diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 924d325d815..1354126dbf5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,13 +1,10 @@
-Fixes #
+<!-- Please remove these Markdown comments before publishing this PR, since the PR message is often used as the commit description. 
+We only allow squash merging and GH suggests the PR details as a default commit message. -->
 
+### What was changed?
 <!-- Is this a user-visible change?  Remember to update RELEASE_NOTES.md -->
 
-<!-- Is this a bug fix?  Remember to include a test in Test/git-issues/ -->
-
-<!-- Is this a bug fix for an issue introduced in the latest release?  Mention this in the PR details and ensure a patch release is considered -->
-
-<!-- Does this PR need tests?  Add them to `Test/` or to `Source/*.Test/…` and run them with `dotnet test` -->
-
-<!-- Are you moving a large amount of code? Read CONTRIBUTING.md to learn how to do that while maintaining git history -->
+### How has this been tested?
+<!-- Tests can be added to `Source/IntegrationTests/TestFiles/LitTests/LitTest/` or to `Source/*.Test/…` and run with `dotnet test` -->
 
 <small>By submitting this pull request, I confirm that my contribution is made under the terms of the [MIT license](https://github.com/dafny-lang/dafny/blob/master/LICENSE.txt).</small>
diff --git a/.github/workflows/check-deep-tests-reusable.yml b/.github/workflows/check-deep-tests-reusable.yml
index c2c6e23dcd2..eb38ecebc98 100644
--- a/.github/workflows/check-deep-tests-reusable.yml
+++ b/.github/workflows/check-deep-tests-reusable.yml
@@ -1,28 +1,26 @@
 name: Check Deep Tests (Reusable Workflow)
 
 on:
+  workflow_dispatch:
   workflow_call:
-    inputs:
-      sha:
-        type: string
-      branch:
-        type: string
 
 jobs:
   check-deep-tests:
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout Dafny
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: dafny
         submodules: recursive
-    - uses: actions/github-script@v6
+    - uses: actions/github-script@v7
       if: github.repository_owner == 'dafny-lang'
       with:
+        # Since nightly-build.yml always targets fixed branches now, rather than being parameterized by
+        # branch, we can't effectively check "for a specific branch".
+        # That means we have to be less precise for now and block all branches if any branch fails the deep nightly tests.
         script: |
           const script = require('${{ github.workspace }}/dafny/.github/workflows/check-for-workflow-run.js')
           console.log(script({github, context, core,
-                              workflow_id: 'deep-tests.yml',
-                              ...('${{ inputs.sha }}' ? {sha: '${{ inputs.sha }}'} : {}),
-                              ...('${{ inputs.branch }}' ? {branch: '${{ inputs.branch }}'} : {})}))
+                              workflow_id: 'nightly-build.yml',
+                              branch: 'master'}))
diff --git a/.github/workflows/check-for-workflow-run.js b/.github/workflows/check-for-workflow-run.js
index e0a2ee1c766..f4b86dd90fb 100644
--- a/.github/workflows/check-for-workflow-run.js
+++ b/.github/workflows/check-for-workflow-run.js
@@ -14,16 +14,33 @@ module.exports = async ({github, context, core, workflow_id, sha, ...config}) =>
   // These are ordered by creation time, so decide based on the first
   // run for this SHA we see.
   const runFilterDesc = sha ? `${workflow_id} on ${sha}` : workflow_id
-  for (const run of result.data.workflow_runs) {
-    if ((!sha || run.head_sha === sha) && run.status !== "in_progress") {
-      if (run.conclusion !== "success") {
-        core.setFailed(`Last run of ${runFilterDesc} did not succeed: ${run.html_url}`)
-      } else {
-        // The SHA is fully tested, exit with success
-        console.log(`Last run of ${runFilterDesc} succeeded: ${run.html_url}`)
-      }
+  const workflow_runs =  result.data.workflow_runs.filter(run => !sha || run.head_sha === sha)
+  const workflow_runs_completed = workflow_runs.filter(run => run.status === "completed")
+  // The status property can be one of: “queued”, “in_progress”, or “completed”.
+  const workflow_runs_in_progress = workflow_runs.filter(run => run.status !== "completed")
+  for (const run of workflow_runs_completed) {
+    // The conclusion property can be one of:
+    // “success”, “failure”, “neutral”, “cancelled”, “skipped”, “timed_out”, or “action_required”.
+    if (run.conclusion === "success") {
+      // The SHA is fully tested, exit with success
+      console.log(`Last run of ${runFilterDesc} succeeded: ${run.html_url}`)
+      return
+    } else if (run.conclusion === "failure" || run.conclusion === "timed_out") {
+      const extraMessage = workflow_runs_in_progress.length > 0 ?
+        `\nA run of ${runFilterDesc} is currently ${workflow_runs_in_progress[0].status}:`+
+        ` ${workflow_runs_in_progress[0].html_url}, just re-run this test once it is finished.` :
+        `\nAt the time of checking, no fix was underway.\n`+
+        `- Please first check https://github.com/dafny-lang/dafny/actions/workflows/nightly-build.yml . `+
+        `If you see any queued or in progress run on ${runFilterDesc}, just re-run this test once it is finished.`+
+        `- If not, and you are a Dafny developer, please fix the issue by creating a PR with the label [run-deep-tests], have it reviewed and merged, ` +
+        `and then trigger the workflow on ${runFilterDesc} with the URL https://github.com/dafny-lang/dafny/actions/workflows/nightly-build.yml .\n`+
+        `With such a label, you can merge a PR even if tests are not successful, but make sure the deeps one are!\n`+
+        `If you do not have any clue on how to fix it, `+
+        `at worst you can revert all PRs from the last successful run and indicate the authors they need to re-file`+
+        ` their PRs and add the label [run-deep-tests] to their PRs`;
+      core.setFailed(`Last run of ${runFilterDesc} did not succeed: ${run.html_url}${extraMessage}`)
       return
     }
   }
-  core.setFailed(`No runs of ${runFilterDesc} found!`)
+  core.setFailed(`No completed runs of ${runFilterDesc} found!`)
 }
diff --git a/.github/workflows/compfuzzci_close_pr.yaml b/.github/workflows/compfuzzci_close_pr.yaml
new file mode 100644
index 00000000000..fec95d7b6b2
--- /dev/null
+++ b/.github/workflows/compfuzzci_close_pr.yaml
@@ -0,0 +1,29 @@
+# This workflow is triggered on PR being closed.
+# It dispatches workflow on CompFuzzCI repository, where the bugs found in the PR head is discarded from the database.
+
+name: Updating CompFuzzCI on PR Closed
+on:
+  pull_request:
+    branches:
+      - master
+    types: [closed]
+  
+jobs:
+  UpdatePRClosed:
+    if: github.event.pull_request.base.ref == 'master' && github.event.pull_request.head.repo.owner.login == 'dafny-lang'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger CompFuzzCI
+        uses: actions/github-script@v7
+        with:
+            github-token: ${{ secrets.COMPFUZZCI_PAT }}
+            script: |
+              await github.rest.actions.createWorkflowDispatch({
+                  owner: 'CompFuzzCI',
+                  repo: 'DafnyCompilerFuzzer',
+                  workflow_id: 'update_pr_close.yaml',
+                  ref: 'main',
+                  inputs: {
+                      pr_head_ref: '${{github.event.pull_request.head.ref}}' 
+                  }
+              })
\ No newline at end of file
diff --git a/.github/workflows/compfuzzci_fuzz.yaml b/.github/workflows/compfuzzci_fuzz.yaml
new file mode 100644
index 00000000000..720f6a02a76
--- /dev/null
+++ b/.github/workflows/compfuzzci_fuzz.yaml
@@ -0,0 +1,37 @@
+# This workflow is triggered on PR being opened, synced, reopened, closed.
+# It dispatches workflow on CompFuzzCI repository, where fuzzing of the PR is handled.
+# For problems or suggestions, contact karnbongkot.boonriong23@imperial.ac.uk
+
+name: Fuzzing on PR
+on:
+  pull_request_target:
+    branches:
+      - master
+  
+jobs:
+  FuzzOnPR:
+    if: github.event.pull_request.base.ref == 'master' &&
+        (github.event.pull_request.author_association == 'COLLABORATOR' ||
+        github.event.pull_request.author_association == 'MEMBER' ||
+        github.event.pull_request.author_association == 'OWNER')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger CompFuzzCI
+        uses: actions/github-script@v7
+        with:
+            github-token: ${{ secrets.COMPFUZZCI_PAT }}
+            script: |
+              await github.rest.actions.createWorkflowDispatch({
+                  owner: 'CompFuzzCI',
+                  repo: 'DafnyCompilerFuzzer',
+                  workflow_id: 'fuzz.yaml',
+                  ref: 'main',
+                  inputs: {
+                      pr: '${{github.event.pull_request.number}}',
+                      author: '${{github.event.pull_request.user.login}}',
+                      branch: '${{github.event.pull_request.head.ref}}',
+                      head_sha: '${{github.event.pull_request.head.sha}}',
+                      duration: '3600',
+                      instance: '2'
+                  }
+              })
\ No newline at end of file
diff --git a/.github/workflows/compfuzzci_process_issues.yaml b/.github/workflows/compfuzzci_process_issues.yaml
new file mode 100644
index 00000000000..2228ef0a2d9
--- /dev/null
+++ b/.github/workflows/compfuzzci_process_issues.yaml
@@ -0,0 +1,51 @@
+# This workflow is triggered on issue being opened, closed, reopened.
+# The CompFuzzCI fuzzer needs to keep track of active issues in the repository to ensure that the fuzzer does not report the same issue multiple times.
+# For open and reopen events: It dispatches workflow on CompFuzzCI repository, where the issue is added to the database.
+# For close event: It dispatches workflow on CompFuzzCI repository, where the issue is removed from the database.
+
+name: Issue Update for Fuzzer
+on:
+  issues:
+    branches:
+      - master
+    types: [opened, closed, reopened]
+
+jobs:
+  UpdateIssueOpened:
+    if: github.event.action == 'opened' || github.event.action == 'reopened'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger CompFuzzCI
+        uses: actions/github-script@v7
+        with:
+            github-token: ${{ secrets.COMPFUZZCI_PAT }}
+            script: |
+              await github.rest.actions.createWorkflowDispatch({
+                  owner: 'CompFuzzCI',
+                  repo: 'DafnyCompilerFuzzer',
+                  workflow_id: 'update_issue_open.yaml',
+                  ref: 'main',
+                  inputs: {
+                      issue_number: '${{github.event.issue.number}}',
+                      issuer: '${{github.event.issue.user.login}}',
+                      commit: '${{ github.sha }}'          
+                  }
+              })
+  UpdateIssueClosed:
+    if: github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger CompFuzzCI
+        uses: actions/github-script@v7
+        with:
+            github-token: ${{ secrets.COMPFUZZCI_PAT }}
+            script: |
+              await github.rest.actions.createWorkflowDispatch({
+                  owner: 'CompFuzzCI',
+                  repo: 'DafnyCompilerFuzzer',
+                  workflow_id: 'update_issue_close.yaml',
+                  ref: 'main',
+                  inputs: {
+                      issue_number: '${{github.event.issue.number}}'
+                  }
+              })
\ No newline at end of file
diff --git a/.github/workflows/daily-soak-test-build.yml b/.github/workflows/daily-soak-test-build.yml
new file mode 100644
index 00000000000..98f9025f244
--- /dev/null
+++ b/.github/workflows/daily-soak-test-build.yml
@@ -0,0 +1,23 @@
+
+# Scheduled daily build
+#
+# The purpose of this build is to run tests that may have non-deterministic failures
+# many times over, in the hopes of more aggressively revealing
+# flaky tests that occasionally slow down unrelated development.
+
+name: Daily soak test workflow
+
+on:
+  schedule:
+    # Chosen to be hopefully outside of business hours for most contributors'
+    # time zones, and not on the hour to avoid heavy scheduled-job times:
+    # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
+    - cron: "30 3 * * *"
+  workflow_dispatch:
+
+jobs:
+  daily-soak-build-for-master:
+    if: github.repository_owner == 'dafny-lang' || github.event_name == 'workflow_dispatch'
+    uses: ./.github/workflows/xunit-tests-reusable.yml
+    with:
+        soak_test: true
diff --git a/.github/workflows/deep-tests.yml b/.github/workflows/deep-tests.yml
deleted file mode 100644
index 16228a31723..00000000000
--- a/.github/workflows/deep-tests.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-# This workflow includes more expensive tests than what is run on every PR, that are unlikely to break on most changes.
-# It also publishes a nightly release.
-#
-# The if at the beginning of each job terminates the workflow immediately on any repo (like a fork) that is not the main
-# dafny-lang/dafny repo. This stops such forks from running this workflow and failing (for lack of a secret) the attempt to
-# publish a nightly build themselves.
-
-name: Nightly test and release workflow
-
-on:
-  schedule:
-    # Chosen to be hopefully outside of business hours for most contributors'
-    # time zones, and not on the hour to avoid heavy scheduled-job times:
-    # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
-    - cron: "30 14 * * *"
-  workflow_dispatch:
-
-jobs:
-  deep-integration-tests:
-    if: github.repository_owner == 'dafny-lang'
-    uses: ./.github/workflows/integration-tests-reusable.yml
-    with:
-      all_platforms: true
-      num_shards: 5
-
-  determine-vars:
-    if: github.repository_owner == 'dafny-lang' && github.ref == 'refs/heads/master'
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout Dafny
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.sha }}
-          submodules: recursive
-
-      - name: Get short sha
-        run: echo "sha_short=`git rev-parse --short HEAD`" >> $GITHUB_ENV
-
-      - name: Get current date
-        run: echo "date=`date +'%Y-%m-%d'`" >> $GITHUB_ENV
-
-    outputs:
-      name: nightly-${{ env.date }}-${{ env.sha_short }}
-
-  publish-release:
-    uses: ./.github/workflows/publish-release-reusable.yml
-    needs: [deep-integration-tests, determine-vars]
-    with:
-      name: ${{ needs.determine-vars.outputs.name }}
-      sha: ${{ github.sha }}
-      tag_name: nightly
-      release_nuget: true
-      draft: false
-      release_notes: "This is an automatically published nightly release. This release may not be as stable as versioned releases and does not contain release notes."
-      prerelease: true
-    secrets:
-      nuget_api_key: ${{ secrets.NUGET_API_KEY }}
diff --git a/.github/workflows/doc-tests.yml b/.github/workflows/doc-tests.yml
index 7680173f8ef..99dc121ca7f 100644
--- a/.github/workflows/doc-tests.yml
+++ b/.github/workflows/doc-tests.yml
@@ -10,6 +10,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches: [ master, main-* ]
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -18,27 +19,27 @@ concurrency:
 jobs:
   check-deep-tests:
      uses: ./.github/workflows/check-deep-tests-reusable.yml
-     with:
-       branch: master
 
   doctests:
     needs: check-deep-tests
     if: always() && (( github.event_name == 'pull_request' && (needs.check-deep-tests.result == 'success' || contains(github.event.pull_request.labels.*.name, 'run-deep-tests'))) || ( github.event_name == 'push' && ( github.ref_name == 'master' || vars.TEST_ON_FORK == 'true' )))
     runs-on: ubuntu-latest
 
-    steps:
+    steps: 
+    # The Windows image was recently updated with a .NET 9 CLI which made CI fail, 
+    # We added a global.json to force it to use any .NET CLI with 8 as a major version
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Checkout Dafny
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
         path: dafny
     - name: Load Z3
       run: |
-        sudo apt-get install -qq libarchive-tools
+        sudo apt-get update && sudo apt-get install -qq libarchive-tools
         mkdir -p dafny/Binaries/z3/bin
         wget -qO- https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2023-08-02/z3-4.12.1-x64-ubuntu-20.04-bin.zip | bsdtar -xf -
         mv z3-* dafny/Binaries/z3/bin/
diff --git a/.github/workflows/integration-tests-reusable.yml b/.github/workflows/integration-tests-reusable.yml
index 905c86531e2..79d72f30dcf 100644
--- a/.github/workflows/integration-tests-reusable.yml
+++ b/.github/workflows/integration-tests-reusable.yml
@@ -9,10 +9,17 @@ on:
       num_shards:
         required: true
         type: number
+      ref:
+        required: true
+        type: string
+      compilers:
+        description: 'Compilers to use'
+        type: string
+        required: false
+        default: ""
 
 env:
-  dotnet-version: 6.0.x # SDK Version for building Dafny
-
+  dotnet-version: 8.0.x # SDK Version for building Dafny
 
 jobs:
   # This job is used to dynamically calculate the matrix dimensions.
@@ -24,7 +31,7 @@ jobs:
       - name: Populate OS list (all platforms)
         id: populate-os-list-all
         if: inputs.all_platforms
-        run: echo "os-list=[\"ubuntu-latest\", \"ubuntu-20.04\", \"macos-latest\", \"windows-2019\"]" >> $GITHUB_OUTPUT
+        run: echo "os-list=[\"ubuntu-20.04\", \"macos-13\", \"windows-2019\"]" >> $GITHUB_OUTPUT
       - name: Populate OS list (one platform)
         id: populate-os-list-one
         if: "!inputs.all_platforms"
@@ -32,7 +39,7 @@ jobs:
       - name: Populate OS mapping for package.py
         id: populate-os-mapping
         run: |
-          echo "os-mapping={\"ubuntu-latest\": \"ubuntu\", \"ubuntu-20.04\": \"ubuntu\", \"macos-latest\": \"macos\", \"windows-2019\": \"windows\"}" >> $GITHUB_OUTPUT
+          echo "os-mapping={\"ubuntu-20.04\": \"ubuntu\", \"macos-13\": \"macos\", \"windows-2019\": \"windows\"}" >> $GITHUB_OUTPUT
       - name: Populate target runtime version list (all platforms)
         id: populate-target-runtime-version-all
         if: inputs.all_platforms
@@ -50,6 +57,7 @@ jobs:
       shard-list: ${{ steps.populate-shard-list.outputs.shard-list }}
   test:
     needs: populate-matrix-dimensions
+    timeout-minutes: 120
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -61,9 +69,14 @@ jobs:
       if: runner.os == 'Linux'
       run: cert-sync /etc/ssl/certs/ca-certificates.crt
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ env.dotnet-version }}
+    #  Setup dotnet 6.0 for running Boogie. Alternatively we could try running Boogie with a roll forward policy, or updating Boogie.
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 6.0.x
     - name: C++ for ubuntu 20.04
       if: matrix.os == 'ubuntu-20.04'
       run: |
@@ -73,31 +86,41 @@ jobs:
       run: |
         sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 60
     - name: Set up oldest supported JDK
-      if: matrix.target-language-version == 'oldest'
-      uses: actions/setup-java@v3
+      if: matrix.target-language-version != 'newest'
+      uses: actions/setup-java@v4
       with:
         java-version: 8
         distribution: corretto
     - name: Set up newest supported JDK
       if: matrix.target-language-version == 'newest'
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 18
         distribution: corretto
+    - name: Set up oldest supported Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.21'
+        cache: false
+    - name: Set up goimports
+      env:
+        GO111MODULE: on
+      run: go install golang.org/x/tools/cmd/goimports@latest
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with: 
         python-version: '3.11'
     - name: Upgrade outdated pip
       run: python -m pip install --upgrade pip
     - name: Install lit
       run: pip install lit OutputCheck pyyaml
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
     - run: npm install bignumber.js
     - name: Checkout Dafny
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: dafny
+        ref: ${{ inputs.ref }}
         submodules: true # Until the libraries work again
     - name: Install Java runtime locally (non-Windows)
       if: runner.os != 'Windows'
@@ -110,6 +133,22 @@ jobs:
 #    - name: Clean up libraries for testing
 #      run: |
 #        rm dafny/Test/libraries/lit.site.cfg # we remove the lit configuration file in the library repo (a git submodule) to prevent override
+    - name: Use the default Rust linker (Non-Windows)
+      if: runner.os != 'Windows'
+      run: rustup default stable
+    - name: Use specific Toolchain (Windows)
+      if: runner.os == 'Windows'
+      run: rustup default stable-x86_64-pc-windows-gnu
+    - name: Rust-related System information
+      run: |
+        echo "What is the Rust version?"
+        rustc -vV
+        echo "What is the cargo version?"
+        cargo --version
+        echo "What is the architecture?"
+        uname -m
+        echo "What are Rust toolchains installed?"
+        rustup toolchain list
     - name: Create release
       if: inputs.all_platforms
       run: |
@@ -124,7 +163,7 @@ jobs:
     - name: Load Z3
       if: "!inputs.all_platforms"
       run: |
-        sudo apt-get install -qq libarchive-tools
+        sudo apt-get update && sudo apt-get install -qq libarchive-tools
         mkdir -p dafny/Binaries/z3/bin
         wget -qO- https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2023-08-02/z3-4.12.1-x64-ubuntu-20.04-bin.zip | bsdtar -xf -
         mv z3-4.12.1 dafny/Binaries/z3/bin/
@@ -137,9 +176,10 @@ jobs:
         XUNIT_SHARD: ${{ matrix.shard }}
         XUNIT_SHARD_COUNT: ${{ inputs.num_shards }}
         DAFNY_RELEASE: ${{ github.workspace }}\unzippedRelease\dafny
+        DAFNY_INTEGRATION_TESTS_ONLY_COMPILERS: ${{ inputs.compilers }}
       run: |
         cmd /c mklink D:\a\dafny\dafny\unzippedRelease\dafny\z3\bin\z3-4.12.1 D:\a\dafny\dafny\unzippedRelease\dafny\z3\bin\z3-4.12.1.exe
-        dotnet test --logger trx --logger "console;verbosity=normal" --collect:"XPlat Code Coverage" dafny/Source/IntegrationTests/IntegrationTests.csproj
+        dotnet test --logger trx --logger "console;verbosity=normal" --collect:"XPlat Code Coverage" --settings dafny/Source/IntegrationTests/coverlet.runsettings dafny/Source/IntegrationTests/IntegrationTests.csproj
     - name: Generate tests (non-Windows)
       ## This step creates lit tests from examples in documentation
       ## These are then picked up by the integration tests below 
@@ -153,13 +193,14 @@ jobs:
       env:
         XUNIT_SHARD: ${{ matrix.shard }}
         XUNIT_SHARD_COUNT: ${{ inputs.num_shards }}
+        DAFNY_INTEGRATION_TESTS_ONLY_COMPILERS: ${{ inputs.compilers }}
       run: |
         ${{ inputs.all_platforms }} && export DAFNY_RELEASE="${{ github.workspace }}/unzippedRelease/dafny"
-        dotnet test --logger trx --logger "console;verbosity=normal" --collect:"XPlat Code Coverage" dafny/Source/IntegrationTests
-    - uses: actions/upload-artifact@v3
+        dotnet test --logger trx --logger "console;verbosity=normal" --collect:"XPlat Code Coverage" --settings dafny/Source/IntegrationTests/coverlet.runsettings dafny/Source/IntegrationTests
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: integration-test-results-${{ matrix.os }}
+        name: integration-test-results-${{ matrix.os }}-${{ matrix.shard }}
         path: |
           dafny/Source/*/TestResults/*.trx
           dafny/Source/*/TestResults/*/coverage.cobertura.xml
diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
new file mode 100644
index 00000000000..0727bfc0c73
--- /dev/null
+++ b/.github/workflows/jekyll.yml
@@ -0,0 +1,60 @@
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll site to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.1' # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          cache-version: 0 # Increment this number if you need to re-download cached gems
+          working-directory: 'docs'
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: (cd docs; bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"  --destination ../_site)
+        env:
+          JEKYLL_ENV: production
+      - name: Upload artifact
+        # Automatically uploads an artifact from the './_site' directory by default
+        uses: actions/upload-pages-artifact@v3
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 61805e91a58..5e779c576a8 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches: [ master, main-* ]
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -11,13 +12,11 @@ concurrency:
 
 
 env:
-  dotnet-version: 6.0.x # SDK Version for building Dafny
+  dotnet-version: 8.0.x # SDK Version for building Dafny
 
 jobs:
   check-deep-tests:
     uses: ./.github/workflows/check-deep-tests-reusable.yml
-    with:
-      branch: master
 
   singletons:
     needs: check-deep-tests
@@ -25,17 +24,23 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{env.dotnet-version}}
     - name: Checkout Dafny
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: dafny
         submodules: recursive
     - name: Restore tools
       working-directory: dafny
       run: dotnet tool restore
+    - name: Check whitespace and style
+      working-directory: dafny
+      run: dotnet format whitespace Source/Dafny.sln --verify-no-changes --exclude Source/DafnyCore/Scanner.cs --exclude Source/DafnyCore/Parser.cs --exclude Source/DafnyCore/GeneratedFromDafny/* --exclude Source/DafnyCore.Test/GeneratedFromDafny/* --exclude Source/DafnyRuntime/DafnyRuntimeSystemModule.cs
+    - name: Check that it's possible to bump the version
+      working-directory: dafny
+      run: make bumpversion-test
     - name: Get Boogie Version
       run: |
         sudo apt-get update
@@ -45,7 +50,7 @@ jobs:
       working-directory: dafny
       run: git apply customBoogie.patch
     - name: Checkout Boogie
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: boogie-org/boogie
         path: dafny/boogie
@@ -53,11 +58,8 @@ jobs:
     - name: Build Dafny with local Boogie
       working-directory: dafny
       run: dotnet build Source/Dafny.sln
-    - name: Check whitespace and style
-      working-directory: dafny
-      run: dotnet tool run dotnet-format -w -s error --check Source/Dafny.sln --exclude DafnyCore/Scanner.cs --exclude DafnyCore/Parser.cs --exclude DafnyCore/GeneratedFromDafny.cs --exclude DafnyCore/GeneratedFromDafnyRust.cs
     - name: Create NuGet package (just to make sure it works)
-      run: dotnet pack --no-build dafny/Source/Dafny.sln
+      run: dotnet pack dafny/Source/Dafny.sln
     - name: Check uniformity of integration tests that exercise backends
       run: DAFNY_INTEGRATION_TESTS_MODE=uniformity-check dotnet test dafny/Source/IntegrationTests
 
@@ -68,14 +70,17 @@ jobs:
 
   integration-tests:
     needs: check-deep-tests
-    if: always() && (( github.event_name == 'pull_request' && (needs.check-deep-tests.result == 'success' || contains(github.event.pull_request.labels.*.name, 'run-deep-tests'))) || ( github.event_name == 'push' && ( github.ref_name == 'master' || vars.TEST_ON_FORK == 'true' )))
+    if: always() && (( github.event_name == 'pull_request' && (needs.check-deep-tests.result == 'success' || contains(github.event.pull_request.labels.*.name, 'run-deep-tests') || contains(github.event.pull_request.labels.*.name, 'run-integration-tests'))) || ( github.event_name == 'push' && ( github.ref_name == 'master' || vars.TEST_ON_FORK == 'true' )))
     uses: ./.github/workflows/integration-tests-reusable.yml
     with:
+      ref: ${{ github.ref }}
       # By default run only on one platform, but run on all platforms if the PR has the "run-deep-tests"
       # label, and skip checking the nightly build above.
       # This is the best way to fix an issue in master that was only caught by the nightly build.
       all_platforms: ${{ contains(github.event.pull_request.labels.*.name, 'run-deep-tests') || contains(github.event.push.labels.*.name, 'run-deep-tests')}}
       num_shards: 5
+      # Omit Rust in the nightly build (or rather simulating it here) because Rust is known to have random issues
+      compilers: ${{ (contains(github.event.pull_request.labels.*.name, 'run-deep-tests') || contains(github.event.push.labels.*.name, 'run-deep-tests')) && 'cs,java,go,js,cpp,dfy,py' || '' }}
 
   test-coverage-analysis:
     runs-on: ubuntu-20.04
@@ -86,13 +91,13 @@ jobs:
     steps:
       # Check out Dafny so that highlighted source is possible
       - name: Checkout Dafny
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: dafny
           submodules: recursive
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{env.dotnet-version}}
 
@@ -109,12 +114,13 @@ jobs:
           dotnet tool run coco "Source/DafnyCore/Dafny.atg" -namespace Microsoft.Dafny -frames "Source/DafnyCore/Coco"
 
       - name: Download integration test artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: integration-test-results-ubuntu-20.04
+          pattern: integration-test-results-ubuntu-20.04-*
+          merge-multiple: true
 
       - name: Download unit test artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: unit-test-results-ubuntu-20.04
 
@@ -127,7 +133,7 @@ jobs:
           reportgenerator \
             -reports:"./**/coverage.cobertura.xml" \
             -reporttypes:Cobertura -targetdir:coverage-cobertura \
-            -classfilters:"-Microsoft.Dafny.*PreType*;-Microsoft.Dafny.ResolverPass;-Microsoft.Dafny.*Underspecification*;-Microsoft.Dafny.DetectUnderspecificationVisitor;-Microsoft.Dafny.Microsoft.Dafny.UnderspecificationDetector;-DAST.*;-DCOMP.*"
+            -classfilters:"-Microsoft.Dafny.*PreType*;-Microsoft.Dafny.ResolverPass;-Microsoft.Dafny.*Underspecification*;-Microsoft.Dafny.DetectUnderspecificationVisitor;-Microsoft.Dafny.Microsoft.Dafny.UnderspecificationDetector;-Microsoft.Dafny.Compilers.DafnyCompiler;-DAST.*;-DCOMP.*"
           # Generate HTML from combined report, leaving out XUnitExtensions
           reportgenerator \
             -reports:"coverage-cobertura/Cobertura.xml" \
@@ -158,7 +164,7 @@ jobs:
           output: both
           # Fail if less than 86% total coverage, measured across all packages combined.
           # Report "yellow" status if less than 90% total coverage.
-          thresholds: '86 90'
+          thresholds: '85 90'
 
       - name: Code coverage report (LSP)
         uses: irongut/CodeCoverageSummary@v1.3.0
@@ -175,7 +181,7 @@ jobs:
           # Report "yellow" status if less than 90% total coverage.
           thresholds: '86 90'
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always() # Upload results even if the job fails
         with:
           name: test-coverage-results
diff --git a/.github/workflows/nightly-build-manual.yml b/.github/workflows/nightly-build-manual.yml
new file mode 100644
index 00000000000..51b85eafed4
--- /dev/null
+++ b/.github/workflows/nightly-build-manual.yml
@@ -0,0 +1,26 @@
+
+# Manual trigger for the nightly build on a given branch.
+
+name: Nightly test and release workflow (Manual trigger)
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'The git ref to run on'
+        required: true
+        type: string
+      publish-prerelease:
+        description: 'Whether to publish a prerelease'
+        required: false
+        type: boolean
+        default: false
+      
+jobs:
+  nightly-build:
+    uses: ./.github/workflows/nightly-build-reusable.yml
+    with:
+      ref: ${{ inputs.ref }}
+      publish-prerelease: ${{ inputs.publish-prerelease }}
+    secrets:
+      nuget_api_key: ${{ secrets.NUGET_API_KEY }}
diff --git a/.github/workflows/nightly-build-reusable.yml b/.github/workflows/nightly-build-reusable.yml
new file mode 100644
index 00000000000..4b659ebba7b
--- /dev/null
+++ b/.github/workflows/nightly-build-reusable.yml
@@ -0,0 +1,63 @@
+# This workflow includes more expensive tests than what is run on every PR, that are unlikely to break on most changes.
+# It also optionally publishes a nightly prerelease.
+
+name: Nightly test and release workflow (Reusable Workflow)
+
+on:
+  workflow_call:
+    inputs:
+      ref:
+        required: true
+        type: string
+      publish-prerelease:
+        required: false
+        type: boolean
+        default: false
+    secrets:
+      # Required if publish-prerelease is true
+      nuget_api_key:
+        required: false
+
+jobs:
+  deep-integration-tests:
+    if: github.repository_owner == 'dafny-lang'
+    uses: ./.github/workflows/integration-tests-reusable.yml
+    with:
+      ref: ${{ inputs.ref }}
+      all_platforms: true
+      num_shards: 10
+      # Omit Rust because Rust is known to have random issues
+      compilers: cs,java,go,js,cpp,dfy,py
+
+  determine-vars:
+    if: github.repository_owner == 'dafny-lang' && inputs.publish-prerelease
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout Dafny
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+          submodules: recursive
+
+      - name: Get short sha
+        run: echo "sha_short=`git rev-parse --short HEAD`" >> $GITHUB_ENV
+
+      - name: Get current date
+        run: echo "date=`date +'%Y-%m-%d'`" >> $GITHUB_ENV
+
+    outputs:
+      name: nightly-${{ env.date }}-${{ env.sha_short }}
+
+  publish-release:
+    uses: ./.github/workflows/publish-release-reusable.yml
+    needs: [deep-integration-tests, determine-vars]
+    with:
+      name: ${{ needs.determine-vars.outputs.name }}
+      ref: ${{ inputs.ref }}
+      tag_name: nightly
+      release_nuget: true
+      draft: false
+      release_notes: "This is an automatically published nightly release. This release may not be as stable as versioned releases and does not contain release notes."
+      prerelease: true
+    secrets:
+      nuget_api_key: ${{ secrets.nuget_api_key }}
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
new file mode 100644
index 00000000000..311a0656713
--- /dev/null
+++ b/.github/workflows/nightly-build.yml
@@ -0,0 +1,33 @@
+
+# Scheduled nightly build
+#
+# Scheduled workflows only ever trigger for the default branch,
+# but we need to run nightly jobs on multiple branches.
+# This workflow therefore triggers a reusable workflow
+# on every branch that needs to be protected with the nightly deep-test mechanism,
+# and ensures which ever branch contains the next planned release
+# publishes the nightly prerelease.
+#
+# The if at the beginning of each job terminates the workflow immediately on any repo (like a fork) that is not the main
+# dafny-lang/dafny repo. This stops such forks from running this workflow and failing (for lack of a secret) the attempt to
+# publish a nightly build themselves.
+
+name: Nightly test and release workflow
+
+on:
+  schedule:
+    # Chosen to be hopefully outside of business hours for most contributors'
+    # time zones, and not on the hour to avoid heavy scheduled-job times:
+    # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
+    - cron: "30 14 * * *"
+  workflow_dispatch:
+
+jobs:
+  nightly-build-for-master:
+    if: github.repository_owner == 'dafny-lang'
+    uses: ./.github/workflows/nightly-build-reusable.yml
+    with:
+      ref: master
+      publish-prerelease: true
+    secrets:
+      nuget_api_key: ${{ secrets.NUGET_API_KEY }}
diff --git a/.github/workflows/publish-release-reusable.yml b/.github/workflows/publish-release-reusable.yml
index 8e6333175bb..adee22747dc 100644
--- a/.github/workflows/publish-release-reusable.yml
+++ b/.github/workflows/publish-release-reusable.yml
@@ -9,7 +9,7 @@ on:
       prerelease:
         required: false
         type: boolean
-      sha:
+      ref:
         required: true
         type: string
       draft:
@@ -30,20 +30,20 @@ on:
         required: false
 
 env:
-  dotnet-version: 6.0.x # SDK Version for building Dafny
+  dotnet-version: 8.0.x # SDK Version for building Dafny
   
 jobs:
 
   publish-release:
-    runs-on: macos-latest
+    runs-on: macos-13   # Put back 'ubuntu-20.04' if macos-latest fails in any way
     steps:
     - name: Print version
       run: echo ${{ inputs.name }}
     - name: Checkout Dafny
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: dafny
-        ref: ${{ inputs.sha }}
+        ref: ${{ inputs.ref }}
     - name: Ensure tag exists
       if: ${{ inputs.prerelease }}
       run: |
@@ -51,7 +51,7 @@ jobs:
         git push origin ${{ inputs.tag_name }} -f
       working-directory: dafny
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{env.dotnet-version}}
     - name: C++ for ubuntu 20.04
@@ -63,14 +63,14 @@ jobs:
       run: |
         sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 60
     - name: Set up JDK 18
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 18
         distribution: corretto
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
     - run: npm install bignumber.js
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with: 
        python-version: '3.11'
     - name: Build Dafny
@@ -79,14 +79,14 @@ jobs:
         rm dafny/Binaries/*.nupkg
     - name: Create release NuGet package (for uploading)
       if: ${{ !inputs.prerelease }}
-      run: dotnet pack --no-build dafny/Source/Dafny.sln
+      run: dotnet pack dafny/Source/Dafny.sln
     - name: Create prerelease NuGet package (for uploading)
       if: ${{ inputs.prerelease }}
       # NuGet will consider any package with a version-suffix as a prerelease
-      run: dotnet pack --version-suffix ${{ inputs.name }} --no-build dafny/Source/Dafny.sln
+      run: dotnet pack --version-suffix ${{ inputs.name }} dafny/Source/Dafny.sln
 
     - name: Make NuGet package available as an artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: nuget-packages
         path: dafny/Binaries/*.nupkg
@@ -96,22 +96,31 @@ jobs:
       # Need --skip-duplicate for cases where we release a new Dafny
       # version but the runtime hasn't changed and is still the old
       # version.
-      run: dotnet nuget push --skip-duplicate "dafny/Binaries/Dafny*.nupkg" -k ${{ secrets.nuget_api_key }} -s https://api.nuget.org/v3/index.json
+      run: dotnet nuget push --skip-duplicate "dafny/Binaries/Dafny*.nupkg" -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
 
-    - name: Install latex pandoc
+    - name: Install pandoc - Linux
+      if: runner.os == 'Linux'
+      run: |
+        wget https://github.com/jgm/pandoc/releases/download/3.1.7/pandoc-3.1.7-1-amd64.deb
+        sudo dpkg -i *.deb
+        rm -rf *.deb
+        pandoc -v
+        sudo gem install rouge
+    - name: Install pandoc - MacOS
+      if: runner.os == 'MacOS'
       run: |
         unset HOMEBREW_NO_INSTALL_FROM_API
         brew untap Homebrew/core
         brew update-reset && brew update
         brew install pandoc
-        brew install --cask mactex
-        eval "$(/usr/libexec/path_helper)"
-        sudo tlmgr update --self
-        sudo tlmgr install framed tcolorbox environ trimspaces unicode-math
         pandoc -v
-        which latex || echo NOT FOUND latex
-        which xelatex || echo NOT FOUND xelatex
         sudo gem install rouge -v 3.30.0
+    - name: Install Tectonic
+      uses: wtfjoke/setup-tectonic@v3
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        tectonic-version: 0.15
+
     - name: Clean Dafny
       run: dotnet clean dafny/Source/Dafny.sln
     # First we build the ZIPs (which do not include the refman)
@@ -128,14 +137,17 @@ jobs:
     # Additionally, since the refman build scripts expect to find Dafny in its usual Binaries/ folder (not in
     # a platform-specific directory), we build Dafny once here.
     - name: Re-build Dafny
+      if: ${{ !inputs.prerelease }}
       run: dotnet build dafny/Source/Dafny.sln
     - name: Build reference manual
+      if: ${{ !inputs.prerelease }}
       run: |
         eval "$(/usr/libexec/path_helper)"
         make -C dafny/docs/DafnyRef
 
-    - name: Create GitHub release
-      uses: softprops/action-gh-release@v1
+    - name: Create GitHub release (release)
+      if: ${{ !inputs.prerelease }}
+      uses: softprops/action-gh-release@v2
       with:
         name: Dafny ${{ inputs.name }}
         tag_name: ${{ inputs.tag_name }}
@@ -146,3 +158,17 @@ jobs:
           dafny/Package/dafny-${{ inputs.name }}*
           dafny/docs/DafnyRef/DafnyRef.pdf
         fail_on_unmatched_files: true
+
+    # This step is separate from the release one because the refman is omitted
+    - name: Create GitHub release (prerelease)
+      if: ${{ inputs.prerelease }}
+      uses: softprops/action-gh-release@v2
+      with:
+        name: Dafny ${{ inputs.name }}
+        tag_name: ${{ inputs.tag_name }}
+        body: ${{ inputs.release_notes }}
+        draft: ${{ inputs.draft }}
+        prerelease: ${{ inputs.prerelease }}
+        files: |
+          dafny/Package/dafny-${{ inputs.name }}*
+        fail_on_unmatched_files: true
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index fd6476f5188..7b3ee73a7ef 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -7,13 +7,16 @@ on:
       - 'v*'
 
 env:
-  dotnet-version: 6.0.x # SDK Version for building Dafny
+  dotnet-version: 8.0.x # SDK Version for building Dafny
 
 jobs:
-  check-deep-tests:
-    uses: ./.github/workflows/check-deep-tests-reusable.yml
+  deep-integration-tests:
+    if: github.repository_owner == 'dafny-lang'
+    uses: ./.github/workflows/integration-tests-reusable.yml
     with:
-      sha: ${{ github.sha }}
+      ref: ${{ github.ref }}
+      all_platforms: true
+      num_shards: 5
 
   get-version:
     runs-on: ubuntu-22.04
@@ -26,11 +29,11 @@ jobs:
       version: ${{ steps.get-version.outputs.version-without-v }}
 
   publish-release:
-    needs: [check-deep-tests, get-version]
+    needs: [deep-integration-tests, get-version]
     uses: ./.github/workflows/publish-release-reusable.yml
     with:
       name: ${{ needs.get-version.outputs.version }}
-      sha: ${{ github.sha }}
+      ref: ${{ github.sha }}
       tag_name: ${{ github.ref }}
       draft: true
       release_nuget: true
diff --git a/.github/workflows/refman.yml b/.github/workflows/refman.yml
index 3a9db4edddc..93a65d4470b 100644
--- a/.github/workflows/refman.yml
+++ b/.github/workflows/refman.yml
@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches: [ master, main-* ]
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -12,76 +13,51 @@ concurrency:
 jobs:
   check-deep-tests:
      uses: ./.github/workflows/check-deep-tests-reusable.yml
-     with:
-       branch: master
 
-  build:
+  build-refman:
     needs: check-deep-tests
     if: always() && (( github.event_name == 'pull_request' && (needs.check-deep-tests.result == 'success' || contains(github.event.pull_request.labels.*.name, 'run-deep-tests'))) || ( github.event_name == 'push' && ( github.ref_name == 'master' || vars.TEST_ON_FORK == 'true' )))
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest ]
-        # os: [macos-latest, ubuntu-latest ]
+        os: [ ubuntu-22.04 ]
     steps:
     - name: OS
       run: echo ${{ runner.os }} ${{ matrix.os }}
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Checkout Dafny
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
         path: dafny
     - name: Build Dafny
       run: dotnet build dafny/Source/Dafny.sln
-    - name: Install latex pandoc - Linux
+    - name: Install pandoc - Linux
       if: runner.os == 'Linux'
       run: |
-        sudo apt-get install texlive texlive-xetex
-        wget https://github.com/jgm/pandoc/releases/download/2.10.1/pandoc-2.10.1-1-amd64.deb
+        wget https://github.com/jgm/pandoc/releases/download/3.1.7/pandoc-3.1.7-1-amd64.deb
         sudo dpkg -i *.deb
         rm -rf *.deb
-      # apt-get has pandoc, but it is outdated
-    - name: Extra linux packages
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-        sudo apt-get install texlive-science
-        sudo tlmgr init-usertree
-        sudo tlmgr update --self
-        sudo tlmgr install framed tcolorbox environ trimspaces unicode-math
-        pandoc -v
-        which latex || echo NOT FOUND latex
-        which xelatex || echo NOT FOUND xelatex
-        sudo gem install rouge
-    - if: matrix.os != 'ubuntu-latest' && runner.os == 'Linux'
-      run: |
-        sudo apt-get install texlive-math-extra
-        sudo tlmgr init-usertree
-        sudo tlmgr update --self
-        sudo tlmgr install framed tcolorbox environ trimspaces unicode-math
         pandoc -v
-        which latex || echo NOT FOUND latex
-        which xelatex || echo NOT FOUND xelatex
         sudo gem install rouge
-    - name: Install latex pandoc - MacOS
+    - name: Install pandoc - MacOS
       if: runner.os == 'MacOS'
       run: |
         unset HOMEBREW_NO_INSTALL_FROM_API
         brew untap Homebrew/core
         brew update-reset && brew update
         brew install pandoc
-        brew install --cask basictex
-        eval "$(/usr/libexec/path_helper)"
-        sudo tlmgr update --self
-        sudo tlmgr install framed tcolorbox environ trimspaces unicode-math
         pandoc -v
-        which latex || echo NOT FOUND latex
-        which xelatex || echo NOT FOUND xelatex
         sudo gem install rouge -v 3.30.0
+    - name: Install Tectonic
+      uses: wtfjoke/setup-tectonic@v3
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        tectonic-version: 0.15
     - name: Build reference manual
       run: |
         eval "$(/usr/libexec/path_helper)"
@@ -89,7 +65,7 @@ jobs:
         make -C dafny/docs/DafnyRef
     - name: Check
       run: ls -la dafny/docs/DafnyRef/DafnyRef.pdf
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: DafnyRef
diff --git a/.github/workflows/release-brew.yml b/.github/workflows/release-brew.yml
index 70bdfb5de88..c6867f03326 100644
--- a/.github/workflows/release-brew.yml
+++ b/.github/workflows/release-brew.yml
@@ -10,7 +10,7 @@ concurrency:
 jobs:
   build:
 
-    runs-on: macos-latest
+    runs-on: macos-13
 
     steps:
     - name: Install dafny
@@ -26,7 +26,7 @@ jobs:
         java -version
         python --version
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.11'
     ## To be consistent, the download should be tested with the quicktest.sh corresponding to
diff --git a/.github/workflows/release-downloads-nuget.yml b/.github/workflows/release-downloads-nuget.yml
index 60c0393ed77..1d08a00ba40 100644
--- a/.github/workflows/release-downloads-nuget.yml
+++ b/.github/workflows/release-downloads-nuget.yml
@@ -17,7 +17,7 @@ on:
   workflow_dispatch:
 
 env:
-  dotnet-version: 6.0.x # SDK Version for running Dafny (TODO: should this be an older version?)
+  dotnet-version: 8.0.x # SDK Version for running Dafny (TODO: should this be an older version?)
   z3BaseUri: https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2023-08-02
 
 concurrency:
@@ -32,18 +32,18 @@ jobs:
       fail-fast: false
       matrix:
         # This workflow breaks on windows-2022: https://github.com/dafny-lang/dafny/issues/1906
-        os: [ ubuntu-22.04, ubuntu-20.04, macos-11, windows-2019 ]
+        os: [ ubuntu-22.04, ubuntu-20.04, macos-13, windows-2019 ]
 
     steps:
     - name: OS
       run: echo ${{ runner.os }} ${{ matrix.os }}
     - name: Set up JDK 18
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 18
         distribution: corretto
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{env.dotnet-version}}
     - name: Load Z3
@@ -85,13 +85,13 @@ jobs:
         excludes: prerelease, draft
     - name: Verify Dafny version
       if: "${{ steps.dafny.outputs.release != '' }}"
-      run: version="${{ steps.dafny.outputs.release }}"; dafny -version | grep -iE "Dafny "${version:1}".[0-9]{5}"
+      run: version="${{ steps.dafny.outputs.release }}"; dafny -version | grep -iE "Dafny "${version:1}".[0-9]+"
       shell: bash
     ## Check that a simple program compiles and runs on each supported platform
     ## Now that the dotnet tool distribution doesn't include the Scripts,
     ## so we need to clone the repository to get them.
     - name: Checkout Dafny
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: recursive
         path: dafny-repo
@@ -111,7 +111,7 @@ jobs:
         # but note we need to skip Dafny since nuget install doesn't work for dotnet tools.
         library-name: [ DafnyPipeline, DafnyServer, DafnyLanguageServer, DafnyRuntime, DafnyCore, DafnyDriver ]
         # This workflow breaks on windows-2022: https://github.com/dafny-lang/dafny/issues/1906
-        os: [ ubuntu-latest, ubuntu-20.04, macos-latest, windows-2019 ]
+        os: [ ubuntu-latest, ubuntu-20.04, macos-13, windows-2019 ]
 
     steps:
     # Verify that the dependencies of the libraries we publish (e.g. DafnyLanguageServer)
diff --git a/.github/workflows/release-downloads.yml b/.github/workflows/release-downloads.yml
index 8cac8cd3ac8..74c68178672 100644
--- a/.github/workflows/release-downloads.yml
+++ b/.github/workflows/release-downloads.yml
@@ -18,14 +18,14 @@ jobs:
       fail-fast: false
       matrix:
         # This workflow breaks on windows-2022: https://github.com/dafny-lang/dafny/issues/1906
-        os: [ ubuntu-latest, ubuntu-20.04, macos-latest, windows-2019 ]
+        os: [ ubuntu-latest, ubuntu-20.04, macos-13, windows-2019 ]
         include:
         - os:  'ubuntu-latest'
           osn: 'ubuntu-20.04'
         - os:  'ubuntu-20.04'
           osn: 'ubuntu-20.04'
-        - os:  'macos-latest'
-          osn: 'x64-macos-11'
+        - os:  'macos-13'
+          osn: 'x64-macos-13'
         - os:  'windows-2019'
           osn: 'windows-2019'
     # There is no hosted environment for Ubuntu 14.04 or for debian
@@ -36,7 +36,7 @@ jobs:
     - name: OS
       run: echo ${{ runner.os }} ${{ matrix.os }}
     - name: Set up JDK 18
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 18
         distribution: corretto
diff --git a/.github/workflows/runtime-tests.yml b/.github/workflows/runtime-tests.yml
index ad927af4867..0d5888a133d 100644
--- a/.github/workflows/runtime-tests.yml
+++ b/.github/workflows/runtime-tests.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
   pull_request:
     branches: [ master, main-* ]
-
+  merge_group:
+  
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -12,8 +13,6 @@ concurrency:
 jobs:
   check-deep-tests:
      uses: ./.github/workflows/check-deep-tests-reusable.yml
-     with:
-       branch: master
 
   build:
     needs: check-deep-tests
@@ -23,14 +22,29 @@ jobs:
 
     steps:
       - name: Checkout Dafny
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
+      # The Windows image was recently updated with a .NET 9 CLI which made CI fail, 
+      # We added a global.json to force it to use any .NET CLI with 8 as a major version
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
       - name: Set up JDK 18
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 18
           distribution: corretto
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+          cache: false
+      - name: Set up goimports
+        env:
+          GO111MODULE: on
+        run: go install golang.org/x/tools/cmd/goimports@latest
       - name: Build Dafny
         run: dotnet build Source/Dafny.sln
       - name: Get Z3
@@ -40,18 +54,36 @@ jobs:
           cd ./Source/DafnyCore
           make test
           make check-format
+          make check-extract
+      - name: Test DafnyRuntime (C#, Rust)
+        run: |
+          cd ./Source/DafnyRuntime
+          make all
       - name: Test DafnyRuntimeDafny
         run: |
           cd ./Source/DafnyRuntime/DafnyRuntimeDafny
-          make test
-          make check-format
+          make all
       - name: Test DafnyRuntimeGo
         run: |
           cd ./Source/DafnyRuntime/DafnyRuntimeGo
-          make test
-      # This isn't strictly necessary since the Java runtime has to be built into a jar,
-      # which also runs the tests.
-      # But I prefer the simplicity of testing every testable runtime in this workflow
+          make all
+      - name: Test DafnyRuntimeGo-gomod
+        run: |
+          cd ./Source/DafnyRuntime/DafnyRuntimeGo-gomod
+          make all
       - name: Test DafnyRuntimeJava
-        run: ./Source/DafnyRuntime/DafnyRuntimeJava/gradlew -p ./Source/DafnyRuntime/DafnyRuntimeJava test
-      
+        run: |
+          cd ./Source/DafnyRuntime/DafnyRuntimeJava
+          make all
+      - name: Test DafnyRuntimePython
+        run: |
+          cd ./Source/DafnyRuntime/DafnyRuntimePython
+          make all
+      - name: Test DafnyRuntimeJs
+        run: |
+          cd ./Source/DafnyRuntime/DafnyRuntimeJs
+          make all
+      - name: Test DafnyRuntimeRust
+        run: |
+          cd ./Source/DafnyRuntime/DafnyRuntimeRust
+          make all
diff --git a/.github/workflows/standard-libraries.yml b/.github/workflows/standard-libraries.yml
new file mode 100644
index 00000000000..dd966bbc82f
--- /dev/null
+++ b/.github/workflows/standard-libraries.yml
@@ -0,0 +1,48 @@
+name: Build and Test Dafny Standard Libraries
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [ master, main-* ]
+  merge_group:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check-deep-tests:
+     uses: ./.github/workflows/check-deep-tests-reusable.yml
+
+  build:
+    needs: check-deep-tests
+    if: always() && (( github.event_name == 'pull_request' && (needs.check-deep-tests.result == 'success' || contains(github.event.pull_request.labels.*.name, 'run-deep-tests'))) || ( github.event_name == 'push' && ( github.ref_name == 'master' || vars.TEST_ON_FORK == 'true' )))
+    runs-on: macos-13
+
+    steps:
+      - name: Checkout Dafny
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Set up JDK 18
+        uses: actions/setup-java@v4
+        with:
+          java-version: 18
+          distribution: corretto
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+          cache: false
+      - name: Set up goimports
+        env:
+          GO111MODULE: on
+        run: go install golang.org/x/tools/cmd/goimports@latest
+      - name: Build Dafny
+        run: dotnet build Source/Dafny.sln
+      - name: Get Z3
+        run: make z3-mac
+      - run: npm install bignumber.js
+      - name: Test DafnyStandardLibraries
+        run: make -C Source/DafnyStandardLibraries all
+      
diff --git a/.github/workflows/test-report.yml b/.github/workflows/test-report.yml
index 29508c1a211..167889f4b90 100644
--- a/.github/workflows/test-report.yml
+++ b/.github/workflows/test-report.yml
@@ -14,7 +14,7 @@ jobs:
     if: always()
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
diff --git a/.github/workflows/xunit-tests-reusable.yml b/.github/workflows/xunit-tests-reusable.yml
index dff2b0da5a7..d6b768e6f3a 100644
--- a/.github/workflows/xunit-tests-reusable.yml
+++ b/.github/workflows/xunit-tests-reusable.yml
@@ -2,7 +2,17 @@ name: Run XUnit tests
 
 on:
   workflow_dispatch:
+    inputs:
+      soak_test:
+        required: false
+        type: boolean
+        default: false
   workflow_call:
+    inputs:
+      soak_test:
+        required: false
+        type: boolean
+        default: false
 
 ## In the matrix:
 ##  os - name of the Github actions runner
@@ -15,15 +25,34 @@ defaults:
     working-directory: dafny
 
 jobs:
+  populate-matrix-dimensions:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Populate iterations (normal mode)
+        id: populate-iterations-normal
+        if: "!inputs.soak_test"
+        working-directory: .
+        run: echo "iterations=[1]" >> $GITHUB_OUTPUT
+      - name: Populate iterations (soak test mode)
+        id: populate-iterations-soak
+        if: inputs.soak_test
+        working-directory: .
+        run: echo "iterations=[`seq -s , 1 5`]" >> $GITHUB_OUTPUT
+    outputs:
+      iterations: ${{ steps.populate-iterations-normal.outputs.iterations }} ${{ steps.populate-iterations-soak.outputs.iterations }}
+  
   build:
+    needs: populate-matrix-dimensions
     runs-on: ${{matrix.os}}
     timeout-minutes: 60
-    name: ${{matrix.suffix}}
+    name: ${{matrix.suffix}} (${{matrix.iteration}})
     strategy:
       fail-fast: false
       matrix:
+        os: [ubuntu-20.04, windows-2019, macos-13]
+        iteration: ${{ fromJson(needs.populate-matrix-dimensions.outputs.iterations) }}
         include:
-          - os: macos-11
+          - os: macos-13
             suffix: osx
             chmod: true
           - os: windows-2019
@@ -34,17 +63,17 @@ jobs:
             chmod: true
     env:
       solutionPath: Source/Dafny.sln
-      z3BaseUri: https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2023-08-02
+      z3BaseUri: https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2024-04-10
       Logging__LogLevel__Microsoft: Debug
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: dafny
         submodules: recursive
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: |
         dotnet restore ${{env.solutionPath}}
@@ -66,27 +95,34 @@ jobs:
     - name: Build
       run: dotnet build --no-restore ${{env.solutionPath}}
     - name: Run DafnyCore Tests
-      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" Source/DafnyCore.Test
+      if: "!inputs.soak_test"
+      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" --settings Source/DafnyCore.Test/coverlet.runsettings Source/DafnyCore.Test
+    - name: Run DafnyLanguageServer Tests (soak test - iteration ${{matrix.iteration}})
+      if: inputs.soak_test
+      run: |
+        dotnet test --no-restore --blame-crash --blame-hang-timeout 360s --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" --settings Source/DafnyLanguageServer.Test/coverlet.runsettings Source/DafnyLanguageServer.Test
     - name: Run DafnyLanguageServer Tests
+      if: "!inputs.soak_test"
       run: |
-        ## Run twice to catch unstable code (Issue #2673)
-        dotnet test --no-restore --blame-hang-timeout 360s --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" Source/DafnyLanguageServer.Test
-        ## On the second run, collect test coverage data
         ##  Note that, for some mysterious reason, --collect doesn't work with the DafnyLanguageServer.Test package
         dotnet coverage collect -o DafnyLanguageServer.Test.coverage dotnet test --no-restore --blame-hang-timeout 360s --logger "console;verbosity=normal" --logger trx Source/DafnyLanguageServer.Test
-
     - name: Run DafnyDriver Tests
-      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" Source/DafnyDriver.Test
+      if: "!inputs.soak_test"
+      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" --settings Source/DafnyDriver.Test/coverlet.runsettings Source/DafnyDriver.Test
     - name: Run DafnyPipeline Tests
-      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" Source/DafnyPipeline.Test
+      if: "!inputs.soak_test"
+      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" --settings Source/DafnyPipeline.Test/coverlet.runsettings Source/DafnyPipeline.Test
     - name: Run DafnyTestGeneration Tests
-      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" Source/DafnyTestGeneration.Test
+      if: "!inputs.soak_test"
+      run: dotnet test --no-restore --blame-hang-timeout 5m --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" --settings Source/DafnyTestGeneration.Test/coverlet.runsettings Source/DafnyTestGeneration.Test
     - name: Run AutoExtern Tests
-      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" Source/AutoExtern.Test
+      if: "!inputs.soak_test"
+      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" --settings Source/AutoExtern.Test/coverlet.runsettings Source/AutoExtern.Test
     - name: Run DafnyRuntime Tests
-      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" Source/DafnyRuntime.Tests
-    - uses: actions/upload-artifact@v3
-      if: always()
+      if: "!inputs.soak_test"
+      run: dotnet test --no-restore --logger "console;verbosity=normal" --logger trx --collect:"XPlat Code Coverage" --settings Source/DafnyRuntime.Tests/coverlet.runsettings Source/DafnyRuntime.Tests
+    - uses: actions/upload-artifact@v4
+      if: always() && !inputs.soak_test
       with:
         name: unit-test-results-${{ matrix.os }}
         path: |
diff --git a/.gitignore b/.gitignore
index 1a7a01535f0..bb6f6c501c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,6 @@ Source/DafnyCore/Scanner.cs.old
 
 Source/DafnyRuntime/MSBuild_Logs/
 TestResults/
-Test/.lit_test_times.txt
 
 Docs/OnlineTutorial/DocumentationTransducer.exe
 Docs/OnlineTutorial/DocumentationTransducer.pdb
@@ -58,6 +57,9 @@ Source/.vs
 # Generated by VS Code
 .vscode/*
 
+# Generated by Dafny tooling
+/Source/DafnyStandardLibraries/build
+
 # Generated by Java tools (gradle/javac/etc)
 
 /Source/DafnyRuntime/DafnyRuntimeJava/.gradle
@@ -70,3 +72,22 @@ package-lock.json
 docs/dev/*.fix
 docs/dev/*.feat
 docs/dev/*.break
+
+Source/IntegrationTests/TestFiles/LitTests/LitTest/server/*.bvd
+/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/Inputs/wrappers3.doo
+/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Build1
+/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/assumptions-lib
+/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/log.smt2
+/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/model
+Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/*.html
+Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/**/*.html
+Source/IntegrationTests/TestFiles/LitTests/LitTest/**/*.dtr
+/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/usesLibrary-lib
+/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/usesLibrary.doo
+Source/IntegrationTests/TestFiles/LitTests/LitTest/**/*.deps.json
+Source/IntegrationTests/TestFiles/LitTests/LitTest/**/*.csproj
+/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule2
+/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/PythonModule1
+/Source/DafnyCore/Prelude/DafnyPrelude.bpl
+/Source/DafnyCore/Prelude/Sequences.bpl
+/venv
diff --git a/.gitmodules b/.gitmodules
index 90ba01b0d54..e69de29bb2d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "Test/libraries"]
-	path = Test/libraries
-	url = https://github.com/dafny-lang/libraries.git
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7dff2b96253..f4cdfba04b2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,5 +4,6 @@ repos:
     -   id: dotnet-format
         name: dotnet-format
         language: system
-        entry: dotnet tool run dotnet-format --folder -w --include
+        entry: dotnet format whitespace Source/Dafny.sln -v:d --include
+        exclude: 'Source/DafnyCore/Scanner.cs|Source/DafnyCore/Parser.cs|.git/modules/Source/boogie|Source/DafnyCore/GeneratedFromDafny|Source/DafnyCore.Test/GeneratedFromDafny|Source/DafnyRuntime/DafnyRuntimeSystemModule.cs'
         types_or: ["c#"]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e8ab3a05586..ddaf0541814 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,17 +30,17 @@ If you want to propose code changes for the Dafny project, please note:
 - To propose code changes, use the standard Github multi-user project process, which is described for Dafny on the [wiki](https://github.com/dafny-lang/dafny/wiki/Setting-up-a-development-copy-of-Dafny).
 
 If your change is user-visible, then part of the PR should be corresponding changes to the
-[`RELEASE_NOTES.md`](../RELEASE_NOTES.md) file and to the 
+[`RELEASE_NOTES.md`](./RELEASE_NOTES.md) file (by following [this](./docs/dev/README.md)) and to the 
 [Dafny Reference Manual](./docs/DafnyRef).
 
 Any PR should have tests that check whether the bug-fix fixes the problem addressed or that the new functionality 
 is properly working.
 
-  - Dafny's integration tests are in [`Test`](../Test).  PRs that fix issues reported on GitHub should include a test in [`Test/git-issues/`](../Test/git-issues/).
+  - Dafny's integration tests are in [this directory](Source/IntegrationTests/TestFiles/LitTests/LitTest).  PRs that fix issues reported on GitHub should include a test under [`git-issues/`](Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/).
 
-    Each `.dfy` file in `Test/` is a test, with a  [`lit`](https://llvm.org/docs/CommandGuide/lit.html) header describing how to run it and a `.expect` file indicating the expected output.  See [`Test/README.md`](../Test/README.md) for more info on running Dafny' integration tests.
+    Each `.dfy` file in this directory is a test, with a  [`lit`](https://llvm.org/docs/CommandGuide/lit.html) header describing how to run it and a `.expect` file indicating the expected output.  See [this README.md file](Source/IntegrationTests/TestFiles/LitTests/LitTest/README.md) for more info on running Dafny' integration tests.
 
-  - Dafny's unit tests are in various `*.Test` directories in [`Source`](../Source).
+  - Dafny's unit tests are in various `*.Test` directories in [`Source`](./Source).
 
   Our CI is configured to run all tests when you create a PR.  To run tests locally, use `dotnet test Source/Dafny.sln` (but note that running the tests for our compiler backends requires installing lots of additional software).
 
@@ -74,7 +74,7 @@ After doing these steps once, for other PRs, one only needs to re-run deep check
 - If some required tests fail, investigate and push more commits, but know that each CI run takes a lot of time, so try to fix the problem with as few commits as possible (ideally 1)
   It is also possible you find some tests that fail randomly, in that case, re-run them and report to the team. Avoid using the re-run all failed jobs here, because it will re-run _all_ jobs, so select them individually instead.
 - Have someone approve the PR and merge it (or auto-merge).
-- Once the PR with the fix to the CI is merged to master, go to https://github.com/dafny-lang/dafny/actions/workflows/deep-tests.yml
+- Once the PR with the fix to the CI is merged to master, go to https://github.com/dafny-lang/dafny/actions/workflows/nightly-build.yml
 - Select "Run workflow..."
 - Select master
 - Wait for this new run to succeed.
@@ -85,7 +85,7 @@ Subsequent CI runs should pick up the successful `deep-tests` run and make the `
 ### How can I write portions of Dafny in Dafny itself?
 
 Since https://github.com/dafny-lang/dafny/pull/2399, it is possible to add \*.dfy files next to other source files.
-The plugin `dafny-msbuild` takes all the dafny files and compiles them into a single file `Source/DafnyCore/obj/Debug/net6.0/GeneratedFromDafny.cs`
+The plugin `dafny-msbuild` takes all the dafny files and compiles them into a single file `Source/DafnyCore/obj/Debug/net8.0/GeneratedFromDafny.cs`
 that is automatically included in the build process. This file contains also the Dafny run-time in C#.
 One example of such file is `Source/DafnyCore/AST/Formatting.dfy`, and you can use it as a starting point.
 
@@ -101,3 +101,9 @@ For example, `Formatting.dfy`
 ### What is the release process?
 
 You can find a description of the release process in [docs/dev/RELEASE.md](https://github.com/dafny-lang/dafny/blob/master/docs/dev/RELEASE.md).
+
+### Backwards compatibility
+
+Dafny is still changing and backwards incompatible changes may be made. Any backwards compatibility breaking change must be easy to adapt to, such as by adding a command line option. In the future, we plan to add a `dafny migrate` command which should support migrating any Dafny codebase from the previous to the current CLI version. 
+
+As rule, Dafny features must be marked as deprecated, including migration instructions, at least one release before they are removed.
diff --git a/Makefile b/Makefile
index fbd17ba228c..5d526d9ffd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,71 +1,132 @@
-DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+# Run these tasks even if eponymous files or folders exist
+.PHONY: test-dafny exe
+
+DIR=$(realpath $(dir $(firstword $(MAKEFILE_LIST))))
 
 default: exe
 
 all: exe refman
 
 exe:
-	(cd ${DIR} ; dotnet build Source/Dafny.sln ) ## includes parser
+	(cd "${DIR}" ; dotnet build Source/Dafny.sln ) ## includes parser
+
+format-dfy:
+	(cd "${DIR}"/Source/DafnyCore ; make format)
+	(cd "${DIR}"/Source/DafnyStandardLibraries ; make format)
+
+dfy-to-cs: 
+	(cd "${DIR}"/Source/DafnyCore ; bash DafnyGeneratedFromDafny.sh)
+
+dfy-to-cs-exe: dfy-to-cs
+	(cd "${DIR}" ; dotnet build Source/Dafny.sln )
+
+dfy-to-cs-noverify:
+	(cd "${DIR}"/Source/DafnyCore ; bash DafnyGeneratedFromDafny.sh --no-verify)
+
+dfy-to-cs-noverify-exe: dfy-to-cs-noverify exe
 
 boogie: ${DIR}/boogie/Binaries/Boogie.exe
 
 tests:
-	(cd ${DIR}; dotnet test Source/IntegrationTests)
+	(cd "${DIR}"; dotnet test Source/IntegrationTests)
+
+# make test name=<integration test filter>
+# make test name=<integration test filter> update=true                to update the test
+# make test name=<integration test filter>              build=false   don't build the solution
+test:
+	@DIR="$(DIR)" name="$(name)" update="$(update)" build="$(build)" bash scripts/test.sh
+
+# Run Dafny on an integration test case directly in the folder itself.
+# make test-dafny name=<part of the path> action="run ..." [build=false]
+test-dafny:
+	@name="$(name)" DIR="$(DIR)" action="$(action)" NO_BUILD=$$( [ "${build}" = "false" ] && echo "true" || echo "false" ) bash scripts/test-dafny.sh
 
 tests-verbose:
-	(cd ${DIR}; dotnet test --logger "console;verbosity=normal" Source/IntegrationTests )
+	(cd "${DIR}"; dotnet test --logger "console;verbosity=normal" Source/IntegrationTests )
 
 ${DIR}/boogie/Binaries/Boogie.exe:
-	(cd ${DIR}/boogie ; dotnet build -c Release Source/Boogie.sln )
+	(cd "${DIR}"/boogie ; dotnet build -c Release Source/Boogie.sln )
 
 refman: exe
-	make -C ${DIR}/docs/DafnyRef
+	make -C "${DIR}"/docs/DafnyRef
 
 refman-release: exe
-	make -C ${DIR}/docs/DafnyRef release
+	make -C "${DIR}"/docs/DafnyRef release
 
 z3-mac:
-	mkdir -p ${DIR}Binaries/z3/bin
+	mkdir -p "${DIR}"/Binaries/z3/bin
 	wget https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2023-08-02/z3-4.12.1-x64-macos-11-bin.zip
 	unzip z3-4.12.1-x64-macos-11-bin.zip
 	rm z3-4.12.1-x64-macos-11-bin.zip
 	wget https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2023-08-02/z3-4.8.5-x64-macos-11-bin.zip
 	unzip z3-4.8.5-x64-macos-11-bin.zip
 	rm z3-4.8.5-x64-macos-11-bin.zip
-	mv z3-* ${DIR}/Binaries/z3/bin/
-	chmod +x ${DIR}/Binaries/z3/bin/z3-*
+	mv z3-* "${DIR}"/Binaries/z3/bin/
+	chmod +x "${DIR}"/Binaries/z3/bin/z3-*
 
 z3-mac-arm:
-	mkdir -p ${DIR}Binaries/z3/bin
+	mkdir -p "${DIR}"/Binaries/z3/bin
 	wget https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2023-08-02/z3-4.12.1-arm64-macos-11-bin.zip
 	unzip z3-4.12.1-arm64-macos-11-bin.zip
 	rm z3-4.12.1-arm64-macos-11-bin.zip
 	wget https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2023-08-02/z3-4.8.5-x64-macos-11-bin.zip
 	unzip z3-4.8.5-x64-macos-11-bin.zip
 	rm z3-4.8.5-x64-macos-11-bin.zip
-	mv z3-* ${DIR}/Binaries/z3/bin/
-	chmod +x ${DIR}/Binaries/z3/bin/z3-*
+	mv z3-* "${DIR}"/Binaries/z3/bin/
+	chmod +x "${DIR}"/Binaries/z3/bin/z3-*
 
 z3-ubuntu:
-	mkdir -p ${DIR}Binaries/z3/bin
+	mkdir -p "${DIR}"/Binaries/z3/bin
 	wget https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2023-08-02/z3-4.12.1-x64-ubuntu-20.04-bin.zip
 	unzip z3-4.12.1-x64-ubuntu-20.04-bin.zip
 	rm z3-4.12.1-x64-ubuntu-20.04-bin.zip
 	wget https://github.com/dafny-lang/solver-builds/releases/download/snapshot-2023-08-02/z3-4.8.5-x64-ubuntu-20.04-bin.zip
 	unzip z3-4.8.5-x64-ubuntu-20.04-bin.zip
 	rm z3-4.8.5-x64-ubuntu-20.04-bin.zip
-	mv z3-* ${DIR}/Binaries/z3/bin/
-	chmod +x ${DIR}/Binaries/z3/bin/z3-*
+	mv z3-* "${DIR}"/Binaries/z3/bin/
+	chmod +x "${DIR}"/Binaries/z3/bin/z3-*
 
 format:
-	dotnet tool run dotnet-format -w -s error Source/Dafny.sln --exclude DafnyCore/Scanner.cs --exclude DafnyCore/Parser.cs --exclude DafnyCore/GeneratedFromDafny.cs --exclude DafnyCore/GeneratedFromDafnyRust.cs
+	dotnet format whitespace Source/Dafny.sln --exclude Source/DafnyCore/Scanner.cs --exclude Source/DafnyCore/Parser.cs --exclude boogie --exclude Source/DafnyCore/GeneratedFromDafny/* --exclude Source/DafnyCore.Test/GeneratedFromDafny/* --exclude Source/DafnyRuntime/DafnyRuntimeSystemModule.cs
 
 clean:
-	(cd ${DIR}; cd Source; rm -rf Dafny/bin Dafny/obj DafnyDriver/bin DafnyDriver/obj DafnyRuntime/obj DafnyRuntime/bin DafnyServer/bin DafnyServer/obj DafnyPipeline/obj DafnyPipeline/bin DafnyCore/obj DafnyCore/bin)
-	(cd ${DIR} ; dotnet build Source/Dafny.sln -v:q --nologo -target:clean )
-	make -C ${DIR}/Source/DafnyCore -f Makefile clean
-	(cd ${DIR}/Source/Dafny && rm -rf Scanner.cs Parser.cs obj )
-	(cd ${DIR}/Source/DafnyRuntime/DafnyRuntimeJava; ./gradlew clean)
-	make -C ${DIR}/docs/DafnyRef clean
-	(cd ${DIR}; cd Source; rm -rf Dafny/bin Dafny/obj DafnyDriver/bin DafnyDriver/obj DafnyRuntime/obj DafnyRuntime/bin DafnyServer/bin DafnyServer/obj DafnyPipeline/obj DafnyPipeline/bin DafnyCore/obj DafnyCore/bin)
+	(cd "${DIR}"; cd Source; rm -rf Dafny/bin Dafny/obj DafnyDriver/bin DafnyDriver/obj DafnyRuntime/obj DafnyRuntime/bin DafnyServer/bin DafnyServer/obj DafnyPipeline/obj DafnyPipeline/bin DafnyCore/obj DafnyCore/bin)
+	(cd "${DIR}" ; dotnet build Source/Dafny.sln -v:q --nologo -target:clean )
+	make -C "${DIR}"/Source/DafnyCore -f Makefile clean
+	(cd "${DIR}"/Source/Dafny && rm -rf Scanner.cs Parser.cs obj )
+	(cd "${DIR}"/Source/DafnyRuntime/DafnyRuntimeJava; ./gradlew clean)
+	make -C "${DIR}"/docs/DafnyRef clean
+	(cd "${DIR}"; cd Source; rm -rf Dafny/bin Dafny/obj DafnyDriver/bin DafnyDriver/obj DafnyRuntime/obj DafnyRuntime/bin DafnyServer/bin DafnyServer/obj DafnyPipeline/obj DafnyPipeline/bin DafnyCore/obj DafnyCore/bin)
 	echo Source/*/bin Source/*/obj
+
+bumpversion-test:
+	node ./Scripts/bump_version_number.js --test 1.2.3
+
+update-cs-module:
+	(cd "${DIR}"; cd Source/DafnyRuntime; make update-system-module)
+
+update-rs-module:
+	(cd "${DIR}"; cd Source/DafnyRuntime/DafnyRuntimeRust; make update-system-module)
+
+update-go-module:
+	(cd "${DIR}"; cd Source/DafnyRuntime/DafnyRuntimeGo; make update-system-module)
+
+update-runtime-dafny:
+	(cd "${DIR}"; cd Source/DafnyRuntime/DafnyRuntimeDafny; make update-go)
+
+pr-nogeneration: format-dfy format update-runtime-dafny update-cs-module update-rs-module update-go-module
+
+update-standard-libraries:
+	(cd "${DIR}"; cd Source/DafnyStandardLibraries; make update-binary)
+
+# `make pr` will bring you in a state suitable for submitting a PR
+# - Builds the Dafny executable
+# - Use the build to convert core .dfy files to .cs
+# - Rebuilds the Dafny executable with this .cs files
+# - Apply dafny format on all dfy files
+# - Apply dotnet format on all cs files except the generated ones
+# - Rebuild the Go and C# runtime modules as needed.
+pr: exe dfy-to-cs-exe pr-nogeneration
+
+# Same as `make pr` but useful when resolving conflicts, to take the last compiled version of Dafny first
+pr-conflict: dfy-to-cs-exe dfy-to-cs-exe pr-nogeneration
diff --git a/README.md b/README.md
index 85b5d451cc3..065b4134367 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+# Dafny
+
 [![Build and Test](https://github.com/dafny-lang/dafny/workflows/Build%20and%20Test/badge.svg)](https://github.com/dafny-lang/dafny/actions?query=workflow%3A%22Build+and+Test%22) [![Gitter](https://badges.gitter.im/dafny-lang/community.svg)](https://gitter.im/dafny-lang/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Dafny is a **verification-ready programming language**. As you type in your program, Dafny's verifier constantly looks over your shoulder, flags any errors, shows you counterexamples, and congratulates you when your code matches your specifications. When you're done, Dafny can **compile your code to C#, Go, Python, Java, or JavaScript** (more to come!), so it can integrate with your existing workflow.
@@ -19,29 +21,29 @@ This github site contains these materials:
 * the [issue tracker](https://github.com/dafny-lang/dafny/issues)
 * the wiki, including [frequently asked questions](https://github.com/dafny-lang/dafny/wiki/FAQ)
 
-Documentation about the dafny language and tools is located
+Documentation about the Dafny language and tools is located
 [here](https://dafny-lang.github.io/dafny).
 A reference manual is available both [online](https://dafny-lang.github.io/dafny/DafnyRef/DafnyRef) and as [pdf](https://github.com/dafny-lang/dafny/blob/master/docs/DafnyRef/out/DafnyRef.pdf). (A LaTeX version can be produced if needed.)
 
-# Community
+## Community
 
-You can ask questions about Dafny on [Stack Overflow](https://stackoverflow.com/questions/tagged/dafny) or participate in general discussion on Dafny's [![Gitter](https://badges.gitter.im/dafny-lang/community.svg)](https://gitter.im/dafny-lang/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge).
+Feel free to report issues here on GitHub or to ask for questions on our :speech_balloon: [Zulip](https://dafny.zulipchat.com/) channel. 
 
-# Try Dafny
+## Try Dafny
 
 The easiest way to try out Dafny is to [install Dafny on your own machine in Visual Studio Code](https://github.com/dafny-lang/dafny/wiki/INSTALL#visual-studio-code)
 and follow along with the [Dafny tutorial](https://dafny-lang.github.io/dafny/OnlineTutorial/guide).
 You can also [download and install](https://github.com/dafny-lang/dafny/wiki/INSTALL#install-the-binaries) the Dafny CLI if you prefer to work from the command line.
 
-# Read more
+## Read more
 
 Here are some ways to get started with Dafny:
 
 * 4-part course on the _Basics of specification and verification of code_:
-  - Lecture 0: [Pre- and postconditions](https://youtu.be/oLS_y842fMc) (19:08)
-  - Lecture 1: [Invariants](https://youtu.be/J0FGb6PyO_k) (20:56)
-  - Lecture 2: [Binary search](https://youtu.be/-_tx3lk7yn4) (21:14)
-  - Lecture 3: [Dutch National Flag algorithm](https://youtu.be/dQC5m-GZYbk) (20:33)
+  * Lecture 0: [Pre- and postconditions](https://youtu.be/oLS_y842fMc) (19:08)
+  * Lecture 1: [Invariants](https://youtu.be/J0FGb6PyO_k) (20:56)
+  * Lecture 2: [Binary search](https://youtu.be/-_tx3lk7yn4) (21:14)
+  * Lecture 3: [Dutch National Flag algorithm](https://youtu.be/dQC5m-GZYbk) (20:33)
 * New overview article: [Accessible Software Verification with Dafny](https://www.computer.org/csdl/mags/so/2017/06/mso2017060094-abs.html), IEEE Software, Nov/Dec 2017
 * [Online tutorial](https://dafny-lang.github.io/dafny/OnlineTutorial/guide), focusing mostly on simple imperative programs
 * [3-page tutorial notes](http://leino.science/papers/krml233.pdf) with examples (ICSE 2013)
@@ -49,7 +51,7 @@ Here are some ways to get started with Dafny:
 * Language reference for the [Dafny type system](http://leino.science/papers/krml243.html), which also describes available expressions for each type
 * [Cheatsheet](https://docs.google.com/document/d/1kz5_yqzhrEyXII96eCF1YoHZhnb_6dzv-K3u79bMMis/edit?pref=2&pli=1): basic Dafny syntax on two pages
 * Dafny Reference Manual [[html](https://dafny-lang.github.io/dafny/DafnyRef/DafnyRef)] [[pdf](https://github.com/dafny-lang/dafny/blob/master/docs/DafnyRef/out/DafnyRef.pdf)]
-* [Dafny libraries](https://github.com/dafny-lang/libraries), a standard library of useful Dafny functions and lemmas
+* [Dafny libraries](Source/DafnyStandardLibraries/README.md), a standard library of useful Dafny functions and lemmas
 * [Dafny Power User](http://leino.science/dafny-power-user)
 * Videos at [Verification Corner](https://www.youtube.com/channel/UCP2eLEql4tROYmIYm5mA27A)
 * [Blog](https://dafny.org/blog)
@@ -63,18 +65,18 @@ The language itself draws pieces of influence from:
 * ML (like the module system, and its functions and inductive datatypes), and
 * Coq and VeriFast (like the ability to include co-inductive datatypes and being able to write inductive and co-inductive proofs).
 
-# External contributions
+## External contributions
 
 * [Haskell-to-Dafny translator](http://www.doc.ic.ac.uk/~dcw/h2d.cgi), by Duncan White
 * [Vim-loves-Dafny mode](https://github.com/mlr-msft/vim-loves-dafny) for vim, by Michael Lowell Roberts
 * [Boogie-Friends Emacs mode](https://github.com/boogie-org/boogie-friends)
 
-# Contributors
+## Contributors
 
 Information and instructions for potential contributors are provided [here](CONTRIBUTING.md).
 
-# License
+## License
 
 Dafny itself is licensed under the MIT license. (See `LICENSE.txt` in the root
 directory for details.) The subdirectory `Source/Dafny/Coco` contains third
-party material; see `Source/Dafny/Coco/LICENSE.txt` for more details.
+party material; see `Source/DafnyCore/Coco/LICENSE.txt` for more details.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index bdc52048954..120b43fdc64 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -2,6 +2,642 @@
 
 See [docs/dev/news/](docs/dev/news/).
 
+# 4.9.1
+
+## New features
+
+- Introduce the attributes {:isolate} and {:isolate "paths} that simplify the verification of an assertion by introducing additional verification jobs. {:isolate} can be applied to `assert`, `return` and `continue` statements. When using `{:isolate_assertions}` or `--isolate-assertions`, each return statement now creates a separate verification job for each ensures clause. Previously all ensures clauses where verified in a single job, for all return statements. (https://github.com/dafny-lang/dafny/pull/5832)
+
+- Fill in matching patterns for the quantifiers introduced by automatic induction to represent the induction hypothesis. Suppress the generation of the induction hypothesis if no such matching patterns are found. Enhance tooltips accordingly. This feature is added to stabilize verification, but by sometimes not generating induction hypotheses, some automatic proofs may no longer go through. For backward compatibility, use an explicit `{:induction ...}` where `...` is the list of variables to use for the induction-hypothesis quantifier. Additionally, use a  `{:nowarn}` attribute to suppress any warning about lack of matching patterns.
+
+  Improve the selection of induction variables.
+
+  Allow codatatype equality in matching patterns and as a focal predicate for extreme predicates.
+
+  More specifically:
+
+  * If a lemma bears `{:induction x, y, z}`, where `x, y, z` is a subset of the lemma's parameters (in the same order
+     that the lemma gives them), then an induction hypothesis (IH) is generated. The IH quantifies over the
+     given variables.
+
+     For an instance-member lemma, the variables may include the implicit `this` parameter.
+
+     For an extreme lemma, the IH generated is the for corresponding prefix lemma, and the given variables may
+     include the implicit parameter `_k`.
+
+     If good matching patterns are found for the quantifier, then these are indicated in tooltips.
+     If no patterns are found, then a warning is generated; except, if the lemma bears `{:nowarn}`, then only
+     an informational message is given.
+
+  * If a lemma bears `{:induction}` or `{:induction true}`, then a list of induction variables is determined heuristically.
+
+     If the list is empty, then a warning message is generated and no IH is generated. If the list is nonempty,
+     an IH is generated and the list of variables is indicated in a tooltip.
+
+     If good matching patterns are found for the quantifier, then these are indicated in tooltips.
+     If no patterns are found, then a warning is generated; except, if the lemma bears {:nowarn}, then only
+     an informational message is given.
+
+  * If a lemma bears `{:induction false}`, then no IH is generated.
+
+  * If a lemma bears an `:induction` attribute other than those listed above, then an error is generated.
+
+  * If a lemma bears no `:induction` attribute, and the `--manual-lemma-induction` flag is present, then no IH is generated.
+
+  * Otherwise, a list of induction variables is determined heuristically.
+
+     If this list is empty, then no IH is generated and no warning/info is given.
+
+     If the list is nonempty, then the machinery looks for matching patterns for the IH quantifier. If none are
+     found, then no IH is generated.  An informational message is generated, saying which candidate variables were
+     used and saying that no matching patterns were found.
+
+     If patterns are found, then an IH is generated, the list of variables and the patterns are indicated in tooltips,
+     and the patterns are used with the IH quantifier.
+
+     The pattern search can be overriden by providing patterns explicitly using the `{:inductionTrigger}` attribute.
+     This attribute has the same syntax as the `{:trigger}` attribute.  Using an empty list of triggers restores
+     Dafny's legacy behavior (no triggers for lemma induction hypotheses).
+  (https://github.com/dafny-lang/dafny/pull/5835)
+
+- Accept `decreases to` and `nonincreases to` expressions with 0 LHSs and/or 0 RHSs, and allow parentheses to be omitted when there is 1 LHS and 1 RHS. (https://github.com/dafny-lang/dafny/pull/5891)
+
+- Allow forall statements in statement expressions (https://github.com/dafny-lang/dafny/pull/5894)
+
+- When using `--isolate-assertions` or `{:isolate_assertions}`, a separate assertion batch will be generated per pair of return statement and ensures clause. (https://github.com/dafny-lang/dafny/pull/5917)
+
+## Bug fixes
+
+- `{:only}` on members only affects verification on the current file. (https://github.com/dafny-lang/dafny/pull/5730)
+
+- Fixed a bug that caused "hide *" and "reveal *" not to work when used in statement expressions, 
+  after a variable assignment occurred in the same expression.
+  (https://github.com/dafny-lang/dafny/pull/5781)
+
+- Fix malformed Boogie in function override checks (https://github.com/dafny-lang/dafny/pull/5875)
+
+- Fix soundness issue where the verifier had assumed properties of `this` already during the first phase of a constructor (https://github.com/dafny-lang/dafny/pull/5876)
+
+- Don't assume type information before binding variables (for let expressions and named function results) (https://github.com/dafny-lang/dafny/pull/5877)
+
+- Enable using reveal statement expression inside witness expressions (https://github.com/dafny-lang/dafny/pull/5882)
+
+- Fix formatting of var by statements (https://github.com/dafny-lang/dafny/pull/5927)
+
+- Fix bugs that occur when using `{:extern}` to export members (https://github.com/dafny-lang/dafny/pull/5939)
+
+- Fixed a bug that would cause the symbol verification tasks to be done multiple times when using module refinement (https://github.com/dafny-lang/dafny/pull/5967)
+
+- Map range requires equality for enclosing type to support equality (https://github.com/dafny-lang/dafny/pull/5972)
+
+- Improved code navigation for datatype update expressions (https://github.com/dafny-lang/dafny/pull/5986)
+
+# 4.9.0
+
+## New features
+
+- Added opaque blocks to the language. Opaque blocks enable improving verification performance. See the documentation for more details. (https://github.com/dafny-lang/dafny/pull/5761)
+
+- By blocks ("... by { ... }") are now available for assert statements, call statements, and the three types of assignments (:=, :-, :|). Also, by blocks should now be more intuitive since they enable proving any assertions on the left-hand side of the 'by', not just the 'outermost' one. For example, previously `assert 3 / x == 1 by { assume x == 3; }` could still give a possible division by zero error, but now it won't. (https://github.com/dafny-lang/dafny/pull/5779)
+
+- Use --suggest-proof-refactoring to be alerted of function definitions, which have no contribution to a method's proof, and facts, which are only used once in a proof. (https://github.com/dafny-lang/dafny/pull/5812)
+
+- Support for [top-level @-attributes](https://dafny.org/latest/DafnyRef/DafnyRef#sec-at-attributes) (https://github.com/dafny-lang/dafny/pull/5825)
+
+## Bug fixes
+
+- Enable abstract imports to work well with match expression that occur in specifications (https://github.com/dafny-lang/dafny/pull/5808)
+
+- Fix a bug that prevented using reveal statement expressions in the body of a constant. (https://github.com/dafny-lang/dafny/pull/5823)
+
+- Improve performance of `dafny verify` for large applications, by removing memory leaks (https://github.com/dafny-lang/dafny/pull/5827)
+
+- Green gutter icons cover constants without RHS (https://github.com/dafny-lang/dafny/pull/5841)
+
+# 4.8.1
+
+## New features
+
+- feat: allow type parameters of `newtype` declarations
+  feat: support optional `witness` clause of constraint-less `newtype` declarations
+  feat: show tool tips for auto-completed type parameters
+  feat: show tool tips for inferred `(==)` characteristics
+  fix: Don't let `newtype` well-formedness checking affect witness checking (fixes ##5520)
+  fix: Check the emptiness status of constraint-less `newtype` declarations (fixes #5521)
+  (https://github.com/dafny-lang/dafny/pull/5495)
+
+- New feature: model extractor
+
+  ### CLI option
+
+  The `dafny verify` command now has an option `--extract:<file>`, where (just like for the various print options) `<file>` is allowed to be `-` to denote standard output.
+
+  ### Extract mechanism
+
+  Upon successful verification, the new extract mechanism visits the AST of the given program. For any module marked with `{:extract}`, the extract-worthy material from the module is output. The output declarations will be in the same order as they appear textually in the module (in particular, the fact that module-level Dafny declarations are collected in an internal class `_default` has no bearing on the output order).
+
+  Three kinds of declarations are extract-worthy:
+
+  * A type declaration `A<X, Y, Z>` that bears an attribute `{:extract_name B}` is extracted into a Boogie type declaration `type B _ _ _;`.
+
+      The definition of the type is ignored. (The intended usage for an extracted type is that the Dafny program give a definition for the type, which goes to show the existence of such a type.)
+
+  * A function declaration `F(x: X, y: Y): Z` that bears an attribute `{:extract_name G}` is extracted into a Boogie function declaration `function G(x: X, y: Y): Z;`.
+
+      The body of the Dafny function is ignored. (The intended usage for an extracted function is that the Dafny program give a definition for the function, which goes to show the existence of such a function.)
+
+  * A lemma declaration `L(x: X, y: Y) requires P ensures Q` that bears an attribute `{:extract_pattern ...}` or an attribute `{:extract_used_by ...}` is extracted into a Boogie `axiom`. The axiom has the basic form `axiom (forall x: X, y: Y :: P ==> Q);`.
+
+      If the lemma has an attribute `{:extract_used_by F}`, then the axiom will be emitted into the `uses` clause of the Boogie function generated for Dafny function `F`.
+
+      If the lemma has no in-parameters, the axiom is just `P ==> Q`.
+
+      If the lemma has in-parameters, then any attribute `{:extract_pattern E, F, G}` adds a matching pattern `{ E, F, G }` to the emitted quantifier. Also, any attribute `{:extract_attribute "name", E, F, G}` adds an attribute `{:name E, F, G}` to the quantifier.
+
+  ### Expressions
+
+  The pre- and postconditions of extracted lemmas turn into analogous Boogie expressions, and the types of function/lemma parameters and bound variables are extracted into analogous Boogie types. The intended usage of the extract mechanism is that these expressions and types do indeed have analogous Boogie types.
+
+  At this time, only a limited set of expressions and types are supported, but more can be added in the future.
+
+  Any `forall` and `exists` quantifiers in expressions are allowed to use `:extract_pattern` and `:extract_attribute` attributes, as described above for lemmas.
+
+  Some extracted expressions are simplified. For example, `true && !!P` is simplified to `P`.
+
+  ### Soundness
+
+  The Dafny program that is used as input for the extraction is treated like any other Dafny program. The intended usage of the extraction mechanism is to prove parts of the axiomatization in `DafnyPrelude.bpl` to be logically consistent. Whether or not the extracted Boogie declarations meet this goal depends on the given Dafny program. For example, if the given Dafny program formalizes sequences in terms of maps and formalizes maps in terms of sequences, then the extraction probably does not provide guarantees of consistency.
+  (https://github.com/dafny-lang/dafny/pull/5621)
+
+- Dafny-to-Rust: `{:test}` methods generate `#[test]` wrappers in Rust that can be invoked using `cargo test`.
+  Similarly, `{:rust_cfg_test}` on modules generates a `#[cfg(test)]` in the resulting rust module.
+  (https://github.com/dafny-lang/dafny/pull/5676)
+
+## Bug fixes
+
+- Allow hiding instance member using a static reference
+
+- Enable using "hide *" in the context of a recursive function
+
+- Support for double constant initialization in Dafny-to-Rust (https://github.com/dafny-lang/dafny/pull/5642)
+
+- Support for enumerating datatypes in the Rust backend (https://github.com/dafny-lang/dafny/pull/5643)
+
+- Tail-Recursion for the Dafny-to-Rust compiler (https://github.com/dafny-lang/dafny/pull/5647)
+
+- The new resolver (accessible using `--type-system-refresh`) can now handle revealing instance functions using a static receiver, as it is the case for the current resolver (https://github.com/dafny-lang/dafny/pull/5760)
+
+# 4.8.0
+
+## New features
+
+- Introduce `hide` statements that enable hiding the body of a function at a particular proof location, which allows simplifying the verification of that proof in case the body of the function is not needed for the proof. `Hide` statements make the opaque keyword on functions obsolete. (https://github.com/dafny-lang/dafny/pull/5562)
+
+- Let the command `measure-complexity` output which verification tasks performed the worst in terms of resource count. Output looks like:
+  ...
+  Verification task on line 8 in file measure-complexity.dfy consumed 9984 resources
+  Verification task on line 7 in file measure-complexity.dfy consumed 9065 resources
+  ...
+  (https://github.com/dafny-lang/dafny/pull/5631)
+
+- Enable the option `--enforce-determinism` for the commands `resolve` and `verify` (https://github.com/dafny-lang/dafny/pull/5632)
+
+- Method calls get an optional by-proof that hides the precondtion and its proof (https://github.com/dafny-lang/dafny/pull/5662)
+
+## Bug fixes
+
+- Clarify error location of inlined `is` predicates. (https://github.com/dafny-lang/dafny/pull/5587)
+
+- Optimize the compilation of single-LHS assignment statements to allow the RHS to be a deeply nested expression. This solves a problem in compiling to Java, since `javac` does not deal gracefully with nested lambda expressions. (https://github.com/dafny-lang/dafny/pull/5589)
+
+- Crash when compiling an empty source file while including testing code (https://github.com/dafny-lang/dafny/pull/5638)
+
+- Let the options --print-mode=NoGhostOrIncludes and --print-mode=NoIncludes work (https://github.com/dafny-lang/dafny/pull/5645)
+
+- Verification in the IDE now works correctly when declaring nested module in a different file than their parent. (https://github.com/dafny-lang/dafny/pull/5650)
+
+- Fix NRE that would occur when using --legacy-data-constructors (https://github.com/dafny-lang/dafny/pull/5655)
+
+# 4.7.0
+
+## New features
+
+- Add the option --find-project <path> that given a Dafny file traverses up the file tree until it finds a Dafny project that includes that path. This is useful when developing a particular file and doing CLI invocations as part of your development workflow.
+
+- Improved error reporting when verification times out or runs out of resources, so that when using `--isolate-assertions`, the error message points to the problematic assertion. (https://github.com/dafny-lang/dafny/pull/5281)
+
+- Support newtypes based on map and imap (https://github.com/dafny-lang/dafny/pull/5175)
+
+- To enable smoothly working with multiple projects inside a single repository, Dafny now allows using a Dafny project file as an argument to `--library`. When using `dafny verify`, Dafny ensures that any dependencies specified through a project are verified as well, unless using the flag `--dont-verify-dependencies`. (https://github.com/dafny-lang/dafny/pull/5297)
+
+- Experimental Dafny-to-Rust compiler development
+  - Supports emitting code even if malformed with option `--emit-uncompilable-code`.
+  - Supports for immutable collections and operators
+  (https://github.com/dafny-lang/dafny/pull/5081)
+
+- Allow for plugins to add custom request handlers to the language server. (https://github.com/dafny-lang/dafny/pull/5161)
+
+- Deprecated the unicode-char option (https://github.com/dafny-lang/dafny/pull/5302)
+
+- Warn when passing a Dafny source file to `--library` (https://github.com/dafny-lang/dafny/pull/5313)
+
+- Add support for "translation records", which record the options used when translating library code.
+  * `--translation-record` - Provides a `.dtr` file from a previous translation of library code. Can be specified multiple times.
+  * `--translation-record-output` - Customizes where to write the translation record for the current translation. Defaults to the output directory.
+  Providing translation records is necessary to handle options such as `--outer-module` that affect how code is translated.
+  (https://github.com/dafny-lang/dafny/pull/5346)
+
+- The new `decreases to` expression makes it possible to write an explicit assertion equivalent to the internal check Dafny does to prove that a loop or recursive call terminates. (https://github.com/dafny-lang/dafny/pull/5367)
+
+- The new `assigned` expression makes it possible to explicitly assert that a variable, constant, out-parameter, or object field is definitely assigned. (https://github.com/dafny-lang/dafny/pull/5501)
+
+- Greatly reduced the size of generated code for the backends: C#, Python, GoLang and JavaScript.
+
+- Introduce additional warnings that previously only appeared when running the `dafny audit` command. Two warnings are as follows:
+  - Emit a warning when exporting a declaration that has requires clauses or subset type inputs
+  - Emit a warning when importing a declaration that has ensures clauses or subset type outputs
+Those two can be silenced with the flag `--allow-external-contracts`. A third new warning occurs when using bodyless functions marked with `{:extern}`, and can be silenced using the option `--allow-external-function`.
+
+- Enable project files to specify another project file as a base, which copies all configuration from that base file. More information can be found in the reference manual. 
+
+## Bug fixes
+
+- Fix a common memory leak that occurred when doing verification in the IDE that could easily consume gigabytes of memory. 
+
+- Fix bugs that could cause the IDE to become unresponsive
+
+- Improve the performance of the Dafny IDE by fixing bugs in its caching code
+
+- No longer reuse SMT solver processes between different document version when using the IDE, making the IDE verification behavior more inline to that of the CLI
+
+- Fix bugs that caused Dafny IDE internal errors (https://github.com/dafny-lang/dafny/issues/5355, https://github.com/dafny-lang/dafny/pull/5543, https://github.com/dafny-lang/dafny/pull/5548)
+
+- Fix bugs in the Dafny IDEs code navigation and renaming features when working with definition that are not referred to.
+
+- Fix a code navigation bug that could occur when navigating to and from module imports
+- 
+- Fix a code navigation bug that could occur when navigating to and from explicit types of variables
+  (https://github.com/dafny-lang/dafny/pull/5419)
+
+- Let the IDE no longer show diagnostics for projects for which all files have been closed (https://github.com/dafny-lang/dafny/pull/5437)
+
+- Fix bug that could lead to an unresponsive IDE when working with project files (https://github.com/dafny-lang/dafny/pull/5444)
+
+- Fix bugs in Dafny library files that could cause them not to work with certain option values, such as --function-syntax=3 
+
+- Fix a bug that prevented building Dafny libraries for Dafny projects that could verify without errors.
+
+- Reserved module identifiers correctly escaped in GoLang (https://github.com/dafny-lang/dafny/pull/4181)
+
+- Fix a soundness issue that could be triggered by calling ensures fresh in the post-condition of a constructor (https://github.com/dafny-lang/dafny/pull/4700)
+
+- Ability to cast a datatype to its trait when overriding functions (https://github.com/dafny-lang/dafny/pull/4823)
+
+- Fix crash that could occur when using a constructor in a match pattern where a tuple was expected (https://github.com/dafny-lang/dafny/pull/4860)
+
+- No longer emit an incorrect internal error while waiting for verification message (https://github.com/dafny-lang/dafny/pull/5209)
+
+- More helpful error messages when read fields not mentioned in reads clauses (https://github.com/dafny-lang/dafny/pull/5262)
+
+- Check datatype constructors for bad type-parameter instantiations (https://github.com/dafny-lang/dafny/pull/5278)
+
+- Avoid name clashes with Go built-in modules (https://github.com/dafny-lang/dafny/pull/5283)
+
+- Invalid Python code for nested set and map comprehensions (https://github.com/dafny-lang/dafny/pull/5287)
+
+- Stop incorrectly emitting the error message "Dafny encountered an internal error while waiting for this symbol to verify" (https://github.com/dafny-lang/dafny/pull/5295)
+
+- Rename the `dafny generate-tests` option `--coverage-report` to `--expected-coverage-report` (https://github.com/dafny-lang/dafny/pull/5301)
+
+- Stop giving an incorrect warning about a missing {:axiom} clause on an opaque constant. (https://github.com/dafny-lang/dafny/pull/5306)
+
+- No new resolver crash when datatype update expressions are partially resolved (https://github.com/dafny-lang/dafny/pull/5331)
+
+- Optional pre-type won't cause a crash anymore (https://github.com/dafny-lang/dafny/pull/5369)
+
+- Unguarded enumeration of bound variables in set and map comprehensions (https://github.com/dafny-lang/dafny/pull/5402)
+
+- Reference the correct `this` after removing the tail call of a function or method (https://github.com/dafny-lang/dafny/pull/5474)
+
+- Apply name mangling to datatype names in Python more often (https://github.com/dafny-lang/dafny/pull/5476)
+
+- Only guard `this` when eliminating tail calls, if possible (https://github.com/dafny-lang/dafny/pull/5524)
+
+- Compiled disjunctive nested pattern matching no longer crashing (https://github.com/dafny-lang/dafny/pull/5572)
+
+# 4.6.0
+
+## New features
+
+- Add a check to `dafny run` that notifies the user when a value that was parsed as a user program argument, and which occurs before a `--` token, starts with `--`, since this indicates they probably mistyped a Dafny option name. (https://github.com/dafny-lang/dafny/pull/5097)
+
+- Add an option --progress that can be used to track the progress of verification. (https://github.com/dafny-lang/dafny/pull/5150)
+
+- Add the attribute `{:isolate_assertions}`, which does the same as `{:vcs_split_on_every_assert}`. Deprecated `{:vcs_split_on_every_assert}` (https://github.com/dafny-lang/dafny/pull/5247)
+
+## Bug fixes
+
+- (soundness issue) Twostate predicate now check if their not new arguments are allocated in the previous heap (https://github.com/dafny-lang/dafny/pull/4844)
+
+- Add uniform checking of type characteristics in refinement modules (https://github.com/dafny-lang/dafny/pull/5146)
+
+- Fixed links associated with the standard libraries. (https://github.com/dafny-lang/dafny/pull/5176)
+
+- fix: Disable the "erase datatype wrappers" optimization if the datatype implements any traits.
+  feat: Allow the "erase datatype wrappers" optimization if the only fields in the datatype are ghost fields.
+  (https://github.com/dafny-lang/dafny/pull/5234)
+
+- Fix the default string value emitted for JavaScript (https://github.com/dafny-lang/dafny/pull/5239)
+
+# 4.5.0
+
+## New features
+
+- Add the option `--include-test-runner` to `dafny translate`, to enable getting the same result as `dafny test` when doing manual compilation. (https://github.com/dafny-lang/dafny/pull/3818)
+
+- - Fix: verification in the IDE no longer fails for iterators
+  - Fix: the IDE now provides feedback when verification fails to run, for example due to a bad solver path
+  - Fix: let the IDE correctly use the solver-path option when it's specified in a project file
+  - Feat: improve the order of verification diagnostics emitted by the Dafny CLI, so that they now always follow the line order of the program.
+  (https://github.com/dafny-lang/dafny/pull/4798)
+
+- - Add an option `--filter-position` to the `dafny verify` command. The option filters what gets verified based on a source location. The location is specified as a file path suffix, optionally followed by a colon and a line number. For example, `dafny verify dfyconfig.toml --filter-position=source1.dfy:5` will only verify things that range over line 5 in the file `source1.dfy`. In combination with ``--isolate-assertions`, individual assertions can be verified by filtering on the line that contains them. When processing a single file, the filename can be skipped, for example: `dafny verify MyFile.dfy --filter-position=:23`
+  - Add an option `--filter-symbol` to the `dafny verify` command, that only verifies symbols whose fully qualified name contains the given argument. For example, `dafny verify dfyconfig.toml --filter-symbol=MyModule` will verify everything inside `MyModule`.
+  - The option `--boogie-filter` has been removed in favor of --filter-symbol
+  (https://github.com/dafny-lang/dafny/pull/4816)
+
+- Add a `json` format to those supported by `--log-format` and `/verificationLogger`, for producing thorough, machine readable logs of verification results. (https://github.com/dafny-lang/dafny/pull/4951)
+
+- - Flip the behavior of `--warn-deprecation` and change the name to `--allow-deprecation`, so the default is now false, which is standard for boolean options.
+  - When using `--allow-deprecation`, deprecated code is shown using tooltips in the IDE, and on the CLI when using `--show-tooltips`.
+  - Replace the option `--warn-as-error` with the option `--allow-warnings`. The new option, when false, the default value, causes Dafny to stop generating executable output and return a failure exit code, when warnings occur in the program. Contrary to the previous `--warn-as-error` option, warnings are always reported as warnings.
+    - During development, users must use `dafny run --allow-warnings` if they want to run their Dafny code when it contains warnings.
+    - If users have builds that were passing with warnings, they have to add `--allow-warnings` to allow them to still pass. 
+    - If users upgrade to a new Dafny version, and are not using `--allow-warnings`, and do not want to migrate off of deprecated features, they will have to use `--allow-deprecation`.
+  - When using the legacy CLI, the option /warningsAsErrors now has the behavior of --allow-warnings=false
+  - A doo file that was created using `--allow-warnings` causes a warning if used by a consumer that does not use it.
+  (https://github.com/dafny-lang/dafny/pull/4971)
+
+- The new `{:contradiction}` attribute can be placed on an `assert` statement to indicate that it forms part of an intentional proof by contradiction and therefore shouldn't be warned about when `--warn-contradictory-assumptions` is turned on. (https://github.com/dafny-lang/dafny/pull/5001)
+
+- Function and method parameters and return types, and datatype constructor arguments, can now have attributes. By default, there are no attributes that Dafny recognizes in these positions, but custom back-ends can use this feature to get extra information from the source files. (https://github.com/dafny-lang/dafny/pull/5032)
+
+- Under the CLI option `--general-newtypes`, the base type of a `newtype` declaration can now be (`int` or `real`, as before, or) `bool`, `char`, or a bitvector type.
+
+  `as` and `is` expressions now support more types than before. In addition, run-time type tests are supported for `is` expressions, provided type parameters are injective (as was already required) and provided the constraints of any subset type or newtype is compilable. Note, although both `as` and `is` allow many more useful cases than before, using `--general-newtypes` will also forbid some unusual cases that were previously allowed. Any such case that is now forbidden can still be done by doing the `as`/`is` via `int`.
+  (https://github.com/dafny-lang/dafny/pull/5061)
+
+- Allow newtype declarations to be based on set/iset/multiset/seq. (https://github.com/dafny-lang/dafny/pull/5133)
+
+## Bug fixes
+
+- Fixed crash caused by cycle in type declaration (https://github.com/dafny-lang/dafny/pull/4471)
+
+- Fix resolution of unary minus in new resolver (https://github.com/dafny-lang/dafny/pull/4737)
+
+- The command line and the language server now use the same counterexample-related Z3 options. (https://github.com/dafny-lang/dafny/pull/4792)
+
+- Dafny no longer crashes when required parameters occur after optional ones. (https://github.com/dafny-lang/dafny/pull/4809)
+
+- Use defensive coding to prevent a crash in the IDE that could occur in the context of code actions. (https://github.com/dafny-lang/dafny/pull/4818)
+
+- Fix null-pointer problem in new resolver (https://github.com/dafny-lang/dafny/pull/4875)
+
+- Fixed a crash that could occur when a case body of a match that was inside a loop, had a continue or break statement. (https://github.com/dafny-lang/dafny/pull/4894)
+
+- Compile run-time constraint checks for newtypes in comprehensions (https://github.com/dafny-lang/dafny/pull/4919)
+
+- Fix null dereference in constant-folding invalid string-indexing expressions (https://github.com/dafny-lang/dafny/pull/4921)
+
+- Check for correct usage of type characteristics in specifications and other places where they were missing.
+
+  This fix will cause build breaks for programs with missing type characteristics (like `(!new)` and `(0)`). Any such error message is accompanied with a hint about what type characterics need to be added where.
+  (https://github.com/dafny-lang/dafny/pull/4928)
+
+- Initialize additional fields in the AST (https://github.com/dafny-lang/dafny/pull/4930)
+
+- Fix crash when a function/method with a specification is overridden in an abstract type. (https://github.com/dafny-lang/dafny/pull/4954)
+
+- Fix crash for lookup of non-existing member in new resolver (https://github.com/dafny-lang/dafny/pull/4955)
+
+- Fix: check that subset-type variable's type is determined (resolver refresh).
+  Fix crash in verifier when there was a previous error in determining subset-type/newtype base type.
+  Fix crash in verifier when a subset type has no explicit `witness` clause and has a non-reference trait as its base type.
+  (https://github.com/dafny-lang/dafny/pull/4956)
+
+- The `{:rlimit N}` attribute, which multiplied `N` by 1000 before sending it to Z3, is deprecated in favor of the `{:resource_limit N}` attribute, which can accept string arguments with exponential notation for brevity.  The `--resource-limit` and `/rlimit` flags also now omit the multiplication, and the former allows exponential notation. (https://github.com/dafny-lang/dafny/pull/4975)
+
+- Allow a datatype to depend on traits without being told "datatype has no instances" (https://github.com/dafny-lang/dafny/pull/4997)
+
+- Don't consider `:= *` to be a definite assignment for non-ghost variables of a `(00)` type (https://github.com/dafny-lang/dafny/pull/5024)
+
+- Detect the same ghost usage in initializing assignments as in other expressions. The effect of this fix is to allow more iset/imap comprehensions to be compiled.
+
+  Also, report errors if the LHS of `:=` in compiled `map`/`imap` comprehensions contains ghosts.
+  (https://github.com/dafny-lang/dafny/pull/5041)
+
+- Escape names of nested modules in C# and Java (https://github.com/dafny-lang/dafny/pull/5049)
+
+- A parent trait that is a reference type can now be named via `import opened`.
+
+  Implicit conversions between a datatype and its parent traits no longer crashes the verifier.
+
+  (Dis)equality expressions of a (co)datatype and its parent traits no longer crashes the verifier.
+  (https://github.com/dafny-lang/dafny/pull/5058)
+
+- Fixed support for newtypes as sequence comprehension lengths in Java (https://github.com/dafny-lang/dafny/pull/5065)
+
+- Don't emit an error message for a `function-by-method` with unused type parameters. (https://github.com/dafny-lang/dafny/pull/5068)
+
+- The syntax of a predicate definition must always include parentheses. (https://github.com/dafny-lang/dafny/pull/5069)
+
+- Termination override check for certain non-reference trait implementations (https://github.com/dafny-lang/dafny/pull/5087)
+
+- Malformed Python code for some functions involving lambdas (https://github.com/dafny-lang/dafny/pull/5093)
+
+- Let verifier understand opaque function overrides, supporting both when the overridden function is opaque and non-opaque. Revealing such a function for one overriding type has the effect of revealing it for all overriding types.
+
+  Also, forbid the case where a function is opaque in a parent trait and the function override is not opaque. (Previously, this had caused a crash.)
+  (https://github.com/dafny-lang/dafny/pull/5111)
+
+# 4.4.0
+
+## New features
+
+- Reads clauses on method declarations are now supported when the `--reads-clauses-on-methods` option is provided. 
+  The `{:concurrent}` attribute now verifies that the `reads` and `modifies` clauses are empty instead of generating an auditor warning.
+  (https://github.com/dafny-lang/dafny/pull/4440)
+
+- Added two new options, `--warn-contradictory-assumptions` and `--warn-redundant-assumptions`, to detect potential problems with specifications that indicate that successful verification may be misleading. These options are currently hidden because they may occasionally produce false positives in cases where proofs are so trivial that the solver never does work on them. (https://github.com/dafny-lang/dafny/pull/4542)
+
+- Verification of the `{:concurrent}` attribute on methods now allows non-empty `reads` and `modifies` clauses with the `{:assume_concurrent}` attribute. (https://github.com/dafny-lang/dafny/pull/4563)
+
+- Implemented support for workspace/symbol request to allow IDE navigation by symbol. (https://github.com/dafny-lang/dafny/pull/4619)
+
+- The new `--verification-coverage-report` flag to `dafny verify` creates an HTML report highlighting which portions of the program were and were not necessary for verification. The format is the same as for `dafny generate-tests --coverage-report` and files from the two commands can be merged. (https://github.com/dafny-lang/dafny/pull/4625)
+
+- Built-in types such as the `nat` subset type, tuples, arrows, and arrays are now pre-compiled into each backend's runtime library,
+  instead of emitted on every call to `dafny translate`, to avoid potential duplicate definitions when translating components separately.
+  (https://github.com/dafny-lang/dafny/pull/4658)
+
+- The new `--only-label` option to `merge-coverage-reports` includes only one category of highlighting in the output. For example, merging coverage reports from test generation and verification using the option `--only-label NotCovered` will highlight only the regions not covered by either testing or verification. (https://github.com/dafny-lang/dafny/pull/4673)
+
+- The Dafny distribution now includes standard libraries, available with the `--standard-libraries` option.
+  See https://github.com/dafny-lang/dafny/blob/master/Source/DafnyStandardLibraries/README.md for details.
+  (https://github.com/dafny-lang/dafny/pull/4678)
+
+- Introduce replaceable modules, which can be used to help define Dafny applications that translate to multiple target languages. (https://github.com/dafny-lang/dafny/pull/4681)
+
+- The new `--coverage-report` flag to `dafny run` and `dafny test` creates an HTML report highlighting which portions of the program were executed at runtime. (https://github.com/dafny-lang/dafny/pull/4755)
+
+- Enable turning nonlinear arithmetic on or off on a per-module basis, using the attribute `{:disable-nonlinear-arithmetic}`, 
+  which optionally takes the value false to enable nonlinear arithmetic.
+  (https://github.com/dafny-lang/dafny/pull/4773)
+
+- Let the IDE provide code navigation in situations where the program parses but has resolution errors. Note that this only works for modules whose dependency tree does not have errors, or modules who contain errors themselves, but not for modules whose dependencies contain errors. (https://github.com/dafny-lang/dafny/pull/4855)
+
+## Bug fixes
+
+- Ensures that computing the set of values or items of map can only be done if the type of the range supports equality. (https://github.com/dafny-lang/dafny/pull/1373)
+
+- Subset type decl's witness correctly taken into account (https://github.com/dafny-lang/dafny/pull/3792)
+
+- Added a comprehensive test for test generation and fixed a bug that prevented test generation to process function-by-method declarations (https://github.com/dafny-lang/dafny/pull/4406)
+
+- Optimized memory consumption of test generation by reusing the Boogie AST of the target Dafny program. (https://github.com/dafny-lang/dafny/pull/4530)
+
+- Fix a bug that prevented certain types of lemma to be verified in the IDE (https://github.com/dafny-lang/dafny/pull/4607)
+
+- Dot completion now works on values the type of which is a type synonym. (https://github.com/dafny-lang/dafny/pull/4635)
+
+- Fix a case where the document symbol API would return incorrect data when working on a file with parse errors (https://github.com/dafny-lang/dafny/pull/4675)
+
+- Emit less nested target code in match-case expressions (nice for readability, and necessary for Java) (https://github.com/dafny-lang/dafny/pull/4683)
+
+- Ghost diagnostics are now correctly updated when they become empty (https://github.com/dafny-lang/dafny/pull/4693)
+
+- Enable verification options that are configured in a Dafny project file, to be picked up by the Dafny language server (https://github.com/dafny-lang/dafny/pull/4703)
+
+- Prevent double-counting of covered/uncovered lines in test coverage reports (https://github.com/dafny-lang/dafny/pull/4710)
+
+- fix: correction of type inference for default expressions (https://github.com/dafny-lang/dafny/pull/4724)
+
+- The new type checker now also supports static reveals for instance functions (https://github.com/dafny-lang/dafny/pull/4733)
+
+- Resolve :- expressions with void outcomes in new resolver (https://github.com/dafny-lang/dafny/pull/4734)
+
+- Crash in the resolver on type parameters of opaque functions in refined modules (https://github.com/dafny-lang/dafny/pull/4768)
+
+- Fix error messages being printed after their context snippets (https://github.com/dafny-lang/dafny/pull/4787)
+
+- Override checks no longer crashing when substituting type parameters and equality (https://github.com/dafny-lang/dafny/pull/4812)
+
+- Removed one cause of need for restarting the IDE. (https://github.com/dafny-lang/dafny/pull/4833)
+
+- The Python compiler emits reserved names for datatypes (https://github.com/dafny-lang/dafny/pull/4843)
+
+# 4.3.0
+
+## New features
+
+- Add support for the Find References LSP request
+  - Returned references may be incomplete when not using project mode
+  (https://github.com/dafny-lang/dafny/pull/2320)
+
+- Improve scalability of inlining for test generation and generate coverage information with respect to the original Dafny source (https://github.com/dafny-lang/dafny/pull/4255)
+
+- Support generating of tests targeting path-coverage of the entire program and tests targeting call-graph-sensitive block coverage (referred to as Branch coverage) (https://github.com/dafny-lang/dafny/pull/4326)
+
+- Add support for Rename LSP request
+  - Support requires enabling project mode and defining a Dafny project file
+  (https://github.com/dafny-lang/dafny/pull/4365)
+
+- Make verification in the IDE more responsive by starting verification after translating the required module to Boogie, instead of first translating all modules that could be verified. (https://github.com/dafny-lang/dafny/pull/4378)
+
+- The Dafny IDE now has improved behavior when working with a Dafny file that's part of a Dafny project. A Dafny file is part of a project if a `dfyconfig.toml` can be found somewhere in the file's path hierarchy, such as in the same folder or in the parent folder. A `dfyconfig.toml` can specify which Dafny options to use for that project, and can specify which Dafny files are part of the project. By default, the project will include all .dfy files reachable from the folder in which the `dfyconfig.toml` resides. Project related features of the IDE are:
+  - Whenever one file in the project is opened, diagnostics for all files in the Dafny project are shown. When including a file with errors that's part of the same project, the message "the included file contains errors" is no longer shown. Instead, the included file's errors are shown directly.
+  - If any file in the project is changed, diagnostics for all files in the project are updated. Without a project, changing an included file will not update diagnostics for the including file until the including file is also changed.
+  - The find references feature (also added in this release), works better in files that are part of a project, since only then can it find references that are inside files that include the current file.
+  - The assisted rename feature (also added in this release), only works for files that are part of a project.
+  - When using a project file, it is no longer necessary to use include directives. In the previous version of Dafny, it was already the case that the Dafny CLI, when passed a Dafny project file, does not require include directives to process the Dafny program. The same now holds for the Dafny IDE when working with Dafny files for which a project file can be found.
+  - If any file in the project is resolved, all files in the project are resolved. Opening a file in a project that's already resolved means the opened file is resolved instantly.
+  - The IDE's memory consumption stays the same regardless of how many files in a project are opened. Without a project, the IDE increases it's memory usage for each open file.
+
+  Try out the IDE's project support now by creating an empty `dfyconfig.toml` file in the root of your project repository.
+  (https://github.com/dafny-lang/dafny/pull/4435)
+
+- Prior to generating tests, Dafny now checks the targeted program for any features that test generation does not support or any misuse of test generation specific attributes.
+  Any such issues are reported to the user.
+  (https://github.com/dafny-lang/dafny/pull/4444)
+
+- Added documentation of the generate-tests command to the reference manual (https://github.com/dafny-lang/dafny/pull/4445)
+
+- When two modules in the same scope have the same name, Dafny now reports an error that contains the location of both modules. (https://github.com/dafny-lang/dafny/pull/4499)
+
+- - The Dafny IDE will now report errors that occur in project files.
+  - The Dafny IDE will now shown a hint diagnostic at the top of Dafny project files, that says which files are referenced by the project.
+  (https://github.com/dafny-lang/dafny/pull/4539)
+
+## Bug fixes
+
+- Triggers warnings correclty converted into errors with --warn-as-errors (https://github.com/dafny-lang/dafny/pull/3358)
+
+- Allow JavaScript keywords as names of Dafny modules (https://github.com/dafny-lang/dafny/pull/4243)
+
+- Support odd characters in pathnames for Go (https://github.com/dafny-lang/dafny/pull/4257)
+
+- Allow Dafny filenames compiled to Java to start with a digit (https://github.com/dafny-lang/dafny/pull/4258)
+
+- Parser now supports files with a lot of consecutive single-line comments (https://github.com/dafny-lang/dafny/pull/4261)
+
+- Gutter icons more robust (https://github.com/dafny-lang/dafny/pull/4287)
+
+- Unresolved abstract imports no longer crash the resolver (https://github.com/dafny-lang/dafny/pull/4298)
+
+- Make capitalization of target Go code consistent (https://github.com/dafny-lang/dafny/pull/4310)
+
+- Refining an abstract module with a class with an opaque function no longer crashes (https://github.com/dafny-lang/dafny/pull/4315)
+
+- Dafny can now produce coverage reports indicating which parts of the program are expected to be covered by automatically generated tests. 
+  The same functionality can be used to report other forms of coverage.
+  (https://github.com/dafny-lang/dafny/pull/4325)
+
+- Fix issue that would prevent the IDE from correctly handling default export sets (https://github.com/dafny-lang/dafny/pull/4328)
+
+- Allow function-syntax and other options with a custom default to be overridden in `dfyconfig.toml` (https://github.com/dafny-lang/dafny/pull/4357)
+
+- There were two differences between verification in the IDE and the CLI, one small and one tiny, which would only become apparent for proofs that Z3 had trouble verifying. The small difference has been resolved, while the tiny one still persists, so the IDE and CLI should behave almost equivalently now, including resource counts, on most code. (https://github.com/dafny-lang/dafny/pull/4374)
+
+- Old command line interface for test generation is no longer supported, all calls should use dafny generate-tests (https://github.com/dafny-lang/dafny/pull/4385)
+
+- Fixed a bug leading to stack overflow during counterexample extraction on some programs. (https://github.com/dafny-lang/dafny/pull/4392)
+
+- Ability to use .Key as a constant name in datatypes and classes (https://github.com/dafny-lang/dafny/pull/4394)
+
+- Existential assertions are now printed correctly (https://github.com/dafny-lang/dafny/pull/4401)
+
+- When a symbol such as a method is not given a name, the error given by Dafny now shows where this problem occurs. (https://github.com/dafny-lang/dafny/pull/4411)
+
+- Fix flickering and incorrect results in the verification status bar, and improve responsiveness of verification diagnostics (https://github.com/dafny-lang/dafny/pull/4413)
+
+- Significantly improve IDE responsiveness for large projects, preventing it from appearing unresponsive or incorrect. Previously, for projects of a certain size, the IDE would not be able to keep up with incoming changes made by the user, possibly causing it to never catch up and appearing frozen or showing outdated results. (https://github.com/dafny-lang/dafny/pull/4419)
+
+- Declarations with {:only} ensure that other declarations aren't displayed as verified in the gutter icons (https://github.com/dafny-lang/dafny/pull/4432)
+
+- Fix issues that could cause the IDE status bar to show incorrect information (https://github.com/dafny-lang/dafny/pull/4454)
+
+- When verification times out, only show a red underline on the name of the verifiable for which verification timed out, instead of under its whole definition. (https://github.com/dafny-lang/dafny/pull/4477)
+
+- Prevent the IDE from becoming completely unresponsive after certain kinds of parse errors would occur. (https://github.com/dafny-lang/dafny/pull/4495)
+
+- Support all types of options in the Dafny project file (dfyconfig.toml) (https://github.com/dafny-lang/dafny/pull/4506)
+
+- Fix an issue that would cause some types of errors and other diagnostics not to appear in the IDE, if they appeared in files other than the active one. (https://github.com/dafny-lang/dafny/pull/4513)
+
+- Fix an IDE issue that would lead to exceptions when using module export declarations and making edits in imported modules that were re-exported (https://github.com/dafny-lang/dafny/pull/4556)
+
+- Fix a leak in the IDE that would cause it to become less responsive over time. (https://github.com/dafny-lang/dafny/pull/4570)
+
 # 4.2.0
 
 ## New features
diff --git a/Scripts/bump_version_number.js b/Scripts/bump_version_number.js
new file mode 100644
index 00000000000..23e39fbf2cb
--- /dev/null
+++ b/Scripts/bump_version_number.js
@@ -0,0 +1,369 @@
+#!/bin/env node
+// Every comment of this file starting with //# comes from the file ../docs/dev/VERSIONBUMP.md
+// and vice-versa
+
+//# After each release, we change the version number by first running
+//#     python3 Scripts/prepare_release.py NEXT_VERSION set-next-version
+//# where NEXT_VERSION is the version of the last release of the format
+//# `major.minor.patch` and the patch has been increased by 1. This script
+//# has for effect to change the version number in `Source/Directory.Build.props`.
+//# Then, many things in Dafny that depend on this version number have to be
+//# updated.
+//# This file is an exhaustive list of everything that needs to be updated
+//# whenever the version number changes. All these steps are
+//# executable by running
+//#     ./Scripts/bump_version_number.js NEW_VERSION
+//# and `make bumpversion-test` run by the CI on each release
+//# verifies that this file is in sync with that script.
+
+const fs = require('fs');
+const { promisify } = require('util');
+const {exec, spawn} = require('child_process');
+const execAsync = promisify(exec);
+const minutes = 60*1000;
+const versionFile = "Source/Directory.Build.props";
+// Change the working directory to Dafny
+process.chdir(__dirname + "/..");
+const prefixLinkedComment = "//# ";
+var existingVersion = "";
+//# Assuming `<TestDirectory>` to be `Source/IntegrationTests/TestFiles/LitTests/LitTest`,
+//# perform the following:
+const TestDirectory = "Source/IntegrationTests/TestFiles/LitTests/LitTest";
+var {version, testMode} = processArgs(process.argv.slice(2)); // Remove "node" and the script's name.
+if(testMode) {
+  test();
+} else {
+  synchronizeRepositoryWithNewVersionNumber();
+}
+
+async function synchronizeRepositoryWithNewVersionNumber() {
+  existingVersion = await getVersionNumber();
+  if(version === false) {
+    version = existingVersion;
+  } else {
+    await bumpVersionNumber(version);
+  }
+  //# * Compile Dafny to ensure you have the right version number.
+  await execute("make exe");
+
+  //# * Compile the standard libraries and update their binaries which are checked in
+  await executeWithTimeout("make -C Source/DafnyStandardLibraries update-binary", 50*minutes);
+
+  //# * Recompile Dafny so that standard libraries are in the executable.
+  await execute("make exe");
+  
+  //# * In the test directory `Source/IntegrationTests/TestFiles/LitTests/LitTest`,
+  await execute(
+  //#   * Rebuild `pythonmodule/multimodule/PythonModule1.doo` from `pythonmodule/multimodule/dafnysource/helloworld.dfy`
+  `bash Scripts/dafny build -t:lib ${TestDirectory}/pythonmodule/multimodule/dafnysource/helloworld.dfy -o ${TestDirectory}/pythonmodule/multimodule/PythonModule1.doo`,
+  //#   * Rebuild `pythonmodule/nestedmodule/SomeNestedModule.doo` from `pythonmodule/nestedmodule/dafnysource/SomeNestedModule.dfy`
+  `bash Scripts/dafny build -t:lib ${TestDirectory}/pythonmodule/nestedmodule/dafnysource/SomeNestedModule.dfy -o ${TestDirectory}/pythonmodule/nestedmodule/SomeNestedModule.doo`,
+  //#   * Rebuild `gomodule/multimodule/test.doo` from `gomodule/multimodule/dafnysource/helloworld.dfy`
+  `bash Scripts/dafny build -t:lib ${TestDirectory}/gomodule/multimodule/dafnysource/helloworld.dfy -o ${TestDirectory}/gomodule/multimodule/test.doo`);
+
+  //#   * Search for `dafny_version = ` in checked-in `.dtr` files of the `<TestDirectory>`
+  //#    and update the version number.
+  var files = await findFiles(TestDirectory, ".*\\.dtr");
+  assert_eq(files.length != 0, true);
+  for(let file of files) {
+    //#     Except for the file NoGood.dtr which is not valid.
+    if(file.endsWith("NoGood.dtr")) {
+      continue;
+    }
+    //#     Except for WrongDafnyVersion.dtr as well. 
+    if(file.endsWith("WrongDafnyVersion.dtr")) {
+      continue;
+    }
+    await replaceInFile(/dafny_version = "\d+\.\d+\.\d+/, `dafny_version = "${version}`,
+      `${TestDirectory}/${file}`);
+  }
+
+  //# * In `Source/DafnyRuntime/DafnyRuntimeJava/build.gradle`, search for `version = ` and update the version number
+  await replaceInFile(/version = '(\d+\.\d+\.\d+)/, `version = '${version}`,
+    `Source/DafnyRuntime/DafnyRuntimeJava/build.gradle`, existingVersion);
+  
+  //# * In `Source/DafnyRuntime/DafnyRuntimePython/pyproject.toml`, search for `version = ` and update the version number
+  await replaceInFile(/version = "(\d+\.\d+\.\d+)"/, `version = "${version}"`,
+    `Source/DafnyRuntime/DafnyRuntimePython/pyproject.toml`, existingVersion);
+
+  //#   * Update `comp/separate-compilation/translation-records/InvalidFormat.dfy.expect` by updating the version number after `by Dafny `
+  await replaceInFile(/by Dafny \d+\.\d+\.\d+/, `by Dafny ${version}`,
+    `${TestDirectory}/comp/separate-compilation/translation-records/InvalidFormat.dfy.expect`);
+
+  //# * Update the Dafny runtime version number by searching for `DafnyRuntime-` and updating the version right afterwards, in the files `DafnyPipeline.csproj` and `DafnyRuntime.csproj`
+  await replaceInFile(/DafnyRuntime-(\d+\.\d+\.\d+)\.jar/, `DafnyRuntime-${version}.jar`,
+    `Source/DafnyPipeline/DafnyPipeline.csproj`, existingVersion);
+  await replaceInFile(/DafnyRuntime-(\d+\.\d+\.\d+)\.jar/, `DafnyRuntime-${version}.jar`,
+    `Source/DafnyRuntime/DafnyRuntime.csproj`, existingVersion);
+}
+
+// Returns the current version number
+async function getVersionNumber() {
+  var versionFileContent = await fs.promises.readFile(versionFile, "utf-8");
+  var version = readVersionNumber(versionFileContent);
+  if(version === false) {
+    throw "Could not find version number in " + versionFile;
+  }
+  return version;
+}
+
+// Returns the version number from the given file content (see const versionFile)
+function readVersionNumber(versionFileContent) {
+  var versionMatch = versionFileContent.match(/<VersionPrefix>(\d+\.\d+\.\d+)<\/VersionPrefix>/);
+  if(versionMatch != null) {
+    return versionMatch[1];
+  }
+  return false;
+}
+
+// Increases the patch of the given version number
+async function bumpVersionNumber(version) {
+  console.log(`Bumping version number to ${version}`);
+  var versionFileContent = await fs.promises.readFile(versionFile, "utf-8");
+  newVersionFileContent = replaceVersionNumber(versionFileContent, version);
+  if(testMode) {
+    if(newVersionFileContent === versionFileContent) {
+      throw "Expected to find " + version + " in " + versionFile;
+    }
+    console.log("Would have updated  " + versionFile + " to " + newVersionFileContent);
+    return;
+  }
+  await fs.promises.writeFile(versionFile, newVersionFileContent);
+}
+
+// Replace the given version number in the given file that has the old version number
+function replaceVersionNumber(versionFileContent, newVersion) {
+  return versionFileContent.replace(/<VersionPrefix>\d+\.\d+\.\d+<\/VersionPrefix>/, `<VersionPrefix>${newVersion}</VersionPrefix>`);
+}
+
+
+// Spawn async
+function spawnAsync(commandAndArgs) {
+  return new Promise((resolve, reject) => {
+    // Regular expression to match quoted arguments and non-quoted parts
+    const regex = /'[^']*'|"[^"]*"|\S+/g;
+    
+    // Extract all matches and clean up quotes
+    const parts = commandAndArgs.match(regex).map(part => {
+      // Remove surrounding quotes (both single and double) if they exist
+      if ((part.startsWith('"') && part.endsWith('"')) || 
+          (part.startsWith("'") && part.endsWith("'"))) {
+        return part.slice(1, -1);
+      }
+      return part;
+    });
+
+    const command = parts[0];
+    const args = parts.slice(1);
+    const childProcess = spawn(command, args);
+
+    childProcess.stdout.on('data', (data) => {
+      process.stdout.write(`| ${data}`);
+    });
+
+    childProcess.stderr.on('data', (data) => {
+      process.stdout.write(`! ${data}`);
+    });
+
+    childProcess.on('close', (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`Process exited with code ${code}`));
+      }
+    });
+  });
+}
+
+// Execute each command in its arguments
+async function execute() {
+  var commands = arguments;
+  for(let i = 0; i < commands.length; i++) {
+    let command = commands[i];
+    if(testMode) {
+      console.log("Would have run " + command);
+    } else {
+      console.log("Running " + command);
+      await spawnAsync(command);
+    }
+  }
+}
+
+// Find files in the given directory, recursively
+// Returns them with the relative path from the given directory
+async function findFiles(directory, regexString) {
+  var files = [];
+  var regexFilter = new RegExp(regexString);
+  var dir = await fs.promises.opendir(directory);
+  for await (const dirent of dir) {
+    if(dirent.isDirectory()) {
+      var subFiles = await findFiles(directory + "/" + dirent.name, regexString);
+      files = files.concat(subFiles.map(f => dirent.name + "/" + f));
+    } else if(dirent.isFile() && regexFilter.test(dirent.name)) {
+      files.push(dirent.name);
+    }
+  }
+  return files;
+}
+
+// Execute the given comment, with the possibility of timing out
+function executeWithTimeout(command, timeout) {
+  if(testMode) {
+    console.log("Would have run " + command + " with a timeout of " + timeout);
+    return new Promise((resolve, reject) => { resolve(); });
+  }
+  // Instead of having an async closure, we are going to return the promise directly
+  // so that it can be fullfilled either way.
+  return new Promise((resolve, reject) => {
+    var finished = false;
+    var childProcess = undefined;
+    var timeoutId = setTimeout(() => {
+      if(!finished) {
+        finished = true;
+        if(typeof childProcess != undefined) {
+          childProcess.kill();
+        }
+        resolve({ok: false, log: `Timeout after ${timeout/1000}s`});
+      }
+    }, timeout);
+    console.log(`Running ${command} with timeout of ${timeout/1000}s`)
+    childProcess = exec(command, (error, stdout, stderr) => {
+      clearTimeout(timeoutId);
+      finished = true;
+      if(error) {
+        resolve({ok: false, log: (error + "\n" + stderr + "\n" + stdout).trim()});
+      } else {
+        resolve({ok: true, log: stdout, answer: undefined});
+      }
+    });
+    // Add these two handlers
+    childProcess.stdout.on('data', (data) => {
+      process.stdout.write(`| ${data}`);
+    });
+
+    childProcess.stderr.on('data', (data) => {
+      process.stdout.write(`! ${data}`);
+    });
+  });
+}
+
+// Find the regex in the given file, and replaces it with the given replacement.
+async function replaceInFile(regex, replacement, fileName, testExistingVersion = null) {
+  var fileContent = await fs.promises.readFile(fileName, 'utf-8');
+  // Replace "Dafny \d.\d.\d" by the new version
+  var previous = fileContent.match(regex);
+  if(previous == null ) {
+    throw `Could not find ${regex} in ${fileName}`;
+  }
+  var newContent = fileContent.replace(regex, replacement);
+  if(testMode) {
+    if(testExistingVersion != null) {
+      assert_eq(previous[1], testExistingVersion);
+    }
+    console.log(`Would have replaced ${previous[0]} with ${replacement} in ${fileName}`);
+    if(newContent == fileContent) {
+      throw "Error in replaceInFile, replacement did not do anything";
+    }
+  } else {
+    await fs.promises.writeFile(fileName, newContent);
+  }
+}
+
+// Process the arguments.
+// If the first argument is --test, then we set the test mode where
+// we are going to read this file and verify that all lines of ../docs/dev/VERSIONBUMP.md
+// became a comment in this file.
+function processArgs(args) {
+  var testMode, version;
+  testMode = args[0] == "--test";
+  if (testMode) {
+    args = args.slice(1);
+  }
+
+  // If another argument is given, it's a version number that we can update 
+  // If there is one argument, it must be the new version number.
+  var version = false;
+  if (args.length > 0) {
+    version = args[0];
+    if (!version.match(/^\d+\.\d+\.\d+$/)) {
+      console.log(`Invalid version number ${version}`);
+      process.exit(1);
+    }
+  }
+  return {version, testMode};
+}
+
+////////////////// Testing part to ensure this script is in sync /////////////
+
+async function test() {
+  await ensureTakesIntoAccountAllReleaseInstructions();
+  assert_eq(readVersionNumber(
+    "\n   <VersionPrefix>1.2.3</VersionPrefix>\n"), "1.2.3");
+  assert_eq(readVersionNumber(
+    "  <VersionPrefix>1.2</VersionPrefix>"), false);
+  assert_eq(replaceVersionNumber(
+    "\n   <VersionPrefix>1.2.3</VersionPrefix>\n", "1.2.4"), 
+    "\n   <VersionPrefix>1.2.4</VersionPrefix>\n");
+  await synchronizeRepositoryWithNewVersionNumber(); // Test mode
+}
+
+// Step to ensure all the public release instructions are taken into account
+async function ensureTakesIntoAccountAllReleaseInstructions() {
+  if(version === false) {
+    version = await getVersionNumber();
+  } else {
+    await bumpVersionNumber(version);
+  }
+  // Read this file itself, and ensure every line of docs/dev/RELEASE.md
+  // appears somewhere in this file in its own line, possibly trimmed
+  var thisScript = await fs.promises.readFile(__filename, 'utf-8');
+  var publicBumpFile = 'docs/dev/VERSIONBUMP.md';
+  var publicReleaseInstructions = await fs.promises.readFile(publicBumpFile, 'utf-8');
+  var lines = publicReleaseInstructions.split("\n");
+  var thisScriptLines = thisScript.split("\n").
+    map(line => line.trim()).
+    filter(line => line.startsWith(prefixLinkedComment)).
+    map(line => line.substring(prefixLinkedComment.length).trim());
+  var missingLines = [];
+  var lineNumber = 1;
+  for(let line of lines) {
+    trimmedLine = line.trim();
+    if(trimmedLine.length > 0 && !trimmedLine.startsWith("#") && thisScriptLines.indexOf(trimmedLine) === -1) {
+      missingLines.push("//# " + line);
+    }
+    lineNumber++;
+  }
+  if(missingLines.length > 0) {
+    for(let line of missingLines) {
+      console.log(line);
+    }
+    console.log(`------------------------------------`);
+    console.log(`${missingLines.length} lines of ${publicBumpFile} were not found in ${__filename} ^^`);
+    console.log(`Please update either file.`);
+    process.exit(1);
+  }
+
+  // Now verify that each line of thisScriptLines is in the publicBumpFile
+  var extraLines = [];
+  var linesTrimmed = lines.map(line => line.trim());
+  for(let line of thisScriptLines) {
+    if(linesTrimmed.indexOf(line) === -1) {
+      extraLines.push(line);
+    }
+  }
+  if(extraLines.length > 0) {
+    for(let line of extraLines) {
+      console.log(line);
+    }
+    console.log(`------------------------------------`);
+    console.log(`${extraLines.length} comment lines of ${__filename} were not found in ${publicBumpFile} ^^`);
+    console.log(`Please update either file.`);
+    process.exit(1);
+  }
+}
+
+function assert_eq(got, expected) {
+  if(got != expected) {
+    throw "Expected " + expected + ", got " + got;
+  }
+}
\ No newline at end of file
diff --git a/Scripts/package.py b/Scripts/package.py
index f543d37715c..aaffbfe4e20 100755
--- a/Scripts/package.py
+++ b/Scripts/package.py
@@ -161,7 +161,6 @@ def build(self):
         if path.exists(self.buildDirectory):
             shutil.rmtree(self.buildDirectory)
         run(["make", "--quiet", "clean"])
-        self.run_publish("DafnyLanguageServer")
         self.run_publish("DafnyServer")
         self.run_publish("DafnyRuntime", "netstandard2.0")
         self.run_publish("DafnyRuntime", "net452")
diff --git a/Scripts/prepare_release.py b/Scripts/prepare_release.py
index 4c8cbf0b630..bb625bb63c0 100755
--- a/Scripts/prepare_release.py
+++ b/Scripts/prepare_release.py
@@ -322,6 +322,18 @@ def _push_release_branch(self):
             self.REMOTE, f"{self.release_branch_path}:{self.release_branch_path}",
             check=True)
 
+    def set_next_version(self):
+        assert_one(f"Is {self.version} a valid version number?",
+                   self._parse_vernum)
+        assert_one(f"Can we find `{self.build_props_path}`?",
+                   self._build_props_file_exists)
+        assert_one(f"Can we parse `{self.build_props_path}`?",
+                   self._build_props_file_parses)
+        assert_one(f"Can we create a section for `{self.version}` in `{self.release_notes_md_path}`?",
+                   self._version_number_is_fresh)
+        run_one(f"Updating `{self.build_props_path}`...",
+                self._update_build_props_file)
+
     # Still TODO:
     # - Run deep test as part of release workflow
 
@@ -375,10 +387,11 @@ def prepare(self):
         progress("Done!")
         progress()
 
-        DEEPTESTS_URL = "https://github.com/dafny-lang/dafny/actions/workflows/deep-tests.yml"
+        DEEPTESTS_URL = "https://github.com/dafny-lang/dafny/actions/workflows/nightly-build.yml"
         progress(f"Now, start a deep-tests workflow manually for branch {self.release_branch_name} at\n"
-                 f"<{DEEPTESTS_URL}>.\n"
-                 "Once it completes, re-run this script with argument `release`.")
+                 f"<{DEEPTESTS_URL}>\n"
+                 f"To do so, click Run workflow, use workflow from {self.release_branch_name},\n"
+                 f"Once it completes, just re-run this script as `./Scripts/prepare_release.py {self.version} release` to tag the branch and push it to trigger the release.")
         progress()
 
     def _tag_release(self):
@@ -429,7 +442,7 @@ def parse_arguments() -> argparse.Namespace:
     parser.add_argument("--source-branch", help="Which branch to release from (optional, defaults to 'master')", default="master")
     parser.add_argument("version", help="Version number for this release (A.B.C-xyz)")
     parser.add_argument("action", help="Which part of the release process to run",
-                        choices=["prepare", "release"])
+                        choices=["prepare", "release", "set-next-version"])
     return parser.parse_args()
 
 def main() -> None:
@@ -437,6 +450,7 @@ def main() -> None:
     try:
         release = (DryRunRelease if args.dry_run else Release)(args.version, args.source_branch)
         {"prepare": release.prepare,
+         "set-next-version": release.set_next_version,
          "release": release.release}[args.action]()
     except CannotReleaseError:
         sys.exit(1)
diff --git a/Scripts/quicktest.sh b/Scripts/quicktest.sh
index ae8053131b4..4909759f8e7 100755
--- a/Scripts/quicktest.sh
+++ b/Scripts/quicktest.sh
@@ -64,7 +64,7 @@ $DAFNY build -t:go c.dfy | diff - $tmp || exit 1
 (cd c-go; GO111MODULE=auto GOPATH=`pwd` go run src/c.go) | diff - $tmpx || exit 1
 echo Building with Python
 $DAFNY build -t:py c.dfy | diff - $tmp || exit 1
-python c-py/c.py | diff - $tmpx || exit 1
+python c-py/__main__.py | diff - $tmpx || exit 1
 echo Building with Rust
 $DAFNY build -t:rs c.dfy | diff - $tmp || exit 1
 ./c-rust/target/debug/c | diff - $tmpx || exit 1
diff --git a/Scripts/test-dafny.sh b/Scripts/test-dafny.sh
new file mode 100644
index 00000000000..cb684eea9aa
--- /dev/null
+++ b/Scripts/test-dafny.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Check for required environment variables
+if [ -z "$DIR" ]; then
+  echo "Error: DIR environment variable is not set."
+  exit 1
+fi
+
+if [ -z "$name" ]; then
+  echo "Error: name environment variable is not set."
+  exit 1
+fi
+
+# Set the default build flag
+NO_BUILD=${NO_BUILD:-false}
+
+# Locate files matching the specified pattern
+files=$(cd "${DIR}/Source/IntegrationTests/TestFiles/LitTests/LitTest" && find . -type f -wholename "*$name*" | grep -E '\.dfy$')
+
+if [ -z "$files" ]; then
+  echo "No files found matching pattern: $name"
+  exit 1
+else
+  count=$(echo "$files" | wc -l)
+  echo "$files"
+  echo "$count test files found."
+  for file in $files; do
+    filedir=$(dirname "$file")
+    (
+      cd "${DIR}/Source/IntegrationTests/TestFiles/LitTests/LitTest/$filedir" || exit
+      
+      build_flag=""
+      [ "$NO_BUILD" = "true" ] && build_flag="--no-build"
+
+      dotnet run $build_flag --project "${DIR}/Source/Dafny" -- ${action} "$(basename "$file")"
+    )
+  done
+fi
\ No newline at end of file
diff --git a/Scripts/test.sh b/Scripts/test.sh
new file mode 100644
index 00000000000..c094b52c530
--- /dev/null
+++ b/Scripts/test.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+set -e
+
+# Ensure name is provided
+if [ -z "$name" ]; then
+  echo "Syntax: make test name=<integration test filter> [update=true] [build=false]"
+  exit 1
+fi
+
+# Default values for update and build
+update_flag=${update:-false}
+build_flag=${build:-true}
+
+# Set the integration tests folder
+integration_tests_dir="${DIR}/Source/IntegrationTests"
+lit_tests_dir="${integration_tests_dir}/TestFiles/LitTests/LitTest"
+
+# Handle no-build logic
+if [ "$build_flag" = "false" ]; then
+  echo ""
+  echo "Build is disabled. Copying test files to the output directory..."
+  
+  framework_dir=$(find "${integration_tests_dir}/bin/Debug" -maxdepth 1 -type d -name "net*" | sort | tail -n 1)
+  if [ -z "$framework_dir" ]; then
+    echo "Error: Could not find target framework directory in bin/Debug. Please run at least once with build=true."
+    exit 1
+  fi
+  output_dir="${framework_dir}/TestFiles/LitTests/LitTest"
+
+  # Find and copy all matching files to the output directory
+  files=$(cd "$lit_tests_dir" && find . -type f -regex '.*\.\(check\|dfy\|expect\)' -wholename "*$name*")
+  if [ -z "$files" ]; then
+    echo "No files found matching pattern: $name"
+    exit 1
+  fi
+  
+  # Create output directory if it doesn't exist
+  mkdir -p "$output_dir"
+  
+  # Copy files
+  echo "$files" | while IFS= read -r file; do
+    echo "Copying $file to $output_dir"
+    cp "$lit_tests_dir/$file" "$output_dir/$file"
+  done
+fi
+
+# Check if update flag is true
+if [ "$update_flag" = "true" ]; then
+  echo ""
+  echo "Update mode enabled."
+  echo "Going to update the .expect files to match the current Dafny output."
+fi
+
+# Run dotnet test
+echo "Running integration tests..."
+DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE="$update_flag" \
+dotnet test "$integration_tests_dir" \
+  $( [ "$build_flag" = "false" ] && echo "--no-build" ) \
+  --filter "DisplayName~$name"
diff --git a/Scripts/use-local-boogie.sh b/Scripts/use-local-boogie.sh
index e3e23d2c0b2..49f1f45613d 100755
--- a/Scripts/use-local-boogie.sh
+++ b/Scripts/use-local-boogie.sh
@@ -2,5 +2,5 @@ BOOGIE_PATH="boogie/"
 allDlls=("Boogie.AbstractInterpretation.dll" "Boogie.BaseTypes.dll" "Boogie.CodeContractsExtender.dll" "Boogie.Concurrency.dll" "Boogie.Core.dll" "Boogie.ExecutionEngine.dll" "Boogie.Graph.dll" "Boogie.Houdini.dll" "Boogie.Model.dll" "Boogie.Predication.dll" "Boogie.Provers.SMTLib.dll" "Boogie.VCExpr.dll" "Boogie.VCGeneration.dll" "BoogieDriver.dll" "System.Configuration.ConfigurationManager.dll" "System.Runtime.Caching.dll" "System.Security.Cryptography.ProtectedData.dll" "System.Security.Permissions.dll")
 for t in "${allDlls[@]}"
 do
-	cp "${BOOGIE_PATH}Source/BoogieDriver/bin/Release/net6.0/${t}" Binaries/
+	cp "${BOOGIE_PATH}Source/BoogieDriver/bin/Release/net8.0/${t}" Binaries/
 done
diff --git a/Source/AutoExtern.Test/AutoExtern.Test.csproj b/Source/AutoExtern.Test/AutoExtern.Test.csproj
index 0c4e1dc0b51..08593d7dba6 100644
--- a/Source/AutoExtern.Test/AutoExtern.Test.csproj
+++ b/Source/AutoExtern.Test/AutoExtern.Test.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
diff --git a/Source/AutoExtern.Test/Minimal/Library.csproj b/Source/AutoExtern.Test/Minimal/Library.csproj
index 132c02c59c2..30402ac0e7a 100644
--- a/Source/AutoExtern.Test/Minimal/Library.csproj
+++ b/Source/AutoExtern.Test/Minimal/Library.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Source/AutoExtern.Test/Tutorial/ClientApp/ClientApp.csproj b/Source/AutoExtern.Test/Tutorial/ClientApp/ClientApp.csproj
index 86b01ff865f..7ba274e8ce9 100644
--- a/Source/AutoExtern.Test/Tutorial/ClientApp/ClientApp.csproj
+++ b/Source/AutoExtern.Test/Tutorial/ClientApp/ClientApp.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <NoWarn>CS3021; CS0162</NoWarn>
+    <NoWarn>CS8981; CS3021; CS0162</NoWarn>
     <!-- <Nullable>enable</Nullable> -->
   </PropertyGroup>
 
diff --git a/Source/AutoExtern.Test/Tutorial/ClientApp/GroceryListPrinter.dfy.expect b/Source/AutoExtern.Test/Tutorial/ClientApp/GroceryListPrinter.dfy.expect
index bdc3a6c4936..44366de2ee0 100644
--- a/Source/AutoExtern.Test/Tutorial/ClientApp/GroceryListPrinter.dfy.expect
+++ b/Source/AutoExtern.Test/Tutorial/ClientApp/GroceryListPrinter.dfy.expect
@@ -1,6 +1,8 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 
 Dafny program verifier did not attempt verification
 Wrote textual form of target program to GroceryListPrinter.cs
+Additional output written to GroceryListPrinter-cs.dtr
 # Printing a grocery list
    (2 items in the list)
 ## Apple: 3 @ 1.00
diff --git a/Source/AutoExtern.Test/Tutorial/ClientApp/LibraryModel.dfy.template b/Source/AutoExtern.Test/Tutorial/ClientApp/LibraryModel.dfy.template
index b26dde534c6..739861e177a 100644
--- a/Source/AutoExtern.Test/Tutorial/ClientApp/LibraryModel.dfy.template
+++ b/Source/AutoExtern.Test/Tutorial/ClientApp/LibraryModel.dfy.template
@@ -7,7 +7,7 @@ module {:extern "App"} {:compile false} App {}
 module {:compile false} {:extern "ExactArithmetic"} App.ExactArithmetic {
   import opened System
   type {:compile false} {:extern} Decimal {
-    function ToStr(): (s: System.String)
+    function {:axiom} ToStr(): (s: System.String)
   }
 }
 
diff --git a/Source/AutoExtern.Test/Tutorial/Library/Library.csproj b/Source/AutoExtern.Test/Tutorial/Library/Library.csproj
index 132c02c59c2..30402ac0e7a 100644
--- a/Source/AutoExtern.Test/Tutorial/Library/Library.csproj
+++ b/Source/AutoExtern.Test/Tutorial/Library/Library.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Source/AutoExtern.Test/coverlet.runsettings b/Source/AutoExtern.Test/coverlet.runsettings
new file mode 100644
index 00000000000..11c8afc63f8
--- /dev/null
+++ b/Source/AutoExtern.Test/coverlet.runsettings
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat Code Coverage">
+        <Configuration>
+          <Exclude>[*]DAST.*,[*]DCOMP.*</Exclude>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
diff --git a/Source/AutoExtern/AutoExtern.csproj b/Source/AutoExtern/AutoExtern.csproj
index 0c00890cffc..f44de5524b4 100644
--- a/Source/AutoExtern/AutoExtern.csproj
+++ b/Source/AutoExtern/AutoExtern.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/Source/Dafny.sln b/Source/Dafny.sln
index 23297b185ed..91dbe9dc747 100644
--- a/Source/Dafny.sln
+++ b/Source/Dafny.sln
@@ -43,6 +43,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DafnyDriver.Test", "DafnyDr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DafnyCore.Test", "DafnyCore.Test\DafnyCore.Test.csproj", "{33C29F26-A27B-474D-B436-83EA615B09FC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scripts", "Scripts\Scripts.csproj", "{3FAB051A-1745-497B-B4C0-D49194BB5D32}"
+EndProject
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -130,6 +132,10 @@ Global
 		{96B8ADA8-6190-49F7-8C38-CDA60DC92293}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{96B8ADA8-6190-49F7-8C38-CDA60DC92293}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{96B8ADA8-6190-49F7-8C38-CDA60DC92293}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FAB051A-1745-497B-B4C0-D49194BB5D32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FAB051A-1745-497B-B4C0-D49194BB5D32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FAB051A-1745-497B-B4C0-D49194BB5D32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FAB051A-1745-497B-B4C0-D49194BB5D32}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Source/Dafny/Dafny.cs b/Source/Dafny/Dafny.cs
index 6de73007627..c99ff44e385 100644
--- a/Source/Dafny/Dafny.cs
+++ b/Source/Dafny/Dafny.cs
@@ -1,9 +1,10 @@
+using System.Threading.Tasks;
 using Microsoft.Dafny;
 
 namespace Dafny;
 
 public class Dafny {
-  public static int Main(string[] args) {
-    return DafnyDriver.Main(args);
+  public static Task<int> Main(string[] args) {
+    return DafnyBackwardsCompatibleCli.Main(args);
   }
 }
diff --git a/Source/Dafny/Dafny.csproj b/Source/Dafny/Dafny.csproj
index 0ac53285657..7c639eb2b7e 100644
--- a/Source/Dafny/Dafny.csproj
+++ b/Source/Dafny/Dafny.csproj
@@ -5,7 +5,7 @@
       <AssemblyName>Dafny</AssemblyName>
       <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
       <DefineConstants>TRACE</DefineConstants>
-      <TargetFramework>net6.0</TargetFramework>
+      <RollForward>Major</RollForward>
       <OutputPath>..\..\Binaries\</OutputPath>
       <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
 
@@ -15,7 +15,7 @@
       <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
diff --git a/Source/DafnyBenchmarkingPlugin/BenchmarkInstrumentation.cs b/Source/DafnyBenchmarkingPlugin/BenchmarkInstrumentation.cs
index 79daf0fd340..9a8291c09f3 100644
--- a/Source/DafnyBenchmarkingPlugin/BenchmarkInstrumentation.cs
+++ b/Source/DafnyBenchmarkingPlugin/BenchmarkInstrumentation.cs
@@ -6,12 +6,12 @@
 public class BenchmarkingCompilerInstrumenter : CompilerInstrumenter {
   public BenchmarkingCompilerInstrumenter(ErrorReporter reporter) : base(reporter) { }
 
-  public override void Instrument(IExecutableBackend backend, SinglePassCompiler compiler, Program program) {
-    if (compiler is JavaCompiler javaCompiler) {
+  public override void Instrument(IExecutableBackend backend, SinglePassCodeGenerator codeGenerator, Program program) {
+    if (codeGenerator is JavaCodeGenerator javaCompiler) {
       javaCompiler.AddInstrumenter(new JavaBenchmarkCompilationInstrumenter(Reporter));
     } else {
-      Reporter.Error(MessageSource.Compiler, ResolutionErrors.ErrorId.none, program.GetFirstTopLevelToken(),
-        $"The benchmarking plugin does not support this compilation target: {compiler} (--target:{backend.TargetId})");
+      Reporter.Error(MessageSource.Compiler, ResolutionErrors.ErrorId.none, program.GetStartOfFirstFileToken(),
+        $"The benchmarking plugin does not support this compilation target: {codeGenerator} (--target:{backend.TargetId})");
     }
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyBenchmarkingPlugin/DafnyBenchmarkingPlugin.csproj b/Source/DafnyBenchmarkingPlugin/DafnyBenchmarkingPlugin.csproj
index badfad3b141..85823c27a94 100644
--- a/Source/DafnyBenchmarkingPlugin/DafnyBenchmarkingPlugin.csproj
+++ b/Source/DafnyBenchmarkingPlugin/DafnyBenchmarkingPlugin.csproj
@@ -1,14 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <RollForward>Major</RollForward>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <OutputPath>..\..\Binaries\</OutputPath>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\DafnyCore\DafnyCore.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath="\" />
+    </ItemGroup>
+
 </Project>
diff --git a/Source/DafnyBenchmarkingPlugin/JavaBenchmarkCompilationInstrumenter.cs b/Source/DafnyBenchmarkingPlugin/JavaBenchmarkCompilationInstrumenter.cs
index 595e22f2e77..1093739a14c 100644
--- a/Source/DafnyBenchmarkingPlugin/JavaBenchmarkCompilationInstrumenter.cs
+++ b/Source/DafnyBenchmarkingPlugin/JavaBenchmarkCompilationInstrumenter.cs
@@ -21,7 +21,7 @@ public override void BeforeMethod(Method m, ConcreteSyntaxTree wr) {
     if (Attributes.Contains(m.EnclosingClass.Attributes, "benchmarks")) {
       if (m is Constructor) {
         if (m.Ins.Any()) {
-          Reporter.Error(MessageSource.Compiler, ResolutionErrors.ErrorId.none, m.tok,
+          Reporter.Error(MessageSource.Compiler, ResolutionErrors.ErrorId.none, m.Origin,
             $"Classes with {{:benchmarks}} can not accept parameters in their constructors");
         }
 
@@ -34,7 +34,7 @@ public override void BeforeMethod(Method m, ConcreteSyntaxTree wr) {
         wr.WriteLine("@org.openjdk.jmh.annotations.Setup(org.openjdk.jmh.annotations.Level.Iteration)");
       } else if (Attributes.Contains(m.Attributes, "benchmarkTearDown")) {
         if (m.Ins.Any()) {
-          Reporter.Error(MessageSource.Compiler, ResolutionErrors.ErrorId.none, m.tok,
+          Reporter.Error(MessageSource.Compiler, ResolutionErrors.ErrorId.none, m.Origin,
             $"Methods with {{:benchmarkTearDown}} can not accept parameters");
         }
         wr.WriteLine("@org.openjdk.jmh.annotations.TearDown(org.openjdk.jmh.annotations.Level.Iteration)");
diff --git a/Source/DafnyCore.Test/ClonerTest.cs b/Source/DafnyCore.Test/ClonerTest.cs
index 5a2b0227154..8d0dccc169a 100644
--- a/Source/DafnyCore.Test/ClonerTest.cs
+++ b/Source/DafnyCore.Test/ClonerTest.cs
@@ -1,6 +1,7 @@
 using Microsoft.Dafny;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Tomlyn;
 
 namespace DafnyCore.Test;
@@ -10,28 +11,31 @@ class DummyDecl : Declaration {
     public DummyDecl(Cloner cloner, Declaration original) : base(cloner, original) {
     }
 
-    public DummyDecl(RangeToken rangeToken, Name name, Attributes attributes, bool isRefining) : base(rangeToken, name,
+    public DummyDecl(IOrigin origin, Name name, Attributes attributes, bool isRefining) : base(origin, name,
       attributes, isRefining) {
     }
+
+    public override SymbolKind? Kind => null;
+    public override string GetDescription(DafnyOptions options) {
+      return "";
+    }
   }
 
   [Fact]
   public void ClonerKeepsBodyStartTok() {
     var tokenBodyStart = new Token() { line = 2 };
-    var rangeToken = new RangeToken(Token.NoToken, Token.NoToken);
+    var rangeToken = new SourceOrigin(Token.NoToken, Token.NoToken);
     var specificationFrame = new LiteralExpr(Microsoft.Dafny.Token.NoToken, 1);
-    var formal1 = new Formal(Token.NoToken, "a", Microsoft.Dafny.Type.Bool, true, false, null) {
-      RangeToken = new RangeToken(tokenBodyStart, tokenBodyStart),
+    var formal1 = new Formal(new SourceOrigin(tokenBodyStart, tokenBodyStart), "a", Microsoft.Dafny.Type.Bool, true, false, null) {
       IsTypeExplicit = true
     };
-    var formal2 = new Formal(Token.NoToken, "b", Microsoft.Dafny.Type.Bool, true, false, null) {
-      RangeToken = new RangeToken(tokenBodyStart, tokenBodyStart),
+    var formal2 = new Formal(new SourceOrigin(tokenBodyStart, tokenBodyStart), "b", Microsoft.Dafny.Type.Bool, true, false, null) {
       IsTypeExplicit = false
     };
     var dummyDecl = new Method(rangeToken, new Name(rangeToken, "hello"),
       false, false, new List<TypeParameter>(), new List<Formal> { formal1, formal2 },
       new List<Formal>(), new List<AttributedExpression>(),
-      new Specification<FrameExpression>(new List<FrameExpression>(), null),
+      new Specification<FrameExpression>(), new Specification<FrameExpression>(new List<FrameExpression>(), null),
       new List<AttributedExpression>(), new Specification<Expression>(new List<Expression>(), null),
       new BlockStmt(rangeToken, new List<Statement>()), null, Token.NoToken, false);
 
@@ -39,9 +43,9 @@ public void ClonerKeepsBodyStartTok() {
     var cloner = new Cloner();
     var dummyDecl2 = cloner.CloneMethod(dummyDecl);
     Assert.Equal(2, dummyDecl2.BodyStartTok.line);
-    Assert.Equal(2, dummyDecl2.Ins[0].RangeToken.StartToken.line);
+    Assert.Equal(2, dummyDecl2.Ins[0].Origin.StartToken.line);
     Assert.True(dummyDecl2.Ins[0].IsTypeExplicit);
-    Assert.Equal(2, dummyDecl2.Ins[1].RangeToken.StartToken.line);
+    Assert.Equal(2, dummyDecl2.Ins[1].Origin.StartToken.line);
     Assert.False(dummyDecl2.Ins[1].IsTypeExplicit);
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore.Test/DafnyCore.Test.csproj b/Source/DafnyCore.Test/DafnyCore.Test.csproj
index 8e9d3e8aeba..e585e29faf8 100644
--- a/Source/DafnyCore.Test/DafnyCore.Test.csproj
+++ b/Source/DafnyCore.Test/DafnyCore.Test.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
diff --git a/Source/DafnyCore.Test/DafnyProjectTest.cs b/Source/DafnyCore.Test/DafnyProjectTest.cs
index 836b21309bc..ca68a2ce67d 100644
--- a/Source/DafnyCore.Test/DafnyProjectTest.cs
+++ b/Source/DafnyCore.Test/DafnyProjectTest.cs
@@ -1,40 +1,37 @@
 using Microsoft.Dafny;
 
-namespace DafnyCore.Test; 
+namespace DafnyCore.Test;
 
 public class DafnyProjectTest {
   [Fact]
   public void Equality() {
     var randomFileName = Path.GetTempFileName();
-    var first = new DafnyProject() {
-      Uri = new Uri(randomFileName, UriKind.Absolute),
-      Includes = new[] { "a", "a2" },
-      Excludes = new[] { "b", "b2" },
-      Options = new Dictionary<string, object>() {
+    var first = new DafnyProject(null, new Uri(randomFileName, UriKind.Absolute), null,
+      new[] { "a", "a2" }.ToHashSet(),
+      new[] { "b", "b2" }.ToHashSet(), new Dictionary<string, object>() {
         { "c", "d" },
         { "e", "f" }
       }
-    };
+    );
 
-    var second = new DafnyProject() {
-      Uri = new Uri(randomFileName, UriKind.Absolute),
-      Includes = new[] { "a2", "a" },
-      Excludes = new[] { "b2", "b" },
-      Options = new Dictionary<string, object>() {
+    var second = new DafnyProject(null, new Uri(randomFileName, UriKind.Absolute), null,
+      new[] { "a2", "a" }.ToHashSet(),
+      new[] { "b2", "b" }.ToHashSet(),
+      new Dictionary<string, object>() {
         { "e", "f" },
         { "c", "d" },
       }
-    };
+    );
 
     Assert.Equal(first, second);
 
-    first.Options.Add("k", new[] { 1, 2, 3 });
-    second.Options.Add("k", new[] { 1, 2, 3 });
+    first.Options.Add("k", "1, 2, 3");
+    second.Options.Add("k", "1, 2, 3");
 
     Assert.Equal(first, second);
 
-    first.Options.Add("m", new[] { 1, 2, 3 });
-    second.Options.Add("m", new[] { 3, 2, 1 });
+    first.Options.Add("m", "1, 2, 3");
+    second.Options.Add("m", "3, 2, 1");
     Assert.NotEqual(first, second);
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore.Test/DooFileTest.cs b/Source/DafnyCore.Test/DooFileTest.cs
index 98705c6a52b..93e668fac27 100644
--- a/Source/DafnyCore.Test/DooFileTest.cs
+++ b/Source/DafnyCore.Test/DooFileTest.cs
@@ -7,15 +7,16 @@ namespace DafnyCore.Test;
 
 public class DooFileTest {
   [Fact]
-  public void RoundTripCurrentVersion() {
+  public async Task RoundTripCurrentVersion() {
     var options = DafnyOptions.Default;
     options.ApplyDefaultOptionsWithoutSettingsDefault();
-    var program = ParseProgram("module MyModule { function TheAnswer(): int { 42 } }", options);
+    var program = await ParseProgram("module MyModule { function TheAnswer(): int { 42 } }", options);
+    options.ProcessSolverOptions(program.Reporter, Token.Cli);
     var dooFile = new DooFile(program);
 
     var path = Path.GetTempFileName();
     dooFile.Write(path);
-    var loadedDooFile = DooFile.Read(path);
+    var loadedDooFile = await DooFile.Read(path);
 
     Assert.Equal(loadedDooFile.Manifest.DooFileVersion, DooFile.ManifestData.CurrentDooFileVersion);
     Assert.Equal(loadedDooFile.Manifest.DafnyVersion, options.VersionNumber);
@@ -30,13 +31,13 @@ public void UnknownManifestEntries() {
     Assert.Throws<TomlException>(() => DooFile.ManifestData.Read(new StringReader(source)));
   }
 
-  private static Program ParseProgram(string dafnyProgramText, DafnyOptions options) {
+  private static async Task<Program> ParseProgram(string dafnyProgramText, DafnyOptions options) {
     const string fullFilePath = "untitled:foo";
     var rootUri = new Uri(fullFilePath);
     Microsoft.Dafny.Type.ResetScopes();
     var errorReporter = new ConsoleErrorReporter(options);
-    var program = new ProgramParser().Parse(dafnyProgramText, rootUri, errorReporter);
+    var parseResult = await new ProgramParser().Parse(dafnyProgramText, rootUri, errorReporter);
     Assert.Equal(0, errorReporter.ErrorCount);
-    return program;
+    return parseResult.Program;
   }
 }
diff --git a/Source/DafnyCore.Test/GeneratedDafnyTest.cs b/Source/DafnyCore.Test/GeneratedDafnyTest.cs
new file mode 100644
index 00000000000..3d4595d4e3f
--- /dev/null
+++ b/Source/DafnyCore.Test/GeneratedDafnyTest.cs
@@ -0,0 +1,26 @@
+using System.Collections.Concurrent;
+using Microsoft.Dafny;
+
+namespace DafnyCore.Test;
+
+public class GeneratedDafnyTest {
+  [Fact]
+  public void TestDafnyCoverage() {
+    DafnyToRustCompilerCoverage.__default.TestIsCopy(); ;
+  }
+
+  [Fact]
+  public void TestRustASTCoverage() {
+    RASTCoverage.__default.TestExpr();
+  }
+
+  [Fact]
+  public void TestPathSimplification() {
+    FactorPathsOptimizationTest.__default.TestApply();
+  }
+
+  [Fact]
+  public void TestDefsCoverage() {
+    DefsCoverage.__default.Tests();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore.Test/GeneratedFromDafny/DafnyToRustCompilerCoverage.cs b/Source/DafnyCore.Test/GeneratedFromDafny/DafnyToRustCompilerCoverage.cs
new file mode 100644
index 00000000000..699aeffaaf2
--- /dev/null
+++ b/Source/DafnyCore.Test/GeneratedFromDafny/DafnyToRustCompilerCoverage.cs
@@ -0,0 +1,32 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace DafnyToRustCompilerCoverage {
+
+  public partial class __default {
+    public static void TestIsCopy()
+    {
+      if (!(Defs.__default.IsNewtypeCopy(DAST.NewtypeRange.create_Bool()))) {
+        throw new Dafny.HaltException("Backends/Rust/Dafny-compiler-rust-coverage.dfy(9,4): " + Dafny.Sequence<Dafny.Rune>.UnicodeFromString("expectation violation").ToVerbatimString(false));}
+      if (!(Defs.__default.IsNewtypeCopy(DAST.NewtypeRange.create_U128(true)))) {
+        throw new Dafny.HaltException("Backends/Rust/Dafny-compiler-rust-coverage.dfy(10,4): " + Dafny.Sequence<Dafny.Rune>.UnicodeFromString("expectation violation").ToVerbatimString(false));}
+      if (!(Defs.__default.IsNewtypeCopy(DAST.NewtypeRange.create_U128(false)))) {
+        throw new Dafny.HaltException("Backends/Rust/Dafny-compiler-rust-coverage.dfy(11,4): " + Dafny.Sequence<Dafny.Rune>.UnicodeFromString("expectation violation").ToVerbatimString(false));}
+      if (!(!(Defs.__default.IsNewtypeCopy(DAST.NewtypeRange.create_BigInt())))) {
+        throw new Dafny.HaltException("Backends/Rust/Dafny-compiler-rust-coverage.dfy(12,4): " + Dafny.Sequence<Dafny.Rune>.UnicodeFromString("expectation violation").ToVerbatimString(false));}
+      if (!(!(Defs.__default.IsNewtypeCopy(DAST.NewtypeRange.create_NoRange())))) {
+        throw new Dafny.HaltException("Backends/Rust/Dafny-compiler-rust-coverage.dfy(13,4): " + Dafny.Sequence<Dafny.Rune>.UnicodeFromString("expectation violation").ToVerbatimString(false));}
+    }
+  }
+} // end of namespace DafnyToRustCompilerCoverage
\ No newline at end of file
diff --git a/Source/DafnyCore.Test/GeneratedFromDafny/DefsCoverage.cs b/Source/DafnyCore.Test/GeneratedFromDafny/DefsCoverage.cs
new file mode 100644
index 00000000000..c31e0447b04
--- /dev/null
+++ b/Source/DafnyCore.Test/GeneratedFromDafny/DefsCoverage.cs
@@ -0,0 +1,83 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace DefsCoverage {
+
+  public partial class __default {
+    public static void Expect(bool x)
+    {
+      if (!(x)) {
+        throw new Dafny.HaltException("Backends/Rust/Dafny-compiler-rust-definitions-coverage.dfy(17,4): " + Dafny.Sequence<Dafny.Rune>.UnicodeFromString("expectation violation").ToVerbatimString(false));}
+    }
+    public static void Tests()
+    {
+      DefsCoverage.__default.Expect(object.Equals((Defs.AssignmentStatus.create_SurelyAssigned()).Join(Defs.AssignmentStatus.create_SurelyAssigned()), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals((Defs.AssignmentStatus.create_NotAssigned()).Join(Defs.AssignmentStatus.create_NotAssigned()), Defs.AssignmentStatus.create_NotAssigned()));
+      DefsCoverage.__default.Expect(object.Equals((Defs.AssignmentStatus.create_NotAssigned()).Join(Defs.AssignmentStatus.create_SurelyAssigned()), Defs.AssignmentStatus.create_Unknown()));
+      DefsCoverage.__default.Expect(object.Equals((Defs.AssignmentStatus.create_SurelyAssigned()).Join(Defs.AssignmentStatus.create_NotAssigned()), Defs.AssignmentStatus.create_Unknown()));
+      DefsCoverage.__default.Expect((object.Equals((Defs.AssignmentStatus.create_Unknown()).Join(Defs.AssignmentStatus.create_NotAssigned()), (Defs.AssignmentStatus.create_NotAssigned()).Join(Defs.AssignmentStatus.create_Unknown()))) && (object.Equals((Defs.AssignmentStatus.create_NotAssigned()).Join(Defs.AssignmentStatus.create_Unknown()), Defs.AssignmentStatus.create_Unknown())));
+      DefsCoverage.__default.Expect((object.Equals((Defs.AssignmentStatus.create_Unknown()).Join(Defs.AssignmentStatus.create_SurelyAssigned()), (Defs.AssignmentStatus.create_SurelyAssigned()).Join(Defs.AssignmentStatus.create_Unknown()))) && (object.Equals((Defs.AssignmentStatus.create_SurelyAssigned()).Join(Defs.AssignmentStatus.create_Unknown()), Defs.AssignmentStatus.create_Unknown())));
+      DefsCoverage.__default.Expect(object.Equals((Defs.AssignmentStatus.create_Unknown()).Join(Defs.AssignmentStatus.create_Unknown()), Defs.AssignmentStatus.create_Unknown()));
+      DefsCoverage.__default.Expect((((object.Equals((Defs.AssignmentStatus.create_SurelyAssigned()).Then(Defs.AssignmentStatus.create_Unknown()), (Defs.AssignmentStatus.create_SurelyAssigned()).Then(Defs.AssignmentStatus.create_NotAssigned()))) && (object.Equals((Defs.AssignmentStatus.create_SurelyAssigned()).Then(Defs.AssignmentStatus.create_NotAssigned()), (Defs.AssignmentStatus.create_SurelyAssigned()).Then(Defs.AssignmentStatus.create_SurelyAssigned())))) && (object.Equals((Defs.AssignmentStatus.create_SurelyAssigned()).Then(Defs.AssignmentStatus.create_SurelyAssigned()), (Defs.AssignmentStatus.create_NotAssigned()).Then(Defs.AssignmentStatus.create_SurelyAssigned())))) && (object.Equals((Defs.AssignmentStatus.create_NotAssigned()).Then(Defs.AssignmentStatus.create_SurelyAssigned()), Defs.AssignmentStatus.create_SurelyAssigned())));
+      DefsCoverage.__default.Expect((((object.Equals((Defs.AssignmentStatus.create_Unknown()).Then(Defs.AssignmentStatus.create_NotAssigned()), (Defs.AssignmentStatus.create_Unknown()).Then(Defs.AssignmentStatus.create_SurelyAssigned()))) && (object.Equals((Defs.AssignmentStatus.create_Unknown()).Then(Defs.AssignmentStatus.create_SurelyAssigned()), (Defs.AssignmentStatus.create_Unknown()).Then(Defs.AssignmentStatus.create_Unknown())))) && (object.Equals((Defs.AssignmentStatus.create_Unknown()).Then(Defs.AssignmentStatus.create_Unknown()), (Defs.AssignmentStatus.create_NotAssigned()).Then(Defs.AssignmentStatus.create_Unknown())))) && (object.Equals((Defs.AssignmentStatus.create_NotAssigned()).Then(Defs.AssignmentStatus.create_Unknown()), Defs.AssignmentStatus.create_Unknown())));
+      DefsCoverage.__default.Expect(object.Equals((Defs.AssignmentStatus.create_NotAssigned()).Then(Defs.AssignmentStatus.create_NotAssigned()), Defs.AssignmentStatus.create_NotAssigned()));
+      Dafny.ISequence<Dafny.Rune> _0_x;
+      _0_x = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x");
+      Dafny.ISequence<Dafny.Rune> _1_y;
+      _1_y = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("y");
+      DAST._IExpression _2_z;
+      _2_z = DAST.Expression.create_Ident(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("z"));
+      Dafny.ISequence<DAST._IStatement> _3_assigns__x;
+      _3_assigns__x = Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Assign(DAST.AssignLhs.create_Ident(_0_x), DAST.Expression.create_Ident(_1_y)));
+      Dafny.ISequence<DAST._IStatement> _4_assigns__y;
+      _4_assigns__y = Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Assign(DAST.AssignLhs.create_Ident(_1_y), DAST.Expression.create_Ident(_0_x)));
+      DAST._IExpression _5_cond;
+      _5_cond = DAST.Expression.create_Ident(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("cond"));
+      Dafny.ISequence<DAST._IStatement> _6_unknown__x;
+      _6_unknown__x = Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_If(_5_cond, _3_assigns__x, _4_assigns__y));
+      Dafny.ISequence<DAST._IStatement> _7_surely__double__x;
+      _7_surely__double__x = Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_If(_5_cond, _3_assigns__x, _3_assigns__x));
+      Dafny.ISequence<DAST._IStatement> _8_call__to__x;
+      _8_call__to__x = Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Call(_2_z, DAST.CallName.create_SetBuilderAdd(), Dafny.Sequence<DAST._IType>.FromElements(), Dafny.Sequence<DAST._IExpression>.FromElements(), Std.Wrappers.Option<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.create_Some(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_0_x))));
+      Dafny.ISequence<DAST._IStatement> _9_declare__x__again;
+      _9_declare__x__again = Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_DeclareVar(_0_x, DAST.Type.create_Tuple(Dafny.Sequence<DAST._IType>.FromElements()), Std.Wrappers.Option<DAST._IExpression>.create_None()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(_4_assigns__y, _0_x), Defs.AssignmentStatus.create_NotAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(_3_assigns__x, _0_x), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(_3_assigns__x, _1_y), Defs.AssignmentStatus.create_NotAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(_3_assigns__x, _4_assigns__y), _1_y), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(_6_unknown__x, _0_x), Defs.AssignmentStatus.create_Unknown()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(_7_surely__double__x, _0_x), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(_7_surely__double__x, _1_y), Defs.AssignmentStatus.create_NotAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(_8_call__to__x, _0_x), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(_8_call__to__x, _1_y), Defs.AssignmentStatus.create_NotAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(_8_call__to__x, _4_assigns__y), _1_y), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Labeled(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("l"), _4_assigns__y)), _3_assigns__x), _1_y), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Labeled(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("l"), _3_assigns__x)), _4_assigns__y), _0_x), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Labeled(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("l"), _3_assigns__x)), _4_assigns__y), _0_x), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(_9_declare__x__again, _3_assigns__x), _0_x), Defs.AssignmentStatus.create_NotAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(_9_declare__x__again, _4_assigns__y), _1_y), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Return(_2_z)), _3_assigns__x), _0_x), Defs.AssignmentStatus.create_NotAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_EarlyReturn()), _3_assigns__x), _0_x), Defs.AssignmentStatus.create_NotAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_JumpTailCallStart()), _3_assigns__x), _0_x), Defs.AssignmentStatus.create_NotAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Print(_2_z)), _3_assigns__x), _0_x), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Print(_2_z)), _3_assigns__x), _0_x), Defs.AssignmentStatus.create_SurelyAssigned()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_While(_2_z, Dafny.Sequence<DAST._IStatement>.FromElements())), _3_assigns__x), _0_x), Defs.AssignmentStatus.create_Unknown()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_If(_5_cond, _3_assigns__x, Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_If(_5_cond, _3_assigns__x, _4_assigns__y)))), _0_x), Defs.AssignmentStatus.create_Unknown()));
+      DefsCoverage.__default.Expect(object.Equals(Defs.__default.DetectAssignmentStatus(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_If(_5_cond, Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_If(_5_cond, Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Return(_2_z)), Dafny.Sequence<DAST._IStatement>.FromElements())), _3_assigns__x), Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_If(_5_cond, Dafny.Sequence<DAST._IStatement>.Concat(Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_If(_5_cond, Dafny.Sequence<DAST._IStatement>.FromElements(DAST.Statement.create_Return(_2_z)), Dafny.Sequence<DAST._IStatement>.FromElements())), _3_assigns__x), _4_assigns__y)))), _0_x), Defs.AssignmentStatus.create_Unknown()));
+    }
+    public static Dafny.ISequence<Dafny.Rune> IND { get {
+      return RAST.__default.IND;
+    } }
+  }
+} // end of namespace DefsCoverage
\ No newline at end of file
diff --git a/Source/DafnyCore.Test/GeneratedFromDafny/FactorPathsOptimizationTest.cs b/Source/DafnyCore.Test/GeneratedFromDafny/FactorPathsOptimizationTest.cs
new file mode 100644
index 00000000000..04573118e97
--- /dev/null
+++ b/Source/DafnyCore.Test/GeneratedFromDafny/FactorPathsOptimizationTest.cs
@@ -0,0 +1,49 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace FactorPathsOptimizationTest {
+
+  public partial class __default {
+    public static void ShouldBeEqual(RAST._IMod a, RAST._IMod b)
+    {
+      Dafny.ISequence<Dafny.Rune> _0_sA;
+      _0_sA = (a)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+      Dafny.ISequence<Dafny.Rune> _1_sB;
+      _1_sB = (b)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+      if (!(_0_sA).Equals(_1_sB)) {
+        Dafny.Helpers.Print((Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Got:\n"), _0_sA), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"))).ToVerbatimString(false));
+        Dafny.Helpers.Print((Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Expected:\n"), _1_sB), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"))).ToVerbatimString(false));
+        if (!((_0_sA).Equals(_1_sB))) {
+          throw new Dafny.HaltException("Backends/Rust/Dafny-compiler-rust-path-simplification.dfy(13,6): " + Dafny.Sequence<Dafny.Rune>.UnicodeFromString("expectation violation").ToVerbatimString(false));}
+      }
+    }
+    public static void TestApply()
+    {
+      RAST._ITypeParamDecl _0_T__Decl;
+      _0_T__Decl = RAST.TypeParamDecl.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("T"), Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.DafnyType));
+      RAST._ITypeParamDecl _1_T__Decl__simp;
+      _1_T__Decl__simp = RAST.TypeParamDecl.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("T"), Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyType"))));
+      RAST._IType _2_T;
+      _2_T = RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("T"));
+      RAST._IPath _3_std__any__Any;
+      _3_std__any__Any = (((RAST.__default.@global).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("std"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("any"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Any"));
+      RAST._IType _4_Any;
+      _4_Any = RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Any"));
+      FactorPathsOptimizationTest.__default.ShouldBeEqual(Dafny.Helpers.Id<Func<RAST._IMod, RAST._IMod>>(FactorPathsOptimization.__default.apply(RAST.__default.crate))(RAST.Mod.create_Mod(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("onemodule"), Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_StructDecl(RAST.Struct.create(RAST.__default.NoDoc, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("test"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_0_T__Decl), RAST.Fields.create_NamedFields(Dafny.Sequence<RAST._IField>.FromElements(RAST.Field.create(RAST.Visibility.create_PUB(), RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("a"), (_3_std__any__Any).AsType())))))), RAST.ModDecl.create_ImplDecl(RAST.Impl.create_Impl(Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_0_T__Decl), (RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("test"))).Apply(Dafny.Sequence<RAST._IType>.FromElements(_2_T)), Dafny.Sequence<RAST._IImplMember>.FromElements())), RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_0_T__Decl), (_3_std__any__Any).AsType(), ((((RAST.__default.crate).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("onemodule"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("test"))).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(_2_T)), Dafny.Sequence<RAST._IImplMember>.FromElements()))))), RAST.Mod.create_Mod(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("onemodule"), Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyType")))), RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), _3_std__any__Any)), RAST.ModDecl.create_StructDecl(RAST.Struct.create(RAST.__default.NoDoc, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("test"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_1_T__Decl__simp), RAST.Fields.create_NamedFields(Dafny.Sequence<RAST._IField>.FromElements(RAST.Field.create(RAST.Visibility.create_PUB(), RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("a"), _4_Any)))))), RAST.ModDecl.create_ImplDecl(RAST.Impl.create_Impl(Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_1_T__Decl__simp), (RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("test"))).Apply(Dafny.Sequence<RAST._IType>.FromElements(_2_T)), Dafny.Sequence<RAST._IImplMember>.FromElements())), RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_1_T__Decl__simp), _4_Any, (RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("test"))).Apply(Dafny.Sequence<RAST._IType>.FromElements(_2_T)), Dafny.Sequence<RAST._IImplMember>.FromElements())))));
+      FactorPathsOptimizationTest.__default.ShouldBeEqual(Dafny.Helpers.Id<Func<RAST._IMod, RAST._IMod>>(FactorPathsOptimization.__default.apply(RAST.__default.crate))(RAST.Mod.create_Mod(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("onemodule"), Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_0_T__Decl), (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("UpcastObject"))).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")))), (RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("test"))).Apply(Dafny.Sequence<RAST._IType>.FromElements(_2_T)), Dafny.Sequence<RAST._IImplMember>.FromElements()))))), RAST.Mod.create_Mod(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("onemodule"), Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyType")))), RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("UpcastObject")))), RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_1_T__Decl__simp), (RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("UpcastObject"))).Apply(Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")))), (RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("test"))).Apply(Dafny.Sequence<RAST._IType>.FromElements(_2_T)), Dafny.Sequence<RAST._IImplMember>.FromElements())))));
+      FactorPathsOptimizationTest.__default.ShouldBeEqual(Dafny.Helpers.Id<Func<RAST._IMod, RAST._IMod>>(FactorPathsOptimization.__default.apply(RAST.__default.crate))(RAST.Mod.create_Mod(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("onemodule"), Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ConstDecl(RAST.Constant.create(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dummy"), (_3_std__any__Any).AsType(), RAST.Expr.create_StmtExpr(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("doit"), Std.Wrappers.Option<RAST._IType>.create_Some(((RAST.__default.std__rc__Rc).AsType()).Apply1(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unknown")))), Std.Wrappers.Option<RAST._IExpr>.create_Some(((RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("something"))).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_DynType((RAST.__default.std__default__Default).AsType())))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.__default.std__default__Default__default, (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("rd!"))).AsExpr()).Apply1(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("obj"))))))), RAST.Expr.create_TypeAscription(RAST.Expr.create_ExprFromType(((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyString"))).AsType()), ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyType"))).AsType()))))))), RAST.Mod.create_Mod(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("onemodule"), Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), _3_std__any__Any)), RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), RAST.__default.std__rc__Rc)), RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), RAST.__default.std__default__Default)), RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("rd")))), RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyString")))), RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyType")))), RAST.ModDecl.create_ConstDecl(RAST.Constant.create(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dummy"), RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Any")), RAST.Expr.create_StmtExpr(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("doit"), Std.Wrappers.Option<RAST._IType>.create_Some((RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Rc"))).Apply1(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unknown")))), Std.Wrappers.Option<RAST._IExpr>.create_Some(((RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("something"))).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_DynType(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Default")))))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(((RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Default"))).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("default"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements()), (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("rd!"))).Apply1(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("obj"))))))), RAST.Expr.create_TypeAscription(RAST.Expr.create_ExprFromType(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyString"))), RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyType")))))))));
+      FactorPathsOptimizationTest.__default.ShouldBeEqual(Dafny.Helpers.Id<Func<RAST._IMod, RAST._IMod>>(FactorPathsOptimization.__default.apply(RAST.__default.crate))(RAST.Mod.create_Mod(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("onemodule"), Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_TraitDecl(RAST.Trait.create(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Something")), Dafny.Sequence<RAST._IType>.FromElements(), Dafny.Sequence<RAST._IImplMember>.FromElements())), RAST.ModDecl.create_ConstDecl(RAST.Constant.create(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dummyExtern"), (((RAST.__default.crate).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("anothermodule"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Something"))).AsType(), RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("nothing")))), RAST.ModDecl.create_ConstDecl(RAST.Constant.create(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dummyIntern"), (((RAST.__default.crate).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("onemodule"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Something"))).AsType(), RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("nothing"))))))), RAST.Mod.create_Mod(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("onemodule"), Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_TraitDecl(RAST.Trait.create(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Something")), Dafny.Sequence<RAST._IType>.FromElements(), Dafny.Sequence<RAST._IImplMember>.FromElements())), RAST.ModDecl.create_ConstDecl(RAST.Constant.create(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dummyExtern"), (((RAST.__default.crate).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("anothermodule"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Something"))).AsType(), RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("nothing")))), RAST.ModDecl.create_ConstDecl(RAST.Constant.create(RAST.__default.NoDoc, RAST.__default.NoAttr, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dummyIntern"), RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Something")), RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("nothing")))))));
+    }
+  }
+} // end of namespace FactorPathsOptimizationTest
\ No newline at end of file
diff --git a/Source/DafnyCore.Test/GeneratedFromDafny/RASTCoverage.cs b/Source/DafnyCore.Test/GeneratedFromDafny/RASTCoverage.cs
new file mode 100644
index 00000000000..bebebfe2763
--- /dev/null
+++ b/Source/DafnyCore.Test/GeneratedFromDafny/RASTCoverage.cs
@@ -0,0 +1,165 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace RASTCoverage {
+
+  public partial class __default {
+    public static void AssertCoverage(bool x)
+    {
+      if (!(x)) {
+        throw new Dafny.HaltException("Backends/Rust/Dafny-compiler-rust-coverage.dfy(26,4): " + Dafny.Sequence<Dafny.Rune>.UnicodeFromString("expectation violation").ToVerbatimString(false));}
+    }
+    public static void TestExpr()
+    {
+      RASTCoverage.__default.TestOptimizeToString();
+      RASTCoverage.__default.TestPrintingInfo();
+      RASTCoverage.__default.TestNoExtraSemicolonAfter();
+    }
+    public static void TestNoOptimize(RAST._IExpr e)
+    {
+    }
+    public static RAST._IExpr ConversionNum(RAST._IType t, RAST._IExpr x)
+    {
+      return RAST.Expr.create_Call(RAST.Expr.create_ExprFromPath(RAST.Path.create_PMemberSelect(RAST.Path.create_PMemberSelect(RAST.Path.create_Global(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dafny_runtime")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("truncate!"))), Dafny.Sequence<RAST._IExpr>.FromElements(x, RAST.Expr.create_ExprFromType(t)));
+    }
+    public static RAST._IExpr DafnyIntLiteral(Dafny.ISequence<Dafny.Rune> s) {
+      return RAST.Expr.create_Call(RAST.Expr.create_ExprFromPath(RAST.Path.create_PMemberSelect(RAST.__default.dafny__runtime, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("int!"))), Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_LiteralInt(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("1"))));
+    }
+    public static RAST._IExpr Optimize(RAST._IExpr e) {
+      return (ExpressionOptimization.__default.ExprSimplifier()).ReplaceExpr(e);
+    }
+    public static void TestOptimizeToString()
+    {
+      RAST._IExpr _0_x;
+      _0_x = RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"));
+      RAST._IExpr _1_y;
+      _1_y = RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("y"));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), RAST.Expr.create_Call(RAST.Expr.create_Select(_0_x, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("clone")), Dafny.Sequence<RAST._IExpr>.FromElements(_1_y)), DAST.Format.UnaryOpFormat.create_NoFormat()));
+      RASTCoverage.__default.AssertCoverage(object.Equals(RASTCoverage.__default.Optimize(RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!"), RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("=="), _0_x, _1_y, DAST.Format.BinaryOpFormat.create_NoFormat()), DAST.Format.UnaryOpFormat.create_CombineFormat())), RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!="), _0_x, _1_y, DAST.Format.BinaryOpFormat.create_NoFormat())));
+      RASTCoverage.__default.AssertCoverage(object.Equals(RASTCoverage.__default.Optimize(RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!"), RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), _0_x, _1_y, DAST.Format.BinaryOpFormat.create_NoFormat()), DAST.Format.UnaryOpFormat.create_CombineFormat())), RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">="), _0_x, _1_y, DAST.Format.BinaryOpFormat.create_NoFormat())));
+      RASTCoverage.__default.AssertCoverage(object.Equals(RASTCoverage.__default.Optimize(RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!"), RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), _0_x, _1_y, DAST.Format.BinaryOpFormat.create_ReverseFormat()), DAST.Format.UnaryOpFormat.create_CombineFormat())), RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<="), _1_y, _0_x, DAST.Format.BinaryOpFormat.create_NoFormat())));
+      RASTCoverage.__default.AssertCoverage(object.Equals(RASTCoverage.__default.Optimize(RASTCoverage.__default.ConversionNum(RAST.Type.create_I128(), RASTCoverage.__default.DafnyIntLiteral(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("1")))), RAST.Expr.create_LiteralInt(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("1"))));
+      RASTCoverage.__default.TestNoOptimize(RASTCoverage.__default.ConversionNum(RAST.Type.create_I128(), _0_x));
+      RASTCoverage.__default.AssertCoverage(object.Equals(RASTCoverage.__default.Optimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("z"), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_I128()), Std.Wrappers.Option<RAST._IExpr>.create_None()), RAST.Expr.create_StmtExpr(RAST.__default.AssignVar(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("z"), _1_y), RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("return"))))), RAST.Expr.create_StmtExpr(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("z"), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_I128()), Std.Wrappers.Option<RAST._IExpr>.create_Some(_1_y)), RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("return")))));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("z"), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_I128()), Std.Wrappers.Option<RAST._IExpr>.create_None()), RAST.Expr.create_StmtExpr(RAST.__default.AssignVar(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("w"), _1_y), RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("return")))));
+      RASTCoverage.__default.TestNoOptimize(_0_x);
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(_0_x, _0_x));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_Match(_0_x, Dafny.Sequence<RAST._IMatchCase>.FromElements()), _0_x));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_StructBuild(_0_x, Dafny.Sequence<RAST._IAssignIdentifier>.FromElements()), _0_x));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_Tuple(Dafny.Sequence<RAST._IExpr>.FromElements()), _0_x));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), _0_x, DAST.Format.UnaryOpFormat.create_NoFormat()), _0_x));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&&"), _0_x, _0_x, DAST.Format.BinaryOpFormat.create_NoFormat()), _0_x));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_TypeAscription(_0_x, RAST.Type.create_I128()), _0_x));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_LiteralInt(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("1")), _0_x));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_LiteralString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("2"), true, false), _0_x));
+      RASTCoverage.__default.TestNoOptimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_LiteralString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("3"), false, true), _0_x));
+      RASTCoverage.__default.AssertCoverage(object.Equals(RASTCoverage.__default.Optimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("z"), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_I128()), Std.Wrappers.Option<RAST._IExpr>.create_None()), RAST.Expr.create_StmtExpr(RAST.__default.AssignVar(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("z"), _1_y), RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("return"))))), RAST.Expr.create_StmtExpr(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("z"), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_I128()), Std.Wrappers.Option<RAST._IExpr>.create_Some(_1_y)), RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("return")))));
+      Dafny.ISequence<RAST._IExpr> _2_coverageExpression;
+      _2_coverageExpression = Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc")), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), RAST.Expr.create_Match(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), Dafny.Sequence<RAST._IMatchCase>.FromElements(RAST.MatchCase.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"))))), RAST.Expr.create_StmtExpr(RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("panic!()")), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("a"))), RAST.Expr.create_Block(RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"))), RAST.Expr.create_StructBuild(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dummy")), Dafny.Sequence<RAST._IAssignIdentifier>.FromElements(RAST.AssignIdentifier.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("foo"), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("bar"))))), RAST.Expr.create_StructBuild(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dummy")), Dafny.Sequence<RAST._IAssignIdentifier>.FromElements(RAST.AssignIdentifier.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("foo"), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("bar"))), RAST.AssignIdentifier.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("foo2"), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("bar"))))), RAST.Expr.create_Tuple(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")))), RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("-"), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), DAST.Format.UnaryOpFormat.create_NoFormat()), RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("+"), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("y")), DAST.Format.BinaryOpFormat.create_NoFormat()), RAST.Expr.create_TypeAscription(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), RAST.Type.create_I128()), RAST.Expr.create_LiteralInt(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("322")), RAST.Expr.create_LiteralString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), true, false), RAST.Expr.create_LiteralString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), false, true), RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_I128()), Std.Wrappers.Option<RAST._IExpr>.create_None()), RAST.Expr.create_DeclareVar(RAST.DeclareType.create_CONST(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")))), RAST.__default.AssignVar(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"))), RAST.Expr.create_IfExpr(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"))), RAST.Expr.create_Loop(Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"))), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"))), RAST.Expr.create_For(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"))), RAST.Expr.create_Labelled(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"))), RAST.Expr.create_Break(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None()), RAST.Expr.create_Break(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("l"))), RAST.Expr.create_Continue(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None()), RAST.Expr.create_Continue(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("l"))), RAST.Expr.create_Return(Std.Wrappers.Option<RAST._IExpr>.create_None()), RAST.Expr.create_Return(Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")))), RAST.Expr.create_Call(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), Dafny.Sequence<RAST._IExpr>.FromElements()), RAST.Expr.create_Call(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("y")))), RAST.Expr.create_CallType(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_I128(), RAST.Type.create_U32())), RAST.Expr.create_Select(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc")), RAST.Expr.create_ExprFromPath(RAST.Path.create_PMemberSelect(RAST.Path.create_Crate(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"))), RAST.Expr.create_ExprFromPath(RAST.Path.create_PMemberSelect(RAST.Path.create_Global(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"))));
+      BigInteger _hi0 = new BigInteger((_2_coverageExpression).Count);
+      for (BigInteger _3_i = BigInteger.Zero; _3_i < _hi0; _3_i++) {
+        RAST._IExpr _4_c;
+        _4_c = (_2_coverageExpression).Select(_3_i);
+        RAST._IPrintingInfo _5___v0;
+        _5___v0 = (_4_c).printingInfo;
+        RAST._IExpr _6___v1;
+        _6___v1 = RASTCoverage.__default.Optimize(_4_c);
+        Dafny.IMap<RAST._IExpr,Dafny.ISequence<Dafny.Rune>> _7___v2;
+        _7___v2 = Dafny.Map<RAST._IExpr, Dafny.ISequence<Dafny.Rune>>.FromElements(new Dafny.Pair<RAST._IExpr, Dafny.ISequence<Dafny.Rune>>(_4_c, (_4_c)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))));
+        RAST._IExpr _8___v3;
+        _8___v3 = RASTCoverage.__default.Optimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_I128()), Std.Wrappers.Option<RAST._IExpr>.create_None()), _4_c));
+        RAST._IExpr _9___v4;
+        _9___v4 = RASTCoverage.__default.Optimize(RAST.Expr.create_StmtExpr(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_I128()), Std.Wrappers.Option<RAST._IExpr>.create_None()), RAST.Expr.create_StmtExpr(RAST.__default.AssignVar(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), _4_c), RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))));
+        RAST._IExpr _10___v5;
+        _10___v5 = RASTCoverage.__default.Optimize(RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), _4_c, DAST.Format.UnaryOpFormat.create_NoFormat()));
+        RAST._IExpr _11___v6;
+        _11___v6 = RASTCoverage.__default.Optimize(RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!"), _4_c, DAST.Format.UnaryOpFormat.create_NoFormat()));
+        RAST._IExpr _12___v7;
+        _12___v7 = RASTCoverage.__default.Optimize(RASTCoverage.__default.ConversionNum(RAST.Type.create_U8(), _4_c));
+        RAST._IExpr _13___v8;
+        _13___v8 = RASTCoverage.__default.Optimize(RASTCoverage.__default.ConversionNum(RAST.Type.create_U8(), RAST.Expr.create_Call(_4_c, Dafny.Sequence<RAST._IExpr>.FromElements())));
+        Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _14___v9;
+        _14___v9 = (_4_c).RightMostIdentifier();
+      }
+    }
+    public static void TestPrintingInfo()
+    {
+      RAST._IExpr _0_x;
+      _0_x = RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"));
+      RAST._IExpr _1_y;
+      _1_y = RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("y"));
+      DAST.Format._IBinaryOpFormat _2_bnf;
+      _2_bnf = DAST.Format.BinaryOpFormat.create_NoFormat();
+      RASTCoverage.__default.AssertCoverage(((RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"))).printingInfo).is_UnknownPrecedence);
+      RASTCoverage.__default.AssertCoverage(object.Equals((_0_x).printingInfo, RAST.PrintingInfo.create_Precedence(BigInteger.One)));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_LiteralInt(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("3"))).printingInfo, RAST.PrintingInfo.create_Precedence(BigInteger.One)));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_LiteralString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abc"), true, false)).printingInfo, RAST.PrintingInfo.create_Precedence(BigInteger.One)));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("?"), _0_x, DAST.Format.UnaryOpFormat.create_NoFormat())).printingInfo, RAST.PrintingInfo.create_SuffixPrecedence(new BigInteger(5))));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("-"), _0_x, DAST.Format.UnaryOpFormat.create_NoFormat())).printingInfo, RAST.PrintingInfo.create_Precedence(new BigInteger(6))));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*"), _0_x, DAST.Format.UnaryOpFormat.create_NoFormat())).printingInfo, RAST.PrintingInfo.create_Precedence(new BigInteger(6))));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!"), _0_x, DAST.Format.UnaryOpFormat.create_NoFormat())).printingInfo, RAST.PrintingInfo.create_Precedence(new BigInteger(6))));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), _0_x, DAST.Format.UnaryOpFormat.create_NoFormat())).printingInfo, RAST.PrintingInfo.create_Precedence(new BigInteger(6))));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&mut"), _0_x, DAST.Format.UnaryOpFormat.create_NoFormat())).printingInfo, RAST.PrintingInfo.create_Precedence(new BigInteger(6))));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!!"), _0_x, DAST.Format.UnaryOpFormat.create_NoFormat())).printingInfo, RAST.PrintingInfo.create_UnknownPrecedence()));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_Select(_0_x, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("name"))).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(2), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_ExprFromPath(RAST.Path.create_PMemberSelect(RAST.Path.create_Global(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("name")))).printingInfo, RAST.PrintingInfo.create_Precedence(new BigInteger(2))));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_Call(_0_x, Dafny.Sequence<RAST._IExpr>.FromElements())).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(2), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_TypeAscription(_0_x, RAST.Type.create_I128())).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(10), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(20), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("/"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(20), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("%"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(20), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("+"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(30), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("-"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(30), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<<"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(40), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">>"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(40), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(50), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("^"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(60), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("|"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(70), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("=="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(80), RAST.Associativity.create_RequiresParentheses())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(80), RAST.Associativity.create_RequiresParentheses())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(80), RAST.Associativity.create_RequiresParentheses())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(80), RAST.Associativity.create_RequiresParentheses())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(80), RAST.Associativity.create_RequiresParentheses())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(80), RAST.Associativity.create_RequiresParentheses())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&&"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(90), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("||"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(100), RAST.Associativity.create_LeftToRight())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".."), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RequiresParentheses())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("..="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RequiresParentheses())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("+="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("-="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("/="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("%="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("|="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("^="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<<="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">>="), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("?!?"), _0_x, _1_y, _2_bnf)).printingInfo, RAST.PrintingInfo.create_PrecedenceAssociativity(BigInteger.Zero, RAST.Associativity.create_RequiresParentheses())));
+      RASTCoverage.__default.AssertCoverage(object.Equals((RAST.Expr.create_Break(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None())).printingInfo, RAST.PrintingInfo.create_UnknownPrecedence()));
+    }
+    public static void TestNoExtraSemicolonAfter()
+    {
+      RASTCoverage.__default.AssertCoverage((RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"))).NoExtraSemicolonAfter());
+      RASTCoverage.__default.AssertCoverage(!((RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("a"))).NoExtraSemicolonAfter()));
+      RASTCoverage.__default.AssertCoverage((RAST.Expr.create_Return(Std.Wrappers.Option<RAST._IExpr>.create_None())).NoExtraSemicolonAfter());
+      RASTCoverage.__default.AssertCoverage((RAST.Expr.create_Continue(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None())).NoExtraSemicolonAfter());
+      RASTCoverage.__default.AssertCoverage((RAST.Expr.create_Break(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None())).NoExtraSemicolonAfter());
+      RASTCoverage.__default.AssertCoverage((RAST.__default.AssignVar(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("y")))).NoExtraSemicolonAfter());
+      RASTCoverage.__default.AssertCoverage((RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"), Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_None())).NoExtraSemicolonAfter());
+      RASTCoverage.__default.AssertCoverage(!((RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"))).NoExtraSemicolonAfter()));
+    }
+  }
+} // end of namespace RASTCoverage
\ No newline at end of file
diff --git a/Source/DafnyCore.Test/NodeTests.cs b/Source/DafnyCore.Test/NodeTests.cs
index e4a52d860f1..fd613cd726d 100644
--- a/Source/DafnyCore.Test/NodeTests.cs
+++ b/Source/DafnyCore.Test/NodeTests.cs
@@ -1,31 +1,30 @@
 using System.Collections.Concurrent;
 using Microsoft.Dafny;
 
-namespace DafnyCore.Test; 
+namespace DafnyCore.Test;
 
 public class NodeTests {
 
   class ConcreteNode : Node {
-    public ConcreteNode(RangeToken rangeToken, IEnumerable<INode>? children = null) {
-      RangeToken = rangeToken;
+    public ConcreteNode(IOrigin origin, IEnumerable<INode>? children = null) {
+      Origin = origin;
       Children = children ?? Enumerable.Empty<INode>();
     }
 
-    public override RangeToken RangeToken { get; set; }
-    public override IToken Tok => RangeToken.StartToken;
+    public override IOrigin Origin { get; }
     public override IEnumerable<INode> Children { get; }
     public override IEnumerable<INode> PreResolveChildren => Children;
   }
 
-  private static RangeToken CreateRange(Uri uri, int startLine, int startColumn, int endLine, int endColumn) {
-    return new RangeToken(new Token(startLine + 1, startColumn + 1) { Uri = uri }, new Token(endLine + 1, endColumn + 1) { Uri = uri });
+  private static SourceOrigin CreateRange(Uri uri, int startLine, int startColumn, int endLine, int endColumn) {
+    return new SourceOrigin(new Token(startLine + 1, startColumn + 1) { Uri = uri }, new Token(endLine + 1, endColumn + 1) { Uri = uri });
   }
 
   [Fact]
   public void FindNodeWithTokenLessIntermediate() {
     var uri = new Uri(Directory.GetCurrentDirectory());
     var child = new ConcreteNode(CreateRange(uri, 0, 1, 0, 2));
-    var parent = new ConcreteNode(RangeToken.NoToken, (IEnumerable<INode>)new INode[] { child });
+    var parent = new ConcreteNode(SourceOrigin.NoToken, (IEnumerable<INode>)new INode[] { child });
     var grandParent = new ConcreteNode(CreateRange(uri, 0, 0, 0, 3), (IEnumerable<INode>)new INode[] { parent });
 
     var shouldBeChild = grandParent.FindNode<INode>(uri, new DafnyPosition(0, 1));
@@ -35,7 +34,7 @@ public void FindNodeWithTokenLessIntermediate() {
   [Fact]
   public void SkipTokenlessLeaf() {
     var uri = new Uri(Directory.GetCurrentDirectory());
-    var child1 = new ConcreteNode(RangeToken.NoToken);
+    var child1 = new ConcreteNode(SourceOrigin.NoToken);
     var child2 = new ConcreteNode(CreateRange(uri, 0, 1, 0, 2));
 
     var parent = new ConcreteNode(CreateRange(uri, 0, 0, 0, 3), (IEnumerable<INode>)new[] { child1, child2 });
diff --git a/Source/DafnyCore.Test/WriterFromOutputHelper.cs b/Source/DafnyCore.Test/WriterFromOutputHelper.cs
new file mode 100644
index 00000000000..a7039f46f01
--- /dev/null
+++ b/Source/DafnyCore.Test/WriterFromOutputHelper.cs
@@ -0,0 +1,53 @@
+#nullable enable
+using System.Text;
+using Xunit.Abstractions;
+
+namespace DafnyCore.Test;
+
+public class WriterFromOutputHelper : TextWriter {
+  private readonly StringBuilder buffer = new();
+  private readonly ITestOutputHelper output;
+
+  public WriterFromOutputHelper(ITestOutputHelper output) {
+    this.output = output;
+  }
+
+  public override void Write(string? value) {
+    if (value != null) {
+      buffer.Append(value);
+    }
+  }
+
+  public override void Write(char value) {
+    buffer.Append(value);
+  }
+
+  public override Encoding Encoding => Encoding.Default;
+
+  public override void WriteLine(string? value) {
+    try {
+      output.WriteLine(buffer + value);
+    } catch {
+      // ignored because of https://github.com/dafny-lang/dafny/issues/5723
+    }
+    buffer.Clear();
+  }
+
+  public override void WriteLine(string format, params object?[] arg) {
+    try {
+      output.WriteLine(buffer + format, arg);
+    } catch {
+      // ignored because of https://github.com/dafny-lang/dafny/issues/5723
+    }
+    buffer.Clear();
+  }
+
+  public override void Flush() {
+    try {
+      output.WriteLine(buffer.ToString());
+    } catch {
+      // ignored because of https://github.com/dafny-lang/dafny/issues/5723
+    }
+    base.Flush();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore.Test/coverlet.runsettings b/Source/DafnyCore.Test/coverlet.runsettings
new file mode 100644
index 00000000000..11c8afc63f8
--- /dev/null
+++ b/Source/DafnyCore.Test/coverlet.runsettings
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat Code Coverage">
+        <Configuration>
+          <Exclude>[*]DAST.*,[*]DCOMP.*</Exclude>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
diff --git a/Source/DafnyCore/AST/AstVisitor.cs b/Source/DafnyCore/AST/AstVisitor.cs
index 9f5ea2ef5f9..08bcd71bf56 100644
--- a/Source/DafnyCore/AST/AstVisitor.cs
+++ b/Source/DafnyCore/AST/AstVisitor.cs
@@ -136,16 +136,17 @@ public virtual void VisitFunction(Function function) {
 
       VisitAttributes(function, function.EnclosingClass.EnclosingModuleDefinition);
 
-      foreach (var formal in function.Formals) {
+      foreach (var formal in function.Ins) {
         VisitUserProvidedType(formal.Type, context);
       }
       VisitUserProvidedType(function.ResultType, context);
 
-      VisitDefaultParameterValues(function.Formals, context);
+      VisitDefaultParameterValues(function.Ins, context);
 
       function.Req.ForEach(aexpr => VisitAttributedExpression(aexpr, context));
 
-      function.Reads.ForEach(frameExpression => VisitTopLevelFrameExpression(frameExpression, context));
+      VisitAttributes(function.Reads, function.EnclosingClass.EnclosingModuleDefinition);
+      function.Reads.Expressions.ForEach(frameExpression => VisitTopLevelFrameExpression(frameExpression, context));
 
       function.Ens.ForEach(aexpr => VisitAttributedExpression(aexpr, GetContext(function, true)));
 
@@ -173,6 +174,8 @@ public virtual void VisitMethod(Method method) {
 
       method.Req.ForEach(aexpr => VisitAttributedExpression(aexpr, context));
 
+      method.Reads.Expressions.ForEach(frameExpression => VisitTopLevelFrameExpression(frameExpression, context));
+
       VisitAttributes(method.Mod, method.EnclosingClass.EnclosingModuleDefinition);
       method.Mod.Expressions.ForEach(frameExpression => VisitTopLevelFrameExpression(frameExpression, context));
 
@@ -325,15 +328,15 @@ protected virtual void VisitStatement(Statement stmt, VisitorContext context) {
         // Visit user-provided types
         if (stmt is VarDeclStmt varDeclStmt) {
           foreach (var local in varDeclStmt.Locals) {
-            VisitUserProvidedType(local.OptionalType, context);
+            VisitUserProvidedType(local.SyntacticType, context);
           }
 
         } else if (stmt is VarDeclPattern varDeclPattern) {
           foreach (var local in varDeclPattern.LocalVars) {
-            VisitUserProvidedType(local.OptionalType, context);
+            VisitUserProvidedType(local.SyntacticType, context);
           }
 
-        } else if (stmt is AssignStmt assignStmt) {
+        } else if (stmt is SingleAssignStmt assignStmt) {
           if (assignStmt.Rhs is TypeRhs typeRhs) {
             if (typeRhs.EType != null) {
               VisitUserProvidedType(typeRhs.EType, context);
diff --git a/Source/DafnyCore/AST/Attributes.cs b/Source/DafnyCore/AST/Attributes.cs
index e063f267ec7..decc10cf47b 100644
--- a/Source/DafnyCore/AST/Attributes.cs
+++ b/Source/DafnyCore/AST/Attributes.cs
@@ -6,7 +6,46 @@
 
 namespace Microsoft.Dafny;
 
-public class Attributes : TokenNode {
+static class AttributeBearingDeclaration {
+
+  public static bool IsExtern(this IAttributeBearingDeclaration me, DafnyOptions options) =>
+    options.AllowExterns && Attributes.Contains(me.Attributes, "extern");
+
+  public static bool IsExplicitAxiom(this IAttributeBearingDeclaration me) =>
+    Attributes.Contains(me.Attributes, "axiom");
+}
+
+// Syntax of a formal of a built-in @-attribute
+// To create one, prefer using the chaining BuiltInAtAttributeSyntax.WithArg()
+public record BuiltInAtAttributeArgSyntax(
+  string ArgName,
+  Type ArgType, // If null, it means it's not resolved (@Induction and @Trigger)
+  Expression DefaultValue) {
+  public Formal ToFormal() {
+    Contract.Assert(ArgType != null);
+    return new Formal(Token.NoToken, ArgName, ArgType, true, false,
+      DefaultValue);
+  }
+}
+
+// Syntax for a built-in @-attribute.
+// To create such an attribute, use the Attributes.B() helper
+public record BuiltInAtAttributeSyntax(
+  string Name,
+  List<BuiltInAtAttributeArgSyntax> Args,
+  Func<IAttributeBearingDeclaration, bool> CanBeApplied) {
+  public BuiltInAtAttributeSyntax WithArg(String argName, Type argType, Expression defaultValue = null) {
+    var c = new List<BuiltInAtAttributeArgSyntax>(Args) {
+      new(argName, argType, defaultValue) };
+    return this with { Args = c };
+  }
+
+  public BuiltInAtAttributeSyntax Filter(Func<IAttributeBearingDeclaration, bool> canBeApplied) {
+    return this with { CanBeApplied = canBeApplied };
+  }
+}
+
+public class Attributes : NodeWithComputedRange, ICanFormat {
   [ContractInvariantMethod]
   void ObjectInvariant() {
     Contract.Invariant(Name != null);
@@ -15,6 +54,7 @@ void ObjectInvariant() {
 
   public static string AxiomAttributeName = "axiom";
   public static string ConcurrentAttributeName = "concurrent";
+  public static string AssumeConcurrentAttributeName = "assume_concurrent";
   public static string ExternAttributeName = "extern";
   public static string VerifyAttributeName = "verify";
   public static string AutoGeneratedAttributeName = "auto_generated";
@@ -24,9 +64,10 @@ void ObjectInvariant() {
   public readonly List<Expression> Args;
 
   public readonly Attributes Prev;
-  public Attributes(string name, [Captured] List<Expression> args, Attributes prev) {
+  public Attributes(string name, [Captured] List<Expression> args, Attributes prev) : base(Token.NoToken) {
     Contract.Requires(name != null);
     Contract.Requires(cce.NonNullElements(args));
+    Contract.Requires(name != UserSuppliedAtAttribute.AtName || this is UserSuppliedAtAttribute);
     Name = name;
     Args = args;
     Prev = prev;
@@ -34,7 +75,7 @@ public Attributes(string name, [Captured] List<Expression> args, Attributes prev
 
   public override string ToString() {
     string result = Prev?.ToString() + "{:" + Name;
-    if (Args == null || Args.Count() == 0) {
+    if (Args == null || !Args.Any()) {
       return result + "}";
     } else {
       var exprs = String.Join(", ", Args.Select(e => e.ToString()));
@@ -88,7 +129,7 @@ public static bool ContainsBool(Attributes attrs, string nm, ref bool value) {
   /// the enclosing class, or any enclosing module.  Settings closer to the declaration
   /// override those further away.
   /// </summary>
-  public static bool ContainsBoolAtAnyLevel(MemberDecl decl, string attribName) {
+  public static bool ContainsBoolAtAnyLevel(MemberDecl decl, string attribName, bool defaultVal = false) {
     bool setting = true;
     if (Attributes.ContainsBool(decl.Attributes, attribName, ref setting)) {
       return setting;
@@ -107,7 +148,7 @@ public static bool ContainsBoolAtAnyLevel(MemberDecl decl, string attribName) {
       mod = mod.EnclosingModule;
     }
 
-    return false;
+    return defaultVal;
   }
 
   /// <summary>
@@ -197,6 +238,438 @@ public static bool ContainsMatchingValue(Attributes attrs, string nm, ref object
       : new List<Node> { Prev });
 
   public override IEnumerable<INode> PreResolveChildren => Children;
+  public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
+    foreach (var token in OwnedTokens) {
+      switch (token.val) {
+        case "}": {
+            formatter.SetClosingIndentedRegion(token, indentBefore);
+            break;
+          }
+        case "@": {
+            formatter.SetIndentations(token, indentBefore, indentBefore, indentBefore);
+            break;
+          }
+        case ",": {
+            formatter.SetDelimiterInsideIndentedRegions(token, indentBefore);
+            break;
+          }
+        case "{" or "{:": {
+            formatter.SetOpeningIndentedRegion(token, indentBefore);
+            break;
+          }
+      }
+    }
+    foreach (var arg in Args) {
+      formatter.SetExpressionIndentation(arg);
+    }
+    formatter.SetClosingIndentedRegion(EndToken, indentBefore);
+    return false; // Don't do inner attributes, they should be performed independently
+  }
+
+  // Typically, {:} are indented when @-attributes are not
+  public static void SetIndents(Attributes attrs, int indentBefore, TokenNewIndentCollector formatter) {
+    foreach (var attribute in attrs.AsEnumerable()) {
+      if (attribute.StartToken.val == UserSuppliedAtAttribute.AtName) {
+        attribute.SetIndent(indentBefore, formatter);
+      } else {
+        attribute.SetIndent(indentBefore + formatter.SpaceTab, formatter);
+      }
+    }
+  }
+  public static string TupleItem0Name => "0";
+  // Helper to create a built-in @-attribute
+  static BuiltInAtAttributeSyntax BuiltIn(string name) {
+    return new BuiltInAtAttributeSyntax(
+      name, new List<BuiltInAtAttributeArgSyntax>(), _ => true);
+  }
+
+  // Helper to create an old-style attribute
+  private static Attributes A(string name, params Expression[] args) {
+    return new Attributes(name, args.Select(arg =>
+      arg is DefaultValueExpression defaultExpr ? defaultExpr.Resolved : arg).ToList(), null);
+  }
+
+  // Helper to create an old-style attribute with only one argument
+  private static Attributes A1(string name, ActualBindings bindings) {
+    if (Get(bindings, 0, out var expr) && expr != null) {
+      return A(name, expr);
+    }
+
+    return A(name);
+  }
+
+  // Given a user-supplied @-attribute, expand it if recognized as builtin to an old-style attribute
+  // or mark it as not built-in for later resolution
+  public static Attributes ExpandAtAttribute(Program program, UserSuppliedAtAttribute atAttribute, IAttributeBearingDeclaration attributeHost) {
+    var toMatch = atAttribute.Arg;
+    var name = atAttribute.UserSuppliedName;
+    var bindings = atAttribute.UserSuppliedPreResolveBindings;
+
+    if (name == null) {
+      program.Reporter.Error(MessageSource.Resolver, atAttribute.Origin, "Attribute not recognized: " + atAttribute.ToString());
+      return null;
+    }
+
+    if (!TryGetBuiltinAtAttribute(name, out var builtinSyntax) || builtinSyntax == null) {
+      atAttribute.Builtin = false; // Will be resolved after
+      return null;
+    }
+
+    if (!builtinSyntax.CanBeApplied(attributeHost)) {
+      program.Reporter.Error(MessageSource.Resolver, atAttribute.Origin, UserSuppliedAtAttribute.AtName + atAttribute.UserSuppliedName + " attribute cannot be applied to " + attributeHost.WhatKind);
+    }
+
+    var resolver = new ModuleResolver(new ProgramResolver(program), program.Options) {
+      reporter = program.Reporter
+    };
+    resolver.moduleInfo = resolver.ProgramResolver.SystemModuleManager.systemNameInfo;
+    var formals = builtinSyntax.Args.Select(arg => arg.ToFormal()).ToArray();
+    ResolveLikeDatatypeConstructor(program, formals, name, atAttribute, bindings, resolver);
+
+    atAttribute.Builtin = true;
+    atAttribute.Arg.Type = Type.Int; // Dummy type to avoid crashes
+    var intDecl = resolver.SystemModuleManager.valuetypeDecls.First(valueTypeDecl => valueTypeDecl.Name == PreType.TypeNameInt);
+
+    atAttribute.Arg.PreType = new DPreType(intDecl, new List<PreType>(), null);
+
+    switch (name) {
+      case "AssumeCrossModuleTermination": {
+          return A("AssumeCrossModuleTermination");
+        }
+      case "AutoContracts": {
+          return A("autocontracts");
+        }
+      case "AutoRequires": {
+          return A("autoReq");
+        }
+      case "AutoRevealDependenciesAll": {
+          return A1("autoRevealDependencies", bindings);
+        }
+      case "AutoRevealDependencies": {
+          return A1("autoRevealDependencies", bindings);
+        }
+      case "Axiom": {
+          return A(AxiomAttributeName);
+        }
+      case "Compile": {
+          return A1("compile", bindings);
+        }
+      case "Concurrent": {
+          return A(ConcurrentAttributeName);
+        }
+      case "DisableNonlinearArithmetic": {
+          return A1("disableNonlinearArithmetic", bindings);
+        }
+      case "Fuel": {
+          if (Get(bindings, 0, out var lowFuel) && lowFuel != null) {
+            if (Get(bindings, 1, out var highFuel) && highFuel != null) {
+              if (Get(bindings, 2, out var functionName) && IsStringNotEmpty(functionName)) {
+                return A("fuel", functionName, lowFuel, highFuel);
+              }
+
+              return A("fuel", lowFuel, highFuel);
+            }
+
+            return A("fuel", lowFuel);
+          }
+
+          return A("fuel");
+        }
+      case "IsolateAssertions": {
+          return A("isolate_assertions");
+        }
+      case "NativeUInt8": {
+          return A("nativeType", DefaultString("byte"));
+        }
+      case "NativeInt8": {
+          return A("nativeType", DefaultString("sbyte"));
+        }
+      case "NativeUInt16": {
+          return A("nativeType", DefaultString("ushort"));
+        }
+      case "NativeInt16": {
+          return A("nativeType", DefaultString("short"));
+        }
+      case "NativeUInt32": {
+          return A("nativeType", DefaultString("uint"));
+        }
+      case "NativeInt32": {
+          return A("nativeType", DefaultString("int"));
+        }
+      case "NativeInt53": {
+          return A("nativeType", DefaultString("number"));
+        }
+      case "NativeUInt64": {
+          return A("nativeType", DefaultString("ulong"));
+        }
+      case "NativeInt64": {
+          return A("nativeType", DefaultString("long"));
+        }
+      case "NativeUInt128": {
+          return A("nativeType", DefaultString("udoublelong"));
+        }
+      case "NativeInt128": {
+          return A("nativeType", DefaultString("doublelong"));
+        }
+      case "NativeInt": {
+          return A("nativeType", DefaultBool(true));
+        }
+      case "NativeNone": {
+          return A("nativeType", DefaultBool(false));
+        }
+      case "NativeIntOrReal": {
+          return A("nativeType");
+        }
+      case "Options": {
+          return A1("options", bindings);
+        }
+      case "Print": {
+          return A("print");
+        }
+      case "Priority": {
+          return A1("priority", bindings);
+        }
+      case "ResourceLimit": {
+          return A1("resource_limit", bindings);
+        }
+      case "Synthesize": {
+          return A("synthesize");
+        }
+      case "TimeLimit": {
+          return A1("timeLimit", bindings);
+        }
+      case "TimeLimitMultiplier": {
+          return A1("timeLimitMultiplier", bindings);
+        }
+      case "TailRecursion": {
+          return A("tailrecursion");
+        }
+      case "Test": {
+          return A("test");
+        }
+      case "TestEntry": {
+          return A("TestEntry");
+        }
+      case "TestInline": {
+          return A1("testInline", bindings);
+        }
+      case "Transparent": {
+          return A("transparent");
+        }
+      case "VcsMaxCost": {
+          return A1("vcs_max_cost", bindings);
+        }
+      case "VcsMaxKeepGoingSplits": {
+          return A1("vcs_max_keep_going_splits", bindings);
+        }
+      case "VcsMaxSplits": {
+          return A1("vcs_max_splits", bindings);
+        }
+      case "Verify": {
+          return A1(VerifyAttributeName, bindings);
+        }
+      case "VerifyOnly": {
+          return A("only");
+        }
+      default: {
+          throw new Exception("@-Attribute added to Attributes.BuiltinAtAttributes needs to be handled here");
+        }
+    }
+  }
+
+  // List of built-in @-attributes with their definitions.
+  // This list could be obtained from parsing and resolving a .Dfy file
+  // but for now it's good enough.
+  public static readonly List<BuiltInAtAttributeSyntax> BuiltinAtAttributes = new() {
+    BuiltIn("AssumeCrossModuleTermination")
+      .Filter(attributeHost => attributeHost is ClassDecl or TraitDecl),
+    BuiltIn("AutoContracts")
+      .Filter(attributeHost => attributeHost is ClassDecl),
+    BuiltIn("AutoRequires")
+      .Filter(attributeHost => attributeHost is Function),
+    BuiltIn("AutoRevealDependenciesAll").WithArg(TupleItem0Name, Type.Bool, DefaultBool(true))
+      .Filter(attributeHost => attributeHost is MethodOrFunction),
+    BuiltIn("AutoRevealDependencies").WithArg("level", Type.Int)
+      .Filter(attributeHost => attributeHost is MethodOrFunction),
+    BuiltIn("Axiom")
+      .Filter(attributeHost => attributeHost is MethodOrFunction),
+    BuiltIn("Compile")
+      .WithArg(TupleItem0Name, Type.Bool, DefaultBool(true))
+      .Filter(attributeHost =>
+        attributeHost is TopLevelDecl and not TypeParameter or MemberDecl or ModuleDefinition),
+    BuiltIn("Concurrent")
+      .Filter(attributeHost =>
+        attributeHost is MethodOrFunction),
+    BuiltIn("DisableNonlinearArithmetic")
+      .WithArg("disable", Type.Bool, DefaultBool(true))
+      .Filter(attributeHost =>
+        attributeHost is ModuleDefinition),
+    BuiltIn("Fuel")
+      .WithArg("low", Type.Int, DefaultInt(1))
+      .WithArg("high", Type.Int, DefaultInt(2))
+      .WithArg("functionName", Type.ResolvedString(), DefaultString(""))
+      .Filter(attributeHost => attributeHost is MethodOrFunction or AssertStmt),
+    BuiltIn("IsolateAssertions")
+      .Filter(attributeHost => attributeHost is ICanVerify),
+    BuiltIn("NativeUInt8")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeInt8")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeUInt16")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeInt16")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeUInt32")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeInt32")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeInt53")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeUInt64")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeInt64")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeUInt128")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeInt128")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeInt")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeNone")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("NativeIntOrReal")
+      .Filter(attributeHost => attributeHost is NewtypeDecl),
+    BuiltIn("Options")
+      .WithArg(TupleItem0Name, Type.ResolvedString())
+      .Filter(attributeHost => attributeHost is ModuleDecl or ModuleDefinition),
+    BuiltIn("Print")
+      .Filter(attributeHost => attributeHost is Method),
+    BuiltIn("Priority").WithArg(TupleItem0Name, Type.Int)
+      .Filter(attributeHost => attributeHost is ICanVerify),
+    BuiltIn("ResourceLimit").WithArg(TupleItem0Name, Type.ResolvedString())
+      .Filter(attributeHost => attributeHost is ICanVerify),
+    BuiltIn("Synthesize")
+      .Filter(attributeHost => attributeHost is Method),
+    BuiltIn("TimeLimit").WithArg(TupleItem0Name, Type.Int)
+      .Filter(attributeHost => attributeHost is ICanVerify),
+    BuiltIn("TimeLimitMultiplier").WithArg(TupleItem0Name, Type.Int)
+      .Filter(attributeHost => attributeHost is ICanVerify),
+    BuiltIn("TailRecursion")
+      .Filter(attributeHost => attributeHost is MethodOrFunction),
+    BuiltIn("Test")
+      .Filter(attributeHost => attributeHost is MethodOrFunction),
+    BuiltIn("TestEntry")
+      .Filter(attributeHost => attributeHost is MethodOrFunction),
+    BuiltIn("TestInline").WithArg("level", Type.Int, DefaultInt(1))
+      .Filter(attributeHost => attributeHost is MethodOrFunction),
+    BuiltIn("Transparent")
+      .Filter(attributeHost => attributeHost is Function),
+    BuiltIn("VcsMaxCost").WithArg(TupleItem0Name, Type.Int)
+      .Filter(attributeHost => attributeHost is ICanVerify),
+    BuiltIn("VcsMaxKeepGoingSplits").WithArg(TupleItem0Name, Type.Int)
+      .Filter(attributeHost => attributeHost is ICanVerify),
+    BuiltIn("VcsMaxSplits").WithArg(TupleItem0Name, Type.Int)
+      .Filter(attributeHost => attributeHost is ICanVerify),
+    BuiltIn("Verify")
+      .Filter(attributeHost => attributeHost is ICanVerify),
+    BuiltIn("VerifyOnly")
+      .Filter(attributeHost => attributeHost is ICanVerify),
+  };
+
+  ////// Helpers to create default values for the @-attribute definitions above //////
+
+  public static LiteralExpr DefaultString(string value) {
+    return Expression.CreateStringLiteral(Token.NoToken, value);
+  }
+
+  public static LiteralExpr DefaultBool(bool value) {
+    return Expression.CreateBoolLiteral(Token.NoToken, value);
+  }
+
+  public static LiteralExpr DefaultInt(int value) {
+    return Expression.CreateIntLiteralNonnegative(Token.NoToken, value);
+  }
+
+  private static bool IsStringNotEmpty(Expression value) {
+    return value is StringLiteralExpr { Value: string and not "" };
+  }
+
+  // Given resolved bindings, gets the i-th argument according to the
+  // declaration formals order
+  private static bool Get(ActualBindings bindings, int i, out Expression expr) {
+    if (bindings.Arguments.Count < i + 1) {
+      expr = null;
+      return false;
+    }
+
+    expr = bindings.Arguments[i];
+    return true;
+  }
+
+  // Resolves bindings given a list of datatype constructor-like formals,
+  // obtained from built-in @-attribute definitions
+  private static void ResolveLikeDatatypeConstructor(Program program, Formal[] formals, string attrName,
+    UserSuppliedAtAttribute attrs, ActualBindings bindings, ModuleResolver resolver) {
+    var resolutionContext = new ResolutionContext(new NoContext(program.DefaultModuleDef), false); ;
+    var typeMap = new Dictionary<TypeParameter, Type>();
+    resolver.ResolveActualParameters(bindings, formals.ToList(), attrs.Origin,
+      attrs, resolutionContext, typeMap, null);
+    resolver.FillInDefaultValueExpressions();
+    resolver.SolveAllTypeConstraints();
+    // Verify that provided arguments are given literally
+    foreach (var binding in bindings.ArgumentBindings) {
+      if (binding.Actual is not LiteralExpr) {
+        program.Reporter.Error(MessageSource.Resolver, binding.Actual.Origin, $"Argument to attribute {attrName} must be a literal");
+      }
+    }
+  }
+
+  // Recovers a built-in @-Attribute if it exists
+  public static bool TryGetBuiltinAtAttribute(string name, out BuiltInAtAttributeSyntax builtinAtAttribute) {
+    return BuiltInAtAttributeDictionary.TryGetValue(name, out builtinAtAttribute);
+  }
+
+  // Builtin @-attributes dictionary based on the sequence of definitions of @-attributes
+  public static Dictionary<string, BuiltInAtAttributeSyntax> BuiltInAtAttributeDictionary =
+    BuiltinAtAttributes.ToDictionary(b => {
+      if (b.Name.Contains("_") || b.Name.Contains("-") || Char.IsLower(b.Name[0])) {
+        throw new Exception("Builtin @-attributes are PascalCase for consistency");
+      }
+      return b.Name;
+    }, b => b);
+
+  // Overridable method to clone the attribute as if the new attribute was placed after "prev" in the source code
+  public virtual Attributes CloneAfter(Attributes prev) {
+    return new Attributes(Name, Args, prev);
+  }
+
+  //////// Helpers for parsing attributes //////////////////
+
+  // Returns the memory location's attributes content and set the memory location to null (no attributes)
+  public static Attributes Consume(ref Attributes tmpStack) {
+    var result = tmpStack;
+    tmpStack = null;
+    return result;
+  }
+
+  // Empties the first attribute memory location while prepending its attributes to the second attribute memory location, in the same order
+  public static void MergeInto(ref Attributes tmpStack, ref Attributes attributesStack) {
+    MergeIntoReadonly(tmpStack, ref attributesStack);
+    tmpStack = null;
+  }
+
+  // Prepends the attributes tmpStack before the attributes contained in the memory location attributesStack 
+  private static void MergeIntoReadonly(Attributes tmpStack, ref Attributes attributesStack) {
+    if (tmpStack == null) {
+      return;
+    }
+    if (attributesStack == null) {
+      attributesStack = tmpStack;
+      return;
+    }
+    MergeIntoReadonly(tmpStack.Prev, ref attributesStack);
+    attributesStack = tmpStack.CloneAfter(attributesStack);
+  }
 }
 
 public static class AttributesExtensions {
@@ -211,30 +684,103 @@ public static IEnumerable<Attributes> AsEnumerable(this Attributes attr) {
   }
 }
 
+// {:..} Attributes parsed are built using this class
 public class UserSuppliedAttributes : Attributes {
-  public readonly IToken OpenBrace;
-  public readonly IToken CloseBrace;
+  public readonly IOrigin OpenBrace;
+  public readonly IOrigin CloseBrace;
   public bool Recognized;  // set to true to indicate an attribute that is processed by some part of Dafny; this allows it to be colored in the IDE
-  public UserSuppliedAttributes(IToken tok, IToken openBrace, IToken closeBrace, List<Expression> args, Attributes prev)
-    : base(tok.val, args, prev) {
-    Contract.Requires(tok != null);
+  public UserSuppliedAttributes(IOrigin origin, IOrigin openBrace, IOrigin closeBrace, List<Expression> args, Attributes prev)
+    : base(origin.val, args, prev) {
+    Contract.Requires(origin != null);
     Contract.Requires(openBrace != null);
     Contract.Requires(closeBrace != null);
     Contract.Requires(args != null);
-    this.tok = tok;
+    SetOrigin(origin);
     OpenBrace = openBrace;
     CloseBrace = closeBrace;
   }
 }
 
+// @-Attributes parsed are built using this class
+public class UserSuppliedAtAttribute : Attributes {
+  public static readonly string AtName = "@";
+  public readonly IOrigin AtSign;
+  public bool Builtin;  // set to true to indicate it was recognized as a builtin attribute
+  // Otherwise it's a user-defined one and Arg needs to be fully resolved
+  public UserSuppliedAtAttribute(IOrigin origin, Expression arg, Attributes prev)
+    : base(AtName, new List<Expression>() { arg }, prev) {
+    Contract.Requires(origin != null);
+    SetOrigin(origin);
+    this.AtSign = origin;
+  }
+
+  public Expression Arg => Args[0];
+
+  public override Attributes CloneAfter(Attributes prev) {
+    return new UserSuppliedAtAttribute(AtSign, Args[0], prev);
+  }
+
+  // Name of this @-Attribute, which is the part right after the @
+  public string UserSuppliedName =>
+    GetName(this);
+
+  // Pre-resolved bindings of this @-Attribute
+  public ActualBindings UserSuppliedPreResolveBindings =>
+    GetPreResolveBindings(this);
+
+  // Pre-resolved arguments of this @-Attributes. The order is the one provided by the user,
+  // not by any binding. Used for 
+  public IEnumerable<Expression> UserSuppliedPreResolveArguments =>
+    GetPreResolveArguments(this);
+
+  // Gets the name of an @-attribute. Attributes might be applied.
+  public static string GetName(Attributes a) {
+    if (a is UserSuppliedAtAttribute { Arg: ApplySuffix { Lhs: NameSegment { Name: var name } } }) {
+      return name;
+    }
+    if (a is UserSuppliedAtAttribute { Arg: NameSegment { Name: var singleName } }) {
+      return singleName;
+    }
+
+    return null;
+  }
+
+  // Gets the pre-resolved bindings of an @-Attribute.
+  // Returns an empty bindings if it's anything else
+  public static ActualBindings GetPreResolveBindings(Attributes a) {
+    if (a is UserSuppliedAtAttribute { Arg: ApplySuffix { Bindings: var bindings } }) {
+      return bindings;
+    }
+    return new ActualBindings(new List<ActualBinding>());
+  }
+
+  // Gets the list of pre-resolved arguments of an @-Attribute, and an empty list otherwise
+  public static IEnumerable<Expression> GetPreResolveArguments(Attributes a) {
+    if (a is UserSuppliedAtAttribute { UserSuppliedPreResolveBindings: var bindings }) {
+      return bindings.ArgumentBindings.Select(arg => arg.Actual);
+    }
+
+    return new List<Expression>();
+  }
+
+  // Gets the list of pre-resolved arguments of an @-Attribute, and the list of arguments
+  // for any other kind of attributes. Used for example to extract module options for parsing.
+  public static IEnumerable<Expression> GetUserSuppliedArguments(Attributes a) {
+    return a is UserSuppliedAtAttribute { UserSuppliedPreResolveArguments: var arguments } ? arguments : a.Args;
+  }
+
+  public override string ToString() => Prev + (Prev == null ? "" : " ") + "@" + Arg;
+}
+
 /// <summary>
 /// A class implementing this interface is one that can carry attributes.
 /// </summary>
 public interface IAttributeBearingDeclaration {
-  Attributes Attributes { get; }
+  Attributes Attributes { get; internal set; }
+  string WhatKind { get; }
 }
 
-public static class IAttributeBearingDeclarationExtensions {
+public static class AttributeBearingDeclarationExtensions {
   public static bool HasUserAttribute(this IAttributeBearingDeclaration decl, string name, out Attributes attribute) {
     if (Attributes.Find(decl.Attributes, name) is UserSuppliedAttributes attr) {
       attribute = attr;
diff --git a/Source/DafnyCore/AST/BottomUpVisitor.cs b/Source/DafnyCore/AST/BottomUpVisitor.cs
index 00d9274beeb..ba784a6ed83 100644
--- a/Source/DafnyCore/AST/BottomUpVisitor.cs
+++ b/Source/DafnyCore/AST/BottomUpVisitor.cs
@@ -56,6 +56,7 @@ public void Visit(NewtypeDecl ntd) {
   }
   public void Visit(Method method) {
     Visit(method.Req);
+    Visit(method.Reads.Expressions);
     Visit(method.Mod.Expressions);
     Visit(method.Ens);
     Visit(method.Decreases.Expressions);
@@ -64,7 +65,7 @@ public void Visit(Method method) {
   }
   public void Visit(Function function) {
     Visit(function.Req);
-    Visit(function.Reads);
+    Visit(function.Reads.Expressions);
     Visit(function.Ens);
     Visit(function.Decreases.Expressions);
     if (function.Body != null) { Visit(function.Body); }
diff --git a/Source/DafnyCore/AST/Cloner.cs b/Source/DafnyCore/AST/Cloner.cs
index 615ab2a33c9..6a8c76b5634 100644
--- a/Source/DafnyCore/AST/Cloner.cs
+++ b/Source/DafnyCore/AST/Cloner.cs
@@ -66,7 +66,7 @@ public virtual TopLevelDecl CloneDeclaration(TopLevelDecl d, ModuleDefinition ne
 
       if (d is AbstractTypeDecl) {
         var dd = (AbstractTypeDecl)d;
-        return new AbstractTypeDecl(Range(dd.RangeToken), dd.NameNode.Clone(this), newParent,
+        return new AbstractTypeDecl(Origin(dd.Origin), dd.NameNode.Clone(this), newParent,
           CloneTPChar(dd.Characteristics), dd.TypeArgs.ConvertAll(CloneTypeParam),
           dd.ParentTraits.ConvertAll(CloneType),
           dd.Members.ConvertAll(d => CloneMember(d, false)), CloneAttributes(dd.Attributes), dd.IsRefining);
@@ -75,23 +75,24 @@ public virtual TopLevelDecl CloneDeclaration(TopLevelDecl d, ModuleDefinition ne
           !(d is NonNullTypeDecl)); // don't clone the non-null type declaration; close the class, which will create a new non-null type declaration
         var dd = (SubsetTypeDecl)d;
         var tps = dd.TypeArgs.ConvertAll(CloneTypeParam);
-        return new SubsetTypeDecl(Range(dd.RangeToken), dd.NameNode.Clone(this), CloneTPChar(dd.Characteristics), tps,
+        return new SubsetTypeDecl(Origin(dd.Origin), dd.NameNode.Clone(this), CloneTPChar(dd.Characteristics), tps,
           newParent, CloneBoundVar(dd.Var, false), CloneExpr(dd.Constraint), dd.WitnessKind, CloneExpr(dd.Witness),
           CloneAttributes(dd.Attributes));
       } else if (d is TypeSynonymDecl) {
         var dd = (TypeSynonymDecl)d;
         var tps = dd.TypeArgs.ConvertAll(CloneTypeParam);
-        return new TypeSynonymDecl(Range(dd.RangeToken), dd.NameNode.Clone(this), CloneTPChar(dd.Characteristics), tps,
+        return new TypeSynonymDecl(Origin(dd.Origin), dd.NameNode.Clone(this), CloneTPChar(dd.Characteristics), tps,
           newParent, CloneType(dd.Rhs), CloneAttributes(dd.Attributes));
       } else if (d is NewtypeDecl) {
         var dd = (NewtypeDecl)d;
         if (dd.Var == null) {
-          return new NewtypeDecl(Range(dd.RangeToken), dd.NameNode.Clone(this), newParent, CloneType(dd.BaseType),
+          return new NewtypeDecl(Origin(dd.Origin), dd.NameNode.Clone(this), dd.TypeArgs.ConvertAll(CloneTypeParam), newParent,
+            CloneType(dd.BaseType), dd.WitnessKind, CloneExpr(dd.Witness),
             dd.ParentTraits.ConvertAll(CloneType),
             dd.Members.ConvertAll(d => CloneMember(d, false)), CloneAttributes(dd.Attributes), dd.IsRefining);
         } else {
-          return new NewtypeDecl(Range(dd.RangeToken), dd.NameNode.Clone(this), newParent, CloneBoundVar(dd.Var, false),
-            CloneExpr(dd.Constraint), dd.WitnessKind, CloneExpr(dd.Witness),
+          return new NewtypeDecl(Origin(dd.Origin), dd.NameNode.Clone(this), dd.TypeArgs.ConvertAll(CloneTypeParam), newParent,
+            CloneBoundVar(dd.Var, false), CloneExpr(dd.Constraint), dd.WitnessKind, CloneExpr(dd.Witness),
             dd.ParentTraits.ConvertAll(CloneType),
             dd.Members.ConvertAll(d => CloneMember(d, false)), CloneAttributes(dd.Attributes), dd.IsRefining);
         }
@@ -103,7 +104,7 @@ public virtual TopLevelDecl CloneDeclaration(TopLevelDecl d, ModuleDefinition ne
         var dd = (IndDatatypeDecl)d;
         var tps = dd.TypeArgs.ConvertAll(CloneTypeParam);
         var ctors = dd.Ctors.ConvertAll(CloneCtor);
-        var dt = new IndDatatypeDecl(Range(dd.RangeToken), dd.NameNode.Clone(this), newParent, tps, ctors,
+        var dt = new IndDatatypeDecl(Origin(dd.Origin), dd.NameNode.Clone(this), newParent, tps, ctors,
           dd.ParentTraits.ConvertAll(CloneType),
           dd.Members.ConvertAll(d => CloneMember(d, false)), CloneAttributes(dd.Attributes), dd.IsRefining);
         return dt;
@@ -111,7 +112,7 @@ public virtual TopLevelDecl CloneDeclaration(TopLevelDecl d, ModuleDefinition ne
         var dd = (CoDatatypeDecl)d;
         var tps = dd.TypeArgs.ConvertAll(CloneTypeParam);
         var ctors = dd.Ctors.ConvertAll(CloneCtor);
-        var dt = new CoDatatypeDecl(Range(dd.RangeToken), dd.NameNode.Clone(this), newParent, tps, ctors,
+        var dt = new CoDatatypeDecl(Origin(dd.Origin), dd.NameNode.Clone(this), newParent, tps, ctors,
           dd.ParentTraits.ConvertAll(CloneType),
           dd.Members.ConvertAll(d => CloneMember(d, false)), CloneAttributes(dd.Attributes), dd.IsRefining);
         return dt;
@@ -128,7 +129,7 @@ public virtual TopLevelDecl CloneDeclaration(TopLevelDecl d, ModuleDefinition ne
         var ens = dd.Ensures.ConvertAll(CloneAttributedExpr);
         var yens = dd.YieldEnsures.ConvertAll(CloneAttributedExpr);
         var body = CloneBlockStmt(dd.Body);
-        var iter = new IteratorDecl(Range(dd.RangeToken), dd.NameNode.Clone(this), newParent,
+        var iter = new IteratorDecl(Origin(dd.Origin), dd.NameNode.Clone(this), newParent,
           tps, ins, outs, reads, mod, decr,
           req, ens, yreq, yens,
           body, CloneAttributes(dd.Attributes), dd.SignatureEllipsis);
@@ -137,7 +138,7 @@ public virtual TopLevelDecl CloneDeclaration(TopLevelDecl d, ModuleDefinition ne
         var dd = (TraitDecl)d;
         var tps = dd.TypeArgs.ConvertAll(CloneTypeParam);
         var mm = dd.Members.ConvertAll(member => CloneMember(member, false));
-        var cl = new TraitDecl(Range(dd.RangeToken), dd.NameNode.Clone(this), newParent, tps, mm,
+        var cl = new TraitDecl(Origin(dd.Origin), dd.NameNode.Clone(this), newParent, tps, mm,
           CloneAttributes(dd.Attributes), dd.IsRefining, dd.ParentTraits.ConvertAll(CloneType));
         return cl;
       } else if (d is DefaultClassDecl) {
@@ -149,7 +150,7 @@ public virtual TopLevelDecl CloneDeclaration(TopLevelDecl d, ModuleDefinition ne
         var dd = (ClassDecl)d;
         var tps = dd.TypeArgs.ConvertAll(CloneTypeParam);
         var mm = dd.Members.ConvertAll(member => CloneMember(member, false));
-        return new ClassDecl(Range(dd.RangeToken), dd.NameNode.Clone(this), newParent, tps, mm,
+        return new ClassDecl(Origin(dd.Origin), dd.NameNode.Clone(this), newParent, tps, mm,
           CloneAttributes(dd.Attributes), dd.IsRefining, dd.ParentTraits.ConvertAll(CloneType));
       } else if (d is ModuleDecl) {
         if (d is LiteralModuleDecl moduleDecl) {
@@ -187,14 +188,14 @@ public TypeParameter.TypeParameterCharacteristics CloneTPChar(
     }
 
     public DatatypeCtor CloneCtor(DatatypeCtor ct) {
-      return new DatatypeCtor(Range(ct.RangeToken), ct.NameNode.Clone(this), ct.IsGhost,
+      return new DatatypeCtor(Origin(ct.Origin), ct.NameNode.Clone(this), ct.IsGhost,
         ct.Formals.ConvertAll(bv => CloneFormal(bv, false)), CloneAttributes(ct.Attributes));
     }
 
     public TypeParameter CloneTypeParam(TypeParameter tp) {
       return (TypeParameter)typeParameterClones.GetOrCreate(tp,
-        () => new TypeParameter(Range(tp.RangeToken), tp.NameNode.Clone(this), tp.VarianceSyntax,
-          CloneTPChar(tp.Characteristics)));
+        () => new TypeParameter(Origin(tp.Origin), tp.NameNode.Clone(this), tp.VarianceSyntax,
+          CloneTPChar(tp.Characteristics), tp.TypeBounds.ConvertAll(CloneType)));
     }
 
     public virtual MemberDecl CloneMember(MemberDecl member, bool isReference) {
@@ -232,12 +233,11 @@ public virtual Type CloneType(Type t) {
       } else if (t is MultiSetType) {
         var tt = (MultiSetType)t;
         return new MultiSetType(tt.HasTypeArg() ? CloneType(tt.Arg) : null);
-      } else if (t is MapType) {
-        var tt = (MapType)t;
-        return new MapType(tt.Finite, CloneType(tt.Domain), CloneType(tt.Range));
+      } else if (t is MapType mapType) {
+        return new MapType(this, mapType);
       } else if (t is ArrowType) {
         var tt = (ArrowType)t;
-        return new ArrowType(Tok(tt.tok), tt.Args.ConvertAll(CloneType), CloneType(tt.Result));
+        return new ArrowType(Origin(tt.Origin), tt.Args.ConvertAll(CloneType), CloneType(tt.Result));
       } else if (t is UserDefinedType) {
         var tt = (UserDefinedType)t;
 #if TEST_TYPE_SYNONYM_TRANSPARENCY
@@ -257,6 +257,9 @@ public virtual Type CloneType(Type t) {
         return inferredTypeProxy;
       } else if (t is ParamTypeProxy) {
         return new ParamTypeProxy(CloneTypeParam(((ParamTypeProxy)t).orig));
+      } else if (t is TypeRefinementWrapper typeRefinementWrapper) {
+        // don't bother keeping TypeRefinementWrapper wrappers
+        return CloneType(typeRefinementWrapper.T);
       } else {
         Contract.Assert(false); // unexpected type (e.g., no other type proxies are expected at this time)
         return null; // to please compiler
@@ -266,9 +269,9 @@ public virtual Type CloneType(Type t) {
     public virtual Formal CloneFormal(Formal formal, bool isReference) {
       return (Formal)clones.GetOrCreate(formal, () => isReference
        ? formal
-       : new Formal(Tok(formal.tok), formal.Name, CloneType(formal.Type), formal.InParam, formal.IsGhost,
-         CloneExpr(formal.DefaultValue), formal.IsOld, formal.IsNameOnly, formal.IsOlder, formal.NameForCompilation) {
-         RangeToken = formal.RangeToken,
+       : new Formal(Origin(formal.Origin), new Name(this, formal.NameNode), CloneType(formal.Type), formal.InParam, formal.IsGhost,
+         CloneExpr(formal.DefaultValue), CloneAttributes(formal.Attributes),
+         formal.IsOld, formal.IsNameOnly, formal.IsOlder, formal.NameForCompilation) {
          IsTypeExplicit = formal.IsTypeExplicit
        });
     }
@@ -279,7 +282,7 @@ public virtual BoundVar CloneBoundVar(BoundVar bv, bool isReference) {
           return bv;
         }
 
-        var bvNew = new BoundVar(Tok(bv.tok), bv.Name, CloneType(bv.SyntacticType));
+        var bvNew = new BoundVar(Origin(bv.Origin), new Name(this, bv.NameNode), CloneType(bv.SyntacticType));
         bvNew.IsGhost = bv.IsGhost;
         return bvNew;
       });
@@ -330,25 +333,35 @@ public Attributes CloneAttributes(Attributes attrs) {
       } else if (!CloneResolvedFields && attrs.Name.StartsWith("_")) {
         // skip this attribute, since it would have been produced during resolution
         return CloneAttributes(attrs.Prev);
-      } else if (attrs is UserSuppliedAttributes) {
-        var usa = (UserSuppliedAttributes)attrs;
-        return new UserSuppliedAttributes(Tok(usa.tok), Tok(usa.OpenBrace), Tok(usa.CloseBrace),
+      } else if (attrs is UserSuppliedAttributes usa) {
+        return new UserSuppliedAttributes(Origin(usa.Origin), Origin(usa.OpenBrace), Origin(usa.CloseBrace),
           attrs.Args.ConvertAll(CloneExpr), CloneAttributes(attrs.Prev));
+      } else if (attrs is UserSuppliedAtAttribute usaa) {
+        var arg = CloneExpr(usaa.Arg);
+        if (usaa.Arg.Type != null) { // The attribute has already been expanded
+          arg.Type = usaa.Arg.Type;
+          arg.PreType = usaa.Arg.PreType;
+        }
+        return new UserSuppliedAtAttribute(Origin(usaa.Origin), arg, CloneAttributes(usaa.Prev)) {
+          Builtin = usaa.Builtin
+        };
       } else {
-        return new Attributes(attrs.Name, attrs.Args.ConvertAll(CloneExpr), CloneAttributes(attrs.Prev));
+        var result = new Attributes(attrs.Name, attrs.Args.ConvertAll(CloneExpr), CloneAttributes(attrs.Prev));
+        result.SetOrigin(Origin(attrs.Origin));
+        return result;
       }
     }
 
     public AttributedExpression CloneAttributedExpr(AttributedExpression expr) {
       var mfe = new AttributedExpression(CloneExpr(expr.E),
-        expr.Label == null ? null : new AssertLabel(Tok(expr.Label.Tok), expr.Label.Name),
+        expr.Label == null ? null : new AssertLabel(Origin(expr.Label.Tok), expr.Label.Name),
         CloneAttributes(expr.Attributes));
       mfe.Attributes = CloneAttributes(expr.Attributes);
       return mfe;
     }
 
     public virtual ActualBinding CloneActualBinding(ActualBinding binding) {
-      return new ActualBinding(binding.FormalParameterName == null ? null : Tok(binding.FormalParameterName),
+      return new ActualBinding(binding.FormalParameterName == null ? null : Origin(binding.FormalParameterName),
         CloneExpr(binding.Actual));
     }
 
@@ -367,13 +380,13 @@ public virtual Expression CloneExpr(Expression expr) {
     public MatchCaseExpr CloneMatchCaseExpr(MatchCaseExpr c) {
       Contract.Requires(c != null);
       Contract.Requires(c.Arguments != null);
-      return new MatchCaseExpr(Tok(c.tok), c.Ctor, c.FromBoundVar,
+      return new MatchCaseExpr(Origin(c.Origin), c.Ctor, c.FromBoundVar,
         c.Arguments.ConvertAll(bv => CloneBoundVar(bv, false)), CloneExpr(c.Body), CloneAttributes(c.Attributes));
     }
 
     public NestedMatchCaseExpr CloneNestedMatchCaseExpr(NestedMatchCaseExpr c) {
       Contract.Requires(c != null);
-      return new NestedMatchCaseExpr(Tok(c.Tok), CloneExtendedPattern(c.Pat), CloneExpr(c.Body),
+      return new NestedMatchCaseExpr(Origin(c.Origin), CloneExtendedPattern(c.Pat), CloneExpr(c.Body),
         CloneAttributes(c.Attributes));
     }
 
@@ -401,7 +414,7 @@ public virtual BlockStmt CloneBlockStmt(BlockStmt stmt) {
       if (stmt == null) {
         return null;
       } else {
-        return new BlockStmt(Tok(stmt.RangeToken), stmt.Body.ConvertAll(CloneStmt));
+        return new BlockStmt(Origin(stmt.Origin), stmt.Body.ConvertAll(stmt1 => CloneStmt(stmt1, false)));
       }
     }
 
@@ -409,20 +422,25 @@ public virtual DividedBlockStmt CloneDividedBlockStmt(DividedBlockStmt stmt) {
       if (stmt == null) {
         return null;
       } else {
-        return new DividedBlockStmt(Tok(stmt.RangeToken), stmt.BodyInit.ConvertAll(CloneStmt),
-          stmt.SeparatorTok == null ? null : Tok(stmt.SeparatorTok), stmt.BodyProper.ConvertAll(CloneStmt));
+        return new DividedBlockStmt(Origin(stmt.Origin), stmt.BodyInit.ConvertAll(stmt1 => CloneStmt(stmt1, false)),
+          stmt.SeparatorTok == null ? null : Origin(stmt.SeparatorTok), stmt.BodyProper.ConvertAll(stmt1 => CloneStmt(stmt1, false)));
       }
     }
 
-    public virtual Statement CloneStmt(Statement stmt) {
+    public virtual Statement CloneStmt(Statement stmt, bool isReference) {
       if (stmt == null) {
         return null;
       }
 
+
       if (statementClones.TryGetValue(stmt, out var cachedResult)) {
         return cachedResult;
       }
 
+      if (isReference) {
+        return stmt;
+      }
+
       if (stmt is ICloneable<Statement> cloneable) {
         var r = cloneable.Clone(this);
         // add labels to the cloned statement
@@ -439,19 +457,19 @@ public virtual Statement CloneStmt(Statement stmt) {
     public MatchCaseStmt CloneMatchCaseStmt(MatchCaseStmt c) {
       Contract.Requires(c != null);
       Contract.Assert(c.Arguments != null);
-      return new MatchCaseStmt(Tok(c.RangeToken), c.Ctor, c.FromBoundVar,
+      return new MatchCaseStmt(Origin(c.Origin), c.Ctor, c.FromBoundVar,
         c.Arguments.ConvertAll(v => CloneBoundVar(v, false)),
-        c.Body.ConvertAll(CloneStmt), CloneAttributes(c.Attributes));
+        c.Body.ConvertAll(stmt => CloneStmt(stmt, false)), CloneAttributes(c.Attributes));
     }
 
     public ExtendedPattern CloneExtendedPattern(ExtendedPattern pat) {
       switch (pat) {
         case LitPattern p:
-          return new LitPattern(p.Tok, CloneExpr(p.OrigLit));
+          return new LitPattern(p.Origin, CloneExpr(p.OrigLit));
         case IdPattern p:
           return new IdPattern(this, p);
         case DisjunctivePattern p:
-          return new DisjunctivePattern(p.Tok, p.Alternatives.ConvertAll(CloneExtendedPattern), p.IsGhost);
+          return new DisjunctivePattern(p.Origin, p.Alternatives.ConvertAll(CloneExtendedPattern), p.IsGhost);
         default:
           Contract.Assert(false);
           return null;
@@ -460,7 +478,7 @@ public ExtendedPattern CloneExtendedPattern(ExtendedPattern pat) {
 
     public NestedMatchCaseStmt CloneNestedMatchCaseStmt(NestedMatchCaseStmt c) {
       Contract.Requires(c != null);
-      return new NestedMatchCaseStmt(c.Tok, CloneExtendedPattern(c.Pat), c.Body.ConvertAll(CloneStmt),
+      return new NestedMatchCaseStmt(c.Origin, CloneExtendedPattern(c.Pat), c.Body.ConvertAll(stmt => CloneStmt(stmt, false)),
         CloneAttributes(c.Attributes));
     }
 
@@ -483,36 +501,36 @@ public void AddStmtLabels(Statement s, LList<Label> node) {
         if (node.Data.Name == null) {
           // this indicates an implicit-target break statement that has been resolved; don't add it
         } else {
-          s.Labels = new LList<Label>(new Label(Tok(node.Data.Tok), node.Data.Name), s.Labels);
+          s.Labels = new LList<Label>(new Label(Origin(node.Data.Tok), node.Data.Name), s.Labels);
         }
       }
     }
 
     public GuardedAlternative CloneGuardedAlternative(GuardedAlternative alt) {
-      return new GuardedAlternative(Tok(alt.Tok), alt.IsBindingGuard, CloneExpr(alt.Guard),
-        alt.Body.ConvertAll(CloneStmt), CloneAttributes(alt.Attributes));
+      return new GuardedAlternative(Origin(alt.Origin), alt.IsBindingGuard, CloneExpr(alt.Guard),
+        alt.Body.ConvertAll(stmt => CloneStmt(stmt, false)), CloneAttributes(alt.Attributes));
     }
 
     public virtual Field CloneField(Field f) {
       Contract.Requires(f != null);
       return f switch {
-        ConstantField c => new ConstantField(Range(c.RangeToken), c.NameNode.Clone(this), CloneExpr(c.Rhs),
+        ConstantField c => new ConstantField(Origin(c.Origin), c.NameNode.Clone(this), CloneExpr(c.Rhs),
           c.HasStaticKeyword, c.IsGhost, c.IsOpaque, CloneType(c.Type), CloneAttributes(c.Attributes)),
         // We don't expect a SpecialField to ever be cloned. However, it can happen for malformed programs, for example if
         // an iterator in a refined module is replaced by a class in the refining module.
-        SpecialField s => new SpecialField(Range(s.RangeToken), s.Name, s.SpecialId, s.IdParam, s.IsGhost, s.IsMutable,
+        SpecialField s => new SpecialField(Origin(s.Origin), s.Name, s.SpecialId, s.IdParam, s.IsGhost, s.IsMutable,
           s.IsUserMutable, CloneType(s.Type), CloneAttributes(s.Attributes)),
-        _ => new Field(Range(f.RangeToken), f.NameNode.Clone(this), f.HasStaticKeyword, f.IsGhost, f.IsMutable,
+        _ => new Field(Origin(f.Origin), f.NameNode.Clone(this), f.HasStaticKeyword, f.IsGhost, f.IsMutable,
           f.IsUserMutable, CloneType(f.Type), CloneAttributes(f.Attributes))
       };
     }
 
     public virtual Function CloneFunction(Function f, string newName = null) {
       var tps = f.TypeArgs.ConvertAll(CloneTypeParam);
-      var formals = f.Formals.ConvertAll(p => CloneFormal(p, false));
+      var formals = f.Ins.ConvertAll(p => CloneFormal(p, false));
       var result = f.Result != null ? CloneFormal(f.Result, false) : null;
       var req = f.Req.ConvertAll(CloneAttributedExpr);
-      var reads = f.Reads.ConvertAll(CloneFrameExpr);
+      var reads = CloneSpecFrameExpr(f.Reads);
       var decreases = CloneSpecExpr(f.Decreases);
       var ens = f.Ens.ConvertAll(CloneAttributedExpr);
       Expression body = CloneExpr(f.Body);
@@ -522,34 +540,34 @@ public virtual Function CloneFunction(Function f, string newName = null) {
         newName = f.Name;
       }
 
-      var newNameNode = new Name(Range(f.NameNode.RangeToken), newName);
+      var newNameNode = new Name(Origin(f.NameNode.Origin), newName);
 
       if (f is Predicate) {
-        return new Predicate(Range(f.RangeToken), newNameNode, f.HasStaticKeyword, f.IsGhost, f.IsOpaque, tps, formals,
+        return new Predicate(Origin(f.Origin), newNameNode, f.HasStaticKeyword, f.IsGhost, f.IsOpaque, tps, formals,
           result,
           req, reads, ens, decreases, body, Predicate.BodyOriginKind.OriginalOrInherited,
-          f.ByMethodTok == null ? null : Tok(f.ByMethodTok), byMethodBody,
+          f.ByMethodTok == null ? null : Origin(f.ByMethodTok), byMethodBody,
           CloneAttributes(f.Attributes), null);
       } else if (f is LeastPredicate) {
-        return new LeastPredicate(Range(f.RangeToken), newNameNode, f.HasStaticKeyword, f.IsOpaque,
+        return new LeastPredicate(Origin(f.Origin), newNameNode, f.HasStaticKeyword, f.IsOpaque,
           ((LeastPredicate)f).TypeOfK, tps, formals, result,
           req, reads, ens, body, CloneAttributes(f.Attributes), null);
       } else if (f is GreatestPredicate greatestPredicate) {
-        return new GreatestPredicate(Range(f.RangeToken), newNameNode, f.HasStaticKeyword, f.IsOpaque,
+        return new GreatestPredicate(Origin(f.Origin), newNameNode, f.HasStaticKeyword, f.IsOpaque,
           ((GreatestPredicate)f).TypeOfK, tps, formals, result,
           req, reads, ens, body, CloneAttributes(f.Attributes), null);
       } else if (f is TwoStatePredicate) {
-        return new TwoStatePredicate(Range(f.RangeToken), newNameNode, f.HasStaticKeyword, f.IsOpaque, tps, formals,
+        return new TwoStatePredicate(Origin(f.Origin), newNameNode, f.HasStaticKeyword, f.IsOpaque, tps, formals,
           result,
           req, reads, ens, decreases, body, CloneAttributes(f.Attributes), null);
       } else if (f is TwoStateFunction) {
-        return new TwoStateFunction(Range(f.RangeToken), newNameNode, f.HasStaticKeyword, f.IsOpaque, tps, formals,
+        return new TwoStateFunction(Origin(f.Origin), newNameNode, f.HasStaticKeyword, f.IsOpaque, tps, formals,
           result, CloneType(f.ResultType),
           req, reads, ens, decreases, body, CloneAttributes(f.Attributes), null);
       } else {
-        return new Function(Range(f.RangeToken), newNameNode, f.HasStaticKeyword, f.IsGhost, f.IsOpaque, tps, formals,
+        return new Function(Origin(f.Origin), newNameNode, f.HasStaticKeyword, f.IsGhost, f.IsOpaque, tps, formals,
           result, CloneType(f.ResultType),
-          req, reads, ens, decreases, body, f.ByMethodTok == null ? null : Tok(f.ByMethodTok), byMethodBody,
+          req, reads, ens, decreases, body, f.ByMethodTok == null ? null : Origin(f.ByMethodTok), byMethodBody,
           CloneAttributes(f.Attributes), null);
       }
     }
@@ -574,36 +592,28 @@ public virtual BlockStmt CloneMethodBody(Method m) {
       }
     }
 
-    public virtual RangeToken Range(RangeToken range) {
-      if (range == null) {
+    public virtual IOrigin Origin(IOrigin tok) {
+      if (tok == null) {
         return null;
       }
-      return new RangeToken(Tok(range.StartToken), Tok(range.EndToken));
-    }
 
-    public virtual IToken Tok(IToken tok) {
       Contract.Requires(tok != null);
       return tok;
     }
 
-    public RangeToken Tok(RangeToken tok) {
-      Contract.Requires(tok != null);
-      return new RangeToken(Tok(tok.StartToken), Tok(tok.EndToken));
-    }
-
     public virtual AttributedToken AttributedTok(AttributedToken tok) {
       if (tok == null) {
         return null;
       }
 
-      return new AttributedToken(Tok(tok.Token), CloneAttributes(tok.Attrs));
+      return new AttributedToken(Origin(tok.Token), CloneAttributes(tok.Attrs));
     }
   }
 
   public class ClonerKeepParensExpressions : Cloner {
     public override Expression CloneExpr(Expression expr) {
       if (expr is ParensExpression parensExpression) {
-        return new ParensExpression(Tok(parensExpression.tok), CloneExpr(parensExpression.E));
+        return new ParensExpression(Origin(parensExpression.Origin), CloneExpr(parensExpression.E));
       }
 
       return base.CloneExpr(expr);
diff --git a/Source/DafnyCore/AST/CompilationData.cs b/Source/DafnyCore/AST/CompilationData.cs
index 99639a2c6f7..d6a4508b230 100644
--- a/Source/DafnyCore/AST/CompilationData.cs
+++ b/Source/DafnyCore/AST/CompilationData.cs
@@ -1,23 +1,18 @@
 using System;
 using System.Collections.Generic;
+using DafnyCore.Options;
 
 namespace Microsoft.Dafny;
 
 public class CompilationData {
-  public readonly FreshIdGenerator IdGenerator = new();
-
   public CompilationData(ErrorReporter errorReporter, List<Include> includes, IList<Uri> rootSourceUris, ISet<Uri> alreadyVerifiedRoots, ISet<Uri> alreadyCompiledRoots) {
     Includes = includes;
     ErrorReporter = errorReporter;
     RootSourceUris = rootSourceUris;
     AlreadyVerifiedRoots = alreadyVerifiedRoots;
     AlreadyCompiledRoots = alreadyCompiledRoots;
-
-    Rewriters = GetRewriters();
   }
 
-  public IList<IRewriter> Rewriters { get; private set; }
-
   public DafnyOptions Options => ErrorReporter.Options;
   public ErrorReporter ErrorReporter { get; }
   public IList<Uri> RootSourceUris { get; }
@@ -33,52 +28,5 @@ public CompilationData(ErrorReporter errorReporter, List<Include> includes, ILis
   [FilledInDuringResolution]
   public ISet<Uri> UrisToCompile;
 
-
-  private IList<IRewriter> GetRewriters() {
-    var result = new List<IRewriter>();
-    var reporter = ErrorReporter;
-
-    result.Add(new RefinementTransformer(reporter));
-    if (Options.AuditProgram) {
-      result.Add(new Auditor.Auditor(reporter));
-    }
-
-    result.Add(new AutoContractsRewriter(reporter));
-    result.Add(new OpaqueMemberRewriter(reporter));
-    result.Add(new AutoReqFunctionRewriter(reporter));
-    result.Add(new TimeLimitRewriter(reporter));
-    result.Add(new ForallStmtRewriter(reporter));
-    result.Add(new ProvideRevealAllRewriter(reporter));
-    result.Add(new MatchFlattener(reporter, IdGenerator));
-
-    if (Options.AutoTriggers) {
-      result.Add(new QuantifierSplittingRewriter(reporter));
-      result.Add(new TriggerGeneratingRewriter(reporter));
-    }
-
-    if (Options.TestContracts != DafnyOptions.ContractTestingMode.None) {
-      result.Add(new ExpectContracts(reporter));
-    }
-
-    if (Options.RunAllTests) {
-      result.Add(new RunAllTestsMainMethod(reporter));
-    }
-
-    result.Add(new InductionRewriter(reporter));
-    result.Add(new PrintEffectEnforcement(reporter));
-    result.Add(new BitvectorOptimization(reporter));
-
-    if (Options.DisallowConstructorCaseWithoutParentheses) {
-      result.Add(new ConstructorWarning(reporter));
-    }
-
-    result.Add(new LocalLinter(reporter));
-    result.Add(new PrecedenceLinter(reporter, this));
-
-    foreach (var plugin in Options.Plugins) {
-      result.AddRange(plugin.GetRewriters(reporter));
-    }
-
-    return result;
-  }
+  public TranslationRecord AlreadyTranslatedRecord { get; set; }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/DafnyInterface.dfy b/Source/DafnyCore/AST/DafnyInterface.dfy
index 4564ddd0125..c39e496bf8b 100644
--- a/Source/DafnyCore/AST/DafnyInterface.dfy
+++ b/Source/DafnyCore/AST/DafnyInterface.dfy
@@ -1,15 +1,18 @@
 include "System.dfy"
 
-// Interface with existing Dafny code (IToken)
-module {:extern "Microsoft.Dafny"} {:compile false} {:options "-functionSyntax:4"} MicrosoftDafny {
+// Interface with existing Dafny code (IOrigin)
+@Compile(false)
+@Options("-functionSyntax:4")
+module {:extern "Microsoft.Dafny"} MicrosoftDafny {
   import opened System
 
-  trait {:extern "IToken"} {:compile false} IToken {
-    var val : CsString
+  @Compile(false)
+  trait {:extern "Token"} Token {
+    var val: CsString
     var LeadingTrivia: CsString
     var TrailingTrivia: CsString
-    var Next: IToken?
-    ghost var allTokens: seq<IToken>
+    var Next: Token?
+    ghost var allTokens: seq<Token>
 
     ghost predicate Valid() reads this, allTokens decreases |allTokens| {
       && |allTokens| > 0 && allTokens[0] == this
@@ -31,10 +34,10 @@ module {:extern "Microsoft.Dafny"} {:compile false} {:options "-functionSyntax:4
         this.Next.AlltokenSpec(i - 1);
       }
     }
-    lemma TokenNextIsIPlus1(middle: IToken, i: int)
+    lemma TokenNextIsIPlus1(middle: Token, i: int)
       requires Valid()
       requires 0 <= i < |allTokens|
-      requires allTokens[i] == middle;
+      requires allTokens[i] == middle
       requires middle.Next != null
       ensures 0 <= i + 1 < |allTokens| && allTokens[i+1] == middle.Next
     {
@@ -44,7 +47,7 @@ module {:extern "Microsoft.Dafny"} {:compile false} {:options "-functionSyntax:4
       }
     }
 
-    lemma TokenNextIsNullImpliesLastToken(middle: IToken, i: int)
+    lemma TokenNextIsNullImpliesLastToken(middle: Token, i: int)
       requires middle.Valid() && this.Valid()
       requires 0 <= i < |allTokens|
       requires middle == allTokens[i]
@@ -57,7 +60,8 @@ module {:extern "Microsoft.Dafny"} {:compile false} {:options "-functionSyntax:4
       }
     }
   }
-  class {:extern "TriviaFormatterHelper"} {:compile false} TriviaFormatterHelper {
+  @Compile(false)
+  class {:extern "TriviaFormatterHelper"} TriviaFormatterHelper {
     static predicate EndsWithNewline(input: CsString)
   }
 }
diff --git a/Source/DafnyCore/AST/Expressions/Applications/ActualBindings.cs b/Source/DafnyCore/AST/Expressions/Applications/ActualBindings.cs
index aa447112db7..1448e1f4030 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/ActualBindings.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/ActualBindings.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Dafny;
 
-public class ActualBindings : TokenNode {
+public class ActualBindings : NodeWithComputedRange {
   public readonly List<ActualBinding> ArgumentBindings;
 
   public ActualBindings(List<ActualBinding> argumentBindings) {
@@ -14,7 +14,7 @@ public ActualBindings(List<ActualBinding> argumentBindings) {
 
   public ActualBindings(Cloner cloner, ActualBindings original) {
     ArgumentBindings = original.ArgumentBindings.Select(actualBinding => new ActualBinding(
-      actualBinding.FormalParameterName == null ? null : cloner.Tok((IToken)actualBinding.FormalParameterName),
+      actualBinding.FormalParameterName == null ? null : cloner.Origin((IOrigin)actualBinding.FormalParameterName),
       cloner.CloneExpr(actualBinding.Actual))).ToList();
     if (cloner.CloneResolvedFields) {
       arguments = original.Arguments?.Select(cloner.CloneExpr).ToList();
@@ -43,8 +43,8 @@ public void AcceptArgumentExpressionsAsExactParameterList(List<Expression> args
   public override IEnumerable<INode> PreResolveChildren => Children;
 }
 
-public class ActualBinding : TokenNode {
-  public readonly IToken /*?*/ FormalParameterName;
+public class ActualBinding : NodeWithComputedRange {
+  public readonly IOrigin /*?*/ FormalParameterName;
   public readonly Expression Actual;
   public readonly bool IsGhost;
 
@@ -52,7 +52,7 @@ public class ActualBinding : TokenNode {
 
   public override IEnumerable<INode> PreResolveChildren => Children;
 
-  public ActualBinding(IToken /*?*/ formalParameterName, Expression actual, bool isGhost = false) {
+  public ActualBinding(IOrigin /*?*/ formalParameterName, Expression actual, bool isGhost = false) {
     Contract.Requires(actual != null);
     FormalParameterName = formalParameterName;
     Actual = actual;
diff --git a/Source/DafnyCore/AST/Expressions/Applications/ApplyExpr.cs b/Source/DafnyCore/AST/Expressions/Applications/ApplyExpr.cs
index 062676bcfc0..6577be242e8 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/ApplyExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/ApplyExpr.cs
@@ -18,16 +18,16 @@ public override IEnumerable<Expression> SubExpressions {
     }
   }
 
-  public IToken CloseParen;
+  public Token CloseParen;
 
   public ApplyExpr(Cloner cloner, ApplyExpr original) : base(cloner, original) {
     Function = cloner.CloneExpr(original.Function);
     Args = original.Args.ConvertAll(cloner.CloneExpr);
-    CloseParen = cloner.Tok(original.CloseParen);
+    CloseParen = original.CloseParen;
   }
 
-  public ApplyExpr(IToken tok, Expression fn, List<Expression> args, IToken closeParen)
-    : base(tok) {
+  public ApplyExpr(IOrigin origin, Expression fn, List<Expression> args, Token closeParen)
+    : base(origin) {
     Function = fn;
     Args = args;
     CloseParen = closeParen;
diff --git a/Source/DafnyCore/AST/Expressions/Applications/ApplySuffix.cs b/Source/DafnyCore/AST/Expressions/Applications/ApplySuffix.cs
index 8465671ebd1..b19fd085aee 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/ApplySuffix.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/ApplySuffix.cs
@@ -8,10 +8,11 @@ namespace Microsoft.Dafny;
 /// An ApplySuffix desugars into either an ApplyExpr or a FunctionCallExpr
 /// </summary>
 public class ApplySuffix : SuffixExpr, ICloneable<ApplySuffix>, ICanFormat {
-  public readonly IToken/*?*/ AtTok;
-  public readonly IToken CloseParen;
+  public readonly IOrigin/*?*/ AtTok;
+  public readonly Token CloseParen;
   public readonly ActualBindings Bindings;
   public List<Expression> Args => Bindings.Arguments;
+  [FilledInDuringResolution] public MethodCallInformation MethodCallInfo = null; // resolution will set to a non-null value if ApplySuffix makes a method call
 
   public override IEnumerable<INode> Children => ResolvedExpression == null
     ? base.Children.Concat(Bindings == null ? new List<Node>() : Args ?? Enumerable.Empty<Node>()) : new[] { ResolvedExpression };
@@ -28,15 +29,15 @@ public ApplySuffix Clone(Cloner cloner) {
 
   public ApplySuffix(Cloner cloner, ApplySuffix original) :
     base(cloner, original) {
-    AtTok = original.AtTok == null ? null : cloner.Tok(original.AtTok);
-    CloseParen = cloner.Tok(original.CloseParen);
+    AtTok = original.AtTok == null ? null : cloner.Origin(original.AtTok);
+    CloseParen = original.CloseParen;
     FormatTokens = original.FormatTokens;
     Bindings = new ActualBindings(cloner, original.Bindings);
   }
 
-  public ApplySuffix(IToken tok, IToken/*?*/ atLabel, Expression lhs, List<ActualBinding> args, IToken closeParen)
-    : base(tok, lhs) {
-    Contract.Requires(tok != null);
+  public ApplySuffix(IOrigin origin, IOrigin/*?*/ atLabel, Expression lhs, List<ActualBinding> args, Token closeParen)
+    : base(origin, lhs) {
+    Contract.Requires(origin != null);
     Contract.Requires(lhs != null);
     Contract.Requires(cce.NonNullElements(args));
     AtTok = atLabel;
@@ -65,10 +66,10 @@ public override IEnumerable<Expression> PreResolveSubExpressions {
   /// <param name="name">The name of the target function or method.</param>
   /// <param name="args">The arguments to apply the function or method to.</param>
   /// <returns></returns>
-  public static Expression MakeRawApplySuffix(IToken tok, string name, List<Expression> args) {
+  public static Expression MakeRawApplySuffix(IOrigin tok, string name, List<Expression> args) {
     var nameExpr = new NameSegment(tok, name, null);
     var argBindings = args.ConvertAll(arg => new ActualBinding(null, arg));
-    return new ApplySuffix(tok, null, nameExpr, argBindings, tok);
+    return new ApplySuffix(tok, null, nameExpr, argBindings, Token.NoToken);
   }
 
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
diff --git a/Source/DafnyCore/AST/Expressions/Applications/ExprDotName.cs b/Source/DafnyCore/AST/Expressions/Applications/ExprDotName.cs
index 4c24490cdd1..3adc0cee290 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/ExprDotName.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/ExprDotName.cs
@@ -7,7 +7,8 @@ namespace Microsoft.Dafny;
 /// An ExprDotName desugars into either an IdentifierExpr (if the Lhs is a static name) or a MemberSelectExpr (if the Lhs is a computed expression).
 /// </summary>
 public class ExprDotName : SuffixExpr, ICloneable<ExprDotName> {
-  public readonly string SuffixName;
+  public readonly Name SuffixNameNode;
+  public string SuffixName => SuffixNameNode.Value;
   public readonly List<Type> OptTypeArguments;
 
   /// <summary>
@@ -28,16 +29,16 @@ public ExprDotName Clone(Cloner cloner) {
   }
 
   public ExprDotName(Cloner cloner, ExprDotName original) : base(cloner, original) {
-    SuffixName = original.SuffixName;
+    SuffixNameNode = new Name(cloner, original.SuffixNameNode);
     OptTypeArguments = original.OptTypeArguments?.ConvertAll(cloner.CloneType);
   }
 
-  public ExprDotName(IToken tok, Expression obj, string suffixName, List<Type> optTypeArguments)
-    : base(tok, obj) {
-    Contract.Requires(tok != null);
+  public ExprDotName(IOrigin origin, Expression obj, Name suffixName, List<Type> optTypeArguments)
+    : base(origin, obj) {
+    Contract.Requires(origin != null);
     Contract.Requires(obj != null);
     Contract.Requires(suffixName != null);
-    this.SuffixName = suffixName;
+    this.SuffixNameNode = suffixName;
     OptTypeArguments = optTypeArguments;
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Expressions/Applications/FunctionCallExpr.cs b/Source/DafnyCore/AST/Expressions/Applications/FunctionCallExpr.cs
index b612767be97..75b5c6e5bcd 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/FunctionCallExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/FunctionCallExpr.cs
@@ -4,11 +4,12 @@
 
 namespace Microsoft.Dafny;
 
-public class FunctionCallExpr : Expression, IHasUsages, ICloneable<FunctionCallExpr> {
-  public string Name;
+public class FunctionCallExpr : Expression, IHasReferences, ICloneable<FunctionCallExpr> {
+  public Name NameNode;
+  public string Name => NameNode.Value;
   public readonly Expression Receiver;
-  public readonly IToken OpenParen;  // can be null if Args.Count == 0
-  public readonly IToken CloseParen;
+  public readonly IOrigin OpenParen;  // can be null if Args.Count == 0
+  public readonly Token CloseParen;
   public readonly Label/*?*/ AtLabel;
   public readonly ActualBindings Bindings;
   public List<Expression> Args => Bindings.Arguments;
@@ -23,10 +24,7 @@ public class FunctionCallExpr : Expression, IHasUsages, ICloneable<FunctionCallE
   /// This method should only be called on fully and successfully resolved FunctionCallExpr's.
   /// </summary>
   public Dictionary<TypeParameter, Type> GetTypeArgumentSubstitutions() {
-    var typeMap = new Dictionary<TypeParameter, Type>();
-    Util.AddToDict(typeMap, Function.EnclosingClass.TypeArgs, TypeApplication_AtEnclosingClass);
-    Util.AddToDict(typeMap, Function.TypeArgs, TypeApplication_JustFunction);
-    return typeMap;
+    return TypeArgumentSubstitutionsWithParents();
   }
 
   /// <summary>
@@ -77,9 +75,15 @@ void ObjectInvariant() {
 
   [FilledInDuringResolution] public Function Function;
 
-  public FunctionCallExpr(IToken tok, string fn, Expression receiver, IToken openParen, IToken closeParen, [Captured] List<ActualBinding> args, Label/*?*/ atLabel = null)
-    : this(tok, fn, receiver, openParen, closeParen, new ActualBindings(args), atLabel) {
-    Contract.Requires(tok != null);
+  public FunctionCallExpr(string fn, Expression receiver, IOrigin openParen, Token closeParen,
+    [Captured] ActualBindings bindings, Label /*?*/ atLabel = null)
+    : this(Token.NoToken, new Name(Token.NoToken, fn), receiver, openParen, closeParen, bindings,
+      atLabel) {
+  }
+
+  public FunctionCallExpr(IOrigin origin, Name fn, Expression receiver, IOrigin openParen, Token closeParen, [Captured] List<ActualBinding> args, Label/*?*/ atLabel = null)
+    : this(origin, fn, receiver, openParen, closeParen, new ActualBindings(args), atLabel) {
+    Contract.Requires(origin != null);
     Contract.Requires(fn != null);
     Contract.Requires(receiver != null);
     Contract.Requires(cce.NonNullElements(args));
@@ -87,16 +91,16 @@ public FunctionCallExpr(IToken tok, string fn, Expression receiver, IToken openP
     Contract.Ensures(type == null);
   }
 
-  public FunctionCallExpr(IToken tok, string fn, Expression receiver, IToken openParen, IToken closeParen, [Captured] ActualBindings bindings, Label/*?*/ atLabel = null)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public FunctionCallExpr(IOrigin origin, Name fn, Expression receiver, IOrigin openParen, Token closeParen, [Captured] ActualBindings bindings, Label/*?*/ atLabel = null)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(fn != null);
     Contract.Requires(receiver != null);
     Contract.Requires(bindings != null);
     Contract.Requires(openParen != null);
     Contract.Ensures(type == null);
 
-    this.Name = fn;
+    this.NameNode = fn;
     this.Receiver = receiver;
     this.OpenParen = openParen;
     this.CloseParen = closeParen;
@@ -109,9 +113,9 @@ public FunctionCallExpr(IToken tok, string fn, Expression receiver, IToken openP
   /// This constructor is intended to be used when constructing a resolved FunctionCallExpr. The "args" are expected
   /// to be already resolved, and are all given positionally.
   /// </summary>
-  public FunctionCallExpr(IToken tok, string fn, Expression receiver, IToken openParen, IToken closeParen, [Captured] List<Expression> args,
+  public FunctionCallExpr(IOrigin origin, Name fn, Expression receiver, IOrigin openParen, Token closeParen, [Captured] List<Expression> args,
     Label /*?*/ atLabel = null)
-    : this(tok, fn, receiver, openParen, closeParen, args.ConvertAll(e => new ActualBinding(null, e)), atLabel) {
+    : this(origin, fn, receiver, openParen, closeParen, args.ConvertAll(e => new ActualBinding(null, e)), atLabel) {
     Bindings.AcceptArgumentExpressionsAsExactParameterList();
   }
 
@@ -120,10 +124,10 @@ public FunctionCallExpr Clone(Cloner cloner) {
   }
 
   public FunctionCallExpr(Cloner cloner, FunctionCallExpr original) : base(cloner, original) {
-    Name = original.Name;
+    NameNode = new Name(cloner, original.NameNode);
     Receiver = cloner.CloneExpr(original.Receiver);
-    OpenParen = original.OpenParen == null ? null : cloner.Tok(original.OpenParen);
-    CloseParen = original.CloseParen == null ? null : cloner.Tok(original.CloseParen);
+    OpenParen = original.OpenParen == null ? null : cloner.Origin(original.OpenParen);
+    CloseParen = original.CloseParen;
     Bindings = new ActualBindings(cloner, original.Bindings);
     AtLabel = original.AtLabel;
 
@@ -147,9 +151,7 @@ public override IEnumerable<Expression> SubExpressions {
   }
 
   public override IEnumerable<Type> ComponentTypes => Util.Concat(TypeApplication_AtEnclosingClass, TypeApplication_JustFunction);
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return Enumerable.Repeat(Function, 1);
+  public IEnumerable<Reference> GetReferences() {
+    return Enumerable.Repeat(new Reference(NameNode.Origin, Function), 1);
   }
-
-  public IToken NameToken => tok;
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Expressions/Applications/MemberSelectExpr.cs b/Source/DafnyCore/AST/Expressions/Applications/MemberSelectExpr.cs
index b8b27eb640b..c3aae1fcbac 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/MemberSelectExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/MemberSelectExpr.cs
@@ -4,9 +4,10 @@
 
 namespace Microsoft.Dafny;
 
-public class MemberSelectExpr : Expression, IHasUsages, ICloneable<MemberSelectExpr> {
+public class MemberSelectExpr : Expression, IHasReferences, ICloneable<MemberSelectExpr> {
   public readonly Expression Obj;
-  public string MemberName;
+  public Name MemberNameNode;
+  public string MemberName => MemberNameNode.Value;
   [FilledInDuringResolution] public MemberDecl Member;    // will be a Field or Function
   [FilledInDuringResolution] public Label /*?*/ AtLabel;  // non-null for a two-state selection
   [FilledInDuringResolution] public bool InCompiledContext;
@@ -15,25 +16,25 @@ public class MemberSelectExpr : Expression, IHasUsages, ICloneable<MemberSelectE
   /// PreTypeApplication_AtEnclosingClass is the list of type arguments used to instantiate the type that
   /// declares Member (which is some supertype of the receiver type).
   /// </summary>
-  [FilledInDuringResolution] public List<PreType> PreTypeApplication_AtEnclosingClass;
+  [FilledInDuringResolution] public List<PreType> PreTypeApplicationAtEnclosingClass;
 
   /// <summary>
   /// PreTypeApplication_JustMember is the list of type arguments used to instantiate the type parameters
   /// of Member.
   /// </summary>
-  [FilledInDuringResolution] public List<PreType> PreTypeApplication_JustMember;
+  [FilledInDuringResolution] public List<PreType> PreTypeApplicationJustMember;
 
   /// <summary>
   /// TypeApplication_AtEnclosingClass is the list of type arguments used to instantiate the type that
   /// declares Member (which is some supertype of the receiver type).
   /// </summary>
-  [FilledInDuringResolution] public List<Type> TypeApplication_AtEnclosingClass;
+  [FilledInDuringResolution] public List<Type> TypeApplicationAtEnclosingClass;
 
   /// <summary>
   /// TypeApplication_JustMember is the list of type arguments used to instantiate the type parameters
   /// of Member.
   /// </summary>
-  [FilledInDuringResolution] public List<Type> TypeApplication_JustMember;
+  [FilledInDuringResolution] public List<Type> TypeApplicationJustMember;
 
   /// <summary>
   /// Returns a mapping from formal type parameters to actual type arguments. For example, given
@@ -54,21 +55,21 @@ public Dictionary<TypeParameter, Type> TypeArgumentSubstitutionsAtMemberDeclarat
 
     // Add the mappings from the member's own type parameters
     if (Member is ICallable icallable) {
-      Contract.Assert(TypeApplication_JustMember.Count == icallable.TypeArgs.Count);
+      Contract.Assert(TypeApplicationJustMember.Count == icallable.TypeArgs.Count);
       for (var i = 0; i < icallable.TypeArgs.Count; i++) {
-        subst.Add(icallable.TypeArgs[i], TypeApplication_JustMember[i]);
+        subst.Add(icallable.TypeArgs[i], TypeApplicationJustMember[i]);
       }
     } else {
-      Contract.Assert(TypeApplication_JustMember.Count == 0);
+      Contract.Assert(TypeApplicationJustMember.Count == 0);
     }
 
     // Add the mappings from the enclosing class.
     TopLevelDecl cl = Member.EnclosingClass;
     // Expand the type down to its non-null type, if any
     if (cl != null) {
-      Contract.Assert(cl.TypeArgs.Count == TypeApplication_AtEnclosingClass.Count);
+      Contract.Assert(cl.TypeArgs.Count == TypeApplicationAtEnclosingClass.Count);
       for (var i = 0; i < cl.TypeArgs.Count; i++) {
-        subst.Add(cl.TypeArgs[i], TypeApplication_AtEnclosingClass[i]);
+        subst.Add(cl.TypeArgs[i], TypeApplicationAtEnclosingClass[i]);
       }
     }
 
@@ -94,21 +95,21 @@ public Dictionary<TypeParameter, PreType> PreTypeArgumentSubstitutionsAtMemberDe
 
     // Add the mappings from the member's own type parameters
     if (Member is ICallable icallable) {
-      Contract.Assert(PreTypeApplication_JustMember.Count == icallable.TypeArgs.Count);
+      Contract.Assert(PreTypeApplicationJustMember.Count == icallable.TypeArgs.Count);
       for (var i = 0; i < icallable.TypeArgs.Count; i++) {
-        subst.Add(icallable.TypeArgs[i], PreTypeApplication_JustMember[i]);
+        subst.Add(icallable.TypeArgs[i], PreTypeApplicationJustMember[i]);
       }
     } else {
-      Contract.Assert(PreTypeApplication_JustMember.Count == 0);
+      Contract.Assert(PreTypeApplicationJustMember.Count == 0);
     }
 
     // Add the mappings from the enclosing class.
     TopLevelDecl cl = Member.EnclosingClass;
     // Expand the type down to its non-null type, if any
     if (cl != null) {
-      Contract.Assert(cl.TypeArgs.Count == PreTypeApplication_AtEnclosingClass.Count);
+      Contract.Assert(cl.TypeArgs.Count == PreTypeApplicationAtEnclosingClass.Count);
       for (var i = 0; i < cl.TypeArgs.Count; i++) {
-        subst.Add(cl.TypeArgs[i], PreTypeApplication_AtEnclosingClass[i]);
+        subst.Add(cl.TypeArgs[i], PreTypeApplicationAtEnclosingClass[i]);
       }
     }
 
@@ -134,7 +135,7 @@ public Dictionary<TypeParameter, Type> TypeArgumentSubstitutionsWithParents() {
     Contract.Requires(WasResolved());
     Contract.Ensures(Contract.Result<Dictionary<TypeParameter, Type>>() != null);
 
-    return TypeArgumentSubstitutionsWithParentsAux(Obj.Type, Member, TypeApplication_JustMember);
+    return TypeArgumentSubstitutionsWithParentsAux(Obj.Type, Member, TypeApplicationJustMember);
   }
 
   public static Dictionary<TypeParameter, Type> TypeArgumentSubstitutionsWithParentsAux(Type receiverType, MemberDecl member, List<Type> typeApplicationMember) {
@@ -193,8 +194,8 @@ public static Dictionary<TypeParameter, Type> TypeArgumentSubstitutionsWithParen
   void ObjectInvariant() {
     Contract.Invariant(Obj != null);
     Contract.Invariant(MemberName != null);
-    Contract.Invariant((Member != null) == (TypeApplication_AtEnclosingClass != null));  // TypeApplication_* are set whenever Member is set
-    Contract.Invariant((Member != null) == (TypeApplication_JustMember != null));  // TypeApplication_* are set whenever Member is set
+    Contract.Invariant((Member != null) == (TypeApplicationAtEnclosingClass != null));  // TypeApplication_* are set whenever Member is set
+    Contract.Invariant((Member != null) == (TypeApplicationJustMember != null));  // TypeApplication_* are set whenever Member is set
   }
 
   public MemberSelectExpr Clone(Cloner cloner) {
@@ -203,32 +204,32 @@ public MemberSelectExpr Clone(Cloner cloner) {
 
   public MemberSelectExpr(Cloner cloner, MemberSelectExpr original) : base(cloner, original) {
     Obj = cloner.CloneExpr(original.Obj);
-    MemberName = original.MemberName;
+    MemberNameNode = new Name(cloner, original.MemberNameNode);
 
     if (cloner.CloneResolvedFields) {
       Member = cloner.CloneMember(original.Member, true);
       AtLabel = original.AtLabel;
       InCompiledContext = original.InCompiledContext;
-      TypeApplication_AtEnclosingClass = original.TypeApplication_AtEnclosingClass;
-      TypeApplication_JustMember = original.TypeApplication_JustMember;
+      TypeApplicationAtEnclosingClass = original.TypeApplicationAtEnclosingClass;
+      TypeApplicationJustMember = original.TypeApplicationJustMember;
     }
   }
 
-  public MemberSelectExpr(IToken tok, Expression obj, string memberName)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public MemberSelectExpr(IOrigin origin, Expression obj, Name memberName)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(obj != null);
     Contract.Requires(memberName != null);
     this.Obj = obj;
-    this.MemberName = memberName;
+    this.MemberNameNode = memberName;
   }
 
   /// <summary>
   /// Returns a resolved MemberSelectExpr for a field.
   /// </summary>
-  public MemberSelectExpr(IToken tok, Expression obj, Field field)
-    : this(tok, obj, field.Name) {
-    Contract.Requires(tok != null);
+  public MemberSelectExpr(IOrigin origin, Expression obj, Field field)
+    : this(origin, obj, new Name(field.Name)) {
+    Contract.Requires(origin != null);
     Contract.Requires(obj != null);
     Contract.Requires(field != null);
     Contract.Requires(obj.Type != null);  // "obj" is required to be resolved
@@ -236,17 +237,16 @@ public MemberSelectExpr(IToken tok, Expression obj, Field field)
     this.Member = field;  // resolve here
 
     var receiverType = obj.Type.NormalizeExpand();
-    this.TypeApplication_AtEnclosingClass = receiverType.TypeArgs;
-    this.TypeApplication_JustMember = new List<Type>();
-    this.ResolvedOutparameterTypes = new List<Type>();
+    this.TypeApplicationAtEnclosingClass = receiverType.TypeArgs;
+    this.TypeApplicationJustMember = new List<Type>();
 
     var typeMap = new Dictionary<TypeParameter, Type>();
     if (receiverType is UserDefinedType udt) {
       var cl = udt.ResolvedClass as TopLevelDeclWithMembers;
       Contract.Assert(cl != null);
-      Contract.Assert(cl.TypeArgs.Count == TypeApplication_AtEnclosingClass.Count);
+      Contract.Assert(cl.TypeArgs.Count == TypeApplicationAtEnclosingClass.Count);
       for (var i = 0; i < cl.TypeArgs.Count; i++) {
-        typeMap.Add(cl.TypeArgs[i], TypeApplication_AtEnclosingClass[i]);
+        typeMap.Add(cl.TypeArgs[i], TypeApplicationAtEnclosingClass[i]);
       }
       foreach (var entry in cl.ParentFormalTypeParametersToActuals) {
         var v = entry.Value.Subst(typeMap);
@@ -255,9 +255,9 @@ public MemberSelectExpr(IToken tok, Expression obj, Field field)
     } else if (field.EnclosingClass == null) {
       // leave typeMap as the empty substitution
     } else {
-      Contract.Assert(field.EnclosingClass.TypeArgs.Count == TypeApplication_AtEnclosingClass.Count);
+      Contract.Assert(field.EnclosingClass.TypeArgs.Count == TypeApplicationAtEnclosingClass.Count);
       for (var i = 0; i < field.EnclosingClass.TypeArgs.Count; i++) {
-        typeMap.Add(field.EnclosingClass.TypeArgs[i], TypeApplication_AtEnclosingClass[i]);
+        typeMap.Add(field.EnclosingClass.TypeArgs[i], TypeApplicationAtEnclosingClass[i]);
       }
     }
     this.Type = field.Type.Subst(typeMap);  // resolve here
@@ -290,13 +290,11 @@ public override IEnumerable<Expression> SubExpressions {
     get { yield return Obj; }
   }
 
-  public override IEnumerable<Type> ComponentTypes => Util.Concat(TypeApplication_AtEnclosingClass, TypeApplication_JustMember);
+  public override IEnumerable<Type> ComponentTypes => Util.Concat(TypeApplicationAtEnclosingClass, TypeApplicationJustMember);
 
   [FilledInDuringResolution] public List<Type> ResolvedOutparameterTypes;
 
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return new[] { Member };
+  public IEnumerable<Reference> GetReferences() {
+    return new[] { new Reference(Center, Member) };
   }
-
-  public IToken NameToken => tok;
-}
\ No newline at end of file
+}
diff --git a/Source/DafnyCore/AST/Expressions/Applications/MultiSelectExpr.cs b/Source/DafnyCore/AST/Expressions/Applications/MultiSelectExpr.cs
index 1a1d5270f6b..edabd5ff48b 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/MultiSelectExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/MultiSelectExpr.cs
@@ -19,9 +19,9 @@ public MultiSelectExpr(Cloner cloner, MultiSelectExpr original) : base(cloner, o
     Array = cloner.CloneExpr(original.Array);
   }
 
-  public MultiSelectExpr(IToken tok, Expression array, List<Expression> indices)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public MultiSelectExpr(IOrigin origin, Expression array, List<Expression> indices)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(array != null);
     Contract.Requires(cce.NonNullElements(indices) && 1 <= indices.Count);
 
diff --git a/Source/DafnyCore/AST/Expressions/Applications/NameSegment.cs b/Source/DafnyCore/AST/Expressions/Applications/NameSegment.cs
index e99628ddadc..8b803a02863 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/NameSegment.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/NameSegment.cs
@@ -6,10 +6,11 @@ namespace Microsoft.Dafny;
 
 public class NameSegment : ConcreteSyntaxExpression, ICloneable<NameSegment>, ICanFormat {
   public readonly string Name;
+  public Name NameNode => new Name(Origin, Name);
   public readonly List<Type> OptTypeArguments;
-  public NameSegment(IToken tok, string name, List<Type> optTypeArguments)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public NameSegment(IOrigin origin, string name, List<Type> optTypeArguments)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(optTypeArguments == null || optTypeArguments.Count > 0);
     Name = name;
diff --git a/Source/DafnyCore/AST/Expressions/Applications/SeqSelectExpr.cs b/Source/DafnyCore/AST/Expressions/Applications/SeqSelectExpr.cs
index 5c629bc582a..0aa0d2eb5d1 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/SeqSelectExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/SeqSelectExpr.cs
@@ -8,14 +8,14 @@ public class SeqSelectExpr : Expression, ICloneable<SeqSelectExpr> {
   public readonly Expression Seq;
   public readonly Expression E0;
   public readonly Expression E1;
-  public readonly IToken CloseParen;
+  public readonly Token CloseParen;
 
   public SeqSelectExpr(Cloner cloner, SeqSelectExpr original) : base(cloner, original) {
     SelectOne = original.SelectOne;
     Seq = cloner.CloneExpr(original.Seq);
     E0 = cloner.CloneExpr(original.E0);
     E1 = cloner.CloneExpr(original.E1);
-    CloseParen = cloner.Tok(original.CloseParen);
+    CloseParen = original.CloseParen;
   }
 
   [ContractInvariantMethod]
@@ -24,9 +24,9 @@ void ObjectInvariant() {
     Contract.Invariant(!SelectOne || E1 == null);
   }
 
-  public SeqSelectExpr(IToken tok, bool selectOne, Expression seq, Expression e0, Expression e1, IToken closeParen)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public SeqSelectExpr(IOrigin origin, bool selectOne, Expression seq, Expression e0, Expression e1, Token closeParen)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(seq != null);
     Contract.Requires(!selectOne || e1 == null);
 
diff --git a/Source/DafnyCore/AST/Expressions/Applications/StaticReceiverExpr.cs b/Source/DafnyCore/AST/Expressions/Applications/StaticReceiverExpr.cs
index 705193fbaf0..9a14dc07319 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/StaticReceiverExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/StaticReceiverExpr.cs
@@ -21,9 +21,9 @@ public class StaticReceiverExpr : LiteralExpr, ICloneable<StaticReceiverExpr> {
   /// </summary>
   public Expression ContainerExpression;
 
-  public StaticReceiverExpr(IToken tok, Type t, bool isImplicit)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public StaticReceiverExpr(IOrigin origin, Type t, bool isImplicit)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(t != null);
     UnresolvedType = t;
     IsImplicit = isImplicit;
@@ -38,12 +38,12 @@ public StaticReceiverExpr(Cloner cloner, StaticReceiverExpr original) : base(clo
   /// Constructs a resolved LiteralExpr representing the fictitious static-receiver literal whose type is
   /// "cl" parameterized by the type arguments of "cl" itself.
   /// </summary>
-  public StaticReceiverExpr(IToken tok, TopLevelDeclWithMembers cl, bool isImplicit, Expression lhs = null)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public StaticReceiverExpr(IOrigin origin, TopLevelDeclWithMembers cl, bool isImplicit, Expression lhs = null)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(cl != null);
     var typeArgs = cl.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
-    Type = new UserDefinedType(tok, cl is DefaultClassDecl ? cl.Name : cl.Name + "?", cl, typeArgs);
+    Type = new UserDefinedType(origin, cl is DefaultClassDecl ? cl.Name : cl.Name + "?", cl, typeArgs);
     UnresolvedType = Type;
     IsImplicit = isImplicit;
     ObjectToDiscard = lhs;
@@ -62,9 +62,9 @@ public StaticReceiverExpr(IToken tok, TopLevelDeclWithMembers cl, bool isImplici
   ///   a trait that in turn extends trait "W(g(Y))".  If "t" denotes type "C(G)" and "cl" denotes "W",
   ///   then type of the StaticReceiverExpr will be "T(g(f(G)))".
   /// </summary>
-  public StaticReceiverExpr(IToken tok, UserDefinedType t, TopLevelDeclWithMembers cl, bool isImplicit, Expression lhs = null)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public StaticReceiverExpr(IOrigin origin, UserDefinedType t, TopLevelDeclWithMembers cl, bool isImplicit, Expression lhs = null)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(t.ResolvedClass != null);
     Contract.Requires(cl != null);
     var top = t.AsTopLevelTypeWithMembersBypassInternalSynonym;
@@ -73,9 +73,9 @@ public StaticReceiverExpr(IToken tok, UserDefinedType t, TopLevelDeclWithMembers
       var clArgsInTermsOfTFormals = cl.TypeArgs.ConvertAll(tp => top.ParentFormalTypeParametersToActuals[tp]);
       var subst = TypeParameter.SubstitutionMap(top.TypeArgs, t.TypeArgs);
       var typeArgs = clArgsInTermsOfTFormals.ConvertAll(ty => ty.Subst(subst));
-      Type = new UserDefinedType(tok, cl.Name, cl, typeArgs);
+      Type = new UserDefinedType(origin, cl.Name, cl, typeArgs);
     } else if (t.Name != cl.Name) {  // t may be using the name "C?", and we'd prefer it read "C"
-      Type = new UserDefinedType(tok, cl.Name, cl, t.TypeArgs);
+      Type = new UserDefinedType(origin, cl.Name, cl, t.TypeArgs);
     } else {
       Type = t;
     }
diff --git a/Source/DafnyCore/AST/Expressions/Applications/SuffixExpr.cs b/Source/DafnyCore/AST/Expressions/Applications/SuffixExpr.cs
index 7deb3808106..42e11a89e18 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/SuffixExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/SuffixExpr.cs
@@ -42,9 +42,9 @@ protected SuffixExpr(Cloner cloner, SuffixExpr original) : base(cloner, original
     Lhs = cloner.CloneExpr(original.Lhs);
   }
 
-  public SuffixExpr(IToken tok, Expression lhs)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public SuffixExpr(IOrigin origin, Expression lhs)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(lhs != null);
     Lhs = lhs;
   }
diff --git a/Source/DafnyCore/AST/Expressions/Applications/ThisExpr.cs b/Source/DafnyCore/AST/Expressions/Applications/ThisExpr.cs
index fadf6162007..47b8c197898 100644
--- a/Source/DafnyCore/AST/Expressions/Applications/ThisExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Applications/ThisExpr.cs
@@ -6,9 +6,9 @@ public class ThisExpr : Expression, ICloneable<ThisExpr> {
   public ThisExpr(Cloner cloner, ThisExpr original) : base(cloner, original) {
   }
 
-  public ThisExpr(IToken tok)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public ThisExpr(IOrigin origin)
+    : base(origin) {
+    Contract.Requires(origin != null);
   }
 
   /// <summary>
@@ -17,12 +17,12 @@ public ThisExpr(IToken tok)
   /// to obtain a Dafny "this" expression.
   /// </summary>
   public ThisExpr(MemberDecl m)
-    : base(m.tok) {
+    : base(m.Origin) {
     Contract.Requires(m != null);
-    Contract.Requires(m.tok != null);
+    Contract.Requires(m.Origin != null);
     Contract.Requires(m.EnclosingClass != null);
     Contract.Requires(!m.IsStatic);
-    Type = ModuleResolver.GetReceiverType(m.tok, m);
+    Type = ModuleResolver.GetReceiverType(m.Origin, m);
   }
 
   /// <summary>
@@ -31,10 +31,10 @@ public ThisExpr(MemberDecl m)
   /// to obtain a Dafny "this" expression.
   /// </summary>
   public ThisExpr(TopLevelDeclWithMembers cl)
-    : base(cl.tok) {
+    : base(cl.Origin) {
     Contract.Requires(cl != null);
-    Contract.Requires(cl.tok != null);
-    Type = ModuleResolver.GetThisType(cl.tok, cl);
+    Contract.Requires(cl.Origin != null);
+    Type = ModuleResolver.GetThisType(cl.Origin, cl);
   }
 
   public ThisExpr Clone(Cloner cloner) {
@@ -46,8 +46,8 @@ public class ImplicitThisExpr : ThisExpr, ICloneable<ImplicitThisExpr> {
   public ImplicitThisExpr(Cloner cloner, ImplicitThisExpr original) : base(cloner, original) {
   }
 
-  public ImplicitThisExpr(IToken tok)
-    : base(new AutoGeneratedToken(tok)) {
+  public ImplicitThisExpr(IOrigin tok)
+    : base(new AutoGeneratedOrigin(tok)) {
     Contract.Requires(tok != null);
   }
 
@@ -66,16 +66,16 @@ public override bool IsImplicit {
 /// gives a way to distinguish this receiver from other receivers, which
 /// plays a role in checking the restrictions on divided block statements.
 /// </summary>
-public class ImplicitThisExpr_ConstructorCall : ImplicitThisExpr, ICloneable<ImplicitThisExpr_ConstructorCall> {
-  public ImplicitThisExpr_ConstructorCall(Cloner cloner, ImplicitThisExpr_ConstructorCall original) : base(cloner, original) {
+public class ImplicitThisExprConstructorCall : ImplicitThisExpr, ICloneable<ImplicitThisExprConstructorCall> {
+  public ImplicitThisExprConstructorCall(Cloner cloner, ImplicitThisExprConstructorCall original) : base(cloner, original) {
   }
 
-  public ImplicitThisExpr_ConstructorCall(IToken tok)
+  public ImplicitThisExprConstructorCall(IOrigin tok)
     : base(tok) {
     Contract.Requires(tok != null);
   }
 
-  public new ImplicitThisExpr_ConstructorCall Clone(Cloner cloner) {
-    return new ImplicitThisExpr_ConstructorCall(cloner, this);
+  public new ImplicitThisExprConstructorCall Clone(Cloner cloner) {
+    return new ImplicitThisExprConstructorCall(cloner, this);
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Expressions/AttributedExpression.cs b/Source/DafnyCore/AST/Expressions/AttributedExpression.cs
index 8ac4b125fa0..91a3ac621c2 100644
--- a/Source/DafnyCore/AST/Expressions/AttributedExpression.cs
+++ b/Source/DafnyCore/AST/Expressions/AttributedExpression.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Dafny;
 
-public class AttributedExpression : TokenNode, IAttributeBearingDeclaration {
+public class AttributedExpression : NodeWithComputedRange, IAttributeBearingDeclaration {
   public readonly Expression E;
   public readonly AssertLabel/*?*/ Label;
 
@@ -23,7 +23,9 @@ public Attributes Attributes {
     }
   }
 
-  public override RangeToken RangeToken => E.RangeToken;
+  string IAttributeBearingDeclaration.WhatKind => "expression";
+
+  public override IOrigin Origin => E.Origin;
 
   public bool HasAttributes() {
     return Attributes != null;
@@ -37,23 +39,22 @@ public AttributedExpression(Expression e)
   public AttributedExpression(Expression e, Attributes attrs) : this(e, null, attrs) {
   }
 
-  public AttributedExpression(Expression e, AssertLabel/*?*/ label, Attributes attrs) {
+  public AttributedExpression(Expression e, AssertLabel/*?*/ label, Attributes attrs) : base(e.Origin) {
     Contract.Requires(e != null);
     E = e;
     Label = label;
     Attributes = attrs;
-    this.tok = e.Tok;
   }
 
-  public void AddCustomizedErrorMessage(IToken tok, string s) {
+  public void AddCustomizedErrorMessage(IOrigin tok, string s) {
     var args = new List<Expression>() { new StringLiteralExpr(tok, s, true) };
-    IToken openBrace = tok;
-    IToken closeBrace = new Token(tok.line, tok.col + 7 + s.Length + 1); // where 7 = length(":error ")
+    IOrigin openBrace = tok;
+    IOrigin closeBrace = new Token(tok.line, tok.col + 7 + s.Length + 1); // where 7 = length(":error ")
     this.Attributes = new UserSuppliedAttributes(tok, openBrace, closeBrace, args, this.Attributes);
   }
 
   public override IEnumerable<INode> Children =>
-    (Attributes != null ? new List<Node>() { Attributes } : Enumerable.Empty<Node>()).Concat(
+    Attributes.AsEnumerable().Concat<Node>(
       new List<Node>() { E });
 
   public override IEnumerable<INode> PreResolveChildren => Children;
diff --git a/Source/DafnyCore/AST/Expressions/AutoGeneratedExpression.cs b/Source/DafnyCore/AST/Expressions/AutoGeneratedExpression.cs
index e22ecb327e8..bb42c95a831 100644
--- a/Source/DafnyCore/AST/Expressions/AutoGeneratedExpression.cs
+++ b/Source/DafnyCore/AST/Expressions/AutoGeneratedExpression.cs
@@ -11,9 +11,9 @@ namespace Microsoft.Dafny;
 /// </summary>
 // TODO replace this with AutoGeneratedToken.
 public class AutoGeneratedExpression : ParensExpression, ICloneable<AutoGeneratedExpression> {
-  public AutoGeneratedExpression(IToken tok, Expression e)
-    : base(tok, e) {
-    Contract.Requires(tok != null);
+  public AutoGeneratedExpression(IOrigin origin, Expression e)
+    : base(origin, e) {
+    Contract.Requires(origin != null);
     Contract.Requires(e != null);
   }
 
@@ -28,9 +28,9 @@ public AutoGeneratedExpression(Cloner cloner, AutoGeneratedExpression original)
   /// This maker method takes a resolved expression "e" and wraps a resolved AutoGeneratedExpression
   /// around it.
   /// </summary>
-  public static AutoGeneratedExpression Create(Expression e, IToken token = null) {
+  public static AutoGeneratedExpression Create(Expression e, IOrigin token = null) {
     Contract.Requires(e != null);
-    var a = new AutoGeneratedExpression(token ?? e.tok, e);
+    var a = new AutoGeneratedExpression(token ?? e.Origin, e);
     a.type = e.Type;
     a.ResolvedExpression = e;
     return a;
diff --git a/Source/DafnyCore/AST/Expressions/Collections/DisplayExpression.cs b/Source/DafnyCore/AST/Expressions/Collections/DisplayExpression.cs
index 677dfe896cf..676bd3a690b 100644
--- a/Source/DafnyCore/AST/Expressions/Collections/DisplayExpression.cs
+++ b/Source/DafnyCore/AST/Expressions/Collections/DisplayExpression.cs
@@ -14,8 +14,8 @@ protected DisplayExpression(Cloner cloner, DisplayExpression original) : base(cl
     Elements = original.Elements.ConvertAll(cloner.CloneExpr);
   }
 
-  public DisplayExpression(IToken tok, List<Expression> elements)
-    : base(tok) {
+  public DisplayExpression(IOrigin origin, List<Expression> elements)
+    : base(origin) {
     Contract.Requires(cce.NonNullElements(elements));
     Elements = elements;
   }
diff --git a/Source/DafnyCore/AST/Expressions/Collections/MapDisplayExpr.cs b/Source/DafnyCore/AST/Expressions/Collections/MapDisplayExpr.cs
index b4994544422..f1c90c2769e 100644
--- a/Source/DafnyCore/AST/Expressions/Collections/MapDisplayExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Collections/MapDisplayExpr.cs
@@ -13,9 +13,9 @@ public MapDisplayExpr(Cloner cloner, MapDisplayExpr original) : base(cloner, ori
     Elements = original.Elements.Select(p => new ExpressionPair(cloner.CloneExpr(p.A), cloner.CloneExpr(p.B))).ToList();
   }
 
-  public MapDisplayExpr(IToken tok, bool finite, List<ExpressionPair> elements)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public MapDisplayExpr(IOrigin origin, bool finite, List<ExpressionPair> elements)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(elements));
     Finite = finite;
     Elements = elements;
diff --git a/Source/DafnyCore/AST/Expressions/Collections/MultiSetDisplayExpr.cs b/Source/DafnyCore/AST/Expressions/Collections/MultiSetDisplayExpr.cs
index 1447da33c6c..17a429e0f15 100644
--- a/Source/DafnyCore/AST/Expressions/Collections/MultiSetDisplayExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Collections/MultiSetDisplayExpr.cs
@@ -7,8 +7,8 @@ public class MultiSetDisplayExpr : DisplayExpression, ICloneable<MultiSetDisplay
   public MultiSetDisplayExpr(Cloner cloner, MultiSetDisplayExpr original) : base(cloner, original) {
   }
 
-  public MultiSetDisplayExpr(IToken tok, List<Expression> elements) : base(tok, elements) {
-    Contract.Requires(tok != null);
+  public MultiSetDisplayExpr(IOrigin origin, List<Expression> elements) : base(origin, elements) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(elements));
   }
 
diff --git a/Source/DafnyCore/AST/Expressions/Collections/MultiSetFormingExpr.cs b/Source/DafnyCore/AST/Expressions/Collections/MultiSetFormingExpr.cs
index f7fdab16273..ffb2f187540 100644
--- a/Source/DafnyCore/AST/Expressions/Collections/MultiSetFormingExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Collections/MultiSetFormingExpr.cs
@@ -16,9 +16,9 @@ public MultiSetFormingExpr(Cloner cloner, MultiSetFormingExpr original) : base(c
   }
 
   [Captured]
-  public MultiSetFormingExpr(IToken tok, Expression expr)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public MultiSetFormingExpr(IOrigin origin, Expression expr)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(expr != null);
     cce.Owner.AssignSame(this, expr);
     E = expr;
diff --git a/Source/DafnyCore/AST/Expressions/Collections/SeqConstructionExpr.cs b/Source/DafnyCore/AST/Expressions/Collections/SeqConstructionExpr.cs
index 7d1fba37d98..456fcb5d2b1 100644
--- a/Source/DafnyCore/AST/Expressions/Collections/SeqConstructionExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Collections/SeqConstructionExpr.cs
@@ -15,9 +15,9 @@ public SeqConstructionExpr(Cloner cloner, SeqConstructionExpr original) : base(c
     ExplicitElementType = elemType;
   }
 
-  public SeqConstructionExpr(IToken tok, Type/*?*/ elementType, Expression length, Expression initializer)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public SeqConstructionExpr(IOrigin origin, Type/*?*/ elementType, Expression length, Expression initializer)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(length != null);
     Contract.Requires(initializer != null);
     ExplicitElementType = elementType;
diff --git a/Source/DafnyCore/AST/Expressions/Collections/SeqDisplayExpr.cs b/Source/DafnyCore/AST/Expressions/Collections/SeqDisplayExpr.cs
index f739f72f5e1..16c0ee65956 100644
--- a/Source/DafnyCore/AST/Expressions/Collections/SeqDisplayExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Collections/SeqDisplayExpr.cs
@@ -4,10 +4,10 @@
 namespace Microsoft.Dafny;
 
 public class SeqDisplayExpr : DisplayExpression, ICanFormat, ICloneable<SeqDisplayExpr> {
-  public SeqDisplayExpr(IToken tok, List<Expression> elements)
-    : base(tok, elements) {
+  public SeqDisplayExpr(IOrigin origin, List<Expression> elements)
+    : base(origin, elements) {
     Contract.Requires(cce.NonNullElements(elements));
-    Contract.Requires(tok != null);
+    Contract.Requires(origin != null);
   }
 
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
diff --git a/Source/DafnyCore/AST/Expressions/Collections/SeqUpdateExpr.cs b/Source/DafnyCore/AST/Expressions/Collections/SeqUpdateExpr.cs
index 1c6b34d2b3f..c3c460e9e08 100644
--- a/Source/DafnyCore/AST/Expressions/Collections/SeqUpdateExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Collections/SeqUpdateExpr.cs
@@ -30,9 +30,9 @@ public SeqUpdateExpr(Cloner cloner, SeqUpdateExpr original) : base(cloner, origi
     Value = cloner.CloneExpr(original.Value);
   }
 
-  public SeqUpdateExpr(IToken tok, Expression seq, Expression index, Expression val)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public SeqUpdateExpr(IOrigin origin, Expression seq, Expression index, Expression val)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(seq != null);
     Contract.Requires(index != null);
     Contract.Requires(val != null);
diff --git a/Source/DafnyCore/AST/Expressions/Collections/SetDisplayExpr.cs b/Source/DafnyCore/AST/Expressions/Collections/SetDisplayExpr.cs
index b413a85348f..6df90ec9203 100644
--- a/Source/DafnyCore/AST/Expressions/Collections/SetDisplayExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Collections/SetDisplayExpr.cs
@@ -5,9 +5,9 @@ namespace Microsoft.Dafny;
 
 public class SetDisplayExpr : DisplayExpression, ICanFormat, ICloneable<SetDisplayExpr> {
   public bool Finite;
-  public SetDisplayExpr(IToken tok, bool finite, List<Expression> elements)
-    : base(tok, elements) {
-    Contract.Requires(tok != null);
+  public SetDisplayExpr(IOrigin origin, bool finite, List<Expression> elements)
+    : base(origin, elements) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(elements));
     Finite = finite;
   }
diff --git a/Source/DafnyCore/AST/Expressions/Comprehensions/ComprehensionExpr.cs b/Source/DafnyCore/AST/Expressions/Comprehensions/ComprehensionExpr.cs
index cbca3fded02..4f4cb90d6e8 100644
--- a/Source/DafnyCore/AST/Expressions/Comprehensions/ComprehensionExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Comprehensions/ComprehensionExpr.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Dafny;
 /// LambdaExpr also inherits from this base class but isn't really a comprehension,
 /// and should be considered implementation inheritance.
 /// </summary>
-public abstract class ComprehensionExpr : Expression, IAttributeBearingDeclaration, IBoundVarsBearingExpression, ICanFormat {
+public abstract partial class ComprehensionExpr : Expression, IAttributeBearingDeclaration, IBoundVarsBearingExpression, ICanFormat {
   public virtual string WhatKind => "comprehension";
   public readonly List<BoundVar> BoundVars;
   public readonly Expression Range;
@@ -31,7 +31,7 @@ public abstract class ComprehensionExpr : Expression, IAttributeBearingDeclarati
 
   public IEnumerable<BoundVar> AllBoundVars => BoundVars;
 
-  public IToken BodyStartTok = Token.NoToken;
+  public IOrigin BodyStartOrigin = Token.NoToken;
 
   [ContractInvariantMethod]
   void ObjectInvariant() {
@@ -40,370 +40,9 @@ void ObjectInvariant() {
   }
 
   public Attributes Attributes;
-  Attributes IAttributeBearingDeclaration.Attributes => Attributes;
-
-  public abstract class BoundedPool : ICloneable<BoundedPool> {
-    [Flags]
-    public enum PoolVirtues { None = 0, Finite = 1, Enumerable = 2, IndependentOfAlloc = 4, IndependentOfAlloc_or_ExplicitAlloc = 8 }
-    public abstract PoolVirtues Virtues { get; }
-    /// <summary>
-    /// A higher preference is better.
-    /// A preference below 2 is a last-resort bounded pool. Bounds discovery will not consider
-    /// such a pool to be final until there are no other choices.
-    ///
-    /// For easy reference, here is the BoundedPool hierarchy and their preference levels:
-    ///
-    /// 0: AllocFreeBoundedPool
-    /// 0: ExplicitAllocatedBoundedPool
-    /// 0: SpecialAllocIndependenceAllocatedBoundedPool
-    /// 0: OlderBoundedPool
-    ///
-    /// 1: WiggleWaggleBound
-    ///
-    /// 2: SuperSetBoundedPool
-    /// 2: DatatypeInclusionBoundedPool
-    ///
-    /// 3: SubSetBoundedPool
-    ///
-    /// 4: IntBoundedPool with one bound
-    /// 5: IntBoundedPool with both bounds
-    /// 5: CharBoundedPool
-    ///
-    /// 8: DatatypeBoundedPool
-    ///
-    /// 10: CollectionBoundedPool
-    ///     - SetBoundedPool
-    ///     - MultiSetBoundedPool
-    ///     - MapBoundedPool
-    ///     - SeqBoundedPool
-    ///
-    /// 14: BoolBoundedPool
-    ///
-    /// 15: ExactBoundedPool
-    /// </summary>
-    public abstract int Preference(); // higher is better
-
-    public static BoundedPool GetBest(List<BoundedPool> bounds) {
-      Contract.Requires(bounds != null);
-      bounds = CombineIntegerBounds(bounds);
-      BoundedPool best = null;
-      foreach (var bound in bounds) {
-        if (best is IntBoundedPool ibp0 && bound is IntBoundedPool ibp1) {
-          best = new IntBoundedPool(
-            ChooseBestIntegerBound(ibp0.LowerBound, ibp1.LowerBound, true),
-            ChooseBestIntegerBound(ibp0.UpperBound, ibp1.UpperBound, false));
-        } else if (best == null || bound.Preference() > best.Preference()) {
-          best = bound;
-        }
-      }
-      return best;
-    }
-
-    [CanBeNull]
-    static Expression ChooseBestIntegerBound([CanBeNull] Expression a, [CanBeNull] Expression b, bool pickMax) {
-      if (a == null || b == null) {
-        return a ?? b;
-      }
-
-      if (Expression.IsIntLiteral(Expression.StripParensAndCasts(a), out var aa) &&
-          Expression.IsIntLiteral(Expression.StripParensAndCasts(b), out var bb)) {
-        var x = pickMax ? BigInteger.Max(aa, bb) : BigInteger.Min(aa, bb);
-        return new LiteralExpr(a.tok, x) { Type = a.Type };
-      }
-      return a; // we don't know how to determine which of "a" or "b" is better, so we'll just return "a"
-    }
-
-    public static List<VT> MissingBounds<VT>(List<VT> vars, List<BoundedPool> bounds, PoolVirtues requiredVirtues = PoolVirtues.None) where VT : IVariable {
-      Contract.Requires(vars != null);
-      Contract.Requires(bounds == null || vars.Count == bounds.Count);
-      Contract.Ensures(Contract.Result<List<VT>>() != null);
-      var missing = new List<VT>();
-      for (var i = 0; i < vars.Count; i++) {
-        if (bounds == null || bounds[i] == null || (bounds[i].Virtues & requiredVirtues) != requiredVirtues) {
-          missing.Add(vars[i]);
-        }
-      }
-      return missing;
-    }
-    public static List<bool> HasBounds(List<BoundedPool> bounds, PoolVirtues requiredVirtues = PoolVirtues.None) {
-      Contract.Requires(bounds != null);
-      Contract.Ensures(Contract.Result<List<bool>>() != null);
-      Contract.Ensures(Contract.Result<List<bool>>().Count == bounds.Count);
-      return bounds.ConvertAll(bound => bound != null && (bound.Virtues & requiredVirtues) == requiredVirtues);
-    }
-    static List<BoundedPool> CombineIntegerBounds(List<BoundedPool> bounds) {
-      var lowerBounds = new List<IntBoundedPool>();
-      var upperBounds = new List<IntBoundedPool>();
-      var others = new List<BoundedPool>();
-      foreach (var b in bounds) {
-        var ib = b as IntBoundedPool;
-        if (ib != null && ib.UpperBound == null) {
-          lowerBounds.Add(ib);
-        } else if (ib != null && ib.LowerBound == null) {
-          upperBounds.Add(ib);
-        } else {
-          others.Add(b);
-        }
-      }
-      // pair up the bounds
-      var n = Math.Min(lowerBounds.Count, upperBounds.Count);
-      for (var i = 0; i < n; i++) {
-        others.Add(new IntBoundedPool(lowerBounds[i].LowerBound, upperBounds[i].UpperBound));
-      }
-      for (var i = n; i < lowerBounds.Count; i++) {
-        others.Add(lowerBounds[i]);
-      }
-      for (var i = n; i < upperBounds.Count; i++) {
-        others.Add(upperBounds[i]);
-      }
-      return others;
-    }
-
-    public abstract BoundedPool Clone(Cloner cloner);
-  }
-  public class ExactBoundedPool : BoundedPool {
-    public readonly Expression E;
-    public ExactBoundedPool(Expression e) {
-      Contract.Requires(e != null);
-      E = e;
-    }
-    public override PoolVirtues Virtues => PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-    public override int Preference() => 15;  // the best of all bounds
-    public override BoundedPool Clone(Cloner cloner) {
-      return new ExactBoundedPool(cloner.CloneExpr(E));
-    }
-  }
-  public class BoolBoundedPool : BoundedPool {
-    public override PoolVirtues Virtues => PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-    public override int Preference() => 14;
-    public override BoundedPool Clone(Cloner cloner) {
-      return this;
-    }
-  }
-  public class CharBoundedPool : BoundedPool {
-    public override PoolVirtues Virtues => PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-    public override int Preference() => 5;
-    public override BoundedPool Clone(Cloner cloner) {
-      return this;
-    }
-  }
-  public class AllocFreeBoundedPool : BoundedPool {
-    public Type Type;
-    public AllocFreeBoundedPool(Type t) {
-      Type = t;
-    }
-    public override PoolVirtues Virtues {
-      get {
-        if (Type.IsRefType) {
-          return PoolVirtues.Finite | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-        } else {
-          return PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-        }
-      }
-    }
-    public override int Preference() => 0;
-    public override BoundedPool Clone(Cloner cloner) {
-      return this;
-    }
-  }
-  public class ExplicitAllocatedBoundedPool : BoundedPool {
-    public ExplicitAllocatedBoundedPool() {
-    }
-    public override PoolVirtues Virtues => PoolVirtues.Finite | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-    public override int Preference() => 0;
-    public override BoundedPool Clone(Cloner cloner) {
-      return this;
-    }
-  }
-  public class SpecialAllocIndependenceAllocatedBoundedPool : BoundedPool {
-    public SpecialAllocIndependenceAllocatedBoundedPool() {
-    }
-    public override PoolVirtues Virtues => PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-    public override int Preference() => 0;
-    public override BoundedPool Clone(Cloner cloner) {
-      return this;
-    }
-  }
-  public class IntBoundedPool : BoundedPool {
-    public readonly Expression LowerBound;
-    public readonly Expression UpperBound;
-    public IntBoundedPool(Expression lowerBound, Expression upperBound) {
-      Contract.Requires(lowerBound != null || upperBound != null);
-      LowerBound = lowerBound;
-      UpperBound = upperBound;
-    }
-    public override PoolVirtues Virtues {
-      get {
-        if (LowerBound != null && UpperBound != null) {
-          return PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-        } else {
-          return PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-        }
-      }
-    }
-    public override int Preference() => LowerBound != null && UpperBound != null ? 5 : 4;
-    public override BoundedPool Clone(Cloner cloner) {
-      return new IntBoundedPool(cloner.CloneExpr(LowerBound), cloner.CloneExpr(UpperBound));
-    }
-  }
-  public abstract class CollectionBoundedPool : BoundedPool {
-    public readonly Type BoundVariableType;
-    public readonly Type CollectionElementType;
-    public readonly bool IsFiniteCollection;
-
-    public CollectionBoundedPool(Type bvType, Type collectionElementType, bool isFiniteCollection) {
-      Contract.Requires(bvType != null);
-      Contract.Requires(collectionElementType != null);
-
-      BoundVariableType = bvType;
-      CollectionElementType = collectionElementType;
-      IsFiniteCollection = isFiniteCollection;
-    }
-
-    public override PoolVirtues Virtues {
-      get {
-        var v = PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-        if (IsFiniteCollection) {
-          v |= PoolVirtues.Finite;
-          if (CollectionElementType.IsTestableToBe(BoundVariableType)) {
-            v |= PoolVirtues.Enumerable;
-          }
-        }
-        return v;
-      }
-    }
-    public override int Preference() => 10;
-  }
-  public class SetBoundedPool : CollectionBoundedPool {
-    public readonly Expression Set;
-
-    public SetBoundedPool(Expression set, Type bvType, Type collectionElementType, bool isFiniteCollection)
-      : base(bvType, collectionElementType, isFiniteCollection) {
-      Contract.Requires(set != null);
-      Contract.Requires(bvType != null);
-      Contract.Requires(collectionElementType != null);
-      Set = set;
-    }
-
-    public override BoundedPool Clone(Cloner cloner) {
-      return new SetBoundedPool(cloner.CloneExpr(Set), BoundVariableType, CollectionElementType, IsFiniteCollection);
-    }
-  }
-  public class SubSetBoundedPool : BoundedPool {
-    public readonly Expression UpperBound;
-    public readonly bool IsFiniteCollection;
-    public SubSetBoundedPool(Expression set, bool isFiniteCollection) {
-      UpperBound = set;
-      IsFiniteCollection = isFiniteCollection;
-    }
-    public override PoolVirtues Virtues {
-      get {
-        if (IsFiniteCollection) {
-          return PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-        } else {
-          // it's still enumerable, because at run time, all sets are finite after all
-          return PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-        }
-      }
-    }
-    public override int Preference() => 3;
-    public override BoundedPool Clone(Cloner cloner) {
-      return new SubSetBoundedPool(cloner.CloneExpr(UpperBound), IsFiniteCollection);
-    }
-  }
-  public class SuperSetBoundedPool : BoundedPool {
-    public readonly Expression LowerBound;
-    public SuperSetBoundedPool(Expression set) { LowerBound = set; }
-    public override int Preference() => 2;
-    public override BoundedPool Clone(Cloner cloner) {
-      return new SuperSetBoundedPool(cloner.CloneExpr(LowerBound));
-    }
-
-    public override PoolVirtues Virtues {
-      get {
-        if (LowerBound.Type.MayInvolveReferences) {
-          return PoolVirtues.None;
-        } else {
-          return PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-        }
-      }
-    }
-  }
-  public class MultiSetBoundedPool : CollectionBoundedPool {
-    public readonly Expression MultiSet;
-
-    public MultiSetBoundedPool(Expression multiset, Type bvType, Type collectionElementType)
-      : base(bvType, collectionElementType, true) {
-      Contract.Requires(multiset != null);
-      Contract.Requires(bvType != null);
-      Contract.Requires(collectionElementType != null);
-      MultiSet = multiset;
-    }
-
-    public override BoundedPool Clone(Cloner cloner) {
-      return new MultiSetBoundedPool(cloner.CloneExpr(MultiSet), BoundVariableType, CollectionElementType);
-    }
-  }
-  public class MapBoundedPool : CollectionBoundedPool {
-    public readonly Expression Map;
-
-    public MapBoundedPool(Expression map, Type bvType, Type collectionElementType, bool isFiniteCollection)
-      : base(bvType, collectionElementType, isFiniteCollection) {
-      Contract.Requires(map != null);
-      Contract.Requires(bvType != null);
-      Contract.Requires(collectionElementType != null);
-      Map = map;
-    }
-    public override BoundedPool Clone(Cloner cloner) {
-      return new MapBoundedPool(cloner.CloneExpr(Map), BoundVariableType, CollectionElementType, IsFiniteCollection);
-    }
-  }
-  public class SeqBoundedPool : CollectionBoundedPool {
-    public readonly Expression Seq;
-
-    public SeqBoundedPool(Expression seq, Type bvType, Type collectionElementType)
-      : base(bvType, collectionElementType, true) {
-      Contract.Requires(seq != null);
-      Contract.Requires(bvType != null);
-      Contract.Requires(collectionElementType != null);
-      Seq = seq;
-    }
-
-    public override BoundedPool Clone(Cloner cloner) {
-      return new SeqBoundedPool(cloner.CloneExpr(Seq), BoundVariableType, CollectionElementType);
-    }
-  }
-  public class DatatypeBoundedPool : BoundedPool {
-    public readonly DatatypeDecl Decl;
-
-    public DatatypeBoundedPool(DatatypeDecl d) {
-      Contract.Requires(d != null);
-      Decl = d;
-    }
-    public override PoolVirtues Virtues => PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-    public override int Preference() => 8;
-    public override BoundedPool Clone(Cloner cloner) {
-      return this;
-    }
-  }
-  public class DatatypeInclusionBoundedPool : BoundedPool {
-    public readonly bool IsIndDatatype;
-    public DatatypeInclusionBoundedPool(bool isIndDatatype) : base() { IsIndDatatype = isIndDatatype; }
-    public override PoolVirtues Virtues => (IsIndDatatype ? PoolVirtues.Finite : PoolVirtues.None) | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-    public override int Preference() => 2;
-    public override BoundedPool Clone(Cloner cloner) {
-      return this;
-    }
-  }
-
-  public class OlderBoundedPool : BoundedPool {
-    public OlderBoundedPool() {
-    }
-    public override PoolVirtues Virtues => PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
-    public override int Preference() => 0;
-    public override BoundedPool Clone(Cloner cloner) {
-      return this;
-    }
+  Attributes IAttributeBearingDeclaration.Attributes {
+    get => Attributes;
+    set => Attributes = value;
   }
 
   [FilledInDuringResolution] public List<BoundedPool> Bounds;
@@ -412,12 +51,12 @@ public override BoundedPool Clone(Cloner cloner) {
   public List<BoundVar> UncompilableBoundVars() {
     Contract.Ensures(Contract.Result<List<BoundVar>>() != null);
     var v = BoundedPool.PoolVirtues.Finite | BoundedPool.PoolVirtues.Enumerable;
-    return ComprehensionExpr.BoundedPool.MissingBounds(BoundVars, Bounds, v);
+    return BoundedPool.MissingBounds(BoundVars, Bounds, v);
   }
 
-  public ComprehensionExpr(IToken tok, RangeToken rangeToken, List<BoundVar> bvars, Expression range, Expression term, Attributes attrs)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  protected ComprehensionExpr(IOrigin origin, List<BoundVar> bvars, Expression range, Expression term, Attributes attrs)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(bvars));
     Contract.Requires(term != null);
 
@@ -425,16 +64,14 @@ public ComprehensionExpr(IToken tok, RangeToken rangeToken, List<BoundVar> bvars
     Range = range;
     Term = term;
     Attributes = attrs;
-    BodyStartTok = tok;
-    RangeToken = rangeToken;
+    BodyStartOrigin = origin;
   }
 
   protected ComprehensionExpr(Cloner cloner, ComprehensionExpr original) : base(cloner, original) {
     BoundVars = original.BoundVars.Select(bv => cloner.CloneBoundVar(bv, false)).ToList();
     Range = cloner.CloneExpr(original.Range);
     Attributes = cloner.CloneAttributes(original.Attributes);
-    BodyStartTok = cloner.Tok(original.BodyStartTok);
-    RangeToken = cloner.Tok(original.RangeToken);
+    BodyStartOrigin = cloner.Origin(original.BodyStartOrigin);
     Term = cloner.CloneExpr(original.Term);
 
     if (cloner.CloneResolvedFields) {
@@ -442,13 +79,13 @@ protected ComprehensionExpr(Cloner cloner, ComprehensionExpr original) : base(cl
     }
   }
   public override IEnumerable<INode> Children =>
-    (Attributes != null ? new List<Node> { Attributes } : Enumerable.Empty<Node>()).
-    Concat(BoundVars).Concat(SubExpressions);
+    Attributes.AsEnumerable().
+    Concat<Node>(BoundVars).Concat(SubExpressions);
 
   public override IEnumerable<INode> PreResolveChildren =>
-    (Attributes != null ? new List<Node> { Attributes } : Enumerable.Empty<Node>())
-    .Concat<Node>(Range != null && Range.tok.line > 0 ? new List<Node>() { Range } : new List<Node>())
-    .Concat(Term != null && Term.tok.line > 0 ? new List<Node> { Term } : new List<Node>());
+    Attributes.AsEnumerable()
+      .Concat<Node>(Range != null && Range.Origin.line > 0 ? new List<Node>() { Range } : new List<Node>())
+    .Concat(Term != null && Term.Origin.line > 0 ? new List<Node> { Term } : new List<Node>());
 
   public override IEnumerable<Expression> SubExpressions {
     get {
diff --git a/Source/DafnyCore/AST/Expressions/Comprehensions/ExistsExpr.cs b/Source/DafnyCore/AST/Expressions/Comprehensions/ExistsExpr.cs
index c021f943bac..52eac7cfdc3 100644
--- a/Source/DafnyCore/AST/Expressions/Comprehensions/ExistsExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Comprehensions/ExistsExpr.cs
@@ -5,12 +5,12 @@ namespace Microsoft.Dafny;
 
 public class ExistsExpr : QuantifierExpr, ICloneable<ExistsExpr> {
   public override string WhatKind => "exists expression";
-  protected override BinaryExpr.ResolvedOpcode SplitResolvedOp { get { return BinaryExpr.ResolvedOpcode.Or; } }
+  protected override BinaryExpr.ResolvedOpcode SplitResolvedOp => BinaryExpr.ResolvedOpcode.Or;
 
-  public ExistsExpr(IToken tok, RangeToken rangeToken, List<BoundVar> bvars, Expression range, Expression term, Attributes attrs)
-    : base(tok, rangeToken, bvars, range, term, attrs) {
+  public ExistsExpr(IOrigin origin, List<BoundVar> bvars, Expression range, Expression term, Attributes attrs)
+    : base(origin, bvars, range, term, attrs) {
     Contract.Requires(cce.NonNullElements(bvars));
-    Contract.Requires(tok != null);
+    Contract.Requires(origin != null);
     Contract.Requires(term != null);
   }
 
@@ -25,9 +25,44 @@ public override Expression LogicalBody(bool bypassSplitQuantifier = false) {
     if (Range == null) {
       return Term;
     }
-    var body = new BinaryExpr(Term.tok, BinaryExpr.Opcode.And, Range, Term);
+    var body = new BinaryExpr(Term.Origin, BinaryExpr.Opcode.And, Range, Term);
     body.ResolvedOp = BinaryExpr.ResolvedOpcode.And;
     body.Type = Term.Type;
     return body;
   }
+
+  /// <summary>
+  /// Returns an expression like 'exists' but where the bound variables have been renamed to have
+  /// 'prefix' as a prefix to their previous names.
+  /// Assumes the expression has been resolved.
+  /// </summary>
+  public Expression AlphaRename(string prefix) {
+    Contract.Requires(this != null);
+    Contract.Requires(prefix != null);
+
+    if (SplitQuantifier != null) {
+      // TODO: what to do?  Substitute(exists.SplitQuantifierExpression);
+    }
+
+    var substMap = new Dictionary<IVariable, Expression>();
+    var var4var = new Dictionary<BoundVar, BoundVar>();
+    var bvars = new List<BoundVar>();
+    foreach (var bv in BoundVars) {
+      var newBv = new BoundVar(bv.Origin, prefix + bv.Name, bv.Type);
+      bvars.Add(newBv);
+      var4var.Add(bv, newBv);
+      var ie = new IdentifierExpr(newBv.Origin, newBv.Name);
+      ie.Var = newBv;  // resolve here
+      ie.Type = newBv.Type;  // resolve here
+      substMap.Add(bv, ie);
+    }
+    var s = new Substituter(null, substMap, new Dictionary<TypeParameter, Type>());
+    var range = Range == null ? null : s.Substitute(Range);
+    var term = s.Substitute(Term);
+    var attrs = s.SubstAttributes(Attributes);
+    var ex = new ExistsExpr(Origin, bvars, range, term, attrs);
+    ex.Type = Type.Bool;
+    ex.Bounds = s.SubstituteBoundedPoolList(Bounds);
+    return ex;
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Expressions/Comprehensions/ForallExpr.cs b/Source/DafnyCore/AST/Expressions/Comprehensions/ForallExpr.cs
index 36f29c10f70..9b03a7712bc 100644
--- a/Source/DafnyCore/AST/Expressions/Comprehensions/ForallExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Comprehensions/ForallExpr.cs
@@ -5,12 +5,12 @@ namespace Microsoft.Dafny;
 
 public class ForallExpr : QuantifierExpr, ICloneable<ForallExpr> {
   public override string WhatKind => "forall expression";
-  protected override BinaryExpr.ResolvedOpcode SplitResolvedOp { get { return BinaryExpr.ResolvedOpcode.And; } }
+  protected override BinaryExpr.ResolvedOpcode SplitResolvedOp => BinaryExpr.ResolvedOpcode.And;
 
-  public ForallExpr(IToken tok, RangeToken rangeToken, List<BoundVar> bvars, Expression range, Expression term, Attributes attrs)
-    : base(tok, rangeToken, bvars, range, term, attrs) {
+  public ForallExpr(IOrigin origin, List<BoundVar> bvars, Expression range, Expression term, Attributes attrs)
+    : base(origin, bvars, range, term, attrs) {
     Contract.Requires(cce.NonNullElements(bvars));
-    Contract.Requires(tok != null);
+    Contract.Requires(origin != null);
     Contract.Requires(term != null);
   }
 
@@ -25,7 +25,7 @@ public override Expression LogicalBody(bool bypassSplitQuantifier = false) {
     if (Range == null) {
       return Term;
     }
-    var body = new BinaryExpr(Term.tok, BinaryExpr.Opcode.Imp, Range, Term);
+    var body = new BinaryExpr(Term.Origin, BinaryExpr.Opcode.Imp, Range, Term);
     body.ResolvedOp = BinaryExpr.ResolvedOpcode.Imp;
     body.Type = Term.Type;
     return body;
diff --git a/Source/DafnyCore/AST/Expressions/Comprehensions/LambdaExpr.cs b/Source/DafnyCore/AST/Expressions/Comprehensions/LambdaExpr.cs
index 14f73e4b845..e745237bf34 100644
--- a/Source/DafnyCore/AST/Expressions/Comprehensions/LambdaExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Comprehensions/LambdaExpr.cs
@@ -3,15 +3,15 @@
 
 namespace Microsoft.Dafny;
 
-public class LambdaExpr : ComprehensionExpr, ICloneable<LambdaExpr> {
-  public override string WhatKind => "lambda";
+public class LambdaExpr : ComprehensionExpr, ICloneable<LambdaExpr>, IFrameScope {
+  public override string WhatKind => Reads.Expressions.Count != 0 ? "lambda" : Range != null ? "partial lambda" : "total lambda";
 
   public Expression Body => Term;
 
-  public readonly List<FrameExpression> Reads;
+  public readonly Specification<FrameExpression> Reads;
 
-  public LambdaExpr(IToken tok, RangeToken rangeToken, List<BoundVar> bvars, Expression requires, List<FrameExpression> reads, Expression body)
-    : base(tok, rangeToken, bvars, requires, body, null) {
+  public LambdaExpr(IOrigin origin, List<BoundVar> bvars, Expression requires, Specification<FrameExpression> reads, Expression body)
+    : base(origin, bvars, requires, body, null) {
     Contract.Requires(reads != null);
     Reads = reads;
   }
@@ -22,14 +22,14 @@ public override IEnumerable<Expression> SubExpressions {
       if (Range != null) {
         yield return Range;
       }
-      foreach (var read in Reads) {
+      foreach (var read in Reads.Expressions) {
         yield return read.E;
       }
     }
   }
 
   public LambdaExpr(Cloner cloner, LambdaExpr original) : base(cloner, original) {
-    Reads = original.Reads.ConvertAll(cloner.CloneFrameExpr);
+    Reads = cloner.CloneSpecFrameExpr(original.Reads);
   }
 
   public LambdaExpr Clone(Cloner cloner) {
@@ -84,4 +84,6 @@ public override bool SetIndent(int indentBefore, TokenNewIndentCollector formatt
 
     return true;
   }
+
+  public string Designator => "lambda";
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Expressions/Comprehensions/MapComprehension.cs b/Source/DafnyCore/AST/Expressions/Comprehensions/MapComprehension.cs
index 38022ff60fb..1cdfe7c3acd 100644
--- a/Source/DafnyCore/AST/Expressions/Comprehensions/MapComprehension.cs
+++ b/Source/DafnyCore/AST/Expressions/Comprehensions/MapComprehension.cs
@@ -20,9 +20,9 @@ public MapComprehension(Cloner cloner, MapComprehension original) : base(cloner,
     Finite = original.Finite;
   }
 
-  public MapComprehension(IToken tok, RangeToken rangeToken, bool finite, List<BoundVar> bvars, Expression range, Expression/*?*/ termLeft, Expression termRight, Attributes attrs)
-    : base(tok, rangeToken, bvars, range, termRight, attrs) {
-    Contract.Requires(tok != null);
+  public MapComprehension(IOrigin origin, bool finite, List<BoundVar> bvars, Expression range, Expression/*?*/ termLeft, Expression termRight, Attributes attrs)
+    : base(origin, bvars, range, termRight, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(bvars));
     Contract.Requires(1 <= bvars.Count);
     Contract.Requires(range != null);
diff --git a/Source/DafnyCore/AST/Expressions/Comprehensions/QuantifierExpr.cs b/Source/DafnyCore/AST/Expressions/Comprehensions/QuantifierExpr.cs
index 5860a67c761..28db8b57af7 100644
--- a/Source/DafnyCore/AST/Expressions/Comprehensions/QuantifierExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Comprehensions/QuantifierExpr.cs
@@ -11,13 +11,13 @@ public abstract class QuantifierExpr : ComprehensionExpr, TypeParameter.ParentTy
   private readonly int UniqueId;
   private static int currentQuantId = -1;
 
-  protected virtual BinaryExpr.ResolvedOpcode SplitResolvedOp { get { return BinaryExpr.ResolvedOpcode.Or; } }
+  protected virtual BinaryExpr.ResolvedOpcode SplitResolvedOp => BinaryExpr.ResolvedOpcode.Or;
 
   private Expression SplitQuantifierToExpression() {
     Contract.Requires(SplitQuantifier != null && SplitQuantifier.Any());
     Expression accumulator = SplitQuantifier[0];
     for (int tid = 1; tid < SplitQuantifier.Count; tid++) {
-      accumulator = new BinaryExpr(Term.tok, SplitResolvedOp, accumulator, SplitQuantifier[tid]);
+      accumulator = new BinaryExpr(Term.Origin, SplitResolvedOp, accumulator, SplitQuantifier[tid]);
     }
     return accumulator;
   }
@@ -50,9 +50,9 @@ public String Refresh(string prefix, FreshIdGenerator idGen) {
     return idGen.FreshId(prefix);
   }
 
-  public QuantifierExpr(IToken tok, RangeToken rangeToken, List<BoundVar> bvars, Expression range, Expression term, Attributes attrs)
-    : base(tok, rangeToken, bvars, range, term, attrs) {
-    Contract.Requires(tok != null);
+  protected QuantifierExpr(IOrigin origin, List<BoundVar> bvars, Expression range, Expression term, Attributes attrs)
+    : base(origin, bvars, range, term, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(bvars));
     Contract.Requires(term != null);
     this.UniqueId = FreshQuantId();
@@ -78,14 +78,14 @@ public virtual Expression LogicalBody(bool bypassSplitQuantifier = false) {
 
   public override IEnumerable<Expression> SubExpressions {
     get {
-      if (SplitQuantifier == null) {
-        foreach (var e in base.SubExpressions) {
-          yield return e;
-        }
-      } else {
-        foreach (var e in Attributes.SubExpressions(Attributes)) {
-          yield return e;
-        }
+      foreach (var e in base.SubExpressions) {
+        yield return e;
+      }
+      foreach (var e in Attributes.SubExpressions(Attributes)) {
+        yield return e;
+      }
+
+      if (SplitQuantifier != null) {
         foreach (var e in SplitQuantifier) {
           yield return e;
         }
diff --git a/Source/DafnyCore/AST/Expressions/Comprehensions/SetComprehension.cs b/Source/DafnyCore/AST/Expressions/Comprehensions/SetComprehension.cs
index 0dc1a998664..831a359655c 100644
--- a/Source/DafnyCore/AST/Expressions/Comprehensions/SetComprehension.cs
+++ b/Source/DafnyCore/AST/Expressions/Comprehensions/SetComprehension.cs
@@ -27,9 +27,9 @@ public SetComprehension(Cloner cloner, SetComprehension original) : base(cloner,
     Finite = original.Finite;
   }
 
-  public SetComprehension(IToken tok, RangeToken rangeToken, bool finite, List<BoundVar> bvars, Expression range, Expression/*?*/ term, Attributes attrs)
-    : base(tok, rangeToken, bvars, range, term ?? new IdentifierExpr(tok, bvars[0].Name), attrs) {
-    Contract.Requires(tok != null);
+  public SetComprehension(IOrigin origin, bool finite, List<BoundVar> bvars, Expression range, Expression/*?*/ term, Attributes attrs)
+    : base(origin, bvars, range, term ?? new IdentifierExpr(origin, bvars[0].Name), attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(bvars));
     Contract.Requires(1 <= bvars.Count);
     Contract.Requires(range != null);
diff --git a/Source/DafnyCore/AST/Expressions/ConcreteSyntaxExpression.cs b/Source/DafnyCore/AST/Expressions/ConcreteSyntaxExpression.cs
index 69bda638311..26ebc0ed5cc 100644
--- a/Source/DafnyCore/AST/Expressions/ConcreteSyntaxExpression.cs
+++ b/Source/DafnyCore/AST/Expressions/ConcreteSyntaxExpression.cs
@@ -15,21 +15,14 @@ protected ConcreteSyntaxExpression(Cloner cloner, ConcreteSyntaxExpression origi
     }
   }
 
+  /// <summary>
+  /// // after resolution, manipulation of "this" should proceed as with manipulating "this.ResolvedExpression"
+  /// </summary>
   [FilledInDuringResolution]
-  private Expression resolvedExpression;
+  public Expression ResolvedExpression { get; set; }
 
-  public Expression ResolvedExpression {
-    get => resolvedExpression;
-    set {
-      resolvedExpression = value;
-      if (rangeToken != null && resolvedExpression != null) {
-        resolvedExpression.RangeToken = rangeToken;
-      }
-    }
-  }  // after resolution, manipulation of "this" should proceed as with manipulating "this.ResolvedExpression"
-
-  public ConcreteSyntaxExpression(IToken tok)
-    : base(tok) {
+  protected ConcreteSyntaxExpression(IOrigin origin)
+    : base(origin) {
   }
   public override IEnumerable<INode> Children => ResolvedExpression == null ? Array.Empty<Node>() : new[] { ResolvedExpression };
   public override IEnumerable<Expression> SubExpressions {
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/ITEExpr.cs b/Source/DafnyCore/AST/Expressions/Conditional/ITEExpr.cs
index aa6e606c27c..78ac3f162e8 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/ITEExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/ITEExpr.cs
@@ -30,9 +30,9 @@ void ObjectInvariant() {
     Contract.Invariant(Els != null);
   }
 
-  public ITEExpr(IToken tok, bool isBindingGuard, Expression test, Expression thn, Expression els)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public ITEExpr(IOrigin origin, bool isBindingGuard, Expression test, Expression thn, Expression els)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(test != null);
     Contract.Requires(thn != null);
     Contract.Requires(els != null);
@@ -64,7 +64,7 @@ public override IEnumerable<Expression> TerminalExpressions {
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     var lineThen = 0;
     var colThen = 0;
-    IToken thenToken = null;
+    IOrigin thenToken = null;
     foreach (var token in OwnedTokens) {
       switch (token.val) {
         case "if": {
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCase.cs b/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCase.cs
index 0897f4bbb69..be2227d0021 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCase.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCase.cs
@@ -2,13 +2,12 @@
 
 namespace Microsoft.Dafny;
 
-public abstract class NestedMatchCase : TokenNode {
+public abstract class NestedMatchCase : NodeWithComputedRange {
   public readonly ExtendedPattern Pat;
 
-  public NestedMatchCase(IToken tok, ExtendedPattern pat) {
-    Contract.Requires(tok != null);
+  protected NestedMatchCase(IOrigin origin, ExtendedPattern pat) : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(pat != null);
-    this.tok = tok;
     this.Pat = pat;
   }
 
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCaseExpr.cs b/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCaseExpr.cs
index 87f15ac5fcd..e831cb82d9d 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCaseExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCaseExpr.cs
@@ -1,23 +1,26 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.IO;
 using System.Linq;
 
 namespace Microsoft.Dafny;
 
 public class NestedMatchCaseExpr : NestedMatchCase, IAttributeBearingDeclaration {
   public Expression Body;
-  public Attributes Attributes;
-  Attributes IAttributeBearingDeclaration.Attributes => Attributes;
+  public Attributes Attributes { get; set; }
 
-  public NestedMatchCaseExpr(IToken tok, ExtendedPattern pat, Expression body, Attributes attrs) : base(tok, pat) {
+  string IAttributeBearingDeclaration.WhatKind => "match expression case";
+
+  public NestedMatchCaseExpr(IOrigin origin, ExtendedPattern pat, Expression body, Attributes attrs) : base(origin, pat) {
     Contract.Requires(body != null);
     this.Body = body;
     this.Attributes = attrs;
   }
 
   public override IEnumerable<INode> Children =>
-    (Attributes != null ? new Node[] { Attributes } : Enumerable.Empty<Node>()).Concat(new Node[] { Body, Pat });
+    Attributes.AsEnumerable().
+      Concat<Node>(new Node[] { Body, Pat });
 
   public override IEnumerable<INode> PreResolveChildren => Children;
 
@@ -33,7 +36,13 @@ public void Resolve(ModuleResolver resolver,
     var afterResolveErrorCount = resolver.reporter.ErrorCount;
     if (beforeResolveErrorCount == afterResolveErrorCount) {
       resolver.ResolveExpression(Body, resolutionContext);
-      resolver.ConstrainSubtypeRelation(resultType, Body.Type, Body.tok, "type of case bodies do not agree (found {0}, previous types {1})", Body.Type, resultType);
+      resolver.ConstrainSubtypeRelation(resultType, Body.Type, Body.Origin, "type of case bodies do not agree (found {0}, previous types {1})", Body.Type, resultType);
     }
   }
+
+  public override string ToString() {
+    var writer = new StringWriter();
+    new Printer(writer, DafnyOptions.Default).PrintNestedMatchCase(false, false, this, false, false);
+    return writer.ToString();
+  }
 }
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCaseStmt.cs b/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCaseStmt.cs
index d9f33f87712..c3a5bd436c9 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCaseStmt.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchCaseStmt.cs
@@ -7,22 +7,21 @@ namespace Microsoft.Dafny;
 
 public class NestedMatchCaseStmt : NestedMatchCase, IAttributeBearingDeclaration, ICloneable<NestedMatchCaseStmt> {
   public readonly List<Statement> Body;
-  public Attributes Attributes;
-  Attributes IAttributeBearingDeclaration.Attributes => Attributes;
-  public NestedMatchCaseStmt(RangeToken rangeToken, ExtendedPattern pat, List<Statement> body) : base(rangeToken.StartToken, pat) {
-    RangeToken = rangeToken;
+  public Attributes Attributes { get; set; }
+  string IAttributeBearingDeclaration.WhatKind => "match statement case";
+  public NestedMatchCaseStmt(IOrigin rangeOrigin, ExtendedPattern pat, List<Statement> body) : base(rangeOrigin, pat) {
     Contract.Requires(body != null);
     this.Body = body;
     this.Attributes = null;
   }
-  public NestedMatchCaseStmt(IToken tok, ExtendedPattern pat, List<Statement> body, Attributes attrs) : base(tok, pat) {
+  public NestedMatchCaseStmt(IOrigin origin, ExtendedPattern pat, List<Statement> body, Attributes attrs) : base(origin, pat) {
     Contract.Requires(body != null);
     this.Body = body;
     this.Attributes = attrs;
   }
 
-  private NestedMatchCaseStmt(Cloner cloner, NestedMatchCaseStmt original) : base(original.tok, original.Pat) {
-    this.Body = original.Body.Select(cloner.CloneStmt).ToList();
+  private NestedMatchCaseStmt(Cloner cloner, NestedMatchCaseStmt original) : base(original.Origin, original.Pat) {
+    this.Body = original.Body.Select(stmt => cloner.CloneStmt(stmt, false)).ToList();
     this.Attributes = cloner.CloneAttributes(original.Attributes);
   }
 
@@ -37,16 +36,16 @@ public void Resolve(
     ResolutionContext resolutionContext,
     Dictionary<TypeParameter, Type> subst,
     Type sourceType) {
-    var beforeResolveErrorCount = resolver.reporter.ErrorCount;
+    var beforeResolveErrorCount = resolver.Reporter.ErrorCount;
 
     Pat.Resolve(resolver, resolutionContext, sourceType, resolutionContext.IsGhost, true, false, false);
 
     // In Dafny, any bound variables introduced in a pattern are in scope throughout the case body, and cannot be shadowed at the top-level
     // of the case body. Because the machinery above creates, for each bound variable, a local variable with the same name and declares that
     // local variable in the case body, we introduce a new scope boundary around the body.
-    resolver.scope.PushMarker();
+    resolver.Scope.PushMarker();
     resolver.ResolveAttributes(this, resolutionContext);
-    var afterResolveErrorCount = resolver.reporter.ErrorCount;
+    var afterResolveErrorCount = resolver.Reporter.ErrorCount;
     if (beforeResolveErrorCount == afterResolveErrorCount) {
       resolver.DominatingStatementLabels.PushMarker();
       foreach (Statement ss in Body) {
@@ -54,6 +53,6 @@ public void Resolve(
       }
       resolver.DominatingStatementLabels.PopMarker();
     }
-    resolver.scope.PopMarker();
+    resolver.Scope.PopMarker();
   }
 }
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchExpr.cs b/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchExpr.cs
index f362acdd8dd..98914aa9457 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchExpr.cs
@@ -8,12 +8,16 @@ namespace Microsoft.Dafny;
 interface INestedMatch : INode {
   Expression Source { get; }
   string MatchTypeName { get; }
+  IReadOnlyList<NestedMatchCase> Cases { get; }
 }
 
 public class NestedMatchExpr : Expression, ICloneable<NestedMatchExpr>, ICanFormat, INestedMatch {
   public Expression Source { get; }
   public string MatchTypeName => "expression";
-  public readonly List<NestedMatchCaseExpr> Cases;
+  public List<NestedMatchCaseExpr> Cases { get; }
+
+  IReadOnlyList<NestedMatchCase> INestedMatch.Cases => Cases;
+
   public readonly bool UsesOptionalBraces;
   public Attributes Attributes;
 
@@ -24,12 +28,13 @@ public NestedMatchExpr(Cloner cloner, NestedMatchExpr original) : base(cloner, o
     this.Source = cloner.CloneExpr(original.Source);
     this.Cases = original.Cases.Select(cloner.CloneNestedMatchCaseExpr).ToList();
     this.UsesOptionalBraces = original.UsesOptionalBraces;
+
     if (cloner.CloneResolvedFields) {
       Flattened = cloner.CloneExpr(original.Flattened);
     }
   }
 
-  public NestedMatchExpr(IToken tok, Expression source, [Captured] List<NestedMatchCaseExpr> cases, bool usesOptionalBraces, Attributes attrs = null) : base(tok) {
+  public NestedMatchExpr(IOrigin origin, Expression source, [Captured] List<NestedMatchCaseExpr> cases, bool usesOptionalBraces, Attributes attrs = null) : base(origin) {
     Contract.Requires(source != null);
     Contract.Requires(cce.NonNullElements(cases));
     this.Source = source;
@@ -60,13 +65,13 @@ public void Resolve(ModuleResolver resolver, ResolutionContext resolutionContext
       resolver.PartiallySolveTypeConstraints(true);
 
       if (Source.Type is TypeProxy) {
-        resolver.reporter.Error(MessageSource.Resolver, tok, "Could not resolve the type of the source of the match expression. Please provide additional typing annotations.");
+        resolver.reporter.Error(MessageSource.Resolver, Origin, "Could not resolve the type of the source of the match expression. Please provide additional typing annotations.");
         return;
       }
     }
 
     var errorCount = resolver.reporter.Count(ErrorLevel.Error);
-    var sourceType = resolver.PartiallyResolveTypeForMemberSelection(Source.tok, Source.Type).NormalizeExpand();
+    var sourceType = resolver.PartiallyResolveTypeForMemberSelection(Source.Origin, Source.Type).NormalizeExpand();
     if (resolver.reporter.Count(ErrorLevel.Error) != errorCount) {
       return;
     }
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchStmt.cs b/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchStmt.cs
index 9afe86731ca..b585aa1de4c 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchStmt.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/NestedMatchStmt.cs
@@ -8,19 +8,22 @@ namespace Microsoft.Dafny;
 public class NestedMatchStmt : Statement, ICloneable<NestedMatchStmt>, ICanFormat, INestedMatch, ICanResolve {
   public Expression Source { get; }
   public string MatchTypeName => "statement";
-  public readonly List<NestedMatchCaseStmt> Cases;
+  public List<NestedMatchCaseStmt> Cases { get; }
+
+  IReadOnlyList<NestedMatchCase> INestedMatch.Cases => Cases;
+
   public readonly bool UsesOptionalBraces;
 
   [FilledInDuringResolution] public Statement Flattened { get; set; }
 
   private void InitializeAttributes() {
     // Default case for match is false
-    bool splitMatch = Attributes.Contains(this.Attributes, "split");
-    Attributes.ContainsBool(this.Attributes, "split", ref splitMatch);
-    foreach (var c in this.Cases) {
+    bool splitMatch = Attributes.Contains(Attributes, "split");
+    Attributes.ContainsBool(Attributes, "split", ref splitMatch);
+    foreach (var c in Cases) {
       if (!Attributes.Contains(c.Attributes, "split")) {
         List<Expression> args = new List<Expression>();
-        args.Add(new LiteralExpr(c.Tok, splitMatch));
+        args.Add(Expression.CreateBoolLiteral(c.Origin, splitMatch));
         Attributes attrs = new Attributes("split", args, c.Attributes);
         c.Attributes = attrs;
       }
@@ -36,16 +39,23 @@ public NestedMatchStmt(Cloner cloner, NestedMatchStmt original) : base(cloner, o
     Cases = original.Cases.ConvertAll(cloner.CloneNestedMatchCaseStmt);
     UsesOptionalBraces = original.UsesOptionalBraces;
     if (cloner.CloneResolvedFields) {
-      Flattened = cloner.CloneStmt(original.Flattened);
+      Flattened = cloner.CloneStmt(original.Flattened, false);
     }
   }
 
   public override IEnumerable<INode> Children => new[] { Source }.Concat<Node>(Cases);
 
-  public override IEnumerable<Statement> SubStatements => Cases.SelectMany(c => c.Body);
+  public override IEnumerable<Statement> SubStatements {
+    get {
+      if (Flattened != null) {
+        return Flattened.SubStatements;
+      }
+      return Cases.SelectMany(c => c.Body);
+    }
+  }
 
   public override IEnumerable<Statement> PreResolveSubStatements {
-    get => this.Cases.SelectMany(oneCase => oneCase.Body);
+    get => Cases.SelectMany(oneCase => oneCase.Body);
   }
 
   public override IEnumerable<Expression> NonSpecificationSubExpressions {
@@ -62,13 +72,13 @@ public override IEnumerable<Expression> NonSpecificationSubExpressions {
     }
   }
 
-  public NestedMatchStmt(RangeToken rangeToken, Expression source, [Captured] List<NestedMatchCaseStmt> cases, bool usesOptionalBraces, Attributes attrs = null)
-    : base(rangeToken, attrs) {
+  public NestedMatchStmt(IOrigin origin, Expression source, [Captured] List<NestedMatchCaseStmt> cases, bool usesOptionalBraces, Attributes attrs = null)
+    : base(origin, attrs) {
     Contract.Requires(source != null);
     Contract.Requires(cce.NonNullElements(cases));
-    this.Source = source;
-    this.Cases = cases;
-    this.UsesOptionalBraces = usesOptionalBraces;
+    Source = source;
+    Cases = cases;
+    UsesOptionalBraces = usesOptionalBraces;
     InitializeAttributes();
   }
 
@@ -78,22 +88,22 @@ public NestedMatchStmt(RangeToken rangeToken, Expression source, [Captured] List
   /// 2 - desugaring it into a decision tree of MatchStmt and IfStmt (for constant matching)
   /// 3 - resolving the generated (sub)statement.
   /// </summary>
-  public override void Resolve(ModuleResolver resolver, ResolutionContext resolutionContext) {
+  public void Resolve(ModuleResolver resolver, ResolutionContext resolutionContext) {
     resolver.ResolveExpression(Source, resolutionContext);
 
     if (Source.Type is TypeProxy) {
       resolver.PartiallySolveTypeConstraints(true);
 
       if (Source.Type is TypeProxy) {
-        resolver.reporter.Error(MessageSource.Resolver, Tok, "Could not resolve the type of the source of the match statement. Please provide additional typing annotations.");
+        resolver.Reporter.Error(MessageSource.Resolver, Origin, "Could not resolve the type of the source of the match statement. Please provide additional typing annotations.");
         return;
       }
     }
 
-    var errorCount = resolver.reporter.Count(ErrorLevel.Error);
-    var sourceType = resolver.PartiallyResolveTypeForMemberSelection(Source.tok, Source.Type).NormalizeExpand();
-    this.CheckLinearNestedMatchStmt(sourceType, resolutionContext, resolver);
-    if (resolver.reporter.Count(ErrorLevel.Error) != errorCount) {
+    var errorCount = resolver.Reporter.Count(ErrorLevel.Error);
+    var sourceType = resolver.PartiallyResolveTypeForMemberSelection(Source.Origin, Source.Type).NormalizeExpand();
+    CheckLinearNestedMatchStmt(sourceType, resolutionContext, resolver);
+    if (resolver.Reporter.Count(ErrorLevel.Error) != errorCount) {
       return;
     }
 
@@ -105,14 +115,14 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
     }
 
     foreach (var _case in Cases) {
-      resolver.scope.PushMarker();
+      resolver.Scope.PushMarker();
       _case.Resolve(resolver, resolutionContext, subst, sourceType);
-      resolver.scope.PopMarker();
+      resolver.Scope.PopMarker();
     }
   }
 
   public void CheckLinearNestedMatchStmt(Type dtd, ResolutionContext resolutionContext, ModuleResolver resolver) {
-    foreach (NestedMatchCaseStmt mc in this.Cases) {
+    foreach (NestedMatchCaseStmt mc in Cases) {
       resolver.scope.PushMarker();
       resolver.ResolveAttributes(mc, resolutionContext);
       mc.CheckLinearNestedMatchCase(dtd, resolutionContext, resolver);
@@ -130,4 +140,31 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
       }
     });
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    var hasGhostPattern = Cases.
+      SelectMany(caze => caze.Pat.DescendantsAndSelf)
+      .OfType<IdPattern>().Any(idPattern => idPattern.Ctor != null && idPattern.Ctor.IsGhost);
+    IsGhost = mustBeErasable || ExpressionTester.UsesSpecFeatures(Source) || hasGhostPattern;
+
+    foreach (var kase in Cases) {
+      ExpressionTester.MakeGhostAsNeeded(kase.Pat, IsGhost);
+    }
+
+    if (!mustBeErasable && IsGhost) {
+      reporter.Info(MessageSource.Resolver, Origin, "ghost match");
+    }
+
+    Cases.ForEach(kase => kase.Body.ForEach(ss =>
+      ss.ResolveGhostness(resolver, reporter, IsGhost, codeContext,
+      proofContext, allowAssumptionVariables, inConstructorInitializationPhase)));
+    IsGhost = IsGhost || Cases.All(kase => kase.Body.All(ss => ss.IsGhost));
+    if (!IsGhost) {
+      // If there were features in the source expression that are treated differently in ghost and non-ghost
+      // contexts, make sure they get treated for non-ghost use.
+      ExpressionTester.CheckIsCompilable(resolver, reporter, Source, codeContext);
+    }
+  }
 }
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/Patterns/DisjunctivePattern.cs b/Source/DafnyCore/AST/Expressions/Conditional/Patterns/DisjunctivePattern.cs
index da15ae183f4..63122640b62 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/Patterns/DisjunctivePattern.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/Patterns/DisjunctivePattern.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Dafny;
 
 public class DisjunctivePattern : ExtendedPattern {
   public readonly List<ExtendedPattern> Alternatives;
-  public DisjunctivePattern(IToken tok, List<ExtendedPattern> alternatives, bool isGhost = false) : base(tok, isGhost) {
+  public DisjunctivePattern(IOrigin origin, List<ExtendedPattern> alternatives, bool isGhost = false) : base(origin, isGhost) {
     Contract.Requires(alternatives != null && alternatives.Count > 0);
     this.Alternatives = alternatives;
   }
@@ -29,7 +29,7 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
     bool inPattern, bool inDisjunctivePattern) {
 
     if (inPattern) {
-      resolver.reporter.Error(MessageSource.Resolver, Tok, "Disjunctive patterns are not allowed inside other patterns");
+      resolver.reporter.Error(MessageSource.Resolver, Origin, "Disjunctive patterns are not allowed inside other patterns");
     }
 
     foreach (var alternative in Alternatives) {
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/Patterns/ExtendedPattern.cs b/Source/DafnyCore/AST/Expressions/Conditional/Patterns/ExtendedPattern.cs
index 43a94fe1b36..28a21660987 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/Patterns/ExtendedPattern.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/Patterns/ExtendedPattern.cs
@@ -11,12 +11,11 @@ namespace Microsoft.Dafny;
 2 - An IdPattern of a string and a list of ExtendedPattern, representing either
     a bound variable or a constructor applied to n arguments or a symbolic constant
 */
-public abstract class ExtendedPattern : TokenNode {
+public abstract class ExtendedPattern : NodeWithComputedRange {
   public bool IsGhost;
 
-  public ExtendedPattern(IToken tok, bool isGhost = false) {
-    Contract.Requires(tok != null);
-    this.tok = tok;
+  public ExtendedPattern(IOrigin origin, bool isGhost = false) : base(origin) {
+    Contract.Requires(origin != null);
     this.IsGhost = isGhost;
   }
 
@@ -64,9 +63,9 @@ public void CheckLinearExtendedPattern(Type type, ResolutionContext resolutionCo
         if (idPattern.Arguments != null) {
           // pat is a tuple or constructor
           if (idPattern.Id.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
-            resolver.reporter.Error(MessageSource.Resolver, this.Tok, $"tuple type does not match type {type.ToString()}");
+            resolver.reporter.Error(MessageSource.Resolver, this.Origin, $"tuple type does not match type {type.ToString()}");
           } else {
-            resolver.reporter.Error(MessageSource.Resolver, this.Tok, $"member {idPattern.Id} does not exist in type {type.ToString()}");
+            resolver.reporter.Error(MessageSource.Resolver, this.Origin, $"member {idPattern.Id} does not exist in type {type.ToString()}");
           }
         } else { // pat is a simple variable or a constant
           /* =[1]= */
@@ -82,7 +81,7 @@ public void CheckLinearExtendedPattern(Type type, ResolutionContext resolutionCo
     } else if (type.AsDatatype is TupleTypeDecl tupleTypeDecl) {
       var udt = type.NormalizeExpand() as UserDefinedType;
       if (!(this is IdPattern)) {
-        resolver.reporter.Error(MessageSource.Resolver, this.Tok, "pattern doesn't correspond to a tuple");
+        resolver.reporter.Error(MessageSource.Resolver, this.Origin, "pattern doesn't correspond to a tuple");
         return;
       }
 
@@ -93,30 +92,31 @@ public void CheckLinearExtendedPattern(Type type, ResolutionContext resolutionCo
         return;
       }
 
+      Contract.Assert(tupleTypeDecl.Ctors.Count == 1);
+      Contract.Assert(tupleTypeDecl.Ctors[0] == tupleTypeDecl.GroundingCtor);
       idpat.Ctor = tupleTypeDecl.GroundingCtor;
 
-      //We expect the number of arguments in the type of the matchee and the provided pattern to match, except if the pattern is a bound variable
-      if (udt.TypeArgs.Count != idpat.Arguments.Count) {
+      if (idpat.Id != tupleTypeDecl.GroundingCtor.Name) {
         if (idpat.Id.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
-          resolver.reporter.Error(MessageSource.Resolver, this.Tok,
+          resolver.reporter.Error(MessageSource.Resolver, this.Origin,
             $"the case pattern is a {idpat.Arguments.Count}-element tuple, while the match expression is a {udt.TypeArgs.Count}-element tuple");
         } else {
-          resolver.reporter.Error(MessageSource.Resolver, this.Tok,
-            $"case pattern {idpat.Id} has {idpat.Arguments.Count} arguments whereas the match expression has {udt.TypeArgs.Count}");
+          resolver.Reporter.Error(MessageSource.Resolver, idpat.Origin,
+            $"found constructor {idpat.Id} but expected a {tupleTypeDecl.Dims}-tuple");
         }
       }
 
       var pairTP = udt.TypeArgs.Zip(idpat.Arguments, (x, y) => new Tuple<Type, ExtendedPattern>(x, y));
 
       foreach (var tp in pairTP) {
-        var t = resolver.PartiallyResolveTypeForMemberSelection(this.Tok, tp.Item1).NormalizeExpand();
+        var t = resolver.PartiallyResolveTypeForMemberSelection(this.Origin, tp.Item1).NormalizeExpand();
         tp.Item2.CheckLinearExtendedPattern(t, resolutionContext, resolver);
       }
       return;
     } else { // matching a datatype value
       if (!(this is IdPattern)) {
         Contract.Assert(this is LitPattern);
-        resolver.reporter.Error(MessageSource.Resolver, this.Tok, "Constant pattern used in place of datatype");
+        resolver.reporter.Error(MessageSource.Resolver, this.Origin, "Constant pattern used in place of datatype");
         return;
       }
       IdPattern idpat = (IdPattern)this;
@@ -154,7 +154,7 @@ public void CheckLinearExtendedPattern(Type type, ResolutionContext resolutionCo
           }
         } else {
           // else applied to the wrong number of arguments
-          resolver.reporter.Error(MessageSource.Resolver, idpat.Tok, "constructor {0} of arity {2} is applied to {1} argument(s)", idpat.Id, (idpat.Arguments == null ? 0 : idpat.Arguments.Count), ctor.Formals.Count);
+          resolver.reporter.Error(MessageSource.Resolver, idpat.Origin, "constructor {0} of arity {2} is applied to {1} argument(s)", idpat.Id, (idpat.Arguments == null ? 0 : idpat.Arguments.Count), ctor.Formals.Count);
         }
       } else {
         /* =[4]= */
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/Patterns/IdPattern.cs b/Source/DafnyCore/AST/Expressions/Conditional/Patterns/IdPattern.cs
index 08000d8ff63..8992bc61164 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/Patterns/IdPattern.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/Patterns/IdPattern.cs
@@ -1,47 +1,46 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Linq;
-using System.Security.AccessControl;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.Dafny;
 
-public class IdPattern : ExtendedPattern, IHasUsages {
+public class IdPattern : ExtendedPattern, IHasReferences {
   public bool HasParenthesis { get; }
   public String Id;
   public PreType PreType;
-  public Type Type; // This is the syntactic type, ExtendedPatterns dissapear during resolution.
-  public IVariable BoundVar { get; set; }
+  public Type Type; // This is the syntactic type, ExtendedPatterns disappear during resolution.
+
+  public IVariable BoundVar { get; set; } // Only set if there are no arguments
+
   public List<ExtendedPattern> Arguments; // null if just an identifier; possibly empty argument list if a constructor call
   public LiteralExpr ResolvedLit; // null if just an identifier
   [FilledInDuringResolution]
   public DatatypeCtor Ctor;
 
   public bool IsWildcardPattern =>
-    Arguments == null && Id.StartsWith("_");
+    Arguments == null && Id.StartsWith(WildcardString);
 
   public bool IsWildcardExact =>
-    Arguments == null && Id == "_";
+    Arguments == null && Id == WildcardString;
+
+  public const string WildcardString = "_";
 
   public void MakeAConstructor() {
     this.Arguments = new List<ExtendedPattern>();
   }
 
-  public IdPattern(Cloner cloner, IdPattern original) : base(cloner.Tok(original.Tok), original.IsGhost) {
+  public IdPattern(Cloner cloner, IdPattern original) : base(cloner.Origin(original.Origin), original.IsGhost) {
     Id = original.Id;
     Arguments = original.Arguments?.Select(cloner.CloneExtendedPattern).ToList();
     HasParenthesis = original.HasParenthesis;
+    Type = cloner.CloneType(original.Type);
     if (cloner.CloneResolvedFields) {
       BoundVar = cloner.CloneIVariable(original.BoundVar, false);
-      Type = original.Type;
-    } else {
-      Type = new InferredTypeProxy();
     }
   }
 
-  public IdPattern(IToken tok, String id, List<ExtendedPattern> arguments, bool isGhost = false, bool hasParenthesis = false) : base(tok, isGhost) {
+  public IdPattern(IOrigin origin, String id, List<ExtendedPattern> arguments, bool isGhost = false, bool hasParenthesis = false) : base(origin, isGhost) {
     Contract.Requires(id != null);
     Contract.Requires(arguments != null); // Arguments can be empty, but shouldn't be null
     HasParenthesis = hasParenthesis;
@@ -50,11 +49,11 @@ public IdPattern(IToken tok, String id, List<ExtendedPattern> arguments, bool is
     this.Arguments = arguments;
   }
 
-  public IdPattern(IToken tok, String id, Type type, List<ExtendedPattern> arguments, bool isGhost = false) : base(tok, isGhost) {
+  public IdPattern(IOrigin origin, String id, Type type, List<ExtendedPattern> arguments, bool isGhost = false) : base(origin, isGhost) {
     Contract.Requires(id != null);
     Contract.Requires(arguments != null); // Arguments can be empty, but shouldn't be null
     this.Id = id;
-    this.Type = type == null ? new InferredTypeProxy() : type;
+    this.Type = type ?? new InferredTypeProxy();
     this.Arguments = arguments;
     this.IsGhost = isGhost;
   }
@@ -91,10 +90,10 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
     bool inPattern, bool inDisjunctivePattern) {
 
     if (inDisjunctivePattern && ResolvedLit == null && Arguments == null && !IsWildcardPattern) {
-      resolver.reporter.Error(MessageSource.Resolver, Tok, "Disjunctive patterns may not bind variables");
+      resolver.reporter.Error(MessageSource.Resolver, Origin, "Disjunctive patterns may not bind variables");
     }
 
-    resolver.ResolveType(Tok, Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+    resolver.ResolveType(Origin, Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
 
     if (ResolvedLit != null) {
       // we're done
@@ -105,17 +104,18 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
       }
 
       if (inStatementContext) {
-        var localVariable = new LocalVariable(RangeToken, Id, null, isGhost) {
+        var localVariable = new LocalVariable(Origin, Id, null, isGhost) {
           type = Type
         };
         BoundVar = localVariable;
       } else {
-        var boundVar = new BoundVar(Tok, Id, Type);
-        boundVar.IsGhost = isGhost;
+        var boundVar = new BoundVar(Origin, Id, Type) {
+          IsGhost = isGhost
+        };
         BoundVar = boundVar;
       }
 
-      resolver.ConstrainSubtypeRelation(Type, sourceType, Tok,
+      resolver.ConstrainSubtypeRelation(Type, sourceType, Origin,
         "match source type '{1}' not assignable to bound variable (of type '{0}')", Type, sourceType);
       resolver.scope.Push(Id, BoundVar);
 
@@ -130,32 +130,30 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
     }
   }
 
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return new IDeclarationOrUsage[] { Ctor }.Where(x => x != null);
+  public IEnumerable<Reference> GetReferences() {
+    return Ctor == null ? Enumerable.Empty<Reference>() : new[] { new Reference(StartToken, Ctor) };
   }
 
-  public IToken NameToken => Tok;
-
   public void CheckLinearVarPattern(Type type, ResolutionContext resolutionContext, ModuleResolver resolver) {
     if (Arguments != null) {
       if (Id == SystemModuleManager.TupleTypeCtorName(1)) {
-        resolver.reporter.Error(MessageSource.Resolver, this.Tok, "parentheses are not allowed around a pattern");
+        resolver.reporter.Error(MessageSource.Resolver, this.Origin, "parentheses are not allowed around a pattern");
       } else {
-        resolver.reporter.Error(MessageSource.Resolver, this.Tok, "member {0} does not exist in type {1}", this.Id, type);
+        resolver.reporter.Error(MessageSource.Resolver, this.Origin, "member {0} does not exist in type {1}", this.Id, type);
       }
       return;
     }
 
     if (resolver.scope.FindInCurrentScope(this.Id) != null) {
-      resolver.reporter.Error(MessageSource.Resolver, this.Tok, "Duplicate parameter name: {0}", this.Id);
+      resolver.reporter.Error(MessageSource.Resolver, this.Origin, "Duplicate parameter name: {0}", this.Id);
     } else if (IsWildcardPattern) {
       // Wildcard, ignore
       return;
     } else {
-      NameSegment e = new NameSegment(this.Tok, this.Id, null);
+      NameSegment e = new NameSegment(this.Origin, this.Id, null);
       resolver.ResolveNameSegment(e, true, null, resolutionContext, false, false);
       if (e.ResolvedExpression == null) {
-        resolver.ScopePushAndReport(resolver.scope, new BoundVar(this.Tok, this.Id, type), "parameter");
+        resolver.ScopePushAndReport(resolver.scope, new BoundVar(this.Origin, this.Id, type), "parameter");
       } else {
         // finds in full scope, not just current scope
         if (e.Resolved is MemberSelectExpr mse) {
@@ -167,19 +165,19 @@ public void CheckLinearVarPattern(Type type, ResolutionContext resolutionContext
                 // OK - type is correct
               } else {
                 // may well be a proxy so add a type constraint
-                resolver.ConstrainSubtypeRelation(e.ResolvedExpression.Type, type, this.Tok,
+                resolver.ConstrainSubtypeRelation(e.ResolvedExpression.Type, type, this.Origin,
                   "the type of the pattern ({0}) does not agree with the match expression ({1})", e.ResolvedExpression.Type, type);
               }
             } else {
-              resolver.reporter.Error(MessageSource.Resolver, this.Tok, "{0} is not initialized as a constant literal", this.Id);
-              resolver.ScopePushAndReport(resolver.scope, new BoundVar(this.Tok, this.Id, type), "parameter");
+              resolver.reporter.Error(MessageSource.Resolver, this.Origin, "{0} is not initialized as a constant literal", this.Id);
+              resolver.ScopePushAndReport(resolver.scope, new BoundVar(this.Origin, this.Id, type), "parameter");
             }
           } else {
             // Not a static const, so just a variable
-            resolver.ScopePushAndReport(resolver.scope, new BoundVar(this.Tok, this.Id, type), "parameter");
+            resolver.ScopePushAndReport(resolver.scope, new BoundVar(this.Origin, this.Id, type), "parameter");
           }
         } else {
-          resolver.ScopePushAndReport(resolver.scope, new BoundVar(this.Tok, this.Id, type), "parameter");
+          resolver.ScopePushAndReport(resolver.scope, new BoundVar(this.Origin, this.Id, type), "parameter");
         }
       }
     }
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/Patterns/LitPattern.cs b/Source/DafnyCore/AST/Expressions/Conditional/Patterns/LitPattern.cs
index a5e2e64584f..652521f13e6 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/Patterns/LitPattern.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/Patterns/LitPattern.cs
@@ -39,11 +39,11 @@ public LiteralExpr OptimisticallyDesugaredLit {
         if (OrigLit is NegationExpression neg) {
           var lit = (LiteralExpr)neg.E;
           if (lit.Value is BaseTypes.BigDec d) {
-            optimisticallyDesugaredLit = new LiteralExpr(neg.tok, -d);
+            optimisticallyDesugaredLit = new LiteralExpr(neg.Origin, -d);
           } else {
             var n = (BigInteger)lit.Value;
-            var tok = new Token(neg.tok.line, neg.tok.col) {
-              Uri = neg.tok.Uri,
+            var tok = new Token(neg.Origin.line, neg.Origin.col) {
+              Uri = neg.Origin.Uri,
               val = "-0"
             };
             optimisticallyDesugaredLit = new LiteralExpr(tok, -n);
@@ -56,7 +56,7 @@ public LiteralExpr OptimisticallyDesugaredLit {
     }
   }
 
-  public LitPattern(IToken tok, Expression lit, bool isGhost = false) : base(tok, isGhost) {
+  public LitPattern(IOrigin origin, Expression lit, bool isGhost = false) : base(origin, isGhost) {
     Contract.Requires(lit is LiteralExpr || lit is NegationExpression);
     this.OrigLit = lit;
   }
@@ -81,7 +81,7 @@ public override void Resolve(ModuleResolver resolver,
 
     var literal = OptimisticallyDesugaredLit;
     resolver.ResolveExpression(literal, resolutionContext);
-    resolver.AddAssignableConstraint(literal.tok, sourceType, literal.Type,
+    resolver.AddAssignableConstraint(literal.Origin, sourceType, literal.Type,
       "literal expression in case (of type '{1}') not assignable to match source type '{0}'");
   }
 }
diff --git a/Source/DafnyCore/AST/Expressions/Conditional/TernaryExpr.cs b/Source/DafnyCore/AST/Expressions/Conditional/TernaryExpr.cs
index 4483e88214d..fc193a52d09 100644
--- a/Source/DafnyCore/AST/Expressions/Conditional/TernaryExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Conditional/TernaryExpr.cs
@@ -8,8 +8,7 @@ public class TernaryExpr : Expression, ICloneable<TernaryExpr> {
   public readonly Expression E0;
   public readonly Expression E1;
   public readonly Expression E2;
-  public enum Opcode { /*SOON: IfOp,*/ PrefixEqOp, PrefixNeqOp }
-  public static readonly bool PrefixEqUsesNat = false;  // "k" is either a "nat" or an "ORDINAL"
+  public enum Opcode { PrefixEqOp, PrefixNeqOp }
 
   public TernaryExpr(Cloner cloner, TernaryExpr original) : base(cloner, original) {
     Op = original.Op;
@@ -18,9 +17,9 @@ public TernaryExpr(Cloner cloner, TernaryExpr original) : base(cloner, original)
     E2 = cloner.CloneExpr(original.E2);
   }
 
-  public TernaryExpr(IToken tok, Opcode op, Expression e0, Expression e1, Expression e2)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public TernaryExpr(IOrigin origin, Opcode op, Expression e0, Expression e1, Expression e2)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(e0 != null);
     Contract.Requires(e1 != null);
     Contract.Requires(e2 != null);
diff --git a/Source/DafnyCore/AST/Expressions/Datatypes/DatatypeUpdateExpr.cs b/Source/DafnyCore/AST/Expressions/Datatypes/DatatypeUpdateExpr.cs
index 6528ea4534b..1568b19b5ab 100644
--- a/Source/DafnyCore/AST/Expressions/Datatypes/DatatypeUpdateExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Datatypes/DatatypeUpdateExpr.cs
@@ -5,9 +5,9 @@
 
 namespace Microsoft.Dafny;
 
-public class DatatypeUpdateExpr : ConcreteSyntaxExpression, IHasUsages, ICloneable<DatatypeUpdateExpr> {
+public class DatatypeUpdateExpr : ConcreteSyntaxExpression, IHasReferences, ICloneable<DatatypeUpdateExpr> {
   public readonly Expression Root;
-  public readonly List<Tuple<IToken, string, Expression>> Updates;
+  public readonly List<Tuple<IOrigin, string, Expression>> Updates;
   [FilledInDuringResolution] public List<MemberDecl> Members;
   [FilledInDuringResolution] public List<DatatypeCtor> LegalSourceConstructors;
   [FilledInDuringResolution] public bool InCompiledContext;
@@ -19,20 +19,24 @@ public DatatypeUpdateExpr Clone(Cloner cloner) {
 
   public DatatypeUpdateExpr(Cloner cloner, DatatypeUpdateExpr original) : base(cloner, original) {
     Root = cloner.CloneExpr(original.Root);
-    Updates = original.Updates.Select(t => Tuple.Create<IToken, string, Expression>(cloner.Tok((IToken)t.Item1), t.Item2, cloner.CloneExpr(t.Item3)))
+    Updates = original.Updates.Select(t => Tuple.Create(cloner.Origin(t.Item1), t.Item2, cloner.CloneExpr(t.Item3)))
       .ToList();
 
     if (cloner.CloneResolvedFields) {
       Members = original.Members;
       LegalSourceConstructors = original.LegalSourceConstructors;
       InCompiledContext = original.InCompiledContext;
-      ResolvedCompiledExpression = cloner.CloneExpr(original.ResolvedCompiledExpression);
+      if (original.ResolvedExpression == original.ResolvedCompiledExpression) {
+        ResolvedCompiledExpression = ResolvedExpression;
+      } else {
+        ResolvedCompiledExpression = cloner.CloneExpr(original.ResolvedCompiledExpression);
+      }
     }
   }
 
-  public DatatypeUpdateExpr(IToken tok, Expression root, List<Tuple<IToken, string, Expression>> updates)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public DatatypeUpdateExpr(IOrigin origin, Expression root, List<Tuple<IOrigin, string, Expression>> updates)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(root != null);
     Contract.Requires(updates != null);
     Contract.Requires(updates.Count != 0);
@@ -43,24 +47,27 @@ public DatatypeUpdateExpr(IToken tok, Expression root, List<Tuple<IToken, string
   public override IEnumerable<Expression> SubExpressions {
     get {
       if (ResolvedExpression == null) {
+        Contract.Assert(ResolvedCompiledExpression == null);
         foreach (var preResolved in PreResolveSubExpressions) {
-
           yield return preResolved;
         }
       } else {
         foreach (var e in base.SubExpressions) {
           yield return e;
         }
+        if (ResolvedExpression != ResolvedCompiledExpression) {
+          yield return ResolvedCompiledExpression;
+        }
       }
     }
   }
 
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return LegalSourceConstructors;
+  public IEnumerable<Reference> GetReferences() {
+    return LegalSourceConstructors == null ? Enumerable.Empty<Reference>()
+      : Updates.Zip(LegalSourceConstructors).Select(t =>
+        new Reference(t.First.Item1, t.Second.Formals.Find(f => f.Name == t.First.Item2)));
   }
 
-  public IToken NameToken => tok;
-
   public override IEnumerable<Expression> PreResolveSubExpressions {
     get {
       yield return Root;
diff --git a/Source/DafnyCore/AST/Expressions/Datatypes/DatatypeValue.cs b/Source/DafnyCore/AST/Expressions/Datatypes/DatatypeValue.cs
index 9cd5476536b..9fd6c491373 100644
--- a/Source/DafnyCore/AST/Expressions/Datatypes/DatatypeValue.cs
+++ b/Source/DafnyCore/AST/Expressions/Datatypes/DatatypeValue.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Dafny;
 
-public class DatatypeValue : Expression, IHasUsages, ICloneable<DatatypeValue>, ICanFormat {
+public class DatatypeValue : Expression, IHasReferences, ICloneable<DatatypeValue>, ICanFormat {
   public readonly string DatatypeName;
   public readonly string MemberName;
   public readonly ActualBindings Bindings;
@@ -41,10 +41,10 @@ public DatatypeValue(Cloner cloner, DatatypeValue original) : base(cloner, origi
     }
   }
 
-  public DatatypeValue(IToken tok, string datatypeName, string memberName, [Captured] List<ActualBinding> arguments)
-    : base(tok) {
+  public DatatypeValue(IOrigin origin, string datatypeName, string memberName, [Captured] List<ActualBinding> arguments)
+    : base(origin) {
     Contract.Requires(cce.NonNullElements(arguments));
-    Contract.Requires(tok != null);
+    Contract.Requires(origin != null);
     Contract.Requires(datatypeName != null);
     Contract.Requires(memberName != null);
     this.DatatypeName = datatypeName;
@@ -56,19 +56,18 @@ public DatatypeValue(IToken tok, string datatypeName, string memberName, [Captur
   /// This constructor is intended to be used when constructing a resolved DatatypeValue. The "args" are expected
   /// to be already resolved, and are all given positionally.
   /// </summary>
-  public DatatypeValue(IToken tok, string datatypeName, string memberName, List<Expression> arguments)
-    : this(tok, datatypeName, memberName, arguments.ConvertAll(e => new ActualBinding(null, e))) {
+  public DatatypeValue(IOrigin origin, string datatypeName, string memberName, List<Expression> arguments)
+    : this(origin, datatypeName, memberName, arguments.ConvertAll(e => new ActualBinding(null, e))) {
     Bindings.AcceptArgumentExpressionsAsExactParameterList();
   }
 
   public override IEnumerable<Expression> SubExpressions =>
     Arguments ?? Enumerable.Empty<Expression>();
 
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return Enumerable.Repeat(Ctor, 1);
+  public IEnumerable<Reference> GetReferences() {
+    return Enumerable.Repeat(new Reference(Origin, Ctor), 1);
   }
 
-  public IToken NameToken => tok;
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     formatter.SetMethodLikeIndent(StartToken, OwnedTokens, indentBefore);
     return true;
diff --git a/Source/DafnyCore/AST/Expressions/DefaultValueExpression.cs b/Source/DafnyCore/AST/Expressions/DefaultValueExpression.cs
index 5df4f73ee03..446b200ee4a 100644
--- a/Source/DafnyCore/AST/Expressions/DefaultValueExpression.cs
+++ b/Source/DafnyCore/AST/Expressions/DefaultValueExpression.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 
 namespace Microsoft.Dafny;
 
@@ -22,63 +23,121 @@ namespace Microsoft.Dafny;
 /// writing, a change to a separate type has shown to be more hassle than the need for special
 /// attention to DefaultValueExpression's in some places.
 /// </summary>
-public class DefaultValueExpression : ConcreteSyntaxExpression, ICloneable<DefaultValueExpression> {
-  public readonly Formal Formal;
-  public readonly Expression Receiver;
-  public readonly Dictionary<IVariable, Expression> SubstMap;
-  public readonly Dictionary<TypeParameter, Type> TypeMap;
+public abstract class DefaultValueExpression : ConcreteSyntaxExpression {
+  private readonly Formal formal;
+  private readonly Expression receiver;
+  private readonly Dictionary<IVariable, Expression> substMap;
 
-  public DefaultValueExpression(IToken tok, Formal formal,
-    Expression/*?*/ receiver, Dictionary<IVariable, Expression> substMap, Dictionary<TypeParameter, Type> typeMap)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  protected abstract Dictionary<TypeParameter, Type> GetTypeMap();
+
+  public enum WorkProgress { BeingVisited, Done }
+
+  protected DefaultValueExpression(IOrigin origin, Formal formal, Expression/*?*/ receiver, Dictionary<IVariable, Expression> substMap)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(formal != null);
     Contract.Requires(formal.DefaultValue != null);
     Contract.Requires(substMap != null);
-    Contract.Requires(typeMap != null);
-    Formal = formal;
-    Receiver = receiver;
-    SubstMap = substMap;
-    TypeMap = typeMap;
-    Type = formal.Type.Subst(typeMap);
-    RangeToken = new RangeToken(tok, tok);
+    this.formal = formal;
+    this.receiver = receiver;
+    this.substMap = substMap;
   }
 
-  public DefaultValueExpression(Cloner cloner, DefaultValueExpression original) : base(cloner, original) {
+  protected DefaultValueExpression(Cloner cloner, DefaultValueExpression original) : base(cloner, original) {
     if (!cloner.CloneResolvedFields) {
       throw new InvalidOperationException("DefaultValueExpression is created during resolution");
     }
-    Formal = cloner.CloneFormal(original.Formal, true);
-    Receiver = cloner.CloneExpr(original.Receiver);
-    SubstMap = original.SubstMap;
-    TypeMap = original.TypeMap;
+    formal = cloner.CloneFormal(original.formal, true);
+    receiver = cloner.CloneExpr(original.receiver);
+    substMap = original.substMap;
+  }
+
+  public void FillIn(ModuleResolver resolver, Dictionary<DefaultValueExpression, WorkProgress> visited) {
+    if (visited.TryGetValue(this, out var p)) {
+      if (p == WorkProgress.Done) {
+        Contract.Assert(this.ResolvedExpression != null);
+      } else {
+        // there is a cycle
+        resolver.reporter.Error(MessageSource.Resolver, this,
+          "default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion");
+        // nevertheless, to avoid any issues in the resolver, fill in the .ResolvedExpression field with something
+        this.ResolvedExpression = Expression.CreateBoolLiteral(this.Origin, false);
+      }
+      return;
+    }
+    Contract.Assert(this.ResolvedExpression == null);
+
+    visited.Add(this, WorkProgress.BeingVisited);
+    var typeMap = GetTypeMap();
+    var s = new DefaultValueSubstituter(resolver, visited, this.receiver, this.substMap, typeMap);
+    this.ResolvedExpression = s.Substitute(this.formal.DefaultValue);
+    visited[this] = WorkProgress.Done;
   }
 
-  public DefaultValueExpression Clone(Cloner cloner) {
-    return new DefaultValueExpression(cloner, this);
+  class DefaultValueSubstituter : Substituter {
+    private readonly ModuleResolver resolver;
+    private readonly Dictionary<DefaultValueExpression, DefaultValueExpression.WorkProgress> visited;
+    public DefaultValueSubstituter(ModuleResolver resolver, Dictionary<DefaultValueExpression, DefaultValueExpression.WorkProgress> visited,
+      Expression /*?*/ receiverReplacement, Dictionary<IVariable, Expression> substMap, Dictionary<TypeParameter, Type> typeMap)
+      : base(receiverReplacement, substMap, typeMap) {
+      Contract.Requires(resolver != null);
+      Contract.Requires(visited != null);
+      this.resolver = resolver;
+      this.visited = visited;
+    }
+
+    public override Expression Substitute(Expression expr) {
+      if (expr is DefaultValueExpression dve) {
+        dve.FillIn(resolver, visited);
+        Contract.Assert(dve.ResolvedExpression != null); // postcondition of FillIn
+      }
+      return base.Substitute(expr);
+    }
   }
 }
 
-/// TODO: This class is a bit sketchy. It should probably be used to replace DefaultValueExpression in some way.
-/// </summary>
-public class DefaultValueExpressionPreType : ConcreteSyntaxExpression {
-  public readonly Formal Formal;
-  public readonly Expression Receiver;
-  public readonly Dictionary<IVariable, Expression> SubstMap;
-  public readonly Dictionary<TypeParameter, PreType> PreTypeMap;
+public class DefaultValueExpressionType : DefaultValueExpression, ICloneable<DefaultValueExpressionType> {
+  private readonly Dictionary<TypeParameter, Type> typeMap;
+
+  public DefaultValueExpressionType(IOrigin origin, Formal formal,
+    Expression/*?*/ receiver, Dictionary<IVariable, Expression> substMap, Dictionary<TypeParameter, Type> typeMap)
+    : base(origin, formal, receiver, substMap) {
+    this.typeMap = typeMap;
+  }
+
+  public DefaultValueExpressionType(Cloner cloner, DefaultValueExpressionType original) : base(cloner, original) {
+    typeMap = original.typeMap;
+  }
 
-  public DefaultValueExpressionPreType(IToken tok, Formal formal,
+  public DefaultValueExpressionType Clone(Cloner cloner) {
+    return new DefaultValueExpressionType(cloner, this);
+  }
+
+  protected override Dictionary<TypeParameter, Type> GetTypeMap() {
+    return typeMap;
+  }
+}
+
+public class DefaultValueExpressionPreType : DefaultValueExpression, ICloneable<DefaultValueExpressionPreType> {
+  private readonly Dictionary<TypeParameter, PreType> preTypeMap;
+
+  public DefaultValueExpressionPreType(IOrigin origin, Formal formal,
     Expression/*?*/ receiver, Dictionary<IVariable, Expression> substMap, Dictionary<TypeParameter, PreType> preTypeMap)
-    : base(tok) {
-    Contract.Requires(tok != null);
-    Contract.Requires(formal != null);
-    Contract.Requires(formal.DefaultValue != null);
-    Contract.Requires(substMap != null);
-    Contract.Requires(preTypeMap != null);
-    Formal = formal;
-    Receiver = receiver;
-    SubstMap = substMap;
-    PreTypeMap = preTypeMap;
-    PreType = formal.PreType.Substitute(preTypeMap);
+    : base(origin, formal, receiver, substMap) {
+    this.preTypeMap = preTypeMap;
+  }
+
+  public DefaultValueExpressionPreType(Cloner cloner, DefaultValueExpressionPreType original) : base(cloner, original) {
+    preTypeMap = original.preTypeMap;
+  }
+
+  public DefaultValueExpressionPreType Clone(Cloner cloner) {
+    return new DefaultValueExpressionPreType(cloner, this);
+  }
+
+  protected override Dictionary<TypeParameter, Type> GetTypeMap() {
+    return preTypeMap.ToDictionary(
+      x => x.Key,
+      x => PreType2TypeUtil.PreType2FixedType(x.Value));
   }
-}
\ No newline at end of file
+}
diff --git a/Source/DafnyCore/AST/Expressions/Expression.cs b/Source/DafnyCore/AST/Expressions/Expression.cs
index aa652b3dc2e..74e9e6ac2c4 100644
--- a/Source/DafnyCore/AST/Expressions/Expression.cs
+++ b/Source/DafnyCore/AST/Expressions/Expression.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 using System.Numerics;
-using Microsoft.Boogie;
 
 namespace Microsoft.Dafny;
 
-public abstract class Expression : TokenNode {
+public abstract class Expression : NodeWithComputedRange {
   [ContractInvariantMethod]
   void ObjectInvariant() {
-    Contract.Invariant(tok != null);
+    Contract.Invariant(Origin != null);
   }
 
   [System.Diagnostics.Contracts.Pure]
@@ -50,7 +50,7 @@ public virtual IEnumerable<Expression> TerminalExpressions {
   public Type Type {
     get {
       Contract.Ensures(type != null || Contract.Result<Type>() == null);  // useful in conjunction with postcondition of constructor
-      return type == null ? null : type.Normalize();
+      return type?.Normalize();
     }
     set {
       Contract.Requires(!WasResolved());  // set it only once
@@ -60,6 +60,22 @@ public Type Type {
       type = value.Normalize();
     }
   }
+
+  /// <summary>
+  /// The new type inference includes a "type refinement" phase, which determines the best subset types for a program. This phase works
+  /// by refining (mutating in the direction from bottom, meaning un ansatisfiable constraint, to top, meaning no constraint) types in place,
+  /// using "TypeRefinementWrapper" type proxies. During that phase, it is necessary to obtain the
+  /// un-normalized type stored in each AST node, which is what the "UnnormalizedType" property does. This property should only be used
+  /// during the type refinement phase. After type inference is complete, use ".Type" instead.
+  /// </summary>
+  public Type UnnormalizedType {
+    get {
+      return type;
+    }
+    set {
+      type = value;
+    }
+  }
   /// <summary>
   /// This method can be used when .Type has been found to be erroneous and its current value
   /// would be unexpected by the rest of the resolver. This method then sets .Type to a neutral
@@ -77,20 +93,15 @@ public void DebugTest_ChangeType(Type ty) {
     }
 #endif
 
-  public Expression(IToken tok) {
-    Contract.Requires(tok != null);
+  protected Expression(IOrigin origin) : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Ensures(type == null);  // we would have liked to have written Type==null, but that's not admissible or provable
-
-    this.tok = tok;
   }
 
-  protected Expression(Cloner cloner, Expression original) {
-
-    tok = cloner.Tok(original.tok);
-    RangeToken = cloner.Range(original.RangeToken);
-
+  protected Expression(Cloner cloner, Expression original) : base(cloner, original) {
     if (cloner.CloneResolvedFields && original.Type != null) {
       Type = original.Type;
+      PreType = original.PreType;
     }
   }
 
@@ -111,6 +122,23 @@ public virtual IEnumerable<Expression> SubExpressions {
     get { yield break; }
   }
 
+  public IEnumerable<Expression> DescendantsAndSelf {
+    get {
+      Stack<Expression> todo = new();
+      List<Expression> result = new();
+      todo.Push(this);
+      while (todo.Any()) {
+        var current = todo.Pop();
+        result.Add(current);
+        foreach (var child in current.SubExpressions) {
+          todo.Push(child);
+        }
+      }
+
+      return result;
+    }
+  }
+
   /// <summary>
   /// Returns the list of types that appear in this expression proper (that is, not including types that
   /// may appear in subexpressions). Types occurring in substatements of the expression are not included.
@@ -120,8 +148,32 @@ public virtual IEnumerable<Type> ComponentTypes {
     get { yield break; }
   }
 
-  public virtual bool IsImplicit {
-    get { return false; }
+  public virtual bool IsImplicit => false;
+
+  public static IEnumerable<Expression> ConjunctsWithLetsOnOutside(Expression expr) {
+    foreach (var conjunct in Conjuncts(expr)) {
+      if (conjunct is LetExpr { Exact: true } letExpr) {
+        foreach (var letBodyConjunct in ConjunctsWithLetsOnOutside(letExpr.Body)) {
+          yield return new LetExpr(letExpr.Origin, letExpr.LHSs, letExpr.RHSs, letBodyConjunct, letExpr.Exact, letExpr.Attributes) {
+            Type = letExpr.Type
+          };
+        }
+      } else {
+        yield return conjunct;
+      }
+    }
+  }
+
+  /// <summary>
+  /// Return the negation of each of the expressions in "expressions".
+  /// If there is just one expression in "expressions", then use the given token "tok" for the negation.
+  /// Otherwise, use the token from each expression.
+  /// </summary>
+  static IEnumerable<Expression> NegateEach(IOrigin tok, IEnumerable<Expression> expressions) {
+    var exprs = expressions.ToList();
+    foreach (Expression e in exprs) {
+      yield return Expression.CreateNot(exprs.Count == 1 ? tok : e.Origin, e);
+    }
   }
 
   public static IEnumerable<Expression> Conjuncts(Expression expr) {
@@ -130,9 +182,9 @@ public static IEnumerable<Expression> Conjuncts(Expression expr) {
     Contract.Ensures(cce.NonNullElements(Contract.Result<IEnumerable<Expression>>()));
 
     expr = StripParens(expr);
-    if (expr is UnaryOpExpr unary && unary.Op == UnaryOpExpr.Opcode.Not) {
-      foreach (Expression e in Disjuncts(unary.E)) {
-        yield return Expression.CreateNot(e.tok, e);
+    if (expr is UnaryOpExpr { Op: UnaryOpExpr.Opcode.Not } unary) {
+      foreach (Expression e in NegateEach(expr.Origin, Disjuncts(unary.E))) {
+        yield return e;
       }
       yield break;
 
@@ -157,26 +209,26 @@ public static IEnumerable<Expression> Disjuncts(Expression expr) {
     Contract.Ensures(cce.NonNullElements(Contract.Result<IEnumerable<Expression>>()));
 
     expr = StripParens(expr);
-    if (expr is UnaryOpExpr unary && unary.Op == UnaryOpExpr.Opcode.Not) {
-      foreach (Expression e in Conjuncts(unary.E)) {
-        yield return Expression.CreateNot(e.tok, e);
+    if (expr is UnaryOpExpr { Op: UnaryOpExpr.Opcode.Not } unary) {
+      foreach (Expression e in NegateEach(expr.Origin, Conjuncts(unary.E))) {
+        yield return e;
       }
       yield break;
 
     } else if (expr is BinaryExpr bin) {
       if (bin.ResolvedOp == BinaryExpr.ResolvedOpcode.Or) {
-        foreach (Expression e in Conjuncts(bin.E0)) {
+        foreach (Expression e in Disjuncts(bin.E0)) {
           yield return e;
         }
-        foreach (Expression e in Conjuncts(bin.E1)) {
+        foreach (Expression e in Disjuncts(bin.E1)) {
           yield return e;
         }
         yield break;
       } else if (bin.ResolvedOp == BinaryExpr.ResolvedOpcode.Imp) {
         foreach (Expression e in Conjuncts(bin.E0)) {
-          yield return Expression.CreateNot(e.tok, e);
+          yield return Expression.CreateNot(e.Origin, e);
         }
-        foreach (Expression e in Conjuncts(bin.E1)) {
+        foreach (Expression e in Disjuncts(bin.E1)) {
           yield return e;
         }
         yield break;
@@ -196,7 +248,7 @@ public static Expression CreateAdd(Expression e0, Expression e1) {
       (e0.Type.IsNumericBased(Type.NumericPersuasion.Int) && e1.Type.IsNumericBased(Type.NumericPersuasion.Int)) ||
       (e0.Type.IsNumericBased(Type.NumericPersuasion.Real) && e1.Type.IsNumericBased(Type.NumericPersuasion.Real)));
     Contract.Ensures(Contract.Result<Expression>() != null);
-    var s = new BinaryExpr(e0.tok, BinaryExpr.Opcode.Add, e0, e1);
+    var s = new BinaryExpr(e0.Origin, BinaryExpr.Opcode.Add, e0, e1);
     s.ResolvedOp = BinaryExpr.ResolvedOpcode.Add;  // resolve here
     s.Type = e0.Type.NormalizeExpand();  // resolve here
     return s;
@@ -212,7 +264,7 @@ public static Expression CreateMul(Expression e0, Expression e1) {
       (e0.Type.IsNumericBased(Type.NumericPersuasion.Int) && e1.Type.IsNumericBased(Type.NumericPersuasion.Int)) ||
       (e0.Type.IsNumericBased(Type.NumericPersuasion.Real) && e1.Type.IsNumericBased(Type.NumericPersuasion.Real)));
     Contract.Ensures(Contract.Result<Expression>() != null);
-    var s = new BinaryExpr(e0.tok, BinaryExpr.Opcode.Mul, e0, e1);
+    var s = new BinaryExpr(e0.Origin, BinaryExpr.Opcode.Mul, e0, e1);
     s.ResolvedOp = BinaryExpr.ResolvedOpcode.Mul;  // resolve here
     s.Type = e0.Type.NormalizeExpand();  // resolve here
     return s;
@@ -248,7 +300,7 @@ public static Expression CreateSubtract_TypeConvert(Expression e0, Expression e1
 
   private static Expression CastIfNeeded(Expression expr, Type toType) {
     if (!expr.Type.Equals(toType)) {
-      var cast = new ConversionExpr(expr.tok, expr, toType);
+      var cast = new ConversionExpr(expr.Origin, expr, toType);
       cast.Type = toType;
       return cast;
     } else {
@@ -269,7 +321,7 @@ public static Expression CreateSubtract(Expression e0, Expression e1) {
       (e0.Type.IsNumericBased(Type.NumericPersuasion.Real) && e1.Type.IsNumericBased(Type.NumericPersuasion.Real)) ||
       (e0.Type.IsBigOrdinalType && e1.Type.IsBigOrdinalType));
     Contract.Ensures(Contract.Result<Expression>() != null);
-    var s = new BinaryExpr(e0.tok, BinaryExpr.Opcode.Sub, e0, e1);
+    var s = new BinaryExpr(e0.Origin, BinaryExpr.Opcode.Sub, e0, e1);
     s.ResolvedOp = BinaryExpr.ResolvedOpcode.Sub;  // resolve here
     s.Type = e0.Type.NormalizeExpand();  // resolve here (and it's important to remove any constraints)
     return s;
@@ -289,7 +341,7 @@ public static Expression CreateSetDifference(Expression e0, Expression e1) {
     if (LiteralExpr.IsEmptySet(e0) || LiteralExpr.IsEmptySet(e1)) {
       return e0;
     }
-    var s = new BinaryExpr(e0.tok, BinaryExpr.Opcode.Sub, e0, e1) {
+    var s = new BinaryExpr(e0.Origin, BinaryExpr.Opcode.Sub, e0, e1) {
       ResolvedOp = BinaryExpr.ResolvedOpcode.SetDifference,
       Type = e0.Type.NormalizeExpand() // important to remove any constraints
     };
@@ -310,7 +362,7 @@ public static Expression CreateMultisetDifference(Expression e0, Expression e1)
     if (LiteralExpr.IsEmptyMultiset(e0) || LiteralExpr.IsEmptyMultiset(e1)) {
       return e0;
     }
-    var s = new BinaryExpr(e0.tok, BinaryExpr.Opcode.Sub, e0, e1) {
+    var s = new BinaryExpr(e0.Origin, BinaryExpr.Opcode.Sub, e0, e1) {
       ResolvedOp = BinaryExpr.ResolvedOpcode.MultiSetDifference,
       Type = e0.Type.NormalizeExpand() // important to remove any constraints
     };
@@ -325,7 +377,7 @@ public static Expression CreateCardinality(Expression e, SystemModuleManager sys
     Contract.Requires(e.Type != null);
     Contract.Requires(e.Type.AsSetType != null || e.Type.AsMultiSetType != null || e.Type.AsSeqType != null);
     Contract.Ensures(Contract.Result<Expression>() != null);
-    var s = new UnaryOpExpr(e.tok, UnaryOpExpr.Opcode.Cardinality, e) {
+    var s = new UnaryOpExpr(e.Origin, UnaryOpExpr.Opcode.Cardinality, e) {
       Type = systemModuleManager.Nat()
     };
     return s;
@@ -343,7 +395,7 @@ public static Expression CreateIncrement(Expression e, int n) {
     if (n == 0) {
       return e;
     }
-    var nn = CreateIntLiteral(e.tok, n);
+    var nn = CreateIntLiteral(e.Origin, n);
     return CreateAdd(e, nn);
   }
 
@@ -358,29 +410,38 @@ public static Expression CreateDecrement(Expression e, int n, Type ty = null) {
     if (n == 0) {
       return e;
     }
-    var nn = CreateIntLiteral(e.tok, n, ty);
+    var nn = CreateIntLiteralNonnegative(e.Origin, n, ty);
     return CreateSubtract(e, nn);
   }
 
+  /// <summary>
+  /// Create a resolved expression of the form "n" when n is nonnegative
+  /// </summary>
+  public static LiteralExpr CreateIntLiteralNonnegative(IOrigin tok, int n, Type ty = null) {
+    Contract.Requires(tok != null);
+    Contract.Requires(0 <= n);
+    var nn = new LiteralExpr(tok, n);
+    nn.Type = ty ?? Type.Int;
+    return nn;
+  }
+
   /// <summary>
   /// Create a resolved expression of the form "n"
   /// </summary>
-  public static Expression CreateIntLiteral(IToken tok, int n, Type ty = null) {
+  public static Expression CreateIntLiteral(IOrigin tok, int n, Type ty = null) {
     Contract.Requires(tok != null);
     Contract.Requires(n != int.MinValue);
     if (0 <= n) {
-      var nn = new LiteralExpr(tok, n);
-      nn.Type = ty ?? Type.Int;
-      return nn;
+      return CreateIntLiteralNonnegative(tok, n, ty);
     } else {
-      return CreateDecrement(CreateIntLiteral(tok, 0, ty), -n, ty);
+      return CreateDecrement(CreateIntLiteralNonnegative(tok, 0, ty), -n, ty);
     }
   }
 
   /// <summary>
   /// Create a resolved expression of the form "x"
   /// </summary>
-  public static Expression CreateRealLiteral(IToken tok, BaseTypes.BigDec x) {
+  public static Expression CreateRealLiteral(IOrigin tok, BaseTypes.BigDec x) {
     Contract.Requires(tok != null);
     var nn = new LiteralExpr(tok, x);
     nn.Type = Type.Real;
@@ -390,7 +451,7 @@ public static Expression CreateRealLiteral(IToken tok, BaseTypes.BigDec x) {
   /// <summary>
   /// Create a resolved expression of the form "n", for either type "int" or type "ORDINAL".
   /// </summary>
-  public static Expression CreateNatLiteral(IToken tok, int n, Type ty) {
+  public static Expression CreateNatLiteral(IOrigin tok, int n, Type ty) {
     Contract.Requires(tok != null);
     Contract.Requires(0 <= n);
     Contract.Requires(ty.IsNumericBased(Type.NumericPersuasion.Int) || ty is BigOrdinalType);
@@ -402,21 +463,23 @@ public static Expression CreateNatLiteral(IToken tok, int n, Type ty) {
   /// <summary>
   /// Create a resolved expression for a bool b
   /// </summary>
-  public static LiteralExpr CreateBoolLiteral(IToken tok, bool b) {
+  public static LiteralExpr CreateBoolLiteral(IOrigin tok, bool b) {
     Contract.Requires(tok != null);
-    var lit = new LiteralExpr(tok, b);
-    lit.Type = Type.Bool;  // resolve here
+    var lit = new LiteralExpr(tok, b) {
+      Type = Type.Bool
+    };
     return lit;
   }
 
   /// <summary>
   /// Create a resolved expression for a string s
   /// </summary>
-  public static LiteralExpr CreateStringLiteral(IToken tok, string s) {
+  public static LiteralExpr CreateStringLiteral(IOrigin tok, string s) {
     Contract.Requires(tok != null);
     Contract.Requires(s != null);
-    var lit = new StringLiteralExpr(tok, s, true);
-    lit.Type = new SeqType(new CharType());  // resolve here
+    var lit = new StringLiteralExpr(tok, s, true) {
+      Type = new SeqType(new CharType())
+    };
     return lit;
   }
 
@@ -426,8 +489,7 @@ public static LiteralExpr CreateStringLiteral(IToken tok, string s) {
   /// </summary>
   public static Expression StripParens(Expression expr) {
     while (true) {
-      var e = expr as ParensExpression;
-      if (e == null) {
+      if (expr is not ParensExpression e) {
         return expr;
       }
       expr = e.E;
@@ -479,11 +541,11 @@ public static bool IsBoolLiteral(Expression expr, out bool value) {
   /// </summary>
   public static bool IsIntLiteral(Expression expr, out BigInteger value) {
     Contract.Requires(expr != null);
-    var e = StripParens(expr) as LiteralExpr;
-    if (e != null && e.Value is int x) {
+    var e = StripParensAndCasts(expr) as LiteralExpr;
+    if (e is { Value: int x }) {
       value = new BigInteger(x);
       return true;
-    } else if (e != null && e.Value is BigInteger xx) {
+    } else if (e is { Value: BigInteger xx }) {
       value = xx;
       return true;
     } else {
@@ -506,11 +568,11 @@ public static bool IsEmptySetOrMultiset(Expression expr) {
   /// <summary>
   /// Create a resolved ParensExpression around a given resolved expression "e".
   /// </summary>
-  public static Expression CreateParensExpression(IToken tok, Expression e) {
+  public static Expression CreateParensExpression(IOrigin tok, Expression e) {
     return new ParensExpression(tok, e) { Type = e.Type, ResolvedExpression = e };
   }
 
-  public static Expression CreateNot(IToken tok, Expression e) {
+  public static Expression CreateNot(IOrigin tok, Expression e) {
     Contract.Requires(tok != null);
     Contract.Requires(e != null && e.Type != null && e.Type.IsBoolType);
 
@@ -556,7 +618,7 @@ public static Expression CreateNot(IToken tok, Expression e) {
           break;
       }
       if (negatedOp != BinaryExpr.ResolvedOpcode.Add) {
-        return new BinaryExpr(bin.tok, BinaryExpr.ResolvedOp2SyntacticOp(negatedOp), bin.E0, bin.E1) {
+        return new BinaryExpr(bin.Origin, BinaryExpr.ResolvedOp2SyntacticOp(negatedOp), bin.E0, bin.E1) {
           ResolvedOp = negatedOp,
           Type = bin.Type
         };
@@ -582,7 +644,7 @@ public static Expression CreateLess(Expression e0, Expression e1) {
       (e0.Type.IsCharType && e1.Type.IsCharType) ||
       (e0.Type.IsBigOrdinalType && e1.Type.IsBigOrdinalType));
     Contract.Ensures(Contract.Result<Expression>() != null);
-    return new BinaryExpr(e0.tok, BinaryExpr.Opcode.Lt, e0, e1) {
+    return new BinaryExpr(e0.Origin, BinaryExpr.Opcode.Lt, e0, e1) {
       ResolvedOp = e0.Type.IsCharType ? BinaryExpr.ResolvedOpcode.LtChar : BinaryExpr.ResolvedOpcode.Lt,
       Type = Type.Bool
     };
@@ -602,7 +664,7 @@ public static Expression CreateAtMost(Expression e0, Expression e1) {
       (e0.Type.IsCharType && e1.Type.IsCharType) ||
       (e0.Type.IsBigOrdinalType && e1.Type.IsBigOrdinalType));
     Contract.Ensures(Contract.Result<Expression>() != null);
-    return new BinaryExpr(e0.tok, BinaryExpr.Opcode.Le, e0, e1) {
+    return new BinaryExpr(e0.Origin, BinaryExpr.Opcode.Le, e0, e1) {
       ResolvedOp = e0.Type.IsCharType ? BinaryExpr.ResolvedOpcode.LeChar : BinaryExpr.ResolvedOpcode.Le,
       Type = Type.Bool
     };
@@ -612,7 +674,7 @@ public static Expression CreateEq(Expression e0, Expression e1, Type ty) {
     Contract.Requires(e0 != null);
     Contract.Requires(e1 != null);
     Contract.Requires(ty != null);
-    var eq = new BinaryExpr(e0.tok, BinaryExpr.Opcode.Eq, e0, e1);
+    var eq = new BinaryExpr(e0.Origin, BinaryExpr.Opcode.Eq, e0, e1);
     if (ty is SetType) {
       eq.ResolvedOp = BinaryExpr.ResolvedOpcode.SetEq;
     } else if (ty is SeqType) {
@@ -641,7 +703,7 @@ public static Expression CreateAnd(Expression a, Expression b, bool allowSimplif
     } else if (allowSimplification && LiteralExpr.IsTrue(b)) {
       return a;
     } else {
-      var and = new BinaryExpr(a.tok, BinaryExpr.Opcode.And, a, b);
+      var and = new BinaryExpr(a.Origin, BinaryExpr.Opcode.And, a, b);
       and.ResolvedOp = BinaryExpr.ResolvedOpcode.And;  // resolve here
       and.Type = Type.Bool;  // resolve here
       return and;
@@ -659,7 +721,7 @@ public static Expression CreateImplies(Expression a, Expression b, bool allowSim
     if (allowSimplification && (LiteralExpr.IsTrue(a) || LiteralExpr.IsTrue(b))) {
       return b;
     } else {
-      var imp = new BinaryExpr(a.tok, BinaryExpr.Opcode.Imp, a, b);
+      var imp = new BinaryExpr(a.Origin, BinaryExpr.Opcode.Imp, a, b);
       imp.ResolvedOp = BinaryExpr.ResolvedOpcode.Imp;  // resolve here
       imp.Type = Type.Bool;  // resolve here
       return imp;
@@ -679,7 +741,7 @@ public static Expression CreateOr(Expression a, Expression b, bool allowSimplifi
     } else if (allowSimplification && LiteralExpr.IsTrue(b)) {
       return b;
     } else {
-      var or = new BinaryExpr(a.tok, BinaryExpr.Opcode.Or, a, b);
+      var or = new BinaryExpr(a.Origin, BinaryExpr.Opcode.Or, a, b);
       or.ResolvedOp = BinaryExpr.ResolvedOpcode.Or;  // resolve here
       or.Type = Type.Bool;  // resolve here
       return or;
@@ -695,7 +757,7 @@ public static Expression CreateITE(Expression test, Expression e0, Expression e1
     Contract.Requires(e1 != null);
     Contract.Requires(test.Type.IsBoolType && e0.Type.Equals(e1.Type));
     Contract.Ensures(Contract.Result<Expression>() != null);
-    var ite = new ITEExpr(test.tok, false, test, e0, e1);
+    var ite = new ITEExpr(test.Origin, false, test, e0, e1);
     ite.Type = e0.type;  // resolve here
     return ite;
   }
@@ -705,12 +767,12 @@ public static Expression CreateITE(Expression test, Expression e0, Expression e1
   /// enables resolving a syntactic clone of this resolved expression.
   /// Expects "receiver" and each of the "arguments" to be a resolved expression.
   /// </summary>
-  public static Expression CreateResolvedCall(IToken tok, Expression receiver, Function function, List<Expression> arguments,
+  public static Expression CreateResolvedCall(IOrigin tok, Expression receiver, Function function, List<Expression> arguments,
     List<Type> typeArguments, SystemModuleManager systemModuleManager) {
-    Contract.Requires(function.Formals.Count == arguments.Count);
+    Contract.Requires(function.Ins.Count == arguments.Count);
     Contract.Requires(function.TypeArgs.Count == typeArguments.Count);
 
-    var call = new FunctionCallExpr(tok, function.Name, receiver, tok, tok, arguments) {
+    var call = new FunctionCallExpr(tok, function.NameNode, receiver, tok, Token.NoToken, arguments) {
       Function = function,
       Type = function.ResultType,
       TypeApplication_AtEnclosingClass = receiver.Type.TypeArgs,
@@ -728,12 +790,12 @@ public static Expression WrapResolvedCall(FunctionCallExpr call, SystemModuleMan
     var receiverType = (UserDefinedType)call.Receiver.Type.NormalizeExpand();
     var subst = TypeParameter.SubstitutionMap(receiverType.ResolvedClass.TypeArgs, receiverType.TypeArgs);
     subst = ModuleResolver.AddParentTypeParameterSubstitutions(subst, receiverType);
-    var exprDotName = new ExprDotName(call.tok, call.Receiver, call.Function.Name, call.TypeApplication_JustFunction) {
+    var exprDotName = new ExprDotName(call.Origin, call.Receiver, call.Function.NameNode, call.TypeApplication_JustFunction) {
       Type = ModuleResolver.SelectAppropriateArrowTypeForFunction(call.Function, subst, systemModuleManager)
     };
 
     subst = TypeParameter.SubstitutionMap(call.Function.TypeArgs, call.TypeApplication_JustFunction);
-    return new ApplySuffix(call.tok, null, exprDotName, new ActualBindings(call.Args).ArgumentBindings, call.tok) {
+    return new ApplySuffix(call.Origin, null, exprDotName, new ActualBindings(call.Args).ArgumentBindings, call.CloseParen) {
       ResolvedExpression = call,
       Type = call.Function.ResultType.Subst(subst)
     };
@@ -743,7 +805,7 @@ public static Expression WrapResolvedCall(FunctionCallExpr call, SystemModuleMan
   /// Create a resolved field-selection expression.
   /// Expects "receiver" to be a resolved expression.
   /// </summary>
-  public static Expression CreateFieldSelect(IToken tok, Expression receiver, Field field) {
+  public static Expression CreateFieldSelect(IOrigin tok, Expression receiver, Field field) {
     var memberSelectExpr = new MemberSelectExpr(tok, receiver, field);
     return WrapResolvedMemberSelect(memberSelectExpr);
   }
@@ -752,13 +814,25 @@ public static Expression CreateFieldSelect(IToken tok, Expression receiver, Fiel
   /// Wrap the resolved MemberSelectExpr in the usual unresolved structure, in case the expression is cloned and re-resolved.
   /// </summary>
   public static Expression WrapResolvedMemberSelect(MemberSelectExpr memberSelectExpr) {
-    List<Type> optTypeArguments = memberSelectExpr.TypeApplication_JustMember.Count == 0 ? null : memberSelectExpr.TypeApplication_JustMember;
-    return new ExprDotName(memberSelectExpr.tok, memberSelectExpr.Obj, memberSelectExpr.MemberName, optTypeArguments) {
+    List<Type> optTypeArguments = memberSelectExpr.TypeApplicationJustMember.Count == 0 ? null : memberSelectExpr.TypeApplicationJustMember;
+    return new ExprDotName(memberSelectExpr.Origin, memberSelectExpr.Obj, memberSelectExpr.MemberNameNode, optTypeArguments) {
       ResolvedExpression = memberSelectExpr,
       Type = memberSelectExpr.Type
     };
   }
 
+  /// <summary>
+  /// If "expr" is an expression that exists only as a resolved expression, then wrap it in the usual unresolved structure.
+  /// </summary>
+  public static Expression WrapAsParsedStructureIfNecessary(Expression expr, SystemModuleManager systemModuleManager) {
+    if (expr is FunctionCallExpr functionCallExpr) {
+      return WrapResolvedCall(functionCallExpr, systemModuleManager);
+    } else if (expr is MemberSelectExpr memberSelectExpr) {
+      return WrapResolvedMemberSelect(memberSelectExpr);
+    }
+    return expr;
+  }
+
   /// <summary>
   /// Create a resolved case expression for a match expression
   /// </summary>
@@ -771,7 +845,7 @@ public static MatchCaseExpr CreateMatchCase(MatchCaseExpr old_case, Expression n
     var newVars = old_case.Arguments.ConvertAll(bv => cloner.CloneBoundVar(bv, false));
     new_body = VarSubstituter(old_case.Arguments.ConvertAll<NonglobalVariable>(x => (NonglobalVariable)x), newVars, new_body);
 
-    var new_case = new MatchCaseExpr(old_case.tok, old_case.Ctor, old_case.FromBoundVar, newVars, new_body, old_case.Attributes);
+    var new_case = new MatchCaseExpr(old_case.Origin, old_case.Ctor, old_case.FromBoundVar, newVars, new_body, old_case.Attributes);
 
     new_case.Ctor = old_case.Ctor; // resolve here
     return new_case;
@@ -780,7 +854,7 @@ public static MatchCaseExpr CreateMatchCase(MatchCaseExpr old_case, Expression n
   /// <summary>
   /// Create a match expression with a resolved type
   /// </summary>
-  public static Expression CreateMatch(IToken tok, Expression src, List<MatchCaseExpr> cases, Type type) {
+  public static Expression CreateMatch(IOrigin tok, Expression src, List<MatchCaseExpr> cases, Type type) {
     MatchExpr e = new MatchExpr(tok, src, cases, false);
     e.Type = type;  // resolve here
 
@@ -790,7 +864,7 @@ public static Expression CreateMatch(IToken tok, Expression src, List<MatchCaseE
   /// <summary>
   /// Create a let expression with a resolved type and fresh variables
   /// </summary>
-  public static Expression CreateLet(IToken tok, List<CasePattern<BoundVar>> LHSs, List<Expression> RHSs, Expression body, bool exact) {
+  public static Expression CreateLet(IOrigin tok, List<CasePattern<BoundVar>> LHSs, List<Expression> RHSs, Expression body, bool exact) {
     Contract.Requires(tok != null);
     Contract.Requires(LHSs != null && RHSs != null);
     Contract.Requires(LHSs.Count == RHSs.Count);
@@ -828,9 +902,9 @@ public static Expression CreateQuantifier(QuantifierExpr expr, bool forall, Expr
 
     QuantifierExpr q;
     if (forall) {
-      q = new ForallExpr(expr.tok, expr.RangeToken, newVars, expr.Range, body, expr.Attributes);
+      q = new ForallExpr(expr.Origin, newVars, expr.Range, body, expr.Attributes);
     } else {
-      q = new ExistsExpr(expr.tok, expr.RangeToken, newVars, expr.Range, body, expr.Attributes);
+      q = new ExistsExpr(expr.Origin, newVars, expr.Range, body, expr.Attributes);
     }
     q.Type = Type.Bool;
 
@@ -842,7 +916,7 @@ public static Expression CreateQuantifier(QuantifierExpr expr, bool forall, Expr
   /// </summary>
   public static Expression CreateIdentExpr(IVariable v) {
     Contract.Requires(v != null);
-    return new IdentifierExpr(v.Tok, v.Name) {
+    return new IdentifierExpr(v.Origin, v.Name) {
       Var = v,
       type = v.Type
     };
@@ -858,7 +932,7 @@ public static Expression VarSubstituter(List<NonglobalVariable> oldVars, List<Bo
     }
 
     for (int i = 0; i < oldVars.Count; i++) {
-      var id = new IdentifierExpr(newVars[i].tok, newVars[i].Name);
+      var id = new IdentifierExpr(newVars[i].Origin, newVars[i].Name);
       id.Var = newVars[i];    // Resolve here manually
       id.Type = newVars[i].Type;  // Resolve here manually
       substMap.Add(oldVars[i], id);
@@ -879,4 +953,10 @@ public string AsStringLiteral() {
 
   public override IEnumerable<INode> Children => SubExpressions;
   public override IEnumerable<INode> PreResolveChildren => Children;
-}
\ No newline at end of file
+
+  public static Expression CreateAssigned(IOrigin tok, IdentifierExpr inner) {
+    return new UnaryOpExpr(tok, UnaryOpExpr.Opcode.Assigned, inner) {
+      Type = Type.Bool
+    };
+  }
+}
diff --git a/Source/DafnyCore/AST/Expressions/Heap/FrameExpression.cs b/Source/DafnyCore/AST/Expressions/Heap/FrameExpression.cs
index fa767652ceb..0082de8dd91 100644
--- a/Source/DafnyCore/AST/Expressions/Heap/FrameExpression.cs
+++ b/Source/DafnyCore/AST/Expressions/Heap/FrameExpression.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Dafny;
 
-public class FrameExpression : TokenNode, IHasUsages {
+public class FrameExpression : NodeWithComputedRange, IHasReferences {
   public readonly Expression OriginalExpression; // may be a WildcardExpr
   [FilledInDuringResolution] public Expression DesugaredExpression; // may be null for modifies clauses, even after resolution
 
@@ -26,17 +26,15 @@ void ObjectInvariant() {
   /// If a "fieldName" is given, then "tok" denotes its source location.  Otherwise, "tok"
   /// denotes the source location of "e".
   /// </summary>
-  public FrameExpression(IToken tok, Expression e, string fieldName) {
-    Contract.Requires(tok != null);
+  public FrameExpression(IOrigin origin, Expression e, string fieldName) : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(e != null);
     Contract.Requires(!(e is WildcardExpr) || fieldName == null);
-    this.tok = tok;
     OriginalExpression = e;
     FieldName = fieldName;
   }
 
-  public FrameExpression(Cloner cloner, FrameExpression original) {
-    this.tok = cloner.Tok(original.tok);
+  public FrameExpression(Cloner cloner, FrameExpression original) : base(cloner, original) {
     OriginalExpression = cloner.CloneExpr(original.OriginalExpression);
     FieldName = original.FieldName;
 
@@ -48,10 +46,9 @@ public FrameExpression(Cloner cloner, FrameExpression original) {
     }
   }
 
-  public IToken NameToken => tok;
   public override IEnumerable<INode> Children => new[] { E };
   public override IEnumerable<INode> PreResolveChildren => Children;
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return new[] { Field }.Where(x => x != null);
+  public IEnumerable<Reference> GetReferences() {
+    return Field == null ? Enumerable.Empty<Reference>() : new[] { new Reference(Origin, Field) };
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Expressions/Heap/FreshExpr.cs b/Source/DafnyCore/AST/Expressions/Heap/FreshExpr.cs
index d3385c9f2e4..de0e4177af7 100644
--- a/Source/DafnyCore/AST/Expressions/Heap/FreshExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Heap/FreshExpr.cs
@@ -6,9 +6,9 @@ public class FreshExpr : UnaryOpExpr, ICloneable<FreshExpr> {
   public readonly string/*?*/ At;
   [FilledInDuringResolution] public Label/*?*/ AtLabel;  // after that, At==null iff AtLabel==null
 
-  public FreshExpr(IToken tok, Expression e, string at = null)
-    : base(tok, Opcode.Fresh, e) {
-    Contract.Requires(tok != null);
+  public FreshExpr(IOrigin origin, Expression e, string at = null)
+    : base(origin, Opcode.Fresh, e) {
+    Contract.Requires(origin != null);
     Contract.Requires(e != null);
     this.At = at;
   }
diff --git a/Source/DafnyCore/AST/Expressions/Heap/OldExpr.cs b/Source/DafnyCore/AST/Expressions/Heap/OldExpr.cs
index 3c0c51c84e5..e523d3b7014 100644
--- a/Source/DafnyCore/AST/Expressions/Heap/OldExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Heap/OldExpr.cs
@@ -28,9 +28,9 @@ public OldExpr Clone(Cloner cloner) {
   }
 
   [Captured]
-  public OldExpr(IToken tok, Expression expr, string at = null)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public OldExpr(IOrigin origin, Expression expr, string at = null)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(expr != null);
     cce.Owner.AssignSame(this, expr);
     E = expr;
diff --git a/Source/DafnyCore/AST/Expressions/Heap/UnchangedExpr.cs b/Source/DafnyCore/AST/Expressions/Heap/UnchangedExpr.cs
index aa30c2828bd..4f01b0286a9 100644
--- a/Source/DafnyCore/AST/Expressions/Heap/UnchangedExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Heap/UnchangedExpr.cs
@@ -24,9 +24,9 @@ public UnchangedExpr(Cloner cloner, UnchangedExpr original) : base(cloner, origi
     }
   }
 
-  public UnchangedExpr(IToken tok, List<FrameExpression> frame, string/*?*/ at)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public UnchangedExpr(IOrigin origin, List<FrameExpression> frame, string/*?*/ at)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(frame != null);
     this.Frame = frame;
     this.At = at;
diff --git a/Source/DafnyCore/AST/Expressions/Heap/WildcardExpr.cs b/Source/DafnyCore/AST/Expressions/Heap/WildcardExpr.cs
index c39d47f0817..831ef5bc0ad 100644
--- a/Source/DafnyCore/AST/Expressions/Heap/WildcardExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Heap/WildcardExpr.cs
@@ -7,9 +7,9 @@ public class WildcardExpr : Expression, ICloneable<WildcardExpr> {  // a Wildcar
   public WildcardExpr(Cloner cloner, WildcardExpr original) : base(cloner, original) {
   }
 
-  public WildcardExpr(IToken tok)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public WildcardExpr(IOrigin origin)
+    : base(origin) {
+    Contract.Requires(origin != null);
   }
 
   public WildcardExpr Clone(Cloner cloner) {
diff --git a/Source/DafnyCore/AST/Expressions/LiteralExpr.cs b/Source/DafnyCore/AST/Expressions/LiteralExpr.cs
index 9d5cc860c0c..897f3314e55 100644
--- a/Source/DafnyCore/AST/Expressions/LiteralExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/LiteralExpr.cs
@@ -48,36 +48,36 @@ public static bool IsEmptySequence(Expression e) {
     return StripParens(e) is SeqDisplayExpr display && display.Elements.Count == 0;
   }
 
-  public LiteralExpr(IToken tok)
-    : base(tok) {  // represents the Dafny literal "null"
-    Contract.Requires(tok != null);
+  public LiteralExpr(IOrigin origin)
+    : base(origin) {  // represents the Dafny literal "null"
+    Contract.Requires(origin != null);
     this.Value = null;
   }
 
-  public LiteralExpr(IToken tok, BigInteger n)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public LiteralExpr(IOrigin origin, BigInteger n)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(0 <= n.Sign);
     this.Value = n;
   }
 
-  public LiteralExpr(IToken tok, BaseTypes.BigDec n)
-    : base(tok) {
+  public LiteralExpr(IOrigin origin, BaseTypes.BigDec n)
+    : base(origin) {
     Contract.Requires(0 <= n.Mantissa.Sign);
-    Contract.Requires(tok != null);
+    Contract.Requires(origin != null);
     this.Value = n;
   }
 
-  public LiteralExpr(IToken tok, int n)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public LiteralExpr(IOrigin origin, int n)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(0 <= n);
     this.Value = new BigInteger(n);
   }
 
-  public LiteralExpr(IToken tok, bool b)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public LiteralExpr(IOrigin origin, bool b)
+    : base(origin) {
+    Contract.Requires(origin != null);
     this.Value = b;
   }
 
@@ -86,9 +86,9 @@ public LiteralExpr(IToken tok, bool b)
   /// two reasons:  both of these literals store a string in .Value, and string literals also carry an
   /// additional field.
   /// </summary>
-  protected LiteralExpr(IToken tok, string s)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  protected LiteralExpr(IOrigin origin, string s)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(s != null);
     this.Value = s;
   }
@@ -103,8 +103,8 @@ public LiteralExpr Clone(Cloner cloner) {
 }
 
 public class CharLiteralExpr : LiteralExpr, ICloneable<CharLiteralExpr> {
-  public CharLiteralExpr(IToken tok, string s)
-    : base(tok, s) {
+  public CharLiteralExpr(IOrigin origin, string s)
+    : base(origin, s) {
     Contract.Requires(s != null);
   }
 
@@ -118,8 +118,8 @@ public CharLiteralExpr(Cloner cloner, CharLiteralExpr original) : base(cloner, o
 
 public class StringLiteralExpr : LiteralExpr, ICloneable<StringLiteralExpr> {
   public readonly bool IsVerbatim;
-  public StringLiteralExpr(IToken tok, string s, bool isVerbatim)
-    : base(tok, s) {
+  public StringLiteralExpr(IOrigin origin, string s, bool isVerbatim)
+    : base(origin, s) {
     Contract.Requires(s != null);
     IsVerbatim = isVerbatim;
   }
@@ -148,9 +148,9 @@ public NegationExpression(Cloner cloner, NegationExpression original) : base(clo
     E = cloner.CloneExpr(original.E);
   }
 
-  public NegationExpression(IToken tok, Expression e)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public NegationExpression(IOrigin origin, Expression e)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(e != null);
     E = e;
   }
diff --git a/Source/DafnyCore/AST/Expressions/Operators/BinaryExpr.cs b/Source/DafnyCore/AST/Expressions/Operators/BinaryExpr.cs
index 5eec0fe5eda..08794f0f865 100644
--- a/Source/DafnyCore/AST/Expressions/Operators/BinaryExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Operators/BinaryExpr.cs
@@ -51,8 +51,8 @@ public enum ResolvedOpcode {
     Le,
     Ge,
     Gt,
-    Add,
-    Sub,
+    Add, // also used for char
+    Sub, // also used for char
     Mul,
     Div,
     Mod,
@@ -114,14 +114,14 @@ public enum ResolvedOpcode {
   }
   private ResolvedOpcode _theResolvedOp = ResolvedOpcode.YetUndetermined;
   public ResolvedOpcode ResolvedOp {
-    set {
-      Contract.Assume(_theResolvedOp == ResolvedOpcode.YetUndetermined || _theResolvedOp == value);  // there's never a reason for resolution to change its mind, is there?
-      _theResolvedOp = value;
-    }
     get {
       Debug.Assert(_theResolvedOp != ResolvedOpcode.YetUndetermined);  // shouldn't read it until it has been properly initialized
       return _theResolvedOp;
     }
+    set {
+      Contract.Assume(_theResolvedOp == ResolvedOpcode.YetUndetermined || _theResolvedOp == value);  // there's never a reason for resolution to change its mind, is there?
+      _theResolvedOp = value;
+    }
   }
   public ResolvedOpcode ResolvedOp_PossiblyStillUndetermined {  // offer a way to return _theResolveOp -- for experts only!
     get { return _theResolvedOp; }
@@ -325,10 +325,10 @@ public BinaryExpr(Cloner cloner, BinaryExpr original) : base(cloner, original) {
     }
   }
 
-  public BinaryExpr(IToken tok, Opcode op, Expression e0, Expression e1)
+  public BinaryExpr(IOrigin origin, Opcode op, Expression e0, Expression e1)
     :
-    base(tok) {
-    Contract.Requires(tok != null);
+    base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(e0 != null);
     Contract.Requires(e1 != null);
     this.Op = op;
@@ -339,8 +339,8 @@ public BinaryExpr(IToken tok, Opcode op, Expression e0, Expression e1)
   /// <summary>
   /// Returns a resolved binary expression
   /// </summary>
-  public BinaryExpr(IToken tok, BinaryExpr.ResolvedOpcode rop, Expression e0, Expression e1)
-    : this(tok, BinaryExpr.ResolvedOp2SyntacticOp(rop), e0, e1) {
+  public BinaryExpr(IOrigin origin, BinaryExpr.ResolvedOpcode rop, Expression e0, Expression e1)
+    : this(origin, BinaryExpr.ResolvedOp2SyntacticOp(rop), e0, e1) {
     ResolvedOp = rop;
     switch (rop) {
       case ResolvedOpcode.EqCommon:
diff --git a/Source/DafnyCore/AST/Expressions/Operators/ChainingExpression.cs b/Source/DafnyCore/AST/Expressions/Operators/ChainingExpression.cs
index 94092be9558..2cf4d3e765e 100644
--- a/Source/DafnyCore/AST/Expressions/Operators/ChainingExpression.cs
+++ b/Source/DafnyCore/AST/Expressions/Operators/ChainingExpression.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Dafny;
 public class ChainingExpression : ConcreteSyntaxExpression, ICloneable<ChainingExpression>, ICanFormat {
   public readonly List<Expression> Operands;
   public readonly List<BinaryExpr.Opcode> Operators;
-  public readonly List<IToken> OperatorLocs;
+  public readonly List<IOrigin> OperatorLocs;
   public readonly List<Expression/*?*/> PrefixLimits;
   public readonly Expression E;
 
@@ -19,14 +19,14 @@ public ChainingExpression Clone(Cloner cloner) {
   public ChainingExpression(Cloner cloner, ChainingExpression original) : base(cloner, original) {
     Operands = original.Operands.Select(cloner.CloneExpr).ToList();
     Operators = original.Operators;
-    OperatorLocs = original.OperatorLocs.Select(cloner.Tok).ToList();
+    OperatorLocs = original.OperatorLocs.Select(cloner.Origin).ToList();
     PrefixLimits = original.PrefixLimits.Select(cloner.CloneExpr).ToList();
     E = ComputeDesugaring(Operands, Operators, OperatorLocs, PrefixLimits);
   }
 
-  public ChainingExpression(IToken tok, List<Expression> operands, List<BinaryExpr.Opcode> operators, List<IToken> operatorLocs, List<Expression/*?*/> prefixLimits)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public ChainingExpression(IOrigin origin, List<Expression> operands, List<BinaryExpr.Opcode> operators, List<IOrigin> operatorLocs, List<Expression/*?*/> prefixLimits)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(operands != null);
     Contract.Requires(operators != null);
     Contract.Requires(operatorLocs != null);
@@ -44,7 +44,7 @@ public ChainingExpression(IToken tok, List<Expression> operands, List<BinaryExpr
     E = ComputeDesugaring(operands, operators, operatorLocs, prefixLimits);
   }
 
-  private static Expression ComputeDesugaring(List<Expression> operands, List<BinaryExpr.Opcode> operators, List<IToken> operatorLocs, List<Expression> prefixLimits) {
+  private static Expression ComputeDesugaring(List<Expression> operands, List<BinaryExpr.Opcode> operators, List<IOrigin> operatorLocs, List<Expression> prefixLimits) {
     Expression desugaring;
     // Compute the desugaring
     if (operators[0] == BinaryExpr.Opcode.Disjoint) {
diff --git a/Source/DafnyCore/AST/Expressions/Operators/DecreasesToExpr.cs b/Source/DafnyCore/AST/Expressions/Operators/DecreasesToExpr.cs
new file mode 100644
index 00000000000..441beb6db09
--- /dev/null
+++ b/Source/DafnyCore/AST/Expressions/Operators/DecreasesToExpr.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+public class DecreasesToExpr : Expression, ICloneable<DecreasesToExpr> {
+  public IReadOnlyList<Expression> OldExpressions { get; }
+  public IReadOnlyList<Expression> NewExpressions { get; }
+
+  public bool AllowNoChange { get; }
+
+  public DecreasesToExpr(IOrigin origin,
+    IReadOnlyList<Expression> oldExpressions,
+    IReadOnlyList<Expression> newExpressions, bool allowNoChange) : base(origin) {
+    OldExpressions = oldExpressions;
+    NewExpressions = newExpressions;
+    AllowNoChange = allowNoChange;
+  }
+
+  public DecreasesToExpr(Cloner cloner, DecreasesToExpr original) : base(cloner, original) {
+    OldExpressions = original.OldExpressions.Select(cloner.CloneExpr).ToList();
+    NewExpressions = original.NewExpressions.Select(cloner.CloneExpr).ToList();
+    AllowNoChange = original.AllowNoChange;
+  }
+
+  public DecreasesToExpr Clone(Cloner cloner) {
+    return new DecreasesToExpr(cloner, this);
+  }
+
+  public override IEnumerable<Expression> SubExpressions => OldExpressions.Concat(NewExpressions);
+}
diff --git a/Source/DafnyCore/AST/Expressions/Operators/ParensExpression.cs b/Source/DafnyCore/AST/Expressions/Operators/ParensExpression.cs
index 809b03ffadd..bac7e4a870c 100644
--- a/Source/DafnyCore/AST/Expressions/Operators/ParensExpression.cs
+++ b/Source/DafnyCore/AST/Expressions/Operators/ParensExpression.cs
@@ -4,8 +4,8 @@ namespace Microsoft.Dafny;
 
 public class ParensExpression : ConcreteSyntaxExpression, ICanFormat, ICloneable<ParensExpression> {
   public readonly Expression E;
-  public ParensExpression(IToken tok, Expression e)
-    : base(tok) {
+  public ParensExpression(IOrigin origin, Expression e)
+    : base(origin) {
     E = e;
   }
 
diff --git a/Source/DafnyCore/AST/Expressions/Operators/UnaryExpr.cs b/Source/DafnyCore/AST/Expressions/Operators/UnaryExpr.cs
index bcc7cf05a61..d4f96327a2f 100644
--- a/Source/DafnyCore/AST/Expressions/Operators/UnaryExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Operators/UnaryExpr.cs
@@ -10,9 +10,9 @@ void ObjectInvariant() {
     Contract.Invariant(E != null);
   }
 
-  public UnaryExpr(IToken tok, Expression e)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public UnaryExpr(IOrigin origin, Expression e)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(e != null);
     this.E = e;
   }
diff --git a/Source/DafnyCore/AST/Expressions/Operators/UnaryOpExpr.cs b/Source/DafnyCore/AST/Expressions/Operators/UnaryOpExpr.cs
index a81c0c6b84a..94ce2b5889e 100644
--- a/Source/DafnyCore/AST/Expressions/Operators/UnaryOpExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Operators/UnaryOpExpr.cs
@@ -9,6 +9,7 @@ public enum Opcode {
     Fresh, // fresh also has a(n optional) second argument, namely the @-label
     Allocated,
     Lit,  // there is no syntax for this operator, but it is sometimes introduced during translation
+    Assigned,
   }
   public readonly Opcode Op;
 
@@ -22,7 +23,8 @@ public enum ResolvedOpcode {
     MapCard,
     Fresh,
     Allocated,
-    Lit
+    Lit,
+    Assigned,
   }
 
   private ResolvedOpcode _ResolvedOp = ResolvedOpcode.YetUndetermined;
@@ -32,7 +34,7 @@ public ResolvedOpcode ResolveOp() {
     if (_ResolvedOp == ResolvedOpcode.YetUndetermined) {
       Contract.Assert(Type != null);
       Contract.Assert(Type is not TypeProxy);
-      _ResolvedOp = (Op, E.Type.NormalizeExpand()) switch {
+      _ResolvedOp = (Op, E.Type.NormalizeToAncestorType()) switch {
         (Opcode.Not, BoolType _) => ResolvedOpcode.BoolNot,
         (Opcode.Not, BitvectorType _) => ResolvedOpcode.BVNot,
         (Opcode.Cardinality, SeqType _) => ResolvedOpcode.SeqLength,
@@ -42,6 +44,7 @@ public ResolvedOpcode ResolveOp() {
         (Opcode.Fresh, _) => ResolvedOpcode.Fresh,
         (Opcode.Allocated, _) => ResolvedOpcode.Allocated,
         (Opcode.Lit, _) => ResolvedOpcode.Lit,
+        (Opcode.Assigned, _) => ResolvedOpcode.Assigned,
         _ => ResolvedOpcode.YetUndetermined // Unreachable
       };
       Contract.Assert(_ResolvedOp != ResolvedOpcode.YetUndetermined);
@@ -56,9 +59,9 @@ public void SetResolveOp(ResolvedOpcode resolvedOpcode) {
     _ResolvedOp = resolvedOpcode;
   }
 
-  public UnaryOpExpr(IToken tok, Opcode op, Expression e)
-    : base(tok, e) {
-    Contract.Requires(tok != null);
+  public UnaryOpExpr(IOrigin origin, Opcode op, Expression e)
+    : base(origin, e) {
+    Contract.Requires(origin != null);
     Contract.Requires(e != null);
     Contract.Requires(op != Opcode.Fresh || this is FreshExpr);
     this.Op = op;
diff --git a/Source/DafnyCore/AST/Expressions/Specification.cs b/Source/DafnyCore/AST/Expressions/Specification.cs
index 58d10ffd234..e9529f2a7e2 100644
--- a/Source/DafnyCore/AST/Expressions/Specification.cs
+++ b/Source/DafnyCore/AST/Expressions/Specification.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Dafny;
 
-public class Specification<T> : TokenNode, IAttributeBearingDeclaration
+public class Specification<T> : NodeWithComputedRange, IAttributeBearingDeclaration
   where T : Node {
   public readonly List<T> Expressions;
 
@@ -12,6 +12,11 @@ private void ObjectInvariant() {
     Contract.Invariant(Expressions == null || cce.NonNullElements<T>(Expressions));
   }
 
+  public Specification() {
+    Expressions = new List<T>();
+    Attributes = null;
+  }
+
   public Specification(List<T> exprs, Attributes attrs) {
     Contract.Requires(exprs == null || cce.NonNullElements<T>(exprs));
     Expressions = exprs;
@@ -19,6 +24,7 @@ public Specification(List<T> exprs, Attributes attrs) {
   }
 
   public Attributes Attributes { get; set; }
+  string IAttributeBearingDeclaration.WhatKind => "specification clause";
 
   public bool HasAttributes() {
     return Attributes != null;
diff --git a/Source/DafnyCore/AST/Expressions/StmtExpr.cs b/Source/DafnyCore/AST/Expressions/StmtExpr.cs
index 0d34e99a999..4dc7be9946f 100644
--- a/Source/DafnyCore/AST/Expressions/StmtExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/StmtExpr.cs
@@ -19,14 +19,14 @@ void ObjectInvariant() {
 
   public StmtExpr(Cloner cloner, StmtExpr original) : base(cloner, original) {
     E = cloner.CloneExpr(original.E);
-    S = cloner.CloneStmt(original.S);
+    S = cloner.CloneStmt(original.S, false);
   }
 
   public override IEnumerable<INode> Children => new Node[] { S, E };
 
-  public StmtExpr(IToken tok, Statement stmt, Expression expr)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public StmtExpr(IOrigin origin, Statement stmt, Expression expr)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(stmt != null);
     Contract.Requires(expr != null);
     S = stmt;
@@ -53,20 +53,25 @@ public override IEnumerable<Expression> TerminalExpressions {
   /// S is executed.
   /// This method should be called only after successful resolution of the expression.
   /// </summary>
-  public Expression GetSConclusion() {
-    // this is one place where we actually investigate what kind of statement .S is
-    if (S is PredicateStmt) {
-      var s = (PredicateStmt)S;
-      return s.Expr;
-    } else if (S is CalcStmt) {
-      var s = (CalcStmt)S;
-      return s.Result;
-    } else if (S is RevealStmt) {
-      return new LiteralExpr(tok, true);  // one could use the definition axiom or the referenced labeled assertions, but "true" is conservative and much simpler :)
-    } else if (S is UpdateStmt) {
-      return new LiteralExpr(tok, true);  // one could use the postcondition of the method, suitably instantiated, but "true" is conservative and much simpler :)
-    } else {
-      Contract.Assert(false); throw new cce.UnreachableException();  // unexpected statement
+  public Expression GetStatementConclusion() {
+    return GetStatementConclusion(S);
+  }
+
+  private Expression GetStatementConclusion(Statement statement) {
+    switch (statement) {
+      // this is one place where we actually investigate what kind of statement .S is
+      case PredicateStmt stmt:
+        return stmt.Expr;
+      case CalcStmt stmt:
+        return stmt.Result;
+      case HideRevealStmt:
+        return CreateBoolLiteral(Origin, true);  // one could use the definition axiom or the referenced labeled assertions, but "true" is conservative and much simpler :)
+      case AssignStatement:
+        return CreateBoolLiteral(Origin, true);  // one could use the postcondition of the method, suitably instantiated, but "true" is conservative and much simpler :)
+      case BlockByProofStmt stmt:
+        return GetStatementConclusion(stmt.Body);
+      default:
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected statement
     }
   }
 
diff --git a/Source/DafnyCore/AST/Expressions/Types/BoxingCastExpr.cs b/Source/DafnyCore/AST/Expressions/Types/BoxingCastExpr.cs
index 39415c325b2..149657e2acd 100644
--- a/Source/DafnyCore/AST/Expressions/Types/BoxingCastExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Types/BoxingCastExpr.cs
@@ -15,7 +15,7 @@ void ObjectInvariant() {
   }
 
   public BoxingCastExpr(Expression e, Type fromType, Type toType)
-    : base(e.tok) {
+    : base(e.Origin) {
     Contract.Requires(e != null);
     Contract.Requires(fromType != null);
     Contract.Requires(toType != null);
diff --git a/Source/DafnyCore/AST/Expressions/Types/ConversionExpr.cs b/Source/DafnyCore/AST/Expressions/Types/ConversionExpr.cs
index 710b98fe58c..9c0cb879651 100644
--- a/Source/DafnyCore/AST/Expressions/Types/ConversionExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Types/ConversionExpr.cs
@@ -9,9 +9,9 @@ public ConversionExpr(Cloner cloner, ConversionExpr original) : base(cloner, ori
     messagePrefix = original.messagePrefix;
   }
 
-  public ConversionExpr(IToken tok, Expression expr, Type toType, string messagePrefix = "")
-    : base(tok, expr, toType) {
-    Contract.Requires(tok != null);
+  public ConversionExpr(IOrigin origin, Expression expr, Type toType, string messagePrefix = "")
+    : base(origin, expr, toType) {
+    Contract.Requires(origin != null);
     Contract.Requires(expr != null);
     Contract.Requires(toType != null);
     this.messagePrefix = messagePrefix;
diff --git a/Source/DafnyCore/AST/Expressions/Types/TypeTestExpr.cs b/Source/DafnyCore/AST/Expressions/Types/TypeTestExpr.cs
index e0d717795b7..1bad77e1212 100644
--- a/Source/DafnyCore/AST/Expressions/Types/TypeTestExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Types/TypeTestExpr.cs
@@ -6,9 +6,9 @@ public class TypeTestExpr : TypeUnaryExpr, ICloneable<TypeTestExpr> {
   public TypeTestExpr(Cloner cloner, TypeTestExpr original) : base(cloner, original) {
   }
 
-  public TypeTestExpr(IToken tok, Expression expr, Type toType)
-    : base(tok, expr, toType) {
-    Contract.Requires(tok != null);
+  public TypeTestExpr(IOrigin origin, Expression expr, Type toType)
+    : base(origin, expr, toType) {
+    Contract.Requires(origin != null);
     Contract.Requires(expr != null);
     Contract.Requires(toType != null);
   }
diff --git a/Source/DafnyCore/AST/Expressions/Types/TypeUnaryExpr.cs b/Source/DafnyCore/AST/Expressions/Types/TypeUnaryExpr.cs
index e270e5d04c8..073ba582784 100644
--- a/Source/DafnyCore/AST/Expressions/Types/TypeUnaryExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Types/TypeUnaryExpr.cs
@@ -11,9 +11,9 @@ protected TypeUnaryExpr(Cloner cloner, TypeUnaryExpr original) : base(cloner, or
     ToType = cloner.CloneType(original.ToType);
   }
 
-  protected TypeUnaryExpr(IToken tok, Expression expr, Type toType)
-    : base(tok, expr) {
-    Contract.Requires(tok != null);
+  protected TypeUnaryExpr(IOrigin origin, Expression expr, Type toType)
+    : base(origin, expr) {
+    Contract.Requires(origin != null);
     Contract.Requires(expr != null);
     Contract.Requires(toType != null);
     ToType = toType;
diff --git a/Source/DafnyCore/AST/Expressions/Types/UnboxingCastExpr.cs b/Source/DafnyCore/AST/Expressions/Types/UnboxingCastExpr.cs
index fd8692cc8bf..8aa28019020 100644
--- a/Source/DafnyCore/AST/Expressions/Types/UnboxingCastExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Types/UnboxingCastExpr.cs
@@ -15,7 +15,7 @@ void ObjectInvariant() {
   }
 
   public UnboxingCastExpr(Expression e, Type fromType, Type toType)
-    : base(e.tok) {
+    : base(e.Origin) {
     Contract.Requires(e != null);
     Contract.Requires(fromType != null);
     Contract.Requires(toType != null);
diff --git a/Source/DafnyCore/AST/Expressions/Variables/AutoGhostIdentifierExpr.cs b/Source/DafnyCore/AST/Expressions/Variables/AutoGhostIdentifierExpr.cs
index a4c64255745..d244205ccef 100644
--- a/Source/DafnyCore/AST/Expressions/Variables/AutoGhostIdentifierExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Variables/AutoGhostIdentifierExpr.cs
@@ -7,8 +7,8 @@ namespace Microsoft.Dafny;
 /// parser and parts of the resolver.
 /// </summary>
 public class AutoGhostIdentifierExpr : IdentifierExpr, ICloneable<AutoGhostIdentifierExpr> {
-  public AutoGhostIdentifierExpr(IToken tok, string name)
-    : base(new AutoGeneratedToken(tok), name) { }
+  public AutoGhostIdentifierExpr(IOrigin tok, string name)
+    : base(new AutoGeneratedOrigin(tok), name) { }
 
   public AutoGhostIdentifierExpr(Cloner cloner, AutoGhostIdentifierExpr original)
     : base(cloner, original) {
diff --git a/Source/DafnyCore/AST/Expressions/Variables/BoundVar.cs b/Source/DafnyCore/AST/Expressions/Variables/BoundVar.cs
index db914c9c9f6..c9ec6c273e9 100644
--- a/Source/DafnyCore/AST/Expressions/Variables/BoundVar.cs
+++ b/Source/DafnyCore/AST/Expressions/Variables/BoundVar.cs
@@ -1,15 +1,19 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
+using JetBrains.Annotations;
 
 namespace Microsoft.Dafny;
 
-[DebuggerDisplay("Bound<{name}>")]
 public class BoundVar : NonglobalVariable {
   public override bool IsMutable => false;
-  public BoundVar(IToken tok, string name, Type type)
-    : base(tok, name, type, false) {
-    Contract.Requires(tok != null);
+
+  public BoundVar(string name, Type type) : this(Token.NoToken, new Name(Token.NoToken, name), type) { }
+  public BoundVar(IOrigin origin, string name, Type type) : this(origin, new Name(origin.StartToken, name), type) { }
+
+  public BoundVar(IOrigin origin, Name name, Type type)
+    : base(origin, name, type, false) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(type != null);
   }
@@ -26,7 +30,7 @@ public class QuantifiedVar : BoundVar {
   public readonly Expression Domain;
   public readonly Expression Range;
 
-  public QuantifiedVar(IToken tok, string name, Type type, Expression domain, Expression range)
+  public QuantifiedVar(IOrigin tok, string name, Type type, Expression domain, Expression range)
     : base(tok, name, type) {
     Contract.Requires(tok != null);
     Contract.Requires(name != null);
@@ -36,7 +40,7 @@ public QuantifiedVar(IToken tok, string name, Type type, Expression domain, Expr
   }
 
   /// <summary>
-  /// Map a list of quantified variables to an eqivalent list of bound variables plus a single range expression.
+  /// Map a list of quantified variables to an equivalent list of bound variables plus a single range expression.
   /// The transformation looks like this in general:
   ///
   /// x1 <- C1 | E1, ..., xN <- CN | EN
@@ -48,25 +52,25 @@ public QuantifiedVar(IToken tok, string name, Type type, Expression domain, Expr
   /// Note the result will be null rather than "true" if there are no such domains or ranges.
   /// Some quantification contexts (such as comprehensions) will replace this with "true".
   /// </summary>
-  public static void ExtractSingleRange(List<QuantifiedVar> qvars, out List<BoundVar> bvars, out Expression range) {
+  public static void ExtractSingleRange(List<QuantifiedVar> qvars, out List<BoundVar> bvars, [CanBeNull] out Expression range) {
     bvars = new List<BoundVar>();
     range = null;
 
     foreach (var qvar in qvars) {
-      BoundVar bvar = new BoundVar(qvar.tok, qvar.Name, qvar.SyntacticType);
+      BoundVar bvar = new BoundVar(qvar.Origin, qvar.Name, qvar.SyntacticType);
       bvars.Add(bvar);
 
       if (qvar.Domain != null) {
         // Attach a token wrapper so we can produce a better error message if the domain is not a collection
         var domainWithToken = QuantifiedVariableDomainCloner.Instance.CloneExpr(qvar.Domain);
-        var inDomainExpr = new BinaryExpr(domainWithToken.tok, BinaryExpr.Opcode.In, new IdentifierExpr(bvar.tok, bvar), domainWithToken);
-        range = range == null ? inDomainExpr : new BinaryExpr(domainWithToken.tok, BinaryExpr.Opcode.And, range, inDomainExpr);
+        var inDomainExpr = new BinaryExpr(domainWithToken.Origin.Center, BinaryExpr.Opcode.In, new IdentifierExpr(bvar.Origin, bvar), domainWithToken);
+        range = range == null ? inDomainExpr : new BinaryExpr(domainWithToken.Origin.Center, BinaryExpr.Opcode.And, range, inDomainExpr);
       }
 
       if (qvar.Range != null) {
         // Attach a token wrapper so we can produce a better error message if the range is not a boolean expression
         var rangeWithToken = QuantifiedVariableRangeCloner.Instance.CloneExpr(qvar.Range);
-        range = range == null ? qvar.Range : new BinaryExpr(rangeWithToken.tok, BinaryExpr.Opcode.And, range, rangeWithToken);
+        range = range == null ? qvar.Range : new BinaryExpr(rangeWithToken.Origin.Center, BinaryExpr.Opcode.And, range, rangeWithToken);
       }
     }
   }
@@ -84,15 +88,23 @@ public IEnumerable<BoundVar> AllBoundVars {
 class QuantifiedVariableDomainCloner : Cloner {
   public static readonly QuantifiedVariableDomainCloner Instance = new QuantifiedVariableDomainCloner();
   private QuantifiedVariableDomainCloner() { }
-  public override IToken Tok(IToken tok) {
-    return new QuantifiedVariableDomainToken(tok);
+  public override IOrigin Origin(IOrigin tok) {
+    if (tok == null) {
+      return null;
+    }
+
+    return new QuantifiedVariableDomainOrigin(tok);
   }
 }
 
 class QuantifiedVariableRangeCloner : Cloner {
   public static readonly QuantifiedVariableRangeCloner Instance = new QuantifiedVariableRangeCloner();
   private QuantifiedVariableRangeCloner() { }
-  public override IToken Tok(IToken tok) {
-    return new QuantifiedVariableRangeToken(tok);
+  public override IOrigin Origin(IOrigin tok) {
+    if (tok == null) {
+      return null;
+    }
+
+    return new QuantifiedVariableRangeOrigin(tok);
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Expressions/Variables/CasePattern.cs b/Source/DafnyCore/AST/Expressions/Variables/CasePattern.cs
index 7dca93bd5e1..2e89f8e0b93 100644
--- a/Source/DafnyCore/AST/Expressions/Variables/CasePattern.cs
+++ b/Source/DafnyCore/AST/Expressions/Variables/CasePattern.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Dafny;
 /// which it is; in this case, Var is non-null, because this is the only place where Var.IsGhost
 /// is recorded by the parser.
 /// </summary>
-public class CasePattern<VT> : TokenNode
+public class CasePattern<VT> : NodeWithComputedRange
   where VT : class, IVariable {
   public readonly string Id;
   // After successful resolution, exactly one of the following two fields is non-null.
@@ -29,8 +29,7 @@ public void MakeAConstructor() {
     this.Arguments = new List<CasePattern<VT>>();
   }
 
-  public CasePattern(Cloner cloner, CasePattern<VT> original) {
-    tok = cloner.Tok(original.tok);
+  public CasePattern(Cloner cloner, CasePattern<VT> original) : base(cloner, original) {
     Id = original.Id;
     if (original.Var != null) {
       Var = cloner.CloneIVariable(original.Var, false);
@@ -51,18 +50,16 @@ public CasePattern(Cloner cloner, CasePattern<VT> original) {
     }
   }
 
-  public CasePattern(IToken tok, string id, [Captured] List<CasePattern<VT>> arguments) {
-    Contract.Requires(tok != null);
+  public CasePattern(IOrigin origin, string id, [Captured] List<CasePattern<VT>> arguments) : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(id != null);
-    this.tok = tok;
     Id = id;
     Arguments = arguments;
   }
 
-  public CasePattern(IToken tok, VT bv) {
-    Contract.Requires(tok != null);
+  public CasePattern(IOrigin origin, VT bv) : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(bv != null);
-    this.tok = tok;
     Id = bv.Name;
     Var = bv;
   }
@@ -75,13 +72,13 @@ public void AssembleExpr(List<Type> dtvTypeArgs) {
     Contract.Requires(Var != null || dtvTypeArgs != null);
     if (Var != null) {
       Contract.Assert(this.Id == this.Var.Name);
-      this.Expr = new IdentifierExpr(this.tok, this.Var);
+      this.Expr = new IdentifierExpr(this.Origin, this.Var);
     } else {
-      var dtValue = new DatatypeValue(this.tok, this.Ctor.EnclosingDatatype.Name, this.Id,
+      var dtValue = new DatatypeValue(this.Origin, this.Ctor.EnclosingDatatype.Name, this.Id,
         this.Arguments == null ? new List<Expression>() : this.Arguments.ConvertAll(arg => arg.Expr));
       dtValue.Ctor = this.Ctor;  // resolve here
       dtValue.InferredTypeArgs.AddRange(dtvTypeArgs);  // resolve here
-      dtValue.Type = new UserDefinedType(this.tok, this.Ctor.EnclosingDatatype.Name, this.Ctor.EnclosingDatatype, dtvTypeArgs);
+      dtValue.Type = new UserDefinedType(this.Origin, this.Ctor.EnclosingDatatype.Name, this.Ctor.EnclosingDatatype, dtvTypeArgs);
       this.Expr = dtValue;
     }
   }
@@ -94,11 +91,11 @@ public void AssembleExprPreType(List<PreType> dtvPreTypeArgs) {
     Contract.Requires(Var != null || dtvPreTypeArgs != null);
     if (Var != null) {
       Contract.Assert(this.Id == this.Var.Name);
-      this.Expr = new IdentifierExpr(this.tok, this.Var) {
+      this.Expr = new IdentifierExpr(this.Origin, this.Var) {
         PreType = this.Var.PreType
       };
     } else {
-      var dtValue = new DatatypeValue(this.tok, this.Ctor.EnclosingDatatype.Name, this.Id,
+      var dtValue = new DatatypeValue(this.Origin, this.Ctor.EnclosingDatatype.Name, this.Id,
         this.Arguments == null ? new List<Expression>() : this.Arguments.ConvertAll(arg => arg.Expr)) {
         Ctor = this.Ctor,
         PreType = new DPreType(this.Ctor.EnclosingDatatype, dtvPreTypeArgs)
diff --git a/Source/DafnyCore/AST/Expressions/Variables/Formal.cs b/Source/DafnyCore/AST/Expressions/Variables/Formal.cs
index f5716d290cb..c123f797d9e 100644
--- a/Source/DafnyCore/AST/Expressions/Variables/Formal.cs
+++ b/Source/DafnyCore/AST/Expressions/Variables/Formal.cs
@@ -5,41 +5,48 @@
 namespace Microsoft.Dafny;
 
 public class Formal : NonglobalVariable {
+  public Attributes Attributes { get; set; }
+
   public readonly bool InParam;  // true to in-parameter, false for out-parameter
   public override bool IsMutable => !InParam;
   public readonly bool IsOld;
-  public readonly Expression DefaultValue;
+  public Expression DefaultValue;
   public readonly bool IsNameOnly;
   public readonly bool IsOlder;
   public readonly string NameForCompilation;
 
-  public Formal(IToken tok, string name, Type type, bool inParam, bool isGhost, Expression defaultValue,
+  public Formal(IOrigin origin, string name, Type type, bool inParam, bool isGhost, Expression defaultValue,
+    Attributes attributes = null,
     bool isOld = false, bool isNameOnly = false, bool isOlder = false, string nameForCompilation = null)
-    : base(tok, name, type, isGhost) {
-    Contract.Requires(tok != null);
-    Contract.Requires(name != null);
+    : this(origin, new Name(origin.StartToken, name), type, inParam, isGhost, defaultValue, attributes,
+      isOld, isNameOnly, isOlder, nameForCompilation) {
+  }
+
+  public Formal(IOrigin origin, Name nameNode, Type type, bool inParam, bool isGhost, Expression defaultValue,
+    Attributes attributes = null,
+    bool isOld = false, bool isNameOnly = false, bool isOlder = false, string nameForCompilation = null)
+    : base(origin, nameNode, type, isGhost) {
+    Contract.Requires(origin != null);
+    Contract.Requires(nameNode != null);
     Contract.Requires(type != null);
     Contract.Requires(inParam || defaultValue == null);
-    Contract.Requires(!isNameOnly || (inParam && !name.StartsWith("#")));
+    Contract.Requires(!isNameOnly || (inParam && !nameNode.Value.StartsWith("#")));
     InParam = inParam;
     IsOld = isOld;
     DefaultValue = defaultValue;
+    Attributes = attributes;
     IsNameOnly = isNameOnly;
     IsOlder = isOlder;
-    NameForCompilation = nameForCompilation ?? name;
+    NameForCompilation = nameForCompilation ?? nameNode.Value;
   }
 
-  public bool HasName {
-    get {
-      return !Name.StartsWith("#");
-    }
+  public bool HasName => !Name.StartsWith("#");
+
+  public override string GetOrCreateCompileName(CodeGenIdGenerator generator) {
+    return CompileName;
   }
 
-  private string sanitizedName;
-  public override string SanitizedName =>
-    sanitizedName ??= SanitizeName(Name); // No unique-ification
-  public override string CompileName =>
-    compileName ??= SanitizeName(NameForCompilation);
+  public string CompileName => compileName ??= SanitizeName(NameForCompilation);
 
   public override IEnumerable<INode> Children =>
     (DefaultValue != null ? new List<Node> { DefaultValue } : Enumerable.Empty<Node>()).Concat(base.Children);
@@ -52,9 +59,9 @@ public bool HasName {
 /// of each extreme lemma (for use in the extreme-method body only, not the specification).
 /// </summary>
 public class ImplicitFormal : Formal {
-  public ImplicitFormal(IToken tok, string name, Type type, bool inParam, bool isGhost)
-    : base(tok, name, type, inParam, isGhost, null) {
-    Contract.Requires(tok != null);
+  public ImplicitFormal(IOrigin origin, string name, Type type, bool inParam, bool isGhost)
+    : base(origin, name, type, inParam, isGhost, null, null) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(type != null);
   }
@@ -67,9 +74,9 @@ public ImplicitFormal(IToken tok, string name, Type type, bool inParam, bool isG
 /// implementation.
 /// </summary>
 public class ThisSurrogate : ImplicitFormal {
-  public ThisSurrogate(IToken tok, Type type)
-    : base(tok, "this", type, true, false) {
-    Contract.Requires(tok != null);
+  public ThisSurrogate(IOrigin origin, Type type)
+    : base(origin, "this", type, true, false) {
+    Contract.Requires(origin != null);
     Contract.Requires(type != null);
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Expressions/Variables/IVariable.cs b/Source/DafnyCore/AST/Expressions/Variables/IVariable.cs
index 12f4e4a7bc5..c8f174a0788 100644
--- a/Source/DafnyCore/AST/Expressions/Variables/IVariable.cs
+++ b/Source/DafnyCore/AST/Expressions/Variables/IVariable.cs
@@ -19,14 +19,14 @@ string UniqueName {
   bool HasBeenAssignedUniqueName {  // unique names are not assigned until the Translator; if you don't already know if that stage has run, this boolean method will tell you
     get;
   }
-  static FreshIdGenerator CompileNameIdGenerator = new FreshIdGenerator();
-  string AssignUniqueName(FreshIdGenerator generator);
-  string SanitizedName {
-    get;
-  }
-  string CompileName {
-    get;
-  }
+  string AssignUniqueName(VerificationIdGenerator generator);
+
+  /// <summary>
+  /// A name suitable for compilation, but without the unique identifier.
+  /// Useful to generate readable identifiers in the generated source code.
+  /// </summary>
+  string CompileNameShadowable { get; }
+  string GetOrCreateCompileName(CodeGenIdGenerator generator);
 
   PreType PreType {
     get;
@@ -35,6 +35,13 @@ PreType PreType {
   Type Type {
     get;
   }
+
+  /// <summary>
+  /// For a description of the difference between .Type and .UnnormalizedType, see Expression.UnnormalizedType.
+  /// </summary>
+  Type UnnormalizedType {
+    get;
+  }
   Type OptionalType {
     get;
   }
diff --git a/Source/DafnyCore/AST/Expressions/Variables/IVariableContracts.cs b/Source/DafnyCore/AST/Expressions/Variables/IVariableContracts.cs
index b2bb15930a1..7f803b3b0a1 100644
--- a/Source/DafnyCore/AST/Expressions/Variables/IVariableContracts.cs
+++ b/Source/DafnyCore/AST/Expressions/Variables/IVariableContracts.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Diagnostics.Contracts;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
 [ContractClassFor(typeof(IVariable))]
-public abstract class IVariableContracts : TokenNode, IVariable {
+public abstract class IVariableContracts : NodeWithComputedRange, IVariable {
   public string Name {
     get {
       Contract.Ensures(Contract.Result<string>() != null);
@@ -34,19 +35,28 @@ public bool HasBeenAssignedUniqueName {
       throw new NotImplementedException();  // this getter implementation is here only so that the Ensures contract can be given here
     }
   }
-  public string SanitizedName {
+  public string SanitizedName(CodeGenIdGenerator generator) {
+    Contract.Ensures(Contract.Result<string>() != null);
+    throw new NotImplementedException();  // this getter implementation is here only so that the Ensures contract can be given here
+  }
+
+  public string CompileNameShadowable {
     get {
       Contract.Ensures(Contract.Result<string>() != null);
       throw new NotImplementedException();  // this getter implementation is here only so that the Ensures contract can be given here
     }
   }
-  public string CompileName {
+  public string GetOrCreateCompileName(CodeGenIdGenerator generator) {
+    Contract.Ensures(Contract.Result<string>() != null);
+    throw new NotImplementedException();  // this getter implementation is here only so that the Ensures contract can be given here
+  }
+  public Type Type {
     get {
-      Contract.Ensures(Contract.Result<string>() != null);
+      Contract.Ensures(Contract.Result<Type>() != null);
       throw new NotImplementedException();  // this getter implementation is here only so that the Ensures contract can be given here
     }
   }
-  public Type Type {
+  public Type UnnormalizedType {
     get {
       Contract.Ensures(Contract.Result<Type>() != null);
       throw new NotImplementedException();  // this getter implementation is here only so that the Ensures contract can be given here
@@ -74,13 +84,13 @@ public bool IsGhost {
   public void MakeGhost() {
     throw new NotImplementedException();
   }
-  public string AssignUniqueName(FreshIdGenerator generator) {
+  public string AssignUniqueName(VerificationIdGenerator generator) {
     Contract.Ensures(Contract.Result<string>() != null);
     throw new NotImplementedException();
   }
 
-  public abstract IToken NameToken { get; }
-  public DafnySymbolKind Kind => throw new NotImplementedException();
+  public abstract IOrigin NavigationToken { get; }
+  public SymbolKind? Kind => throw new NotImplementedException();
   public string GetDescription(DafnyOptions options) {
     throw new NotImplementedException();
   }
diff --git a/Source/DafnyCore/AST/Expressions/Variables/IdentifierExpr.cs b/Source/DafnyCore/AST/Expressions/Variables/IdentifierExpr.cs
index 1693a8e3a17..d0294f48f50 100644
--- a/Source/DafnyCore/AST/Expressions/Variables/IdentifierExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Variables/IdentifierExpr.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Dafny;
 
-public class IdentifierExpr : Expression, IHasUsages, ICloneable<IdentifierExpr> {
+public class IdentifierExpr : Expression, IHasReferences, ICloneable<IdentifierExpr> {
   [ContractInvariantMethod]
   void ObjectInvariant() {
     Contract.Invariant(Name != null);
@@ -13,20 +13,20 @@ void ObjectInvariant() {
   public readonly string Name;
   [FilledInDuringResolution] public IVariable Var;
 
-  public string DafnyName => tok.line > 0 ? RangeToken.PrintOriginal() : Name;
+  public string DafnyName => Origin.line > 0 ? Origin.PrintOriginal() : Name;
 
-  public IdentifierExpr(IToken tok, string name)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public IdentifierExpr(IOrigin origin, string name)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Name = name;
   }
   /// <summary>
   /// Constructs a resolved IdentifierExpr.
   /// </summary>
-  public IdentifierExpr(IToken tok, IVariable v)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public IdentifierExpr(IOrigin origin, IVariable v)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(v != null);
     Name = v.Name;
     Var = v;
@@ -52,11 +52,10 @@ public static bool Is(Expression expr, IVariable variable) {
     return expr.Resolved is IdentifierExpr identifierExpr && identifierExpr.Var == variable;
   }
 
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return Enumerable.Repeat(Var, 1);
+  public IEnumerable<Reference> GetReferences() {
+    return Enumerable.Repeat(new Reference(Origin, Var), 1);
   }
 
-  public IToken NameToken => tok;
   public override IEnumerable<INode> Children { get; } = Enumerable.Empty<Node>();
 }
 
@@ -65,14 +64,14 @@ public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
 /// assigning a value to a Method's out parameter.
 /// </summary>
 public class ImplicitIdentifierExpr : IdentifierExpr {
-  public ImplicitIdentifierExpr(IToken tok, string name)
-    : base(tok, name) { }
+  public ImplicitIdentifierExpr(IOrigin origin, string name)
+    : base(origin, name) { }
 
   /// <summary>
   /// Constructs a resolved implicit identifier.
   /// </summary>
-  public ImplicitIdentifierExpr(IToken tok, IVariable v)
-    : base(tok, v) { }
+  public ImplicitIdentifierExpr(IOrigin origin, IVariable v)
+    : base(origin, v) { }
 
   public override bool IsImplicit => true;
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Expressions/Variables/LetExpr.cs b/Source/DafnyCore/AST/Expressions/Variables/LetExpr.cs
index 849d30f43c7..07a83ddb972 100644
--- a/Source/DafnyCore/AST/Expressions/Variables/LetExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Variables/LetExpr.cs
@@ -9,20 +9,20 @@ public class LetExpr : Expression, IAttributeBearingDeclaration, IBoundVarsBeari
   public readonly List<Expression> RHSs;
   public readonly Expression Body;
   public readonly bool Exact;  // Exact==true means a regular let expression; Exact==false means an assign-such-that expression
-  public readonly Attributes Attributes;
-  Attributes IAttributeBearingDeclaration.Attributes => Attributes;
-  [FilledInDuringResolution] public List<ComprehensionExpr.BoundedPool> Constraint_Bounds;  // null for Exact=true and for when expression is in a ghost context
+  public Attributes Attributes { get; set; }
+  string IAttributeBearingDeclaration.WhatKind => "let expression";
+  [FilledInDuringResolution] public List<BoundedPool> Constraint_Bounds;  // null for Exact=true and for when expression is in a ghost context
   // invariant Constraint_Bounds == null || Constraint_Bounds.Count == BoundVars.Count;
   private Expression translationDesugaring;  // filled in during translation, lazily; to be accessed only via Translation.LetDesugaring; always null when Exact==true
-  private Translator lastTranslatorUsed; // avoid clashing desugaring between translators
+  private BoogieGenerator lastBoogieGeneratorUsed; // avoid clashing desugaring between translators
 
-  public void SetTranslationDesugaring(Translator trans, Expression expr) {
-    lastTranslatorUsed = trans;
+  public void SetTranslationDesugaring(BoogieGenerator trans, Expression expr) {
+    lastBoogieGeneratorUsed = trans;
     translationDesugaring = expr;
   }
 
-  public Expression GetTranslationDesugaring(Translator trans) {
-    if (lastTranslatorUsed == trans) {
+  public Expression GetTranslationDesugaring(BoogieGenerator trans) {
+    if (lastBoogieGeneratorUsed == trans) {
       return translationDesugaring;
     } else {
       return null;
@@ -44,8 +44,8 @@ public LetExpr(Cloner cloner, LetExpr original) : base(cloner, original) {
     }
   }
 
-  public LetExpr(IToken tok, List<CasePattern<BoundVar>> lhss, List<Expression> rhss, Expression body, bool exact, Attributes attrs = null)
-    : base(tok) {
+  public LetExpr(IOrigin origin, List<CasePattern<BoundVar>> lhss, List<Expression> rhss, Expression body, bool exact, Attributes attrs = null)
+    : base(origin) {
     LHSs = lhss;
     RHSs = rhss;
     Body = body;
@@ -53,7 +53,7 @@ public LetExpr(IToken tok, List<CasePattern<BoundVar>> lhss, List<Expression> rh
     Attributes = attrs;
   }
 
-  public static LetExpr Havoc(IToken tok, Type type = null) {
+  public static LetExpr Havoc(IOrigin tok, Type type = null) {
     type ??= new InferredTypeProxy();
     var boundVar = new BoundVar(tok, "x", type);
     var casePatterns = new List<CasePattern<BoundVar>>() { new(tok, boundVar) };
@@ -123,8 +123,8 @@ public IEnumerable<BoundVar> BoundVars {
   public IEnumerable<BoundVar> AllBoundVars => BoundVars;
 
   public override IEnumerable<INode> Children =>
-    (Attributes != null ? new List<Node> { Attributes } : Enumerable.Empty<Node>())
-    .Concat(LHSs)
+    Attributes.AsEnumerable().
+      Concat<Node>(LHSs)
     .Concat(base.Children);
 
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
diff --git a/Source/DafnyCore/AST/Expressions/Variables/LetOrFailExpr.cs b/Source/DafnyCore/AST/Expressions/Variables/LetOrFailExpr.cs
index c01fc64e877..a5a9529cd80 100644
--- a/Source/DafnyCore/AST/Expressions/Variables/LetOrFailExpr.cs
+++ b/Source/DafnyCore/AST/Expressions/Variables/LetOrFailExpr.cs
@@ -8,7 +8,7 @@ public class LetOrFailExpr : ConcreteSyntaxExpression, ICloneable<LetOrFailExpr>
   public readonly Expression Rhs;
   public readonly Expression Body;
 
-  public LetOrFailExpr(IToken tok, CasePattern<BoundVar>/*?*/ lhs, Expression rhs, Expression body) : base(tok) {
+  public LetOrFailExpr(IOrigin origin, CasePattern<BoundVar>/*?*/ lhs, Expression rhs, Expression body) : base(origin) {
     Lhs = lhs;
     Rhs = rhs;
     Body = body;
diff --git a/Source/DafnyCore/AST/Expressions/Variables/NonglobalVariable.cs b/Source/DafnyCore/AST/Expressions/Variables/NonglobalVariable.cs
index ac3c520ac28..b4f14067005 100644
--- a/Source/DafnyCore/AST/Expressions/Variables/NonglobalVariable.cs
+++ b/Source/DafnyCore/AST/Expressions/Variables/NonglobalVariable.cs
@@ -1,32 +1,42 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public abstract class NonglobalVariable : TokenNode, IVariable {
-  readonly string name;
+public abstract class NonglobalVariable : NodeWithComputedRange, IVariable {
+  public Name NameNode { get; }
+
+  protected NonglobalVariable(IOrigin origin, Name nameNode, Type type, bool isGhost) : base(origin) {
+    Contract.Requires(origin != null);
+    Contract.Requires(nameNode != null);
+    Contract.Requires(type != null);
+    this.NameNode = nameNode;
+    IsTypeExplicit = type != null;
+    this.type = type ?? new InferredTypeProxy();
+    this.isGhost = isGhost;
+  }
 
   [ContractInvariantMethod]
   void ObjectInvariant() {
-    Contract.Invariant(name != null);
     Contract.Invariant(type != null);
   }
 
   public string Name {
     get {
       Contract.Ensures(Contract.Result<string>() != null);
-      return name;
+      return NameNode.Value;
     }
   }
-  public string DafnyName => RangeToken == null || tok.line == 0 ? Name : RangeToken.PrintOriginal();
+  public string DafnyName => Origin == null || Origin.line == 0 ? Name : Origin.PrintOriginal();
   public string DisplayName =>
     LocalVariable.DisplayNameHelper(this);
 
   private string uniqueName;
   public string UniqueName => uniqueName;
   public bool HasBeenAssignedUniqueName => uniqueName != null;
-  public string AssignUniqueName(FreshIdGenerator generator) {
+  public string AssignUniqueName(VerificationIdGenerator generator) {
     return uniqueName ??= generator.FreshId(Name + "#");
   }
 
@@ -73,16 +83,19 @@ public static string SanitizeName(string nm) {
     }
   }
 
-  private string sanitizedName;
-  public virtual string SanitizedName =>
-    sanitizedName ??= $"_{IVariable.CompileNameIdGenerator.FreshNumericId()}_{SanitizeName(Name)}";
+  private string sanitizedNameShadowable;
+
+  public virtual string CompileNameShadowable =>
+    sanitizedNameShadowable ??= SanitizeName(Name);
 
   protected string compileName;
-  public virtual string CompileName =>
-    compileName ??= SanitizedName;
+
+  public virtual string GetOrCreateCompileName(CodeGenIdGenerator generator) {
+    return compileName ??= $"_{generator.FreshNumericId()}_{CompileNameShadowable}";
+  }
 
   Type type;
-  public bool IsTypeExplicit = false;
+  public bool IsTypeExplicit { get; set; }
   public Type SyntacticType { get { return type; } }  // returns the non-normalized type
   public PreType PreType { get; set; }
 
@@ -92,6 +105,16 @@ public Type Type {
       return type.Normalize();
     }
   }
+
+  /// <summary>
+  /// For a description of the difference between .Type and .UnnormalizedType, see Expression.UnnormalizedType.
+  /// </summary>
+  public Type UnnormalizedType {
+    get {
+      Contract.Ensures(Contract.Result<Type>() != null);
+      return type;
+    }
+  }
   Type IVariable.OptionalType {
     get { return Type; }  // same as Type for NonglobalVariable
   }
@@ -111,20 +134,10 @@ public void MakeGhost() {
     IsGhost = true;
   }
 
-  public NonglobalVariable(IToken tok, string name, Type type, bool isGhost) {
-    Contract.Requires(tok != null);
-    Contract.Requires(name != null);
-    Contract.Requires(type != null);
-    this.tok = tok;
-    this.name = name;
-    this.type = type;
-    this.isGhost = isGhost;
-  }
-
-  public IToken NameToken => tok;
+  public IOrigin NavigationToken => NameNode.Origin;
   public override IEnumerable<INode> Children => IsTypeExplicit ? new List<Node> { Type } : Enumerable.Empty<Node>();
   public override IEnumerable<INode> PreResolveChildren => IsTypeExplicit ? new List<Node>() { Type } : Enumerable.Empty<Node>();
-  public DafnySymbolKind Kind => DafnySymbolKind.Variable;
+  public SymbolKind? Kind => SymbolKind.Variable;
   public string GetDescription(DafnyOptions options) {
     return this.AsText();
   }
diff --git a/Source/DafnyCore/AST/Expressions/Variables/ResolverIdentifierExpr.cs b/Source/DafnyCore/AST/Expressions/Variables/ResolverIdentifierExpr.cs
new file mode 100644
index 00000000000..11de95a29f0
--- /dev/null
+++ b/Source/DafnyCore/AST/Expressions/Variables/ResolverIdentifierExpr.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// This class is used only inside the resolver itself. It gets hung in the AST in uncompleted name segments.
+/// </summary>
+class ResolverIdentifierExpr : Expression, IHasReferences, ICloneable<ResolverIdentifierExpr> {
+  public readonly TopLevelDecl Decl;
+  public readonly List<Type> TypeArgs;
+  [ContractInvariantMethod]
+  void ObjectInvariant() {
+    Contract.Invariant(Decl != null);
+    Contract.Invariant(TypeArgs != null);
+    Contract.Invariant(TypeArgs.Count == Decl.TypeArgs.Count);
+    Contract.Invariant(Type is ResolverTypeModule or ResolverTypeType);
+  }
+
+  public ResolverIdentifierExpr(Cloner cloner, ResolverIdentifierExpr original) : base(cloner, original) {
+    Decl = original.Decl;
+    TypeArgs = original.TypeArgs;
+  }
+
+  public override IEnumerable<INode> Children => TypeArgs.SelectMany(ta => ta.Nodes);
+
+  public abstract class ResolverType : Type {
+    public override bool ComputeMayInvolveReferences(ISet<DatatypeDecl>/*?*/ visitedDatatypes) {
+      return false;
+    }
+    public override Type Subst(IDictionary<TypeParameter, Type> subst) {
+      throw new NotSupportedException();
+    }
+
+    public override Type ReplaceTypeArguments(List<Type> arguments) {
+      throw new NotSupportedException();
+    }
+  }
+  public class ResolverTypeModule : ResolverType {
+    [System.Diagnostics.Contracts.Pure]
+    public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
+      Contract.Assert(parseAble == false);
+      return "#module";
+    }
+    public override bool Equals(Type that, bool keepConstraints = false) {
+      return that.NormalizeExpand(keepConstraints) is ResolverTypeModule;
+    }
+  }
+  public class ResolverTypeType : ResolverType {
+    [System.Diagnostics.Contracts.Pure]
+    public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
+      Contract.Assert(parseAble == false);
+      return "#type";
+    }
+    public override bool Equals(Type that, bool keepConstraints = false) {
+      return that.NormalizeExpand(keepConstraints) is ResolverTypeType;
+    }
+  }
+
+  public ResolverIdentifierExpr(IOrigin origin, TopLevelDecl decl, List<Type> typeArgs)
+    : base(origin) {
+    Contract.Requires(origin != null);
+    Contract.Requires(decl != null);
+    Contract.Requires(typeArgs != null && typeArgs.Count == decl.TypeArgs.Count);
+    Decl = decl;
+    TypeArgs = typeArgs;
+    Type = decl is ModuleDecl ? (Type)new ResolverTypeModule() : new ResolverTypeType();
+    PreType = decl is ModuleDecl ? new PreTypePlaceholderModule() : new PreTypePlaceholderType();
+  }
+  public ResolverIdentifierExpr(IOrigin origin, TypeParameter tp)
+    : this(origin, tp, new List<Type>()) {
+    Contract.Requires(origin != null);
+    Contract.Requires(tp != null);
+  }
+
+  public IEnumerable<Reference> GetReferences() {
+    return new[] { new Reference(Center, Decl) };
+  }
+
+  public ResolverIdentifierExpr Clone(Cloner cloner) {
+    return new ResolverIdentifierExpr(cloner, this);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Expressions/Variables/Resolver_IdentifierExpr.cs b/Source/DafnyCore/AST/Expressions/Variables/Resolver_IdentifierExpr.cs
deleted file mode 100644
index e781b702630..00000000000
--- a/Source/DafnyCore/AST/Expressions/Variables/Resolver_IdentifierExpr.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-
-namespace Microsoft.Dafny;
-
-/// <summary>
-/// This class is used only inside the resolver itself. It gets hung in the AST in uncompleted name segments.
-/// </summary>
-class Resolver_IdentifierExpr : Expression, IHasUsages, ICloneable<Resolver_IdentifierExpr> {
-  public readonly TopLevelDecl Decl;
-  public readonly List<Type> TypeArgs;
-  [ContractInvariantMethod]
-  void ObjectInvariant() {
-    Contract.Invariant(Decl != null);
-    Contract.Invariant(TypeArgs != null);
-    Contract.Invariant(TypeArgs.Count == Decl.TypeArgs.Count);
-    Contract.Invariant(Type is ResolverType_Module || Type is ResolverType_Type);
-  }
-
-  public Resolver_IdentifierExpr(Cloner cloner, Resolver_IdentifierExpr original) : base(cloner, original) {
-    Decl = original.Decl;
-    TypeArgs = original.TypeArgs;
-  }
-
-  public override IEnumerable<INode> Children => TypeArgs.SelectMany(ta => ta.Nodes);
-
-  public abstract class ResolverType : Type {
-    public override bool ComputeMayInvolveReferences(ISet<DatatypeDecl>/*?*/ visitedDatatypes) {
-      return false;
-    }
-    public override Type Subst(IDictionary<TypeParameter, Type> subst) {
-      throw new NotSupportedException();
-    }
-
-    public override Type ReplaceTypeArguments(List<Type> arguments) {
-      throw new NotSupportedException();
-    }
-  }
-  public class ResolverType_Module : ResolverType {
-    [System.Diagnostics.Contracts.Pure]
-    public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
-      Contract.Assert(parseAble == false);
-      return "#module";
-    }
-    public override bool Equals(Type that, bool keepConstraints = false) {
-      return that.NormalizeExpand(keepConstraints) is ResolverType_Module;
-    }
-  }
-  public class ResolverType_Type : ResolverType {
-    [System.Diagnostics.Contracts.Pure]
-    public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
-      Contract.Assert(parseAble == false);
-      return "#type";
-    }
-    public override bool Equals(Type that, bool keepConstraints = false) {
-      return that.NormalizeExpand(keepConstraints) is ResolverType_Type;
-    }
-  }
-
-  public Resolver_IdentifierExpr(IToken tok, TopLevelDecl decl, List<Type> typeArgs)
-    : base(tok) {
-    Contract.Requires(tok != null);
-    Contract.Requires(decl != null);
-    Contract.Requires(typeArgs != null && typeArgs.Count == decl.TypeArgs.Count);
-    Decl = decl;
-    TypeArgs = typeArgs;
-    Type = decl is ModuleDecl ? (Type)new ResolverType_Module() : new ResolverType_Type();
-    PreType = decl is ModuleDecl ? new PreTypePlaceholderModule() : new PreTypePlaceholderType();
-  }
-  public Resolver_IdentifierExpr(IToken tok, TypeParameter tp)
-    : this(tok, tp, new List<Type>()) {
-    Contract.Requires(tok != null);
-    Contract.Requires(tp != null);
-  }
-
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return new[] { Decl };
-  }
-
-  public IToken NameToken => tok;
-  public Resolver_IdentifierExpr Clone(Cloner cloner) {
-    return new Resolver_IdentifierExpr(cloner, this);
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/ExtremeCloner.cs b/Source/DafnyCore/AST/ExtremeCloner.cs
index d4d725e82e3..db247b445dc 100644
--- a/Source/DafnyCore/AST/ExtremeCloner.cs
+++ b/Source/DafnyCore/AST/ExtremeCloner.cs
@@ -17,7 +17,7 @@ protected ExtremeCloner(Expression k, ErrorReporter reporter) {
     Contract.Requires(reporter != null);
     this.k = k;
     this.reporter = reporter;
-    this.suffix = string.Format("#[{0}]", Printer.ExprToString(reporter.Options, k));
+    this.suffix = $"#[{Printer.ExprToString(reporter.Options, k)}]";
   }
   protected Expression CloneCallAndAddK(ApplySuffix e) {
     Contract.Requires(e != null);
@@ -31,19 +31,19 @@ protected Expression CloneCallAndAddK(ApplySuffix e) {
     string name;
     if (e.Lhs is NameSegment ns) {
       name = ns.Name;
-      lhs = new NameSegment(Tok(ns.tok), name + "#", ns.OptTypeArguments?.ConvertAll(CloneType));
+      lhs = new NameSegment(Origin(ns.Origin), name + "#", ns.OptTypeArguments?.ConvertAll(CloneType));
     } else {
       var edn = (ExprDotName)e.Lhs;
       name = edn.SuffixName;
-      lhs = new ExprDotName(Tok(edn.tok), CloneExpr(edn.Lhs), name + "#", edn.OptTypeArguments?.ConvertAll(CloneType));
+      lhs = new ExprDotName(Origin(edn.Origin), CloneExpr(edn.Lhs), new Name(name + "#"), edn.OptTypeArguments?.ConvertAll(CloneType));
     }
     var args = new List<ActualBinding>();
     args.Add(new ActualBinding(null, k));
     foreach (var arg in e.Bindings.ArgumentBindings) {
       args.Add(CloneActualBinding(arg));
     }
-    var apply = new ApplySuffix(Tok(e.tok), e.AtTok == null ? null : Tok(e.AtTok), lhs, args, Tok(e.CloseParen));
-    reporter.Info(MessageSource.Cloner, e.tok, name + suffix);
+    var apply = new ApplySuffix(Origin(e.Origin), e.AtTok == null ? null : Origin(e.AtTok), lhs, args, e.CloseParen);
+    reporter.Info(MessageSource.Cloner, e.Origin, name + suffix);
     return apply;
   }
 
@@ -59,8 +59,20 @@ protected Expression CloneCallAndAddK(FunctionCallExpr e) {
     foreach (var binding in e.Bindings.ArgumentBindings) {
       args.Add(CloneActualBinding(binding));
     }
-    var fexp = new FunctionCallExpr(Tok(e.tok), e.Name + "#", receiver, e.OpenParen, e.CloseParen, args, e.AtLabel);
-    reporter.Info(MessageSource.Cloner, e.tok, e.Name + suffix);
+    var fexp = new FunctionCallExpr(Origin(e.Origin), e.NameNode.Append("#"), receiver, e.OpenParen, e.CloseParen, args, e.AtLabel);
+    reporter.Info(MessageSource.Cloner, e.Origin, e.Name + suffix);
     return fexp;
   }
+
+  protected Expression CloneEqualityAndAddK(BinaryExpr binaryExpr) {
+    if (this.CloneResolvedFields) {
+      throw new NotImplementedException();
+    }
+
+    var eq = new TernaryExpr(Origin(binaryExpr.Origin),
+      binaryExpr.ResolvedOp == BinaryExpr.ResolvedOpcode.EqCommon ? TernaryExpr.Opcode.PrefixEqOp : TernaryExpr.Opcode.PrefixNeqOp,
+      k, CloneExpr(binaryExpr.E0), CloneExpr(binaryExpr.E1));
+    reporter.Info(MessageSource.Cloner, binaryExpr.Origin, "==" + suffix);
+    return eq;
+  }
 }
diff --git a/Source/DafnyCore/AST/ExtremeLemmaBodyCloner.cs b/Source/DafnyCore/AST/ExtremeLemmaBodyCloner.cs
index f71835f6ce2..cd04febe3ad 100644
--- a/Source/DafnyCore/AST/ExtremeLemmaBodyCloner.cs
+++ b/Source/DafnyCore/AST/ExtremeLemmaBodyCloner.cs
@@ -11,42 +11,31 @@ namespace Microsoft.Dafny;
 class ExtremeLemmaBodyCloner : ExtremeCloner {
   readonly ExtremeLemma context;
   readonly ISet<ExtremePredicate> focalPredicates;
-  public ExtremeLemmaBodyCloner(ExtremeLemma context, Expression k, ISet<ExtremePredicate> focalPredicates, ErrorReporter reporter)
+  readonly ISet<CoDatatypeDecl> focalCodatatypeEquality;
+  public ExtremeLemmaBodyCloner(ExtremeLemma context, Expression k,
+    ISet<ExtremePredicate> focalPredicates, ISet<CoDatatypeDecl> focalCodatatypeEquality, ErrorReporter reporter)
     : base(k, reporter) {
     Contract.Requires(context != null);
     Contract.Requires(k != null);
     Contract.Requires(reporter != null);
     this.context = context;
     this.focalPredicates = focalPredicates;
+    this.focalCodatatypeEquality = focalCodatatypeEquality;
   }
 
   public override Expression CloneExpr(Expression expr) {
     if (reporter.Options.RewriteFocalPredicates) {
-      if (expr is FunctionCallExpr) {
-        var e = (FunctionCallExpr)expr;
-#if DEBUG_PRINT
-          if (e.Function.Name.EndsWith("#") && Contract.Exists(focalPredicates, p => e.Function.Name == p.Name + "#")) {
-            Options.Writer.WriteLine("{0}({1},{2}): DEBUG: Possible opportunity to rely on new rewrite: {3}", e.tok.filename, e.tok.line, e.tok.col, Printer.ExprToString(e));
-          }
-#endif
+      if (expr is FunctionCallExpr functionCallExpr) {
         // Note, we don't actually ever get here, because all calls will have been parsed as ApplySuffix.
         // However, if something changes in the future (for example, some rewrite that changing an ApplySuffix
         // to its resolved FunctionCallExpr), then we do want this code, so with the hope of preventing
         // some error in the future, this case is included.  (Of course, it is currently completely untested!)
-        var f = e.Function as ExtremePredicate;
-        if (f != null && focalPredicates.Contains(f)) {
-#if DEBUG_PRINT
-            var r = CloneCallAndAddK(e);
-            Options.Writer.WriteLine("{0}({1},{2}): DEBUG: Rewrote extreme predicate into prefix predicate: {3}", e.tok.filename, e.tok.line, e.tok.col, Printer.ExprToString(r));
-            return r;
-#else
-          return CloneCallAndAddK(e);
-#endif
+        if (functionCallExpr.Function is ExtremePredicate f && focalPredicates.Contains(f)) {
+          return CloneCallAndAddK(functionCallExpr);
         }
       } else if (expr is StaticReceiverExpr ee) {
-        return new StaticReceiverExpr(Tok(ee.tok), ee.Type, ee.IsImplicit);
-      } else if (expr is ApplySuffix) {
-        var apply = (ApplySuffix)expr;
+        return new StaticReceiverExpr(Origin(ee.Origin), ee.Type, ee.IsImplicit);
+      } else if (expr is ApplySuffix apply) {
         if (!apply.WasResolved()) {
           // Since we're assuming the enclosing statement to have been resolved, this ApplySuffix must
           // be part of an ExprRhs that actually designates a method call.  Such an ApplySuffix does
@@ -54,56 +43,46 @@ public override Expression CloneExpr(Expression expr) {
           var mse = (MemberSelectExpr)apply.Lhs.Resolved;
           Contract.Assume(mse.Member is Method);
         } else {
-          var fce = apply.Resolved as FunctionCallExpr;
-          if (fce != null) {
-#if DEBUG_PRINT
-              if (fce.Function.Name.EndsWith("#") && Contract.Exists(focalPredicates, p => fce.Function.Name == p.Name + "#")) {
-                Options.Writer.WriteLine("{0}({1},{2}): DEBUG: Possible opportunity to rely on new rewrite: {3}", fce.tok.filename, fce.tok.line, fce.tok.col, Printer.ExprToString(fce));
-              }
-#endif
-            var f = fce.Function as ExtremePredicate;
-            if (f != null && focalPredicates.Contains(f)) {
-#if DEBUG_PRINT
-                var r = CloneCallAndAddK(fce);
-                Options.Writer.WriteLine("{0}({1},{2}): DEBUG: Rewrote extreme predicate into prefix predicate: {3}", fce.tok.filename, fce.tok.line, fce.tok.col, Printer.ExprToString(r));
-                return r;
-#else
+          if (apply.Resolved is FunctionCallExpr fce) {
+            if (fce.Function is ExtremePredicate f && focalPredicates.Contains(f)) {
               return CloneCallAndAddK(fce);
-#endif
             }
           }
         }
+      } else if (expr is BinaryExpr { ResolvedOp: BinaryExpr.ResolvedOpcode.EqCommon or BinaryExpr.ResolvedOpcode.NeqCommon } binaryExpr) {
+        if (binaryExpr.E0.Type.AsCoDatatype is { } coDatatypeDecl && focalCodatatypeEquality.Contains(coDatatypeDecl)) {
+          return CloneEqualityAndAddK(binaryExpr);
+        }
       }
     }
     return base.CloneExpr(expr);
   }
   public override AssignmentRhs CloneRHS(AssignmentRhs rhs) {
-    var r = rhs as ExprRhs;
-    if (r != null && r.Expr is ApplySuffix) {
-      var apply = (ApplySuffix)r.Expr;
-      var mse = apply.Lhs.Resolved as MemberSelectExpr;
-      if (mse != null && mse.Member is ExtremeLemma && ModuleDefinition.InSameSCC(context, (ExtremeLemma)mse.Member)) {
+    if (rhs is ExprRhs { Expr: ApplySuffix apply }) {
+      if (apply.Lhs.Resolved is MemberSelectExpr { Member: ExtremeLemma extremeLemma } && ModuleDefinition.InSameSCC(context, extremeLemma)) {
         // we're looking at a recursive call to an extreme lemma
-        Contract.Assert(apply.Lhs is NameSegment || apply.Lhs is ExprDotName);  // this is the only way a call statement can have been parsed
+        Contract.Assert(apply.Lhs is NameSegment or ExprDotName); // this is the only way a call statement can have been parsed
         // clone "apply.Lhs", changing the least/greatest lemma to the prefix lemma; then clone "apply", adding in the extra argument
         Expression lhsClone;
         if (apply.Lhs is NameSegment) {
           var lhs = (NameSegment)apply.Lhs;
-          lhsClone = new NameSegment(Tok(lhs.tok), lhs.Name + "#", lhs.OptTypeArguments == null ? null : lhs.OptTypeArguments.ConvertAll(CloneType));
+          lhsClone = new NameSegment(Origin(lhs.Origin), lhs.Name + "#", lhs.OptTypeArguments?.ConvertAll(CloneType));
         } else {
           var lhs = (ExprDotName)apply.Lhs;
-          lhsClone = new ExprDotName(Tok(lhs.tok), CloneExpr(lhs.Lhs), lhs.SuffixName + "#", lhs.OptTypeArguments == null ? null : lhs.OptTypeArguments.ConvertAll(CloneType));
+          lhsClone = new ExprDotName(Origin(lhs.Origin), CloneExpr(lhs.Lhs), lhs.SuffixNameNode.Append("#"), lhs.OptTypeArguments?.ConvertAll(CloneType));
         }
+
         var args = new List<ActualBinding>();
         args.Add(new ActualBinding(null, k));
         apply.Bindings.ArgumentBindings.ForEach(arg => args.Add(CloneActualBinding(arg)));
-        var applyClone = new ApplySuffix(Tok(apply.tok), apply.AtTok == null ? null : Tok(apply.AtTok),
-          lhsClone, args, Tok(apply.CloseParen));
+        var applyClone = new ApplySuffix(Origin(apply.Origin), apply.AtTok == null ? null : Origin(apply.AtTok),
+          lhsClone, args, apply.CloseParen);
         var c = new ExprRhs(applyClone, CloneAttributes(rhs.Attributes));
-        reporter.Info(MessageSource.Cloner, apply.Lhs.tok, mse.Member.Name + suffix);
+        reporter.Info(MessageSource.Cloner, apply.Lhs.Origin, extremeLemma.Name + suffix);
         return c;
       }
     }
+
     return base.CloneRHS(rhs);
   }
 }
diff --git a/Source/DafnyCore/AST/ExtremeLemmaSpecificationSubstituter.cs b/Source/DafnyCore/AST/ExtremeLemmaSpecificationSubstituter.cs
index 0ffa7e0b7aa..ced594ebff9 100644
--- a/Source/DafnyCore/AST/ExtremeLemmaSpecificationSubstituter.cs
+++ b/Source/DafnyCore/AST/ExtremeLemmaSpecificationSubstituter.cs
@@ -53,9 +53,9 @@ public override Expression CloneExpr(Expression expr) {
         var op = e.ResolvedOp == BinaryExpr.ResolvedOpcode.EqCommon ? TernaryExpr.Opcode.PrefixEqOp : TernaryExpr.Opcode.PrefixNeqOp;
         var A = CloneExpr(e.E0);
         var B = CloneExpr(e.E1);
-        var teq = new TernaryExpr(Tok(e.tok), op, k, A, B);
+        var teq = new TernaryExpr(Origin(e.Origin), op, k, A, B);
         var opString = op == TernaryExpr.Opcode.PrefixEqOp ? "==" : "!=";
-        reporter.Info(MessageSource.Cloner, e.tok, opString + suffix);
+        reporter.Info(MessageSource.Cloner, e.Origin, opString + suffix);
         return teq;
       }
     }
@@ -66,7 +66,7 @@ public override Type CloneType(Type t) {
       var tt = (UserDefinedType)t;
       // We want syntactic cloning of the Expression that is tt.NamePath, unlike the semantic (that is, post-resolved)
       // cloning that CloneExpr is doing above.
-      return new UserDefinedType(Tok(tt.tok), CloneNamePathExpression(tt.NamePath));
+      return new UserDefinedType(Origin(tt.Origin), CloneNamePathExpression(tt.NamePath));
     } else {
       return base.CloneType(t);
     }
@@ -78,7 +78,7 @@ Expression CloneNamePathExpression(Expression expr) {
       return new NameSegment(this, e);
     } else {
       var e = (ExprDotName)expr;
-      return new ExprDotName(Tok(e.tok), CloneNamePathExpression(e.Lhs), e.SuffixName, e.OptTypeArguments == null ? null : e.OptTypeArguments.ConvertAll(CloneType));
+      return new ExprDotName(Origin(e.Origin), CloneNamePathExpression(e.Lhs), e.SuffixNameNode, e.OptTypeArguments == null ? null : e.OptTypeArguments.ConvertAll(CloneType));
     }
   }
 }
diff --git a/Source/DafnyCore/AST/Formatting.dfy b/Source/DafnyCore/AST/Formatting.dfy
index 0cabc68c628..283c9156da5 100644
--- a/Source/DafnyCore/AST/Formatting.dfy
+++ b/Source/DafnyCore/AST/Formatting.dfy
@@ -9,36 +9,37 @@ include "System.dfy"
 include "DafnyInterface.dfy"
 
 // Provided new Dafny code (trait Microsoft.Dafny.Formatting.IIndentationFormatter)
-module {:extern "Microsoft"} {:options "-functionSyntax:4"}  Microsoft {
+@Options("-functionSyntax:4")
+module {:extern "Microsoft"} Microsoft {
   module {:extern "Dafny"} Dafny {
     module {:extern "Formatting"} Formatting {
       import opened MicrosoftDafny
       import opened System
 
-      const {:extern "System", "String.Empty"} CsStringEmpty: CsString;
+      const {:extern "System", "String.Empty"} CsStringEmpty: CsString
 
       trait IIndentationFormatter {
         // Given the current indentation at this point
         // returns the leading trivia but with its indentation corrected.
-        function GetNewLeadingTrivia(token: IToken): CsString
+        function GetNewLeadingTrivia(token: Token): CsString
 
         // Given the current indentation at this point
         // returns the trailing trivia but with its indentation corrected.
-        function GetNewTrailingTrivia(token: IToken): CsString
+        function GetNewTrailingTrivia(token: Token): CsString
       }
 
       lemma IsAllocated<T>(x: T)
         ensures allocated(x) {
       }
 
-      /** Prints the entire program while fixing identation, based on
+      /** Prints the entire program while fixing indentation, based on
           1) indentation information provided by the IIndentationFormatter reindent
           2) Reindentation algorithm provided by the same reindent */
-      method ReindentProgramFromFirstToken(firstToken: IToken, reindent: IIndentationFormatter) returns (s: CsString)
+      method ReindentProgramFromFirstToken(firstToken: Token, reindent: IIndentationFormatter) returns (s: CsString)
         requires firstToken.Valid()
-        ensures forall token <- firstToken.allTokens :: s.Contains(token.val)
+        ensures forall token: Token <- firstToken.allTokens :: s.Contains(token.val)
       {
-        var token: IToken? := firstToken;
+        var token: Token? := firstToken;
         var sb := new CsStringBuilder();
         ghost var i := 0;
         var allTokens := firstToken.allTokens;
@@ -49,7 +50,7 @@ module {:extern "Microsoft"} {:options "-functionSyntax:4"}  Microsoft {
                     && token.Valid()
                     && i < |allTokens|
                     && token == allTokens[i]
-          invariant forall t <- allTokens[0..i] :: sb.built.Contains(t.val)
+          invariant forall t: Token <- allTokens[0..i] :: sb.built.Contains(t.val)
         {
           if(token.Next == null) {
             firstToken.TokenNextIsNullImpliesLastToken(token, i);
@@ -65,7 +66,7 @@ module {:extern "Microsoft"} {:options "-functionSyntax:4"}  Microsoft {
           sb.Append(token.val);
           sb.Append(newTrailingTrivia);
           ContainsTransitive();
-          assert {:split_here} forall t <- allTokens[0..i+1] :: sb.built.Contains(t.val);
+          assert {:split_here} forall t: Token <- allTokens[0..i+1] :: sb.built.Contains(t.val);
           token := token.Next;
           i := i + 1;
         }
diff --git a/Source/DafnyCore/AST/Grammar/IFileSystem.cs b/Source/DafnyCore/AST/Grammar/IFileSystem.cs
index 5af553b872d..8f078e965c0 100644
--- a/Source/DafnyCore/AST/Grammar/IFileSystem.cs
+++ b/Source/DafnyCore/AST/Grammar/IFileSystem.cs
@@ -1,24 +1,56 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using DafnyCore.Options;
+using Microsoft.Dafny.LanguageServer.Workspace;
 using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
 
 namespace Microsoft.Dafny;
 
+public record FileSnapshot(TextReader Reader, int? Version);
+
 public interface IFileSystem {
-  TextReader ReadFile(Uri uri);
+  FileSnapshot ReadFile(Uri uri);
 
   public bool Exists(Uri path);
   DirectoryInfoBase GetDirectoryInfoBase(string root);
 }
 
+public class InMemoryFileSystem : IFileSystem {
+  private readonly IReadOnlyDictionary<Uri, string> files;
+
+  public InMemoryFileSystem(IReadOnlyDictionary<Uri, string> files) {
+    this.files = files;
+  }
+
+  public FileSnapshot ReadFile(Uri uri) {
+    if (files.TryGetValue(uri, out var entry)) {
+      return new FileSnapshot(new StringReader(entry), null);
+    }
+
+    return OnDiskFileSystem.Instance.ReadFile(uri);
+  }
+
+  public bool Exists(Uri path) {
+    return files.ContainsKey(path) || OnDiskFileSystem.Instance.Exists(path);
+  }
+
+  public DirectoryInfoBase GetDirectoryInfoBase(string root) {
+    var inMemoryFiles = files.Keys.Select(openFileUri => openFileUri.LocalPath);
+    var inMemory = new InMemoryDirectoryInfoFromDotNet8(root, inMemoryFiles);
+    return new CombinedDirectoryInfo(new[] { inMemory, OnDiskFileSystem.Instance.GetDirectoryInfoBase(root) });
+  }
+}
+
 public class OnDiskFileSystem : IFileSystem {
   public static readonly IFileSystem Instance = new OnDiskFileSystem();
 
   private OnDiskFileSystem() {
   }
 
-  public TextReader ReadFile(Uri uri) {
-    return new StreamReader(uri.LocalPath);
+  public FileSnapshot ReadFile(Uri uri) {
+    return new FileSnapshot(new StreamReader(uri.LocalPath), null);
   }
 
   public bool Exists(Uri path) {
diff --git a/Source/DafnyCore/AST/Grammar/IndentationFormatter.cs b/Source/DafnyCore/AST/Grammar/IndentationFormatter.cs
index 0256db2fb27..7f98214ac91 100644
--- a/Source/DafnyCore/AST/Grammar/IndentationFormatter.cs
+++ b/Source/DafnyCore/AST/Grammar/IndentationFormatter.cs
@@ -23,11 +23,15 @@ public IndentationFormatter(TokenNewIndentCollector formatter) {
   /// Creates an IndentationFormatter for the given program,
   /// by immediately processing all nodes and assigning indentations to most structural tokens 
   /// </summary>
-  public static IndentationFormatter ForProgram(Program program, bool reduceBlockiness = true) {
-    var tokenNewIndentCollector = new TokenNewIndentCollector(program) {
+  public static IndentationFormatter ForProgram(Program program, Uri fileToFormat, bool reduceBlockiness = true) {
+    var tokenNewIndentCollector = new TokenNewIndentCollector(program, fileToFormat) {
       ReduceBlockiness = reduceBlockiness
     };
     foreach (var child in program.DefaultModuleDef.PreResolveChildren) {
+      var isPhysicalToken = child.Origin.line != 0;
+      if (isPhysicalToken && child.Origin.Uri != fileToFormat) {
+        continue;
+      }
       if (child is TopLevelDecl topLevelDecl) {
         tokenNewIndentCollector.SetDeclIndentation(topLevelDecl, 0);
       } else if (child is Include include) {
@@ -43,11 +47,11 @@ public static IndentationFormatter ForProgram(Program program, bool reduceBlocki
 
   #region Override for implementing IIndentationFormatter
 
-  public string GetNewLeadingTrivia(IToken token) {
+  public string GetNewLeadingTrivia(Token token) {
     return GetNewTrivia(token, false);
   }
 
-  public string GetNewTrailingTrivia(IToken token) {
+  public string GetNewTrailingTrivia(Token token) {
     return GetNewTrivia(token, true);
   }
 
@@ -144,7 +148,7 @@ public string GetNewTrailingTrivia(IToken token) {
   ///   // One last word
   /// }
   /// ```
-  public string GetNewTrivia(IToken token, bool trailingTrivia) {
+  public string GetNewTrivia(Token token, bool trailingTrivia) {
     var precededByNewline = token.Prev != null && !trailingTrivia && TriviaFormatterHelper.EndsWithNewline(token.Prev.TrailingTrivia);
     if (token.val == "") {
       return trailingTrivia ? token.TrailingTrivia : token.LeadingTrivia;
@@ -225,7 +229,7 @@ public string GetNewTrivia(IToken token, bool trailingTrivia) {
     });
   }
 
-  private string ReIndentMultilineComment(IToken token, string capturedComment, int currentIndent,
+  private string ReIndentMultilineComment(IOrigin token, string capturedComment, int currentIndent,
     string indentationBefore, bool precededByNewline, out bool previousMatchWasSingleLineCommentToAlign) {
     var doubleStar = capturedComment.StartsWith("/**") && !capturedComment.StartsWith("/***");
 
@@ -293,7 +297,7 @@ private string ReIndentMultilineComment(IToken token, string capturedComment, in
     return Whitespace(currentIndent + relativeIndent - initialRelativeIndent) + result;
   }
 
-  private string ReIndentSingleLineComment(IToken token, string capturedComment, int originalCommentIndent,
+  private string ReIndentSingleLineComment(Token token, string capturedComment, int originalCommentIndent,
     int currentIndent, int newCommentIndent, Group caseCommented, ref bool previousMatchWasSingleLineCommentToAlign,
     ref string indentationBefore) {
     if (capturedComment.StartsWith("///") && !capturedComment.StartsWith("////")) {
diff --git a/Source/DafnyCore/AST/Grammar/ParseErrors.cs b/Source/DafnyCore/AST/Grammar/ParseErrors.cs
index 6cb251de182..bc318beb0b3 100644
--- a/Source/DafnyCore/AST/Grammar/ParseErrors.cs
+++ b/Source/DafnyCore/AST/Grammar/ParseErrors.cs
@@ -11,6 +11,7 @@ public class ParseErrors {
   public enum ErrorId {
     // ReSharper disable once InconsistentNaming
     none,
+    p_extra_attributes,
     p_duplicate_modifier,
     p_abstract_not_allowed,
     p_no_ghost_for_by_method,
@@ -95,6 +96,7 @@ public enum ErrorId {
     p_no_decreases_expressions_with_star,
     p_assert_needs_by_or_semicolon,
     p_deprecated_forall_with_no_bound_variables,
+    p_deprecated_forall_statement_with_parentheses_around_bound_variables,
     p_forall_with_ensures_must_have_body,
     p_deprecated_modify_statement_with_block,
     p_calc_operator_must_be_transitive,
@@ -137,26 +139,39 @@ public enum ErrorId {
     p_deprecated_statement_refinement,
     p_internal_exception,
     p_file_has_no_code,
-    p_general_traits_beta,
+    p_general_traits_datatype,
+    p_general_traits_full,
+    p_decreases_without_to,
+    p_binding_in_decreases_to,
+    p_ghost_in_decreases_to,
   }
 
   static ParseErrors() {
-
+    Add(ErrorId.p_extra_attributes,
+      @"
+@-attributes are not supported here".TrimStart(), Remove(true, "Remove this @-attribute"));
     Add(ErrorId.p_duplicate_modifier,
       @"
 No Dafny modifier, such as [`abstract`, `static`, `ghost`](https://dafny.org/latest/DafnyRef/DafnyRef#sec-declaration-modifiers) may be repeated
 Such repetition would be superfluous even if allowed.
-", Remove(true, "remove duplicate modifier"));
+".TrimStart(), Remove(true, "remove duplicate modifier"));
 
     Add(ErrorId.p_abstract_not_allowed,
     @"
 Only modules may be declared abstract.
-", Remove(true));
+".TrimStart(), Remove(true));
 
-    Add(ErrorId.p_general_traits_beta,
+    Add(ErrorId.p_general_traits_datatype,
       @"
-Use of traits as non-reference types is a beta feature. To engage, use /generalTraits:1.
-", Remove(true));
+A newtype extending a trait is not generally supported. The option --general-traits=full causes
+Dafny to allow them in the input, but is not recommended.
+".TrimStart(), Remove(true));
+
+    Add(ErrorId.p_general_traits_full,
+      @"
+Use of traits as non-reference types is supported, but is not yet the default. Until it becomes the
+default, use --general--traits=datatype to enable it.
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_no_ghost_for_by_method,
     @"
@@ -165,7 +180,7 @@ Functions with a [by method](https://dafny.org/latest/DafnyRef/DafnyRef#sec-func
 in ghost contexts the function body is used and in compiled contexts
 the by-method body is used. The `ghost` keyword is not permitted on the
 declaration.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_ghost_forbidden_default_3,
     @"
@@ -175,7 +190,7 @@ the by-method body is used. The `ghost` keyword is not permitted on the
 `function` means a non-ghost function. 
 See the discussion [here](https://dafny.org/latest/DafnyRef/DafnyRef#sec-function-syntax) for
 a discussion of options to control this feature.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_ghost_forbidden_default,
     @"
@@ -185,37 +200,37 @@ a discussion of options to control this feature.
 `function` means a non-ghost function. 
 See the discussion [here](https://dafny.org/latest/DafnyRef/DafnyRef#sec-function-syntax) for
 a discussion of options to control this feature.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_ghost_forbidden,
     @"
 Only some kinds of declarations can be declared `ghost`, most often functions,
 fields, and local declarations.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_no_static,
     @"
 Only some kinds of declarations can be declared 'static', most often
 fields, constants, methods, and functions, and only within classes.
 Modules and the declarations within them are already always static.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_no_opaque,
     @"
 Only some kinds of declarations can be declared 'opaque':
 const fields and the various kinds of functions.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     // TODO - not used at present
     Add(ErrorId.p_deprecated_attribute,
     @"
 This attribute is obsolete and unmaintained. It will be removed from dafny in the future.
-", Remove(true, "remove attribute"));
+".TrimStart(), Remove(true, "remove attribute"));
 
     Add(ErrorId.p_literal_string_required,
     @"
 The value of an options attribute cannot be a computed expression. It must be a literal string.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("enclose in quotes", range, "\"" + range.PrintOriginal() + "\"")
 });
 
@@ -226,7 +241,7 @@ The value of an options attribute cannot be a computed expression. It must be a
 such identifiers are reserved for internal use.
 In match statements and expressions, an identifier
 that is a single underscore is used as a wild-card match.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("remove underscore", range, range.PrintOriginal().Substring(1))
   });
 
@@ -236,7 +251,7 @@ that is a single underscore is used as a wild-card match.
 such identifiers are reserved for internal use.
 In match statements and expressions, an identifier
 that is a single underscore is used as a wild-card match.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("remove underscore", range, range.PrintOriginal().Substring(1))
   });
 
@@ -245,7 +260,7 @@ that is a single underscore is used as a wild-card match.
 A bitvector type name is the characters 'bv' followed by a non-negative
 integer literal. However, dafny only supports widths up to the largest
 signed 32-bit integer (2147483647).
-");
+".TrimStart());
 
     Add(ErrorId.p_array_dimension_too_large,
     @"
@@ -254,21 +269,21 @@ A multi-dimensional array type name is the characters 'array' followed by
 dimensions up to the largest signed 32-bit integer (2147483647).
 In practice (as of v3.9.1) dimensions of more than a few can take 
 overly long to resolve ([Issue #3180](https://github.com/dafny-lang/dafny/issues/3180)).
-");
+".TrimStart());
 
     Add(ErrorId.p_superfluous_export,
 @"
 Although all top-level declarations are contained in an implicit top-level module, there is no syntax to import that module.
 Such an import would likely cause a circular module dependency error.
 If the implicit module cannot be imported, there is no point to any export declarations inside the implicit module.
-", Remove(false, "remove export declaration"));
+".TrimStart(), Remove(false, "remove export declaration"));
 
     Add(ErrorId.p_bad_module_decl,
     @"
 The [syntax for a module declaration](https://dafny.org/latest/DafnyRef/DafnyRef#sec-modules) is either `module M { ... }` or
 `module M refines N { ... }` with optional attributes after the `module` keyword.
 This error message often occurs if the `refines` keyword is misspelled.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("replace '" + range.PrintOriginal() + "' with 'refines'", range, "refines"),
     OneAction("remove '" + range.PrintOriginal() + "'", range, "", true)
   });
@@ -280,7 +295,7 @@ it can be either the name of the export set or associated with the `predicate` d
 The parser associates it with the `export`. To avoid this warning, do not put the
 `least` or `greatest` token on the same line as the `predicate` token.
 If you intend for the `least` to go with the predicate, change the order of the declarations.
-"); // TODO - could use a quick fix
+".TrimStart()); // TODO - could use a quick fix
 
     Add(ErrorId.p_extraneous_comma_in_export,
     @"
@@ -288,50 +303,50 @@ it can be either the name of the export set or associated with the `predicate` d
 a comma-separated list of identifiers, but the clauses themselves are not separated by any delimiter.
 So in the example above, the comma after `a` is wrong in each export declaration. 
 This mistake is easy to make when the clauses are on the same line.
-", Remove(false, "remove comma"));
+".TrimStart(), Remove(false, "remove comma"));
 
     Add(ErrorId.p_top_level_field,
     @"
 `var` declarations are used to declare mutable fields of classes, local variables in method bodies, and identifiers in let-expressions.
 But mutable field declarations are not permitted at the static module level, including in the (implicit) toplevel module.
 Rather, you may want the declaration to be a `const` declaration or you may want the mutable field to be declared in the body of a class.
-", Replace("const"));
+".TrimStart(), Replace("const"));
 
     Add(ErrorId.p_bad_datatype_refinement, // TODO - add a code action
     @"
 There are limitations on refining a datatype, namely that the set of constructors cannot be changed.
 It is only allowed to add members to the body of the datatype.
-");
+".TrimStart());
 
     Add(ErrorId.p_module_level_function_always_static,
     @"
 All names declared in a module (outside a class-like entity) are implicitly `static`.
 Dafny does not allow them to be explictly, redundantly, declared `static`.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_module_level_method_always_static,
     @"
 All names declared in a module (outside a class-like entity) are implicitly `static`.
 Dafny does not allow them to be explictly, redundantly, declared `static`.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_const_decl_missing_identifier,
     @"
 This error arises from a truncated declarations of a const field, namely just a const keyword.
 To correct the error, add an identifier and either or both a type and initializing expression (or remove the const keyword).
-");
+".TrimStart());
 
     Add(ErrorId.p_module_level_const_always_static,
     @"
 All names declared in a module (outside a class-like entity) are implicitly `static`.
 Dafny does not allow them to be explictly, redundantly, declared `static`.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_bad_const_initialize_op,
     @"
 Dafny's syntax for initialization of const fields uses `:=`, not `=`.
 In Dafny, `=` is used only in type definitions.
-", Replace(":="));
+".TrimStart(), Replace(":="));
 
     Add(ErrorId.p_const_is_missing_type_or_init,
     @"
@@ -339,40 +354,40 @@ All names declared in a module (outside a class-like entity) are implicitly `sta
 or a right-hand-side expression, whose type is then the type of the 
 declared identifier. 
 So use syntax either like `const i: int` or `const i := 5` (or both together).
-", InsertAfter(": int := 42", "add example"));
+".TrimStart(), InsertAfter(": int := 42", "add example"));
 
     Add(ErrorId.p_misplaced_ellipsis_in_newtype,
     @"
 There are limitations on refining a newtype, namely that the base type cannot be changed. You can change an abstract type into a newtype, however.
 When refining a newtype by adding a body, the ... stands in place of both the '=' and the base type.
-"); // TODO - add an action
+".TrimStart()); // TODO - add an action
 
     Add(ErrorId.p_output_of_function_not_ghost,
     @"
 The output of a predicate or function cannot be ghost.
 It is implicitly ghost if the function is ghost itself.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_no_new_on_output_formals,
     @"
 The `new` modifier only applies to input parameters.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_no_nameonly_on_output_formals,
     @"
 The `nameonly` modifier only applies to input parameters.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_no_older_on_output_formals,
     @"
 The `older` modifier only applies to input parameters.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_var_decl_must_have_type,
     @"
 Because a mutable field does not have initializer, it must have a type (as in `var f: int`).
 `const` declarations may have initializers; if they do they do not need an explicit type.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("insert ': bool'", range, range.PrintOriginal() + ": bool"),
     OneAction("insert ': int'", range, range.PrintOriginal() + ": int")
   });
@@ -381,7 +396,7 @@ The output of a predicate or function cannot be ghost.
     @"
 Dafny does not allow field declarations to have initializers. They are initialized in constructors.
 Local variable declarations (which also begin with `var`) may have initializers.
-", Remove(false, "remove := and expression"));
+".TrimStart(), Remove(false, "remove := and expression"));
     // TODO - when there is capability to find constructors, enhance this with a code action that moves the initialization to the constructor
 
     Add(ErrorId.p_datatype_formal_is_not_id,
@@ -390,7 +405,7 @@ Local variable declarations (which also begin with `var`) may have initializers.
 In datatype constructors the 'name :' is optional; one can just state the type.
 However, if there is a name, it may not be a typename.
 The formal parameter name should be a simple identifier that is not a reserved word.
-", Replace("_"));
+".TrimStart(), Replace("_"));
 
     Add(ErrorId.p_nameonly_must_have_parameter_name,
     @"
@@ -399,7 +414,7 @@ The formal parameter name should be a simple identifier that is not a reserved w
 then the name must be given, as in `datatype D = D (i: int, nameonly j: int) {}`
 
 More detail is given [here](https://dafny.org/latest/DafnyRef/DafnyRef#sec-parameter-bindings).
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("remove 'nameonly'", range, "", true),
     OneAction("insert '_:'", range, range.PrintOriginal() + " _:")
   });
@@ -411,21 +426,21 @@ its control flow produces (yields) a value, but the execution continues from tha
 To accentuate this difference, a `yield` statement is used to say when the next value of the iterator is ready, rather than a `return` statement.
 In addition, the declaration does not use `returns` to state the out-parameter, as a method would. Rather it has a `yields` clause.
 The example above is a valid example if `returns` is replaced by `yields`.
-", Replace("yields"));
+".TrimStart(), Replace("yields"));
 
     Add(ErrorId.p_type_parameter_variance_forbidden,
     @"
 [Type-parameter variance](https://dafny.org/latest/DafnyRef/DafnyRef#sec-type-parameter-variance) is specified by a 
 `+`, `-`, `*` or `!` before the type-parameter name.
 Such designations are allowed in generic type declarations but not in generic method, function, or predicate declarations.
-", Remove(false, "remove type parameter variance"));
+".TrimStart(), Remove(false, "remove type parameter variance"));
 
     Add(ErrorId.p_unexpected_type_characteristic,
     @"
 [Type characteristics](https://dafny.org/latest/DafnyRef/DafnyRef#sec-type-parameters), 
 indicated in parentheses after the type name, state properties of the otherwise uninterpreted or abstract type.
 The currently defined type characteristics are designated by `==` (equality-supporting), `0` (auto-initializable), `00` (non-empty), and `!new` (non-reference).
-", Replacements(new[] {
+".TrimStart(), Replacements(new[] {
       ("==", "replace with '==' - this type supports equality"),
       ("0", "replace with '0' - this type is auto-initializable"),
       ("00", "replace with '00' - this type is nonempty"),
@@ -439,10 +454,10 @@ state properties of the otherwise uninterpreted or abstract type.
 They are given in a parentheses-enclosed, comma-separated list after the type name.
 The currently defined type characteristics are designated by `==` (equality - supporting),
 `0` (auto - initializable), `00` (non - empty), and `!new` (non - reference).
-", range =>
+".TrimStart(), range =>
     range.Prev.val == "," ?
       new List<DafnyAction> {
-      OneAction("remove comma", range.Prev.ToRange(), ""),
+      OneAction("remove comma", range.Prev, ""),
       OneAction("insert '=='", range, "==" + range.PrintOriginal()),
       OneAction("insert '0'", range, "0" + range.PrintOriginal()),
       OneAction("insert '00'", range, "00" + range.PrintOriginal()),
@@ -461,7 +476,7 @@ [Type characteristics](https://dafny.org/latest/DafnyRef/DafnyRef#sec-type-param
 The currently defined type characteristics are designated by `==` (equality - supporting),
 `0` (auto - initializable), `00` (non - empty), and `!new` (non - reference).
 Type characteristics are given in a parentheses-enclosed, comma-separated list after the type name.
-", Replacements(new[] {
+".TrimStart(), Replacements(new[] {
       ("==", "replace with '==' - this type supports equality"),
       ("0", "replace with '0' - this type is auto-initializable"),
       ("00", "replace with '00' - this type is nonempty"),
@@ -471,26 +486,26 @@ [Type characteristics](https://dafny.org/latest/DafnyRef/DafnyRef#sec-type-param
     Add(ErrorId.p_deprecated_colemma,
     @"
 The adjectives `least` and `greatest` for lemmas and functions are more consistent with the nomenclature for coinduction.
-", Replace("greatest lemma"));
+".TrimStart(), Replace("greatest lemma"));
 
     Add(ErrorId.p_deprecated_inductive_lemma,
   @"
 The adjectives `least` and `greatest` for lemmas and functions are more consistent with the nomenclature for coinduction.
-", Replace("least"));
+".TrimStart(), Replace("least"));
 
     Add(ErrorId.p_constructor_not_in_class,
     @"
 Constructors are methods that initialize class instances. That is, when a new instance of a class is being created, 
 using the `new` object syntax, some constructor of the class is called, perhaps a default anonymous one.
 So, constructor declarations only make sense within classes.
-", Replace("method"));
+".TrimStart(), Replace("method"));
 
     Add(ErrorId.p_method_missing_name,
     @"
 A method declaration always requires an identifier between the `method` keyword and the `(` that starts the formal parameter list.
 This is the case even when, as in the example above, a name is specified using `:extern`. The extern name is only used in the
 compiled code; it is not the name used to refer to the method in Dafny code
-", InsertBefore("M"));
+".TrimStart(), InsertBefore("M"));
 
     Add(ErrorId.p_extraneous_k,
     @"
@@ -498,7 +513,7 @@ Least and greatest lemmas and predicates have a special parameter named `k`.
 Its type is specified in square brackets between the lemma/predicate name and the rest of the signature.
 The type may be either `nat` or `ORDINAL`.
 But this type is specified only for `least` and `greatest` constructs.
-", Remove(false));
+".TrimStart(), Remove(false));
 
     Add(ErrorId.p_constructors_have_no_out_parameters,
     @"
@@ -509,7 +524,7 @@ a reference to the newly constructed object (as in `new C(42)`).
 There is no syntax to receive out-parameter values of a constructor
 and they may not be declared. 
 (This is similar to constructors in other programming languages, like Java.)
-", Remove(true, "remove out parameters"));
+".TrimStart(), Remove(true, "remove out parameters"));
 
     Add(ErrorId.p_reads_star_must_be_alone,
     @"
@@ -518,7 +533,7 @@ A reads clause lists the objects whose fields the function is allowed to read (o
 So it does not make sense to list `*` along with something more specific.
 If you mean that the function should be able to read anything, just list `*`.
 Otherwise, omit the `*` and list expressions containing all the objects that are read.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("remove *", IncludeComma(range), "", true)
 });
 
@@ -528,54 +543,54 @@ So it does not make sense to list `*` along with something more specific.
 with just an identifier and a type, separated by a colon. 
 No initializing value may be given. If a default value is needed, assign the out-parameter
 that value as a first statement in the body of the method.
-", Remove(true, "remove initializer")); // TODO - could be improved by removing leading whitespace
+".TrimStart(), Remove(true, "remove initializer")); // TODO - could be improved by removing leading whitespace
 
     Add(ErrorId.p_set_only_one_type_parameter,
     @"
 A `set` type has one type parameter, namely the type of the elements of the set.
 The error message states that the parser sees some number of type parameters different than one.
 The type parameters are listed in a comma-separated list between `<` and `>`, after the type name.
-"); // TODO - code action: keep only first parameter, and for susequent errors
+".TrimStart()); // TODO - code action: keep only first parameter, and for susequent errors
 
     Add(ErrorId.p_iset_only_one_type_parameter,
     @"
 A `iset` type has one type parameter, namely the type of the elements of the set.
 The error message states that the parser sees some number of type parameters different than one.
 The type parameters are listed in a comma-separated list between `<` and `>`, after the type name.
-");
+".TrimStart());
 
     Add(ErrorId.p_multiset_only_one_type_parameter,
     @"
 A `multiset` type has one type parameter, namely the type of the elements of the multiset.
 The error message states that the parser sees some number of type parameters different than one.
 The type parameters are listed in a comma-separated list between `<` and `>`, after the type name.
-");
+".TrimStart());
 
     Add(ErrorId.p_seq_only_one_type_parameter,
     @"
 A `seq` type has one type parameter, namely the type of the elements of the sequence.
 The error message states that the parser sees some number of type parameters different than one.
 The type parameters are listed in a comma-separated list between `<` and `>`, after the type name.
-");
+".TrimStart());
 
     Add(ErrorId.p_map_needs_two_type_parameters,
     @"
 A `map` type has two type parameters: the type of the keys and the type of the values.
 The error message states that the parser sees some number of type parameters different than two.
-");
+".TrimStart());
 
     Add(ErrorId.p_imap_needs_two_type_parameters,
     @"
 A `imap` type has two type parameters: the type of the keys and the type of the values.
 The error message states that the parser sees some number of type parameters different than two.
-");
+".TrimStart());
 
     Add(ErrorId.p_no_ghost_arrow_type_arguments,
     @"
 [Arrow types](../DafnyRef/DafnyRef#sec-arrow-types) are the types of functions in Dafny.
 They are designated with the arrow syntax, as shown in the example,
 except that the types used cannot be declared as ghost.
-", Remove(true, "remove ghost keyword"));
+".TrimStart(), Remove(true, "remove ghost keyword"));
 
     Add(ErrorId.p_no_empty_type_parameter_list,
     @"
@@ -585,7 +600,7 @@ there is no list and no angle brackets either.
 
 However, this particular error message is not reachable in the current parser. 
 If the message is seen, please report the code that caused it so that the bug or documentation can be corrected.
-");
+".TrimStart());
 
     Add(ErrorId.p_formal_ktype_only_in_least_and_greatest_predicates,
     @"
@@ -595,7 +610,7 @@ The type of that special formal is given in square brackets between the
 predicate name and the opening parenthesis of the formals.
 The type may be either `nat` or `ORDINAL`.
 This special formal is not permitted in a regular (non-extreme) predicate.
-", Remove(true)); // TODO - would like to have option to add 'least' or 'greatest', but that takes a different token location
+".TrimStart(), Remove(true)); // TODO - would like to have option to add 'least' or 'greatest', but that takes a different token location
 
     Add(ErrorId.p_no_by_method_in_twostate,
     @"
@@ -604,13 +619,13 @@ Such functions use values from two different program (heap) states, which is not
 something that can be implemented (at least with any degree of good performance) in conventional programming languages.
 
 Because there is no feasible compiled verion of a two-state function, it cannot have a `by method` block (which is always compiled).
-", Remove(false, "remove by method block"));
+".TrimStart(), Remove(false, "remove by method block"));
 
     Add(ErrorId.p_no_by_method_in_extreme_predicate,
     @"
 Least and greatest predicates are always ghost and do not have a compiled representation, 
 so it makes no sense to have a `by method` alternative implementation.
-", Remove(false, "remove by method block"));
+".TrimStart(), Remove(false, "remove by method block"));
 
     Add(ErrorId.p_no_by_method_for_ghost_function,
     @"
@@ -619,13 +634,13 @@ so it makes no sense to have a `by method` alternative implementation.
 Uses of the function are verified using the function body, but the method body is used when the function is compiled.
 
 Thus the function part is always implicitly `ghost` and may not be explicitly declared `ghost`.
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_twostate_and_extreme_are_always_ghost,
     @"
 The `twostate`, `least`, and `greatest` functions and predicates are always ghost and cannot be compiled, so they cannot be
 declared as a `function method` (v3 only).
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_old_ghost_syntax,
     @"
@@ -633,7 +648,7 @@ This error only occurs when the `experimentalPredicateAlwaysGhost` option is cho
 It indicates that `predicates` are always ghost and cannot be declared with the (Dafny 3) syntax `predicate method`.
 - If you intend to predicate to be ghost, remove `method`.
 - If you intend the predicate to be non-ghost, you either cannot use `experimentalPredicateAlwaysGhost` or you should use `function` with a `bool` return type instead of `predicate`
-", Remove(true));
+".TrimStart(), Remove(true));
 
     Add(ErrorId.p_deprecating_predicate_method,
     @"
@@ -641,7 +656,7 @@ This error only occurs when the `experimentalPredicateAlwaysGhost` option is cho
 longer accepted. Use `function` for compiled, non-ghost functions and
 `ghost function` for non-compiled, ghost functions, and similarly for predicates.
 See [the documentation here](https://dafny.org/latest/DafnyRef/DafnyRef#sec-function-syntax).
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("remove 'method'", range, "predicate", false),
 });
 
@@ -651,7 +666,7 @@ See [the documentation here](https://dafny.org/latest/DafnyRef/DafnyRef#sec-func
 longer accepted. Use `function` for compiled, non-ghost functions and
 `ghost function` for non-compiled, ghost functions, and similarly for predicates.
 See [the documentation here](https://dafny.org/latest/DafnyRef/DafnyRef#sec-function-syntax).
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("remove 'method'", range, "function", false),
 });
 
@@ -666,7 +681,7 @@ See [the documentation here](https://dafny.org/latest/DafnyRef/DafnyRef#sec-func
 and there is no longer any declaration of the form `function method`, and similarly for predicates. 
 
 See [the documentation here](../DafnyRef/DafnyRef#sec-function-syntax).
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("remove 'method'", range, "function", false),
 });
 
@@ -681,7 +696,7 @@ See [the documentation here](../DafnyRef/DafnyRef#sec-function-syntax).
 and there is no longer any declaration of the form `function method`, and similarly for predicates. 
 
 See [the documentation here](../DafnyRef/DafnyRef#sec-function-syntax).
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("remove 'method'", range, "predicate", false),
 });
 
@@ -689,7 +704,7 @@ See [the documentation here](../DafnyRef/DafnyRef#sec-function-syntax).
     @"
 This error occurs only when using `migration3to4`. With this option, ghost functions are declared using `ghost function` and compiled functions using `function method`.
 Change `function` in the declaration to one of these.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("add 'ghost'", range, "ghost function", false),
     OneAction("add 'method'", range, "function method", false),
 });
@@ -697,7 +712,7 @@ See [the documentation here](../DafnyRef/DafnyRef#sec-function-syntax).
     Add(ErrorId.p_no_ghost_formal,
     @"
 A ghost predicate or function effectively has all ghost formal parameters, so they cannot be declared ghost in addition.
-", range => range.PrintOriginal() != "ghost" ?
+".TrimStart(), range => range.PrintOriginal() != "ghost" ?
     new List<DafnyAction> { }
     : new List<DafnyAction> { OneAction("remove 'ghost'", range, "", true) }
 );
@@ -706,14 +721,14 @@ See [the documentation here](../DafnyRef/DafnyRef#sec-function-syntax).
     @"
 Least and greatest predicates are not checked for termination. In fact, unbounded recursion is part of being coinductive.
 Hence `decreases` clauses are inappropriate and not allowed.
-", Remove(false, "remove decreases clause"));
+".TrimStart(), Remove(false, "remove decreases clause"));
 
     Add(ErrorId.p_predicate_return_type_must_be_bool,
     @"
 A predicate is a function that returns `bool`. The return type here is something else.
 If you mean to have a non-`bool` return type, use `function` instead of `predicate`.
-", range => new List<DafnyAction> {
-    OneAction("remove type", new RangeToken(range.StartToken.Prev, range.EndToken), "", true),
+".TrimStart(), range => new List<DafnyAction> {
+    OneAction("remove type", new SourceOrigin(range.StartToken.Prev, range.EndToken), "", true),
     OneAction("replace type with 'bool'", range, "bool", true) }
 );
 
@@ -722,8 +737,8 @@ See [the documentation here](../DafnyRef/DafnyRef#sec-function-syntax).
 A `predicate` is simply a `function` that returns a `bool` value.
 Accordingly, the type is (required to be) omitted, unless the result is being named.
 So `predicate p(): (res: bool) { true }` is permitted.
-", range => new List<DafnyAction> {
-    OneAction("remove type", new RangeToken(range.StartToken.Prev, range.EndToken), "", true),
+".TrimStart(), range => new List<DafnyAction> {
+    OneAction("remove type", new SourceOrigin(range.StartToken.Prev, range.EndToken), "", true),
   });
 
     Add(ErrorId.p_no_wild_expression,
@@ -731,14 +746,14 @@ See [the documentation here](../DafnyRef/DafnyRef#sec-function-syntax).
 A method or loop with a `decreases *` clause is not checked for termination.
 This is only permitted for non-ghost methods and loops.
 Insert an actual decreases expression.
-");
+".TrimStart());
 
     Add(ErrorId.p_no_wild_frame_expression,
     @"
 A `reads *` clause means the reads clause allows the functions it specifies to read anything.
 Such a clause is not allowed in an iterator specification.
 Insert a specific reads expression.
-");
+".TrimStart());
 
     Add(ErrorId.p_invalid_colon,
     @"
@@ -747,7 +762,7 @@ This is not a legal start to a statement. Most commonly either
 * a `var` or `const` keyword is missing, and the `x:` is the beginning of a declaration, or
 * a `label` keyword is missing and the identifier is the label for the statement that follows.
 (The second error is somewhat common because in C/C++ and Java, there is no keyword introducing a label, just the identifier and the colon.)
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("insert 'label'", range, "label " + range.PrintOriginal(), false),
     OneAction("insert 'var'", range, "var " + range.PrintOriginal(), false),
     OneAction("insert 'const'", range, "const " + range.PrintOriginal(), false),
@@ -760,9 +775,9 @@ This is not a legal start to a statement. Most commonly either
 but multi-dimensional arrays cannot. The alternatives are to initialize the array
 in a loop after it is allocated, or to initialize with a function, as in
 `var a:= new int[2,2]((i: int, j: int)=>i+j)`.
-");
+".TrimStart());
 
-    ActionSignature sharedLambda = delegate (RangeToken range) {
+    ActionSignature sharedLambda = delegate (SourceOrigin range) {
       return new List<DafnyAction> {
         OneAction("replace with ':='", range, ":=", false),
         OneAction("replace with ':-", range, ":-", false),
@@ -774,7 +789,7 @@ but multi-dimensional arrays cannot. The alternatives are to initialize the arra
     @"
 Local variables are initialized with `:=` (and sometimes with `:-` or `:|`), but not with `=`.
 In Dafny `=` is used only in type definitions.
-", sharedLambda);
+".TrimStart(), sharedLambda);
 
     Add(ErrorId.p_no_patterns_and_such_that,
     @"
@@ -782,12 +797,12 @@ but multi-dimensional arrays cannot. The alternatives are to initialize the arra
 some non-deterministic values that satisfy the predicate on the right-hand-side.
 
 However, Dafny only allows a list of simple variables on the left, not datatype deconstructor patterns, as seen here.
-");
+".TrimStart());
 
     Add(ErrorId.p_no_modifies_on_refining_loops,
     @"
 _Refining statements, including loops, are deprecated._
-");
+".TrimStart());
 
     Add(ErrorId.p_to_or_downto,
     @"
@@ -810,7 +825,7 @@ method m() {
 }
 ```
 is legal, but not at all recommended.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("replace with 'to'", range, "to", false),
     OneAction("replace with 'downto'", range, "downto", false),
   });
@@ -824,21 +839,21 @@ In loops it assures termination of the loop iteration.
 `decreases *` means to skip the termination check.
 So it does not make sense to both list a metric and to list '*'.
 Use one or the other.
-");  // TODO - somewhere else where we remove the * or replace the whole works?
+".TrimStart());  // TODO - somewhere else where we remove the * or replace the whole works?
 
     Add(ErrorId.p_assert_needs_by_or_semicolon,
     @"
 Assert statements, like all statements, end in either a semicolon or a block. Most assert statements end in semicolons,
 but an assert-by statement has the form `assert expr by { ... }` where the by-block contains statements such as lemma calls
 that assist in proving the validity of the asserted expression.
-", InsertAfter(";", "insert semicolon"));
+".TrimStart(), InsertAfter(";", "insert semicolon"));
 
     Add(ErrorId.p_forall_with_ensures_must_have_body,
     @"
 A forall statement without a body is like an assume statement: the ensures clause is assumed in the following code.
 Assumptions like that are a risk to soundness because there is no check that the assumption is true.
 Thus in a context in which open assumptions are not allowed, body-less forall statements are also not allowed.
-");
+".TrimStart());
 
     Add(ErrorId.p_calc_operator_must_be_transitive,
     @"
@@ -851,7 +866,7 @@ But the sequence of operators must obey certain patterns similar to chaining exp
 in the body of the calc statement.
 
 But the operator has to be transitive: `!=` is not allowed; `==`, `<`, `<=`, '>' and '>=' are allowed.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("replace with '=='", range, "==", false),
     OneAction("replace with '<'", range, "<", false),
     OneAction("replace with '<='", range, "<=", false),
@@ -869,7 +884,7 @@ But the sequence of operators must obey certain patterns similar to chaining exp
 In particular, this error message is complaining that it sees an unacceptable operator.
 In this case, the reason is that the sequence may contain only one `!=` operator;
 another reason causing this message would be a combination of `<` and `>` operators.
-");
+".TrimStart());
 
     Add(ErrorId.p_calc_dangling_operator,
     @"
@@ -881,14 +896,14 @@ But the sequence must begin and end with (semicolon-terminated) expressions.
 This error message is complaining that it sees an operator ending the sequence.
 This may be because there is no following expression or that the parser 
 does not recognize the material after the last operator as a legal ending expression.
-", Remove(false));
+".TrimStart(), Remove(false));
 
     Add(ErrorId.p_no_side_effects_in_expressions,
     @"
 Dafny expressions may not have side-effects. This prohibits both assignments to local variables and any
 changes to the heap. Thus method and constructor calls may not occur in expressions.
 This check is syntactic, so even methods that do not modify anything are not permitted in expressions.
-");
+".TrimStart());
 
     Add(ErrorId.p_ambiguous_implies,
     @"
@@ -900,7 +915,7 @@ changes to the heap. Thus method and constructor calls may not occur in expressi
 `p <== q <== r` is `(p <== q) <== r`.
 
 See [this section](../DafnyRef/DafnyRef#sec-implication-and-reverse-implication) for more information.
-"); // TODO - would be nice to have code actions for the alternatives, but that requires passing multiple ranges
+".TrimStart()); // TODO - would be nice to have code actions for the alternatives, but that requires passing multiple ranges
     Add(ErrorId.p_ambiguous_implies_2,
     @"
 The `==>` and `<==` operators have the same precedence but do not associate with each other.
@@ -911,14 +926,14 @@ changes to the heap. Thus method and constructor calls may not occur in expressi
 `p <== q <== r` is `(p <== q) <== r`.
 
 See [this section](../DafnyRef/DafnyRef#sec-implication-and-reverse-implication) for more information.
-"); // TODO - would be nice to have code actions for the alternatives, but that requires passing multiple ranges
+".TrimStart()); // TODO - would be nice to have code actions for the alternatives, but that requires passing multiple ranges
 
     Add(ErrorId.p_ambiguous_and_or,
      @"
 The `&&` and `||` operators have the same precedence but do not associate with each other.
 You must use parentheses to show how they are grouped. Write `p && q || r` as either
 `(p && q) || r` or `p && (q || r)`.
-");// TODO - would be nice to have code actions for the alternatives, but that requires passing multiple ranges
+".TrimStart());// TODO - would be nice to have code actions for the alternatives, but that requires passing multiple ranges
 
     Add(ErrorId.p_invalid_equal_chaining,
     @"
@@ -928,7 +943,7 @@ But there are limitations on which operators can be in one chain together.
 
 In particular, the relational operators `in` and `!in` may not be part of a chain.
 Use parentheses as necessary to group the operations.
-");
+".TrimStart());
 
     Add(ErrorId.p_invalid_notequal_chaining,
     @"
@@ -937,7 +952,7 @@ [Chained operations](../DafnyRef/DafnyRef#sec-basic-types)
 But there are limitations on which operators can be in one chain together.
 
 In particular for this error message, one cannot have chains that include more than one `!=` operator.
-");
+".TrimStart());
 
     Add(ErrorId.p_invalid_operator_in_chain,
     @"
@@ -946,7 +961,7 @@ [Chained operations](../DafnyRef/DafnyRef#sec-basic-types)
 But there are limitations on which operators can be in one chain together.
 
 In particular for this error message, the designated operator is not permitted to extend the existing chain.
-");
+".TrimStart());
 
     Add(ErrorId.p_invalid_descending_chaining,
     @"
@@ -956,7 +971,7 @@ But there are limitations on which operators can be in one chain together.
 
 In particular for this error message, one cannot have chains that include both
 less-than operations (either `<` or `<=`) and greater-than operations (either `>` or `>=`).
-");
+".TrimStart());
 
     Add(ErrorId.p_invalid_ascending_chaining,
     @"
@@ -966,7 +981,7 @@ But there are limitations on which operators can be in one chain together.
 
 In particular for this error message, one cannot have chains that include both
 less-than operations (either `<` or `<=`) and greater-than operations (either `>` or `>=`).
-");
+".TrimStart());
 
     Add(ErrorId.p_invalid_disjoint_chaining,
     @"
@@ -980,13 +995,13 @@ But there are limitations on which operators can be in one chain together.
 As described [here](../DafnyRef/DafnyRef#sec-collection-types),
 `a !! b !! c !! d` means that `a`, `b`, `c`, and `d` are all mutually disjoint
 (which is a different rewriting of the chain than for other operations).
-");
+".TrimStart());
 
     Add(ErrorId.p_operator_does_not_chain,
     @"
 The operators `in` and `!in` are relational operators, but they may not occur in a chain.
 Use parentheses if necessary. Such expressions are usually not type-correct in any case.
-");
+".TrimStart());
 
     Add(ErrorId.p_bang_not_a_relational_op,
     @"
@@ -994,7 +1009,7 @@ As described [here](../DafnyRef/DafnyRef#sec-collection-types),
 (one of `==`, `!=`, `>`, `>=`, `<`, `<=`, `!!`, `in`, `!in`). But the parser saw just a `!` ,
 which could be the beginning of `!=`, `!!`, or `!in`, but is not continued as such.
 So perhaps there is extraneous white space or something else entirely is intended.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("replace with `!=`", range, "!=", false),
     OneAction("replace with `!!`", range, "!!", false),
 });
@@ -1004,14 +1019,14 @@ As described [here](../DafnyRef/DafnyRef#sec-collection-types),
 The parser is expecting a relational expression, that is, two expressions separated by a relational operator
 (one of `==`, `!=`, `>`, `>=`, `<`, `<=`, `!!`, `in`, `!in`). But the parser saw two `!` separated by
 white space. This is possibly meant to be a `!!` operator, but it could also just be an illegal expression.
-", Replace("!!"));
+".TrimStart(), Replace("!!"));
 
     Add(ErrorId.p_ambiguous_bitop,
     @"
 The bit-operators `&`, `|`, and `^` have the same precedence but do not associate with each other.
 So if they are used within the same expression, parentheses have to be used to show how they
 are grouped. The example `5 | 6 & 7` should be written as either `(5 | 6) & 7` or `5 | (6 & 7)`.
-");
+".TrimStart());
 
     Add(ErrorId.p_invalid_char_literal,
     @"
@@ -1025,13 +1040,13 @@ so this means a character literal can only contain a character that can be repre
 Unicode scalar value, but be aware that it may change the meaning of your program.
 
 More detail is given [here](../DafnyRef/DafnyRef#sec-character-constant-token) and [here](../DafnyRef/DafnyRef#sec-escaped-characters).;
-");
+".TrimStart());
 
     Add(ErrorId.p_no_parenthesized_binding,
     @"
 Bindings of the form `x := y` are used in map-display expressions, in which case they are enclosed in square brackets,
 not parentheses. `var c := ( 4 := 5 )` should be `var c := map[ 4 := 5 ]`.
-", range => new List<DafnyAction> {
+".TrimStart(), range => new List<DafnyAction> {
     OneAction("replace `( )` with `map[ ]`", range, "map[" + range.PrintOriginal()[1..^1] + "]", false),
     OneAction("replace `( )` with `imap[ ]`", range, "imap[" + range.PrintOriginal()[1..^1] + "]", false),
 });
@@ -1046,13 +1061,13 @@ A set/iset/multiset display expression can have two forms.
 In the current parser, however, this error message is unreachable,
 so if it appears please report the error.
 The tests that check for this error case are already known to be false by previous testing.
-");
+".TrimStart());
 
     Add(ErrorId.p_seq_display_has_one_type_argument,
     @"
 The built-in `seq` (sequence) type takes one type parameter, which in some situations is inferred.
 That type parameter is the type of the sequence elements.
-"); // TODO - get rid of the extra parameters
+".TrimStart()); // TODO - get rid of the extra parameters
 
     Add(ErrorId.p_map_comprehension_must_have_term_expression,
     @"
@@ -1073,7 +1088,7 @@ because it is not clear what the left-hand expression should be.
 Incorrect text like `const s := map x, y | 0 <= x < y < 10 :: x*y` should be written
 as `const s := map x, y | 0 <= x < y < 10 :: f(x,y) := x*y` for some `f(x,y)` that gives
 a unique value for each pair of `x,y` permitted by the range expression (here `0 <= x < y < 10`).
-");
+".TrimStart());
 
     Add(ErrorId.p_no_patterns_in_let_such_that,
     @"
@@ -1082,18 +1097,18 @@ The let-such-that expression initializes a variable to some value satisfying a g
 where `cc` would get some value `x` satisfying `x < 10`.
 
 For simplicity, however, Dafny requires the variables being initialized to be simple names, not patterns.
-");
+".TrimStart());
 
     Add(ErrorId.p_no_equal_in_let_initialization,
     @"
 Like local variables, let variables are initialized with `:=` (and sometimes with `:-` or `:|`), but not with `=`.
 In Dafny `=` is used only in type definitions.
-", sharedLambda);
+".TrimStart(), sharedLambda);
 
     Add(ErrorId.p_elephant_has_one_lhs,
     @"
 Within a function, the `:-` operator is limited to a most one left-hand-side and exactly one-right-hand-side.
-", Remove(false, "remove extra LHSs"));
+".TrimStart(), Remove(false, "remove extra LHSs"));
 
     Add(ErrorId.p_elephant_has_one_rhs,
     @"
@@ -1104,7 +1119,7 @@ and in the context of a let-or-fail expression.
 In contrast to the let expression (`:=`), which allows multiple parallel initializations, 
 the let-or-fail expression (`:-`) is implemented to
 only allow at most a single left-hand-side and exactly one right-hand-side.
-", Remove(false, "remove extra RHSs"));
+".TrimStart(), Remove(false, "remove extra RHSs"));
 
     Add(ErrorId.p_set_comprehension_needs_term_expression,
     @"
@@ -1118,13 +1133,13 @@ A set comprehension (1) declares one or more variables, (2) possibly states some
 But if more than one variable is declared, then there is no natural implicit expression to fill in after the `::` if it is omitted, 
 so some expression is required. The failing example above, for example, might use the expression `x * y`, as in 
 `set x, y  | 0 <= x < y < 10 :: x * y`, or any other expression over `x` and `y`.
-", InsertAfter(" :: 0", "insert example expression"));
+".TrimStart(), InsertAfter(" :: 0", "insert example expression"));
 
     Add(ErrorId.p_invalid_name_after_dot,
     @"
 This error message is not reachable in current Dafny.
 If it occurs, please report an internal bug (or obsolete documentation).
-");
+".TrimStart());
 
     Add(ErrorId.p_bad_number_format,
    @"
@@ -1132,7 +1147,7 @@ This error can only result from an internal bug in the Dafny parser.
 The parser recognizes a legitimate sequence of digits (as an integer literal
 and then passes that string to a library routine to create a BigInteger
 or BigDecimal. Given the parser logic, that parsing should never fail.
-");
+".TrimStart());
 
     Add(ErrorId.p_bad_hex_number_format,
     @"
@@ -1140,7 +1155,7 @@ This error can only result from an internal bug in the Dafny parser.
 The parser recognizes a legitimate sequence of hexdigits
 and then passes that string to a library routine to create a BigInteger. 
 Given the parser logic, that parsing should never fail.
-");
+".TrimStart());
 
     Add(ErrorId.p_bad_decimal_number_format,
     @"
@@ -1148,7 +1163,7 @@ This error can only result from an internal bug in the Dafny parser.
 The parser recognizes a legitimate Dafny decimal number 
 and then passes that string to a library routine to create a BigDecimal. 
 Given the parser logic, that parsing should never fail.
-");
+".TrimStart());
 
     Add(ErrorId.p_generic_syntax_error,
     @"
@@ -1163,59 +1178,61 @@ The only advice we can give is to carefully scrutinize the location of the
 error to see what might be wrong with the text. If you think this is a
 common or confusing enough occurrence to warrant special error handling,
 please suggest the improvement, with this sample code, to the Dafny team.
-");
+".TrimStart());
 
     Add(ErrorId.p_deprecated_semicolon,
     @"
 Semicolons are required after statements and declarations in method bodies,  
 but are deprecated after declarations within modules and types.
-", Remove(true, "remove semicolon"));
+".TrimStart(), Remove(true, "remove semicolon"));
 
     Add(ErrorId.p_file_has_no_code,
       @"
 The indicated file has no code. This can be because the file is empty, because some parse error
 left the top-level module with no well-formed declarations, or because a unclosed comment
 has commented-out the whole file.
-");
+".TrimStart());
 
     Add(ErrorId.p_internal_exception,
       @"
 This error indicates an internal crashing bug in Dafny. Please report it with as much of 
 the source code that causes the problem as possible.
-");
+".TrimStart());
 
     Add(ErrorId.p_deprecated_inductive_predicate,
     @"
 The terms `least predicate` and `greatest predicate` are more descriptive of the relationship between them than was the old terminology.
-");
+".TrimStart());
 
     Add(ErrorId.p_deprecated_copredicate,
     @"
 The terms `least predicate` and `greatest predicate` are more descriptive of the relationship between them than was the old terminology.
-");
+".TrimStart());
 
     Add(ErrorId.p_deprecated_statement_refinement,
     @"
 Statement refinement has been deprecated. Refinement is restricted to changing declarations, not bodies of methods or functions.
-");
+".TrimStart());
 
     Add(ErrorId.p_deprecated_forall_with_no_bound_variables,
     @"
 <!-- TODO -->
-");
+".TrimStart());
 
     Add(ErrorId.p_deprecated_modify_statement_with_block,
     @"
 <!-- TODO-->
-");
+".TrimStart());
 
     Add(ErrorId.p_deprecated_opaque_as_identifier,
      @"
 Because of the value to proof success of using `opaque` declarations and `reveal`ing them in appropriate contexts,
 the word `opaque` is being converted to a reserved keyword, whereas it used to be a normal identifier.
 Please rename your use of opaque as an identifier to some other name.
-");
+".TrimStart());
 
   }
 
+  public static void RunStaticConstructor() {
+  }
 }
diff --git a/Source/DafnyCore/AST/Grammar/ParserNonGeneratedPart.cs b/Source/DafnyCore/AST/Grammar/ParserNonGeneratedPart.cs
new file mode 100644
index 00000000000..a2dee52d68f
--- /dev/null
+++ b/Source/DafnyCore/AST/Grammar/ParserNonGeneratedPart.cs
@@ -0,0 +1,876 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.CommandLine;
+using System.Diagnostics.Contracts;
+using System.Threading;
+using static Microsoft.Dafny.ParseErrors;
+
+namespace Microsoft.Dafny;
+
+public partial class Parser {
+
+  public Parser(DafnyOptions options, Scanner/*!*/ scanner, Errors/*!*/ errors, CancellationToken cancellationToken)
+    : this(scanner, errors, cancellationToken)  // the real work
+  {
+    // initialize readonly fields
+    dummyExpr = new LiteralExpr(Token.NoToken);
+    dummyRhs = new ExprRhs(dummyExpr);
+    dummyFrameExpr = new FrameExpression(dummyExpr.Origin, dummyExpr, null);
+    dummyStmt = new ReturnStmt(Token.NoToken, null);
+    var dummyBlockStmt = new BlockStmt(Token.NoToken, new List<Statement>());
+    dummyIfStmt = new IfStmt(Token.NoToken, false, null, dummyBlockStmt, null);
+
+    theOptions = new DafnyOptions(options);
+    theModule = new FileModuleDefinition(scanner.FirstToken);
+  }
+
+  public void MergeInto(ref Attributes attrsStack, ref Attributes attrsTarget) {
+    Attributes.MergeInto(ref attrsStack, ref attrsTarget);
+  }
+
+  public Attributes Consume(ref Attributes attrs) {
+    return Attributes.Consume(ref attrs);
+  }
+
+  bool IsReveal(IOrigin nextToken) => la.kind == _reveal || (la.kind == _hide && nextToken.kind is _star or _ident);
+
+  bool IsIdentifier(int kind) {
+    return kind == _ident || kind == _least || kind == _greatest || kind == _older || kind == _opaque;
+  }
+
+  bool IsQuantifierVariableDecl(QuantifiedVar previousVar) {
+    // Introducing per-quantified variable ranges creates some ambiguities in the grammar,
+    // since before that the range would terminate the quantifed domain. For example, the following statement:
+    //
+    // print set x | E, y;
+    //
+    // This would previously parse as two separate arguments to the print statement, but
+    // could now also be parsed as a single set comprehension argument with two quantified variables
+    // (and an invalid one since it would need an explicit ":: <Term>" section).
+    //
+    // Even worse:
+    //
+    // print set x | E, y <- C;
+    //
+    // This was a valid statement before as well, because "y <- C" would be parsed as the expression
+    // "y < (-C)".
+    //
+    // The /quantifierSyntax option is used to help migrate this otherwise breaking change:
+    // * /quantifierSyntax:3 keeps the old behaviour where a "| <Range>" always terminates the list of quantified variables.
+    // * /quantifierSyntax:4 instead attempts to parse additional quantified variables.
+    if (previousVar.Range != null && theOptions.QuantifierSyntax == QuantifierSyntaxOptions.Version3) {
+      return false;
+    }
+
+    scanner.ResetPeek();
+    IOrigin x = scanner.Peek();
+    return la.kind == _comma && IsIdentifier(x.kind);
+  }
+
+  // Checks for "<-", which has to be parsed as two separate tokens,
+  // but ensures no whitespace between them.
+  bool IsFromArrow() {
+    scanner.ResetPeek();
+    IOrigin x = scanner.Peek();
+    return la.kind == _openAngleBracket && x.kind == _minus
+      && la.line == x.line && la.col == x.col - 1;
+  }
+
+  bool IsLabel(bool allowLabel) {
+    if (!allowLabel) {
+      return false;
+    }
+    scanner.ResetPeek();
+    IOrigin x = scanner.Peek();
+    return (IsIdentifier(la.kind) || la.kind == _digits) && x.kind == _colon;
+  }
+
+  bool IsKeywordForFormal() {
+    scanner.ResetPeek();
+    if (la.kind == _ghost || la.kind == _new || la.kind == _nameonly) {
+      return true;
+    } else if (la.kind == _older) {
+      // "older" is just a contextual keyword, so don't recognize it as a keyword if it must be an identifier
+      IOrigin x = scanner.Peek();
+      return x.kind != _colon;
+    }
+    return false;
+  }
+
+  bool IsBinding() {
+    scanner.ResetPeek();
+    IOrigin x = scanner.Peek();
+    return (IsIdentifier(la.kind) || la.kind == _digits) && x.kind == _gets;
+  }
+
+  bool IsAlternative() {
+    IOrigin x = scanner.Peek();
+    return (la.kind == _lbrace && x.kind == _case)
+        || la.kind == _case;
+  }
+
+  bool IsParenIdentsColon() {
+    IOrigin x = la;
+    if (x.kind != _openparen) {
+      return false;
+    }
+    x = scanner.Peek();
+    var oneOrMoreIdentifiers = false;
+    while (IsIdentifier(x.kind) || x.kind == _ghost) { /* ghost is illegal here, but checking for it allows better error messages and recovery */
+      x = scanner.Peek();
+      oneOrMoreIdentifiers = true;
+    }
+    return oneOrMoreIdentifiers && x.kind == _colon;
+  }
+
+  bool IsGets() {
+    return la.kind == _gets;
+  }
+
+  bool IsPeekVar() {
+    scanner.ResetPeek();
+    IOrigin x = scanner.Peek();
+    return x.kind == _var;
+  }
+
+  // an existential guard starts with an identifier and is then followed by
+  // * a colon (if the first identifier is given an explicit type),
+  // * a comma (if there's a list of bound variables and the first one is not given an explicit type),
+  // * a start-attribute (if there's one bound variable and it is not given an explicit type and there are attributes), or
+  // * a bored smiley (if there's one bound variable and it is not given an explicit type).
+  bool IsBindingGuard() {
+    scanner.ResetPeek();
+    if (IsIdentifier(la.kind)) {
+      Token x = scanner.Peek();
+      if (x.kind == _colon || x.kind == _comma || x.kind == _boredSmiley || x.kind == _lbracecolon) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  bool IsLoopSpec() {
+    return la.kind == _invariant || la.kind == _decreases || la.kind == _modifies;
+  }
+
+  bool IsWitness() {
+    scanner.ResetPeek();
+    if (la.kind == _witness) {
+      return true;
+    } else if (la.kind == _ghost) {
+      Token x = scanner.Peek();
+      return x.kind == _witness;
+    }
+    return false;
+  }
+
+  bool IsFunctionDecl() {
+    var kind = la.kind;
+    return IsFunctionDecl(kind);
+  }
+
+  bool IsDecreasesTo() {
+    scanner.ResetPeek();
+    if (la.kind is _decreases or _nonincreases) {
+      Token x = scanner.Peek();
+      if (x.kind == _ident && x.val == "to") {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private bool IsFunctionDecl(int kind) {
+    switch (kind) {
+      case _function:
+      case _predicate:
+      case _copredicate:
+        return true;
+      case _least:
+      case _greatest:
+      case _inductive:
+        return scanner.Peek().kind != _lemma;
+      case _twostate:
+        var x = scanner.Peek();
+        return x.kind == _function || x.kind == _predicate;
+      default:
+        return false;
+    }
+  }
+
+  bool IsParenStar() {
+    scanner.ResetPeek();
+    Token x = scanner.Peek();
+    return la.kind == _openparen && x.kind == _star;
+  }
+
+  bool IsEquivOp() => IsEquivOp(la);
+  bool IsImpliesOp() => IsImpliesOp(la);
+  bool IsExpliesOp() => IsExpliesOp(la);
+  bool IsAndOp() => IsAndOp(la);
+  bool IsOrOp() => IsOrOp(la);
+  bool IsComma() {
+    return la.val == ",";
+  }
+  static bool IsEquivOp(IOrigin la) {
+    return la.val == "<==>";
+  }
+  static bool IsImpliesOp(IOrigin la) {
+    return la.val == "==>";
+  }
+  static bool IsExpliesOp(IOrigin la) {
+    return la.val == "<==";
+  }
+  static bool IsAndOp(IOrigin la) {
+    return la.val == "&&";
+  }
+  static bool IsOrOp(IOrigin la) {
+    return la.val == "||";
+  }
+  bool IsBitwiseAndOp() {
+    return la.val == "&";
+  }
+  bool IsBitwiseOrOp() {
+    return la.val == "|";
+  }
+  bool IsBitwiseXorOp() {
+    return la.val == "^";
+  }
+  bool IsBitwiseOp() {
+    return IsBitwiseAndOp() || IsBitwiseOrOp() || IsBitwiseXorOp();
+  }
+  bool IsAsOrIs() {
+    return la.kind == _as || la.kind == _is;
+  }
+  bool IsRelOp() {
+    return la.val == "=="
+        || la.val == "<"
+        || la.val == ">"
+        || la.val == "<="
+        || la.val == ">="
+        || la.val == "!="
+        || la.val == "in"
+        || la.kind == _notIn
+        || la.val == "!";
+  }
+  bool IsShiftOp() {
+    if (la.kind == _openAngleBracket) {
+    } else if (la.kind == _closeAngleBracket) {
+    } else {
+      return false;
+    }
+    scanner.ResetPeek();
+    var x = scanner.Peek();
+    if (x.kind != la.kind) {
+      return false;
+    }
+    return x.pos == la.pos + 1;  // return true only if the tokens are adjacent to each other
+  }
+  bool IsAddOp() {
+    return la.val == "+" || la.val == "-";
+  }
+  bool IsMulOp() {
+    return la.kind == _star || la.val == "/" || la.val == "%";
+  }
+  bool IsQSep() {
+    return la.kind == _doublecolon;
+  }
+
+  bool IsNonFinalColon() {
+    return la.kind == _colon && scanner.Peek().kind != _rbracket;
+  }
+
+  bool ExprIsMapDisplay() {
+    scanner.ResetPeek();
+    return (la.kind == _map || la.kind == _imap) && scanner.Peek().kind == _lbracket;
+  }
+
+  bool ExprIsSetDisplay() {
+    scanner.ResetPeek();
+    if (la.kind == _lbrace) {
+      return true;
+    }
+
+    int k = scanner.Peek().kind;
+    if (la.kind == _iset && k == _lbrace) {
+      return true;
+    }
+
+    if (la.kind == _multiset) {
+      return true;
+    }
+
+    return false;
+  }
+
+  bool IsSuffix() {
+    return la.kind == _dot || la.kind == _lbracket || la.kind == _openparen;
+  }
+
+  string UnwildIdent(IOrigin x, bool allowWildcardId) {
+    if (x.val.StartsWith("_")) {
+      if (allowWildcardId && x.val.Length == 1) {
+        return "_v" + anonymousIds++;
+      } else {
+        SemErr(ErrorId.p_no_leading_underscore, x, "cannot declare identifier beginning with underscore");
+      }
+    }
+    return x.val;
+  }
+
+  bool IsLambda(bool allowLambda) {
+    if (!allowLambda) {
+      return false;
+    }
+    scanner.ResetPeek();
+    Token x;
+    // peek at what might be a signature of a lambda expression
+    if (IsIdentifier(la.kind)) {
+      // cool, that's the entire candidate signature
+    } else if (la.kind != _openparen) {
+      return false;  // this is not a lambda expression
+    } else {
+      int identCount = 0;
+      x = scanner.Peek();
+      while (x.kind != _closeparen) {
+        if (identCount != 0) {
+          if (x.kind != _comma) {
+            return false;  // not the signature of a lambda
+          }
+          x = scanner.Peek();
+        }
+        if (!IsIdentifier(x.kind)) {
+          return false;  // not a lambda expression
+        }
+        identCount++;
+        x = scanner.Peek();
+        if (x.kind == _colon) {
+          // a colon belongs only in a lamdba signature, so this must be a lambda (or something ill-formed)
+          return true;
+        }
+      }
+    }
+    // What we have seen so far could have been a lambda signature or could have been some
+    // other expression (in particular, an identifier, a parenthesized identifier, or a
+    // tuple all of whose subexpressions are identifiers).
+    // It is a lambda expression if what follows is something that must be a lambda.
+    x = scanner.Peek();
+    return x.kind == _darrow || x.kind == _reads || x.kind == _requires;
+  }
+
+  bool IsIdentParen() {
+    scanner.ResetPeek();
+    Token x = scanner.Peek();
+    return IsIdentifier(la.kind) && x.kind == _openparen;
+  }
+
+  /* Used to disambiguate the LHS of a VarDeclStmt. If it looks like the start of a CasePattern,
+   * we consider it to be a VarDeclPattern. But if we are looking at a simple identifier, then we
+   * consider it to be a VarDeclStmt.
+   */
+  bool IsPatternDecl() {
+    return IsIdentParen() || la.kind == _openparen;
+  }
+
+  bool IsIdentColonOrBar() {
+    Token x = scanner.Peek();
+    return IsIdentifier(la.kind) && (x.kind == _colon || x.kind == _verticalbar);
+  }
+
+  bool SemiFollowsCall(bool allowLemma, Expression e) {
+    return allowLemma && la.kind == _semicolon && e is ApplySuffix;
+  }
+
+  bool IsNotEndOfCase() {
+    return la.kind != _EOF && la.kind != _rbrace && la.kind != _case;
+  }
+
+  /* The following is the largest lookahead there is. It needs to check if what follows
+   * can be nothing but "<" Type { "," Type } ">".
+   * If inExpressionContext == true, it also checks the token immediately after
+   * the ">" to help disambiguate some cases (see implementation comment).   
+   */
+  bool IsGenericInstantiation(bool inExpressionContext) {
+    scanner.ResetPeek();
+    IOrigin pt = la;
+    if (!IsTypeList(ref pt)) {
+      return false;
+    }
+    if (!inExpressionContext) {
+      return true;
+    }
+    /* There are ambiguities in the parsing.  For example:
+     *     F( a < b , c > (d) )
+     * can either be a unary function F whose argument is a function "a" with type arguments "<b,c>" and
+     * parameter "d", or can be a binary function F with the two boolean arguments "a < b" and "c > (d)".
+     * To make the situation a little better, we (somewhat heuristically) look at the character that
+     * follows the ">".  Note that if we, contrary to a user's intentions, pick "a<b,c>" out as a function
+     * with a type instantiation, the user can disambiguate it by making sure the ">" sits inside some
+     * parentheses, like:
+     *     F( a < b , (c > (d)) )
+     */
+    // In the following cases, we're sure we must have read a type instantiation that just ended an expression
+    if (IsEquivOp(pt) || IsImpliesOp(pt) || IsExpliesOp(pt) || IsAndOp(pt) || IsOrOp(pt)) {
+      return true;
+    }
+    switch (pt.kind) {
+      case _dot:  // here, we're sure it must have been a type instantiation we saw, because an expression cannot begin with dot
+      case _openparen:  // it was probably a type instantiation of a function/method
+      case _lbracket:  // it is possible that it was a type instantiation
+      case _lbrace:  // it was probably a type instantiation of a function/method
+      case _at:
+      // In the following cases, we're sure we must have read a type instantiation that just ended an expression
+      case _closeparen:
+      case _rbracket:
+      case _rbrace:
+      case _comma:
+      case _semicolon:
+      case _then:
+      case _else:
+      case _case:
+      case _eq:
+      case _neq:
+      case _as:
+      case _is:
+      case _darrow:
+      case _by:
+      case _in:
+      case _openAngleBracket:
+      case _closeAngleBracket:
+      case _EOF:
+      // (specification clauses that can follow an expression)
+      case _decreases:
+      case _modifies:
+      case _reads:
+      case _requires:
+      case _ensures:
+      case _invariant:
+      case _witness:
+      // (top-level declarations that can follow an expression)
+      case _function:
+      case _predicate:
+      case _least:
+      case _greatest:
+      case _inductive:
+      case _twostate:
+      case _lemma:
+      case _copredicate:
+      case _ghost:
+      case _static:
+      case _import:
+      case _export:
+      case _class:
+      case _trait:
+      case _datatype:
+      case _codatatype:
+      case _var:
+      case _const:
+      case _newtype:
+      case _type:
+      case _iterator:
+      case _method:
+      case _colemma:
+      case _constructor:
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  // Returns true if the parser can parse an heap-referencing @-call
+  // The reason to do this is that expressions can be prefixed by @-Attributes,
+  // so the rule to distinguish them is that an @-call of the form name@label(args),
+  // the @ must be next to the name. Otherwise an attribute is parsed.
+  // Indeed 'name' could be the last expression of an ensures clause, and the attribute
+  // could belong to the next method declaration otherwise.
+  bool IsAtCall() {
+    IOrigin pt = la;
+    if (pt.val != "@") {
+      return false;
+    }
+    // If it's the beginning of the file, or the previous token is on a different line or separated by a space, it's not an At-call. Must be an attribute
+    var isFirstToken = pt.Prev == null;
+    var spaceExistsSincePreviousToken =
+      !isFirstToken &&
+      (pt.Prev.line != pt.line || pt.Prev.col + pt.Prev.val.Length + pt.TrailingTrivia.Trim().Length < pt.col - pt.LeadingTrivia.Trim().Length);
+    if (isFirstToken || spaceExistsSincePreviousToken) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /* Returns true if the next thing is of the form:
+   *     "<" Type { "," Type } ">"
+   */
+  bool IsTypeList(ref IOrigin pt) {
+    if (pt.kind != _openAngleBracket) {
+      return false;
+    }
+    pt = scanner.Peek();
+    return IsTypeSequence(ref pt, _closeAngleBracket);
+  }
+  /* Returns true if the next thing is of the form:
+   *     [ "ghost" ] Type { "," [ "ghost" ] Type }
+   * followed by an endBracketKind.
+   */
+  bool IsTypeSequence(ref IOrigin pt, int endBracketKind) {
+    while (true) {
+      if (pt.kind == _ghost) {
+        pt = scanner.Peek();
+      }
+      if (!IsType(ref pt)) {
+        return false;
+      }
+      if (pt.kind == endBracketKind) {
+        // end of type list
+        pt = scanner.Peek();
+        return true;
+      } else if (pt.kind == _comma) {
+        // type list continues
+        pt = scanner.Peek();
+      } else {
+        // not a type list
+        return false;
+      }
+    }
+  }
+
+  bool IsType(ref IOrigin pt) {
+    if (!IsNonArrowType(ref pt)) {
+      return false;
+    }
+
+    while (pt.kind == _sarrow || pt.kind == _qarrow || pt.kind == _larrow) {
+      pt = scanner.Peek();
+      if (!IsNonArrowType(ref pt)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  bool IsNonArrowType(ref IOrigin pt) {
+    switch (pt.kind) {
+      case _bool:
+      case _char:
+      case _nat:
+      case _int:
+      case _real:
+      case _ORDINAL:
+      case _string:
+      case _object_q:
+      case _object:
+        pt = scanner.Peek();
+        return true;
+      case _arrayToken:
+      case _bvToken:
+      case _set:
+      case _iset:
+      case _multiset:
+      case _seq:
+      case _map:
+      case _imap:
+        pt = scanner.Peek();
+        return pt.kind != _openAngleBracket || IsTypeList(ref pt);
+      case _ident:
+      case _least:
+      case _greatest:
+        while (true) {
+          // invariant: next token is an identifier (_ident, _least, or _greatest)
+          pt = scanner.Peek();
+          if (pt.kind == _openAngleBracket && !IsTypeList(ref pt)) {
+            return false;
+          }
+          if (pt.kind != _dot) {
+            // end of the type
+            return true;
+          }
+          pt = scanner.Peek();  // get the _dot
+          if (!IsIdentifier(pt.kind)) {
+            return false;
+          }
+        }
+      case _openparen:
+        pt = scanner.Peek();
+        if (pt.kind == _closeparen) {
+          // end of type list
+          pt = scanner.Peek();
+          return true;
+        }
+        return IsTypeSequence(ref pt, _closeparen);
+      default:
+        return false;
+    }
+  }
+
+
+  void ConvertKeywordTokenToIdent() {
+    var oldKind = la.kind;
+    la.kind = _ident;
+
+    // call CheckLiteral with la
+    var origT = t;
+    t = la;
+    scanner.CheckLiteral();
+    t = origT;
+
+    if (la.kind != _ident) {
+      // it has been changed by CheckLiteral, which means it was a keyword
+      la.kind = _ident;  // convert it to an ident
+    } else {
+      // la was something other than a keyword
+      la.kind = oldKind;
+    }
+  }
+
+  int StringToInt(string s, int defaultValue, string errString, IOrigin tok) {
+    Contract.Requires(s != null);
+    Contract.Requires(errString != null);
+    try {
+      if (s != "") {
+        defaultValue = int.Parse(s);
+      }
+    } catch (System.OverflowException) {
+      SemErr(errString.Contains("array") ? ErrorId.p_array_dimension_too_large
+                                         : ErrorId.p_bitvector_too_large,
+        tok, string.Format("sorry, {0} ({1}) are not supported", errString, s));
+    }
+    return defaultValue;
+  }
+
+  readonly Expression/*!*/ dummyExpr;
+  readonly AssignmentRhs/*!*/ dummyRhs;
+  readonly FrameExpression/*!*/ dummyFrameExpr;
+  readonly Statement/*!*/ dummyStmt;
+  readonly Statement/*!*/ dummyIfStmt;
+  public readonly FileModuleDefinition theModule;
+  public readonly List<Action<SystemModuleManager>> SystemModuleModifiers = new();
+  DafnyOptions theOptions;
+  int anonymousIds = 0;
+
+  /// <summary>
+  /// Holds the modifiers and attributes given for a declaration
+  ///
+  /// Not all modifiers are applicable to all kinds of declarations.
+  /// Errors are given when a modify does not apply.
+  /// We also record the tokens for the specified modifiers so that
+  /// they can be used in error messages.
+  /// </summary>
+  class DeclModifierData {
+    public bool IsReplaceable;
+    public IOrigin ReplaceableToken;
+    public bool IsAbstract;
+    public IOrigin AbstractToken;
+    public bool IsGhost;
+    public IOrigin GhostToken;
+    public bool IsStatic;
+    public IOrigin StaticToken;
+    public bool IsOpaque;
+    public IOrigin OpaqueToken;
+    public Token FirstTokenExceptAttributes;
+    public Attributes Attributes = null;
+
+    public Token FirstToken {
+      get {
+        Token result = FirstTokenExceptAttributes;
+        foreach (var attr in Attributes.AsEnumerable()) {
+          if (result == null || result.pos > attr.Origin.pos) {
+            result = attr.StartToken;
+          }
+        }
+
+        return result;
+      }
+    }
+  }
+
+  private ModuleKindEnum GetModuleKind(DeclModifierData mods) {
+    if (mods.IsReplaceable && mods.IsAbstract) {
+      SemErr(null, mods.ReplaceableToken, "Can't be both replaceable and abstract");
+    }
+
+    if (mods.IsReplaceable) {
+      return ModuleKindEnum.Replaceable;
+    }
+    if (mods.IsAbstract) {
+      return ModuleKindEnum.Abstract;
+    }
+
+    return ModuleKindEnum.Concrete;
+  }
+
+  /// <summary>
+  /// Before literals that end a block, we usually add CheckNoAttributes to avoid any non-attached or dangling attributes
+  /// </summary>
+  public void CheckNoAttributes(ref Attributes attrs) {
+    if (attrs != null) {
+      SemErr(ErrorId.p_extra_attributes, attrs.Origin, "Attribute not expected here");
+      attrs = null;
+    }
+  }
+
+  // Check that token has not been set, then set it.
+  public void CheckAndSetToken(ref IOrigin token) {
+    if (token != null) {
+      SemErr(ErrorId.p_duplicate_modifier, t, "Duplicate declaration modifier: " + t.val);
+    }
+    token = t;
+  }
+
+  // Check that token has not been set, then set it, but just ignores if it was set already
+  public void CheckAndSetTokenOnce(ref Token token) {
+    if (token == null) {
+      token = t;
+    }
+  }
+
+  /// <summary>
+  // A flags type used to tell what declaration modifiers are allowed for a declaration.
+  /// </summary>
+  [Flags]
+  enum AllowedDeclModifiers {
+    None = 0,
+    Abstract = 1,
+    Ghost = 2,
+
+    // Means ghost not allowed because already implicitly ghost.
+    AlreadyGhost = 4,
+    Static = 8,
+    Opaque = 16,
+    Replaceable = 32
+  };
+
+  bool CheckAttribute(Errors errors, IOrigin attr, SourceOrigin range) {
+    // attr is the identifier of the Attribute
+    // range is from opening brace to closing brace
+    if (attr.val == "ignore") {
+      errors.Warning(ErrorId.p_deprecated_attribute,
+        range,
+        $"attribute :{attr.val} is deprecated");
+      return false;
+    }
+    return true;
+  }
+
+  bool IsAssumeTypeKeyword(IOrigin la) {
+    return la.kind == _assume || la.kind == _assert || la.kind == _expect;
+  }
+
+  Expression ProcessTupleArgs(List<ActualBinding> args, IOrigin lp) {
+    if (args.Count == 1 && !args[0].IsGhost) {
+      if (args[0].FormalParameterName != null) {
+        SemErr(ErrorId.p_no_parenthesized_binding, lp, "binding not allowed in parenthesized expression");
+      }
+      return args[0].Actual;
+    } else {
+      // Compute the actual position of ghost arguments
+      var ghostness = new bool[args.Count];
+      for (var i = 0; i < args.Count; i++) {
+        ghostness[i] = false;
+      }
+      for (var i = 0; i < args.Count; i++) {
+        var arg = args[i];
+        if (arg.IsGhost) {
+          if (arg.FormalParameterName == null) {
+            ghostness[i] = true;
+          } else {
+            var success = int.TryParse(arg.FormalParameterName.val, out var index);
+            if (success && 0 <= index && index < args.Count) {
+              ghostness[index] = true;
+            }
+          }
+        }
+      }
+      var argumentGhostness = ghostness.ToList();
+      // make sure the corresponding tuple type exists
+      SystemModuleModifiers.Add(b => b.TupleType(lp, args.Count, true, argumentGhostness));
+      return new DatatypeValue(lp, SystemModuleManager.TupleTypeName(argumentGhostness), SystemModuleManager.TupleTypeCtorName(args.Count), args);
+    }
+  }
+
+
+  public void ApplyOptionsFromAttributes(Attributes attrs) {
+    var overrides = attrs.AsEnumerable().Where(a => a.Name == "options" || a is UserSuppliedAtAttribute { UserSuppliedName: "Options" })
+      .Reverse().Select(a =>
+        (token: a.Origin,
+         options: UserSuppliedAtAttribute.GetUserSuppliedArguments(a).Select(arg => {
+           if (arg is not LiteralExpr { Value: string optStr }) {
+             SemErr(ErrorId.p_literal_string_required, arg.Origin, "argument to :options attribute must be a literal string");
+             return null;
+           }
+           return optStr;
+         }).Where(opt => opt != null).ToArray()))
+      .Where(opts => opts.options.Any());
+
+    if (overrides.Any()) {
+      var options = new DafnyAttributeOptions(theOptions, errors);
+      foreach (var (token, opts) in overrides) {
+
+        var newOptionsCommand = new RootCommand();
+        newOptionsCommand.AddOption(CommonOptionBag.QuantifierSyntax);
+        newOptionsCommand.AddOption(Function.FunctionSyntaxOption);
+        var result = newOptionsCommand.Parse(string.Join(' ', opts));
+
+        if (!result.Errors.Any()) {
+          foreach (var option in newOptionsCommand.Options) {
+            var value = result.GetValueForOption(option);
+            options.Options.OptionArguments[option] = value;
+            options.ApplyBinding(option);
+          }
+          continue;
+        }
+
+        options.Token = token;
+        options.Parse(opts);
+      }
+      theOptions = options;
+    }
+  }
+
+  /// <summary>
+  /// Check the declaration modifiers against those that are allowed.
+  ///
+  /// The 'allowed' parameter specifies which declaration modifiers are allowed.
+  /// The 'declCaption' parameter should be a string describing the kind of declaration.
+  /// It is used in error messages.
+  /// Any declaration modifiers that are present but not allowed are cleared.
+  ///</summary>
+  void CheckDeclModifiers(ref DeclModifierData dmod, string declCaption, AllowedDeclModifiers allowed) {
+    declCaption = (declCaption.StartsWith("i") || declCaption.StartsWith("o") ? "an " : "a ") + declCaption;
+    if (dmod.IsAbstract && ((allowed & AllowedDeclModifiers.Abstract) == 0)) {
+      SemErr(ErrorId.p_abstract_not_allowed, dmod.AbstractToken, $"{declCaption} cannot be declared 'abstract'");
+      dmod.IsAbstract = false;
+    }
+    if (dmod.IsReplaceable && ((allowed & AllowedDeclModifiers.Replaceable) == 0)) {
+      SemErr(ErrorId.p_abstract_not_allowed, dmod.ReplaceableToken, $"{declCaption} cannot be declared 'replaceable'");
+      dmod.IsReplaceable = false;
+    }
+    if (dmod.IsGhost) {
+      if ((allowed & AllowedDeclModifiers.AlreadyGhost) != 0) {
+        if (declCaption.Contains("-by-method")) {
+          SemErr(ErrorId.p_no_ghost_for_by_method, dmod.GhostToken,
+            $"{declCaption} has a ghost function body and a non-ghost method body; {declCaption} declaration does not use the 'ghost' keyword.");
+        } else if (declCaption == "a function" || declCaption == "a predicate") {
+          SemErr(ErrorId.p_ghost_forbidden_default_3, dmod.GhostToken, $"{declCaption} cannot be declared 'ghost' (it is 'ghost' by default when using --function-syntax:3)");
+        } else {
+          SemErr(ErrorId.p_ghost_forbidden_default, dmod.GhostToken, $"{declCaption} cannot be declared 'ghost' (it is 'ghost' by default)");
+        }
+        dmod.IsGhost = false;
+      } else if ((allowed & AllowedDeclModifiers.Ghost) == 0) {
+        SemErr(ErrorId.p_ghost_forbidden, dmod.GhostToken, $"{declCaption} cannot be declared 'ghost'");
+        dmod.IsGhost = false;
+      }
+    }
+    if (dmod.IsStatic && ((allowed & AllowedDeclModifiers.Static) == 0)) {
+      SemErr(ErrorId.p_no_static, dmod.StaticToken, $"{declCaption} cannot be declared 'static'");
+      dmod.IsStatic = false;
+    }
+    if (dmod.IsOpaque && ((allowed & AllowedDeclModifiers.Opaque) == 0)) {
+      SemErr(ErrorId.p_no_opaque, dmod.OpaqueToken, $"{declCaption} cannot be declared 'opaque'");
+      dmod.IsOpaque = false;
+    }
+  }
+
+}
diff --git a/Source/DafnyCore/AST/Grammar/Printer.cs b/Source/DafnyCore/AST/Grammar/Printer.cs
deleted file mode 100644
index 98c5f190bf0..00000000000
--- a/Source/DafnyCore/AST/Grammar/Printer.cs
+++ /dev/null
@@ -1,3105 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) Microsoft Corporation.  All Rights Reserved.
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-//
-//-----------------------------------------------------------------------------
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.CommandLine;
-using System.Diagnostics.Contracts;
-using System.Numerics;
-using System.Linq;
-using DafnyCore;
-using JetBrains.Annotations;
-using Bpl = Microsoft.Boogie;
-
-namespace Microsoft.Dafny {
-
-  public enum PrintModes {
-    Everything,
-    Serialization, // Serializing the program to a file for lossless loading later
-    NoIncludes,
-    NoGhost
-  }
-
-
-  public record PrintFlags(bool UseOriginalDafnyNames = false);
-
-  public class Printer {
-    private DafnyOptions options;
-    static Printer() {
-      DafnyOptions.RegisterLegacyBinding(PrintMode, (options, value) => {
-        options.PrintMode = value;
-      });
-
-      DooFile.RegisterNoChecksNeeded(new Option[] {
-        PrintMode
-      });
-    }
-
-    public static readonly Option<PrintModes> PrintMode = new("--print-mode", () => PrintModes.Everything, @"
-Everything - Print everything listed below.
-DllEmbed - print the source that will be included in a compiled dll.
-NoIncludes - disable printing of {:verify false} methods
-    incorporated via the include mechanism, as well as datatypes and
-    fields included from other files.
-NoGhost - disable printing of functions, ghost methods, and proof
-    statements in implementation methods. It also disables anything
-    NoIncludes disables.".TrimStart()) {
-      IsHidden = true
-    };
-
-    TextWriter wr;
-    PrintModes printMode;
-    bool afterResolver;
-    bool printingExportSet = false;
-    bool printingDesugared = false;
-    private readonly PrintFlags printFlags;
-
-    [ContractInvariantMethod]
-    void ObjectInvariant() {
-      Contract.Invariant(wr != null);
-    }
-
-    public Printer(TextWriter wr, DafnyOptions options, PrintModes printMode = PrintModes.Everything, [CanBeNull] PrintFlags printFlags = null) {
-      Contract.Requires(wr != null);
-      this.wr = wr;
-      this.options = options;
-      this.printMode = printMode;
-      this.printFlags = printFlags ?? new PrintFlags();
-    }
-
-    public static string ExprToString(DafnyOptions options, Expression expr, [CanBeNull] PrintFlags printFlags = null) {
-      Contract.Requires(expr != null);
-      using var wr = new StringWriter();
-      var pr = new Printer(wr, options, printFlags: printFlags);
-      pr.PrintExpression(expr, false);
-      return wr.ToString();
-    }
-
-    public static string GuardToString(DafnyOptions options, bool isBindingGuard, Expression expr) {
-      Contract.Requires(!isBindingGuard || (expr is ExistsExpr && ((ExistsExpr)expr).Range == null));
-      using (var wr = new System.IO.StringWriter()) {
-        var pr = new Printer(wr, options);
-        pr.PrintGuard(isBindingGuard, expr);
-        return wr.ToString();
-      }
-    }
-
-    public static string ExtendedExprToString(DafnyOptions options, Expression expr) {
-      Contract.Requires(expr != null);
-      using (var wr = new System.IO.StringWriter()) {
-        var pr = new Printer(wr, options);
-        pr.PrintExtendedExpr(expr, 0, true, false);
-        return wr.ToString();
-      }
-    }
-
-    public static string FrameExprListToString(DafnyOptions options, List<FrameExpression> fexprs) {
-      Contract.Requires(fexprs != null);
-      using var wr = new StringWriter();
-      var pr = new Printer(wr, options);
-      pr.PrintFrameExpressionList(fexprs);
-      return wr.ToString();
-    }
-
-    public static string StatementToString(DafnyOptions options, Statement stmt) {
-      Contract.Requires(stmt != null);
-      using var wr = new StringWriter();
-      var pr = new Printer(wr, options);
-      pr.PrintStatement(stmt, 0);
-      return ToStringWithoutNewline(wr);
-    }
-
-    public static string IteratorClassToString(DafnyOptions options, IteratorDecl iter) {
-      Contract.Requires(iter != null);
-      using (var wr = new System.IO.StringWriter()) {
-        var pr = new Printer(wr, options);
-        pr.PrintIteratorClass(iter, 0, null);
-        return ToStringWithoutNewline(wr);
-      }
-    }
-
-    public static string IteratorSignatureToString(DafnyOptions options, IteratorDecl iter) {
-      Contract.Requires(iter != null);
-      using (var wr = new System.IO.StringWriter()) {
-        var pr = new Printer(wr, options);
-        pr.PrintIteratorSignature(iter, 0);
-        return ToStringWithoutNewline(wr);
-      }
-    }
-
-    public static string FieldToString(DafnyOptions options, Field field) {
-      Contract.Requires(field != null);
-      using (var wr = new StringWriter()) {
-        var pr = new Printer(wr, options);
-        pr.PrintField(field, 0);
-        return ToStringWithoutNewline(wr);
-      }
-    }
-
-    public static string FunctionSignatureToString(DafnyOptions options, Function f) {
-      Contract.Requires(f != null);
-      using var wr = new StringWriter();
-      var pr = new Printer(wr, options);
-      pr.PrintFunction(f, 0, true);
-      return ToStringWithoutNewline(wr);
-    }
-
-    public static string MethodSignatureToString(DafnyOptions options, Method m) {
-      Contract.Requires(m != null);
-      using (var wr = new System.IO.StringWriter()) {
-        var pr = new Printer(wr, options);
-        pr.PrintMethod(m, 0, true);
-        return ToStringWithoutNewline(wr);
-      }
-    }
-
-    /// <summary>
-    /// Returns a string for all attributes on the list "a".  Each attribute is
-    /// followed by a space.
-    /// </summary>
-    public static string AttributesToString(DafnyOptions options, Attributes a) {
-      if (a == null) {
-        return "";
-      } else {
-        return AttributesToString(options, a.Prev) + OneAttributeToString(options, a) + " ";
-      }
-    }
-
-    public static string OneAttributeToString(DafnyOptions options, Attributes a, string nameSubstitution = null) {
-      Contract.Requires(a != null);
-      using (var wr = new System.IO.StringWriter()) {
-        var pr = new Printer(wr, options);
-        pr.PrintOneAttribute(a, nameSubstitution);
-        return ToStringWithoutNewline(wr);
-      }
-    }
-
-    public static string ToStringWithoutNewline(System.IO.StringWriter wr) {
-      Contract.Requires(wr != null);
-      var sb = wr.GetStringBuilder();
-      var len = sb.Length;
-      while (len > 0 && (sb[len - 1] == '\n' || sb[len - 1] == '\r')) {
-        len--;
-      }
-      return sb.ToString(0, len);
-    }
-
-    public void PrintProgramLargeStack(Program prog, bool afterResolver) {
-      DafnyMain.LargeStackFactory.StartNew(() => PrintProgram(prog, afterResolver)).Wait();
-    }
-
-    public void PrintProgram(Program prog, bool afterResolver) {
-      Contract.Requires(prog != null);
-      this.afterResolver = afterResolver;
-      if (options.ShowEnv != Bpl.ExecutionEngineOptions.ShowEnvironment.Never) {
-        wr.WriteLine("// " + options.Version);
-        wr.WriteLine("// " + options.Environment);
-      }
-      if (options.PrintMode != PrintModes.Serialization) {
-        wr.WriteLine("// {0}", prog.Name);
-      }
-      if (options.DafnyPrintResolvedFile != null && options.PrintMode == PrintModes.Everything) {
-        wr.WriteLine();
-        wr.WriteLine("/*");
-        PrintModuleDefinition(prog.Compilation, prog.SystemModuleManager.SystemModule, null, 0, null, Path.GetFullPath(options.DafnyPrintResolvedFile));
-        wr.Write("// bitvector types in use:");
-        foreach (var w in prog.SystemModuleManager.Bitwidths) {
-          wr.Write(" bv{0}", w);
-        }
-        wr.WriteLine();
-        wr.WriteLine("*/");
-      }
-      wr.WriteLine();
-      PrintCallGraph(prog.DefaultModuleDef, 0);
-      PrintTopLevelDecls(prog.Compilation, prog.DefaultModuleDef.TopLevelDecls, 0, null, Path.GetFullPath(prog.FullName));
-      foreach (var tup in prog.DefaultModuleDef.PrefixNamedModules) {
-        var decls = new List<TopLevelDecl>() { tup.Module };
-        PrintTopLevelDecls(prog.Compilation, decls, 0, tup.Parts, Path.GetFullPath(prog.FullName));
-      }
-      wr.Flush();
-    }
-
-    public void PrintCallGraph(ModuleDefinition module, int indent) {
-      Contract.Requires(module != null);
-      Contract.Requires(0 <= indent);
-      if (options.DafnyPrintResolvedFile != null && options.PrintMode == PrintModes.Everything) {
-        // print call graph
-        Indent(indent); wr.WriteLine("/* CALL GRAPH for module {0}:", module.Name);
-        var SCCs = module.CallGraph.TopologicallySortedComponents();
-        // Sort output SCCs in order of: descending height, then decreasing size of SCC, then alphabetical order of the name of
-        // the representative element. By being this specific, we reduce changes in output from minor changes in the code. (With
-        // more effort, we could be even more deterministic, if needed in the future.)
-        SCCs.Sort((m, n) => {
-          var mm = module.CallGraph.GetSCCRepresentativePredecessorCount(m);
-          var nn = module.CallGraph.GetSCCRepresentativePredecessorCount(n);
-          if (mm < nn) {
-            return 1;
-          } else if (mm > nn) {
-            return -1;
-          }
-          mm = module.CallGraph.GetSCCSize(m);
-          nn = module.CallGraph.GetSCCSize(n);
-          if (mm < nn) {
-            return 1;
-          } else if (mm > nn) {
-            return -1;
-          }
-          return string.CompareOrdinal(m.NameRelativeToModule, n.NameRelativeToModule);
-        });
-        foreach (var callable in SCCs) {
-          Indent(indent);
-          wr.WriteLine(" * SCC at height {0}:", module.CallGraph.GetSCCRepresentativePredecessorCount(callable));
-          var r = module.CallGraph.GetSCC(callable);
-          foreach (var m in r) {
-            Indent(indent);
-            var maybeByMethod = m is Method method && method.IsByMethod ? " (by method)" : "";
-            wr.WriteLine($" *   {m.NameRelativeToModule}{maybeByMethod}");
-          }
-        }
-        Indent(indent); wr.WriteLine(" */");
-      }
-    }
-
-    public void PrintTopLevelDecls(CompilationData compilation, IEnumerable<TopLevelDecl> decls, int indent, IEnumerable<IToken>/*?*/ prefixIds, string fileBeingPrinted) {
-      Contract.Requires(decls != null);
-      int i = 0;
-      foreach (TopLevelDecl d in decls) {
-        Contract.Assert(d != null);
-        if (PrintModeSkipGeneral(d.tok, fileBeingPrinted)) { continue; }
-        if (d is AbstractTypeDecl) {
-          var at = (AbstractTypeDecl)d;
-          if (i++ != 0) { wr.WriteLine(); }
-          Indent(indent);
-          PrintClassMethodHelper("type", at.Attributes, at.Name + TPCharacteristicsSuffix(at.Characteristics), d.TypeArgs);
-          PrintExtendsClause(at);
-          if (at.Members.Count == 0) {
-            wr.WriteLine();
-          } else {
-            wr.WriteLine(" {");
-            PrintMembers(at.Members, indent + IndentAmount, fileBeingPrinted);
-            Indent(indent);
-            wr.WriteLine("}");
-          }
-        } else if (d is NewtypeDecl) {
-          var dd = (NewtypeDecl)d;
-          if (i++ != 0) { wr.WriteLine(); }
-          Indent(indent);
-          PrintClassMethodHelper("newtype", dd.Attributes, dd.Name, new List<TypeParameter>());
-          PrintExtendsClause(dd);
-          wr.Write(" = ");
-          if (dd.Var == null) {
-            PrintType(dd.BaseType);
-            wr.WriteLine();
-          } else {
-            wr.Write(dd.Var.DisplayName);
-            if (ShowType(dd.Var.Type)) {
-              wr.Write(": ");
-              PrintType(dd.BaseType);
-            }
-            wr.WriteLine();
-            Indent(indent + IndentAmount);
-            wr.Write("| ");
-            PrintExpression(dd.Constraint, true);
-            wr.WriteLine();
-            if (dd.WitnessKind != SubsetTypeDecl.WKind.CompiledZero) {
-              Indent(indent + IndentAmount);
-              PrintWitnessClause(dd);
-              wr.WriteLine();
-            }
-          }
-          if (dd.Members.Count != 0) {
-            Indent(indent);
-            wr.WriteLine("{");
-            PrintMembers(dd.Members, indent + IndentAmount, fileBeingPrinted);
-            Indent(indent);
-            wr.WriteLine("}");
-          }
-        } else if (d is SubsetTypeDecl subsetTypeDecl) {
-          if (i++ != 0) { wr.WriteLine(); }
-
-          PrintSubsetTypeDecl(subsetTypeDecl, indent);
-        } else if (d is TypeSynonymDecl) {
-          var dd = (TypeSynonymDecl)d;
-          if (i++ != 0) { wr.WriteLine(); }
-          Indent(indent);
-          PrintClassMethodHelper("type", dd.Attributes, dd.Name + TPCharacteristicsSuffix(dd.Characteristics), dd.TypeArgs);
-          wr.Write(" = ");
-          PrintType(dd.Rhs);
-          wr.WriteLine();
-        } else if (d is DatatypeDecl) {
-          var dd = (DatatypeDecl)d;
-          if (i++ != 0) { wr.WriteLine(); }
-          PrintDatatype(dd, indent, fileBeingPrinted);
-        } else if (d is IteratorDecl) {
-          var iter = (IteratorDecl)d;
-          if (i++ != 0) { wr.WriteLine(); }
-          PrintIteratorSignature(iter, indent);
-
-          if (iter.Body != null) {
-            Indent(indent);
-            PrintStatement(iter.Body, indent);
-            wr.WriteLine();
-          }
-
-          if (afterResolver) {
-            // also print the members that were created as part of the interpretation of the iterator
-            Contract.Assert(iter.Members.Count != 0);  // filled in during resolution
-            Indent(indent); wr.WriteLine("/*---------- iterator members ----------");
-            Indent(indent); PrintIteratorClass(iter, indent, fileBeingPrinted);
-            Indent(indent); wr.WriteLine("---------- iterator members ----------*/");
-          }
-
-        } else if (d is DefaultClassDecl defaultClassDecl) {
-          if (defaultClassDecl.Members.Count == 0) {
-            // print nothing
-          } else {
-            if (i++ != 0) { wr.WriteLine(); }
-            PrintMembers(defaultClassDecl.Members, indent, fileBeingPrinted);
-          }
-        } else if (d is ClassLikeDecl) {
-          var cl = (ClassLikeDecl)d;
-          if (i++ != 0) { wr.WriteLine(); }
-          PrintClass(cl, indent, fileBeingPrinted);
-
-        } else if (d is ClassLikeDecl) {
-          var cl = (ClassLikeDecl)d;
-          if (i++ != 0) { wr.WriteLine(); }
-          PrintClass(cl, indent, fileBeingPrinted);
-
-        } else if (d is ValuetypeDecl) {
-          var vtd = (ValuetypeDecl)d;
-          if (i++ != 0) { wr.WriteLine(); }
-          Indent(indent);
-          PrintClassMethodHelper("type", vtd.Attributes, vtd.Name, vtd.TypeArgs);
-          if (vtd.Members.Count == 0) {
-            wr.WriteLine(" { }");
-          } else {
-            wr.WriteLine(" {");
-            PrintMembers(vtd.Members, indent + IndentAmount, fileBeingPrinted);
-            Indent(indent);
-            wr.WriteLine("}");
-          }
-
-        } else if (d is ModuleDecl md) {
-          wr.WriteLine();
-          Indent(indent);
-          if (d is LiteralModuleDecl modDecl) {
-            if (printMode == PrintModes.Serialization && !modDecl.ModuleDef.ShouldCompile(compilation)) {
-              // This mode is used to losslessly serialize the source program by the C# and Library backends.
-              // Backends don't compile any code for modules not marked for compilation,
-              // so it's consistent to skip those modules here too. 
-              continue;
-            }
-
-            VisibilityScope scope = null;
-            if (modDecl.Signature != null) {
-              scope = modDecl.Signature.VisibilityScope;
-            }
-            PrintModuleDefinition(compilation, modDecl.ModuleDef, scope, indent, prefixIds, fileBeingPrinted);
-          } else if (d is AliasModuleDecl) {
-            var dd = (AliasModuleDecl)d;
-
-            wr.Write("import");
-            if (dd.Opened) {
-              wr.Write(" opened");
-            }
-            wr.Write(" {0}", dd.Name);
-            if (dd.Name != dd.TargetQId.ToString()) {
-              wr.Write(" = {0}", dd.TargetQId.ToString());
-            }
-            if (dd.Exports.Count == 1) {
-              wr.Write("`{0}", dd.Exports[0].val);
-            }
-            if (dd.Exports.Count > 1) {
-              wr.Write("`{{{0}}}", Util.Comma(dd.Exports, id => id.val));
-            }
-            wr.WriteLine();
-          } else if (d is AbstractModuleDecl) {
-            var dd = (AbstractModuleDecl)d;
-
-            wr.Write("import");
-            if (dd.Opened) {
-              wr.Write(" opened");
-            }
-            wr.Write(" {0} ", dd.Name);
-            wr.Write(": {0}", dd.QId.ToString());
-            if (dd.Exports.Count > 0) {
-              wr.Write("`{{{0}}}", Util.Comma(dd.Exports, id => id.val));
-            }
-            wr.WriteLine();
-
-          } else if (d is ModuleExportDecl) {
-            ModuleExportDecl e = (ModuleExportDecl)d;
-            if (!e.IsDefault) {
-              wr.Write("export {0}", e.Name);
-            } else {
-              wr.Write("export");
-            }
-
-            if (e.IsRefining) {
-              wr.Write(" ...");
-            }
-            if (e.Extends.Count > 0) {
-              wr.Write(" extends {0}", Util.Comma(e.Extends, id => id.val));
-            }
-
-            wr.WriteLine();
-            PrintModuleExportDecl(compilation, e, indent + IndentAmount, fileBeingPrinted);
-            wr.WriteLine();
-          } else {
-            Contract.Assert(false); // unexpected ModuleDecl
-          }
-        } else {
-          Contract.Assert(false); // unexpected TopLevelDecl
-        }
-      }
-    }
-
-    private void PrintSubsetTypeDecl(SubsetTypeDecl dd, int indent) {
-      Indent(indent);
-      PrintClassMethodHelper("type", dd.Attributes, dd.Name + TPCharacteristicsSuffix(dd.Characteristics), dd.TypeArgs);
-      wr.Write(" = ");
-      wr.Write(dd.Var.DisplayName);
-      if (ShowType(dd.Var.Type)) {
-        wr.Write(": ");
-        PrintType(dd.Rhs);
-      }
-
-      if (dd is NonNullTypeDecl) {
-        wr.Write(" ");
-      } else {
-        wr.WriteLine();
-        Indent(indent + IndentAmount);
-      }
-
-      wr.Write("| ");
-      PrintExpression(dd.Constraint, true);
-      if (dd.WitnessKind != SubsetTypeDecl.WKind.CompiledZero) {
-        if (dd is NonNullTypeDecl) {
-          wr.Write(" ");
-        } else {
-          wr.WriteLine();
-          Indent(indent + IndentAmount);
-        }
-
-        PrintWitnessClause(dd);
-      }
-
-      wr.WriteLine();
-    }
-
-    private void PrintWitnessClause(RedirectingTypeDecl dd) {
-      Contract.Requires(dd != null);
-      Contract.Requires(dd.WitnessKind != SubsetTypeDecl.WKind.CompiledZero);
-
-      switch (dd.WitnessKind) {
-        case SubsetTypeDecl.WKind.Ghost:
-          wr.Write("ghost ");
-          goto case SubsetTypeDecl.WKind.Compiled;
-        case SubsetTypeDecl.WKind.Compiled:
-          wr.Write("witness ");
-          PrintExpression(dd.Witness, true);
-          break;
-        case SubsetTypeDecl.WKind.OptOut:
-          wr.Write("witness *");
-          break;
-        case SubsetTypeDecl.WKind.Special:
-          wr.Write("/*special witness*/");
-          break;
-        case SubsetTypeDecl.WKind.CompiledZero:
-        default:
-          Contract.Assert(false);  // unexpected WKind
-          break;
-      }
-    }
-
-    void PrintModuleExportDecl(CompilationData compilation, ModuleExportDecl m, int indent, string fileBeingPrinted) {
-      Contract.Requires(m != null);
-
-      if (m.RevealAll) {
-        Indent(indent);
-        wr.WriteLine("reveals *");
-      }
-      if (m.ProvideAll) {
-        Indent(indent);
-        wr.WriteLine("provides *");
-      }
-      var i = 0;
-      while (i < m.Exports.Count) {
-        var start = i;
-        var bodyKind = m.Exports[start].Opaque;
-        do {
-          i++;
-        } while (i < m.Exports.Count && m.Exports[i].Opaque == bodyKind);
-        // print [start..i)
-        Indent(indent);
-        wr.Write("{0} ", bodyKind ? "provides" : "reveals");
-        wr.WriteLine(Util.Comma(i - start, j => m.Exports[start + j].ToString()));
-
-        if (options.DafnyPrintResolvedFile != null) {
-          Contract.Assert(!printingExportSet);
-          printingExportSet = true;
-          Indent(indent);
-          wr.WriteLine("/*----- exported view:");
-          for (int j = start; j < i; j++) {
-            var id = m.Exports[j];
-            if (id.Decl is TopLevelDecl) {
-              PrintTopLevelDecls(compilation, new List<TopLevelDecl> { (TopLevelDecl)id.Decl }, indent + IndentAmount, null, fileBeingPrinted);
-            } else if (id.Decl is MemberDecl) {
-              PrintMembers(new List<MemberDecl> { (MemberDecl)id.Decl }, indent + IndentAmount, fileBeingPrinted);
-            }
-          }
-          Indent(indent);
-          wr.WriteLine("-----*/");
-          Contract.Assert(printingExportSet);
-          printingExportSet = false;
-        }
-      }
-    }
-
-    public void PrintModuleDefinition(CompilationData compilation, ModuleDefinition module, VisibilityScope scope, int indent, IEnumerable<IToken>/*?*/ prefixIds, string fileBeingPrinted) {
-      Contract.Requires(module != null);
-      Contract.Requires(0 <= indent);
-      Type.PushScope(scope);
-      if (module.IsAbstract) {
-        wr.Write("abstract ");
-      }
-      wr.Write("module");
-      PrintAttributes(module.Attributes);
-      wr.Write(" ");
-      if (prefixIds != null) {
-        foreach (var p in prefixIds) {
-          wr.Write("{0}.", p.val);
-        }
-      }
-      wr.Write("{0} ", module.Name);
-      if (module.RefinementQId != null) {
-        wr.Write("refines {0} ", module.RefinementQId);
-      }
-      if (!module.TopLevelDecls.Any()) {
-        wr.WriteLine("{ }");
-      } else {
-        wr.WriteLine("{");
-        PrintCallGraph(module, indent + IndentAmount);
-        PrintTopLevelDeclsOrExportedView(compilation, module, indent, fileBeingPrinted);
-        Indent(indent);
-        wr.WriteLine("}");
-      }
-      Type.PopScope(scope);
-    }
-
-    void PrintTopLevelDeclsOrExportedView(CompilationData compilation, ModuleDefinition module, int indent, string fileBeingPrinted) {
-      var decls = module.TopLevelDecls;
-      // only filter based on view name after resolver.
-      if (afterResolver && options.DafnyPrintExportedViews.Count != 0) {
-        var views = options.DafnyPrintExportedViews.ToHashSet();
-        decls = decls.Where(d => views.Contains(d.FullName));
-      }
-      PrintTopLevelDecls(compilation, decls, indent + IndentAmount, null, fileBeingPrinted);
-      foreach (var tup in module.PrefixNamedModules) {
-        PrintTopLevelDecls(compilation, new TopLevelDecl[] { tup.Module }, indent + IndentAmount, tup.Parts, fileBeingPrinted);
-      }
-    }
-
-    void PrintIteratorSignature(IteratorDecl iter, int indent) {
-      Indent(indent);
-      PrintClassMethodHelper("iterator", iter.Attributes, iter.Name, iter.TypeArgs);
-      if (iter.IsRefining) {
-        wr.Write(" ...");
-      } else {
-        PrintFormals(iter.Ins, iter);
-        if (iter.Outs.Count != 0) {
-          if (iter.Ins.Count + iter.Outs.Count <= 3) {
-            wr.Write(" yields ");
-          } else {
-            wr.WriteLine();
-            Indent(indent + 2 * IndentAmount);
-            wr.Write("yields ");
-          }
-          PrintFormals(iter.Outs, iter);
-        }
-      }
-
-      int ind = indent + IndentAmount;
-      PrintSpec("requires", iter.Requires, ind);
-      if (iter.Reads.Expressions != null) {
-        PrintFrameSpecLine("reads", iter.Reads.Expressions, ind, iter.Reads.HasAttributes() ? iter.Reads.Attributes : null);
-      }
-      if (iter.Modifies.Expressions != null) {
-        PrintFrameSpecLine("modifies", iter.Modifies.Expressions, ind, iter.Modifies.HasAttributes() ? iter.Modifies.Attributes : null);
-      }
-      PrintSpec("yield requires", iter.YieldRequires, ind);
-      PrintSpec("yield ensures", iter.YieldEnsures, ind);
-      PrintSpec("ensures", iter.Ensures, ind);
-      PrintDecreasesSpec(iter.Decreases, ind);
-      wr.WriteLine();
-    }
-
-    private void PrintIteratorClass(IteratorDecl iter, int indent, string fileBeingPrinted) {
-      PrintClassMethodHelper("class", null, iter.Name, iter.TypeArgs);
-      wr.WriteLine(" {");
-      PrintMembers(iter.Members, indent + IndentAmount, fileBeingPrinted);
-      Indent(indent); wr.WriteLine("}");
-
-      Contract.Assert(iter.NonNullTypeDecl != null);
-      PrintSubsetTypeDecl(iter.NonNullTypeDecl, indent);
-    }
-
-    public void PrintClass(ClassLikeDecl c, int indent, string fileBeingPrinted) {
-      Contract.Requires(c != null);
-
-      Indent(indent);
-      PrintClassMethodHelper((c is TraitDecl) ? "trait" : "class", c.Attributes, c.Name, c.TypeArgs);
-      if (c.IsRefining) {
-        wr.Write(" ...");
-      } else {
-        PrintExtendsClause(c);
-      }
-
-      if (c.Members.Count == 0) {
-        wr.WriteLine(" { }");
-      } else {
-        wr.WriteLine(" {");
-        PrintMembers(c.Members, indent + IndentAmount, fileBeingPrinted);
-        Indent(indent);
-        wr.WriteLine("}");
-      }
-
-      if (options.DafnyPrintResolvedFile != null && c.NonNullTypeDecl != null) {
-        if (!printingExportSet) {
-          Indent(indent); wr.WriteLine("/*-- non-null type");
-        }
-        PrintSubsetTypeDecl(c.NonNullTypeDecl, indent);
-        if (!printingExportSet) {
-          Indent(indent); wr.WriteLine("*/");
-        }
-      }
-    }
-
-    private void PrintExtendsClause(TopLevelDeclWithMembers c) {
-      string sep = " extends ";
-      foreach (var trait in c.ParentTraits) {
-        wr.Write(sep);
-        PrintType(trait);
-        sep = ", ";
-      }
-    }
-
-    public void PrintMembers(List<MemberDecl> members, int indent, string fileBeingPrinted) {
-      Contract.Requires(members != null);
-
-      int state = 0;  // 0 - no members yet; 1 - previous member was a field; 2 - previous member was non-field
-      foreach (MemberDecl m in members) {
-        if (PrintModeSkipGeneral(m.tok, fileBeingPrinted)) { continue; }
-        if (printMode == PrintModes.Serialization && Attributes.Contains(m.Attributes, "auto_generated")) {
-          // omit this declaration
-        } else if (m is Method) {
-          if (state != 0) { wr.WriteLine(); }
-          PrintMethod((Method)m, indent, false);
-          var com = m as ExtremeLemma;
-          if (com != null && com.PrefixLemma != null) {
-            Indent(indent); wr.WriteLine("/***");
-            PrintMethod(com.PrefixLemma, indent, false);
-            Indent(indent); wr.WriteLine("***/");
-          }
-          state = 2;
-        } else if (m is Field) {
-          if (state == 2) { wr.WriteLine(); }
-          PrintField((Field)m, indent);
-          state = 1;
-        } else if (m is Function) {
-          if (state != 0) { wr.WriteLine(); }
-          PrintFunction((Function)m, indent, false);
-          if (m is ExtremePredicate fixp && fixp.PrefixPredicate != null) {
-            Indent(indent); wr.WriteLine("/*** (note, what is printed here does not show substitutions of calls to prefix predicates)");
-            PrintFunction(fixp.PrefixPredicate, indent, false);
-            Indent(indent); wr.WriteLine("***/");
-          }
-          state = 2;
-        } else {
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected member
-        }
-      }
-    }
-
-    /// <summary>
-    /// Prints no space before "kind", but does print a space before "attrs" and "name".
-    /// </summary>
-    void PrintClassMethodHelper(string kind, Attributes attrs, string name, List<TypeParameter> typeArgs) {
-      Contract.Requires(kind != null);
-      Contract.Requires(name != null);
-      Contract.Requires(typeArgs != null);
-
-      wr.Write(kind);
-      PrintAttributes(attrs);
-
-      if (ArrowType.IsArrowTypeName(name)) {
-        PrintArrowType(ArrowType.ANY_ARROW, name, typeArgs);
-      } else if (ArrowType.IsPartialArrowTypeName(name)) {
-        PrintArrowType(ArrowType.PARTIAL_ARROW, name, typeArgs);
-      } else if (ArrowType.IsTotalArrowTypeName(name)) {
-        PrintArrowType(ArrowType.TOTAL_ARROW, name, typeArgs);
-      } else if (SystemModuleManager.IsTupleTypeName(name)) {
-        wr.Write(" /*{0}*/ ({1})", name, Util.Comma(typeArgs, TypeParamString));
-      } else {
-        wr.Write(" {0}", name);
-        PrintTypeParams(typeArgs);
-      }
-    }
-
-    private void PrintTypeParams(List<TypeParameter> typeArgs) {
-      Contract.Requires(typeArgs != null);
-      Contract.Requires(
-        typeArgs.All(tp => tp.Name.StartsWith("_")) ||
-        typeArgs.All(tp => !tp.Name.StartsWith("_")));
-
-      if (typeArgs.Count != 0 && !typeArgs[0].Name.StartsWith("_")) {
-        wr.Write("<{0}>", Util.Comma(typeArgs, TypeParamString));
-      }
-    }
-
-    public string TypeParamString(TypeParameter tp) {
-      Contract.Requires(tp != null);
-      string variance;
-      switch (tp.VarianceSyntax) {
-        case TypeParameter.TPVarianceSyntax.Covariant_Permissive:
-          variance = "*";
-          break;
-        case TypeParameter.TPVarianceSyntax.Covariant_Strict:
-          variance = "+";
-          break;
-        case TypeParameter.TPVarianceSyntax.NonVariant_Permissive:
-          variance = "!";
-          break;
-        case TypeParameter.TPVarianceSyntax.NonVariant_Strict:
-          variance = "";
-          break;
-        case TypeParameter.TPVarianceSyntax.Contravariance:
-          variance = "-";
-          break;
-        default:
-          Contract.Assert(false);  // unexpected VarianceSyntax
-          throw new cce.UnreachableException();
-      }
-      return variance + tp.Name + TPCharacteristicsSuffix(tp.Characteristics);
-    }
-
-    private void PrintArrowType(string arrow, string internalName, List<TypeParameter> typeArgs) {
-      Contract.Requires(arrow != null);
-      Contract.Requires(internalName != null);
-      Contract.Requires(typeArgs != null);
-      Contract.Requires(1 <= typeArgs.Count);  // argument list ends with the result type
-      wr.Write(" /*{0}*/ ", internalName);
-      int arity = typeArgs.Count - 1;
-      if (arity != 1) {
-        wr.Write("(");
-      }
-      wr.Write(Util.Comma(arity, i => TypeParamString(typeArgs[i])));
-      if (arity != 1) {
-        wr.Write(")");
-      }
-      wr.Write(" {0} {1}", arrow, TypeParamString(typeArgs[arity]));
-    }
-
-    private void PrintTypeInstantiation(List<Type> typeArgs) {
-      Contract.Requires(typeArgs == null || typeArgs.Count != 0);
-      wr.Write(Type.TypeArgsToString(options, typeArgs));
-    }
-
-    public void PrintDatatype(DatatypeDecl dt, int indent, string fileBeingPrinted) {
-      Contract.Requires(dt != null);
-      Indent(indent);
-      PrintClassMethodHelper(dt is IndDatatypeDecl ? "datatype" : "codatatype", dt.Attributes, dt.Name, dt.TypeArgs);
-      PrintExtendsClause(dt);
-      wr.Write(" =");
-      string sep = "";
-      foreach (DatatypeCtor ctor in dt.Ctors) {
-        wr.Write(sep);
-        PrintClassMethodHelper(ctor.IsGhost ? " ghost" : "", ctor.Attributes, ctor.Name, new List<TypeParameter>());
-        if (ctor.Formals.Count != 0) {
-          PrintFormals(ctor.Formals, null);
-        }
-        sep = " |";
-      }
-      if (dt.Members.Count == 0) {
-        wr.WriteLine();
-      } else {
-        wr.WriteLine(" {");
-        PrintMembers(dt.Members, indent + IndentAmount, fileBeingPrinted);
-        Indent(indent);
-        wr.WriteLine("}");
-      }
-    }
-
-    /// <summary>
-    /// Prints a space before each attribute.
-    /// </summary>
-    public void PrintAttributes(Attributes a) {
-      if (a != null) {
-        PrintAttributes(a.Prev);
-        wr.Write(" ");
-        PrintOneAttribute(a);
-      }
-    }
-    public void PrintOneAttribute(Attributes a, string nameSubstitution = null) {
-      Contract.Requires(a != null);
-      var name = nameSubstitution ?? a.Name;
-      var usAttribute = name.StartsWith("_") || (options.DisallowExterns && name == "extern");
-      wr.Write("{1}{{:{0}", name, usAttribute ? "/*" : "");
-      if (a.Args != null) {
-        PrintAttributeArgs(a.Args, false);
-      }
-      wr.Write("}}{0}", usAttribute ? "*/" : "");
-
-    }
-
-    public void PrintAttributeArgs(List<Expression> args, bool isFollowedBySemicolon) {
-      Contract.Requires(args != null);
-      string prefix = " ";
-      foreach (var arg in args) {
-        Contract.Assert(arg != null);
-        wr.Write(prefix);
-        prefix = ", ";
-        PrintExpression(arg, isFollowedBySemicolon);
-      }
-    }
-
-    public void PrintField(Field field, int indent) {
-      Contract.Requires(field != null);
-      Indent(indent);
-      if (field.HasStaticKeyword) {
-        wr.Write("static ");
-      }
-      if (field.IsGhost) {
-        wr.Write("ghost ");
-      }
-      if (field is ConstantField) {
-        wr.Write("const");
-      } else {
-        wr.Write("var");
-      }
-      PrintAttributes(field.Attributes);
-      wr.Write(" {0}", field.Name);
-      if (ShowType(field.Type)) {
-        wr.Write(": ");
-        PrintType(field.Type);
-      }
-      if (field is ConstantField) {
-        var c = (ConstantField)field;
-        if (c.Rhs != null) {
-          wr.Write(" := ");
-          PrintExpression(c.Rhs, true);
-        }
-      } else if (field.IsUserMutable) {
-        // nothing more to say
-      } else if (field.IsMutable) {
-        wr.Write("  // non-assignable");
-      } else {
-        wr.Write("  // immutable");
-      }
-      wr.WriteLine();
-    }
-
-    public void PrintFunction(Function f, int indent, bool printSignatureOnly) {
-      Contract.Requires(f != null);
-
-      if (PrintModeSkipFunctionOrMethod(f.IsGhost, f.Attributes, f.Name)) { return; }
-      Indent(indent);
-      PrintClassMethodHelper(f.GetFunctionDeclarationKeywords(options), f.Attributes, f.Name, f.TypeArgs);
-      if (f.SignatureIsOmitted) {
-        wr.Write(" ...");
-      } else {
-        if (f is ExtremePredicate) {
-          PrintKTypeIndication(((ExtremePredicate)f).TypeOfK);
-        }
-        PrintFormals(f.Formals, f, f.Name);
-        if (f.Result != null || (f is not Predicate && f is not ExtremePredicate && f is not TwoStatePredicate && f is not PrefixPredicate)) {
-          wr.Write(": ");
-          if (f.Result != null) {
-            wr.Write("(");
-            PrintFormal(f.Result, false);
-            wr.Write(")");
-          } else {
-            PrintType(f.ResultType);
-          }
-        }
-      }
-
-      int ind = indent + IndentAmount;
-      PrintSpec("requires", f.Req, ind);
-      PrintFrameSpecLine("reads", f.Reads, ind, null);
-      PrintSpec("ensures", f.Ens, ind);
-      PrintDecreasesSpec(f.Decreases, ind);
-      wr.WriteLine();
-      if (f.Body != null && !printSignatureOnly) {
-        Indent(indent);
-        wr.WriteLine("{");
-        PrintExtendedExpr(f.Body, ind, true, false);
-        Indent(indent);
-        wr.Write("}");
-        if (f.ByMethodBody != null) {
-          wr.Write(" by method ");
-          if (options.DafnyPrintResolvedFile != null && f.ByMethodDecl != null) {
-            Contract.Assert(f.ByMethodDecl.Ens.Count == 1);
-            wr.Write("/* ensures");
-            PrintAttributedExpression(f.ByMethodDecl.Ens[0]);
-            wr.Write(" */ ");
-          }
-          PrintStatement(f.ByMethodBody, indent);
-        }
-        wr.WriteLine();
-      }
-    }
-
-    // ----------------------------- PrintMethod -----------------------------
-
-    const int IndentAmount = 2; // The amount of indent for each new scope
-    void Indent(int amount) {
-      Contract.Requires(0 <= amount);
-      wr.Write(new String(' ', amount));
-    }
-
-    private bool PrintModeSkipFunctionOrMethod(bool IsGhost, Attributes attributes, string name) {
-      if (printMode == PrintModes.NoGhost && IsGhost) { return true; }
-      if (printMode == PrintModes.NoIncludes || printMode == PrintModes.NoGhost) {
-        bool verify = true;
-        if (Attributes.ContainsBool(attributes, "verify", ref verify) && !verify) { return true; }
-        if (name.Contains("INTERNAL") || name.StartsWith("reveal_")) { return true; }
-      }
-      return false;
-    }
-
-    private bool PrintModeSkipGeneral(IToken tok, string fileBeingPrinted) {
-      return (printMode == PrintModes.NoIncludes || printMode == PrintModes.NoGhost)
-             && tok.Uri != null && fileBeingPrinted != null && tok.Uri.LocalPath != fileBeingPrinted;
-    }
-
-    public void PrintMethod(Method method, int indent, bool printSignatureOnly) {
-      Contract.Requires(method != null);
-
-      if (PrintModeSkipFunctionOrMethod(method.IsGhost, method.Attributes, method.Name)) { return; }
-      Indent(indent);
-      string k = method is Constructor ? "constructor" :
-        method is LeastLemma ? "least lemma" :
-        method is GreatestLemma ? "greatest lemma" :
-        method is Lemma || method is PrefixLemma ? "lemma" :
-        method is TwoStateLemma ? "twostate lemma" :
-        "method";
-      if (method.HasStaticKeyword) { k = "static " + k; }
-      if (method.IsGhost && !method.IsLemmaLike) {
-        k = "ghost " + k;
-      }
-      string nm = method is Constructor && !((Constructor)method).HasName ? "" : method.Name;
-      PrintClassMethodHelper(k, method.Attributes, nm, method.TypeArgs);
-      if (method.SignatureIsOmitted) {
-        wr.Write(" ...");
-      } else {
-        if (method is ExtremeLemma) {
-          PrintKTypeIndication(((ExtremeLemma)method).TypeOfK);
-        }
-        PrintFormals(method.Ins, method, method.Name);
-        if (method.Outs.Count != 0) {
-          if (method.Ins.Count + method.Outs.Count <= 3) {
-            wr.Write(" returns ");
-          } else {
-            wr.WriteLine();
-            Indent(indent + 2 * IndentAmount);
-            wr.Write("returns ");
-          }
-          PrintFormals(method.Outs, method);
-        }
-      }
-
-      int ind = indent + IndentAmount;
-      PrintSpec("requires", method.Req, ind);
-      if (method.Mod.Expressions != null) {
-        PrintFrameSpecLine("modifies", method.Mod.Expressions, ind, method.Mod.HasAttributes() ? method.Mod.Attributes : null);
-      }
-      PrintSpec("ensures", method.Ens, ind);
-      PrintDecreasesSpec(method.Decreases, ind);
-      wr.WriteLine();
-
-      if (method.Body != null && !printSignatureOnly) {
-        Indent(indent);
-        PrintStatement(method.Body, indent);
-        wr.WriteLine();
-      }
-    }
-
-    void PrintKTypeIndication(ExtremePredicate.KType kType) {
-      switch (kType) {
-        case ExtremePredicate.KType.Nat:
-          wr.Write("[nat]");
-          break;
-        case ExtremePredicate.KType.ORDINAL:
-          wr.Write("[ORDINAL]");
-          break;
-        case ExtremePredicate.KType.Unspecified:
-          break;
-        default:
-          Contract.Assume(false);  // unexpected KType value
-          break;
-      }
-    }
-
-    internal void PrintFormals(List<Formal> ff, ICallable/*?*/ context, string name = null) {
-      Contract.Requires(ff != null);
-      if (name != null && name.EndsWith("#")) {
-        wr.Write("[");
-        PrintFormal(ff[0], false);
-        wr.Write("]");
-        ff = new List<Formal>(ff.Skip(1));
-      }
-      wr.Write("(");
-      string sep = "";
-      foreach (Formal f in ff) {
-        Contract.Assert(f != null);
-        wr.Write(sep);
-        sep = ", ";
-        PrintFormal(f, (context is TwoStateLemma || context is TwoStateFunction) && f.InParam);
-      }
-      wr.Write(")");
-    }
-
-    void PrintFormal(Formal f, bool showNewKeyword) {
-      Contract.Requires(f != null);
-      if (showNewKeyword && !f.IsOld) {
-        wr.Write("new ");
-      }
-      if (f.IsOlder) {
-        Contract.Assert(f.HasName);
-        wr.Write("older ");
-      }
-      if (f.IsGhost) {
-        wr.Write("ghost ");
-      }
-      if (f.IsNameOnly) {
-        Contract.Assert(f.HasName);
-        wr.Write("nameonly ");
-      }
-      if (f.HasName) {
-        wr.Write("{0}: ", f.DisplayName);
-      }
-      PrintType(f.Type);
-      if (f.DefaultValue != null) {
-        wr.Write(" := ");
-        PrintExpression(f.DefaultValue, false);
-      }
-    }
-
-    internal void PrintDecreasesSpec(Specification<Expression> decs, int indent) {
-      Contract.Requires(decs != null);
-      if (printMode == PrintModes.NoGhost) { return; }
-      if (decs.Expressions != null && decs.Expressions.Count != 0) {
-        wr.WriteLine();
-        Indent(indent);
-        wr.Write("decreases");
-        if (decs.HasAttributes()) {
-          PrintAttributes(decs.Attributes);
-        }
-        wr.Write(" ");
-        PrintExpressionList(decs.Expressions, true);
-      }
-    }
-
-    internal void PrintFrameSpecLine(string kind, List<FrameExpression> ee, int indent, Attributes attrs) {
-      Contract.Requires(kind != null);
-      Contract.Requires(cce.NonNullElements(ee));
-      if (ee != null && ee.Count != 0) {
-        wr.WriteLine();
-        Indent(indent);
-        wr.Write("{0}", kind);
-        if (attrs != null) {
-          PrintAttributes(attrs);
-        }
-        wr.Write(" ");
-        PrintFrameExpressionList(ee);
-      }
-    }
-
-    internal void PrintSpec(string kind, List<AttributedExpression> ee, int indent) {
-      Contract.Requires(kind != null);
-      Contract.Requires(ee != null);
-      if (printMode == PrintModes.NoGhost) { return; }
-      foreach (AttributedExpression e in ee) {
-        Contract.Assert(e != null);
-        wr.WriteLine();
-        Indent(indent);
-        wr.Write("{0}", kind);
-        PrintAttributedExpression(e);
-      }
-    }
-
-    void PrintAttributedExpression(AttributedExpression e) {
-      Contract.Requires(e != null);
-
-      if (e.HasAttributes()) {
-        PrintAttributes(e.Attributes);
-      }
-
-      wr.Write(" ");
-      if (e.Label != null) {
-        wr.Write("{0}: ", e.Label.Name);
-      }
-      PrintExpression(e.E, true);
-    }
-
-    // ----------------------------- PrintType -----------------------------
-
-    public void PrintType(Type ty) {
-      Contract.Requires(ty != null);
-      wr.Write(ty.TypeName(options, null, true));
-    }
-
-    public void PrintType(string prefix, Type ty) {
-      Contract.Requires(prefix != null);
-      Contract.Requires(ty != null);
-      if (options.DafnyPrintResolvedFile != null) {
-        ty = ty.Normalize();
-      }
-      string s = ty.TypeName(options, null, true);
-      if (!(ty is TypeProxy) && !s.StartsWith("_")) {
-        wr.Write("{0}{1}", prefix, s);
-      }
-    }
-
-    public string TPCharacteristicsSuffix(TypeParameter.TypeParameterCharacteristics characteristics) {
-      string s = null;
-      if (characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Required ||
-        (characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.InferredRequired && options.DafnyPrintResolvedFile != null)) {
-        s = "==";
-      }
-      if (characteristics.HasCompiledValue) {
-        var prefix = s == null ? "" : s + ",";
-        s = prefix + "0";
-      } else if (characteristics.IsNonempty) {
-        var prefix = s == null ? "" : s + ",";
-        s = prefix + "00";
-      }
-      if (characteristics.ContainsNoReferenceTypes) {
-        var prefix = s == null ? "" : s + ",";
-        s = prefix + "!new";
-      }
-      if (s == null) {
-        return "";
-      } else {
-        return "(" + s + ")";
-      }
-    }
-
-    bool ShowType(Type t) {
-      Contract.Requires(t != null);
-      return !(t is TypeProxy) || options.DafnyPrintResolvedFile != null;
-    }
-
-    // ----------------------------- PrintStatement -----------------------------
-
-    /// <summary>
-    /// Prints from the current position of the current line.
-    /// If the statement requires several lines, subsequent lines are indented at "indent".
-    /// No newline is printed after the statement.
-    /// </summary>
-    public void PrintStatement(Statement stmt, int indent) {
-      Contract.Requires(stmt != null);
-
-      if (stmt.IsGhost && printMode == PrintModes.NoGhost) { return; }
-      for (LList<Label> label = stmt.Labels; label != null; label = label.Next) {
-        if (label.Data.Name != null) {
-          wr.WriteLine("label {0}:", label.Data.Name);
-          Indent(indent);
-        }
-      }
-
-      if (stmt is PredicateStmt) {
-        if (printMode == PrintModes.NoGhost) { return; }
-        Expression expr = ((PredicateStmt)stmt).Expr;
-        var assertStmt = stmt as AssertStmt;
-        var expectStmt = stmt as ExpectStmt;
-        wr.Write(assertStmt != null ? "assert" :
-                 expectStmt != null ? "expect" :
-                 "assume");
-        if (stmt.Attributes != null) {
-          PrintAttributes(stmt.Attributes);
-        }
-        wr.Write(" ");
-        if (assertStmt != null && assertStmt.Label != null) {
-          wr.Write("{0}: ", assertStmt.Label.Name);
-        }
-        PrintExpression(expr, true);
-        if (assertStmt != null && assertStmt.Proof != null) {
-          wr.Write(" by ");
-          PrintStatement(assertStmt.Proof, indent);
-        } else if (expectStmt != null && expectStmt.Message != null) {
-          wr.Write(", ");
-          PrintExpression(expectStmt.Message, true);
-        } else {
-          wr.Write(";");
-        }
-
-      } else if (stmt is PrintStmt) {
-        PrintStmt s = (PrintStmt)stmt;
-        wr.Write("print");
-        PrintAttributeArgs(s.Args, true);
-        wr.Write(";");
-
-      } else if (stmt is RevealStmt) {
-        var s = (RevealStmt)stmt;
-        wr.Write("reveal ");
-        var sep = "";
-        foreach (var e in s.Exprs) {
-          wr.Write(sep);
-          sep = ", ";
-          if (RevealStmt.SingleName(e) != null) {
-            // this will do the printing correctly for labels (or label-lookalikes) like 00_023 (which by PrintExpression below would be printed as 23)
-            wr.Write(RevealStmt.SingleName(e));
-          } else {
-            PrintExpression(e, true);
-          }
-        }
-        wr.Write(";");
-
-      } else if (stmt is BreakStmt) {
-        var s = (BreakStmt)stmt;
-        if (s.TargetLabel != null) {
-          wr.Write($"{s.Kind} {s.TargetLabel.val};");
-        } else {
-          for (int i = 0; i < s.BreakAndContinueCount - 1; i++) {
-            wr.Write("break ");
-          }
-          wr.Write($"{s.Kind};");
-        }
-
-      } else if (stmt is ProduceStmt) {
-        var s = (ProduceStmt)stmt;
-        wr.Write(s is YieldStmt ? "yield" : "return");
-        if (s.Rhss != null) {
-          var sep = " ";
-          foreach (var rhs in s.Rhss) {
-            wr.Write(sep);
-            PrintRhs(rhs);
-            sep = ", ";
-          }
-        }
-        wr.Write(";");
-
-      } else if (stmt is AssignStmt) {
-        AssignStmt s = (AssignStmt)stmt;
-        PrintExpression(s.Lhs, true);
-        wr.Write(" := ");
-        PrintRhs(s.Rhs);
-        wr.Write(";");
-
-      } else if (stmt is DividedBlockStmt) {
-        var sbs = (DividedBlockStmt)stmt;
-        wr.WriteLine("{");
-        int ind = indent + IndentAmount;
-        foreach (Statement s in sbs.BodyInit) {
-          Indent(ind);
-          PrintStatement(s, ind);
-          wr.WriteLine();
-        }
-        if (sbs.BodyProper.Count != 0 || sbs.SeparatorTok != null) {
-          Indent(indent + IndentAmount);
-          wr.WriteLine("new;");
-          foreach (Statement s in sbs.BodyProper) {
-            Indent(ind);
-            PrintStatement(s, ind);
-            wr.WriteLine();
-          }
-        }
-        Indent(indent);
-        wr.Write("}");
-
-      } else if (stmt is BlockStmt) {
-        wr.WriteLine("{");
-        int ind = indent + IndentAmount;
-        foreach (Statement s in ((BlockStmt)stmt).Body) {
-          Indent(ind);
-          PrintStatement(s, ind);
-          wr.WriteLine();
-        }
-        Indent(indent);
-        wr.Write("}");
-
-      } else if (stmt is IfStmt) {
-        IfStmt s = (IfStmt)stmt;
-        PrintIfStatement(indent, s, false);
-
-      } else if (stmt is AlternativeStmt) {
-        var s = (AlternativeStmt)stmt;
-        wr.Write("if");
-        PrintAttributes(s.Attributes);
-        if (s.UsesOptionalBraces) {
-          wr.Write(" {");
-        }
-        PrintAlternatives(indent + (s.UsesOptionalBraces ? IndentAmount : 0), s.Alternatives);
-        if (s.UsesOptionalBraces) {
-          wr.WriteLine();
-          Indent(indent);
-          wr.Write("}");
-        }
-      } else if (stmt is WhileStmt) {
-        var s = (WhileStmt)stmt;
-        PrintWhileStatement(indent, s, false, false);
-      } else if (stmt is AlternativeLoopStmt) {
-        var s = (AlternativeLoopStmt)stmt;
-        wr.Write("while");
-        PrintAttributes(s.Attributes);
-        PrintSpec("invariant", s.Invariants, indent + IndentAmount);
-        PrintDecreasesSpec(s.Decreases, indent + IndentAmount);
-        PrintFrameSpecLine("modifies", s.Mod.Expressions, indent + IndentAmount, s.Mod.Attributes);
-        bool hasSpecs = s.Invariants.Count != 0 || (s.Decreases.Expressions != null && s.Decreases.Expressions.Count != 0) || s.Mod.Expressions != null;
-        if (s.UsesOptionalBraces) {
-          if (hasSpecs) {
-            wr.WriteLine();
-            Indent(indent);
-          } else {
-            wr.Write(" ");
-          }
-          wr.Write("{");
-        }
-        Contract.Assert(s.Alternatives.Count != 0);
-        PrintAlternatives(indent + (s.UsesOptionalBraces ? IndentAmount : 0), s.Alternatives);
-        if (s.UsesOptionalBraces) {
-          wr.WriteLine();
-          Indent(indent);
-          wr.Write("}");
-        }
-
-      } else if (stmt is ForLoopStmt) {
-        var s = (ForLoopStmt)stmt;
-        PrintForLoopStatement(indent, s);
-
-      } else if (stmt is ForallStmt) {
-        var s = (ForallStmt)stmt;
-        if (options.DafnyPrintResolvedFile != null && s.ForallExpressions != null) {
-          foreach (var expr in s.ForallExpressions) {
-            PrintExpression(expr, false, new string(' ', indent + IndentAmount) + "ensures ");
-          }
-          if (s.Body != null) {
-            wr.WriteLine();
-            Indent(indent);
-          }
-        } else {
-          wr.Write("forall");
-          if (s.BoundVars.Count != 0) {
-            wr.Write(" ");
-            PrintQuantifierDomain(s.BoundVars, s.Attributes, s.Range);
-          }
-          PrintSpec("ensures", s.Ens, indent + IndentAmount);
-          if (s.Body != null) {
-            if (s.Ens.Count == 0) {
-              wr.Write(" ");
-            } else {
-              wr.WriteLine();
-              Indent(indent);
-            }
-          }
-        }
-        if (s.Body != null) {
-          PrintStatement(s.Body, indent);
-        }
-
-      } else if (stmt is ModifyStmt) {
-        var s = (ModifyStmt)stmt;
-        PrintModifyStmt(indent, s, false);
-
-      } else if (stmt is CalcStmt) {
-        CalcStmt s = (CalcStmt)stmt;
-        if (printMode == PrintModes.NoGhost) { return; }   // Calcs don't get a "ghost" attribute, but they are.
-        wr.Write("calc");
-        PrintAttributes(stmt.Attributes);
-        wr.Write(" ");
-        if (s.UserSuppliedOp != null) {
-          PrintCalcOp(s.UserSuppliedOp);
-          wr.Write(" ");
-        } else if (options.DafnyPrintResolvedFile != null && s.Op != null) {
-          PrintCalcOp(s.Op);
-          wr.Write(" ");
-        }
-        wr.WriteLine("{");
-        int lineInd = indent + IndentAmount;
-        int lineCount = s.Lines.Count == 0 ? 0 : s.Lines.Count - 1;  // if nonempty, .Lines always contains a duplicated last line
-        // The number of op/hints is commonly one less than the number of lines, but
-        // it can also equal the number of lines for empty calc's and for calc's with
-        // a dangling hint.
-        int hintCount = s.Lines.Count != 0 && s.Hints.Last().Body.Count == 0 ? lineCount - 1 : lineCount;
-        for (var i = 0; i < lineCount; i++) {
-          var e = s.Lines[i];
-          var op = s.StepOps[i];
-          var h = s.Hints[i];
-          // print the line
-          Indent(lineInd);
-          PrintExpression(e, true, lineInd);
-          wr.WriteLine(";");
-          if (i == hintCount) {
-            break;
-          }
-          // print the operator, if any
-          if (op != null || (options.DafnyPrintResolvedFile != null && s.Op != null)) {
-            Indent(indent);  // this lines up with the "calc"
-            PrintCalcOp(op ?? s.Op);
-            wr.WriteLine();
-          }
-          // print the hints
-          foreach (var st in h.Body) {
-            Indent(lineInd);
-            PrintStatement(st, lineInd);
-            wr.WriteLine();
-          }
-        }
-        Indent(indent);
-        wr.Write("}");
-      } else if (stmt is NestedMatchStmt) {
-        // Print ResolvedStatement, if present, as comment
-        var s = (NestedMatchStmt)stmt;
-
-        if (s.Flattened != null && options.DafnyPrintResolvedFile != null) {
-          wr.WriteLine();
-          if (!printingDesugared) {
-            Indent(indent); wr.WriteLine("/*---------- flattened ----------");
-          }
-
-          var savedDesugarMode = printingDesugared;
-          printingDesugared = true;
-          Indent(indent); PrintStatement(s.Flattened, indent);
-          wr.WriteLine();
-          printingDesugared = savedDesugarMode;
-
-          if (!printingDesugared) {
-            Indent(indent); wr.WriteLine("---------- end flattened ----------*/");
-          }
-          Indent(indent);
-        }
-
-        if (!printingDesugared) {
-          wr.Write("match");
-          PrintAttributes(s.Attributes);
-          wr.Write(" ");
-          PrintExpression(s.Source, false);
-          if (s.UsesOptionalBraces) {
-            wr.Write(" {");
-          }
-          int caseInd = indent + (s.UsesOptionalBraces ? IndentAmount : 0);
-          foreach (NestedMatchCaseStmt mc in s.Cases) {
-            wr.WriteLine();
-            Indent(caseInd);
-            wr.Write("case");
-            PrintAttributes(mc.Attributes);
-            wr.Write(" ");
-            PrintExtendedPattern(mc.Pat);
-            wr.Write(" =>");
-            foreach (Statement bs in mc.Body) {
-              wr.WriteLine();
-              Indent(caseInd + IndentAmount);
-              PrintStatement(bs, caseInd + IndentAmount);
-            }
-          }
-          if (s.UsesOptionalBraces) {
-            wr.WriteLine();
-            Indent(indent);
-            wr.Write("}");
-          }
-        }
-      } else if (stmt is MatchStmt) {
-        var s = (MatchStmt)stmt;
-        wr.Write("match");
-        PrintAttributes(s.Attributes);
-        wr.Write(" ");
-        PrintExpression(s.Source, false);
-        if (s.UsesOptionalBraces) {
-          wr.Write(" {");
-        }
-
-        int caseInd = indent + (s.UsesOptionalBraces ? IndentAmount : 0);
-        foreach (MatchCaseStmt mc in s.Cases) {
-          wr.WriteLine();
-          Indent(caseInd);
-          wr.Write("case");
-          PrintAttributes(mc.Attributes);
-          wr.Write(" ");
-          if (!mc.Ctor.Name.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
-            wr.Write(mc.Ctor.Name);
-          }
-
-          PrintMatchCaseArgument(mc);
-          wr.Write(" =>");
-          foreach (Statement bs in mc.Body) {
-            wr.WriteLine();
-            Indent(caseInd + IndentAmount);
-            PrintStatement(bs, caseInd + IndentAmount);
-          }
-        }
-
-        if (s.UsesOptionalBraces) {
-          wr.WriteLine();
-          Indent(indent);
-          wr.Write("}");
-        }
-
-      } else if (stmt is ConcreteUpdateStatement) {
-        var s = (ConcreteUpdateStatement)stmt;
-        string sep = "";
-        foreach (var lhs in s.Lhss) {
-          wr.Write(sep);
-          PrintExpression(lhs, true);
-          sep = ", ";
-        }
-        if (s.Lhss.Count > 0) {
-          wr.Write(" ");
-        }
-        PrintUpdateRHS(s, indent);
-        wr.Write(";");
-
-      } else if (stmt is CallStmt) {
-        // Most calls are printed from their concrete syntax given in the input. However, recursive calls to
-        // prefix lemmas end up as CallStmt's by the end of resolution and they may need to be printed here.
-        var s = (CallStmt)stmt;
-        PrintExpression(s.MethodSelect, false);
-        PrintActualArguments(s.Bindings, s.Method.Name, null);
-
-      } else if (stmt is VarDeclStmt) {
-        var s = (VarDeclStmt)stmt;
-        if (s.Locals.Exists(v => v.IsGhost) && printMode == PrintModes.NoGhost) { return; }
-        if (s.Locals.TrueForAll((v => v.IsGhost))) {
-          // Emit the "ghost" modifier if all of the variables are ghost. If some are ghost, but not others,
-          // then some of these ghosts are auto-converted to ghost, so we should not emit the "ghost" keyword.
-          wr.Write("ghost ");
-        }
-        wr.Write("var");
-        string sep = "";
-        foreach (var local in s.Locals) {
-          wr.Write(sep);
-          if (local.Attributes != null) {
-            PrintAttributes(local.Attributes);
-          }
-          wr.Write(" {0}", local.DisplayName);
-          PrintType(": ", local.OptionalType);
-          sep = ",";
-        }
-        if (s.Update != null) {
-          wr.Write(" ");
-          PrintUpdateRHS(s.Update, indent);
-        }
-        wr.Write(";");
-
-      } else if (stmt is VarDeclPattern) {
-        var s = (VarDeclPattern)stmt;
-        if (s.tok is AutoGeneratedToken) {
-          wr.Write("/* ");
-        }
-        if (s.HasGhostModifier) {
-          wr.Write("ghost ");
-        }
-        wr.Write("var ");
-        PrintCasePattern(s.LHS);
-        wr.Write(" := ");
-        PrintExpression(s.RHS, true);
-        wr.Write(";");
-        if (s.tok is AutoGeneratedToken) {
-          wr.Write(" */");
-        }
-
-      } else if (stmt is SkeletonStatement) {
-        var s = (SkeletonStatement)stmt;
-        if (s.S == null) {
-          wr.Write("...;");
-        } else if (s.S is AssertStmt) {
-          Contract.Assert(s.ConditionOmitted);
-          wr.Write("assert ...;");
-        } else if (s.S is ExpectStmt) {
-          Contract.Assert(s.ConditionOmitted);
-          wr.Write("expect ...;");
-        } else if (s.S is AssumeStmt) {
-          Contract.Assert(s.ConditionOmitted);
-          wr.Write("assume ...;");
-        } else if (s.S is IfStmt) {
-          PrintIfStatement(indent, (IfStmt)s.S, s.ConditionOmitted);
-        } else if (s.S is WhileStmt) {
-          PrintWhileStatement(indent, (WhileStmt)s.S, s.ConditionOmitted, s.BodyOmitted);
-        } else if (s.S is ModifyStmt) {
-          PrintModifyStmt(indent, (ModifyStmt)s.S, true);
-        } else {
-          Contract.Assert(false);
-          throw new cce.UnreachableException(); // unexpected skeleton statement
-        }
-
-      } else if (stmt is TryRecoverStatement haltRecoveryStatement) {
-        // These have no actual syntax for Dafny user code, so emit something
-        // clearly not parsable.
-        int ind = indent + IndentAmount;
-
-        Indent(indent);
-        wr.WriteLine("[[ try { ]]");
-        PrintStatement(haltRecoveryStatement.TryBody, ind);
-        wr.WriteLine();
-
-        Indent(indent);
-        wr.WriteLine($"[[ }} recover ({haltRecoveryStatement.HaltMessageVar.Name}) {{ ]]");
-        PrintStatement(haltRecoveryStatement.RecoverBody, ind);
-        wr.Write("[[ } ]]");
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected statement
-      }
-    }
-
-    private void PrintModifyStmt(int indent, ModifyStmt s, bool omitFrame) {
-      Contract.Requires(0 <= indent);
-      Contract.Requires(s != null);
-      Contract.Requires(!omitFrame || s.Mod.Expressions.Count == 0);
-
-      wr.Write("modify");
-      PrintAttributes(s.Mod.Attributes);
-      wr.Write(" ");
-      if (omitFrame) {
-        wr.Write("...");
-      } else {
-        PrintFrameExpressionList(s.Mod.Expressions);
-      }
-      if (s.Body != null) {
-        // There's a possible syntactic ambiguity, namely if the frame is empty (more precisely,
-        // if s.Mod.Expressions.Count is 0).  Since the statement was parsed at some point, this
-        // situation can occur only if the modify statement inherited its frame by refinement
-        // and we're printing the post-resolve AST.  In this special case, print an explicit
-        // empty set as the frame.
-        if (s.Mod.Expressions.Count == 0) {
-          wr.Write(" {}");
-        }
-        wr.Write(" ");
-        PrintStatement(s.Body, indent);
-      } else {
-        wr.Write(";");
-      }
-    }
-
-    /// <summary>
-    /// Does not print LHS, nor the space one might want between LHS and RHS,
-    /// because if there's no LHS, we don't want to start with a space
-    /// </summary>
-    void PrintUpdateRHS(ConcreteUpdateStatement s, int indent) {
-      Contract.Requires(s != null);
-      if (s is UpdateStmt) {
-        var update = (UpdateStmt)s;
-        if (update.Lhss.Count != 0) {
-          wr.Write(":= ");
-        }
-        var sep = "";
-        foreach (var rhs in update.Rhss) {
-          wr.Write(sep);
-          PrintRhs(rhs);
-          sep = ", ";
-        }
-      } else if (s is AssignSuchThatStmt) {
-        var update = (AssignSuchThatStmt)s;
-        wr.Write(":| ");
-        if (update.AssumeToken != null) {
-          wr.Write("assume");
-          PrintAttributes(update.AssumeToken.Attrs);
-          wr.Write(" ");
-        }
-        PrintExpression(update.Expr, true);
-      } else if (s is AssignOrReturnStmt) {
-        var stmt = (AssignOrReturnStmt)s;
-        wr.Write(":-");
-        if (stmt.KeywordToken != null) {
-          wr.Write($" {stmt.KeywordToken.Token.val}");
-          PrintAttributes(stmt.KeywordToken.Attrs);
-        }
-        wr.Write(" ");
-        PrintRhs(stmt.Rhs);
-        foreach (var rhs in stmt.Rhss) {
-          wr.Write(", ");
-          PrintRhs(rhs);
-        }
-        if (options.DafnyPrintResolvedFile != null && stmt.ResolvedStatements.Count > 0) {
-          wr.WriteLine();
-          Indent(indent); wr.WriteLine("/*---------- desugared ----------");
-          foreach (Statement r in stmt.ResolvedStatements) {
-            Indent(indent);
-            PrintStatement(r, indent);
-            wr.WriteLine();
-          }
-          Indent(indent); wr.Write("---------- end desugared ----------*/");
-        }
-
-      } else {
-        Contract.Assert(false);  // otherwise, unknown type
-      }
-    }
-
-    void PrintIfStatement(int indent, IfStmt s, bool omitGuard) {
-      wr.Write("if");
-      PrintAttributes(s.Attributes);
-      wr.Write(" ");
-      if (omitGuard) {
-        wr.Write("... ");
-      } else {
-        PrintGuard(s.IsBindingGuard, s.Guard);
-        wr.Write(" ");
-      }
-      PrintStatement(s.Thn, indent);
-      if (s.Els != null) {
-        wr.Write(" else");
-        if (!(s.Els is IfStmt) && s.Els.Attributes != null) {
-          PrintAttributes(s.Els.Attributes);
-        }
-        wr.Write(" ");
-        PrintStatement(s.Els, indent);
-      }
-    }
-
-    void PrintWhileStatement(int indent, WhileStmt s, bool omitGuard, bool omitBody) {
-      Contract.Requires(0 <= indent);
-      wr.Write("while");
-      PrintAttributes(s.Attributes);
-      wr.Write(" ");
-      if (omitGuard) {
-        wr.Write("...");
-      } else {
-        PrintGuard(false, s.Guard);
-      }
-
-      PrintSpec("invariant", s.Invariants, indent + IndentAmount);
-      PrintDecreasesSpec(s.Decreases, indent + IndentAmount);
-      PrintFrameSpecLine("modifies", s.Mod.Expressions, indent + IndentAmount, s.Mod.Attributes);
-      if (omitBody) {
-        wr.WriteLine();
-        Indent(indent + IndentAmount);
-        wr.Write("...;");
-      } else if (s.Body != null) {
-        if (s.Invariants.Count == 0 && s.Decreases.Expressions.Count == 0 && (s.Mod.Expressions == null || s.Mod.Expressions.Count == 0)) {
-          wr.Write(" ");
-        } else {
-          wr.WriteLine();
-          Indent(indent);
-        }
-        PrintStatement(s.Body, indent);
-      }
-    }
-
-    void PrintAlternatives(int indent, List<GuardedAlternative> alternatives) {
-      var startWithLine = true;
-      foreach (var alternative in alternatives) {
-        if (startWithLine) {
-          wr.WriteLine();
-        } else {
-          startWithLine = true;
-        }
-        Indent(indent);
-        wr.Write("case");
-        PrintAttributes(alternative.Attributes);
-        wr.Write(" ");
-        if (alternative.IsBindingGuard) {
-          var exists = (ExistsExpr)alternative.Guard;
-          PrintBindingGuard(exists);
-        } else {
-          PrintExpression(alternative.Guard, false);
-        }
-        wr.Write(" =>");
-        foreach (Statement s in alternative.Body) {
-          wr.WriteLine();
-          Indent(indent + IndentAmount);
-          PrintStatement(s, indent + IndentAmount);
-        }
-      }
-    }
-
-    void PrintForLoopStatement(int indent, ForLoopStmt s) {
-      Contract.Requires(0 <= indent);
-      Contract.Requires(s != null);
-      wr.Write("for");
-      PrintAttributes(s.Attributes);
-      wr.Write($" {s.LoopIndex.Name}");
-      PrintType(": ", s.LoopIndex.Type);
-      wr.Write(" := ");
-      PrintExpression(s.Start, false);
-      wr.Write(s.GoingUp ? " to " : " downto ");
-      if (s.End == null) {
-        wr.Write("*");
-      } else {
-        PrintExpression(s.End, false);
-      }
-
-      PrintSpec("invariant", s.Invariants, indent + IndentAmount);
-      PrintDecreasesSpec(s.Decreases, indent + IndentAmount);
-      if (s.Mod.Expressions != null) {
-        PrintFrameSpecLine("modifies", s.Mod.Expressions, indent + IndentAmount, s.Mod.HasAttributes() ? s.Mod.Attributes : null);
-      }
-      if (s.Body != null) {
-        if (s.Invariants.Count == 0 && s.Decreases.Expressions.Count == 0 && (s.Mod.Expressions == null || s.Mod.Expressions.Count == 0)) {
-          wr.Write(" ");
-        } else {
-          wr.WriteLine();
-          Indent(indent);
-        }
-        PrintStatement(s.Body, indent);
-      }
-    }
-
-    void PrintRhs(AssignmentRhs rhs) {
-      Contract.Requires(rhs != null);
-      if (rhs is ExprRhs) {
-        PrintExpression(((ExprRhs)rhs).Expr, true);
-      } else if (rhs is HavocRhs) {
-        wr.Write("*");
-      } else if (rhs is TypeRhs) {
-        TypeRhs t = (TypeRhs)rhs;
-        wr.Write("new ");
-        if (t.ArrayDimensions != null) {
-          if (ShowType(t.EType)) {
-            PrintType(t.EType);
-          }
-          if (options.DafnyPrintResolvedFile == null &&
-            t.InitDisplay != null && t.ArrayDimensions.Count == 1 &&
-            AutoGeneratedToken.Is(t.ArrayDimensions[0].tok)) {
-            // elide the size
-            wr.Write("[]");
-          } else {
-            string s = "[";
-            foreach (Expression dim in t.ArrayDimensions) {
-              Contract.Assume(dim != null);
-              wr.Write(s);
-              PrintExpression(dim, false);
-              s = ", ";
-            }
-            wr.Write("]");
-          }
-          if (t.ElementInit != null) {
-            wr.Write(" (");
-            PrintExpression(t.ElementInit, false);
-            wr.Write(")");
-          } else if (t.InitDisplay != null) {
-            wr.Write(" [");
-            PrintExpressionList(t.InitDisplay, false);
-            wr.Write("]");
-          }
-        } else if (t.Bindings == null) {
-          PrintType(t.EType);
-        } else {
-          PrintType(t.Path);
-          wr.Write("(");
-          PrintBindings(t.Bindings, false);
-          wr.Write(")");
-        }
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected RHS
-      }
-
-      if (rhs.HasAttributes()) {
-        PrintAttributes(rhs.Attributes);
-      }
-    }
-
-    void PrintGuard(bool isBindingGuard, Expression guard) {
-      Contract.Requires(!isBindingGuard || (guard is ExistsExpr && ((ExistsExpr)guard).Range == null));
-      if (guard == null) {
-        wr.Write("*");
-      } else if (isBindingGuard) {
-        var exists = (ExistsExpr)guard;
-        PrintBindingGuard(exists);
-      } else {
-        PrintExpression(guard, false);
-      }
-    }
-
-    void PrintBindingGuard(ExistsExpr guard) {
-      Contract.Requires(guard != null);
-      Contract.Requires(guard.Range == null);
-      PrintQuantifierDomain(guard.BoundVars, guard.Attributes, null);
-      wr.Write(" :| ");
-      PrintExpression(guard.Term, false);
-    }
-
-    void PrintCalcOp(CalcStmt.CalcOp op) {
-      Contract.Requires(op != null);
-      wr.Write(op.ToString());
-      if (op is CalcStmt.TernaryCalcOp) {
-        wr.Write("[");
-        PrintExpression(((CalcStmt.TernaryCalcOp)op).Index, false);
-        wr.Write("]");
-      }
-    }
-
-    // ----------------------------- PrintExpression -----------------------------
-
-    /// <summary>
-    /// PrintExtendedExpr prints an expression, but formats top-level if-then-else and match expressions across several lines.
-    /// Its intended use is thus to print the body of a function.
-    /// </summary>
-    public void PrintExtendedExpr(Expression expr, int indent, bool isRightmost, bool endWithCloseParen) {
-      Contract.Requires(expr != null);
-      if (expr is ITEExpr) {
-        Indent(indent);
-        while (true) {
-          var ite = (ITEExpr)expr;
-          wr.Write("if ");
-          PrintExpression(ite.Test, false);
-          wr.WriteLine(" then");
-          PrintExtendedExpr(ite.Thn, indent + IndentAmount, true, false);
-          expr = ite.Els;
-          if (expr is ITEExpr) {
-            Indent(indent); wr.Write("else ");
-          } else {
-            Indent(indent); wr.WriteLine("else");
-            Indent(indent + IndentAmount);
-            PrintExpression(expr, isRightmost, false);
-            wr.WriteLine(endWithCloseParen ? ")" : "");
-            return;
-          }
-        }
-
-      } else if (expr is NestedMatchExpr) {
-        var e = (NestedMatchExpr)expr;
-        if (e.Flattened != null && options.DafnyPrintResolvedFile != null) {
-          wr.WriteLine();
-          if (!printingDesugared) {
-            Indent(indent); wr.WriteLine("/*---------- flattened ----------");
-          }
-
-          var savedDesugarMode = printingDesugared;
-          printingDesugared = true;
-          PrintExtendedExpr(e.Flattened, indent, isRightmost, endWithCloseParen);
-          printingDesugared = savedDesugarMode;
-
-          if (!printingDesugared) {
-            Indent(indent); wr.WriteLine("---------- end flattened ----------*/");
-          }
-        }
-        if (!printingDesugared) {
-          Indent(indent);
-          var parensNeeded = !isRightmost && !e.UsesOptionalBraces;
-          if (parensNeeded) { wr.Write("("); }
-          wr.Write("match ");
-          PrintExpression(e.Source, isRightmost && e.Cases.Count == 0, false);
-          if (e.UsesOptionalBraces) {
-            wr.WriteLine(" {");
-          } else if (parensNeeded && e.Cases.Count == 0) {
-            wr.WriteLine(")");
-          } else {
-            wr.WriteLine();
-          }
-          int i = 0;
-          int ind = indent + (e.UsesOptionalBraces ? IndentAmount : 0);
-          foreach (var mc in e.Cases) {
-            bool isLastCase = i == e.Cases.Count - 1;
-            Indent(ind);
-            wr.Write("case");
-            PrintAttributes(mc.Attributes);
-            wr.Write(" ");
-            PrintExtendedPattern(mc.Pat);
-            wr.WriteLine(" =>");
-            PrintExtendedExpr(mc.Body, ind + IndentAmount, isLastCase, isLastCase && (parensNeeded || endWithCloseParen));
-            i++;
-          }
-          if (e.UsesOptionalBraces) {
-            Indent(indent);
-            wr.WriteLine("}");
-          }
-        }
-      } else if (expr is MatchExpr) {
-        var e = (MatchExpr)expr;
-        if (options.DafnyPrintResolvedFile == null && e.OrigUnresolved != null) {
-          PrintExtendedExpr(e.OrigUnresolved, indent, isRightmost, endWithCloseParen);
-        } else {
-          Indent(indent);
-          var parensNeeded = !isRightmost && !e.UsesOptionalBraces;
-          if (parensNeeded) { wr.Write("("); }
-          wr.Write("match ");
-          PrintExpression(e.Source, isRightmost && e.Cases.Count == 0, false);
-          if (e.UsesOptionalBraces) { wr.WriteLine(" {"); } else if (parensNeeded && e.Cases.Count == 0) { wr.WriteLine(")"); } else { wr.WriteLine(); }
-          int i = 0;
-          int ind = indent + (e.UsesOptionalBraces ? IndentAmount : 0);
-          foreach (var mc in e.Cases) {
-            bool isLastCase = i == e.Cases.Count - 1;
-            Indent(ind);
-            wr.Write("case");
-            PrintAttributes(mc.Attributes);
-            wr.Write(" ");
-            wr.Write(mc.Ctor.Name);
-            PrintMatchCaseArgument(mc);
-            wr.WriteLine(" =>");
-            PrintExtendedExpr(mc.Body, ind + IndentAmount, isLastCase, isLastCase && (parensNeeded || endWithCloseParen));
-            i++;
-          }
-          if (e.UsesOptionalBraces) {
-            Indent(indent);
-            wr.WriteLine("}");
-          }
-        }
-
-      } else if (expr is LetExpr) {
-        var e = (LetExpr)expr;
-        Indent(indent);
-        if (e.tok is AutoGeneratedToken) {
-          wr.Write("/* ");
-        }
-        if (e.LHSs.Exists(lhs => lhs != null && lhs.Var != null && lhs.Var.IsGhost)) { wr.Write("ghost "); }
-        wr.Write("var ");
-        string sep = "";
-        foreach (var lhs in e.LHSs) {
-          wr.Write(sep);
-          PrintCasePattern(lhs);
-          sep = ", ";
-        }
-        if (e.Exact) {
-          wr.Write(" := ");
-        } else {
-          PrintAttributes(e.Attributes);
-          wr.Write(" :| ");
-        }
-        PrintExpressionList(e.RHSs, true);
-        wr.Write(";");
-        if (e.tok is AutoGeneratedToken) {
-          wr.Write(" */");
-        }
-        wr.WriteLine();
-        PrintExtendedExpr(e.Body, indent, isRightmost, endWithCloseParen);
-      } else if (expr is StmtExpr && isRightmost) {
-        var e = (StmtExpr)expr;
-        Indent(indent);
-        PrintStatement(e.S, indent);
-        wr.WriteLine();
-        PrintExtendedExpr(e.E, indent, isRightmost, endWithCloseParen);
-
-      } else if (expr is ParensExpression) {
-        PrintExtendedExpr(((ParensExpression)expr).E, indent, isRightmost, endWithCloseParen);
-      } else {
-        Indent(indent);
-        PrintExpression(expr, false, indent);
-        wr.WriteLine(endWithCloseParen ? ")" : "");
-      }
-    }
-
-    public void PrintMatchCaseArgument(MatchCase mc) {
-      Contract.Assert(mc.Arguments != null);
-      if (mc.Arguments.Count != 0) {
-        string sep = "(";
-        foreach (BoundVar bv in mc.Arguments) {
-          wr.Write("{0}{1}", sep, bv.DisplayName);
-          string typeName = bv.Type.TypeName(options, null, true);
-          if (bv.Type is NonProxyType && !typeName.StartsWith("_")) {
-            wr.Write(": {0}", typeName);
-          }
-          sep = ", ";
-        }
-        wr.Write(")");
-      }
-    }
-
-    public void PrintExpression(Expression expr, bool isFollowedBySemicolon) {
-      Contract.Requires(expr != null);
-      PrintExpr(expr, 0, false, true, isFollowedBySemicolon, -1);
-    }
-
-    public void PrintExpression(Expression expr, bool isRightmost, bool isFollowedBySemicolon) {
-      Contract.Requires(expr != null);
-      PrintExpr(expr, 0, false, isRightmost, isFollowedBySemicolon, -1);
-    }
-
-    /// <summary>
-    /// An indent of -1 means print the entire expression on one line.
-    /// </summary>
-    public void PrintExpression(Expression expr, bool isFollowedBySemicolon, int indent) {
-      Contract.Requires(expr != null);
-      PrintExpr(expr, 0, false, true, isFollowedBySemicolon, indent);
-    }
-
-    public void PrintExpression(Expression expr, bool isFollowedBySemicolon, string keyword) {
-      Contract.Requires(expr != null);
-      PrintExpr(expr, 0, false, true, isFollowedBySemicolon, -1, keyword);
-    }
-
-    private bool ParensNeeded(int opBindingStrength, int contextBindingStrength, bool fragileContext) {
-      return opBindingStrength < contextBindingStrength ||
-             (fragileContext && opBindingStrength == contextBindingStrength);
-    }
-
-    /// <summary>
-    /// An indent of -1 means print the entire expression on one line.
-    /// </summary>
-    void PrintExpr(Expression expr, int contextBindingStrength, bool fragileContext, bool isRightmost, bool isFollowedBySemicolon, int indent, string keyword = null, int resolv_count = 2) {
-      Contract.Requires(-1 <= indent);
-      Contract.Requires(expr != null);
-
-      /* When debugging:
-      if (resolv_count > 0 && expr.Resolved != null) {
-        PrintExpr(expr.Resolved, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent, resolv_count - 1);
-        return;
-      }
-      */
-
-      if (expr is StaticReceiverExpr) {
-        StaticReceiverExpr e = (StaticReceiverExpr)expr;
-        wr.Write(e.Type);
-      } else if (expr is LiteralExpr) {
-        LiteralExpr e = (LiteralExpr)expr;
-        if (e.Value == null) {
-          wr.Write("null");
-        } else if (e.Value is bool) {
-          wr.Write((bool)e.Value ? "true" : "false");
-        } else if (e is CharLiteralExpr) {
-          wr.Write("'{0}'", (string)e.Value);
-        } else if (e is StringLiteralExpr) {
-          var str = (StringLiteralExpr)e;
-          wr.Write("{0}\"{1}\"", str.IsVerbatim ? "@" : "", (string)e.Value);
-        } else if (e.Value is BaseTypes.BigDec) {
-          BaseTypes.BigDec dec = (BaseTypes.BigDec)e.Value;
-          wr.Write((dec.Mantissa >= 0) ? "" : "-");
-          string s = BigInteger.Abs(dec.Mantissa).ToString();
-          int digits = s.Length;
-          if (dec.Exponent >= 0) {
-            wr.Write("{0}{1}.0", s, new string('0', dec.Exponent));
-          } else {
-            int exp = -dec.Exponent;
-            if (exp < digits) {
-              int intDigits = digits - exp;
-              int fracDigits = digits - intDigits;
-              wr.Write("{0}.{1}", s.Substring(0, intDigits), s.Substring(intDigits, fracDigits));
-            } else {
-              int fracDigits = digits;
-              wr.Write("0.{0}{1}", new string('0', exp - fracDigits), s.Substring(0, fracDigits));
-            }
-          }
-        } else {
-          wr.Write((BigInteger)e.Value);
-        }
-
-      } else if (expr is ThisExpr) {
-        wr.Write("this");
-
-      } else if (expr is IdentifierExpr) {
-        var e = (IdentifierExpr)expr;
-        if (printFlags.UseOriginalDafnyNames) {
-          wr.Write(e.DafnyName);
-        } else {
-          wr.Write(e.Name);
-        }
-
-      } else if (expr is DatatypeValue) {
-        var dtv = (DatatypeValue)expr;
-        bool printParens;
-        if (dtv.MemberName.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
-          // we're looking at a tuple, whose printed constructor name is essentially the empty string
-          printParens = true;
-        } else {
-          var typeArgs = "";
-          if (dtv.InferredTypeArgs != null && dtv.InferredTypeArgs.Count != 0) {
-            typeArgs = $"<{string.Join(",", dtv.InferredTypeArgs.ConvertAll(ty => ty.ToString()))}>";
-          }
-          wr.Write("{0}{1}.{2}", dtv.DatatypeName, typeArgs, dtv.MemberName);
-          printParens = dtv.Arguments.Count != 0;
-        }
-        if (printParens) {
-          PrintActualArguments(dtv.Bindings, null, null);
-        }
-
-      } else if (expr is DisplayExpression) {
-        DisplayExpression e = (DisplayExpression)expr;
-        if (e is MultiSetDisplayExpr) {
-          wr.Write("multiset");
-        } else if (e is SetDisplayExpr && !((SetDisplayExpr)e).Finite) {
-          wr.Write("iset");
-        }
-        wr.Write(e is SetDisplayExpr || e is MultiSetDisplayExpr ? "{" : "[");
-        PrintExpressionList(e.Elements, false);
-        wr.Write(e is SetDisplayExpr || e is MultiSetDisplayExpr ? "}" : "]");
-
-      } else if (expr is MapDisplayExpr) {
-        MapDisplayExpr e = (MapDisplayExpr)expr;
-        wr.Write(e.Finite ? "map" : "imap");
-        wr.Write("[");
-        PrintExpressionPairList(e.Elements);
-        wr.Write("]");
-
-      } else if (expr is NameSegment) {
-        var e = (NameSegment)expr;
-        wr.Write(e.Name);
-        if (e.OptTypeArguments != null) {
-          PrintTypeInstantiation(e.OptTypeArguments);
-        }
-
-      } else if (expr is ExprDotName) {
-        var e = (ExprDotName)expr;
-        // determine if parens are needed
-        int opBindingStrength = 0x90;
-        bool parensNeeded = !e.Lhs.IsImplicit && // KRML: I think that this never holds
-          ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-        if (!e.Lhs.IsImplicit) {
-          PrintExpr(e.Lhs, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
-          if (e.Lhs.Type is Resolver_IdentifierExpr.ResolverType_Type) {
-            Contract.Assert(e.Lhs is NameSegment || e.Lhs is ExprDotName);  // these are the only expressions whose .Type can be ResolverType_Type
-            if (options.DafnyPrintResolvedFile != null && options.PrintMode == PrintModes.Everything) {
-              // The printing of e.Lhs printed the type arguments only if they were given explicitly in the input.
-              var optionalTypeArgs = e.Lhs is NameSegment ns ? ns.OptTypeArguments : ((ExprDotName)e.Lhs).OptTypeArguments;
-              if (optionalTypeArgs == null && e.Lhs.Resolved is Resolver_IdentifierExpr ri) {
-                PrintTypeInstantiation(ri.TypeArgs);
-              }
-            }
-          }
-          wr.Write(".");
-        }
-        wr.Write(e.SuffixName);
-        PrintTypeInstantiation(e.OptTypeArguments);
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is ApplySuffix) {
-        var e = (ApplySuffix)expr;
-        // determine if parens are needed
-        int opBindingStrength = 0x90;
-        bool parensNeeded = !e.Lhs.IsImplicit &&  // KRML: I think that this never holds
-          ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-        if (ParensMayMatter(e.Lhs)) {
-          wr.Write("(");
-          PrintExpression(e.Lhs, false);
-          wr.Write(")");
-        } else {
-          PrintExpr(e.Lhs, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
-        }
-        string name = e.Lhs is NameSegment ? ((NameSegment)e.Lhs).Name : e.Lhs is ExprDotName ? ((ExprDotName)e.Lhs).SuffixName : null;
-        PrintActualArguments(e.Bindings, name, e.AtTok);
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is MemberSelectExpr) {
-        MemberSelectExpr e = (MemberSelectExpr)expr;
-        // determine if parens are needed
-        int opBindingStrength = 0x90;
-        bool parensNeeded = !e.Obj.IsImplicit &&
-          ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-        if (!(e.Obj.IsImplicit)) {
-          PrintExpr(e.Obj, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
-          wr.Write(".");
-        }
-        wr.Write(e.MemberName);
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is SeqSelectExpr) {
-        SeqSelectExpr e = (SeqSelectExpr)expr;
-        // determine if parens are needed
-        int opBindingStrength = 0x90;
-        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-        PrintExpr(e.Seq, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, indent, keyword);
-        wr.Write("[");
-        if (e.SelectOne) {
-          Contract.Assert(e.E0 != null);
-          PrintExpression(e.E0, false);
-        } else {
-          if (e.E0 != null) {
-            PrintExpression(e.E0, false);
-          }
-          wr.Write(e.E0 != null && e.E1 != null ? " .. " : "..");
-          if (e.E1 != null) {
-            PrintExpression(e.E1, false);
-          }
-        }
-        wr.Write("]");
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is MultiSelectExpr) {
-        MultiSelectExpr e = (MultiSelectExpr)expr;
-        // determine if parens are needed
-        int opBindingStrength = 0x90;
-        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-        PrintExpr(e.Array, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, indent, keyword);
-        string prefix = "[";
-        foreach (Expression idx in e.Indices) {
-          Contract.Assert(idx != null);
-          wr.Write(prefix);
-          PrintExpression(idx, false);
-          prefix = ", ";
-        }
-        wr.Write("]");
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is SeqUpdateExpr) {
-        SeqUpdateExpr e = (SeqUpdateExpr)expr;
-        // determine if parens are needed
-        int opBindingStrength = 0x90;
-        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-        PrintExpr(e.Seq, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, indent, keyword);
-        wr.Write("[");
-        PrintExpression(e.Index, false);
-        wr.Write(" := ");
-        PrintExpression(e.Value, false);
-        wr.Write("]");
-        if (parensNeeded) { wr.Write(")"); }
-      } else if (expr is DatatypeUpdateExpr) {
-        var e = (DatatypeUpdateExpr)expr;
-        // determine if parens are needed
-        int opBindingStrength = 0x90;
-        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-        PrintExpr(e.Root, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, indent, keyword);
-        wr.Write(".(");
-        var sep = "";
-        foreach (var update in e.Updates) {
-          wr.Write("{0}{1} := ", sep, update.Item2);
-          PrintExpression(update.Item3, false);
-          sep = ", ";
-        }
-        wr.Write(")");
-        if (options.DafnyPrintResolvedFile != null && options.PrintMode == PrintModes.Everything) {
-          if (e.ResolvedExpression != null) {
-            wr.Write("/*");
-            PrintExpression(e.ResolvedExpression, false);
-            wr.Write("*/");
-          }
-        }
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is ApplyExpr) {
-        var e = (ApplyExpr)expr;
-        // determine if parens are needed
-        int opBindingStrength = 0x90;
-        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-
-        PrintExpr(e.Function, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
-        wr.Write("(");
-        PrintExpressionList(e.Args, false);
-        wr.Write(")");
-
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is FunctionCallExpr) {
-        var e = (FunctionCallExpr)expr;
-        // determine if parens are needed
-        int opBindingStrength = 0x90;
-        bool parensNeeded = !(e.Receiver.IsImplicit) &&
-          ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-        if (!e.Receiver.IsImplicit) {
-          PrintExpr(e.Receiver, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
-          wr.Write(".");
-        }
-        wr.Write(e.Name);
-        /* When debugging, this is nice to have:
-        if (e.TypeArgumentSubstitutions.Count > 0) {
-          wr.Write("[");
-          wr.Write(Util.Comma(",", e.TypeArgumentSubstitutions, kv => kv.Key.FullName() + "->" + kv.Value));
-          wr.Write("]");
-        }
-        */
-        if (e.OpenParen == null && e.Args.Count == 0) {
-        } else {
-          PrintActualArguments(e.Bindings, e.Name, null);
-        }
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is SeqConstructionExpr) {
-        var e = (SeqConstructionExpr)expr;
-        wr.Write("seq");
-        if (e.ExplicitElementType != null) {
-          wr.Write("<{0}>", e.ExplicitElementType);
-        }
-        wr.Write("(");
-        PrintExpression(e.N, false);
-        wr.Write(", ");
-        PrintExpression(e.Initializer, false);
-        wr.Write(")");
-
-      } else if (expr is MultiSetFormingExpr) {
-        wr.Write("multiset(");
-        PrintExpression(((MultiSetFormingExpr)expr).E, false);
-        wr.Write(")");
-
-      } else if (expr is OldExpr) {
-        var e = (OldExpr)expr;
-        wr.Write("old");
-        if (e.At != null) {
-          wr.Write("@{0}", e.At);
-        }
-        wr.Write("(");
-        PrintExpression(e.E, false);
-        wr.Write(")");
-
-      } else if (expr is UnchangedExpr) {
-        var e = (UnchangedExpr)expr;
-        wr.Write("unchanged");
-        if (e.At != null) {
-          wr.Write("@{0}", e.At);
-        }
-        wr.Write("(");
-        PrintFrameExpressionList(e.Frame);
-        wr.Write(")");
-
-      } else if (expr is FreshExpr) {
-        var e = (FreshExpr)expr;
-        var label = e.At;
-        wr.Write("fresh{0}(", label == null ? "" : "@" + label);
-        PrintExpression(e.E, false);
-        wr.Write(")");
-
-      } else if (expr is UnaryOpExpr) {
-        var e = (UnaryOpExpr)expr;
-        if (e.Op == UnaryOpExpr.Opcode.Cardinality) {
-          wr.Write("|");
-          PrintExpression(e.E, false);
-          wr.Write("|");
-        } else if (e.Op == UnaryOpExpr.Opcode.Allocated) {
-          wr.Write("allocated(");
-          PrintExpression(e.E, false);
-          wr.Write(")");
-        } else if (e.Op == UnaryOpExpr.Opcode.Lit) {
-          wr.Write("Lit(");
-          PrintExpression(e.E, false);
-          wr.Write(")");
-        } else {
-          Contract.Assert(e.Op != UnaryOpExpr.Opcode.Fresh); // this is handled is "is FreshExpr" case above
-          // Prefix operator.
-          // determine if parens are needed
-          string op;
-          int opBindingStrength;
-          switch (e.Op) {
-            case UnaryOpExpr.Opcode.Not:
-              op = "!"; opBindingStrength = 0x80; break;
-            default:
-              Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary opcode
-          }
-          bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-          if (parensNeeded) { wr.Write("("); }
-          wr.Write(op);
-          PrintExpr(e.E, opBindingStrength, false, parensNeeded || isRightmost, !parensNeeded && isFollowedBySemicolon, -1, keyword);
-          if (parensNeeded) { wr.Write(")"); }
-        }
-
-      } else if (expr is TypeUnaryExpr) {
-        var e = (TypeUnaryExpr)expr;
-        int opBindingStrength = 0x70;
-        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-        PrintExpr(e.E, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
-        Contract.Assert(e is ConversionExpr || e is TypeTestExpr);
-        wr.Write(e is ConversionExpr ? " as " : " is ");
-        PrintType(e.ToType);
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is BinaryExpr) {
-        var e = (BinaryExpr)expr;
-        // determine if parens are needed
-        int opBindingStrength;
-        bool fragileLeftContext = false;  // false means "allow same binding power on left without parens"
-        bool fragileRightContext = false;  // false means "allow same binding power on right without parens"
-        switch (e.Op) {
-          case BinaryExpr.Opcode.LeftShift:
-          case BinaryExpr.Opcode.RightShift:
-            opBindingStrength = 0x48; fragileRightContext = true; break;
-          case BinaryExpr.Opcode.Add: {
-              opBindingStrength = 0x40;
-              var t1 = e.E1.Type;
-              fragileRightContext = t1 == null || !(t1.IsIntegerType || t1.IsRealType || t1.IsBigOrdinalType || t1.IsBitVectorType);
-              break;
-            }
-          case BinaryExpr.Opcode.Sub:
-            opBindingStrength = 0x40; fragileRightContext = true; break;
-          case BinaryExpr.Opcode.Mul: {
-              opBindingStrength = 0x50;
-              var t1 = e.E1.Type;
-              fragileRightContext = t1 == null || !(t1.IsIntegerType || t1.IsRealType || t1.IsBigOrdinalType || t1.IsBitVectorType);
-              break;
-            }
-          case BinaryExpr.Opcode.Div:
-          case BinaryExpr.Opcode.Mod:
-            opBindingStrength = 0x50; fragileRightContext = true; break;
-          case BinaryExpr.Opcode.BitwiseAnd:
-            opBindingStrength = 0x60; break;
-          case BinaryExpr.Opcode.BitwiseOr:
-            opBindingStrength = 0x61; break;
-          case BinaryExpr.Opcode.BitwiseXor:
-            opBindingStrength = 0x62; break;
-          case BinaryExpr.Opcode.Eq:
-          case BinaryExpr.Opcode.Neq:
-          case BinaryExpr.Opcode.Gt:
-          case BinaryExpr.Opcode.Ge:
-          case BinaryExpr.Opcode.Lt:
-          case BinaryExpr.Opcode.Le:
-          case BinaryExpr.Opcode.Disjoint:
-          case BinaryExpr.Opcode.In:
-          case BinaryExpr.Opcode.NotIn:
-            opBindingStrength = 0x30; fragileLeftContext = fragileRightContext = true; break;
-          case BinaryExpr.Opcode.And:
-            opBindingStrength = 0x20; break;
-          case BinaryExpr.Opcode.Or:
-            opBindingStrength = 0x21; break;
-          case BinaryExpr.Opcode.Imp:
-            opBindingStrength = 0x10; fragileLeftContext = true; break;
-          case BinaryExpr.Opcode.Exp:
-            opBindingStrength = 0x11; fragileRightContext = true; break;
-          case BinaryExpr.Opcode.Iff:
-            opBindingStrength = 0x08; break;
-          default:
-            Contract.Assert(false); throw new cce.UnreachableException();  // unexpected binary operator
-        }
-        int opBS = opBindingStrength & 0xF8;
-        int ctxtBS = contextBindingStrength & 0xF8;
-        bool parensNeeded = opBS < ctxtBS ||
-          (opBS == ctxtBS && (opBindingStrength != contextBindingStrength || fragileContext));
-
-        string op = BinaryExpr.OpcodeString(e.Op);
-        if (parensNeeded) { wr.Write("("); }
-        var sem = !parensNeeded && isFollowedBySemicolon;
-        if (0 <= indent && e.Op == BinaryExpr.Opcode.And) {
-          PrintExpr(e.E0, opBindingStrength, fragileLeftContext, false, sem, indent, keyword);
-          wr.WriteLine(" {0}", op);
-          Indent(indent);
-          PrintExpr(e.E1, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, indent, keyword);
-        } else if (0 <= indent && e.Op == BinaryExpr.Opcode.Imp) {
-          PrintExpr(e.E0, opBindingStrength, fragileLeftContext, false, sem, indent, keyword);
-          wr.WriteLine(" {0}", op);
-          int ind = indent + IndentAmount;
-          Indent(ind);
-          PrintExpr(e.E1, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, ind, keyword);
-        } else if (0 <= indent && e.Op == BinaryExpr.Opcode.Exp) {
-          PrintExpr(e.E1, opBindingStrength, fragileLeftContext, false, sem, indent, keyword);
-          wr.WriteLine(" {0}", op);
-          int ind = indent + IndentAmount;
-          Indent(ind);
-          PrintExpr(e.E0, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, ind, keyword);
-        } else if (e.Op == BinaryExpr.Opcode.Exp) {
-          PrintExpr(e.E1, opBindingStrength, fragileLeftContext, false, sem, -1, keyword);
-          wr.Write(" {0} ", op);
-          PrintExpr(e.E0, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, -1, keyword);
-        } else {
-          PrintExpr(e.E0, opBindingStrength, fragileLeftContext, false, sem, -1, keyword);
-          wr.Write(" {0} ", op);
-          PrintExpr(e.E1, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, -1, keyword);
-        }
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is TernaryExpr) {
-        var e = (TernaryExpr)expr;
-        switch (e.Op) {
-          case TernaryExpr.Opcode.PrefixEqOp:
-          case TernaryExpr.Opcode.PrefixNeqOp:
-            var opBindingStrength = 0x30;
-            var fragileLeftContext = true;
-            var fragileRightContext = true;
-
-            int opBS = opBindingStrength & 0xF8;
-            int ctxtBS = contextBindingStrength & 0xF8;
-            bool parensNeeded = opBS < ctxtBS ||
-              (opBS == ctxtBS && (opBindingStrength != contextBindingStrength || fragileContext));
-
-            if (parensNeeded) { wr.Write("("); }
-            var sem = !parensNeeded && isFollowedBySemicolon;
-            PrintExpr(e.E1, opBindingStrength, fragileLeftContext, false, sem, -1, keyword);
-            wr.Write(" {0}#[", e.Op == TernaryExpr.Opcode.PrefixEqOp ? "==" : "!=");
-            PrintExpression(e.E0, false);
-            wr.Write("] ");
-            PrintExpr(e.E2, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, -1, keyword);
-            if (parensNeeded) { wr.Write(")"); }
-            break;
-          default:
-            Contract.Assert(false);  // unexpected ternary operator
-            break;
-        }
-
-      } else if (expr is ChainingExpression) {
-        var e = (ChainingExpression)expr;
-        // determine if parens are needed
-        int opBindingStrength = 0x30;
-        int opBS = opBindingStrength & 0xF8;
-        int ctxtBS = contextBindingStrength & 0xF8;
-        bool parensNeeded = opBS < ctxtBS ||
-          (opBS == ctxtBS && (opBindingStrength != contextBindingStrength || fragileContext));
-
-        if (parensNeeded) { wr.Write("("); }
-        var sem = !parensNeeded && isFollowedBySemicolon;
-        PrintExpr(e.Operands[0], opBindingStrength, true, false, sem, -1, keyword);
-        for (int i = 0; i < e.Operators.Count; i++) {
-          string op = BinaryExpr.OpcodeString(e.Operators[i]);
-          if (e.PrefixLimits[i] == null) {
-            wr.Write(" {0} ", op);
-          } else {
-            wr.Write(" {0}#[", op);
-            PrintExpression(e.PrefixLimits[i], false);
-            wr.Write("] ");
-          }
-          PrintExpr(e.Operands[i + 1], opBindingStrength, true, i == e.Operators.Count - 1 && (parensNeeded || isRightmost), sem, -1, keyword);
-        }
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is LetExpr) {
-        var e = (LetExpr)expr;
-        bool parensNeeded = !isRightmost;
-        if (parensNeeded) { wr.Write("("); }
-        if (e.tok is AutoGeneratedToken) {
-          wr.Write("/* ");
-        }
-        if (e.LHSs.Exists(lhs => lhs != null && lhs.Var != null && lhs.Var.IsGhost)) { wr.Write("ghost "); }
-        wr.Write("var ");
-        string sep = "";
-        foreach (var lhs in e.LHSs) {
-          wr.Write(sep);
-          PrintCasePattern(lhs);
-          sep = ", ";
-        }
-        if (e.Exact) {
-          wr.Write(" := ");
-        } else {
-          PrintAttributes(e.Attributes);
-          wr.Write(" :| ");
-        }
-        PrintExpressionList(e.RHSs, true);
-        wr.Write("; ");
-        if (e.tok is AutoGeneratedToken) {
-          wr.Write("*/ ");
-        }
-        PrintExpression(e.Body, !parensNeeded && isFollowedBySemicolon);
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is LetOrFailExpr) {
-        // TODO should we also print the desugared version?
-        // If so, should we insert newlines?
-        var e = (LetOrFailExpr)expr;
-        bool parensNeeded = !isRightmost;
-        if (parensNeeded) { wr.Write("("); }
-        if (e.Lhs != null) {
-          if (e.Lhs.Var != null && e.Lhs.Var.IsGhost) { wr.Write("ghost "); }
-          wr.Write("var ");
-          PrintCasePattern(e.Lhs);
-          wr.Write(" :- ");
-        }
-        PrintExpression(e.Rhs, true);
-        wr.Write("; ");
-        PrintExpression(e.Body, !parensNeeded && isFollowedBySemicolon);
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is QuantifierExpr) {
-        QuantifierExpr e = (QuantifierExpr)expr;
-
-        if (e.SplitQuantifier != null) {
-          PrintExpr(e.SplitQuantifierExpression, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent, keyword, resolv_count);
-          return;
-        }
-
-        bool parensNeeded = !isRightmost;
-        if (parensNeeded) { wr.Write("("); }
-        wr.Write(e is ForallExpr ? "forall" : "exists");
-        wr.Write(" ");
-        PrintQuantifierDomain(e.BoundVars, e.Attributes, e.Range);
-        if (keyword == null) {
-          wr.Write(" :: ");
-        } else {
-          wr.WriteLine();
-          wr.Write(keyword);
-        }
-        if (0 <= indent) {
-          int ind = indent + IndentAmount;
-          wr.WriteLine();
-          Indent(ind);
-          PrintExpression(e.Term, !parensNeeded && isFollowedBySemicolon, ind);
-        } else {
-          PrintExpression(e.Term, !parensNeeded && isFollowedBySemicolon);
-        }
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is SetComprehension) {
-        var e = (SetComprehension)expr;
-        bool parensNeeded = !isRightmost;
-        if (parensNeeded) { wr.Write("("); }
-        if (e.Finite) {
-          wr.Write("set ");
-        } else {
-          wr.Write("iset ");
-        }
-        string sep = "";
-        foreach (BoundVar bv in e.BoundVars) {
-          wr.Write("{0}{1}", sep, bv.DisplayName);
-          sep = ", ";
-          PrintType(": ", bv.Type);
-        }
-        PrintAttributes(e.Attributes);
-        wr.Write(" | ");
-        PrintExpression(e.Range, !parensNeeded && isFollowedBySemicolon);
-        if (!e.TermIsImplicit) {
-          wr.Write(" :: ");
-          PrintExpression(e.Term, !parensNeeded && isFollowedBySemicolon);
-        }
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is MapComprehension) {
-        var e = (MapComprehension)expr;
-        bool parensNeeded = !isRightmost;
-        if (parensNeeded) { wr.Write("("); }
-        wr.Write(e.Finite ? "map " : "imap ");
-        string sep = "";
-        foreach (BoundVar bv in e.BoundVars) {
-          wr.Write("{0}{1}", sep, bv.DisplayName);
-          sep = ", ";
-          PrintType(": ", bv.Type);
-        }
-        PrintAttributes(e.Attributes);
-        wr.Write(" | ");
-        PrintExpression(e.Range, false);
-        wr.Write(" :: ");
-        if (e.TermLeft != null) {
-          PrintExpression(e.TermLeft, false);
-          wr.Write(" := ");
-        }
-        PrintExpression(e.Term, !parensNeeded && isFollowedBySemicolon);
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is LambdaExpr) {
-        var e = (LambdaExpr)expr;
-        bool parensNeeded = !isRightmost;
-        if (parensNeeded) { wr.Write("("); }
-        var skipSignatureParens = e.BoundVars.Count == 1 && !ShowType(e.BoundVars[0].Type);
-        if (!skipSignatureParens) { wr.Write("("); }
-        wr.Write(Util.Comma(e.BoundVars, bv => bv.DisplayName + (ShowType(bv.Type) ? ": " + bv.Type : "")));
-        if (!skipSignatureParens) { wr.Write(")"); }
-        if (e.Range != null) {
-          wr.Write(" requires ");
-          PrintExpression(e.Range, false);
-        }
-        var readsPrefix = " reads ";
-        foreach (var read in e.Reads) {
-          wr.Write(readsPrefix);
-          PrintExpression(read.E, false);
-          readsPrefix = ", ";
-        }
-        wr.Write(" => ");
-        PrintExpression(e.Term, isFollowedBySemicolon);
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is WildcardExpr) {
-        wr.Write("*");
-
-      } else if (expr is StmtExpr) {
-        var e = (StmtExpr)expr;
-        bool parensNeeded;
-        if (e.S is AssertStmt || e.S is ExpectStmt || e.S is AssumeStmt || e.S is CalcStmt) {
-          parensNeeded = !isRightmost;
-        } else {
-          parensNeeded = !isRightmost || isFollowedBySemicolon;
-        }
-        if (parensNeeded) { wr.Write("("); }
-        int ind = indent < 0 ? IndentAmount : indent;  // if the expression was to be printed on one line, instead print the .S part at indentation IndentAmount (not pretty, but something)
-        PrintStatement(e.S, ind);
-        wr.Write(" ");
-        PrintExpression(e.E, !parensNeeded && isFollowedBySemicolon);
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is ITEExpr) {
-        ITEExpr ite = (ITEExpr)expr;
-        bool parensNeeded = !isRightmost;
-        if (parensNeeded) { wr.Write("("); }
-        wr.Write("if ");
-        PrintExpression(ite.Test, false);
-        wr.Write(" then ");
-        PrintExpression(ite.Thn, false);
-        wr.Write(" else ");
-        PrintExpression(ite.Els, !parensNeeded && isFollowedBySemicolon);
-        if (parensNeeded) { wr.Write(")"); }
-
-      } else if (expr is ParensExpression) {
-        var e = (ParensExpression)expr;
-        // printing of parentheses is done optimally, not according to the parentheses in the given program
-        PrintExpr(e.E, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent, keyword);
-
-      } else if (expr is NegationExpression) {
-        var e = (NegationExpression)expr;
-        string op = "-";
-        int opBindingStrength = 0x80;
-        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
-
-        if (parensNeeded) { wr.Write("("); }
-        wr.Write(op);
-        PrintExpr(e.E, opBindingStrength, false, parensNeeded || isRightmost, !parensNeeded && isFollowedBySemicolon, -1, keyword);
-        if (parensNeeded) { wr.Write(")"); }
-      } else if (expr is NestedMatchExpr) {
-        var e = (NestedMatchExpr)expr;
-        var parensNeeded = !isRightmost && !e.UsesOptionalBraces;
-        if (parensNeeded) { wr.Write("("); }
-        wr.Write("match ");
-        PrintExpression(e.Source, isRightmost && e.Cases.Count == 0, !parensNeeded && isFollowedBySemicolon);
-        if (e.UsesOptionalBraces) { wr.Write(" {"); }
-        int i = 0;
-        foreach (var mc in e.Cases) {
-          bool isLastCase = i == e.Cases.Count - 1;
-          wr.Write(" case");
-          PrintAttributes(mc.Attributes);
-          wr.Write(" ");
-          PrintExtendedPattern(mc.Pat);
-          wr.Write(" => ");
-          PrintExpression(mc.Body, isRightmost && isLastCase, !parensNeeded && isFollowedBySemicolon);
-          i++;
-        }
-        if (e.UsesOptionalBraces) { wr.Write(" }"); } else if (parensNeeded) { wr.Write(")"); }
-        // }
-      } else if (expr is MatchExpr) {
-        var e = (MatchExpr)expr;
-        if (options.DafnyPrintResolvedFile == null && e.OrigUnresolved != null) {
-          PrintExpr(e.OrigUnresolved, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent);
-        } else {
-          var parensNeeded = !isRightmost && !e.UsesOptionalBraces;
-          if (parensNeeded) { wr.Write("("); }
-          wr.Write("match ");
-          PrintExpression(e.Source, isRightmost && e.Cases.Count == 0, !parensNeeded && isFollowedBySemicolon);
-          if (e.UsesOptionalBraces) { wr.Write(" {"); }
-          int i = 0;
-          foreach (var mc in e.Cases) {
-            bool isLastCase = i == e.Cases.Count - 1;
-            wr.Write(" case {0}", mc.Ctor.Name);
-            PrintMatchCaseArgument(mc);
-            wr.Write(" => ");
-            PrintExpression(mc.Body, isRightmost && isLastCase, !parensNeeded && isFollowedBySemicolon);
-            i++;
-          }
-          if (e.UsesOptionalBraces) {
-            wr.Write(" }");
-          } else if (parensNeeded) {
-            wr.Write(")");
-          }
-        }
-
-      } else if (expr is DefaultValueExpression) {
-        var e = (DefaultValueExpression)expr;
-        // DefaultValueExpression's are introduced during resolution, so we expect .Resolved to be non-null
-        Contract.Assert(e.WasResolved());
-        Contract.Assert(e.Resolved != null);
-        PrintExpr(e.Resolved, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent, keyword);
-
-      } else if (expr is BoxingCastExpr) {
-        // this is not expected for a parsed program, but we may be called for /trace purposes in the translator
-        var e = (BoxingCastExpr)expr;
-        PrintExpr(e.E, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent, keyword);
-      } else if (expr is Translator.BoogieWrapper) {
-        wr.Write("[BoogieWrapper]");  // this is somewhat unexpected, but we can get here if the /trace switch is used, so it seems best to cover this case here
-      } else if (expr is Translator.BoogieFunctionCall) {
-        wr.Write("[BoogieFunctionCall]");  // this prevents debugger watch window crash
-      } else if (expr is Resolver_IdentifierExpr) {
-        wr.Write("[Resolver_IdentifierExpr]");  // we can get here in the middle of a debugging session
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
-      }
-    }
-
-    bool ParensMayMatter(Expression expr) {
-      Contract.Requires(expr != null);
-      int parenPairs = 0;
-      for (; expr is ParensExpression; parenPairs++) {
-        expr = ((ParensExpression)expr).E;
-      }
-      // If the program were resolved, we could be more precise than the following (in particular, looking
-      // to see if expr denotes a MemberSelectExpr of a member that is a Function.
-      return parenPairs != 0 && (expr is NameSegment || expr is ExprDotName);
-    }
-
-    void PrintCasePattern<VT>(CasePattern<VT> pat)
-      where VT : class, IVariable {
-      Contract.Requires(pat != null);
-      var v = pat.Var;
-      if (v != null) {
-        wr.Write(v.DisplayName);
-        if (v.OptionalType is NonProxyType || options.DafnyPrintResolvedFile != null) {
-          PrintType(": ", v.OptionalType);
-        }
-      } else {
-        if (pat.Id.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
-          Contract.Assert(pat.Arguments != null);
-        } else {
-          wr.Write(pat.Id);
-        }
-        if (pat.Arguments != null) {
-          wr.Write("(");
-          var sep = "";
-          foreach (var arg in pat.Arguments) {
-            wr.Write(sep);
-            PrintCasePattern(arg);
-            sep = ", ";
-          }
-          wr.Write(")");
-        }
-      }
-    }
-
-    // Main difference with .ToString is that tuple constructors are not printed.
-    void PrintExtendedPattern(ExtendedPattern pat) {
-      Contract.Requires(pat != null);
-      switch (pat) {
-        case IdPattern idPat:
-          if (idPat.Id.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
-          } else if (idPat.IsWildcardPattern) {
-            // In case of the universal match pattern, print '_' instead of
-            // its node identifier, otherwise the printed program becomes
-            // syntactically incorrect.
-            wr.Write("_");
-            if (!idPat.IsWildcardExact) {
-              wr.Write($" /* {idPat.Id} */");
-            }
-          } else {
-            wr.Write(idPat.Id);
-          }
-          if (idPat.Arguments != null) {
-            wr.Write("(");
-            var sep = "";
-            foreach (var arg in idPat.Arguments) {
-              wr.Write(sep);
-              PrintExtendedPattern(arg);
-              sep = ", ";
-            }
-            wr.Write(")");
-          } else if (options.DafnyPrintResolvedFile != null && idPat.ResolvedLit != null) {
-            Contract.Assert(idPat.BoundVar == null && idPat.Ctor == null);
-            wr.Write(" /*== ");
-            PrintExpression(idPat.ResolvedLit, false);
-            wr.Write("*/");
-          } else if (ShowType(idPat.Type)) {
-            wr.Write(": ");
-            PrintType(idPat.Type);
-          }
-          break;
-        case DisjunctivePattern dPat:
-          var patSep = "";
-          foreach (var arg in dPat.Alternatives) {
-            wr.Write(patSep);
-            PrintExtendedPattern(arg);
-            patSep = " | ";
-          }
-          break;
-        case LitPattern litPat:
-          wr.Write(litPat.ToString());
-          break;
-      }
-    }
-
-    private void PrintQuantifierDomain(List<BoundVar> boundVars, Attributes attrs, Expression range) {
-      Contract.Requires(boundVars != null);
-      string sep = "";
-      foreach (BoundVar bv in boundVars) {
-        wr.Write("{0}", sep);
-        if (printFlags.UseOriginalDafnyNames) {
-          wr.Write(bv.DafnyName);
-        } else {
-          wr.Write(bv.DisplayName);
-        }
-
-        PrintType(": ", bv.Type);
-        sep = ", ";
-      }
-      PrintAttributes(attrs);
-      if (range != null) {
-        wr.Write(" | ");
-        PrintExpression(range, false);
-      }
-    }
-
-    void PrintActualArguments(ActualBindings bindings, string/*?*/ name, Bpl.IToken/*?*/ atLabel) {
-      Contract.Requires(bindings != null);
-      var i = 0;
-      if (name != null && name.EndsWith("#")) {
-        Contract.Assert(atLabel == null);
-        Contract.Assert(1 <= bindings.ArgumentBindings.Count);
-        Contract.Assert(bindings.ArgumentBindings[0].FormalParameterName == null);
-        wr.Write("[");
-        PrintExpression(bindings.ArgumentBindings[0].Actual, false);
-        wr.Write("]");
-        i++;
-      } else if (atLabel != null) {
-        wr.Write($"@{atLabel.val}");
-      }
-      wr.Write("(");
-      string sep = "";
-      if (options.DafnyPrintResolvedFile == null || !bindings.WasResolved) {
-        for (; i < bindings.ArgumentBindings.Count; i++) {
-          var binding = bindings.ArgumentBindings[i];
-          wr.Write(sep);
-          sep = ", ";
-          if (binding.IsGhost) {
-            wr.Write("ghost ");
-          }
-          if (binding.FormalParameterName != null) {
-            wr.Write($"{binding.FormalParameterName.val} := ");
-          }
-          PrintExpression(binding.Actual, false);
-        }
-      } else {
-        // print arguments after incorporating default parameters
-        for (; i < bindings.Arguments.Count; i++) {
-          var arg = bindings.Arguments[i];
-          wr.Write(sep);
-          sep = ", ";
-          PrintExpression(arg, false);
-        }
-      }
-      wr.Write(")");
-    }
-
-    void PrintBindings(ActualBindings bindings, bool isFollowedBySemicolon) {
-      Contract.Requires(bindings != null);
-      string sep = "";
-      foreach (var binding in bindings.ArgumentBindings) {
-        wr.Write(sep);
-        sep = ", ";
-        if (binding.FormalParameterName != null) {
-          wr.Write($"{binding.FormalParameterName.val} := ");
-        }
-        PrintExpression(binding.Actual, isFollowedBySemicolon);
-      }
-    }
-
-    void PrintExpressionList(List<Expression> exprs, bool isFollowedBySemicolon) {
-      Contract.Requires(exprs != null);
-      string sep = "";
-      foreach (Expression e in exprs) {
-        Contract.Assert(e != null);
-        wr.Write(sep);
-        sep = ", ";
-        PrintExpression(e, isFollowedBySemicolon);
-      }
-    }
-    void PrintExpressionPairList(List<ExpressionPair> exprs) {
-      Contract.Requires(exprs != null);
-      string sep = "";
-      foreach (ExpressionPair p in exprs) {
-        Contract.Assert(p != null);
-        wr.Write(sep);
-        sep = ", ";
-        PrintExpression(p.A, false);
-        wr.Write(" := ");
-        PrintExpression(p.B, false);
-      }
-    }
-
-    void PrintFrameExpressionList(List<FrameExpression/*!*/>/*!*/ fexprs) {
-      Contract.Requires(fexprs != null);
-      string sep = "";
-      foreach (FrameExpression fe in fexprs) {
-        Contract.Assert(fe != null);
-        wr.Write(sep);
-        sep = ", ";
-        if (fe.E is ImplicitThisExpr) {
-          Contract.Assert(fe.FieldName != null);
-        } else {
-          PrintExpression(fe.E, true);
-        }
-        if (fe.FieldName != null) {
-          wr.Write("`{0}", fe.FieldName);
-        }
-      }
-    }
-  }
-}
diff --git a/Source/DafnyCore/AST/Grammar/Printer/Printer.Expression.cs b/Source/DafnyCore/AST/Grammar/Printer/Printer.Expression.cs
new file mode 100644
index 00000000000..c3d5d415ee9
--- /dev/null
+++ b/Source/DafnyCore/AST/Grammar/Printer/Printer.Expression.cs
@@ -0,0 +1,1283 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.Diagnostics.Contracts;
+using System.Numerics;
+using System.Linq;
+using DafnyCore;
+using JetBrains.Annotations;
+using Bpl = Microsoft.Boogie;
+
+namespace Microsoft.Dafny {
+
+  public partial class Printer {
+    /// <summary>
+    /// PrintExtendedExpr prints an expression, but formats top-level if-then-else and match expressions across several lines.
+    /// Its intended use is thus to print the body of a function.
+    /// </summary>
+    public void PrintExtendedExpr(Expression expr, int indent, bool isRightmost, bool endWithCloseParen) {
+      Contract.Requires(expr != null);
+      if (expr is ITEExpr) {
+        Indent(indent);
+        while (true) {
+          var ite = (ITEExpr)expr;
+          wr.Write("if ");
+          PrintExpression(ite.Test, false);
+          wr.WriteLine(" then");
+          PrintExtendedExpr(ite.Thn, indent + IndentAmount, true, false);
+          expr = ite.Els;
+          if (expr is ITEExpr) {
+            Indent(indent); wr.Write("else ");
+          } else {
+            Indent(indent); wr.WriteLine("else");
+            Indent(indent + IndentAmount);
+            PrintExpression(expr, isRightmost, false);
+            wr.WriteLine(endWithCloseParen ? ")" : "");
+            return;
+          }
+        }
+
+      } else if (expr is NestedMatchExpr) {
+        var e = (NestedMatchExpr)expr;
+        if (e.Flattened != null && options.DafnyPrintResolvedFile != null) {
+          wr.WriteLine();
+          if (!printingDesugared) {
+            Indent(indent); wr.WriteLine("/*---------- flattened ----------");
+          }
+
+          var savedDesugarMode = printingDesugared;
+          printingDesugared = true;
+          PrintExtendedExpr(e.Flattened, indent, isRightmost, endWithCloseParen);
+          printingDesugared = savedDesugarMode;
+
+          if (!printingDesugared) {
+            Indent(indent); wr.WriteLine("---------- end flattened ----------*/");
+          }
+        }
+        if (!printingDesugared) {
+          Indent(indent);
+          var parensNeeded = !isRightmost && !e.UsesOptionalBraces;
+          if (parensNeeded) { wr.Write("("); }
+          wr.Write("match ");
+          PrintExpression(e.Source, isRightmost && e.Cases.Count == 0, false);
+          if (e.UsesOptionalBraces) {
+            wr.WriteLine(" {");
+          } else if (parensNeeded && e.Cases.Count == 0) {
+            wr.WriteLine(")");
+          } else {
+            wr.WriteLine();
+          }
+          int i = 0;
+          int ind = indent + (e.UsesOptionalBraces ? IndentAmount : 0);
+          foreach (var mc in e.Cases) {
+            bool isLastCase = i == e.Cases.Count - 1;
+            Indent(ind);
+            PrintAttributes(mc.Attributes, indent, () => {
+              wr.Write("case");
+            });
+            wr.Write(" ");
+            PrintExtendedPattern(mc.Pat);
+            wr.WriteLine(" =>");
+            PrintExtendedExpr(mc.Body, ind + IndentAmount, isLastCase, isLastCase && (parensNeeded || endWithCloseParen));
+            i++;
+          }
+          if (e.UsesOptionalBraces) {
+            Indent(indent);
+            wr.WriteLine("}");
+          }
+        }
+      } else if (expr is MatchExpr) {
+        var e = (MatchExpr)expr;
+        if (options.DafnyPrintResolvedFile == null && e.OrigUnresolved != null) {
+          PrintExtendedExpr(e.OrigUnresolved, indent, isRightmost, endWithCloseParen);
+        } else {
+          Indent(indent);
+          var parensNeeded = !isRightmost && !e.UsesOptionalBraces;
+          if (parensNeeded) { wr.Write("("); }
+          wr.Write("match ");
+          PrintExpression(e.Source, isRightmost && e.Cases.Count == 0, false);
+          if (e.UsesOptionalBraces) { wr.WriteLine(" {"); } else if (parensNeeded && e.Cases.Count == 0) { wr.WriteLine(")"); } else { wr.WriteLine(); }
+          int i = 0;
+          int ind = indent + (e.UsesOptionalBraces ? IndentAmount : 0);
+          foreach (var mc in e.Cases) {
+            bool isLastCase = i == e.Cases.Count - 1;
+            Indent(ind);
+            PrintAttributes(mc.Attributes, ind, () => {
+              wr.Write("case");
+            });
+            wr.Write(" ");
+            wr.Write(mc.Ctor.Name);
+            PrintMatchCaseArgument(mc);
+            wr.WriteLine(" =>");
+            PrintExtendedExpr(mc.Body, ind + IndentAmount, isLastCase, isLastCase && (parensNeeded || endWithCloseParen));
+            i++;
+          }
+          if (e.UsesOptionalBraces) {
+            Indent(indent);
+            wr.WriteLine("}");
+          }
+        }
+
+      } else if (expr is LetExpr) {
+        var e = (LetExpr)expr;
+        Indent(indent);
+        if (e.Origin is AutoGeneratedOrigin) {
+          wr.Write("/* ");
+        }
+        if (e.LHSs.Exists(lhs => lhs != null && lhs.Var != null && lhs.Var.IsGhost)) { wr.Write("ghost "); }
+        wr.Write("var ");
+        string sep = "";
+        foreach (var lhs in e.LHSs) {
+          wr.Write(sep);
+          PrintCasePattern(lhs);
+          sep = ", ";
+        }
+        if (e.Exact) {
+          wr.Write(" := ");
+        } else {
+          PrintAttributes(e.Attributes, AtAttributesOnSameLineIndent, () => { });
+          wr.Write(" :| ");
+        }
+        PrintExpressionList(e.RHSs, true);
+        wr.Write(";");
+        if (e.Origin is AutoGeneratedOrigin) {
+          wr.Write(" */");
+        }
+        wr.WriteLine();
+        PrintExtendedExpr(e.Body, indent, isRightmost, endWithCloseParen);
+      } else if (expr is StmtExpr && isRightmost) {
+        var e = (StmtExpr)expr;
+        Indent(indent);
+        PrintStatement(e.S, indent);
+        wr.WriteLine();
+        PrintExtendedExpr(e.E, indent, isRightmost, endWithCloseParen);
+
+      } else if (expr is ParensExpression) {
+        PrintExtendedExpr(((ParensExpression)expr).E, indent, isRightmost, endWithCloseParen);
+      } else {
+        Indent(indent);
+        PrintExpression(expr, false, indent);
+        wr.WriteLine(endWithCloseParen ? ")" : "");
+      }
+    }
+
+    public void PrintMatchCaseArgument(MatchCase mc) {
+      Contract.Assert(mc.Arguments != null);
+      if (mc.Arguments.Count != 0) {
+        string sep = "(";
+        foreach (BoundVar bv in mc.Arguments) {
+          wr.Write("{0}{1}", sep, bv.DisplayName);
+          string typeName = bv.Type.TypeName(options, null, true);
+          if (bv.Type is NonProxyType && !typeName.StartsWith("_")) {
+            wr.Write(": {0}", typeName);
+          }
+          sep = ", ";
+        }
+        wr.Write(")");
+      }
+    }
+
+    public void PrintExpression(Expression expr, bool isFollowedBySemicolon) {
+      Contract.Requires(expr != null);
+      PrintExpr(expr, 0, false, true, isFollowedBySemicolon, -1);
+    }
+
+    public void PrintExpression(Expression expr, bool isRightmost, bool isFollowedBySemicolon) {
+      Contract.Requires(expr != null);
+      PrintExpr(expr, 0, false, isRightmost, isFollowedBySemicolon, -1);
+    }
+
+    /// <summary>
+    /// An indent of -1 means print the entire expression on one line.
+    /// </summary>
+    public void PrintExpression(Expression expr, bool isFollowedBySemicolon, int indent) {
+      Contract.Requires(expr != null);
+      PrintExpr(expr, 0, false, true, isFollowedBySemicolon, indent);
+    }
+
+    public void PrintExpression(Expression expr, bool isFollowedBySemicolon, string keyword) {
+      Contract.Requires(expr != null);
+      PrintExpr(expr, 0, false, true, isFollowedBySemicolon, -1, keyword);
+    }
+
+    private const int BindingGroup = 0xF0;
+
+    private const int BindingStrengthDecreasesTo = 0x10; // decreases to, nonincreases to
+
+    private const int BindingStrengthEquiv = 0x20; // <==>
+
+    private const int BindingStrengthImplies = 0x30; // ==>
+    private const int BindingStrengthExplies = 0x31; // <==
+
+    private const int BindingStrengthAnd = 0x40; // &&
+    private const int BindingStrengthOr = 0x41; // ||
+
+    private const int BindingStrengthCompare = 0x50; // == != ==#[...] !=#[...] < <= >= >
+
+    private const int BindingStrengthAdd = 0x60; // + -
+
+    private const int BindingStrengthShift = 0x70; // << >>
+
+    private const int BindingStrengthMul = 0x80; // * / %
+
+    private const int BindingStrengthBitwiseAnd = 0x90; // &
+    private const int BindingStrengthBitwiseOr = 0x91; // |
+    private const int BindingStrengthBitwiseXor = 0x92; // ^
+
+    private const int BindingStrengthUnarySuffix = 0xA0; // as is
+
+    private const int BindingStrengthUnaryPrefix = 0xB0; // ! -
+
+    private const int BindingStrengthSuffix = 0xC0; // X.name X.(name := ...) X(...) X[...]
+
+    private bool ParensNeeded(int opBindingStrength, int contextBindingStrength, bool fragileContext) {
+      int opGroupStrength = opBindingStrength & BindingGroup;
+      int contextGroupStrength = contextBindingStrength & BindingGroup;
+      var parensNeeded = opGroupStrength < contextGroupStrength ||
+                         (opGroupStrength == contextGroupStrength && (opBindingStrength != contextBindingStrength || fragileContext));
+      return parensNeeded;
+    }
+
+
+    bool ParensMayMatter(Expression expr) {
+      Contract.Requires(expr != null);
+      int parenPairs = 0;
+      for (; expr is ParensExpression; parenPairs++) {
+        expr = ((ParensExpression)expr).E;
+      }
+      // If the program were resolved, we could be more precise than the following (in particular, looking
+      // to see if expr denotes a MemberSelectExpr of a member that is a Function.
+      return parenPairs != 0 && (expr is NameSegment || expr is ExprDotName);
+    }
+
+    void PrintCasePattern<VT>(CasePattern<VT> pat)
+      where VT : class, IVariable {
+      Contract.Requires(pat != null);
+      var v = pat.Var;
+      if (v != null) {
+        wr.Write(v.DisplayName);
+        if (v.OptionalType is NonProxyType || options.DafnyPrintResolvedFile != null) {
+          PrintType(": ", v.OptionalType);
+        }
+      } else {
+        if (pat.Id.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
+          Contract.Assert(pat.Arguments != null);
+        } else {
+          wr.Write(pat.Id);
+        }
+        if (pat.Arguments != null) {
+          wr.Write("(");
+          var sep = "";
+          foreach (var arg in pat.Arguments) {
+            wr.Write(sep);
+            PrintCasePattern(arg);
+            sep = ", ";
+          }
+          wr.Write(")");
+        }
+      }
+    }
+
+    // Main difference with .ToString is that tuple constructors are not printed.
+    void PrintExtendedPattern(ExtendedPattern pat) {
+      Contract.Requires(pat != null);
+      switch (pat) {
+        case IdPattern idPat:
+          if (idPat.Id.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
+          } else if (idPat.IsWildcardPattern) {
+            // In case of the universal match pattern, print '_' instead of
+            // its node identifier, otherwise the printed program becomes
+            // syntactically incorrect.
+            wr.Write("_");
+            if (!idPat.IsWildcardExact) {
+              wr.Write($" /* {idPat.Id} */");
+            }
+          } else {
+            wr.Write(idPat.Id);
+          }
+          if (idPat.Arguments != null) {
+            wr.Write("(");
+            var sep = "";
+            foreach (var arg in idPat.Arguments) {
+              wr.Write(sep);
+              PrintExtendedPattern(arg);
+              sep = ", ";
+            }
+            wr.Write(")");
+          } else if (options.DafnyPrintResolvedFile != null && idPat.ResolvedLit != null) {
+            Contract.Assert(idPat.BoundVar == null && idPat.Ctor == null);
+            wr.Write(" /*== ");
+            PrintExpression(idPat.ResolvedLit, false);
+            wr.Write("*/");
+          } else if (ShowType(idPat.Type)) {
+            wr.Write(": ");
+            PrintType(idPat.Type);
+          }
+          break;
+        case DisjunctivePattern dPat:
+          var patSep = "";
+          foreach (var arg in dPat.Alternatives) {
+            wr.Write(patSep);
+            PrintExtendedPattern(arg);
+            patSep = " | ";
+          }
+          break;
+        case LitPattern litPat:
+          wr.Write(litPat.ToString());
+          break;
+      }
+    }
+
+    private void PrintQuantifierDomain(List<BoundVar> boundVars, Attributes attrs, Expression range) {
+      Contract.Requires(boundVars != null);
+      string sep = "";
+      foreach (BoundVar bv in boundVars) {
+        wr.Write("{0}", sep);
+        if (printFlags.UseOriginalDafnyNames) {
+          wr.Write(bv.DafnyName);
+        } else {
+          wr.Write(bv.DisplayName);
+        }
+
+        PrintType(": ", bv.Type);
+        sep = ", ";
+      }
+      PrintAttributes(attrs, AtAttributesOnSameLineIndent, () => { });
+      if (range != null) {
+        wr.Write(" | ");
+        PrintExpression(range, false);
+      }
+    }
+
+    void PrintActualArguments(ActualBindings bindings, string/*?*/ name, Bpl.IToken/*?*/ atLabel) {
+      Contract.Requires(bindings != null);
+      var i = 0;
+      if (name != null && name.EndsWith("#")) {
+        Contract.Assert(atLabel == null);
+        Contract.Assert(1 <= bindings.ArgumentBindings.Count);
+        Contract.Assert(bindings.ArgumentBindings[0].FormalParameterName == null);
+        wr.Write("[");
+        PrintExpression(bindings.ArgumentBindings[0].Actual, false);
+        wr.Write("]");
+        i++;
+      } else if (atLabel != null) {
+        wr.Write($"@{atLabel.val}");
+      }
+      wr.Write("(");
+      string sep = "";
+      if (options.DafnyPrintResolvedFile == null || !bindings.WasResolved) {
+        for (; i < bindings.ArgumentBindings.Count; i++) {
+          var binding = bindings.ArgumentBindings[i];
+          wr.Write(sep);
+          sep = ", ";
+          if (binding.IsGhost) {
+            wr.Write("ghost ");
+          }
+          if (binding.FormalParameterName != null) {
+            wr.Write($"{binding.FormalParameterName.val} := ");
+          }
+          PrintExpression(binding.Actual, false);
+        }
+      } else {
+        // print arguments after incorporating default parameters
+        for (; i < bindings.Arguments.Count; i++) {
+          var arg = bindings.Arguments[i];
+          if (arg is DefaultValueExpression { Resolved: null }) {
+            // An error was detected during resolution, so this argument was not filled in. Omit printing it.
+            continue;
+          }
+          wr.Write(sep);
+          sep = ", ";
+          PrintExpression(arg, false);
+        }
+      }
+      wr.Write(")");
+    }
+
+    void PrintBindings(ActualBindings bindings, bool isFollowedBySemicolon) {
+      Contract.Requires(bindings != null);
+      string sep = "";
+      foreach (var binding in bindings.ArgumentBindings) {
+        wr.Write(sep);
+        sep = ", ";
+        if (binding.FormalParameterName != null) {
+          wr.Write($"{binding.FormalParameterName.val} := ");
+        }
+        PrintExpression(binding.Actual, isFollowedBySemicolon);
+      }
+    }
+
+    void PrintExpressionList(List<Expression> exprs, bool isFollowedBySemicolon) {
+      Contract.Requires(exprs != null);
+      string sep = "";
+      foreach (Expression e in exprs) {
+        Contract.Assert(e != null);
+        wr.Write(sep);
+        sep = ", ";
+        PrintExpression(e, isFollowedBySemicolon);
+      }
+    }
+    void PrintExpressionPairList(List<ExpressionPair> exprs) {
+      Contract.Requires(exprs != null);
+      string sep = "";
+      foreach (ExpressionPair p in exprs) {
+        Contract.Assert(p != null);
+        wr.Write(sep);
+        sep = ", ";
+        PrintExpression(p.A, false);
+        wr.Write(" := ");
+        PrintExpression(p.B, false);
+      }
+    }
+
+    void PrintFrameExpressionList(List<FrameExpression/*!*/>/*!*/ fexprs) {
+      Contract.Requires(fexprs != null);
+      string sep = "";
+      foreach (FrameExpression fe in fexprs) {
+        Contract.Assert(fe != null);
+        wr.Write(sep);
+        sep = ", ";
+        if (fe.E is ImplicitThisExpr) {
+          Contract.Assert(fe.FieldName != null);
+        } else {
+          PrintExpression(fe.E, true);
+        }
+        if (fe.FieldName != null) {
+          wr.Write("`{0}", fe.FieldName);
+        }
+      }
+    }
+
+    /// <summary>
+    /// An indent of -1 means print the entire expression on one line.
+    /// </summary>
+    void PrintExpr(Expression expr, int contextBindingStrength, bool fragileContext, bool isRightmost, bool isFollowedBySemicolon, int indent, string keyword = null, int resolv_count = 2) {
+      Contract.Requires(-1 <= indent);
+      Contract.Requires(expr != null);
+
+      /* When debugging:
+      if (resolv_count > 0 && expr.Resolved != null) {
+        PrintExpr(expr.Resolved, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent, resolv_count - 1);
+        return;
+      }
+      */
+
+      if (expr is StaticReceiverExpr) {
+        StaticReceiverExpr e = (StaticReceiverExpr)expr;
+        wr.Write(e.Type);
+      } else if (expr is LiteralExpr) {
+        LiteralExpr e = (LiteralExpr)expr;
+        if (e.Value == null) {
+          wr.Write("null");
+        } else if (e.Value is bool) {
+          wr.Write((bool)e.Value ? "true" : "false");
+        } else if (e is CharLiteralExpr) {
+          wr.Write("'{0}'", (string)e.Value);
+        } else if (e is StringLiteralExpr) {
+          var str = (StringLiteralExpr)e;
+          wr.Write("{0}\"{1}\"", str.IsVerbatim ? "@" : "", (string)e.Value);
+        } else if (e.Value is BaseTypes.BigDec) {
+          BaseTypes.BigDec dec = (BaseTypes.BigDec)e.Value;
+          wr.Write((dec.Mantissa >= 0) ? "" : "-");
+          string s = BigInteger.Abs(dec.Mantissa).ToString();
+          int digits = s.Length;
+          if (dec.Exponent >= 0) {
+            wr.Write("{0}{1}.0", s, new string('0', dec.Exponent));
+          } else {
+            int exp = -dec.Exponent;
+            if (exp < digits) {
+              int intDigits = digits - exp;
+              int fracDigits = digits - intDigits;
+              wr.Write("{0}.{1}", s.Substring(0, intDigits), s.Substring(intDigits, fracDigits));
+            } else {
+              int fracDigits = digits;
+              wr.Write("0.{0}{1}", new string('0', exp - fracDigits), s.Substring(0, fracDigits));
+            }
+          }
+        } else {
+          wr.Write((BigInteger)e.Value);
+        }
+
+      } else if (expr is ThisExpr) {
+        wr.Write("this");
+
+      } else if (expr is IdentifierExpr) {
+        var e = (IdentifierExpr)expr;
+        if (printFlags.UseOriginalDafnyNames) {
+          wr.Write(e.DafnyName);
+        } else {
+          wr.Write(e.Name);
+        }
+
+      } else if (expr is DatatypeValue) {
+        var dtv = (DatatypeValue)expr;
+        bool printParens;
+        if (dtv.MemberName.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
+          // we're looking at a tuple, whose printed constructor name is essentially the empty string
+          printParens = true;
+        } else {
+          var typeArgs = "";
+          if (dtv.InferredTypeArgs != null && dtv.InferredTypeArgs.Count != 0) {
+            typeArgs = $"<{string.Join(",", dtv.InferredTypeArgs.ConvertAll(ty => ty.ToString()))}>";
+          }
+          wr.Write("{0}{1}.{2}", dtv.DatatypeName, typeArgs, dtv.MemberName);
+          printParens = dtv.Arguments.Count != 0;
+        }
+        if (printParens) {
+          PrintActualArguments(dtv.Bindings, null, null);
+        }
+
+      } else if (expr is DisplayExpression) {
+        DisplayExpression e = (DisplayExpression)expr;
+        if (e is MultiSetDisplayExpr) {
+          wr.Write("multiset");
+        } else if (e is SetDisplayExpr && !((SetDisplayExpr)e).Finite) {
+          wr.Write("iset");
+        }
+        wr.Write(e is SetDisplayExpr || e is MultiSetDisplayExpr ? "{" : "[");
+        PrintExpressionList(e.Elements, false);
+        wr.Write(e is SetDisplayExpr || e is MultiSetDisplayExpr ? "}" : "]");
+
+      } else if (expr is MapDisplayExpr) {
+        MapDisplayExpr e = (MapDisplayExpr)expr;
+        wr.Write(e.Finite ? "map" : "imap");
+        wr.Write("[");
+        PrintExpressionPairList(e.Elements);
+        wr.Write("]");
+
+      } else if (expr is NameSegment) {
+        var e = (NameSegment)expr;
+        wr.Write(e.Name);
+        if (e.OptTypeArguments != null) {
+          PrintTypeInstantiation(e.OptTypeArguments);
+        }
+
+      } else if (expr is ExprDotName) {
+        var e = (ExprDotName)expr;
+        // determine if parens are needed
+        int opBindingStrength = BindingStrengthSuffix;
+        bool parensNeeded = !e.Lhs.IsImplicit && ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+        Contract.Assert(!parensNeeded); // KRML: I think parens are never needed
+
+        if (parensNeeded) { wr.Write("("); }
+        if (!e.Lhs.IsImplicit) {
+          PrintExpr(e.Lhs, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
+          if (e.Lhs.Type is ResolverIdentifierExpr.ResolverTypeType) {
+            Contract.Assert(e.Lhs is NameSegment || e.Lhs is ExprDotName);  // these are the only expressions whose .Type can be ResolverType_Type
+            if (options.DafnyPrintResolvedFile != null && options.PrintMode == PrintModes.Everything) {
+              // The printing of e.Lhs printed the type arguments only if they were given explicitly in the input.
+              var optionalTypeArgs = e.Lhs is NameSegment ns ? ns.OptTypeArguments : ((ExprDotName)e.Lhs).OptTypeArguments;
+              if (optionalTypeArgs == null && e.Lhs.Resolved is ResolverIdentifierExpr ri) {
+                PrintTypeInstantiation(ri.TypeArgs);
+              }
+            }
+          }
+          wr.Write(".");
+        }
+        wr.Write(e.SuffixName);
+        PrintTypeInstantiation(e.OptTypeArguments);
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is ApplySuffix) {
+        var e = (ApplySuffix)expr;
+        // determine if parens are needed
+        int opBindingStrength = BindingStrengthSuffix;
+        bool parensNeeded = !e.Lhs.IsImplicit && ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+        Contract.Assert(!parensNeeded); // KRML: I think parens are never needed
+
+        if (parensNeeded) { wr.Write("("); }
+        if (ParensMayMatter(e.Lhs)) {
+          wr.Write("(");
+          PrintExpression(e.Lhs, false);
+          wr.Write(")");
+        } else {
+          PrintExpr(e.Lhs, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
+        }
+        string name = e.Lhs is NameSegment ? ((NameSegment)e.Lhs).Name : e.Lhs is ExprDotName ? ((ExprDotName)e.Lhs).SuffixName : null;
+        PrintActualArguments(e.Bindings, name, e.AtTok);
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is MemberSelectExpr) {
+        MemberSelectExpr e = (MemberSelectExpr)expr;
+        // determine if parens are needed
+        int opBindingStrength = BindingStrengthSuffix;
+        bool parensNeeded = !e.Obj.IsImplicit && ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        if (parensNeeded) { wr.Write("("); }
+        if (!(e.Obj.IsImplicit)) {
+          PrintExpr(e.Obj, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
+          wr.Write(".");
+        }
+        wr.Write(e.MemberName);
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is SeqSelectExpr) {
+        SeqSelectExpr e = (SeqSelectExpr)expr;
+        // determine if parens are needed
+        int opBindingStrength = BindingStrengthSuffix;
+        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        if (parensNeeded) { wr.Write("("); }
+        PrintExpr(e.Seq, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, indent, keyword);
+        wr.Write("[");
+        if (e.SelectOne) {
+          Contract.Assert(e.E0 != null);
+          PrintExpression(e.E0, false);
+        } else {
+          if (e.E0 != null) {
+            PrintExpression(e.E0, false);
+          }
+          wr.Write(e.E0 != null && e.E1 != null ? " .. " : "..");
+          if (e.E1 != null) {
+            PrintExpression(e.E1, false);
+          }
+        }
+        wr.Write("]");
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is MultiSelectExpr) {
+        MultiSelectExpr e = (MultiSelectExpr)expr;
+        // determine if parens are needed
+        int opBindingStrength = BindingStrengthSuffix;
+        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        if (parensNeeded) { wr.Write("("); }
+        PrintExpr(e.Array, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, indent, keyword);
+        string prefix = "[";
+        foreach (Expression idx in e.Indices) {
+          Contract.Assert(idx != null);
+          wr.Write(prefix);
+          PrintExpression(idx, false);
+          prefix = ", ";
+        }
+        wr.Write("]");
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is SeqUpdateExpr) {
+        SeqUpdateExpr e = (SeqUpdateExpr)expr;
+        // determine if parens are needed
+        int opBindingStrength = BindingStrengthSuffix;
+        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        if (parensNeeded) { wr.Write("("); }
+        PrintExpr(e.Seq, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, indent, keyword);
+        wr.Write("[");
+        PrintExpression(e.Index, false);
+        wr.Write(" := ");
+        PrintExpression(e.Value, false);
+        wr.Write("]");
+        if (parensNeeded) { wr.Write(")"); }
+      } else if (expr is DatatypeUpdateExpr) {
+        var e = (DatatypeUpdateExpr)expr;
+        // determine if parens are needed
+        int opBindingStrength = BindingStrengthSuffix;
+        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        if (parensNeeded) { wr.Write("("); }
+        PrintExpr(e.Root, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, indent, keyword);
+        wr.Write(".(");
+        var sep = "";
+        foreach (var update in e.Updates) {
+          wr.Write("{0}{1} := ", sep, update.Item2);
+          PrintExpression(update.Item3, false);
+          sep = ", ";
+        }
+        wr.Write(")");
+        if (options.DafnyPrintResolvedFile != null && options.PrintMode == PrintModes.Everything) {
+          if (e.ResolvedExpression != null) {
+            wr.Write("/*");
+            PrintExpression(e.ResolvedExpression, false);
+            wr.Write("*/");
+          }
+        }
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is ApplyExpr) {
+        var e = (ApplyExpr)expr;
+        // determine if parens are needed
+        int opBindingStrength = BindingStrengthSuffix;
+        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        if (parensNeeded) { wr.Write("("); }
+
+        PrintExpr(e.Function, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
+        wr.Write("(");
+        PrintExpressionList(e.Args, false);
+        wr.Write(")");
+
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is FunctionCallExpr) {
+        var e = (FunctionCallExpr)expr;
+        // determine if parens are needed
+        int opBindingStrength = BindingStrengthSuffix;
+        bool parensNeeded = !e.Receiver.IsImplicit && ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        if (parensNeeded) { wr.Write("("); }
+        if (!e.Receiver.IsImplicit) {
+          PrintExpr(e.Receiver, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
+          wr.Write(".");
+        }
+        wr.Write(e.Name);
+        /* When debugging, this is nice to have:
+        if (e.TypeArgumentSubstitutions.Count > 0) {
+          wr.Write("[");
+          wr.Write(Util.Comma(",", e.TypeArgumentSubstitutions, kv => kv.Key.FullName() + "->" + kv.Value));
+          wr.Write("]");
+        }
+        */
+        if (e.OpenParen == null && e.Args.Count == 0) {
+        } else {
+          PrintActualArguments(e.Bindings, e.Name, null);
+        }
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is SeqConstructionExpr) {
+        var e = (SeqConstructionExpr)expr;
+        wr.Write("seq");
+        if (e.ExplicitElementType != null) {
+          wr.Write("<{0}>", e.ExplicitElementType);
+        }
+        wr.Write("(");
+        PrintExpression(e.N, false);
+        wr.Write(", ");
+        PrintExpression(e.Initializer, false);
+        wr.Write(")");
+
+      } else if (expr is MultiSetFormingExpr) {
+        wr.Write("multiset(");
+        PrintExpression(((MultiSetFormingExpr)expr).E, false);
+        wr.Write(")");
+
+      } else if (expr is OldExpr) {
+        var e = (OldExpr)expr;
+        wr.Write("old");
+        if (e.At != null) {
+          wr.Write("@{0}", e.At);
+        }
+        wr.Write("(");
+        PrintExpression(e.E, false);
+        wr.Write(")");
+
+      } else if (expr is UnchangedExpr) {
+        var e = (UnchangedExpr)expr;
+        wr.Write("unchanged");
+        if (e.At != null) {
+          wr.Write("@{0}", e.At);
+        }
+        wr.Write("(");
+        PrintFrameExpressionList(e.Frame);
+        wr.Write(")");
+
+      } else if (expr is FreshExpr) {
+        var e = (FreshExpr)expr;
+        var label = e.At;
+        wr.Write("fresh{0}(", label == null ? "" : "@" + label);
+        PrintExpression(e.E, false);
+        wr.Write(")");
+
+      } else if (expr is UnaryOpExpr) {
+        var e = (UnaryOpExpr)expr;
+        if (e.Op == UnaryOpExpr.Opcode.Cardinality) {
+          wr.Write("|");
+          PrintExpression(e.E, false);
+          wr.Write("|");
+        } else if (e.Op == UnaryOpExpr.Opcode.Allocated) {
+          wr.Write("allocated(");
+          PrintExpression(e.E, false);
+          wr.Write(")");
+        } else if (e.Op == UnaryOpExpr.Opcode.Lit) {
+          wr.Write("Lit(");
+          PrintExpression(e.E, false);
+          wr.Write(")");
+        } else if (e.Op == UnaryOpExpr.Opcode.Assigned) {
+          wr.Write("assigned(");
+          PrintExpression(e.E, false);
+          wr.Write(")");
+        } else {
+          Contract.Assert(e.Op != UnaryOpExpr.Opcode.Fresh); // this is handled is "is FreshExpr" case above
+          // Prefix operator.
+          // determine if parens are needed
+          string op;
+          int opBindingStrength;
+          switch (e.Op) {
+            case UnaryOpExpr.Opcode.Not:
+              op = "!"; opBindingStrength = BindingStrengthUnaryPrefix; break;
+            default:
+              Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary opcode
+          }
+          bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+          if (parensNeeded) { wr.Write("("); }
+          wr.Write(op);
+          PrintExpr(e.E, opBindingStrength, false, parensNeeded || isRightmost, !parensNeeded && isFollowedBySemicolon, -1, keyword);
+          if (parensNeeded) { wr.Write(")"); }
+        }
+
+      } else if (expr is TypeUnaryExpr) {
+        var e = (TypeUnaryExpr)expr;
+        int opBindingStrength = BindingStrengthUnarySuffix;
+        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        if (parensNeeded) { wr.Write("("); }
+        PrintExpr(e.E, opBindingStrength, false, false, !parensNeeded && isFollowedBySemicolon, -1, keyword);
+        Contract.Assert(e is ConversionExpr || e is TypeTestExpr);
+        wr.Write(e is ConversionExpr ? " as " : " is ");
+        PrintType(e.ToType);
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is BinaryExpr) {
+        var e = (BinaryExpr)expr;
+        // determine if parens are needed
+        int opBindingStrength;
+        bool fragileLeftContext = false;  // false means "allow same binding power on left without parens"
+        bool fragileRightContext = false;  // false means "allow same binding power on right without parens"
+        switch (e.Op) {
+          case BinaryExpr.Opcode.LeftShift:
+          case BinaryExpr.Opcode.RightShift:
+            opBindingStrength = BindingStrengthShift; fragileRightContext = true; break;
+          case BinaryExpr.Opcode.Add: {
+              opBindingStrength = BindingStrengthAdd;
+              var t1 = e.E1.Type;
+              fragileRightContext = t1 == null || !(t1.IsIntegerType || t1.IsRealType || t1.IsBigOrdinalType || t1.IsBitVectorType);
+              break;
+            }
+          case BinaryExpr.Opcode.Sub:
+            opBindingStrength = BindingStrengthAdd; fragileRightContext = true; break;
+          case BinaryExpr.Opcode.Mul: {
+              opBindingStrength = BindingStrengthMul;
+              var t1 = e.E1.Type;
+              fragileRightContext = t1 == null || !(t1.IsIntegerType || t1.IsRealType || t1.IsBigOrdinalType || t1.IsBitVectorType);
+              break;
+            }
+          case BinaryExpr.Opcode.Div:
+          case BinaryExpr.Opcode.Mod:
+            opBindingStrength = BindingStrengthMul; fragileRightContext = true; break;
+          case BinaryExpr.Opcode.BitwiseAnd:
+            opBindingStrength = BindingStrengthBitwiseAnd; break;
+          case BinaryExpr.Opcode.BitwiseOr:
+            opBindingStrength = BindingStrengthBitwiseOr; break;
+          case BinaryExpr.Opcode.BitwiseXor:
+            opBindingStrength = BindingStrengthBitwiseXor; break;
+          case BinaryExpr.Opcode.Eq:
+          case BinaryExpr.Opcode.Neq:
+          case BinaryExpr.Opcode.Gt:
+          case BinaryExpr.Opcode.Ge:
+          case BinaryExpr.Opcode.Lt:
+          case BinaryExpr.Opcode.Le:
+          case BinaryExpr.Opcode.Disjoint:
+          case BinaryExpr.Opcode.In:
+          case BinaryExpr.Opcode.NotIn:
+            opBindingStrength = BindingStrengthCompare; fragileLeftContext = fragileRightContext = true; break;
+          case BinaryExpr.Opcode.And:
+            opBindingStrength = BindingStrengthAnd; break;
+          case BinaryExpr.Opcode.Or:
+            opBindingStrength = BindingStrengthOr; break;
+          case BinaryExpr.Opcode.Imp:
+            opBindingStrength = BindingStrengthImplies; fragileLeftContext = true; break;
+          case BinaryExpr.Opcode.Exp:
+            opBindingStrength = BindingStrengthExplies; fragileRightContext = true; break;
+          case BinaryExpr.Opcode.Iff:
+            opBindingStrength = BindingStrengthEquiv; break;
+          default:
+            Contract.Assert(false); throw new cce.UnreachableException();  // unexpected binary operator
+        }
+        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        string op = BinaryExpr.OpcodeString(e.Op);
+        if (parensNeeded) { wr.Write("("); }
+        var sem = !parensNeeded && isFollowedBySemicolon;
+        if (0 <= indent && e.Op == BinaryExpr.Opcode.And) {
+          PrintExpr(e.E0, opBindingStrength, fragileLeftContext, false, sem, indent, keyword);
+          wr.WriteLine(" {0}", op);
+          Indent(indent);
+          PrintExpr(e.E1, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, indent, keyword);
+        } else if (0 <= indent && e.Op == BinaryExpr.Opcode.Imp) {
+          PrintExpr(e.E0, opBindingStrength, fragileLeftContext, false, sem, indent, keyword);
+          wr.WriteLine(" {0}", op);
+          int ind = indent + IndentAmount;
+          Indent(ind);
+          PrintExpr(e.E1, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, ind, keyword);
+        } else if (0 <= indent && e.Op == BinaryExpr.Opcode.Exp) {
+          PrintExpr(e.E1, opBindingStrength, fragileLeftContext, false, sem, indent, keyword);
+          wr.WriteLine(" {0}", op);
+          int ind = indent + IndentAmount;
+          Indent(ind);
+          PrintExpr(e.E0, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, ind, keyword);
+        } else if (e.Op == BinaryExpr.Opcode.Exp) {
+          PrintExpr(e.E1, opBindingStrength, fragileLeftContext, false, sem, -1, keyword);
+          wr.Write(" {0} ", op);
+          PrintExpr(e.E0, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, -1, keyword);
+        } else {
+          PrintExpr(e.E0, opBindingStrength, fragileLeftContext, false, sem, -1, keyword);
+          wr.Write(" {0} ", op);
+          PrintExpr(e.E1, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, -1, keyword);
+        }
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is TernaryExpr) {
+        var e = (TernaryExpr)expr;
+        switch (e.Op) {
+          case TernaryExpr.Opcode.PrefixEqOp:
+          case TernaryExpr.Opcode.PrefixNeqOp:
+            var opBindingStrength = BindingStrengthCompare;
+            var fragileLeftContext = true;
+            var fragileRightContext = true;
+            bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+            if (parensNeeded) { wr.Write("("); }
+            var sem = !parensNeeded && isFollowedBySemicolon;
+            PrintExpr(e.E1, opBindingStrength, fragileLeftContext, false, sem, -1, keyword);
+            wr.Write(" {0}#[", e.Op == TernaryExpr.Opcode.PrefixEqOp ? "==" : "!=");
+            PrintExpression(e.E0, false);
+            wr.Write("] ");
+            PrintExpr(e.E2, opBindingStrength, fragileRightContext, parensNeeded || isRightmost, sem, -1, keyword);
+            if (parensNeeded) { wr.Write(")"); }
+            break;
+          default:
+            Contract.Assert(false);  // unexpected ternary operator
+            break;
+        }
+
+      } else if (expr is ChainingExpression) {
+        var e = (ChainingExpression)expr;
+        // determine if parens are needed
+        int opBindingStrength = BindingStrengthCompare;
+        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        if (parensNeeded) { wr.Write("("); }
+        var sem = !parensNeeded && isFollowedBySemicolon;
+        PrintExpr(e.Operands[0], opBindingStrength, true, false, sem, -1, keyword);
+        for (int i = 0; i < e.Operators.Count; i++) {
+          string op = BinaryExpr.OpcodeString(e.Operators[i]);
+          if (e.PrefixLimits[i] == null) {
+            wr.Write(" {0} ", op);
+          } else {
+            wr.Write(" {0}#[", op);
+            PrintExpression(e.PrefixLimits[i], false);
+            wr.Write("] ");
+          }
+          PrintExpr(e.Operands[i + 1], opBindingStrength, true, i == e.Operators.Count - 1 && (parensNeeded || isRightmost), sem, -1, keyword);
+        }
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is LetExpr) {
+        var e = (LetExpr)expr;
+        bool parensNeeded = !isRightmost;
+        if (parensNeeded) { wr.Write("("); }
+        if (e.Origin is AutoGeneratedOrigin) {
+          wr.Write("/* ");
+        }
+        PrintAttributes(e.Attributes, true, indent);
+        if (e.LHSs.Exists(lhs => lhs != null && lhs.Var != null && lhs.Var.IsGhost)) { wr.Write("ghost "); }
+        wr.Write("var ");
+        string sep = "";
+        foreach (var lhs in e.LHSs) {
+          wr.Write(sep);
+          PrintCasePattern(lhs);
+          sep = ", ";
+        }
+        if (e.Exact) {
+          wr.Write(" := ");
+        } else {
+          PrintAttributes(e.Attributes, false);
+          wr.Write(" :| ");
+        }
+        PrintExpressionList(e.RHSs, true);
+        wr.Write("; ");
+        if (e.Origin is AutoGeneratedOrigin) {
+          wr.Write("*/ ");
+        }
+        PrintExpression(e.Body, !parensNeeded && isFollowedBySemicolon);
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is LetOrFailExpr) {
+        // TODO should we also print the desugared version?
+        // If so, should we insert newlines?
+        var e = (LetOrFailExpr)expr;
+        bool parensNeeded = !isRightmost;
+        if (parensNeeded) { wr.Write("("); }
+        if (e.Lhs != null) {
+          if (e.Lhs.Var != null && e.Lhs.Var.IsGhost) { wr.Write("ghost "); }
+          wr.Write("var ");
+          PrintCasePattern(e.Lhs);
+          wr.Write(" :- ");
+        } else {
+          wr.Write(":- ");
+        }
+        PrintExpression(e.Rhs, true);
+        wr.Write("; ");
+        PrintExpression(e.Body, !parensNeeded && isFollowedBySemicolon);
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is QuantifierExpr) {
+        QuantifierExpr e = (QuantifierExpr)expr;
+
+        if (e.SplitQuantifier != null) {
+          PrintExpr(e.SplitQuantifierExpression, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent, keyword, resolv_count);
+          return;
+        }
+
+        bool parensNeeded = !isRightmost;
+        if (parensNeeded) { wr.Write("("); }
+        wr.Write(e is ForallExpr ? "forall" : "exists");
+        wr.Write(" ");
+        PrintQuantifierDomain(e.BoundVars, e.Attributes, e.Range);
+        if (keyword == null) {
+          wr.Write(" :: ");
+        } else {
+          wr.WriteLine();
+          wr.Write(keyword);
+        }
+        if (0 <= indent) {
+          int ind = indent + IndentAmount;
+          wr.WriteLine();
+          Indent(ind);
+          PrintExpression(e.Term, !parensNeeded && isFollowedBySemicolon, ind);
+        } else {
+          PrintExpression(e.Term, !parensNeeded && isFollowedBySemicolon);
+        }
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is SetComprehension) {
+        var e = (SetComprehension)expr;
+        bool parensNeeded = !isRightmost;
+        if (parensNeeded) { wr.Write("("); }
+        PrintAttributes(e.Attributes, true, AtAttributesOnSameLineIndent);
+        if (e.Finite) {
+          wr.Write("set ");
+        } else {
+          wr.Write("iset ");
+        }
+        string sep = "";
+        foreach (BoundVar bv in e.BoundVars) {
+          wr.Write("{0}{1}", sep, bv.DisplayName);
+          sep = ", ";
+          PrintType(": ", bv.Type);
+        }
+        PrintAttributes(e.Attributes, false);
+        wr.Write(" | ");
+        PrintExpression(e.Range, !parensNeeded && isFollowedBySemicolon);
+        if (!e.TermIsImplicit) {
+          wr.Write(" :: ");
+          PrintExpression(e.Term, !parensNeeded && isFollowedBySemicolon);
+        }
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is MapComprehension) {
+        var e = (MapComprehension)expr;
+        bool parensNeeded = !isRightmost;
+        if (parensNeeded) { wr.Write("("); }
+
+        PrintAttributes(e.Attributes, true);
+        wr.Write(e.Finite ? "map " : "imap ");
+        string sep = "";
+        foreach (BoundVar bv in e.BoundVars) {
+          wr.Write("{0}{1}", sep, bv.DisplayName);
+          sep = ", ";
+          PrintType(": ", bv.Type);
+        }
+        PrintAttributes(e.Attributes, false);
+        wr.Write(" | ");
+        PrintExpression(e.Range, false);
+        wr.Write(" :: ");
+        if (e.TermLeft != null) {
+          PrintExpression(e.TermLeft, false);
+          wr.Write(" := ");
+        }
+        PrintExpression(e.Term, !parensNeeded && isFollowedBySemicolon);
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is LambdaExpr) {
+        var e = (LambdaExpr)expr;
+        bool parensNeeded = !isRightmost;
+        if (parensNeeded) { wr.Write("("); }
+        var skipSignatureParens = e.BoundVars.Count == 1 && !ShowType(e.BoundVars[0].Type);
+        if (!skipSignatureParens) { wr.Write("("); }
+        wr.Write(Util.Comma(e.BoundVars, bv => bv.DisplayName + (ShowType(bv.Type) ? ": " + bv.Type : "")));
+        if (!skipSignatureParens) { wr.Write(")"); }
+        if (e.Range != null) {
+          wr.Write(" requires ");
+          PrintExpression(e.Range, false);
+        }
+
+        var firstReadsExpression = true;
+        foreach (var read in e.Reads.Expressions) {
+          if (firstReadsExpression) {
+            PrintAttributes(e.Reads.Attributes, indent, () => {
+              wr.Write(" reads ");
+            });
+            firstReadsExpression = false;
+          } else {
+            wr.Write(", ");
+          }
+
+          PrintExpression(read.E, false);
+        }
+        wr.Write(" => ");
+        PrintExpression(e.Term, isFollowedBySemicolon);
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is WildcardExpr) {
+        wr.Write("*");
+
+      } else if (expr is StmtExpr) {
+        var e = (StmtExpr)expr;
+        bool parensNeeded;
+        if (e.S is AssertStmt || e.S is ExpectStmt || e.S is AssumeStmt || e.S is CalcStmt) {
+          parensNeeded = !isRightmost;
+        } else {
+          parensNeeded = !isRightmost || isFollowedBySemicolon;
+        }
+        if (parensNeeded) { wr.Write("("); }
+        int ind = indent < 0 ? IndentAmount : indent;  // if the expression was to be printed on one line, instead print the .S part at indentation IndentAmount (not pretty, but something)
+        PrintStatement(e.S, ind);
+        wr.Write(" ");
+        PrintExpression(e.E, !parensNeeded && isFollowedBySemicolon);
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is ITEExpr) {
+        ITEExpr ite = (ITEExpr)expr;
+        bool parensNeeded = !isRightmost;
+        if (parensNeeded) { wr.Write("("); }
+        wr.Write("if ");
+        PrintExpression(ite.Test, false);
+        wr.Write(" then ");
+        PrintExpression(ite.Thn, false);
+        wr.Write(" else ");
+        PrintExpression(ite.Els, !parensNeeded && isFollowedBySemicolon);
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else if (expr is ParensExpression) {
+        var e = (ParensExpression)expr;
+        // printing of parentheses is done optimally, not according to the parentheses in the given program
+        PrintExpr(e.E, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent, keyword);
+
+      } else if (expr is NegationExpression) {
+        var e = (NegationExpression)expr;
+        string op = "-";
+        int opBindingStrength = BindingStrengthUnaryPrefix;
+        bool parensNeeded = ParensNeeded(opBindingStrength, contextBindingStrength, fragileContext);
+
+        if (parensNeeded) { wr.Write("("); }
+        wr.Write(op);
+        PrintExpr(e.E, opBindingStrength, false, parensNeeded || isRightmost, !parensNeeded && isFollowedBySemicolon, -1, keyword);
+        if (parensNeeded) { wr.Write(")"); }
+      } else if (expr is NestedMatchExpr) {
+        var e = (NestedMatchExpr)expr;
+        var parensNeeded = !isRightmost && !e.UsesOptionalBraces;
+        if (parensNeeded) { wr.Write("("); }
+        wr.Write("match ");
+        PrintExpression(e.Source, isRightmost && e.Cases.Count == 0, !parensNeeded && isFollowedBySemicolon);
+        if (e.UsesOptionalBraces) { wr.Write(" {"); }
+        int i = 0;
+        foreach (var mc in e.Cases) {
+          bool isLastCase = i == e.Cases.Count - 1;
+          PrintNestedMatchCase(isRightmost, isFollowedBySemicolon, mc, isLastCase, parensNeeded);
+          i++;
+        }
+        if (e.UsesOptionalBraces) { wr.Write(" }"); } else if (parensNeeded) { wr.Write(")"); }
+        // }
+      } else if (expr is MatchExpr) {
+        var e = (MatchExpr)expr;
+        if (options.DafnyPrintResolvedFile == null && e.OrigUnresolved != null) {
+          PrintExpr(e.OrigUnresolved, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent);
+        } else {
+          var parensNeeded = !isRightmost && !e.UsesOptionalBraces;
+          if (parensNeeded) { wr.Write("("); }
+          wr.Write("match ");
+          PrintExpression(e.Source, isRightmost && e.Cases.Count == 0, !parensNeeded && isFollowedBySemicolon);
+          if (e.UsesOptionalBraces) { wr.Write(" {"); }
+          int i = 0;
+          foreach (var mc in e.Cases) {
+            bool isLastCase = i == e.Cases.Count - 1;
+            wr.Write(" case {0}", mc.Ctor.Name);
+            PrintMatchCaseArgument(mc);
+            wr.Write(" => ");
+            PrintExpression(mc.Body, isRightmost && isLastCase, !parensNeeded && isFollowedBySemicolon);
+            i++;
+          }
+          if (e.UsesOptionalBraces) {
+            wr.Write(" }");
+          } else if (parensNeeded) {
+            wr.Write(")");
+          }
+        }
+
+      } else if (expr is DefaultValueExpression) {
+        var e = (DefaultValueExpression)expr;
+        // DefaultValueExpression's are introduced during resolution, so we expect .Resolved to be non-null
+        Contract.Assert(e.WasResolved());
+        Contract.Assert(e.Resolved != null);
+        PrintExpr(e.Resolved, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent, keyword);
+
+      } else if (expr is BoxingCastExpr) {
+        // this is not expected for a parsed program, but we may be called for /trace purposes in the translator
+        var e = (BoxingCastExpr)expr;
+        PrintExpr(e.E, contextBindingStrength, fragileContext, isRightmost, isFollowedBySemicolon, indent, keyword);
+      } else if (expr is BoogieGenerator.BoogieWrapper) {
+        wr.Write("[BoogieWrapper]");  // this is somewhat unexpected, but we can get here if the /trace switch is used, so it seems best to cover this case here
+      } else if (expr is BoogieGenerator.BoogieFunctionCall) {
+        wr.Write("[BoogieFunctionCall]");  // this prevents debugger watch window crash
+      } else if (expr is ResolverIdentifierExpr) {
+        wr.Write("[Resolver_IdentifierExpr]");  // we can get here in the middle of a debugging session
+      } else if (expr is DecreasesToExpr decreasesToExpr) {
+        var opBindingStrength = BindingStrengthDecreasesTo;
+        var parensNeeded =
+          opBindingStrength < contextBindingStrength ||
+          (opBindingStrength == contextBindingStrength && fragileContext) ||
+          decreasesToExpr.OldExpressions.Count != 1 || decreasesToExpr.NewExpressions.Count != 1; // always parenthesize non-simple expressions
+
+        if (parensNeeded) { wr.Write("("); }
+
+        var comma = false;
+        foreach (var oldExpr in decreasesToExpr.OldExpressions) {
+          if (comma) {
+            wr.Write(", ");
+          }
+          PrintExpr(oldExpr, opBindingStrength, true, false, false, -1);
+          comma = true;
+        }
+        if (decreasesToExpr.AllowNoChange) {
+          wr.Write(" nonincreases to ");
+        } else {
+          wr.Write(" decreases to ");
+        }
+        comma = false;
+        foreach (var newExpr in decreasesToExpr.NewExpressions) {
+          if (comma) {
+            wr.Write(", ");
+          }
+          PrintExpr(newExpr, opBindingStrength, true, !parensNeeded && isRightmost, true, -1);
+          comma = true;
+        }
+
+        if (parensNeeded) { wr.Write(")"); }
+
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
+      }
+    }
+
+    public void PrintNestedMatchCase(bool isRightmost, bool isFollowedBySemicolon, NestedMatchCaseExpr mc, bool isLastCase,
+      bool parensNeeded) {
+      wr.Write(" ");
+      PrintAttributes(mc.Attributes, AtAttributesOnSameLineIndent, () => {
+        wr.Write("case");
+      });
+      wr.Write(" ");
+      PrintExtendedPattern(mc.Pat);
+      wr.Write(" => ");
+      PrintExpression(mc.Body, isRightmost && isLastCase, !parensNeeded && isFollowedBySemicolon);
+    }
+  }
+}
diff --git a/Source/DafnyCore/AST/Grammar/Printer/Printer.Statement.cs b/Source/DafnyCore/AST/Grammar/Printer/Printer.Statement.cs
new file mode 100644
index 00000000000..f12d0dcd96f
--- /dev/null
+++ b/Source/DafnyCore/AST/Grammar/Printer/Printer.Statement.cs
@@ -0,0 +1,802 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.Diagnostics.Contracts;
+using System.Numerics;
+using System.Linq;
+using DafnyCore;
+using JetBrains.Annotations;
+using Bpl = Microsoft.Boogie;
+
+namespace Microsoft.Dafny {
+
+  interface ICanPrint {
+    void Render(TextWriter wr, Printer printer, int indent);
+  }
+
+  public partial class Printer {
+
+    /// <summary>
+    /// Prints from the current position of the current line.
+    /// If the statement requires several lines, subsequent lines are indented at "indent".
+    /// No newline is printed after the statement.
+    /// </summary>
+    public void PrintStatement(Statement stmt, int indent, bool includeSemicolon = true) {
+      Contract.Requires(stmt != null);
+
+      if (stmt.IsGhost && printMode == PrintModes.NoGhostOrIncludes) {
+        return;
+      }
+
+      for (LList<Label> label = stmt.Labels; label != null; label = label.Next) {
+        if (label.Data.Name != null) {
+          wr.WriteLine("label {0}:", label.Data.Name);
+          Indent(indent);
+        }
+      }
+
+      if (stmt is ICanPrint canPrint) {
+        canPrint.Render(wr, this, indent);
+        return;
+      }
+
+      if (stmt is PredicateStmt) {
+        PrintPredicateStmt(stmt, includeSemicolon);
+      } else if (stmt is PrintStmt) {
+        PrintStmt s = (PrintStmt)stmt;
+        wr.Write("print");
+        PrintAttributeArgs(s.Args, true);
+        wr.Write(";");
+
+      } else if (stmt is HideRevealStmt revealStmt) {
+        PrintHideReveal(revealStmt);
+      } else if (stmt is BreakOrContinueStmt) {
+        var s = (BreakOrContinueStmt)stmt;
+        if (s.TargetLabel != null) {
+          wr.Write($"{s.Kind} {s.TargetLabel.val};");
+        } else {
+          for (int i = 0; i < s.BreakAndContinueCount - 1; i++) {
+            wr.Write("break ");
+          }
+          wr.Write($"{s.Kind};");
+        }
+
+      } else if (stmt is ProduceStmt) {
+        var s = (ProduceStmt)stmt;
+        wr.Write(s is YieldStmt ? "yield" : "return");
+        if (s.Rhss != null) {
+          var sep = " ";
+          foreach (var rhs in s.Rhss) {
+            wr.Write(sep);
+            PrintRhs(rhs);
+            sep = ", ";
+          }
+        }
+        wr.Write(";");
+
+      } else if (stmt is SingleAssignStmt) {
+        SingleAssignStmt s = (SingleAssignStmt)stmt;
+        PrintExpression(s.Lhs, true);
+        wr.Write(" := ");
+        PrintRhs(s.Rhs);
+        wr.Write(";");
+
+      } else if (stmt is DividedBlockStmt) {
+        var sbs = (DividedBlockStmt)stmt;
+        wr.WriteLine("{");
+        int ind = indent + IndentAmount;
+        foreach (Statement s in sbs.BodyInit) {
+          Indent(ind);
+          PrintStatement(s, ind);
+          wr.WriteLine();
+        }
+        if (sbs.BodyProper.Count != 0 || sbs.SeparatorTok != null) {
+          Indent(indent + IndentAmount);
+          wr.WriteLine("new;");
+          foreach (Statement s in sbs.BodyProper) {
+            Indent(ind);
+            PrintStatement(s, ind);
+            wr.WriteLine();
+          }
+        }
+        Indent(indent);
+        wr.Write("}");
+
+      } else if (stmt is BlockStmt blockStmt) {
+        PrintBlockStmt(blockStmt, indent);
+      } else if (stmt is IfStmt) {
+        IfStmt s = (IfStmt)stmt;
+        PrintIfStatement(indent, s, false);
+
+      } else if (stmt is AlternativeStmt) {
+        var s = (AlternativeStmt)stmt;
+        PrintAttributes(s.Attributes, indent, () => {
+          wr.Write("if");
+        });
+        if (s.UsesOptionalBraces) {
+          wr.Write(" {");
+        }
+        PrintAlternatives(indent + (s.UsesOptionalBraces ? IndentAmount : 0), s.Alternatives);
+        if (s.UsesOptionalBraces) {
+          wr.WriteLine();
+          Indent(indent);
+          wr.Write("}");
+        }
+      } else if (stmt is WhileStmt) {
+        var s = (WhileStmt)stmt;
+        PrintWhileStatement(indent, s, false, false);
+      } else if (stmt is AlternativeLoopStmt) {
+        var s = (AlternativeLoopStmt)stmt;
+        PrintAttributes(s.Attributes, indent, () => {
+          wr.Write("while");
+        });
+        PrintSpec("invariant", s.Invariants, indent + IndentAmount);
+        PrintDecreasesSpec(s.Decreases, indent + IndentAmount);
+        PrintFrameSpecLine("modifies", s.Mod, indent + IndentAmount);
+        bool hasSpecs = s.Invariants.Count != 0 ||
+                        (s.Decreases.Expressions != null && s.Decreases.Expressions.Count != 0) ||
+                        s.Mod.Expressions != null;
+        if (s.UsesOptionalBraces) {
+          if (hasSpecs) {
+            wr.WriteLine();
+            Indent(indent);
+          } else {
+            wr.Write(" ");
+          }
+          wr.Write("{");
+        }
+        Contract.Assert(s.Alternatives.Count != 0);
+        PrintAlternatives(indent + (s.UsesOptionalBraces ? IndentAmount : 0), s.Alternatives);
+        if (s.UsesOptionalBraces) {
+          wr.WriteLine();
+          Indent(indent);
+          wr.Write("}");
+        }
+
+      } else if (stmt is ForLoopStmt) {
+        var s = (ForLoopStmt)stmt;
+        PrintForLoopStatement(indent, s);
+
+      } else if (stmt is ForallStmt) {
+        var s = (ForallStmt)stmt;
+        if (options.DafnyPrintResolvedFile != null && s.EffectiveEnsuresClauses != null) {
+          foreach (var expr in s.EffectiveEnsuresClauses) {
+            PrintExpression(expr, false, new string(' ', indent + IndentAmount) + "ensures ");
+          }
+          if (s.Body != null) {
+            wr.WriteLine();
+            Indent(indent);
+          }
+        } else {
+          wr.Write("forall");
+          if (s.BoundVars.Count != 0) {
+            wr.Write(" ");
+            PrintQuantifierDomain(s.BoundVars, s.Attributes, s.Range);
+          }
+          PrintSpec("ensures", s.Ens, indent + IndentAmount);
+          if (s.Body != null) {
+            if (s.Ens.Count == 0) {
+              wr.Write(" ");
+            } else {
+              wr.WriteLine();
+              Indent(indent);
+            }
+          }
+        }
+        if (s.Body != null) {
+          PrintStatement(s.Body, indent);
+        }
+
+      } else if (stmt is ModifyStmt) {
+        var s = (ModifyStmt)stmt;
+        PrintModifyStmt(indent, s, false);
+
+      } else if (stmt is CalcStmt) {
+        CalcStmt s = (CalcStmt)stmt;
+        if (printMode == PrintModes.NoGhostOrIncludes) { return; }   // Calcs don't get a "ghost" attribute, but they are.
+        PrintAttributes(stmt.Attributes, indent, () => {
+          wr.Write("calc");
+        });
+        wr.Write(" ");
+        if (s.UserSuppliedOp != null) {
+          PrintCalcOp(s.UserSuppliedOp);
+          wr.Write(" ");
+        } else if (options.DafnyPrintResolvedFile != null && s.Op != null) {
+          PrintCalcOp(s.Op);
+          wr.Write(" ");
+        }
+        wr.WriteLine("{");
+        int lineInd = indent + IndentAmount;
+        int lineCount = s.Lines.Count == 0 ? 0 : s.Lines.Count - 1;  // if nonempty, .Lines always contains a duplicated last line
+        // The number of op/hints is commonly one less than the number of lines, but
+        // it can also equal the number of lines for empty calc's and for calc's with
+        // a dangling hint.
+        int hintCount = s.Lines.Count != 0 && s.Hints.Last().Body.Count == 0 ? lineCount - 1 : lineCount;
+        for (var i = 0; i < lineCount; i++) {
+          var e = s.Lines[i];
+          var op = s.StepOps[i];
+          var h = s.Hints[i];
+          // print the line
+          Indent(lineInd);
+          PrintExpression(e, true, lineInd);
+          wr.WriteLine(";");
+          if (i == hintCount) {
+            break;
+          }
+          // print the operator, if any
+          if (op != null || (options.DafnyPrintResolvedFile != null && s.Op != null)) {
+            Indent(indent); // this lines up with the "calc"
+            PrintCalcOp(op ?? s.Op);
+            wr.WriteLine();
+          }
+          // print the hints
+          foreach (var st in h.Body) {
+            Indent(lineInd);
+            PrintStatement(st, lineInd);
+            wr.WriteLine();
+          }
+        }
+        Indent(indent);
+        wr.Write("}");
+      } else if (stmt is NestedMatchStmt) {
+        // Print ResolvedStatement, if present, as comment
+        var s = (NestedMatchStmt)stmt;
+
+        if (s.Flattened != null && options.DafnyPrintResolvedFile != null) {
+          wr.WriteLine();
+          if (!printingDesugared) {
+            Indent(indent); wr.WriteLine("/*---------- flattened ----------");
+          }
+
+          var savedDesugarMode = printingDesugared;
+          printingDesugared = true;
+          Indent(indent); PrintStatement(s.Flattened, indent);
+          wr.WriteLine();
+          printingDesugared = savedDesugarMode;
+
+          if (!printingDesugared) {
+            Indent(indent); wr.WriteLine("---------- end flattened ----------*/");
+          }
+          Indent(indent);
+        }
+
+        if (!printingDesugared) {
+          PrintAttributes(s.Attributes, indent, () => {
+            wr.Write("match");
+          });
+          wr.Write(" ");
+          PrintExpression(s.Source, false);
+          if (s.UsesOptionalBraces) {
+            wr.Write(" {");
+          }
+          int caseInd = indent + (s.UsesOptionalBraces ? IndentAmount : 0);
+          foreach (NestedMatchCaseStmt mc in s.Cases) {
+            wr.WriteLine();
+            Indent(caseInd);
+            PrintAttributes(mc.Attributes, indent, () => {
+              wr.Write("case");
+            });
+            wr.Write(" ");
+            PrintExtendedPattern(mc.Pat);
+            wr.Write(" =>");
+            foreach (Statement bs in mc.Body) {
+              wr.WriteLine();
+              Indent(caseInd + IndentAmount);
+              PrintStatement(bs, caseInd + IndentAmount);
+            }
+          }
+          if (s.UsesOptionalBraces) {
+            wr.WriteLine();
+            Indent(indent);
+            wr.Write("}");
+          }
+        }
+      } else if (stmt is MatchStmt) {
+        var s = (MatchStmt)stmt;
+        PrintAttributes(s.Attributes, indent, () => {
+          wr.Write("match");
+        });
+        wr.Write(" ");
+        PrintExpression(s.Source, false);
+        if (s.UsesOptionalBraces) {
+          wr.Write(" {");
+        }
+
+        int caseInd = indent + (s.UsesOptionalBraces ? IndentAmount : 0);
+        foreach (MatchCaseStmt mc in s.Cases) {
+          wr.WriteLine();
+          Indent(caseInd);
+          PrintAttributes(mc.Attributes, indent, () => {
+            wr.Write("case");
+          });
+          wr.Write(" ");
+          if (!mc.Ctor.Name.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
+            wr.Write(mc.Ctor.Name);
+          }
+
+          PrintMatchCaseArgument(mc);
+          wr.Write(" =>");
+          foreach (Statement bs in mc.Body) {
+            wr.WriteLine();
+            Indent(caseInd + IndentAmount);
+            PrintStatement(bs, caseInd + IndentAmount);
+          }
+        }
+
+        if (s.UsesOptionalBraces) {
+          wr.WriteLine();
+          Indent(indent);
+          wr.Write("}");
+        }
+
+      } else if (stmt is ConcreteAssignStatement concreteAssignStatement) {
+        PrintConcreteUpdateStatement(concreteAssignStatement, indent, includeSemicolon);
+      } else if (stmt is CallStmt) {
+        // Most calls are printed from their concrete syntax given in the input. However, recursive calls to
+        // prefix lemmas end up as CallStmt's by the end of resolution and they may need to be printed here.
+        var s = (CallStmt)stmt;
+        PrintExpression(s.MethodSelect, false);
+        PrintActualArguments(s.Bindings, s.Method.Name, null);
+
+      } else if (stmt is VarDeclStmt) {
+        var s = (VarDeclStmt)stmt;
+        if (s.Locals.Exists(v => v.IsGhost) && printMode == PrintModes.NoGhostOrIncludes) { return; }
+        if (s.Locals.TrueForAll((v => v.IsGhost))) {
+          // Emit the "ghost" modifier if all of the variables are ghost. If some are ghost, but not others,
+          // then some of these ghosts are auto-converted to ghost, so we should not emit the "ghost" keyword.
+          wr.Write("ghost ");
+        }
+        wr.Write("var");
+        string sep = "";
+        foreach (var local in s.Locals) {
+          wr.Write(sep);
+          if (local.Attributes != null) {
+            PrintAttributes(local.Attributes, AtAttributesOnSameLineIndent, () => { });
+          }
+          wr.Write(" {0}", local.DisplayName);
+          PrintType(": ", local.SyntacticType);
+          sep = ",";
+        }
+        if (s.Assign != null) {
+          wr.Write(" ");
+          PrintUpdateRHS(s.Assign, indent);
+        }
+
+        if (includeSemicolon) {
+          wr.Write(";");
+        }
+      } else if (stmt is VarDeclPattern) {
+        var s = (VarDeclPattern)stmt;
+        if (s.Origin is AutoGeneratedOrigin) {
+          wr.Write("/* ");
+        }
+        if (s.HasGhostModifier) {
+          wr.Write("ghost ");
+        }
+        wr.Write("var ");
+        PrintCasePattern(s.LHS);
+        wr.Write(" := ");
+        PrintExpression(s.RHS, true);
+        wr.Write(";");
+        if (s.Origin is AutoGeneratedOrigin) {
+          wr.Write(" */");
+        }
+
+      } else if (stmt is SkeletonStatement) {
+        var s = (SkeletonStatement)stmt;
+        if (s.S == null) {
+          wr.Write("...;");
+        } else if (s.S is AssertStmt) {
+          Contract.Assert(s.ConditionOmitted);
+          wr.Write("assert ...;");
+        } else if (s.S is ExpectStmt) {
+          Contract.Assert(s.ConditionOmitted);
+          wr.Write("expect ...;");
+        } else if (s.S is AssumeStmt) {
+          Contract.Assert(s.ConditionOmitted);
+          wr.Write("assume ...;");
+        } else if (s.S is IfStmt) {
+          PrintIfStatement(indent, (IfStmt)s.S, s.ConditionOmitted);
+        } else if (s.S is WhileStmt) {
+          PrintWhileStatement(indent, (WhileStmt)s.S, s.ConditionOmitted, s.BodyOmitted);
+        } else if (s.S is ModifyStmt) {
+          PrintModifyStmt(indent, (ModifyStmt)s.S, true);
+        } else {
+          Contract.Assert(false);
+          throw new cce.UnreachableException(); // unexpected skeleton statement
+        }
+
+      } else if (stmt is TryRecoverStatement haltRecoveryStatement) {
+        // These have no actual syntax for Dafny user code, so emit something
+        // clearly not parsable.
+        int ind = indent + IndentAmount;
+
+        Indent(indent);
+        wr.WriteLine("[[ try { ]]");
+        PrintStatement(haltRecoveryStatement.TryBody, ind);
+        wr.WriteLine();
+
+        Indent(indent);
+        wr.WriteLine($"[[ }} recover ({haltRecoveryStatement.HaltMessageVar.Name}) {{ ]]");
+        PrintStatement(haltRecoveryStatement.RecoverBody, ind);
+        wr.Write("[[ } ]]");
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected statement
+      }
+    }
+
+    public void PrintConcreteUpdateStatement(ConcreteAssignStatement stmt, int indent, bool includeSemicolon = true) {
+      string sep = "";
+      foreach (var lhs in stmt.Lhss) {
+        wr.Write(sep);
+        PrintExpression(lhs, true);
+        sep = ", ";
+      }
+      if (stmt.Lhss.Count > 0) {
+        wr.Write(" ");
+      }
+      PrintUpdateRHS(stmt, indent);
+      if (includeSemicolon) {
+        wr.Write(";");
+      }
+    }
+
+    public void PrintBlockStmt(BlockStmt stmt, int indent) {
+      wr.WriteLine("{");
+      int ind = indent + IndentAmount;
+      foreach (Statement s in stmt.Body) {
+        Indent(ind);
+        PrintStatement(s, ind);
+        wr.WriteLine();
+      }
+      Indent(indent);
+      wr.Write("}");
+    }
+
+    public void PrintPredicateStmt(Statement stmt, bool includeSemicolon = true) {
+      if (printMode == PrintModes.NoGhostOrIncludes) {
+        return;
+      }
+      Expression expr = ((PredicateStmt)stmt).Expr;
+      var assertStmt = stmt as AssertStmt;
+      var expectStmt = stmt as ExpectStmt;
+      var keyword = assertStmt != null ? "assert" :
+        expectStmt != null ? "expect" :
+        "assume";
+      PrintAttributes(stmt.Attributes, AtAttributesOnSameLineIndent, () => {
+        wr.Write(keyword);
+      });
+      wr.Write(" ");
+      if (assertStmt != null && assertStmt.Label != null) {
+        wr.Write("{0}: ", assertStmt.Label.Name);
+      }
+      PrintExpression(expr, true);
+      if (expectStmt is { Message: not null }) {
+        wr.Write(", ");
+        PrintExpression(expectStmt.Message, true);
+      }
+
+      if (includeSemicolon) {
+        wr.Write(";");
+      }
+    }
+
+    private void PrintHideReveal(HideRevealStmt revealStmt) {
+      wr.Write(revealStmt.Mode == Bpl.HideRevealCmd.Modes.Hide ? "hide " : "reveal ");
+      if (revealStmt.Wildcard) {
+        wr.Write("*");
+      } else {
+        var sep = "";
+        foreach (var e in revealStmt.Exprs) {
+          wr.Write(sep);
+          sep = ", ";
+          if (HideRevealStmt.SingleName(e) != null) {
+            // this will do the printing correctly for labels (or label-lookalikes) like 00_023 (which by PrintExpression below would be printed as 23)
+            wr.Write(HideRevealStmt.SingleName(e));
+          } else {
+            PrintExpression(e, true);
+          }
+        }
+      }
+      wr.Write(";");
+    }
+
+    private void PrintModifyStmt(int indent, ModifyStmt s, bool omitFrame) {
+      Contract.Requires(0 <= indent);
+      Contract.Requires(s != null);
+      Contract.Requires(!omitFrame || s.Mod.Expressions.Count == 0);
+
+      PrintAttributes(s.Mod.Attributes, indent, () => {
+        wr.Write("modify");
+      });
+      wr.Write(" ");
+      if (omitFrame) {
+        wr.Write("...");
+      } else {
+        PrintFrameExpressionList(s.Mod.Expressions);
+      }
+      if (s.Body != null) {
+        // There's a possible syntactic ambiguity, namely if the frame is empty (more precisely,
+        // if s.Mod.Expressions.Count is 0).  Since the statement was parsed at some point, this
+        // situation can occur only if the modify statement inherited its frame by refinement
+        // and we're printing the post-resolve AST.  In this special case, print an explicit
+        // empty set as the frame.
+        if (s.Mod.Expressions.Count == 0) {
+          wr.Write(" {}");
+        }
+        wr.Write(" ");
+        PrintStatement(s.Body, indent);
+      } else {
+        wr.Write(";");
+      }
+    }
+
+    /// <summary>
+    /// Does not print LHS, nor the space one might want between LHS and RHS,
+    /// because if there's no LHS, we don't want to start with a space
+    /// </summary>
+    void PrintUpdateRHS(ConcreteAssignStatement s, int indent) {
+      Contract.Requires(s != null);
+      if (s is AssignStatement) {
+        var update = (AssignStatement)s;
+        if (update.Lhss.Count != 0) {
+          wr.Write(":= ");
+        }
+        var sep = "";
+        foreach (var rhs in update.Rhss) {
+          wr.Write(sep);
+          PrintRhs(rhs);
+          sep = ", ";
+        }
+      } else if (s is AssignSuchThatStmt) {
+        var update = (AssignSuchThatStmt)s;
+        wr.Write(":| ");
+        if (update.AssumeToken != null) {
+          PrintAttributes(update.AssumeToken.Attrs, indent, () => {
+            wr.Write("assume");
+          });
+          wr.Write(" ");
+        }
+        PrintExpression(update.Expr, true);
+      } else if (s is AssignOrReturnStmt) {
+        var stmt = (AssignOrReturnStmt)s;
+        wr.Write(":-");
+        if (stmt.KeywordToken != null) {
+          wr.Write(" ");
+          PrintAttributes(stmt.KeywordToken.Attrs, indent, () => {
+            wr.Write(stmt.KeywordToken.Token.val);
+          });
+        }
+        wr.Write(" ");
+        PrintRhs(stmt.Rhs);
+        foreach (var rhs in stmt.Rhss) {
+          wr.Write(", ");
+          PrintRhs(rhs);
+        }
+        if (options.DafnyPrintResolvedFile != null && stmt.ResolvedStatements.Count > 0) {
+          wr.WriteLine();
+          Indent(indent); wr.WriteLine("/*---------- desugared ----------");
+          foreach (Statement r in stmt.ResolvedStatements) {
+            Indent(indent);
+            PrintStatement(r, indent);
+            wr.WriteLine();
+          }
+          Indent(indent); wr.Write("---------- end desugared ----------*/");
+        }
+
+      } else {
+        Contract.Assert(false);  // otherwise, unknown type
+      }
+    }
+
+    void PrintIfStatement(int indent, IfStmt s, bool omitGuard) {
+      PrintAttributes(s.Attributes, indent, () => {
+        wr.Write("if");
+      });
+      wr.Write(" ");
+      if (omitGuard) {
+        wr.Write("... ");
+      } else {
+        PrintGuard(s.IsBindingGuard, s.Guard);
+        wr.Write(" ");
+      }
+      PrintStatement(s.Thn, indent);
+      if (s.Els != null) {
+        wr.Write(" ");
+        if (!(s.Els is IfStmt) && s.Els.Attributes != null) {
+          PrintAttributes(s.Els.Attributes, indent, () => {
+            wr.Write("else");
+          });
+        } else {
+          wr.Write("else");
+        }
+        wr.Write(" ");
+        PrintStatement(s.Els, indent);
+      }
+    }
+
+    void PrintWhileStatement(int indent, WhileStmt s, bool omitGuard, bool omitBody) {
+      Contract.Requires(0 <= indent);
+      PrintAttributes(s.Attributes, indent, () => {
+        wr.Write("while");
+      });
+      wr.Write(" ");
+      if (omitGuard) {
+        wr.Write("...");
+      } else {
+        PrintGuard(false, s.Guard);
+      }
+
+      PrintSpec("invariant", s.Invariants, indent + IndentAmount);
+      PrintDecreasesSpec(s.Decreases, indent + IndentAmount);
+      PrintFrameSpecLine("modifies", s.Mod, indent + IndentAmount);
+      if (omitBody) {
+        wr.WriteLine();
+        Indent(indent + IndentAmount);
+        wr.Write("...;");
+      } else if (s.Body != null) {
+        if (s.Invariants.Count == 0 && s.Decreases.Expressions.Count == 0 && (s.Mod.Expressions == null || s.Mod.Expressions.Count == 0)) {
+          wr.Write(" ");
+        } else {
+          wr.WriteLine();
+          Indent(indent);
+        }
+        PrintStatement(s.Body, indent);
+      }
+    }
+
+    void PrintAlternatives(int indent, List<GuardedAlternative> alternatives) {
+      var startWithLine = true;
+      foreach (var alternative in alternatives) {
+        if (startWithLine) {
+          wr.WriteLine();
+        } else {
+          startWithLine = true;
+        }
+        Indent(indent);
+        PrintAttributes(alternative.Attributes, indent, () => {
+          wr.Write("case");
+        });
+        wr.Write(" ");
+        if (alternative.IsBindingGuard) {
+          var exists = (ExistsExpr)alternative.Guard;
+          PrintBindingGuard(exists);
+        } else {
+          PrintExpression(alternative.Guard, false);
+        }
+        wr.Write(" =>");
+        foreach (Statement s in alternative.Body) {
+          wr.WriteLine();
+          Indent(indent + IndentAmount);
+          PrintStatement(s, indent + IndentAmount);
+        }
+      }
+    }
+
+    void PrintForLoopStatement(int indent, ForLoopStmt s) {
+      Contract.Requires(0 <= indent);
+      Contract.Requires(s != null);
+      PrintAttributes(s.Attributes, indent, () => {
+        wr.Write("for");
+      });
+      wr.Write($" {s.LoopIndex.Name}");
+      PrintType(": ", s.LoopIndex.Type);
+      wr.Write(" := ");
+      PrintExpression(s.Start, false);
+      wr.Write(s.GoingUp ? " to " : " downto ");
+      if (s.End == null) {
+        wr.Write("*");
+      } else {
+        PrintExpression(s.End, false);
+      }
+
+      PrintSpec("invariant", s.Invariants, indent + IndentAmount);
+      PrintDecreasesSpec(s.Decreases, indent + IndentAmount);
+      if (s.Mod.Expressions != null) {
+        PrintFrameSpecLine("modifies", s.Mod, indent + IndentAmount);
+      }
+      if (s.Body != null) {
+        if (s.Invariants.Count == 0 && s.Decreases.Expressions.Count == 0 && (s.Mod.Expressions == null || s.Mod.Expressions.Count == 0)) {
+          wr.Write(" ");
+        } else {
+          wr.WriteLine();
+          Indent(indent);
+        }
+        PrintStatement(s.Body, indent);
+      }
+    }
+
+    void PrintRhs(AssignmentRhs rhs) {
+      Contract.Requires(rhs != null);
+      if (rhs is ExprRhs) {
+        PrintExpression(((ExprRhs)rhs).Expr, true);
+      } else if (rhs is HavocRhs) {
+        wr.Write("*");
+      } else if (rhs is TypeRhs) {
+        TypeRhs t = (TypeRhs)rhs;
+        wr.Write("new ");
+        if (t.ArrayDimensions != null) {
+          if (ShowType(t.EType)) {
+            PrintType(t.EType);
+          }
+          if (options.DafnyPrintResolvedFile == null &&
+            t.InitDisplay != null && t.ArrayDimensions.Count == 1 &&
+            AutoGeneratedOrigin.Is(t.ArrayDimensions[0].Origin)) {
+            // elide the size
+            wr.Write("[]");
+          } else {
+            string s = "[";
+            foreach (Expression dim in t.ArrayDimensions) {
+              Contract.Assume(dim != null);
+              wr.Write(s);
+              PrintExpression(dim, false);
+              s = ", ";
+            }
+            wr.Write("]");
+          }
+          if (t.ElementInit != null) {
+            wr.Write(" (");
+            PrintExpression(t.ElementInit, false);
+            wr.Write(")");
+          } else if (t.InitDisplay != null) {
+            wr.Write(" [");
+            PrintExpressionList(t.InitDisplay, false);
+            wr.Write("]");
+          }
+        } else if (t.Bindings == null) {
+          PrintType(t.EType);
+        } else {
+          PrintType(t.Path);
+          wr.Write("(");
+          PrintBindings(t.Bindings, false);
+          wr.Write(")");
+        }
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected RHS
+      }
+
+      if (rhs.HasAttributes()) {
+        PrintAttributes(rhs.Attributes, AtAttributesOnSameLineIndent, () => { });
+      }
+    }
+
+    void PrintGuard(bool isBindingGuard, Expression guard) {
+      Contract.Requires(!isBindingGuard || (guard is ExistsExpr && ((ExistsExpr)guard).Range == null));
+      if (guard == null) {
+        wr.Write("*");
+      } else if (isBindingGuard) {
+        var exists = (ExistsExpr)guard;
+        PrintBindingGuard(exists);
+      } else {
+        PrintExpression(guard, false);
+      }
+    }
+
+    void PrintBindingGuard(ExistsExpr guard) {
+      Contract.Requires(guard != null);
+      Contract.Requires(guard.Range == null);
+      PrintQuantifierDomain(guard.BoundVars, guard.Attributes, null);
+      wr.Write(" :| ");
+      PrintExpression(guard.Term, false);
+    }
+
+    void PrintCalcOp(CalcStmt.CalcOp op) {
+      Contract.Requires(op != null);
+      wr.Write(op.ToString());
+      if (op is CalcStmt.TernaryCalcOp) {
+        wr.Write("[");
+        PrintExpression(((CalcStmt.TernaryCalcOp)op).Index, false);
+        wr.Write("]");
+      }
+    }
+  }
+}
diff --git a/Source/DafnyCore/AST/Grammar/Printer/Printer.cs b/Source/DafnyCore/AST/Grammar/Printer/Printer.cs
new file mode 100644
index 00000000000..5d61f3aebbf
--- /dev/null
+++ b/Source/DafnyCore/AST/Grammar/Printer/Printer.cs
@@ -0,0 +1,1261 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.Diagnostics.Contracts;
+using System.Numerics;
+using System.Linq;
+using DafnyCore;
+using JetBrains.Annotations;
+using Bpl = Microsoft.Boogie;
+
+namespace Microsoft.Dafny {
+
+  public enum PrintModes {
+    Everything,
+    Serialization, // Serializing the program to a file for lossless loading later
+    NoIncludes,
+    NoGhostOrIncludes
+  }
+
+  public record PrintFlags(bool UseOriginalDafnyNames = false);
+
+  public partial class Printer {
+    private DafnyOptions options;
+    private const int AtAttributesOnSameLineIndent = -1;
+    static Printer() {
+      DafnyOptions.RegisterLegacyBinding(PrintMode, (options, value) => {
+        options.PrintMode = value;
+      });
+
+      OptionRegistry.RegisterOption(PrintMode, OptionScope.Cli);
+    }
+
+    public static readonly Option<PrintModes> PrintMode = new("--print-mode", () => PrintModes.Everything, @"
+Everything - Print everything listed below.
+Serialization - print the source that will be included in a compiled dll.
+NoIncludes - disable printing of {:verify false} methods
+    incorporated via the include mechanism, as well as datatypes and
+    fields included from other files.
+NoGhost - disable printing of functions, ghost methods, and proof
+    statements in implementation methods. It also disables anything
+    NoIncludes disables.".TrimStart()) {
+      IsHidden = true
+    };
+
+    TextWriter wr;
+    PrintModes printMode;
+    bool afterResolver;
+    bool printingExportSet = false;
+    bool printingDesugared = false;
+    private readonly PrintFlags printFlags;
+
+    [ContractInvariantMethod]
+    void ObjectInvariant() {
+      Contract.Invariant(wr != null);
+    }
+
+    public Printer(TextWriter wr, DafnyOptions options, PrintModes printMode = PrintModes.Everything, [CanBeNull] PrintFlags printFlags = null) {
+      Contract.Requires(wr != null);
+      this.wr = wr;
+      this.options = options;
+      this.printMode = printMode;
+      this.printFlags = printFlags ?? new PrintFlags();
+    }
+
+    public static string ExprToString(DafnyOptions options, Expression expr, [CanBeNull] PrintFlags printFlags = null) {
+      Contract.Requires(expr != null);
+      using var wr = new StringWriter();
+      var pr = new Printer(wr, options, printFlags: printFlags);
+      pr.PrintExpression(expr, false);
+      return wr.ToString();
+    }
+
+    public static string ExprListToString(DafnyOptions options, List<Expression> expressions, [CanBeNull] PrintFlags printFlags = null) {
+      Contract.Requires(expressions != null);
+      using var wr = new StringWriter();
+      var pr = new Printer(wr, options, printFlags: printFlags);
+      pr.PrintExpressionList(expressions, false);
+      return wr.ToString();
+    }
+
+    public static string GuardToString(DafnyOptions options, bool isBindingGuard, Expression expr) {
+      Contract.Requires(!isBindingGuard || (expr is ExistsExpr && ((ExistsExpr)expr).Range == null));
+      using (var wr = new System.IO.StringWriter()) {
+        var pr = new Printer(wr, options);
+        pr.PrintGuard(isBindingGuard, expr);
+        return wr.ToString();
+      }
+    }
+
+    public static string ExtendedExprToString(DafnyOptions options, Expression expr) {
+      Contract.Requires(expr != null);
+      using (var wr = new System.IO.StringWriter()) {
+        var pr = new Printer(wr, options);
+        pr.PrintExtendedExpr(expr, 0, true, false);
+        return wr.ToString();
+      }
+    }
+
+    public static string FrameExprListToString(DafnyOptions options, List<FrameExpression> fexprs) {
+      Contract.Requires(fexprs != null);
+      using var wr = new StringWriter();
+      var pr = new Printer(wr, options);
+      pr.PrintFrameExpressionList(fexprs);
+      return wr.ToString();
+    }
+
+    public static string StatementToString(DafnyOptions options, Statement stmt) {
+      Contract.Requires(stmt != null);
+      using var wr = new StringWriter();
+      var pr = new Printer(wr, options);
+      pr.PrintStatement(stmt, 0);
+      return ToStringWithoutNewline(wr);
+    }
+
+    public static string IteratorClassToString(DafnyOptions options, IteratorDecl iter) {
+      Contract.Requires(iter != null);
+      using (var wr = new System.IO.StringWriter()) {
+        var pr = new Printer(wr, options);
+        pr.PrintIteratorClass(iter, 0, null);
+        return ToStringWithoutNewline(wr);
+      }
+    }
+
+    public static string IteratorSignatureToString(DafnyOptions options, IteratorDecl iter) {
+      Contract.Requires(iter != null);
+      using (var wr = new System.IO.StringWriter()) {
+        var pr = new Printer(wr, options);
+        pr.PrintIteratorSignature(iter, 0);
+        return ToStringWithoutNewline(wr);
+      }
+    }
+
+    public static string FieldToString(DafnyOptions options, Field field) {
+      Contract.Requires(field != null);
+      using (var wr = new StringWriter()) {
+        var pr = new Printer(wr, options);
+        pr.PrintField(field, 0);
+        return ToStringWithoutNewline(wr);
+      }
+    }
+
+    public static string FunctionSignatureToString(DafnyOptions options, Function f) {
+      Contract.Requires(f != null);
+      using var wr = new StringWriter();
+      var pr = new Printer(wr, options);
+      pr.PrintFunction(f, 0, true);
+      return ToStringWithoutNewline(wr);
+    }
+
+    public static string MethodSignatureToString(DafnyOptions options, Method m) {
+      Contract.Requires(m != null);
+      using (var wr = new System.IO.StringWriter()) {
+        var pr = new Printer(wr, options);
+        pr.PrintMethod(m, 0, true);
+        return ToStringWithoutNewline(wr);
+      }
+    }
+
+    /// <summary>
+    /// Returns a string for all attributes on the list "a".  Each attribute is
+    /// followed by a space.
+    /// </summary>
+    public static string AttributesToString(DafnyOptions options, Attributes a) {
+      if (a == null) {
+        return "";
+      } else {
+        return AttributesToString(options, a.Prev) + OneAttributeToString(options, a) + " ";
+      }
+    }
+
+    public static string OneAttributeToString(DafnyOptions options, Attributes a, string nameSubstitution = null) {
+      Contract.Requires(a != null);
+      using (var wr = new System.IO.StringWriter()) {
+        var pr = new Printer(wr, options);
+        pr.PrintOneAttribute(a, nameSubstitution);
+        return ToStringWithoutNewline(wr);
+      }
+    }
+
+    public static string ToStringWithoutNewline(System.IO.StringWriter wr) {
+      Contract.Requires(wr != null);
+      var sb = wr.GetStringBuilder();
+      var len = sb.Length;
+      while (len > 0 && (sb[len - 1] == '\n' || sb[len - 1] == '\r')) {
+        len--;
+      }
+      return sb.ToString(0, len);
+    }
+
+    public void PrintProgramLargeStack(Program prog, bool afterResolver) {
+#pragma warning disable VSTHRD002
+      DafnyMain.LargeStackFactory.StartNew(() => PrintProgram(prog, afterResolver)).Wait();
+#pragma warning restore VSTHRD002
+    }
+
+    public void PrintProgram(Program prog, bool afterResolver) {
+      Contract.Requires(prog != null);
+      this.afterResolver = afterResolver;
+      if (options.ShowEnv != Bpl.ExecutionEngineOptions.ShowEnvironment.Never) {
+        wr.WriteLine("// " + options.Version);
+        wr.WriteLine("// " + options.Environment);
+      }
+      if (options.PrintMode != PrintModes.Serialization) {
+        wr.WriteLine("// {0}", prog.Name);
+      }
+      if (options.DafnyPrintResolvedFile != null && options.PrintMode == PrintModes.Everything) {
+        wr.WriteLine();
+        wr.WriteLine("/*");
+        PrintModuleDefinition(prog.Compilation, prog.SystemModuleManager.SystemModule, null, 0, null);
+        wr.Write("// bitvector types in use:");
+        foreach (var w in prog.SystemModuleManager.Bitwidths) {
+          wr.Write(" bv{0}", w);
+        }
+        wr.WriteLine();
+        wr.WriteLine("*/");
+      }
+      wr.WriteLine();
+      PrintCallGraph(prog.DefaultModuleDef, 0);
+      PrintTopLevelDecls(prog.Compilation, prog.DefaultModuleDef.TopLevelDecls, 0, null);
+      foreach (var tup in prog.DefaultModuleDef.PrefixNamedModules) {
+        var decls = new List<TopLevelDecl>() { tup.Module };
+        PrintTopLevelDecls(prog.Compilation, decls, 0, tup.Parts);
+      }
+      wr.Flush();
+    }
+
+    public void PrintCallGraph(ModuleDefinition module, int indent) {
+      Contract.Requires(module != null);
+      Contract.Requires(0 <= indent);
+      if (options.DafnyPrintResolvedFile != null && options.PrintMode == PrintModes.Everything) {
+        // print call graph
+        Indent(indent); wr.WriteLine("/* CALL GRAPH for module {0}:", module.Name);
+        var SCCs = module.CallGraph.TopologicallySortedComponents();
+        // Sort output SCCs in order of: descending height, then decreasing size of SCC, then alphabetical order of the name of
+        // the representative element. By being this specific, we reduce changes in output from minor changes in the code. (With
+        // more effort, we could be even more deterministic, if needed in the future.)
+        SCCs.Sort((m, n) => {
+          var mm = module.CallGraph.GetSCCRepresentativePredecessorCount(m);
+          var nn = module.CallGraph.GetSCCRepresentativePredecessorCount(n);
+          if (mm < nn) {
+            return 1;
+          } else if (mm > nn) {
+            return -1;
+          }
+          mm = module.CallGraph.GetSCCSize(m);
+          nn = module.CallGraph.GetSCCSize(n);
+          if (mm < nn) {
+            return 1;
+          } else if (mm > nn) {
+            return -1;
+          }
+          return string.CompareOrdinal(m.NameRelativeToModule, n.NameRelativeToModule);
+        });
+        foreach (var callable in SCCs) {
+          Indent(indent);
+          wr.WriteLine(" * SCC at height {0}:", module.CallGraph.GetSCCRepresentativePredecessorCount(callable));
+          var r = module.CallGraph.GetSCC(callable);
+          foreach (var m in r) {
+            Indent(indent);
+            var maybeByMethod = m is Method method && method.IsByMethod ? " (by method)" : "";
+            wr.WriteLine($" *   {m.NameRelativeToModule}{maybeByMethod}");
+          }
+        }
+        Indent(indent); wr.WriteLine(" */");
+      }
+    }
+
+    public void PrintTopLevelDecls(CompilationData compilation, IEnumerable<TopLevelDecl> decls, int indent,
+      IEnumerable<IOrigin>/*?*/ prefixIds) {
+      Contract.Requires(decls != null);
+      int i = 0;
+      foreach (TopLevelDecl d in decls) {
+        Contract.Assert(d != null);
+        var project = compilation.Options.DafnyProject;
+        if (PrintModeSkipGeneral(project, d.Origin)) { continue; }
+        if (d is AbstractTypeDecl) {
+          var at = (AbstractTypeDecl)d;
+          if (i++ != 0) { wr.WriteLine(); }
+          Indent(indent);
+          PrintClassMethodHelper("type", at.Attributes, at.Name + TPCharacteristicsSuffix(at.Characteristics), d.TypeArgs);
+          PrintExtendsClause(at);
+          if (at.Members.Count == 0) {
+            wr.WriteLine();
+          } else {
+            wr.WriteLine(" {");
+            PrintMembers(at.Members, indent + IndentAmount, project);
+            Indent(indent);
+            wr.WriteLine("}");
+          }
+        } else if (d is NewtypeDecl) {
+          var dd = (NewtypeDecl)d;
+          if (i++ != 0) { wr.WriteLine(); }
+          Indent(indent);
+          PrintClassMethodHelper("newtype", dd.Attributes, dd.Name, dd.TypeArgs);
+          PrintExtendsClause(dd);
+          wr.Write(" = ");
+          if (dd.Var == null) {
+            PrintType(dd.BaseType);
+            wr.WriteLine();
+          } else {
+            wr.Write(dd.Var.DisplayName);
+            if (ShowType(dd.Var.Type)) {
+              wr.Write(": ");
+              PrintType(dd.BaseType);
+            }
+            wr.WriteLine();
+            Indent(indent + IndentAmount);
+            wr.Write("| ");
+            PrintExpression(dd.Constraint, true);
+            wr.WriteLine();
+          }
+          if (dd.WitnessKind != SubsetTypeDecl.WKind.CompiledZero) {
+            Indent(indent + IndentAmount);
+            PrintWitnessClause(dd);
+            wr.WriteLine();
+          }
+          if (dd.Members.Count != 0) {
+            Indent(indent);
+            wr.WriteLine("{");
+            PrintMembers(dd.Members, indent + IndentAmount, project);
+            Indent(indent);
+            wr.WriteLine("}");
+          }
+        } else if (d is SubsetTypeDecl subsetTypeDecl) {
+          if (i++ != 0) { wr.WriteLine(); }
+
+          PrintSubsetTypeDecl(subsetTypeDecl, indent);
+        } else if (d is TypeSynonymDecl) {
+          var dd = (TypeSynonymDecl)d;
+          if (i++ != 0) { wr.WriteLine(); }
+          Indent(indent);
+          PrintClassMethodHelper("type", dd.Attributes, dd.Name + TPCharacteristicsSuffix(dd.Characteristics), dd.TypeArgs);
+          wr.Write(" = ");
+          PrintType(dd.Rhs);
+          wr.WriteLine();
+        } else if (d is DatatypeDecl) {
+          var dd = (DatatypeDecl)d;
+          if (i++ != 0) { wr.WriteLine(); }
+          PrintDatatype(dd, indent, project);
+        } else if (d is IteratorDecl) {
+          var iter = (IteratorDecl)d;
+          if (i++ != 0) { wr.WriteLine(); }
+          PrintIteratorSignature(iter, indent);
+
+          if (iter.Body != null) {
+            Indent(indent);
+            PrintStatement(iter.Body, indent);
+            wr.WriteLine();
+          }
+
+          if (afterResolver) {
+            // also print the members that were created as part of the interpretation of the iterator
+            Contract.Assert(iter.Members.Count != 0);  // filled in during resolution
+            Indent(indent); wr.WriteLine("/*---------- iterator members ----------");
+            Indent(indent); PrintIteratorClass(iter, indent, project);
+            Indent(indent); wr.WriteLine("---------- iterator members ----------*/");
+          }
+
+        } else if (d is DefaultClassDecl defaultClassDecl) {
+          if (defaultClassDecl.Members.Count == 0) {
+            // print nothing
+          } else {
+            if (i++ != 0) { wr.WriteLine(); }
+            PrintMembers(defaultClassDecl.Members, indent, project);
+          }
+        } else if (d is ClassLikeDecl) {
+          var cl = (ClassLikeDecl)d;
+          if (i++ != 0) { wr.WriteLine(); }
+          PrintClass(cl, indent, project);
+
+        } else if (d is ClassLikeDecl) {
+          var cl = (ClassLikeDecl)d;
+          if (i++ != 0) { wr.WriteLine(); }
+          PrintClass(cl, indent, project);
+
+        } else if (d is ValuetypeDecl) {
+          var vtd = (ValuetypeDecl)d;
+          if (i++ != 0) { wr.WriteLine(); }
+          Indent(indent);
+          PrintClassMethodHelper("type", vtd.Attributes, vtd.Name, vtd.TypeArgs);
+          if (vtd.Members.Count == 0) {
+            wr.WriteLine(" { }");
+          } else {
+            wr.WriteLine(" {");
+            PrintMembers(vtd.Members, indent + IndentAmount, project);
+            Indent(indent);
+            wr.WriteLine("}");
+          }
+
+        } else if (d is ModuleDecl md) {
+          wr.WriteLine();
+          Indent(indent);
+          if (d is LiteralModuleDecl modDecl) {
+            if (printMode == PrintModes.Serialization && !modDecl.ModuleDef.ShouldCompile(compilation)) {
+              // This mode is used to losslessly serialize the source program by the C# and Library backends.
+              // Backends don't compile any code for modules not marked for compilation,
+              // so it's consistent to skip those modules here too. 
+              continue;
+            }
+
+            VisibilityScope scope = null;
+            if (modDecl.Signature != null) {
+              scope = modDecl.Signature.VisibilityScope;
+            }
+            PrintModuleDefinition(compilation, modDecl.ModuleDef, scope, indent, prefixIds);
+          } else if (d is AliasModuleDecl) {
+            var dd = (AliasModuleDecl)d;
+
+            wr.Write("import");
+            if (dd.Opened) {
+              wr.Write(" opened");
+            }
+            wr.Write(" {0}", dd.Name);
+            if (dd.Name != dd.TargetQId.ToString()) {
+              wr.Write(" = {0}", dd.TargetQId.ToString());
+            }
+            if (dd.Exports.Count == 1) {
+              wr.Write("`{0}", dd.Exports[0].val);
+            }
+            if (dd.Exports.Count > 1) {
+              wr.Write("`{{{0}}}", Util.Comma(dd.Exports, id => id.val));
+            }
+            wr.WriteLine();
+          } else if (d is AbstractModuleDecl) {
+            var dd = (AbstractModuleDecl)d;
+
+            wr.Write("import");
+            if (dd.Opened) {
+              wr.Write(" opened");
+            }
+            wr.Write(" {0} ", dd.Name);
+            wr.Write(": {0}", dd.QId.ToString());
+            if (dd.Exports.Count > 0) {
+              wr.Write("`{{{0}}}", Util.Comma(dd.Exports, id => id.val));
+            }
+            wr.WriteLine();
+
+          } else if (d is ModuleExportDecl) {
+            ModuleExportDecl e = (ModuleExportDecl)d;
+            if (!e.IsDefault) {
+              wr.Write("export {0}", e.Name);
+            } else {
+              wr.Write("export");
+            }
+
+            if (e.IsRefining) {
+              wr.Write(" ...");
+            }
+            if (e.Extends.Count > 0) {
+              wr.Write(" extends {0}", Util.Comma(e.Extends, id => id.val));
+            }
+
+            wr.WriteLine();
+            PrintModuleExportDecl(compilation, e, indent + IndentAmount, project);
+            wr.WriteLine();
+          } else {
+            Contract.Assert(false); // unexpected ModuleDecl
+          }
+        } else {
+          Contract.Assert(false); // unexpected TopLevelDecl
+        }
+      }
+    }
+
+    private void PrintSubsetTypeDecl(SubsetTypeDecl dd, int indent) {
+      Indent(indent);
+      PrintClassMethodHelper("type", dd.Attributes, dd.Name + TPCharacteristicsSuffix(dd.Characteristics), dd.TypeArgs);
+      wr.Write(" = ");
+      wr.Write(dd.Var.DisplayName);
+      if (ShowType(dd.Var.Type)) {
+        wr.Write(": ");
+        PrintType(dd.Rhs);
+      }
+
+      if (dd is NonNullTypeDecl) {
+        wr.Write(" ");
+      } else {
+        wr.WriteLine();
+        Indent(indent + IndentAmount);
+      }
+
+      wr.Write("| ");
+      PrintExpression(dd.Constraint, true);
+      if (dd.WitnessKind != SubsetTypeDecl.WKind.CompiledZero) {
+        if (dd is NonNullTypeDecl) {
+          wr.Write(" ");
+        } else {
+          wr.WriteLine();
+          Indent(indent + IndentAmount);
+        }
+
+        PrintWitnessClause(dd);
+      }
+
+      wr.WriteLine();
+    }
+
+    private void PrintWitnessClause(RedirectingTypeDecl dd) {
+      Contract.Requires(dd != null);
+      Contract.Requires(dd.WitnessKind != SubsetTypeDecl.WKind.CompiledZero);
+
+      switch (dd.WitnessKind) {
+        case SubsetTypeDecl.WKind.Ghost:
+          wr.Write("ghost ");
+          goto case SubsetTypeDecl.WKind.Compiled;
+        case SubsetTypeDecl.WKind.Compiled:
+          wr.Write("witness ");
+          PrintExpression(dd.Witness, true);
+          break;
+        case SubsetTypeDecl.WKind.OptOut:
+          wr.Write("witness *");
+          break;
+        case SubsetTypeDecl.WKind.Special:
+          wr.Write("/*special witness*/");
+          break;
+        case SubsetTypeDecl.WKind.CompiledZero:
+        default:
+          Contract.Assert(false);  // unexpected WKind
+          break;
+      }
+    }
+
+    void PrintModuleExportDecl(CompilationData compilation, ModuleExportDecl m, int indent, DafnyProject project) {
+      Contract.Requires(m != null);
+
+      if (m.RevealAll) {
+        Indent(indent);
+        wr.WriteLine("reveals *");
+      }
+      if (m.ProvideAll) {
+        Indent(indent);
+        wr.WriteLine("provides *");
+      }
+      var i = 0;
+      while (i < m.Exports.Count) {
+        var start = i;
+        var bodyKind = m.Exports[start].Opaque;
+        do {
+          i++;
+        } while (i < m.Exports.Count && m.Exports[i].Opaque == bodyKind);
+        // print [start..i)
+        Indent(indent);
+        wr.Write("{0} ", bodyKind ? "provides" : "reveals");
+        wr.WriteLine(Util.Comma(i - start, j => m.Exports[start + j].ToString()));
+
+        if (options.DafnyPrintResolvedFile != null) {
+          Contract.Assert(!printingExportSet);
+          printingExportSet = true;
+          Indent(indent);
+          wr.WriteLine("/*----- exported view:");
+          for (int j = start; j < i; j++) {
+            var id = m.Exports[j];
+            if (id.Decl is TopLevelDecl) {
+              PrintTopLevelDecls(compilation, new List<TopLevelDecl> { (TopLevelDecl)id.Decl }, indent + IndentAmount, null);
+            } else if (id.Decl is MemberDecl) {
+              PrintMembers(new List<MemberDecl> { (MemberDecl)id.Decl }, indent + IndentAmount, project);
+            }
+          }
+          Indent(indent);
+          wr.WriteLine("-----*/");
+          Contract.Assert(printingExportSet);
+          printingExportSet = false;
+        }
+      }
+    }
+
+    public void PrintModuleDefinition(CompilationData compilation, ModuleDefinition module, VisibilityScope scope, int indent, IEnumerable<IOrigin>/*?*/ prefixIds) {
+      Contract.Requires(module != null);
+      Contract.Requires(0 <= indent);
+      Type.PushScope(scope);
+      PrintAttributes(module.Attributes, indent, () => {
+        if (module.ModuleKind == ModuleKindEnum.Abstract) {
+          wr.Write("abstract ");
+        }
+        if (module.ModuleKind == ModuleKindEnum.Replaceable) {
+          wr.Write("replaceable ");
+        }
+        wr.Write("module");
+      });
+      wr.Write(" ");
+      if (prefixIds != null) {
+        foreach (var p in prefixIds) {
+          wr.Write("{0}.", p.val);
+        }
+      }
+      wr.Write("{0} ", module.Name);
+      if (module.Implements != null) {
+        var kindString = module.Implements.Kind switch {
+          ImplementationKind.Refinement => "refines",
+          ImplementationKind.Replacement => "replaces",
+          _ => throw new ArgumentOutOfRangeException()
+        };
+        wr.Write($"{kindString} {module.Implements.Target} ");
+      }
+      if (!module.TopLevelDecls.Any()) {
+        wr.WriteLine("{ }");
+      } else {
+        wr.WriteLine("{");
+        PrintCallGraph(module, indent + IndentAmount);
+        PrintTopLevelDeclsOrExportedView(compilation, module, indent);
+        Indent(indent);
+        wr.WriteLine("}");
+      }
+      Type.PopScope(scope);
+    }
+
+    void PrintTopLevelDeclsOrExportedView(CompilationData compilation, ModuleDefinition module, int indent) {
+      var decls = module.TopLevelDecls;
+      // only filter based on view name after resolver.
+      if (afterResolver && options.DafnyPrintExportedViews.Count != 0) {
+        var views = options.DafnyPrintExportedViews.ToHashSet();
+        decls = decls.Where(d => views.Contains(d.FullName));
+      }
+      PrintTopLevelDecls(compilation, decls, indent + IndentAmount, null);
+      foreach (var tup in module.PrefixNamedModules) {
+        PrintTopLevelDecls(compilation, new TopLevelDecl[] { tup.Module }, indent + IndentAmount, tup.Parts);
+      }
+    }
+
+    void PrintIteratorSignature(IteratorDecl iter, int indent) {
+      Indent(indent);
+      PrintClassMethodHelper("iterator", iter.Attributes, iter.Name, iter.TypeArgs);
+      if (iter.IsRefining) {
+        wr.Write(" ...");
+      } else {
+        PrintFormals(iter.Ins, iter);
+        if (iter.Outs.Count != 0) {
+          if (iter.Ins.Count + iter.Outs.Count <= 3) {
+            wr.Write(" yields ");
+          } else {
+            wr.WriteLine();
+            Indent(indent + 2 * IndentAmount);
+            wr.Write("yields ");
+          }
+          PrintFormals(iter.Outs, iter);
+        }
+      }
+
+      int ind = indent + IndentAmount;
+      PrintSpec("requires", iter.Requires, ind);
+      if (iter.Reads.Expressions != null) {
+        PrintFrameSpecLine("reads", iter.Reads, ind);
+      }
+      if (iter.Modifies.Expressions != null) {
+        PrintFrameSpecLine("modifies", iter.Modifies, ind);
+      }
+      PrintSpec("yield requires", iter.YieldRequires, ind);
+      PrintSpec("yield ensures", iter.YieldEnsures, ind);
+      PrintSpec("ensures", iter.Ensures, ind);
+      PrintDecreasesSpec(iter.Decreases, ind);
+      wr.WriteLine();
+    }
+
+    private void PrintIteratorClass(IteratorDecl iter, int indent, DafnyProject project) {
+      PrintClassMethodHelper("class", null, iter.Name, iter.TypeArgs);
+      wr.WriteLine(" {");
+      PrintMembers(iter.Members, indent + IndentAmount, project);
+      Indent(indent); wr.WriteLine("}");
+
+      Contract.Assert(iter.NonNullTypeDecl != null);
+      PrintSubsetTypeDecl(iter.NonNullTypeDecl, indent);
+    }
+
+    public void PrintClass(ClassLikeDecl c, int indent, DafnyProject project) {
+      Contract.Requires(c != null);
+
+      Indent(indent);
+      PrintClassMethodHelper(c is TraitDecl ? "trait" : "class", c.Attributes, c.Name, c.TypeArgs);
+      if (c.IsRefining) {
+        wr.Write(" ...");
+      } else {
+        PrintExtendsClause(c);
+      }
+
+      if (c.Members.Count == 0) {
+        wr.WriteLine(" { }");
+      } else {
+        wr.WriteLine(" {");
+        PrintMembers(c.Members, indent + IndentAmount, project);
+        Indent(indent);
+        wr.WriteLine("}");
+      }
+
+      if (options.DafnyPrintResolvedFile != null && c.NonNullTypeDecl != null) {
+        if (!printingExportSet) {
+          Indent(indent); wr.WriteLine("/*-- non-null type");
+        }
+        PrintSubsetTypeDecl(c.NonNullTypeDecl, indent);
+        if (!printingExportSet) {
+          Indent(indent); wr.WriteLine("*/");
+        }
+      }
+    }
+
+    private void PrintExtendsClause(TopLevelDeclWithMembers c) {
+      string sep = " extends ";
+      foreach (var trait in c.ParentTraits) {
+        wr.Write(sep);
+        PrintType(trait);
+        sep = ", ";
+      }
+    }
+
+    public void PrintMembers(List<MemberDecl> members, int indent, DafnyProject project) {
+      Contract.Requires(members != null);
+
+      int state = 0;  // 0 - no members yet; 1 - previous member was a field; 2 - previous member was non-field
+      foreach (MemberDecl m in members) {
+        if (PrintModeSkipGeneral(project, m.Origin)) { continue; }
+        if (printMode == PrintModes.Serialization && Attributes.Contains(m.Attributes, "auto_generated")) {
+          // omit this declaration
+        } else if (m is Method) {
+          if (state != 0) { wr.WriteLine(); }
+          PrintMethod((Method)m, indent, false);
+          var com = m as ExtremeLemma;
+          if (com != null && com.PrefixLemma != null) {
+            Indent(indent); wr.WriteLine("/***");
+            PrintMethod(com.PrefixLemma, indent, false);
+            Indent(indent); wr.WriteLine("***/");
+          }
+          state = 2;
+        } else if (m is Field) {
+          if (state == 2) { wr.WriteLine(); }
+          PrintField((Field)m, indent);
+          state = 1;
+        } else if (m is Function) {
+          if (state != 0) { wr.WriteLine(); }
+          PrintFunction((Function)m, indent, false);
+          if (m is ExtremePredicate fixp && fixp.PrefixPredicate != null) {
+            Indent(indent); wr.WriteLine("/*** (note, what is printed here does not show substitutions of calls to prefix predicates)");
+            PrintFunction(fixp.PrefixPredicate, indent, false);
+            Indent(indent); wr.WriteLine("***/");
+          }
+          state = 2;
+        } else {
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected member
+        }
+      }
+    }
+
+    /// <summary>
+    /// Prints no space before "kind", but does print a space before "attrs" and "name".
+    /// </summary>
+    void PrintClassMethodHelper(string kind, Attributes attrs, string name, List<TypeParameter> typeArgs) {
+      Contract.Requires(kind != null);
+      Contract.Requires(name != null);
+      Contract.Requires(typeArgs != null);
+
+      PrintAttributes(attrs, AtAttributesOnSameLineIndent, () => {
+        wr.Write(kind);
+      });
+
+      if (ArrowType.IsArrowTypeName(name)) {
+        PrintArrowType(ArrowType.ANY_ARROW, name, typeArgs);
+      } else if (ArrowType.IsPartialArrowTypeName(name)) {
+        PrintArrowType(ArrowType.PARTIAL_ARROW, name, typeArgs);
+      } else if (ArrowType.IsTotalArrowTypeName(name)) {
+        PrintArrowType(ArrowType.TOTAL_ARROW, name, typeArgs);
+      } else if (SystemModuleManager.IsTupleTypeName(name)) {
+        wr.Write(" /*{0}*/ ({1})", name, Util.Comma(typeArgs, TypeParamString));
+      } else {
+        wr.Write(" {0}", name);
+        PrintTypeParams(typeArgs);
+      }
+    }
+
+    private void PrintTypeParams(List<TypeParameter> typeArgs) {
+      Contract.Requires(typeArgs != null);
+      Contract.Requires(
+        typeArgs.All(tp => tp.IsAutoCompleted) ||
+        typeArgs.All(tp => !tp.IsAutoCompleted));
+
+      if (typeArgs.Count != 0 && !typeArgs[0].IsAutoCompleted) {
+        wr.Write("<{0}>", Util.Comma(typeArgs, TypeParamString));
+      }
+    }
+
+    public static string TypeParameterToString(TypeParameter tp) {
+      return TypeParamVariance(tp) + tp.Name + TPCharacteristicsSuffix(tp.Characteristics, true);
+    }
+
+    public string TypeParamString(TypeParameter tp) {
+      Contract.Requires(tp != null);
+      var paramString = TypeParamVariance(tp) + tp.Name + TPCharacteristicsSuffix(tp.Characteristics);
+      foreach (var typeBound in tp.TypeBounds) {
+        paramString += $" extends {typeBound.TypeName(options, null, true)}";
+      }
+      return paramString;
+    }
+
+    public static string TypeParamVariance(TypeParameter tp) {
+      switch (tp.VarianceSyntax) {
+        case TypeParameter.TPVarianceSyntax.Covariant_Permissive:
+          return "*";
+        case TypeParameter.TPVarianceSyntax.Covariant_Strict:
+          return "+";
+        case TypeParameter.TPVarianceSyntax.NonVariant_Permissive:
+          return "!";
+        case TypeParameter.TPVarianceSyntax.NonVariant_Strict:
+          return "";
+        case TypeParameter.TPVarianceSyntax.Contravariance:
+          return "-";
+        default:
+          Contract.Assert(false);  // unexpected VarianceSyntax
+          throw new cce.UnreachableException();
+      }
+    }
+
+    private void PrintArrowType(string arrow, string internalName, List<TypeParameter> typeArgs) {
+      Contract.Requires(arrow != null);
+      Contract.Requires(internalName != null);
+      Contract.Requires(typeArgs != null);
+      Contract.Requires(1 <= typeArgs.Count);  // argument list ends with the result type
+      wr.Write(" /*{0}*/ ", internalName);
+      int arity = typeArgs.Count - 1;
+      if (arity != 1) {
+        wr.Write("(");
+      }
+      wr.Write(Util.Comma(arity, i => TypeParamString(typeArgs[i])));
+      if (arity != 1) {
+        wr.Write(")");
+      }
+      wr.Write(" {0} {1}", arrow, TypeParamString(typeArgs[arity]));
+    }
+
+    private void PrintTypeInstantiation(List<Type> typeArgs) {
+      Contract.Requires(typeArgs == null || typeArgs.Count != 0);
+      wr.Write(Type.TypeArgsToString(options, typeArgs));
+    }
+
+    public void PrintDatatype(DatatypeDecl dt, int indent, DafnyProject dafnyProject) {
+      Contract.Requires(dt != null);
+      Indent(indent);
+      PrintClassMethodHelper(dt is IndDatatypeDecl ? "datatype" : "codatatype", dt.Attributes, dt.Name, dt.TypeArgs);
+      PrintExtendsClause(dt);
+      wr.Write(" =");
+      string sep = "";
+      foreach (DatatypeCtor ctor in dt.Ctors) {
+        wr.Write(sep);
+        PrintClassMethodHelper(ctor.IsGhost ? " ghost" : "", ctor.Attributes, ctor.Name, new List<TypeParameter>());
+        if (ctor.Formals.Count != 0) {
+          PrintFormals(ctor.Formals, null);
+        }
+        sep = " |";
+      }
+      if (dt.Members.Count == 0) {
+        wr.WriteLine();
+      } else {
+        wr.WriteLine(" {");
+        PrintMembers(dt.Members, indent + IndentAmount, dafnyProject);
+        Indent(indent);
+        wr.WriteLine("}");
+      }
+    }
+
+    /// <summary>
+    /// Prints a space before each attribute.
+    /// For @-Attributes, prints a newline and indent after each @-Attribute
+    /// Use an indent of -1 to put just a space after the @-Attribute
+    /// </summary>
+    public void PrintAttributes(Attributes a, bool atAttributes, int indent = -1) {
+      if (a != null) {
+        PrintAttributes(a.Prev, atAttributes, indent);
+        if (a is UserSuppliedAtAttribute usaa && atAttributes) {
+          PrintOneAtAttribute(usaa);
+          if (indent >= 0) {
+            wr.WriteLine();
+            Indent(indent);
+          } else {
+            wr.Write(" ");
+          }
+        } else if (!(a is UserSuppliedAtAttribute) && !atAttributes) {
+          wr.Write(" ");
+          PrintOneAttribute(a);
+        }
+      }
+    }
+
+    // @-Attributes are printed first, then the keywords typically, then the regular attributes
+    public void PrintAttributes(Attributes a, int indent, Action printBetween) {
+      PrintAttributes(a, true, indent);
+      printBetween();
+      PrintAttributes(a, false, indent);
+    }
+
+    public void PrintOneAtAttribute(UserSuppliedAtAttribute usaa) {
+      Contract.Requires(usaa != null);
+      wr.Write(UserSuppliedAtAttribute.AtName);
+      PrintExpression(usaa.Arg, false, -1);
+    }
+    public void PrintOneAttribute(Attributes a, string nameSubstitution = null) {
+      Contract.Requires(a != null);
+      var name = nameSubstitution ?? a.Name;
+      var usAttribute = name.StartsWith("_") || (options.DisallowExterns && name == "extern");
+      wr.Write("{1}{{:{0}", name, usAttribute ? "/*" : "");
+      if (a.Args != null) {
+        PrintAttributeArgs(a.Args, false);
+      }
+      wr.Write("}}{0}", usAttribute ? "*/" : "");
+
+    }
+
+    public void PrintAttributeArgs(List<Expression> args, bool isFollowedBySemicolon) {
+      Contract.Requires(args != null);
+      string prefix = " ";
+      foreach (var arg in args) {
+        Contract.Assert(arg != null);
+        wr.Write(prefix);
+        prefix = ", ";
+        PrintExpression(arg, isFollowedBySemicolon);
+      }
+    }
+
+    public void PrintField(Field field, int indent) {
+      Contract.Requires(field != null);
+      Indent(indent);
+
+      PrintAttributes(field.Attributes, indent, () => {
+        if (field.HasStaticKeyword) {
+          wr.Write("static ");
+        }
+        if (field.IsGhost) {
+          wr.Write("ghost ");
+        }
+        if (!field.IsMutable) {
+          wr.Write("const");
+        } else {
+          wr.Write("var");
+        }
+      });
+      wr.Write(" {0}", field.Name);
+      if (ShowType(field.Type)) {
+        wr.Write(": ");
+        PrintType(field.Type);
+      }
+      if (field is ConstantField) {
+        var c = (ConstantField)field;
+        if (c.Rhs != null) {
+          wr.Write(" := ");
+          PrintExpression(c.Rhs, true);
+        }
+      } else if (!field.IsUserMutable && field.IsMutable) {
+        wr.Write("  // non-assignable");
+      }
+      wr.WriteLine();
+    }
+
+    public void PrintFunction(Function f, int indent, bool printSignatureOnly) {
+      Contract.Requires(f != null);
+
+      if (PrintModeSkipFunctionOrMethod(f.IsGhost, f.Attributes, f.Name)) { return; }
+      Indent(indent);
+      PrintClassMethodHelper(f.GetFunctionDeclarationKeywords(options), f.Attributes, f.Name, f.TypeArgs);
+      if (f.SignatureIsOmitted) {
+        wr.Write(" ...");
+      } else {
+        if (f is ExtremePredicate) {
+          PrintKTypeIndication(((ExtremePredicate)f).TypeOfK);
+        }
+        PrintFormals(f.Ins, f, f.Name);
+        if (f.Result != null || (f is not Predicate && f is not ExtremePredicate && f is not TwoStatePredicate && f is not PrefixPredicate)) {
+          wr.Write(": ");
+          if (f.Result != null) {
+            wr.Write("(");
+            PrintFormal(f.Result, false);
+            wr.Write(")");
+          } else {
+            PrintType(f.ResultType);
+          }
+        }
+      }
+
+      int ind = indent + IndentAmount;
+      PrintSpec("requires", f.Req, ind);
+      PrintFrameSpecLine("reads", f.Reads, ind);
+      PrintSpec("ensures", f.Ens, ind);
+      PrintDecreasesSpec(f.Decreases, ind);
+      wr.WriteLine();
+      if (f.Body != null && !printSignatureOnly) {
+        Indent(indent);
+        wr.WriteLine("{");
+        PrintExtendedExpr(f.Body, ind, true, false);
+        Indent(indent);
+        wr.Write("}");
+        if (f.ByMethodBody != null) {
+          wr.Write(" by method ");
+          if (options.DafnyPrintResolvedFile != null && f.ByMethodDecl != null) {
+            Contract.Assert(f.ByMethodDecl.Ens.Count == 1);
+            wr.Write("/* ensures");
+            PrintAttributedExpression(f.ByMethodDecl.Ens[0]);
+            wr.Write(" */ ");
+          }
+          PrintStatement(f.ByMethodBody, indent);
+        }
+        wr.WriteLine();
+      }
+    }
+
+    // ----------------------------- PrintMethod -----------------------------
+
+    const int IndentAmount = 2; // The amount of indent for each new scope
+    void Indent(int amount) {
+      Contract.Requires(0 <= amount);
+      wr.Write(new String(' ', amount));
+    }
+
+    private bool PrintModeSkipFunctionOrMethod(bool IsGhost, Attributes attributes, string name) {
+      if (printMode == PrintModes.NoGhostOrIncludes && IsGhost) { return true; }
+      if (printMode == PrintModes.NoIncludes || printMode == PrintModes.NoGhostOrIncludes) {
+        bool verify = true;
+        if (Attributes.ContainsBool(attributes, "verify", ref verify) && !verify) { return true; }
+        if (name.Contains("INTERNAL") || name.StartsWith(HideRevealStmt.RevealLemmaPrefix)) { return true; }
+      }
+      return false;
+    }
+
+    private bool PrintModeSkipGeneral(DafnyProject project, IOrigin tok) {
+      return (printMode == PrintModes.NoIncludes || printMode == PrintModes.NoGhostOrIncludes)
+             && tok.Uri != null && !project.ContainsSourceFile(tok.Uri);
+    }
+
+    public void PrintMethod(Method method, int indent, bool printSignatureOnly) {
+      Contract.Requires(method != null);
+
+      if (PrintModeSkipFunctionOrMethod(method.IsGhost, method.Attributes, method.Name)) { return; }
+      Indent(indent);
+      string k = method is Constructor ? "constructor" :
+        method is LeastLemma ? "least lemma" :
+        method is GreatestLemma ? "greatest lemma" :
+        method is Lemma || method is PrefixLemma ? "lemma" :
+        method is TwoStateLemma ? "twostate lemma" :
+        "method";
+      if (method.HasStaticKeyword) { k = "static " + k; }
+      if (method.IsGhost && !method.IsLemmaLike) {
+        k = "ghost " + k;
+      }
+      string nm = method is Constructor && !((Constructor)method).HasName ? "" : method.Name;
+      PrintClassMethodHelper(k, method.Attributes, nm, method.TypeArgs);
+      if (method.SignatureIsOmitted) {
+        wr.Write(" ...");
+      } else {
+        if (method is ExtremeLemma) {
+          PrintKTypeIndication(((ExtremeLemma)method).TypeOfK);
+        }
+        PrintFormals(method.Ins, method, method.Name);
+        if (method.Outs.Count != 0) {
+          if (method.Ins.Count + method.Outs.Count <= 3) {
+            wr.Write(" returns ");
+          } else {
+            wr.WriteLine();
+            Indent(indent + 2 * IndentAmount);
+            wr.Write("returns ");
+          }
+          PrintFormals(method.Outs, method);
+        }
+      }
+
+      int ind = indent + IndentAmount;
+      PrintSpec("requires", method.Req, ind);
+      var readsExpressions = method.Reads.Expressions;
+      if (readsExpressions != null) {
+        var isDefault = readsExpressions.Count == 1 && readsExpressions[0].E is WildcardExpr;
+        if (!isDefault) {
+          PrintFrameSpecLine("reads", method.Reads, ind);
+        }
+      }
+      if (method.Mod.Expressions != null) {
+        PrintFrameSpecLine("modifies", method.Mod, ind);
+      }
+      PrintSpec("ensures", method.Ens, ind);
+      PrintDecreasesSpec(method.Decreases, ind);
+      wr.WriteLine();
+
+      if (method.Body != null && !printSignatureOnly) {
+        Indent(indent);
+        PrintStatement(method.Body, indent);
+        wr.WriteLine();
+      }
+    }
+
+    void PrintKTypeIndication(ExtremePredicate.KType kType) {
+      switch (kType) {
+        case ExtremePredicate.KType.Nat:
+          wr.Write("[nat]");
+          break;
+        case ExtremePredicate.KType.ORDINAL:
+          wr.Write("[ORDINAL]");
+          break;
+        case ExtremePredicate.KType.Unspecified:
+          break;
+        default:
+          Contract.Assume(false);  // unexpected KType value
+          break;
+      }
+    }
+
+    internal void PrintFormals(List<Formal> ff, ICallable/*?*/ context, string name = null) {
+      Contract.Requires(ff != null);
+      if (name != null && name.EndsWith("#")) {
+        wr.Write("[");
+        PrintFormal(ff[0], false);
+        wr.Write("]");
+        ff = new List<Formal>(ff.Skip(1));
+      }
+      wr.Write("(");
+      string sep = "";
+      foreach (Formal f in ff) {
+        Contract.Assert(f != null);
+        wr.Write(sep);
+        sep = ", ";
+        PrintFormal(f, (context is TwoStateLemma || context is TwoStateFunction) && f.InParam);
+      }
+      wr.Write(")");
+    }
+
+    void PrintFormal(Formal f, bool showNewKeyword) {
+      Contract.Requires(f != null);
+      if (showNewKeyword && !f.IsOld) {
+        wr.Write("new ");
+      }
+      if (f.IsOlder) {
+        Contract.Assert(f.HasName);
+        wr.Write("older ");
+      }
+      if (f.IsGhost) {
+        wr.Write("ghost ");
+      }
+      if (f.IsNameOnly) {
+        Contract.Assert(f.HasName);
+        wr.Write("nameonly ");
+      }
+      if (f.HasName) {
+        wr.Write("{0}: ", f.DisplayName);
+      }
+      PrintType(f.Type);
+      if (f.DefaultValue != null) {
+        wr.Write(" := ");
+        PrintExpression(f.DefaultValue, false);
+      }
+    }
+
+    internal void PrintDecreasesSpec(Specification<Expression> decs, int indent) {
+      Contract.Requires(decs != null);
+      if (printMode == PrintModes.NoGhostOrIncludes) {
+        return;
+      }
+      if (decs.Expressions != null && decs.Expressions.Count != 0) {
+        wr.WriteLine();
+        Indent(indent);
+        PrintAttributes(decs.Attributes, indent, () => {
+          wr.Write("decreases");
+        });
+        wr.Write(" ");
+        PrintExpressionList(decs.Expressions, true);
+      }
+    }
+
+    internal void PrintFrameSpecLine(string kind, Specification<FrameExpression> ee, int indent) {
+      Contract.Requires(kind != null);
+      Contract.Requires(ee != null);
+      if (ee != null && ee.Expressions != null && ee.Expressions.Count != 0) {
+        wr.WriteLine();
+        Indent(indent);
+        PrintAttributes(ee.Attributes, indent, () => {
+          wr.Write("{0}", kind);
+        });
+        wr.Write(" ");
+        PrintFrameExpressionList(ee.Expressions);
+      }
+    }
+
+    internal void PrintSpec(string kind, List<AttributedExpression> ee, int indent) {
+      Contract.Requires(kind != null);
+      Contract.Requires(ee != null);
+      if (printMode == PrintModes.NoGhostOrIncludes) { return; }
+      foreach (AttributedExpression e in ee) {
+        Contract.Assert(e != null);
+        wr.WriteLine();
+        Indent(indent);
+        wr.Write("{0}", kind);
+        PrintAttributedExpression(e);
+      }
+    }
+
+    void PrintAttributedExpression(AttributedExpression e) {
+      Contract.Requires(e != null);
+
+      if (e.HasAttributes()) {
+        PrintAttributes(e.Attributes, AtAttributesOnSameLineIndent, () => {
+        });
+      }
+
+      wr.Write(" ");
+      if (e.Label != null) {
+        wr.Write("{0}: ", e.Label.Name);
+      }
+      PrintExpression(e.E, true);
+    }
+
+    // ----------------------------- PrintType -----------------------------
+
+    public void PrintType(Type ty) {
+      Contract.Requires(ty != null);
+      wr.Write(ty.TypeName(options, null, true));
+    }
+
+    public void PrintType(string prefix, Type ty) {
+      Contract.Requires(prefix != null);
+      Contract.Requires(ty != null);
+      if (options.DafnyPrintResolvedFile != null) {
+        ty = TypeRefinementWrapper.NormalizeSansRefinementWrappers(ty);
+      }
+      string s = ty.TypeName(options, null, true);
+      if (ty is TypeRefinementWrapper or not TypeProxy && !s.StartsWith("_")) {
+        wr.Write("{0}{1}", prefix, s);
+      }
+    }
+
+    public string TPCharacteristicsSuffix(TypeParameter.TypeParameterCharacteristics characteristics) {
+      return TPCharacteristicsSuffix(characteristics, options.DafnyPrintResolvedFile != null);
+    }
+
+    public static string TPCharacteristicsSuffix(TypeParameter.TypeParameterCharacteristics characteristics, bool printInferredTypeCharacteristics) {
+      string s = null;
+      if (characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Required ||
+          (characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.InferredRequired && printInferredTypeCharacteristics)) {
+        s = "==";
+      }
+      if (characteristics.HasCompiledValue) {
+        var prefix = s == null ? "" : s + ",";
+        s = prefix + "0";
+      } else if (characteristics.IsNonempty) {
+        var prefix = s == null ? "" : s + ",";
+        s = prefix + "00";
+      }
+      if (characteristics.ContainsNoReferenceTypes) {
+        var prefix = s == null ? "" : s + ",";
+        s = prefix + "!new";
+      }
+      if (s == null) {
+        return "";
+      } else {
+        return "(" + s + ")";
+      }
+    }
+
+    bool ShowType(Type t) {
+      Contract.Requires(t != null);
+      return !(t is TypeProxy) || options.DafnyPrintResolvedFile != null;
+    }
+  }
+}
diff --git a/Source/DafnyCore/AST/Grammar/ProgramParser.cs b/Source/DafnyCore/AST/Grammar/ProgramParser.cs
index 4c9b394a017..4a011f9669f 100644
--- a/Source/DafnyCore/AST/Grammar/ProgramParser.cs
+++ b/Source/DafnyCore/AST/Grammar/ProgramParser.cs
@@ -1,18 +1,22 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using Microsoft.CodeAnalysis;
+using System.Threading.Tasks;
+using Microsoft.Dafny.Compilers;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using static Microsoft.Dafny.ParseErrors;
 
 namespace Microsoft.Dafny;
 
-public record DfyParseResult(
+public record DfyParseFileResult(
+  int? Version,
+  Uri Uri,
   BatchErrorReporter ErrorReporter,
   FileModuleDefinition Module,
   IReadOnlyList<Action<SystemModuleManager>> ModifyBuiltins
@@ -30,63 +34,47 @@ public ProgramParser(ILogger<ProgramParser> logger, IFileSystem fileSystem) {
     this.fileSystem = fileSystem;
   }
 
-  public virtual Program ParseFiles(string programName, IReadOnlyList<DafnyFile> files,
+  public virtual async Task<ProgramParseResult> ParseFiles(string programName, IReadOnlyList<DafnyFile> files,
     ErrorReporter errorReporter,
     CancellationToken cancellationToken) {
     var options = errorReporter.Options;
     var builtIns = new SystemModuleManager(options);
-    var defaultModule = new DefaultModuleDefinition(files.Where(f => !f.IsPreverified).Select(f => f.Uri).ToList());
+    var defaultModule = new DefaultModuleDefinition();
 
-    var verifiedRoots = files.Where(df => df.IsPreverified).Select(df => df.Uri).ToHashSet();
-    var compiledRoots = files.Where(df => df.IsPrecompiled).Select(df => df.Uri).ToHashSet();
-    var compilation = new CompilationData(errorReporter, defaultModule.Includes, defaultModule.RootSourceUris, verifiedRoots,
+    var rootSourceUris = files.Select(f => f.Uri).ToList();
+    var verifiedRoots = files.Where(df => df.ShouldNotVerify).Select(df => df.Uri).ToHashSet();
+    var compiledRoots = files.Where(df => df.ShouldNotCompile).Select(df => df.Uri).ToHashSet();
+    var compilation = new CompilationData(errorReporter, defaultModule.Includes, rootSourceUris, verifiedRoots,
       compiledRoots);
     var program = new Program(
       programName,
-      new LiteralModuleDecl(defaultModule, null, Guid.NewGuid()),
+      new LiteralModuleDecl(options, defaultModule, null, Guid.NewGuid()),
       builtIns,
       errorReporter, compilation
     );
+    var versionedFiles = new Dictionary<Uri, int>();
 
     foreach (var dafnyFile in files) {
+      cancellationToken.ThrowIfCancellationRequested();
       if (options.Trace) {
-        options.OutputWriter.WriteLine("Parsing " + dafnyFile.FilePath);
+        await options.OutputWriter.WriteLineAsync("Parsing " + dafnyFile.FilePath);
       }
 
       if (options.XmlSink is { IsOpen: true } && dafnyFile.Uri.IsFile) {
         options.XmlSink.WriteFileFragment(dafnyFile.Uri.LocalPath);
       }
 
-      try {
-        var parseResult = ParseFile(
-          options,
-          dafnyFile.Content,
-          dafnyFile.Uri
-        );
-        if (parseResult.ErrorReporter.ErrorCount != 0) {
-          logger.LogDebug($"encountered {parseResult.ErrorReporter.ErrorCount} errors while parsing {dafnyFile.Uri}");
-        }
-
-        AddParseResultToProgram(parseResult, program);
-        if (defaultModule.RangeToken.StartToken.Uri == null) {
-          defaultModule.RangeToken = parseResult.Module.RangeToken;
-        }
-
-      } catch (Exception e) {
-        logger.LogDebug(e, $"encountered an exception while parsing {dafnyFile.Uri}");
-        var internalErrorDummyToken = new Token {
-          Uri = dafnyFile.Uri,
-          line = 1,
-          col = 1,
-          pos = 0,
-          val = string.Empty
-        };
-        errorReporter.Error(MessageSource.Parser, internalErrorDummyToken,
-          "[internal error] Parser exception: " + e.Message);
-      }
-      finally {
-        dafnyFile.Content.Close();
+      var parseResult = ParseFileWithErrorHandling(
+        dafnyFile.FileOptions,
+        dafnyFile.GetContent,
+        dafnyFile.Origin,
+        dafnyFile.Uri,
+        cancellationToken);
+      if (parseResult.ErrorReporter.HasErrors) {
+        logger.LogDebug($"encountered {parseResult.ErrorReporter.ErrorCount} errors while parsing {dafnyFile.Uri}");
       }
+
+      AddParseResultToProgram(parseResult, program, versionedFiles);
     }
 
     if (!(options.DisallowIncludes || options.PrintIncludesMode == DafnyOptions.IncludesModes.Immediate)) {
@@ -94,7 +82,7 @@ public virtual Program ParseFiles(string programName, IReadOnlyList<DafnyFile> f
         builtIns, errorReporter, cancellationToken);
 
       foreach (var module in includedModules) {
-        AddParseResultToProgram(module, program);
+        AddParseResultToProgram(module, program, versionedFiles);
       }
     }
 
@@ -104,13 +92,57 @@ public virtual Program ParseFiles(string programName, IReadOnlyList<DafnyFile> f
       dependencyMap.PrintMap(options);
     }
 
-    if (errorReporter.ErrorCount == 0) {
+    if (!errorReporter.HasErrors) {
       DafnyMain.MaybePrintProgram(program, options.DafnyPrintFile, false);
+
+      // Capture the original program text before resolution
+      // if we're building a .doo file.
+      // See comment on LibraryBackend.DooFile.
+      if (program.Options.Backend is LibraryBackend libBackend) {
+        program.AfterParsingClone = new Program(new Cloner(true), program);
+      }
     }
 
     ShowWarningsForIncludeCycles(program);
 
-    return program;
+    return new ProgramParseResult(program, versionedFiles);
+  }
+
+  private DfyParseFileResult ParseFileWithErrorHandling(DafnyOptions options,
+    Func<FileSnapshot> getSnapShot,
+    IOrigin origin,
+    Uri uri,
+    CancellationToken cancellationToken) {
+    var fileSnapshot = getSnapShot();
+    try {
+      return ParseFile(options, fileSnapshot, uri, cancellationToken);
+    } catch (IOException e) {
+      if (origin == null) {
+        throw;
+      }
+
+      var reporter = new BatchErrorReporter(options);
+      reporter.Error(MessageSource.Parser, origin,
+        $"Unable to open the file {uri} because {e.Message}.");
+      return new DfyParseFileResult(fileSnapshot.Version, uri, reporter, new FileModuleDefinition(Token.NoToken),
+        new Action<SystemModuleManager>[] { });
+    } catch (OperationCanceledException) {
+      throw;
+    } catch (Exception e) {
+      var internalErrorDummyToken = new Token {
+        Uri = uri,
+        line = 1,
+        col = 1,
+        pos = 0,
+        val = string.Empty
+      };
+
+      var reporter = new BatchErrorReporter(options);
+      reporter.Error(MessageSource.Parser, ErrorId.p_internal_exception, internalErrorDummyToken,
+        "[internal error] Parser exception: " + e.Message + "\n" + e.StackTrace);
+      return new DfyParseFileResult(fileSnapshot.Version, uri, reporter, new FileModuleDefinition(Token.NoToken),
+        new Action<SystemModuleManager>[] { });
+    }
   }
 
   private void ShowWarningsForIncludeCycles(Program program) {
@@ -124,56 +156,66 @@ private void ShowWarningsForIncludeCycles(Program program) {
     var sortedSccRoots = graph.TopologicallySortedComponents();
     var includeCycles = sortedSccRoots.Select(graph.GetSCC).Where(scc => scc.Count > 1);
     foreach (var cycle in includeCycles) {
-      program.Reporter.Info(MessageSource.Parser, program.GetFirstTopLevelToken(),
+      program.Reporter.Info(MessageSource.Parser, program.GetStartOfFirstFileToken(),
         $"Program contains a cycle of includes, consisting of:\n{string.Join("\n", cycle.Select(c => c.LocalPath))}");
     }
   }
 
-  private static void AddParseResultToProgram(DfyParseResult parseResult, Program program) {
+  private static void AddParseResultToProgram(DfyParseFileResult parseFileResult, Program program,
+    Dictionary<Uri, int> versionedFiles) {
+    if (parseFileResult.Version != null) {
+      versionedFiles.Add(parseFileResult.Uri, parseFileResult.Version.Value);
+    }
+
     var defaultModule = program.DefaultModuleDef;
-    var fileModule = parseResult.Module;
+    var fileModule = parseFileResult.Module;
     program.Files.Add(fileModule);
 
-    foreach (var modify in parseResult.ModifyBuiltins) {
+    foreach (var modify in parseFileResult.ModifyBuiltins) {
       modify(program.SystemModuleManager);
     }
 
-    foreach (var diagnostic in parseResult.ErrorReporter.AllMessages) {
-      program.Reporter.Message(diagnostic.Source, diagnostic.Level, diagnostic.ErrorId, diagnostic.Token,
-        diagnostic.Message);
+    parseFileResult.ErrorReporter.CopyDiagnostics(program.Reporter);
+
+    ModuleDefinition sourceModule = fileModule;
+    ModuleDefinition targetModule = defaultModule;
+
+    MoveModuleContents(sourceModule, targetModule);
+
+    foreach (var include in fileModule.Includes) {
+      defaultModule.Includes.Add(include);
+    }
+
+    foreach (var prefixNamedModule in fileModule.PrefixNamedModules) {
+      defaultModule.PrefixNamedModules.Add(prefixNamedModule);
     }
 
-    foreach (var declToMove in fileModule.TopLevelDecls) {
-      declToMove.EnclosingModuleDefinition = defaultModule;
+    defaultModule.DefaultClass.SetMembersBeforeResolution();
+  }
+
+  public static void MoveModuleContents(ModuleDefinition sourceModule, ModuleDefinition targetModule) {
+    foreach (var declToMove in sourceModule.DefaultClasses.Concat(sourceModule.SourceDecls)) {
+      declToMove.EnclosingModuleDefinition = targetModule;
       if (declToMove is LiteralModuleDecl literalModuleDecl) {
-        literalModuleDecl.ModuleDef.EnclosingModule = defaultModule;
+        literalModuleDecl.ModuleDef.EnclosingModule = targetModule;
       }
 
       if (declToMove is ClassLikeDecl { NonNullTypeDecl: { } nonNullTypeDecl }) {
-        nonNullTypeDecl.EnclosingModuleDefinition = defaultModule;
+        nonNullTypeDecl.EnclosingModuleDefinition = targetModule;
       }
+
       if (declToMove is DefaultClassDecl defaultClassDecl) {
         foreach (var member in defaultClassDecl.Members) {
-          defaultModule.DefaultClass.Members.Add(member);
-          member.EnclosingClass = defaultModule.DefaultClass;
+          targetModule.DefaultClass.Members.Add(member);
+          member.EnclosingClass = targetModule.DefaultClass;
         }
       } else {
-        defaultModule.SourceDecls.Add(declToMove);
+        targetModule.SourceDecls.Add(declToMove);
       }
     }
-
-    foreach (var include in fileModule.Includes) {
-      defaultModule.Includes.Add(include);
-    }
-
-    foreach (var prefixNamedModule in fileModule.PrefixNamedModules) {
-      defaultModule.PrefixNamedModules.Add(prefixNamedModule);
-    }
-
-    defaultModule.DefaultClass.SetMembersBeforeResolution();
   }
 
-  public IList<DfyParseResult> TryParseIncludes(
+  public IList<DfyParseFileResult> TryParseIncludes(
     IReadOnlyList<DafnyFile> files,
     IEnumerable<Include> roots,
     SystemModuleManager systemModuleManager,
@@ -181,14 +223,14 @@ public IList<DfyParseResult> TryParseIncludes(
     CancellationToken cancellationToken
   ) {
     var stack = new Stack<DafnyFile>();
-    var result = new List<DfyParseResult>();
+    var result = new List<DfyParseFileResult>();
     var resolvedFiles = new HashSet<Uri>();
     foreach (var rootFile in files) {
       resolvedFiles.Add(rootFile.Uri);
     }
 
     foreach (var root in roots) {
-      var dafnyFile = IncludeToDafnyFile(systemModuleManager, errorReporter, root);
+      var dafnyFile = IncludeToDafnyFile(errorReporter, root);
       if (dafnyFile != null) {
         stack.Push(dafnyFile);
       }
@@ -201,44 +243,27 @@ CancellationToken cancellationToken
       }
 
       cancellationToken.ThrowIfCancellationRequested();
-      try {
-        var parseIncludeResult = ParseFile(
-          errorReporter.Options,
-          top.Content,
-          top.Uri
-        );
-        result.Add(parseIncludeResult);
-
-        foreach (var include in parseIncludeResult.Module.Includes) {
-          var dafnyFile = IncludeToDafnyFile(systemModuleManager, errorReporter, include);
-          if (dafnyFile != null) {
-            stack.Push(dafnyFile);
-          }
+      var parseIncludeResult = ParseFileWithErrorHandling(
+        top.FileOptions,
+        top.GetContent,
+        top.Origin,
+        top.Uri,
+        cancellationToken);
+      result.Add(parseIncludeResult);
+
+      foreach (var include in parseIncludeResult.Module.Includes) {
+        var dafnyFile = IncludeToDafnyFile(errorReporter, include);
+        if (dafnyFile != null) {
+          stack.Push(dafnyFile);
         }
-      } catch (Exception) {
-        // ignored
-      }
-      finally {
-        top.Content.Close();
       }
     }
 
     return result;
   }
 
-  private DafnyFile IncludeToDafnyFile(SystemModuleManager systemModuleManager, ErrorReporter errorReporter, Include include) {
-    try {
-      return new DafnyFile(systemModuleManager.Options, include.IncludedFilename,
-        fileSystem.ReadFile(include.IncludedFilename));
-    } catch (IOException e) {
-      errorReporter.Error(MessageSource.Parser, include.tok,
-        $"Unable to open the include {include.IncludedFilename} because {e.Message}.");
-      return null;
-    } catch (IllegalDafnyFile) {
-      errorReporter.Error(MessageSource.Parser, include.tok,
-        $"Unable to open the include {include.IncludedFilename}.");
-      return null;
-    }
+  private DafnyFile IncludeToDafnyFile(ErrorReporter errorReporter, Include include) {
+    return DafnyFile.HandleDafnyFile(fileSystem, errorReporter, include.ParseOptions, include.IncludedFilename, include.PathOrigin, false);
   }
 
   ///<summary>
@@ -247,25 +272,12 @@ private DafnyFile IncludeToDafnyFile(SystemModuleManager systemModuleManager, Er
   /// Returns the number of parsing errors encountered.
   /// Note: first initialize the Scanner.
   ///</summary>
-  protected virtual DfyParseResult ParseFile(DafnyOptions options, TextReader reader, Uri uri) /* throws System.IO.IOException */ {
+  protected virtual DfyParseFileResult ParseFile(DafnyOptions options, FileSnapshot fileSnapshot,
+    Uri uri, CancellationToken cancellationToken) /* throws System.IO.IOException */ {
     Contract.Requires(uri != null);
+    using var reader = fileSnapshot.Reader;
     var text = SourcePreprocessor.ProcessDirectives(reader, new List<string>());
-    try {
-      return ParseFile(options, text, uri);
-    } catch (Exception e) {
-      var internalErrorDummyToken = new Token {
-        Uri = uri,
-        line = 1,
-        col = 1,
-        pos = 0,
-        val = string.Empty
-      };
-      var reporter = new BatchErrorReporter(options);
-      reporter.Error(MessageSource.Parser, ErrorId.p_internal_exception, internalErrorDummyToken,
-        "[internal error] Parser exception: " + e.Message + (!options.Verbose ? "" :
-            "\n" + e.StackTrace));
-      return new DfyParseResult(reporter, null, new Action<SystemModuleManager>[] { });
-    }
+    return ParseFile(options, fileSnapshot.Version, text, uri, cancellationToken);
   }
 
   ///<summary>
@@ -274,20 +286,16 @@ protected virtual DfyParseResult ParseFile(DafnyOptions options, TextReader read
   /// Returns the number of parsing errors encountered.
   /// Note: first initialize the Scanner with the given Errors sink.
   ///</summary>
-  private static DfyParseResult ParseFile(DafnyOptions options, string /*!*/ s, Uri /*!*/ uri) {
+  private static DfyParseFileResult ParseFile(DafnyOptions options, int? version, string /*!*/ content, Uri /*!*/ uri, CancellationToken cancellationToken) {
     var batchErrorReporter = new BatchErrorReporter(options);
-    Parser parser = SetupParser(s, uri, batchErrorReporter);
+    Parser parser = SetupParser(content, uri, batchErrorReporter, cancellationToken);
     parser.Parse();
 
-    if (parser.theModule.DefaultClass.Members.Count == 0 && parser.theModule.Includes.Count == 0 && !parser.theModule.SourceDecls.Any()
-        && (parser.theModule.PrefixNamedModules == null || parser.theModule.PrefixNamedModules.Count == 0)) {
-      batchErrorReporter.Warning(MessageSource.Parser, ErrorId.p_file_has_no_code, new Token(1, 1) { Uri = uri }, "File contains no code");
-    }
-
-    return new DfyParseResult(batchErrorReporter, parser.theModule, parser.SystemModuleModifiers);
+    return new DfyParseFileResult(version, uri, batchErrorReporter, parser.theModule, parser.SystemModuleModifiers);
   }
 
-  private static Parser SetupParser(string /*!*/ s, Uri /*!*/ uri, ErrorReporter /*!*/ errorReporter) {
+  private static Parser SetupParser(string s /*!*/, Uri uri /*!*/,
+    ErrorReporter errorReporter /*!*/, CancellationToken cancellationToken) {
     Contract.Requires(s != null);
     Contract.Requires(uri != null);
     System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(ParseErrors).TypeHandle);
@@ -301,11 +309,13 @@ private static Parser SetupParser(string /*!*/ s, Uri /*!*/ uri, ErrorReporter /
     var errors = new Errors(errorReporter);
 
     var scanner = new Scanner(ms, errors, uri, firstToken: firstToken);
-    return new Parser(errorReporter.Options, scanner, errors);
+    return new Parser(errorReporter.Options, scanner, errors, cancellationToken);
   }
 
-  public Program Parse(string source, Uri uri, ErrorReporter reporter) {
-    var files = new[] { new DafnyFile(reporter.Options, uri, new StringReader(source)) };
-    return ParseFiles(uri.ToString(), files, reporter, CancellationToken.None);
+  public async Task<ProgramParseResult> Parse(string source, Uri uri, ErrorReporter reporter) {
+    var fs = new InMemoryFileSystem(ImmutableDictionary<Uri, string>.Empty.Add(uri, source));
+    var file = DafnyFile.HandleDafnyFile(fs, reporter, reporter.Options, uri, Token.NoToken, false);
+    var files = new[] { file };
+    return await ParseFiles(uri.ToString(), files, reporter, CancellationToken.None);
   }
 }
diff --git a/Source/DafnyCore/AST/Grammar/TokenNewIndentCollector.cs b/Source/DafnyCore/AST/Grammar/TokenNewIndentCollector.cs
index ca0597ec551..6242c26fc63 100644
--- a/Source/DafnyCore/AST/Grammar/TokenNewIndentCollector.cs
+++ b/Source/DafnyCore/AST/Grammar/TokenNewIndentCollector.cs
@@ -83,8 +83,9 @@ private Indentations PosToIndentations(int pos) {
   public int binOpIndent = -1;
   public int binOpArgIndent = -1;
 
-  internal TokenNewIndentCollector(Program program) {
+  internal TokenNewIndentCollector(Program program, Uri fileToFormat) {
     this.program = program;
+    this.fileToFormat = fileToFormat;
     preResolve = true;
   }
 
@@ -121,7 +122,7 @@ protected override bool VisitOneStmt(Statement stmt, ref int unusedIndent) {
     }
 
     // Best heuristic for new elements is to indent them using the method's formatting
-    SetMethodLikeIndent(stmt.Tok, stmt.OwnedTokens, indentBefore);
+    SetMethodLikeIndent(stmt.Origin, stmt.OwnedTokens, indentBefore);
     SetIndentations(stmt.EndToken, -1, -1, indentBefore);
 
     return true;
@@ -129,7 +130,7 @@ protected override bool VisitOneStmt(Statement stmt, ref int unusedIndent) {
 
   /// If the first token on the line of the given token satisfies the given predicate.
   /// Used to detect commented cases or datatype constructors
-  public static bool FirstTokenOnLineIs(IToken token, Func<IToken, bool> predicate) {
+  public static bool FirstTokenOnLineIs(Token token, Func<Token, bool> predicate) {
     if (token.Prev == null || token.Prev.line != token.line) {
       return predicate(token);
     }
@@ -140,7 +141,7 @@ public static bool FirstTokenOnLineIs(IToken token, Func<IToken, bool> predicate
   // Given a token, finds the indentation that was expected before it.
   // Used for frame expressions to initially copy the indentation of "reads", "requires", etc.
 
-  public int GetIndentAbove(IToken token) {
+  public int GetIndentAbove(IOrigin token) {
     if (PosToIndentations(token.pos).Above is var aboveIndentation and not -1) {
       return aboveIndentation;
     }
@@ -148,7 +149,7 @@ public int GetIndentAbove(IToken token) {
     return GetIndentBelowOrInlineOrAbove(token.Prev);
   }
 
-  public int GetIndentInlineOrAbove(IToken token) {
+  public int GetIndentInlineOrAbove(IOrigin token) {
     if (PosToIndentations(token.pos).Inline is var indentation and not -1) {
       return indentation;
     }
@@ -156,7 +157,7 @@ public int GetIndentInlineOrAbove(IToken token) {
     return GetIndentAbove(token);
   }
 
-  public int GetIndentBelowOrInlineOrAbove(IToken token) {
+  public int GetIndentBelowOrInlineOrAbove(IOrigin token) {
     if (token == null || token == Token.NoToken) {
       return 0;
     }
@@ -172,7 +173,7 @@ public int GetIndentBelowOrInlineOrAbove(IToken token) {
   // Get the precise column this token will be at after reformatting.
   // Requires all tokens before to have been formatted.
 
-  public int GetNewTokenVisualIndent(IToken token, int defaultIndent) {
+  public int GetNewTokenVisualIndent(IOrigin token, int defaultIndent) {
     var previousTrivia = token.Prev != null ? token.Prev.TrailingTrivia : "";
     previousTrivia += token.LeadingTrivia;
     var lastNL = previousTrivia.LastIndexOf('\n');
@@ -205,7 +206,7 @@ public int GetNewTokenVisualIndent(IToken token, int defaultIndent) {
     return token.col - 1;
   }
 
-  private static int GetTrailingSpace(IToken token) {
+  private static int GetTrailingSpace(IOrigin token) {
     var c = 0;
     while (c < token.TrailingTrivia.Length && token.TrailingTrivia[c] == ' ') {
       c++;
@@ -216,22 +217,23 @@ private static int GetTrailingSpace(IToken token) {
 
   // Given a token such as `var ` immediately followed by another token
   // returns the indent so that everything after it is aligned with the first token.
-  public int GetRightAlignIndentAfter(IToken token, int indentFallback) {
+  public int GetRightAlignIndentAfter(IOrigin token, int indentFallback) {
     var trailingSpace = GetTrailingSpace(token);
     return GetNewTokenVisualIndent(token, indentFallback) + token.val.Length + trailingSpace;
   }
 
   private static readonly Regex FollowedByNewlineRegex = new Regex("^[ \t]*([\r\n]|//)");
+  private readonly Uri fileToFormat;
 
-  public static bool IsFollowedByNewline(IToken token) {
+  public static bool IsFollowedByNewline(IOrigin token) {
     return FollowedByNewlineRegex.IsMatch(token.TrailingTrivia);
   }
 
   // 'above' is the hypothetical indentation of a comment attached to that token on the line before
   // 'inline' is the hypothetical indentation of this token if it was on its own line
   // 'below' is the hypothetical indentation of a comment after that token, and of the next token if it does not have a set indentation
-  public void SetIndentations(IToken token, int above = -1, int inline = -1, int below = -1) {
-    if (token.FromIncludeDirective(program) || (token.line == 0 && token.col == 0)) {
+  public void SetIndentations(IOrigin token, int above = -1, int inline = -1, int below = -1) {
+    if (token.Uri != fileToFormat || (token.line == 0 && token.col == 0)) {
       // Just ignore this token.
       return;
     }
@@ -251,7 +253,7 @@ public void SetIndentations(IToken token, int above = -1, int inline = -1, int b
 
   // functions, methods, predicates, iterators, can all be formatted using this method.
   // See FormatterWorksForMethodsInModule in Formatter.cs to see how methods are formatted.
-  public void SetMethodLikeIndent(IToken startToken, IEnumerable<IToken> ownedTokens, int indent) {
+  public void SetMethodLikeIndent(IOrigin startToken, IEnumerable<IOrigin> ownedTokens, int indent) {
     var indent2 = indent + SpaceTab;
     if (startToken.val != "{") {
       SetIndentations(startToken, indent, indent, indent2);
@@ -320,7 +322,7 @@ public void SetMethodLikeIndent(IToken startToken, IEnumerable<IToken> ownedToke
     }
   }
 
-  public void SetTypeLikeIndentation(int indent, IEnumerable<IToken> tokens) {
+  public void SetTypeLikeIndentation(int indent, IEnumerable<IOrigin> tokens) {
     var commaIndent = indent + SpaceTab;
     var rightIndent = indent + SpaceTab;
     foreach (var token in tokens) {
@@ -401,7 +403,7 @@ public void SetStatementIndentation(Statement statement) {
   }
 
   public void SetDeclIndentation(TopLevelDecl topLevelDecl, int indent) {
-    if (topLevelDecl.tok.FromIncludeDirective(program)) {
+    if (topLevelDecl.Origin.FromIncludeDirective(program)) {
       return;
     }
 
@@ -420,9 +422,9 @@ public void SetDeclIndentation(TopLevelDecl topLevelDecl, int indent) {
         SetRedirectingTypeDeclDeclIndentation(indent, redirectingTypeDecl);
       }
 
-      var initialMemberIndent = declWithMembers.tok.line == 0 ? indent : indent2;
+      var initialMemberIndent = declWithMembers.Origin.line == 0 ? indent : indent2;
       foreach (var member in declWithMembers.PreResolveChildren) {
-        if (member.Tok.FromIncludeDirective(program)) {
+        if (member.Origin.FromIncludeDirective(program)) {
           continue;
         }
 
@@ -459,6 +461,9 @@ private void SetRedirectingTypeDeclDeclIndentation(int indent, RedirectingTypeDe
     var indent2 = indent + SpaceTab;
     var rightOfVerticalBarIndent = indent2 + SpaceTab;
     var verticalBarIndent = indent2;
+    if (redirectingTypeDecl is IAttributeBearingDeclaration { Attributes: var attributes }) {
+      Attributes.SetIndents(attributes, indent, this);
+    }
     foreach (var token in redirectingTypeDecl.OwnedTokens) {
       switch (token.val) {
         case "newtype":
@@ -557,7 +562,7 @@ public bool SetIndentAssertLikeStatement(Statement stmt, int indent) {
       }
     }
 
-    if (stmt is AssertStmt { Proof: { StartToken: { } startToken } }) {
+    if (stmt is BlockByProofStmt { Proof: { StartToken: { } startToken } }) {
       SetOpeningIndentedRegion(startToken, indent);
     }
 
@@ -574,7 +579,7 @@ public void SetIndentBody(Statement body, int indent) {
     Visit(body, indent);
   }
 
-  public bool SetIndentPrintRevealStmt(int indent, IEnumerable<IToken> ownedTokens) {
+  public bool SetIndentPrintRevealStmt(int indent, IEnumerable<IOrigin> ownedTokens) {
     var commaIndent = indent + SpaceTab;
     var innerIndent = indent + SpaceTab;
     var afterSemicolonIndent = indent;
@@ -607,7 +612,7 @@ public bool SetIndentPrintRevealStmt(int indent, IEnumerable<IToken> ownedTokens
     return true;
   }
 
-  public bool SetIndentUpdateStmt(ConcreteUpdateStatement stmt, int indent, bool inner) {
+  public bool SetIndentUpdateStmt(ConcreteAssignStatement stmt, int indent, bool inner) {
     var ownedTokens = stmt.OwnedTokens.ToList();
     var opIndentDefault =
       stmt is AssignOrReturnStmt assignStmt && assignStmt.Lhss.Count == 0
@@ -620,7 +625,7 @@ public bool SetIndentUpdateStmt(ConcreteUpdateStatement stmt, int indent, bool i
     var commaIndent = indent + SpaceTab;
     SetIndentations(startToken, startAssignmentIndent, startAssignmentIndent, afterStartIndent);
 
-    var rhss = stmt is UpdateStmt updateStmt ? updateStmt.Rhss
+    var rhss = stmt is AssignStatement updateStmt ? updateStmt.Rhss
       : stmt is AssignOrReturnStmt assignOrReturnStmt ? new List<AssignmentRhs> { assignOrReturnStmt.Rhs }
         .Concat(assignOrReturnStmt.Rhss).ToList()
       : new List<AssignmentRhs>();
@@ -645,7 +650,7 @@ void InferRightIndentFromRhs() {
         return;
       }
 
-      rightIndent = GetNewTokenVisualIndent(rhs.RangeToken.StartToken, rightIndent);
+      rightIndent = GetNewTokenVisualIndent(rhs.Origin.StartToken, rightIndent);
     }
 
     if (!ownedTokens.Any(token => token.val == ":=" || token.val == ":-" || token.val == ":|")) {
@@ -719,7 +724,7 @@ public void VisitAlternatives(List<GuardedAlternative> alternatives, int indent)
     }
   }
 
-  public bool SetIndentParensExpression(int indent, IEnumerable<IToken> ownedTokens) {
+  public bool SetIndentParensExpression(int indent, IEnumerable<IOrigin> ownedTokens) {
     var itemIndent = indent + SpaceTab;
     var commaIndent = indent;
 
@@ -758,14 +763,14 @@ public bool SetIndentParensExpression(int indent, IEnumerable<IToken> ownedToken
     return true;
   }
 
-  public bool SetIndentCases(int indent, IEnumerable<IToken> ownedTokens, Action indentInside) {
+  public bool SetIndentCases(int indent, IEnumerable<IOrigin> ownedTokens, Action indentInside) {
     var caseIndent = indent;
     var afterArrowIndent = indent + SpaceTab;
     var decreasesElemIndent = indent + SpaceTab + SpaceTab;
     var commaIndent = decreasesElemIndent;
     // Need to ensure that the "case" is at least left aligned with the match/if/while keyword
-    IToken decisionToken = null;
-    var allTokens = ownedTokens as IToken[] ?? ownedTokens.ToArray();
+    IOrigin decisionToken = null;
+    var allTokens = ownedTokens as IOrigin[] ?? ownedTokens.ToArray();
     foreach (var token in allTokens) {
       if (SetIndentLabelTokens(token, indent)) {
         continue;
@@ -851,7 +856,7 @@ public bool SetIndentCases(int indent, IEnumerable<IToken> ownedTokens, Action i
     return false;
   }
 
-  public bool SetIndentVarDeclStmt(int indent, IEnumerable<IToken> ownedTokens, bool noLHS, bool isLetExpr) {
+  public bool SetIndentVarDeclStmt(int indent, IEnumerable<IOrigin> ownedTokens, bool noLHS, bool isLetExpr) {
     var rightIndent = indent + SpaceTab;
     var commaIndent = indent + SpaceTab;
     var afterSemicolonIndent = indent;
@@ -921,7 +926,7 @@ public bool SetIndentVarDeclStmt(int indent, IEnumerable<IToken> ownedTokens, bo
     return true;
   }
 
-  public bool SetIndentLabelTokens(IToken token, int indent) {
+  public bool SetIndentLabelTokens(IOrigin token, int indent) {
     if (token.val == "label") {
       SetOpeningIndentedRegion(token, indent);
     } else if (token.val == ":" && token.Prev.Prev.val == "label") {
@@ -933,7 +938,7 @@ public bool SetIndentLabelTokens(IToken token, int indent) {
     return true;
   }
 
-  public void SetIndentLikeLoop(IEnumerable<IToken> ownedTokens, Statement body, int indent) {
+  public void SetIndentLikeLoop(IEnumerable<IOrigin> ownedTokens, Statement body, int indent) {
     var decreasesElemIndent = indent + SpaceTab;
     var commaIndent = indent + SpaceTab;
     var first = true;
@@ -987,7 +992,7 @@ public void SetIndentLikeLoop(IEnumerable<IToken> ownedTokens, Statement body, i
     }
 
     if (body != null) {
-      SetDelimiterIndentedRegions(body.Tok, indent);
+      SetDelimiterIndentedRegions(body.Origin, indent);
       if (body.EndToken.val == "}") {
         SetClosingIndentedRegion(body.EndToken, indent);
       }
@@ -996,7 +1001,7 @@ public void SetIndentLikeLoop(IEnumerable<IToken> ownedTokens, Statement body, i
     }
   }
 
-  public bool TryGetIndentAbove(IToken token, out int indent) {
+  public bool TryGetIndentAbove(IOrigin token, out int indent) {
     if (PosToIndentations(token.pos).Above is var aboveIndent and not -1) {
       indent = aboveIndent;
       return true;
@@ -1006,7 +1011,7 @@ public bool TryGetIndentAbove(IToken token, out int indent) {
     return false;
   }
 
-  public bool TryGetIndentInline(IToken token, out int indent) {
+  public bool TryGetIndentInline(IOrigin token, out int indent) {
     if (PosToIndentations(token.pos).Inline is var inlineIndent and not -1) {
       indent = inlineIndent;
       return true;
@@ -1021,7 +1026,7 @@ public bool TryGetIndentInline(IToken token, out int indent) {
   /// // Not indented
   /// if       // line not indented
   ///   x == 2 // Line indented
-  public void SetOpeningIndentedRegion(IToken token, int indent) {
+  public void SetOpeningIndentedRegion(IOrigin token, int indent) {
     SetIndentations(token, indent, indent, indent + SpaceTab);
   }
 
@@ -1033,7 +1038,7 @@ public void SetOpeningIndentedRegion(IToken token, int indent) {
   ///               // rightIndent
   ///               B();
   /// 
-  private void SetDelimiterSpeciallyIndentedRegions(IToken token, int indent, int rightIndent) {
+  private void SetDelimiterSpeciallyIndentedRegions(IOrigin token, int indent, int rightIndent) {
     SetIndentations(token, rightIndent, indent, rightIndent);
   }
 
@@ -1044,7 +1049,7 @@ private void SetDelimiterSpeciallyIndentedRegions(IToken token, int indent, int
   ///   // indented
   /// else     // line not indented
   ///   x == 2 // Line indented
-  public void SetDelimiterIndentedRegions(IToken token, int indent) {
+  public void SetDelimiterIndentedRegions(IOrigin token, int indent) {
     SetIndentations(token, indent + SpaceTab, indent, indent + SpaceTab);
   }
 
@@ -1056,7 +1061,7 @@ public void SetDelimiterIndentedRegions(IToken token, int indent) {
   ///   // indented
   ///   1, 2
   /// 
-  public void SetDelimiterInsideIndentedRegions(IToken token, int indent) {
+  public void SetDelimiterInsideIndentedRegions(IOrigin token, int indent) {
     SetIndentations(token, indent + SpaceTab, indent + SpaceTab, indent + SpaceTab);
   }
 
@@ -1069,7 +1074,7 @@ public void SetDelimiterInsideIndentedRegions(IToken token, int indent) {
   //           >   // this line indent's
   //           //  after liene indent
   // // not indented
-  public void SetClosingIndentedRegionAligned(IToken token, int beforeIndent, int indent) {
+  public void SetClosingIndentedRegionAligned(IOrigin token, int beforeIndent, int indent) {
     SetIndentations(token, beforeIndent, indent, indent);
   }
 
@@ -1079,7 +1084,7 @@ public void SetClosingIndentedRegionAligned(IToken token, int beforeIndent, int
   ///   // indented
   /// } // not indented
   /// // not indented
-  public void SetClosingIndentedRegion(IToken token, int indent) {
+  public void SetClosingIndentedRegion(IOrigin token, int indent) {
     SetIndentations(token, indent + SpaceTab, indent, indent);
   }
 
@@ -1089,7 +1094,7 @@ public void SetClosingIndentedRegion(IToken token, int indent) {
   ///   // indented
   ///   ; // indented
   /// // not indented
-  public void SetClosingIndentedRegionInside(IToken token, int indent) {
+  public void SetClosingIndentedRegionInside(IOrigin token, int indent) {
     SetIndentations(token, indent + SpaceTab, indent + SpaceTab, indent);
   }
 
@@ -1103,7 +1108,7 @@ public void SetClosingIndentedRegionInside(IToken token, int indent) {
   /// {
   /// }
   /// // not indented
-  public void SetKeywordWithoutSurroundingIndentation(IToken token, int indent) {
+  public void SetKeywordWithoutSurroundingIndentation(IOrigin token, int indent) {
     SetIndentations(token, indent, indent, indent);
   }
 
@@ -1115,7 +1120,7 @@ public void SetKeywordWithoutSurroundingIndentation(IToken token, int indent) {
   ///                ^rightIndent
   ///           ^commaIndent
   /// 
-  public void SetAlign(int indent, IToken token, out int rightIndent, out int commaIndent) {
+  public void SetAlign(int indent, IOrigin token, out int rightIndent, out int commaIndent) {
     SetIndentations(token, indent, indent);
     rightIndent = GetRightAlignIndentAfter(token, indent);
     commaIndent = GetNewTokenVisualIndent(token, indent) + token.val.Length - 1;
@@ -1131,7 +1136,7 @@ public void SetAlign(int indent, IToken token, out int rightIndent, out int comm
   ///        ^ rightIndent
   /// else Z
   /// 
-  public void SetAlignOpen(IToken token, int indent) {
+  public void SetAlignOpen(IOrigin token, int indent) {
     var rightIndent = GetRightAlignIndentAfter(token, indent);
     SetIndentations(token, indent, indent, rightIndent);
   }
diff --git a/Source/DafnyCore/AST/IHasReferences.cs b/Source/DafnyCore/AST/IHasReferences.cs
new file mode 100644
index 00000000000..f771fc729df
--- /dev/null
+++ b/Source/DafnyCore/AST/IHasReferences.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// Node that has a token that is used to navigate to this node
+/// </summary>
+public interface IHasNavigationToken : INode {
+  IOrigin NavigationToken { get; }
+}
+
+public record Reference(IOrigin Referer, IHasNavigationToken Referred);
+public interface IHasReferences {
+  public IEnumerable<Reference> GetReferences();
+}
+
+/// <summary>
+/// A symbol that potential has something to verify
+/// </summary>
+public interface ICanVerify : ISymbol {
+  ModuleDefinition ContainingModule { get; }
+
+  /// <summary>
+  /// Return true if this symbol has something to verify.
+  /// If true is incorrectly returned, the IDE will allow the user to verify this but it'll pass immediately.
+  /// </summary>
+  bool ShouldVerify { get; }
+
+  string FullDafnyName { get; }
+}
+
+public interface IFrameScope {
+  string Designator { get; } // "lambda expression", "method", "function"...
+}
+
+public static class AstExtensions {
+
+  public static string GetMemberQualification(MemberDecl memberDecl) {
+    if (memberDecl.EnclosingClass == null) {
+      // If traversing up the AST is already made available after parsing, this branch can be removed.
+      return "";
+    }
+    return memberDecl.EnclosingClass.Name == "_default" ? "" : $"{memberDecl.EnclosingClass.Name}.";
+  }
+
+  /// <summary>
+  /// Returns a text representation of the given variable.
+  /// </summary>
+  /// <param name="variable">The variable to get a text representation of.</param>
+  /// <returns>The text representation of the variable.</returns>
+  public static string AsText(this IVariable variable) {
+    var ghost = variable.IsGhost ? "ghost " : "";
+    string type;
+    try {
+      type = variable.Type.ToString();
+    } catch (Exception e) {
+      type = $"<Internal error: {e.Message}>";
+    }
+    return $"{ghost}{variable.Name}: {type}";
+  }
+}
+
+public interface ISymbol : IHasNavigationToken {
+  SymbolKind? Kind { get; }
+
+  string GetDescription(DafnyOptions options);
+}
+
+public interface IHasSymbolChildren : ISymbol {
+  IEnumerable<ISymbol> ChildSymbols { get; }
+}
+
+public static class SymbolExtensions {
+
+  public static ISet<ISymbol> GetSymbolDescendants(ISymbol node) {
+    var todo = new Stack<ISymbol>();
+    todo.Push(node);
+    var result = new HashSet<ISymbol>();
+    while (todo.Any()) {
+      var current = todo.Pop();
+      result.Add(current);
+      if (current is IHasSymbolChildren hasChildren) {
+        foreach (var child in hasChildren.ChildSymbols) {
+          todo.Push(child);
+        }
+      }
+    }
+    return result;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/IHasUsages.cs b/Source/DafnyCore/AST/IHasUsages.cs
deleted file mode 100644
index 0952d3afd00..00000000000
--- a/Source/DafnyCore/AST/IHasUsages.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.Dafny;
-
-public interface IDeclarationOrUsage : INode {
-  IToken NameToken { get; }
-}
-
-public interface IHasUsages : IDeclarationOrUsage {
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations();
-}
-
-/// <summary>
-/// A symbol that potential has something to verify
-/// </summary>
-public interface ICanVerify : ISymbol {
-  ModuleDefinition ContainingModule { get; }
-
-  /// <summary>
-  /// Return true if this symbol has something to verify.
-  /// If true is incorrectly returned, the IDE will allow the user to verify this but it'll pass immediately.
-  /// </summary>
-  bool ShouldVerify { get; }
-}
-
-public static class AstExtensions {
-
-  public static string GetMemberQualification(MemberDecl memberDecl) {
-    return memberDecl.EnclosingClass.Name == "_default" ? "" : $"{memberDecl.EnclosingClass.Name}.";
-  }
-
-  /// <summary>
-  /// Returns a text representation of the given variable.
-  /// </summary>
-  /// <param name="variable">The variable to get a text representation of.</param>
-  /// <returns>The text representation of the variable.</returns>
-  public static string AsText(this IVariable variable) {
-    var ghost = variable.IsGhost ? "ghost " : "";
-    string type;
-    try {
-      type = variable.Type.ToString();
-    } catch (Exception e) {
-      type = $"<Internal error: {e.Message}>";
-    }
-    return $"{ghost}{variable.Name}: {type}";
-  }
-}
-
-public interface ISymbol : IDeclarationOrUsage {
-  DafnySymbolKind Kind { get; }
-
-  string GetDescription(DafnyOptions options);
-}
-
-public interface IHasSymbolChildren : ISymbol {
-  IEnumerable<ISymbol> ChildSymbols { get; }
-}
-
-public static class SymbolExtensions {
-
-  public static ISet<ISymbol> GetSymbolDescendants(ISymbol node) {
-    var todo = new Stack<ISymbol>();
-    todo.Push(node);
-    var result = new HashSet<ISymbol>();
-    while (todo.Any()) {
-      var current = todo.Pop();
-      result.Add(current);
-      if (current is IHasSymbolChildren hasChildren) {
-        foreach (var child in hasChildren.ChildSymbols) {
-          todo.Push(child);
-        }
-      }
-    }
-    return result;
-  }
-}
-
-/// <summary>
-/// This is a copy of OmniSharp.Extensions.LanguageServer.Protocol.Models.SymbolKind
-/// In the future, we'll include that package in this project, and then this copy can be removed.
-/// For now, adding that package reference is not worth its weight.
-/// </summary>
-public enum DafnySymbolKind {
-  File = 1,
-  Module = 2,
-  Namespace = 3,
-  Package = 4,
-  Class = 5,
-  Method = 6,
-  Property = 7,
-  Field = 8,
-  Constructor = 9,
-  Enum = 10,
-  Interface = 11,
-  Function = 12,
-  Variable = 13,
-  Constant = 14,
-  String = 15,
-  Number = 16,
-  Boolean = 17,
-  Array = 18,
-  Object = 19,
-  Key = 20,
-  Null = 21,
-  EnumMember = 22,
-  Struct = 23,
-  Event = 24,
-  Operator = 25,
-  TypeParameter = 26,
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/IOrigin.cs b/Source/DafnyCore/AST/IOrigin.cs
new file mode 100644
index 00000000000..36b797ac4c0
--- /dev/null
+++ b/Source/DafnyCore/AST/IOrigin.cs
@@ -0,0 +1,60 @@
+using System;
+using System.IO;
+
+namespace Microsoft.Dafny;
+
+public interface IOrigin : Microsoft.Boogie.IToken {
+
+  bool IsInherited(ModuleDefinition m);
+
+  int Length => EndToken.pos - StartToken.pos;
+
+  bool InclusiveEnd { get; }
+  bool IncludesRange { get; }
+  /*
+  int kind { get; set; }
+  int pos { get; set; }
+  int col { get; set; }
+  int line { get; set; }
+  string val { get; set; }
+  bool IsValid { get; }*/
+  string Boogie.IToken.filename {
+    get => Uri == null ? null : Path.GetFileName(Uri.LocalPath);
+    set => throw new NotSupportedException();
+  }
+
+  public string ActualFilename => Uri.LocalPath;
+  string Filepath => Uri?.LocalPath;
+
+  Uri Uri { get; }
+
+  Token StartToken { get; }
+  Token EndToken { get; }
+  Token Center {
+    get;
+  }
+
+  /// <summary>
+  /// TrailingTrivia contains everything after the token,
+  /// until and including two newlines between which there is no commment
+  /// All the remaining trivia is for the LeadingTrivia of the next token
+  ///
+  /// ```
+  /// const /*for const*/ x /*for x*/ := /* for := */ 1/* for 1 */
+  /// // for 1 again
+  /// // for 1 again
+  ///
+  /// // Two newlines, now all the trivia is for var y
+  /// // this line as well.
+  /// var y := 2
+  /// ```
+  /// </summary>
+  string TrailingTrivia { get; set; }
+  string LeadingTrivia { get; set; }
+  Token Next { get; set; } // The next token
+  Token Prev { get; set; } // The previous token
+
+  public IOrigin WithVal(string val);  // create a new token by setting the given val.
+
+  bool IsCopy { get; }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Include.cs b/Source/DafnyCore/AST/Include.cs
index 844772c7b17..b3fb091c3aa 100644
--- a/Source/DafnyCore/AST/Include.cs
+++ b/Source/DafnyCore/AST/Include.cs
@@ -4,18 +4,21 @@
 
 namespace Microsoft.Dafny;
 
-public class Include : TokenNode, IComparable {
+public class Include : NodeWithComputedRange, IComparable {
+  public DafnyOptions ParseOptions { get; }
   public Uri IncluderFilename { get; }
   public Uri IncludedFilename { get; }
   public string CanonicalPath { get; }
 
-  public Include(IToken tok, Uri includer, Uri theFilename) {
-    this.tok = tok;
+  public Include(IOrigin origin, Uri includer, Uri theFilename, DafnyOptions parseOptions) : base(origin) {
     this.IncluderFilename = includer;
     this.IncludedFilename = theFilename;
+    ParseOptions = parseOptions;
     this.CanonicalPath = DafnyFile.Canonicalize(theFilename.LocalPath).LocalPath;
   }
 
+  public IOrigin PathOrigin => new SourceOrigin(Center, EndToken);
+
   public int CompareTo(object obj) {
     if (obj is Include include) {
       return CanonicalPath.CompareTo(include.CanonicalPath);
diff --git a/Source/DafnyCore/AST/Members/ConstantField.cs b/Source/DafnyCore/AST/Members/ConstantField.cs
index c58b5eae4a2..6aa3aeacc9a 100644
--- a/Source/DafnyCore/AST/Members/ConstantField.cs
+++ b/Source/DafnyCore/AST/Members/ConstantField.cs
@@ -1,18 +1,20 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public class ConstantField : SpecialField, ICallable, ICanVerify {
+public class ConstantField : SpecialField, ICallable, ICanAutoRevealDependencies, ICanVerify {
   public override string WhatKind => "const field";
-  public readonly Expression Rhs;
+  public Expression Rhs;
 
   public override bool IsOpaque { get; }
 
-  public ConstantField(RangeToken rangeToken, Name name, Expression/*?*/ rhs, bool hasStaticKeyword, bool isGhost, bool isOpaque, Type type, Attributes attributes)
-    : base(rangeToken, name, ID.UseIdParam, NonglobalVariable.SanitizeName(name.Value), hasStaticKeyword, isGhost, false, false, type, attributes) {
-    Contract.Requires(tok != null);
+  public ConstantField(IOrigin origin, Name name, Expression/*?*/ rhs, bool hasStaticKeyword, bool isGhost, bool isOpaque, Type type, Attributes attributes)
+    : base(origin, name, ID.UseIdParam, NonglobalVariable.SanitizeName(name.Value), hasStaticKeyword, isGhost, false, false, type, attributes) {
+    Contract.Requires(Origin != null);
     Contract.Requires(name != null);
     Contract.Requires(type != null);
     this.Rhs = rhs;
@@ -23,12 +25,16 @@ public override bool CanBeRevealed() {
     return true;
   }
 
+  public bool ContainsHide { get; set; }
+
   public new bool IsGhost { get { return this.isGhost; } }
   public List<TypeParameter> TypeArgs { get { return new List<TypeParameter>(); } }
   public List<Formal> Ins { get { return new List<Formal>(); } }
   public ModuleDefinition EnclosingModule { get { return this.EnclosingClass.EnclosingModuleDefinition; } }
   public bool MustReverify { get { return false; } }
   public bool AllowsNontermination { get { throw new cce.UnreachableException(); } }
+  CodeGenIdGenerator ICodeContext.CodeGenIdGenerator => CodeGenIdGenerator;
+
   public string NameRelativeToModule {
     get {
       if (EnclosingClass is DefaultClassDecl) {
@@ -45,10 +51,25 @@ public bool InferredDecreases {
   }
   public bool AllowsAllocation => true;
 
-  public override IEnumerable<INode> Children => base.Children.Concat(new[] { Rhs }.Where(x => x != null));
-  public override DafnySymbolKind Kind => DafnySymbolKind.Constant;
+  public override IEnumerable<INode> Children =>
+    base.Children.Concat(new[] { Rhs }.Where(x => x != null));
+  public override SymbolKind? Kind => SymbolKind.Constant;
 
   public override IEnumerable<INode> PreResolveChildren => Children;
   public ModuleDefinition ContainingModule => EnclosingModule;
   public bool ShouldVerify => Rhs != null; // This could be made more accurate by checking whether the Rhs needs to be verified.
+  public void AutoRevealDependencies(AutoRevealFunctionDependencies Rewriter, DafnyOptions Options, ErrorReporter Reporter) {
+    if (Rhs is null) {
+      return;
+    }
+
+    var addedReveals = Rewriter.ExprToFunctionalDependencies(Rhs, EnclosingModule);
+    Rhs = Rewriter.AddRevealStmtsToExpression(Rhs, addedReveals);
+
+    if (addedReveals.Any()) {
+      Reporter.Message(MessageSource.Rewriter, ErrorLevel.Info, null, Origin,
+        AutoRevealFunctionDependencies.GenerateMessage(addedReveals.ToList()));
+    }
+  }
+  public string Designator => WhatKind;
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Members/Constructor.cs b/Source/DafnyCore/AST/Members/Constructor.cs
index 76c9bc96140..b5171440180 100644
--- a/Source/DafnyCore/AST/Members/Constructor.cs
+++ b/Source/DafnyCore/AST/Members/Constructor.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
@@ -10,7 +11,7 @@ void ObjectInvariant() {
     Contract.Invariant(Body == null || Body is DividedBlockStmt);
   }
 
-  public override DafnySymbolKind Kind => DafnySymbolKind.Constructor;
+  public override SymbolKind? Kind => SymbolKind.Constructor;
   protected override string GetQualifiedName() {
     return EnclosingClass.Name;
   }
@@ -33,17 +34,19 @@ public List<Statement> BodyProper {  // second part of Body's statements
       }
     }
   }
-  public Constructor(RangeToken rangeToken, Name name,
+  public Constructor(IOrigin origin, Name name,
     bool isGhost,
     List<TypeParameter> typeArgs,
     List<Formal> ins,
-    List<AttributedExpression> req, [Captured] Specification<FrameExpression> mod,
+    List<AttributedExpression> req,
+    Specification<FrameExpression> reads,
+    [Captured] Specification<FrameExpression> mod,
     List<AttributedExpression> ens,
     Specification<Expression> decreases,
     DividedBlockStmt body,
-    Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, false, isGhost, typeArgs, ins, new List<Formal>(), req, mod, ens, decreases, body, attributes, signatureEllipsis) {
-    Contract.Requires(rangeToken != null);
+    Attributes attributes, IOrigin signatureEllipsis)
+    : base(origin, name, false, isGhost, typeArgs, ins, new List<Formal>(), req, reads, mod, ens, decreases, body, attributes, signatureEllipsis) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
     Contract.Requires(cce.NonNullElements(ins));
diff --git a/Source/DafnyCore/AST/Members/ExtremeLemma.cs b/Source/DafnyCore/AST/Members/ExtremeLemma.cs
index 8c5d117192f..cacd1b2372b 100644
--- a/Source/DafnyCore/AST/Members/ExtremeLemma.cs
+++ b/Source/DafnyCore/AST/Members/ExtremeLemma.cs
@@ -18,17 +18,19 @@ public ExtremeLemma(Cloner cloner, ExtremeLemma lemma) : base(cloner, lemma) {
     TypeOfK = lemma.TypeOfK;
   }
 
-  public ExtremeLemma(RangeToken rangeToken, Name name,
+  public ExtremeLemma(IOrigin origin, Name name,
     bool hasStaticKeyword, ExtremePredicate.KType typeOfK,
     List<TypeParameter> typeArgs,
     List<Formal> ins, [Captured] List<Formal> outs,
-    List<AttributedExpression> req, [Captured] Specification<FrameExpression> mod,
+    List<AttributedExpression> req,
+    Specification<FrameExpression> reads,
+    [Captured] Specification<FrameExpression> mod,
     List<AttributedExpression> ens,
     Specification<Expression> decreases,
     BlockStmt body,
-    Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, true, typeArgs, ins, outs, req, mod, ens, decreases, body, attributes, signatureEllipsis) {
-    Contract.Requires(rangeToken != null);
+    Attributes attributes, IOrigin signatureEllipsis)
+    : base(origin, name, hasStaticKeyword, true, typeArgs, ins, outs, req, reads, mod, ens, decreases, body, attributes, signatureEllipsis) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
     Contract.Requires(cce.NonNullElements(ins));
@@ -46,17 +48,19 @@ public ExtremeLemma(RangeToken rangeToken, Name name,
 public class LeastLemma : ExtremeLemma {
   public override string WhatKind => "least lemma";
 
-  public LeastLemma(RangeToken rangeToken, Name name,
+  public LeastLemma(IOrigin origin, Name name,
     bool hasStaticKeyword, ExtremePredicate.KType typeOfK,
     List<TypeParameter> typeArgs,
     List<Formal> ins, [Captured] List<Formal> outs,
-    List<AttributedExpression> req, [Captured] Specification<FrameExpression> mod,
+    List<AttributedExpression> req,
+    Specification<FrameExpression> reads,
+    [Captured] Specification<FrameExpression> mod,
     List<AttributedExpression> ens,
     Specification<Expression> decreases,
     BlockStmt body,
-    Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, typeOfK, typeArgs, ins, outs, req, mod, ens, decreases, body, attributes, signatureEllipsis) {
-    Contract.Requires(rangeToken != null);
+    Attributes attributes, IOrigin signatureEllipsis)
+    : base(origin, name, hasStaticKeyword, typeOfK, typeArgs, ins, outs, req, reads, mod, ens, decreases, body, attributes, signatureEllipsis) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
     Contract.Requires(cce.NonNullElements(ins));
@@ -74,17 +78,19 @@ public LeastLemma(Cloner cloner, LeastLemma leastLemma) : base(cloner, leastLemm
 public class GreatestLemma : ExtremeLemma {
   public override string WhatKind => "greatest lemma";
 
-  public GreatestLemma(RangeToken rangeToken, Name name,
+  public GreatestLemma(IOrigin origin, Name name,
     bool hasStaticKeyword, ExtremePredicate.KType typeOfK,
     List<TypeParameter> typeArgs,
     List<Formal> ins, [Captured] List<Formal> outs,
-    List<AttributedExpression> req, [Captured] Specification<FrameExpression> mod,
+    List<AttributedExpression> req,
+    Specification<FrameExpression> reads,
+    [Captured] Specification<FrameExpression> mod,
     List<AttributedExpression> ens,
     Specification<Expression> decreases,
     BlockStmt body,
-    Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, typeOfK, typeArgs, ins, outs, req, mod, ens, decreases, body, attributes, signatureEllipsis) {
-    Contract.Requires(rangeToken != null);
+    Attributes attributes, IOrigin signatureEllipsis)
+    : base(origin, name, hasStaticKeyword, typeOfK, typeArgs, ins, outs, req, reads, mod, ens, decreases, body, attributes, signatureEllipsis) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
     Contract.Requires(cce.NonNullElements(ins));
diff --git a/Source/DafnyCore/AST/Members/ExtremePredicate.cs b/Source/DafnyCore/AST/Members/ExtremePredicate.cs
index 84e11b915f5..5d2088c808d 100644
--- a/Source/DafnyCore/AST/Members/ExtremePredicate.cs
+++ b/Source/DafnyCore/AST/Members/ExtremePredicate.cs
@@ -19,11 +19,11 @@ public bool KNat {
   public override IEnumerable<INode> Children => base.Children.Concat(new[] { PrefixPredicate });
   public override IEnumerable<INode> PreResolveChildren => base.Children;
 
-  public ExtremePredicate(RangeToken rangeToken, Name name, bool hasStaticKeyword, bool isOpaque, KType typeOfK,
-    List<TypeParameter> typeArgs, List<Formal> formals, Formal result,
-    List<AttributedExpression> req, List<FrameExpression> reads, List<AttributedExpression> ens,
-    Expression body, Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, true, isOpaque, typeArgs, formals, result, Type.Bool,
+  public ExtremePredicate(IOrigin rangeOrigin, Name name, bool hasStaticKeyword, bool isOpaque, KType typeOfK,
+    List<TypeParameter> typeArgs, List<Formal> ins, Formal result,
+    List<AttributedExpression> req, Specification<FrameExpression> reads, List<AttributedExpression> ens,
+    Expression body, Attributes attributes, IOrigin signatureEllipsis)
+    : base(rangeOrigin, name, hasStaticKeyword, true, isOpaque, typeArgs, ins, result, Type.Bool,
       req, reads, ens, new Specification<Expression>(new List<Expression>(), null), body, null, null, attributes, signatureEllipsis) {
     TypeOfK = typeOfK;
   }
@@ -40,7 +40,7 @@ public FunctionCallExpr CreatePrefixPredicateCall(FunctionCallExpr fexp, Express
 
     var args = new List<Expression>() { depth };
     args.AddRange(fexp.Args);
-    var prefixPredCall = new FunctionCallExpr(fexp.Tok, this.PrefixPredicate.Name, fexp.Receiver, fexp.OpenParen, fexp.CloseParen, args);
+    var prefixPredCall = new FunctionCallExpr(fexp.Origin, PrefixPredicate.NameNode, fexp.Receiver, fexp.OpenParen, fexp.CloseParen, args);
     prefixPredCall.Function = this.PrefixPredicate;  // resolve here
     prefixPredCall.TypeApplication_AtEnclosingClass = fexp.TypeApplication_AtEnclosingClass;  // resolve here
     prefixPredCall.TypeApplication_JustFunction = fexp.TypeApplication_JustFunction;  // resolve here
@@ -52,22 +52,22 @@ public FunctionCallExpr CreatePrefixPredicateCall(FunctionCallExpr fexp, Express
 
 public class GreatestPredicate : ExtremePredicate {
   public override string WhatKind => "greatest predicate";
-  public GreatestPredicate(RangeToken rangeToken, Name name, bool hasStaticKeyword, bool isOpaque, KType typeOfK,
-    List<TypeParameter> typeArgs, List<Formal> formals, Formal result,
-    List<AttributedExpression> req, List<FrameExpression> reads, List<AttributedExpression> ens,
-    Expression body, Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, isOpaque, typeOfK, typeArgs, formals, result,
+  public GreatestPredicate(IOrigin rangeOrigin, Name name, bool hasStaticKeyword, bool isOpaque, KType typeOfK,
+    List<TypeParameter> typeArgs, List<Formal> ins, Formal result,
+    List<AttributedExpression> req, Specification<FrameExpression> reads, List<AttributedExpression> ens,
+    Expression body, Attributes attributes, IOrigin signatureEllipsis)
+    : base(rangeOrigin, name, hasStaticKeyword, isOpaque, typeOfK, typeArgs, ins, result,
       req, reads, ens, body, attributes, signatureEllipsis) {
   }
 }
 
 public class LeastPredicate : ExtremePredicate {
   public override string WhatKind => "least predicate";
-  public LeastPredicate(RangeToken rangeToken, Name name, bool hasStaticKeyword, bool isOpaque, KType typeOfK,
-    List<TypeParameter> typeArgs, List<Formal> formals, Formal result,
-    List<AttributedExpression> req, List<FrameExpression> reads, List<AttributedExpression> ens,
-    Expression body, Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, isOpaque, typeOfK, typeArgs, formals, result,
+  public LeastPredicate(IOrigin rangeOrigin, Name name, bool hasStaticKeyword, bool isOpaque, KType typeOfK,
+    List<TypeParameter> typeArgs, List<Formal> ins, Formal result,
+    List<AttributedExpression> req, Specification<FrameExpression> reads, List<AttributedExpression> ens,
+    Expression body, Attributes attributes, IOrigin signatureEllipsis)
+    : base(rangeOrigin, name, hasStaticKeyword, isOpaque, typeOfK, typeArgs, ins, result,
       req, reads, ens, body, attributes, signatureEllipsis) {
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Members/Field.cs b/Source/DafnyCore/AST/Members/Field.cs
index 719834ab2e0..1902b7c9cb7 100644
--- a/Source/DafnyCore/AST/Members/Field.cs
+++ b/Source/DafnyCore/AST/Members/Field.cs
@@ -1,33 +1,36 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public class Field : MemberDecl, ICanFormat, IHasDocstring, ISymbol {
+public class Field : MemberDecl, ICanFormat, IHasDocstring {
   public override string WhatKind => "field";
   public readonly bool IsMutable;  // says whether or not the field can ever change values
   public readonly bool IsUserMutable;  // says whether or not code is allowed to assign to the field (IsUserMutable implies IsMutable)
   public PreType PreType;
-  public readonly Type Type;
+
+  public readonly Type Type; // Might be null after parsing and set during resolution
   [ContractInvariantMethod]
   void ObjectInvariant() {
     Contract.Invariant(Type != null);
     Contract.Invariant(!IsUserMutable || IsMutable);  // IsUserMutable ==> IsMutable
   }
 
-  public override IEnumerable<INode> Children => Type.Nodes;
+  public override IEnumerable<INode> Children =>
+    (Type?.Nodes ?? Enumerable.Empty<INode>()).Concat(this.Attributes.AsEnumerable());
 
-  public Field(RangeToken rangeToken, Name name, bool isGhost, Type type, Attributes attributes)
-    : this(rangeToken, name, false, isGhost, true, true, type, attributes) {
-    Contract.Requires(rangeToken != null);
+  public Field(IOrigin origin, Name name, bool isGhost, Type type, Attributes attributes)
+    : this(origin, name, false, isGhost, true, true, type, attributes) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(type != null);
   }
 
-  public Field(RangeToken rangeToken, Name name, bool hasStaticKeyword, bool isGhost, bool isMutable, bool isUserMutable, Type type, Attributes attributes)
-    : base(rangeToken, name, hasStaticKeyword, isGhost, attributes, false) {
-    Contract.Requires(rangeToken != null);
+  public Field(IOrigin origin, Name name, bool hasStaticKeyword, bool isGhost, bool isMutable, bool isUserMutable, Type type, Attributes attributes)
+    : base(origin, name, hasStaticKeyword, isGhost, attributes, false) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(type != null);
     Contract.Requires(!isUserMutable || isMutable);
@@ -39,6 +42,7 @@ public Field(RangeToken rangeToken, Name name, bool hasStaticKeyword, bool isGho
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     formatter.SetOpeningIndentedRegion(StartToken, indentBefore);
     formatter.SetIndentations(EndToken, below: indentBefore);
+    Attributes.SetIndents(Attributes, indentBefore, formatter);
     var hasComma = OwnedTokens.Any(token => token.val == ",");
     switch (this) {
       case ConstantField constantField:
@@ -87,16 +91,26 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
   }
 
   public string GetTriviaContainingDocstring() {
-    if (EndToken.TrailingTrivia.Trim() != "") {
-      return EndToken.TrailingTrivia;
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
+    }
+    foreach (var token in OwnedTokens) {
+      if (token.val == ":=") {
+        if ((token.Prev.TrailingTrivia + (token.LeadingTrivia ?? "")).Trim() is { } tentativeTrivia and not "") {
+          return tentativeTrivia;
+        }
+      }
+    }
+    if (EndToken.TrailingTrivia.Trim() is { } tentativeTrivia2 and not "") {
+      return tentativeTrivia2;
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    return null;
   }
 
-  public virtual DafnySymbolKind Kind => DafnySymbolKind.Field;
+  public override SymbolKind? Kind => SymbolKind.Field;
 
-  public string GetDescription(DafnyOptions options) {
+  public override string GetDescription(DafnyOptions options) {
     var prefix = IsMutable ? "var" : "const";
     return $"{prefix} {AstExtensions.GetMemberQualification(this)}{Name}: {Type}";
   }
diff --git a/Source/DafnyCore/AST/Members/Function.cs b/Source/DafnyCore/AST/Members/Function.cs
index fb494916527..c9384adaa12 100644
--- a/Source/DafnyCore/AST/Members/Function.cs
+++ b/Source/DafnyCore/AST/Members/Function.cs
@@ -5,10 +5,12 @@
 using System.Numerics;
 using DafnyCore;
 using Microsoft.Dafny.Auditor;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public class Function : MemberDecl, TypeParameter.ParentType, ICallable, ICanFormat, IHasDocstring, ISymbol, ICanVerify {
+public class Function : MethodOrFunction, TypeParameter.ParentType, ICallable, ICanFormat, IHasDocstring,
+  ICanAutoRevealDependencies, ICanVerify {
   public override string WhatKind => "function";
 
   public string GetFunctionDeclarationKeywords(DafnyOptions options) {
@@ -28,43 +30,49 @@ public string GetFunctionDeclarationKeywords(DafnyOptions options) {
       k = WhatKind;
     }
 
+    // If this function is opaque due to the opaque keyword, include it.
+    k = (IsOpaque && !Attributes.Contains(Attributes, "opaque")) ? "opaque " + k : k;
     return HasStaticKeyword ? "static " + k : k;
   }
 
   public override bool IsOpaque { get; }
 
+  public bool IsMadeImplicitlyOpaque(DafnyOptions options) {
+    return
+       !IsOpaque &&
+       !Attributes.Contains(Attributes, "opaque") &&
+       options.Get(CommonOptionBag.DefaultFunctionOpacity) != CommonOptionBag.DefaultFunctionOpacityOptions.Transparent
+       && this is not ExtremePredicate
+       && this is not PrefixPredicate
+       && Name != "reads" && Name != "requires"
+       && !Attributes.Contains(this.Attributes, "transparent");
+  }
+
   public override bool CanBeRevealed() {
     return true;
   }
 
-  public bool HasPostcondition =>
+  public override bool HasPostcondition =>
     Ens.Count > 0 || ResultType.AsSubsetType is not null;
 
-  public bool HasPrecondition =>
-    Req.Count > 0 || Formals.Any(f => f.Type.AsSubsetType is not null);
-
   public override IEnumerable<Assumption> Assumptions(Declaration decl) {
     foreach (var a in base.Assumptions(this)) {
       yield return a;
     }
 
-    if (Body is null && HasPostcondition && !EnclosingClass.EnclosingModuleDefinition.IsAbstract && !HasExternAttribute && !HasAxiomAttribute) {
-      yield return new Assumption(this, tok, AssumptionDescription.NoBody(IsGhost));
-    }
-
-    if (Body is not null && HasConcurrentAttribute) {
-      yield return new Assumption(this, tok, AssumptionDescription.HasConcurrentAttribute);
+    if (Body is null && HasPostcondition && EnclosingClass.EnclosingModuleDefinition.ModuleKind == ModuleKindEnum.Concrete && !HasExternAttribute && !HasAxiomAttribute) {
+      yield return new Assumption(this, Origin, AssumptionDescription.NoBody(IsGhost));
     }
 
     if (HasExternAttribute) {
-      yield return new Assumption(this, tok, AssumptionDescription.ExternFunction);
+      yield return new Assumption(this, Origin, AssumptionDescription.ExternFunction);
       if (HasPostcondition && !HasAxiomAttribute) {
-        yield return new Assumption(this, tok, AssumptionDescription.ExternWithPostcondition);
+        yield return new Assumption(this, Origin, AssumptionDescription.ExternWithPostcondition);
       }
     }
 
     if (HasExternAttribute && HasPrecondition && !HasAxiomAttribute) {
-      yield return new Assumption(this, tok, AssumptionDescription.ExternWithPrecondition);
+      yield return new Assumption(this, Origin, AssumptionDescription.ExternWithPrecondition);
     }
 
     foreach (var c in this.Descendants()) {
@@ -83,23 +91,30 @@ public TailStatus
       TailStatus.NotTailRecursive; // NotTailRecursive = no tail recursion; TriviallyTailRecursive is never used here
 
   public bool IsTailRecursive => TailRecursion != TailStatus.NotTailRecursive;
-  public bool IsAccumulatorTailRecursive => IsTailRecursive && TailRecursion != Function.TailStatus.TailRecursive;
+  public bool IsAccumulatorTailRecursive => IsTailRecursive && TailRecursion != TailStatus.TailRecursive;
   [FilledInDuringResolution] public bool IsFueled; // if anyone tries to adjust this function's fuel
-  public readonly List<TypeParameter> TypeArgs;
-  public readonly List<Formal> Formals;
   public readonly Formal Result;
   public PreType ResultPreType;
   public readonly Type ResultType;
-  public readonly List<AttributedExpression> Req;
-  public readonly List<FrameExpression> Reads;
-  public readonly List<AttributedExpression> Ens;
-  public readonly Specification<Expression> Decreases;
+  public Type OriginalResultTypeWithRenamings() {
+    if (OverriddenFunction == null) {
+      return ResultType;
+    }
+
+    Contract.Assert(TypeArgs.Count == OverriddenFunction.TypeArgs.Count);
+    var renamings = new Dictionary<TypeParameter, Type>();
+    for (var i = 0; i < TypeArgs.Count; i++) {
+      renamings.Add(OverriddenFunction.TypeArgs[i], new UserDefinedType(Origin, TypeArgs[i]));
+    }
+    return OverriddenFunction.ResultType.Subst(renamings);
+
+  }
   public Expression Body; // an extended expression; Body is readonly after construction, except for any kind of rewrite that may take place around the time of resolution
-  public IToken /*?*/ ByMethodTok; // null iff ByMethodBody is null
+  public IOrigin /*?*/ ByMethodTok; // null iff ByMethodBody is null
   public BlockStmt /*?*/ ByMethodBody;
   [FilledInDuringResolution] public Method /*?*/ ByMethodDecl; // if ByMethodBody is non-null
   public bool SignatureIsOmitted => SignatureEllipsis != null; // is "false" for all Function objects that survive into resolution
-  public readonly IToken SignatureEllipsis;
+  public readonly IOrigin SignatureEllipsis;
   public Function OverriddenFunction;
   public Function Original => OverriddenFunction == null ? this : OverriddenFunction.Original;
   public override bool IsOverrideThatAddsBody => base.IsOverrideThatAddsBody && Body != null;
@@ -129,32 +144,34 @@ public enum TailStatus {
 
   public override IEnumerable<INode> Children => new[] { ByMethodBody }.Where(x => x != null).
     Concat<Node>(TypeArgs).
-    Concat<Node>(Reads).
+    Concat<Node>(Reads.Expressions).
     Concat<Node>(Req).
     Concat(Ens.Select(e => e.E)).
     Concat(Decreases.Expressions).
-    Concat(Formals).Concat(Result != null ? new List<Node>() { Result } : new List<Node>()).
+    Concat(Ins).
+    Concat(Result != null ? new List<Node>() { Result } : new List<Node>()).
+    Concat(ResultType != null ? new List<Node>() { ResultType } : new List<Node>()).
     Concat(Body == null ? Enumerable.Empty<Node>() : new[] { Body });
 
   public override IEnumerable<INode> PreResolveChildren =>
     TypeArgs.
-    Concat<Node>(Reads).
+    Concat<Node>(Reads.Expressions).
     Concat<Node>(Req).
     Concat(Ens).
     Concat(Decreases.Expressions.Where(expression => expression is not AutoGeneratedExpression)).
-    Concat(Formals).Concat(ResultType != null && ResultType.tok.line > 0 ? new List<Node>() { ResultType } : new List<Node>()).
+    Concat(Ins).Concat(ResultType != null && ResultType.Origin.line > 0 ? new List<Node>() { ResultType } : new List<Node>()).
     Concat(Body == null ? Enumerable.Empty<Node>() : new[] { Body }).
     Concat(ByMethodBody == null ? Enumerable.Empty<Node>() : new[] { ByMethodBody });
 
   public override IEnumerable<Expression> SubExpressions {
     get {
-      foreach (var formal in Formals.Where(f => f.DefaultValue != null)) {
+      foreach (var formal in Ins.Where(f => f.DefaultValue != null)) {
         yield return formal.DefaultValue;
       }
       foreach (var e in Req) {
         yield return e.E;
       }
-      foreach (var e in Reads) {
+      foreach (var e in Reads.Expressions) {
         yield return e.E;
       }
       foreach (var e in Ens) {
@@ -171,10 +188,10 @@ public override IEnumerable<Expression> SubExpressions {
 
   public Type GetMemberType(ArrowTypeDecl atd) {
     Contract.Requires(atd != null);
-    Contract.Requires(atd.Arity == Formals.Count);
+    Contract.Requires(atd.Arity == Ins.Count);
 
     // Note, the following returned type can contain type parameters from the function and its enclosing class
-    return new ArrowType(tok, atd, Formals.ConvertAll(f => f.Type), ResultType);
+    return new ArrowType(Origin, atd, Ins.ConvertAll(f => f.Type), ResultType);
   }
 
   public bool AllowsNontermination {
@@ -183,6 +200,8 @@ public bool AllowsNontermination {
     }
   }
 
+  CodeGenIdGenerator ICodeContext.CodeGenIdGenerator => CodeGenIdGenerator;
+
   /// <summary>
   /// The "AllCalls" field is used for non-ExtremePredicate, non-PrefixPredicate functions only (so its value should not be relied upon for ExtremePredicate and PrefixPredicate functions).
   /// It records all function calls made by the Function, including calls made in the body as well as in the specification.
@@ -200,45 +219,40 @@ public enum CoCallClusterInvolvement {
   [ContractInvariantMethod]
   void ObjectInvariant() {
     Contract.Invariant(cce.NonNullElements(TypeArgs));
-    Contract.Invariant(cce.NonNullElements(Formals));
+    Contract.Invariant(cce.NonNullElements(Ins));
     Contract.Invariant(ResultType != null);
     Contract.Invariant(cce.NonNullElements(Req));
-    Contract.Invariant(cce.NonNullElements(Reads));
+    Contract.Invariant(Reads != null);
     Contract.Invariant(cce.NonNullElements(Ens));
     Contract.Invariant(Decreases != null);
   }
 
-  public Function(RangeToken range, Name name, bool hasStaticKeyword, bool isGhost, bool isOpaque,
-    List<TypeParameter> typeArgs, List<Formal> formals, Formal result, Type resultType,
-    List<AttributedExpression> req, List<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
-    Expression/*?*/ body, IToken/*?*/ byMethodTok, BlockStmt/*?*/ byMethodBody,
-    Attributes attributes, IToken/*?*/ signatureEllipsis)
-    : base(range, name, hasStaticKeyword, isGhost, attributes, signatureEllipsis != null) {
+  public Function(IOrigin range, Name name, bool hasStaticKeyword, bool isGhost, bool isOpaque,
+    List<TypeParameter> typeArgs, List<Formal> ins, Formal result, Type resultType,
+    List<AttributedExpression> req, Specification<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
+    Expression/*?*/ body, IOrigin/*?*/ byMethodTok, BlockStmt/*?*/ byMethodBody,
+    Attributes attributes, IOrigin/*?*/ signatureEllipsis)
+    : base(range, name, hasStaticKeyword, isGhost, attributes, signatureEllipsis != null, typeArgs, ins, req, ens, decreases) {
 
-    Contract.Requires(tok != null);
+    Contract.Requires(Origin != null);
     Contract.Requires(name != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
-    Contract.Requires(cce.NonNullElements(formals));
+    Contract.Requires(cce.NonNullElements(ins));
     Contract.Requires(resultType != null);
     Contract.Requires(cce.NonNullElements(req));
-    Contract.Requires(cce.NonNullElements(reads));
+    Contract.Requires(reads != null);
     Contract.Requires(cce.NonNullElements(ens));
     Contract.Requires(decreases != null);
     Contract.Requires(byMethodBody == null || (!isGhost && body != null)); // function-by-method has a ghost expr and non-ghost stmt, but to callers appears like a functiion-method
     this.IsFueled = false;  // Defaults to false.  Only set to true if someone mentions this function in a fuel annotation
-    this.TypeArgs = typeArgs;
-    this.Formals = formals;
     this.Result = result;
     this.ResultType = result != null ? result.Type : resultType;
-    this.Req = req;
     this.Reads = reads;
-    this.Ens = ens;
-    this.Decreases = decreases;
     this.Body = body;
     this.ByMethodTok = byMethodTok;
     this.ByMethodBody = byMethodBody;
     this.SignatureEllipsis = signatureEllipsis;
-    this.IsOpaque = isOpaque;
+    this.IsOpaque = isOpaque || Attributes.Contains(attributes, "opaque");
 
     if (attributes != null) {
       List<Expression> args = Attributes.FindExpressions(attributes, "fuel");
@@ -246,23 +260,23 @@ public Function(RangeToken range, Name name, bool hasStaticKeyword, bool isGhost
         if (args.Count == 1) {
           LiteralExpr literal = args[0] as LiteralExpr;
           if (literal != null && literal.Value is BigInteger) {
-            this.IsFueled = true;
+            IsFueled = true;
           }
         } else if (args.Count == 2) {
           LiteralExpr literalLow = args[0] as LiteralExpr;
           LiteralExpr literalHigh = args[1] as LiteralExpr;
 
           if (literalLow != null && literalLow.Value is BigInteger && literalHigh != null && literalHigh.Value is BigInteger) {
-            this.IsFueled = true;
+            IsFueled = true;
           }
         }
       }
     }
   }
 
-  bool ICodeContext.IsGhost { get { return this.IsGhost; } }
-  List<TypeParameter> ICodeContext.TypeArgs { get { return this.TypeArgs; } }
-  List<Formal> ICodeContext.Ins { get { return this.Formals; } }
+  bool ICodeContext.IsGhost { get { return IsGhost; } }
+  List<TypeParameter> ICodeContext.TypeArgs { get { return TypeArgs; } }
+  List<Formal> ICodeContext.Ins { get { return Ins; } }
   string ICallable.NameRelativeToModule {
     get {
       if (EnclosingClass is DefaultClassDecl) {
@@ -272,18 +286,18 @@ string ICallable.NameRelativeToModule {
       }
     }
   }
-  Specification<Expression> ICallable.Decreases { get { return this.Decreases; } }
+  Specification<Expression> ICallable.Decreases { get { return Decreases; } }
   bool _inferredDecr;
   bool ICallable.InferredDecreases {
     set { _inferredDecr = value; }
     get { return _inferredDecr; }
   }
-  ModuleDefinition IASTVisitorContext.EnclosingModule { get { return this.EnclosingClass.EnclosingModuleDefinition; } }
+  ModuleDefinition IASTVisitorContext.EnclosingModule { get { return EnclosingClass.EnclosingModuleDefinition; } }
   bool ICodeContext.MustReverify { get { return false; } }
 
   [Pure]
   public bool IsFuelAware() { return IsRecursive || IsFueled || (OverriddenFunction != null && OverriddenFunction.IsFuelAware()); }
-  public virtual bool ReadsHeap { get { return Reads.Count != 0; } }
+  public virtual bool ReadsHeap { get { return Reads.Expressions.Count != 0; } }
 
   public static readonly Option<string> FunctionSyntaxOption = new("--function-syntax",
     () => "4",
@@ -315,8 +329,7 @@ static Function() {
     DafnyOptions.RegisterLegacyBinding(FunctionSyntaxOption, (options, value) => {
       options.FunctionSyntax = functionSyntaxOptionsMap[value];
     });
-
-    DooFile.RegisterNoChecksNeeded(FunctionSyntaxOption);
+    OptionRegistry.RegisterOption(FunctionSyntaxOption, OptionScope.Module);
   }
 
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
@@ -324,8 +337,8 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     if (BodyStartTok.line > 0) {
       formatter.SetDelimiterIndentedRegions(BodyStartTok, indentBefore);
     }
-
-    formatter.SetFormalsIndentation(Formals);
+    Attributes.SetIndents(Attributes, indentBefore, formatter);
+    formatter.SetFormalsIndentation(Ins);
     if (Result is { } outFormal) {
       formatter.SetTypeIndentation(outFormal.SyntacticType);
     }
@@ -334,7 +347,7 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
       formatter.SetAttributedExpressionIndentation(req, indentBefore + formatter.SpaceTab);
     }
 
-    foreach (var frame in Reads) {
+    foreach (var frame in Reads.Expressions) {
       formatter.SetFrameExpressionIndentation(frame, indentBefore + formatter.SpaceTab);
     }
 
@@ -356,41 +369,51 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     return true;
   }
 
+  protected override bool Bodyless => Body == null;
+  protected override string TypeName => "function";
+
+  public void ResolveNewOrOldPart(INewOrOldResolver resolver) {
+    ResolveMethodOrFunction(resolver);
+  }
+
   /// <summary>
   /// Assumes type parameters have already been pushed
   /// </summary>
-  public void Resolve(ModuleResolver resolver) {
+  public override void Resolve(ModuleResolver resolver) {
     Contract.Requires(this != null);
     Contract.Requires(resolver.AllTypeConstraints.Count == 0);
     Contract.Ensures(resolver.AllTypeConstraints.Count == 0);
 
+    ResolveNewOrOldPart(resolver);
+
     // make note of the warnShadowing attribute
     bool warnShadowingOption = resolver.Options.WarnShadowing;  // save the original warnShadowing value
-    bool warnShadowing = false;
+    bool warnShadowing = true;
     if (Attributes.ContainsBool(Attributes, "warnShadowing", ref warnShadowing)) {
       resolver.Options.WarnShadowing = warnShadowing;  // set the value according to the attribute
     }
-    resolver.DominatingStatementLabels.PushMarker();
 
     resolver.scope.PushMarker();
     if (IsStatic) {
       resolver.scope.AllowInstance = false;
     }
 
-    foreach (Formal p in Formals) {
+    foreach (Formal p in Ins) {
       resolver.scope.Push(p.Name, p);
     }
 
-    resolver.ResolveParameterDefaultValues(Formals, ResolutionContext.FromCodeContext(this));
+    resolver.ResolveParameterDefaultValues(Ins, ResolutionContext.FromCodeContext(this));
 
+    var contractContext = new ResolutionContext(this, this is TwoStateFunction);
     foreach (var req in Req) {
-      resolver.ResolveAttributes(req, new ResolutionContext(this, this is TwoStateFunction));
+      resolver.ResolveAttributes(req, contractContext);
       Expression r = req.E;
-      resolver.ResolveExpression(r, new ResolutionContext(this, this is TwoStateFunction));
+      resolver.ResolveExpression(r, contractContext);
       Contract.Assert(r.Type != null);  // follows from postcondition of ResolveExpression
       resolver.ConstrainTypeExprBool(r, "Precondition must be a boolean (got {0})");
     }
-    foreach (FrameExpression fr in Reads) {
+    resolver.ResolveAttributes(Reads, contractContext);
+    foreach (FrameExpression fr in Reads.Expressions) {
       resolver.ResolveFrameExpressionTopLevel(fr, FrameExpressionUse.Reads, this);
     }
 
@@ -400,16 +423,16 @@ public void Resolve(ModuleResolver resolver) {
     }
     foreach (AttributedExpression e in Ens) {
       Expression r = e.E;
-      resolver.ResolveAttributes(e, new ResolutionContext(this, this is TwoStateFunction));
-      resolver.ResolveExpression(r, new ResolutionContext(this, this is TwoStateFunction) with { InFunctionPostcondition = true });
+      resolver.ResolveAttributes(e, contractContext);
+      resolver.ResolveExpression(r, contractContext with { InFunctionPostcondition = true });
       Contract.Assert(r.Type != null);  // follows from postcondition of ResolveExpression
       resolver.ConstrainTypeExprBool(r, "Postcondition must be a boolean (got {0})");
     }
     resolver.scope.PopMarker(); // function result name
 
-    resolver.ResolveAttributes(Decreases, new ResolutionContext(this, this is TwoStateFunction));
+    resolver.ResolveAttributes(Decreases, contractContext);
     foreach (Expression r in Decreases.Expressions) {
-      resolver.ResolveExpression(r, new ResolutionContext(this, this is TwoStateFunction));
+      resolver.ResolveExpression(r, contractContext);
       // any type is fine
     }
     resolver.SolveAllTypeConstraints(); // solve type constraints in the specification
@@ -429,7 +452,7 @@ public void Resolve(ModuleResolver resolver) {
       }
       resolver.ResolveExpression(Body, new ResolutionContext(this, this is TwoStateFunction));
       Contract.Assert(Body.Type != null);  // follows from postcondition of ResolveExpression
-      resolver.AddAssignableConstraint(tok, ResultType, Body.Type, "Function body type mismatch (expected {0}, got {1})");
+      resolver.AddAssignableConstraint(Origin, ResultType, Body.Type, "Function body type mismatch (expected {0}, got {1})");
       resolver.SolveAllTypeConstraints();
       resolver.DominatingStatementLabels.PopMarker();
     }
@@ -438,7 +461,7 @@ public void Resolve(ModuleResolver resolver) {
     if (Result != null) {
       resolver.scope.Push(Result.Name, Result);  // function return only visible in post-conditions (and in function attributes)
     }
-    resolver.ResolveAttributes(this, new ResolutionContext(this, this is TwoStateFunction), true);
+    resolver.ResolveAttributes(this, contractContext, true);
     resolver.scope.PopMarker(); // function result name
 
     resolver.scope.PopMarker(); // formals
@@ -452,35 +475,124 @@ public void Resolve(ModuleResolver resolver) {
         // method should have been filled in by now,
         // unless there was a function by method and a method of the same name
         // but then this error must have been reported.
-        Contract.Assert(resolver.Reporter.ErrorCount > 0);
+        Contract.Assert(resolver.Reporter.HasErrors);
       }
     }
 
     resolver.Options.WarnShadowing = warnShadowingOption; // restore the original warnShadowing value
-    resolver.DominatingStatementLabels.PopMarker();
   }
 
   public string GetTriviaContainingDocstring() {
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
+    }
 
+    // Comments after the type, but before the clauses
     var endTokenDefinition =
-      OwnedTokens.LastOrDefault(token => token.val == ")" || token.pos == ResultType.EndToken.pos)
-      ?? EndToken;
-    if (endTokenDefinition.TrailingTrivia.Trim() != "") {
-      return endTokenDefinition.TrailingTrivia;
+      OwnedTokens.LastOrDefault(token => token.val == ")");
+    if (endTokenDefinition != null && endTokenDefinition.pos < ResultType.EndToken.pos) {
+      endTokenDefinition = ResultType.EndToken;
+    }
+    var tentativeTrivia = "";
+    if (endTokenDefinition != null) {
+      if (endTokenDefinition.pos < this.EndToken.pos) { // All comments are docstring
+        tentativeTrivia = (endTokenDefinition.TrailingTrivia + endTokenDefinition.Next.LeadingTrivia).Trim();
+      } else {
+        // Comments at the end of bodiless functions
+        tentativeTrivia = endTokenDefinition.TrailingTrivia.Trim();
+      }
+      if (tentativeTrivia != "") {
+        return tentativeTrivia;
+      }
     }
 
-    if (StartToken.LeadingTrivia.Trim() != "") {
-      return StartToken.LeadingTrivia;
+    tentativeTrivia = EndToken.TrailingTrivia.Trim();
+    if (tentativeTrivia != "") {
+      return tentativeTrivia;
     }
+
     return null;
   }
 
-  public DafnySymbolKind Kind => DafnySymbolKind.Function;
+  public override SymbolKind? Kind => SymbolKind.Function;
   public bool ShouldVerify => true; // This could be made more accurate
   public ModuleDefinition ContainingModule => EnclosingClass.EnclosingModuleDefinition;
-  public string GetDescription(DafnyOptions options) {
-    var formals = string.Join(", ", Formals.Select(f => f.AsText()));
+  public override string GetDescription(DafnyOptions options) {
+    var formals = string.Join(", ", Ins.Select(f => f.AsText()));
     var resultType = ResultType.TypeName(options, null, false);
     return $"{WhatKind} {AstExtensions.GetMemberQualification(this)}{Name}({formals}): {resultType}";
   }
+
+  public void AutoRevealDependencies(AutoRevealFunctionDependencies rewriter, DafnyOptions options,
+    ErrorReporter reporter) {
+    if (Body is null) {
+      return;
+    }
+
+    if (ByMethodDecl is not null) {
+      ByMethodDecl.AutoRevealDependencies(rewriter, options, reporter);
+    }
+
+    object autoRevealDepsVal = null;
+    bool autoRevealDeps = Attributes.ContainsMatchingValue(Attributes, "autoRevealDependencies",
+      ref autoRevealDepsVal, new List<Attributes.MatchingValueOption> {
+        Attributes.MatchingValueOption.Bool,
+        Attributes.MatchingValueOption.Int
+      }, s => reporter.Error(MessageSource.Rewriter, ErrorLevel.Error, Origin, s));
+
+    // Default behavior is reveal all dependencies
+    int autoRevealDepth = int.MaxValue;
+
+    if (autoRevealDeps) {
+      if (autoRevealDepsVal is false) {
+        autoRevealDepth = 0;
+      } else if (autoRevealDepsVal is BigInteger i) {
+        autoRevealDepth = (int)i;
+      }
+    }
+
+    var currentClass = EnclosingClass;
+    List<AutoRevealFunctionDependencies.RevealStmtWithDepth> addedReveals = new();
+
+    foreach (var func in rewriter.GetEnumerator(this, currentClass, SubExpressions)) {
+      var revealStmt =
+        AutoRevealFunctionDependencies.BuildRevealStmt(func.Function, Origin, EnclosingClass.EnclosingModuleDefinition);
+
+      if (revealStmt is not null) {
+        addedReveals.Add(new AutoRevealFunctionDependencies.RevealStmtWithDepth(revealStmt, func.Depth));
+      }
+    }
+
+    if (autoRevealDepth > 0) {
+      Expression reqExpr = Expression.CreateBoolLiteral(Origin, true);
+
+      var bodyExpr = Body;
+
+      foreach (var revealStmt in addedReveals) {
+        if (revealStmt.Depth <= autoRevealDepth) {
+          bodyExpr = new StmtExpr(Origin, revealStmt.RevealStmt, bodyExpr) {
+            Type = bodyExpr.Type
+          };
+
+          reqExpr = new StmtExpr(reqExpr.Origin, revealStmt.RevealStmt, reqExpr) {
+            Type = Type.Bool
+          };
+        } else {
+          break;
+        }
+      }
+
+      Body = bodyExpr;
+
+      if (Req.Any() || Ens.Any()) {
+        Req.Insert(0, new AttributedExpression(reqExpr));
+      }
+    }
+
+    if (addedReveals.Any()) {
+      reporter.Message(MessageSource.Rewriter, ErrorLevel.Info, null, Origin,
+        AutoRevealFunctionDependencies.GenerateMessage(addedReveals, autoRevealDepth));
+    }
+  }
+  public string Designator => WhatKind;
 }
diff --git a/Source/DafnyCore/AST/Members/ICanAutoReveal.cs b/Source/DafnyCore/AST/Members/ICanAutoReveal.cs
new file mode 100644
index 00000000000..ef7a4c9cb76
--- /dev/null
+++ b/Source/DafnyCore/AST/Members/ICanAutoReveal.cs
@@ -0,0 +1,5 @@
+namespace Microsoft.Dafny;
+
+public interface ICanAutoRevealDependencies {
+  public void AutoRevealDependencies(AutoRevealFunctionDependencies Rewriter, DafnyOptions Options, ErrorReporter Reporter);
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Members/ICodeContext.cs b/Source/DafnyCore/AST/Members/ICodeContext.cs
index 8044e9311aa..68437269621 100644
--- a/Source/DafnyCore/AST/Members/ICodeContext.cs
+++ b/Source/DafnyCore/AST/Members/ICodeContext.cs
@@ -1,5 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
@@ -7,12 +9,14 @@ namespace Microsoft.Dafny;
 /// An ICodeContext is an ICallable or a NoContext.
 /// </summary>
 public interface ICodeContext : IASTVisitorContext {
+  bool ContainsHide { get; set; }
   bool IsGhost { get; }
   List<TypeParameter> TypeArgs { get; }
   List<Formal> Ins { get; }
   bool MustReverify { get; }
   string FullSanitizedName { get; }
   bool AllowsNontermination { get; }
+  CodeGenIdGenerator CodeGenIdGenerator { get; }
 }
 
 
@@ -29,6 +33,11 @@ public CodeContextWrapper(ICodeContext inner, bool isGhostContext) {
     this.isGhostContext = isGhostContext;
   }
 
+  public bool ContainsHide {
+    get => inner.ContainsHide;
+    set => inner.ContainsHide = value;
+  }
+
   public bool IsGhost => isGhostContext;
   public List<TypeParameter> TypeArgs => inner.TypeArgs;
   public List<Formal> Ins => inner.Ins;
@@ -36,6 +45,7 @@ public CodeContextWrapper(ICodeContext inner, bool isGhostContext) {
   public bool MustReverify => inner.MustReverify;
   public string FullSanitizedName => inner.FullSanitizedName;
   public bool AllowsNontermination => inner.AllowsNontermination;
+  CodeGenIdGenerator ICodeContext.CodeGenIdGenerator => inner.CodeGenIdGenerator;
 
   public static ICodeContext Unwrap(ICodeContext codeContext) {
     while (codeContext is CodeContextWrapper ccw) {
@@ -45,11 +55,13 @@ public static ICodeContext Unwrap(ICodeContext codeContext) {
   }
 }
 
+interface ICodeContainer {
+}
 
 /// <summary>
 /// An ICallable is a Function, Method, IteratorDecl, or (less fitting for the name ICallable) RedirectingTypeDecl or DatatypeDecl.
 /// </summary>
-public interface ICallable : ICodeContext, INode {
+public interface ICallable : ICodeContext, ISymbol, IFrameScope {
   string WhatKind { get; }
   string NameRelativeToModule { get; }
   Specification<Expression> Decreases { get; }
@@ -74,53 +86,31 @@ public CallableWrapper(ICallable callable, bool isGhostContext)
     : base(callable, isGhostContext) {
   }
 
-  protected ICallable cwInner => (ICallable)inner;
-  public IToken Tok => cwInner.Tok;
-  public IEnumerable<INode> Children => cwInner.Children;
-  public IEnumerable<INode> PreResolveChildren => cwInner.PreResolveChildren;
+  public ICallable CwInner => (ICallable)inner;
+  public IEnumerable<INode> Children => CwInner.Children;
+  public IEnumerable<INode> PreResolveChildren => CwInner.PreResolveChildren;
 
-  public string WhatKind => cwInner.WhatKind;
-  public string NameRelativeToModule => cwInner.NameRelativeToModule;
-  public Specification<Expression> Decreases => cwInner.Decreases;
+  public string WhatKind => CwInner.WhatKind;
+  public string NameRelativeToModule => CwInner.NameRelativeToModule;
+  public Specification<Expression> Decreases => CwInner.Decreases;
 
   public bool InferredDecreases {
-    get => cwInner.InferredDecreases;
-    set { cwInner.InferredDecreases = value; }
+    get => CwInner.InferredDecreases;
+    set { CwInner.InferredDecreases = value; }
   }
 
-  public bool AllowsAllocation => cwInner.AllowsAllocation;
+  public bool AllowsAllocation => CwInner.AllowsAllocation;
 
-  public IEnumerable<IToken> OwnedTokens => cwInner.OwnedTokens;
-  public RangeToken RangeToken => cwInner.RangeToken;
-}
-
-
-public class DontUseICallable : ICallable {
-  public string WhatKind { get { throw new cce.UnreachableException(); } }
-  public bool IsGhost { get { throw new cce.UnreachableException(); } }
-  public List<TypeParameter> TypeArgs { get { throw new cce.UnreachableException(); } }
-  public List<Formal> Ins { get { throw new cce.UnreachableException(); } }
-  public ModuleDefinition EnclosingModule { get { throw new cce.UnreachableException(); } }
-  public bool MustReverify { get { throw new cce.UnreachableException(); } }
-  public string FullSanitizedName { get { throw new cce.UnreachableException(); } }
-  public bool AllowsNontermination { get { throw new cce.UnreachableException(); } }
-  public IToken Tok { get { throw new cce.UnreachableException(); } }
-  public IEnumerable<INode> Children => throw new cce.UnreachableException();
-  public IEnumerable<INode> PreResolveChildren => throw new cce.UnreachableException();
-
-  public string NameRelativeToModule { get { throw new cce.UnreachableException(); } }
-  public Specification<Expression> Decreases { get { throw new cce.UnreachableException(); } }
-  public bool InferredDecreases {
-    get { throw new cce.UnreachableException(); }
-    set { throw new cce.UnreachableException(); }
-  }
-  public bool AllowsAllocation => throw new cce.UnreachableException();
-  public IEnumerable<INode> GetConcreteChildren() {
-    throw new cce.UnreachableException();
+  public bool SingleFileToken => CwInner.SingleFileToken;
+  public IEnumerable<IOrigin> OwnedTokens => CwInner.OwnedTokens;
+  public IOrigin Origin => CwInner.Origin;
+  public IOrigin NavigationToken => CwInner.NavigationToken;
+  public SymbolKind? Kind => CwInner.Kind;
+  public string GetDescription(DafnyOptions options) {
+    return CwInner.GetDescription(options);
   }
 
-  public IEnumerable<IToken> OwnedTokens => throw new cce.UnreachableException();
-  public RangeToken RangeToken => throw new cce.UnreachableException();
+  public string Designator => WhatKind;
 }
 
 /// <summary>
@@ -139,6 +129,11 @@ public class NoContext : ICodeContext {
   public NoContext(ModuleDefinition module) {
     this.Module = module;
   }
+
+  public bool ContainsHide {
+    get => throw new NotSupportedException();
+    set => throw new NotSupportedException();
+  }
   bool ICodeContext.IsGhost { get { return true; } }
   List<TypeParameter> ICodeContext.TypeArgs { get { return new List<TypeParameter>(); } }
   List<Formal> ICodeContext.Ins { get { return new List<Formal>(); } }
@@ -146,18 +141,26 @@ public NoContext(ModuleDefinition module) {
   bool ICodeContext.MustReverify { get { Contract.Assume(false, "should not be called on NoContext"); throw new cce.UnreachableException(); } }
   public string FullSanitizedName { get { Contract.Assume(false, "should not be called on NoContext"); throw new cce.UnreachableException(); } }
   public bool AllowsNontermination { get { Contract.Assume(false, "should not be called on NoContext"); throw new cce.UnreachableException(); } }
+  CodeGenIdGenerator ICodeContext.CodeGenIdGenerator { get; } = new();
+
   public bool AllowsAllocation => true;
 }
 
 public interface RedirectingTypeDecl : ICallable {
   string Name { get; }
 
-  IToken tok { get; }
+  string FullDafnyName { get; }
+  IOrigin Tok { get; }
+
   Attributes Attributes { get; }
   ModuleDefinition Module { get; }
   BoundVar/*?*/ Var { get; }
+  PreType BasePreType { get; }
+  Type BaseType { get; }
   Expression/*?*/ Constraint { get; }
   SubsetTypeDecl.WKind WitnessKind { get; }
   Expression/*?*/ Witness { get; }  // non-null iff WitnessKind is Compiled or Ghost
-  FreshIdGenerator IdGenerator { get; }
+  VerificationIdGenerator IdGenerator { get; }
+
+  [FilledInDuringResolution] bool ConstraintIsCompilable { get; set; }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Members/Lemma.cs b/Source/DafnyCore/AST/Members/Lemma.cs
index 6ddb886f77c..35c4e02e2e8 100644
--- a/Source/DafnyCore/AST/Members/Lemma.cs
+++ b/Source/DafnyCore/AST/Members/Lemma.cs
@@ -6,16 +6,18 @@ namespace Microsoft.Dafny;
 public class Lemma : Method {
   public override string WhatKind => "lemma";
   public override string WhatKindMentionGhost => WhatKind;
-  public Lemma(RangeToken rangeToken, Name name,
+  public Lemma(IOrigin origin, Name name,
     bool hasStaticKeyword,
     [Captured] List<TypeParameter> typeArgs,
     [Captured] List<Formal> ins, [Captured] List<Formal> outs,
-    [Captured] List<AttributedExpression> req, [Captured] Specification<FrameExpression> mod,
+    [Captured] List<AttributedExpression> req,
+    [Captured] Specification<FrameExpression> reads,
+    [Captured] Specification<FrameExpression> mod,
     [Captured] List<AttributedExpression> ens,
     [Captured] Specification<Expression> decreases,
     [Captured] BlockStmt body,
-    Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, true, typeArgs, ins, outs, req, mod, ens, decreases, body, attributes, signatureEllipsis) {
+    Attributes attributes, IOrigin signatureEllipsis)
+    : base(origin, name, hasStaticKeyword, true, typeArgs, ins, outs, req, reads, mod, ens, decreases, body, attributes, signatureEllipsis) {
   }
 
   public Lemma(Cloner cloner, Lemma lemma) : base(cloner, lemma) {
@@ -28,18 +30,19 @@ public class TwoStateLemma : Method {
   public override string WhatKind => "twostate lemma";
   public override string WhatKindMentionGhost => WhatKind;
 
-  public TwoStateLemma(RangeToken rangeToken, Name name,
+  public TwoStateLemma(IOrigin origin, Name name,
     bool hasStaticKeyword,
     [Captured] List<TypeParameter> typeArgs,
     [Captured] List<Formal> ins, [Captured] List<Formal> outs,
     [Captured] List<AttributedExpression> req,
+    [Captured] Specification<FrameExpression> reads,
     [Captured] Specification<FrameExpression> mod,
     [Captured] List<AttributedExpression> ens,
     [Captured] Specification<Expression> decreases,
     [Captured] BlockStmt body,
-    Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, true, typeArgs, ins, outs, req, mod, ens, decreases, body, attributes, signatureEllipsis) {
-    Contract.Requires(rangeToken != null);
+    Attributes attributes, IOrigin signatureEllipsis)
+    : base(origin, name, hasStaticKeyword, true, typeArgs, ins, outs, req, reads, mod, ens, decreases, body, attributes, signatureEllipsis) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(typeArgs != null);
     Contract.Requires(ins != null);
diff --git a/Source/DafnyCore/AST/Members/MemberDecl.cs b/Source/DafnyCore/AST/Members/MemberDecl.cs
index 081c33e4788..6f72e2204bd 100644
--- a/Source/DafnyCore/AST/Members/MemberDecl.cs
+++ b/Source/DafnyCore/AST/Members/MemberDecl.cs
@@ -2,11 +2,13 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using Microsoft.Dafny.Auditor;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public abstract class MemberDecl : Declaration {
+public abstract class MemberDecl : Declaration, ISymbol {
   public abstract string WhatKind { get; }
+  public string WhatKindAndName => $"{WhatKind} '{Name}'";
   public virtual string WhatKindMentionGhost => (IsGhost ? "ghost " : "") + WhatKind;
   protected bool hasStaticKeyword;
   public bool HasStaticKeyword => hasStaticKeyword;
@@ -65,9 +67,9 @@ protected MemberDecl(Cloner cloner, MemberDecl original) : base(cloner, original
     this.isGhost = original.isGhost;
   }
 
-  protected MemberDecl(RangeToken rangeToken, Name name, bool hasStaticKeyword, bool isGhost, Attributes attributes, bool isRefining)
-    : base(rangeToken, name, attributes, isRefining) {
-    Contract.Requires(rangeToken != null);
+  protected MemberDecl(IOrigin origin, Name name, bool hasStaticKeyword, bool isGhost, Attributes attributes, bool isRefining)
+    : base(origin, name, attributes, isRefining) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     this.hasStaticKeyword = hasStaticKeyword;
     this.isGhost = isGhost;
@@ -95,7 +97,8 @@ public virtual string FullName {
   public override string SanitizedName =>
     (Name == EnclosingClass.Name ? "_" : "") + base.SanitizedName;
 
-  public override string GetCompileName(DafnyOptions options) => (Name == EnclosingClass.Name ? "_" : "") + base.GetCompileName(options);
+  public override string GetCompileName(DafnyOptions options) =>
+    (Name == EnclosingClass.Name ? "_" : "") + base.GetCompileName(options);
 
   public virtual string FullSanitizedName {
     get {
@@ -103,9 +106,9 @@ public virtual string FullSanitizedName {
       Contract.Ensures(Contract.Result<string>() != null);
 
       if (Name == "requires") {
-        return Translator.Requires(((ArrowTypeDecl)EnclosingClass).Arity);
+        return BoogieGenerator.Requires(((ArrowTypeDecl)EnclosingClass).Arity);
       } else if (Name == "reads") {
-        return Translator.Reads(((ArrowTypeDecl)EnclosingClass).Arity);
+        return BoogieGenerator.Reads(((ArrowTypeDecl)EnclosingClass).Arity);
       } else {
         return EnclosingClass.FullSanitizedName + "." + SanitizedName;
       }
@@ -119,7 +122,43 @@ public override IEnumerable<Assumption> Assumptions(Declaration decl) {
       yield return a;
     }
     if (this.HasUserAttribute("only", out _)) {
-      yield return new Assumption(decl, tok, AssumptionDescription.MemberOnly);
+      yield return new Assumption(decl, Origin, AssumptionDescription.MemberOnly);
+    }
+  }
+
+  public void RecursiveCallParameters(IOrigin tok, List<TypeParameter> typeParams, List<Formal> ins,
+    Expression receiverSubst, Dictionary<IVariable, Expression> substMap,
+    out Expression receiver, out List<Expression> arguments) {
+    Contract.Requires(tok != null);
+    Contract.Requires(this != null);
+    Contract.Requires(EnclosingClass is TopLevelDeclWithMembers);
+    Contract.Requires(typeParams != null);
+    Contract.Requires(ins != null);
+    // receiverSubst is allowed to be null
+    Contract.Requires(substMap != null);
+    Contract.Ensures(Contract.ValueAtReturn(out receiver) != null);
+    Contract.Ensures(Contract.ValueAtReturn(out arguments) != null);
+
+    if (IsStatic) {
+      receiver = new StaticReceiverExpr(tok, (TopLevelDeclWithMembers)EnclosingClass, true); // this also resolves it
+    } else if (receiverSubst != null) {
+      receiver = receiverSubst;
+    } else {
+      receiver = new ImplicitThisExpr(tok);
+      receiver.Type = ModuleResolver.GetReceiverType(tok, this);  // resolve here
+    }
+
+    arguments = new List<Expression>();
+    foreach (var inFormal in ins) {
+      Expression inE;
+      if (substMap.TryGetValue(inFormal, out inE)) {
+        arguments.Add(inE);
+      } else {
+        var ie = new IdentifierExpr(inFormal.Origin, inFormal.Name);
+        ie.Var = inFormal;  // resolve here
+        ie.Type = inFormal.Type;  // resolve here
+        arguments.Add(ie);
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Members/Method.cs b/Source/DafnyCore/AST/Members/Method.cs
index d881698ab93..efb84b83cf9 100644
--- a/Source/DafnyCore/AST/Members/Method.cs
+++ b/Source/DafnyCore/AST/Members/Method.cs
@@ -1,30 +1,41 @@
 using System.Collections.Generic;
+using System.CommandLine;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using System.Numerics;
+using DafnyCore;
+using DafnyCore.Options;
 using Microsoft.Dafny.Auditor;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public class Method : MemberDecl, TypeParameter.ParentType,
-  IMethodCodeContext, ICanFormat, IHasDocstring, IHasSymbolChildren, ICanVerify {
+public class Method : MethodOrFunction, TypeParameter.ParentType,
+  IMethodCodeContext, ICanFormat, IHasDocstring, IHasSymbolChildren, ICanAutoRevealDependencies, ICanVerify {
+
+  public static readonly Option<bool> ReadsClausesOnMethods = new("--reads-clauses-on-methods",
+    "Allows reads clauses on methods (with a default of 'reads *') as well as functions."
+  );
+
+  static Method() {
+    DafnyOptions.RegisterLegacyUi(ReadsClausesOnMethods, DafnyOptions.ParseBoolean, "Language feature selection", "readsClausesOnMethods", @"
+0 (default) - Reads clauses on methods are forbidden.
+1 - Reads clauses on methods are permitted (with a default of 'reads *').".TrimStart(), defaultValue: false);
+    OptionRegistry.RegisterGlobalOption(ReadsClausesOnMethods, OptionCompatibility.CheckOptionLocalImpliesLibrary);
+  }
+
   public override IEnumerable<INode> Children => new Node[] { Body, Decreases }.Where(x => x != null).
     Concat(Ins).Concat(Outs).Concat<Node>(TypeArgs).
-    Concat(Req).Concat(Ens).Concat(Mod.Expressions);
+    Concat(Req).Concat(Ens).Concat(Reads.Expressions).Concat(Mod.Expressions);
   public override IEnumerable<INode> PreResolveChildren => Children;
-
   public override string WhatKind => "method";
   public bool SignatureIsOmitted { get { return SignatureEllipsis != null; } }
-  public readonly IToken SignatureEllipsis;
+  public readonly IOrigin SignatureEllipsis;
   public readonly bool IsByMethod;
   public bool MustReverify;
   public bool IsEntryPoint = false;
-  public readonly List<TypeParameter> TypeArgs;
-  public readonly List<Formal> Ins;
   public readonly List<Formal> Outs;
-  public readonly List<AttributedExpression> Req;
   public readonly Specification<FrameExpression> Mod;
-  public readonly List<AttributedExpression> Ens;
-  public readonly Specification<Expression> Decreases;
   [FilledInDuringResolution] public bool IsRecursive;
   [FilledInDuringResolution] public bool IsTailRecursive;
   [FilledInDuringResolution] public Function FunctionFromWhichThisIsByMethodDecl;
@@ -33,35 +44,37 @@ public class Method : MemberDecl, TypeParameter.ParentType,
   public Method Original => OverriddenMethod == null ? this : OverriddenMethod.Original;
   public override bool IsOverrideThatAddsBody => base.IsOverrideThatAddsBody && Body != null;
 
-  public bool HasPostcondition =>
-    Ens.Count > 0 || Outs.Any(f => f.Type.AsSubsetType is not null);
-
-  public bool HasPrecondition =>
-    Req.Count > 0 || Ins.Any(f => f.Type.AsSubsetType is not null);
+  public override bool HasPostcondition =>
+    Ens.Count > 0
+    // This check is incomplete, which is a bug
+    || Outs.Any(f => f.Type.AsSubsetType is not null);
 
   public override IEnumerable<Assumption> Assumptions(Declaration decl) {
     foreach (var a in base.Assumptions(this)) {
       yield return a;
     }
 
-    if (Body is null && HasPostcondition && !EnclosingClass.EnclosingModuleDefinition.IsAbstract && !HasExternAttribute) {
-      yield return new Assumption(this, tok, AssumptionDescription.NoBody(IsGhost));
-    }
-
-    if (Body is not null && HasConcurrentAttribute) {
-      yield return new Assumption(this, tok, AssumptionDescription.HasConcurrentAttribute);
+    if (Body is null && HasPostcondition && EnclosingClass.EnclosingModuleDefinition.ModuleKind == ModuleKindEnum.Concrete && !HasExternAttribute && !HasAxiomAttribute) {
+      yield return new Assumption(this, Origin, AssumptionDescription.NoBody(IsGhost));
     }
 
     if (HasExternAttribute && HasPostcondition && !HasAxiomAttribute) {
-      yield return new Assumption(this, tok, AssumptionDescription.ExternWithPostcondition);
+      yield return new Assumption(this, Origin, AssumptionDescription.ExternWithPostcondition);
     }
 
     if (HasExternAttribute && HasPrecondition && !HasAxiomAttribute) {
-      yield return new Assumption(this, tok, AssumptionDescription.ExternWithPrecondition);
+      yield return new Assumption(this, Origin, AssumptionDescription.ExternWithPrecondition);
+    }
+
+    if (Attributes.Contains(Reads.Attributes, Attributes.AssumeConcurrentAttributeName)) {
+      yield return new Assumption(this, Origin, AssumptionDescription.HasAssumeConcurrentAttribute(false));
+    }
+    if (Attributes.Contains(Mod.Attributes, Attributes.AssumeConcurrentAttributeName)) {
+      yield return new Assumption(this, Origin, AssumptionDescription.HasAssumeConcurrentAttribute(true));
     }
 
     if (AllowsNontermination) {
-      yield return new Assumption(this, tok, AssumptionDescription.MayNotTerminate);
+      yield return new Assumption(this, Origin, AssumptionDescription.MayNotTerminate);
     }
 
     foreach (var c in this.Descendants()) {
@@ -79,6 +92,9 @@ public override IEnumerable<Expression> SubExpressions {
       foreach (var e in Req) {
         yield return e.E;
       }
+      foreach (var e in Reads.Expressions) {
+        yield return e.E;
+      }
       foreach (var e in Mod.Expressions) {
         yield return e.E;
       }
@@ -97,53 +113,51 @@ void ObjectInvariant() {
     Contract.Invariant(cce.NonNullElements(Ins));
     Contract.Invariant(cce.NonNullElements(Outs));
     Contract.Invariant(cce.NonNullElements(Req));
+    Contract.Invariant(Reads != null);
     Contract.Invariant(Mod != null);
     Contract.Invariant(cce.NonNullElements(Ens));
     Contract.Invariant(Decreases != null);
   }
 
   public Method(Cloner cloner, Method original) : base(cloner, original) {
-    this.TypeArgs = cloner.CloneResolvedFields ? original.TypeArgs : original.TypeArgs.ConvertAll(cloner.CloneTypeParam);
-    this.Ins = original.Ins.ConvertAll(p => cloner.CloneFormal(p, false));
     if (original.Outs != null) {
       this.Outs = original.Outs.ConvertAll(p => cloner.CloneFormal(p, false));
     }
 
-    this.Req = original.Req.ConvertAll(cloner.CloneAttributedExpr);
+    this.Reads = cloner.CloneSpecFrameExpr(original.Reads);
     this.Mod = cloner.CloneSpecFrameExpr(original.Mod);
-    this.Decreases = cloner.CloneSpecExpr(original.Decreases);
-    this.Ens = original.Ens.ConvertAll(cloner.CloneAttributedExpr);
     this.Body = cloner.CloneMethodBody(original);
     this.SignatureEllipsis = original.SignatureEllipsis;
     this.IsByMethod = original.IsByMethod;
   }
 
-  public Method(RangeToken rangeToken, Name name,
+  public Method(IOrigin origin, Name name,
     bool hasStaticKeyword, bool isGhost,
     [Captured] List<TypeParameter> typeArgs,
     [Captured] List<Formal> ins, [Captured] List<Formal> outs,
-    [Captured] List<AttributedExpression> req, [Captured] Specification<FrameExpression> mod,
+    [Captured] List<AttributedExpression> req,
+    [Captured] Specification<FrameExpression> reads,
+    [Captured] Specification<FrameExpression> mod,
     [Captured] List<AttributedExpression> ens,
     [Captured] Specification<Expression> decreases,
     [Captured] BlockStmt body,
-    Attributes attributes, IToken signatureEllipsis, bool isByMethod = false)
-    : base(rangeToken, name, hasStaticKeyword, isGhost, attributes, signatureEllipsis != null) {
-    Contract.Requires(rangeToken != null);
+    Attributes attributes, IOrigin signatureEllipsis,
+    bool isByMethod = false)
+    : base(origin, name, hasStaticKeyword, isGhost, attributes, signatureEllipsis != null,
+      typeArgs, ins, req, ens, decreases) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
     Contract.Requires(cce.NonNullElements(ins));
     Contract.Requires(cce.NonNullElements(outs));
     Contract.Requires(cce.NonNullElements(req));
+    Contract.Requires(reads != null);
     Contract.Requires(mod != null);
     Contract.Requires(cce.NonNullElements(ens));
     Contract.Requires(decreases != null);
-    this.TypeArgs = typeArgs;
-    this.Ins = ins;
     this.Outs = outs;
-    this.Req = req;
+    this.Reads = reads;
     this.Mod = mod;
-    this.Ens = ens;
-    this.Decreases = decreases;
     Body = body;
     this.SignatureEllipsis = signatureEllipsis;
     this.IsByMethod = isByMethod;
@@ -186,9 +200,11 @@ public bool AllowsNontermination {
     }
   }
 
+  CodeGenIdGenerator ICodeContext.CodeGenIdGenerator => CodeGenIdGenerator;
+
   public override string GetCompileName(DafnyOptions options) {
     var nm = base.GetCompileName(options);
-    if (nm == Dafny.Compilers.SinglePassCompiler.DefaultNameMain && IsStatic && !IsEntryPoint) {
+    if (nm == Dafny.Compilers.SinglePassCodeGenerator.DefaultNameMain && IsStatic && !IsEntryPoint) {
       // for a static method that is named "Main" but is not a legal "Main" method,
       // change its name.
       nm = EnclosingClass.Name + "_" + nm;
@@ -207,12 +223,18 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
       formatter.SetDelimiterIndentedRegions(BodyStartTok, indentBefore);
     }
 
+    Attributes.SetIndents(Attributes, indentBefore, formatter);
+
     formatter.SetFormalsIndentation(Ins);
     formatter.SetFormalsIndentation(Outs);
     foreach (var req in Req) {
       formatter.SetAttributedExpressionIndentation(req, indentBefore + formatter.SpaceTab);
     }
 
+    foreach (var read in Reads.Expressions) {
+      formatter.SetFrameExpressionIndentation(read, indentBefore + formatter.SpaceTab);
+    }
+
     foreach (var mod in Mod.Expressions) {
       formatter.SetFrameExpressionIndentation(mod, indentBefore + formatter.SpaceTab);
     }
@@ -233,20 +255,25 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     return true;
   }
 
+  protected override bool Bodyless => Body == null;
+  protected override string TypeName => "method";
+
   /// <summary>
   /// Assumes type parameters have already been pushed
   /// </summary>
-  public void Resolve(ModuleResolver resolver) {
+  public override void Resolve(ModuleResolver resolver) {
     Contract.Requires(this != null);
     Contract.Requires(resolver.AllTypeConstraints.Count == 0);
     Contract.Ensures(resolver.AllTypeConstraints.Count == 0);
 
+    ResolveMethodOrFunction(resolver);
+
     try {
       resolver.currentMethod = this;
 
       // make note of the warnShadowing attribute
       bool warnShadowingOption = resolver.Options.WarnShadowing;  // save the original warnShadowing value
-      bool warnShadowing = false;
+      bool warnShadowing = true;
       if (Attributes.ContainsBool(Attributes, "warnShadowing", ref warnShadowing)) {
         resolver.Options.WarnShadowing = warnShadowing;  // set the value according to the attribute
       }
@@ -260,29 +287,31 @@ public void Resolve(ModuleResolver resolver) {
         resolver.scope.Push(p.Name, p);
       }
 
-      resolver.ResolveParameterDefaultValues(Ins, new ResolutionContext(this, this is TwoStateLemma));
+      var resolutionContext = new ResolutionContext(this, this is TwoStateLemma);
+      resolver.ResolveParameterDefaultValues(Ins, resolutionContext);
 
       // Start resolving specification...
       foreach (AttributedExpression e in Req) {
-        resolver.ResolveAttributes(e, new ResolutionContext(this, this is TwoStateLemma));
-        resolver.ResolveExpression(e.E, new ResolutionContext(this, this is TwoStateLemma));
+        resolver.ResolveAttributes(e, resolutionContext);
+        resolver.ResolveExpression(e.E, resolutionContext);
         Contract.Assert(e.E.Type != null);  // follows from postcondition of ResolveExpression
         resolver.ConstrainTypeExprBool(e.E, "Precondition must be a boolean (got {0})");
       }
 
-      resolver.ResolveAttributes(Mod, new ResolutionContext(this, false));
+      var context = new ResolutionContext(this, false);
+      resolver.ResolveAttributes(Reads, context);
+      foreach (FrameExpression fe in Reads.Expressions) {
+        resolver.ResolveFrameExpressionTopLevel(fe, FrameExpressionUse.Reads, this);
+      }
+
+      resolver.ResolveAttributes(Mod, context);
       foreach (FrameExpression fe in Mod.Expressions) {
         resolver.ResolveFrameExpressionTopLevel(fe, FrameExpressionUse.Modifies, this);
-        if (IsLemmaLike) {
-          resolver.reporter.Error(MessageSource.Resolver, fe.tok, "{0}s are not allowed to have modifies clauses", WhatKind);
-        } else if (IsGhost) {
-          resolver.DisallowNonGhostFieldSpecifiers(fe);
-        }
       }
 
-      resolver.ResolveAttributes(Decreases, new ResolutionContext(this, false));
+      resolver.ResolveAttributes(Decreases, context);
       foreach (Expression e in Decreases.Expressions) {
-        resolver.ResolveExpression(e, new ResolutionContext(this, this is TwoStateLemma));
+        resolver.ResolveExpression(e, resolutionContext);
         // any type is fine
       }
 
@@ -299,7 +328,7 @@ public void Resolve(ModuleResolver resolver) {
       // Don't care about any duplication errors among the out-parameters, since they have already been reported
       resolver.scope.PushMarker();
       if (this is ExtremeLemma && Outs.Count != 0) {
-        resolver.reporter.Error(MessageSource.Resolver, Outs[0].tok, "{0}s are not allowed to have out-parameters", WhatKind);
+        resolver.reporter.Error(MessageSource.Resolver, Outs[0].Origin, "{0}s are not allowed to have out-parameters", WhatKind);
       } else {
         foreach (Formal p in Outs) {
           resolver.scope.Push(p.Name, p);
@@ -308,8 +337,9 @@ public void Resolve(ModuleResolver resolver) {
 
       // ... continue resolving specification
       foreach (AttributedExpression e in Ens) {
-        resolver.ResolveAttributes(e, new ResolutionContext(this, true));
-        resolver.ResolveExpression(e.E, new ResolutionContext(this, true));
+        var ensuresContext = new ResolutionContext(this, true);
+        resolver.ResolveAttributes(e, ensuresContext);
+        resolver.ResolveExpression(e.E, ensuresContext);
         Contract.Assert(e.E.Type != null);  // follows from postcondition of ResolveExpression
         resolver.ConstrainTypeExprBool(e.E, "Postcondition must be a boolean (got {0})");
       }
@@ -343,7 +373,7 @@ public void Resolve(ModuleResolver resolver) {
       }
 
       // attributes are allowed to mention both in- and out-parameters (including the implicit _k, for greatest lemmas)
-      resolver.ResolveAttributes(this, new ResolutionContext(this, this is TwoStateLemma), true);
+      resolver.ResolveAttributes(this, resolutionContext, true);
 
       resolver.Options.WarnShadowing = warnShadowingOption; // restore the original warnShadowing value
       resolver.scope.PopMarker();  // for the out-parameters and outermost-level locals
@@ -356,22 +386,40 @@ public void Resolve(ModuleResolver resolver) {
   }
 
   public string GetTriviaContainingDocstring() {
-    IToken lastClosingParenthesis = null;
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
+    }
+
+    IOrigin lastClosingParenthesis = null;
     foreach (var token in OwnedTokens) {
       if (token.val == ")") {
         lastClosingParenthesis = token;
       }
     }
 
-    if (lastClosingParenthesis != null && lastClosingParenthesis.TrailingTrivia.Trim() != "") {
-      return lastClosingParenthesis.TrailingTrivia;
+    var tentativeTrivia = "";
+    if (lastClosingParenthesis != null) {
+      if (lastClosingParenthesis.pos < EndToken.pos) {
+        tentativeTrivia = (lastClosingParenthesis.TrailingTrivia + lastClosingParenthesis.Next.LeadingTrivia).Trim();
+      } else {
+        tentativeTrivia = lastClosingParenthesis.TrailingTrivia.Trim();
+      }
+
+      if (tentativeTrivia != "") {
+        return tentativeTrivia;
+      }
+    }
+
+    tentativeTrivia = EndToken.TrailingTrivia.Trim();
+    if (tentativeTrivia != "") {
+      return tentativeTrivia;
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    return null;
   }
 
-  public virtual DafnySymbolKind Kind => DafnySymbolKind.Method;
-  public string GetDescription(DafnyOptions options) {
+  public override SymbolKind? Kind => SymbolKind.Method;
+  public override string GetDescription(DafnyOptions options) {
     var qualifiedName = GetQualifiedName();
     var signatureWithoutReturn = $"{WhatKind} {qualifiedName}({string.Join(", ", Ins.Select(i => i.AsText()))})";
     if (Outs.Count == 0) {
@@ -393,4 +441,75 @@ public IEnumerable<ISymbol> ChildSymbols {
 
   public bool ShouldVerify => true; // This could be made more accurate
   public ModuleDefinition ContainingModule => EnclosingClass.EnclosingModuleDefinition;
+
+  public void AutoRevealDependencies(AutoRevealFunctionDependencies Rewriter, DafnyOptions Options,
+    ErrorReporter Reporter) {
+    if (Body is null) {
+      return;
+    }
+
+    object autoRevealDepsVal = null;
+    bool autoRevealDeps = Attributes.ContainsMatchingValue(Attributes, "autoRevealDependencies",
+      ref autoRevealDepsVal, new List<Attributes.MatchingValueOption> {
+        Attributes.MatchingValueOption.Bool,
+        Attributes.MatchingValueOption.Int
+      }, s => Reporter.Error(MessageSource.Rewriter, ErrorLevel.Error, Origin, s));
+
+    // Default behavior is reveal all dependencies
+    int autoRevealDepth = int.MaxValue;
+
+    if (autoRevealDeps) {
+      if (autoRevealDepsVal is false) {
+        autoRevealDepth = 0;
+      } else if (autoRevealDepsVal is BigInteger i) {
+        autoRevealDepth = (int)i;
+      }
+    }
+
+    var currentClass = EnclosingClass;
+    List<AutoRevealFunctionDependencies.RevealStmtWithDepth> addedReveals = new();
+
+    foreach (var func in Rewriter.GetEnumerator(this, currentClass, SubExpressions)) {
+      var revealStmt =
+        AutoRevealFunctionDependencies.BuildRevealStmt(func.Function, Origin, EnclosingClass.EnclosingModuleDefinition);
+
+      if (revealStmt is not null) {
+        addedReveals.Add(new AutoRevealFunctionDependencies.RevealStmtWithDepth(revealStmt, func.Depth));
+      }
+    }
+
+    if (autoRevealDepth > 0) {
+      Expression reqExpr = Expression.CreateBoolLiteral(Origin, true);
+
+      foreach (var revealStmt in addedReveals) {
+        if (revealStmt.Depth <= autoRevealDepth) {
+          if (this is Constructor c) {
+            c.BodyInit.Insert(0, revealStmt.RevealStmt);
+          } else {
+            Body.Body.Insert(0, revealStmt.RevealStmt);
+          }
+
+          reqExpr = new StmtExpr(reqExpr.Origin, revealStmt.RevealStmt, reqExpr) {
+            Type = Type.Bool
+          };
+        } else {
+          break;
+        }
+      }
+
+      if (Req.Any() || Ens.Any()) {
+        Req.Insert(0, new AttributedExpression(reqExpr));
+      }
+    }
+
+    if (addedReveals.Any()) {
+      Reporter.Message(MessageSource.Rewriter, ErrorLevel.Info, null, Origin,
+        AutoRevealFunctionDependencies.GenerateMessage(addedReveals, autoRevealDepth));
+    }
+  }
+  public string Designator => WhatKind;
+
+  public void ResolveNewOrOldPart(INewOrOldResolver resolver) {
+    ResolveMethodOrFunction(resolver);
+  }
 }
diff --git a/Source/DafnyCore/AST/Members/MethodOrFunction.cs b/Source/DafnyCore/AST/Members/MethodOrFunction.cs
new file mode 100644
index 00000000000..8421c051b8f
--- /dev/null
+++ b/Source/DafnyCore/AST/Members/MethodOrFunction.cs
@@ -0,0 +1,102 @@
+using System.Collections.Generic;
+using System.CommandLine;
+using System.Linq;
+using DafnyCore;
+using DafnyCore.Options;
+
+namespace Microsoft.Dafny;
+
+public abstract class MethodOrFunction : MemberDecl, ICodeContainer {
+  public static readonly Option<bool> AllowExternalContracts = new("--allow-external-contracts",
+    "Allow exporting callables with preconditions, and importing callables with postconditions");
+
+  static MethodOrFunction() {
+    OptionRegistry.RegisterGlobalOption(AllowExternalContracts, OptionCompatibility.OptionLibraryImpliesLocalError);
+  }
+
+  [FilledInDuringResolution]
+  public bool ContainsHide { get; set; }
+  public readonly List<TypeParameter> TypeArgs;
+  public readonly List<AttributedExpression> Req;
+  public readonly List<AttributedExpression> Ens;
+  public readonly Specification<Expression> Decreases;
+  public readonly List<Formal> Ins;
+
+  protected MethodOrFunction(IOrigin origin, Name name, bool hasStaticKeyword, bool isGhost,
+    Attributes attributes, bool isRefining, List<TypeParameter> typeArgs, List<Formal> ins,
+    List<AttributedExpression> req,
+    List<AttributedExpression> ens,
+    Specification<Expression> decreases)
+    : base(origin, name, hasStaticKeyword, isGhost, attributes, isRefining) {
+    TypeArgs = typeArgs;
+    Req = req;
+    Decreases = decreases;
+    Ens = ens;
+    Ins = ins;
+  }
+
+  protected MethodOrFunction(Cloner cloner, MethodOrFunction original) : base(cloner, original) {
+    this.TypeArgs = cloner.CloneResolvedFields ? original.TypeArgs : original.TypeArgs.ConvertAll(cloner.CloneTypeParam);
+    this.Req = original.Req.ConvertAll(cloner.CloneAttributedExpr);
+    this.Decreases = cloner.CloneSpecExpr(original.Decreases);
+    this.Ens = original.Ens.ConvertAll(cloner.CloneAttributedExpr);
+    this.Ins = original.Ins.ConvertAll(p => cloner.CloneFormal(p, false));
+    if (cloner.CloneResolvedFields) {
+      this.ContainsHide = original.ContainsHide;
+    }
+  }
+
+  protected abstract bool Bodyless { get; }
+  protected abstract string TypeName { get; }
+
+  public bool IsVirtual => EnclosingClass is TraitDecl && !IsStatic;
+  public bool IsAbstract => EnclosingClass.EnclosingModuleDefinition.ModuleKind != ModuleKindEnum.Concrete;
+
+  public virtual void Resolve(ModuleResolver resolver) {
+    ResolveMethodOrFunction(resolver);
+  }
+
+  public abstract bool HasPostcondition { get; }
+
+  public void ResolveMethodOrFunction(INewOrOldResolver resolver) {
+    var isImported = (Bodyless || !ProgramResolver.ShouldCompile(this)) && this.IsExtern(resolver.Options);
+    if (!resolver.Options.Get(AllowExternalContracts) && HasPostcondition && isImported && !HasAxiomAttribute) {
+      resolver.Reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.none, Origin,
+        $"when a {WhatKind} is imported, meaning it has no body and an {{:extern}} annotation, " +
+        $"Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). " +
+        $"To silence this warning, please add an {{:axiom}} attribute or use the option '--allow-external-contracts'.");
+    }
+
+    var isExported = !Bodyless && ProgramResolver.ShouldCompile(this) && this.IsExtern(resolver.Options);
+    if (!resolver.Options.Get(AllowExternalContracts) && HasPrecondition && !HasAxiomAttribute && isExported) {
+      resolver.Reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.none, Origin,
+        $"when a {WhatKind} is exported, meaning it has a body and an {{:extern}} annotation, " +
+        $"Dafny can not guarantee that it is called with arguments that satisfy its preconditions (its requires clauses and inputs that are subset types). " +
+        $"To silence this warning, please add an {{:axiom}} attribute or use the option '--allow-external-contracts'");
+    }
+    if (!AutoGeneratedOrigin.Is(Origin) && HasVerifyFalseAttribute) {
+      resolver.Reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.none, Origin,
+        $"The {{:verify false}} attribute should only be used during development. " +
+        $"Consider using a bodyless {WhatKind} together with the {{:axiom}} attribute instead");
+    } else if (!AutoGeneratedOrigin.Is(Origin) && Bodyless && !IsVirtual && !IsAbstract
+                 && !this.IsExtern(resolver.Options) && !this.IsExplicitAxiom()) {
+      foreach (var ensures in Ens) {
+        if (!ensures.IsExplicitAxiom() && !resolver.Options.Get(CommonOptionBag.AllowAxioms)) {
+          resolver.Reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.none, ensures.Origin,
+            $"This ensures clause is part of a bodyless {TypeName}. Add the {{:axiom}} attribute to it or the enclosing {TypeName} to suppress this warning");
+        }
+      }
+
+    }
+  }
+
+  public bool HasPrecondition =>
+    Req.Count > 0
+    // The following check is incomplete, which is a bug.
+    || Ins.Any(f => f.Type.AsSubsetType is not null);
+
+  protected MethodOrFunction(SourceOrigin tok, Name name, bool hasStaticKeyword, bool isGhost, Attributes attributes, bool isRefining) : base(tok, name, hasStaticKeyword, isGhost, attributes, isRefining) {
+  }
+
+  public Specification<FrameExpression> Reads { get; set; }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Members/Predicate.cs b/Source/DafnyCore/AST/Members/Predicate.cs
index f067aa8a4a6..7a3cb993ce4 100644
--- a/Source/DafnyCore/AST/Members/Predicate.cs
+++ b/Source/DafnyCore/AST/Members/Predicate.cs
@@ -11,12 +11,12 @@ public enum BodyOriginKind {
     Extension  // this predicate extends the definition of a predicate with a body in a module being refined
   }
   public readonly BodyOriginKind BodyOrigin;
-  public Predicate(RangeToken rangeToken, Name name, bool hasStaticKeyword, bool isGhost, bool isOpaque,
-    List<TypeParameter> typeArgs, List<Formal> formals,
+  public Predicate(IOrigin rangeOrigin, Name name, bool hasStaticKeyword, bool isGhost, bool isOpaque,
+    List<TypeParameter> typeArgs, List<Formal> ins,
     Formal result,
-    List<AttributedExpression> req, List<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
-    Expression body, BodyOriginKind bodyOrigin, IToken/*?*/ byMethodTok, BlockStmt/*?*/ byMethodBody, Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, isGhost, isOpaque, typeArgs, formals, result, Type.Bool, req, reads, ens, decreases, body, byMethodTok, byMethodBody, attributes, signatureEllipsis) {
+    List<AttributedExpression> req, Specification<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
+    Expression body, BodyOriginKind bodyOrigin, IOrigin/*?*/ byMethodTok, BlockStmt/*?*/ byMethodBody, Attributes attributes, IOrigin signatureEllipsis)
+    : base(rangeOrigin, name, hasStaticKeyword, isGhost, isOpaque, typeArgs, ins, result, Type.Bool, req, reads, ens, decreases, body, byMethodTok, byMethodBody, attributes, signatureEllipsis) {
     Contract.Requires(bodyOrigin == Predicate.BodyOriginKind.OriginalOrInherited || body != null);
     BodyOrigin = bodyOrigin;
   }
diff --git a/Source/DafnyCore/AST/Members/PrefixLemma.cs b/Source/DafnyCore/AST/Members/PrefixLemma.cs
index 0c7d2e2cb8b..fea261a5af6 100644
--- a/Source/DafnyCore/AST/Members/PrefixLemma.cs
+++ b/Source/DafnyCore/AST/Members/PrefixLemma.cs
@@ -12,11 +12,12 @@ public class PrefixLemma : Method {
 
   public readonly Formal K;
   public readonly ExtremeLemma ExtremeLemma;
-  public PrefixLemma(RangeToken rangeToken, Name name, bool hasStaticKeyword,
+  public PrefixLemma(IOrigin origin, Name name, bool hasStaticKeyword,
     List<TypeParameter> typeArgs, Formal k, List<Formal> ins, List<Formal> outs,
-    List<AttributedExpression> req, Specification<FrameExpression> mod, List<AttributedExpression> ens, Specification<Expression> decreases,
+    List<AttributedExpression> req, [Captured] Specification<FrameExpression> reads,
+    Specification<FrameExpression> mod, List<AttributedExpression> ens, Specification<Expression> decreases,
     BlockStmt body, Attributes attributes, ExtremeLemma extremeLemma)
-    : base(rangeToken, name, hasStaticKeyword, true, typeArgs, ins, outs, req, mod, ens, decreases, body, attributes, null) {
+    : base(origin, name, hasStaticKeyword, true, typeArgs, ins, outs, req, reads, mod, ens, decreases, body, attributes, null) {
     Contract.Requires(k != null);
     Contract.Requires(ins != null && 1 <= ins.Count && ins[0] == k);
     Contract.Requires(extremeLemma != null);
diff --git a/Source/DafnyCore/AST/Members/PrefixPredicate.cs b/Source/DafnyCore/AST/Members/PrefixPredicate.cs
index e2108d8267c..704aa2daa10 100644
--- a/Source/DafnyCore/AST/Members/PrefixPredicate.cs
+++ b/Source/DafnyCore/AST/Members/PrefixPredicate.cs
@@ -11,14 +11,14 @@ public class PrefixPredicate : Function {
   public override string WhatKindMentionGhost => WhatKind;
   public readonly Formal K;
   public readonly ExtremePredicate ExtremePred;
-  public PrefixPredicate(RangeToken rangeToken, Name name, bool hasStaticKeyword,
-    List<TypeParameter> typeArgs, Formal k, List<Formal> formals,
-    List<AttributedExpression> req, List<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
+  public PrefixPredicate(IOrigin rangeOrigin, Name name, bool hasStaticKeyword,
+    List<TypeParameter> typeArgs, Formal k, List<Formal> ins,
+    List<AttributedExpression> req, Specification<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
     Expression body, Attributes attributes, ExtremePredicate extremePred)
-    : base(rangeToken, name, hasStaticKeyword, true, false, typeArgs, formals, null, Type.Bool, req, reads, ens, decreases, body, null, null, attributes, null) {
+    : base(rangeOrigin, name, hasStaticKeyword, true, false, typeArgs, ins, null, Type.Bool, req, reads, ens, decreases, body, null, null, attributes, null) {
     Contract.Requires(k != null);
     Contract.Requires(extremePred != null);
-    Contract.Requires(formals != null && 1 <= formals.Count && formals[0] == k);
+    Contract.Requires(ins != null && 1 <= ins.Count && ins[0] == k);
     K = k;
     ExtremePred = extremePred;
   }
diff --git a/Source/DafnyCore/AST/Members/SpecialField.cs b/Source/DafnyCore/AST/Members/SpecialField.cs
index 7637bc8780c..1d930da163a 100644
--- a/Source/DafnyCore/AST/Members/SpecialField.cs
+++ b/Source/DafnyCore/AST/Members/SpecialField.cs
@@ -23,15 +23,15 @@ public enum ID {
   public readonly ID SpecialId;
   public readonly object IdParam;
 
-  public SpecialField(RangeToken rangeToken, string name, ID specialId, object idParam,
+  public SpecialField(IOrigin origin, string name, ID specialId, object idParam,
     bool isGhost, bool isMutable, bool isUserMutable, Type type, Attributes attributes)
-    : this(rangeToken, new Name(name), specialId, idParam, false, isGhost, isMutable, isUserMutable, type, attributes) {
+    : this(origin, new Name(origin, name), specialId, idParam, false, isGhost, isMutable, isUserMutable, type, attributes) {
   }
 
-  public SpecialField(RangeToken rangeToken, Name name, ID specialId, object idParam,
+  public SpecialField(IOrigin origin, Name name, ID specialId, object idParam,
     bool hasStaticKeyword, bool isGhost, bool isMutable, bool isUserMutable, Type type, Attributes attributes)
-    : base(rangeToken, name, hasStaticKeyword, isGhost, isMutable, isUserMutable, type, attributes) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, name, hasStaticKeyword, isGhost, isMutable, isUserMutable, type, attributes) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(!isUserMutable || isMutable);
     Contract.Requires(type != null);
@@ -65,8 +65,8 @@ public override string WhatKind {
     get { return "discriminator"; }
   }
 
-  public DatatypeDiscriminator(RangeToken rangeToken, Name name, ID specialId, object idParam, bool isGhost, Type type, Attributes attributes)
-    : base(rangeToken, name, specialId, idParam, false, isGhost, false, false, type, attributes) {
+  public DatatypeDiscriminator(IOrigin origin, Name name, ID specialId, object idParam, bool isGhost, Type type, Attributes attributes)
+    : base(origin, name, specialId, idParam, false, isGhost, false, false, type, attributes) {
   }
 }
 
@@ -81,9 +81,9 @@ void ObjectInvariant() {
     Contract.Invariant(EnclosingCtors.Count == CorrespondingFormals.Count);
   }
 
-  public DatatypeDestructor(RangeToken rangeToken, DatatypeCtor enclosingCtor, Formal correspondingFormal, Name name, string compiledName, bool isGhost, Type type, Attributes attributes)
-    : base(rangeToken, name, SpecialField.ID.UseIdParam, compiledName, false, isGhost, false, false, type, attributes) {
-    Contract.Requires(rangeToken != null);
+  public DatatypeDestructor(IOrigin origin, DatatypeCtor enclosingCtor, Formal correspondingFormal, Name name, string compiledName, bool isGhost, Type type, Attributes attributes)
+    : base(origin, name, SpecialField.ID.UseIdParam, compiledName, false, isGhost, false, false, type, attributes) {
+    Contract.Requires(origin != null);
     Contract.Requires(enclosingCtor != null);
     Contract.Requires(correspondingFormal != null);
     Contract.Requires(name != null);
diff --git a/Source/DafnyCore/AST/Members/SpecialFunction.cs b/Source/DafnyCore/AST/Members/SpecialFunction.cs
index c343938604c..bfa7bd6ba3a 100644
--- a/Source/DafnyCore/AST/Members/SpecialFunction.cs
+++ b/Source/DafnyCore/AST/Members/SpecialFunction.cs
@@ -4,11 +4,11 @@ namespace Microsoft.Dafny;
 
 public class SpecialFunction : Function, ICallable {
   readonly ModuleDefinition Module;
-  public SpecialFunction(RangeToken rangeToken, string name, ModuleDefinition module, bool hasStaticKeyword, bool isGhost,
-    List<TypeParameter> typeArgs, List<Formal> formals, Type resultType,
-    List<AttributedExpression> req, List<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
-    Expression body, Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, new Name(name), hasStaticKeyword, isGhost, false, typeArgs, formals, null, resultType, req, reads, ens, decreases, body, null, null, attributes, signatureEllipsis) {
+  public SpecialFunction(IOrigin rangeOrigin, string name, ModuleDefinition module, bool hasStaticKeyword, bool isGhost,
+    List<TypeParameter> typeArgs, List<Formal> ins, Type resultType,
+    List<AttributedExpression> req, Specification<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
+    Expression body, Attributes attributes, IOrigin signatureEllipsis)
+    : base(rangeOrigin, new Name(name), hasStaticKeyword, isGhost, false, typeArgs, ins, null, resultType, req, reads, ens, decreases, body, null, null, attributes, signatureEllipsis) {
     Module = module;
   }
   ModuleDefinition IASTVisitorContext.EnclosingModule { get { return this.Module; } }
diff --git a/Source/DafnyCore/AST/Members/TwoStateFunction.cs b/Source/DafnyCore/AST/Members/TwoStateFunction.cs
index 3cd865549a8..0a09fafc15b 100644
--- a/Source/DafnyCore/AST/Members/TwoStateFunction.cs
+++ b/Source/DafnyCore/AST/Members/TwoStateFunction.cs
@@ -6,15 +6,15 @@ namespace Microsoft.Dafny;
 public class TwoStateFunction : Function {
   public override string WhatKind => "twostate function";
   public override string WhatKindMentionGhost => WhatKind;
-  public TwoStateFunction(RangeToken rangeToken, Name name, bool hasStaticKeyword, bool isOpaque,
-    List<TypeParameter> typeArgs, List<Formal> formals, Formal result, Type resultType,
-    List<AttributedExpression> req, List<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
-    Expression body, Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, true, isOpaque, typeArgs, formals, result, resultType, req, reads, ens, decreases, body, null, null, attributes, signatureEllipsis) {
-    Contract.Requires(rangeToken != null);
+  public TwoStateFunction(IOrigin rangeOrigin, Name name, bool hasStaticKeyword, bool isOpaque,
+    List<TypeParameter> typeArgs, List<Formal> ins, Formal result, Type resultType,
+    List<AttributedExpression> req, Specification<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
+    Expression body, Attributes attributes, IOrigin signatureEllipsis)
+    : base(rangeOrigin, name, hasStaticKeyword, true, isOpaque, typeArgs, ins, result, resultType, req, reads, ens, decreases, body, null, null, attributes, signatureEllipsis) {
+    Contract.Requires(rangeOrigin != null);
     Contract.Requires(name != null);
     Contract.Requires(typeArgs != null);
-    Contract.Requires(formals != null);
+    Contract.Requires(ins != null);
     Contract.Requires(resultType != null);
     Contract.Requires(req != null);
     Contract.Requires(reads != null);
@@ -26,15 +26,15 @@ public TwoStateFunction(RangeToken rangeToken, Name name, bool hasStaticKeyword,
 
 public class TwoStatePredicate : TwoStateFunction {
   public override string WhatKind => "twostate predicate";
-  public TwoStatePredicate(RangeToken rangeToken, Name name, bool hasStaticKeyword, bool isOpaque,
-    List<TypeParameter> typeArgs, List<Formal> formals, Formal result,
-    List<AttributedExpression> req, List<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
-    Expression body, Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, hasStaticKeyword, isOpaque, typeArgs, formals, result, Type.Bool, req, reads, ens, decreases, body, attributes, signatureEllipsis) {
-    Contract.Requires(rangeToken != null);
+  public TwoStatePredicate(IOrigin rangeOrigin, Name name, bool hasStaticKeyword, bool isOpaque,
+    List<TypeParameter> typeArgs, List<Formal> ins, Formal result,
+    List<AttributedExpression> req, Specification<FrameExpression> reads, List<AttributedExpression> ens, Specification<Expression> decreases,
+    Expression body, Attributes attributes, IOrigin signatureEllipsis)
+    : base(rangeOrigin, name, hasStaticKeyword, isOpaque, typeArgs, ins, result, Type.Bool, req, reads, ens, decreases, body, attributes, signatureEllipsis) {
+    Contract.Requires(rangeOrigin != null);
     Contract.Requires(name != null);
     Contract.Requires(typeArgs != null);
-    Contract.Requires(formals != null);
+    Contract.Requires(ins != null);
     Contract.Requires(req != null);
     Contract.Requires(reads != null);
     Contract.Requires(ens != null);
diff --git a/Source/DafnyCore/AST/Modules/AbstractModuleDecl.cs b/Source/DafnyCore/AST/Modules/AbstractModuleDecl.cs
index a6087fbe549..b41e175cd54 100644
--- a/Source/DafnyCore/AST/Modules/AbstractModuleDecl.cs
+++ b/Source/DafnyCore/AST/Modules/AbstractModuleDecl.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Dafny;
 /// </summary>
 public class AbstractModuleDecl : ModuleDecl, ICanFormat {
   public readonly ModuleQualifiedId QId;
-  public readonly List<IToken> Exports; // list of exports sets
+  public readonly List<IOrigin> Exports; // list of exports sets
   public ModuleDecl CompileRoot;
   public ModuleSignature OriginalSignature;
 
@@ -20,9 +20,9 @@ public AbstractModuleDecl(Cloner cloner, AbstractModuleDecl original, ModuleDefi
     QId = new ModuleQualifiedId(cloner, original.QId);
   }
 
-  public AbstractModuleDecl(RangeToken rangeToken, ModuleQualifiedId qid, Name name,
-    ModuleDefinition parent, bool opened, List<IToken> exports, Guid cloneId)
-    : base(rangeToken, name, parent, opened, false, cloneId) {
+  public AbstractModuleDecl(DafnyOptions options, IOrigin origin, ModuleQualifiedId qid, Name name,
+    ModuleDefinition parent, bool opened, List<IOrigin> exports, Guid cloneId)
+    : base(options, origin, name, parent, opened, false, cloneId) {
     Contract.Requires(qid != null && qid.Path.Count > 0);
     Contract.Requires(exports != null);
 
diff --git a/Source/DafnyCore/AST/Modules/AccessibleMember.cs b/Source/DafnyCore/AST/Modules/AccessibleMember.cs
new file mode 100644
index 00000000000..151d038dad8
--- /dev/null
+++ b/Source/DafnyCore/AST/Modules/AccessibleMember.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// The following class stores the relative name of any declaration that is reachable from this module
+/// as a list of NameSegments, along with a flag for whether the Declaration is revealed or merely provided.
+/// For example, if "A" is a module, a function "A.f()" will be stored in the AccessibleMembers dictionary as
+/// the declaration "f" pointing to an AccessibleMember whose AccessPath list contains the NameSegments "A" and "_default".
+/// </summary>
+public class AccessibleMember {
+  public List<NameSegment> AccessPath;
+  public bool IsRevealed;
+
+  public AccessibleMember(List<NameSegment> accessPath, bool isRevealed = true) {
+    AccessPath = accessPath;
+    IsRevealed = isRevealed;
+  }
+
+  public AccessibleMember(bool isRevealed = true) {
+    AccessPath = new List<NameSegment>();
+    IsRevealed = isRevealed;
+  }
+
+  public AccessibleMember Clone() {
+    return new AccessibleMember(AccessPath.ToList(), IsRevealed);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Modules/AliasModuleDecl.cs b/Source/DafnyCore/AST/Modules/AliasModuleDecl.cs
index c2de10eb72d..acc59427b82 100644
--- a/Source/DafnyCore/AST/Modules/AliasModuleDecl.cs
+++ b/Source/DafnyCore/AST/Modules/AliasModuleDecl.cs
@@ -3,15 +3,16 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using Microsoft.CodeAnalysis;
+using SymbolKind = OmniSharp.Extensions.LanguageServer.Protocol.Models.SymbolKind;
 
 namespace Microsoft.Dafny;
 
 /// <summary>
 /// Represents "module name = path;", where name is an identifier and path is a possibly qualified name.
 /// </summary>
-public class AliasModuleDecl : ModuleDecl, IHasUsages, ICanFormat {
+public class AliasModuleDecl : ModuleDecl, ICanFormat {
   public readonly ModuleQualifiedId TargetQId; // generated by the parser, this is looked up
-  public readonly List<IToken> Exports; // list of exports sets
+  public readonly List<IOrigin> Exports; // list of exports sets
   [FilledInDuringResolution] public bool ShadowsLiteralModule;  // initialized early during Resolution (and used not long after that); true for "import opened A = A" where "A" is a literal module in the same scope
 
   public AliasModuleDecl(Cloner cloner, AliasModuleDecl original, ModuleDefinition parent)
@@ -30,9 +31,9 @@ public AliasModuleDecl(Cloner cloner, AliasModuleDecl original, ModuleDefinition
     Exports = original.Exports;
   }
 
-  public AliasModuleDecl(RangeToken rangeToken, ModuleQualifiedId path, Name name,
-    ModuleDefinition parent, bool opened, List<IToken> exports, Guid cloneId)
-    : base(rangeToken, name, parent, opened, false, cloneId) {
+  public AliasModuleDecl(DafnyOptions options, SourceOrigin origin, ModuleQualifiedId path, Name name,
+    ModuleDefinition parent, bool opened, List<IOrigin> exports, Guid cloneId)
+    : base(options, origin, name, parent, opened, false, cloneId) {
     Contract.Requires(path != null && path.Path.Count > 0);
     Contract.Requires(exports != null);
     Contract.Requires(exports.Count == 0 || path.Path.Count == 1);
@@ -41,9 +42,6 @@ public AliasModuleDecl(RangeToken rangeToken, ModuleQualifiedId path, Name name,
   }
 
   public override ModuleDefinition Dereference() { return Signature.ModuleDef; }
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return new[] { Dereference() };
-  }
 
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     if (OwnedTokens.FirstOrDefault() is { } theToken) {
@@ -52,4 +50,21 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
 
     return true;
   }
+
+  /// <summary>
+  /// If no explicit name is given for an import declaration,
+  /// Then we consider this as a reference, not a declaration, from the IDE perspective.
+  /// So any further references to the imported module then resolve directly to the module,
+  /// Not to this import declaration.
+  ///
+  /// Code wise, it might be better not to let AliasModuleDecl inherit from Declaration,
+  /// since it is not always a declaration. 
+  /// </summary>
+  public override IOrigin NavigationToken => HasAlias ? base.NavigationToken : (TargetQId.Decl?.NavigationToken ?? base.NavigationToken);
+
+  public bool HasAlias => NameNode.Origin.IsSet();
+
+  public override SymbolKind? Kind => !HasAlias ? null : base.Kind;
+
+  public override IEnumerable<INode> Children => base.Children.Concat(new INode[] { TargetQId });
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Modules/DefaultClassDecl.cs b/Source/DafnyCore/AST/Modules/DefaultClassDecl.cs
index 1ba074ffe70..5d0c4a0b474 100644
--- a/Source/DafnyCore/AST/Modules/DefaultClassDecl.cs
+++ b/Source/DafnyCore/AST/Modules/DefaultClassDecl.cs
@@ -12,7 +12,7 @@ public class DefaultClassDecl : TopLevelDeclWithMembers, RevealableTypeDecl {
   public TypeDeclSynonymInfo SynonymInfo { get; set; }
 
   public DefaultClassDecl(ModuleDefinition module, [Captured] List<MemberDecl> members)
-    : base(RangeToken.NoToken, new Name("_default"), module, new List<TypeParameter>(), members, null, false, null) {
+    : base(SourceOrigin.NoToken, new Name("_default"), module, new List<TypeParameter>(), members, null, false, null) {
     Contract.Requires(module != null);
     Contract.Requires(cce.NonNullElements(members));
     this.NewSelfSynonym();
diff --git a/Source/DafnyCore/AST/Modules/DefaultModuleDefinition.cs b/Source/DafnyCore/AST/Modules/DefaultModuleDefinition.cs
index 6fe45ed53a1..bdfc6d8b488 100644
--- a/Source/DafnyCore/AST/Modules/DefaultModuleDefinition.cs
+++ b/Source/DafnyCore/AST/Modules/DefaultModuleDefinition.cs
@@ -6,19 +6,20 @@ namespace Microsoft.Dafny;
 
 public class DefaultModuleDefinition : ModuleDefinition, ICloneable<DefaultModuleDefinition> {
   public List<Include> Includes { get; } = new();
-  public IList<Uri> RootSourceUris { get; }
 
   public DefaultModuleDefinition(Cloner cloner, DefaultModuleDefinition original) : base(cloner, original, original.NameNode) {
-    RootSourceUris = original.RootSourceUris;
   }
 
-  public DefaultModuleDefinition(IList<Uri> rootSourceUris)
-    : base(RangeToken.NoToken, new Name("_module"), new List<IToken>(), false, false,
-      null, null, null, true) {
-    RootSourceUris = rootSourceUris;
+  public DefaultModuleDefinition()
+    : base(SourceOrigin.NoToken, new Name("_module"), new List<IOrigin>(), ModuleKindEnum.Concrete, false,
+      null, null, null) {
   }
 
   public override bool IsDefaultModule => true;
+
+  public override bool TryToAvoidName => Name == "_module";
+
+  public override IEnumerable<INode> Children => Includes.Concat(base.Children);
   public override IEnumerable<INode> PreResolveChildren => Includes.Concat(base.PreResolveChildren);
   public new DefaultModuleDefinition Clone(Cloner cloner) {
     return new DefaultModuleDefinition(cloner, this);
diff --git a/Source/DafnyCore/AST/Modules/ExportSignature.cs b/Source/DafnyCore/AST/Modules/ExportSignature.cs
index 831f4c7af63..4190ca0cb61 100644
--- a/Source/DafnyCore/AST/Modules/ExportSignature.cs
+++ b/Source/DafnyCore/AST/Modules/ExportSignature.cs
@@ -4,8 +4,8 @@
 
 namespace Microsoft.Dafny;
 
-public class ExportSignature : TokenNode, IHasUsages {
-  public readonly IToken ClassIdTok;
+public class ExportSignature : NodeWithComputedRange, IHasReferences {
+  public readonly IOrigin ClassIdTok;
   public readonly bool Opaque;
   public readonly string ClassId;
   public readonly string Id;
@@ -14,31 +14,37 @@ public class ExportSignature : TokenNode, IHasUsages {
 
   [ContractInvariantMethod]
   void ObjectInvariant() {
-    Contract.Invariant(Tok != null);
+    Contract.Invariant(Origin != null);
     Contract.Invariant(Id != null);
     Contract.Invariant((ClassId != null) == (ClassIdTok != null));
   }
 
-  public ExportSignature(IToken prefixTok, string prefix, IToken idTok, string id, bool opaque) {
+  public ExportSignature(IOrigin prefixTok, string prefix, IOrigin idOrigin, string id, bool opaque) : base(idOrigin) {
     Contract.Requires(prefixTok != null);
     Contract.Requires(prefix != null);
-    Contract.Requires(idTok != null);
+    Contract.Requires(idOrigin != null);
     Contract.Requires(id != null);
-    tok = idTok;
     ClassIdTok = prefixTok;
     ClassId = prefix;
     Id = id;
     Opaque = opaque;
-    OwnedTokensCache = new List<IToken>() { Tok, prefixTok };
+    OwnedTokensCache = new List<IOrigin>() { Origin, prefixTok };
   }
 
-  public ExportSignature(IToken idTok, string id, bool opaque) {
-    Contract.Requires(idTok != null);
+  public ExportSignature(IOrigin idOrigin, string id, bool opaque) : base(idOrigin) {
+    Contract.Requires(idOrigin != null);
     Contract.Requires(id != null);
-    tok = idTok;
     Id = id;
     Opaque = opaque;
-    OwnedTokensCache = new List<IToken>() { Tok };
+    OwnedTokensCache = new List<IOrigin>() { Origin };
+  }
+
+  public ExportSignature(Cloner cloner, ExportSignature original) : base(cloner, original) {
+    Id = original.Id;
+    Opaque = original.Opaque;
+    ClassId = original.ClassId;
+    ClassIdTok = cloner.Origin(original.ClassIdTok);
+    OwnedTokensCache = new List<IOrigin>() { Origin };
   }
 
   public override string ToString() {
@@ -48,10 +54,9 @@ public override string ToString() {
     return Id;
   }
 
-  public IToken NameToken => Tok;
   public override IEnumerable<INode> Children => Enumerable.Empty<Node>();
   public override IEnumerable<INode> PreResolveChildren => Enumerable.Empty<Node>();
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return new[] { Decl };
+  public IEnumerable<Reference> GetReferences() {
+    return new[] { new Reference(Origin, Decl) };
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Modules/FileModuleDefinition.cs b/Source/DafnyCore/AST/Modules/FileModuleDefinition.cs
index 00c29a9a915..e0cbe4db640 100644
--- a/Source/DafnyCore/AST/Modules/FileModuleDefinition.cs
+++ b/Source/DafnyCore/AST/Modules/FileModuleDefinition.cs
@@ -12,9 +12,9 @@ namespace Microsoft.Dafny;
 public class FileModuleDefinition : ModuleDefinition {
   public List<Include> Includes { get; } = new();
 
-  public FileModuleDefinition(IToken token) :
-    base(token.ToRange(), new Name("_module"), new List<IToken>(),
-      false, false, null, null, null, true) {
+  public FileModuleDefinition(IOrigin token) :
+    base(token, new Name("_module"), new List<IOrigin>(),
+      ModuleKindEnum.Concrete, false, null, null, null) {
     {
     }
   }
diff --git a/Source/DafnyCore/AST/Modules/LiteralModuleDecl.cs b/Source/DafnyCore/AST/Modules/LiteralModuleDecl.cs
index a92c7d99c33..fd3a12c22ce 100644
--- a/Source/DafnyCore/AST/Modules/LiteralModuleDecl.cs
+++ b/Source/DafnyCore/AST/Modules/LiteralModuleDecl.cs
@@ -20,6 +20,9 @@ public override ModuleSignature AccessibleSignature(bool ignoreExports) {
     }
     return this.AccessibleSignature();
   }
+
+  public override bool SingleFileToken => ModuleDef.SingleFileToken;
+
   public override ModuleSignature AccessibleSignature() {
     if (DefaultExport == null) {
       if (emptySignature == null) {
@@ -39,14 +42,13 @@ public LiteralModuleDecl(Cloner cloner, LiteralModuleDecl original, ModuleDefini
     ModuleDef = newModuleDefinition;
     DefaultExport = original.DefaultExport;
     BodyStartTok = ModuleDef.BodyStartTok;
-    TokenWithTrailingDocString = ModuleDef.TokenWithTrailingDocString;
   }
 
-  public LiteralModuleDecl(ModuleDefinition module, ModuleDefinition parent, Guid cloneId)
-    : base(module.RangeToken, module.NameNode, parent, false, false, cloneId) {
+  public LiteralModuleDecl(DafnyOptions options, ModuleDefinition module, ModuleDefinition parent, Guid cloneId)
+    : base(options, module.Origin, module.NameNode, parent, false, false, cloneId) {
     ModuleDef = module;
     BodyStartTok = module.BodyStartTok;
-    TokenWithTrailingDocString = module.TokenWithTrailingDocString;
+    module.EnclosingLiteralModuleDecl = this;
   }
 
   public override object Dereference() { return ModuleDef; }
@@ -79,6 +81,9 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
       }
     }
 
+    Attributes.SetIndents(Attributes, indentBefore, formatter);
+    Attributes.SetIndents(ModuleDef.Attributes, indentBefore, formatter);
+
     foreach (var decl2 in ModuleDef.TopLevelDecls) {
       formatter.SetDeclIndentation(decl2, innerIndent);
     }
@@ -102,17 +107,18 @@ public ModuleSignature Resolve(ModuleResolver resolver, CompilationData compilat
     var module = ModuleDef;
 
     var errorCount = resolver.reporter.ErrorCount;
-    if (module.RefinementQId != null) {
-      var md = module.RefinementQId.ResolveTarget(resolver.reporter);
-      module.RefinementQId.SetTarget(md); // If module is not found, md is null and an error message has been emitted
+    if (module.Implements != null) {
+      var md = module.Implements.Target.ResolveTarget(resolver.reporter);
+      module.Implements.Target.SetTarget(md); // If module is not found, md is null and an error message has been emitted
     }
 
-    foreach (var rewriter in compilation.Rewriters) {
+    var rewriters = RewriterCollection.GetRewriters(resolver.Reporter, resolver.ProgramResolver.Program);
+    foreach (var rewriter in rewriters) {
       rewriter.PreResolve(module);
     }
 
     Signature = module.RegisterTopLevelDecls(resolver, true);
-    Signature.Refines = module.RefinementQId?.Sig;
+    Signature.Refines = module.Implements?.Target.Sig;
 
     var sig = Signature;
     // set up environment
@@ -131,7 +137,7 @@ public ModuleSignature Resolve(ModuleResolver resolver, CompilationData compilat
     tempVis.Augment(resolver.ProgramResolver.SystemModuleManager.systemNameInfo.VisibilityScope);
     Type.PushScope(tempVis);
 
-    foreach (var rewriter in compilation.Rewriters) {
+    foreach (var rewriter in rewriters) {
       if (!good || resolver.reporter.ErrorCount != preResolveErrorCount) {
         break;
       }
@@ -145,25 +151,25 @@ public ModuleSignature Resolve(ModuleResolver resolver, CompilationData compilat
 
     Type.PopScope(tempVis);
 
-    if (!good || resolver.reporter.ErrorCount > 0) {
+    if (!good || resolver.reporter.HasErrors) {
       return sig;
     }
 
     Type.PushScope(tempVis);
-    resolver.ComputeIsRecursiveBit(compilation, module);
+    resolver.ComputeIsRecursiveBit(compilation, module, rewriters);
     resolver.FillInDecreasesClauses(module);
     foreach (var iter in module.TopLevelDecls.OfType<IteratorDecl>()) {
-      resolver.reporter.Info(MessageSource.Resolver, iter.tok, Printer.IteratorClassToString(resolver.Reporter.Options, iter));
+      resolver.reporter.Info(MessageSource.Resolver, iter.Origin, Printer.IteratorClassToString(resolver.Reporter.Options, iter));
     }
 
-    foreach (var rewriter in compilation.Rewriters) {
+    foreach (var rewriter in rewriters) {
       rewriter.PostDecreasesResolve(module);
     }
 
     resolver.FillInAdditionalInformation(module);
     FuelAdjustment.CheckForFuelAdjustments(resolver.reporter, module);
 
-    foreach (var rewriter in compilation.Rewriters) {
+    foreach (var rewriter in rewriters) {
       rewriter.PostResolve(module);
     }
 
@@ -177,9 +183,20 @@ public void BindModuleNames(ProgramResolver resolver, ModuleBindings parentBindi
 
     var bindings = ModuleDef.BindModuleNames(resolver, parentBindings);
     if (!parentBindings.BindName(Name, this, bindings)) {
-      resolver.Reporter.Error(MessageSource.Resolver, tok, "Duplicate module name: {0}", Name);
+      parentBindings.TryLookup(Name, out var otherModule);
+      resolver.Reporter.Error(MessageSource.Resolver, new NestedOrigin(Origin, otherModule.Origin), "Duplicate module name: {0}", Name);
     }
   }
 
-  public IEnumerable<ISymbol> ChildSymbols => ModuleDef.ChildSymbols;
+  public IEnumerable<ISymbol> ChildSymbols => ModuleDef.TopLevelDecls.SelectMany(decl => {
+    if (decl is DefaultClassDecl defaultClassDecl) {
+      return defaultClassDecl.Members;
+    }
+
+    if (decl is ISymbol symbol) {
+      return new[] { symbol };
+    }
+
+    return Enumerable.Empty<ISymbol>();
+  });
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Modules/ModuleBindings.cs b/Source/DafnyCore/AST/Modules/ModuleBindings.cs
index 68c65c349c4..fa0fd5fac62 100644
--- a/Source/DafnyCore/AST/Modules/ModuleBindings.cs
+++ b/Source/DafnyCore/AST/Modules/ModuleBindings.cs
@@ -25,14 +25,14 @@ public bool BindName(string name, ModuleDecl subModule, ModuleBindings b) {
     }
   }
 
-  public bool TryLookup(IToken name, out ModuleDecl m) {
+  public bool TryLookup(string name, out ModuleDecl m) {
     Contract.Requires(name != null);
     return TryLookupFilter(name, out m, l => true);
   }
 
-  public bool TryLookupFilter(IToken name, out ModuleDecl m, Func<ModuleDecl, bool> filter) {
+  public bool TryLookupFilter(string name, out ModuleDecl m, Func<ModuleDecl, bool> filter) {
     Contract.Requires(name != null);
-    if (modules.TryGetValue(name.val, out m) && filter(m)) {
+    if (modules.TryGetValue(name, out m) && filter(m)) {
       return true;
     } else if (parent != null) {
       return parent.TryLookupFilter(name, out m, filter);
@@ -54,9 +54,9 @@ public ModuleBindings SubBindings(string name) {
   public bool ResolveQualifiedModuleIdRootAbstract(AbstractModuleDecl context, ModuleQualifiedId qid,
     out ModuleDecl result) {
     Contract.Assert(qid != null);
-    IToken root = qid.Path[0].StartToken;
+    IOrigin root = qid.Path[0].StartToken;
     result = null;
-    bool res = TryLookupFilter(root, out result,
+    bool res = TryLookupFilter(root.val, out result,
       m => context != m && ((context.EnclosingModuleDefinition == m.EnclosingModuleDefinition && context.Exports.Count == 0) || m is LiteralModuleDecl));
     return res;
   }
@@ -70,9 +70,9 @@ public bool ResolveQualifiedModuleIdRootAbstract(AbstractModuleDecl context, Mod
   public bool ResolveQualifiedModuleIdRootImport(AliasModuleDecl context, ModuleQualifiedId qid,
     out ModuleDecl result) {
     Contract.Assert(qid != null);
-    IToken root = qid.Path[0].StartToken;
+    IOrigin root = qid.Path[0].StartToken;
     result = null;
-    bool res = TryLookupFilter(root, out result,
+    bool res = TryLookupFilter(root.val, out result,
       m => context != m && ((context.EnclosingModuleDefinition == m.EnclosingModuleDefinition && context.Exports.Count == 0) || m is LiteralModuleDecl));
     return res;
   }
@@ -80,9 +80,9 @@ public bool ResolveQualifiedModuleIdRootImport(AliasModuleDecl context, ModuleQu
   public bool ResolveQualifiedModuleIdRootRefines(ModuleDefinition context, ModuleQualifiedId qid,
     out ModuleDecl result) {
     Contract.Assert(qid != null);
-    IToken root = qid.Path[0].StartToken;
+    IOrigin root = qid.Path[0].StartToken;
     result = null;
-    bool res = TryLookupFilter(root, out result, m => m.EnclosingModuleDefinition != context);
+    bool res = TryLookupFilter(root.val, out result, m => m.EnclosingModuleDefinition != context);
     return res;
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Modules/ModuleDecl.cs b/Source/DafnyCore/AST/Modules/ModuleDecl.cs
index cc351a33fe3..43356564d16 100644
--- a/Source/DafnyCore/AST/Modules/ModuleDecl.cs
+++ b/Source/DafnyCore/AST/Modules/ModuleDecl.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
@@ -9,6 +10,9 @@ namespace Microsoft.Dafny;
 /// Represents a submodule declaration at module level scope
 /// </summary>
 public abstract class ModuleDecl : TopLevelDecl, IHasDocstring, ISymbol {
+
+  public DafnyOptions Options { get; }
+
   /// <summary>
   /// Only equivalent between modules if one is a clone of the other.
   /// This property is used to determine if two module declarations have the same contents when doing resolution caching
@@ -36,12 +40,14 @@ public virtual ModuleSignature AccessibleSignature() {
 
   protected ModuleDecl(Cloner cloner, ModuleDecl original, ModuleDefinition parent)
     : base(cloner, original, parent) {
+    Options = original.Options;
     Opened = original.Opened;
     CloneId = original.CloneId;
   }
 
-  protected ModuleDecl(RangeToken rangeToken, Name name, ModuleDefinition parent, bool opened, bool isRefining, Guid cloneId)
-    : base(rangeToken, name, parent, new List<TypeParameter>(), null, isRefining) {
+  protected ModuleDecl(DafnyOptions options, IOrigin origin, Name name, ModuleDefinition parent, bool opened, bool isRefining, Guid cloneId)
+    : base(origin, name, parent, new List<TypeParameter>(), null, isRefining) {
+    Options = options;
     Height = -1;
     Signature = null;
     Opened = opened;
@@ -55,28 +61,28 @@ public override bool IsEssentiallyEmpty() {
   }
 
   public virtual string GetTriviaContainingDocstring() {
-    IToken candidate = null;
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
+    }
     var tokens = OwnedTokens.Any() ?
       OwnedTokens :
-      PreResolveChildren.Any() ? PreResolveChildren.First().OwnedTokens : Enumerable.Empty<IToken>();
+      PreResolveChildren.Any() ? PreResolveChildren.First().OwnedTokens : Enumerable.Empty<IOrigin>();
     foreach (var token in tokens) {
       if (token.val == "{") {
-        candidate = token.Prev;
-        if (candidate.TrailingTrivia.Trim() != "") {
-          return candidate.TrailingTrivia;
+        if ((token.Prev.TrailingTrivia + token.LeadingTrivia).Trim() is { } tentativeTrivia and not "") {
+          return tentativeTrivia;
         }
       }
     }
-
-    if (candidate == null && EndToken.TrailingTrivia.Trim() != "") {
-      return EndToken.TrailingTrivia;
+    if (EndToken.TrailingTrivia.Trim() is { } tentativeTrivia2 and not "") {
+      return tentativeTrivia2;
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    return null;
   }
 
-  public DafnySymbolKind Kind => DafnySymbolKind.Namespace;
-  public string GetDescription(DafnyOptions options) {
+  public override SymbolKind? Kind => SymbolKind.Namespace;
+  public override string GetDescription(DafnyOptions options) {
     return $"module {Name}";
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Modules/ModuleDefinition.cs b/Source/DafnyCore/AST/Modules/ModuleDefinition.cs
index 41ecbf14b2a..c604abdc537 100644
--- a/Source/DafnyCore/AST/Modules/ModuleDefinition.cs
+++ b/Source/DafnyCore/AST/Modules/ModuleDefinition.cs
@@ -1,22 +1,50 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.CommandLine;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using DafnyCore;
+using DafnyCore.Options;
 using Microsoft.Dafny.Auditor;
+using Microsoft.Dafny.Compilers;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public record PrefixNameModule(IReadOnlyList<IToken> Parts, LiteralModuleDecl Module);
+public record PrefixNameModule(DafnyOptions Options, IReadOnlyList<IOrigin> Parts, LiteralModuleDecl Module);
 
-public class ModuleDefinition : RangeNode, IDeclarationOrUsage, IAttributeBearingDeclaration, ICloneable<ModuleDefinition>, IHasSymbolChildren {
+public enum ModuleKindEnum {
+  Concrete,
+  Abstract,
+  Replaceable
+}
 
-  public IToken BodyStartTok = Token.NoToken;
-  public IToken TokenWithTrailingDocString = Token.NoToken;
+public enum ImplementationKind {
+  Refinement,
+  Replacement
+}
+
+public record Implements(ImplementationKind Kind, ModuleQualifiedId Target);
+
+public class ModuleDefinition : RangeNode, IAttributeBearingDeclaration, ICloneable<ModuleDefinition> {
+
+  public static readonly Option<bool> LegacyModuleNames = new("--legacy-module-names",
+    @"
+Generate module names in the older A_mB_mC style instead of the current A.B.C scheme".TrimStart()) {
+    IsHidden = true
+  };
+
+  static ModuleDefinition() {
+    DafnyOptions.RegisterLegacyUi(LegacyModuleNames, DafnyOptions.ParseBoolean, "Compilation options", legacyName: "legacyModuleNames", defaultValue: false);
+    OptionRegistry.RegisterOption(LegacyModuleNames, OptionScope.Translation);
+  }
+
+  public IOrigin BodyStartTok = Token.NoToken;
   public string DafnyName => NameNode.StartToken.val; // The (not-qualified) name as seen in Dafny source code
-  public readonly Name NameNode; // (Last segment of the) module name
+  public Name NameNode; // (Last segment of the) module name
 
-  public override IToken Tok => NameNode.StartToken;
+  public override bool SingleFileToken => !ResolvedPrefixNamedModules.Any();
 
   public string Name => NameNode.Value;
   public string FullDafnyName {
@@ -31,23 +59,23 @@ public string FullDafnyName {
   }
   public string FullName {
     get {
-      if (EnclosingModule == null || EnclosingModule.IsDefaultModule) {
+      if (EnclosingModule == null || EnclosingModule.TryToAvoidName) {
         return Name;
       } else {
         return EnclosingModule.FullName + "." + Name;
       }
     }
   }
-  public readonly List<IToken> PrefixIds; // The qualified module name, except the last segment when a
-                                          // nested module declaration is outside its enclosing module
+  public readonly List<IOrigin> PrefixIds; // The qualified module name, except the last segment when a
+                                           // nested module declaration is outside its enclosing module
   public ModuleDefinition EnclosingModule;  // readonly, except can be changed by resolver for prefix-named modules when the real parent is discovered
-  public readonly Attributes Attributes;
-  Attributes IAttributeBearingDeclaration.Attributes => Attributes;
-  public ModuleQualifiedId RefinementQId; // full qualified ID of the refinement parent, null if no refinement base
+  public Attributes Attributes { get; set; }
+  public string WhatKind => "module definition";
+  public readonly Implements Implements; // null if no refinement base
   public bool SuccessfullyResolved;  // set to true upon successful resolution; modules that import an unsuccessfully resolved module are not themselves resolved
-  public readonly bool IsAbstract;
+  public readonly ModuleKindEnum ModuleKind;
   public readonly bool IsFacade; // True iff this module represents a module facade (that is, an abstract interface)
-  private readonly bool IsBuiltinName; // true if this is something like _System that shouldn't have it's name mangled.
+  private bool IsBuiltinName => Name is "_System" or "_module"; // true if this is something like _System that shouldn't have it's name mangled.
 
   public DefaultClassDecl DefaultClass { get; set; }
 
@@ -56,7 +84,10 @@ public string FullName {
   public readonly List<TopLevelDecl> ResolvedPrefixNamedModules = new();
   [FilledInDuringResolution]
   public readonly List<PrefixNameModule> PrefixNamedModules = new();  // filled in by the parser; emptied by the resolver
-  public virtual IEnumerable<TopLevelDecl> TopLevelDecls => DefaultClasses.
+
+  public CallRedirector CallRedirector { get; set; }
+
+  public IEnumerable<TopLevelDecl> TopLevelDecls => DefaultClasses.
         Concat(SourceDecls).
         Concat(ResolvedPrefixNamedModules);
 
@@ -66,15 +97,23 @@ public string FullName {
       : new[] { new Pointer<TopLevelDecl>(() => DefaultClass, v => DefaultClass = (DefaultClassDecl)v) }).
     Concat(SourceDecls.ToPointers()).Concat(ResolvedPrefixNamedModules.ToPointers());
 
-  protected IEnumerable<TopLevelDecl> DefaultClasses {
+  public IEnumerable<TopLevelDecl> DefaultClasses {
     get { return DefaultClass == null ? Enumerable.Empty<TopLevelDecl>() : new TopLevelDecl[] { DefaultClass }; }
   }
 
   [FilledInDuringResolution]
   public readonly Graph<ICallable> CallGraph = new();
+
+  // This field is only populated if `defaultFunctionOpacity` is set to something other than transparent
+  [FilledInDuringResolution]
+  public readonly Graph<ICallable> InterModuleCallGraph = new();
+
   [FilledInDuringResolution]
   public int Height;  // height in the topological sorting of modules;
 
+  [FilledInDuringResolution]
+  public Dictionary<Declaration, AccessibleMember> AccessibleMembers = new();
+
   [ContractInvariantMethod]
   void ObjectInvariant() {
     Contract.Invariant(cce.NonNullElements(TopLevelDecls));
@@ -83,18 +122,15 @@ void ObjectInvariant() {
 
   public ModuleDefinition(Cloner cloner, ModuleDefinition original, Name name) : this(cloner, original) {
     NameNode = name;
-    IsBuiltinName = true;
   }
 
   public ModuleDefinition(Cloner cloner, ModuleDefinition original) : base(cloner, original) {
-    IsBuiltinName = original.IsBuiltinName;
     NameNode = original.NameNode;
-    PrefixIds = original.PrefixIds.Select(cloner.Tok).ToList();
-
+    PrefixIds = original.PrefixIds.Select(cloner.Origin).ToList();
     IsFacade = original.IsFacade;
     Attributes = original.Attributes;
-    IsAbstract = original.IsAbstract;
-    RefinementQId = original.RefinementQId == null ? null : new ModuleQualifiedId(cloner, original.RefinementQId);
+    ModuleKind = original.ModuleKind;
+    Implements = original.Implements == null ? null : original.Implements with { Target = new ModuleQualifiedId(cloner, original.Implements.Target) };
     foreach (var d in original.SourceDecls) {
       SourceDecls.Add(cloner.CloneDeclaration(d, this));
     }
@@ -110,28 +146,27 @@ public ModuleDefinition(Cloner cloner, ModuleDefinition original) : base(cloner,
     // For cloning modules into their compiled variants, we don't want to copy resolved fields, but we do need to copy this.
     // We're hoping to remove the copying of modules into compiled variants altogether,
     // and then this can be moved to inside the `if (cloner.CloneResolvedFields)` block
-    foreach (var tup in original.ResolvedPrefixNamedModules) {
-      ResolvedPrefixNamedModules.Add(cloner.CloneDeclaration(tup, this));
-    }
 
     if (cloner.CloneResolvedFields) {
+      foreach (var tup in original.ResolvedPrefixNamedModules) {
+        ResolvedPrefixNamedModules.Add(cloner.CloneDeclaration(tup, this));
+      }
+
       Height = original.Height;
     }
   }
 
-  public ModuleDefinition(RangeToken tok, Name name, List<IToken> prefixIds, bool isAbstract, bool isFacade,
-    ModuleQualifiedId refinementQId, ModuleDefinition parent, Attributes attributes,
-    bool isBuiltinName) : base(tok) {
+  public ModuleDefinition(IOrigin tok, Name name, List<IOrigin> prefixIds, ModuleKindEnum moduleKind, bool isFacade,
+    Implements implements, ModuleDefinition parent, Attributes attributes) : base(tok) {
     Contract.Requires(tok != null);
     Contract.Requires(name != null);
     this.NameNode = name;
     this.PrefixIds = prefixIds;
     this.Attributes = attributes;
     this.EnclosingModule = parent;
-    this.RefinementQId = refinementQId;
-    this.IsAbstract = isAbstract;
+    this.Implements = implements;
+    this.ModuleKind = moduleKind;
     this.IsFacade = isFacade;
-    this.IsBuiltinName = isBuiltinName;
 
     if (Name != "_System") {
       DefaultClass = new DefaultClassDecl(this, new List<MemberDecl>());
@@ -144,8 +179,15 @@ public ModuleDefinition(RangeToken tok, Name name, List<IToken> prefixIds, bool
 
   public virtual bool IsDefaultModule => false;
 
+  public virtual bool TryToAvoidName => false;
+
   private string sanitizedName = null;
 
+  public void ClearNameCache() {
+    sanitizedName = null;
+    compileName = null;
+  }
+
   public string SanitizedName {
     get {
       if (sanitizedName == null) {
@@ -167,17 +209,45 @@ public string SanitizedName {
 
   string compileName;
 
+  public ModuleDefinition GetImplementedModule() {
+    return Implements is { Kind: ImplementationKind.Replacement } ? Implements.Target.Def : null;
+  }
+
   public string GetCompileName(DafnyOptions options) {
-    if (compileName == null) {
-      var externArgs = options.DisallowExterns ? null : Attributes.FindExpressions(this.Attributes, "extern");
-      var nonExternSuffix = (options.Get(CommonOptionBag.AddCompileSuffix) && Name != "_module" && Name != "_System" ? "_Compile" : "");
-      if (externArgs != null && 1 <= externArgs.Count && externArgs[0] is StringLiteralExpr) {
-        compileName = (string)((StringLiteralExpr)externArgs[0]).Value;
-      } else if (externArgs != null) {
-        compileName = Name + nonExternSuffix;
+    if (compileName != null) {
+      return compileName;
+    }
+
+    var implemented = GetImplementedModule();
+    if (implemented != null) {
+      return implemented.GetCompileName(options);
+    }
+
+    var externArgs = options.DisallowExterns ? null : Attributes.FindExpressions(this.Attributes, "extern");
+    var nonExternSuffix = (options.Get(CommonOptionBag.AddCompileSuffix) && Name != "_module" && Name != "_System" ? "_Compile" : "");
+    if (externArgs != null && 1 <= externArgs.Count && externArgs[0] is StringLiteralExpr) {
+      compileName = (string)((StringLiteralExpr)externArgs[0]).Value;
+    } else if (externArgs != null) {
+      compileName = Name + nonExternSuffix;
+    } else {
+
+      if (IsBuiltinName) {
+        compileName = Name;
+      } else if (EnclosingModule is { TryToAvoidName: false }) {
+        if (options.Get(LegacyModuleNames)) {
+          compileName = SanitizedName;
+        } else {
+          // Include all names in the module tree path, to disambiguate when compiling
+          // a flat list of modules.
+          // Use an "underscore-escaped" character as a module name separator, since
+          // underscores are already used as escape characters in SanitizeName()
+          compileName = EnclosingModule.GetCompileName(options) + options.Backend.ModuleSeparator + NonglobalVariable.SanitizeName(Name);
+        }
       } else {
-        compileName = SanitizedName + nonExternSuffix;
+        compileName = NonglobalVariable.SanitizeName(Name);
       }
+
+      compileName += nonExternSuffix;
     }
 
     return compileName;
@@ -337,20 +407,22 @@ public bool IsEssentiallyEmptyModuleBody() {
     return TopLevelDecls.All(decl => decl.IsEssentiallyEmpty());
   }
 
-  public IToken NameToken => tok;
-  public override IEnumerable<INode> Children => (Attributes != null ?
-      new List<Node> { Attributes } :
-      Enumerable.Empty<Node>()).Concat<Node>(TopLevelDecls).
-    Concat(RefinementQId == null ? Enumerable.Empty<Node>() : new Node[] { RefinementQId });
+  public IOrigin NavigationToken => NameNode.Origin;
+  public override IEnumerable<INode> Children =>
+    Attributes.AsEnumerable().
+    Concat<Node>(DefaultClasses).
+    Concat(SourceDecls).
+    Concat(PrefixNamedModules.Any() ? PrefixNamedModules.Select(m => m.Module) : ResolvedPrefixNamedModules).
+    Concat(Implements == null ? Enumerable.Empty<Node>() : new Node[] { Implements.Target });
 
   private IEnumerable<Node> preResolveTopLevelDecls;
   private IEnumerable<Node> preResolvePrefixNamedModules;
 
   public override IEnumerable<INode> PreResolveChildren {
     get {
-      var attributes = Attributes != null ? new List<Node> { Attributes } : Enumerable.Empty<Node>();
-      return attributes.Concat(preResolveTopLevelDecls ?? TopLevelDecls).Concat(
-          (preResolvePrefixNamedModules ?? PrefixNamedModules.Select(tuple => tuple.Module)));
+      return Attributes.AsEnumerable().
+        Concat<Node>(preResolveTopLevelDecls ?? TopLevelDecls).
+        Concat(preResolvePrefixNamedModules ?? PrefixNamedModules.Select(tuple => tuple.Module));
     }
   }
 
@@ -374,33 +446,30 @@ public ModuleDefinition Clone(Cloner cloner) {
   /// resolved, a caller has to check for both a change in error count and a "false"
   /// return value.
   /// </summary>
-  public bool Resolve(ModuleSignature sig, ModuleResolver resolver, bool isAnExport = false) {
+  public bool Resolve(ModuleSignature sig, ModuleResolver resolver, string exportSetName = null) {
     Contract.Requires(resolver.AllTypeConstraints.Count == 0);
     Contract.Ensures(resolver.AllTypeConstraints.Count == 0);
 
     sig.VisibilityScope.Augment(resolver.ProgramResolver.SystemModuleManager.systemNameInfo.VisibilityScope);
     // make sure all imported modules were successfully resolved
     foreach (var d in TopLevelDecls) {
-      if (d is AliasModuleDecl || d is AbstractModuleDecl) {
-        ModuleSignature importSig;
-        if (d is AliasModuleDecl) {
-          var alias = (AliasModuleDecl)d;
-          importSig = alias.TargetQId.Root != null ? alias.TargetQId.Root.Signature : alias.Signature;
-        } else {
-          importSig = ((AbstractModuleDecl)d).OriginalSignature;
+      if (d is AliasModuleDecl importDecl) {
+        var importSig = importDecl.TargetQId.Root != null ? importDecl.TargetQId.Root.Signature : importDecl.Signature;
+        if (importSig is not { ModuleDef: { SuccessfullyResolved: true } }) {
+          return false;
         }
-
+      } else if (d is AbstractModuleDecl abstractImportDecl) {
+        var importSig = abstractImportDecl.OriginalSignature;
         if (importSig is not { ModuleDef: { SuccessfullyResolved: true } }) {
           return false;
         }
-      } else if (d is LiteralModuleDecl) {
-        var nested = (LiteralModuleDecl)d;
-        if (!nested.ModuleDef.SuccessfullyResolved) {
+      } else if (d is LiteralModuleDecl nestedModuleDecl) {
+        if (!nestedModuleDecl.ModuleDef.SuccessfullyResolved) {
           if (!IsEssentiallyEmptyModuleBody()) {
             // say something only if this will cause any testing to be omitted
-            resolver.reporter.Error(MessageSource.Resolver, nested,
+            resolver.reporter.Error(MessageSource.Resolver, nestedModuleDecl,
               "not resolving module '{0}' because there were errors in resolving its nested module '{1}'", Name,
-              nested.Name);
+              nestedModuleDecl.Name);
           }
 
           return false;
@@ -425,14 +494,118 @@ public bool Resolve(ModuleSignature sig, ModuleResolver resolver, bool isAnExpor
     resolver.scope.PopMarker();
 
     if (resolver.reporter.Count(ErrorLevel.Error) == prevErrorCount) {
-      resolver.ResolveTopLevelDecls_Core(allDeclarations, datatypeDependencies, codatatypeDependencies, Name, isAnExport);
+      resolver.ResolveTopLevelDecls_Core(allDeclarations, datatypeDependencies, codatatypeDependencies,
+        exportSetName == null ? Name : $"{Name} export {exportSetName}", exportSetName != null);
     }
 
     Type.PopScope(resolver.moduleInfo.VisibilityScope);
     resolver.moduleInfo = oldModuleInfo;
+
+
+    // Build the AccessibleMembers dictionary
+    foreach (var d in TopLevelDecls) {
+      if (d is AliasModuleDecl || d is AbstractModuleDecl) {
+        ModuleSignature importSig;
+        if (d is AliasModuleDecl alias) {
+          if (alias.TargetQId.Decl is not null) {
+            importSig = alias.TargetQId.Decl.Signature;
+          } else if (alias.TargetQId.Root is not null) {
+            importSig = alias.TargetQId.Root.Signature;
+          } else {
+            importSig = alias.Signature;
+          }
+        } else {
+          importSig = ((AbstractModuleDecl)d).OriginalSignature;
+        }
+
+        var origMod = importSig.ModuleDef;
+
+        var exports = d is AliasModuleDecl ? ((AliasModuleDecl)d).Exports : ((AbstractModuleDecl)d).Exports;
+        var exportSet = exports.Any() ? exports.First().val : null;
+
+        foreach (var (decl, accMember) in origMod.AccessibleMembers) {
+          if (isDeclExported(origMod, exportSet, decl, out var isDeclRevealed)) {
+            var newAccMember = accMember.Clone();
+
+            newAccMember.AccessPath.Insert(0, TopLevelDeclToNameSegment(d, d.Origin));
+            newAccMember.IsRevealed = newAccMember.IsRevealed && isDeclRevealed;
+            AddAccessibleMember(decl, newAccMember);
+          }
+        }
+
+        var newAccessibleMember = new AccessibleMember();
+        AddAccessibleMember(d, newAccessibleMember);
+
+      } else if (d is LiteralModuleDecl) {
+        var nested = (LiteralModuleDecl)d;
+
+        foreach (var (decl, accMember) in nested.ModuleDef.AccessibleMembers) {
+          if (isDeclExported(nested.ModuleDef, null, decl, out var isDeclRevealed)) {
+            var newAccMember = accMember.Clone();
+
+            newAccMember.AccessPath.Insert(0, TopLevelDeclToNameSegment(d, d.Origin));
+            newAccMember.IsRevealed = newAccMember.IsRevealed && isDeclRevealed;
+
+            AddAccessibleMember(decl, newAccMember);
+          }
+        }
+
+        var newAccessibleMember = new AccessibleMember();
+        AddAccessibleMember(d, newAccessibleMember);
+
+      } else if (d is TopLevelDeclWithMembers tld) {
+        var memberList = tld.Members;
+
+        foreach (var mem in memberList) {
+          var accessPath = new List<NameSegment> { TopLevelDeclToNameSegment(d, d.Origin) };
+          var newAccessibleMember = new AccessibleMember(accessPath);
+          AddAccessibleMember(mem, newAccessibleMember);
+        }
+      }
+    }
+
+    return true;
+  }
+
+  private static NameSegment TopLevelDeclToNameSegment(TopLevelDecl decl, IOrigin tok) {
+    var typeArgs = new List<Type>();
+
+    foreach (var arg in decl.TypeArgs) {
+      typeArgs.Add(new IntType());
+    }
+
+    return new NameSegment(tok, decl.Name, typeArgs);
+  }
+
+  private bool isDeclExported(ModuleDefinition moduleDefinition, string exportSetName, Declaration decl, out bool isItRevealed) {
+    isItRevealed = true;
+
+    exportSetName ??= moduleDefinition.Name;
+
+    var moduleExports = moduleDefinition.TopLevelDecls.Where(decl => decl is ModuleExportDecl && decl.Name == exportSetName);
+
+    if (!moduleExports.Any()) {
+      return true;
+    }
+
+    var exportSignatures = ((ModuleExportDecl)moduleExports.First()).Exports.Where(export => export.Decl == decl);
+
+    if (!exportSignatures.Any()) {
+      return false;
+    }
+
+    isItRevealed = !exportSignatures.First().Opaque;
     return true;
   }
 
+  private void AddAccessibleMember(Declaration accessibleDecl, AccessibleMember newVal) {
+    if (AccessibleMembers.TryGetValue(accessibleDecl, out var oldVal)) {
+      newVal = !oldVal.IsRevealed && newVal.IsRevealed ? newVal : oldVal;
+    }
+
+    AccessibleMembers[accessibleDecl] = newVal;
+  }
+
   public void ProcessPrefixNamedModules() {
     // moduleDecl.PrefixNamedModules is a list of pairs like:
     //     A.B.C  ,  module D { ... }
@@ -457,16 +630,17 @@ public void ProcessPrefixNamedModules() {
 
     // Next, add new modules for any remaining entries in "prefixNames".
     foreach (var (name, prefixNamedModules) in prefixModulesByFirstPart) {
-      var firstPartToken = prefixNamedModules.First().Parts[0];
-      var module = prefixNamedModules.First().Module;
-      var modDef = new ModuleDefinition(module.RangeToken, new Name(firstPartToken.ToRange(), name), new List<IToken>(), false,
-        false, null, this, null, false);
+      var prefixNameModule = prefixNamedModules.First();
+      var firstPartToken = prefixNameModule.Parts[0];
+      var modDef = new ModuleDefinition(SourceOrigin.NoToken, new Name(firstPartToken, name), new List<IOrigin>(), ModuleKindEnum.Concrete,
+        false, null, this, null);
       // Add the new module to the top-level declarations of its parent and then bind its names as usual
 
       // Use an empty cloneId because these are empty module declarations.
       var cloneId = Guid.Empty;
-      var subDecl = new LiteralModuleDecl(modDef, this, cloneId);
+      var subDecl = new LiteralModuleDecl(prefixNameModule.Options, modDef, this, cloneId);
       ResolvedPrefixNamedModules.Add(subDecl);
+      // only set the range on the last submodule of the chain, since the others can be part of multiple files
       ProcessPrefixNamedModules(prefixNamedModules.ConvertAll(ShortenPrefix), subDecl);
     }
   }
@@ -478,7 +652,7 @@ private static void ProcessPrefixNamedModules(List<PrefixNameModule> prefixModul
         if (prefixModule.Parts.Count == 0) {
           // change the parent, now that we have found the right parent module for the prefix-named module
           prefixModule.Module.ModuleDef.EnclosingModule = subDecl.ModuleDef;
-          var sm = new LiteralModuleDecl(prefixModule.Module.ModuleDef, subDecl.ModuleDef,
+          var sm = new LiteralModuleDecl(prefixModule.Options, prefixModule.Module.ModuleDef, subDecl.ModuleDef,
             prefixModule.Module.CloneId);
           subDecl.ModuleDef.ResolvedPrefixNamedModules.Add(sm);
         } else {
@@ -507,15 +681,15 @@ public ModuleBindings BindModuleNames(ProgramResolver resolver, ModuleBindings p
         // the add was successful
       } else {
         // there's already something with this name
-        var yes = bindings.TryLookup(subDecl.tok, out var prevDecl);
-        Contract.Assert(yes);
+        var existingModuleIsFound = bindings.TryLookup(subDecl.Name, out var prevDecl);
+        Contract.Assert(existingModuleIsFound);
         if (prevDecl is AbstractModuleDecl || prevDecl is AliasModuleDecl) {
-          resolver.Reporter.Error(MessageSource.Resolver, subDecl.tok, "Duplicate name of import: {0}", subDecl.Name);
+          resolver.Reporter.Error(MessageSource.Resolver, subDecl.Origin, "Duplicate name of import: {0}", subDecl.Name);
         } else if (subDecl is AliasModuleDecl { Opened: true } importDecl && importDecl.TargetQId.Path.Count == 1 &&
                    importDecl.Name == importDecl.TargetQId.RootName()) {
           importDecl.ShadowsLiteralModule = true;
         } else {
-          resolver.Reporter.Error(MessageSource.Resolver, subDecl.tok,
+          resolver.Reporter.Error(MessageSource.Resolver, subDecl.Origin,
             "Import declaration uses same name as a module in the same scope: {0}", subDecl.Name);
         }
       }
@@ -530,16 +704,32 @@ private static PrefixNameModule ShortenPrefix(PrefixNameModule prefixNameModule)
     return prefixNameModule with { Parts = rest };
   }
 
+  private static readonly List<(string, string)> incompatibleAttributePairs =
+    new() {
+      ("rlimit", "resource_limit")
+    };
+
+  private void CheckIncompatibleAttributes(ModuleResolver resolver, Attributes attrs) {
+    foreach (var pair in incompatibleAttributePairs) {
+      var attr1 = Attributes.Find(attrs, pair.Item1);
+      var attr2 = Attributes.Find(attrs, pair.Item2);
+      if (attr1 is not null && attr2 is not null) {
+        resolver.reporter.Error(MessageSource.Resolver, attr1.Origin,
+            $"the {pair.Item1} and {pair.Item2} attributes cannot be used together");
+      }
+    }
+  }
+
   public ModuleSignature RegisterTopLevelDecls(ModuleResolver resolver, bool useImports) {
     Contract.Requires(this != null);
     var sig = new ModuleSignature();
     sig.ModuleDef = this;
-    sig.IsAbstract = IsAbstract;
+    sig.IsAbstract = ModuleKind == ModuleKindEnum.Abstract;
     sig.VisibilityScope = new VisibilityScope();
     sig.VisibilityScope.Augment(VisibilityScope);
 
     // This is solely used to detect duplicates amongst the various e
-    ISet<string> toplevels = new HashSet<string>();
+    Dictionary<string, INode> toplevels = new();
     // Now add the things present
     var anonymousImportCount = 0;
     foreach (TopLevelDecl d in TopLevelDecls) {
@@ -563,8 +753,9 @@ public ModuleSignature RegisterTopLevelDecls(ModuleResolver resolver, bool useIm
         registerThisDecl = d;
         registerUnderThisName = string.Format("{0}#{1}", d.Name, anonymousImportCount);
         anonymousImportCount++;
-      } else if (toplevels.Contains(d.Name)) {
-        resolver.reporter.Error(MessageSource.Resolver, d, "duplicate name of top-level declaration: {0}", d.Name);
+      } else if (toplevels.TryGetValue(d.Name, out var existingTopLevel)) {
+        resolver.reporter.Error(MessageSource.Resolver, new NestedOrigin(d.Origin, existingTopLevel.Origin),
+          "duplicate name of top-level declaration: {0}", d.Name);
       } else if (d is ClassLikeDecl { NonNullTypeDecl: { } nntd }) {
         registerThisDecl = nntd;
         registerUnderThisName = d.Name;
@@ -577,7 +768,7 @@ public ModuleSignature RegisterTopLevelDecls(ModuleResolver resolver, bool useIm
       }
 
       if (registerThisDecl != null) {
-        toplevels.Add(registerUnderThisName);
+        toplevels[registerUnderThisName] = d;
         sig.TopLevels[registerUnderThisName] = registerThisDecl;
       }
 
@@ -607,14 +798,17 @@ public ModuleSignature RegisterTopLevelDecls(ModuleResolver resolver, bool useIm
 
         foreach (MemberDecl m in members.Values) {
           Contract.Assert(!m.HasStaticKeyword || Attributes.Contains(m.Attributes, "opaque_reveal"));
+
+          CheckIncompatibleAttributes(resolver, m.Attributes);
+
           if (m is Function or Method or ConstantField) {
             sig.StaticMembers[m.Name] = m;
           }
 
-          if (toplevels.Contains(m.Name)) {
-            resolver.reporter.Error(MessageSource.Resolver, m.tok, $"duplicate declaration for name {m.Name}");
+          if (toplevels.ContainsKey(m.Name)) {
+            resolver.reporter.Error(MessageSource.Resolver, m.Origin, $"duplicate declaration for name {m.Name}");
           } else {
-            toplevels.Add(m.Name);
+            toplevels.Add(m.Name, m);
           }
         }
 
@@ -650,7 +844,7 @@ public ModuleSignature RegisterTopLevelDecls(ModuleResolver resolver, bool useIm
 
             // create and add the query "method" (field, really)
             var queryName = ctor.NameNode.Append("?");
-            var query = new DatatypeDiscriminator(ctor.RangeToken, queryName, SpecialField.ID.UseIdParam, "is_" + ctor.GetCompileName(resolver.Options),
+            var query = new DatatypeDiscriminator(ctor.Origin, queryName, SpecialField.ID.UseIdParam, "is_" + ctor.GetCompileName(resolver.Options),
               ctor.IsGhost, Type.Bool, null);
             query.InheritVisibility(dt);
             query.EnclosingClass = dt; // resolve here
@@ -701,7 +895,7 @@ public ModuleSignature RegisterTopLevelDecls(ModuleResolver resolver, bool useIm
               dtor.AddAnotherEnclosingCtor(ctor, formal);
             } else {
               // either the destructor has no explicit name, or this constructor declared another destructor with this name, or no previous destructor had this name
-              dtor = new DatatypeDestructor(formal.RangeToken, ctor, formal, new Name(formal.RangeToken, formal.Name), "dtor_" + formal.CompileName,
+              dtor = new DatatypeDestructor(formal.Origin, ctor, formal, formal.NameNode, "dtor_" + formal.CompileName,
                 formal.IsGhost, formal.Type, null);
               dtor.InheritVisibility(dt);
               dtor.EnclosingClass = dt; // resolve here
@@ -738,13 +932,13 @@ public ModuleSignature RegisterTopLevelDecls(ModuleResolver resolver, bool useIm
     foreach (TopLevelDecl d in TopLevelDecls) {
       if (d is ClassLikeDecl { NonNullTypeDecl: { } nntd }) {
         var name = d.Name + "?";
-        if (toplevels.Contains(name)) {
+        if (toplevels.ContainsKey(name)) {
           resolver.reporter.Error(MessageSource.Resolver, d,
             "a module that already contains a top-level declaration '{0}' is not allowed to declare a reference type ({1}) '{2}'",
             name, d.WhatKind, d.Name);
         } else {
-          toplevels.Add(name);
-          toplevels.Add(d.Name);
+          toplevels[name] = d;
+          toplevels[d.Name] = d;
           // change the mapping of d.Name to d.NonNullTypeDecl
           sig.TopLevels[d.Name] = nntd;
           sig.TopLevels[name] = d;
@@ -773,6 +967,7 @@ private void DetermineReferenceTypes(ModuleResolver resolver, ModuleSignature si
     // In the following dictionary, a TraitDecl not being present among the keys means it has not been visited in the InheritsFromObject traversal.
     // If a TraitDecl is a key and maps to "false", then it is currently being visited.
     // If a TraitDecl is a key and maps to "true", then its .IsReferenceTypeDecl has been computed and is ready to be used.
+    var openedImports = TopLevelDecls.OfType<ModuleDecl>().Where(d => d.Opened).ToList();
     var traitsProgress = new Dictionary<TraitDecl, bool>();
     foreach (var decl in TopLevelDecls.Where(d => d is TraitDecl)) {
       // Resolve a "path" to a top-level declaration, if possible. On error, return null.
@@ -790,9 +985,22 @@ TopLevelDecl ResolveNamePath(Expression path) {
             // For "object" and other reference-type declarations from other modules, we're picking up the NonNullTypeDecl; if so, return
             // the original declaration.
             return topLevelDecl is NonNullTypeDecl nntd ? nntd.ViewAsClass : topLevelDecl;
-          } else {
-            return null;
           }
+          // Look through opened imports (which haven't yet been added to the module's signature). There may be ambiguities among the declarations
+          // of these opened imports. Still, we'll just pick the first declaration that matches, if any. If this declaration turns out to be
+          // ambiguous, then an error will be reported later; in the meantime, all that would have happened is that the resolved name path here
+          // is referring to some top-level declaration that won't accurately answer the question of whether "path" is referring to a reference
+          // type or not.
+          foreach (var importDecl in openedImports) {
+            Contract.Assert(importDecl is AliasModuleDecl or AbstractModuleDecl); // only these ModuleDecl's can be .Opened
+            if (importDecl.AccessibleSignature(false).TopLevels.TryGetValue(nameSegment.Name, out topLevelDecl)) {
+              // For "object" and other reference-type declarations from other modules, we're picking up the NonNullTypeDecl; if so, return
+              // the original declaration.
+              return topLevelDecl is NonNullTypeDecl nntd ? nntd.ViewAsClass : topLevelDecl;
+            }
+          }
+          // We didn't find "path"
+          return null;
         }
 
         // convert the ExprDotName to a list of strings
@@ -845,7 +1053,7 @@ bool InheritsFromObject(TraitDecl traitDecl) {
           }
         }
 
-        traitDecl.SetUpAsReferenceType(resolver.Options.Get(CommonOptionBag.GeneralTraits) ? inheritsFromObject : true);
+        traitDecl.SetUpAsReferenceType(resolver.Options.Get(CommonOptionBag.GeneralTraits) == CommonOptionBag.GeneralTraitsOptions.Legacy || inheritsFromObject);
         traitsProgress[traitDecl] = true; // indicate that traitDecl.IsReferenceTypeDecl can now be called
         return inheritsFromObject;
       }
@@ -855,19 +1063,8 @@ bool InheritsFromObject(TraitDecl traitDecl) {
 
   }
 
-  public IEnumerable<ISymbol> ChildSymbols => TopLevelDecls.SelectMany(decl => {
-    if (decl is DefaultClassDecl defaultClassDecl) {
-      return defaultClassDecl.Members.OfType<ISymbol>();
-    }
-
-    if (decl is ISymbol symbol) {
-      return new[] { symbol };
-    }
-
-    return Enumerable.Empty<ISymbol>();
-  });
+  public LiteralModuleDecl EnclosingLiteralModuleDecl { get; set; }
 
-  public DafnySymbolKind Kind => DafnySymbolKind.Namespace;
   public string GetDescription(DafnyOptions options) {
     return $"module {Name}";
   }
diff --git a/Source/DafnyCore/AST/Modules/ModuleExportDecl.cs b/Source/DafnyCore/AST/Modules/ModuleExportDecl.cs
index 90b55acd97d..a8f02386389 100644
--- a/Source/DafnyCore/AST/Modules/ModuleExportDecl.cs
+++ b/Source/DafnyCore/AST/Modules/ModuleExportDecl.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 using System.Security.AccessControl;
 
 namespace Microsoft.Dafny;
@@ -11,9 +12,8 @@ namespace Microsoft.Dafny;
 public class ModuleExportDecl : ModuleDecl, ICanFormat {
   public readonly bool IsDefault;
   public List<ExportSignature> Exports; // list of TopLevelDecl that are included in the export
-  public List<IToken> Extends; // list of exports that are extended
-  [FilledInDuringResolution] public readonly List<ModuleExportDecl> ExtendDecls = new List<ModuleExportDecl>();
-  [FilledInDuringResolution] public readonly HashSet<Tuple<Declaration, bool>> ExportDecls = new HashSet<Tuple<Declaration, bool>>();
+  public List<IOrigin> Extends; // list of exports that are extended
+  [FilledInDuringResolution] public readonly List<ModuleExportDecl> ExtendDecls = new();
   public bool RevealAll; // only kept for initial rewriting, then discarded
   public bool ProvideAll;
   public override IEnumerable<INode> Children => Exports;
@@ -25,19 +25,20 @@ public class ModuleExportDecl : ModuleDecl, ICanFormat {
 
   public ModuleExportDecl(Cloner cloner, ModuleExportDecl original, ModuleDefinition parent)
     : base(cloner, original, parent) {
-    Exports = original.Exports;
-    Extends = original.Extends;
+    Exports = original.Exports.Select(s => new ExportSignature(cloner, s)).ToList();
+    Extends = original.Extends.Select(cloner.Origin).ToList();
     ProvideAll = original.ProvideAll;
     RevealAll = original.RevealAll;
     IsRefining = original.IsRefining;
     IsDefault = original.IsDefault;
     ThisScope = new VisibilityScope(FullSanitizedName);
+    SetupDefaultSignature();
   }
 
-  public ModuleExportDecl(RangeToken rangeToken, Name name, ModuleDefinition parent,
-    List<ExportSignature> exports, List<IToken> extends,
+  public ModuleExportDecl(DafnyOptions options, IOrigin origin, Name name, ModuleDefinition parent,
+    List<ExportSignature> exports, List<IOrigin> extends,
     bool provideAll, bool revealAll, bool isDefault, bool isRefining, Guid cloneId)
-    : base(rangeToken, name, parent, false, isRefining, cloneId) {
+    : base(options, origin, name, parent, false, isRefining, cloneId) {
     Contract.Requires(exports != null);
     IsDefault = isDefault;
     Exports = exports;
@@ -45,13 +46,14 @@ public ModuleExportDecl(RangeToken rangeToken, Name name, ModuleDefinition paren
     ProvideAll = provideAll;
     RevealAll = revealAll;
     ThisScope = new VisibilityScope(this.FullSanitizedName);
+    SetupDefaultSignature();
   }
 
   public void SetupDefaultSignature() {
     Contract.Requires(this.Signature == null);
     var sig = new ModuleSignature();
     sig.ModuleDef = this.EnclosingModuleDefinition;
-    sig.IsAbstract = this.EnclosingModuleDefinition.IsAbstract;
+    sig.IsAbstract = this.EnclosingModuleDefinition.ModuleKind == ModuleKindEnum.Abstract;
     sig.VisibilityScope = new VisibilityScope();
     sig.VisibilityScope.Augment(ThisScope);
     this.Signature = sig;
@@ -96,10 +98,25 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
   }
 
   public override string GetTriviaContainingDocstring() {
-    if (Tok.TrailingTrivia.Trim() != "") {
-      return Tok.TrailingTrivia;
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    var tentativeTrivia = "";
+    if (Center.pos < EndToken.pos) {
+      tentativeTrivia = (Center.TrailingTrivia + Center.Next?.LeadingTrivia).Trim();
+    } else {
+      tentativeTrivia = Center.TrailingTrivia.Trim();
+    }
+    if (tentativeTrivia != "") {
+      return tentativeTrivia;
+    }
+
+    tentativeTrivia = EndToken.TrailingTrivia.Trim();
+    if (tentativeTrivia != "") {
+      return tentativeTrivia;
+    }
+
+    return null;
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Modules/ModuleQualifiedId.cs b/Source/DafnyCore/AST/Modules/ModuleQualifiedId.cs
index 0fe70257351..190cfccd4b9 100644
--- a/Source/DafnyCore/AST/Modules/ModuleQualifiedId.cs
+++ b/Source/DafnyCore/AST/Modules/ModuleQualifiedId.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Dafny;
 
-public class ModuleQualifiedId : Node, IHasUsages {
+public class ModuleQualifiedId : Node, IHasReferences {
   public readonly List<Name> Path; // Path != null && Path.Count > 0
 
   // The following are filled in during resolution
@@ -28,13 +28,16 @@ public ModuleQualifiedId(List<Name> path) {
 
   public ModuleQualifiedId(Cloner cloner, ModuleQualifiedId original) {
     Path = original.Path.Select(n => n.Clone(cloner)).ToList();
+    if (cloner.CloneResolvedFields) {
+      Root = original.Root;
+    }
   }
 
   public string RootName() {
     return Path[0].Value;
   }
 
-  public IToken RootToken() {
+  public IOrigin RootToken() {
     return Path[0].StartToken;
   }
 
@@ -59,19 +62,20 @@ public void SetTarget(ModuleDecl m) {
     }
   }
 
-  public override IToken Tok => Path.Last().Tok;
   public override IEnumerable<INode> Children => Enumerable.Empty<Node>();
   public override IEnumerable<INode> PreResolveChildren => Children;
 
-  public override RangeToken RangeToken {
-    get => new(Path.First().StartToken, Path.Last().EndToken);
-    set => throw new NotSupportedException();
+  public override IOrigin Origin {
+    get => new SourceOrigin(Path.First().StartToken, Path.Last().EndToken, Path.Last().Center);
   }
 
-  public IToken NameToken => Path.Last().StartToken;
 
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return Enumerable.Repeat(Decl, 1);
+  public IEnumerable<Reference> GetReferences() {
+    // Normally the target should already have been resolved, but in certain conditions like an unused alias module decl,
+    // Decl might not be set yet so we need to resolve it here.
+
+    var reference = new Reference(Path.Last().StartToken, ResolveTarget(new ErrorReporterSink(DafnyOptions.Default)));
+    return Enumerable.Repeat(reference, 1);
   }
 
   /// <summary>
@@ -92,6 +96,10 @@ public ModuleDecl ResolveTarget(ErrorReporter reporter) {
   }
 
   private ModuleDecl ResolveTargetUncached(ErrorReporter reporter) {
+    if (Root == null) {
+      return null;
+    }
+
     var decl = Root;
     for (int k = 1; k < Path.Count; k++) {
       ModuleSignature p;
diff --git a/Source/DafnyCore/AST/Modules/ScopeCloner.cs b/Source/DafnyCore/AST/Modules/ScopeCloner.cs
index 8d459db5384..6147d1301af 100644
--- a/Source/DafnyCore/AST/Modules/ScopeCloner.cs
+++ b/Source/DafnyCore/AST/Modules/ScopeCloner.cs
@@ -95,7 +95,7 @@ public override TopLevelDecl CloneDeclaration(TopLevelDecl d, ModuleDefinition n
       var characteristics = TypeParameter.GetExplicitCharacteristics(d);
       var members = based is TopLevelDeclWithMembers tm ? tm.Members : new List<MemberDecl>();
       // copy the newParent traits only if "d" is already an AbstractTypeDecl and is being export-revealed
-      var otd = new AbstractTypeDecl(Range(d.RangeToken), d.NameNode.Clone(this), newParent, characteristics, tps,
+      var otd = new AbstractTypeDecl(Origin(d.Origin), d.NameNode.Clone(this), newParent, characteristics, tps,
         new List<Type>(), // omit the newParent traits
         members, CloneAttributes(d.Attributes), d.IsRefining);
       based = otd;
@@ -114,7 +114,7 @@ public override Field CloneField(Field f) {
     if (f is ConstantField { Rhs: not null } cf && !RevealedInScope(f)) {
       // We erase the RHS value. While we do that, we must also make sure the declaration does have a type, so instead of
       // cloning cf.Type, we assume "f" has been resolved and clone cf.Type.NormalizeExpandKeepConstraints().
-      return new ConstantField(Range(cf.RangeToken), cf.NameNode.Clone(this), null, cf.HasStaticKeyword, cf.IsGhost, cf.IsOpaque, CloneType(cf.Type.NormalizeExpandKeepConstraints()), CloneAttributes(cf.Attributes));
+      return new ConstantField(Origin(cf.Origin), cf.NameNode.Clone(this), null, cf.HasStaticKeyword, cf.IsGhost, cf.IsOpaque, CloneType(cf.Type.NormalizeExpandKeepConstraints()), CloneAttributes(cf.Attributes));
     }
     return base.CloneField(f);
   }
@@ -126,7 +126,7 @@ public override Function CloneFunction(Function f, string newName = null) {
       Contract.Assert(basef.Body != null); // a function-by-method has a nonempty .Body
       if (RevealedInScope(f)) {
         // For an "export reveals", use an empty (but not absent) by-method part.
-        basef.ByMethodBody = new BlockStmt(basef.ByMethodBody.RangeToken, new List<Statement>());
+        basef.ByMethodBody = new BlockStmt(basef.ByMethodBody.Origin, new List<Statement>());
       } else {
         // For an "export provides", remove the by-method part altogether.
         basef.ByMethodTok = null;
diff --git a/Source/DafnyCore/AST/OriginWrapper.cs b/Source/DafnyCore/AST/OriginWrapper.cs
new file mode 100644
index 00000000000..dbd8e5e7d3d
--- /dev/null
+++ b/Source/DafnyCore/AST/OriginWrapper.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public abstract class OriginWrapper : IOrigin {
+
+  public readonly IOrigin WrappedToken;
+  protected OriginWrapper(IOrigin wrappedToken) {
+    Contract.Requires(wrappedToken != null);
+    WrappedToken = wrappedToken;
+  }
+
+  public abstract IOrigin WithVal(string newVal);
+  public virtual bool IsCopy => WrappedToken.IsCopy;
+
+  public virtual int col {
+    get { return WrappedToken.col; }
+    set { WrappedToken.col = value; }
+  }
+
+  public virtual bool IsInherited(ModuleDefinition m) {
+    return WrappedToken.IsInherited(m);
+  }
+
+  public virtual bool InclusiveEnd => WrappedToken.InclusiveEnd;
+  public virtual bool IncludesRange => WrappedToken.IncludesRange;
+  public string ActualFilename => WrappedToken.ActualFilename;
+
+  public virtual string Filepath => WrappedToken.Filepath;
+
+  public Uri Uri => WrappedToken.Uri;
+
+  public virtual Token StartToken => WrappedToken.StartToken;
+  public virtual Token EndToken => WrappedToken.EndToken;
+  public virtual Token Center => WrappedToken.Center;
+
+  public bool IsValid {
+    get { return WrappedToken.IsValid; }
+  }
+
+  public virtual bool IsSourceToken => false;
+
+  public int kind {
+    get { return WrappedToken.kind; }
+    set { WrappedToken.kind = value; }
+  }
+  public virtual int line {
+    get { return WrappedToken.line; }
+    set { WrappedToken.line = value; }
+  }
+  public virtual int pos {
+    get { return WrappedToken.pos; }
+    set { WrappedToken.pos = value; }
+  }
+
+  public virtual string val {
+    get { return WrappedToken.val; }
+    set { WrappedToken.val = value; }
+  }
+  public virtual string LeadingTrivia {
+    get { return WrappedToken.LeadingTrivia; }
+    set { throw new NotSupportedException(); }
+  }
+  public virtual string TrailingTrivia {
+    get { return WrappedToken.TrailingTrivia; }
+    set { throw new NotSupportedException(); }
+  }
+  public virtual Token Next {
+    get { return WrappedToken.Next; }
+    set { throw new NotSupportedException(); }
+  }
+  public virtual Token Prev {
+    get { return WrappedToken.Prev; }
+    set { throw new NotSupportedException(); }
+  }
+
+  public int CompareTo(IOrigin other) {
+    return WrappedToken.CompareTo(other);
+  }
+
+  public int CompareTo(Boogie.IToken other) {
+    return WrappedToken.CompareTo(other);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Program.cs b/Source/DafnyCore/AST/Program.cs
index 6b7a4e765b1..4c0cd63525a 100644
--- a/Source/DafnyCore/AST/Program.cs
+++ b/Source/DafnyCore/AST/Program.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Dafny;
 
-public class Program : TokenNode {
+public class Program : NodeWithComputedRange {
   public CompilationData Compilation { get; }
 
   [ContractInvariantMethod]
@@ -15,7 +15,13 @@ void ObjectInvariant() {
     Contract.Invariant(DefaultModule != null);
   }
 
+  public bool HasParseErrors { get; set; }
   public readonly string FullName;
+  /// <summary>
+  /// If this is a placeholder module, code generation will look for a unique module that replaces this one,
+  /// and use it to set this field. 
+  /// </summary>
+  public Dictionary<ModuleDefinition, ModuleDefinition> Replacements = new();
 
   // Resolution essentially flattens the module hierarchy, for
   // purposes of translation and compilation.
@@ -31,6 +37,26 @@ void ObjectInvariant() {
   public DafnyOptions Options => Reporter.Options;
   public ErrorReporter Reporter { get; set; }
 
+  public ProofDependencyManager ProofDependencyManager { get; set; } = new();
+
+  /// <summary>
+  /// Serializing the state of the Program passed to this backend,
+  /// after resolution, can be problematic.
+  /// If nothing else, very early on in the resolution process
+  /// we create explicit module definitions for implicit ones appearing
+  /// in qualified names such as `module A.B.C { ... }`,
+  /// and this means that multiple .doo files would then not be able to
+  /// share these prefixes without hitting duplicate name errors.
+  ///
+  /// Instead we serialize the state of the program immediately after parsing.
+  /// See also ProgramParser.ParseFiles().
+  /// 
+  /// This could be captured somewhere else, such as on the Program itself,
+  /// if having this state here hampers reuse in the future,
+  /// especially parallel processing.
+  /// </summary>
+  public Program AfterParsingClone { get; set; }
+
   public Program(string name, [Captured] LiteralModuleDecl module, [Captured] SystemModuleManager systemModuleManager, ErrorReporter reporter,
     CompilationData compilation) {
     Contract.Requires(name != null);
@@ -43,6 +69,20 @@ public Program(string name, [Captured] LiteralModuleDecl module, [Captured] Syst
     Compilation = compilation;
   }
 
+  public Program(Cloner cloner, Program original) {
+    FullName = original.FullName;
+    DefaultModule = new LiteralModuleDecl(cloner, original.DefaultModule, original.DefaultModule.EnclosingModuleDefinition);
+    Files = original.Files;
+    SystemModuleManager = original.SystemModuleManager;
+    Reporter = original.Reporter;
+    Compilation = original.Compilation;
+    HasParseErrors = original.HasParseErrors;
+
+    if (cloner.CloneResolvedFields) {
+      throw new NotImplementedException();
+    }
+  }
+
   //Set appropriate visibilty before presenting module
   public IEnumerable<ModuleDefinition> Modules() {
 
@@ -70,28 +110,17 @@ public string Name {
 
   /// Get the first token that is in the same file as the DefaultModule.RootToken.FileName
   /// (skips included tokens)
-  public IToken GetFirstTopLevelToken() {
-    var rootToken = DefaultModuleDef.StartToken;
-    if (rootToken.Next == null) {
-      return null;
-    }
-
-    var firstToken = rootToken;
-    // We skip all included files
-    while (firstToken is { Next: { } } && firstToken.Next.Filepath != rootToken.Filepath) {
-      firstToken = firstToken.Next;
-    }
-
-    if (firstToken == null || firstToken.kind == 0) {
-      return null;
-    }
+  public Token GetStartOfFirstFileToken() {
+    return GetFirstTokenForUri(Compilation.RootSourceUris[0]);
+  }
 
-    return firstToken;
+  public Token GetFirstTokenForUri(Uri uri) {
+    return this.FindNodesInUris(uri).MinBy(n => n.Origin.StartToken.pos)?.StartToken;
   }
 
   public override IEnumerable<INode> Children => new[] { DefaultModule };
 
-  public override IEnumerable<INode> PreResolveChildren => Children;
+  public override IEnumerable<INode> PreResolveChildren => DefaultModuleDef.Includes.Concat<INode>(Files);
 
   public override IEnumerable<Assumption> Assumptions(Declaration decl) {
     return Modules().SelectMany(m => m.Assumptions(decl));
diff --git a/Source/DafnyCore/AST/ShouldCompileOrVerify.cs b/Source/DafnyCore/AST/ShouldCompileOrVerify.cs
index bd461007178..55273bcc3c1 100644
--- a/Source/DafnyCore/AST/ShouldCompileOrVerify.cs
+++ b/Source/DafnyCore/AST/ShouldCompileOrVerify.cs
@@ -13,7 +13,10 @@ public static bool ShouldCompile(this ModuleDefinition module, CompilationData p
     }
 
     if (module.FullName == "_System") {
-      return true;
+      return program.Options.SystemModuleTranslationMode != CommonOptionBag.SystemModuleMode.Omit;
+    }
+    if (program.Options.SystemModuleTranslationMode == CommonOptionBag.SystemModuleMode.OmitAllOtherModules) {
+      return false;
     }
 
     if (module is DefaultModuleDefinition) {
@@ -21,18 +24,25 @@ public static bool ShouldCompile(this ModuleDefinition module, CompilationData p
       // https://github.com/dafny-lang/dafny/issues/4009
       return true;
     }
-    return program.UrisToCompile.Contains(module.Tok.Uri);
+
+    if (program.Options.Backend?.TargetId != "lib") {
+      if (!ProgramResolver.ShouldCompile(module)) {
+        return false;
+      }
+    }
+
+    return program.UrisToCompile.Contains(module.Origin.Uri);
   }
 
   public static bool ShouldVerify(this INode declaration, CompilationData compilation) {
-    if (declaration.Tok == Token.NoToken) {
+    if (ReferenceEquals(declaration.Origin, Token.NoToken)) {
       // Required for DefaultModuleDefinition.
       return true;
     }
     if (compilation.UrisToVerify == null) {
       compilation.UrisToVerify = ComputeUrisToVerify(compilation);
     }
-    if (!compilation.UrisToVerify.Contains(declaration.Tok.Uri)) {
+    if (!compilation.UrisToVerify.Contains(declaration.Origin.Uri)) {
       return false;
     }
 
@@ -40,11 +50,11 @@ public static bool ShouldVerify(this INode declaration, CompilationData compilat
       return true;
     }
 
-    return !declaration.Tok.FromIncludeDirective(compilation);
+    return !declaration.Origin.FromIncludeDirective(compilation);
   }
 
-  public static bool FromIncludeDirective(this IToken token, CompilationData outerModule) {
-    if (token is RefinementToken) {
+  public static bool FromIncludeDirective(this IOrigin token, CompilationData outerModule) {
+    if (token is RefinementOrigin) {
       return false;
     }
 
@@ -60,7 +70,7 @@ public static bool FromIncludeDirective(this IToken token, CompilationData outer
     return true;
   }
 
-  public static bool FromIncludeDirective(this IToken token, Program program) {
+  public static bool FromIncludeDirective(this IOrigin token, Program program) {
     return token.FromIncludeDirective(program.Compilation);
   }
 
diff --git a/Source/DafnyCore/AST/SourceOrigin.cs b/Source/DafnyCore/AST/SourceOrigin.cs
new file mode 100644
index 00000000000..c0660132417
--- /dev/null
+++ b/Source/DafnyCore/AST/SourceOrigin.cs
@@ -0,0 +1,135 @@
+#nullable enable
+using System;
+using System.Collections;
+using System.Text;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+public class SourceOrigin : IOrigin, IComparable<SourceOrigin> {
+  public Uri Uri => Center.Uri;
+
+  public Token StartToken { get; }
+
+  public Token EndToken => endToken ?? StartToken;
+
+  public bool InclusiveEnd => endToken != null;
+  public bool IncludesRange => true;
+
+  public SourceOrigin(Token startToken, Token? endToken, Token? center = null) {
+    this.endToken = endToken;
+    StartToken = startToken;
+    Center = center ?? startToken;
+  }
+
+  public int CompareTo(IToken? other) {
+    if (other is IOrigin otherOrigin) {
+      int result = StartToken.CompareTo(otherOrigin.StartToken);
+      if (result == 0) {
+        result = EndToken.CompareTo(otherOrigin.EndToken);
+      }
+
+      return result;
+    }
+
+    return 1;
+  }
+
+  public override bool Equals(object? obj) {
+    if (obj is SourceOrigin other) {
+      return StartToken.Equals(other.StartToken) && EndToken.Equals(other.EndToken);
+    }
+    return false;
+  }
+
+  public override int GetHashCode() {
+    return HashCode.Combine(StartToken.GetHashCode(), EndToken.GetHashCode());
+  }
+
+  public bool IsInherited(ModuleDefinition m) {
+    return false;
+  }
+
+  public string PrintOriginal() {
+    var token = StartToken;
+    var originalString = new StringBuilder();
+    originalString.Append(token.val);
+    while (token.Next != null && token.pos < EndToken.pos) {
+      originalString.Append(token.TrailingTrivia);
+      token = token.Next;
+      originalString.Append(token.LeadingTrivia);
+      originalString.Append(token.val);
+    }
+
+    return originalString.ToString();
+  }
+
+  public int Length() {
+    return EndToken.pos - StartToken.pos;
+  }
+
+  // TODO rename to Generated, and Token.NoToken to Token.Generated, and remove AutoGeneratedToken.
+  public static IOrigin NoToken => Token.NoToken;
+  private readonly Token? endToken;
+
+  public Token Center {
+    get;
+  }
+  public string TrailingTrivia {
+    get => Center.TrailingTrivia;
+    set => throw new InvalidOperationException();
+  }
+
+  public string LeadingTrivia {
+    get => Center.LeadingTrivia;
+    set => throw new InvalidOperationException();
+  }
+
+  public Token Next {
+    get => Center.Next;
+    set => throw new InvalidOperationException();
+  }
+
+  public Token Prev {
+    get => Center.Prev;
+    set => throw new InvalidOperationException();
+  }
+
+  public IOrigin WithVal(string newVal) {
+    throw new NotImplementedException();
+  }
+
+  public bool IsCopy => false;
+
+  public bool IsSourceToken => !ReferenceEquals(this, NoToken);
+  public int kind {
+    get => Center.kind;
+    set => throw new NotImplementedException();
+  }
+
+  public int pos {
+    get => Center.pos;
+    set => throw new NotImplementedException();
+  }
+
+  public int col {
+    get => Center.col;
+    set => throw new NotImplementedException();
+  }
+
+  public int line {
+    get => Center.line;
+    set => throw new NotImplementedException();
+  }
+
+  public string val {
+    get => Center.val;
+    set => throw new InvalidOperationException();
+  }
+
+  public bool IsValid => true;
+
+  public int CompareTo(SourceOrigin? other) {
+    throw new NotImplementedException();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Assignment/AssignOrReturnStmt.cs b/Source/DafnyCore/AST/Statements/Assignment/AssignOrReturnStmt.cs
index af6ad71290d..3007867104d 100644
--- a/Source/DafnyCore/AST/Statements/Assignment/AssignOrReturnStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Assignment/AssignOrReturnStmt.cs
@@ -5,24 +5,18 @@
 
 namespace Microsoft.Dafny;
 
-public class AssignOrReturnStmt : ConcreteUpdateStatement, ICloneable<AssignOrReturnStmt>, ICanResolve {
+/// <summary>
+/// Parsed from ":-"
+/// </summary>
+public class AssignOrReturnStmt : ConcreteAssignStatement, ICloneable<AssignOrReturnStmt>, ICanResolve {
   public readonly ExprRhs Rhs; // this is the unresolved RHS, and thus can also be a method call
   public readonly List<AssignmentRhs> Rhss;
   public readonly AttributedToken KeywordToken;
-  [FilledInDuringResolution] public readonly List<Statement> ResolvedStatements = new List<Statement>();
+  [FilledInDuringResolution] public readonly List<Statement> ResolvedStatements = new();
   public override IEnumerable<Statement> SubStatements => ResolvedStatements;
-  public override IToken Tok {
-    get {
-      var result = Rhs.StartToken.Prev;
-      if (char.IsLetter(result.val[0])) {
-        // Jump to operator if we're on an assume/expect/assert keyword.
-        result = result.Prev;
-      }
-      return result;
-    }
-  }
 
   public override IEnumerable<INode> Children => ResolvedStatements;
+
   public override IEnumerable<Statement> PreResolveSubStatements => Enumerable.Empty<Statement>();
 
   [ContractInvariantMethod]
@@ -45,13 +39,13 @@ public AssignOrReturnStmt(Cloner cloner, AssignOrReturnStmt original) : base(clo
     KeywordToken = cloner.AttributedTok(original.KeywordToken);
 
     if (cloner.CloneResolvedFields) {
-      ResolvedStatements = original.ResolvedStatements.Select(cloner.CloneStmt).ToList();
+      ResolvedStatements = original.ResolvedStatements.Select(stmt => cloner.CloneStmt(stmt, false)).ToList();
     }
   }
 
-  public AssignOrReturnStmt(RangeToken rangeToken, List<Expression> lhss, ExprRhs rhs, AttributedToken keywordToken, List<AssignmentRhs> rhss)
-    : base(rangeToken, lhss) {
-    Contract.Requires(rangeToken != null);
+  public AssignOrReturnStmt(IOrigin origin, List<Expression> lhss, ExprRhs rhs, AttributedToken keywordToken, List<AssignmentRhs> rhss)
+    : base(origin, lhss) {
+    Contract.Requires(origin != null);
     Contract.Requires(lhss != null);
     Contract.Requires(lhss.Count <= 1);
     Contract.Requires(rhs != null);
@@ -66,7 +60,7 @@ public override IEnumerable<Expression> PreResolveSubExpressions {
       foreach (var e in base.SpecificationSubExpressions) {
         yield return e;
       }
-      foreach (var e in base.Lhss) {
+      foreach (var e in Lhss) {
         yield return e;
       }
       if (Rhs != null) {
@@ -112,7 +106,8 @@ public override IEnumerable<Expression> PreResolveSubExpressions {
   /// </summary>
   public override void Resolve(ModuleResolver resolver, ResolutionContext resolutionContext) {
     base.Resolve(resolver, resolutionContext);
-    // TODO Do I have any responsibilities regarding the use of resolutionContext? Is it mutable?
+
+    ResolveKeywordToken(resolver, resolutionContext);
 
     // We need to figure out whether we are using a status type that has Extract or not,
     // as that determines how the AssignOrReturnStmt is desugared. Thus if the Rhs is a
@@ -132,7 +127,7 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
         if (call.Outs.Count != 0) {
           firstType = call.Outs[0].Type.Subst(typeMap);
         } else {
-          resolver.reporter.Error(MessageSource.Resolver, Rhs.tok, "Expected {0} to have a Success/Failure output value, but the method returns nothing.", call.Name);
+          resolver.Reporter.Error(MessageSource.Resolver, Rhs.Origin, "Expected {0} to have a Success/Failure output value, but the method returns nothing.", call.Name);
         }
       } else {
         // We're looking at a call to a function. Treat it like any other expression.
@@ -145,46 +140,46 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
 
     var method = (Method)resolutionContext.CodeContext;
     if (method.Outs.Count == 0 && KeywordToken == null) {
-      resolver.reporter.Error(MessageSource.Resolver, Tok, "A method containing a :- statement must have an out-parameter ({0})", method.Name);
+      resolver.Reporter.Error(MessageSource.Resolver, Origin, "A method containing a :- statement must have an out-parameter ({0})", method.Name);
       return;
     }
     if (firstType != null) {
-      firstType = resolver.PartiallyResolveTypeForMemberSelection(Rhs.tok, firstType);
+      firstType = resolver.PartiallyResolveTypeForMemberSelection(Rhs.Origin, firstType);
       if (firstType.AsTopLevelTypeWithMembers != null) {
         if (firstType.AsTopLevelTypeWithMembers.Members.Find(x => x.Name == "IsFailure") == null) {
-          resolver.reporter.Error(MessageSource.Resolver, Tok,
+          resolver.Reporter.Error(MessageSource.Resolver, Origin,
             "member IsFailure does not exist in {0}, in :- statement", firstType);
           return;
         }
         expectExtract = firstType.AsTopLevelTypeWithMembers.Members.Find(x => x.Name == "Extract") != null;
         if (expectExtract && call == null && Lhss.Count != 1 + Rhss.Count) {
-          resolver.reporter.Error(MessageSource.Resolver, Tok,
+          resolver.Reporter.Error(MessageSource.Resolver, Origin,
             "number of lhs ({0}) must match number of rhs ({1}) for a rhs type ({2}) with member Extract",
             Lhss.Count, 1 + Rhss.Count, firstType);
           return;
         } else if (expectExtract && call != null && Lhss.Count != call.Outs.Count) {
-          resolver.reporter.Error(MessageSource.Resolver, Tok,
+          resolver.Reporter.Error(MessageSource.Resolver, Origin,
             "wrong number of method result arguments (got {0}, expected {1}) for a rhs type ({2}) with member Extract",
             Lhss.Count, call.Outs.Count, firstType);
           return;
 
         } else if (!expectExtract && call == null && Lhss.Count != Rhss.Count) {
-          resolver.reporter.Error(MessageSource.Resolver, Tok,
+          resolver.Reporter.Error(MessageSource.Resolver, Origin,
             "number of lhs ({0}) must be one less than number of rhs ({1}) for a rhs type ({2}) without member Extract", Lhss.Count, 1 + Rhss.Count, firstType);
           return;
 
         } else if (!expectExtract && call != null && Lhss.Count != call.Outs.Count - 1) {
-          resolver.reporter.Error(MessageSource.Resolver, Tok,
+          resolver.Reporter.Error(MessageSource.Resolver, Origin,
             "wrong number of method result arguments (got {0}, expected {1}) for a rhs type ({2}) without member Extract", Lhss.Count, call.Outs.Count - 1, firstType);
           return;
         }
       } else {
-        resolver.reporter.Error(MessageSource.Resolver, Tok,
+        resolver.Reporter.Error(MessageSource.Resolver, Origin,
           $"The type of the first expression to the right of ':-' could not be determined to be a failure type (got '{firstType}')");
         return;
       }
     } else {
-      resolver.reporter.Error(MessageSource.Resolver, Tok,
+      resolver.Reporter.Error(MessageSource.Resolver, Origin,
         "Internal Error: Unknown failure type in :- statement");
       return;
     }
@@ -192,7 +187,7 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
     Expression lhsExtract = null;
     if (expectExtract) {
       if (resolutionContext.CodeContext is Method caller && caller.Outs.Count == 0 && KeywordToken == null) {
-        resolver.reporter.Error(MessageSource.Resolver, Rhs.tok, "Expected {0} to have a Success/Failure output value", caller.Name);
+        resolver.Reporter.Error(MessageSource.Resolver, Rhs.Origin, "Expected {0} to have a Success/Failure output value", caller.Name);
         return;
       }
 
@@ -202,16 +197,16 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
       if (lhsResolved is MemberSelectExpr lexr) {
         Expression id = Expression.AsThis(lexr.Obj) != null ? lexr.Obj : resolver.makeTemp("recv", this, resolutionContext, lexr.Obj);
         var lex = lhsExtract as ExprDotName; // might be just a NameSegment
-        lhsExtract = new ExprDotName(lexr.tok, id, lexr.MemberName, lex == null ? null : lex.OptTypeArguments);
+        lhsExtract = new ExprDotName(lexr.Origin, id, lexr.MemberNameNode, lex == null ? null : lex.OptTypeArguments);
       } else if (lhsResolved is SeqSelectExpr lseq) {
         if (!lseq.SelectOne || lseq.E0 == null) {
-          resolver.reporter.Error(MessageSource.Resolver, Tok,
+          resolver.Reporter.Error(MessageSource.Resolver, Origin,
             "Element ranges not allowed as l-values");
           return;
         }
         Expression id = resolver.makeTemp("recv", this, resolutionContext, lseq.Seq);
         Expression id0 = id0 = resolver.makeTemp("idx", this, resolutionContext, lseq.E0);
-        lhsExtract = new SeqSelectExpr(lseq.tok, lseq.SelectOne, id, id0, null, lseq.CloseParen);
+        lhsExtract = new SeqSelectExpr(lseq.Origin, lseq.SelectOne, id, id0, null, lseq.CloseParen);
         lhsExtract.Type = lseq.Type;
       } else if (lhsResolved is MultiSelectExpr lmulti) {
         Expression id = resolver.makeTemp("recv", this, resolutionContext, lmulti.Array);
@@ -220,7 +215,7 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
           Expression idx = resolver.makeTemp("idx", this, resolutionContext, i);
           idxs.Add(idx);
         }
-        lhsExtract = new MultiSelectExpr(lmulti.tok, id, idxs);
+        lhsExtract = new MultiSelectExpr(lmulti.Origin, id, idxs);
         lhsExtract.Type = lmulti.Type;
       } else if (lhsResolved is IdentifierExpr) {
         // do nothing
@@ -228,13 +223,25 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
         // LHS failed to resolve. Abort trying to resolve assign or return stmt
         return;
       } else {
-        throw new InvalidOperationException("Internal error: unexpected option in AssignOrReturnStmt.Resolve");
+        throw new InvalidOperationException("Internal error: unexpected option in ResolveAssignOrReturnStmt");
       }
     }
 
     DesugarElephantStatement(expectExtract, lhsExtract, firstType, resolver, (Method)resolutionContext.CodeContext);
     ResolvedStatements.ForEach(a => resolver.ResolveStatement(a, resolutionContext));
-    resolver.EnsureSupportsErrorHandling(Tok, firstType, expectExtract, KeywordToken != null);
+    resolver.EnsureSupportsErrorHandling(Origin, firstType, expectExtract, KeywordToken?.Token.val);
+  }
+
+  public void ResolveKeywordToken(INewOrOldResolver resolver, ResolutionContext resolutionContext) {
+    if (KeywordToken == null) {
+      return;
+    }
+
+    if (!resolver.Options.Get(CommonOptionBag.AllowAxioms) && KeywordToken.Token.val == "assume" && !KeywordToken.IsExplicitAxiom()) {
+      resolver.Reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.none, KeywordToken.Token, "assume keyword in update-with-failure statement has no {:axiom} annotation");
+    }
+
+    resolver.ResolveAttributes(KeywordToken, resolutionContext);
   }
 
   /// <summary>
@@ -249,10 +256,10 @@ private void DesugarElephantStatement(bool expectExtract, Expression lhsExtract,
     ModuleResolver resolver, Method enclosingMethod) {
 
     var temp = resolver.FreshTempVarName("valueOrError", enclosingMethod);
-    var lhss = new List<LocalVariable>() { new LocalVariable(RangeToken, temp, new InferredTypeProxy(), false) };
+    var lhss = new List<LocalVariable>() { new LocalVariable(Origin, temp, new InferredTypeProxy(), false) };
     // "var temp ;"
-    ResolvedStatements.Add(new VarDeclStmt(RangeToken, lhss, null));
-    var lhss2 = new List<Expression>() { new IdentifierExpr(Tok, temp) };
+    ResolvedStatements.Add(new VarDeclStmt(Origin, lhss, null));
+    var lhss2 = new List<Expression>() { new IdentifierExpr(Origin, temp) };
     for (int k = (expectExtract ? 1 : 0); k < Lhss.Count; ++k) {
       lhss2.Add(Lhss[k]);
     }
@@ -262,7 +269,7 @@ private void DesugarElephantStatement(bool expectExtract, Expression lhsExtract,
     }
     if (Rhss != null && Rhss.Count > 0) {
       if (lhss2.Count != rhss2.Count) {
-        resolver.reporter.Error(MessageSource.Resolver, Tok,
+        resolver.reporter.Error(MessageSource.Resolver, Origin,
           "Mismatch in expected number of LHSs and RHSs");
         if (lhss2.Count < rhss2.Count) {
           rhss2.RemoveRange(lhss2.Count, rhss2.Count - lhss2.Count);
@@ -272,29 +279,30 @@ private void DesugarElephantStatement(bool expectExtract, Expression lhsExtract,
       }
     }
     // " temp, ... := MethodOrExpression, ...;"
-    UpdateStmt up = new UpdateStmt(RangeToken, lhss2, rhss2);
+    var up = new AssignStatement(Origin, lhss2, rhss2);
     if (expectExtract) {
       up.OriginalInitialLhs = Lhss.Count == 0 ? null : Lhss[0];
     }
     ResolvedStatements.Add(up);
 
     if (KeywordToken != null) {
-      var notFailureExpr = new UnaryOpExpr(Tok, UnaryOpExpr.Opcode.Not, resolver.VarDotMethod(Tok, temp, "IsFailure"));
+      var keyword = KeywordToken.Token;
+      var notFailureExpr = new UnaryOpExpr(keyword, UnaryOpExpr.Opcode.Not, resolver.VarDotMethod(Origin, temp, "IsFailure"));
       Statement ss = null;
-      if (KeywordToken.Token.val == "expect") {
+      if (keyword.val == "expect") {
         // "expect !temp.IsFailure(), temp"
-        ss = new ExpectStmt(new RangeToken(Tok, EndToken), notFailureExpr, new IdentifierExpr(Tok, temp), KeywordToken.Attrs);
-      } else if (KeywordToken.Token.val == "assume") {
-        ss = new AssumeStmt(new RangeToken(Tok, EndToken), notFailureExpr, KeywordToken.Attrs);
-      } else if (KeywordToken.Token.val == "assert") {
-        ss = new AssertStmt(new RangeToken(Tok, EndToken), notFailureExpr, null, null, KeywordToken.Attrs);
+        ss = new ExpectStmt(new SourceOrigin(keyword.StartToken, EndToken), notFailureExpr, new IdentifierExpr(Origin, temp), KeywordToken.Attrs);
+      } else if (keyword.val == "assume") {
+        ss = new AssumeStmt(new SourceOrigin(keyword.StartToken, EndToken), notFailureExpr, SystemModuleManager.AxiomAttribute(KeywordToken.Attrs));
+      } else if (keyword.val == "assert") {
+        ss = new AssertStmt(new SourceOrigin(keyword.StartToken, EndToken), notFailureExpr, null, KeywordToken.Attrs);
       } else {
-        Contract.Assert(false, $"Invalid token in :- statement: {KeywordToken.Token.val}");
+        Contract.Assert(false, $"Invalid token in :- statement: {keyword.val}");
       }
       ResolvedStatements.Add(ss);
     } else {
       var enclosingOutParameter = enclosingMethod.Outs[0];
-      var ident = new IdentifierExpr(Tok, enclosingOutParameter.Name);
+      var ident = new IdentifierExpr(Origin, enclosingOutParameter.Name);
       // resolve it here to avoid capture into more closely declared local variables
       Contract.Assert(enclosingOutParameter.Type != null); // this confirms our belief that the out-parameter has already been resolved
       ident.Var = enclosingOutParameter;
@@ -302,14 +310,14 @@ private void DesugarElephantStatement(bool expectExtract, Expression lhsExtract,
 
       ResolvedStatements.Add(
         // "if temp.IsFailure()"
-        new IfStmt(RangeToken, false, resolver.VarDotMethod(Tok, temp, "IsFailure"),
+        new IfStmt(Origin, false, resolver.VarDotMethod(Origin, temp, "IsFailure"),
           // THEN: { out := temp.PropagateFailure(); return; }
-          new BlockStmt(RangeToken, new List<Statement>() {
-            new UpdateStmt(RangeToken,
+          new BlockStmt(Origin, new List<Statement>() {
+            new AssignStatement(Origin,
               new List<Expression>() { ident },
-              new List<AssignmentRhs>() { new ExprRhs(resolver.VarDotMethod(Tok, temp, "PropagateFailure")) }
+              new List<AssignmentRhs>() { new ExprRhs(resolver.VarDotMethod(Origin, temp, "PropagateFailure")) }
             ),
-            new ReturnStmt(RangeToken, null),
+            new ReturnStmt(Origin, null),
           }),
           // ELSE: no else block
           null
@@ -320,17 +328,25 @@ private void DesugarElephantStatement(bool expectExtract, Expression lhsExtract,
       // "y := temp.Extract();"
       var lhs = Lhss[0];
       ResolvedStatements.Add(
-        new UpdateStmt(RangeToken,
+        new AssignStatement(Origin,
           new List<Expression>() { lhsExtract },
-          new List<AssignmentRhs>() { new ExprRhs(resolver.VarDotMethod(Tok, temp, "Extract")) }
+          new List<AssignmentRhs>() { new ExprRhs(resolver.VarDotMethod(Origin, temp, "Extract")) }
         ));
       // The following check is not necessary, because the ghost mismatch is caught later.
       // However the error message here is much clearer.
-      var m = resolver.ResolveMember(Tok, firstType, "Extract", out _);
-      if (m != null && m.IsGhost && !AssignStmt.LhsIsToGhostOrAutoGhost(lhs)) {
-        resolver.reporter.Error(MessageSource.Resolver, lhs.tok,
+      var m = resolver.ResolveMember(Origin, firstType, "Extract", out _);
+      if (m != null && m.IsGhost && !SingleAssignStmt.LhsIsToGhostOrAutoGhost(lhs)) {
+        resolver.reporter.Error(MessageSource.Resolver, lhs.Origin,
           "The Extract member may not be ghost unless the initial LHS is ghost");
       }
     }
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    ResolvedStatements.ForEach(ss => ss.ResolveGhostness(resolver, reporter, mustBeErasable, codeContext,
+      proofContext, allowAssumptionVariables, inConstructorInitializationPhase));
+    IsGhost = ResolvedStatements.All(ss => ss.IsGhost);
+  }
 }
diff --git a/Source/DafnyCore/AST/Statements/Assignment/AssignStatement.cs b/Source/DafnyCore/AST/Statements/Assignment/AssignStatement.cs
new file mode 100644
index 00000000000..204dc277d5b
--- /dev/null
+++ b/Source/DafnyCore/AST/Statements/Assignment/AssignStatement.cs
@@ -0,0 +1,191 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// Parsed from ":="
+/// </summary>
+public class AssignStatement : ConcreteAssignStatement, ICloneable<AssignStatement>, ICanResolve {
+  public readonly List<AssignmentRhs> Rhss;
+  public readonly bool CanMutateKnownState;
+  public Expression OriginalInitialLhs = null;
+
+  [FilledInDuringResolution] public List<Statement> ResolvedStatements;
+  public override IEnumerable<Statement> SubStatements => Children.OfType<Statement>();
+
+  public override IEnumerable<Expression> NonSpecificationSubExpressions =>
+    ResolvedStatements == null ? Rhss.SelectMany(r => r.NonSpecificationSubExpressions) : Enumerable.Empty<Expression>();
+
+  public override IEnumerable<INode> Children => ResolvedStatements ?? Lhss.Concat<Node>(Rhss);
+  public override IEnumerable<INode> PreResolveChildren => Lhss.Concat<Node>(Rhss);
+
+  public override IEnumerable<Statement> PreResolveSubStatements => Enumerable.Empty<Statement>();
+
+  [ContractInvariantMethod]
+  void ObjectInvariant() {
+    Contract.Invariant(cce.NonNullElements(Lhss));
+    Contract.Invariant(cce.NonNullElements(Rhss));
+  }
+
+  public AssignStatement Clone(Cloner cloner) {
+    return new AssignStatement(cloner, this);
+  }
+
+  public AssignStatement(Cloner cloner, AssignStatement original) : base(cloner, original) {
+    Rhss = original.Rhss.Select(cloner.CloneRHS).ToList();
+    CanMutateKnownState = original.CanMutateKnownState;
+    if (cloner.CloneResolvedFields) {
+      ResolvedStatements = original.ResolvedStatements.Select(stmt => cloner.CloneStmt(stmt, false)).ToList();
+    }
+  }
+
+  public AssignStatement(IOrigin origin, List<Expression> lhss, List<AssignmentRhs> rhss)
+    : base(origin, lhss) {
+    Contract.Requires(cce.NonNullElements(lhss));
+    Contract.Requires(cce.NonNullElements(rhss));
+    Contract.Requires(lhss.Count != 0 || rhss.Count == 1);
+    Rhss = rhss;
+    CanMutateKnownState = false;
+  }
+  public AssignStatement(IOrigin origin, List<Expression> lhss, List<AssignmentRhs> rhss, bool mutate)
+    : base(origin, lhss) {
+    Contract.Requires(cce.NonNullElements(lhss));
+    Contract.Requires(cce.NonNullElements(rhss));
+    Contract.Requires(lhss.Count != 0 || rhss.Count == 1);
+    Rhss = rhss;
+    CanMutateKnownState = mutate;
+  }
+
+  public override IEnumerable<Expression> PreResolveSubExpressions {
+    get {
+      foreach (var e in base.PreResolveSubExpressions) {
+        yield return e;
+      }
+      foreach (var rhs in Rhss) {
+        foreach (var e in rhs.PreResolveSubExpressions) {
+          yield return e;
+        }
+      }
+    }
+  }
+
+  /// <summary>
+  /// Resolve the RHSs and entire UpdateStmt (LHSs should already have been checked by the caller).
+  /// errorCountBeforeCheckingLhs is passed in so that this method can determined if any resolution errors were found during
+  /// LHS or RHS checking, because only if no errors were found is update.ResolvedStmt changed.
+  /// </summary>
+  public override void Resolve(ModuleResolver resolver, ResolutionContext resolutionContext) {
+    Contract.Requires(this != null);
+    Contract.Requires(resolutionContext != null);
+
+    int errorCountBeforeCheckingLhs = resolver.Reporter.Count(ErrorLevel.Error);
+
+    base.Resolve(resolver, resolutionContext);
+
+    IOrigin firstEffectfulRhs = null;
+    MethodCallInformation methodCallInfo = null;
+    ResolvedStatements = new();
+    foreach (var rhs in Rhss) {
+      bool isEffectful;
+      if (rhs is TypeRhs) {
+        var tr = (TypeRhs)rhs;
+        resolver.ResolveTypeRhs(tr, this, resolutionContext);
+        isEffectful = tr.InitCall != null;
+      } else if (rhs is HavocRhs) {
+        isEffectful = false;
+      } else {
+        var er = (ExprRhs)rhs;
+        if (er.Expr is ApplySuffix) {
+          var a = (ApplySuffix)er.Expr;
+          var cRhs = resolver.ResolveApplySuffix(a, resolutionContext, true);
+          isEffectful = cRhs != null;
+          methodCallInfo = methodCallInfo ?? cRhs;
+        } else {
+          resolver.ResolveExpression(er.Expr, resolutionContext);
+          isEffectful = false;
+        }
+      }
+      if (isEffectful && firstEffectfulRhs == null) {
+        firstEffectfulRhs = rhs.Origin;
+      }
+
+      resolver.ResolveAttributes(rhs, resolutionContext);
+    }
+
+    // figure out what kind of UpdateStmt this is
+    if (firstEffectfulRhs == null) {
+      if (Lhss.Count == 0) {
+        Contract.Assert(Rhss.Count == 1);  // guaranteed by the parser
+        resolver.Reporter.Error(MessageSource.Resolver, this, "expected method call, found expression");
+      } else if (Lhss.Count != Rhss.Count) {
+        resolver.Reporter.Error(MessageSource.Resolver, this, "the number of left-hand sides ({0}) and right-hand sides ({1}) must match for a multi-assignment", Lhss.Count, Rhss.Count);
+      } else if (resolver.Reporter.Count(ErrorLevel.Error) == errorCountBeforeCheckingLhs) {
+        // add the statements here in a sequence, but don't use that sequence later for translation (instead, should translate properly as multi-assignment)
+        for (int i = 0; i < Lhss.Count; i++) {
+          var origin = Lhss.Count > 1 ? new OverrideCenter(Origin, Rhss[i].Center) : Origin;
+          var a = new SingleAssignStmt(origin, Lhss[i].Resolved, Rhss[i]);
+          ResolvedStatements.Add(a);
+        }
+      }
+
+    } else if (CanMutateKnownState) {
+      if (1 < Rhss.Count) {
+        resolver.Reporter.Error(MessageSource.Resolver, firstEffectfulRhs, "cannot have effectful parameter in multi-return statement.");
+      } else { // it might be ok, if it is a TypeRhs
+        Contract.Assert(Rhss.Count == 1);
+        if (methodCallInfo != null) {
+          resolver.Reporter.Error(MessageSource.Resolver, methodCallInfo.Tok, "cannot have method call in return statement.");
+        } else {
+          // we have a TypeRhs
+          Contract.Assert(Rhss[0] is TypeRhs);
+          var tr = (TypeRhs)Rhss[0];
+          Contract.Assert(tr.InitCall != null); // there were effects, so this must have been a call.
+          if (tr.CanAffectPreviouslyKnownExpressions) {
+            resolver.Reporter.Error(MessageSource.Resolver, tr.Origin, "can only have initialization methods which modify at most 'this'.");
+          } else if (resolver.Reporter.Count(ErrorLevel.Error) == errorCountBeforeCheckingLhs) {
+            var a = new SingleAssignStmt(Origin, Lhss[0].Resolved, tr);
+            ResolvedStatements.Add(a);
+          }
+        }
+      }
+
+    } else {
+      // if there was an effectful RHS, that must be the only RHS
+      if (Rhss.Count != 1) {
+        resolver.Reporter.Error(MessageSource.Resolver, firstEffectfulRhs, "an update statement is allowed an effectful RHS only if there is just one RHS");
+      } else if (methodCallInfo == null) {
+        // must be a single TypeRhs
+        if (Lhss.Count != 1) {
+          Contract.Assert(2 <= Lhss.Count);  // the parser allows 0 Lhss only if the whole statement looks like an expression (not a TypeRhs)
+          resolver.Reporter.Error(MessageSource.Resolver, Lhss[1].Origin, "the number of left-hand sides ({0}) and right-hand sides ({1}) must match for a multi-assignment", Lhss.Count, Rhss.Count);
+        } else if (resolver.Reporter.Count(ErrorLevel.Error) == errorCountBeforeCheckingLhs) {
+          var a = new SingleAssignStmt(Origin, Lhss[0].Resolved, Rhss[0]);
+          ResolvedStatements.Add(a);
+        }
+      } else if (resolver.Reporter.Count(ErrorLevel.Error) == errorCountBeforeCheckingLhs) {
+        // a call statement
+        var resolvedLhss = new List<Expression>();
+        foreach (var ll in Lhss) {
+          resolvedLhss.Add(ll.Resolved);
+        }
+        CallStmt a = new CallStmt(Origin, resolvedLhss, methodCallInfo.Callee, methodCallInfo.ActualParameters, methodCallInfo.Tok.Center);
+        a.OriginalInitialLhs = OriginalInitialLhs;
+        ResolvedStatements.Add(a);
+      }
+    }
+
+    foreach (var a in ResolvedStatements) {
+      resolver.ResolveStatement(a, resolutionContext);
+    }
+  }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    ResolvedStatements.ForEach(ss => ss.ResolveGhostness(resolver, reporter, mustBeErasable, codeContext,
+      proofContext, allowAssumptionVariables, inConstructorInitializationPhase));
+    IsGhost = ResolvedStatements.All(ss => ss.IsGhost);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Assignment/AssignStmt.cs b/Source/DafnyCore/AST/Statements/Assignment/AssignStmt.cs
deleted file mode 100644
index 09f93ed194a..00000000000
--- a/Source/DafnyCore/AST/Statements/Assignment/AssignStmt.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-
-namespace Microsoft.Dafny;
-
-public class AssignStmt : Statement, ICloneable<AssignStmt> {
-  public readonly Expression Lhs;
-  public readonly AssignmentRhs Rhs;
-  public override IEnumerable<INode> Children => new List<Node> { Lhs, Rhs }.Where(x => x != null);
-  public override IEnumerable<INode> PreResolveChildren => Children;
-  [ContractInvariantMethod]
-  void ObjectInvariant() {
-    Contract.Invariant(Lhs != null);
-    Contract.Invariant(Rhs != null);
-  }
-
-  public override IToken Tok {
-    get {
-      var previous = Rhs.StartToken.Prev;
-      // If there was a single assignment, report on the operator.
-      var singleAssignment = previous.val == ":=";
-      // If there was an implicit return assignment, report on the return.
-      var implicitAssignment = previous.val == "return";
-      if (singleAssignment || implicitAssignment) {
-        return previous;
-      }
-      return Rhs.StartToken;
-    }
-  }
-
-  public AssignStmt Clone(Cloner cloner) {
-    return new AssignStmt(cloner, this);
-  }
-
-  public AssignStmt(Cloner cloner, AssignStmt original) : base(cloner, original) {
-    Lhs = cloner.CloneExpr(original.Lhs);
-    Rhs = cloner.CloneRHS(original.Rhs);
-  }
-
-  public AssignStmt(RangeToken rangeToken, Expression lhs, AssignmentRhs rhs)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
-    Contract.Requires(lhs != null);
-    Contract.Requires(rhs != null);
-    this.Lhs = lhs;
-    this.Rhs = rhs;
-  }
-
-  public override IEnumerable<Statement> SubStatements {
-    get {
-      foreach (var s in Rhs.SubStatements) {
-        yield return s;
-      }
-    }
-  }
-
-  public override IEnumerable<Statement> PreResolveSubStatements {
-    get {
-      foreach (var s in Rhs.PreResolveSubStatements) {
-        yield return s;
-      }
-    }
-  }
-
-  public override IEnumerable<Expression> NonSpecificationSubExpressions {
-    get {
-      foreach (var e in base.NonSpecificationSubExpressions) { yield return e; }
-      yield return Lhs;
-      foreach (var ee in Rhs.NonSpecificationSubExpressions) {
-        yield return ee;
-      }
-    }
-  }
-
-  public override IEnumerable<Expression> SpecificationSubExpressions {
-    get {
-      foreach (var e in base.SpecificationSubExpressions) { yield return e; }
-      foreach (var ee in Rhs.SpecificationSubExpressions) {
-        yield return ee;
-      }
-    }
-  }
-
-  /// <summary>
-  /// This method assumes "lhs" has been successfully resolved.
-  /// </summary>
-  public static bool LhsIsToGhost(Expression lhs) {
-    Contract.Requires(lhs != null);
-    return LhsIsToGhost_Which(lhs) == NonGhostKind.IsGhost;
-  }
-  public static bool LhsIsToGhostOrAutoGhost(Expression lhs) {
-    Contract.Requires(lhs != null);
-    return LhsIsToGhost_Which(lhs) == NonGhostKind.IsGhost || lhs.Resolved is AutoGhostIdentifierExpr;
-  }
-  public enum NonGhostKind { IsGhost, Variable, Field, ArrayElement }
-  public static string NonGhostKind_To_String(NonGhostKind gk) {
-    Contract.Requires(gk != NonGhostKind.IsGhost);
-    switch (gk) {
-      case NonGhostKind.Variable: return "non-ghost variable";
-      case NonGhostKind.Field: return "non-ghost field";
-      case NonGhostKind.ArrayElement: return "array element";
-      default:
-        Contract.Assume(false);  // unexpected NonGhostKind
-        throw new cce.UnreachableException();  // please compiler
-    }
-  }
-  /// <summary>
-  /// This method assumes "lhs" has been successfully resolved.
-  /// </summary>
-  public static NonGhostKind LhsIsToGhost_Which(Expression lhs) {
-    Contract.Requires(lhs != null);
-    lhs = lhs.Resolved;
-    if (lhs is AutoGhostIdentifierExpr) {
-      // TODO: Should we return something different for this case?
-      var x = (IdentifierExpr)lhs;
-      if (!x.Var.IsGhost) {
-        return NonGhostKind.Variable;
-      }
-    } else if (lhs is IdentifierExpr) {
-      var x = (IdentifierExpr)lhs;
-      if (!x.Var.IsGhost) {
-        return NonGhostKind.Variable;
-      }
-    } else if (lhs is MemberSelectExpr) {
-      var x = (MemberSelectExpr)lhs;
-      if (!x.Member.IsGhost) {
-        return NonGhostKind.Field;
-      }
-    } else {
-      // LHS denotes an array element, which is always non-ghost
-      return NonGhostKind.ArrayElement;
-    }
-    return NonGhostKind.IsGhost;
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Assignment/AssignSuchThatStmt.cs b/Source/DafnyCore/AST/Statements/Assignment/AssignSuchThatStmt.cs
index 23f586bab9c..f2dc1f44fd3 100644
--- a/Source/DafnyCore/AST/Statements/Assignment/AssignSuchThatStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Assignment/AssignSuchThatStmt.cs
@@ -5,32 +5,24 @@
 
 namespace Microsoft.Dafny;
 
-public class AssignSuchThatStmt : ConcreteUpdateStatement, ICloneable<AssignSuchThatStmt>, ICanResolve {
+/// <summary>
+/// Parsed from ":|"
+/// </summary>
+public class AssignSuchThatStmt : ConcreteAssignStatement, ICloneable<AssignSuchThatStmt>, ICanResolveNewAndOld {
   public readonly Expression Expr;
   public readonly AttributedToken AssumeToken;
 
   public override IEnumerable<INode> PreResolveChildren =>
     Lhss.Concat<Node>(new List<Node>() { Expr });
 
-  public override IToken Tok {
-    get {
-      var result = Expr.StartToken.Prev;
-      if (char.IsLetter(result.val[0])) {
-        // Jump to operator if we're on an assume keyword.
-        result = result.Prev;
-      }
-      return result;
-    }
-  }
-
-  [FilledInDuringResolution] public List<ComprehensionExpr.BoundedPool> Bounds;  // null for a ghost statement
+  [FilledInDuringResolution] public List<BoundedPool> Bounds;  // null for a ghost statement
   // invariant Bounds == null || Bounds.Count == BoundVars.Count;
   [FilledInDuringResolution] public List<IVariable> MissingBounds;  // remains "null" if bounds can be found
   // invariant Bounds == null || MissingBounds == null;
-  public class WiggleWaggleBound : ComprehensionExpr.BoundedPool {
+  public class WiggleWaggleBound : BoundedPool {
     public override PoolVirtues Virtues => PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
     public override int Preference() => 1;
-    public override ComprehensionExpr.BoundedPool Clone(Cloner cloner) {
+    public override BoundedPool Clone(Cloner cloner) {
       return this;
     }
   }
@@ -55,9 +47,9 @@ public AssignSuchThatStmt(Cloner cloner, AssignSuchThatStmt original) : base(clo
   /// "assumeToken" is allowed to be "null", in which case the verifier will check that a RHS value exists.
   /// If "assumeToken" is non-null, then it should denote the "assume" keyword used in the statement.
   /// </summary>
-  public AssignSuchThatStmt(RangeToken rangeToken, List<Expression> lhss, Expression expr, AttributedToken assumeToken, Attributes attrs)
-    : base(rangeToken, lhss, attrs) {
-    Contract.Requires(rangeToken != null);
+  public AssignSuchThatStmt(IOrigin origin, List<Expression> lhss, Expression expr, AttributedToken assumeToken, Attributes attrs)
+    : base(origin, lhss, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(lhss));
     Contract.Requires(lhss.Count != 0);
     Contract.Requires(expr != null);
@@ -73,13 +65,21 @@ public override IEnumerable<Expression> NonSpecificationSubExpressions {
     }
   }
 
-  public override void Resolve(ModuleResolver resolver, ResolutionContext resolutionContext) {
+  public override void GenResolve(INewOrOldResolver resolver, ResolutionContext resolutionContext) {
     Contract.Requires(this != null);
     Contract.Requires(resolutionContext != null);
 
-    base.Resolve(resolver, resolutionContext);
+    if (!resolutionContext.IsGhost && resolver.Options.ForbidNondeterminism) {
+      resolver.Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_assign_such_that_forbidden,
+        Origin, "assign-such-that statement forbidden by the --enforce-determinism option");
+    }
+    base.GenResolve(resolver, resolutionContext);
 
     if (AssumeToken != null) {
+      if (!resolver.Options.Get(CommonOptionBag.AllowAxioms) && !AssumeToken.IsExplicitAxiom()) {
+        resolver.Reporter.Warning(MessageSource.Resolver, ResolutionErrors.ErrorId.none, AssumeToken.Token, "assume keyword in assign-such-that statement has no {:axiom} annotation");
+      }
+
       resolver.ResolveAttributes(AssumeToken, resolutionContext);
     }
 
@@ -88,23 +88,44 @@ public override void Resolve(ModuleResolver resolver, ResolutionContext resoluti
       if (lhs.Resolved != null) {
         resolver.CheckIsLvalue(lhs.Resolved, resolutionContext);
       } else {
-        Contract.Assert(resolver.reporter.ErrorCount > 0);
+        Contract.Assert(resolver.Reporter.HasErrors);
       }
       if (lhs.Resolved is IdentifierExpr ide) {
-        if (lhsSimpleVariables.Contains(ide.Var)) {
+        if (!lhsSimpleVariables.Add(ide.Var)) {
           // syntactically forbid duplicate simple-variables on the LHS
-          resolver.reporter.Error(MessageSource.Resolver, lhs, $"variable '{ide.Var.Name}' occurs more than once as left-hand side of :|");
-        } else {
-          lhsSimpleVariables.Add(ide.Var);
+          resolver.Reporter.Error(MessageSource.Resolver, lhs, $"variable '{ide.Var.Name}' occurs more than once as left-hand side of :|");
         }
       }
       // to ease in the verification of the existence check, only allow local variables as LHSs
       if (AssumeToken == null && !(lhs.Resolved is IdentifierExpr)) {
-        resolver.reporter.Error(MessageSource.Resolver, lhs, "an assign-such-that statement (without an 'assume' clause) currently only supports local-variable LHSs");
+        resolver.Reporter.Error(MessageSource.Resolver, lhs, "an assign-such-that statement (without an 'assume' clause) currently only supports local-variable LHSs");
       }
     }
 
     resolver.ResolveExpression(Expr, resolutionContext);
     resolver.ConstrainTypeExprBool(Expr, "type of RHS of assign-such-that statement must be boolean (got {0})");
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = mustBeErasable || AssumeToken != null || Lhss.Any(SingleAssignStmt.LhsIsToGhost);
+    if (mustBeErasable && !codeContext.IsGhost) {
+      foreach (var lhs in Lhss) {
+        var gk = SingleAssignStmt.LhsIsToGhost_Which(lhs);
+        if (gk != SingleAssignStmt.NonGhostKind.IsGhost) {
+          reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_no_assign_to_var_in_ghost, lhs,
+            "cannot assign to {0} in a ghost context", SingleAssignStmt.NonGhostKind_To_String(gk));
+        }
+      }
+    } else if (!mustBeErasable && AssumeToken == null && ExpressionTester.UsesSpecFeatures(Expr)) {
+      foreach (var lhs in Lhss) {
+        var gk = SingleAssignStmt.LhsIsToGhost_Which(lhs);
+        if (gk != SingleAssignStmt.NonGhostKind.IsGhost) {
+          reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_no_assign_ghost_to_var, lhs,
+            "{0} cannot be assigned a value that depends on a ghost", SingleAssignStmt.NonGhostKind_To_String(gk));
+        }
+      }
+    }
+  }
 }
diff --git a/Source/DafnyCore/AST/Statements/Assignment/AssignmentRhs.cs b/Source/DafnyCore/AST/Statements/Assignment/AssignmentRhs.cs
index 6dcef77ae92..30b322af18f 100644
--- a/Source/DafnyCore/AST/Statements/Assignment/AssignmentRhs.cs
+++ b/Source/DafnyCore/AST/Statements/Assignment/AssignmentRhs.cs
@@ -3,26 +3,24 @@
 
 namespace Microsoft.Dafny;
 
-public abstract class AssignmentRhs : TokenNode, IAttributeBearingDeclaration {
+public abstract class AssignmentRhs : NodeWithComputedRange, IAttributeBearingDeclaration {
   private Attributes attributes;
 
   public Attributes Attributes {
     get { return attributes; }
     set { attributes = value; }
   }
+  string IAttributeBearingDeclaration.WhatKind => "assignment right-hand-side";
 
   public bool HasAttributes() {
     return Attributes != null;
   }
 
-  internal AssignmentRhs(Cloner cloner, AssignmentRhs original) {
-    tok = cloner.Tok(original.tok);
+  internal AssignmentRhs(Cloner cloner, AssignmentRhs original) : base(cloner, original) {
     Attributes = cloner.CloneAttributes(original.Attributes);
-    RangeToken = cloner.Range(original.rangeToken);
   }
 
-  internal AssignmentRhs(IToken tok, Attributes attrs = null) {
-    this.tok = tok;
+  internal AssignmentRhs(IOrigin origin, Attributes attrs = null) : base(origin) {
     Attributes = attrs;
   }
 
diff --git a/Source/DafnyCore/AST/Statements/Assignment/AttributedToken.cs b/Source/DafnyCore/AST/Statements/Assignment/AttributedToken.cs
index 49545c285a5..4d2eae1a113 100644
--- a/Source/DafnyCore/AST/Statements/Assignment/AttributedToken.cs
+++ b/Source/DafnyCore/AST/Statements/Assignment/AttributedToken.cs
@@ -11,6 +11,10 @@ namespace Microsoft.Dafny;
 /// `{:axiom}` attribute is directly attached to the statement-level
 /// attributes).
 /// </summary>
-public record AttributedToken(IToken Token, Attributes Attrs) : IAttributeBearingDeclaration {
-  Attributes IAttributeBearingDeclaration.Attributes => Attrs;
+public record AttributedToken(IOrigin Token, Attributes Attrs) : IAttributeBearingDeclaration {
+  Attributes IAttributeBearingDeclaration.Attributes {
+    get => Attrs;
+    set => throw new System.NotImplementedException();
+  }
+  string IAttributeBearingDeclaration.WhatKind => "token";
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Assignment/ConcreteAssignStatement.cs b/Source/DafnyCore/AST/Statements/Assignment/ConcreteAssignStatement.cs
new file mode 100644
index 00000000000..6f2d3f8a34f
--- /dev/null
+++ b/Source/DafnyCore/AST/Statements/Assignment/ConcreteAssignStatement.cs
@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// Common superclass of UpdateStmt, AssignSuchThatStmt and AssignOrReturnStmt
+/// </summary>
+public abstract class ConcreteAssignStatement : Statement, ICanFormat {
+  public readonly List<Expression> Lhss;
+
+  protected ConcreteAssignStatement(Cloner cloner, ConcreteAssignStatement original) : base(cloner, original) {
+    Lhss = original.Lhss.Select(cloner.CloneExpr).ToList();
+  }
+
+  public ConcreteAssignStatement(IOrigin origin, List<Expression> lhss, Attributes attrs = null)
+    : base(origin, attrs) {
+    Contract.Requires(cce.NonNullElements(lhss));
+    Lhss = lhss;
+  }
+
+  public override IEnumerable<INode> Children => Lhss;
+  public override IEnumerable<INode> PreResolveChildren => Lhss;
+  public override IEnumerable<IdentifierExpr> GetAssignedLocals() {
+    return Lhss.Select(lhs => lhs.Resolved).OfType<IdentifierExpr>();
+  }
+
+  public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
+    return formatter.SetIndentUpdateStmt(this, indentBefore, false);
+  }
+
+  public virtual void Resolve(ModuleResolver resolver, ResolutionContext context) {
+    GenResolve(resolver, context);
+  }
+
+  public override void GenResolve(INewOrOldResolver resolver, ResolutionContext context) {
+    foreach (var lhs in Lhss) {
+      var ec = resolver.Reporter.Count(ErrorLevel.Error);
+      resolver.ResolveExpression(lhs, context);
+      if (ec == resolver.Reporter.Count(ErrorLevel.Error)) {
+        if (lhs is SeqSelectExpr && !((SeqSelectExpr)lhs).SelectOne) {
+          resolver.Reporter.Error(MessageSource.Resolver, lhs, "cannot assign to a range of array elements (try the 'forall' statement)");
+        }
+      }
+    }
+
+    base.GenResolve(resolver, context);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Assignment/ConcreteUpdateStatement.cs b/Source/DafnyCore/AST/Statements/Assignment/ConcreteUpdateStatement.cs
deleted file mode 100644
index 92239b19fd3..00000000000
--- a/Source/DafnyCore/AST/Statements/Assignment/ConcreteUpdateStatement.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-
-namespace Microsoft.Dafny;
-
-/// <summary>
-/// Common superclass of UpdateStmt, AssignSuchThatStmt and AssignOrReturnStmt
-/// </summary>
-public abstract class ConcreteUpdateStatement : Statement, ICanFormat {
-  public readonly List<Expression> Lhss;
-
-  protected ConcreteUpdateStatement(Cloner cloner, ConcreteUpdateStatement original) : base(cloner, original) {
-    Lhss = original.Lhss.Select(cloner.CloneExpr).ToList();
-  }
-
-  public ConcreteUpdateStatement(RangeToken rangeToken, List<Expression> lhss, Attributes attrs = null)
-    : base(rangeToken, attrs) {
-    Contract.Requires(cce.NonNullElements(lhss));
-    Lhss = lhss;
-  }
-
-  public override IEnumerable<INode> Children => Lhss;
-  public override IEnumerable<INode> PreResolveChildren => Lhss;
-
-  public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
-    return formatter.SetIndentUpdateStmt(this, indentBefore, false);
-  }
-
-  public override void Resolve(ModuleResolver resolver, ResolutionContext context) {
-    foreach (var lhs in Lhss) {
-      var ec = resolver.Reporter.Count(ErrorLevel.Error);
-      resolver.ResolveExpression(lhs, context);
-      if (ec == resolver.Reporter.Count(ErrorLevel.Error)) {
-        if (lhs is SeqSelectExpr && !((SeqSelectExpr)lhs).SelectOne) {
-          resolver.Reporter.Error(MessageSource.Resolver, lhs, "cannot assign to a range of array elements (try the 'forall' statement)");
-        }
-      }
-    }
-
-    base.Resolve(resolver, context);
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Assignment/ExprRhs.cs b/Source/DafnyCore/AST/Statements/Assignment/ExprRhs.cs
index b4bcd2f9c54..9683efbb7ef 100644
--- a/Source/DafnyCore/AST/Statements/Assignment/ExprRhs.cs
+++ b/Source/DafnyCore/AST/Statements/Assignment/ExprRhs.cs
@@ -18,7 +18,7 @@ public ExprRhs(Cloner cloner, ExprRhs original) : base(cloner, original) {
   }
 
   public ExprRhs(Expression expr, Attributes attrs = null)
-    : base(expr.tok, attrs) {
+    : base(expr.Origin, attrs) {
     Contract.Requires(expr != null);
     Expr = expr;
   }
diff --git a/Source/DafnyCore/AST/Statements/Assignment/HavocRhs.cs b/Source/DafnyCore/AST/Statements/Assignment/HavocRhs.cs
index 73e32f52b8e..08b75f5be05 100644
--- a/Source/DafnyCore/AST/Statements/Assignment/HavocRhs.cs
+++ b/Source/DafnyCore/AST/Statements/Assignment/HavocRhs.cs
@@ -7,7 +7,7 @@ public class HavocRhs : AssignmentRhs, ICloneable<HavocRhs> {
   public HavocRhs Clone(Cloner cloner) {
     return new HavocRhs(cloner, this);
   }
-  public HavocRhs(IToken tok) : base(tok) {
+  public HavocRhs(IOrigin origin) : base(origin) {
   }
 
   private HavocRhs(Cloner cloner, HavocRhs havocRhs) : base(cloner, havocRhs) {
@@ -16,4 +16,10 @@ private HavocRhs(Cloner cloner, HavocRhs havocRhs) : base(cloner, havocRhs) {
   public override bool CanAffectPreviouslyKnownExpressions { get { return false; } }
   public override IEnumerable<INode> Children => Enumerable.Empty<Node>();
   public override IEnumerable<INode> PreResolveChildren => Enumerable.Empty<Node>();
+
+  public void Resolve(INewOrOldResolver resolver, ResolutionContext resolutionContext) {
+    if (!resolutionContext.IsGhost && resolver.Options.ForbidNondeterminism) {
+      resolver.Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_nondeterminism_forbidden, Origin, "nondeterministic assignment forbidden by the --enforce-determinism option");
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Assignment/LocalVariable.cs b/Source/DafnyCore/AST/Statements/Assignment/LocalVariable.cs
index 70a2adfa12a..548957cf17f 100644
--- a/Source/DafnyCore/AST/Statements/Assignment/LocalVariable.cs
+++ b/Source/DafnyCore/AST/Statements/Assignment/LocalVariable.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
@@ -8,20 +9,23 @@ public class LocalVariable : RangeNode, IVariable, IAttributeBearingDeclaration
   readonly string name;
   public string DafnyName => Name;
   public Attributes Attributes;
-  Attributes IAttributeBearingDeclaration.Attributes => Attributes;
+  Attributes IAttributeBearingDeclaration.Attributes {
+    get => Attributes;
+    set => Attributes = value;
+  }
+  string IAttributeBearingDeclaration.WhatKind => "local variable";
+
   public bool IsGhost;
   [ContractInvariantMethod]
   void ObjectInvariant() {
     Contract.Invariant(name != null);
-    Contract.Invariant(OptionalType != null);
+    Contract.Invariant(SyntacticType != null);
   }
 
-  public override IToken Tok => RangeToken.StartToken;
-
   public LocalVariable(Cloner cloner, LocalVariable original)
     : base(cloner, original) {
     name = original.Name;
-    OptionalType = cloner.CloneType(original.OptionalType);
+    SyntacticType = cloner.CloneType(original.SyntacticType);
     IsTypeExplicit = original.IsTypeExplicit;
     IsGhost = original.IsGhost;
 
@@ -30,13 +34,14 @@ public LocalVariable(Cloner cloner, LocalVariable original)
     }
   }
 
-  public LocalVariable(RangeToken rangeToken, string name, Type type, bool isGhost)
-    : base(rangeToken) {
+  public LocalVariable(IOrigin origin, string name, Type type, bool isGhost)
+    : base(origin) {
     Contract.Requires(name != null);
     Contract.Requires(type != null);  // can be a proxy, though
 
     this.name = name;
-    this.OptionalType = type;
+    IsTypeExplicit = type != null;
+    this.SyntacticType = type ?? new InferredTypeProxy();
     if (type is InferredTypeProxy) {
       ((InferredTypeProxy)type).KeepConstraints = true;
     }
@@ -63,20 +68,24 @@ public string DisplayName {
   private string uniqueName;
   public string UniqueName => uniqueName;
   public bool HasBeenAssignedUniqueName => uniqueName != null;
-  public string AssignUniqueName(FreshIdGenerator generator) {
+  public string AssignUniqueName(VerificationIdGenerator generator) {
     return uniqueName ??= generator.FreshId(Name + "#");
   }
 
-  private string sanitizedName;
-  public string SanitizedName =>
-    sanitizedName ??= $"_{IVariable.CompileNameIdGenerator.FreshNumericId()}_{NonglobalVariable.SanitizeName(Name)}";
+  private string sanitizedNameShadowable;
+
+  public string CompileNameShadowable =>
+    sanitizedNameShadowable ??= NonglobalVariable.SanitizeName(Name);
 
   string compileName;
-  public string CompileName =>
-    compileName ??= SanitizedName;
 
-  public readonly Type OptionalType;  // this is the type mentioned in the declaration, if any
-  Type IVariable.OptionalType { get { return this.OptionalType; } }
+  public string GetOrCreateCompileName(CodeGenIdGenerator generator) {
+    return compileName ??= $"_{generator.FreshNumericId()}_{CompileNameShadowable}";
+  }
+
+  // TODO rename and update comment? Or make it nullable?
+  public readonly Type SyntacticType;  // this is the type mentioned in the declaration, if any
+  Type IVariable.OptionalType => SyntacticType;
 
   [FilledInDuringResolution]
   internal Type type;  // this is the declared or inferred type of the variable; it is non-null after resolution (even if resolution fails)
@@ -89,6 +98,18 @@ public Type Type {
     }
   }
 
+  /// <summary>
+  /// For a description of the difference between .Type and .UnnormalizedType, see Expression.UnnormalizedType.
+  /// </summary>
+  public Type UnnormalizedType {
+    get {
+      Contract.Ensures(Contract.Result<Type>() != null);
+
+      Contract.Assume(type != null);  /* we assume object has been resolved */
+      return type;
+    }
+  }
+
   public PreType PreType { get; set; }
 
   public bool IsMutable {
@@ -108,17 +129,19 @@ public void MakeGhost() {
     this.IsGhost = true;
   }
 
-  public IToken NameToken => RangeToken.StartToken;
-  public bool IsTypeExplicit = false;
+  public IOrigin NavigationToken => Origin.StartToken;
+  public bool IsTypeExplicit { get; }
   public override IEnumerable<INode> Children =>
-    (Attributes != null ? new List<Node> { Attributes } : Enumerable.Empty<Node>()).Concat(
+    Attributes.AsEnumerable().
+      Concat<Node>(
       IsTypeExplicit ? new List<Node>() { type } : Enumerable.Empty<Node>());
 
   public override IEnumerable<INode> PreResolveChildren =>
-    (Attributes != null ? new List<Node> { Attributes } : Enumerable.Empty<Node>()).Concat(
-      IsTypeExplicit ? new List<Node>() { OptionalType ?? type } : Enumerable.Empty<Node>());
+    Attributes.AsEnumerable().
+      Concat<Node>(
+      IsTypeExplicit ? new List<Node>() { SyntacticType ?? type } : Enumerable.Empty<Node>());
 
-  public DafnySymbolKind Kind => DafnySymbolKind.Variable;
+  public SymbolKind? Kind => SymbolKind.Variable;
   public string GetDescription(DafnyOptions options) {
     return this.AsText();
   }
diff --git a/Source/DafnyCore/AST/Statements/Assignment/SingleAssignStmt.cs b/Source/DafnyCore/AST/Statements/Assignment/SingleAssignStmt.cs
new file mode 100644
index 00000000000..a8514b185bd
--- /dev/null
+++ b/Source/DafnyCore/AST/Statements/Assignment/SingleAssignStmt.cs
@@ -0,0 +1,220 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+public class SingleAssignStmt : Statement, ICloneable<SingleAssignStmt> {
+  public readonly Expression Lhs;
+  public readonly AssignmentRhs Rhs;
+  public override IEnumerable<INode> Children => new List<Node> { Lhs, Rhs }.Where(x => x != null);
+  public override IEnumerable<INode> PreResolveChildren => Children;
+
+  public override IEnumerable<IdentifierExpr> GetAssignedLocals() {
+    return new[] { Lhs.Resolved }.OfType<IdentifierExpr>();
+  }
+
+  [ContractInvariantMethod]
+  void ObjectInvariant() {
+    Contract.Invariant(Lhs != null);
+    Contract.Invariant(Rhs != null);
+  }
+
+  public SingleAssignStmt Clone(Cloner cloner) {
+    return new SingleAssignStmt(cloner, this);
+  }
+
+  public SingleAssignStmt(Cloner cloner, SingleAssignStmt original) : base(cloner, original) {
+    Lhs = cloner.CloneExpr(original.Lhs);
+    Rhs = cloner.CloneRHS(original.Rhs);
+  }
+
+  public SingleAssignStmt(IOrigin origin, Expression lhs, AssignmentRhs rhs)
+    : base(origin) {
+    Contract.Requires(origin != null);
+    Contract.Requires(lhs != null);
+    Contract.Requires(rhs != null);
+    Lhs = lhs;
+    Rhs = rhs;
+  }
+
+  public override IEnumerable<Statement> SubStatements {
+    get {
+      foreach (var s in Rhs.SubStatements) {
+        yield return s;
+      }
+    }
+  }
+
+  public override IEnumerable<Statement> PreResolveSubStatements {
+    get {
+      foreach (var s in Rhs.PreResolveSubStatements) {
+        yield return s;
+      }
+    }
+  }
+
+  public override IEnumerable<Expression> NonSpecificationSubExpressions {
+    get {
+      foreach (var e in base.NonSpecificationSubExpressions) { yield return e; }
+      yield return Lhs;
+      foreach (var ee in Rhs.NonSpecificationSubExpressions) {
+        yield return ee;
+      }
+    }
+  }
+
+  public override IEnumerable<Expression> SpecificationSubExpressions {
+    get {
+      foreach (var e in base.SpecificationSubExpressions) { yield return e; }
+      foreach (var ee in Rhs.SpecificationSubExpressions) {
+        yield return ee;
+      }
+    }
+  }
+
+  /// <summary>
+  /// This method assumes "lhs" has been successfully resolved.
+  /// </summary>
+  public static bool LhsIsToGhost(Expression lhs) {
+    Contract.Requires(lhs != null);
+    return LhsIsToGhost_Which(lhs) == NonGhostKind.IsGhost;
+  }
+  public static bool LhsIsToGhostOrAutoGhost(Expression lhs) {
+    Contract.Requires(lhs != null);
+    return LhsIsToGhost_Which(lhs) == NonGhostKind.IsGhost || lhs.Resolved is AutoGhostIdentifierExpr;
+  }
+  public enum NonGhostKind { IsGhost, Variable, Field, ArrayElement }
+  public static string NonGhostKind_To_String(NonGhostKind gk) {
+    Contract.Requires(gk != NonGhostKind.IsGhost);
+    switch (gk) {
+      case NonGhostKind.Variable: return "non-ghost variable";
+      case NonGhostKind.Field: return "non-ghost field";
+      case NonGhostKind.ArrayElement: return "array element";
+      default:
+        Contract.Assume(false);  // unexpected NonGhostKind
+        throw new cce.UnreachableException();  // please compiler
+    }
+  }
+  /// <summary>
+  /// This method assumes "lhs" has been successfully resolved.
+  /// </summary>
+  public static NonGhostKind LhsIsToGhost_Which(Expression lhs) {
+    Contract.Requires(lhs != null);
+    lhs = lhs.Resolved;
+    if (lhs is AutoGhostIdentifierExpr) {
+      // TODO: Should we return something different for this case?
+      var x = (IdentifierExpr)lhs;
+      if (!x.Var.IsGhost) {
+        return NonGhostKind.Variable;
+      }
+    } else if (lhs is IdentifierExpr) {
+      var x = (IdentifierExpr)lhs;
+      if (!x.Var.IsGhost) {
+        return NonGhostKind.Variable;
+      }
+    } else if (lhs is MemberSelectExpr) {
+      var x = (MemberSelectExpr)lhs;
+      if (!x.Member.IsGhost) {
+        return NonGhostKind.Field;
+      }
+    } else {
+      // LHS denotes an array element, which is always non-ghost
+      return NonGhostKind.ArrayElement;
+    }
+    return NonGhostKind.IsGhost;
+  }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    var lhs = Lhs.Resolved;
+
+    // Make an auto-ghost variable a ghost if the RHS is a ghost
+    if (lhs.Resolved is AutoGhostIdentifierExpr autoGhostIdExpr) {
+      if (Rhs is ExprRhs eRhs && ExpressionTester.UsesSpecFeatures(eRhs.Expr)) {
+        autoGhostIdExpr.Var.MakeGhost();
+      } else if (Rhs is TypeRhs tRhs) {
+        if (tRhs.InitCall != null && tRhs.InitCall.Method.IsGhost) {
+          autoGhostIdExpr.Var.MakeGhost();
+        } else if (tRhs.ArrayDimensions != null && tRhs.ArrayDimensions.Exists(ExpressionTester.UsesSpecFeatures)) {
+          autoGhostIdExpr.Var.MakeGhost();
+        } else if (tRhs.ElementInit != null && ExpressionTester.UsesSpecFeatures(tRhs.ElementInit)) {
+          autoGhostIdExpr.Var.MakeGhost();
+        } else if (tRhs.InitDisplay != null && tRhs.InitDisplay.Any(ExpressionTester.UsesSpecFeatures)) {
+          autoGhostIdExpr.Var.MakeGhost();
+        }
+      }
+    }
+
+    if (proofContext != null && Rhs is TypeRhs) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_new_forbidden_in_proof, Rhs.Origin, $"{proofContext} is not allowed to use 'new'");
+    }
+
+    var gk = LhsIsToGhost_Which(lhs);
+    if (gk == NonGhostKind.IsGhost) {
+      IsGhost = true;
+      if (proofContext != null && !(lhs is IdentifierExpr)) {
+        reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_no_heap_update_in_proof, lhs.Origin, $"{proofContext} is not allowed to make heap updates");
+      }
+      if (Rhs is TypeRhs tRhs && tRhs.InitCall != null) {
+        tRhs.InitCall.ResolveGhostness(resolver, reporter, true, codeContext, proofContext, allowAssumptionVariables, inConstructorInitializationPhase);
+      }
+    } else if (gk == NonGhostKind.Variable && codeContext.IsGhost) {
+      // cool
+    } else if (mustBeErasable) {
+      if (inConstructorInitializationPhase && codeContext is Constructor && codeContext.IsGhost && lhs is MemberSelectExpr mse &&
+          mse.Obj.Resolved is ThisExpr) {
+        // in this first division (before "new;") of a ghost constructor, allow assignment to non-ghost field of the object being constructed
+      } else {
+        string reason;
+        if (codeContext.IsGhost) {
+          reason = string.Format("this is a ghost {0}", codeContext is MemberDecl member ? member.WhatKind : "context");
+        } else {
+          reason = "the statement is in a ghost context; e.g., it may be guarded by a specification-only expression";
+        }
+        reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_assignment_forbidden_in_context, this, $"assignment to {NonGhostKind_To_String(gk)} is not allowed in this context, because {reason}");
+      }
+    } else {
+      if (gk == NonGhostKind.Field) {
+        var mse = (MemberSelectExpr)lhs;
+        ExpressionTester.CheckIsCompilable(resolver, reporter, mse.Obj, codeContext);
+      } else if (gk == NonGhostKind.ArrayElement) {
+        ExpressionTester.CheckIsCompilable(resolver, reporter, lhs, codeContext);
+      }
+
+      if (Rhs is ExprRhs) {
+        var rhs = (ExprRhs)Rhs;
+        if (!LhsIsToGhost(lhs)) {
+          ExpressionTester.CheckIsCompilable(resolver, reporter, rhs.Expr, codeContext);
+        }
+      } else if (Rhs is HavocRhs) {
+        // cool
+      } else {
+        var rhs = (TypeRhs)Rhs;
+        if (rhs.ArrayDimensions != null) {
+          rhs.ArrayDimensions.ForEach(ee => ExpressionTester.CheckIsCompilable(resolver, reporter, ee, codeContext));
+          if (rhs.ElementInit != null) {
+            ExpressionTester.CheckIsCompilable(resolver, reporter, rhs.ElementInit, codeContext);
+          }
+          if (rhs.InitDisplay != null) {
+            rhs.InitDisplay.ForEach(ee => ExpressionTester.CheckIsCompilable(resolver, reporter, ee, codeContext));
+          }
+        }
+        if (rhs.InitCall != null) {
+          var callee = rhs.InitCall.Method;
+          if (callee.IsGhost) {
+            reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_assignment_to_ghost_constructor_only_in_ghost,
+              rhs.InitCall, "the result of a ghost constructor can only be assigned to a ghost variable");
+          }
+          for (var i = 0; i < rhs.InitCall.Args.Count; i++) {
+            if (!callee.Ins[i].IsGhost) {
+              ExpressionTester.CheckIsCompilable(resolver, reporter, rhs.InitCall.Args[i], codeContext);
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Assignment/TypeRhs.cs b/Source/DafnyCore/AST/Statements/Assignment/TypeRhs.cs
index 532e74227a3..99e19b86be1 100644
--- a/Source/DafnyCore/AST/Statements/Assignment/TypeRhs.cs
+++ b/Source/DafnyCore/AST/Statements/Assignment/TypeRhs.cs
@@ -37,7 +37,7 @@ public class TypeRhs : AssignmentRhs, ICloneable<TypeRhs> {
   ///     ElementInit is non-null to represent "new EType[ArrayDimensions] (elementInit)",
   ///     InitDisplay is non-null to represent "new EType[ArrayDimensions] [InitDisplay]",
   ///     and Arguments, Path, and InitCall are all null.
-  /// If ArrayDimentions == null && Arguments == null, then the TypeRhs represents "new EType"
+  /// If ArrayDimensions == null && Arguments == null, then the TypeRhs represents "new EType"
   ///     and ElementInit, Path, and InitCall are all null.
   /// If Arguments != null, then the TypeRhs represents "new Path(Arguments)"
   ///     and EType and InitCall is filled in by resolution, and ArrayDimensions == null and ElementInit == null.
@@ -80,7 +80,7 @@ public TypeRhs(Cloner cloner, TypeRhs original)
     }
 
     if (cloner.CloneResolvedFields) {
-      InitCall = cloner.CloneStmt(original.InitCall) as CallStmt;
+      InitCall = cloner.CloneStmt(original.InitCall, false) as CallStmt;
       Type = cloner.CloneType(original.Type);
     }
   }
@@ -99,18 +99,18 @@ void ObjectInvariant() {
     Contract.Invariant(!(ArrayDimensions == null && Bindings == null) || (Path == null && InitCall == null && ElementInit == null && InitDisplay == null));
   }
 
-  public TypeRhs(IToken tok, Type type, List<Expression> arrayDimensions, Expression elementInit)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public TypeRhs(IOrigin origin, Type type, List<Expression> arrayDimensions, Expression elementInit)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(type != null);
     Contract.Requires(arrayDimensions != null && 1 <= arrayDimensions.Count);
     EType = type;
     ArrayDimensions = arrayDimensions;
     ElementInit = elementInit;
   }
-  public TypeRhs(IToken tok, Type type, Expression dim, List<Expression> initDisplay)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public TypeRhs(IOrigin origin, Type type, Expression dim, List<Expression> initDisplay)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(type != null);
     Contract.Requires(dim != null);
     Contract.Requires(initDisplay != null);
@@ -118,15 +118,15 @@ public TypeRhs(IToken tok, Type type, Expression dim, List<Expression> initDispl
     ArrayDimensions = new List<Expression> { dim };
     InitDisplay = initDisplay;
   }
-  public TypeRhs(IToken tok, Type type)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public TypeRhs(IOrigin origin, Type type)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(type != null);
     EType = type;
   }
-  public TypeRhs(IToken tok, Type path, List<ActualBinding> arguments)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public TypeRhs(IOrigin origin, Type path, List<ActualBinding> arguments)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(path != null);
     Contract.Requires(arguments != null);
     Path = path;
@@ -176,10 +176,14 @@ public override IEnumerable<Statement> SubStatements {
     }
   }
 
-  public IToken Start => Tok;
+  public IOrigin Start => Origin;
 
   public override IEnumerable<INode> Children {
     get {
+      if (Type == null) {
+        return PreResolveChildren;
+      }
+
       if (ArrayDimensions == null) {
         if (InitCall != null) {
           return new[] { InitCall };
diff --git a/Source/DafnyCore/AST/Statements/Assignment/UpdateStmt.cs b/Source/DafnyCore/AST/Statements/Assignment/UpdateStmt.cs
deleted file mode 100644
index 1f6d4ca1297..00000000000
--- a/Source/DafnyCore/AST/Statements/Assignment/UpdateStmt.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-
-namespace Microsoft.Dafny;
-
-public class UpdateStmt : ConcreteUpdateStatement, ICloneable<UpdateStmt>, ICanResolve {
-  public readonly List<AssignmentRhs> Rhss;
-  public readonly bool CanMutateKnownState;
-  public Expression OriginalInitialLhs = null;
-
-  public override IToken Tok {
-    get {
-      var firstRhs = Rhss.First();
-      if (firstRhs.StartToken != StartToken) {
-        // If there is an operator, use it as a token
-        return firstRhs.StartToken.Prev;
-      }
-
-      return firstRhs.Tok;
-    }
-  }
-
-  [FilledInDuringResolution] public List<Statement> ResolvedStatements;
-  public override IEnumerable<Statement> SubStatements => Children.OfType<Statement>();
-
-  public override IEnumerable<INode> Children => ResolvedStatements ?? Lhss.Concat<Node>(Rhss);
-  public override IEnumerable<INode> PreResolveChildren => Lhss.Concat<Node>(Rhss);
-
-  public override IEnumerable<Statement> PreResolveSubStatements => Enumerable.Empty<Statement>();
-
-  [ContractInvariantMethod]
-  void ObjectInvariant() {
-    Contract.Invariant(cce.NonNullElements(Lhss));
-    Contract.Invariant(cce.NonNullElements(Rhss));
-  }
-
-  public UpdateStmt Clone(Cloner cloner) {
-    return new UpdateStmt(cloner, this);
-  }
-
-  public UpdateStmt(Cloner cloner, UpdateStmt original) : base(cloner, original) {
-    Rhss = original.Rhss.Select(cloner.CloneRHS).ToList();
-    CanMutateKnownState = original.CanMutateKnownState;
-    if (cloner.CloneResolvedFields) {
-      ResolvedStatements = original.ResolvedStatements.Select(cloner.CloneStmt).ToList();
-    }
-  }
-
-  public UpdateStmt(RangeToken rangeToken, List<Expression> lhss, List<AssignmentRhs> rhss)
-    : base(rangeToken, lhss) {
-    Contract.Requires(cce.NonNullElements(lhss));
-    Contract.Requires(cce.NonNullElements(rhss));
-    Contract.Requires(lhss.Count != 0 || rhss.Count == 1);
-    Rhss = rhss;
-    CanMutateKnownState = false;
-  }
-  public UpdateStmt(RangeToken rangeToken, List<Expression> lhss, List<AssignmentRhs> rhss, bool mutate)
-    : base(rangeToken, lhss) {
-    Contract.Requires(cce.NonNullElements(lhss));
-    Contract.Requires(cce.NonNullElements(rhss));
-    Contract.Requires(lhss.Count != 0 || rhss.Count == 1);
-    Rhss = rhss;
-    CanMutateKnownState = mutate;
-  }
-  public override IEnumerable<Expression> PreResolveSubExpressions {
-    get {
-      foreach (var e in base.PreResolveSubExpressions) {
-        yield return e;
-      }
-      foreach (var rhs in Rhss) {
-        foreach (var e in rhs.PreResolveSubExpressions) {
-          yield return e;
-        }
-      }
-    }
-  }
-
-  /// <summary>
-  /// Resolve the RHSs and entire UpdateStmt (LHSs should already have been checked by the caller).
-  /// errorCountBeforeCheckingLhs is passed in so that this method can determined if any resolution errors were found during
-  /// LHS or RHS checking, because only if no errors were found is update.ResolvedStmt changed.
-  /// </summary>
-  public override void Resolve(ModuleResolver resolver, ResolutionContext resolutionContext) {
-    Contract.Requires(this != null);
-    Contract.Requires(resolutionContext != null);
-
-    int errorCountBeforeCheckingLhs = resolver.Reporter.Count(ErrorLevel.Error);
-
-    base.Resolve(resolver, resolutionContext);
-
-    IToken firstEffectfulRhs = null;
-    ModuleResolver.MethodCallInformation methodCallInfo = null;
-    ResolvedStatements = new();
-    foreach (var rhs in Rhss) {
-      bool isEffectful;
-      if (rhs is TypeRhs) {
-        var tr = (TypeRhs)rhs;
-        resolver.ResolveTypeRhs(tr, this, resolutionContext);
-        isEffectful = tr.InitCall != null;
-      } else if (rhs is HavocRhs) {
-        isEffectful = false;
-      } else {
-        var er = (ExprRhs)rhs;
-        if (er.Expr is ApplySuffix) {
-          var a = (ApplySuffix)er.Expr;
-          var cRhs = resolver.ResolveApplySuffix(a, resolutionContext, true);
-          isEffectful = cRhs != null;
-          methodCallInfo = methodCallInfo ?? cRhs;
-        } else {
-          resolver.ResolveExpression(er.Expr, resolutionContext);
-          isEffectful = false;
-        }
-      }
-      if (isEffectful && firstEffectfulRhs == null) {
-        firstEffectfulRhs = rhs.Tok;
-      }
-
-      resolver.ResolveAttributes(rhs, resolutionContext);
-    }
-
-    // figure out what kind of UpdateStmt this is
-    if (firstEffectfulRhs == null) {
-      if (Lhss.Count == 0) {
-        Contract.Assert(Rhss.Count == 1);  // guaranteed by the parser
-        resolver.reporter.Error(MessageSource.Resolver, this, "expected method call, found expression");
-      } else if (Lhss.Count != Rhss.Count) {
-        resolver.reporter.Error(MessageSource.Resolver, this, "the number of left-hand sides ({0}) and right-hand sides ({1}) must match for a multi-assignment", Lhss.Count, Rhss.Count);
-      } else if (resolver.reporter.Count(ErrorLevel.Error) == errorCountBeforeCheckingLhs) {
-        // add the statements here in a sequence, but don't use that sequence later for translation (instead, should translate properly as multi-assignment)
-        for (int i = 0; i < Lhss.Count; i++) {
-          var a = new AssignStmt(RangeToken, Lhss[i].Resolved, Rhss[i]);
-          ResolvedStatements.Add(a);
-        }
-      }
-
-    } else if (CanMutateKnownState) {
-      if (1 < Rhss.Count) {
-        resolver.reporter.Error(MessageSource.Resolver, firstEffectfulRhs, "cannot have effectful parameter in multi-return statement.");
-      } else { // it might be ok, if it is a TypeRhs
-        Contract.Assert(Rhss.Count == 1);
-        if (methodCallInfo != null) {
-          resolver.reporter.Error(MessageSource.Resolver, methodCallInfo.Tok, "cannot have method call in return statement.");
-        } else {
-          // we have a TypeRhs
-          Contract.Assert(Rhss[0] is TypeRhs);
-          var tr = (TypeRhs)Rhss[0];
-          Contract.Assert(tr.InitCall != null); // there were effects, so this must have been a call.
-          if (tr.CanAffectPreviouslyKnownExpressions) {
-            resolver.reporter.Error(MessageSource.Resolver, tr.Tok, "can only have initialization methods which modify at most 'this'.");
-          } else if (resolver.reporter.Count(ErrorLevel.Error) == errorCountBeforeCheckingLhs) {
-            var a = new AssignStmt(RangeToken, Lhss[0].Resolved, tr);
-            ResolvedStatements.Add(a);
-          }
-        }
-      }
-
-    } else {
-      // if there was an effectful RHS, that must be the only RHS
-      if (Rhss.Count != 1) {
-        resolver.reporter.Error(MessageSource.Resolver, firstEffectfulRhs, "an update statement is allowed an effectful RHS only if there is just one RHS");
-      } else if (methodCallInfo == null) {
-        // must be a single TypeRhs
-        if (Lhss.Count != 1) {
-          Contract.Assert(2 <= Lhss.Count);  // the parser allows 0 Lhss only if the whole statement looks like an expression (not a TypeRhs)
-          resolver.reporter.Error(MessageSource.Resolver, Lhss[1].tok, "the number of left-hand sides ({0}) and right-hand sides ({1}) must match for a multi-assignment", Lhss.Count, Rhss.Count);
-        } else if (resolver.reporter.Count(ErrorLevel.Error) == errorCountBeforeCheckingLhs) {
-          var a = new AssignStmt(RangeToken, Lhss[0].Resolved, Rhss[0]);
-          ResolvedStatements.Add(a);
-        }
-      } else if (resolver.reporter.Count(ErrorLevel.Error) == errorCountBeforeCheckingLhs) {
-        // a call statement
-        var resolvedLhss = new List<Expression>();
-        foreach (var ll in Lhss) {
-          resolvedLhss.Add(ll.Resolved);
-        }
-        CallStmt a = new CallStmt(RangeToken, resolvedLhss, methodCallInfo.Callee, methodCallInfo.ActualParameters, methodCallInfo.Tok);
-        a.OriginalInitialLhs = OriginalInitialLhs;
-        ResolvedStatements.Add(a);
-      }
-    }
-
-    foreach (var a in ResolvedStatements) {
-      resolver.ResolveStatement(a, resolutionContext);
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Assignment/VarDeclPattern.cs b/Source/DafnyCore/AST/Statements/Assignment/VarDeclPattern.cs
index 2926403b600..3289459d012 100644
--- a/Source/DafnyCore/AST/Statements/Assignment/VarDeclPattern.cs
+++ b/Source/DafnyCore/AST/Statements/Assignment/VarDeclPattern.cs
@@ -18,8 +18,8 @@ public VarDeclPattern(Cloner cloner, VarDeclPattern original) : base(cloner, ori
     HasGhostModifier = original.HasGhostModifier;
   }
 
-  public VarDeclPattern(RangeToken rangeToken, CasePattern<LocalVariable> lhs, Expression rhs, bool hasGhostModifier)
-    : base(rangeToken) {
+  public VarDeclPattern(IOrigin origin, CasePattern<LocalVariable> lhs, Expression rhs, bool hasGhostModifier)
+    : base(origin) {
     LHS = lhs;
     RHS = rhs;
     HasGhostModifier = hasGhostModifier;
@@ -48,4 +48,28 @@ public IEnumerable<LocalVariable> LocalVars {
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     return formatter.SetIndentVarDeclStmt(indentBefore, OwnedTokens, false, true);
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    if (mustBeErasable) {
+      foreach (var local in LocalVars) {
+        local.MakeGhost();
+      }
+    }
+    if (HasGhostModifier || mustBeErasable) {
+      IsGhost = LocalVars.All(v => v.IsGhost);
+    } else {
+      var spec = ExpressionTester.UsesSpecFeatures(RHS);
+      if (spec) {
+        foreach (var local in LocalVars) {
+          local.MakeGhost();
+        }
+      } else {
+        ExpressionTester.CheckIsCompilable(resolver, reporter, RHS, codeContext);
+      }
+      IsGhost = spec;
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Assignment/VarDeclStmt.cs b/Source/DafnyCore/AST/Statements/Assignment/VarDeclStmt.cs
index 9f11344f00b..eec3194d618 100644
--- a/Source/DafnyCore/AST/Statements/Assignment/VarDeclStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Assignment/VarDeclStmt.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Dafny;
 
 public class VarDeclStmt : Statement, ICloneable<VarDeclStmt>, ICanFormat {
   public readonly List<LocalVariable> Locals;
-  public readonly ConcreteUpdateStatement Update;
+  public readonly ConcreteAssignStatement Assign;
   [ContractInvariantMethod]
   void ObjectInvariant() {
     Contract.Invariant(cce.NonNullElements(Locals));
@@ -19,20 +19,20 @@ public VarDeclStmt Clone(Cloner cloner) {
 
   public VarDeclStmt(Cloner cloner, VarDeclStmt original) : base(cloner, original) {
     Locals = original.Locals.Select(l => cloner.CloneLocalVariable(l, false)).ToList();
-    Update = (ConcreteUpdateStatement)cloner.CloneStmt(original.Update);
+    Assign = (ConcreteAssignStatement)cloner.CloneStmt(original.Assign, false);
   }
 
-  public VarDeclStmt(RangeToken rangeToken, List<LocalVariable> locals, ConcreteUpdateStatement update)
-    : base(rangeToken) {
+  public VarDeclStmt(IOrigin origin, List<LocalVariable> locals, ConcreteAssignStatement assign)
+    : base(origin) {
     Contract.Requires(locals != null);
     Contract.Requires(locals.Count != 0);
 
     Locals = locals;
-    Update = update;
+    Assign = assign;
   }
 
   public override IEnumerable<Statement> SubStatements {
-    get { if (Update != null) { yield return Update; } }
+    get { if (Assign != null) { yield return Assign; } }
   }
 
   public override IEnumerable<Expression> SpecificationSubExpressions {
@@ -43,12 +43,6 @@ public override IEnumerable<Expression> SpecificationSubExpressions {
           yield return e;
         }
       }
-
-      if (this.Update != null) {
-        foreach (var e in this.Update.NonSpecificationSubExpressions) {
-          yield return e;
-        }
-      }
     }
   }
 
@@ -57,6 +51,40 @@ public override IEnumerable<Expression> SpecificationSubExpressions {
   public override IEnumerable<INode> PreResolveChildren => Children;
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     var result = formatter.SetIndentVarDeclStmt(indentBefore, OwnedTokens, false, false);
-    return Update != null ? formatter.SetIndentUpdateStmt(Update, indentBefore, true) : result;
+    return Assign != null ? formatter.SetIndentUpdateStmt(Assign, indentBefore, true) : result;
+  }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    if (mustBeErasable) {
+      foreach (var local in Locals) {
+        // a local variable in a specification-only context might as well be ghost
+        local.MakeGhost();
+      }
+    }
+    if (Assign != null) {
+      Assign.ResolveGhostness(resolver, reporter, mustBeErasable, codeContext, proofContext, allowAssumptionVariables, inConstructorInitializationPhase);
+    }
+    IsGhost = (Assign == null || Assign.IsGhost) && Locals.All(v => v.IsGhost);
+
+    // Check on "assumption" variables
+    foreach (var local in Locals) {
+      if (Attributes.Contains(local.Attributes, "assumption")) {
+        if (allowAssumptionVariables) {
+          if (!local.Type.IsBoolType) {
+            reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_assumption_var_must_be_bool, local.Origin,
+              "assumption variable must be of type 'bool'");
+          }
+          if (!local.IsGhost) {
+            reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_assumption_var_must_be_ghost, local.Origin,
+              "assumption variable must be ghost");
+          }
+        } else {
+          reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_assumption_var_must_be_in_method, local.Origin,
+            "assumption variable can only be declared in a method");
+        }
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/BlockByProofStmt.cs b/Source/DafnyCore/AST/Statements/BlockByProofStmt.cs
new file mode 100644
index 00000000000..ebade64175a
--- /dev/null
+++ b/Source/DafnyCore/AST/Statements/BlockByProofStmt.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Microsoft.Dafny;
+
+public class BlockByProofStmt : Statement, ICanResolveNewAndOld, ICanPrint,
+  ICloneable<Statement>, ICanFormat {
+
+  public Statement Body { get; }
+  public BlockStmt Proof { get; }
+  public BlockByProofStmt(IOrigin range, BlockStmt proof, Statement body) : base(range) {
+    Proof = proof;
+    Body = body;
+  }
+  public BlockByProofStmt(Cloner cloner, BlockByProofStmt original) : base(cloner, original) {
+    Proof = cloner.CloneBlockStmt(original.Proof);
+    Body = cloner.CloneStmt(original.Body, false);
+  }
+
+  public override IEnumerable<Statement> SubStatements => new[] { Body, Proof };
+
+  public override void GenResolve(INewOrOldResolver resolver, ResolutionContext resolutionContext) {
+    resolver.ResolveStatement(Body, resolutionContext);
+    ResolveByProof(resolver, Proof, resolutionContext);
+    base.GenResolve(resolver, resolutionContext);
+  }
+
+  internal static void ResolveByProof(INewOrOldResolver resolver, BlockStmt proof, ResolutionContext resolutionContext) {
+    if (proof == null) {
+      return;
+    }
+
+    // clear the labels for the duration of checking the proof body, because break statements are not allowed to leave the proof body
+    var prevLblStmts = resolver.EnclosingStatementLabels;
+    var prevLoopStack = resolver.LoopStack;
+    resolver.EnclosingStatementLabels = new Scope<Statement>(resolver.Options);
+    resolver.LoopStack = new List<Statement>();
+    resolver.ResolveStatement(proof, resolutionContext);
+    resolver.EnclosingStatementLabels = prevLblStmts;
+    resolver.LoopStack = prevLoopStack;
+  }
+
+  public void Render(TextWriter wr, Printer printer, int indent) {
+    printer.PrintStatement(Body, indent, false);
+    wr.Write(" by ");
+    printer.PrintBlockStmt(Proof, indent);
+  }
+
+  public Statement Clone(Cloner cloner) {
+    return new BlockByProofStmt(cloner, this);
+  }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = mustBeErasable;  // set .IsGhost before descending into substatements (since substatements may do a 'break' out of this block)
+    Body.ResolveGhostness(resolver, reporter, mustBeErasable, codeContext, proofContext, allowAssumptionVariables, inConstructorInitializationPhase);
+    IsGhost = IsGhost || Body.IsGhost;
+
+    Proof.ResolveGhostness(resolver, reporter, true, codeContext, "a by block", allowAssumptionVariables, inConstructorInitializationPhase);
+  }
+
+  public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
+    formatter.SetStatementIndentation(Body);
+    Proof.SetIndent(indentBefore, formatter);
+    return false;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/BlockStmt.cs b/Source/DafnyCore/AST/Statements/BlockStmt.cs
index 4c55aa99096..d43fa0ef971 100644
--- a/Source/DafnyCore/AST/Statements/BlockStmt.cs
+++ b/Source/DafnyCore/AST/Statements/BlockStmt.cs
@@ -12,14 +12,14 @@ public BlockStmt Clone(Cloner cloner) {
   }
 
   protected BlockStmt(Cloner cloner, BlockStmt original) : base(cloner, original) {
-    Body = original.Body.Select(cloner.CloneStmt).ToList();
+    Body = original.Body.Select(stmt => cloner.CloneStmt(stmt, false)).ToList();
   }
 
-  public BlockStmt(RangeToken rangeToken, [Captured] List<Statement> body)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
+  public BlockStmt(IOrigin origin, [Captured] List<Statement> body)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(body));
-    this.Body = body;
+    Body = body;
   }
 
   public override IEnumerable<Statement> SubStatements => Body;
@@ -61,14 +61,31 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
       }
     }
 
-    foreach (var blockStmtBody in Body) {
-      if (blockStmtBody is not BlockStmt && OwnedTokens.Any()) {
-        formatter.SetIndentations(blockStmtBody.StartToken, innerBlockIndent, innerBlockIndent);
+    foreach (var childStatement in Body) {
+      if (childStatement is not BlockStmt or BlockByProofStmt && OwnedTokens.Any()) {
+        formatter.SetIndentations(childStatement.StartToken, innerBlockIndent, innerBlockIndent);
       }
 
-      formatter.Visit(blockStmtBody, indentBefore + formatter.SpaceTab);
+      formatter.Visit(childStatement, indentBefore + formatter.SpaceTab);
     }
 
     return false;
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = mustBeErasable;  // set .IsGhost before descending into substatements (since substatements may do a 'break' out of this block)
+    if (this is DividedBlockStmt ds) {
+      ds.BodyInit.ForEach(ss =>
+        ss.ResolveGhostness(resolver, reporter, mustBeErasable, codeContext, proofContext, allowAssumptionVariables, true));
+      ds.BodyProper.ForEach(ss =>
+        ss.ResolveGhostness(resolver, reporter, mustBeErasable, codeContext, proofContext, allowAssumptionVariables,
+          inConstructorInitializationPhase));
+    } else {
+      Body.ForEach(ss => ss.ResolveGhostness(resolver, reporter, mustBeErasable, codeContext, proofContext,
+        allowAssumptionVariables, inConstructorInitializationPhase));
+    }
+    IsGhost = IsGhost || Body.All(ss => ss.IsGhost);  // mark the block statement as ghost if all its substatements are ghost
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/CalcStmt.cs b/Source/DafnyCore/AST/Statements/CalcStmt.cs
index a4d5d14af45..ab141b12989 100644
--- a/Source/DafnyCore/AST/Statements/CalcStmt.cs
+++ b/Source/DafnyCore/AST/Statements/CalcStmt.cs
@@ -102,9 +102,9 @@ public override CalcOp ResultOp(CalcOp other) {
     public override Expression StepExpr(Expression line0, Expression line1) {
       if (Op == BinaryExpr.Opcode.Exp) {
         // The order of operands is reversed so that it can be turned into implication during resolution
-        return new BinaryExpr(new AutoGeneratedToken(line0.tok), Op, line1, line0);
+        return new BinaryExpr(new AutoGeneratedOrigin(line0.Origin), Op, line1, line0);
       } else {
-        return new BinaryExpr(new AutoGeneratedToken(line0.tok), Op, line0, line1);
+        return new BinaryExpr(new AutoGeneratedOrigin(line0.Origin), Op, line0, line1);
       }
     }
 
@@ -136,7 +136,7 @@ public override CalcOp ResultOp(CalcOp other) {
       } else if (other is TernaryCalcOp) {
         var a = Index;
         var b = ((TernaryCalcOp)other).Index;
-        var minIndex = new ITEExpr(a.tok, false, new BinaryExpr(a.tok, BinaryExpr.Opcode.Le, a, b), a, b);
+        var minIndex = new ITEExpr(a.Origin, false, new BinaryExpr(a.Origin, BinaryExpr.Opcode.Le, a, b), a, b);
         return new TernaryCalcOp(minIndex); // ToDo: if we could compare expressions for syntactic equality, we could use this here to optimize
       } else {
         Contract.Assert(false);
@@ -145,7 +145,7 @@ public override CalcOp ResultOp(CalcOp other) {
     }
 
     public override Expression StepExpr(Expression line0, Expression line1) {
-      return new TernaryExpr(new AutoGeneratedToken(line0.tok), TernaryExpr.Opcode.PrefixEqOp, Index, line0, line1);
+      return new TernaryExpr(new AutoGeneratedOrigin(line0.Origin), TernaryExpr.Opcode.PrefixEqOp, Index, line0, line1);
     }
 
     public override string ToString() {
@@ -223,9 +223,9 @@ void ObjectInvariant() {
     Contract.Invariant(StepOps.Count == Hints.Count);
   }
 
-  public CalcStmt(RangeToken rangeToken, CalcOp userSuppliedOp, List<Expression> lines, List<BlockStmt> hints, List<CalcOp/*?*/> stepOps, Attributes attrs)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
+  public CalcStmt(IOrigin origin, CalcOp userSuppliedOp, List<Expression> lines, List<BlockStmt> hints, List<CalcOp/*?*/> stepOps, Attributes attrs)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(lines != null);
     Contract.Requires(hints != null);
     Contract.Requires(stepOps != null);
@@ -416,7 +416,7 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
 
     foreach (var hint in Hints) {
       // This block
-      if (hint.Tok.pos != hint.EndToken.pos) {
+      if (hint.Origin.pos != hint.EndToken.pos) {
         foreach (var hintStep in hint.Body) {
           formatter.SetOpeningIndentedRegion(hintStep.StartToken, indentBefore + formatter.SpaceTab + extraHintIndent);
         }
@@ -429,4 +429,14 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
 
     return true;
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = true;
+    foreach (var hint in Hints) {
+      hint.ResolveGhostness(resolver, reporter, true, codeContext, "a hint", allowAssumptionVariables,
+        inConstructorInitializationPhase);
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/AlternativeLoopStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/AlternativeLoopStmt.cs
index 4f97b94e872..ff3abe6a751 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/AlternativeLoopStmt.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/AlternativeLoopStmt.cs
@@ -21,19 +21,19 @@ public AlternativeLoopStmt(Cloner cloner, AlternativeLoopStmt original) : base(c
     UsesOptionalBraces = original.UsesOptionalBraces;
   }
 
-  public AlternativeLoopStmt(RangeToken rangeToken,
+  public AlternativeLoopStmt(IOrigin origin,
     List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod,
     List<GuardedAlternative> alternatives, bool usesOptionalBraces)
-    : base(rangeToken, invariants, decreases, mod) {
+    : base(origin, invariants, decreases, mod) {
     Contract.Requires(alternatives != null);
     this.Alternatives = alternatives;
     this.UsesOptionalBraces = usesOptionalBraces;
   }
-  public AlternativeLoopStmt(RangeToken rangeToken,
+  public AlternativeLoopStmt(IOrigin origin,
     List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod,
     List<GuardedAlternative> alternatives, bool usesOptionalBraces, Attributes attrs)
-    : base(rangeToken, invariants, decreases, mod, attrs) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, invariants, decreases, mod, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(alternatives != null);
     this.Alternatives = alternatives;
     this.UsesOptionalBraces = usesOptionalBraces;
@@ -85,4 +85,37 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
       }
     });
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+
+    var s = this;
+    if (proofContext != null && s.Mod.Expressions != null && s.Mod.Expressions.Count != 0) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_loop_in_proof_may_not_use_modifies, s.Mod.Expressions[0].Origin, $"a loop in {proofContext} is not allowed to use 'modifies' clauses");
+    }
+
+    s.IsGhost = mustBeErasable || s.Alternatives.Exists(alt => ExpressionTester.UsesSpecFeatures(alt.Guard));
+    if (!mustBeErasable && s.IsGhost) {
+      reporter.Info(MessageSource.Resolver, s.Origin, "ghost while");
+    }
+    if (s.IsGhost && s.Decreases.Expressions.Exists(e => e is WildcardExpr)) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_decreases_forbidden_on_ghost_loops, s, "'decreases *' is not allowed on ghost loops");
+    }
+    if (s.IsGhost && s.Mod.Expressions != null) {
+      s.Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
+    }
+
+    s.Alternatives.ForEach(alt => alt.Body.ForEach(ss =>
+      ss.ResolveGhostness(resolver, reporter, s.IsGhost, codeContext,
+      proofContext, allowAssumptionVariables, inConstructorInitializationPhase)));
+    s.IsGhost = s.IsGhost || (!s.Decreases.Expressions.Exists(e => e is WildcardExpr) && s.Alternatives.All(alt => alt.Body.All(ss => ss.IsGhost)));
+    if (!s.IsGhost) {
+      // If there were features in the guards that are treated differently in ghost and non-ghost
+      // contexts, make sure they get treated for non-ghost use.
+      foreach (var alt in s.Alternatives) {
+        ExpressionTester.CheckIsCompilable(resolver, reporter, alt.Guard, codeContext);
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/AlternativeStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/AlternativeStmt.cs
index 60e52485d2a..e0a1345028e 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/AlternativeStmt.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/AlternativeStmt.cs
@@ -21,17 +21,17 @@ public AlternativeStmt(Cloner cloner, AlternativeStmt original) : base(cloner, o
     UsesOptionalBraces = original.UsesOptionalBraces;
   }
 
-  public AlternativeStmt(RangeToken rangeToken, List<GuardedAlternative> alternatives, bool usesOptionalBraces)
-    : base(rangeToken) {
+  public AlternativeStmt(IOrigin origin, List<GuardedAlternative> alternatives, bool usesOptionalBraces)
+    : base(origin) {
     Contract.Requires(alternatives != null);
-    this.Alternatives = alternatives;
-    this.UsesOptionalBraces = usesOptionalBraces;
+    Alternatives = alternatives;
+    UsesOptionalBraces = usesOptionalBraces;
   }
-  public AlternativeStmt(RangeToken rangeToken, List<GuardedAlternative> alternatives, bool usesOptionalBraces, Attributes attrs)
-    : base(rangeToken, attrs) {
+  public AlternativeStmt(IOrigin origin, List<GuardedAlternative> alternatives, bool usesOptionalBraces, Attributes attrs)
+    : base(origin, attrs) {
     Contract.Requires(alternatives != null);
-    this.Alternatives = alternatives;
-    this.UsesOptionalBraces = usesOptionalBraces;
+    Alternatives = alternatives;
+    UsesOptionalBraces = usesOptionalBraces;
   }
   public override IEnumerable<Statement> SubStatements {
     get {
@@ -57,4 +57,70 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
       formatter.VisitAlternatives(Alternatives, indentBefore);
     });
   }
+
+  public void Resolve(INewOrOldResolver resolver, ResolutionContext resolutionContext) {
+    if (!resolutionContext.IsGhost && resolver.Options.ForbidNondeterminism && 2 <= Alternatives.Count) {
+      resolver.Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_case_based_if_forbidden, Origin,
+        "case-based if statement forbidden by the --enforce-determinism option");
+    }
+    ResolveAlternatives(resolver, Alternatives, null, resolutionContext);
+  }
+
+  public static void ResolveAlternatives(INewOrOldResolver resolver, List<GuardedAlternative> alternatives,
+    AlternativeLoopStmt loopToCatchBreaks, ResolutionContext resolutionContext) {
+    Contract.Requires(alternatives != null);
+    Contract.Requires(resolutionContext != null);
+
+    // first, resolve the guards
+    foreach (var alternative in alternatives) {
+      int prevErrorCount = resolver.Reporter.Count(ErrorLevel.Error);
+      resolver.ResolveExpression(alternative.Guard, resolutionContext);  // follows from postcondition of ResolveExpression
+      bool successfullyResolved = resolver.Reporter.Count(ErrorLevel.Error) == prevErrorCount;
+      resolver.ConstrainTypeExprBool(alternative.Guard, "condition is expected to be of type bool, but is {0}");
+    }
+
+    if (loopToCatchBreaks != null) {
+      resolver.LoopStack.Add(loopToCatchBreaks);  // push
+    }
+    foreach (var alternative in alternatives) {
+      resolver.Scope.PushMarker();
+      resolver.DominatingStatementLabels.PushMarker();
+      if (alternative.IsBindingGuard) {
+        var exists = (ExistsExpr)alternative.Guard;
+        foreach (var v in exists.BoundVars) {
+          resolver.ScopePushAndReport(resolver.Scope, v, "bound-variable");
+        }
+      }
+      resolver.ResolveAttributes(alternative, resolutionContext);
+      foreach (Statement ss in alternative.Body) {
+        resolver.ResolveStatementWithLabels(ss, resolutionContext);
+      }
+      resolver.DominatingStatementLabels.PopMarker();
+      resolver.Scope.PopMarker();
+    }
+    if (loopToCatchBreaks != null) {
+      resolver.LoopStack.RemoveAt(resolver.LoopStack.Count - 1);  // pop
+    }
+  }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = mustBeErasable || Alternatives.Exists(alt => ExpressionTester.UsesSpecFeatures(alt.Guard));
+    if (!mustBeErasable && IsGhost) {
+      resolver.Reporter.Info(MessageSource.Resolver, Origin, "ghost if");
+    }
+
+    Alternatives.ForEach(alt => alt.Body.ForEach(ss =>
+      ss.ResolveGhostness(resolver, reporter, IsGhost, codeContext, proofContext,
+        allowAssumptionVariables, inConstructorInitializationPhase)));
+    IsGhost = IsGhost || Alternatives.All(alt => alt.Body.All(ss => ss.IsGhost));
+    if (!IsGhost) {
+      // If there were features in the guards that are treated differently in ghost and non-ghost
+      // contexts, make sure they get treated for non-ghost use.
+      foreach (var alt in Alternatives) {
+        ExpressionTester.CheckIsCompilable(resolver, reporter, alt.Guard, codeContext);
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/BreakOrContinueStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/BreakOrContinueStmt.cs
new file mode 100644
index 00000000000..de1c3f94590
--- /dev/null
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/BreakOrContinueStmt.cs
@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// Class "BreakStmt" represents both "break" and "continue" statements.
+/// </summary>
+public class BreakOrContinueStmt : Statement, IHasReferences, ICloneable<BreakOrContinueStmt> {
+  public readonly IOrigin TargetLabel;
+  public readonly bool IsContinue;
+  public string Kind => IsContinue ? "continue" : "break";
+  public readonly int BreakAndContinueCount;
+  [FilledInDuringResolution] public Statement TargetStmt;
+  [ContractInvariantMethod]
+  void ObjectInvariant() {
+    Contract.Invariant(TargetLabel != null || 1 <= BreakAndContinueCount);
+  }
+
+  public BreakOrContinueStmt Clone(Cloner cloner) {
+    return new BreakOrContinueStmt(cloner, this);
+  }
+
+  public BreakOrContinueStmt(Cloner cloner, BreakOrContinueStmt original) : base(cloner, original) {
+    TargetLabel = original.TargetLabel;
+    IsContinue = original.IsContinue;
+    BreakAndContinueCount = original.BreakAndContinueCount;
+    if (cloner.CloneResolvedFields) {
+      TargetStmt = cloner.CloneStmt(original.TargetStmt, true);
+    }
+  }
+
+  public BreakOrContinueStmt(IOrigin origin, IOrigin targetLabel, bool isContinue, Attributes attributes = null)
+    : base(origin, attributes) {
+    Contract.Requires(origin != null);
+    Contract.Requires(targetLabel != null);
+    TargetLabel = targetLabel;
+    IsContinue = isContinue;
+  }
+
+  /// <summary>
+  /// For "isContinue == false", represents the statement "break ^breakAndContinueCount ;".
+  /// For "isContinue == true", represents the statement "break ^(breakAndContinueCount - 1) continue;".
+  /// </summary>
+  public BreakOrContinueStmt(IOrigin origin, int breakAndContinueCount, bool isContinue, Attributes attributes = null)
+    : base(origin, attributes) {
+    Contract.Requires(origin != null);
+    Contract.Requires(1 <= breakAndContinueCount);
+    BreakAndContinueCount = breakAndContinueCount;
+    IsContinue = isContinue;
+  }
+
+  public IEnumerable<Reference> GetReferences() {
+    return TargetStmt is IHasNavigationToken target ? new[] { new Reference(TargetLabel ?? Origin, target) } : Enumerable.Empty<Reference>();
+  }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = mustBeErasable;
+    if (IsGhost && !TargetStmt.IsGhost) {
+      var targetKind = TargetStmt is LoopStmt ? "loop" : "structure";
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_ghost_break, this,
+        $"ghost-context {Kind} statement is not allowed to {Kind} out of non-ghost {targetKind}");
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/BreakStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/BreakStmt.cs
deleted file mode 100644
index a3315a7bc32..00000000000
--- a/Source/DafnyCore/AST/Statements/ControlFlow/BreakStmt.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-
-namespace Microsoft.Dafny;
-
-/// <summary>
-/// Class "BreakStmt" represents both "break" and "continue" statements.
-/// </summary>
-public class BreakStmt : Statement, IHasUsages, ICloneable<BreakStmt> {
-  public readonly IToken TargetLabel;
-  public readonly bool IsContinue;
-  public string Kind => IsContinue ? "continue" : "break";
-  public readonly int BreakAndContinueCount;
-  [FilledInDuringResolution] public Statement TargetStmt;
-  [ContractInvariantMethod]
-  void ObjectInvariant() {
-    Contract.Invariant(TargetLabel != null || 1 <= BreakAndContinueCount);
-  }
-
-  public BreakStmt Clone(Cloner cloner) {
-    return new BreakStmt(cloner, this);
-  }
-
-  public BreakStmt(Cloner cloner, BreakStmt original) : base(cloner, original) {
-    TargetLabel = original.TargetLabel;
-    IsContinue = original.IsContinue;
-    BreakAndContinueCount = original.BreakAndContinueCount;
-    if (cloner.CloneResolvedFields) {
-      TargetStmt = cloner.CloneStmt(original.TargetStmt);
-    }
-  }
-
-  public BreakStmt(RangeToken rangeToken, IToken targetLabel, bool isContinue)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
-    Contract.Requires(targetLabel != null);
-    this.TargetLabel = targetLabel;
-    this.IsContinue = isContinue;
-  }
-
-  /// <summary>
-  /// For "isContinue == false", represents the statement "break ^breakAndContinueCount ;".
-  /// For "isContinue == true", represents the statement "break ^(breakAndContinueCount - 1) continue;".
-  /// </summary>
-  public BreakStmt(RangeToken rangeToken, int breakAndContinueCount, bool isContinue)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
-    Contract.Requires(1 <= breakAndContinueCount);
-    this.BreakAndContinueCount = breakAndContinueCount;
-    this.IsContinue = isContinue;
-  }
-
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return new[] { TargetStmt }.OfType<IDeclarationOrUsage>();
-  }
-
-  public IToken NameToken => Tok;
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/ForLoopStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/ForLoopStmt.cs
index 6c1dd2153f6..aff49fa4e0e 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/ForLoopStmt.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/ForLoopStmt.cs
@@ -20,11 +20,11 @@ public ForLoopStmt(Cloner cloner, ForLoopStmt original) : base(cloner, original)
     GoingUp = original.GoingUp;
   }
 
-  public ForLoopStmt(RangeToken rangeToken, BoundVar loopIndexVariable, Expression start, Expression/*?*/ end, bool goingUp,
+  public ForLoopStmt(IOrigin origin, BoundVar loopIndexVariable, Expression start, Expression/*?*/ end, bool goingUp,
     List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod,
     BlockStmt /*?*/ body, Attributes attrs)
-    : base(rangeToken, invariants, decreases, mod, body, attrs) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, invariants, decreases, mod, body, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(loopIndexVariable != null);
     Contract.Requires(start != null);
     Contract.Requires(invariants != null);
@@ -80,4 +80,44 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     formatter.SetClosingIndentedRegion(EndToken, indentBefore);
     return false;
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+
+    var s = this;
+    if (proofContext != null && s.Mod.Expressions != null && s.Mod.Expressions.Count != 0) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_loop_in_proof_may_not_use_modifies, s.Mod.Expressions[0].Origin, $"a loop in {proofContext} is not allowed to use 'modifies' clauses");
+    }
+
+    s.IsGhost = mustBeErasable || ExpressionTester.UsesSpecFeatures(s.Start) || (s.End != null && ExpressionTester.UsesSpecFeatures(s.End));
+    if (!mustBeErasable && s.IsGhost) {
+      reporter.Info(MessageSource.Resolver, s.Origin, "ghost for-loop");
+    }
+    if (s.IsGhost) {
+      if (s.Decreases.Expressions.Exists(e => e is WildcardExpr)) {
+        reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_decreases_forbidden_on_ghost_loops, s, "'decreases *' is not allowed on ghost loops");
+      } else if (s.End == null && s.Decreases.Expressions.Count == 0) {
+        reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_ghost_loop_must_terminate, s, "a ghost loop must be terminating; make the end-expression specific or add a 'decreases' clause");
+      }
+    }
+    if (s.IsGhost && s.Mod.Expressions != null) {
+      s.Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
+    }
+    if (s.Body != null) {
+      s.Body.ResolveGhostness(resolver, reporter, s.IsGhost, codeContext,
+        proofContext, allowAssumptionVariables, inConstructorInitializationPhase);
+      if (s.Body.IsGhost) {
+        s.IsGhost = true;
+      }
+    }
+    if (!s.IsGhost) {
+      // If there were features in the bounds that are treated differently in ghost and non-ghost
+      // contexts, make sure they get treated for non-ghost use.
+      ExpressionTester.CheckIsCompilable(resolver, reporter, s.Start, codeContext);
+      if (s.End != null) {
+        ExpressionTester.CheckIsCompilable(resolver, reporter, s.End, codeContext);
+      }
+    }
+  }
 }
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/ForallStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/ForallStmt.cs
index f3fc7ee51be..8e03cee1727 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/ForallStmt.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/ForallStmt.cs
@@ -11,10 +11,10 @@ public class ForallStmt : Statement, ICloneable<ForallStmt>, ICanFormat {
   public readonly List<AttributedExpression> Ens;
   public readonly Statement Body;
   [FilledInDuringResolution]
-  public List<Expression> ForallExpressions;   // fill in by rewriter.
+  public List<Expression> EffectiveEnsuresClauses;   // fill in by rewriter.
   public bool CanConvert = true; //  can convert to ForallExpressions
 
-  [FilledInDuringResolution] public List<ComprehensionExpr.BoundedPool> Bounds;
+  [FilledInDuringResolution] public List<BoundedPool> Bounds;
   // invariant: if successfully resolved, Bounds.Count == BoundVars.Count;
 
   /// <summary>
@@ -53,40 +53,40 @@ public ForallStmt(Cloner cloner, ForallStmt original) : base(cloner, original) {
     BoundVars = original.BoundVars.ConvertAll(bv => cloner.CloneBoundVar(bv, false));
     Range = cloner.CloneExpr(original.Range);
     Ens = original.Ens.Select(cloner.CloneAttributedExpr).ToList();
-    Body = cloner.CloneStmt(original.Body);
+    Body = cloner.CloneStmt(original.Body, false);
     Attributes = cloner.CloneAttributes(original.Attributes);
 
     if (cloner.CloneResolvedFields) {
       Bounds = original.Bounds.ConvertAll(bp => bp.Clone(cloner));
       Kind = original.Kind;
-      ForallExpressions = original.ForallExpressions?.Select(cloner.CloneExpr).ToList();
+      EffectiveEnsuresClauses = original.EffectiveEnsuresClauses?.Select(cloner.CloneExpr).ToList();
     }
   }
 
-  public ForallStmt(RangeToken rangeToken, List<BoundVar> boundVars, Attributes attrs, Expression range, List<AttributedExpression> ens, Statement body)
-    : base(rangeToken, attrs) {
-    Contract.Requires(rangeToken != null);
+  public ForallStmt(IOrigin origin, List<BoundVar> boundVars, Attributes attrs, Expression range, List<AttributedExpression> ens, Statement body)
+    : base(origin, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(boundVars));
     Contract.Requires(range != null);
     Contract.Requires(boundVars.Count != 0 || LiteralExpr.IsTrue(range));
     Contract.Requires(cce.NonNullElements(ens));
-    this.BoundVars = boundVars;
-    this.Range = range;
-    this.Ens = ens;
-    this.Body = body;
+    BoundVars = boundVars;
+    Range = range;
+    Ens = ens;
+    Body = body;
   }
 
   public Statement S0 {
     get {
       // dig into Body to find a single statement
-      Statement s = this.Body;
+      Statement s = Body;
       while (true) {
         var block = s as BlockStmt;
         if (block != null && block.Body.Count == 1) {
           s = block.Body[0];
           // dig further into s
-        } else if (s is UpdateStmt) {
-          var update = (UpdateStmt)s;
+        } else if (s is AssignStatement) {
+          var update = (AssignStatement)s;
           if (update.ResolvedStatements?.Count == 1) {
             s = update.ResolvedStatements[0];
             // dig further into s
@@ -126,19 +126,25 @@ public override IEnumerable<Expression> SpecificationSubExpressions {
         foreach (var e in Attributes.SubExpressions(ee.Attributes)) { yield return e; }
         yield return ee.E;
       }
+
+      if (EffectiveEnsuresClauses != null) {
+        foreach (var e in EffectiveEnsuresClauses) {
+          yield return e;
+        }
+      }
     }
   }
 
   public override IEnumerable<Assumption> Assumptions(Declaration decl) {
     if (Body is null) {
-      yield return new Assumption(decl, tok, AssumptionDescription.ForallWithoutBody);
+      yield return new Assumption(decl, Origin, AssumptionDescription.ForallWithoutBody);
     }
   }
 
   public List<BoundVar> UncompilableBoundVars() {
     Contract.Ensures(Contract.Result<List<BoundVar>>() != null);
-    var v = ComprehensionExpr.BoundedPool.PoolVirtues.Finite | ComprehensionExpr.BoundedPool.PoolVirtues.Enumerable;
-    return ComprehensionExpr.BoundedPool.MissingBounds(BoundVars, Bounds, v);
+    var v = BoundedPool.PoolVirtues.Finite | BoundedPool.PoolVirtues.Enumerable;
+    return BoundedPool.MissingBounds(BoundVars, Bounds, v);
   }
 
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
@@ -153,4 +159,31 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     formatter.SetClosingIndentedRegion(EndToken, indentBefore);
     return false;
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = mustBeErasable || Kind != BodyKind.Assign || ExpressionTester.UsesSpecFeatures(Range);
+    if (proofContext != null && Kind == BodyKind.Assign) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_no_aggregate_heap_update_in_proof, this, $"{proofContext} is not allowed to perform an aggregate heap update");
+    } else if (Body != null) {
+      Body.ResolveGhostness(resolver, reporter, IsGhost, codeContext,
+        Kind == BodyKind.Assign ? proofContext : "a forall statement", allowAssumptionVariables, inConstructorInitializationPhase);
+    }
+    IsGhost = IsGhost || Body == null || Body.IsGhost;
+
+    if (!IsGhost) {
+      // Since we've determined this is a non-ghost forall statement, we now check that the bound variables have compilable bounds.
+      var uncompilableBoundVars = UncompilableBoundVars();
+      if (uncompilableBoundVars.Count != 0) {
+        foreach (var bv in uncompilableBoundVars) {
+          reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_unknown_bounds_for_forall, this, "forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for '{0}'", bv.Name);
+        }
+      }
+
+      // If there were features in the range that are treated differently in ghost and non-ghost
+      // contexts, make sure they get treated for non-ghost use.
+      ExpressionTester.CheckIsCompilable(resolver, reporter, Range, codeContext);
+    }
+  }
 }
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/GuardedAlternative.cs b/Source/DafnyCore/AST/Statements/ControlFlow/GuardedAlternative.cs
index 93ecceb9f3c..3af5111911e 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/GuardedAlternative.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/GuardedAlternative.cs
@@ -4,39 +4,38 @@
 
 namespace Microsoft.Dafny;
 
-public class GuardedAlternative : TokenNode, IAttributeBearingDeclaration {
+public class GuardedAlternative : NodeWithComputedRange, IAttributeBearingDeclaration {
   public readonly bool IsBindingGuard;
   public readonly Expression Guard;
   public readonly List<Statement> Body;
-  public Attributes Attributes;
-  public override IEnumerable<INode> Children => (Attributes != null ? new List<Node> { Attributes } : Enumerable.Empty<Node>()).Concat(new List<Node>() { Guard }).Concat<Node>(Body);
+  public Attributes Attributes { get; set; }
+  string IAttributeBearingDeclaration.WhatKind => "alternative-based case";
+  public override IEnumerable<INode> Children => Attributes.AsEnumerable().
+    Concat<Node>(new List<Node>() { Guard }).Concat<Node>(Body);
   public override IEnumerable<INode> PreResolveChildren => Children;
-  Attributes IAttributeBearingDeclaration.Attributes => Attributes;
 
   [ContractInvariantMethod]
   void ObjectInvariant() {
-    Contract.Invariant(Tok != null);
+    Contract.Invariant(Origin != null);
     Contract.Invariant(Guard != null);
     Contract.Invariant(!IsBindingGuard || (Guard is ExistsExpr && ((ExistsExpr)Guard).Range == null));
     Contract.Invariant(Body != null);
   }
-  public GuardedAlternative(IToken tok, bool isBindingGuard, Expression guard, List<Statement> body) {
-    Contract.Requires(tok != null);
+  public GuardedAlternative(IOrigin origin, bool isBindingGuard, Expression guard, List<Statement> body) : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(guard != null);
     Contract.Requires(!isBindingGuard || (guard is ExistsExpr && ((ExistsExpr)guard).Range == null));
     Contract.Requires(body != null);
-    this.tok = tok;
     this.IsBindingGuard = isBindingGuard;
     this.Guard = guard;
     this.Body = body;
     this.Attributes = null;
   }
-  public GuardedAlternative(IToken tok, bool isBindingGuard, Expression guard, List<Statement> body, Attributes attrs) {
-    Contract.Requires(tok != null);
+  public GuardedAlternative(IOrigin origin, bool isBindingGuard, Expression guard, List<Statement> body, Attributes attrs) : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(guard != null);
     Contract.Requires(!isBindingGuard || (guard is ExistsExpr && ((ExistsExpr)guard).Range == null));
     Contract.Requires(body != null);
-    this.tok = tok;
     this.IsBindingGuard = isBindingGuard;
     this.Guard = guard;
     this.Body = body;
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/IfStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/IfStmt.cs
index 95a1bd42e5e..a4030ef45dd 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/IfStmt.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/IfStmt.cs
@@ -23,30 +23,30 @@ public IfStmt(Cloner cloner, IfStmt original) : base(cloner, original) {
     IsBindingGuard = original.IsBindingGuard;
     Guard = cloner.CloneExpr(original.Guard);
     Thn = cloner.CloneBlockStmt(original.Thn);
-    Els = cloner.CloneStmt(original.Els);
+    Els = cloner.CloneStmt(original.Els, false);
   }
 
-  public IfStmt(RangeToken rangeToken, bool isBindingGuard, Expression guard, BlockStmt thn, Statement els)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
+  public IfStmt(IOrigin origin, bool isBindingGuard, Expression guard, BlockStmt thn, Statement els)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(!isBindingGuard || (guard is ExistsExpr && ((ExistsExpr)guard).Range == null));
     Contract.Requires(thn != null);
     Contract.Requires(els == null || els is BlockStmt || els is IfStmt || els is SkeletonStatement);
-    this.IsBindingGuard = isBindingGuard;
-    this.Guard = guard;
-    this.Thn = thn;
-    this.Els = els;
+    IsBindingGuard = isBindingGuard;
+    Guard = guard;
+    Thn = thn;
+    Els = els;
   }
-  public IfStmt(RangeToken rangeToken, bool isBindingGuard, Expression guard, BlockStmt thn, Statement els, Attributes attrs)
-    : base(rangeToken, attrs) {
-    Contract.Requires(rangeToken != null);
+  public IfStmt(IOrigin origin, bool isBindingGuard, Expression guard, BlockStmt thn, Statement els, Attributes attrs)
+    : base(origin, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(!isBindingGuard || (guard is ExistsExpr && ((ExistsExpr)guard).Range == null));
     Contract.Requires(thn != null);
     Contract.Requires(els == null || els is BlockStmt || els is IfStmt || els is SkeletonStatement);
-    this.IsBindingGuard = isBindingGuard;
-    this.Guard = guard;
-    this.Thn = thn;
-    this.Els = els;
+    IsBindingGuard = isBindingGuard;
+    Guard = guard;
+    Thn = thn;
+    Els = els;
   }
   public override IEnumerable<Statement> SubStatements {
     get {
@@ -86,4 +86,56 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     }
     return false;
   }
+
+  public void Resolve(INewOrOldResolver resolver, ResolutionContext resolutionContext) {
+    if (Guard != null) {
+      if (!resolutionContext.IsGhost && IsBindingGuard && resolver.Options.ForbidNondeterminism) {
+        resolver.Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_binding_if_forbidden, Origin, "binding if statement forbidden by the --enforce-determinism option");
+      }
+      resolver.ResolveExpression(Guard, resolutionContext);
+      resolver.ConstrainTypeExprBool(Guard, "condition is expected to be of type bool, but is {0}");
+    } else {
+      if (!resolutionContext.IsGhost && resolver.Options.ForbidNondeterminism) {
+        resolver.Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_nondeterministic_if_forbidden, Origin, "nondeterministic if statement forbidden by the --enforce-determinism option");
+      }
+    }
+
+    resolver.Scope.PushMarker();
+    if (IsBindingGuard) {
+      var exists = (ExistsExpr)Guard;
+      foreach (var v in exists.BoundVars) {
+        resolver.ScopePushAndReport(resolver.Scope, v.Name, v, v.Origin, "bound-variable");
+      }
+    }
+    resolver.DominatingStatementLabels.PushMarker();
+    resolver.ResolveBlockStatement(Thn, resolutionContext);
+    resolver.DominatingStatementLabels.PopMarker();
+    resolver.Scope.PopMarker();
+
+    if (Els != null) {
+      resolver.DominatingStatementLabels.PushMarker();
+      resolver.ResolveStatement(Els, resolutionContext);
+      resolver.DominatingStatementLabels.PopMarker();
+    }
+  }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = mustBeErasable || (Guard != null && ExpressionTester.UsesSpecFeatures(Guard));
+    if (!mustBeErasable && IsGhost) {
+      reporter.Info(MessageSource.Resolver, Origin, "ghost if");
+    }
+    Thn.ResolveGhostness(resolver, reporter, IsGhost, codeContext, proofContext, allowAssumptionVariables, inConstructorInitializationPhase);
+    if (Els != null) {
+      Els.ResolveGhostness(resolver, reporter, IsGhost, codeContext, proofContext, allowAssumptionVariables, inConstructorInitializationPhase);
+    }
+    // if both branches were all ghost, then we can mark the enclosing statement as ghost as well
+    IsGhost = IsGhost || (Thn.IsGhost && (Els == null || Els.IsGhost));
+    if (!IsGhost && Guard != null) {
+      // If there were features in the guard that are treated differently in ghost and non-ghost
+      // contexts, make sure they get treated for non-ghost use.
+      ExpressionTester.CheckIsCompilable(resolver, reporter, Guard, codeContext);
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/Label.cs b/Source/DafnyCore/AST/Statements/ControlFlow/Label.cs
index e696b3df4aa..7558c191e20 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/Label.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/Label.cs
@@ -3,16 +3,17 @@
 namespace Microsoft.Dafny;
 
 public class Label {
-  public readonly IToken Tok;
+  public readonly IOrigin Tok;
   public readonly string Name;
   string uniqueId = null;
+
   public string AssignUniqueId(FreshIdGenerator idGen) {
     if (uniqueId == null) {
       uniqueId = idGen.FreshNumericId("label");
     }
     return uniqueId;
   }
-  public Label(IToken tok, string/*?*/ label) {
+  public Label(IOrigin tok, string/*?*/ label) {
     Contract.Requires(tok != null);
     Tok = tok;
     Name = label;
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/LoopStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/LoopStmt.cs
index b9a47487938..105e51eaa8e 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/LoopStmt.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/LoopStmt.cs
@@ -3,9 +3,10 @@
 
 namespace Microsoft.Dafny;
 
-public abstract class LoopStmt : Statement, IDeclarationOrUsage {
+public abstract class LoopStmt : Statement, IHasNavigationToken {
   public readonly List<AttributedExpression> Invariants;
   public readonly Specification<Expression> Decreases;
+
   [FilledInDuringResolution] public bool InferredDecreases;  // says that no explicit "decreases" clause was given and an attempt was made to find one automatically (which may or may not have produced anything)
   public readonly Specification<FrameExpression> Mod;
   [ContractInvariantMethod]
@@ -25,9 +26,9 @@ protected LoopStmt(Cloner cloner, LoopStmt original) : base(cloner, original) {
     }
   }
 
-  public LoopStmt(RangeToken rangeToken, List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
+  public LoopStmt(IOrigin origin, List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(invariants));
     Contract.Requires(decreases != null);
     Contract.Requires(mod != null);
@@ -36,9 +37,9 @@ public LoopStmt(RangeToken rangeToken, List<AttributedExpression> invariants, Sp
     this.Decreases = decreases;
     this.Mod = mod;
   }
-  public LoopStmt(RangeToken rangeToken, List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod, Attributes attrs)
-    : base(rangeToken, attrs) {
-    Contract.Requires(rangeToken != null);
+  public LoopStmt(IOrigin origin, List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod, Attributes attrs)
+    : base(origin, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(invariants));
     Contract.Requires(decreases != null);
     Contract.Requires(mod != null);
@@ -84,5 +85,5 @@ public override IEnumerable<Expression> SpecificationSubExpressions {
     }
   }
 
-  public IToken NameToken => Tok;
+  public IOrigin NavigationToken => StartToken;
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/OneBodyLoopStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/OneBodyLoopStmt.cs
index fd9fd676f60..73b8f4bfcbf 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/OneBodyLoopStmt.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/OneBodyLoopStmt.cs
@@ -11,7 +11,7 @@ public abstract class OneBodyLoopStmt : LoopStmt {
   public WhileStmt.LoopBodySurrogate/*?*/ BodySurrogate;  // set by Resolver; remains null unless Body==null
 
   protected OneBodyLoopStmt(Cloner cloner, OneBodyLoopStmt original) : base(cloner, original) {
-    Body = (BlockStmt)cloner.CloneStmt(original.Body);
+    Body = (BlockStmt)cloner.CloneStmt(original.Body, false);
     if (cloner.CloneResolvedFields) {
       if (original.BodySurrogate != null) {
         BodySurrogate = new WhileStmt.LoopBodySurrogate(
@@ -21,10 +21,10 @@ protected OneBodyLoopStmt(Cloner cloner, OneBodyLoopStmt original) : base(cloner
     }
   }
 
-  protected OneBodyLoopStmt(RangeToken rangeToken,
+  protected OneBodyLoopStmt(IOrigin origin,
     List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod,
     BlockStmt /*?*/ body, Attributes/*?*/ attrs)
-    : base(rangeToken, invariants, decreases, mod, attrs) {
+    : base(origin, invariants, decreases, mod, attrs) {
     Body = body;
   }
 
@@ -38,7 +38,7 @@ public override IEnumerable<Statement> SubStatements {
 
   public override IEnumerable<Assumption> Assumptions(Declaration decl) {
     if (Body is null) {
-      yield return new Assumption(decl, tok, AssumptionDescription.LoopWithoutBody);
+      yield return new Assumption(decl, Origin, AssumptionDescription.LoopWithoutBody);
     }
   }
 
@@ -85,8 +85,8 @@ public void ComputeBodySurrogate(ErrorReporter reporter) {
     if (BodySurrogate.UsesHeap) {
       text += text.Length == 0 ? "$Heap" : ", $Heap";
     }
-    text = string.Format("note, this loop has no body{0}", text.Length == 0 ? "" : " (loop frame: " + text + ")");
-    reporter.Warning(MessageSource.Resolver, ErrorRegistry.NoneId, Tok, text);
+    text = $"this loop has no body{(text.Length == 0 ? "" : " (loop frame: " + text + ")")}";
+    reporter.Warning(MessageSource.Resolver, ErrorRegistry.NoneId, Origin, text);
   }
 
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/RefinedWhileStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/RefinedWhileStmt.cs
index 717cd694dd7..31bdfd11666 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/RefinedWhileStmt.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/RefinedWhileStmt.cs
@@ -8,10 +8,10 @@ namespace Microsoft.Dafny;
 /// merge.
 /// </summary>
 public class RefinedWhileStmt : WhileStmt {
-  public RefinedWhileStmt(RangeToken rangeToken, Expression guard,
+  public RefinedWhileStmt(IOrigin origin, Expression guard,
     List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod,
     BlockStmt body)
-    : base(rangeToken, guard, invariants, decreases, mod, body) {
+    : base(origin, guard, invariants, decreases, mod, body) {
     Contract.Requires(body != null);
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/ControlFlow/WhileStmt.cs b/Source/DafnyCore/AST/Statements/ControlFlow/WhileStmt.cs
index 8357aa8fc03..03ef21db39b 100644
--- a/Source/DafnyCore/AST/Statements/ControlFlow/WhileStmt.cs
+++ b/Source/DafnyCore/AST/Statements/ControlFlow/WhileStmt.cs
@@ -23,18 +23,18 @@ public WhileStmt(Cloner cloner, WhileStmt original) : base(cloner, original) {
     Guard = cloner.CloneExpr(original.Guard);
   }
 
-  public WhileStmt(RangeToken rangeToken, Expression guard,
+  public WhileStmt(IOrigin origin, Expression guard,
     List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod,
     BlockStmt body)
-    : base(rangeToken, invariants, decreases, mod, body, null) {
-    this.Guard = guard;
+    : base(origin, invariants, decreases, mod, body, null) {
+    Guard = guard;
   }
 
-  public WhileStmt(RangeToken rangeToken, Expression guard,
+  public WhileStmt(IOrigin origin, Expression guard,
     List<AttributedExpression> invariants, Specification<Expression> decreases, Specification<FrameExpression> mod,
     BlockStmt body, Attributes attrs)
-    : base(rangeToken, invariants, decreases, mod, body, attrs) {
-    this.Guard = guard;
+    : base(origin, invariants, decreases, mod, body, attrs) {
+    Guard = guard;
   }
 
   public override IEnumerable<Expression> NonSpecificationSubExpressions {
@@ -62,4 +62,35 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
 
     return false;
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    if (proofContext != null && Mod.Expressions != null && Mod.Expressions.Count != 0) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_loop_may_not_use_modifies, Mod.Expressions[0].Origin, $"a loop in {proofContext} is not allowed to use 'modifies' clauses");
+    }
+
+    IsGhost = mustBeErasable || (Guard != null && ExpressionTester.UsesSpecFeatures(Guard));
+    if (!mustBeErasable && IsGhost) {
+      reporter.Info(MessageSource.Resolver, Origin, "ghost while");
+    }
+    if (IsGhost && Decreases.Expressions.Exists(e => e is WildcardExpr)) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_decreases_forbidden_on_ghost_loops, this, "'decreases *' is not allowed on ghost loops");
+    }
+    if (IsGhost && Mod.Expressions != null) {
+      Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
+    }
+    if (Body != null) {
+      Body.ResolveGhostness(resolver, reporter, IsGhost, codeContext, proofContext, allowAssumptionVariables,
+        inConstructorInitializationPhase);
+      if (Body.IsGhost && !Decreases.Expressions.Exists(e => e is WildcardExpr)) {
+        IsGhost = true;
+      }
+    }
+    if (!IsGhost && Guard != null) {
+      // If there were features in the guard that are treated differently in ghost and non-ghost
+      // contexts, make sure they get treated for non-ghost use.
+      ExpressionTester.CheckIsCompilable(resolver, reporter, Guard, codeContext);
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/DividedBlockStmt.cs b/Source/DafnyCore/AST/Statements/DividedBlockStmt.cs
index 076fbae4025..b4487ed76ca 100644
--- a/Source/DafnyCore/AST/Statements/DividedBlockStmt.cs
+++ b/Source/DafnyCore/AST/Statements/DividedBlockStmt.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Dafny;
    */
 public class DividedBlockStmt : BlockStmt, ICloneable<DividedBlockStmt> {
   public readonly List<Statement> BodyInit;  // first part of Body's statements
-  public readonly IToken SeparatorTok;  // token that separates the two parts, if any
+  public readonly IOrigin SeparatorTok;  // token that separates the two parts, if any
   public readonly List<Statement> BodyProper;  // second part of Body's statements
 
   public new DividedBlockStmt Clone(Cloner cloner) {
@@ -22,9 +22,9 @@ public DividedBlockStmt(Cloner cloner, DividedBlockStmt original) : base(cloner,
     SeparatorTok = original.SeparatorTok;
   }
 
-  public DividedBlockStmt(RangeToken rangeToken, List<Statement> bodyInit, IToken/*?*/ separatorTok, List<Statement> bodyProper)
-    : base(rangeToken, Util.Concat(bodyInit, bodyProper)) {
-    Contract.Requires(rangeToken != null);
+  public DividedBlockStmt(IOrigin origin, List<Statement> bodyInit, IOrigin/*?*/ separatorTok, List<Statement> bodyProper)
+    : base(origin, Util.Concat(bodyInit, bodyProper)) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(bodyInit));
     Contract.Requires(cce.NonNullElements(bodyProper));
     this.BodyInit = bodyInit;
diff --git a/Source/DafnyCore/AST/Statements/Methods/CallStmt.cs b/Source/DafnyCore/AST/Statements/Methods/CallStmt.cs
index fc52debc2a6..49856332356 100644
--- a/Source/DafnyCore/AST/Statements/Methods/CallStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Methods/CallStmt.cs
@@ -4,12 +4,77 @@
 
 namespace Microsoft.Dafny;
 
+/// <summary>
+/// This class temporarily exists to retain old behavior
+/// When it comes to where errors are reported.
+///
+/// For function calls, the following location is used to report precondition failures:
+/// 
+/// someFunction(x, y);
+/// ^           ^
+/// old     future
+///
+/// For assertions, when the condition does not hold
+/// assert P(x)
+/// ^       ^
+/// future  old
+/// </summary>
+class OverrideCenter : OriginWrapper {
+  public OverrideCenter(IOrigin wrappedToken, Token newCenter) : base(wrappedToken) {
+    this.Center = newCenter;
+  }
+
+  public override Token Center { get; }
+
+  public override IOrigin WithVal(string newVal) {
+    throw new System.NotImplementedException();
+  }
+
+  public override int col {
+    get => Center.col;
+    set => throw new System.NotImplementedException();
+  }
+
+  public override int line {
+    get => Center.line;
+    set => throw new System.NotImplementedException();
+  }
+
+  public override int pos {
+    get => Center.pos;
+    set => throw new System.NotImplementedException();
+  }
+
+  public override string val {
+    get => Center.val;
+    set => throw new System.NotImplementedException();
+  }
+
+  public override string LeadingTrivia {
+    get => Center.LeadingTrivia;
+    set => throw new System.NotImplementedException();
+  }
+
+  public override string TrailingTrivia {
+    get => Center.TrailingTrivia;
+    set => throw new System.NotImplementedException();
+  }
+
+  public override Token Next {
+    get => Center.Next;
+    set => throw new System.NotImplementedException();
+  }
+
+  public override Token Prev {
+    get => Center.Prev;
+    set => throw new System.NotImplementedException();
+  }
+}
+
 /// <summary>
 /// A CallStmt is always resolved.  It is typically produced as a resolved counterpart of the syntactic AST note ApplySuffix.
 /// </summary>
 public class CallStmt : Statement, ICloneable<CallStmt> {
-  // OverrideToken is required because MethodSelect.EndToken can be incorrect. Will remove once resolved expressions have correct ranges.
-  public override IToken Tok => overrideToken ?? MethodSelect.EndToken.Next;
 
   [ContractInvariantMethod]
   void ObjectInvariant() {
@@ -19,19 +84,25 @@ void ObjectInvariant() {
   }
 
   public override IEnumerable<INode> Children => Lhs.Concat(new Node[] { MethodSelect, Bindings });
+  public override IEnumerable<IdentifierExpr> GetAssignedLocals() {
+    return Lhs.Select(lhs => lhs.Resolved).OfType<IdentifierExpr>();
+  }
+
   public readonly List<Expression> Lhs;
   public readonly MemberSelectExpr MethodSelect;
-  private readonly IToken overrideToken;
   public readonly ActualBindings Bindings;
   public List<Expression> Args => Bindings.Arguments;
   public Expression OriginalInitialLhs = null;
 
-  public Expression Receiver { get { return MethodSelect.Obj; } }
-  public Method Method { get { return (Method)MethodSelect.Member; } }
+  public Expression Receiver => MethodSelect.Obj;
+  public Method Method => (Method)MethodSelect.Member;
 
-  public CallStmt(RangeToken rangeToken, List<Expression> lhs, MemberSelectExpr memSel, List<ActualBinding> args, IToken overrideToken = null)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
+  public CallStmt(IOrigin rangeOrigin, List<Expression> lhs, MemberSelectExpr memSel, List<ActualBinding> args, Token overrideToken = null)
+    : base(
+      /* it would be better if the correct rangeOrigin was passed in,
+       then the parameter overrideToken would become obsolete */
+      new OverrideCenter(rangeOrigin, overrideToken ?? memSel.EndToken.Next)) {
+    Contract.Requires(rangeOrigin != null);
     Contract.Requires(cce.NonNullElements(lhs));
     Contract.Requires(memSel != null);
     Contract.Requires(memSel.Member is Method);
@@ -39,7 +110,7 @@ public CallStmt(RangeToken rangeToken, List<Expression> lhs, MemberSelectExpr me
 
     this.Lhs = lhs;
     this.MethodSelect = memSel;
-    this.overrideToken = overrideToken;
+
     this.Bindings = new ActualBindings(args);
   }
 
@@ -51,15 +122,14 @@ public CallStmt(Cloner cloner, CallStmt original) : base(cloner, original) {
     MethodSelect = (MemberSelectExpr)cloner.CloneExpr(original.MethodSelect);
     Lhs = original.Lhs.Select(cloner.CloneExpr).ToList();
     Bindings = new ActualBindings(cloner, original.Bindings);
-    overrideToken = original.overrideToken;
   }
 
   /// <summary>
   /// This constructor is intended to be used when constructing a resolved CallStmt. The "args" are expected
   /// to be already resolved, and are all given positionally.
   /// </summary>
-  public CallStmt(RangeToken rangeToken, List<Expression> lhs, MemberSelectExpr memSel, List<Expression> args)
-    : this(rangeToken, lhs, memSel, args.ConvertAll(e => new ActualBinding(null, e))) {
+  public CallStmt(IOrigin rangeOrigin, List<Expression> lhs, MemberSelectExpr memSel, List<Expression> args)
+    : this(rangeOrigin, lhs, memSel, args.ConvertAll(e => new ActualBinding(null, e))) {
     Bindings.AcceptArgumentExpressionsAsExactParameterList();
   }
 
@@ -75,4 +145,65 @@ public override IEnumerable<Expression> NonSpecificationSubExpressions {
       }
     }
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    var callee = this.Method;
+    Contract.Assert(callee != null);  // follows from the invariant of CallStmt
+    this.IsGhost = callee.IsGhost;
+    if (proofContext != null && !callee.IsLemmaLike) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_no_calls_in_proof, this,
+        $"in {proofContext}, calls are allowed only to lemmas");
+    } else if (mustBeErasable) {
+      if (!this.IsGhost) {
+        reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_only_ghost_calls, this,
+          "only ghost methods can be called from this context");
+      }
+    } else {
+      int j;
+      if (!callee.IsGhost) {
+        // check in-parameters
+        ExpressionTester.CheckIsCompilable(resolver, reporter, this.Receiver, codeContext);
+        j = 0;
+        foreach (var e in this.Args) {
+          Contract.Assume(j < callee.Ins.Count);  // this should have already been checked by the resolver
+          if (!callee.Ins[j].IsGhost) {
+            ExpressionTester.CheckIsCompilable(resolver, reporter, e, codeContext);
+          }
+          j++;
+        }
+      }
+      j = 0;
+      foreach (var e in this.Lhs) {
+        var resolvedLhs = e.Resolved;
+        if (callee.IsGhost || callee.Outs[j].IsGhost) {
+          // LHS must denote a ghost
+          if (resolvedLhs is IdentifierExpr) {
+            var ll = (IdentifierExpr)resolvedLhs;
+            if (!ll.Var.IsGhost) {
+              if (ll is AutoGhostIdentifierExpr && ll.Var is LocalVariable) {
+                // the variable was actually declared in this statement, so auto-declare it as ghost
+                ((LocalVariable)ll.Var).MakeGhost();
+              } else {
+                reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_out_parameter_must_be_ghost, this,
+                  "actual out-parameter{0} is required to be a ghost variable", this.Lhs.Count == 1 ? "" : " " + j);
+              }
+            }
+          } else if (resolvedLhs is MemberSelectExpr) {
+            var ll = (MemberSelectExpr)resolvedLhs;
+            if (!ll.Member.IsGhost) {
+              reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_out_parameter_must_be_ghost_field, this,
+                "actual out-parameter{0} is required to be a ghost field", this.Lhs.Count == 1 ? "" : " " + j);
+            }
+          } else {
+            // this is an array update, and arrays are always non-ghost
+            reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_out_parameter_must_be_ghost, this,
+              "actual out-parameter{0} is required to be a ghost variable", this.Lhs.Count == 1 ? "" : " " + j);
+          }
+        }
+        j++;
+      }
+    }
+  }
 }
diff --git a/Source/DafnyCore/AST/Statements/Methods/PrintStmt.cs b/Source/DafnyCore/AST/Statements/Methods/PrintStmt.cs
index 02151399489..b7ed2c15e98 100644
--- a/Source/DafnyCore/AST/Statements/Methods/PrintStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Methods/PrintStmt.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using DafnyCore;
+using DafnyCore.Options;
 
 namespace Microsoft.Dafny;
 
@@ -16,10 +17,7 @@ static PrintStmt() {
       options.EnforcePrintEffects = value;
     });
 
-    DooFile.RegisterLibraryChecks(
-      checks: new Dictionary<Option, DooFile.OptionCheck> {
-        { TrackPrintEffectsOption, DooFile.CheckOptionMatches }
-      });
+    OptionRegistry.RegisterGlobalOption(TrackPrintEffectsOption, OptionCompatibility.CheckOptionLocalImpliesLibrary);
   }
 
   [ContractInvariantMethod]
@@ -35,9 +33,9 @@ public PrintStmt(Cloner cloner, PrintStmt original) : base(cloner, original) {
     Args = original.Args.Select(cloner.CloneExpr).ToList();
   }
 
-  public PrintStmt(RangeToken rangeToken, List<Expression> args)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
+  public PrintStmt(IOrigin origin, List<Expression> args)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(cce.NonNullElements(args));
 
     Args = args;
@@ -54,4 +52,15 @@ public override IEnumerable<Expression> NonSpecificationSubExpressions {
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     return formatter.SetIndentPrintRevealStmt(indentBefore, OwnedTokens);
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    if (mustBeErasable) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_print_statement_is_not_ghost, this,
+        "print statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)");
+    } else {
+      Args.ForEach(ee => ExpressionTester.CheckIsCompilable(resolver, reporter, ee, codeContext));
+    }
+  }
 }
diff --git a/Source/DafnyCore/AST/Statements/Methods/ProduceStmt.cs b/Source/DafnyCore/AST/Statements/Methods/ProduceStmt.cs
index 5d2ca2f5269..f6c5faefa29 100644
--- a/Source/DafnyCore/AST/Statements/Methods/ProduceStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Methods/ProduceStmt.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Dafny;
 public abstract class ProduceStmt : Statement {
   public List<AssignmentRhs> Rhss;
   [FilledInDuringResolution]
-  public UpdateStmt HiddenUpdate;
+  public AssignStatement HiddenUpdate;
 
   protected ProduceStmt(Cloner cloner, ProduceStmt original) : base(cloner, original) {
     if (original.Rhss != null) {
@@ -14,13 +14,13 @@ protected ProduceStmt(Cloner cloner, ProduceStmt original) : base(cloner, origin
     }
     if (cloner.CloneResolvedFields) {
       if (original.HiddenUpdate != null) {
-        HiddenUpdate = new UpdateStmt(cloner, original.HiddenUpdate);
+        HiddenUpdate = new AssignStatement(cloner, original.HiddenUpdate);
       }
     }
   }
 
-  public ProduceStmt(RangeToken rangeToken, List<AssignmentRhs> rhss)
-    : base(rangeToken) {
+  protected ProduceStmt(IOrigin origin, List<AssignmentRhs> rhss, Attributes attributes)
+    : base(origin, attributes) {
     this.Rhss = rhss;
     HiddenUpdate = null;
   }
@@ -69,4 +69,17 @@ public override IEnumerable<Statement> PreResolveSubStatements {
       }
     }
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    var kind = this is YieldStmt ? "yield" : "return";
+    if (mustBeErasable && !codeContext.IsGhost) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_produce_statement_not_allowed_in_ghost, this,
+        "{0} statement is not allowed in this context (because it is guarded by a specification-only expression)", kind);
+    }
+
+    this.HiddenUpdate?.ResolveGhostness(resolver, reporter, mustBeErasable, codeContext, proofContext,
+      allowAssumptionVariables, inConstructorInitializationPhase);
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Methods/ReturnStmt.cs b/Source/DafnyCore/AST/Statements/Methods/ReturnStmt.cs
index b24516762fb..2b14fad0714 100644
--- a/Source/DafnyCore/AST/Statements/Methods/ReturnStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Methods/ReturnStmt.cs
@@ -14,8 +14,8 @@ public ReturnStmt(Cloner cloner, ReturnStmt original) : base(cloner, original) {
     ReverifyPost = original.ReverifyPost;
   }
 
-  public ReturnStmt(RangeToken rangeToken, List<AssignmentRhs> rhss)
-    : base(rangeToken, rhss) {
-    Contract.Requires(rangeToken != null);
+  public ReturnStmt(IOrigin origin, List<AssignmentRhs> rhss, Attributes attributes = null)
+    : base(origin, rhss, attributes) {
+    Contract.Requires(origin != null);
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Methods/TryRecoverStatement.cs b/Source/DafnyCore/AST/Statements/Methods/TryRecoverStatement.cs
index 78f489cc196..6ac8a61a289 100644
--- a/Source/DafnyCore/AST/Statements/Methods/TryRecoverStatement.cs
+++ b/Source/DafnyCore/AST/Statements/Methods/TryRecoverStatement.cs
@@ -23,13 +23,13 @@ public TryRecoverStatement Clone(Cloner cloner) {
   }
 
   public TryRecoverStatement(Cloner cloner, TryRecoverStatement original) : base(cloner, original) {
-    TryBody = cloner.CloneStmt(original.TryBody);
-    RecoverBody = cloner.CloneStmt(original.RecoverBody);
+    TryBody = cloner.CloneStmt(original.TryBody, false);
+    RecoverBody = cloner.CloneStmt(original.RecoverBody, false);
     HaltMessageVar = cloner.CloneIVariable(original.HaltMessageVar, false);
   }
 
   public TryRecoverStatement(Statement tryBody, IVariable haltMessageVar, Statement recoverBody)
-    : base(new RangeToken(tryBody.StartToken, recoverBody.EndToken)) {
+    : base(new SourceOrigin(tryBody.StartToken, recoverBody.EndToken)) {
     Contract.Requires(tryBody != null);
     Contract.Requires(haltMessageVar != null);
     Contract.Requires(recoverBody != null);
@@ -37,4 +37,9 @@ public TryRecoverStatement(Statement tryBody, IVariable haltMessageVar, Statemen
     HaltMessageVar = haltMessageVar;
     RecoverBody = recoverBody;
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable, ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    throw new System.NotSupportedException("This type is only created after resolution");
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Methods/YieldStmt.cs b/Source/DafnyCore/AST/Statements/Methods/YieldStmt.cs
index 0ba70cee8d8..678bb7daa8c 100644
--- a/Source/DafnyCore/AST/Statements/Methods/YieldStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Methods/YieldStmt.cs
@@ -10,8 +10,8 @@ public YieldStmt Clone(Cloner cloner) {
   public YieldStmt(Cloner cloner, YieldStmt original) : base(cloner, original) {
   }
 
-  public YieldStmt(RangeToken rangeToken, List<AssignmentRhs> rhss)
-    : base(rangeToken, rhss) {
+  public YieldStmt(IOrigin origin, List<AssignmentRhs> rhss)
+    : base(origin, rhss, null) {
   }
 
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
diff --git a/Source/DafnyCore/AST/Statements/OpaqueBlock.cs b/Source/DafnyCore/AST/Statements/OpaqueBlock.cs
new file mode 100644
index 00000000000..234e32fae6f
--- /dev/null
+++ b/Source/DafnyCore/AST/Statements/OpaqueBlock.cs
@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+public class OpaqueBlock : BlockStmt, ICanResolveNewAndOld {
+  public readonly List<AttributedExpression> Ensures;
+  public readonly Specification<FrameExpression> Modifies;
+
+  protected OpaqueBlock(Cloner cloner, OpaqueBlock original) : base(cloner, original) {
+    Ensures = original.Ensures.Select(cloner.CloneAttributedExpr).ToList();
+    Modifies = cloner.CloneSpecFrameExpr(original.Modifies);
+  }
+
+  public override IEnumerable<Expression> SpecificationSubExpressions {
+    get {
+      foreach (var e in Ensures) {
+        yield return e.E;
+      }
+      foreach (var e in Modifies.Expressions) {
+        yield return e.E;
+      }
+    }
+  }
+
+  public OpaqueBlock(IOrigin origin, List<Statement> body,
+    List<AttributedExpression> ensures,
+    Specification<FrameExpression> modifies) : base(origin, body) {
+    Ensures = ensures;
+    Modifies = modifies;
+  }
+
+  public override void GenResolve(INewOrOldResolver resolver, ResolutionContext resolutionContext) {
+
+    resolver.Scope.PushMarker();
+    foreach (Statement ss in Body) {
+      resolver.ResolveStatementWithLabels(ss, resolutionContext);
+    }
+    resolver.Scope.PopMarker();
+
+    resolver.ResolveAttributes(Modifies, resolutionContext);
+    foreach (var fe in Modifies.Expressions) {
+      resolver.ResolveFrameExpression(fe, FrameExpressionUse.Modifies, resolutionContext);
+    }
+
+    foreach (var ensure in Ensures) {
+      resolver.ResolveAttributes(ensure, resolutionContext);
+      resolver.ResolveExpression(ensure.E, resolutionContext);
+      resolver.ConstrainTypeExprBool(ensure.E, "Postcondition must be a boolean (got {0})");
+    }
+    base.GenResolve(resolver, resolutionContext);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/SkeletonStatement.cs b/Source/DafnyCore/AST/Statements/SkeletonStatement.cs
index 9656a4798e8..76bc505b299 100644
--- a/Source/DafnyCore/AST/Statements/SkeletonStatement.cs
+++ b/Source/DafnyCore/AST/Statements/SkeletonStatement.cs
@@ -1,3 +1,5 @@
+#nullable enable
+
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 
@@ -24,41 +26,42 @@ namespace Microsoft.Dafny;
 ///   ConditionOmitted == true && BodyOmitted == false
 /// </summary>
 public class SkeletonStatement : Statement, ICloneable<SkeletonStatement>, ICanFormat {
-  public readonly Statement S;
-  public bool ConditionOmitted { get { return ConditionEllipsis != null; } }
-  public readonly IToken ConditionEllipsis;
-  public bool BodyOmitted { get { return BodyEllipsis != null; } }
-  public readonly IToken BodyEllipsis;
+  public readonly Statement? S;
+  public bool ConditionOmitted => ConditionEllipsis != null;
+  public readonly IOrigin? ConditionEllipsis;
+  public bool BodyOmitted => BodyEllipsis != null;
+  public readonly IOrigin? BodyEllipsis;
 
   public SkeletonStatement Clone(Cloner cloner) {
     return new SkeletonStatement(cloner, this);
   }
 
   public SkeletonStatement(Cloner cloner, SkeletonStatement original) : base(cloner, original) {
-    S = original.S == null ? null : cloner.CloneStmt(original.S);
+    S = original.S == null ? null : cloner.CloneStmt(original.S, false);
     ConditionEllipsis = original.ConditionEllipsis;
     BodyEllipsis = original.BodyEllipsis;
   }
 
-  public SkeletonStatement(RangeToken rangeToken)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
+  public SkeletonStatement(IOrigin origin)
+    : base(origin) {
+    Contract.Requires(origin != null);
     S = null;
   }
-  public SkeletonStatement(Statement s, IToken conditionEllipsis, IToken bodyEllipsis)
-    : base(s.RangeToken) {
+  public SkeletonStatement(Statement s, IOrigin conditionEllipsis, IOrigin bodyEllipsis)
+    : base(s.Origin) {
     Contract.Requires(s != null);
     S = s;
     ConditionEllipsis = conditionEllipsis;
     BodyEllipsis = bodyEllipsis;
   }
+
   public override IEnumerable<Statement> SubStatements {
     get {
       // The SkeletonStatement is really a modification of its inner statement S.  Therefore,
       // we don't consider S to be a substatement.  Instead, the substatements of S are the
       // substatements of the SkeletonStatement.  In the case the SkeletonStatement modifies
       // S by omitting its body (which is true only for loops), there are no substatements.
-      if (!BodyOmitted && S.SubStatements != null) {
+      if (!BodyOmitted && S?.SubStatements != null) {
         foreach (var s in S.SubStatements) {
           yield return s;
         }
@@ -68,11 +71,23 @@ public override IEnumerable<Statement> SubStatements {
 
   public override IEnumerable<Statement> PreResolveSubStatements {
     get {
-      yield return S;
+      if (S != null) {
+        yield return S;
+      }
     }
   }
 
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     return true;
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = mustBeErasable;
+    if (S != null) {
+      S.ResolveGhostness(resolver, reporter, mustBeErasable, codeContext, proofContext, allowAssumptionVariables, inConstructorInitializationPhase);
+      IsGhost = IsGhost || S.IsGhost;
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Statement.cs b/Source/DafnyCore/AST/Statements/Statement.cs
index 2b9f7783476..03452a29d13 100644
--- a/Source/DafnyCore/AST/Statements/Statement.cs
+++ b/Source/DafnyCore/AST/Statements/Statement.cs
@@ -6,35 +6,28 @@
 namespace Microsoft.Dafny;
 
 public abstract class Statement : RangeNode, IAttributeBearingDeclaration {
-  public override IToken Tok => PostLabelToken ?? StartToken;
-  public IToken PostLabelToken { get; set; }
+  public Token PostLabelToken { get; set; }
 
+  public int ScopeDepth { get; set; }
   public LList<Label> Labels;  // mutable during resolution
 
-  private Attributes attributes;
-  public Attributes Attributes {
-    get {
-      return attributes;
-    }
-    set {
-      attributes = value;
-    }
-  }
+  public Attributes Attributes { get; set; }
+  string IAttributeBearingDeclaration.WhatKind => "statement";
 
   [ContractInvariantMethod]
   void ObjectInvariant() {
-    Contract.Invariant(Tok != null);
+    Contract.Invariant(Origin != null);
   }
 
   [FilledInDuringResolution] public bool IsGhost { get; set; }
 
-  public virtual void Resolve(ModuleResolver resolver, ResolutionContext resolutionContext) {
+  public virtual void GenResolve(INewOrOldResolver resolver, ResolutionContext resolutionContext) {
     resolver.ResolveAttributes(this, resolutionContext);
   }
 
-  protected Statement(Cloner cloner, Statement original) : base(cloner.Tok(original.RangeToken)) {
+  protected Statement(Cloner cloner, Statement original) : base(cloner.Origin(original.Origin)) {
     cloner.AddStatementClone(original, this);
-    this.attributes = cloner.CloneAttributes(original.Attributes);
+    this.Attributes = cloner.CloneAttributes(original.Attributes);
 
     if (cloner.CloneResolvedFields) {
       IsGhost = original.IsGhost;
@@ -42,13 +35,13 @@ protected Statement(Cloner cloner, Statement original) : base(cloner.Tok(origina
     }
   }
 
-  protected Statement(RangeToken rangeToken, Attributes attrs) : base(rangeToken) {
-    this.attributes = attrs;
+  protected Statement(IOrigin origin, Attributes attrs) : base(origin) {
+    this.Attributes = attrs;
   }
 
-  protected Statement(RangeToken rangeToken)
-    : this(rangeToken, null) {
-    Contract.Requires(rangeToken != null);
+  protected Statement(IOrigin origin)
+    : this(origin, null) {
+    Contract.Requires(origin != null);
   }
 
   /// <summary>
@@ -76,6 +69,23 @@ public virtual IEnumerable<Statement> SubStatements {
     get { yield break; }
   }
 
+  public IEnumerable<Statement> DescendantsAndSelf {
+    get {
+      Stack<Statement> todo = new();
+      List<Statement> result = new();
+      todo.Push(this);
+      while (todo.Any()) {
+        var current = todo.Pop();
+        result.Add(current);
+        foreach (var child in current.SubStatements) {
+          todo.Push(child);
+        }
+      }
+
+      return result;
+    }
+  }
+
   /// <summary>
   /// Returns the non-null substatements of the Statements, before resolution occurs
   /// </summary>
@@ -127,36 +137,34 @@ public virtual IEnumerable<Expression> NonSpecificationSubExpressions {
   /// <summary>
   /// Create a resolved statement for an uninitialized local variable.
   /// </summary>
-  public static VarDeclStmt CreateLocalVariable(IToken tok, string name, Type type) {
+  public static VarDeclStmt CreateLocalVariable(IOrigin tok, string name, Type type) {
     Contract.Requires(tok != null);
     Contract.Requires(name != null);
     Contract.Requires(type != null);
-    var variable = new LocalVariable(tok.ToRange(), name, type, false);
+    var variable = new LocalVariable(tok, name, type, false);
     variable.type = type;
-    return new VarDeclStmt(tok.ToRange(), Util.Singleton(variable), null);
+    return new VarDeclStmt(tok, Util.Singleton(variable), null);
   }
 
   /// <summary>
   /// Create a resolved statement for a local variable with an initial value.
   /// </summary>
-  public static VarDeclStmt CreateLocalVariable(IToken tok, string name, Expression value) {
+  public static VarDeclStmt CreateLocalVariable(IOrigin tok, string name, Expression value) {
     Contract.Requires(tok != null);
     Contract.Requires(name != null);
     Contract.Requires(value != null);
-    var rangeToken = new RangeToken(tok, tok);
-    var variable = new LocalVariable(rangeToken, name, value.Type, false);
+    var variable = new LocalVariable(tok, name, value.Type, false);
     variable.type = value.Type;
     Expression variableExpr = new IdentifierExpr(tok, variable);
-    var variableUpdateStmt = new UpdateStmt(rangeToken, Util.Singleton(variableExpr),
+    var variableUpdateStmt = new AssignStatement(tok, Util.Singleton(variableExpr),
       Util.Singleton<AssignmentRhs>(new ExprRhs(value)));
-    var variableAssignStmt = new AssignStmt(rangeToken, variableUpdateStmt.Lhss[0], variableUpdateStmt.Rhss[0]);
+    var variableAssignStmt = new SingleAssignStmt(tok, variableUpdateStmt.Lhss[0], variableUpdateStmt.Rhss[0]);
     variableUpdateStmt.ResolvedStatements = new List<Statement>() { variableAssignStmt };
-    return new VarDeclStmt(rangeToken, Util.Singleton(variable), variableUpdateStmt);
+    return new VarDeclStmt(tok, Util.Singleton(variable), variableUpdateStmt);
   }
 
-  public static PrintStmt CreatePrintStmt(IToken tok, params Expression[] exprs) {
-    var rangeToken = new RangeToken(tok, tok);
-    return new PrintStmt(rangeToken, exprs.ToList());
+  public static PrintStmt CreatePrintStmt(IOrigin tok, params Expression[] exprs) {
+    return new PrintStmt(tok, exprs.ToList());
   }
 
   public override string ToString() {
@@ -168,10 +176,50 @@ public override string ToString() {
   }
 
   public override IEnumerable<INode> Children =>
-    (Attributes != null ? new List<Node> { Attributes } : Enumerable.Empty<Node>()).Concat(
+    Attributes.AsEnumerable().
+      Concat<Node>(
       SubStatements.Concat<Node>(SubExpressions));
 
   public override IEnumerable<INode> PreResolveChildren =>
-    (Attributes != null ? new List<Node> { Attributes } : Enumerable.Empty<Node>()).Concat(
+    Attributes.AsEnumerable().
+      Concat<Node>(
       PreResolveSubStatements).Concat(PreResolveSubExpressions);
+
+  public virtual IEnumerable<IdentifierExpr> GetAssignedLocals() => Enumerable.Empty<IdentifierExpr>();
+
+
+  /// <summary>
+  /// There are three kinds of contexts for statements.
+  ///   - compiled contexts, where the statement must be compilable
+  ///     -- !mustBeErasable && proofContext == null
+  ///   - ghost contexts that allow the allocation of new object
+  ///     -- mustBeErasable && proofContext == null
+  ///   - lemma/proof contexts, which are ghost and are not allowed to allocate new objects
+  ///     -- mustBeErasable && proofContext != null
+  /// 
+  /// This method does three things, in order:
+  /// 0. Sets .IsGhost to "true" if the statement is ghost.  This often depends on some guard of the statement
+  ///    (like the guard of an "if" statement) or the LHS of the statement (if it is an assignment).
+  ///    Note, if "mustBeErasable", then the statement is already in a ghost context.
+  /// 1. Determines if the statement and all its subparts are legal under its computed .IsGhost setting.
+  /// 2. ``Upgrades'' .IsGhost to "true" if, after investigation of the substatements of the statement, it
+  ///    turns out that the statement can be erased during compilation.
+  /// Notes:
+  /// * Both step (0) and step (2) sets the .IsGhost field.  What step (0) does affects only the
+  ///   rules of resolution, whereas step (2) makes a note for the later compilation phase.
+  /// * It is important to do step (0) before step (1)--that is, it is important to set the statement's ghost
+  ///   status before descending into its substatements--because break statements look at the ghost status of
+  ///   its enclosing statements.
+  /// * The method called by a StmtExpr must be ghost; however, this is checked elsewhere.  For
+  ///   this reason, it is not necessary to visit all subexpressions, unless the subexpression
+  ///   matter for the ghost checking/recording of "stmt".
+  ///
+  /// If "proofContext" is non-null, then this method also checks that "stmt" does not allocate
+  /// memory or modify the heap, either directly or indirectly using a statement like "modify", a loop with
+  /// an explicit "modifies" clause, or a call to a method that may allocate memory or modify the heap.
+  /// The "proofContext" string is something that can be printed as part of an error message.
+  /// </summary>
+  public abstract void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase);
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Verification/AssertLabel.cs b/Source/DafnyCore/AST/Statements/Verification/AssertLabel.cs
index fbc5e496d68..cf622067d81 100644
--- a/Source/DafnyCore/AST/Statements/Verification/AssertLabel.cs
+++ b/Source/DafnyCore/AST/Statements/Verification/AssertLabel.cs
@@ -7,7 +7,7 @@ public class AssertLabel : Label {
   [FilledInDuringTranslation]
   public Boogie.Expr E;
 
-  public AssertLabel(IToken tok, string label)
+  public AssertLabel(IOrigin tok, string label)
     : base(tok, label) {
     Contract.Requires(tok != null);
     Contract.Requires(label != null);
diff --git a/Source/DafnyCore/AST/Statements/Verification/AssertStmt.cs b/Source/DafnyCore/AST/Statements/Verification/AssertStmt.cs
index 1f33ab05031..154267b0823 100644
--- a/Source/DafnyCore/AST/Statements/Verification/AssertStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Verification/AssertStmt.cs
@@ -5,7 +5,6 @@
 namespace Microsoft.Dafny;
 
 public class AssertStmt : PredicateStmt, ICloneable<AssertStmt>, ICanFormat {
-  public readonly BlockStmt Proof;
   public readonly AssertLabel Label;
 
   public AssertStmt Clone(Cloner cloner) {
@@ -13,39 +12,30 @@ public AssertStmt Clone(Cloner cloner) {
   }
 
   public AssertStmt(Cloner cloner, AssertStmt original) : base(cloner, original) {
-    Proof = cloner.CloneBlockStmt(original.Proof);
-    Label = original.Label == null ? null : new AssertLabel(cloner.Tok(original.Label.Tok), original.Label.Name);
+    Label = original.Label == null ? null : new AssertLabel(cloner.Origin(original.Label.Tok), original.Label.Name);
   }
 
   public static AssertStmt CreateErrorAssert(INode node, string message, Expression guard = null) {
-    var errorMessage = new StringLiteralExpr(node.Tok, message, true);
+    var errorMessage = new StringLiteralExpr(node.Origin, message, true);
     errorMessage.Type = new SeqType(Type.Char);
     var attr = new Attributes("error", new List<Expression> { errorMessage }, null);
-    guard ??= Expression.CreateBoolLiteral(node.Tok, false);
-    var assertFalse = new AssertStmt(node.RangeToken, guard, null, null, attr);
+    guard ??= Expression.CreateBoolLiteral(node.Origin, false);
+    var assertFalse = new AssertStmt(node.Origin, guard, null, attr);
     assertFalse.IsGhost = true;
     return assertFalse;
   }
 
-  public AssertStmt(RangeToken rangeToken, Expression expr, BlockStmt/*?*/ proof, AssertLabel/*?*/ label, Attributes attrs)
-    : base(rangeToken, expr, attrs) {
-    Contract.Requires(rangeToken != null);
+  public AssertStmt(IOrigin origin, Expression expr, AssertLabel/*?*/ label, Attributes attrs)
+    : base(origin, expr, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(expr != null);
-    Proof = proof;
     Label = label;
   }
 
-  public override IEnumerable<Statement> SubStatements {
-    get {
-      if (Proof != null) {
-        yield return Proof;
-      }
-    }
-  }
-  public void AddCustomizedErrorMessage(IToken tok, string s) {
+  public void AddCustomizedErrorMessage(IOrigin tok, string s) {
     var args = new List<Expression>() { new StringLiteralExpr(tok, s, true) };
-    IToken openBrace = tok;
-    IToken closeBrace = new Token(tok.line, tok.col + 7 + s.Length + 1); // where 7 = length(":error ")
+    IOrigin openBrace = tok;
+    IOrigin closeBrace = new Token(tok.line, tok.col + 7 + s.Length + 1); // where 7 = length(":error ")
     this.Attributes = new UserSuppliedAttributes(tok, openBrace, closeBrace, args, this.Attributes);
   }
 
@@ -58,7 +48,7 @@ public override IEnumerable<Expression> SpecificationSubExpressions {
 
   public override IEnumerable<Assumption> Assumptions(Declaration decl) {
     if (this.HasUserAttribute("only", out _)) {
-      yield return new Assumption(decl, tok, AssumptionDescription.AssertOnly);
+      yield return new Assumption(decl, Origin, AssumptionDescription.AssertOnly);
     }
   }
 
@@ -66,6 +56,30 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     return formatter.SetIndentAssertLikeStatement(this, indentBefore);
   }
 
+  public override void GenResolve(INewOrOldResolver resolver, ResolutionContext context) {
+    if (Label != null) {
+      if (resolver.DominatingStatementLabels.Find(Label.Name) != null) {
+        resolver.Reporter.Error(MessageSource.Resolver, Label.Tok, "assert label shadows a dominating label");
+      } else {
+        var rr = resolver.DominatingStatementLabels.Push(Label.Name, Label);
+        Contract.Assert(rr == Scope<Label>.PushResult.Success); // since we just checked for duplicates, we expect the Push to succeed
+      }
+    }
+
+    if (this.HasUserAttribute("only", out var attribute)) {
+      resolver.Reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.r_assert_only_assumes_others.ToString(), attribute.Origin,
+        "Assertion with {:only} temporarily transforms other assertions into assumptions");
+      if (attribute.Args.Count >= 1
+          && attribute.Args[0] is LiteralExpr { Value: string value }
+          && value != "before" && value != "after") {
+        resolver.Reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.r_assert_only_before_after.ToString(), attribute.Args[0].Origin,
+          "{:only} only accepts \"before\" or \"after\" as an optional argument");
+      }
+    }
+
+    base.GenResolve(resolver, context);
+  }
+
   public bool HasAssertOnlyAttribute(out AssertOnlyKind assertOnlyKind) {
     assertOnlyKind = AssertOnlyKind.Single;
     if (!this.HasUserAttribute("only", out var attribute)) {
@@ -90,5 +104,11 @@ public enum AssertOnlyKind {
     After,
     Single
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = true;
+  }
 }
 
diff --git a/Source/DafnyCore/AST/Statements/Verification/AssumeStmt.cs b/Source/DafnyCore/AST/Statements/Verification/AssumeStmt.cs
index 7f82ac665d1..bf5b58098a1 100644
--- a/Source/DafnyCore/AST/Statements/Verification/AssumeStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Verification/AssumeStmt.cs
@@ -12,9 +12,9 @@ public AssumeStmt Clone(Cloner cloner) {
   public AssumeStmt(Cloner cloner, AssumeStmt original) : base(cloner, original) {
   }
 
-  public AssumeStmt(RangeToken rangeToken, Expression expr, Attributes attrs)
-    : base(rangeToken, expr, attrs) {
-    Contract.Requires(rangeToken != null);
+  public AssumeStmt(IOrigin origin, Expression expr, Attributes attrs)
+    : base(origin, expr, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(expr != null);
   }
   public override IEnumerable<Expression> SpecificationSubExpressions {
@@ -25,11 +25,25 @@ public override IEnumerable<Expression> SpecificationSubExpressions {
   }
 
   public override IEnumerable<Assumption> Assumptions(Declaration decl) {
-    yield return new Assumption(decl, tok, AssumptionDescription.AssumeStatement(
+    yield return new Assumption(decl, Origin, AssumptionDescription.AssumeStatement(
       Attributes.Contains(Attributes, Attributes.AxiomAttributeName)));
   }
 
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     return formatter.SetIndentAssertLikeStatement(this, indentBefore);
   }
+
+  public override void GenResolve(INewOrOldResolver resolver, ResolutionContext context) {
+    base.GenResolve(resolver, context);
+
+    if (!resolver.Options.Get(CommonOptionBag.AllowAxioms) && !this.IsExplicitAxiom()) {
+      resolver.Reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.r_assume_statement_without_axiom, Origin, "assume statement has no {:axiom} annotation");
+    }
+  }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = true;
+  }
 }
diff --git a/Source/DafnyCore/AST/Statements/Verification/ExpectStmt.cs b/Source/DafnyCore/AST/Statements/Verification/ExpectStmt.cs
index bc919f1dfed..825a306b24f 100644
--- a/Source/DafnyCore/AST/Statements/Verification/ExpectStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Verification/ExpectStmt.cs
@@ -10,15 +10,13 @@ public ExpectStmt Clone(Cloner cloner) {
     return new ExpectStmt(cloner, this);
   }
 
-  public override IToken Tok => StartToken == Expr.StartToken ? Expr.Tok : base.Tok; // TODO move up to PredicateStmt?
-
   public ExpectStmt(Cloner cloner, ExpectStmt original) : base(cloner, original) {
     Message = cloner.CloneExpr(original.Message);
   }
 
-  public ExpectStmt(RangeToken rangeToken, Expression expr, Expression message, Attributes attrs)
-    : base(rangeToken, expr, attrs) {
-    Contract.Requires(rangeToken != null);
+  public ExpectStmt(IOrigin origin, Expression expr, Expression message, Attributes attrs)
+    : base(origin, expr, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(expr != null);
     this.Message = message;
   }
@@ -36,4 +34,27 @@ public override IEnumerable<Expression> NonSpecificationSubExpressions {
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     return formatter.SetIndentAssertLikeStatement(this, indentBefore);
   }
+
+  public override void GenResolve(INewOrOldResolver resolver, ResolutionContext context) {
+    base.GenResolve(resolver, context);
+    if (Message == null) {
+      Message = new StringLiteralExpr(Origin, "expectation violation", false);
+    }
+    resolver.ResolveExpression(Message, context);
+  }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = false;
+    if (mustBeErasable) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_expect_statement_is_not_ghost, this,
+        "expect statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)");
+    } else {
+      ExpressionTester.CheckIsCompilable(resolver, reporter, Expr, codeContext);
+      // If not provided, the message is populated with a default value in resolution
+      Contract.Assert(Message != null);
+      ExpressionTester.CheckIsCompilable(resolver, reporter, Message, codeContext);
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Verification/HideRevealStmt.cs b/Source/DafnyCore/AST/Statements/Verification/HideRevealStmt.cs
new file mode 100644
index 00000000000..c31ca6f9e06
--- /dev/null
+++ b/Source/DafnyCore/AST/Statements/Verification/HideRevealStmt.cs
@@ -0,0 +1,152 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+public class HideRevealStmt : Statement, ICloneable<HideRevealStmt>, ICanFormat, ICanResolveNewAndOld {
+  public const string RevealLemmaPrefix = "reveal_";
+
+  public string Kind => Mode == HideRevealCmd.Modes.Hide ? "hide" : "reveal";
+  public string KindVerb => Mode == HideRevealCmd.Modes.Hide ? "hidden" : "revealed";
+  public readonly List<Expression> Exprs;
+  [FilledInDuringResolution]
+  public readonly List<AssertLabel> LabeledAsserts = new();  // to indicate that "Expr" denotes a labeled assertion
+  [FilledInDuringResolution]
+  public readonly List<Statement> ResolvedStatements = new();
+  [FilledInDuringResolution] public List<MemberDecl> OffsetMembers = new();
+  public HideRevealCmd.Modes Mode { get; private set; }
+  public bool Wildcard { get; private set; }
+
+  public override IEnumerable<Statement> SubStatements => ResolvedStatements;
+
+  public override IEnumerable<Statement> PreResolveSubStatements => Enumerable.Empty<Statement>();
+
+  [ContractInvariantMethod]
+  void ObjectInvariant() {
+    Contract.Invariant(Exprs != null);
+    Contract.Invariant(LabeledAsserts.Count <= Exprs.Count);
+  }
+
+  public HideRevealStmt Clone(Cloner cloner) {
+    return new HideRevealStmt(cloner, this);
+  }
+
+  public HideRevealStmt(Cloner cloner, HideRevealStmt original) : base(cloner, original) {
+    Mode = original.Mode;
+    Exprs = original.Exprs?.Select(cloner.CloneExpr).ToList();
+    Wildcard = original.Wildcard;
+    if (cloner.CloneResolvedFields) {
+      OffsetMembers = original.OffsetMembers.ToList();
+      LabeledAsserts = original.LabeledAsserts.Select(a => new AssertLabel(cloner.Origin(a.Tok), a.Name)).ToList();
+      ResolvedStatements = original.ResolvedStatements.Select(stmt => cloner.CloneStmt(stmt, false)).ToList();
+    }
+  }
+
+  public HideRevealStmt(IOrigin origin, HideRevealCmd.Modes mode)
+    : base(origin) {
+    Wildcard = true;
+    this.Exprs = null;
+    Mode = mode;
+  }
+
+  public HideRevealStmt(IOrigin origin, List<Expression> exprs, HideRevealCmd.Modes mode)
+    : base(origin) {
+    Contract.Requires(exprs != null);
+    this.Exprs = exprs;
+    Wildcard = false;
+    Mode = mode;
+  }
+
+  public static string SingleName(Expression e) {
+    Contract.Requires(e != null);
+    if (e is NameSegment || e is LiteralExpr) {
+      return e.Origin.val;
+    } else {
+      return null;
+    }
+  }
+
+  public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
+    return formatter.SetIndentPrintRevealStmt(indentBefore, OwnedTokens);
+  }
+
+  public override void GenResolve(INewOrOldResolver resolver, ResolutionContext resolutionContext) {
+    resolutionContext.CodeContext.ContainsHide |= Mode == HideRevealCmd.Modes.Hide;
+
+    if (Wildcard) {
+      return;
+    }
+
+    foreach (var expr in Exprs) {
+      var name = SingleName(expr);
+      var labeledAssert = name == null ? null : resolver.DominatingStatementLabels.Find(name) as AssertLabel;
+      if (labeledAssert != null) {
+        LabeledAsserts.Add(labeledAssert);
+      } else {
+        Expression effectiveExpr = expr;
+        if (expr is ApplySuffix applySuffix) {
+          if (applySuffix.AtTok != null) {
+            resolver.Reporter.Error(MessageSource.Resolver, expr.Origin, $"an @-label can not be used in a hide or reveal statement");
+          }
+          effectiveExpr = applySuffix.Lhs;
+        }
+        if (effectiveExpr is NameSegment or ExprDotName) {
+          if (effectiveExpr is NameSegment segment) {
+            resolver.ResolveNameSegment(segment, true, null, resolutionContext, true);
+          } else {
+            resolver.ResolveDotSuffix((ExprDotName)effectiveExpr, true, true, null, resolutionContext, true);
+          }
+
+          if (effectiveExpr.Resolved == null) {
+            // error from resolving child
+          } else if (effectiveExpr.Resolved is not MemberSelectExpr callee) {
+            resolver.Reporter.Error(MessageSource.Resolver, effectiveExpr.Origin,
+              $"cannot reveal '{name}' because no revealable constant, function, assert label, or requires label in the current scope is named '{name}'");
+          } else {
+            if (callee.Member is Function or ConstantField) {
+              OffsetMembers.Add(callee.Member);
+              if (!BoogieGenerator.IsOpaque(callee.Member, resolver.Options) || Mode != HideRevealCmd.Modes.Reveal) {
+                continue;
+              }
+
+              var revealResolutionContext = resolutionContext with { InReveal = true };
+              var exprClone = new Cloner().CloneExpr(effectiveExpr);
+              if (exprClone is NameSegment nameSegment) {
+                resolver.ResolveNameSegment(nameSegment, true, null, revealResolutionContext, true);
+              } else {
+                resolver.ResolveDotSuffix((ExprDotName)exprClone, true, true, null, revealResolutionContext, true);
+              }
+
+              var revealCallee = ((MemberSelectExpr)((ConcreteSyntaxExpression)exprClone).ResolvedExpression);
+              if (revealCallee != null) {
+                var call = new CallStmt(Origin, new List<Expression>(),
+                  revealCallee,
+                  new List<ActualBinding>(), effectiveExpr.Center);
+                ResolvedStatements.Add(call);
+              }
+            } else {
+              resolver.Reporter.Error(MessageSource.Resolver, effectiveExpr.Origin,
+                $"only functions and constants can be {KindVerb}");
+            }
+          }
+        } else {
+          resolver.Reporter.Error(MessageSource.Resolver, Origin, "can't use parenthesis when hiding or revealing");
+        }
+      }
+    }
+
+    foreach (var a in ResolvedStatements) {
+      resolver.ResolveStatement(a, resolutionContext);
+    }
+  }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext,
+    string proofContext, bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    ResolvedStatements.ForEach(ss => ss.ResolveGhostness(resolver, reporter, true, codeContext,
+      $"a {Kind} statement", allowAssumptionVariables, inConstructorInitializationPhase));
+    IsGhost = ResolvedStatements.All(ss => ss.IsGhost);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Verification/ModifyStmt.cs b/Source/DafnyCore/AST/Statements/Verification/ModifyStmt.cs
index 228e003cd75..6606c1e7947 100644
--- a/Source/DafnyCore/AST/Statements/Verification/ModifyStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Verification/ModifyStmt.cs
@@ -16,9 +16,9 @@ public ModifyStmt(Cloner cloner, ModifyStmt original) : base(cloner, original) {
     Body = cloner.CloneBlockStmt(original.Body);
   }
 
-  public ModifyStmt(RangeToken rangeToken, List<FrameExpression> mod, Attributes attrs, BlockStmt body)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
+  public ModifyStmt(IOrigin origin, List<FrameExpression> mod, Attributes attrs, BlockStmt body)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(mod != null);
     Mod = new Specification<FrameExpression>(mod, attrs);
     Body = body;
@@ -76,4 +76,21 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
 
     return true;
   }
+
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    if (proofContext != null) {
+      reporter.Error(MessageSource.Resolver, ResolutionErrors.ErrorId.r_modify_forbidden_in_proof, this, $"a modify statement is not allowed in {proofContext}");
+    }
+
+    IsGhost = mustBeErasable;
+    if (IsGhost) {
+      Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
+    }
+    if (Body != null) {
+      Body.ResolveGhostness(resolver, reporter, mustBeErasable, codeContext, proofContext, allowAssumptionVariables,
+        inConstructorInitializationPhase);
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Verification/PredicateStmt.cs b/Source/DafnyCore/AST/Statements/Verification/PredicateStmt.cs
index 6451350536f..dc8267241df 100644
--- a/Source/DafnyCore/AST/Statements/Verification/PredicateStmt.cs
+++ b/Source/DafnyCore/AST/Statements/Verification/PredicateStmt.cs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.Dafny;
 
-public abstract class PredicateStmt : Statement {
+public abstract class PredicateStmt : Statement, ICanResolveNewAndOld {
   public readonly Expression Expr;
   [ContractInvariantMethod]
   void ObjectInvariant() {
@@ -13,17 +13,23 @@ protected PredicateStmt(Cloner cloner, PredicateStmt original) : base(cloner, or
     Expr = cloner.CloneExpr(original.Expr);
   }
 
-  protected PredicateStmt(RangeToken rangeToken, Expression expr, Attributes attrs)
-    : base(rangeToken, attrs) {
-    Contract.Requires(rangeToken != null);
+  protected PredicateStmt(IOrigin origin, Expression expr, Attributes attrs)
+    : base(origin, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(expr != null);
     this.Expr = expr;
   }
 
-  protected PredicateStmt(RangeToken rangeToken, Expression expr)
-    : this(rangeToken, expr, null) {
-    Contract.Requires(rangeToken != null);
+  protected PredicateStmt(IOrigin origin, Expression expr)
+    : this(origin, expr, null) {
+    Contract.Requires(origin != null);
     Contract.Requires(expr != null);
     this.Expr = expr;
   }
+
+  public override void GenResolve(INewOrOldResolver resolver, ResolutionContext context) {
+    base.GenResolve(resolver, context);
+    resolver.ResolveExpression(Expr, context);// follows from postcondition of ResolveExpression
+    resolver.ConstrainTypeExprBool(Expr, "condition is expected to be of type bool, but is {0}");
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Statements/Verification/RevealStmt.cs b/Source/DafnyCore/AST/Statements/Verification/RevealStmt.cs
deleted file mode 100644
index 9fc91a1ba17..00000000000
--- a/Source/DafnyCore/AST/Statements/Verification/RevealStmt.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-
-namespace Microsoft.Dafny;
-
-public class RevealStmt : Statement, ICloneable<RevealStmt>, ICanFormat {
-  public readonly List<Expression> Exprs;
-  [FilledInDuringResolution] public readonly List<AssertLabel> LabeledAsserts = new List<AssertLabel>();  // to indicate that "Expr" denotes a labeled assertion
-  [FilledInDuringResolution] public readonly List<Statement> ResolvedStatements = new List<Statement>();
-
-  public override IEnumerable<Statement> SubStatements {
-    get { return ResolvedStatements; }
-  }
-
-  public override IEnumerable<Statement> PreResolveSubStatements => Enumerable.Empty<Statement>();
-
-  [ContractInvariantMethod]
-  void ObjectInvariant() {
-    Contract.Invariant(Exprs != null);
-    Contract.Invariant(LabeledAsserts.Count <= Exprs.Count);
-  }
-
-  public RevealStmt Clone(Cloner cloner) {
-    return new RevealStmt(cloner, this);
-  }
-
-  public RevealStmt(Cloner cloner, RevealStmt original) : base(cloner, original) {
-    Exprs = original.Exprs.Select(cloner.CloneExpr).ToList();
-    if (cloner.CloneResolvedFields) {
-      LabeledAsserts = original.LabeledAsserts.Select(a => new AssertLabel(cloner.Tok(a.Tok), a.Name)).ToList();
-      ResolvedStatements = original.ResolvedStatements.Select(cloner.CloneStmt).ToList();
-    }
-  }
-
-  public RevealStmt(RangeToken rangeToken, List<Expression> exprs)
-    : base(rangeToken) {
-    Contract.Requires(exprs != null);
-    this.Exprs = exprs;
-  }
-
-  public static string SingleName(Expression e) {
-    Contract.Requires(e != null);
-    if (e is NameSegment || e is LiteralExpr) {
-      return e.tok.val;
-    } else {
-      return null;
-    }
-  }
-
-  public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
-    return formatter.SetIndentPrintRevealStmt(indentBefore, OwnedTokens);
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Substituter.cs b/Source/DafnyCore/AST/Substituter.cs
index 47fbadd7f1a..432b5c954fe 100644
--- a/Source/DafnyCore/AST/Substituter.cs
+++ b/Source/DafnyCore/AST/Substituter.cs
@@ -12,9 +12,9 @@ namespace Microsoft.Dafny {
   /// particular, the substituter does not copy parts of an expression that are used only for well-formedness checks.
   /// </summary>
   public class Substituter {
-    protected readonly Expression receiverReplacement;
-    protected readonly Dictionary<IVariable, Expression> substMap;
-    protected readonly Dictionary<TypeParameter, Type> typeMap;
+    protected Expression receiverReplacement { get; }
+    public Dictionary<IVariable, Expression> substMap { get; }
+    public Dictionary<TypeParameter, Type> typeMap { get; }
     protected readonly Label oldHeapLabel;
     [CanBeNull] protected readonly SystemModuleManager SystemModuleManager; // if non-null, substitutions into FunctionCallExpr's will be wrapped
 
@@ -38,21 +38,21 @@ public virtual Expression Substitute(Expression expr) {
       if (expr is StaticReceiverExpr) {
         var e = (StaticReceiverExpr)expr;
         var ty = e.Type.Subst(typeMap);
-        return new StaticReceiverExpr(e.tok, ty, e.IsImplicit) { Type = ty };
+        return new StaticReceiverExpr(e.Origin, ty, e.IsImplicit) { Type = ty };
       } else if (expr is LiteralExpr literalExpr) {
         if (literalExpr.Value == null) {
           var ty = literalExpr.Type.Subst(typeMap);
           if (ty != literalExpr.Type) {
-            return new LiteralExpr(literalExpr.tok) { Type = ty };
+            return new LiteralExpr(literalExpr.Origin) { Type = ty };
           }
         } else {
           // nothing to substitute
         }
-      } else if (expr is Translator.BoogieWrapper) {
-        var e = (Translator.BoogieWrapper)expr;
+      } else if (expr is BoogieGenerator.BoogieWrapper) {
+        var e = (BoogieGenerator.BoogieWrapper)expr;
         var ty = e.Type.Subst(typeMap);
         if (ty != e.Type) {
-          return new Translator.BoogieWrapper(e.Expr, ty);
+          return new BoogieGenerator.BoogieWrapper(e.Expr, ty);
         }
       } else if (expr is WildcardExpr) {
         // nothing to substitute
@@ -60,9 +60,8 @@ public virtual Expression Substitute(Expression expr) {
         if (receiverReplacement == null) {
           return expr;
         } else {
-          return new ParensExpression(expr.tok, receiverReplacement) {
+          return new ParensExpression(expr.Origin, receiverReplacement) {
             ResolvedExpression = receiverReplacement,
-            RangeToken = expr.RangeToken,
             Type = receiverReplacement.Type
           };
         }
@@ -73,10 +72,10 @@ public virtual Expression Substitute(Expression expr) {
           Expression substExprFinal;
           if (substIdExpr != null) {
             // clone it, using the source location of the original
-            substExprFinal = new IdentifierExpr(expr.tok, substIdExpr.Var);
+            substExprFinal = new IdentifierExpr(expr.Origin, substIdExpr.Var);
           } else {
-            if (substExpr.RangeToken != e.RangeToken) {
-              var substExprParens = new ParensExpression(expr.tok, substExpr);
+            if (substExpr.Origin != e.Origin) {
+              var substExprParens = new ParensExpression(expr.Origin, substExpr);
               substExprParens.Type = substExpr.Type;
               substExprParens.ResolvedExpression = substExpr;
               substExprFinal = substExprParens;
@@ -92,11 +91,11 @@ public virtual Expression Substitute(Expression expr) {
         List<Expression> newElements = SubstituteExprList(e.Elements);
         if (newElements != e.Elements || e.Type.Subst(typeMap) != e.Type) {
           if (expr is SetDisplayExpr) {
-            newExpr = new SetDisplayExpr(expr.tok, ((SetDisplayExpr)expr).Finite, newElements);
+            newExpr = new SetDisplayExpr(expr.Origin, ((SetDisplayExpr)expr).Finite, newElements);
           } else if (expr is MultiSetDisplayExpr) {
-            newExpr = new MultiSetDisplayExpr(expr.tok, newElements);
+            newExpr = new MultiSetDisplayExpr(expr.Origin, newElements);
           } else {
-            newExpr = new SeqDisplayExpr(expr.tok, newElements);
+            newExpr = new SeqDisplayExpr(expr.Origin, newElements);
           }
         }
       } else if (expr is MapDisplayExpr) {
@@ -113,20 +112,20 @@ public virtual Expression Substitute(Expression expr) {
         }
         var ty = e.Type.Subst(typeMap);
         if (anyChanges || ty != e.Type) {
-          newExpr = new MapDisplayExpr(expr.tok, e.Finite, elmts);
+          newExpr = new MapDisplayExpr(expr.Origin, e.Finite, elmts);
         }
       } else if (expr is MemberSelectExpr) {
         var mse = (MemberSelectExpr)expr;
         var newObj = Substitute(mse.Obj);
-        var newTypeApplicationAtEnclosingClass = SubstituteTypeList(mse.TypeApplication_AtEnclosingClass);
-        var newTypeApplicationJustMember = SubstituteTypeList(mse.TypeApplication_JustMember);
+        var newTypeApplicationAtEnclosingClass = SubstituteTypeList(mse.TypeApplicationAtEnclosingClass);
+        var newTypeApplicationJustMember = SubstituteTypeList(mse.TypeApplicationJustMember);
         if (newObj != mse.Obj ||
-            newTypeApplicationAtEnclosingClass != mse.TypeApplication_AtEnclosingClass ||
-            newTypeApplicationJustMember != mse.TypeApplication_JustMember) {
-          var fseNew = new MemberSelectExpr(mse.tok, newObj, mse.MemberName) {
+            newTypeApplicationAtEnclosingClass != mse.TypeApplicationAtEnclosingClass ||
+            newTypeApplicationJustMember != mse.TypeApplicationJustMember) {
+          var fseNew = new MemberSelectExpr(mse.Origin, newObj, mse.MemberNameNode) {
             Member = mse.Member,
-            TypeApplication_AtEnclosingClass = newTypeApplicationAtEnclosingClass,
-            TypeApplication_JustMember = newTypeApplicationJustMember,
+            TypeApplicationAtEnclosingClass = newTypeApplicationAtEnclosingClass,
+            TypeApplicationJustMember = newTypeApplicationJustMember,
             AtLabel = mse.AtLabel ?? oldHeapLabel
           };
           newExpr = fseNew;
@@ -137,7 +136,7 @@ public virtual Expression Substitute(Expression expr) {
         Expression e0 = sse.E0 == null ? null : Substitute(sse.E0);
         Expression e1 = sse.E1 == null ? null : Substitute(sse.E1);
         if (seq != sse.Seq || e0 != sse.E0 || e1 != sse.E1) {
-          newExpr = new SeqSelectExpr(sse.tok, sse.SelectOne, seq, e0, e1, sse.CloseParen);
+          newExpr = new SeqSelectExpr(sse.Origin, sse.SelectOne, seq, e0, e1, sse.CloseParen);
         }
 
       } else if (expr is SeqUpdateExpr) {
@@ -146,14 +145,14 @@ public virtual Expression Substitute(Expression expr) {
         Expression index = Substitute(sse.Index);
         Expression val = Substitute(sse.Value);
         if (seq != sse.Seq || index != sse.Index || val != sse.Value) {
-          newExpr = new SeqUpdateExpr(sse.tok, seq, index, val);
+          newExpr = new SeqUpdateExpr(sse.Origin, seq, index, val);
         }
       } else if (expr is MultiSelectExpr) {
         MultiSelectExpr mse = (MultiSelectExpr)expr;
         Expression array = Substitute(mse.Array);
         List<Expression> newArgs = SubstituteExprList(mse.Indices);
         if (array != mse.Array || newArgs != mse.Indices) {
-          newExpr = new MultiSelectExpr(mse.tok, array, newArgs);
+          newExpr = new MultiSelectExpr(mse.Origin, array, newArgs);
         }
 
       } else if (expr is FunctionCallExpr) {
@@ -165,7 +164,7 @@ public virtual Expression Substitute(Expression expr) {
         if (receiver != e.Receiver || newArgs != e.Args ||
             newTypeApplicationAtEnclosingClass != e.TypeApplication_AtEnclosingClass ||
             newTypeApplicationJustFunction != e.TypeApplication_JustFunction) {
-          var newFce = new FunctionCallExpr(expr.tok, e.Name, receiver, e.OpenParen, e.CloseParen, newArgs, e.AtLabel ?? oldHeapLabel) {
+          var newFce = new FunctionCallExpr(expr.Origin, e.NameNode, receiver, e.OpenParen, e.CloseParen, newArgs, e.AtLabel ?? oldHeapLabel) {
             Function = e.Function, // resolve on the fly (and set newFce.Type below, at end)
             CoCall = e.CoCall, // also copy the co-call status
             CoCallHint = e.CoCallHint, // and any co-call hint
@@ -185,14 +184,14 @@ public virtual Expression Substitute(Expression expr) {
         ApplyExpr e = (ApplyExpr)expr;
         Expression fn = Substitute(e.Function);
         List<Expression> args = SubstituteExprList(e.Args);
-        newExpr = new ApplyExpr(e.tok, fn, args, e.CloseParen);
+        newExpr = new ApplyExpr(e.Origin, fn, args, e.CloseParen);
 
       } else if (expr is DatatypeValue) {
         var dtv = (DatatypeValue)expr;
         var newArguments = SubstituteExprList(dtv.Bindings.Arguments); // substitute into the expressions, but drop any binding names (since those are no longer needed)
         var newTypeArgs = SubstituteTypeList(dtv.InferredTypeArgs);
         if (newArguments != dtv.Bindings.Arguments || newTypeArgs != dtv.InferredTypeArgs) {
-          var newDtv = new DatatypeValue(dtv.tok, dtv.DatatypeName, dtv.MemberName, newArguments) {
+          var newDtv = new DatatypeValue(dtv.Origin, dtv.DatatypeName, dtv.MemberName, newArguments) {
             Ctor = dtv.Ctor,
             InferredTypeArgs = newTypeArgs
           };
@@ -207,7 +206,7 @@ public virtual Expression Substitute(Expression expr) {
         // BoogieWrapper before calling Substitute.
         Expression se = Substitute(e.E);
         if (se != e.E) {
-          newExpr = new OldExpr(expr.tok, se, e.At) {
+          newExpr = new OldExpr(expr.Origin, se, e.At) {
             AtLabel = e.AtLabel ?? oldHeapLabel,
             Useless = e.Useless
           };
@@ -224,20 +223,20 @@ public virtual Expression Substitute(Expression expr) {
           fr.Add(fefe);
         }
         if (anythingChanged) {
-          newExpr = new UnchangedExpr(e.tok, fr, e.At) { AtLabel = e.AtLabel ?? oldHeapLabel };
+          newExpr = new UnchangedExpr(e.Origin, fr, e.At) { AtLabel = e.AtLabel ?? oldHeapLabel };
         }
       } else if (expr is SeqConstructionExpr) {
         var e = (SeqConstructionExpr)expr;
         var sn = Substitute(e.N);
         var sinit = Substitute(e.Initializer);
         if (sn != e.N || sinit != e.Initializer) {
-          newExpr = new SeqConstructionExpr(expr.tok, e.ExplicitElementType, sn, sinit);
+          newExpr = new SeqConstructionExpr(expr.Origin, e.ExplicitElementType, sn, sinit);
         }
       } else if (expr is MultiSetFormingExpr) {
         var e = (MultiSetFormingExpr)expr;
         var se = Substitute(e.E);
         if (se != e.E) {
-          newExpr = new MultiSetFormingExpr(expr.tok, se);
+          newExpr = new MultiSetFormingExpr(expr.Origin, se);
         }
       } else if (expr is BoxingCastExpr) {
         var e = (BoxingCastExpr)expr;
@@ -255,10 +254,10 @@ public virtual Expression Substitute(Expression expr) {
           if (se != e.E || toType != typeUnaryExpr.ToType) {
             if (e is ConversionExpr) {
               var ee = (ConversionExpr)e;
-              newExpr = new ConversionExpr(expr.tok, se, toType);
+              newExpr = new ConversionExpr(expr.Origin, se, toType);
             } else if (e is TypeTestExpr) {
               var ee = (TypeTestExpr)e;
-              newExpr = new TypeTestExpr(expr.tok, se, toType);
+              newExpr = new TypeTestExpr(expr.Origin, se, toType);
             } else {
               Contract.Assert(false); // unexpected UnaryExpr subtype
             }
@@ -266,10 +265,10 @@ public virtual Expression Substitute(Expression expr) {
         } else if (se != e.E) {
           if (e is FreshExpr) {
             var ee = (FreshExpr)e;
-            newExpr = new FreshExpr(expr.tok, se, ee.At) { AtLabel = ee.AtLabel ?? oldHeapLabel };
+            newExpr = new FreshExpr(expr.Origin, se, ee.At) { AtLabel = ee.AtLabel ?? oldHeapLabel };
           } else if (e is UnaryOpExpr) {
             var ee = (UnaryOpExpr)e;
-            newExpr = new UnaryOpExpr(expr.tok, ee.Op, se);
+            newExpr = new UnaryOpExpr(expr.Origin, ee.Op, se);
           } else {
             Contract.Assert(false);  // unexpected UnaryExpr subtype
           }
@@ -280,7 +279,7 @@ public virtual Expression Substitute(Expression expr) {
         Expression e0 = Substitute(e.E0);
         Expression e1 = Substitute(e.E1);
         if (e0 != e.E0 || e1 != e.E1) {
-          BinaryExpr newBin = new BinaryExpr(expr.tok, e.Op, e0, e1);
+          BinaryExpr newBin = new BinaryExpr(expr.Origin, e.Op, e0, e1);
           newBin.ResolvedOp = e.ResolvedOp;  // part of what needs to be done to resolve on the fly (newBin.Type is set below, at end)
           newExpr = newBin;
         }
@@ -291,7 +290,7 @@ public virtual Expression Substitute(Expression expr) {
         var e1 = Substitute(e.E1);
         var e2 = Substitute(e.E2);
         if (e0 != e.E0 || e1 != e.E1 || e2 != e.E2) {
-          newExpr = new TernaryExpr(expr.tok, e.Op, e0, e1, e2);
+          newExpr = new TernaryExpr(expr.Origin, e.Op, e0, e1, e2);
         }
 
       } else if (expr is LetExpr letExpr) {
@@ -309,16 +308,18 @@ public virtual Expression Substitute(Expression expr) {
           ExtendedPattern SubstituteForPattern(ExtendedPattern pattern) {
             switch (pattern) {
               case DisjunctivePattern disjunctivePattern:
-                return new DisjunctivePattern(disjunctivePattern.Tok,
+                return new DisjunctivePattern(disjunctivePattern.Origin,
                   disjunctivePattern.Alternatives.Select(SubstituteForPattern).ToList(), disjunctivePattern.IsGhost);
               case IdPattern idPattern:
                 if (idPattern.BoundVar == null) {
-                  return new IdPattern(idPattern.Tok, idPattern.Id, idPattern.Type,
-                    idPattern.Arguments?.Select(SubstituteForPattern).ToList(), idPattern.IsGhost);
+                  return new IdPattern(idPattern.Origin, idPattern.Id, idPattern.Type,
+                    idPattern.Arguments?.Select(SubstituteForPattern).ToList(), idPattern.IsGhost) {
+                    Ctor = idPattern.Ctor
+                  };
                 }
 
                 discoveredBvs.Add((BoundVar)idPattern.BoundVar);
-                var result = new IdPattern(idPattern.Tok, idPattern.Id, idPattern.Type, null, idPattern.IsGhost) {
+                var result = new IdPattern(idPattern.Origin, idPattern.Id, idPattern.Type, null, idPattern.IsGhost) {
                   BoundVar = CreateBoundVarSubstitutions(new[] { (BoundVar)idPattern.BoundVar }.ToList(), false)[0]
                 };
                 if (idPattern.BoundVar != result.BoundVar) {
@@ -342,11 +343,11 @@ ExtendedPattern SubstituteForPattern(ExtendedPattern pattern) {
             anythingChanged = true;
           }
 
-          var newCaseExpr = new NestedMatchCaseExpr(mc.Tok, pattern, body, mc.Attributes);
+          var newCaseExpr = new NestedMatchCaseExpr(mc.Origin, pattern, body, mc.Attributes);
           cases.Add(newCaseExpr);
         }
         if (anythingChanged) {
-          newExpr = new NestedMatchExpr(expr.tok, src, cases, nestedMatchExpr.UsesOptionalBraces) {
+          newExpr = new NestedMatchExpr(expr.Origin, src, cases, nestedMatchExpr.UsesOptionalBraces) {
             Flattened = flattened
           };
         }
@@ -367,12 +368,12 @@ ExtendedPattern SubstituteForPattern(ExtendedPattern pattern) {
           if (newBoundVars != mc.Arguments || body != mc.Body) {
             anythingChanged = true;
           }
-          var newCaseExpr = new MatchCaseExpr(mc.tok, mc.Ctor, mc.FromBoundVar, newBoundVars, body, mc.Attributes);
+          var newCaseExpr = new MatchCaseExpr(mc.Origin, mc.Ctor, mc.FromBoundVar, newBoundVars, body, mc.Attributes);
           newCaseExpr.Ctor = mc.Ctor;  // resolve here
           cases.Add(newCaseExpr);
         }
         if (anythingChanged) {
-          var newME = new MatchExpr(expr.tok, src, cases, e.UsesOptionalBraces);
+          var newME = new MatchExpr(expr.Origin, src, cases, e.UsesOptionalBraces);
           newME.MissingCases.AddRange(e.MissingCases);
           newExpr = newME;
         }
@@ -383,7 +384,7 @@ ExtendedPattern SubstituteForPattern(ExtendedPattern pattern) {
 
       } else if (expr is StmtExpr) {
         var e = (StmtExpr)expr;
-        newExpr = new StmtExpr(e.tok, SubstStmt(e.S), Substitute(e.E));
+        newExpr = new StmtExpr(e.Origin, SubstStmt(e.S), Substitute(e.E));
 
       } else if (expr is ITEExpr) {
         ITEExpr e = (ITEExpr)expr;
@@ -391,19 +392,18 @@ ExtendedPattern SubstituteForPattern(ExtendedPattern pattern) {
         Expression thn = Substitute(e.Thn);
         Expression els = Substitute(e.Els);
         if (test != e.Test || thn != e.Thn || els != e.Els) {
-          newExpr = new ITEExpr(expr.tok, e.IsBindingGuard, test, thn, els);
+          newExpr = new ITEExpr(expr.Origin, e.IsBindingGuard, test, thn, els);
         }
       } else if (expr is ConcreteSyntaxExpression concreteSyntaxExpression) {
         Contract.Assert(concreteSyntaxExpression.ResolvedExpression != null);
         var resolvedExpression = Substitute(concreteSyntaxExpression.ResolvedExpression);
-        return new ParensExpression(expr.tok, resolvedExpression) {
+        return new ParensExpression(expr.Origin, resolvedExpression) {
           ResolvedExpression = resolvedExpression,
-          RangeToken = expr.RangeToken,
           Type = resolvedExpression.Type
         };
 
-      } else if (expr is Translator.BoogieFunctionCall) {
-        var e = (Translator.BoogieFunctionCall)expr;
+      } else if (expr is BoogieGenerator.BoogieFunctionCall) {
+        var e = (BoogieGenerator.BoogieFunctionCall)expr;
         bool anythingChanged = false;
         var newTyArgs = new List<Type>();
         foreach (var arg in e.TyArgs) {
@@ -422,9 +422,16 @@ ExtendedPattern SubstituteForPattern(ExtendedPattern pattern) {
           newArgs.Add(newArg);
         }
         if (anythingChanged) {
-          newExpr = new Translator.BoogieFunctionCall(e.tok, e.FunctionName, e.UsesHeap, e.UsesOldHeap, e.HeapAtLabels, newArgs, newTyArgs);
+          newExpr = new BoogieGenerator.BoogieFunctionCall(e.Origin, e.FunctionName, e.UsesHeap, e.UsesOldHeap, e.HeapAtLabels, newArgs, newTyArgs);
         }
 
+      } else if (expr is DecreasesToExpr decreasesToExpr) {
+        List<Expression> oldExpressionsSubst = SubstituteExprList(decreasesToExpr.OldExpressions.ToList());
+        List<Expression> newExpressionsSubst = SubstituteExprList(decreasesToExpr.NewExpressions.ToList());
+        newExpr = new DecreasesToExpr(decreasesToExpr.Origin, oldExpressionsSubst, newExpressionsSubst, decreasesToExpr.AllowNoChange) {
+          Type = decreasesToExpr.Type
+        };
+
       } else {
         Contract.Assume(false); // unexpected Expression
       }
@@ -466,22 +473,28 @@ private Expression LetExpr(LetExpr letExpr) {
 
         // Put things together
         if (anythingChanged || body != letExpr.Body) {
-          return new LetExpr(letExpr.tok, newCasePatterns, rhss, body, letExpr.Exact);
+          return new LetExpr(letExpr.Origin, newCasePatterns, rhss, body, letExpr.Exact);
         }
 
         return null;
       } else {
+        var newLHSs = CreateCasePatternSubstitutions(letExpr.LHSs, true);
         var rhs = Substitute(letExpr.RHSs[0]);
         var body = Substitute(letExpr.Body);
         var newBounds = SubstituteBoundedPoolList(letExpr.Constraint_Bounds);
-        if (rhs == letExpr.RHSs[0] && body == letExpr.Body && newBounds == letExpr.Constraint_Bounds) {
+        // undo any changes to substMap
+        foreach (var bv in letExpr.BoundVars) {
+          substMap.Remove(bv);
+        }
+
+        if (newLHSs == letExpr.LHSs && rhs == letExpr.RHSs[0] && body == letExpr.Body && newBounds == letExpr.Constraint_Bounds) {
           return null;
         }
 
         // keep copies of the substitution maps so we can reuse them at desugaring time
         var newSubstMap = new Dictionary<IVariable, Expression>(substMap);
         var newTypeMap = new Dictionary<TypeParameter, Type>(typeMap);
-        return new Translator.SubstLetExpr(letExpr.tok, letExpr.LHSs, new List<Expression> { rhs }, body, letExpr.Exact, letExpr, newSubstMap, newTypeMap, newBounds);
+        return new BoogieGenerator.SubstLetExpr(letExpr.Origin, newLHSs, new List<Expression> { rhs }, body, letExpr.Exact, letExpr, newSubstMap, newTypeMap, newBounds);
       }
     }
 
@@ -489,7 +502,7 @@ private Expression LetExpr(LetExpr letExpr) {
     /// This method calls "SubstituteBoundedPool" on each item in the possibly null list. If any of those calls returns a
     /// change from the original, then all of the results are returned in a new list; otherwise, "list" is returned.
     /// </summary>
-    public List<ComprehensionExpr.BoundedPool>/*?*/ SubstituteBoundedPoolList(List<ComprehensionExpr.BoundedPool>/*?*/ list) {
+    public List<BoundedPool>/*?*/ SubstituteBoundedPoolList(List<BoundedPool>/*?*/ list) {
       if (list != null) {
         var newList = list.ConvertAll(SubstituteBoundedPool);
         for (var i = 0; i < list.Count; i++) {
@@ -501,53 +514,55 @@ private Expression LetExpr(LetExpr letExpr) {
       return list;
     }
 
-    public ComprehensionExpr.BoundedPool SubstituteBoundedPool(ComprehensionExpr.BoundedPool bound) {
+    public BoundedPool SubstituteBoundedPool(BoundedPool bound) {
       if (bound == null) {
         return null;
-      } else if (bound is ComprehensionExpr.ExactBoundedPool) {
-        var b = (ComprehensionExpr.ExactBoundedPool)bound;
-        return new ComprehensionExpr.ExactBoundedPool(Substitute(b.E));
-      } else if (bound is ComprehensionExpr.BoolBoundedPool) {
+      } else if (bound is ExactBoundedPool) {
+        var b = (ExactBoundedPool)bound;
+        return new ExactBoundedPool(Substitute(b.E));
+      } else if (bound is BoolBoundedPool) {
         return bound;  // nothing to substitute
-      } else if (bound is ComprehensionExpr.CharBoundedPool) {
+      } else if (bound is CharBoundedPool) {
         return bound;  // nothing to substitute
-      } else if (bound is ComprehensionExpr.IntBoundedPool) {
-        var b = (ComprehensionExpr.IntBoundedPool)bound;
-        return new ComprehensionExpr.IntBoundedPool(b.LowerBound == null ? null : Substitute(b.LowerBound), b.UpperBound == null ? null : Substitute(b.UpperBound));
-      } else if (bound is ComprehensionExpr.SetBoundedPool) {
-        var b = (ComprehensionExpr.SetBoundedPool)bound;
-        return new ComprehensionExpr.SetBoundedPool(Substitute(b.Set), b.BoundVariableType, b.CollectionElementType, b.IsFiniteCollection);
-      } else if (bound is ComprehensionExpr.MultiSetBoundedPool) {
-        var b = (ComprehensionExpr.MultiSetBoundedPool)bound;
-        return new ComprehensionExpr.MultiSetBoundedPool(Substitute(b.MultiSet), b.BoundVariableType, b.CollectionElementType);
-      } else if (bound is ComprehensionExpr.SubSetBoundedPool) {
-        var b = (ComprehensionExpr.SubSetBoundedPool)bound;
-        return new ComprehensionExpr.SubSetBoundedPool(Substitute(b.UpperBound), b.IsFiniteCollection);
-      } else if (bound is ComprehensionExpr.SuperSetBoundedPool) {
-        var b = (ComprehensionExpr.SuperSetBoundedPool)bound;
-        return new ComprehensionExpr.SuperSetBoundedPool(Substitute(b.LowerBound));
-      } else if (bound is ComprehensionExpr.MapBoundedPool) {
-        var b = (ComprehensionExpr.MapBoundedPool)bound;
-        return new ComprehensionExpr.MapBoundedPool(Substitute(b.Map), b.BoundVariableType, b.CollectionElementType, b.IsFiniteCollection);
-      } else if (bound is ComprehensionExpr.SeqBoundedPool) {
-        var b = (ComprehensionExpr.SeqBoundedPool)bound;
-        return new ComprehensionExpr.SeqBoundedPool(Substitute(b.Seq), b.BoundVariableType, b.CollectionElementType);
-      } else if (bound is ComprehensionExpr.DatatypeBoundedPool) {
+      } else if (bound is IntBoundedPool) {
+        var b = (IntBoundedPool)bound;
+        return new IntBoundedPool(
+          b.LowerBound == null ? null : Substitute(b.LowerBound),
+          b.UpperBound == null ? null : Substitute(b.UpperBound));
+      } else if (bound is SetBoundedPool) {
+        var b = (SetBoundedPool)bound;
+        return new SetBoundedPool(Substitute(b.Set), b.BoundVariableType, b.CollectionElementType, b.IsFiniteCollection);
+      } else if (bound is MultiSetBoundedPool) {
+        var b = (MultiSetBoundedPool)bound;
+        return new MultiSetBoundedPool(Substitute(b.MultiSet), b.BoundVariableType, b.CollectionElementType);
+      } else if (bound is SubSetBoundedPool) {
+        var b = (SubSetBoundedPool)bound;
+        return new SubSetBoundedPool(Substitute(b.UpperBound), b.IsFiniteCollection);
+      } else if (bound is SuperSetBoundedPool) {
+        var b = (SuperSetBoundedPool)bound;
+        return new SuperSetBoundedPool(Substitute(b.LowerBound));
+      } else if (bound is MapBoundedPool) {
+        var b = (MapBoundedPool)bound;
+        return new MapBoundedPool(Substitute(b.Map), b.BoundVariableType, b.CollectionElementType, b.IsFiniteCollection);
+      } else if (bound is SeqBoundedPool) {
+        var b = (SeqBoundedPool)bound;
+        return new SeqBoundedPool(Substitute(b.Seq), b.BoundVariableType, b.CollectionElementType);
+      } else if (bound is DatatypeBoundedPool) {
         return bound;  // nothing to substitute
-      } else if (bound is ComprehensionExpr.DatatypeInclusionBoundedPool) {
+      } else if (bound is DatatypeInclusionBoundedPool) {
         return bound;  // nothing to substitute
-      } else if (bound is ComprehensionExpr.AllocFreeBoundedPool) {
+      } else if (bound is AllocFreeBoundedPool) {
         return bound;  // nothing to substitute
-      } else if (bound is ComprehensionExpr.ExplicitAllocatedBoundedPool) {
+      } else if (bound is ExplicitAllocatedBoundedPool) {
         return bound;  // nothing to substitute
       } else if (bound is AssignSuchThatStmt.WiggleWaggleBound) {
         return bound;  // nothing to substitute
-      } else if (bound is ComprehensionExpr.SpecialAllocIndependenceAllocatedBoundedPool) {
+      } else if (bound is SpecialAllocIndependenceAllocatedBoundedPool) {
         return bound;  // nothing to substitute
-      } else if (bound is ComprehensionExpr.OlderBoundedPool) {
+      } else if (bound is OlderBoundedPool) {
         return bound;  // nothing to substitute
       } else {
-        Contract.Assume(false);  // unexpected ComprehensionExpr.BoundedPool
+        Contract.Assume(false);  // unexpected BoundedPool
         throw new cce.UnreachableException();  // to please compiler
       }
     }
@@ -567,12 +582,10 @@ protected virtual List<BoundVar> CreateBoundVarSubstitutions(List<BoundVar> vars
           newBoundVars.Add(bv);
         } else {
           anythingChanged = true;
-          var newBv = new BoundVar(bv.tok, bv.Name, tt);
+          var newBv = new BoundVar(bv.Origin, bv.Name, tt);
           newBoundVars.Add(newBv);
           // update substMap to reflect the new BoundVar substitutions
-          var ie = new IdentifierExpr(newBv.tok, newBv.Name);
-          ie.Var = newBv;  // resolve here
-          ie.Type = newBv.Type;  // resolve here
+          var ie = new IdentifierExpr(newBv.Origin, newBv.Name) { Var = newBv, Type = newBv.Type };
           substMap.Add(bv, ie);
         }
       }
@@ -589,18 +602,16 @@ protected virtual List<LocalVariable> CreateLocalVarSubstitutions(List<LocalVari
       bool anythingChanged = false;
       var newVars = new List<LocalVariable>();
       foreach (var v in vars) {
-        var tt = v.OptionalType.Subst(typeMap);
-        if (!forceSubstitutionOfVars && tt == v.OptionalType) {
+        var tt = v.SyntacticType.Subst(typeMap);
+        if (!forceSubstitutionOfVars && tt == v.SyntacticType) {
           newVars.Add(v);
         } else {
           anythingChanged = true;
-          var newVar = new LocalVariable(v.RangeToken, v.Name, tt, v.IsGhost);
+          var newVar = new LocalVariable(v.Origin, v.Name, tt, v.IsGhost);
           newVar.type = tt;  // resolve here
           newVars.Add(newVar);
           // update substMap to reflect the new LocalVariable substitutions
-          var ie = new IdentifierExpr(newVar.Tok, newVar.Name);
-          ie.Var = newVar;  // resolve here
-          ie.Type = newVar.Type;  // resolve here
+          var ie = new IdentifierExpr(newVar.Origin, newVar.Name) { Var = newVar, Type = newVar.Type };
           substMap.Add(v, ie);
         }
       }
@@ -635,11 +646,9 @@ Func<CasePattern<VT>, Type, VT, VT> cloneVt
         if (forceSubstitutionOfBoundVars || tt != bv.Type) {
           var newBv = cloneVt(pat, tt, bv);
           // update substMap to reflect the new BoundVar substitutions
-          var ie = new IdentifierExpr(newBv.Tok, newBv.Name);
-          ie.Var = newBv;  // resolve here
-          ie.Type = newBv.Type;  // resolve here
+          var ie = new IdentifierExpr(newBv.Origin, newBv.Name) { Var = newBv, Type = newBv.Type };
           substMap.Add(bv, ie);
-          var newPat = new CasePattern<VT>(pat.tok, newBv);
+          var newPat = new CasePattern<VT>(pat.Origin, newBv);
           newPat.AssembleExpr(null);
           return newPat;
         }
@@ -655,7 +664,7 @@ Func<CasePattern<VT>, Type, VT, VT> cloneVt
         }
         if (anythingChanged) {
           var patE = (DatatypeValue)pat.Expr;
-          var newPat = new CasePattern<VT>(pat.tok, pat.Id, newArgs);
+          var newPat = new CasePattern<VT>(pat.Origin, pat.Id, newArgs);
           newPat.Ctor = pat.Ctor;
           newPat.AssembleExpr(patE.InferredTypeArgs.ConvertAll(tp => tp.Subst(typeMap)));
           return newPat;
@@ -739,10 +748,10 @@ protected List<Type> SubstituteTypeList(List<Type> types) {
     }
 
     public LocalVariable CloneLocalVariable(CasePattern<LocalVariable> pat, Type tt, LocalVariable lv) {
-      return new LocalVariable(pat.RangeToken, pat.Id, tt, lv.IsGhost);
+      return new LocalVariable(pat.Origin, pat.Id, tt, lv.IsGhost);
     }
     public BoundVar CloneBoundVar(CasePattern<BoundVar> pat, Type tt, BoundVar bv) {
-      return new BoundVar(pat.tok, pat.Id, tt);
+      return new BoundVar(pat.Origin, pat.Id, tt);
     }
     /// <summary>
     /// This method (which currently is used only internally to class Substituter) performs substitutions in
@@ -755,34 +764,34 @@ protected virtual Statement SubstStmt(Statement stmt) {
         return null;
       } else if (stmt is AssertStmt) {
         var s = (AssertStmt)stmt;
-        r = new AssertStmt(s.RangeToken, Substitute(s.Expr), SubstBlockStmt(s.Proof), s.Label, SubstAttributes(s.Attributes));
+        r = new AssertStmt(s.Origin, Substitute(s.Expr), s.Label, SubstAttributes(s.Attributes));
       } else if (stmt is ExpectStmt) {
         var s = (ExpectStmt)stmt;
-        r = new ExpectStmt(s.RangeToken, Substitute(s.Expr), Substitute(s.Message), SubstAttributes(s.Attributes));
+        r = new ExpectStmt(s.Origin, Substitute(s.Expr), Substitute(s.Message), SubstAttributes(s.Attributes));
       } else if (stmt is AssumeStmt) {
         var s = (AssumeStmt)stmt;
-        r = new AssumeStmt(s.RangeToken, Substitute(s.Expr), SubstAttributes(s.Attributes));
-      } else if (stmt is BreakStmt) {
-        var s = (BreakStmt)stmt;
-        BreakStmt rr;
+        r = new AssumeStmt(s.Origin, Substitute(s.Expr), SubstAttributes(s.Attributes));
+      } else if (stmt is BreakOrContinueStmt) {
+        var s = (BreakOrContinueStmt)stmt;
+        BreakOrContinueStmt rr;
         if (s.TargetLabel != null) {
-          rr = new BreakStmt(s.RangeToken, s.TargetLabel, s.IsContinue);
+          rr = new BreakOrContinueStmt(s.Origin, s.TargetLabel, s.IsContinue);
         } else {
-          rr = new BreakStmt(s.RangeToken, s.BreakAndContinueCount, s.IsContinue);
+          rr = new BreakOrContinueStmt(s.Origin, s.BreakAndContinueCount, s.IsContinue);
         }
         // r.TargetStmt will be filled in as later
         if (!BreaksToBeResolved.TryGetValue(s, out var breaks)) {
-          breaks = new List<BreakStmt>();
+          breaks = new List<BreakOrContinueStmt>();
           BreaksToBeResolved.Add(s, breaks);
         }
         breaks.Add(rr);
         r = rr;
-      } else if (stmt is AssignStmt) {
-        var s = (AssignStmt)stmt;
-        r = new AssignStmt(s.RangeToken, Substitute(s.Lhs), SubstRHS(s.Rhs));
+      } else if (stmt is SingleAssignStmt) {
+        var s = (SingleAssignStmt)stmt;
+        r = new SingleAssignStmt(s.Origin, Substitute(s.Lhs), SubstRHS(s.Rhs));
       } else if (stmt is CallStmt) {
         var s = (CallStmt)stmt;
-        var rr = new CallStmt(s.RangeToken, s.Lhs.ConvertAll(Substitute), (MemberSelectExpr)Substitute(s.MethodSelect), s.Args.ConvertAll(Substitute));
+        var rr = new CallStmt(s.Origin, s.Lhs.ConvertAll(Substitute), (MemberSelectExpr)Substitute(s.MethodSelect), s.Args.ConvertAll(Substitute));
         r = rr;
       } else if (stmt is DividedBlockStmt) {
         r = SubstDividedBlockStmt((DividedBlockStmt)stmt);
@@ -791,16 +800,16 @@ protected virtual Statement SubstStmt(Statement stmt) {
       } else if (stmt is IfStmt) {
         var s = (IfStmt)stmt;
         var guard = s.IsBindingGuard ? SubstituteComprehensionExpr((ExistsExpr)s.Guard, false) : Substitute(s.Guard);
-        r = new IfStmt(s.RangeToken, s.IsBindingGuard, guard, SubstBlockStmt(s.Thn), SubstStmt(s.Els));
+        r = new IfStmt(s.Origin, s.IsBindingGuard, guard, SubstBlockStmt(s.Thn), SubstStmt(s.Els));
       } else if (stmt is AlternativeStmt) {
         var s = (AlternativeStmt)stmt;
-        r = new AlternativeStmt(s.RangeToken, s.Alternatives.ConvertAll(SubstGuardedAlternative), s.UsesOptionalBraces);
+        r = new AlternativeStmt(s.Origin, s.Alternatives.ConvertAll(SubstGuardedAlternative), s.UsesOptionalBraces);
       } else if (stmt is WhileStmt) {
         var s = (WhileStmt)stmt;
-        r = new WhileStmt(s.RangeToken, Substitute(s.Guard), s.Invariants.ConvertAll(SubstMayBeFreeExpr), SubstSpecExpr(s.Decreases), SubstSpecFrameExpr(s.Mod), SubstBlockStmt(s.Body));
+        r = new WhileStmt(s.Origin, Substitute(s.Guard), s.Invariants.ConvertAll(SubstMayBeFreeExpr), SubstSpecExpr(s.Decreases), SubstSpecFrameExpr(s.Mod), SubstBlockStmt(s.Body));
       } else if (stmt is AlternativeLoopStmt) {
         var s = (AlternativeLoopStmt)stmt;
-        r = new AlternativeLoopStmt(s.RangeToken, s.Invariants.ConvertAll(SubstMayBeFreeExpr), SubstSpecExpr(s.Decreases), SubstSpecFrameExpr(s.Mod), s.Alternatives.ConvertAll(SubstGuardedAlternative), s.UsesOptionalBraces);
+        r = new AlternativeLoopStmt(s.Origin, s.Invariants.ConvertAll(SubstMayBeFreeExpr), SubstSpecExpr(s.Decreases), SubstSpecFrameExpr(s.Mod), s.Alternatives.ConvertAll(SubstGuardedAlternative), s.UsesOptionalBraces);
       } else if (stmt is ForallStmt) {
         var s = (ForallStmt)stmt;
         var newBoundVars = CreateBoundVarSubstitutions(s.BoundVars, false);
@@ -811,40 +820,40 @@ protected virtual Statement SubstStmt(Statement stmt) {
         }
 
         // Put things together
-        var rr = new ForallStmt(s.RangeToken, newBoundVars, SubstAttributes(s.Attributes), Substitute(s.Range), s.Ens.ConvertAll(SubstMayBeFreeExpr), body);
+        var rr = new ForallStmt(s.Origin, newBoundVars, SubstAttributes(s.Attributes), Substitute(s.Range), s.Ens.ConvertAll(SubstMayBeFreeExpr), body);
         rr.Kind = s.Kind;
         rr.CanConvert = s.CanConvert;
         rr.Bounds = SubstituteBoundedPoolList(s.Bounds);
-        if (s.ForallExpressions != null) {
-          rr.ForallExpressions = s.ForallExpressions.ConvertAll(Substitute);
+        if (s.EffectiveEnsuresClauses != null) {
+          rr.EffectiveEnsuresClauses = s.EffectiveEnsuresClauses.ConvertAll(Substitute);
         }
         r = rr;
       } else if (stmt is CalcStmt) {
         var s = (CalcStmt)stmt;
-        var rr = new CalcStmt(s.RangeToken, SubstCalcOp(s.UserSuppliedOp), s.Lines.ConvertAll(Substitute), s.Hints.ConvertAll(SubstBlockStmt), s.StepOps.ConvertAll(SubstCalcOp), SubstAttributes(s.Attributes));
+        var rr = new CalcStmt(s.Origin, SubstCalcOp(s.UserSuppliedOp), s.Lines.ConvertAll(Substitute), s.Hints.ConvertAll(SubstBlockStmt), s.StepOps.ConvertAll(SubstCalcOp), SubstAttributes(s.Attributes));
         rr.Op = SubstCalcOp(s.Op);
         rr.Steps.AddRange(s.Steps.ConvertAll(Substitute));
         rr.Result = Substitute(s.Result);
         r = rr;
       } else if (stmt is MatchStmt) {
         var s = (MatchStmt)stmt;
-        var rr = new MatchStmt(s.RangeToken, Substitute(s.Source), s.Cases.ConvertAll(SubstMatchCaseStmt), s.UsesOptionalBraces);
+        var rr = new MatchStmt(s.Origin, Substitute(s.Source), s.Cases.ConvertAll(SubstMatchCaseStmt), s.UsesOptionalBraces);
         rr.MissingCases.AddRange(s.MissingCases);
         r = rr;
       } else if (stmt is AssignSuchThatStmt) {
         var s = (AssignSuchThatStmt)stmt;
-        r = new AssignSuchThatStmt(s.RangeToken, s.Lhss.ConvertAll(Substitute), Substitute(s.Expr), s.AssumeToken, null) {
+        r = new AssignSuchThatStmt(s.Origin, s.Lhss.ConvertAll(Substitute), Substitute(s.Expr), s.AssumeToken, null) {
           Bounds = SubstituteBoundedPoolList(s.Bounds)
         };
-      } else if (stmt is UpdateStmt) {
-        var s = (UpdateStmt)stmt;
+      } else if (stmt is AssignStatement) {
+        var s = (AssignStatement)stmt;
         var resolved = s.ResolvedStatements;
-        UpdateStmt rr;
+        AssignStatement rr;
         if (resolved.Count == 1) {
           // when later translating this UpdateStmt, the s.Lhss and s.Rhss components won't be used, only s.ResolvedStatements
-          rr = new UpdateStmt(s.RangeToken, s.Lhss, s.Rhss, s.CanMutateKnownState);
+          rr = new AssignStatement(s.Origin, s.Lhss, s.Rhss, s.CanMutateKnownState);
         } else {
-          rr = new UpdateStmt(s.RangeToken, s.Lhss.ConvertAll(Substitute), s.Rhss.ConvertAll(SubstRHS), s.CanMutateKnownState);
+          rr = new AssignStatement(s.Origin, s.Lhss.ConvertAll(Substitute), s.Rhss.ConvertAll(SubstRHS), s.CanMutateKnownState);
         }
 
         if (s.ResolvedStatements != null) {
@@ -854,19 +863,26 @@ protected virtual Statement SubstStmt(Statement stmt) {
       } else if (stmt is VarDeclStmt) {
         var s = (VarDeclStmt)stmt;
         var lhss = CreateLocalVarSubstitutions(s.Locals, false);
-        var rr = new VarDeclStmt(s.RangeToken, lhss, (ConcreteUpdateStatement)SubstStmt(s.Update));
+        var rr = new VarDeclStmt(s.Origin, lhss, (ConcreteAssignStatement)SubstStmt(s.Assign));
         r = rr;
       } else if (stmt is VarDeclPattern) {
         var s = (VarDeclPattern)stmt;
         var lhss = SubstituteCasePattern(s.LHS, false, CloneLocalVariable);
-        var rr = new VarDeclPattern(s.RangeToken, lhss, (Expression)Substitute(s.RHS), s.HasGhostModifier);
+        var rr = new VarDeclPattern(s.Origin, lhss, (Expression)Substitute(s.RHS), s.HasGhostModifier);
         r = rr;
-      } else if (stmt is RevealStmt) {
-        var s = (RevealStmt)stmt;
+      } else if (stmt is HideRevealStmt revealStmt) {
         // don't need to substitute s.Expr since it won't be used, only the s.ResolvedStatements are used.
-        var rr = new RevealStmt(s.RangeToken, s.Exprs);
-        rr.LabeledAsserts.AddRange(s.LabeledAsserts);
-        rr.ResolvedStatements.AddRange(s.ResolvedStatements.ConvertAll(SubstStmt));
+        var rr = revealStmt.Wildcard
+          ? new HideRevealStmt(revealStmt.Origin, revealStmt.Mode)
+          : new HideRevealStmt(revealStmt.Origin, revealStmt.Exprs, revealStmt.Mode);
+        rr.LabeledAsserts.AddRange(revealStmt.LabeledAsserts);
+        rr.ResolvedStatements.AddRange(revealStmt.ResolvedStatements.ConvertAll(SubstStmt));
+        rr.OffsetMembers = revealStmt.OffsetMembers.ToList();
+        r = rr;
+      } else if (stmt is BlockByProofStmt blockByProofStmt) {
+        var rr = new BlockByProofStmt(blockByProofStmt.Origin,
+          (BlockStmt)SubstStmt(blockByProofStmt.Proof),
+          SubstStmt(blockByProofStmt.Body));
         r = rr;
       } else {
         Contract.Assert(false); throw new cce.UnreachableException();  // unexpected statement
@@ -888,7 +904,7 @@ protected virtual Statement SubstStmt(Statement stmt) {
       return r;
     }
 
-    Dictionary<Statement, List<BreakStmt>> BreaksToBeResolved = new Dictionary<Statement, List<BreakStmt>>();  // old-target -> new-breaks
+    Dictionary<Statement, List<BreakOrContinueStmt>> BreaksToBeResolved = new Dictionary<Statement, List<BreakOrContinueStmt>>();  // old-target -> new-breaks
 
     protected void AddStmtLabels(Statement s, LList<Label> node) {
       if (node != null) {
@@ -898,7 +914,7 @@ protected void AddStmtLabels(Statement s, LList<Label> node) {
     }
 
     protected virtual DividedBlockStmt SubstDividedBlockStmt(DividedBlockStmt stmt) {
-      return stmt == null ? null : new DividedBlockStmt(stmt.RangeToken, stmt.BodyInit.ConvertAll(SubstStmt), stmt.SeparatorTok, stmt.BodyProper.ConvertAll(SubstStmt));
+      return stmt == null ? null : new DividedBlockStmt(stmt.Origin, stmt.BodyInit.ConvertAll(SubstStmt), stmt.SeparatorTok, stmt.BodyProper.ConvertAll(SubstStmt));
     }
 
     protected virtual BlockStmt SubstBlockStmt(BlockStmt stmt) {
@@ -906,7 +922,7 @@ protected virtual BlockStmt SubstBlockStmt(BlockStmt stmt) {
         return null;
       }
       var prevSubstMap = new Dictionary<IVariable, Expression>(substMap);
-      var b = new BlockStmt(stmt.RangeToken, stmt.Body.ConvertAll(SubstStmt));
+      var b = new BlockStmt(stmt.Origin, stmt.Body.ConvertAll(SubstStmt));
       if (substMap.Count != prevSubstMap.Count) {
         // reset substMap to what it was (note that substMap is a readonly field, so we can't just change it back to prevSubstMap)
         substMap.Clear();
@@ -920,7 +936,7 @@ protected virtual BlockStmt SubstBlockStmt(BlockStmt stmt) {
     protected GuardedAlternative SubstGuardedAlternative(GuardedAlternative alt) {
       Contract.Requires(alt != null);
       var guard = alt.IsBindingGuard ? SubstituteComprehensionExpr((ExistsExpr)alt.Guard, false) : Substitute(alt.Guard);
-      return new GuardedAlternative(alt.Tok, alt.IsBindingGuard, guard, alt.Body.ConvertAll(SubstStmt));
+      return new GuardedAlternative(alt.Origin, alt.IsBindingGuard, guard, alt.Body.ConvertAll(SubstStmt));
     }
 
     protected AttributedExpression SubstMayBeFreeExpr(AttributedExpression expr) {
@@ -935,14 +951,14 @@ protected Specification<Expression> SubstSpecExpr(Specification<Expression> spec
       return new Specification<Expression>(ee, SubstAttributes(spec.Attributes));
     }
 
-    protected Specification<FrameExpression> SubstSpecFrameExpr(Specification<FrameExpression> frame) {
+    public Specification<FrameExpression> SubstSpecFrameExpr(Specification<FrameExpression> frame) {
       var ee = frame.Expressions == null ? null : frame.Expressions.ConvertAll(SubstFrameExpr);
       return new Specification<FrameExpression>(ee, SubstAttributes(frame.Attributes));
     }
 
     public FrameExpression SubstFrameExpr(FrameExpression frame) {
       Contract.Requires(frame != null);
-      var fe = new FrameExpression(frame.tok, Substitute(frame.E), frame.FieldName);
+      var fe = new FrameExpression(frame.Origin, Substitute(frame.E), frame.FieldName);
       fe.Field = frame.Field;  // resolve here
       return fe;
     }
@@ -953,7 +969,7 @@ protected AssignmentRhs SubstRHS(AssignmentRhs rhs) {
         var r = (ExprRhs)rhs;
         c = new ExprRhs(Substitute(r.Expr));
       } else if (rhs is HavocRhs) {
-        c = new HavocRhs(rhs.Tok);
+        c = new HavocRhs(rhs.Origin);
       } else {
         // since the Substituter is assumed to operate on statements only if they are part of a StatementExpression, then the TypeRhs case cannot occur
         Contract.Assume(false); throw new cce.UnreachableException();
@@ -965,7 +981,7 @@ protected AssignmentRhs SubstRHS(AssignmentRhs rhs) {
     protected MatchCaseStmt SubstMatchCaseStmt(MatchCaseStmt c) {
       Contract.Requires(c != null);
       var newBoundVars = CreateBoundVarSubstitutions(c.Arguments, false);
-      var r = new MatchCaseStmt(c.RangeToken, c.Ctor, c.FromBoundVar, newBoundVars, c.Body.ConvertAll(SubstStmt), c.Attributes);
+      var r = new MatchCaseStmt(c.Origin, c.Ctor, c.FromBoundVar, newBoundVars, c.Body.ConvertAll(SubstStmt), c.Attributes);
       r.Ctor = c.Ctor;
       // undo any changes to substMap (could be optimized to do this only if newBoundVars != e.Vars)
       foreach (var bv in c.Arguments) {
@@ -1009,7 +1025,7 @@ public Attributes SubstAttributes(Attributes attrs) {
         if (newArgs != attrs.Args || prev != attrs.Prev) {
           if (attrs is UserSuppliedAttributes) {
             var usa = (UserSuppliedAttributes)attrs;
-            return new UserSuppliedAttributes(usa.tok, usa.OpenBrace, usa.CloseBrace, newArgs, prev);
+            return new UserSuppliedAttributes(usa.Origin, usa.OpenBrace, usa.CloseBrace, newArgs, prev);
           } else {
             return new Attributes(attrs.Name, newArgs, prev);
           }
@@ -1049,20 +1065,20 @@ protected Expression SubstituteComprehensionExpr(ComprehensionExpr expr, bool fo
       if (newBoundVars != e.BoundVars || newRange != e.Range || newTerm != e.Term || newAttrs != e.Attributes ||
           newBounds != e.Bounds || !forceSubstituteOfBoundVars) {
         if (e is SetComprehension) {
-          newExpr = new SetComprehension(e.BodyStartTok, e.RangeToken, ((SetComprehension)e).Finite, newBoundVars,
+          newExpr = new SetComprehension(e.Origin, ((SetComprehension)e).Finite, newBoundVars,
             newRange, newTerm, newAttrs);
         } else if (e is MapComprehension) {
           var mc = (MapComprehension)e;
           var newTermLeft = mc.IsGeneralMapComprehension ? Substitute(mc.TermLeft) : null;
-          newExpr = new MapComprehension(e.BodyStartTok, e.RangeToken, mc.Finite, newBoundVars, newRange, newTermLeft, newTerm, newAttrs);
+          newExpr = new MapComprehension(e.Origin, mc.Finite, newBoundVars, newRange, newTermLeft, newTerm, newAttrs);
         } else if (expr is ForallExpr forallExpr) {
-          newExpr = new ForallExpr(expr.tok, e.RangeToken, newBoundVars, newRange, newTerm, newAttrs);
+          newExpr = new ForallExpr(e.Origin, newBoundVars, newRange, newTerm, newAttrs);
         } else if (expr is ExistsExpr existsExpr) {
-          newExpr = new ExistsExpr(expr.tok, e.RangeToken, newBoundVars, newRange, newTerm, newAttrs);
+          newExpr = new ExistsExpr(e.Origin, newBoundVars, newRange, newTerm, newAttrs);
         } else if (expr is LambdaExpr) {
           var l = (LambdaExpr)expr;
-          newExpr = new LambdaExpr(e.BodyStartTok, e.RangeToken, newBoundVars, newRange,
-            l.Reads.ConvertAll(SubstFrameExpr), newTerm);
+          newExpr = new LambdaExpr(e.Origin, newBoundVars, newRange,
+            SubstSpecFrameExpr(l.Reads), newTerm);
         } else {
           Contract.Assert(false); // unexpected ComprehensionExpr
         }
diff --git a/Source/DafnyCore/AST/SubstitutingCloner.cs b/Source/DafnyCore/AST/SubstitutingCloner.cs
index d1d7f18abb3..ec687805479 100644
--- a/Source/DafnyCore/AST/SubstitutingCloner.cs
+++ b/Source/DafnyCore/AST/SubstitutingCloner.cs
@@ -3,18 +3,18 @@
 namespace Microsoft.Dafny;
 
 class SubstitutingCloner : Cloner {
-  private readonly Dictionary<IVariable, Expression> substitutions;
+  private readonly Dictionary<IVariable, IVariable> substitutions;
 
-  public SubstitutingCloner(Dictionary<IVariable, Expression> substitutions, bool cloneResolvedFields)
+  public SubstitutingCloner(Dictionary<IVariable, IVariable> substitutions, bool cloneResolvedFields)
     : base(false, cloneResolvedFields) {
     this.substitutions = substitutions;
   }
 
   public override Expression CloneExpr(Expression expr) {
     if (expr is IdentifierExpr identifierExpr) {
-      if (substitutions.TryGetValue(identifierExpr.Var, out var substitution)) {
-        // TODO consider using the code from Substitutor
-        return substitution;
+      if (substitutions.TryGetValue(identifierExpr.Var, out var variableReplacement)) {
+        // TODO consider using the code from Substituter
+        return new IdentifierExpr(expr.Origin, variableReplacement);
       }
     }
 
diff --git a/Source/DafnyCore/AST/System.dfy b/Source/DafnyCore/AST/System.dfy
index 889a5cf519a..4fabc8eb4aa 100644
--- a/Source/DafnyCore/AST/System.dfy
+++ b/Source/DafnyCore/AST/System.dfy
@@ -1,20 +1,26 @@
 
 // Interface with the System namespace
-module {:extern "System"} {:compile false} {:options "-functionSyntax:4"} System {
-  class {:extern "Text.StringBuilder"} {:compile false} CsStringBuilder {
+@Options("-functionSyntax:4")
+@Compile(false)
+module {:extern "System"} System {
+  @Compile(false)
+  class {:extern "Text.StringBuilder"} CsStringBuilder {
     ghost var built: CsString
     constructor {:extern} ()
+    @Axiom
     method {:extern "Append"} Append(s: CsString)
       modifies this
       ensures built == String.Concat(old(built), s)
     // This hack is necessary because ToString is replaced by ToString_
     // in the C# compiler, even if it's declared extern...
+    @Axiom
     method {:extern @"ToString().ToString"} ToString() returns (r: CsString)
       ensures r == built
   }
   type {:extern "String"} CsString(!new,==) {
     ghost predicate {:extern} Contains(needle: CsString)
-    lemma {:axiom} ContainsTransitive(other: CsString, needle: CsString)
+    @Axiom
+    lemma ContainsTransitive(other: CsString, needle: CsString)
       requires Contains(other) && other.Contains(needle)
       ensures Contains(needle)
   }
@@ -28,8 +34,10 @@ module {:extern "System"} {:compile false} {:options "-functionSyntax:4"} System
       s1.ContainsTransitive(s2, s3);
     }
   }
-  class {:extern "String"} {:compile false} String {
-    static function Concat(s1: CsString, s2: CsString): (r: CsString)
+  @Compile(false)
+  class {:extern "String"} String {
+    @Axiom
+    static function {:extern} Concat(s1: CsString, s2: CsString): (r: CsString)
       ensures r.Contains(s1)
       ensures r.Contains(s2)
   }
diff --git a/Source/DafnyCore/AST/SystemModuleManager.cs b/Source/DafnyCore/AST/SystemModuleManager.cs
index f017211705d..2c8c02fa49f 100644
--- a/Source/DafnyCore/AST/SystemModuleManager.cs
+++ b/Source/DafnyCore/AST/SystemModuleManager.cs
@@ -6,14 +6,12 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Security.Policy;
-using Microsoft.Boogie;
 
 namespace Microsoft.Dafny;
 
 public class SystemModuleManager {
   public DafnyOptions Options { get; }
-  public readonly ModuleDefinition SystemModule = new(RangeToken.NoToken, new Name("_System"), new List<IToken>(),
-    false, false, null, null, null, true);
+  public readonly ModuleDefinition SystemModule;
   internal readonly Dictionary<int, ClassDecl> arrayTypeDecls = new();
   public readonly Dictionary<int, ArrowTypeDecl> ArrowTypeDecls = new();
   public readonly Dictionary<int, SubsetTypeDecl> PartialArrowTypeDecls = new();  // same keys as arrowTypeDecl
@@ -22,10 +20,17 @@ public class SystemModuleManager {
 
   internal readonly ValuetypeDecl[] valuetypeDecls;
 
+  /// <summary>
+  /// PreTypeBuiltins is stored here once for the entire program, so that its ToplevelDecl's are unique across the program.
+  /// It is used by the pre-type resolver, and its entries are filled in lazily by the pre-type resolver. There may be overlap
+  /// between the values of PreTypeBuiltins and the values in the dictionaries above.
+  /// </summary>
+  public readonly Dictionary<string, TopLevelDecl> PreTypeBuiltins = new();
+
   public ModuleSignature systemNameInfo;
 
   public int MaxNonGhostTupleSizeUsed { get; private set; }
-  public IToken MaxNonGhostTupleSizeToken { get; private set; }
+  public IOrigin MaxNonGhostTupleSizeToken { get; private set; }
 
   private byte[] hash;
 
@@ -57,7 +62,7 @@ public byte[] MyHash {
             Concat(TotalArrowTypeDecls.Keys.OrderBy(x => x)).
             Concat(tupleInts.OrderBy(x => x));
         var bytes = ints.SelectMany(BitConverter.GetBytes).ToArray();
-        hash = HashAlgorithm.Create("SHA256")!.ComputeHash(bytes);
+        hash = SHA256.Create()!.ComputeHash(bytes);
       }
 
       return hash;
@@ -74,12 +79,20 @@ public UserDefinedType ObjectQ() {
     Contract.Assume(ObjectDecl != null);
     return new UserDefinedType(Token.NoToken, "object?", null) { ResolvedClass = ObjectDecl };
   }
+  /// <summary>
+  /// Return a resolved type for "set<object?>".
+  /// </summary>
+  public Type ObjectSetType() {
+    return new SetType(true, ObjectQ());
+  }
 
   public SystemModuleManager(DafnyOptions options) {
+    SystemModule = new(SourceOrigin.NoToken, new Name("_System"), new List<IOrigin>(),
+      ModuleKindEnum.Concrete, false, null, null, null);
     this.Options = options;
     SystemModule.Height = -1;  // the system module doesn't get a height assigned later, so we set it here to something below everything else
     // create type synonym 'string'
-    var str = new TypeSynonymDecl(RangeToken.NoToken, new Name("string"),
+    var str = new TypeSynonymDecl(SourceOrigin.NoToken, new Name("string"),
       new TypeParameter.TypeParameterCharacteristics(TypeParameter.EqualitySupportValue.InferredRequired, Type.AutoInitInfo.CompilableValue, false),
       new List<TypeParameter>(), SystemModule, new SeqType(new CharType()), null);
     SystemModule.SourceDecls.Add(str);
@@ -87,12 +100,13 @@ public SystemModuleManager(DafnyOptions options) {
     var bvNat = new BoundVar(Token.NoToken, "x", Type.Int);
     var natConstraint = Expression.CreateAtMost(Expression.CreateIntLiteral(Token.NoToken, 0), Expression.CreateIdentExpr(bvNat));
     var ax = AxiomAttribute();
-    NatDecl = new SubsetTypeDecl(RangeToken.NoToken, new Name("nat"),
+    NatDecl = new SubsetTypeDecl(SourceOrigin.NoToken, new Name("nat"),
       new TypeParameter.TypeParameterCharacteristics(TypeParameter.EqualitySupportValue.InferredRequired, Type.AutoInitInfo.CompilableValue, false),
       new List<TypeParameter>(), SystemModule, bvNat, natConstraint, SubsetTypeDecl.WKind.CompiledZero, null, ax);
+    ((RedirectingTypeDecl)NatDecl).ConstraintIsCompilable = true;
     SystemModule.SourceDecls.Add(NatDecl);
     // create trait 'object'
-    ObjectDecl = new TraitDecl(RangeToken.NoToken, new Name("object"), SystemModule, new List<TypeParameter>(), new List<MemberDecl>(), DontCompile(), false, null);
+    ObjectDecl = new TraitDecl(SourceOrigin.NoToken, new Name("object"), SystemModule, new List<TypeParameter>(), new List<MemberDecl>(), DontCompile(), false, null);
     SystemModule.SourceDecls.Add(ObjectDecl);
     // add one-dimensional arrays, since they may arise during type checking
     // Arrays of other dimensions may be added during parsing as the parser detects the need for these
@@ -108,18 +122,34 @@ public SystemModuleManager(DafnyOptions options) {
     CreateArrowTypeDecl(1);
 
     valuetypeDecls = new[] {
-        new ValuetypeDecl("bool", SystemModule, t => t.IsBoolType, typeArgs => Type.Bool),
-        new ValuetypeDecl("int", SystemModule, t => t.IsNumericBased(Type.NumericPersuasion.Int), typeArgs => Type.Int),
-        new ValuetypeDecl("real", SystemModule, t => t.IsNumericBased(Type.NumericPersuasion.Real), typeArgs => Type.Real),
-        new ValuetypeDecl("ORDINAL", SystemModule, t => t.IsBigOrdinalType, typeArgs => Type.BigOrdinal),
-        new ValuetypeDecl("_bv", SystemModule, t => t.IsBitVectorType, null), // "_bv" represents a family of classes, so no typeTester or type creator is supplied
-        new ValuetypeDecl("map", SystemModule,
-          new List<TypeParameter.TPVarianceSyntax>() { TypeParameter.TPVarianceSyntax.Covariant_Strict , TypeParameter.TPVarianceSyntax.Covariant_Strict },
-          t => t.IsMapType, typeArgs => new MapType(true, typeArgs[0], typeArgs[1])),
-        new ValuetypeDecl("imap", SystemModule,
-          new List<TypeParameter.TPVarianceSyntax>() { TypeParameter.TPVarianceSyntax.Covariant_Permissive , TypeParameter.TPVarianceSyntax.Covariant_Strict },
-          t => t.IsIMapType, typeArgs => new MapType(false, typeArgs[0], typeArgs[1]))
-      };
+      new ValuetypeDecl("bool", SystemModule, t => t.IsBoolType, typeArgs => Type.Bool),
+      new ValuetypeDecl("char", SystemModule, t => t.IsCharType, typeArgs => Type.Char),
+      new ValuetypeDecl("int", SystemModule, t => t.IsNumericBased(Type.NumericPersuasion.Int), typeArgs => Type.Int),
+      new ValuetypeDecl("real", SystemModule, t => t.IsNumericBased(Type.NumericPersuasion.Real), typeArgs => Type.Real),
+      new ValuetypeDecl("ORDINAL", SystemModule, t => t.IsBigOrdinalType, typeArgs => Type.BigOrdinal),
+      new ValuetypeDecl("_bv", SystemModule, t => t.IsBitVectorType && !Options.Get(CommonOptionBag.TypeSystemRefresh),
+        null), // "_bv" represents a family of classes, so no typeTester or type creator is supplied (it's used only in the legacy resolver)
+      new ValuetypeDecl("set", SystemModule,
+        new List<TypeParameter.TPVarianceSyntax>() { TypeParameter.TPVarianceSyntax.Covariant_Strict },
+        t => t.AsSetType is { Finite: true }, typeArgs => new SetType(true, typeArgs[0])),
+      new ValuetypeDecl("iset", SystemModule,
+        new List<TypeParameter.TPVarianceSyntax>() { TypeParameter.TPVarianceSyntax.Covariant_Permissive },
+        t => t.IsISetType, typeArgs => new SetType(false, typeArgs[0])),
+      new ValuetypeDecl("seq", SystemModule,
+        new List<TypeParameter.TPVarianceSyntax>() { TypeParameter.TPVarianceSyntax.Covariant_Strict },
+        t => t.AsSeqType != null, typeArgs => new SeqType(typeArgs[0])),
+      new ValuetypeDecl("multiset", SystemModule,
+        new List<TypeParameter.TPVarianceSyntax>() { TypeParameter.TPVarianceSyntax.Covariant_Strict },
+        t => t.AsMultiSetType != null, typeArgs => new MultiSetType(typeArgs[0])),
+      new ValuetypeDecl("map", SystemModule,
+        new List<TypeParameter.TPVarianceSyntax>()
+          { TypeParameter.TPVarianceSyntax.Covariant_Strict, TypeParameter.TPVarianceSyntax.Covariant_Strict },
+        t => t.IsMapType, typeArgs => new MapType(true, typeArgs[0], typeArgs[1])),
+      new ValuetypeDecl("imap", SystemModule,
+        new List<TypeParameter.TPVarianceSyntax>()
+          { TypeParameter.TPVarianceSyntax.Covariant_Permissive, TypeParameter.TPVarianceSyntax.Covariant_Strict },
+        t => t.IsIMapType, typeArgs => new MapType(false, typeArgs[0], typeArgs[1]))
+    };
     SystemModule.SourceDecls.AddRange(valuetypeDecls);
     // Resolution error handling relies on being able to get to the 0-tuple declaration
     TupleType(Token.NoToken, 0, true);
@@ -133,20 +163,20 @@ void AddMember(MemberDecl member, ValuetypeVariety valuetypeVariety) {
       enclosingType.Members.Add(member);
     }
 
-    var floor = new SpecialField(RangeToken.NoToken, "Floor", SpecialField.ID.Floor, null, false, false, false, Type.Int, null);
+    var floor = new SpecialField(SourceOrigin.NoToken, "Floor", SpecialField.ID.Floor, null, false, false, false, Type.Int, null);
     AddMember(floor, ValuetypeVariety.Real);
 
-    var isLimit = new SpecialField(RangeToken.NoToken, "IsLimit", SpecialField.ID.IsLimit, null, false, false, false, Type.Bool, null);
+    var isLimit = new SpecialField(SourceOrigin.NoToken, "IsLimit", SpecialField.ID.IsLimit, null, false, false, false, Type.Bool, null);
     AddMember(isLimit, ValuetypeVariety.BigOrdinal);
 
-    var isSucc = new SpecialField(RangeToken.NoToken, "IsSucc", SpecialField.ID.IsSucc, null, false, false, false, Type.Bool, null);
+    var isSucc = new SpecialField(SourceOrigin.NoToken, "IsSucc", SpecialField.ID.IsSucc, null, false, false, false, Type.Bool, null);
     AddMember(isSucc, ValuetypeVariety.BigOrdinal);
 
-    var limitOffset = new SpecialField(RangeToken.NoToken, "Offset", SpecialField.ID.Offset, null, false, false, false, Type.Int, null);
+    var limitOffset = new SpecialField(SourceOrigin.NoToken, "Offset", SpecialField.ID.Offset, null, false, false, false, Type.Int, null);
     AddMember(limitOffset, ValuetypeVariety.BigOrdinal);
     ORDINAL_Offset = limitOffset;
 
-    var isNat = new SpecialField(RangeToken.NoToken, "IsNat", SpecialField.ID.IsNat, null, false, false, false, Type.Bool, null);
+    var isNat = new SpecialField(SourceOrigin.NoToken, "IsNat", SpecialField.ID.IsNat, null, false, false, false, Type.Bool, null);
     AddMember(isNat, ValuetypeVariety.BigOrdinal);
 
     // Add "Keys", "Values", and "Items" to map, imap
@@ -155,16 +185,16 @@ void AddMember(MemberDecl member, ValuetypeVariety valuetypeVariety) {
       var isFinite = typeVariety == ValuetypeVariety.Map;
 
       var r = new SetType(isFinite, new UserDefinedType(vtd.TypeArgs[0]));
-      var keys = new SpecialField(RangeToken.NoToken, "Keys", SpecialField.ID.Keys, null, false, false, false, r, null);
+      var keys = new SpecialField(SourceOrigin.NoToken, "Keys", SpecialField.ID.Keys, null, false, false, false, r, null);
 
       r = new SetType(isFinite, new UserDefinedType(vtd.TypeArgs[1]));
-      var values = new SpecialField(RangeToken.NoToken, "Values", SpecialField.ID.Values, null, false, false, false, r, null);
+      var values = new SpecialField(SourceOrigin.NoToken, "Values", SpecialField.ID.Values, null, false, false, false, r, null);
 
       var gt = vtd.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
       var dt = TupleType(Token.NoToken, 2, true);
       var tupleType = new UserDefinedType(Token.NoToken, dt.Name, dt, gt);
       r = new SetType(isFinite, tupleType);
-      var items = new SpecialField(RangeToken.NoToken, "Items", SpecialField.ID.Items, null, false, false, false, r, null);
+      var items = new SpecialField(SourceOrigin.NoToken, "Items", SpecialField.ID.Items, null, false, false, false, r, null);
 
       foreach (var memb in new[] { keys, values, items }) {
         AddMember(memb, typeVariety);
@@ -178,10 +208,10 @@ void AddMember(MemberDecl member, ValuetypeVariety valuetypeVariety) {
   }
 
   public void AddRotateMember(ValuetypeDecl enclosingType, string name, Type resultType) {
-    var formals = new List<Formal> { new Formal(Token.NoToken, "w", Type.Nat(), true, false, null, false) };
-    var rotateMember = new SpecialFunction(RangeToken.NoToken, name, SystemModule, false, false,
+    var formals = new List<Formal> { new Formal(Token.NoToken, "w", Type.Nat(), true, false, null) };
+    var rotateMember = new SpecialFunction(SourceOrigin.NoToken, name, SystemModule, false, false,
       new List<TypeParameter>(), formals, resultType,
-      new List<AttributedExpression>(), new List<FrameExpression>(), new List<AttributedExpression>(),
+      new List<AttributedExpression>(), new Specification<FrameExpression>(new List<FrameExpression>(), null), new List<AttributedExpression>(),
       new Specification<Expression>(new List<Expression>(), null), null, null, null);
     rotateMember.EnclosingClass = enclosingType;
     rotateMember.AddVisibilityScope(SystemModule.VisibilityScope, false);
@@ -193,8 +223,8 @@ private Attributes DontCompile() {
     return new Attributes("compile", new List<Expression>() { flse }, null);
   }
 
-  public static Attributes AxiomAttribute() {
-    return new Attributes("axiom", new List<Expression>(), null);
+  public static Attributes AxiomAttribute(Attributes prev = null) {
+    return new Attributes("axiom", new List<Expression>(), prev);
   }
 
   /// <summary>
@@ -208,7 +238,7 @@ public UserDefinedType ArrayType(int dims, Type arg, bool allowCreationOfNewClas
     return result;
   }
 
-  public static (UserDefinedType type, Action<SystemModuleManager> ModifyBuiltins) ArrayType(IToken tok, int dims, List<Type> optTypeArgs, bool allowCreationOfNewClass, bool useClassNameType = false) {
+  public static (UserDefinedType type, Action<SystemModuleManager> ModifyBuiltins) ArrayType(IOrigin tok, int dims, List<Type> optTypeArgs, bool allowCreationOfNewClass, bool useClassNameType = false) {
     Contract.Requires(tok != null);
     Contract.Requires(1 <= dims);
     Contract.Requires(optTypeArgs == null || optTypeArgs.Count > 0);  // ideally, it is 1, but more will generate an error later, and null means it will be filled in automatically
@@ -227,7 +257,7 @@ void ModifyBuiltins(SystemModuleManager builtIns) {
       ArrayClassDecl arrayClass = new ArrayClassDecl(dims, builtIns.SystemModule, builtIns.DontCompile());
       for (int d = 0; d < dims; d++) {
         string name = dims == 1 ? "Length" : "Length" + d;
-        Field len = new SpecialField(RangeToken.NoToken, name, SpecialField.ID.ArrayLength, dims == 1 ? null : (object)d, false, false, false, Type.Int, null);
+        Field len = new SpecialField(SourceOrigin.NoToken, name, SpecialField.ID.ArrayLength, dims == 1 ? null : (object)d, false, false, false, Type.Int, null);
         len.EnclosingClass = arrayClass; // resolve here
         arrayClass.Members.Add(len);
       }
@@ -261,24 +291,24 @@ public void CreateArrowTypeDecl(int arity) {
       return;
     }
 
-    IToken tok = Token.NoToken;
+    IOrigin tok = Token.NoToken;
     var tps = Util.Map(Enumerable.Range(0, arity + 1),
       x => x < arity
-        ? new TypeParameter(RangeToken.NoToken, new Name("T" + x), TypeParameter.TPVarianceSyntax.Contravariance)
-        : new TypeParameter(RangeToken.NoToken, new Name("R"), TypeParameter.TPVarianceSyntax.Covariant_Strict));
+        ? new TypeParameter(SourceOrigin.NoToken, new Name("T" + x), TypeParameter.TPVarianceSyntax.Contravariance)
+        : new TypeParameter(SourceOrigin.NoToken, new Name("R"), TypeParameter.TPVarianceSyntax.Covariant_Strict));
     var tys = tps.ConvertAll(tp => (Type)(new UserDefinedType(tp)));
 
     Function CreateMember(string name, Type resultType, Function readsFunction = null) {
       var args = Util.Map(Enumerable.Range(0, arity), i => new Formal(tok, "x" + i, tys[i], true, false, null));
       var argExprs = args.ConvertAll(a =>
         (Expression)new IdentifierExpr(tok, a.Name) { Var = a, Type = a.Type });
-      var readsIS = new FunctionCallExpr(tok, "reads", new ImplicitThisExpr(tok), tok, tok, argExprs) {
-        Type = new SetType(true, ObjectQ()),
+      var readsIS = new FunctionCallExpr(tok, new Name("reads"), new ImplicitThisExpr(tok), tok, Token.NoToken, argExprs) {
+        Type = ObjectSetType(),
       };
       var readsFrame = new List<FrameExpression> { new FrameExpression(tok, readsIS, null) };
-      var function = new Function(RangeToken.NoToken, new Name(name), false, true, false,
+      var function = new Function(SourceOrigin.NoToken, new Name(name), false, true, false,
         new List<TypeParameter>(), args, null, resultType,
-        new List<AttributedExpression>(), readsFrame, new List<AttributedExpression>(),
+        new List<AttributedExpression>(), new Specification<FrameExpression>(readsFrame, null), new List<AttributedExpression>(),
         new Specification<Expression>(new List<Expression>(), null),
         null, null, null, null, null);
       readsIS.Function = readsFunction ?? function; // just so we can really claim the member declarations are resolved
@@ -287,7 +317,7 @@ Function CreateMember(string name, Type resultType, Function readsFunction = nul
       return function;
     }
 
-    var reads = CreateMember("reads", new SetType(true, ObjectQ()), null);
+    var reads = CreateMember("reads", ObjectSetType(), null);
     var req = CreateMember("requires", Type.Bool, reads);
 
     var arrowDecl = new ArrowTypeDecl(tps, req, reads, SystemModule, DontCompile());
@@ -297,13 +327,14 @@ Function CreateMember(string name, Type resultType, Function readsFunction = nul
     // declaration of read-effect-free arrow-type, aka heap-independent arrow-type, aka partial-function arrow-type
     tps = Util.Map(Enumerable.Range(0, arity + 1),
       x => x < arity
-        ? new TypeParameter(RangeToken.NoToken, new Name("T" + x), TypeParameter.TPVarianceSyntax.Contravariance)
-        : new TypeParameter(RangeToken.NoToken, new Name("R"), TypeParameter.TPVarianceSyntax.Covariant_Strict));
+        ? new TypeParameter(SourceOrigin.NoToken, new Name("T" + x), TypeParameter.TPVarianceSyntax.Contravariance)
+        : new TypeParameter(SourceOrigin.NoToken, new Name("R"), TypeParameter.TPVarianceSyntax.Covariant_Strict));
     tys = tps.ConvertAll(tp => (Type)(new UserDefinedType(tp)));
     var id = new BoundVar(tok, "f", new ArrowType(tok, arrowDecl, tys));
-    var partialArrow = new SubsetTypeDecl(RangeToken.NoToken, new Name(ArrowType.PartialArrowTypeName(arity)),
+    var partialArrow = new SubsetTypeDecl(SourceOrigin.NoToken, new Name(ArrowType.PartialArrowTypeName(arity)),
       new TypeParameter.TypeParameterCharacteristics(false), tps, SystemModule,
-      id, ArrowSubtypeConstraint(tok, tok.ToRange(), id, reads, tps, false), SubsetTypeDecl.WKind.Special, null, DontCompile());
+      id, ArrowSubtypeConstraint(tok, id, reads, tps, false), SubsetTypeDecl.WKind.Special, null, DontCompile());
+    ((RedirectingTypeDecl)partialArrow).ConstraintIsCompilable = false;
     PartialArrowTypeDecls.Add(arity, partialArrow);
     SystemModule.SourceDecls.Add(partialArrow);
 
@@ -311,13 +342,14 @@ Function CreateMember(string name, Type resultType, Function readsFunction = nul
 
     tps = Util.Map(Enumerable.Range(0, arity + 1),
       x => x < arity
-        ? new TypeParameter(RangeToken.NoToken, new Name("T" + x), TypeParameter.TPVarianceSyntax.Contravariance)
-        : new TypeParameter(RangeToken.NoToken, new Name("R"), TypeParameter.TPVarianceSyntax.Covariant_Strict));
+        ? new TypeParameter(SourceOrigin.NoToken, new Name("T" + x), TypeParameter.TPVarianceSyntax.Contravariance)
+        : new TypeParameter(SourceOrigin.NoToken, new Name("R"), TypeParameter.TPVarianceSyntax.Covariant_Strict));
     tys = tps.ConvertAll(tp => (Type)(new UserDefinedType(tp)));
     id = new BoundVar(tok, "f", new UserDefinedType(tok, partialArrow.Name, partialArrow, tys));
-    var totalArrow = new SubsetTypeDecl(RangeToken.NoToken, new Name(ArrowType.TotalArrowTypeName(arity)),
+    var totalArrow = new SubsetTypeDecl(SourceOrigin.NoToken, new Name(ArrowType.TotalArrowTypeName(arity)),
       new TypeParameter.TypeParameterCharacteristics(false), tps, SystemModule,
-      id, ArrowSubtypeConstraint(tok, tok.ToRange(), id, req, tps, true), SubsetTypeDecl.WKind.Special, null, DontCompile());
+      id, ArrowSubtypeConstraint(tok, id, req, tps, true), SubsetTypeDecl.WKind.Special, null, DontCompile());
+    ((RedirectingTypeDecl)totalArrow).ConstraintIsCompilable = false;
     TotalArrowTypeDecls.Add(arity, totalArrow);
     SystemModule.SourceDecls.Add(totalArrow);
   }
@@ -328,7 +360,7 @@ Function CreateMember(string name, Type resultType, Function readsFunction = nul
   /// the built-in total-arrow type (if "total", in which case "member" is expected to denote the "requires" member).
   /// The given "id" is expected to be already resolved.
   /// </summary>
-  private Expression ArrowSubtypeConstraint(IToken tok, RangeToken rangeToken, BoundVar id, Function member, List<TypeParameter> tps, bool total) {
+  private Expression ArrowSubtypeConstraint(IOrigin tok, BoundVar id, Function member, List<TypeParameter> tps, bool total) {
     Contract.Requires(tok != null);
     Contract.Requires(id != null);
     Contract.Requires(member != null);
@@ -339,20 +371,14 @@ private Expression ArrowSubtypeConstraint(IToken tok, RangeToken rangeToken, Bou
     // forall x0,x1,x2 :: f.requires(x0,x1,x2)
     var bvs = new List<BoundVar>();
     var args = new List<Expression>();
-    var bounds = new List<ComprehensionExpr.BoundedPool>();
+    var bounds = new List<BoundedPool>();
     for (int i = 0; i < tps.Count - 1; i++) {
       var bv = new BoundVar(tok, "x" + i, new UserDefinedType(tps[i]));
       bvs.Add(bv);
       args.Add(new IdentifierExpr(tok, bv));
-      bounds.Add(new ComprehensionExpr.SpecialAllocIndependenceAllocatedBoundedPool());
+      bounds.Add(new SpecialAllocIndependenceAllocatedBoundedPool());
     }
-    var fn = new MemberSelectExpr(tok, f, member.Name) {
-      Member = member,
-      TypeApplication_AtEnclosingClass = f.Type.TypeArgs,
-      TypeApplication_JustMember = new List<Type>(),
-      Type = GetTypeOfFunction(member, tps.ConvertAll(tp => (Type)new UserDefinedType(tp)), new List<Type>())
-    };
-    Expression body = new ApplyExpr(tok, fn, args, tok);
+    Expression body = Expression.CreateResolvedCall(tok, f, member, args, new List<Type>(), this);
     body.Type = member.ResultType;  // resolve here
     if (!total) {
       Expression emptySet = new SetDisplayExpr(tok, true, new List<Expression>());
@@ -360,7 +386,7 @@ private Expression ArrowSubtypeConstraint(IToken tok, RangeToken rangeToken, Bou
       body = Expression.CreateEq(body, emptySet, member.ResultType);
     }
     if (tps.Count > 1) {
-      body = new ForallExpr(tok, rangeToken, bvs, null, body, null) { Type = Type.Bool, Bounds = bounds };
+      body = new ForallExpr(tok, bvs, null, body, null) { Type = Type.Bool, Bounds = bounds };
     }
     return body;
   }
@@ -373,15 +399,15 @@ Type GetTypeOfFunction(Function f, List<Type> typeArgumentsClass, List<Type> typ
     Contract.Requires(typeArgumentsClass.Count == f.EnclosingClass.TypeArgs.Count);
     Contract.Requires(typeArgumentsMember.Count == f.TypeArgs.Count);
 
-    var atd = ArrowTypeDecls[f.Formals.Count];
+    var atd = ArrowTypeDecls[f.Ins.Count];
 
     var formals = Util.Concat(f.EnclosingClass.TypeArgs, f.TypeArgs);
     var actuals = Util.Concat(typeArgumentsClass, typeArgumentsMember);
     var typeMap = TypeParameter.SubstitutionMap(formals, actuals);
-    return new ArrowType(f.tok, atd, f.Formals.ConvertAll(arg => arg.Type.Subst(typeMap)), f.ResultType.Subst(typeMap));
+    return new ArrowType(f.Origin, atd, f.Ins.ConvertAll(arg => arg.Type.Subst(typeMap)), f.ResultType.Subst(typeMap));
   }
 
-  public TupleTypeDecl TupleType(IToken tok, int dims, bool allowCreationOfNewType, List<bool> argumentGhostness = null) {
+  public TupleTypeDecl TupleType(IOrigin tok, int dims, bool allowCreationOfNewType, List<bool> argumentGhostness = null) {
     Contract.Requires(tok != null);
     Contract.Requires(0 <= dims);
     Contract.Requires(argumentGhostness == null || argumentGhostness.Count == dims);
@@ -403,7 +429,7 @@ public TupleTypeDecl TupleType(IToken tok, int dims, bool allowCreationOfNewType
         nonGhostTupleTypeDecl = TupleType(tok, nonGhostDims, allowCreationOfNewType);
       }
 
-      tt = new TupleTypeDecl(argumentGhostness, SystemModule, nonGhostTupleTypeDecl, DontCompile());
+      tt = new TupleTypeDecl(argumentGhostness, SystemModule, nonGhostTupleTypeDecl, null);
       if (tt.NonGhostDims > MaxNonGhostTupleSizeUsed) {
         MaxNonGhostTupleSizeToken = tok;
         MaxNonGhostTupleSizeUsed = tt.NonGhostDims;
@@ -464,7 +490,7 @@ public ValuetypeDecl AsValuetypeDecl(Type t) {
   }
 
   public void ResolveValueTypeDecls(ProgramResolver programResolver) {
-    var moduleResolver = new ModuleResolver(programResolver);
+    var moduleResolver = new ModuleResolver(programResolver, programResolver.Options);
     moduleResolver.moduleInfo = systemNameInfo;
     foreach (var valueTypeDecl in valuetypeDecls) {
       foreach (var member in valueTypeDecl.Members) {
@@ -478,14 +504,52 @@ public void ResolveValueTypeDecls(ProgramResolver programResolver) {
       }
     }
   }
+
+  public void CheckHasAllTupleNonGhostDimsUpTo(int max) {
+    var allNeededDims = Enumerable.Range(0, max + 1).ToHashSet();
+    var allDeclaredDims = tupleTypeDecls.Keys
+        .Select(argumentGhostness => argumentGhostness.Count(ghost => !ghost))
+        .Distinct()
+        .ToHashSet();
+    if (!allDeclaredDims.SetEquals(allNeededDims)) {
+      throw new ArgumentException(@$"Not all tuple types declared between 0 and {max}!
+needed: {allNeededDims.Comma()}
+declared: {allDeclaredDims.Comma()}");
+    }
+  }
+
+  public void CheckHasAllArrayDimsUpTo(int max) {
+    var allNeededDims = Enumerable.Range(1, max).ToHashSet();
+    var allDeclaredDims = arrayTypeDecls.Keys.ToHashSet();
+    if (!allDeclaredDims.SetEquals(allNeededDims)) {
+      throw new ArgumentException(@$"Not all array types declared between 1 and {max}!
+needed: {allNeededDims.Comma()}
+declared: {allDeclaredDims.Comma()}");
+    }
+  }
+
+  public void CheckHasAllArrowAritiesUpTo(int max) {
+    var allNeededArities = Enumerable.Range(0, max + 1).ToHashSet();
+    var allDeclaredArities = ArrowTypeDecls.Keys.ToHashSet();
+    if (!allDeclaredArities.SetEquals(allNeededArities)) {
+      throw new ArgumentException(@$"Not all arrow types declared between 0 and {max}
+needed: {allNeededArities.Comma()}
+declared: {allDeclaredArities.Comma()}");
+    }
+  }
 }
 
 enum ValuetypeVariety {
   Bool = 0,
+  Char,
   Int,
   Real,
   BigOrdinal,
   Bitvector,
+  Set,
+  ISet,
+  Seq,
+  Multiset,
   Map,
   IMap,
   None
diff --git a/Source/DafnyCore/AST/Tokens.cs b/Source/DafnyCore/AST/Tokens.cs
index 7797e6bbfe6..2b3173b2c8b 100644
--- a/Source/DafnyCore/AST/Tokens.cs
+++ b/Source/DafnyCore/AST/Tokens.cs
@@ -1,67 +1,20 @@
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.IO;
-using System.Text;
 
 namespace Microsoft.Dafny;
 
-public interface IToken : Microsoft.Boogie.IToken, IComparable<IToken> {
-  public RangeToken To(IToken end) => new RangeToken(this, end);
-
-  /*
-  int kind { get; set; }
-  int pos { get; set; }
-  int col { get; set; }
-  int line { get; set; }
-  string val { get; set; }
-  bool IsValid { get; }*/
-  string Boogie.IToken.filename {
-    get => Uri == null ? null : Path.GetFileName(Uri.LocalPath);
-    set => throw new NotSupportedException();
-  }
-
-  public string ActualFilename => Uri.LocalPath;
-  string Filepath => Uri.LocalPath;
-
-  Uri Uri { get; set; }
-
-  /// <summary>
-  /// TrailingTrivia contains everything after the token,
-  /// until and including two newlines between which there is no commment
-  /// All the remaining trivia is for the LeadingTrivia of the next token
-  ///
-  /// ```
-  /// const /*for const*/ x /*for x*/ := /* for := */ 1/* for 1 */
-  /// // for 1 again
-  /// // for 1 again
-  ///
-  /// // Two newlines, now all the trivia is for var y
-  /// // this line as well.
-  /// var y := 2
-  /// ```
-  /// </summary>
-  string TrailingTrivia { get; set; }
-  string LeadingTrivia { get; set; }
-  IToken Next { get; set; } // The next token
-  IToken Prev { get; set; } // The previous token
-
-  public IToken WithVal(string val);  // create a new token by setting the given val.
-}
-
 /// <summary>
 /// Has one-indexed line and column fields
 /// </summary>
-public class Token : IToken {
-
-  public Token peekedTokens; // Used only internally by Coco when the scanner "peeks" tokens. Normallly null at the end of parsing
-  public static readonly Token NoToken = new Token();
+public class Token : IOrigin {
 
-  static Token() {
-    NoToken.Next = NoToken;
-    NoToken.Prev = NoToken;
-  }
+  public Token peekedTokens; // Used only internally by Coco when the scanner "peeks" tokens. Normally null at the end of parsing
+  public static readonly Token NoToken = new();
+  public static readonly Token Cli = new(1, 1);
+  public static readonly Token Ide = new(1, 1);
+  public string filename => Path.GetFileName(Filepath);
 
   public Token() : this(0, 0) { }
 
@@ -71,11 +24,22 @@ public Token(int linenum, int colnum) {
     this.val = "";
   }
 
+  public bool IsSourceToken => this != NoToken;
   public int kind { get; set; } // Used by coco, so we can't rename it to Kind
 
+  public bool IsInherited(ModuleDefinition m) {
+    return false;
+  }
+
+  public bool InclusiveEnd => true;
+  public bool IncludesRange => false;
   public string ActualFilename => Filepath;
   public string Filepath => Uri?.LocalPath;
   public Uri Uri { get; set; }
+  public Token StartToken => this;
+  public Token EndToken => this;
+
+  public Token Center => this;
 
   public int pos { get; set; } // Used by coco, so we can't rename it to Pos
 
@@ -95,13 +59,15 @@ public Token(int linenum, int colnum) {
 
   public string TrailingTrivia { get; set; } = "";
 
-  public IToken Next { get; set; } // The next token
+  public Token Next { get; set; } // The next token
 
-  public IToken Prev { get; set; } // The previous token
+  public Token Prev { get; set; } // The previous token
 
   public bool IsValid => this.ActualFilename != null;
 
-  public IToken WithVal(string newVal) {
+  public SourceOrigin To(Token end) => new(this, end);
+
+  public IOrigin WithVal(string newVal) {
     return new Token {
       pos = pos,
       col = col,
@@ -114,6 +80,15 @@ public IToken WithVal(string newVal) {
     };
   }
 
+  public bool IsCopy => false;
+
+  public int CompareTo(Boogie.IToken other) {
+    if (line != other.line) {
+      return line.CompareTo(other.line);
+    }
+    return col.CompareTo(other.col);
+  }
+
   public override int GetHashCode() {
     return pos;
   }
@@ -122,7 +97,7 @@ public override string ToString() {
     return $"'{val}': {Path.GetFileName(Filepath)}@{pos} - @{line}:{col}";
   }
 
-  public int CompareTo(IToken other) {
+  public int CompareTo(IOrigin other) {
     if (line != other.line) {
       return line.CompareTo(other.line);
     }
@@ -130,83 +105,58 @@ public int CompareTo(IToken other) {
   }
 }
 
-public abstract class TokenWrapper : IToken {
+public static class TokenExtensions {
 
-  public readonly IToken WrappedToken;
-  protected TokenWrapper(IToken wrappedToken) {
-    Contract.Requires(wrappedToken != null);
-    WrappedToken = wrappedToken;
-  }
 
-  public abstract IToken WithVal(string newVal);
+  public static DafnyRange ToDafnyRange(this IOrigin origin, bool includeTrailingWhitespace = false) {
+    var startLine = origin.StartToken.line - 1;
+    var startColumn = origin.StartToken.col - 1;
+    var endLine = origin.EndToken.line - 1;
+    int whitespaceOffset = 0;
+    if (includeTrailingWhitespace) {
+      string trivia = origin.EndToken.TrailingTrivia;
+      // Don't want to remove newlines or comments -- just spaces and tabs
+      while (whitespaceOffset < trivia.Length && (trivia[whitespaceOffset] == ' ' || trivia[whitespaceOffset] == '\t')) {
+        whitespaceOffset++;
+      }
+    }
 
-  public virtual int col {
-    get { return WrappedToken.col; }
-    set { WrappedToken.col = value; }
+    var endColumn = origin.EndToken.col + (origin.InclusiveEnd ? origin.EndToken.val.Length : 0) + whitespaceOffset - 1;
+    return new DafnyRange(
+      new DafnyPosition(startLine, startColumn),
+      new DafnyPosition(endLine, endColumn));
   }
 
-  public string ActualFilename => WrappedToken.ActualFilename;
-
-  public virtual string Filepath => WrappedToken.Filepath;
-
-  public Uri Uri {
-    get => WrappedToken.Uri;
-    set => WrappedToken.Uri = value;
+  public static IOrigin MakeAutoGenerated(this IOrigin origin) {
+    return new AutoGeneratedOrigin(origin);
   }
 
-  public bool IsValid {
-    get { return WrappedToken.IsValid; }
-  }
-  public int kind {
-    get { return WrappedToken.kind; }
-    set { WrappedToken.kind = value; }
-  }
-  public virtual int line {
-    get { return WrappedToken.line; }
-    set { WrappedToken.line = value; }
-  }
-  public virtual int pos {
-    get { return WrappedToken.pos; }
-    set { WrappedToken.pos = value; }
+  public static IOrigin MakeRefined(this IOrigin origin, ModuleDefinition module) {
+    return new RefinementOrigin(origin, module);
   }
 
-  public virtual string val {
-    get { return WrappedToken.val; }
-    set { WrappedToken.val = value; }
-  }
-  public virtual string LeadingTrivia {
-    get { return WrappedToken.LeadingTrivia; }
-    set { throw new NotSupportedException(); }
-  }
-  public virtual string TrailingTrivia {
-    get { return WrappedToken.TrailingTrivia; }
-    set { throw new NotSupportedException(); }
-  }
-  public virtual IToken Next {
-    get { return WrappedToken.Next; }
-    set { throw new NotSupportedException(); }
+  public static bool Contains(this IOrigin container, IOrigin otherToken) {
+    return container.StartToken.Uri == otherToken.Uri &&
+           container.StartToken.pos <= otherToken.pos &&
+           (container.EndToken == null || otherToken.pos <= container.EndToken.pos);
   }
-  public virtual IToken Prev {
-    get { return WrappedToken.Prev; }
-    set { throw new NotSupportedException(); }
+
+  public static bool Intersects(this IOrigin origin, IOrigin other) {
+    return !(other.EndToken.pos + other.EndToken.val.Length <= origin.StartToken.pos
+             || origin.EndToken.pos + origin.EndToken.val.Length <= other.StartToken.pos);
   }
 
-  public int CompareTo(IToken other) {
-    return WrappedToken.CompareTo(other);
+  public static string PrintOriginal(this IOrigin origin) {
+    return new SourceOrigin(origin.StartToken, origin.EndToken).PrintOriginal();
   }
-}
 
-public static class TokenExtensions {
+  public static bool IsSet(this IOrigin token) => token.Uri != null;
 
-  public static string TokenToString(this Boogie.IToken tok, DafnyOptions options) {
-    if (tok is IToken dafnyToken) {
-      return dafnyToken.TokenToString(options);
+  public static string TokenToString(this IOrigin tok, DafnyOptions options) {
+    if (ReferenceEquals(tok, Token.Cli)) {
+      return "CLI";
     }
 
-    return $"{tok.filename}({tok.line},{tok.col - 1})";
-  }
-
-  public static string TokenToString(this IToken tok, DafnyOptions options) {
     if (tok.Uri == null) {
       return $"({tok.line},{tok.col - 1})";
     }
@@ -222,131 +172,21 @@ public static string TokenToString(this IToken tok, DafnyOptions options) {
 
     return $"{filename}({tok.line},{tok.col - 1})";
   }
-
-  public static RangeToken ToRange(this IToken token) {
-    if (token is BoogieRangeToken boogieRangeToken) {
-      return new RangeToken(boogieRangeToken.StartToken, boogieRangeToken.EndToken);
-    }
-    return token as RangeToken ?? new RangeToken(token, token);
-  }
-}
-
-public class RangeToken : TokenWrapper {
-  public IToken StartToken => WrappedToken;
-
-  public IToken EndToken => endToken ?? StartToken;
-
-  public bool InclusiveEnd => endToken != null;
-
-  public DafnyRange ToDafnyRange(bool includeTrailingWhitespace = false) {
-    var startLine = StartToken.line - 1;
-    var startColumn = StartToken.col - 1;
-    var endLine = EndToken.line - 1;
-    int whitespaceOffset = 0;
-    if (includeTrailingWhitespace) {
-      string trivia = EndToken.TrailingTrivia;
-      // Don't want to remove newlines or comments -- just spaces and tabs
-      while (whitespaceOffset < trivia.Length && (trivia[whitespaceOffset] == ' ' || trivia[whitespaceOffset] == '\t')) {
-        whitespaceOffset++;
-      }
-    }
-
-    var endColumn = EndToken.col + (InclusiveEnd ? EndToken.val.Length : 0) + whitespaceOffset - 1;
-    return new DafnyRange(
-      new DafnyPosition(startLine, startColumn),
-      new DafnyPosition(endLine, endColumn));
-  }
-
-  public RangeToken(IToken startToken, IToken endToken) : base(startToken) {
-    this.endToken = endToken;
-  }
-
-  public string PrintOriginal() {
-    var token = StartToken;
-    var originalString = new StringBuilder();
-    originalString.Append(token.val);
-    while (token.Next != null && token.pos < EndToken.pos) {
-      originalString.Append(token.TrailingTrivia);
-      token = token.Next;
-      originalString.Append(token.LeadingTrivia);
-      originalString.Append(token.val);
-    }
-
-    return originalString.ToString();
-  }
-
-  public int Length() {
-    return EndToken.pos - StartToken.pos;
-  }
-
-  public RangeToken MakeAutoGenerated() {
-    return new RangeToken(new AutoGeneratedToken(StartToken), EndToken);
-  }
-
-  public RangeToken MakeRefined(ModuleDefinition module) {
-    return new RangeToken(new RefinementToken(StartToken, module), EndToken);
-  }
-
-  // TODO rename to Generated, and Token.NoToken to Token.Generated, and remove AutoGeneratedToken.
-  public static RangeToken NoToken = new(Token.NoToken, Token.NoToken);
-  private readonly IToken endToken;
-
-  public override IToken WithVal(string newVal) {
-    throw new NotImplementedException();
-  }
-
-  public BoogieRangeToken ToToken() {
-    return new BoogieRangeToken(StartToken, EndToken, null);
-  }
-
-  public bool Contains(int position) {
-    return StartToken.pos <= position && (EndToken == null || position <= EndToken.pos);
-  }
-
-  public bool Intersects(RangeToken other) {
-    return !(other.EndToken.pos + other.EndToken.val.Length <= StartToken.pos
-             || EndToken.pos + EndToken.val.Length <= other.StartToken.pos);
-  }
-}
-
-public class BoogieRangeToken : TokenWrapper {
-  // The wrapped token is the startTok
-  public IToken StartToken { get; }
-  public IToken EndToken { get; }
-  public IToken NameToken { get; }
-
-  // Used for range reporting
-  public override string val => new(' ', Math.Max(EndToken.pos + EndToken.val.Length - pos, 1));
-
-  public BoogieRangeToken(IToken startTok, IToken endTok, IToken nameToken) : base(
-    nameToken ?? startTok) {
-    StartToken = startTok;
-    EndToken = endTok;
-    NameToken = nameToken;
-  }
-
-  public override IToken WithVal(string newVal) {
-    return this;
-  }
-
-  public string PrintOriginal() {
-    return new RangeToken(StartToken, EndToken).PrintOriginal();
-  }
 }
 
-public class NestedToken : TokenWrapper {
-  public NestedToken(IToken outer, IToken inner, string message = null)
+public class NestedOrigin : OriginWrapper {
+  public NestedOrigin(IOrigin outer, IOrigin inner, string message = null)
     : base(outer) {
     Contract.Requires(outer != null);
     Contract.Requires(inner != null);
     Inner = inner;
     this.Message = message;
   }
-  public IToken Outer { get { return WrappedToken; } }
-  public readonly IToken Inner;
+  public IOrigin Outer { get { return WrappedToken; } }
+  public readonly IOrigin Inner;
   public readonly string Message;
 
-  public override IToken WithVal(string newVal) {
+  public override IOrigin WithVal(string newVal) {
     return this;
   }
 }
@@ -355,8 +195,8 @@ public override IToken WithVal(string newVal) {
 /// A token wrapper used to produce better type checking errors
 /// for quantified variables. See QuantifierVar.ExtractSingleRange()
 /// </summary>
-public class QuantifiedVariableDomainToken : TokenWrapper {
-  public QuantifiedVariableDomainToken(IToken wrappedToken)
+public class QuantifiedVariableDomainOrigin : OriginWrapper {
+  public QuantifiedVariableDomainOrigin(IOrigin wrappedToken)
     : base(wrappedToken) {
     Contract.Requires(wrappedToken != null);
   }
@@ -366,8 +206,8 @@ public override string val {
     set { WrappedToken.val = value; }
   }
 
-  public override IToken WithVal(string newVal) {
-    return new QuantifiedVariableDomainToken((WrappedToken.WithVal(newVal)));
+  public override IOrigin WithVal(string newVal) {
+    return new QuantifiedVariableDomainOrigin((WrappedToken.WithVal(newVal)));
   }
 }
 
@@ -375,8 +215,8 @@ public override IToken WithVal(string newVal) {
 /// A token wrapper used to produce better type checking errors
 /// for quantified variables. See QuantifierVar.ExtractSingleRange()
 /// </summary>
-public class QuantifiedVariableRangeToken : TokenWrapper {
-  public QuantifiedVariableRangeToken(IToken wrappedToken)
+public class QuantifiedVariableRangeOrigin : OriginWrapper {
+  public QuantifiedVariableRangeOrigin(IOrigin wrappedToken)
     : base(wrappedToken) {
     Contract.Requires(wrappedToken != null);
   }
@@ -386,7 +226,7 @@ public override string val {
     set { WrappedToken.val = value; }
   }
 
-  public override IToken WithVal(string newVal) {
-    return new QuantifiedVariableRangeToken(WrappedToken.WithVal(newVal));
+  public override IOrigin WithVal(string newVal) {
+    return new QuantifiedVariableRangeOrigin(WrappedToken.WithVal(newVal));
   }
 }
diff --git a/Source/DafnyCore/AST/TopDownVisitor.cs b/Source/DafnyCore/AST/TopDownVisitor.cs
index 50ffa56a548..e7c6e5e45df 100644
--- a/Source/DafnyCore/AST/TopDownVisitor.cs
+++ b/Source/DafnyCore/AST/TopDownVisitor.cs
@@ -5,9 +5,18 @@
 namespace Microsoft.Dafny;
 
 public class TopDownVisitor<State> {
+  private bool allowAutoGenerated;
   protected bool preResolve = false;
 
+  public TopDownVisitor(bool allowAutoGenerated = true) {
+    this.allowAutoGenerated = allowAutoGenerated;
+  }
+
   public void Visit(Expression expr, State st) {
+    if (!allowAutoGenerated && AutoGeneratedOrigin.Is(expr.Origin)) {
+      return;
+    }
+
     Contract.Requires(expr != null);
     if (VisitOneExpr(expr, ref st)) {
       if (preResolve && expr is ConcreteSyntaxExpression concreteSyntaxExpression) {
@@ -68,6 +77,7 @@ public void Visit(ICallable decl, State st) {
   public virtual void Visit(Method method, State st) {
     Visit(method.Ens, st);
     Visit(method.Req, st);
+    Visit(method.Reads.Expressions, st);
     Visit(method.Mod.Expressions, st);
     Visit(method.Decreases.Expressions, st);
     if (method.Body != null) { Visit(method.Body, st); }
@@ -76,7 +86,7 @@ public virtual void Visit(Method method, State st) {
   public virtual void Visit(Function function, State st) {
     Visit(function.Ens, st);
     Visit(function.Req, st);
-    Visit(function.Reads, st);
+    Visit(function.Reads.Expressions, st);
     Visit(function.Decreases.Expressions, st);
     if (function.Body != null) { Visit(function.Body, st); }
     //TODO More?
diff --git a/Source/DafnyCore/AST/TypeDeclarations/AbstractTypeDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/AbstractTypeDecl.cs
index c0b8ba20129..5662efb1421 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/AbstractTypeDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/AbstractTypeDecl.cs
@@ -11,10 +11,10 @@ public bool SupportsEquality {
     get { return Characteristics.EqualitySupport != TypeParameter.EqualitySupportValue.Unspecified; }
   }
 
-  public AbstractTypeDecl(RangeToken rangeToken, Name name, ModuleDefinition module, TypeParameter.TypeParameterCharacteristics characteristics,
+  public AbstractTypeDecl(IOrigin origin, Name name, ModuleDefinition module, TypeParameter.TypeParameterCharacteristics characteristics,
     List<TypeParameter> typeArgs, List<Type> parentTraits, List<MemberDecl> members, Attributes attributes, bool isRefining)
-    : base(rangeToken, name, module, typeArgs, members, attributes, isRefining, parentTraits) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, name, module, typeArgs, members, attributes, isRefining, parentTraits) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(module != null);
     Contract.Requires(typeArgs != null);
@@ -30,6 +30,7 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     var typeArgumentIndent = indent2;
     var commaIndent = indent2;
     var rightIndent = indent2;
+    Attributes.SetIndents(Attributes, indentBefore, formatter);
     foreach (var token in OwnedTokens) {
       switch (token.val) {
         case "type": {
@@ -87,21 +88,29 @@ public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
   }
 
   public string GetTriviaContainingDocstring() {
-    IToken openingBlock = null;
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
+    }
+    IOrigin openingBlock = null;
     foreach (var token in OwnedTokens) {
       if (token.val == "{") {
         openingBlock = token;
       }
     }
 
-    if (openingBlock != null && openingBlock.Prev.TrailingTrivia.Trim() != "") {
-      return openingBlock.Prev.TrailingTrivia;
+    var tentativeTrivia = "";
+    if (openingBlock != null) {
+      tentativeTrivia = (openingBlock.Prev.TrailingTrivia + openingBlock.LeadingTrivia).Trim();
+      if (tentativeTrivia != "") {
+        return tentativeTrivia;
+      }
     }
 
-    if (openingBlock == null && EndToken.TrailingTrivia.Trim() != "") {
-      return EndToken.TrailingTrivia;
+    tentativeTrivia = EndToken.TrailingTrivia.Trim();
+    if (tentativeTrivia != "") {
+      return tentativeTrivia;
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    return null;
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/TypeDeclarations/ArrayClassDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/ArrayClassDecl.cs
index 8b691e9c1c1..a002c6b0bab 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/ArrayClassDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/ArrayClassDecl.cs
@@ -8,8 +8,8 @@ public class ArrayClassDecl : ClassDecl {
 
   public readonly int Dims;
   public ArrayClassDecl(int dims, ModuleDefinition module, Attributes attrs)
-    : base(RangeToken.NoToken, new Name(SystemModuleManager.ArrayClassName(dims)), module,
-      new List<TypeParameter>(new TypeParameter[] { new TypeParameter(RangeToken.NoToken, new Name("arg"), TypeParameter.TPVarianceSyntax.NonVariant_Strict) }),
+    : base(SourceOrigin.NoToken, new Name(SystemModuleManager.ArrayClassName(dims)), module,
+      new List<TypeParameter>(new TypeParameter[] { new TypeParameter(SourceOrigin.NoToken, new Name("arg"), TypeParameter.TPVarianceSyntax.NonVariant_Strict) }),
       new List<MemberDecl>(), attrs, false, null) {
     Contract.Requires(1 <= dims);
     Contract.Requires(module != null);
diff --git a/Source/DafnyCore/AST/TypeDeclarations/ClassDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/ClassDecl.cs
index 7fb0d201eb6..9dc90af6308 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/ClassDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/ClassDecl.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Dafny;
 
-public class ClassDecl : ClassLikeDecl, IHasDocstring {
+public class ClassDecl : ClassLikeDecl {
   public override string WhatKind => "class";
   public override bool IsReferenceTypeDecl => true;
   public override bool AcceptThis => true;
@@ -15,10 +15,10 @@ void ObjectInvariant() {
     Contract.Invariant(ParentTraits != null);
   }
 
-  public ClassDecl(RangeToken rangeToken, Name name, ModuleDefinition module,
+  public ClassDecl(IOrigin origin, Name name, ModuleDefinition module,
     List<TypeParameter> typeArgs, [Captured] List<MemberDecl> members, Attributes attributes, bool isRefining, List<Type>/*?*/ traits)
-    : base(rangeToken, name, module, typeArgs, members, attributes, isRefining, traits) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, name, module, typeArgs, members, attributes, isRefining, traits) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(module != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
diff --git a/Source/DafnyCore/AST/TypeDeclarations/ClassLikeDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/ClassLikeDecl.cs
index eca519a627e..bdc617d61b0 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/ClassLikeDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/ClassLikeDecl.cs
@@ -24,10 +24,10 @@ public bool IsObjectTrait {
   public TopLevelDecl AsTopLevelDecl => this;
   public TypeDeclSynonymInfo SynonymInfo { get; set; }
 
-  public ClassLikeDecl(RangeToken rangeToken, Name name, ModuleDefinition module,
+  public ClassLikeDecl(IOrigin origin, Name name, ModuleDefinition module,
     List<TypeParameter> typeArgs, [Captured] List<MemberDecl> members, Attributes attributes, bool isRefining, List<Type>/*?*/ traits)
-    : base(rangeToken, name, module, typeArgs, members, attributes, isRefining, traits) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, name, module, typeArgs, members, attributes, isRefining, traits) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(module != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
@@ -35,15 +35,17 @@ public ClassLikeDecl(RangeToken rangeToken, Name name, ModuleDefinition module,
   }
 
   public virtual bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
-    IToken classToken = null;
+    IOrigin classToken = null;
     var parentTraitIndent = indentBefore + formatter.SpaceTab;
     var commaIndent = indentBefore;
     var extraIndent = 0;
 
     foreach (var token in OwnedTokens) {
       switch (token.val) {
+        case "trait":
         case "class": {
             classToken = token;
+            formatter.SetOpeningIndentedRegion(token, indentBefore);
             break;
           }
         case "extends": {
@@ -66,6 +68,8 @@ public virtual bool SetIndent(int indentBefore, TokenNewIndentCollector formatte
       }
     }
 
+    Attributes.SetIndents(Attributes, indentBefore, formatter);
+
     foreach (var parent in ParentTraits) {
       formatter.SetTypeIndentation(parent);
     }
@@ -74,20 +78,22 @@ public virtual bool SetIndent(int indentBefore, TokenNewIndentCollector formatte
   }
 
   public virtual string GetTriviaContainingDocstring() {
-    IToken candidate = null;
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
+    }
+
     foreach (var token in OwnedTokens) {
       if (token.val == "{") {
-        candidate = token.Prev;
-        if (candidate.TrailingTrivia.Trim() != "") {
-          return candidate.TrailingTrivia;
+        if ((token.Prev.TrailingTrivia + token.LeadingTrivia).Trim() is { } tentativeTrivia and not "") {
+          return tentativeTrivia;
         }
       }
     }
 
-    if (candidate == null && EndToken.TrailingTrivia.Trim() != "") {
-      return EndToken.TrailingTrivia;
+    if (EndToken.TrailingTrivia.Trim() is { } tentativeTrivia2 and not "") {
+      return tentativeTrivia2;
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    return null;
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/TypeDeclarations/CoDatatypeDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/CoDatatypeDecl.cs
index 319e2520fa7..951b9bca9e7 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/CoDatatypeDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/CoDatatypeDecl.cs
@@ -8,10 +8,10 @@ public class CoDatatypeDecl : DatatypeDecl {
   public override string WhatKind { get { return "codatatype"; } }
   [FilledInDuringResolution] public CoDatatypeDecl SscRepr;
 
-  public CoDatatypeDecl(RangeToken rangeToken, Name name, ModuleDefinition module, List<TypeParameter> typeArgs,
+  public CoDatatypeDecl(IOrigin origin, Name name, ModuleDefinition module, List<TypeParameter> typeArgs,
     [Captured] List<DatatypeCtor> ctors, List<Type> parentTraits, List<MemberDecl> members, Attributes attributes, bool isRefining)
-    : base(rangeToken, name, module, typeArgs, ctors, parentTraits, members, attributes, isRefining) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, name, module, typeArgs, ctors, parentTraits, members, attributes, isRefining) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(module != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
diff --git a/Source/DafnyCore/AST/TypeDeclarations/DatatypeCtor.cs b/Source/DafnyCore/AST/TypeDeclarations/DatatypeCtor.cs
index 0a779e080c9..c64d1571fc6 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/DatatypeCtor.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/DatatypeCtor.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
@@ -23,9 +24,9 @@ void ObjectInvariant() {
   [FilledInDuringResolution] public SpecialField QueryField;
   [FilledInDuringResolution] public List<DatatypeDestructor> Destructors = new List<DatatypeDestructor>();  // includes both implicit (not mentionable in source) and explicit destructors
 
-  public DatatypeCtor(RangeToken rangeToken, Name name, bool isGhost, [Captured] List<Formal> formals, Attributes attributes)
-    : base(rangeToken, name, attributes, false) {
-    Contract.Requires(rangeToken != null);
+  public DatatypeCtor(IOrigin origin, Name name, bool isGhost, [Captured] List<Formal> formals, Attributes attributes)
+    : base(origin, name, attributes, false) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(cce.NonNullElements(formals));
     this.Formals = formals;
@@ -42,19 +43,25 @@ public string FullName {
   }
 
   public string GetTriviaContainingDocstring() {
-    if (EndToken.TrailingTrivia.Trim() != "") {
-      return EndToken.TrailingTrivia;
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    var tentativeTrivia = EndToken.TrailingTrivia.Trim();
+    if (tentativeTrivia != "") {
+      return tentativeTrivia;
+    }
+
+    return null;
   }
 
-  public DafnySymbolKind Kind => DafnySymbolKind.EnumMember;
-  public string GetDescription(DafnyOptions options) {
+  public override SymbolKind? Kind => SymbolKind.EnumMember;
+  public override string GetDescription(DafnyOptions options) {
     var formals = string.Join(", ", Formals.Select(f => f.AsText()));
     return $"{EnclosingDatatype.Name}.{Name}({formals})";
   }
 
   public ModuleDefinition ContainingModule => EnclosingDatatype.EnclosingModuleDefinition;
   public bool ShouldVerify => Formals.Any(f => f.DefaultValue != null);
+  public string FullDafnyName => FullName;
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/TypeDeclarations/DatatypeDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/DatatypeDecl.cs
index 27136983903..a75322f7ea2 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/DatatypeDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/DatatypeDecl.cs
@@ -1,10 +1,12 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public abstract class DatatypeDecl : TopLevelDeclWithMembers, RevealableTypeDecl, ICallable, ICanFormat, IHasDocstring {
+public abstract class DatatypeDecl : TopLevelDeclWithMembers, RevealableTypeDecl, ICallable, ICanFormat, IHasDocstring, ICanAutoRevealDependencies {
   public override bool CanBeRevealed() { return true; }
   public readonly List<DatatypeCtor> Ctors;
 
@@ -19,10 +21,10 @@ void ObjectInvariant() {
 
   public override IEnumerable<INode> PreResolveChildren => Ctors.Concat(base.PreResolveChildren);
 
-  public DatatypeDecl(RangeToken rangeToken, Name name, ModuleDefinition module, List<TypeParameter> typeArgs,
+  public DatatypeDecl(IOrigin origin, Name name, ModuleDefinition module, List<TypeParameter> typeArgs,
     [Captured] List<DatatypeCtor> ctors, List<Type> parentTraits, List<MemberDecl> members, Attributes attributes, bool isRefining)
-    : base(rangeToken, name, module, typeArgs, members, attributes, isRefining, parentTraits) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, name, module, typeArgs, members, attributes, isRefining, parentTraits) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(module != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
@@ -48,12 +50,18 @@ public bool IsRecordType {
   public TopLevelDecl AsTopLevelDecl => this;
   public TypeDeclSynonymInfo SynonymInfo { get; set; }
 
+  public bool ContainsHide {
+    get => throw new NotSupportedException();
+    set => throw new NotSupportedException();
+  }
+
   bool ICodeContext.IsGhost { get { return true; } }
   List<TypeParameter> ICodeContext.TypeArgs { get { return TypeArgs; } }
   List<Formal> ICodeContext.Ins { get { return new List<Formal>(); } }
   ModuleDefinition IASTVisitorContext.EnclosingModule { get { return EnclosingModuleDefinition; } }
   bool ICodeContext.MustReverify { get { return false; } }
   bool ICodeContext.AllowsNontermination { get { return false; } }
+  CodeGenIdGenerator ICodeContext.CodeGenIdGenerator => CodeGenIdGenerator;
   string ICallable.NameRelativeToModule { get { return Name; } }
   Specification<Expression> ICallable.Decreases {
     get {
@@ -81,9 +89,11 @@ public override bool IsEssentiallyEmpty() {
   }
 
   public override IEnumerable<ISymbol> ChildSymbols => base.ChildSymbols.Concat(Ctors);
-  public override DafnySymbolKind Kind => DafnySymbolKind.Enum;
+  public override SymbolKind? Kind => SymbolKind.Enum;
 
   public bool SetIndent(int indent, TokenNewIndentCollector formatter) {
+    Attributes.SetIndents(Attributes, indent, formatter);
+
     var indent2 = indent + formatter.SpaceTab;
     var verticalBarIndent = indent2;
     var rightOfVerticalBarIndent = indent2 + formatter.SpaceTab;
@@ -106,6 +116,7 @@ public bool SetIndent(int indent, TokenNewIndentCollector formatter) {
       .OrderBy(token => token.pos);
     foreach (var token in ownedTokens) {
       switch (token.val) {
+        case "codatatype":
         case "datatype": {
             formatter.SetOpeningIndentedRegion(token, indent);
             break;
@@ -169,12 +180,36 @@ public bool SetIndent(int indent, TokenNewIndentCollector formatter) {
   }
 
   public string GetTriviaContainingDocstring() {
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
+    }
     foreach (var token in OwnedTokens) {
-      if (token.val == "=" && token.TrailingTrivia.Trim() != "") {
-        return token.TrailingTrivia;
+      if (token.val == "=") {
+        if ((token.Prev.TrailingTrivia + (token.LeadingTrivia ?? "")).Trim() is { } tentativeTrivia and not "") {
+          return tentativeTrivia;
+        }
       }
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    return null;
+  }
+
+  public void AutoRevealDependencies(AutoRevealFunctionDependencies Rewriter, DafnyOptions Options, ErrorReporter Reporter) {
+    foreach (var ctor in Ctors) {
+      foreach (var formal in ctor.Formals) {
+        if (formal.DefaultValue is null) {
+          continue;
+        }
+
+        var addedReveals = Rewriter.ExprToFunctionalDependencies(formal.DefaultValue, EnclosingModuleDefinition);
+        formal.DefaultValue = Rewriter.AddRevealStmtsToExpression(formal.DefaultValue, addedReveals);
+
+        if (addedReveals.Any()) {
+          Reporter.Message(MessageSource.Rewriter, ErrorLevel.Info, null, formal.Origin,
+            AutoRevealFunctionDependencies.GenerateMessage(addedReveals.ToList()));
+        }
+      }
+    }
   }
+  public string Designator => WhatKind;
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/TypeDeclarations/Declaration.cs b/Source/DafnyCore/AST/TypeDeclarations/Declaration.cs
index 0c6cc8e00db..31af8d68bcb 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/Declaration.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/Declaration.cs
@@ -1,22 +1,22 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using Microsoft.Dafny.Auditor;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public abstract class Declaration : RangeNode, IAttributeBearingDeclaration, IDeclarationOrUsage {
+public abstract class Declaration : RangeNode, IAttributeBearingDeclaration, ISymbol {
   [ContractInvariantMethod]
   void ObjectInvariant() {
     Contract.Invariant(Name != null);
   }
 
-  public IToken BodyStartTok = Token.NoToken;
-  public IToken TokenWithTrailingDocString = Token.NoToken;
+  public IOrigin BodyStartTok = Token.NoToken;
   public Name NameNode;
 
-  public override IToken Tok => NameNode.StartToken;
-  public IToken NameToken => NameNode.StartToken;
+  public virtual IOrigin NavigationToken => NameNode.Origin;
 
   public string Name => NameNode.Value;
   public bool IsRefining;
@@ -28,12 +28,12 @@ void ObjectInvariant() {
 
   protected Declaration(Cloner cloner, Declaration original) : base(cloner, original) {
     NameNode = original.NameNode.Clone(cloner);
-    BodyStartTok = cloner.Tok(original.BodyStartTok);
+    BodyStartTok = cloner.Origin(original.BodyStartTok);
     Attributes = cloner.CloneAttributes(original.Attributes);
   }
 
-  protected Declaration(RangeToken rangeToken, Name name, Attributes attributes, bool isRefining) : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
+  protected Declaration(IOrigin origin, Name name, Attributes attributes, bool isRefining) : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     this.NameNode = name;
     this.Attributes = attributes;
@@ -53,18 +53,18 @@ protected Declaration(RangeToken rangeToken, Name name, Attributes attributes, b
     Attributes.Contains(Attributes, Attributes.AutoGeneratedAttributeName);
 
   public bool HasVerifyFalseAttribute =>
-    Attributes.Find(Attributes, Attributes.VerifyAttributeName) is Attributes va &&
+    Attributes.Find(Attributes, Attributes.VerifyAttributeName) is { } va &&
     va.Args.Count == 1 &&
     Expression.IsBoolLiteral(va.Args[0], out var verify) &&
     verify == false;
 
   public override IEnumerable<Assumption> Assumptions(Declaration decl) {
     if (HasAxiomAttribute && !HasAutoGeneratedAttribute) {
-      yield return new Assumption(this, tok, AssumptionDescription.HasAxiomAttribute);
+      yield return new Assumption(this, Origin, AssumptionDescription.HasAxiomAttribute);
     }
 
     if (HasVerifyFalseAttribute && !HasAutoGeneratedAttribute) {
-      yield return new Assumption(this, tok, AssumptionDescription.HasVerifyFalseAttribute);
+      yield return new Assumption(this, Origin, AssumptionDescription.HasVerifyFalseAttribute);
     }
   }
 
@@ -115,40 +115,24 @@ public bool IsVisibleInScope(VisibilityScope scope) {
 
   public virtual string GetCompileName(DafnyOptions options) {
     if (compileName == null) {
-      IsExtern(options, out _, out compileName);
+      this.IsExtern(options, out _, out compileName);
       compileName ??= SanitizedName;
     }
 
     return compileName;
   }
 
-  public bool IsExtern(DafnyOptions options, out string/*?*/ qualification, out string/*?*/ name) {
-    // ensures result==false ==> qualification == null && name == null
-    Contract.Ensures(Contract.Result<bool>() || (Contract.ValueAtReturn(out qualification) == null && Contract.ValueAtReturn(out name) == null));
-    // ensures result==true ==> qualification != null ==> name != null
-    Contract.Ensures(!Contract.Result<bool>() || Contract.ValueAtReturn(out qualification) == null || Contract.ValueAtReturn(out name) != null);
-
-    qualification = null;
-    name = null;
-    if (!options.DisallowExterns) {
-      var externArgs = Attributes.FindExpressions(this.Attributes, "extern");
-      if (externArgs != null) {
-        if (externArgs.Count == 0) {
-          return true;
-        } else if (externArgs.Count == 1 && externArgs[0] is StringLiteralExpr) {
-          name = externArgs[0].AsStringLiteral();
-          return true;
-        } else if (externArgs.Count == 2 && externArgs[0] is StringLiteralExpr && externArgs[1] is StringLiteralExpr) {
-          qualification = externArgs[0].AsStringLiteral();
-          name = externArgs[1].AsStringLiteral();
-          return true;
-        }
-      }
-    }
-    return false;
-  }
   public Attributes Attributes;  // readonly, except during class merging in the refinement transformations and when changed by Compiler.MarkCapitalizationConflict
-  Attributes IAttributeBearingDeclaration.Attributes => Attributes;
+  Attributes IAttributeBearingDeclaration.Attributes {
+    get => Attributes;
+    set => Attributes = value;
+  }
+  string IAttributeBearingDeclaration.WhatKind =>
+    this is TopLevelDecl topLevelDecl
+      ? topLevelDecl.WhatKind
+      : this is MemberDecl memberDecl
+      ? memberDecl.WhatKind
+      : "declaration";
 
   [Pure]
   public override string ToString() {
@@ -156,7 +140,14 @@ public override string ToString() {
     return Name;
   }
 
-  internal FreshIdGenerator IdGenerator = new();
-  public override IEnumerable<INode> Children => (Attributes != null ? new List<Node> { Attributes } : Enumerable.Empty<Node>());
+  // For Boogie
+  internal VerificationIdGenerator IdGenerator = new();
+  public override IEnumerable<INode> Children => Enumerable.Empty<INode>(); // Attributes should be enumerated by the parent, as they could be placed in different places
   public override IEnumerable<INode> PreResolveChildren => Children;
+  public abstract SymbolKind? Kind { get; }
+  public abstract string GetDescription(DafnyOptions options);
+
+
+  // For Compilation
+  internal CodeGenIdGenerator CodeGenIdGenerator = new();
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/TypeDeclarations/IndDatatypeDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/IndDatatypeDecl.cs
index dd9749718a7..355efb80e86 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/IndDatatypeDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/IndDatatypeDecl.cs
@@ -1,25 +1,41 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 
 namespace Microsoft.Dafny;
 
 public class IndDatatypeDecl : DatatypeDecl {
   public override string WhatKind { get { return "datatype"; } }
-  public DatatypeCtor GroundingCtor;  // set during resolution
+  [FilledInDuringResolution] public DatatypeCtor GroundingCtor; // set during resolution (possibly to null)
 
   public override DatatypeCtor GetGroundingCtor() {
-    return GroundingCtor;
+    return GroundingCtor ?? Ctors.FirstOrDefault(ctor => ctor.IsGhost, Ctors[0]);
   }
 
-  public bool[] TypeParametersUsedInConstructionByGroundingCtor;  // set during resolution; has same length as the number of type arguments
+  private bool[] typeParametersUsedInConstructionByGroundingCtor;
+
+  public bool[] TypeParametersUsedInConstructionByGroundingCtor {
+    get {
+      if (typeParametersUsedInConstructionByGroundingCtor == null) {
+        typeParametersUsedInConstructionByGroundingCtor = new bool[TypeArgs.Count];
+        for (var i = 0; i < typeParametersUsedInConstructionByGroundingCtor.Length; i++) {
+          typeParametersUsedInConstructionByGroundingCtor[i] = true;
+        }
+      }
+      return typeParametersUsedInConstructionByGroundingCtor;
+    }
+    set {
+      typeParametersUsedInConstructionByGroundingCtor = value;
+    }
+  }
 
   public enum ES { NotYetComputed, Never, ConsultTypeArguments }
   public ES EqualitySupport = ES.NotYetComputed;
 
-  public IndDatatypeDecl(RangeToken rangeToken, Name name, ModuleDefinition module, List<TypeParameter> typeArgs,
+  public IndDatatypeDecl(IOrigin origin, Name name, ModuleDefinition module, List<TypeParameter> typeArgs,
     [Captured] List<DatatypeCtor> ctors, List<Type> parentTraits, List<MemberDecl> members, Attributes attributes, bool isRefining)
-    : base(rangeToken, name, module, typeArgs, ctors, parentTraits, members, attributes, isRefining) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, name, module, typeArgs, ctors, parentTraits, members, attributes, isRefining) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(module != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
diff --git a/Source/DafnyCore/AST/TypeDeclarations/IteratorDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/IteratorDecl.cs
index b1cba2cc9df..ff462344cf0 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/IteratorDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/IteratorDecl.cs
@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
+using Microsoft.Dafny.Compilers;
 
 namespace Microsoft.Dafny;
 
-public class IteratorDecl : ClassDecl, IMethodCodeContext, ICanVerify {
+public class IteratorDecl : ClassDecl, IMethodCodeContext, ICanVerify, ICodeContainer {
   public override string WhatKind { get { return "iterator"; } }
   public readonly List<Formal> Ins;
   public readonly List<Formal> Outs;
@@ -16,7 +18,7 @@ public class IteratorDecl : ClassDecl, IMethodCodeContext, ICanVerify {
   public readonly List<AttributedExpression> YieldEnsures;
   public readonly BlockStmt Body;
   public bool SignatureIsOmitted { get { return SignatureEllipsis != null; } }
-  public readonly IToken SignatureEllipsis;
+  public readonly IOrigin SignatureEllipsis;
   public readonly List<Field> OutsFields;
   public readonly List<Field> OutsHistoryFields;  // these are the 'xs' variables
   [FilledInDuringResolution] public readonly List<Field> DecreasesFields;
@@ -28,16 +30,16 @@ public class IteratorDecl : ClassDecl, IMethodCodeContext, ICanVerify {
   [FilledInDuringResolution] public Method Member_MoveNext;  // created during registration phase of resolution;
   public readonly LocalVariable YieldCountVariable;
 
-  public IteratorDecl(RangeToken rangeToken, Name name, ModuleDefinition module, List<TypeParameter> typeArgs,
+  public IteratorDecl(IOrigin origin, Name name, ModuleDefinition module, List<TypeParameter> typeArgs,
     List<Formal> ins, List<Formal> outs,
     Specification<FrameExpression> reads, Specification<FrameExpression> mod, Specification<Expression> decreases,
     List<AttributedExpression> requires,
     List<AttributedExpression> ensures,
     List<AttributedExpression> yieldRequires,
     List<AttributedExpression> yieldEnsures,
-    BlockStmt body, Attributes attributes, IToken signatureEllipsis)
-    : base(rangeToken, name, module, typeArgs, new List<MemberDecl>(), attributes, signatureEllipsis != null, null) {
-    Contract.Requires(rangeToken != null);
+    BlockStmt body, Attributes attributes, IOrigin signatureEllipsis)
+    : base(origin, name, module, typeArgs, new List<MemberDecl>(), attributes, signatureEllipsis != null, null) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(module != null);
     Contract.Requires(typeArgs != null);
@@ -66,8 +68,8 @@ public IteratorDecl(RangeToken rangeToken, Name name, ModuleDefinition module, L
     OutsHistoryFields = new List<Field>();
     DecreasesFields = new List<Field>();
 
-    YieldCountVariable = new LocalVariable(rangeToken, "_yieldCount", new EverIncreasingType(), true);
-    YieldCountVariable.type = YieldCountVariable.OptionalType;  // resolve YieldCountVariable here
+    YieldCountVariable = new LocalVariable(origin, "_yieldCount", new EverIncreasingType(), true);
+    YieldCountVariable.type = YieldCountVariable.SyntacticType;  // resolve YieldCountVariable here
   }
 
   /// <summary>
@@ -151,6 +153,8 @@ public bool AllowsNontermination {
     }
   }
 
+  CodeGenIdGenerator ICodeContext.CodeGenIdGenerator => CodeGenIdGenerator;
+
   public override bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     formatter.SetMethodLikeIndent(StartToken, OwnedTokens, indentBefore);
     foreach (var req in Requires) {
@@ -189,7 +193,7 @@ public override bool SetIndent(int indentBefore, TokenNewIndentCollector formatt
   public void CreateIteratorMethodSpecs(ModuleResolver resolver) {
     Contract.Requires(this != null);
 
-    var tok = new AutoGeneratedToken(Tok);
+    var tok = new AutoGeneratedOrigin(Origin);
 
     // ---------- here comes the constructor ----------
     // same requires clause as the iterator itself
@@ -197,65 +201,36 @@ public void CreateIteratorMethodSpecs(ModuleResolver resolver) {
     var ens = Member_Init.Ens;
     foreach (var p in Ins) {
       // ensures this.x == x;
-      ens.Add(new AttributedExpression(new BinaryExpr(p.tok, BinaryExpr.Opcode.Eq,
-        new ExprDotName(p.tok, new ThisExpr(p.tok), p.Name, null), new IdentifierExpr(p.tok, p.Name))));
+      ens.Add(new AttributedExpression(new BinaryExpr(p.Origin, BinaryExpr.Opcode.Eq,
+        new ExprDotName(p.Origin, new ThisExpr(p.Origin), p.NameNode, null), new IdentifierExpr(p.Origin, p.Name))));
     }
     foreach (var p in OutsHistoryFields) {
       // ensures this.ys == [];
-      ens.Add(new AttributedExpression(new BinaryExpr(p.tok, BinaryExpr.Opcode.Eq,
-        new ExprDotName(p.tok, new ThisExpr(p.tok), p.Name, null), new SeqDisplayExpr(p.tok, new List<Expression>()))));
+      ens.Add(new AttributedExpression(new BinaryExpr(p.Origin, BinaryExpr.Opcode.Eq,
+        new ExprDotName(p.Origin, new ThisExpr(p.Origin), p.NameNode, null), new SeqDisplayExpr(p.Origin, new List<Expression>()))));
     }
     // ensures this.Valid();
     var valid_call = AutoContractsRewriter.CreateUnresolvedValidCall(tok);
     ens.Add(new AttributedExpression(valid_call));
-    // ensures this._reads == old(ReadsClause);
-    var modSetSingletons = new List<Expression>();
-    Expression frameSet = new SetDisplayExpr(tok, true, modSetSingletons);
-    foreach (var fr in Reads.Expressions) {
-      if (fr.FieldName != null) {
-        resolver.reporter.Error(MessageSource.Resolver, fr.tok, "sorry, a reads clause for an iterator is not allowed to designate specific fields");
-      } else if (fr.E.Type.IsRefType) {
-        modSetSingletons.Add(fr.E);
-      } else {
-        frameSet = new BinaryExpr(fr.tok, BinaryExpr.Opcode.Add, frameSet, fr.E);
-      }
-    }
-    ens.Add(new AttributedExpression(new BinaryExpr(tok, BinaryExpr.Opcode.Eq,
-      new ExprDotName(tok, new ThisExpr(tok), "_reads", null),
-      new OldExpr(tok, frameSet))));
-    // ensures this._modifies == old(ModifiesClause);
-    modSetSingletons = new List<Expression>();
-    frameSet = new SetDisplayExpr(tok, true, modSetSingletons);
-    foreach (var fr in Modifies.Expressions) {
-      if (fr.FieldName != null) {
-        resolver.reporter.Error(MessageSource.Resolver, fr.tok, "sorry, a modifies clause for an iterator is not allowed to designate specific fields");
-      } else if (fr.E.Type.IsRefType) {
-        modSetSingletons.Add(fr.E);
-      } else {
-        frameSet = new BinaryExpr(fr.tok, BinaryExpr.Opcode.Add, frameSet, fr.E);
-      }
-    }
-    ens.Add(new AttributedExpression(new BinaryExpr(tok, BinaryExpr.Opcode.Eq,
-      new ExprDotName(tok, new ThisExpr(tok), "_modifies", null),
-      new OldExpr(tok, frameSet))));
+    AddConstructorFramePostconditions(tok, ens, resolver);
     // ensures this._new == {};
     ens.Add(new AttributedExpression(new BinaryExpr(tok, BinaryExpr.Opcode.Eq,
-      new ExprDotName(tok, new ThisExpr(tok), "_new", null),
+      new ExprDotName(tok, new ThisExpr(tok), new Name("_new"), null),
       new SetDisplayExpr(tok, true, new List<Expression>()))));
     // ensures this._decreases0 == old(DecreasesClause[0]) && ...;
     Contract.Assert(Decreases.Expressions.Count == DecreasesFields.Count);
     for (int i = 0; i < Decreases.Expressions.Count; i++) {
       var p = Decreases.Expressions[i];
       ens.Add(new AttributedExpression(new BinaryExpr(tok, BinaryExpr.Opcode.Eq,
-        new ExprDotName(tok, new ThisExpr(tok), DecreasesFields[i].Name, null),
+        new ExprDotName(tok, new ThisExpr(tok), DecreasesFields[i].NameNode, null),
         new OldExpr(tok, p))));
     }
 
     // ---------- here comes predicate Valid() ----------
     var reads = Member_Valid.Reads;
-    reads.Add(new FrameExpression(tok, new ThisExpr(tok), null));  // reads this;
-    reads.Add(new FrameExpression(tok, new ExprDotName(tok, new ThisExpr(tok), "_reads", null), null));  // reads this._reads;
-    reads.Add(new FrameExpression(tok, new ExprDotName(tok, new ThisExpr(tok), "_new", null), null));  // reads this._new;
+    reads.Expressions.Add(new FrameExpression(tok, new ThisExpr(tok), null));  // reads this;
+    reads.Expressions.Add(new FrameExpression(tok, new ExprDotName(tok, new ThisExpr(tok), new Name("_reads"), null), null));  // reads this._reads;
+    reads.Expressions.Add(new FrameExpression(tok, new ExprDotName(tok, new ThisExpr(tok), new Name("_new"), null), null));  // reads this._new;
 
     // ---------- here comes method MoveNext() ----------
     // requires this.Valid();
@@ -267,18 +242,18 @@ public void CreateIteratorMethodSpecs(ModuleResolver resolver) {
     // modifies this, this._modifies, this._new;
     var mod = Member_MoveNext.Mod.Expressions;
     mod.Add(new FrameExpression(tok, new ThisExpr(tok), null));
-    mod.Add(new FrameExpression(tok, new ExprDotName(tok, new ThisExpr(tok), "_modifies", null), null));
-    mod.Add(new FrameExpression(tok, new ExprDotName(tok, new ThisExpr(tok), "_new", null), null));
+    mod.Add(new FrameExpression(tok, new ExprDotName(tok, new ThisExpr(tok), new Name("_modifies"), null), null));
+    mod.Add(new FrameExpression(tok, new ExprDotName(tok, new ThisExpr(tok), new Name("_new"), null), null));
     // ensures fresh(_new - old(_new));
     ens = Member_MoveNext.Ens;
     ens.Add(new AttributedExpression(new FreshExpr(tok,
       new BinaryExpr(tok, BinaryExpr.Opcode.Sub,
-        new ExprDotName(tok, new ThisExpr(tok), "_new", null),
-        new OldExpr(tok, new ExprDotName(tok, new ThisExpr(tok), "_new", null))))));
+        new ExprDotName(tok, new ThisExpr(tok), new Name("_new"), null),
+        new OldExpr(tok, new ExprDotName(tok, new ThisExpr(tok), new Name("_new"), null))))));
     // ensures null !in _new
     ens.Add(new AttributedExpression(new BinaryExpr(tok, BinaryExpr.Opcode.NotIn,
       new LiteralExpr(tok),
-      new ExprDotName(tok, new ThisExpr(tok), "_new", null))));
+      new ExprDotName(tok, new ThisExpr(tok), new Name("_new"), null))));
     // ensures more ==> this.Valid();
     valid_call = AutoContractsRewriter.CreateUnresolvedValidCall(tok);
     ens.Add(new AttributedExpression(new BinaryExpr(tok, BinaryExpr.Opcode.Imp,
@@ -291,10 +266,10 @@ public void CreateIteratorMethodSpecs(ModuleResolver resolver) {
       var ys = OutsHistoryFields[i];
       var ite = new ITEExpr(tok, false, new IdentifierExpr(tok, "more"),
         new BinaryExpr(tok, BinaryExpr.Opcode.Add,
-          new OldExpr(tok, new ExprDotName(tok, new ThisExpr(tok), ys.Name, null)),
-          new SeqDisplayExpr(tok, new List<Expression>() { new ExprDotName(tok, new ThisExpr(tok), y.Name, null) })),
-        new OldExpr(tok, new ExprDotName(tok, new ThisExpr(tok), ys.Name, null)));
-      var eq = new BinaryExpr(tok, BinaryExpr.Opcode.Eq, new ExprDotName(tok, new ThisExpr(tok), ys.Name, null), ite);
+          new OldExpr(tok, new ExprDotName(tok, new ThisExpr(tok), ys.NameNode, null)),
+          new SeqDisplayExpr(tok, new List<Expression>() { new ExprDotName(tok, new ThisExpr(tok), y.NameNode, null) })),
+        new OldExpr(tok, new ExprDotName(tok, new ThisExpr(tok), ys.NameNode, null)));
+      var eq = new BinaryExpr(tok, BinaryExpr.Opcode.Eq, new ExprDotName(tok, new ThisExpr(tok), ys.NameNode, null), ite);
       ens.Add(new AttributedExpression(eq));
     }
     // ensures more ==> YieldEnsures;
@@ -314,13 +289,55 @@ public void CreateIteratorMethodSpecs(ModuleResolver resolver) {
     Contract.Assert(Decreases.Expressions.Count == DecreasesFields.Count);
     for (int i = 0; i < Decreases.Expressions.Count; i++) {
       var p = Decreases.Expressions[i];
-      Member_MoveNext.Decreases.Expressions.Add(new ExprDotName(p.tok, new ThisExpr(p.tok), DecreasesFields[i].Name, null));
+      Member_MoveNext.Decreases.Expressions.Add(new ExprDotName(p.Origin, new ThisExpr(p.Origin), DecreasesFields[i].NameNode, null));
     }
     Member_MoveNext.Decreases.Attributes = Decreases.Attributes;
   }
 
+  /// <summary>
+  /// Append to "iteratorCtorEnsures" the following postconditions about the _reads and _modifies fields:
+  ///     ensures this._reads == old(ReadsClause)
+  ///     ensures this._modifies == old(ModifiesClause)
+  /// In order to produce the RHSs of these equalities, type information about the ReadsClause and ModifiesClause are needed.
+  /// </summary>
+  private void AddConstructorFramePostconditions(AutoGeneratedOrigin tok, List<AttributedExpression> iteratorCtorEnsures, ModuleResolver resolver) {
+    // ensures this._reads == old(ReadsClause)
+    var modSetSingletons = new List<Expression>();
+    Expression frameSet = new SetDisplayExpr(tok, true, modSetSingletons);
+    foreach (var fr in Reads.Expressions) {
+      if (fr.FieldName != null) {
+        resolver.reporter.Error(MessageSource.Resolver, fr.Origin,
+          "sorry, a reads clause for an iterator is not allowed to designate specific fields");
+      } else if (fr.E.Type != null ? fr.E.Type.IsRefType : fr.E.PreType.IsRefType) {
+        modSetSingletons.Add(fr.E);
+      } else {
+        frameSet = new BinaryExpr(fr.Origin, BinaryExpr.Opcode.Add, frameSet, fr.E);
+      }
+    }
+    iteratorCtorEnsures.Add(new AttributedExpression(new BinaryExpr(tok, BinaryExpr.Opcode.Eq,
+      new ExprDotName(tok, new ThisExpr(tok), new Name("_reads"), null),
+      new OldExpr(tok, frameSet))));
+
+    // ensures this._modifies == old(ModifiesClause)
+    modSetSingletons = new List<Expression>();
+    frameSet = new SetDisplayExpr(tok, true, modSetSingletons);
+    foreach (var fr in Modifies.Expressions) {
+      if (fr.FieldName != null) {
+        resolver.reporter.Error(MessageSource.Resolver, fr.Origin,
+          "sorry, a modifies clause for an iterator is not allowed to designate specific fields");
+      } else if (fr.E.Type != null ? fr.E.Type.IsRefType : fr.E.PreType.IsRefType) {
+        modSetSingletons.Add(fr.E);
+      } else {
+        frameSet = new BinaryExpr(fr.Origin, BinaryExpr.Opcode.Add, frameSet, fr.E);
+      }
+    }
+    iteratorCtorEnsures.Add(new AttributedExpression(new BinaryExpr(tok, BinaryExpr.Opcode.Eq,
+      new ExprDotName(tok, new ThisExpr(tok), new Name("_modifies"), null),
+      new OldExpr(tok, frameSet))));
+  }
+
   public void Resolve(ModuleResolver resolver) {
-    var rangeToken = RangeToken.MakeAutoGenerated();
+    var rangeToken = Origin.MakeAutoGenerated();
 
     // register the names of the implicit members
     var members = new Dictionary<string, MemberDecl>();
@@ -332,7 +349,7 @@ public void Resolve(ModuleResolver resolver) {
         resolver.reporter.Error(MessageSource.Resolver, p,
           "Name of in-parameter is used by another member of the iterator: {0}", p.Name);
       } else {
-        var field = new SpecialField(p.RangeToken, p.Name, SpecialField.ID.UseIdParam, p.CompileName, p.IsGhost, false,
+        var field = new SpecialField(p.Origin, p.NameNode, SpecialField.ID.UseIdParam, p.CompileName, false, p.IsGhost, false,
           false, p.Type, null);
         field.EnclosingClass = this; // resolve here
         field.InheritVisibility(this);
@@ -348,7 +365,7 @@ public void Resolve(ModuleResolver resolver) {
           "Name of yield-parameter is used by another member of the iterator: {0}", p.Name);
       } else {
         nonDuplicateOuts.Add(p);
-        var field = new SpecialField(p.RangeToken, p.Name, SpecialField.ID.UseIdParam, p.CompileName, p.IsGhost, true,
+        var field = new SpecialField(p.Origin, p.NameNode, SpecialField.ID.UseIdParam, p.CompileName, false, p.IsGhost, true,
           true, p.Type, null);
         field.EnclosingClass = this; // resolve here
         field.InheritVisibility(this);
@@ -359,17 +376,17 @@ public void Resolve(ModuleResolver resolver) {
     }
 
     foreach (var p in nonDuplicateOuts) {
-      var nm = p.Name + "s";
-      if (members.ContainsKey(nm)) {
-        resolver.reporter.Error(MessageSource.Resolver, p.tok,
+      var nm = p.NameNode.Append("s");
+      if (members.ContainsKey(nm.Value)) {
+        resolver.reporter.Error(MessageSource.Resolver, p.Origin,
           "Name of implicit yield-history variable '{0}' is already used by another member of the iterator",
           p.Name);
-        nm = p.Name + "*"; // bogus name, but at least it'll be unique
+        nm = p.NameNode.Append("*"); // bogus name, but at least it'll be unique
       }
 
       // we add some field to OutsHistoryFields, even if there was an error; the name of the field, in case of error, is not so important
       var tp = new SeqType(p.Type.NormalizeExpand());
-      var field = new SpecialField(p.RangeToken, nm, SpecialField.ID.UseIdParam, nm, true, true, false, tp, null);
+      var field = new SpecialField(p.Origin, nm, SpecialField.ID.UseIdParam, nm, false, true, true, false, tp, null);
       field.EnclosingClass = this; // resolve here
       field.InheritVisibility(this);
       OutsHistoryFields
@@ -385,12 +402,12 @@ public void Resolve(ModuleResolver resolver) {
       Members.Add(f);
     });
     // add the additional special variables as fields
-    Member_Reads = new SpecialField(RangeToken, "_reads", SpecialField.ID.Reads, null, true, false, false,
-      new SetType(true, resolver.SystemModuleManager.ObjectQ()), null);
-    Member_Modifies = new SpecialField(RangeToken, "_modifies", SpecialField.ID.Modifies, null, true, false,
-      false, new SetType(true, resolver.SystemModuleManager.ObjectQ()), null);
-    Member_New = new SpecialField(RangeToken, "_new", SpecialField.ID.New, null, true, true, true,
-      new SetType(true, resolver.SystemModuleManager.ObjectQ()), null);
+    Member_Reads = new SpecialField(Origin, "_reads", SpecialField.ID.Reads, null, true, false, false,
+      resolver.SystemModuleManager.ObjectSetType(), null);
+    Member_Modifies = new SpecialField(Origin, "_modifies", SpecialField.ID.Modifies, null, true, false,
+      false, resolver.SystemModuleManager.ObjectSetType(), null);
+    Member_New = new SpecialField(Origin, "_new", SpecialField.ID.New, null, true, true, true,
+      resolver.SystemModuleManager.ObjectSetType(), null);
     foreach (var field in new List<Field>() { Member_Reads, Member_Modifies, Member_New }) {
       field.EnclosingClass = this; // resolve here
       field.InheritVisibility(this);
@@ -404,7 +421,7 @@ public void Resolve(ModuleResolver resolver) {
     var i = 0;
     foreach (var p in Decreases.Expressions) {
       var nm = "_decreases" + i;
-      var field = new SpecialField(p.RangeToken, nm, SpecialField.ID.UseIdParam, nm, true, false, false,
+      var field = new SpecialField(p.Origin, nm, SpecialField.ID.UseIdParam, nm, true, false, false,
         new InferredTypeProxy(), null);
       field.EnclosingClass = this; // resolve here
       field.InheritVisibility(this);
@@ -418,32 +435,34 @@ public void Resolve(ModuleResolver resolver) {
     // saying is that the Method/Predicate does not take any type parameters over and beyond what the enclosing type (namely, the
     // iterator type) does.
     // --- here comes the constructor
-    var init = new Constructor(rangeToken, new Name(NameNode.RangeToken, "_ctor"), false,
+    var init = new Constructor(rangeToken, new Name(NameNode.Origin, "_ctor"), false,
       new List<TypeParameter>(), Ins,
       new List<AttributedExpression>(),
+      new Specification<FrameExpression>(),
       new Specification<FrameExpression>(new List<FrameExpression>(), null),
       new List<AttributedExpression>(),
       new Specification<Expression>(new List<Expression>(), null),
-      null, null, null);
+      null, SystemModuleManager.AxiomAttribute(), null);
     // --- here comes predicate Valid()
-    var valid = new Predicate(rangeToken, new Name(NameNode.RangeToken, "Valid"), false, true, false,
+    var valid = new Predicate(rangeToken, new Name(NameNode.Origin, "Valid"), false, true, false,
       new List<TypeParameter>(),
       new List<Formal>(),
       null,
       new List<AttributedExpression>(),
-      new List<FrameExpression>(),
+      new Specification<FrameExpression>(),
       new List<AttributedExpression>(),
       new Specification<Expression>(new List<Expression>(), null),
-      null, Predicate.BodyOriginKind.OriginalOrInherited, null, null, null, null);
+      null, Predicate.BodyOriginKind.OriginalOrInherited, null, null, SystemModuleManager.AxiomAttribute(), null);
     // --- here comes method MoveNext
-    var moveNext = new Method(rangeToken, new Name(NameNode.RangeToken, "MoveNext"), false, false,
+    var moveNext = new Method(rangeToken, new Name(NameNode.Origin, "MoveNext"), false, false,
       new List<TypeParameter>(),
-      new List<Formal>(), new List<Formal>() { new Formal(tok, "more", Type.Bool, false, false, null) },
+      new List<Formal>(), new List<Formal>() { new Formal(Origin, "more", Type.Bool, false, false, null) },
       new List<AttributedExpression>(),
+      new Specification<FrameExpression>(),
       new Specification<FrameExpression>(new List<FrameExpression>(), null),
       new List<AttributedExpression>(),
       new Specification<Expression>(new List<Expression>(), null),
-      null, Attributes.Find(Attributes, "print"), null);
+      null, SystemModuleManager.AxiomAttribute(Attributes.Find(Attributes, "print")), null);
     // add these implicit members to the class
     init.EnclosingClass = this;
     init.InheritVisibility(this);
@@ -456,7 +475,7 @@ public void Resolve(ModuleResolver resolver) {
     Member_Valid = valid;
     Member_MoveNext = moveNext;
     if (members.TryGetValue(init.Name, out var member)) {
-      resolver.reporter.Error(MessageSource.Resolver, member.tok,
+      resolver.reporter.Error(MessageSource.Resolver, member.Origin,
         "member name '{0}' is already predefined for this iterator", init.Name);
     } else {
       members.Add(init.Name, init);
@@ -466,7 +485,7 @@ public void Resolve(ModuleResolver resolver) {
     // If the name of the iterator is "Valid" or "MoveNext", one of the following will produce an error message.  That
     // error message may not be as clear as it could be, but the situation also seems unlikely to ever occur in practice.
     if (members.TryGetValue("Valid", out member)) {
-      resolver.reporter.Error(MessageSource.Resolver, member.tok,
+      resolver.reporter.Error(MessageSource.Resolver, member.Origin,
         "member name 'Valid' is already predefined for iterators");
     } else {
       members.Add(valid.Name, valid);
@@ -474,7 +493,7 @@ public void Resolve(ModuleResolver resolver) {
     }
 
     if (members.TryGetValue("MoveNext", out member)) {
-      resolver.reporter.Error(MessageSource.Resolver, member.tok,
+      resolver.reporter.Error(MessageSource.Resolver, member.Origin,
         "member name 'MoveNext' is already predefined for iterators");
     } else {
       members.Add(moveNext.Name, moveNext);
@@ -483,19 +502,41 @@ public void Resolve(ModuleResolver resolver) {
   }
 
   public override string GetTriviaContainingDocstring() {
-    IToken lastClosingParenthesis = null;
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
+    }
+
+    IOrigin lastClosingParenthesis = null;
     foreach (var token in OwnedTokens) {
       if (token.val == ")") {
         lastClosingParenthesis = token;
       }
     }
 
-    if (lastClosingParenthesis != null && lastClosingParenthesis.TrailingTrivia.Trim() != "") {
-      return lastClosingParenthesis.TrailingTrivia;
+    var tentativeTrivia = "";
+    if (lastClosingParenthesis != null) {
+      if (lastClosingParenthesis.pos < EndToken.pos) {
+        tentativeTrivia = (lastClosingParenthesis.TrailingTrivia + lastClosingParenthesis.Next.LeadingTrivia).Trim();
+      } else {
+        tentativeTrivia = lastClosingParenthesis.TrailingTrivia.Trim();
+      }
+
+      if (tentativeTrivia != "") {
+        return tentativeTrivia;
+      }
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    tentativeTrivia = EndToken.TrailingTrivia.Trim();
+    if (tentativeTrivia != "") {
+      return tentativeTrivia;
+    }
+
+    return null;
   }
   public bool ShouldVerify => true; // This could be made more accurate
   public ModuleDefinition ContainingModule => EnclosingModuleDefinition;
+  public string Designator => WhatKind;
+
+  [FilledInDuringResolution]
+  public bool ContainsHide { get; set; }
 }
diff --git a/Source/DafnyCore/AST/TypeDeclarations/NewtypeDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/NewtypeDecl.cs
index abd9b684fde..c778d79f23f 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/NewtypeDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/NewtypeDecl.cs
@@ -9,26 +9,49 @@ public class NewtypeDecl : TopLevelDeclWithMembers, RevealableTypeDecl, Redirect
   public override string WhatKind { get { return "newtype"; } }
   public override bool CanBeRevealed() { return true; }
   public PreType BasePreType;
+  PreType RedirectingTypeDecl.BasePreType => BasePreType;
   public Type BaseType { get; set; } // null when refining
   public BoundVar Var { get; set; }  // can be null (if non-null, then object.ReferenceEquals(Var.Type, BaseType))
   public Expression Constraint { get; set; }  // is null iff Var is
   public SubsetTypeDecl.WKind WitnessKind { get; set; } = SubsetTypeDecl.WKind.CompiledZero;
   public Expression/*?*/ Witness { get; set; } // non-null iff WitnessKind is Compiled or Ghost
   [FilledInDuringResolution] public NativeType NativeType; // non-null for fixed-size representations (otherwise, use BigIntegers for integers)
-  public NewtypeDecl(RangeToken rangeToken, Name name, ModuleDefinition module, Type baseType, List<Type> parentTraits,
-    List<MemberDecl> members, Attributes attributes, bool isRefining)
-    : base(rangeToken, name, module, new List<TypeParameter>(), members, attributes, isRefining, parentTraits) {
-    Contract.Requires(rangeToken != null);
+
+  private bool? constraintIsCompilable = null;
+  [FilledInDuringResolution]
+  bool RedirectingTypeDecl.ConstraintIsCompilable {
+    get {
+      Contract.Assert(constraintIsCompilable != null);
+      return (bool)constraintIsCompilable;
+    }
+    set {
+      Contract.Assert(constraintIsCompilable == null);
+      constraintIsCompilable = value;
+    }
+  }
+
+  [FilledInDuringResolution] public bool TargetTypeCoversAllBitPatterns; // "target complete" -- indicates that any bit pattern that can fill the target type is a value of the newtype
+
+  public NewtypeDecl(IOrigin origin, Name name, List<TypeParameter> typeParameters, ModuleDefinition module,
+    Type baseType,
+    SubsetTypeDecl.WKind witnessKind, Expression witness, List<Type> parentTraits, List<MemberDecl> members, Attributes attributes, bool isRefining)
+    : base(origin, name, module, typeParameters, members, attributes, isRefining, parentTraits) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(module != null);
     Contract.Requires(isRefining ^ (baseType != null));
+    Contract.Requires((witnessKind == SubsetTypeDecl.WKind.Compiled || witnessKind == SubsetTypeDecl.WKind.Ghost) == (witness != null));
     Contract.Requires(members != null);
     BaseType = baseType;
+    Witness = witness;
+    WitnessKind = witnessKind;
+    this.NewSelfSynonym();
   }
-  public NewtypeDecl(RangeToken rangeToken, Name name, ModuleDefinition module, BoundVar bv, Expression constraint,
+  public NewtypeDecl(IOrigin origin, Name name, List<TypeParameter> typeParameters, ModuleDefinition module,
+    BoundVar bv, Expression constraint,
     SubsetTypeDecl.WKind witnessKind, Expression witness, List<Type> parentTraits, List<MemberDecl> members, Attributes attributes, bool isRefining)
-    : base(rangeToken, name, module, new List<TypeParameter>(), members, attributes, isRefining, parentTraits) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, name, module, typeParameters, members, attributes, isRefining, parentTraits) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(module != null);
     Contract.Requires(bv != null && bv.Type != null);
@@ -42,37 +65,79 @@ public NewtypeDecl(RangeToken rangeToken, Name name, ModuleDefinition module, Bo
     this.NewSelfSynonym();
   }
 
+  public Type ConcreteBaseType(List<Type> typeArguments) {
+    Contract.Requires(TypeArgs.Count == typeArguments.Count);
+    if (typeArguments.Count == 0) {
+      // this optimization seems worthwhile
+      return BaseType;
+    }
+    var subst = TypeParameter.SubstitutionMap(TypeArgs, typeArguments);
+    return BaseType.Subst(subst);
+  }
+
+  /// <summary>
+  /// Return .BaseType instantiated with "typeArgs", but only look at the part of .BaseType that is in scope.
+  /// </summary>
+  public Type RhsWithArgument(List<Type> typeArgs) {
+    Contract.Requires(typeArgs != null);
+    Contract.Requires(typeArgs.Count == TypeArgs.Count);
+    var scope = Type.GetScope();
+    var rtd = BaseType.AsRevealableType;
+    if (rtd != null) {
+      Contract.Assume(rtd.AsTopLevelDecl.IsVisibleInScope(scope));
+      if (!rtd.IsRevealedInScope(scope)) {
+        // type is actually hidden in this scope
+        return rtd.SelfSynonym(typeArgs);
+      }
+    }
+    return ConcreteBaseType(typeArgs);
+  }
+
   public TopLevelDecl AsTopLevelDecl => this;
   public TypeDeclSynonymInfo SynonymInfo { get; set; }
 
-  public TypeParameter.EqualitySupportValue EqualitySupport {
+  private IndDatatypeDecl.ES equalitySupport = IndDatatypeDecl.ES.NotYetComputed;
+
+  public IndDatatypeDecl.ES EqualitySupport {
     get {
-      if (this.BaseType.SupportsEquality) {
-        return TypeParameter.EqualitySupportValue.Required;
-      } else {
-        return TypeParameter.EqualitySupportValue.Unspecified;
+      if (equalitySupport == IndDatatypeDecl.ES.NotYetComputed) {
+        var thingsChanged = false;
+        if (ModuleResolver.SurelyNeverSupportEquality(BaseType)) {
+          equalitySupport = IndDatatypeDecl.ES.Never;
+        } else {
+          ModuleResolver.DetermineEqualitySupportType(BaseType, ref thingsChanged);
+          equalitySupport = IndDatatypeDecl.ES.ConsultTypeArguments;
+        }
       }
+
+      return equalitySupport;
     }
   }
 
   string RedirectingTypeDecl.Name { get { return Name; } }
-  IToken RedirectingTypeDecl.tok { get { return tok; } }
+  IOrigin RedirectingTypeDecl.Tok { get { return Origin; } }
   Attributes RedirectingTypeDecl.Attributes { get { return Attributes; } }
   ModuleDefinition RedirectingTypeDecl.Module { get { return EnclosingModuleDefinition; } }
   BoundVar RedirectingTypeDecl.Var { get { return Var; } }
   Expression RedirectingTypeDecl.Constraint { get { return Constraint; } }
   SubsetTypeDecl.WKind RedirectingTypeDecl.WitnessKind { get { return WitnessKind; } }
   Expression RedirectingTypeDecl.Witness { get { return Witness; } }
-  FreshIdGenerator RedirectingTypeDecl.IdGenerator { get { return IdGenerator; } }
+  VerificationIdGenerator RedirectingTypeDecl.IdGenerator { get { return IdGenerator; } }
+
+  public bool ContainsHide {
+    get => throw new NotSupportedException();
+    set => throw new NotSupportedException();
+  }
 
   bool ICodeContext.IsGhost {
     get { throw new NotSupportedException(); }  // if .IsGhost is needed, the object should always be wrapped in an CodeContextWrapper
   }
-  List<TypeParameter> ICodeContext.TypeArgs { get { return new List<TypeParameter>(); } }
+  List<TypeParameter> ICodeContext.TypeArgs { get { return TypeArgs; } }
   List<Formal> ICodeContext.Ins { get { return new List<Formal>(); } }
   ModuleDefinition IASTVisitorContext.EnclosingModule { get { return EnclosingModuleDefinition; } }
   bool ICodeContext.MustReverify { get { return false; } }
   bool ICodeContext.AllowsNontermination { get { return false; } }
+  CodeGenIdGenerator ICodeContext.CodeGenIdGenerator => CodeGenIdGenerator;
   string ICallable.NameRelativeToModule { get { return Name; } }
   Specification<Expression> ICallable.Decreases {
     get {
@@ -94,25 +159,28 @@ public override bool IsEssentiallyEmpty() {
   }
 
   public string GetTriviaContainingDocstring() {
-    IToken candidate = null;
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
+    }
+
     foreach (var token in OwnedTokens) {
-      if (token.val == "{") {
-        candidate = token.Prev;
-        if (candidate.TrailingTrivia.Trim() != "") {
-          return candidate.TrailingTrivia;
+      if (token.val == "=") {
+        if ((token.Prev.TrailingTrivia + token.LeadingTrivia).Trim() is { } tentativeTrivia1 and not "") {
+          return tentativeTrivia1;
         }
       }
     }
 
-    if (candidate == null && EndToken.TrailingTrivia.Trim() != "") {
-      return EndToken.TrailingTrivia;
+    if (EndToken.TrailingTrivia.Trim() is { } tentativeTrivia and not "") {
+      return tentativeTrivia;
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    return null;
   }
 
   public ModuleDefinition ContainingModule => EnclosingModuleDefinition;
   public bool ShouldVerify => true; // This could be made more accurate
+  public string Designator => WhatKind;
 }
 
 public class NativeType {
@@ -120,7 +188,7 @@ public class NativeType {
   public readonly BigInteger LowerBound;
   public readonly BigInteger UpperBound;
   public readonly int Bitwidth;  // for unassigned types, this shows the number of bits in the type; else is 0
-  public enum Selection { Byte, SByte, UShort, Short, UInt, Int, Number, ULong, Long }
+  public enum Selection { Byte, SByte, UShort, Short, UInt, Int, Number, ULong, Long, UDoubleLong, DoubleLong }
   public readonly Selection Sel;
   public NativeType(string Name, BigInteger LowerBound, BigInteger UpperBound, int bitwidth, Selection sel) {
     Contract.Requires(Name != null);
@@ -131,6 +199,17 @@ public NativeType(string Name, BigInteger LowerBound, BigInteger UpperBound, int
     this.Bitwidth = bitwidth;
     this.Sel = sel;
   }
+
+  public Selection? UnsignedCounterpart() {
+    switch (Sel) {
+      case Selection.SByte: return Selection.Byte;
+      case Selection.Short: return Selection.UShort;
+      case Selection.Int: return Selection.UInt;
+      case Selection.Long: return Selection.ULong;
+      default:
+        return null;
+    }
+  }
 }
 
 public interface RevealableTypeDecl {
diff --git a/Source/DafnyCore/AST/TypeDeclarations/NonNullTypeDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/NonNullTypeDecl.cs
index 3451dff1a58..9a837b99815 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/NonNullTypeDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/NonNullTypeDecl.cs
@@ -1,10 +1,11 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public class NonNullTypeDecl : SubsetTypeDecl, ISymbol {
-  public override string WhatKind { get { return "non-null type"; } }
+public class NonNullTypeDecl : SubsetTypeDecl {
+  public override string WhatKind => "non-null type";
   public readonly ClassLikeDecl Class;
 
   /// <summary>
@@ -12,20 +13,20 @@ public class NonNullTypeDecl : SubsetTypeDecl, ISymbol {
   /// in order to build values that depend on previously computed parameters.
   /// </summary>
   public NonNullTypeDecl(ClassLikeDecl cl)
-    : this(cl, cl.TypeArgs.ConvertAll(tp => new TypeParameter(tp.RangeToken, tp.NameNode, tp.VarianceSyntax, tp.Characteristics))) {
+    : this(cl, TypeParameter.CloneTypeParameters(cl.TypeArgs)) {
     Contract.Requires(cl != null);
   }
 
   private NonNullTypeDecl(ClassLikeDecl cl, List<TypeParameter> tps)
     : this(cl, tps,
-      new BoundVar(cl.Tok, "c", new UserDefinedType(cl.Tok, cl.Name + "?", tps.Count == 0 ? null : tps.ConvertAll(tp => (Type)new UserDefinedType(tp))))) {
+      new BoundVar(cl.Origin, "c", new UserDefinedType(cl.Origin, cl.Name + "?", tps.Count == 0 ? null : tps.ConvertAll(tp => (Type)new UserDefinedType(tp))))) {
     Contract.Requires(cl != null);
     Contract.Requires(tps != null);
   }
 
   private NonNullTypeDecl(ClassLikeDecl cl, List<TypeParameter> tps, BoundVar id)
-    : base(cl.RangeToken, cl.NameNode, new TypeParameter.TypeParameterCharacteristics(), tps, cl.EnclosingModuleDefinition, id,
-      new BinaryExpr(cl.Tok, BinaryExpr.Opcode.Neq, new IdentifierExpr(cl.Tok, id), new LiteralExpr(cl.Tok)),
+    : base(cl.Origin, cl.NameNode, new TypeParameter.TypeParameterCharacteristics(), tps, cl.EnclosingModuleDefinition, id,
+      new BinaryExpr(cl.Origin, BinaryExpr.Opcode.Neq, new IdentifierExpr(cl.Origin, id), new LiteralExpr(cl.Origin)),
       SubsetTypeDecl.WKind.Special, null, SystemModuleManager.AxiomAttribute()) {
     Contract.Requires(cl != null);
     Contract.Requires(tps != null);
@@ -33,10 +34,10 @@ private NonNullTypeDecl(ClassLikeDecl cl, List<TypeParameter> tps, BoundVar id)
     Class = cl;
   }
 
-  public override List<Type> ParentTypes(List<Type> typeArgs) {
-    List<Type> result = new List<Type>(base.ParentTypes(typeArgs));
+  public override List<Type> ParentTypes(List<Type> typeArgs, bool includeTypeBounds) {
+    var result = new List<Type>(base.ParentTypes(typeArgs, includeTypeBounds));
 
-    foreach (var rhsParentType in Class.ParentTypes(typeArgs)) {
+    foreach (var rhsParentType in Class.ParentTypes(typeArgs, includeTypeBounds)) {
       var rhsParentUdt = (UserDefinedType)rhsParentType; // all parent types of .Class are expected to be possibly-null class types
       Contract.Assert(rhsParentUdt.ResolvedClass is TraitDecl);
       result.Add(UserDefinedType.CreateNonNullTypeIfReferenceType(rhsParentUdt));
@@ -45,7 +46,7 @@ public override List<Type> ParentTypes(List<Type> typeArgs) {
     return result;
   }
 
-  public override DafnySymbolKind Kind => Class.Kind;
+  public override SymbolKind? Kind => Class.Kind;
 
   public override string GetDescription(DafnyOptions options) {
     return Class.GetDescription(options);
diff --git a/Source/DafnyCore/AST/TypeDeclarations/SubsetTypeDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/SubsetTypeDecl.cs
index 6208a13770f..f6ba7866d21 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/SubsetTypeDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/SubsetTypeDecl.cs
@@ -1,23 +1,36 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public class SubsetTypeDecl : TypeSynonymDecl, RedirectingTypeDecl, ICanVerify {
+public class SubsetTypeDecl : TypeSynonymDecl, RedirectingTypeDecl, ICanAutoRevealDependencies, ICanVerify {
   public override string WhatKind => "subset type";
   public readonly BoundVar Var;
   public readonly Expression Constraint;
   public enum WKind { CompiledZero, Compiled, Ghost, OptOut, Special }
   public readonly WKind WitnessKind;
-  public readonly Expression/*?*/ Witness;  // non-null iff WitnessKind is Compiled or Ghost
-  [FilledInDuringResolution] public bool ConstraintIsCompilable;
-  [FilledInDuringResolution] public bool CheckedIfConstraintIsCompilable = false; // Set to true lazily by the Resolver when the Resolver fills in "ConstraintIsCompilable".
-  public SubsetTypeDecl(RangeToken rangeToken, Name name, TypeParameter.TypeParameterCharacteristics characteristics, List<TypeParameter> typeArgs, ModuleDefinition module,
+  public Expression/*?*/ Witness;  // non-null iff WitnessKind is Compiled or Ghost
+
+  private bool? constraintIsCompilable = null;
+  [FilledInDuringResolution]
+  bool RedirectingTypeDecl.ConstraintIsCompilable {
+    get {
+      Contract.Assert(constraintIsCompilable != null);
+      return (bool)constraintIsCompilable;
+    }
+    set {
+      Contract.Assert(constraintIsCompilable == null);
+      constraintIsCompilable = value;
+    }
+  }
+
+  public SubsetTypeDecl(IOrigin origin, Name name, TypeParameter.TypeParameterCharacteristics characteristics, List<TypeParameter> typeArgs, ModuleDefinition module,
     BoundVar id, Expression constraint, WKind witnessKind, Expression witness,
     Attributes attributes)
-    : base(rangeToken, name, characteristics, typeArgs, module, id.Type, attributes) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, name, characteristics, typeArgs, module, id.Type, attributes) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(typeArgs != null);
     Contract.Requires(module != null);
@@ -37,17 +50,63 @@ public SubsetTypeDecl(RangeToken rangeToken, Name name, TypeParameter.TypeParame
       );
 
   BoundVar RedirectingTypeDecl.Var => Var;
+  PreType RedirectingTypeDecl.BasePreType => Var.PreType;
+  Type RedirectingTypeDecl.BaseType => Var.Type;
   Expression RedirectingTypeDecl.Constraint => Constraint;
   WKind RedirectingTypeDecl.WitnessKind => WitnessKind;
   Expression RedirectingTypeDecl.Witness => Witness;
 
-  public override List<Type> ParentTypes(List<Type> typeArgs) {
+  public override List<Type> ParentTypes(List<Type> typeArgs, bool includeTypeBounds) {
     return new List<Type> { RhsWithArgument(typeArgs) };
   }
   public bool ShouldVerify => true; // This could be made more accurate
   public ModuleDefinition ContainingModule => EnclosingModuleDefinition;
-  public virtual DafnySymbolKind Kind => DafnySymbolKind.Class;
-  public virtual string GetDescription(DafnyOptions options) {
+  public override SymbolKind? Kind => SymbolKind.Class;
+  public override string GetDescription(DafnyOptions options) {
     return "subset type";
   }
+
+  public void AutoRevealDependencies(AutoRevealFunctionDependencies Rewriter, DafnyOptions Options, ErrorReporter Reporter) {
+    if (Witness is null) {
+      return;
+    }
+
+    var expressions = Constraint.SubExpressions.ToList().Concat(Witness.SubExpressions.ToList());
+    foreach (var expression in expressions) {
+      if (expression is not FunctionCallExpr funcExpr) {
+        continue;
+      }
+
+      var func = funcExpr.Function;
+
+      if (!AutoRevealFunctionDependencies.IsRevealable(EnclosingModuleDefinition.AccessibleMembers, func)) {
+        continue;
+      }
+
+      if (func.IsMadeImplicitlyOpaque(Options)) {
+        var revealStmt0 = AutoRevealFunctionDependencies.BuildRevealStmt(func, Witness.Origin, EnclosingModuleDefinition);
+
+        if (revealStmt0 is not null) {
+          var newExpr = new StmtExpr(Witness.Origin, revealStmt0, Witness) {
+            Type = Witness.Type
+          };
+          Witness = newExpr;
+        }
+      }
+
+      foreach (var newFunc in Rewriter.GetEnumerator(func, func.EnclosingClass, new List<Expression>(), EnclosingModuleDefinition)) {
+        var origExpr = Witness;
+        var revealStmt = AutoRevealFunctionDependencies.BuildRevealStmt(newFunc.Function, Witness.Origin, EnclosingModuleDefinition);
+
+        if (revealStmt is null) {
+          continue;
+        }
+
+        var newExpr = new StmtExpr(Witness.Origin, revealStmt, origExpr) {
+          Type = origExpr.Type
+        };
+        Witness = newExpr;
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/TypeDeclarations/TopLevelDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/TopLevelDecl.cs
index 23919f5ce38..8fc96714927 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/TopLevelDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/TopLevelDecl.cs
@@ -1,11 +1,13 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
-public abstract class TopLevelDecl : Declaration, TypeParameter.ParentType {
+public abstract class TopLevelDecl : Declaration, TypeParameter.ParentType, ISymbol {
   public abstract string WhatKind { get; }
+  public string WhatKindAndName => $"{WhatKind} '{Name}'";
   public ModuleDefinition EnclosingModuleDefinition;
   public readonly List<TypeParameter> TypeArgs;
   [ContractInvariantMethod]
@@ -18,9 +20,9 @@ protected TopLevelDecl(Cloner cloner, TopLevelDecl original, ModuleDefinition pa
     EnclosingModuleDefinition = parent;
   }
 
-  protected TopLevelDecl(RangeToken rangeToken, Name name, ModuleDefinition enclosingModule, List<TypeParameter> typeArgs, Attributes attributes, bool isRefining)
-    : base(rangeToken, name, attributes, isRefining) {
-    Contract.Requires(rangeToken != null);
+  protected TopLevelDecl(IOrigin origin, Name name, ModuleDefinition enclosingModule, List<TypeParameter> typeArgs, Attributes attributes, bool isRefining)
+    : base(origin, name, attributes, isRefining) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
     EnclosingModuleDefinition = enclosingModule;
@@ -74,7 +76,7 @@ public string GetFullCompileName(DafnyOptions options) {
       }
     }
 
-    return options.Backend.GetCompileName(EnclosingModuleDefinition.IsDefaultModule,
+    return options.Backend.GetCompileName(EnclosingModuleDefinition.TryToAvoidName,
       EnclosingModuleDefinition.GetCompileName(options), GetCompileName(options));
   }
 
@@ -96,8 +98,10 @@ public TopLevelDecl ViewAsClass {
   ///     class C<X> extends J<X, int>
   /// C.ParentTypes(real) = J<real, int>    // non-null types C and J
   /// C?.ParentTypes(real) = J?<real, int>  // possibly-null type C? and J?
+  /// 
+  /// If "includeTypeBounds" is "true", then for a type parameter, ParentTypes() returns the type bounds.
   /// </summary>
-  public virtual List<Type> ParentTypes(List<Type> typeArgs) {
+  public virtual List<Type> ParentTypes(List<Type> typeArgs, bool includeTypeBounds) {
     Contract.Requires(typeArgs != null);
     Contract.Requires(this.TypeArgs.Count == typeArgs.Count);
     return new List<Type>();
diff --git a/Source/DafnyCore/AST/TypeDeclarations/TopLevelDeclWithMembers.cs b/Source/DafnyCore/AST/TypeDeclarations/TopLevelDeclWithMembers.cs
index b77260cb56c..771fe3bc267 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/TopLevelDeclWithMembers.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/TopLevelDeclWithMembers.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using Microsoft.Dafny.Auditor;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
@@ -27,6 +28,13 @@ internal bool HeadDerivesFrom(TopLevelDecl b) {
     return this == b || this.ParentTraitHeads.Exists(tr => tr.HeadDerivesFrom(b));
   }
 
+  public void AddParentTypeParameterSubstitutions(Dictionary<TypeParameter, Type> typeMap) {
+    foreach (var entry in ParentFormalTypeParametersToActuals) {
+      var v = entry.Value.Subst(typeMap);
+      typeMap.Add(entry.Key, v);
+    }
+  }
+
   [FilledInDuringResolution] public InheritanceInformationClass ParentTypeInformation;
   public class InheritanceInformationClass {
     private readonly Dictionary<TraitDecl, List<(Type, List<TraitDecl> /*via this parent path*/)>> info = new Dictionary<TraitDecl, List<(Type, List<TraitDecl>)>>();
@@ -79,11 +87,11 @@ public void Extend(TraitDecl parent, InheritanceInformationClass parentInfo, Dic
     }
   }
 
-  protected TopLevelDeclWithMembers(RangeToken rangeToken, Name name, ModuleDefinition module,
+  protected TopLevelDeclWithMembers(IOrigin origin, Name name, ModuleDefinition module,
     List<TypeParameter> typeArgs, List<MemberDecl> members, Attributes attributes,
     bool isRefining, List<Type>/*?*/ traits = null)
-    : base(rangeToken, name, module, typeArgs, attributes, isRefining) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, name, module, typeArgs, attributes, isRefining) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(cce.NonNullElements(typeArgs));
     Contract.Requires(cce.NonNullElements(members));
@@ -101,13 +109,17 @@ public List<Type> RawTraitsWithArgument(List<Type> typeArgs) {
     Contract.Requires(typeArgs.Count == TypeArgs.Count);
     // Instantiate with the actual type arguments
     var subst = TypeParameter.SubstitutionMap(TypeArgs, typeArgs);
-    return ParentTraits.ConvertAll(traitType => {
+    var isReferenceType = this is ClassLikeDecl { IsReferenceTypeDecl: true };
+    var results = new List<Type>();
+    foreach (var traitType in ParentTraits) {
       var ty = (UserDefinedType)traitType.Subst(subst);
-      return (Type)UserDefinedType.CreateNullableTypeIfReferenceType(ty);
-    });
+      Contract.Assert(isReferenceType || !ty.IsRefType);
+      results.Add(UserDefinedType.CreateNullableTypeIfReferenceType(ty));
+    }
+    return results;
   }
 
-  public override List<Type> ParentTypes(List<Type> typeArgs) {
+  public override List<Type> ParentTypes(List<Type> typeArgs, bool includeTypeBounds) {
     return RawTraitsWithArgument(typeArgs);
   }
 
@@ -120,7 +132,7 @@ public static List<UserDefinedType> CommonTraits(TopLevelDeclWithMembers a, TopL
     var types = new List<UserDefinedType>();
     foreach (var t in aa) {
       var typeArgs = t.TypeArgs.ConvertAll(tp => a.ParentFormalTypeParametersToActuals[tp]);
-      var u = new UserDefinedType(t.Tok, t.Name + "?", t, typeArgs);
+      var u = new UserDefinedType(t.Origin, t.Name + "?", t, typeArgs);
       types.Add(u);
     }
     return types;
@@ -170,7 +182,17 @@ public override bool IsEssentiallyEmpty() {
   }
 
   public override IEnumerable<Assumption> Assumptions(Declaration decl) {
-    return Members.SelectMany(m => m.Assumptions(this));
+    foreach (var a in base.Assumptions(this)) {
+      yield return a;
+    }
+
+    foreach (var a in Members.SelectMany(m => m.Assumptions(this))) {
+      yield return a;
+    }
+
+    if (Attributes.Contains(Attributes, "AssumeCrossModuleTermination")) {
+      yield return new Assumption(this, Origin, AssumptionDescription.HasAssumeCrossModuleTerminationAttribute);
+    }
   }
 
   public void RegisterMembers(ModuleResolver resolver, Dictionary<string, MemberDecl> members) {
@@ -183,7 +205,7 @@ public void RegisterMembers(ModuleResolver resolver, Dictionary<string, MemberDe
         if (m is Constructor) {
           Contract.Assert(this is ClassLikeDecl); // the parser ensures this condition
           if (this is TraitDecl) {
-            resolver.reporter.Error(MessageSource.Resolver, m.tok, "a trait is not allowed to declare a constructor");
+            resolver.reporter.Error(MessageSource.Resolver, m.Origin, "a trait is not allowed to declare a constructor");
           } else {
             ((ClassDecl)this).HasConstructor = true;
           }
@@ -195,28 +217,28 @@ public void RegisterMembers(ModuleResolver resolver, Dictionary<string, MemberDe
           Type typeOfK;
           if ((m is ExtremePredicate && ((ExtremePredicate)m).KNat) ||
               (m is ExtremeLemma && ((ExtremeLemma)m).KNat)) {
-            typeOfK = new UserDefinedType(m.tok, "nat", (List<Type>)null);
+            typeOfK = new UserDefinedType(m.Origin, "nat", (List<Type>)null);
           } else {
             typeOfK = new BigOrdinalType();
           }
 
-          var k = new ImplicitFormal(m.tok, "_k", typeOfK, true, false);
-          resolver.reporter.Info(MessageSource.Resolver, m.tok, string.Format("_k: {0}", k.Type));
+          var k = new ImplicitFormal(m.Origin, "_k", typeOfK, true, false);
+          resolver.reporter.Info(MessageSource.Resolver, m.Origin, string.Format("_k: {0}", k.Type));
           formals.Add(k);
           if (m is ExtremePredicate extremePredicate) {
-            formals.AddRange(extremePredicate.Formals.ConvertAll(f => cloner.CloneFormal(f, false)));
+            formals.AddRange(extremePredicate.Ins.ConvertAll(f => cloner.CloneFormal(f, false)));
 
             List<TypeParameter> tyvars = extremePredicate.TypeArgs.ConvertAll(cloner.CloneTypeParam);
 
             // create prefix predicate
-            extremePredicate.PrefixPredicate = new PrefixPredicate(extremePredicate.RangeToken, extraName, extremePredicate.HasStaticKeyword,
+            extremePredicate.PrefixPredicate = new PrefixPredicate(extremePredicate.Origin, extraName, extremePredicate.HasStaticKeyword,
               tyvars, k, formals,
               extremePredicate.Req.ConvertAll(cloner.CloneAttributedExpr),
-              extremePredicate.Reads.ConvertAll(cloner.CloneFrameExpr),
+              cloner.CloneSpecFrameExpr(extremePredicate.Reads),
               extremePredicate.Ens.ConvertAll(cloner.CloneAttributedExpr),
-              new Specification<Expression>(new List<Expression>() { new IdentifierExpr(extremePredicate.tok, k.Name) }, null),
+              new Specification<Expression>(new List<Expression>() { new IdentifierExpr(extremePredicate.Origin, k.Name) }, null),
               cloner.CloneExpr(extremePredicate.Body),
-              null,
+              SystemModuleManager.AxiomAttribute(),
               extremePredicate);
             extraMember = extremePredicate.PrefixPredicate;
           } else {
@@ -225,7 +247,7 @@ public void RegisterMembers(ModuleResolver resolver, Dictionary<string, MemberDe
             formals.AddRange(extremeLemma.Ins.ConvertAll(f => cloner.CloneFormal(f, false)));
             // prepend _k to the given decreases clause
             var decr = new List<Expression>();
-            decr.Add(new IdentifierExpr(extremeLemma.tok, k.Name));
+            decr.Add(new IdentifierExpr(extremeLemma.Origin, k.Name));
             decr.AddRange(extremeLemma.Decreases.Expressions.ConvertAll(cloner.CloneExpr));
             // Create prefix lemma.  Note that the body is not cloned, but simply shared.
             // For a greatest lemma, the postconditions are filled in after the greatest lemma's postconditions have been resolved.
@@ -236,19 +258,20 @@ public void RegisterMembers(ModuleResolver resolver, Dictionary<string, MemberDe
             var ens = extremeLemma is GreatestLemma
               ? new List<AttributedExpression>()
               : extremeLemma.Ens.ConvertAll(cloner.CloneAttributedExpr);
-            extremeLemma.PrefixLemma = new PrefixLemma(extremeLemma.RangeToken, extraName, extremeLemma.HasStaticKeyword,
+            extremeLemma.PrefixLemma = new PrefixLemma(extremeLemma.Origin, extraName, extremeLemma.HasStaticKeyword,
               extremeLemma.TypeArgs.ConvertAll(cloner.CloneTypeParam), k, formals, extremeLemma.Outs.ConvertAll(f => cloner.CloneFormal(f, false)),
-              req, cloner.CloneSpecFrameExpr(extremeLemma.Mod), ens,
+              req, cloner.CloneSpecFrameExpr(extremeLemma.Reads),
+              cloner.CloneSpecFrameExpr(extremeLemma.Mod), ens,
               new Specification<Expression>(decr, null),
               null, // Note, the body for the prefix method will be created once the call graph has been computed and the SCC for the greatest lemma is known
-              cloner.CloneAttributes(extremeLemma.Attributes), extremeLemma);
+              SystemModuleManager.AxiomAttribute(cloner.CloneAttributes(extremeLemma.Attributes)), extremeLemma);
             extraMember = extremeLemma.PrefixLemma;
           }
 
           extraMember.InheritVisibility(m, false);
           members.Add(extraName.Value, extraMember);
         } else if (m is Function f && f.ByMethodBody != null) {
-          ModuleResolver.RegisterByMethod(f, this);
+          resolver.RegisterByMethod(f, this);
         }
       } else if (m is Constructor && !((Constructor)m).HasName) {
         resolver.reporter.Error(MessageSource.Resolver, m, "More than one anonymous constructor");
@@ -258,8 +281,8 @@ public void RegisterMembers(ModuleResolver resolver, Dictionary<string, MemberDe
     }
   }
   public virtual IEnumerable<ISymbol> ChildSymbols => Members.OfType<ISymbol>();
-  public virtual DafnySymbolKind Kind => DafnySymbolKind.Class;
-  public virtual string GetDescription(DafnyOptions options) {
+  public override SymbolKind? Kind => SymbolKind.Class;
+  public override string GetDescription(DafnyOptions options) {
     return $"{WhatKind} {Name}";
   }
 }
diff --git a/Source/DafnyCore/AST/TypeDeclarations/TraitDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/TraitDecl.cs
index 6a99442fd16..2339e304b4a 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/TraitDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/TraitDecl.cs
@@ -25,9 +25,9 @@ internal void SetUpAsReferenceType(bool isReferenceType) {
   /// This constructor creates a TraitDecl object. However, before the object really functions as a TraitDecl, it is necessary
   /// to call SetUpAsReferenceType, which sets .NonNullTypeDecl (if necessary) and calls NewSelfSynonym().
   /// </summary>
-  public TraitDecl(RangeToken rangeToken, Name name, ModuleDefinition module,
+  public TraitDecl(IOrigin origin, Name name, ModuleDefinition module,
     List<TypeParameter> typeArgs, [Captured] List<MemberDecl> members, Attributes attributes, bool isRefining, List<Type> /*?*/ traits)
-    : base(rangeToken, name, module, typeArgs, members, attributes, isRefining, traits) {
+    : base(origin, name, module, typeArgs, members, attributes, isRefining, traits) {
   }
 
   public override IEnumerable<Assumption> Assumptions(Declaration decl) {
@@ -38,7 +38,7 @@ public override IEnumerable<Assumption> Assumptions(Declaration decl) {
     if (Attributes.Find(Attributes, "termination") is { } ta &&
         ta.Args.Count == 1 && Expression.IsBoolLiteral(ta.Args[0], out var termCheck) &&
         termCheck == false) {
-      yield return new Assumption(this, tok, AssumptionDescription.HasTerminationFalseAttribute);
+      yield return new Assumption(this, Origin, AssumptionDescription.HasTerminationFalseAttribute);
     }
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/TypeDeclarations/TupleTypeDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/TupleTypeDecl.cs
index e370a07ab71..3d28bb44f43 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/TupleTypeDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/TupleTypeDecl.cs
@@ -2,7 +2,6 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using JetBrains.Annotations;
-using Microsoft.Boogie;
 
 namespace Microsoft.Dafny;
 
@@ -35,11 +34,12 @@ public TupleTypeDecl(List<bool> argumentGhostness, ModuleDefinition systemModule
   }
 
   private TupleTypeDecl(ModuleDefinition systemModule, List<TypeParameter> typeArgs, List<bool> argumentGhostness, Attributes attributes)
-    : base(RangeToken.NoToken, new Name(SystemModuleManager.TupleTypeName(argumentGhostness)), systemModule, typeArgs,
+    : base(SourceOrigin.NoToken, new Name(SystemModuleManager.TupleTypeName(argumentGhostness)), systemModule, typeArgs,
       CreateConstructors(typeArgs, argumentGhostness),
       new List<Type>(), new List<MemberDecl>(), attributes, false) {
     Contract.Requires(systemModule != null);
     Contract.Requires(typeArgs != null);
+    Contract.Assert(Ctors.Count == 1);
     ArgumentGhostness = argumentGhostness;
     foreach (var ctor in Ctors) {
       ctor.EnclosingDatatype = this;  // resolve here
@@ -50,17 +50,24 @@ private TupleTypeDecl(ModuleDefinition systemModule, List<TypeParameter> typeArg
       }
     }
     this.EqualitySupport = argumentGhostness.Contains(true) ? ES.Never : ES.ConsultTypeArguments;
+
+    // Resolve parent type information - not currently possible for tuples to have any parent traits
+    ParentTypeInformation = new InheritanceInformationClass();
   }
   private static List<TypeParameter> CreateCovariantTypeParameters(int dims) {
     Contract.Requires(0 <= dims);
     var ts = new List<TypeParameter>();
     for (int i = 0; i < dims; i++) {
-      var tp = new TypeParameter(RangeToken.NoToken, new Name("T" + i), TypeParameter.TPVarianceSyntax.Covariant_Strict);
+      var tp = new TypeParameter(SourceOrigin.NoToken, new Name("T" + i), TypeParameter.TPVarianceSyntax.Covariant_Strict);
       tp.NecessaryForEqualitySupportOfSurroundingInductiveDatatype = true;
       ts.Add(tp);
     }
     return ts;
   }
+
+  /// <summary>
+  /// Creates the one and only constructor of the tuple type.
+  /// </summary>
   private static List<DatatypeCtor> CreateConstructors(List<TypeParameter> typeArgs, List<bool> argumentGhostness) {
     Contract.Requires(typeArgs != null);
     var formals = new List<Formal>();
@@ -80,7 +87,7 @@ private static List<DatatypeCtor> CreateConstructors(List<TypeParameter> typeArg
       formals.Add(f);
     }
     string ctorName = SystemModuleManager.TupleTypeCtorName(typeArgs.Count);
-    var ctor = new DatatypeCtor(RangeToken.NoToken, new Name(ctorName), false, formals, null);
+    var ctor = new DatatypeCtor(SourceOrigin.NoToken, new Name(ctorName), false, formals, null);
     return new List<DatatypeCtor>() { ctor };
   }
 
diff --git a/Source/DafnyCore/AST/TypeDeclarations/TypeDeclSynonymInfo.cs b/Source/DafnyCore/AST/TypeDeclarations/TypeDeclSynonymInfo.cs
index ec0bcf82e61..bd927624aec 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/TypeDeclSynonymInfo.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/TypeDeclSynonymInfo.cs
@@ -6,13 +6,13 @@ public class TypeDeclSynonymInfo {
   public readonly InternalTypeSynonymDecl SelfSynonymDecl;
 
   public TypeDeclSynonymInfo(TopLevelDecl d) {
-    var thisType = UserDefinedType.FromTopLevelDecl(d.Tok, d);
-    SelfSynonymDecl = new InternalTypeSynonymDecl(d.RangeToken, d.NameNode, TypeParameter.GetExplicitCharacteristics(d),
+    var thisType = UserDefinedType.FromTopLevelDecl(d.Origin, d);
+    SelfSynonymDecl = new InternalTypeSynonymDecl(d.Origin, d.NameNode, TypeParameter.GetExplicitCharacteristics(d),
       d.TypeArgs, d.EnclosingModuleDefinition, thisType, d.Attributes);
     SelfSynonymDecl.InheritVisibility(d, false);
   }
 
   public UserDefinedType SelfSynonym(List<Type> args, Expression /*?*/ namePath = null) {
-    return new UserDefinedType(SelfSynonymDecl.Tok, SelfSynonymDecl.Name, SelfSynonymDecl, args, namePath);
+    return new UserDefinedType(SelfSynonymDecl.Origin, SelfSynonymDecl.Name, SelfSynonymDecl, args, namePath);
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/TypeDeclarations/TypeSynonymDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/TypeSynonymDecl.cs
index 8d583888377..88fd0bf80b0 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/TypeSynonymDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/TypeSynonymDecl.cs
@@ -1,20 +1,31 @@
 using System.Collections.Generic;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
 public class TypeSynonymDecl : TypeSynonymDeclBase, RevealableTypeDecl {
-  public override string WhatKind { get { return "type synonym"; } }
-  public TypeSynonymDecl(RangeToken rangeToken, Name name, TypeParameter.TypeParameterCharacteristics characteristics, List<TypeParameter> typeArgs, ModuleDefinition module, Type rhs, Attributes attributes)
-    : base(rangeToken, name, characteristics, typeArgs, module, rhs, attributes) {
+  public override string WhatKind => "type synonym";
+
+  public TypeSynonymDecl(IOrigin origin, Name name, TypeParameter.TypeParameterCharacteristics characteristics, List<TypeParameter> typeArgs, ModuleDefinition module, Type rhs, Attributes attributes)
+    : base(origin, name, characteristics, typeArgs, module, rhs, attributes) {
     this.NewSelfSynonym();
   }
   public TopLevelDecl AsTopLevelDecl => this;
   public TypeDeclSynonymInfo SynonymInfo { get; set; }
+  public override SymbolKind? Kind => SymbolKind.Class;
+  public override string GetDescription(DafnyOptions options) {
+    return "type synonym";
+  }
 }
 
 public class InternalTypeSynonymDecl : TypeSynonymDeclBase {
   public override string WhatKind { get { return "export-provided type"; } }
-  public InternalTypeSynonymDecl(RangeToken rangeToken, Name name, TypeParameter.TypeParameterCharacteristics characteristics, List<TypeParameter> typeArgs, ModuleDefinition module, Type rhs, Attributes attributes)
-    : base(rangeToken, name, characteristics, typeArgs, module, rhs, attributes) {
+  public InternalTypeSynonymDecl(IOrigin origin, Name name, TypeParameter.TypeParameterCharacteristics characteristics, List<TypeParameter> typeArgs, ModuleDefinition module, Type rhs, Attributes attributes)
+    : base(origin, name, characteristics, typeArgs, module, rhs, attributes) {
+  }
+
+  public override SymbolKind? Kind => SymbolKind.Class;
+  public override string GetDescription(DafnyOptions options) {
+    return "type synonym";
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/TypeDeclarations/TypeSynonymDeclBase.cs b/Source/DafnyCore/AST/TypeDeclarations/TypeSynonymDeclBase.cs
index 4b911fe718a..306045b3b65 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/TypeSynonymDeclBase.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/TypeSynonymDeclBase.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
@@ -12,9 +13,9 @@ public bool SupportsEquality {
   }
   public readonly Type Rhs;
 
-  protected TypeSynonymDeclBase(RangeToken rangeToken, Name name, TypeParameter.TypeParameterCharacteristics characteristics, List<TypeParameter> typeArgs, ModuleDefinition module, Type rhs, Attributes attributes)
-    : base(rangeToken, name, module, typeArgs, attributes, false) {
-    Contract.Requires(rangeToken != null);
+  protected TypeSynonymDeclBase(IOrigin origin, Name name, TypeParameter.TypeParameterCharacteristics characteristics, List<TypeParameter> typeArgs, ModuleDefinition module, Type rhs, Attributes attributes)
+    : base(origin, name, module, typeArgs, attributes, false) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Contract.Requires(typeArgs != null);
     Contract.Requires(module != null);
@@ -59,23 +60,32 @@ public Type RhsWithArgumentIgnoringScope(List<Type> typeArgs) {
     Rhs != null ? new List<Node>() { Rhs } : Enumerable.Empty<Node>());
 
   string RedirectingTypeDecl.Name { get { return Name; } }
-  IToken RedirectingTypeDecl.tok { get { return tok; } }
+  IOrigin RedirectingTypeDecl.Tok { get { return Origin; } }
   Attributes RedirectingTypeDecl.Attributes { get { return Attributes; } }
   ModuleDefinition RedirectingTypeDecl.Module { get { return EnclosingModuleDefinition; } }
   BoundVar RedirectingTypeDecl.Var { get { return null; } }
+  PreType RedirectingTypeDecl.BasePreType { get { return null; } }
+  Type RedirectingTypeDecl.BaseType { get { return null; } }
   Expression RedirectingTypeDecl.Constraint { get { return null; } }
+
+  bool RedirectingTypeDecl.ConstraintIsCompilable {
+    get => throw new NotSupportedException();
+    set => throw new NotSupportedException();
+  }
+
   SubsetTypeDecl.WKind RedirectingTypeDecl.WitnessKind { get { return SubsetTypeDecl.WKind.CompiledZero; } }
   Expression RedirectingTypeDecl.Witness { get { return null; } }
-  FreshIdGenerator RedirectingTypeDecl.IdGenerator { get { return IdGenerator; } }
+  VerificationIdGenerator RedirectingTypeDecl.IdGenerator { get { return IdGenerator; } }
 
-  bool ICodeContext.IsGhost {
-    get { throw new NotSupportedException(); }  // if .IsGhost is needed, the object should always be wrapped in an CodeContextWrapper
-  }
-  List<TypeParameter> ICodeContext.TypeArgs { get { return TypeArgs; } }
-  List<Formal> ICodeContext.Ins { get { return new List<Formal>(); } }
+  public bool ContainsHide { get; set; }
+
+  bool ICodeContext.IsGhost => throw new NotSupportedException(); // if .IsGhost is needed, the object should always be wrapped in an CodeContextWrapper
+  List<TypeParameter> ICodeContext.TypeArgs => TypeArgs;
+  List<Formal> ICodeContext.Ins => new();
   ModuleDefinition IASTVisitorContext.EnclosingModule { get { return EnclosingModuleDefinition; } }
   bool ICodeContext.MustReverify { get { return false; } }
   bool ICodeContext.AllowsNontermination { get { return false; } }
+  CodeGenIdGenerator ICodeContext.CodeGenIdGenerator => CodeGenIdGenerator;
   string ICallable.NameRelativeToModule { get { return Name; } }
   Specification<Expression> ICallable.Decreases {
     get {
@@ -98,21 +108,26 @@ public override bool IsEssentiallyEmpty() {
   }
 
   public string GetTriviaContainingDocstring() {
-    IToken openingBlock = null;
-    foreach (var token in OwnedTokens) {
-      if (token.val == "{") {
-        openingBlock = token;
-      }
+    if (GetStartTriviaDocstring(out var triviaFound)) {
+      return triviaFound;
     }
 
-    if (openingBlock != null && openingBlock.Prev.TrailingTrivia.Trim() != "") {
-      return openingBlock.Prev.TrailingTrivia;
+    foreach (var token in OwnedTokens) {
+      if (token.val == "=") {
+        if ((token.Prev.TrailingTrivia + token.LeadingTrivia).Trim() is { } tentativeTrivia and not "") {
+          return tentativeTrivia;
+        }
+      }
     }
 
-    if (openingBlock == null && EndToken.TrailingTrivia.Trim() != "") {
-      return EndToken.TrailingTrivia;
+    if (EndToken.TrailingTrivia.Trim() is { } tentativeTrivia2 and not "") {
+      return tentativeTrivia2;
     }
 
-    return GetTriviaContainingDocstringFromStartTokenOrNull();
+    return null;
   }
+
+  public abstract override SymbolKind? Kind { get; }
+  public abstract override string GetDescription(DafnyOptions options);
+  public string Designator => WhatKind;
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/TypeDeclarations/ValuetypeDecl.cs b/Source/DafnyCore/AST/TypeDeclarations/ValuetypeDecl.cs
index fdce0dbaf1b..99417211c77 100644
--- a/Source/DafnyCore/AST/TypeDeclarations/ValuetypeDecl.cs
+++ b/Source/DafnyCore/AST/TypeDeclarations/ValuetypeDecl.cs
@@ -16,7 +16,7 @@ public class ValuetypeDecl : TopLevelDeclWithMembers {
   public override bool AcceptThis => true;
 
   public ValuetypeDecl(string name, ModuleDefinition module, Func<Type, bool> typeTester, Func<List<Type>, Type> typeCreator /*?*/)
-    : base(RangeToken.NoToken, new Name(name), module, new List<TypeParameter>(), new List<MemberDecl>(), null, false, null) {
+    : base(SourceOrigin.NoToken, new Name(name), module, new List<TypeParameter>(), new List<MemberDecl>(), null, false, null) {
     Contract.Requires(name != null);
     Contract.Requires(module != null);
     Contract.Requires(typeTester != null);
@@ -34,7 +34,7 @@ public ValuetypeDecl(string name, ModuleDefinition module, List<TypeParameter.TP
     if (typeParameterVariance != null) {
       for (int i = 0; i < typeParameterVariance.Count; i++) {
         var variance = typeParameterVariance[i];
-        var tp = new TypeParameter(RangeToken.NoToken, new Name(((char)('T' + i)).ToString()), variance) {
+        var tp = new TypeParameter(SourceOrigin.NoToken, new Name(((char)('T' + i)).ToString()), variance) {
           Parent = this,
           PositionalIndex = i
         };
@@ -45,7 +45,7 @@ public ValuetypeDecl(string name, ModuleDefinition module, List<TypeParameter.TP
 
   public ValuetypeDecl(string name, ModuleDefinition module, List<TypeParameter> typeParameters,
     List<MemberDecl> members, Attributes attributes, Func<Type, bool> typeTester, Func<List<Type>, Type> /*?*/ typeCreator)
-    : base(RangeToken.NoToken, new Name(name), module, typeParameters, members, attributes, false) {
+    : base(SourceOrigin.NoToken, new Name(name), module, typeParameters, members, attributes, false) {
     this.typeTester = typeTester;
     this.typeCreator = typeCreator;
   }
diff --git a/Source/DafnyCore/AST/Types/ArrowType.cs b/Source/DafnyCore/AST/Types/ArrowType.cs
index 364edf28540..27b3d767695 100644
--- a/Source/DafnyCore/AST/Types/ArrowType.cs
+++ b/Source/DafnyCore/AST/Types/ArrowType.cs
@@ -10,6 +10,14 @@ public List<Type> Args {
     get { return TypeArgs.GetRange(0, Arity); }
   }
 
+  public List<TypeParameter.TPVariance> Variances(bool negate = false) {
+    if (negate) {
+      return Enumerable.Range(0, Arity + 1).Select(i => i == Arity ? TypeParameter.TPVariance.Contra : TypeParameter.TPVariance.Co).ToList();
+    } else {
+      return Enumerable.Range(0, Arity + 1).Select(i => i == Arity ? TypeParameter.TPVariance.Co : TypeParameter.TPVariance.Contra).ToList();
+    }
+  }
+
   public Type Result {
     get { return TypeArgs[Arity]; }
   }
@@ -21,18 +29,18 @@ public int Arity {
   /// <summary>
   /// Constructs a(n unresolved) arrow type.
   /// </summary>
-  public ArrowType(IToken tok, List<Type> args, Type result)
-    : base(tok, ArrowTypeName(args.Count), Util.Snoc(args, result)) {
-    Contract.Requires(tok != null);
+  public ArrowType(IOrigin origin, List<Type> args, Type result)
+    : base(origin, ArrowTypeName(args.Count), Util.Snoc(args, result)) {
+    Contract.Requires(origin != null);
     Contract.Requires(args != null);
     Contract.Requires(result != null);
   }
   /// <summary>
   /// Constructs and returns a resolved arrow type.
   /// </summary>
-  public ArrowType(IToken tok, ArrowTypeDecl atd, List<Type> typeArgsAndResult)
-    : base(tok, ArrowTypeName(atd.Arity), atd, typeArgsAndResult) {
-    Contract.Requires(tok != null);
+  public ArrowType(IOrigin origin, ArrowTypeDecl atd, List<Type> typeArgsAndResult)
+    : base(origin, ArrowTypeName(atd.Arity), atd, typeArgsAndResult) {
+    Contract.Requires(origin != null);
     Contract.Requires(atd != null);
     Contract.Requires(typeArgsAndResult != null);
     Contract.Requires(typeArgsAndResult.Count == atd.Arity + 1);
@@ -40,9 +48,9 @@ public ArrowType(IToken tok, ArrowTypeDecl atd, List<Type> typeArgsAndResult)
   /// <summary>
   /// Constructs and returns a resolved arrow type.
   /// </summary>
-  public ArrowType(IToken tok, ArrowTypeDecl atd, List<Type> typeArgs, Type result)
-    : this(tok, atd, Util.Snoc(typeArgs, result)) {
-    Contract.Requires(tok != null);
+  public ArrowType(IOrigin origin, ArrowTypeDecl atd, List<Type> typeArgs, Type result)
+    : this(origin, atd, Util.Snoc(typeArgs, result)) {
+    Contract.Requires(origin != null);
     Contract.Requires(atd != null);
     Contract.Requires(typeArgs != null);
     Contract.Requires(typeArgs.Count == atd.Arity);
@@ -125,11 +133,11 @@ public static string PrettyArrowTypeName(DafnyOptions options, string arrow, Lis
   }
 
   public override Type Subst(IDictionary<TypeParameter, Type> subst) {
-    return new ArrowType(tok, (ArrowTypeDecl)ResolvedClass, Args.ConvertAll(u => u.Subst(subst)), Result.Subst(subst));
+    return new ArrowType(Origin, (ArrowTypeDecl)ResolvedClass, Args.ConvertAll(u => u.Subst(subst)), Result.Subst(subst));
   }
 
   public override Type ReplaceTypeArguments(List<Type> arguments) {
-    return new ArrowType(tok, (ArrowTypeDecl)ResolvedClass, arguments);
+    return new ArrowType(Origin, (ArrowTypeDecl)ResolvedClass, arguments);
   }
 
   public override bool SupportsEquality {
diff --git a/Source/DafnyCore/AST/Types/MapType.cs b/Source/DafnyCore/AST/Types/MapType.cs
new file mode 100644
index 00000000000..062bb0ffacf
--- /dev/null
+++ b/Source/DafnyCore/AST/Types/MapType.cs
@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+public class MapType : CollectionType {
+  public bool Finite {
+    get { return finite; }
+    set { finite = value; }
+  }
+  private bool finite;
+  public Type Range {
+    get { return range; }
+  }
+  private Type range;
+  public override void SetTypeArgs(Type domain, Type range) {
+    base.SetTypeArgs(domain, range);
+    Contract.Assume(this.range == null);  // Can only set once.  This is really a precondition.
+    this.range = range;
+  }
+  public MapType(bool finite, Type domain, Type range) : base(domain, range) {
+    Contract.Requires((domain == null && range == null) || (domain != null && range != null));
+    this.finite = finite;
+    this.range = range;
+  }
+
+  public MapType(Cloner cloner, MapType original) : base(cloner, original) {
+    Finite = original.Finite;
+    range = cloner.CloneType(original.Range);
+    var arg = HasTypeArg() ? Arg : null;
+    TypeArgs = new List<Type>() { arg, range };
+  }
+
+  public Type Domain {
+    get { return Arg; }
+  }
+  public override string CollectionTypeName { get { return finite ? "map" : "imap"; } }
+  [System.Diagnostics.Contracts.Pure]
+  public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
+    Contract.Ensures(Contract.Result<string>() != null);
+    var targs = HasTypeArg() ? this.TypeArgsToString(options, context, parseAble) : "";
+    return CollectionTypeName + targs;
+  }
+  public override bool Equals(Type that, bool keepConstraints = false) {
+    var t = that.NormalizeExpand(keepConstraints) as MapType;
+    return t != null && Finite == t.Finite && Arg.Equals(t.Arg, keepConstraints) && Range.Equals(t.Range, keepConstraints);
+  }
+
+  public override Type Subst(IDictionary<TypeParameter, Type> subst) {
+    var dom = Domain.Subst(subst);
+    if (dom is InferredTypeProxy) {
+      ((InferredTypeProxy)dom).KeepConstraints = true;
+    }
+    var ran = Range.Subst(subst);
+    if (ran is InferredTypeProxy) {
+      ((InferredTypeProxy)ran).KeepConstraints = true;
+    }
+    if (dom == Domain && ran == Range) {
+      return this;
+    } else {
+      return new MapType(Finite, dom, ran);
+    }
+  }
+
+  public override Type ReplaceTypeArguments(List<Type> arguments) {
+    return new MapType(Finite, arguments[0], arguments[1]);
+  }
+
+  public override bool SupportsEquality {
+    get {
+      // A map type supports equality if both its Keys type and Values type does.  It is checked
+      // that the Keys type always supports equality, so we only need to check the Values type here.
+      return range.SupportsEquality;
+    }
+  }
+  public override bool ComputeMayInvolveReferences(ISet<DatatypeDecl> visitedDatatypes) {
+    return Domain.ComputeMayInvolveReferences(visitedDatatypes) || Range.ComputeMayInvolveReferences(visitedDatatypes);
+  }
+
+  public override BinaryExpr.ResolvedOpcode ResolvedOpcodeForIn => BinaryExpr.ResolvedOpcode.InMap;
+  public override CollectionBoundedPool GetBoundedPool(Expression source) {
+    return new MapBoundedPool(source, Domain, Domain, Finite);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Types/TypeParameter.cs b/Source/DafnyCore/AST/Types/TypeParameter.cs
index 0f18c9d0d6c..c3aad802008 100644
--- a/Source/DafnyCore/AST/Types/TypeParameter.cs
+++ b/Source/DafnyCore/AST/Types/TypeParameter.cs
@@ -1,15 +1,19 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
 public class TypeParameter : TopLevelDecl {
   public interface ParentType {
     string FullName { get; }
+    IOrigin Origin { get; }
   }
 
   public override string WhatKind => "type parameter";
 
+  public bool IsAutoCompleted => Name.StartsWith("_");
+
   ParentType parent;
   public ParentType Parent {
     get {
@@ -112,9 +116,17 @@ public bool StrictVariance {
     }
   }
 
+  public static List<TPVariance> Variances(List<TypeParameter> typeParameters, bool negate = false) {
+    if (negate) {
+      return typeParameters.ConvertAll(tp => Negate(tp.Variance));
+    } else {
+      return typeParameters.ConvertAll(tp => tp.Variance);
+    }
+  }
+
   public enum EqualitySupportValue { Required, InferredRequired, Unspecified }
   public struct TypeParameterCharacteristics {
-    public RangeToken RangeToken = null;
+    public SourceOrigin SourceOrigin = null;
     public EqualitySupportValue EqualitySupport;  // the resolver may change this value from Unspecified to InferredRequired (for some signatures that may immediately imply that equality support is required)
     public Type.AutoInitInfo AutoInit;
     public bool HasCompiledValue => AutoInit == Type.AutoInitInfo.CompilableValue;
@@ -162,26 +174,51 @@ public bool SupportsEquality {
   }
   public int PositionalIndex; // which type parameter this is (ie. in C<S, T, U>, S is 0, T is 1 and U is 2).
 
-  public TypeParameter(RangeToken rangeToken, Name name, TPVarianceSyntax varianceS, TypeParameterCharacteristics characteristics)
-    : base(rangeToken, name, null, new List<TypeParameter>(), null, false) {
-    Contract.Requires(rangeToken != null);
+  public readonly List<Type> TypeBounds;
+
+  public IEnumerable<TopLevelDecl> TypeBoundHeads {
+    get {
+      foreach (var typeBound in TypeBounds) {
+        if (typeBound is UserDefinedType { ResolvedClass: { } parentDecl }) {
+          yield return parentDecl;
+        }
+      }
+    }
+  }
+
+  public TypeParameter(IOrigin origin, Name name, TPVarianceSyntax varianceS, TypeParameterCharacteristics characteristics,
+    List<Type> typeBounds)
+    : base(origin, name, null, new List<TypeParameter>(), null, false) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
     Characteristics = characteristics;
     VarianceSyntax = varianceS;
+    TypeBounds = typeBounds;
   }
 
-  public TypeParameter(RangeToken rangeToken, Name name, TPVarianceSyntax varianceS)
-    : this(rangeToken, name, varianceS, new TypeParameterCharacteristics(false)) {
-    Contract.Requires(rangeToken != null);
+  public TypeParameter(IOrigin origin, Name name, TPVarianceSyntax varianceS)
+    : this(origin, name, varianceS, new TypeParameterCharacteristics(false), new List<Type>()) {
+    Contract.Requires(origin != null);
     Contract.Requires(name != null);
   }
 
-  public TypeParameter(RangeToken tok, Name name, int positionalIndex, ParentType parent)
+  public TypeParameter(IOrigin tok, Name name, int positionalIndex, ParentType parent)
     : this(tok, name, TPVarianceSyntax.NonVariant_Strict) {
     PositionalIndex = positionalIndex;
     Parent = parent;
   }
 
+  /// <summary>
+  /// Return a list of unresolved clones of the type parameters in "typeParameters".
+  /// </summary>
+  public static List<TypeParameter> CloneTypeParameters(List<TypeParameter> typeParameters) {
+    var cloner = new Cloner();
+    return typeParameters.ConvertAll(tp => {
+      var typeBounds = tp.TypeBounds.ConvertAll(cloner.CloneType);
+      return new TypeParameter(tp.Origin, tp.NameNode, tp.VarianceSyntax, tp.Characteristics, typeBounds);
+    });
+  }
+
   public override string FullName {
     get {
       // when debugging, print it all:
@@ -189,6 +226,11 @@ public override string FullName {
     }
   }
 
+  public override SymbolKind? Kind => SymbolKind.TypeParameter;
+  public override string GetDescription(DafnyOptions options) {
+    return null; // TODO test the effect of this
+  }
+
   public static TypeParameterCharacteristics GetExplicitCharacteristics(TopLevelDecl d) {
     Contract.Requires(d != null);
     TypeParameterCharacteristics characteristics = new TypeParameterCharacteristics(false);
@@ -217,4 +259,7 @@ public static Dictionary<TypeParameter, Type> SubstitutionMap(List<TypeParameter
     return subst;
   }
 
+  public override List<Type> ParentTypes(List<Type> typeArgs, bool includeTypeBounds) {
+    return includeTypeBounds ? TypeBounds : new List<Type>();
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/AST/Types/Types.cs b/Source/DafnyCore/AST/Types/Types.cs
index 04c2d809798..b6c76c5fc53 100644
--- a/Source/DafnyCore/AST/Types/Types.cs
+++ b/Source/DafnyCore/AST/Types/Types.cs
@@ -1,22 +1,34 @@
 #define TI_DEBUG_PRINT
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Threading;
-using JetBrains.Annotations;
 
 namespace Microsoft.Dafny;
 
-public abstract class Type : TokenNode {
+public abstract class Type : NodeWithComputedRange {
   public static readonly BoolType Bool = new BoolType();
   public static readonly CharType Char = new CharType();
   public static readonly IntType Int = new IntType();
   public static readonly RealType Real = new RealType();
+
+  protected Type(IOrigin origin = null) : base(origin) {
+  }
+
+  protected Type(Cloner cloner, Type original) : base(cloner, original) {
+  }
+
   public override IEnumerable<INode> Children => TypeArgs;
   public override IEnumerable<INode> PreResolveChildren => TypeArgs.OfType<Node>();
   public static Type Nat() { return new UserDefinedType(Token.NoToken, "nat", null); }  // note, this returns an unresolved type
   public static Type String() { return new UserDefinedType(Token.NoToken, "string", null); }  // note, this returns an unresolved type
+
+  public static Type ResolvedString() {
+    return new SeqType(new CharType());
+  }
+
   public static readonly BigOrdinalType BigOrdinal = new BigOrdinalType();
 
   private static ThreadLocal<List<VisibilityScope>> _scopes = new();
@@ -95,8 +107,7 @@ public string TypeArgsToString(DafnyOptions options, ModuleDefinition/*?*/ conte
   public void AddFreeTypeParameters(ISet<TypeParameter> tps) {
     Contract.Requires(tps != null);
     var ty = this.NormalizeExpandKeepConstraints();
-    var tp = ty.AsTypeParameter;
-    if (tp != null) {
+    if (ty.AsTypeParameter is { } tp) {
       tps.Add(tp);
     }
     foreach (var ta in ty.TypeArgs) {
@@ -135,29 +146,83 @@ public Type Normalize() {
     Contract.Ensures(Contract.Result<Type>() != null);
     Type type = this;
     while (true) {
-      var pt = type as TypeProxy;
-      if (pt != null && pt.T != null) {
-        type = pt.T;
+      if (type is TypeProxy { T: { } proxyTarget }) {
+        type = proxyTarget;
       } else {
         return type;
       }
     }
   }
 
+  /// <summary>
+  /// Return the type that "this" stands for, getting to the bottom of proxies, and then using an InternalTypeSynonym if
+  /// the type is not in scope.
+  ///
+  /// For more documentation, see method Normalize().
+  /// </summary>
+  [System.Diagnostics.Contracts.Pure]
+  public Type NormalizeAndAdjustForScope() {
+    return NormalizeExpand(ExpandMode.DontExpandJustAdjustForScopes);
+  }
+
+  /// <summary>
+  /// Call NormalizeExpand() repeatedly, also on the base type of newtype's.
+  /// </summary>
+  public Type NormalizeToAncestorType() {
+    Type result = this;
+    while (true) {
+      result = result.NormalizeExpand();
+      if (result.AsNewtype is { } newtypeDecl) {
+        result = newtypeDecl.ConcreteBaseType(result.TypeArgs);
+      } else {
+        return result;
+      }
+    }
+  }
+
+  /// <summary>
+  /// Return the type that "this" stands for, getting to the bottom of proxies and following type synonyms, but does
+  /// not follow subset types.
+  ///
+  /// For more documentation, see method Normalize().
+  /// </summary>
+  [System.Diagnostics.Contracts.Pure]
+  public Type NormalizeExpandKeepConstraints() {
+    return NormalizeExpand(ExpandMode.ExpandSynonymsOnly);
+  }
+
+  public Type NormalizeExpand(bool keepConstraints) {
+    return NormalizeExpand(keepConstraints ? ExpandMode.ExpandSynonymsOnly : ExpandMode.ExpandSynonymsAndSubsetTypes);
+  }
+
+  public enum ExpandMode {
+    DontExpandJustAdjustForScopes,
+    ExpandSynonymsOnly,
+    ExpandSynonymsAndSubsetTypes
+  }
+
+  public NativeType AsNativeType() {
+    if (AsNewtype != null) {
+      return AsNewtype.NativeType;
+    } else if (IsBitVectorType) {
+      return AsBitVectorType.NativeType;
+    }
+    return null;
+  }
+
   /// <summary>
   /// Return the type that "this" stands for, getting to the bottom of proxies and following type synonyms.
   ///
   /// For more documentation, see method Normalize().
   /// </summary>
   [System.Diagnostics.Contracts.Pure]
-  public Type NormalizeExpand(bool keepConstraints = false) {
+  public Type NormalizeExpand(ExpandMode expandMode = ExpandMode.ExpandSynonymsAndSubsetTypes) {
     Contract.Ensures(Contract.Result<Type>() != null);
     Contract.Ensures(!(Contract.Result<Type>() is TypeProxy) || ((TypeProxy)Contract.Result<Type>()).T == null);  // return a proxy only if .T == null
+
     Type type = this;
     while (true) {
-
-      var pt = type as TypeProxy;
-      if (pt != null && pt.T != null) {
+      if (type is TypeProxy { T: not null } pt) {
         type = pt.T;
         continue;
       }
@@ -179,12 +244,13 @@ public Type NormalizeExpand(bool keepConstraints = false) {
         }
 
         if (rtd.IsRevealedInScope(scope)) {
-          if (rtd is TypeSynonymDecl && (!(rtd is SubsetTypeDecl) || !keepConstraints)) {
-            type = ((TypeSynonymDecl)rtd).RhsWithArgumentIgnoringScope(udt.TypeArgs);
-            continue;
-          } else {
-            return type;
+          if (expandMode != ExpandMode.DontExpandJustAdjustForScopes && rtd is TypeSynonymDecl typeSynonymDecl) {
+            if (typeSynonymDecl is not SubsetTypeDecl || expandMode == ExpandMode.ExpandSynonymsAndSubsetTypes) {
+              type = typeSynonymDecl.RhsWithArgumentIgnoringScope(udt.TypeArgs);
+              continue;
+            }
           }
+          return type;
         } else { // type is hidden, no more normalization is possible
           return rtd.SelfSynonym(type.TypeArgs);
         }
@@ -201,7 +267,7 @@ public Type NormalizeExpand(bool keepConstraints = false) {
           var rhs = isyn.RhsWithArgumentIgnoringScope(udt.TypeArgs);
           Contract.Assert(rhs is UserDefinedType);
           var cl = ((UserDefinedType)rhs).ResolvedClass as ClassLikeDecl;
-          Contract.Assert(cl != null && cl.NonNullTypeDecl != null);
+          Contract.Assert(cl != null && cl.NonNullTypeDecl != null, rhs.ToString());
           Contract.Assert(cl.NonNullTypeDecl.IsVisibleInScope(scope));
         }
 
@@ -217,17 +283,6 @@ public Type NormalizeExpand(bool keepConstraints = false) {
     }
   }
 
-  /// <summary>
-  /// Return the type that "this" stands for, getting to the bottom of proxies and following type synonyms, but does
-  /// not follow subset types.
-  ///
-  /// For more documentation, see method Normalize().
-  /// </summary>
-  [System.Diagnostics.Contracts.Pure]
-  public Type NormalizeExpandKeepConstraints() {
-    return NormalizeExpand(true);
-  }
-
   /// <summary>
   /// Return "the type that "this" stands for, getting to the bottom of proxies and following type synonyms.
   /// </summary>
@@ -271,17 +326,18 @@ public Type UseInternalSynonym() {
   [System.Diagnostics.Contracts.Pure]
   public abstract bool Equals(Type that, bool keepConstraints = false);
 
-  public bool IsBoolType { get { return NormalizeExpand() is BoolType; } }
-  public bool IsCharType { get { return NormalizeExpand() is CharType; } }
-  public bool IsIntegerType { get { return NormalizeExpand() is IntType; } }
-  public bool IsRealType { get { return NormalizeExpand() is RealType; } }
-  public bool IsBigOrdinalType { get { return NormalizeExpand() is BigOrdinalType; } }
-  public bool IsBitVectorType { get { return AsBitVectorType != null; } }
-  public bool IsStringType { get { return AsSeqType?.Arg.IsCharType == true; } }
-  public BitvectorType AsBitVectorType { get { return NormalizeExpand() as BitvectorType; } }
+  public bool IsBoolType => NormalizeExpand() is BoolType;
+  public bool IsCharType => NormalizeExpand() is CharType;
+  public bool IsIntegerType => NormalizeExpand() is IntType;
+  public bool IsRealType => NormalizeExpand() is RealType;
+  public bool IsBigOrdinalType => NormalizeExpand() is BigOrdinalType;
+  public bool IsBitVectorType => AsBitVectorType != null;
+  public bool IsStringType => AsSeqType?.Arg.IsCharType == true;
+  public BitvectorType AsBitVectorType => NormalizeExpand() as BitvectorType;
+
   public bool IsNumericBased() {
     var t = NormalizeExpand();
-    return t.IsIntegerType || t.IsRealType || t.AsNewtype != null;
+    return t.IsIntegerType || t.IsRealType || t.AsNewtype?.BaseType.IsNumericBased() == true;
   }
   public enum NumericPersuasion { Int, Real }
   [System.Diagnostics.Contracts.Pure]
@@ -294,11 +350,10 @@ public bool IsNumericBased(NumericPersuasion p) {
       } else if (t.IsRealType) {
         return p == NumericPersuasion.Real;
       }
-      var d = t.AsNewtype;
-      if (d == null) {
+      if (t.AsNewtype is not { } newtypeDecl) {
         return false;
       }
-      t = d.BaseType;
+      t = newtypeDecl.RhsWithArgument(t.TypeArgs);
     }
   }
 
@@ -330,6 +385,10 @@ public bool KnownToHaveToAValue(bool ghostContext) {
 
   public enum AutoInitInfo { MaybeEmpty, Nonempty, CompilableValue }
 
+  public bool HavocCountsAsDefiniteAssignment(bool inGhostContext) {
+    return inGhostContext ? IsNonempty : HasCompilableValue;
+  }
+
   /// <summary>
   /// This property returns
   ///     - CompilableValue, if the type has a known compilable value
@@ -553,15 +612,13 @@ public UserDefinedType AsNonNullRefType {
     get {
       var t = this;
       while (true) {
-        var udt = t.NormalizeExpandKeepConstraints() as UserDefinedType;
-        if (udt == null) {
+        if (t.NormalizeExpandKeepConstraints() is not UserDefinedType udt) {
           return null;
         }
         if (udt.ResolvedClass is NonNullTypeDecl) {
           return udt;
         }
-        var sst = udt.ResolvedClass as SubsetTypeDecl;
-        if (sst != null) {
+        if (udt.ResolvedClass is SubsetTypeDecl sst) {
           t = sst.RhsWithArgument(udt.TypeArgs);  // continue the search up the chain of subset types
         } else {
           return null;
@@ -578,7 +635,7 @@ public UserDefinedType AsParentType(TopLevelDecl parent) {
 
     var udt = (UserDefinedType)NormalizeExpand();
     if (udt.ResolvedClass is InternalTypeSynonymDecl isyn) {
-      udt = isyn.RhsWithArgumentIgnoringScope(udt.TypeArgs) as UserDefinedType;
+      udt = (UserDefinedType)isyn.RhsWithArgumentIgnoringScope(udt.TypeArgs);
     }
     TopLevelDeclWithMembers cl;
     if (udt.ResolvedClass is NonNullTypeDecl nntd) {
@@ -592,13 +649,10 @@ public UserDefinedType AsParentType(TopLevelDecl parent) {
     var typeMapParents = cl.ParentFormalTypeParametersToActuals;
     var typeMapUdt = TypeParameter.SubstitutionMap(cl.TypeArgs, udt.TypeArgs);
     var typeArgs = parent.TypeArgs.ConvertAll(tp => typeMapParents[tp].Subst(typeMapUdt));
-    return new UserDefinedType(udt.tok, parent.Name, parent, typeArgs);
-  }
-  public bool IsTraitType {
-    get {
-      return AsTraitType != null;
-    }
+    return new UserDefinedType(udt.Origin, parent.Name, parent, typeArgs);
   }
+
+  public bool IsTraitType => AsTraitType != null;
   public TraitDecl/*?*/ AsTraitType {
     get {
       var udt = NormalizeExpand() as UserDefinedType;
@@ -681,58 +735,32 @@ public bool IsArrowTypeWithoutPreconditions {
       }
     }
   }
-  public bool IsArrowType {
-    get { return AsArrowType != null; }
-  }
-  public ArrowType AsArrowType {
-    get {
-      var t = NormalizeExpand();
-      return t as ArrowType;
-    }
-  }
+  public bool IsArrowType => AsArrowType != null;
+
+  public ArrowType AsArrowType => NormalizeExpand() as ArrowType;
+
+  public bool IsMapType => NormalizeExpand() is MapType { Finite: true };
+
+  public bool IsIMapType => NormalizeExpand() is MapType { Finite: false };
+
+  public bool IsISetType => NormalizeExpand() is SetType { Finite: false };
 
-  public bool IsMapType {
-    get {
-      var t = NormalizeExpand() as MapType;
-      return t != null && t.Finite;
-    }
-  }
-  public bool IsIMapType {
-    get {
-      var t = NormalizeExpand() as MapType;
-      return t != null && !t.Finite;
-    }
-  }
-  public bool IsISetType {
-    get {
-      var t = NormalizeExpand() as SetType;
-      return t != null && !t.Finite;
-    }
-  }
   public NewtypeDecl AsNewtype {
     get {
       var udt = NormalizeExpand() as UserDefinedType;
-      return udt == null ? null : udt.ResolvedClass as NewtypeDecl;
+      return udt?.ResolvedClass as NewtypeDecl;
     }
   }
   public TypeSynonymDecl AsTypeSynonym {
     get {
       var udt = this as UserDefinedType;  // note, it is important to use 'this' here, not 'this.NormalizeExpand()'
-      if (udt == null) {
-        return null;
-      } else {
-        return udt.ResolvedClass as TypeSynonymDecl;
-      }
+      return udt?.ResolvedClass as TypeSynonymDecl;
     }
   }
   public InternalTypeSynonymDecl AsInternalTypeSynonym {
     get {
       var udt = this as UserDefinedType;  // note, it is important to use 'this' here, not 'this.NormalizeExpand()'
-      if (udt == null) {
-        return null;
-      } else {
-        return udt.ResolvedClass as InternalTypeSynonymDecl;
-      }
+      return udt?.ResolvedClass as InternalTypeSynonymDecl;
     }
   }
   public RedirectingTypeDecl AsRedirectingType {
@@ -748,59 +776,33 @@ public RedirectingTypeDecl AsRedirectingType {
   public RevealableTypeDecl AsRevealableType {
     get {
       var udt = this as UserDefinedType;
-      if (udt == null) {
-        return null;
-      } else {
-        return (udt.ResolvedClass as RevealableTypeDecl);
-      }
-    }
-  }
-  public bool IsRevealableType {
-    get { return AsRevealableType != null; }
-  }
-  public bool IsDatatype {
-    get {
-      return AsDatatype != null;
+      return udt?.ResolvedClass as RevealableTypeDecl;
     }
   }
+  public bool IsRevealableType => AsRevealableType != null;
+
+  public bool IsDatatype => AsDatatype != null;
+
   public DatatypeDecl AsDatatype {
     get {
       var udt = NormalizeExpand() as UserDefinedType;
-      if (udt == null) {
-        return null;
-      } else {
-        return udt.ResolvedClass as DatatypeDecl;
-      }
-    }
-  }
-  public bool IsIndDatatype {
-    get {
-      return AsIndDatatype != null;
+      return udt?.ResolvedClass as DatatypeDecl;
     }
   }
+  public bool IsIndDatatype => AsIndDatatype != null;
+
   public IndDatatypeDecl AsIndDatatype {
     get {
       var udt = NormalizeExpand() as UserDefinedType;
-      if (udt == null) {
-        return null;
-      } else {
-        return udt.ResolvedClass as IndDatatypeDecl;
-      }
-    }
-  }
-  public bool IsCoDatatype {
-    get {
-      return AsCoDatatype != null;
+      return udt?.ResolvedClass as IndDatatypeDecl;
     }
   }
+  public bool IsCoDatatype => AsCoDatatype != null;
+
   public CoDatatypeDecl AsCoDatatype {
     get {
       var udt = NormalizeExpand() as UserDefinedType;
-      if (udt == null) {
-        return null;
-      } else {
-        return udt.ResolvedClass as CoDatatypeDecl;
-      }
+      return udt?.ResolvedClass as CoDatatypeDecl;
     }
   }
   public bool InvolvesCoDatatype {
@@ -808,23 +810,18 @@ public bool InvolvesCoDatatype {
       return IsCoDatatype;  // TODO: should really check structure of the type recursively
     }
   }
-  public bool IsTypeParameter {
-    get {
-      return AsTypeParameter != null;
-    }
-  }
-  public bool IsInternalTypeSynonym {
-    get { return AsInternalTypeSynonym != null; }
-  }
+  public bool IsTypeParameter => AsTypeParameter != null;
+
+  public bool IsInternalTypeSynonym => AsInternalTypeSynonym != null;
+
   public TypeParameter AsTypeParameter {
     get {
       var ct = NormalizeExpandKeepConstraints() as UserDefinedType;
       return ct?.ResolvedClass as TypeParameter;
     }
   }
-  public bool IsAbstractType {
-    get { return AsAbstractType != null; }
-  }
+  public bool IsAbstractType => AsAbstractType != null;
+
   public AbstractTypeDecl AsAbstractType {
     get {
       var udt = this.Normalize() as UserDefinedType;  // note, it is important to use 'this.Normalize()' here, not 'this.NormalizeExpand()'
@@ -885,45 +882,6 @@ public bool IsOrdered {
     }
   }
 
-  /// <summary>
-  /// Returns "true" if:  Given a value of type "this", can we determine at run time if the
-  /// value is a member of type "target"?
-  /// </summary>
-  public bool IsTestableToBe(Type target) {
-    Contract.Requires(target != null);
-
-    // First up, we know how to check for null, so let's expand "target" and "source"
-    // past any type synonyms and also past any (built-in) non-null constraint.
-    var source = this.NormalizeExpandKeepConstraints();
-    if (source is UserDefinedType && ((UserDefinedType)source).ResolvedClass is NonNullTypeDecl) {
-      source = source.NormalizeExpand(); // also lop off non-null constraint
-    }
-    target = target.NormalizeExpandKeepConstraints();
-    if (target is UserDefinedType && ((UserDefinedType)target).ResolvedClass is NonNullTypeDecl) {
-      target = target.NormalizeExpand(); // also lop off non-null constraint
-    }
-
-    if (source.IsSubtypeOf(target, false, true)) {
-      // Every value of "source" (except possibly "null") is also a member of type "target",
-      // so no run-time test is needed (except possibly a null check).
-      return true;
-#if SOON  // include in a coming PR that sorts this one in the compilers
-      } else if (target is UserDefinedType udt && (udt.ResolvedClass is SubsetTypeDecl || udt.ResolvedClass is NewtypeDecl)) {
-        // The type of the bound variable has a constraint. Such a constraint is a ghost expression, so it cannot
-        // (in general) by checked at run time. (A possible enhancement here would be to look at the type constraint
-        // to if it is compilable after all.)
-        var constraints = target.GetTypeConstraints();
-        return false;
-#endif
-    } else if (target.TypeArgs.Count == 0) {
-      // No type parameters. So, we just need to check the run-time class/interface type.
-      return true;
-    } else {
-      // We give up.
-      return false;
-    }
-  }
-
   /// <summary>
   /// Returns "true" iff "sub" is a subtype of "super".
   /// Expects that neither "super" nor "sub" is an unresolved proxy.
@@ -1129,14 +1087,17 @@ public static bool IsHeadSupertypeOf(Type super, Type sub) {
   /// <summary>
   /// Returns "true" iff "a" and "b" denote the same type, expanding type synonyms (but treating types with
   /// constraints as being separate types).
-  /// Expects that neither "a" nor "b" is or contains an unresolved proxy type.
+  /// Any unresolved proxy type contained in either "a" or "b" is compared with reference equality; in other
+  /// words, the proxy itself is compared, not what the proxy will eventually stand for.
   /// </summary>
   public static bool Equal_Improved(Type a, Type b) {
     Contract.Requires(a != null);
     Contract.Requires(b != null);
     a = a.NormalizeExpandKeepConstraints();  // expand type synonyms
     b = b.NormalizeExpandKeepConstraints();  // expand type synonyms
-    if (a is BoolType) {
+    if (object.ReferenceEquals(a, b)) {
+      return true;
+    } else if (a is BoolType) {
       return b is BoolType;
     } else if (a is CharType) {
       return b is CharType;
@@ -1184,10 +1145,10 @@ public static bool Equal_Improved(Type a, Type b) {
           return true;
         }
       }
-    } else if (a is Resolver_IdentifierExpr.ResolverType_Module) {
-      return b is Resolver_IdentifierExpr.ResolverType_Module;
-    } else if (a is Resolver_IdentifierExpr.ResolverType_Type) {
-      return b is Resolver_IdentifierExpr.ResolverType_Type;
+    } else if (a is ResolverIdentifierExpr.ResolverTypeModule) {
+      return b is ResolverIdentifierExpr.ResolverTypeModule;
+    } else if (a is ResolverIdentifierExpr.ResolverTypeType) {
+      return b is ResolverIdentifierExpr.ResolverTypeType;
     } else {
       // this is an unexpected type; however, it may be that we get here during the resolution of an erroneous
       // program, so we'll just return false
@@ -1213,16 +1174,18 @@ public static Type HeadWithProxyArgs(Type t) {
     } else if (t is ArrowType) {
       var s = (ArrowType)t;
       var args = s.TypeArgs.ConvertAll(_ => (Type)new InferredTypeProxy());
-      return new ArrowType(s.tok, (ArrowTypeDecl)s.ResolvedClass, args);
+      return new ArrowType(s.Origin, (ArrowTypeDecl)s.ResolvedClass, args);
     } else {
       var s = (UserDefinedType)t;
       var args = s.TypeArgs.ConvertAll(_ => (Type)new InferredTypeProxy());
-      return new UserDefinedType(s.tok, s.Name, s.ResolvedClass, args);
+      return new UserDefinedType(s.Origin, s.Name, s.ResolvedClass, args);
     }
   }
 
   /// <summary>
-  /// Returns a stack of base types leading to "type".  More precisely, of the tower returned,
+  /// Returns a stack of base types leading to "type".  More precisely:
+  ///
+  /// With "typeSynonymsAreSignificant" being "false", then, of the tower returned,
   ///     tower[0] == type.NormalizeExpand()
   ///     tower.Last == type.NormalizeExpandKeepConstraints()
   /// In between, for consecutive indices i and i+1:
@@ -1230,14 +1193,23 @@ public static Type HeadWithProxyArgs(Type t) {
   /// The tower thus has the property that:
   ///     tower[0] is not a UserDefinedType with .ResolvedClass being a SubsetTypeDecl,
   ///     but all other tower[i] (for i > 0) are.
+  ///
+  /// With "typeSynonymsAreSignificant" being "true", then, of the tower returned,
+  ///     tower[0] == type.Normalize()
+  ///     tower.Last == type.NormalizeExpandKeepConstraints()
+  /// In between, for consecutive indices i and i+1:
+  ///     tower[i] is the base type (that is, .Rhs) of the subset type or type synonym tower[i+1]
+  /// The tower thus has the property that:
+  ///     tower[0] is not a UserDefinedType with .ResolvedClass being a TypeSynonymDecl,
+  ///     but all other tower[i] (for i > 0) are.
   /// </summary>
-  public static List<Type> GetTowerOfSubsetTypes(Type type) {
+  public static List<Type> GetTowerOfSubsetTypes(Type type, bool typeSynonymsAreSignificant = false) {
     Contract.Requires(type != null);
-    type = type.NormalizeExpandKeepConstraints();
+    type = typeSynonymsAreSignificant ? type.NormalizeAndAdjustForScope() : type.NormalizeExpandKeepConstraints();
     List<Type> tower;
-    if (type is UserDefinedType { ResolvedClass: SubsetTypeDecl sst }) {
+    if (type is UserDefinedType { ResolvedClass: TypeSynonymDecl sst } && (typeSynonymsAreSignificant || sst is SubsetTypeDecl)) {
       var parent = sst.RhsWithArgument(type.TypeArgs);
-      tower = GetTowerOfSubsetTypes(parent);
+      tower = GetTowerOfSubsetTypes(parent, typeSynonymsAreSignificant);
     } else {
       tower = new List<Type>();
     }
@@ -1331,7 +1303,7 @@ public static Type JoinX(Type a, Type b, SystemModuleManager systemModuleManager
         if (typeArgs == null) {
           return null;
         }
-        return new UserDefinedType(udtA.tok, udtA.Name, udtA.ResolvedClass, typeArgs);
+        return new UserDefinedType(udtA.Origin, udtA.Name, udtA.ResolvedClass, typeArgs);
       }
     }
     // We exhausted all possibilities of subset types being equal, so use the base-most types.
@@ -1405,7 +1377,7 @@ public static Type JoinX(Type a, Type b, SystemModuleManager systemModuleManager
         return null;
       }
       var udt = (UserDefinedType)a;
-      return new UserDefinedType(udt.tok, udt.Name, aa, typeArgs);
+      return new UserDefinedType(udt.Origin, udt.Name, aa, typeArgs);
     } else if (a.AsArrowType != null) {
       var aa = a.AsArrowType;
       var bb = b.AsArrowType;
@@ -1426,7 +1398,7 @@ public static Type JoinX(Type a, Type b, SystemModuleManager systemModuleManager
         return null;
       }
       var arr = (ArrowType)aa;
-      return new ArrowType(arr.tok, (ArrowTypeDecl)arr.ResolvedClass, typeArgs);
+      return new ArrowType(arr.Origin, (ArrowTypeDecl)arr.ResolvedClass, typeArgs);
     } else if (b.IsObjectQ) {
       var udtB = (UserDefinedType)b;
       return !a.IsRefType ? null : abNonNullTypes ? UserDefinedType.CreateNonNullType(udtB) : udtB;
@@ -1451,7 +1423,7 @@ public static Type JoinX(Type a, Type b, SystemModuleManager systemModuleManager
           return null;
         }
         var udt = (UserDefinedType)a;
-        var xx = new UserDefinedType(udt.tok, udt.Name, aa, typeArgs);
+        var xx = new UserDefinedType(udt.Origin, udt.Name, aa, typeArgs);
         return abNonNullTypes ? UserDefinedType.CreateNonNullType(xx) : xx;
       } else if (aa is ClassLikeDecl && bb is ClassLikeDecl) {
         var A = (TopLevelDeclWithMembers)aa;
@@ -1569,7 +1541,7 @@ public static Type MeetX(Type a, Type b, SystemModuleManager systemModuleManager
         if (typeArgs == null) {
           return null;
         }
-        return new UserDefinedType(udtA.tok, udtA.Name, udtA.ResolvedClass, typeArgs);
+        return new UserDefinedType(udtA.Origin, udtA.Name, udtA.ResolvedClass, typeArgs);
       } else {
         // The two subset types do not have the same head, so there is no meet
         return null;
@@ -1631,7 +1603,7 @@ public static Type MeetX(Type a, Type b, SystemModuleManager systemModuleManager
         return null;
       }
       var udt = (UserDefinedType)a;
-      return new UserDefinedType(udt.tok, udt.Name, aa, typeArgs);
+      return new UserDefinedType(udt.Origin, udt.Name, aa, typeArgs);
     } else if (a.AsArrowType != null) {
       var aa = a.AsArrowType;
       var bb = b.AsArrowType;
@@ -1652,7 +1624,7 @@ public static Type MeetX(Type a, Type b, SystemModuleManager systemModuleManager
         return null;
       }
       var arr = (ArrowType)aa;
-      return new ArrowType(arr.tok, (ArrowTypeDecl)arr.ResolvedClass, typeArgs);
+      return new ArrowType(arr.Origin, (ArrowTypeDecl)arr.ResolvedClass, typeArgs);
     } else if (b.IsObjectQ) {
       return a.IsRefType ? a : null;
     } else if (a.IsObjectQ) {
@@ -1675,7 +1647,7 @@ public static Type MeetX(Type a, Type b, SystemModuleManager systemModuleManager
           return null;
         }
         var udt = (UserDefinedType)a;
-        return new UserDefinedType(udt.tok, udt.Name, aa, typeArgs);
+        return new UserDefinedType(udt.Origin, udt.Name, aa, typeArgs);
       } else if (aa is ClassLikeDecl && bb is ClassLikeDecl) {
         if (a.IsSubtypeOf(b, false, false)) {
           return a;
@@ -1704,7 +1676,7 @@ public bool ContainsProxy(TypeProxy proxy) {
     }
   }
 
-  public virtual List<Type> ParentTypes() {
+  public virtual List<Type> ParentTypes(bool includeTypeBounds) {
     return new List<Type>();
   }
 
@@ -1731,7 +1703,13 @@ public virtual bool IsSubtypeOf(Type super, bool ignoreTypeArguments, bool ignor
       return ignoreTypeArguments || CompatibleTypeArgs(super, sub);
     }
 
-    return sub.ParentTypes().Any(parentType => parentType.IsSubtypeOf(super, ignoreTypeArguments, ignoreNullity));
+    // There is a special case, namely when super is the non-null "object". Since "sub.ParentTypes()" only gives
+    // back the explicitly declared parent traits, the general case below may miss it.
+    if (super.IsObject) {
+      return sub.IsNonNullRefType;
+    }
+
+    return sub.ParentTypes(true).Any(parentType => parentType.IsSubtypeOf(super, ignoreTypeArguments, ignoreNullity));
   }
 
   public static bool CompatibleTypeArgs(Type super, Type sub) {
@@ -1803,6 +1781,11 @@ public override bool Equals(Type that, bool keepConstraints = false) {
 /// A NonProxy type is a fully constrained type.  It may contain members.
 /// </summary>
 public abstract class NonProxyType : Type {
+  protected NonProxyType(IOrigin origin = null) : base(origin) {
+  }
+
+  protected NonProxyType(Cloner cloner, NonProxyType original) : base(cloner, original) {
+  }
 }
 
 public abstract class BasicType : NonProxyType {
@@ -1905,9 +1888,11 @@ public BitvectorType(DafnyOptions options, int width)
     }
   }
 
+  public string Name => "bv" + Width;
+
   [System.Diagnostics.Contracts.Pure]
   public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
-    return "bv" + Width;
+    return Name;
   }
   public override bool Equals(Type that, bool keepConstraints = false) {
     var bv = that.NormalizeExpand(keepConstraints) as BitvectorType;
@@ -1925,7 +1910,7 @@ public class SelfType : NonProxyType {
   public TypeParameter TypeArg;
   public Type ResolvedType;
   public SelfType() : base() {
-    TypeArg = new TypeParameter(RangeToken.NoToken, new Name("selfType"), TypeParameter.TPVarianceSyntax.NonVariant_Strict);
+    TypeArg = new TypeParameter(SourceOrigin.NoToken, new Name("selfType"), TypeParameter.TPVarianceSyntax.NonVariant_Strict);
   }
 
   [System.Diagnostics.Contracts.Pure]
@@ -1984,19 +1969,21 @@ public bool HasTypeArg() {
   }
   public void SetTypeArg(Type arg) {
     Contract.Requires(arg != null);
-    Contract.Requires(1 <= this.TypeArgs.Count);  // this is actually an invariant of all collection types
     Contract.Assume(this.arg == null);  // Can only set it once.  This is really a precondition.
     this.arg = arg;
-    this.TypeArgs[0] = arg;
+
+    Debug.Assert(TypeArgs.Count == 0);
+    TypeArgs.Add(arg);
   }
   public virtual void SetTypeArgs(Type arg, Type other) {
     Contract.Requires(arg != null);
     Contract.Requires(other != null);
-    Contract.Requires(this.TypeArgs.Count == 2);
     Contract.Assume(this.arg == null);  // Can only set it once.  This is really a precondition.
     this.arg = arg;
-    this.TypeArgs[0] = arg;
-    this.TypeArgs[1] = other;
+
+    Debug.Assert(TypeArgs.Count == 0);
+    TypeArgs.Add(arg);
+    TypeArgs.Add(other);
   }
   [ContractInvariantMethod]
   void ObjectInvariant() {
@@ -2009,14 +1996,27 @@ void ObjectInvariant() {
   /// </summary>
   protected CollectionType(Type arg) {
     this.arg = arg;
-    this.TypeArgs = new List<Type> { arg };
+    TypeArgs = new List<Type>(1);
+    if (arg != null) {
+      TypeArgs.Add(arg);
+    }
   }
+
   /// <summary>
   /// This constructor is a collection types with 2 type arguments
   /// </summary>
   protected CollectionType(Type arg, Type other) {
     this.arg = arg;
-    this.TypeArgs = new List<Type> { arg, other };
+    TypeArgs = new List<Type>(2);
+    if (arg != null && other != null) {
+      TypeArgs.Add(arg);
+      TypeArgs.Add(other);
+    }
+    Debug.Assert(arg == null && other == null || arg != null && other != null);
+  }
+
+  protected CollectionType(Cloner cloner, CollectionType original) {
+    this.arg = cloner.CloneType(original.arg);
   }
 
   public override bool ComputeMayInvolveReferences(ISet<DatatypeDecl> visitedDatatypes) {
@@ -2032,7 +2032,7 @@ public override bool ComputeMayInvolveReferences(ISet<DatatypeDecl> visitedDatat
   /// For a given "source", denoting an expression of this CollectionType, return the BoundedPool corresponding
   /// to an expression "x in source".
   /// </summary>
-  public abstract ComprehensionExpr.CollectionBoundedPool GetBoundedPool(Expression source);
+  public abstract CollectionBoundedPool GetBoundedPool(Expression source);
 }
 
 public class SetType : CollectionType {
@@ -2073,8 +2073,8 @@ public override bool SupportsEquality {
   }
 
   public override BinaryExpr.ResolvedOpcode ResolvedOpcodeForIn => BinaryExpr.ResolvedOpcode.InSet;
-  public override ComprehensionExpr.CollectionBoundedPool GetBoundedPool(Expression source) {
-    return new ComprehensionExpr.SetBoundedPool(source, Arg, Arg, Finite);
+  public override CollectionBoundedPool GetBoundedPool(Expression source) {
+    return new SetBoundedPool(source, Arg, Arg, Finite);
   }
 }
 
@@ -2107,8 +2107,8 @@ public override bool SupportsEquality {
   }
 
   public override BinaryExpr.ResolvedOpcode ResolvedOpcodeForIn => BinaryExpr.ResolvedOpcode.InMultiSet;
-  public override ComprehensionExpr.CollectionBoundedPool GetBoundedPool(Expression source) {
-    return new ComprehensionExpr.MultiSetBoundedPool(source, Arg, Arg);
+  public override CollectionBoundedPool GetBoundedPool(Expression source) {
+    return new MultiSetBoundedPool(source, Arg, Arg);
   }
 }
 
@@ -2141,578 +2141,9 @@ public override bool SupportsEquality {
   }
 
   public override BinaryExpr.ResolvedOpcode ResolvedOpcodeForIn => BinaryExpr.ResolvedOpcode.InSeq;
-  public override ComprehensionExpr.CollectionBoundedPool GetBoundedPool(Expression source) {
-    return new ComprehensionExpr.SeqBoundedPool(source, Arg, Arg);
-  }
-}
-public class MapType : CollectionType {
-  public bool Finite {
-    get { return finite; }
-    set { finite = value; }
-  }
-  private bool finite;
-  public Type Range {
-    get { return range; }
-  }
-  private Type range;
-  public override void SetTypeArgs(Type domain, Type range) {
-    base.SetTypeArgs(domain, range);
-    Contract.Assume(this.range == null);  // Can only set once.  This is really a precondition.
-    this.range = range;
-  }
-  public MapType(bool finite, Type domain, Type range) : base(domain, range) {
-    Contract.Requires((domain == null && range == null) || (domain != null && range != null));
-    this.finite = finite;
-    this.range = range;
-  }
-  public Type Domain {
-    get { return Arg; }
-  }
-  public override string CollectionTypeName { get { return finite ? "map" : "imap"; } }
-  [System.Diagnostics.Contracts.Pure]
-  public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
-    Contract.Ensures(Contract.Result<string>() != null);
-    var targs = HasTypeArg() ? this.TypeArgsToString(options, context, parseAble) : "";
-    return CollectionTypeName + targs;
-  }
-  public override bool Equals(Type that, bool keepConstraints = false) {
-    var t = that.NormalizeExpand(keepConstraints) as MapType;
-    return t != null && Finite == t.Finite && Arg.Equals(t.Arg, keepConstraints) && Range.Equals(t.Range, keepConstraints);
-  }
-
-  public override Type Subst(IDictionary<TypeParameter, Type> subst) {
-    var dom = Domain.Subst(subst);
-    if (dom is InferredTypeProxy) {
-      ((InferredTypeProxy)dom).KeepConstraints = true;
-    }
-    var ran = Range.Subst(subst);
-    if (ran is InferredTypeProxy) {
-      ((InferredTypeProxy)ran).KeepConstraints = true;
-    }
-    if (dom == Domain && ran == Range) {
-      return this;
-    } else {
-      return new MapType(Finite, dom, ran);
-    }
+  public override CollectionBoundedPool GetBoundedPool(Expression source) {
+    return new SeqBoundedPool(source, Arg, Arg);
   }
-
-  public override Type ReplaceTypeArguments(List<Type> arguments) {
-    return new MapType(Finite, arguments[0], arguments[1]);
-  }
-
-  public override bool SupportsEquality {
-    get {
-      // A map type supports equality if both its Keys type and Values type does.  It is checked
-      // that the Keys type always supports equality, so we only need to check the Values type here.
-      return range.SupportsEquality;
-    }
-  }
-  public override bool ComputeMayInvolveReferences(ISet<DatatypeDecl> visitedDatatypes) {
-    return Domain.ComputeMayInvolveReferences(visitedDatatypes) || Range.ComputeMayInvolveReferences(visitedDatatypes);
-  }
-
-  public override BinaryExpr.ResolvedOpcode ResolvedOpcodeForIn => BinaryExpr.ResolvedOpcode.InMap;
-  public override ComprehensionExpr.CollectionBoundedPool GetBoundedPool(Expression source) {
-    return new ComprehensionExpr.MapBoundedPool(source, Domain, Domain, Finite);
-  }
-}
-
-public class UserDefinedType : NonProxyType {
-  [ContractInvariantMethod]
-  void ObjectInvariant() {
-    Contract.Invariant(tok != null);
-    Contract.Invariant(Name != null);
-    Contract.Invariant(cce.NonNullElements(TypeArgs));
-    Contract.Invariant(NamePath is NameSegment || NamePath is ExprDotName);
-    Contract.Invariant(!ArrowType.IsArrowTypeName(Name) || this is ArrowType);
-  }
-
-  public readonly Expression NamePath;  // either NameSegment or ExprDotName (with the inner expression satisfying this same constraint)
-  public readonly string Name;
-  [Rep]
-
-  public string FullName {
-    get {
-      if (ResolvedClass?.EnclosingModuleDefinition?.IsDefaultModule == false) {
-        return ResolvedClass.EnclosingModuleDefinition.Name + "." + Name;
-      } else {
-        return Name;
-      }
-    }
-  }
-
-  string compileName;
-  public string GetCompileName(DafnyOptions options) => compileName ??= ResolvedClass.GetCompileName(options);
-
-  public string GetFullCompanionCompileName(DafnyOptions options) {
-    Contract.Requires(ResolvedClass is TraitDecl || (ResolvedClass is NonNullTypeDecl nntd && nntd.Class is TraitDecl));
-    var m = ResolvedClass.EnclosingModuleDefinition;
-    var s = m.IsDefaultModule ? "" : m.GetCompileName(options) + ".";
-    return s + "_Companion_" + ResolvedClass.GetCompileName(options);
-  }
-
-  [FilledInDuringResolution] public TopLevelDecl ResolvedClass;  // if Name denotes a class/datatype/iterator and TypeArgs match the type parameters of that class/datatype/iterator
-
-  public UserDefinedType(IToken tok, string name, List<Type> optTypeArgs)
-    : this(tok, new NameSegment(tok, name, optTypeArgs)) {
-    Contract.Requires(tok != null);
-    Contract.Requires(name != null);
-    Contract.Requires(optTypeArgs == null || optTypeArgs.Count > 0);  // this is what it means to be syntactically optional
-  }
-
-  public UserDefinedType(IToken tok, Expression namePath) {
-    Contract.Requires(tok != null);
-    Contract.Requires(namePath is NameSegment || namePath is ExprDotName);
-    this.tok = tok;
-    if (namePath is NameSegment) {
-      var n = (NameSegment)namePath;
-      this.Name = n.Name;
-      this.TypeArgs = n.OptTypeArguments;
-    } else {
-      var n = (ExprDotName)namePath;
-      this.Name = n.SuffixName;
-      this.TypeArgs = n.OptTypeArguments;
-    }
-    if (this.TypeArgs == null) {
-      this.TypeArgs = new List<Type>();  // TODO: is this really the thing to do?
-    }
-    this.NamePath = namePath;
-  }
-  public UserDefinedType(Cloner cloner, UserDefinedType original)
-    : this(cloner.Tok(original.tok), cloner.CloneExpr(original.NamePath)) {
-    if (cloner.CloneResolvedFields) {
-      ResolvedClass = cloner.GetCloneIfAvailable(original.ResolvedClass);
-      TypeArgs = original.TypeArgs.Select(cloner.CloneType).ToList();
-    }
-  }
-
-  /// <summary>
-  /// Constructs a Type (in particular, a UserDefinedType) from a TopLevelDecl denoting a type declaration.  If
-  /// the given declaration takes type parameters, these are filled as references to the formal type parameters
-  /// themselves.  (Usually, this method is called when the type parameters in the result don't matter, other
-  /// than that they need to be filled in, so as to make a properly resolved UserDefinedType.)
-  /// If "typeArgs" is non-null, then its type parameters are used in constructing the returned type.
-  /// If "typeArgs" is null, then the formal type parameters of "cd" are used.
-  /// </summary>
-  public static UserDefinedType FromTopLevelDecl(IToken tok, TopLevelDecl cd, List<TypeParameter> typeArgs = null) {
-    Contract.Requires(tok != null);
-    Contract.Requires(cd != null);
-    Contract.Assert((cd is ArrowTypeDecl) == ArrowType.IsArrowTypeName(cd.Name));
-    var args = (typeArgs ?? cd.TypeArgs).ConvertAll(tp => (Type)new UserDefinedType(tp));
-    if (cd is ArrowTypeDecl) {
-      return new ArrowType(tok, (ArrowTypeDecl)cd, args);
-    } else if (cd is ClassLikeDecl { IsReferenceTypeDecl: true }) {
-      return new UserDefinedType(tok, cd.Name + "?", cd, args);
-    } else {
-      return new UserDefinedType(tok, cd.Name, cd, args);
-    }
-  }
-
-  public static UserDefinedType FromTopLevelDeclWithAllBooleanTypeParameters(TopLevelDecl cd) {
-    Contract.Requires(cd != null);
-    Contract.Requires(!(cd is ArrowTypeDecl));
-
-    var typeArgs = cd.TypeArgs.ConvertAll(tp => (Type)Type.Bool);
-    return new UserDefinedType(cd.tok, cd.Name, cd, typeArgs);
-  }
-
-  /// <summary>
-  /// If "member" is non-null, then:
-  ///   Return the upcast of "receiverType" that has base type "member.EnclosingClass".
-  ///   Assumes that "receiverType" normalizes to a UserDefinedFunction with a .ResolveClass that is a subtype
-  ///   of "member.EnclosingClass".
-  /// Otherwise:
-  ///   Return "receiverType" (expanded).
-  /// </summary>
-  public static Type UpcastToMemberEnclosingType(Type receiverType, MemberDecl/*?*/ member) {
-    Contract.Requires(receiverType != null);
-    if (member != null && member.EnclosingClass != null && !(member.EnclosingClass is ValuetypeDecl)) {
-      return receiverType.AsParentType(member.EnclosingClass);
-    }
-    return receiverType.NormalizeExpandKeepConstraints();
-  }
-
-  /// <summary>
-  /// This constructor constructs a resolved class/datatype/iterator/subset-type/newtype type
-  /// </summary>
-  public UserDefinedType(IToken tok, string name, TopLevelDecl cd, [Captured] List<Type> typeArgs, Expression/*?*/ namePath = null) {
-    Contract.Requires(tok != null);
-    Contract.Requires(name != null);
-    Contract.Requires(cd != null);
-    Contract.Requires(cce.NonNullElements(typeArgs));
-    Contract.Requires(cd.TypeArgs.Count == typeArgs.Count);
-    Contract.Requires(namePath == null || namePath is NameSegment || namePath is ExprDotName);
-    // The following is almost a precondition. In a few places, the source program names a class, not a type,
-    // and in then name==cd.Name for a ClassDecl.
-    //Contract.Requires(!(cd is ClassDecl) || name == cd.Name + "?");
-    Contract.Requires(!(cd is ArrowTypeDecl) || name == cd.Name);
-    Contract.Requires(!(cd is DefaultClassDecl) || name == cd.Name);
-    this.tok = tok;
-    this.Name = name;
-    this.ResolvedClass = cd;
-    this.TypeArgs = typeArgs;
-    if (namePath == null) {
-      var ns = new NameSegment(tok, name, typeArgs.Count == 0 ? null : typeArgs);
-      var r = new Resolver_IdentifierExpr(tok, cd, typeArgs);
-      ns.ResolvedExpression = r;
-      ns.Type = r.Type;
-      this.NamePath = ns;
-    } else {
-      this.NamePath = namePath;
-    }
-  }
-
-  public static UserDefinedType CreateNonNullType(UserDefinedType udtNullableType) {
-    Contract.Requires(udtNullableType != null);
-    Contract.Requires(udtNullableType.ResolvedClass is ClassLikeDecl { IsReferenceTypeDecl: true });
-    var cl = (ClassLikeDecl)udtNullableType.ResolvedClass;
-    return new UserDefinedType(udtNullableType.tok, cl.NonNullTypeDecl.Name, cl.NonNullTypeDecl, udtNullableType.TypeArgs);
-  }
-
-  public static UserDefinedType CreateNullableType(UserDefinedType udtNonNullType) {
-    Contract.Requires(udtNonNullType != null);
-    Contract.Requires(udtNonNullType.ResolvedClass is NonNullTypeDecl);
-    var nntd = (NonNullTypeDecl)udtNonNullType.ResolvedClass;
-    return new UserDefinedType(udtNonNullType.tok, nntd.Class.Name + "?", nntd.Class, udtNonNullType.TypeArgs);
-  }
-
-  public static UserDefinedType CreateNonNullTypeIfReferenceType(UserDefinedType classLikeType) {
-    Contract.Requires(classLikeType != null);
-    Contract.Requires(classLikeType.ResolvedClass is ClassLikeDecl);
-    return classLikeType.IsRefType ? CreateNonNullType(classLikeType) : classLikeType;
-  }
-
-  public static UserDefinedType CreateNullableTypeIfReferenceType(UserDefinedType classLikeType) {
-    Contract.Requires(classLikeType != null);
-    Contract.Requires(!classLikeType.IsRefType || classLikeType.ResolvedClass is NonNullTypeDecl);
-    return classLikeType.IsRefType ? CreateNullableType(classLikeType) : classLikeType;
-  }
-
-  /// <summary>
-  /// This constructor constructs a resolved type parameter
-  /// </summary>
-  public UserDefinedType(TypeParameter tp)
-    : this(tp.tok, tp) {
-    Contract.Requires(tp != null);
-  }
-
-  /// <summary>
-  /// This constructor constructs a resolved type parameter
-  /// </summary>
-  public UserDefinedType(IToken tok, TypeParameter tp) {
-    Contract.Requires(tok != null);
-    Contract.Requires(tp != null);
-    this.tok = tok;
-    this.Name = tp.Name;
-    this.TypeArgs = new List<Type>();
-    this.ResolvedClass = tp;
-    var ns = new NameSegment(tok, tp.Name, null);
-    var r = new Resolver_IdentifierExpr(tok, tp);
-    ns.ResolvedExpression = r;
-    ns.Type = r.Type;
-    this.NamePath = ns;
-  }
-
-  public override bool Equals(Type that, bool keepConstraints = false) {
-    var i = NormalizeExpand(keepConstraints);
-    if (i is UserDefinedType) {
-      var ii = (UserDefinedType)i;
-      var t = that.NormalizeExpand(keepConstraints) as UserDefinedType;
-      if (t == null || ii.ResolvedClass != t.ResolvedClass || ii.TypeArgs.Count != t.TypeArgs.Count) {
-        return false;
-      } else {
-        for (int j = 0; j < ii.TypeArgs.Count; j++) {
-          if (!ii.TypeArgs[j].Equals(t.TypeArgs[j], keepConstraints)) {
-            return false;
-          }
-        }
-        return true;
-      }
-    } else {
-      // TODO?: return i.Equals(that.NormalizeExpand());
-      return i.Equals(that, keepConstraints);
-    }
-  }
-
-  public override Type Subst(IDictionary<TypeParameter, Type> subst) {
-    if (ResolvedClass is TypeParameter tp) {
-      if (subst.TryGetValue(tp, out var s)) {
-        Contract.Assert(TypeArgs.Count == 0);
-        return s;
-      } else {
-        return this;
-      }
-    } else if (ResolvedClass != null) {
-      List<Type> newArgs = null;  // allocate it lazily
-      var resolvedClass = ResolvedClass;
-      var isArrowType = ArrowType.IsPartialArrowTypeName(resolvedClass.Name) || ArrowType.IsTotalArrowTypeName(resolvedClass.Name);
-      for (int i = 0; i < TypeArgs.Count; i++) {
-        Type p = TypeArgs[i];
-        Type s = p.Subst(subst);
-        if (s is InferredTypeProxy && !isArrowType) {
-          ((InferredTypeProxy)s).KeepConstraints = true;
-        }
-        if (s != p && newArgs == null) {
-          // lazily construct newArgs
-          newArgs = new List<Type>();
-          for (int j = 0; j < i; j++) {
-            newArgs.Add(TypeArgs[j]);
-          }
-        }
-        if (newArgs != null) {
-          newArgs.Add(s);
-        }
-      }
-      if (newArgs == null) {
-        // there were no substitutions
-        return this;
-      } else {
-        // Note, even if t.NamePath is non-null, we don't care to keep that syntactic part of the expression in what we return here
-        return new UserDefinedType(tok, Name, resolvedClass, newArgs);
-      }
-    } else {
-      // there's neither a resolved param nor a resolved class, which means the UserDefinedType wasn't
-      // properly resolved; just return it
-      return this;
-    }
-  }
-
-  public override Type ReplaceTypeArguments(List<Type> arguments) {
-    return new UserDefinedType(tok, Name, ResolvedClass, arguments);
-  }
-
-  /// <summary>
-  /// If type denotes a resolved class type, then return that class type.
-  /// Otherwise, return null.
-  /// </summary>
-  public static UserDefinedType DenotesClass(Type type) {
-    Contract.Requires(type != null);
-    Contract.Ensures(Contract.Result<UserDefinedType>() == null || Contract.Result<UserDefinedType>().ResolvedClass is ClassDecl);
-    type = type.NormalizeExpand();
-    UserDefinedType ct = type as UserDefinedType;
-    if (ct != null && ct.ResolvedClass is ClassDecl) {
-      return ct;
-    } else {
-      return null;
-    }
-  }
-
-  public static Type ArrayElementType(Type type) {
-    Contract.Requires(type != null);
-    Contract.Requires(type.IsArrayType);
-    Contract.Ensures(Contract.Result<Type>() != null);
-
-    UserDefinedType udt = DenotesClass(type);
-    Contract.Assert(udt != null);
-    Contract.Assert(udt.TypeArgs.Count == 1);  // holds true of all array types
-    return udt.TypeArgs[0];
-  }
-
-  /// <summary>
-  /// This method converts a UserDefinedType given in an "extends" clause to the TraitDecl it refers to.
-  /// Return null if the UserDefinedType does not refer to a trait in this way.
-  /// </summary>
-  [CanBeNull]
-  public TraitDecl AsParentTraitDecl() {
-    // If .Name == "Tr" and "Tr" is a reference-type trait, then .ResolvedClass will be a NonNullTypeDecl
-    // whose .ViewAsClass is that trait declaration we're looking for.
-    if (ResolvedClass is NonNullTypeDecl { ViewAsClass: TraitDecl trait0 }) {
-      Contract.Assert(trait0.IsReferenceTypeDecl);
-      return trait0;
-    }
-    // If .Name == "Tr?" where "Tr" is a reference trait, then the "extends" clause is malformed. In this case,
-    // .ResolvedClass will still be a TraitDecl, but we don't want to return it. To distinguish this case, we
-    // compare the given .Name with the name of the trait declaration.
-    if (ResolvedClass is TraitDecl trait1 && trait1.Name == Name) {
-      Contract.Assert(!trait1.IsReferenceTypeDecl);
-      return trait1;
-    }
-    return null;
-  }
-
-  public override IEnumerable<Node> Nodes => new[] { this }.Concat(TypeArgs.SelectMany(t => t.Nodes));
-
-  [System.Diagnostics.Contracts.Pure]
-  public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
-    Contract.Ensures(Contract.Result<string>() != null);
-    if (SystemModuleManager.IsTupleTypeName(Name)) {
-      // Unfortunately, ResolveClass may be null, so Name is all we have.  Reverse-engineer the string name.
-      IEnumerable<bool> argumentGhostness = SystemModuleManager.ArgumentGhostnessFromString(Name, TypeArgs.Count);
-      return "(" + Util.Comma(System.Linq.Enumerable.Zip(TypeArgs, argumentGhostness),
-        (ty_u) => ModuleResolver.GhostPrefix(ty_u.Item2) + ty_u.Item1.TypeName(options, context, parseAble)) + ")";
-    } else if (ArrowType.IsPartialArrowTypeName(Name)) {
-      return ArrowType.PrettyArrowTypeName(options, ArrowType.PARTIAL_ARROW, TypeArgs, null, context, parseAble);
-    } else if (ArrowType.IsTotalArrowTypeName(Name)) {
-      return ArrowType.PrettyArrowTypeName(options, ArrowType.TOTAL_ARROW, TypeArgs, null, context, parseAble);
-    } else {
-#if TEST_TYPE_SYNONYM_TRANSPARENCY
-        if (Name == "type#synonym#transparency#test" && ResolvedClass is TypeSynonymDecl) {
-          return ((TypeSynonymDecl)ResolvedClass).Rhs.TypeName(context);
-        }
-#endif
-      var s = Printer.ExprToString(options, NamePath);
-      if (ResolvedClass != null) {
-        var optionalTypeArgs = NamePath is NameSegment ? ((NameSegment)NamePath).OptTypeArguments : ((ExprDotName)NamePath).OptTypeArguments;
-        if (optionalTypeArgs == null && TypeArgs != null && TypeArgs.Count != 0) {
-          s += this.TypeArgsToString(options, context, parseAble);
-        }
-      }
-      return s;
-    }
-  }
-
-  public override bool SupportsEquality {
-    get {
-      if (ResolvedClass is ClassLikeDecl { IsReferenceTypeDecl: true } or NewtypeDecl) {
-        return ResolvedClass.IsRevealedInScope(Type.GetScope());
-      } else if (ResolvedClass is TraitDecl) {
-        return false;
-      } else if (ResolvedClass is CoDatatypeDecl) {
-        return false;
-      } else if (ResolvedClass is IndDatatypeDecl) {
-        var dt = (IndDatatypeDecl)ResolvedClass;
-        Contract.Assume(dt.EqualitySupport != IndDatatypeDecl.ES.NotYetComputed);
-        if (!dt.IsRevealedInScope(Type.GetScope())) {
-          return false;
-        }
-        if (dt.EqualitySupport == IndDatatypeDecl.ES.Never) {
-          return false;
-        }
-        Contract.Assert(dt.TypeArgs.Count == TypeArgs.Count);
-        var i = 0;
-        foreach (var tp in dt.TypeArgs) {
-          if (tp.NecessaryForEqualitySupportOfSurroundingInductiveDatatype && !TypeArgs[i].SupportsEquality) {
-            return false;
-          }
-          i++;
-        }
-        return true;
-      } else if (ResolvedClass is TypeSynonymDeclBase) {
-        var t = (TypeSynonymDeclBase)ResolvedClass;
-        if (t.SupportsEquality) {
-          return true;
-        } else if (t.IsRevealedInScope(Type.GetScope())) {
-          return t.RhsWithArgument(TypeArgs).SupportsEquality;
-        } else {
-          return false;
-        }
-      } else if (ResolvedClass is TypeParameter) {
-        return ((TypeParameter)ResolvedClass).SupportsEquality;
-      } else if (ResolvedClass is AbstractTypeDecl) {
-        return ((AbstractTypeDecl)ResolvedClass).SupportsEquality;
-      }
-      Contract.Assume(false);  // the SupportsEquality getter requires the Type to have been successfully resolved
-      return true;
-    }
-  }
-
-  public override bool PartiallySupportsEquality {
-    get {
-      var totalEqualitySupport = SupportsEquality;
-      if (!totalEqualitySupport && ResolvedClass is TypeSynonymDeclBase synonymBase) {
-        return synonymBase.IsRevealedInScope(Type.GetScope()) && synonymBase.RhsWithArgument(TypeArgs).PartiallySupportsEquality;
-      } else if (!totalEqualitySupport && ResolvedClass is IndDatatypeDecl dt && dt.IsRevealedInScope(Type.GetScope())) {
-        // Equality is partially supported (at run time) for a datatype that
-        //   * is inductive (because codatatypes never support equality), and
-        //   * has at least one non-ghost constructor (because if all constructors are ghost, then equality is never supported), and
-        //   * for each non-ghost constructor, every argument totally supports equality (an argument totally supports equality
-        //       if it is non-ghost (because ghost arguments are not available at run time) and has a type that supports equality).
-        var hasNonGhostConstructor = false;
-        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-          hasNonGhostConstructor = true;
-          if (!ctor.Formals.All(formal => !formal.IsGhost && formal.Type.SupportsEquality)) {
-            return false;
-          }
-        }
-        Contract.Assert(dt.HasGhostVariant); // sanity check (if the types of all formals support equality, then either .SupportsEquality or there is a ghost constructor)
-        return hasNonGhostConstructor;
-      }
-      return totalEqualitySupport;
-    }
-  }
-
-  public override bool ComputeMayInvolveReferences(ISet<DatatypeDecl> visitedDatatypes) {
-    if (ResolvedClass is ArrowTypeDecl) {
-      return TypeArgs.Any(ta => ta.ComputeMayInvolveReferences(visitedDatatypes));
-    } else if (ResolvedClass is ClassLikeDecl) {
-      return true;
-    } else if (ResolvedClass is NewtypeDecl) {
-      return false;
-    } else if (ResolvedClass is DatatypeDecl) {
-      // Datatype declarations do not support explicit (!new) annotations. Instead, whether or not
-      // a datatype involves references depends on the definition and parametrization of the type.
-      // See ComputeMayInvolveReferences in class Type for more information.
-      // In particular, if one of the datatype's constructors mentions a type that involves
-      // references, then so does the datatype. And if one of the datatype's type arguments involves
-      // references, then we consider the datatype to do so as well (without regard to whether or
-      // not the type parameter is actually used in the definition of the datatype).
-      var dt = (DatatypeDecl)ResolvedClass;
-      if (!dt.IsRevealedInScope(Type.GetScope())) {
-        // The type's definition is hidden from the current scope, so we
-        // have to assume the type may involve references.
-        return true;
-      } else if (TypeArgs.Any(ta => ta.ComputeMayInvolveReferences(visitedDatatypes))) {
-        return true;
-      } else if (visitedDatatypes != null && visitedDatatypes.Contains(dt)) {
-        // we're in the middle of looking through the types involved in dt's definition
-        return false;
-      } else {
-        visitedDatatypes ??= new HashSet<DatatypeDecl>();
-        visitedDatatypes.Add(dt);
-        return dt.Ctors.Any(ctor => ctor.Formals.Any(f => f.Type.ComputeMayInvolveReferences(visitedDatatypes)));
-      }
-    } else if (ResolvedClass is TypeSynonymDeclBase) {
-      var t = (TypeSynonymDeclBase)ResolvedClass;
-      if (t.Characteristics.ContainsNoReferenceTypes) {
-        // There's an explicit "(!new)" annotation on the type.
-        return false;
-      } else if (t.IsRevealedInScope(Type.GetScope())) {
-        // The type's definition is available in the scope, so consult the RHS type
-        return t.RhsWithArgument(TypeArgs).ComputeMayInvolveReferences(visitedDatatypes);
-      } else {
-        // The type's definition is hidden from the current scope and there's no explicit "(!new)", so we
-        // have to assume the type may involve references.
-        return true;
-      }
-    } else if (ResolvedClass is TypeParameter typeParameter) {
-      if (visitedDatatypes != null) {
-        // Datatypes look at the type arguments passed in, so we ignore their formal type parameters.
-        // See comment above and in Type.ComputeMayInvolveReferences.
-        Contract.Assert(typeParameter.Parent is DatatypeDecl);
-        return false;
-      } else {
-        return !typeParameter.Characteristics.ContainsNoReferenceTypes;
-      }
-    } else if (ResolvedClass is AbstractTypeDecl opaqueTypeDecl) {
-      return !opaqueTypeDecl.Characteristics.ContainsNoReferenceTypes;
-    }
-    Contract.Assume(false);  // unexpected or not successfully resolved Type
-    return true;
-  }
-
-  public override List<Type> ParentTypes() {
-    return ResolvedClass != null ? ResolvedClass.ParentTypes(TypeArgs) : base.ParentTypes();
-  }
-
-  public override bool IsSubtypeOf(Type super, bool ignoreTypeArguments, bool ignoreNullity) {
-    super = super.NormalizeExpandKeepConstraints();
-
-    // Specifically handle object as the implicit supertype of classes and traits.
-    // "object?" is handled by Builtins rather than the Type hierarchy, so unfortunately
-    // it can't be returned in ParentTypes().
-    if (super.IsObjectQ) {
-      return IsRefType;
-    } else if (super.IsObject) {
-      return ignoreNullity ? IsRefType : IsNonNullRefType;
-    }
-
-    return base.IsSubtypeOf(super, ignoreTypeArguments, ignoreNullity);
-  }
-
-  public IToken NameToken => tok;
-  public override IEnumerable<INode> Children => base.Children.Concat(new[] { NamePath });
-
-  public override IEnumerable<INode> PreResolveChildren => new List<Node>() { NamePath };
 }
 
 public abstract class TypeProxy : Type {
@@ -2801,7 +2232,7 @@ public void AddSubtype(TypeConstraint c) {
   public enum Family { Unknown, Bool, Char, IntLike, RealLike, Ordinal, BitVector, ValueType, Ref, Opaque }
   public Family family = Family.Unknown;
   public static Family GetFamily(Type t) {
-    Contract.Ensures(Contract.Result<Family>() != Family.Unknown || t is TypeProxy || t is Resolver_IdentifierExpr.ResolverType);  // return Unknown ==> t is TypeProxy || t is ResolverType
+    Contract.Ensures(Contract.Result<Family>() != Family.Unknown || t is TypeProxy || t is ResolverIdentifierExpr.ResolverType);  // return Unknown ==> t is TypeProxy || t is ResolverType
     if (t.IsBoolType) {
       return Family.Bool;
     } else if (t.IsCharType) {
diff --git a/Source/DafnyCore/AST/Types/UserDefinedType.cs b/Source/DafnyCore/AST/Types/UserDefinedType.cs
new file mode 100644
index 00000000000..e7076751bb4
--- /dev/null
+++ b/Source/DafnyCore/AST/Types/UserDefinedType.cs
@@ -0,0 +1,536 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using JetBrains.Annotations;
+
+namespace Microsoft.Dafny;
+
+public class UserDefinedType : NonProxyType, IHasReferences {
+  [ContractInvariantMethod]
+  void ObjectInvariant() {
+    Contract.Invariant(Origin != null);
+    Contract.Invariant(Name != null);
+    Contract.Invariant(cce.NonNullElements(TypeArgs));
+    Contract.Invariant(NamePath is NameSegment or ExprDotName);
+    Contract.Invariant(!ArrowType.IsArrowTypeName(Name) || this is ArrowType);
+  }
+
+  public readonly Expression NamePath;  // either NameSegment or ExprDotName (with the inner expression satisfying this same constraint)
+  public readonly string Name;
+  [Rep]
+
+  public string FullName {
+    get {
+      if (ResolvedClass?.EnclosingModuleDefinition?.TryToAvoidName == false) {
+        return ResolvedClass.EnclosingModuleDefinition.Name + "." + Name;
+      } else {
+        return Name;
+      }
+    }
+  }
+
+  string compileName;
+  public string GetCompileName(DafnyOptions options) => compileName ??= ResolvedClass.GetCompileName(options);
+
+  public string GetFullCompanionCompileName(DafnyOptions options) {
+    Contract.Requires(ResolvedClass is TraitDecl || (ResolvedClass is NonNullTypeDecl nntd && nntd.Class is TraitDecl));
+    var m = ResolvedClass.EnclosingModuleDefinition;
+    var s = m.TryToAvoidName ? "" : m.GetCompileName(options) + ".";
+    return s + "_Companion_" + ResolvedClass.GetCompileName(options);
+  }
+
+  [FilledInDuringResolution] public TopLevelDecl ResolvedClass;  // if Name denotes a class/datatype/iterator and TypeArgs match the type parameters of that class/datatype/iterator
+
+  public UserDefinedType(IOrigin origin, string name, List<Type> optTypeArgs)
+    : this(origin, new NameSegment(origin, name, optTypeArgs)) {
+    Contract.Requires(origin != null);
+    Contract.Requires(name != null);
+    Contract.Requires(optTypeArgs == null || optTypeArgs.Count > 0);  // this is what it means to be syntactically optional
+  }
+
+  public UserDefinedType(IOrigin origin, Expression namePath) : base(origin) {
+    Contract.Requires(origin != null);
+    Contract.Requires(namePath is NameSegment || namePath is ExprDotName);
+    if (namePath is NameSegment) {
+      var n = (NameSegment)namePath;
+      this.Name = n.Name;
+      this.TypeArgs = n.OptTypeArguments;
+    } else {
+      var n = (ExprDotName)namePath;
+      this.Name = n.SuffixName;
+      this.TypeArgs = n.OptTypeArguments;
+    }
+    if (this.TypeArgs == null) {
+      this.TypeArgs = new List<Type>();  // TODO: is this really the thing to do?
+    }
+    this.NamePath = namePath;
+  }
+  public UserDefinedType(Cloner cloner, UserDefinedType original)
+    : this(cloner.Origin(original.Origin), cloner.CloneExpr(original.NamePath)) {
+    if (cloner.CloneResolvedFields) {
+      ResolvedClass = cloner.GetCloneIfAvailable(original.ResolvedClass);
+      TypeArgs = original.TypeArgs.Select(cloner.CloneType).ToList();
+    }
+  }
+
+  /// <summary>
+  /// Constructs a Type (in particular, a UserDefinedType) from a TopLevelDecl denoting a type declaration.  If
+  /// the given declaration takes type parameters, these are filled as references to the formal type parameters
+  /// themselves.  (Usually, this method is called when the type parameters in the result don't matter, other
+  /// than that they need to be filled in, so as to make a properly resolved UserDefinedType.)
+  /// If "typeArgs" is non-null, then its type parameters are used in constructing the returned type.
+  /// If "typeArgs" is null, then the formal type parameters of "cd" are used.
+  /// </summary>
+  public static UserDefinedType FromTopLevelDecl(IOrigin tok, TopLevelDecl cd, List<TypeParameter> typeArgs = null) {
+    Contract.Requires(tok != null);
+    Contract.Requires(cd != null);
+    Contract.Assert((cd is ArrowTypeDecl) == ArrowType.IsArrowTypeName(cd.Name));
+    var args = (typeArgs ?? cd.TypeArgs).ConvertAll(tp => (Type)new UserDefinedType(tp));
+    return FromTopLevelDecl(tok, cd, args);
+  }
+
+  /// <summary>
+  /// Constructs a Type (in particular, a UserDefinedType) from a TopLevelDecl denoting a type declaration.
+  /// </summary>
+  public static UserDefinedType FromTopLevelDecl(IOrigin tok, TopLevelDecl cd, List<Type> typeArguments) {
+    if (cd is ArrowTypeDecl) {
+      return new ArrowType(tok, (ArrowTypeDecl)cd, typeArguments);
+    } else if (cd is ClassLikeDecl { IsReferenceTypeDecl: true }) {
+      return new UserDefinedType(tok, cd.Name + "?", cd, typeArguments);
+    } else {
+      return new UserDefinedType(tok, cd.Name, cd, typeArguments);
+    }
+  }
+
+  public static UserDefinedType FromTopLevelDeclWithAllBooleanTypeParameters(TopLevelDecl cd) {
+    Contract.Requires(cd != null);
+    Contract.Requires(!(cd is ArrowTypeDecl));
+
+    var typeArgs = cd.TypeArgs.ConvertAll(tp => (Type)Type.Bool);
+    return new UserDefinedType(cd.Origin, cd.Name, cd, typeArgs);
+  }
+
+  /// <summary>
+  /// If "member" is non-null, then:
+  ///   Return the upcast of "receiverType" that has base type "member.EnclosingClass".
+  ///   Assumes that "receiverType" normalizes to a UserDefinedFunction with a .ResolveClass that is a subtype
+  ///   of "member.EnclosingClass".
+  ///   Preserves non-null-ness of "receiverType" if it is a non-null reference.
+  /// Otherwise:
+  ///   Return "receiverType" (expanded).
+  /// </summary>
+  public static Type UpcastToMemberEnclosingType(Type receiverType, MemberDecl/*?*/ member) {
+    Contract.Requires(receiverType != null);
+    if (member != null && member.EnclosingClass != null && !(member.EnclosingClass is ValuetypeDecl)) {
+      var parentType = receiverType.AsParentType(member.EnclosingClass);
+
+      if (receiverType.IsNonNullRefType) {
+        if (parentType == null) {
+          return null;
+        } else if (parentType.ResolvedClass is ClassLikeDecl { IsReferenceTypeDecl: true }) {
+          return CreateNonNullType(parentType);
+        } else {
+          return parentType;
+        }
+      } else {
+        return parentType;
+      }
+    }
+    return receiverType.NormalizeExpandKeepConstraints();
+  }
+
+  /// <summary>
+  /// This constructor constructs a resolved class/datatype/iterator/subset-type/newtype type.
+  /// Note, if "cd" is an arrow type or a possibly-null reference type, then it's better to call
+  /// the FromTopLevelDecl method to create the UserDefinedType; that makes sure the right class
+  /// and right name is used.
+  /// </summary>
+  public UserDefinedType(IOrigin origin, string name, TopLevelDecl cd, [Captured] List<Type> typeArgs, Expression/*?*/ namePath = null)
+   : base(origin) {
+    Contract.Requires(origin != null);
+    Contract.Requires(name != null);
+    Contract.Requires(cd != null);
+    Contract.Requires(cce.NonNullElements(typeArgs));
+    Contract.Requires(cd.TypeArgs.Count == typeArgs.Count);
+    Contract.Requires(namePath == null || namePath is NameSegment || namePath is ExprDotName);
+    // The following is almost a precondition. In a few places, the source program names a class, not a type,
+    // and in then name==cd.Name for a ClassDecl.
+    //Contract.Requires(!(cd is ClassDecl) || name == cd.Name + "?");
+    Contract.Requires(!(cd is ArrowTypeDecl) || name == cd.Name);
+    Contract.Requires(!(cd is DefaultClassDecl) || name == cd.Name);
+    Contract.Assert(cd is not ArrowTypeDecl || this is ArrowType);
+    this.Name = name;
+    this.ResolvedClass = cd;
+    this.TypeArgs = typeArgs;
+    if (namePath == null) {
+      var ns = new NameSegment(origin, name, typeArgs.Count == 0 ? null : typeArgs);
+      var r = new ResolverIdentifierExpr(origin, cd, typeArgs);
+      ns.ResolvedExpression = r;
+      ns.Type = r.Type;
+      this.NamePath = ns;
+    } else {
+      this.NamePath = namePath;
+    }
+  }
+
+  public static UserDefinedType CreateNonNullType(UserDefinedType udtNullableType) {
+    Contract.Requires(udtNullableType != null);
+    Contract.Requires(udtNullableType.ResolvedClass is ClassLikeDecl { IsReferenceTypeDecl: true });
+    var cl = (ClassLikeDecl)udtNullableType.ResolvedClass;
+    return new UserDefinedType(udtNullableType.Origin, cl.NonNullTypeDecl.Name, cl.NonNullTypeDecl, udtNullableType.TypeArgs);
+  }
+
+  public static UserDefinedType CreateNullableType(UserDefinedType udtNonNullType) {
+    Contract.Requires(udtNonNullType != null);
+    Contract.Requires(udtNonNullType.ResolvedClass is NonNullTypeDecl);
+    var nntd = (NonNullTypeDecl)udtNonNullType.ResolvedClass;
+    return new UserDefinedType(udtNonNullType.Origin, nntd.Class.Name + "?", nntd.Class, udtNonNullType.TypeArgs);
+  }
+
+  public static UserDefinedType CreateNonNullTypeIfReferenceType(UserDefinedType classLikeType) {
+    Contract.Requires(classLikeType != null);
+    Contract.Requires(classLikeType.ResolvedClass is ClassLikeDecl);
+    return classLikeType.IsRefType ? CreateNonNullType(classLikeType) : classLikeType;
+  }
+
+  public static UserDefinedType CreateNullableTypeIfReferenceType(UserDefinedType classLikeType) {
+    Contract.Requires(classLikeType != null);
+    Contract.Requires(!classLikeType.IsRefType || classLikeType.ResolvedClass is NonNullTypeDecl);
+    return classLikeType.IsRefType ? CreateNullableType(classLikeType) : classLikeType;
+  }
+
+  /// <summary>
+  /// This constructor constructs a resolved type parameter
+  /// </summary>
+  public UserDefinedType(TypeParameter tp)
+    : this(tp.Origin, tp) {
+    Contract.Requires(tp != null);
+  }
+
+  /// <summary>
+  /// This constructor constructs a resolved type parameter
+  /// </summary>
+  public UserDefinedType(IOrigin origin, TypeParameter tp) : base(origin) {
+    Contract.Requires(origin != null);
+    Contract.Requires(tp != null);
+    this.Name = tp.Name;
+    this.TypeArgs = new List<Type>();
+    this.ResolvedClass = tp;
+    var ns = new NameSegment(origin, tp.Name, null);
+    var r = new ResolverIdentifierExpr(origin, tp);
+    ns.ResolvedExpression = r;
+    ns.Type = r.Type;
+    this.NamePath = ns;
+  }
+
+  public override bool Equals(Type that, bool keepConstraints = false) {
+    var i = NormalizeExpand(keepConstraints);
+    if (i is UserDefinedType) {
+      var ii = (UserDefinedType)i;
+      var t = that.NormalizeExpand(keepConstraints) as UserDefinedType;
+      if (t == null || ii.ResolvedClass != t.ResolvedClass || ii.TypeArgs.Count != t.TypeArgs.Count) {
+        return false;
+      } else {
+        for (int j = 0; j < ii.TypeArgs.Count; j++) {
+          if (!ii.TypeArgs[j].Equals(t.TypeArgs[j], keepConstraints)) {
+            return false;
+          }
+        }
+        return true;
+      }
+    } else {
+      // TODO?: return i.Equals(that.NormalizeExpand());
+      return i.Equals(that, keepConstraints);
+    }
+  }
+
+  public override Type Subst(IDictionary<TypeParameter, Type> subst) {
+    if (ResolvedClass is TypeParameter tp) {
+      if (subst.TryGetValue(tp, out var s)) {
+        Contract.Assert(TypeArgs.Count == 0);
+        return s;
+      } else {
+        return this;
+      }
+    } else if (ResolvedClass != null) {
+      List<Type> newArgs = null;  // allocate it lazily
+      var resolvedClass = ResolvedClass;
+      var isArrowType = ArrowType.IsPartialArrowTypeName(resolvedClass.Name) || ArrowType.IsTotalArrowTypeName(resolvedClass.Name);
+      for (int i = 0; i < TypeArgs.Count; i++) {
+        Type p = TypeArgs[i];
+        Type s = p.Subst(subst);
+        if (s is InferredTypeProxy && !isArrowType) {
+          ((InferredTypeProxy)s).KeepConstraints = true;
+        }
+        if (s != p && newArgs == null) {
+          // lazily construct newArgs
+          newArgs = new List<Type>();
+          for (int j = 0; j < i; j++) {
+            newArgs.Add(TypeArgs[j]);
+          }
+        }
+        if (newArgs != null) {
+          newArgs.Add(s);
+        }
+      }
+      if (newArgs == null) {
+        // there were no substitutions
+        return this;
+      } else {
+        // Note, even if t.NamePath is non-null, we don't care to keep that syntactic part of the expression in what we return here
+        return new UserDefinedType(Origin, Name, resolvedClass, newArgs);
+      }
+    } else {
+      // there's neither a resolved param nor a resolved class, which means the UserDefinedType wasn't
+      // properly resolved; just return it
+      return this;
+    }
+  }
+
+  public override Type ReplaceTypeArguments(List<Type> arguments) {
+    return new UserDefinedType(Origin, Name, ResolvedClass, arguments);
+  }
+
+  /// <summary>
+  /// If type denotes a resolved class type, then return that class type.
+  /// Otherwise, return null.
+  /// </summary>
+  public static UserDefinedType DenotesClass(Type type) {
+    Contract.Requires(type != null);
+    Contract.Ensures(Contract.Result<UserDefinedType>() == null || Contract.Result<UserDefinedType>().ResolvedClass is ClassDecl);
+    type = type.NormalizeExpand();
+    UserDefinedType ct = type as UserDefinedType;
+    if (ct != null && ct.ResolvedClass is ClassDecl) {
+      return ct;
+    } else {
+      return null;
+    }
+  }
+
+  public static Type ArrayElementType(Type type) {
+    Contract.Requires(type != null);
+    Contract.Requires(type.IsArrayType);
+    Contract.Ensures(Contract.Result<Type>() != null);
+
+    UserDefinedType udt = DenotesClass(type);
+    Contract.Assert(udt != null);
+    Contract.Assert(udt.TypeArgs.Count == 1);  // holds true of all array types
+    return udt.TypeArgs[0];
+  }
+
+  /// <summary>
+  /// This method converts a UserDefinedType given in an "extends" clause to the TraitDecl it refers to.
+  /// Return null if the UserDefinedType does not refer to a trait in this way.
+  /// </summary>
+  [CanBeNull]
+  public TraitDecl AsParentTraitDecl() {
+    // If .Name == "Tr" and "Tr" is a reference-type trait, then .ResolvedClass will be a NonNullTypeDecl
+    // whose .ViewAsClass is that trait declaration we're looking for.
+    if (ResolvedClass is NonNullTypeDecl { ViewAsClass: TraitDecl trait0 }) {
+      Contract.Assert(trait0.IsReferenceTypeDecl);
+      return trait0;
+    }
+    // If .Name == "Tr?" where "Tr" is a reference trait, then the "extends" clause is malformed. In this case,
+    // .ResolvedClass will still be a TraitDecl, but we don't want to return it. To distinguish this case, we
+    // compare the given .Name with the name of the trait declaration.
+    if (ResolvedClass is TraitDecl trait1 && trait1.Name == Name) {
+      Contract.Assert(!trait1.IsReferenceTypeDecl);
+      return trait1;
+    }
+    return null;
+  }
+
+  public override IEnumerable<Node> Nodes => new[] { this }.Concat(TypeArgs.SelectMany(t => t.Nodes));
+
+  [System.Diagnostics.Contracts.Pure]
+  public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
+    Contract.Ensures(Contract.Result<string>() != null);
+    if (SystemModuleManager.IsTupleTypeName(Name)) {
+      // Unfortunately, ResolveClass may be null, so Name is all we have.  Reverse-engineer the string name.
+      IEnumerable<bool> argumentGhostness = SystemModuleManager.ArgumentGhostnessFromString(Name, TypeArgs.Count);
+      return "(" + Util.Comma(System.Linq.Enumerable.Zip(TypeArgs, argumentGhostness),
+        (ty_u) => ModuleResolver.GhostPrefix(ty_u.Item2) + ty_u.Item1.TypeName(options, context, parseAble)) + ")";
+    } else if (ArrowType.IsPartialArrowTypeName(Name)) {
+      return ArrowType.PrettyArrowTypeName(options, ArrowType.PARTIAL_ARROW, TypeArgs, null, context, parseAble);
+    } else if (ArrowType.IsTotalArrowTypeName(Name)) {
+      return ArrowType.PrettyArrowTypeName(options, ArrowType.TOTAL_ARROW, TypeArgs, null, context, parseAble);
+    } else {
+#if TEST_TYPE_SYNONYM_TRANSPARENCY
+        if (Name == "type#synonym#transparency#test" && ResolvedClass is TypeSynonymDecl) {
+          return ((TypeSynonymDecl)ResolvedClass).Rhs.TypeName(context);
+        }
+#endif
+      var s = Printer.ExprToString(options, NamePath);
+      if (ResolvedClass != null) {
+        var optionalTypeArgs = NamePath is NameSegment ? ((NameSegment)NamePath).OptTypeArguments : ((ExprDotName)NamePath).OptTypeArguments;
+        if (optionalTypeArgs == null && TypeArgs != null && TypeArgs.Count != 0) {
+          s += this.TypeArgsToString(options, context, parseAble);
+        }
+      }
+      return s;
+    }
+  }
+
+  public override bool SupportsEquality {
+    get {
+      if (ResolvedClass is ClassLikeDecl { IsReferenceTypeDecl: true }) {
+        return ResolvedClass.IsRevealedInScope(Type.GetScope());
+      } else if (ResolvedClass is TraitDecl) {
+        return false;
+      } else if (ResolvedClass is CoDatatypeDecl) {
+        return false;
+      } else if (ResolvedClass is IndDatatypeDecl) {
+        var dt = (IndDatatypeDecl)ResolvedClass;
+        Contract.Assume(dt.EqualitySupport != IndDatatypeDecl.ES.NotYetComputed);
+        if (!dt.IsRevealedInScope(Type.GetScope())) {
+          return false;
+        }
+        if (dt.EqualitySupport == IndDatatypeDecl.ES.Never) {
+          return false;
+        }
+        Contract.Assert(dt.TypeArgs.Count == TypeArgs.Count);
+        var i = 0;
+        foreach (var tp in dt.TypeArgs) {
+          if (tp.NecessaryForEqualitySupportOfSurroundingInductiveDatatype && !TypeArgs[i].SupportsEquality) {
+            return false;
+          }
+          i++;
+        }
+        return true;
+      } else if (ResolvedClass is NewtypeDecl newtypeDecl) {
+        if (newtypeDecl.IsRevealedInScope(Type.GetScope())) {
+          return newtypeDecl.RhsWithArgument(TypeArgs).SupportsEquality;
+        } else {
+          return false;
+        }
+      } else if (ResolvedClass is TypeSynonymDeclBase) {
+        var t = (TypeSynonymDeclBase)ResolvedClass;
+        if (t.SupportsEquality) {
+          return true;
+        } else if (t.IsRevealedInScope(Type.GetScope())) {
+          return t.RhsWithArgument(TypeArgs).SupportsEquality;
+        } else {
+          return false;
+        }
+      } else if (ResolvedClass is TypeParameter) {
+        return ((TypeParameter)ResolvedClass).SupportsEquality;
+      } else if (ResolvedClass is AbstractTypeDecl) {
+        return ((AbstractTypeDecl)ResolvedClass).SupportsEquality;
+      }
+      Contract.Assume(false);  // the SupportsEquality getter requires the Type to have been successfully resolved
+      return true;
+    }
+  }
+
+  public override bool PartiallySupportsEquality {
+    get {
+      var totalEqualitySupport = SupportsEquality;
+      if (!totalEqualitySupport && ResolvedClass is TypeSynonymDeclBase synonymBase) {
+        return synonymBase.IsRevealedInScope(Type.GetScope()) && synonymBase.RhsWithArgument(TypeArgs).PartiallySupportsEquality;
+      } else if (!totalEqualitySupport && ResolvedClass is IndDatatypeDecl dt && dt.IsRevealedInScope(Type.GetScope())) {
+        // Equality is partially supported (at run time) for a datatype that
+        //   * is inductive (because codatatypes never support equality), and
+        //   * has at least one non-ghost constructor (because if all constructors are ghost, then equality is never supported), and
+        //   * for each non-ghost constructor, every argument totally supports equality (an argument totally supports equality
+        //       if it is non-ghost (because ghost arguments are not available at run time) and has a type that supports equality).
+        var hasNonGhostConstructor = false;
+        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+          hasNonGhostConstructor = true;
+          if (!ctor.Formals.All(formal => !formal.IsGhost && formal.Type.SupportsEquality)) {
+            return false;
+          }
+        }
+        Contract.Assert(dt.HasGhostVariant); // sanity check (if the types of all formals support equality, then either .SupportsEquality or there is a ghost constructor)
+        return hasNonGhostConstructor;
+      }
+      return totalEqualitySupport;
+    }
+  }
+
+  public override bool ComputeMayInvolveReferences(ISet<DatatypeDecl> visitedDatatypes) {
+    if (ResolvedClass is ArrowTypeDecl) {
+      return TypeArgs.Any(ta => ta.ComputeMayInvolveReferences(visitedDatatypes));
+    } else if (ResolvedClass is ClassLikeDecl) {
+      return true;
+    } else if (ResolvedClass is NewtypeDecl) {
+      return false;
+    } else if (ResolvedClass is DatatypeDecl) {
+      // Datatype declarations do not support explicit (!new) annotations. Instead, whether or not
+      // a datatype involves references depends on the definition and parametrization of the type.
+      // See ComputeMayInvolveReferences in class Type for more information.
+      // In particular, if one of the datatype's constructors mentions a type that involves
+      // references, then so does the datatype. And if one of the datatype's type arguments involves
+      // references, then we consider the datatype to do so as well (without regard to whether or
+      // not the type parameter is actually used in the definition of the datatype).
+      var dt = (DatatypeDecl)ResolvedClass;
+      if (!dt.IsRevealedInScope(Type.GetScope())) {
+        // The type's definition is hidden from the current scope, so we
+        // have to assume the type may involve references.
+        return true;
+      } else if (TypeArgs.Any(ta => ta.ComputeMayInvolveReferences(visitedDatatypes))) {
+        return true;
+      } else if (visitedDatatypes != null && visitedDatatypes.Contains(dt)) {
+        // we're in the middle of looking through the types involved in dt's definition
+        return false;
+      } else {
+        visitedDatatypes ??= new HashSet<DatatypeDecl>();
+        visitedDatatypes.Add(dt);
+        return dt.Ctors.Any(ctor => ctor.Formals.Any(f => f.Type.ComputeMayInvolveReferences(visitedDatatypes)));
+      }
+    } else if (ResolvedClass is TypeSynonymDeclBase) {
+      var t = (TypeSynonymDeclBase)ResolvedClass;
+      if (t.Characteristics.ContainsNoReferenceTypes) {
+        // There's an explicit "(!new)" annotation on the type.
+        return false;
+      } else if (t.IsRevealedInScope(Type.GetScope())) {
+        // The type's definition is available in the scope, so consult the RHS type
+        return t.RhsWithArgument(TypeArgs).ComputeMayInvolveReferences(visitedDatatypes);
+      } else {
+        // The type's definition is hidden from the current scope and there's no explicit "(!new)", so we
+        // have to assume the type may involve references.
+        return true;
+      }
+    } else if (ResolvedClass is TypeParameter typeParameter) {
+      if (visitedDatatypes != null) {
+        // Datatypes look at the type arguments passed in, so we ignore their formal type parameters.
+        // See comment above and in Type.ComputeMayInvolveReferences.
+        Contract.Assert(typeParameter.Parent is DatatypeDecl);
+        return false;
+      } else {
+        return !typeParameter.Characteristics.ContainsNoReferenceTypes;
+      }
+    } else if (ResolvedClass is AbstractTypeDecl opaqueTypeDecl) {
+      return !opaqueTypeDecl.Characteristics.ContainsNoReferenceTypes;
+    }
+    Contract.Assume(false);  // unexpected or not successfully resolved Type
+    return true;
+  }
+
+  public override List<Type> ParentTypes(bool includeTypeBounds) {
+    return ResolvedClass != null ? ResolvedClass.ParentTypes(TypeArgs, includeTypeBounds) : base.ParentTypes(includeTypeBounds);
+  }
+
+  public override bool IsSubtypeOf(Type super, bool ignoreTypeArguments, bool ignoreNullity) {
+    super = super.NormalizeExpandKeepConstraints();
+
+    // Specifically handle object as the implicit supertype of classes and traits.
+    // "object?" is handled by Builtins rather than the Type hierarchy, so unfortunately
+    // it can't be returned in ParentTypes().
+    if (super.IsObjectQ) {
+      return IsRefType;
+    } else if (super.IsObject) {
+      return ignoreNullity ? IsRefType : IsNonNullRefType;
+    }
+
+    return base.IsSubtypeOf(super, ignoreTypeArguments, ignoreNullity);
+  }
+
+  public IEnumerable<Reference> GetReferences() {
+    return new[] { new Reference(Center, ResolvedClass) };
+  }
+
+  public override IEnumerable<INode> Children => base.Children.Concat(new[] { NamePath });
+
+  public override IEnumerable<INode> PreResolveChildren => new List<Node>() { NamePath };
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/AlphaConvertingSubstituter.cs b/Source/DafnyCore/AlphaConvertingSubstituter.cs
index c78fd20daa0..d6640e8a891 100644
--- a/Source/DafnyCore/AlphaConvertingSubstituter.cs
+++ b/Source/DafnyCore/AlphaConvertingSubstituter.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Dafny {
   /// </summary>
   public class AlphaConvertingSubstituter : Substituter {
     public AlphaConvertingSubstituter(Expression receiverReplacement, Dictionary<IVariable, Expression> substMap, Dictionary<TypeParameter, Type> typeMap)
-      : base(receiverReplacement is ImplicitThisExpr ? new ThisExpr(receiverReplacement.tok) { Type = receiverReplacement.Type } : receiverReplacement, substMap, typeMap) {
+      : base(receiverReplacement is ImplicitThisExpr ? new ThisExpr(receiverReplacement.Origin) { Type = receiverReplacement.Type } : receiverReplacement, substMap, typeMap) {
       Contract.Requires(substMap != null);
       Contract.Requires(typeMap != null);
     }
@@ -18,12 +18,10 @@ protected override List<BoundVar> CreateBoundVarSubstitutions(List<BoundVar> var
       var newBoundVars = vars.Count == 0 ? vars : new List<BoundVar>();
       foreach (var bv in vars) {
         var tt = bv.Type.Subst(typeMap);
-        var newBv = new BoundVar(bv.tok, "_'" + bv.Name, tt);
+        var newBv = new BoundVar(bv.Origin, "_'" + bv.Name, tt);
         newBoundVars.Add(newBv);
         // update substMap to reflect the new BoundVar substitutions
-        var ie = new IdentifierExpr(newBv.tok, newBv.Name);
-        ie.Var = newBv;  // resolve here
-        ie.Type = newBv.Type;  // resolve here
+        var ie = new IdentifierExpr(newBv.Origin, newBv.Name) { Var = newBv, Type = newBv.Type };
         substMap.Add(bv, ie);
       }
       return newBoundVars;
diff --git a/Source/DafnyCore/Auditor/Assumption.cs b/Source/DafnyCore/Auditor/Assumption.cs
index 26c85746269..9398112eae6 100644
--- a/Source/DafnyCore/Auditor/Assumption.cs
+++ b/Source/DafnyCore/Auditor/Assumption.cs
@@ -5,124 +5,116 @@
 namespace Microsoft.Dafny.Auditor;
 
 public record AssumptionDescription(
-  string issue,
-  string mitigation,
-  string mitigationIETF,
-  bool isExplicit,
-  bool allowedInLibraries
+  string Issue,
+  string Mitigation,
+  string MitigationIetf,
+  bool IsExplicit
 ) {
   public static AssumptionDescription HasAxiomAttribute = new(
-    issue: "Declaration has explicit [{:axiom}] attribute.",
-    mitigation: "Provide a proof or test.",
-    mitigationIETF: "SHOULD provide a proof or test.",
-    isExplicit: true,
-    allowedInLibraries: true);
+    Issue: "Declaration has explicit [{:axiom}] attribute.",
+    Mitigation: "Provide a proof or test.",
+    MitigationIetf: "SHOULD provide a proof or test.",
+    IsExplicit: true);
   public static AssumptionDescription HasVerifyFalseAttribute = new(
-    issue: "Declaration has [{:verify false}] attribute.",
-    mitigation: "Remove [{:verify false}] attribute and prove if possible.",
-    mitigationIETF: "MUST remove [{:verify false}] attribute and prove.",
-    isExplicit: false,
-    allowedInLibraries: false);
+    Issue: "Declaration has [{:verify false}] attribute.",
+    Mitigation: "Remove [{:verify false}] attribute and prove if possible.",
+    MitigationIetf: "MUST remove [{:verify false}] attribute and prove.",
+    IsExplicit: false);
   public static AssumptionDescription ExternFunction = new(
-    issue: "Function with [{:extern}] attribute.",
-    mitigation: "Turn into a [method] with [modifies *] or test thoroughly for lack of side effects.",
-    mitigationIETF: "SHOULD use [method] with [modifies *] instead.",
-    isExplicit: false,
-    allowedInLibraries: false);
+    Issue: "Function with [{:extern}] attribute.",
+    Mitigation: "Turn into a [method] with [modifies {}] and test thoroughly for lack of side effects.",
+    MitigationIetf: "SHOULD use [method] with [modifies {}] instead.",
+    IsExplicit: false);
+
   public static AssumptionDescription ExternWithPrecondition = new(
-    issue: "Declaration with [{:extern}] has a requires clause.",
-    mitigation: "Test any external callers (maybe with [/testContracts]).",
-    mitigationIETF: "MUST test any external callers.",
-    isExplicit: false,
-    allowedInLibraries: false);
+    Issue: "Declaration with [{:extern}] has a requires clause.",
+    Mitigation: "Test any external callers (maybe with [/testContracts]).",
+    MitigationIetf: "MUST test any external callers.",
+    IsExplicit: false);
   public static AssumptionDescription ExternWithPostcondition = new(
-    issue: "Declaration with [{:extern}] has a ensures clause.",
-    mitigation: "Test external callee (maybe with [/testContracts]).",
-    mitigationIETF: "MUST test external callee.",
-    isExplicit: false,
-    allowedInLibraries: false);
+    Issue: "Declaration with [{:extern}] has a ensures clause.",
+    Mitigation: "Test external callee (maybe with [/testContracts]).",
+    MitigationIetf: "MUST test external callee.",
+    IsExplicit: false);
+
   public static AssumptionDescription AssumeStatement(bool hasAxiomAttribute) {
     return new(
-      issue:
+      Issue:
       hasAxiomAttribute
         ? "Definition has [assume {:axiom}] statement in body."
         : "Definition has [assume] statement in body.",
-      mitigation:
+      Mitigation:
         hasAxiomAttribute
           ? "Replace with [assert] and prove."
           : "Replace with [assert] and prove or add [{:axiom}].",
-      mitigationIETF:
+      MitigationIetf:
         hasAxiomAttribute
           ? "SHOULD replace with [assert] and prove."
           : "MUST replace with [assert] and prove or add [{:axiom}].",
-      isExplicit: false,
-      allowedInLibraries: false
+      IsExplicit: false
     );
   }
   public static AssumptionDescription MayNotTerminate = new(
-    issue: "Method may not terminate (uses [decreases *]).",
-    mitigation: "Provide a valid [decreases] clause.",
-    mitigationIETF: "SHOULD provide a valid [decreases] clause.",
-    isExplicit: false,
-    // This isn't unsound but it's hard to imagine useful libraries
-    // with non-terminating methods. If we ever want to offer something like a
-    // top-level event loop driver we can revisit.
-    allowedInLibraries: false);
+    Issue: "Method may not terminate (uses [decreases *]).",
+    Mitigation: "Provide a valid [decreases] clause.",
+    MitigationIetf: "SHOULD provide a valid [decreases] clause.",
+    IsExplicit: false);
   public static AssumptionDescription HasTerminationFalseAttribute = new(
-    issue: "Trait method calls may not terminate (uses [{:termination false}]).",
-    mitigation: "Remove if possible.",
-    mitigationIETF: "MUST remove [{:termination false}] or justify.",
-    isExplicit: false,
-    allowedInLibraries: false);
+    Issue: "Trait method calls may not terminate (uses [{:termination false}]).",
+    Mitigation: "Remove if possible.",
+    MitigationIetf: "MUST remove [{:termination false}] or justify.",
+    IsExplicit: false);
+  public static AssumptionDescription HasAssumeCrossModuleTerminationAttribute = new(
+    Issue: "Trait method calls may not terminate (uses [@AssumeCrossModuleTermination]).",
+    Mitigation: "Remove if possible.",
+    MitigationIetf: "MUST remove [@AssumeCrossModuleTermination] or justify.",
+    IsExplicit: false);
   public static AssumptionDescription ForallWithoutBody = new(
-    issue: "Definition contains [forall] statement with no body.",
-    mitigation: "Provide a body.",
-    mitigationIETF: "MUST provide a body.",
-    isExplicit: false,
-    allowedInLibraries: false);
+    Issue: "Definition contains [forall] statement with no body.",
+    Mitigation: "Provide a body.",
+    MitigationIetf: "MUST provide a body.",
+    IsExplicit: false);
   public static AssumptionDescription LoopWithoutBody = new(
-    issue: "Definition contains loop with no body.",
-    mitigation: "Provide a body.",
-    mitigationIETF: "MUST provide a body.",
-    isExplicit: false,
-    allowedInLibraries: false);
-  public static AssumptionDescription HasConcurrentAttribute = new(
-    issue: "Declaration has [{:concurrent}] attribute.",
-    mitigation: "Manually review and test in a concurrent setting.",
-    mitigationIETF: "MUST manually review and test in a concurrent setting.",
-    isExplicit: false,
-    allowedInLibraries: false);
+    Issue: "Definition contains loop with no body.",
+    Mitigation: "Provide a body.",
+    MitigationIetf: "MUST provide a body.",
+    IsExplicit: false);
+
+  public static AssumptionDescription HasAssumeConcurrentAttribute(bool isModifies) {
+    return new AssumptionDescription(
+      Issue: (isModifies ? "Modifies" : "Reads") + " clause has [{:assume_concurrent}] attribute.",
+      Mitigation: "Manually review and test in a concurrent setting.",
+      MitigationIetf: "MUST manually review and test in a concurrent setting.",
+      IsExplicit: true);
+  }
 
   public static AssumptionDescription NoBody(bool isGhost) {
     return new(
-      issue: (isGhost ? "Ghost" : "Compiled") +
+      Issue: (isGhost ? "Ghost" : "Compiled") +
              " declaration has no body and has an ensures clause.",
-      mitigation: "Provide a body or add [{:axiom}].",
-      mitigationIETF: (isGhost ? "MUST" : "SHOULD") + " provide a body or add [{:axiom}].",
-      isExplicit: false,
-      allowedInLibraries: false);
+      Mitigation: "Provide a body or add [{:axiom}].",
+      MitigationIetf: (isGhost ? "MUST" : "SHOULD") + " provide a body or add [{:axiom}].",
+      IsExplicit: false);
   }
 
   public static readonly AssumptionDescription AssertOnly = new(
-    issue: "Assertion has explicit temporary [{:only}] attribute.",
-    mitigation: "Remove the [{:only}] attribute.",
-    mitigationIETF: "MUST remove the [{:only}] attribute.",
-    isExplicit: true,
-    allowedInLibraries: false
+    Issue: "Assertion has explicit temporary [{:only}] attribute.",
+    Mitigation: "Remove the [{:only}] attribute.",
+    MitigationIetf: "MUST remove the [{:only}] attribute.",
+    IsExplicit: true
   );
 
   public static readonly AssumptionDescription MemberOnly = new(
-    issue: "Member has explicit temporary [{:only}] attribute.",
-    mitigation: "Remove the [{:only}] attribute.",
-    mitigationIETF: "MUST remove the [{:only}] attribute.",
-    isExplicit: true,
-    allowedInLibraries: false
+    Issue: "Member has explicit temporary [{:only}] attribute.",
+    Mitigation: "Remove the [{:only}] attribute.",
+    MitigationIetf: "MUST remove the [{:only}] attribute.",
+    IsExplicit: true
   );
 }
-public record Assumption(Declaration decl, IToken tok, AssumptionDescription desc) {
+public record Assumption(Declaration decl, IOrigin Tok, AssumptionDescription desc) {
   public string Warning() {
-    var tickIssue = UpdateVerbatim(desc.issue, "`", "`");
-    var tickMitigation = UpdateVerbatim(desc.mitigation, "`", "`");
+    var tickIssue = UpdateVerbatim(desc.Issue, "`", "`");
+    var tickMitigation = UpdateVerbatim(desc.Mitigation, "`", "`");
     return decl.Name + ": " + tickIssue + " Possible mitigation: " + tickMitigation;
   }
 
diff --git a/Source/DafnyCore/Auditor/AuditReport.cs b/Source/DafnyCore/Auditor/AuditReport.cs
index 07d1f48985c..c5f11d9d4c8 100644
--- a/Source/DafnyCore/Auditor/AuditReport.cs
+++ b/Source/DafnyCore/Auditor/AuditReport.cs
@@ -36,7 +36,7 @@ private void UseDecl(Declaration decl) {
     }
   }
   public void AddAssumptions(Declaration decl, IEnumerable<Assumption> assumptions) {
-    var explicitAssumptions = assumptions.Where(a => a.desc.isExplicit);
+    var explicitAssumptions = assumptions.Where(a => a.desc.IsExplicit);
     var assumptionsToAdd = explicitAssumptions.Any() ? explicitAssumptions : assumptions;
     if (assumptionsToAdd.Any()) {
       assumptionsByDecl.Add(decl, assumptionsToAdd);
@@ -81,7 +81,7 @@ private IEnumerable<string> IssueRow(Declaration decl, Assumption a, string issu
 
   private string RenderAssumptionRows(Declaration decl, IEnumerable<Assumption> assumptions, string beg, string sep, string end, Func<string, string> targetFormatter) {
     var rows = assumptions
-      .Select(a => RenderRow(beg, sep, end, IssueRow(decl, a, a.desc.issue, a.desc.mitigation, targetFormatter)));
+      .Select(a => RenderRow(beg, sep, end, IssueRow(decl, a, a.desc.Issue, a.desc.Mitigation, targetFormatter)));
     return String.Concat(rows);
   }
 
@@ -112,8 +112,8 @@ public string RenderMarkdownTable() {
   }
 
   private void AppendMarkdownIETFDescription(AssumptionDescription desc, StringBuilder text) {
-    var issue = Assumption.UpdateVerbatim(desc.issue, "`", "`");
-    var mitigation = Assumption.UpdateVerbatim(desc.mitigationIETF, "`", "`");
+    var issue = Assumption.UpdateVerbatim(desc.Issue, "`", "`");
+    var mitigation = Assumption.UpdateVerbatim(desc.MitigationIetf, "`", "`");
     text.AppendLine("");
     text.AppendLine($"* {issue} {mitigation}");
   }
@@ -122,7 +122,7 @@ public string RenderMarkdownIETF() {
     StringBuilder text = new StringBuilder();
 
     foreach (var module in modulesWithEntries) {
-      if (module.IsDefaultModule) {
+      if (module.TryToAvoidName) {
         text.AppendLine($"# Default module");
       } else {
         text.AppendLine($"# Module `{module.Name}`");
@@ -167,7 +167,7 @@ public string RenderText() {
 
     foreach (var (decl, assumptions) in assumptionsByDecl) {
       foreach (var assumption in assumptions) {
-        text.AppendLine($"{decl.tok.TokenToString(options)}:{assumption.Warning()}");
+        text.AppendLine($"{decl.Origin.TokenToString(options)}:{assumption.Warning()}");
       }
     }
 
@@ -190,7 +190,7 @@ public static AuditReport BuildReport(Program program) {
           continue;
         }
         foreach (var decl in topLevelDeclWithMembers.Members) {
-          if (decl.tok.FromIncludeDirective(program)) {
+          if (decl.Origin.FromIncludeDirective(program)) {
             // Don't audit included code
             continue;
           }
diff --git a/Source/DafnyCore/Auditor/Auditor.cs b/Source/DafnyCore/Auditor/Auditor.cs
index 16f266cda25..901748f38c9 100644
--- a/Source/DafnyCore/Auditor/Auditor.cs
+++ b/Source/DafnyCore/Auditor/Auditor.cs
@@ -66,11 +66,9 @@ static Auditor() {
                                  "md-ietf", "markdown-ietf",
                                  "txt");
 
-    DooFile.RegisterNoChecksNeeded(
-      ReportFileOption,
-      ReportFormatOption,
-      CompareReportOption
-    );
+    OptionRegistry.RegisterOption(ReportFileOption, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ReportFormatOption, OptionScope.Cli);
+    OptionRegistry.RegisterOption(CompareReportOption, OptionScope.Cli);
   }
 
   /// <summary>
@@ -125,7 +123,7 @@ internal override void PostResolve(Program program) {
     if (reportFileName is null && reportFormat is null) {
       foreach (var (_, assumptions) in report.AllAssumptions()) {
         foreach (var assumption in assumptions) {
-          Reporter.Warning(MessageSource.Verifier, ErrorRegistry.NoneId, assumption.tok, assumption.Warning());
+          Reporter.Warning(MessageSource.Verifier, ErrorRegistry.NoneId, assumption.Tok, assumption.Warning());
         }
       }
     } else {
diff --git a/Source/DafnyCore/Backends/CSharp/CsharpBackend.cs b/Source/DafnyCore/Backends/CSharp/CsharpBackend.cs
new file mode 100644
index 00000000000..50c293c1f0c
--- /dev/null
+++ b/Source/DafnyCore/Backends/CSharp/CsharpBackend.cs
@@ -0,0 +1,153 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Dafny.Compilers;
+
+public class CsharpBackend : ExecutableBackend {
+
+  protected override SinglePassCodeGenerator CreateCodeGenerator() {
+    return new CsharpCodeGenerator(Options, Reporter);
+  }
+
+  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".cs", ".dll" };
+
+  public override string TargetName => "C#";
+  public override bool IsStable => true;
+  public override string TargetExtension => "cs";
+
+  // True if the most recently visited AST has a method annotated with {:synthesize}:
+
+  public override string GetCompileName(bool isDefaultModule, string moduleName, string compileName) {
+    return isDefaultModule
+      ? PublicIdProtect(compileName)
+      : base.GetCompileName(isDefaultModule, moduleName, compileName);
+  }
+
+  public override bool SupportsInMemoryCompilation => true;
+  public override bool TextualTargetIsExecutable => false;
+
+  public override async Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText,
+    string callToMain /*?*/, string targetFilename /*?*/, ReadOnlyCollection<string> otherFileNames,
+    bool runAfterCompile, TextWriter outputWriter) {
+
+    var outputDir = targetFilename == null ? Directory.GetCurrentDirectory() : Path.GetDirectoryName(Path.GetFullPath(targetFilename));
+    var fileNames = Path.GetFileNameWithoutExtension(Path.GetFileName(dafnyProgramName));
+    var sourcePath = Path.Join(outputDir, fileNames + ".cs");
+    var csprojPath = Path.Join(outputDir, fileNames + ".csproj");
+    Directory.CreateDirectory(outputDir);
+
+    var source = callToMain == null ? targetProgramText : targetProgramText + callToMain;
+    await File.WriteAllTextAsync(sourcePath, source);
+
+    var outputType = callToMain == null ? "Library" : "Exe";
+
+    var itemGroupExtra = @"";
+    if (!Options.IncludeRuntime) {
+      var libPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+      var runtimePath = Path.Join(libPath, "DafnyRuntime.dll");
+      itemGroupExtra = @$"
+    <Reference Include=""DafnyRuntime"">
+      <HintPath>{runtimePath}</HintPath>
+    </Reference>";
+    }
+
+    var sourceFiles = new StringBuilder();
+    sourceFiles.AppendLine(@$"<Compile Include=""{sourcePath}"" />");
+
+    foreach (var file in otherFileNames) {
+      string extension = Path.GetExtension(file);
+      if (extension != null) { extension = extension.ToLower(); }
+      if (extension == ".cs") {
+        var normalizedPath = Path.Combine(Path.GetDirectoryName(file), Path.GetFileName(file));
+        if (File.Exists(normalizedPath)) {
+          sourceFiles.AppendLine(@$"<Compile Include=""{normalizedPath}"" />");
+        } else {
+          await outputWriter.WriteLineAsync($"Errors compiling program: Could not find {file}");
+          return (false, null);
+        }
+      } else if (extension == ".dll") {
+        sourceFiles.Append(@$"
+    <Reference Include=""{Path.GetFileNameWithoutExtension(file)}"">
+      <HintPath>{Path.GetFullPath(file)}</HintPath>
+    </Reference>");
+      }
+    }
+
+    var itemGroup = @$"
+  <ItemGroup>
+      {sourceFiles}
+      <PackageReference Include=""System.Runtime.Numerics"" Version=""4.3.0"" />
+      <PackageReference Include=""System.Collections.Immutable"" Version=""1.7.1"" />
+      {itemGroupExtra}
+  </ItemGroup>";
+
+    var projectFile = @$"<Project Sdk=""Microsoft.NET.Sdk"">
+
+  <PropertyGroup>
+    <OutputType>{outputType}</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <NoWarn>CS8600;CS8603;CS8604;CS8605;CS8625;CS8629;CS8714;CS8765;CS8769;CS8981</NoWarn>
+    <Nullable>enable</Nullable>
+    <RollForward>Major</RollForward>
+  </PropertyGroup>
+
+  {itemGroup}
+</Project>
+";
+
+    await File.WriteAllTextAsync(csprojPath, projectFile);
+
+    var arguments = new[] { "build", csprojPath, "-o", outputDir };
+    var psi = PrepareProcessStartInfo("dotnet", arguments);
+    var dotnetOutputWriter = new StringWriter();
+    var dotnetErrorWriter = new StringWriter();
+    var exitCode = await RunProcess(psi, dotnetOutputWriter, dotnetErrorWriter);
+    var dllPath = Path.Combine(outputDir, fileNames + ".dll");
+    if (exitCode != 0 || !File.Exists(dllPath)) {
+      await outputWriter.WriteLineAsync($@"Failed to compile C# source code using 'dotnet {string.Join(" ", arguments)}'. Command output was:");
+      await outputWriter.WriteAsync(dotnetOutputWriter.ToString());
+      await outputWriter.WriteAsync(dotnetErrorWriter.ToString());
+    } else {
+      if (Options.Verbose) {
+        await outputWriter.WriteLineAsync($"Compiled assembly into {Path.GetFileName(dllPath)}");
+      }
+    }
+    return (exitCode == 0, dllPath);
+  }
+
+  public override async Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain,
+    string targetFilename /*?*/, ReadOnlyCollection<string> otherFileNames,
+    object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
+
+    var dllPath = (string)compilationResult;
+    var dllFolder = Path.GetDirectoryName(dllPath)!;
+
+    foreach (var otherFileName in otherFileNames) {
+      if (Path.GetExtension(otherFileName) == ".dll") {
+        var destination = Path.Combine(dllFolder, Path.GetFileName(otherFileName));
+        if (Path.GetFullPath(otherFileName) != Path.GetFullPath(destination)) {
+          File.Copy(otherFileName, destination, true);
+        }
+      }
+    }
+
+    var psi = PrepareProcessStartInfo("dotnet", new[] { dllPath }.Concat(Options.MainArgs));
+    return await RunProcess(psi, outputWriter, errorWriter) == 0;
+  }
+
+  public override void PopulateCoverageReport(CoverageReport coverageReport) {
+    codeGenerator.Coverage.PopulateCoverageReport(coverageReport);
+  }
+
+  public CsharpBackend(DafnyOptions options) : base(options) {
+  }
+}
diff --git a/Source/DafnyCore/Backends/CSharp/CsharpCodeGenerator.cs b/Source/DafnyCore/Backends/CSharp/CsharpCodeGenerator.cs
new file mode 100644
index 00000000000..d8092b84678
--- /dev/null
+++ b/Source/DafnyCore/Backends/CSharp/CsharpCodeGenerator.cs
@@ -0,0 +1,3558 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.IO;
+using System.Diagnostics.Contracts;
+using JetBrains.Annotations;
+using Microsoft.BaseTypes;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.ConcreteSyntaxTreeUtils;
+
+namespace Microsoft.Dafny.Compilers {
+  public class CsharpCodeGenerator : SinglePassCodeGenerator {
+    protected bool Synthesize = false;
+
+    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
+      Feature.SubsetTypeTests,
+      Feature.TuplesWiderThan20,
+      Feature.ArraysWithMoreThan16Dims,
+      Feature.ArrowsWithMoreThan16Arguments
+    };
+
+    public CsharpCodeGenerator(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
+    }
+
+    const string DafnyISet = "Dafny.ISet";
+    const string DafnyIMultiset = "Dafny.IMultiSet";
+    const string DafnyISeq = "Dafny.ISequence";
+    const string DafnyIMap = "Dafny.IMap";
+
+    const string DafnySetClass = "Dafny.Set";
+    const string DafnyMultiSetClass = "Dafny.MultiSet";
+    const string DafnySeqClass = "Dafny.Sequence";
+    const string DafnyMapClass = "Dafny.Map";
+
+    const string DafnyHelpersClass = "Dafny.Helpers";
+
+    static string FormatTypeDescriptorVariable(string typeVarName) => $"_td_{typeVarName}";
+    string FormatTypeDescriptorVariable(TypeParameter tp) => FormatTypeDescriptorVariable(tp.GetCompileName(Options));
+    const string TypeDescriptorMethodName = "_TypeDescriptor";
+
+    string FormatDefaultTypeParameterValue(TopLevelDecl tp) {
+      Contract.Requires(tp is TypeParameter || tp is AbstractTypeDecl);
+      if (tp is AbstractTypeDecl) {
+        // This is unusual. Typically, the compiler never needs to compile an abstract type, but this abstract type
+        // is apparently an :extern (or a compiler error has already been reported and we're just trying to get to
+        // the end of compilation without crashing). It's difficult to say what the compiler could do in this situation, since
+        // it doesn't know how to generate code that produces a legal value of the abstract type. If we don't do
+        // anything different from the common case (the "else" branch below), then the code emitted will not
+        // compile (see github issue #1151). So, to do something a wee bit better, we emit a placebo value. This
+        // will only work when the abstract type is in the same module and has no type parameters.
+        return $"default({tp.EnclosingModuleDefinition.GetCompileName(Options) + "." + tp.GetCompileName(Options)})";
+      } else {
+        // this is the common case
+        return $"_default_{tp.GetCompileName(Options)}";
+      }
+    }
+
+    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
+      wr.WriteLine("// Dafny program {0} compiled into C#", program.Name);
+      wr.WriteLine("// To recompile, you will need the libraries");
+      wr.WriteLine("//     System.Runtime.Numerics.dll System.Collections.Immutable.dll");
+      wr.WriteLine("// but the 'dotnet' tool in .NET should pick those up automatically.");
+      wr.WriteLine("// Optionally, you may want to include compiler switches like");
+      wr.WriteLine("//     /debug /nowarn:162,164,168,183,219,436,1717,1718");
+      wr.WriteLine();
+      if (program.Options.SystemModuleTranslationMode == CommonOptionBag.SystemModuleMode.OmitAllOtherModules) {
+        wr.WriteLine("#if ISDAFNYRUNTIMELIB");
+      }
+      wr.WriteLine("using System;");
+      wr.WriteLine("using System.Numerics;");
+      wr.WriteLine("using System.Collections;");
+
+      if (Options.Get(CommonOptionBag.ExecutionCoverageReport) != null) {
+        wr.WriteLine("using System.IO;");
+      }
+
+      if (program.Options.SystemModuleTranslationMode == CommonOptionBag.SystemModuleMode.OmitAllOtherModules) {
+        wr.WriteLine("#endif");
+      }
+      Synthesize = ProgramHasMethodsWithAttr(program, "synthesize");
+      if (Synthesize) {
+        CsharpSynthesizer.EmitImports(wr);
+      }
+
+      if (program.Options.SystemModuleTranslationMode != CommonOptionBag.SystemModuleMode.OmitAllOtherModules) {
+        EmitDafnySourceAttribute(program, wr);
+      }
+
+      if (Options.IncludeRuntime) {
+        EmitRuntimeSource("DafnyRuntimeCsharp", wr, false);
+      }
+      if (Options.Get(CommonOptionBag.UseStandardLibraries) && Options.Get(CommonOptionBag.TranslateStandardLibrary)) {
+        EmitRuntimeSource("DafnyStandardLibraries_cs", wr, false);
+      }
+
+      if (Options.Get(CommonOptionBag.ExecutionCoverageReport) != null) {
+        EmitCoverageReportInstrumentation(program, wr);
+      }
+    }
+
+    /// <summary>
+    /// Return true if the AST contains a method annotated with an attribute
+    /// </summary>
+    private static bool ProgramHasMethodsWithAttr(Program p, String attr) {
+      foreach (var module in p.Modules()) {
+        foreach (ICallable callable in ModuleDefinition.AllCallables(
+                   module.TopLevelDecls)) {
+          if ((callable is Method method) &&
+              Attributes.Contains(method.Attributes, attr)) {
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+
+    void EmitDafnySourceAttribute(Program program, ConcreteSyntaxTree wr) {
+      Contract.Requires(program != null);
+      Contract.Requires(wr != null);
+
+      var stringWriter = new StringWriter();
+      stringWriter.NewLine = Environment.NewLine;
+      var oldValue = Options.ShowEnv;
+      Options.ShowEnv = ExecutionEngineOptions.ShowEnvironment.DuringPrint;
+      new Printer(stringWriter, Options, PrintModes.Serialization).PrintProgramLargeStack(program, true);
+      Options.ShowEnv = oldValue;
+      var programString = stringWriter.GetStringBuilder().Replace("\"", "\"\"").ToString();
+
+      wr.WriteLine($"[assembly: DafnyAssembly.DafnySourceAttribute(@\"{programString}\")]");
+      wr.WriteLine();
+    }
+
+    protected override void EmitBuiltInDecls(SystemModuleManager systemModuleManager, ConcreteSyntaxTree wr) {
+      switch (Options.SystemModuleTranslationMode) {
+        case CommonOptionBag.SystemModuleMode.Omit: {
+            CheckCommonSytemModuleLimits(systemModuleManager);
+            break;
+          }
+        case CommonOptionBag.SystemModuleMode.OmitAllOtherModules: {
+            CheckSystemModulePopulatedToCommonLimits(systemModuleManager);
+            break;
+          }
+      }
+
+      // The declarations below would normally be omitted if we aren't compiling the system module,
+      // but they are all marked as "internal", so they have to be included in each separately-compiled assembly.
+      // In particular, FuncExtensions contain extension methods for the System.Func<> family of delegates,
+      // and extension methods always only apply within the current assembly.
+      //
+      // Instead we just make sure to guard them with "#if ISDAFNYRUNTIMELIB" when compiling the system module,
+      // so they don't become duplicates when --include-runtime is used.
+      // See comment at the top of DafnyRuntime.cs.
+
+      if (Options.SystemModuleTranslationMode == CommonOptionBag.SystemModuleMode.OmitAllOtherModules) {
+        wr.WriteLine("#if ISDAFNYRUNTIMELIB");
+      }
+
+      var dafnyNamespace = CreateModule(null, "Dafny", false, null, null, null, wr);
+      EmitInitNewArrays(systemModuleManager, dafnyNamespace);
+      if (Synthesize) {
+        CsharpSynthesizer.EmitMultiMatcher(dafnyNamespace);
+      }
+      EmitFuncExtensions(systemModuleManager, wr);
+
+      if (Options.SystemModuleTranslationMode == CommonOptionBag.SystemModuleMode.OmitAllOtherModules) {
+        wr.WriteLine("#endif");
+      }
+    }
+
+    // Generates casts for functions of those arities present in the program, like:
+    //   public static class FuncExtensions {
+    //     public static Func<U, UResult> DowncastClone<T, TResult, U, UResult>(this Func<T, TResult> F,
+    //         Func<U, T> ArgConv, Func<TResult, UResult> ResConv) {
+    //       return arg => ResConv(F(ArgConv(arg)));
+    //     }
+    //     ...
+    //   }
+    // They aren't in any namespace to make them universally accessible.
+    private void EmitFuncExtensions(SystemModuleManager systemModuleManager, ConcreteSyntaxTree wr) {
+      var funcExtensions = wr.NewNamedBlock("internal static class FuncExtensions");
+      wr.WriteLine("// end of class FuncExtensions");
+      foreach (var kv in systemModuleManager.ArrowTypeDecls) {
+        int arity = kv.Key;
+
+        List<string> TypeParameterList(string prefix) {
+          var l = arity switch {
+            1 => new List<string> { prefix },
+            _ => Enumerable.Range(1, arity).Select(i => $"{prefix}{i}").ToList()
+          };
+          l.Add($"{prefix}Result");
+          return l;
+        }
+
+        var us = TypeParameterList("U");
+        var ts = TypeParameterList("T");
+
+        string ArgConvDecl((string u, string t) tp) => $"Func<{tp.u}, {tp.t}> ArgConv";
+        var argConvDecls = arity switch {
+          0 => "",
+          1 => $"{ArgConvDecl(("U", "T"))}, ",
+          _ => Enumerable.Zip(us.SkipLast(1), ts.SkipLast(1))
+                 .Comma((tp, i) => $"{ArgConvDecl(tp)}{++i}")
+               + ", "
+        };
+
+        var parameters = $"this Func<{ts.Comma()}> F, {argConvDecls}Func<TResult, UResult> ResConv";
+        funcExtensions.Write($"public static Func<{us.Comma()}> DowncastClone<{ts.Concat(us).Comma()}>({parameters})");
+
+        var binder = arity switch { 1 => "arg", _ => $"({Enumerable.Range(1, arity).Comma(i => $"arg{i}")})" };
+        var argConvCalls = arity switch {
+          1 => "ArgConv(arg)",
+          _ => Enumerable.Range(1, arity).Comma(i => $"ArgConv{i}(arg{i})")
+        };
+        funcExtensions.NewBlock().WriteLine($"return {binder} => ResConv(F({argConvCalls}));");
+      }
+    }
+
+    private void EmitInitNewArrays(SystemModuleManager systemModuleManager, ConcreteSyntaxTree dafnyNamespace) {
+      var arrayHelpers = dafnyNamespace.NewNamedBlock("internal class ArrayHelpers");
+      foreach (var decl in systemModuleManager.SystemModule.TopLevelDecls) {
+        if (decl is ArrayClassDecl classDecl) {
+          int dims = classDecl.Dims;
+
+          // Here is an overloading of the method name, where there is an initialValue parameter
+          // public static T[,] InitNewArray2<T>(T z, BigInteger size0, BigInteger size1) {
+          arrayHelpers.Write(
+            $"public static T[{Repeat("", dims, ",")}] InitNewArray{dims}<T>(T z, {Repeat("BigInteger size{0}", dims, ", ")})");
+
+          var w = arrayHelpers.NewBlock();
+          // int s0 = (int)size0;
+          for (int i = 0; i < dims; i++) {
+            w.WriteLine("int s{0} = (int)size{0};", i);
+          }
+
+          // T[,] a = new T[s0, s1];
+          w.WriteLine($"T[{Repeat("", dims, ",")}] a = new T[{Repeat("s{0}", dims, ",")}];");
+
+          // for (int i0 = 0; i0 < s0; i0++) {
+          //   for (int i1 = 0; i1 < s1; i1++) {
+          var wLoopNest = w;
+          for (int i = 0; i < dims; i++) {
+            wLoopNest = wLoopNest.NewNamedBlock("for (int i{0} = 0; i{0} < s{0}; i{0}++)", i);
+          }
+
+          // a[i0,i1] = z;
+          wLoopNest.WriteLine($"a[{Repeat("i{0}", dims, ",")}] = z;");
+          // return a;
+          w.WriteLine("return a;");
+        }
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
+      var wr = ((ClassWriter)cw).StaticMemberWriter;
+      // See EmitCallToMain() - this is named differently because otherwise C# tries
+      // to resolve the reference to the instance-level Main method
+      return wr.NewBlock($"public static void _StaticMain(Dafny.ISequence<Dafny.ISequence<{CharTypeName}>> {argsParameterName})");
+    }
+
+    /// <summary>
+    /// Compute the name of the class to use to translate a data-type or a class
+    /// </summary>
+    private string protectedTypeName(TopLevelDecl dt) {
+      var protectedName = IdName(dt);
+      if (dt.EnclosingModuleDefinition is { Name: var moduleName } && moduleName == protectedName) {
+        return $"_{protectedName}";
+      }
+      return protectedName;
+    }
+
+    string IdProtectModule(string moduleName) {
+      Contract.Requires(moduleName != null);
+      return string.Join(".", moduleName.Split(".").Select(IdProtect));
+    }
+
+    protected override ConcreteSyntaxTree CreateModule(ModuleDefinition module, string moduleName, bool isDefault,
+      ModuleDefinition externModule,
+      string libraryName /*?*/, Attributes moduleAttributes, ConcreteSyntaxTree wr) {
+      var protectedModuleName = IdProtectModule(moduleName);
+      return wr.NewBlock($"namespace {protectedModuleName}", " // end of " + $"namespace {protectedModuleName}");
+    }
+
+    protected override string GetHelperModuleName() => DafnyHelpersClass;
+
+    const string DafnyTypeDescriptor = "Dafny.TypeDescriptor";
+
+    internal string TypeParameters(List<TypeParameter>/*?*/ targs, bool addVariance = false, bool uniqueNames = false) {
+      Contract.Requires(targs == null || cce.NonNullElements(targs));
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      if (targs == null || targs.Count == 0) {
+        return "";
+      }
+
+      string PrintVariance(TypeParameter.TPVariance variance) {
+        if (addVariance) {
+          switch (variance) {
+            case TypeParameter.TPVariance.Co:
+              return "out ";
+            case TypeParameter.TPVariance.Contra:
+              return "in ";
+          }
+        }
+        return "";
+      }
+
+      string PrintTypeParameter(TypeParameter tArg) => $"{PrintVariance(tArg.Variance)}{(uniqueNames ? "__" : "")}{IdName(tArg)}";
+
+      return $"<{targs.Comma(PrintTypeParameter)}>";
+    }
+
+    protected override IClassWriter CreateClass(string moduleName, bool isExtern, string /*?*/ fullPrintName,
+      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type>/*?*/ superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+      var name = protectedTypeName(cls);
+      var wBody = WriteTypeHeader("partial class", name, typeParameters, superClasses, tok, wr);
+
+      ConcreteSyntaxTree/*?*/ wCtorBody = null;
+      if (cls is ClassLikeDecl cl) {
+        if (!cl.Members.OfType<Constructor>().Any(IsExternallyImported)) {
+          // This is a (non-default) class with no :extern constructor, so emit a C# constructor for the target class
+          EmitTypeDescriptorsForClass(typeParameters, cls, out var wTypeFields, out var wCtorParams, out _, out wCtorBody);
+          wBody.Append(wTypeFields);
+          wBody.Format($"public {name}({wCtorParams})").NewBlock().Append(wCtorBody);
+        }
+      }
+
+      return new ClassWriter(this, wBody, wCtorBody);
+    }
+
+    /// <summary>
+    /// For each type parameter X in "typeParametersForClass" that needs a type descriptor,
+    ///   * Write "protected TypeDescriptor<X> _td_X;" to wTypeFields
+    ///     -- each entry is terminated by a newline
+    ///   * Write "TypeDescriptor<X> _td_X" to wCtorParams
+    ///     -- entries are separated by a comma
+    ///   * Write "_td_X" to wCallArguments
+    ///     -- entries are separated by a comma
+    ///   * Write "this._td_X := _td_X;" to wCtorBody
+    ///     -- each entry is terminated by a newline
+    /// The method returns the number type descriptors written.
+    /// </summary>
+    int EmitTypeDescriptorsForClass(List<TypeParameter> typeParametersForClass, TopLevelDecl cls,
+      out ConcreteSyntaxTree wTypeFields, out ConcreteSyntaxTree wCtorParams,
+      out ConcreteSyntaxTree wCallArguments, out ConcreteSyntaxTree wCtorBody,
+      List<TypeParameter> alternateTypeParameters = null) {
+
+      wTypeFields = new ConcreteSyntaxTree();
+      wCtorParams = new ConcreteSyntaxTree();
+      wCallArguments = new ConcreteSyntaxTree();
+      wCtorBody = new ConcreteSyntaxTree();
+      int numberOfEmittedTypeDescriptors = 0;
+      if (typeParametersForClass != null) {
+        var sep = "";
+        foreach (var (ta, index) in TypeArgumentInstantiation.ListFromFormals(typeParametersForClass).Indexed()) {
+          if (NeedsTypeDescriptor(ta.Formal)) {
+            var fieldName = FormatTypeDescriptorVariable((alternateTypeParameters == null ? ta.Formal : alternateTypeParameters[index]).GetCompileName(Options));
+            var actualType = alternateTypeParameters == null ? ta.Actual : new UserDefinedType(ta.Formal.Origin, alternateTypeParameters[index]);
+            var paramName = TypeDescriptor(actualType, wCallArguments, ta.Formal.Origin);
+            var decl = $"{DafnyTypeDescriptor}<{TypeName(actualType, wTypeFields, ta.Formal.Origin)}> {fieldName}";
+
+            wTypeFields.WriteLine($"protected {decl};");
+            if (ta.Formal.Parent == cls) {
+              wCtorParams.Write($"{sep}{decl}");
+            }
+            wCtorBody.WriteLine($"this.{fieldName} = {paramName};");
+            wCallArguments.Write($"{sep}{paramName}");
+
+            sep = ", ";
+            numberOfEmittedTypeDescriptors++;
+          }
+        }
+      }
+      return numberOfEmittedTypeDescriptors;
+    }
+
+    /// <summary>
+    /// Generate the "_TypeDescriptor" method for a generated class.
+    /// </summary>
+    private void EmitTypeDescriptorMethod(TopLevelDecl enclosingTypeDecl, ConcreteSyntaxTree wr) {
+      Contract.Requires(enclosingTypeDecl != null);
+      Contract.Requires(wr != null);
+
+      var type = UserDefinedType.FromTopLevelDecl(enclosingTypeDecl.Origin, enclosingTypeDecl);
+      var initializer = DefaultValue(type, wr, enclosingTypeDecl.Origin, true);
+
+      var targetTypeName = TypeName(type, wr, enclosingTypeDecl.Origin);
+      var typeDescriptorExpr = $"new {DafnyTypeDescriptor}<{targetTypeName}>({initializer})";
+
+      if (enclosingTypeDecl.TypeArgs.Count == 0) {
+        wr.WriteLine($"private static readonly {DafnyTypeDescriptor}<{targetTypeName}> _TYPE = {typeDescriptorExpr};");
+        typeDescriptorExpr = "_TYPE"; // use the precomputed value
+      }
+
+      List<TypeParameter> typeDescriptorParams;
+      if (enclosingTypeDecl is DatatypeDecl dtDecl) {
+        typeDescriptorParams = UsedTypeParameters(dtDecl, true);
+      } else {
+        typeDescriptorParams = enclosingTypeDecl.TypeArgs;
+      }
+
+      var parameters = typeDescriptorParams.Comma(tp => $"{DafnyTypeDescriptor}<{tp.GetCompileName(Options)}> {FormatTypeDescriptorVariable(tp.GetCompileName(Options))}");
+      var wTypeMethodBody = wr.Write($"public static {DafnyTypeDescriptor}<{targetTypeName}> {TypeDescriptorMethodName}({parameters})").NewBlock();
+      wTypeMethodBody.WriteLine($"return {typeDescriptorExpr};");
+    }
+
+    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
+      TraitDecl trait, List<Type> superClasses /*?*/, IOrigin tok, ConcreteSyntaxTree wr) {
+      var instanceMemberWriter = WriteTypeHeader("interface", name, typeParameters, superClasses, tok, wr);
+
+      //writing the _Companion class
+      wr.Write($"public class _Companion_{name}{TypeParameters(typeParameters)}");
+      var staticMemberWriter = wr.NewBlock();
+
+      return new ClassWriter(this, instanceMemberWriter, null, staticMemberWriter);
+    }
+
+    private ConcreteSyntaxTree WriteTypeHeader(string kind, string name, List<TypeParameter> typeParameters, List<Type>/*?*/ superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+      wr.Write($"public {kind} {IdProtect(name)}{TypeParameters(typeParameters)}");
+      var realSuperClasses = superClasses?.Where(trait => !trait.IsObject).ToList() ?? new List<Type>();
+      if (realSuperClasses.Any()) {
+        wr.Write($" : {realSuperClasses.Comma(trait => TypeName(trait, wr, tok))}");
+      }
+      return wr.NewBlock();
+    }
+
+    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
+      // An iterator is compiled as follows:
+      //   public class MyIteratorExample<T>
+      //   {
+      //     public T q;  // in-parameter
+      //     public T x;  // yield-parameter
+      //     public int y;  // yield-parameter
+      //     IEnumerator<object> _iter;
+      //
+      //     public void _MyIteratorExample(T q) {
+      //       this.q = q;
+      //       _iter = TheIterator();
+      //     }
+      //
+      //     public bool MoveNext() {
+      //       return _iter.MoveNext();
+      //     }
+      //
+      //     private IEnumerator<object> TheIterator() {
+      //       // the translation of the body of the iterator, with each "yield" turning into a "yield return null;"
+      //       yield break;
+      //     }
+      //   }
+
+      var cw = (ClassWriter)CreateClass(IdProtect(iter.EnclosingModuleDefinition.GetCompileName(Options)), iter, wr);
+      var w = cw.InstanceMemberWriter;
+      // here come the fields
+
+      var constructors = iter.Members.OfType<Constructor>().ToList();
+
+      // we're expecting just one constructor 
+      var enumerable = constructors.ToList();
+      Contract.Assert(enumerable.Count == 1);
+      Constructor ct = constructors[0];
+
+      foreach (var member in iter.Members) {
+        if (member is Field f && !f.IsGhost) {
+          cw.DeclareField(IdName(f), iter, false, false, f.Type, f.Origin, PlaceboValue(f.Type, w, f.Origin, true), f);
+        }
+      }
+
+      w.WriteLine("System.Collections.Generic.IEnumerator<object> _iter;");
+
+      // here we rely on the parameters and the corresponding fields having the same names
+      var nonGhostFormals = ct.Ins.Where(p => !p.IsGhost).ToList();
+      var parameters = nonGhostFormals.Comma(p => $"{TypeName(p.Type, w, p.Origin)} {IdName(p)}");
+
+      // here's the initializer method
+      w.Write($"public void {IdName(ct)}({parameters})");
+      var wBody = w.NewBlock();
+      foreach (var p in nonGhostFormals) {
+        wBody.WriteLine("this.{0} = {0};", IdName(p));
+      }
+
+      wBody.WriteLine("this._iter = TheIterator();");
+      // here are the enumerator methods
+      w.WriteLine("public bool MoveNext() { return _iter.MoveNext(); }");
+      var wIter = w.NewBlock("private System.Collections.Generic.IEnumerator<object> TheIterator()");
+      var beforeYield = wIter.Fork();
+      wIter.WriteLine("yield break;");
+      return beforeYield;
+    }
+
+    private string DtTypeName(TopLevelDecl dt, bool typeVariables = true) {
+      var name = "_I" + dt.GetCompileName(Options);
+      if (typeVariables) { name += TypeParameters(SelectNonGhost(dt, dt.TypeArgs)); }
+      return name;
+    }
+
+    protected override IClassWriter/*?*/ DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
+      var w = CompileDatatypeBase(dt, wr);
+      CompileDatatypeConstructors(dt, wr);
+      return w;
+    }
+
+    IClassWriter CompileDatatypeBase(DatatypeDecl dt, ConcreteSyntaxTree wr) {
+      Contract.Requires(dt != null);
+      Contract.Requires(wr != null);
+
+      // public interface _IDt<T> { // T has variance modifier
+      //   _IDt<T> _Get();  // for co-datatypes
+      //
+      //   bool is_Ctor0 { get; }
+      //   ...
+      //
+      //   T0 dtor_Dtor0 { get; }
+      //   ...
+      //
+      //   _IDt<U> DowncastClone<U>(Func<T0, U0> converter0, ...);
+      //
+      //   // Members that don't violate C# variance restrictions
+      // }
+      //
+      // public abstract class Dt<T> : _IDt<T> {  // for record types: drop "abstract"
+      //   public Dt() { }
+      //   #if TypeArgs.Count == 0
+      //     private static _IDt<T> theDefault = ...;
+      //     public static _IDt<T> Default() {
+      //       return theDefault;
+      //     }
+      //   #else
+      //     public static _IDt<T> Default(values...) {
+      //       return ...;
+      //     }
+      //   #endif
+      //   public static TypeDescriptor<_IDt<T>> _TypeDescriptor(typeDescriptors...) {
+      //     return new TypeDescriptor<_IDt<T>>(Default(typeDescriptors...));
+      //   }
+      //   public abstract _IDt<T> _Get();  // for co-datatypes
+      //
+      //   public static _IDt<T> create_Ctor0(field0, field1, ...) {  // for record types: create
+      //     return new Dt_Ctor0(field0, field1, ...);                // for record types: new Dt
+      //   }
+      //   ...
+      //
+      //   public bool is_Ctor0 { get { return this is Dt_Ctor0; } }  // for record types: return true
+      //   ...
+      //
+      //   // if the datatype HasFinitePossibleValues
+      //   public static System.Collections.Generic.IEnumerable<_IDt<T>> AllSingletonConstructors { get {
+      //     yield return _IDt<T>.create_Ctor0();
+      //     ...
+      //   }}
+      //
+      //   public T0 dtor_Dtor0 { get {
+      //       var d = this;         // for inductive datatypes
+      //       var d = this._Get();  // for co-inductive datatypes
+      //       if (d is DT_Ctor0) { return ((DT_Ctor0)d).Dtor0; }
+      //       if (d is DT_Ctor1) { return ((DT_Ctor1)d).Dtor0; }
+      //       ...
+      //       if (d is DT_Ctor(n-2)) { return ((DT_Ctor(n-2))d).Dtor0; }
+      //       return ((DT_Ctor(n-1))d).Dtor0;  // for record types: drop cast
+      //    }}
+      //   ...
+      //
+      //   public abstract _IDt<U> DowncastClone<U>(Func<T0, U0> converter0, ...); // for record types: implementation
+      //
+      //   // Implementations of all members, but possibly (variance) rewritten to be static.
+      // }
+      var nonGhostTypeArgs = SelectNonGhost(dt, dt.TypeArgs);
+      var DtT_TypeArgs = TypeParameters(nonGhostTypeArgs);
+      var DtT_protected = protectedTypeName(dt) + DtT_TypeArgs;
+      var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, UserDefinedType.FromTopLevelDecl(dt.Origin, dt));
+      var simplifiedTypeName = TypeName(simplifiedType, wr, dt.Origin);
+
+      // ConcreteSyntaxTree for the interface
+      wr.Write($"public interface _I{dt.GetCompileName(Options)}{TypeParameters(nonGhostTypeArgs, true)}");
+      var superTraits = dt.ParentTypeInformation.UniqueParentTraits();
+      if (superTraits.Any()) {
+        wr.Write($" : {superTraits.Comma(trait => TypeName(trait, wr, dt.Origin))}");
+      }
+      var interfaceTree = wr.NewBlock();
+
+      // from here on, write everything into the new block created here:
+      var btw = wr.NewNamedBlock("public{0} class {1} : {2}", dt.IsRecordType ? "" : " abstract", DtT_protected, DtTypeName(dt));
+      wr = btw;
+
+      // constructor
+      if (dt.IsRecordType) {
+        DatatypeFieldsAndConstructor(dt.Ctors[0], 0, wr);
+      } else {
+        EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out var wTypeFields, out var wCtorParams, out _, out var wCtorBody);
+        wr.Append(wTypeFields);
+        wr.Format($"public {protectedTypeName(dt)}({wCtorParams})").NewBlock().Append(wCtorBody);
+      }
+
+      var wDefault = new ConcreteSyntaxTree();
+      ConcreteSyntaxTree wDefaultTypeArguments;
+      var defaultMethodTypeDescriptorCount = 0;
+      if (nonGhostTypeArgs.Count == 0) {
+        wr.FormatLine($"private static readonly {simplifiedTypeName} theDefault = {wDefault};");
+        var w = wr.NewBlock($"public static {simplifiedTypeName} Default()");
+        w.WriteLine("return theDefault;");
+        wDefaultTypeArguments = new ConcreteSyntaxTree();
+      } else {
+        wr.Write($"public static {simplifiedTypeName} Default(");
+        defaultMethodTypeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out _, out var wDefaultParameters, out wDefaultTypeArguments, out _);
+        var usedTypeParameters = UsedTypeParameters(dt);
+        var parameters = usedTypeParameters.Comma(tp => $"{tp.GetCompileName(Options)} {FormatDefaultTypeParameterValue(tp)}");
+        var sep = defaultMethodTypeDescriptorCount != 0 && usedTypeParameters.Count != 0 ? ", " : "";
+        wr.Write($"{wDefaultParameters}{sep}{parameters})");
+        var w = wr.NewBlock();
+        w.FormatLine($"return {wDefault};");
+      }
+
+      var groundingCtor = dt.GetGroundingCtor();
+      if (groundingCtor.IsGhost) {
+        wDefault.Write(ForcePlaceboValue(simplifiedType, wDefault, dt.Origin));
+      } else if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
+        wDefault.Write(DefaultValue(innerType, wDefault, dt.Origin));
+      } else {
+        if (dt is CoDatatypeDecl) {
+          var wCo = wDefault;
+          var count = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out _, out _, out var lazyTypeDescriptorArguments, out _);
+          var sep = count > 0 ? ", " : "";
+          wDefault = new ConcreteSyntaxTree();
+          wCo.Format($"new {dt.GetFullCompileName(Options)}__Lazy{DtT_TypeArgs}({lazyTypeDescriptorArguments}{sep}() => {{ return {wDefault}; }})");
+        }
+
+        var wDefaultArguments = wDefault.Write(DtCreateName(groundingCtor)).ForkInParens();
+        wDefaultArguments.Append(wDefaultTypeArguments);
+        var nonGhostFormals = groundingCtor.Formals.Where(f => !f.IsGhost).ToList();
+        if (defaultMethodTypeDescriptorCount != 0 && nonGhostFormals.Count != 0) {
+          wDefaultArguments.Write(", ");
+        }
+        wDefaultArguments.Write(nonGhostFormals.Comma(f => DefaultValue(f.Type, wDefault, f.Origin)));
+      }
+
+      EmitTypeDescriptorMethod(dt, wr);
+
+      if (dt is CoDatatypeDecl) {
+        interfaceTree.WriteLine($"{DtTypeName(dt)} _Get();");
+        wr.WriteLine($"public abstract {DtTypeName(dt)} _Get();");
+      }
+
+      // create methods
+      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out _, out var wCtorParams, out var wCallArguments, out _);
+        wr.Write($"public static {DtTypeName(dt)} {DtCreateName(ctor)}(");
+        wr.Append(wCtorParams);
+        var formalCount = WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wr);
+        var sep = typeDescriptorCount > 0 && formalCount > 0 ? ", " : "";
+        wr.NewBlock(")")
+          .WriteLine($"return new {DtCtorDeclarationName(ctor)}{DtT_TypeArgs}({wCallArguments}{sep}{ctor.Formals.Where(f => !f.IsGhost).Comma(FormalName)});");
+      }
+
+      if (dt.IsRecordType) {
+        // Also emit a "create_<ctor_name>" method that thunks to "create",
+        // to provide a more uniform interface.
+
+        var ctor = dt.Ctors[0];
+        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out _, out var wCtorParams, out var wCallArguments, out _);
+        wr.Write($"public static {DtTypeName(dt)} create_{ctor.GetCompileName(Options)}(");
+        wr.Append(wCtorParams);
+        var formalCount = WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wr);
+        var sep = typeDescriptorCount > 0 && formalCount > 0 ? ", " : "";
+        wr.NewBlock(")")
+          .WriteLine($"return create({wCallArguments}{sep}{ctor.Formals.Where(f => !f.IsGhost).Comma(FormalName)});");
+      }
+
+      // query properties
+      if (dt is TupleTypeDecl) {
+        // omit the is_ property for tuples, since it cannot be used syntactically in the language
+      } else {
+        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+          interfaceTree.WriteLine($"bool is_{ctor.GetCompileName(Options)} {{ get; }}");
+
+          var returnValue = dt.IsRecordType
+            // public bool is_Ctor0 { get { return true; } }
+            ? "true"
+            // public bool is_Ctor0 { get { return this is Dt_Ctor0; } }
+            : $"this is {dt.GetCompileName(Options)}_{ctor.GetCompileName(Options)}{DtT_TypeArgs}";
+          wr.WriteLine($"public bool is_{ctor.GetCompileName(Options)} {{ get {{ return {returnValue}; }} }}");
+        }
+      }
+
+      if (dt.HasFinitePossibleValues) {
+        Contract.Assert(nonGhostTypeArgs.Count == 0);
+        var w = wr.NewNamedBlock(
+          $"public static System.Collections.Generic.IEnumerable<{DtTypeName(dt)}> AllSingletonConstructors");
+        var wGet = w.NewBlock("get");
+        foreach (var ctor in dt.Ctors) {
+          Contract.Assert(ctor.Formals.Count == 0);
+          var constructor = ctor.IsGhost
+            ? ForcePlaceboValue(UserDefinedType.FromTopLevelDecl(dt.Origin, dt), wGet, dt.Origin)
+            : $"{DtT_protected}.{DtCreateName(ctor)}()";
+          wGet.WriteLine($"yield return {constructor};");
+        }
+      }
+
+      CompileDatatypeDestructorsAndAddToInterface(dt, wr, interfaceTree, DtT_TypeArgs);
+
+      CompileDatatypeDowncastClone(dt, interfaceTree, nonGhostTypeArgs, toInterface: true);
+      if (!dt.IsRecordType) {
+        CompileDatatypeDowncastClone(dt, wr, nonGhostTypeArgs);
+      }
+
+      CompileDatatypeInterfaceMembers(dt, interfaceTree);
+
+      return new ClassWriter(this, btw, null);
+    }
+
+    /// <summary>
+    /// Generate the "DowncastClone" code for a generated datatype. This includes the exported signature for the interface,
+    /// the abstract method for the abstract class, and the actual implementations for the constructor classes. If the
+    /// datatype is a record type, there is no abstract class, so the method is directly emitted. Contravariant type
+    /// parameters require a CustomReceiver-like treatment involving static methods and can thus require a jump table in
+    /// the abstract class. Erasable type wrappers require the same kind of CustomReceiver-like treatment and operate
+    /// on the unwrapped type.
+    /// toInterface: just the signature for the interface
+    /// lazy: convert the computer of a codatatype's "__Lazy" class
+    /// ctor: constructor to generate the method for
+    /// </summary>
+    private void CompileDatatypeDowncastClone(DatatypeDecl datatype, ConcreteSyntaxTree wr,
+        List<TypeParameter> nonGhostTypeArgs, bool toInterface = false, bool lazy = false, DatatypeCtor ctor = null) {
+      bool InvalidType(Type ty, bool refTy) =>
+        (ty.AsTypeParameter != null && refTy && datatype.TypeArgs.Contains(ty.AsTypeParameter))
+        || ty.TypeArgs.Exists(arg => InvalidType(arg, refTy || ty.IsRefType));
+
+      if (datatype.Ctors.Any(ctor => ctor.Formals.Any(f => !f.IsGhost && InvalidType(f.SyntacticType, false)))) {
+        return;
+      }
+
+      var customReceiver = DowncastCloneNeedsCustomReceiver(datatype);
+      var uTypeArgs = TypeParameters(nonGhostTypeArgs, uniqueNames: true);
+      var typeArgs = TypeParameters(nonGhostTypeArgs);
+      var typeParameterSubstMap = nonGhostTypeArgs.ToDictionary(
+        tp => tp,
+        tp => new TypeParameter(tp.Origin, tp.NameNode.Prepend("_"), tp.VarianceSyntax));
+      var typeSubstMap = nonGhostTypeArgs.ToDictionary(
+        tp => tp,
+        tp => (Type)new UserDefinedType(tp.Origin, typeParameterSubstMap[tp]));
+      var uTypeParameters = datatype.TypeArgs.ConvertAll(tp => typeParameterSubstMap[tp]);
+
+      var resultType = DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, datatype, out var innerType)
+        ? TypeName(innerType.Subst(typeSubstMap), wr, datatype.Origin)
+        : "_I" + datatype.GetCompileName(Options) + uTypeArgs;
+      var converters = $"{nonGhostTypeArgs.Comma((_, i) => $"converter{i}")}";
+      var lazyClass = $"{datatype.GetFullCompileName(Options)}__Lazy";
+      string PrintConverter(TypeParameter tArg, int i) {
+        var name = IdName(tArg);
+        return $"Func<{name}, __{name}> converter{i}";
+      }
+
+      if (!toInterface) {
+        string Modifiers(string abs, string single, string cons) =>
+          (ctor != null || lazy) ? (datatype.IsRecordType ? single : cons) : abs;
+        var modifiers = customReceiver
+          ? Modifiers("static ", "static ", "new static ")
+          : Modifiers("abstract ", "", "override ");
+        wr.Write($"public {modifiers}");
+      }
+
+      if (!(toInterface && customReceiver)) {
+        var typeDescriptorCount = EmitTypeDescriptorsForClass(datatype.TypeArgs, datatype,
+          out _, out var wTypeDescriptorDecls, out _, out _, uTypeParameters);
+
+        string receiver;
+        if (customReceiver) {
+          var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, UserDefinedType.FromTopLevelDecl(datatype.Origin, datatype));
+          receiver = $"{TypeName(simplifiedType, wr, datatype.Origin)} _this";
+        } else {
+          receiver = "";
+        }
+
+        var comma0 = typeDescriptorCount != 0 && receiver.Length != 0 ? ", " : "";
+        var comma1 = (typeDescriptorCount != 0 || receiver.Length != 0) && nonGhostTypeArgs.Count != 0 ? ", " : "";
+        wr.Write($"{resultType} DowncastClone{uTypeArgs}({wTypeDescriptorDecls}{comma0}{receiver}{comma1}{nonGhostTypeArgs.Comma(PrintConverter)})");
+      }
+
+      if (ctor == null && !lazy) {
+        if (!customReceiver) {
+          wr.WriteLine(";");
+        } else if (!toInterface) {
+          var body = wr.NewBlock();
+
+          ConcreteSyntaxTree NextBlock(string comp) { return body.NewBlock($"if (_this{comp})"); }
+
+          void WriteReturn(ConcreteSyntaxTree wr, string staticClass) {
+            var typeDescriptorCount = EmitTypeDescriptorsForClass(datatype.TypeArgs, datatype,
+              out _, out _, out var wTypeDescriptorArguments, out _, uTypeParameters);
+            var sep0 = typeDescriptorCount != 0 ? ", " : "";
+            var sep1 = converters.Length != 0 ? ", " : "";
+            wr.WriteLine($"return {staticClass}{typeArgs}.DowncastClone{uTypeArgs}({wTypeDescriptorArguments}{sep0}_this{sep1}{converters});");
+          }
+
+          if (datatype is CoDatatypeDecl) {
+            WriteReturn(NextBlock($" is {lazyClass}{typeArgs}"), lazyClass);
+          }
+
+          var nonGhostConstructors = datatype.Ctors.Where(ctor => !ctor.IsGhost).ToList();
+          for (var i = 0; i < nonGhostConstructors.Count; i++) {
+            var ret = body;
+            //The final constructor is chosen as the default
+            if (i + 1 < nonGhostConstructors.Count) {
+              ret = NextBlock($".is_{nonGhostConstructors[i].GetCompileName(Options)}");
+            }
+            WriteReturn(ret, DtCtorDeclarationName(nonGhostConstructors[i]));
+          }
+        }
+        return;
+      }
+
+      string PrintConvertedExpr(string name, Type fromType) {
+        var constructorIndex = nonGhostTypeArgs.IndexOf(fromType.AsTypeParameter);
+        if (constructorIndex != -1) {
+          return $"converter{constructorIndex}({name})";
+        }
+
+        bool ContainsTyVar(TypeParameter tp, Type ty)
+          => (ty.AsTypeParameter != null && ty.AsTypeParameter.Equals(tp))
+             || ty.TypeArgs.Exists(ty => ContainsTyVar(tp, ty));
+        if (nonGhostTypeArgs.Exists(ty => ContainsTyVar(ty, fromType))) {
+          var map = nonGhostTypeArgs.ToDictionary(
+            tp => tp,
+            tp => (Type)new UserDefinedType(tp.Origin, new TypeParameter(tp.Origin, tp.NameNode.Prepend("_"), tp.VarianceSyntax)));
+          var to = fromType.Subst(map);
+          var downcast = new ConcreteSyntaxTree();
+          EmitDowncast(fromType, to, null, downcast).Write(name);
+          return downcast.ToString();
+        }
+
+        return name;
+      }
+
+      string PrintInvocation(Formal f, int i) {
+        var name = customReceiver
+          ? datatype.IsRecordType || !f.HasName
+            ? $"(({DtCtorDeclarationName(ctor)}{typeArgs}) _this).{FieldName(f, i)}"
+            : $"_this.{DestructorGetterName(f, ctor, i)}"
+          : FieldName(f, i);
+        return PrintConvertedExpr(name, f.Type);
+      }
+
+      if (innerType != null) {
+        var wBody = wr.NewBlock("");
+        wBody.WriteLine($"return {PrintConvertedExpr("_this", innerType)};");
+      } else {
+        var wBody = wr.NewBlock("").WriteLine($"if ({(customReceiver ? "_" : "")}this is {resultType} dt) {{ return dt; }}");
+        var typeDescriptorCount = EmitTypeDescriptorsForClass(datatype.TypeArgs, datatype, out _, out _, out var wCallArguments, out _, uTypeParameters);
+        var typeDescriptorArgumentsStrings = wCallArguments.ToString();
+        string constructorArgs;
+        if (!lazy) {
+          constructorArgs = ctor.Formals.Where(f => !f.IsGhost).Comma(PrintInvocation);
+        } else if (customReceiver) {
+          var sep0 = typeDescriptorCount != 0 ? ", " : "";
+          var sep1 = converters.Length != 0 ? ", " : "";
+          constructorArgs =
+            $"() => {datatype.GetCompileName(Options)}{typeArgs}.DowncastClone{uTypeArgs}({typeDescriptorArgumentsStrings}{sep0}_this._Get(){sep1}{converters})";
+        } else {
+          var sep0 = typeDescriptorCount != 0 && converters.Length != 0 ? ", " : "";
+          constructorArgs = $"() => _Get().DowncastClone{uTypeArgs}({typeDescriptorArgumentsStrings}{sep0}{converters})";
+        }
+        var sep = typeDescriptorCount != 0 && (lazy || ctor.Formals.Any(f => !f.IsGhost)) ? ", " : "";
+        var className = lazy ? lazyClass : DtCtorDeclarationName(ctor);
+        wBody.WriteLine($"return new {className}{uTypeArgs}({typeDescriptorArgumentsStrings}{sep}{constructorArgs});");
+      }
+    }
+
+    // Emits getters for both named and unnamed destructors. The named ones are grouped across constructors by their
+    // name and thus QDtorM = DtorM. This is not possible for unnamed ones, as there is no guarantee about shared return
+    // types, so they are treated individually and their names (QDtorM) are qualified by their respective constructors.
+    private void CompileDatatypeDestructorsAndAddToInterface(DatatypeDecl dt, ConcreteSyntaxTree wr,
+        ConcreteSyntaxTree interfaceTree, string DtT_TypeArgs) {
+      foreach (var ctor in dt.Ctors) {
+        var index = 0;
+        foreach (var dtor in ctor.Destructors.Where(dtor => dtor.EnclosingCtors[0] == ctor)) {
+          var compiledConstructorCount = dtor.EnclosingCtors.Count(constructor => !constructor.IsGhost);
+          if (compiledConstructorCount != 0) {
+            var arg = dtor.CorrespondingFormals[0];
+            if (!arg.IsGhost) {
+              var DtorM = arg.HasName ? InternalFieldPrefix + arg.CompileName : FieldName(arg, index);
+              //   TN dtor_QDtorM { get; }
+              interfaceTree.WriteLine($"{TypeName(arg.Type, wr, arg.Origin)} {DestructorGetterName(arg, ctor, index)} {{ get; }}");
+
+              //   public TN dtor_QDtorM { get {
+              //       var d = this;         // for inductive datatypes
+              //       var d = this._Get();  // for co-inductive datatypes
+              //       if (d is DT_Ctor0) { return ((DT_Ctor0)d).DtorM; }
+              //       if (d is DT_Ctor1) { return ((DT_Ctor1)d).DtorM; }
+              //       ...
+              //       if (d is DT_Ctor(n-2)) { return ((DT_Ctor(n-2))d).DtorM; }
+              //       return ((DT_Ctor(n-1))d).DtorM;
+              //    }}
+              var wDtor =
+                wr.NewNamedBlock($"public {TypeName(arg.Type, wr, arg.Origin)} {DestructorGetterName(arg, ctor, index)}");
+              var wGet = wDtor.NewBlock("get");
+              if (dt.IsRecordType) {
+                if (dt is CoDatatypeDecl) {
+                  wGet.WriteLine($"return this._Get().{IdProtect(DtorM)};");
+                } else {
+                  wGet.WriteLine($"return this.{IdProtect(DtorM)};");
+                }
+              } else {
+                if (dt is CoDatatypeDecl) {
+                  wGet.WriteLine("var d = this._Get();");
+                } else {
+                  wGet.WriteLine("var d = this;");
+                }
+
+                var compiledConstructorsProcessed = 0;
+                for (var i = 0; i < dtor.EnclosingCtors.Count; i++) {
+                  var ctor_i = dtor.EnclosingCtors[i];
+                  Contract.Assert(arg.CompileName == dtor.CorrespondingFormals[i].CompileName);
+                  if (ctor_i.IsGhost) {
+                    continue;
+                  }
+                  var type = $"{dt.GetCompileName(Options)}_{ctor_i.GetCompileName(Options)}{DtT_TypeArgs}";
+                  // TODO use pattern matching to replace cast.
+                  var returnTheValue = $"return (({type})d).{IdProtect(DtorM)};";
+                  if (compiledConstructorsProcessed < compiledConstructorCount - 1) {
+                    wGet.WriteLine($"if (d is {type}) {{ {returnTheValue} }}");
+                  } else {
+                    wGet.WriteLine(returnTheValue);
+                  }
+                  compiledConstructorsProcessed++;
+                }
+              }
+              index++;
+            }
+          }
+        }
+      }
+    }
+
+    private void CompileDatatypeInterfaceMembers(DatatypeDecl dt, ConcreteSyntaxTree interfaceTree) {
+      foreach (var member in dt.Members) {
+        if (member.IsGhost || member.IsStatic) { continue; }
+        if (member is Function fn && !NeedsCustomReceiver(member)) {
+          CreateFunction(IdName(fn), CombineAllTypeArguments(fn), fn.Ins, fn.ResultType, fn.Origin, fn.IsStatic,
+            false, fn, interfaceTree, false, false);
+        } else if (member is Method m && !NeedsCustomReceiver(member)) {
+          CreateMethod(m, CombineAllTypeArguments(m), false, interfaceTree, false, false);
+        } else if (member is ConstantField c && !NeedsCustomReceiver(member)) {
+          CreateFunctionOrGetter(c, IdName(c), dt, false, false, false, new ClassWriter(this, interfaceTree, null));
+        }
+      }
+    }
+
+    string NeedsNew(TopLevelDeclWithMembers ty, string memberName) {
+      Contract.Requires(ty != null);
+      Contract.Requires(memberName != null);
+      if (ty.Members.Exists(member => member.Name == memberName)) {
+        return "new ";
+      } else {
+        return "";
+      }
+    }
+
+    public override bool NeedsCustomReceiverInDatatype(MemberDecl member) {
+      Contract.Requires(!member.IsStatic && member.EnclosingClass is DatatypeDecl);
+      if (member.EnclosingClass is DatatypeDecl d) {
+        foreach (var tp in d.TypeArgs) {
+          bool InvalidType(Type ty) => (ty.AsTypeParameter != null && ty.AsTypeParameter.Equals(tp))
+                                       || ty.TypeArgs.Exists(InvalidType);
+          bool InvalidFormal(Formal f) => !f.IsGhost && InvalidType(f.SyntacticType);
+          switch (tp.Variance) {
+            //Can only be in output
+            case TypeParameter.TPVariance.Co:
+              if ((member is Function f && f.Ins.Exists(InvalidFormal))
+                  || (member is Method m && m.Ins.Exists(InvalidFormal))
+                  || NeedsTypeDescriptor(tp)) {
+                return true;
+              }
+              break;
+            //Can only be in input
+            case TypeParameter.TPVariance.Contra:
+              if ((member is Function fn && InvalidType(fn.ResultType))
+                  || (member is Method me && me.Outs.Exists(InvalidFormal))
+                  || (member is ConstantField c && InvalidType(c.Type))) {
+                return true;
+              }
+              break;
+          }
+        }
+      }
+
+      return base.NeedsCustomReceiverInDatatype(member);
+    }
+
+    private void CompileDatatypeConstructors(DatatypeDecl dt, ConcreteSyntaxTree wrx) {
+      Contract.Requires(dt != null);
+      var nonGhostTypeArgs = SelectNonGhost(dt, dt.TypeArgs);
+      string typeParams = TypeParameters(nonGhostTypeArgs);
+      if (dt is CoDatatypeDecl) {
+        // public class Dt__Lazy<T> : Dt<T> {
+        //   public delegate _IDt<T> Computer();
+        //   Computer c;
+        //   _IDt<T> d;
+        //   public Dt__Lazy(Computer c) { this.c = c; }
+        //   public override _IDt<U> DowncastClone<U>(Func<T0, U0> converter0, ...) {
+        //     if (this is _IDt<U> dt) { return dt; }
+        //     return new Dt__Lazy<U>(() => c().DowncastClone<U>(converter0, ...));
+        //   }
+        //   public override _IDt<T> _Get() { if (c != null) { d = c(); c = null; } return d; }
+        //   public override string ToString() { return _Get().ToString(); }
+        // }
+        var w = wrx.NewNamedBlock($"public class {dt.GetCompileName(Options)}__Lazy{typeParams} : {protectedTypeName(dt)}{typeParams}");
+        w.WriteLine($"public {NeedsNew(dt, "Computer")}delegate {DtTypeName(dt)} Computer();");
+        w.WriteLine($"{NeedsNew(dt, "c")}Computer c;");
+        w.WriteLine($"{NeedsNew(dt, "d")}{DtTypeName(dt)} d;");
+
+        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out _, out var wCtorParams, out var wBaseCallArguments, out _);
+        var sep = typeDescriptorCount > 0 ? ", " : "";
+        w.NewBlock($"public {dt.GetCompileName(Options)}__Lazy({wCtorParams}{sep}Computer c) : base({wBaseCallArguments})")
+          .WriteLine("this.c = c;");
+        CompileDatatypeDowncastClone(dt, w, nonGhostTypeArgs, lazy: true);
+        w.WriteLine($"public override {DtTypeName(dt)} _Get() {{ if (c != null) {{ d = c(); c = null; }} return d; }}");
+        w.WriteLine("public override string ToString() { return _Get().ToString(); }");
+      }
+
+      if (dt.IsRecordType) {
+        // There is only one constructor, and it is populated by CompileDatatypeBase
+        return;
+      }
+
+      int constructorIndex = 0; // used to give each constructor a different name
+      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+        var wr = wrx.NewNamedBlock(
+          $"public class {DtCtorDeclarationName(ctor)}{TypeParameters(nonGhostTypeArgs)} : {protectedTypeName(dt)}{typeParams}");
+        DatatypeFieldsAndConstructor(ctor, constructorIndex, wr);
+        constructorIndex++;
+      }
+    }
+
+    void DatatypeFieldsAndConstructor(DatatypeCtor ctor, int constructorIndex, ConcreteSyntaxTree wr) {
+      Contract.Requires(ctor != null);
+      Contract.Requires(0 <= constructorIndex && constructorIndex < ctor.EnclosingDatatype.Ctors.Count);
+      Contract.Requires(wr != null);
+
+      var dt = ctor.EnclosingDatatype;
+      // class Dt_Ctor<T> : Dt<T> {  // This line is to be added by the caller of DatatypeFieldsAndConstructor
+      //   Fields;
+      //   public Dt_Ctor(arguments) {  // for record types: Dt
+      //     Fields = arguments;
+      //   }
+      //   public override _IDt<T> _Get() { return this; }  // for co-datatypes only
+      //   public override _IDt<U> DowncastClone<U>(Func<T0, U0> converter0, ...) {
+      //     if (this is _IDt<U> dt) {
+      //       return dt;
+      //     } else {
+      //       return new Dt_Ctor<U>(converter0(_field0), ...);
+      //     }
+      //   }
+      //   public override bool Equals(object other) {
+      //     var oth = other as Dt_Ctor;  // for record types: Dt
+      //     return oth != null && equals(_field0, oth._field0) && ... ;
+      //   }
+      //   public override int GetHashCode() {
+      //     return base.GetHashCode();  // surely this can be improved
+      //   }
+      //   public override string ToString() {  // only for inductive datatypes
+      //     // ...
+      //   }
+      // }
+
+      var i = 0;
+      foreach (Formal arg in ctor.Formals) {
+        if (!arg.IsGhost) {
+          wr.WriteLine($"public readonly {TypeName(arg.Type, wr, arg.Origin)} {FieldName(arg, i)};");
+          i++;
+        }
+      }
+
+      var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out var wTypeFields, out var wCtorParams, out var wBaseCallArguments, out var wCtorBody);
+      if (ctor.EnclosingDatatype.IsRecordType) {
+        wr.Append(wTypeFields);
+      }
+      var wBaseCall = new ConcreteSyntaxTree();
+      wr.Format($"public {DtCtorDeclarationName(ctor)}({wCtorParams}){wBaseCall}").NewBlock().Append(wCtorBody);
+      if (!ctor.EnclosingDatatype.IsRecordType) {
+        wBaseCall.Write(" : base").ForkInParens().Append(wBaseCallArguments);
+      }
+      WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wCtorParams);
+      {
+        var w = wCtorBody;
+        i = 0;
+        foreach (Formal arg in ctor.Formals) {
+          if (!arg.IsGhost) {
+            w.WriteLine($"this.{FieldName(arg, i)} = {FormalName(arg, i)};");
+            i++;
+          }
+        }
+      }
+
+      var nonGhostTypeArgs = SelectNonGhost(dt, dt.TypeArgs);
+
+      if (dt is CoDatatypeDecl) {
+        wr.WriteLine($"public override {DtTypeName(dt)} _Get() {{ return this; }}");
+      }
+
+      CompileDatatypeDowncastClone(dt, wr, nonGhostTypeArgs, ctor: ctor);
+
+      // Equals method
+      {
+        var w = wr.NewBlock("public override bool Equals(object other)");
+        w.WriteLine($"var oth = other as {DtCtorName(ctor)}{TypeParameters(nonGhostTypeArgs)};");
+        w.Write("return oth != null");
+        i = 0;
+        foreach (var arg in ctor.Formals) {
+          if (!arg.IsGhost) {
+            var nm = FieldName(arg, i);
+            w.Write(IsDirectlyComparable(DatatypeWrapperEraser.SimplifyType(Options, arg.Type))
+              ? $" && this.{nm} == oth.{nm}"
+              : $" && object.Equals(this.{nm}, oth.{nm})");
+
+            i++;
+          }
+        }
+
+        w.WriteLine(";");
+      }
+
+      // GetHashCode method (Uses the djb2 algorithm)
+      {
+        var w = wr.NewBlock("public override int GetHashCode()");
+        w.WriteLine("ulong hash = 5381;");
+        w.WriteLine($"hash = ((hash << 5) + hash) + {constructorIndex};");
+        i = 0;
+        foreach (Formal arg in ctor.Formals) {
+          if (!arg.IsGhost) {
+            string nm = FieldName(arg, i);
+            w.WriteLine($"hash = ((hash << 5) + hash) + ((ulong){DafnyHelpersClass}.GetHashCode(this.{nm}));");
+            i++;
+          }
+        }
+
+        w.WriteLine("return (int) hash;");
+      }
+
+      {
+        var w = wr.NewBlock("public override string ToString()");
+        string nm;
+        if (dt is TupleTypeDecl) {
+          nm = "";
+        } else {
+          nm = (dt.EnclosingModuleDefinition.TryToAvoidName ? "" : dt.EnclosingModuleDefinition.Name + ".") + dt.Name + "." + ctor.Name;
+        }
+
+        switch (dt) {
+          case TupleTypeDecl tupleDt when ctor.Formals.Count == 0:
+            // here we want parentheses and no name
+            w.WriteLine("return \"()\";");
+            break;
+          case CoDatatypeDecl _:
+            w.WriteLine($"return \"{nm}\";");
+            break;
+          default:
+            var tempVar = GenVarName("s", ctor.Formals);
+            w.WriteLine($"string {tempVar} = \"{nm}\";");
+            if (ctor.Formals.Count != 0) {
+              w.WriteLine($"{tempVar} += \"(\";");
+              i = 0;
+              foreach (var arg in ctor.Formals) {
+                if (!arg.IsGhost) {
+                  if (i != 0) {
+                    w.WriteLine($"{tempVar} += \", \";");
+                  }
+
+                  if (arg.Type.IsStringType && UnicodeCharEnabled) {
+                    w.WriteLine($"{tempVar} += this.{FieldName(arg, i)}.ToVerbatimString(true);");
+                  } else {
+                    w.WriteLine($"{tempVar} += {DafnyHelpersClass}.ToString(this.{FieldName(arg, i)});");
+                  }
+
+                  i++;
+                }
+              }
+
+              w.WriteLine($"{tempVar} += \")\";");
+            }
+
+            w.WriteLine($"return {tempVar};");
+            break;
+        }
+      }
+    }
+
+    private string FieldName(Formal formal, int i) {
+      Contract.Requires(formal != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      return IdProtect(InternalFieldPrefix + (formal.HasName ? formal.CompileName : "a" + i));
+    }
+
+    /// <summary>
+    /// Returns a protected name.
+    /// </summary>
+    string DtCtorDeclarationName(DatatypeCtor ctor) {
+      Contract.Requires(ctor != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      var dt = ctor.EnclosingDatatype;
+      return dt.IsRecordType ? protectedTypeName(dt) : dt.GetCompileName(Options) + "_" + ctor.GetCompileName(Options);
+    }
+
+    /// <summary>
+    /// Returns a protected name with type parameters.
+    /// </summary>
+    string DtCtorName(DatatypeCtor ctor, List<Type> typeArgs, ConcreteSyntaxTree wr) {
+      Contract.Requires(ctor != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      var s = DtCtorName(ctor);
+      if (typeArgs != null && typeArgs.Count != 0) {
+        s += $"<{TypeNames(typeArgs, wr, ctor.Origin)}>";
+      }
+
+      return s;
+    }
+
+    /// <summary>
+    /// Returns a protected name. (No type parameters.)
+    /// </summary>
+    string DtCtorName(DatatypeCtor ctor) {
+      Contract.Requires(ctor != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      var dt = ctor.EnclosingDatatype;
+      var dtName = protectedTypeName(dt);
+      if (!dt.EnclosingModuleDefinition.TryToAvoidName) {
+        dtName = IdProtectModule(dt.EnclosingModuleDefinition.GetCompileName(Options)) + "." + dtName;
+      }
+
+      return dt.IsRecordType ? dtName : dtName + "_" + ctor.GetCompileName(Options);
+    }
+
+    string DtCreateName(DatatypeCtor ctor) {
+      Contract.Assert(!ctor.IsGhost); // there should never be an occasion to ask for a ghost constructor
+      if (ctor.EnclosingDatatype.IsRecordType) {
+        return "create";
+      } else {
+        return "create_" + ctor.GetCompileName(Options);
+      }
+    }
+
+    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
+      var cw = (ClassWriter)CreateClass(IdProtect(nt.EnclosingModuleDefinition.GetCompileName(Options)), nt, wr);
+      var w = cw.StaticMemberWriter;
+      if (nt.NativeType != null) {
+        var wEnum = w.NewBlock($"public static System.Collections.Generic.IEnumerable<{GetNativeTypeName(nt.NativeType)}> IntegerRange(BigInteger lo, BigInteger hi)");
+        wEnum.WriteLine($"for (var j = lo; j < hi; j++) {{ yield return ({GetNativeTypeName(nt.NativeType)})j; }}");
+      }
+      if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        var wStmts = w.Fork();
+        var witness = Expr(nt.Witness, false, wStmts).ToString();
+        string typeName;
+        if (nt.NativeType == null) {
+          typeName = TypeName(nt.BaseType, cw.StaticMemberWriter, nt.Origin);
+        } else {
+          typeName = GetNativeTypeName(nt.NativeType);
+          witness = $"({typeName})({witness})";
+        }
+        DeclareField("Witness", true, true, true, typeName, witness, cw);
+      }
+      EmitTypeDescriptorMethod(nt, w);
+      GenerateIsMethod(nt, cw.StaticMemberWriter);
+
+      if (nt.ParentTraits.Count != 0) {
+        DeclareBoxedNewtype(nt, cw.InstanceMemberWriter);
+      }
+
+      return cw;
+    }
+
+    void GenerateIsMethod(RedirectingTypeDecl declWithConstraints, ConcreteSyntaxTree wr) {
+      Contract.Requires(declWithConstraints is SubsetTypeDecl or NewtypeDecl);
+
+      if (declWithConstraints.ConstraintIsCompilable) {
+        var type = UserDefinedType.FromTopLevelDecl(declWithConstraints.Tok, (TopLevelDecl)declWithConstraints);
+
+        wr.Write($"public static bool {IsMethodName}(");
+
+        var count = EmitTypeDescriptorsForClass(declWithConstraints.TypeArgs, (TopLevelDecl)declWithConstraints,
+          out _, out var wCtorParams, out _, out _);
+        if (count != 0) {
+          wr.Write($"{wCtorParams}, ");
+        }
+
+        var sourceFormal = new Formal(declWithConstraints.Tok, "_source", type, true, false, null);
+        var typeName = TypeName(type, wr, declWithConstraints.Tok);
+        var wrBody = wr.NewBlock($"{typeName} {IdName(sourceFormal)})");
+        GenerateIsMethodBody(declWithConstraints, sourceFormal, wrBody);
+      }
+    }
+
+    void DeclareBoxedNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
+      // instance field:  public TargetRepresentation _value;
+      var targetTypeName = nt.NativeType == null ? TypeName(nt.BaseType, wr, nt.Origin) : GetNativeTypeName(nt.NativeType);
+      wr.WriteLine($"public {targetTypeName} _value;");
+
+      // constructor:
+      // public NewType(TargetRepresentation value) {
+      //   _value = value;
+      // }
+      var wBody = wr.NewNamedBlock($"public {IdName(nt)}({targetTypeName} value)");
+      wBody.WriteLine("_value = value;");
+
+      // public override string ToString() {
+      //   return _value.ToString();
+      // }
+      wBody = wr.NewNamedBlock("public override string ToString()");
+      wBody.WriteLine("return _value.ToString();");
+    }
+
+    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
+      var cw = (ClassWriter)CreateClass(IdProtect(sst.EnclosingModuleDefinition.GetCompileName(Options)), sst, wr);
+      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        var sw = new ConcreteSyntaxTree(cw.InstanceMemberWriter.RelativeIndentLevel);
+        var wStmts = cw.InstanceMemberWriter.Fork();
+        sw.Append(Expr(sst.Witness, false, wStmts));
+        var witness = sw.ToString();
+        var typeName = TypeName(sst.Rhs, cw.StaticMemberWriter, sst.Origin);
+        if (sst.TypeArgs.Count == 0) {
+          DeclareField("Witness", false, true, true, typeName, witness, cw);
+          witness = "Witness";
+        }
+        var w = cw.StaticMemberWriter.NewBlock($"public static {typeName} Default()");
+        w.WriteLine($"return {witness};");
+      }
+      EmitTypeDescriptorMethod(sst, cw.StaticMemberWriter);
+      GenerateIsMethod(sst, cw.StaticMemberWriter);
+    }
+
+    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
+      switch (sel) {
+        case NativeType.Selection.Byte:
+          name = "byte";
+          literalSuffix = "";
+          needsCastAfterArithmetic = true;
+          break;
+        case NativeType.Selection.SByte:
+          name = "sbyte";
+          literalSuffix = "";
+          needsCastAfterArithmetic = true;
+          break;
+        case NativeType.Selection.UShort:
+          name = "ushort";
+          literalSuffix = "";
+          needsCastAfterArithmetic = true;
+          break;
+        case NativeType.Selection.Short:
+          name = "short";
+          literalSuffix = "";
+          needsCastAfterArithmetic = true;
+          break;
+        case NativeType.Selection.UInt:
+          name = "uint";
+          literalSuffix = "U";
+          needsCastAfterArithmetic = false;
+          break;
+        case NativeType.Selection.Int:
+          name = "int";
+          literalSuffix = "";
+          needsCastAfterArithmetic = false;
+          break;
+        case NativeType.Selection.Number:
+          name = "number";
+          literalSuffix = "";
+          needsCastAfterArithmetic = false;
+          break;
+        case NativeType.Selection.ULong:
+          name = "ulong";
+          literalSuffix = "UL";
+          needsCastAfterArithmetic = false;
+          break;
+        case NativeType.Selection.Long:
+          name = "long";
+          literalSuffix = "L";
+          needsCastAfterArithmetic = false;
+          break;
+        default:
+          Contract.Assert(false); // unexpected native type
+          throw new cce.UnreachableException(); // to please the compiler
+      }
+    }
+
+    protected class ClassWriter : IClassWriter {
+      public readonly CsharpCodeGenerator CodeGenerator;
+      public readonly ConcreteSyntaxTree InstanceMemberWriter;
+      public readonly ConcreteSyntaxTree StaticMemberWriter;
+      public readonly ConcreteSyntaxTree CtorBodyWriter;
+      private readonly CsharpSynthesizer csharpSynthesizer;
+
+      public ClassWriter(CsharpCodeGenerator codeGenerator, ConcreteSyntaxTree instanceMemberWriter, ConcreteSyntaxTree/*?*/ ctorBodyWriter, ConcreteSyntaxTree/*?*/ staticMemberWriter = null) {
+        Contract.Requires(codeGenerator != null);
+        Contract.Requires(instanceMemberWriter != null);
+        this.CodeGenerator = codeGenerator;
+        this.InstanceMemberWriter = instanceMemberWriter;
+        this.CtorBodyWriter = ctorBodyWriter;
+        this.StaticMemberWriter = staticMemberWriter ?? instanceMemberWriter;
+        this.csharpSynthesizer = new CsharpSynthesizer(CodeGenerator, ErrorWriter());
+      }
+
+      public ConcreteSyntaxTree Writer(bool isStatic, bool createBody, MemberDecl/*?*/ member) {
+        if (createBody) {
+          if (isStatic || (member?.EnclosingClass is TraitDecl && CodeGenerator.NeedsCustomReceiver(member))) {
+            return StaticMemberWriter;
+          }
+        }
+
+        return InstanceMemberWriter;
+      }
+
+      public ConcreteSyntaxTree /*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        return CodeGenerator.CreateMethod(m, typeArgs, createBody, Writer(m.IsStatic, createBody, m), forBodyInheritance, lookasideBody);
+      }
+
+      public ConcreteSyntaxTree SynthesizeMethod(Method method, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance,
+        bool lookasideBody) {
+        return csharpSynthesizer.SynthesizeMethod(method, typeArgs, createBody, Writer(method.IsStatic, createBody, method), forBodyInheritance, lookasideBody);
+      }
+
+      public ConcreteSyntaxTree /*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
+        return CodeGenerator.CreateFunction(name, typeArgs, formals, resultType, tok, isStatic, createBody, member, Writer(isStatic, createBody, member), forBodyInheritance, lookasideBody);
+      }
+
+      public ConcreteSyntaxTree /*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IOrigin tok, bool isStatic, bool isConst, bool createBody, MemberDecl /*?*/ member, bool forBodyInheritance) {
+        return CodeGenerator.CreateGetter(name, resultType, tok, isStatic, createBody, Writer(isStatic, createBody, member));
+      }
+
+      public ConcreteSyntaxTree /*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody, MemberDecl /*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
+        return CodeGenerator.CreateGetterSetter(name, resultType, tok, createBody, out setterWriter, Writer(false, createBody, member));
+      }
+
+      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs, Field field) {
+        var typeName = CodeGenerator.TypeName(type, this.StaticMemberWriter, tok);
+        CodeGenerator.DeclareField(name, true, isStatic, isConst, typeName, rhs, this);
+      }
+
+      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
+        throw new cce.UnreachableException(); // InitializeField should be called only for those compilers that set ClassesRedeclareInheritedFields to false.
+      }
+
+      public ConcreteSyntaxTree /*?*/ ErrorWriter() => InstanceMemberWriter;
+
+      public void Finish() { }
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
+      var customReceiver = createBody && !forBodyInheritance && NeedsCustomReceiver(m);
+      var keywords = Keywords(createBody, m.IsStatic || customReceiver, false);
+      var returnType = GetTargetReturnTypeReplacement(m, wr);
+      AddTestCheckerIfNeeded(m.Name, m, wr);
+      var typeParameters = TypeParameters(TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, m, lookasideBody)));
+      var parameters = GetMethodParameters(m, typeArgs, lookasideBody, customReceiver, returnType);
+
+      if (!createBody && m is Constructor) { return null; }
+
+      wr.Format($"{keywords}{returnType} {IdName(m)}{typeParameters}({parameters})");
+
+      if (!createBody) {
+        wr.WriteLine(";");
+        return null;
+      }
+
+      var block = wr.NewBlock(open: BlockStyle.NewlineBrace);
+      if (returnType != "void" && !forBodyInheritance) {
+        var beforeReturnBlock = block.Fork();
+        EmitReturn(m.Outs, block);
+        return beforeReturnBlock;
+      }
+
+      return block;
+    }
+
+    internal string Keywords(bool isPublic = false, bool isStatic = false, bool isExtern = false) {
+      return (isPublic ? "public " : "") + (isStatic ? "static " : "") + (isExtern ? "extern " : "") + (Synthesize && !isStatic && isPublic ? "virtual " : "");
+    }
+
+    internal ConcreteSyntaxTree GetMethodParameters(Method m, List<TypeArgumentInstantiation> typeArgs, bool lookasideBody, bool customReceiver, string returnType) {
+      var parameters = GetFunctionParameters(m.Ins, m, typeArgs, lookasideBody, customReceiver);
+      if (returnType == "void") {
+        WriteFormals(parameters.Nodes.Any() ? ", " : "", m.Outs, parameters);
+      }
+      return parameters;
+    }
+
+    private ConcreteSyntaxTree GetFunctionParameters(List<Formal> formals, MemberDecl m, List<TypeArgumentInstantiation> typeArgs, bool lookasideBody, bool customReceiver) {
+      var parameters = new ConcreteSyntaxTree();
+      var sep = "";
+      WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, m.EnclosingClass, m, lookasideBody), parameters, ref sep,
+        tp => $"{DafnyTypeDescriptor}<{tp.GetCompileName(Options)}> {FormatTypeDescriptorVariable(tp)}");
+      if (customReceiver) {
+        var nt = m.EnclosingClass;
+        var receiverType = UserDefinedType.FromTopLevelDecl(m.Origin, nt);
+        DeclareFormal(sep, "_this", receiverType, m.Origin, true, parameters);
+        sep = ", ";
+      }
+
+      WriteFormals(sep, formals, parameters);
+      return parameters;
+    }
+
+    internal string GetTargetReturnTypeReplacement(Method m, ConcreteSyntaxTree wr) {
+      string/*?*/ targetReturnTypeReplacement = null;
+      foreach (var p in m.Outs) {
+        if (!p.IsGhost) {
+          if (targetReturnTypeReplacement == null) {
+            targetReturnTypeReplacement = TypeName(p.Type, wr, p.Origin);
+          } else {
+            // there's more than one out-parameter, so bail
+            targetReturnTypeReplacement = null;
+            break;
+          }
+        }
+      }
+
+      targetReturnTypeReplacement ??= "void";
+      return targetReturnTypeReplacement;
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member, ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
+
+      var customReceiver = createBody && !forBodyInheritance && NeedsCustomReceiver(member);
+
+      AddTestCheckerIfNeeded(name, member, wr);
+      wr.Write(Keywords(createBody, isStatic || customReceiver, false));
+
+      var typeParameters = TypeParameters(TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, member, lookasideBody)));
+      var parameters = GetFunctionParameters(formals, member, typeArgs, lookasideBody, customReceiver);
+
+      wr.Write($"{TypeName(resultType, wr, tok)} {name}{typeParameters}({parameters})");
+      if (!createBody) {
+        wr.WriteLine(";");
+        return null;
+      }
+
+      return wr.NewBlock(open: formals.Count > 1 ? BlockStyle.NewlineBrace : BlockStyle.SpaceBrace);
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateGetter(string name, Type resultType, IOrigin tok, bool isStatic, bool createBody, ConcreteSyntaxTree wr) {
+      ConcreteSyntaxTree/*?*/ result = null;
+      var body = createBody ? Block(out result, close: BlockStyle.Brace) : new ConcreteSyntaxTree().Write(";");
+      wr.FormatLine($"{Keywords(createBody, isStatic)}{TypeName(resultType, wr, tok)} {name} {{ get{body} }}");
+      return result;
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody, out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree wr) {
+      wr.Write($"{Keywords(createBody)}{TypeName(resultType, wr, tok)} {name}");
+      if (createBody) {
+        var w = wr.NewBlock();
+        var wGet = w.NewBlock("get");
+        var wSet = w.NewBlock("set");
+        setterWriter = wSet;
+        return wGet;
+      } else {
+        wr.WriteLine(" { get; set; }");
+        setterWriter = null;
+        return null;
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
+      Contract.Assume(member is Method { IsTailRecursive: true } or Function { IsTailRecursive: true }); // precondition
+      if (!member.IsStatic && !NeedsCustomReceiver(member)) {
+        var receiverType = member.EnclosingClass is DatatypeDecl dt ? DtTypeName(dt) : "var";
+        wr.WriteLine($"{receiverType} _this = this;");
+      }
+      wr.Fork(-1).WriteLine("TAIL_CALL_START: ;");
+      return wr;
+    }
+
+    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
+      wr.WriteLine("goto TAIL_CALL_START;");
+    }
+
+    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member = null) {
+      Contract.Ensures(Contract.Result<string>() != null);
+      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
+
+      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
+      if (xType is BoolType) {
+        return "bool";
+      } else if (xType is CharType) {
+        return CharTypeName;
+      } else if (xType is IntType or BigOrdinalType) {
+        return "BigInteger";
+      } else if (xType is RealType) {
+        return "Dafny.BigRational";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        return t.NativeType != null ? GetNativeTypeName(t.NativeType) : "BigInteger";
+      } else if (xType.AsNewtype != null && member == null) {  // when member is given, use UserDefinedType case below
+        var newtypeDecl = xType.AsNewtype;
+        if (newtypeDecl.NativeType is { } nativeType) {
+          return GetNativeTypeName(nativeType);
+        }
+        return TypeName(newtypeDecl.ConcreteBaseType(xType.TypeArgs), wr, tok);
+      } else if (xType.IsObjectQ) {
+        return "object";
+      } else if (xType.IsArrayType) {
+        ArrayClassDecl at = xType.AsArrayType;
+        Contract.Assert(at != null);  // follows from type.IsArrayType
+        Type elType = UserDefinedType.ArrayElementType(xType);
+        TypeName_SplitArrayName(elType, wr, tok, out string typeNameSansBrackets, out string brackets);
+        return typeNameSansBrackets + TypeNameArrayBrackets(at.Dims) + brackets;
+      } else if (xType is UserDefinedType udt) {
+        if (udt.ResolvedClass is TypeParameter tp) {
+          if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(tp, out var instantiatedTypeParameter)) {
+            return TypeName(instantiatedTypeParameter, wr, tok, member);
+          }
+        }
+        var s = FullTypeName(udt, member);
+        var cl = udt.ResolvedClass;
+        return TypeName_UDT(s, udt, wr, udt.Origin);
+      } else if (xType is SetType) {
+        Type argType = ((SetType)xType).Arg;
+        return DafnyISet + "<" + TypeName(argType, wr, tok) + ">";
+      } else if (xType is SeqType) {
+        Type argType = ((SeqType)xType).Arg;
+        return DafnyISeq + "<" + TypeName(argType, wr, tok) + ">";
+      } else if (xType is MultiSetType) {
+        Type argType = ((MultiSetType)xType).Arg;
+        return DafnyIMultiset + "<" + TypeName(argType, wr, tok) + ">";
+      } else if (xType is MapType) {
+        Type domType = ((MapType)xType).Domain;
+        Type ranType = ((MapType)xType).Range;
+        return DafnyIMap + "<" + TypeName(domType, wr, tok) + "," + TypeName(ranType, wr, tok) + ">";
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    // To improve readability
+    private bool CharIsRune => UnicodeCharEnabled;
+    private string CharTypeName => UnicodeCharEnabled ? "Dafny.Rune" : "char";
+    private string CharTypeDescriptorName => DafnyHelpersClass + (UnicodeCharEnabled ? ".RUNE" : ".CHAR");
+
+    private void ConvertFromChar(Expression e, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
+      if (e.Type.IsCharType && UnicodeCharEnabled) {
+        wr.Write("(");
+        TrParenExpr(e, wr, inLetExprBody, wStmts);
+        wr.Write(".Value)");
+      } else {
+        TrParenExpr(e, wr, inLetExprBody, wStmts);
+      }
+    }
+
+    public string TypeHelperName(Type type, ConcreteSyntaxTree wr, IOrigin tok, Type/*?*/ otherType = null) {
+      var xType = type.NormalizeToAncestorType();
+      if (xType is SeqType seqType) {
+        return "Dafny.Sequence" + "<" + CommonTypeName(seqType.Arg, otherType?.AsSeqType?.Arg, wr, tok) + ">";
+      } else if (xType is SetType setType) {
+        return $"{DafnySetClass}<{CommonTypeName(setType.Arg, otherType?.AsSetType?.Arg, wr, tok)}>";
+      } else if (xType is MultiSetType msType) {
+        return $"{DafnyMultiSetClass}<{CommonTypeName(msType.Arg, otherType?.AsMultiSetType?.Arg, wr, tok)}>";
+      } else if (xType is MapType mapType) {
+        var domainType = CommonTypeName(mapType.Domain, otherType?.AsMapType?.Domain, wr, tok);
+        var rangeType = CommonTypeName(mapType.Range, otherType?.AsMapType?.Range, wr, tok);
+        return $"{DafnyMapClass}<{domainType}, {rangeType}>";
+      } else {
+        return TypeName(type, wr, tok);
+      }
+    }
+
+    public string CommonTypeName(Type a, Type /*?*/ b, ConcreteSyntaxTree wr, IOrigin tok) {
+      if (b == null) {
+        return TypeName(a, wr, tok);
+      }
+      a = a.NormalizeExpand();
+      b = b.NormalizeExpand();
+      if (a.Equals(b)) {
+        return TypeName(a, wr, tok);
+      }
+      // It would be nice to use Meet(a, b) here. Unfortunately, Resolver.Meet also needs a Builtins argument, which we
+      // don't have here.
+      Contract.Assert(a.IsRefType);
+      Contract.Assert(b.IsRefType);
+      return "object";
+    }
+
+    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
+      var xType = type.NormalizeExpandKeepConstraints();
+
+      if (usePlaceboValue) {
+        return $"default({TypeName(type, wr, tok)})";
+      }
+
+      if (xType is BoolType) {
+        return "false";
+      } else if (xType is CharType) {
+        return UnicodeCharEnabled ? $"new {CharTypeName}({CharType.DefaultValueAsString})" : CharType.DefaultValueAsString;
+      } else if (xType is IntType or BigOrdinalType) {
+        return "BigInteger.Zero";
+      } else if (xType is RealType) {
+        return "Dafny.BigRational.ZERO";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        return t.NativeType != null ? "0" : "BigInteger.Zero";
+      } else if (xType is CollectionType) {
+        return TypeHelperName(xType, wr, tok) + ".Empty";
+      }
+
+      var udt = (UserDefinedType)xType;
+      var cl = udt.ResolvedClass;
+      Contract.Assert(cl != null);
+      if (cl is TypeParameter tp) {
+        if (constructTypeParameterDefaultsFromTypeDescriptors) {
+          return $"{FormatTypeDescriptorVariable(tp.GetCompileName(Options))}.Default()";
+        } else {
+          return FormatDefaultTypeParameterValue(tp);
+        }
+      } else if (cl is AbstractTypeDecl opaque) {
+        return FormatDefaultTypeParameterValue(opaque);
+      } else if (cl is NewtypeDecl) {
+        var td = (NewtypeDecl)cl;
+        if (td.Witness != null) {
+          return TypeName_UDT(FullTypeName(udt), udt, wr, udt.Origin) + ".Witness";
+        } else if (td.NativeType != null) {
+          return "0";
+        } else {
+          return TypeInitializationValue(td.ConcreteBaseType(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+      } else if (cl is SubsetTypeDecl) {
+        var td = (SubsetTypeDecl)cl;
+        if (td.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+          return TypeName_UDT(FullTypeName(udt), udt, wr, udt.Origin) + ".Default()";
+        } else if (td.WitnessKind == SubsetTypeDecl.WKind.Special) {
+          // WKind.Special is only used with -->, ->, and non-null types:
+          Contract.Assert(ArrowType.IsPartialArrowTypeName(td.Name) || ArrowType.IsTotalArrowTypeName(td.Name) || td is NonNullTypeDecl);
+          if (ArrowType.IsPartialArrowTypeName(td.Name)) {
+            return $"(({TypeName(xType, wr, udt.Origin)})null)";
+          } else if (ArrowType.IsTotalArrowTypeName(td.Name)) {
+            var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+            // return the lambda expression ((Ty0 x0, Ty1 x1, Ty2 x2) => rangeDefaultValue)
+            var arguments = Util.Comma(udt.TypeArgs.Count - 1, i => $"{TypeName(udt.TypeArgs[i], wr, udt.Origin)} {idGenerator.FreshId("x")}");
+            return $"(({arguments}) => {rangeDefaultValue})";
+          } else if (((NonNullTypeDecl)td).Class is ArrayClassDecl arrayClass) {
+            // non-null array type; we know how to initialize them
+            TypeName_SplitArrayName(udt.TypeArgs[0], wr, udt.Origin, out var typeNameSansBrackets, out var brackets);
+            return $"new {typeNameSansBrackets}[{Util.Comma(arrayClass.Dims, _ => "0")}]{brackets}";
+          } else {
+            // non-null (non-array) type
+            // even though the type doesn't necessarily have a known initializer, it could be that the the compiler needs to
+            // lay down some bits to please the C#'s compiler's different definite-assignment rules.
+            return $"default({TypeName(xType, wr, udt.Origin)})";
+          }
+        } else {
+          return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+      } else if (cl is ClassLikeDecl or ArrowTypeDecl) {
+        return $"(({TypeName(xType, wr, udt.Origin)})null)";
+      } else if (cl is DatatypeDecl dt) {
+        var s = FullTypeName(udt, ignoreInterface: true);
+        var nonGhostTypeArgs = SelectNonGhost(dt, udt.TypeArgs);
+        if (nonGhostTypeArgs.Count != 0) {
+          s += "<" + TypeNames(nonGhostTypeArgs, wr, udt.Origin) + ">";
+        }
+
+
+        var wDefaultTypeArguments = new ConcreteSyntaxTree();
+        var sep = "";
+        WriteTypeDescriptors(dt, udt.TypeArgs, wDefaultTypeArguments, ref sep);
+        var relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs);
+        var arguments = relevantTypeArgs.Comma(ta => DefaultValue(ta.Actual, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors));
+        if (relevantTypeArgs.Count == 0) {
+          sep = "";
+        }
+        return string.Format($"{s}.Default({wDefaultTypeArguments}{sep}{arguments})");
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
+      ConcreteSyntaxTree wr, IOrigin tok, bool omitTypeArguments = false) {
+      Contract.Assume(fullCompileName != null);  // precondition; this ought to be declared as a Requires in the superclass
+      Contract.Assume(variance != null);  // precondition; this ought to be declared as a Requires in the superclass
+      Contract.Assume(typeArgs != null);  // precondition; this ought to be declared as a Requires in the superclass
+      Contract.Assume(variance.Count == typeArgs.Count);
+      string s = IdProtect(fullCompileName);
+      if (typeArgs.Count != 0) {
+        s += "<" + TypeNames(typeArgs, wr, tok) + ">";
+      }
+      return s;
+    }
+
+    internal override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member) {
+      type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
+      if (type is UserDefinedType udt) {
+        var name = udt.ResolvedClass is TraitDecl ? udt.GetFullCompanionCompileName(Options) : FullTypeName(udt, member, true);
+        return TypeName_UDT(name, udt, wr, tok);
+      } else {
+        return TypeName(type, wr, tok, member);
+      }
+    }
+
+    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
+      if (cl is DatatypeDecl) {
+        needsTypeParameter = false;
+        needsTypeDescriptor = true;
+      } else if (cl is TraitDecl) {
+        needsTypeParameter = false;
+        needsTypeDescriptor = isStatic || lookasideBody;
+      } else {
+        Contract.Assert(cl is ClassDecl);
+        needsTypeParameter = false;
+        needsTypeDescriptor = isStatic;
+      }
+    }
+
+    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      type = DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(Options, type);
+      if (type is BoolType) {
+        return "Dafny.Helpers.BOOL";
+      } else if (type is CharType) {
+        return CharTypeDescriptorName;
+      } else if (type is IntType || type is BigOrdinalType) {
+        return "Dafny.Helpers.INT";
+      } else if (type is RealType) {
+        return "Dafny.Helpers.REAL";
+      } else if (type is BitvectorType) {
+        var t = (BitvectorType)type;
+        if (t.NativeType != null) {
+          return GetNativeTypeDescriptor(AsNativeType(type));
+        } else {
+          return "Dafny.Helpers.INT";
+        }
+      } else if (type is SetType setType) {
+        return $"{DafnySetClass}<{TypeName(setType.Arg, wr, tok)}>.{TypeDescriptorMethodName}()";
+      } else if (type is SeqType seqType) {
+        return $"{DafnySeqClass}<{TypeName(seqType.Arg, wr, tok)}>.{TypeDescriptorMethodName}()";
+      } else if (type is MultiSetType multisetType) {
+        return $"{DafnyMultiSetClass}<{TypeName(multisetType.Arg, wr, tok)}>.{TypeDescriptorMethodName}()";
+      } else if (type is MapType mapType) {
+        return $"{DafnyMapClass}<{TypeName(mapType.Domain, wr, tok)}, {TypeName(mapType.Range, wr, tok)}>.{TypeDescriptorMethodName}()";
+      } else if (type.IsRefType) {
+        return $"Dafny.Helpers.NULL<{TypeName(type, wr, tok)}>()";
+      } else if (type.IsArrayType) {
+        ArrayClassDecl at = type.AsArrayType;
+        var elType = UserDefinedType.ArrayElementType(type);
+        var elTypeName = TypeName(elType, wr, tok);
+        return $"Dafny.Helpers.ARRAY{(at.Dims == 1 ? "" : $"{at.Dims}")}<{elTypeName}>()";
+      } else if (type.IsTypeParameter) {
+        var tp = type.AsTypeParameter;
+        Contract.Assert(tp != null);
+        if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(tp, out var instantiatedTypeParameter)) {
+          return TypeDescriptor(instantiatedTypeParameter, wr, tok);
+        }
+        return FormatTypeDescriptorVariable(type.AsTypeParameter.GetCompileName(Options));
+      } else if (type.IsBuiltinArrowType) {
+        return $"Dafny.Helpers.NULL<{TypeName(type, wr, tok)}>()";
+      } else if (type is UserDefinedType udt) {
+        var cl = udt.ResolvedClass;
+        Contract.Assert(cl != null);
+
+        List<Type> relevantTypeArgs;
+        if (cl is DatatypeDecl dt) {
+          relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs, true).ConvertAll(ta => ta.Actual);
+        } else {
+          relevantTypeArgs = type.TypeArgs;
+        }
+
+        return AddTypeDescriptorArgs(FullTypeName(udt, ignoreInterface: true), udt, relevantTypeArgs, wr, tok);
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();
+      }
+    }
+
+    private string GetNativeTypeDescriptor(NativeType nt) {
+      Contract.Assert(nt != null);
+      switch (nt.Sel) {
+        case NativeType.Selection.SByte:
+          return $"Dafny.Helpers.INT8";
+        case NativeType.Selection.Byte:
+          return $"Dafny.Helpers.UINT8";
+        case NativeType.Selection.Short:
+          return $"Dafny.Helpers.INT16";
+        case NativeType.Selection.UShort:
+          return $"Dafny.Helpers.UINT16";
+        case NativeType.Selection.Int:
+          return $"Dafny.Helpers.INT32";
+        case NativeType.Selection.UInt:
+          return $"Dafny.Helpers.UINT32";
+        case NativeType.Selection.Long:
+          return $"Dafny.Helpers.INT64";
+        case NativeType.Selection.ULong:
+          return $"Dafny.Helpers.UINT64";
+        default:
+          Contract.Assert(false);
+          throw new cce.UnreachableException();
+      }
+    }
+
+    private string AddTypeDescriptorArgs(string fullCompileName, UserDefinedType udt, List<Type> typeDescriptors, ConcreteSyntaxTree wr, IOrigin tok) {
+      Contract.Requires(fullCompileName != null);
+      Contract.Requires(udt != null);
+      Contract.Requires(typeDescriptors != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(tok != null);
+
+      var s = TypeName_UDT(fullCompileName, udt, wr, tok);
+      s += $".{TypeDescriptorMethodName}({typeDescriptors.Comma(arg => TypeDescriptor(arg, wr, tok))})";
+      return s;
+    }
+
+    // ----- Declarations -------------------------------------------------------------
+
+    protected void DeclareField(string name, bool isPublic, bool isStatic, bool isConst, string typeName, string rhs, ClassWriter cw) {
+      var publik = isPublic ? "public" : "private";
+      var konst = isConst ? " readonly" : "";
+      var virtuall = Synthesize ? " virtual" : "";
+      if (isStatic) {
+        cw.StaticMemberWriter.Write($"{publik} static{konst} {typeName} {name}");
+        if (rhs != null) {
+          cw.StaticMemberWriter.Write($" = {rhs}");
+        }
+        cw.StaticMemberWriter.WriteLine(";");
+      } else {
+        string ending = "";
+        if (isPublic) {
+          if (isConst) {
+            cw.InstanceMemberWriter.Write(
+              $"{publik}{konst}{virtuall} {typeName} {name} {{get;}}");
+          } else {
+            cw.InstanceMemberWriter.Write(
+              $"{publik}{virtuall} {typeName} {name} {{get; set;}}");
+          }
+        } else {
+          cw.InstanceMemberWriter.WriteLine($"{publik}{konst} {typeName} {name}");
+          ending = ";";
+        }
+        if (cw.CtorBodyWriter == null) {
+          if (rhs != null) {
+            cw.InstanceMemberWriter.Write($" = {rhs}");
+            ending = ";";
+          }
+        } else {
+          if (rhs != null) {
+            cw.CtorBodyWriter.WriteLine($"this.{name} = {rhs};");
+          }
+        }
+        cw.InstanceMemberWriter.WriteLine(ending);
+      }
+    }
+
+    protected override bool DeclareFormal(string prefix, string name, Type type, IOrigin tok, bool isInParam, ConcreteSyntaxTree wr) {
+      wr.Write($"{prefix}{(isInParam ? "" : "out ")}{TypeName(type, wr, tok)} {name}");
+      return true;
+    }
+
+    protected override void DeclareLocalVar(string name, Type/*?*/ type, IOrigin/*?*/ tok, bool leaveRoomForRhs, string/*?*/ rhs, ConcreteSyntaxTree wr) {
+      wr.Write($"{(type != null ? TypeName(type, wr, tok) : "var")} {name}");
+      if (leaveRoomForRhs) {
+        Contract.Assert(rhs == null);  // follows from precondition
+      } else if (rhs != null) {
+        wr.WriteLine($" = {rhs};");
+      } else {
+        wr.WriteLine(";");
+      }
+    }
+
+    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type/*?*/ type, IOrigin/*?*/ tok, ConcreteSyntaxTree wr) {
+      var w = new ConcreteSyntaxTree();
+      wr.FormatLine($"{(type != null ? TypeName(type, wr, tok) : "var")} {name} = {w};");
+      return w;
+    }
+
+    protected override void DeclareOutCollector(string collectorVarName, ConcreteSyntaxTree wr) {
+      wr.Write($"var {collectorVarName} = ");
+    }
+
+    protected override void DeclareLocalOutVar(string name, Type type, IOrigin tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr) {
+      if (useReturnStyleOuts) {
+        DeclareLocalVar(name, type, tok, false, rhs, wr);
+      } else {
+        EmitAssignment(name, type, rhs, null, wr);
+      }
+    }
+
+    protected override void EmitActualOutArg(string actualOutParamName, ConcreteSyntaxTree wr) {
+      wr.Write($"out {actualOutParamName}");
+    }
+
+    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) {
+      return nonGhostOutCount == 1;
+    }
+
+    protected override void EmitOutParameterSplits(string outCollector, List<string> actualOutParamNames, ConcreteSyntaxTree wr) {
+      Contract.Assert(actualOutParamNames.Count == 1);
+      EmitAssignment(actualOutParamNames[0], null, outCollector, null, wr);
+    }
+
+    protected override void EmitActualTypeArgs(List<Type> typeArgs, IOrigin tok, ConcreteSyntaxTree wr) {
+      if (typeArgs.Count != 0) {
+        wr.Write("<" + TypeNames(typeArgs, wr, tok) + ">");
+      }
+    }
+
+    // ----- Statements -------------------------------------------------------------
+
+    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
+      var wStmts = wr.Fork();
+      var type = DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, arg.Type);
+      var typeArgs = type.AsArrowType == null ? "" : $"<{TypeName(type, wr, null, null)}>";
+      var suffix = type.IsStringType && UnicodeCharEnabled ? ".ToVerbatimString(false)" : "";
+      wr.WriteLine($"{DafnyHelpersClass}.Print{typeArgs}(({Expr(arg, false, wStmts)}){suffix});");
+    }
+
+    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
+      outParams = outParams.Where(f => !f.IsGhost).ToList();
+      var returnExpr = outParams.Count == 1 ? IdName(outParams[0]) : "";
+      wr.WriteLine($"return {returnExpr};");
+    }
+
+    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
+      var w = wr.Fork();
+      var prefix = createContinueLabel ? "continue_" : "after_";
+      wr.Fork(-1).WriteLine($"{prefix}{label}: ;");
+      return w;
+    }
+
+    protected override void EmitBreak(string/*?*/ label, ConcreteSyntaxTree wr) {
+      if (label == null) {
+        wr.WriteLine("break;");
+      } else {
+        wr.WriteLine("goto after_{0};", label);
+      }
+    }
+
+    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
+      wr.WriteLine("goto continue_{0};", label);
+    }
+
+    protected override void EmitYield(ConcreteSyntaxTree wr) {
+      wr.WriteLine("yield return null;");
+    }
+
+    protected override void EmitAbsurd(string/*?*/ message, ConcreteSyntaxTree wr) {
+      if (message == null) {
+        message = "unexpected control point";
+      }
+      wr.WriteLine("throw new System.Exception(\"{0}\");", message);
+    }
+
+    protected override void EmitHalt(IOrigin tok, Expression/*?*/ messageExpr, ConcreteSyntaxTree wr) {
+      var exceptionMessage = Expr(messageExpr, false, wr.Fork());
+      if (tok != null) {
+        exceptionMessage.Prepend(new LineSegment($"\"{tok.TokenToString(Options).Replace(@"\", @"\\")}: \" + "));
+      }
+      if (UnicodeCharEnabled && messageExpr.Type.IsStringType) {
+        exceptionMessage.Write(".ToVerbatimString(false)");
+      }
+      wr.Format($"throw new Dafny.HaltException({exceptionMessage});");
+    }
+
+    protected override ConcreteSyntaxTree EmitForStmt(IOrigin tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
+      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
+
+      wr.Write($"for ({TypeName(loopIndex.Type, wr, tok)} {loopIndex.GetOrCreateCompileName(currentIdGenerator)} = ");
+      var startWr = wr.Fork();
+      wr.Write($"; ");
+
+      ConcreteSyntaxTree bodyWr;
+      if (goingUp) {
+        wr.Write(endVarName != null ? $"{loopIndex.GetOrCreateCompileName(currentIdGenerator)} < {endVarName}" : "");
+        bodyWr = wr.NewBlock($"; {loopIndex.GetOrCreateCompileName(currentIdGenerator)}++)");
+      } else {
+        wr.Write(endVarName != null ? $"{endVarName} < {loopIndex.GetOrCreateCompileName(currentIdGenerator)}" : "");
+        bodyWr = wr.NewBlock($"; )");
+        bodyWr.WriteLine($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)}--;");
+      }
+      bodyWr = EmitContinueLabel(labels, bodyWr);
+      TrStmtList(body, bodyWr);
+
+      return startWr;
+    }
+
+    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, Action<ConcreteSyntaxTree> boundAction, ConcreteSyntaxTree wr, string start = null) {
+      start = start ?? "0";
+      var boundWriter = new ConcreteSyntaxTree();
+      boundAction(boundWriter);
+      var bound = boundWriter.ToString();
+      return wr.NewNamedBlock("for (var {0} = {2}; {0} < {1}; {0}++)", indexVar, bound, start);
+    }
+
+    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
+      return wr.NewNamedBlock("for (var {0} = new BigInteger({1}); ; {0} *= 2)", indexVar, start);
+    }
+
+    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine($"{varName}++;");
+    }
+
+    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine($"{varName}--;");
+    }
+
+    protected override string GetQuantifierName(string bvType) {
+      return string.Format($"{DafnyHelpersClass}.Quantifier<{bvType}>");
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IOrigin tok, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      collectionWriter = new ConcreteSyntaxTree();
+      wr.Format($"foreach ({TypeName(collectionElementType, wr, tok)} {tmpVarName} in {collectionWriter})");
+      return wr.NewBlock();
+    }
+
+    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
+      Type sourceType, bool introduceBoundVar, IOrigin tok, ConcreteSyntaxTree wr) {
+      var typeName = TypeName(boundVarType, wr, tok);
+      wr.WriteLine("{0}{1} = ({2}){3};", introduceBoundVar ? typeName + " " : "", boundVarName, typeName, tmpVarName);
+    }
+
+    [CanBeNull]
+    protected override Action<ConcreteSyntaxTree> GetSubtypeCondition(string tmpVarName, Type boundVarType, IOrigin tok, ConcreteSyntaxTree wPreconditions) {
+      string typeTest;
+      if (boundVarType.IsRefType) {
+        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
+          typeTest = "true";
+        } else {
+          typeTest = $"{tmpVarName} is {TypeName(boundVarType, wPreconditions, tok)}";
+        }
+        if (boundVarType.IsNonNullRefType) {
+          typeTest = $"{tmpVarName} != null && {typeTest}";
+        } else {
+          typeTest = $"{tmpVarName} == null || {typeTest}";
+        }
+      } else {
+        typeTest = "true";
+      }
+
+      typeTest = typeTest == "true" ? null : typeTest;
+      return typeTest == null ? null : wr => wr.Write(typeTest);
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      collectionWriter = new ConcreteSyntaxTree();
+      return wr.Format($"foreach (var {boundVarName} in {collectionWriter})").NewBlock();
+    }
+
+    // ----- Expressions -------------------------------------------------------------
+
+    protected override void EmitNew(Type type, IOrigin tok, CallStmt initCall /*?*/, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var cl = ((UserDefinedType)type.NormalizeExpand()).ResolvedClass;
+      var ctor = (Constructor)initCall?.Method;  // correctness of cast follows from precondition of "EmitNew"
+      var arguments = new ConcreteSyntaxTree();
+      wr.Format($"new {TypeName(type, wr, tok)}({arguments})");
+      var sep = "";
+      EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass(cl, type.TypeArgs), tok, arguments, ref sep);
+      arguments.Write(ConstructorArguments(initCall, wStmts, ctor, sep));
+    }
+
+    protected override void EmitNewArray(Type elementType, IOrigin tok, List<string> dimensions,
+        bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var wrs = EmitNewArray(elementType, tok, dimensions.Count, mustInitialize, wr);
+      for (var i = 0; i < wrs.Count; i++) {
+        wrs[i].Write(dimensions[i]);
+      }
+    }
+
+    private List<ConcreteSyntaxTree> EmitNewArray(Type elmtType, IOrigin tok, int dimCount, bool mustInitialize, ConcreteSyntaxTree wr) {
+      ConcreteSyntaxTree EmitSizeCheckWrapper(ConcreteSyntaxTree w) {
+        w.Write($"{DafnyHelpersClass}.ToIntChecked(");
+        var wSize = w.Fork();
+        w.Write(", \"array size exceeds memory limit\")");
+        return wSize;
+      }
+
+      var wrs = new List<ConcreteSyntaxTree>();
+      if (!mustInitialize || HasSimpleZeroInitializer(elmtType)) {
+        TypeName_SplitArrayName(elmtType, wr, tok, out string typeNameSansBrackets, out string brackets);
+        wr.Write("new {0}", typeNameSansBrackets);
+        string prefix = "[";
+        for (var d = 0; d < dimCount; d++) {
+          wr.Write(prefix);
+          wrs.Add(EmitSizeCheckWrapper(wr));
+          prefix = ", ";
+        }
+        wr.Write("]{0}", brackets);
+      } else {
+        wr.Write("Dafny.ArrayHelpers.InitNewArray{0}<{1}>", dimCount, TypeName(elmtType, wr, tok));
+        var inParens = wr.ForkInParens();
+        inParens.Write(DefaultValue(elmtType, inParens, tok, true));
+        for (var d = 0; d < dimCount; d++) {
+          inParens.Write(", ");
+          wrs.Add(EmitSizeCheckWrapper(inParens));
+        }
+      }
+      return wrs;
+    }
+
+    /// <summary>
+    /// Return "true" if the C# all-zero bit pattern is a meaningful value for a Dafny type "t".
+    /// This method is allowed to be conservative; that is, it is allowed to return "false" more often
+    /// than strictly needed.
+    /// </summary>
+    private bool HasSimpleZeroInitializer(Type t) {
+      Contract.Requires(t != null);
+
+      t = t.NormalizeExpandKeepConstraints();
+      if (t is CharType) {
+        // Okay, so '\0' _is_ a value of type "char", but it's so unpleasant to deal with in test files, etc.
+        // By returning false here, a different value will be chosen.
+        return false;
+      } else if (t is BoolType || t is IntType || t is BigOrdinalType || t is RealType || t is BitvectorType) {
+        return true;
+      } else if (t is CollectionType) {
+        return false;
+      }
+
+      var udt = (UserDefinedType)t;
+      var cl = udt.ResolvedClass;
+      Contract.Assert(cl != null);
+      if (cl is NewtypeDecl) {
+        var td = (NewtypeDecl)cl;
+        return td.WitnessKind == SubsetTypeDecl.WKind.CompiledZero;
+      } else if (cl is ClassLikeDecl { IsReferenceTypeDecl: true }) {
+        return true; // null is a value of this type
+      } else {
+        return false;
+      }
+    }
+
+    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
+      if (e is StaticReceiverExpr) {
+        wr.Write(TypeName(e.Type, wr, e.Origin));
+      } else if (e.Value == null) {
+        var cl = (e.Type.NormalizeExpand() as UserDefinedType)?.ResolvedClass;
+        wr.Write("({0})null", TypeName(e.Type, wr, e.Origin));
+      } else if (e.Value is bool) {
+        wr.Write((bool)e.Value ? "true" : "false");
+      } else if (e is CharLiteralExpr) {
+        var v = (string)e.Value;
+        if (UnicodeCharEnabled) {
+          var codePoint = Util.UnescapedCharacters(Options, v, false).Single();
+          if (codePoint > char.MaxValue) {
+            // C# supports \U, but doesn't allow values that require two UTF-16 code units in character literals.
+            // For such values we construct the Rune value directly from the unescaped codepoint.
+            wr.Write($"new Dafny.Rune(0x{codePoint:x})");
+          } else {
+            wr.Write($"new Dafny.Rune('{Util.ExpandUnicodeEscapes(v, false)}')");
+          }
+        } else {
+          wr.Write($"'{v}'");
+        }
+      } else if (e is StringLiteralExpr str) {
+        wr.Format($"{DafnySeqClass}<{CharTypeName}>.{CharMethodQualifier}FromString({StringLiteral(str)})");
+      } else if (AsNativeType(e.Type) is { } nativeType) {
+        GetNativeInfo(nativeType.Sel, out var nativeName, out var literalSuffix, out var needsCastAfterArithmetic);
+        if (needsCastAfterArithmetic) {
+          wr = wr.Write($"({nativeName})").ForkInParens();
+        }
+        wr.Write((BigInteger)e.Value + literalSuffix);
+      } else if (e.Value is BigInteger bigInteger) {
+        EmitIntegerLiteral(bigInteger, wr);
+      } else if (e.Value is BigDec n) {
+        if (0 <= n.Exponent) {
+          wr.Write("new Dafny.BigRational(BigInteger.Parse(\"{0}", n.Mantissa);
+          for (int i = 0; i < n.Exponent; i++) {
+            wr.Write("0");
+          }
+          wr.Write("\"), BigInteger.One)");
+        } else {
+          wr.Write("new Dafny.BigRational(");
+          EmitIntegerLiteral(n.Mantissa, wr);
+          wr.Write(", BigInteger.Parse(\"1");
+          for (int i = n.Exponent; i < 0; i++) {
+            wr.Write("0");
+          }
+          wr.Write("\"))");
+        }
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
+      }
+    }
+
+    void EmitIntegerLiteral(BigInteger i, ConcreteSyntaxTree wr) {
+      Contract.Requires(wr != null);
+      if (i.IsZero) {
+        wr.Write("BigInteger.Zero");
+      } else if (i.IsOne) {
+        wr.Write("BigInteger.One");
+      } else if (int.MinValue <= i && i <= int.MaxValue) {
+        wr.Write($"new BigInteger({i})");
+      } else if (long.MinValue <= i && i <= long.MaxValue) {
+        wr.Write($"new BigInteger({i}L)");
+      } else if (ulong.MinValue <= i && i <= ulong.MaxValue) {
+        wr.Write($"new BigInteger({i}UL)");
+      } else {
+        wr.Write($"BigInteger.Parse(\"{i}\")");
+      }
+    }
+
+    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
+      wr.Write($"{(isVerbatim ? "@" : "")}\"{Util.ExpandUnicodeEscapes(str, false)}\"");
+    }
+
+    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, [CanBeNull] NativeType nativeType,
+      bool surroundByUnchecked, ConcreteSyntaxTree wr) {
+      string nativeName = null, literalSuffix = null;
+      if (nativeType != null) {
+        GetNativeInfo(nativeType.Sel, out nativeName, out literalSuffix, out _);
+      }
+
+      // --- Before
+      if (nativeType != null) {
+        if (surroundByUnchecked) {
+          // Unfortunately, the following will apply "unchecked" to all subexpressions as well.  There
+          // shouldn't ever be any problem with this, but stylistically it would have been nice to have
+          // applied the "unchecked" only to the actual operation that may overflow.
+          wr = wr.Write("unchecked").ForkInParens();
+        }
+        wr.Write($"({nativeName})");
+      }
+      wr = wr.ForkInParens();
+      // --- Middle
+      var middle = wr.ForkInParens();
+      // --- After
+      // do the truncation, if needed
+      if (nativeType == null) {
+        wr.Write(" & ((new BigInteger(1) << {0}) - 1)", bvType.Width);
+      } else if (bvType.Width < nativeType.Bitwidth) {
+        // print in hex, because that looks nice
+        wr.Write(" & ({2})0x{0:X}{1}", (1UL << bvType.Width) - 1, literalSuffix, nativeName);
+      }
+
+      return middle;
+    }
+
+    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
+        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      string nativeName = null;
+      bool needsCast = false;
+      var nativeType = AsNativeType(e0.Type);
+      if (nativeType != null) {
+        GetNativeInfo(nativeType.Sel, out nativeName, out _, out needsCast);
+      }
+
+      // ( e0 op1 e1) | (e0 op2 (width - e1))
+      if (needsCast) {
+        wr = wr.Write("(" + nativeName + ")").ForkInParens();
+      }
+      EmitShift(e0, e1, isRotateLeft ? "<<" : ">>", isRotateLeft, nativeType, true, wr.ForkInParens(), inLetExprBody, wStmts, tr);
+
+      wr.Write(" | ");
+
+      EmitShift(e0, e1, isRotateLeft ? ">>" : "<<", !isRotateLeft, nativeType, false, wr.ForkInParens(), inLetExprBody, wStmts, tr);
+    }
+
+    private void EmitShift(Expression e0, Expression e1, string op, bool truncate, [CanBeNull] NativeType nativeType, bool firstOp,
+        ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      var bv = e0.Type.NormalizeToAncestorType().AsBitVectorType;
+      if (truncate) {
+        wr = EmitBitvectorTruncation(bv, nativeType, true, wr);
+      }
+      tr(e0, wr, inLetExprBody, wStmts);
+      wr.Write(" {0} ", op);
+      if (!firstOp) {
+        wr = wr.ForkInParens().Write("{0} - ", bv.Width);
+      }
+
+      wr.Write("(int)");
+      tr(e1, wr.ForkInParens(), inLetExprBody, wStmts);
+    }
+
+    protected override bool CompareZeroUsingSign(Type type) {
+      return AsNativeType(type) == null;
+    }
+
+    protected override ConcreteSyntaxTree EmitSign(Type type, ConcreteSyntaxTree wr) {
+      // Should only be called when CompareZeroUsingSign is true
+      Contract.Assert(AsNativeType(type) == null);
+
+      ConcreteSyntaxTree w = wr.Fork();
+      wr.Write(".Sign");
+
+      return w;
+    }
+
+    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      wr.Write($"new System.Collections.Generic.List<System.Tuple<{tupleTypeArgs}>>()");
+    }
+
+    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      var wrTuple = new ConcreteSyntaxTree();
+      wr.FormatLine($"{ingredients}.Add(new System.Tuple<{tupleTypeArgs}>({wrTuple}));");
+      return wrTuple;
+    }
+
+    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
+      wr.Write($"{prefix}.Item{i + 1}");
+    }
+
+    protected override string IdProtect(string name) {
+      return PublicIdProtect(name);
+    }
+    public override string PublicIdProtect(string name) {
+      if (name == "" || name.First() == '_') {
+        return name;  // no need to further protect this name -- we know it's not a C# keyword
+      }
+      switch (name) {
+        // keywords
+        case "base":
+        case "byte":
+        case "catch":
+        case "checked":
+        case "continue":
+        case "decimal":
+        case "default":
+        case "delegate":
+        case "do":
+        case "double":
+        case "enum":
+        case "event":
+        case "explicit":
+        case "extern":
+        case "finally":
+        case "fixed":
+        case "float":
+        case "for":
+        case "foreach":
+        case "goto":
+        case "implicit":
+        case "interface":
+        case "internal":
+        case "is":
+        case "lock":
+        case "long":
+        case "namespace":
+        case "operator":
+        case "out":
+        case "override":
+        case "params":
+        case "private":
+        case "public":
+        case "readonly":
+        case "ref":
+        case "sbyte":
+        case "sealed":
+        case "short":
+        case "sizeof":
+        case "stackalloc":
+        case "struct":
+        case "switch":
+        case "throw":
+        case "try":
+        case "typeof":
+        case "uint":
+        case "ulong":
+        case "unchecked":
+        case "unsafe":
+        case "ushort":
+        case "using":
+        case "virtual":
+        case "void":
+        case "volatile":
+        // contextual keywords
+        case "add":
+        case "alias":
+        case "ascending":
+        case "async":
+        case "await":
+        case "descending":
+        case "dynamic":
+        case "equals":
+        case "from":
+        case "get":
+        case "global":
+        case "group":
+        case "into":
+        case "join":
+        case "let":
+        case "nameof":
+        case "on":
+        case "orderby":
+        case "partial":
+        case "remove":
+        case "select":
+        case "set":
+        case "value":
+        case "when":
+        case "where":
+          return "@" + name;
+        // methods with expected names
+        case "ToString":
+        case "GetHashCode":
+        case "Main":
+        case "Default":
+          return "_" + name;
+        default:
+          return name;
+      }
+    }
+
+    protected override string FullTypeName(UserDefinedType udt, MemberDecl /*?*/ member = null) {
+      return FullTypeName(udt, member);
+    }
+    private string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null, bool ignoreInterface = false) {
+      Contract.Assume(udt != null);  // precondition; this ought to be declared as a Requires in the superclass
+      if (udt is ArrowType) {
+        return ArrowType.Arrow_FullCompileName;
+      }
+
+      if (member != null && member.IsExtern(Options, out var qualification, out _) && qualification != null) {
+        return qualification;
+      }
+      var cl = udt.ResolvedClass;
+      if (cl is TypeParameter) {
+        return IdProtect(udt.GetCompileName(Options));
+      }
+
+      //Use the interface if applicable (not handwritten, or incompatible variance)
+      if ((cl is DatatypeDecl)
+          && !ignoreInterface
+          && (member is null || !NeedsCustomReceiver(member))) {
+        return (cl.EnclosingModuleDefinition.TryToAvoidName ? "" : IdProtectModule(cl.EnclosingModuleDefinition.GetCompileName(Options)) + ".") + DtTypeName(cl, false);
+      }
+
+      if (cl is DatatypeDecl) {
+        return (cl.EnclosingModuleDefinition.TryToAvoidName ? "" : IdProtectModule(cl.EnclosingModuleDefinition.GetCompileName(Options)) + ".") + protectedTypeName(cl as DatatypeDecl);
+      }
+
+      if (cl.EnclosingModuleDefinition.TryToAvoidName) {
+        return IdProtect(cl.GetCompileName(Options));
+      }
+
+      if (cl.IsExtern(Options, out _, out _)) {
+        return cl.EnclosingModuleDefinition.GetCompileName(Options) + "." + cl.GetCompileName(Options);
+      }
+
+      if (cl is ClassDecl) {
+        return (cl.EnclosingModuleDefinition.TryToAvoidName ? "" : IdProtectModule(cl.EnclosingModuleDefinition.GetCompileName(Options)) + ".") + protectedTypeName(cl as ClassDecl);
+      }
+
+      return IdProtectModule(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdProtect(cl.GetCompileName(Options));
+    }
+
+    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
+      var custom =
+        (enclosingMethod != null && (enclosingMethod.IsTailRecursive || NeedsCustomReceiver(enclosingMethod))) ||
+        (enclosingFunction != null && (enclosingFunction.IsTailRecursive || NeedsCustomReceiver(enclosingFunction))) ||
+        (thisContext is NewtypeDecl && !callToInheritedMember) ||
+        thisContext is TraitDecl;
+      wr.Write(custom ? "_this" : "this");
+    }
+
+    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
+      var dt = dtv.Ctor.EnclosingDatatype;
+      var dtName = IdProtectModule(dt.EnclosingModuleDefinition.GetCompileName(Options)) + "." + protectedTypeName(dt);
+
+      var nonGhostInferredTypeArgs = SelectNonGhost(dt, dtv.InferredTypeArgs);
+      var typeParams = nonGhostInferredTypeArgs.Count == 0 ? "" : $"<{TypeNames(nonGhostInferredTypeArgs, wr, dtv.Origin)}>";
+      var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
+      if (!dtv.IsCoCall) {
+        // For an ordinary constructor (that is, one that does not guard any co-recursive calls), generate:
+        //   Dt.create_Cons<T>( args )
+        wr.Write($"{dtName}{typeParams}.{DtCreateName(dtv.Ctor)}({typeDescriptorArguments}{sep}{arguments})");
+      } else {
+        var sep0 = typeDescriptorArguments.Length != 0 ? ", " : "";
+        // In the case of a co-recursive call, generate:
+        //     new Dt__Lazy<T>( LAMBDA )
+        // where LAMBDA is:
+        //     () => { return Dt_Cons<T>( ...args... ); }
+        wr.Write($"new {dtName}__Lazy{typeParams}({typeDescriptorArguments}{sep0}");
+        wr.Write("() => { return ");
+        wr.Write($"new {DtCtorName(dtv.Ctor, dtv.InferredTypeArgs, wr)}({typeDescriptorArguments}{sep}{arguments})");
+        wr.Write("; })");
+      }
+    }
+
+
+    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString) {
+      compiledName = "";
+      preString = "";
+      postString = "";
+      switch (id) {
+        case SpecialField.ID.UseIdParam:
+          compiledName = IdProtect((string)idParam);
+          break;
+        case SpecialField.ID.ArrayLength:
+        case SpecialField.ID.ArrayLengthInt:
+          compiledName = idParam == null ? "Length" : $"GetLength({(int)idParam})";
+          if (id == SpecialField.ID.ArrayLength) {
+            preString = "new BigInteger(";
+            postString = ")";
+          }
+          break;
+        case SpecialField.ID.Floor:
+          compiledName = "ToBigInteger()";
+          break;
+        case SpecialField.ID.IsLimit:
+          preString = "Dafny.BigOrdinal.IsLimit(";
+          postString = ")";
+          break;
+        case SpecialField.ID.IsSucc:
+          preString = "Dafny.BigOrdinal.IsSucc(";
+          postString = ")";
+          break;
+        case SpecialField.ID.Offset:
+          preString = "Dafny.BigOrdinal.Offset(";
+          postString = ")";
+          break;
+        case SpecialField.ID.IsNat:
+          preString = "Dafny.BigOrdinal.IsNat(";
+          postString = ")";
+          break;
+        case SpecialField.ID.Keys:
+          compiledName = "Keys";
+          break;
+        case SpecialField.ID.Values:
+          compiledName = "Values";
+          break;
+        case SpecialField.ID.Items:
+          var mapType = receiverType.AsMapType;
+          Contract.Assert(mapType != null);
+          var errorWr = new ConcreteSyntaxTree();
+          var domainType = TypeName(mapType.Domain, errorWr, Token.NoToken);
+          var rangeType = TypeName(mapType.Range, errorWr, Token.NoToken);
+          preString = $"{DafnyMapClass}<{domainType}, {rangeType}>.Items(";
+          postString = ")";
+          break;
+        case SpecialField.ID.Reads:
+          compiledName = "_reads";
+          break;
+        case SpecialField.ID.Modifies:
+          compiledName = "_modifies";
+          break;
+        case SpecialField.ID.New:
+          compiledName = "_new";
+          break;
+        default:
+          Contract.Assert(false); // unexpected ID
+          break;
+      }
+    }
+
+    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
+      Type expectedType, string/*?*/ additionalCustomParameter, bool internalAccess = false) {
+      var memberStatus = DatatypeWrapperEraser.GetMemberStatus(Options, member);
+      if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.Identity) {
+        return SimpleLvalue(obj);
+      } else if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue) {
+        return SimpleLvalue(w => w.Write("true"));
+      } else if (member is SpecialField sf && !(member is ConstantField)) {
+        GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out string compiledName, out string _, out string _);
+        if (compiledName.Length != 0) {
+          return SuffixLvalue(obj, ".{0}", compiledName);
+        } else {
+          // this member selection is handled by some kind of enclosing function call, so nothing to do here
+          return SimpleLvalue(obj);
+        }
+      } else if (member is Function fn) {
+        var wr = new ConcreteSyntaxTree();
+        EmitNameAndActualTypeArgs(IdName(member), TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, member, false)),
+        member.Origin, null, false, wr);
+        if (typeArgs.Count == 0 && additionalCustomParameter == null) {
+          var nameAndTypeArgs = wr.ToString();
+          return SuffixLvalue(obj, $".{nameAndTypeArgs}");
+        } else {
+          // We need an eta conversion to adjust for the difference in arity.
+          // (T0 a0, T1 a1, ...) => obj.F(additionalCustomParameter, a0, a1, ...)
+          var callArguments = wr.ForkInParens();
+          var sep = "";
+          EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), fn.Origin, callArguments, ref sep);
+          if (additionalCustomParameter != null) {
+            callArguments.Write($"{sep}{additionalCustomParameter}");
+            sep = ", ";
+          }
+          var lambdaHeader = new ConcreteSyntaxTree();
+          var prefixSep = "";
+          var arguments = lambdaHeader.ForkInParens();
+          lambdaHeader.Write(" => ");
+
+          foreach (var arg in fn.Ins) {
+            if (!arg.IsGhost) {
+              var name = idGenerator.FreshId("_eta");
+              var ty = arg.Type.Subst(typeMap);
+              arguments.Write($"{prefixSep}{TypeName(ty, arguments, arg.Origin)} {name}");
+              callArguments.Write($"{sep}{name}");
+              sep = ", ";
+              prefixSep = ", ";
+            }
+          }
+          return EnclosedLvalue(lambdaHeader.ToString(), obj, $".{wr}");
+        }
+      } else {
+        Contract.Assert(member is Field);
+        if (member.IsStatic) {
+          return SimpleLvalue(w => {
+            w.Write("{0}.{1}", TypeName_Companion(objType, w, member.Origin, member), IdName(member));
+            var sep = "(";
+            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.Origin, w, ref sep);
+            if (sep != "(") {
+              w.Write(")");
+            }
+          });
+        } else if (NeedsCustomReceiverNotTrait(member)) {
+          // instance const in a newtype or belongs to a datatype
+          Contract.Assert(typeArgs.Count == 0 || member.EnclosingClass is DatatypeDecl);
+          return SimpleLvalue(w => {
+            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.Origin, member), IdName(member));
+            obj(w);
+            w.Write(")");
+          });
+        } else if (internalAccess && (member is ConstantField || member.EnclosingClass is TraitDecl)) {
+          return SuffixLvalue(obj, $".{InternalFieldPrefix}{member.GetCompileName(Options)}");
+        } else {
+          return SimpleLvalue(w => {
+            obj(w);
+            w.Write(".{0}", IdName(member));
+            var sep = "(";
+            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.Origin, w, ref sep);
+            if (sep != "(") {
+              w.Write(")");
+            }
+          });
+        }
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Action<ConcreteSyntaxTree>> indices, Type elmtType, ConcreteSyntaxTree wr) {
+      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
+      var w = wr.Fork();
+      wr.Write("[");
+      var sep = "";
+      foreach (var index in indices) {
+        wr.Write("{0}(int)(", sep);
+        index(wr);
+        wr.Write(")");
+        sep = ", ";
+      }
+      wr.Write("]");
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
+      var w = wr.Fork();
+      wr.Write("[");
+      var sep = "";
+      foreach (var index in indices) {
+        wr.Write("{0}(int)", sep);
+        TrParenExpr(index, wr, inLetExprBody, wStmts);
+        sep = ", ";
+      }
+      wr.Write("]");
+      return w;
+    }
+
+    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr("(int)", expr, wr, inLetExprBody, wStmts);
+    }
+
+    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var xType = source.Type.NormalizeToAncestorType();
+      if (xType is MapType) {
+        var inner = wr.Write(TypeHelperName(xType, wr, source.Origin) + ".Select").ForkInParens();
+        inner.Append(Expr(source, inLetExprBody, wStmts));
+        inner.Write(",");
+        inner.Append(Expr(index, inLetExprBody, wStmts));
+      } else {
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+        TrParenExpr(".Select", index, wr, inLetExprBody, wStmts);
+      }
+    }
+
+    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
+        CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (resultCollectionType is SeqType) {
+        wr.Write(TypeHelperName(resultCollectionType, wr, source.Origin) + ".Update");
+        wr.Append(ParensList(
+          Expr(source, inLetExprBody, wStmts),
+          Expr(index, inLetExprBody, wStmts),
+          CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts)));
+      } else if (resultCollectionType is MapType resultMapType) {
+        wr.Write(TypeHelperName(resultCollectionType, wr, source.Origin) + ".Update");
+        wr.Append(ParensList(
+          Expr(source, inLetExprBody, wStmts),
+          CoercedExpr(index, resultMapType.Domain, inLetExprBody, wStmts),
+          CoercedExpr(value, resultMapType.Range, inLetExprBody, wStmts)));
+      } else {
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+        wr.Write(".Update");
+        wr.Append(ParensList(
+          CoercedExpr(index, resultCollectionType.ValueArg, inLetExprBody, wStmts),
+          Expr(value, inLetExprBody, wStmts)));
+      }
+    }
+
+    protected override void EmitSeqSelectRange(Expression source, Expression lo /*?*/, Expression hi /*?*/,
+      bool fromArray, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (fromArray) {
+        wr.Write($"{DafnyHelpersClass}.SeqFromArray");
+      }
+      TrParenExpr(source, wr, inLetExprBody, wStmts);
+      if (hi != null) {
+        if (lo != null) {
+          wr.Write(".Subsequence");
+          wr.Append(ParensList(Expr(lo, inLetExprBody, wStmts), Expr(hi, inLetExprBody, wStmts)));
+        } else {
+          TrParenExpr(".Take", hi, wr, inLetExprBody, wStmts);
+        }
+      } else {
+        if (lo != null) {
+          TrParenExpr(".Drop", lo, wr, inLetExprBody, wStmts);
+        }
+      }
+    }
+
+    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts) {
+      if (expr.Initializer is LambdaExpr lam) {
+        Contract.Assert(lam.BoundVars.Count == 1);
+        EmitSeqConstructionExprFromLambda(expr.N, lam.BoundVars[0], lam.Body, inLetExprBody, wr);
+      } else {
+        wr.Write($"{DafnySeqClass}<{TypeName(expr.Type.NormalizeToAncestorType().AsSeqType.Arg, wr, expr.Origin)}>.Create");
+        wr.Append(ParensList(Expr(expr.N, inLetExprBody, wStmts), Expr(expr.Initializer, inLetExprBody, wStmts)));
+      }
+    }
+
+    protected override void EmitSeqBoundedPool(Expression of, bool includeDuplicates, string _, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(of, wr, inLetExprBody, wStmts);
+      wr.Write(includeDuplicates ? ".CloneAsArray()" : ".UniqueElements");
+    }
+
+    // Construct a sequence for the Dafny expression seq(N, F) in the common
+    // case that f is a lambda expression.  In that case, rather than
+    // something like
+    //
+    //   var s = Dafny.Sequence.Create(N, i => ...);
+    //
+    // (which will call the lambda N times), we'd rather write
+    //
+    //   var dim = N;
+    //   var arr = new T[dim];
+    //   for (int i = 0; i < dim; i++) {
+    //     arr[i] = ...;
+    //   }
+    //   var s = Dafny.Sequence<T>.FromArray(a);
+    //
+    // and thus avoid method calls.  Unfortunately, since we can't add
+    // statements easily, we have to settle for the slightly clunkier
+    //
+    //   var s = ((System.Func<Dafny.Sequence<T>>) (() => {
+    //     var dim = N;
+    //     var arr = new T[dim];
+    //     for (int i = 0; i < dim; i++) {
+    //       arr[i] = ...;
+    //     }
+    //     return Dafny.Sequence<T>.FromArray(a);
+    //   }))();
+    private void EmitSeqConstructionExprFromLambda(Expression lengthExpr, BoundVar boundVar, Expression body, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      wr.Format($"((System.Func<{TypeName(new SeqType(body.Type), wr, body.Origin)}>) (() =>{ExprBlock(out ConcreteSyntaxTree wrLamBody)}))()");
+
+      var indexType = lengthExpr.Type;
+      var lengthVar = idGenerator.FreshId("dim");
+      DeclareLocalVar(lengthVar, indexType, lengthExpr.Origin, lengthExpr, inLetExprBody, wrLamBody);
+      var arrVar = idGenerator.FreshId("arr");
+      wrLamBody.Write($"var {arrVar} = ");
+      var wrDims = EmitNewArray(body.Type, body.Origin, dimCount: 1, mustInitialize: false, wr: wrLamBody);
+      Contract.Assert(wrDims.Count == 1);
+      wrDims[0].Write(lengthVar);
+      wrLamBody.WriteLine(";");
+
+      var intIxVar = idGenerator.FreshId("i");
+      var wrLoopBody = wrLamBody.NewBlock(string.Format("for (int {0} = 0; {0} < {1}; {0}++)", intIxVar, lengthVar));
+      var ixVar = IdName(boundVar);
+      wrLoopBody.WriteLine("var {0} = ({1}) {2};",
+        ixVar, TypeName(indexType, wrLoopBody, body.Origin), intIxVar);
+      var wrArrName = EmitArrayUpdate(new List<Action<ConcreteSyntaxTree>> { wr => wr.Write(ixVar) }, body, wrLoopBody);
+      wrArrName.Write(arrVar);
+      EndStmt(wrLoopBody);
+
+      wrLamBody.WriteLine("return {0}<{1}>.FromArray({2});", DafnySeqClass, TypeName(body.Type, wr, body.Origin), arrVar);
+    }
+
+    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+        ConcreteSyntaxTree wStmts) {
+      wr.Write("{0}<{1}>", DafnyMultiSetClass, TypeName(expr.E.Type.NormalizeToAncestorType().AsCollectionType.Arg, wr, expr.Origin));
+      var eeType = expr.E.Type.NormalizeToAncestorType();
+      if (eeType is SeqType) {
+        TrParenExpr(".FromSeq", expr.E, wr, inLetExprBody, wStmts);
+      } else if (eeType is SetType) {
+        TrParenExpr(".FromSet", expr.E, wr, inLetExprBody, wStmts);
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();
+      }
+    }
+
+    protected override void EmitApplyExpr(Type functionType, IOrigin tok, Expression function, List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"{DafnyHelpersClass}.Id<{TypeName(functionType, wr, tok)}>({Expr(function, inLetExprBody, wStmts)})");
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+    }
+
+    protected override ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
+      if (type.HasFatPointer) {
+        var w = wr.ForkInParens();
+        wr.Write("._value");
+        return w;
+      } else {
+        return wr;
+      }
+    }
+
+    protected override ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
+      if (type.HasFatPointer) {
+        wr.Write($"new {type.AsNewtype.GetFullCompileName(Options)}");
+        return wr.ForkInParens();
+      } else {
+        return wr;
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitDowncast(Type from, Type to, IOrigin tok, ConcreteSyntaxTree wr) {
+      from = from.NormalizeExpand();
+      to = to.NormalizeExpand();
+      Contract.Assert(Options.Get(CommonOptionBag.GeneralTraits) != CommonOptionBag.GeneralTraitsOptions.Legacy ||
+                      from.IsRefType == to.IsRefType ||
+                      (from.IsTypeParameter && to.IsTraitType));
+
+      var w = new ConcreteSyntaxTree();
+      if (from.IsTraitType && to.AsNewtype != null) {
+        wr.Format($"(({to.AsNewtype.GetFullCompileName(Options)})({w}))");
+      } else if (to.IsRefType || to.IsTraitType || from.IsTraitType || to.IsTypeParameter) {
+        wr.Format($"(({TypeName(to, wr, tok)})({w}))");
+      } else {
+        Contract.Assert(Type.SameHead(from, to));
+
+        var typeArgs = from.IsArrowType ? from.TypeArgs.Concat(to.TypeArgs).ToList() : to.TypeArgs;
+        var wTypeArgs = typeArgs.Comma(ta => TypeName(ta, wr, tok));
+        var argPairs = Enumerable.Zip(from.TypeArgs, to.TypeArgs);
+        if (from.IsArrowType) {
+          argPairs = argPairs.Select((tp, i) => ++i < to.TypeArgs.Count ? (tp.Second, tp.First) : tp);
+        }
+        var wConverters = argPairs.Comma(t => DowncastConverter(t.Item1, t.Item2, wr, tok));
+        DatatypeDecl dt = from.AsDatatype;
+        var sep = "";
+        var wTypeDescriptorArguments = new ConcreteSyntaxTree();
+        if (to is UserDefinedType udt) {
+          WriteTypeDescriptors(udt.ResolvedClass, typeArgs, wTypeDescriptorArguments, ref sep);
+        }
+        if (dt != null && DowncastCloneNeedsCustomReceiver(dt)) {
+          wr.Format($"{TypeName_Companion(from, wr, tok, null)}.DowncastClone<{wTypeArgs}>({wTypeDescriptorArguments}{sep}{w}, {wConverters})");
+        } else {
+          wr.Format($"({w}).DowncastClone<{wTypeArgs}>({wTypeDescriptorArguments}{sep}{wConverters})");
+        }
+        Contract.Assert(from.TypeArgs.Count == to.TypeArgs.Count);
+      }
+      return w;
+    }
+
+    bool DowncastCloneNeedsCustomReceiver(DatatypeDecl dt) {
+      return SelectNonGhost(dt, dt.TypeArgs).Any(ty => ty.Variance == TypeParameter.TPVariance.Contra) ||
+             DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _);
+    }
+
+    string DowncastConverter(Type from, Type to, ConcreteSyntaxTree errorWr, IOrigin tok) {
+      if (IsTargetSupertype(from, to, true)) {
+        return $"Dafny.Helpers.Id<{TypeName(to, errorWr, tok)}>";
+      }
+      if (from.NormalizeToAncestorType().AsCollectionType != null) {
+        var sTo = TypeName(to, errorWr, tok);
+        // (from x) => { return x.DowncastClone<A, B, ...>(aConverter, bConverter, ...); }
+        var wr = new ConcreteSyntaxTree();
+        wr.Format($"({TypeName(@from, errorWr, tok)} x) => {{ return {Downcast(from, to, tok, (LineSegment)"x")}; }}");
+        return wr.ToString();
+      }
+      // use a type
+      return $"Dafny.Helpers.CastConverter<{TypeName(from, errorWr, tok)}, {TypeName(to, errorWr, tok)}>";
+    }
+
+    protected override bool TargetLambdaCanUseEnclosingLocals => false;
+
+    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
+      List<Type> boundTypes, Type resultType, IOrigin tok, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ref ConcreteSyntaxTree wStmts) {
+      var tas = Util.Snoc(boundTypes, resultType);
+      var typeArgs = TypeName_UDT(ArrowType.Arrow_FullCompileName, tas.ConvertAll(_ => TypeParameter.TPVariance.Non), tas, wr, tok);
+      var result = new ConcreteSyntaxTree();
+      wr.Format($"{DafnyHelpersClass}.Id<{typeArgs}>(({boundVars.Comma()}) => {result})");
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+      return result;
+    }
+
+    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex,
+      DatatypeCtor ctor, Func<List<Type>> getTypeArgs, Type bvType, ConcreteSyntaxTree wr) {
+      if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
+        Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
+        Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
+        source(wr);
+      } else {
+        source(wr);
+        wr.Write($".{DestructorGetterName(dtor, ctor, formalNonGhostIndex)}");
+      }
+    }
+
+    private string DestructorGetterName(Formal dtor, DatatypeCtor ctor, int index) {
+      return $"dtor_{(dtor.HasName ? dtor.CompileName : ctor.GetCompileName(Options) + FieldName(dtor, index))}";
+    }
+
+    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IOrigin tok, List<string> inNames,
+      Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
+      // (
+      //   (System.Func<inTypes,resultType>)  // cast, which tells C# what the various types involved are
+      //   (
+      //     (inNames) => {
+      //       <<caller fills in body here; must end with a return statement>>
+      //     }
+      //   )
+      // )
+      wr = wr.ForkInParens();
+      if (!untyped) {
+        wr.Write($"(System.Func<{inTypes.Concat(new[] { resultType }).Comma(t => TypeName(t, wr, tok))}>)");
+      }
+      wr.Format($"(({inNames.Comma(nm => nm)}) =>{ExprBlock(out ConcreteSyntaxTree body)})");
+      return body;
+    }
+
+    protected override void CreateIIFE(string bvName, Type bvType, IOrigin bvTok, Type bodyType, IOrigin bodyTok,
+      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
+      wrRhs = new ConcreteSyntaxTree();
+      wrBody = new ConcreteSyntaxTree();
+      wr.Format($"{DafnyHelpersClass}.Let<{TypeName(bvType, wr, bvTok)}, {TypeName(bodyType, wr, bodyTok)}>({wrRhs}, {bvName} => {wrBody})");
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IOrigin resultTok, ConcreteSyntaxTree wr,
+        ConcreteSyntaxTree wStmts) {
+      // (
+      //   (System.Func<resultType>)(() => <<body>>)
+      // )()
+      wr.Format($"((System.Func<{TypeName(resultType, wr, resultTok)}>)(() =>{ExprBlock(out ConcreteSyntaxTree result)}))()");
+      return result;
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IOrigin resultTok, string bvName,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Format($"{DafnyHelpersClass}.Let<int, {TypeName(resultType, wr, resultTok)}>({source}, {bvName} => {Block(out ConcreteSyntaxTree result)})");
+      return result;
+    }
+
+    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      switch (op) {
+        case ResolvedUnaryOp.BoolNot:
+          TrParenExpr("!", expr, wr, inLetExprBody, wStmts);
+          break;
+        case ResolvedUnaryOp.BitwiseNot:
+          TrParenExpr("~", expr, wr, inLetExprBody, wStmts);
+          break;
+        case ResolvedUnaryOp.Cardinality:
+          if (expr.Type.NormalizeToAncestorType().AsCollectionType is MultiSetType) {
+            TrParenExpr(expr, wr, inLetExprBody, wStmts);
+            wr.Write(".ElementCount");
+          } else {
+            TrParenExpr("new BigInteger(", expr, wr, inLetExprBody, wStmts);
+            wr.Write(".Count)");
+          }
+          break;
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
+      }
+    }
+
+    static bool IsDirectlyComparable(Type t) {
+      Contract.Requires(t != null);
+      return t.IsBoolType || t.IsCharType || t.IsIntegerType || t.IsRealType || t.AsNewtype != null || t.IsBitVectorType || t.IsBigOrdinalType || t.IsRefType;
+    }
+
+    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
+      Type e0Type, Type e1Type, IOrigin tok, Type resultType,
+      out string opString,
+      out string preOpString,
+      out string postOpString,
+      out string callString,
+      out string staticCallString,
+      out bool reverseArguments,
+      out bool truncateResult,
+      out bool convertE1_to_int,
+      out bool coerceE1,
+      ConcreteSyntaxTree errorWr) {
+
+      opString = null;
+      preOpString = "";
+      postOpString = "";
+      callString = null;
+      staticCallString = null;
+      reverseArguments = false;
+      truncateResult = false;
+      convertE1_to_int = false;
+      coerceE1 = false;
+
+      switch (op) {
+        case BinaryExpr.ResolvedOpcode.EqCommon: {
+            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0Type);
+            if (eqType.IsRefType) {
+              // Dafny's type rules are slightly different C#, so we may need a cast here.
+              // For example, Dafny allows x==y if x:array<T> and y:array<int> and T is some
+              // type parameter.
+              opString = "== (object)";
+            } else if (IsDirectlyComparable(eqType)) {
+              opString = "==";
+            } else {
+              staticCallString = "object.Equals";
+            }
+            break;
+          }
+        case BinaryExpr.ResolvedOpcode.NeqCommon: {
+            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0Type);
+            if (eqType.IsRefType) {
+              // Dafny's type rules are slightly different C#, so we may need a cast here.
+              // For example, Dafny allows x==y if x:array<T> and y:array<int> and T is some
+              // type parameter.
+              opString = "!= (object)";
+            } else if (IsDirectlyComparable(eqType)) {
+              opString = "!=";
+            } else {
+              preOpString = "!";
+              staticCallString = "object.Equals";
+            }
+            break;
+          }
+
+        case BinaryExpr.ResolvedOpcode.LeftShift: {
+            var typeBitwidth = resultType.NormalizeToAncestorType().AsBitVectorType.Width;
+            if (resultType.AsNativeType() is { Bitwidth: (32 or 64) and var targetBitwidth } && targetBitwidth <= typeBitwidth) {
+              // In C#, "<< 32" on "int" and "<< 64" on "long" are the same as "<< 0".
+              staticCallString = $"{DafnyHelpersClass}.Bv{targetBitwidth}ShiftLeft";
+            } else {
+              opString = "<<";
+            }
+            convertE1_to_int = true;
+            truncateResult = true;
+            break;
+          }
+        case BinaryExpr.ResolvedOpcode.RightShift: {
+            var typeBitwidth = resultType.NormalizeToAncestorType().AsBitVectorType.Width;
+            if (resultType.AsNativeType() is { Bitwidth: (32 or 64) and var targetBitwidth } && targetBitwidth <= typeBitwidth) {
+              // In C#, ">> 32" on "int" and ">> 64" on "long" are the same as ">> 0".
+              staticCallString = $"{DafnyHelpersClass}.Bv{targetBitwidth}ShiftRight";
+            } else {
+              opString = ">>";
+            }
+            convertE1_to_int = true;
+            break;
+          }
+        case BinaryExpr.ResolvedOpcode.Add:
+          if (resultType.IsCharType) {
+            if (CharIsRune) {
+              staticCallString = $"{DafnyHelpersClass}.AddRunes";
+            } else {
+              opString = "+"; truncateResult = true;
+              preOpString = $"(char)(";
+              postOpString = ")";
+            }
+          } else {
+            opString = "+"; truncateResult = true;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Sub:
+          if (resultType.IsCharType) {
+            if (CharIsRune) {
+              staticCallString = $"{DafnyHelpersClass}.SubtractRunes";
+            } else {
+              opString = "-"; truncateResult = true;
+              preOpString = $"(char)(";
+              postOpString = ")";
+            }
+          } else {
+            opString = "-"; truncateResult = true;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mul:
+          opString = "*"; truncateResult = true; break;
+        case BinaryExpr.ResolvedOpcode.Div:
+          if (NeedsEuclideanDivision(resultType)) {
+            var suffix = AsNativeType(resultType) != null ? "_" + GetNativeTypeName(AsNativeType(resultType)) : "";
+            staticCallString = $"{DafnyHelpersClass}.EuclideanDivision{suffix}";
+          } else {
+            opString = "/";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mod:
+          if (NeedsEuclideanDivision(resultType)) {
+            var suffix = AsNativeType(resultType) != null ? "_" + GetNativeTypeName(AsNativeType(resultType)) : "";
+            staticCallString = $"{DafnyHelpersClass}.EuclideanModulus{suffix}";
+          } else {
+            opString = "%";
+          }
+          break;
+
+        case BinaryExpr.ResolvedOpcode.SetEq:
+        case BinaryExpr.ResolvedOpcode.MultiSetEq:
+        case BinaryExpr.ResolvedOpcode.SeqEq:
+        case BinaryExpr.ResolvedOpcode.MapEq:
+          callString = "Equals"; break;
+
+        case BinaryExpr.ResolvedOpcode.ProperSubset:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
+          staticCallString = TypeHelperName(e0Type, errorWr, tok, e1Type) + ".IsProperSubsetOf"; break;
+        case BinaryExpr.ResolvedOpcode.Subset:
+        case BinaryExpr.ResolvedOpcode.MultiSubset:
+          staticCallString = TypeHelperName(e0Type, errorWr, tok, e1Type) + ".IsSubsetOf"; break;
+
+        case BinaryExpr.ResolvedOpcode.Disjoint:
+        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
+          staticCallString = TypeHelperName(e0Type, errorWr, tok, e1Type) + ".IsDisjointFrom"; break;
+        case BinaryExpr.ResolvedOpcode.InSet:
+        case BinaryExpr.ResolvedOpcode.InMultiSet:
+        case BinaryExpr.ResolvedOpcode.InMap:
+        case BinaryExpr.ResolvedOpcode.InSeq:
+          callString = "Contains"; reverseArguments = true; break;
+
+        case BinaryExpr.ResolvedOpcode.Union:
+        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+          staticCallString = TypeHelperName(resultType, errorWr, tok) + ".Union"; break;
+        case BinaryExpr.ResolvedOpcode.MapMerge:
+          staticCallString = TypeHelperName(resultType, errorWr, tok) + ".Merge"; break;
+        case BinaryExpr.ResolvedOpcode.Intersection:
+        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+          staticCallString = TypeHelperName(resultType, errorWr, tok) + ".Intersect"; break;
+        case BinaryExpr.ResolvedOpcode.SetDifference:
+        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+          staticCallString = TypeHelperName(resultType, errorWr, tok) + ".Difference"; break;
+
+        case BinaryExpr.ResolvedOpcode.MapSubtraction:
+          staticCallString = TypeHelperName(resultType, errorWr, tok) + ".Subtract"; break;
+
+        case BinaryExpr.ResolvedOpcode.ProperPrefix:
+          staticCallString = TypeHelperName(e0Type, errorWr, e0Type.Origin) + ".IsProperPrefixOf"; break;
+        case BinaryExpr.ResolvedOpcode.Prefix:
+          staticCallString = TypeHelperName(e0Type, errorWr, e0Type.Origin) + ".IsPrefixOf"; break;
+        case BinaryExpr.ResolvedOpcode.Concat:
+          staticCallString = TypeHelperName(e0Type, errorWr, e0Type.Origin) + ".Concat"; break;
+
+        default:
+          base.CompileBinOp(op, e0Type, e1Type, tok, resultType,
+            out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
+            errorWr);
+          break;
+      }
+    }
+
+    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
+      wr.Write("{0} == 0", varName);
+    }
+
+    protected override void EmitConversionExpr(Expression fromExpr, Type fromType, Type toType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Int) || fromType.NormalizeToAncestorType().IsBitVectorType || fromType.IsCharType) {
+        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          // (int or bv or char) -> real
+          Contract.Assert(AsNativeType(toType) == null);
+          wr.Write("new Dafny.BigRational(");
+          if (AsNativeType(fromType) != null) {
+            wr.Write("new BigInteger");
+          }
+          ConvertFromChar(fromExpr, wr, inLetExprBody, wStmts);
+          wr.Write(", BigInteger.One)");
+        } else if (toType.IsCharType) {
+          if (fromType.IsCharType) {
+            EmitExpr(fromExpr, inLetExprBody, wr, wStmts);
+          } else if (UnicodeCharEnabled) {
+            wr.Write($"new {CharTypeName}((int)");
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            wr.Write(")");
+          } else {
+            wr.Write($"({CharTypeName})");
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          }
+        } else {
+          // (int or bv or char) -> (int or bv or ORDINAL)
+          var fromNative = AsNativeType(fromType);
+          var toNative = AsNativeType(toType);
+          if (fromNative == null && toNative == null) {
+            if (fromType.IsCharType) {
+              // char -> big-integer (int or bv or ORDINAL)
+              wr.Write("new BigInteger");
+              ConvertFromChar(fromExpr, wr, inLetExprBody, wStmts);
+            } else {
+              // big-integer (int or bv) -> big-integer (int or bv or ORDINAL), so identity will do
+              wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+            }
+          } else if (fromNative != null && toNative == null) {
+            // native (int or bv) -> big-integer (int or bv)
+            wr.Write("new BigInteger");
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          } else {
+            GetNativeInfo(toNative.Sel, out string toNativeName, out string toNativeSuffix, out var toNativeNeedsCast);
+            // any (int or bv) -> native (int or bv)
+            // A cast would do, but we also consider some optimizations
+            wr.Write("({0})", toNativeName);
+
+            var literal = PartiallyEvaluate(fromExpr);
+            UnaryOpExpr u = fromExpr.Resolved as UnaryOpExpr;
+            MemberSelectExpr m = fromExpr.Resolved as MemberSelectExpr;
+            if (literal != null) {
+              // Optimize constant to avoid intermediate BigInteger
+              wr.Write("(" + literal + toNativeSuffix + ")");
+            } else if (u != null && u.Op == UnaryOpExpr.Opcode.Cardinality) {
+              // Optimize .Count to avoid intermediate BigInteger
+              TrParenExpr(u.E, wr, inLetExprBody, wStmts);
+              if (toNative.UpperBound <= new BigInteger(0x80000000U)) {
+                wr.Write(".Count");
+              } else {
+                wr.Write(".LongCount");
+              }
+            } else if (m != null && m.MemberName == "Length" && m.Obj.Type.IsArrayType) {
+              // Optimize .Length to avoid intermediate BigInteger
+              TrParenExpr(m.Obj, wr, inLetExprBody, wStmts);
+              if (toNative.UpperBound <= new BigInteger(0x80000000U)) {
+                wr.Write(".Length");
+              } else {
+                wr.Write(".LongLength");
+              }
+            } else {
+              // no optimization applies; use the standard translation
+              ConvertFromChar(fromExpr, wr, inLetExprBody, wStmts);
+            }
+          }
+        }
+      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        Contract.Assert(AsNativeType(fromType) == null);
+        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          // real -> real
+          Contract.Assert(AsNativeType(toType) == null);
+          wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+        } else {
+          // real -> (int or bv or char or ordinal)
+          if (toType.IsCharType) {
+            wr.Write($"({CharTypeName})");
+          } else if (AsNativeType(toType) != null) {
+            wr.Write("({0})", GetNativeTypeName(AsNativeType(toType)));
+          }
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          wr.Write(".ToBigInteger()");
+        }
+      } else if (fromType.IsBigOrdinalType) {
+        if (toType.IsNumericBased(Type.NumericPersuasion.Int) || toType.IsBigOrdinalType) {
+          wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+        } else if (toType.IsCharType) {
+          wr.Write($"({CharTypeName})");
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+        } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          wr.Write("new Dafny.BigRational(");
+          if (AsNativeType(fromType) != null) {
+            wr.Write("new BigInteger");
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            wr.Write(", BigInteger.One)");
+          } else {
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            wr.Write(", 1)");
+          }
+        } else if (toType.NormalizeToAncestorType().IsBitVectorType) {
+          // ordinal -> bv
+          var typename = TypeName(toType, wr, null, null);
+          wr.Write($"({typename})");
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+        } else {
+          Contract.Assert(false, $"not implemented for C#: {fromType} -> {toType}");
+        }
+      } else if (fromType.Equals(toType) || fromType.AsNewtype != null || toType.AsNewtype != null) {
+        wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+      } else {
+        Contract.Assert(false, $"not implemented for C#: {fromType} -> {toType}");
+      }
+    }
+
+    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IOrigin tok, ConcreteSyntaxTree wr) {
+      // from T to U:   t is U && ...
+      // from T to U?:  t is U && ...                 // since t is known to be non-null, this is fine
+      // from T? to U:  t is U && ...                 // note, "is" implies non-null, so no need for explicit null check
+      // from T? to U?: t == null || (t is U && ...)
+      if (fromType.IsRefType && !fromType.IsNonNullRefType && toType.IsRefType && !toType.IsNonNullRefType) {
+        wr = wr.Write($"{localName} == null || ").ForkInParens();
+      }
+
+      var toTypeString = fromType.IsTraitType && toType.AsNewtype is { } newtypeDecl ? newtypeDecl.GetFullCompileName(Options) : TypeName(toType, wr, tok);
+      wr.Write($"{localName} is {toTypeString}");
+    }
+
+    protected override void EmitIsIntegerTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(".IsInteger() && ");
+    }
+
+    protected override void EmitIsUnicodeScalarValueTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("Dafny.Rune.IsRune");
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(" && ");
+    }
+
+    protected override void EmitIsInIntegerRange(Expression source, BigInteger lo, BigInteger hi, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitLiteralExpr(wr, new LiteralExpr(source.Origin, lo) { Type = Type.Int });
+      wr.Write(" <= ");
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(" && ");
+
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(" < ");
+      EmitLiteralExpr(wr, new LiteralExpr(source.Origin, hi) { Type = Type.Int });
+      wr.Write(" && ");
+    }
+
+    protected override void EmitCollectionDisplay(CollectionType ct, IOrigin tok, List<Expression> elements,
+        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("{0}.FromElements", TypeHelperName(ct, wr, tok));
+      TrExprList(elements, wr, inLetExprBody, wStmts, typeAt: _ => ct.Arg);
+    }
+
+    protected override void EmitMapDisplay(MapType mt, IOrigin tok, List<ExpressionPair> elements,
+        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var arguments = elements.Select(p => {
+        var result = new ConcreteSyntaxTree();
+        result.Format($"new Dafny.Pair{BracketList((LineSegment)TypeName(p.A.Type, result, p.A.Origin), (LineSegment)TypeName(p.B.Type, result, p.B.Origin))}");
+        result.Append(ParensList(Expr(p.A, inLetExprBody, wStmts), Expr(p.B, inLetExprBody, wStmts)));
+        return result;
+      }).ToArray<ICanRender>();
+      wr.Write($"{TypeHelperName(mt, wr, tok)}.FromElements{ParensList(arguments)}");
+    }
+
+    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
+      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
+      wrVarInit.Write("new System.Collections.Generic.List<{0}>()", TypeName(e.Type.NormalizeToAncestorType().AsSetType.Arg, wrVarInit, e.Origin));
+    }
+
+    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
+      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
+      var mt = e.Type.NormalizeToAncestorType().AsMapType;
+      var domtypeName = TypeName(mt.Domain, wrVarInit, e.Origin);
+      var rantypeName = TypeName(mt.Range, wrVarInit, e.Origin);
+      wrVarInit.Write($"new System.Collections.Generic.List<Dafny.Pair<{domtypeName},{rantypeName}>>()");
+    }
+
+    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      if (ct is SetType) {
+        var wStmts = wr.Fork();
+        wr.FormatLine($"{collName}.Add({Expr(elmt, inLetExprBody, wStmts)});");
+      } else {
+        Contract.Assume(false);  // unexpected collection type
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IOrigin tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      var domtypeName = TypeName(mt.Domain, wr, tok);
+      var rantypeName = TypeName(mt.Range, wr, tok);
+      var termLeftWriter = new ConcreteSyntaxTree();
+      var wStmts = wr.Fork();
+      wr.FormatLine($"{collName}.Add(new Dafny.Pair<{domtypeName},{rantypeName}>{ParensList(termLeftWriter, Expr(term, inLetExprBody, wStmts))});");
+      return termLeftWriter;
+    }
+
+    protected override void GetCollectionBuilder_Build(CollectionType ct, IOrigin tok, string collName,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmt) {
+      if (ct is SetType) {
+        var typeName = TypeName(ct.Arg, wr, tok);
+        wr.Write(string.Format($"{DafnySetClass}<{typeName}>.FromCollection({collName})"));
+      } else if (ct is MapType) {
+        var mt = (MapType)ct;
+        var domtypeName = TypeName(mt.Domain, wr, tok);
+        var rantypeName = TypeName(mt.Range, wr, tok);
+        wr.Write($"{DafnyMapClass}<{domtypeName},{rantypeName}>.FromCollection({collName})");
+      } else {
+        Contract.Assume(false);  // unexpected collection type
+        throw new cce.UnreachableException();  // please compiler
+      }
+    }
+
+    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"{DafnyHelpersClass}.SingleValue<{type}>");
+      TrParenExpr(e, wr, inLetExprBody, wStmts);
+    }
+
+    private void AddTestCheckerIfNeeded(string name, Declaration decl, ConcreteSyntaxTree wr) {
+      if (Options.Compile || Options.Get(RunAllTestsMainMethod.IncludeTestRunner) || !Attributes.Contains(decl.Attributes, "test")) {
+        return;
+      }
+
+      var firstReturnIsFailureCompatible = false;
+      var returnTypesCount = 0;
+
+      if (decl is Function func) {
+        returnTypesCount = 1;
+        firstReturnIsFailureCompatible =
+          func.ResultType?.AsTopLevelTypeWithMembers?.Members?.Any(m => m.Name == "IsFailure") ?? false;
+      } else if (decl is Method method) {
+        returnTypesCount = method.Outs.Count;
+        if (returnTypesCount > 0) {
+          firstReturnIsFailureCompatible =
+            method.Outs[0].Type?.AsTopLevelTypeWithMembers?.Members?.Any(m => m.Name == "IsFailure") ?? false;
+        }
+      }
+
+      wr.WriteLine("[Xunit.Fact]");
+      if (!firstReturnIsFailureCompatible) {
+        return;
+      }
+
+      wr = wr.NewNamedBlock("public static void {0}_CheckForFailureForXunit()", name);
+      var returnsString = string.Join(",", Enumerable.Range(0, returnTypesCount).Select(i => $"r{i}"));
+      wr.FormatLine($"var {returnsString} = {name}();");
+      wr.WriteLine("Xunit.Assert.False(r0.IsFailure(), \"Dafny test failed: \" + r0);");
+
+    }
+
+    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
+      var companion = TypeName_Companion(UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(mainMethod.EnclosingClass), wr, mainMethod.Origin, mainMethod);
+      var wClass = wr.NewNamedBlock("class __CallToMain");
+      var wBody = wClass.NewNamedBlock("public static void Main(string[] args)");
+      var modName = mainMethod.EnclosingClass.EnclosingModuleDefinition.TryToAvoidName ? "_module." : "";
+      companion = modName + companion;
+
+      var idName = IssueCreateStaticMain(mainMethod) ? "_StaticMain" : IdName(mainMethod);
+
+      Coverage.EmitSetup(wBody);
+      wBody.WriteLine($"{GetHelperModuleName()}.WithHaltHandling(() => {companion}.{idName}(Dafny.Sequence<Dafny.ISequence<{CharTypeName}>>.{CharMethodQualifier}FromMainArguments(args)));");
+      Coverage.EmitTearDown(wBody);
+    }
+
+    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
+      var tryBlock = wr.NewBlock("try");
+      TrStmt(body, tryBlock);
+      var catchBlock = wr.NewBlock("catch (Dafny.HaltException e)");
+      catchBlock.WriteLine($"var {haltMessageVarName} = Dafny.Sequence<{CharTypeName}>.{CharMethodQualifier}FromString(e.Message);");
+      TrStmt(recoveryBody, catchBlock);
+    }
+
+    protected void EmitCoverageReportInstrumentation(Program program, ConcreteSyntaxTree wr) {
+      wr.WriteLine(@"
+namespace DafnyProfiling {
+  public class CodeCoverage {
+    static uint[] tallies;
+    static string talliesFileName;
+    public static void Setup(int size, string theTalliesFileName) {
+      tallies = new uint[size];
+      talliesFileName = theTalliesFileName;
+    }
+    public static void TearDown() {
+      using TextWriter talliesWriter = new StreamWriter(
+        new FileStream(talliesFileName, FileMode.Create));
+      for (var i = 0; i < tallies.Length; i++) {
+        talliesWriter.WriteLine(""{0}"", tallies[i]);
+      }
+      tallies = null;
+    }
+    public static bool Record(int id) {
+      tallies[id]++;
+      return true;
+    }
+  }
+}");
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/CSharp/CsharpSynthesizer.cs b/Source/DafnyCore/Backends/CSharp/CsharpSynthesizer.cs
new file mode 100644
index 00000000000..67ee4725bd4
--- /dev/null
+++ b/Source/DafnyCore/Backends/CSharp/CsharpSynthesizer.cs
@@ -0,0 +1,350 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.Dafny.Compilers;
+
+/// <summary>
+/// Below is the full grammar of ensures clauses that can specify
+/// the behavior of an object returned by a synthesize-annotated method
+/// (S is the starting symbol, ID refers to a variable/field/method/type
+/// identifier, EXPR stands for an arbitrary Dafny expression):
+///
+/// S         = FORALL
+///           | EQUALS 
+///           | S && S
+/// EQUALS    = ID.ID (ARGLIST)  == EXPR // stubs a method call
+///           | ID.ID            == EXPR // stubs field access
+///           | EQUALS && EQUALS
+/// FORALL    = forall BOUNDVARS :: EXPR ==> EQUALS
+/// ARGLIST   = ID   // this can be one of the bound variables
+///           | EXPR // this expr may not reference any of the bound variables 
+///           | ARGLIST, ARGLIST
+/// BOUNDVARS = ID : ID 
+///           | BOUNDVARS, BOUNDVARS
+/// 
+/// </summary>
+public class CsharpSynthesizer {
+
+  private readonly CsharpCodeGenerator codeGenerator;
+  private readonly ConcreteSyntaxTree ErrorWriter;
+  // maps identifiers to the names of the corresponding mock:
+  private Dictionary<IVariable, string> objectToMockName = new();
+  // associates a bound variable with the lambda passed to argument matcher
+  private Dictionary<IVariable, string> bounds = new();
+  private Method lastSynthesizedMethod = null;
+  private DafnyOptions Options => codeGenerator.Options;
+
+  public CsharpSynthesizer(CsharpCodeGenerator codeGenerator, ConcreteSyntaxTree errorWriter) {
+    this.codeGenerator = codeGenerator;
+    ErrorWriter = errorWriter;
+  }
+
+  /// <summary>
+  /// Create a body of a method that synthesizes one or more objects.
+  /// For instance, the following Dafny method:
+  /// 
+  /// method {:synthesize} CrossReferentialMock()
+  ///     returns (e1:Even, e2:Even) 
+  ///     ensures fresh(e1) && fresh(e2) 
+  ///     ensures e1.Next() == e2
+  ///     ensures e2.Next() == e1
+  ///
+  /// Gets compiled to the following C# code:
+  /// (Note that e1Return and e2Return are introduced because e1 and e2
+  /// are used inside a lambda and cannot, therefore, be out parameters)
+  ///
+  /// public static void CrossReferentialMock(out Even e1Return,
+  ///                                         out Even e2Return) {
+  ///     var e1Mock = new Mock<Even>();
+  ///     var e1 = e1Mock.Object;
+  ///     var e2Mock = new Mock<Even>();
+  ///     var e2 = e2Mock.Object;
+  ///     e1Mock.Setup(x => x.Next()).Returns(()=>e2);
+  ///     e2Mock.Setup(x => x.Next()).Returns(()=>e1);
+  ///     e1Return = e1;
+  ///     e2Return = e2;
+  /// }
+  /// </summary>
+  public ConcreteSyntaxTree SynthesizeMethod(Method method,
+    List<SinglePassCodeGenerator.TypeArgumentInstantiation> typeArgs, bool createBody,
+    ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
+
+    lastSynthesizedMethod = method;
+    // The following few lines are identical to those in Compiler.CreateMethod:
+    var customReceiver = createBody &&
+                         !forBodyInheritance &&
+                         codeGenerator.NeedsCustomReceiver(method);
+    var keywords = codeGenerator.Keywords(true, true);
+    var returnType = codeGenerator.GetTargetReturnTypeReplacement(method, wr);
+    var typeParameters = codeGenerator.TypeParameters(SinglePassCodeGenerator.TypeArgumentInstantiation.
+      ToFormals(codeGenerator.ForTypeParameters(typeArgs, method, lookasideBody)));
+    var parameters = codeGenerator
+      .GetMethodParameters(method, typeArgs, lookasideBody, customReceiver, returnType);
+
+    // Out parameters cannot be used inside lambda expressions in Csharp
+    // but the mocked objects may appear in lambda expressions during
+    // mocking (e.g. two objects may cross-reference each other).
+    // The solution is to rename the out parameters.
+    var parameterString = parameters.ToString();
+    var objectToReturnName = method.Outs.ToDictionary(o => o,
+      o => codeGenerator.idGenerator.FreshId(o.CompileName + "Return"));
+    foreach (var (obj, returnName) in objectToReturnName) {
+      parameterString = Regex.Replace(parameterString,
+        $"(^|[^a-zA-Z0-9_]){obj.GetOrCreateCompileName(codeGenerator.currentIdGenerator)}([^a-zA-Z0-9_]|$)",
+        "$1" + returnName + "$2");
+    }
+    wr.FormatLine($"{keywords}{returnType} {codeGenerator.PublicIdProtect(method.GetCompileName(Options))}{typeParameters}({parameterString}) {{");
+
+    // Initialize the mocks
+    objectToMockName = method.Outs.ToDictionary(o => (IVariable)o,
+      o => codeGenerator.idGenerator.FreshId(o.CompileName + "Mock"));
+    foreach (var (obj, mockName) in objectToMockName) {
+      var typeName = codeGenerator.TypeName(obj.Type, wr, obj.Origin);
+      // Mocking a trait works only so long as no trait member is accessed
+      if ((method.Outs.First().Type is UserDefinedType userDefinedType) &&
+          userDefinedType.IsTraitType) {
+        wr.FormatLine($"var {mockName} = new Mock<{typeName}>(MockBehavior.Strict);");
+      } else {
+        wr.FormatLine($"var {mockName} = new Mock<{typeName}>();");
+        wr.FormatLine($"{mockName}.CallBase = true;");
+      }
+      wr.FormatLine($"var {obj.GetOrCreateCompileName(method.CodeGenIdGenerator)} = {mockName}.Object;");
+    }
+
+    // Stub methods and fields according to the Dafny post-conditions:
+    foreach (var ensureClause in method.Ens) {
+      bounds = new();
+      var wStmts = wr.Fork();
+      SynthesizeExpression(wr, ensureClause.E, wStmts);
+    }
+
+    // Return the mocked objects:
+    if (returnType != "void") {
+      wr.FormatLine($"return {method.Outs[0].CompileName};");
+    } else {
+      foreach (var o in method.Outs) {
+        wr.FormatLine($"{objectToReturnName[o]} = {o.CompileName};");
+      }
+    }
+    wr.WriteLine("}");
+    return wr;
+  }
+
+  /// <summary>
+  /// If the expression is a bound variable identifier, return the
+  /// variable and the string representation of the bounding condition
+  /// </summary>
+  private Tuple<IVariable, string> GetBound(Expression exp) {
+    if (exp is not NameSegment) {
+      return null;
+    }
+    var variable = ((IdentifierExpr)exp.Resolved).Var;
+    if (!bounds.ContainsKey(variable)) {
+      return null;
+    }
+    return new Tuple<IVariable, string>(variable, bounds[variable]);
+  }
+
+  private void SynthesizeExpression(ConcreteSyntaxTree wr, Expression expr, ConcreteSyntaxTree wStmts) {
+    switch (expr) {
+      case LiteralExpr literalExpr:
+        wr.Append(codeGenerator.Expr(literalExpr, false, wStmts));
+        break;
+      case ApplySuffix applySuffix:
+        SynthesizeExpression(wr, applySuffix, wStmts);
+        break;
+      case BinaryExpr binaryExpr:
+        SynthesizeExpression(wr, binaryExpr, wStmts);
+        break;
+      case ForallExpr forallExpr:
+        SynthesizeExpression(wr, forallExpr, wStmts);
+        break;
+      case FreshExpr:
+        break;
+      default:
+        // TODO: Have the resolver reject all these unimplemented cases,
+        // or convert them to UnsupportedFeatureExceptions
+        throw new NotImplementedException();
+    }
+  }
+
+  private void SynthesizeExpression(ConcreteSyntaxTree wr, ApplySuffix applySuffix, ConcreteSyntaxTree wStmts) {
+
+    var methodApp = (ExprDotName)applySuffix.Lhs;
+    var receiver = ((IdentifierExpr)methodApp.Lhs.Resolved).Var;
+    var method = ((MemberSelectExpr)methodApp.Resolved).Member;
+    var methodName = method.GetCompileName(Options);
+
+    if (((Function)method).Ens.Count != 0) {
+      codeGenerator.Reporter.Warning(MessageSource.Compiler,
+          GeneratorErrors.ErrorId.c_possibly_unsatisfied_postconditions, lastSynthesizedMethod.Origin,
+        "Post-conditions on function {0} might " +
+        "be unsatisfied when synthesizing code " +
+        "for method {1}",
+        methodName, lastSynthesizedMethod.Name);
+    }
+
+    var tmpId = codeGenerator.idGenerator.FreshId("tmp");
+    wr.Format($"{objectToMockName[receiver]}.Setup({tmpId} => {tmpId}.{methodName}(");
+
+    // The remaining part of the method uses Moq's argument matching to
+    // describe the arguments for which the method should be stubbed
+    // (in Dafny, this condition is the antecedent over bound variables)
+    for (int i = 0; i < applySuffix.Args.Count; i++) {
+      var arg = applySuffix.Args[i];
+      var bound = GetBound(arg);
+      if (bound != null) { // if true, arg is a bound variable
+        wr.Write(bound.Item2);
+      } else {
+        wr.Append(codeGenerator.Expr(arg, false, wStmts));
+      }
+      if (i != applySuffix.Args.Count - 1) {
+        wr.Write(", ");
+      }
+    }
+    wr.Write("))");
+  }
+
+  private void SynthesizeExpression(ConcreteSyntaxTree wr, BinaryExpr binaryExpr, ConcreteSyntaxTree wStmts) {
+    if (binaryExpr.Op == BinaryExpr.Opcode.And) {
+      Dictionary<IVariable, string> oldBounds = bounds
+        .ToDictionary(entry => entry.Key, entry => entry.Value);
+      SynthesizeExpression(wr, binaryExpr.E0, wStmts);
+      bounds = oldBounds;
+      SynthesizeExpression(wr, binaryExpr.E1, wStmts);
+      return;
+    }
+    if (binaryExpr.Op != BinaryExpr.Opcode.Eq) {
+      throw new NotImplementedException();
+    }
+    if (binaryExpr.E0 is ExprDotName exprDotName) { // field stubbing
+      var obj = ((IdentifierExpr)exprDotName.Lhs.Resolved).Var;
+      var field = ((MemberSelectExpr)exprDotName.Resolved).Member;
+      var fieldName = field.GetCompileName(Options);
+      codeGenerator.Reporter.Warning(MessageSource.Compiler,
+        GeneratorErrors.ErrorId.c_stubbing_fields_not_recommended, lastSynthesizedMethod.Origin,
+        "Stubbing fields is not recommended (field {0} of object {1} inside method {2})",
+        fieldName, obj.Name, lastSynthesizedMethod.Name);
+      var tmpId = codeGenerator.idGenerator.FreshId("tmp");
+      wr.Format($"{objectToMockName[obj]}.SetupGet({tmpId} => {tmpId}.@{fieldName}).Returns( ");
+      wr.Append(codeGenerator.Expr(binaryExpr.E1, false, wStmts));
+      wr.WriteLine(");");
+      return;
+    }
+    if (binaryExpr.E0 is not ApplySuffix applySuffix) {
+      throw new NotImplementedException();
+    }
+    SynthesizeExpression(wr, applySuffix, wStmts);
+    wr.Write(".Returns(");
+    wr.Write("(");
+    for (int i = 0; i < applySuffix.Args.Count; i++) {
+      var arg = applySuffix.Args[i];
+      var typeName = codeGenerator.TypeName(arg.Type, wr, arg.Origin);
+      var bound = GetBound(arg);
+      if (bound != null) {
+        wr.Format($"{typeName} {bound.Item1.GetOrCreateCompileName(codeGenerator.currentIdGenerator)}");
+      } else {
+        // if the argument is not a bound variable, it is irrelevant to the
+        // expression in the lambda
+        wr.Format($"{typeName} _");
+      }
+      if (i != applySuffix.Args.Count - 1) {
+        wr.Write(", ");
+      }
+    }
+    wr.Write(")=>");
+    wr.Append(codeGenerator.Expr(binaryExpr.E1, false, wStmts));
+    wr.WriteLine(");");
+  }
+
+  private void SynthesizeExpression(ConcreteSyntaxTree wr, ForallExpr forallExpr, ConcreteSyntaxTree wStmts) {
+    if (forallExpr.Term is not BinaryExpr binaryExpr) {
+      throw new NotImplementedException();
+    }
+    var declarations = new List<string>();
+
+    // a MultiMatcher is created to convert an antecedent of the implication
+    // following the forall statement to argument matching calls in Moq
+    var matcherName = codeGenerator.idGenerator.FreshId("matcher");
+
+    var tmpId = codeGenerator.idGenerator.FreshId("tmp");
+    for (int i = 0; i < forallExpr.BoundVars.Count; i++) {
+      var boundVar = forallExpr.BoundVars[i];
+      var varType = codeGenerator.TypeName(boundVar.Type, wr, boundVar.Origin);
+      bounds[boundVar] = $"It.Is<{varType}>(x => {matcherName}.Match(x))";
+      declarations.Add($"var {boundVar.GetOrCreateCompileName(codeGenerator.currentIdGenerator)} = ({varType}) {tmpId}[{i}];");
+    }
+
+    wr.WriteLine($"var {matcherName} = new Dafny.MultiMatcher({declarations.Count}, {tmpId} => {{");
+    foreach (var declaration in declarations) {
+      wr.WriteLine($"\t{declaration}");
+    }
+
+    switch (binaryExpr.Op) {
+      case BinaryExpr.Opcode.Imp:
+        wr.Write("\treturn ");
+        wr.Append(codeGenerator.Expr(binaryExpr.E0, false, wStmts));
+        wr.WriteLine(";");
+        binaryExpr = (BinaryExpr)binaryExpr.E1.Resolved;
+        break;
+      case BinaryExpr.Opcode.Eq:
+        wr.WriteLine("\treturn true;");
+        break;
+      default:
+        throw new NotImplementedException();
+    }
+    wr.WriteLine("});");
+    SynthesizeExpression(wr, binaryExpr, wStmts);
+  }
+
+  /// <summary>
+  /// Adds MultiMatcher class to the specified ConcreteSyntaxTree.
+  /// MultiMatcher allows converting one expression over many arguments
+  /// (like ones one finds in Dafny in antecedent of a forall statement)
+  /// to many separate predicates over each argument (which is how argument
+  /// matching is done in expressionC#'s Moq library)
+  /// So, for instance, a Dafny postcondition
+  ///   forall a,b:int :: a > b ==> o.m(a, b) == 4
+  /// is converted to:
+  /// 
+  ///   var matcher = new Dafny.MultiMatcher(2, args => {
+  ///     return args[0] > args[1];
+  ///   });
+  ///   o.Setup(x => x.m(It.Is<int>(a => matcher.Match(a)),
+  ///                    It.Is<int>(b => matcher.Match(b)))).Returns(4);
+  /// 
+  /// </summary>
+  internal static void EmitMultiMatcher(ConcreteSyntaxTree dafnyNamespace) {
+    const string multiMatcher = @"
+    internal class MultiMatcher {
+
+      private readonly Func<object[], bool> predicate;
+      private readonly int argumentCount;
+      private readonly List<object> collectedArguments;
+
+      public MultiMatcher(int argumentCount, Func<object[], bool> predicate) {
+        this.predicate = predicate;
+        this.argumentCount = argumentCount;
+        collectedArguments = new List<object>();
+      }
+
+      public bool Match(object argument) {
+        collectedArguments.Add(argument);
+        if (collectedArguments.Count != argumentCount) {
+          return true;
+        }
+        bool result = predicate(collectedArguments.ToArray());
+        collectedArguments.Clear();
+        return result;
+      }
+    }";
+    dafnyNamespace.WriteLine(multiMatcher);
+  }
+
+  internal static void EmitImports(ConcreteSyntaxTree wr) {
+    wr.WriteLine("using Moq;");
+    wr.WriteLine("using System.Collections.Generic;");
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/CodeGeneratorTypeExtensions.cs b/Source/DafnyCore/Backends/CodeGeneratorTypeExtensions.cs
new file mode 100644
index 00000000000..1fae5747c3e
--- /dev/null
+++ b/Source/DafnyCore/Backends/CodeGeneratorTypeExtensions.cs
@@ -0,0 +1,22 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny.Compilers;
+
+public static class CompilerTypeExtensions {
+  /// <summary>
+  /// Trim away newtypes to get to an ancestor type that either is not a newtype or is a native type.
+  /// The method differs from Type.NormalizeToAncestorType() in that GetRuntimeType() stops at native types.
+  /// </summary>
+  public static Type GetRuntimeType(this Type typ) {
+    while (typ.AsNewtype is { NativeType: null } newtypeDecl) {
+      typ = newtypeDecl.ConcreteBaseType(typ.TypeArgs);
+    }
+    return typ.NormalizeExpand();
+  }
+
+}
diff --git a/Source/DafnyCore/Backends/CoverageInstrumenter.cs b/Source/DafnyCore/Backends/CoverageInstrumenter.cs
new file mode 100644
index 00000000000..5dbae937ef8
--- /dev/null
+++ b/Source/DafnyCore/Backends/CoverageInstrumenter.cs
@@ -0,0 +1,113 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.Dafny.Compilers;
+
+public class CoverageInstrumenter {
+  private readonly SinglePassCodeGenerator codeGenerator;
+  private List<(IOrigin, string)>/*?*/ legend;  // non-null implies options.CoverageLegendFile is non-null
+  private string talliesFilePath;
+
+  public CoverageInstrumenter(SinglePassCodeGenerator codeGenerator) {
+    this.codeGenerator = codeGenerator;
+    if (codeGenerator.Options?.CoverageLegendFile != null
+        || codeGenerator.Options?.Get(CommonOptionBag.ExecutionCoverageReport) != null) {
+      legend = new List<(IOrigin, string)>();
+    }
+
+    if (codeGenerator.Options?.Get(CommonOptionBag.ExecutionCoverageReport) != null) {
+      talliesFilePath = Path.GetTempFileName();
+    }
+  }
+
+  public bool IsRecording {
+    get => legend != null;
+  }
+
+  public void Instrument(IOrigin tok, string description, ConcreteSyntaxTree wr) {
+    Contract.Requires(tok != null);
+    Contract.Requires(description != null);
+    Contract.Requires(wr != null || !IsRecording);
+    if (legend != null) {
+      wr.Write("DafnyProfiling.CodeCoverage.Record({0})", legend.Count);
+      codeGenerator.EndStmt(wr);
+      legend.Add((tok, description));
+    }
+  }
+
+  public void UnusedInstrumentationPoint(IOrigin tok, string description) {
+    Contract.Requires(tok != null);
+    Contract.Requires(description != null);
+    if (legend != null) {
+      legend.Add((tok, description));
+    }
+  }
+
+  public void InstrumentExpr(IOrigin tok, string description, bool resultValue, ConcreteSyntaxTree wr) {
+    Contract.Requires(tok != null);
+    Contract.Requires(description != null);
+    Contract.Requires(wr != null || !IsRecording);
+    if (legend != null) {
+      // The "Record" call always returns "true", so we negate it to get the value "false"
+      wr.Write("{1}DafnyProfiling.CodeCoverage.Record({0})", legend.Count, resultValue ? "" : "!");
+      legend.Add((tok, description));
+    }
+  }
+
+  /// <summary>
+  /// Should be called once "n" has reached its final value
+  /// </summary>
+  public void EmitSetup(ConcreteSyntaxTree wr) {
+    Contract.Requires(wr != null);
+    if (legend != null) {
+      wr.Write("DafnyProfiling.CodeCoverage.Setup({0}", legend.Count);
+      if (talliesFilePath != null) {
+        wr.Write($", @\"{talliesFilePath}\"");
+      }
+      wr.Write(")");
+      codeGenerator.EndStmt(wr);
+    }
+  }
+
+  public void EmitTearDown(ConcreteSyntaxTree wr) {
+    Contract.Requires(wr != null);
+    if (legend != null) {
+      wr.Write("DafnyProfiling.CodeCoverage.TearDown()");
+      codeGenerator.EndStmt(wr);
+    }
+  }
+
+  public void WriteLegendFile() {
+    if (codeGenerator.Options?.CoverageLegendFile != null) {
+      var filename = codeGenerator.Options.CoverageLegendFile;
+      Contract.Assert(filename != null);
+      TextWriter wr = filename == "-" ? codeGenerator.Options.OutputWriter : new StreamWriter(new FileStream(Path.GetFullPath(filename), FileMode.Create));
+      {
+        for (var i = 0; i < legend.Count; i++) {
+          var e = legend[i];
+          wr.WriteLine($"{i}: {e.Item1.TokenToString(codeGenerator.Options)}: {e.Item2}");
+        }
+      }
+      legend = null;
+    }
+  }
+
+  public void PopulateCoverageReport(CoverageReport coverageReport) {
+    var coverageReportDir = codeGenerator.Options?.Get(CommonOptionBag.ExecutionCoverageReport);
+    if (coverageReportDir != null) {
+      var tallies = File.ReadLines(talliesFilePath).Select(int.Parse).ToArray();
+      foreach (var ((token, _), tally) in legend.Zip(tallies)) {
+        var label = tally == 0 ? CoverageLabel.NotCovered : CoverageLabel.FullyCovered;
+        // For now we only identify branches at the line granularity,
+        // which matches what `dafny generate-tests ... --coverage-report` does as well.
+        var rangeToken = new SourceOrigin(
+          new Token(token.line, 1) { Uri = token.Uri },
+          new Token(token.line + 1, 1));
+        coverageReport.LabelCode(rangeToken, label);
+      }
+    }
+  }
+
+}
diff --git a/Source/DafnyCore/Backends/Cplusplus/CppBackend.cs b/Source/DafnyCore/Backends/Cplusplus/CppBackend.cs
new file mode 100644
index 00000000000..095412d24e2
--- /dev/null
+++ b/Source/DafnyCore/Backends/Cplusplus/CppBackend.cs
@@ -0,0 +1,76 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.CommandLine;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Microsoft.Dafny.Compilers;
+
+public class CppBackend : ExecutableBackend {
+
+  protected override SinglePassCodeGenerator CreateCodeGenerator() {
+    return new CppCodeGenerator(Options, Reporter, OtherFileNames);
+  }
+
+  private string ComputeExeName(string targetFilename) {
+    return Path.ChangeExtension(Path.GetFullPath(targetFilename), "exe");
+  }
+
+  public override async Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText,
+    string callToMain /*?*/, string targetFilename /*?*/, ReadOnlyCollection<string> otherFileNames,
+    bool runAfterCompile, TextWriter outputWriter) {
+    var assemblyLocation = System.Reflection.Assembly.GetExecutingAssembly().Location;
+    Contract.Assert(assemblyLocation != null);
+    var codebase = Path.GetDirectoryName(assemblyLocation);
+    Contract.Assert(codebase != null);
+    var psi = PrepareProcessStartInfo("g++", new List<string> {
+      "-Wall",
+      "-Wextra",
+      "-Wpedantic",
+      "-Wno-unused-variable",
+      "-Wno-deprecated-copy",
+      "-Wno-unused-label",
+      "-Wno-unused-but-set-variable",
+      "-Wno-unknown-warning-option",
+      "-g",
+      "-std=c++17",
+      "-I", codebase,
+      "-o", ComputeExeName(targetFilename),
+      targetFilename
+    });
+    return (0 == await RunProcess(psi, outputWriter, outputWriter, "Error while compiling C++ files."), null);
+  }
+
+  public override async Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText,
+    string callToMain, /*?*/
+    string targetFilename, ReadOnlyCollection<string> otherFileNames,
+    object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
+    var psi = PrepareProcessStartInfo(ComputeExeName(targetFilename), Options.MainArgs);
+    return 0 == await RunProcess(psi, outputWriter, errorWriter);
+  }
+
+  public override Command GetCommand() {
+    var cmd = base.GetCommand();
+    cmd.Description = $@"Translate Dafny sources to {TargetName} source and build files.
+
+This back-end has various limitations (see Docs/Compilation/Cpp.md).
+This includes lack of support for BigIntegers (aka int), most higher order functions,
+and advanced features like traits or co-inductive types.";
+    return cmd;
+  }
+
+  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".h" };
+
+  public override string TargetName => "C++";
+  public override bool IsStable => true;
+  public override string TargetExtension => "cpp";
+
+  public override bool SupportsInMemoryCompilation => false;
+
+  public override bool TextualTargetIsExecutable => false;
+
+  public CppBackend(DafnyOptions options) : base(options) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/Cplusplus/CppCodeGenerator.cs b/Source/DafnyCore/Backends/Cplusplus/CppCodeGenerator.cs
new file mode 100644
index 00000000000..dc8d8715169
--- /dev/null
+++ b/Source/DafnyCore/Backends/Cplusplus/CppCodeGenerator.cs
@@ -0,0 +1,2484 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using System.Collections.ObjectModel;
+using System.IO;
+using JetBrains.Annotations;
+
+namespace Microsoft.Dafny.Compilers {
+  class CppCodeGenerator : SinglePassCodeGenerator {
+
+    private readonly ReadOnlyCollection<string> headers;
+
+    public CppCodeGenerator(DafnyOptions options, ErrorReporter reporter, ReadOnlyCollection<string> headers) : base(options, reporter) {
+      this.headers = headers;
+    }
+
+    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
+      Feature.UnboundedIntegers,
+      Feature.RealNumbers,
+      Feature.CollectionsOfTraits,
+      Feature.Codatatypes,
+      Feature.Multisets,
+      Feature.ExternalClasses,
+      Feature.Traits,
+      Feature.Iterators,
+      Feature.NonNativeNewtypes,
+      Feature.RuntimeTypeDescriptors,
+      Feature.MultiDimensionalArrays,
+      Feature.CollectionsOfTraits,
+      Feature.Quantifiers,
+      Feature.NewObject,
+      Feature.BitvectorRotateFunctions,
+      Feature.NonSequentializableForallStatements,
+      Feature.FunctionValues,
+      Feature.ArrayLength,
+      Feature.Ordinals,
+      Feature.MapItems,
+      Feature.Codatatypes,
+      Feature.LetSuchThatExpressions,
+      Feature.NonNativeNewtypes,
+      Feature.TypeTests,
+      Feature.SubsetTypeTests,
+      Feature.SequenceDisplaysOfCharacters,
+      Feature.MapComprehensions,
+      Feature.ExactBoundedPool,
+      Feature.RunAllTests,
+      Feature.MethodSynthesis,
+      Feature.UnicodeChars,
+      Feature.ConvertingValuesToStrings,
+      Feature.BuiltinsInRuntime,
+      Feature.RuntimeCoverageReport
+    };
+
+    private List<DatatypeDecl> datatypeDecls = new();
+    private List<string> classDefaults = new();
+
+    /*
+     * Unlike other Dafny and Dafny's other backends, C++ cares about
+     * the order in which types are declared.  To make this more likely
+     * to succeed, we emit type information as gradually as possible
+     * in hopes that definitions are in place when needed.
+     */
+
+    // Forward declarations of class and struct names
+    private ConcreteSyntaxTree modDeclsWr = null;
+    private ConcreteSyntaxTree modDeclWr = null;
+    // Dafny datatype declarations
+    private ConcreteSyntaxTree dtDeclsWr = null;
+    private ConcreteSyntaxTree dtDeclWr = null;
+    // Dafny class declarations
+    private ConcreteSyntaxTree classDeclsWr = null;
+    private ConcreteSyntaxTree classDeclWr = null;
+    // Dedicated hash-function definitions for each type
+    private ConcreteSyntaxTree hashWr = null;
+
+    const string DafnySetClass = "DafnySet";
+    const string DafnyMultiSetClass = "DafnyMultiset";
+    const string DafnySeqClass = "DafnySequence";
+    const string DafnyMapClass = "DafnyMap";
+
+    public override string ModuleSeparator => "::";
+    protected override string StaticClassAccessor => "::";
+    protected override string InstanceClassAccessor => "->";
+
+    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
+      // This seems to be a good place to check for unsupported options
+      if (UnicodeCharEnabled) {
+        throw new UnsupportedFeatureException(program.GetStartOfFirstFileToken(), Feature.UnicodeChars);
+      }
+
+      wr.WriteLine("// Dafny program {0} compiled into Cpp", program.Name);
+      wr.WriteLine("#include \"DafnyRuntime.h\"");
+      foreach (var header in this.headers) {
+        wr.WriteLine("#include \"{0}\"", Path.GetFileName(header));
+      }
+
+      // For "..."s string literals, to avoid interpreting /0 as the C end of the string, cstring-style
+      wr.WriteLine("using namespace std::literals;");
+
+      var filenameNoExtension = program.Name.Substring(0, program.Name.Length - 4);
+      var headerFileName = $"{filenameNoExtension}.h";
+      wr.WriteLine("#include \"{0}\"", Path.GetFileName(headerFileName));
+
+      var headerFileWr = wr.NewFile(headerFileName);
+      headerFileWr.WriteLine("// Dafny program {0} compiled into a Cpp header file", program.Name);
+      headerFileWr.WriteLine("#pragma once");
+      headerFileWr.WriteLine("#include \"DafnyRuntime.h\"");
+
+      this.modDeclsWr = headerFileWr.Fork();
+      this.dtDeclsWr = headerFileWr.Fork();
+      this.classDeclsWr = headerFileWr.Fork();
+      this.hashWr = headerFileWr.Fork();
+
+      if (Options.IncludeRuntime) {
+        EmitRuntimeSource("DafnyRuntimeCpp", wr);
+      }
+
+    }
+    protected override void EmitFooter(Program program, ConcreteSyntaxTree wr) {
+      // Define default values for each datatype
+      foreach (var dt in this.datatypeDecls) {
+        var wd = wr.NewBlock(String.Format("template <{0}>\nstruct get_default<{1}::{2}{3} >",
+          TypeParameters(dt.TypeArgs),
+          dt.EnclosingModuleDefinition.GetCompileName(Options),
+          dt.GetCompileName(Options),
+          InstantiateTemplate(dt.TypeArgs)), ";");
+        var wc = wd.NewBlock(String.Format("static {0}::{1}{2} call()",
+          dt.EnclosingModuleDefinition.GetCompileName(Options),
+          dt.GetCompileName(Options),
+          InstantiateTemplate(dt.TypeArgs)));
+        wc.WriteLine("return {0}::{1}{2}();", dt.EnclosingModuleDefinition.GetCompileName(Options), dt.GetCompileName(Options), InstantiateTemplate(dt.TypeArgs));
+      }
+
+      // Define default values for each class
+      foreach (var classDefault in classDefaults) {
+        wr.WriteLine(classDefault);
+      }
+    }
+
+    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
+      var w = wr.NewBlock("int main(int argc, char *argv[])");
+      var tryWr = w.NewBlock("try");
+      tryWr.WriteLine(string.Format("{0}::{1}::{2}(dafny_get_args(argc, argv));", mainMethod.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options), clName(mainMethod.EnclosingClass), mainMethod.Name));
+      var catchWr = w.NewBlock("catch (DafnyHaltException & e)");
+      catchWr.WriteLine("std::cout << \"Program halted: \" << e.what() << std::endl;");
+    }
+
+    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
+      var wr = (cw as ClassWriter).MethodWriter;
+      return wr.NewBlock($"int main(DafnySequence<DafnySequence<char>> {argsParameterName})");
+    }
+
+    protected override ConcreteSyntaxTree CreateModule(ModuleDefinition module, string moduleName, bool isDefault,
+      ModuleDefinition externModule,
+      string libraryName /*?*/, Attributes moduleAttributes, ConcreteSyntaxTree wr) {
+      var s = $"namespace {IdProtect(moduleName)} ";
+      string footer = "// end of " + s + " declarations";
+      this.modDeclWr = this.modDeclsWr.NewBlock(s, footer);
+      string footer1 = "// end of " + s + " datatype declarations";
+      this.dtDeclWr = this.dtDeclsWr.NewBlock(s, footer1);
+      string footer2 = "// end of " + s + " class declarations";
+      this.classDeclWr = this.classDeclsWr.NewBlock(s, footer2);
+      string footer3 = "// end of " + s;
+      return wr.NewBlock(s, footer3);
+    }
+
+    private string TypeParameters(List<TypeParameter> targs) {
+      Contract.Requires(cce.NonNullElements(targs));
+      Contract.Ensures(Contract.Result<string>() != null);
+      if (targs != null) {
+        return Util.Comma(targs, tp => "typename " + IdName(tp));
+      } else {
+        return "";
+      }
+    }
+
+    private string DeclareTemplate(List<TypeParameter> typeArgs) {
+      var targs = "";
+      if (typeArgs != null && typeArgs.Count > 0) {
+        targs = String.Format("template <{0}>", TypeParameters(typeArgs));
+      }
+      return targs;
+    }
+
+    private string DeclareTemplate(List<Type> typeArgs) {
+      var targs = "";
+      if (typeArgs != null && typeArgs.Count > 0) {
+        targs = String.Format("template <{0}>", Util.Comma(typeArgs, t => "typename " + TypeName(t, null, null)));
+      }
+      return targs;
+    }
+
+    private string InstantiateTemplate(List<TypeParameter> typeArgs) {
+      if (typeArgs != null) {
+        var targs = "";
+        if (typeArgs.Count > 0) {
+          targs = String.Format("<{0}>", Util.Comma(typeArgs, ta => ta.GetCompileName(Options)));
+        }
+        return targs;
+      } else {
+        return "";
+      }
+    }
+
+    private string InstantiateTemplate(List<Type> typeArgs) {
+      if (typeArgs != null) {
+        var targs = "";
+        if (typeArgs.Count > 0) {
+          targs = String.Format("<{0}>", Util.Comma(typeArgs, ta => TypeName(ta, null, Token.NoToken)));
+        }
+
+        return targs;
+      } else {
+        return "";
+      }
+    }
+
+    protected override string GetHelperModuleName() => "_dafny";
+
+    private string clName(TopLevelDecl cl) {
+      var className = IdName(cl);
+      if (cl is ClassDecl || cl is DefaultClassDecl) {
+        return className;
+      }
+      return "class_" + className;
+    }
+
+    protected override IClassWriter CreateClass(string moduleName, bool isExtern, string/*?*/ fullPrintName, List<TypeParameter>/*?*/ typeParameters, TopLevelDecl cls, List<Type>/*?*/ superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+      var className = clName(cls);
+      if (isExtern) {
+        throw new UnsupportedFeatureException(tok, Feature.ExternalClasses, String.Format("extern in class {0}", className));
+      }
+      if (superClasses != null && superClasses.Any(trait => !trait.IsObject)) {
+        throw new UnsupportedFeatureException(tok, Feature.Traits);
+      }
+
+      var classDeclWriter = modDeclWr;
+      var classDefWriter = this.classDeclWr;
+
+      if (typeParameters != null && typeParameters.Count > 0) {
+        classDeclWriter.WriteLine(DeclareTemplate(typeParameters));
+        classDefWriter.WriteLine(DeclareTemplate(typeParameters));
+      }
+
+      var methodDeclWriter = classDefWriter.NewBlock(string.Format("class {0}", className), ";");
+      var methodDefWriter = wr;
+
+      classDeclWriter.WriteLine("class {0};", className);
+
+      methodDeclWriter.Write("public:\n");
+      methodDeclWriter.WriteLine("// Default constructor");
+      methodDeclWriter.WriteLine("{0}() {{}}", className);
+
+      // Create the code for the specialization of get_default
+      var fullName = moduleName + "::" + className;
+      var getDefaultStr = String.Format("template <{0}>\nstruct get_default<std::shared_ptr<{1}{2} > > {{\n",
+        TypeParameters(typeParameters),
+        fullName,
+        InstantiateTemplate(typeParameters));
+      getDefaultStr += String.Format("static std::shared_ptr<{0}{1} > call() {{\n",
+        fullName,
+        InstantiateTemplate(typeParameters));
+      getDefaultStr += String.Format("return std::shared_ptr<{0}{1} >();", fullName, InstantiateTemplate(typeParameters));
+      getDefaultStr += "}\n};";
+      this.classDefaults.Add(getDefaultStr);
+
+      var fieldWriter = methodDeclWriter;
+
+      return new ClassWriter(className, this, methodDeclWriter, methodDefWriter, fieldWriter, wr);
+    }
+
+    protected override bool SupportsProperties { get => false; }
+
+    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
+      TraitDecl trait, List<Type> superClasses /*?*/, IOrigin tok, ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(tok, Feature.Traits);
+    }
+
+    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(iter.Origin, Feature.Iterators);
+    }
+
+    protected bool IsRecursiveConstructor(DatatypeDecl dt, DatatypeCtor ctor) {
+      foreach (var dtor in ctor.Destructors) {
+        if (dtor.Type is UserDefinedType t) {
+          if (t.ResolvedClass == dt) {
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+
+    protected bool IsRecursiveDatatype(DatatypeDecl dt) {
+      foreach (var ctor in dt.Ctors) {
+        if (IsRecursiveConstructor(dt, ctor)) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    // Uniform naming convention
+    protected string DatatypeSubStructName(DatatypeCtor ctor, bool inclTemplateArgs = false) {
+      string args = "";
+      if (inclTemplateArgs) {
+        args = InstantiateTemplate(ctor.EnclosingDatatype.TypeArgs);
+      }
+      return String.Format("{0}_{1}{2}", IdProtect(ctor.EnclosingDatatype.GetCompileName(Options)), ctor.GetCompileName(Options), args);
+    }
+
+    protected override bool DatatypeDeclarationAndMemberCompilationAreSeparate => false;
+    public override bool SupportsDatatypeWrapperErasure => false;
+
+    protected override IClassWriter DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree writer) {
+      if (dt is TupleTypeDecl) {
+        // Tuple types are declared once and for all in DafnyRuntime.h
+        return null;
+      }
+
+      this.datatypeDecls.Add(dt);
+
+      string DtT = dt.GetCompileName(Options);
+      string DtT_protected = IdProtect(DtT);
+
+      // Forward declaration of the type
+      this.modDeclWr.WriteLine("{0}\nstruct {1};", DeclareTemplate(dt.TypeArgs), DtT_protected);
+      var wdecl = this.dtDeclWr;
+      var wdef = writer;
+
+      if (IsRecursiveDatatype(dt)) { // Note that if this is true, there must be more than one constructor!
+        // Add some forward declarations
+        wdecl.WriteLine("{0}\nstruct {1};", DeclareTemplate(dt.TypeArgs), DtT_protected);
+        wdecl.WriteLine("{2}\nbool operator==(const {0}{1} &left, const {0}{1} &right); ", DtT_protected, InstantiateTemplate(dt.TypeArgs), DeclareTemplate(dt.TypeArgs));
+      }
+
+      // Optimize a not-uncommon case
+      if (dt.IsRecordType) {
+        var ctor = dt.Ctors[0];
+        var ws = wdecl.NewBlock(String.Format("{0}\nstruct {1}", DeclareTemplate(dt.TypeArgs), DtT_protected), ";");
+
+        // Declare the struct members
+        var i = 0;
+        var argNames = new List<string>();
+        foreach (Formal arg in ctor.Formals) {
+          if (!arg.IsGhost) {
+            ws.WriteLine("{0} {1};", TypeName(arg.Type, wdecl, arg.Origin), FormalName(arg, i));
+            argNames.Add(FormalName(arg, i));
+            i++;
+          }
+        }
+
+        if (argNames.Count > 0) {
+          // Create a constructor with arguments
+          ws.Write("{0}(", DtT_protected);
+          WriteFormals("", ctor.Formals, ws);
+          ws.Write(")");
+          if (argNames.Count > 0) {
+            // Add initializers
+            ws.Write(" :");
+            ws.Write(Util.Comma(argNames, nm => String.Format(" {0} ({0})", IdProtect(nm))));
+          }
+
+          ws.WriteLine(" {}");
+        }
+
+        // Create a constructor with no arguments
+        ws.WriteLine("{0}();", DtT_protected);
+        var wc = wdef.NewNamedBlock("{1}\n{0}{2}::{0}()", DtT_protected, DeclareTemplate(dt.TypeArgs), InstantiateTemplate(dt.TypeArgs));
+        foreach (var arg in ctor.Formals) {
+          if (!arg.IsGhost) {
+            wc.WriteLine("{0} = {1};", arg.CompileName, DefaultValue(arg.Type, wc, arg.Origin));
+          }
+        }
+
+        // Overload the comparison operator
+        var wrCompOp = ws.NewNamedBlock("friend bool operator==(const {0} &left, const {0} &right)", DtT_protected);
+        wrCompOp.Write("\treturn true");
+        foreach (var arg in argNames) {
+          wrCompOp.WriteLine("\t\t&& left.{0} == right.{0}", arg);
+        }
+        wrCompOp.WriteLine(";");
+
+        // Overload the not-comparison operator
+        ws.WriteLine("friend bool operator!=(const {0} &left, const {0} &right) {{ return !(left == right); }} ", DtT_protected);
+
+        wdecl.WriteLine("{0}\ninline bool is_{1}(const struct {2}{3} d) {{ (void) d; return true; }}", DeclareTemplate(dt.TypeArgs), ctor.GetCompileName(Options), DtT_protected, InstantiateTemplate(dt.TypeArgs));
+
+        // Define a custom hasher
+        hashWr.WriteLine("template <{0}>", TypeParameters(dt.TypeArgs));
+        var fullName = dt.EnclosingModuleDefinition.GetCompileName(Options) + "::" + DtT_protected + InstantiateTemplate(dt.TypeArgs);
+        var hwr = hashWr.NewBlock(string.Format("struct std::hash<{0}>", fullName), ";");
+        var owr = hwr.NewBlock(string.Format("std::size_t operator()(const {0}& x) const", fullName));
+        owr.WriteLine("size_t seed = 0;");
+        foreach (var arg in ctor.Formals) {
+          if (!arg.IsGhost) {
+            owr.WriteLine("hash_combine<{0}>(seed, x.{1});", TypeName(arg.Type, owr, dt.Origin), arg.CompileName);
+          }
+        }
+        owr.WriteLine("return seed;");
+      } else {
+
+        /*** Create one struct for each constructor ***/
+        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+          string structName = DatatypeSubStructName(ctor);
+          var wstruct = wdecl.NewBlock(String.Format("{0}\nstruct {1}", DeclareTemplate(dt.TypeArgs), structName), ";");
+          // Declare the struct members
+          var i = 0;
+          foreach (Formal arg in ctor.Formals) {
+            if (!arg.IsGhost) {
+              if (arg.Type is UserDefinedType udt && udt.ResolvedClass == dt) {  // Recursive declaration needs to use a pointer
+                wstruct.WriteLine("std::shared_ptr<{0}> {1};", TypeName(arg.Type, wdecl, arg.Origin), FormalName(arg, i));
+              } else {
+                wstruct.WriteLine("{0} {1};", TypeName(arg.Type, wdecl, arg.Origin), FormalName(arg, i));
+              }
+              i++;
+            }
+          }
+
+          // Overload the comparison operator
+          wstruct.WriteLine("friend bool operator==(const {0} &left, const {0} &right) {{ ", structName);
+
+          var preReturn = wstruct.Fork();
+          wstruct.Write("\treturn true ");
+          i = 0;
+          foreach (Formal arg in ctor.Formals) {
+            if (!arg.IsGhost) {
+              if (arg.Type is UserDefinedType udt && udt.ResolvedClass == dt) {  // Recursive destructor needs to use a pointer
+                wstruct.WriteLine("\t\t&& *(left.{0}) == *(right.{0})", FormalName(arg, i));
+              } else {
+                wstruct.WriteLine("\t\t&& left.{0} == right.{0}", FormalName(arg, i));
+              }
+              i++;
+            }
+          }
+
+          if (i == 0) { // Avoid a warning from the C++ compiler
+            preReturn.WriteLine("(void)left; (void) right;");
+          }
+
+          wstruct.WriteLine(";\n}");
+
+          // Overload the not-comparison operator
+          wstruct.WriteLine("friend bool operator!=(const {0} &left, const {0} &right) {{ return !(left == right); }} ", structName);
+
+          // Define a custom hasher
+          hashWr.WriteLine("template <{0}>", TypeParameters(dt.TypeArgs));
+          var fullName = dt.EnclosingModuleDefinition.GetCompileName(Options) + "::" + structName + InstantiateTemplate(dt.TypeArgs);
+          var hwr = hashWr.NewBlock(string.Format("struct std::hash<{0}>", fullName), ";");
+          var owr = hwr.NewBlock(string.Format("std::size_t operator()(const {0}& x) const", fullName));
+          owr.WriteLine("size_t seed = 0;");
+          int argCount = 0;
+          foreach (var arg in ctor.Formals) {
+            if (!arg.IsGhost) {
+              if (arg.Type is UserDefinedType udt && udt.ResolvedClass == dt) {
+                // Recursive destructor needs to use a pointer
+                owr.WriteLine("hash_combine<std::shared_ptr<{0}>>(seed, x.{1});", TypeName(arg.Type, owr, dt.Origin), arg.CompileName);
+              } else {
+                owr.WriteLine("hash_combine<{0}>(seed, x.{1});", TypeName(arg.Type, owr, dt.Origin), arg.CompileName);
+              }
+              argCount++;
+            }
+          }
+          if (argCount == 0) {
+            owr.WriteLine("(void)x;");
+          }
+          owr.WriteLine("return seed;");
+        }
+
+        /*** Declare the overall tagged union ***/
+        var ws = wdecl.NewBlock(String.Format("{0}\nstruct {1}", DeclareTemplate(dt.TypeArgs), DtT_protected), ";");
+        ws.WriteLine("std::variant<{0}> v;", Util.Comma(dt.Ctors, ctor => DatatypeSubStructName(ctor, true)));
+
+        // Declare static "constructors" for each Dafny constructor
+        foreach (var ctor in dt.Ctors) {
+          var wc = ws.NewNamedBlock("static {0} create_{1}({2})",
+            DtT_protected, ctor.GetCompileName(Options),
+            DeclareFormals(ctor.Formals));
+          wc.WriteLine("{0}{1} COMPILER_result;", DtT_protected, InstantiateTemplate(dt.TypeArgs));
+          wc.WriteLine("{0} COMPILER_result_subStruct;", DatatypeSubStructName(ctor, true));
+
+          foreach (Formal arg in ctor.Formals) {
+            if (!arg.IsGhost) {
+              if (arg.Type is UserDefinedType udt && udt.ResolvedClass == dt) {
+                // This is a recursive destuctor, so we need to allocate space and copy the input in
+                wc.WriteLine("COMPILER_result_subStruct.{0} = std::make_shared<{1}>({0});", arg.CompileName,
+                  DtT_protected);
+              } else {
+                wc.WriteLine("COMPILER_result_subStruct.{0} = {0};", arg.CompileName);
+              }
+            }
+          }
+
+          wc.WriteLine("COMPILER_result.v = COMPILER_result_subStruct;");
+          wc.WriteLine("return COMPILER_result;");
+        }
+
+        // Declare a default constructor
+        ws.WriteLine("{0}();", DtT_protected);
+        var wd = wdef.NewNamedBlock(String.Format("{1}\n{0}{2}::{0}()", DtT_protected, DeclareTemplate(dt.TypeArgs), InstantiateTemplate(dt.TypeArgs)));
+        var default_ctor = dt.Ctors[0]; // Arbitrarily choose the first one
+        wd.WriteLine("{0} COMPILER_result_subStruct;", DatatypeSubStructName(default_ctor, true));
+        foreach (Formal arg in default_ctor.Formals) {
+          if (!arg.IsGhost) {
+            wd.WriteLine("COMPILER_result_subStruct.{0} = {1};", arg.CompileName,
+              DefaultValue(arg.Type, wd, arg.Origin));
+          }
+        }
+
+        wd.WriteLine("v = COMPILER_result_subStruct;");
+
+        // Declare a default destructor
+        ws.WriteLine("~{0}() {{}}", DtT_protected);
+
+        {
+          // Declare a default copy constructor (just in case any of our components are non-trivial, i.e., contain smart_ptr)
+          var wcc = ws.NewNamedBlock(String.Format("{0}(const {0} &other)", DtT_protected));
+          wcc.WriteLine("v = other.v;");
+        }
+        {
+          // Declare a default copy assignment operator (just in case any of our components are non-trivial, i.e., contain smart_ptr)
+          var wcc = ws.NewNamedBlock(String.Format("{0}& operator=(const {0} other)", DtT_protected));
+          wcc.WriteLine("v = other.v;");
+          wcc.WriteLine("return *this;");
+        }
+
+        // Declare type queries, both as members and general-purpose functions
+        foreach (var ctor in dt.Ctors) {
+          var name = DatatypeSubStructName(ctor);
+          var holds = String.Format("std::holds_alternative<{0}{1}>", name, InstantiateTemplate(dt.TypeArgs));
+          ws.WriteLine("bool is_{0}() const {{ return {1}(v); }}", name, holds);
+          wdecl.WriteLine("{0}\ninline bool is_{1}(const struct {2}{3} d);", DeclareTemplate(dt.TypeArgs), name, DtT_protected, InstantiateTemplate(dt.TypeArgs));
+          wdef.WriteLine("{0}\ninline bool is_{1}(const struct {2}{3} d) {{ return {4}(d.v); }}",
+            DeclareTemplate(dt.TypeArgs), name, DtT_protected, InstantiateTemplate(dt.TypeArgs), holds);
+        }
+
+        // Overload the comparison operator
+        ws.WriteLine("friend bool operator==(const {0} &left, const {0} &right) {{ ", DtT_protected);
+        ws.WriteLine("\treturn left.v == right.v;\n}");
+
+        // Create destructors
+        foreach (var ctor in dt.Ctors) {
+          foreach (var dtor in ctor.Destructors) {
+            if (dtor.EnclosingCtors[0] == ctor) {
+              var arg = dtor.CorrespondingFormals[0];
+              if (!arg.IsGhost && arg.HasName) {
+                var returnType = TypeName(arg.Type, ws, arg.Origin);
+                if (arg.Type is UserDefinedType udt && udt.ResolvedClass == dt) {
+                  // This is a recursive destuctor, so return a pointer
+                  returnType = String.Format("std::shared_ptr<{0}>", returnType);
+                }
+
+                var wDtor = ws.NewNamedBlock("{0} dtor_{1}()", returnType,
+                  arg.CompileName);
+                if (dt.IsRecordType) {
+                  wDtor.WriteLine("return this.{0};", IdName(arg));
+                } else {
+                  var n = dtor.EnclosingCtors.Count;
+                  for (int i = 0; i < n - 1; i++) {
+                    var ctor_i = dtor.EnclosingCtors[i];
+                    var ctor_name = DatatypeSubStructName(ctor_i);
+                    Contract.Assert(arg.GetOrCreateCompileName(currentIdGenerator) == dtor.CorrespondingFormals[i].GetOrCreateCompileName(currentIdGenerator));
+                    wDtor.WriteLine("if (is_{0}()) {{ return std::get<{0}{1}>(v).{2}; }}",
+                      ctor_name, InstantiateTemplate(dt.TypeArgs), IdName(arg));
+                  }
+
+                  Contract.Assert(arg.GetOrCreateCompileName(currentIdGenerator) == dtor.CorrespondingFormals[n - 1].GetOrCreateCompileName(currentIdGenerator));
+                  var final_ctor_name = DatatypeSubStructName(dtor.EnclosingCtors[n - 1], true);
+                  wDtor.WriteLine("return std::get<{0}>(v).{1}; ",
+                    final_ctor_name, IdName(arg));
+                }
+              }
+            }
+          }
+        }
+
+        // Overload the not-comparison operator
+        ws.WriteLine("friend bool operator!=(const {0} &left, const {0} &right) {{ return !(left == right); }} ", DtT_protected);
+
+        // Define a custom hasher for the struct as a whole
+        hashWr.WriteLine("template <{0}>", TypeParameters(dt.TypeArgs));
+        var fullStructName = dt.EnclosingModuleDefinition.GetCompileName(Options) + "::" + DtT_protected;
+        var hwr2 = hashWr.NewBlock(string.Format("struct std::hash<{0}{1}>", fullStructName, InstantiateTemplate(dt.TypeArgs)), ";");
+        var owr2 = hwr2.NewBlock(string.Format("std::size_t operator()(const {0}{1}& x) const", fullStructName, InstantiateTemplate(dt.TypeArgs)));
+        owr2.WriteLine("size_t seed = 0;");
+        var index = 0;
+        foreach (var ctor in dt.Ctors) {
+          var ifwr = owr2.NewBlock(string.Format("if (x.is_{0}())", DatatypeSubStructName(ctor)));
+          ifwr.WriteLine("hash_combine<uint64>(seed, {0});", index);
+          ifwr.WriteLine("hash_combine<struct {0}::{1}>(seed, std::get<{0}::{1}>(x.v));", dt.EnclosingModuleDefinition.GetCompileName(Options), DatatypeSubStructName(ctor, true));
+          index++;
+        }
+        owr2.WriteLine("return seed;");
+
+        if (IsRecursiveDatatype(dt)) {
+          // Emit a custom hasher for a pointer to this type
+          hashWr.WriteLine("template <{0}>", TypeParameters(dt.TypeArgs));
+          hwr2 = hashWr.NewBlock(string.Format("struct std::hash<std::shared_ptr<{0}{1}>>", fullStructName, InstantiateTemplate(dt.TypeArgs)), ";");
+          owr2 = hwr2.NewBlock(string.Format("std::size_t operator()(const std::shared_ptr<{0}{1}>& x) const", fullStructName, InstantiateTemplate(dt.TypeArgs)));
+          owr2.WriteLine("struct std::hash<{0}{1}> hasher;", fullStructName, InstantiateTemplate(dt.TypeArgs));
+          owr2.WriteLine("std::size_t h = hasher(*x);");
+          owr2.WriteLine("return h;");
+        }
+      }
+
+      return null;
+    }
+
+    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
+      if (nt.NativeType != null) {
+        if (nt.NativeType.Name != nt.Name) {
+          GetNativeInfo(nt.NativeType.Sel, out var nt_name_def, out var literalSuffice_def, out var needsCastAfterArithmetic_def);
+          wr.WriteLine("typedef {0} {1};", nt_name_def, nt.Name);
+        }
+      } else {
+        throw new UnsupportedFeatureException(nt.Origin, Feature.NonNativeNewtypes);
+      }
+      var cw = CreateClass(nt.EnclosingModuleDefinition.GetCompileName(Options), nt, wr) as ClassWriter;
+      var className = clName(nt);
+      var w = cw.MethodDeclWriter;
+      if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        var witness = new ConcreteSyntaxTree(w.RelativeIndentLevel);
+        var wStmts = w.Fork();
+        if (nt.NativeType == null) {
+          witness.Append(Expr(nt.Witness, false, wStmts));
+        } else {
+          TrParenExpr(nt.Witness, witness, false, wStmts);
+          witness.Write(".toNumber()");
+        }
+        DeclareField(className, nt.TypeArgs, "Witness", true, true, nt.BaseType, nt.Origin, witness.ToString(), w, wr);
+      }
+
+      GetNativeInfo(nt.NativeType.Sel, out var nt_name, out var literalSuffice, out var needsCastAfterArithmetic);
+      var wDefault = w.NewBlock(string.Format("static {0} get_Default()", nt_name));
+      var udt = new UserDefinedType(nt.Origin, nt.Name, nt, new List<Type>());
+      var d = TypeInitializationValue(udt, wr, nt.Origin, false, false);
+      wDefault.WriteLine("return {0};", d);
+
+      return cw;
+    }
+
+    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
+      if (sst.Name == "nat") {
+        return;  // C++ does not support Nats
+      }
+
+      string templateDecl = "";
+      if (sst.Var.Type is SeqType s) {
+        templateDecl = DeclareTemplate(s.TypeArgs[0].TypeArgs);  // We want the type args (if any) for the seq-elt type, not the seq
+      } else {
+        templateDecl = DeclareTemplate(sst.Var.Type.TypeArgs);
+      }
+
+      this.modDeclWr.WriteLine("{0} using {1} = {2};", templateDecl, IdName(sst), TypeName(sst.Var.Type, wr, sst.Origin));
+
+      var cw = CreateClass(sst.EnclosingModuleDefinition.GetCompileName(Options), sst, wr) as ClassWriter;
+      var className = clName(sst);
+      var w = cw.MethodDeclWriter;
+
+      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        var witness = new ConcreteSyntaxTree(w.RelativeIndentLevel);
+        witness.Append(Expr(sst.Witness, false, w));
+        DeclareField(className, sst.TypeArgs, "Witness", true, true, sst.Rhs, sst.Origin, witness.ToString(), w, wr);
+      }
+
+      var wDefault = w.NewBlock(String.Format("static {0}{1} get_Default()", IdName(sst), InstantiateTemplate(sst.TypeArgs)));
+      var udt = new UserDefinedType(sst.Origin, sst.Name, sst,
+        sst.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp)));
+      var d = TypeInitializationValue(udt, wr, sst.Origin, false, false);
+      wDefault.WriteLine("return {0};", d);
+    }
+
+    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
+      literalSuffix = "";
+      needsCastAfterArithmetic = false;
+      switch (sel) {
+        case NativeType.Selection.Byte:
+          name = "uint8";
+          break;
+        case NativeType.Selection.SByte:
+          name = "int8";
+          break;
+        case NativeType.Selection.UShort:
+          name = "uint16";
+          break;
+        case NativeType.Selection.Short:
+          name = "int16";
+          break;
+        case NativeType.Selection.UInt:
+          name = "uint32";
+          break;
+        case NativeType.Selection.Int:
+          name = "int32";
+          break;
+        case NativeType.Selection.ULong:
+          name = "uint64";
+          break;
+        case NativeType.Selection.Number:
+        case NativeType.Selection.Long:
+          name = "int64";
+          break;
+        default:
+          Contract.Assert(false);  // unexpected native type
+          throw new cce.UnreachableException();  // to please the compiler
+      }
+    }
+
+    protected class ClassWriter : IClassWriter {
+      public string ClassName;
+      public readonly CppCodeGenerator CodeGenerator;
+      public readonly ConcreteSyntaxTree MethodDeclWriter;
+      public readonly ConcreteSyntaxTree MethodWriter;
+      public readonly ConcreteSyntaxTree FieldWriter;
+      public readonly ConcreteSyntaxTree Finisher;
+
+      public ClassWriter(string className, CppCodeGenerator codeGenerator, ConcreteSyntaxTree methodDeclWriter, ConcreteSyntaxTree methodWriter, ConcreteSyntaxTree fieldWriter, ConcreteSyntaxTree finisher) {
+        Contract.Requires(codeGenerator != null);
+        Contract.Requires(methodDeclWriter != null);
+        Contract.Requires(methodWriter != null);
+        Contract.Requires(fieldWriter != null);
+        this.ClassName = className;
+        this.CodeGenerator = codeGenerator;
+        this.MethodDeclWriter = methodDeclWriter;
+        this.MethodWriter = methodWriter;
+        this.FieldWriter = fieldWriter;
+        this.Finisher = finisher;
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        return CodeGenerator.CreateMethod(m, typeArgs, createBody, MethodDeclWriter, MethodWriter, lookasideBody);
+      }
+
+      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        throw new UnsupportedFeatureException(m.Origin, Feature.MethodSynthesis);
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation>/*?*/ typeArgs,
+        List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
+        return CodeGenerator.CreateFunction(member.EnclosingClass.GetCompileName(CodeGenerator.Options),
+          member.EnclosingClass.TypeArgs, name, typeArgs, formals, resultType, tok, isStatic, createBody, member,
+          MethodDeclWriter, MethodWriter, lookasideBody);
+      }
+      public ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IOrigin tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance) {
+        return CodeGenerator.CreateGetter(name, enclosingDecl, resultType, tok, isStatic, isConst, createBody, MethodDeclWriter, MethodWriter);
+      }
+      public ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
+        return CodeGenerator.CreateGetterSetter(name, resultType, tok, createBody, out setterWriter, MethodWriter);
+      }
+      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs, Field field) {
+        CodeGenerator.DeclareField(ClassName, enclosingDecl.TypeArgs, name, isStatic, isConst, type, tok, rhs, FieldWriter, Finisher);
+      }
+      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
+        throw new cce.UnreachableException();  // InitializeField should be called only for those compilers that set ClassesRedeclareInheritedFields to false.
+      }
+      public ConcreteSyntaxTree/*?*/ ErrorWriter() => MethodWriter;
+      public void Finish() { }
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, ConcreteSyntaxTree wdr, ConcreteSyntaxTree wr, bool lookasideBody) {
+      List<Formal> nonGhostOuts = m.Outs.Where(o => !o.IsGhost).ToList();
+      string targetReturnTypeReplacement = null;
+      if (nonGhostOuts.Count == 1) {
+        targetReturnTypeReplacement = TypeName(nonGhostOuts[0].Type, wr, nonGhostOuts[0].Origin);
+      } else if (nonGhostOuts.Count > 1) {
+        targetReturnTypeReplacement = String.Format("struct Tuple{0}", InstantiateTemplate(nonGhostOuts.ConvertAll(n => n.Type)));
+      }
+
+      if (!createBody) {
+        return null;
+      }
+
+      if (typeArgs.Count != 0) {
+        var formalTypeParameters = TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, m, lookasideBody));
+        // Filter out type parameters we've already emitted at the class level, to avoid shadowing
+        // the class' template parameter (which C++ treats as an error)
+        formalTypeParameters = formalTypeParameters.Where(param =>
+          m.EnclosingClass.TypeArgs == null || !m.EnclosingClass.TypeArgs.Contains(param)).ToList();
+        wdr.WriteLine(DeclareTemplate(formalTypeParameters));
+        wr.WriteLine(DeclareTemplate(formalTypeParameters));
+      }
+
+      if (m.EnclosingClass.TypeArgs != null && m.EnclosingClass.TypeArgs.Count > 0) {
+        wr.WriteLine(DeclareTemplate(m.EnclosingClass.TypeArgs));
+      }
+
+      wr.Write("{0} {1}{2}::{3}",
+        targetReturnTypeReplacement ?? "void",
+        clName(m.EnclosingClass),
+        InstantiateTemplate(m.EnclosingClass.TypeArgs),
+        IdName(m));
+
+      wdr.Write("{0}{1} {2}",
+        m.IsStatic ? "static " : "",
+        targetReturnTypeReplacement ?? "void",
+        IdName(m));
+
+      wr.Write("(");
+      wdr.Write("(");
+      int nIns = WriteFormals("", m.Ins, wr);
+      WriteFormals("", m.Ins, wdr);
+      if (targetReturnTypeReplacement == null) {
+        WriteFormals(nIns == 0 ? "" : ", ", m.Outs, wr);
+        WriteFormals(nIns == 0 ? "" : ", ", m.Outs, wdr);
+      }
+      wdr.Write(");\n");
+
+      var block = wr.NewBlock(")", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
+
+      if (targetReturnTypeReplacement != null) {
+        var beforeReturnBlock = block.Fork(0);
+        EmitReturn(m.Outs, block);
+        return beforeReturnBlock;
+      }
+      return block;
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateFunction(string className, List<TypeParameter> classArgs, string name, List<TypeArgumentInstantiation>/*?*/ typeArgs, List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member, ConcreteSyntaxTree wdr, ConcreteSyntaxTree wr, bool lookasideBody) {
+      if (!createBody) {
+        return null;
+      }
+
+      if (typeArgs.Count != 0) {
+        var formalTypeParameters = TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, member, lookasideBody));
+        // Filter out type parameters we've already emitted at the class level, to avoid shadowing
+        // the class' template parameter (which C++ treats as an error)
+        formalTypeParameters = formalTypeParameters.Where(param =>
+          !classArgs.Contains(param)).ToList();
+        wdr.WriteLine(DeclareTemplate(formalTypeParameters));
+        wr.WriteLine(DeclareTemplate(formalTypeParameters));
+      }
+      if (classArgs != null && classArgs.Count != 0) {
+        wr.WriteLine(DeclareTemplate(classArgs));
+      }
+
+      wdr.Write("{0}{1} {2}",
+        isStatic ? "static " : "",
+        TypeName(resultType, wr, tok),
+        name);
+      wr.Write("{0} {1}{2}::{3}",
+        TypeName(resultType, wr, tok),
+        className,
+        InstantiateTemplate(classArgs),
+        name);
+
+      wdr.Write("(");
+      wr.Write("(");
+      WriteFormals("", formals, wdr);
+      int nIns = WriteFormals("", formals, wr);
+
+      wdr.Write(");");
+      var w = wr.NewBlock(")", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
+
+      return w;
+    }
+
+    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
+      needsTypeParameter = false;
+      needsTypeDescriptor = false;
+    }
+
+    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      Contract.Requires(type != null);
+      Contract.Requires(tok != null);
+      Contract.Requires(wr != null);
+      throw new UnsupportedFeatureException(tok, Feature.RuntimeTypeDescriptors, string.Format("RuntimeTypeDescriptor {0} not yet supported", type));
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl cls, Type resultType, IOrigin tok, bool isStatic, bool isConst, bool createBody, ConcreteSyntaxTree wdr, ConcreteSyntaxTree wr) {
+      // Compiler insists on using Getter for constants, but we just use the raw variable name to hold the value,
+      // because o/w Compiler tries to use the Getter function as an Lvalue in assignments
+      // Unfortunately, Compiler doesn't tell us what the initial value is, so we hack around it
+      // by declaring the variable and a function to statically initialize it
+
+      ConcreteSyntaxTree w = null;
+      string postfix = null;
+      if (createBody) {
+        w = wdr.NewNamedBlock("{0}{1} init__{2}()", isStatic ? "static " : "", TypeName(resultType, wr, tok), name);
+        postfix = String.Format(" init__{0}()", name);
+      }
+      DeclareField(cls.GetCompileName(Options), cls.TypeArgs, name, isStatic, isConst, resultType, tok, postfix, wdr, wr);
+      //wdr.Write("{0}{1} {2}{3};", isStatic ? "static " : "", TypeName(resultType, wr, tok), name, postfix);
+      return w;
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody, out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree wr) {
+      // We don't use getter/setter pairs; we just embed the trait's fields.
+      if (createBody) {
+        var abyss = new ConcreteSyntaxTree();
+        setterWriter = abyss;
+        return abyss.NewBlock("");
+      } else {
+        setterWriter = null;
+        return null;
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
+      wr.WriteLine("TAIL_CALL_START:");
+      return wr;
+    }
+
+    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
+      wr.WriteLine("goto TAIL_CALL_START;");
+    }
+
+    protected void Warn(string msg, IOrigin tok) {
+      Options.ErrorWriter.WriteLine("WARNING: {3} ({0}:{1}:{2})", tok.Filepath, tok.line, tok.col, msg);
+    }
+
+    // Because we use reference counting (via shared_ptr), the TypeName of a class differs
+    // depending on whether we are declaring a variable or talking about the class itself.
+    // Use class_name = true if you want the actual name of the class, not the type used when declaring variables/arguments/etc.
+    protected string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member = null, bool class_name = false) {
+      Contract.Ensures(Contract.Result<string>() != null);
+      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
+
+      var xType = type.NormalizeExpand();
+      if (xType is TypeProxy) {
+        // unresolved proxy; just treat as ref, since no particular type information is apparently needed for this type
+        return "object";
+      }
+
+      if (xType is BoolType) {
+        return "bool";
+      } else if (xType is CharType) {
+        return "char";
+      } else if (xType is IntType or BigOrdinalType) {
+        UnsupportedFeatureError(tok, Feature.UnboundedIntegers);
+        return "BigNumber";
+      } else if (xType is RealType) {
+        UnsupportedFeatureError(tok, Feature.RealNumbers);
+        return "Dafny.BigRational";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        return t.NativeType != null ? GetNativeTypeName(t.NativeType) : "BigNumber";
+      } else if (xType.AsNewtype != null) {
+        var newtypeDecl = xType.AsNewtype;
+        if (newtypeDecl.NativeType is { } nativeType) {
+          return GetNativeTypeName(nativeType);
+        }
+        return TypeName(newtypeDecl.ConcreteBaseType(xType.TypeArgs), wr, tok, member);
+      } else if (xType.IsObjectQ) {
+        return "object";
+      } else if (xType.IsArrayType) {
+        ArrayClassDecl at = xType.AsArrayType;
+        Contract.Assert(at != null);  // follows from type.IsArrayType
+        Type elType = UserDefinedType.ArrayElementType(xType);
+        if (at.Dims == 1) {
+          return "DafnyArray<" + TypeName(elType, wr, tok, null, false) + ">";
+        } else {
+          throw new UnsupportedFeatureException(tok, Feature.MultiDimensionalArrays);
+        }
+      } else if (xType is UserDefinedType) {
+        var udt = (UserDefinedType)xType;
+        var s = FullTypeName(udt, member);
+        var cl = udt.ResolvedClass;
+        if (class_name || xType.IsTypeParameter || xType.IsAbstractType || xType.IsDatatype) {  // Don't add pointer decorations to class names or type parameters
+          return IdProtect(s) + ActualTypeArgs(xType.TypeArgs);
+        } else {
+          return TypeName_UDT(s, udt, wr, udt.Origin);
+        }
+      } else if (xType is SetType) {
+        Type argType = ((SetType)xType).Arg;
+        if (ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance.Co, argType)) {
+          UnsupportedFeatureError(tok, Feature.CollectionsOfTraits, "compilation of set<TRAIT> is not supported; consider introducing a ghost", wr);
+        }
+        return DafnySetClass + "<" + TypeName(argType, wr, tok) + ">";
+      } else if (xType is SeqType) {
+        Type argType = ((SeqType)xType).Arg;
+        if (ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance.Co, argType)) {
+          UnsupportedFeatureError(tok, Feature.CollectionsOfTraits, "compilation of seq<TRAIT> is not supported; consider introducing a ghost", wr);
+        }
+        return DafnySeqClass + "<" + TypeName(argType, wr, tok) + ">";
+      } else if (xType is MultiSetType) {
+        Type argType = ((MultiSetType)xType).Arg;
+        if (ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance.Co, argType)) {
+          UnsupportedFeatureError(tok, Feature.CollectionsOfTraits, "compilation of multiset<TRAIT> is not supported; consider introducing a ghost", wr);
+        }
+        return DafnyMultiSetClass + "<" + TypeName(argType, wr, tok) + ">";
+      } else if (xType is MapType) {
+        Type domType = ((MapType)xType).Domain;
+        Type ranType = ((MapType)xType).Range;
+        if (ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance.Co, domType) || ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance.Co, ranType)) {
+          UnsupportedFeatureError(tok, Feature.CollectionsOfTraits, "compilation of map<TRAIT, _> or map<_, TRAIT> is not supported; consider introducing a ghost", wr);
+        }
+        return DafnyMapClass + "<" + TypeName(domType, wr, tok) + "," + TypeName(ranType, wr, tok) + ">";
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member = null) {
+      Contract.Ensures(Contract.Result<string>() != null);
+      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
+      return TypeName(type, wr, tok, member, false);
+    }
+
+    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
+      var xType = type.NormalizeExpandKeepConstraints();
+      if (xType is BoolType) {
+        return "false";
+      } else if (xType is CharType) {
+        return CharType.DefaultValueAsString;
+      } else if (xType is IntType or BigOrdinalType) {
+        UnsupportedFeatureError(tok, Feature.UnboundedIntegers);
+        return "new BigNumber(0)";
+      } else if (xType is RealType) {
+        UnsupportedFeatureError(tok, Feature.RealNumbers);
+        return "_dafny.BigRational.ZERO";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        if (t.NativeType != null) {
+          return "0";
+        } else {
+          Warn("Non-native bitvector type used.  Code will not compile.", tok);
+          return "new BigNumber(0)";
+        }
+      } else if (xType is SetType) {
+        var s = (SetType)xType;
+        return String.Format("DafnySet<{0}>::empty()", TypeName(s.Arg, wr, tok));
+      } else if (xType is MultiSetType) {
+        throw new UnsupportedFeatureException(tok, Feature.Multisets);
+      } else if (xType is SeqType) {
+        return string.Format("DafnySequence<{0}>()", TypeName(xType.AsSeqType.Arg, wr, tok, null, false));
+      } else if (xType is MapType) {
+        var m = (MapType)xType;
+        return String.Format("DafnyMap<{0},{1}>::empty()", TypeName(m.Domain, wr, tok), TypeName(m.Range, wr, tok));
+      }
+
+      var udt = (UserDefinedType)xType;
+      var cl = udt.ResolvedClass;
+      Contract.Assert(cl != null);
+      if (cl is TypeParameter or AbstractTypeDecl) {
+        var hasCompiledValue = (cl is TypeParameter ? ((TypeParameter)cl).Characteristics : ((AbstractTypeDecl)cl).Characteristics).HasCompiledValue;
+        if (Attributes.Contains(udt.ResolvedClass.Attributes, "extern")) {
+          // Assume the external definition includes a default value
+          return String.Format("{1}::get_{0}_default()", IdProtect(udt.Name), udt.ResolvedClass.EnclosingModuleDefinition.GetCompileName(Options));
+        } else if (usePlaceboValue && !hasCompiledValue) {
+          return String.Format("get_default<{0}>::call()", IdProtect(udt.GetCompileName(Options)));
+        } else {
+          return String.Format("get_default<{0}>::call()", IdProtect(udt.GetCompileName(Options)));
+        }
+      } else if (cl is NewtypeDecl) {
+        var td = (NewtypeDecl)cl;
+        if (td.Witness != null) {
+          return td.EnclosingModuleDefinition.GetCompileName(Options) + "::" + clName(td) + "::Witness";
+        } else if (td.NativeType != null) {
+          return "0";
+        } else {
+          return TypeInitializationValue(td.ConcreteBaseType(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+      } else if (cl is SubsetTypeDecl) {
+        var td = (SubsetTypeDecl)cl;
+        if (td.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+          return td.EnclosingModuleDefinition.GetCompileName(Options) + "::" + clName(td) + "::Witness";
+        } else if (td.WitnessKind == SubsetTypeDecl.WKind.Special) {
+          // WKind.Special is only used with -->, ->, and non-null types:
+          Contract.Assert(ArrowType.IsPartialArrowTypeName(td.Name) || ArrowType.IsTotalArrowTypeName(td.Name) || td is NonNullTypeDecl);
+          if (ArrowType.IsPartialArrowTypeName(td.Name)) {
+            return "nullptr";
+          } else if (ArrowType.IsTotalArrowTypeName(td.Name)) {
+            var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+            // return the lambda expression ((Ty0 x0, Ty1 x1, Ty2 x2) => rangeDefaultValue)
+            return string.Format("function () {{ return {0}; }}", rangeDefaultValue);
+          } else if (((NonNullTypeDecl)td).Class is ArrayClassDecl) {
+            // non-null array type; we know how to initialize them
+            var arrayClass = (ArrayClassDecl)((NonNullTypeDecl)td).Class;
+            Type elType = UserDefinedType.ArrayElementType(xType);
+            if (arrayClass.Dims == 1) {
+              return string.Format("DafnyArray<{0}>::Null()", TypeName(elType, wr, tok));
+            } else {
+              return string.Format("_dafny.newArray(nullptr, {0})", Util.Comma(arrayClass.Dims, _ => "0"));
+            }
+          } else {
+            // non-null (non-array) type
+            // even though the type doesn't necessarily have a known initializer, it could be that the the compiler needs to
+            // lay down some bits to please the C++ compiler's different definite-assignment rules.
+            return "nullptr";
+          }
+        } else {
+          return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+      } else if (cl is ClassLikeDecl or ArrowTypeDecl) {
+        if (cl is ArrayClassDecl) {
+          var arrayClass = (ArrayClassDecl)cl;
+          Type elType = UserDefinedType.ArrayElementType(xType);
+          if (arrayClass.Dims == 1) {
+            return string.Format("DafnyArray<{0}>::Null()", TypeName(elType, wr, tok));
+          } else {
+            throw new UnsupportedFeatureException(tok, Feature.MultiDimensionalArrays);
+          }
+        } else {
+          return "nullptr";
+        }
+      } else if (cl is DatatypeDecl) {
+        var dt = (DatatypeDecl)cl;
+        var s = dt is TupleTypeDecl ? "Tuple" : FullTypeName(udt);
+        var w = new ConcreteSyntaxTree();
+        w.Write("{0}{1}()", s, InstantiateTemplate(udt.TypeArgs));
+        return w.ToString();
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+
+    }
+
+    private string ActualTypeArgs(List<Type> typeArgs) {
+      return typeArgs.Count > 0
+        ? String.Format(" <{0}> ", Util.Comma(typeArgs, tp => TypeName(tp, null, Token.NoToken))) : "";
+    }
+
+    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
+      ConcreteSyntaxTree wr, IOrigin tok, bool omitTypeArguments) {
+      Contract.Assume(fullCompileName != null);  // precondition; this ought to be declared as a Requires in the superclass
+      Contract.Assume(typeArgs != null);  // precondition; this ought to be declared as a Requires in the superclass
+      string s = IdProtect(fullCompileName);
+      return String.Format("std::shared_ptr<{0}{1}>", s, ActualTypeArgs(typeArgs));
+    }
+
+    internal override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member) {
+      // There are no companion classes for Cpp
+      var t = TypeName(type, wr, tok, member, true);
+      return t;
+    }
+
+    // ----- Declarations -------------------------------------------------------------
+    protected override void DeclareExternType(AbstractTypeDecl d, Expression compileTypeHint, ConcreteSyntaxTree wr) {
+      if (compileTypeHint.AsStringLiteral() == "struct") {
+        modDeclWr.WriteLine("// Extern declaration of {1}\n{0} struct {1};", DeclareTemplate(d.TypeArgs), d.Name);
+      } else {
+        Error(GeneratorErrors.ErrorId.c_abstract_type_cannot_be_compiled_extern, d.Origin, "Abstract type ('{0}') with unrecognized extern attribute {1} cannot be compiled.  Expected {{:extern compile_type_hint}}, e.g., 'struct'.", wr, d.FullName, compileTypeHint.AsStringLiteral());
+      }
+    }
+
+    protected void DeclareField(string className, List<TypeParameter> targs, string name, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs, ConcreteSyntaxTree wr, ConcreteSyntaxTree finisher) {
+      var r = rhs != null ? rhs : DefaultValue(type, wr, tok);
+      var t = TypeName(type, wr, tok);
+      if (isStatic) {
+        wr.WriteLine("static {0} {1};", t, name);
+        finisher.WriteLine("{5} {0} {1}{4}::{2} = {3};", t, className, name, r, InstantiateTemplate(targs), DeclareTemplate(targs));
+      } else {
+        wr.WriteLine("{0} {1} = {2};", t, name, r);
+      }
+    }
+
+    private string DeclareFormalString(string prefix, string name, Type type, IOrigin tok, bool isInParam) {
+      if (isInParam) {
+        var result = String.Format("{0}{2} {1}", prefix, name, TypeName(type, null, tok));
+        if (name == "__noArgsParameter") {
+          result += " __attribute__((unused))";
+        }
+
+        return result;
+      } else {
+        return null;
+      }
+    }
+
+    protected override bool DeclareFormal(string prefix, string name, Type type, IOrigin tok, bool isInParam, ConcreteSyntaxTree wr) {
+      var formal_str = DeclareFormalString(prefix, name, type, tok, isInParam);
+      if (formal_str != null) {
+        wr.Write(formal_str);
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+    private string DeclareFormals(List<Formal> formals) {
+      var i = 0;
+      var ret = "";
+      var sep = "";
+      foreach (Formal arg in formals) {
+        if (!arg.IsGhost) {
+          string name = FormalName(arg, i);
+          string decl = DeclareFormalString(sep, name, arg.Type, arg.Origin, arg.InParam);
+          if (decl != null) {
+            ret += decl;
+            sep = ", ";
+          }
+          i++;
+        }
+      }
+      return ret;
+    }
+
+    protected override void DeclareLocalVar(string name, Type/*?*/ type, IOrigin/*?*/ tok, bool leaveRoomForRhs, string/*?*/ rhs, ConcreteSyntaxTree wr) {
+      if (type != null) {
+        wr.Write("{0} ", TypeName(type, wr, tok));
+      } else {
+        wr.Write("auto ");
+      }
+      wr.Write("{0}", name);
+      if (leaveRoomForRhs) {
+        Contract.Assert(rhs == null);  // follows from precondition
+      } else if (rhs != null) {
+        wr.WriteLine(" = {0};", rhs);
+      } else {
+        wr.WriteLine(";");
+      }
+    }
+
+    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type/*?*/ type, IOrigin/*?*/ tok, ConcreteSyntaxTree wr) {
+      if (type != null) {
+        wr.Write("{0} ", TypeName(type, wr, tok));
+      } else {
+        wr.Write("auto ");
+      }
+      wr.Write("{0} = ", name);
+      var w = wr.Fork();
+      wr.WriteLine(";");
+      return w;
+    }
+
+    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
+
+    protected override void DeclareOutCollector(string collectorVarName, ConcreteSyntaxTree wr) {
+      wr.Write("auto {0} = ", collectorVarName);
+    }
+
+    protected override void DeclareLocalOutVar(string name, Type type, IOrigin tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr) {
+      DeclareLocalVar(name, type, tok, false, rhs, wr);
+    }
+
+    protected override void EmitOutParameterSplits(string outCollector, List<string> actualOutParamNames, ConcreteSyntaxTree wr) {
+      if (actualOutParamNames.Count == 1) {
+        EmitAssignment(actualOutParamNames[0], null, outCollector, null, wr);
+      } else {
+        for (var i = 0; i < actualOutParamNames.Count; i++) {
+          wr.WriteLine("{0} = {1}.template get<{2}>();", actualOutParamNames[i], outCollector, i);
+        }
+      }
+    }
+
+    protected override void EmitActualTypeArgs(List<Type> typeArgs, IOrigin tok, ConcreteSyntaxTree wr) {
+      wr.Write(ActualTypeArgs(typeArgs));
+    }
+
+    protected void EmitNullText(Type type, ConcreteSyntaxTree wr) {
+      var xType = type.NormalizeExpand();
+      if (xType.IsArrayType) {
+        ArrayClassDecl at = xType.AsArrayType;
+        Contract.Assert(at != null);  // follows from xType.IsArrayType
+        Type elType = UserDefinedType.ArrayElementType(xType);
+        if (at.Dims == 1) {
+          wr.Write("DafnyArray<{0}>::Null()", TypeName(elType, wr, null));
+        } else {
+          throw new UnsupportedFeatureException(Token.NoToken, Feature.MultiDimensionalArrays);
+        }
+      } else {
+        wr.Write("nullptr");
+      }
+    }
+
+    protected override void EmitNull(Type type, ConcreteSyntaxTree wr) {
+      EmitNullText(type, wr);
+    }
+
+    // ----- Statements -------------------------------------------------------------
+
+    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
+      var wStmts = wr.Fork();
+      wr.Write("dafny_print(");
+      wr.Append(Expr(arg, false, wStmts));
+      wr.WriteLine(");");
+    }
+
+    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
+      outParams = outParams.Where(f => !f.IsGhost).ToList();
+      if (!outParams.Any()) {
+        wr.WriteLine("return;");
+      } else if (outParams.Count == 1) {
+        wr.WriteLine("return {0};", IdName(outParams[0]));
+      } else {
+        wr.WriteLine("return Tuple{0}({1});", InstantiateTemplate(outParams.ConvertAll(o => o.Type)), Util.Comma(outParams, IdName));
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
+      var w = wr.Fork();
+      var prefix = createContinueLabel ? "continue_" : "after_";
+      wr.Fork(-1).WriteLine($"{prefix}{label}: ;");
+      return w;
+    }
+
+    protected override void EmitBreak(string/*?*/ label, ConcreteSyntaxTree wr) {
+      if (label == null) {
+        wr.WriteLine("break;");
+      } else {
+        wr.WriteLine("goto after_{0};", label);
+      }
+    }
+
+    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
+      wr.WriteLine("goto continue_{0};", label);
+    }
+
+    protected override void EmitYield(ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(Token.NoToken, Feature.Iterators);
+    }
+
+    protected override void EmitAbsurd(string/*?*/ message, ConcreteSyntaxTree wr) {
+      if (message == null) {
+        message = "unexpected control point";
+      }
+      wr.WriteLine("throw \"{0}\";", message);
+    }
+
+    protected override void EmitHalt(IOrigin tok, Expression messageExpr, ConcreteSyntaxTree wr) {
+      var wStmts = wr.Fork();
+      wr.Write("throw DafnyHaltException(");
+      if (tok != null) {
+        wr.Write("\"" + tok.TokenToString(Options) + ": \" + ");
+      }
+
+      if (messageExpr.Type.IsStringType) {
+        wr.Write("ToVerbatimString(");
+        wr.Append(Expr(messageExpr, false, wStmts));
+        wr.Write(")");
+      } else {
+        throw new UnsupportedFeatureException(tok, Feature.ConvertingValuesToStrings);
+      }
+
+      wr.WriteLine(");");
+    }
+
+    protected override ConcreteSyntaxTree EmitForStmt(IOrigin tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
+      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(tok, Feature.ForLoops, "for loops have not yet been implemented");
+    }
+
+    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, Action<ConcreteSyntaxTree> boundAction, ConcreteSyntaxTree wr, string start = null) {
+      start = start ?? "0";
+      var boundWriter = new ConcreteSyntaxTree();
+      boundAction(boundWriter);
+      var bound = boundWriter.ToString();
+      return wr.NewNamedBlock("for (auto {0} = {2}; {0} < {1}; {0}++)", indexVar, bound, start);
+    }
+
+    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
+      return wr.NewNamedBlock("for (unsigned long long {0} = 1; ; {0} = {0} * 2)", indexVar, start);
+    }
+
+    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine("{0} += 1;", varName);
+    }
+
+    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine("{0} = {0} -= 1;", varName);
+    }
+
+    protected override string GetQuantifierName(string bvType) {
+      throw new UnsupportedFeatureException(Token.NoToken, Feature.Quantifiers);
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IOrigin tok,
+      out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      wr.Write("for ({1} {0} : ", tmpVarName, TypeName(collectionElementType, wr, tok));
+      collectionWriter = wr.Fork();
+      var wwr = wr.NewBlock(")");
+      return wwr;
+    }
+
+    [CanBeNull]
+    protected override Action<ConcreteSyntaxTree> GetSubtypeCondition(string tmpVarName, Type boundVarType, IOrigin tok, ConcreteSyntaxTree wPreconditions) {
+      string typeTest;
+      if (boundVarType.IsRefType) {
+        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
+          typeTest = "true";
+        } else if (boundVarType.IsTraitType) {
+          typeTest = $"_dafny.InstanceOfTrait({tmpVarName}, {TypeName(boundVarType, wPreconditions, tok)})";
+        } else {
+          typeTest = $"typeid({tmpVarName}) is typeid({TypeName(boundVarType, wPreconditions, tok)})";
+        }
+        if (boundVarType.IsNonNullRefType) {
+          typeTest = $"{tmpVarName} != null && {typeTest}";
+        } else {
+          typeTest = $"{tmpVarName} == null || {typeTest}";
+        }
+      } else {
+        typeTest = "true";
+      }
+
+      typeTest = typeTest == "true" ? null : typeTest;
+      return typeTest == null ? null : wr => wr.Write(typeTest);
+    }
+
+    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
+      Type sourceType, bool introduceBoundVar, IOrigin tok, ConcreteSyntaxTree wr) {
+      var typeName = TypeName(boundVarType, wr, tok);
+      wr.WriteLine("{0}{1} = ({2}){3};", introduceBoundVar ? typeName + " " : "", boundVarName, typeName, tmpVarName);
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      wr.Write($"for (auto {boundVarName} : ");
+      collectionWriter = wr.Fork();
+      return wr.NewBlock(")");
+    }
+
+    // ----- Expressions -------------------------------------------------------------
+
+    protected override void EmitNew(Type type, IOrigin tok, CallStmt initCall /*?*/, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var cl = (type.NormalizeExpand() as UserDefinedType)?.ResolvedClass;
+      if (cl != null && cl.Name == "object") {
+        //wr.Write("_dafny.NewObject()");
+        throw new UnsupportedFeatureException(tok, Feature.NewObject);
+      } else {
+        var ctor = initCall == null ? null : (Constructor)initCall.Method;  // correctness of cast follows from precondition of "EmitNew"
+        wr.Write("std::make_shared<{0}> (", TypeName(type, wr, tok, null, true));
+        var tas = TypeArgumentInstantiation.ListFromClass(cl, type.TypeArgs);
+        var sep = "";
+        EmitTypeDescriptorsActuals(tas, tok, wr, ref sep);
+        if (ctor != null && ctor.IsExtern(Options, out var q, out var n)) {
+          // the arguments of any external constructor are placed here
+          for (int i = 0; i < ctor.Ins.Count; i++) {
+            Formal p = ctor.Ins[i];
+            if (!p.IsGhost) {
+              wr.Write(sep);
+              wr.Append(Expr(initCall.Args[i], false, wStmts));
+              sep = ", ";
+            }
+          }
+        }
+        wr.Write(")");
+      }
+    }
+
+    protected override void EmitNewArray(Type elementType, IOrigin tok, List<string> dimensions,
+        bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var initValue = mustInitialize ? DefaultValue(elementType, wr, tok) : null;
+      // TODO: Handle initValue
+      if (dimensions.Count == 1) {
+        // handle the common case of 1-dimensional arrays separately
+        wr.Write($"DafnyArray<{TypeName(elementType, wr, tok)}>::New({dimensions[0]})");
+      } else {
+        throw new UnsupportedFeatureException(tok, Feature.MultiDimensionalArrays);
+      }
+    }
+
+    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
+      if (e is StaticReceiverExpr) {
+        wr.Write(TypeName(e.Type, wr, e.Origin));
+      } else if (e.Value == null) {
+        EmitNullText(e.Type, wr);
+      } else if (e.Value is bool) {
+        wr.Write((bool)e.Value ? "true" : "false");
+      } else if (e is CharLiteralExpr) {
+        var v = (string)e.Value;
+        wr.Write("'{0}'", v);
+      } else if (e is StringLiteralExpr) {
+        var str = (StringLiteralExpr)e;
+        wr.Write("DafnySequenceFromString(");
+        TrStringLiteral(str, wr);
+        wr.Write(")");
+      } else if (AsNativeType(e.Type) is NativeType nt) {
+        wr.Write("({0}){1}", GetNativeTypeName(nt), (BigInteger)e.Value);
+        if ((BigInteger)e.Value > 9223372036854775807) {
+          // Avoid compiler warning: integer literal is too large to be represented in a signed integer type
+          wr.Write("U");
+        }
+      } else if (e.Value is BigInteger i) {
+        EmitIntegerLiteral(i, wr);
+      } else if (e.Value is BaseTypes.BigDec) {
+        throw new UnsupportedFeatureException(e.Origin, Feature.RealNumbers);
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
+      }
+    }
+    void EmitIntegerLiteral(BigInteger i, ConcreteSyntaxTree wr) {
+      Contract.Requires(wr != null);
+      wr.Write(i.ToString());
+    }
+
+    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
+      var n = str.Length;
+      if (!isVerbatim) {
+        wr.Write($"\"{TranslateEscapes(str)}\"");
+      } else {
+        wr.Write("\"");
+        for (var i = 0; i < n; i++) {
+          if (str[i] == '\"' && i + 1 < n && str[i + 1] == '\"') {
+            wr.Write("\\\"");
+            i++;
+          } else if (str[i] == '\\') {
+            wr.Write("\\\\");
+          } else if (str[i] == '\n') {
+            wr.Write("\\n");
+          } else if (str[i] == '\r') {
+            wr.Write("\\r");
+          } else {
+            wr.Write(str[i]);
+          }
+        }
+        wr.Write("\"");
+      }
+
+      // Use the postfix "..."s operator (operator""s) to convert to std::string values
+      // without interpreting /0 as a terminator:
+      // https://en.cppreference.com/w/cpp/string/basic_string/operator%22%22s
+      wr.Write("s");
+    }
+
+    private static string TranslateEscapes(string s) {
+      s = Util.ReplaceNullEscapesWithCharacterEscapes(s);
+      // TODO: Other cases, once we address the fact that we shouldn't be
+      // using the C++ char as the Dafny 16-bit char in the first place.
+      return s;
+    }
+
+    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, [CanBeNull] NativeType nativeType,
+      bool surroundByUnchecked, ConcreteSyntaxTree wr) {
+      string literalSuffix = null;
+      if (nativeType != null) {
+        GetNativeInfo(nativeType.Sel, out _, out literalSuffix, out _);
+      }
+
+      if (nativeType == null) {
+        throw new UnsupportedFeatureException(Token.NoToken, Feature.UnboundedIntegers, "EmitBitvectorTruncation with BigInteger value");
+      } else if (bvType.Width < nativeType.Bitwidth) {
+        wr.Write("((");
+        var middle = wr.Fork();
+        // print in hex, because that looks nice
+        wr.Write(") & 0x{0:X}{1})", (1UL << bvType.Width) - 1, literalSuffix);
+        return middle;
+      } else {
+        // no truncation needed
+        return wr;
+      }
+    }
+
+    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
+      bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      throw new UnsupportedFeatureException(e0.Origin, Feature.BitvectorRotateFunctions);
+    }
+
+    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(Token.NoToken, Feature.NonSequentializableForallStatements);
+    }
+
+    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(Token.NoToken, Feature.NonSequentializableForallStatements);
+    }
+
+    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(Token.NoToken, Feature.NonSequentializableForallStatements);
+    }
+
+    protected override string IdProtect(string name) {
+      return PublicIdProtect(name);
+    }
+
+    public override string PublicIdProtect(string name) {
+      Contract.Requires(name != null);
+      switch (name) {
+        // Taken from: https://www.w3schools.in/cplusplus-tutorial/keywords/
+        // Keywords
+        case "asm":
+        case "auto":
+        case "bool":
+        case "break":
+        case "case":
+        case "catch":
+        case "char":
+        case "class":
+        case "const":
+        case "const_cast":
+        case "continue":
+        case "default":
+        case "delete":
+        case "do":
+        case "double":
+        case "dynamic_cast":
+        case "else":
+        case "enum":
+        case "explicit":
+        case "export":
+        case "extern":
+        case "false":
+        case "float":
+        case "for":
+        case "friend":
+        case "goto":
+        case "if":
+        case "inline":
+        case "int":
+        case "long":
+        case "mutable":
+        case "namespace":
+        case "new":
+        case "operator":
+        case "private":
+        case "public":
+        case "register":
+        case "reinterpret_cast":
+        case "return":
+        case "short":
+        case "signed":
+        case "sizeof":
+        case "static":
+        case "static_cast":
+        case "struct":
+        case "switch":
+        case "template":
+        case "this":
+        case "throw":
+        case "true":
+        case "try":
+        case "typedef":
+        case "typeid":
+        case "typename":
+        case "union":
+        case "unsigned":
+        case "using":
+        case "virtual":
+        case "void":
+        case "volatile":
+        case "wchar_t":
+        case "while":
+
+        // Also reserved
+        case "And":
+        case "and_eq":
+        case "bitand":
+        case "bitor":
+        case "compl":
+        case "not":
+        case "not_eq":
+        case "or":
+        case "or_eq":
+        case "xor":
+        case "xor_eq":
+          return name + "_";
+        default:
+          return name;
+      }
+    }
+
+    protected override string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null) {
+      Contract.Assume(udt != null);  // precondition; this ought to be declared as a Requires in the superclass
+      if (udt is ArrowType) {
+        throw new UnsupportedFeatureException(udt.Origin, Feature.FunctionValues, string.Format("UserDefinedTypeName {0}", udt.Name));
+        //return ArrowType.Arrow_FullCompileName;
+      }
+      var cl = udt.ResolvedClass;
+      if (cl is TypeParameter) {
+        return IdProtect(udt.GetCompileName(Options));
+      } else if (cl is DefaultClassDecl && Attributes.Contains(cl.EnclosingModuleDefinition.Attributes, "extern") &&
+                 member != null && Attributes.Contains(member.Attributes, "extern")) {
+        // omit the default class name ("_default") in extern modules, when the class is used to qualify an extern member
+        Contract.Assert(!cl.EnclosingModuleDefinition.IsDefaultModule); // default module is not marked ":extern"
+        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options));
+      } else if (Attributes.Contains(cl.Attributes, "extern")) {
+        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "::" + IdProtect(cl.Name);
+      } else if (cl is TupleTypeDecl) {
+        if (udt.TypeArgs.Count > 0) {
+          return "Tuple";
+        } else {
+          return "Tuple0"; // Need to special case this, as C++ won't infer the correct type arguments
+        }
+      } else {
+        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "::" + IdProtect(cl.GetCompileName(Options));
+      }
+    }
+
+    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
+      wr.Write("this");
+    }
+
+    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
+      EmitDatatypeValue(dtv, dtv.Ctor, dtv.IsCoCall, arguments, wr);
+    }
+
+    void EmitDatatypeValue(DatatypeValue dtv, DatatypeCtor ctor, bool isCoCall, string arguments, ConcreteSyntaxTree wr) {
+      var dt = dtv.Ctor.EnclosingDatatype;
+      var dtName = dt.GetCompileName(Options);
+      var ctorName = ctor.GetCompileName(Options);
+
+      if (dt is TupleTypeDecl) {
+        var tuple = dt as TupleTypeDecl;
+        var types = new List<Type>();
+        foreach (var arg in dtv.Arguments) {
+          types.Add(arg.Type);
+        }
+
+        if (types.Count == 0) {
+          wr.Write("Tuple0()");
+        } else {
+          wr.Write("Tuple{0}({1})", InstantiateTemplate(types), arguments);
+        }
+      } else if (!isCoCall) {
+        // Ordinary constructor (that is, one that does not guard any co-recursive calls)
+        // Generate:  Dt.create_Ctor(arguments)
+        if (dt.Ctors.Count == 1) {
+          wr.Write("{3}::{0}{1}({2})",
+            dtName,
+            InstantiateTemplate(dt.TypeArgs),
+            arguments,
+            dt.EnclosingModuleDefinition.GetCompileName(Options));
+        } else {
+          wr.Write("{4}::{0}{1}::create_{2}({3})",
+            dtName, ActualTypeArgs(dtv.InferredTypeArgs), ctorName,
+            arguments, dt.EnclosingModuleDefinition.GetCompileName(Options));
+        }
+
+      } else {
+        // Co-recursive call
+        // Generate:  Dt.lazy_Ctor(($dt) => Dt.create_Ctor($dt, args))
+        wr.Write("{0}.lazy_{1}(($dt) => ", dtName, ctorName);
+        wr.Write("{0}.create_{1}($dt{2}{3})", dtName, ctorName, arguments.Length == 0 ? "" : ", ", arguments);
+        wr.Write(")");
+      }
+    }
+
+    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString) {
+      compiledName = "";
+      preString = "";
+      postString = "";
+      switch (id) {
+        case SpecialField.ID.UseIdParam:
+          compiledName = (string)idParam;
+          break;
+        case SpecialField.ID.ArrayLength:
+        case SpecialField.ID.ArrayLengthInt:
+          throw new UnsupportedFeatureException(Token.NoToken, Feature.ArrayLength);
+        case SpecialField.ID.Floor:
+          compiledName = "int()";
+          break;
+        case SpecialField.ID.IsLimit:
+          throw new UnsupportedFeatureException(Token.NoToken, Feature.Ordinals);
+        case SpecialField.ID.IsSucc:
+          throw new UnsupportedFeatureException(Token.NoToken, Feature.Ordinals);
+        case SpecialField.ID.Offset:
+          throw new UnsupportedFeatureException(Token.NoToken, Feature.Ordinals);
+        case SpecialField.ID.IsNat:
+          throw new UnsupportedFeatureException(Token.NoToken, Feature.Ordinals);
+        case SpecialField.ID.Keys:
+          compiledName = "dafnyKeySet()";
+          break;
+        case SpecialField.ID.Values:
+          compiledName = "dafnyValues()";
+          break;
+        case SpecialField.ID.Items:
+          throw new UnsupportedFeatureException(Token.NoToken, Feature.MapItems);
+        case SpecialField.ID.Reads:
+          compiledName = "_reads";
+          break;
+        case SpecialField.ID.Modifies:
+          compiledName = "_modifies";
+          break;
+        case SpecialField.ID.New:
+          compiledName = "_new";
+          break;
+        default:
+          Contract.Assert(false); // unexpected ID
+          break;
+      }
+    }
+
+    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
+      Type expectedType, string/*?*/ additionalCustomParameter = null, bool internalAccess = false) {
+      if (member.IsStatic && member is ConstantField) {
+        // This used to work, but now obj comes in wanting to use TypeName on the class, which results in (std::shared_ptr<_module::MyClass>)::c;
+        //return SuffixLvalue(obj, "::{0}", member.CompileName);
+        return SimpleLvalue(wr => {
+          wr.Write("{0}::{1}::{2}", IdProtect(member.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options)), IdProtect(clName(member.EnclosingClass)), IdProtect(member.GetCompileName(Options)));
+        });
+      } else if (member is DatatypeDestructor dtor && dtor.EnclosingClass is TupleTypeDecl) {
+        return SuffixLvalue(obj, ".get<{0}>()", dtor.Name);
+      } else if (member is SpecialField sf2 && sf2.SpecialId == SpecialField.ID.UseIdParam && sf2.IdParam is string fieldName
+                 && fieldName.StartsWith("is_")) {
+        // Ugly hack of a check to figure out if this is a datatype query: f.Constructor?
+        return SuffixLvalue(obj, ".is_{0}_{1}()", IdProtect(sf2.EnclosingClass.GetCompileName(Options)), fieldName.Substring(3));
+      } else if (member is SpecialField sf) {
+        GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out var preStr, out var postStr);
+        if (sf.SpecialId == SpecialField.ID.Keys || sf.SpecialId == SpecialField.ID.Values) {
+          return SuffixLvalue(obj, ".{0}", compiledName);
+        } else if (sf is DatatypeDestructor dtor2) {
+          if (!(dtor2.EnclosingClass is IndDatatypeDecl)) {
+            UnsupportedFeatureError(dtor2.Origin, Feature.Codatatypes,
+              String.Format("Unexpected use of a destructor {0} that isn't for an inductive datatype.  Panic!",
+                member.Name));
+          }
+
+          var dt = dtor2.EnclosingClass as IndDatatypeDecl;
+          return SimpleLvalue(wr => {
+            if (dt.Ctors.Count > 1) {
+              if (dtor2.Type is UserDefinedType udt && udt.ResolvedClass == dt) {
+                // This a recursively defined datatype; need to dereference the pointer
+                wr.Write("*");
+              }
+
+              wr.Write("(");
+              obj(wr);
+              wr.Write(".dtor_{0}()", sf.GetCompileName(Options));
+            } else {
+              wr.Write("(");
+              obj(wr);
+              wr.Write(".{0}", sf.GetCompileName(Options));
+            }
+
+            wr.Write(")");
+          });
+        } else if (!member.IsStatic && compiledName.Length != 0) {
+          return SuffixLvalue(obj, "->{0}", compiledName);
+        } else if (compiledName.Length != 0) {
+          return SuffixLvalue(obj, "::{0}", compiledName);
+        } else {
+          // this member selection is handled by some kind of enclosing function call, so nothing to do here
+          return SimpleLvalue(obj);
+        }
+      } else if (member is Function) {
+        return StringLvalue(String.Format("{0}::{1}::{2}",
+          IdProtect(member.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options)),
+          IdName(member.EnclosingClass),
+          IdName(member)
+        ));
+      } else {
+        return SuffixLvalue(obj, "->{0}", IdName(member));
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Action<ConcreteSyntaxTree>> indices, Type elmtType, ConcreteSyntaxTree wr) {
+      var w = wr.Fork();
+      foreach (var index in indices) {
+        wr.Write(".at(");
+        index(wr);
+        wr.Write(")");
+      }
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
+      var w = wr.Fork();
+      foreach (var index in indices) {
+        wr.Write(".at(");
+        wr.Append(Expr(index, inLetExprBody, wStmts));
+        wr.Write(")");
+      }
+      return w;
+    }
+
+    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitExpr(expr, inLetExprBody, wr, wStmts);
+    }
+
+    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(source, wr, inLetExprBody, wStmts);
+      if (source.Type.NormalizeToAncestorType() is SeqType) {
+        // seq
+        wr.Write(".select(");
+        wr.Append(Expr(index, inLetExprBody, wStmts));
+        wr.Write(")");
+      } else {
+        // map or imap
+        wr.Write(".get(");
+        wr.Append(Expr(index, inLetExprBody, wStmts));
+        wr.Write(")");
+      }
+    }
+
+    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
+        CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(source, wr, inLetExprBody, wStmts);
+      wr.Write(".update(");
+      wr.Append(Expr(index, inLetExprBody, wStmts));
+      wr.Write(", ");
+      wr.Append(CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts));
+      wr.Write(")");
+    }
+
+    protected override void EmitSeqSelectRange(Expression source, Expression lo /*?*/, Expression hi /*?*/,
+        bool fromArray, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (fromArray) {
+        string typeName = "";
+
+        if (source.Type.TypeArgs.Count == 0 && source.Type is UserDefinedType udt && udt.ResolvedClass != null &&
+            udt.ResolvedClass is TypeSynonymDecl tsd) {
+          // Hack to workaround type synonyms wrapped around the actual array type
+          // TODO: Come up with a more systematic way of resolving this!
+          typeName = TypeName(tsd.Rhs.TypeArgs[0], wr, source.Origin, null, false);
+        } else {
+          typeName = TypeName(source.Type.TypeArgs[0], wr, source.Origin, null, false);
+        }
+        if (lo == null) {
+          if (hi == null) {
+            wr.Write("DafnySequence<{0}>::SeqFromArray", typeName);
+            TrParenExpr(source, wr, inLetExprBody, wStmts);
+          } else {
+            wr.Write("DafnySequence<{0}>::SeqFromArrayPrefix(", typeName);
+            TrParenExpr(source, wr, inLetExprBody, wStmts);
+            wr.Write(",");
+            TrParenExpr(hi, wr, inLetExprBody, wStmts);
+            wr.Write(")");
+          }
+        } else {
+          if (hi == null) {
+            wr.Write("DafnySequence<{0}>::SeqFromArraySuffix(", typeName);
+            TrParenExpr(source, wr, inLetExprBody, wStmts);
+            wr.Write(",");
+            TrParenExpr(lo, wr, inLetExprBody, wStmts);
+            wr.Write(")");
+          } else {
+            wr.Write("DafnySequence<{0}>::SeqFromArraySlice(", typeName);
+            TrParenExpr(source, wr, inLetExprBody, wStmts);
+            wr.Write(",");
+            TrParenExpr(lo, wr, inLetExprBody, wStmts);
+            wr.Write(",");
+            TrParenExpr(hi, wr, inLetExprBody, wStmts);
+            wr.Write(")");
+          }
+        }
+      } else {
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+
+        if (hi != null) {
+          TrParenExpr(".take", hi, wr, inLetExprBody, wStmts);
+        }
+        if (lo != null) {
+          TrParenExpr(".drop", lo, wr, inLetExprBody, wStmts);
+        }
+      }
+    }
+
+    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("DafnySequence<{0}>::Create(", TypeName(expr.Type, wr, expr.Origin, null, false));
+      wr.Append(Expr(expr.N, inLetExprBody, wStmts));
+      wr.Write(", ");
+      wr.Append(Expr(expr.Initializer, inLetExprBody, wStmts));
+      wr.Write(")");
+    }
+
+    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts) {
+      throw new UnsupportedFeatureException(expr.Origin, Feature.Multisets);
+    }
+
+    protected override void EmitApplyExpr(Type functionType, IOrigin tok, Expression function, List<Expression> arguments,
+        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(function, wr, inLetExprBody, wStmts);
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+    }
+
+    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
+      List<Type> boundTypes, Type resultType, IOrigin tok, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ref ConcreteSyntaxTree wStmts) {
+      wr.Write("(({0}) => ", Util.Comma(boundVars));
+      var w = wr.Fork();
+      wr.Write(")");
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+      return w;
+    }
+
+    protected override void EmitConstructorCheck(string source, DatatypeCtor ctor, ConcreteSyntaxTree wr) {
+      wr.Write("is_{1}({0})", source, DatatypeSubStructName(ctor));
+    }
+
+    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex,
+      DatatypeCtor ctor, Func<List<Type>> getTypeArgs, Type bvType, ConcreteSyntaxTree wr) {
+      if (ctor.EnclosingDatatype is TupleTypeDecl) {
+        wr.Write("(");
+        source(wr);
+        wr.Write(").template get<{0}>()", formalNonGhostIndex);
+      } else {
+        var dtorName = FormalName(dtor, formalNonGhostIndex);
+        if (dtor.Type is UserDefinedType udt && udt.ResolvedClass == ctor.EnclosingDatatype) {
+          // Recursively defined datatype requires a dereference here
+          wr.Write("*");
+        }
+
+        if (ctor.EnclosingDatatype.Ctors.Count > 1) {
+          wr.Write("((");
+          source(wr);
+          wr.Write(").dtor_{0}())", dtorName);
+        } else {
+          wr.Write("((");
+          source(wr);
+          wr.Write(").{0})", dtorName);
+        }
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IOrigin tok, List<string> inNames,
+        Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
+      wr.Write("function (");
+      Contract.Assert(inTypes.Count == inNames.Count);  // guaranteed by precondition
+      for (var i = 0; i < inNames.Count; i++) {
+        wr.Write("{0}{1}", i == 0 ? "" : ", ", inNames[i]);
+      }
+      var w = wr.NewExprBlock(")");
+      return w;
+    }
+
+    protected override void CreateIIFE(string bvName, Type bvType, IOrigin bvTok, Type bodyType, IOrigin bodyTok,
+      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
+      var w = wr.NewExprBlock("[&]({0} {1}) -> {2} ", TypeName(bvType, wr, bvTok), bvName, TypeName(bodyType, wr, bodyTok));
+      wStmts = w.Fork();
+      w.Write("return ");
+      wrBody = w.Fork();
+      w.WriteLine(";");
+      wr.Write("(");
+      wrRhs = wr.Fork();
+      wr.Write(")");
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IOrigin resultTok, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var w = wr.NewBigExprBlock("[&] ", " ()");
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IOrigin resultTok, string bvName,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      throw new UnsupportedFeatureException(resultTok, Feature.LetSuchThatExpressions);
+    }
+
+    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      switch (op) {
+        case ResolvedUnaryOp.BoolNot:
+          TrParenExpr("!", expr, wr, inLetExprBody, wStmts);
+          break;
+        case ResolvedUnaryOp.BitwiseNot:
+          if (AsNativeType(expr.Type) != null) {
+            wr.Write("~ ");
+            TrParenExpr(expr, wr, inLetExprBody, wStmts);
+          } else {
+            TrParenExpr(expr, wr, inLetExprBody, wStmts);
+            wr.Write(".Not()");
+          }
+          break;
+        case ResolvedUnaryOp.Cardinality:
+          TrParenExpr(expr, wr, inLetExprBody, wStmts);
+          wr.Write(".size()");
+          break;
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
+      }
+    }
+
+    bool IsDirectlyComparable(Type t) {
+      Contract.Requires(t != null);
+      return t.IsBoolType || t.IsCharType || AsNativeType(t) != null;
+    }
+
+    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
+      Type e0Type, Type e1Type, IOrigin tok, Type resultType,
+      out string opString,
+      out string preOpString,
+      out string postOpString,
+      out string callString,
+      out string staticCallString,
+      out bool reverseArguments,
+      out bool truncateResult,
+      out bool convertE1_to_int,
+      out bool coerceE1,
+      ConcreteSyntaxTree errorWr) {
+
+      opString = null;
+      preOpString = "";
+      postOpString = "";
+      callString = null;
+      staticCallString = null;
+      reverseArguments = false;
+      truncateResult = false;
+      convertE1_to_int = false;
+      coerceE1 = false;
+
+      switch (op) {
+        case BinaryExpr.ResolvedOpcode.Iff:
+          opString = "=="; break;
+        case BinaryExpr.ResolvedOpcode.Imp:
+          preOpString = "!"; opString = "||"; break;
+        case BinaryExpr.ResolvedOpcode.Or:
+          opString = "||"; break;
+        case BinaryExpr.ResolvedOpcode.And:
+          opString = "&&"; break;
+        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
+          if (AsNativeType(resultType) != null) {
+            opString = "&";
+          } else {
+            callString = "And";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.BitwiseOr:
+          if (AsNativeType(resultType) != null) {
+            opString = "|";
+          } else {
+            callString = "Or";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.BitwiseXor:
+          if (AsNativeType(resultType) != null) {
+            opString = "^";
+          } else {
+            callString = "Xor";
+          }
+          break;
+
+        case BinaryExpr.ResolvedOpcode.EqCommon: {
+            if (IsDirectlyComparable(e0Type)) {
+              opString = "==";
+            } else if (e0Type.IsRefType) {
+              opString = "==";
+            } else {
+              //staticCallString = "==";
+              opString = "==";
+            }
+            break;
+          }
+        case BinaryExpr.ResolvedOpcode.NeqCommon: {
+            if (IsDirectlyComparable(e0Type)) {
+              opString = "!=";
+            } else if (e0Type.IsRefType) {
+              opString = "!=";
+            } else {
+              opString = "!=";
+            }
+            break;
+          }
+
+        case BinaryExpr.ResolvedOpcode.Lt:
+        case BinaryExpr.ResolvedOpcode.LtChar:
+          opString = "<";
+          break;
+        case BinaryExpr.ResolvedOpcode.Le:
+        case BinaryExpr.ResolvedOpcode.LeChar:
+          opString = "<=";
+          break;
+        case BinaryExpr.ResolvedOpcode.Ge:
+        case BinaryExpr.ResolvedOpcode.GeChar:
+          opString = ">=";
+          break;
+        case BinaryExpr.ResolvedOpcode.Gt:
+        case BinaryExpr.ResolvedOpcode.GtChar:
+          opString = ">";
+          break;
+        case BinaryExpr.ResolvedOpcode.LeftShift:
+          if (resultType.NormalizeToAncestorType().IsBitVectorType) {
+            truncateResult = true;
+          }
+          if (AsNativeType(resultType) != null) {
+            opString = "<<";
+          } else {
+            throw new UnsupportedFeatureException(tok, Feature.NonNativeNewtypes,
+              "LeftShift of non-native type");
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.RightShift:
+          if (AsNativeType(resultType) != null) {
+            opString = ">>";
+            if (AsNativeType(e1Type) == null) {
+              postOpString = ".Uint64()";
+            }
+          } else {
+            throw new UnsupportedFeatureException(tok, Feature.NonNativeNewtypes,
+              "LeftShift of non-native type");
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Add:
+          if (resultType.NormalizeToAncestorType().IsBitVectorType) {
+            truncateResult = true;
+          }
+          if (resultType.IsCharType || AsNativeType(resultType) != null) {
+            opString = "+";
+          } else {
+            throw new UnsupportedFeatureException(tok, Feature.NonNativeNewtypes,
+              "Add of non-native type");
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Sub:
+          if (resultType.NormalizeToAncestorType().IsBitVectorType) {
+            truncateResult = true;
+          }
+          if (resultType.IsCharType || AsNativeType(resultType) != null) {
+            opString = "-";
+          } else {
+            throw new UnsupportedFeatureException(tok, Feature.NonNativeNewtypes);
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mul:
+          if (resultType.NormalizeToAncestorType().IsBitVectorType) {
+            truncateResult = true;
+          }
+          if (AsNativeType(resultType) != null) {
+            opString = "*";
+          } else {
+            throw new UnsupportedFeatureException(tok, Feature.NonNativeNewtypes);
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Div:
+          if (AsNativeType(resultType) != null) {
+            var nt = AsNativeType(resultType);
+            if (nt.LowerBound < BigInteger.Zero) {
+              // Want Euclidean division for signed types
+              staticCallString = "EuclideanDivision_" + GetNativeTypeName(AsNativeType(resultType));
+            } else {
+              // Native division is fine for unsigned
+              opString = "/";
+            }
+          } else {
+            callString = "DivBy";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mod:
+          if (AsNativeType(resultType) != null) {
+            var nt = AsNativeType(resultType);
+            if (nt.LowerBound < BigInteger.Zero) {
+              // Want Euclidean division for signed types
+              staticCallString = "_dafny.Mod" + Capitalize(GetNativeTypeName(AsNativeType(resultType)));
+            } else {
+              // Native division is fine for unsigned
+              opString = "%";
+            }
+          } else {
+            callString = "Modulo";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.SetEq:
+        case BinaryExpr.ResolvedOpcode.MultiSetEq:
+        case BinaryExpr.ResolvedOpcode.MapEq:
+        case BinaryExpr.ResolvedOpcode.SeqEq:
+          callString = "equals"; break;
+        case BinaryExpr.ResolvedOpcode.SetNeq:
+        case BinaryExpr.ResolvedOpcode.MultiSetNeq:
+        case BinaryExpr.ResolvedOpcode.MapNeq:
+        case BinaryExpr.ResolvedOpcode.SeqNeq:
+          preOpString = "!"; callString = "equals"; break;
+        case BinaryExpr.ResolvedOpcode.ProperSubset:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
+          callString = "IsProperSubsetOf"; break;
+        case BinaryExpr.ResolvedOpcode.Subset:
+        case BinaryExpr.ResolvedOpcode.MultiSubset:
+          callString = "IsSubsetOf"; break;
+        case BinaryExpr.ResolvedOpcode.Superset:
+        case BinaryExpr.ResolvedOpcode.MultiSuperset:
+          callString = "IsSupersetOf"; break;
+        case BinaryExpr.ResolvedOpcode.ProperSuperset:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
+          callString = "IsProperSupersetOf"; break;
+        case BinaryExpr.ResolvedOpcode.Disjoint:
+        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
+          callString = "IsDisjointFrom"; break;
+        case BinaryExpr.ResolvedOpcode.InSet:
+        case BinaryExpr.ResolvedOpcode.InMultiSet:
+        case BinaryExpr.ResolvedOpcode.InMap:
+          callString = "contains"; reverseArguments = true; break;
+        case BinaryExpr.ResolvedOpcode.NotInSet:
+        case BinaryExpr.ResolvedOpcode.NotInMultiSet:
+        case BinaryExpr.ResolvedOpcode.NotInMap:
+          preOpString = "!"; callString = "contains"; reverseArguments = true; break;
+        case BinaryExpr.ResolvedOpcode.Union:
+        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+          callString = "Union"; break;
+        case BinaryExpr.ResolvedOpcode.MapMerge:
+          callString = "Merge"; break;
+        case BinaryExpr.ResolvedOpcode.Intersection:
+        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+          callString = "Intersection"; break;
+        case BinaryExpr.ResolvedOpcode.SetDifference:
+        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+          callString = "Difference"; break;
+        case BinaryExpr.ResolvedOpcode.MapSubtraction:
+          callString = "Subtract"; break;
+
+        case BinaryExpr.ResolvedOpcode.ProperPrefix:
+          callString = "IsProperPrefixOf"; break;
+        case BinaryExpr.ResolvedOpcode.Prefix:
+          callString = "IsPrefixOf"; break;
+        case BinaryExpr.ResolvedOpcode.Concat:
+          callString = "concatenate"; break;
+        case BinaryExpr.ResolvedOpcode.InSeq:
+          callString = "contains"; reverseArguments = true; break;
+        case BinaryExpr.ResolvedOpcode.NotInSeq:
+          preOpString = "!"; callString = "contains"; reverseArguments = true; break;
+
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected binary expression
+      }
+    }
+
+    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
+      wr.Write("{0} == 0", varName);
+    }
+
+    protected override void EmitConversionExpr(Expression fromExpr, Type fromType, Type toType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Int) || fromType.IsBitVectorType || fromType.IsCharType) {
+        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          throw new UnsupportedFeatureException(fromExpr.Origin, Feature.RealNumbers);
+        } else if (toType.IsCharType) {
+          wr.Write("(char)");
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+        } else {
+          // (int or bv or char) -> (int or bv or ORDINAL)
+          var fromNative = AsNativeType(fromType);
+          var toNative = AsNativeType(toType);
+          if (fromNative != null && toNative != null) {
+            // from a native, to a native -- simple!
+            wr.Write(GetNativeTypeName(toNative));
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          } else if (fromType.IsCharType) {
+            Contract.Assert(fromNative == null);
+            if (toNative == null) {
+              throw new UnsupportedFeatureException(fromExpr.Origin, Feature.UnboundedIntegers);
+            } else {
+              // char -> native
+              wr.Write($"({GetNativeTypeName(toNative)})");
+              TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            }
+          } else if (fromNative == null && toNative == null) {
+            // big-integer (int or bv) -> big-integer (int or bv or ORDINAL), so identity will do
+            wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+          } else if (fromNative != null) {
+            Contract.Assert(toNative == null); // follows from other checks
+
+            // native (int or bv) -> big-integer (int or bv)
+            wr.Write("_dafny.IntOf{0}(", Capitalize(GetNativeTypeName(fromNative)));
+            wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+            wr.Write(')');
+          } else {
+            // any (int or bv) -> native (int or bv)
+            // Consider some optimizations
+            var literal = PartiallyEvaluate(fromExpr);
+            UnaryOpExpr u = fromExpr.Resolved as UnaryOpExpr;
+            MemberSelectExpr m = fromExpr.Resolved as MemberSelectExpr;
+            if (literal != null) {
+              // Optimize constant to avoid intermediate BigInteger
+              wr.Write("{0}({1})", GetNativeTypeName(toNative), literal);
+            } else if (u != null && u.Op == UnaryOpExpr.Opcode.Cardinality) {
+              wr.Write("({0})(", GetNativeTypeName(toNative));
+              TrParenExpr(u.E, wr, inLetExprBody, wStmts);
+              wr.Write(".size())");
+            } else if (m != null && m.MemberName == "Length" && m.Obj.Type.IsArrayType) {
+              // Optimize .Length to avoid intermediate BigInteger
+              wr.Write("({0})(", GetNativeTypeName(toNative));
+              TrParenExpr(m.Obj, wr, inLetExprBody, wStmts);
+              wr.Write(".size())");
+            } else {
+              // no optimization applies; use the standard translation
+              TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+              wr.Write(".{0}()", Capitalize(GetNativeTypeName(toNative)));
+            }
+
+          }
+        }
+      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        Contract.Assert(AsNativeType(fromType) == null);
+        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          // real -> real
+          Contract.Assert(AsNativeType(toType) == null);
+          wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+        } else {
+          // real -> (int or bv)
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          wr.Write(".Int()");
+          if (AsNativeType(toType) is NativeType nt) {
+            wr.Write(".{0}()", Capitalize(GetNativeTypeName(nt)));
+          }
+        }
+      } else if (fromType.IsBigOrdinalType) {
+        Contract.Assert(toType.IsNumericBased(Type.NumericPersuasion.Int));
+        // identity will do
+        wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+      } else {
+        // identity will do
+        Contract.Assert(fromType.Equals(toType) || fromType.AsNewtype != null || toType.AsNewtype != null);
+        wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+      }
+    }
+
+    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IOrigin tok, ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(tok, Feature.TypeTests);
+    }
+
+    protected override void EmitIsIntegerTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      throw new UnsupportedFeatureException(source.Origin, Feature.TypeTests);
+    }
+
+    protected override void EmitIsUnicodeScalarValueTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      throw new UnsupportedFeatureException(source.Origin, Feature.TypeTests);
+    }
+
+    protected override void EmitIsInIntegerRange(Expression source, BigInteger lo, BigInteger hi, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      throw new UnsupportedFeatureException(source.Origin, Feature.TypeTests);
+    }
+
+    protected override void EmitCollectionDisplay(CollectionType ct, IOrigin tok, List<Expression> elements,
+      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (ct is SetType) {
+        wr.Write("DafnySet<{0}>::Create({{", TypeName(ct.TypeArgs[0], wr, tok, null, false));
+        for (var i = 0; i < elements.Count; i++) {
+          wr.Append(Expr(elements[i], inLetExprBody, wStmts));
+          if (i < elements.Count - 1) {
+            wr.Write(",");
+          }
+        }
+        wr.Write("})");
+      } else if (ct is MultiSetType) {
+        throw new UnsupportedFeatureException(tok, Feature.Multisets);
+      } else {
+        Contract.Assert(ct is SeqType);  // follows from precondition
+        if (ct.Arg.IsCharType) {
+          throw new UnsupportedFeatureException(tok, Feature.SequenceDisplaysOfCharacters);
+        } else {
+          wr.Write("DafnySequence<{0}>::Create({{", TypeName(ct.TypeArgs[0], wr, tok, null, false));
+          for (var i = 0; i < elements.Count; i++) {
+            wr.Append(Expr(elements[i], inLetExprBody, wStmts));
+            if (i < elements.Count - 1) {
+              wr.Write(",");
+            }
+          }
+          wr.Write("})");
+        }
+      }
+    }
+
+    protected override void EmitMapDisplay(MapType mt, IOrigin tok, List<ExpressionPair> elements,
+      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("DafnyMap<{0},{1}>::Create({{",
+               TypeName(mt.TypeArgs[0], wr, tok, null, false),
+               TypeName(mt.TypeArgs[1], wr, tok, null, false));
+      string sep = "";
+      foreach (ExpressionPair p in elements) {
+        wr.Write(sep);
+        wr.Write("{");
+        wr.Append(Expr(p.A, inLetExprBody, wStmts));
+        wr.Write(",");
+        wr.Append(Expr(p.B, inLetExprBody, wStmts));
+        wr.Write("}");
+        sep = ", ";
+      }
+      wr.Write("})");
+    }
+
+    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
+      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
+      wrVarInit.Write("DafnySet<{0}>()", TypeName(e.Type.NormalizeToAncestorType().AsSetType.Arg, wrVarInit, e.Origin, null, false));
+    }
+
+    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
+      throw new UnsupportedFeatureException(e.Origin, Feature.MapComprehensions);
+    }
+
+    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      Contract.Assume(ct is SetType || ct is MultiSetType);  // follows from precondition
+      if (ct is MultiSetType) {
+        // This should never occur since there is no syntax for multiset comprehensions yet
+        throw new cce.UnreachableException();
+      }
+      var wStmts = wr.Fork();
+      wr.Write("{0}.set.emplace(", collName);
+      wr.Append(Expr(elmt, inLetExprBody, wStmts));
+      wr.WriteLine(");");
+    }
+
+    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IOrigin tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(tok, Feature.MapComprehensions);
+    }
+
+    protected override void GetCollectionBuilder_Build(CollectionType ct, IOrigin tok, string collName,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmt) {
+      // collections are built in place
+      wr.Write(collName);
+    }
+
+    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      throw new UnsupportedFeatureException(Token.NoToken, Feature.ExactBoundedPool);
+    }
+
+    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(Token.NoToken, Feature.RunAllTests);
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/Dafny/AST.dfy b/Source/DafnyCore/Backends/Dafny/AST.dfy
new file mode 100644
index 00000000000..abf6b485f67
--- /dev/null
+++ b/Source/DafnyCore/Backends/Dafny/AST.dfy
@@ -0,0 +1,440 @@
+module {:extern "DAST.Format"} DAST.Format
+/* Cues about how to format different AST elements if necessary,
+   e.g. to generate idiomatic code when needed. */
+{
+  // Dafny AST compilation tenets:
+  // - The Compiled Dafny AST should be minimal
+  // - The generated code should look idiomatic and close to the original Dafny file if possible
+  // Since the two might conflict, the second one is taken care of by adding formatting information
+
+  datatype UnaryOpFormat =
+    | NoFormat
+    | CombineFormat
+  datatype BinaryOpFormat =
+    | NoFormat
+    | ImpliesFormat
+    | EquivalenceFormat
+    | ReverseFormat
+
+  function SeqToHeight<T>(s: seq<T>, f: T --> nat): (r: nat)
+    requires forall t <- s :: f.requires(t)
+    ensures forall t <- s :: f(t) <= r
+  {
+    if |s| == 0 then 0 else
+    var i := f(s[0]);
+    var j := SeqToHeight(s[1..], f);
+    if i < j then j else i
+  }
+}
+
+module {:extern "DAST"} DAST {
+  import opened Std.Wrappers
+  import Std
+
+  // Prevents Dafny names to being direclty integrated into Rust without explicit conversion
+  // Make it a newtype once newtypes are compatible with standard library
+  // See issue https://github.com/dafny-lang/dafny/issues/5345
+  datatype Name = Name(dafny_name: string)
+
+  // A special Dafny name wrapper for variable names.
+  // For example, the identifier 'None' needs to be escaped in Rust, but not as a constructor.
+  datatype VarName = VarName(dafny_name: string)
+
+  datatype Module = Module(
+    name: Name,
+    docString: string,
+    attributes: seq<Attribute>,
+    requiresExterns: bool,
+    body: Option<seq<ModuleItem>>)
+
+  datatype ModuleItem =
+    | Module(Module)
+    | Class(Class)
+    | Trait(Trait)
+    | Newtype(Newtype)
+    | SynonymType(SynonymType)
+    | Datatype(Datatype)
+  {
+    function name(): Name {
+      match this {
+        case Module(m) => m.name
+        case Class(m) => m.name
+        case Trait(m) => m.name
+        case Newtype(m) => m.name
+        case SynonymType(m) => m.name
+        case Datatype(m) => m.name
+      }
+    }
+    function attributes(): seq<Attribute> {
+      match this {
+        case Module(m) => m.attributes
+        case Class(m) => m.attributes
+        case Trait(m) => m.attributes
+        case Newtype(m) => m.attributes
+        case SynonymType(m) => m.attributes
+        case Datatype(m) => m.attributes
+      }
+    }
+  }
+
+  datatype Type =
+    UserDefined(resolved: ResolvedType) |
+    Tuple(seq<Type>) |
+    Array(element: Type, dims: nat) |
+    Seq(element: Type) |
+    Set(element: Type) |
+    Multiset(element: Type) |
+    Map(key: Type, value: Type) |
+    SetBuilder(element: Type) |
+    MapBuilder(key: Type, value: Type) |
+    Arrow(args: seq<Type>, result: Type) |
+    Primitive(Primitive) | Passthrough(string) |
+    TypeArg(Ident) | Object()
+  {
+    function Replace(mapping: map<Type, Type>): Type {
+      if this in mapping then mapping[this] else
+      match this {
+        case UserDefined(resolved: ResolvedType) =>
+          Type.UserDefined(resolved.Replace(mapping))
+        case Tuple(arguments) =>
+          Type.Tuple(Std.Collections.Seq.Map(
+                       t requires t in arguments => t.Replace(mapping), arguments))
+        case Array(element, dims) =>
+          Type.Array(element.Replace(mapping), dims)
+        case Seq(element) =>
+          Type.Seq(element.Replace(mapping))
+        case Set(element) =>
+          Type.Set(element.Replace(mapping))
+        case Multiset(element) =>
+          Type.Multiset(element.Replace(mapping))
+        case Map(key, value) =>
+          Type.Map(key.Replace(mapping), value.Replace(mapping))
+        case SetBuilder(element) =>
+          Type.SetBuilder(element.Replace(mapping))
+        case MapBuilder(key, value) =>
+          Type.MapBuilder(key.Replace(mapping), value.Replace(mapping))
+        case Arrow(args: seq<Type>, result: Type) =>
+          Type.Arrow(Std.Collections.Seq.Map(
+                       t requires t in args => t.Replace(mapping), args), result.Replace(mapping))
+        case Primitive(_) | Passthrough(_) | Object() | TypeArg(_) =>
+          this
+      }
+    }
+
+    predicate IsPrimitiveInt() {
+      match this {
+        case Primitive(Int) => true
+        case UserDefined(ResolvedType(_, _, SynonymType(typ), _, _, _)) =>
+          typ.IsPrimitiveInt()
+        case _ => false
+      }
+    }
+
+    predicate IsGeneralTrait() {
+      match this {
+        case UserDefined(ResolvedType(_, _, typeKind, _, _, _)) =>
+          match typeKind {
+            case SynonymType(typ) =>
+              typ.IsGeneralTrait()
+            case Trait(GeneralTrait) => true
+            case _ => false
+          }
+        case _ => false
+      }
+    }
+  }
+
+  datatype Variance =
+    | Nonvariant
+    | Covariant
+    | Contravariant
+
+  datatype TypeArgDecl = TypeArgDecl(name: Ident, bounds: seq<TypeArgBound>, variance: Variance)
+
+  datatype TypeArgBound =
+    | SupportsEquality
+    | SupportsDefault
+
+  datatype Primitive = Int | Real | String | Bool | Char | Native
+
+
+  datatype NewtypeRange =
+    | U8(overflow: bool) // Whether arithmetic operations can overflow and wrap
+    | I8(overflow: bool)
+    | U16(overflow: bool)
+    | I16(overflow: bool)
+    | U32(overflow: bool)
+    | I32(overflow: bool)
+    | U64(overflow: bool)
+    | I64(overflow: bool)
+    | U128(overflow: bool)
+    | I128(overflow: bool)
+    | NativeArrayIndex
+    | BigInt
+    | Bool
+    | NoRange
+  {
+    predicate CanOverflow() {
+      (U8? || I8? || U16? || I16? || U32? || I32? || U64? || I64? || U128? || I128?) && overflow
+    }
+    predicate HasArithmeticOperations() {
+      !Bool?// To change when newtypes will have sequences and sets as ranges.
+    }
+  }
+
+  datatype Attribute = Attribute(name: string, args: seq<string>)
+
+  datatype NewtypeType = NewtypeType(baseType: Type, range: NewtypeRange, erase: bool)
+
+  datatype TraitType =
+    | ObjectTrait()     // Traits that extend objects with --type-system-refresh, all traits otherwise
+    | GeneralTrait()  // Traits that don't necessarily extend objects with --type-system-refresh
+
+  datatype ResolvedTypeBase =
+    | Class()
+    | Datatype(variances: seq<Variance>)
+    | Trait(traitType: TraitType)
+    | SynonymType(baseType: Type)
+    | Newtype(baseType: Type, range: NewtypeRange, erase: bool)
+
+  datatype ResolvedType = ResolvedType(
+    path: seq<Ident>,
+    typeArgs: seq<Type>,
+    kind: ResolvedTypeBase,
+    attributes: seq<Attribute>,
+    properMethods: seq<Name>,
+    extendedTypes: seq<Type>) {
+    function Replace(mapping: map<Type, Type>): ResolvedType {
+      ResolvedType(
+        path,
+        Std.Collections.Seq.Map(
+          t requires t in typeArgs => t.Replace(mapping), typeArgs),
+        match kind {
+          case Newtype(baseType, range, erase) =>
+            ResolvedTypeBase.Newtype(baseType.Replace(mapping), range, erase)
+          case _ => kind
+        },
+        attributes,
+        properMethods,
+        Std.Collections.Seq.Map(
+          t requires t in extendedTypes => t.Replace(mapping), extendedTypes)
+      )
+    }
+  }
+
+  datatype Ident = Ident(id: Name)
+
+  datatype Class = Class(
+    name: Name,
+    docString: string,
+    enclosingModule: Ident,
+    typeParams: seq<TypeArgDecl>,
+    superTraitTypes: seq<Type>,
+    fields: seq<Field>,
+    body: seq<ClassItem>,
+    attributes: seq<Attribute>)
+
+  datatype Trait = Trait(
+    name: Name,
+    docString: string,
+    typeParams: seq<TypeArgDecl>,
+    traitType: TraitType,
+    parents: seq<Type>,
+    body: seq<ClassItem>,
+    attributes: seq<Attribute>)
+
+  datatype Datatype = Datatype(
+    name: Name,
+    docString: string,
+    enclosingModule: Ident,
+    typeParams: seq<TypeArgDecl>,
+    ctors: seq<DatatypeCtor>,
+    body: seq<ClassItem>,
+    isCo: bool,
+    attributes: seq<Attribute>,
+    superTraitTypes: seq<Type>)
+
+  datatype DatatypeDtor = DatatypeDtor(
+    formal: Formal,
+    callName: Option<string>)
+
+  datatype DatatypeCtor = DatatypeCtor(
+    name: Name,
+    docString: string,
+    args: seq<DatatypeDtor>,
+    hasAnyArgs: bool /* includes ghost */)
+
+  datatype Newtype =
+    Newtype(
+      name: Name,
+      docString: string,
+      typeParams: seq<TypeArgDecl>, base: Type,
+      range: NewtypeRange, constraint: Option<NewtypeConstraint>,
+      witnessStmts: seq<Statement>, witnessExpr: Option<Expression>, attributes: seq<Attribute>,
+      classItems: seq<ClassItem>)
+
+  datatype NewtypeConstraint = NewtypeConstraint(variable: Formal, constraintStmts: seq<Statement>)
+
+  // At this point, constraints have been entirely removed,
+  // but synonym types might have different witnesses to use for by the compiler
+  datatype SynonymType = SynonymType(
+    name: Name,
+    docString: string,
+    typeParams: seq<TypeArgDecl>,
+    base: Type,
+    witnessStmts: seq<Statement>,
+    witnessExpr: Option<Expression>,
+    attributes: seq<Attribute>)
+
+  datatype ClassItem = Method(Method)
+
+  datatype Field = Field(formal: Formal, isConstant: bool, defaultValue: Option<Expression>, isStatic: bool)
+
+  datatype Formal = Formal(name: VarName, typ: Type, attributes: seq<Attribute>)
+
+  datatype Method = Method(
+    docString: string,
+    attributes: seq<Attribute>,
+    isStatic: bool,
+    hasBody: bool,
+    outVarsAreUninitFieldsToAssign: bool, // For constructors
+    wasFunction: bool, // To choose between "&self" and "&mut self"
+    overridingPath: Option<seq<Ident>>,
+    name: Name,
+    typeParams: seq<TypeArgDecl>,
+    params: seq<Formal>,
+    body: seq<Statement>,
+    outTypes: seq<Type>,
+    outVars: Option<seq<VarName>>)
+
+  datatype CallSignature = CallSignature(parameters: seq<Formal>)
+
+  datatype CallName =
+    CallName(name: Name, onType: Option<Type>, receiverArg: Option<Formal>, receiverAsArgument: bool, signature: CallSignature) |
+    MapBuilderAdd | MapBuilderBuild | SetBuilderAdd | SetBuilderBuild
+
+  datatype Statement =
+    DeclareVar(name: VarName, typ: Type, maybeValue: Option<Expression>) |
+    Assign(lhs: AssignLhs, value: Expression) |
+    If(cond: Expression, thn: seq<Statement>, els: seq<Statement>) |
+    Labeled(lbl: string, body: seq<Statement>) |
+    While(cond: Expression, body: seq<Statement>) |
+    Foreach(boundName: VarName, boundType: Type, over: Expression, body: seq<Statement>) |
+    Call(on: Expression, callName: CallName, typeArgs: seq<Type>, args: seq<Expression>, outs: Option<seq<VarName>>) |
+    Return(expr: Expression) |
+    EarlyReturn() |
+    Break(toLabel: Option<string>) |
+    TailRecursive(body: seq<Statement>) |
+    JumpTailCallStart() |
+    Halt() |
+    Print(Expression) |
+    ConstructorNewSeparator(fields: seq<Field>)
+  {
+  }
+
+  datatype AssignLhs =
+    Ident(ident: VarName) |
+    Select(expr: Expression, field: VarName, isConstant: bool) |
+    Index(expr: Expression, indices: seq<Expression>)
+
+  datatype CollKind = Seq | Array | Map
+
+  datatype TypedBinOp =
+    TypedBinOp(op: BinOp, leftType: Type, rightType: Type, resultType: Type)
+
+  datatype BinOp =
+    Eq(referential: bool) |
+    Div(overflow: bool) | EuclidianDiv() |
+    Mod() | EuclidianMod() |
+    Lt() | // a <= b is !(b < a)
+    LtChar() |
+    Plus(overflow: bool) | Minus(overflow: bool) | Times(overflow: bool) |
+    BitwiseAnd() | BitwiseOr() | BitwiseXor() |
+    BitwiseShiftRight() | BitwiseShiftLeft() |
+    And() | Or() |
+    In() |
+    SeqProperPrefix() | SeqPrefix() |
+    SetMerge() | SetSubtraction() | SetIntersection() |
+    Subset() | ProperSubset() | SetDisjoint() |
+    MapMerge() | MapSubtraction() |
+    MultisetMerge() | MultisetSubtraction() | MultisetIntersection() |
+    Submultiset() | ProperSubmultiset() | MultisetDisjoint() |
+    Concat() |
+    Passthrough(string)
+
+  datatype Expression =
+    Literal(Literal) |
+    Ident(name: VarName) |
+    Companion(seq<Ident>, typeArgs: seq<Type>) |
+    ExternCompanion(seq<Ident>) |
+    Tuple(seq<Expression>) |
+    New(path: seq<Ident>, typeArgs: seq<Type>, args: seq<Expression>) |
+    NewUninitArray(dims: seq<Expression>, typ: Type) |
+    ArrayIndexToInt(value: Expression) |
+    FinalizeNewArray(value: Expression, typ: Type) |
+    DatatypeValue(datatypeType: ResolvedType, typeArgs: seq<Type>, variant: Name, isCo: bool, contents: seq<(VarName, Expression)>) |
+    Convert(value: Expression, from: Type, typ: Type) |
+    SeqConstruct(length: Expression, elem: Expression) |
+    SeqValue(elements: seq<Expression>, typ: Type) |
+    SetValue(elements: seq<Expression>) |
+    MultisetValue(elements: seq<Expression>) |
+    MapValue(mapElems: seq<(Expression, Expression)>) |
+    MapBuilder(keyType: Type, valueType: Type) |
+    SeqUpdate(expr: Expression, indexExpr: Expression, value: Expression) |
+    MapUpdate(expr: Expression, indexExpr: Expression, value: Expression) |
+    SetBuilder(elemType: Type) |
+    ToMultiset(Expression) |
+    This() |
+    Ite(cond: Expression, thn: Expression, els: Expression) |
+    UnOp(unOp: UnaryOp, expr: Expression, format1: Format.UnaryOpFormat) |
+    BinOp(op: TypedBinOp, left: Expression, right: Expression, format2: Format.BinaryOpFormat) |
+    ArrayLen(expr: Expression, exprType: Type, dim: nat, native: bool) |
+    MapKeys(expr: Expression) |
+    MapValues(expr: Expression) |
+    MapItems(expr: Expression) |
+    Select(expr: Expression, field: VarName, fieldMutability: FieldMutability, isDatatype: bool, fieldType: Type) |
+    SelectFn(expr: Expression, field: VarName, onDatatype: bool, isStatic: bool, isConstant: bool, arguments: seq<Type>) |
+    Index(expr: Expression, collKind: CollKind, indices: seq<Expression>) |
+    IndexRange(expr: Expression, isArray: bool, low: Option<Expression>, high: Option<Expression>) |
+    TupleSelect(expr: Expression, index: nat, fieldType: Type) |
+    Call(on: Expression, callName: CallName, typeArgs: seq<Type>, args: seq<Expression>) |
+    Lambda(params: seq<Formal>, retType: Type, body: seq<Statement>) |
+    BetaRedex(values: seq<(Formal, Expression)>, retType: Type, expr: Expression) |
+    IIFE(ident: VarName, typ: Type, value: Expression, iifeBody: Expression) |
+    Apply(expr: Expression, args: seq<Expression>) |
+    TypeTest(on: Expression, dType: seq<Ident>, variant: Name) |
+    Is(expr: Expression, fromType: Type, toType: Type) |
+    InitializationValue(typ: Type) |
+    BoolBoundedPool() |
+    SetBoundedPool(of: Expression) |
+    MapBoundedPool(of: Expression) |
+    SeqBoundedPool(of: Expression, includeDuplicates: bool) |
+    MultisetBoundedPool(of: Expression, includeDuplicates: bool) |
+    ExactBoundedPool(of: Expression) |
+    IntRange(elemType: Type, lo: Expression, hi: Expression, up: bool) |
+    UnboundedIntRange(start: Expression, up: bool) |
+    Quantifier(elemType: Type, collection: Expression, is_forall: bool, lambda: Expression)
+
+  // Since constant fields need to be set up in the constructor,
+  // accessing constant fields is done in two ways:
+  // - The internal field access (through the internal field that contains the value of the constant)
+  //   it's not initialized at the beginning of the constructor.
+  // - The external field access (through a function), which when accessed
+  //   must always be initialized.
+  // For Select expressions, it's important to know how the field is being accessed
+  // For mutable fields, there is no wrapping function so only one way to access the mutable field
+  datatype FieldMutability =
+    | ConstantField // Access a class constant field after initialization, or a datatype constant field
+    | InternalClassConstantFieldOrDatatypeDestructor // Access a class internal field before initialization, or a datatype destructor
+    | ClassMutableField
+  datatype UnaryOp = Not | BitwiseNot | Cardinality
+
+  datatype Literal =
+    | BoolLiteral(bool)
+    | IntLiteral(string, Type)
+    | DecLiteral(string, string, Type)
+    | StringLiteral(string, verbatim: bool)
+    | CharLiteral(char)
+    | CharLiteralUTF16(nat)
+    | Null(Type)
+}
diff --git a/Source/DafnyCore/Backends/Dafny/ASTBuilder.cs b/Source/DafnyCore/Backends/Dafny/ASTBuilder.cs
new file mode 100644
index 00000000000..3b7f6eeb867
--- /dev/null
+++ b/Source/DafnyCore/Backends/Dafny/ASTBuilder.cs
@@ -0,0 +1,1941 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using Dafny;
+using DAST;
+using DAST.Format;
+using JetBrains.Annotations;
+using Microsoft.CodeAnalysis;
+using Microsoft.Dafny.Compilers;
+using Std.Wrappers;
+using Attribute = DAST.Attribute;
+
+namespace Microsoft.Dafny.Compilers {
+
+  interface Container {
+    public void AddUnsupported(string why);
+  }
+
+  class ProgramBuilder : ModuleContainer {
+    readonly List<Module> items = new();
+
+    public void AddModule(Module item) {
+      items.Add(item);
+    }
+
+    public List<Module> Finish() {
+      return items;
+    }
+
+    public void AddUnsupported(string why) {
+      items.Add(ModuleContainer.UnsupportedToModule(why));
+    }
+  }
+
+  interface ModuleContainer : Container {
+    void AddModule(Module item);
+
+    public ModuleBuilder Module(string name, string docString, Sequence<Attribute> attributes, bool requiresExterns) {
+      return new ModuleBuilder(this, name, docString, attributes, requiresExterns);
+    }
+
+    public static Module UnsupportedToModule(string why) {
+      return new Module(
+        Sequence<Rune>.UnicodeFromString($"uncompilable/*{why.Replace(".", ",")}*/"),
+        Sequence<Rune>.UnicodeFromString(""),
+        Sequence<Attribute>.FromElements(
+          (Attribute)Attribute.create_Attribute(
+            Sequence<Rune>.UnicodeFromString("extern"),
+            Sequence<Sequence<Rune>>.FromElements(
+              (Sequence<Rune>)Sequence<Rune>.UnicodeFromString($"uncompilable/*{why}*/")))), false,
+        Std.Wrappers.Option<Sequence<ModuleItem>>.create_None());
+    }
+  }
+
+  class ModuleBuilder : ClassContainer, TraitContainer, NewtypeContainer, DatatypeContainer, SynonymTypeContainer {
+    readonly ModuleContainer parent;
+    readonly string name;
+    readonly Sequence<Attribute> attributes;
+    readonly List<ModuleItem> body = new();
+    private readonly bool requiresExterns;
+    private string docString;
+
+    public ModuleBuilder(ModuleContainer parent, string name, string docString, Sequence<Attribute> attributes, bool requiresExterns) {
+      this.parent = parent;
+      this.name = name;
+      this.attributes = attributes;
+      this.requiresExterns = requiresExterns;
+      this.docString = docString;
+    }
+
+    public void AddModule(Module item) {
+      body.Add((ModuleItem)ModuleItem.create_Module(item));
+    }
+
+    public void AddClass(Class item) {
+      body.Add((ModuleItem)ModuleItem.create_Class(item));
+    }
+
+    public void AddTrait(Trait item) {
+      body.Add((ModuleItem)ModuleItem.create_Trait(item));
+    }
+
+    public void AddNewtype(Newtype item) {
+      body.Add((ModuleItem)ModuleItem.create_Newtype(item));
+    }
+
+    public void AddDatatype(Datatype item) {
+      body.Add((ModuleItem)ModuleItem.create_Datatype(item));
+    }
+
+    public object Finish() {
+      parent.AddModule((Module)Module.create(
+        Sequence<Rune>.UnicodeFromString(this.name),
+        Sequence<Rune>.UnicodeFromString(this.docString),
+        attributes,
+        requiresExterns,
+        Std.Wrappers.Option<Sequence<ModuleItem>>.create_Some((Sequence<ModuleItem>)Sequence<ModuleItem>.FromArray(body.ToArray()))
+      ));
+
+      return parent;
+    }
+
+    public void AddSynonymType(SynonymType item) {
+      body.Add((ModuleItem)ModuleItem.create_SynonymType(item));
+    }
+
+    public void AddUnsupported(string why) {
+      body.Add((ModuleItem)ModuleItem.create_Module(ModuleContainer.UnsupportedToModule(why)));
+    }
+  }
+
+  interface ClassContainer : Container {
+    void AddClass(Class item);
+
+    public ClassBuilder Class(string name, string enclosingModule, List<DAST.TypeArgDecl> typeParams, List<DAST.Type> superClasses, ISequence<_IAttribute> attributes, string docString) {
+      return new ClassBuilder(this, name, docString, enclosingModule, typeParams, superClasses, attributes);
+    }
+  }
+
+
+
+  class ClassBuilder : ClassLike {
+    readonly ClassContainer parent;
+    readonly string name;
+    readonly string enclosingModule;
+    readonly List<DAST.TypeArgDecl> typeParams;
+    readonly List<DAST.Type> superClasses;
+    readonly List<DAST.Field> fields = new();
+    readonly List<DAST.Method> body = new();
+    readonly ISequence<_IAttribute> attributes;
+    private string docString;
+
+    public ClassBuilder(ClassContainer parent, string name, string docString, string enclosingModule, List<DAST.TypeArgDecl> typeParams, List<DAST.Type> superClasses, ISequence<_IAttribute> attributes) {
+      this.parent = parent;
+      this.name = name;
+      this.enclosingModule = enclosingModule;
+      this.typeParams = typeParams;
+      this.superClasses = superClasses;
+      this.attributes = attributes;
+      this.docString = docString;
+    }
+
+    public void AddMethod(DAST.Method item) {
+      body.Add(item);
+    }
+
+    public void AddField(DAST.Formal item, bool isConstant, _IOption<DAST._IExpression> defaultValue, bool isStatic) {
+      fields.Add((DAST.Field)DAST.Field.create_Field(item, isConstant, defaultValue, isStatic));
+    }
+
+    public object Finish() {
+      parent.AddClass((Class)Class.create(
+        Sequence<Rune>.UnicodeFromString(this.name),
+        Sequence<Rune>.UnicodeFromString(this.docString),
+        Sequence<Rune>.UnicodeFromString(this.enclosingModule),
+        Sequence<DAST.TypeArgDecl>.FromArray(this.typeParams.ToArray()),
+        Sequence<DAST.Type>.FromArray(this.superClasses.ToArray()),
+        Sequence<DAST.Field>.FromArray(this.fields.ToArray()),
+        Sequence<DAST.Method>.FromArray(body.ToArray()),
+        attributes
+      ));
+      return parent;
+    }
+  }
+
+  interface TraitContainer : Container {
+    void AddTrait(Trait item);
+
+    public TraitBuilder Trait(string name, List<DAST.TypeArgDecl> typeParams, List<DAST.Type> parents,
+      ISequence<_IAttribute> attributes, string docString, _ITraitType traitType) {
+      return new TraitBuilder(this, name, docString, typeParams, parents, attributes, traitType);
+    }
+  }
+
+  class TraitBuilder : ClassLike {
+    readonly TraitContainer parent;
+    readonly string name;
+    readonly List<DAST.TypeArgDecl> typeParams;
+    private readonly List<DAST.Type> parents;
+    readonly List<DAST.Method> body = new();
+    private ISequence<_IAttribute> attributes;
+    private string docString;
+    private _ITraitType traitType;
+
+    public TraitBuilder(TraitContainer parent, string name, string docString, List<DAST.TypeArgDecl> typeParams, List<DAST.Type> parents, ISequence<_IAttribute> attributes, _ITraitType traitType) {
+      this.parent = parent;
+      this.name = name;
+      this.typeParams = typeParams;
+      this.attributes = attributes;
+      this.docString = docString;
+      this.traitType = traitType;
+      this.parents = parents;
+    }
+
+    public void AddMethod(DAST.Method item) {
+      // remove existing method with the same name, because we're going to define an implementation
+      for (int i = 0; i < body.Count; i++) {
+        if (body[i].is_Method && body[i].dtor_name.Equals(item.dtor_name)) {
+          body.RemoveAt(i);
+          break;
+        }
+      }
+
+      body.Add(item);
+    }
+
+    public void AddField(DAST.Formal item, bool isConstant, _IOption<DAST._IExpression> defaultValue, bool isStatic) {
+      this.parent.AddUnsupported("var/const fro trait - " + item.dtor_name);
+    }
+
+    public object Finish() {
+      parent.AddTrait((Trait)Trait.create(
+        Sequence<Rune>.UnicodeFromString(this.name),
+        Sequence<Rune>.UnicodeFromString(this.docString),
+        Sequence<DAST.TypeArgDecl>.FromArray(typeParams.ToArray()),
+        traitType,
+        Sequence<DAST.Type>.FromArray(parents.ToArray()),
+        Sequence<DAST.Method>.FromArray(body.ToArray()),
+        attributes)
+      );
+      return parent;
+    }
+  }
+
+  interface NewtypeContainer : Container {
+    void AddNewtype(Newtype item);
+
+    public NewtypeBuilder Newtype(string name, List<DAST.TypeArgDecl> typeParams,
+      DAST.Type baseType, NewtypeRange newtypeRange, Option<DAST.NewtypeConstraint> constraint, List<DAST.Statement> witnessStmts, DAST.Expression witness,
+      ISequence<_IAttribute> attributes, string docString) {
+      return new NewtypeBuilder(this, name, typeParams, newtypeRange, baseType, constraint, witnessStmts, witness, attributes, docString);
+    }
+  }
+
+  class NewtypeBuilder : ClassLike {
+    readonly NewtypeContainer parent;
+    readonly string name;
+    readonly List<DAST.TypeArgDecl> typeParams;
+    readonly DAST.Type baseType;
+    private readonly Option<DAST.NewtypeConstraint> constraint;
+    private readonly DAST.NewtypeRange newtypeRange;
+    readonly List<DAST.Statement> witnessStmts;
+    readonly DAST.Expression witness;
+    private ISequence<_IAttribute> attributes;
+    private readonly List<DAST._IMethod> methods;
+    private string docString;
+
+    public NewtypeBuilder(NewtypeContainer parent, string name, List<TypeArgDecl> typeParams,
+      NewtypeRange newtypeRange, DAST.Type baseType, Option<DAST.NewtypeConstraint> constraint, List<DAST.Statement> statements,
+      DAST.Expression witness,
+      ISequence<_IAttribute> attributes, string docString) {
+      this.parent = parent;
+      this.name = name;
+      this.typeParams = typeParams;
+      this.newtypeRange = newtypeRange;
+      this.baseType = baseType;
+      this.constraint = constraint;
+      this.witnessStmts = statements;
+      this.witness = witness;
+      this.attributes = attributes;
+      this.docString = docString;
+      this.methods = new();
+    }
+
+    public void AddMethod(DAST.Method item) {
+      methods.Add(item);
+    }
+
+    public void AddField(DAST.Formal item, bool isConstant, _IOption<DAST._IExpression> defaultValue, bool isStatic) {
+      parent.AddUnsupported("Newtype field " + item.dtor_name);
+    }
+
+    public object Finish() {
+      parent.AddNewtype((Newtype)Newtype.create(
+        Sequence<Rune>.UnicodeFromString(this.name),
+        Sequence<Rune>.UnicodeFromString(this.docString),
+        Sequence<DAST.TypeArgDecl>.FromArray(this.typeParams.ToArray()),
+        this.baseType,
+        newtypeRange,
+        constraint,
+        Sequence<DAST.Statement>.FromArray(this.witnessStmts.ToArray()),
+        this.witness == null
+          ? Option<DAST._IExpression>.create_None()
+          : Option<DAST._IExpression>.create_Some(this.witness),
+        attributes,
+        Sequence<DAST._IMethod>.FromArray(methods.ToArray())
+      ));
+      return parent;
+    }
+  }
+
+  interface SynonymTypeContainer : Container {
+    void AddSynonymType(SynonymType item);
+
+    public SynonymTypeBuilder SynonymType(string name, List<DAST.TypeArgDecl> typeParams,
+      DAST.Type rhsType, List<DAST.Statement> witnessStmts, DAST.Expression witness,
+      ISequence<_IAttribute> attributes, string docString) {
+      return new SynonymTypeBuilder(this, name, typeParams, rhsType, witnessStmts, witness, attributes, docString);
+    }
+  }
+
+  class SynonymTypeBuilder {
+    readonly SynonymTypeContainer parent;
+    readonly string name;
+    readonly List<DAST.TypeArgDecl> typeParams;
+    readonly DAST.Type rhsType;
+    readonly List<DAST.Statement> witnessStmts;
+    readonly DAST.Expression witness;
+    private ISequence<_IAttribute> attributes;
+    private string docString;
+
+    public SynonymTypeBuilder(SynonymTypeContainer parent, string name, List<DAST.TypeArgDecl> typeParams,
+      DAST.Type rhsType, List<DAST.Statement> statements, DAST.Expression witness,
+      ISequence<_IAttribute> attributes, string docString) {
+      this.parent = parent;
+      this.name = name;
+      this.typeParams = typeParams;
+      this.rhsType = rhsType;
+      this.witnessStmts = statements;
+      this.witness = witness;
+      this.attributes = attributes;
+      this.docString = docString;
+    }
+
+    public object Finish() {
+      parent.AddSynonymType((SynonymType)SynonymType.create(
+        Sequence<Rune>.UnicodeFromString(this.name),
+        Sequence<Rune>.UnicodeFromString(this.docString),
+        Sequence<DAST.TypeArgDecl>.FromArray(this.typeParams.ToArray()),
+        this.rhsType,
+        Sequence<DAST.Statement>.FromArray(this.witnessStmts.ToArray()),
+        this.witness == null
+          ? Option<DAST._IExpression>.create_None()
+          : Option<DAST._IExpression>.create_Some(this.witness),
+        attributes
+      ));
+      return parent;
+    }
+  }
+
+  interface DatatypeContainer : Container {
+    void AddDatatype(Datatype item);
+
+    public DatatypeBuilder Datatype(string name, string enclosingModule, List<DAST.TypeArgDecl> typeParams,
+      List<DAST.DatatypeCtor> ctors, bool isCo, ISequence<_IAttribute> attributes, string docString, List<DAST.Type> superTraitTypes) {
+      return new DatatypeBuilder(this, name, docString, enclosingModule, typeParams, ctors, isCo, attributes, superTraitTypes);
+    }
+  }
+
+  class DatatypeBuilder : ClassLike {
+    readonly DatatypeContainer parent;
+    readonly string name;
+    readonly string enclosingModule;
+    readonly List<DAST.TypeArgDecl> typeParams;
+    readonly List<DAST.DatatypeCtor> ctors;
+    readonly bool isCo;
+    readonly List<DAST.Method> body = new();
+    private ISequence<_IAttribute> attributes;
+    private string docString;
+    private List<DAST.Type> superTraitTypes;
+
+    public DatatypeBuilder(DatatypeContainer parent, string name, string docString, string enclosingModule, List<DAST.TypeArgDecl> typeParams, List<DAST.DatatypeCtor> ctors, bool isCo, ISequence<_IAttribute> attributes, List<DAST.Type> superTraitTypes) {
+      this.parent = parent;
+      this.name = name;
+      this.docString = docString;
+      this.typeParams = typeParams;
+      this.enclosingModule = enclosingModule;
+      this.ctors = ctors;
+      this.isCo = isCo;
+      this.attributes = attributes;
+      this.superTraitTypes = superTraitTypes;
+    }
+
+    public void AddMethod(DAST.Method item) {
+      body.Add(item);
+    }
+
+    public void AddField(DAST.Formal item, bool isConstant, _IOption<DAST._IExpression> defaultValue, bool isStatic) {
+      parent.AddUnsupported("Datatype field " + item.dtor_name);
+    }
+
+    public object Finish() {
+      parent.AddDatatype((Datatype)Datatype.create(
+        Sequence<Rune>.UnicodeFromString(this.name),
+        Sequence<Rune>.UnicodeFromString(this.docString),
+        Sequence<Rune>.UnicodeFromString(this.enclosingModule),
+        Sequence<DAST.TypeArgDecl>.FromArray(typeParams.ToArray()),
+        Sequence<DAST.DatatypeCtor>.FromArray(ctors.ToArray()),
+        Sequence<DAST.Method>.FromArray(body.ToArray()),
+        this.isCo, attributes,
+        Sequence<DAST.Type>.FromArray(superTraitTypes.ToArray())
+      ));
+      return parent;
+    }
+  }
+
+  interface ClassLike {
+    void AddMethod(DAST.Method item);
+
+    void AddField(DAST.Formal item, bool isConstant, _IOption<DAST._IExpression> defaultValue, bool isStatic);
+
+    public MethodBuilder Method(bool isStatic, bool hasBody, bool outVarsAreUninitFieldsToAssign, bool wasFunction,
+      ISequence<ISequence<Rune>> overridingPath,
+      string docString,
+      ISequence<_IAttribute> attributes,
+      string name,
+      List<TypeArgDecl> typeArgs,
+      Sequence<DAST.Formal> params_,
+      List<DAST.Type> outTypes, List<ISequence<Rune>> outVars) {
+      return new MethodBuilder(this, isStatic, hasBody, outVarsAreUninitFieldsToAssign, wasFunction, overridingPath, docString, attributes, name, typeArgs, params_, outTypes, outVars);
+    }
+
+    public object Finish();
+  }
+
+  class MethodBuilder : StatementContainer {
+    readonly ClassLike parent;
+    readonly string name;
+    readonly bool isStatic;
+    readonly bool hasBody;
+    readonly bool outVarsAreUninitFieldsToAssign;
+    readonly bool wasFunction;
+    readonly ISequence<ISequence<Rune>> overridingPath;
+    readonly List<DAST.TypeArgDecl> typeArgs;
+    readonly Sequence<DAST.Formal> params_;
+    readonly List<DAST.Type> outTypes;
+    readonly List<ISequence<Rune>> outVars;
+    readonly List<object> body = new();
+    private ISequence<_IAttribute> attributes;
+    private ISequence<Rune> docString;
+
+    public MethodBuilder(
+      ClassLike parent,
+      bool isStatic, bool hasBody, bool outVarsAreUninitFieldsToAssign, bool wasFunction,
+      ISequence<ISequence<Rune>> overridingPath,
+      string docString,
+      ISequence<_IAttribute> attributes,
+      string name,
+      List<DAST.TypeArgDecl> typeArgs,
+      Sequence<DAST.Formal> params_,
+      List<DAST.Type> outTypes, List<ISequence<Rune>> outVars
+    ) {
+      this.parent = parent;
+      this.isStatic = isStatic;
+      this.hasBody = hasBody;
+      this.outVarsAreUninitFieldsToAssign = outVarsAreUninitFieldsToAssign;
+      this.wasFunction = wasFunction;
+      this.overridingPath = overridingPath;
+      this.docString = Sequence<Rune>.UnicodeFromString(docString);
+      this.attributes = attributes;
+      this.name = name;
+      this.typeArgs = typeArgs;
+      this.params_ = params_;
+      this.outTypes = outTypes;
+      this.outVars = outVars;
+    }
+
+    public List<object> ForkList() {
+      var ret = new List<object>();
+      body.Add(ret);
+      return ret;
+    }
+
+    public void AddStatement(DAST.Statement item) {
+      body.Add(item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      body.Add(item);
+    }
+
+    public DAST.Method Build() {
+      List<DAST.Statement> builtStatements = new();
+      StatementContainer.RecursivelyBuild(body, builtStatements);
+      return (DAST.Method)DAST.Method.create(
+        docString,
+        attributes,
+        isStatic,
+        hasBody,
+        outVarsAreUninitFieldsToAssign,
+        wasFunction,
+        overridingPath != null ? Option<ISequence<ISequence<Rune>>>.create_Some(overridingPath) : Option<ISequence<ISequence<Rune>>>.create_None(),
+        Sequence<Rune>.UnicodeFromString(this.name),
+        Sequence<DAST.TypeArgDecl>.FromArray(typeArgs.ToArray()),
+        params_,
+        Sequence<DAST.Statement>.FromArray(builtStatements.ToArray()),
+        Sequence<DAST.Type>.FromArray(outTypes.ToArray()),
+        outVars != null ? Option<ISequence<ISequence<Rune>>>.create_Some(Sequence<ISequence<Rune>>.FromArray(outVars.ToArray())) : Option<ISequence<ISequence<Rune>>>.create_None()
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddStatement(StatementContainer.UnsupportedToStatement(why));
+    }
+  }
+
+  interface StatementContainer : Container {
+    void AddStatement(DAST.Statement item);
+
+    void AddBuildable(BuildableStatement item);
+
+    public static DAST.Statement UnsupportedToStatement(string why) {
+      return (DAST.Statement)DAST.Statement.create_Print(ExprContainer.UnsupportedToExpr(why));
+    }
+
+    List<object> ForkList();
+
+    public StatementContainer Fork() {
+      return new ForkedStatementContainer(ForkList());
+    }
+
+    protected static void RecursivelyBuild(List<object> body, List<DAST.Statement> builtStatements) {
+      foreach (var maybeBuilt in body) {
+        if (maybeBuilt is DAST.Statement built) {
+          builtStatements.Add(built);
+        } else if (maybeBuilt is BuildableStatement buildable) {
+          builtStatements.Add(buildable.Build());
+        } else if (maybeBuilt is List<object> rec) {
+          RecursivelyBuild(rec, builtStatements);
+        } else {
+          throw new InvalidOperationException("Unknown buildable type");
+        }
+      }
+    }
+
+    public void Print(DAST.Expression expr) {
+      AddStatement((DAST.Statement)DAST.Statement.create_Print(expr));
+    }
+
+    public AssignBuilder Assign() {
+      var ret = new AssignBuilder();
+      AddBuildable(ret);
+      return ret;
+    }
+
+    public DeclareBuilder DeclareAndAssign(DAST.Type type, string name) {
+      var ret = new DeclareBuilder(type, name);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    public IfElseBuilder IfElse() {
+      var ret = new IfElseBuilder();
+      AddBuildable(ret);
+      return ret;
+    }
+
+    public WhileBuilder While() {
+      var ret = new WhileBuilder();
+      AddBuildable(ret);
+      return ret;
+    }
+
+    public ForeachBuilder Foreach(string boundName, DAST.Type boundType) {
+      var ret = new ForeachBuilder(boundName, boundType);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    public TailRecursiveBuilder TailRecursive() {
+      var ret = new TailRecursiveBuilder();
+      AddBuildable(ret);
+      return ret;
+    }
+
+    public CallStmtBuilder Call(ISequence<_IFormal> signature) {
+      var ret = new CallStmtBuilder(signature);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    public ReturnBuilder Return() {
+      var ret = new ReturnBuilder();
+      AddBuildable(ret);
+      return ret;
+    }
+
+    public LabeledBuilder Labeled(string label) {
+      var ret = new LabeledBuilder(label);
+      AddBuildable(ret);
+      return ret;
+    }
+  }
+
+  interface BuildableStatement {
+    DAST.Statement Build();
+  }
+
+  class ForkedStatementContainer : StatementContainer {
+    readonly List<object> list;
+
+    public ForkedStatementContainer(List<object> list) {
+      this.list = list;
+    }
+
+    public void AddStatement(DAST.Statement item) {
+      list.Add(item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      list.Add(item);
+    }
+
+    public List<object> ForkList() {
+      var ret = new List<object>();
+      list.Add(ret);
+      return ret;
+    }
+
+    public void AddUnsupported(string why) {
+      AddStatement(StatementContainer.UnsupportedToStatement(why));
+    }
+  }
+
+  class DeclareBuilder : ExprContainer, BuildableStatement {
+    readonly DAST.Type type;
+    readonly string name;
+    public object value;
+
+    public DeclareBuilder(DAST.Type type, string name) {
+      this.type = type;
+      this.name = name;
+    }
+
+    public void AddExpr(DAST.Expression value) {
+      if (this.value != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.value = value;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr value) {
+      if (this.value != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.value = value;
+      }
+    }
+
+    public DAST.Statement Build() {
+      if (this.value == null) {
+        return (DAST.Statement)DAST.Statement.create_DeclareVar(
+          Sequence<Rune>.UnicodeFromString(name), type, Option<DAST._IExpression>.create_None());
+      } else {
+        var builtValue = new List<DAST.Expression>();
+        ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
+        return (DAST.Statement)DAST.Statement.create_DeclareVar(Sequence<Rune>.UnicodeFromString(name), type, Option<DAST._IExpression>.create_Some(builtValue[0]));
+      }
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(Compilers.ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class AssignBuilder : LhsContainer, ExprContainer, BuildableStatement {
+    object lhs = null;
+    public object value;
+
+    public void AddLhs(DAST.AssignLhs lhs) {
+      if (this.lhs != null && this.lhs != lhs) {
+        throw new InvalidOperationException("Cannot change name of variable in assignment: " + this.lhs + " -> " + lhs);
+      } else {
+        this.lhs = lhs;
+      }
+    }
+
+    public void AddBuildable(BuildableLhs lhs) {
+      if (this.lhs != null && this.lhs != lhs) {
+        throw new InvalidOperationException("Cannot change name of variable in assignment: " + this.lhs + " -> " + lhs);
+      } else {
+        this.lhs = lhs;
+      }
+    }
+
+    public void AddExpr(DAST.Expression value) {
+      if (this.value != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.value = value;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr value) {
+      if (this.value != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.value = value;
+      }
+    }
+    public void AddUnsupported(string why) {
+      AddExpr(Compilers.ExprContainer.UnsupportedToExpr(why));
+    }
+
+    public DAST.Statement Build() {
+
+      var builtLhs = LhsContainer.Build(lhs);
+      DAST.Expression rhs;
+      if (this.value == null) {
+        rhs = ExprContainer.UnsupportedToExpr("<i>Cannot assign null value to variable</i>: " + lhs);
+      } else {
+        var builtValue = new List<DAST.Expression>();
+        ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
+        rhs = builtValue[0];
+      }
+
+      return (DAST.Statement)DAST.Statement.create_Assign(builtLhs, rhs);
+    }
+  }
+
+  class IfElseBuilder : ExprContainer, StatementContainer, BuildableStatement {
+    object condition = null;
+    readonly List<object> ifBody = new();
+    readonly List<object> elseBody = new();
+
+    public object Condition => condition;
+
+    public IfElseBuilder() { }
+
+    public void AddExpr(DAST.Expression value) {
+      if (condition != null) {
+        throw new InvalidOperationException();
+      } else {
+        condition = value;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr value) {
+      if (condition != null) {
+        throw new InvalidOperationException();
+      } else {
+        condition = value;
+      }
+    }
+
+    public void AddStatement(DAST.Statement item) {
+      ifBody.Add(item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      ifBody.Add(item);
+    }
+
+    public List<object> ForkList() {
+      var ret = new List<object>();
+      this.ifBody.Add(ret);
+      return ret;
+    }
+
+    public void AddElseStatement(DAST.Statement item) {
+      elseBody.Add(item);
+    }
+
+    public void AddElseBuildable(BuildableStatement item) {
+      elseBody.Add(item);
+    }
+
+    public List<object> ElseForkList() {
+      var ret = new List<object>();
+      this.elseBody.Add(ret);
+      return ret;
+    }
+
+    public ElseBuilder Else() {
+      return new ElseBuilder(this);
+    }
+
+    public DAST.Statement Build() {
+      List<DAST.Expression> builtCondition = new();
+      ExprContainer.RecursivelyBuild(new List<object> {
+        condition ?? ExprContainer.UnsupportedToExpr("<i>condition to if expression</i>")
+      }, builtCondition);
+
+      List<DAST.Statement> builtIfStatements = new();
+      StatementContainer.RecursivelyBuild(ifBody, builtIfStatements);
+
+      List<DAST.Statement> builtElseStatements = new();
+      StatementContainer.RecursivelyBuild(elseBody, builtElseStatements);
+
+      return (DAST.Statement)DAST.Statement.create_If(
+        builtCondition[0],
+        Sequence<DAST.Statement>.FromArray(builtIfStatements.ToArray()),
+        Sequence<DAST.Statement>.FromArray(builtElseStatements.ToArray())
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      condition = ExprContainer.UnsupportedToExpr(why);
+    }
+  }
+
+  class ElseBuilder : StatementContainer {
+    public readonly IfElseBuilder parent;
+
+    public ElseBuilder(IfElseBuilder parent) {
+      this.parent = parent;
+    }
+
+    public List<object> ForkList() {
+      return parent.ElseForkList();
+    }
+
+    public void AddStatement(DAST.Statement item) {
+      parent.AddElseStatement(item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      parent.AddElseBuildable(item);
+    }
+
+    public void AddUnsupported(string why) {
+      AddStatement(StatementContainer.UnsupportedToStatement(why));
+    }
+  }
+
+  class WhileBuilder : ExprContainer, StatementContainer, BuildableStatement {
+    object condition = null;
+    readonly List<object> body = new();
+    public object Condition => condition;
+
+    public void AddExpr(DAST.Expression value) {
+      if (condition != null) {
+        throw new InvalidOperationException();
+      } else {
+        condition = value;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr value) {
+      if (condition != null) {
+        throw new InvalidOperationException();
+      } else {
+        condition = value;
+      }
+    }
+
+    public void AddStatement(DAST.Statement item) {
+      body.Add(item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      body.Add(item);
+    }
+
+    public List<object> ForkList() {
+      var ret = new List<object>();
+      this.body.Add(ret);
+      return ret;
+    }
+
+    public DAST.Statement Build() {
+      List<DAST.Expression> builtCondition = new();
+      ExprContainer.RecursivelyBuild(new List<object> { condition }, builtCondition);
+
+      List<DAST.Statement> builtStatements = new();
+      StatementContainer.RecursivelyBuild(body, builtStatements);
+
+      return (DAST.Statement)DAST.Statement.create_While(
+        builtCondition[0],
+        Sequence<DAST.Statement>.FromArray(builtStatements.ToArray())
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddStatement(StatementContainer.UnsupportedToStatement(why));
+    }
+  }
+
+  class ForeachBuilder : ExprContainer, StatementContainer, BuildableStatement {
+    readonly string boundName;
+    readonly DAST.Type boundType;
+    object over = null;
+    readonly List<object> body = new();
+
+    public ForeachBuilder(string boundName, DAST.Type boundType) {
+      this.boundName = boundName;
+      this.boundType = boundType;
+    }
+
+    public void AddExpr(DAST.Expression value) {
+      if (over != null) {
+        throw new InvalidOperationException();
+      } else {
+        over = value;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr value) {
+      if (over != null) {
+        throw new InvalidOperationException();
+      } else {
+        over = value;
+      }
+    }
+
+    public void AddStatement(DAST.Statement item) {
+      body.Add(item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      body.Add(item);
+    }
+
+    public List<object> ForkList() {
+      var ret = new List<object>();
+      this.body.Add(ret);
+      return ret;
+    }
+
+    public DAST.Statement Build() {
+      List<DAST.Expression> builtOver = new();
+      ExprContainer.RecursivelyBuild(new List<object> {
+        over ?? ExprContainer.UnsupportedToExpr("<i>Foreach over is null</i>")
+      }, builtOver);
+
+      List<DAST.Statement> builtStatements = new();
+      StatementContainer.RecursivelyBuild(body, builtStatements);
+
+      return (DAST.Statement)DAST.Statement.create_Foreach(
+        Sequence<Rune>.UnicodeFromString(boundName),
+        boundType,
+        builtOver[0],
+        Sequence<DAST.Statement>.FromArray(builtStatements.ToArray())
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddStatement(StatementContainer.UnsupportedToStatement(why));
+    }
+  }
+
+  class TailRecursiveBuilder : StatementContainer, BuildableStatement {
+    readonly List<object> body = new();
+
+    public TailRecursiveBuilder() { }
+
+    public void AddStatement(DAST.Statement item) {
+      body.Add(item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      body.Add(item);
+    }
+
+    public List<object> ForkList() {
+      var ret = new List<object>();
+      this.body.Add(ret);
+      return ret;
+    }
+
+    public DAST.Statement Build() {
+      List<DAST.Statement> builtStatements = new();
+      StatementContainer.RecursivelyBuild(body, builtStatements);
+
+      return (DAST.Statement)DAST.Statement.create_TailRecursive(
+        Sequence<DAST.Statement>.FromArray(builtStatements.ToArray())
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddStatement(StatementContainer.UnsupportedToStatement(why));
+    }
+  }
+
+  class CallStmtBuilder : ExprContainer, BuildableStatement {
+    object on = null;
+    DAST.CallName name = null;
+    List<DAST.Type> typeArgs = null;
+    readonly List<object> args = new();
+    List<ISequence<Rune>> outs = null;
+    public readonly ISequence<_IFormal> Signature;
+
+    public CallStmtBuilder(ISequence<_IFormal> signature) {
+      this.Signature = signature;
+    }
+
+    public void SetName(CallName name) {
+      if (this.name != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.name = name;
+      }
+    }
+
+    public void SetTypeArgs(List<DAST.Type> typeArgs) {
+      if (this.typeArgs != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.typeArgs = typeArgs;
+      }
+    }
+
+    public void AddExpr(DAST.Expression value) {
+      if (on == null) {
+        on = value;
+      } else {
+        args.Add(value);
+      }
+    }
+
+    public void AddBuildable(BuildableExpr value) {
+      if (on == null) {
+        on = value;
+      } else {
+        args.Add(value);
+      }
+    }
+
+    public void SetOuts(List<ISequence<Rune>> outs) {
+      if (this.outs != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.outs = outs;
+      }
+    }
+
+    public DAST.Statement Build() {
+      List<DAST.Expression> builtOn = new();
+      ExprContainer.RecursivelyBuild(new List<object> { on }, builtOn);
+
+      List<DAST.Expression> builtArgs = new();
+      ExprContainer.RecursivelyBuild(args, builtArgs);
+
+      return (DAST.Statement)DAST.Statement.create_Call(
+        builtOn[0],
+        name,
+        Sequence<DAST.Type>.FromArray(typeArgs.ToArray()),
+        Sequence<DAST.Expression>.FromArray(builtArgs.ToArray()),
+        outs == null ? Option<ISequence<ISequence<Rune>>>.create_None() : Option<ISequence<ISequence<Rune>>>.create_Some(Sequence<ISequence<Rune>>.FromArray(outs.ToArray()))
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class ReturnBuilder : ExprContainer, BuildableStatement {
+    object value = null;
+
+    public ReturnBuilder() { }
+
+    public void AddExpr(DAST.Expression value) {
+      if (this.value != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.value = value;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr value) {
+      if (this.value != null) {
+        AddUnsupported("Second value for ReturnBuilder");
+      } else {
+        this.value = value;
+      }
+    }
+
+    public DAST.Statement Build() {
+      var builtValue = new List<DAST.Expression>();
+      if (value == null) {
+        return (DAST.Statement)DAST.Statement.create_EarlyReturn();
+      }
+      ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
+
+      return (DAST.Statement)DAST.Statement.create_Return(builtValue[0]);
+    }
+
+    public void AddUnsupported(string why) {
+      value = ExprContainer.UnsupportedToExpr(why);
+    }
+  }
+
+  class LabeledBuilder : BuildableStatement, StatementContainer {
+    readonly string label;
+    readonly List<object> statements = new();
+
+    public LabeledBuilder(string label) {
+      this.label = label;
+    }
+
+    public void AddStatement(DAST.Statement item) {
+      statements.Add(item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      statements.Add(item);
+    }
+
+    public StatementContainer Fork() {
+      return new ForkedStatementContainer(ForkList());
+    }
+
+    public List<object> ForkList() {
+      var ret = new List<object>();
+      statements.Add(ret);
+      return ret;
+    }
+
+    public DAST.Statement Build() {
+      List<DAST.Statement> builtStatements = new();
+      StatementContainer.RecursivelyBuild(statements, builtStatements);
+
+      return (DAST.Statement)DAST.Statement.create_Labeled(
+        Sequence<Rune>.UnicodeFromString(label),
+        Sequence<DAST.Statement>.FromArray(builtStatements.ToArray())
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddStatement(StatementContainer.UnsupportedToStatement(why));
+    }
+  }
+
+  class NoStatementBuffer : StatementContainer {
+    public void AddUnsupported(string why) {
+      throw new Exception(why);
+    }
+
+    public void AddStatement(DAST.Statement item) {
+      throw new Exception("<i>Add statements in pure expressions</i>, in a context where statements can't be added, tried to add " + item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      throw new Exception("<i>Add buildable statements in pure expressions</i>, in a context where statements can't be added, tried to add " + item);
+    }
+
+    public List<object> ForkList() {
+      throw new Exception("<i>Fork statements in pure expressions</i>, in a context where statements can't be added");
+    }
+  }
+
+  class StatementBuffer : StatementContainer {
+    readonly List<object> statements = new();
+
+    public void AddStatement(DAST.Statement item) {
+      statements.Add(item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      statements.Add(item);
+    }
+
+    public List<object> ForkList() {
+      var ret = new List<object>();
+      statements.Add(ret);
+      return ret;
+    }
+
+    public List<DAST.Statement> PopAll() {
+      var builtResult = new List<DAST.Statement>();
+      StatementContainer.RecursivelyBuild(statements, builtResult);
+
+      return builtResult;
+    }
+
+    public void AddUnsupported(string why) {
+      AddStatement(StatementContainer.UnsupportedToStatement(why));
+    }
+  }
+
+  class ExprWrapper : ExprContainer, BuildableExpr {
+    public Func<DAST.Expression, DAST.Expression> InternalWrapper;
+    [CanBeNull] public object Expr;
+
+    public ExprWrapper(Func<DAST.Expression, DAST.Expression> internalWrapper = null) {
+      this.InternalWrapper = internalWrapper;
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      if (Expr == null) {
+        Expr = item;
+      } else {
+        throw new InvalidOperationException("AddExpr already had an object");
+      }
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      if (Expr == null) {
+        Expr = item;
+      } else {
+        throw new InvalidOperationException("AddExpr already had an object");
+      }
+    }
+
+    public DAST.Expression Finish() {
+      if (Expr == null) {
+        return ExprContainer.UnsupportedToExpr("Expected exactly one expression for ExprWrapper, got none");
+      } else if (Expr is BuildableExpr b) {
+        return b.Build();
+      } else if (Expr is DAST.Expression e) {
+        return e;
+      } else {
+        return ExprContainer.UnsupportedToExpr("Expected exactly one expression for ExprWrapper, got " + Expr);
+      }
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+
+    public DAST.Expression Build() {
+      if (InternalWrapper == null) {
+        return Finish();
+      } else {
+        return InternalWrapper(Finish());
+      }
+    }
+  }
+
+  class ExprBuffer : ExprContainer, BuildableExpr {
+    Stack<object> exprs = new();
+    public readonly object parent;
+
+    public ExprBuffer(object returnTo) {
+      this.parent = returnTo;
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      exprs.Push(item);
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      exprs.Push(item);
+    }
+
+    public List<DAST.Expression> PopN(int n) {
+      if (exprs.Count < n) {
+        throw new InvalidOperationException();
+      } else {
+        var result = new List<object>();
+        for (int i = 0; i < n; i++) {
+          result.Insert(0, exprs.Pop());
+        }
+
+        var builtResult = new List<DAST.Expression>();
+        ExprContainer.RecursivelyBuild(result, builtResult);
+
+        return builtResult;
+      }
+    }
+
+    public List<DAST.Expression> PopAll() {
+      return PopN(exprs.Count);
+    }
+
+    public DAST.Expression Finish() {
+      if (exprs.Count != 1) {
+        return ExprContainer.UnsupportedToExpr("Expected exactly one expression in buffer, got " +
+                                               exprs.Comma(e => e.ToString()));
+      } else {
+        return PopN(1)[0];
+      }
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+
+    public DAST.Expression Build() {
+      return Finish();
+    }
+  }
+
+  interface ExprContainer : Container {
+    void AddExpr(DAST.Expression item);
+
+    void AddBuildable(BuildableExpr item);
+
+    ExprWrapper Wrapper(Func<DAST.Expression, DAST.Expression> wrapper) {
+      var ret = new ExprWrapper(wrapper);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    BinOpBuilder BinOp(DAST.BinOp op, DAST.Type leftType, DAST.Type rightType, DAST.Type resType) {
+      var ret = new BinOpBuilder(op, leftType, rightType, resType);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    BinOpBuilder BinOp(string op, Func<DAST.Expression, DAST.Expression, DAST.Expression> callback) {
+      var ret = new BinOpBuilder(op, callback);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    CallExprBuilder Call(ISequence<_IFormal> signature) {
+      var ret = new CallExprBuilder(signature);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    ApplyExprBuilder Apply() {
+      var ret = new ApplyExprBuilder();
+      AddBuildable(ret);
+      return ret;
+    }
+
+    LambdaExprBuilder Lambda(List<DAST.Formal> formals, DAST.Type retType) {
+      var ret = new LambdaExprBuilder(formals, retType);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    IIFEExprBuilder IIFE(string name, DAST.Type tpe) {
+      var ret = new IIFEExprBuilder(name, tpe);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    BetaRedexBuilder BetaRedex(List<_System.Tuple2<DAST.Formal, DAST.Expression>> bindings, DAST.Type retType) {
+      var ret = new BetaRedexBuilder(bindings, retType);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    ConvertBuilder Convert(DAST.Type fromType, DAST.Type toType) {
+      var ret = new ConvertBuilder(fromType, toType);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    IndexBuilder Index(List<DAST.Expression> indices, DAST._ICollKind collKind) {
+      var ret = new IndexBuilder(indices, collKind);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    protected static void RecursivelyBuild(List<object> body, List<DAST.Expression> builtExprs) {
+      foreach (var maybeBuilt in body) {
+        if (maybeBuilt is DAST.Expression built) {
+          builtExprs.Add(built);
+        } else if (maybeBuilt is BuildableExpr buildable) {
+          builtExprs.Add(buildable.Build());
+        } else {
+          throw new InvalidOperationException(
+            "Unknown buildable type: " +
+            (maybeBuilt == null ? "NULL" :
+             maybeBuilt.GetType())
+            );
+        }
+      }
+    }
+
+    static DAST.Expression UnsupportedToExpr(string why) {
+      return (DAST.Expression)DAST.Expression.create_Ident(
+        Sequence<ISequence<Rune>>.UnicodeFromString($"uncompilable(\"<i>Unsupported: {why}</i>\")")
+      );
+    }
+  }
+
+  interface LhsContainer : Container {
+    void AddLhs(DAST.AssignLhs lhs);
+
+    void AddBuildable(BuildableLhs lhs);
+
+    ArrayLhs Array(List<DAST.Expression> indices) {
+      var ret = new ArrayLhs(indices);
+      AddBuildable(ret);
+      return ret;
+    }
+
+    protected static DAST.AssignLhs Build(object maybeBuilt) {
+      if (maybeBuilt is DAST.AssignLhs built) {
+        return built;
+      } else if (maybeBuilt is BuildableLhs buildable) {
+        return buildable.Build();
+      } else {
+        throw new InvalidOperationException("Unknown buildable type: " + maybeBuilt.GetType());
+      }
+    }
+  }
+
+  interface BuildableLhs {
+    DAST.AssignLhs Build();
+  }
+
+  class ArrayLhs : BuildableLhs, ExprContainer {
+    readonly List<DAST.Expression> indices;
+    object arrayExpr = null;
+    readonly System.Diagnostics.StackTrace stackTrace = new(true);
+
+    public ArrayLhs(List<DAST.Expression> indices) {
+      this.indices = indices;
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      if (arrayExpr != null) {
+        throw new InvalidOperationException();
+      } else {
+        arrayExpr = item;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      if (arrayExpr != null) {
+        throw new InvalidOperationException();
+      } else {
+        arrayExpr = item;
+      }
+    }
+
+    public DAST.AssignLhs Build() {
+      if (arrayExpr == null) {
+        Console.WriteLine(stackTrace);
+      }
+      var builtArrayExpr = new List<DAST.Expression>();
+      ExprContainer.RecursivelyBuild(new List<object> { arrayExpr }, builtArrayExpr);
+
+      return (DAST.AssignLhs)DAST.AssignLhs.create_Index(builtArrayExpr[0], Sequence<DAST.Expression>.FromArray(indices.ToArray()));
+    }
+
+    public void AddUnsupported(string why) {
+      arrayExpr = ExprContainer.UnsupportedToExpr(why);
+    }
+  }
+
+  interface BuildableExpr {
+    DAST.Expression Build();
+  }
+
+  class BinOpBuilder : ExprContainer, BuildableExpr {
+    private readonly Func<DAST.Expression, DAST.Expression, DAST.Expression> internalBuilder;
+    readonly List<object> operands = new();
+    private readonly string op;
+
+    public BinOpBuilder(DAST.BinOp op, DAST.Type leftType, DAST.Type rightType, DAST.Type resType) {
+      this.internalBuilder = (DAST.Expression left, DAST.Expression right) =>
+        (DAST.Expression)DAST.Expression.create_BinOp(
+          DAST.TypedBinOp.create_TypedBinOp(op, leftType, rightType, resType), left, right, new BinaryOpFormat_NoFormat());
+      this.op = op.ToString();
+    }
+
+    public BinOpBuilder(string op, Func<DAST.Expression, DAST.Expression, DAST.Expression> callback) {
+      this.op = op;
+      internalBuilder = callback;
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      operands.Add(item);
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      operands.Add(item);
+    }
+
+    public DAST.Expression Build() {
+      var builtOperands = new List<DAST.Expression>();
+      ExprContainer.RecursivelyBuild(operands, builtOperands);
+
+      if (operands.Count != 2) {
+        builtOperands.Insert(0, ExprContainer.UnsupportedToExpr(op + " with not 2 elements"));
+        return (DAST.Expression)DAST.Expression.create_SetValue(
+          Sequence<DAST.Expression>.FromElements(builtOperands.ToArray()));
+      }
+
+      return internalBuilder(builtOperands[0], builtOperands[1]);
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class CallExprBuilder : ExprContainer, BuildableExpr {
+    object on = null;
+    DAST.CallName name = null;
+    List<DAST.Type> typeArgs = null;
+    readonly List<object> args = new();
+    List<ISequence<Rune>> outs = null;
+
+    public ISequence<_IFormal> Signature { get; }
+
+    public CallExprBuilder(ISequence<_IFormal> signature) {
+      Signature = signature;
+    }
+
+    public void SetName(DAST.CallName name) {
+      if (this.name != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.name = name;
+      }
+    }
+
+    public void SetTypeArgs(List<DAST.Type> typeArgs) {
+      if (this.typeArgs != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.typeArgs = typeArgs;
+      }
+    }
+
+    public void AddExpr(DAST.Expression value) {
+      if (on == null) {
+        on = value;
+      } else {
+        args.Add(value);
+      }
+    }
+
+    public void AddBuildable(BuildableExpr value) {
+      if (on == null) {
+        on = value;
+      } else {
+        args.Add(value);
+      }
+    }
+
+    public void SetOuts(List<ISequence<Rune>> outs) {
+      if (this.outs != null) {
+        throw new InvalidOperationException();
+      } else {
+        this.outs = outs;
+      }
+    }
+
+    public DAST.Expression Build() {
+      var builtOn = new List<DAST.Expression>();
+      ExprContainer.RecursivelyBuild(new List<object> { on }, builtOn);
+
+      var builtArgs = new List<DAST.Expression>();
+      ExprContainer.RecursivelyBuild(args, builtArgs);
+
+      return (DAST.Expression)DAST.Expression.create_Call(
+        builtOn[0],
+        name,
+        Sequence<DAST.Type>.FromArray((typeArgs ?? new()).ToArray()),
+        Sequence<DAST.Expression>.FromArray(builtArgs.ToArray())
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class ApplyExprBuilder : ExprContainer, BuildableExpr {
+    object on = null;
+    readonly List<object> args = new();
+
+    public ApplyExprBuilder() { }
+
+    public void AddExpr(DAST.Expression value) {
+      if (on == null) {
+        on = value;
+      } else {
+        args.Add(value);
+      }
+    }
+
+    public void AddBuildable(BuildableExpr value) {
+      if (on == null) {
+        on = value;
+      } else {
+        args.Add(value);
+      }
+    }
+
+    public DAST.Expression Build() {
+      var builtOn = new List<DAST.Expression>();
+      ExprContainer.RecursivelyBuild(new List<object> { on }, builtOn);
+
+      var builtArgs = new List<DAST.Expression>();
+      ExprContainer.RecursivelyBuild(args, builtArgs);
+
+      return (DAST.Expression)DAST.Expression.create_Apply(
+        builtOn[0],
+        Sequence<DAST.Expression>.FromArray(builtArgs.ToArray())
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class LambdaExprBuilder : StatementContainer, BuildableExpr {
+    readonly List<DAST.Formal> formals;
+    readonly DAST.Type retType;
+    readonly List<object> body = new();
+
+    public LambdaExprBuilder(List<DAST.Formal> formals, DAST.Type retType) {
+      this.formals = formals;
+      this.retType = retType;
+    }
+
+    public void AddStatement(DAST.Statement item) {
+      body.Add(item);
+    }
+
+    public void AddBuildable(BuildableStatement item) {
+      body.Add(item);
+    }
+
+    public List<object> ForkList() {
+      var ret = new List<object>();
+      body.Add(ret);
+      return ret;
+    }
+
+    public DAST.Expression Build() {
+      var builtBody = new List<DAST.Statement>();
+      StatementContainer.RecursivelyBuild(body, builtBody);
+
+      return (DAST.Expression)DAST.Expression.create_Lambda(
+        Sequence<DAST.Formal>.FromArray(formals.ToArray()),
+        retType,
+        Sequence<DAST.Statement>.FromArray(builtBody.ToArray())
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddStatement(StatementContainer.UnsupportedToStatement(why));
+    }
+  }
+
+  class IIFEExprBuilder : ExprContainer, BuildableExpr {
+    readonly string name;
+    readonly DAST.Type tpe;
+
+    object body = null;
+    public object value = null;
+
+    public IIFEExprBuilder(string name, DAST.Type tpe) {
+      this.name = name;
+      this.tpe = tpe;
+    }
+
+    public IIFEExprRhs RhsBuilder() {
+      return new IIFEExprRhs(this);
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      if (body != null) {
+        throw new InvalidOperationException();
+      } else {
+        body = item;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      if (body != null) {
+        throw new InvalidOperationException();
+      } else {
+        body = item;
+      }
+    }
+
+    public DAST.Expression Build() {
+      var builtBody = new List<DAST.Expression>();
+      ExprContainer.RecursivelyBuild(new List<object> { body ?? ExprContainer.UnsupportedToExpr("IIFEExprBuilder with empty body") }, builtBody);
+
+      var builtValue = new List<DAST.Expression>();
+      ExprContainer.RecursivelyBuild(new List<object> { value
+       ?? ExprContainer.UnsupportedToExpr("IIFEExprBuilder with empty value")
+       }, builtValue);
+
+      return (DAST.Expression)DAST.Expression.create_IIFE(
+        Sequence<Rune>.UnicodeFromString(name),
+        tpe,
+        builtValue[0],
+        builtBody[0]
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class IIFEExprRhs : ExprContainer {
+    readonly IIFEExprBuilder parent;
+
+    public IIFEExprRhs(IIFEExprBuilder parent) {
+      this.parent = parent;
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      if (parent.value != null) {
+        throw new InvalidOperationException();
+      } else {
+        parent.value = item;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      if (parent.value != null) {
+        throw new InvalidOperationException();
+      } else {
+        parent.value = item;
+      }
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class BetaRedexBuilder : ExprContainer, BuildableExpr {
+    readonly List<_System.Tuple2<DAST.Formal, DAST.Expression>> bindings;
+    readonly DAST.Type retType;
+    object body = null;
+
+    public BetaRedexBuilder(List<_System.Tuple2<DAST.Formal, DAST.Expression>> bindings, DAST.Type retType) {
+      this.bindings = bindings;
+      this.retType = retType;
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      body = item;
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      body = item;
+    }
+
+    public DAST.Expression Build() {
+      var builtBody = new List<DAST.Expression>();
+      ExprContainer.RecursivelyBuild(new List<object> { body }, builtBody);
+
+      return (DAST.Expression)DAST.Expression.create_BetaRedex(
+        Sequence<_System.Tuple2<DAST.Formal, DAST.Expression>>.FromArray(bindings.ToArray()),
+        retType,
+        builtBody[0]
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class ConvertBuilder : ExprContainer, BuildableExpr {
+    readonly DAST.Type fromType;
+    readonly DAST.Type toType;
+    object value = null;
+
+    public ConvertBuilder(DAST.Type fromType, DAST.Type toType) {
+      this.fromType = fromType;
+      this.toType = toType;
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      if (value != null) {
+        throw new InvalidOperationException();
+      } else {
+        value = item;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      if (value != null) {
+        throw new InvalidOperationException();
+      } else {
+        value = item;
+      }
+    }
+
+    public DAST.Expression Build() {
+      var builtValue = new List<DAST.Expression>();
+      DAST.Expression v;
+      if (value == null) {
+        v = ExprContainer.UnsupportedToExpr($"Conversion from {fromType} to {toType} of something missing");
+      } else {
+        ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
+        v = builtValue[0];
+      }
+
+      return (DAST.Expression)DAST.Expression.create_Convert(
+        v,
+        fromType,
+        toType
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class IndexBuilder : ExprContainer, BuildableExpr {
+    readonly List<DAST.Expression> indices;
+    readonly DAST._ICollKind collKind;
+    object value = null;
+
+    public IndexBuilder(List<DAST.Expression> indices, DAST._ICollKind collKind) {
+      this.indices = indices;
+      this.collKind = collKind;
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      if (value != null) {
+        throw new InvalidOperationException();
+      } else {
+        value = item;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      if (value != null) {
+        throw new InvalidOperationException();
+      } else {
+        value = item;
+      }
+    }
+
+    public DAST.Expression Build() {
+      var builtValue = new List<DAST.Expression>();
+      ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
+
+      return (DAST.Expression)DAST.Expression.create_Index(
+        builtValue[0],
+        collKind,
+        Sequence<DAST.Expression>.FromArray(indices.ToArray())
+      );
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class NativeRangeBuilder : ExprContainer, BuildableExpr {
+    [CanBeNull] readonly string start;
+    [CanBeNull] object bound;
+
+    public NativeRangeBuilder(string start = null) {
+      this.start = start;
+      bound = null;
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      if (bound != null) {
+        throw new InvalidOperationException();
+      } else {
+        bound = item;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      if (bound != null) {
+        throw new InvalidOperationException();
+      } else {
+        bound = item;
+      }
+    }
+
+    public static DAST.Expression ToNativeUsize(int number) {
+      var origType = DAST.Type.create_Primitive(DAST.Primitive.create_Int());
+      var numberExpr = (DAST.Expression)DAST.Expression.create_Literal(
+        DAST.Literal.create_IntLiteral(Sequence<Rune>.UnicodeFromString($"{number}"),
+          origType)
+      );
+      return (DAST.Expression)DAST.Expression.create_Convert(numberExpr, origType, DAST.Type.create_UserDefined(
+        DAST.ResolvedType.create_ResolvedType(
+        Sequence<Sequence<Rune>>.FromElements((Sequence<Rune>)Sequence<Rune>.UnicodeFromString("usize")),
+        Sequence<_IType>.Empty,
+        DAST.ResolvedTypeBase.create_Newtype(origType, DAST.NewtypeRange.create_NativeArrayIndex(), true), Sequence<_IAttribute>.Empty,
+        Sequence<Sequence<Rune>>.Empty, Sequence<_IType>.Empty)
+      ));
+    }
+
+    public DAST.Expression Build() {
+      var builtValue = new List<DAST.Expression>();
+      DAST.Expression endExpr;
+      if (bound == null) {
+        endExpr = ExprContainer.UnsupportedToExpr($"NativeRangeBuilder has no upper bound");
+      } else {
+        ExprContainer.RecursivelyBuild(new List<object> { bound }, builtValue);
+        endExpr = builtValue[0];
+      }
+
+      DAST.Expression startExpr;
+      if (start == null) {
+        startExpr = ToNativeUsize(0);
+      } else {
+        startExpr = (DAST.Expression)DAST.Expression.create_Ident(
+          Sequence<Rune>.UnicodeFromString(start));
+      }
+
+      return (DAST.Expression)DAST.Expression.create_IntRange(
+        DAST.Type.create_Primitive(DAST.Primitive.create_Native()),
+        startExpr, endExpr, true);
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+
+  class ArrayLengthBuilder : ExprContainer, BuildableExpr {
+    private readonly DAST.Type arrayType;
+    private readonly int dim;
+    private object array;
+    private readonly bool native;
+
+    public ArrayLengthBuilder(DAST.Type arrayType, int dim, bool native) {
+      this.arrayType = arrayType;
+      this.dim = dim;
+      this.native = native;
+      array = null;
+    }
+
+    public void AddExpr(DAST.Expression item) {
+      if (array != null) {
+        throw new InvalidOperationException();
+      } else {
+        array = item;
+      }
+    }
+
+    public void AddBuildable(BuildableExpr item) {
+      if (array != null) {
+        throw new InvalidOperationException();
+      } else {
+        array = item;
+      }
+    }
+
+    public DAST.Expression Build() {
+      var builtValue = new List<DAST.Expression>();
+      DAST.Expression arrayExpr;
+      if (array == null) {
+        arrayExpr = ExprContainer.UnsupportedToExpr($"ArrayLengthBuilder has no array");
+      } else {
+        ExprContainer.RecursivelyBuild(new List<object> { array }, builtValue);
+        arrayExpr = builtValue[0];
+      }
+
+      return (DAST.Expression)DAST.Expression.create_ArrayLen(
+        arrayExpr, arrayType, new BigInteger(dim), native);
+    }
+
+    public void AddUnsupported(string why) {
+      AddExpr(ExprContainer.UnsupportedToExpr(why));
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/Dafny/BuilderSyntaxTree.cs b/Source/DafnyCore/Backends/Dafny/BuilderSyntaxTree.cs
new file mode 100644
index 00000000000..40913275d2b
--- /dev/null
+++ b/Source/DafnyCore/Backends/Dafny/BuilderSyntaxTree.cs
@@ -0,0 +1,38 @@
+using System;
+
+namespace Microsoft.Dafny.Compilers {
+
+  class BuilderSyntaxTree<T> : ConcreteSyntaxTree {
+    public readonly T Builder;
+    public readonly DafnyCodeGenerator Compiler;
+
+    public BuilderSyntaxTree(T builder, DafnyCodeGenerator compiler) {
+      if (builder == null) {
+        throw new ArgumentNullException(nameof(builder));
+      }
+
+      Builder = builder;
+      Compiler = compiler;
+    }
+
+    public override ConcreteSyntaxTree Fork(int relativeIndent = 0) {
+      if (Builder is StatementContainer statementContainer) {
+        return new BuilderSyntaxTree<StatementContainer>(statementContainer.Fork(), Compiler);
+      } else {
+        // Warning: this is an invalid operation: cannot fork builder of type Builder.GetType()
+        throw new InvalidOperationException("<i>Builder not StatementContainer</i> but " + Builder.GetType().ToString());
+      }
+    }
+
+    public override ConcreteSyntaxTree ForkInParens() {
+      // TODO(shadaj): perhaps should check if we are an expr container
+      return new BuilderSyntaxTree<T>(Builder, Compiler);
+    }
+
+    public override ConcreteSyntaxTree NewBlock(string header = "", string footer = "",
+      BlockStyle open = BlockStyle.SpaceBrace,
+      BlockStyle close = BlockStyle.NewlineBrace) {
+      return Fork();
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/Dafny/DafnyCodeGenerator.cs b/Source/DafnyCore/Backends/Dafny/DafnyCodeGenerator.cs
new file mode 100644
index 00000000000..ba17c4a4d15
--- /dev/null
+++ b/Source/DafnyCore/Backends/Dafny/DafnyCodeGenerator.cs
@@ -0,0 +1,3265 @@
+using System;
+using System.Collections.Generic;
+using Dafny;
+using JetBrains.Annotations;
+using DAST;
+using System.Numerics;
+using Microsoft.BaseTypes;
+using System.Linq;
+using System.Diagnostics.Contracts;
+using DAST.Format;
+using Microsoft.Boogie;
+using Std.Wrappers;
+
+namespace Microsoft.Dafny.Compilers {
+
+  class DafnyCodeGenerator : SinglePassCodeGenerator {
+
+    ProgramBuilder items;
+    public object currentBuilder;
+    public bool emitUncompilableCode;
+    protected override string InternalFieldPrefix => internalFieldPrefix;
+    public string internalFieldPrefix;
+    public bool preventShadowing;
+
+    protected override bool InstanceMethodsAllowedToCallTraitMethods => false;
+
+    public void Start() {
+      if (items != null) {
+        throw new InvalidOperationException("");
+      }
+
+      items = new ProgramBuilder();
+      this.currentBuilder = items;
+    }
+
+    public List<Module> Build() {
+      var res = items.Finish();
+      items = null;
+      this.currentBuilder = null;
+      return res;
+    }
+
+    public DafnyCodeGenerator(DafnyOptions options, ErrorReporter reporter, string internalFieldPrefix, bool preventShadowing, bool canEmitUncompilableCode) : base(options, reporter) {
+      if (Options?.CoverageLegendFile != null) {
+        Imports.Add("DafnyProfiling");
+      }
+
+      this.internalFieldPrefix = internalFieldPrefix;
+      emitUncompilableCode = options.Get(CommonOptionBag.EmitUncompilableCode) && canEmitUncompilableCode;
+      this.preventShadowing = preventShadowing;
+    }
+
+    protected override string GetCompileNameNotProtected(IVariable v) {
+      return preventShadowing ? v.GetOrCreateCompileName(currentIdGenerator) : v.CompileNameShadowable;
+    }
+
+    public string TokenToString(IOrigin tok) {
+      var absolutePath = tok.Uri;
+      var localPath = absolutePath.LocalPath;
+      var relativePath = System.IO.Path.GetRelativePath(".", localPath).Replace("\\", "/"); // Normalize paths
+      return $"{relativePath}({tok.line},{tok.col})";
+    }
+
+    public void AddUnsupported(IOrigin tok, string why) {
+      if (emitUncompilableCode && currentBuilder is Container container) {
+        container.AddUnsupported($"{TokenToString(tok)}: {why}");
+      } else {
+        throw new UnsupportedInvalidOperationException(why);
+      }
+    }
+
+    public void AddUnsupportedFeature(IOrigin tok, Feature feature) {
+      if (emitUncompilableCode && currentBuilder is Container container) {
+        container.AddUnsupported($"<i>{TokenToString(tok)}DCOMP: {feature}</i>");
+      } else {
+        throw new RecoverableUnsupportedFeatureException(tok, feature);
+      }
+    }
+
+    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
+      Feature.Ordinals,
+      Feature.Iterators,
+      Feature.Multisets,
+      Feature.MapComprehensions,
+      Feature.MethodSynthesis,
+      Feature.ExternalClasses,
+      Feature.NewObject,
+      Feature.NonSequentializableForallStatements,
+      Feature.MapItems,
+      Feature.RunAllTests,
+      Feature.SequenceDisplaysOfCharacters,
+      Feature.TypeTests,
+      Feature.SubsetTypeTests,
+      Feature.BitvectorRotateFunctions,
+      Feature.AssignSuchThatWithNonFiniteBounds,
+      Feature.SequenceUpdateExpressions,
+      Feature.SequenceConstructionsWithNonLambdaInitializers,
+      Feature.ExternalConstructors,
+      Feature.SubtypeConstraintsInQuantifiers,
+      Feature.TuplesWiderThan20,
+      Feature.ArraysWithMoreThan16Dims,
+      Feature.ForLoops,
+      Feature.Traits,
+      Feature.RuntimeCoverageReport,
+      Feature.MultiDimensionalArrays,
+      Feature.NonNativeNewtypes
+    };
+
+    private readonly List<string> Imports = new() { DafnyDefaultModule };
+
+    private const string DafnyRuntimeModule = "_dafny";
+    private const string DafnyDefaultModule = "module_";
+
+    protected override string AssignmentSymbol { get => null; }
+
+    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
+    }
+
+    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
+      AddUnsupported(Token.NoToken, "<i>Call to main</i>");
+    }
+
+    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
+      AddUnsupported(Token.NoToken, "<i>create static main</i>");
+      return WrBuffer(out _);
+    }
+
+    private bool NeedsExternalImport(MemberDecl memberDecl) {
+      return !memberDecl.IsGhost && memberDecl.HasExternAttribute &&
+             memberDecl is Function { Body: null } or Method { Body: null };
+    }
+
+    protected override ConcreteSyntaxTree CreateModule(ModuleDefinition module, string moduleName, bool isDefault,
+      ModuleDefinition externModule,
+      string libraryName, Attributes moduleAttributes, ConcreteSyntaxTree wr) {
+      if (currentBuilder is ModuleContainer moduleBuilder) {
+        var attributes = (Sequence<DAST.Attribute>)ParseAttributes(moduleAttributes);
+        if (externModule != null) {
+          attributes = (Sequence<DAST.Attribute>)ParseAttributes(externModule.Attributes);
+        }
+
+        var requiresExternImport = enclosingModule.TopLevelDecls.Any((TopLevelDecl decl) =>
+          (decl is DefaultClassDecl defaultClassDecl &&
+           GetIsExternAndIncluded(defaultClassDecl) is (_, included: false)
+           && defaultClassDecl.Members.Exists(NeedsExternalImport)
+           ) ||
+          (decl is ClassLikeDecl classLikeDecl &&
+           GetIsExternAndIncluded(classLikeDecl) is (ClassIsExtern: true, _)) ||
+          (decl is AbstractTypeDecl)
+        );
+        var docString = GetDocString(module.EnclosingLiteralModuleDecl is { } node ? node : module);
+        currentBuilder = moduleBuilder.Module(moduleName, docString, attributes, requiresExternImport);
+      } else {
+        throw new InvalidOperationException();
+      }
+
+      return wr;
+    }
+
+    private string GetDocString(INode node) {
+      return ((node is IHasDocstring iHasDocstring ? iHasDocstring?.GetDocstring(Options) : "") +
+              "\n" + (node.StartToken.line != 0 && node is not DatatypeCtor ? TokenToString(node.StartToken) : "")).Trim();
+    }
+
+    protected override void FinishModule() {
+      if (currentBuilder is ModuleBuilder builder) {
+        currentBuilder = builder.Finish();
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override string GetHelperModuleName() => DafnyRuntimeModule;
+
+    private static string MangleName(string name) {
+      return name;
+    }
+
+    protected override ConcreteSyntaxTree EmitCoercionIfNecessary(Type from, Type to, IOrigin tok, ConcreteSyntaxTree wr, Type toOrig = null) {
+      if (currentBuilder is ExprBuffer buf && wr is not BuilderSyntaxTree<ExprContainer>) {
+        // the writers are not currently wired properly for DatatypeValue
+        wr = new BuilderSyntaxTree<ExprContainer>(buf, this);
+      }
+
+      if (from == null || to == null || from.Equals(to, false)) {
+        return wr;
+      }
+
+      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
+        return new BuilderSyntaxTree<ExprContainer>(builder.Builder.Convert(GenType(from), GenType(to)), this);
+      } else {
+        throw new UnsupportedInvalidOperationException("coercion not in the presence of an ExprContainer");
+      }
+    }
+
+    protected override IClassWriter CreateClass(string moduleName, bool isExtern, string fullPrintName,
+      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type> superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+      if (currentBuilder is ClassContainer builder) {
+        List<DAST.TypeArgDecl> typeParams = typeParameters.Select(tp => GenTypeArgDecl(tp)).ToList();
+
+        return new ClassWriter(this, typeParams.Count > 0, builder.Class(
+          IdName(cls), moduleName, typeParams, superClasses.Select(t => GenType(t)).ToList(),
+          ParseAttributes(cls.Attributes), GetDocString(cls))
+          );
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    private Variance GenTypeVariance(TypeParameter tp) {
+      if (tp.Variance is TypeParameter.TPVariance.Co) {
+        return (Variance)Variance.create_Covariant();
+      }
+
+      if (tp.Variance is TypeParameter.TPVariance.Contra) {
+        AddUnsupported(tp.Origin, "Contravariance");
+      }
+      return (Variance)Variance.create_Nonvariant();
+    }
+
+    private static ISequence<_ITypeArgBound> GenTypeBounds(TypeParameter tp) {
+      var characteristics = new List<_ITypeArgBound>();
+      if (tp.Characteristics.AutoInit is Type.AutoInitInfo.CompilableValue) {
+        characteristics.Add(DAST.TypeArgBound.create_SupportsDefault());
+      }
+
+      if (tp.Characteristics.EqualitySupport is TypeParameter.EqualitySupportValue.Required or TypeParameter.EqualitySupportValue.InferredRequired) {
+        characteristics.Add(DAST.TypeArgBound.create_SupportsEquality());
+      }
+
+      var bounds = Sequence<_ITypeArgBound>.FromArray(characteristics.ToArray());
+      return bounds;
+    }
+
+    protected TypeArgDecl GenTypeArgDecl(TypeParameter tp, string name = null) {
+      var bounds = GenTypeBounds(tp);
+
+      var variance = GenTypeVariance(tp);
+
+      name ??= tp.GetCompileName(Options);
+
+      return (DAST.TypeArgDecl)DAST.TypeArgDecl.create_TypeArgDecl(
+        Sequence<Rune>.UnicodeFromString(name), bounds, variance);
+    }
+
+    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters,
+      TraitDecl trait, List<Type> superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+
+      if (currentBuilder is TraitContainer builder) {
+        var typeParams = trait.TypeArgs.Select(tp => GenTypeArgDecl(tp)).ToList();
+        List<DAST.Type> parents = new();
+        if (trait.IsReferenceTypeDecl) {
+          parents.Add((DAST.Type)DAST.Type.create_Object());
+        }
+        foreach (var pt in trait.ParentTraits) {
+          var genType = GenType(pt);
+
+          parents.Add(genType);
+        }
+
+        var traitType = trait.IsReferenceTypeDecl
+          ? DAST.TraitType.create_ObjectTrait()
+          : TraitType.create_GeneralTrait();
+
+        return new ClassWriter(this, typeParameters.Any(), builder.Trait(name, typeParams, parents, ParseAttributes(trait.Attributes), GetDocString(trait), traitType));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
+      AddUnsupportedFeature(iter.Origin, Feature.Iterators);
+      return wr;
+    }
+
+    private static bool isTpSupported(TypeParameter tp, [CanBeNull] out string why) {
+      if (tp.Variance == TypeParameter.TPVariance.Contra) {
+        why = $"<b>Unsupported: <i>Type variance {tp.Variance} not supported</i></b>";
+        return false;
+      }
+      why = null;
+      return true;
+    }
+
+    protected override IClassWriter DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
+      if (currentBuilder is DatatypeContainer builder) {
+        List<DAST.TypeArgDecl> typeParams = new();
+        foreach (var tp in dt.TypeArgs) {
+          typeParams.Add(GenTypeArgDecl(tp));
+        }
+
+        IEnumerable<DAST.DatatypeCtor> ctors =
+          from ctor in dt.Ctors
+          let allDtors =
+            from arg in ctor.Formals
+            where !arg.IsGhost
+            let formalName = Sequence<Rune>.UnicodeFromString(GetDestructorFormalName(arg))
+            let formalType = GenType(arg.Type)
+            let formalCallName = GetExtractOverrideName(arg.Attributes, null)
+            let dtorName =
+              formalCallName == null ? Option<Sequence<Rune>>.create_None() :
+              Option<Sequence<Rune>>.create_Some((Sequence<Rune>)Sequence<Rune>.UnicodeFromString(formalCallName))
+            let formalAttributes = ParseAttributes(arg.Attributes)
+            select (DAST.DatatypeDtor)DAST.DatatypeDtor.create_DatatypeDtor((DAST.Formal)DAST.Formal.create_Formal(
+              formalName, formalType, formalAttributes), dtorName)
+          let args = Sequence<DAST.DatatypeDtor>.FromArray(allDtors.ToArray<DatatypeDtor>())
+          select (DAST.DatatypeCtor)DAST.DatatypeCtor.create_DatatypeCtor(
+            Sequence<Rune>.UnicodeFromString(ctor.GetCompileName(Options)),
+            Sequence<Rune>.UnicodeFromString(GetDocString(ctor)),
+            args, ctor.Formals.Count > 0);
+        var superClasses = dt.ParentTypeInformation.UniqueParentTraits();
+        var superTraitTypes = superClasses.Select(GenType).ToList();
+
+        return new ClassWriter(this, typeParams.Count > 0, builder.Datatype(
+          dt.GetCompileName(Options),
+          dt.EnclosingModuleDefinition.GetCompileName(Options),
+          typeParams,
+          ctors.ToList(),
+          dt is CoDatatypeDecl,
+          ParseAttributes(dt.Attributes),
+          GetDocString(dt),
+          superTraitTypes
+        ));
+      } else {
+        throw new InvalidOperationException("Cannot declare datatype outside of a module: " + currentBuilder);
+      }
+    }
+
+    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
+      if (currentBuilder is NewtypeContainer builder) {
+        List<DAST.Statement> witnessStmts = new();
+        DAST.Expression witness = null;
+        var statementBuf = new StatementBuffer();
+        if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+          EmitExpr(
+            nt.Witness, false,
+            EmitCoercionIfNecessary(nt.Witness.Type, nt.BaseType, nt.Witness.Origin,
+              WrBuffer(out var buf)),
+            new BuilderSyntaxTree<StatementContainer>(statementBuf, this)
+          );
+          witness = buf.Finish();
+          witnessStmts = statementBuf.PopAll();
+        }
+
+        Option<DAST.NewtypeConstraint> constraint;
+        if (((RedirectingTypeDecl)nt).ConstraintIsCompilable) {
+          // To check if something is compilable for a newtype, we need to convert the variable to the base type
+          var type = UserDefinedType.FromTopLevelDecl(nt.Origin, (TopLevelDecl)nt);
+          var sourceFormal = new Formal(nt.Origin, "_source", type, true, false, null);
+          var statementBuffer = new StatementBuffer();
+          var wStmt = new BuilderSyntaxTree<StatementContainer>(statementBuffer, this);
+          GenerateIsMethodBody(nt, sourceFormal, wStmt);
+          constraint = (Option<DAST.NewtypeConstraint>)Option<DAST.NewtypeConstraint>.create_Some(
+            (DAST.NewtypeConstraint)DAST.NewtypeConstraint.create_NewtypeConstraint(
+              (DAST.Formal)DAST.Formal.create_Formal(
+                Sequence<Rune>.UnicodeFromString(IdProtect(sourceFormal.CompileNameShadowable)), GenType(type), ParseAttributes(null)),
+              Sequence<DAST.Statement>.FromArray(statementBuffer.PopAll().ToArray())));
+        } else {
+          constraint = (Option<DAST.NewtypeConstraint>)Option<DAST.NewtypeConstraint>.create_None();
+        }
+
+        return new ClassWriter(this, false, builder.Newtype(
+          nt.GetCompileName(Options), new(),
+          GenType(nt.BaseType), NativeTypeToNewtypeRange(nt, false),
+            constraint, witnessStmts, witness, ParseAttributes(nt.Attributes), GetDocString(nt)));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    private DAST.Type GenType(Type typ) {
+      // TODO(shadaj): this is leaking Rust types into the AST, but we do need native types
+      var xType = DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(Options, typ);
+
+      if (xType is BoolType) {
+        return (DAST.Type)DAST.Type.create_Primitive(DAST.Primitive.create_Bool());
+      } else if (xType is IntType) {
+        return (DAST.Type)DAST.Type.create_Primitive(DAST.Primitive.create_Int());
+      } else if (xType is RealType) {
+        return (DAST.Type)DAST.Type.create_Primitive(DAST.Primitive.create_Real());
+      } else if (xType.IsStringType) {
+        return (DAST.Type)DAST.Type.create_Primitive(DAST.Primitive.create_String());
+      } else if (xType.IsCharType) {
+        return (DAST.Type)DAST.Type.create_Primitive(DAST.Primitive.create_Char());
+      } else if (xType is UserDefinedType udt) {
+        if (udt.ResolvedClass is TypeParameter tp) {
+          if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(tp, out var instantiatedTypeParameter)) {
+            return GenType(instantiatedTypeParameter);
+          }
+        }
+
+        return FullTypeNameAST(udt, null);
+      } else if (AsNativeType(typ) != null) {
+        var overflows = typ is BitvectorType;
+        var CreateNewtype = (string baseName, DAST._INewtypeRange newTypeRange) =>
+          DAST.Type.create_UserDefined(
+            DAST.ResolvedType.create_ResolvedType(
+              Sequence<ISequence<Rune>>.FromElements(
+                Sequence<Rune>.UnicodeFromString(baseName)
+              ),
+              Sequence<DAST.Type>.Empty,
+              DAST.ResolvedTypeBase.create_Newtype(
+                DAST.Type.create_Primitive(DAST.Primitive.create_Int()),
+                newTypeRange,
+                true
+              ),
+              Sequence<DAST.Attribute>.Empty,
+              Sequence<ISequence<Rune>>.Empty,
+              Sequence<DAST.Type>.Empty
+            )
+          );
+        return (DAST.Type)(AsNativeType(xType).Sel switch {
+          NativeType.Selection.Byte => CreateNewtype("u8", DAST.NewtypeRange.create_U8(overflows)),
+          NativeType.Selection.SByte => CreateNewtype("i8", DAST.NewtypeRange.create_I8(overflows)),
+          NativeType.Selection.Short => CreateNewtype("i16", DAST.NewtypeRange.create_I16(overflows)),
+          NativeType.Selection.UShort => CreateNewtype("u16", DAST.NewtypeRange.create_U16(overflows)),
+          NativeType.Selection.Int => CreateNewtype("i32", DAST.NewtypeRange.create_I32(overflows)),
+          NativeType.Selection.UInt => CreateNewtype("u32", DAST.NewtypeRange.create_U32(overflows)),
+          NativeType.Selection.Long => CreateNewtype("i64", DAST.NewtypeRange.create_I64(overflows)),
+          NativeType.Selection.ULong => CreateNewtype("u64", DAST.NewtypeRange.create_U64(overflows)),
+          NativeType.Selection.DoubleLong => CreateNewtype("i128", DAST.NewtypeRange.create_I128(overflows)),
+          NativeType.Selection.UDoubleLong => CreateNewtype("u128", DAST.NewtypeRange.create_U128(overflows)),
+          _ => throw new InvalidOperationException(),
+        });
+      } else if (xType is SeqType seq) {
+        var argType = seq.Arg;
+        return (DAST.Type)DAST.Type.create_Seq(GenType(argType));
+      } else if (xType is SetType set) {
+        var argType = set.Arg;
+        return (DAST.Type)DAST.Type.create_Set(GenType(argType));
+      } else if (xType is MultiSetType multiSet) {
+        var argType = multiSet.Arg;
+        return (DAST.Type)DAST.Type.create_Multiset(GenType(argType));
+      } else if (xType is MapType map) {
+        var keyType = map.Domain;
+        var valueType = map.Range;
+        return (DAST.Type)DAST.Type.create_Map(GenType(keyType), GenType(valueType));
+      } else {
+        var why = "<i>Type name for " + xType + " (" + typ.GetType() + ")</i>";
+        AddUnsupported(typ.Origin, why);
+        return (DAST.Type)DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString($"<b>Unsupported: {why}</b>"));
+      }
+    }
+
+    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
+      if (currentBuilder is not SynonymTypeContainer builder) {
+        throw new InvalidOperationException();
+      }
+
+      var erasedType = sst.Rhs.NormalizeExpand();
+
+      List<DAST.Statement> witnessStmts = new();
+      DAST.Expression witness = null;
+      var statementBuf = new StatementBuffer();
+      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        EmitExpr(
+          sst.Witness, false,
+          EmitCoercionIfNecessary(sst.Witness.Type, erasedType, sst.Witness.Origin,
+            WrBuffer(out var buf)),
+          new BuilderSyntaxTree<StatementContainer>(statementBuf, this)
+        );
+        witness = buf.Finish();
+        witnessStmts = statementBuf.PopAll();
+      }
+
+      List<DAST.TypeArgDecl> typeParams = new();
+      foreach (var tp in sst.TypeArgs) {
+        typeParams.Add(GenTypeArgDecl(tp, tp.Name)); // TODO: Test if we can remove the second argument
+      }
+
+      builder.SynonymType(sst.GetCompileName(Options), typeParams,
+        GenType(erasedType), witnessStmts, witness,
+        ParseAttributes(sst.Attributes), GetDocString(sst)).Finish();
+    }
+
+    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
+      name = null;
+      literalSuffix = null;
+      needsCastAfterArithmetic = false;
+    }
+
+
+    private Sequence<DAST.Formal> GenFormals(List<Formal> formals) {
+      List<DAST.Formal> paramsList = new();
+      foreach (var param in formals) {
+        if (!param.IsGhost) {
+          paramsList.Add((DAST.Formal)DAST.Formal.create_Formal(
+            Sequence<Rune>.UnicodeFromString(IdProtect(param.CompileName)), GenType(param.Type), ParseAttributes(param.Attributes)));
+        }
+      }
+
+      Sequence<DAST.Formal> params_ = (Sequence<DAST.Formal>)Sequence<DAST.Formal>.FromArray(paramsList.ToArray());
+      return params_;
+    }
+
+    protected override void TrDividedBlockStmt(Constructor m, DividedBlockStmt dividedBlockStmt, ConcreteSyntaxTree writer) {
+      TrStmtList(dividedBlockStmt.BodyInit, writer);
+      if (writer is BuilderSyntaxTree<StatementContainer> builder) {
+        var membersToInitialize = ((TopLevelDeclWithMembers)m.EnclosingClass).Members.Where((md =>
+          md is Field and not ConstantField { Rhs: { } }));
+        var outFields = membersToInitialize.Select((MemberDecl md) => {
+          var formal = DAST.Formal.create_Formal(
+            Sequence<Rune>.UnicodeFromString(
+              (md is ConstantField ? InternalFieldPrefix : "") +
+              md.GetCompileName(Options)),
+            GenType(((Field)md).Type.Subst(((TopLevelDeclWithMembers)((Field)md).EnclosingClass)
+              .ParentFormalTypeParametersToActuals))
+            , ParseAttributes(md.Attributes)
+          );
+          return DAST.Field.create_Field(formal, md is ConstantField,
+            Std.Wrappers.Option<DAST.Expression>.create_None(), md.HasStaticKeyword);
+        }
+        ).ToList();
+        builder.Builder.AddStatement((DAST.Statement)DAST.Statement.create_ConstructorNewSeparator(
+          Sequence<_IField>.FromArray(outFields.ToArray())));
+      } else {
+        throw new InvalidCastException("Divided block statement outside of a statement container");
+      }
+      // We need to indicate to Dafny that 
+      TrStmtList(dividedBlockStmt.BodyProper, writer);
+    }
+
+    protected override bool InstanceConstAreStatic() {
+      return false;
+    }
+
+    private class ClassWriter : IClassWriter {
+      private readonly DafnyCodeGenerator compiler;
+      private readonly ClassLike builder;
+      private readonly bool hasTypeArgs;
+      private readonly List<MethodBuilder> methods = new();
+
+      public ClassWriter(DafnyCodeGenerator compiler, bool hasTypeArgs, ClassLike builder) {
+        this.compiler = compiler;
+        this.hasTypeArgs = hasTypeArgs;
+        this.builder = builder;
+      }
+
+      public ConcreteSyntaxTree CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody,
+        bool forBodyInheritance, bool lookasideBody) {
+        if (m.IsStatic && this.hasTypeArgs) {
+          compiler.AddUnsupported(m.Origin, "<i>Static methods with type arguments</i>");
+          return new BuilderSyntaxTree<StatementContainer>(new StatementBuffer(), this.compiler);
+        }
+
+        var astTypeArgs = typeArgs.Select(typeArg => compiler.GenTypeArgDecl(typeArg.Formal)).ToList();
+
+        var params_ = compiler.GenFormals(m.Ins);
+
+        List<ISequence<Rune>> outVars = new();
+        List<DAST.Type> outTypes = new();
+        foreach (var outVar in m.Outs) {
+          if (!outVar.IsGhost) {
+            outVars.Add(Sequence<Rune>.UnicodeFromString(compiler.IdProtect(outVar.GetOrCreateCompileName(m.CodeGenIdGenerator))));
+            outTypes.Add(compiler.GenType(outVar.Type));
+          }
+        }
+
+        var overriddenMethod = m.OverriddenMethod;
+        while (overriddenMethod != null && overriddenMethod.OverriddenMethod != null) {
+          overriddenMethod = overriddenMethod.OverriddenMethod;
+        }
+
+        var overridingTrait = overriddenMethod?.EnclosingClass;
+        if (m is Constructor { EnclosingClass: TopLevelDeclWithMembers cm }) {
+          // Constructors need to assign all fields without RHS
+          var membersToInitialize = cm.Members.Where((md =>
+            md is Field and not ConstantField { Rhs: { } } && !md.IsGhost));
+          outVars = membersToInitialize.Select((MemberDecl md) =>
+            Sequence<Rune>.UnicodeFromString(
+              (md is ConstantField ? compiler.InternalFieldPrefix : "") +
+              md.GetCompileName(compiler.Options))
+          ).ToList();
+          /*outTypes = membersToInitialize.Select((MemberDecl md) =>
+            GenType(md.GetType())
+          ).ToList();*/
+        }
+
+        var attributes = compiler.ParseAttributes(m.Attributes);
+        var builder = this.builder.Method(
+          m.IsStatic, createBody, m is Constructor, false,
+          overridingTrait != null ? compiler.PathFromTopLevel(overridingTrait) : null,
+          compiler.GetDocString(m),
+          attributes,
+          m.GetCompileName(compiler.Options),
+          astTypeArgs, params_,
+          outTypes, outVars
+        );
+        methods.Add(builder);
+
+        if (createBody) {
+          return new BuilderSyntaxTree<StatementContainer>(builder, this.compiler);
+        } else {
+          // TODO(shadaj): actually create a trait
+          return null;
+        }
+      }
+
+      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        compiler.AddUnsupportedFeature(m.Origin, Feature.MethodSynthesis);
+        return new BuilderSyntaxTree<StatementContainer>(new StatementBuffer(), this.compiler);
+      }
+
+      public ConcreteSyntaxTree CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs,
+          List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member,
+          bool forBodyInheritance, bool lookasideBody) {
+        if (isStatic && this.hasTypeArgs) {
+          compiler.AddUnsupported(tok, "<i>Static functions with type arguments</i>");
+          return new BuilderSyntaxTree<StatementContainer>(new StatementBuffer(), this.compiler);
+        }
+
+        var astTypeArgs = typeArgs.Select(typeArg => compiler.GenTypeArgDecl(typeArg.Formal)).ToList();
+
+        var params_ = compiler.GenFormals(formals);
+
+        var overridingTrait = member.OverriddenMember?.EnclosingClass;
+        var attributes = compiler.ParseAttributes(member.Attributes);
+        var builder = this.builder.Method(
+          isStatic, createBody, false, true,
+          overridingTrait != null ? compiler.PathFromTopLevel(overridingTrait) : null,
+          compiler.GetDocString(member),
+          attributes,
+          name,
+          astTypeArgs, params_,
+          new() {
+            compiler.GenType(resultType)
+          }, null
+        );
+        methods.Add(builder);
+
+        if (createBody) {
+          return new BuilderSyntaxTree<StatementContainer>(builder, this.compiler);
+        } else {
+          return null;
+        }
+      }
+
+      public ConcreteSyntaxTree CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IOrigin tok,
+          bool isStatic, bool isConst, bool createBody, MemberDecl member, bool forBodyInheritance) {
+        if (isStatic && this.hasTypeArgs) {
+          compiler.AddUnsupported(tok, "<i>Static fields with type arguments</i>");
+          return new BuilderSyntaxTree<StatementContainer>(new StatementBuffer(), this.compiler);
+        }
+
+        var overridingTrait = member.OverriddenMember?.EnclosingClass;
+
+        var attributes = compiler.ParseAttributes(enclosingDecl.Attributes);
+
+        var builder = this.builder.Method(
+          isStatic, createBody, false, true,
+          overridingTrait != null ? compiler.PathFromTopLevel(overridingTrait) : null,
+          compiler.GetDocString(member),
+          attributes,
+          name,
+          new(), (Sequence<DAST.Formal>)Sequence<DAST.Formal>.Empty,
+          new() {
+            compiler.GenType(resultType)
+          }, null
+        );
+        methods.Add(builder);
+
+        if (createBody) {
+          return new BuilderSyntaxTree<StatementContainer>(builder, this.compiler);
+        } else {
+          return null;
+        }
+      }
+
+      public ConcreteSyntaxTree CreateGetterSetter(string name, Type resultType, IOrigin tok,
+          bool createBody, MemberDecl member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
+        compiler.AddUnsupported(tok, "<i>Create Getter Setter</i>");
+        if (createBody) {
+          setterWriter = new BuilderSyntaxTree<StatementContainer>(new StatementBuffer(), this.compiler);
+          return new BuilderSyntaxTree<StatementContainer>(new StatementBuffer(), this.compiler);
+        } else {
+          setterWriter = null;
+          return null;
+        }
+      }
+
+      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type,
+          IOrigin tok, string rhs, Field field) {
+        _IOption<DAST._IExpression> rhsExpr = null;
+        if (rhs != null) {
+          rhsExpr = compiler.bufferedInitializationValue;
+          compiler.bufferedInitializationValue = null;
+
+          if (rhsExpr == null) {
+            throw new InvalidOperationException();
+          }
+        } else {
+          rhsExpr = Option<DAST._IExpression>.create_None();
+        }
+
+        builder.AddField((DAST.Formal)DAST.Formal.create_Formal(
+          Sequence<Rune>.UnicodeFromString(name),
+          compiler.GenType(type),
+          compiler.ParseAttributes(field.Attributes)
+        ), isConst || field is ConstantField, rhsExpr, field.IsStatic);
+      }
+
+      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
+        throw new cce.UnreachableException();
+      }
+
+      public ConcreteSyntaxTree ErrorWriter() => null;
+
+      public void Finish() {
+        foreach (var method in methods) {
+          builder.AddMethod(method.Build());
+        }
+
+        compiler.currentBuilder = builder.Finish();
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitReturnExpr(ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        return new BuilderSyntaxTree<ExprContainer>(stmtContainer.Builder.Return(), this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitReturnExpr(string returnExpr, ConcreteSyntaxTree wr) {
+      if (returnExpr == "BUFFERED") {
+        if (bufferedInitializationValue == null) {
+          throw new InvalidOperationException("Expected a buffered value to have been populated because rhs != null");
+        }
+
+        var rhsValue = bufferedInitializationValue;
+        bufferedInitializationValue = null;
+
+        if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+          var returnBuilder = stmtContainer.Builder.Return();
+          returnBuilder.AddExpr((DAST.Expression)rhsValue.dtor_value);
+        } else {
+          throw new InvalidOperationException();
+        }
+      } else {
+        // TODO(shadaj): this may not be robust, we should use the writer version directly
+        EmitIdentifier(returnExpr, EmitReturnExpr(wr));
+      }
+    }
+
+    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      type = DatatypeWrapperEraser.SimplifyType(Options, type);
+      return type.ToString();
+    }
+
+    protected override ConcreteSyntaxTree EmitMethodReturns(Method m, ConcreteSyntaxTree wr) {
+      var beforeReturnBlock = wr.Fork();
+      EmitReturn(m.Outs, wr);
+      return beforeReturnBlock;
+    }
+
+    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        var recBuilder = stmtContainer.Builder.TailRecursive();
+        return new BuilderSyntaxTree<StatementContainer>(recBuilder, this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    public override string TailRecursiveVar(int inParamIndex, IVariable variable) {
+      return preventShadowing ? base.TailRecursiveVar(inParamIndex, variable) : Defs.__default.TailRecursionPrefix.ToVerbatimString(false) + inParamIndex;
+    }
+
+    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        stmtContainer.Builder.AddStatement((DAST.Statement)DAST.Statement.create_JumpTailCallStart());
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member = null) {
+      return "PLACEBO_TYPE";
+    }
+
+    // sometimes, the compiler generates the initial value before the declaration,
+    // so we buffer it here
+    _IOption<DAST._IExpression> bufferedInitializationValue = null;
+
+    // And its statements here
+    _IOption<List<DAST.Statement>> bufferedInitializationStmts = null;
+
+    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IOrigin tok,
+        bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
+      if (bufferedInitializationValue != null) {
+        throw new InvalidOperationException();
+      } else {
+        type = type.NormalizeExpandKeepConstraints();
+        if (usePlaceboValue) {
+          bufferedInitializationValue = Option<DAST._IExpression>.create_None();
+          bufferedInitializationStmts = Option<List<DAST.Statement>>.create_None();
+        } else {
+          if (type.AsNewtype is { WitnessKind: SubsetTypeDecl.WKind.Compiled } newType) {
+            var bufStmt = new StatementBuffer();
+            bufferedInitializationValue = Option<DAST._IExpression>.create_Some(
+              DAST.Expression.create_Convert(
+              ConvertExpression(newType.Witness, new BuilderSyntaxTree<StatementContainer>(bufStmt, this)),
+                  GenType(newType.BaseType),
+              GenType(UserDefinedType.FromTopLevelDecl(newType.Witness.Origin, newType))
+              ));
+            bufferedInitializationStmts = Option<List<DAST.Statement>>.create_Some(bufStmt.PopAll());
+          } else if (type.AsSubsetType != null && type.AsSubsetType.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+            var bufStmt = new StatementBuffer();
+            bufferedInitializationValue = Option<DAST._IExpression>.create_Some(
+              ConvertExpression(type.AsSubsetType.Witness, new BuilderSyntaxTree<StatementContainer>(bufStmt, this)));
+            bufferedInitializationStmts = Option<List<DAST.Statement>>.create_Some(bufStmt.PopAll());
+          } else if (type.AsDatatype != null && type.AsDatatype.Ctors.Count == 1 && type.AsDatatype.Ctors[0].EnclosingDatatype is TupleTypeDecl tupleDecl) {
+            var elems = new List<DAST._IExpression>();
+            for (var i = 0; i < tupleDecl.Ctors[0].Formals.Count; i++) {
+              if (!tupleDecl.Ctors[0].Formals[i].IsGhost) {
+                TypeInitializationValue(type.TypeArgs[i], wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+                elems.Add(bufferedInitializationValue.dtor_value);
+                bufferedInitializationValue = null;
+              }
+            }
+
+            if (elems.Count == 1) {
+              bufferedInitializationValue = Option<DAST._IExpression>.create_Some(elems[0]);
+            } else {
+              bufferedInitializationValue = Option<DAST._IExpression>.create_Some(
+                DAST.Expression.create_Tuple(Sequence<DAST._IExpression>.FromArray(elems.ToArray()))
+              );
+            }
+          } else {
+            bufferedInitializationValue = Option<DAST._IExpression>.create_Some(
+              DAST.Expression.create_InitializationValue(GenType(type))
+            );
+            bufferedInitializationStmts = Option<List<DAST.Statement>>.create_None();
+          }
+        }
+        return "BUFFERED"; // used by DeclareLocal(Out)Var
+      }
+    }
+
+    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance,
+        List<Type> typeArgs, ConcreteSyntaxTree wr, IOrigin tok, bool omitTypeArguments) {
+      return fullCompileName;
+    }
+
+    internal override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl member) {
+      ExprContainer actualBuilder;
+      if (wr is BuilderSyntaxTree<ExprContainer> st) {
+        actualBuilder = st.Builder;
+      } else {
+        throw new InvalidOperationException();
+      }
+
+      EmitTypeName_Companion(type, new BuilderSyntaxTree<ExprContainer>(actualBuilder, this), wr, tok, member);
+      return "";
+    }
+
+    protected override void EmitTypeName_Companion(Type type, ConcreteSyntaxTree wr, ConcreteSyntaxTree surrounding, IOrigin tok, MemberDecl member) {
+      if (wr is BuilderSyntaxTree<ExprContainer> container) {
+        type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
+        var typeArgs = Sequence<DAST.Type>.FromArray(type.TypeArgs.Select(GenType).ToArray());
+
+        if (type.NormalizeExpandKeepConstraints() is UserDefinedType udt && udt.ResolvedClass is DatatypeDecl dt &&
+            DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _)) {
+          container.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Companion(PathFromTopLevel(udt.ResolvedClass), typeArgs));
+        } else {
+          if (type.AsTopLevelTypeWithMembers == null) { // git-issues/git-issue-697g.dfy while iterating over "nat"
+            AddUnsupportedFeature(tok, Feature.SubtypeConstraintsInQuantifiers);
+          } else {
+            container.Builder.AddExpr(
+              (DAST.Expression)DAST.Expression.create_Companion(PathFromTopLevel(type.AsTopLevelTypeWithMembers), typeArgs));
+          }
+        }
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitNameAndActualTypeArgs(string protectedName, List<Type> typeArgs, IOrigin tok,
+     Expression replacementReceiver, bool receiverAsArgument, ConcreteSyntaxTree wr) {
+      Option<_IFormal> receiverArg;
+      var receiverBeforeName = replacementReceiver != null && replacementReceiver is not StaticReceiverExpr;
+      Option<DAST.Type> receiverType = receiverBeforeName && !receiverAsArgument
+        ? (Option<DAST.Type>)Option<DAST.Type>.create_Some(GenType(replacementReceiver.Type))
+        : (Option<DAST.Type>)Option<DAST.Type>.create_None();
+      if (receiverBeforeName) {
+        var name = replacementReceiver is IdentifierExpr { Var: { } variable } && variable.GetOrCreateCompileName(enclosingDeclaration.CodeGenIdGenerator) is var compileName
+          ? compileName
+          : "receiver";
+        receiverArg = (Option<_IFormal>)Option<DAST._IFormal>.create_Some(
+          DAST.Formal.create_Formal(Sequence<Rune>.UnicodeFromString(name),
+          GenType(replacementReceiver.Type), ParseAttributes(null)));
+      } else {
+        receiverArg = (Option<_IFormal>)Option<_IFormal>.create_None();
+      }
+
+      if (GetExprBuilder(wr, out var st) && st.Builder is CallExprBuilder callExpr) {
+        var signature = callExpr.Signature;
+        callExpr.SetName((DAST.CallName)DAST.CallName.create_CallName(Sequence<Rune>.UnicodeFromString(protectedName), receiverType, receiverArg, receiverAsArgument, signature));
+      } else if (GetExprBuilder(wr, out var st2) && st2.Builder is CallStmtBuilder callStmt) {
+        var signature = callStmt.Signature;
+        callStmt.SetName((DAST.CallName)DAST.CallName.create_CallName(Sequence<Rune>.UnicodeFromString(protectedName), receiverType, receiverArg, receiverAsArgument, signature));
+      } else {
+        AddUnsupported(tok, "Builder issue: wr is as " + wr.GetType() +
+                                (GetExprBuilder(wr, out var st3) ?
+                                  " and its builder is a " + st3.Builder.GetType() : ""
+                                  ));
+        return;
+      }
+
+      base.EmitNameAndActualTypeArgs(protectedName, typeArgs, tok, replacementReceiver, receiverAsArgument, wr);
+    }
+
+    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
+      needsTypeParameter = false;
+      needsTypeDescriptor = false;
+    }
+
+    protected override bool DeclareFormal(string prefix, string name, Type type, IOrigin tok, bool isInParam, ConcreteSyntaxTree wr) {
+      AddUnsupported(tok, "<i>Declare formal</i>");
+      return true;
+    }
+
+    DeclareBuilder tmpDeclareBuilder;
+
+    protected override ConcreteSyntaxTree EmitAssignmentRhs(ConcreteSyntaxTree wr) {
+      if (tmpDeclareBuilder == null) {
+        return base.EmitAssignmentRhs(wr);
+      }
+      var t = tmpDeclareBuilder;
+      tmpDeclareBuilder = null;
+      return new BuilderSyntaxTree<ExprContainer>(t, this);
+    }
+
+    protected override void DeclareLocalVar(string name, Type type, IOrigin tok, bool leaveRoomForRhs, string rhs,
+        ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        var typ = GenType(type);
+
+        if (rhs == null) {
+          // we expect an initializer to come *after* this declaration
+          var variable = stmtContainer.Builder.DeclareAndAssign(typ, name);
+
+          if (leaveRoomForRhs) {
+            tmpDeclareBuilder = variable;
+          }
+        } else if (rhs == "BUFFERED") {
+          if (bufferedInitializationValue == null) {
+            throw new InvalidOperationException(
+              "Expected a buffered value to have been populated because rhs != null");
+          }
+
+          var rhsValue = bufferedInitializationValue;
+          bufferedInitializationValue = null;
+
+          if (bufferedInitializationStmts is { is_Some: true }) {
+            foreach (var stmt in bufferedInitializationStmts.dtor_value) {
+              stmtContainer.Builder.AddStatement(stmt);
+            }
+
+            bufferedInitializationStmts = null;
+          }
+
+          stmtContainer.Builder.AddStatement(
+            (DAST.Statement)DAST.Statement.create_DeclareVar(
+              Sequence<Rune>.UnicodeFromString(name),
+              typ,
+              rhsValue
+            )
+          );
+        } else {
+          throw new InvalidOperationException();
+        }
+      } else {
+        throw new InvalidOperationException("Cannot declare local var outside of a statement container: " + wr);
+      }
+    }
+
+    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type type, IOrigin tok, ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        var variable = stmtContainer.Builder.DeclareAndAssign(GenType(type), name);
+        return new BuilderSyntaxTree<ExprContainer>(variable, this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
+    protected override bool SupportsMultipleReturns => true;
+
+    protected override void DeclareLocalOutVar(string name, Type type, IOrigin tok, string rhs, bool useReturnStyleOuts,
+        ConcreteSyntaxTree wr) {
+      DeclareLocalVar(name, type, tok, true, rhs, wr);
+    }
+
+    protected override void EmitCallReturnOuts(List<string> outTmps, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var builder) && builder.Builder is CallStmtBuilder call) {
+        call.SetOuts(outTmps.Select(i => Sequence<Rune>.UnicodeFromString(i)).ToList());
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+
+
+    protected override void TrCallStmt(CallStmt s, string receiverReplacement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wrStmts, ConcreteSyntaxTree wrStmtsAfterCall) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        if (s.Method == enclosingMethod && enclosingMethod.IsTailRecursive) {
+          base.TrCallStmt(s, receiverReplacement, wr, wrStmts, wrStmtsAfterCall);
+        } else {
+          var parameters = GenFormals(s.Method.Ins);
+          var callBuilder = stmtContainer.Builder.Call(parameters);
+          base.TrCallStmt(s, receiverReplacement, new BuilderSyntaxTree<ExprContainer>(callBuilder, this), wrStmts, wrStmtsAfterCall);
+        }
+      } else {
+        throw new InvalidOperationException("Cannot call statement in this context: " + currentBuilder);
+      }
+    }
+
+    public override bool NeedsCustomReceiverNotTrait(MemberDecl member) {
+      return member is Constructor || base.NeedsCustomReceiverNotTrait(member);
+    }
+
+    protected override void EmitStaticExternMethodQualifier(string qual, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var builder)) {
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_ExternCompanion(
+          Sequence<ISequence<Rune>>.FromArray(new[] {
+            Defs.__default.DAFNY__EXTERN__MODULE,
+            Sequence<Rune>.UnicodeFromString(qual)
+          })
+          ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitCallToInheritedMethod(Method method, [CanBeNull] TopLevelDeclWithMembers heir, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, ConcreteSyntaxTree wStmtsAfterCall) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        var callBuilder = stmtContainer.Builder.Call(GenFormals(method.Ins));
+        base.EmitCallToInheritedMethod(method, heir, new BuilderSyntaxTree<ExprContainer>(callBuilder, this), wStmts, wStmtsAfterCall);
+      } else {
+        throw new InvalidOperationException("Cannot call inherited method in this context: " + currentBuilder);
+      }
+    }
+
+    protected override void EmitCallToInheritedFunction(Function f, [CanBeNull] TopLevelDeclWithMembers heir,
+      ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<ExprContainer> exprContainer) {
+        var callBuilder = exprContainer.Builder.Call(GenFormals(f.Ins));
+        base.EmitCallToInheritedFunction(f, heir, new BuilderSyntaxTree<ExprContainer>(callBuilder, this));
+      } else {
+        throw new InvalidOperationException("Cannot call inherited function in this context: " + currentBuilder);
+      }
+    }
+
+    protected override void EmitMultiReturnTuple(List<Formal> outs, List<Type> outTypes, List<string> outTmps, IOrigin methodToken, ConcreteSyntaxTree wr) {
+      // nothing to do, we auto-emit a return for the method
+    }
+
+    protected override void CompileFunctionCallExpr(FunctionCallExpr e, ConcreteSyntaxTree wr, bool inLetExprBody,
+        ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr, bool alreadyCoerced) {
+      var toType = e.Type.Subst(e.GetTypeArgumentSubstitutions());
+      var fromType = e.Function.Original.ResultType.Subst(e.GetTypeArgumentSubstitutions());
+      if (thisContext != null) {
+        toType = toType.Subst(thisContext.ParentFormalTypeParametersToActuals);
+        fromType = fromType.Subst(thisContext.ParentFormalTypeParametersToActuals);
+      }
+      wr = EmitCoercionIfNecessary(fromType, toType, e.Origin, wr);
+
+      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
+        var callBuilder = builder.Builder.Call(GenFormals(e.Function.Ins));
+        base.CompileFunctionCallExpr(e, new BuilderSyntaxTree<ExprContainer>(callBuilder, this), inLetExprBody, wStmts, tr, true);
+      } else {
+        throw new InvalidOperationException("Cannot call function in this context: " + currentBuilder);
+      }
+    }
+
+    protected override void EmitActualTypeArgs(List<Type> typeArgs, IOrigin tok, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var st) && st.Builder is CallExprBuilder callExpr) {
+        callExpr.SetTypeArgs(typeArgs.Select(GenType).ToList());
+      } else if (GetExprBuilder(wr, out var st2) && st2.Builder is CallStmtBuilder callStmt) {
+        callStmt.SetTypeArgs(typeArgs.Select(GenType).ToList());
+      } else {
+        throw new InvalidOperationException("Cannot emit actual type args in this context: " + currentBuilder);
+      }
+    }
+
+    private class BuilderLvalue : ILvalue {
+      readonly string name;
+      private readonly DafnyCodeGenerator compiler;
+
+      public BuilderLvalue(string name, DafnyCodeGenerator compiler) {
+        this.name = name;
+        this.compiler = compiler;
+      }
+
+      public void EmitRead(ConcreteSyntaxTree wr) {
+        throw new InvalidOperationException();
+      }
+
+      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
+        if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+          var assign = stmtContainer.Builder.Assign();
+          assign.AddLhs((DAST.AssignLhs)DAST.AssignLhs.create_Ident(Sequence<Rune>.UnicodeFromString(name)));
+          return new BuilderSyntaxTree<ExprContainer>(assign, this.compiler);
+        } else {
+          throw new InvalidOperationException();
+        }
+      }
+    }
+
+    private class ExprLvalue : ILvalue {
+      readonly DAST.Expression expr;
+      readonly DAST.AssignLhs assignExpr;
+      private readonly DafnyCodeGenerator compiler;
+
+      public ExprLvalue(DAST.Expression expr, DAST.AssignLhs assignExpr, DafnyCodeGenerator compiler) {
+        this.expr = expr;
+        this.assignExpr = assignExpr;
+        this.compiler = compiler;
+      }
+
+      public void EmitRead(ConcreteSyntaxTree wr) {
+        if (GetExprBuilder(wr, out var exprContainer)) {
+          exprContainer.Builder.AddExpr(expr);
+        } else {
+          compiler.AddUnsupported(Token.NoToken, "<i>EmitRead</i> without ExprContainer builder");
+        }
+      }
+
+      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
+        if (assignExpr == null) {
+          throw new InvalidOperationException();
+        }
+
+        if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+          var assign = stmtContainer.Builder.Assign();
+          assign.AddLhs(assignExpr);
+          return new BuilderSyntaxTree<ExprContainer>(assign, this.compiler);
+        } else {
+          throw new InvalidOperationException();
+        }
+      }
+    }
+
+    protected override void EmitAssignment(string lhs, Type/*?*/ lhsType, string rhs, Type/*?*/ rhsType, ConcreteSyntaxTree wr) {
+      throw new InvalidOperationException("Cannot use stringified version of assignment");
+    }
+
+    protected override ILvalue IdentLvalue(string var) {
+      return new BuilderLvalue(var, this);
+    }
+
+    protected override ILvalue SeqSelectLvalue(SeqSelectExpr ll, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitExpr(
+        ll.Seq, false,
+        EmitCoercionIfNecessary(
+          ll.Seq.Type,
+          ll.Seq.Type.IsNonNullRefType || !ll.Seq.Type.IsRefType ? null : UserDefinedType.CreateNonNullType((UserDefinedType)ll.Seq.Type.NormalizeExpand()),
+          ll.Origin, WrBuffer(out var sourceBuf)
+        ),
+        wStmts
+      );
+
+      EmitExpr(ll.E0, false, WrBuffer(out var indexBuf), wStmts);
+
+      var source = sourceBuf.Finish();
+      var index = indexBuf.Finish();
+
+
+      DAST._ICollKind collKind;
+      if (ll.Seq.Type.IsArrayType) {
+        collKind = DAST.CollKind.create_Array();
+      } else if (ll.Seq.Type.IsMapType) {
+        collKind = DAST.CollKind.create_Map();
+      } else {
+        collKind = DAST.CollKind.create_Seq();
+      }
+
+      return new ExprLvalue(
+        (DAST.Expression)DAST.Expression.create_Index(source, collKind, Sequence<DAST.Expression>.FromElements(index)),
+        (DAST.AssignLhs)DAST.AssignLhs.create_Index(source, Sequence<DAST.Expression>.FromElements(index)),
+        this
+      );
+    }
+
+    protected override ILvalue MultiSelectLvalue(MultiSelectExpr ll, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      throw new UnsupportedFeatureException(ll.Origin, Feature.MultiDimensionalArrays);
+    }
+
+    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        ExprBuffer buffer = new(null);
+        EmitExpr(arg, false, new BuilderSyntaxTree<ExprContainer>(buffer, this), wr);
+        stmtContainer.Builder.Print(buffer.Finish());
+      } else {
+        throw new InvalidOperationException("Cannot print outside of a statement container: " + currentBuilder);
+      }
+    }
+
+    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        stmtContainer.Builder.AddStatement((DAST.Statement)DAST.Statement.create_EarlyReturn());
+      } else {
+        throw new InvalidOperationException("Cannot return outside of a statement container: " + currentBuilder);
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        var labelBuilder = stmtContainer.Builder.Labeled((createContinueLabel ? "continue_" : "goto_") + label);
+        return new BuilderSyntaxTree<StatementContainer>(labelBuilder, this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitBreak(string label, ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        stmtContainer.Builder.AddStatement((DAST.Statement)DAST.Statement.create_Break(
+          label == null ? Option<ISequence<Rune>>.create_None() : Option<ISequence<Rune>>.create_Some(Sequence<Rune>.UnicodeFromString("goto_" + label))
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
+        stmtContainer.Builder.AddStatement((DAST.Statement)DAST.Statement.create_Break(
+          Option<ISequence<Rune>>.create_Some(Sequence<Rune>.UnicodeFromString("continue_" + label))
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitYield(ConcreteSyntaxTree wr) {
+      AddUnsupportedFeature(Token.NoToken, Feature.Iterators);
+    }
+
+    protected override void EmitAbsurd(string message, ConcreteSyntaxTree wr) {
+      // TODO(shadaj): emit correct message
+      if (wr is BuilderSyntaxTree<StatementContainer> container) {
+        container.Builder.AddStatement((DAST.Statement)DAST.Statement.create_Halt());
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitHalt(IOrigin tok, Expression messageExpr, ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> container) {
+        container.Builder.AddStatement((DAST.Statement)DAST.Statement.create_Halt());
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    private readonly Stack<(ElseBuilder, StatementContainer)> elseBuilderStack = new();
+
+    protected override ConcreteSyntaxTree EmitIf(out ConcreteSyntaxTree guardWriter, bool hasElse, ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> statementContainer) {
+        var containingBuilder = statementContainer.Builder;
+        if (elseBuilderStack.Count > 0 && elseBuilderStack.Peek().Item2 == statementContainer.Builder) {
+          var popped = elseBuilderStack.Pop();
+          statementContainer = new BuilderSyntaxTree<StatementContainer>(popped.Item1, this);
+          containingBuilder = popped.Item2;
+        }
+
+        var ifBuilder = statementContainer.Builder.IfElse();
+        if (hasElse) {
+          elseBuilderStack.Push((ifBuilder.Else(), containingBuilder));
+        }
+
+        guardWriter = new BuilderSyntaxTree<ExprContainer>(ifBuilder, this);
+        return new BuilderSyntaxTree<StatementContainer>(ifBuilder, this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitBlock(ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> statementContainer) {
+        if (elseBuilderStack.Count > 0 && elseBuilderStack.Peek().Item2 == statementContainer.Builder) {
+          return new BuilderSyntaxTree<StatementContainer>(elseBuilderStack.Pop().Item1, this);
+        } else {
+          return wr.Fork();
+        }
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    // Return a writer to write the start expression, which is lo if going up, and hi if going down
+    protected override ConcreteSyntaxTree EmitForStmt(IOrigin tok, IVariable loopIndex, bool goingUp, string endVarName,
+      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
+      if (GetStatementBuilder(wr, out var statementContainer)) {
+        var indexName = loopIndex.CompileNameShadowable;
+        ForeachBuilder foreachBuilder = statementContainer.Builder.Foreach(
+          indexName, GenType(loopIndex.Type));
+        if (endVarName == null) {
+          var startBuilder = ((ExprContainer)foreachBuilder).Wrapper(start =>
+            (DAST.Expression)DAST.Expression.create_UnboundedIntRange(
+              start,
+              goingUp
+            ));
+          ConcreteSyntaxTree bodyWr = new BuilderSyntaxTree<StatementContainer>(foreachBuilder, this);
+          bodyWr = EmitContinueLabel(labels, bodyWr);
+          TrStmtList(body, bodyWr);
+          return new BuilderSyntaxTree<ExprContainer>(startBuilder, this);
+        } else {
+          var loHiBuilder = ((ExprContainer)foreachBuilder).BinOp("int_range", (DAST.Expression lo, DAST.Expression hi) =>
+             (DAST.Expression)DAST.Expression.create_IntRange(
+               GenType(loopIndex.Type),
+               lo,
+               hi,
+               goingUp
+             ));
+          ConcreteSyntaxTree bodyWr = new BuilderSyntaxTree<StatementContainer>(foreachBuilder, this);
+          bodyWr = EmitContinueLabel(labels, bodyWr);
+          TrStmtList(body, bodyWr);
+          BuilderSyntaxTree<ExprContainer> toReturn;
+          if (goingUp) {
+            toReturn = WrBuffer(out var loBuf);
+            loHiBuilder.AddBuildable(loBuf);
+          } else {
+            toReturn = new BuilderSyntaxTree<ExprContainer>(loHiBuilder, this);
+          }
+          loHiBuilder.AddExpr((DAST.Expression)DAST.Expression.create_Ident(Sequence<Rune>.UnicodeFromString(endVarName)));
+          return toReturn;
+        }
+      }
+      throw new InvalidOperationException();
+    }
+
+    protected override ConcreteSyntaxTree CreateWhileLoop(out ConcreteSyntaxTree guardWriter, ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> statementContainer) {
+        var whileBuilder = statementContainer.Builder.While();
+        guardWriter = new BuilderSyntaxTree<ExprContainer>(whileBuilder, this);
+        return new BuilderSyntaxTree<StatementContainer>(whileBuilder, this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitArrayLength(Action<ConcreteSyntaxTree> arr, TypeRhs typeRhs, int d, bool native,
+      ConcreteSyntaxTree w) {
+      var arrayLengthBuilder = new ArrayLengthBuilder(GenType(typeRhs.Type), d, native);
+      arr(new BuilderSyntaxTree<ExprContainer>(arrayLengthBuilder, this));
+      if (w is BuilderSyntaxTree<ExprContainer> expressionContainer) {
+        expressionContainer.Builder.AddBuildable(arrayLengthBuilder);
+      } else {
+        throw new InvalidOperationException("ArrayLength within a non-expression context");
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateForLoop(string indexVar,
+      Action<ConcreteSyntaxTree> boundWriter, ConcreteSyntaxTree wr,
+      string start = null) {
+      if (wr is BuilderSyntaxTree<StatementContainer> statementContainer) {
+        var foreachBuilder = statementContainer.Builder.Foreach(indexVar, GenType(Dafny.Type.Int));
+        var nativeRangeBuilder = new NativeRangeBuilder(start);
+        foreachBuilder.AddBuildable(nativeRangeBuilder);
+        boundWriter(new BuilderSyntaxTree<ExprContainer>(nativeRangeBuilder, this));
+        return new BuilderSyntaxTree<StatementContainer>(foreachBuilder, this);
+      }
+      throw new InvalidOperationException("Not in a statement container");
+    }
+
+    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
+      AddUnsupportedFeature(Token.NoToken, Feature.ForLoops);
+      return wr;
+    }
+
+    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
+      AddUnsupported(Token.NoToken, "<i>EmitIncrementVar</i>");
+    }
+
+    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
+      AddUnsupported(Token.NoToken, "<i>EmitDecrementVar</i>");
+    }
+
+    protected override ConcreteSyntaxTree EmitQuantifierExpr(Action<ConcreteSyntaxTree> collection, bool isForall, Type collectionElementType, BoundVar bv, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var builder)) {
+        var tp = GenType(collectionElementType);
+        var argBuilder = builder.Builder.BinOp("quantifier",
+          (DAST.Expression collectionExpr, DAST.Expression lambda) =>
+            (DAST.Expression)DAST.Expression.create_Quantifier(tp, collectionExpr, isForall, lambda)
+        );
+        var wBody = new BuilderSyntaxTree<ExprContainer>(argBuilder, this);
+        collection(wBody);
+        return wBody;
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override string GetQuantifierName(string bvType) {
+      throw new InvalidOperationException();
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IOrigin tok,
+      out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      if (wr is BuilderSyntaxTree<StatementContainer> statementContainer) {
+        var foreachBuilder = statementContainer.Builder.Foreach(tmpVarName, GenType(collectionElementType));
+        collectionWriter = new BuilderSyntaxTree<ExprContainer>(foreachBuilder, this);
+        return new BuilderSyntaxTree<StatementContainer>(foreachBuilder, this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitDowncast(Type from, Type to, IOrigin tok, ConcreteSyntaxTree wr) {
+      return wr;
+    }
+
+    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
+      Type sourceType, bool introduceBoundVar, IOrigin tok, ConcreteSyntaxTree wr) {
+      var w = introduceBoundVar ? DeclareLocalVar(boundVarName, boundVarType, tok, wr) : IdentLvalue(boundVarName).EmitWrite(wr);
+      EmitIdentifier(tmpVarName, EmitCoercionIfNecessary(sourceType, boundVarType, tok, w));
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs,
+        out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      AddUnsupported(Token.NoToken, "<i>CreateForeachIngredientLoop</i>");
+      collectionWriter = new BuilderSyntaxTree<ExprContainer>(new ExprBuffer(null), this);
+      return new BuilderSyntaxTree<StatementContainer>(new StatementBuffer(), this);
+    }
+
+    protected override void EmitNew(Type type, IOrigin tok, CallStmt initCall, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        var ctor = (Constructor)initCall?.Method;
+        var arguments = Enumerable.Empty<DAST.Expression>();
+        if (ctor != null && ctor.IsExtern(Options, out _, out _)) {
+          // the arguments of any external constructor are placed here
+          arguments = ctor.Ins.Select((f, i) => (f, i))
+            .Where(tp => !tp.f.IsGhost)
+            .Select(tp => {
+              var localWriter = WrBuffer(out var buf);
+              EmitExpr(initCall.Args[tp.i], false, localWriter, wStmts);
+              return buf.Finish();
+            });
+        }
+
+        if (ctor == null) {
+          AddUnsupported(tok, "Creation of object of type " + type.ToString() + " requires a constructor");
+        }
+
+        var typeArgs = type.TypeArgs.Select(GenType).ToArray();
+
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_New(
+          PathFromTopLevel(type.AsTopLevelTypeWithMembers),
+          Sequence<DAST.Type>.FromArray(typeArgs),
+          Sequence<DAST.Expression>.FromArray(arguments.ToArray())
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitNewArray(Type elementType, IOrigin tok, List<string> dimensions,
+      bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      throw new InvalidOperationException();
+    }
+
+    protected override void EmitNewArray(Type elementType, IOrigin tok, List<Expression> dimensions, bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        var dimensionsAST = dimensions.Select(convert).ToArray();
+
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_NewUninitArray(
+          Sequence<DAST.Expression>.FromArray(dimensionsAST),
+          GenType(elementType)
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitIdentifier(string ident, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var builder)) {
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Ident(
+          Sequence<Rune>.UnicodeFromString(ident)
+        ));
+      } else {
+        AddUnsupported(Token.NoToken, "Expected ExprContainer, got " + wr.GetType());
+      }
+    }
+
+    // Overriden from SinglePassCodeGenerator to return a BuilderSyntaxTree
+    // To avoid UnsupportedInvalidOperationException in EmitIdentifier by way of set comprehension (github issue 5644)
+    protected override ConcreteSyntaxTree MaybeEmitCallToIsMethod(RedirectingTypeDecl declWithConstraints, List<Type> typeArguments, ConcreteSyntaxTree wr) {
+      Contract.Requires(declWithConstraints is SubsetTypeDecl or NewtypeDecl);
+      Contract.Requires(declWithConstraints.TypeArgs.Count == typeArguments.Count);
+      Contract.Requires(declWithConstraints.ConstraintIsCompilable);
+      switch (declWithConstraints) {
+        case NonNullTypeDecl:
+          // Non-null types don't have a special target class, so we just do the non-null constraint check here.
+          return EmitNullTest(false, wr);
+        case NewtypeDecl { TargetTypeCoversAllBitPatterns: true }: {
+            EmitLiteralExpr(wr, Expression.CreateBoolLiteral(declWithConstraints.Tok, true));
+            return new BuilderSyntaxTree<ExprContainer>(new ExprBuffer(null), this);
+          }
+        default: {
+            // in mind that type parameters are not accessible in static methods in some target languages).
+            var type = UserDefinedType.FromTopLevelDecl(declWithConstraints.Tok, (TopLevelDecl)declWithConstraints, typeArguments);
+            return EmitCallToIsMethod(declWithConstraints, type, wr);
+          }
+      }
+    }
+
+    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
+      if (GetExprBuilder(wr, out var builder)) {
+        DAST.Expression baseExpr;
+
+        switch (e) {
+          case CharLiteralExpr c:
+            var codePoint = Util.UnescapedCharacters(Options, (string)c.Value, false).Single();
+            if (Rune.IsRune(new BigInteger(codePoint))) { // More readable version in the generated code.
+              baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_CharLiteral(
+                new Rune(codePoint)
+              ));
+            } else {
+              baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_CharLiteralUTF16(
+                codePoint
+              ));
+            }
+
+            break;
+          case StringLiteralExpr str:
+            if (!UnicodeCharEnabled && Util.TokensWithEscapes(str.AsStringLiteral(), false) is var tokens && tokens.Any((string token) => Util.Utf16Escape.IsMatch(token))) {
+              var s = Util.UnescapedCharacters(UnicodeCharEnabled, str.AsStringLiteral(), true);
+              var chars = tokens.Select((string singleChar) =>
+                ConvertExpressionNoStatement(new CharLiteralExpr(Token.NoToken, singleChar) { Type = Type.Char })).ToArray();
+              baseExpr = (DAST.Expression)DAST.Expression.create_SeqValue(Sequence<DAST.Expression>.FromArray(chars), GenType(new CharType()));
+              // We need to emit a sequence of chars literal. We first 
+            } else {
+              baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_StringLiteral(
+                Sequence<Rune>.UnicodeFromString(str.AsStringLiteral()), str.IsVerbatim
+              ));
+            }
+            break;
+          case StaticReceiverExpr:
+            var typeArgs = Sequence<DAST.Type>.FromArray(e.Type.TypeArgs.Select(GenType).ToArray());
+
+            if (e.Type.NormalizeExpandKeepConstraints() is UserDefinedType udt && udt.ResolvedClass is DatatypeDecl dt &&
+                DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _)) {
+              baseExpr = (DAST.Expression)DAST.Expression.create_Companion(PathFromTopLevel(udt.ResolvedClass), typeArgs);
+            } else {
+              baseExpr = (DAST.Expression)DAST.Expression.create_Companion(PathFromTopLevel(e.Type.AsTopLevelTypeWithMembers), typeArgs);
+            }
+            break;
+          default:
+            DAST.Type baseType = GenType(e.Type.NormalizeToAncestorType());
+
+            switch (e.Value) {
+              case null:
+                baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_Null(GenType(e.Type)));
+                break;
+              case bool value:
+                baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_BoolLiteral(value));
+                break;
+              case BigInteger integer:
+                baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_IntLiteral(
+                  Sequence<Rune>.UnicodeFromString(integer.ToString()),
+                  baseType
+                ));
+                break;
+              case BigDec n:
+                var mantissaStr = n.Mantissa.ToString();
+                var denominator = "1";
+                if (n.Exponent > 0) {
+                  for (var i = 0; i < n.Exponent; i++) {
+                    mantissaStr += "0";
+                  }
+                } else {
+                  for (var i = 0; i < -n.Exponent; i++) {
+                    denominator += "0";
+                  }
+                }
+
+                baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_DecLiteral(
+                  Sequence<Rune>.UnicodeFromString(mantissaStr),
+                  Sequence<Rune>.UnicodeFromString(denominator),
+                  baseType
+                ));
+                break;
+              default:
+                // TODO: This may not be exhaustive
+                throw new cce.UnreachableException();
+            }
+            break;
+        }
+
+        if (e is not StaticReceiverExpr) {
+          if (e.Type.AsNewtype != null) {
+            baseExpr = (DAST.Expression)DAST.Expression.create_Convert(baseExpr, GenType(EraseNewtypeLayers(e.Type.AsNewtype)),
+              GenType(e.Type));
+          } else if (e.Type.AsSubsetType != null) {
+            baseExpr = (DAST.Expression)DAST.Expression.create_Convert(baseExpr, GenType(e.Type),
+              GenType(e.Type));
+          }
+        }
+
+        builder.Builder.AddExpr(baseExpr);
+      } else if (emitUncompilableCode && GetStatementBuilder(wr, out var builder2)) {
+        builder2.Builder.AddStatement(StatementContainer.UnsupportedToStatement($"Cannot emit literal expression {e} outside of expression context: " + wr.GetType()));
+      } else {
+        throw new InvalidOperationException("Cannot emit literal expression outside of expression context: " + wr.GetType());
+      }
+    }
+
+    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
+      AddUnsupported(Token.NoToken, "<i>EmitStringLiteral</i>");
+    }
+
+    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, [CanBeNull] NativeType nativeType,
+      bool surroundByUnchecked, ConcreteSyntaxTree wr) {
+      if (nativeType != null && bvType.NativeType.Name == nativeType.Name && bvType.NativeType.Bitwidth == nativeType.Bitwidth) {
+        return wr;
+      }
+
+      AddUnsupported(bvType.Origin, $"<i>EmitBitvectorTruncation from {bvType} to {nativeType}</i>");
+      return wr;
+    }
+
+    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
+        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      AddUnsupportedFeature(e0.Origin, Feature.BitvectorRotateFunctions);
+    }
+
+    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      AddUnsupportedFeature(Token.NoToken, Feature.NonSequentializableForallStatements);
+    }
+
+    protected override ConcreteSyntaxTree EmitIngredients(ConcreteSyntaxTree wr, string ingredients, int L,
+      string tupleTypeArgs, ForallStmt s, SingleAssignStmt s0, Expression rhs) {
+      AddUnsupportedFeature(Token.NoToken, Feature.NonSequentializableForallStatements);
+      return wr;
+    }
+    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      AddUnsupportedFeature(Token.NoToken, Feature.NonSequentializableForallStatements);
+      return wr;
+    }
+
+    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
+      AddUnsupportedFeature(Token.NoToken, Feature.NonSequentializableForallStatements);
+    }
+
+    protected override string IdProtect(string name) {
+      return PublicIdProtect(name);
+    }
+
+    public override string PublicIdProtect(string name) {
+      return MangleName(name);
+    }
+
+    protected override string FullTypeName(UserDefinedType udt, MemberDecl member = null) {
+      AddUnsupported(udt.Origin, "<i>FullTypeName</i>");
+      return "FullTypeName";
+    }
+
+    private DAST.Type FullTypeNameAST(UserDefinedType udt, MemberDecl member = null) {
+      if (udt.IsArrowType) {
+        var arrow = udt.AsArrowType;
+        return (DAST.Type)DAST.Type.create_Arrow(
+          Sequence<DAST.Type>.FromArray(arrow.Args.Select(m => GenType(m)).ToArray()),
+          GenType(arrow.Result)
+        );
+      } else if (udt.AsArrayType is var array && array != null) {
+        return (DAST.Type)DAST.Type.create_Array(GenType(udt.TypeArgs[0]), array.Dims);
+      }
+
+      var cl = udt.ResolvedClass;
+      switch (cl) {
+        case TypeParameter:
+          return (DAST.Type)DAST.Type.create_TypeArg(Sequence<Rune>.UnicodeFromString(IdProtect(udt.GetCompileName(Options))));
+        case TupleTypeDecl:
+          return (DAST.Type)DAST.Type.create_Tuple(Sequence<DAST.Type>.FromArray(
+            udt.TypeArgs.Select(m => GenType(m)).ToArray()
+          ));
+        default:
+          return TypeNameASTFromTopLevel(cl, udt.TypeArgs);
+      }
+    }
+
+    private ISequence<ISequence<Rune>> PathFromTopLevel(TopLevelDecl topLevel) {
+      List<ISequence<Rune>> path = new();
+      path.Add(Sequence<Rune>.UnicodeFromString(topLevel.EnclosingModuleDefinition.GetCompileName(Options)));
+      path.Add(Sequence<Rune>.UnicodeFromString(topLevel.GetCompileName(Options)));
+      return Sequence<ISequence<Rune>>.FromArray(path.ToArray());
+    }
+
+    private DAST.NewtypeRange NativeTypeToNewtypeRange(NewtypeDecl newtypeDecl, bool overflows) {
+      var nativeType = newtypeDecl.NativeType;
+      return (DAST.NewtypeRange)(nativeType?.Sel switch {
+        NativeType.Selection.Byte => NewtypeRange.create_U8(overflows),
+        NativeType.Selection.SByte => NewtypeRange.create_I8(overflows),
+        NativeType.Selection.UShort => NewtypeRange.create_U16(overflows),
+        NativeType.Selection.Short => NewtypeRange.create_I16(overflows),
+        NativeType.Selection.UInt => NewtypeRange.create_U32(overflows),
+        NativeType.Selection.Int => NewtypeRange.create_I32(overflows),
+        NativeType.Selection.ULong => NewtypeRange.create_U64(overflows),
+        NativeType.Selection.Long => NewtypeRange.create_I64(overflows),
+        NativeType.Selection.UDoubleLong => NewtypeRange.create_U128(overflows),
+        NativeType.Selection.DoubleLong => NewtypeRange.create_I128(overflows),
+        _ =>
+          EraseNewtypeLayers(newtypeDecl) is BoolType
+            ? NewtypeRange.create_Bool()
+          : NewtypeRange.create_NoRange()
+      });
+    }
+
+    private ISequence<DAST.Attribute> ParseAttributes(Attributes attributes) {
+      var a = attributes;
+      var result = new List<DAST.Attribute>() { };
+      while (a != null) {
+        var name = Sequence<Rune>.UnicodeFromString(a.Name);
+        var args = new List<Sequence<Rune>>();
+        foreach (var arg in a.Args) {
+          if (arg is Dafny.LiteralExpr { Value: var value }) {
+            var argToAdd = "";
+            if (value is string s) {
+              argToAdd = s;
+            } else if (value is bool b) {
+              argToAdd = b ? "true" : "false";
+            } else if (value is BigInteger big) {
+              argToAdd = big.ToString();
+            } else {
+              argToAdd = "unknown " + value.GetType();
+            }
+            args.Add((Sequence<Rune>)Sequence<Rune>.UnicodeFromString(argToAdd));
+          }
+        }
+        result.Add((DAST.Attribute)DAST.Attribute.create_Attribute(name,
+          Sequence<Sequence<Rune>>.FromArray(args.ToArray())));
+        a = a.Prev;
+      }
+
+      return Sequence<DAST.Attribute>.FromArray(result.ToArray());
+    }
+
+    protected override bool IsNewtypeErased(NewtypeDecl newtypeDecl) {
+      var erasedIfNewtype = true;
+      if (!Attributes.ContainsBool(newtypeDecl.Attributes, "rust_erased", ref erasedIfNewtype)) {
+        var hasNoMember = !newtypeDecl.Members.Any();
+        erasedIfNewtype = hasNoMember;
+      }
+
+      return erasedIfNewtype;
+    }
+
+    private DAST.Type TypeNameASTFromTopLevel(TopLevelDecl topLevel, List<Type> typeArgs) {
+      var path = PathFromTopLevel(topLevel);
+
+      if (topLevel is NonNullTypeDecl non) {
+        topLevel = non.Rhs.AsTopLevelTypeWithMembers;
+      }
+
+      var properMethods = new List<Sequence<Rune>>();
+      var extendedTraits = new List<DAST.Type>();
+
+      if (topLevel is TopLevelDeclWithMembers memberContainer) {
+        foreach (var member in memberContainer.Members) {
+          if (member.OverriddenMember == null) {
+            properMethods.Add((Sequence<Rune>)Sequence<Rune>.UnicodeFromString(member.GetCompileName(Options)));
+          }
+        }
+      }
+
+      var erasedIfNewtype = true;
+      if (topLevel is NewtypeDecl newtypeDecl) {
+        erasedIfNewtype = IsNewtypeErased(newtypeDecl);
+      }
+
+      foreach (var parentType in topLevel.ParentTypes(typeArgs, true)) {
+        extendedTraits.Add(GenType(parentType));
+      }
+
+      var seqProperMethods = Sequence<Sequence<Rune>>.FromArray(properMethods.ToArray());
+      var seqExtendTraits = Sequence<DAST.Type>.FromArray(extendedTraits.ToArray());
+      var seqTypeArgs = Sequence<DAST.Type>.FromArray(typeArgs.Select(m => GenType(m)).ToArray());
+
+      DAST.ResolvedTypeBase resolvedTypeBase;
+
+      if (topLevel is NewtypeDecl newType) {
+        var range = NativeTypeToNewtypeRange(newType, false);
+        var newtypeBase = newType.BaseType;
+        resolvedTypeBase = (DAST.ResolvedTypeBase)DAST.ResolvedTypeBase.create_Newtype(
+          GenType(newtypeBase), range, erasedIfNewtype);
+      } else if (topLevel is TypeSynonymDecl typeSynonym) { // Also SubsetTypeDecl
+        resolvedTypeBase = (DAST.ResolvedTypeBase)DAST.ResolvedTypeBase.create_SynonymType(
+          GenType(typeSynonym.Rhs.Subst(typeSynonym.TypeArgs.Zip(typeArgs).ToDictionary(kv => kv.Item1, kv => kv.Item2)).NormalizeExpand()));
+      } else if (topLevel is TraitDecl traitDecl) {
+        var traitType = traitDecl.IsReferenceTypeDecl
+          ? TraitType.create_ObjectTrait()
+          : TraitType.create_GeneralTrait();
+        resolvedTypeBase = (DAST.ResolvedTypeBase)DAST.ResolvedTypeBase.create_Trait(traitType);
+      } else if (topLevel is DatatypeDecl dd) {
+        var variances = Sequence<Variance>.FromArray(dd.TypeArgs.Select(GenTypeVariance).ToArray());
+        resolvedTypeBase = (DAST.ResolvedTypeBase)DAST.ResolvedTypeBase.create_Datatype(variances);
+      } else if (topLevel is ClassDecl) {
+        resolvedTypeBase = (DAST.ResolvedTypeBase)DAST.ResolvedTypeBase.create_Class();
+      } else {
+        // SubsetTypeDecl are covered by TypeSynonymDecl
+        throw new InvalidOperationException(topLevel.GetType().ToString());
+      }
+      var resolvedType = (DAST.ResolvedType)DAST.ResolvedType.create_ResolvedType(
+        path, seqTypeArgs, resolvedTypeBase, ParseAttributes(topLevel.Attributes), seqProperMethods, seqExtendTraits);
+
+      DAST.Type baseType = (DAST.Type)DAST.Type.create_UserDefined(resolvedType);
+
+      return baseType;
+    }
+
+    private static Type EraseNewtypeLayers(TopLevelDecl topLevel) {
+      var topLevelType = UserDefinedType.FromTopLevelDecl(topLevel.Origin, topLevel);
+      return topLevelType.NormalizeToAncestorType();
+    }
+
+    // Contrary to other backends, we don't necessarily erase newtypes
+    public override Type GetRuntimeType(Type tpe) {
+      if (tpe.AsNewtype is { } newtypeDecl && !IsNewtypeErased(newtypeDecl)) {
+        return tpe;
+      }
+      return base.GetRuntimeType(tpe);
+    }
+
+    public override ConcreteSyntaxTree Expr(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
+      if (currentBuilder is ExprContainer container) {
+        EmitExpr(expr, inLetExprBody, new BuilderSyntaxTree<ExprContainer>(container, this), wStmts);
+        return new BuilderSyntaxTree<ExprContainer>(new ExprBuffer(null), this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    public override void EmitExpr(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var actualWr = wr;
+      if (currentBuilder is ExprBuffer buf && wr is not BuilderSyntaxTree<ExprContainer>) {
+        // the writers are not currently wired properly for DatatypeValue
+        actualWr = new BuilderSyntaxTree<ExprContainer>(buf, this);
+      }
+      if (
+        actualWr is BuilderSyntaxTree<ExprContainer> { Builder: IfElseBuilder { Condition: null } or WhileBuilder { Condition: null } } builder &&
+        expr.Type is not BoolType) {
+        actualWr = EmitConversion(builder, expr.Type, new BoolType());
+      }
+
+      if (expr is DatatypeValue) {
+        ExprBuffer buffer = new(currentBuilder);
+        var origBuilder = currentBuilder;
+        currentBuilder = buffer;
+        base.EmitExpr(expr, inLetExprBody, actualWr, wStmts);
+
+        if (currentBuilder == buffer) {
+          // sometimes, we don't actually call EmitDatatypeValue
+          currentBuilder = origBuilder;
+        }
+      } else if (expr is BinaryExpr bin) {
+        var origBuilder = currentBuilder;
+        base.EmitExpr(expr, inLetExprBody, actualWr, wStmts);
+        currentBuilder = origBuilder;
+      } else if (expr is IdentifierExpr) {
+        // we don't need to create a copy of the identifier, that's language specific
+        base.EmitExpr(expr, false, actualWr, wStmts);
+      } else {
+        base.EmitExpr(expr, inLetExprBody, actualWr, wStmts);
+      }
+    }
+
+    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
+      if (GetExprBuilder(wr, out var builder)) {
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_This());
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var builder) && currentBuilder is ExprBuffer buf) {
+        List<DAST.Expression> contents = buf.PopAll();
+        currentBuilder = buf.parent; // pop early to make sure the receiving builder is in the expected state
+        List<_System._ITuple2<ISequence<Rune>, DAST.Expression>> namedContents = new();
+
+        int argI = 0;
+        for (int i = 0; i < dtv.Ctor.Formals.Count; i++) {
+          var destructor = dtv.Ctor.Destructors[i];
+          if (destructor.IsGhost) {
+            continue;
+          }
+
+          var actual = contents[argI];
+          var formal = dtv.Ctor.Formals[i];
+          var destructorName = GetDestructorFormalName(formal);
+          namedContents.Add(_System.Tuple2<ISequence<Rune>, DAST.Expression>.create(
+            Sequence<Rune>.UnicodeFromString(destructorName),
+            actual
+          ));
+
+          argI++;
+        }
+
+        if (argI != contents.Count) {
+          var error = "Datatype constructor "
+                + dtv.Ctor.Name + " expects " + dtv.Ctor.Formals.Count + " arguments, but "
+                + contents.Count + " were provided";
+          if (emitUncompilableCode) {
+            contents.Insert(0,
+              ExprContainer.UnsupportedToExpr(
+                error));
+            builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Tuple(
+              Sequence<DAST.Expression>.FromArray(contents.ToArray())
+              ));
+            return;
+          }
+          throw new InvalidOperationException(error);
+        }
+
+        if (dtv.Ctor.EnclosingDatatype is TupleTypeDecl tupleDecl) {
+          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Tuple(
+            Sequence<DAST.Expression>.FromArray(namedContents.Select(x => x.dtor__1).ToArray())
+          ));
+        } else {
+          var dtPath = PathFromTopLevel(dtv.Ctor.EnclosingDatatype);
+          var dtTypeArgs = Sequence<DAST.Type>.FromArray(dtv.InferredTypeArgs.Select(m => GenType(m)).ToArray());
+          var dType = GenType(dtv.Type);
+          if (!dType.is_UserDefined) {
+            throw new InvalidOperationException("Did not expected a non-user defined type for database values");
+          }
+
+          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_DatatypeValue(
+            dType.dtor_resolved,
+            dtTypeArgs,
+            Sequence<Rune>.UnicodeFromString(dtv.Ctor.GetCompileName(Options)),
+            dtv.Ctor.EnclosingDatatype is CoDatatypeDecl,
+            Sequence<_System._ITuple2<ISequence<Rune>, DAST.Expression>>.FromArray(namedContents.ToArray())
+          ));
+        }
+      } else {
+        throw new InvalidOperationException("Cannot emit datatype value outside of expression context: " + wr.GetType() + ", " + currentBuilder);
+      }
+    }
+
+    private static string GetDestructorFormalName(Formal formal) {
+      var defaultName = formal.CompileName;
+      object externVal = null;
+      bool hasExternVal = Attributes.ContainsMatchingValue(formal.Attributes, "extern",
+        ref externVal, new List<Attributes.MatchingValueOption> {
+          Attributes.MatchingValueOption.String
+        }, s => throw new UnsupportedInvalidOperationException("Non-string externs for destructors"));
+      var destructorName = externVal as string ?? defaultName;
+      return destructorName;
+    }
+
+    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType,
+        out string compiledName, out string preString, out string postString) {
+      compiledName = "";
+      preString = "";
+      postString = "";
+      switch (id) {
+        case SpecialField.ID.UseIdParam:
+          compiledName = (string)idParam;
+          break;
+        case SpecialField.ID.ArrayLength:
+        case SpecialField.ID.ArrayLengthInt:
+          break;
+        case SpecialField.ID.Keys:
+          break;
+        case SpecialField.ID.Values:
+          break;
+        case SpecialField.ID.Items:
+          break;
+        default:
+          AddUnsupported(receiverType.Origin, "<i>Special field: " + id + "</i>");
+          break;
+      }
+    }
+
+    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member,
+      List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap, Type expectedType,
+      string additionalCustomParameter = null, bool internalAccess = false) {
+      var objReceiver = new ExprBuffer(null);
+
+      var memberStatus = DatatypeWrapperEraser.GetMemberStatus(Options, member);
+
+      if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.Identity) {
+        obj(new BuilderSyntaxTree<ExprContainer>(objReceiver, this));
+        var objExpr = objReceiver.Finish();
+        return new ExprLvalue(objExpr, null, this);
+      } else if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue) {
+        return new ExprLvalue((DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_BoolLiteral(true)), null, this);
+      } else if (member is DatatypeDestructor dtor) {
+        obj(new BuilderSyntaxTree<ExprContainer>(objReceiver, this));
+        var objExpr = objReceiver.Finish();
+        if (dtor.EnclosingClass is TupleTypeDecl) {
+          return new ExprLvalue((DAST.Expression)DAST.Expression.create_TupleSelect(
+            objExpr,
+            int.Parse(dtor.CorrespondingFormals[0].NameForCompilation), GenType(expectedType)
+          ), null, this);
+        } else {
+          var attributes = member.Attributes ??
+                           (dtor.CorrespondingFormals.Count == 1 ? dtor.CorrespondingFormals[0].Attributes : null);
+          var compileName = GetExtractOverrideName(attributes, member.GetCompileName(Options));
+          return new ExprLvalue((DAST.Expression)DAST.Expression.create_Select(
+            objExpr,
+            Sequence<Rune>.UnicodeFromString(compileName),
+            FieldMutabilityOf(member),
+            member.EnclosingClass is DatatypeDecl or NewtypeDecl, GenType(expectedType)
+          ), (DAST.AssignLhs)DAST.AssignLhs.create_Select(
+            objExpr,
+            Sequence<Rune>.UnicodeFromString(member.GetCompileName(Options)),
+            member is ConstantField
+          ), this);
+        }
+      } else if (member is SpecialField { SpecialId: SpecialField.ID.ArrayLength } arraySpecial) {
+        obj(EmitCoercionIfNecessary(
+            objType,
+            objType.IsNonNullRefType || !objType.IsRefType ? null : UserDefinedType.CreateNonNullType((UserDefinedType)objType.NormalizeExpand()),
+          null, new BuilderSyntaxTree<ExprContainer>(objReceiver, this)
+        ));
+        var objExpr = objReceiver.Finish();
+
+        return new ExprLvalue((DAST.Expression)DAST.Expression.create_ArrayLen(
+          objExpr,
+          GenType(objType),
+          arraySpecial.IdParam != null ? ((int)arraySpecial.IdParam) : 0,
+          false
+        ), null, this);
+      } else if (member is SpecialField { SpecialId: SpecialField.ID.Keys }) {
+        obj(new BuilderSyntaxTree<ExprContainer>(objReceiver, this));
+        var objExpr = objReceiver.Finish();
+        return new ExprLvalue((DAST.Expression)DAST.Expression.create_MapKeys(
+          objExpr), null, this);
+      } else if (member is SpecialField { SpecialId: SpecialField.ID.Values }) {
+        obj(new BuilderSyntaxTree<ExprContainer>(objReceiver, this));
+        var objExpr = objReceiver.Finish();
+        return new ExprLvalue((DAST.Expression)DAST.Expression.create_MapValues(
+          objExpr), null, this);
+      } else if (member is SpecialField { SpecialId: SpecialField.ID.Items }) {
+        obj(new BuilderSyntaxTree<ExprContainer>(objReceiver, this));
+        var objExpr = objReceiver.Finish();
+        return new ExprLvalue((DAST.Expression)DAST.Expression.create_MapItems(
+          objExpr), null, this);
+      } else if (member is SpecialField sf && sf.SpecialId != SpecialField.ID.UseIdParam) {
+        obj(new BuilderSyntaxTree<ExprContainer>(objReceiver, this));
+        var objExpr = objReceiver.Finish();
+
+        GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out _, out _);
+        return new ExprLvalue((DAST.Expression)DAST.Expression.create_Select(
+          objExpr,
+          Sequence<Rune>.UnicodeFromString(compiledName),
+          FieldMutabilityOf(member),
+          member.EnclosingClass is DatatypeDecl or NewtypeDecl, GenType(expectedType)
+        ), (DAST.AssignLhs)DAST.AssignLhs.create_Select(
+          objExpr,
+          Sequence<Rune>.UnicodeFromString(compiledName),
+          member is ConstantField
+        ), this);
+      } else if (member is SpecialField sf2 && sf2.SpecialId == SpecialField.ID.UseIdParam && sf2.IdParam is string fieldName && fieldName.StartsWith("is_")) {
+        obj(new BuilderSyntaxTree<ExprContainer>(objReceiver, this));
+        var objExpr = objReceiver.Finish();
+
+        return new ExprLvalue((DAST.Expression)DAST.Expression.create_TypeTest(
+          objExpr,
+          PathFromTopLevel(objType.AsTopLevelTypeWithMembers),
+          Sequence<Rune>.UnicodeFromString(fieldName.Substring(3))
+        ), null, this);
+      } else {
+        obj(new BuilderSyntaxTree<ExprContainer>(objReceiver, this));
+        var objExpr = objReceiver.Finish();
+
+        if (expectedType.IsArrowType) {
+          return new ExprLvalue((DAST.Expression)DAST.Expression.create_SelectFn(
+            objExpr,
+            Sequence<Rune>.UnicodeFromString(member.GetCompileName(Options)),
+            member.EnclosingClass is DatatypeDecl,
+            member.IsStatic,
+            member.IsInstanceIndependentConstant,
+            Sequence<DAST.Type>.FromElements(expectedType.AsArrowType.Args.Select(GenType).ToArray())
+          ), null, this);
+        } else if (internalAccess && (member is ConstantField || member.EnclosingClass is TraitDecl)) {
+          return new ExprLvalue((DAST.Expression)DAST.Expression.create_Select(
+            objExpr,
+            Sequence<Rune>.UnicodeFromString(InternalFieldPrefix + member.GetCompileName(Options)),
+            FieldMutabilityOf(member, isInternal: true),
+            member.EnclosingClass is DatatypeDecl or NewtypeDecl, GenType(expectedType)
+          ), (DAST.AssignLhs)DAST.AssignLhs.create_Select(
+            objExpr,
+            Sequence<Rune>.UnicodeFromString(InternalFieldPrefix + member.GetCompileName(Options)),
+            member is ConstantField
+          ), this);
+        } else {
+          return new ExprLvalue((DAST.Expression)DAST.Expression.create_Select(
+            objExpr,
+            Sequence<Rune>.UnicodeFromString(member.GetCompileName(Options)),
+            FieldMutabilityOf(member),
+            member.EnclosingClass is DatatypeDecl or NewtypeDecl, GenType(expectedType)
+          ), (DAST.AssignLhs)DAST.AssignLhs.create_Select(
+            objExpr,
+            Sequence<Rune>.UnicodeFromString(member.GetCompileName(Options)),
+            member is ConstantField
+          ), this);
+        }
+      }
+    }
+
+    private static _IFieldMutability FieldMutabilityOf(MemberDecl member, bool isInternal = false) {
+      return member is ConstantField or DatatypeDestructor
+          ? isInternal || member is DatatypeDestructor
+            ? new FieldMutability_InternalClassConstantFieldOrDatatypeDestructor()
+            : new FieldMutability_ConstantField()
+          : new FieldMutability_ClassMutableField();
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Action<ConcreteSyntaxTree>> indices, Type elmtType, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var builder)) {
+        var indicesAST = indices.Select(i => {
+          var buf = new ExprBuffer(null);
+          var localWriter = new BuilderSyntaxTree<ExprContainer>(buf, this);
+          i(localWriter);
+          return buf.Finish();
+        }).ToList();
+
+        return new BuilderSyntaxTree<ExprContainer>(builder.Builder.Index(indicesAST, DAST.CollKind.create_Array()), this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        var indicesAST = indices.Select(convert).ToList();
+
+        return new BuilderSyntaxTree<ExprContainer>(builder.Builder.Index(
+          indicesAST, DAST.CollKind.create_Array()), this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override (ConcreteSyntaxTree wArray, ConcreteSyntaxTree wRhs) EmitArrayUpdate(List<Action<ConcreteSyntaxTree>> indices, Type elmtType, ConcreteSyntaxTree wr) {
+      if (GetStatementBuilder(wr, out var builder)) {
+        var indicesAST = indices.Select(i => {
+          var buf = new ExprBuffer(null);
+          var localWriter = new BuilderSyntaxTree<ExprContainer>(buf, this);
+          i(localWriter);
+          return buf.Finish();
+        }).ToList();
+
+        var assign = builder.Builder.Assign();
+
+        return (new BuilderSyntaxTree<ExprContainer>(((LhsContainer)assign).Array(indicesAST), this), new BuilderSyntaxTree<ExprContainer>(assign, this));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts) {
+      EmitExpr(expr, inLetExprBody, wr, wStmts);
+    }
+
+    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var sourceBuf = new ExprBuffer(null);
+      EmitExpr(source, inLetExprBody, new BuilderSyntaxTree<ExprContainer>(sourceBuf, this), wStmts);
+
+      DAST._ICollKind collKind;
+      Type indexType;
+      if (source.Type.IsArrayType) {
+        collKind = DAST.CollKind.create_Array();
+        indexType = Type.Int;
+      } else if (source.Type.NormalizeToAncestorType() is { IsMapType: true } normalized) {
+        collKind = DAST.CollKind.create_Map();
+        indexType = normalized.AsMapType.Domain;
+      } else {
+        collKind = DAST.CollKind.create_Seq();
+        indexType = Type.Int;
+      }
+
+      var indexBuf = new ExprBuffer(null);
+      var indexWr = EmitCoercionIfNecessary(index.Type.NormalizeExpand(), indexType, source.Origin, new BuilderSyntaxTree<ExprContainer>(indexBuf, this));
+      EmitExpr(index, inLetExprBody, indexWr, wStmts);
+
+      if (GetExprBuilder(wr, out var builder)) {
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Index(
+          sourceBuf.Finish(),
+          collKind,
+          Sequence<DAST.Expression>.FromElements(indexBuf.Finish())
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected static bool GetStatementBuilder(ConcreteSyntaxTree wStmts,
+      out BuilderSyntaxTree<StatementContainer> statementBuilder) {
+      if (wStmts is BuilderSyntaxTree<StatementContainer> s) {
+        statementBuilder = s;
+        return true;
+      }
+      statementBuilder = null;
+      return false;
+    }
+
+    protected static bool GetExprBuilder(ConcreteSyntaxTree wr,
+      out BuilderSyntaxTree<ExprContainer> builder) {
+      if (wr is BuilderSyntaxTree<ExprContainer> exprBuilder) {
+        builder = exprBuilder;
+        return true;
+      }
+      builder = null;
+      return false;
+    }
+
+    protected bool GetExprConverter(ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts,
+      out BuilderSyntaxTree<ExprContainer> builder,
+      out Func<Expression, DAST.Expression> converter) {
+      if (wr is BuilderSyntaxTree<ExprContainer> b) {
+        builder = b;
+        if (wStmts is BuilderSyntaxTree<StatementContainer> s) {
+          converter = (Expression expr) => ConvertExpression(expr, s);
+        } else {
+          var statementBuf = new NoStatementBuffer();
+          var sNoStmt = new BuilderSyntaxTree<StatementContainer>(statementBuf, this);
+          converter = (Expression expr) => ConvertExpression(expr, sNoStmt);
+        }
+
+        return true;
+      }
+      converter = null;
+      builder = null;
+      return false;
+    }
+
+    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
+      CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        if (resultCollectionType.AsSeqType is { }) {
+          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_SeqUpdate(
+            convert(source), convert(index), convert(value)
+          ));
+        } else if (resultCollectionType.AsMapType is { }) {
+          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_MapUpdate(
+            convert(source), convert(index), convert(value)
+          ));
+        } else {
+          AddUnsupported(source.Origin, "<i>EmitIndexCollectionUpdate for " + resultCollectionType.ToString() + "</i>");
+        }
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitSeqSelectRange(Expression source, Expression lo, Expression hi, bool fromArray,
+      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var sourceBuf = new ExprBuffer(null);
+      EmitExpr(
+        source,
+        inLetExprBody,
+        EmitCoercionIfNecessary(
+          source.Type,
+          source.Type.IsNonNullRefType || !source.Type.IsRefType ? null : UserDefinedType.CreateNonNullType((UserDefinedType)source.Type.NormalizeExpand()),
+          null, new BuilderSyntaxTree<ExprContainer>(sourceBuf, this)
+        ),
+        wStmts
+      );
+      var sourceExpr = sourceBuf.Finish();
+
+      DAST.Expression loExpr = null;
+      if (lo != null) {
+        var loBuf = new ExprBuffer(null);
+        var loWr = EmitCoercionIfNecessary(lo.Type.NormalizeExpand(), Type.Int, source.Origin, new BuilderSyntaxTree<ExprContainer>(loBuf, this));
+        EmitExpr(lo, inLetExprBody, loWr, wStmts);
+        loExpr = loBuf.Finish();
+      }
+
+      DAST.Expression hiExpr = null;
+      if (hi != null) {
+        var hiBuf = new ExprBuffer(null);
+        var loWr = EmitCoercionIfNecessary(hi.Type.NormalizeExpand(), Type.Int, source.Origin, new BuilderSyntaxTree<ExprContainer>(hiBuf, this));
+        EmitExpr(hi, inLetExprBody, loWr, wStmts);
+        hiExpr = hiBuf.Finish();
+      }
+
+      if (GetExprBuilder(wr, out var builder)) {
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_IndexRange(
+          sourceExpr,
+          fromArray,
+          loExpr != null ? Option<DAST._IExpression>.create_Some(loExpr) : Option<DAST._IExpression>.create_None(),
+          hiExpr != null ? Option<DAST._IExpression>.create_Some(hiExpr) : Option<DAST._IExpression>.create_None()
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        var size = expr.N;
+        if (size.Type.AsNewtype is { }) {
+          size = new ConversionExpr(expr.N.Origin, size, new IntType());
+        }
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_SeqConstruct(
+          convert(size),
+          convert(expr.Initializer)
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_ToMultiset(
+          convert(expr.E)));
+      } else {
+        AddUnsupportedFeature(expr.Origin, Feature.Multisets);
+      }
+    }
+
+    protected override void EmitApplyExpr(Type functionType, IOrigin tok, Expression function,
+        List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Apply(
+          convert(function),
+          Sequence<DAST.Expression>.FromArray(
+            arguments.Select(arg => convert(arg)).ToArray())));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
+      List<Type> boundTypes, Type resultType, IOrigin resultTok, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ref ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        var argsAST = arguments.Select((t, i) =>
+          (_System.Tuple2<DAST.Formal, DAST.Expression>)
+          _System.Tuple2<DAST.Formal, DAST.Expression>.create(
+            (DAST.Formal)DAST.Formal.create_Formal(Sequence<Rune>.UnicodeFromString(boundVars[i]),
+              GenType(boundTypes[i]), ParseAttributes(null)), convert(t))).ToList();
+
+        var retType = GenType(resultType);
+
+        return new BuilderSyntaxTree<ExprContainer>(builder.Builder.BetaRedex(
+          argsAST, retType
+        ), this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex,
+      DatatypeCtor ctor,
+      Func<List<Type>> getTypeArgs, Type bvType, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var builder)) {
+        if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
+          Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
+          Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
+          source(wr);
+        } else {
+          var buf = new ExprBuffer(null);
+          source(new BuilderSyntaxTree<ExprContainer>(buf, this));
+          var sourceAST = buf.Finish();
+          if (ctor.EnclosingDatatype is TupleTypeDecl) {
+            builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_TupleSelect(
+              sourceAST,
+              int.Parse(dtor.NameForCompilation), GenType(dtor.Type)
+            ));
+          } else {
+            var compileName = GetExtractOverrideName(dtor.Attributes, dtor.GetOrCreateCompileName(currentIdGenerator));
+            builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Select(
+              sourceAST,
+              Sequence<Rune>.UnicodeFromString(compileName),
+              new FieldMutability_InternalClassConstantFieldOrDatatypeDestructor(),
+              true, GenType(dtor.Type)
+            ));
+          }
+        }
+      }
+    }
+
+    private static string GetExtractOverrideName(Attributes attributes, string defaultValue) {
+      return ((Attributes.Find(attributes, "extern_extract") is { } extern_extract
+               && extern_extract.Args.Count() == 1 && extern_extract.Args[0] is LiteralExpr { Value: string overrideName }
+        ? overrideName : defaultValue));
+    }
+
+    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IOrigin tok, List<string> inNames,
+        Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
+      if (GetExprBuilder(wr, out var builder)) {
+        var formals = new List<DAST.Formal>();
+        for (int i = 0; i < inTypes.Count; ++i) {
+          formals.Add((DAST.Formal)DAST.Formal.create_Formal(
+            Sequence<Rune>.UnicodeFromString(inNames[i]),
+            GenType(inTypes[i]), ParseAttributes(null)
+          ));
+        }
+
+        var retType = GenType(resultType);
+
+        return new BuilderSyntaxTree<StatementContainer>(builder.Builder.Lambda(formals, retType), this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitLambdaApply(ConcreteSyntaxTree wr, out ConcreteSyntaxTree wLambda, out ConcreteSyntaxTree wArg) {
+      if (GetExprBuilder(wr, out var exprBuilder)) {
+        var lambda = exprBuilder.Builder.Apply();
+        wLambda = new BuilderSyntaxTree<ExprContainer>(lambda, this);
+        wArg = new BuilderSyntaxTree<ExprContainer>(lambda, this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitCallToIsMethod(RedirectingTypeDecl declWithConstraints, Type type, ConcreteSyntaxTree wr) {
+      if (!GetExprBuilder(wr, out var builder)) {
+        throw new InvalidOperationException();
+      }
+
+      if (declWithConstraints is SubsetTypeDecl subsetTypeDecl) {
+        // Since this type becomes a type synonym at run-time, we simply inline the condition
+        // We put it as a IIFE
+        var constraint = subsetTypeDecl.Constraint;
+
+        var statementBuf = new NoStatementBuffer();
+        ConcreteSyntaxTree sNoStmt = new BuilderSyntaxTree<StatementContainer>(statementBuf, this);
+        CreateIIFE(GetCompileNameNotProtected(subsetTypeDecl.Var), subsetTypeDecl.Var.Type, subsetTypeDecl.Var.Origin,
+        Type.Bool, constraint.Origin, wr, ref sNoStmt, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody);
+        if (!GetExprBuilder(wrBody, out var wrBodyBuilder)) {
+          throw new InvalidOperationException();
+        }
+        wrBodyBuilder.Builder.AddExpr(ConvertExpression(constraint, sNoStmt));
+        return wrRhs;
+      }
+
+      var signature = Sequence<_IFormal>.FromArray(new[] {
+        new DAST.Formal(Sequence<Rune>.UnicodeFromString("_dummy_"), GenType(type), Sequence<DAST.Attribute>.Empty)
+      });
+      var c = builder.Builder.Call(signature);
+      c.SetName((DAST.CallName)DAST.CallName.create_CallName(Sequence<Rune>.UnicodeFromString("is"),
+        Option<_IType>.create_None(), Option<_IFormal>.create_None(), false, signature));
+      var wrc = new BuilderSyntaxTree<ExprContainer>(c, this);
+      EmitTypeName_Companion(type, wrc,
+        wr, declWithConstraints.Tok, null);
+      return wrc;
+    }
+
+    protected override ConcreteSyntaxTree EmitAnd(Action<ConcreteSyntaxTree> lhs, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var builder)) {
+        var boolType = (DAST.Type)DAST.Type.create_Primitive(Primitive.create_Bool());
+        var binOp = builder.Builder.BinOp((DAST.BinOp)DAST.BinOp.create_And(), boolType, boolType, boolType);
+        lhs(new BuilderSyntaxTree<ExprContainer>(binOp, this));
+
+        return new BuilderSyntaxTree<ExprContainer>(binOp, this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitArrayIndexToInt(ConcreteSyntaxTree wr, out ConcreteSyntaxTree wIndex) {
+      if (GetExprBuilder(wr, out var builder)) {
+        var binOp = builder.Builder.Wrapper((DAST.Expression nativeArrayIndex) =>
+          (DAST.Expression)DAST.Expression.create_ArrayIndexToInt(nativeArrayIndex));
+        wIndex = new BuilderSyntaxTree<ExprContainer>(binOp, this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitArrayFinalize(ConcreteSyntaxTree wr, out ConcreteSyntaxTree wrArray, Type type) {
+      if (GetExprBuilder(wr, out var builder)) {
+        var binOp = builder.Builder.Wrapper((DAST.Expression arrayPointer) =>
+          (DAST.Expression)DAST.Expression.create_FinalizeNewArray(arrayPointer, GenType(type)));
+        wrArray = new BuilderSyntaxTree<ExprContainer>(binOp, this);
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitBoolBoundedPool(bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprBuilder(wr, out var exprBuilder)) {
+        exprBuilder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_BoolBoundedPool());
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitCharBoundedPool(bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      AddUnsupported(Token.NoToken, "<i>EmitCharBoundedPool</i>");
+    }
+
+    protected override void EmitWiggleWaggleBoundedPool(bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      AddUnsupported(Token.NoToken, "<i>EmitWiggleWaggleBoundedPool</i>");
+    }
+
+    protected override void EmitSetBoundedPool(Expression of, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var exprBuilder, out var convert)) {
+        exprBuilder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_SetBoundedPool(
+          convert(of)
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitMultiSetBoundedPool(Expression of, bool includeDuplicates, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var exprBuilder, out var convert)) {
+        exprBuilder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_MultisetBoundedPool(
+          convert(of), includeDuplicates
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitSubSetBoundedPool(Expression of, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      AddUnsupported(of.Origin, "<i>EmitSubSetBoundedPool</i>");
+    }
+
+    protected override void EmitMapBoundedPool(Expression map, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var exprBuilder, out var convert)) {
+        exprBuilder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_MapBoundedPool(
+          convert(map)
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitSeqBoundedPool(Expression of, bool includeDuplicates, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var exprBuilder, out var convert)) {
+        exprBuilder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_SeqBoundedPool(
+          convert(of),
+          includeDuplicates
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitDatatypeBoundedPool(IVariable bv, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var exprBuilder, out var convert)) {
+        if (bv.Type.IsDatatype && bv.Type.AsDatatype is { } datatypeDecl) {
+
+          var signature = Sequence<_IFormal>.FromArray(new _IFormal[] { });
+          var c = exprBuilder.Builder.Call(signature);
+          c.SetName((DAST.CallName)DAST.CallName.create_CallName(Sequence<Rune>.UnicodeFromString("_AllSingletonConstructors"),
+            Option<_IType>.create_None(), Option<_IFormal>.create_None(), false, signature));
+          var wrc = new BuilderSyntaxTree<ExprContainer>(c, this);
+          EmitTypeName_Companion(bv.Type, wrc, wr, bv.Origin, null);
+        } else {
+          throw new InvalidOperationException("Datatype Bounded pool on non-datatype value");
+        }
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void CreateIIFE(string bvName, Type bvType, IOrigin bvTok, Type bodyType, IOrigin bodyTok,
+      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
+      if (GetExprBuilder(wr, out var builder)) {
+        var iife = builder.Builder.IIFE(bvName, GenType(bvType));
+        wrRhs = new BuilderSyntaxTree<ExprContainer>(iife.RhsBuilder(), this);
+        wrBody = new BuilderSyntaxTree<ExprContainer>(iife, this);
+      } else {
+        throw new InvalidOperationException("Invalid context for IIFE: " + wr.GetType());
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IOrigin resultTok, ConcreteSyntaxTree wr,
+        ConcreteSyntaxTree wStmts) {
+      EmitLambdaApply(wr, out var wLambda, out var wArg);
+      return CreateLambda(new(), null, new(), resultType, wLambda, wStmts);
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IOrigin resultTok, string bvName,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitLambdaApply(wr, out var wLambda, out var wArg);
+      var ret = CreateLambda(new() { Type.Int }, null, new() { bvName }, resultType, wLambda, wStmts);
+      EmitLiteralExpr(wArg, new LiteralExpr(null, source) {
+        Type = Type.Int
+      });
+      return ret;
+    }
+
+    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var container, out var convert)) {
+        var dastExpr = convert(expr);
+        switch (op) {
+          case ResolvedUnaryOp.BoolNot: {
+              container.Builder.AddExpr((DAST.Expression)DAST.Expression.create_UnOp(
+                UnaryOp.create_Not(),
+                dastExpr,
+                new UnaryOpFormat_NoFormat()
+              ));
+              break;
+            }
+          case ResolvedUnaryOp.BitwiseNot: {
+              container.Builder.AddExpr((DAST.Expression)DAST.Expression.create_UnOp(
+                UnaryOp.create_BitwiseNot(),
+                dastExpr,
+                new UnaryOpFormat_NoFormat()
+              ));
+              break;
+            }
+          case ResolvedUnaryOp.Cardinality: {
+              container.Builder.AddExpr((DAST.Expression)DAST.Expression.create_UnOp(
+                UnaryOp.create_Cardinality(),
+                dastExpr,
+                new UnaryOpFormat_NoFormat()
+              ));
+              break;
+            }
+        }
+      } else {
+        AddUnsupported(expr.Origin, "<i>UnaryExpr " + op + " without expr container</i>");
+      }
+    }
+
+    // A few helpers to reduce the size of expressions
+    private static DAST.Expression Not(_IExpression expr, bool mergeInner = true) {
+      return (DAST.Expression)DAST.Expression.create_UnOp(
+        new UnaryOp_Not(),
+        (DAST.Expression)expr,
+        mergeInner ? new UnaryOpFormat_CombineFormat() : new UnaryOpFormat_NoFormat());
+    }
+
+    private static DAST.Expression BinaryOp(_ITypedBinOp typedOp, _IExpression left, _IExpression right, _IBinaryOpFormat format = null) {
+      format ??= new BinaryOpFormat_NoFormat();
+
+      return (DAST.Expression)DAST.Expression.create_BinOp(typedOp, left, right, format
+      );
+    }
+
+    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
+      Type e0Type, Type e1Type, IOrigin tok, Type resultType,
+      out string opString,
+      out string preOpString,
+      out string postOpString,
+      out string callString,
+      out string staticCallString,
+      out bool reverseArguments,
+      out bool truncateResult,
+      out bool convertE1_to_int,
+      out bool coerceE1,
+      ConcreteSyntaxTree errorWr) {
+      if (errorWr is BuilderSyntaxTree<ExprContainer> builder) {
+        opString = null;
+        preOpString = "";
+        postOpString = "";
+        callString = null;
+        staticCallString = null;
+        reverseArguments = false;
+        truncateResult = false;
+        convertE1_to_int = false;
+        coerceE1 = false;
+        var overflows = e0Type is BitvectorType;
+
+        opString = op switch {
+          BinaryExpr.ResolvedOpcode.Iff => "==",
+          BinaryExpr.ResolvedOpcode.And => "&&",
+          BinaryExpr.ResolvedOpcode.Or => "||",
+          BinaryExpr.ResolvedOpcode.BitwiseAnd => "&",
+          BinaryExpr.ResolvedOpcode.BitwiseOr => "|",
+          BinaryExpr.ResolvedOpcode.BitwiseXor => "^",
+          BinaryExpr.ResolvedOpcode.Lt => "<",
+          BinaryExpr.ResolvedOpcode.LtChar => "<",
+          BinaryExpr.ResolvedOpcode.Le => "<=",
+          BinaryExpr.ResolvedOpcode.LeChar => "<=",
+          BinaryExpr.ResolvedOpcode.Ge => ">=",
+          BinaryExpr.ResolvedOpcode.GeChar => ">=",
+          BinaryExpr.ResolvedOpcode.Gt => ">",
+          BinaryExpr.ResolvedOpcode.GtChar => ">",
+          BinaryExpr.ResolvedOpcode.LeftShift => "<<",
+          BinaryExpr.ResolvedOpcode.RightShift => ">>",
+          BinaryExpr.ResolvedOpcode.Add => "+",
+          BinaryExpr.ResolvedOpcode.Sub => "-",
+          BinaryExpr.ResolvedOpcode.Mul => "*",
+          BinaryExpr.ResolvedOpcode.SetEq => "==",
+          BinaryExpr.ResolvedOpcode.SetNeq => "!=",
+          BinaryExpr.ResolvedOpcode.MultiSetEq => "==",
+          BinaryExpr.ResolvedOpcode.MultiSetNeq => "!=",
+          BinaryExpr.ResolvedOpcode.SeqEq => "==",
+          BinaryExpr.ResolvedOpcode.SeqNeq => "!=",
+          BinaryExpr.ResolvedOpcode.MapEq => "==",
+          BinaryExpr.ResolvedOpcode.MapNeq => "!=",
+          BinaryExpr.ResolvedOpcode.ProperSubset => "<",
+          BinaryExpr.ResolvedOpcode.ProperMultiSubset => "<",
+          BinaryExpr.ResolvedOpcode.Subset => "<=",
+          BinaryExpr.ResolvedOpcode.MultiSubset => "<=",
+          BinaryExpr.ResolvedOpcode.Disjoint => "!!",
+          BinaryExpr.ResolvedOpcode.MultiSetDisjoint => "!!",
+          BinaryExpr.ResolvedOpcode.InMultiSet => "in",
+          BinaryExpr.ResolvedOpcode.InMap => "in",
+          BinaryExpr.ResolvedOpcode.NotInMap => "notin",
+          BinaryExpr.ResolvedOpcode.Union => "+",
+          BinaryExpr.ResolvedOpcode.MultiSetUnion => "+",
+          BinaryExpr.ResolvedOpcode.MapMerge => "+",
+          BinaryExpr.ResolvedOpcode.Intersection => "*",
+          BinaryExpr.ResolvedOpcode.MultiSetIntersection => "*",
+          BinaryExpr.ResolvedOpcode.MultiSetDifference => "-",
+          BinaryExpr.ResolvedOpcode.MapSubtraction => "-",
+          BinaryExpr.ResolvedOpcode.ProperPrefix => "<=",
+          BinaryExpr.ResolvedOpcode.Prefix => "<",
+          BinaryExpr.ResolvedOpcode.NeqCommon => "!=",
+          _ => null
+        };
+
+        var typeLeft = GenType(e0Type);
+        var typeRight = GenType(e1Type);
+        var typeResult = GenType(resultType);
+
+        object B(_IBinOp binOp) {
+          return builder.Builder.BinOp((DAST.BinOp)binOp, typeLeft, typeRight, typeResult);
+        }
+
+        var opStringClosure = opString;
+        object C(System.Func<DAST.Expression, DAST.Expression, DAST.Expression> callback) {
+          return builder.Builder.BinOp(opStringClosure, callback);
+        }
+
+        TypedBinOp TypeOp(_IBinOp binOp) {
+          return (TypedBinOp)TypedBinOp.create_TypedBinOp(binOp, typeLeft, typeRight, typeResult);
+        }
+
+        TypedBinOp TypeOpRev(_IBinOp binOp) {
+          return (TypedBinOp)TypedBinOp.create_TypedBinOp(binOp, typeRight, typeLeft, typeResult);
+        }
+
+        var newBuilder = op switch {
+          BinaryExpr.ResolvedOpcode.EqCommon => B((BinOp)BinOp.create_Eq(
+            e0Type.IsRefType
+          )),
+          BinaryExpr.ResolvedOpcode.SetEq => B((BinOp)BinOp.create_Eq(false)),
+          BinaryExpr.ResolvedOpcode.MapEq => B((BinOp)BinOp.create_Eq(false)),
+          BinaryExpr.ResolvedOpcode.SeqEq => B((BinOp)BinOp.create_Eq(false)),
+          BinaryExpr.ResolvedOpcode.MultiSetEq => B((BinOp)BinOp.create_Eq(false)),
+          BinaryExpr.ResolvedOpcode.NeqCommon => C((left, right) =>
+            Not(BinaryOp(
+              TypeOp(BinOp.create_Eq(
+                e0Type.IsRefType
+              )), left, right))),
+          BinaryExpr.ResolvedOpcode.SetNeq => C((left, right) =>
+            Not(BinaryOp(TypeOp(BinOp.create_Eq(false)), left, right))),
+          BinaryExpr.ResolvedOpcode.SeqNeq => C((left, right) =>
+            Not(BinaryOp(TypeOp(BinOp.create_Eq(false)), left, right))),
+          BinaryExpr.ResolvedOpcode.MapNeq => C((left, right) =>
+            Not(BinaryOp(TypeOp(BinOp.create_Eq(false)), left, right))),
+          BinaryExpr.ResolvedOpcode.MultiSetNeq => C((left, right) =>
+            Not(BinaryOp(TypeOp(BinOp.create_Eq(false)), left, right))),
+
+          BinaryExpr.ResolvedOpcode.Div =>
+            B(NeedsEuclideanDivision(resultType) ? BinOp.create_EuclidianDiv() : BinOp.create_Div(overflows)),
+          BinaryExpr.ResolvedOpcode.Mod =>
+            B(NeedsEuclideanDivision(resultType) ? BinOp.create_EuclidianMod() : BinOp.create_Mod()),
+          BinaryExpr.ResolvedOpcode.Imp =>
+            C((left, right) =>
+              BinaryOp(
+                TypeOp(DAST.BinOp.create_Or()),
+                Not(left, false), right, new BinaryOpFormat_ImpliesFormat()
+              )),
+          BinaryExpr.ResolvedOpcode.Iff =>
+            C((left, right) =>
+              BinaryOp(
+                TypeOp(BinOp.create_Eq(false)),
+                left, right, new BinaryOpFormat_EquivalenceFormat()
+              )),
+          BinaryExpr.ResolvedOpcode.InSet => B(DAST.BinOp.create_In()), // TODO: Differentiate?
+          BinaryExpr.ResolvedOpcode.InSeq => B(DAST.BinOp.create_In()),
+          BinaryExpr.ResolvedOpcode.InMap => B(DAST.BinOp.create_In()),
+          BinaryExpr.ResolvedOpcode.InMultiSet => B(DAST.BinOp.create_In()),
+
+
+          BinaryExpr.ResolvedOpcode.Union =>
+            B(DAST.BinOp.create_SetMerge()),
+          BinaryExpr.ResolvedOpcode.SetDifference =>
+            B(DAST.BinOp.create_SetSubtraction()),
+          BinaryExpr.ResolvedOpcode.Intersection =>
+            B(DAST.BinOp.create_SetIntersection()),
+          BinaryExpr.ResolvedOpcode.Disjoint =>
+            B(DAST.BinOp.create_SetDisjoint()),
+          BinaryExpr.ResolvedOpcode.ProperSubset =>
+            B(DAST.BinOp.create_ProperSubset()),
+          BinaryExpr.ResolvedOpcode.Subset =>
+            B(DAST.BinOp.create_Subset()),
+          BinaryExpr.ResolvedOpcode.Superset =>
+            C((left, right) =>
+              BinaryOp(TypeOpRev(new BinOp_Subset()), right, left,
+                new BinaryOpFormat_ReverseFormat())),
+          BinaryExpr.ResolvedOpcode.ProperSuperset =>
+            C((left, right) =>
+              BinaryOp(TypeOpRev(new BinOp_ProperSubset()), right, left,
+                new BinaryOpFormat_ReverseFormat())),
+
+          BinaryExpr.ResolvedOpcode.MultiSetUnion =>
+            B(DAST.BinOp.create_MultisetMerge()),
+          BinaryExpr.ResolvedOpcode.MultiSetDifference =>
+            B(DAST.BinOp.create_MultisetSubtraction()),
+          BinaryExpr.ResolvedOpcode.MultiSetIntersection =>
+            B(DAST.BinOp.create_MultisetIntersection()),
+          BinaryExpr.ResolvedOpcode.MultiSetDisjoint =>
+            B(DAST.BinOp.create_MultisetDisjoint()),
+          BinaryExpr.ResolvedOpcode.ProperMultiSubset =>
+            B(DAST.BinOp.create_ProperSubmultiset()),
+          BinaryExpr.ResolvedOpcode.MultiSubset =>
+            B(DAST.BinOp.create_Submultiset()),
+          BinaryExpr.ResolvedOpcode.MultiSuperset =>
+            C((left, right) =>
+              BinaryOp(TypeOpRev(new BinOp_Submultiset()), right, left,
+                new BinaryOpFormat_ReverseFormat())),
+          BinaryExpr.ResolvedOpcode.ProperMultiSuperset =>
+            C((left, right) =>
+              BinaryOp(TypeOpRev(new BinOp_ProperSubmultiset()), right, left,
+                new BinaryOpFormat_ReverseFormat())),
+
+          BinaryExpr.ResolvedOpcode.MapMerge =>
+            B(DAST.BinOp.create_MapMerge()),
+          BinaryExpr.ResolvedOpcode.MapSubtraction =>
+            B(DAST.BinOp.create_MapSubtraction()),
+
+          BinaryExpr.ResolvedOpcode.ProperPrefix =>
+            B(DAST.BinOp.create_SeqProperPrefix()),
+          BinaryExpr.ResolvedOpcode.Prefix =>
+            B(DAST.BinOp.create_SeqPrefix()),
+
+          BinaryExpr.ResolvedOpcode.NotInMap =>
+            C((left, right) =>
+              Not(BinaryOp(TypeOp(new BinOp_In()), left, right))),
+          BinaryExpr.ResolvedOpcode.NotInSet =>
+            C((left, right) =>
+              Not(BinaryOp(TypeOp(new BinOp_In()), left, right))),
+          BinaryExpr.ResolvedOpcode.NotInSeq =>
+            C((left, right) =>
+              Not(BinaryOp(TypeOp(new BinOp_In()), left, right))),
+          BinaryExpr.ResolvedOpcode.NotInMultiSet =>
+            C((left, right) =>
+              Not(BinaryOp(TypeOp(new BinOp_In()), left, right))),
+          BinaryExpr.ResolvedOpcode.Concat => B(BinOp.create_Concat()),
+          BinaryExpr.ResolvedOpcode.And => B(BinOp.create_And()),
+          BinaryExpr.ResolvedOpcode.Or => B(BinOp.create_Or()),
+          BinaryExpr.ResolvedOpcode.Add => B(BinOp.create_Plus(overflows)),
+          BinaryExpr.ResolvedOpcode.Sub => B(BinOp.create_Minus(overflows)),
+          BinaryExpr.ResolvedOpcode.Mul => B(BinOp.create_Times(overflows)),
+          BinaryExpr.ResolvedOpcode.BitwiseAnd => B(BinOp.create_BitwiseAnd()),
+          BinaryExpr.ResolvedOpcode.BitwiseOr => B(BinOp.create_BitwiseOr()),
+          BinaryExpr.ResolvedOpcode.BitwiseXor => B(BinOp.create_BitwiseXor()),
+          BinaryExpr.ResolvedOpcode.LeftShift => B(BinOp.create_BitwiseShiftLeft()),
+          BinaryExpr.ResolvedOpcode.RightShift => B(BinOp.create_BitwiseShiftRight()),
+          BinaryExpr.ResolvedOpcode.Lt =>
+            B(BinOp.create_Lt()),
+          BinaryExpr.ResolvedOpcode.LtChar =>
+            B(BinOp.create_LtChar()),
+          BinaryExpr.ResolvedOpcode.Le =>
+            C((left, right) =>
+              Not(BinaryOp(TypeOpRev(new BinOp_Lt()), right, left,
+                new BinaryOpFormat_ReverseFormat()))),
+          BinaryExpr.ResolvedOpcode.LeChar =>
+            C((left, right) =>
+              Not(BinaryOp(TypeOpRev(new BinOp_LtChar()), right, left,
+                new BinaryOpFormat_ReverseFormat()))),
+          BinaryExpr.ResolvedOpcode.Gt =>
+            C((left, right) =>
+              BinaryOp(TypeOpRev(new BinOp_Lt()), right, left, new BinaryOpFormat_ReverseFormat())),
+          BinaryExpr.ResolvedOpcode.GtChar =>
+            C((left, right) =>
+              BinaryOp(TypeOpRev(new BinOp_LtChar()), right, left, new BinaryOpFormat_ReverseFormat())),
+          BinaryExpr.ResolvedOpcode.Ge =>
+            C((left, right) =>
+              Not(BinaryOp(TypeOp(new BinOp_Lt()), left, right))),
+          BinaryExpr.ResolvedOpcode.GeChar =>
+            C((left, right) =>
+              Not(BinaryOp(TypeOp(new BinOp_LtChar()), left, right))),
+
+          _ => B(DAST.BinOp.create_Passthrough(Sequence<Rune>.UnicodeFromString($"<b>Unsupported: <i>Operator {op}</i></b>"))),
+        };
+
+        opString = "";
+
+        currentBuilder = newBuilder;
+        // cleaned up by EmitExpr
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    public BuilderSyntaxTree<ExprContainer> WrBuffer(out ExprBuffer buf) {
+      buf = new ExprBuffer(null);
+      var wGuard = new BuilderSyntaxTree<ExprContainer>(buf, this);
+      return wGuard;
+    }
+    protected override void EmitITE(Expression guard, Expression thn, Expression els, Type resultType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        DAST.Expression convertedGuard;
+        if (guard.Type is BoolType) {
+          if (guard is UnaryOpExpr { ResolvedOp: UnaryOpExpr.ResolvedOpcode.BoolNot, E: var innerGuard } unaryOpExpr && innerGuard.Type is not BoolType) {
+            guard = unaryOpExpr.E;
+          }
+          convertedGuard = convert(guard);
+        } else {
+          EmitConversionExpr(guard, guard.Type, new BoolType(), inLetExprBody, WrBuffer(out var buf), wStmts);
+          convertedGuard = buf.Finish();
+        }
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Ite(
+          convertedGuard,
+          convert(thn),
+          convert(els)
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
+      AddUnsupported(Token.NoToken, "<i>EmitIsZero</i>");
+    }
+
+    protected override void EmitConversionExpr(Expression fromExpr, Type fromType, Type toType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprBuilder(wr, out var builder)) {
+        if (toType.Equals(fromType)) {
+          EmitExpr(fromExpr, inLetExprBody, builder, wStmts);
+        } else {
+          EmitExpr(fromExpr, inLetExprBody, EmitConversion(builder, fromType, toType), wStmts);
+        }
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    private BuilderSyntaxTree<ExprContainer> EmitConversion(BuilderSyntaxTree<ExprContainer> builder, Type fromType, Type toType) {
+      return new BuilderSyntaxTree<ExprContainer>(builder.Builder.Convert(
+        GenType(fromType),
+        GenType(toType)
+      ), this);
+    }
+
+    protected override void EmitConstructorCheck(string source, DatatypeCtor ctor, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var builder)) {
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_TypeTest(
+          DAST.Expression.create_Ident(Sequence<Rune>.UnicodeFromString(source)),
+          PathFromTopLevel(ctor.EnclosingDatatype),
+          Sequence<Rune>.UnicodeFromString(ctor.GetCompileName(Options))
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IOrigin tok, ConcreteSyntaxTree wr) {
+      if (GetExprBuilder(wr, out var builder)) {
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Is(
+          DAST.Expression.create_Ident(Sequence<Rune>.UnicodeFromString(localName)),
+          GenType(fromType),
+          GenType(toType)
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitIsIntegerTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      AddUnsupportedFeature(source.Origin, Feature.TypeTests);
+    }
+
+    protected override void EmitIsUnicodeScalarValueTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      AddUnsupportedFeature(source.Origin, Feature.TypeTests);
+    }
+
+    protected override void EmitIsInIntegerRange(Expression source, BigInteger lo, BigInteger hi, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      AddUnsupportedFeature(source.Origin, Feature.TypeTests);
+    }
+
+    protected override void EmitCollectionDisplay(CollectionType ct, IOrigin tok, List<Expression> elements,
+      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        var elementsAST = elements.Select(convert).ToArray();
+
+        if (ct is SetType set) {
+          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_SetValue(
+            Sequence<DAST.Expression>.FromArray(elementsAST)
+          ));
+        } else if (ct is MultiSetType multiSet) {
+          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_MultisetValue(
+            Sequence<DAST.Expression>.FromArray(elementsAST)
+          ));
+        } else if (ct is SeqType seq) {
+          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_SeqValue(
+            Sequence<DAST.Expression>.FromArray(elementsAST),
+            GenType(ct.TypeArgs[0])
+          ));
+        } else {
+          throw new InvalidOperationException();
+        }
+      } else {
+        throw new InvalidOperationException();//TODO
+      }
+    }
+
+    protected override void EmitMapDisplay(MapType mt, IOrigin tok, List<ExpressionPair> elements, bool inLetExprBody,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var converter)) {
+        var elementsAST = new List<_System.Tuple2<DAST.Expression, DAST.Expression>>();
+        foreach (var e in elements) {
+          elementsAST.Add((_System.Tuple2<DAST.Expression, DAST.Expression>)_System.Tuple2<DAST.Expression, DAST.Expression>.create(
+            converter(e.A),
+            converter(e.B)
+          ));
+        }
+
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_MapValue(
+          Sequence<_System.Tuple2<DAST.Expression, DAST.Expression>>.FromArray(elementsAST.ToArray())
+        ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
+      if (GetStatementBuilder(wr, out var builder)) {
+        var eType = e.Type.AsSetType;
+        if (eType == null) {// dafny0/GeneralNewtypeCollections
+          AddUnsupportedFeature(e.Origin, Feature.NonNativeNewtypes);
+        }
+        var elemType = GenType(eType.Arg);
+        var setBuilderType = DAST.Type.create_SetBuilder(elemType);
+        builder.Builder.AddStatement(
+          (DAST.Statement)DAST.Statement.create_DeclareVar(
+            Sequence<Rune>.UnicodeFromString(collectionName),
+            setBuilderType,
+            Option<_IExpression>.create_Some(
+              DAST.Expression.create_SetBuilder(elemType)
+            )
+          ));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
+      if (GetStatementBuilder(wr, out var builder)) {
+        var eType = e.Type.AsMapType;
+        var keyType = GenType(eType.Domain);
+        var valueType = GenType(eType.Range);
+        var mapType = DAST.Type.create_MapBuilder(keyType, valueType);
+        builder.Builder.AddStatement(
+          (DAST.Statement)DAST.Statement.create_DeclareVar(
+            Sequence<Rune>.UnicodeFromString(collectionName),
+            mapType,
+            Option<_IExpression>.create_Some(
+              DAST.Expression.create_MapBuilder(keyType, valueType)
+              )
+            ));
+      } else {
+        AddUnsupported(e.Origin, "<i>EmitMapBuilder_New (non-statement)</i>");
+      }
+      //throw new InvalidOperationException();
+    }
+
+    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody,
+        ConcreteSyntaxTree wr) {
+      if (GetStatementBuilder(wr, out var builder)) {
+        var stmtBuilder = new CallStmtBuilder(Sequence<_IFormal>.Empty);
+        stmtBuilder.SetName((DAST.CallName)DAST.CallName.create_SetBuilderAdd());
+        stmtBuilder.SetTypeArgs(new List<DAST.Type> { });
+        stmtBuilder.SetOuts(new List<ISequence<Rune>> { }); ;
+        stmtBuilder.AddExpr((DAST.Expression)DAST.Expression.create_Ident(Sequence<Rune>.UnicodeFromString(collName)));
+        stmtBuilder.AddExpr(ConvertExpression(elmt, builder));
+        builder.Builder.AddBuildable(stmtBuilder);
+      } else {
+        AddUnsupported(elmt.Origin, "<i>EmitSetBuilder_Add</i>");
+      }
+      //throw new InvalidOperationException();
+    }
+
+    // Normally wStmt is a BuilderSyntaxTree<StatementContainer> but it might not while the compiler is being developed
+    private DAST.Expression ConvertExpression(Expression term, ConcreteSyntaxTree wStmt) {
+      EmitExpr(term, false, WrBuffer(out var buffer0), wStmt);
+      return buffer0.Finish();
+    }
+
+    private DAST.Expression ConvertExpressionNoStatement(Expression term) {
+      var statementBuf = new NoStatementBuffer();
+      var sNoStmt = new BuilderSyntaxTree<StatementContainer>(statementBuf, this);
+      return ConvertExpression(term, sNoStmt);
+    }
+
+    private BuilderSyntaxTree<ExprContainer> CreateExprBuilder() {
+      return WrBuffer(out _);
+    }
+
+    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IOrigin tok, string collName, Expression term,
+        bool inLetExprBody, ConcreteSyntaxTree wr) {
+      if (GetStatementBuilder(wr, out var builder)) {
+        var stmtBuilder = new CallStmtBuilder(Sequence<_IFormal>.Empty);
+        stmtBuilder.SetName((DAST.CallName)DAST.CallName.create_MapBuilderAdd());
+        stmtBuilder.SetTypeArgs(new List<DAST.Type> { });
+        stmtBuilder.SetOuts(new List<ISequence<Rune>> { }); ;
+        stmtBuilder.AddExpr((DAST.Expression)DAST.Expression.create_Ident(Sequence<Rune>.UnicodeFromString(collName)));
+        var keyBuilder = CreateExprBuilder();
+        stmtBuilder.AddBuildable((ExprBuffer)keyBuilder.Builder);
+        stmtBuilder.AddExpr(ConvertExpression(term, builder));
+        builder.Builder.AddBuildable(stmtBuilder);
+        return keyBuilder;
+      } else {
+        AddUnsupported(tok, "<i>EMitMapBuilder_Add</i>");
+        return WrBuffer(out _);
+      }
+    }
+
+    protected override Action<ConcreteSyntaxTree> GetSubtypeCondition(string tmpVarName, Type boundVarType, IOrigin tok, ConcreteSyntaxTree wPreconditions) {
+      Action<ConcreteSyntaxTree> typeTest;
+
+      if (boundVarType.IsRefType) {
+        DAST._IExpression baseExpr;
+        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
+          baseExpr = DAST.Expression.create_Literal(DAST.Literal.create_BoolLiteral(true));
+        } else {
+          // typeTest = $"{tmpVarName} instanceof {TypeName(boundVarType, wPreconditions, tok)}";
+          AddUnsupported(tok, "<i>TypeName</i>");
+          return (ConcreteSyntaxTree w) => { };
+        }
+
+        if (boundVarType.IsNonNullRefType) {
+          typeTest = wr => {
+            if (GetExprBuilder(wr, out var builder)) {
+              var boolType = DAST.Type.create_Primitive(Primitive.create_Bool());
+              var tmpVarType = GenType(boundVarType);
+              var tmpVarNotNull = DAST.Expression.create_UnOp(
+                DAST.UnaryOp.create_Not(),
+                DAST.Expression.create_BinOp(
+                  TypedBinOp.create_TypedBinOp(DAST.BinOp.create_Eq(true), tmpVarType, tmpVarType, boolType),
+                  DAST.Expression.create_Ident(Sequence<Rune>.UnicodeFromString(tmpVarName)),
+                  DAST.Expression.create_Literal(DAST.Literal.create_Null(GenType(boundVarType))),
+                  new BinaryOpFormat_NoFormat()), new UnaryOpFormat_CombineFormat());
+              builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_BinOp(
+                TypedBinOp.create_TypedBinOp(BinOp.create_And(), boolType, boolType, boolType),
+                  tmpVarNotNull,
+                baseExpr,
+                new BinaryOpFormat_NoFormat()
+              ));
+            } else {
+              throw new InvalidOperationException();
+            }
+          };
+        } else {
+          typeTest = wr => {
+            if (GetExprBuilder(wr, out var builder)) {
+              var boolType = DAST.Type.create_Primitive(Primitive.create_Bool());
+              var tmpVarType = GenType(boundVarType);
+              builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_BinOp(
+                TypedBinOp.create_TypedBinOp(BinOp.create_Or(), boolType, boolType, boolType),
+                DAST.Expression.create_BinOp(
+                  TypedBinOp.create_TypedBinOp(DAST.BinOp.create_Eq(true), tmpVarType, tmpVarType, boolType),
+                  DAST.Expression.create_Ident(Sequence<Rune>.UnicodeFromString(tmpVarName)),
+                  DAST.Expression.create_Literal(DAST.Literal.create_Null(GenType(boundVarType))),
+                  new BinaryOpFormat_NoFormat()
+                ),
+                baseExpr,
+                new BinaryOpFormat_NoFormat()
+              ));
+            } else {
+              throw new InvalidOperationException();
+            }
+          };
+        }
+      } else {
+        typeTest = wr => EmitExpr(Expression.CreateBoolLiteral(tok, true), false, wr, null);
+      }
+
+      return typeTest;
+    }
+
+    protected override void GetCollectionBuilder_Build(CollectionType ct, IOrigin tok, string collName,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmt) {
+      if (GetExprBuilder(wr, out var builder)) {
+        var callExpr = new CallExprBuilder(Sequence<_IFormal>.Empty);
+        if (ct.IsMapType) {
+          callExpr.SetName((DAST.CallName)DAST.CallName.create_MapBuilderBuild());
+        } else {
+          callExpr.SetName((DAST.CallName)DAST.CallName.create_SetBuilderBuild());
+        }
+
+        callExpr.SetTypeArgs(new List<DAST.Type> { });
+        callExpr.SetOuts(new List<ISequence<Rune>> { }); ;
+        callExpr.AddExpr((DAST.Expression)DAST.Expression.create_Ident(Sequence<Rune>.UnicodeFromString(collName)));
+        builder.Builder.AddBuildable(callExpr);
+      } else {
+        AddUnsupported(tok, "<i>GetCollectionBuilder_Build</i>");
+      }
+    }
+
+    protected override (Type, Action<ConcreteSyntaxTree>) EmitIntegerRange(Type type, Action<ConcreteSyntaxTree> wLo, Action<ConcreteSyntaxTree> wHi) {
+      Type result;
+      if (AsNativeType(type) != null) {
+        result = type;
+      } else {
+        result = new IntType();
+      }
+
+      return (result, (wr) => {
+        wLo(WrBuffer(out var loBuf));
+        wHi(WrBuffer(out var hiBuf));
+
+        if (GetExprBuilder(wr, out var builder)) {
+          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_IntRange(
+            GenType(result),
+            loBuf.Finish(),
+            hiBuf.Finish(),
+            true
+          ));
+        } else {
+          throw new InvalidOperationException();
+        }
+      }
+      );
+    }
+
+    protected override void EmitNull(Type _, ConcreteSyntaxTree wr) {
+      AddUnsupported(Token.NoToken, "<i>EmitNull</i>");
+    }
+
+    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (GetExprConverter(wr, wStmts, out var builder, out var convert)) {
+        var eBuild = convert(e);
+        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_ExactBoundedPool(eBuild));
+      } else {
+        throw new InvalidOperationException();
+      }
+    }
+
+    protected override void OrganizeModules(Program program, out List<ModuleDefinition> modules) {
+      modules = program.CompileModules.ToList();
+      modules.Sort((a, b) =>
+        String.Compare(a.FullDafnyName, b.FullDafnyName, StringComparison.Ordinal));
+    }
+
+    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
+      TrStmt(body, wr);
+    }
+
+    protected override ConcreteSyntaxTree GetNullClassConcreteSyntaxTree() {
+      return new BuilderSyntaxTree<StatementContainer>(new StatementBuffer(), this);
+    }
+
+    protected override void EmitNestedMatchExpr(NestedMatchExpr match, bool inLetExprBody, ConcreteSyntaxTree output,
+      ConcreteSyntaxTree wStmts) {
+      EmitExpr(match.Flattened, inLetExprBody, output, wStmts);
+    }
+
+    protected override void TrOptNestedMatchExpr(NestedMatchExpr match, Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts,
+      bool inLetExprBody, IVariable accumulatorVar, OptimizedExpressionContinuation continuation) {
+      TrExprOpt(match.Flattened, resultType, wr, wStmts, inLetExprBody, accumulatorVar, continuation);
+    }
+
+    protected override void EmitNestedMatchStmt(NestedMatchStmt match, ConcreteSyntaxTree writer) {
+      TrStmt(match.Flattened, writer);
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/Dafny/PrettyPrinter.dfy b/Source/DafnyCore/Backends/Dafny/PrettyPrinter.dfy
new file mode 100644
index 00000000000..790421c42b1
--- /dev/null
+++ b/Source/DafnyCore/Backends/Dafny/PrettyPrinter.dfy
@@ -0,0 +1,11 @@
+module {:extern "D2DPrettyPrinter"} PrettyPrinter {
+
+  import DAST
+  import UnsupportedFeature
+
+  method PrettyPrint(d: seq<DAST.Module>) returns (s: string) {
+    UnsupportedFeature.Throw();
+    s := "Not Implemented Yet";
+  }
+
+}
diff --git a/Source/DafnyCore/Backends/Dafny/UnsupportedFeatureException.dfy b/Source/DafnyCore/Backends/Dafny/UnsupportedFeatureException.dfy
new file mode 100644
index 00000000000..0127e181f87
--- /dev/null
+++ b/Source/DafnyCore/Backends/Dafny/UnsupportedFeatureException.dfy
@@ -0,0 +1,5 @@
+module UnsupportedFeature {
+
+  method {:extern "Microsoft.Dafny.Compilers.WrapException", "Throw"} Throw()
+
+}
diff --git a/Source/DafnyCore/Backends/Dafny/WrapException.cs b/Source/DafnyCore/Backends/Dafny/WrapException.cs
new file mode 100644
index 00000000000..15340517734
--- /dev/null
+++ b/Source/DafnyCore/Backends/Dafny/WrapException.cs
@@ -0,0 +1,9 @@
+namespace Microsoft.Dafny.Compilers;
+
+public class WrapException {
+
+  public static void Throw() {
+    throw new UnsupportedFeatureException(Token.NoToken, Feature.RunAllTests);
+  }
+
+}
diff --git a/Source/DafnyCore/Backends/DafnyExecutableBackend.cs b/Source/DafnyCore/Backends/DafnyExecutableBackend.cs
new file mode 100644
index 00000000000..2012cf6d474
--- /dev/null
+++ b/Source/DafnyCore/Backends/DafnyExecutableBackend.cs
@@ -0,0 +1,77 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using Dafny;
+
+namespace Microsoft.Dafny.Compilers;
+
+public abstract class DafnyExecutableBackend : ExecutableBackend {
+
+  protected virtual bool PreventShadowing => true;
+  protected virtual bool CanEmitUncompilableCode => true;
+  public override bool SupportsDatatypeWrapperErasure => false;
+
+  protected virtual string InternalFieldPrefix => "_i_";
+
+  protected DafnyWrittenCodeGenerator DafnyCodeGenerator;
+
+  public List<string> ImportedFiles = new();
+
+  protected DafnyExecutableBackend(DafnyOptions options) : base(options) {
+  }
+
+  protected override SinglePassCodeGenerator CreateCodeGenerator() {
+    // becomes this.compiler
+    return new DafnyCodeGenerator(Options, Reporter, InternalFieldPrefix, PreventShadowing, CanEmitUncompilableCode);
+  }
+
+  protected abstract DafnyWrittenCodeGenerator CreateDafnyWrittenCompiler();
+
+  public override void OnPreCompile(ErrorReporter reporter, ReadOnlyCollection<string> otherFileNames) {
+    base.OnPreCompile(reporter, otherFileNames);
+    DafnyCodeGenerator = CreateDafnyWrittenCompiler();
+  }
+
+  // Returns a mapping from source files without extension to pathless target file.
+  // Values of this dictionary are provided as the second argument to the Compile method
+  // Should ensures all values are different
+  public virtual Dictionary<string, string> ImportFilesMapping(string dafnyProgramName) {
+    Dictionary<string, string> importedFilesMapping = new();
+    return importedFilesMapping;
+  }
+
+  public IEnumerable<string> ImportFiles(string dafnyProgramName) {
+    var result = ImportFilesMapping(dafnyProgramName).Values.ToList();
+    result.Sort();
+    return result;
+  }
+
+  public override void Compile(Program dafnyProgram, string dafnyProgramName, ConcreteSyntaxTree output) {
+    ProcessTranslationRecords(dafnyProgram, dafnyProgramName, output);
+    CheckInstantiationReplaceableModules(dafnyProgram);
+    ProcessOuterModules(dafnyProgram);
+
+    ((DafnyCodeGenerator)codeGenerator).Start();
+    codeGenerator.Compile(dafnyProgram, new ConcreteSyntaxTree());
+    var dast = ((DafnyCodeGenerator)codeGenerator).Build();
+    DafnyCodeGenerator.Compile(
+      (Sequence<DAST.Module>)Sequence<DAST.Module>.FromArray(dast.ToArray()),
+      (Sequence<ISequence<Rune>>)Sequence<ISequence<Rune>>.FromArray(
+        ImportFiles(dafnyProgramName).Select(fileName =>
+          Sequence<Rune>.UnicodeFromString(Path.GetFileName(fileName))).ToArray()
+      ), output);
+  }
+
+  public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree output) {
+    var sourceBuf = new ExprBuffer(null);
+    var mainCallHolder = new BuilderSyntaxTree<ExprContainer>(sourceBuf, ((DafnyCodeGenerator)codeGenerator));
+    ((DafnyCodeGenerator)codeGenerator).TypeName_Companion(UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(mainMethod.EnclosingClass), mainCallHolder, mainMethod.Origin, mainMethod);
+    var companion = sourceBuf.Finish();
+    var hasArguments = mainMethod.Ins.Any();
+    var mainMethodName = (Sequence<Rune>)Sequence<Rune>.UnicodeFromString(mainMethod.Name);
+    var o = DafnyCodeGenerator.EmitCallToMain(companion, mainMethodName, hasArguments);
+    output.Write(o.ToVerbatimString(false));
+  }
+
+}
diff --git a/Source/DafnyCore/Backends/DafnyWrittenCodeGenerator.cs b/Source/DafnyCore/Backends/DafnyWrittenCodeGenerator.cs
new file mode 100644
index 00000000000..458a9e3851c
--- /dev/null
+++ b/Source/DafnyCore/Backends/DafnyWrittenCodeGenerator.cs
@@ -0,0 +1,17 @@
+
+using Dafny;
+
+namespace Microsoft.Dafny.Compilers {
+
+  public abstract class DafnyWrittenCodeGenerator {
+
+    public abstract void Compile(Sequence<DAST.Module> program, Sequence<ISequence<Rune>> otherFiles, ConcreteSyntaxTree w);
+
+    public abstract ISequence<Rune> EmitCallToMain(
+      DAST.Expression companion,
+      Sequence<Rune> mainMethodName,
+      bool hasArguments);
+
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/DatatypeWrapperEraser.cs b/Source/DafnyCore/Backends/DatatypeWrapperEraser.cs
similarity index 79%
rename from Source/DafnyCore/Compilers/DatatypeWrapperEraser.cs
rename to Source/DafnyCore/Backends/DatatypeWrapperEraser.cs
index 8814908ec67..f15de83f5ad 100644
--- a/Source/DafnyCore/Compilers/DatatypeWrapperEraser.cs
+++ b/Source/DafnyCore/Backends/DatatypeWrapperEraser.cs
@@ -26,14 +26,43 @@ public static bool CanBeLeftUninitialized(DafnyOptions options, Type type) {
       return false;
     }
 
+    public static Type SimplifyTypeAndTrimSubsetTypes(DafnyOptions options, Type ty) {
+      return SimplifyTypeWorker(options, ty, SimplifyTypeExpandMode.ExpandSynonymsOnly);
+    }
+
+    public static Type SimplifyType(DafnyOptions options, Type ty) {
+      return SimplifyTypeWorker(options, ty, SimplifyTypeExpandMode.ExpandSynonymsAndSubsetTypes);
+    }
+
+    public static Type SimplifyTypeAndTrimNewtypes(DafnyOptions options, Type ty) {
+      return SimplifyTypeWorker(options, ty, SimplifyTypeExpandMode.ExpandSynonymsAndSubsetTypesAndNewtypesExceptNativeTypes);
+    }
+
+    private enum SimplifyTypeExpandMode {
+      ExpandSynonymsOnly,
+      ExpandSynonymsAndSubsetTypes,
+      ExpandSynonymsAndSubsetTypesAndNewtypesExceptNativeTypes
+    }
+
     /// <summary>
     /// Remove any erasable type wrappers and simplify ghost tuple types.
     /// </summary>
-    public static Type SimplifyType(DafnyOptions options, Type ty, bool keepConstraints = false) {
+    private static Type SimplifyTypeWorker(DafnyOptions options, Type ty, SimplifyTypeExpandMode expandMode) {
       Contract.Requires(ty != null);
       Contract.Requires(ty is not TypeProxy);
 
-      ty = ty.NormalizeExpand(keepConstraints);
+      Type ExpandType(Type typ) {
+        switch (expandMode) {
+          case SimplifyTypeExpandMode.ExpandSynonymsOnly: return typ.NormalizeExpandKeepConstraints();
+          case SimplifyTypeExpandMode.ExpandSynonymsAndSubsetTypes: return typ.NormalizeExpand();
+          case SimplifyTypeExpandMode.ExpandSynonymsAndSubsetTypesAndNewtypesExceptNativeTypes: return typ.GetRuntimeType();
+          default:
+            Contract.Assert(false); // unexpected case
+            throw new cce.UnreachableException();
+        }
+      }
+
+      ty = ExpandType(ty);
       Contract.Assert(ty is NonProxyType);
 
       if (ty is UserDefinedType udt) {
@@ -50,19 +79,19 @@ public static Type SimplifyType(DafnyOptions options, Type ty, bool keepConstrai
           }
           Contract.Assert(typeArgsForNonGhostTuple.Count == nonGhostTupleTypeDecl.Dims);
           Contract.Assert(nonGhostTupleTypeDecl.NonGhostDims == nonGhostTupleTypeDecl.Dims);
-          return new UserDefinedType(udt.tok, nonGhostTupleTypeDecl.Name, nonGhostTupleTypeDecl, typeArgsForNonGhostTuple);
+          return new UserDefinedType(udt.Origin, nonGhostTupleTypeDecl.Name, nonGhostTupleTypeDecl, typeArgsForNonGhostTuple);
 
         } else if (udt.ResolvedClass is DatatypeDecl datatypeDecl && GetInnerTypeOfErasableDatatypeWrapper(options, datatypeDecl, out var innerType)) {
           var typeSubst = TypeParameter.SubstitutionMap(datatypeDecl.TypeArgs, udt.TypeArgs);
-          var stype = innerType.Subst(typeSubst).NormalizeExpand(keepConstraints);
-          return SimplifyType(options, stype, keepConstraints);
+          var stype = ExpandType(innerType.Subst(typeSubst));
+          return SimplifyTypeWorker(options, stype, expandMode);
         }
       }
 
       // Simplify the type arguments of "ty"
       if (ty.TypeArgs.Count != 0) {
-        var simplifiedArguments = ty.TypeArgs.ConvertAll(typeArg => SimplifyType(options, typeArg, keepConstraints));
-        if (Enumerable.Range(0, ty.TypeArgs.Count).Any(i => ty.TypeArgs[i].NormalizeExpand(keepConstraints) != simplifiedArguments[i])) {
+        var simplifiedArguments = ty.TypeArgs.ConvertAll(typeArg => SimplifyTypeWorker(options, typeArg, expandMode));
+        if (Enumerable.Range(0, ty.TypeArgs.Count).Any(i => ExpandType(ty.TypeArgs[i]) != simplifiedArguments[i])) {
           ty.ReplaceTypeArguments(simplifiedArguments);
         }
       }
@@ -107,9 +136,10 @@ public static bool GetInnerTypeOfErasableDatatypeWrapper(DafnyOptions options, D
     ///   2 -- be an inductive datatype (not a "codatatype"), and
     ///   3 -- have exactly one non-ghost constructor, and
     ///   4 -- that constructor must have exactly one non-ghost destructor parameter (say, "d" of type "D"), and
-    ///   5 -- have no fields declared as members, and
-    ///   6 -- the compiled parts of type "D" must not include the datatype itself, and
-    ///   7 -- not be declared with {:extern} (since extern code may rely on it being there).
+    ///   5 -- have no non-ghost fields declared as members, and
+    ///   6 -- have no parent traits, and
+    ///   7 -- the compiled parts of type "D" must not include the datatype itself, and
+    ///   8 -- not be declared with {:extern} (since extern code may rely on it being there).
     ///
     /// If the conditions above apply, then the method returns true and sets the out-parameter to the core DatatypeDestructor "d".
     /// From this return, the compiler (that is, the caller) will arrange to compile type "dt" as type "D".
@@ -132,12 +162,13 @@ public static bool IsErasableDatatypeWrapper(DafnyOptions options, DatatypeDecl
     }
 
     /// <summary>
-    /// Check for conditions 2, 3, 4, 5, and 7 (but not 0, 1, and 6) mentioned in the description of IsErasableDatatypeWrapper.
+    /// Check for conditions 2, 3, 4, 5, 6, and 8 (but not 0, 1, and 7) mentioned in the description of IsErasableDatatypeWrapper.
     /// </summary>
     private static bool FindUnwrappedCandidate(DafnyOptions options, DatatypeDecl datatypeDecl, out DatatypeDestructor coreDtor) {
       if (datatypeDecl is IndDatatypeDecl &&
           !datatypeDecl.IsExtern(options, out _, out _) &&
-          !datatypeDecl.Members.Any(member => member is Field)) {
+          !datatypeDecl.Members.Any(member => member is Field { IsGhost: false }) &&
+          datatypeDecl.ParentTraits.Count == 0) {
         var nonGhostConstructors = datatypeDecl.Ctors.Where(ctor => !ctor.IsGhost).ToList();
         if (nonGhostConstructors.Count == 1) {
           // there is exactly one non-ghost constructor
diff --git a/Source/DafnyCore/Backends/ExecutableBackend.cs b/Source/DafnyCore/Backends/ExecutableBackend.cs
new file mode 100644
index 00000000000..23e22670091
--- /dev/null
+++ b/Source/DafnyCore/Backends/ExecutableBackend.cs
@@ -0,0 +1,326 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DafnyCore.Options;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Dafny.Plugins;
+
+namespace Microsoft.Dafny;
+
+public abstract class ExecutableBackend : IExecutableBackend {
+  // May be null for backends that don't use the single-pass compiler logic
+  protected SinglePassCodeGenerator codeGenerator;
+
+  protected ExecutableBackend(DafnyOptions options) : base(options) {
+  }
+
+  public override IReadOnlySet<Feature> UnsupportedFeatures => CreateCodeGenerator().UnsupportedFeatures;
+
+  public override bool SupportsDatatypeWrapperErasure =>
+    CreateCodeGenerator()?.SupportsDatatypeWrapperErasure ?? base.SupportsDatatypeWrapperErasure;
+
+  public override string ModuleSeparator => CodeGenerator.ModuleSeparator;
+
+  public override void Compile(Program dafnyProgram, string dafnyProgramName, ConcreteSyntaxTree output) {
+    ProcessTranslationRecords(dafnyProgram, dafnyProgramName, output);
+    CheckInstantiationReplaceableModules(dafnyProgram);
+    ProcessOuterModules(dafnyProgram);
+
+    CodeGenerator.Compile(dafnyProgram, output);
+  }
+
+  protected void ProcessTranslationRecords(Program dafnyProgram, string dafnyProgramName, ConcreteSyntaxTree output) {
+    // Process --translation-record options, since translation may need that data to translate correctly.
+    dafnyProgram.Compilation.AlreadyTranslatedRecord = TranslationRecord.Empty(dafnyProgram);
+    var records = dafnyProgram.Options.Get(TranslationRecords);
+    if (records != null) {
+      foreach (var path in records) {
+        TranslationRecord.ReadValidateAndMerge(dafnyProgram, path.FullName, Token.Cli);
+      }
+    }
+
+    // Write out the translation record for THIS translation before compiling,
+    // in case the compilation process mutates the program.
+    var translationRecord = new TranslationRecord(dafnyProgram);
+    var baseName = Path.GetFileNameWithoutExtension(dafnyProgramName);
+    var dtrFilePath = dafnyProgram.Options.Get(TranslationRecordOutput)?.FullName ?? $"{baseName}-{TargetId}.dtr";
+    var dtrWriter = output.NewFile(dtrFilePath);
+    translationRecord.Write(dtrWriter);
+  }
+
+  protected void CheckInstantiationReplaceableModules(Program dafnyProgram) {
+    foreach (var compiledModule in dafnyProgram.Modules()) {
+      if (compiledModule.Implements is { Kind: ImplementationKind.Replacement }) {
+        if (compiledModule.IsExtern(Options, out _, out var name) && name != null) {
+          Reporter!.Error(MessageSource.Compiler, compiledModule.Origin,
+            "inside a module that replaces another, {:extern} attributes may only be used without arguments");
+        }
+      }
+
+      if (compiledModule.ModuleKind == ModuleKindEnum.Replaceable && dafnyProgram.Replacements.GetValueOrDefault(compiledModule) == null) {
+        if (compiledModule.ShouldCompile(dafnyProgram.Compilation)) {
+          Reporter!.Error(MessageSource.Compiler, compiledModule.Origin,
+            $"when producing executable code, replaceable modules must be replaced somewhere in the program. For example, `module {compiledModule.Name}Impl replaces {compiledModule.Name} {{ ... }}`");
+        }
+      }
+    }
+  }
+
+  protected void ProcessOuterModules(Program dafnyProgram) {
+    // Apply the --outer-module option from any translation records for libraries,
+    // but only to top-level modules.
+    var outerModules = new Dictionary<string, ModuleDefinition>();
+    foreach (var module in dafnyProgram.CompileModules) {
+      if (module.EnclosingModule is not DefaultModuleDefinition) {
+        continue;
+      }
+
+      var recordedOuterModuleName = (string)dafnyProgram.Compilation.AlreadyTranslatedRecord.Get(null, module.FullDafnyName, OuterModule);
+      if (recordedOuterModuleName == null) {
+        continue;
+      }
+
+      var outerModule = outerModules.GetOrCreate(recordedOuterModuleName, () => CreateOuterModule(recordedOuterModuleName));
+      module.EnclosingModule = outerModule;
+    }
+
+    // Apply the local --output-module option if there is one
+    var outerModuleName = Options.Get(OuterModule);
+    if (outerModuleName != null) {
+      var rootUserModule = outerModules.GetOrCreate(outerModuleName, () => CreateOuterModule(outerModuleName));
+      dafnyProgram.DefaultModuleDef.NameNode = rootUserModule.NameNode;
+      dafnyProgram.DefaultModuleDef.EnclosingModule = rootUserModule.EnclosingModule;
+    }
+
+    foreach (var module in dafnyProgram.CompileModules) {
+      module.ClearNameCache();
+    }
+  }
+
+  private static ModuleDefinition CreateOuterModule(string moduleName) {
+    var outerModules = moduleName.Split(".");
+
+    ModuleDefinition module = null;
+    foreach (var outerModule in outerModules) {
+      var thisModule = new ModuleDefinition(SourceOrigin.NoToken, new Name(outerModule), new List<IOrigin>(),
+        ModuleKindEnum.Concrete, false,
+        null, null, null) {
+        EnclosingModule = module
+      };
+      module = thisModule;
+    }
+
+    return module;
+  }
+
+  public override void OnPreCompile(ErrorReporter reporter, ReadOnlyCollection<string> otherFileNames) {
+    base.OnPreCompile(reporter, otherFileNames);
+    codeGenerator = CreateCodeGenerator();
+  }
+
+  SinglePassCodeGenerator CodeGenerator {
+    get {
+      if (codeGenerator == null) {
+        codeGenerator = CreateCodeGenerator();
+      }
+
+      return codeGenerator;
+    }
+  }
+
+  public override Task<bool> OnPostGenerate(string dafnyProgramName, string targetDirectory, TextWriter outputWriter) {
+    CodeGenerator.Coverage.WriteLegendFile();
+    return Task.FromResult(true);
+  }
+
+  protected abstract SinglePassCodeGenerator CreateCodeGenerator();
+
+  public override string PublicIdProtect(string name) {
+    return CodeGenerator.PublicIdProtect(name);
+  }
+
+  public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree callToMainTree) {
+    CodeGenerator.EmitCallToMain(mainMethod, baseName, callToMainTree);
+  }
+
+  public ProcessStartInfo PrepareProcessStartInfo(string programName, IEnumerable<string> args = null) {
+    var psi = new ProcessStartInfo(programName) {
+      UseShellExecute = false,
+      CreateNoWindow = false, // https://github.com/dotnet/runtime/issues/68259
+      RedirectStandardOutput = true,
+    };
+    foreach (var arg in args ?? Enumerable.Empty<string>()) {
+      psi.ArgumentList.Add(arg);
+    }
+    return psi;
+  }
+
+  public Task<int> RunProcess(ProcessStartInfo psi,
+    TextWriter outputWriter,
+    TextWriter errorWriter,
+    string errorMessage = null) {
+    if (OutputWriterEncoding != null) {
+      psi.StandardOutputEncoding = OutputWriterEncoding;
+    }
+
+    return StartProcess(psi, outputWriter) is { } process ?
+      WaitForExit(process, outputWriter, errorWriter, errorMessage) : Task.FromResult(-1);
+  }
+
+  public virtual Encoding OutputWriterEncoding => null;
+
+  public async Task<int> WaitForExit(Process process, TextWriter outputWriter, TextWriter errorWriter, string errorMessage = null) {
+
+    var errorTask = PassthroughBuffer(process.StandardError, errorWriter);
+    var outputTask = PassthroughBuffer(process.StandardOutput, outputWriter);
+    await process.WaitForExitAsync();
+    await errorTask;
+    await outputTask;
+    if (process.ExitCode != 0 && errorMessage != null) {
+      await outputWriter.WriteLineAsync($"{errorMessage} Process exited with exit code {process.ExitCode}");
+    }
+
+    return process.ExitCode;
+  }
+
+
+  protected static async Task PassthroughBuffer(TextReader input, TextWriter output) {
+    char[] buffer = new char[256];
+    int readCount;
+    while ((readCount = await input.ReadBlockAsync(buffer)) > 0) {
+      await output.WriteAsync(buffer, 0, readCount);
+    }
+  }
+
+  public Process StartProcess(ProcessStartInfo psi, TextWriter outputWriter) {
+    string additionalInfo = "";
+
+    try {
+      psi.RedirectStandardError = true;
+      if (Process.Start(psi) is { } process) {
+        return process;
+      }
+    } catch (System.ComponentModel.Win32Exception e) {
+      additionalInfo = $": {e.Message}";
+    }
+
+    outputWriter.WriteLine($"Error: Unable to start {psi.FileName}{additionalInfo}");
+    return null;
+  }
+
+  public override Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText,
+    string callToMain /*?*/, string targetFilename, /*?*/
+    ReadOnlyCollection<string> otherFileNames,
+    bool runAfterCompile, TextWriter outputWriter) {
+    Contract.Requires(dafnyProgramName != null);
+    Contract.Requires(targetProgramText != null);
+    Contract.Requires(otherFileNames != null);
+    Contract.Requires(otherFileNames.Count == 0 || targetFilename != null);
+    Contract.Requires(this.SupportsInMemoryCompilation || targetFilename != null);
+    Contract.Requires(!runAfterCompile || callToMain != null);
+    Contract.Requires(outputWriter != null);
+
+    return Task.FromResult((true, (object)null));
+  }
+
+  public override Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText,
+    string callToMain, /*?*/
+    string targetFilename /*?*/, ReadOnlyCollection<string> otherFileNames,
+    object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
+    Contract.Requires(dafnyProgramName != null);
+    Contract.Requires(targetProgramText != null);
+    Contract.Requires(otherFileNames != null);
+    Contract.Requires(otherFileNames.Count == 0 || targetFilename != null);
+    Contract.Requires(outputWriter != null);
+    return Task.FromResult(true);
+  }
+
+  public override void InstrumentCompiler(CompilerInstrumenter instrumenter, Program dafnyProgram) {
+    if (CodeGenerator == null) {
+      return;
+    }
+
+    instrumenter.Instrument(this, CodeGenerator, dafnyProgram);
+  }
+
+  protected static void WriteFromFile(string inputFilename, TextWriter outputWriter) {
+    var rd = new StreamReader(new FileStream(inputFilename, FileMode.Open, FileAccess.Read));
+    SinglePassCodeGenerator.WriteFromStream(rd, outputWriter);
+  }
+
+  protected async Task<bool> RunTargetDafnyProgram(string targetFilename, TextWriter outputWriter, TextWriter errorWriter, bool verify) {
+
+    /*
+     * In order to work for the continuous integration, we need to call the Dafny compiler using dotnet
+     * because dafny is not currently in the path
+     */
+
+    var where = System.Reflection.Assembly.GetExecutingAssembly().Location;
+    where = Path.GetDirectoryName(where);
+    var dafny = where + "/Dafny.dll";
+
+    var opt = Options;
+    var args = opt.MainArgs
+      .Prepend(targetFilename);
+    if (!verify) {
+      args = args.Prepend("--no-verify");
+    }
+    args = args
+      .Prepend("--target:cs")
+      .Prepend("run")
+      .Prepend(dafny);
+    var psi = PrepareProcessStartInfo("dotnet", args);
+    await Console.Out.WriteLineAsync(string.Join(", ", psi.ArgumentList));
+    /*
+     * When this code was written, the Dafny compiler cannot be made completely silent.
+     * This is a problem for this specific compiler and the integration tests because the second
+     * call to the compiler makes unexpected writes to the output.
+     * The following code is catching the output from the second compiler call (the one that executes the code)
+     * and stripping out the first two lines and the last line.
+     */
+
+    psi.RedirectStandardOutput = true;
+    var process = new Process();
+    process.StartInfo = psi;
+    var outputBuilder = new List<string>();
+    var errorBuilder = new List<string>();
+    process.OutputDataReceived += (sender, args) => outputBuilder.Add(args.Data);
+    process.ErrorDataReceived += (sender, args) => errorBuilder.Add(args.Data);
+
+    try {
+      process.Start();
+      process.BeginOutputReadLine();
+      process.BeginErrorReadLine();
+      await process.WaitForExitAsync();
+      process.CancelOutputRead();
+      process.CancelErrorRead();
+
+      for (int i = 2; i < outputBuilder.Count - 1; i++) {
+        await outputWriter.WriteLineAsync(outputBuilder[i]);
+      }
+
+      for (int i = 0; i < errorBuilder.Count - 1; i++) {
+        await errorWriter.WriteLineAsync(errorBuilder[i]);
+      }
+
+      if (process.ExitCode != 0) {
+        await outputWriter.WriteLineAsync($"Process exited with exit code {process.ExitCode}");
+        return false;
+      }
+
+    } catch (System.ComponentModel.Win32Exception e) {
+      string additionalInfo = $": {e.Message}";
+      await outputWriter.WriteLineAsync($"Error: Unable to start {psi.FileName}{additionalInfo}");
+      return false;
+    }
+
+    return true;
+  }
+}
diff --git a/Source/DafnyCore/Backends/ExternExtensions.cs b/Source/DafnyCore/Backends/ExternExtensions.cs
new file mode 100644
index 00000000000..c13e7ba9461
--- /dev/null
+++ b/Source/DafnyCore/Backends/ExternExtensions.cs
@@ -0,0 +1,32 @@
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public static class ExternExtensions {
+
+  public static bool IsExtern(this IAttributeBearingDeclaration declaration, DafnyOptions options, out string/*?*/ qualification, out string/*?*/ name) {
+    // ensures result==false ==> qualification == null && name == null
+    Contract.Ensures(Contract.Result<bool>() || (Contract.ValueAtReturn(out qualification) == null && Contract.ValueAtReturn(out name) == null));
+    // ensures result==true ==> qualification != null ==> name != null
+    Contract.Ensures(!Contract.Result<bool>() || Contract.ValueAtReturn(out qualification) == null || Contract.ValueAtReturn(out name) != null);
+
+    qualification = null;
+    name = null;
+    if (!options.DisallowExterns) {
+      var externArgs = Attributes.FindExpressions(declaration.Attributes, "extern");
+      if (externArgs != null) {
+        if (externArgs.Count == 0) {
+          return true;
+        } else if (externArgs.Count == 1 && externArgs[0] is StringLiteralExpr) {
+          name = externArgs[0].AsStringLiteral();
+          return true;
+        } else if (externArgs.Count == 2 && externArgs[0] is StringLiteralExpr && externArgs[1] is StringLiteralExpr) {
+          qualification = externArgs[0].AsStringLiteral();
+          name = externArgs[1].AsStringLiteral();
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/GeneratorErrors.cs b/Source/DafnyCore/Backends/GeneratorErrors.cs
new file mode 100644
index 00000000000..1d1ebc80f2d
--- /dev/null
+++ b/Source/DafnyCore/Backends/GeneratorErrors.cs
@@ -0,0 +1,379 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+
+using System.Collections.Generic;
+using static Microsoft.Dafny.ErrorRegistry;
+
+namespace Microsoft.Dafny;
+
+public class GeneratorErrors {
+
+  public enum ErrorId {
+    None,
+    c_process_exit,
+    c_process_failed_to_start,
+    c_unsupported_feature,
+    c_abstract_type_needs_hint,
+    c_abstract_type_cannot_be_compiled,
+    c_iterators_are_not_deterministic,
+    c_iterator_has_no_body,
+    c_constructorless_class_forbidden,
+    c_method_may_not_be_main_method,
+    c_could_not_find_stipulated_main_method,
+    c_more_than_one_explicit_main_method,
+    c_method_not_permitted_as_main,
+    c_more_than_one_default_Main_method,
+    c_Main_method_not_permitted,
+    c_function_has_no_body,
+    c_test_function_must_be_compilable,
+    c_invalid_synthesize_method,
+    c_method_has_no_body,
+    c_forall_statement_has_no_body,
+    c_loop_has_no_body,
+    c_nondeterminism_forbidden,
+    c_assign_such_that_forbidden,
+    c_assign_such_that_is_too_complex,
+    c_nondeterministic_if_forbidden,
+    c_binding_if_forbidden,
+    c_case_based_if_forbidden,
+    c_non_deterministic_loop_forbidden,
+    c_case_based_loop_forbidden,
+    c_no_assignments_to_seven_d_arrays,
+    c_bodyless_modify_statement_forbidden,
+    c_let_such_that_is_too_complex,
+    c_possibly_unsatisfied_postconditions,
+    c_stubbing_fields_not_recommended,
+    c_abstract_type_cannot_be_compiled_extern,
+    c_Go_unsupported_field,
+    c_Go_infeasible_conversion,
+
+    f_unsupported_feature,
+
+  }
+
+  static GeneratorErrors() {
+
+    Add(ErrorId.c_process_exit,
+    @"
+The dafny compiler prepares a representation of the Dafny program in the desired target programming
+language and then invokes the target language's compiler on those files as a subsidiary process.
+This error message indicates that the sub-process terminated with an error of some sort.
+This should not ordinarily happen. Some possible causes are
+- lack of resources that caused the underlying compiler to fail
+- lack of or corrupted installation of the underlying compiler
+- a bug in dafny whereby the source code it prepares for the compiler is faulty
+
+There may be additional error messages from the underlying compiler that can help debug this situation.
+You can also attempt to run the target programming language compiler manually in your system 
+to make sure it is functional.
+".TrimStart());
+
+    Add(ErrorId.c_process_failed_to_start,
+    @"
+The dafny compiler prepares a representation of the Dafny program in the desired target programming
+language and then invokes the target language's compiler on those files as a subsidiary process.
+This error message indicates that this sub-process would not start;
+it gives some additional information about what the invoking process was told about the failure to start.
+
+Typically this error happens when the installation of the underlying compiler is not present or is incomplete,
+such as the proper files not having the correct permissions.
+".TrimStart());
+
+    Add(ErrorId.c_unsupported_feature,
+    @"
+This messages indicates two problems:
+- the given feature is not supported in the compiler for the target language but is present in the program,
+so the program will need to be revised to avoid this feature;
+- the feature is not listed in the in-tool list of unsupported features.
+The latter is an omission in the in-tool documentation. Please report this error message and the part of the
+program provoking it to the Dafny team's [issue tracker](https://github.com/dafny-lang/dafny/issues).
+".TrimStart());
+
+    Add(ErrorId.c_abstract_type_needs_hint,
+    @"
+The type needs a name given to know which type in the target language it is associated with.
+".TrimStart());
+
+    Add(ErrorId.c_abstract_type_cannot_be_compiled,
+    @"
+[Abstract types](../DafnyRef/DafnyRef#sec-abstract-types) are declared like `type T`.
+They can be useful in programs where the particular characteristics of the type
+do not matter, such as in manipulating generic collections.
+Such programs can be verified, but in order to be compiled to something executable, 
+the type must be given an actual definition. 
+If the definition really does not matter, just give it a definition like 
+`type T = bool` or `type T = `int`.
+
+Note that some properties of a type an be indicated using a [type characteristic](../DafnyRef/DafnyRef#sec-type-characteristics).
+For example, [`type T(00)` indicates that the type `T` is non-empty](../DafnyRef/DafnyRef#sec-nonempty-types).
+".TrimStart());
+
+    Add(ErrorId.c_iterators_are_not_deterministic,
+    @"
+The `--enforce-determinism` option requires a target program to be deterministic and predictable:
+there may be no program statements that have an arbitrary, even if deterministic, result.
+In an iterator, the yield parameters are initialized with arbitary values and can be read before 
+they are set with actual values, so there is a bit of nondeterminism.
+Consequently, iterators in general are not permitted along with `--enforce-determinism`.
+".TrimStart());
+
+    Add(ErrorId.c_iterator_has_no_body,
+    @"
+Programs containing iterators without bodies can be verified.
+However, a body-less iterator is an unchecked assumption (even if it is ghost).
+Consequently, like body-less functions and loops, dafny will not
+compile a program containing an iterator without a body.
+Furthermore, if the iterator is non-ghost, it cannot be compiled if it does not have a body.
+".TrimStart());
+
+    Add(ErrorId.c_constructorless_class_forbidden,
+    @"
+The `--enforce-determinism` option prohibits all non-deterministic operations in a Dafny program.
+One of these operations is the arbitrary values assigned to non-explicitly-initialized fields in a default constructor.
+Consequently an explicit constructor is required.
+".TrimStart());
+
+    Add(ErrorId.c_method_may_not_be_main_method,
+    @"
+To create an executable program, the compiler needs to know which is the method 
+to call to start the program, typically known as the 'main' method or main entry point. 
+`dafny` chooses such a method based on a few rules (cf. [details in the Dafny User Guide](#sec-user-guide-main)).
+
+But there are restrictions on which methods may be used as a main entry point.
+Most importantly
+- the method must take no input arguments or just one argument of type `seq<string>`
+- it must not be ghost
+- the method may be a class method, but then typically it is `static`
+
+Most commonly and for clarity, the intended main method is marked with the attribute `{:main}`.
+".TrimStart());
+
+    Add(ErrorId.c_could_not_find_stipulated_main_method,
+    @"
+In the legacy command-line syntax, the main method may be specified on the command-line.
+When doing so, the name given must be a fully-qualified name.
+For instance. a method `m` in a (top-level) module `M` is named `M.m` 
+or in a class `C` in a module `M` is named `M.C.m`.
+This error message indicates that dafny does not recognize the name given as the name of a method.
+".TrimStart());
+
+    Add(ErrorId.c_more_than_one_explicit_main_method,
+    @"
+When searching all the files in the program (including `include`d ones), dafny found more than one method marked
+with `{:main}`. The error location is that of one of the methods and the error refers to another.
+The tool does not know which one to use. 
+The solution is to remove the `{:main}` attribute from all but one.
+
+Note that entry points that are intended as unit tests can be marked with `{:test}` instead.
+".TrimStart());
+
+    Add(ErrorId.c_method_not_permitted_as_main,
+    @"
+Only some methods may be used as entry points and the one indicated may not.
+The principal restrictions are these ([more details in the Dafny User Guide](#sec-user-guide-main)):
+- the method must take no input arguments or just one argument of type `seq<string>`
+- it must not be ghost
+- the method may be a class method, but then typically it is `static`
+".TrimStart());
+
+    Add(ErrorId.c_more_than_one_default_Main_method,
+    @"
+In the absence of any `{:main}` attributes, dafny chooses a method named `Main` as the main entry point.
+When searching all the files in the program (including `include`d ones), dafny found more than one method named `Main`.
+The error location is that of one of the methods and the error text refers to another.
+The solution is to mark one of them as `{:main}`.
+
+Note that entry points that are intended as unit tests can be marked with `{:test}` instead.
+".TrimStart());
+
+    Add(ErrorId.c_Main_method_not_permitted,
+    @"
+If dafny finds no methods marked `{:main}`, it then looks for a method named `Main`
+to use as the starting point for the program.
+This error occurs if the `Main` method that is found
+does not qualify as a main entry point because it violates one or more of the [rules](#sec-user-guide-main),
+as given by the reason in the error message.
+".TrimStart());
+
+    Add(ErrorId.c_function_has_no_body,
+    @"
+The given function has no body, which is OK for verification, but not OK for compilation 
+--- the compiler does not know what content to give it.
+Even ghost functions must have bodies because body-less ghost functions are a form of unchecked assumptions.
+".TrimStart());
+
+    Add(ErrorId.c_test_function_must_be_compilable,
+    @"
+Only compiled functions and methods may be tested using the `dafny test` command, 
+which tests everything marked with `{:test}`.
+However this function is a ghost function, and consequently cannot be tested during execution.
+If you want the function to be compiled,
+declare the function as a `function` instead of `ghost function` in Dafny 4 
+or as `function method` instead of `function` in Dafny 3.
+".TrimStart());
+
+    Add(ErrorId.c_invalid_synthesize_method,
+    @"
+The `{:synthesize}` attribute is an experimental attribute used to create 
+a mock object for methods that do not have bodies.
+It is currently only available for compiling to C# and in conjunction with the Moq library.
+See the [reference manual section on {:synthesize}](../DafnyRef/DafnyRef#sec-synthesize-attr) for more detail.
+".TrimStart());
+
+    Add(ErrorId.c_method_has_no_body,
+    @"
+To be part of a compiled program, each method must have a body.
+Ghost methods are the equivalent of unchecked assumptions
+so they too must have bodies.
+".TrimStart());
+
+    Add(ErrorId.c_forall_statement_has_no_body,
+    @"
+A method may be parsed and verified even if a [forall statement](../DafnyRef/DafnyRef#sec-forall-statement) is missing a body. 
+However, the body must be supplied before the program can be compiled,
+even if the method is `ghost`. Body-less foralls in ghost methods are 
+unchecked assumptions.
+".TrimStart());
+
+    Add(ErrorId.c_loop_has_no_body,
+    @"
+A method may be parsed and verified even if a loop is missing a body. 
+Note that a missing body is different than an empty body, which is just `{ }`.
+However, the body must be supplied before the program can be compiled,
+even if the method is `ghost`. 
+Body-less loops in ghost methods are similar to unchecked assumptions.
+".TrimStart());
+
+    Add(ErrorId.c_nondeterminism_forbidden,
+    @"
+The `--enforce-determinism` option requires a target program to be deterministic and predictable:
+there may be no program statements that have an arbitrary, even if deterministic, result.
+Hence this 'assign any legal value' (`... := *`) statement is not permitted with `--enforce-determinism`.
+
+There are a few different forms of this kind of assignment:
+- `x := *;`
+- `x, y, z := 3, *, 42;`
+- `forall i | 0 <= i < a.Length { a[i] := *; }`
+".TrimStart());
+
+    Add(ErrorId.c_assign_such_that_forbidden,
+    @"
+The `--enforce-determinism` option requires a target program to be deterministic and predictable:
+there may be no program statements that have an arbitrary, even if deterministic, result.
+Hence this 'assign any value that satisfies the predicate' (`:|`) statement is not permitted with `--enforce-determinism`,
+even if there is only one such possible value.
+(The tool does not try to determine whether there is just one value and
+whether there is a reasonable way to compute the value.)
+".TrimStart());
+
+    Add(ErrorId.c_assign_such_that_is_too_complex,
+    @"
+To compile an assign-such-that statement, Dafny needs to find some appropriate bounds for each variable.
+However, in this case the expression is too complex for Dafny's heuristics.
+".TrimStart());
+
+    Add(ErrorId.c_nondeterministic_if_forbidden,
+    @"
+The `--enforce-determinism` option requires a target program to be deterministic and predictable:
+there may be no program statements that have an arbitrary, even if deterministic, result.
+Hence this 'non-deterministic if' (`if *`) statement is not permitted with `--enforce-determinism`.
+".TrimStart());
+
+    Add(ErrorId.c_binding_if_forbidden,
+    @"
+The `--enforce-determinism` option requires a target program to be deterministic and predictable:
+there may be no program statements that have an arbitrary, even if deterministic, result.
+The [`if` with a binding guard](../DafnyRef/DafnyRef#sec-binding-guards) (`if ... :| `) checks that the 
+given predicate is satisfiable by some value. If not, then the 'else' branch is executed;
+but if so, the 'then' branch is executed with an arbitrary value that satisifies the predicate.
+Because of this arbitrary selection, the if-with-binding-guard is not permitted with `--enforce-determinism`,
+even if there is exactly one value that satisfies the predicate.
+(The tool does not try to determine whether there is just one value or
+whether there is a reasonable way to compute a value.)
+".TrimStart());
+
+    Add(ErrorId.c_case_based_if_forbidden,
+    @"
+The `--enforce-determinism` option requires a target program to be deterministic and predictable:
+there may be no program statements that have an arbitrary, even if deterministic, result.
+The case-based if statement allows the case guards to be evaluated in an arbitrary order and
+an arbitrary one of those found to be true is chosen to be executed.
+Hence the case-based if is not permitted with `--enforce-determinism`.
+
+To enforce a deterministic order to the evaluation, use a chain of if-then-else statements.
+".TrimStart());
+
+    Add(ErrorId.c_non_deterministic_loop_forbidden,
+    @"
+The `--enforce-determinism` option requires a target program to be deterministic and predictable:
+there may be no program statements that have an arbitrary, even if deterministic, result.
+Hence this 'non-deterministic while' (`while *`) statement is not permitted with `--enforce-determinism`.
+".TrimStart());
+
+    Add(ErrorId.c_case_based_loop_forbidden,
+    @"
+The `--enforce-determinism` option requires a target program to be deterministic and predictable:
+there may be no program statements that have an arbitrary, even if deterministic, result.
+The case-based while statement allows the case guards to be evaluated in an arbitrary order and
+an arbitrary one of those found to be true is chosen to be executed.
+Hence the case-based loop is not permitted with `--enforce-determinism`.
+
+To enforce a deterministic order to the evaluation, use a chain of if-then-else statements
+or series of `if` statements in which the then-branch ends in a continue statement.
+".TrimStart());
+
+    Add(ErrorId.c_no_assignments_to_seven_d_arrays,
+    @"
+_The documentation of this problem is in progress._
+".TrimStart());
+
+    Add(ErrorId.c_bodyless_modify_statement_forbidden,
+    @"
+The `--enforce-determinism` option requires a target program to be deterministic and predictable:
+there may be no program statements that have an arbitrary, even if deterministic, result.
+
+The [`modify` statement](../DafnyRef/DafnyRef#sec-modify-statement) allows the program to modify 
+the state of the given objects in an arbitrary way
+(though each field still has a legal value of its declared type).
+Hence such a statement is not permitted with `--enforce-determinism`.
+
+Note that a `modify` statement with a body is deprecated.
+".TrimStart());
+
+    Add(ErrorId.c_let_such_that_is_too_complex,
+    @"
+_The documentation of this problem is in progress._
+".TrimStart());
+
+    Add(ErrorId.c_possibly_unsatisfied_postconditions,
+    @"
+This message relates to mocking methods in C# with the Moq framework. 
+See the [reference manual section on {:synthesize}](../DafnyRef/DafnyRef#sec-synthesize-attr) for more detail.
+".TrimStart());
+
+    Add(ErrorId.c_stubbing_fields_not_recommended,
+    @"
+This message relates to mocking methods in C# with the Moq framework. 
+See the [reference manual section on {:synthesize}](../DafnyRef/DafnyRef#sec-synthesize-attr) for more detail.
+".TrimStart());
+
+    Add(ErrorId.c_abstract_type_cannot_be_compiled_extern,
+    @"
+The C++ compiler must be told how to translate an abstract type. Typically the value of the extern attribute is ""struct"".
+Note that Dafny's C++ compiler is very preliminary, partial and experimental.
+".TrimStart());
+
+    Add(ErrorId.c_Go_unsupported_field,
+    @"
+_Documentation of the Go compiler errors is in progress._
+".TrimStart());
+
+    Add(ErrorId.c_Go_infeasible_conversion,
+    @"
+_Documentation of the Go compiler errors is in progress._
+".TrimStart());
+  }
+
+  public static void RunStaticConstructor() {
+  }
+}
diff --git a/Source/DafnyCore/Compilers/GenericCompilationInstrumenter.cs b/Source/DafnyCore/Backends/GenericCompilationInstrumenter.cs
similarity index 100%
rename from Source/DafnyCore/Compilers/GenericCompilationInstrumenter.cs
rename to Source/DafnyCore/Backends/GenericCompilationInstrumenter.cs
diff --git a/Source/DafnyCore/Backends/GoLang/GoBackend.cs b/Source/DafnyCore/Backends/GoLang/GoBackend.cs
new file mode 100644
index 00000000000..7ef9f0dedff
--- /dev/null
+++ b/Source/DafnyCore/Backends/GoLang/GoBackend.cs
@@ -0,0 +1,242 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.CommandLine;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using DafnyCore.Options;
+using Microsoft.Dafny.Compilers;
+
+namespace Microsoft.Dafny;
+
+public class GoBackend : ExecutableBackend {
+
+  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".go" };
+
+  public override string TargetName => "Go";
+  public override bool IsStable => true;
+  public override string TargetExtension => "go";
+
+  public override string TargetBaseDir(string dafnyProgramName) {
+    var topLevelDir = $"{Path.GetFileNameWithoutExtension(dafnyProgramName)}-go";
+    if (GoModuleMode) {
+      return topLevelDir;
+    }
+
+    return $"{topLevelDir}/src";
+  }
+
+  public override bool SupportsInMemoryCompilation => false;
+  public override bool TextualTargetIsExecutable => false;
+
+  public bool GoModuleMode { get; set; } = true;
+  public string GoModuleName;
+
+  public static readonly Option<string> GoModuleNameCliOption = new("--go-module-name",
+    @"This Option is used to specify the Go Module Name for the translated code".TrimStart()) {
+  };
+  public override IEnumerable<Option<string>> SupportedOptions => new List<Option<string>> { GoModuleNameCliOption };
+
+  static GoBackend() {
+    OptionRegistry.RegisterOption(GoModuleNameCliOption, OptionScope.Translation);
+  }
+
+  protected override SinglePassCodeGenerator CreateCodeGenerator() {
+    var goModuleName = Options.Get(GoModuleNameCliOption);
+    GoModuleMode = goModuleName != null;
+    if (GoModuleMode) {
+      GoModuleName = goModuleName;
+    }
+    return new GoCodeGenerator(Options, Reporter);
+  }
+
+  public override async Task<bool> OnPostGenerate(string dafnyProgramName, string targetDirectory, TextWriter outputWriter) {
+    return await base.OnPostGenerate(dafnyProgramName, targetDirectory, outputWriter) && await OptimizeImports(targetDirectory, outputWriter);
+  }
+
+  private async Task<bool> OptimizeImports(string targetFilename, TextWriter outputWriter) {
+    var goArgs = new List<string> {
+      "-w",
+      targetFilename
+    };
+
+    var writer = new StringWriter();
+
+    var psi = PrepareProcessStartInfo("goimports", goArgs);
+
+    var result = await RunProcess(psi, writer, writer);
+    if (result != 0) {
+      await outputWriter.WriteLineAsync("Error occurred while invoking goimports:");
+      await outputWriter.WriteAsync(writer.ToString());
+    }
+    return 0 == result;
+  }
+
+  public override async Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText,
+    string callToMain, /*?*/
+    string targetFilename /*?*/, ReadOnlyCollection<string> otherFileNames,
+    bool runAfterCompile, TextWriter outputWriter) {
+    if (runAfterCompile) {
+      Contract.Assert(callToMain != null);  // this is part of the contract of CompileTargetProgram
+      // Since the program is to be run soon, nothing further is done here. Any compilation errors (that is, any errors
+      // in the emitted program--this should never happen if the compiler itself is correct) will be reported as 'go run'
+      // will run the program.
+      return (true, null);
+    } else {
+      // compile now
+      return (await SendToNewGoProcess(dafnyProgramName, targetFilename, otherFileNames,
+        outputWriter, outputWriter, callToMain != null, run: false), null);
+    }
+  }
+
+  public override Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText,
+    string callToMain, /*?*/
+    string targetFilename, ReadOnlyCollection<string> otherFileNames,
+    object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
+
+    return SendToNewGoProcess(dafnyProgramName, targetFilename, otherFileNames, outputWriter, errorWriter, hasMain: true, run: true);
+  }
+
+  private async Task<bool> SendToNewGoProcess(string dafnyProgramName, string targetFilename,
+    ReadOnlyCollection<string> otherFileNames,
+    TextWriter outputWriter, TextWriter errorWriter, bool hasMain, bool run) {
+    Contract.Requires(targetFilename != null);
+
+    foreach (var otherFileName in otherFileNames) {
+      if (Path.GetExtension(otherFileName) != ".go") {
+        await outputWriter.WriteLineAsync($"Unrecognized file as extra input for Go compilation: {otherFileName}");
+        return false;
+      }
+
+      if (!CopyExternLibraryIntoPlace(mainProgram: targetFilename, externFilename: otherFileName, outputWriter: outputWriter)) {
+        return false;
+      }
+    }
+
+    // Dafny used to compile to the old Go package system only, but Go has moved on to a module
+    // system. Although compiler has moved to new system, it still doesn't generate the go.mod file which
+    // is required by go run. It also supports backwards compatability with GOPATH hence those env variables
+    // are still being used while running in GOPATH mode.
+    if (GoModuleMode) {
+      Reporter.Info(MessageSource.Compiler, Token.Cli, "go build/run skipped in Go Module Mode");
+      return true;
+    }
+
+    List<string> goArgs = new();
+    if (run) {
+      goArgs.Add("run");
+    } else {
+      string output;
+      var outputToFile = !Options.RunAfterCompile;
+
+      if (outputToFile) {
+        string extension;
+        if (hasMain) {
+          switch (Environment.OSVersion.Platform) {
+            case PlatformID.Unix:
+            case PlatformID.MacOSX:
+            case (PlatformID)128: // early Mono
+              extension = null;
+              break;
+            default:
+              extension = "exe";
+              break;
+          }
+        } else {
+          extension = "a";
+        }
+        output = Path.ChangeExtension(dafnyProgramName, extension);
+      } else {
+        // This is used when there is no main method but user has invoked dafny run.
+        switch (Environment.OSVersion.Platform) {
+          case PlatformID.Unix:
+          case PlatformID.MacOSX:
+          case (PlatformID)128: // early Mono
+            output = "/dev/null";
+            break;
+          default:
+            output = "NUL";
+            break;
+        }
+      }
+
+      goArgs.Add("build");
+      goArgs.Add("-o");
+      goArgs.Add(output);
+    }
+
+    goArgs.Add(targetFilename);
+    goArgs.AddRange(Options.MainArgs);
+
+    var psi = PrepareProcessStartInfo("go", goArgs);
+
+    psi.EnvironmentVariables["GOPATH"] = GoPath(targetFilename);
+    psi.EnvironmentVariables["GO111MODULE"] = "auto";
+
+    return 0 == await RunProcess(psi, outputWriter, errorWriter);
+  }
+
+  static string GoPath(string filename) {
+    var dirName = Path.GetDirectoryName(Path.GetDirectoryName(filename));
+
+    Contract.Assert(dirName != null);
+
+    // Filename is Foo-go/src/Foo.go, so go two directories up
+    return Path.GetFullPath(dirName);
+  }
+
+  bool CopyExternLibraryIntoPlace(string externFilename, string mainProgram, TextWriter outputWriter) {
+    // Grossly, we need to look in the file to figure out where to put it
+    var pkgName = FindPackageName(externFilename);
+    if (pkgName == null) {
+      outputWriter.WriteLine("Unable to determine package name: {0}", externFilename);
+      return false;
+    }
+    if (pkgName.StartsWith("_")) {
+      // Check this here because otherwise Go acts like the package simply doesn't exist, which is confusing
+      outputWriter.WriteLine("Go packages can't start with underscores: {0}", pkgName);
+      return false;
+    }
+
+    var mainDir = Path.GetDirectoryName(mainProgram);
+
+    Contract.Assert(mainDir != null);
+
+    var tgtDir = Path.Combine(mainDir, pkgName);
+    var tgtFilename = Path.Combine(tgtDir, pkgName + ".go");
+
+    Directory.CreateDirectory(tgtDir);
+    File.Copy(externFilename, tgtFilename, overwrite: true);
+
+    string relTgtFilename;
+    var cwd = Directory.GetCurrentDirectory();
+    if (tgtFilename.StartsWith(cwd)) {
+      relTgtFilename = tgtFilename.Substring(cwd.Length + 1); // chop off relative path and '/'
+    } else {
+      relTgtFilename = tgtFilename;
+    }
+    if (Options.Verbose) {
+      outputWriter.WriteLine("Additional input {0} copied to {1}", externFilename, relTgtFilename);
+    }
+    return true;
+  }
+
+  private static string FindPackageName(string externFilename) {
+    using var rd = new StreamReader(new FileStream(externFilename, FileMode.Open, FileAccess.Read));
+    while (rd.ReadLine() is { } line) {
+      var match = PackageLine.Match(line);
+      if (match.Success) {
+        return match.Groups[1].Value;
+      }
+    }
+    return null;
+  }
+
+  private static readonly Regex PackageLine = new Regex(@"^\s*package\s+([a-zA-Z0-9_]+)\s*$");
+
+  public GoBackend(DafnyOptions options) : base(options) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/GoLang/GoCodeGenerator.cs b/Source/DafnyCore/Backends/GoLang/GoCodeGenerator.cs
new file mode 100644
index 00000000000..12dfa815b05
--- /dev/null
+++ b/Source/DafnyCore/Backends/GoLang/GoCodeGenerator.cs
@@ -0,0 +1,4101 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.IO;
+using System.Diagnostics.Contracts;
+using System.Text.RegularExpressions;
+using DafnyCore;
+using DafnyCore.Options;
+using JetBrains.Annotations;
+using Tomlyn.Model;
+using static Microsoft.Dafny.ConcreteSyntaxTreeUtils;
+
+namespace Microsoft.Dafny.Compilers {
+  class GoCodeGenerator : SinglePassCodeGenerator {
+    protected override void EmitStaticExternMethodQualifier(string qual, ConcreteSyntaxTree wr) {
+      if (qual != null) {
+        qual = ImportPrefix + qual;
+      }
+      base.EmitStaticExternMethodQualifier(qual, wr);
+    }
+
+    protected override bool RequiresAllVariablesToBeUsed => true;
+    private string DafnyRuntimeGoModule = "github.com/dafny-lang/DafnyRuntimeGo/v4/";
+
+    private bool GoModuleMode;
+    private string GoModuleName;
+    public GoCodeGenerator(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
+      var goModuleName = Options.Get(GoBackend.GoModuleNameCliOption);
+      GoModuleMode = goModuleName != null;
+      if (GoModuleMode) {
+        GoModuleName = goModuleName.ToString();
+      }
+      if (Options?.CoverageLegendFile != null) {
+        //TODO: What's the module name for this?
+        ImportsNotFromDafnyModules.Add(new Import { Name = "DafnyProfiling", Path = "DafnyProfiling" });
+      }
+    }
+
+    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
+      Feature.MethodSynthesis,
+      Feature.ExternalConstructors,
+      Feature.SubsetTypeTests,
+      Feature.AllUnderscoreExternalModuleNames,
+      Feature.RuntimeCoverageReport
+    };
+
+    public override string ModuleSeparator => "_";
+    protected override string IsMethodName => "Is_";
+
+    string FormatDefaultTypeParameterValue(TopLevelDecl tp) {
+      Contract.Requires(tp is TypeParameter || tp is AbstractTypeDecl);
+      return $"_default_{tp.GetCompileName(Options)}";
+    }
+
+    private readonly Dictionary<ModuleDefinition, Import> ModuleImports = new();
+    private readonly List<Import> ImportsNotFromDafnyModules = new(StandardImports);
+    private string ModuleName;
+    private ModuleDefinition CurrentModule;
+    private ConcreteSyntaxTree RootImportWriter;
+    private ConcreteSyntaxTree RootImportDummyWriter;
+
+    private string MainModuleName;
+    private static List<Import> StandardImports =
+      new List<Import> {
+        new Import { Name = "os", Path = "os" },
+      };
+    private static string DummyTypeName = "Dummy__";
+
+    private static string ImportPrefix = "m_";
+    private struct Import {
+      public string Name, Path;
+      public ModuleDefinition ExternModule;
+    }
+
+    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
+      wr.WriteLine("// Dafny program {0} compiled into Go", program.Name);
+
+      CurrentModule = null;
+      ModuleName = MainModuleName = program.MainMethod != null ? "main" : TransformToClassName(Path.GetFileNameWithoutExtension(program.Name));
+
+      wr.WriteLine("package {0}", ModuleName);
+      wr.WriteLine();
+
+      string path;
+      if (Options.IncludeRuntime) {
+        EmitRuntimeSource("DafnyRuntimeGo", wr);
+        path = GoModuleMode ? GoModuleName + "/" : "";
+      } else {
+        path = GoModuleMode ? DafnyRuntimeGoModule : "";
+      }
+      ImportsNotFromDafnyModules.Add(new Import { Name = "_dafny", Path = $"{path}dafny" });
+
+      if (Options.Get(CommonOptionBag.UseStandardLibraries) && Options.Get(CommonOptionBag.TranslateStandardLibrary)) {
+        EmitRuntimeSource("DafnyStandardLibraries_go", wr);
+      }
+
+      // Keep the import writers so that we can import subsequent modules into the main one
+      EmitImports(wr, out RootImportWriter, out RootImportDummyWriter);
+    }
+
+    private string DafnyTypeDescriptor => $"{HelperModulePrefix}TypeDescriptor";
+
+    // The implementation of seq<T> is now in DafnyRuntimeDafny/src/dafnyRuntime.dfy.
+    // We have to special-case compiling this code a little bit in places to work around
+    // features Dafny doesn't support, such as customizing the definition of equality.
+    private bool IsDafnySequence(TopLevelDecl d) =>
+      Options.Get(DeveloperOptionBag.Bootstrapping) && d.GetFullCompileName(Options) == "dafny.Sequence";
+
+    private string DafnySequenceCompanion => $"{HelperModulePrefix}Companion_Sequence_";
+
+    void EmitModuleHeader(ConcreteSyntaxTree wr) {
+      wr.WriteLine("// Package {0}", ModuleName);
+      wr.WriteLine("// Dafny module {0} compiled into Go", ModuleName);
+      wr.WriteLine();
+      wr.WriteLine("package {0}", ModuleName);
+      wr.WriteLine();
+      // This is a non-main module; it only imports things declared before it, so we don't need these writers
+      EmitImports(wr, out _, out _);
+      wr.WriteLine();
+      wr.WriteLine("type {0} struct{{}}", DummyTypeName);
+      wr.WriteLine();
+    }
+
+    void EmitImports(ConcreteSyntaxTree wr, out ConcreteSyntaxTree importWriter, out ConcreteSyntaxTree importDummyWriter) {
+      wr.WriteLine("import (");
+      importWriter = wr.Fork(1);
+      wr.WriteLine(")");
+      importDummyWriter = wr.Fork();
+      if (ModuleName != "dafny") {
+        foreach (var import in ImportsNotFromDafnyModules.Concat(ModuleImports.Values)) {
+          EmitImport(import, importWriter, importDummyWriter);
+        }
+      }
+    }
+
+    public string TransformToClassName(string baseName) =>
+      IdProtect(Regex.Replace(baseName, "[^_A-Za-z0-9$]", "_"));
+
+    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
+      CurrentModule = null;
+      var companion = TypeName_Companion(UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(mainMethod.EnclosingClass), wr, mainMethod.Origin, mainMethod);
+
+      var wBody = wr.NewNamedBlock("func main()");
+      wBody.WriteLine("defer _dafny.CatchHalt()");
+
+      var idName = IssueCreateStaticMain(mainMethod) ? "Main" : IdName(mainMethod);
+
+      Coverage.EmitSetup(wBody);
+      wBody.WriteLine($"{companion}.{idName}({GetHelperModuleName()}.{CharMethodQualifier}FromMainArguments(os.Args))");
+      Coverage.EmitTearDown(wBody);
+    }
+
+    ConcreteSyntaxTree CreateDescribedSection(string desc, ConcreteSyntaxTree wr, params object[] args) {
+      var body = wr.Fork();
+      var str = string.Format(desc, args);
+      body.WriteLine("// Definition of {0}", str);
+      wr.WriteLine("// End of {0}", str);
+      return body;
+    }
+
+    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
+      var wr = ((GoCodeGenerator.ClassWriter)cw).ConcreteMethodWriter;
+      return wr.NewNamedBlock("func (_this * {0}) Main({1} _dafny.Sequence)", FormatCompanionTypeName(((GoCodeGenerator.ClassWriter)cw).ClassName), argsParameterName);
+    }
+
+    private Import CreateImport(string moduleName, ModuleDefinition externModule,
+      string /*?*/ libraryName) {
+      string pkgName;
+      if (libraryName != null) {
+        pkgName = libraryName;
+      } else {
+        // Go ignores all filenames starting with underscores.  So we're forced
+        // to rewrite "__default" to "default__".
+        pkgName = moduleName;
+        if (pkgName != "" && pkgName.All(c => c == '_')) {
+          throw new UnsupportedFeatureException(Token.NoToken, Feature.AllUnderscoreExternalModuleNames,
+            $"Cannot have a package name with only underscores: {pkgName}");
+        }
+        while (pkgName.StartsWith("_")) {
+          pkgName = pkgName.Substring(1) + "_";
+        }
+      }
+
+
+      return new Import { Name = ImportPrefix + moduleName, Path = pkgName, ExternModule = externModule };
+    }
+
+    protected override bool ShouldCompileModule(Program program, ModuleDefinition module) {
+      if (!base.ShouldCompileModule(program, module)) {
+        return false;
+      }
+
+      if (TranslationRecord.ModuleEmptyForCompilation(module)) {
+        return false;
+      }
+
+      return true;
+    }
+
+    protected override ConcreteSyntaxTree CreateModule(ModuleDefinition module, string moduleName, bool isDefault,
+      ModuleDefinition externModule,
+      string libraryName /*?*/, Attributes moduleAttributes, ConcreteSyntaxTree wr) {
+      if (isDefault) {
+        // Fold the default module into the main module
+        return wr;
+      }
+
+      var goModuleName = GoModuleMode ? GoModuleName + "/" : "";
+      if (moduleName.Equals("_System")) {
+        if (Options.IncludeRuntime) {
+          goModuleName = GoModuleMode ? GoModuleName + "/" : "";
+        } else {
+          goModuleName = GoModuleMode ? DafnyRuntimeGoModule : "";
+        }
+      }
+      ModuleName = PublicModuleIdProtect(moduleName);
+      CurrentModule = module;
+      var import = CreateImport(ModuleName, externModule, libraryName);
+      var filename = string.Format("{0}/{0}.go", import.Path);
+      var w = wr.NewFile(filename);
+      EmitModuleHeader(w);
+
+      import.Path = goModuleName + import.Path;
+      AddImport(module, import);
+
+      return w;
+    }
+
+    protected override void DependOnModule(Program program, ModuleDefinition module, ModuleDefinition externModule,
+      string libraryName) {
+
+      if (externModule == null && TranslationRecord.ModuleEmptyForCompilation(module)) {
+        return;
+      }
+
+      var goModuleName = "";
+      if (GoModuleMode) {
+        // "_System" module has a special handling because although it gets translated from a Dafny module,
+        // it is still part of the Dafny Runtime lib so has no associated go module name. It either uses the
+        // project module name if embedded or falls back to the Runtime module name.
+        if (module.GetCompileName(Options).Equals("_System")) {
+          if (Options.IncludeRuntime) {
+            goModuleName = GoModuleName + "/";
+          } else {
+            goModuleName = DafnyRuntimeGoModule;
+          }
+        } else {
+          // For every other Dafny Module, fetch the associated go module name from the dtr structure.
+          var translatedRecord = program.Compilation.AlreadyTranslatedRecord;
+          translatedRecord.OptionsByModule.TryGetValue(module.FullDafnyName, out var moduleOptions);
+          object moduleName = null;
+          moduleOptions?.TryGetValue(GoBackend.GoModuleNameCliOption.Name, out moduleName);
+
+          goModuleName = moduleName is string name ? moduleName + "/" : "";
+          if (String.IsNullOrEmpty(goModuleName)) {
+            Reporter.Warning(MessageSource.Compiler, ResolutionErrors.ErrorId.none, Token.Cli,
+              $"Go Module Name not found for the module {module.GetCompileName(Options)}");
+          }
+        }
+      }
+
+      var publicModuleName = PublicModuleIdProtect(module.GetCompileName(Options));
+      var import = CreateImport(publicModuleName, externModule, libraryName);
+      import.Path = goModuleName + import.Path;
+      AddImport(module, import);
+    }
+
+    protected override void FinishModule() {
+      CurrentModule = null;
+      ModuleName = MainModuleName;
+    }
+
+    private void AddImport(ModuleDefinition module, Import import) {
+      // Import in root module
+      EmitImport(import, RootImportWriter, RootImportDummyWriter);
+      // Import in all subsequent modules
+      ModuleImports[module] = import;
+      var implemented = module.GetImplementedModule();
+      while (implemented != null) {
+        ModuleImports[implemented] = import;
+        implemented = implemented.GetImplementedModule();
+      }
+    }
+
+    private void EmitImport(Import import, ConcreteSyntaxTree importWriter, ConcreteSyntaxTree importDummyWriter) {
+      var id = IdProtect(import.Name);
+      var path = import.Path;
+
+      importWriter.WriteLine("{0} \"{1}\"", id, path);
+
+      bool isType;
+      string memberName = null;
+      if (id == "os") {
+        memberName = "Args";
+        isType = false;
+      } else {
+        isType = true;
+        if (import.ExternModule != null) {
+          var attributes = Attributes.Find(import.ExternModule.Attributes, "dummyImportMember");
+          if (attributes != null && attributes.Args.Count == 2) {
+            if (attributes.Args[0] is LiteralExpr expr1 && expr1.Value is string isNameValue &&
+              attributes.Args[1] is LiteralExpr expr2 && expr2.Value is bool isTypeValue) {
+              memberName = isNameValue;
+              isType = isTypeValue;
+            }
+          }
+        } else {
+          memberName = DummyTypeName;
+        }
+      }
+
+      if (memberName != null) {
+        if (isType) {
+          importDummyWriter.WriteLine("var _ {0}.{1}", id, memberName);
+        } else {
+          importDummyWriter.WriteLine("var _ = {0}.{1}", id, memberName);
+        }
+      }
+    }
+
+    protected override string GetHelperModuleName() => "_dafny";
+
+    private string HelperModulePrefix => ModuleName == "dafny" ? "" : $"{GetHelperModuleName()}.";
+
+    protected override IClassWriter CreateClass(string moduleName, bool isExtern, string/*?*/ fullPrintName,
+      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type>/*?*/ superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+      var isDefaultClass = cls is DefaultClassDecl;
+
+      bool isSequence = superClasses.Any(superClass => superClass is UserDefinedType udt && IsDafnySequence(udt.ResolvedClass));
+      return CreateClass(cls, isExtern, fullPrintName, typeParameters, superClasses, tok, wr, includeRtd: !isDefaultClass, includeEquals: !isSequence, includeString: !isSequence);
+    }
+
+    // TODO Consider splitting this into two functions; most things seem to be passing includeRtd: false, includeEquals: false and includeString: true.
+    private GoCodeGenerator.ClassWriter CreateClass(TopLevelDecl classContext, bool isExtern, string/*?*/ fullPrintName, List<TypeParameter>/*?*/ typeParameters, List<Type>/*?*/ superClasses, IOrigin tok, ConcreteSyntaxTree wr, bool includeRtd, bool includeEquals, bool includeString) {
+      // See docs/Compilation/ReferenceTypes.md for a description of how instance members of classes and traits are compiled into Go.
+      //
+      // func New_Class_(Type0 _dafny.TypeDescriptor, Type1 _dafny.TypeDescriptor) *Class {
+      //   _this := Class{}
+      //
+      //   // Have to do it this way because some default values (namely type
+      //   // parameters) assume that _this points to the current value
+      //   _this.Type0 = Type0
+      //   _this.Type1 = Type1
+      //   _this.Field0 = ...
+      //   _this.Field1 = ...
+      //   return &_this
+      // }
+      //
+      // func (_this *Class) InstanceMethod(param0 type0, ...) returnType {
+      //   ...
+      // }
+      //
+      // func (_this *CompanionStruct_Class) StaticMethod(param0 type0, ...) returnType {
+      //   ...
+      // }
+      //
+      // func (*Class) String() string {
+      //   return "module.Class"
+      // }
+      //
+      // func Type_Class_(Type0 _dafny.TypeDescriptor, Type1 _dafny.TypeDescriptor) _dafny.TypeDescriptor {
+      //   return type_Class_{Type0, Type1}
+      // }
+      //
+      // type type_Class_ struct{
+      //   Type0 _dafny.TypeDescriptor
+      //   Type1 _dafny.TypeDescriptor
+      // }
+      //
+      // func (_this type_Class_) Default() any {
+      //   return (*Class)(nil)
+      // }
+      //
+      // func (_this type_Class_) String() string {
+      //   return "module.Class"
+      // }
+      //
+      var name = Capitalize(IdName(classContext));
+
+      var w = CreateDescribedSection("class {0}", wr, name);
+
+      var instanceFieldWriter = w.NewBlock(string.Format("type {0} struct", name));
+
+      w.WriteLine();
+      CreateInitializer(classContext, name, w, out var instanceFieldInitWriter, out var traitInitWriter, out var rtdParamWriter);
+
+      var isNewtypeWithTraits = classContext is NewtypeDecl { ParentTraits: { Count: > 0 } };
+
+      var rtdCount = 0;
+      if (typeParameters != null) {
+        rtdCount = WriteRuntimeTypeDescriptorsFields(typeParameters, false, instanceFieldWriter, instanceFieldInitWriter, rtdParamWriter);
+      }
+      if (isNewtypeWithTraits) {
+        var udt = UserDefinedType.FromTopLevelDecl(classContext.Origin, classContext);
+        rtdParamWriter.Write($"value {TypeName(udt, rtdParamWriter, classContext.Origin)}");
+      }
+
+      w.WriteLine();
+      var staticFieldWriter = w.NewNamedBlock("type {0} struct", FormatCompanionTypeName(name));
+      var staticFieldInitWriter = w.NewNamedBlock("var {0} = {1}", FormatCompanionName(name), FormatCompanionTypeName(name));
+
+      if (includeEquals) {
+        // This Equals() is so simple that we could just use == instead, but uniformity is good and it'll get inlined anyway.
+
+        w.WriteLine();
+        var wEquals = w.NewNamedBlock("func (_this *{0}) Equals(other *{0}) bool", name);
+        wEquals.WriteLine("return _this == other");
+
+        w.WriteLine();
+        var wEqualsGeneric = w.NewNamedBlock("func (_this *{0}) EqualsGeneric(x interface{{}}) bool", name);
+        wEqualsGeneric.WriteLine("other, ok := x.(*{0})", name);
+        wEqualsGeneric.WriteLine("return ok && _this.Equals(other)");
+      }
+
+      w.WriteLine();
+      if (includeString) {
+        if (isNewtypeWithTraits) {
+          var wString = w.NewNamedBlock("func (_this *{0}) String() string", name);
+          wString.WriteLine("return _dafny.String(_this._value)");
+        } else {
+          var wString = w.NewNamedBlock("func (*{0}) String() string", name);
+          // Be consistent with other back ends, which don't fold _module into the main module
+          var module = ModuleName == MainModuleName ? "_module" : ModuleName;
+          wString.WriteLine("return \"{0}.{1}\"", module, name);
+        }
+      }
+
+      if (includeRtd) {
+        CreateRTD(name, typeParameters, out var wDefault, w);
+
+        wDefault.WriteLine("return (*{0})(nil)", name);
+      }
+
+      var cw = new ClassWriter(this, classContext, tok != null, name, isExtern, null, w, instanceFieldWriter, instanceFieldInitWriter, traitInitWriter, staticFieldWriter, staticFieldInitWriter);
+
+      if (superClasses != null) {
+        superClasses = superClasses.Where(trait => !trait.IsObject).ToList();
+        EmitParentTraits(tok, name, true, superClasses, w);
+      }
+      return cw;
+    }
+
+    private void EmitParentTraits(IOrigin tok, string childName, bool childIsUsedAsPointer, List<Type> parentTraits, ConcreteSyntaxTree wr) {
+      var star = childIsUsedAsPointer ? "*" : "";
+      var addressOf = childIsUsedAsPointer ? "&" : "";
+      // Emit a method that returns the ID of each parent trait
+      var parentTraitsWriter = wr.NewBlock($"func (_this {star}{childName}) ParentTraits_() []*{HelperModulePrefix}TraitID");
+      parentTraitsWriter.WriteLine("return [](*{0}TraitID){{{1}}};", HelperModulePrefix, Util.Comma(parentTraits, parent => {
+        var trait = ((UserDefinedType)parent).ResolvedClass;
+        return TypeName_Companion(trait, parentTraitsWriter, tok) + ".TraitID_";
+      }));
+
+      foreach (Type typ in parentTraits) {
+        // Emit a compile-time sanity check that the class emitted does indeed have the methods required by the parent trait
+        wr.WriteLine($"var _ {TypeName(typ, wr, tok)} = {addressOf}{childName}{{}}");
+      }
+
+      wr.WriteLine($"var _ {HelperModulePrefix}TraitOffspring = {addressOf}{childName}{{}}");
+
+      wr.WriteLine();
+    }
+
+    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
+      TraitDecl trait, List<Type> superClasses /*?*/, IOrigin tok, ConcreteSyntaxTree wr) {
+      //
+      // type Trait interface {
+      //   String() string
+      //   AbstractMethod0(param0 type0, ...) returnType0
+      //   ...
+      // }
+      //
+      // type companionStruct_Trait_ struct {
+      //   StaticField0 type0
+      //   StaticField1 type1
+      //   ...
+      // }
+      //
+      // var Companion_Trait_ = companionStruct_Trait{
+      //   StaticField0: ...,
+      //   StaticField1: ...,
+      // }
+      //
+      // func (_static *companionStruct_Trait) CastTo_(x any) Trait {
+      //   var t Trait
+      //   t, _ = x.(Trait)
+      //   return t
+      // }
+      //
+      // func (_static *companionStruct_Trait) ConcreteInstanceMethod(_this Trait, ...) ... {
+      //   ...
+      // }
+      //
+      // func (_static *companionStruct_Trait) StaticMethod(...) ... {
+      //   ...
+      // }
+      wr = CreateDescribedSection("trait {0}", wr, name);
+      var abstractMethodWriter = wr.NewNamedBlock("type {0} interface", name);
+      var concreteMethodWriter = wr.Fork();
+      abstractMethodWriter.WriteLine("String() string");
+      if (IsDafnySequence(trait)) {
+        abstractMethodWriter.WriteLine("Equals(other Sequence) bool");
+        abstractMethodWriter.WriteLine("EqualsGeneric(x interface{}) bool");
+        abstractMethodWriter.WriteLine("VerbatimString(isLiteral bool) string");
+      }
+
+      var staticFieldWriter = wr.NewNamedBlock("type {0} struct", FormatCompanionTypeName(name));
+      var staticFieldInitWriter = wr.NewNamedBlock("var {0} = {1}", FormatCompanionName(name), FormatCompanionTypeName(name));
+      var wCastTo = wr.NewNamedBlock("func ({0}) CastTo_(x interface{{}}) {1}", FormatCompanionTypeName(name), name);
+      wCastTo.WriteLine("var t {0}", name);
+      wCastTo.WriteLine("t, _ = x.({0})", name);
+      wCastTo.WriteLine("return t");
+
+
+      var cw = new ClassWriter(this, trait, false, name, isExtern, abstractMethodWriter, concreteMethodWriter, null, null, null, staticFieldWriter, staticFieldInitWriter);
+      staticFieldWriter.WriteLine($"TraitID_ *{HelperModulePrefix}TraitID");
+      staticFieldInitWriter.WriteLine($"TraitID_: &{HelperModulePrefix}TraitID{{}},");
+      return cw;
+    }
+
+    protected void CreateInitializer(TopLevelDecl classContext, string name, ConcreteSyntaxTree wr,
+      out ConcreteSyntaxTree instanceFieldInitWriter, out ConcreteSyntaxTree traitInitWriter, out ConcreteSyntaxTree rtdParamWriter) {
+      wr.Write("func {0}(", FormatInitializerName(name));
+      rtdParamWriter = wr.Fork();
+      var w = wr.NewNamedBlock(") *{0}", name);
+      var parameters = classContext is NewtypeDecl { ParentTraits: { Count: > 0 } } ? "value" : "";
+      w.WriteLine($"_this := {name}{{{parameters}}}");
+
+      w.WriteLine();
+      instanceFieldInitWriter = w.Fork();
+      traitInitWriter = w.Fork();
+      w.WriteLine("return &_this");
+    }
+
+    protected override bool SupportsProperties => false;
+
+    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
+      // FIXME: There should be tests to make sure that the finalizer mechanism achieves what I hope it does, namely allowing the iterator's goroutine to be garbage-collected along with the iterator.
+      //
+      // type MyIteratorExample struct {
+      //   cont chan<- struct{}
+      //   yielded <-chan struct{}
+      //
+      //   // Fields
+      // }
+      //
+      // func (_this * MyIteratorExample) Ctor__(/* params */) {
+      //   _cont := make(chan struct{})
+      //   _yielded := make(chan struct{})
+      //   _this.cont = _cont
+      //   _this.yielded = _yielded
+      //   // assign params
+      //
+      //   go _this.run(_cont, _yielded)
+      //
+      //   _dafny.SetFinalizer(this_, func(_ MyIteratorExample) {
+      //     close(_cont) // will cause the iterator to return and close _yielded
+      //   })
+      // }
+      //
+      // func (_this * MyIteratorExample) MoveNext() bool {
+      //   _this.cont <- struct{}{}
+      //   _, ok <- _this.yielded
+      //
+      //   return ok
+      // }
+      //
+      // func (_this * MyIteratorExample) run(_cont <-chan struct{}, _yielded chan<- struct{}) {
+      //   defer close(_yielded)
+      //
+      //   var _ok bool
+      //   _, _ok = <- _cont
+      //   if !_ok { return }
+      //
+      //   // Statements ... yield becomes:
+      //   _yielded <- struct{}{}
+      //   _, _ok = <- _cont
+      //   if !_ok { return }
+      //
+      //   // break becomes:
+      //   return
+      // }()
+      var cw = CreateClass(iter, false, null, iter.TypeArgs, null, null, wr, includeRtd: false, includeEquals: false, includeString: true);
+
+      cw.InstanceFieldWriter.WriteLine("cont chan<- struct{}");
+      cw.InstanceFieldWriter.WriteLine("yielded <-chan struct{}");
+
+      Constructor ct = null;
+      foreach (var member in iter.Members) {
+        if (member is Field f && !f.IsGhost) {
+          cw.DeclareField(IdName(f), iter, false, false, f.Type, f.Origin, PlaceboValue(f.Type, wr, f.Origin, true), f);
+        } else if (member is Constructor c) {
+          Contract.Assert(ct == null);
+          ct = c;
+        }
+      }
+      Contract.Assert(ct != null);
+
+      cw.ConcreteMethodWriter.Write("func (_this * {0}) {1}(", IdName(iter), IdName(ct));
+      string sep = "";
+      foreach (var p in ct.Ins) {
+        if (!p.IsGhost) {
+          // here we rely on the parameters and the corresponding fields having the same names
+          cw.ConcreteMethodWriter.Write("{0}{1} {2}", sep, IdName(p), TypeName(p.Type, wr, p.Origin));
+          sep = ", ";
+        }
+      }
+      var wCtor = cw.ConcreteMethodWriter.NewBlock(")");
+      wCtor.WriteLine("_cont := make(chan struct{})");
+      wCtor.WriteLine("_yielded := make(chan struct{})");
+      wCtor.WriteLine("_this.cont = _cont");
+      wCtor.WriteLine("_this.yielded = _yielded");
+      wCtor.WriteLine();
+      foreach (var p in ct.Ins) {
+        if (!p.IsGhost) {
+          wCtor.WriteLine("_this.{0} = {1}", Capitalize(IdName(p)), IdName(p));
+        }
+      }
+      wCtor.WriteLine();
+      wCtor.WriteLine("go _this.run(_cont, _yielded)");
+      wCtor.WriteLine();
+      wCtor.WriteLine("_dafny.SetFinalizer(_this, func(_ * {0}) {{ close(_cont) }})", IdName(iter));
+
+      var wMoveNext = cw.ConcreteMethodWriter.NewNamedBlock("func (_this * {0}) MoveNext() bool", IdName(iter));
+      wMoveNext.WriteLine("_this.cont <- struct{}{}");
+      wMoveNext.WriteLine("_, ok := <- _this.yielded");
+      wMoveNext.WriteLine();
+      wMoveNext.WriteLine("return ok");
+
+      var wRun = cw.ConcreteMethodWriter.NewNamedBlock("func (_this * {0}) run(_cont <-chan struct{{}}, _yielded chan<- struct{{}})", IdName(iter));
+      wRun.WriteLine("defer close(_yielded)");
+      wRun.WriteLine();
+      wRun.WriteLine("_, _ok := <- _cont");
+      wRun.WriteLine("if !_ok { return }");
+      wRun.WriteLine();
+
+      return wRun;
+    }
+
+    protected override IClassWriter/*?*/ DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
+      // ===== For inductive datatypes:
+      //
+      // type Dt struct {
+      //   Data_Dt_
+      // }
+      //
+      // type Data_Dt_ interface {
+      //   isDt()
+      // }
+      //
+      // // For uniformity with co-datatypes
+      // func (_this Dt) Get_() Data_Dt_ {
+      //   return _this.Data_Dt_
+      // }
+      //
+      // type CompanionStruct_Dt_ struct {}
+      //
+      // var Companion_Dt_ = CompanionStruct_Dt_ {}
+      //
+      // ...
+      //
+      // type Dt_Ctor0 struct {
+      //   Field0 type0
+      //   Field1 type1
+      //   ...
+      // }
+      //
+      // func (Dt_Ctor0) isDt() {}
+      //
+      // func (_ CompanionStruct_Dt_) CreateCtor0(field0 type0, field1 type1) Dt {
+      //   return Dt{Dt_Ctor0{type0, type1}}
+      // }
+      //
+      // func (_this Dt) IsCtor0() bool {
+      //   _, ok := _this.Data_Dt_.(Dt_Ctor0)
+      //   return ok
+      // }
+      //
+      // type Dt_Ctor1 struct {
+      //   ...
+      // }
+      //
+      // ...
+      //
+      // func (_this Dt) DtorDtor0() (dtor0Type, bool) {
+      //   return _this.Data_Dt_.(Dt_Ctor0).Field0
+      // }
+      //
+      // func (_this Dt) DtorDtor1() (dtor1Type, bool) {
+      //   switch data := _this.Data_Dt_.(type) {
+      //   case Dt_Ctor0:
+      //     return data.Field1
+      //   default:
+      //     return data.(Dt_Ctor1).Field0
+      //   }
+      // }
+      //
+      // func (_this Dt) String() { ... }
+      //
+      // func (_this Dt) EqualsGeneric(other any) bool { ... }
+      //
+      // func (CompanionStruct_Dt_) AllSingletonConstructors() _dafny.Iterator {
+      //   i := -1
+      //   return func() (any, bool) {
+      //     i++
+      //     switch i {
+      //       case 0:
+      //         return Companion_Dt_.Create_Ctor0(), true
+      //       case 1:
+      //         return Companion_Dt_.Create_Ctor1(), true
+      //       ...
+      //       default:
+      //         return Dt{}, false
+      //     }
+      //   }
+      // }
+      //
+      // func Type_Dt_(tyArg0 Type, tyArg1 Type, ...) _dafny.TypeDescriptor {
+      //   return type_Dt_{tyArg0, tyArg1, ...}
+      // }
+      //
+      // type type_Dt_ struct {
+      //   tyArg0 Type
+      //   tyArg1 Type
+      // }
+      //
+      // func (ty type_Dt_) Default() any {
+      //   tyArg0 := ty.tyArg0
+      //   tyArg1 := ty.tyArg1
+      //   return Companion_Dt_.Create_CtorK(...)
+      // }
+      //
+      // func (ty type_Dt_) String() string {
+      //   return "module.Dt"
+      // }
+      //
+      // TODO Optimize record types
+      //
+      // ===== For co-inductive datatypes:
+      //
+      // type Dt struct {
+      //   Iface_Dt_
+      // }
+      //
+      // type Iface_Dt_ interface {
+      //   Get_() Data_Dt_
+      // }
+      //
+      // type lazyDt struct {
+      //   value Iface_Dt_
+      //   init func() Dt
+      // }
+      //
+      // func (_this * lazyDt) Get_() *Iface_Dt {
+      //   if _this.value == nil {
+      //      _this.value = _this.init().Get_()
+      //      _this.init = nil // allow GC of values in closure
+      //   }
+      //   return _this.value
+      // }
+      //
+      // ...
+      //
+      // func (_ CompanionStruct_Dt_) LazyDt(f func() Dt) Dt {
+      //   return Dt{*lazyDt{nil, f}}
+      // }
+      //
+      // func (_ CompanionStruct_Dt_) CreateCtor0(field0 type0, field1 type1) Dt {
+      //   return Dt{*Dt_Ctor0{type0, type1}}
+      // }
+      //
+      // func (_this * Dt_Ctor0) Get_() Dt {
+      //   return _this
+      // }
+      if (dt is TupleTypeDecl) {
+        // Tuple types are declared once and for all in DafnyRuntime.go
+        return null;
+      }
+
+      string name = Capitalize(dt.GetCompileName(Options));
+      string companionTypeName = FormatCompanionTypeName(name);
+      string dataName = FormatDatatypeInterfaceName(name);
+      string ifaceName = FormatLazyInterfaceName(name);
+      var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, UserDefinedType.FromTopLevelDecl(dt.Origin, dt));
+      var simplifiedTypeName = TypeName(simplifiedType, wr, dt.Origin);
+
+      string StructOfCtor(DatatypeCtor ctor) {
+        return string.Format("{0}{1}_{2}", dt is CoDatatypeDecl ? "*" : "", name, ctor.GetCompileName(Options));
+      }
+
+      // from here on, write everything into the new block created here:
+      wr = CreateDescribedSection("{0} {1}", wr, dt.WhatKind, name);
+
+      if (dt is IndDatatypeDecl) {
+        var wStruct = wr.NewNamedBlock("type {0} struct", name);
+        WriteRuntimeTypeDescriptorsFields(dt.TypeArgs, false, wStruct, null, null);
+        wStruct.WriteLine(dataName);
+
+        wr.WriteLine();
+        var wGet = wr.NewNamedBlock("func (_this {0}) Get_() {1}", name, dataName);
+        wGet.WriteLine("return _this.{0}", dataName);
+      } else {
+        var wDt = wr.NewNamedBlock("type {0} struct", name);
+        WriteRuntimeTypeDescriptorsFields(dt.TypeArgs, false, wDt, null, null);
+        wDt.WriteLine(ifaceName);
+
+        wr.WriteLine();
+        var wIface = wr.NewNamedBlock("type {0} interface", ifaceName);
+        wIface.WriteLine("Get_() {0}", dataName);
+
+        wr.WriteLine();
+        var wLazy = wr.NewNamedBlock("type lazy_{0}_ struct", name);
+        wLazy.WriteLine("value {0}", dataName);
+        wLazy.WriteLine("init func() {0}", name);
+
+        wr.WriteLine();
+        var wLazyGet = wr.NewNamedBlock("func (_this *lazy_{0}_) Get_() {1}", name, dataName);
+        var wIf = wLazyGet.NewBlock("if _this.value == nil");
+        wIf.WriteLine("_this.value = _this.init().Get_()");
+        wIf.WriteLine("_this.init = nil"); // allow GC of values in closure
+
+        wLazyGet.WriteLine("return _this.value");
+
+        wr.WriteLine();
+        var typeDescriptorCount = WriteRuntimeTypeDescriptorsFormals(dt.TypeArgs, false, out var wrFormals, out var wrActuals);
+        var sep = typeDescriptorCount > 0 ? ", " : "";
+        var wLazyCreate = wr.NewNamedBlock($"func ({companionTypeName}) {FormatLazyConstructorName(name)}({wrFormals}{sep}f func () {name}) {name}");
+        wLazyCreate.WriteLine($"return {name}{{{wrActuals}{sep}&lazy_{name}_{{nil, f}}}}");
+      }
+
+      {
+        wr.WriteLine();
+        var wIface = wr.NewNamedBlock("type {0} interface", dataName);
+        wIface.WriteLine("is{0}()", name);
+      }
+
+      wr.WriteLine();
+      var staticFieldWriter = wr.NewNamedBlock("type {0} struct", companionTypeName);
+      var staticFieldInitWriter = wr.NewNamedBlock("var {0} = {1}", FormatCompanionName(name), companionTypeName);
+
+      string typeDescriptorDeclarations;
+      string typeDescriptorUses;
+      {
+        WriteRuntimeTypeDescriptorsFormals(dt.TypeArgs, false, out var wTypeDescriptorDeclarations, out var wTypeDescriptorUses);
+        typeDescriptorDeclarations = wTypeDescriptorDeclarations.ToString();
+        typeDescriptorUses = wTypeDescriptorUses.ToString();
+      }
+
+      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+        var ctorStructName = name + "_" + ctor.GetCompileName(Options);
+        wr.WriteLine();
+        var wStruct = wr.NewNamedBlock("type {0} struct", ctorStructName);
+        var k = 0;
+        foreach (var formal in ctor.Formals) {
+          if (!formal.IsGhost) {
+            wStruct.WriteLine("{0} {1}", DatatypeFieldName(formal, k), TypeName(formal.Type, wr, formal.Origin));
+            k++;
+          }
+        }
+
+        wr.WriteLine();
+        wr.WriteLine("func ({0}{1}) is{2}() {{}}", dt is CoDatatypeDecl ? "*" : "", ctorStructName, name);
+        wr.WriteLine();
+
+        wr.Write($"func ({companionTypeName}) {FormatDatatypeConstructorName(ctor.GetCompileName(Options))}({typeDescriptorDeclarations}");
+        var sep = typeDescriptorDeclarations.Length != 0 ? ", " : "";
+        var argNames = new List<string>();
+        k = 0;
+        foreach (var formal in ctor.Formals) {
+          if (!formal.IsGhost) {
+            var formalName = DatatypeFieldName(formal, k);
+
+            wr.Write($"{sep}{formalName} {TypeName(formal.Type, wr, formal.Origin)}");
+
+            argNames.Add(formalName);
+            sep = ", ";
+            k++;
+          }
+        }
+        var wCreateBody = wr.NewNamedBlock(") {0}", name);
+        sep = typeDescriptorDeclarations.Length != 0 ? ", " : "";
+        var co = dt is CoDatatypeDecl ? "&" : "";
+        wCreateBody.WriteLine($"return {name}{{{typeDescriptorUses}{sep}{co}{ctorStructName}{{{Util.Comma(argNames)}}}}}");
+
+        wr.WriteLine();
+        var wCheck = wr.NewNamedBlock("func (_this {0}) {1}() bool", name, FormatDatatypeConstructorCheckName(ctor.GetCompileName(Options)));
+        wCheck.WriteLine("_, ok := _this.Get_().({0})", StructOfCtor(ctor));
+        wCheck.WriteLine("return ok");
+
+        if (dt is CoDatatypeDecl) {
+          wr.WriteLine();
+          var wGet = wr.NewNamedBlock("func (_this *{0}) Get_() {1}", ctorStructName, dataName);
+          wGet.WriteLine("return _this");
+        }
+      }
+
+      /* func (_static CompanionStruct_Dt_) Default(_default_A any, _default_B any) Dt {
+       *   return Dt{Dt_GroundingCtor{...}}
+       * }
+       */
+      wr.WriteLine();
+      wr.Write($"func ({companionTypeName}) Default({typeDescriptorDeclarations}");
+      var usedParameters = UsedTypeParameters(dt);
+      if (typeDescriptorDeclarations.Length != 0 && usedParameters.Count != 0) {
+        wr.Write(", ");
+      }
+      wr.Write(usedParameters.Comma(tp => $"{FormatDefaultTypeParameterValue(tp)} interface{{}}"));
+      {
+        var wDefault = wr.NewBlock($") {simplifiedTypeName}");
+        wDefault.Write("return ");
+        var groundingCtor = dt.GetGroundingCtor();
+        if (groundingCtor.IsGhost) {
+          wDefault.Write(ForcePlaceboValue(simplifiedType, wDefault, dt.Origin));
+        } else if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
+          wDefault.Write(DefaultValue(innerType, wDefault, dt.Origin));
+        } else {
+          var nonGhostFormals = groundingCtor.Formals.Where(f => !f.IsGhost).ToList();
+          var arguments = nonGhostFormals.Comma(f => DefaultValue(f.Type, wDefault, f.Origin));
+          EmitDatatypeValue(dt, groundingCtor, dt is CoDatatypeDecl, typeDescriptorUses, arguments, wDefault);
+        }
+        wDefault.WriteLine();
+      }
+
+      if (dt.HasFinitePossibleValues) {
+        wr.WriteLine();
+        var wSingles = wr.NewNamedBlock("func (_ {0}) AllSingletonConstructors() _dafny.Iterator", companionTypeName);
+        wSingles.WriteLine("i := -1");
+        wSingles = wSingles.NewNamedBlock("return func() (interface{{}}, bool)");
+        wSingles.WriteLine("i++");
+        wSingles = wSingles.NewNamedBlock("switch i");
+        var i = 0;
+        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+          wSingles.WriteLine("case {0}: return {1}.{2}(), true", i, FormatCompanionName(name), FormatDatatypeConstructorName(ctor.GetCompileName(Options)));
+          i++;
+        }
+        wSingles.WriteLine("default: return {0}{{}}, false", name);
+      }
+
+      // destructors
+      foreach (var ctor in dt.Ctors) {
+        foreach (var dtor in ctor.Destructors.Where(dtor => dtor.EnclosingCtors[0] == ctor)) {
+          var compiledConstructorCount = dtor.EnclosingCtors.Count(constructor => !constructor.IsGhost);
+          if (compiledConstructorCount != 0) {
+            var arg = dtor.CorrespondingFormals[0];
+            if (!arg.IsGhost && arg.HasName) {
+              wr.WriteLine();
+              var wDtor = wr.NewNamedBlock("func (_this {0}) {1}() {2}", name, FormatDatatypeDestructorName(arg.CompileName), TypeName(arg.Type, wr, arg.Origin));
+              var n = dtor.EnclosingCtors.Count;
+              if (n == 1) {
+                wDtor.WriteLine("return _this.Get_().({0}).{1}", StructOfCtor(dtor.EnclosingCtors[0]), DatatypeFieldName(arg));
+              } else {
+                wDtor = wDtor.NewBlock("switch data := _this.Get_().(type)");
+                var compiledConstructorsProcessed = 0;
+                for (var i = 0; i < n; i++) {
+                  var ctor_i = dtor.EnclosingCtors[i];
+                  Contract.Assert(arg.GetOrCreateCompileName(currentIdGenerator) == dtor.CorrespondingFormals[i].GetOrCreateCompileName(currentIdGenerator));
+                  if (ctor_i.IsGhost) {
+                    continue;
+                  }
+                  if (compiledConstructorsProcessed < compiledConstructorCount - 1) {
+                    wDtor.WriteLine("case {0}: return data.{1}", StructOfCtor(ctor_i), DatatypeFieldName(arg));
+                  } else {
+                    wDtor.WriteLine("default: return data.({0}).{1}", StructOfCtor(ctor_i), DatatypeFieldName(arg));
+                  }
+                  compiledConstructorsProcessed++;
+                }
+              }
+            }
+          }
+        }
+      }
+
+      {
+        // String() method
+        wr.WriteLine();
+        var w = wr.NewNamedBlock("func (_this {0}) String() string", name);
+        // TODO Avoid switch if only one branch
+        var needData = dt is IndDatatypeDecl && dt.Ctors.Exists(ctor => !ctor.IsGhost && ctor.Formals.Exists(arg => !arg.IsGhost));
+        w = w.NewNamedBlock("switch {0}_this.Get_().(type)", needData ? "data := " : "");
+        w.WriteLine("case nil: return \"null\"");
+        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+          var wCase = w.NewNamedBlock("case {0}:", StructOfCtor(ctor));
+          var nm = (dt.EnclosingModuleDefinition.TryToAvoidName ? "" : dt.EnclosingModuleDefinition.Name + ".") + dt.Name + "." + ctor.Name;
+          if (dt is CoDatatypeDecl) {
+            wCase.WriteLine("return \"{0}\"", nm);
+          } else {
+            wCase.Write("return \"{0}\"", nm);
+            var sep = " + \"(\" + ";
+            var anyFormals = false;
+            var k = 0;
+            foreach (var arg in ctor.Formals) {
+              if (!arg.IsGhost) {
+                anyFormals = true;
+                if (UnicodeCharEnabled && arg.Type.IsStringType) {
+                  wCase.Write($"{sep}data.{DatatypeFieldName(arg, k)}.VerbatimString(true)");
+                } else {
+                  wCase.Write($"{sep}{HelperModulePrefix}String(data.{DatatypeFieldName(arg, k)})");
+                }
+
+                sep = " + \", \" + ";
+                k++;
+              }
+            }
+            if (anyFormals) {
+              wCase.Write(" + \")\"");
+            }
+            wCase.WriteLine();
+          }
+        }
+        var wDefault = w.NewBlock("default:");
+        if (dt is CoDatatypeDecl) {
+          wDefault.WriteLine("return \"{0}.{1}.unexpected\"", dt.EnclosingModuleDefinition.GetCompileName(Options), dt.GetCompileName(Options));
+        } else {
+          wDefault.WriteLine("return \"<unexpected>\"");
+        }
+      }
+
+      // Equals method
+      {
+        wr.WriteLine();
+        var wEquals = wr.NewNamedBlock("func (_this {0}) Equals(other {0}) bool", name);
+        // TODO: Way to implement shortcut check for address equality?
+        var needData1 = dt.Ctors.Exists(ctor => !ctor.IsGhost && ctor.Formals.Exists(arg => !arg.IsGhost));
+
+        wEquals = wEquals.NewNamedBlock("switch {0}_this.Get_().(type)", needData1 ? "data1 := " : "");
+        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+          var wCase = wEquals.NewNamedBlock("case {0}:", StructOfCtor(ctor));
+
+          var needData2 = ctor.Formals.Exists(arg => !arg.IsGhost);
+
+          wCase.WriteLine("{0}, ok := other.Get_().({1})", needData2 ? "data2" : "_", StructOfCtor(ctor));
+          wCase.Write("return ok");
+          var k = 0;
+          foreach (Formal arg in ctor.Formals) {
+            if (!arg.IsGhost) {
+              wCase.Write(" && ");
+              string nm = DatatypeFieldName(arg, k);
+              var eqType = DatatypeWrapperEraser.SimplifyType(Options, arg.Type);
+              if (IsDirectlyComparable(eqType)) {
+                wCase.Write("data1.{0} == data2.{0}", nm);
+              } else if (IsOrderedByCmp(eqType)) {
+                wCase.Write("data1.{0}.Cmp(data2.{0}) == 0", nm);
+              } else if (IsComparedByEquals(eqType)) {
+                wCase.Write("data1.{0}.Equals(data2.{0})", nm);
+              } else {
+                wCase.Write("{0}AreEqual(data1.{1}, data2.{1})", HelperModulePrefix, nm);
+              }
+              k++;
+            }
+          }
+          wCase.WriteLine();
+        }
+        var wDefault = wEquals.NewNamedBlock("default:");
+        wDefault.WriteLine("return false; // unexpected");
+
+        wr.WriteLine();
+        var wEqualsGeneric = wr.NewNamedBlock("func (_this {0}) EqualsGeneric(other interface{{}}) bool", name);
+        wEqualsGeneric.WriteLine("typed, ok := other.({0})", name);
+        wEqualsGeneric.WriteLine("return ok && _this.Equals(typed)");
+      }
+
+      // RTD
+      {
+        var usedOrAutoInitTypeParams = UsedTypeParameters(dt, true);
+        CreateRTD(name, usedOrAutoInitTypeParams, out var wDefault, wr);
+        WriteRuntimeTypeDescriptorsLocals(usedOrAutoInitTypeParams, wDefault);
+
+        var usedTypeParams = UsedTypeParameters(dt);
+        var sep = typeDescriptorUses.Length != 0 && usedTypeParams.Count != 0 ? ", " : "";
+        var arguments = usedTypeParams.Comma(tp => DefaultValue(new UserDefinedType(tp), wDefault, dt.Origin, true));
+        wDefault.WriteLine($"return {TypeName_Companion(dt, wr, dt.Origin)}.Default({typeDescriptorUses}{sep}{arguments});");
+      }
+
+      EmitParentTraits(dt.Origin, name, false, dt.ParentTraits, wr);
+
+      return new ClassWriter(this, dt, false, name, dt.IsExtern(Options, out _, out _), null,
+        wr, wr, wr, wr, staticFieldWriter, staticFieldInitWriter);
+    }
+
+    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
+      var cw = CreateClass(nt, false, null, nt.TypeArgs,
+        nt.ParentTypeInformation.UniqueParentTraits(), null, wr, includeRtd: false, includeEquals: false, includeString: true);
+      var w = cw.ConcreteMethodWriter;
+      var nativeType = nt.NativeType != null ? GetNativeTypeName(nt.NativeType) : null;
+      if (nt.NativeType != null) {
+        var intType = $"{HelperModulePrefix}Int";
+        var wIntegerRangeBody = w.NewNamedBlock($"func (_this *{FormatCompanionTypeName(IdName(nt))}) IntegerRange(lo {intType}, hi {intType}) {HelperModulePrefix}Iterator");
+        wIntegerRangeBody.WriteLine($"iter := {HelperModulePrefix}IntegerRange(lo, hi)");
+        var wIterFuncBody = wIntegerRangeBody.NewBlock($"return func() ({AnyType}, bool)");
+        wIterFuncBody.WriteLine("next, ok := iter()");
+        wIterFuncBody.WriteLine("if !ok {{ return {0}(0), false }}", nativeType);
+        wIterFuncBody.WriteLine($"return next.({intType}).{Capitalize(nativeType)}(), true");
+      }
+      if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        var retType = nativeType ?? TypeName(nt.BaseType, w, nt.Origin);
+        var wWitness = w.NewNamedBlock("func (_this *{0}) Witness() {1}", FormatCompanionTypeName(IdName(nt)), retType);
+        var wStmts = wWitness.Fork();
+        wWitness.Write("return ");
+        if (nt.NativeType == null) {
+          wWitness.Append(Expr(nt.Witness, false, wStmts));
+          wWitness.WriteLine();
+        } else {
+          TrParenExpr(nt.Witness, wWitness, false, wStmts);
+          wWitness.WriteLine(".{0}()", Capitalize(GetNativeTypeName(nt.NativeType)));
+        }
+      }
+
+      var udt = UserDefinedType.FromTopLevelDecl(nt.Origin, nt);
+      // RTD
+      {
+        CreateRTD(IdName(nt), nt.TypeArgs, out var wDefaultBody, wr);
+        WriteRuntimeTypeDescriptorsLocals(nt.TypeArgs, wDefaultBody);
+        var d = DefaultValue(udt, wr, nt.Origin, true);
+        wDefaultBody.WriteLine("return {0}", d);
+      }
+
+      GenerateIsMethod(nt, wr);
+
+      if (nt.ParentTraits.Count != 0) {
+        cw.InstanceFieldWriter.WriteLine($"_value {TypeName(udt, cw.InstanceFieldWriter, nt.Origin)}");
+      }
+
+      return cw;
+    }
+
+    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
+      var cw = CreateClass(sst, false, null, sst.TypeArgs, null, null, wr, includeRtd: false, includeEquals: false, includeString: true);
+      var w = cw.ConcreteMethodWriter;
+      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        var witness = new ConcreteSyntaxTree(w.RelativeIndentLevel);
+        var wStmts = w.Fork();
+        witness.Append(Expr(sst.Witness, false, wStmts));
+        DeclareField("Witness", false, true, true, sst.Rhs, sst.Origin, witness.ToString(), cw.ClassName, cw.StaticFieldWriter, cw.StaticFieldInitWriter, cw.ConcreteMethodWriter);
+      }
+      // RTD
+      {
+        CreateRTD(IdName(sst), sst.TypeArgs, out var wDefaultBody, wr);
+        WriteRuntimeTypeDescriptorsLocals(sst.TypeArgs, wDefaultBody);
+        var udt = UserDefinedType.FromTopLevelDecl(sst.Origin, sst);
+        var d = DefaultValue(udt, wr, sst.Origin, true);
+        wDefaultBody.WriteLine("return {0}", d);
+      }
+
+      GenerateIsMethod(sst, wr);
+    }
+
+    private void CreateRTD(string typeName, List<TypeParameter> usedParams, out ConcreteSyntaxTree wDefaultBody, ConcreteSyntaxTree wr) {
+      Contract.Requires(typeName != null);
+      Contract.Requires(usedParams != null);
+      Contract.Requires(wr != null);
+      Contract.Ensures(Contract.ValueAtReturn(out wDefaultBody) != null);
+
+      wr.WriteLine();
+      wr.Write($"func {FormatRTDName(typeName)}(");
+      WriteRuntimeTypeDescriptorsFormals(usedParams, true, out var wrFormals, out _);
+      wr.Append(wrFormals);
+      var wTypeMethod = wr.NewBlock($") {DafnyTypeDescriptor}");
+      wTypeMethod.WriteLine($"return type_{typeName}_{{{usedParams.Comma(tp => FormatRTDName(tp.GetCompileName(Options)))}}}");
+
+      wr.WriteLine();
+      var wType = wr.NewNamedBlock($"type type_{typeName}_ struct");
+      WriteRuntimeTypeDescriptorsFields(usedParams, true, wType, null, null);
+
+      wr.WriteLine();
+      wDefaultBody = wr.NewNamedBlock("func (_this type_{0}_) Default() interface{{}}", typeName);
+
+      wr.WriteLine();
+      var wString = wr.NewNamedBlock($"func (_this type_{typeName}_) String() string");
+      wString.WriteLine($"return \"{ModuleName}.{typeName}\"");
+    }
+
+    void GenerateIsMethod(RedirectingTypeDecl declWithConstraints, ConcreteSyntaxTree wr) {
+      Contract.Requires(declWithConstraints is SubsetTypeDecl or NewtypeDecl);
+
+      if (declWithConstraints.ConstraintIsCompilable) {
+        var type = UserDefinedType.FromTopLevelDecl(declWithConstraints.Tok, (TopLevelDecl)declWithConstraints);
+
+        wr.Write($"func (_this *{FormatCompanionTypeName(IdName((TopLevelDecl)declWithConstraints))}) Is_(");
+
+        var count = WriteRuntimeTypeDescriptorsFormals(declWithConstraints.TypeArgs, false, out var wrFormals, out _);
+        if (count != 0) {
+          wr.Write($"{wrFormals}, ");
+        }
+
+        var sourceFormal = new Formal(declWithConstraints.Tok, "_source", type, true, false, null);
+        var typeName = TypeName(type, wr, declWithConstraints.Tok);
+        var wrBody = wr.NewBlock($"{IdName(sourceFormal)} {typeName}) bool");
+        GenerateIsMethodBody(declWithConstraints, sourceFormal, wrBody);
+      }
+    }
+
+    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
+      literalSuffix = "";
+      needsCastAfterArithmetic = false;
+      switch (sel) {
+        case NativeType.Selection.Byte:
+          name = "uint8";
+          break;
+        case NativeType.Selection.SByte:
+          name = "int8";
+          break;
+        case NativeType.Selection.UShort:
+          name = "uint16";
+          break;
+        case NativeType.Selection.Short:
+          name = "int16";
+          break;
+        case NativeType.Selection.UInt:
+          name = "uint32";
+          break;
+        case NativeType.Selection.Int:
+          name = "int32";
+          break;
+        case NativeType.Selection.ULong:
+          name = "uint64";
+          break;
+        case NativeType.Selection.Long:
+          name = "int64";
+          break;
+        default:
+          Contract.Assert(false);  // unexpected native type
+          throw new cce.UnreachableException();  // to please the compiler
+      }
+    }
+    protected class ClassWriter : IClassWriter {
+      public readonly GoCodeGenerator CodeGenerator;
+      public readonly TopLevelDecl ClassContext;
+      public readonly bool IsClass;
+      public readonly string ClassName;
+      public readonly bool IsExtern;
+      public readonly ConcreteSyntaxTree/*?*/ AbstractMethodWriter, ConcreteMethodWriter, InstanceFieldWriter, InstanceFieldInitWriter, TraitInitWriter, StaticFieldWriter, StaticFieldInitWriter;
+      public bool AnyInstanceFields { get; private set; } = false;
+
+      public ClassWriter(GoCodeGenerator codeGenerator, TopLevelDecl classContext, bool isClass, string className, bool isExtern, ConcreteSyntaxTree abstractMethodWriter, ConcreteSyntaxTree concreteMethodWriter,
+        ConcreteSyntaxTree/*?*/ instanceFieldWriter, ConcreteSyntaxTree/*?*/ instanceFieldInitWriter, ConcreteSyntaxTree/*?*/ traitInitWriter,
+        ConcreteSyntaxTree staticFieldWriter, ConcreteSyntaxTree staticFieldInitWriter) {
+        Contract.Requires(codeGenerator != null);
+        Contract.Requires(className != null);
+        this.CodeGenerator = codeGenerator;
+        this.ClassContext = classContext;
+        this.IsClass = isClass;
+        this.ClassName = className;
+        this.IsExtern = isExtern;
+        this.AbstractMethodWriter = abstractMethodWriter;
+        this.ConcreteMethodWriter = concreteMethodWriter;
+        this.InstanceFieldWriter = instanceFieldWriter;
+        this.InstanceFieldInitWriter = instanceFieldInitWriter;
+        this.TraitInitWriter = traitInitWriter;
+        this.StaticFieldWriter = staticFieldWriter;
+        this.StaticFieldInitWriter = staticFieldInitWriter;
+      }
+
+      public ConcreteSyntaxTree FieldWriter(bool isStatic) {
+        return isStatic ? StaticFieldWriter : InstanceFieldWriter;
+      }
+
+      public ConcreteSyntaxTree FieldInitWriter(bool isStatic) {
+        return isStatic ? StaticFieldInitWriter : InstanceFieldInitWriter;
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        return CodeGenerator.CreateMethod(m, typeArgs, createBody, ClassContext, ClassName, AbstractMethodWriter, ConcreteMethodWriter, forBodyInheritance, lookasideBody);
+      }
+
+      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        throw new UnsupportedFeatureException(m.Origin, Feature.MethodSynthesis);
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
+        return CodeGenerator.CreateFunction(name, typeArgs, formals, resultType, tok, isStatic, createBody, member, ClassContext, ClassName, AbstractMethodWriter, ConcreteMethodWriter, forBodyInheritance, lookasideBody);
+      }
+      public ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IOrigin tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance) {
+        return CodeGenerator.CreateGetter(name, resultType, tok, isStatic, createBody, member, ClassContext, ClassName, AbstractMethodWriter, ConcreteMethodWriter, forBodyInheritance);
+      }
+      public ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
+        return CodeGenerator.CreateGetterSetter(name, resultType, tok, createBody, member, ClassContext, ClassName, out setterWriter, AbstractMethodWriter, ConcreteMethodWriter, forBodyInheritance);
+      }
+      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs, Field field) {
+        // FIXME: This should probably be done in Compiler.DeclareField().
+        // Should just have these delegate methods take the ClassWriter as an
+        // argument.
+        if (!isStatic) {
+          AnyInstanceFields = true;
+        }
+        CodeGenerator.DeclareField(name, IsExtern, isStatic, isConst, type, tok, rhs, ClassName, FieldWriter(isStatic), FieldInitWriter(isStatic), ConcreteMethodWriter);
+      }
+
+      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
+        var tok = field.Origin;
+        var lvalue = CodeGenerator.EmitMemberSelect(w => w.Write("_this"), UserDefinedType.FromTopLevelDecl(tok, enclosingClass), field,
+        new List<TypeArgumentInstantiation>(), enclosingClass.ParentFormalTypeParametersToActuals, instantiatedFieldType);
+        var wRHS = lvalue.EmitWrite(FieldInitWriter(false));
+        CodeGenerator.EmitCoercionIfNecessary(instantiatedFieldType, field.Type, tok, wRHS);
+        wRHS.Write(CodeGenerator.PlaceboValue(instantiatedFieldType, ErrorWriter(), tok));
+      }
+
+      public ConcreteSyntaxTree/*?*/ ErrorWriter() => ConcreteMethodWriter;
+
+      public void Finish() {
+        CodeGenerator.FinishClass(this);
+      }
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody,
+      TopLevelDecl ownerContext, string ownerName,
+      ConcreteSyntaxTree abstractWriter, ConcreteSyntaxTree concreteWriter, bool forBodyInheritance, bool lookasideBody) {
+      var overriddenIns = m.EnclosingClass is TraitDecl && !forBodyInheritance ? null : m.OverriddenMethod?.Original.Ins;
+      var overriddenOuts = m.EnclosingClass is TraitDecl && !forBodyInheritance ? null : m.OverriddenMethod?.Original.Outs;
+      return CreateSubroutine(IdName(m), typeArgs, m.Ins, m.Outs, null,
+        overriddenIns, overriddenOuts, null,
+        m.Origin, m.IsStatic, createBody, ownerContext, ownerName, m, abstractWriter, concreteWriter, forBodyInheritance, lookasideBody);
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType,
+      IOrigin tok, bool isStatic, bool createBody, MemberDecl member, TopLevelDecl ownerContext, string ownerName,
+      ConcreteSyntaxTree abstractWriter, ConcreteSyntaxTree concreteWriter, bool forBodyInheritance, bool lookasideBody) {
+
+      var fnOverridden = (member as Function)?.OverriddenFunction?.Original;
+      return CreateSubroutine(name, typeArgs, formals, new List<Formal>(), resultType,
+        fnOverridden?.Ins, fnOverridden == null ? null : new List<Formal>(), fnOverridden?.ResultType,
+        tok, isStatic, createBody, ownerContext, ownerName, member, abstractWriter, concreteWriter, forBodyInheritance, lookasideBody);
+    }
+
+    private ConcreteSyntaxTree CreateSubroutine(string name, List<TypeArgumentInstantiation> typeArgs,
+      List<Formal> inParams, List<Formal> outParams, Type/*?*/ resultType,
+      List<Formal>/*?*/ overriddenInParams, List<Formal>/*?*/ overriddenOutParams, Type/*?*/ overriddenResultType,
+      IOrigin tok, bool isStatic, bool createBody, TopLevelDecl ownerContext, string ownerName, MemberDecl/*?*/ member,
+      ConcreteSyntaxTree abstractWriter, ConcreteSyntaxTree concreteWriter,
+      bool forBodyInheritance, bool lookasideBody) {
+      Contract.Requires(name != null);
+      Contract.Requires(typeArgs != null);
+      Contract.Requires(inParams != null);
+      Contract.Requires(outParams != null);
+      Contract.Requires(overriddenInParams == null || overriddenInParams.Count == inParams.Count);
+      Contract.Requires(overriddenOutParams == null || overriddenOutParams.Count == outParams.Count);
+      Contract.Requires(tok != null);
+      Contract.Requires(ownerName != null);
+      Contract.Requires(abstractWriter != null || concreteWriter != null);
+
+      var customReceiver = createBody && !forBodyInheritance && member != null && NeedsCustomReceiver(member);
+      ConcreteSyntaxTree wr;
+      if (createBody || abstractWriter == null) {
+        wr = concreteWriter;
+        string receiver = isStatic || customReceiver ? FormatCompanionTypeName(ownerName) : ownerName;
+        if (member != null && ownerContext is DatatypeDecl) {
+          wr.Write("func ({0} {1}) ", isStatic || customReceiver ? "_static" : "_this", receiver);
+        } else {
+          wr.Write("func ({0} *{1}) ", isStatic || customReceiver ? "_static" : "_this", receiver);
+        }
+      } else {
+        wr = abstractWriter;
+      }
+      wr.Write("{0}(", name);
+      var prefix = "";
+      var nTypes = WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, lookasideBody), wr, ref prefix, tp => $"{FormatRTDName(tp.GetCompileName(Options))} {DafnyTypeDescriptor}");
+      if (customReceiver) {
+        wr.Write("{0}_this {1}", nTypes != 0 ? ", " : "", TypeName(UserDefinedType.FromTopLevelDecl(tok, member.EnclosingClass), wr, tok));
+      }
+      var _ = WriteFormals(nTypes != 0 || customReceiver ? ", " : "", overriddenInParams ?? inParams, wr, inParams);
+      wr.Write(")");
+
+      // TODO: Maybe consider using named result parameters, since they're actually close to how Dafny method outs work
+      if (overriddenOutParams != null) {
+        WriteOutTypes(overriddenOutParams, overriddenResultType, wr, tok);
+      } else {
+        WriteOutTypes(outParams, resultType, wr, tok);
+      }
+
+      if (createBody) {
+        var w = wr.NewBlock("");
+        // Go doesn't have type parameters. Instead, the empty interface type is used as the type of what would have been type parameters.
+        // If this is a routine inherited from a trait, then the Dafny signature of the method may have replaced the trait's type parameters.
+        // Go has no direct support for this idiom. Instead, we re-declare the in-parameters with the actual type, let the re-declarations
+        // shadow the given (generic) in-parameters, and then do a cast on entry to the body.
+        // If the routine only contains a call to an inherited body, then we omit the conversions here.
+        if (forBodyInheritance) {
+          // don't do any conversions
+        } else if (thisContext != null) {
+          w = w.NewBlock("", open: BlockStyle.Brace);
+          for (var i = 0; i < inParams.Count; i++) {
+            var p = (overriddenInParams ?? inParams)[i];
+            var instantiatedType = p.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
+            if (!p.IsGhost && !instantiatedType.Equals(p.Type)) {
+              // var p instantiatedType = p.(instantiatedType)
+              var pName = IdName(inParams[i]);
+              DeclareLocalVar(pName, instantiatedType, p.Origin, true, null, w);
+              var wRhs = EmitAssignmentRhs(w);
+              wRhs = EmitCoercionIfNecessary(p.Type, instantiatedType, p.Origin, wRhs);
+              wRhs.Write(pName);
+              EmitDummyVariableUse(pName, w);
+            }
+          }
+        } else {
+          Contract.Assert(overriddenInParams == null);
+        }
+        if (outParams.Any() && !forBodyInheritance) {
+          var beforeReturn = w.Fork(0);
+          EmitReturnWithCoercions(outParams, overriddenOutParams, thisContext?.ParentFormalTypeParametersToActuals, w);
+          return beforeReturn;
+        }
+        return w;
+      } else {
+        wr.WriteLine();
+        return null;
+      }
+    }
+
+    protected void WriteOutTypes(List<Formal> outParams, Type/*?*/ resultType, ConcreteSyntaxTree wr, IOrigin tok) {
+      var outTypes = new List<Type>();
+      if (resultType != null) {
+        outTypes.Add(resultType);
+      }
+
+      foreach (Formal f in outParams) {
+        if (!f.IsGhost) {
+          outTypes.Add(f.Type);
+        }
+      }
+      if (outTypes.Count > 0) {
+        wr.Write(' ');
+        if (outTypes.Count > 1) {
+          wr.Write('(');
+        }
+        wr.Write(Util.Comma(outTypes, ty => TypeName(ty, wr, tok)));
+        if (outTypes.Count > 1) {
+          wr.Write(')');
+        }
+      }
+    }
+
+    int WriteRuntimeTypeDescriptorsFields(List<TypeParameter> typeParams, bool useAllTypeArgs, ConcreteSyntaxTree/*?*/ wr, ConcreteSyntaxTree/*?*/ wInit, ConcreteSyntaxTree/*?*/ wParams) {
+      Contract.Requires(typeParams != null);
+
+      var count = 0;
+      var sep = "";
+      foreach (var tp in typeParams) {
+        if (useAllTypeArgs || NeedsTypeDescriptor(tp)) {
+          var name = FormatRTDName(tp.GetCompileName(Options));
+          wr?.WriteLine($"{name} {DafnyTypeDescriptor}");
+          wInit?.WriteLine("_this.{0} = {0}", name);
+          wParams?.Write($"{sep}{name} {DafnyTypeDescriptor}");
+          sep = ", ";
+          count++;
+        }
+      }
+      return count;
+    }
+
+    int WriteRuntimeTypeDescriptorsFormals(List<TypeParameter> typeParams, bool useAllTypeArgs,
+      out ConcreteSyntaxTree wrFormals, out ConcreteSyntaxTree wrActuals) {
+      Contract.Requires(typeParams != null);
+
+      wrFormals = new ConcreteSyntaxTree();
+      wrActuals = new ConcreteSyntaxTree();
+      var count = 0;
+      var prefix = "";
+      foreach (var tp in typeParams) {
+        if (useAllTypeArgs || NeedsTypeDescriptor(tp)) {
+          var parameterName = FormatRTDName(tp.GetCompileName(Options));
+          wrFormals.Write($"{prefix}{parameterName} {DafnyTypeDescriptor}");
+          wrActuals.Write($"{prefix}{parameterName}");
+          prefix = ", ";
+          count++;
+        }
+      }
+      return count;
+    }
+
+    void WriteRuntimeTypeDescriptorsLocals(List<TypeParameter> typeParams, ConcreteSyntaxTree wr) {
+      Contract.Requires(typeParams != null);
+      Contract.Requires(wr != null);
+
+      foreach (var tp in typeParams) {
+        wr.WriteLine("{0} := _this.{0}", FormatRTDName(tp.GetCompileName(Options)));
+        EmitDummyVariableUse(FormatRTDName(tp.GetCompileName(Options)), wr);
+      }
+    }
+
+    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
+      if (cl is DatatypeDecl) {
+        needsTypeParameter = false;
+        needsTypeDescriptor = true;
+      } else if (cl is TraitDecl) {
+        needsTypeParameter = false;
+        needsTypeDescriptor = isStatic || lookasideBody;
+      } else {
+        Contract.Assert(cl is ClassDecl);
+        needsTypeParameter = false;
+        needsTypeDescriptor = isStatic;
+      }
+    }
+
+    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      var xType = DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(Options, type);
+      if (xType is BoolType) {
+        return "_dafny.BoolType";
+      } else if (xType is CharType) {
+        return CharTypeDescriptorName;
+      } else if (xType is IntType) {
+        return "_dafny.IntType";
+      } else if (xType is BigOrdinalType) {
+        return "_dafny.IntType";
+      } else if (xType is RealType) {
+        return "_dafny.RealType";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        if (t.NativeType != null) {
+          return string.Format("_dafny.{0}Type", Capitalize(GetNativeTypeName(t.NativeType)));
+        } else {
+          return "_dafny.IntType";
+        }
+      } else if (xType is SetType) {
+        return "_dafny.SetType";
+      } else if (xType is MultiSetType) {
+        return "_dafny.MultiSetType";
+      } else if (xType is SeqType) {
+        return "_dafny.SeqType";
+      } else if (xType is MapType) {
+        return "_dafny.MapType";
+      } else if (xType.IsRefType) {
+        return string.Format("_dafny.CreateStandardTypeDescriptor({0})", TypeInitializationValue(xType, wr, tok, false, true));
+      } else if (xType.IsArrayType) {
+        return "_dafny.ArrayType";
+      } else if (xType.IsTypeParameter) {
+        var tp = type.AsTypeParameter;
+        Contract.Assert(tp != null);
+        string th;
+        if (thisContext != null && tp.Parent is TopLevelDeclWithMembers and not TraitDecl) {
+          th = "_this.";
+        } else {
+          th = "";
+        }
+        return string.Format("{0}{1}", th, FormatRTDName(tp.GetCompileName(Options)));
+      } else if (xType.IsBuiltinArrowType) {
+        return string.Format("_dafny.CreateStandardTypeDescriptor({0})", TypeInitializationValue(xType, wr, tok, false, true));
+      } else if (xType is UserDefinedType udt) {
+        var cl = udt.ResolvedClass;
+        Contract.Assert(cl != null);
+
+        var w = new ConcreteSyntaxTree();
+        w.Write("{0}(", cl is TupleTypeDecl ? "_dafny.TupleType" : TypeName_RTD(xType, w, tok));
+        var typeArgs = cl is DatatypeDecl dt ? UsedTypeParameters(dt, udt.TypeArgs, true) : TypeArgumentInstantiation.ListFromClass(cl, udt.TypeArgs);
+        EmitTypeDescriptorsActuals(typeArgs, udt.Origin, w, true);
+        w.Write(")");
+        return w.ToString();
+
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateGetter(string name, Type resultType, IOrigin tok, bool isStatic, bool createBody,
+      MemberDecl/*?*/ member, TopLevelDecl ownerContext, string ownerName,
+      ConcreteSyntaxTree abstractWriter, ConcreteSyntaxTree concreteWriter, bool forBodyInheritance) {
+      return CreateFunction(name, new List<TypeArgumentInstantiation>(), new List<Formal>(), resultType,
+        tok, isStatic, createBody, member, ownerContext, ownerName, abstractWriter, concreteWriter, forBodyInheritance, false);
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody,
+      MemberDecl/*?*/ member, TopLevelDecl ownerContext, string ownerName,
+      out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree abstractWriter, ConcreteSyntaxTree concreteWriter, bool forBodyInheritance) {
+
+      var getterWriter = CreateGetter(name, resultType, tok, false, createBody, member, ownerContext, ownerName, abstractWriter, concreteWriter, forBodyInheritance);
+
+      var valueParam = new Formal(tok, "value", resultType, true, false, null);
+      setterWriter = CreateSubroutine(name + "_set_", new List<TypeArgumentInstantiation>(), new List<Formal>() { valueParam }, new List<Formal>(), null,
+        new List<Formal>() { valueParam }, new List<Formal>(), null,
+        tok, false, createBody, ownerContext, ownerName, member,
+        abstractWriter, concreteWriter, forBodyInheritance, false);
+      return getterWriter;
+    }
+
+    protected override bool SupportsStaticsInGenericClasses => false;
+    protected override bool TraitRepeatsInheritedDeclarations => true;
+
+    private void FinishClass(GoCodeGenerator.ClassWriter cw) {
+      // Go gets weird about zero-length structs.  In particular, it likes to
+      // make all pointers to a zero-length struct the same.  Irritatingly, this
+      // forces us to waste space here.
+      if (cw.IsClass && !cw.AnyInstanceFields) {
+        cw.InstanceFieldWriter.WriteLine("dummy byte");
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitNullTest(bool testIsNull, ConcreteSyntaxTree wr) {
+      if (!testIsNull) {
+        wr.Write("!");
+      }
+      wr.Write("_dafny.IsDafnyNull");
+      return wr.ForkInParens();
+    }
+
+    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
+      wr.WriteLine("goto TAIL_CALL_START");
+      wr.WriteLine("TAIL_CALL_START:");
+      return wr;
+    }
+
+    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
+      wr.WriteLine("goto TAIL_CALL_START");
+    }
+
+    private const string AnyType = "interface{}"; // In Go 1.18, this type can be written as "any"
+
+    private string CharTypeName => $"_dafny.{CharTypeNameProper}";
+    private string CharTypeDescriptorName => $"_dafny.{CharTypeNameProper}Type";
+    private string CharTypeNameProper => UnicodeCharEnabled ? "CodePoint" : "Char";
+
+    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member = null) {
+      Contract.Ensures(Contract.Result<string>() != null);
+      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
+
+      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
+      if (xType is BoolType) {
+        return "bool";
+      } else if (xType is CharType) {
+        return CharTypeName;
+      } else if (xType is IntType) {
+        return $"{HelperModulePrefix}Int";
+      } else if (xType is BigOrdinalType) {
+        return "_dafny.Ord";
+      } else if (xType is RealType) {
+        return "_dafny.Real";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        return t.NativeType != null ? GetNativeTypeName(t.NativeType) : "_dafny.BV";
+      } else if (xType.AsNewtype != null && member == null) {  // when member is given, use UserDefinedType case below
+        var newtypeDecl = xType.AsNewtype;
+        if (newtypeDecl.NativeType is { } nativeType) {
+          return GetNativeTypeName(nativeType);
+        }
+        return TypeName(newtypeDecl.ConcreteBaseType(xType.TypeArgs), wr, tok);
+      } else if (xType.IsObjectQ) {
+        return AnyType;
+      } else if (xType.IsArrayType) {
+        return "_dafny.Array";
+      } else if (xType is UserDefinedType udt) {
+        var s = FullTypeName(udt, member);
+        var cl = udt.ResolvedClass;
+        if (xType is ArrowType at) {
+          return string.Format("func ({0}) {1}", Util.Comma(at.Args, arg => TypeName(arg, wr, tok)), TypeName(at.Result, wr, tok));
+        } else if (udt.IsTypeParameter) {
+          return AnyType;
+        } else if (cl is TupleTypeDecl tupleTypeDecl) {
+          return HelperModulePrefix + "Tuple";
+        }
+        if (udt.IsTraitType && udt.ResolvedClass.IsExtern(Options, out _, out _)) {
+          // To use an external interface, we need to have values of the
+          // interface type, so we treat an extern trait as a plain interface
+          // value, not a pointer (a Go interface value is basically a typed
+          // pointer anyway).
+          //
+          // Also don't use IdProtect so that we can have it be a built-in
+          // name like error.
+          return s;
+        } else if (udt.IsDatatype || udt.IsTraitType) {
+          // Don't return a pointer to the datatype because the datatype is
+          // already represented using a pointer
+          return IdProtect(s);
+        } else {
+          return "*" + IdProtect(s);
+        }
+      } else if (xType is SetType) {
+        return HelperModulePrefix + "Set";
+      } else if (xType is SeqType) {
+        return HelperModulePrefix + "Sequence";
+      } else if (xType is MultiSetType) {
+        return HelperModulePrefix + "MultiSet";
+      } else if (xType is MapType) {
+        return "_dafny.Map";
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
+      // When returning nil, explicitly cast the nil so that type assertions work
+      string nil() {
+        return string.Format("({0})(nil)", TypeName(type, wr, tok));
+      }
+
+      var xType = type.NormalizeExpandKeepConstraints();
+      if (xType is BoolType) {
+        return "false";
+      } else if (xType is CharType) {
+        return $"{CharTypeName}({CharType.DefaultValueAsString})";
+      } else if (xType is IntType or BigOrdinalType) {
+        return "_dafny.Zero";
+      } else if (xType is RealType) {
+        return "_dafny.ZeroReal";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        return t.NativeType != null ? "0" : "_dafny.Zero";
+      } else if (xType is SetType) {
+        return "_dafny.EmptySet";
+      } else if (xType is MultiSetType) {
+        return "_dafny.EmptyMultiSet";
+      } else if (xType is SeqType seq) {
+        if (seq.Arg.IsCharType && !UnicodeCharEnabled) {
+          return "_dafny.EmptySeq.SetString()";
+        }
+        return "_dafny.EmptySeq";
+      } else if (xType is MapType) {
+        return "_dafny.EmptyMap";
+      }
+
+      var udt = (UserDefinedType)xType;
+      var cl = udt.ResolvedClass;
+      Contract.Assert(cl != null);
+      if (cl is TypeParameter tp) {
+        if (usePlaceboValue && !tp.Characteristics.HasCompiledValue) {
+          return nil();
+        } else if (constructTypeParameterDefaultsFromTypeDescriptors) {
+          var w = new ConcreteSyntaxTree();
+          w = EmitCoercionIfNecessary(from: null, to: xType, tok: tok, wr: w);
+          w.Write(TypeDescriptor(udt, wr, udt.Origin));
+          w.Write(".Default()");
+          return w.ToString();
+        } else {
+          return FormatDefaultTypeParameterValue(tp);
+        }
+      } else if (cl is AbstractTypeDecl opaque) {
+        return FormatDefaultTypeParameterValue(opaque);
+      } else if (cl is NewtypeDecl) {
+        var td = (NewtypeDecl)cl;
+        if (td.Witness != null) {
+          return TypeName_Companion(cl, wr, tok) + ".Witness()";
+        } else if (td.NativeType != null) {
+          return GetNativeTypeName(td.NativeType) + "(0)";
+        } else {
+          return TypeInitializationValue(td.ConcreteBaseType(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+      } else if (cl is SubsetTypeDecl) {
+        var td = (SubsetTypeDecl)cl;
+        if (td.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+          return TypeName_Companion(cl, wr, tok) + ".Witness()";
+        } else if (td.WitnessKind == SubsetTypeDecl.WKind.Special) {
+          // WKind.Special is only used with -->, ->, and non-null types:
+          Contract.Assert(ArrowType.IsPartialArrowTypeName(td.Name) || ArrowType.IsTotalArrowTypeName(td.Name) || td is NonNullTypeDecl);
+          if (ArrowType.IsPartialArrowTypeName(td.Name)) {
+            return nil();
+          } else if (ArrowType.IsTotalArrowTypeName(td.Name)) {
+            var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+            // return the lambda expression ((Ty0 x0, Ty1 x1, Ty2 x2) => rangeDefaultValue)
+            return string.Format("func ({0}) {1} {{ return {2}; }}", Util.Comma(udt.TypeArgs.GetRange(0, udt.TypeArgs.Count - 1), tp => TypeName(tp, wr, tok)), TypeName(udt.TypeArgs.Last(), wr, tok), rangeDefaultValue);
+          } else if (((NonNullTypeDecl)td).Class is ArrayClassDecl arrayClass) {
+            // non-null array type; we know how to initialize them
+            return string.Format("_dafny.NewArrayWithValue(nil, {0})", Util.Comma(arrayClass.Dims, d => string.Format("_dafny.IntOf(0)")));
+          } else {
+            return nil();
+          }
+        } else {
+          return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+      } else if (cl is ClassLikeDecl or ArrowTypeDecl) {
+        return nil();
+      } else if (cl is DatatypeDecl) {
+        var dt = (DatatypeDecl)cl;
+        if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
+          var typeSubstMap = TypeParameter.SubstitutionMap(dt.TypeArgs, udt.TypeArgs);
+          return TypeInitializationValue(innerType.Subst(typeSubstMap), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+        // In an auto-init context (like a field initializer), we may not have
+        // access to all the type descriptors, so we can't construct the
+        // default value, but then an empty structure is an acceptable default, since
+        // Dafny proves the value won't be accessed.
+        if (usePlaceboValue) {
+          return string.Format("{0}{{}}", TypeName(udt, wr, tok));
+        }
+        var n = dt is TupleTypeDecl ? "_dafny.TupleOf" : $"{TypeName_Companion(dt, wr, tok)}.Default";
+        var wTypeDescriptorArguments = new ConcreteSyntaxTree();
+        var sep = "";
+        WriteTypeDescriptors(dt, udt.TypeArgs, wTypeDescriptorArguments, ref sep);
+        var relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs);
+        if (relevantTypeArgs.Count == 0) {
+          sep = "";
+        }
+        var arguments = relevantTypeArgs.Comma(ta => DefaultValue(ta.Actual, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors));
+        return $"{n}({wTypeDescriptorArguments}{sep}{arguments})";
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
+      ConcreteSyntaxTree wr, IOrigin tok, bool omitTypeArguments) {
+      Contract.Assume(fullCompileName != null);  // precondition; this ought to be declared as a Requires in the superclass
+      Contract.Assume(typeArgs != null);  // precondition; this ought to be declared as a Requires in the superclass
+      string s = "*" + IdProtect(fullCompileName);
+      return s;
+    }
+
+    protected static string FormatCompanionName(string clsName) =>
+      string.Format("Companion_{0}_", clsName);
+    protected static string FormatCompanionTypeName(string clsName) =>
+      // Need to export this because it could be for a trait that could be
+      // derived from in another module
+      string.Format("CompanionStruct_{0}_", clsName);
+    protected static string FormatDatatypeConstructorName(string ctorName) =>
+      string.Format("Create_{0}_", ctorName);
+    protected static string FormatDatatypeConstructorCheckName(string ctorName) =>
+      string.Format("Is_{0}", ctorName);
+    protected static string FormatDatatypeDestructorName(string dtorName) =>
+      string.Format("Dtor_{0}", dtorName);
+    protected static string FormatDatatypeInterfaceName(string typeName) =>
+      string.Format("Data_{0}_", typeName);
+    protected static string FormatDefaultName(string typeName) =>
+      string.Format("Default_{0}_", typeName);
+    protected static string FormatInitializerName(string clsName) =>
+      string.Format("New_{0}_", clsName);
+    protected static string FormatLazyConstructorName(string datatypeName) =>
+      string.Format("Lazy_{0}_", datatypeName);
+    protected static string FormatLazyInterfaceName(string traitName) =>
+      string.Format("Iface_{0}_", traitName);
+    protected static string FormatRTDName(string formalName) =>
+      string.Format("Type_{0}_", formalName);
+
+    protected string TypeName_Related(Func<string, string> formatter, Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member = null) {
+      Contract.Requires(formatter != null);
+      Contract.Requires(type != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      // FIXME This is a hacky bit of string munging.
+
+      string name = ClassName(type, wr, tok, member);
+      string prefix, baseName;
+      var periodIx = name.LastIndexOf('.');
+      if (periodIx >= 0) {
+        prefix = name.Substring(0, periodIx + 1);
+        baseName = name.Substring(periodIx + 1);
+      } else {
+        prefix = "";
+        baseName = name;
+      }
+
+      return prefix + formatter(baseName);
+    }
+
+    protected string TypeName_Constructor(DatatypeCtor ctor, ConcreteSyntaxTree wr) {
+      var ptr = ctor.EnclosingDatatype is CoDatatypeDecl ? "*" : "";
+      return string.Format("{0}{1}_{2}", ptr, TypeName(UserDefinedType.FromTopLevelDecl(ctor.Origin, ctor.EnclosingDatatype), wr, ctor.Origin), ctor.GetCompileName(Options));
+    }
+
+    internal override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member) {
+      type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
+      // XXX This duplicates some of the logic in UserDefinedTypeName, but if we
+      // don't do it here, we end up passing the name of the module to
+      // FormatCompanionName, which doesn't help anyone
+      if (type is UserDefinedType { ResolvedClass: not null } udt && IsExternMemberOfExternModule(member, udt.ResolvedClass)) {
+        // omit the default class name ("_default") in extern modules, when the class is used to qualify an extern member
+        Contract.Assert(!udt.ResolvedClass.EnclosingModuleDefinition.IsDefaultModule);  // default module is not marked ":extern"
+        return IdProtect(ModuleImports[udt.ResolvedClass.EnclosingModuleDefinition].Name);
+      }
+      return TypeName_Related(FormatCompanionName, type, wr, tok, member);
+    }
+
+    protected string TypeName_CompanionType(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      return TypeName_Related(FormatCompanionTypeName, type, wr, tok);
+    }
+
+    protected string TypeName_Initializer(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      return TypeName_Related(FormatInitializerName, type, wr, tok);
+    }
+
+    protected string TypeName_RTD(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      return TypeName_Related(FormatRTDName, type, wr, tok);
+    }
+
+    protected string ClassName(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member = null) {
+      return type is UserDefinedType udt ? FullTypeName(udt, member) : TypeName(type, wr, tok, member);
+    }
+
+    protected string UnqualifiedClassName(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      return type is UserDefinedType udt ? UnqualifiedTypeName(udt) : TypeName(type, wr, tok);
+    }
+
+    protected string DatatypeFieldName(Formal formal, int formalNonGhostIndex) {
+      // Don't rely on base.FormalName because it needlessly (for us) passes the
+      // value through IdProtect when we're going to capitalize it
+      return formal.HasName ? Capitalize(formal.CompileName) : "A" + formalNonGhostIndex + "_";
+    }
+
+    protected string DatatypeFieldName(Formal formal) {
+      Contract.Assert(formal.HasName);
+      return Capitalize(formal.CompileName);
+    }
+
+    // ----- Declarations -------------------------------------------------------------
+
+    protected void DeclareField(string name, bool isExtern, bool isStatic, bool isConst, Type type, IOrigin tok, string/*?*/ rhs, string className, ConcreteSyntaxTree wr, ConcreteSyntaxTree initWriter, ConcreteSyntaxTree concreteMethodWriter) {
+      if (isExtern) {
+        Error(GeneratorErrors.ErrorId.c_Go_unsupported_field, tok, "Unsupported field {0} in extern trait", wr, name);
+      }
+
+      if (isConst && rhs != null) {
+        var receiver = isStatic ? FormatCompanionTypeName(className) : className;
+        var wBody = concreteMethodWriter.NewNamedBlock("func (_this *{0}) {1}() {2}", receiver, name, TypeName(type, concreteMethodWriter, tok));
+        wBody.WriteLine("return {0}", rhs);
+      } else {
+        wr.WriteLine("{0} {1}", name, TypeName(type, initWriter, tok));
+
+        if (isStatic) {
+          initWriter.WriteLine("{0}: {1},", name, rhs ?? PlaceboValue(type, initWriter, tok));
+        } else if (rhs != null) {
+          initWriter.WriteLine("_this.{0} = {1}", name, rhs);
+        }
+      }
+    }
+
+    protected override bool DeclareFormal(string prefix, string name, Type type, IOrigin tok, bool isInParam, ConcreteSyntaxTree wr) {
+      if (isInParam) {
+        wr.Write("{0}{1} {2}", prefix, name, TypeName(type, wr, tok));
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+    private ConcreteSyntaxTree/*?*/ DeclareLocalVar(string name, Type/*?*/ type, IOrigin/*?*/ tok, bool includeRhs, bool leaveRoomForRhs, ConcreteSyntaxTree wr) {
+      wr.Write("var {0}", name);
+
+      if (type != null) {
+        // Always specify the type in case the rhs is nil
+        wr.Write(" {0}", TypeName(type, wr, tok));
+      }
+
+      ConcreteSyntaxTree w;
+      if (includeRhs) {
+        if (!leaveRoomForRhs) {
+          wr.Write(" = ");
+        }
+        w = wr.Fork();
+      } else {
+        w = null;
+      }
+
+      if (!leaveRoomForRhs) {
+        wr.WriteLine();
+        EmitDummyVariableUse(name, wr);
+      }
+
+      return w;
+    }
+
+    protected override void EmitDummyVariableUse(string variableName, ConcreteSyntaxTree wr) {
+      Contract.Requires(variableName != null);
+      Contract.Requires(wr != null);
+
+      wr.WriteLine("_ = {0}", variableName);
+    }
+
+    protected override void DeclareLocalVar(string name, Type type, IOrigin tok, bool leaveRoomForRhs, string rhs, ConcreteSyntaxTree wr) {
+      var w = DeclareLocalVar(name, type, tok, includeRhs: (rhs != null || leaveRoomForRhs), leaveRoomForRhs: leaveRoomForRhs, wr: wr);
+      if (rhs != null) {
+        w.Write(rhs);
+      }
+    }
+
+    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type/*?*/ type, IOrigin/*?*/ tok, ConcreteSyntaxTree wr) {
+      return DeclareLocalVar(name, type, tok, includeRhs: true, leaveRoomForRhs: false, wr: wr);
+    }
+
+    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
+
+    protected override bool NeedsCastFromTypeParameter => true;
+    protected override bool SupportsMultipleReturns => true;
+    protected override string StmtTerminator => "";
+
+    protected override void DeclareLocalOutVar(string name, Type type, IOrigin tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr) {
+      DeclareLocalVar(name, type, tok, false, rhs, wr);
+    }
+
+    protected override void EmitActualTypeArgs(List<Type> typeArgs, IOrigin tok, ConcreteSyntaxTree wr) {
+      // emit nothing; this is only for actual parametric polymorphism, not RTDs
+    }
+
+    // ----- Statements -------------------------------------------------------------
+
+    protected override void EmitMultiAssignment(List<Expression> lhsExprs, List<ILvalue> wLhss, List<Type> lhsTypes, out List<ConcreteSyntaxTree> wRhss, List<Type> rhsTypes, ConcreteSyntaxTree wr) {
+      // TODO Go actually supports multi-assignment, but that will only work
+      // in the simple (but very typical) case where an lvalue represents an
+      // actual lvalue that is written via an assignment statement.  (Actually,
+      // currently *all* Go lvalues work this way, but in the future we could
+      // implement getters and setters via ILvalueWriter.)
+      //
+      // Given a way to inquire whether a given lvalue is an actual lvalue in
+      // the target, we could implement multi-assignment for the special case
+      // where all lvalues are real lvalues.
+      base.EmitMultiAssignment(lhsExprs, wLhss, lhsTypes, out wRhss, rhsTypes, wr);
+    }
+
+    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
+      var isString = DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, arg.Type).IsStringType;
+      var wStmts = wr.Fork();
+      if (isString && UnicodeCharEnabled) {
+        wr.Write("_dafny.Print(");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.WriteLine(".VerbatimString(false))");
+      } else if (!isString ||
+                 (arg.Resolved is MemberSelectExpr mse &&
+                  mse.Member.IsExtern(Options, out _, out _))) {
+        wr.Write("_dafny.Print(");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.WriteLine(")");
+      } else {
+        wr.Write("_dafny.Print((");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.Write(")");
+        if (!UnicodeCharEnabled) {
+          wr.Write(".SetString()");
+        }
+        wr.WriteLine(")");
+      }
+    }
+
+    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
+      EmitReturnWithCoercions(outParams, null, null, wr);
+    }
+
+    protected void EmitReturnWithCoercions(List<Formal> outParams, List<Formal>/*?*/ overriddenOutParams, Dictionary<TypeParameter, Type>/*?*/ typeMap, ConcreteSyntaxTree wr) {
+      wr.Write("return");
+      var sep = " ";
+      for (var i = 0; i < outParams.Count; i++) {
+        var f = outParams[i];
+        if (!f.IsGhost) {
+          wr.Write(sep);
+          ConcreteSyntaxTree wOutParam;
+          if (overriddenOutParams == null && typeMap != null) {
+            wOutParam = EmitCoercionIfNecessary(f.Type.Subst(typeMap), f.Type, f.Origin, wr);
+          } else if (overriddenOutParams != null) {
+            // ignore typeMap
+            wOutParam = EmitCoercionIfNecessary(f.Type, overriddenOutParams[i].Type, f.Origin, wr);
+          } else {
+            wOutParam = wr;
+          }
+          wOutParam.Write(IdName(f));
+          sep = ", ";
+        }
+      }
+      wr.WriteLine();
+    }
+
+    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
+      var wBody = wr.NewBlock(open: BlockStyle.Brace);
+      var w = wBody.Fork();
+      var prefix = createContinueLabel ? "C" : "L";
+      wBody.WriteLine($"goto {prefix}{label};");
+      wr.Fork(-1).WriteLine($"{prefix}{label}:");
+      return w;
+    }
+
+    protected override void EmitBreak(string/*?*/ label, ConcreteSyntaxTree wr) {
+      if (label == null) {
+        wr.WriteLine("break");
+      } else {
+        wr.WriteLine("goto L{0}", label);
+      }
+    }
+
+    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
+      wr.WriteLine("goto C{0};", label);
+    }
+
+    protected override void EmitYield(ConcreteSyntaxTree wr) {
+      wr.WriteLine("_yielded <- struct{}{}");
+      wr.WriteLine("_, _ok = <- _cont");
+      wr.WriteLine("if !_ok { return }");
+    }
+
+    protected override void EmitAbsurd(string/*?*/ message, ConcreteSyntaxTree wr) {
+      if (message == null) {
+        message = "unexpected control point";
+      }
+      wr.WriteLine("panic(\"{0}\")", message);
+    }
+
+    protected override void EmitHalt(IOrigin tok, Expression messageExpr, ConcreteSyntaxTree wr) {
+      var wStmts = wr.Fork();
+      wr.Write("panic(");
+      if (tok != null) {
+        wr.Write("\"" + tok.TokenToString(Options) + ": \" + ");
+      }
+
+      TrParenExpr(messageExpr, wr, false, wStmts);
+      if (UnicodeCharEnabled && messageExpr.Type.IsStringType) {
+        wr.Write(".VerbatimString(false))");
+      } else {
+        wr.WriteLine(".String())");
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateWhileLoop(out ConcreteSyntaxTree guardWriter, ConcreteSyntaxTree wr) {
+      wr.Write("for ");
+      guardWriter = wr.Fork();
+      var wBody = wr.NewBlock("");
+      return wBody;
+    }
+
+    protected override ConcreteSyntaxTree EmitForStmt(IOrigin tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
+      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
+
+      wr.Write($"for {loopIndex.GetOrCreateCompileName(currentIdGenerator)} := ");
+      var startWr = wr.Fork();
+      wr.Write($"; ");
+
+      ConcreteSyntaxTree bodyWr;
+      if (goingUp) {
+        if (endVarName == null) {
+          wr.Write("true");
+        } else if (IsOrderedByCmp(loopIndex.Type)) {
+          wr.Write($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)}.Cmp({endVarName}) < 0");
+        } else {
+          wr.Write($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)} < {endVarName}");
+        }
+        if (AsNativeType(loopIndex.Type) == null) {
+          bodyWr = wr.NewBlock($"; {loopIndex.GetOrCreateCompileName(currentIdGenerator)} = {loopIndex.GetOrCreateCompileName(currentIdGenerator)}.Plus(_dafny.One)");
+        } else {
+          bodyWr = wr.NewBlock($"; {loopIndex.GetOrCreateCompileName(currentIdGenerator)}++");
+        }
+      } else {
+        if (endVarName == null) {
+          wr.Write("true");
+        } else if (IsOrderedByCmp(loopIndex.Type)) {
+          wr.Write($"{endVarName}.Cmp({loopIndex.GetOrCreateCompileName(currentIdGenerator)}) < 0");
+        } else {
+          wr.Write($"{endVarName} < {loopIndex.GetOrCreateCompileName(currentIdGenerator)}");
+        }
+        bodyWr = wr.NewBlock($"; ");
+        if (AsNativeType(loopIndex.Type) == null) {
+          bodyWr.WriteLine($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)} = {loopIndex.GetOrCreateCompileName(currentIdGenerator)}.Minus(_dafny.One)");
+        } else {
+          bodyWr.WriteLine($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)}--");
+        }
+      }
+      bodyWr = EmitContinueLabel(labels, bodyWr);
+      TrStmtList(body, bodyWr);
+
+      return startWr;
+    }
+
+    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, Action<ConcreteSyntaxTree> boundAction, ConcreteSyntaxTree wr, string start = null) {
+      start = start ?? "0";
+      var boundWriter = new ConcreteSyntaxTree();
+      boundAction(boundWriter);
+      var bound = boundWriter.ToString();
+      return wr.NewNamedBlock("for {0} := {2}; {0} < {1}; {0}++", indexVar, bound, start);
+    }
+
+    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
+      return wr.NewNamedBlock("for {0} := {1}IntOf({2}); ; {0} = {0}.Times(_dafny.Two)", indexVar, HelperModulePrefix, start);
+    }
+
+    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine("{0} = {0}.Plus(_dafny.One)", varName);
+    }
+
+    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine("{0} = {0}.Minus(_dafny.One)", varName);
+    }
+
+    protected override string GetQuantifierName(string bvType) {
+      return "_dafny.Quantifier";
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IOrigin tok,
+      out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+
+      var okVar = idGenerator.FreshId("_ok");
+      var iterVar = idGenerator.FreshId("_iter");
+      wr.Write("for {0} := _dafny.Iterate(", iterVar);
+      collectionWriter = wr.Fork();
+      var wBody = wr.NewBlock(");;");
+      wBody.WriteLine("{0}, {1} := {2}()", tmpVarName, okVar, iterVar);
+      wBody.WriteLine("if !{0} {{ break }}", okVar);
+      return wBody;
+    }
+
+    [CanBeNull]
+    protected override Action<ConcreteSyntaxTree> GetSubtypeCondition(string tmpVarName, Type boundVarType, IOrigin tok, ConcreteSyntaxTree wPreconditions) {
+      var conditions = new List<string> { };
+      if (boundVarType.IsNonNullRefType) {
+        conditions.Add($"!_dafny.IsDafnyNull({tmpVarName})");
+      }
+
+      if (boundVarType.IsRefType) {
+        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
+          // Nothing more to test
+        } else if (boundVarType.IsTraitType) {
+          var trait = boundVarType.AsTraitType;
+          conditions.Add(
+            $"{HelperModulePrefix}InstanceOfTrait/*1*/({tmpVarName}.(_dafny.TraitOffspring), {TypeName_Companion(trait, wPreconditions, tok)}.TraitID_)");
+        } else {
+          var typeAssertSucceeds = idGenerator.FreshId("_typeAssertSucceeds");
+          wPreconditions.WriteLine(
+            $@"{typeAssertSucceeds} := func(param interface{{}}) bool {{ var ok bool; _, ok = param.({TypeName(boundVarType, wPreconditions, tok)}); return ok}}");
+          conditions.Add($"{typeAssertSucceeds}({tmpVarName})");
+        }
+      }
+
+      if (!conditions.Any()) {
+        conditions.Add("true");
+      }
+
+      var typeTest = string.Join("&&", conditions);
+      if (boundVarType.IsRefType && !boundVarType.IsNonNullRefType && typeTest != "true") {
+        typeTest = $"_dafny.IsDafnyNull({tmpVarName}) || " + typeTest;
+      }
+
+      typeTest = typeTest == "true" ? null : typeTest;
+      return typeTest == null ? null : wr => wr.Write(typeTest);
+    }
+
+    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
+      Type sourceType, bool introduceBoundVar, IOrigin tok, ConcreteSyntaxTree wr) {
+
+      if (introduceBoundVar) {
+        wr.WriteLine("var {0} {1}", boundVarName, TypeName(boundVarType, wr, tok));
+      }
+
+      var wrAssign = wr;
+      if (boundVarType.IsRefType && !boundVarType.IsNonNullRefType) {
+        var wIf = EmitIf($"_dafny.IsDafnyNull({tmpVarName})", true, wr);
+        wIf.WriteLine("{0} = ({1})(nil)", boundVarName, TypeName(boundVarType, wr, tok));
+        wrAssign = wr.NewBlock("", open: BlockStyle.Brace);
+      }
+
+      var cast = $".({TypeName(boundVarType, wrAssign, tok)})";
+      tmpVarName = $"interface{{}}({tmpVarName})";
+      wrAssign.WriteLine("{0} = {1}{2}", boundVarName, tmpVarName, cast);
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      var okVar = idGenerator.FreshId("_ok");
+      var iterVar = idGenerator.FreshId("_iter");
+      wr.Write("for {0} := _dafny.Iterate(", iterVar);
+      collectionWriter = wr.Fork();
+      var wBody = wr.NewBlock(");;");
+      wBody.WriteLine("{0}, {1} := {2}()", boundVarName, okVar, iterVar);
+      wBody.WriteLine("if !{0} {{ break }}", okVar);
+      return wBody;
+    }
+
+    // ----- Expressions -------------------------------------------------------------
+
+    protected override void EmitNew(Type type, IOrigin tok, CallStmt initCall /*?*/, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts) {
+      var cl = ((UserDefinedType)type.NormalizeExpand()).ResolvedClass;
+      Contract.Assert(cl != null);
+      if (cl is TraitDecl { IsObjectTrait: true }) {
+        wr.Write("_dafny.New_Object()");
+      } else {
+        var ctor = (Constructor)initCall?.Method; // correctness of cast follows from precondition of "EmitNew"
+        var sep = "";
+        wr.Write("{0}(", TypeName_Initializer(type, wr, tok));
+        EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass(cl, type.TypeArgs), tok, wr);
+        wr.Write(ConstructorArguments(initCall, wStmts, ctor, sep));
+        wr.Write(")");
+      }
+    }
+
+    protected override bool DeterminesArrayTypeFromExampleElement => true;
+
+    protected override void EmitNewArray(Type elementType, IOrigin tok, List<string> dimensions,
+        bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+
+      string sep;
+      if (mustInitialize) {
+        var initValue = DefaultValue(elementType, wr, tok, true);
+        wr.Write("_dafny.NewArrayWithValue({0}", initValue);
+        sep = ", ";
+      } else if (exampleElement != null) {
+        wr.Write("_dafny.NewArrayFromExample({0}, nil", exampleElement);
+        sep = ", ";
+      } else {
+        wr.Write("_dafny.NewArray(");
+        sep = "";
+      }
+
+      foreach (var dim in dimensions) {
+        wr.Write($"{sep}{dim}");
+        sep = ", ";
+      }
+
+      wr.Write(")");
+    }
+
+    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
+      if (e is StaticReceiverExpr) {
+        wr.Write("{0}", TypeName_Companion(((UserDefinedType)e.Type).ResolvedClass, wr, e.Origin));
+      } else if (e.Value == null) {
+        wr.Write("({0})(nil)", TypeName(e.Type, wr, e.Origin));
+      } else if (e.Value is bool) {
+        wr.Write((bool)e.Value ? "true" : "false");
+      } else if (e is CharLiteralExpr chrLit) {
+        TrCharLiteral(chrLit, wr);
+      } else if (e is StringLiteralExpr strLit) {
+        TrStringLiteral(strLit, wr);
+      } else if (AsNativeType(e.Type) is NativeType nt) {
+        wr.Write("{0}({1})", GetNativeTypeName(nt), (BigInteger)e.Value);
+      } else if (e.Value is BigInteger i) {
+        EmitIntegerLiteral(i, wr);
+      } else if (e.Value is BaseTypes.BigDec n) {
+        var zeros = Repeat("0", Math.Abs(n.Exponent));
+        string str;
+        if (n.Exponent >= 0) {
+          str = n.Mantissa + zeros;
+        } else {
+          str = n.Mantissa + "/1" + zeros;
+        }
+        wr.Write("_dafny.RealOfString(\"{0}\")", str);
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
+      }
+    }
+    void EmitIntegerLiteral(BigInteger i, ConcreteSyntaxTree wr) {
+      Contract.Requires(wr != null);
+      if (i.IsZero) {
+        wr.Write($"{HelperModulePrefix}Zero");
+      } else if (i.IsOne) {
+        wr.Write($"{HelperModulePrefix}One");
+      } else if (long.MinValue <= i && i <= long.MaxValue) {
+        wr.Write($"{HelperModulePrefix}IntOfInt64({i})");
+      } else {
+        wr.Write($"{HelperModulePrefix}IntOfString(\"{i}\")");
+      }
+    }
+
+    protected void TrCharLiteral(CharLiteralExpr chr, ConcreteSyntaxTree wr) {
+      var v = (string)chr.Value;
+      wr.Write($"{CharTypeName}(");
+      // See comment in TrStringLiteral for why we can't just translate directly sometimes.
+      if (!UnicodeCharEnabled && Util.MightContainNonAsciiCharacters(v, false)) {
+        var c = Util.UnescapedCharacters(Options, v, false).Single();
+        wr.Write($"{c}");
+      } else {
+        wr.Write("'{0}'", TranslateEscapes(v, isChar: true));
+      }
+      wr.Write(")");
+    }
+
+    protected override void TrStringLiteral(StringLiteralExpr str, ConcreteSyntaxTree wr) {
+      Contract.Requires(str != null);
+      Contract.Requires(wr != null);
+      var s = (string)str.Value;
+      if (UnicodeCharEnabled) {
+        wr.Write($"_dafny.UnicodeSeqOfUtf8Bytes(");
+        EmitStringLiteral(s, str.IsVerbatim, wr);
+        wr.Write(")");
+      } else {
+        // When --unicode-char is false, it may not be possible to translate a Dafny string into a valid Go string,
+        // since Go string literals have to be encodable in UTF-8,
+        // but Dafny allows invalid sequences of surrogate characters.
+        // In addition, _dafny.SeqOfString iterates over the runes in the Go string
+        // rather than the equivalent UTF-16 code units.
+        // That means in many cases we can't create a Dafny string value by emitting
+        // _dafny.SeqOfString("..."), since there's no way to encode the right data in the Go string literal.
+        // Instead, if any non-ascii characters might be present, just emit a sequence of the direct UTF-16 code units instead.
+        if (Util.MightContainNonAsciiCharacters(s, false)) {
+          wr.Write($"_dafny.SeqOfChars(");
+          var comma = "";
+          foreach (var c in Util.UnescapedCharacters(Options, s, str.IsVerbatim)) {
+            wr.Write(comma);
+            wr.Write($"{c}");
+            comma = ", ";
+          }
+
+          wr.Write(")");
+        } else {
+          wr.Write($"{HelperModulePrefix}SeqOfString(");
+          EmitStringLiteral(s, str.IsVerbatim, wr);
+          wr.Write(")");
+        }
+      }
+    }
+
+    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
+      var n = str.Length;
+      if (!isVerbatim) {
+        wr.Write("\"{0}\"", TranslateEscapes(str, isChar: false));
+      } else {
+        wr.Write("\"");
+        for (var i = 0; i < n; i++) {
+          if (str[i] == '\"' && i + 1 < n && str[i + 1] == '\"') {
+            wr.Write("\\\"");
+            i++;
+          } else if (str[i] == '\\') {
+            wr.Write("\\\\");
+          } else if (str[i] == '\n') {
+            wr.Write("\\n");
+          } else if (str[i] == '\r') {
+            wr.Write("\\r");
+          } else {
+            wr.Write(str[i]);
+          }
+        }
+        wr.Write("\"");
+      }
+    }
+
+    private static string TranslateEscapes(string s, bool isChar) {
+      if (isChar) {
+        s = s.Replace("\\\"", "\"");
+      } else {
+        s = s.Replace("\\'", "'");
+      }
+
+      s = Util.ReplaceNullEscapesWithCharacterEscapes(s);
+
+      s = Util.ExpandUnicodeEscapes(s, false);
+
+      return s;
+    }
+
+    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, [CanBeNull] NativeType nativeType,
+      bool surroundByUnchecked, ConcreteSyntaxTree wr) {
+
+      string literalSuffix = null;
+      if (nativeType != null) {
+        GetNativeInfo(nativeType.Sel, out _, out literalSuffix, out _);
+      }
+
+      if (nativeType == null) {
+        wr.Write('(');
+        var middle = wr.Fork();
+        wr.Write($").Modulo(_dafny.One.Lsh({HelperModulePrefix}IntOf({bvType.Width})))");
+        return middle;
+      } else if (bvType.Width < nativeType.Bitwidth) {
+        wr.Write("((");
+        var middle = wr.Fork();
+        // print in hex, because that looks nice
+        wr.Write(") & 0x{0:X}{1})", (1UL << bvType.Width) - 1, literalSuffix);
+        return middle;
+      } else {
+        // no truncation needed
+        return wr;
+      }
+    }
+
+    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
+        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      bool needsCast = false;
+      var nativeType = AsNativeType(e0.Type);
+      if (nativeType != null) {
+        GetNativeInfo(nativeType.Sel, out _, out _, out needsCast);
+      }
+
+      var bv = e0.Type.NormalizeToAncestorType().AsBitVectorType;
+      if (bv.Width == 0) {
+        tr(e0, wr, inLetExprBody, wStmts);
+      } else {
+        ConcreteSyntaxTree wFirstArg;
+        if (bv.NativeType != null) {
+          wr.Write("_dafny.{0}{1}(", isRotateLeft ? "Lrot" : "Rrot", Capitalize(GetNativeTypeName(bv.NativeType)));
+          wFirstArg = wr.Fork();
+          wr.Write(", ");
+        } else {
+          wr.Write('(');
+          wFirstArg = wr.Fork();
+          wr.Write(").{0}(", isRotateLeft ? "Lrot" : "Rrot");
+        }
+        wFirstArg.Append(Expr(e0, inLetExprBody, wStmts));
+        wr.Append(Expr(e1, inLetExprBody, wStmts));
+        wr.Write(", {0})", bv.Width);
+
+        if (needsCast) {
+          wr.Write(".Int64()");
+        }
+      }
+    }
+
+    protected override bool CompareZeroUsingSign(Type type) {
+      return AsNativeType(type) == null;
+    }
+
+    protected override ConcreteSyntaxTree EmitSign(Type type, ConcreteSyntaxTree wr) {
+      // This is only called when CompareZeroUsingSign returns true
+      Contract.Assert(AsNativeType(type) == null);
+
+      var w = wr.Fork();
+      wr.Write(".Sign()");
+      return w;
+    }
+
+    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      wr.Write("_dafny.NewBuilder()");
+    }
+
+    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      wr.Write("{0}.Add(_dafny.TupleOf(", ingredients);
+      var wrTuple = wr.Fork();
+      wr.WriteLine("))");
+      return wrTuple;
+    }
+
+    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
+      wr.Write("(*({0}).IndexInt({1}))", prefix, i);
+    }
+
+    protected override string IdName(TopLevelDecl d) {
+      return IdName((Declaration)d);
+    }
+
+    protected override string IdName(MemberDecl member) {
+      return IdName((Declaration)member);
+    }
+
+    private string IdName(Declaration decl) {
+      if (HasCapitalizationConflict(decl)) {
+        // Don't use Go_ because Capitalize might use it and we know there's a conflict
+        return "Go__" + decl.GetCompileName(Options);
+      } else {
+        return IdProtect(Capitalize(decl.GetCompileName(Options)));
+      }
+    }
+
+    protected override string PrefixForForcedCapitalization => "Go_";
+
+    protected override string IdMemberName(MemberSelectExpr mse) {
+      return Capitalize(mse.MemberName);
+    }
+
+    protected override string IdProtect(string name) {
+      return PublicIdProtect(name);
+    }
+    public override string PublicIdProtect(string name) {
+      Contract.Requires(name != null);
+
+      switch (name) {
+        // Keywords
+        case "break":
+        case "case":
+        case "chan":
+        case "const":
+        case "continue":
+        case "default":
+        case "defer":
+        case "else":
+        case "fallthrough":
+        case "for":
+        case "func":
+        case "go":
+        case "goto":
+        case "if":
+        case "import":
+        case "interface":
+        case "map":
+        case "package":
+        case "range":
+        case "return":
+        case "select":
+        case "struct":
+        case "switch":
+        case "type":
+        case "var":
+
+        // Built-in functions
+        case "append":
+        case "cap":
+        case "close":
+        case "complex":
+        case "copy":
+        case "delete":
+        case "imag":
+        case "len":
+        case "make":
+        case "new":
+        case "panic":
+        case "print":
+        case "println":
+        case "real":
+        case "recover":
+
+        case "String":
+        case "Equals":
+        case "EqualsGeneric":
+        case "Default":
+
+        // Built-in types (can also be used as functions)
+        case "bool":
+        case "byte":
+        case "complex64":
+        case "complex128":
+        case "error":
+        case "float32":
+        case "float64":
+        case "int":
+        case "int8":
+        case "int16":
+        case "int32":
+        case "int64":
+        case "rune":
+        case "string":
+        case "uint":
+        case "uint8":
+        case "uint16":
+        case "uint32":
+        case "uint64":
+        case "uintptr":
+          return name + "_";
+        default:
+          return name;
+      }
+    }
+
+    /* Obtained by running the following on the console on the page https://pkg.go.dev/std :
+     var lineLength = 0; copy([...document.querySelectorAll(
+    "td > div.UnitDirectories-pathCell > div > span, "+
+    "td > div.UnitDirectories-pathCell > div > a")]
+    .map((e, i) => {
+        var res = JSON.stringify(e.textContent);
+        if(lineLength + res.length > 94) {
+            lineLength = res.length;
+            res = ",\n      " + res;
+        } else if(i > 0) {
+            res = "," + res;
+            lineLength += res.length;
+        }
+        return res;
+    }).join(""))
+     */
+    public readonly HashSet<string> ReservedModuleNames = new() {
+      "c",
+      "archive",
+      "bufio",
+      "builtin",
+      "bytes",
+      "cmp",
+      "compress",
+      "container",
+      "context",
+      "crypto",
+      "database",
+      "debug",
+      "embed",
+      "encoding",
+      "errors",
+      "expvar",
+      "flag",
+      "fmt",
+      "go",
+      "hash",
+      "html",
+      "image",
+      "index",
+      "internal",
+      "io",
+      "log",
+      "maps",
+      "math",
+      "mime",
+      "net",
+      "os",
+      "path",
+      "plugin",
+      "reflect",
+      "regexp",
+      "runtime",
+      "slices",
+      "sort",
+      "strconv",
+      "strings",
+      "sync",
+      "syscall",
+      "testing",
+      "text",
+      "time",
+      "unicode",
+      "unsafe"
+    };
+
+    public string PublicModuleIdProtect(string name) {
+      if (ReservedModuleNames.Contains(name.ToLower())) {
+        return "_" + name;
+      } else {
+        return IdProtect(name);
+      }
+    }
+
+    protected override string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null) {
+      return UserDefinedTypeName(udt, full: true, member: member);
+    }
+
+    private string UnqualifiedTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null) {
+      return UserDefinedTypeName(udt, full: false, member: member);
+    }
+
+    private string UserDefinedTypeName(UserDefinedType udt, bool full, MemberDecl/*?*/ member = null) {
+      Contract.Requires(udt != null);
+      if (udt is ArrowType) {
+        return ArrowType.Arrow_FullCompileName;
+      }
+      var cl = udt.ResolvedClass;
+      if (cl is TypeParameter) {
+        return IdProtect(udt.GetCompileName(Options));
+      } else {
+        return UserDefinedTypeName(cl, full, member);
+      }
+    }
+
+    private string UserDefinedTypeName(TopLevelDecl cl, bool full, MemberDecl/*?*/ member = null) {
+      string enclosingModuleDefinitionId;
+      if (CurrentModule == cl.EnclosingModuleDefinition || cl.EnclosingModuleDefinition.IsDefaultModule) {
+        enclosingModuleDefinitionId = PublicModuleIdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options));
+      } else {
+        enclosingModuleDefinitionId = ModuleImports[cl.EnclosingModuleDefinition].Name;
+      }
+      if (IsExternMemberOfExternModule(member, cl)) {
+        // omit the default class name ("_default") in extern modules, when the class is used to qualify an extern member
+        Contract.Assert(!cl.EnclosingModuleDefinition.IsDefaultModule);  // default module is not marked ":extern"
+        return enclosingModuleDefinitionId;
+      } else {
+        if (cl.IsExtern(Options, out var qual, out _)) {
+          // No need to take into account the second argument to extern, since
+          // it'll already be cl.CompileName
+          if (qual == null) {
+            if (this.ModuleName == enclosingModuleDefinitionId) {
+              qual = "";
+            } else {
+              qual = enclosingModuleDefinitionId;
+            }
+          }
+          // Don't use IdName since that'll capitalize, which is unhelpful for
+          // built-in types
+          return qual + (qual == "" ? "" : ".") + cl.GetCompileName(Options);
+        } else if (!full || cl.EnclosingModuleDefinition.TryToAvoidName || this.ModuleName == enclosingModuleDefinitionId) {
+          return IdName(cl);
+        } else {
+          return enclosingModuleDefinitionId + "." + IdName(cl);
+        }
+      }
+    }
+
+    private bool IsExternMemberOfExternModule(MemberDecl/*?*/ member, TopLevelDecl cl) {
+      return cl is DefaultClassDecl && Attributes.Contains(cl.EnclosingModuleDefinition.Attributes, "extern") &&
+             member != null && member.IsExtern(Options, out _, out _);
+    }
+
+    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
+      wr.Write("_this");
+    }
+
+    protected override void EmitNull(Type type, ConcreteSyntaxTree wr) {
+      if (type.IsIntegerType || type.IsBitVectorType || type.AsNewtype != null) {
+        wr.Write("_dafny.NilInt");
+      } else if (type.IsRealType) {
+        wr.Write("_dafny.NilReal");
+      } else {
+        wr.Write("({0})(nil)", TypeName(type, wr, tok: null));
+      }
+    }
+
+    protected override void EmitITE(Expression guard, Expression thn, Expression els, Type resultType, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("(func () {0} {{ if ", TypeName(resultType, wr, null));
+      wr.Append(Expr(guard, inLetExprBody, wStmts));
+      wr.Write(" { return ");
+      var wBranch = EmitCoercionIfNecessary(thn.Type, resultType, thn.Origin, wr);
+      wBranch.Append(Expr(thn, inLetExprBody, wStmts));
+      wr.Write(" }; return ");
+      wBranch = EmitCoercionIfNecessary(els.Type, resultType, thn.Origin, wr);
+      wBranch.Append(Expr(els, inLetExprBody, wStmts));
+      wr.Write(" })() ");
+    }
+
+    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
+      EmitDatatypeValue(dtv.Ctor.EnclosingDatatype, dtv.Ctor, dtv.IsCoCall, typeDescriptorArguments, arguments, wr);
+    }
+
+    void EmitDatatypeValue(DatatypeDecl dt, DatatypeCtor ctor, bool isCoCall, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
+      var ctorName = ctor.GetCompileName(Options);
+      var companionName = TypeName_Companion(dt, wr, dt.Origin);
+
+      var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
+      if (dt is TupleTypeDecl) {
+        wr.Write("_dafny.TupleOf({0})", arguments);
+      } else if (!isCoCall) {
+        // Ordinary constructor (that is, one that does not guard any co-recursive calls)
+        // Generate: Companion_Dt_.CreateCtor(args)
+        wr.Write($"{companionName}.{FormatDatatypeConstructorName(ctorName)}({typeDescriptorArguments}{sep}{arguments})");
+      } else {
+        // Co-recursive call
+        // Generate:  Companion_Dt_.LazyDt(func () Dt => Companion_Dt_.CreateCtor(args))
+        wr.Write("{0}.{1}({2}{3}func () {4} ", companionName, FormatLazyConstructorName(dt.GetCompileName(Options)),
+          typeDescriptorArguments, sep,
+          TypeName(UserDefinedType.FromTopLevelDecl(dt.Origin, dt), wr, dt.Origin));
+        wr.Write("{{ return {0}.{1}({2}{3}{4}) }}", companionName, FormatDatatypeConstructorName(ctorName), typeDescriptorArguments, sep, arguments);
+        wr.Write(')');
+      }
+    }
+
+    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString) {
+      compiledName = "";
+      preString = "";
+      postString = "";
+      switch (id) {
+        case SpecialField.ID.UseIdParam:
+          compiledName = IdProtect((string)idParam);
+          break;
+        case SpecialField.ID.ArrayLength:
+        case SpecialField.ID.ArrayLengthInt:
+          preString = "_dafny.ArrayLen(";
+          postString = string.Format(", {0}){1}", idParam == null ? 0 : (int)idParam,
+            id == SpecialField.ID.ArrayLengthInt ? ".Int()" : "");
+          break;
+        case SpecialField.ID.Floor:
+          compiledName = "Int()";
+          break;
+        case SpecialField.ID.IsLimit:
+          compiledName = "IsLimitOrd()";
+          break;
+        case SpecialField.ID.IsSucc:
+          compiledName = "IsSuccOrd()";
+          break;
+        case SpecialField.ID.Offset:
+          compiledName = "OrdOffset()";
+          break;
+        case SpecialField.ID.IsNat:
+          compiledName = "IsNatOrd()";
+          break;
+        case SpecialField.ID.Keys:
+          compiledName = "Keys()";
+          break;
+        case SpecialField.ID.Values:
+          compiledName = "Values()";
+          break;
+        case SpecialField.ID.Items:
+          compiledName = "Items()";
+          break;
+        case SpecialField.ID.Reads:
+          compiledName = "_reads";
+          break;
+        case SpecialField.ID.Modifies:
+          compiledName = "_modifies";
+          break;
+        case SpecialField.ID.New:
+          compiledName = "_new";
+          break;
+        default:
+          Contract.Assert(false); // unexpected ID
+          break;
+      }
+    }
+
+    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
+      Type expectedType, string/*?*/ additionalCustomParameter = null, bool internalAccess = false) {
+      var memberStatus = DatatypeWrapperEraser.GetMemberStatus(Options, member);
+      if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.Identity) {
+        return SimpleLvalue(obj);
+      } else if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue) {
+        return SimpleLvalue(w => w.Write("true"));
+      } else if (member is DatatypeDestructor dtor) {
+        return SimpleLvalue(wr => {
+          wr = EmitCoercionIfNecessary(dtor.Type, expectedType, Token.NoToken, wr);
+          if (dtor.EnclosingClass is TupleTypeDecl) {
+            Contract.Assert(dtor.CorrespondingFormals.Count == 1);
+            var formal = dtor.CorrespondingFormals[0];
+            wr.Write("(*(");
+            obj(wr);
+            wr.Write(").IndexInt({0}))", formal.NameForCompilation);
+          } else {
+            obj(wr);
+            wr.Write(".{0}()", FormatDatatypeDestructorName(dtor.GetCompileName(Options)));
+          }
+        });
+      } else if (member is SpecialField sf && sf.SpecialId != SpecialField.ID.UseIdParam) {
+        return SimpleLvalue(wr => {
+          wr = EmitCoercionIfNecessary(sf.Type, expectedType, Token.NoToken, wr);
+          obj(wr);
+          GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out _, out _);
+          if (compiledName.Length != 0) {
+            wr.Write(".{0}", Capitalize(compiledName));
+          } else {
+            // this member selection is handled by some kind of enclosing function call, so nothing to do here
+          }
+        });
+      } else if (member is SpecialField sf2 && sf2.SpecialId == SpecialField.ID.UseIdParam && sf2.IdParam is string fieldName && fieldName.StartsWith("is_")) {
+        // sf2 is needed here only because the scope rules for these pattern matches are asinine: sf is *still in scope* but it's useless because it may not have been assigned to!
+        return SimpleLvalue(wr => {
+          wr = EmitCoercionIfNecessary(sf2.Type, expectedType, Token.NoToken, wr);
+          obj(wr);
+          // FIXME This is a pretty awful string hack.
+          wr.Write(".{0}()", FormatDatatypeConstructorCheckName(fieldName.Substring(3)));
+        });
+      } else if (member is Function fn) {
+        typeArgs = typeArgs.Where(ta => NeedsTypeDescriptor(ta.Formal)).ToList();
+        if (typeArgs.Count == 0 && additionalCustomParameter == null) {
+          var lvalue = SuffixLvalue(obj, ".{0}", IdName(member));
+          return CoercedLvalue(lvalue, fn.GetMemberType((ArrowTypeDecl)expectedType.AsArrowType.ResolvedClass), expectedType);
+        } else {
+          // We need an eta conversion to adjust for the difference in arity.
+          // func (a0 T0, a1 T1, ...) ResultType { return obj.F(rtd0, rtd1, ..., a0, a1, ...); }
+          // Start by writing to the suffix:  F(rtd0, rtd1, ...
+          var suffixWr = new ConcreteSyntaxTree();
+          suffixWr.Write(IdName(member));
+          suffixWr.Write("(");
+          var suffixSep = "";
+          EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), fn.Origin, suffixWr, ref suffixSep);
+          if (additionalCustomParameter != null) {
+            suffixWr.Write("{0}{1}", suffixSep, additionalCustomParameter);
+            suffixSep = ", ";
+          }
+          // Write the prefix and the rest of the suffix
+          var prefixWr = new ConcreteSyntaxTree();
+          var prefixSep = "";
+          prefixWr.Write("func (");
+          foreach (var arg in fn.Ins) {
+            if (!arg.IsGhost) {
+              var name = idGenerator.FreshId("_eta");
+              var ty = arg.Type.Subst(typeMap);
+              prefixWr.Write($"{prefixSep}{name} {TypeName(ty, prefixWr, arg.Origin)}");
+              suffixWr.Write("{0}{1}", suffixSep, name);
+              suffixSep = ", ";
+              prefixSep = ", ";
+            }
+          }
+          var resultType = fn.ResultType.Subst(typeMap);
+          prefixWr.Write(") {0} {{ return ", TypeName(resultType, prefixWr, fn.Origin));
+          suffixWr.Write(")");
+          var suffix = suffixWr.ToString();
+          return EnclosedLvalue(
+            prefixWr.ToString(),
+            wr => {
+              var wCall = EmitCoercionIfNecessary(fn.ResultType, resultType, Token.NoToken, wr: wr);
+              obj(wCall);
+              wCall.Write(".");
+              wCall.Write(suffix);
+              wr.Write("; }");
+            },
+            "");
+        }
+      } else {
+        var field = (Field)member;
+        ILvalue lvalue;
+        if (member.IsStatic) {
+          lvalue = SimpleLvalue(w => {
+            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.Origin, member), IdName(member));
+            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.Origin, w);
+            w.Write(")");
+          });
+        } else if (NeedsCustomReceiverNotTrait(member)) {
+          // instance const in a newtype
+          Contract.Assert(typeArgs.Count == 0);
+          lvalue = SimpleLvalue(w => {
+            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.Origin, member), IdName(member));
+            obj(w);
+            w.Write(")");
+          });
+        } else if (internalAccess && (member is ConstantField || member.EnclosingClass is TraitDecl)) {
+          lvalue = SuffixLvalue(obj, $".{InternalFieldPrefix}{member.GetCompileName(Options)}");
+        } else if (internalAccess) {
+          lvalue = SuffixLvalue(obj, $".{IdName(member)}");
+        } else if (member is ConstantField) {
+          lvalue = SimpleLvalue(w => {
+            obj(w);
+            w.Write(".{0}(", IdName(member));
+            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.Origin, w);
+            w.Write(")");
+          });
+        } else if (member.EnclosingClass is TraitDecl) {
+          lvalue = GetterSetterLvalue(obj, IdName(member), $"{IdName(member)}_set_");
+        } else {
+          lvalue = SuffixLvalue(obj, $".{IdName(member)}");
+        }
+        return CoercedLvalue(lvalue, field.Type, expectedType);
+      }
+    }
+
+    protected override string ArrayIndexToNativeInt(string s, Type type) {
+      var nt = AsNativeType(type);
+      if (nt == null) {
+        return $"({s}).Int()";
+      } else {
+        return $"int({s})";
+      }
+    }
+
+    protected override ConcreteSyntaxTree ExprToInt(Type fromType, ConcreteSyntaxTree wr) {
+      if (AsNativeType(fromType) == null) {
+        return wr;
+      }
+      wr.Write("_dafny.IntOfAny");
+      return wr.ForkInParens();
+    }
+
+    /// <summary>
+    /// Emit to "wr" a call
+    ///     _dafny.ArrayGet( <<wArray>>, <<wArguments>> )        // if isGet
+    /// or
+    ///     _dafny.ArraySet( <<wArray>>, <<wArguments>> )        // if !isGet
+    /// and return (wArray, wArguments). Optimize these calls based on "dimensionCount" and "elementType".
+    /// "elementType" is allowed to be "null", which says to not specialize based on the element type.
+    /// </summary>
+    private (ConcreteSyntaxTree wArray, ConcreteSyntaxTree wArguments) CallArrayGetOrSet(bool isGet,
+      int dimensionCount, [CanBeNull] Type elementType, ConcreteSyntaxTree wr) {
+
+      var typeSpecialization = "";
+      if (dimensionCount == 1 && elementType != null) {
+        if (elementType.IsCharType) {
+          typeSpecialization = CharTypeNameProper;
+        } else {
+          var nt = AsNativeType(elementType);
+          if (nt != null && nt.Sel == NativeType.Selection.Byte) {
+            typeSpecialization = "Byte";
+          }
+        }
+      }
+      if (isGet && typeSpecialization == "") {
+        wr = EmitCoercionIfNecessary(null, elementType, Token.NoToken, wr);
+      }
+
+      ConcreteSyntaxTree wArray;
+      if (dimensionCount != 1) {
+        // use a general call, which uses a varargs for the indices
+        wr.Write(isGet ? "_dafny.ArrayGet(" : "_dafny.ArraySet(");
+        wArray = wr.Fork();
+        wr.Write(", ");
+      } else {
+        // specialize to a call with exactly one index argument
+        wArray = wr.ForkInParens();
+        wr.Write($"{(isGet ? ".ArrayGet1" : ".ArraySet1")}{typeSpecialization}(");
+      }
+      var wArguments = wr.Fork();
+      wr.Write(")");
+      return (wArray, wArguments);
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Action<ConcreteSyntaxTree>> indices, Type elmtType, ConcreteSyntaxTree wr) {
+      // Note, the indices are formulated in the native array-index type.
+      var (wArray, wArguments) = CallArrayGetOrSet(true, indices.Count, elmtType, wr);
+      for (int i = 0; i < indices.Count; i++) {
+        if (i > 0) {
+          wArguments.Write(", ");
+        }
+        indices[i](wArguments);
+      }
+      return wArray;
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
+      var (wArray, wArguments) = CallArrayGetOrSet(true, indices.Count, elmtType, wr);
+      wArguments.Write(indices.Comma(index => {
+        var idx = Expr(index, inLetExprBody, wStmts).ToString();
+        return ArrayIndexToNativeInt(idx, index.Type);
+      }));
+      return wArray;
+    }
+
+    protected override (ConcreteSyntaxTree/*array*/, ConcreteSyntaxTree/*rhs*/) EmitArrayUpdate(List<Action<ConcreteSyntaxTree>> indices, Type elementType, ConcreteSyntaxTree wr) {
+      var (wArray, wArguments) = CallArrayGetOrSet(false, indices.Count, elementType, wr);
+      var wRhs = wArguments.Fork();
+      for (int i = 0; i < indices.Count; i++) {
+        wArguments.Write(", ");
+        indices[i](wArguments);
+      }
+      return (wArray, wRhs);
+    }
+
+    protected override void EmitArrayIndexToInt(ConcreteSyntaxTree wr, out ConcreteSyntaxTree wIndex) {
+      wIndex = new ConcreteSyntaxTree();
+      wr.Write($"{HelperModulePrefix}IntOf(");
+      wr.Append(wIndex);
+      wr.Write(")");
+    }
+
+    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (expr is LiteralExpr lit) {
+        wr.Write(lit.Value.ToString());
+      } else {
+        TrParenExpr(expr, wr, inLetExprBody, wStmts);
+        if (AsNativeType(expr.Type) == null) {
+          wr.Write(".Int()");
+        }
+      }
+    }
+
+    // This will probably move up to the superclass once more compilers are using dafnyRuntime.dfy
+    protected void TrExprToSizeT(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (expr is LiteralExpr lit) {
+        wr.Write(lit.Value.ToString());
+      } else {
+        if (AsNativeType(expr.Type) == null) {
+          TrParenExpr(expr, wr, inLetExprBody, wStmts);
+          wr.Write(".Uint32()");
+        } else {
+          wr.Write("uint32(");
+          wr.Append(Expr(expr, inLetExprBody, wStmts));
+          wr.Write(")");
+        }
+      }
+    }
+
+    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var type = source.Type.NormalizeToAncestorType();
+      if (type is SeqType seqType) {
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+        wr.Write(".Select(");
+        TrExprToSizeT(index, inLetExprBody, wr, wStmts);
+        wr.Write(").({0})", TypeName(seqType.Arg, wr, null));
+      } else if (type is MultiSetType) {
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+        wr.Write(".Multiplicity(");
+        wr.Append(Expr(index, inLetExprBody, wStmts));
+        wr.Write(")");
+      } else {
+        Contract.Assert(type is MapType);
+        // map or imap
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+        wr.Write(".Get(");
+        wr.Append(Expr(index, inLetExprBody, wStmts));
+        wr.Write(").({0})", TypeName(((MapType)type).Range, wr, null));
+      }
+    }
+
+    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
+        CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (resultCollectionType.AsSeqType != null) {
+        wr.Write($"{DafnySequenceCompanion}.Update(");
+        wr.Append(Expr(source, inLetExprBody, wStmts));
+        wr.Write(", ");
+        TrExprToSizeT(index, inLetExprBody, wr, wStmts);
+        wr.Write(", ");
+        wr.Append(CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts));
+        wr.Write(")");
+      } else if (resultCollectionType.AsMapType is { } mapType) {
+        EmitIndexCollectionUpdate(source.Type, out var wSource, out var wIndex, out var wValue, wr, false);
+        TrParenExpr(source, wSource, inLetExprBody, wSource);
+        wIndex.Append(CoercedExpr(index, mapType.Domain, inLetExprBody, wSource));
+        wValue.Append(CoercedExpr(value, mapType.Range, inLetExprBody, wSource));
+      } else {
+        Contract.Assert(resultCollectionType.AsMultiSetType != null);
+        EmitIndexCollectionUpdate(source.Type, out var wSource, out var wIndex, out var wValue, wr, false);
+        TrParenExpr(source, wSource, inLetExprBody, wSource);
+        wIndex.Append(CoercedExpr(index, resultCollectionType.Arg, inLetExprBody, wSource));
+        wValue.Append(Expr(value, inLetExprBody, wSource));
+      }
+    }
+
+    protected override void EmitIndexCollectionUpdate(Type sourceType, out ConcreteSyntaxTree wSource, out ConcreteSyntaxTree wIndex, out ConcreteSyntaxTree wValue, ConcreteSyntaxTree wr, bool nativeIndex) {
+      if (sourceType.IsArrayType) {
+        Contract.Assume(nativeIndex);
+        (wSource, var wArguments) = CallArrayGetOrSet(false, 1, null, wr);
+        wValue = wArguments.Fork();
+        wArguments.Write(", ");
+        wIndex = wArguments.Fork();
+      } else {
+        wSource = wr.ForkInParens();
+        wr.Write(nativeIndex ? ".UpdateInt(" : ".Update(");
+        wIndex = wr.Fork();
+        wr.Write(", ");
+        wValue = wr.Fork();
+        wr.Write(")");
+      }
+    }
+
+    protected override void EmitSeqSelectRange(Expression source, Expression lo /*?*/, Expression hi /*?*/,
+        bool fromArray, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (fromArray) {
+        wr.Write("_dafny.ArrayRangeToSeq(");
+        wr.Append(Expr(source, inLetExprBody, wStmts));
+        wr.Write(", ");
+
+        if (lo == null) {
+          wr.Write("_dafny.NilInt");
+        } else {
+          TrExprToBigInt(lo, wr, inLetExprBody);
+        }
+
+        wr.Write(", ");
+
+        if (hi == null) {
+          wr.Write("_dafny.NilInt");
+        } else {
+          TrExprToBigInt(hi, wr, inLetExprBody);
+        }
+
+        wr.Write(")");
+      } else {
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+
+        if (lo == null) {
+          if (hi == null) {
+            return;
+          }
+
+          wr.Write(".Take(");
+          TrExprToSizeT(hi, inLetExprBody, wr, wStmts);
+          wr.Write(")");
+        } else {
+          if (hi == null) {
+            wr.Write(".Drop(");
+            TrExprToSizeT(lo, inLetExprBody, wr, wStmts);
+            wr.Write(")");
+          } else {
+            wr.Write(".Subsequence(");
+            TrExprToSizeT(lo, inLetExprBody, wr, wStmts);
+            wr.Write(", ");
+            TrExprToSizeT(hi, inLetExprBody, wr, wStmts);
+            wr.Write(")");
+          }
+        }
+      }
+    }
+
+    void TrExprToBigInt(Expression e, ConcreteSyntaxTree wr, bool inLetExprBody) {
+      var wStmts = wr.Fork();
+      var nativeType = AsNativeType(e.Type);
+      if (nativeType != null) {
+        wr.Write(HelperModulePrefix);
+        switch (nativeType.Sel) {
+          case NativeType.Selection.Byte:
+            wr.Write("IntOfUint8(");
+            break;
+          case NativeType.Selection.UShort:
+            wr.Write("IntOfUint16(");
+            break;
+          case NativeType.Selection.UInt:
+            wr.Write("IntOfUint32(");
+            break;
+          case NativeType.Selection.ULong:
+            wr.Write("IntOfUint64(");
+            break;
+          case NativeType.Selection.SByte:
+            wr.Write("IntOfInt8(");
+            break;
+          case NativeType.Selection.Short:
+            wr.Write("IntOfInt16(");
+            break;
+          case NativeType.Selection.Int:
+            wr.Write("IntOfInt32(");
+            break;
+          case NativeType.Selection.Long:
+            wr.Write($"IntOfInt64(");
+            break;
+          default:
+            throw new cce.UnreachableException();  // unexpected nativeType.Selection value
+        }
+      }
+
+      TrParenExpr(e, wr, inLetExprBody, wStmts);
+
+      if (nativeType != null) {
+        wr.Write(")");
+      }
+    }
+
+    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"{HelperModulePrefix}SeqCreate(");
+      TrExprToSizeT(expr.N, inLetExprBody, wr, wStmts);
+      wr.Write(", ");
+      var fromType = (ArrowType)expr.Initializer.Type.NormalizeExpand();
+      var atd = (ArrowTypeDecl)fromType.ResolvedClass;
+      var tParam = new UserDefinedType(expr.Origin, new TypeParameter(expr.Origin, new Name("X"), TypeParameter.TPVarianceSyntax.NonVariant_Strict));
+      var toType = new ArrowType(expr.Origin, atd, new List<Type>() { Type.Int }, tParam);
+      var initWr = EmitCoercionIfNecessary(fromType, toType, expr.Origin, wr);
+      initWr.Append(Expr(expr.Initializer, inLetExprBody, wStmts));
+      wr.Write(")");
+      if (fromType.Result.IsCharType && !UnicodeCharEnabled) {
+        // Tag this sequence as being a string at runtime,
+        // but only if --unicode-char is false.
+        // See "Printing strings and characters" in docs/Compilation/StringsAndChars.md.
+        wr.Write(".SetString()");
+      }
+    }
+
+    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var eeType = expr.E.Type.NormalizeToAncestorType();
+      if (eeType is SeqType) {
+        TrParenExpr("_dafny.MultiSetFromSeq", expr.E, wr, inLetExprBody, wStmts);
+      } else if (eeType is SetType) {
+        TrParenExpr("_dafny.MultiSetFromSet", expr.E, wr, inLetExprBody, wStmts);
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();
+      }
+    }
+
+    protected override void EmitApplyExpr(Type functionType, IOrigin tok, Expression function, List<Expression> arguments,
+        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(function, wr, inLetExprBody, wStmts);
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+    }
+
+    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
+      List<Type> boundTypes, Type type, IOrigin tok, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ref ConcreteSyntaxTree wStmts) {
+      Contract.Assert(boundVars.Count == boundTypes.Count);
+      wr.Write("(func (");
+      for (int i = 0; i < boundVars.Count; i++) {
+        if (i > 0) {
+          wr.Write(", ");
+        }
+        wr.Write("{0} {1}", boundVars[i], TypeName(boundTypes[i], wr, tok));
+      }
+
+      wr.Write(") {0}", TypeName(type, wr, tok));
+      var wLambdaBody = wr.NewBigExprBlock("", ")");
+      var w = EmitReturnExpr(wLambdaBody);
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+      return w;
+    }
+
+    protected override void EmitConstructorCheck(string source, DatatypeCtor ctor, ConcreteSyntaxTree wr) {
+      wr.Write("{0}.{1}()", source, FormatDatatypeConstructorCheckName(ctor.GetCompileName(Options)));
+    }
+
+    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex,
+      DatatypeCtor ctor, Func<List<Type>> getTypeArgs, Type bvType, ConcreteSyntaxTree wr) {
+      if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
+        Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
+        Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
+        source(wr);
+      } else if (ctor.EnclosingDatatype is TupleTypeDecl tupleTypeDecl) {
+        Contract.Assert(tupleTypeDecl.NonGhostDims != 1); // such a tuple is an erasable-wrapper type, handled above
+        wr.Write("(*(");
+        source(wr);
+        wr.Write(").IndexInt({0})).({1})", formalNonGhostIndex, TypeName(getTypeArgs()[formalNonGhostIndex], wr, Token.NoToken));
+      } else {
+        var dtorName = DatatypeFieldName(dtor, formalNonGhostIndex);
+        wr = EmitCoercionIfNecessary(from: dtor.Type, to: bvType, tok: dtor.Origin, wr: wr);
+        source(wr);
+        wr.Write(".Get_().({0}).{1}", TypeName_Constructor(ctor, wr), dtorName);
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IOrigin tok, List<string> inNames,
+      Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
+      wr.Write("func (");
+      Contract.Assert(inTypes.Count == inNames.Count);  // guaranteed by precondition
+      for (var i = 0; i < inNames.Count; i++) {
+        wr.Write("{0}{1} {2}", i == 0 ? "" : ", ", inNames[i], TypeName(inTypes[i], wr, tok));
+      }
+      var w = wr.NewExprBlock(") {0}", TypeName(resultType, wr, tok));
+      return w;
+    }
+
+    protected override void CreateIIFE(string bvName, Type bvType, IOrigin bvTok, Type bodyType, IOrigin bodyTok,
+      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
+      var w = wr.NewExprBlock("func ({0} {1}) {2}", bvName, TypeName(bvType, wr, bvTok), TypeName(bodyType, wr, bodyTok));
+      wStmts = w.Fork();
+      w.Write("return ");
+      wrBody = w.Fork();
+      w.WriteLine();
+      wr.Write('(');
+      wrRhs = wr.Fork();
+      wr.Write(')');
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IOrigin resultTok, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts) {
+      var w = wr.NewBigExprBlock("func () " + TypeName(resultType, wr, resultTok), "()");
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IOrigin resultTok, string bvName,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var w = wr.NewExprBlock("func ({0} int) {1}", bvName, TypeName(resultType, wr, resultTok));
+      wr.Write("({0})", source);
+      return w;
+    }
+
+    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      switch (op) {
+        case ResolvedUnaryOp.BoolNot:
+          TrParenExpr("!", expr, wr, inLetExprBody, wStmts);
+          break;
+        case ResolvedUnaryOp.BitwiseNot:
+          if (AsNativeType(expr.Type) != null) {
+            wr.Write("^ ");
+            TrParenExpr(expr, wr, inLetExprBody, wStmts);
+          } else {
+            TrParenExpr(expr, wr, inLetExprBody, wStmts);
+            wr.Write(".Not()");
+          }
+          break;
+        case ResolvedUnaryOp.Cardinality:
+          if (expr.Type.NormalizeToAncestorType().AsSeqType != null) {
+            wr.Write($"{HelperModulePrefix}IntOfUint32(");
+            TrParenExpr(expr, wr, inLetExprBody, wStmts);
+            wr.Write(".Cardinality())");
+          } else {
+            TrParenExpr(expr, wr, inLetExprBody, wStmts);
+            wr.Write(".Cardinality()");
+          }
+
+          break;
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
+      }
+    }
+
+    private bool IsDirectlyComparable(Type t) {
+      t = t.GetRuntimeType();
+      return t.IsBoolType || t.IsCharType || AsNativeType(t) != null || t.IsArrayType ||
+             t is UserDefinedType { ResolvedClass: ClassDecl };
+    }
+
+    private bool IsOrderedByCmp(Type t) {
+      t = t.GetRuntimeType();
+      return t.IsIntegerType || t.IsRealType || t.IsBigOrdinalType ||
+             (t.AsBitVectorType is { NativeType: null }) ||
+             (t.AsNewtype is { NativeType: null });
+    }
+
+    private bool IsComparedByEquals(Type t) {
+      t = t.GetRuntimeType();
+      return t.IsIndDatatype || t is CollectionType;
+    }
+
+    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
+      Type e0Type, Type e1Type, IOrigin tok, Type resultType,
+      out string opString,
+      out string preOpString,
+      out string postOpString,
+      out string callString,
+      out string staticCallString,
+      out bool reverseArguments,
+      out bool truncateResult,
+      out bool convertE1_to_int,
+      out bool coerceE1,
+      ConcreteSyntaxTree errorWr) {
+
+      opString = null;
+      preOpString = "";
+      postOpString = "";
+      callString = null;
+      staticCallString = null;
+      reverseArguments = false;
+      truncateResult = false;
+      convertE1_to_int = false;
+      coerceE1 = false;
+
+      switch (op) {
+        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
+          if (AsNativeType(resultType) != null) {
+            opString = "&";
+          } else {
+            callString = "And";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.BitwiseOr:
+          if (AsNativeType(resultType) != null) {
+            opString = "|";
+          } else {
+            callString = "Or";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.BitwiseXor:
+          if (AsNativeType(resultType) != null) {
+            opString = "^";
+          } else {
+            callString = "Xor";
+          }
+          break;
+
+        case BinaryExpr.ResolvedOpcode.EqCommon: {
+            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0Type);
+            if (!EqualsUpToParameters(eqType, DatatypeWrapperEraser.SimplifyType(Options, e1Type))) {
+              staticCallString = $"{HelperModulePrefix}AreEqual";
+            } else if (IsOrderedByCmp(eqType)) {
+              callString = "Cmp";
+              postOpString = " == 0";
+            } else if (IsComparedByEquals(eqType)) {
+              callString = "Equals";
+            } else if (IsDirectlyComparable(eqType)) {
+              opString = "==";
+            } else {
+              staticCallString = $"{HelperModulePrefix}AreEqual";
+            }
+            break;
+          }
+        case BinaryExpr.ResolvedOpcode.NeqCommon: {
+            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0Type);
+            if (!EqualsUpToParameters(eqType, DatatypeWrapperEraser.SimplifyType(Options, e1Type))) {
+              preOpString = "!";
+              staticCallString = $"{HelperModulePrefix}AreEqual";
+            } else if (IsDirectlyComparable(eqType)) {
+              opString = "!=";
+              postOpString = "/* dircomp */";
+            } else if (IsOrderedByCmp(eqType)) {
+              callString = "Cmp";
+              postOpString = " != 0";
+            } else if (IsComparedByEquals(eqType)) {
+              preOpString = "!";
+              callString = "Equals";
+            } else {
+              preOpString = "!";
+              staticCallString = $"{HelperModulePrefix}AreEqual";
+            }
+            break;
+          }
+
+        case BinaryExpr.ResolvedOpcode.Lt:
+          if (IsOrderedByCmp(e0Type)) {
+            callString = "Cmp";
+            postOpString = " < 0";
+          } else {
+            opString = "<";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Le:
+          if (IsOrderedByCmp(e0Type)) {
+            callString = "Cmp";
+            postOpString = " <= 0";
+          } else {
+            opString = "<=";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Ge:
+          if (IsOrderedByCmp(e0Type)) {
+            callString = "Cmp";
+            postOpString = " >= 0";
+          } else {
+            opString = ">=";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Gt:
+          if (IsOrderedByCmp(e0Type)) {
+            callString = "Cmp";
+            postOpString = " > 0";
+          } else {
+            opString = ">";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.LeftShift:
+          if (resultType.NormalizeToAncestorType().IsBitVectorType) {
+            truncateResult = true;
+          }
+          if (AsNativeType(resultType) != null) {
+            opString = "<<";
+            if (AsNativeType(e1Type) == null) {
+              postOpString = ".Uint64()";
+            }
+          } else {
+            if (AsNativeType(e1Type) != null) {
+              callString = "Lsh(_dafny.IntOfUint64(uint64";
+              postOpString = "))";
+            } else {
+              callString = "Lsh";
+            }
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.RightShift:
+          if (AsNativeType(resultType) != null) {
+            opString = ">>";
+            if (AsNativeType(e1Type) == null) {
+              postOpString = ".Uint64()";
+            }
+          } else {
+            if (AsNativeType(e1Type) != null) {
+              callString = "Rsh(_dafny.IntOfUint64(uint64";
+              postOpString = "))";
+            } else {
+              callString = "Rsh";
+            }
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Add:
+          if (resultType.NormalizeToAncestorType().IsBitVectorType) {
+            truncateResult = true;
+          }
+          if (resultType.IsCharType || AsNativeType(resultType) != null) {
+            opString = "+";
+          } else {
+            callString = "Plus";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Sub:
+          if (resultType.NormalizeToAncestorType().IsBitVectorType) {
+            truncateResult = true;
+          }
+          if (AsNativeType(resultType) != null) {
+            if (AsNativeType(resultType).LowerBound == BigInteger.Zero) {
+              // Go is a PITA about subtracting unsigned integers---it complains
+              // if they're constant and the substraction underflows.  Hiding
+              // one of the arguments behind a thunk is kind of hideous but
+              // it does prevent constant folding.
+              opString = string.Format("- (func () {0} {{ return ", GetNativeTypeName(AsNativeType(resultType)));
+              postOpString = " })()";
+            } else {
+              opString = "-";
+            }
+          } else if (resultType.IsCharType) {
+            opString = "-";
+          } else {
+            callString = "Minus";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mul:
+          if (resultType.NormalizeToAncestorType().IsBitVectorType) {
+            truncateResult = true;
+          }
+          if (AsNativeType(resultType) != null) {
+            opString = "*";
+          } else {
+            callString = "Times";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Div:
+          if (AsNativeType(resultType) != null) {
+            var nt = AsNativeType(resultType);
+            if (nt.LowerBound < BigInteger.Zero) {
+              // Want Euclidean division for signed types
+              staticCallString = "_dafny.Div" + Capitalize(GetNativeTypeName(AsNativeType(resultType)));
+            } else {
+              // Native division is fine for unsigned
+              opString = "/";
+            }
+          } else {
+            callString = "DivBy";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mod:
+          if (AsNativeType(resultType) != null) {
+            var nt = AsNativeType(resultType);
+            if (nt.LowerBound < BigInteger.Zero) {
+              // Want Euclidean division for signed types
+              staticCallString = "_dafny.Mod" + Capitalize(GetNativeTypeName(AsNativeType(resultType)));
+            } else {
+              // Native division is fine for unsigned
+              opString = "%";
+            }
+          } else {
+            callString = "Modulo";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.SetEq:
+        case BinaryExpr.ResolvedOpcode.MultiSetEq:
+        case BinaryExpr.ResolvedOpcode.MapEq:
+          callString = "Equals"; break;
+        case BinaryExpr.ResolvedOpcode.SeqEq:
+          staticCallString = $"{DafnySequenceCompanion}.Equal"; break;
+        case BinaryExpr.ResolvedOpcode.ProperSubset:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
+          callString = "IsProperSubsetOf"; break;
+        case BinaryExpr.ResolvedOpcode.Subset:
+        case BinaryExpr.ResolvedOpcode.MultiSubset:
+          callString = "IsSubsetOf"; break;
+        case BinaryExpr.ResolvedOpcode.Disjoint:
+        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
+          callString = "IsDisjointFrom"; break;
+        case BinaryExpr.ResolvedOpcode.InSet:
+        case BinaryExpr.ResolvedOpcode.InMultiSet:
+        case BinaryExpr.ResolvedOpcode.InMap:
+          callString = "Contains"; reverseArguments = true; break;
+        case BinaryExpr.ResolvedOpcode.Union:
+        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+          callString = "Union"; break;
+        case BinaryExpr.ResolvedOpcode.MapMerge:
+          callString = "Merge"; break;
+        case BinaryExpr.ResolvedOpcode.Intersection:
+        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+          callString = "Intersection"; break;
+        case BinaryExpr.ResolvedOpcode.SetDifference:
+        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+          callString = "Difference"; break;
+        case BinaryExpr.ResolvedOpcode.MapSubtraction:
+          callString = "Subtract"; break;
+
+        case BinaryExpr.ResolvedOpcode.ProperPrefix:
+          staticCallString = $"{DafnySequenceCompanion}.IsProperPrefixOf"; break;
+        case BinaryExpr.ResolvedOpcode.Prefix:
+          staticCallString = $"{DafnySequenceCompanion}.IsPrefixOf"; break;
+        case BinaryExpr.ResolvedOpcode.Concat:
+          staticCallString = $"{DafnySequenceCompanion}.Concatenate"; break;
+        case BinaryExpr.ResolvedOpcode.InSeq:
+          staticCallString = $"{DafnySequenceCompanion}.Contains"; reverseArguments = true; break;
+
+        default:
+          base.CompileBinOp(op, e0Type, e1Type, tok, resultType,
+            out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
+            errorWr);
+          break;
+      }
+    }
+
+    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
+      wr.Write("{0}.Cmp(_dafny.Zero) == 0", varName);
+    }
+
+    protected override void EmitConversionExpr(Expression fromExpr, Type fromType, Type toType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (toType.Equals(fromType)) {
+        TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Int) || fromType.NormalizeToAncestorType().IsBitVectorType || fromType.IsCharType || fromType.IsBigOrdinalType) {
+        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          // (int or bv or char) -> real
+          Contract.Assert(AsNativeType(toType) == null);
+          wr.Write("_dafny.RealOfFrac(");
+          ConcreteSyntaxTree w;
+          if (fromType.IsCharType) {
+            wr.Write($"{HelperModulePrefix}IntOfInt32(rune");
+            w = wr.Fork();
+            wr.Write(")");
+          } else if (AsNativeType(fromType) is NativeType nt) {
+            wr.Write($"{HelperModulePrefix}IntOf{Capitalize(GetNativeTypeName(nt))}(");
+            w = wr.Fork();
+            wr.Write(")");
+          } else {
+            w = wr;
+          }
+          TrParenExpr(fromExpr, w, inLetExprBody, wStmts);
+          wr.Write(", _dafny.One)");
+        } else if (toType.IsCharType) {
+          if (fromType.IsCharType) {
+            EmitExpr(fromExpr, inLetExprBody, wr, wStmts);
+          } else {
+            wr.Write($"{CharTypeName}(");
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            if (AsNativeType(fromType) == null) {
+              wr.Write(".Int32()");
+            }
+            wr.Write(")");
+          }
+        } else {
+          // (int or bv or char) -> (int or bv or ORDINAL)
+          var fromNative = AsNativeType(fromType);
+          var toNative = AsNativeType(toType);
+          if (fromNative != null && toNative != null) {
+            // from a native, to a native -- simple!
+            wr.Write(GetNativeTypeName(toNative));
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          } else if (fromType.IsCharType) {
+            Contract.Assert(fromNative == null);
+            if (toNative == null) {
+              // char -> big-integer (int or bv or ORDINAL)
+              wr.Write($"{HelperModulePrefix}IntOfInt32(rune(");
+              wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+              wr.Write("))");
+            } else {
+              // char -> native
+              wr.Write(GetNativeTypeName(toNative));
+              TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            }
+          } else if (fromNative == null && toNative == null) {
+            // big-integer (int or bv) -> big-integer (int or bv or ORDINAL), so identity will do
+            wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+          } else if (fromNative != null) {
+            Contract.Assert(toNative == null); // follows from other checks
+            // native (int or bv) -> big-integer (int or bv)
+            wr.Write($"{HelperModulePrefix}IntOf{Capitalize(GetNativeTypeName(fromNative))}(");
+            wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+            wr.Write(')');
+          } else {
+            // any (int or bv) -> native (int or bv)
+            // Consider some optimizations
+            var literal = PartiallyEvaluate(fromExpr);
+            UnaryOpExpr u = fromExpr.Resolved as UnaryOpExpr;
+            MemberSelectExpr m = fromExpr.Resolved as MemberSelectExpr;
+            if (literal != null) {
+              // Optimize constant to avoid intermediate BigInteger
+              wr.Write("{0}({1})", GetNativeTypeName(toNative), literal);
+            } else if (u != null && u.Op == UnaryOpExpr.Opcode.Cardinality) {
+              // Optimize .Count to avoid intermediate BigInteger
+              wr.Write("{0}(", GetNativeTypeName(toNative));
+              TrParenExpr(u.E, wr, inLetExprBody, wStmts);
+              wr.Write(u.E.Type.NormalizeToAncestorType().AsSeqType != null ? ".Cardinality())" : ".CardinalityInt())");
+            } else if (m != null && m.MemberName == "Length" && m.Obj.Type.IsArrayType) {
+              // Optimize .Length to avoid intermediate BigInteger
+              wr.Write("{0}(_dafny.ArrayLenInt(", GetNativeTypeName(toNative));
+              wr.Append(Expr(m.Obj, inLetExprBody, wStmts));
+              wr.Write(", 0))");
+            } else {
+              // no optimization applies; use the standard translation
+              TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+              wr.Write(".{0}()", Capitalize(GetNativeTypeName(toNative)));
+            }
+          }
+        }
+      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        Contract.Assert(AsNativeType(fromType) == null);
+        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          // real -> real
+          Contract.Assert(AsNativeType(toType) == null);
+          wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+        } else if (toType.IsCharType) {
+          wr.Write($"{CharTypeName}(");
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          wr.Write(".Int().Int32())");
+        } else {
+          // real -> (int or bv)
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          wr.Write(".Int()");
+          if (AsNativeType(toType) is NativeType nt) {
+            wr.Write(".{0}()", Capitalize(GetNativeTypeName(nt)));
+          }
+        }
+      } else if (fromType.Equals(toType) || fromType.AsNewtype != null || toType.AsNewtype != null) {
+        wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+      } else {
+        Contract.Assert(false, $"not implemented for go: {fromType} -> {toType}");
+      }
+    }
+
+    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IOrigin tok, ConcreteSyntaxTree wr) {
+      if (fromType.IsRefType && !fromType.IsNonNullRefType) {
+        Contract.Assert(toType.IsRefType);
+        if (toType.IsNonNullRefType) {
+          wr.Write($"!_dafny.IsDafnyNull({localName}) && ");
+        } else {
+          wr.Write($"_dafny.IsDafnyNull({localName}) || ");
+        }
+      }
+
+      if (fromType.IsSubtypeOf(toType, true, true)) {
+        wr.Write("true");
+      } else if (toType.IsTraitType) {
+        wr.Write($"{HelperModulePrefix}InstanceOfTrait({localName}.(_dafny.TraitOffspring), {TypeName_Companion(toType.AsTraitType, wr, tok)}.TraitID_)");
+      } else if (toType.IsRefType) {
+        wr.Write($"{HelperModulePrefix}InstanceOf({localName}, ({TypeName(toType, wr, tok)})(nil))");
+      } else if (fromType.IsTraitType && toType.AsNewtype != null) {
+        wr.Write($"{HelperModulePrefix}InstanceOf({localName}, (*{ClassName(toType, wr, tok)})(nil))");
+      } else {
+        wr.Write($"{HelperModulePrefix}InstanceOf({localName}, {TypeName(toType, wr, tok)}{{}})");
+      }
+    }
+
+    protected override void EmitIsIntegerTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(".IsInteger() && ");
+    }
+
+    protected override void EmitIsUnicodeScalarValueTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("_dafny.IsCodePoint");
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(" && ");
+    }
+
+    protected override void EmitIsInIntegerRange(Expression source, BigInteger lo, BigInteger hi, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitLiteralExpr(wr, new LiteralExpr(source.Origin, lo) { Type = Type.Int });
+      wr.Write(".Cmp(");
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(") <= 0 && ");
+
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(".Cmp(");
+      EmitLiteralExpr(wr, new LiteralExpr(source.Origin, hi) { Type = Type.Int });
+      wr.Write(") < 0 && ");
+    }
+
+    private static bool EqualsUpToParameters(Type type1, Type type2) {
+      // TODO Consider whether Type.SameHead should return true in this case
+      return Type.SameHead(type1, type2) || (type1.IsArrayType && type1.IsArrayType);
+    }
+
+    protected override ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
+      if (type.HasFatPointer) {
+        var w = wr.ForkInParens();
+        wr.Write("._value");
+        return w;
+      } else {
+        return wr;
+      }
+    }
+
+    protected override ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
+      if (type.HasFatPointer) {
+        wr.Write(TypeName_Initializer(type, wr, type.AsNewtype.Origin));
+        return wr.ForkInParens();
+      } else {
+        return wr;
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitCoercionIfNecessary(Type/*?*/ from, Type/*?*/ to, IOrigin tok, ConcreteSyntaxTree wr, Type toOrig = null) {
+      if (toOrig != null) {
+        to = toOrig;
+      }
+
+      if (to == null) {
+        return wr;
+      }
+
+      if (from != null && from.IsTraitType && to.AsNewtype != null) {
+        wr = FromFatPointer(to, wr);
+        var w = wr.ForkInParens();
+        wr.Write($".(*{UserDefinedTypeName(to.AsNewtype, true)})");
+        return w;
+      }
+      if (from != null && from.AsNewtype != null && to.IsTraitType && (enclosingMethod != null || enclosingFunction != null)) {
+        return ToFatPointer(from, wr);
+      }
+
+      from = from == null ? null : DatatypeWrapperEraser.SimplifyType(Options, from);
+      to = DatatypeWrapperEraser.SimplifyType(Options, to);
+      if (from != null && from.IsArrowType && to.IsArrowType && !from.Equals(to)) {
+        // Need to convert functions more often, so do this before the
+        // EqualsUpToParameters check below
+        ArrowType fat = from.AsArrowType, tat = to.AsArrowType;
+        // We must wrap the whole conversion in an IIFE to avoid capturing the source expression
+        var bvName = idGenerator.FreshId("coer");
+        // Nothing interesting should be written to wStmts
+        var blackHole = new ConcreteSyntaxTree();
+        CreateIIFE(bvName, fat, tok, tat, tok, wr, ref blackHole, out var ans, out wr);
+
+        wr.Write("func (");
+        var sep = "";
+        var args = new List<string>();
+        foreach (Type toArgType in tat.Args) {
+          var arg = idGenerator.FreshId("arg");
+          args.Add(arg);
+          wr.Write("{0}{1} {2}", sep, arg, TypeName(toArgType, wr, tok));
+          sep = ", ";
+        }
+        wr.Write(')');
+        if (tat.Result != null) {
+          wr.Write(" {0}", TypeName(tat.Result, wr, tok));
+        }
+        var wBody = wr.NewExprBlock("");
+        ConcreteSyntaxTree wCall;
+        if (fat.Result == null) {
+          wCall = wBody;
+        } else {
+          wBody.Write("return ");
+          wCall = EmitCoercionIfNecessary(@from: fat.Result, to: tat.Result, tok: tok, wr: wBody);
+        }
+        wCall.Write("{0}(", bvName);
+        Contract.Assert(fat.Args.Count == tat.Args.Count);
+        sep = "";
+        for (int i = 0; i < fat.Args.Count; i++) {
+          var fromArgType = fat.Args[i];
+          var toArgType = tat.Args[i];
+          wCall.Write(sep);
+          var w = EmitCoercionIfNecessary(@from: toArgType, to: fromArgType, tok: tok, wr: wCall);
+          w.Write(args[i]);
+          sep = ", ";
+        }
+        wCall.Write(')');
+        wBody.WriteLine();
+        return ans;
+      } else if (to.IsTypeParameter || (from != null && EqualsUpToParameters(from, to))) {
+        // do nothing
+        return wr;
+      } else if (from != null && !from.IsTypeParameter && from.IsSubtypeOf(to, true, true)) {
+        // upcast
+        return wr;
+      } else if (from == null || from.IsTypeParameter || to.IsSubtypeOf(from, true, true)) {
+        // downcast (allowed?) or implicit cast from parameter
+        if (to.IsObjectQ || to.IsObject) {
+          // a cast to any can be omitted
+          return wr;
+        } else if (to.IsTraitType) {
+          wr.Write("{0}.CastTo_(", TypeName_Companion(to.AsTraitType, wr, tok));
+          var w = wr.Fork();
+          wr.Write(")");
+          return w;
+        } else if (to.IsArrayType) {
+          wr.Write("_dafny.ArrayCastTo(");
+          var w = wr.Fork();
+          wr.Write(")");
+          return w;
+        } else {
+          var w = wr.Fork();
+          wr.Write(".({0})", TypeName(to, wr, tok));
+          return w;
+        }
+      } else if (from.AsNewtype is { } fromNewtypeDecl) {
+        return EmitCoercionIfNecessary(fromNewtypeDecl.ConcreteBaseType(from.TypeArgs), to, tok, wr, toOrig);
+      } else {
+        // It's unclear to me whether it's possible to hit this case with a valid Dafny program,
+        // so I'm not using UnsupportedFeatureError for now.
+        Error(GeneratorErrors.ErrorId.c_Go_infeasible_conversion, tok, "Cannot convert from {0} to {1}", wr, from, to);
+        return wr;
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitDowncast(Type from, Type to, IOrigin tok, ConcreteSyntaxTree wr) {
+      if (to.IsTraitType) {
+        wr.Write("{0}.CastTo_(", TypeName_Companion(to.AsTraitType, wr, tok));
+        var w = wr.Fork();
+        wr.Write(")");
+        return w;
+      }
+      return base.EmitDowncast(from, to, tok, wr);
+    }
+
+    protected override ConcreteSyntaxTree EmitCoercionToNativeInt(ConcreteSyntaxTree wr) {
+      var w = wr.Fork();
+      wr.Write(".(int)");
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree EmitCoercionToArbitraryTuple(ConcreteSyntaxTree wr) {
+      var w = wr.Fork();
+      wr.Write(".(_dafny.Tuple)");
+      return w;
+    }
+
+    protected override void EmitCollectionDisplay(CollectionType ct, IOrigin tok, List<Expression> elements,
+        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (ct is SetType) {
+        wr.Write("_dafny.SetOf");
+      } else if (ct is MultiSetType) {
+        wr.Write("_dafny.MultiSetOf");
+      } else {
+        Contract.Assert(ct is SeqType);  // follows from precondition
+        if (ct.Arg.IsCharType && !UnicodeCharEnabled) {
+          wr.Write("_dafny.SeqOfChars");
+        } else {
+          wr.Write("_dafny.SeqOf");
+        }
+      }
+      TrExprList(elements, wr, inLetExprBody, wStmts, typeAt: _ => ct.Arg);
+    }
+
+    protected override void EmitMapDisplay(MapType mt, IOrigin tok, List<ExpressionPair> elements,
+        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("_dafny.NewMapBuilder().ToMap()");
+      foreach (ExpressionPair p in elements) {
+        wr.Write(".UpdateUnsafe(");
+        wr.Append(Expr(p.A, inLetExprBody, wStmts));
+        wr.Write(", ");
+        wr.Append(Expr(p.B, inLetExprBody, wStmts));
+        wr.Write(')');
+      }
+    }
+
+    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
+      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
+      wrVarInit.Write("_dafny.NewBuilder()");
+    }
+
+    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
+      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
+      wrVarInit.Write("_dafny.NewMapBuilder()");
+    }
+
+    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      Contract.Assume(ct is SetType || ct is MultiSetType);  // follows from precondition
+      var wStmts = wr.Fork();
+      wr.Write("{0}.Add(", collName);
+      wr.Append(Expr(elmt, inLetExprBody, wStmts));
+      wr.WriteLine(")");
+    }
+
+    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IOrigin tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      var wStmts = wr.Fork();
+      wr.Write("{0}.Add(", collName);
+      var termLeftWriter = wr.Fork();
+      wr.Write(",");
+      wr.Append(Expr(term, inLetExprBody, wStmts));
+      wr.WriteLine(")");
+      return termLeftWriter;
+    }
+
+    protected override void GetCollectionBuilder_Build(CollectionType ct, IOrigin tok, string collName,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmt) {
+      if (ct is SetType) {
+        wr.Write(collName + ".ToSet()");
+      } else {
+        Contract.Assert(ct is MapType);
+        wr.Write(collName + ".ToMap()");
+      }
+    }
+
+    protected override (Type, Action<ConcreteSyntaxTree>) EmitIntegerRange(Type type, Action<ConcreteSyntaxTree> wLo, Action<ConcreteSyntaxTree> wHi) {
+      Type result;
+      if (AsNativeType(type) != null) {
+        result = type;
+      } else {
+        result = new IntType();
+      }
+
+      return (result, (wr) => {
+        if (AsNativeType(type) != null) {
+          wr.Write("{0}.IntegerRange(", TypeName_Companion(type.AsNewtype, wr, tok: Token.NoToken));
+        } else {
+          wr.Write($"{HelperModulePrefix}IntegerRange(");
+        }
+
+        wLo(wr);
+        wr.Write(", ");
+        wHi(wr);
+        wr.Write(')');
+      }
+      );
+    }
+
+    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr("_dafny.SingleValue", e, wr, inLetExprBody, wStmts);
+    }
+
+    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
+      var funcBlock = wr.NewBlock("func()", close: BlockStyle.Brace);
+      var deferBlock = funcBlock.NewBlock("defer func()", close: BlockStyle.Brace);
+      var ifRecoverBlock = deferBlock.NewBlock("if r := recover(); r != nil");
+      var stringMaker = UnicodeCharEnabled ? "UnicodeSeqOfUtf8Bytes" : "SeqOfString";
+      ifRecoverBlock.WriteLine($"var {haltMessageVarName} = {HelperModulePrefix}{stringMaker}(r.(string))");
+      TrStmt(recoveryBody, ifRecoverBlock);
+      funcBlock.WriteLine("()");
+      TrStmt(body, funcBlock);
+      wr.WriteLine("()");
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/InternalBackendsPluginConfiguration.cs b/Source/DafnyCore/Backends/InternalBackendsPluginConfiguration.cs
new file mode 100644
index 00000000000..ebd3651fad5
--- /dev/null
+++ b/Source/DafnyCore/Backends/InternalBackendsPluginConfiguration.cs
@@ -0,0 +1,21 @@
+using Microsoft.Dafny.Plugins;
+
+namespace Microsoft.Dafny.Compilers;
+
+internal class InternalBackendsPluginConfiguration : Plugins.PluginConfiguration {
+  public static readonly InternalBackendsPluginConfiguration Singleton = new();
+
+  public override IExecutableBackend[] GetCompilers(DafnyOptions options) {
+    return new IExecutableBackend[] {
+      new CsharpBackend(options),
+      new JavaScriptBackend(options),
+      new GoBackend(options),
+      new JavaBackend(options),
+      new PythonBackend(options),
+      new CppBackend(options),
+      new LibraryBackend(options),
+      new RustBackend(options),
+      new ResolvedDesugaredExecutableDafnyBackend(options)
+    };
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/Java/JavaBackend.cs b/Source/DafnyCore/Backends/Java/JavaBackend.cs
similarity index 75%
rename from Source/DafnyCore/Compilers/Java/JavaBackend.cs
rename to Source/DafnyCore/Backends/Java/JavaBackend.cs
index 68d620e15ad..a0dd281c25d 100644
--- a/Source/DafnyCore/Compilers/Java/JavaBackend.cs
+++ b/Source/DafnyCore/Backends/Java/JavaBackend.cs
@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.CommandLine;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using DafnyCore;
+using DafnyCore.Options;
 
 namespace Microsoft.Dafny.Compilers;
 
@@ -17,7 +21,7 @@ public class JavaBackend : ExecutableBackend {
   public override string TargetExtension => "java";
 
   public override string TargetBasename(string dafnyProgramName) =>
-    JavaCompiler.TransformToClassName(base.TargetBasename(dafnyProgramName));
+    JavaCodeGenerator.TransformToClassName(base.TargetBasename(dafnyProgramName));
 
   public override string TargetBaseDir(string dafnyProgramName) =>
     $"{Path.GetFileNameWithoutExtension(dafnyProgramName)}-java";
@@ -25,6 +29,19 @@ public override string TargetBaseDir(string dafnyProgramName) =>
   public override bool SupportsInMemoryCompilation => false;
   public override bool TextualTargetIsExecutable => false;
 
+  public static readonly Option<bool> LegacyDataConstructors = new("--legacy-data-constructors",
+    @"
+Generate unsafe, deprecated data constructor methods that do not take type descriptors, 
+for backwards compatibility with Java code generated with Dafny versions earlier than 4.3.".TrimStart()) {
+    IsHidden = true
+  };
+  static JavaBackend() {
+    DafnyOptions.RegisterLegacyUi(LegacyDataConstructors, DafnyOptions.ParseBoolean, "Compilation options", legacyName: "legacyDataConstructors", defaultValue: false);
+    OptionRegistry.RegisterOption(LegacyDataConstructors, OptionScope.Cli);
+  }
+
+  public override IEnumerable<Option> SupportedOptions => new List<Option> { LegacyDataConstructors };
+
   public override void CleanSourceDirectory(string sourceDirectory) {
     try {
       Directory.Delete(sourceDirectory, true);
@@ -32,8 +49,8 @@ public override void CleanSourceDirectory(string sourceDirectory) {
     }
   }
 
-  protected override SinglePassCompiler CreateCompiler() {
-    return new JavaCompiler(Options, Reporter);
+  protected override SinglePassCodeGenerator CreateCodeGenerator() {
+    return new JavaCodeGenerator(Options, Reporter);
   }
 
   private void EmitRuntimeJar(string targetDirectory) {
@@ -51,16 +68,17 @@ private void EmitRuntimeJar(string targetDirectory) {
     outStream.Close();
   }
 
-  public override bool CompileTargetProgram(string dafnyProgramName, string targetProgramText, string /*?*/ callToMain, string /*?*/ targetFilename,
-    ReadOnlyCollection<string> otherFileNames, bool runAfterCompile, TextWriter outputWriter, out object compilationResult) {
-    compilationResult = null;
+  public override async Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText,
+    string callToMain /*?*/, string targetFilename, /*?*/
+    ReadOnlyCollection<string> otherFileNames, bool runAfterCompile, TextWriter outputWriter) {
     foreach (var otherFileName in otherFileNames) {
       if (Path.GetExtension(otherFileName) != ".java") {
-        outputWriter.WriteLine($"Unrecognized file as extra input for Java compilation: {otherFileName}");
-        return false;
+        await outputWriter.WriteLineAsync($"Unrecognized file as extra input for Java compilation: {otherFileName}");
+        return (false, null);
       }
       if (!CopyExternLibraryIntoPlace(mainProgram: targetFilename, externFilename: otherFileName, outputWriter: outputWriter)) {
-        return false;
+        return (false, null);
       }
     }
 
@@ -75,8 +93,8 @@ public override bool CompileTargetProgram(string dafnyProgramName, string target
     var compileProcess = PrepareProcessStartInfo("javac", new List<string> { "-encoding", "UTF8" }.Concat(files));
     compileProcess.WorkingDirectory = Path.GetFullPath(Path.GetDirectoryName(targetFilename));
     compileProcess.EnvironmentVariables["CLASSPATH"] = GetClassPath(targetFilename);
-    if (0 != RunProcess(compileProcess, outputWriter, outputWriter, "Error while compiling Java files.")) {
-      return false;
+    if (0 != await RunProcess(compileProcess, outputWriter, outputWriter, "Error while compiling Java files.")) {
+      return (false, null);
     }
 
     var classFiles = Directory.EnumerateFiles(targetDirectory, "*.class", SearchOption.AllDirectories)
@@ -84,12 +102,12 @@ public override bool CompileTargetProgram(string dafnyProgramName, string target
 
     var simpleProgramName = Path.GetFileNameWithoutExtension(targetFilename);
     var jarPath = Path.GetFullPath(Path.ChangeExtension(dafnyProgramName, ".jar"));
-    if (!CreateJar(callToMain == null ? null : simpleProgramName,
+    if (!await CreateJar(callToMain == null ? null : simpleProgramName,
                    jarPath,
                    Path.GetFullPath(Path.GetDirectoryName(targetFilename)),
                    classFiles,
                    outputWriter)) {
-      return false;
+      return (false, null);
     }
 
     // Keep the build artifacts if --spill-translation is true
@@ -105,24 +123,24 @@ public override bool CompileTargetProgram(string dafnyProgramName, string target
     if (Options.Verbose) {
       // For the sake of tests, just write out the filename and not the directory path
       var fileKind = callToMain != null ? "executable" : "library";
-      outputWriter.WriteLine($"Wrote {fileKind} jar {Path.GetFileName(jarPath)}");
+      await outputWriter.WriteLineAsync($"Wrote {fileKind} jar {Path.GetFileName(jarPath)}");
     }
 
-    return true;
+    return (true, null);
   }
 
 
-  public bool CreateJar(string/*?*/ entryPointName, string jarPath, string rootDirectory, List<string> files, TextWriter outputWriter) {
+  public async Task<bool> CreateJar(string/*?*/ entryPointName, string jarPath, string rootDirectory, List<string> files, TextWriter outputWriter) {
     Directory.CreateDirectory(Path.GetDirectoryName(jarPath));
     var args = entryPointName == null ? // If null, then no entry point is added
         new List<string> { "cf", jarPath }
         : new List<string> { "cfe", jarPath, entryPointName };
     var jarCreationProcess = PrepareProcessStartInfo("jar", args.Concat(files));
     jarCreationProcess.WorkingDirectory = rootDirectory;
-    return 0 == RunProcess(jarCreationProcess, outputWriter, outputWriter, "Error while creating jar file: " + jarPath);
+    return 0 == await RunProcess(jarCreationProcess, outputWriter, outputWriter, "Error while creating jar file: " + jarPath);
   }
 
-  public override bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain,
+  public override async Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain,
     string targetFilename, /*?*/
     ReadOnlyCollection<string> otherFileNames, object compilationResult, TextWriter outputWriter,
     TextWriter errorWriter) {
@@ -132,7 +150,7 @@ public override bool RunTargetProgram(string dafnyProgramName, string targetProg
         .Concat(Options.MainArgs));
     // Run the target program in the user's working directory and with the user's classpath
     psi.EnvironmentVariables["CLASSPATH"] = GetClassPath(null);
-    return 0 == RunProcess(psi, outputWriter, errorWriter);
+    return 0 == await RunProcess(psi, outputWriter, errorWriter);
   }
 
   private string GetClassPath(string targetFilename) {
diff --git a/Source/DafnyCore/Backends/Java/JavaCodeGenerator.cs b/Source/DafnyCore/Backends/Java/JavaCodeGenerator.cs
new file mode 100644
index 00000000000..89c86b482ad
--- /dev/null
+++ b/Source/DafnyCore/Backends/Java/JavaCodeGenerator.cs
@@ -0,0 +1,4371 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.IO;
+using System.Diagnostics.Contracts;
+using System.Collections.ObjectModel;
+using System.CommandLine;
+using System.Text.RegularExpressions;
+using JetBrains.Annotations;
+using static Microsoft.Dafny.ConcreteSyntaxTreeUtils;
+
+namespace Microsoft.Dafny.Compilers {
+  public class JavaCodeGenerator : SinglePassCodeGenerator {
+    public JavaCodeGenerator(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
+      IntSelect = ",java.math.BigInteger";
+      LambdaExecute = ".apply";
+    }
+
+    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
+      Feature.Iterators,
+      Feature.SubsetTypeTests,
+      Feature.MethodSynthesis,
+      Feature.TuplesWiderThan20,
+      Feature.ArraysWithMoreThan16Dims,
+      Feature.ArrowsWithMoreThan16Arguments,
+      Feature.RuntimeCoverageReport,
+    };
+
+    const string DafnySetClass = "dafny.DafnySet";
+    const string DafnyMultiSetClass = "dafny.DafnyMultiset";
+    const string DafnySeqClass = "dafny.DafnySequence";
+    const string DafnyMapClass = "dafny.DafnyMap";
+
+    const string DafnyBigRationalClass = "dafny.BigRational";
+    const string DafnyEuclideanClass = "dafny.DafnyEuclidean";
+    const string DafnyHelpersClass = "dafny.Helpers";
+    const string DafnyTypeDescriptor = "dafny.TypeDescriptor";
+    string FormatDefaultTypeParameterValue(TypeParameter tp) => FormatDefaultTypeParameterValueName(tp.GetCompileName(Options));
+    static string FormatDefaultTypeParameterValueName(string tpName) => $"_default_{tpName}";
+
+    const string DafnyFunctionIfacePrefix = "dafny.Function";
+    const string DafnyMultiArrayClassPrefix = "dafny.Array";
+    const string DafnyTupleClassPrefix = "dafny.Tuple";
+
+    string DafnyMultiArrayClass(int dim) => DafnyMultiArrayClassPrefix + dim;
+    string DafnyTupleClass(int size) => DafnyTupleClassPrefix + size;
+
+    string DafnyFunctionIface(int arity) =>
+      arity == 1 ? "java.util.function.Function" : DafnyFunctionIfacePrefix + arity;
+
+    static string FormatExternBaseClassName(string externClassName) =>
+      $"_ExternBase_{externClassName}";
+    static string FormatTypeDescriptorVariable(string typeVarName) =>
+      $"_td_{typeVarName}";
+    string FormatTypeDescriptorVariable(TypeParameter tp) =>
+      FormatTypeDescriptorVariable(tp.GetCompileName(Options));
+
+    const string TypeMethodName = "_typeDescriptor";
+
+    private string ModuleName;
+    private string ModulePath;
+    private readonly List<GenericCompilationInstrumenter> Instrumenters = new();
+
+    public void AddInstrumenter(GenericCompilationInstrumenter compilationInstrumenter) {
+      Instrumenters.Add(compilationInstrumenter);
+    }
+
+    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
+
+
+    protected override bool SupportsAmbiguousTypeDecl => false;
+    protected override bool SupportsProperties => false;
+
+    private enum JavaNativeType { Byte, Short, Int, Long }
+
+    private static JavaNativeType AsJavaNativeType(NativeType.Selection sel) {
+      switch (sel) {
+        case NativeType.Selection.Byte:
+        case NativeType.Selection.SByte:
+          return JavaNativeType.Byte;
+        case NativeType.Selection.Short:
+        case NativeType.Selection.UShort:
+          return JavaNativeType.Short;
+        case NativeType.Selection.Int:
+        case NativeType.Selection.UInt:
+          return JavaNativeType.Int;
+        case NativeType.Selection.Long:
+        case NativeType.Selection.ULong:
+          return JavaNativeType.Long;
+        default:
+          Contract.Assert(false);
+          throw new cce.UnreachableException();
+      }
+    }
+
+    private static bool IsUnsignedJavaNativeType(NativeType nt) {
+      Contract.Requires(nt != null);
+      switch (nt.Sel) {
+        case NativeType.Selection.Byte:
+        case NativeType.Selection.UShort:
+        case NativeType.Selection.UInt:
+        case NativeType.Selection.ULong:
+          return true;
+        default:
+          return false;
+      }
+    }
+
+    private static JavaNativeType AsJavaNativeType(NativeType nt) {
+      return AsJavaNativeType(nt.Sel);
+    }
+
+    private JavaNativeType? AsJavaNativeType(Type type) {
+      var nt = AsNativeType(type);
+      if (nt == null) {
+        return null;
+      } else {
+        return AsJavaNativeType(nt);
+      }
+    }
+
+    protected override void DeclareSpecificOutCollector(string collectorVarName, ConcreteSyntaxTree wr, List<Type> formalTypes, List<Type> lhsTypes) {
+      // If the method returns an array of parameter type, and we're assigning
+      // to a variable with a more specific type, we need to insert a cast:
+      //
+      // Array<Integer> outcollector42 = obj.Method(); // <-- you are here
+      // int[] out43 = (int[]) outcollector42.unwrap();
+      var returnedTypes = new List<string>();
+      Contract.Assert(formalTypes.Count == lhsTypes.Count);
+      for (var i = 0; i < formalTypes.Count; i++) {
+        var formalType = formalTypes[i];
+        var lhsType = lhsTypes[i];
+        if (formalType.IsArrayType && formalType.AsArrayType.Dims == 1 && UserDefinedType.ArrayElementType(formalType).IsTypeParameter) {
+          returnedTypes.Add("java.lang.Object");
+        } else {
+          returnedTypes.Add(TypeName(lhsType, wr, Token.NoToken, boxed: formalTypes.Count > 1));
+        }
+      }
+      if (formalTypes.Count > 1) {
+        wr.Write($"{DafnyTupleClass(formalTypes.Count)}<{Util.Comma(returnedTypes)}> {collectorVarName} = ");
+      } else {
+        wr.Write($"{returnedTypes[0]} {collectorVarName} = ");
+      }
+    }
+    protected override void EmitCastOutParameterSplits(string outCollector, List<string> lhsNames,
+      ConcreteSyntaxTree wr, List<Type> formalTypes, List<Type> lhsTypes, IOrigin tok) {
+      var wOuts = new List<ConcreteSyntaxTree>();
+      for (var i = 0; i < lhsNames.Count; i++) {
+        wr.Write($"{lhsNames[i]} = ");
+        //
+        // Suppose we have:
+        //
+        //   method Foo<A>(a : A) returns (arr : array<A>)
+        //
+        // This is compiled to:
+        //
+        //   public <A> Object Foo(A a)
+        //
+        // (There's also an argument for the type descriptor, but I'm omitting
+        // it for clarity.)  Foo returns Object, not A[], since A could be
+        // primitive and primitives cannot be generic parameters in Java
+        // (*sigh*).  So when we call it:
+        //
+        //   var arr : int[] := Foo(42);
+        //
+        // we have to add a type cast:
+        //
+        //   BigInteger[] arr = (BigInteger[]) Foo(new BigInteger(42));
+        //
+        // Things can get more complicated than this, however.  If the method returns
+        // the array as part of a tuple:
+        //
+        //   method Foo<A>(a : A) returns (pair : (array<A>, array<A>))
+        //
+        // then we get:
+        //
+        //   public <A> Tuple2<Object, Object> Foo(A a)
+        //
+        // and we have to write:
+        //
+        //   BigInteger[] arr = (Pair<BigInteger[], BigInteger[]>) (Object) Foo(new BigInteger(42));
+        //
+        // (Note the extra cast to Object, since Java doesn't allow a cast to
+        // change a type parameter, as that's unsound in general.  It just
+        // happens to be okay here!)
+        //
+        // Rather than try and exhaustively check for all the circumstances
+        // where a cast is necessary, for the moment we just always cast to the
+        // LHS type via Object, which is redundant 99% of the time but not
+        // harmful.
+        if (lhsTypes[i] == null) {
+          wr.Write($"(Object) ");
+        } else {
+          wr.Write($"({TypeName(lhsTypes[i], wr, Token.NoToken)}) (Object) ");
+        }
+
+        if (lhsNames.Count == 1) {
+          wr.Write(outCollector);
+        } else {
+          wr.Write($"{outCollector}.dtor__{i}()");
+        }
+        EndStmt(wr);
+      }
+    }
+
+    protected override void EmitSeqSelect(SingleAssignStmt s0, List<Type> tupleTypeArgsList, ConcreteSyntaxTree wr, string tup) {
+      wr.Write("(");
+      var lhs = (SeqSelectExpr)s0.Lhs;
+      EmitIndexCollectionUpdate(lhs.Seq.Type, out var wColl, out var wIndex, out var wValue, wr, nativeIndex: true);
+      var wCoerce = EmitCoercionIfNecessary(from: NativeObjectType, to: lhs.Seq.Type, tok: s0.Origin, wr: wColl);
+      wCoerce.Write($"({TypeName(lhs.Seq.Type.NormalizeExpand(), wCoerce, s0.Origin)})");
+      EmitTupleSelect(tup, 0, wCoerce);
+      wColl.Write(")");
+      var wCast = EmitCoercionToNativeInt(wIndex);
+      EmitTupleSelect(tup, 1, wCast);
+      wValue.Write($"({TypeName(tupleTypeArgsList[2].NormalizeExpand(), wValue, s0.Origin)})");
+      EmitTupleSelect(tup, 2, wValue);
+      EndStmt(wr);
+    }
+
+    protected override void EmitMultiSelect(SingleAssignStmt s0, List<Type> tupleTypeArgsList, ConcreteSyntaxTree wr, string tup, int L) {
+      var arrayType = tupleTypeArgsList[0];
+      var rhsType = tupleTypeArgsList[L - 1];
+
+      var lhs = (MultiSelectExpr)s0.Lhs;
+      var indices = new List<Action<ConcreteSyntaxTree>>();
+      for (var i = 0; i < lhs.Indices.Count; i++) {
+        var wIndex = new ConcreteSyntaxTree();
+        wIndex.Write("((java.math.BigInteger)");
+        EmitTupleSelect(tup, i + 1, wIndex);
+        wIndex.Write(")");
+        indices.Add(wr => wr.Write(wIndex.ToString()));
+      }
+
+      var (wArray, wRhs) = EmitArrayUpdate(indices, rhsType, wr);
+      wArray = EmitCoercionIfNecessary(from: null, to: arrayType, tok: s0.Origin, wr: wArray);
+      wArray.Write($"({TypeName(arrayType.NormalizeExpand(), wArray, s0.Origin)})");
+      EmitTupleSelect(tup, 0, wArray);
+
+      wRhs.Write($"({TypeName(rhsType, wr, s0.Origin)})");
+      EmitTupleSelect(tup, L - 1, wRhs);
+
+      EndStmt(wr);
+    }
+
+    protected override void WriteCast(string s, ConcreteSyntaxTree wr) {
+      wr.Write($"({s})");
+    }
+
+    protected override ConcreteSyntaxTree EmitIngredients(ConcreteSyntaxTree wr, string ingredients, int L, string tupleTypeArgs, ForallStmt s, SingleAssignStmt s0, Expression rhs) {
+      var wStmts = wr.Fork();
+      var wrVarInit = wr;
+      wrVarInit.Write($"java.util.ArrayList<{DafnyTupleClass(L)}<{tupleTypeArgs}>> {ingredients} = ");
+      Contract.Assert(L <= MaxTupleNonGhostDims);
+      EmitEmptyTupleList(tupleTypeArgs, wrVarInit);
+      var wrOuter = wr;
+      wr = CompileGuardedLoops(s.BoundVars, s.Bounds, s.Range, wr);
+      var wrTuple = EmitAddTupleToList(ingredients, tupleTypeArgs, wr);
+      wrTuple.Write($"{L}<{tupleTypeArgs}>(");
+      if (s0.Lhs is MemberSelectExpr lhs1) {
+        wrTuple.Append(Expr(lhs1.Obj, false, wStmts));
+      } else if (s0.Lhs is SeqSelectExpr lhs2) {
+        wrTuple.Append(Expr(lhs2.Seq, false, wStmts));
+        wrTuple.Write(", ");
+        TrParenExpr(lhs2.E0, wrTuple, false, wStmts);
+      } else {
+        var lhs = (MultiSelectExpr)s0.Lhs;
+        wrTuple.Append(Expr(lhs.Array, false, wStmts));
+        foreach (var t in lhs.Indices) {
+          wrTuple.Write(", ");
+          TrParenExpr(t, wrTuple, false, wStmts);
+        }
+      }
+
+      wrTuple.Write(", ");
+      if (rhs is MultiSelectExpr) {
+        Type t = rhs.Type.NormalizeExpand();
+        wrTuple.Write($"({TypeName(t, wrTuple, rhs.Origin)})");
+      }
+
+      wrTuple.Append(Expr(rhs, false, wStmts));
+      return wrOuter;
+    }
+
+    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
+      if (Options.IncludeRuntime) {
+        EmitRuntimeSource("DafnyRuntimeJava", wr);
+      }
+      if (Options.Get(CommonOptionBag.UseStandardLibraries) && Options.Get(CommonOptionBag.TranslateStandardLibrary)) {
+        EmitRuntimeSource("DafnyStandardLibraries_java", wr);
+      }
+      wr.WriteLine($"// Dafny program {program.Name} compiled into Java");
+      ModuleName = program.MainMethod != null ? "main" : Path.GetFileNameWithoutExtension(program.Name);
+      wr.WriteLine();
+    }
+
+    protected override void EmitBuiltInDecls(SystemModuleManager systemModuleManager, ConcreteSyntaxTree wr) {
+      switch (Options.SystemModuleTranslationMode) {
+        case CommonOptionBag.SystemModuleMode.Omit: {
+            CheckCommonSytemModuleLimits(systemModuleManager);
+            return;
+          }
+        case CommonOptionBag.SystemModuleMode.OmitAllOtherModules: {
+            CheckSystemModulePopulatedToCommonLimits(systemModuleManager);
+            break;
+          }
+      }
+
+      foreach (var kv in systemModuleManager.ArrowTypeDecls) {
+        var arity = kv.Key;
+        CreateLambdaFunctionInterface(arity, wr);
+      }
+
+      foreach (var decl in systemModuleManager.SystemModule.TopLevelDecls) {
+        if (decl is ArrayClassDecl classDecl) {
+          var dims = classDecl.Dims;
+          CreateDafnyArrays(dims, wr);
+        }
+      }
+    }
+
+    public static string TransformToClassName(string baseName) {
+      baseName = PublicIdProtectAux(baseName);
+      var sanitizedName = Regex.Replace(baseName, "[^_A-Za-z0-9$]", "_");
+      if (!Regex.IsMatch(sanitizedName, "^[_A-Za-z]")) {
+        sanitizedName = "_" + sanitizedName;
+      }
+      return sanitizedName;
+    }
+
+    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
+      var className = TransformToClassName(baseName);
+      wr = wr.NewBlock($"public class {className}");
+
+      var companion = TypeName_Companion(UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(mainMethod.EnclosingClass), wr, mainMethod.Origin, mainMethod);
+      var wBody = wr.NewNamedBlock("public static void main(String[] args)");
+      var modName = mainMethod.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options) == "_module" ? "_System." : "";
+      companion = modName + companion;
+      Coverage.EmitSetup(wBody);
+      wBody.WriteLine($"{DafnyHelpersClass}.withHaltHandling(() -> {{ {companion}.__Main({DafnyHelpersClass}.{CharMethodQualifier}FromMainArguments(args)); }} );");
+      Coverage.EmitTearDown(wBody);
+    }
+
+
+    string IdProtectModule(string moduleName) {
+      return string.Join(".", moduleName.Split(".").Select(IdProtect));
+    }
+
+    protected override ConcreteSyntaxTree CreateModule(ModuleDefinition module, string moduleName, bool isDefault,
+      ModuleDefinition externModule,
+      string libraryName /*?*/, Attributes moduleAttributes, ConcreteSyntaxTree wr) {
+      moduleName = IdProtectModule(moduleName);
+      if (isDefault) {
+        // Fold the default module into the main module
+        moduleName = "_System";
+      }
+      var pkgName = libraryName ?? IdProtect(moduleName);
+      var path = pkgName.Replace('.', '/');
+      ModuleName = IdProtect(moduleName);
+      ModulePath = path;
+      return wr;
+    }
+
+    protected override void FinishModule() {
+    }
+
+    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
+      var cw = (ClassWriter)CreateClass(IdProtect(sst.EnclosingModuleDefinition.GetCompileName(Options)), sst, wr);
+      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        var sw = new ConcreteSyntaxTree(cw.InstanceMemberWriter.RelativeIndentLevel);
+        var wStmts = cw.InstanceMemberWriter.Fork();
+        sw.Append(Expr(sst.Witness, false, wStmts));
+        var witness = sw.ToString();
+        var typeName = TypeName(sst.Rhs, cw.StaticMemberWriter, sst.Origin);
+        if (sst.TypeArgs.Count == 0) {
+          cw.DeclareField("Witness", sst, true, true, sst.Rhs, sst.Origin, witness, null);
+          witness = "Witness";
+        }
+        cw.StaticMemberWriter.Write($"public static {TypeParameters(sst.TypeArgs, " ")}{typeName} defaultValue(");
+        var typeDescriptorParams = sst.TypeArgs.Where(NeedsTypeDescriptor);
+        cw.StaticMemberWriter.Write(typeDescriptorParams.Comma(TypeDescriptorVariableDeclaration));
+        var w = cw.StaticMemberWriter.NewBlock(")");
+        w.WriteLine($"return {witness};");
+      }
+
+      GenerateIsMethod(sst, cw.StaticMemberWriter);
+    }
+
+    private string TypeDescriptorVariableDeclaration(TypeParameter tp) {
+      return $"{DafnyTypeDescriptor}<{tp.GetCompileName(Options)}> {FormatTypeDescriptorVariable(tp.GetCompileName(Options))}";
+    }
+
+    protected class ClassWriter : IClassWriter {
+      public readonly JavaCodeGenerator CodeGenerator;
+      public readonly ConcreteSyntaxTree InstanceMemberWriter;
+      public readonly ConcreteSyntaxTree StaticMemberWriter;
+      public readonly ConcreteSyntaxTree CtorBodyWriter;
+
+      public ClassWriter(JavaCodeGenerator codeGenerator, ConcreteSyntaxTree instanceMemberWriter, ConcreteSyntaxTree ctorBodyWriter, ConcreteSyntaxTree staticMemberWriter = null) {
+        Contract.Requires(codeGenerator != null);
+        Contract.Requires(instanceMemberWriter != null);
+        this.CodeGenerator = codeGenerator;
+        this.InstanceMemberWriter = instanceMemberWriter;
+        this.CtorBodyWriter = ctorBodyWriter;
+        this.StaticMemberWriter = staticMemberWriter ?? instanceMemberWriter;
+      }
+
+      public ConcreteSyntaxTree Writer(bool isStatic, bool createBody, MemberDecl/*?*/ member) {
+        if (createBody) {
+          if (isStatic || (member != null && member.EnclosingClass is TraitDecl && CodeGenerator.NeedsCustomReceiver(member))) {
+            return StaticMemberWriter;
+          }
+        }
+        return InstanceMemberWriter;
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        return CodeGenerator.CreateMethod(m, typeArgs, createBody, Writer(m.IsStatic, createBody, m), forBodyInheritance, lookasideBody);
+      }
+
+      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        throw new UnsupportedFeatureException(m.Origin, Feature.MethodSynthesis);
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
+        return CodeGenerator.CreateFunction(name, typeArgs, formals, resultType, tok, isStatic, createBody, member, Writer(isStatic, createBody, member), forBodyInheritance, lookasideBody);
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IOrigin tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance) {
+        return CodeGenerator.CreateGetter(name, resultType, tok, isStatic, createBody, Writer(isStatic, createBody, member));
+      }
+      public ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
+        return CodeGenerator.CreateGetterSetter(name, resultType, tok, createBody, out setterWriter, Writer(false, createBody, member));
+      }
+      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs, Field field) {
+        CodeGenerator.DeclareField(name, isStatic, isConst, type, tok, rhs, this);
+      }
+      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
+        throw new cce.UnreachableException();  // InitializeField should be called only for those compilers that set ClassesRedeclareInheritedFields to false.
+      }
+      public ConcreteSyntaxTree/*?*/ ErrorWriter() => InstanceMemberWriter;
+
+      public void Finish() { }
+    }
+
+    protected override bool SupportsStaticsInGenericClasses => false;
+
+    protected ConcreteSyntaxTree CreateGetter(string name, Type resultType, IOrigin tok, bool isStatic,
+      bool createBody, ConcreteSyntaxTree wr) {
+      wr.Write("public {0}{1} {2}()", isStatic ? "static " : "", TypeName(resultType, wr, tok), name);
+      if (createBody) {
+        var w = wr.NewBlock("", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
+        return w;
+      } else {
+        wr.WriteLine(";");
+        return null;
+      }
+    }
+
+    protected override void DeclareLocalVar(string name, Type /*?*/ type, IOrigin /*?*/ tok, Expression rhs,
+        bool inLetExprBody, ConcreteSyntaxTree wr) {
+      if (type == null) {
+        type = rhs.Type;
+      }
+      var wStmts = wr.Fork();
+      var w = DeclareLocalVar(name, type, tok, wr);
+      w.Append(Expr(rhs, inLetExprBody, wStmts));
+    }
+
+    public ConcreteSyntaxTree /*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok,
+      bool createBody, out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree wr) {
+      wr.Write($"public {TypeName(resultType, wr, tok)} {name}()");
+      ConcreteSyntaxTree wGet = null;
+      if (createBody) {
+        wGet = wr.NewBlock("", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
+      } else {
+        wr.WriteLine(";");
+      }
+      wr.Write($"public void set_{name}({TypeName(resultType, wr, tok)} value)");
+      if (createBody) {
+        setterWriter = wr.NewBlock("", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
+      } else {
+        wr.WriteLine(";");
+        setterWriter = null;
+      }
+      return wGet;
+    }
+    protected ConcreteSyntaxTree CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
+      if (!createBody && (m.IsStatic || m is Constructor)) {
+        // No need for an abstract version of a static method or a constructor
+        return null;
+      }
+      string targetReturnTypeReplacement = null;
+      int nonGhostOuts = 0;
+      int nonGhostIndex = 0;
+      for (int i = 0; i < m.Outs.Count; i++) {
+        if (!m.Outs[i].IsGhost) {
+          nonGhostOuts += 1;
+          nonGhostIndex = i;
+        }
+      }
+      if (nonGhostOuts == 1) {
+        targetReturnTypeReplacement = TypeName(m.Outs[nonGhostIndex].Type, wr, m.Outs[nonGhostIndex].Origin);
+      } else if (nonGhostOuts > 1) {
+        targetReturnTypeReplacement = DafnyTupleClass(nonGhostOuts);
+      }
+      var customReceiver = createBody && !forBodyInheritance && NeedsCustomReceiver(m);
+      var receiverType = UserDefinedType.FromTopLevelDecl(m.Origin, m.EnclosingClass);
+      foreach (var instrumenter in Instrumenters) {
+        instrumenter.BeforeMethod(m, wr);
+      }
+      wr.Write("public {0}{1}", !createBody && !(m.EnclosingClass is TraitDecl) ? "abstract " : "", m.IsStatic || customReceiver ? "static " : "");
+      wr.Write(TypeParameters(TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, m, lookasideBody)), " "));
+      wr.Write("{0} {1}", targetReturnTypeReplacement ?? "void", IdName(m));
+      wr.Write("(");
+      var sep = "";
+      WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, m.EnclosingClass, m, lookasideBody), wr, ref sep,
+        TypeDescriptorVariableDeclaration);
+      if (customReceiver) {
+        DeclareFormal(sep, "_this", receiverType, m.Origin, true, wr);
+        sep = ", ";
+      }
+      WriteFormals(sep, m.Ins, wr);
+      if (!createBody) {
+        wr.WriteLine(");");
+        return null; // We do not want to write a function body, so instead of returning a BTW, we return null.
+      } else {
+        return wr.NewBlock(")", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitMethodReturns(Method m, ConcreteSyntaxTree wr) {
+      int nonGhostOuts = 0;
+      foreach (var t in m.Outs) {
+        if (t.IsGhost) {
+          continue;
+        }
+
+        nonGhostOuts += 1;
+        break;
+      }
+      if (!m.Body.Body.OfType<ReturnStmt>().Any() && (nonGhostOuts > 0 || m.IsTailRecursive)) { // If method has out parameters or is tail-recursive but no explicit return statement in Dafny
+        var beforeReturn = wr.NewBlock("if(true)"); // Ensure no unreachable error is thrown for the return statement
+        EmitReturn(m.Outs, wr);
+        return beforeReturn;
+      }
+      return wr;
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs,
+      List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member,
+      ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
+      if (!createBody && isStatic) {
+        // No need for abstract version of static method
+        return null;
+      }
+      var customReceiver = createBody && !forBodyInheritance && NeedsCustomReceiver(member);
+      var receiverType = UserDefinedType.FromTopLevelDecl(member.Origin, member.EnclosingClass);
+      wr.Write("public {0}{1}", !createBody && !(member.EnclosingClass is TraitDecl) ? "abstract " : "", isStatic || customReceiver ? "static " : "");
+      wr.Write(TypeParameters(TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, member, lookasideBody)), " "));
+      wr.Write($"{TypeName(resultType, wr, tok)} {name}(");
+      var sep = "";
+      var argCount = WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, lookasideBody), wr, ref sep, TypeDescriptorVariableDeclaration);
+      if (customReceiver) {
+        DeclareFormal(sep, "_this", receiverType, tok, true, wr);
+        sep = ", ";
+        argCount++;
+      }
+      argCount += WriteFormals(sep, formals, wr);
+      if (!createBody) {
+        wr.WriteLine(");");
+        return null; // We do not want to write a function body, so instead of returning a BTW, we return null.
+      } else {
+        ConcreteSyntaxTree w;
+        if (argCount > 1) {
+          w = wr.NewBlock(")", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
+        } else {
+          w = wr.NewBlock(")");
+        }
+        return w;
+      }
+    }
+
+    protected void DeclareField(string name, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs, ClassWriter cw) {
+      if (isStatic) {
+        var r = rhs ?? DefaultValue(type, cw.StaticMemberWriter, tok);
+        var t = StripTypeParameters(TypeName(type, cw.StaticMemberWriter, tok));
+        cw.StaticMemberWriter.WriteLine($"public static {t} {name} = {r};");
+      } else {
+        Contract.Assert(cw.CtorBodyWriter != null, "Unexpected instance field");
+        cw.InstanceMemberWriter.WriteLine("public {0} {1};", TypeName(type, cw.InstanceMemberWriter, tok), name);
+        cw.CtorBodyWriter.WriteLine("this.{0} = {1};", name, rhs ?? PlaceboValue(type, cw.CtorBodyWriter, tok));
+      }
+    }
+
+    private string StripTypeParameters(string s) {
+      Contract.Requires(s != null);
+      return Regex.Replace(s, @"<.+>", "");
+    }
+
+    private void EmitSuppression(ConcreteSyntaxTree wr) {
+      wr.WriteLine("@SuppressWarnings({\"unchecked\", \"deprecation\"})");
+    }
+
+    string TypeParameters(List<TypeParameter>/*?*/ targs, string suffix = "") {
+      Contract.Requires(targs == null || cce.NonNullElements(targs));
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      if (targs == null || targs.Count == 0) {
+        return "";  // ignore suffix
+      }
+      return $"<{Util.Comma(targs, IdName)}>{suffix}";
+    }
+
+    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member = null) {
+      return TypeName(type, wr, tok, boxed: false, member);
+    }
+
+    private string BoxedTypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      return TypeName(type, wr, tok, boxed: true);
+    }
+
+    private string ActualTypeArgument(Type type, TypeParameter.TPVariance variance, ConcreteSyntaxTree wr, IOrigin tok) {
+      Contract.Requires(type != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(tok != null);
+      var typeName = BoxedTypeName(type, wr, tok);
+      if (variance == TypeParameter.TPVariance.Co) {
+        return "? extends " + typeName;
+      } else if (variance == TypeParameter.TPVariance.Contra) {
+        if (type.IsRefType) {
+          return "? super " + typeName;
+        }
+      }
+      return typeName;
+    }
+
+    private string BoxedTypeNames(List<Type> types, ConcreteSyntaxTree wr, IOrigin tok) {
+      return Util.Comma(types, t => BoxedTypeName(t, wr, tok));
+    }
+
+    protected override string TypeArgumentName(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      return BoxedTypeName(type, wr, tok);
+    }
+
+    private string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool boxed, MemberDecl /*?*/ member = null) {
+      return TypeName(type, wr, tok, boxed, false, member);
+    }
+
+    private string CharTypeName(bool boxed) {
+      if (UnicodeCharEnabled) {
+        return boxed ? "dafny.CodePoint" : "int";
+      } else {
+        return boxed ? "Character" : "char";
+      }
+    }
+
+    private string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool boxed, bool erased, MemberDecl/*?*/ member = null) {
+      Contract.Ensures(Contract.Result<string>() != null);
+      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
+
+      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
+      if (xType is BoolType) {
+        return boxed ? "Boolean" : "boolean";
+      } else if (xType is CharType) {
+        return CharTypeName(boxed);
+      } else if (xType is IntType or BigOrdinalType) {
+        return "java.math.BigInteger";
+      } else if (xType is RealType) {
+        return DafnyBigRationalClass;
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        return t.NativeType != null ? GetNativeTypeName(t.NativeType, boxed) : "java.math.BigInteger";
+      } else if (member == null && xType.AsNewtype != null) {
+        var newtypeDecl = xType.AsNewtype;
+        if (newtypeDecl.NativeType is { } nativeType) {
+          return GetNativeTypeName(nativeType, boxed);
+        }
+        return TypeName(newtypeDecl.ConcreteBaseType(xType.TypeArgs), wr, tok, boxed, erased);
+      } else if (xType.IsObjectQ) {
+        return "Object";
+      } else if (xType.IsArrayType) {
+        ArrayClassDecl at = xType.AsArrayType;
+        Contract.Assert(at != null);  // follows from type.IsArrayType
+        Type elType = UserDefinedType.ArrayElementType(xType);
+        return ArrayTypeName(elType, at.Dims, wr, tok, erased);
+      } else if (xType is UserDefinedType udt) {
+        if (udt.ResolvedClass is TypeParameter tp) {
+          if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(tp, out var instantiatedTypeParameter)) {
+            return TypeName(instantiatedTypeParameter, wr, tok, true, member);
+          }
+        }
+        var s = FullTypeName(udt, member);
+        if (s.Equals("string")) {
+          return "String";
+        }
+        var cl = udt.ResolvedClass;
+        if (cl is TupleTypeDecl tupleDecl) {
+          s = DafnyTupleClass(tupleDecl.NonGhostDims);
+        }
+        // When accessing a static member, leave off the type arguments
+        if (member != null) {
+          return TypeName_UDT(s, new List<TypeParameter.TPVariance>(), new List<Type>(), wr, udt.Origin, erased);
+        } else {
+          return TypeName_UDT(s, udt, wr, udt.Origin, erased);
+        }
+      } else if (xType is SetType) {
+        var argType = ((SetType)xType).Arg;
+        if (erased) {
+          return DafnySetClass;
+        }
+        return $"{DafnySetClass}<{ActualTypeArgument(argType, TypeParameter.TPVariance.Co, wr, tok)}>";
+      } else if (xType is SeqType) {
+        var argType = ((SeqType)xType).Arg;
+        if (erased) {
+          return DafnySeqClass;
+        }
+        return $"{DafnySeqClass}<{ActualTypeArgument(argType, TypeParameter.TPVariance.Co, wr, tok)}>";
+      } else if (xType is MultiSetType) {
+        var argType = ((MultiSetType)xType).Arg;
+        if (erased) {
+          return DafnyMultiSetClass;
+        }
+        return $"{DafnyMultiSetClass}<{ActualTypeArgument(argType, TypeParameter.TPVariance.Co, wr, tok)}>";
+      } else if (xType is MapType) {
+        var domType = ((MapType)xType).Domain;
+        var ranType = ((MapType)xType).Range;
+        if (erased) {
+          return DafnyMapClass;
+        }
+        return $"{DafnyMapClass}<{ActualTypeArgument(domType, TypeParameter.TPVariance.Co, wr, tok)}, {ActualTypeArgument(ranType, TypeParameter.TPVariance.Co, wr, tok)}>";
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    string ArrayTypeName(Type elType, int dims, ConcreteSyntaxTree wr, IOrigin tok, bool erased) {
+      elType = DatatypeWrapperEraser.SimplifyType(Options, elType);
+      if (dims > 1) {
+        if (erased) {
+          return DafnyMultiArrayClass(dims);
+        } else {
+          return $"{DafnyMultiArrayClass(dims)}<{ActualTypeArgument(elType, TypeParameter.TPVariance.Non, wr, tok)}>";
+        }
+      } else if (elType.IsTypeParameter) {
+        return "java.lang.Object";
+      } else {
+        return $"{TypeName(elType, wr, tok, false, erased)}[]";
+      }
+    }
+
+    protected string CollectionTypeUnparameterizedName(CollectionType ct) {
+      if (ct is SeqType) {
+        return DafnySeqClass;
+      } else if (ct is SetType) {
+        return DafnySetClass;
+      } else if (ct is MultiSetType) {
+        return DafnyMultiSetClass;
+      } else if (ct is MapType) {
+        return DafnyMapClass;
+      } else {
+        Contract.Assert(false);  // unexpected collection type
+        throw new cce.UnreachableException();  // to please the compiler
+      }
+    }
+
+    protected override string FullTypeName(UserDefinedType udt, MemberDecl /*?*/ member = null) {
+      return FullTypeName(udt, member, false);
+    }
+
+    protected string FullTypeName(UserDefinedType udt, MemberDecl member, bool useCompanionName) {
+      Contract.Requires(udt != null);
+      if (udt.IsBuiltinArrowType) {
+        return DafnyFunctionIface(udt.TypeArgs.Count - 1);
+      }
+
+      if (member != null && member.IsExtern(Options, out var qualification, out _) && qualification != null) {
+        return qualification;
+      }
+      var cl = udt.ResolvedClass;
+      if (cl is NonNullTypeDecl nntd) {
+        cl = nntd.Class;
+      }
+      if (cl is TypeParameter) {
+        return IdProtect(udt.GetCompileName(Options));
+      } else if (cl is TupleTypeDecl tupleDecl) {
+        return DafnyTupleClass(tupleDecl.NonGhostDims);
+      } else if (cl is TraitDecl && useCompanionName) {
+        return IdProtect(udt.GetFullCompanionCompileName(Options));
+      } else if (cl.EnclosingModuleDefinition.GetCompileName(Options) == ModuleName || cl.EnclosingModuleDefinition.TryToAvoidName) {
+        return IdProtect(cl.GetCompileName(Options));
+      } else {
+        return IdProtectModule(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdProtect(cl.GetCompileName(Options));
+      }
+    }
+
+    protected override void TypeName_SplitArrayName(Type type, out Type innermostElementType, out string brackets) {
+      Contract.Requires(type != null);
+
+      type = DatatypeWrapperEraser.SimplifyType(Options, type);
+      var at = type.AsArrayType;
+      if (at != null && at.Dims == 1 && !DatatypeWrapperEraser.SimplifyType(Options, type.TypeArgs[0]).IsTypeParameter) {
+        TypeName_SplitArrayName(type.TypeArgs[0], out innermostElementType, out brackets);
+        brackets = TypeNameArrayBrackets(at.Dims) + brackets;
+      } else {
+        innermostElementType = type;
+        brackets = "";
+      }
+    }
+
+    protected override string TypeNameArrayBrackets(int dims) {
+      return Util.Repeat(dims, "[]");
+    }
+
+    protected override bool DeclareFormal(string prefix, string name, Type type, IOrigin tok, bool isInParam, ConcreteSyntaxTree wr) {
+      if (!isInParam) {
+        return false;
+      }
+
+      wr.Write($"{prefix}{TypeName(type, wr, tok)} {name}");
+      return true;
+    }
+
+    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
+      ConcreteSyntaxTree wr, IOrigin tok, bool omitTypeArguments) {
+      Contract.Assume(fullCompileName != null);  // precondition; this ought to be declared as a Requires in the superclass
+      Contract.Assume(variance != null);  // precondition; this ought to be declared as a Requires in the superclass
+      Contract.Assume(typeArgs != null);  // precondition; this ought to be declared as a Requires in the superclass
+      Contract.Assume(variance.Count == typeArgs.Count);
+      string s = IdProtect(fullCompileName);
+      if (typeArgs.Count != 0 && !omitTypeArguments) {
+        s += "<" + BoxedTypeNames(typeArgs, wr, tok) + ">";
+      }
+      return s;
+    }
+
+    // We write an extern class as a base class that the actual extern class
+    // needs to extend, so the extern methods and functions need to be abstract
+    // in the base class
+    protected override bool IncludeExternallyImportedMembers => true;
+
+    //
+    // An example to show how type parameters are dealt with:
+    //
+    //   class Class<T /* needs auto-initializer */, U /* does not */> {
+    //     private String sT; // type descriptor for T
+    //
+    //     // Fields are assigned in the constructor because some will
+    //     // depend on a type parameter
+    //     public T t;
+    //     public U u;
+    //
+    //     public Class(String sT) {
+    //       this.sT = sT;
+    //       this.t = dafny.Helpers.getDefault(sT);
+    //       // Note: The field must be assigned a real value before being read!
+    //       this.u = null;
+    //     }
+    //
+    //     public __ctor(U u) {
+    //       this.u = u;
+    //     }
+    //   }
+    //
+    protected override IClassWriter CreateClass(string moduleName, bool isExtern, string /*?*/ fullPrintName,
+      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type> /*?*/ superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+      var name = IdName(cls);
+      var javaName = isExtern ? FormatExternBaseClassName(name) : name;
+      var filename = $"{ModulePath}/{javaName}.java";
+      var w = wr.NewFile(filename);
+      w.WriteLine($"// Class {javaName}");
+      w.WriteLine($"// Dafny class {name} compiled into Java");
+      w.WriteLine($"package {ModuleName};");
+      w.WriteLine();
+      //TODO: Fix implementations so they do not need this suppression
+      EmitSuppression(w);
+      foreach (var instrumenter in Instrumenters) {
+        instrumenter.BeforeClass(cls, w);
+      }
+      var abstractness = isExtern ? "abstract " : "";
+      w.Write($"public {abstractness}class {javaName}{TypeParameters(typeParameters)}");
+      string sep;
+      // Since Java does not support multiple inheritance, we are assuming a list of "superclasses" is a list of interfaces
+      if (superClasses != null) {
+        sep = " implements ";
+        foreach (var trait in superClasses) {
+          if (!trait.IsObject) {
+            w.Write($"{sep}{TypeName(trait, w, tok)}");
+            sep = ", ";
+          }
+        }
+      }
+      var wBody = w.NewBlock("");
+      var wTypeFields = wBody.Fork();
+
+      wBody.Write($"public {javaName}(");
+      var wCtorParams = wBody.Fork();
+      var wCtorBody = wBody.NewBlock(")", "");
+
+      EmitTypeDescriptorsForClass(typeParameters, cls, wTypeFields, wCtorParams, null, wCtorBody);
+
+      // make sure the (static fields associated with the) type method come after the Witness static field
+      var wTypeMethod = wBody;
+      var wRestOfBody = wBody.Fork();
+      if (cls is DefaultClassDecl || (
+            (cls is ClassLikeDecl and not ArrayClassDecl) &&
+            !Options.Get(JavaBackend.LegacyDataConstructors))) {
+        // don't emit a type-descriptor method
+      } else {
+        EmitTypeDescriptorMethod(cls, typeParameters, null, null, wTypeMethod);
+      }
+
+      if (fullPrintName != null) {
+        // By emitting a toString() method, printing an object will give the same output as with other target languages.
+        EmitToString(fullPrintName, wBody);
+      }
+
+      return new ClassWriter(this, wRestOfBody, wCtorBody);
+    }
+
+    /// <summary>
+    /// For each type parameter X in "typeParametersForClass" that needs a type descriptor,
+    ///   * Write "protected TypeDescriptor<X> _td_X;" to wTypeFields
+    ///     -- each entry is terminated by a newline
+    ///   * Write "TypeDescriptor<X> _td_X" to wCtorParams
+    ///     -- entries are separated by a comma
+    ///   * Write "_td_X" to wCallArguments
+    ///     -- entries are separated by a comma
+    ///   * Write "this._td_X := _td_X;" to wCtorBody
+    ///     -- each entry is terminated by a newline
+    /// Any of the writer parameters may be null, so long as at least one is non-null.
+    /// The method returns the number type descriptors written.
+    /// </summary>
+    int EmitTypeDescriptorsForClass(List<TypeParameter> typeParametersForClass, TopLevelDecl cls,
+      [CanBeNull] ConcreteSyntaxTree wTypeFields, [CanBeNull] ConcreteSyntaxTree wCtorParams,
+      [CanBeNull] ConcreteSyntaxTree wCallArguments, [CanBeNull] ConcreteSyntaxTree wCtorBody,
+      string namePrefix = null) {
+
+      namePrefix ??= "";
+
+      var wError = wTypeFields ?? wCtorParams ?? wCallArguments ?? wCtorBody;
+      int numberOfEmittedTypeDescriptors = 0;
+      if (typeParametersForClass != null) {
+        var sep = "";
+        foreach (var ta in TypeArgumentInstantiation.ListFromFormals(typeParametersForClass)) {
+          if (NeedsTypeDescriptor(ta.Formal)) {
+            var fieldName = FormatTypeDescriptorVariable(ta.Formal.GetCompileName(Options));
+            var paramName = TypeDescriptor(ta.Actual, wError, ta.Formal.Origin);
+            var decl = $"{DafnyTypeDescriptor}<{namePrefix}{BoxedTypeName(ta.Actual, wError, ta.Formal.Origin)}> {fieldName}";
+
+            wTypeFields?.WriteLine($"protected {decl};");
+            if (ta.Formal.Parent == cls) {
+              wCtorParams?.Write($"{sep}{decl}");
+            }
+            wCtorBody?.WriteLine($"this.{fieldName} = {paramName};");
+            wCallArguments?.Write($"{sep}{paramName}");
+
+            sep = ", ";
+            numberOfEmittedTypeDescriptors++;
+          }
+        }
+      }
+      return numberOfEmittedTypeDescriptors;
+    }
+
+    private void EmitToString(string fullPrintName, ConcreteSyntaxTree wr) {
+      wr.WriteLine("@Override");
+      wr.NewBlock("public java.lang.String toString()")
+        .WriteLine($"return \"{fullPrintName}\";");
+    }
+
+    /// <summary>
+    /// Generate the "_typeDescriptor" method for a generated class.
+    /// "enclosingType" is allowed to be "null", in which case the target values are assumed to be references.
+    /// If "enclosingType" is null, then "targetTypeName" is expected to be the name of the Java type representing the type.
+    /// If "enclosingType" is non-null, then "targetTypeName" is expected to be null.
+    /// </summary>
+    private void EmitTypeDescriptorMethod([CanBeNull] TopLevelDecl enclosingTypeDecl, List<TypeParameter> typeParams, string targetTypeName,
+      [CanBeNull] string initializer, ConcreteSyntaxTree wr) {
+      Contract.Requires((enclosingTypeDecl != null) != (targetTypeName != null));
+
+      string typeDescriptorExpr;
+      if (enclosingTypeDecl == null) {
+        Contract.Assert(targetTypeName != null);
+        // use reference type
+        typeDescriptorExpr = $"{DafnyTypeDescriptor}.referenceWithInitializer({StripTypeParameters(targetTypeName)}.class, () -> {initializer ?? "null"})";
+      } else {
+        Contract.Assert(targetTypeName == null);
+        var enclosingTypeWithItsOwnTypeArguments = UserDefinedType.FromTopLevelDecl(enclosingTypeDecl.Origin, enclosingTypeDecl);
+        var targetType = DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(Options, enclosingTypeWithItsOwnTypeArguments);
+        var targetTypeIgnoringConstraints = DatatypeWrapperEraser.SimplifyType(Options, enclosingTypeWithItsOwnTypeArguments).GetRuntimeType();
+        targetTypeName = BoxedTypeName(targetTypeIgnoringConstraints, wr, enclosingTypeDecl.Origin);
+        var w = (enclosingTypeDecl as RedirectingTypeDecl)?.Witness != null ? "Witness" : null;
+        switch (AsJavaNativeType(targetType)) {
+          case JavaNativeType.Byte:
+            typeDescriptorExpr = $"{DafnyTypeDescriptor}.byteWithDefault({w ?? "(byte)0"})";
+            break;
+          case JavaNativeType.Short:
+            typeDescriptorExpr = $"{DafnyTypeDescriptor}.shortWithDefault({w ?? "(short)0"})";
+            break;
+          case JavaNativeType.Int:
+            typeDescriptorExpr = $"{DafnyTypeDescriptor}.intWithDefault({w ?? "0"})";
+            break;
+          case JavaNativeType.Long:
+            typeDescriptorExpr = $"{DafnyTypeDescriptor}.longWithDefault({w ?? "0L"})";
+            break;
+          case null:
+            if (targetTypeIgnoringConstraints.IsBoolType) {
+              typeDescriptorExpr = $"{DafnyTypeDescriptor}.booleanWithDefault({w ?? "false"})";
+            } else if (targetTypeIgnoringConstraints.IsCharType) {
+              if (UnicodeCharEnabled) {
+                typeDescriptorExpr = $"{DafnyTypeDescriptor}.unicodeCharWithDefault((int){w ?? CharType.DefaultValueAsString})";
+              } else {
+                typeDescriptorExpr = $"{DafnyTypeDescriptor}.charWithDefault({w ?? CharType.DefaultValueAsString})";
+              }
+            } else {
+              var d = initializer ?? DefaultValue(targetType, wr, enclosingTypeDecl.Origin, true);
+              // We'd like to say, essentially, targetTypeName.class. But this is not legal Java if targetTypeName is a type parameter.
+              // So, we detect that case here and use the corresponding type descriptor instead (because method
+              // referenceWithInitializerAndTypeDescriptor will use the .boxedClass of that type descriptor, which gives the Class<T> object
+              // we're looking for).
+              var tp = targetTypeIgnoringConstraints.AsTypeParameter;
+              if (tp == null) {
+                typeDescriptorExpr = $"{DafnyTypeDescriptor}.<{targetTypeName}>referenceWithInitializer({StripTypeParameters(targetTypeName)}.class, () -> {d})";
+              } else {
+                var td = FormatTypeDescriptorVariable(tp.GetCompileName(Options));
+                typeDescriptorExpr = $"{DafnyTypeDescriptor}.<{targetTypeName}>referenceWithInitializerAndTypeDescriptor({td}, () -> {d})";
+              }
+            }
+            break;
+          default:
+            Contract.Assert(false); // unexpected case
+            throw new cce.UnreachableException();
+        }
+      }
+
+      if (typeParams.Count == 0) {
+        // a static context in Java does not see the enclosing type parameters
+        wr.WriteLine($"private static final {DafnyTypeDescriptor}<{targetTypeName}> _TYPE = {typeDescriptorExpr};");
+        typeDescriptorExpr = "_TYPE";
+      }
+      wr.Write($"public static {TypeParameters(typeParams, " ")}{DafnyTypeDescriptor}<{targetTypeName}> {TypeMethodName}(");
+      EmitTypeDescriptorsForClass(typeParams, enclosingTypeDecl, null, wr, null, null);
+      var wTypeMethodBody = wr.NewBlock(")", "");
+      var typeDescriptorCast = $"({DafnyTypeDescriptor}<{targetTypeName}>) ({DafnyTypeDescriptor}<?>)";
+      wTypeMethodBody.WriteLine($"return {typeDescriptorCast} {typeDescriptorExpr};");
+    }
+
+    private string CastIfSmallNativeType(Type t) {
+      var nt = AsNativeType(t);
+      return nt == null ? "" : CastIfSmallNativeType(nt);
+    }
+
+    private string CastIfSmallNativeType(NativeType nt) {
+      switch (AsJavaNativeType(nt)) {
+        case JavaNativeType.Byte: return "(byte) ";
+        case JavaNativeType.Short: return "(short) ";
+        case JavaNativeType.Long: return "(long) ";
+        default: return "";
+      }
+    }
+
+    private static string TranslateEscapes(string s) {
+      s = Util.ReplaceNullEscapesWithCharacterEscapes(s);
+
+      s = Util.UnicodeEscapesToUtf16Escapes(s);
+
+      // Java \u escapes are translated before parsing, so we need to convert to escapes
+      // that aren't for characters that will mess up paring the string or character literal.
+      s = Util.ReplaceTokensWithEscapes(s, Util.Utf16Escape, match => {
+        return match.Value switch {
+          "\\u000a" => "\\n",
+          "\\u000d" => "\\r",
+          "\\u0022" => "\\\"",
+          "\\u0027" => "\\\'",
+          "\\u005c" => "\\\\",
+          _ => match.Value
+        };
+      });
+
+      return s;
+    }
+
+    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
+      if (e is StaticReceiverExpr) {
+        wr.Write(TypeName(e.Type, wr, e.Origin));
+      } else if (e.Value == null) {
+        wr.Write($"({TypeName(e.Type, wr, e.Origin)}) null");
+      } else if (e.Value is bool value) {
+        wr.Write(value ? "true" : "false");
+      } else if (e is CharLiteralExpr) {
+        var v = (string)e.Value;
+        if (UnicodeCharEnabled && Util.MightContainNonAsciiCharacters(v, false)) {
+          wr.Write($"{Util.UnescapedCharacters(Options, v, false).Single()}");
+        } else {
+          wr.Write($"'{TranslateEscapes(v)}'");
+        }
+      } else if (e is StringLiteralExpr str) {
+        wr.Write(UnicodeCharEnabled ? $"{DafnySeqClass}.asUnicodeString(" : $"{DafnySeqClass}.asString(");
+        TrStringLiteral(str, wr);
+        wr.Write(")");
+      } else if (AsNativeType(e.Type) is { } nativeType) {
+        EmitNativeIntegerLiteral((BigInteger)e.Value, nativeType, wr);
+      } else if (e.Value is BigInteger i) {
+        if (i.IsZero) {
+          wr.Write("java.math.BigInteger.ZERO");
+        } else if (i.IsOne) {
+          wr.Write("java.math.BigInteger.ONE");
+        } else if (long.MinValue <= i && i <= long.MaxValue) {
+          wr.Write($"java.math.BigInteger.valueOf({i}L)");
+        } else {
+          wr.Write($"new java.math.BigInteger(\"{i}\")");
+        }
+      } else if (e.Value is BaseTypes.BigDec n) {
+        if (0 <= n.Exponent) {
+          wr.Write($"new {DafnyBigRationalClass}(new java.math.BigInteger(\"{n.Mantissa}");
+          for (int j = 0; j < n.Exponent; j++) {
+            wr.Write("0");
+          }
+          wr.Write("\"), java.math.BigInteger.ONE)");
+        } else {
+          wr.Write($"new {DafnyBigRationalClass}(");
+          wr.Write($"new java.math.BigInteger(\"{n.Mantissa}\")");
+          wr.Write(", new java.math.BigInteger(\"1");
+          for (int j = n.Exponent; j < 0; j++) {
+            wr.Write("0");
+          }
+          wr.Write("\"))");
+        }
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
+      }
+    }
+
+    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
+      if (!isVerbatim) {
+        wr.Write($"\"{TranslateEscapes(str)}\"");
+      } else {
+        //TODO: This is taken from Go and JS since Java doesn't have raw string literals, modify and make better if possible.
+        var n = str.Length;
+        wr.Write("\"");
+        for (var i = 0; i < n; i++) {
+          if (str[i] == '\"' && i + 1 < n && str[i + 1] == '\"') {
+            wr.Write("\\\"");
+            i++;
+          } else if (str[i] == '\\') {
+            wr.Write("\\\\");
+          } else if (str[i] == '\n') {
+            wr.Write("\\n");
+          } else if (str[i] == '\r') {
+            wr.Write("\\r");
+          } else {
+            wr.Write(str[i]);
+          }
+        }
+        wr.Write("\"");
+      }
+    }
+
+    void EmitNativeIntegerLiteral(BigInteger value, NativeType nt, ConcreteSyntaxTree wr) {
+      GetNativeInfo(nt.Sel, out var name, out var literalSuffix, out _);
+      var intValue = value;
+      if (intValue > long.MaxValue) {
+        // The value must be a 64-bit unsigned integer, since it has a native
+        // type and unsigned long is the biggest native type
+        Contract.Assert(intValue <= ulong.MaxValue);
+
+        // Represent the value as a signed 64-bit integer
+        intValue -= ulong.MaxValue + BigInteger.One;
+      } else if (nt.Sel == NativeType.Selection.UInt && intValue > int.MaxValue) {
+        // Represent the value as a signed 32-bit integer
+        intValue -= uint.MaxValue + BigInteger.One;
+      }
+      wr.Write($"{CastIfSmallNativeType(nt)}{intValue}{literalSuffix}");
+    }
+
+    protected string GetNativeDefault(NativeType nt) {
+      switch (AsJavaNativeType(nt)) {
+        case JavaNativeType.Byte: return "(byte) 0";
+        case JavaNativeType.Short: return "(short) 0";
+        case JavaNativeType.Int: return "0";
+        case JavaNativeType.Long: return "0L";
+        default:
+          Contract.Assert(false);  // unexpected native type
+          throw new cce.UnreachableException();  // to please the compiler
+      }
+    }
+
+    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix,
+      out bool needsCastAfterArithmetic) {
+      literalSuffix = "";
+      needsCastAfterArithmetic = false;
+      switch (AsJavaNativeType(sel)) {
+        case JavaNativeType.Byte: name = "byte"; needsCastAfterArithmetic = true; break;
+        case JavaNativeType.Short: name = "short"; needsCastAfterArithmetic = true; break;
+        case JavaNativeType.Int: name = "int"; break;
+        case JavaNativeType.Long: name = "long"; literalSuffix = "L"; break;
+        default:
+          Contract.Assert(false);  // unexpected native type
+          throw new cce.UnreachableException();  // to please the compiler
+      }
+    }
+
+    private string GetNativeTypeName(NativeType nt, bool boxed = false) {
+      return boxed ? GetBoxedNativeTypeName(nt) : base.GetNativeTypeName(nt);
+    }
+
+    private string GetBoxedNativeTypeName(NativeType nt) {
+      switch (AsJavaNativeType(nt)) {
+        case JavaNativeType.Byte: return "java.lang.Byte";
+        case JavaNativeType.Short: return "java.lang.Short";
+        case JavaNativeType.Int: return "java.lang.Integer";
+        case JavaNativeType.Long: return "java.lang.Long";
+        default:
+          Contract.Assert(false);  // unexpected native type
+          throw new cce.UnreachableException();  // to please the compiler
+      }
+    }
+
+    // Note the (semantically iffy) distinction between a *primitive type*,
+    // being one of the eight Java primitive types, and a NativeType, which can
+    // only be one of the integer types.
+    // Note also that in --unicode-char mode, we have our own CodePoint boxing type
+    // that boxes int values that are actually Dafny char values.
+    private bool IsJavaPrimitiveType(Type type) {
+      return type.IsBoolType || type.IsCharType || AsNativeType(type) != null;
+    }
+
+    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
+      var custom =
+        (enclosingMethod != null && (enclosingMethod.IsTailRecursive || NeedsCustomReceiver(enclosingMethod))) ||
+        (enclosingFunction != null && (enclosingFunction.IsTailRecursive || NeedsCustomReceiver(enclosingFunction))) ||
+        (thisContext is NewtypeDecl && !callToInheritedMember) ||
+        thisContext is TraitDecl;
+      wr.Write(custom ? "_this" : "this");
+    }
+
+    protected override void DeclareLocalVar(string name, Type /*?*/ type, IOrigin /*?*/ tok, bool leaveRoomForRhs,
+      string /*?*/ rhs, ConcreteSyntaxTree wr) {
+      // Note that type can be null to represent the native object type.
+      // See comment on NativeObjectType.
+      if (type is { IsTypeParameter: true }) {
+        EmitSuppression(wr);
+      }
+      wr.Write("{0} {1}", type != null ? TypeName(type, wr, tok) : "Object", name);
+      if (leaveRoomForRhs) {
+        Contract.Assert(rhs == null); // follows from precondition
+      } else if (rhs != null) {
+        wr.WriteLine($" = {rhs};");
+      } else if (type is { IsIntegerType: true }) {
+        wr.WriteLine(" = java.math.BigInteger.ZERO;");
+      } else {
+        wr.WriteLine(";");
+      }
+    }
+
+    protected override void DeclareLocalVar(string name, Type /*?*/ type, IOrigin /*?*/ tok, bool leaveRoomForRhs,
+      string /*?*/ rhs, ConcreteSyntaxTree wr, Type t) {
+      DeclareLocalVar(name, t, tok, leaveRoomForRhs, rhs, wr);
+    }
+
+    protected override void EmitCollectionDisplay(CollectionType ct, IOrigin tok, List<Expression> elements,
+        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (elements.Count == 0) {
+        wr.Write($"{CollectionTypeUnparameterizedName(ct)}.<{BoxedTypeName(ct.Arg, wr, tok)}> empty(");
+        if (ct is SeqType) {
+          wr.Write(TypeDescriptor(ct.Arg, wr, tok));
+        }
+        wr.Write(")");
+        return;
+      }
+      wr.Write($"{CollectionTypeUnparameterizedName(ct)}.<{BoxedTypeName(ct.Arg, wr, tok)}> of(");
+      string sep = "";
+      if (ct is SeqType && (!IsJavaPrimitiveType(ct.Arg) || (UnicodeCharEnabled && ct.Arg.IsCharType))) {
+        wr.Write(TypeDescriptor(ct.Arg, wr, tok));
+        sep = ", ";
+      }
+
+      if (elements.Count != 0) {
+        wr.Write(sep);
+      }
+      TrExprList(elements, wr, inLetExprBody, wStmts, typeAt: _ => NativeObjectType, parens: false);
+
+      wr.Write(")");
+    }
+
+    protected override void EmitMapDisplay(MapType mt, IOrigin tok, List<ExpressionPair> elements, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"{DafnyMapClass}.fromElements");
+      wr.Write("(");
+      string sep = "";
+      foreach (ExpressionPair p in elements) {
+        wr.Write(sep);
+        wr.Write($"new {DafnyTupleClass(2)}(");
+        var coercedW = EmitCoercionIfNecessary(from: p.A.Type, to: NativeObjectType, tok: p.A.Origin, wr: wr);
+        coercedW.Append(Expr(p.A, inLetExprBody, wStmts));
+        wr.Write(", ");
+        coercedW = EmitCoercionIfNecessary(from: p.B.Type, to: NativeObjectType, tok: p.B.Origin, wr: wr);
+        coercedW.Append(Expr(p.B, inLetExprBody, wStmts));
+        wr.Write(")");
+        sep = ", ";
+      }
+      wr.Write(")");
+    }
+
+    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString) {
+      compiledName = "";
+      preString = "";
+      postString = "";
+      switch (id) {
+        case SpecialField.ID.UseIdParam:
+          compiledName = IdProtect((string)idParam);
+          break;
+        case SpecialField.ID.ArrayLength:
+        case SpecialField.ID.ArrayLengthInt:
+          if (idParam == null) {
+            // Works on both fixed array types like array<int> (=> BigInteger[])
+            // or generic array types like array<A> (=> Object) and (unlike most
+            // of java.lang.reflect.Array) is fast
+            preString = "java.lang.reflect.Array.getLength(";
+            postString = ")";
+          } else {
+            compiledName = "dim" + (int)idParam;
+          }
+          if (id == SpecialField.ID.ArrayLength) {
+            preString = "java.math.BigInteger.valueOf(" + preString;
+            postString = postString + ")";
+          }
+          break;
+        case SpecialField.ID.Floor:
+          compiledName = "ToBigInteger()";
+          break;
+        case SpecialField.ID.IsLimit:
+          preString = "dafny.BigOrdinal.IsLimit(";
+          postString = ")";
+          break;
+        case SpecialField.ID.IsSucc:
+          preString = "dafny.BigOrdinal.IsSucc(";
+          postString = ")";
+          break;
+        case SpecialField.ID.Offset:
+          preString = "dafny.BigOrdinal.Offset(";
+          postString = ")";
+          break;
+        case SpecialField.ID.IsNat:
+          preString = "dafny.BigOrdinal.IsNat(";
+          postString = ")";
+          break;
+        case SpecialField.ID.Keys:
+          compiledName = "keySet()";
+          break;
+        case SpecialField.ID.Values:
+          compiledName = "valueSet()";
+          break;
+        case SpecialField.ID.Items:
+          var mapType = receiverType.NormalizeToAncestorType().AsMapType;
+          Contract.Assert(mapType != null);
+          var errorWr = new ConcreteSyntaxTree();
+          compiledName = $"<{BoxedTypeName(mapType.Domain, errorWr, Token.NoToken)}, {BoxedTypeName(mapType.Range, errorWr, Token.NoToken)}>entrySet()";
+          break;
+        case SpecialField.ID.Reads:
+          compiledName = "_reads";
+          break;
+        case SpecialField.ID.Modifies:
+          compiledName = "_modifies";
+          break;
+        case SpecialField.ID.New:
+          compiledName = "_new";
+          break;
+        default:
+          Contract.Assert(false); // unexpected ID
+          break;
+      }
+    }
+
+    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
+      Type expectedType, string/*?*/ additionalCustomParameter, bool internalAccess = false) {
+      var memberStatus = DatatypeWrapperEraser.GetMemberStatus(Options, member);
+      if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.Identity) {
+        return SimpleLvalue(obj);
+      } else if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue) {
+        return SimpleLvalue(w => w.Write("true"));
+      } else if (member is SpecialField sf && !(member is ConstantField)) {
+        GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out _, out _);
+        if (compiledName.Length != 0) {
+          if (member.EnclosingClass is DatatypeDecl) {
+            if (member.EnclosingClass is TupleTypeDecl && sf.Type.Subst(typeMap).IsCharType && UnicodeCharEnabled) {
+              return SuffixLvalue(obj, $".{compiledName}().value()");
+            } else {
+              return SuffixLvalue(obj, $".{compiledName}()");
+            }
+          } else {
+            return SuffixLvalue(obj, $".{compiledName}");
+          }
+        } else {
+          // Assume it's already handled by the caller
+          return SimpleLvalue(obj);
+        }
+      } else if (member is Function fn) {
+        return EmitFunctionSelect(obj, member, typeArgs, typeMap, additionalCustomParameter, fn);
+      } else {
+        var field = (Field)member;
+        ILvalue lvalue;
+        if (member.IsStatic) {
+          lvalue = SimpleLvalue(w => {
+            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.Origin, member), IdName(member));
+            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.Origin, w);
+            w.Write(")");
+          });
+        } else if (NeedsCustomReceiverNotTrait(member)) {
+          // instance const in a newtype
+          Contract.Assert(typeArgs.Count == 0);
+          lvalue = SimpleLvalue(w => {
+            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.Origin, member), IdName(member));
+            obj(w);
+            w.Write(")");
+          });
+        } else if (internalAccess && (member is ConstantField || member.EnclosingClass is TraitDecl)) {
+          lvalue = SuffixLvalue(obj, $".{InternalFieldPrefix}{member.GetCompileName(Options)}");
+        } else if (internalAccess) {
+          lvalue = SuffixLvalue(obj, $".{IdName(member)}");
+        } else if (member is ConstantField) {
+          lvalue = SimpleLvalue(w => {
+            obj(w);
+            w.Write(".{0}(", IdName(member));
+            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.Origin, w);
+            w.Write(")");
+          });
+        } else if (member.EnclosingClass is TraitDecl) {
+          lvalue = GetterSetterLvalue(obj, IdName(member), $"set_{IdName(member)}");
+        } else {
+          lvalue = SuffixLvalue(obj, $".{IdName(member)}");
+        }
+        return CoercedLvalue(lvalue, field.Type, expectedType);
+      }
+    }
+
+    private ILvalue EmitFunctionSelect(Action<ConcreteSyntaxTree> obj, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
+      string additionalCustomParameter, Function fn) {
+      var wr = new ConcreteSyntaxTree();
+      EmitNameAndActualTypeArgs(IdName(member), TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, member, false)),
+        member.Origin, null, false, wr);
+      var needsEtaConversion = typeArgs.Any()
+                               || additionalCustomParameter != null
+                               || (UnicodeCharEnabled &&
+                                   (fn.ResultType.IsCharType || fn.Ins.Any(f => f.Type.IsCharType)));
+      if (!needsEtaConversion) {
+        var nameAndTypeArgs = wr.ToString();
+        return SuffixLvalue(obj, $"::{nameAndTypeArgs}");
+      } else {
+        // We need an eta conversion to adjust for the difference in arity or coerce inputs/outputs.
+        // (T0 a0, T1 a1, ...) -> obj.F(rtd0, rtd1, ..., additionalCustomParameter, a0, a1, ...)
+        wr.Write("(");
+        var sep = "";
+        EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), fn.Origin, wr, ref sep);
+        if (additionalCustomParameter != null) {
+          wr.Write("{0}{1}", sep, additionalCustomParameter);
+          sep = ", ";
+        }
+        var prefixWr = new ConcreteSyntaxTree();
+        var prefixSep = "";
+        prefixWr.Write("(");
+        foreach (var arg in fn.Ins) {
+          if (!arg.IsGhost) {
+            var name = idGenerator.FreshId("_eta");
+            var ty = arg.Type.Subst(typeMap);
+            prefixWr.Write($"{prefixSep}{BoxedTypeName(ty, prefixWr, arg.Origin)} {name}");
+            wr.Write(sep);
+            var coercedWr = EmitCoercionIfNecessary(NativeObjectType, ty, arg.Origin, wr);
+            coercedWr.Write(name);
+            sep = ", ";
+            prefixSep = ", ";
+          }
+        }
+        prefixWr.Write(") -> ");
+        wr.Write(")");
+
+        if (fn.ResultType.IsCharType && UnicodeCharEnabled) {
+          prefixWr.Write("dafny.CodePoint.valueOf(");
+          wr.Write(")");
+        }
+
+        return EnclosedLvalue(prefixWr.ToString(), obj, $".{wr}");
+      }
+    }
+
+    protected override void EmitConstructorCheck(string source, DatatypeCtor ctor, ConcreteSyntaxTree wr) {
+      wr.Write($"{source}.is_{ctor.GetCompileName(Options)}()");
+    }
+
+    internal override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member) {
+      type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
+      if (type is UserDefinedType udt) {
+        var name = udt.ResolvedClass is TraitDecl ? udt.GetFullCompanionCompileName(Options) : FullTypeName(udt, member, true);
+        return TypeName_UDT(name, udt, wr, tok, true);
+      } else {
+        return TypeName(type, wr, tok, member);
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Action<ConcreteSyntaxTree>> indices, Type elmtType, ConcreteSyntaxTree wr) {
+      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
+      var w = EmitArraySelect(indices.Count, out var wIndices, elmtType, wr);
+      for (int i = 0; i < indices.Count; i++) {
+        var stringifiedIndex = new ConcreteSyntaxTree();
+        indices[i](stringifiedIndex);
+        var index = stringifiedIndex.ToString();
+        if (!int.TryParse(index, out _)) {
+          wIndices[i].Write($"{DafnyHelpersClass}.toInt({index})");
+        } else {
+          wIndices[i].Write(index);
+        }
+      }
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
+      var w = EmitArraySelect(indices.Count, out var wIndices, elmtType, wr);
+
+      for (int i = 0; i < indices.Count; i++) {
+        TrParenExprAsInt(indices[i], wIndices[i], inLetExprBody, wStmts);
+      }
+
+      return w;
+    }
+
+    private ConcreteSyntaxTree EmitArraySelect(int dimCount, out List<ConcreteSyntaxTree> wIndices, Type elmtType, ConcreteSyntaxTree wr) {
+      elmtType = DatatypeWrapperEraser.SimplifyType(Options, elmtType);
+      wIndices = new List<ConcreteSyntaxTree>();
+      ConcreteSyntaxTree w;
+      if (dimCount == 1) {
+        if (elmtType.IsTypeParameter) {
+          wr.Write($"{FormatTypeDescriptorVariable(elmtType.AsTypeParameter)}.getArrayElement(");
+          w = wr.Fork();
+          wr.Write(", ");
+          wIndices.Add(wr.Fork());
+          wr.Write(")");
+        } else {
+          w = wr.Fork();
+          wr.Write("[");
+          wIndices.Add(wr.Fork());
+          wr.Write("]");
+        }
+      } else {
+        if (elmtType.IsTypeParameter) {
+          w = wr.Fork();
+          wr.Write(".get(");
+          for (int i = 0; i < dimCount; i++) {
+            if (i > 0) {
+              wr.Write(", ");
+            }
+            wIndices.Add(wr.Fork());
+          }
+          wr.Write(")");
+        } else {
+          wr.Write($"(({TypeName(elmtType, wr, Token.NoToken)}{Repeat("[]", dimCount)}) ((");
+          w = wr.Fork();
+          wr.Write(").elmts))");
+          for (int i = 0; i < dimCount; i++) {
+            wr.Write("[");
+            wIndices.Add(wr.Fork());
+            wr.Write("]");
+          }
+        }
+      }
+      return w;
+    }
+
+    protected override (ConcreteSyntaxTree/*array*/, ConcreteSyntaxTree/*rhs*/) EmitArrayUpdate(List<Action<ConcreteSyntaxTree>> indices, Type elementType, ConcreteSyntaxTree wr) {
+      elementType = DatatypeWrapperEraser.SimplifyType(Options, elementType);
+      ConcreteSyntaxTree wArray, wRhs;
+      if (indices.Count == 1) {
+        if (elementType.IsTypeParameter) {
+          wr.Write($"{FormatTypeDescriptorVariable(elementType.AsTypeParameter)}.setArrayElement(");
+          wArray = wr.Fork();
+          wr.Write($", {DafnyHelpersClass}.toInt(");
+          indices[0](wr);
+          wr.Write("), ");
+          wRhs = wr.Fork();
+          wr.Write(")");
+        } else {
+          wArray = wr.Fork();
+          wr.Write($"[{DafnyHelpersClass}.toInt(");
+          indices[0](wr);
+          wr.Write(")] = ");
+          wRhs = wr.Fork();
+        }
+      } else {
+        if (elementType.IsTypeParameter) {
+          wArray = wr.Fork();
+          wr.Write($".set(");
+          for (int i = 0; i < indices.Count; i++) {
+            if (i > 0) {
+              wr.Write(", ");
+            }
+            wr.Write($"{DafnyHelpersClass}.toInt(");
+            indices[i](wr);
+            wr.Write(")");
+          }
+          wr.Write(", ");
+          wRhs = wr.Fork();
+          wr.Write(")");
+        } else {
+          wr.Write($"(({TypeName(elementType, wr, Token.NoToken)}{Repeat("[]", indices.Count)}) (");
+          wArray = wr.Fork();
+          wr.Write($").elmts)");
+          for (int i = 0; i < indices.Count; i++) {
+            wr.Write($"[{DafnyHelpersClass}.toInt(");
+            indices[i](wr);
+            wr.Write(")]");
+          }
+          wr.Write(" = ");
+          wRhs = wr.Fork();
+        }
+      }
+      return (wArray, wRhs);
+    }
+
+    protected override void EmitSeqSelectRange(Expression source, Expression lo, Expression hi, bool fromArray,
+        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (fromArray) {
+        wr.Write($"{DafnySeqClass}.fromRawArrayRange({TypeDescriptor(source.Type.NormalizeExpand().TypeArgs[0], wr, source.Origin)}, ");
+      }
+      TrParenExpr(source, wr, inLetExprBody, wStmts);
+      if (fromArray) {
+        wr.Write(", ");
+        if (lo != null) {
+          TrExprAsInt(lo, wr, inLetExprBody, wStmts);
+        } else {
+          wr.Write("0");
+        }
+        wr.Write(", ");
+        if (hi != null) {
+          TrExprAsInt(hi, wr, inLetExprBody, wStmts);
+        } else {
+          wr.Write("java.lang.reflect.Array.getLength");
+          TrParenExpr(source, wr, inLetExprBody, wStmts);
+        }
+        wr.Write(")");
+      } else {
+        if (lo != null && hi != null) {
+          wr.Write(".subsequence(");
+          TrExprAsInt(lo, wr, inLetExprBody, wStmts);
+          wr.Write(", ");
+          TrExprAsInt(hi, wr, inLetExprBody, wStmts);
+          wr.Write(")");
+        } else if (lo != null) {
+          wr.Write(".drop");
+          TrParenExpr(lo, wr, inLetExprBody, wStmts);
+        } else if (hi != null) {
+          wr.Write(".take");
+          TrParenExpr(hi, wr, inLetExprBody, wStmts);
+        }
+      }
+    }
+
+    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      // Taken from C# compiler, assuming source is a DafnySequence type.
+      if (source.Type.NormalizeToAncestorType().AsMultiSetType is { } multiSetType) {
+        wr.Write($"{DafnyMultiSetClass}.<{BoxedTypeName(multiSetType.Arg, wr, Token.NoToken)}>multiplicity(");
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+        wr.Write(", ");
+        wr.Append(JavaCoercedExpr(index, multiSetType.Arg, inLetExprBody, wStmts));
+        wr.Write(")");
+      } else if (source.Type.NormalizeToAncestorType().AsMapType is { } mapType) {
+        wr = EmitCoercionIfNecessary(from: NativeObjectType, to: mapType.Range, tok: source.Origin, wr: wr);
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+        wr.Write(".get(");
+        var coercedWr = EmitCoercionIfNecessary(from: mapType.Domain, to: NativeObjectType, tok: source.Origin, wr: wr);
+        EmitExpr(index, inLetExprBody, coercedWr, wStmts);
+        wr.Write(")");
+      } else {
+        wr = EmitCoercionIfNecessary(from: NativeObjectType, to: source.Type.NormalizeToAncestorType().AsCollectionType.Arg, tok: source.Origin, wr: wr);
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+        wr.Write(".select");
+        TrParenExprAsInt(index, wr, inLetExprBody, wStmts);
+      }
+    }
+
+    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+        ConcreteSyntaxTree wStmts) {
+      TrParenExpr(expr.E, wr, inLetExprBody, wStmts);
+      wr.Write(".asDafnyMultiset()");
+    }
+
+    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
+        CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (resultCollectionType.AsSeqType != null) {
+        wr.Write($"{DafnySeqClass}.<{BoxedTypeName(resultCollectionType.Arg, wr, Token.NoToken)}>update(");
+        wr.Append(Expr(source, inLetExprBody, wStmts));
+        wr.Write(", ");
+        TrExprAsInt(index, wr, inLetExprBody, wStmts);
+        wr.Write(", ");
+        wr.Append(JavaCoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts));
+        wr.Write(")");
+      } else if (resultCollectionType.AsMapType is { } mapType) {
+        wr.Write($"{DafnyMapClass}.<{BoxedTypeName(mapType.Domain, wr, Token.NoToken)}, {BoxedTypeName(mapType.Range, wr, Token.NoToken)}>update(");
+        wr.Append(Expr(source, inLetExprBody, wStmts));
+        wr.Write(", ");
+        wr.Append(JavaCoercedExpr(index, mapType.Domain, inLetExprBody, wStmts));
+        wr.Write(", ");
+        wr.Append(JavaCoercedExpr(value, mapType.Range, inLetExprBody, wStmts));
+        wr.Write(")");
+      } else {
+        Contract.Assert(resultCollectionType.AsMultiSetType != null);
+        wr.Write($"{DafnyMultiSetClass}.<{BoxedTypeName(resultCollectionType.Arg, wr, Token.NoToken)}>update(");
+        wr.Append(Expr(source, inLetExprBody, wStmts));
+        wr.Write(", ");
+        wr.Append(JavaCoercedExpr(index, resultCollectionType.ValueArg, inLetExprBody, wStmts));
+        wr.Write(", ");
+        wr.Append(Expr(value, inLetExprBody, wStmts));
+        wr.Write(")");
+      }
+    }
+
+    private ConcreteSyntaxTree JavaCoercedExpr(Expression expr, Type toType, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
+      return CoercedExpr(expr, expr.Type.IsTypeParameter ? toType : NativeObjectType, inLetExprBody, wStmts);
+    }
+
+    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
+      bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      string nativeName = null;
+      bool needsCast = false;
+      var nativeType = AsNativeType(e0.Type);
+      if (nativeType != null) {
+        GetNativeInfo(nativeType.Sel, out nativeName, out _, out needsCast);
+      }
+      var leftShift = nativeType == null ? ".shiftLeft" : "<<";
+      var rightShift = nativeType == null ? ".shiftRight" : ">>>";
+      // ( e0 op1 e1) | (e0 op2 (width - e1))
+      if (needsCast) {
+        wr.Write("(" + nativeName + ")(" + CastIfSmallNativeType(e0.Type) + "(");
+      }
+      wr.Write("(");
+      EmitShift(e0, e1, isRotateLeft ? leftShift : rightShift, isRotateLeft, nativeType, true, wr, inLetExprBody, wStmts, tr);
+      wr.Write(")");
+      if (nativeType == null) {
+        wr.Write(".or");
+      } else {
+        wr.Write("|");
+      }
+      wr.Write("(");
+      EmitShift(e0, e1, isRotateLeft ? rightShift : leftShift, !isRotateLeft, nativeType, false, wr, inLetExprBody, wStmts, tr);
+      wr.Write(")))");
+      if (needsCast) {
+        wr.Write("))");
+      }
+    }
+
+    private void EmitShift(Expression e0, Expression e1, string op, bool truncate, [CanBeNull] NativeType nativeType, bool firstOp,
+        ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      var bv = e0.Type.NormalizeToAncestorType().AsBitVectorType;
+      if (truncate) {
+        wr = EmitBitvectorTruncation(bv, nativeType, true, wr);
+      }
+      tr(e0, wr, inLetExprBody, wStmts);
+      wr.Write($" {op} ");
+      if (!firstOp) {
+        wr.Write($"({bv.Width} - ");
+      }
+      wr.Write("((");
+      tr(e1, wr, inLetExprBody, wStmts);
+      wr.Write(")");
+      if (AsNativeType(e1.Type) == null) {
+        wr.Write(".intValue()");
+      }
+      if (!firstOp) {
+        wr.Write(")");
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, [CanBeNull] NativeType nativeType,
+      bool surroundByUnchecked, ConcreteSyntaxTree wr) {
+
+      string nativeName = null, literalSuffix = null;
+      if (nativeType != null) {
+        GetNativeInfo(nativeType.Sel, out nativeName, out literalSuffix, out _);
+      }
+      // --- Before
+      if (nativeType == null) {
+        wr.Write("((");
+      } else {
+        wr.Write($"({nativeName}) {CastIfSmallNativeType(nativeType)}((");
+      }
+      // --- Middle
+      var middle = wr.Fork();
+      // --- After
+      // do the truncation, if needed
+      if (nativeType == null) {
+        wr.Write($").and((java.math.BigInteger.ONE.shiftLeft({bvType.Width})).subtract(java.math.BigInteger.ONE)))");
+      } else if (bvType.Width < nativeType.Bitwidth) {
+        // print in hex, because that looks nice
+        wr.Write($") & {CastIfSmallNativeType(nativeType)}0x{(1UL << bvType.Width) - 1:X}{literalSuffix})");
+      } else {
+        wr.Write("))"); // close the parentheses for the cast
+      }
+      return middle;
+    }
+
+    protected override bool CompareZeroUsingSign(Type type) {
+      // Everything is boxed, so everything benefits from avoiding explicit 0
+      return true;
+    }
+
+    protected override ConcreteSyntaxTree EmitSign(Type type, ConcreteSyntaxTree wr) {
+      ConcreteSyntaxTree w;
+      var nt = AsNativeType(type);
+      if (nt == null) {
+        w = wr.Fork();
+        wr.Write(".signum()");
+      } else if (nt.LowerBound >= 0) {
+        wr.Write("(");
+        w = wr.Fork();
+        wr.Write(" == 0 ? 0 : 1)");
+      } else {
+        wr.Write($"{HelperClass(nt)}.signum(");
+        w = wr.Fork();
+        wr.Write(")");
+      }
+      return w;
+    }
+
+    protected override IClassWriter/*?*/ DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
+      if (dt is TupleTypeDecl tupleTypeDecl) {
+        // CreateTuple() produces quite different code than this method would
+        // by treating a tuple declaration as just a special case of a datatype.
+        // Compare to the C# compiler which just compiles tuples like datatypes
+        // with a bit of special handling for the name.
+        // This could be changed to match at some point, but it would break
+        // code that relies on the current runtime representation of tuples in Java.
+        CreateTuple(tupleTypeDecl.Dims, wr);
+        return null;
+      }
+
+      var w = CompileDatatypeBase(dt, wr);
+      CompileDatatypeConstructors(dt, wr);
+      return w;
+    }
+
+    IClassWriter CompileDatatypeBase(DatatypeDecl dt, ConcreteSyntaxTree wr) {
+      var DtT_TypeArgs = TypeParameters(dt.TypeArgs);
+      var justTypeArgs = dt.TypeArgs.Count == 0 ? "" : " " + DtT_TypeArgs;
+      var DtT_protected = IdName(dt) + DtT_TypeArgs;
+      var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, UserDefinedType.FromTopLevelDecl(dt.Origin, dt));
+      var simplifiedTypeName = TypeName(simplifiedType, wr, dt.Origin);
+
+      var filename = $"{ModulePath}/{IdName(dt)}.java";
+      wr = wr.NewFile(filename);
+      wr.WriteLine($"// Class {DtT_protected}");
+      wr.WriteLine($"// Dafny class {DtT_protected} compiled into Java");
+      wr.WriteLine($"package {ModuleName};");
+      wr.WriteLine();
+      //TODO: Figure out how to resolve type checking warnings
+      // from here on, write everything into the new block created here:
+      EmitSuppression(wr);
+      wr.Write("public{0} class {1}", dt.IsRecordType ? "" : " abstract", DtT_protected);
+      var superTraits = dt.ParentTypeInformation.UniqueParentTraits();
+      if (superTraits.Any()) {
+        wr.Write($" implements {superTraits.Comma(trait => TypeName(trait, wr, dt.Origin))}");
+      }
+      var btw = wr.NewBlock();
+      wr = btw;
+
+      // constructor
+      if (dt.IsRecordType) {
+        DatatypeFieldsAndConstructor(dt.Ctors[0], 0, wr);
+      } else {
+        var wTypeFields = wr.Fork();
+        var wCtorParams = new ConcreteSyntaxTree();
+        var wCtorBody = wr.Format($"public {IdName(dt)}({wCtorParams})").NewBlock();
+        EmitTypeDescriptorsForClass(dt.TypeArgs, dt, wTypeFields, wCtorParams, null, wCtorBody);
+      }
+
+      // type descriptor needs to be initialized before default value is generated (issue 3766)
+      EmitTypeDescriptorMethod(dt, dt.TypeArgs, null, null, wr);
+
+      // default value
+      var wDefaultTypeArguments = new ConcreteSyntaxTree();
+      var defaultMethodTypeDescriptorCount = 0;
+      var usedTypeArgs = UsedTypeParameters(dt);
+      ConcreteSyntaxTree wDefault;
+      ConcreteSyntaxTree wLegacyDefault = null;
+      wr.WriteLine();
+      if (dt.TypeArgs.Count == 0) {
+        wr.Write($"private static final {simplifiedTypeName} theDefault = ");
+        wDefault = wr.Fork();
+        wr.WriteLine(";");
+        var w = wr.NewBlock($"public static {simplifiedTypeName} Default()");
+        w.WriteLine("return theDefault;");
+      } else {
+        wr.Write($"public static{justTypeArgs} {simplifiedTypeName} Default(");
+        defaultMethodTypeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, null, wr, wDefaultTypeArguments, null);
+        var typeParameters = usedTypeArgs.Comma(tp => $"{tp.GetCompileName(Options)} {FormatDefaultTypeParameterValue(tp)}");
+        var sep = defaultMethodTypeDescriptorCount != 0 && typeParameters.Length != 0 ? ", " : "";
+        wr.Write($"{sep}{typeParameters}");
+        var w = wr.NewBlock(")");
+        w.Write("return ");
+        wDefault = w.Fork();
+        w.WriteLine(";");
+
+        if (Options.Get(JavaBackend.LegacyDataConstructors)) {
+          wr.WriteLine("@Deprecated()");
+          w = wr.NewBlock($"public static{justTypeArgs} {simplifiedTypeName} Default({typeParameters})");
+          foreach (var typeParameter in dt.TypeArgs) {
+            w.WriteLine(TypeDescriptorVariableDeclaration(typeParameter) + " = null;");
+          }
+          w.Write("return ");
+          wLegacyDefault = w.Fork();
+          w.WriteLine(";");
+        }
+      }
+      var groundingCtor = dt.GetGroundingCtor();
+      if (groundingCtor.IsGhost) {
+        wDefault.Write(ForcePlaceboValue(simplifiedType, wDefault, dt.Origin));
+      } else if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
+        wDefault.Write(DefaultValue(innerType, wDefault, dt.Origin));
+      } else {
+        var nonGhostFormals = groundingCtor.Formals.Where(f => !f.IsGhost).ToList();
+        var args = nonGhostFormals.Comma(f => DefaultValue(f.Type, wDefault, f.Origin));
+        EmitDatatypeValue(dt, groundingCtor,
+          dt.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(dt.Origin, tp)),
+          dt is CoDatatypeDecl, $"{wDefaultTypeArguments}", args, wDefault);
+      }
+
+      if (wLegacyDefault != null) {
+        foreach (var node in wDefault.Nodes) {
+          wLegacyDefault.Append(node);
+        }
+      }
+
+      // create methods
+      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+        var wCtorParams = new ConcreteSyntaxTree();
+        var wCallArguments = new ConcreteSyntaxTree();
+        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, null, wCtorParams, wCallArguments, null);
+        wr.Write($"public static{justTypeArgs} {DtT_protected} {DtCreateName(ctor)}(");
+        wr.Append(wCtorParams);
+        var formalCount = WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wr);
+        var sep = typeDescriptorCount > 0 && formalCount > 0 ? ", " : "";
+        wr.NewBlock(")")
+          .WriteLine($"return new {DtCtorDeclarationName(ctor, dt.TypeArgs)}({wCallArguments}{sep}{ctor.Formals.Where(f => !f.IsGhost).Comma(FormalName)});");
+
+        if (dt.TypeArgs.Any() && Options.Get(JavaBackend.LegacyDataConstructors)) {
+          wr.WriteLine("@Deprecated()");
+          wr.Write($"public static{justTypeArgs} {DtT_protected} {DtCreateName(ctor)}(");
+          var nullTypeDescriptorArgs = Enumerable.Repeat("null", typeDescriptorCount).Comma();
+          WriteFormals("", ctor.Formals, wr);
+          wr.NewBlock(")")
+            .WriteLine($"return new {DtCtorDeclarationName(ctor, dt.TypeArgs)}({nullTypeDescriptorArgs}{sep}{ctor.Formals.Where(f => !f.IsGhost).Comma(FormalName)});");
+        }
+      }
+
+      if (dt.IsRecordType) {
+        // Also emit a "create_<ctor_name>" method that thunks to "create",
+        // to provide a more uniform interface.
+
+        var ctor = dt.Ctors[0];
+        var wCtorParams = new ConcreteSyntaxTree();
+        var wCallArguments = new ConcreteSyntaxTree();
+        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, null, wCtorParams, wCallArguments, null);
+        wr.Write($"public static{justTypeArgs} {DtT_protected} create_{ctor.GetCompileName(Options)}(");
+        wr.Append(wCtorParams);
+        var formalCount = WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wr);
+        var sep = typeDescriptorCount > 0 && formalCount > 0 ? ", " : "";
+        wr.NewBlock(")")
+          .WriteLine($"return create({wCallArguments}{sep}{ctor.Formals.Where(f => !f.IsGhost).Comma(FormalName)});");
+
+        if (dt.TypeArgs.Any() && Options.Get(JavaBackend.LegacyDataConstructors)) {
+          wr.WriteLine("@Deprecated()");
+          wr.Write($"public static{justTypeArgs} {DtT_protected} create_{ctor.GetCompileName(Options)}(");
+          var nullTypeDescriptorArgs = Enumerable.Repeat("null", typeDescriptorCount).Comma();
+          WriteFormals("", ctor.Formals, wr);
+          wr.NewBlock(")")
+            .WriteLine($"return create({nullTypeDescriptorArgs}{sep}{ctor.Formals.Where(f => !f.IsGhost).Comma(FormalName)});");
+        }
+      }
+
+      // query properties
+      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+        if (dt.IsRecordType) {
+          wr.WriteLine($"public boolean is_{ctor.GetCompileName(Options)}() {{ return true; }}");
+        } else {
+          wr.WriteLine($"public boolean is_{ctor.GetCompileName(Options)}() {{ return this instanceof {dt.GetCompileName(Options)}_{ctor.GetCompileName(Options)}; }}");
+        }
+      }
+      if (dt is CoDatatypeDecl) {
+        wr.WriteLine($"public abstract {DtT_protected} Get();");
+      }
+      if (dt.HasFinitePossibleValues) {
+        Contract.Assert(dt.TypeArgs.Count == 0);
+        var w = wr.NewNamedBlock($"public static java.util.ArrayList<{DtT_protected}> AllSingletonConstructors()");
+        string arraylist = "singleton_iterator";
+        w.WriteLine($"java.util.ArrayList<{DtT_protected}> {arraylist} = new java.util.ArrayList<>();");
+        foreach (var ctor in dt.Ctors) {
+          Contract.Assert(ctor.Formals.Count == 0);
+          if (ctor.IsGhost) {
+            w.WriteLine("{0}.add({1});", arraylist, ForcePlaceboValue(UserDefinedType.FromTopLevelDecl(dt.Origin, dt), w, dt.Origin));
+          } else {
+            w.WriteLine("{0}.add(new {1}{2}());", arraylist, DtT_protected, dt.IsRecordType ? "" : $"_{ctor.GetCompileName(Options)}");
+          }
+        }
+        w.WriteLine($"return {arraylist};");
+      }
+      // destructors
+      foreach (var ctor in dt.Ctors) {
+        foreach (var dtor in ctor.Destructors.Where(dtor => dtor.EnclosingCtors[0] == ctor)) {
+          var compiledConstructorCount = dtor.EnclosingCtors.Count(constructor => !constructor.IsGhost);
+          if (compiledConstructorCount == 0) {
+            continue;
+          }
+
+          var arg = dtor.CorrespondingFormals[0];
+          if (arg.IsGhost || !arg.HasName) {
+            continue;
+          }
+
+          var wDtor = wr.NewNamedBlock($"public {TypeName(arg.Type, wr, arg.Origin)} dtor_{arg.GetOrCreateCompileName(currentIdGenerator)}()");
+          if (dt.IsRecordType) {
+            wDtor.WriteLine($"return this.{FieldName(arg, 0)};");
+          } else {
+            wDtor.WriteLine("{0} d = this{1};", DtT_protected, dt is CoDatatypeDecl ? ".Get()" : "");
+            var compiledConstructorsProcessed = 0;
+            for (var i = 0; i < dtor.EnclosingCtors.Count; i++) {
+              var ctor_i = dtor.EnclosingCtors[i];
+              Contract.Assert(arg.GetOrCreateCompileName(currentIdGenerator) == dtor.CorrespondingFormals[i].GetOrCreateCompileName(currentIdGenerator));
+              if (ctor_i.IsGhost) {
+                continue;
+              }
+              if (compiledConstructorsProcessed < compiledConstructorCount - 1) {
+                wDtor.WriteLine("if (d instanceof {0}_{1}) {{ return (({0}_{1}{2})d).{3}; }}", dt.GetCompileName(Options),
+                  ctor_i.GetCompileName(Options), DtT_TypeArgs, FieldName(arg, i));
+              } else {
+                wDtor.WriteLine($"return (({dt.GetCompileName(Options)}_{ctor_i.GetCompileName(Options)}{DtT_TypeArgs})d).{FieldName(arg, 0)};");
+              }
+              compiledConstructorsProcessed++;
+            }
+          }
+        }
+      }
+
+      // FIXME: This is dodgy.  We can set the constructor body writer to null
+      // only because we don't expect to use it, which is only because we don't
+      // expect there to be fields.
+      return new ClassWriter(this, btw, ctorBodyWriter: null);
+    }
+
+    void CompileDatatypeConstructors(DatatypeDecl dt, ConcreteSyntaxTree wrx) {
+      Contract.Requires(dt != null);
+      string typeParams = TypeParameters(dt.TypeArgs);
+      if (dt.IsRecordType) {
+        // There is only one constructor, and it is populated by CompileDatatypeBase
+        return;
+      }
+      int constructorIndex = 0; // used to give each constructor a different name
+      foreach (DatatypeCtor ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+        var filename = $"{ModulePath}/{DtCtorDeclarationName(ctor)}.java";
+        var wr = wrx.NewFile(filename);
+        wr.WriteLine($"// Class {DtCtorDeclarationName(ctor, dt.TypeArgs)}");
+        wr.WriteLine($"// Dafny class {DtCtorDeclarationName(ctor, dt.TypeArgs)} compiled into Java");
+        wr.WriteLine($"package {ModuleName};");
+        wr.WriteLine();
+        EmitSuppression(wr);
+        var w = wr.NewNamedBlock($"public class {DtCtorDeclarationName(ctor, dt.TypeArgs)} extends {IdName(dt)}{typeParams}");
+        DatatypeFieldsAndConstructor(ctor, constructorIndex, w);
+        constructorIndex++;
+      }
+      if (dt is CoDatatypeDecl) {
+        var filename = $"{ModulePath}/{dt.GetCompileName(Options)}__Lazy.java";
+        var wr = wrx.NewFile(filename);
+        wr.WriteLine($"// Class {dt.GetCompileName(Options)}__Lazy");
+        wr.WriteLine($"// Dafny class {dt.GetCompileName(Options)}__Lazy compiled into Java");
+        wr.WriteLine($"package {ModuleName};");
+        wr.WriteLine();
+        EmitSuppression(wr); //TODO: Fix implementations so they do not need this suppression
+        var w = wr.NewNamedBlock($"public class {dt.GetCompileName(Options)}__Lazy{typeParams} extends {IdName(dt)}{typeParams}");
+        w.WriteLine($"public interface Computer {{ {dt.GetCompileName(Options)} run(); }}");
+        w.WriteLine("Computer c;");
+        w.WriteLine($"{dt.GetCompileName(Options)}{typeParams} d;");
+
+        var wCtorParams = new ConcreteSyntaxTree();
+        var wBaseCallArguments = new ConcreteSyntaxTree();
+        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, null, wCtorParams, wBaseCallArguments, null);
+        var sep = typeDescriptorCount > 0 ? ", " : "";
+        var wCtorBody = w.NewBlock($"public {dt.GetCompileName(Options)}__Lazy({wCtorParams}{sep}Computer c)");
+        wCtorBody.WriteLine($"super({wBaseCallArguments});");
+        wCtorBody.WriteLine("this.c = c;");
+        w.WriteLine($"public {dt.GetCompileName(Options)}{typeParams} Get() {{ if (c != null) {{ d = c.run(); c = null; }} return d; }}");
+        w.WriteLine("public String toString() { return Get().toString(); }");
+      }
+    }
+
+    void DatatypeFieldsAndConstructor(DatatypeCtor ctor, int constructorIndex, ConcreteSyntaxTree wr) {
+      Contract.Requires(ctor != null);
+      Contract.Requires(0 <= constructorIndex && constructorIndex < ctor.EnclosingDatatype.Ctors.Count);
+      Contract.Requires(wr != null);
+      var dt = ctor.EnclosingDatatype;
+      var i = 0;
+      foreach (Formal arg in ctor.Formals) {
+        if (!arg.IsGhost) {
+          wr.WriteLine($"public {TypeName(arg.Type, wr, arg.Origin)} {FieldName(arg, i)};");
+          i++;
+        }
+      }
+
+      var wTypeFields = wr.Fork();
+      var wCtorParams = new ConcreteSyntaxTree();
+      var wCtorBody = wr.Format($"public {DtCtorDeclarationName(ctor)} ({wCtorParams})").NewBlock();
+      int typeDescriptorCount;
+      if (ctor.EnclosingDatatype.IsRecordType) {
+        typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, wTypeFields, wCtorParams, null, wCtorBody);
+      } else {
+        var wBaseCallArguments = wCtorBody.Write("super").ForkInParens();
+        wCtorBody.WriteLine(";");
+        typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, null, wCtorParams, wBaseCallArguments, null);
+      }
+      WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wCtorParams);
+      {
+        var w = wCtorBody;
+        i = 0;
+        foreach (Formal arg in ctor.Formals) {
+          if (!arg.IsGhost) {
+            w.WriteLine($"this.{FieldName(arg, i)} = {FormalName(arg, i)};");
+            i++;
+          }
+        }
+      }
+      if (dt is CoDatatypeDecl) {
+        string typeParams = TypeParameters(dt.TypeArgs);
+        wr.WriteLine($"public {dt.GetCompileName(Options)}{typeParams} Get() {{ return this; }}");
+      }
+      // Equals method
+      wr.WriteLine();
+      wr.WriteLine("@Override");
+      {
+        var w = wr.NewBlock("public boolean equals(Object other)");
+        w.WriteLine("if (this == other) return true;");
+        w.WriteLine("if (other == null) return false;");
+        w.WriteLine("if (getClass() != other.getClass()) return false;");
+        string typeParams = TypeParameters(dt.TypeArgs);
+        w.WriteLine("{0} o = ({0})other;", DtCtorDeclarationName(ctor, dt.TypeArgs));
+        w.Write("return true");
+        i = 0;
+        foreach (var arg in ctor.Formals) {
+          if (!arg.IsGhost) {
+            var nm = FieldName(arg, i);
+            w.Write(" && ");
+            if (IsDirectlyComparable(DatatypeWrapperEraser.SimplifyType(Options, arg.Type))) {
+              w.Write($"this.{nm} == o.{nm}");
+            } else {
+              w.Write($"java.util.Objects.equals(this.{nm}, o.{nm})");
+            }
+            i++;
+          }
+        }
+        w.WriteLine(";");
+      }
+      // GetHashCode method (Uses the djb2 algorithm)
+      wr.WriteLine("@Override");
+      {
+        var w = wr.NewBlock("public int hashCode()");
+        w.WriteLine("long hash = 5381;");
+        w.WriteLine($"hash = ((hash << 5) + hash) + {constructorIndex};");
+        i = 0;
+        foreach (Formal arg in ctor.Formals) {
+          if (!arg.IsGhost) {
+            string nm = FieldName(arg, i);
+            w.Write("hash = ((hash << 5) + hash) + ");
+            if (IsJavaPrimitiveType(arg.Type)) {
+              w.WriteLine($"{BoxedTypeName(arg.Type, w, Token.NoToken)}.hashCode(this.{nm});");
+            } else {
+              w.WriteLine($"java.util.Objects.hashCode(this.{nm});");
+            }
+            i++;
+          }
+        }
+        w.WriteLine("return (int)hash;");
+      }
+
+      wr.WriteLine();
+      wr.WriteLine("@Override");
+      {
+        var w = wr.NewBlock("public String toString()");
+        string nm;
+        if (dt is TupleTypeDecl) {
+          nm = "";
+        } else {
+          nm = (dt.EnclosingModuleDefinition.TryToAvoidName ? "" : dt.EnclosingModuleDefinition.Name + ".") + dt.Name + "." + ctor.Name;
+        }
+        if (dt is TupleTypeDecl && ctor.Formals.Count == 0) {
+          // here we want parentheses and no name
+          w.WriteLine("return \"()\";");
+        } else if (dt is CoDatatypeDecl) {
+          w.WriteLine($"return \"{nm}\";");
+        } else {
+          var tempVar = GenVarName("s", ctor.Formals);
+          w.WriteLine($"StringBuilder {tempVar} = new StringBuilder();");
+          w.WriteLine($"{tempVar}.append(\"{nm}\");");
+          if (ctor.Formals.Count != 0) {
+            w.WriteLine($"{tempVar}.append(\"(\");");
+            i = 0;
+            foreach (var arg in ctor.Formals) {
+              if (!arg.IsGhost) {
+                if (i != 0) {
+                  w.WriteLine($"{tempVar}.append(\", \");");
+                }
+                w.Write($"{tempVar}.append(");
+                var memberName = FieldName(arg, i);
+                if (UnicodeCharEnabled && arg.Type.IsCharType) {
+                  w.Write($"{DafnyHelpersClass}.ToCharLiteral(this.{memberName})");
+                } else if (UnicodeCharEnabled && arg.Type.IsStringType) {
+                  w.Write($"{DafnyHelpersClass}.ToStringLiteral(this.{memberName})");
+                } else if (IsJavaPrimitiveType(arg.Type)) {
+                  w.Write($"this.{memberName}");
+                } else {
+                  w.Write($"{DafnyHelpersClass}.toString(this.{memberName})");
+                }
+                w.WriteLine(");");
+                i++;
+              }
+            }
+            w.WriteLine($"{tempVar}.append(\")\");");
+          }
+          w.WriteLine($"return {tempVar}.toString();");
+        }
+      }
+    }
+
+    string DtCtorDeclarationName(DatatypeCtor ctor, List<TypeParameter>/*?*/ typeParams) {
+      Contract.Requires(ctor != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      return DtCtorDeclarationName(ctor) + TypeParameters(typeParams);
+    }
+    string DtCtorDeclarationName(DatatypeCtor ctor) {
+      Contract.Requires(ctor != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      var dt = ctor.EnclosingDatatype;
+      return dt.IsRecordType ? IdName(dt) : dt.GetCompileName(Options) + "_" + ctor.GetCompileName(Options);
+    }
+    string DtCtorName(DatatypeCtor ctor, List<Type> typeArgs, ConcreteSyntaxTree wr) {
+      Contract.Requires(ctor != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      var s = DtCtorName(ctor);
+      if (typeArgs != null && typeArgs.Count != 0) {
+        s += "<" + BoxedTypeNames(typeArgs, wr, ctor.Origin) + ">";
+      }
+      return s;
+    }
+    string DtCtorName(DatatypeCtor ctor) {
+      Contract.Requires(ctor != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      var dt = ctor.EnclosingDatatype;
+      if (dt is TupleTypeDecl tupleDecl) {
+        return DafnyTupleClass(tupleDecl.NonGhostDims);
+      }
+      var dtName = IdProtectModule(dt.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdName(dt);
+      return dt.IsRecordType ? dtName : dtName + "_" + ctor.GetCompileName(Options);
+    }
+    string DtCreateName(DatatypeCtor ctor) {
+      Contract.Assert(!ctor.IsGhost); // there should never be an occasion to ask for a ghost constructor
+      if (ctor.EnclosingDatatype.IsRecordType) {
+        return "create";
+      }
+      return "create_" + ctor.GetCompileName(Options);
+    }
+
+    private string FieldName(Formal formal, int i) {
+      Contract.Requires(formal != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      return IdProtect(InternalFieldPrefix + (formal.HasName ? formal.CompileName : "a" + i));
+    }
+
+    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
+      var wStmts = wr.Fork();
+      wr.Write("System.out.print(");
+      EmitToString(wr, arg, wStmts);
+      wr.WriteLine(");");
+    }
+
+    protected void EmitToString(ConcreteSyntaxTree wr, Expression arg, ConcreteSyntaxTree wStmts) {
+      if (arg.Type.IsArrowType) {
+        var expr = arg.Resolved;
+        if (expr is IdentifierExpr id) {
+          wr.Write(IdName(id.Var) + " == null ? null : \"Function\"");
+        } else {
+          wr.Write("\"Function\"");
+        }
+      } else {
+        var argumentWriter = EmitToString(wr, arg.Type);
+        argumentWriter.Append(Expr(arg, false, wStmts));
+      }
+    }
+
+    private ConcreteSyntaxTree EmitToString(ConcreteSyntaxTree wr, Type type) {
+      Contract.Requires(!type.IsArrayType);
+      ConcreteSyntaxTree argumentWriter;
+      type = DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, type);
+      if (AsNativeType(type) != null && AsNativeType(type).LowerBound >= 0) {
+        var nativeName = GetNativeTypeName(AsNativeType(type));
+        switch (AsNativeType(type).Sel) {
+          case NativeType.Selection.Byte:
+            wr.Write("java.lang.Integer.toUnsignedString(java.lang.Byte.toUnsignedInt(");
+            argumentWriter = wr.Fork();
+            wr.Write("))");
+            break;
+          case NativeType.Selection.UShort:
+            wr.Write("java.lang.Integer.toUnsignedString(java.lang.Short.toUnsignedInt(");
+            argumentWriter = wr.Fork();
+            wr.Write("))");
+            break;
+          case NativeType.Selection.UInt:
+            wr.Write("java.lang.Integer.toUnsignedString(");
+            argumentWriter = wr.Fork();
+            wr.Write(")");
+            break;
+          case NativeType.Selection.ULong:
+            wr.Write("java.lang.Long.toUnsignedString(");
+            argumentWriter = wr.Fork();
+            wr.Write(")");
+            break;
+          default:
+            // Should be an unsigned type by assumption
+            Contract.Assert(false);
+            throw new cce.UnreachableException();
+        }
+      } else {
+        bool isGeneric = type.NormalizeToAncestorType().AsSeqType is { Arg: { IsTypeParameter: true } };
+        if (type.NormalizeToAncestorType().IsStringType) {
+          argumentWriter = wr.ForkInParens();
+          wr.Write(".verbatimString()");
+        } else if (type.NormalizeToAncestorType().IsCharType && UnicodeCharEnabled) {
+          wr.Write($"{DafnyHelpersClass}.ToCharLiteral(");
+          argumentWriter = wr.Fork();
+          wr.Write(")");
+        } else if (isGeneric && !UnicodeCharEnabled) {
+          wr.Write($"((java.util.function.Function<{DafnySeqClass}<?>,String>)(_s -> (_s.elementType().defaultValue().getClass() == java.lang.Character.class ? _s.verbatimString() : String.valueOf(_s)))).apply(");
+          argumentWriter = wr.Fork();
+          wr.Write(")");
+        } else {
+          wr.Write("java.lang.String.valueOf(");
+          argumentWriter = wr.Fork();
+          wr.Write(")");
+        }
+      }
+      return argumentWriter;
+    }
+
+    protected override string IdProtect(string name) {
+      return PublicIdProtectAux(name);
+    }
+
+    public override string PublicIdProtect(string name) {
+      return PublicIdProtectAux(name);
+    }
+
+    private static string PublicIdProtectAux(string name) {
+      name = name.Replace("_module", "_System");
+      if (name == "" || name.First() == '_') {
+        return name; // no need to further protect this name
+      }
+
+      // TODO: Finish with all the public IDs that need to be protected
+      switch (name) {
+        // keywords Java 8 and before
+        // https://docs.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
+        case "abstract":
+        case "assert":
+        case "break":
+        case "byte":
+        case "case":
+        case "catch":
+        case "char":
+        case "class":
+        case "continue":
+        case "default":
+        case "do":
+        case "double":
+        case "else":
+        case "enum":
+        case "extends":
+        case "final":
+        case "finally":
+        case "float":
+        case "for":
+        case "if":
+        case "implements":
+        case "import":
+        case "instanceof":
+        case "int":
+        case "interface":
+        case "long":
+        case "native":
+        case "new":
+        case "package":
+        case "private":
+        case "public":
+        case "return":
+        case "short":
+        case "static":
+        case "strictfp":
+        case "super":
+        case "switch":
+        case "synchronized":
+        case "this":
+        case "throw":
+        case "throws":
+        case "transient":
+        case "try":
+        case "void":
+        case "volatile":
+        case "while":
+        // keywords since Java 9
+        case "exports":
+        case "module":
+        case "requires":
+        // no longer used in Java but still reserved as keywords
+        case "const":
+        case "goto":
+        // special identifiers since Java 10
+        case "var":
+        // literal values
+        case "false":
+        case "null":
+        case "true":
+        case "toString":
+        case "equals":
+        case "hashCode":
+        case "Default":
+          return name + "_"; // TODO: figure out what to do here (C# uses @, Go uses _, JS uses _$$_)
+        default:
+          return name; // Package name is not a keyword, so it can be used
+      }
+    }
+
+    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
+      outParams = outParams.Where(f => !f.IsGhost).ToList();
+      if (outParams.Count == 0) {
+        wr.WriteLine("return;");
+      } else if (outParams.Count == 1) {
+        wr.WriteLine($"return {IdName(outParams[0])};");
+      } else {
+        wr.WriteLine($"return new {DafnyTupleClass(outParams.Count)}<>({Util.Comma(outParams, IdName)});");
+      }
+    }
+
+    // TODO: See if more types need to be added
+    bool IsDirectlyComparable(Type t) {
+      Contract.Requires(t != null);
+      return t.IsBoolType || t.IsCharType || t.IsRefType || AsJavaNativeType(t) != null;
+    }
+
+    protected override void EmitActualTypeArgs(List<Type> typeArgs, IOrigin tok, ConcreteSyntaxTree wr) {
+      if (typeArgs.Count != 0) {
+        wr.Write("<" + BoxedTypeNames(typeArgs, wr, tok) + ">");
+      }
+    }
+
+    protected override void EmitNameAndActualTypeArgs(string protectedName, List<Type> typeArgs, IOrigin tok,
+      Expression customReceiver, bool receiverAsArgument, ConcreteSyntaxTree wr) {
+      EmitActualTypeArgs(typeArgs, tok, wr);
+      wr.Write(protectedName);
+    }
+
+    protected override void EmitNew(Type type, IOrigin tok, CallStmt initCall, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var ctor = (Constructor)initCall?.Method; // correctness of cast follows from precondition of "EmitNew"
+      wr.Write($"new {TypeName(type, wr, tok)}(");
+      var sep = "";
+      if (type is UserDefinedType definedType) {
+        var typeArguments = TypeArgumentInstantiation.ListFromClass(definedType.ResolvedClass, definedType.TypeArgs);
+        EmitTypeDescriptorsActuals(typeArguments, tok, wr, ref sep);
+      }
+      wr.Write(ConstructorArguments(initCall, wStmts, ctor, sep));
+      wr.Write(")");
+    }
+
+    /// <summary>
+    /// Returns whether or not there is a run-time type descriptor corresponding to "tp".
+    ///
+    /// Note, one might think that this method should return "tp.Characteristics.HasCompiledValue".
+    /// However, currently, all built-in collection types in Java use type descriptors for their arguments.
+    /// To get this threaded through everywhere, all type arguments must always be passed with a
+    /// corresponding type descriptor. :(  Thus, this method returns "true".
+    /// </summary>
+    protected override bool NeedsTypeDescriptor(TypeParameter tp) {
+      return tp.Parent is not TupleTypeDecl;
+    }
+
+    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
+      if (cl is DatatypeDecl dt) {
+        needsTypeParameter = isStatic || DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _);
+        needsTypeDescriptor = true;
+      } else if (cl is TraitDecl) {
+        needsTypeParameter = isStatic || lookasideBody;
+        needsTypeDescriptor = isStatic || lookasideBody;
+      } else {
+        Contract.Assert(cl is ClassDecl);
+        needsTypeParameter = isStatic;
+        needsTypeDescriptor = isStatic;
+      }
+    }
+
+    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      type = DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(Options, type);
+      if (type is BoolType) {
+        return $"{DafnyTypeDescriptor}.BOOLEAN";
+      } else if (type is CharType) {
+        return UnicodeCharEnabled ? $"{DafnyTypeDescriptor}.UNICODE_CHAR" : $"{DafnyTypeDescriptor}.CHAR";
+      } else if (type is IntType or BigOrdinalType) {
+        return $"{DafnyTypeDescriptor}.BIG_INTEGER";
+      } else if (type is RealType) {
+        return $"{DafnyTypeDescriptor}.BIG_RATIONAL";
+      } else if (type is BitvectorType) {
+        var t = (BitvectorType)type;
+        if (t.NativeType != null) {
+          return GetNativeTypeDescriptor(AsNativeType(type));
+        } else {
+          return $"{DafnyTypeDescriptor}.BIG_INTEGER";
+        }
+      } else if (type is SetType setType) {
+        return AddTypeDescriptorArgs(DafnySetClass, setType.TypeArgs, setType.TypeArgs, wr, tok);
+      } else if (type is SeqType seqType) {
+        return AddTypeDescriptorArgs(DafnySeqClass, seqType.TypeArgs, seqType.TypeArgs, wr, tok);
+      } else if (type is MultiSetType multiSetType) {
+        return AddTypeDescriptorArgs(DafnyMultiSetClass, multiSetType.TypeArgs, multiSetType.TypeArgs, wr, tok);
+      } else if (type is MapType mapType) {
+        return AddTypeDescriptorArgs(DafnyMapClass, mapType.TypeArgs, mapType.TypeArgs, wr, tok);
+      } else if (type.IsArrayType) {
+        ArrayClassDecl at = type.AsArrayType;
+        var elType = UserDefinedType.ArrayElementType(type);
+        var elTypeName = TypeName(elType, wr, tok, true);
+        if (at.Dims > 1) {
+          return $"{DafnyMultiArrayClass(at.Dims)}.<{elTypeName}>{TypeMethodName}()";
+        } else if (elType.IsBoolType) {
+          return $"{DafnyTypeDescriptor}.BOOLEAN_ARRAY";
+        } else if (elType.IsCharType) {
+          return $"{DafnyTypeDescriptor}.CHAR_ARRAY";
+        } else if (AsNativeType(elType) != null) {
+          switch (AsJavaNativeType(elType)) {
+            case JavaNativeType.Byte: return $"{DafnyTypeDescriptor}.BYTE_ARRAY";
+            case JavaNativeType.Short: return $"{DafnyTypeDescriptor}.SHORT_ARRAY";
+            case JavaNativeType.Int: return $"{DafnyTypeDescriptor}.INT_ARRAY";
+            case JavaNativeType.Long: return $"{DafnyTypeDescriptor}.LONG_ARRAY";
+            default:
+              Contract.Assert(false);
+              throw new cce.UnreachableException();
+          }
+        } else {
+          return $"(({DafnyTypeDescriptor}<{BoxedTypeName(type, wr, tok)}>)({TypeDescriptor(elType, wr, tok)}).arrayType())";
+        }
+      } else if (type.IsObjectQ || type.IsObject) {
+        return $"{DafnyTypeDescriptor}.OBJECT";
+      } else if (type.IsRefType || type.IsTraitType) {
+        var typeName = TypeName(type, wr, tok);
+        var typeNameSansTypeParameters = StripTypeParameters(typeName);
+        return $"(({DafnyTypeDescriptor}<{typeName}>)" +
+               "(java.lang.Object)" +
+               $"{DafnyTypeDescriptor}.reference({typeNameSansTypeParameters}.class))";
+      } else if (type.IsTypeParameter) {
+        var tp = type.AsTypeParameter;
+        Contract.Assert(tp != null);
+        if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(tp, out var instantiatedTypeParameter)) {
+          return TypeDescriptor(instantiatedTypeParameter, wr, tok);
+        }
+        return FormatTypeDescriptorVariable(type.AsTypeParameter.GetCompileName(Options));
+      } else if (type.IsBuiltinArrowType && type.AsArrowType.Arity == 1) {
+        // Can't go the usual route because java.util.function.Function doesn't have a _typeDescriptor() method
+        var arrowType = type.AsArrowType;
+        return $"{DafnyTypeDescriptor}.function({TypeDescriptor(arrowType.Args[0], wr, tok)}, {TypeDescriptor(arrowType.Result, wr, tok)})";
+      } else if (type is UserDefinedType udt) {
+        var s = FullTypeName(udt, null, true);
+        var cl = udt.ResolvedClass;
+        Contract.Assert(cl != null);
+
+        if (cl.IsExtern(Options, out _, out _)) {
+          var td = $"{DafnyTypeDescriptor}.<{BoxedTypeName(type, wr, tok)}> findType({s}.class";
+          if (udt.TypeArgs != null && udt.TypeArgs.Count > 0) {
+            td += $", {Util.Comma(udt.TypeArgs, arg => TypeDescriptor(arg, wr, tok))}";
+          }
+          return td + ")";
+        }
+
+        List<Type> relevantTypeArgs;
+        if (type.IsBuiltinArrowType) {
+          relevantTypeArgs = type.TypeArgs;
+        } else if (cl is DatatypeDecl dt) {
+          relevantTypeArgs = udt.TypeArgs;
+        } else {
+          relevantTypeArgs = new List<Type>();
+          for (int i = 0; i < cl.TypeArgs.Count; i++) {
+            if (NeedsTypeDescriptor(cl.TypeArgs[i])) {
+              relevantTypeArgs.Add(udt.TypeArgs[i]);
+            }
+          }
+        }
+
+        return AddTypeDescriptorArgs(s, udt.TypeArgs, relevantTypeArgs, wr, udt.Origin);
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();
+      }
+    }
+
+    private string GetNativeTypeDescriptor(NativeType nt) {
+      switch (AsJavaNativeType(nt)) {
+        case JavaNativeType.Byte: return $"{DafnyTypeDescriptor}.BYTE";
+        case JavaNativeType.Short: return $"{DafnyTypeDescriptor}.SHORT";
+        case JavaNativeType.Int: return $"{DafnyTypeDescriptor}.INT";
+        case JavaNativeType.Long: return $"{DafnyTypeDescriptor}.LONG";
+        default: Contract.Assert(false); throw new cce.UnreachableException();
+      }
+    }
+
+    private string AddTypeDescriptorArgs(string fullCompileName, List<Type> typeArgs, List<Type> relevantTypeArgs, ConcreteSyntaxTree wr, IOrigin tok) {
+      Contract.Requires(fullCompileName != null);
+      Contract.Requires(typeArgs != null);
+      Contract.Requires(relevantTypeArgs != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(tok != null);
+
+      string s = $"{IdProtect(fullCompileName)}.";
+      if (typeArgs != null && typeArgs.Count != 0) {
+        s += $"<{BoxedTypeNames(typeArgs, wr, tok)}>";
+      }
+      s += $"{TypeMethodName}(";
+      s += Util.Comma(relevantTypeArgs, arg => TypeDescriptor(arg, wr, tok));
+      return s + ")";
+    }
+
+    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
+      wr.WriteLine($"java.util.ArrayList<{BoxedTypeName(e.Type.NormalizeToAncestorType().AsSetType.Arg, wr, e.Origin)}> {collectionName} = new java.util.ArrayList<>();");
+    }
+
+    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
+      var mt = e.Type.NormalizeToAncestorType().AsMapType;
+      var domType = mt.Domain;
+      var ranType = mt.Range;
+      wr.WriteLine($"java.util.HashMap<{BoxedTypeName(domType, wr, e.Origin)}, {BoxedTypeName(ranType, wr, e.Origin)}> {collectionName} = new java.util.HashMap<>();");
+    }
+
+    protected override void OrganizeModules(Program program, out List<ModuleDefinition> modules) {
+      modules = new List<ModuleDefinition>();
+      foreach (var m in program.CompileModules) {
+        if (!m.IsDefaultModule && !m.Name.Equals("_System")) {
+          modules.Add(m);
+        }
+      }
+      foreach (var m in program.CompileModules) {
+        if (m.Name.Equals("_System")) {
+          modules.Add(m);
+        }
+      }
+      foreach (var m in program.CompileModules) {
+        if (m.IsDefaultModule) {
+          modules.Add(m);
+        }
+      }
+    }
+
+    protected override bool AllowMixingImportsAndNonImports => false;
+
+    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
+      var dt = dtv.Ctor.EnclosingDatatype;
+      var typeArgs = SelectNonGhost(dt, dtv.InferredTypeArgs);
+      EmitDatatypeValue(dt, dtv.Ctor, typeArgs, dtv.IsCoCall, typeDescriptorArguments, arguments, wr);
+    }
+
+    void EmitDatatypeValue(DatatypeDecl dt, DatatypeCtor ctor, List<Type> typeArgs, bool isCoCall,
+      string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
+      var modname = IdProtectModule(dt.EnclosingModuleDefinition.GetCompileName(Options));
+      modname = (modname == ModuleName ? "" : modname + ".");
+      var dtName = dt is TupleTypeDecl tupleDecl
+        ? DafnyTupleClass(tupleDecl.NonGhostDims)
+        : modname + IdName(dt);
+      var typeParams = typeArgs.Count == 0 ? "" : $"<{BoxedTypeNames(typeArgs, wr, dt.Origin)}>";
+      var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
+      if (!isCoCall) {
+        // For an ordinary constructor (that is, one that does not guard any co-recursive calls), generate:
+        //   Dt.<T>create_Cons( args )
+        wr.Write($"{dtName}.{typeParams}{DtCreateName(ctor)}({typeDescriptorArguments}{sep}{arguments})");
+      } else {
+        var sep0 = typeDescriptorArguments.Length != 0 ? ", " : "";
+
+        wr.Write($"new {modname}{IdName(dt)}__Lazy({typeDescriptorArguments}{sep0}");
+        wr.Write("() -> { return ");
+        wr.Write($"new {DtCtorName(ctor)}{typeParams}({typeDescriptorArguments}{sep}{arguments})");
+        wr.Write("; })");
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IOrigin tok, List<string> inNames,
+        Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
+      // TODO: there may be an opportunity to share code with CreateIIFE,
+      // which may be worth it given all the necessary coercions.
+
+      wr.Write('(');
+      if (!untyped) {
+        wr.Write("({0}<{1}{2}>)", DafnyFunctionIface(inTypes.Count), Util.Comma("", inTypes, t => BoxedTypeName(t, wr, tok) + ", "), BoxedTypeName(resultType, wr, tok));
+      }
+      var boxedInNames = inNames.Select(inName => ProtectedFreshId(inName + "_boxed")).ToList();
+      wr.Write($"({boxedInNames.Comma(nm => nm)}) ->");
+      var w = wr.NewExprBlock("");
+      wr.Write(")");
+
+      for (var i = 0; i < inNames.Count; i++) {
+        w.Write($"{TypeName(inTypes[i], w, tok)} {inNames[i]} = ");
+        var coercedW = EmitCoercionIfNecessary(NativeObjectType, inTypes[i], tok, w);
+        coercedW.Write(boxedInNames[i]);
+        w.WriteLine(";");
+      }
+
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IOrigin resultTok, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"(({DafnyFunctionIface(0)}<{BoxedTypeName(resultType, wr, resultTok)}>)(() ->");
+      var w = wr.NewBigExprBlock("", ")).apply()");
+      return w;
+    }
+
+    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      switch (op) {
+        case ResolvedUnaryOp.BoolNot:
+          TrParenExpr("!", expr, wr, inLetExprBody, wStmts);
+          break;
+        case ResolvedUnaryOp.BitwiseNot:
+          if (AsNativeType(expr.Type) != null) {
+            TrParenExpr(CastIfSmallNativeType(expr.Type) + "~", expr, wr, inLetExprBody, wStmts);
+          } else {
+            TrParenExpr("", expr, wr, inLetExprBody, wStmts);
+            wr.Write(".not()");
+          }
+          break;
+        case ResolvedUnaryOp.Cardinality: {
+            var collectionType = expr.Type.NormalizeToAncestorType().AsCollectionType;
+            if (collectionType is MultiSetType) {
+              TrParenExpr("", expr, wr, inLetExprBody, wStmts);
+              wr.Write(".cardinality()");
+            } else if (collectionType is SetType or MapType) {
+              TrParenExpr("java.math.BigInteger.valueOf(", expr, wr, inLetExprBody, wStmts);
+              wr.Write(".size())");
+            } else if (expr.Type.IsArrayType) {
+              TrParenExpr("java.math.BigInteger.valueOf(java.lang.reflect.Array.getLength", expr, wr, inLetExprBody, wStmts);
+              wr.Write(")");
+            } else {
+              TrParenExpr("java.math.BigInteger.valueOf(", expr, wr, inLetExprBody, wStmts);
+              wr.Write(".length())");
+            }
+            break;
+          }
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
+      }
+    }
+
+    // Find the class with static methods like "divideUnsigned" for the type
+    private string HelperClass(NativeType nt) {
+      return AsJavaNativeType(nt) == JavaNativeType.Long ? "java.lang.Long" : "java.lang.Integer";
+    }
+
+    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op, Type e0Type, Type e1Type, IOrigin tok,
+      Type resultType, out string opString,
+      out string preOpString, out string postOpString, out string callString, out string staticCallString,
+      out bool reverseArguments, out bool truncateResult, out bool convertE1_to_int, out bool coerceE1,
+      ConcreteSyntaxTree errorWr) {
+      opString = null;
+      preOpString = "";
+      postOpString = "";
+      callString = null;
+      staticCallString = null;
+      reverseArguments = false;
+      truncateResult = false;
+      convertE1_to_int = false;
+      coerceE1 = false;
+
+      void doPossiblyNativeBinOp(string o, string name, out string preOpS, out string opS,
+        out string postOpS, out string callS, out string staticCallS) {
+        if (AsNativeType(resultType) != null) {
+          var nativeName = GetNativeTypeName(AsNativeType(resultType));
+          if (o == ">>>" && resultType.AsBitVectorType is { Width: var width and (8 or 16 or 32 or 64) }) {
+            // Solves https://github.com/dafny-lang/dafny/issues/3734
+            preOpS = CastIfSmallNativeType(resultType);
+            opS = null;
+            postOpS = "";
+            callS = null;
+            staticCallS = $"{DafnyHelpersClass}.bv{width}ShiftRight";
+          } else if (o == "<<" && resultType.AsBitVectorType is { Width: var width2 and (32 or 64) }) {
+            // Solves https://github.com/dafny-lang/dafny/issues/3734
+            preOpS = CastIfSmallNativeType(resultType);
+            opS = null;
+            postOpS = "";
+            callS = null;
+            staticCallS = $"{DafnyHelpersClass}.bv{width2}ShiftLeft";
+          } else {
+            preOpS = $"({nativeName}) {CastIfSmallNativeType(resultType)}(";
+            opS = o;
+            postOpS = ")";
+            callS = null;
+            staticCallS = null;
+          }
+        } else {
+          callS = name;
+          preOpS = "";
+          opS = null;
+          postOpS = "";
+          staticCallS = null;
+        }
+      }
+
+      switch (op) {
+        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
+          doPossiblyNativeBinOp("&", "and", out preOpString, out opString, out postOpString, out callString, out staticCallString);
+          break;
+        case BinaryExpr.ResolvedOpcode.BitwiseOr:
+          doPossiblyNativeBinOp("|", "or", out preOpString, out opString, out postOpString, out callString, out staticCallString);
+          break;
+        case BinaryExpr.ResolvedOpcode.BitwiseXor:
+          doPossiblyNativeBinOp("^", "xor", out preOpString, out opString, out postOpString, out callString, out staticCallString);
+          break;
+        case BinaryExpr.ResolvedOpcode.EqCommon: {
+            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0Type);
+            if (eqType.IsRefType) {
+              opString = "== (Object) ";
+            } else if (IsDirectlyComparable(eqType)) {
+              opString = "==";
+            } else {
+              staticCallString = "java.util.Objects.equals";
+            }
+            break;
+          }
+        case BinaryExpr.ResolvedOpcode.NeqCommon: {
+            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0Type);
+            if (eqType.IsRefType) {
+              opString = "!= (Object) ";
+            } else if (IsDirectlyComparable(eqType)) {
+              opString = "!=";
+            } else {
+              preOpString = "!";
+              staticCallString = "java.util.Objects.equals";
+            }
+            break;
+          }
+        case BinaryExpr.ResolvedOpcode.Lt:
+        case BinaryExpr.ResolvedOpcode.Le:
+        case BinaryExpr.ResolvedOpcode.Ge:
+        case BinaryExpr.ResolvedOpcode.Gt:
+          var call = false;
+          var argNative = AsNativeType(e0Type);
+          if (argNative != null && argNative.LowerBound >= 0) {
+            staticCallString = HelperClass(argNative) + ".compareUnsigned";
+            call = true;
+          } else if (argNative == null) {
+            callString = "compareTo";
+            call = true;
+          }
+          if (call) {
+            switch (op) {
+              case BinaryExpr.ResolvedOpcode.Lt:
+                postOpString = " < 0";
+                break;
+              case BinaryExpr.ResolvedOpcode.Le:
+                postOpString = " <= 0";
+                break;
+              case BinaryExpr.ResolvedOpcode.Ge:
+                postOpString = " >= 0";
+                break;
+              case BinaryExpr.ResolvedOpcode.Gt:
+                postOpString = " > 0";
+                break;
+              default:
+                Contract.Assert(false);
+                throw new cce.UnreachableException();
+            }
+          } else {
+            switch (op) {
+              case BinaryExpr.ResolvedOpcode.Lt:
+                opString = "<";
+                break;
+              case BinaryExpr.ResolvedOpcode.Le:
+                opString = "<=";
+                break;
+              case BinaryExpr.ResolvedOpcode.Ge:
+                opString = ">=";
+                break;
+              case BinaryExpr.ResolvedOpcode.Gt:
+                opString = ">";
+                break;
+              default:
+                Contract.Assert(false);
+                throw new cce.UnreachableException();
+            }
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.LeftShift:
+          doPossiblyNativeBinOp("<<", "shiftLeft", out preOpString, out opString, out postOpString, out callString, out staticCallString);
+          truncateResult = true;
+          convertE1_to_int = AsNativeType(e1Type) == null;
+          break;
+        case BinaryExpr.ResolvedOpcode.RightShift:
+          doPossiblyNativeBinOp(">>>", "shiftRight", out preOpString, out opString, out postOpString, out callString, out staticCallString);
+          convertE1_to_int = AsNativeType(e1Type) == null;
+          break;
+        case BinaryExpr.ResolvedOpcode.Add:
+          truncateResult = true;
+          if (resultType.IsCharType) {
+            preOpString = $"({CharTypeName(false)}) (";
+            postOpString = ")";
+            opString = "+";
+          } else {
+            doPossiblyNativeBinOp("+", "add", out preOpString, out opString, out postOpString, out callString, out staticCallString);
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Sub:
+          truncateResult = true;
+          if (resultType.IsCharType) {
+            preOpString = $"({CharTypeName(false)}) (";
+            opString = "-";
+            postOpString = ")";
+          } else {
+            doPossiblyNativeBinOp("-", "subtract", out preOpString, out opString, out postOpString, out callString, out staticCallString);
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mul:
+          doPossiblyNativeBinOp("*", "multiply", out preOpString, out opString, out postOpString, out callString, out staticCallString);
+          truncateResult = true;
+          break;
+        case BinaryExpr.ResolvedOpcode.Div:
+          if (NeedsEuclideanDivision(resultType)) {
+            staticCallString = $"{DafnyEuclideanClass}.EuclideanDivision";
+          } else if (AsNativeType(resultType) != null) {
+            var nt = AsNativeType(resultType);
+            if (nt.Sel == NativeType.Selection.Byte) {
+              staticCallString = $"{DafnyHelpersClass}.divideUnsignedByte";
+            } else if (nt.Sel == NativeType.Selection.UShort) {
+              staticCallString = $"{DafnyHelpersClass}.divideUnsignedShort";
+            } else {
+              preOpString = CastIfSmallNativeType(resultType);
+              staticCallString = HelperClass(AsNativeType(resultType)) + ".divideUnsigned";
+            }
+          } else {
+            callString = "divide";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mod:
+          if (NeedsEuclideanDivision(resultType)) {
+            staticCallString = $"{DafnyEuclideanClass}.EuclideanModulus";
+          } else if (AsNativeType(resultType) != null) {
+            var nt = AsNativeType(resultType);
+            if (nt.Sel == NativeType.Selection.Byte) {
+              staticCallString = $"{DafnyHelpersClass}.remainderUnsignedByte";
+            } else if (nt.Sel == NativeType.Selection.UShort) {
+              staticCallString = $"{DafnyHelpersClass}.remainderUnsignedShort";
+            } else {
+              preOpString = CastIfSmallNativeType(resultType);
+              staticCallString = HelperClass(AsNativeType(resultType)) + ".remainderUnsigned";
+            }
+          } else {
+            callString = "mod";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.SetEq:
+        case BinaryExpr.ResolvedOpcode.MultiSetEq:
+        case BinaryExpr.ResolvedOpcode.SeqEq:
+        case BinaryExpr.ResolvedOpcode.MapEq:
+          callString = "equals";
+          break;
+        case BinaryExpr.ResolvedOpcode.ProperSubset:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
+          callString = "isProperSubsetOf";
+          break;
+        case BinaryExpr.ResolvedOpcode.Subset:
+        case BinaryExpr.ResolvedOpcode.MultiSubset:
+          callString = "isSubsetOf";
+          break;
+        case BinaryExpr.ResolvedOpcode.Disjoint:
+        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
+          callString = $"<{BoxedTypeName(e1Type.NormalizeToAncestorType().AsCollectionType.Arg, errorWr, tok)}>disjoint";
+          break;
+        case BinaryExpr.ResolvedOpcode.InSet:
+        case BinaryExpr.ResolvedOpcode.InMultiSet:
+        case BinaryExpr.ResolvedOpcode.InMap:
+          callString = $"<{BoxedTypeName(e0Type, errorWr, tok)}>contains";
+          reverseArguments = true;
+          coerceE1 = true;
+          break;
+
+        case BinaryExpr.ResolvedOpcode.Union:
+          staticCallString = $"{DafnySetClass}.<{BoxedTypeName(resultType.AsSetType.Arg, errorWr, tok)}>union";
+          break;
+        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+          staticCallString = $"{DafnyMultiSetClass}.<{BoxedTypeName(resultType.AsMultiSetType.Arg, errorWr, tok)}>union";
+          break;
+        case BinaryExpr.ResolvedOpcode.MapMerge:
+          staticCallString = $"{DafnyMapClass}.<{BoxedTypeName(resultType.AsMapType.Domain, errorWr, tok)}, {BoxedTypeName(resultType.AsMapType.Range, errorWr, tok)}>merge";
+          break;
+        case BinaryExpr.ResolvedOpcode.Intersection:
+          staticCallString = $"{DafnySetClass}.<{BoxedTypeName(resultType.AsSetType.Arg, errorWr, tok)}>intersection";
+          break;
+        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+          staticCallString = $"{DafnyMultiSetClass}.<{BoxedTypeName(resultType.AsMultiSetType.Arg, errorWr, tok)}>intersection";
+          break;
+        case BinaryExpr.ResolvedOpcode.SetDifference:
+          staticCallString = $"{DafnySetClass}.<{BoxedTypeName(resultType.AsSetType.Arg, errorWr, tok)}>difference";
+          break;
+        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+          staticCallString = $"{DafnyMultiSetClass}.<{BoxedTypeName(resultType.AsMultiSetType.Arg, errorWr, tok)}>difference";
+          break;
+        case BinaryExpr.ResolvedOpcode.MapSubtraction:
+          staticCallString = $"{DafnyMapClass}.<{BoxedTypeName(resultType.AsMapType.Domain, errorWr, tok)}, {BoxedTypeName(resultType.AsMapType.Range, errorWr, tok)}>subtract";
+          break;
+
+        case BinaryExpr.ResolvedOpcode.ProperPrefix:
+          callString = "isProperPrefixOf";
+          break;
+        case BinaryExpr.ResolvedOpcode.Prefix:
+          callString = "isPrefixOf";
+          break;
+        case BinaryExpr.ResolvedOpcode.Concat:
+          staticCallString = $"{DafnySeqClass}.<{BoxedTypeName(resultType.AsSeqType.Arg, errorWr, tok)}>concatenate";
+          break;
+        case BinaryExpr.ResolvedOpcode.InSeq:
+          callString = "contains";
+          reverseArguments = true;
+          coerceE1 = true;
+          break;
+        default:
+          base.CompileBinOp(op, e0Type, e1Type, tok, resultType,
+            out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
+            errorWr);
+          break;
+      }
+    }
+
+    private void CreateTuple(int i, ConcreteSyntaxTree outputWr) {
+      Contract.Requires(0 <= i);
+      Contract.Requires(outputWr != null);
+
+      var wrTop = outputWr.NewFile(Path.Combine("dafny", $"Tuple{i}.java"));
+
+      wrTop.WriteLine("package dafny;");
+      wrTop.WriteLine();
+      EmitSuppression(wrTop);
+      wrTop.Write($"public class Tuple{i}");
+      if (i != 0) {
+        wrTop.Write("<{0}>", Util.Comma(i, j => $"T{j}"));
+      }
+
+      var wr = wrTop.NewBlock("");
+      for (var j = 0; j < i; j++) {
+        wr.WriteLine("private T{0} _{0};", j);
+      }
+      wr.WriteLine();
+
+      wr.Write("public Tuple{0}({1}", i, Util.Comma(i, j => $"T{j} _{j}"));
+      var wrCtor = wr.NewBlock(")");
+      for (var j = 0; j < i; j++) {
+        wrCtor.WriteLine("this._{0} = _{0};", j);
+      }
+
+      wr.WriteLine();
+      var typeParams = new List<TypeParameter>();
+      for (var j = 0; j < i; j++) {
+        typeParams.Add(new TypeParameter(SourceOrigin.NoToken, new Name($"T{j}"), TypeParameter.TPVarianceSyntax.Covariant_Permissive));
+      }
+      var typeParamString = TypeParameters(typeParams);
+      var initializer = string.Format("Default({0})", Util.Comma(i, j => $"_td_T{j}.defaultValue()"));
+      EmitTypeDescriptorMethod(null, typeParams, $"Tuple{i}{typeParamString}", initializer, wr);
+
+      // public static Tuple4<T0, T1, T2, T3> Default(dafny.TypeDescriptor<T0> _td_T0, dafny.TypeDescriptor<T1> _td_T1, dafny.TypeDescriptor<T2> _td_T2, dafny.TypeDescriptor<T3> _td_T3) {
+      //   return new Tuple4<>(_td_T0.defaultValue(), _td_T1.defaultValue(), _td_T2.defaultValue(), _td_T3.defaultValue());
+      // }
+      wr.WriteLine();
+      if (i == 0) {
+        wr.Write("public static Tuple0");
+      } else {
+        wr.Write("public static <{1}> Tuple{0}<{1}>", i, Util.Comma(i, j => $"T{j}"));
+      }
+      wr.Write(" Default({0})", Util.Comma(i, j => $"T{j} {FormatDefaultTypeParameterValueName($"T{j}")}"));
+      {
+        var w = wr.NewBlock("");
+        w.WriteLine("return create({0});", Util.Comma(i, j => $"{FormatDefaultTypeParameterValueName($"T{j}")}"));
+      }
+
+      // create method
+      wr.WriteLine();
+      if (i == 0) {
+        wr.Write("public static Tuple0");
+      } else {
+        wr.Write("public static <{1}> Tuple{0}<{1}>", i, Util.Comma(i, j => $"T{j}"));
+      }
+      wr.Write(" create({0})", Util.Comma(i, j => $"T{j} _{j}"));
+      {
+        var w = wr.NewBlock("");
+        w.WriteLine("return new Tuple{0}({1});", i, Util.Comma(i, j => $"_{j}"));
+      }
+
+      wr.WriteLine();
+      wr.WriteLine("@Override");
+      var wrEquals = wr.NewBlock("public boolean equals(Object obj)");
+      wrEquals.WriteLine("if (this == obj) return true;");
+      wrEquals.WriteLine("if (obj == null) return false;");
+      wrEquals.WriteLine("if (getClass() != obj.getClass()) return false;");
+      wrEquals.WriteLine($"Tuple{i} o = (Tuple{i}) obj;");
+      if (i != 0) {
+        wrEquals.WriteLine("return {0};", Util.Comma(" && ", i, j => $"java.util.Objects.equals(this._{j}, o._{j})"));
+      } else {
+        wrEquals.WriteLine("return true;");
+      }
+
+      wr.WriteLine();
+      wr.WriteLine("@Override");
+      var wrToString = wr.NewBlock("public String toString()");
+      wrToString.WriteLine("StringBuilder sb = new StringBuilder();");
+      wrToString.WriteLine("sb.append(\"(\");");
+      for (int j = 0; j < i; j++) {
+        wrToString.WriteLine($"sb.append(_{j} == null ? \"null\" : _{j}.toString());");
+        if (j != i - 1) {
+          wrToString.WriteLine("sb.append(\", \");");
+        }
+      }
+
+      wrToString.WriteLine("sb.append(\")\");");
+      wrToString.WriteLine("return sb.toString();");
+
+      wr.WriteLine();
+      wr.WriteLine("@Override");
+      var wrHashCode = wr.NewBlock("public int hashCode()");
+      wrHashCode.WriteLine("// GetHashCode method (Uses the djb2 algorithm)");
+      wrHashCode.WriteLine(
+        "// https://stackoverflow.com/questions/1579721/why-are-5381-and-33-so-important-in-the-djb2-algorithm");
+      wrHashCode.WriteLine("long hash = 5381;");
+      wrHashCode.WriteLine(
+        "hash = ((hash << 5) + hash) + 0;"); // this is constructor 0 (in fact, it's the only constructor)
+      for (int j = 0; j < i; j++) {
+        wrHashCode.WriteLine("hash = ((hash << 5) + hash) + java.util.Objects.hashCode(this._" + j + ");");
+      }
+
+      wrHashCode.WriteLine("return (int)hash;");
+
+      for (int j = 0; j < i; j++) {
+        wr.WriteLine();
+        wr.WriteLine("public T" + j + " dtor__" + j + "() { return this._" + j + "; }");
+      }
+    }
+
+    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
+      var xType = type.NormalizeExpandKeepConstraints();
+      if (xType is BoolType) {
+        return "false";
+      } else if (xType is CharType) {
+        return UnicodeCharEnabled ? $"((int){CharType.DefaultValueAsString})" : CharType.DefaultValueAsString;
+      } else if (xType is IntType or BigOrdinalType) {
+        return "java.math.BigInteger.ZERO";
+      } else if (xType is RealType) {
+        return $"{DafnyBigRationalClass}.ZERO";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        return t.NativeType != null ? $"{CastIfSmallNativeType(t)}0" : "java.math.BigInteger.ZERO";
+      } else if (xType is CollectionType collType) {
+        string collName = CollectionTypeUnparameterizedName(collType);
+        string argNames = BoxedTypeName(collType.Arg, wr, tok);
+        if (xType is MapType mapType) {
+          argNames += "," + BoxedTypeName(mapType.Range, wr, tok);
+        }
+        string td = "";
+        if (xType is SeqType) {
+          td = TypeDescriptor(collType.Arg, wr, tok);
+        }
+        return $"{collName}.<{argNames}> empty({td})";
+      }
+
+      var udt = (UserDefinedType)xType;
+      var cl = udt.ResolvedClass;
+      Contract.Assert(cl != null);
+      if (cl is TypeParameter tp) {
+        if (usePlaceboValue && !tp.Characteristics.HasCompiledValue) {
+          return "null";
+        } else if (constructTypeParameterDefaultsFromTypeDescriptors) {
+          return $"{FormatTypeDescriptorVariable(tp.GetCompileName(Options))}.defaultValue()";
+        } else {
+          return FormatDefaultTypeParameterValue(tp);
+        }
+      } else if (cl is AbstractTypeDecl opaque) {
+        return FormatDefaultTypeParameterValueName(opaque.GetCompileName(Options));
+      } else if (cl is NewtypeDecl) {
+        var td = (NewtypeDecl)cl;
+        if (td.Witness != null) {
+          return FullTypeName(udt) + ".Witness";
+        } else if (td.NativeType != null) {
+          return GetNativeDefault(td.NativeType);
+        } else {
+          return TypeInitializationValue(td.ConcreteBaseType(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+      } else if (cl is SubsetTypeDecl) {
+        var td = (SubsetTypeDecl)cl;
+        if (td.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+          var relevantTypeArgs = new List<Type>();
+          for (int i = 0; i < td.TypeArgs.Count; i++) {
+            if (NeedsTypeDescriptor(td.TypeArgs[i])) {
+              relevantTypeArgs.Add(udt.TypeArgs[i]);
+            }
+          }
+          string typeParameters = Util.Comma(relevantTypeArgs, arg => TypeDescriptor(arg, wr, tok));
+          return $"{FullTypeName(udt)}.defaultValue({typeParameters})";
+        } else if (td.WitnessKind == SubsetTypeDecl.WKind.Special) {
+          // WKind.Special is only used with -->, ->, and non-null types:
+          Contract.Assert(ArrowType.IsPartialArrowTypeName(td.Name) || ArrowType.IsTotalArrowTypeName(td.Name) || td is NonNullTypeDecl);
+          if (ArrowType.IsPartialArrowTypeName(td.Name)) {
+            return $"(({BoxedTypeName(xType, wr, udt.Origin)}) null)";
+          } else if (ArrowType.IsTotalArrowTypeName(td.Name)) {
+            var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+            // return the lambda expression ((Ty0 x0, Ty1 x1, Ty2 x2) -> rangeDefaultValue)
+            return $"(({Util.Comma(udt.TypeArgs.Count - 1, i => $"{BoxedTypeName(udt.TypeArgs[i], wr, udt.Origin)} {idGenerator.FreshId("x")}")}) -> {rangeDefaultValue})";
+          } else if (((NonNullTypeDecl)td).Class is ArrayClassDecl arrayClass) {
+            // non-null array type; we know how to initialize them
+            var elType = udt.TypeArgs[0];
+            TypeName_SplitArrayName(elType, out var innermostElementType, out var brackets);
+            string bareArray;
+            brackets += Util.Repeat(arrayClass.Dims - 1, "[]");
+            if (innermostElementType.IsTypeParameter) {
+              var cast = $"(java.lang.Object{brackets})";
+              bareArray = $"{cast}{FormatTypeDescriptorVariable(innermostElementType.AsTypeParameter)}.newArray({Util.Comma(arrayClass.Dims, _ => "0")})";
+            } else {
+              var typeNameSansBrackets = TypeName(innermostElementType, wr, udt.Origin, false, true);
+              bareArray = $"new {typeNameSansBrackets}[0]{brackets}";
+            }
+            if (arrayClass.Dims == 1) {
+              return bareArray;
+            } else {
+              var zeros = Util.Repeat(arrayClass.Dims, "0, ");
+              return $"new {DafnyMultiArrayClass(arrayClass.Dims)}<>({TypeDescriptor(elType, wr, tok)}, {zeros}{bareArray})";
+            }
+          } else {
+            return "null";
+          }
+        } else {
+          return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+      } else if (cl is ClassLikeDecl or ArrowTypeDecl) {
+        return $"({BoxedTypeName(xType, wr, udt.Origin)}) null";
+      } else if (cl is DatatypeDecl dt) {
+        if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
+          var typeSubstMap = TypeParameter.SubstitutionMap(dt.TypeArgs, udt.TypeArgs);
+          return TypeInitializationValue(innerType.Subst(typeSubstMap), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+        var s = FullTypeName(udt);
+        var typeargs = "";
+        var nonGhostTypeArgs = SelectNonGhost(cl, udt.TypeArgs);
+        if (nonGhostTypeArgs.Count != 0) {
+          typeargs = $"<{BoxedTypeNames(nonGhostTypeArgs, wr, udt.Origin)}>";
+        }
+        // In an auto-init context (like a field initializer), we may not have
+        // access to all the type descriptors, so we can't construct the
+        // default value, but then null is an acceptable default, since
+        // Dafny proves the value won't be accessed.
+        if (usePlaceboValue) {
+          return $"({s}{typeargs})null";
+        }
+        var wDefaultTypeArguments = new ConcreteSyntaxTree();
+        var sep = "";
+        WriteTypeDescriptors(dt, udt.TypeArgs, wDefaultTypeArguments, ref sep);
+        var relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs);
+        var arguments = relevantTypeArgs.Comma(ta => DefaultValueCoercedIfNecessary(ta.Actual, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors));
+        if (relevantTypeArgs.Count == 0) {
+          sep = "";
+        }
+        return $"{s}.{typeargs}Default({wDefaultTypeArguments}{sep}{arguments})";
+      } else {
+        Contract.Assert(false);
+        throw new cce.UnreachableException(); // unexpected type
+      }
+    }
+
+    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type type, IOrigin tok, ConcreteSyntaxTree wr) {
+      wr.Write("{0} {1} = ", type != null ? TypeName(type, wr, tok, false, false, null) : "var", name);
+      var w = wr.Fork();
+      wr.WriteLine(";");
+      return w;
+    }
+
+    protected override void DeclareLocalOutVar(string name, Type type, IOrigin tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr) {
+      DeclareLocalVar(name, type, tok, false, rhs, wr);
+    }
+
+    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
+      TraitDecl trait, List<Type> superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+      var filename = $"{ModulePath}/{IdProtect(name)}.java";
+      var w = wr.NewFile(filename);
+      w.WriteLine($"// Interface {name}");
+      w.WriteLine($"// Dafny trait {name} compiled into Java");
+      w.WriteLine($"package {ModuleName};");
+      w.WriteLine();
+      EmitSuppression(w); //TODO: Fix implementations so they do not need this suppression
+      var typeParamString = TypeParameters(typeParameters);
+      w.Write($"public interface {IdProtect(name)}{typeParamString}");
+      if (superClasses != null) {
+        string sep = " extends ";
+        foreach (var tr in superClasses) {
+          if (!tr.IsObject) {
+            w.Write($"{sep}{TypeName(tr, w, tok)}");
+            sep = ", ";
+          }
+        }
+      }
+      var instanceMemberWriter = w.NewBlock("");
+      //writing the _Companion class
+      filename = $"{ModulePath}/_Companion_{name}.java";
+      w = w.NewFile(filename);
+      w.WriteLine($"// Interface {name}");
+      w.WriteLine($"// Dafny trait {name} compiled into Java");
+      w.WriteLine($"package {ModuleName};");
+      w.WriteLine();
+      EmitSuppression(w); //TODO: Fix implementations so they do not need this suppression
+      w.Write($"public class _Companion_{name}{typeParamString}");
+      var staticMemberWriter = w.NewBlock("");
+      var ctorBodyWriter = staticMemberWriter.NewBlock($"public _Companion_{name}()");
+
+      if (Options.Get(JavaBackend.LegacyDataConstructors)) {
+        EmitTypeDescriptorMethod(null, typeParameters, name + typeParamString, initializer: null, wr: staticMemberWriter);
+      }
+      return new ClassWriter(this, instanceMemberWriter, ctorBodyWriter, staticMemberWriter);
+    }
+
+    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex,
+      DatatypeCtor ctor, Func<List<Type>> getTypeArgs, Type bvType, ConcreteSyntaxTree wr) {
+      if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
+        Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
+        Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
+        source(wr);
+        return;
+      }
+      string dtorName;
+      if (ctor.EnclosingDatatype is TupleTypeDecl tupleTypeDecl) {
+        Contract.Assert(tupleTypeDecl.NonGhostDims != 1); // such a tuple is an erasable-wrapper type, handled above
+        dtorName = $"dtor__{dtor.NameForCompilation}()";
+        wr = EmitCoercionIfNecessary(NativeObjectType, bvType, dtor.Origin, wr);
+      } else {
+        dtorName = FieldName(dtor, formalNonGhostIndex);
+      }
+      wr.Write("(({0})", DtCtorName(ctor, getTypeArgs(), wr));
+      source(wr);
+      wr.Write("{0}).{1}", ctor.EnclosingDatatype is CoDatatypeDecl ? ".Get()" : "", dtorName);
+    }
+
+    private void CreateLambdaFunctionInterface(int i, ConcreteSyntaxTree outputWr) {
+      Contract.Requires(0 <= i);
+      Contract.Requires(outputWr != null);
+
+      var functionName = $"Function{i}";
+      var wr = outputWr.NewFile(Path.Combine("dafny", $"{functionName}.java"));
+
+      var typeArgs = "<" + Util.Comma(i + 1, j => $"T{j}") + ">";
+
+      wr.WriteLine("package dafny;");
+      wr.WriteLine();
+      wr.WriteLine("@FunctionalInterface");
+      wr.Write($"public interface {functionName}{typeArgs}");
+      var wrMembers = wr.NewBlock("");
+      wrMembers.Write($"public T{i} apply(");
+      wrMembers.Write(Util.Comma(i, j => $"T{j} t{j}"));
+      wrMembers.WriteLine(");");
+
+      EmitSuppression(wrMembers);
+      wrMembers.Write($"public static {typeArgs} {DafnyTypeDescriptor}<{functionName}{typeArgs}> {TypeMethodName}(");
+      wrMembers.Write(Util.Comma(i + 1, j => $"{DafnyTypeDescriptor}<T{j}> t{j}"));
+      var wrTypeBody = wrMembers.NewBlock(")", "");
+      // XXX This seems to allow non-nullable types to have null values (since
+      // arrow types are allowed as "(0)"-constrained type arguments), but it's
+      // consistent with other backends.
+      wrTypeBody.Write($"return ({DafnyTypeDescriptor}<{functionName}{typeArgs}>) ({DafnyTypeDescriptor}<?>) {DafnyTypeDescriptor}.reference({functionName}.class);");
+    }
+
+    private void CreateDafnyArrays(int i, ConcreteSyntaxTree outputWr) {
+      Contract.Requires(0 <= i);
+      Contract.Requires(outputWr != null);
+
+      var wrTop = outputWr.NewFile(Path.Combine("dafny", $"Array{i}.java"));
+
+      wrTop.WriteLine("package dafny;");
+      wrTop.WriteLine();
+
+      // All brackets on the underlying "real" array type, minus the innermost
+      // pair.  The innermost array must be represented as an Object since it
+      // could be of primitive type.
+      var outerBrackets = Repeat("[]", i - 1);
+
+      var dims = Enumerable.Range(0, i);
+      var outerDims = Enumerable.Range(0, i - 1);
+
+      var wr = wrTop.NewBlock($"public final class Array{i}<T>");
+
+      wr.WriteLine($"public final Object{outerBrackets} elmts;");
+      wr.WriteLine($"private final {DafnyTypeDescriptor}<T> elmtType;");
+
+      foreach (var j in dims) {
+        wr.WriteLine($"public final int dim{j};");
+      }
+      {
+        var wrBody = wr.NewBlock($"public Array{i}({DafnyTypeDescriptor}<T> elmtType, {Util.Comma(dims, j => $"int dim{j}")}, Object{outerBrackets} elmts)");
+        wrBody.WriteLine("assert elmts.getClass().isArray();");
+        wrBody.WriteLine("this.elmtType = elmtType;");
+        foreach (var j in dims) {
+          wrBody.WriteLine($"this.dim{j} = dim{j};");
+        }
+        wrBody.WriteLine("this.elmts = elmts;");
+      }
+
+      {
+        var wrBody = wr.NewBlock($"public T get({Util.Comma(dims, j => $"int i{j}")})");
+        wrBody.Write("return elmtType.getArrayElement(elmts");
+        foreach (var j in outerDims) {
+          wrBody.Write($"[i{j}]");
+        }
+        wrBody.WriteLine($", i{i - 1});");
+      }
+
+      {
+        var wrBody = wr.NewBlock($"public void set({Util.Comma(dims, j => $"int i{j}")}, T value)");
+        wrBody.Write("elmtType.setArrayElement(elmts");
+        foreach (var j in outerDims) {
+          wrBody.Write($"[i{j}]");
+        }
+        wrBody.WriteLine($", i{i - 1}, value);");
+      }
+
+      {
+        var body = wr.NewBlock("public void fill(T z)");
+        var forBodyWr = body;
+        for (int j = 0; j < i - 1; j++) {
+          forBodyWr = forBodyWr.NewBlock($"for(int i{j} = 0; i{j} < dim{j}; i{j}++)");
+        }
+        forBodyWr.Write($"elmtType.fillArray(elmts");
+        for (int j = 0; j < i - 1; j++) {
+          forBodyWr.Write($"[i{j}]");
+        }
+        forBodyWr.WriteLine(", z);");
+      }
+
+      {
+        var body = wr.NewBlock($"public Array{i} fillThenReturn(T z)");
+        body.WriteLine("fill(z);");
+        body.WriteLine("return this;");
+      }
+
+      EmitSuppression(wr);
+      wr.WriteLine($"private static final {DafnyTypeDescriptor}<Array{i}<?>> TYPE = ({DafnyTypeDescriptor}<Array{i}<?>>) ({DafnyTypeDescriptor}<?>) {DafnyTypeDescriptor}.reference(Array{i}.class);");
+      EmitSuppression(wr);
+      var wrTypeMethod = wr.NewBlock($"public static <T> {DafnyTypeDescriptor}<Array{i}<T>> {TypeMethodName}()");
+      wrTypeMethod.WriteLine($"return ({DafnyTypeDescriptor}<Array{i}<T>>) ({DafnyTypeDescriptor}<?>) TYPE;");
+    }
+
+    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
+      if (!member.IsStatic && !NeedsCustomReceiver(member)) {
+        var receiverType = UserDefinedType.FromTopLevelDecl(member.Origin, member.EnclosingClass);
+        var receiverTypeName = TypeName(receiverType, wr, member.Origin);
+        if (member.EnclosingClass.IsExtern(Options, out _, out _)) {
+          receiverTypeName = FormatExternBaseClassName(receiverTypeName);
+        }
+        wr.WriteLine("{0} _this = this;", receiverTypeName);
+      }
+      return wr.NewBlock("TAIL_CALL_START: while (true)");
+    }
+
+    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
+      wr.WriteLine("continue TAIL_CALL_START;");
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachLoop(
+      string tmpVarName, Type collectionElementType, IOrigin tok, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+
+      // We may have to coerce from the boxed type used in collections
+      var needsCoercion = IsCoercionNecessary(NativeObjectType, collectionElementType);
+      var boxedType = BoxedTypeName(collectionElementType, wr, tok);
+      var loopVarName = needsCoercion ? ProtectedFreshId(tmpVarName + "_boxed") : tmpVarName;
+      wr.Write($"for ({boxedType} {loopVarName} : ");
+      collectionWriter = wr.Fork();
+      var wwr = wr.NewBlock(")");
+      if (needsCoercion) {
+        wwr.Write($"{TypeName(collectionElementType, wr, tok)} {tmpVarName} = ");
+        var coercedWwr = EmitCoercionIfNecessary(NativeObjectType, collectionElementType, tok, wwr);
+        coercedWwr.Write(loopVarName);
+        wwr.WriteLine(";");
+      }
+      return wwr;
+    }
+
+    protected override Action<ConcreteSyntaxTree> GetSubtypeCondition(string tmpVarName, Type boundVarType, IOrigin tok, ConcreteSyntaxTree wPreconditions) {
+      string typeTest;
+
+      if (boundVarType.IsRefType) {
+        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
+          typeTest = "true";
+        } else {
+          typeTest = $"{tmpVarName} instanceof {TypeName(boundVarType, wPreconditions, tok)}";
+        }
+        if (boundVarType.IsNonNullRefType) {
+          typeTest = $"{tmpVarName} != null && {typeTest}";
+        } else {
+          typeTest = $"{tmpVarName} == null || {typeTest}";
+        }
+      } else {
+        typeTest = "true";
+      }
+
+      return typeTest == null ? null : wr => wr.Write(typeTest);
+    }
+
+    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
+      Type sourceType, bool introduceBoundVar, IOrigin tok, ConcreteSyntaxTree wr) {
+
+      var typeName = TypeName(boundVarType, wr, tok);
+      wr.WriteLine("{0}{1} = ({2}){3};", introduceBoundVar ? typeName + " " : "", boundVarName, typeName, tmpVarName);
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      wr.Write($"for ({DafnyTupleClass(L)}<{tupleTypeArgs}> {boundVarName} : ");
+      collectionWriter = wr.Fork();
+      return wr.NewBlock(")");
+    }
+
+    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      if (ct is SetType) {
+        var wStmts = wr.Fork();
+        wr.Write($"{collName}.add(");
+        var coercedWr = EmitCoercionIfNecessary(elmt.Type, NativeObjectType, elmt.Origin, wr);
+        coercedWr.Append(Expr(elmt, inLetExprBody, wStmts));
+        wr.WriteLine(");");
+      } else {
+        Contract.Assume(false);  // unexpected collection type
+      }
+    }
+
+    protected override void GetCollectionBuilder_Build(CollectionType ct, IOrigin tok, string collName,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmt) {
+      if (ct is SetType) {
+        var typeName = BoxedTypeName(ct.Arg, wr, tok);
+        wr.Write($"new {DafnySetClass}<{typeName}>({collName})");
+      } else if (ct is MapType) {
+        var mt = (MapType)ct;
+        var domtypeName = BoxedTypeName(mt.Domain, wr, tok);
+        var rantypeName = BoxedTypeName(mt.Range, wr, tok);
+        wr.Write($"new {DafnyMapClass}<{domtypeName},{rantypeName}>({collName})");
+      } else {
+        Contract.Assume(false);  // unexpected collection type
+        throw new cce.UnreachableException();  // please compiler
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
+      var prefix = createContinueLabel ? "continue_" : "goto_";
+      return wr.NewNamedBlock($"{prefix}{label}:");
+    }
+
+    protected override void EmitBreak(string label, ConcreteSyntaxTree wr) {
+      wr.WriteLine(label == null ? "break;" : $"break goto_{label};");
+    }
+
+    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
+      wr.WriteLine($"break continue_{label};");
+    }
+
+    protected override void EmitAbsurd(string message, ConcreteSyntaxTree wr) {
+      if (message == null) {
+        message = "unexpected control point";
+      }
+
+      // Wrapping an "if (true) { ... }" around the "break" statement is a way to tell the Java compiler not to give
+      // errors for any (unreachable) code that may follow.  
+      wr = EmitIf(out var guardWriter, false, wr);
+      guardWriter.Write("true");
+      wr.WriteLine($"throw new IllegalArgumentException(\"{message}\");");
+    }
+
+    protected override void EmitAbsurd(string message, ConcreteSyntaxTree wr, bool needIterLimit) {
+      if (!needIterLimit) {
+        EmitAbsurd(message, wr);
+      }
+    }
+
+    protected override void EmitHalt(IOrigin tok, Expression messageExpr, ConcreteSyntaxTree wr) {
+      var wStmts = wr.Fork();
+      wr.Write("throw new dafny.DafnyHaltException(");
+      if (tok != null) {
+        EmitStringLiteral(tok.TokenToString(Options) + ": ", true, wr);
+        wr.Write(" + ");
+      }
+
+      EmitToString(wr, messageExpr, wStmts);
+      wr.WriteLine(");");
+    }
+
+    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
+      var cw = (ClassWriter)CreateClass(IdProtect(nt.EnclosingModuleDefinition.GetCompileName(Options)), nt, wr);
+      var w = cw.StaticMemberWriter;
+      if (nt.NativeType != null) {
+        var nativeType = GetBoxedNativeTypeName(nt.NativeType);
+        var wEnum = w.NewNamedBlock($"public static java.util.ArrayList<{nativeType}> IntegerRange(java.math.BigInteger lo, java.math.BigInteger hi)");
+        wEnum.WriteLine($"java.util.ArrayList<{nativeType}> arr = new java.util.ArrayList<>();");
+        var numberval = $"{GetNativeTypeName(nt.NativeType)}Value()";
+        wEnum.WriteLine($"for (java.math.BigInteger j = lo; j.compareTo(hi) < 0; j = j.add(java.math.BigInteger.ONE)) {{ arr.add({nativeType}.valueOf(j.{numberval})); }}");
+        wEnum.WriteLine("return arr;");
+      }
+      if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        var wStmts = w.Fork();
+        var witness = new ConcreteSyntaxTree(w.RelativeIndentLevel);
+        witness.Append(Expr(nt.Witness, false, wStmts));
+        if (nt.NativeType == null) {
+          cw.DeclareField("Witness", nt, true, true, nt.BaseType, nt.Origin, witness.ToString(), null);
+        } else {
+          var nativeType = GetNativeTypeName(nt.NativeType);
+          // Hacky way of doing the conversion from any (including BigInteger) to any
+          w.Write("public static {0} Witness = ((java.lang.Number) (", nativeType);
+          w.Append(witness);
+          w.WriteLine($")).{nativeType}Value();");
+        }
+      }
+
+      GenerateIsMethod(nt, cw.StaticMemberWriter);
+
+      if (nt.ParentTraits.Count != 0) {
+        DeclareBoxedNewtype(nt, cw.InstanceMemberWriter);
+      }
+
+      return cw;
+    }
+
+    void GenerateIsMethod(RedirectingTypeDecl declWithConstraints, ConcreteSyntaxTree wr) {
+      Contract.Requires(declWithConstraints is SubsetTypeDecl or NewtypeDecl);
+
+      if (declWithConstraints.ConstraintIsCompilable) {
+        var type = UserDefinedType.FromTopLevelDecl(declWithConstraints.Tok, (TopLevelDecl)declWithConstraints);
+
+        wr.Write($"public static {TypeParameters(declWithConstraints.TypeArgs, " ")}boolean {IsMethodName}(");
+
+        var wCtorParams = new ConcreteSyntaxTree();
+        var count = EmitTypeDescriptorsForClass(declWithConstraints.TypeArgs, (TopLevelDecl)declWithConstraints,
+          null, wCtorParams, null, null);
+        if (count != 0) {
+          wr.Write($"{wCtorParams}, ");
+        }
+
+        var sourceFormal = new Formal(declWithConstraints.Tok, "_source", type, true, false, null);
+        var typeName = TypeName(type, wr, declWithConstraints.Tok);
+        var wrBody = wr.NewBlock($"{typeName} {IdName(sourceFormal)})");
+        GenerateIsMethodBody(declWithConstraints, sourceFormal, wrBody);
+      }
+    }
+
+    void DeclareBoxedNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
+      // instance field:  public TargetRepresentation _value;
+      var targetTypeName = nt.NativeType == null ? TypeName(nt.BaseType, wr, nt.Origin) : GetNativeTypeName(nt.NativeType);
+      wr.WriteLine($"public {targetTypeName} _value;");
+
+      // constructor:
+      // public NewType(TargetRepresentation value) {
+      //   _value = value;
+      // }
+      wr.NewNamedBlock($"public {IdName(nt)}({targetTypeName} value)")
+        .WriteLine("_value = value;");
+
+      // @Override
+      // public java.lang.String toString() {
+      //   return java.lang.String.valueOf(_value);
+      // }
+      wr.WriteLine("@Override");
+      var wBody = wr.NewNamedBlock("public java.lang.String toString()");
+      wBody.Write("return ");
+      EmitToString(wBody, UserDefinedType.FromTopLevelDecl(nt.Origin, nt))
+        .Write("_value");
+      wBody.WriteLine(";");
+    }
+
+    protected override string ArrayIndexToNativeInt(string s, Type type) {
+      var nt = AsNativeType(type);
+      if (nt == null) {
+        return $"({s}).intValue()";
+      } else if (nt.Sel == NativeType.Selection.Int || nt.Sel == NativeType.Selection.UInt) {
+        return s;
+      } else if (IsUnsignedJavaNativeType(nt)) {
+        return $"{DafnyHelpersClass}.unsignedToInt({s})";
+      } else {
+        return $"{DafnyHelpersClass}.toInt({s})";
+      }
+    }
+
+    // if checkRange is false, msg is ignored
+    // if checkRange is true and msg is null and the value is out of range, a generic message is emitted
+    // if checkRange is true and msg is not null and the value is out of range, msg is emitted in the error message
+    private void TrExprAsInt(Expression expr, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts,
+      bool checkRange = false, string msg = null) {
+      var wrExpr = new ConcreteSyntaxTree();
+      wrExpr.Append(Expr(expr, inLetExprBody, wStmts));
+      TrExprAsInt(wrExpr.ToString(), expr.Type, wr, checkRange, msg);
+    }
+
+    // if checkRange is false, msg is ignored
+    // if checkRange is true and msg is null and the value is out of range, a generic message is emitted
+    // if checkRange is true and msg is not null and the value is out of range, msg is emitted in the error message
+    private void TrExprAsInt(string expr, Type type, ConcreteSyntaxTree wr, bool checkRange = false, string msg = null) {
+      var nt = AsNativeType(type);
+      if (nt == null) {
+        wr.Write($"{DafnyHelpersClass}.toInt" + (checkRange ? "Checked(" : "("));
+        wr.Write($"({expr})");
+        if (checkRange) {
+          wr.Write(msg == null ? ", null" : $", \"{msg}\"");
+        }
+
+        wr.Write(")");
+      } else if (nt.Sel == NativeType.Selection.Int || nt.Sel == NativeType.Selection.UInt) {
+        wr.Write(expr);
+      } else if (IsUnsignedJavaNativeType(nt)) {
+        wr.Write($"{DafnyHelpersClass}.unsignedToInt" + (checkRange ? "Checked(" : "("));
+        wr.Write(expr);
+        if (checkRange) {
+          wr.Write(msg == null ? ", null" : $", \"{msg}\"");
+        }
+
+        wr.Write(")");
+      } else {
+        wr.Write($"{DafnyHelpersClass}.toInt" + (checkRange ? "Checked(" : "("));
+        wr.Write(expr);
+        if (checkRange) {
+          wr.Write(msg == null ? ", null" : $", \"{msg}\"");
+        }
+
+        wr.Write(")");
+      }
+    }
+
+    private void TrParenExprAsInt(Expression expr, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
+      wr.Write("(");
+      TrExprAsInt(expr, wr, inLetExprBody, wStmts);
+      wr.Write(")");
+    }
+
+    protected override void EmitNewArray(Type elementType, IOrigin tok, List<string> dimensions,
+        bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      // Where to put the array to be wrapped
+      ConcreteSyntaxTree wBareArray;
+      if (dimensions.Count > 1) {
+        wr.Write($"new {DafnyMultiArrayClass(dimensions.Count)}<>({TypeDescriptor(elementType, wr, tok)}, ");
+        foreach (var dim in dimensions) {
+          TrExprAsInt(dim, Type.Int, wr, checkRange: true, msg: "Java arrays may be no larger than the maximum 32-bit signed int");
+          wr.Write(", ");
+        }
+        wBareArray = wr.Fork();
+        wr.Write(")");
+        if (mustInitialize) {
+          wr.Write($".fillThenReturn({DefaultValueCoercedIfNecessary(elementType, wr, tok, true)})");
+        }
+      } else {
+        wr.Write($"({ArrayTypeName(elementType, dimensions.Count, wr, tok, false)}) ");
+        if (mustInitialize) {
+          wr.Write($"{TypeDescriptor(elementType, wr, tok)}.fillThenReturnArray(");
+        }
+        wBareArray = wr.Fork();
+        if (mustInitialize) {
+          wr.Write($", {DefaultValueCoercedIfNecessary(elementType, wr, tok, true)})");
+        }
+      }
+
+      if (dimensions.Count > 1) {
+        wBareArray.Write($"(Object{Repeat("[]", dimensions.Count - 1)}) ");
+      }
+      wBareArray.Write($"{TypeDescriptor(elementType, wr, tok)}.newArray(");
+      var sep = "";
+      foreach (var dim in dimensions) {
+        wBareArray.Write(sep);
+        TrExprAsInt(dim, Type.Int, wBareArray, checkRange: true, msg: "Java arrays may be no larger than the maximum 32-bit signed int");
+        sep = ", ";
+      }
+      wBareArray.Write(")");
+    }
+
+    protected override bool TargetLambdaCanUseEnclosingLocals => false;
+
+    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
+      List<Type> boundTypes, Type resultType, IOrigin resultTok, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ref ConcreteSyntaxTree wStmts) {
+      wr.Write("(({0}<{1}{2}>)", DafnyFunctionIface(boundTypes.Count), Util.Comma("", boundTypes, t => BoxedTypeName(t, wr, resultTok) + ", "), BoxedTypeName(resultType, wr, resultTok));
+      wr.Write($"({Util.Comma(boundVars)}) -> ");
+      var w = wr.Fork();
+      wr.Write(").apply");
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, Action<ConcreteSyntaxTree> boundAction, ConcreteSyntaxTree wr, string start = null) {
+      start = start ?? "java.math.BigInteger.ZERO";
+      var boundWriter = new ConcreteSyntaxTree();
+      boundAction(boundWriter);
+      var bound = boundWriter.ToString();
+      return wr.NewNamedBlock($"for (java.math.BigInteger {indexVar} = {start}; {indexVar}.compareTo({bound}) < 0; {indexVar} = {indexVar}.add(java.math.BigInteger.ONE))");
+    }
+
+    protected override ConcreteSyntaxTree EmitForStmt(IOrigin tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
+      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
+
+      var nativeType = AsNativeType(loopIndex.Type);
+
+      wr.Write($"for ({TypeName(loopIndex.Type, wr, tok)} {loopIndex.GetOrCreateCompileName(currentIdGenerator)} = ");
+      var startWr = wr.Fork();
+      wr.Write($"; ");
+
+      ConcreteSyntaxTree bodyWr;
+      if (goingUp) {
+        if (endVarName == null) {
+          wr.Write("");
+        } else if (nativeType == null) {
+          wr.Write($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)}.compareTo({endVarName}) < 0");
+        } else if (0 <= nativeType.LowerBound) {
+          wr.Write($"{HelperClass(nativeType)}.compareUnsigned({loopIndex.GetOrCreateCompileName(currentIdGenerator)}, {endVarName}) < 0");
+        } else {
+          wr.Write($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)} < {endVarName}");
+        }
+        if (nativeType == null) {
+          bodyWr = wr.NewBlock($"; {loopIndex.GetOrCreateCompileName(currentIdGenerator)} = {loopIndex.GetOrCreateCompileName(currentIdGenerator)}.add(java.math.BigInteger.ONE))");
+        } else {
+          bodyWr = wr.NewBlock($"; {loopIndex.GetOrCreateCompileName(currentIdGenerator)}++)");
+        }
+      } else {
+        if (endVarName == null) {
+          wr.Write("");
+        } else if (nativeType == null) {
+          wr.Write($"{endVarName}.compareTo({loopIndex.GetOrCreateCompileName(currentIdGenerator)}) < 0");
+        } else if (0 <= nativeType.LowerBound) {
+          wr.Write($"{HelperClass(nativeType)}.compareUnsigned({endVarName}, {loopIndex.GetOrCreateCompileName(currentIdGenerator)}) < 0");
+        } else {
+          wr.Write($"{endVarName} < {loopIndex.GetOrCreateCompileName(currentIdGenerator)}");
+        }
+        bodyWr = wr.NewBlock($"; )");
+        if (nativeType == null) {
+          bodyWr.WriteLine($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)} = {loopIndex.GetOrCreateCompileName(currentIdGenerator)}.subtract(java.math.BigInteger.ONE);");
+        } else {
+          bodyWr.WriteLine($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)}--;");
+        }
+      }
+      bodyWr = EmitContinueLabel(labels, bodyWr);
+      TrStmtList(body, bodyWr);
+
+      return startWr;
+    }
+
+    protected override string GetHelperModuleName() => DafnyHelpersClass;
+
+    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      wr.WriteLine("new java.util.ArrayList<>();");
+    }
+
+    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      // FIXME: tupleTypeArgs is wrong because it already got generated from
+      // TypeName (with unboxed being the default)  :-(
+      wr.Write($"{ingredients}.add(new {DafnyTupleClassPrefix}");
+      var wrTuple = wr.Fork();
+      wr.Write("));");
+      return wrTuple;
+    }
+
+    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(expr, wr, inLetExprBody, wStmts);
+      wr.Write(".intValue()");
+    }
+
+    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
+      wr.Write($"{prefix}.dtor__{i}()");
+    }
+
+    protected override void EmitApplyExpr(Type functionType, IOrigin tok, Expression function, List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr = EmitCoercionIfNecessary(NativeObjectType, functionType.AsArrowType.Result, tok, wr);
+      TrParenExpr(function, wr, inLetExprBody, wStmts);
+      wr.Write(".apply");
+      TrExprList(arguments, wr, inLetExprBody, wStmts, typeAt: _ => NativeObjectType);
+    }
+
+    protected override bool NeedsCastFromTypeParameter => true;
+
+    protected override bool TargetSubtypingRequiresEqualTypeArguments(Type type) {
+      return type.NormalizeToAncestorType().AsCollectionType == null;
+    }
+
+    protected override bool IsCoercionNecessary(Type/*?*/ from, Type/*?*/ to) {
+      from = from == null ? null : DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, from);
+      to = to == null ? null : DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, to);
+
+      if (to == NativeObjectType) {
+        return false;
+      }
+      if (from == NativeObjectType) {
+        return true;
+      }
+
+      if (UnicodeCharEnabled && ((IsNativeObjectType(from) && to.IsCharType) || (from.IsCharType && IsNativeObjectType(to)))) {
+        // Need to box from int to CodePoint, or unbox from CodePoint to int
+        return true;
+      }
+
+      if (from.IsArrayType && to.IsArrayType) {
+        var dims = from.AsArrayType.Dims;
+        Contract.Assert(dims == to.AsArrayType.Dims);
+        if (dims > 1) {
+          return false;
+        }
+
+        var udtFrom = (UserDefinedType)from.NormalizeExpand();
+        var udtTo = (UserDefinedType)to.NormalizeExpand();
+        return udtFrom.TypeArgs[0].IsTypeParameter && !udtTo.TypeArgs[0].IsTypeParameter;
+      }
+
+      return false;
+    }
+
+    protected override Type TypeForCoercion(Type type) {
+      return NativeObjectType;
+    }
+
+    // We use null to represent java.lang.Object, as that's a decent
+    // default native type for "no type information".
+    // We don't use the SpecialNativeType approach that the Go compiler
+    // uses for string because that kind of compiler-specific Type implementation
+    // doesn't fit well into the generic logic on Types
+    // (see for example https://github.com/dafny-lang/dafny/issues/2989).
+    private static readonly Type NativeObjectType = null;
+
+    private bool IsNativeObjectType(Type type) {
+      return type == NativeObjectType || type.IsTypeParameter;
+    }
+
+    protected override ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
+      if (type.HasFatPointer) {
+        var w = wr.ForkInParens();
+        wr.Write("._value");
+        return w;
+      } else {
+        return wr;
+      }
+    }
+
+    protected override ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
+      if (type.HasFatPointer) {
+        wr.Write($"new {type.AsNewtype.GetFullCompileName(Options)}");
+        return wr.ForkInParens();
+      } else {
+        return wr;
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitCoercionIfNecessary(Type/*?*/ from, Type/*?*/ to, IOrigin tok, ConcreteSyntaxTree wr, Type toOrig = null) {
+      if (toOrig != null) {
+        to = toOrig;
+      }
+
+      if (from != null && to != null && from.IsTraitType && to.AsNewtype != null) {
+        return FromFatPointer(to, wr);
+      }
+      if (from != null && to != null && from.AsNewtype != null && to.IsTraitType && (enclosingMethod != null || enclosingFunction != null)) {
+        return ToFatPointer(from, wr);
+      }
+
+      from = from == null ? null : DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, from);
+      to = to == null ? null : DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, to);
+
+      if (UnicodeCharEnabled) {
+        // Need to box from int to CodePoint, or unbox from CodePoint to int
+
+        if (IsNativeObjectType(from) && to is { IsCharType: true }) {
+          wr.Write("((dafny.CodePoint)(");
+          var w = wr.Fork();
+          wr.Write(")).value()");
+          return w;
+        }
+
+        if (from is { IsCharType: true } && IsNativeObjectType(to)) {
+          wr.Write("dafny.CodePoint.valueOf(");
+          var w = wr.Fork();
+          wr.Write(")");
+          return w;
+        }
+      }
+
+      if (IsCoercionNecessary(from, to)) {
+        return EmitDowncast(from, to, tok, wr);
+      }
+
+      return wr;
+    }
+
+    protected override ConcreteSyntaxTree EmitDowncast(Type from, Type to, IOrigin tok, ConcreteSyntaxTree wr) {
+      var w = new ConcreteSyntaxTree();
+      if (from != null && to != null && from.IsTraitType && to.AsNewtype != null) {
+        wr.Format($"(({to.AsNewtype.GetFullCompileName(Options)})({w}))");
+      } else if (from != null && to != null && from.AsNewtype != null && to.IsTraitType) {
+        wr.Format($"(({TypeName(to, wr, tok)})({w}))");
+      } else {
+        wr.Write($"(({TypeName(to, wr, tok)})(java.lang.Object)(");
+        w = wr.Fork();
+        wr.Write("))");
+      }
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree EmitCoercionToNativeInt(ConcreteSyntaxTree wr) {
+      wr.Write("((java.math.BigInteger)");
+      var w = wr.Fork();
+      wr.Write(").intValue()");
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
+      return wr.NewNamedBlock($"for (java.math.BigInteger {indexVar} = java.math.BigInteger.valueOf({start}); ; {indexVar} = {indexVar}.multiply(new java.math.BigInteger(\"2\")))");
+    }
+
+    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
+      wr.Write($"{varName}.equals(java.math.BigInteger.ZERO)");
+    }
+
+    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine($"{varName} = {varName}.subtract(java.math.BigInteger.ONE);");
+    }
+
+    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine($"{varName} = {varName}.add(java.math.BigInteger.ONE);");
+    }
+
+    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("java.util.Arrays.asList");
+      TrParenExpr(e, wr, inLetExprBody, wStmts);
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IOrigin resultTok, string bvName,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"((java.util.function.Function<java.math.BigInteger, {BoxedTypeName(resultType, wr, resultTok)}>)(({bvName}) ->");
+      var w = wr.NewBigExprBlock("", $")).apply(java.math.BigInteger.valueOf({source}))");
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IOrigin tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      var wStmts = wr.Fork();
+      wr.Write($"{collName}.put(");
+      var termLeftWriter = wr.Fork();
+      wr.Write(",");
+      wr.Append(Expr(term, inLetExprBody, wStmts));
+      wr.WriteLine(");");
+      return termLeftWriter;
+    }
+
+    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"{DafnySeqClass}.Create({TypeDescriptor(expr.Type.NormalizeToAncestorType().AsCollectionType.Arg, wr, expr.Origin)}, ");
+      var size = expr.N;
+      if (AsJavaNativeType(size.Type) is { }) {
+        size = new ConversionExpr(expr.N.Origin, size, new IntType());
+      }
+      var sizeWr = Expr(size, inLetExprBody, wStmts);
+      wr.Append(sizeWr);
+      wr.Write(", ");
+      wr.Append(Expr(expr.Initializer, inLetExprBody, wStmts));
+      wr.Write(")");
+    }
+
+    // Warning: NOT the same as NativeType.Bitwidth, which is zero except for
+    // bitvector types
+    private static int NativeTypeSize(NativeType nt) {
+      switch (AsJavaNativeType(nt)) {
+        case JavaNativeType.Byte: return 8;
+        case JavaNativeType.Short: return 16;
+        case JavaNativeType.Int: return 32;
+        case JavaNativeType.Long: return 64;
+        default: Contract.Assert(false); throw new cce.UnreachableException();
+      }
+    }
+
+    protected override void EmitConversionExpr(Expression fromExpr, Type fromType, Type toType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Int) || fromType.NormalizeToAncestorType().IsBitVectorType || fromType.IsCharType) {
+        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          // (int or bv or char) -> real
+          Contract.Assert(AsNativeType(toType) == null);
+          var fromNative = AsNativeType(fromType);
+          wr.Write($"new {DafnyBigRationalClass}(");
+          if (fromNative != null) {
+            wr.Write(fromNative.LowerBound >= 0
+              ? $"{DafnyHelpersClass}.unsignedToBigInteger"
+              : "java.math.BigInteger.valueOf");
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            wr.Write(", java.math.BigInteger.ONE)");
+          } else if (fromType.IsCharType) {
+            wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+            wr.Write(", 1)");
+          } else {
+            wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+            wr.Write(", java.math.BigInteger.ONE)");
+          }
+        } else if (toType.IsCharType) {
+          // (int or bv or char) -> char
+          // Painfully, Java sign-extends bytes when casting to chars ...
+          if (fromType.IsCharType) {
+            EmitExpr(fromExpr, inLetExprBody, wr, wStmts);
+          } else {
+            var fromNative = AsNativeType(fromType);
+            wr.Write($"({CharTypeName(false)})");
+            if (fromNative != null && fromNative.Sel == NativeType.Selection.Byte) {
+              wr.Write("java.lang.Byte.toUnsignedInt");
+              TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            } else {
+              TrExprAsInt(fromExpr, wr, inLetExprBody, wStmts);
+            }
+          }
+        } else {
+          // (int or bv or char) -> (int or bv or ORDINAL)
+          var fromNative = AsNativeType(fromType);
+          var toNative = AsNativeType(toType);
+          if (fromNative == null && toNative == null) {
+            if (fromType.IsCharType) {
+              // char -> big-integer (int or bv or ORDINAL)
+              wr.Write("java.math.BigInteger.valueOf");
+              TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            } else {
+              // big-integer (int or bv) -> big-integer (int or bv or ORDINAL), so identity will do
+              wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+            }
+          } else if (fromNative != null && toNative == null) {
+            // native (int or bv) -> big-integer (int or bv)
+            wr.Write(fromNative.LowerBound >= 0
+              ? $"{DafnyHelpersClass}.unsignedToBigInteger"
+              : "java.math.BigInteger.valueOf");
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          } else if (fromNative != null && NativeTypeSize(toNative) == NativeTypeSize(fromNative)) {
+            // native (int or bv) -> native (int or bv)
+            // Cast between signed and unsigned, which have the same Java type
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          } else {
+            GetNativeInfo(toNative.Sel, out var toNativeName, out var toNativeSuffix, out var toNativeNeedsCast);
+            // any (int or bv) -> native (int or bv)
+            // A cast would do, but we also consider some optimizations
+            var literal = PartiallyEvaluate(fromExpr);
+            UnaryOpExpr u = fromExpr.Resolved as UnaryOpExpr;
+            MemberSelectExpr m = fromExpr.Resolved as MemberSelectExpr;
+            if (literal != null) {
+              // Optimize constant to avoid intermediate BigInteger
+              EmitNativeIntegerLiteral((BigInteger)literal, toNative, wr);
+            } else if (u != null && u.Op == UnaryOpExpr.Opcode.Cardinality) {
+              // Optimize || to avoid intermediate BigInteger
+              wr.Write(CastIfSmallNativeType(toType));
+              TrParenExpr("", u.E, wr, inLetExprBody, wStmts);
+              wr.Write(".cardinalityInt()");
+            } else if (m != null && m.MemberName == "Length" && m.Obj.Type.IsArrayType) {
+              // Optimize .length to avoid intermediate BigInteger
+              wr.Write(CastIfSmallNativeType(toType));
+              var elmtType = UserDefinedType.ArrayElementType(m.Obj.Type);
+              ConcreteSyntaxTree w;
+              if (elmtType.IsTypeParameter) {
+                wr.Write($"{FormatTypeDescriptorVariable(elmtType.AsTypeParameter)}.getArrayLength(");
+                w = wr.Fork();
+                wr.Write(")");
+              } else {
+                w = wr.Fork();
+                wr.Write(".length");
+              }
+              TrParenExpr(m.Obj, w, inLetExprBody, wStmts);
+            } else {
+              // no optimization applies; use the standard translation
+              if (fromNative != null && fromNative.LowerBound >= 0 && NativeTypeSize(fromNative) < NativeTypeSize(toNative)) {
+                // Widening an unsigned value; careful!!
+                wr.Write($"{CastIfSmallNativeType(toType)}{GetBoxedNativeTypeName(fromNative)}");
+                if (NativeTypeSize(toNative) == 64) {
+                  wr.Write(".toUnsignedLong");
+                } else {
+                  wr.Write(".toUnsignedInt");
+                }
+                TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+              } else {
+                if (fromNative == null && !fromType.IsCharType) {
+                  TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+                  wr.Write($".{toNativeName}Value()");
+                } else {
+                  wr.Write($"(({toNativeName}) ");
+                  TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+                  wr.Write(")");
+                }
+              }
+            }
+          }
+        }
+      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        Contract.Assert(AsNativeType(fromType) == null);
+        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          // real -> real
+          Contract.Assert(AsNativeType(toType) == null);
+          wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+        } else if (toType.IsCharType) {
+          // real -> char
+          // Painfully, Java sign-extends bytes when casting to chars ...
+          wr.Write($"({CharTypeName(false)})");
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          wr.Write(".ToBigInteger().intValue()");
+        } else if (toType.IsBigOrdinalType) {
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          wr.Write(".ToBigInteger()");
+        } else {
+          // real -> (int or bv)
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          wr.Write(".ToBigInteger()");
+          if (AsNativeType(toType) != null) {
+            wr.Write($".{GetNativeTypeName(AsNativeType(toType))}Value()");
+          }
+        }
+      } else if (fromType.IsBigOrdinalType) {
+        if (toType.IsNumericBased(Type.NumericPersuasion.Int) || toType.IsCharType) {
+          // ordinal -> int, char
+          if (AsNativeType(toType) != null) {
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            wr.Write($".{GetNativeTypeName(AsNativeType(toType))}Value()");
+          } else if (toType.IsCharType) {
+            wr.Write($"({CharTypeName(false)})");
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            wr.Write(".intValue()");
+          } else {
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          }
+        } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          // ordinal -> real
+          wr.Write($"new {DafnyBigRationalClass}(");
+          wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+          wr.Write(", java.math.BigInteger.ONE)");
+        } else if (toType.NormalizeToAncestorType().IsBitVectorType) {
+          // ordinal -> bv
+          if (AsNativeType(toType) != null) {
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            wr.Write($".{GetNativeTypeName(AsNativeType(toType))}Value()");
+          } else {
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          }
+        } else if (toType.IsBigOrdinalType) {
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+        } else {
+          Contract.Assert(false, $"not implemented for java: {fromType} -> {toType}");
+        }
+      } else if (fromType.Equals(toType) || fromType.AsNewtype != null || toType.AsNewtype != null) {
+        wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+      } else {
+        Contract.Assert(false, $"not implemented for java: {fromType} -> {toType}");
+      }
+    }
+
+    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IOrigin tok, ConcreteSyntaxTree wr) {
+      // from T to U:   t instanceof U && ...
+      // from T to U?:  t instanceof U && ...                 // since t is known to be non-null, this is fine
+      // from T? to U:  t instanceof U && ...                 // note, "instanceof" implies non-null, so no need for explicit null check
+      // from T? to U?: t == null || (t instanceof U && ...)
+      if (fromType.IsRefType && !fromType.IsNonNullRefType && toType.IsRefType && !toType.IsNonNullRefType) {
+        wr = wr.Write($"{localName} == null || ").ForkInParens();
+      }
+
+      var typeName = toType.IsObject ? "Object" : FullTypeName((UserDefinedType)toType.NormalizeExpand());
+      wr.Write($"{localName} instanceof {typeName}");
+    }
+
+    protected override void EmitIsIntegerTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(".isInteger() && ");
+    }
+
+    protected override void EmitIsUnicodeScalarValueTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("dafny.CodePoint.isCodePoint");
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(" && ");
+    }
+
+    protected override void EmitIsInIntegerRange(Expression source, BigInteger lo, BigInteger hi, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(".compareTo(");
+      EmitLiteralExpr(wr, new LiteralExpr(source.Origin, lo) { Type = Type.Int });
+      wr.Write(") >= 0 && ");
+
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(".compareTo(");
+      EmitLiteralExpr(wr, new LiteralExpr(source.Origin, hi) { Type = Type.Int });
+      wr.Write(") < 0 && ");
+    }
+
+    protected override bool IssueCreateStaticMain(Method m) {
+      return true;
+    }
+    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
+      var wr = ((ClassWriter)cw).StaticMemberWriter;
+      return wr.NewBlock($"public static void __Main(dafny.DafnySequence<? extends dafny.DafnySequence<? extends {CharTypeName(true)}>> {argsParameterName})");
+    }
+
+    protected override void CreateIIFE(string bvName, Type bvType, IOrigin bvTok, Type bodyType, IOrigin bodyTok,
+      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
+      wr = EmitCoercionIfNecessary(NativeObjectType, bodyType, bvTok, wr);
+      var boxedBvType = BoxedTypeName(bvType, wr, bvTok);
+      wr.Write("{0}.<{1}, {2}>Let(", DafnyHelpersClass, boxedBvType, BoxedTypeName(bodyType, wr, bodyTok));
+      wrRhs = wr.Fork();
+      wrRhs = EmitCoercionIfNecessary(bvType, NativeObjectType, bvTok, wrRhs);
+
+      var boxedBvName = idGenerator.FreshId("boxed");
+      wr.Write($", {boxedBvName} ->");
+      var wrBodyWithCoercion = wr.NewBlock();
+      wrBodyWithCoercion.Write($"{TypeName(bvType, wr, bvTok)} {bvName} = ");
+      var wrUnboxed = EmitCoercionIfNecessary(NativeObjectType, bvType, bvTok, wrBodyWithCoercion.Fork());
+      wrUnboxed.Write(boxedBvName);
+      wrBodyWithCoercion.WriteLine(";");
+
+      wrBodyWithCoercion.Write("return ");
+      wrBody = wrBodyWithCoercion.Fork();
+      wrBody = EmitCoercionIfNecessary(bodyType, NativeObjectType, bodyTok, wrBody);
+      wrBodyWithCoercion.WriteLine(";");
+      wr.Write(")");
+    }
+
+    protected override string GetQuantifierName(string bvType) {
+      return $"{DafnyHelpersClass}.Quantifier";
+    }
+
+    // ABSTRACT METHOD DECLARATIONS FOR THE SAKE OF BUILDING PROGRAM
+
+    protected override void EmitYield(ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(Token.NoToken, Feature.Iterators);
+    }
+
+    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
+      throw new UnsupportedFeatureException(iter.Origin, Feature.Iterators);
+    }
+
+    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
+      var tryBlock = wr.NewBlock("try");
+      TrStmt(body, tryBlock);
+      var catchBlock = wr.NewBlock("catch (dafny.DafnyHaltException e)");
+      catchBlock.WriteLine($"dafny.DafnySequence<Character> {haltMessageVarName} = dafny.DafnySequence.asString(e.getMessage());");
+      TrStmt(recoveryBody, catchBlock);
+    }
+
+    protected override void EmitNestedMatchExpr(NestedMatchExpr match, bool inLetExprBody, ConcreteSyntaxTree output,
+      ConcreteSyntaxTree wStmts) {
+      if (match.Cases.Count == 0) {
+        base.EmitNestedMatchExpr(match, inLetExprBody, output, wStmts);
+      } else {
+        EmitExpr(match.Flattened, inLetExprBody, output, wStmts);
+      }
+    }
+
+    protected override void TrOptNestedMatchExpr(NestedMatchExpr match, Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts,
+      bool inLetExprBody, IVariable accumulatorVar, OptimizedExpressionContinuation continuation) {
+      if (match.Cases.Count == 0) {
+        base.TrOptNestedMatchExpr(match, resultType, wr, wStmts, inLetExprBody, accumulatorVar, continuation);
+      } else {
+        TrExprOpt(match.Flattened, resultType, wr, wStmts, inLetExprBody, accumulatorVar, continuation);
+      }
+    }
+
+    protected override void EmitNestedMatchStmt(NestedMatchStmt match, ConcreteSyntaxTree writer) {
+      if (match.Cases.Count == 0) {
+        base.EmitNestedMatchStmt(match, writer);
+      } else {
+        TrStmt(match.Flattened, writer);
+      }
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/JavaScript/JavaScriptBackend.cs b/Source/DafnyCore/Backends/JavaScript/JavaScriptBackend.cs
new file mode 100644
index 00000000000..443c3ad50b0
--- /dev/null
+++ b/Source/DafnyCore/Backends/JavaScript/JavaScriptBackend.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Dafny.Compilers;
+
+public class JavaScriptBackend : ExecutableBackend {
+  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".js" };
+
+  public override string TargetName => "JavaScript";
+  public override bool IsStable => true;
+  public override string TargetExtension => "js";
+
+  public override bool SupportsInMemoryCompilation => true;
+  public override bool TextualTargetIsExecutable => true;
+
+  public override IReadOnlySet<string> SupportedNativeTypes =>
+    new HashSet<string>(new List<string> { "number" });
+
+  protected override SinglePassCodeGenerator CreateCodeGenerator() {
+    return new JavaScriptCodeGenerator(Options, Reporter);
+  }
+
+  public override async Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText,
+    string callToMain /*?*/, string targetFilename /*?*/, ReadOnlyCollection<string> otherFileNames,
+    bool runAfterCompile, TextWriter outputWriter) {
+    if (runAfterCompile) {
+      Contract.Assert(callToMain != null);  // this is part of the contract of CompileTargetProgram
+                                            // Since the program is to be run soon, nothing further is done here. Any compilation errors (that is, any errors
+                                            // in the emitted program--this should never happen if the compiler itself is correct) will be reported as 'node'
+                                            // will run the program.
+      return (true, null);
+    } else {
+      // compile now
+      return (await SendToNewNodeProcess(dafnyProgramName, targetProgramText, null, targetFilename, otherFileNames, outputWriter), null);
+    }
+  }
+
+  public override Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText,
+    string callToMain, /*?*/
+    string targetFilename, ReadOnlyCollection<string> otherFileNames,
+    object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
+
+    return SendToNewNodeProcess(dafnyProgramName, targetProgramText, callToMain, targetFilename, otherFileNames, outputWriter);
+  }
+
+  async Task<bool> SendToNewNodeProcess(string dafnyProgramName, string targetProgramText, string/*?*/ callToMain, string targetFilename, ReadOnlyCollection<string> otherFileNames,
+    TextWriter outputWriter) {
+    Contract.Requires(targetFilename != null || otherFileNames.Count == 0);
+
+    var psi = new ProcessStartInfo("node", "") {
+      RedirectStandardInput = true,
+      RedirectStandardOutput = true,
+      RedirectStandardError = true,
+      StandardInputEncoding = Encoding.UTF8,
+    };
+
+    try {
+      Process nodeProcess = Process.Start(psi);
+      foreach (var filename in otherFileNames) {
+        WriteFromFile(filename, nodeProcess.StandardInput);
+      }
+      await nodeProcess.StandardInput.WriteAsync(targetProgramText);
+      if (callToMain != null && Options.RunAfterCompile) {
+        await nodeProcess.StandardInput.WriteLineAsync("require('process').stdout.setEncoding(\"utf-8\");");
+        await nodeProcess.StandardInput.WriteLineAsync("require('process').argv = [\"node\",\"stdin\", " + string.Join(",", Options.MainArgs.Select(((JavaScriptCodeGenerator)codeGenerator).ToStringLiteral)) + "];");
+        await nodeProcess.StandardInput.WriteAsync(callToMain);
+      }
+      await nodeProcess.StandardInput.FlushAsync();
+      nodeProcess.StandardInput.Close();
+      // Fixes a problem of Node on Windows, where Node does not prints to the parent console its standard outputs.
+      await PassthroughBuffer(nodeProcess.StandardError, Options.ErrorWriter);
+      await PassthroughBuffer(nodeProcess.StandardOutput, Options.OutputWriter);
+      await nodeProcess.WaitForExitAsync();
+#pragma warning disable VSTHRD00
+      return nodeProcess.ExitCode == 0;
+    } catch (System.ComponentModel.Win32Exception e) {
+      await outputWriter.WriteLineAsync($"Error: Unable to start node.js ({psi.FileName}): {e.Message}");
+      return false;
+    }
+  }
+
+  public JavaScriptBackend(DafnyOptions options) : base(options) {
+  }
+}
diff --git a/Source/DafnyCore/Backends/JavaScript/JavaScriptCodeGenerator.cs b/Source/DafnyCore/Backends/JavaScript/JavaScriptCodeGenerator.cs
new file mode 100644
index 00000000000..a75fd312f41
--- /dev/null
+++ b/Source/DafnyCore/Backends/JavaScript/JavaScriptCodeGenerator.cs
@@ -0,0 +1,2615 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.IO;
+using System.Diagnostics.Contracts;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Text;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+
+namespace Microsoft.Dafny.Compilers {
+  class JavaScriptCodeGenerator : SinglePassCodeGenerator {
+    public JavaScriptCodeGenerator(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
+    }
+
+    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
+      Feature.MethodSynthesis,
+      Feature.ExternalConstructors,
+      Feature.SubsetTypeTests,
+      Feature.SeparateCompilation,
+      Feature.RuntimeCoverageReport
+    };
+
+    public override string ModuleSeparator => "_";
+
+    const string DafnySetClass = "_dafny.Set";
+    const string DafnyMultiSetClass = "_dafny.MultiSet";
+    const string DafnySeqClass = "_dafny.Seq";
+    const string DafnyMapClass = "_dafny.Map";
+
+    string FormatDefaultTypeParameterValue(TopLevelDecl tp) {
+      Contract.Requires(tp is TypeParameter || tp is AbstractTypeDecl);
+      return $"_default_{tp.GetCompileName(Options)}";
+    }
+
+    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
+      wr.WriteLine("// Dafny program {0} compiled into JavaScript", program.Name);
+      if (Options.IncludeRuntime) {
+        EmitRuntimeSource("DafnyRuntimeJs", wr, false);
+      }
+      if (Options.Get(CommonOptionBag.UseStandardLibraries) && Options.Get(CommonOptionBag.TranslateStandardLibrary)) {
+        EmitRuntimeSource("DafnyStandardLibraries_js", wr, false);
+      }
+    }
+
+    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
+      Coverage.EmitSetup(wr);
+      wr.WriteLine($"_dafny.HandleHaltExceptions(() => {mainMethod.EnclosingClass.GetFullCompileName(Options)}.{(mainMethod.IsStatic ? IdName(mainMethod) : "Main")}(_dafny.{CharMethodQualifier}FromMainArguments(require('process').argv)));");
+      Coverage.EmitTearDown(wr);
+    }
+
+    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
+      var wr = (cw as JavaScriptCodeGenerator.ClassWriter).MethodWriter;
+      return wr.NewBlock($"static Main({argsParameterName})");
+    }
+
+    protected override ConcreteSyntaxTree CreateModule(ModuleDefinition module, string moduleName, bool isDefault,
+      ModuleDefinition externModule,
+      string libraryName /*?*/, Attributes moduleAttributes, ConcreteSyntaxTree wr) {
+      moduleName = IdProtect(moduleName);
+      if (externModule == null || libraryName != null) {
+        wr.Write("let {0} = ", moduleName);
+      }
+
+      string footer = ")(); // end of module " + moduleName;
+      var block = wr.NewBlock("(function()", footer);
+      var beforeReturnBody = block.Fork(0);
+      if (externModule == null) {
+        // create new module here
+        beforeReturnBody.WriteLine("let $module = {};");
+      } else if (libraryName == null) {
+        // extend a module provided in another .js file
+        beforeReturnBody.WriteLine("let $module = {0};", moduleName);
+      } else {
+        // require a library
+        beforeReturnBody.WriteLine("let $module = require(\"{0}\");", libraryName);
+      }
+      block.WriteLine("return $module;");
+      return beforeReturnBody;
+    }
+
+    protected override string GetHelperModuleName() => "_dafny";
+
+    protected override IClassWriter CreateClass(string moduleName, bool isExtern, string/*?*/ fullPrintName,
+      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type>/*?*/ superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+      var name = IdName(cls);
+      var w = wr.NewBlock(string.Format("$module.{0} = class {0}" + (isExtern ? " extends $module.{0}" : ""), name), ";");
+      w.Write("constructor (");
+      var sep = "";
+      if (typeParameters != null && WriteRuntimeTypeDescriptorsFormals(typeParameters, false, w) > 0) {
+        sep = ", ";
+      }
+      if (cls is NewtypeDecl { ParentTraits: { } parentTraits } && parentTraits.Count > 0) {
+        w.Write($"{sep}value");
+      }
+      var fieldWriter = w.NewBlock(")");
+      if (isExtern) {
+        fieldWriter.Write("super(");
+        if (typeParameters != null) {
+          WriteRuntimeTypeDescriptorsFormals(typeParameters, false, w);
+        }
+        fieldWriter.WriteLine(");");
+      }
+      if (fullPrintName != null) {
+        fieldWriter.WriteLine("this._tname = \"{0}\";", fullPrintName);
+      }
+      if (typeParameters != null) {
+        foreach (var tp in typeParameters) {
+          if (NeedsTypeDescriptor(tp)) {
+            fieldWriter.WriteLine("this.{0} = {0};", "rtd$_" + tp.GetCompileName(Options));
+          }
+        }
+      }
+      if (superClasses != null) {
+        superClasses = superClasses.Where(trait => !trait.IsObject).ToList();
+        var parentTraitsWriter = w.NewBlock("_parentTraits()");
+        parentTraitsWriter.WriteLine("return [{0}];", Util.Comma(superClasses, parent => TypeName(parent, parentTraitsWriter, tok)));
+      }
+      var methodWriter = w;
+      return new ClassWriter(this, methodWriter, fieldWriter);
+    }
+
+    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
+      TraitDecl trait, List<Type> superClasses /*?*/, IOrigin tok, ConcreteSyntaxTree wr) {
+      var w = wr.NewBlock(string.Format("$module.{0} = class {0}", IdProtect(name)), ";");
+      var fieldWriter = w;  // not used for traits, but we need a value to give to the ClassWriter
+      var methodWriter = w;
+      return new ClassWriter(this, methodWriter, fieldWriter);
+    }
+
+    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
+      // An iterator is compiled as follows:
+      //   public class MyIteratorExample
+      //   {
+      //     public T q;  // in-parameter
+      //     public T x;  // yield-parameter
+      //     public int y;  // yield-parameter
+      //     IEnumerator<object> _iter;
+      //
+      //     public void _MyIteratorExample(T q) {
+      //       this.q = q;
+      //       _iter = TheIterator();
+      //     }
+      //
+      //     public void MoveNext(out bool more) {
+      //       more =_iter.MoveNext();
+      //     }
+      //
+      //     private IEnumerator<object> TheIterator() {
+      //       // the translation of the body of the iterator, with each "yield" turning into a "yield return null;"
+      //       yield break;
+      //     }
+      //   }
+
+      var cw = CreateClass(IdProtect(iter.EnclosingModuleDefinition.GetCompileName(Options)), iter, wr) as JavaScriptCodeGenerator.ClassWriter;
+      var w = cw.MethodWriter;
+      var instanceFieldsWriter = cw.FieldWriter;
+      // here come the fields
+      Constructor ct = null;
+      foreach (var member in iter.Members) {
+        var f = member as Field;
+        if (f != null && !f.IsGhost) {
+          DeclareField(IdName(f), false, false, f.Type, f.Origin, PlaceboValue(f.Type, instanceFieldsWriter, f.Origin, true), instanceFieldsWriter);
+        } else if (member is Constructor) {
+          Contract.Assert(ct == null);  // we're expecting just one constructor
+          ct = (Constructor)member;
+        }
+      }
+      Contract.Assert(ct != null);  // we do expect a constructor
+      instanceFieldsWriter.WriteLine("this._iter = undefined;");
+
+      // here's the initializer method
+      w.Write("{0}(", IdName(ct));
+      string sep = "";
+      foreach (var p in ct.Ins) {
+        if (!p.IsGhost) {
+          // here we rely on the parameters and the corresponding fields having the same names
+          w.Write("{0}{1}", sep, IdName(p));
+          sep = ", ";
+        }
+      }
+      {
+        var wBody = w.NewBlock(")");
+        foreach (var p in ct.Ins) {
+          if (!p.IsGhost) {
+            wBody.WriteLine("this.{0} = {0};", IdName(p));
+          }
+        }
+        wBody.WriteLine("this.__iter = this.TheIterator();");
+      }
+      // here are the enumerator methods
+      {
+        var wBody = w.NewBlock("MoveNext()");
+        wBody.WriteLine("let r = this.__iter.next();");
+        wBody.WriteLine("return !r.done;");
+      }
+      var wIter = w.NewBlock("*TheIterator()");
+      wIter.WriteLine("let _this = this;");
+      return wIter;
+    }
+
+    protected override IClassWriter/*?*/ DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
+      // ===== For inductive datatypes:
+      //
+      // $module.Dt = class Dt {
+      //   constructor(tag) {
+      //     this.$tag = tag;
+      //   }
+      //   static create_Ctor0(field0, field1, ...) {
+      //     let $dt = new Dt(0);
+      //     $dt.field0 = field0;
+      //     $dt.field1 = field1;
+      //     ...
+      //     return $dt;
+      //   }
+      //   static create_Ctor1(...) {
+      //     let $dt = new Dt(1);
+      //     ...
+      //   }
+      //   ...
+      //
+      //   get is_Ctor0 { return this.$tag === 0; }
+      //   get is_Ctor1 { return this.$tag === 1; }
+      //   ...
+      //
+      //   static get AllSingletonConstructors() {
+      //     return this.AllSingletonConstructors_();
+      //   }
+      //   static *AllSingletonConstructors_() {
+      //     yield Berry.create_Ctor0();
+      //     ...
+      //   }
+      //
+      //   get dtor_Dtor0() { return this.Dtor0; }
+      //   get dtor_Dtor1() { return this.Dtor1; }
+      //   ...
+      //
+      //   toString() {
+      //     ...
+      //   }
+      //   equals(other) {
+      //     ...
+      //   }
+      //   static Rtd(rtd...) {
+      //     return class {
+      //       static get Default() { return Dt.create_CtorK(...); }
+      //     };
+      //   }
+      // }
+      //
+      // ===== For co-inductive datatypes:
+      //
+      // $module.Dt = class Dt {
+      //   constructor(tag) {
+      //     this.$tag = tag;
+      //   }
+      //   _D() {
+      //     if (this._d === undefined) {
+      //       this._d = this._initializer(this);
+      //       delete this._initializer;
+      //     }
+      //     return this._d;
+      //   }
+      //   static create_Ctor0($dt, field0, field1, ...) {
+      //     if ($dt === null) {
+      //       $dt = new Dt(0);
+      //       $dt._d = $dt;
+      //     }
+      //     $dt.field0 = field0;
+      //     $dt.field1 = field1;
+      //     ...
+      //     return $dt;
+      //   }
+      //   static lazy_Ctor0(initializer) {
+      //     let dt = new Dt(0);
+      //     dt._initializer = initializer;
+      //     return dt;
+      //   }
+      //   static create_Ctor1(initializer) {
+      //     let $dt = new Dt(1);
+      //     ...
+      //   }
+      //   ...
+      //
+      //   get is_Ctor0() { return this.$tag === 0; }
+      //   get is_Ctor1() { return this.$tag === 1; }
+      //   ...
+      //
+      //   static get AllSingletonConstructors() {
+      //     return this.AllSingletonConstructors_();
+      //   }
+      //   static *AllSingletonConstructors_() {
+      //     yield Berry.create_Ctor0(null);
+      //     ...
+      //   }
+      //
+      //   get dtor_Dtor0() { return this._D().Dtor0; }
+      //   get dtor_Dtor1() { return this._D().Dtor1; }
+      //   ...
+      //
+      //   toString() {
+      //     if ($tag == 0) {
+      //       return "module.Dt.Ctor0";
+      //     } else if ...
+      //   }
+      //   equals(other) {
+      //     ...
+      //   }
+      //   static Rtd(rtd...) {
+      //     return class {
+      //       static get Default() { return Dt.create_CtorK(...); }
+      //     };
+      //   }
+      // }
+      if (dt is TupleTypeDecl) {
+        // Tuple types are declared once and for all in DafnyRuntime.js
+        return null;
+      }
+
+      string DtT = dt.GetCompileName(Options);
+      string DtT_protected = IdProtect(DtT);
+      var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, UserDefinedType.FromTopLevelDecl(dt.Origin, dt));
+
+      // from here on, write everything into the new block created here:
+      var btw = wr.NewNamedBlock("$module.{0} = class {0}", DtT_protected);
+      wr = btw;
+
+      var wTypeDescriptors = new ConcreteSyntaxTree();
+      var typeDescriptorComma = WriteRuntimeTypeDescriptorsFormals(dt.TypeArgs, false, wTypeDescriptors) != 0 ? ", " : "";
+      var typeDescriptors = wTypeDescriptors.ToString();
+
+      var wBody = wr.NewBlock($"constructor(tag{typeDescriptorComma}{typeDescriptors})");
+      wBody.WriteLine("this.$tag = tag;");
+      foreach (var tp in dt.TypeArgs.Where(NeedsTypeDescriptor)) {
+        wBody.WriteLine("this.{0} = {0};", "rtd$_" + tp.GetCompileName(Options));
+      }
+
+      if (dt is CoDatatypeDecl) {
+        var w0 = wr.NewBlock("_D()");
+        var w1 = EmitIf("this._d === undefined", false, w0);
+        w1.WriteLine("this._d = this._initializer(this);");
+        w1.WriteLine("delete this._initializer;");
+        w0.WriteLine("return this._d");
+      }
+
+      // create methods
+      var i = 0;
+      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+        // collect the names of non-ghost arguments
+        var argNames = new List<string>();
+        var k = 0;
+        foreach (var formal in ctor.Formals) {
+          if (!formal.IsGhost) {
+            argNames.Add(FormalName(formal, k));
+            k++;
+          }
+        }
+        // datatype:
+        //   static create_Ctor0(params) { let $dt = new Dt(tag); $dt.param0 = param0; ...; return $dt; }
+        // codatatype:
+        //   static create_Ctor0(params) { if ($dt === null) { $dt = new Dt(tag); $dt._d = $dt; } $dt.param0 = param0; ...; return $dt; }
+        //   static lazy_Ctor0(initializer) { let dt = new Dt(tag); dt._initializer = initializer; return dt; }
+        wr.Write($"static create_{ctor.GetCompileName(Options)}(");
+        wr.Write(typeDescriptors);
+        var sep = typeDescriptorComma;
+        if (dt is CoDatatypeDecl) {
+          wr.Write($"{sep}$dt");
+          sep = ", ";
+        }
+        if (argNames.Count != 0) {
+          wr.Write(sep);
+        }
+        wr.Write(Util.Comma(argNames, nm => nm));
+        var w = wr.NewBlock(")");
+        if (dt is CoDatatypeDecl) {
+          var wThen = EmitIf("$dt === null", false, w);
+          wThen.WriteLine($"$dt = new {DtT_protected}({i}{typeDescriptorComma}{typeDescriptors});");
+          wThen.WriteLine("$dt._d = $dt;");
+        } else {
+          w.WriteLine($"let $dt = new {DtT_protected}({i}{typeDescriptorComma}{typeDescriptors});");
+        }
+        foreach (var arg in argNames) {
+          w.WriteLine("$dt.{0} = {0};", arg);
+        }
+        w.WriteLine("return $dt;");
+        if (dt is CoDatatypeDecl) {
+          wBody = wr.NewNamedBlock("static lazy_{0}(initializer)", ctor.GetCompileName(Options));
+          wBody.WriteLine("let dt = new {0}({1});", DtT_protected, i);
+          wBody.WriteLine("dt._initializer = initializer;");
+          wBody.WriteLine("return dt;");
+        }
+        i++;
+      }
+
+      // query properties
+      i = 0;
+      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+        // get is_Ctor0() { return _D is Dt_Ctor0; }
+        wr.WriteLine("get is_{0}() {{ return this.$tag === {1}; }}", ctor.GetCompileName(Options), i);
+        i++;
+      }
+
+      if (dt.HasFinitePossibleValues) {
+        Contract.Assert(dt.TypeArgs.Count == 0);
+        {
+          var w = wr.NewNamedBlock("static get AllSingletonConstructors()");
+          w.WriteLine("return this.AllSingletonConstructors_();");
+        }
+        {
+          var w = wr.NewNamedBlock("static *AllSingletonConstructors_()");
+          foreach (var ctor in dt.Ctors) {
+            Contract.Assert(ctor.Formals.Count == 0);
+            if (ctor.IsGhost) {
+              w.WriteLine("yield {0};", ForcePlaceboValue(UserDefinedType.FromTopLevelDecl(dt.Origin, dt), w, dt.Origin));
+            } else {
+              w.WriteLine("yield {0}.create_{1}({2});", DtT_protected, ctor.GetCompileName(Options), dt is CoDatatypeDecl ? "null" : "");
+            }
+          }
+        }
+      }
+
+      // destructors
+      foreach (var ctor in dt.Ctors) {
+        foreach (var dtor in ctor.Destructors.Where(dtor => dtor.EnclosingCtors[0] == ctor)) {
+          var compiledConstructorCount = dtor.EnclosingCtors.Count(constructor => !constructor.IsGhost);
+          if (compiledConstructorCount != 0) {
+            var arg = dtor.CorrespondingFormals[0];
+            if (!arg.IsGhost && arg.HasName) {
+              // datatype:   get dtor_Dtor0() { return this.Dtor0; }
+              // codatatype: get dtor_Dtor0() { return this._D().Dtor0; }
+              wr.WriteLine("get dtor_{0}() {{ return this{2}.{1}; }}", arg.CompileName, IdName(arg), dt is CoDatatypeDecl ? "._D()" : "");
+            }
+          }
+        }
+      }
+
+      if (dt is CoDatatypeDecl) {
+        // toString method
+        var w = wr.NewBlock("toString()");
+        i = 0;
+        foreach (var ctor in dt.Ctors) {
+          var thn = EmitIf(string.Format("this.$tag === {0}", i), true, w);
+          var nm = (dt.EnclosingModuleDefinition.TryToAvoidName ? "" : dt.EnclosingModuleDefinition.Name + ".") +
+                   dt.Name + "." + ctor.Name;
+          thn.WriteLine("return \"{0}\";", nm);
+          i++;
+        }
+        var els = w.NewBlock("");
+        els.WriteLine("return \"{0}.{1}.unexpected\";", dt.EnclosingModuleDefinition.GetCompileName(Options), DtT);
+
+      } else if (dt is IndDatatypeDecl) {
+        // toString method
+        var w = wr.NewBlock("toString()");
+        i = 0;
+        foreach (var ctor in dt.Ctors) {
+          var cw = EmitIf(string.Format("this.$tag === {0}", i), true, w);
+          var nm = (dt.EnclosingModuleDefinition.TryToAvoidName ? "" : dt.EnclosingModuleDefinition.Name + ".") +
+                   dt.Name + "." + ctor.Name;
+          cw.Write("return \"{0}\"", nm);
+          var sep = " + \"(\" + ";
+          var anyFormals = false;
+          var k = 0;
+          foreach (var arg in ctor.Formals) {
+            if (!arg.IsGhost) {
+              anyFormals = true;
+              if (arg.Type.IsStringType && UnicodeCharEnabled) {
+                cw.Write("{0}this.{1}.toVerbatimString(true)", sep, FormalName(arg, k));
+              } else {
+                cw.Write("{0}_dafny.toString(this.{1})", sep, FormalName(arg, k));
+              }
+
+              sep = " + \", \" + ";
+              k++;
+            }
+          }
+
+          if (anyFormals) {
+            cw.Write(" + \")\"");
+          }
+
+          cw.WriteLine(";");
+          i++;
+        }
+
+        var wElse = w.NewBlock("");
+        wElse.WriteLine("return \"<unexpected>\";");
+      }
+
+      // equals method
+      {
+        var w = wr.NewBlock("equals(other)");
+        {
+          var thn = EmitIf("this === other", true, w);
+          EmitReturnExpr("true", thn);
+        }
+        i = 0;
+        foreach (var ctor in dt.Ctors) {
+          var thn = EmitIf(string.Format("this.$tag === {0}", i), true, w);
+          var guard = EmitReturnExpr(thn);
+          guard.Write("other.$tag === {0}", i);
+          var k = 0;
+          foreach (Formal arg in ctor.Formals) {
+            if (!arg.IsGhost) {
+              string nm = FormalName(arg, k);
+              if (IsDirectlyComparable(DatatypeWrapperEraser.SimplifyType(Options, arg.Type))) {
+                guard.Write(" && this.{0} === other.{0}", nm);
+              } else {
+                guard.Write(" && _dafny.areEqual(this.{0}, other.{0})", nm);
+              }
+              k++;
+            }
+          }
+          i++;
+        }
+        var els = w.NewBlock("");
+        els.WriteLine("return false; // unexpected");
+      }
+
+      // static Default(defaultValues...) {  // where defaultValues are the parameters to the grounding constructor
+      //   return Dt.create_GroundingCtor(defaultValues...);
+      // }
+      wr.Write($"static Default(");
+      var usedTypeParameters = UsedTypeParameters(dt);
+      if (WriteRuntimeTypeDescriptorsFormals(dt.TypeArgs, false, wr) != 0 && usedTypeParameters.Count != 0) {
+        wr.Write(", ");
+      }
+      wr.Write(usedTypeParameters.Comma(FormatDefaultTypeParameterValue));
+      {
+        var wDefault = wr.NewBlock(")");
+        wDefault.Write("return ");
+        var groundingCtor = dt.GetGroundingCtor();
+        if (groundingCtor.IsGhost) {
+          wDefault.Write(ForcePlaceboValue(simplifiedType, wDefault, dt.Origin));
+        } else if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
+          wDefault.Write(DefaultValue(innerType, wDefault, dt.Origin));
+        } else {
+          var nonGhostFormals = groundingCtor.Formals.Where(f => !f.IsGhost).ToList();
+          var arguments = nonGhostFormals.Comma(f => DefaultValue(f.Type, wDefault, f.Origin));
+          EmitDatatypeValue(dt, groundingCtor, dt is CoDatatypeDecl, typeDescriptors, arguments, wDefault);
+        }
+        wDefault.WriteLine(";");
+      }
+
+      // Note: It is important that the following be a class with a static getter Default(), as opposed
+      // to a simple "{ Default: ... }" object, because we need for any recursive calls in the default
+      // expression to be evaluated lazily. (More precisely, not evaluated at all, but that will sort
+      // itself out due to the restrictions placed by the resolver.)
+      //
+      // static Rtd(rtd...) {
+      //   return class {
+      //     static get Default() { return Dt.create_CtorK(...); }
+      //   };
+      // }
+      wr.Write("static Rtd(");
+      WriteRuntimeTypeDescriptorsFormals(UsedTypeParameters(dt, true), true, wr);
+      var wRtd = wr.NewBlock(")");
+      var wClass = wRtd.NewBlock("return class", ";");
+      {
+        var wDefault = wClass.NewBlock("static get Default()");
+        var sep = typeDescriptors.Length != 0 && usedTypeParameters.Count != 0 ? ", " : "";
+        var arguments = usedTypeParameters.Comma(
+          tp => DefaultValue(new UserDefinedType(tp), wDefault, dt.Origin, true));
+        wDefault.WriteLine($"return {DtT_protected}.Default({typeDescriptors}{typeDescriptorComma}{arguments});");
+      }
+
+      return new ClassWriter(this, btw, btw);
+    }
+
+    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
+      var cw = (ClassWriter)CreateClass(IdProtect(nt.EnclosingModuleDefinition.GetCompileName(Options)), nt, wr);
+      var w = cw.MethodWriter;
+      if (nt.NativeType != null) {
+        var wIntegerRangeBody = w.NewBlock("static *IntegerRange(lo, hi)");
+        var wLoopBody = wIntegerRangeBody.NewBlock("while (lo.isLessThan(hi))");
+        wLoopBody.WriteLine("yield lo.toNumber();");
+        EmitIncrementVar("lo", wLoopBody);
+      }
+      if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        var witness = new ConcreteSyntaxTree(w.RelativeIndentLevel);
+        var wStmts = w.Fork();
+        if (nt.NativeType == null) {
+          witness.Append(Expr(nt.Witness, false, wStmts));
+        } else {
+          TrParenExpr(nt.Witness, witness, false, wStmts);
+          witness.Write(".toNumber()");
+        }
+        DeclareField("Witness", true, true, nt.BaseType, nt.Origin, witness.ToString(), w);
+      }
+      // In JavaScript, the companion class of a newtype (which is what is being declared here) doubles as a
+      // type descriptor for the newtype. The Default() method for that type descriptor is declared here.
+      var wDefault = w.NewBlock("static get Default()");
+      var udt = new UserDefinedType(nt.Origin, nt.Name, nt, new List<Type>());
+      var d = TypeInitializationValue(udt, wr, nt.Origin, false, false);
+      wDefault.WriteLine("return {0};", d);
+
+      GenerateIsMethod(nt, cw.MethodWriter);
+
+      if (nt.ParentTraits.Count != 0) {
+        // in constructor:
+        //   this._value = value;
+        cw.FieldWriter.WriteLine("this._value = value;");
+
+        // toString() {
+        //   return _dafny.toString(this._value)
+        // }
+        var wBody = cw.MethodWriter.NewNamedBlock("toString()");
+        wBody.WriteLine("return _dafny.toString(this._value)");
+      }
+
+      return cw;
+    }
+
+    void GenerateIsMethod(RedirectingTypeDecl declWithConstraints, ConcreteSyntaxTree wr) {
+      Contract.Requires(declWithConstraints is SubsetTypeDecl or NewtypeDecl);
+
+      if (declWithConstraints.ConstraintIsCompilable) {
+        var type = UserDefinedType.FromTopLevelDecl(declWithConstraints.Tok, (TopLevelDecl)declWithConstraints);
+
+        wr.Write($"static {IsMethodName}(");
+
+        var count = WriteRuntimeTypeDescriptorsFormals(declWithConstraints.TypeArgs, false, wr);
+        if (count != 0) {
+          wr.Write(", ");
+        }
+
+        var sourceFormal = new Formal(declWithConstraints.Tok, "_source", type, true, false, null);
+        var wrBody = wr.NewBlock($"{IdName(sourceFormal)})");
+        GenerateIsMethodBody(declWithConstraints, sourceFormal, wrBody);
+      }
+    }
+
+    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
+      var cw = (ClassWriter)CreateClass(IdProtect(sst.EnclosingModuleDefinition.GetCompileName(Options)), sst, wr);
+      var w = cw.MethodWriter;
+      var udt = UserDefinedType.FromTopLevelDecl(sst.Origin, sst);
+      string d;
+      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+        var sw = new ConcreteSyntaxTree(w.RelativeIndentLevel);
+        var wStmts = w.Fork();
+        sw.Append(Expr(sst.Witness, false, wStmts));
+        DeclareField("Witness", true, true, sst.Rhs, sst.Origin, sw.ToString(), w);
+        d = TypeName_UDT(FullTypeName(udt), udt, wr, udt.Origin) + ".Witness";
+      } else {
+        d = TypeInitializationValue(udt, wr, sst.Origin, false, false);
+      }
+      w.NewBlock("static get Default()").WriteLine($"return {d};");
+
+      GenerateIsMethod(sst, cw.MethodWriter);
+    }
+
+    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
+      literalSuffix = "";
+      needsCastAfterArithmetic = false;
+      switch (sel) {
+        case NativeType.Selection.Number:
+          name = "number";
+          break;
+        default:
+          Contract.Assert(false);  // unexpected native type
+          throw new cce.UnreachableException();  // to please the compiler
+      }
+    }
+
+    protected class ClassWriter : IClassWriter {
+      public readonly JavaScriptCodeGenerator CodeGenerator;
+      public readonly ConcreteSyntaxTree MethodWriter;
+      public readonly ConcreteSyntaxTree FieldWriter;
+
+      public ClassWriter(JavaScriptCodeGenerator codeGenerator, ConcreteSyntaxTree methodWriter, ConcreteSyntaxTree fieldWriter) {
+        Contract.Requires(codeGenerator != null);
+        Contract.Requires(methodWriter != null);
+        Contract.Requires(fieldWriter != null);
+        this.CodeGenerator = codeGenerator;
+        this.MethodWriter = methodWriter;
+        this.FieldWriter = fieldWriter;
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        return CodeGenerator.CreateMethod(m, typeArgs, createBody, MethodWriter, forBodyInheritance, lookasideBody);
+      }
+
+      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        throw new UnsupportedFeatureException(m.Origin, Feature.MethodSynthesis);
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
+        return CodeGenerator.CreateFunction(name, typeArgs, formals, resultType, tok, isStatic, createBody, member, MethodWriter, forBodyInheritance, lookasideBody);
+      }
+      public ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IOrigin tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance) {
+        return CodeGenerator.CreateGetter(name, resultType, tok, isStatic, createBody, MethodWriter);
+      }
+      public ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
+        return CodeGenerator.CreateGetterSetter(name, resultType, tok, createBody, out setterWriter, MethodWriter);
+      }
+      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs, Field field) {
+        CodeGenerator.DeclareField(name, isStatic, isConst, type, tok, rhs, FieldWriter);
+      }
+      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
+        throw new cce.UnreachableException();  // InitializeField should be called only for those compilers that set ClassesRedeclareInheritedFields to false.
+      }
+      public ConcreteSyntaxTree/*?*/ ErrorWriter() => MethodWriter;
+      public void Finish() { }
+    }
+
+    protected override bool SupportsStaticsInGenericClasses => false;
+
+    protected ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
+      if (!createBody) {
+        return null;
+      }
+
+      var customReceiver = !forBodyInheritance && NeedsCustomReceiver(m);
+      wr.Write("{0}{1}(", m.IsStatic || customReceiver ? "static " : "", IdName(m));
+      var sep = "";
+      WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, m.EnclosingClass, m, lookasideBody), wr, ref sep, tp => $"rtd$_{tp.GetCompileName(Options)}");
+      if (customReceiver) {
+        var nt = m.EnclosingClass;
+        var receiverType = UserDefinedType.FromTopLevelDecl(m.Origin, nt);
+        DeclareFormal(sep, "_this", receiverType, m.Origin, true, wr);
+        sep = ", ";
+      }
+      WriteFormals(sep, m.Ins, wr);
+      var w = wr.NewBlock(")");
+
+      if (!m.IsStatic && !customReceiver) {
+        w.WriteLine("let _this = this;");
+      }
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree EmitMethodReturns(Method m, ConcreteSyntaxTree wr) {
+      var beforeReturnBlock = wr.Fork(0);
+      EmitReturn(m.Outs, wr);
+      return beforeReturnBlock;
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member, ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
+      if (!createBody) {
+        return null;
+      }
+
+      var customReceiver = !forBodyInheritance && NeedsCustomReceiver(member);
+      wr.Write("{0}{1}(", isStatic || customReceiver ? "static " : "", name);
+      var sep = "";
+      WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, lookasideBody), wr, ref sep,
+        tp => $"rtd$_{tp.GetCompileName(Options)}");
+      if (customReceiver) {
+        var nt = member.EnclosingClass;
+        var receiverType = UserDefinedType.FromTopLevelDecl(tok, nt);
+        DeclareFormal(sep, "_this", receiverType, tok, true, wr);
+        sep = ", ";
+      }
+      WriteFormals(sep, formals, wr);
+      var w = wr.NewBlock(")", ";");
+      if (!isStatic && !customReceiver) {
+        w.WriteLine("let _this = this;");
+      }
+      return w;
+    }
+
+    int WriteRuntimeTypeDescriptorsFormals(List<TypeParameter> typeParams, bool useAllTypeArgs, ConcreteSyntaxTree wr, string prefix = "") {
+      Contract.Requires(typeParams != null);
+      Contract.Requires(wr != null);
+
+      int c = 0;
+      foreach (var tp in typeParams) {
+        if (useAllTypeArgs || NeedsTypeDescriptor(tp)) {
+          wr.Write($"{prefix}rtd$_{tp.GetCompileName(Options)}");
+          prefix = ", ";
+          c++;
+        }
+      }
+      return c;
+    }
+
+    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
+      if (cl is DatatypeDecl) {
+        needsTypeParameter = false;
+        needsTypeDescriptor = true;
+      } else if (cl is TraitDecl) {
+        needsTypeParameter = false;
+        needsTypeDescriptor = isStatic || lookasideBody;
+      } else {
+        Contract.Assert(cl is ClassDecl);
+        needsTypeParameter = false;
+        needsTypeDescriptor = isStatic;
+      }
+    }
+
+    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      Contract.Requires(type != null);
+      Contract.Requires(tok != null);
+      Contract.Requires(wr != null);
+
+      var xType = DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(Options, type);
+      if (xType is BoolType) {
+        return "_dafny.Rtd_bool";
+      } else if (xType is CharType) {
+        return UnicodeCharEnabled ? "_dafny.Rtd_codepoint" : "_dafny.Rtd_char";
+      } else if (xType is IntType) {
+        return "_dafny.Rtd_int";
+      } else if (xType is BigOrdinalType) {
+        return "_dafny.BigOrdinal";
+      } else if (xType is RealType) {
+        return "_dafny.BigRational";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        if (t.NativeType != null) {
+          return "_dafny.Rtd_number";
+        } else {
+          return "_dafny.Rtd_int";
+        }
+      } else if (xType is SetType) {
+        return DafnySetClass;
+      } else if (xType is MultiSetType) {
+        return DafnyMultiSetClass;
+      } else if (xType is SeqType) {
+        return DafnySeqClass;
+      } else if (xType is MapType) {
+        return DafnyMapClass;
+      } else if (xType.IsBuiltinArrowType) {
+        return "_dafny.Rtd_ref";  // null suffices as a default value, since the function will never be called
+      } else if (xType is UserDefinedType) {
+        var udt = (UserDefinedType)xType;
+        if (udt.ResolvedClass is TypeParameter tp) {
+          var receiver = thisContext != null && tp.Parent is TopLevelDeclWithMembers and not TraitDecl ? "this." : "";
+          return string.Format($"{receiver}rtd$_{tp.GetCompileName(Options)}");
+        }
+        var cl = udt.ResolvedClass;
+        Contract.Assert(cl != null);
+        if (cl is ClassLikeDecl) {
+          return "_dafny.Rtd_ref";
+        } else if (cl is DatatypeDecl) {
+          var dt = (DatatypeDecl)cl;
+          var w = new ConcreteSyntaxTree();
+          w.Write("{0}.Rtd(", dt is TupleTypeDecl ? "_dafny.Tuple" : FullTypeName(udt));
+          EmitTypeDescriptorsActuals(UsedTypeParameters(dt, udt.TypeArgs, true), udt.Origin, w, true);
+          w.Write(")");
+          return w.ToString();
+        } else if (xType.IsNonNullRefType) {
+          // what we emit here will only be used to construct a dummy value that programmer-supplied code will overwrite later
+          return "_dafny.Rtd_ref/*not used*/";
+        } else {
+          Contract.Assert(cl is NewtypeDecl || cl is SubsetTypeDecl);
+          return TypeName_UDT(FullTypeName(udt), udt, wr, udt.Origin);
+        }
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateGetter(string name, Type resultType, IOrigin tok, bool isStatic, bool createBody, ConcreteSyntaxTree wr) {
+      if (createBody) {
+        wr.Write("{0}get {1}()", isStatic ? "static " : "", name);
+        var w = wr.NewBlock("", ";");
+        if (!isStatic) {
+          w.WriteLine("let _this = this;");
+        }
+        return w;
+      } else {
+        return null;
+      }
+    }
+
+    protected ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody, out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree wr) {
+      if (createBody) {
+        wr.Write($"get {name}()");
+        var wGet = wr.NewBlock("", ";");
+        wGet.WriteLine("let _this = this;");
+
+        wr.Write($"set {name}(value)");
+        var wSet = wr.NewBlock("", ";");
+        wSet.WriteLine("let _this = this;");
+
+        setterWriter = wSet;
+        return wGet;
+      } else {
+        setterWriter = null;
+        return null;
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
+      var block = wr.NewBlock("TAIL_CALL_START: while (true)");
+      if (member is Method m) {
+        var beforeReturnBlock = block.Fork(0);
+        EmitReturn(m.Outs, block);
+        return beforeReturnBlock;
+      }
+      return block;
+    }
+
+    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
+      wr.WriteLine("continue TAIL_CALL_START;");
+    }
+
+    private string CharFromNumberMethodName() {
+      return UnicodeCharEnabled ? "new _dafny.CodePoint" : "String.fromCharCode";
+    }
+
+    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl /*?*/ member = null) {
+      Contract.Ensures(Contract.Result<string>() != null);
+      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
+
+      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
+      if (xType is BoolType) {
+        return "bool";
+      } else if (xType is CharType) {
+        return "char";
+      } else if (xType is IntType or BigOrdinalType) {
+        return "BigNumber";
+      } else if (xType is RealType) {
+        return "Dafny.BigRational";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        return t.NativeType != null ? GetNativeTypeName(t.NativeType) : "BigNumber";
+      } else if (xType.AsNewtype != null && member == null) {  // when member is given, use UserDefinedType case below
+        var newtypeDecl = xType.AsNewtype;
+        if (newtypeDecl.NativeType is { } nativeType) {
+          return GetNativeTypeName(nativeType);
+        }
+        return TypeName(newtypeDecl.ConcreteBaseType(xType.TypeArgs), wr, tok);
+      } else if (xType.IsObjectQ) {
+        return "object";
+      } else if (xType.IsArrayType) {
+        return "Array";
+      } else if (xType is UserDefinedType udt) {
+        var s = FullTypeName(udt, member);
+        return TypeName_UDT(s, udt, wr, udt.Origin);
+      } else if (xType is SetType) {
+        Type argType = ((SetType)xType).Arg;
+        return DafnySetClass;
+      } else if (xType is SeqType) {
+        Type argType = ((SeqType)xType).Arg;
+        return DafnySeqClass;
+      } else if (xType is MultiSetType) {
+        Type argType = ((MultiSetType)xType).Arg;
+        return DafnyMultiSetClass;
+      } else if (xType is MapType) {
+        return DafnyMapClass;
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
+      if (usePlaceboValue) {
+        return "undefined";
+      }
+
+      var xType = type.NormalizeExpandKeepConstraints();
+
+      if (xType is BoolType) {
+        return "false";
+      } else if (xType is CharType) {
+        return $"{CharFromNumberMethodName()}({CharType.DefaultValueAsString}.codePointAt(0))";
+      } else if (xType is IntType or BigOrdinalType) {
+        return IntegerLiteral(0);
+      } else if (xType is RealType) {
+        return "_dafny.BigRational.ZERO";
+      } else if (xType is BitvectorType) {
+        var t = (BitvectorType)xType;
+        return t.NativeType != null ? "0" : IntegerLiteral(0);
+      } else if (xType is SetType) {
+        return $"{DafnySetClass}.Empty";
+      } else if (xType is MultiSetType) {
+        return $"{DafnyMultiSetClass}.Empty";
+      } else if (xType is SeqType seq) {
+        if (seq.Arg.IsCharType) {
+          if (UnicodeCharEnabled) {
+            return "_dafny.Seq.UnicodeFromString(\"\")";
+          } else {
+            return "\"\"";
+          }
+        }
+        return $"{DafnySeqClass}.of()";
+      } else if (xType is MapType) {
+        return $"{DafnyMapClass}.Empty";
+      }
+
+      var udt = (UserDefinedType)xType;
+      var cl = udt.ResolvedClass;
+      Contract.Assert(cl != null);
+      if (cl is TypeParameter) {
+        if (constructTypeParameterDefaultsFromTypeDescriptors) {
+          return string.Format("{0}.Default", TypeDescriptor(udt, wr, udt.Origin));
+        } else {
+          return FormatDefaultTypeParameterValue((TypeParameter)udt.ResolvedClass);
+        }
+      } else if (cl is AbstractTypeDecl opaque) {
+        return FormatDefaultTypeParameterValue(opaque);
+      } else if (cl is NewtypeDecl) {
+        var td = (NewtypeDecl)cl;
+        if (td.Witness != null) {
+          return TypeName_UDT(FullTypeName(udt), udt, wr, udt.Origin) + ".Witness";
+        } else if (td.NativeType != null) {
+          return "0";
+        } else {
+          return TypeInitializationValue(td.ConcreteBaseType(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+      } else if (cl is SubsetTypeDecl) {
+        var td = (SubsetTypeDecl)cl;
+        if (td.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+          return TypeName_UDT(FullTypeName(udt), udt, wr, udt.Origin) + ".Default";
+        } else if (td.WitnessKind == SubsetTypeDecl.WKind.Special) {
+          // WKind.Special is only used with -->, ->, and non-null types:
+          Contract.Assert(ArrowType.IsPartialArrowTypeName(td.Name) || ArrowType.IsTotalArrowTypeName(td.Name) || td is NonNullTypeDecl);
+          if (ArrowType.IsPartialArrowTypeName(td.Name)) {
+            return "null";
+          } else if (ArrowType.IsTotalArrowTypeName(td.Name)) {
+            var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+            // return the lambda expression ((Ty0 x0, Ty1 x1, Ty2 x2) => rangeDefaultValue)
+            return string.Format("function () {{ return {0}; }}", rangeDefaultValue);
+          } else if (((NonNullTypeDecl)td).Class is ArrayClassDecl) {
+            // non-null array type; we know how to initialize them
+            var arrayClass = (ArrayClassDecl)((NonNullTypeDecl)td).Class;
+            if (arrayClass.Dims == 1) {
+              return "[]";
+            } else {
+              return string.Format("_dafny.newArray(undefined, {0})", Util.Comma(arrayClass.Dims, _ => "_dafny.ZERO"));
+            }
+          } else {
+            // non-null (non-array) type
+            // even though the type doesn't necessarily have a known initializer, it could be that the the compiler needs to
+            // lay down some bits to please the C#'s compiler's different definite-assignment rules.
+            return "null";
+          }
+        } else {
+          return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+        }
+      } else if (cl is ClassLikeDecl or ArrowTypeDecl) {
+        return "null";
+      } else if (cl is DatatypeDecl) {
+        var dt = (DatatypeDecl)cl;
+        var s = dt is TupleTypeDecl ? "_dafny.Tuple" : FullTypeName(udt);
+        var relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs).ConvertAll(ta => ta.Actual);
+
+        var wTypeDescriptors = new ConcreteSyntaxTree();
+        EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass(dt, udt.TypeArgs), tok, wTypeDescriptors);
+        var typeDescriptors = wTypeDescriptors.ToString();
+
+        var sep = typeDescriptors.Length != 0 && relevantTypeArgs.Count != 0 ? ", " : "";
+        var arguments = relevantTypeArgs.Comma(arg => DefaultValue(arg, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors));
+        return string.Format($"{s}.Default({typeDescriptors}{sep}{arguments})");
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+
+    }
+
+    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
+      ConcreteSyntaxTree wr, IOrigin tok, bool omitTypeArguments) {
+      Contract.Assume(fullCompileName != null);  // precondition; this ought to be declared as a Requires in the superclass
+      Contract.Assume(typeArgs != null);  // precondition; this ought to be declared as a Requires in the superclass
+      string s = IdProtect(fullCompileName);
+      return s;
+    }
+
+    internal override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member) {
+      // Many (that is, more so than in C# or Java) companion classes in JavaScript are just the same as the type
+      type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
+      if (type.NormalizeExpandKeepConstraints() is UserDefinedType udt) {
+        if ((udt.ResolvedClass is DatatypeDecl dt && DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _)) ||
+            udt.ResolvedClass is SubsetTypeDecl or NewtypeDecl) {
+          var s = FullTypeName(udt, member);
+          return TypeName_UDT(s, udt, wr, udt.Origin);
+        }
+      }
+
+      return TypeName(type, wr, tok, member);
+    }
+
+    // ----- Declarations -------------------------------------------------------------
+
+    protected void DeclareField(string name, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs, ConcreteSyntaxTree wr) {
+      if (isStatic) {
+        var w = wr.NewNamedBlock("static get {0}()", name);
+        EmitReturnExpr(rhs, w);
+      } else {
+        wr.WriteLine("this.{0} = {1};", name, rhs);
+      }
+    }
+
+    protected override bool DeclareFormal(string prefix, string name, Type type, IOrigin tok, bool isInParam, ConcreteSyntaxTree wr) {
+      if (isInParam) {
+        wr.Write("{0}{1}", prefix, name);
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+    protected override void DeclareLocalVar(string name, Type/*?*/ type, IOrigin/*?*/ tok, bool leaveRoomForRhs, string/*?*/ rhs, ConcreteSyntaxTree wr) {
+      wr.Write("let {0}", name);
+      if (leaveRoomForRhs) {
+        Contract.Assert(rhs == null);  // follows from precondition
+      } else if (rhs != null) {
+        wr.WriteLine(" = {0};", rhs);
+      } else {
+        wr.WriteLine(";");
+      }
+    }
+
+    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type/*?*/ type, IOrigin/*?*/ tok, ConcreteSyntaxTree wr) {
+      wr.Write("let {0} = ", name);
+      var w = wr.Fork();
+      wr.WriteLine(";");
+      return w;
+    }
+
+    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
+
+    protected override void DeclareOutCollector(string collectorVarName, ConcreteSyntaxTree wr) {
+      wr.Write("let {0} = ", collectorVarName);
+    }
+
+    protected override void DeclareLocalOutVar(string name, Type type, IOrigin tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr) {
+      DeclareLocalVar(name, type, tok, false, rhs, wr);
+    }
+
+    protected override void EmitOutParameterSplits(string outCollector, List<string> actualOutParamNames, ConcreteSyntaxTree wr) {
+      if (actualOutParamNames.Count == 1) {
+        EmitAssignment(actualOutParamNames[0], null, outCollector, null, wr);
+      } else {
+        for (var i = 0; i < actualOutParamNames.Count; i++) {
+          wr.WriteLine("{0} = {1}[{2}];", actualOutParamNames[i], outCollector, i);
+        }
+      }
+    }
+
+    protected override void EmitActualTypeArgs(List<Type> typeArgs, IOrigin tok, ConcreteSyntaxTree wr) {
+      // emit nothing
+    }
+
+    // ----- Statements -------------------------------------------------------------
+
+    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
+      bool isString = DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, arg.Type).IsStringType;
+      bool isStringLiteral = arg is StringLiteralExpr;
+      bool isGeneric = arg.Type.NormalizeToAncestorType().AsSeqType is { Arg.IsTypeParameter: true };
+      var wStmts = wr.Fork();
+      if (isStringLiteral && !UnicodeCharEnabled) {
+        // process.stdout.write(_dafny.toString(x));
+        wr.Write("process.stdout.write(_dafny.toString(");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.WriteLine("));");
+      } else if (isString) {
+        if (UnicodeCharEnabled) {
+          wr.Write($"process.stdout.write(");
+          TrParenExpr(arg, wr, false, wStmts);
+          wr.WriteLine(".toVerbatimString(false));");
+        } else {
+          wr.Write($"process.stdout.write(_dafny.toString({DafnySeqClass}.JoinIfPossible(");
+          wr.Append(Expr(arg, false, wStmts));
+          wr.WriteLine(")));");
+        }
+      } else if (isGeneric && !UnicodeCharEnabled) {
+        // try { process.stdout.write(_dafny.toString(((x) instanceof Array && typeof((x)[0]) == \"string\") ? (x).join("") : (x))); } catch (_error) { process.stdout.write(_dafny.toString(x)); }
+        wr.Write("try { process.stdout.write(_dafny.toString(");
+        wr.Write("(");
+        wr.Write("(");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.Write(") instanceof Array && typeof((");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.Write(")[0]) == \"string\") ? ");
+        wr.Write("(");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.Write(").join(\"\")");
+        wr.Write(":");
+        wr.Write("(");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.Write(")));");
+        wr.Write("} catch (_error) { process.stdout.write(_dafny.toString(");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.WriteLine("));}");
+      } else { // !isString && !isGeneric
+        // process.stdout.write(_dafny.toString(x));
+        wr.Write("process.stdout.write(_dafny.toString(");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.WriteLine("));");
+      }
+    }
+
+    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
+      outParams = outParams.Where(f => !f.IsGhost).ToList();
+      if (outParams.Count == 0) {
+        wr.WriteLine("return;");
+      } else if (outParams.Count == 1) {
+        wr.WriteLine("return {0};", IdName(outParams[0]));
+      } else {
+        wr.WriteLine("return [{0}];", Util.Comma(outParams, IdName));
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
+      var prefix = createContinueLabel ? "C" : "L";
+      return wr.NewNamedBlock($"{prefix}{label}:");
+    }
+
+    protected override void EmitBreak(string/*?*/ label, ConcreteSyntaxTree wr) {
+      if (label == null) {
+        wr.WriteLine("break;");
+      } else {
+        wr.WriteLine("break L{0};", label);
+      }
+    }
+
+    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
+      wr.WriteLine("break C{0};", label);
+    }
+
+    protected override void EmitYield(ConcreteSyntaxTree wr) {
+      wr.WriteLine("yield null;");
+    }
+
+    protected override void EmitAbsurd(string/*?*/ message, ConcreteSyntaxTree wr) {
+      if (message == null) {
+        message = "unexpected control point";
+      }
+      wr.WriteLine("throw new Error(\"{0}\");", message);
+    }
+
+    protected override void EmitHalt(IOrigin tok, Expression/*?*/ messageExpr, ConcreteSyntaxTree wr) {
+      var wStmts = wr.Fork();
+      wr.Write("throw new _dafny.HaltException(");
+      if (tok != null) {
+        wr.Write("\"" + tok.TokenToString(Options) + ": \" + ");
+      }
+
+      TrParenExpr(messageExpr, wr, false, wStmts);
+      if (UnicodeCharEnabled && messageExpr.Type.IsStringType) {
+        wr.Write(".toVerbatimString(false)");
+      }
+      wr.WriteLine(");");
+    }
+
+    protected override ConcreteSyntaxTree EmitForStmt(IOrigin tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
+      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
+
+      var nativeType = AsNativeType(loopIndex.Type);
+
+      wr.Write($"for (let {loopIndex.GetOrCreateCompileName(currentIdGenerator)} = ");
+      var startWr = wr.Fork();
+      wr.Write($"; ");
+
+      ConcreteSyntaxTree bodyWr;
+      if (goingUp) {
+        if (endVarName == null) {
+          wr.Write("true");
+        } else if (nativeType == null) {
+          wr.Write($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)}.isLessThan({endVarName})");
+        } else {
+          wr.Write($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)} < {endVarName}");
+        }
+        if (nativeType == null) {
+          bodyWr = wr.NewBlock($"; {loopIndex.GetOrCreateCompileName(currentIdGenerator)} = {loopIndex.GetOrCreateCompileName(currentIdGenerator)}.plus(_dafny.ONE))");
+        } else {
+          bodyWr = wr.NewBlock($"; {loopIndex.GetOrCreateCompileName(currentIdGenerator)}++)");
+        }
+      } else {
+        if (endVarName == null) {
+          wr.Write("true");
+        } else if (nativeType == null) {
+          wr.Write($"{endVarName}.isLessThan({loopIndex.GetOrCreateCompileName(currentIdGenerator)})");
+        } else {
+          wr.Write($"{endVarName} < {loopIndex.GetOrCreateCompileName(currentIdGenerator)}");
+        }
+        bodyWr = wr.NewBlock($"; )");
+        if (nativeType == null) {
+          bodyWr.WriteLine($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)} = {loopIndex.GetOrCreateCompileName(currentIdGenerator)}.minus(_dafny.ONE);");
+        } else {
+          bodyWr.WriteLine($"{loopIndex.GetOrCreateCompileName(currentIdGenerator)}--;");
+        }
+      }
+      bodyWr = EmitContinueLabel(labels, bodyWr);
+      TrStmtList(body, bodyWr);
+
+      return startWr;
+    }
+
+    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, Action<ConcreteSyntaxTree> boundAction, ConcreteSyntaxTree wr, string start = null) {
+      start = start ?? "0";
+      var boundWriter = new ConcreteSyntaxTree();
+      boundAction(boundWriter);
+      var bound = boundWriter.ToString();
+      return wr.NewNamedBlock("for (let {0} = {2}; {0} < {1}; {0}++)", indexVar, bound, start);
+    }
+
+    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
+      return wr.NewNamedBlock("for (let {0} = new BigNumber({1}); ; {0} = {0}.multipliedBy(2))", indexVar, start);
+    }
+
+    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine("{0} = {0}.plus(1);", varName);
+    }
+
+    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine("{0} = {0}.minus(1);", varName);
+    }
+
+    protected override string GetQuantifierName(string bvType) {
+      return string.Format("_dafny.Quantifier");
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IOrigin tok,
+      out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      wr.Write("for (const {0} of ", tmpVarName);
+      collectionWriter = wr.Fork();
+      var wwr = wr.NewBlock(")");
+      return wwr;
+    }
+
+    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
+      Type sourceType, bool introduceBoundVar, IOrigin tok, ConcreteSyntaxTree wr) {
+      wr.WriteLine("{0}{1} = {2};", introduceBoundVar ? "let " : "", boundVarName, tmpVarName);
+    }
+
+    [CanBeNull]
+    protected override Action<ConcreteSyntaxTree> GetSubtypeCondition(string tmpVarName, Type boundVarType, IOrigin tok, ConcreteSyntaxTree preconditions) {
+      string typeTest;
+      if (boundVarType.IsRefType) {
+        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
+          typeTest = "true";
+        } else if (boundVarType.IsTraitType) {
+          typeTest = $"_dafny.InstanceOfTrait({tmpVarName}, {TypeName(boundVarType, preconditions, tok)})";
+        } else {
+          typeTest = $"{tmpVarName} instanceof {TypeName(boundVarType, preconditions, tok)}";
+        }
+
+        if (boundVarType.IsNonNullRefType) {
+          typeTest = $"{tmpVarName} !== null && " + typeTest;
+        } else {
+          typeTest = $"{tmpVarName} === null || " + typeTest;
+        }
+      } else {
+        typeTest = "true";
+      }
+
+      typeTest = typeTest == "true" ? null : typeTest;
+      return typeTest == null ? null : wr => wr.Write(typeTest);
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      wr.Write("for (const {0} of ", boundVarName);
+      collectionWriter = wr.Fork();
+      return wr.NewBlock(")");
+    }
+
+    // ----- Expressions -------------------------------------------------------------
+
+    protected override void EmitNew(Type type, IOrigin tok, CallStmt initCall /*?*/, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts) {
+      var cl = ((UserDefinedType)type.NormalizeExpand()).ResolvedClass;
+      if (cl.Name == "object") {
+        wr.Write("_dafny.NewObject()");
+      } else {
+        wr.Write("new {0}(", TypeName(type, wr, tok));
+        EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass(cl, type.TypeArgs), tok, wr);
+        wr.Write(")");
+      }
+    }
+
+    protected override void EmitNewArray(Type elementType, IOrigin tok, List<string> dimensions,
+        bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var initValue = mustInitialize ? DefaultValue(elementType, wr, tok, true) : null;
+      if (dimensions.Count == 1) {
+        // handle the common case of 1-dimensional arrays separately
+        wr.Write($"Array(({dimensions[0]}).toNumber())");
+        if (initValue != null) {
+          wr.Write(".fill({0})", initValue);
+        }
+      } else {
+        // the general case
+        wr.Write("_dafny.newArray({0}, {1})", initValue ?? "undefined", dimensions.Comma(s => s));
+      }
+    }
+
+    protected string TranslateEscapes(string s) {
+      s = Util.ReplaceNullEscapesWithCharacterEscapes(s);
+
+      s = Util.UnicodeEscapesToLowercase(s);
+
+      return s;
+    }
+
+    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
+      if (e is StaticReceiverExpr) {
+        wr.Write(TypeName(e.Type, wr, e.Origin));
+      } else if (e.Value == null) {
+        wr.Write("null");
+      } else if (e.Value is bool) {
+        wr.Write((bool)e.Value ? "true" : "false");
+      } else if (e is CharLiteralExpr) {
+        var escaped = TranslateEscapes((string)e.Value);
+        if (UnicodeCharEnabled) {
+          wr.Write($"new _dafny.CodePoint('{escaped}'.codePointAt(0))");
+        } else {
+          wr.Write($"'{escaped}'");
+        }
+      } else if (e is StringLiteralExpr) {
+        var str = (StringLiteralExpr)e;
+        if (UnicodeCharEnabled) {
+          wr.Write($"_dafny.Seq.UnicodeFromString(");
+          TrStringLiteral(str, wr);
+          wr.Write(")");
+        } else {
+          TrStringLiteral(str, wr);
+        }
+      } else if (AsNativeType(e.Type) != null) {
+        wr.Write(e.Value.ToString());
+      } else if (e.Value is BigInteger) {
+        var i = (BigInteger)e.Value;
+        wr.Write(IntegerLiteral(i));
+      } else if (e.Value is BaseTypes.BigDec) {
+        var n = (BaseTypes.BigDec)e.Value;
+        if (0 <= n.Exponent) {
+          wr.Write("new _dafny.BigRational(new BigNumber(\"{0}", n.Mantissa);
+          for (int i = 0; i < n.Exponent; i++) {
+            wr.Write("0");
+          }
+          wr.Write("\"))");
+        } else {
+          wr.Write($"new _dafny.BigRational({IntegerLiteral(n.Mantissa)}, new BigNumber(\"1");
+          for (int i = n.Exponent; i < 0; i++) {
+            wr.Write("0");
+          }
+          wr.Write("\"))");
+        }
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
+      }
+    }
+    string IntegerLiteral(BigInteger i) {
+      if (i.IsZero) {
+        return "_dafny.ZERO";
+      } else if (i.IsOne) {
+        return "_dafny.ONE";
+      } else if (-0x20_0000_0000_0000L < i && i < 0x20_0000_0000_0000L) {  // 53 bits, plus sign
+        return $"new BigNumber({i})";
+      } else {
+        return $"new BigNumber(\"{i}\")";
+      }
+    }
+
+    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
+      var n = str.Length;
+      if (!isVerbatim) {
+        wr.Write($"\"{TranslateEscapes(str)}\"");
+      } else {
+        wr.Write("\"");
+        for (var i = 0; i < n; i++) {
+          if (str[i] == '\"' && i + 1 < n && str[i + 1] == '\"') {
+            wr.Write("\\\"");
+            i++;
+          } else if (str[i] == '\\') {
+            wr.Write("\\\\");
+          } else if (str[i] == '\n') {
+            wr.Write("\\n");
+          } else if (str[i] == '\r') {
+            wr.Write("\\r");
+          } else {
+            wr.Write(str[i]);
+          }
+        }
+        wr.Write("\"");
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, [CanBeNull] NativeType nativeType,
+      bool surroundByUnchecked, ConcreteSyntaxTree wr) {
+
+      Contract.Assert(nativeType == null || bvType.Width == 0); // JavaScript only supports "number" as a native type, and it is used just for bv0
+
+      if (bvType.Width == 0) {
+        return wr;
+      }
+      wr.Write("(");
+      var middle = wr.Fork();
+      wr.Write(").mod(new BigNumber(2).exponentiatedBy({0}))", bvType.Width);
+      return middle;
+    }
+
+    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
+        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      bool needsCast = false;
+      var nativeType = AsNativeType(e0.Type);
+      if (nativeType != null) {
+        GetNativeInfo(nativeType.Sel, out _, out _, out needsCast);
+      }
+
+      var bv = e0.Type.NormalizeToAncestorType().AsBitVectorType;
+      if (bv.Width == 0) {
+        tr(e0, wr, inLetExprBody, wStmts);
+      } else {
+        wr.Write("_dafny.{0}(", isRotateLeft ? "RotateLeft" : "RotateRight");
+        tr(e0, wr, inLetExprBody, wStmts);
+        wr.Write(", (");
+        tr(e1, wr, inLetExprBody, wStmts);
+        wr.Write(").toNumber(), {0})", bv.Width);
+        if (needsCast) {
+          wr.Write(".toNumber()");
+        }
+      }
+    }
+
+    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      wr.Write("[]", tupleTypeArgs);
+    }
+
+    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      wr.Write("{0}.push(_dafny.Tuple.of(", ingredients, tupleTypeArgs);
+      var wrTuple = wr.Fork();
+      wr.WriteLine("));");
+      return wrTuple;
+    }
+
+    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
+      wr.Write("{0}[{1}]", prefix, i);
+    }
+
+    protected override string IdProtect(string name) {
+      return PublicIdProtect(name);
+    }
+    public override string PublicIdProtect(string name) {
+      Contract.Requires(name != null);
+      switch (name) {
+        case "arguments":
+        case "await":
+        case "boolean":
+        case "byte":
+        case "catch":
+        case "continue":
+        case "debugger":
+        case "default":
+        case "delete":
+        case "do":
+        case "double":
+        case "enum":
+        case "eval":
+        case "final":
+        case "finally":
+        case "float":
+        case "for":
+        case "goto":
+        case "implements":
+        case "instanceof":
+        case "interface":
+        case "let":
+        case "long":
+        case "native":
+        case "package":
+        case "private":
+        case "public":
+        case "short":
+        case "super":
+        case "switch":
+        case "synchronized":
+        case "throw":
+        case "throws":
+        case "transient":
+        case "try":
+        case "typeof":
+        case "void":
+        case "volatile":
+        case "with":
+        case "toString":
+        case "equals":
+          return "_$$_" + name;
+        default:
+          return name;
+      }
+    }
+
+    protected override string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null) {
+      Contract.Assume(udt != null);  // precondition; this ought to be declared as a Requires in the superclass
+      if (udt is ArrowType) {
+        return ArrowType.Arrow_FullCompileName;
+      }
+      var cl = udt.ResolvedClass;
+      if (cl is TypeParameter) {
+        return IdProtect(udt.GetCompileName(Options));
+      } else if (cl is DefaultClassDecl && Attributes.Contains(cl.EnclosingModuleDefinition.Attributes, "extern") &&
+                 member != null && Attributes.Contains(member.Attributes, "extern")) {
+        // omit the default class name ("_default") in extern modules, when the class is used to qualify an extern member
+        Contract.Assert(!cl.EnclosingModuleDefinition.TryToAvoidName); // default module is not marked ":extern"
+        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options));
+      } else {
+        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdProtect(cl.GetCompileName(Options));
+      }
+    }
+
+    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
+      wr.Write("_this");
+    }
+
+    protected override ConcreteSyntaxTree EmitCast(ICanRender toType, ConcreteSyntaxTree wr) {
+      return wr;
+    }
+
+    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
+      var dt = dtv.Ctor.EnclosingDatatype;
+      EmitDatatypeValue(dt, dtv.Ctor, dtv.IsCoCall, typeDescriptorArguments, arguments, wr);
+    }
+
+    void EmitDatatypeValue(DatatypeDecl dt, DatatypeCtor ctor, bool isCoCall, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
+      var dtName = dt.GetFullCompileName(Options);
+      var ctorName = ctor.GetCompileName(Options);
+
+      var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
+      if (dt is TupleTypeDecl) {
+        Contract.Assert(typeDescriptorArguments.Length == 0);
+        wr.Write($"_dafny.Tuple.of({arguments})");
+      } else if (!isCoCall) {
+        // Ordinary constructor (that is, one that does not guard any co-recursive calls)
+        // Generate: Dt.create_Ctor(arguments)
+        var lazyArgument = dt is IndDatatypeDecl ? "" : arguments.Length == 0 ? "null" : "null, ";
+        wr.Write($"{dtName}.create_{ctorName}({lazyArgument}{typeDescriptorArguments}{sep}{arguments})");
+      } else {
+        var sep0 = typeDescriptorArguments.Length != 0 ? ", " : "";
+        // Co-recursive call
+        // Generate:  Dt.lazy_Ctor(($dt) => Dt.create_Ctor($dt, args))
+        wr.Write($"{dtName}.lazy_{ctorName}(($dt{sep0}{typeDescriptorArguments}) => ");
+        wr.Write("{0}.create_{1}($dt{2}{3}{4}{5})", dtName, ctorName, arguments.Length == 0 ? "" : ", ", typeDescriptorArguments, sep, arguments);
+        wr.Write(")");
+      }
+    }
+
+    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString) {
+      compiledName = "";
+      preString = "";
+      postString = "";
+      switch (id) {
+        case SpecialField.ID.UseIdParam:
+          compiledName = IdProtect((string)idParam);
+          break;
+        case SpecialField.ID.ArrayLength:
+        case SpecialField.ID.ArrayLengthInt:
+          if (idParam == null) {
+            compiledName = "length";
+          } else {
+            compiledName = "dims[" + (int)idParam + "]";
+          }
+          if (id == SpecialField.ID.ArrayLength) {
+            preString = "new BigNumber(";
+            postString = ")";
+          }
+          break;
+        case SpecialField.ID.Floor:
+          compiledName = "toBigNumber()";
+          break;
+        case SpecialField.ID.IsLimit:
+          preString = "_dafny.BigOrdinal.IsLimit(";
+          postString = ")";
+          break;
+        case SpecialField.ID.IsSucc:
+          preString = "_dafny.BigOrdinal.IsSucc(";
+          postString = ")";
+          break;
+        case SpecialField.ID.Offset:
+          preString = "_dafny.BigOrdinal.Offset(";
+          postString = ")";
+          break;
+        case SpecialField.ID.IsNat:
+          preString = "_dafny.BigOrdinal.IsNat(";
+          postString = ")";
+          break;
+        case SpecialField.ID.Keys:
+          compiledName = "Keys";
+          break;
+        case SpecialField.ID.Values:
+          compiledName = "Values";
+          break;
+        case SpecialField.ID.Items:
+          compiledName = "Items";
+          break;
+        case SpecialField.ID.Reads:
+          compiledName = "_reads";
+          break;
+        case SpecialField.ID.Modifies:
+          compiledName = "_modifies";
+          break;
+        case SpecialField.ID.New:
+          compiledName = "_new";
+          break;
+        default:
+          Contract.Assert(false); // unexpected ID
+          break;
+      }
+    }
+
+    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
+      Type expectedType, string/*?*/ additionalCustomParameter, bool internalAccess = false) {
+      var memberStatus = DatatypeWrapperEraser.GetMemberStatus(Options, member);
+      if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.Identity) {
+        return SimpleLvalue(obj);
+      } else if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue) {
+        return SimpleLvalue(w => w.Write("true"));
+      } else if (member is DatatypeDestructor dtor && dtor.EnclosingClass is TupleTypeDecl) {
+        Contract.Assert(dtor.CorrespondingFormals.Count == 1);
+        var formal = dtor.CorrespondingFormals[0];
+        return SuffixLvalue(obj, "[{0}]", formal.NameForCompilation);
+      } else if (member is SpecialField sf && !(member is ConstantField)) {
+        GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out var preStr, out var postStr);
+        if (compiledName.Length != 0) {
+          return SuffixLvalue(obj, ".{0}", compiledName);
+        } else {
+          // this member selection is handled by some kind of enclosing function call, so nothing to do here
+          return SimpleLvalue(obj);
+        }
+      } else if (member is Function fn) {
+        typeArgs = typeArgs.Where(ta => NeedsTypeDescriptor(ta.Formal)).ToList();
+        if (typeArgs.Count == 0 && additionalCustomParameter == null) {
+          if (member.IsStatic) {
+            return SuffixLvalue(obj, ".{0}", IdName(member));
+          } else {
+            // generate: obj.F.bind(obj)
+            return SimpleLvalue(w => {
+              var objWriter = new ConcreteSyntaxTree();
+              obj(objWriter);
+              var objString = objWriter.ToString();
+              w.Write("{0}.{1}.bind({0})", objString, IdName(member));
+            });
+          }
+        } else {
+          // We need an eta conversion to adjust for the difference in arity.
+          // (T0 a0, T1 a1, ...) -> obj.F(rtd0, rtd1, ..., additionalCustomParameter, a0, a1, ...)
+          // Start by writing to the suffix:  F(rtd0, rtd1, ...
+          var suffixWr = new ConcreteSyntaxTree();
+          suffixWr.Write(IdName(member));
+          suffixWr.Write("(");
+          var suffixSep = "";
+          EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), fn.Origin, suffixWr, ref suffixSep);
+          if (additionalCustomParameter != null) {
+            suffixWr.Write("{0}{1}", suffixSep, additionalCustomParameter);
+            suffixSep = ", ";
+          }
+          // Write the prefix and the rest of the suffix
+          var prefixWr = new ConcreteSyntaxTree();
+          var prefixSep = "";
+          prefixWr.Write("(");
+          foreach (var arg in fn.Ins) {
+            if (!arg.IsGhost) {
+              var name = idGenerator.FreshId("_eta");
+              prefixWr.Write("{0}{1}", prefixSep, name);
+              suffixWr.Write("{0}{1}", suffixSep, name);
+              suffixSep = ", ";
+              prefixSep = ", ";
+            }
+          }
+          prefixWr.Write(") => ");
+          suffixWr.Write(")");
+          return EnclosedLvalue(prefixWr.ToString(), obj, $".{suffixWr.ToString()}");
+        }
+      } else {
+        Contract.Assert(member is Field);
+        if (member.IsStatic) {
+          return SimpleLvalue(w => {
+            w.Write("{0}.{1}", TypeName_Companion(objType, w, member.Origin, member), IdName(member));
+            var sep = "(";
+            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.Origin, w, ref sep);
+            if (sep != "(") {
+              w.Write(")");
+            }
+          });
+        } else if (NeedsCustomReceiverNotTrait(member)) {
+          // instance const in a newtype
+          return SimpleLvalue(w => {
+            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.Origin, member), IdName(member));
+            obj(w);
+            w.Write(")");
+          });
+        } else if (internalAccess && (member is ConstantField || member.EnclosingClass is TraitDecl)) {
+          return SuffixLvalue(obj, $".{InternalFieldPrefix}{member.GetCompileName(Options)}");
+        } else {
+          return SimpleLvalue(w => {
+            obj(w);
+            w.Write(".{0}", IdName(member));
+            var sep = "(";
+            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.Origin, w, ref sep);
+            if (sep != "(") {
+              w.Write(")");
+            }
+          });
+        }
+      }
+    }
+
+    protected override ConcreteSyntaxTree ExprToInt(Type fromType, ConcreteSyntaxTree wr) {
+      if (AsNativeType(fromType) == null) {
+        return wr;
+      }
+      wr.Write("BigNumber");
+      return wr.ForkInParens();
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Action<ConcreteSyntaxTree>> indices, Type elmtType, ConcreteSyntaxTree wr) {
+      var w = wr.Fork();
+      if (indices.Count == 1) {
+        wr.Write("[");
+        indices[0](wr);
+        wr.Write("]");
+      } else {
+        wr.Write(".elmts");
+        foreach (var index in indices) {
+          wr.Write("[");
+          index(wr);
+          wr.Write("]");
+        }
+      }
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
+      var w = wr.Fork();
+      if (indices.Count == 1) {
+        wr.Write("[");
+        wr.Append(Expr(indices[0], inLetExprBody, wStmts));
+        wr.Write("]");
+      } else {
+        wr.Write(".elmts");
+        foreach (var index in indices) {
+          wr.Write("[");
+          wr.Append(Expr(index, inLetExprBody, wStmts));
+          wr.Write("]");
+        }
+      }
+      return w;
+    }
+
+    protected override void EmitArrayIndexToInt(ConcreteSyntaxTree wr, out ConcreteSyntaxTree wIndex) {
+      wIndex = new ConcreteSyntaxTree();
+      wr.Write($"new BigNumber(");
+      wr.Append(wIndex);
+      wr.Write(")");
+    }
+
+    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(expr, wr, inLetExprBody, wStmts);
+      if (AsNativeType(expr.Type) == null) {
+        wr.Write(".toNumber()");
+      }
+    }
+
+    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(source, wr, inLetExprBody, wStmts);
+      if (source.Type.NormalizeToAncestorType() is SeqType) {
+        // seq
+        wr.Write("[");
+        wr.Append(Expr(index, inLetExprBody, wStmts));
+        wr.Write("]");
+      } else {
+        // map or imap
+        wr.Write(".get(");
+        wr.Append(Expr(index, inLetExprBody, wStmts));
+        wr.Write(")");
+      }
+    }
+
+    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
+        CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (resultCollectionType.AsSeqType != null) {
+        wr.Write($"{DafnySeqClass}.update(");
+        wr.Append(Expr(source, inLetExprBody, wStmts));
+        wr.Write(", ");
+      } else {
+        TrParenExpr(source, wr, inLetExprBody, wStmts);
+        wr.Write(".update(");
+      }
+      wr.Append(Expr(index, inLetExprBody, wStmts));
+      wr.Write(", ");
+      wr.Append(CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts));
+      wr.Write(")");
+    }
+
+    protected override void EmitSeqSelectRange(Expression source, Expression lo /*?*/, Expression hi /*?*/,
+        bool fromArray, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (fromArray) {
+        wr.Write($"{DafnySeqClass}.of(...");
+      }
+      TrParenExpr(source, wr, inLetExprBody, wStmts);
+      if (lo != null) {
+        wr.Write(".slice(");
+        wr.Append(Expr(lo, inLetExprBody, wStmts));
+        if (hi != null) {
+          wr.Write(", ");
+          wr.Append(Expr(hi, inLetExprBody, wStmts));
+        }
+        wr.Write(")");
+      } else if (hi != null) {
+        wr.Write(".slice(0, ");
+        wr.Append(Expr(hi, inLetExprBody, wStmts));
+        wr.Write(")");
+      } else if (fromArray) {
+        wr.Write(".slice()");
+      }
+      if (fromArray) {
+        wr.Write(")");
+      }
+    }
+
+    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var fromType = (ArrowType)expr.Initializer.Type.NormalizeExpand();
+      wr.Write($"{DafnySeqClass}.Create(");
+      wr.Append(Expr(expr.N, inLetExprBody, wStmts));
+      wr.Write(", ");
+      wr.Append(Expr(expr.Initializer, inLetExprBody, wStmts));
+      wr.Write(")");
+      if (fromType.Result.IsCharType && !UnicodeCharEnabled) {
+        wr.Write(".join('')");
+      }
+    }
+
+    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr($"{DafnyMultiSetClass}.FromArray", expr.E, wr, inLetExprBody, wStmts);
+    }
+
+    protected override void EmitApplyExpr(Type functionType, IOrigin tok, Expression function,
+        List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(function, wr, inLetExprBody, wStmts);
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+    }
+
+    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
+      List<Type> boundTypes, Type resultType, IOrigin tok, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ref ConcreteSyntaxTree wStmts) {
+      wr.Write("(({0}) => ", Util.Comma(boundVars));
+      var w = wr.Fork();
+      wr.Write(")");
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+      return w;
+    }
+
+    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex,
+      DatatypeCtor ctor, Func<List<Type>> getTypeArgs, Type bvType, ConcreteSyntaxTree wr) {
+      if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
+        Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
+        Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
+        source(wr);
+      } else if (ctor.EnclosingDatatype is TupleTypeDecl tupleTypeDecl) {
+        Contract.Assert(tupleTypeDecl.NonGhostDims != 1); // such a tuple is an erasable-wrapper type, handled above
+        wr.Write("(");
+        source(wr);
+        wr.Write(")[{0}]", formalNonGhostIndex);
+      } else {
+        var dtorName = FormalName(dtor, formalNonGhostIndex);
+        wr.Write("(");
+        source(wr);
+        wr.Write("){0}.{1}", ctor.EnclosingDatatype is CoDatatypeDecl ? "._D()" : "", dtorName);
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IOrigin tok, List<string> inNames,
+        Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
+      wr.Write("function (");
+      Contract.Assert(inTypes.Count == inNames.Count);  // guaranteed by precondition
+      for (var i = 0; i < inNames.Count; i++) {
+        wr.Write("{0}{1}", i == 0 ? "" : ", ", inNames[i]);
+      }
+      var w = wr.NewExprBlock(")");
+      return w;
+    }
+
+    protected override void CreateIIFE(string bvName, Type bvType, IOrigin bvTok, Type bodyType, IOrigin bodyTok,
+      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
+      var w = wr.NewExprBlock("function ({0})", bvName);
+      wStmts = w.Fork();
+      w.Write("return ");
+      wrBody = w.Fork();
+      w.WriteLine(";");
+      wr.Write("(");
+      wrRhs = wr.Fork();
+      wr.Write(")");
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IOrigin resultTok, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var w = wr.NewBigExprBlock("function ()", "()");
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IOrigin resultTok, string bvName,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var w = wr.NewExprBlock("function ({0})", bvName);
+      wr.Write("({0})", source);
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
+      if (type.HasFatPointer) {
+        var w = wr.ForkInParens();
+        wr.Write("._value");
+        return w;
+      } else {
+        return wr;
+      }
+    }
+
+    protected override ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
+      if (type.HasFatPointer) {
+        wr.Write($"new {type.AsNewtype.GetFullCompileName(Options)}");
+        return wr.ForkInParens();
+      } else {
+        return wr;
+      }
+
+    }
+
+    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      switch (op) {
+        case ResolvedUnaryOp.BoolNot:
+          TrParenExpr("!", expr, wr, inLetExprBody, wStmts);
+          break;
+        case ResolvedUnaryOp.BitwiseNot: {
+            var exprType = expr.Type.NormalizeToAncestorType();
+            if (AsNativeType(exprType) != null) {
+              // JavaScript bitwise operators are weird (numeric operands are first converted into
+              // signed 32-bit values), and it could be easy to forget how weird they are.
+              // Therefore, as a protective measure, the following assert is here to catch against any future
+              // change that would render this translation incorrect.
+              Contract.Assert(exprType.AsBitVectorType.Width == 0);
+              wr.Write("0");
+            } else {
+              wr.Write("_dafny.BitwiseNot(");
+              wr.Append(Expr(expr, inLetExprBody, wStmts));
+              wr.Write(", {0})", exprType.AsBitVectorType.Width);
+            }
+            break;
+          }
+        case ResolvedUnaryOp.Cardinality:
+          TrParenExpr("new BigNumber(", expr, wr, inLetExprBody, wStmts);
+          if (expr.Type.NormalizeToAncestorType().AsMultiSetType != null) {
+            wr.Write(".cardinality())");
+          } else {
+            wr.Write(".length)");
+          }
+          break;
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
+      }
+    }
+
+    bool IsDirectlyComparable(Type t) {
+      Contract.Requires(t != null);
+      return t.IsBoolType || (t.IsCharType && !UnicodeCharEnabled) || AsNativeType(t) != null || t.IsRefType;
+    }
+
+    bool IsRepresentedAsBigNumber(Type t) {
+      if (AsNativeType(t) != null) {
+        return false;
+      } else {
+        return t.IsNumericBased(Type.NumericPersuasion.Int)
+          || t.NormalizeToAncestorType().IsBitVectorType
+          || t.IsBigOrdinalType;
+      }
+    }
+
+    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
+      Type e0Type, Type e1Type, IOrigin tok, Type resultType,
+      out string opString,
+      out string preOpString,
+      out string postOpString,
+      out string callString,
+      out string staticCallString,
+      out bool reverseArguments,
+      out bool truncateResult,
+      out bool convertE1_to_int,
+      out bool coerceE1,
+      ConcreteSyntaxTree errorWr) {
+
+      opString = null;
+      preOpString = "";
+      postOpString = "";
+      callString = null;
+      staticCallString = null;
+      reverseArguments = false;
+      truncateResult = false;
+      convertE1_to_int = false;
+      coerceE1 = false;
+
+      switch (op) {
+        case BinaryExpr.ResolvedOpcode.Iff:
+          opString = "==="; break;
+        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
+          if (AsNativeType(resultType) != null) {
+            // JavaScript bitwise operators are weird (numeric operands are first converted into
+            // signed 32-bit values), and it could be easy to forget how weird they are.
+            // Therefore, as a protective measure, the following assert is here to catch against any future
+            // change that would render this translation incorrect.
+            Contract.Assert(resultType.AsBitVectorType.Width < 32);
+            opString = "&";
+          } else {
+            staticCallString = "_dafny.BitwiseAnd";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.BitwiseOr:
+          if (AsNativeType(resultType) != null) {
+            // JavaScript bitwise operators are weird (numeric operands are first converted into
+            // signed 32-bit values), and it could be easy to forget how weird they are.
+            // Therefore, as a protective measure, the following assert is here to catch against any future
+            // change that would render this translation incorrect.
+            Contract.Assert(resultType.AsBitVectorType.Width < 32);
+            opString = "|";
+          } else {
+            staticCallString = "_dafny.BitwiseOr";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.BitwiseXor:
+          if (AsNativeType(resultType) != null) {
+            // JavaScript bitwise operators are weird (numeric operands are first converted into
+            // signed 32-bit values), and it could be easy to forget how weird they are.
+            // Therefore, as a protective measure, the following assert is here to catch against any future
+            // change that would render this translation incorrect.
+            Contract.Assert(resultType.AsBitVectorType.Width < 32);
+            opString = "^";
+          } else {
+            staticCallString = "_dafny.BitwiseXor";
+          }
+          break;
+
+        case BinaryExpr.ResolvedOpcode.EqCommon: {
+            var eqType = DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, e0Type);
+            if (IsDirectlyComparable(eqType)) {
+              opString = "===";
+            } else if (eqType.IsIntegerType || eqType.IsBitVectorType) {
+              callString = "isEqualTo";
+            } else if (eqType.IsRealType) {
+              callString = "equals";
+            } else {
+              staticCallString = "_dafny.areEqual";
+            }
+            break;
+          }
+        case BinaryExpr.ResolvedOpcode.NeqCommon: {
+            var eqType = DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, e0Type);
+            if (IsDirectlyComparable(eqType)) {
+              opString = "!==";
+            } else if (eqType.IsIntegerType) {
+              preOpString = "!";
+              callString = "isEqualTo";
+            } else if (eqType.IsRealType) {
+              preOpString = "!";
+              callString = "equals";
+            } else {
+              preOpString = "!";
+              staticCallString = "_dafny.areEqual";
+            }
+            break;
+          }
+
+        case BinaryExpr.ResolvedOpcode.Lt:
+          if (AsNativeType(e0Type) != null) {
+            opString = "<";
+          } else if (IsRepresentedAsBigNumber(e0Type) || e0Type.IsNumericBased(Type.NumericPersuasion.Real)) {
+            callString = "isLessThan";
+          } else {
+            Contract.Assert(false); throw new cce.UnreachableException();
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Le:
+          if (AsNativeType(e0Type) != null) {
+            opString = "<=";
+          } else if (IsRepresentedAsBigNumber(e0Type)) {
+            callString = "isLessThanOrEqualTo";
+          } else if (e0Type.IsNumericBased(Type.NumericPersuasion.Real)) {
+            callString = "isAtMost";
+          } else {
+            Contract.Assert(false); throw new cce.UnreachableException();
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Ge:
+          if (AsNativeType(e0Type) != null) {
+            opString = ">=";
+          } else if (IsRepresentedAsBigNumber(e0Type)) {
+            callString = "isLessThanOrEqualTo";
+            reverseArguments = true;
+          } else if (e0Type.IsNumericBased(Type.NumericPersuasion.Real)) {
+            callString = "isAtMost";
+            reverseArguments = true;
+          } else {
+            Contract.Assert(false); throw new cce.UnreachableException();
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Gt:
+          if (AsNativeType(e0Type) != null) {
+            opString = ">";
+          } else if (IsRepresentedAsBigNumber(e0Type) || e0Type.IsNumericBased(Type.NumericPersuasion.Real)) {
+            callString = "isLessThan";
+            reverseArguments = true;
+          } else {
+            Contract.Assert(false); throw new cce.UnreachableException();
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.LtChar when UnicodeCharEnabled:
+          callString = "isLessThan";
+          break;
+        case BinaryExpr.ResolvedOpcode.LeChar when UnicodeCharEnabled:
+          callString = "isLessThanOrEqual";
+          break;
+        case BinaryExpr.ResolvedOpcode.GtChar when UnicodeCharEnabled:
+          callString = "isLessThan";
+          reverseArguments = true;
+          break;
+        case BinaryExpr.ResolvedOpcode.GeChar when UnicodeCharEnabled:
+          callString = "isLessThanOrEqual";
+          reverseArguments = true;
+          break;
+        case BinaryExpr.ResolvedOpcode.LeftShift:
+          if (AsNativeType(resultType) != null) {
+            // JavaScript bitwise operators are weird (numeric operands are first converted into
+            // signed 32-bit values), and it could be easy to forget how weird they are.
+            // Therefore, as a protective measure, the following assert is here to catch against any future
+            // change that would render this translation incorrect.
+            Contract.Assert(resultType.AsBitVectorType.Width == 0);
+            opString = "+";  // 0 + 0 == 0 == 0 << 0
+            convertE1_to_int = true;
+          } else {
+            staticCallString = "_dafny.ShiftLeft";
+            truncateResult = true; convertE1_to_int = true;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.RightShift:
+          if (AsNativeType(resultType) != null) {
+            // JavaScript bitwise operators are weird (numeric operands are first converted into
+            // signed 32-bit values), and it could be easy to forget how weird they are.
+            // Therefore, as a protective measure, the following assert is here to catch against any future
+            // change that would render this translation incorrect.
+            Contract.Assert(resultType.AsBitVectorType.Width == 0);
+            opString = "+";  // 0 + 0 == 0 == 0 << 0
+            convertE1_to_int = true;
+          } else {
+            staticCallString = "_dafny.ShiftRight";
+            truncateResult = true; convertE1_to_int = true;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Add:
+          if (resultType.IsIntegerType || resultType.IsRealType || resultType.IsBigOrdinalType) {
+            callString = "plus"; truncateResult = true;
+          } else if (AsNativeType(resultType) != null) {
+            opString = "+";
+          } else if (resultType.IsCharType) {
+            staticCallString = $"_dafny.{CharMethodQualifier}PlusChar";
+          } else {
+            callString = "plus"; truncateResult = true;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Sub:
+          if (resultType.IsIntegerType || resultType.IsRealType || resultType.IsBigOrdinalType) {
+            callString = "minus"; truncateResult = true;
+          } else if (AsNativeType(resultType) != null) {
+            opString = "-";
+          } else if (resultType.IsCharType) {
+            staticCallString = $"_dafny.{CharMethodQualifier}MinusChar";
+          } else {
+            callString = "minus"; truncateResult = true;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mul:
+          if (resultType.IsIntegerType || resultType.IsRealType) {
+            callString = "multipliedBy"; truncateResult = true;
+          } else if (AsNativeType(resultType) != null) {
+            opString = "*";
+          } else {
+            callString = "multipliedBy"; truncateResult = true;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Div:
+          if (resultType.IsNumericBased(Type.NumericPersuasion.Real)) {
+            callString = "dividedBy";
+          } else if (resultType.IsIntegerType || AsNativeType(resultType) == null) {
+            staticCallString = "_dafny.EuclideanDivision";
+          } else if (AsNativeType(resultType).LowerBound < BigInteger.Zero) {
+            staticCallString = "_dafny.EuclideanDivisionNumber";
+          } else {
+            opString = "/";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mod:
+          if (resultType.IsIntegerType) {
+            callString = "mod";
+          } else if (AsNativeType(resultType) == null) {
+            callString = "mod";
+          } else if (AsNativeType(resultType).LowerBound < BigInteger.Zero) {
+            staticCallString = "_dafny.EuclideanModuloNumber";
+          } else {
+            opString = "%";
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.SetEq:
+        case BinaryExpr.ResolvedOpcode.MultiSetEq:
+        case BinaryExpr.ResolvedOpcode.MapEq:
+          callString = "equals"; break;
+        case BinaryExpr.ResolvedOpcode.SeqEq:
+          // a sequence may be represented as an array or as a string
+          staticCallString = "_dafny.areEqual"; break;
+
+        case BinaryExpr.ResolvedOpcode.ProperSubset:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
+          callString = "IsProperSubsetOf"; break;
+        case BinaryExpr.ResolvedOpcode.Subset:
+        case BinaryExpr.ResolvedOpcode.MultiSubset:
+          callString = "IsSubsetOf"; break;
+        case BinaryExpr.ResolvedOpcode.Disjoint:
+        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
+          callString = "IsDisjointFrom"; break;
+        case BinaryExpr.ResolvedOpcode.InSet:
+        case BinaryExpr.ResolvedOpcode.InMultiSet:
+        case BinaryExpr.ResolvedOpcode.InMap:
+          callString = "contains"; reverseArguments = true; break;
+        case BinaryExpr.ResolvedOpcode.Union:
+        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+          callString = "Union"; break;
+        case BinaryExpr.ResolvedOpcode.MapMerge:
+          callString = "Merge"; break;
+        case BinaryExpr.ResolvedOpcode.Intersection:
+        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+          callString = "Intersect"; break;
+        case BinaryExpr.ResolvedOpcode.SetDifference:
+        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+          callString = "Difference"; break;
+        case BinaryExpr.ResolvedOpcode.MapSubtraction:
+          callString = "Subtract"; break;
+
+        case BinaryExpr.ResolvedOpcode.ProperPrefix:
+          staticCallString = $"{DafnySeqClass}.IsProperPrefixOf"; break;
+        case BinaryExpr.ResolvedOpcode.Prefix:
+          staticCallString = $"{DafnySeqClass}.IsPrefixOf"; break;
+        case BinaryExpr.ResolvedOpcode.Concat:
+          staticCallString = $"{DafnySeqClass}.Concat"; break;
+        case BinaryExpr.ResolvedOpcode.InSeq:
+          staticCallString = $"{DafnySeqClass}.contains"; reverseArguments = true; break;
+
+        default:
+          base.CompileBinOp(op, e0Type, e1Type, tok, resultType,
+            out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
+            errorWr);
+          break;
+      }
+    }
+
+    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
+      wr.Write("{0}.isZero()", varName);
+    }
+
+    protected override void EmitConversionExpr(Expression fromExpr, Type fromType, Type toType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Int) || fromType.NormalizeToAncestorType().IsBitVectorType || fromType.IsCharType || fromType.IsBigOrdinalType) {
+        if (toType.Equals(fromType)) {
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+        } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          // (int or bv or char) -> real
+          Contract.Assert(AsNativeType(toType) == null);
+          wr.Write("new _dafny.BigRational(");
+          if (AsNativeType(fromType) != null || fromType.IsCharType) {
+            wr.Write("new BigNumber");
+          }
+          if (fromType.IsCharType) {
+            wr.Write("(");
+          }
+
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          if (fromType.IsCharType) {
+            wr.Write(UnicodeCharEnabled ? ".value)" : ".charCodeAt(0))");
+          }
+
+          wr.Write(", new BigNumber(1))");
+        } else if (toType.IsCharType) {
+          if (fromType.IsCharType) {
+            EmitExpr(fromExpr, inLetExprBody, wr, wStmts);
+          } else {
+            wr.Write($"{CharFromNumberMethodName()}(");
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+            if (AsNativeType(fromType) == null) {
+              wr.Write(".toNumber()");
+            }
+            wr.Write(")");
+          }
+        } else {
+          // (int or bv or char) -> (int or bv or ORDINAL)
+          var fromNative = AsNativeType(fromType);
+          var toNative = AsNativeType(toType);
+          if (fromNative != null && toNative != null) {
+            // from a native, to a native -- simple!
+            wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+          } else if (fromType.IsCharType) {
+            Contract.Assert(fromNative == null);
+            if (toNative == null) {
+              // char -> big-integer (int or bv or ORDINAL)
+              wr.Write("new BigNumber(");
+              TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+              wr.Write(UnicodeCharEnabled ? ".value)" : ".charCodeAt(0))");
+            } else {
+              // char -> native
+              TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+              wr.Write(UnicodeCharEnabled ? ".value" : ".charCodeAt(0)");
+            }
+          } else if (fromNative == null && toNative == null) {
+            // big-integer (int or bv) -> big-integer (int or bv or ORDINAL), so identity will do
+            wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+          } else if (fromNative != null && toNative == null) {
+            // native (int or bv) -> big-integer (int or bv)
+            wr.Write("new BigNumber");
+            TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          } else {
+            // any (int or bv) -> native (int or bv)
+            // Consider some optimizations
+            var literal = PartiallyEvaluate(fromExpr);
+            UnaryOpExpr u = fromExpr.Resolved as UnaryOpExpr;
+            MemberSelectExpr m = fromExpr.Resolved as MemberSelectExpr;
+            if (literal != null) {
+              // Optimize constant to avoid intermediate BigInteger
+              wr.Write("(" + literal + ")");
+            } else if (u != null && u.Op == UnaryOpExpr.Opcode.Cardinality) {
+              // Optimize .Count to avoid intermediate BigInteger
+              TrParenExpr(u.E, wr, inLetExprBody, wStmts);
+              wr.Write(".length");
+            } else if (m != null && m.MemberName == "Length" && m.Obj.Type.IsArrayType) {
+              // Optimize .Length to avoid intermediate BigInteger
+              TrParenExpr(m.Obj, wr, inLetExprBody, wStmts);
+              wr.Write(".length");
+            } else {
+              // no optimization applies; use the standard translation
+              TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+              wr.Write(".toNumber()");
+            }
+          }
+        }
+      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        Contract.Assert(AsNativeType(fromType) == null);
+        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          // real -> real
+          Contract.Assert(AsNativeType(toType) == null);
+          wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+        } else if (toType.IsCharType) {
+          wr.Write($"{CharFromNumberMethodName()}(");
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          wr.Write(".toBigNumber().toNumber())");
+        } else {
+          // real -> (int or bv)
+          TrParenExpr(fromExpr, wr, inLetExprBody, wStmts);
+          wr.Write(".toBigNumber()");
+          if (AsNativeType(toType) != null) {
+            wr.Write(".toNumber()");
+          }
+        }
+      } else if (fromType.IsBigOrdinalType) {
+        if (toType.IsCharType) {
+          wr.Write($"{CharFromNumberMethodName()}((");
+        }
+
+        wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+        if (toType.IsCharType) {
+          wr.Write(").toNumber())");
+        }
+      } else if (fromType.Equals(toType) || fromType.AsNewtype != null || toType.AsNewtype != null) {
+        wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+      } else {
+        Contract.Assert(false, $"not implemented for javascript: {fromType} -> {toType}");
+      }
+    }
+
+    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IOrigin tok, ConcreteSyntaxTree wr) {
+      if (fromType.IsRefType && !fromType.IsNonNullRefType) {
+        Contract.Assert(toType.IsRefType);
+        if (toType.IsNonNullRefType) {
+          wr.Write($"{localName} != null && ");
+        } else {
+          wr.Write($"{localName} == null || ");
+        }
+      }
+
+      if (toType.IsObject || toType.IsObjectQ) {
+        wr.Write("true");
+      } else if (toType.IsTraitType) {
+        wr.Write($"_dafny.InstanceOfTrait({localName}, {TypeName(toType, wr, tok)})");
+      } else if (fromType.IsTraitType && toType.AsNewtype != null) {
+        wr.Write($"{localName} instanceof {toType.AsNewtype.GetFullCompileName(Options)}");
+      } else {
+        wr.Write($"{localName} instanceof {TypeName(toType, wr, tok)}");
+      }
+    }
+
+    protected override void EmitIsIntegerTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(".isInteger() && ");
+    }
+
+    protected override void EmitIsUnicodeScalarValueTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("_dafny.CodePoint.isCodePoint");
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(" && ");
+    }
+
+    protected override void EmitIsInIntegerRange(Expression source, BigInteger lo, BigInteger hi, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitLiteralExpr(wr.ForkInParens(), new LiteralExpr(source.Origin, lo) { Type = Type.Int });
+      wr.Write(".isLessThanOrEqualTo");
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(" && ");
+
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(".isLessThan");
+      EmitLiteralExpr(wr.ForkInParens(), new LiteralExpr(source.Origin, hi) { Type = Type.Int });
+      wr.Write(" && ");
+    }
+
+    protected override void EmitCollectionDisplay(CollectionType ct, IOrigin tok, List<Expression> elements,
+        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      if (ct is SetType) {
+        wr.Write($"{DafnySetClass}.fromElements");
+        TrExprList(elements, wr, inLetExprBody, wStmts);
+      } else if (ct is MultiSetType) {
+        wr.Write($"{DafnyMultiSetClass}.fromElements");
+        TrExprList(elements, wr, inLetExprBody, wStmts);
+      } else {
+        Contract.Assert(ct is SeqType);  // follows from precondition
+        ConcreteSyntaxTree wrElements;
+        if (ct.Arg.IsCharType && !UnicodeCharEnabled) {
+          // We're really constructing a string.
+          // TODO: It may be that ct.Arg is a type parameter that may stand for char. We currently don't catch that case here.
+          wr.Write("[");
+          wrElements = wr.Fork();
+          wr.Write("].join(\"\")");
+        } else {
+          wr.Write($"{DafnySeqClass}.of(");
+          wrElements = wr.Fork();
+          wr.Write(")");
+        }
+        TrExprList(elements, wrElements, inLetExprBody, wStmts, typeAt: _ => ct.Arg, parens: false);
+      }
+    }
+
+    protected override void EmitMapDisplay(MapType mt, IOrigin tok, List<ExpressionPair> elements,
+        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"{DafnyMapClass}.Empty.slice()");
+      foreach (ExpressionPair p in elements) {
+        wr.Write(".updateUnsafe(");
+        wr.Append(Expr(p.A, inLetExprBody, wStmts));
+        wr.Write(",");
+        wr.Append(Expr(p.B, inLetExprBody, wStmts));
+        wr.Write(")");
+      }
+    }
+
+    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
+      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
+      wrVarInit.Write($"new {DafnySetClass}()");
+    }
+
+    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
+      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
+      wrVarInit.Write($"new {DafnyMapClass}()");
+    }
+
+    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      Contract.Assume(ct is SetType || ct is MultiSetType);  // follows from precondition
+      var wStmts = wr.Fork();
+      wr.Write("{0}.add(", collName);
+      wr.Append(Expr(elmt, inLetExprBody, wStmts));
+      wr.WriteLine(");");
+    }
+
+    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IOrigin tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      var wStmts = wr.Fork();
+      wr.Write("{0}.push([", collName);
+      var termLeftWriter = wr.Fork();
+      wr.Write(",");
+      wr.Append(Expr(term, inLetExprBody, wStmts));
+      wr.WriteLine("]);");
+      return termLeftWriter;
+    }
+
+    protected override void GetCollectionBuilder_Build(CollectionType ct, IOrigin tok, string collName,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmt) {
+      // collections are built in place
+      wr.Write(collName);
+    }
+
+    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr("_dafny.SingleValue", e, wr, inLetExprBody, wStmts);
+    }
+
+    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
+      var tryBlock = wr.NewBlock("try");
+      TrStmt(body, tryBlock);
+      var catchBlock = wr.NewBlock("catch (e)");
+      var ifBlock = catchBlock.NewBlock("if (e instanceof _dafny.HaltException)");
+      ifBlock.Write($"let {haltMessageVarName} = ");
+      if (UnicodeCharEnabled) {
+        ifBlock.Write("_dafny.Seq.UnicodeFromString(e.message)");
+      } else {
+        ifBlock.Write("e.message");
+      }
+      ifBlock.WriteLine(";");
+
+      TrStmt(recoveryBody, ifBlock);
+      var elseBlock = catchBlock.NewBlock("else");
+      elseBlock.WriteLine("throw e");
+    }
+
+    public string ToStringLiteral(string s) {
+      var wr = new ConcreteSyntaxTree();
+      EmitStringLiteral(s, false, wr);
+      return wr.ToString();
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/Library/LibraryBackend.cs b/Source/DafnyCore/Backends/Library/LibraryBackend.cs
new file mode 100644
index 00000000000..552c3127cf2
--- /dev/null
+++ b/Source/DafnyCore/Backends/Library/LibraryBackend.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Threading.Tasks;
+using DafnyCore;
+
+namespace Microsoft.Dafny.Compilers;
+
+public class LibraryBackend : ExecutableBackend {
+  public LibraryBackend(DafnyOptions options) : base(options) {
+  }
+
+  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { };
+
+  public override string TargetName => "Dafny Library (.doo)";
+
+  /// Some tests still fail when using the lib back-end, for example due to disallowed assumptions being present in the test,
+  /// such as empty constructors with ensures clauses, generated from iterators
+  public override bool IsStable => false;
+
+  public override string TargetExtension => "doo";
+  public override string TargetId => "lib";
+
+  public override string TargetBaseDir(string dafnyProgramName) =>
+    $"{Path.GetFileNameWithoutExtension(dafnyProgramName)}-lib";
+
+  public override bool TextualTargetIsExecutable => false;
+
+  public override bool SupportsInMemoryCompilation => false;
+
+  public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
+    Feature.LegacyCLI,
+    Feature.RuntimeCoverageReport
+  };
+
+  // Necessary since Compiler is null
+  public override string ModuleSeparator => ".";
+
+  public string DooPath { get; set; }
+
+  protected override SinglePassCodeGenerator CreateCodeGenerator() {
+    return null;
+  }
+
+  public override Task<bool> OnPostGenerate(string dafnyProgramName, string targetFilename, TextWriter outputWriter) {
+    // Not calling base.OnPostCompile() since it references `compiler`
+    return Task.FromResult(true);
+  }
+
+  public override string PublicIdProtect(string name) {
+    throw new NotSupportedException();
+  }
+
+  public override void Compile(Program dafnyProgram, string dafnyProgramName, ConcreteSyntaxTree output) {
+    if (!Options.UsingNewCli) {
+      throw new UnsupportedFeatureException(dafnyProgram.GetStartOfFirstFileToken(), Feature.LegacyCLI);
+    }
+
+    var dooFile = new DooFile(dafnyProgram.AfterParsingClone);
+    dooFile.Write(output);
+  }
+
+  public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree callToMainTree) {
+    // No-op
+  }
+
+  private string DooFilePath(string dafnyProgramName) {
+    return Path.GetFullPath(Path.ChangeExtension(dafnyProgramName, DooFile.Extension));
+  }
+
+  public override async Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText, string callToMain,
+    string targetFilename,
+    ReadOnlyCollection<string> otherFileNames, bool runAfterCompile, TextWriter outputWriter) {
+
+    var targetDirectory = Path.GetFullPath(Path.GetDirectoryName(targetFilename));
+    DooPath = DooFilePath(dafnyProgramName);
+
+    File.Delete(DooPath);
+
+    try {
+      ZipFile.CreateFromDirectory(targetDirectory, DooPath);
+    } catch (IOException) {
+      if (File.Exists(DooPath)) {
+        await outputWriter.WriteLineAsync($"Failed to delete doo file at {Options.GetPrintPath(DooPath)}");
+      }
+
+      throw;
+    }
+    if (Options.Verbose) {
+      await outputWriter.WriteLineAsync($"Wrote Dafny library to {Options.GetPrintPath(DooPath)}");
+    }
+
+    return (true, null);
+  }
+
+  public override Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain,
+    string targetFilename,
+    ReadOnlyCollection<string> otherFileNames, object compilationResult, TextWriter outputWriter,
+    TextWriter errorWriter) {
+    var dooPath = DooFilePath(dafnyProgramName);
+    return RunTargetDafnyProgram(dooPath, outputWriter, errorWriter, true);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/Python/PythonBackend.cs b/Source/DafnyCore/Backends/Python/PythonBackend.cs
new file mode 100644
index 00000000000..c3399cc4e9d
--- /dev/null
+++ b/Source/DafnyCore/Backends/Python/PythonBackend.cs
@@ -0,0 +1,142 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.CommandLine;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using DafnyCore.Options;
+
+namespace Microsoft.Dafny.Compilers;
+
+public class PythonBackend : ExecutableBackend {
+
+  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".py" };
+
+  public override string TargetName => "Python";
+  public override bool IsStable => true;
+  public override string TargetExtension => "py";
+  public override int TargetIndentSize => 4;
+
+  public override string TargetBaseDir(string dafnyProgramName) =>
+    $"{Path.GetFileNameWithoutExtension(dafnyProgramName)}-py";
+
+  public override string TargetBasename(string dafnyProgramName) => "__main__";
+
+  public override bool SupportsInMemoryCompilation => false;
+  public override bool TextualTargetIsExecutable => true;
+
+  public bool PythonModuleMode { get; set; } = true;
+  public string PythonModuleName;
+
+  public static readonly Option<string> PythonModuleNameCliOption = new("--python-module-name",
+    @"This Option is used to specify the Python Module Name for the translated code".TrimStart()) {
+  };
+  public override IEnumerable<Option<string>> SupportedOptions => new List<Option<string>> { PythonModuleNameCliOption };
+
+  static PythonBackend() {
+    OptionRegistry.RegisterOption(PythonModuleNameCliOption, OptionScope.Translation);
+  }
+
+  public override IReadOnlySet<string> SupportedNativeTypes =>
+    new HashSet<string> { "byte", "sbyte", "ushort", "short", "uint", "int", "number", "ulong", "long" };
+
+  protected override SinglePassCodeGenerator CreateCodeGenerator() {
+    var pythonModuleName = Options.Get(PythonModuleNameCliOption);
+    PythonModuleMode = pythonModuleName != null;
+    if (PythonModuleMode) {
+      PythonModuleName = pythonModuleName;
+    }
+    return new PythonCodeGenerator(Options, Reporter);
+  }
+
+  private static readonly Regex ModuleLine = new(@"^\s*#\s*Module:\s+([a-zA-Z0-9_]+(.[a-zA-Z0-9_]+)*)\s*$");
+
+  private static string FindModuleName(string externFilename) {
+    using var rd = new StreamReader(new FileStream(externFilename, FileMode.Open, FileAccess.Read));
+    while (rd.ReadLine() is { } line) {
+      var match = ModuleLine.Match(line);
+      if (match.Success) {
+        rd.Close();
+        return match.Groups[1].Value;
+      }
+    }
+    rd.Close();
+    return Path.GetExtension(externFilename) == ".py" ? Path.GetFileNameWithoutExtension(externFilename) : null;
+  }
+
+  private static readonly Dictionary<OSPlatform, string> PlatformDefaults = new() {
+    { OSPlatform.Linux, "python3" },
+    { OSPlatform.Windows, "python" },
+    { OSPlatform.FreeBSD, "python3" },
+    { OSPlatform.OSX, "python3" },
+  };
+  private static string DefaultPythonCommand => PlatformDefaults.SingleOrDefault(
+      kv => RuntimeInformation.IsOSPlatform(kv.Key),
+      new(OSPlatform.Linux, "python3")
+    ).Value;
+
+  bool CopyExternLibraryIntoPlace(string externFilename, string mainProgram, TextWriter outputWriter) {
+    // Grossly, we need to look in the file to figure out where to put it
+    var moduleName = FindModuleName(externFilename);
+    if (moduleName == null) {
+      outputWriter.WriteLine($"Unable to determine module name: {externFilename}");
+      return false;
+    }
+    var mainDir = Path.GetDirectoryName(mainProgram);
+    Contract.Assert(mainDir != null);
+    var modulePath = moduleName.Replace('.', Path.DirectorySeparatorChar);
+    var tgtFilename = Path.Combine(mainDir, $"{modulePath}.py");
+    var file = new FileInfo(externFilename);
+    Directory.CreateDirectory(Path.GetDirectoryName(tgtFilename)!);
+    file.CopyTo(tgtFilename, true);
+    if (Options.Verbose) {
+      outputWriter.WriteLine($"Additional input {externFilename} copied to {tgtFilename}");
+    }
+    return true;
+  }
+
+  public override void CleanSourceDirectory(string sourceDirectory) {
+    var cacheDirectory = Path.Combine(sourceDirectory, "__pycache__");
+    try {
+      Directory.Delete(cacheDirectory, true);
+    } catch (DirectoryNotFoundException) {
+    }
+  }
+
+  public override async Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText,
+    string callToMain /*?*/, string targetFilename /*?*/, ReadOnlyCollection<string> otherFileNames,
+    bool runAfterCompile, TextWriter outputWriter) {
+    foreach (var otherFileName in otherFileNames) {
+      if (Path.GetExtension(otherFileName) != ".py") {
+        await outputWriter.WriteLineAsync($"Unrecognized file as extra input for Python compilation: {otherFileName}");
+        return (false, null);
+      }
+      if (!CopyExternLibraryIntoPlace(otherFileName, targetFilename, outputWriter)) {
+        return (false, null);
+      }
+    }
+    if (!runAfterCompile) {
+      var psi = PrepareProcessStartInfo(DefaultPythonCommand);
+      psi.Arguments = $"-m compileall -q {Path.GetDirectoryName(targetFilename)}";
+      return (0 == await RunProcess(psi, outputWriter, outputWriter, "Error while compiling Python files."), null);
+    }
+    return (true, null);
+  }
+
+  public override async Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText,
+    string callToMain, /*?*/
+    string targetFilename, ReadOnlyCollection<string> otherFileNames, object compilationResult, TextWriter outputWriter,
+    TextWriter errorWriter) {
+    Contract.Requires(targetFilename != null || otherFileNames.Count == 0);
+    var psi = PrepareProcessStartInfo(DefaultPythonCommand, Options.MainArgs.Prepend(targetFilename));
+    psi.EnvironmentVariables["PYTHONIOENCODING"] = "utf8";
+    return 0 == await RunProcess(psi, outputWriter, errorWriter);
+  }
+
+  public PythonBackend(DafnyOptions options) : base(options) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/Python/PythonCodeGenerator.cs b/Source/DafnyCore/Backends/Python/PythonCodeGenerator.cs
new file mode 100644
index 00000000000..e95837a998b
--- /dev/null
+++ b/Source/DafnyCore/Backends/Python/PythonCodeGenerator.cs
@@ -0,0 +1,1993 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using System.Numerics;
+using DafnyCore.Backends.Python;
+using DafnyCore.Options;
+using JetBrains.Annotations;
+using Microsoft.BaseTypes;
+
+namespace Microsoft.Dafny.Compilers {
+
+  class PythonCodeGenerator : SinglePassCodeGenerator {
+
+    private bool PythonModuleMode;
+    private string PythonModuleName;
+
+    public PythonCodeGenerator(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
+      var pythonModuleName = Options.Get(PythonBackend.PythonModuleNameCliOption);
+      PythonModuleMode = pythonModuleName != null;
+      if (PythonModuleMode) {
+        PythonModuleName = pythonModuleName.ToString();
+      }
+
+      if (Options?.CoverageLegendFile != null) {
+        Imports.Add("DafnyProfiling", "DafnyProfiling");
+      }
+    }
+
+    // Key: Fully-qualified module name with python-module-name/outer-module
+    // Value: Dafny-generated Python module name without python-module-name/outer-module
+    // This separation is used to identify nested extern modules,
+    //   which currently cannot be used with python-module-name/outer-module.
+    private readonly Dictionary<string, string> Imports = new Dictionary<string, string>();
+
+    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
+      Feature.SubsetTypeTests,
+      Feature.MethodSynthesis,
+      Feature.RuntimeCoverageReport
+    };
+
+    public override string ModuleSeparator => "_";
+
+    private const string DafnyRuntimeModule = "_dafny";
+    private const string DafnyDefaultModule = "module_";
+    private const string DafnySystemModule = "System_";
+    private static readonly ISet<string> DafnyRuntimeGeneratedModuleNames = new HashSet<string> { DafnySystemModule, };
+    const string DafnySetClass = $"{DafnyRuntimeModule}.Set";
+    const string DafnyMultiSetClass = $"{DafnyRuntimeModule}.MultiSet";
+    const string DafnySeqClass = $"{DafnyRuntimeModule}.Seq";
+    private string DafnySeqMakerFunction => UnicodeCharEnabled ? $"{DafnyRuntimeModule}.SeqWithoutIsStrInference" : DafnySeqClass;
+    const string DafnyArrayClass = $"{DafnyRuntimeModule}.Array";
+    const string DafnyMapClass = $"{DafnyRuntimeModule}.Map";
+    const string DafnyDefaults = $"{DafnyRuntimeModule}.defaults";
+    string FormatDefaultTypeParameterValue(TopLevelDecl tp) {
+      Contract.Requires(tp is TypeParameter or AbstractTypeDecl);
+      return $"default_{tp.GetCompileName(Options)}";
+    }
+    protected override string StmtTerminator { get => ""; }
+    protected override string True { get => "True"; }
+    protected override string False { get => "False"; }
+    protected override string Conj { get => "and"; }
+    private static readonly IEnumerable<string> Keywords = new HashSet<string> { "False", "None", "True", "and", "as"
+      , "assert", "async", "await", "break", "class", "continue", "def", "del", "enum", "elif", "else", "except"
+      , "finally", "for", "from", "global", "if", "import", "in", "is", "lambda", "nonlocal", "not", "or", "pass"
+      , "raise", "return", "try", "while", "with", "yield" };
+    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
+      wr.WriteLine($"# Dafny program {program.Name} compiled into Python");
+      if (Options.IncludeRuntime) {
+        EmitRuntimeSource("DafnyRuntimePython", wr);
+      }
+      if (Options.Get(CommonOptionBag.UseStandardLibraries) && Options.Get(CommonOptionBag.TranslateStandardLibrary)) {
+        EmitRuntimeSource("DafnyStandardLibraries_py", wr);
+      }
+
+      Imports.Add(DafnyRuntimeModule, DafnyRuntimeModule);
+      EmitImports(null, null, wr);
+      wr.WriteLine();
+    }
+
+    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
+      Coverage.EmitSetup(wr);
+      var moduleName = IdProtect(mainMethod.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options));
+      if (moduleName != DafnyDefaultModule) {
+        wr.WriteLine($"import {moduleName}");
+      }
+      if (UnicodeCharEnabled) {
+        wr.NewBlockPy("try:")
+          .WriteLine($"dafnyArgs = [{DafnyRuntimeModule}.SeqWithoutIsStrInference(map({DafnyRuntimeModule}.CodePoint, a)) for a in sys.argv]")
+          .WriteLine($"{mainMethod.EnclosingClass.GetFullCompileName(Options)}.{(IssueCreateStaticMain(mainMethod) ? "StaticMain" : IdName(mainMethod))}(dafnyArgs)");
+      } else {
+        wr.NewBlockPy("try:")
+        .WriteLine($"dafnyArgs = [{DafnyRuntimeModule}.Seq(a) for a in sys.argv]")
+        .WriteLine($"{mainMethod.EnclosingClass.GetFullCompileName(Options)}.{(IssueCreateStaticMain(mainMethod) ? "StaticMain" : IdName(mainMethod))}(dafnyArgs)");
+      }
+      wr.NewBlockPy($"except {DafnyRuntimeModule}.HaltException as e:")
+        .WriteLine($"{DafnyRuntimeModule}.print(\"[Program halted] \" + e.message + \"\\n\")")
+        .WriteLine("sys.exit(1)");
+      Coverage.EmitTearDown(wr);
+    }
+
+    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
+      var mw = ((ClassWriter)cw).MethodWriter.WriteLine("@staticmethod");
+      return mw.NewBlockPy($"def StaticMain({argsParameterName}):");
+    }
+
+    protected override ConcreteSyntaxTree CreateModule(ModuleDefinition module, string moduleName, bool isDefault,
+      ModuleDefinition externModule,
+      string libraryName, Attributes moduleAttributes, ConcreteSyntaxTree wr) {
+      var pythonModuleName = PythonModuleMode ? PythonModuleName + "." : "";
+
+      moduleName = PublicModuleIdProtect(moduleName);
+      // Nested extern modules should be written inside a folder
+      var file = wr.NewFile($"{moduleName.Replace(".", "/")}.py");
+      EmitImports(moduleName, pythonModuleName, file);
+      return file;
+    }
+
+    protected override void DependOnModule(Program program, ModuleDefinition module, ModuleDefinition externModule,
+      string libraryName) {
+      var dependencyPythonModuleName = "";
+
+      // If the module being depended on was compiled using module mode,
+      // this module needs to rely on it using the dependency's translation record,
+      // even if this module is not using module mode
+      var translatedRecord = program.Compilation.AlreadyTranslatedRecord;
+      translatedRecord.OptionsByModule.TryGetValue(module.FullDafnyName, out var moduleOptions);
+      object dependencyModuleName = null;
+      moduleOptions?.TryGetValue(PythonBackend.PythonModuleNameCliOption.Name, out dependencyModuleName);
+      if (dependencyModuleName is string && !string.IsNullOrEmpty((string)dependencyModuleName)) {
+        dependencyPythonModuleName = dependencyModuleName is string name ? (string)dependencyModuleName + "." : "";
+        if (String.IsNullOrEmpty(dependencyPythonModuleName)) {
+          Reporter.Warning(MessageSource.Compiler, ResolutionErrors.ErrorId.none, Token.Cli,
+            $"Python Module Name not found for the module {module.GetCompileName(Options)}");
+        }
+      }
+
+      var dependencyCompileName = IdProtect(module.GetCompileName(Options));
+      // Don't import an empty module.
+      // Empty modules aren't generated, so their imports aren't valid.
+      if (!TranslationRecord.ModuleEmptyForCompilation(module)) {
+        Imports.Add(dependencyPythonModuleName + dependencyCompileName, dependencyCompileName);
+      }
+    }
+
+    private void EmitImports(string moduleName, string pythonModuleName, ConcreteSyntaxTree wr) {
+      wr.WriteLine("import sys");
+      wr.WriteLine("from typing import Callable, Any, TypeVar, NamedTuple");
+      wr.WriteLine("from math import floor");
+      wr.WriteLine("from itertools import count");
+      wr.WriteLine();
+      // Don't emit `import module_` for generated modules in the DafnyRuntimePython.
+      // The DafnyRuntimePython doesn't have a module.py file, so the import isn't valid.
+      if (!(DafnyRuntimeGeneratedModuleNames.Contains(moduleName))) {
+        wr.WriteLine($"import {(PythonModuleMode ? PythonModuleName + "." + DafnyDefaultModule : DafnyDefaultModule)} as {DafnyDefaultModule}");
+      }
+      foreach (var module in Imports) {
+        if (module.Value.Contains(".")) {
+          // This code branch only applies to extern modules. (ex. module {:extern "a.b.c"})
+          // If module.Value has `.`s in it, it is a nested extern module.
+          // (Non-extern nested modules with `.`s in their names
+          // will have their `.`s replaced with `_` before this code is executed,
+          // ex. module M.N --> "M_N", and will not hit this branch.)
+          // 
+          // Nested externs currently CANNOT be used with python-module-name:
+          //
+          // 1. (Python behavior; not able to be changed)
+          // Aliased Python modules cannot have `.`s in their name.
+          // ex. with `import X as Y`, `Y` cannot have `.`s.
+          //
+          // 2. (Dafny behavior; able to be changed, but don't need to change)
+          // Inside Dafny-generated Python modules,
+          // references to modules do not contain the python-module-name prefix.
+          // ex. If python-module-name=X.Y, and we have nested extern module "a.b.c",
+          //     code generation ignores the prefix and writes `a.b.c`.
+          //     Similarly, an extern non-nested module `E` is not prefixed and is generated as `E`,
+          //     and a non-extern nested module `M.N` is prefixed and generated as `X.Y.M_N`.
+          // (Similarly, extern modules do not contain the outer-module prefix).
+          // 
+          // 1. and 2. taken together prevent nested extern modules from being used with python-module-name.
+          // The reference to the nested extern inside generated code MUST be `a.b.c` due to 1).
+          // However, the aliased import cannot have `.`s in it due to 2).
+          // So nested externs cannot be aliased.
+          // Nested non-externs can be aliased (since, in 2., any nested `.`s are replaced with `_`s).
+          // Non-nested externs can be aliased (since, in 2., `Y` does not have `.`s).
+          //
+          // There are several possible paths to supporting these features together:
+          // - Modify behavior in 1 to apply prefixe (python-module-name/outer-module) to externs.
+          //   This is out of scope for python-module-name, since the outer-module prefix also does not apply to externs.
+          //   These are both "prefixes", and I expect any solution for python-module-name should also apply to outer-module.
+          // - Modify nested extern behavior to replace `.`s with `_`s, similar to nested non-externs.
+          if (!module.Value.Equals(module.Key)) {
+            throw new NotSupportedException($"Nested extern modules cannot be used with python-module-name. Nested extern: {module.Value}");
+          }
+          // Import the nested extern module directly.
+          // ex. module {:extern "a.b.c"} ==> `import a.b.c`
+          wr.WriteLine($"import {module.Value}");
+        } else {
+          // Here, module.Key == [python-module-name][outer-module][module.Value].
+          // However, in the body of the generated module, Dafny-generated code only references module.Value.
+          // Alias the import to module.Value so generated code can use the module.
+          //
+          // ex. python-module-name `X.Y`, outer-module=`A.B`:
+          // module `M` ==> `import X.Y.A_B_M as M`
+          // module `M.N` ==> `import X.Y.A_B_M_N as M_N`
+          // non-nested extern module `E` ==> `import X.Y.E as E` (outer-module prefix not applied to externs)
+          // nested extern modules not supported with python-module-name/outer-module prefixes.
+          wr.WriteLine($"import {module.Key} as {module.Value}");
+        }
+      }
+      if (moduleName != null) {
+        wr.WriteLine();
+        wr.WriteLine($"# Module: {moduleName}");
+        Imports.Add(pythonModuleName + moduleName, moduleName);
+      }
+    }
+
+    protected override string GetHelperModuleName() => DafnyRuntimeModule;
+
+    private static string MangleName(string name) {
+      if (Keywords.Contains(name)) {
+        name = $"{name}_";
+      } else {
+        while (name.StartsWith("_")) {
+          name = $"{name[1..]}_";
+        }
+        if (name.Length > 0 && char.IsDigit(name[0])) {
+          name = $"d_{name}";
+        }
+      }
+      return name;
+    }
+
+    protected override IClassWriter CreateClass(string moduleName, bool isExtern, string/*?*/ fullPrintName,
+      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type> superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+      var realSuperClasses = superClasses?.Where(trait => !trait.IsObject).ToList() ?? new List<Type>();
+      var baseClasses = realSuperClasses.Any()
+        ? $"({realSuperClasses.Comma(trait => TypeName(trait, wr, tok))})"
+        : "";
+      var name = IdName(cls);
+      var methodWriter = wr.NewBlockPy(header: $"class {IdProtect(name)}{baseClasses}:");
+
+      var relevantTypeParameters = typeParameters.Where(NeedsTypeDescriptor).ToList();
+      var args = relevantTypeParameters.Comma(tp => tp.GetCompileName(Options));
+      if (!string.IsNullOrEmpty(args)) { args = $", {args}"; }
+      var isNewtypeWithTraits = cls is NewtypeDecl { ParentTraits: { Count: > 0 } };
+      if (isNewtypeWithTraits) {
+        args += ", value";
+      }
+      var block = methodWriter.NewBlockPy(header: $"def  __init__(self{args}):", close: BlockStyle.Newline);
+      foreach (var tp in relevantTypeParameters) {
+        block.WriteLine("self.{0} = {0}", tp.GetCompileName(Options));
+      }
+      var constructorWriter = block.Fork();
+      block.WriteLine("pass");
+
+      if (cls is not DefaultClassDecl && (fullPrintName != null || isNewtypeWithTraits)) {
+        var wBody = methodWriter.NewBlockPy("def __dafnystr__(self) -> str:");
+        if (isNewtypeWithTraits) {
+          wBody.WriteLine("return _dafny.string_of(self._value)");
+        } else {
+          wBody.WriteLine($"return \"{fullPrintName}\"");
+        }
+      }
+
+      return new ClassWriter(this, constructorWriter, methodWriter);
+    }
+
+    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters,
+      TraitDecl trait, List<Type> superClasses, IOrigin tok, ConcreteSyntaxTree wr) {
+      var methodWriter = wr.NewBlockPy(header: $"class {IdProtect(name)}:");
+      // Avoids problems with member-less traits 
+      if (trait is TraitDecl tr && tr.Members.All(m => m.IsGhost || !m.IsStatic)) {
+        methodWriter.WriteLine("pass");
+      }
+      return new ClassWriter(this, methodWriter, methodWriter);
+    }
+
+    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
+      var cw = (ClassWriter)CreateClass(PublicModuleIdProtect(iter.EnclosingModuleDefinition.GetCompileName(Options)), false,
+        iter.FullName, iter.TypeArgs, iter, null, iter.Origin, wr);
+      var constructorWriter = cw.ConstructorWriter;
+      var w = cw.MethodWriter;
+      // here come the fields
+      Constructor ct = null;
+      foreach (var member in iter.Members) {
+        switch (member) {
+          case Field { IsGhost: false } f:
+            DeclareField(IdName(f), false, false, f.Type, f.Origin, PlaceboValue(f.Type, constructorWriter, f.Origin, true), constructorWriter);
+            break;
+          case Constructor constructor:
+            Contract.Assert(ct == null);  // we're expecting just one constructor
+            ct = constructor;
+            break;
+        }
+      }
+      Contract.Assert(ct != null);  // we do expect a constructor
+      constructorWriter.WriteLine("self._iter = None");
+
+      var nonNullIns = ct.Ins.Where(f => !f.IsGhost).ToList();
+      var args = nonNullIns.Select(IdName).Prepend("self").Comma();
+      var wCtor = w.NewBlockPy($"def {IdName(ct)}({args}):");
+      foreach (var p in nonNullIns) {
+        wCtor.WriteLine("self.{0} = {0}", IdName(p));
+      }
+      wCtor.WriteLine("self._iter = self.TheIterator()");
+
+      var wMoveNext = w.NewBlockPy("def MoveNext(self):");
+      wMoveNext.NewBlockPy("try:")
+        .WriteLine("next(self._iter)")
+        .WriteLine("return True");
+      wMoveNext.NewBlockPy("except (StopIteration, TypeError) as e:")
+        .WriteLine("return False");
+
+      return w.NewBlockPy("def TheIterator(self):");
+    }
+
+    protected override IClassWriter DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
+
+      if (dt is TupleTypeDecl) {
+        return null;
+      }
+
+      var DtT = IdProtect(dt.GetCompileName(Options));
+
+      var baseClasses = dt.ParentTypeInformation.UniqueParentTraits().Any()
+        ? $"({dt.ParentTypeInformation.UniqueParentTraits().Comma(trait => TypeName(trait, wr, dt.Origin))})"
+        : "";
+      var btw = wr.NewBlockPy($"class {DtT}{baseClasses}:", close: BlockStyle.Newline);
+
+      if (dt.HasFinitePossibleValues) {
+        btw.WriteLine($"@{DafnyRuntimeModule}.classproperty");
+        var w = btw.NewBlockPy(
+          $"def AllSingletonConstructors(cls):");
+        var values = dt.Ctors.Select(ctor =>
+          ctor.IsGhost
+          ? ForcePlaceboValue(UserDefinedType.FromTopLevelDecl(dt.Origin, dt), w, dt.Origin)
+          : $"{DtCtorDeclarationName(ctor)}()");
+        w.WriteLine($"return [{values.Comma()}]");
+      }
+
+      btw.WriteLine($"@classmethod");
+      var wDefault = btw.NewBlockPy($"def default(cls, {UsedTypeParameters(dt, true).Comma(FormatDefaultTypeParameterValue)}):");
+      var groundingCtor = dt.GetGroundingCtor();
+      if (groundingCtor.IsGhost) {
+        wDefault.WriteLine($"return lambda: {ForcePlaceboValue(UserDefinedType.FromTopLevelDecl(dt.Origin, dt), wDefault, dt.Origin)}");
+      } else if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
+        wDefault.WriteLine($"return lambda: {DefaultValue(innerType, wDefault, dt.Origin)}");
+      } else {
+        var wTypeDescriptors = new ConcreteSyntaxTree();
+        var typeDescriptorComma = "";
+        WriteRuntimeTypeDescriptorsFormals(TypeArgumentInstantiation.ListFromFormals(dt.TypeArgs),
+          wTypeDescriptors, ref typeDescriptorComma, FormatDefaultTypeParameterValue);
+        var typeDescriptorUses = wTypeDescriptors.ToString();
+
+        var nonGhostFormals = groundingCtor.Formals.Where(f => !f.IsGhost).ToList();
+        var arguments = nonGhostFormals.Comma(f => DefaultValue(f.Type, wDefault, f.Origin));
+        wDefault.Write("return lambda: ");
+        EmitDatatypeValue(dt, groundingCtor, dt is CoDatatypeDecl, typeDescriptorUses, arguments, wDefault, false);
+        wDefault.WriteLine();
+      }
+
+      // Ensures the inequality is based on equality defined in the constructor
+      btw.NewBlockPy("def __ne__(self, __o: object) -> bool:")
+        .WriteLine("return not self.__eq__(__o)");
+
+      if (dt is CoDatatypeDecl) {
+        var w = wr.NewBlockPy($"class {dt.GetCompileName(Options)}__Lazy({IdName(dt)}):");
+        w.NewBlockPy("def __init__(self, _c):")
+          .WriteLine("self._c = _c")
+          .WriteLine("self._d = None");
+        var get = w.NewBlockPy($"def _get(self):");
+        get.NewBlockPy("if self._c is not None:")
+          .WriteLine("self._d = self._c()")
+          .WriteLine("self._c = None");
+        get.WriteLine("return self._d");
+        w.NewBlockPy("def __dafnystr__(self) -> str:")
+          .WriteLine($"return {DafnyRuntimeModule}.string_of(self._get())");
+        foreach (var destructor in from ctor in dt.Ctors
+                                   let index = 0
+                                   from dtor in ctor.Destructors
+                                   where dtor.EnclosingCtors[0] == ctor
+                                   select dtor.CorrespondingFormals[0] into arg
+                                   where !arg.IsGhost
+                                   select IdProtect(arg.GetOrCreateCompileName(dt.CodeGenIdGenerator))) {
+          w.WriteLine("@property");
+          w.NewBlockPy($"def {destructor}(self):")
+            .WriteLine($"return self._get().{destructor}");
+        }
+      }
+
+      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
+        // Class-level fields don't work in all python version due to metaclasses.
+        // Adding a more restrictive type would be desirable, but Python expects their definition to precede this.
+        var argListX = dt.TypeArgs.Where(NeedsTypeDescriptor)
+          .Select(tp => $"('{IdProtect(tp.GetCompileName(Options))}', Any)");
+        var argListY = ctor.Destructors.Where(d => !d.IsGhost)
+          .Select(d => $"('{IdProtect(d.GetCompileName(Options))}', Any)");
+        var argList = argListX.Concat(argListY).Comma();
+        var namedtuple = $"NamedTuple('{IdProtect(ctor.GetCompileName(Options))}', [{argList}])";
+        var header = $"class {DtCtorDeclarationName(ctor)}({DtT}, {namedtuple}):";
+        var constructor = wr.NewBlockPy(header, close: BlockStyle.Newline);
+        DatatypeFieldsAndConstructor(ctor, constructor);
+
+        // @property
+        // def is_Ctor0(self) -> bool:
+        //   return isinstance(self, Dt_Ctor0) }
+        btw.WriteLine("@property");
+        btw.NewBlockPy($"def is_{ctor.GetCompileName(Options)}(self) -> bool:")
+          .WriteLine($"return isinstance(self, {DtCtorDeclarationName(ctor)})");
+      }
+
+      return new ClassWriter(this, btw, btw);
+    }
+
+    private void DatatypeFieldsAndConstructor(DatatypeCtor ctor, ConcreteSyntaxTree wr) {
+      var dt = ctor.EnclosingDatatype;
+
+      // Dt.Ctor
+      var fString = (dt.EnclosingModuleDefinition.TryToAvoidName ? "" : dt.EnclosingModuleDefinition.Name + ".") +
+                dt.Name + "." + ctor.Name;
+
+      // {self.Dtor0}, {self.Dtor1}, ..., {self.DtorN}
+      var args = ctor.Formals
+        .Where(f => !f.IsGhost)
+        .Select(f => {
+          if (f.Type.IsStringType && UnicodeCharEnabled) {
+            return $"{{self.{IdProtect(f.CompileName)}.VerbatimString(True)}}";
+          } else {
+            return $"{{{DafnyRuntimeModule}.string_of(self.{IdProtect(f.CompileName)})}}";
+          }
+        })
+        .Comma();
+
+      if (args.Length > 0 && dt is not CoDatatypeDecl) {
+        fString += $"({args})";
+      }
+
+      wr.NewBlockPy("def __dafnystr__(self) -> str:")
+        .WriteLine($"return f\'{fString.Replace("\'", "\\\'")}\'");
+
+      var argList = ctor.Formals
+        .Where(f => !f.IsGhost)
+        .Select(f => $"self.{IdProtect(f.CompileName)} == __o.{IdProtect(f.CompileName)}");
+      var suffix = args.Length > 0 ? $" and {string.Join(" and ", argList)}" : "";
+
+      wr.NewBlockPy("def __eq__(self, __o: object) -> bool:")
+        .WriteLine($"return isinstance(__o, {DtCtorDeclarationName(ctor)}){suffix}");
+
+      wr.NewBlockPy("def __hash__(self) -> int:")
+        .WriteLine("return super().__hash__()");
+    }
+
+    private string DtCtorDeclarationName(DatatypeCtor ctor, bool full = false) {
+      var dt = ctor.EnclosingDatatype;
+      return $"{(full ? dt.GetFullCompileName(Options) : IdProtect(dt.GetCompileName(Options)))}_{ctor.GetCompileName(Options)}";
+    }
+
+    protected IClassWriter DeclareType(TopLevelDecl d, SubsetTypeDecl.WKind witnessKind, Expression witness, ConcreteSyntaxTree wr) {
+      Contract.Requires(d is SubsetTypeDecl or NewtypeDecl);
+
+      var cw = (ClassWriter)CreateClass(IdProtect(d.EnclosingModuleDefinition.GetCompileName(Options)), d, wr);
+      var w = cw.MethodWriter;
+      var udt = UserDefinedType.FromTopLevelDecl(d.Origin, d);
+      w.WriteLine("@staticmethod");
+      var block = w.NewBlockPy("def default():");
+      var wStmts = block.Fork();
+      block.Write("return ");
+      if (witnessKind == SubsetTypeDecl.WKind.Compiled) {
+        block.Append(Expr(witness, false, wStmts));
+      } else {
+        block.Write(TypeInitializationValue(udt, wr, d.Origin, false, false));
+      }
+      block.WriteLine();
+
+      GenerateIsMethod((RedirectingTypeDecl)d, w);
+
+      if (d is NewtypeDecl newtypeDecl && newtypeDecl.ParentTraits.Count != 0) {
+        // in constructor:
+        //   self._value = value
+        cw.ConstructorWriter.WriteLine("self._value = value");
+      }
+
+      return cw;
+    }
+
+    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
+      return DeclareType(nt, nt.WitnessKind, nt.Witness, wr);
+    }
+
+    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
+      DeclareType(sst, sst.WitnessKind, sst.Witness, wr);
+    }
+
+    void GenerateIsMethod(RedirectingTypeDecl declWithConstraints, ConcreteSyntaxTree wr) {
+      Contract.Requires(declWithConstraints is SubsetTypeDecl or NewtypeDecl);
+
+      if (declWithConstraints.ConstraintIsCompilable) {
+        var type = UserDefinedType.FromTopLevelDecl(declWithConstraints.Tok, (TopLevelDecl)declWithConstraints);
+
+        wr.Write($"def {IsMethodName}(");
+
+        var sep = "";
+        var count = WriteRuntimeTypeDescriptorsFormals(TypeArgumentInstantiation.ListFromFormals(declWithConstraints.TypeArgs), wr, ref sep,
+          FormatDefaultTypeParameterValue);
+        wr.Write(sep);
+
+        var sourceFormal = new Formal(declWithConstraints.Tok, "_source", type, true, false, null);
+        var wrBody = wr.NewBlockPy($"{IdName(sourceFormal)}):");
+        GenerateIsMethodBody(declWithConstraints, sourceFormal, wrBody);
+      }
+    }
+
+    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
+      literalSuffix = "";
+      needsCastAfterArithmetic = false;
+      switch (sel) {
+        case NativeType.Selection.Byte:
+        case NativeType.Selection.SByte:
+        case NativeType.Selection.UShort:
+        case NativeType.Selection.Short:
+        case NativeType.Selection.UInt:
+        case NativeType.Selection.Int:
+        case NativeType.Selection.Number:
+        case NativeType.Selection.ULong:
+        case NativeType.Selection.Long:
+          name = "int"; break;
+        default:
+          Contract.Assert(false); // unexpected native type
+          throw new cce.UnreachableException(); // to please the compiler
+      }
+    }
+
+    private class ClassWriter : IClassWriter {
+      private readonly PythonCodeGenerator Compiler;
+      public readonly ConcreteSyntaxTree ConstructorWriter;
+      public readonly ConcreteSyntaxTree MethodWriter;
+
+      public ClassWriter(PythonCodeGenerator compiler, ConcreteSyntaxTree constructorWriter, ConcreteSyntaxTree methodWriter) {
+        Contract.Requires(compiler != null);
+        Contract.Requires(methodWriter != null);
+        Contract.Requires(constructorWriter != null);
+        Compiler = compiler;
+        ConstructorWriter = constructorWriter;
+        MethodWriter = methodWriter;
+      }
+
+      public ConcreteSyntaxTree CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody,
+        bool forBodyInheritance, bool lookasideBody) {
+        return Compiler.CreateMethod(m, typeArgs, createBody, MethodWriter, forBodyInheritance, lookasideBody);
+      }
+
+      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        throw new UnsupportedFeatureException(Token.NoToken, Feature.MethodSynthesis);
+      }
+
+      public ConcreteSyntaxTree CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs,
+          List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member,
+          bool forBodyInheritance, bool lookasideBody) {
+        return Compiler.CreateFunction(name, typeArgs, formals, resultType, tok, isStatic, createBody, member,
+          MethodWriter, forBodyInheritance, lookasideBody);
+      }
+
+      public ConcreteSyntaxTree CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IOrigin tok,
+          bool isStatic, bool isConst, bool createBody, MemberDecl member, bool forBodyInheritance) {
+        return Compiler.CreateGetter(name, resultType, tok, isStatic, createBody, MethodWriter);
+      }
+
+      public ConcreteSyntaxTree CreateGetterSetter(string name, Type resultType, IOrigin tok,
+          bool createBody, MemberDecl member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
+        return Compiler.CreateGetterSetter(name, createBody, out setterWriter, methodWriter: MethodWriter);
+      }
+
+      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type,
+          IOrigin tok, string rhs, Field field) {
+        Compiler.DeclareField(name, isStatic, isConst, type, tok, rhs, ConstructorWriter);
+      }
+
+      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
+        throw new cce.UnreachableException();
+      }
+
+      public ConcreteSyntaxTree ErrorWriter() => MethodWriter;
+
+      public void Finish() {
+
+      }
+    }
+
+    protected override string CompanionMemberIdName(MemberDecl member) {
+      if (member.EnclosingClass is NewtypeDecl && member.OverriddenMember != null) {
+        return "_Companion_" + IdName(member);
+      }
+      return base.CompanionMemberIdName(member);
+    }
+
+    private void DeclareField(string name, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs,
+        ConcreteSyntaxTree fieldWriter) {
+      fieldWriter.Write($"self.{name}: {TypeName(type, fieldWriter, tok)}");
+      if (rhs != null) {
+        fieldWriter.Write($" = {rhs}");
+      }
+      fieldWriter.WriteLine();
+    }
+
+    private ConcreteSyntaxTree CreateGetterSetter(string name, bool createBody, out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree methodWriter) {
+      methodWriter.WriteLine("@property");
+      var getterWriter = methodWriter.NewBlockPy(header: $"def {name}(self):");
+      methodWriter.WriteLine($"@{name}.setter");
+      setterWriter = methodWriter.NewBlockPy(header: $"def {name}(self, value):");
+      if (createBody) {
+        return getterWriter;
+      }
+      getterWriter.WriteLine($"return self.{InternalFieldPrefix}{name}");
+      setterWriter.WriteLine($"self.{InternalFieldPrefix}{name} = value");
+      setterWriter = null;
+      return null;
+    }
+
+    private ConcreteSyntaxTree CreateGetter(string name, Type resultType, IOrigin tok, bool isStatic, bool createBody, ConcreteSyntaxTree methodWriter) {
+      if (!createBody) { return null; }
+      methodWriter.WriteLine(isStatic ? $"@{DafnyRuntimeModule}.classproperty" : "@property");
+      return methodWriter.NewBlockPy(header: $"def {name}({(isStatic ? "instance" : "self")}):");
+    }
+
+    private ConcreteSyntaxTree CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody,
+        ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
+      var customReceiver = !forBodyInheritance && NeedsCustomReceiver(m);
+      if (m.IsStatic || customReceiver) { wr.WriteLine("@staticmethod"); }
+      var protectedName = !forBodyInheritance ? CompanionMemberIdName(m) : IdName(m);
+      wr.Write($"def {protectedName}(");
+      var sep = "";
+      WriteFormals(ForTypeDescriptors(typeArgs, m.EnclosingClass, m, lookasideBody), m.Ins, m.IsStatic, customReceiver, ref sep, wr);
+      var body = wr.NewBlockPy("):", close: BlockStyle.Newline);
+      if (createBody) {
+        if (m.Body.Body.All(s => s.IsGhost)) {
+          body.WriteLine("pass");
+        }
+        return body;
+      }
+      body.WriteLine("pass");
+      return null;
+    }
+
+    protected override ConcreteSyntaxTree EmitMethodReturns(Method m, ConcreteSyntaxTree wr) {
+      if (m.Outs.Any(f => !f.IsGhost)) {
+        var beforeReturnBlock = wr.Fork();
+        EmitReturn(m.Outs, wr);
+        return beforeReturnBlock;
+      }
+      return wr;
+    }
+
+    private void WriteFormals(List<TypeArgumentInstantiation> typeParams, List<Formal> formals, bool isStatic,
+      bool customReceiver, ref string sep, ConcreteSyntaxTree wr) {
+      if (!isStatic && !customReceiver) {
+        wr.Write(sep + "self");
+        sep = ", ";
+      }
+      WriteRuntimeTypeDescriptorsFormals(typeParams, wr, ref sep, FormatDefaultTypeParameterValue);
+      if (customReceiver) {
+        wr.Write(sep + "self");
+        sep = ", ";
+      }
+      WriteFormals(sep, formals, wr);
+    }
+
+    private ConcreteSyntaxTree CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs,
+      List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member,
+      ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
+      if (!createBody) { return null; }
+      var customReceiver = !forBodyInheritance && NeedsCustomReceiver(member);
+      if (isStatic || customReceiver) { wr.WriteLine("@staticmethod"); }
+      var protectedName = !forBodyInheritance ? CompanionMemberIdName(member) : IdName(member);
+      wr.Write($"def {protectedName}(");
+      var sep = "";
+      WriteFormals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, lookasideBody), formals, isStatic, customReceiver, ref sep, wr);
+      return wr.NewBlockPy("):", close: BlockStyle.Newline);
+    }
+
+    // Unlike the other compilers, we use lambdas to model type descriptors here.
+    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      Contract.Requires(type != null);
+      Contract.Requires(tok != null);
+      Contract.Requires(wr != null);
+
+      var simplifiedType = DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(Options, type);
+      return simplifiedType switch {
+        var x when x.IsBuiltinArrowType => $"{DafnyDefaults}.pointer",
+        // unresolved proxy; just treat as bool, since no particular type information is apparently needed for this type
+        BoolType or TypeProxy => $"{DafnyDefaults}.bool",
+        CharType => UnicodeCharEnabled ? $"{DafnyDefaults}.codepoint" : $"{DafnyDefaults}.char",
+        IntType or BitvectorType => $"{DafnyDefaults}.int",
+        RealType => $"{DafnyDefaults}.real",
+        SeqType or SetType or MultiSetType or MapType => TypeHelperName(simplifiedType.NormalizeExpandKeepConstraints()),
+        UserDefinedType udt => udt.ResolvedClass switch {
+          TypeParameter tp => TypeParameterDescriptor(tp),
+          ClassLikeDecl or NonNullTypeDecl => $"{DafnyDefaults}.pointer",
+          DatatypeDecl => DatatypeDescriptor(udt, udt.TypeArgs, udt.Origin),
+          NewtypeDecl or SubsetTypeDecl => CustomDescriptor(udt),
+          _ => throw new cce.UnreachableException()
+        },
+        _ => throw new cce.UnreachableException()
+      };
+
+      string TypeParameterDescriptor(TypeParameter typeParameter) {
+        if ((thisContext != null && typeParameter.Parent is TopLevelDeclWithMembers and not TraitDecl) || typeParameter.Parent is IteratorDecl) {
+          return $"self.{typeParameter.GetCompileName(Options)}";
+        }
+        if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(typeParameter, out var instantiatedTypeParameter)) {
+          return TypeDescriptor(instantiatedTypeParameter, wr, tok);
+        }
+        return FormatDefaultTypeParameterValue(type.AsTypeParameter);
+      }
+
+      string CustomDescriptor(UserDefinedType userDefinedType) {
+        return $"{TypeName_UDT(FullTypeName(userDefinedType), userDefinedType, wr, userDefinedType.Origin)}.default";
+      }
+
+      string DatatypeDescriptor(UserDefinedType udt, List<Type> typeArgs, IOrigin tok) {
+        var dt = (DatatypeDecl)udt.ResolvedClass;
+        var w = new ConcreteSyntaxTree();
+        if (dt is TupleTypeDecl) {
+          w.Write($"{DafnyDefaults}.tuple(");
+        } else {
+          w.Write($"{TypeName_UDT(FullTypeName(udt), udt, wr, tok)}.default(");
+        }
+        EmitTypeDescriptorsActuals(UsedTypeParameters(dt, typeArgs, true), tok, w, true);
+        w.Write(")");
+        return w.ToString();
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitNullTest(bool testIsNull, ConcreteSyntaxTree wr) {
+      var wrTarget = wr.ForkInParens();
+      wr.Write(testIsNull ? " == None" : " != None");
+      return wrTarget;
+    }
+
+    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
+      if (!member.IsStatic) {
+        wr.WriteLine("_this = self");
+      }
+      wr = wr.NewBlockPy($"while True:").NewBlockPy($"with {DafnyRuntimeModule}.label():");
+      var body = wr.Fork();
+      wr.WriteLine("break");
+      return body;
+    }
+
+    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
+      wr.WriteLine($"raise {DafnyRuntimeModule}.TailCall()");
+    }
+
+    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member = null) {
+      Contract.Ensures(Contract.Result<string>() != null);
+      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
+
+      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
+
+      if (xType.IsObjectQ) {
+        return "object";
+      }
+
+      if (xType.AsNewtype != null && member == null) {
+        // when member is given, use UserDefinedType case below
+        var newtypeDecl = xType.AsNewtype;
+        if (newtypeDecl.NativeType is { } nativeType) {
+          return GetNativeTypeName(nativeType);
+        }
+        return TypeName(newtypeDecl.ConcreteBaseType(xType.TypeArgs), wr, tok);
+      }
+
+      switch (xType) {
+        case BoolType:
+          return "bool";
+        case CharType:
+          return "str";
+        case IntType or BigOrdinalType or BitvectorType:
+          return "int";
+        case RealType:
+          return $"{DafnyRuntimeModule}.BigRational";
+        case UserDefinedType udt: {
+            var s = FullTypeName(udt, member);
+            return TypeName_UDT(s, udt, wr, udt.Origin);
+          }
+        case CollectionType:
+          return TypeHelperName(xType);
+      }
+
+      // TODO: I'm not 100% sure this is exhaustive yet
+      Contract.Assert(false);
+      throw new cce.UnreachableException();
+    }
+
+    private string FullName(TopLevelDecl decl) {
+      var segments = new List<string> { IdProtect(decl.GetCompileName(Options)) };
+      if (decl.EnclosingModuleDefinition != enclosingModule) {
+        segments = decl.EnclosingModuleDefinition.GetCompileName(Options).Split('.').Select(PublicModuleIdProtect).Concat(segments).ToList();
+      }
+      return string.Join('.', segments);
+    }
+
+    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IOrigin tok,
+        bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
+
+      if (usePlaceboValue) {
+        return "None";
+      }
+
+      var xType = type.NormalizeExpandKeepConstraints();
+
+      if (xType.IsObjectQ) {
+        return "None";
+      }
+
+      switch (xType) {
+        case BoolType:
+          return "False";
+        case CharType:
+          return UnicodeCharEnabled ? $"{DafnyRuntimeModule}.CodePoint({CharType.DefaultValueAsString})" : CharType.DefaultValueAsString;
+        case IntType or BigOrdinalType or BitvectorType:
+          return "int(0)";
+        case RealType:
+          return $"{DafnyRuntimeModule}.BigRational()";
+        case CollectionType:
+          if (xType is SeqType { Arg: { IsCharType: true } }) {
+            var wrString = new ConcreteSyntaxTree();
+            StringLiteralWrapper(wrString).Write("\"\"");
+            return wrString.ToString();
+          } else {
+            return $"{TypeHelperName(xType)}({{}})";
+          }
+        case UserDefinedType udt: {
+            var cl = udt.ResolvedClass;
+            Contract.Assert(cl != null);
+            switch (cl) {
+              case SubsetTypeDecl td:
+                switch (td.WitnessKind) {
+                  case SubsetTypeDecl.WKind.Compiled:
+                    return TypeName_UDT(FullName(cl), udt, wr, udt.Origin) + ".default()";
+                  case SubsetTypeDecl.WKind.Special:
+                    if (ArrowType.IsPartialArrowTypeName(td.Name)) {
+                      return "None";
+                    }
+                    if (td is NonNullTypeDecl decl) {
+                      if (decl.Class is ArrayClassDecl arr) {
+                        return $"{DafnyArrayClass}(None, {Enumerable.Repeat("0", arr.Dims).Comma()})";
+                      }
+                      return "None";
+                    }
+                    Contract.Assert(udt.TypeArgs.Any() && ArrowType.IsTotalArrowTypeName(td.Name));
+                    var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue,
+                      constructTypeParameterDefaultsFromTypeDescriptors);
+                    // The final TypeArg contains the result type
+                    var arguments = udt.TypeArgs.SkipLast(1).Comma((_, i) => idGenerator.FreshId("x"));
+                    return $"(lambda {arguments}: {rangeDefaultValue})";
+                  default:
+                    return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue,
+                      constructTypeParameterDefaultsFromTypeDescriptors);
+                }
+
+              case NewtypeDecl td:
+                if (td.Witness != null) {
+                  return TypeName_UDT(FullName(cl), udt, wr, udt.Origin) + ".default()";
+                } else {
+                  return TypeInitializationValue(td.ConcreteBaseType(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+                }
+
+              case DatatypeDecl dt:
+                var relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs, true).ConvertAll(ta => ta.Actual);
+                return dt is TupleTypeDecl
+                  ? $"({relevantTypeArgs.Comma(arg => DefaultValue(arg, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors))}{(relevantTypeArgs.Count == 1 ? "," : "")})"
+                  : $"{FullName(cl)}.default({relevantTypeArgs.Comma(arg => TypeDescriptor(arg, wr, tok))})()";
+
+              case TypeParameter tp:
+                return constructTypeParameterDefaultsFromTypeDescriptors
+                  ? $"{TypeDescriptor(udt, wr, tok)}()"
+                  : $"{FormatDefaultTypeParameterValue(tp)}()";
+
+              case AbstractTypeDecl opaque:
+                return FormatDefaultTypeParameterValue(opaque);
+
+              case ClassDecl:
+              case TraitDecl:
+              case ArrowTypeDecl:
+                return "None";
+            }
+            break;
+          }
+      }
+
+      Contract.Assert(false);
+      throw new cce.UnreachableException();  // unexpected type
+    }
+
+    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance,
+        List<Type> typeArgs, ConcreteSyntaxTree wr, IOrigin tok, bool omitTypeArguments) {
+      return fullCompileName;
+    }
+
+    internal override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl member) {
+      type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
+
+      if (type.NormalizeExpandKeepConstraints() is UserDefinedType udt) {
+        if ((udt.ResolvedClass is DatatypeDecl dt && DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _)) ||
+            udt.ResolvedClass is SubsetTypeDecl or NewtypeDecl) {
+          var s = FullTypeName(udt, member);
+          return TypeName_UDT(s, udt, wr, udt.Origin);
+        }
+      }
+      return TypeName(type, wr, tok, member);
+    }
+
+    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
+      needsTypeDescriptor = false;
+      needsTypeParameter = false;
+      switch (cl) {
+        case DatatypeDecl:
+          needsTypeDescriptor = true;
+          break;
+        case TraitDecl:
+          needsTypeDescriptor = isStatic || lookasideBody;
+          break;
+        case ClassDecl:
+          needsTypeDescriptor = isStatic;
+          break;
+      }
+    }
+
+    protected override bool DeclareFormal(string prefix, string name, Type type, IOrigin tok, bool isInParam, ConcreteSyntaxTree wr) {
+      if (isInParam) {
+        wr.Write($"{prefix}{name}");
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+    protected override void DeclareLocalVar(string name, Type type, IOrigin tok, bool leaveRoomForRhs, string rhs,
+        ConcreteSyntaxTree wr) {
+      wr.Write(name);
+      if (type != null) { wr.Write($": {TypeName(type, wr, tok)}"); }
+      if (rhs != null) { wr.Write($" = {rhs}"); }
+      if (!leaveRoomForRhs) {
+        wr.WriteLine();
+      }
+    }
+
+    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type type, IOrigin tok, ConcreteSyntaxTree wr) {
+      var w = new ConcreteSyntaxTree();
+      wr.FormatLine($"{name} = {w}");
+      return w;
+    }
+
+    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
+    protected override bool SupportsMultipleReturns => true;
+
+    protected override void DeclareLocalOutVar(string name, Type type, IOrigin tok, string rhs, bool useReturnStyleOuts,
+        ConcreteSyntaxTree wr) {
+      DeclareLocalVar(name, type, tok, false, rhs, wr);
+    }
+
+    protected override void EmitActualTypeArgs(List<Type> typeArgs, IOrigin tok, ConcreteSyntaxTree wr) {
+      // emit nothing
+    }
+
+    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
+      var wStmts = wr.Fork();
+      wr.Write($"{DafnyRuntimeModule}.print(");
+      EmitToString(wr, arg, wStmts);
+      wr.WriteLine(")");
+    }
+
+    private void EmitToString(ConcreteSyntaxTree wr, Expression arg, ConcreteSyntaxTree wStmts) {
+      if (UnicodeCharEnabled && DatatypeWrapperEraser.SimplifyTypeAndTrimNewtypes(Options, arg.Type).IsStringType) {
+        TrParenExpr(arg, wr, false, wStmts);
+        wr.Write(".VerbatimString(False)");
+      } else {
+        wr.Write($"{DafnyRuntimeModule}.string_of(");
+        wr.Append(Expr(arg, false, wStmts));
+        wr.Write(")");
+      }
+    }
+
+    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
+      outParams = outParams.Where(f => !f.IsGhost).ToList();
+      wr.Write("return");
+      if (outParams.Count > 0) {
+        wr.Write($" {outParams.Comma(IdName)}");
+      }
+      wr.WriteLine();
+    }
+
+    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
+      var manager = createContinueLabel ? "c_label" : "label";
+      var block = wr.NewBlockPy($"with {DafnyRuntimeModule}.{manager}(\"{label}\"):");
+      var core = block.Fork();
+      block.WriteLine("pass");
+      return core;
+    }
+
+    protected override void EmitBreak(string label, ConcreteSyntaxTree wr) {
+      wr.WriteLine(label != null ? $"raise {DafnyRuntimeModule}.Break(\"{label}\")" : "break");
+    }
+
+    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
+      wr.WriteLine($"raise {DafnyRuntimeModule}.Continue(\"{label}\")");
+    }
+
+    protected override void EmitYield(ConcreteSyntaxTree wr) {
+      wr.WriteLine("yield");
+    }
+
+    protected override void EmitAbsurd(string message, ConcreteSyntaxTree wr) {
+      if (message == null) {
+        message = "unexpected control point";
+      }
+      wr.WriteLine($"raise Exception(\"{message}\")");
+    }
+
+    protected override void EmitHalt(IOrigin tok, Expression messageExpr, ConcreteSyntaxTree wr) {
+      Contract.Requires(tok != null);
+      var wStmts = wr.Fork();
+      wr.Write($"raise {DafnyRuntimeModule}.HaltException(");
+      wr.Write($"\"{tok.TokenToString(Options)}: \" + ");
+      EmitToString(wr, messageExpr, wStmts);
+      wr.WriteLine(")");
+    }
+
+    protected override ConcreteSyntaxTree EmitIf(out ConcreteSyntaxTree guardWriter, bool hasElse, ConcreteSyntaxTree wr) {
+      wr.Write("if ");
+      guardWriter = wr.Fork();
+      return wr.NewBlockPy(":", hasElse ? "el" : "");
+    }
+
+    protected override ConcreteSyntaxTree EmitBlock(ConcreteSyntaxTree wr) {
+      //This encoding does not provide a new scope
+      return wr.NewBlockPy("if True:");
+    }
+
+    protected override ConcreteSyntaxTree EmitForStmt(IOrigin tok, IVariable loopIndex, bool goingUp, string endVarName,
+      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
+      string iterator;
+      var lowWr = new ConcreteSyntaxTree();
+      string argumentRemainder;
+      if (endVarName == null) {
+        iterator = "count";
+        argumentRemainder = goingUp ? "" : "-1, -1";
+      } else {
+        iterator = "range";
+        argumentRemainder = goingUp ? $", {endVarName}" : $"-1, {endVarName}-1, -1";
+      }
+      wr.Format($"for {IdName(loopIndex)} in {iterator}({lowWr}{argumentRemainder})");
+      var bodyWr = wr.NewBlockPy($":");
+      bodyWr = EmitContinueLabel(labels, bodyWr);
+      TrStmtList(body, bodyWr);
+
+      return lowWr;
+    }
+
+    protected override ConcreteSyntaxTree CreateWhileLoop(out ConcreteSyntaxTree guardWriter, ConcreteSyntaxTree wr) {
+      wr.Write("while ");
+      guardWriter = wr.Fork();
+      var wBody = wr.NewBlockPy(":");
+      return wBody;
+    }
+
+    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, Action<ConcreteSyntaxTree> boundAction, ConcreteSyntaxTree wr, string start = null) {
+      var lowerBound = start == null ? "" : start + ", ";
+      var boundWriter = new ConcreteSyntaxTree();
+      boundAction(boundWriter);
+      var bound = boundWriter.ToString();
+      return wr.NewBlockPy($"for {indexVar} in range({lowerBound}{bound}):");
+    }
+
+    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
+      return wr.NewBlockPy($"for {indexVar} in {DafnyRuntimeModule}.Doubler({start}):");
+    }
+
+    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine($"{varName} += 1");
+    }
+
+    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
+      wr.WriteLine($"{varName} -= 1");
+    }
+
+    protected override string GetQuantifierName(string bvType) {
+      return $"{DafnyRuntimeModule}.quantifier";
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IOrigin tok,
+      out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      collectionWriter = new ConcreteSyntaxTree();
+      wr.WriteLine($"{tmpVarName}: {TypeName(collectionElementType, wr, tok)}")
+        .Format($"for {tmpVarName} in {collectionWriter}:");
+      return wr.NewBlockPy();
+    }
+
+    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
+      Type sourceType, bool introduceBoundVar, IOrigin tok, ConcreteSyntaxTree wr) {
+      wr.WriteLine($"{boundVarName}{(introduceBoundVar ? $": {TypeName(boundVarType, wr, tok)}" : "")} = {tmpVarName}");
+    }
+
+    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs,
+        out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
+      collectionWriter = new ConcreteSyntaxTree();
+      return wr.Format($"for {boundVarName} in {collectionWriter}:").NewBlockPy();
+    }
+
+    protected override void EmitNew(Type type, IOrigin tok, CallStmt initCall, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var cl = ((UserDefinedType)type.NormalizeExpand()).ResolvedClass;
+      var ctor = (Constructor)initCall?.Method;  // correctness of cast follows from precondition of "EmitNew"
+      var sep = "";
+      wr.Write($"{TypeName(type, wr, tok)}(");
+      EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass(cl, type.TypeArgs), tok, wr, ref sep);
+      wr.Write(ConstructorArguments(initCall, wStmts, ctor, sep));
+      wr.Write(")");
+    }
+
+    protected override void EmitNewArray(Type elementType, IOrigin tok, List<string> dimensions,
+      bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var initValue = mustInitialize ? DefaultValue(elementType, wr, tok, true) : "None";
+      wr.Write($"{DafnyArrayClass}({initValue}, {dimensions.Comma(s => s)})");
+    }
+
+    protected static string TranslateEscapes(string s) {
+      s = Util.ReplaceNullEscapesWithCharacterEscapes(s);
+
+      s = Util.ExpandUnicodeEscapes(s, false);
+
+      return s;
+    }
+
+    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
+      switch (e) {
+        case CharLiteralExpr:
+          var escaped = TranslateEscapes((string)e.Value);
+          if (UnicodeCharEnabled) {
+            wr.Write($"{DafnyRuntimeModule}.CodePoint('{escaped}')");
+          } else {
+            wr.Write($"'{escaped}'");
+          }
+          break;
+        case StringLiteralExpr str:
+          TrStringLiteral(str, StringLiteralWrapper(wr));
+          break;
+        case StaticReceiverExpr:
+          wr.Write(TypeName(e.Type, wr, e.Origin));
+          break;
+        default:
+          switch (e.Value) {
+            case null:
+              wr.Write("None");
+              break;
+            case bool value:
+              wr.Write($"{value}");
+              break;
+            case BigInteger integer:
+              wr.Write($"{integer}");
+              break;
+            case BigDec n:
+              wr.Write($"{DafnyRuntimeModule}.BigRational('{n.Mantissa}e{n.Exponent}')");
+              break;
+            default:
+              // TODO: This may not be exhaustive
+              throw new cce.UnreachableException();
+          }
+          break;
+      }
+    }
+
+    private ConcreteSyntaxTree StringLiteralWrapper(ConcreteSyntaxTree wr) {
+      ConcreteSyntaxTree wrStringGoesHere;
+      if (UnicodeCharEnabled) {
+        wr.Write($"{DafnySeqMakerFunction}(map({DafnyRuntimeModule}.CodePoint, ");
+        wrStringGoesHere = wr.Fork();
+        wr.Write("))");
+      } else {
+        wr.Write($"{DafnySeqMakerFunction}(");
+        wrStringGoesHere = wr.Fork();
+        wr.Write(")");
+      }
+      return wrStringGoesHere;
+    }
+
+    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
+      if (!isVerbatim) {
+        wr.Write($"\"{TranslateEscapes(str)}\"");
+      } else {
+        var n = str.Length;
+        wr.Write("\"");
+        for (var i = 0; i < n; i++) {
+          if (str[i] == '\"' && i + 1 < n && str[i + 1] == '\"') {
+            wr.Write("\\\"");
+            i++;
+          } else if (str[i] == '\\') {
+            wr.Write("\\\\");
+          } else if (str[i] == '\n') {
+            wr.Write("\\n");
+          } else if (str[i] == '\r') {
+            wr.Write("\\r");
+          } else {
+            wr.Write(str[i]);
+          }
+        }
+        wr.Write("\"");
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, [CanBeNull] NativeType nativeType,
+      bool surroundByUnchecked, ConcreteSyntaxTree wr) {
+      var vec = wr.ForkInParens();
+      wr.Write($" & ((1 << {bvType.Width}) - 1)");
+      return vec;
+    }
+
+    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
+        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      // (( e0 op1 e1) | (e0 op2 (width - e1)))
+      wr = wr.ForkInParens();
+      EmitShift(e0, e1, isRotateLeft ? "<<" : ">>", isRotateLeft, true, wr.ForkInParens(), inLetExprBody, wStmts, tr);
+      wr.Write(" | ");
+      EmitShift(e0, e1, isRotateLeft ? ">>" : "<<", !isRotateLeft, false, wr.ForkInParens(), inLetExprBody, wStmts, tr);
+    }
+
+    void EmitShift(Expression e0, Expression e1, string op, bool truncate, bool firstOp, ConcreteSyntaxTree wr,
+        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      var bv = e0.Type.NormalizeToAncestorType().AsBitVectorType;
+      if (truncate) {
+        wr = EmitBitvectorTruncation(bv, null, true, wr);
+      }
+      tr(e0, wr, inLetExprBody, wStmts);
+      wr.Write($" {op} ");
+      if (!firstOp) {
+        wr = wr.ForkInParens().Write($"{bv.Width} - ");
+      }
+
+      tr(e1, wr.ForkInParens(), inLetExprBody, wStmts);
+    }
+
+    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      wr.Write("[]");
+    }
+
+    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
+      var wrTuple = new ConcreteSyntaxTree();
+      wr.FormatLine($"{ingredients}.append(({wrTuple}))");
+      return wrTuple;
+    }
+
+    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
+      wr.Write("{0}[{1}]", prefix, i);
+    }
+
+    protected override string IdProtect(string name) {
+      return PublicIdProtect(name);
+    }
+
+    public override string PublicIdProtect(string name) {
+      Contract.Requires(name != null);
+      return name switch {
+        _ => MangleName(name)
+      };
+    }
+
+
+    private readonly HashSet<string> ReservedModuleNames = new() {
+      "itertools",
+      "math",
+      "typing",
+      "sys"
+    };
+
+    private string PublicModuleIdProtect(string name) {
+      if (ReservedModuleNames.Contains(name)) {
+        return "_" + name;
+      }
+      return IdProtect(name);
+    }
+
+    protected override string FullTypeName(UserDefinedType udt, MemberDecl member = null) {
+      if (udt is ArrowType) {
+        //TODO: Add deeper types
+        return "Callable";
+      }
+
+      var cl = udt.ResolvedClass;
+      return cl switch {
+        TypeParameter => $"TypeVar(\'{IdProtect(cl.GetCompileName(Options))}\')",
+        ArrayClassDecl => DafnyArrayClass,
+        TupleTypeDecl => "tuple",
+        _ => FullName(cl)
+      };
+    }
+
+    protected override void EmitThis(ConcreteSyntaxTree wr, bool _ = false) {
+      var isTailRecursive = enclosingMethod is { IsTailRecursive: true } || enclosingFunction is { IsTailRecursive: true };
+      wr.Write(isTailRecursive ? "_this" : "self");
+    }
+
+    protected override void EmitNull(Type _, ConcreteSyntaxTree wr) {
+      wr.Write("None");
+    }
+
+    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
+      EmitDatatypeValue(dtv.Ctor.EnclosingDatatype, dtv.Ctor, dtv.IsCoCall, typeDescriptorArguments, arguments, wr);
+    }
+
+    void EmitDatatypeValue(DatatypeDecl dt, DatatypeCtor ctor, bool isCoCall, string typeDescriptorArguments, string arguments,
+      ConcreteSyntaxTree wr, bool qualifiedName = true) {
+      if (isCoCall) {
+        wr.Write($"{FullName(dt)}__Lazy(lambda: ");
+        var end = wr.Fork();
+        wr.Write(")");
+        wr = end;
+      }
+      if (dt is not TupleTypeDecl) {
+        wr.Write($"{DtCtorDeclarationName(ctor, dt.EnclosingModuleDefinition != enclosingModule)}");
+      } else if (ctor.Destructors.Count(d => !d.IsGhost) == 1) {
+        // 1-tuples need this this for disambiguation
+        arguments += ",";
+      }
+      var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
+      wr.Write($"({typeDescriptorArguments}{sep}{arguments})");
+    }
+
+    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType,
+        out string compiledName, out string preString, out string postString) {
+      compiledName = "";
+      preString = "";
+      postString = "";
+      switch (id) {
+        case SpecialField.ID.UseIdParam:
+          compiledName = IdProtect((string)idParam);
+          break;
+        case SpecialField.ID.Keys:
+          compiledName = "keys";
+          break;
+        case SpecialField.ID.Values:
+          compiledName = "values";
+          break;
+        case SpecialField.ID.Items:
+          compiledName = "items";
+          break;
+        case SpecialField.ID.Floor:
+          preString = "floor(";
+          postString = ")";
+          break;
+        case SpecialField.ID.IsLimit:
+          preString = $"{DafnyRuntimeModule}.BigOrdinal.is_limit(";
+          postString = ")";
+          break;
+        case SpecialField.ID.IsSucc:
+          preString = $"{DafnyRuntimeModule}.BigOrdinal.is_succ(";
+          postString = ")";
+          break;
+        case SpecialField.ID.Offset:
+          preString = $"{DafnyRuntimeModule}.BigOrdinal.offset(";
+          postString = ")";
+          break;
+        case SpecialField.ID.IsNat:
+          preString = $"{DafnyRuntimeModule}.BigOrdinal.is_nat(";
+          postString = ")";
+          break;
+        case SpecialField.ID.ArrayLength:
+        case SpecialField.ID.ArrayLengthInt:
+          var dim = idParam is int d and > 0 ? d : 0;
+          compiledName = $"length({dim})";
+          break;
+        default:
+          Contract.Assert(false); // unexpected ID
+          break;
+      }
+    }
+
+    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member,
+      List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap, Type expectedType,
+      string additionalCustomParameter = null, bool internalAccess = false) {
+      switch (DatatypeWrapperEraser.GetMemberStatus(Options, member)) {
+        case DatatypeWrapperEraser.MemberCompileStatus.Identity:
+          return SimpleLvalue(obj);
+        case DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue:
+          return StringLvalue(True);
+        default:
+          break;
+      }
+      switch (member) {
+        case DatatypeDestructor dd: {
+            var dest = dd.EnclosingClass switch {
+              TupleTypeDecl => $"[{dd.CorrespondingFormals[0].NameForCompilation}]",
+              _ => $".{IdProtect(dd.GetCompileName(Options))}"
+            };
+            return SuffixLvalue(obj, dest);
+          }
+        case SpecialField sf: {
+            GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out _, out _);
+            return SimpleLvalue(w => {
+              var customReceiver = NeedsCustomReceiverNotTrait(sf);
+              if (sf.IsStatic || customReceiver) {
+                w.Write(TypeName_Companion(objType, w, member.Origin, member));
+              } else {
+                obj(w);
+              }
+              if (compiledName.Length > 0) {
+                w.Write($".{(sf is ConstantField && internalAccess ? InternalFieldPrefix : "")}{compiledName}");
+              }
+              var sep = "(";
+              EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.Origin, w, ref sep);
+              if (customReceiver) {
+                w.Write(sep);
+                obj(w);
+                sep = ", ";
+              }
+              if (sep != "(") {
+                w.Write(")");
+              }
+            });
+          }
+        case Field: {
+            return SimpleLvalue(w => {
+              if (member.IsStatic) { w.Write(TypeName_Companion(objType, w, member.Origin, member)); } else { obj(w); }
+              w.Write($".{IdName(member)}");
+            });
+          }
+        case Function fn: {
+            if (additionalCustomParameter == null && typeArgs.Count == 0) {
+              return SuffixLvalue(obj, $".{IdName(fn)}");
+            }
+            return SimpleLvalue(w => {
+              var args = fn.Ins
+                .Where(f => !f.IsGhost)
+                .Select(_ => ProtectedFreshId("_eta"))
+                .Comma();
+              w.Write($"lambda {args}: ");
+              obj(w);
+              w.Write($".{IdName(fn)}(");
+              var sep = "";
+              EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), fn.Origin, w, ref sep);
+              if (additionalCustomParameter != null) {
+                w.Write(sep + additionalCustomParameter);
+                sep = ", ";
+              }
+              if (args.Length > 0) {
+                w.Write(sep);
+              }
+              w.Write(args + ")");
+            });
+          }
+        default:
+          return SimpleLvalue(w => {
+            w.Write($"{TypeName_Companion(objType, w, member.Origin, member)}.{IdName(member)}({additionalCustomParameter ?? ""})");
+          });
+      }
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Action<ConcreteSyntaxTree>> indices, Type elmtType, ConcreteSyntaxTree wr) {
+      Contract.Assert(indices is { Count: >= 1 });
+      var w = wr.Fork();
+      wr.Write("[");
+      for (var i = 0; i < indices.Count; i++) {
+        if (i > 0) {
+          wr.Write(", ");
+        }
+        indices[i](wr);
+      }
+      wr.Write("]");
+      return w;
+    }
+
+    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Assert(indices != null);  // follows from precondition
+      var strings = indices.Select<Expression, Action<ConcreteSyntaxTree>>(index => wr => EmitExpr(index, inLetExprBody, wr, wStmts));
+      return EmitArraySelect(strings.ToList(), elmtType, wr);
+    }
+
+    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts) {
+      // This is also used for bit shift operators, or more generally any binary operation where CompileBinOp()
+      // sets the convertE1_to_int out parameter to true. This compiler always sets that to false, however,
+      // so this method is only called for non-sequentializable forall statements.
+      TrParenExpr("int", expr, wr, inLetExprBody, wStmts);
+    }
+
+    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(source, wr, inLetExprBody, wStmts);
+      wr.Write("[");
+      wr.Append(Expr(index, inLetExprBody, wStmts));
+      wr.Write("]");
+    }
+
+    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
+      CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(source, wr, inLetExprBody, wStmts);
+      wr.Write(".set(");
+      wr.Append(Expr(index, inLetExprBody, wStmts));
+      wr.Write(", ");
+      wr.Append(CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts));
+      wr.Write(")");
+    }
+
+    protected override void EmitSeqSelectRange(Expression source, Expression lo, Expression hi, bool fromArray,
+      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"{DafnySeqMakerFunction}(");
+      TrParenExpr(source, wr, inLetExprBody, wStmts);
+      wr.Write("[");
+      if (lo != null) { wr.Append(Expr(lo, inLetExprBody, wStmts)); }
+      wr.Write(":");
+      if (hi != null) { wr.Append(Expr(hi, inLetExprBody, wStmts)); }
+
+      wr.Write(":])");
+    }
+
+    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      ConcreteSyntaxTree valueExpression;
+      var range = $"range({Expr(expr.N, inLetExprBody, wStmts)})";
+      wr.Write(DafnySeqMakerFunction);
+      if (expr.Initializer is LambdaExpr lam) {
+        valueExpression = Expr(lam.Body, inLetExprBody, wStmts);
+        var binder = IdProtect(lam.BoundVars[0].GetOrCreateCompileName(currentIdGenerator));
+        wr.Write($"([{valueExpression} for {binder} in {range}])");
+      } else {
+        valueExpression = Expr(expr.Initializer, inLetExprBody, wStmts);
+        wr.Write($"(tuple(map({valueExpression}, {range})))");
+      }
+    }
+
+    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts) {
+      TrParenExpr(DafnyMultiSetClass, expr.E, wr, inLetExprBody, wStmts);
+    }
+
+    protected override void EmitApplyExpr(Type functionType, IOrigin tok, Expression function,
+        List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Append(Expr(function, inLetExprBody, wStmts));
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+    }
+
+    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
+      List<Type> boundTypes, Type resultType, IOrigin resultTok, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ref ConcreteSyntaxTree wStmts) {
+      var functionName = ProtectedFreshId("_lambda");
+      wr.Write($"{functionName}");
+      TrExprList(arguments, wr, inLetExprBody, wStmts);
+      var wrBody = wStmts.NewBlockPy($"def {functionName}({boundVars.Comma()}):", close: BlockStyle.Newline);
+      wStmts = wrBody.Fork();
+      return EmitReturnExpr(wrBody);
+    }
+
+    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex,
+      DatatypeCtor ctor,
+      Func<List<Type>> getTypeArgs, Type bvType, ConcreteSyntaxTree wr) {
+      source(wr);
+      if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
+        Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
+        Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
+      } else {
+        wr.Write(ctor.EnclosingDatatype is TupleTypeDecl ? $"[{dtor.NameForCompilation}]" : $".{IdProtect(dtor.GetOrCreateCompileName(currentIdGenerator))}");
+      }
+    }
+
+    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IOrigin tok, List<string> inNames,
+        Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
+      var functionName = ProtectedFreshId("_lambda");
+      wr.Write(functionName);
+      return wStmts.NewBlockPy($"def {functionName}({inNames.Comma()}):", close: BlockStyle.Newline);
+    }
+
+    protected override void CreateIIFE(string bvName, Type bvType, IOrigin bvTok, Type bodyType, IOrigin bodyTok,
+      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
+      wrRhs = new ConcreteSyntaxTree();
+      var functionName = ProtectedFreshId("_iife");
+      wr.Format($"{functionName}({wrRhs})");
+      wrBody = wStmts.NewBlockPy($"def {functionName}({bvName}):");
+      wStmts = wrBody.Fork();
+      wrBody = EmitReturnExpr(wrBody);
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IOrigin resultTok, ConcreteSyntaxTree wr,
+        ConcreteSyntaxTree wStmts) {
+      var functionName = ProtectedFreshId("_iife");
+      wr.WriteLine($"{functionName}()");
+      return wStmts.NewBlockPy($"def {functionName}():");
+    }
+
+    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IOrigin resultTok, string bvName,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var functionName = ProtectedFreshId("_iife");
+      wr.WriteLine($"{functionName}({source})");
+      return wStmts.NewBlockPy($"def {functionName}({bvName}):");
+    }
+
+    protected override ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
+      if (type.HasFatPointer) {
+        var w = wr.ForkInParens();
+        wr.Write("._value");
+        return w;
+      } else {
+        return wr;
+      }
+    }
+
+    protected override ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
+      if (type.HasFatPointer) {
+        wr.Write(FullName(type.AsNewtype));
+        return wr.ForkInParens();
+      } else {
+        return wr;
+      }
+    }
+
+    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      switch (op) {
+        case ResolvedUnaryOp.Cardinality:
+          var multiset = expr.Type.NormalizeToAncestorType().AsMultiSetType != null;
+          if (!multiset) { wr.Write("len"); }
+          TrParenExpr(expr, wr, inLetExprBody, wStmts);
+          if (multiset) { wr.Write(".cardinality"); }
+          break;
+        case ResolvedUnaryOp.BitwiseNot:
+          TrParenExpr("~", expr, wr, inLetExprBody, wStmts);
+          break;
+        case ResolvedUnaryOp.BoolNot:
+          TrParenExpr("not", expr, wr, inLetExprBody, wStmts);
+          break;
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
+      }
+    }
+
+    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
+      Type e0Type, Type e1Type, IOrigin tok, Type resultType,
+      out string opString,
+      out string preOpString,
+      out string postOpString,
+      out string callString,
+      out string staticCallString,
+      out bool reverseArguments,
+      out bool truncateResult,
+      out bool convertE1_to_int,
+      out bool coerceE1,
+      ConcreteSyntaxTree errorWr) {
+
+      opString = null;
+      preOpString = "";
+      postOpString = "";
+      callString = null;
+      staticCallString = null;
+      reverseArguments = false;
+      truncateResult = false;
+      convertE1_to_int = false;
+      coerceE1 = false;
+
+      switch (op) {
+        case BinaryExpr.ResolvedOpcode.And:
+          opString = "and";
+          break;
+
+        case BinaryExpr.ResolvedOpcode.Or:
+          opString = "or";
+          break;
+
+        case BinaryExpr.ResolvedOpcode.Imp:
+          preOpString = "not ";
+          opString = "or";
+          break;
+
+        case BinaryExpr.ResolvedOpcode.LeftShift:
+          opString = "<<";
+          truncateResult = true;
+          break;
+
+        case BinaryExpr.ResolvedOpcode.RightShift:
+          opString = ">>";
+          break;
+
+        case BinaryExpr.ResolvedOpcode.Concat:
+          opString = "+";
+          break;
+
+        case BinaryExpr.ResolvedOpcode.Add:
+          if (resultType.IsCharType && !UnicodeCharEnabled) {
+            staticCallString = $"{DafnyRuntimeModule}.plus_char";
+          } else {
+            opString = "+";
+            truncateResult = true;
+          }
+          break;
+
+        case BinaryExpr.ResolvedOpcode.Sub:
+        case BinaryExpr.ResolvedOpcode.SetDifference:
+        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+        case BinaryExpr.ResolvedOpcode.MapSubtraction:
+          if (resultType.IsCharType && !UnicodeCharEnabled) {
+            staticCallString = $"{DafnyRuntimeModule}.minus_char";
+          } else {
+            opString = "-";
+            truncateResult = true;
+          }
+          break;
+
+        case BinaryExpr.ResolvedOpcode.Mul:
+          opString = "*";
+          truncateResult = true;
+          break;
+
+        case BinaryExpr.ResolvedOpcode.Div:
+          if (resultType.IsNumericBased(Type.NumericPersuasion.Int) || resultType.NormalizeToAncestorType().IsBitVectorType) {
+            staticCallString = $"{DafnyRuntimeModule}.euclidian_division";
+          } else {
+            opString = "/";
+          }
+          break;
+
+        case BinaryExpr.ResolvedOpcode.Mod:
+          staticCallString = $"{DafnyRuntimeModule}.euclidian_modulus"; break;
+
+        case BinaryExpr.ResolvedOpcode.ProperPrefix:
+          opString = "<"; break;
+
+        case BinaryExpr.ResolvedOpcode.Prefix:
+          opString = "<="; break;
+
+        case BinaryExpr.ResolvedOpcode.SeqEq:
+        case BinaryExpr.ResolvedOpcode.SetEq:
+        case BinaryExpr.ResolvedOpcode.MapEq:
+        case BinaryExpr.ResolvedOpcode.EqCommon:
+        case BinaryExpr.ResolvedOpcode.MultiSetEq:
+          opString = "=="; break;
+
+        case BinaryExpr.ResolvedOpcode.NeqCommon:
+        case BinaryExpr.ResolvedOpcode.SeqNeq:
+        case BinaryExpr.ResolvedOpcode.SetNeq:
+        case BinaryExpr.ResolvedOpcode.MapNeq:
+        case BinaryExpr.ResolvedOpcode.MultiSetNeq:
+          opString = "!="; break;
+
+        case BinaryExpr.ResolvedOpcode.Union:
+        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+        case BinaryExpr.ResolvedOpcode.MapMerge:
+          opString = "|"; break;
+
+        case BinaryExpr.ResolvedOpcode.InSet:
+        case BinaryExpr.ResolvedOpcode.InMultiSet:
+        case BinaryExpr.ResolvedOpcode.InSeq:
+        case BinaryExpr.ResolvedOpcode.InMap:
+          opString = "in"; break;
+
+        case BinaryExpr.ResolvedOpcode.NotInSet:
+        case BinaryExpr.ResolvedOpcode.NotInMultiSet:
+        case BinaryExpr.ResolvedOpcode.NotInSeq:
+        case BinaryExpr.ResolvedOpcode.NotInMap:
+          opString = "not in"; break;
+
+        case BinaryExpr.ResolvedOpcode.Intersection:
+        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+          callString = "intersection"; break;
+
+        case BinaryExpr.ResolvedOpcode.Disjoint:
+        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
+          callString = "isdisjoint"; break;
+
+        case BinaryExpr.ResolvedOpcode.Subset:
+        case BinaryExpr.ResolvedOpcode.MultiSubset:
+          callString = "issubset"; break;
+
+        case BinaryExpr.ResolvedOpcode.ProperSubset:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
+          callString = "ispropersubset"; break;
+
+
+        default:
+          base.CompileBinOp(op, e0Type, e1Type, tok, resultType,
+            out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments,
+            out truncateResult, out convertE1_to_int, out coerceE1,
+            errorWr);
+          break;
+      }
+    }
+
+    protected override void TrStmtList(List<Statement> stmts, ConcreteSyntaxTree writer) {
+      Contract.Requires(cce.NonNullElements(stmts));
+      Contract.Requires(writer != null);
+      var listWriter = new ConcreteSyntaxTree();
+      base.TrStmtList(stmts, listWriter);
+      if (listWriter.Descendants.OfType<LineSegment>().Any()) {
+        writer.Append(listWriter);
+      } else {
+        writer.WriteLine("pass");
+      }
+    }
+
+    protected override void EmitITE(Expression guard, Expression thn, Expression els, Type resultType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Requires(guard != null);
+      Contract.Requires(thn != null);
+      Contract.Requires(els != null);
+      Contract.Requires(wr != null);
+
+      ConcreteSyntaxTree Tree(Expression e) => Expr(e, inLetExprBody, wStmts);
+
+      wr.Format($"({Tree(thn)} if {Tree(guard)} else {Tree(els)})");
+    }
+
+    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
+      wr.Write($"{varName} == 0");
+    }
+
+    protected override void EmitConversionExpr(Expression fromExpr, Type fromType, Type toType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var (pre, post) = ("", "");
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Int) || fromType.NormalizeToAncestorType().IsBitVectorType || fromType.IsBigOrdinalType) {
+        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          (pre, post) = ($"{DafnyRuntimeModule}.BigRational(", ", 1)");
+        } else if (toType.IsCharType) {
+          if (UnicodeCharEnabled) {
+            (pre, post) = ($"{DafnyRuntimeModule}.CodePoint(chr(", "))");
+          } else {
+            (pre, post) = ("chr(", ")");
+          }
+        }
+      } else if (fromType.IsCharType) {
+        if (toType.IsCharType) {
+          // nothing to do
+        } else if (toType.IsNumericBased(Type.NumericPersuasion.Int) || toType.NormalizeToAncestorType().IsBitVectorType || toType.IsBigOrdinalType) {
+          (pre, post) = ("ord(", ")");
+        } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+          (pre, post) = ($"{DafnyRuntimeModule}.BigRational(ord(", "), 1)");
+        }
+      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        if (toType.IsNumericBased(Type.NumericPersuasion.Int) || toType.NormalizeToAncestorType().IsBitVectorType || toType.IsBigOrdinalType) {
+          (pre, post) = ("int(", ")");
+        } else if (toType.IsCharType) {
+          if (UnicodeCharEnabled) {
+            (pre, post) = ($"{DafnyRuntimeModule}.CodePoint(chr(floor(", ")))");
+          } else {
+            (pre, post) = ("chr(floor(", "))");
+          }
+        }
+      }
+      wr.Write(pre);
+      wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
+      wr.Write(post);
+    }
+
+    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IOrigin tok, ConcreteSyntaxTree wr) {
+      if (fromType.IsRefType && !fromType.IsNonNullRefType) {
+        Contract.Assert(toType.IsRefType);
+        wr = wr.Write($"{localName} is {(toType.IsNonNullRefType ? "not None and" : "None or")} ").ForkInParens();
+      }
+
+      if (fromType.IsTraitType && toType.AsNewtype != null) {
+        wr.Write($"isinstance({localName}, {FullName(toType.AsNewtype)})");
+      } else {
+        wr.Write($"isinstance({localName}, {TypeName(toType, wr, tok)})");
+      }
+    }
+
+    protected override void EmitIsIntegerTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(".is_integer() and ");
+    }
+
+    protected override void EmitIsUnicodeScalarValueTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("_dafny.CodePoint.is_code_point");
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(" and ");
+    }
+
+    protected override void EmitIsInIntegerRange(Expression source, BigInteger lo, BigInteger hi, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      EmitLiteralExpr(wr, new LiteralExpr(source.Origin, lo) { Type = Type.Int });
+      wr.Write(" <= ");
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(" and ");
+
+      EmitExpr(source, false, wr.ForkInParens(), wStmts);
+      wr.Write(" < ");
+      EmitLiteralExpr(wr, new LiteralExpr(source.Origin, hi) { Type = Type.Int });
+      wr.Write(" and ");
+    }
+
+    protected override void EmitCollectionDisplay(CollectionType ct, IOrigin tok, List<Expression> elements,
+      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var (open, close) = ct switch {
+        SeqType or MultiSetType => ("[", "]"),
+        _ => ("{", "}")
+      };
+      wr.Write(ct is SeqType ? DafnySeqMakerFunction : TypeHelperName(ct));
+      wr.Write("(");
+      wr.Write(open);
+      TrExprList(elements, wr, inLetExprBody, wStmts, typeAt: _ => ct.Arg, parens: false);
+      wr.Write(close);
+      wr.Write(")");
+    }
+
+    private static string TypeHelperName(Type ct) {
+      return ct switch {
+        SetType => DafnySetClass,
+        SeqType => DafnySeqClass,
+        MapType => DafnyMapClass,
+        MultiSetType => DafnyMultiSetClass,
+        _ => throw new NotImplementedException()
+      };
+    }
+
+    protected override void EmitMapDisplay(MapType mt, IOrigin tok, List<ExpressionPair> elements, bool inLetExprBody,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"{DafnyMapClass}({{");
+      var sep = "";
+      foreach (var p in elements) {
+        wr.Write(sep);
+        wr.Append(Expr(p.A, inLetExprBody, wStmts));
+        wr.Write(": ");
+        wr.Append(Expr(p.B, inLetExprBody, wStmts));
+        sep = ", ";
+      }
+      wr.Write("})");
+    }
+
+    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
+      wr.WriteLine($"{collectionName} = {DafnySetClass}()");
+    }
+
+    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
+      wr.WriteLine($"{collectionName} = {DafnyMapClass}()");
+    }
+
+    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody,
+        ConcreteSyntaxTree wr) {
+      var wStmts = wr.Fork();
+      wr.WriteLine($"{collName} = {collName}.union({DafnySetClass}([{Expr(elmt, inLetExprBody, wStmts)}]))");
+    }
+
+    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IOrigin tok, string collName, Expression term,
+        bool inLetExprBody, ConcreteSyntaxTree wr) {
+      var termLeftWriter = new ConcreteSyntaxTree();
+      var wStmts = wr.Fork();
+      wr.FormatLine($"{collName}[{termLeftWriter}] = {Expr(term, inLetExprBody, wStmts)}");
+      return termLeftWriter;
+    }
+
+    [CanBeNull]
+    protected override Action<ConcreteSyntaxTree> GetSubtypeCondition(string tmpVarName, Type boundVarType, IOrigin tok, ConcreteSyntaxTree wPreconditions) {
+      if (!boundVarType.IsRefType) {
+        return null;
+      }
+
+      var typeTest = boundVarType.IsObject || boundVarType.IsObjectQ
+        ? True
+        : $"isinstance({tmpVarName}, {TypeName(boundVarType, wPreconditions, tok)})";
+      return wr => wr.Write(boundVarType.IsNonNullRefType
+        ? $"{tmpVarName} is not None and {typeTest}"
+        : $"{tmpVarName} is None or {typeTest}");
+    }
+
+    protected override void GetCollectionBuilder_Build(CollectionType ct, IOrigin tok, string collName,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmt) {
+      wr.Write(TypeHelperName(ct) + $"({collName})");
+    }
+
+    protected override (Type, Action<ConcreteSyntaxTree>) EmitIntegerRange(Type type, Action<ConcreteSyntaxTree> wLo, Action<ConcreteSyntaxTree> wHi) {
+      return (new IntType(), (wr) => {
+        wr.Write($"{DafnyRuntimeModule}.IntegerRange(");
+        wLo(wr);
+        wr.Write(", ");
+        wHi(wr);
+        wr.Write(')');
+      }
+      );
+    }
+
+    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("[");
+      wr.Append(Expr(e, inLetExprBody, wStmts));
+      wr.Write("]");
+    }
+
+    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
+      var tryBlock = wr.NewBlockPy("try:");
+      TrStmt(body, tryBlock);
+      var exceptBlock = wr.NewBlockPy($"except {DafnyRuntimeModule}.HaltException as e:");
+      exceptBlock.Write($"{IdProtect(haltMessageVarName)} = ");
+      if (UnicodeCharEnabled) {
+        exceptBlock.Write($"{DafnySeqMakerFunction}(map({DafnyRuntimeModule}.CodePoint, e.message))");
+      } else {
+        exceptBlock.Write("e.message");
+      }
+      exceptBlock.WriteLine();
+      TrStmt(recoveryBody, exceptBlock);
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/Python/PythonExtensions.cs b/Source/DafnyCore/Backends/Python/PythonExtensions.cs
new file mode 100644
index 00000000000..6bbe510aadd
--- /dev/null
+++ b/Source/DafnyCore/Backends/Python/PythonExtensions.cs
@@ -0,0 +1,11 @@
+using Microsoft.Dafny;
+
+namespace DafnyCore.Backends.Python;
+
+public static class PythonExtensions {
+  public static ConcreteSyntaxTree NewBlockPy(this ConcreteSyntaxTree tree, string header = "", string footer = "",
+    BlockStyle open = BlockStyle.Newline,
+    BlockStyle close = BlockStyle.Nothing) {
+    return tree.NewBlock(header, footer, open, close);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/ResolvedDesugaredExecutableDafny/Dafny-compiler-fdafny.dfy b/Source/DafnyCore/Backends/ResolvedDesugaredExecutableDafny/Dafny-compiler-fdafny.dfy
new file mode 100644
index 00000000000..8d3dcfd6ed7
--- /dev/null
+++ b/Source/DafnyCore/Backends/ResolvedDesugaredExecutableDafny/Dafny-compiler-fdafny.dfy
@@ -0,0 +1,16 @@
+module {:extern "ResolvedDesugaredExecutableDafnyPlugin"} ResolvedDesugaredExecutableDafnyPlugin {
+  import opened DAST
+  import PrettyPrinter
+  import UnsupportedFeature
+
+  class COMP {
+
+    static method Compile(p: seq<Module>) returns (s: string) {
+      s := PrettyPrinter.PrettyPrint(p);
+    }
+
+    static method EmitCallToMain(fullName: Expression) returns (s: string) {
+      s := "";
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/ResolvedDesugaredExecutableDafny/ResolvedDesugaredExecutableDafnyBackend.cs b/Source/DafnyCore/Backends/ResolvedDesugaredExecutableDafny/ResolvedDesugaredExecutableDafnyBackend.cs
new file mode 100644
index 00000000000..dd3a4d3192b
--- /dev/null
+++ b/Source/DafnyCore/Backends/ResolvedDesugaredExecutableDafny/ResolvedDesugaredExecutableDafnyBackend.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.Dafny.Compilers;
+
+public class ResolvedDesugaredExecutableDafnyBackend : DafnyExecutableBackend {
+  protected override bool CanEmitUncompilableCode => false;
+  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".dfy" };
+  public override string TargetName => "ResolvedDesugaredExecutableDafny";
+  public override bool IsStable => true;
+  public override bool IsInternal => true;
+  public override string TargetExtension => "dfy";
+  public override bool SupportsInMemoryCompilation => false;
+  public override bool TextualTargetIsExecutable => false;
+
+  public override string TargetBaseDir(string dafnyProgramName) =>
+    $"{Path.GetFileNameWithoutExtension(dafnyProgramName)}-ResolvedDesugaredExecutableDafny/src";
+
+  protected override DafnyWrittenCodeGenerator CreateDafnyWrittenCompiler() {
+    return new ResolvedDesugaredExecutableDafnyCodeGenerator();
+  }
+
+  public ResolvedDesugaredExecutableDafnyBackend(DafnyOptions options) : base(options) {
+  }
+}
diff --git a/Source/DafnyCore/Backends/ResolvedDesugaredExecutableDafny/ResolvedDesugaredExecutableDafnyCodeGenerator.cs b/Source/DafnyCore/Backends/ResolvedDesugaredExecutableDafny/ResolvedDesugaredExecutableDafnyCodeGenerator.cs
new file mode 100644
index 00000000000..3524aa775e7
--- /dev/null
+++ b/Source/DafnyCore/Backends/ResolvedDesugaredExecutableDafny/ResolvedDesugaredExecutableDafnyCodeGenerator.cs
@@ -0,0 +1,21 @@
+using System;
+using System.IO;
+using System.Linq;
+using Dafny;
+using ResolvedDesugaredExecutableDafnyPlugin;
+
+namespace Microsoft.Dafny.Compilers;
+
+class ResolvedDesugaredExecutableDafnyCodeGenerator : DafnyWrittenCodeGenerator {
+
+  public override void Compile(Sequence<DAST.Module> program, Sequence<ISequence<Rune>> otherFiles, ConcreteSyntaxTree w) {
+    w.Write(COMP.Compile(program).ToVerbatimString(false));
+  }
+
+  public override ISequence<Rune> EmitCallToMain(
+    DAST.Expression companion,
+    Sequence<Rune> mainMethodName,
+    bool hasArguments) {
+    return COMP.EmitCallToMain(companion);
+  }
+}
diff --git a/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-coverage.dfy b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-coverage.dfy
new file mode 100644
index 00000000000..472b897393f
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-coverage.dfy
@@ -0,0 +1,204 @@
+/*These modules exists to increase code coverage of the generated code and test it as well.
+  All modules ending with "Coverage" will be compiled to DafnyCore.Test */
+module DafnyToRustCompilerCoverage {
+  import opened DafnyToRustCompiler
+  import opened DAST
+  import opened DafnyToRustCompilerDefinitions
+
+  method TestIsCopy() {
+    expect IsNewtypeCopy(NewtypeRange.Bool);
+    expect IsNewtypeCopy(NewtypeRange.U128(true));
+    expect IsNewtypeCopy(NewtypeRange.U128(false));
+    expect !IsNewtypeCopy(NewtypeRange.BigInt);
+    expect !IsNewtypeCopy(NewtypeRange.NoRange);
+  }
+}
+
+module RASTCoverage {
+  import opened RAST
+  import opened Std.Wrappers
+  import opened DAST.Format
+  import Strings = Std.Strings
+  import ExpressionOptimization
+
+  method AssertCoverage(x: bool)
+  {
+    expect x;
+  }
+
+  method TestExpr() {
+    TestOptimizeToString();
+    TestPrintingInfo();
+    TestNoExtraSemicolonAfter();
+  }
+
+  method TestNoOptimize(e: Expr)
+    //requires e.Optimize() == e // Too expensive
+  {
+  }
+
+  function ConversionNum(t: Type, x: Expr): Expr {
+    Call(
+      ExprFromPath(
+        PMemberSelect(
+          PMemberSelect(
+            Global(),
+            "dafny_runtime"),
+          "truncate!")),
+      [x, ExprFromType(t)])
+  }
+
+  function DafnyIntLiteral(s: string): Expr {
+    Call(ExprFromPath(PMemberSelect(dafny_runtime, "int!")), [LiteralInt("1")])
+  }
+
+  function Optimize(e: Expr): Expr {
+    ExpressionOptimization.ExprSimplifier().ReplaceExpr(e)
+  }
+
+  method TestOptimizeToString() {
+    var x := Identifier("x");
+    var y := Identifier("y");
+    TestNoOptimize(UnaryOp("&", Call(Select(x, "clone"), [y]), UnaryOpFormat.NoFormat));
+    AssertCoverage(Optimize(UnaryOp("!", BinaryOp("==", x, y, BinaryOpFormat.NoFormat),
+                                    CombineFormat())) == BinaryOp("!=", x, y, BinaryOpFormat.NoFormat));
+    AssertCoverage(Optimize(UnaryOp("!", BinaryOp("<", x, y, BinaryOpFormat.NoFormat),
+                                    CombineFormat())) == BinaryOp(">=", x, y, BinaryOpFormat.NoFormat()));
+    AssertCoverage(Optimize(UnaryOp("!", BinaryOp("<", x, y, ReverseFormat()),
+                                    CombineFormat())) == BinaryOp("<=", y, x, BinaryOpFormat.NoFormat()));
+    AssertCoverage(Optimize(ConversionNum(I128, DafnyIntLiteral("1"))) == LiteralInt("1"));
+    TestNoOptimize(ConversionNum(I128, x));
+    AssertCoverage(Optimize(StmtExpr(DeclareVar(MUT, "z", Some(I128), None), StmtExpr(AssignVar("z", y), RawExpr("return"))))
+                   == StmtExpr(DeclareVar(MUT, "z", Some(I128), Some(y)), RawExpr("return")));
+    TestNoOptimize(StmtExpr(DeclareVar(MUT, "z", Some(I128), None), StmtExpr(AssignVar("w", y), RawExpr("return"))));
+
+    TestNoOptimize(x);
+    TestNoOptimize(StmtExpr(x, x));
+    TestNoOptimize(StmtExpr(Match(x, []), x));
+    TestNoOptimize(StmtExpr(StructBuild(x, []), x));
+    TestNoOptimize(StmtExpr(Tuple([]), x));
+    TestNoOptimize(StmtExpr(UnaryOp("&", x, UnaryOpFormat.NoFormat), x));
+    TestNoOptimize(StmtExpr(BinaryOp("&&", x, x, BinaryOpFormat.NoFormat), x));
+    TestNoOptimize(StmtExpr(TypeAscription(x, I128), x));
+    TestNoOptimize(StmtExpr(LiteralInt("1"), x));
+    TestNoOptimize(StmtExpr(LiteralString("2", true, false), x));
+    TestNoOptimize(StmtExpr(LiteralString("3", false, true), x));
+    AssertCoverage(Optimize(StmtExpr(DeclareVar(MUT, "z", Some(I128), None), StmtExpr(AssignVar("z", y), RawExpr("return"))))
+                   == StmtExpr(DeclareVar(MUT, "z", Some(I128), Some(y)), RawExpr("return")));
+
+    var coverageExpression := [
+      RawExpr("abc"),
+      Identifier("x"),
+      Match(Identifier("x"), [MatchCase(RawPattern("abc"), Identifier("x"))]),
+      StmtExpr(RawExpr("panic!()"), Identifier("a")),
+      Block(RawExpr("abc")),
+      StructBuild(Identifier("dummy"), [AssignIdentifier("foo", Identifier("bar"))]),
+      StructBuild(Identifier("dummy"), [AssignIdentifier("foo", Identifier("bar")), AssignIdentifier("foo2", Identifier("bar"))]),
+      Tuple([Identifier("x")]),
+      UnaryOp("-", Identifier("x"), UnaryOpFormat.NoFormat),
+      BinaryOp("+", Identifier("x"), Identifier("y"), BinaryOpFormat.NoFormat),
+      TypeAscription(Identifier("x"), I128),
+      LiteralInt("322"),
+      LiteralString("abc", true, false),
+      LiteralString("abc", false, true),
+      DeclareVar(MUT, "abc", Some(I128), None),
+      DeclareVar(CONST, "abc", None, Some(Identifier("x"))),
+      AssignVar("abc", Identifier("x")),
+      IfExpr(Identifier("x"), Identifier("x"), Identifier("x")),
+      Loop(Some(Identifier("x")), Identifier("x")),
+      For("abc", Identifier("x"), Identifier("x")),
+      Labelled("abc", Identifier("x")),
+      Break(None),
+      Break(Some("l")),
+      Continue(None),
+      Continue(Some("l")),
+      Return(None),
+      Return(Some(Identifier("x"))),
+      Call(Identifier("x"), []),
+      Call(Identifier("x"), [Identifier("x"), Identifier("y")]),
+      CallType(Identifier("x"), [I128, U32]),
+      Select(Identifier("x"), "abc"),
+      ExprFromPath(PMemberSelect(Crate(), "abc")),
+      ExprFromPath(PMemberSelect(Global(), "abc"))
+    ];
+    for i := 0 to |coverageExpression| {
+      var c := coverageExpression[i];
+      var _ := c.printingInfo;
+      var _ := Optimize(c);
+      var _ := map[c := c.ToString("")];
+      var _ := Optimize(StmtExpr(DeclareVar(MUT, "abc", Some(I128), None), c));
+      var _ := Optimize(StmtExpr(DeclareVar(MUT, "abc", Some(I128), None), StmtExpr(AssignVar("abc", c), RawExpr(""))));
+      var _ := Optimize(UnaryOp("&", c, UnaryOpFormat.NoFormat()));
+      var _ := Optimize(UnaryOp("!", c, UnaryOpFormat.NoFormat()));
+      var _ := Optimize(ConversionNum(U8, c));
+      var _ := Optimize(ConversionNum(U8, Call(c, [])));
+      var _ := c.RightMostIdentifier();
+
+    }
+  }
+
+  method TestPrintingInfo() {
+    var x := Identifier("x");
+    var y := Identifier("y");
+    var bnf := BinaryOpFormat.NoFormat;
+    AssertCoverage(RawExpr("x").printingInfo.UnknownPrecedence?);
+    AssertCoverage(x.printingInfo == Precedence(1));
+    AssertCoverage(LiteralInt("3").printingInfo == Precedence(1));
+    AssertCoverage(LiteralString("abc", true, false).printingInfo == Precedence(1));
+    AssertCoverage(UnaryOp("?", x, UnaryOpFormat.NoFormat).printingInfo == SuffixPrecedence(5));
+    AssertCoverage(UnaryOp("-", x, UnaryOpFormat.NoFormat).printingInfo == Precedence(6));
+    AssertCoverage(UnaryOp("*", x, UnaryOpFormat.NoFormat).printingInfo == Precedence(6));
+    AssertCoverage(UnaryOp("!", x, UnaryOpFormat.NoFormat).printingInfo == Precedence(6));
+    AssertCoverage(UnaryOp("&", x, UnaryOpFormat.NoFormat).printingInfo == Precedence(6));
+    AssertCoverage(UnaryOp("&mut", x, UnaryOpFormat.NoFormat).printingInfo == Precedence(6));
+    AssertCoverage(UnaryOp("!!", x, UnaryOpFormat.NoFormat).printingInfo == UnknownPrecedence());
+    AssertCoverage(Select(x, "name").printingInfo == PrecedenceAssociativity(2, LeftToRight));
+    AssertCoverage(ExprFromPath(PMemberSelect(Global(), "name")).printingInfo == Precedence(2));
+    AssertCoverage(Call(x, []).printingInfo == PrecedenceAssociativity(2, LeftToRight));
+    AssertCoverage(TypeAscription(x, I128).printingInfo == PrecedenceAssociativity(10, LeftToRight));
+    AssertCoverage(BinaryOp("*", x, y, bnf).printingInfo == PrecedenceAssociativity(20, LeftToRight));
+    AssertCoverage(BinaryOp("/", x, y, bnf).printingInfo == PrecedenceAssociativity(20, LeftToRight));
+    AssertCoverage(BinaryOp("%", x, y, bnf).printingInfo == PrecedenceAssociativity(20, LeftToRight));
+    AssertCoverage(BinaryOp("+", x, y, bnf).printingInfo == PrecedenceAssociativity(30, LeftToRight));
+    AssertCoverage(BinaryOp("-", x, y, bnf).printingInfo == PrecedenceAssociativity(30, LeftToRight));
+    AssertCoverage(BinaryOp("<<", x, y, bnf).printingInfo == PrecedenceAssociativity(40, LeftToRight));
+    AssertCoverage(BinaryOp(">>", x, y, bnf).printingInfo == PrecedenceAssociativity(40, LeftToRight));
+    AssertCoverage(BinaryOp("&", x, y, bnf).printingInfo == PrecedenceAssociativity(50, LeftToRight));
+    AssertCoverage(BinaryOp("^", x, y, bnf).printingInfo == PrecedenceAssociativity(60, LeftToRight));
+    AssertCoverage(BinaryOp("|", x, y, bnf).printingInfo == PrecedenceAssociativity(70, LeftToRight));
+    AssertCoverage(BinaryOp("==", x, y, bnf).printingInfo == PrecedenceAssociativity(80, RequiresParentheses));
+    AssertCoverage(BinaryOp("!=", x, y, bnf).printingInfo == PrecedenceAssociativity(80, RequiresParentheses));
+    AssertCoverage(BinaryOp("<", x, y, bnf).printingInfo == PrecedenceAssociativity(80, RequiresParentheses));
+    AssertCoverage(BinaryOp(">", x, y, bnf).printingInfo == PrecedenceAssociativity(80, RequiresParentheses));
+    AssertCoverage(BinaryOp("<=", x, y, bnf).printingInfo == PrecedenceAssociativity(80, RequiresParentheses));
+    AssertCoverage(BinaryOp(">=", x, y, bnf).printingInfo == PrecedenceAssociativity(80, RequiresParentheses));
+    AssertCoverage(BinaryOp("&&", x, y, bnf).printingInfo == PrecedenceAssociativity(90, LeftToRight));
+    AssertCoverage(BinaryOp("||", x, y, bnf).printingInfo == PrecedenceAssociativity(100, LeftToRight));
+    AssertCoverage(BinaryOp("..", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RequiresParentheses));
+    AssertCoverage(BinaryOp("..=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RequiresParentheses));
+    AssertCoverage(BinaryOp("=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp("+=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp("-=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp("*=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp("/=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp("%=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp("&=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp("|=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp("^=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp("<<=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp(">>=", x, y, bnf).printingInfo == PrecedenceAssociativity(110, RightToLeft));
+    AssertCoverage(BinaryOp("?!?", x, y, bnf).printingInfo == PrecedenceAssociativity(0, RequiresParentheses));
+    AssertCoverage(Break(None).printingInfo == UnknownPrecedence());
+  }
+
+  method TestNoExtraSemicolonAfter() {
+    AssertCoverage(RawExpr(";").NoExtraSemicolonAfter());
+    AssertCoverage(!RawExpr("a").NoExtraSemicolonAfter());
+    AssertCoverage(Return(None).NoExtraSemicolonAfter());
+    AssertCoverage(Continue(None).NoExtraSemicolonAfter());
+    AssertCoverage(Break(None).NoExtraSemicolonAfter());
+    AssertCoverage(AssignVar("x", Identifier("y")).NoExtraSemicolonAfter());
+    AssertCoverage(DeclareVar(MUT, "x", None, None).NoExtraSemicolonAfter());
+    AssertCoverage(!Identifier("x").NoExtraSemicolonAfter());
+  }
+}
diff --git a/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-definitions-coverage.dfy b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-definitions-coverage.dfy
new file mode 100644
index 00000000000..ad1627b2325
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-definitions-coverage.dfy
@@ -0,0 +1,84 @@
+// Tests
+module {:extern "DefsCoverage"} DafnyToRustCompilerDefinitionsCoverage {
+  import opened DafnyToRustCompilerDefinitions
+  import opened DAST
+  import Strings = Std.Strings
+  import Std
+  import opened Std.Wrappers
+  import R = RAST
+  import opened DafnyCompilerRustUtils
+
+  const IND := R.IND
+  type Type = DAST.Type
+  type Formal = DAST.Formal
+
+  method Expect(x: bool)
+  {
+    expect x; // Avoids having too little coverage
+  }
+
+  method Tests() {
+    Expect(SurelyAssigned.Join(SurelyAssigned) == SurelyAssigned);
+    Expect(NotAssigned.Join(NotAssigned) == NotAssigned);
+    Expect(NotAssigned.Join(SurelyAssigned) == Unknown);
+    Expect(SurelyAssigned.Join(NotAssigned) == Unknown);
+    Expect(Unknown.Join(NotAssigned) == NotAssigned.Join(Unknown) == Unknown);
+    Expect(Unknown.Join(SurelyAssigned) == SurelyAssigned.Join(Unknown) == Unknown);
+    Expect(Unknown.Join(Unknown) == Unknown);
+
+    Expect(SurelyAssigned.Then(Unknown)
+        == SurelyAssigned.Then(NotAssigned)
+        == SurelyAssigned.Then(SurelyAssigned)
+        == NotAssigned.Then(SurelyAssigned)
+        == SurelyAssigned);
+    Expect(Unknown.Then(NotAssigned)
+        == Unknown.Then(SurelyAssigned)
+        == Unknown.Then(Unknown)
+        == NotAssigned.Then(Unknown)
+        == Unknown);
+    Expect(NotAssigned.Then(NotAssigned)
+           == NotAssigned);
+
+    var x := VarName("x");
+    var y := VarName("y");
+    var z := Expression.Ident(VarName("z"));
+    var assigns_x := [Assign(AssignLhs.Ident(x), Expression.Ident(y))];
+    var assigns_y := [Assign(AssignLhs.Ident(y), Expression.Ident(x))];
+    var cond := Expression.Ident(VarName("cond"));
+    var unknown_x := [If(cond, assigns_x, assigns_y)];
+    var surely_double_x := [If(cond, assigns_x, assigns_x)];
+    var call_to_x := [Statement.Call(z, SetBuilderAdd, [], [], Some([x]))];
+    var declare_x_again := [DeclareVar(x, Type.Tuple([]), None)];
+    Expect(DetectAssignmentStatus(assigns_y, x) == NotAssigned);
+    Expect(DetectAssignmentStatus(assigns_x, x) == SurelyAssigned);
+    Expect(DetectAssignmentStatus(assigns_x, y) == NotAssigned);
+    Expect(DetectAssignmentStatus(assigns_x + assigns_y, y) == SurelyAssigned);
+    Expect(DetectAssignmentStatus(unknown_x, x) == Unknown);
+    Expect(DetectAssignmentStatus(surely_double_x, x) == SurelyAssigned);
+    Expect(DetectAssignmentStatus(surely_double_x, y) == NotAssigned);
+    Expect(DetectAssignmentStatus(call_to_x, x) == SurelyAssigned);
+    Expect(DetectAssignmentStatus(call_to_x, y) == NotAssigned);
+    Expect(DetectAssignmentStatus(call_to_x + assigns_y, y) == SurelyAssigned);
+    Expect(DetectAssignmentStatus([Labeled("l", assigns_y)] + assigns_x, y) == SurelyAssigned);
+    Expect(DetectAssignmentStatus([Labeled("l", assigns_x)] + assigns_y, x) == SurelyAssigned);
+    Expect(DetectAssignmentStatus([Labeled("l", assigns_x)] + assigns_y, x) == SurelyAssigned);
+    Expect(DetectAssignmentStatus(declare_x_again + assigns_x, x) == NotAssigned);
+    Expect(DetectAssignmentStatus(declare_x_again + assigns_y, y) == SurelyAssigned);
+    Expect(DetectAssignmentStatus([Return(z)] + assigns_x, x) == NotAssigned);
+    Expect(DetectAssignmentStatus([EarlyReturn()] + assigns_x, x) == NotAssigned);
+    Expect(DetectAssignmentStatus([JumpTailCallStart()] + assigns_x, x) == NotAssigned);
+    Expect(DetectAssignmentStatus([Print(z)] + assigns_x, x) == SurelyAssigned);
+    Expect(DetectAssignmentStatus([Print(z)] + assigns_x, x) == SurelyAssigned);
+    Expect(DetectAssignmentStatus([While(z, [])] + assigns_x, x) == Unknown);
+    Expect(DetectAssignmentStatus([If(cond, assigns_x, [If(cond, assigns_x, assigns_y)])], x) == Unknown);
+    Expect(
+      DetectAssignmentStatus(
+        [ If(cond,
+             [If(cond, [Return(z)], [])] +
+             assigns_x,
+             [If(cond,
+                 [If(cond, [Return(z)], [])] +
+                 assigns_x,
+                 assigns_y)])], x) == Unknown);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-definitions.dfy b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-definitions.dfy
new file mode 100644
index 00000000000..eedf8adcb60
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-definitions.dfy
@@ -0,0 +1,846 @@
+
+module {:extern "Defs"} DafnyToRustCompilerDefinitions {
+  import FactorPathsOptimization
+  import ExpressionOptimization
+
+  import opened DAST
+  import Strings = Std.Strings
+  import Std
+  import opened Std.Wrappers
+  import R = RAST
+  import opened DafnyCompilerRustUtils
+
+  const IND := R.IND
+  type Type = DAST.Type
+  type Formal = DAST.Formal
+
+  // List taken from https://doc.rust-lang.org/book/appendix-01-keywords.html
+  const reserved_rust := {
+    "as","async","await","break","const","continue",
+    "crate","dyn","else","enum","extern","false","fn","for","if","impl",
+    "in","let","loop","match","mod","move","mut","pub","ref","return",
+    "static","struct","super","trait","true","type","union",
+    "unsafe","use","where","while","Keywords","The","abstract","become",
+    "box","do","final","macro","override","priv","try","typeof","unsized",
+    "virtual","yield"}
+
+  // Method names that would automatically resolve to trait methods instead of inherent methods
+  // Hence, full name is always required for these methods
+  const builtin_trait_preferred_methods := {
+    "le", "eq", "lt", "ge", "gt"
+  }
+
+
+  const reserved_vars := { "None", "hash" }
+
+  const reserved_rust_need_prefix := {"u8", "u16", "u32", "u64", "u128","i8", "i16", "i32", "i64", "i128"}
+
+  const AttributeOwned := Attribute("owned", [])
+
+  predicate is_tuple_numeric(i: string) {
+    |i| >= 2 && i[0] == '_' &&
+    i[1] in "0123456789" &&
+    (|i| == 2 ||
+     (|i| == 3 && i[2] in "0123456789"))
+  }
+
+  // Given a Dafny-expanded fully qualified name with # or ., where ' has been replaced by _k, ? by _q and _ by __
+  // detect if there are of the strings above
+  predicate has_special(i: string) {
+    if |i| == 0 then false
+    else if i[0] == '.' then true
+    else if i[0] == '#' then true // otherwise "escapeName("r#") becomes "r#""
+    else if i[0] == '_' then
+      if 2 <= |i| then
+        if i[1] == '_' then has_special(i[2..])
+        else true
+      else
+        true
+    else
+      has_special(i[1..])
+  }
+
+  function idiomatic_rust(i: string): string
+    requires !has_special(i)
+  {
+    if |i| == 0 then ""
+    else if i[0] == '_' then
+      assert 2 <= |i| && i[1] == '_';
+      "_" + idiomatic_rust(i[2..])
+    else
+      [i[0]] + idiomatic_rust(i[1..])
+  }
+
+  function replaceDots(i: string): string {
+    if |i| == 0 then
+      ""
+    else if i[0] == '.' then
+      "_d" + replaceDots(i[1..])
+    else
+      [i[0]] + replaceDots(i[1..])
+  }
+
+  predicate is_tuple_builder(i: string)
+    // A tuple builder identifier looks like ___hMake0 to ___hMake99
+  {
+    && |i| >= 9
+    && i[..8] == "___hMake"
+    && i[8] in "0123456789"
+    && (|i| == 9 || (|i| == 10 && i[9] in "0123456789"))
+  }
+
+  function better_tuple_builder_name(i: string): string
+    requires is_tuple_builder(i)
+  {
+    "_T" + i[8..]
+  }
+
+  predicate is_dafny_generated_id(i: string) {
+    && |i| > 0 && i[0] == '_' && !has_special(i[1..])
+    && (i != "_self" && i != "_Self")
+    && (|i| >= 2 ==> i[1] != 'T') // To avoid conflict with tuple builders _T<digits>
+  }
+
+  predicate is_idiomatic_rust_id(i: string) {
+    0 < |i| && !has_special(i) && i !in reserved_rust && i !in reserved_rust_need_prefix
+  }
+  // To be used when escaping class names, datatype constructors, externs, paths, function/method names, etc.
+  // Datatype destructors, variable names and field names all use escapeVar()
+  function escapeName(n: Name): string {
+    escapeIdent(n.dafny_name)
+  }
+
+  function escapeIdent(i: string): string {
+    if is_tuple_numeric(i) then // _42 remains the same
+      i
+    else if is_tuple_builder(i) then // ___hMake42 becomes _T42
+      better_tuple_builder_name(i)
+    else if i == "self" || i == "Self" then // self becomes _self
+      "_" + i
+    else if i in reserved_rust then
+      "r#" + i
+    else if is_idiomatic_rust_id(i) then // some__id becomes some_id
+      idiomatic_rust(i)
+    else if is_dafny_generated_id(i) then // _module remains _module
+      i // Dafny-generated identifiers like "_module", cannot be written in Dafny itself
+    else // u16 becomes _u16, namespace.IsSomething_q becomes _namespace_dIsSomething_q
+      var r := replaceDots(i);
+      "_" + r
+  }
+
+  // To be used when escaping variables
+  function escapeVar(f: VarName): string {
+    var r := f.dafny_name;
+    if r in reserved_vars then
+      "_" + r
+    else
+      escapeIdent(f.dafny_name)
+  }
+
+  // T, &T, &mut T
+  // Box<T>, &Box<T>, Rc<T>, &Rc<T> are counted in T
+  datatype Ownership =
+    | OwnershipOwned
+    | OwnershipBorrowed
+    | OwnershipBorrowedMut
+    | OwnershipAutoBorrowed
+
+  // types stores the Rust type per Rust name.
+  // fn Test<T>(i: T) is map["i" := R.RawType("T")]
+  // fn Test(i: &T) is map["i" := R.Borrowed(...)]
+  // fn Test(i: &mut T) is map["i" := R.BorrowedMut(...)]
+  datatype Environment = Environment(
+    names: seq<string>,                 // All variable names, after escape, in Rust
+    types: map<string, R.Type>,
+    assignmentStatusKnown: set<string> // Variables that are guaranteed to be assigned exactly once
+  ) {
+    function ToOwned(): Environment {
+      this.(types :=
+      map k <- types :: k := types[k].ToOwned())
+    }
+    static function Empty(): Environment {
+      Environment([], map[], {})
+    }
+    opaque predicate CanReadWithoutClone(name: string) {
+      name in types && types[name].CanReadWithoutClone()
+    }
+    opaque predicate HasCloneSemantics(name: string) {
+      !CanReadWithoutClone(name)
+    }
+    function GetType(name: string): Option<R.Type> {
+      if name in types then Some(types[name]) else None
+    }
+    predicate IsBorrowed(name: string) {
+      name in types && types[name].Borrowed?
+    }
+    predicate IsBorrowedMut(name: string) {
+      name in types && types[name].BorrowedMut?
+    }
+    predicate IsBoxed(name: string) {
+      name in types && types[name].IsBox()
+    }
+    predicate NeedsAsRefForBorrow(name: string) {
+      name in types && types[name].NeedsAsRefForBorrow()
+    }
+    predicate IsMaybePlacebo(name: string) {
+      name in types && types[name].ExtractMaybePlacebo().Some?
+    }
+    function AddAssigned(name: string, tpe: R.Type): Environment
+      // If we know for sure the type of name extends the Copy trait
+    {
+      Environment(names + [name], types[name := tpe], assignmentStatusKnown - {name})
+    }
+    function merge(other: Environment): Environment
+    {
+      Environment(
+        names + other.names,
+        types + other.types,
+        assignmentStatusKnown + other.assignmentStatusKnown
+      )
+    }
+    // Used to removed from the environment the "_is_assigned" vars used to initialize fields
+    function RemoveAssigned(name: string): Environment
+      requires name in names
+    {
+      var indexInEnv := Std.Collections.Seq.IndexOf(names, name);
+      Environment(
+        names[0..indexInEnv] + names[indexInEnv + 1..],
+        types - {name},
+        assignmentStatusKnown - {name}
+      )
+    }
+    function AddAssignmentStatus(name: string, assignmentStatus: AssignmentStatus): Environment {
+      Environment(
+        names,
+        types,
+        if assignmentStatus.Unknown? then
+          assignmentStatusKnown - {name}
+        else
+          assignmentStatusKnown + {name}
+      )
+    }
+    predicate IsAssignmentStatusKnown(name: string) {
+      name in assignmentStatusKnown
+    }
+  }
+
+  const ASSIGNED_PREFIX := "_set"
+
+  function AddAssignedPrefix(rustName: string): string {
+    if |rustName| >= 2 && rustName[0..2] == "r#" then
+      ASSIGNED_PREFIX + rustName[2..]
+    else
+      ASSIGNED_PREFIX + "_" + rustName
+  }
+
+  datatype PointerType = Raw | RcMut
+  datatype CharType = UTF16 | UTF32
+  datatype RootType = RootCrate | RootPath(moduleName: string)
+
+  datatype GenTypeContext =
+    GenTypeContext(forTraitParents: bool)
+  {
+    static function ForTraitParents(): GenTypeContext {
+      GenTypeContext(true)
+    }
+    static function default(): GenTypeContext {
+      GenTypeContext(false)
+    }
+  }
+
+  // Returns the first trait type that has dafnyName as a proper method
+  // Resolution guarantees it's the only one.
+  function TraitTypeContainingMethodAux(rs: seq<Type>, dafnyName: string): Option<ResolvedType> {
+    if |rs| == 0 then None
+    else
+      var res := match rs[0] {
+        case UserDefined(resolvedType) =>
+          TraitTypeContainingMethod(resolvedType, dafnyName)
+        case _ =>
+          None
+      };
+      match res {
+        case Some(_) => res
+        case None => TraitTypeContainingMethodAux(rs[1..], dafnyName)
+      }
+  }
+
+  function TraitTypeContainingMethod(r: ResolvedType, dafnyName: string): Option<ResolvedType> {
+    var ResolvedType(
+        path,
+        typeArgs,
+        kind,
+        attributes,
+        properMethods,
+        extendedTypes) := r;
+    if Name(dafnyName) in properMethods then
+      Some(r)
+    else
+      TraitTypeContainingMethodAux(extendedTypes, dafnyName)
+  }
+
+  /* Which variable is representing the current "this" context and how it's represented
+  if NoSelf? then // static context
+  else if IsSelf() then For object: &Self or &mut Self, for datatypes &Rc<Self>
+  else // For objects: &Object<Self>, for datatypes &Rc<Self>
+  */
+  datatype SelfInfo =
+    | NoSelf
+    | ThisTyped(rSelfName: string, dafnyType: Type)
+  {
+    predicate IsSelf() {
+      ThisTyped? && rSelfName == "self"
+    }
+  }
+
+  datatype ExternAttribute =
+    | NoExtern()
+    | SimpleExtern(overrideName: string)
+    | AdvancedExtern(enclosingModule: seq<string>, overrideName: string)
+    | UnsupportedExtern(reason: string)
+
+  opaque function OptExtern(attr: Attribute, dafnyName: Name): Option<ExternAttribute> {
+    if attr.name == "extern" then
+      Some(
+        if |attr.args| == 0 then SimpleExtern(escapeName(dafnyName)) else
+        if |attr.args| == 1 then SimpleExtern(attr.args[0]) else
+        if |attr.args| == 2 then AdvancedExtern(SplitRustPathElement(ReplaceDotByDoubleColon(attr.args[0])), attr.args[1]) else
+        UnsupportedExtern("{:extern} supports only 0, 1 or 2 attributes, got " + Std.Strings.OfNat(|attr.args|))
+      )
+    else
+      None
+  }
+
+  // Dots are not valid identifier characters in Rust, so we replace them by double colons.
+  // We don't perform this replacement after any space occurs in an extern string
+  // because normally spaces don't occur in paths, so any use of space indicates something different.
+  function ReplaceDotByDoubleColon(s: string): string {
+    if |s| == 0 then "" else
+    if s[0] == ' ' then s else
+    (if s[0] == '.' then "::" else [s[0]]) + ReplaceDotByDoubleColon(s[1..])
+  }
+
+  function SplitRustPathElement(s: string, result: seq<string> := [], acc: string := ""): seq<string> {
+    if |s| == 0 then
+      if acc == "" then result else result + [acc]
+    else
+    if |s| >= 2 && s[0..2] =="::" then
+      SplitRustPathElement(s[2..], result + [acc], "")
+    else
+      SplitRustPathElement(s[1..], result, acc + [s[0]])
+  }
+
+  function ExtractExtern(attributes: seq<Attribute>, dafnyName: Name): (res: ExternAttribute) {
+    if |attributes| == 0 then NoExtern()
+    else
+      var attr := OptExtern(attributes[0], dafnyName);
+      match attr
+      case Some(n) => n
+      case None =>
+        ExtractExtern(attributes[1..], dafnyName)
+  } by method {
+    for i := 0 to |attributes|
+      invariant ExtractExtern(attributes, dafnyName) == ExtractExtern(attributes[i..], dafnyName)
+    {
+      var attr := OptExtern(attributes[i], dafnyName);
+      assert attributes[i] == attributes[i..][0];
+      match attr {
+        case Some(n) =>
+          res := n;
+          return;
+        case _ =>
+      }
+      assert attributes[i..][1..] == attributes[i+1..];
+    }
+    res := NoExtern();
+  }
+
+  function ExtractExternMod(mod: Module): ExternAttribute {
+    ExtractExtern(mod.attributes, mod.name)
+  }
+
+  const TailRecursionPrefix := "_r"
+
+  const DAFNY_EXTERN_MODULE := "_dafny_externs"
+
+  function ContainingPathToRust(containingPath: seq<Ident>): seq<string> {
+    Std.Collections.Seq.Map((i: Ident) => escapeName(i.id), containingPath)
+  }
+
+  const OpTable: map<BinOp, string> :=
+    map[
+      Mod() := "%",
+      And() := "&&",
+      Or() := "||",
+      Div(overflow := false) := "/",
+      Lt() := "<",
+      LtChar() := "<",
+      Plus(overflow := false) := "+",
+      Minus(overflow := false) := "-",
+      Times(overflow := false) := "*",
+      BitwiseAnd() := "&",
+      BitwiseOr() := "|",
+      BitwiseXor() := "^",
+      BitwiseShiftRight() := ">>",
+      BitwiseShiftLeft() := "<<"
+    ]
+
+  function AddOverflow(tpe: R.Type, overflow: bool): R.Type {
+    if !overflow then tpe else R.TMetaData(tpe, copySemantics := true, overflow := true)
+  }
+
+  // We use the range as the wrapped type only if the base is a Primitive
+  function NewtypeRangeToUnwrappedBoundedRustType(base: Type, range: NewtypeRange): Option<R.Type> {
+    if base.IsPrimitiveInt() then
+      NewtypeRangeToRustType(range)
+    else
+      None
+  }
+
+  function NewtypeRangeToRustType(range: NewtypeRange)
+    : Option<R.Type> {
+    match range {
+      case NoRange() => None
+      case U8(overflow) => Some(AddOverflow(R.Type.U8, overflow))
+      case U16(overflow) => Some(AddOverflow(R.Type.U16, overflow))
+      case U32(overflow) => Some(AddOverflow(R.Type.U32, overflow))
+      case U64(overflow) => Some(AddOverflow(R.Type.U64, overflow))
+      case U128(overflow) => Some(AddOverflow(R.Type.U128, overflow))
+      case I8(overflow) => Some(AddOverflow(R.Type.I8, overflow))
+      case I16(overflow) => Some(AddOverflow(R.Type.I16, overflow))
+      case I32(overflow) => Some(AddOverflow(R.Type.I32, overflow))
+      case I64(overflow) => Some(AddOverflow(R.Type.I64, overflow))
+      case I128(overflow) => Some(AddOverflow(R.Type.I128, overflow))
+      case NativeArrayIndex() => Some(R.Type.USIZE)
+      case Bool => Some(R.Bool)
+      case _ => None
+    }
+  }
+
+  predicate IsBooleanOperator(op: BinOp) {
+    op.And? || op.Or?
+  }
+
+  predicate IsComplexArithmetic(op: BinOp) {
+    op.EuclidianDiv? || op.EuclidianMod?
+  }
+
+  function GetUnwrappedBoundedRustType(tpe: Type): Option<R.Type> {
+    match tpe {
+      case UserDefined(ResolvedType(path, typeArgs, Newtype(base, range, erase), _, _, _)) =>
+        NewtypeRangeToUnwrappedBoundedRustType(base, range)
+      case _ => None
+    }
+  }
+
+  predicate NeedsUnwrappingConversion(tpe: Type) {
+    match tpe {
+      case UserDefined(ResolvedType(path, typeArgs, Newtype(base, range, erase), _, _, _)) =>
+        NewtypeRangeToUnwrappedBoundedRustType(base, range).None?
+      case _ => false
+    }
+  }
+
+  predicate IsNewtype(tpe: Type) {
+    tpe.UserDefined? && tpe.resolved.kind.Newtype?
+  }
+
+  lemma CoveredAllNewtypeCases(tpe: Type)
+    requires GetUnwrappedBoundedRustType(tpe).None?
+    requires !NeedsUnwrappingConversion(tpe)
+    ensures !IsNewtype(tpe)
+  {
+  }
+
+  predicate IsNewtypeCopy(range: NewtypeRange) {
+    && NewtypeRangeToRustType(range).Some?
+    && (range.HasArithmeticOperations() || range.Bool?)
+  }
+
+  predicate OwnershipGuarantee(expectedOwnership: Ownership, resultingOwnership: Ownership) {
+    && (expectedOwnership != OwnershipAutoBorrowed ==>
+          resultingOwnership == expectedOwnership)
+    && resultingOwnership != OwnershipAutoBorrowed // We know what's going on
+  }
+
+  predicate BecomesLeftCallsRight(op: BinOp) {
+    match op {
+      case SetMerge()
+        | SetSubtraction()
+        | SetIntersection()
+        | SetDisjoint()
+        | MapMerge()
+        | MapSubtraction()
+        | MultisetMerge()
+        | MultisetSubtraction()
+        | MultisetIntersection()
+        | MultisetDisjoint()
+        | Concat()
+        => true
+      case _ => false
+    }
+  }
+
+  predicate BecomesRightCallsLeft(op: BinOp) {
+    match op {
+      case In() => true
+      case _ => false
+    }
+  }
+
+  lemma BecomesExclusive(op: BinOp)
+    ensures BecomesRightCallsLeft(op) ==> !BecomesLeftCallsRight(op)
+    ensures BecomesLeftCallsRight(op) ==> !BecomesRightCallsLeft(op)
+  {}
+
+  function UnreachablePanicIfVerified(pointerType: PointerType, optText: string := ""): R.Expr {
+    if pointerType.Raw? then
+      R.Unsafe(R.Block(R.std.MSel("hint").AsExpr().FSel("unreachable_unchecked").Apply0()))
+    else if optText == "" then
+      R.Identifier("panic!").Apply0()
+    else
+      R.Identifier("panic!").Apply1(R.LiteralString(optText, binary := false, verbatim := false))
+  }
+
+  function DefaultDatatypeImpl(
+    rTypeParamsDecls: seq<R.TypeParamDecl>,
+    datatypeType: R.Type,
+    datatypeName: R.Expr,
+    structAssignments: seq<R.AssignIdentifier>
+  ): R.ModDecl {
+    var defaultConstrainedTypeParams := R.TypeParamDecl.AddConstraintsMultiple(
+                                          rTypeParamsDecls, [R.DefaultTrait]
+                                        );
+    R.ImplDecl(
+      R.ImplFor(
+        defaultConstrainedTypeParams,
+        R.DefaultTrait,
+        datatypeType,
+        [R.FnDecl(
+           R.NoDoc, R.NoAttr,
+           R.PRIV,
+           R.Fn(
+             "default", [], [], Some(datatypeType),
+             Some(
+               R.StructBuild(
+                 datatypeName,
+                 structAssignments
+               )))
+         )]
+      ))
+  }
+
+  function AsRefDatatypeImpl(rTypeParamsDecls: seq<R.TypeParamDecl>, datatypeType: R.Type): R.ModDecl {
+    R.ImplDecl(
+      R.ImplFor(
+        rTypeParamsDecls,
+        R.std.MSel("convert").MSel("AsRef").AsType().Apply1(datatypeType),
+        datatypeType,
+        [R.FnDecl(
+           R.NoDoc, R.NoAttr,
+           R.PRIV,
+           R.Fn("as_ref", [], [R.Formal.selfBorrowed], Some(R.SelfBorrowed),
+                Some(R.self))
+         )]
+      ))
+  }
+
+  function DebugImpl(rTypeParamsDecls: seq<R.TypeParamDecl>, datatypeType: R.Type, rTypeParams: seq<R.Type>): R.ModDecl {
+    R.ImplDecl(
+      R.ImplFor(
+        rTypeParamsDecls,
+        R.std.MSel("fmt").MSel("Debug").AsType(),
+        datatypeType,
+        [
+          R.FnDecl(
+            R.NoDoc, R.NoAttr,
+            R.PRIV,
+            R.Fn(
+              "fmt", [],
+              [R.Formal.selfBorrowed,
+               R.Formal("f", R.BorrowedMut(R.std.MSel("fmt").MSel("Formatter").AsType()))],
+              Some(R.std.MSel("fmt").MSel("Result").AsType()),
+              Some(R.dafny_runtime
+                   .MSel("DafnyPrint")
+                   .AsExpr()
+                   .FSel("fmt_print")
+                   .Apply(
+                     [ R.self,
+                       R.Identifier("f"),
+                       R.LiteralBool(true)
+                     ])))
+          )
+        ]
+      ))
+  }
+
+  function PrintImpl(rTypeParamsDecls: seq<R.TypeParamDecl>, datatypeType: R.Type, rTypeParams: seq<R.Type>, printImplBody: R.Expr): R.ModDecl {
+    R.ImplDecl(
+      R.ImplFor(
+        rTypeParamsDecls,
+        R.DafnyPrint,
+        datatypeType,
+        [R.FnDecl(
+           R.NoDoc, R.NoAttr,
+           R.PRIV,
+           R.Fn(
+             "fmt_print", [],
+             [R.Formal.selfBorrowed,
+              R.Formal("_formatter", R.BorrowedMut(R.std.MSel("fmt").MSel("Formatter").AsType())),
+              R.Formal("_in_seq", R.Type.Bool)],
+             Some(R.RawType("std::fmt::Result")),
+             Some(printImplBody)))]
+      ))
+  }
+
+  function CoerceImpl(
+    rTypeParamsDecls: seq<R.TypeParamDecl>,
+    datatypeName: string,
+    datatypeType: R.Type,
+    rCoerceTypeParams: seq<R.TypeParamDecl>,
+    coerceArguments: seq<R.Formal>,
+    coerceTypes: seq<R.Type>,
+    coerceImplBody: R.Expr
+  ): R.ModDecl {
+
+    R.ImplDecl(
+      R.Impl(
+        rTypeParamsDecls,
+        datatypeType,
+        [R.FnDecl(
+           "Given type parameter conversions, returns a lambda to convert this structure", R.NoAttr,
+           R.PUB,
+           R.Fn(
+             "coerce", rCoerceTypeParams,
+             coerceArguments,
+             Some(
+               R.Rc(
+                 R.ImplType(
+                   R.FnType(
+                     [datatypeType],
+                     R.TypeApp(R.TIdentifier(datatypeName), coerceTypes))))),
+             Some(
+               R.RcNew(R.Lambda([R.Formal("this", R.SelfOwned)],
+                                Some(R.TypeApp(R.TIdentifier(datatypeName), coerceTypes)),
+                                coerceImplBody)))))]
+      ))
+  }
+
+  function SingletonsImpl(
+    rTypeParamsDecls: seq<R.TypeParamDecl>,
+    datatypeType: R.Type,
+    instantiationType: R.Type,
+    singletonConstructors: seq<R.Expr>): R.ModDecl {
+    R.ImplDecl(
+      R.Impl(
+        rTypeParamsDecls,
+        datatypeType,
+        [R.FnDecl(
+           "Enumerates all possible values of " + datatypeType.ToString(""), [],
+           R.PUB,
+           R.Fn(
+             "_AllSingletonConstructors", [],
+             [],
+             Some(R.dafny_runtime.MSel("SequenceIter").AsType().Apply([instantiationType])),
+             Some(R.dafny_runtime.MSel("seq!").AsExpr().Apply(singletonConstructors).Sel("iter").Apply0())
+           )
+         )]))
+  }
+
+  // Requires the hashImplBody to depend on the variable "_state"
+  function HashImpl(
+    rTypeParamsDeclsWithHash: seq<R.TypeParamDecl>,
+    datatypeOrNewtypeType: R.Type,
+    hashImplBody: R.Expr
+  ): R.ModDecl {
+    R.ImplDecl(
+      R.ImplFor(
+        rTypeParamsDeclsWithHash,
+        R.Hash,
+        datatypeOrNewtypeType,
+        [R.FnDecl(
+           R.NoDoc, R.NoAttr,
+           R.PRIV,
+           R.Fn(
+             "hash", [R.TypeParamDecl("_H", [R.std.MSel("hash").MSel("Hasher").AsType()])],
+             [R.Formal.selfBorrowed,
+              R.Formal("_state", R.BorrowedMut(R.TIdentifier("_H")))],
+             None,
+             Some(hashImplBody)))]
+      ))
+  }
+
+  function UnaryOpsImpl(
+    op: char,
+    rTypeParamsDecls: seq<R.TypeParamDecl>,
+    newtypeType: R.Type,
+    newtypeConstructor: string
+  ): R.ModDecl
+    requires op in "!"
+  {
+    var (traitName, methodName) := match op {
+      case '!' => ("Not", "not")
+    };
+    R.ImplDecl(
+      R.ImplFor(
+        rTypeParamsDecls,
+        R.std.MSel("ops").MSel(traitName).AsType(),
+        newtypeType,
+        [ R.TypeDeclMember("Output", newtypeType),
+          R.FnDecl(
+            R.NoDoc, R.NoAttr,
+            R.PRIV,
+            R.Fn(
+              methodName, [],
+              [R.Formal.selfOwned],
+              Some(R.SelfOwned),
+              Some(R.Identifier(newtypeConstructor).Apply1(
+                     R.UnaryOp(
+                       [op],
+                       R.self.Sel("0"),
+                       Format.UnaryOpFormat.NoFormat
+                     )))))]
+      ))
+  }
+
+  function OpsImpl(
+    op: char,
+    rTypeParamsDecls: seq<R.TypeParamDecl>,
+    newtypeType: R.Type,
+    newtypeConstructor: string
+  ): R.ModDecl
+    requires op in "+-/*"
+  {
+    var (traitName, methodName) := match op {
+      case '+' => ("Add", "add")
+      case '-' => ("Sub", "sub")
+      case '/' => ("Div", "div")
+      case '*' => ("Mul", "mul")
+    };
+    R.ImplDecl(
+      R.ImplFor(
+        rTypeParamsDecls,
+        R.std.MSel("ops").MSel(traitName).AsType(),
+        newtypeType,
+        [ R.TypeDeclMember("Output", newtypeType),
+          R.FnDecl(
+            R.NoDoc, R.NoAttr,
+            R.PRIV,
+            R.Fn(
+              methodName, [],
+              [R.Formal.selfOwned,
+               R.Formal("other", R.SelfOwned)],
+              Some(R.SelfOwned),
+              Some(R.Identifier(newtypeConstructor).Apply1(
+                     R.BinaryOp(
+                       [op],
+                       R.self.Sel("0"),
+                       R.Identifier("other").Sel("0"),
+                       Format.BinaryOpFormat.NoFormat
+                     )))))]
+      ))
+  }
+
+  function PartialOrdImpl(
+    rTypeParamsDecls: seq<R.TypeParamDecl>,
+    newtypeType: R.Type,
+    newtypeConstructor: string
+  ): R.ModDecl
+  {
+    R.ImplDecl(
+      R.ImplFor(
+        rTypeParamsDecls,
+        R.std.MSel("cmp").MSel("PartialOrd").AsType(),
+        newtypeType,
+        [ R.FnDecl(
+            R.NoDoc, R.NoAttr,
+            R.PRIV,
+            R.Fn(
+              "partial_cmp", [],
+              [R.Formal.selfBorrowed,
+               R.Formal("other", R.SelfBorrowed)],
+              Some(R.std.MSel("option").MSel("Option").AsType().Apply1(R.std.MSel("cmp").MSel("Ordering").AsType())),
+              Some(
+                R.std.MSel("cmp").MSel("PartialOrd").AsExpr().FSel("partial_cmp").Apply([
+                                                                                          R.Borrow(R.self.Sel("0")),
+                                                                                          R.Borrow(R.Identifier("other").Sel("0"))
+                                                                                        ]))
+            ))
+        ]))
+  }
+
+  // Overapproximate but sound static analysis domain for assignment of a variable
+  datatype AssignmentStatus = NotAssigned | SurelyAssigned | Unknown {
+    // After a if, typically. What we know if either of the assignment status is taken
+    function Join(other: AssignmentStatus): AssignmentStatus {
+      if SurelyAssigned? && other.SurelyAssigned? then SurelyAssigned
+      else if NotAssigned? && other.NotAssigned? then NotAssigned
+      else Unknown
+    }
+    function Then(other: AssignmentStatus): AssignmentStatus {
+      if SurelyAssigned? then SurelyAssigned
+      else if NotAssigned? then other
+      else Unknown // It's not as simple. If there are are two paths leading to one being assigned, the other not,
+      // Rust won't be able to figure out the rules
+    }
+  }
+
+  /** Detects if a given variable can be detected to be surely assigned or surely unassigned by the Rust compiler */
+  function DetectAssignmentStatus(stmts_remainder: seq<Statement>, dafny_name: VarName): AssignmentStatus {
+    if |stmts_remainder| == 0 then NotAssigned else
+    var stmt := stmts_remainder[0];
+    var tailAssigned := DetectAssignmentStatus(stmts_remainder[1..], dafny_name);
+    var stop := stmt.Return? || stmt.EarlyReturn? || stmt.JumpTailCallStart? || (stmt.DeclareVar? && stmt.name == dafny_name);
+    var thisAssign := match stmt {
+      case Assign(Ident(assign_name), _) =>
+        if assign_name == dafny_name then SurelyAssigned else NotAssigned
+      case If(cond, thn, els) =>
+        DetectAssignmentStatus(thn, dafny_name)
+        .Join(DetectAssignmentStatus(els, dafny_name))
+      case Call(on, callName, typeArgs, args, outs) =>
+        if outs.Some? && dafny_name in outs.value then SurelyAssigned else NotAssigned
+      case Labeled(_, stmts) =>
+        DetectAssignmentStatus(stmts, dafny_name)
+      case DeclareVar(name, _, _) =>
+        NotAssigned // If it's the same name, it's shadowed
+      case Return(_) | EarlyReturn() | JumpTailCallStart() => NotAssigned
+      case Print(_) => NotAssigned
+      case _ => Unknown
+    };
+    if stop then thisAssign else thisAssign.Then(tailAssigned)
+  } by method {
+    for i := 0 to |stmts_remainder|
+      invariant DetectAssignmentStatus(stmts_remainder, dafny_name) == DetectAssignmentStatus(stmts_remainder[i..], dafny_name)
+    {
+      assert stmts_remainder[i..][0] == stmts_remainder[i];
+      var stmt := stmts_remainder[i];
+      match stmt {
+        case Assign(Ident(assign_name), _) =>
+          if assign_name == dafny_name {
+            return SurelyAssigned;
+          }
+        case If(cond, thn, els) =>
+          var rec := DetectAssignmentStatus(thn, dafny_name);
+          if rec == Unknown { return Unknown; }
+          var rec2 := DetectAssignmentStatus(els, dafny_name);
+          if rec2 == Unknown { return Unknown; }
+          if rec != rec2 { return Unknown; }
+          if rec.SurelyAssigned? { return SurelyAssigned; }
+        case Call(on, callName, typeArgs, args, outs) =>
+          if outs.Some? && dafny_name in outs.value { return SurelyAssigned; }
+        case Labeled(_, stmts) =>
+          var rec := DetectAssignmentStatus(stmts, dafny_name);
+          if !rec.NotAssigned? { return rec; }
+        case DeclareVar(name, _, _) =>
+          if name == dafny_name { return NotAssigned; /* Shadowed */ }
+        case Return(_) | EarlyReturn() | JumpTailCallStart() =>
+          return NotAssigned;
+        case Print(_) =>
+        case _ =>
+          return Unknown;
+      }
+      assert DetectAssignmentStatus(stmts_remainder[i..][1..], dafny_name) == DetectAssignmentStatus(stmts_remainder[i+1..], dafny_name);
+    }
+    return NotAssigned;
+  }
+}
diff --git a/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-expression-optimization.dfy b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-expression-optimization.dfy
new file mode 100644
index 00000000000..4894570f2cb
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-expression-optimization.dfy
@@ -0,0 +1,65 @@
+// Tests in Dafny-compiler-rust-coverage
+module ExpressionOptimization {
+  import Std
+  import opened RAST
+  import opened DAST.Format
+  import opened Std.Wrappers
+
+  function apply(mod: Mod): Mod {
+    ExprSimplifier().ReplaceMod(mod, crate.MSel(mod.name))
+  }
+
+  function ExprSimplifier(): RASTBottomUpReplacer
+  {
+    RASTBottomUpReplacer(
+      ReplaceModSingle :=
+        (m: Mod, SelfPath: Path) => m,
+      ReplaceTypeSingle := (t: Type) => t,
+      ReplaceExprSingle :=
+        (e: Expr) =>
+          match e {
+            case UnaryOp("!", BinaryOp(op, left, right, format),
+              CombineFormat()) =>
+              match op {
+                case "==" => BinaryOp("!=", left, right, BinaryOpFormat.NoFormat())
+                case "<" =>
+                  if format.NoFormat? then
+                    BinaryOp(">=", left, right, BinaryOpFormat.NoFormat())
+                  else if format.ReverseFormat? then
+                    BinaryOp("<=", right, left, BinaryOpFormat.NoFormat())
+                  else
+                    e
+                case _ => e
+              }
+            case Call(ExprFromPath(PMemberSelect(r, "truncate!")), args) =>
+              if (r != dafny_runtime && r != global) || |args| != 2  then
+                e
+              else
+                var expr := args[0];
+                var tpeExpr := args[1];
+                if !tpeExpr.ExprFromType? then e else
+                var tpe := tpeExpr.tpe;
+                if tpe.IsAutoSize() then
+                  match expr {
+                    case Call(ExprFromPath(PMemberSelect(base, "int!")), args) =>
+                      if |args| == 1 && (base == dafny_runtime || base == global) then
+                        match args[0] {
+                          case LiteralInt(number) => LiteralInt(number)
+                          case LiteralString(number, _, _) => LiteralInt(number)
+                          case _ => e
+                        }
+                      else e
+                    case _ => e
+                  }
+                else
+                  e
+            case StmtExpr(DeclareVar(mod, name, Some(tpe), None), StmtExpr(Assign(name2, rhs), last)) =>
+              if name2 == Some(LocalVar(name)) then
+                StmtExpr(DeclareVar(mod, name, Some(tpe), Some(rhs)), last)
+              else
+                e
+            case _ => e
+          }
+    )
+  }
+}
diff --git a/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-path-simplification.dfy b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-path-simplification.dfy
new file mode 100644
index 00000000000..c51a856c08a
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-path-simplification.dfy
@@ -0,0 +1,331 @@
+module FactorPathsOptimizationTest {
+  export provides TestApply
+  import opened RAST
+  import opened FactorPathsOptimization
+  import opened Std.Wrappers
+
+  method ShouldBeEqual(a: Mod, b: Mod) {
+    var sA := a.ToString("");
+    var sB := b.ToString("");
+    if sA != sB {
+      print "Got:\n" + sA + "\n";
+      print "Expected:\n" + sB + "\n";
+      expect sA == sB;
+    }
+  }
+
+  method TestApply() {
+    var T_Decl := TypeParamDecl("T", [DafnyType]);
+    var T_Decl_simp := TypeParamDecl("T", [TIdentifier("DafnyType")]);
+    var T := TIdentifier("T");
+    var std_any_Any := global.MSel("std").MSel("any").MSel("Any");
+    var Any := TIdentifier("Any");
+    ShouldBeEqual(
+      apply(crate)(
+        Mod(
+          NoDoc, NoAttr,
+          "onemodule", [
+            StructDecl(
+              Struct(NoDoc, [], "test", [T_Decl],
+                     NamedFields([Field(PUB, Formal("a", std_any_Any.AsType()))]))),
+            //                                   ::std::any::Any ==> Any
+            ImplDecl(Impl([T_Decl], TIdentifier("test").Apply([T]), [])),
+            ImplDecl(
+              ImplFor(
+                [T_Decl], std_any_Any.AsType(), crate.MSel("onemodule").MSel("test").AsType().Apply([T]), []))
+            //         ::std::any::Any ==> Any  crate::onemodule::test ==> test
+          ])),
+      Mod(
+        NoDoc, NoAttr,
+        "onemodule", [
+          UseDecl(Use(PUB, dafny_runtime.MSel("DafnyType"))),
+          UseDecl(Use(PUB, std_any_Any)),
+          StructDecl(
+            Struct(NoDoc, [], "test", [T_Decl_simp],
+                   NamedFields([Field(PUB, Formal("a", Any))]))),
+          ImplDecl(Impl([T_Decl_simp], TIdentifier("test").Apply([T]), [])),
+          ImplDecl(ImplFor([T_Decl_simp], Any, TIdentifier("test").Apply([T]), []))
+        ]));
+    ShouldBeEqual(
+      apply(crate)(
+        Mod(
+          NoDoc, NoAttr,
+          "onemodule", [
+            ImplDecl(
+              ImplFor(
+                [T_Decl], dafny_runtime.MSel("UpcastObject").AsType().Apply([TIdentifier("x")]),
+                TIdentifier("test").Apply([T]), []))
+          ])),
+      Mod(
+        NoDoc, NoAttr,
+        "onemodule", [
+          UseDecl(Use(PUB, dafny_runtime.MSel("DafnyType"))),
+          UseDecl(Use(PUB, dafny_runtime.MSel("UpcastObject"))),
+          ImplDecl(
+            ImplFor(
+              [T_Decl_simp], TIdentifier("UpcastObject").Apply([TIdentifier("x")]),
+              TIdentifier("test").Apply([T]), []))
+        ]));
+    ShouldBeEqual(
+      apply(crate)(
+        Mod(
+          NoDoc, NoAttr,
+          "onemodule", [
+            ConstDecl(
+              Constant(
+                NoDoc, NoAttr,
+                "dummy", std_any_Any.AsType(),
+                StmtExpr(
+                  DeclareVar(
+                    MUT, "doit", Some(std_rc_Rc.AsType().Apply1(TIdentifier("unknown"))),
+                    Some(
+                      Identifier("something").ApplyType(
+                        [ DynType(std_default_Default.AsType())
+                        ]).Apply([
+                                 std_default_Default_default,
+                                 dafny_runtime.MSel("rd!").AsExpr().Apply1(Identifier("obj"))
+                               ])
+                    )),
+                  TypeAscription(
+                    ExprFromType(
+                      dafny_runtime.MSel("DafnyString").AsType()),
+                    dafny_runtime.MSel("DafnyType").AsType()))))
+          ])),
+      Mod(
+        NoDoc, NoAttr,
+        "onemodule", [
+          UseDecl(Use(PUB, std_any_Any)),
+          UseDecl(Use(PUB, std_rc_Rc)),
+          UseDecl(Use(PUB, std_default_Default)),
+          UseDecl(Use(PUB, dafny_runtime.MSel("rd"))),
+          UseDecl(Use(PUB, dafny_runtime.MSel("DafnyString"))),
+          UseDecl(Use(PUB, dafny_runtime.MSel("DafnyType"))),
+          ConstDecl(
+            Constant(
+              NoDoc, NoAttr,
+              "dummy", TIdentifier("Any"),
+              StmtExpr(
+                DeclareVar(
+                  MUT, "doit", Some(TIdentifier("Rc").Apply1(TIdentifier("unknown"))),
+                  Some(
+                    Identifier("something").ApplyType(
+                      [ DynType(TIdentifier("Default"))
+                      ]).Apply([
+                               Identifier("Default").FSel("default").Apply([]),
+                               Identifier("rd!").Apply1(Identifier("obj"))
+                             ])
+                  )),
+                TypeAscription(
+                  ExprFromType(
+                    TIdentifier("DafnyString")),
+                  TIdentifier("DafnyType")))))
+        ]));
+
+    // Edge case: There is a trait in the current module
+    // And we have a constant of the type of this trait
+    // and another the type of another trait in another module but with the same name.
+    ShouldBeEqual(
+      apply(crate)(
+        Mod(
+          NoDoc, NoAttr,
+          "onemodule", [
+            TraitDecl(
+              Trait(
+                NoDoc, NoAttr, [],
+                TIdentifier("Something"), [], [])
+            ),
+            ConstDecl(
+              Constant(
+                NoDoc, NoAttr,
+                "dummyExtern", crate.MSel("anothermodule").MSel("Something").AsType(),
+                RawExpr("nothing"))),
+            ConstDecl(
+              Constant(
+                NoDoc, NoAttr,
+                "dummyIntern", crate.MSel("onemodule").MSel("Something").AsType(),
+                RawExpr("nothing")))
+          ])),
+      Mod(
+        NoDoc, NoAttr,
+        "onemodule", [
+          TraitDecl(
+            Trait(NoDoc, NoAttr, [], TIdentifier("Something"), [], [])
+          ),
+          ConstDecl(
+            Constant(
+              NoDoc, NoAttr,
+              "dummyExtern", crate.MSel("anothermodule").MSel("Something").AsType(), // No simplification
+              RawExpr("nothing"))),
+          ConstDecl(
+            Constant(
+              NoDoc, NoAttr,
+              "dummyIntern", TIdentifier("Something"),
+              RawExpr("nothing")))
+        ])
+    );
+  }
+}
+
+module FactorPathsOptimization {
+  export provides apply, RAST
+  import Std
+  import opened RAST
+  export Std
+
+  function apply(root: Path): Mod -> Mod {
+    (mod: Mod) => applyPrefix(mod, root.MSel(mod.name))
+  }
+
+  function applyPrefix(mod: Mod, SelfPath: Path): Mod
+    decreases mod, 1
+  {
+    if mod.ExternMod? then mod else
+    var mappings: Mapping := PathsVisitor().VisitMod(Mapping(map[], []), mod, SelfPath);
+    var pathsToRemove := mappings.ToFinalReplacement(SelfPath);
+    var imports := mappings.ToUseStatements(pathsToRemove, SelfPath);
+    var mod := PathSimplifier(mod, pathsToRemove).ReplaceMod(mod, SelfPath);
+    mod.(body := imports + mod.body)
+  }
+
+  // Retrieves the unique element of a singleton set
+  opaque function UniqueElementOf<T>(s: set<T>): (r: T)
+    requires |s| == 1
+    ensures r in s
+  {
+    assert forall e: T, e': T | e in s && e' in s :: e == e' by {
+      forall e: T, e': T | e in s && e' in s ensures e == e' {
+        if e != e' {
+          assert e' in (s - {e});
+          assert |s - {e}| == 0;
+        }
+      }
+    }
+    var e :| e in s;
+    e
+  }
+
+  type FinalReplacement = map<string, Path>
+
+  datatype Mapping = Mapping(
+    provenance: map<string, set<Path>>,
+    keys: seq<string>
+  ) {
+    function Add(k: string, path: Path): Mapping {
+      if k in provenance then
+        this.(provenance := provenance[k := provenance[k] + {path}])
+      else
+        this.(provenance := provenance[k := {path}], keys := keys + [k])
+    }
+
+    // For any mapping identifier -> full paths,
+    // we will perform the replacement either if there is exactly one full path,
+    // or if the path is the dafny runtime (in which cases, all other homonyms remain fully prefixed)
+    function ToFinalReplacement(SelfPath: Path): FinalReplacement {
+      map identifier <- provenance, paths
+        | paths == provenance[identifier] &&
+          (|| |paths| == 1
+           || SelfPath in paths
+           || dafny_runtime in paths)
+        ::
+          identifier := if |paths| == 1 then UniqueElementOf(paths) else
+                        if SelfPath in paths then SelfPath else dafny_runtime
+    }
+    // Given a final replacement map,
+    // creates a sequence of use statements to be inserted at the beginning of the module
+    function ToUseStatements(finalReplacement: FinalReplacement, SelfPath: Path): seq<ModDecl>
+      requires finalReplacement == ToFinalReplacement(SelfPath)
+    {
+      var toUse :=
+        Std.Collections.Seq.Filter(
+          (key: string) => key in finalReplacement && finalReplacement[key] != SelfPath,
+          keys);
+      seq(|toUse|, i requires 0 <= i < |toUse| =>
+        UseDecl(Use(PUB, finalReplacement[toUse[i]].MSel(toUse[i]))))
+    }
+  }
+
+  function PathsVisitor(): RASTTopDownVisitor<Mapping> {
+    RASTTopDownVisitor(
+      VisitTypeSingle := (current: Mapping, t: Type) =>
+        match t {
+          case TypeFromPath(PMemberSelect(base, name)) =>
+            if base == Self() then current else current.Add(name, base)
+          case _ => current
+        },
+      VisitExprSingle := (current: Mapping, e: Expr) =>
+        match e {
+          case ExprFromPath(PMemberSelect(base, id)) =>
+            if base == Self() then current else
+            if |id| > 0 && id[|id|-1] == '!' then
+              current.Add(id[..|id|-1], base)
+            else
+              current.Add(id, base)
+          case _ => current
+        }
+    ,
+      VisitModDeclSingle := (current: Mapping, modDecl: ModDecl, prefix: Path) =>
+        match modDecl {
+          case ModDecl(mod) =>
+            current.Add(mod.name, prefix) // Modules must be handled independently
+          case StructDecl(struct) =>
+            current.Add(struct.name, prefix)
+          case TypeDecl(tpe) =>
+            current.Add(tpe.name, prefix)
+          case ConstDecl(c) =>
+            current.Add(c.name, prefix)
+          case EnumDecl(enum) =>
+            current.Add(enum.name, prefix)
+          case ImplDecl(impl) =>
+            current
+          case TraitDecl(tr) =>
+            match tr.tpe {
+              case TypeApp(TIdentifier(name), _) =>
+                current.Add(name, prefix)
+              case TIdentifier(name) =>
+                current.Add(name, prefix)
+              case _ =>
+                current
+            }
+          case TopFnDecl(fn) =>
+            current.Add(fn.fn.name, prefix)
+          case UseDecl(use) => // Used for externs with *, we can't extract any name
+            current
+        },
+      recurseSubmodules := false // Recursion is done manually
+    )
+  }
+
+  function PathSimplifier(ghost mParent: Mod, replacement: FinalReplacement): RASTBottomUpReplacer
+    decreases mParent, 0
+  {
+    RASTBottomUpReplacer(
+      ReplaceModSingle :=
+        (m: Mod, SelfPath: Path) requires m < mParent =>
+          applyPrefix(m, SelfPath.MSel(m.name)),
+      ReplaceTypeSingle := (t: Type) =>
+        match t {
+          case TypeFromPath(PMemberSelect(base, id)) =>
+            if id in replacement && replacement[id] == base then
+              TSynonym(TIdentifier(id), t)
+            else
+              t
+          case _ => t
+        },
+      ReplaceExprSingle :=
+        (e: Expr) =>
+          match e {
+            case ExprFromPath(PMemberSelect(base, id)) =>
+              if id in replacement && replacement[id] == base then
+                Identifier(id)
+              else if |id| > 0 && id[|id|-1] == '!' then
+                var macro_id := id[..|id|-1];
+                if macro_id in replacement && replacement[macro_id] == base then
+                  Identifier(id)
+                else e
+              else e
+            case _ => e
+          }
+
+    )
+  }
+}
diff --git a/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-proofs.dfy b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-proofs.dfy
new file mode 100644
index 00000000000..7c2d44d2b1d
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-proofs.dfy
@@ -0,0 +1,394 @@
+include "../Dafny/AST.dfy"
+
+/*This module does not contain any compiled code because it
+  only proves properties about DCOMP. In a sense, it's a test file. */
+@Compile(false)
+module {:extern "DafnyToRustCompilerProofs"} DafnyToRustCompilerProofs {
+  import opened DafnyToRustCompiler
+  import opened DafnyToRustCompilerDefinitions
+
+  ghost predicate IsDafnyId(s: string) {
+    && |s| > 0 && s[0] in "aqkhd" &&
+       IsDafnyIdTail(s[1..])
+  }
+
+  ghost predicate IsDafnyIdTail(s: string) {
+    |s| == 0 ||
+    (s[0] in "aqkhd_?'#." && IsDafnyIdTail(s[1..]))
+  }
+
+  lemma IsDafnyIdImpliesDafnyIdTail(s: string)
+    requires IsDafnyId(s)
+    ensures IsDafnyIdTail(s)
+  {}
+
+  function DafnyEscape(s: string): string {
+    if |s| == 0 then "" else
+    if s[0] == '_' then "__" + DafnyEscape(s[1..]) else
+    if s[0] == '?' then "_q" + DafnyEscape(s[1..]) else
+    if s[0] == '\'' then "_k" + DafnyEscape(s[1..]) else
+    if s[0] == '#' then "_h" + DafnyEscape(s[1..]) else
+    [s[0]] + DafnyEscape(s[1..])
+  }
+
+  function DafnyUnescape(s: string): string {
+    if |s| <= 1 then s else
+    if s[0] == '_' then
+      if s[1] == '_' then "_" + DafnyUnescape(s[2..]) else
+      if s[1] == 'q' then "?" + DafnyUnescape(s[2..]) else
+      if s[1] == 'k' then "'" + DafnyUnescape(s[2..]) else
+      if s[1] == 'h' then "#" + DafnyUnescape(s[2..]) else
+      s[..1] + DafnyUnescape(s[1..])
+    else
+      s[..1] + DafnyUnescape(s[1..])
+  }
+
+  lemma DafnyEscapeBijective(s: string)
+    ensures DafnyUnescape(DafnyEscape(s)) == s
+  {
+    if |s| == 0 {
+    } else {
+      DafnyEscapeBijective(s[1..]);
+      if s[0] == '_' {
+      } else if s[0] == '?' {
+      } else if s[0] == '\'' {
+      } else if s[0] == '#' {
+      } else {
+      }
+    }
+  }
+
+  lemma DafnyEscapeCharacteristic(s: string)
+    requires IsDafnyIdTail(s)
+    ensures IsDafnyEncodedIdTail(DafnyEscape(s))
+  {
+    if |s| == 0 {
+    } else {
+      DafnyEscapeCharacteristic(s[1..]);
+      if s[0] == '_' {
+      } else if s[0] == '?' {
+      } else if s[0] == '\'' {
+      } else if s[0] == '#' {
+      } else {
+      }
+    }
+  }
+
+  function ReverseReplaceDots(i: string): string {
+    if |i| <= 1 then i
+    else if i[0] == '_' then
+      if i[1] == 'd' then "." + ReverseReplaceDots(i[2..])
+      else [i[0]] + [i[1]] + ReverseReplaceDots(i[2..])
+    else
+      [i[0]] + ReverseReplaceDots(i[1..])
+  }
+
+  predicate IsDafnyEncodedIdTail(i: string) {
+    if |i| == 0 then true
+    else
+    if i[0] == '_' then
+      |i| >= 2 &&
+      i[1] in ESCAPING && IsDafnyEncodedIdTail(i[2..])
+    else
+      (i[0] in SAMPLE_LETTERS || i[0] == '.') &&
+      IsDafnyEncodedIdTail(i[1..])
+  }
+
+  // Subset of characters supported in Dafny identifiers, for proof purposes
+  const SAMPLE_LETTERS := "aqkhd"
+
+  // Letters that can come after a "_" in Dafny identifiers
+  // __ => _
+  // _q => ?
+  // _k => '
+  // _h => #
+  const ESCAPING := "_qkh"
+
+  ghost predicate IsDafnyEncodedId(i: string) {
+    if |i| == 0 then false
+    else i[0] in SAMPLE_LETTERS && IsDafnyEncodedIdTail(i[1..])
+  }
+
+  lemma DafnyEscapeCorrect(s: string)
+    requires IsDafnyIdTail(s)
+    ensures IsDafnyEncodedIdTail(DafnyEscape(s))
+            && (IsDafnyId(s) && |s| > 0 ==> DafnyEscape(s)[0] in "aqkhd")
+  {
+    if |s| == 0 {
+    } else {
+      if s[0] == '_' { // "__" + DafnyEscape(s[1..])
+      } else if s[0] == '?' { // "_q" + DafnyEscape(s[1..]) else
+      } else if s[0] == '\'' { // "_k" + DafnyEscape(s[1..]) else
+      } else if s[0] == '#' { // "_h" + DafnyEscape(s[1..]) else=
+      } else { // [s[0]] + DafnyEscape(s[1..])=
+        DafnyEscapeCorrect(s[1..]);
+      }
+    }
+  }
+  // replaceDots is not invertible generally speaking.
+  // Indeed, both _d and . get translated to _d.
+  lemma ReplaceDotsNotInvertible()
+    ensures replaceDots("_d") == replaceDots(".")
+    ensures !IsDafnyEncodedIdTail("_d")
+  {}
+
+  // However, if we restrict ourself to a Dafny encoding, it's invertible
+  @ResourceLimit("2500e3")
+  @IsolateAssertions
+  lemma ReplaceDotsInvertible(i: string)
+    requires IsDafnyEncodedIdTail(i)
+    ensures ReverseReplaceDots(replaceDots(i)) == i
+  {
+    if |i| == 0 {
+    } else if i[0] == '.' { //"_d" + replaceDots(i[1..])
+      ReplaceDotsInvertible(i[1..]);
+      assert ReverseReplaceDots(replaceDots(i)) == i;
+    } else { // [i[0]] + replaceDots(i[1..])
+      assert replaceDots(i) == [i[0]] + replaceDots(i[1..]);
+      if i[0] == '_' {
+        assert |i| >= 2 &&
+               i[1] in "_qkh" && IsDafnyEncodedIdTail(i[2..]);
+        assert [i[0]] + replaceDots(i[1..]) == [i[0]] + [i[1]] + replaceDots(i[2..]);
+        ReplaceDotsInvertible(i[2..]);
+        assert ReverseReplaceDots(replaceDots(i)) == i;
+      } else {
+        ReplaceDotsInvertible(i[1..]);
+        assert ReverseReplaceDots(replaceDots(i)) == i;
+      }
+    }
+  }
+
+  // The reason why escapeIdent is correct is that
+  // - It receives either
+  //     - a Dafny-encoded Id that has no special character (only letters + "__" which came from "_")
+  //       and is not a reserved Rust keyword
+  //       ==> Use idiomatic rust
+  //     - a is_tuple_numeric like _<1 or 2 digits>
+  //       ==> Use idiomatic rust
+  //     - a is_tuple_builder like ___hMake<1 or 2 digits>
+  //     - a dafny-generated identifier that starts with a "_" like "_module"
+  //     - A rust keyword
+  //       ==> use "r#" + rust keyword
+  //     - Anything else
+  //       ==> use "r#_" + replaceDot
+  // - The reverse function is such that
+  //   - If the input is a Dafny-encoded Id or a tuple numeric,
+  //     it can find the original identifier based in the output
+
+  lemma BetterTupleBuilderNameNotRsharp(i: string)
+    ensures is_tuple_builder(i) ==>
+              var s := better_tuple_builder_name(i);
+              s[0..2] != "r#"
+  {}
+
+  lemma IdiomaticRustNotRsharp(i: string)
+    ensures
+      !has_special(i)
+      ==>
+        |idiomatic_rust(i)| < 1 || idiomatic_rust(i)[0] != '#'
+  {
+    if !has_special(i) {
+      var s := idiomatic_rust(i);
+      if |i| == 0 {
+      } else if i[0] == '_' {
+        var s := "_" + idiomatic_rust(i[2..]);
+        assert s[0] == '_';
+      } else {
+        var s := [i[0]] + idiomatic_rust(i[1..]);
+        assert s[0] == i[0];
+      }
+    }
+  }
+
+  @Fuel(2, 3, "has_special")
+  lemma EscapeIdentExamples()
+    ensures escapeIdent("i") == "i"   // Loop variable
+    ensures escapeIdent("_1") == "_1" // tuple deconstructor
+    ensures escapeIdent("_m") == "_m" // any hidden variable
+    ensures escapeIdent("___hMake1") == "_T1" // tuple deconstructor
+    ensures escapeIdent("h__w") == "h_w" // only letters and underscore
+    ensures escapeIdent("h_kw") == "_h_kw" //contains special char
+    ensures escapeIdent("fn") == "r#fn" // Keyword
+  {
+    assert has_special("h_kw");
+  }
+
+  // Just convert all underscores to double underscores
+  function ReverseIdiomaticRust(s: string): string {
+    if |s| == 0 then ""
+    else if s[0] == '_' then
+      "__" + ReverseIdiomaticRust(s[1..])
+    else
+      [s[0]] + ReverseIdiomaticRust(s[1..])
+  }
+
+  lemma {:rlimit 200} IdiomaticRustInvertible(i: string)
+    requires !has_special(i)
+    ensures ReverseIdiomaticRust(idiomatic_rust(i)) == i
+  {
+    if |i| == 0 {
+    } else if i[0] == '_' {
+      IdiomaticRustInvertible(i[2..]);
+      assert 2 <= |i| && i[1] == '_';
+      var ss := ['_'] + idiomatic_rust(i[2..]);
+      assert ss[0] == '_' && |ss| != 0;
+    } else {
+      IdiomaticRustInvertible(i[1..]);
+    }
+  }
+
+  function UnescapeIdent(s: string): string {
+    if |s| >= 1 && s[0] == '_' then
+      if is_tuple_numeric(s) then
+        s
+      else if |s| >= 2 && s[1] == 'T' then
+        "___hMake" + s[2..] // Tuple builder
+      else if s == "_self" || s == "_Self" then
+        s[1..]
+      else
+        ReverseReplaceDots(s[1..]) // We remove the extra "_" prefix and place dots again
+    else if |s| >= 2 && s[0..2] == "r#" then
+      s[2..] // Reserved identifier
+    else // Idiomatic rust
+      ReverseIdiomaticRust(s)
+  }
+
+  lemma TupleIdentInvertible(i: string)
+    requires is_tuple_numeric(i)
+    ensures UnescapeIdent(escapeIdent(i)) == i
+  {
+  }
+
+  lemma {:rlimit 500} TupleBuilderInvertible(i: string)
+    requires !is_tuple_numeric(i)
+    requires is_tuple_builder(i)
+    ensures UnescapeIdent(escapeIdent(i)) == i
+  {
+    var s := "_T" + i[8..];
+    calc {
+      UnescapeIdent(escapeIdent(i));
+      UnescapeIdent(s);
+      i[0..8] + s[2..];
+      i;
+    }
+  }
+
+  lemma {:rlimit 800} ReservedRustInvertible(i: string)
+    requires !is_tuple_numeric(i)
+    requires !is_tuple_builder(i)
+    requires i in reserved_rust
+    ensures UnescapeIdent(escapeIdent(i)) == i
+  {
+    assert i[0] != '_';
+    var s := "r#" + i;
+    calc {
+      UnescapeIdent(escapeIdent(i));
+      UnescapeIdent(s);
+      s[2..];
+      i;
+    }
+  }
+
+  lemma {:rlimit 800} EscapeIdentInvertibleForIdiomaticRust(i: string)
+    requires IsDafnyEncodedId(i) // Needed to ensure i does not start with '_'
+    requires !is_tuple_numeric(i)
+    requires !is_tuple_builder(i)
+    requires i !in reserved_rust
+    requires is_idiomatic_rust_id(i)
+    ensures UnescapeIdent(escapeIdent(i)) == i
+  {
+    var s := idiomatic_rust(i);
+    IdiomaticRustNotRsharp(i);
+    assert |s| < 2 || s[0..2] != "r#" by {
+      if |s| >= 2 && s[0..2] == "r#" {
+        assert s[1] == '#';
+        IdiomaticRustNotRsharp(i[1..]);
+      }
+    }
+    assert s[0] != '_';
+    calc {
+      UnescapeIdent(escapeIdent(i));
+      UnescapeIdent(idiomatic_rust(i));
+      ReverseIdiomaticRust(idiomatic_rust(i));
+      { IdiomaticRustInvertible(i); }
+      i;
+    }
+  }
+
+  lemma {:rlimit 800} EscapeIdentInvertibleForDafnyGeneratedId(i: string)
+    requires IsDafnyEncodedId(i)
+    requires !is_tuple_numeric(i)
+    requires !is_tuple_builder(i)
+    requires i !in reserved_rust
+    requires !is_idiomatic_rust_id(i)
+    requires is_dafny_generated_id(i)
+    ensures UnescapeIdent(escapeIdent(i)) == i
+  {
+    assert escapeIdent(i) == i;
+    var s := i;
+    assert |s| >= 1 && s[0] == '_';
+    assert !(|s| >= 2 && s[1] == 'T');
+    assert !(s == "_self" || s == "_Self");
+    calc {
+      UnescapeIdent(s);
+      s;
+    }
+  }
+
+  lemma {:rlimit 800} EverythingElseInvertible(i: string)
+    requires IsDafnyEncodedId(i) // Needed to ensure i does not start with '_'
+    requires !is_tuple_numeric(i)
+    requires !is_tuple_builder(i)
+    requires i !in reserved_rust
+    requires !is_idiomatic_rust_id(i)
+    requires !is_dafny_generated_id(i)
+    ensures UnescapeIdent(escapeIdent(i)) == i
+  {
+    var r := replaceDots(i);
+    var s := "_" + r;
+    assert escapeIdent(i) == s;
+    assert |s| >= 1 && s[0] == '_';
+    assert !(|s| >= 2 && s[1] == 'T');
+    assert !(s == "_self" || s == "_Self");
+    assert |i| > 0;
+    if i[0] == '_' {
+      assert i[0] == '_'; // So if i[0] is not '_'
+      assert UnescapeIdent(escapeIdent(i)) == i;
+    } else {
+      calc {
+        UnescapeIdent(s);
+        ReverseReplaceDots(s[1..]);
+        ReverseReplaceDots(r);
+        ReverseReplaceDots(replaceDots(i));
+        { ReplaceDotsInvertible(i); }
+        i;
+      }
+    }
+  }
+
+  // That's the lemma that shows
+  lemma EscapeIdentInvertible(i: string)
+    requires is_tuple_numeric(i) // _0 _1 ...                 => _0, _1 ...
+             || is_tuple_builder(i) // ___hMake0, ____hMake1 ... => _T0, _T1 ...
+             || i in reserved_rust  // fn, impl, mod ...         => r#fn, r#impl, r#mod...
+             || IsDafnyEncodedId(i) // i                         => i
+    // create_struct             => create_struct
+    //  c#ons.tant?'              => r#_c_hons_dtant_q_k
+    ensures UnescapeIdent(escapeIdent(i)) == i
+  {
+    if is_tuple_numeric(i) {
+      TupleIdentInvertible(i);
+    } else if is_tuple_builder(i) {
+      TupleBuilderInvertible(i);
+    } else if i in reserved_rust {
+      assert UnescapeIdent(escapeIdent(i)) == i;
+    } else if is_idiomatic_rust_id(i) {
+      EscapeIdentInvertibleForIdiomaticRust(i);
+    } else if is_dafny_generated_id(i) { // TODO: Mov up so that we can put it in specifications
+      EscapeIdentInvertibleForDafnyGeneratedId(i);
+    } else {
+      EverythingElseInvertible(i);
+    }
+  }
+
+}
diff --git a/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-rast.dfy b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-rast.dfy
new file mode 100644
index 00000000000..cb4439c874f
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-rast.dfy
@@ -0,0 +1,1932 @@
+
+// Rust AST
+module RAST
+// All ToString methods should produce well-formed Rust code
+{
+  import opened Std.Wrappers
+  import Std
+  import opened DAST.Format
+  import Strings = Std.Strings
+
+  // Rust tuples support some traits like Default only till arity 12
+  // Past that, we use Dafny system tuples (see https://www.reddit.com/r/rust/comments/11gvkda/why_rust_std_only_provides_trait_implementation/)
+  const MAX_TUPLE_SIZE := 12
+
+  // Default Rust-like indentation
+  const IND := "    "
+
+  datatype RASTTopDownVisitor<!T(!new)> =
+    RASTTopDownVisitor(
+      nameonly VisitTypeSingle: (T, Type) -> T,
+      nameonly VisitExprSingle: (T, Expr) -> T,
+      nameonly VisitModDeclSingle: (T, ModDecl, Path) -> T,
+      nameonly recurseSubmodules: bool := false
+    )
+  {
+    function VisitMod(acc: T, mod: Mod, SelfPath: Path): T {
+      mod.Fold(acc, (acc, modDecl) requires modDecl < mod => VisitModMapping(acc, modDecl, SelfPath))
+    }
+    function VisitTypeParams(acc: T, typeParams: seq<TypeParamDecl>): T {
+      FoldLeft( (acc: T, t: TypeParamDecl) =>
+                  FoldLeft( (acc: T, t: Type) =>
+                              VisitType(acc, t),
+                            acc, t.constraints),
+                acc, typeParams)
+    }
+    function VisitFields(acc: T, fields: Fields): T {
+      match fields {
+        case NamedFields(sFields) =>
+          FoldLeft( (acc: T, f: Field) =>
+                      VisitType(acc, f.formal.tpe),
+                    acc, sFields)
+        case NamelessFields(sFields) =>
+          FoldLeft( (acc: T, f: NamelessField) =>
+                      VisitType(acc, f.tpe),
+                    acc, sFields)
+      }
+    }
+
+    function VisitModMapping(acc: T, modDecl: ModDecl, SelfPath: Path): T {
+      var acc := VisitModDeclSingle(acc, modDecl, SelfPath);
+      match modDecl {
+        case ModDecl(mod) =>
+          if recurseSubmodules then VisitMod(acc, mod, SelfPath.MSel(mod.name)) else acc
+        case StructDecl(struct) =>
+          VisitStructMapping(acc, struct)
+        case TypeDecl(TypeSynonym(attributes, _, name, typeParams, tpe)) =>
+          var acc := VisitTypeParams(acc, typeParams);
+          var acc := VisitType(acc, tpe);
+          acc
+        case ConstDecl(Constant(attributes, _, name, tpe, value)) =>
+          var acc := VisitType(acc, tpe);
+          var acc := value.Fold(acc, VisitExprSingle, VisitTypeSingle);
+          acc
+        case EnumDecl(Enum(attributes, _, name, typeParams, variants)) =>
+          FoldLeft(
+            (acc: T, enumCase: EnumCase) requires enumCase in variants =>
+              VisitFields(acc, enumCase.fields),
+            VisitTypeParams(acc, typeParams),
+            variants
+          )
+        case ImplDecl(impl) => VisitImplMapping(acc, impl)
+        case TraitDecl(tr) => VisitTraitDecl(acc, tr)
+        case TopFnDecl(fn) => VisitTopFn(acc, fn)
+        case UseDecl(use) => VisitUse(acc, use)
+      }
+    }
+
+    function VisitStructMapping(acc: T, struct: Struct): T {
+      VisitTypeParams(acc, struct.typeParams)
+    }
+
+    function VisitTraitDecl(acc: T, tr: Trait): T {
+      match tr {
+        case Trait(_, _, typeParams, tpe, parents, body) =>
+          var acc := VisitTypeParams(acc, typeParams);
+          var acc := tpe.Fold(acc, VisitTypeSingle);
+          var acc :=
+            FoldLeft(
+              (acc: T, parent: Type) =>
+                parent.Fold(acc, VisitTypeSingle),
+              acc,
+              parents
+            );
+          VisitBody(acc, body)
+      }
+    }
+
+    function VisitTopFn(acc: T, t: TopFnDecl): T {
+      match t {
+        case TopFn(_, attributes, visibility, fn) =>
+          VisitFn(acc, fn)
+      }
+    }
+
+    function VisitUse(acc: T, u: Use): T {
+      acc // Nothing to visit for now
+    }
+
+    function VisitType(acc: T, tpe: Type): T {
+      tpe.Fold(acc, (acc: T, t: Type) => VisitTypeSingle(acc, t))
+    }
+
+    function VisitImplMapping(acc: T, impl: Impl): T {
+      match impl {
+        case ImplFor(typeParams, tpe, forType, body) =>
+          var acc := VisitTypeParams(acc, typeParams);
+          var acc := VisitType(acc, tpe);
+          var acc := VisitType(acc, forType);
+          VisitBody(acc, body)
+        // TODO: Add body
+        case Impl(typeParams, tpe, body) =>
+          var acc := VisitType(acc, tpe);
+          VisitBody(acc, body)
+      }
+    }
+    function VisitBody(acc: T, members: seq<ImplMember>): T {
+      FoldLeft(
+        (acc: T, member: ImplMember) requires member in members =>
+          VisitMember(acc, member),
+        acc,
+        members
+      )
+    }
+    function VisitMember(acc: T, member: ImplMember): T {
+      match member {
+        case RawImplMember(content) => acc
+        case FnDecl(docString, attributes, pub, fun) =>
+          VisitFn(acc, fun)
+        case TypeDeclMember(name, tpe) =>
+          VisitType(acc, tpe)
+        case ImplMemberMacro(expr: Expr) =>
+          expr.Fold(acc, VisitExprSingle, VisitTypeSingle)
+      }
+    }
+    function VisitFn(acc: T, fn: Fn): T {
+      match fn {
+        case Fn(name, typeParams, formals, returnType, body) =>
+          var acc := VisitTypeParams(acc, typeParams);
+          var acc := FoldLeft(
+                       (acc: T, f: Formal) requires f in formals => f.tpe.Fold(acc, VisitTypeSingle),
+                       acc, formals
+                     );
+          var acc := if returnType.None? then acc else returnType.value.Fold(acc, VisitTypeSingle);
+          var acc := if body.None? then acc else body.value.Fold(acc, VisitExprSingle, VisitTypeSingle);
+          acc
+      }
+    }
+  }
+
+  datatype RASTBottomUpReplacer =
+    RASTBottomUpReplacer(
+      nameonly ReplaceModSingle: (Mod, Path) --> Mod := (m: Mod, p: Path) => m,
+      nameonly ReplaceTypeSingle: Type -> Type := (t: Type) => t,
+      nameonly ReplaceExprSingle: Expr -> Expr := (e: Expr) => e
+    ) {
+    function ReplaceMod(mod: Mod, SelfPath: Path): Mod
+      requires forall m: Mod, p: Path | m < mod ::
+                 ReplaceModSingle.requires(m, p)
+    {
+      if mod.ExternMod? then mod else
+      var newModDeclarations := mod.Fold([], (current, modDecl) requires modDecl < mod =>
+                                           assert forall mod: Mod, p: Path | mod < modDecl :: this.ReplaceModSingle.requires(mod, p);
+                                           current + [ReplaceModDecl(modDecl, SelfPath)]
+                                );
+      mod.(body := newModDeclarations)
+    }
+    function ReplaceModDecl(modDecl: ModDecl, SelfPath: Path): ModDecl
+      requires forall mod: Mod, p: Path | mod < modDecl ::
+                 ReplaceModSingle.requires(mod, p)
+    {
+      match modDecl {
+        case ModDecl(mod) =>
+          ModDecl(ReplaceModSingle(mod, SelfPath.MSel(mod.name))) // We optimize independently submodules
+        case StructDecl(struct) =>
+          StructDecl(ReplaceStruct(struct))
+        case TypeDecl(tpe) =>
+          TypeDecl(ReplaceTypeDecl(tpe))
+        case ConstDecl(c) =>
+          ConstDecl(ReplaceConst(c))
+        case EnumDecl(enum) =>
+          EnumDecl(ReplaceEnum(enum))
+        case ImplDecl(impl) =>
+          ImplDecl(ReplaceImplDecl(impl))
+        case TraitDecl(tr) =>
+          TraitDecl(ReplaceTrait(tr))
+        case TopFnDecl(fn) =>
+          TopFnDecl(ReplaceTopFn(fn))
+        case UseDecl(use) =>
+          UseDecl(ReplaceUse(use))
+      }
+    }
+
+    function ReplaceStruct(struct: Struct): Struct {
+      match struct {
+        case Struct(docString, attributes, name, typeParams, fields) =>
+          Struct(docString, attributes, name,
+                 ReplaceTypeParams(typeParams),
+                 ReplaceFields(fields)
+          )
+      }
+    }
+
+    function ReplaceTypeDecl(t: TypeSynonym): TypeSynonym {
+      match t {
+        case TypeSynonym(docString, attributes, name, typeParams, tpe) =>
+          TypeSynonym(docString, attributes, name, ReplaceTypeParams(typeParams), ReplaceType(tpe))
+      }
+    }
+
+    function ReplaceConst(t: Constant): Constant {
+      match t {
+        case Constant(docString, attributes, name, tpe, value) =>
+          Constant(docString, attributes, name, ReplaceType(tpe), ReplaceExpr(value))
+      }
+    }
+
+    function ReplaceEnum(enum: Enum): Enum {
+      match enum {
+        case Enum(docString, attributes, name, typeParams, variants) =>
+          Enum(docString, attributes, name,
+               ReplaceTypeParams(typeParams),
+               Std.Collections.Seq.Map(
+                 (t: EnumCase) => ReplaceEnumCase(t), variants))
+      }
+    }
+
+    function ReplaceEnumCase(enumCase: EnumCase): EnumCase {
+      match enumCase {
+        case EnumCase(docString, name, fields) =>
+          EnumCase(docString, name, ReplaceFields(fields))
+      }
+    }
+
+    function ReplaceImplDecl(impl: Impl): Impl {
+      match impl {
+        case ImplFor(typeParams, tpe, forType, body) =>
+          ImplFor(
+            ReplaceTypeParams(typeParams),
+            ReplaceType(tpe),
+            ReplaceType(forType),
+            ReplaceBody(body))
+        case Impl(typeParams, tpe, body) =>
+          Impl(ReplaceTypeParams(typeParams), ReplaceType(tpe), ReplaceBody(body))
+      }
+    }
+
+    function ReplaceTrait(tr: Trait): Trait {
+      match tr {
+        case Trait(docString, attributes, typeParams, tpe, parents, body) =>
+          Trait(
+            docString,
+            attributes,
+            ReplaceTypeParams(typeParams),
+            ReplaceType(tpe),
+            Std.Collections.Seq.Map(
+              (t: Type) => ReplaceType(t), parents),
+            ReplaceBody(body))
+      }
+    }
+
+    function ReplaceTopFn(t: TopFnDecl): TopFnDecl {
+      match t {
+        case TopFn(docString, attributes, visibility, fn) =>
+          TopFn(docString, attributes, visibility, ReplaceFn(fn))
+      }
+    }
+
+    function ReplaceFn(t: Fn): Fn {
+      match t {
+        case Fn(name, typeParams, formals, returnType, body) =>
+          Fn(
+            name,
+            ReplaceTypeParams(typeParams),
+            Std.Collections.Seq.Map(
+              (f: Formal) requires f in formals => f.Replace(ReplaceType),
+              formals
+            ),
+            if returnType.None? then None else Some(returnType.value.Replace(ReplaceType)),
+            if body.None? then None else Some(body.value.Replace(ReplaceExpr, ReplaceType))
+          )
+      }
+    }
+
+    function ReplaceUse(use: Use): Use {
+      match use {
+        case Use(visibility, path) =>
+          Use(visibility, path)
+      }
+    }
+
+    function ReplaceBody(decls: seq<ImplMember>): seq<ImplMember> {
+      Std.Collections.Seq.Map(
+        (t: ImplMember) => ReplaceImplMember(t), decls)
+    }
+
+    function ReplaceImplMember(t: ImplMember): ImplMember {
+      match t {
+        case RawImplMember(content) => t
+        case FnDecl(docString, attributes, pub, fun) =>
+          FnDecl(docString, attributes, pub, ReplaceFn(fun))
+        case TypeDeclMember(name, tpe) =>
+          TypeDeclMember(name, ReplaceType(tpe))
+        case ImplMemberMacro(expr: Expr) =>
+          ImplMemberMacro(ReplaceExpr(expr))
+      }
+    }
+    function ReplaceExpr(e: Expr): Expr {
+      e.Replace(ReplaceExprSingle, ReplaceTypeSingle)
+    }
+    function ReplaceTypeParams(typeParams: seq<TypeParamDecl>): seq<TypeParamDecl> {
+      Std.Collections.Seq.Map(
+        (t: TypeParamDecl) =>
+          t.(constraints := Std.Collections.Seq.Map(
+            (constraint: Type) =>
+              ReplaceType(constraint), t.constraints)), typeParams)
+    }
+    function ReplaceType(t: Type): Type {
+      t.Replace(this.ReplaceTypeSingle)
+    }
+    function ReplaceFields(fields: Fields): Fields {
+      match fields {
+        case NamedFields(sFields) =>
+          NamedFields(
+            Std.Collections.Seq.Map(
+              (f: Field) =>
+                f.(formal := f.formal.(tpe := ReplaceType(f.formal.tpe))), sFields
+            ))
+        case NamelessFields(sFields) =>
+          NamelessFields(
+            Std.Collections.Seq.Map(
+              (f: NamelessField) =>
+                f.(tpe := ReplaceType(f.tpe)), sFields))
+      }
+    }
+  }
+
+  opaque function FoldLeft<A(!new), T>(f: (A, T) --> A, init: A, xs: seq<T>): A
+    requires forall t: T <- xs, a: A :: f.requires(a, t)
+  {
+    if |xs| == 0 then init
+    else FoldLeft(f, f(init, xs[0]), xs[1..])
+  }
+
+  function ToDocstringPrefix(docString: string, ind: string): string {
+    if docString == "" then "" else
+    "/// " + AddIndent(docString, ind + "/// ") + "\n" + ind
+  }
+
+  datatype Mod =
+      // Rust modules
+    | Mod(
+        docString: string,
+        attributes: seq<Attribute>,
+        name: string,
+        body: seq<ModDecl>)
+    | ExternMod(name: string)
+  {
+    function Fold<T(!new)>(acc: T, accBuilder: (T, ModDecl) --> T): T
+      requires Mod? ==> forall modDecl: ModDecl <- body, t: T :: accBuilder.requires(t, modDecl)
+    {
+      if ExternMod? then acc else
+      FoldLeft(accBuilder, acc, body)
+    }
+    function ToString(ind: string): string
+      decreases this
+    {
+      match this {
+        case ExternMod(name) =>
+          "pub mod " + name + ";"
+        case Mod(docString, attributes, name, body) =>
+          ToDocstringPrefix(docString, ind) +
+          Attribute.ToStringMultiple(attributes, ind) +
+          /* If the module does not start with "use", just separate declarations by one blank line
+             If the module starts with "use", add blank lines only after use declarations */
+          var startWithUse := |body| > 0 && body[0].UseDecl?;
+          var prefixIfNotUseDecl := if startWithUse then "\n" + ind + IND else "";
+          var prefixIfUseDecl := if startWithUse then ind + IND else "";
+          var infixDecl := if startWithUse then "\n" else "\n\n" + ind + IND;
+          var initialIdent := if startWithUse then "" else ind + IND;
+          "pub mod " + name + " {" + "\n" + initialIdent +
+          SeqToString(
+            body,
+            (modDecl: ModDecl) requires modDecl < this =>
+              (if modDecl.UseDecl? then prefixIfUseDecl else prefixIfNotUseDecl) +
+              modDecl.ToString(ind + IND), infixDecl)
+          + "\n" + ind + "}"
+      }
+    }
+  }
+  function SeqToString<T>(s: seq<T>, f: T --> string, separator: string := ""): string
+    requires forall t <- s :: f.requires(t)
+  {
+    if |s| == 0 then "" else
+    f(s[0]) + (if |s| > 1 then separator + SeqToString(s[1..], f, separator) else "")
+  }
+  datatype ModDecl =
+    | ModDecl(mod: Mod)
+    | StructDecl(struct: Struct)
+    | TypeDecl(tpe: TypeSynonym)
+    | ConstDecl(c: Constant)
+    | EnumDecl(enum: Enum)
+    | ImplDecl(impl: Impl)
+    | TraitDecl(tr: Trait)
+    | TopFnDecl(fn: TopFnDecl)
+    | UseDecl(use: Use)
+  {
+    function ToString(ind: string): string
+      decreases this
+    {
+      if ModDecl? then mod.ToString(ind)
+      else if StructDecl? then struct.ToString(ind)
+      else if ImplDecl? then impl.ToString(ind)
+      else if EnumDecl? then enum.ToString(ind)
+      else if TypeDecl? then tpe.ToString(ind)
+      else if ConstDecl? then c.ToString(ind)
+      else if TraitDecl? then tr.ToString(ind)
+      else if TopFnDecl? then fn.ToString(ind)
+      else assert UseDecl?; use.ToString(ind)
+    }
+  }
+  datatype Use = Use(visibility: Visibility, path: Path) {
+    function ToString(ind: string): string {
+      visibility.ToString() + "use " + path.ToString() + ";"
+    }
+  }
+  datatype TopFnDecl = TopFn(
+    docString: string,
+    attributes: seq<Attribute>,
+    visibility: Visibility, fn: Fn) {
+    function ToString(ind: string): string {
+      ToDocstringPrefix(docString, ind) +
+      Attribute.ToStringMultiple(attributes, ind) +
+      visibility.ToString() + fn.ToString(ind)
+    }
+  }
+  datatype Attribute = RawAttribute(content: string) {
+    static function ToStringMultiple(attributes: seq<Attribute>, ind: string): string {
+      SeqToString(
+        attributes,
+        (attribute: Attribute) => attribute.content + "\n" + ind)
+    }
+  }
+
+  datatype Struct =
+    Struct(docString: string,
+           attributes: seq<Attribute>,
+           name: string, typeParams: seq<TypeParamDecl>, fields: Fields)
+  {
+    function ToString(ind: string): string {
+      ToDocstringPrefix(docString, ind) +
+      Attribute.ToStringMultiple(attributes, ind) +
+      "pub struct " + name +
+      TypeParamDecl.ToStringMultiple(typeParams, ind) +
+      fields.ToString(ind, fields.NamedFields?) +
+      (if fields.NamelessFields? then ";" else "")
+    }
+  }
+
+  datatype TypeSynonym =
+    TypeSynonym(
+      docString: string,
+      attributes: seq<Attribute>,
+      name: string, typeParams: seq<TypeParamDecl>, tpe: Type)
+  {
+    function ToString(ind: string): string {
+      ToDocstringPrefix(docString, ind) +
+      Attribute.ToStringMultiple(attributes, ind) +
+      "pub type " + name +
+      TypeParamDecl.ToStringMultiple(typeParams, ind) + " = " +
+      tpe.ToString(ind) + ";"
+    }
+  }
+
+  datatype Constant =
+    Constant(
+      docString: string,
+      attributes: seq<Attribute>,
+      name: string, tpe: Type, value: Expr)
+  {
+    function ToString(ind: string): string {
+      ToDocstringPrefix(docString, ind) +
+      Attribute.ToStringMultiple(attributes, ind) +
+      "pub const " + name + ": " + tpe.ToString(ind) + " = " +
+      value.ToString(ind) + ";"
+    }
+  }
+
+  datatype NamelessField =
+    NamelessField(visibility: Visibility, tpe: Type)
+  {
+    function ToString(ind: string): string {
+      visibility.ToString() + tpe.ToString(ind)
+    }
+  }
+
+  datatype Field = Field(visibility: Visibility, formal: Formal)
+  {
+    function ToString(ind: string): string {
+      visibility.ToString() + formal.ToString(ind)
+    }
+    function ToNamelessField(): NamelessField {
+      NamelessField(visibility, formal.tpe)
+    }
+  }
+
+  datatype Fields =
+    | NamedFields(fields: seq<Field>)
+    | NamelessFields(types: seq<NamelessField>)
+  {
+    function ToNamelessFields(): Fields
+      requires NamedFields?
+    {
+      NamelessFields(seq(|fields|, i requires 0 <= i < |fields| => fields[i].ToNamelessField()))
+    }
+    function ToString(ind: string, newLine: bool): string {
+      if NamedFields? then
+        var separator := if newLine then ",\n" + ind + IND else ", ";
+        var (beginSpace, endSpace) :=
+          if newLine && |fields| > 0 then
+            ("\n" + ind + IND, "\n" + ind)
+          else if |fields| > 0 then
+            (" ", " ")
+          else
+            ("", "");
+        " {" + beginSpace +
+        SeqToString(fields, (field: Field) => field.ToString(ind + IND), separator)
+        + endSpace + "}"
+      else
+        assert NamelessFields?;
+        var separator := if newLine then ",\n" + ind + IND else ", ";
+        "("+
+        SeqToString(types, (t: NamelessField) => t.ToString(ind + IND), separator)
+        +")"
+    }
+  }
+
+  datatype EnumCase =
+    | EnumCase(docString: string, name: string, fields: Fields)
+  {
+    function ToString(ind: string, newLine: bool): string {
+      ToDocstringPrefix(docString, ind) +
+      name + fields.ToString(ind, newLine)
+    }
+  }
+
+  datatype Enum =
+    Enum(
+      docString: string,
+      attributes: seq<Attribute>,
+      name: string, typeParams: seq<TypeParamDecl>,
+      variants: seq<EnumCase>)
+  {
+    function ToString(ind: string): string {
+      ToDocstringPrefix(docString, ind) +
+      Attribute.ToStringMultiple(attributes, ind) +
+      "pub enum " + name +
+      TypeParamDecl.ToStringMultiple(typeParams, ind)
+      + " {" +
+      SeqToString(
+        variants,
+        (variant: EnumCase) =>
+          "\n" + ind + IND + variant.ToString(ind + IND, true), ",") +
+      "\n" + ind + "}"
+    }
+  }
+
+  type TypeParamConstraint = Type
+
+  datatype TypeParamDecl =
+    | TypeParamDecl(name: string, constraints: seq<TypeParamConstraint>)
+  {
+    static function ToStringMultiple(typeParams: seq<TypeParamDecl>, ind: string): string {
+      if |typeParams| == 0 then "" else
+      "<" + SeqToString(typeParams, (t: TypeParamDecl) => t.ToString(ind + IND), ", ") + ">"
+    }
+    @TailRecursion
+    static function AddConstraintsMultiple(
+      typeParams: seq<TypeParamDecl>, constraints: seq<TypeParamConstraint>
+    ): seq<TypeParamDecl> {
+      if |typeParams| == 0 then []
+      else
+        [typeParams[0].AddConstraints(constraints)] + AddConstraintsMultiple(typeParams[1..], constraints)
+    }
+    function AddConstraints(constraints: seq<TypeParamConstraint>): TypeParamDecl {
+      this.(constraints := this.constraints + constraints)
+    }
+    function ToString(ind: string): string {
+      name + (
+        if |constraints| == 0 then
+          ""
+        else
+          ": " + SeqToString(constraints, (t: TypeParamConstraint) requires t < this =>
+                               t.ToString(ind + IND), " + "))
+    }
+  }
+  const SelfBorrowed := Borrowed(SelfOwned)
+
+  const SelfBorrowedMut := BorrowedMut(SelfOwned)
+
+  const RcPath := std.MSel("rc").MSel("Rc")
+
+  const RcType := RcPath.AsType()
+
+  const ObjectPath: Path := dafny_runtime.MSel("Object")
+
+  const Object := ObjectPath.AsExpr()
+
+  function ObjectType(underlying: Type): Type {
+    ObjectPath.AsType().Apply([underlying])
+  }
+
+  const PtrPath: Path := dafny_runtime.MSel("Ptr")
+
+  const BoxPath := std.MSel("boxed").MSel("Box")
+
+  const Ptr := PtrPath.AsExpr()
+
+  function PtrType(underlying: Type): Type {
+    PtrPath.AsType().Apply([underlying])
+  }
+
+  function Rc(underlying: Type): Type {
+    TypeApp(RcType, [underlying])
+  }
+  function RefCell(underlying: Type): Type {
+    TypeApp(RefcellType, [underlying])
+  }
+  function Vec(underlying: Type): Type {
+    TypeApp(std.MSel("vec").MSel("Vec").AsType(), [underlying])
+  }
+  function NewVec(elements: seq<Expr>): Expr {
+    Identifier("vec!").Apply(elements)
+  }
+  function Borrow(underlying: Expr): Expr {
+    UnaryOp("&", underlying, UnaryOpFormat.NoFormat)
+  }
+  function BorrowMut(underlying: Expr): Expr {
+    UnaryOp("&mut", underlying, UnaryOpFormat.NoFormat)
+  }
+
+  function RawType(content: string): Type {
+    TIdentifier(content)
+  }
+
+  function Box(content: Type): Type {
+    TypeApp(BoxPath.AsType(), [content])
+  }
+  function BoxNew(content: Expr): Expr {
+    BoxPath.AsExpr().FSel("new").Apply([content])
+  }
+
+  datatype Path =
+    | Global() // ::...   to access other crates
+    | Crate()  // crate::... to access modules and imported modules in the same crate
+    | Self()   // Self::...
+    | PMemberSelect(base: Path, name: string)
+  {
+    function MSel(name: string): Path {
+      PMemberSelect(this, name)
+    }
+    function MSels(names: seq<string>): Path
+      decreases |names|
+    {
+      if |names| == 0 then this else
+      this.MSel(names[0]).MSels(names[1..])
+    }
+    function FSel(name: string): Expr {
+      AsExpr().FSel(name)
+    }
+    function AsType(): Type {
+      TypeFromPath(this)
+    }
+    function AsExpr(): Expr {
+      ExprFromPath(this)
+    }
+    function ToString(): string {
+      match this {
+        case Global() => ""
+        case Crate() => "crate"
+        case Self() => "Self"
+        case PMemberSelect(base, name) => base.ToString() + "::" + name
+      }
+    }
+    function RightMostIdentifier(): Option<string> {
+      match this {
+        case Global() => None
+        case Crate() => Some("crate")
+        case Self() => Some("Self")
+        case PMemberSelect(base, name) => Some(name)
+      }
+    }
+  }
+
+  const SelfOwned := Self().AsType()
+
+  datatype Type =
+    | U8 | U16 | U32 | U64 | U128 | I8 | I16 | I32 | I64 | I128 | USIZE
+    | Bool
+    | TIdentifier(name: string)
+    | TypeFromPath(path: Path)
+    | TypeApp(baseName: Type, arguments: seq<Type>)
+    | Borrowed(underlying: Type)
+    | BorrowedMut(underlying: Type)
+    | ImplType(underlying: Type)
+    | DynType(underlying: Type)
+    | TupleType(arguments: seq<Type>)
+    | FnType(arguments: seq<Type>, returnType: Type)
+    | IntersectionType(left: Type, right: Type)
+    | Array(underlying: Type, size: Option<string>)
+    | TSynonym(display: Type, base: Type)
+    | TMetaData(display: Type, nameonly copySemantics: bool, nameonly overflow: bool)
+  {
+    function Expand(): (r: Type)
+      ensures !r.TSynonym? && !r.TMetaData? && (!TSynonym? && !TMetaData? ==> r == this)
+    {
+      if TSynonym? then base.Expand() else
+      if TMetaData? then display.Expand() else this
+    }
+    predicate EndsWithNameThatCanAcceptGenerics() {
+      || U8? || U16? || U32? || U64? || U128? || I8? || I16? || I32? || I64? || I128?
+      || TIdentifier? || TypeFromPath?
+      || (Borrowed? && underlying.EndsWithNameThatCanAcceptGenerics())
+      || (BorrowedMut? && underlying.EndsWithNameThatCanAcceptGenerics())
+      || (ImplType? && underlying.EndsWithNameThatCanAcceptGenerics())
+      || (DynType? && underlying.EndsWithNameThatCanAcceptGenerics())
+      || (IntersectionType? && right.EndsWithNameThatCanAcceptGenerics())
+      || ((TSynonym? || TMetaData?) && display.EndsWithNameThatCanAcceptGenerics())
+    }
+    function ReplaceMap(mapping: map<Type, Type>): Type {
+      Replace((t: Type) => if t in mapping then mapping[t] else t)
+    }
+    function Replace(mapping: Type -> Type): Type {
+      var r :=
+        match this {
+          case U8 | U16 | U32 | U64 | U128 | I8 | I16 | I32 | I64 | I128 | USIZE | Bool => this
+          case TIdentifier(_) => this
+          case TypeFromPath(path) => this
+          case TypeApp(baseName, arguments) =>
+            this.(baseName := baseName.Replace(mapping),
+            arguments := Std.Collections.Seq.Map(
+              t requires t in arguments => t.Replace(mapping), arguments))
+          case Borrowed(underlying) => this.(underlying := underlying.Replace(mapping))
+          case BorrowedMut(underlying) => this.(underlying := underlying.Replace(mapping))
+          case ImplType(underlying) => this.(underlying := underlying.Replace(mapping))
+          case DynType(underlying) => this.(underlying := underlying.Replace(mapping))
+          case TupleType(arguments) =>
+            this.(
+            arguments := Std.Collections.Seq.Map(
+              t requires t in arguments => t.Replace(mapping), arguments))
+          case FnType(arguments, returnType) =>
+            this.(arguments := Std.Collections.Seq.Map(
+              t requires t in arguments => t.Replace(mapping), arguments),
+            returnType := returnType.Replace(mapping))
+          case IntersectionType(left, right) =>
+            this.(left := left.Replace(mapping), right := right.Replace(mapping))
+          case Array(underlying, size) =>
+            this.(underlying := underlying.Replace(mapping))
+          case TSynonym(display, base) =>
+            this.(display := display.Replace(mapping), base := base.Replace(mapping))
+          case TMetaData(display, copySemantics, overflow) =>
+            this.(display := display.Replace(mapping))
+        };
+      mapping(r)
+    }
+
+    function Fold<T(!new)>(acc: T, f: (T, Type) -> T): T
+      // Traverses all types in a random order
+    {
+      var newAcc := f(acc, this);
+      match this {
+        case U8 | U16 | U32 | U64 | U128 | I8 | I16 | I32 | I64 | I128 | USIZE | Bool => newAcc
+        case TIdentifier(_) => newAcc
+        case TypeFromPath(path) => newAcc
+        case TypeApp(baseName, arguments) =>
+          var newAcc := baseName.Fold(newAcc, f);
+          FoldLeft(
+            (acc: T, argType: Type) requires argType in arguments => argType.Fold(acc, f),
+            newAcc,
+            arguments)
+        case Borrowed(underlying) => underlying.Fold(newAcc, f)
+        case BorrowedMut(underlying) => underlying.Fold(newAcc, f)
+        case ImplType(underlying) => underlying.Fold(newAcc, f)
+        case DynType(underlying) => underlying.Fold(newAcc, f)
+        case TupleType(arguments) =>
+          FoldLeft(
+            (acc: T, argType: Type) requires argType in arguments => argType.Fold(acc, f),
+            newAcc, arguments)
+        case FnType(arguments, returnType) =>
+          returnType.Fold(
+            FoldLeft(
+              (acc: T, argType: Type) requires argType in arguments => argType.Fold(acc, f),
+              newAcc, arguments),
+            f)
+        case IntersectionType(left, right) =>
+          right.Fold(left.Fold(newAcc, f), f)
+        case Array(underlying, size) => underlying.Fold(newAcc, f)
+        case TSynonym(display, base) => display.Fold(newAcc, f)
+        case TMetaData(display, _, _) => display.Fold(newAcc, f)
+      }
+    }
+
+    predicate IsAutoSize() {
+      U8? || U16? || U32? || U64? || U128? || I8? || I16? || I32? || I64? || I128? || USIZE?
+      || (TSynonym? && base.IsAutoSize())
+      || (TMetaData? && display.IsAutoSize())
+    }
+
+    predicate CanReadWithoutClone() {
+      IsAutoSize() || Bool?
+      || IsPointer()
+      || (TSynonym? && base.CanReadWithoutClone())
+      || (TMetaData? && (copySemantics || display.CanReadWithoutClone()))
+    }
+    predicate IsRcOrBorrowedRc() {
+      (TypeApp? && baseName == RcType) ||
+      (Borrowed? && underlying.IsRcOrBorrowedRc()) ||
+      (TSynonym? && base.IsRcOrBorrowedRc())
+    }
+    function ExtractMaybePlacebo(): Option<Type> {
+      match this {
+        case TypeApp(wrapper, arguments) =>
+          if wrapper == TypeFromPath(MaybePlaceboPath)
+             && |arguments| == 1
+          then
+            Some(arguments[0])
+          else
+            None
+        case _ => None
+      }
+    }
+    function ExtractMaybeUninitArrayElement(): Option<Type> {
+      if this.IsObjectOrPointer() then
+        var s := this.ObjectOrPointerUnderlying();
+        if s.Array? && IsMaybeUninitType(s.underlying) then
+          Some(MaybeUninitTypeUnderlying(s.underlying))
+        else if s.IsMultiArray() && IsMaybeUninitType(s.MultiArrayUnderlying()) then
+          Some(MaybeUninitTypeUnderlying(s.MultiArrayUnderlying()))
+        else
+          None
+      else
+        None
+    }
+    function ToString(ind: string): string {
+      match this {
+        case Bool() => "bool"
+        case TIdentifier(underlying) => underlying
+        case TypeFromPath(underlying) => underlying.ToString()
+        case Borrowed(underlying) => "&" + underlying.ToString(ind)
+        case BorrowedMut(underlying) => "&mut " + underlying.ToString(ind)
+        case ImplType(underlying) => "impl " + underlying.ToString(ind)
+        case DynType(underlying) => "dyn " + underlying.ToString(ind)
+        case FnType(arguments, returnType) =>
+          "::std::ops::Fn("+
+          SeqToString(arguments, (arg: Type) requires arg < this =>
+                        arg.ToString(ind + IND), ", ")
+          +") -> " + returnType.ToString(ind + IND)
+        case IntersectionType(left, right) =>
+          left.ToString(ind) + " + " + right.ToString(ind)
+        case TupleType(args) =>
+          (if args == [] then
+             "()"
+           else
+             "(" +
+             SeqToString(args, (arg: Type) requires arg < this => arg.ToString(ind + IND), ", ")
+             + ")")
+        case TypeApp(base, args) =>
+          base.ToString(ind) +
+          (if args == [] then
+             ""
+           else
+             "<" +
+             SeqToString(args, (arg: Type) requires arg < this => arg.ToString(ind + IND), ", ")
+             + ">")
+
+        case U8() => "u8"
+        case U16() => "u16"
+        case U32() => "u32"
+        case U64() => "u64"
+        case U128() => "u128"
+        case I8() => "i8"
+        case I16() => "i16"
+        case I32() => "i32"
+        case I64() => "i64"
+        case I128() => "i128"
+        case USIZE() => "usize"
+        case Array(underlying, size) => "[" + underlying.ToString(ind) + (if size.Some? then "; " + size.value else "") + "]"
+        case TSynonym(display, base) => display.ToString(ind)
+        case TMetaData(display, _, _) => display.ToString(ind)
+      }
+    }
+
+    function Apply1(arg: Type): Type {
+      TypeApp(this, [arg])
+    }
+
+    function Apply(args: seq<Type>): Type {
+      TypeApp(this, args)
+    }
+
+    function ToOwned(): Type {
+      match this {
+        case Borrowed(x) => x
+        case BorrowedMut(x) => x
+        case x => x
+      }
+    }
+
+    function ToNullExpr(): Expr
+      requires IsObjectOrPointer()
+    {
+      assert Expand().IsObject() || Expand().IsPointer();
+      if Expand().IsObject() then
+        Object.FSel("null").Apply0()
+      else
+        Ptr.FSel("null").Apply0()
+    }
+
+    predicate IsMultiArray() {
+      var t := Expand();
+      t.TypeApp? &&
+      var baseName := t.baseName;
+      var args := t.arguments;
+      |args| == 1 &&
+      baseName.TypeFromPath? && baseName.path.PMemberSelect? &&
+      baseName.path.base == dafny_runtime &&
+      |baseName.path.name| >= 5 && baseName.path.name[0..5] == "Array"
+    }
+
+    function MultiArrayClass(): string
+      requires IsMultiArray()
+    {
+      this.Expand().baseName.path.name
+    }
+
+    function MultiArrayUnderlying(): Type
+      requires IsMultiArray()
+    {
+      this.Expand().arguments[0]
+    }
+
+    // Given an array type like *mut [T], produces the type *mut[MaybeUninit<T>]
+    // Same for *mut ::dafny_runtime::Array2<T> that becomes *mut ::dafny_runtime::Array2<MaybeUninit<T>>
+    function TypeAtInitialization(): Type {
+      if this.IsObjectOrPointer() then
+        var s := this.ObjectOrPointerUnderlying();
+        if s.Array? && s.size.None? then
+          var newUnderlying := Array(MaybeUninitType(s.underlying), None);
+          if this.IsObject() then ObjectType(newUnderlying) else PtrType(newUnderlying)
+        else if s.IsMultiArray() then
+          var newUnderlying := TypeApp(s.Expand().baseName, [MaybeUninitType(s.Expand().arguments[0])]);
+          if this.IsObject() then ObjectType(newUnderlying) else PtrType(newUnderlying)
+        else
+          this
+      else
+        this
+    }
+
+    predicate IsMaybeUninit() {
+      TypeApp? && baseName.TypeFromPath?
+      && baseName.path == MaybeUninitPath && |this.arguments| == 1
+    }
+
+    predicate IsUninitArray() {
+      if IsObjectOrPointer() then
+        var s := ObjectOrPointerUnderlying().Expand();
+        if s.Array? && s.size.None? then
+          s.underlying.IsMaybeUninit()
+        else if s.IsMultiArray() then
+          s.arguments[0].IsMaybeUninit()
+        else
+          false
+      else
+        false
+    }
+    predicate IsBox() {
+      match this {
+        case TypeApp(TypeFromPath(o), elems1) =>
+          o == BoxPath && |elems1| == 1
+        case _ => false
+      }
+    }
+    // Every type that needs to be .as_ref() to become purely borrowed
+    predicate NeedsAsRefForBorrow() {
+      if Borrowed? then
+        underlying.IsBox() || underlying.IsRc()
+      else
+        IsBox() || IsRc()
+    }
+    function BoxUnderlying(): Type
+      requires IsBox()
+    {
+      match this {
+        case TypeApp(TypeFromPath(o), elems1) =>
+          elems1[0]
+      }
+    }
+    predicate IsObject() {
+      match this {
+        case TypeApp(TypeFromPath(o), elems1) =>
+          o == ObjectPath &&
+          |elems1| == 1
+        case _ => false
+      }
+    }
+    predicate IsPointer() {
+      match this {
+        case TypeApp(TypeFromPath(o), elems1) =>
+          o == PtrPath &&
+          |elems1| == 1
+        case _ => false
+      }
+    }
+    predicate IsObjectOrPointer() {
+      this.Expand().IsPointer() || this.Expand().IsObject()
+    } by method {
+      var t := this.Expand();
+      return t.IsPointer() || t.IsObject();
+    }
+    function ObjectOrPointerUnderlying(): Type
+      requires IsObjectOrPointer()
+    {
+      match Expand() {
+        case TypeApp(_, elems1) =>
+          elems1[0]
+      }
+    }
+
+    predicate IsBuiltinCollection() {
+      match this.Expand() {
+        case TypeApp(TypeFromPath(PMemberSelect(PMemberSelect(Global(), "dafny_runtime"), tpe)), elems1) =>
+          || ((tpe == "Set" || tpe == "Sequence" || tpe == "Multiset") && |elems1| == 1)
+          || (tpe == "Map" && |elems1| == 2)
+        case _ => false
+      }
+    }
+
+    function GetBuiltinCollectionElement(): Type
+      requires IsBuiltinCollection()
+    {
+      match this.Expand() {
+        case TypeApp(TypeFromPath(PMemberSelect(PMemberSelect(Global(), "dafny_runtime"), tpe)), elems) =>
+          if tpe == "Map" then elems[1] else elems[0]
+      }
+    }
+
+    predicate IsRc() {
+      this.TypeApp? && this.baseName == RcType && |arguments| == 1
+    }
+    function RcUnderlying(): Type
+      requires IsRc()
+    {
+      arguments[0]
+    }
+  }
+
+  function SystemTupleType(elements: seq<Type>): Type {
+    dafny_runtime.MSel("_System").MSel("Tuple" + Strings.OfNat(|elements|)).AsType().Apply(elements)
+  }
+
+  const global := Global()
+  const std: Path := global.MSel("std")
+  const cell := std.MSel("cell")
+  const RefcellType := cell.MSel("RefCell").AsType()
+  const dafny_runtime: Path := global.MSel("dafny_runtime")
+  const CloneTrait := std.MSel("clone").MSel("Clone").AsType()
+  const std_default_Default := std.MSel("default").MSel("Default")
+  const DefaultTrait := std_default_Default.AsType()
+  const AnyTrait := std.MSel("any").MSel("Any").AsType()
+  const StaticTrait := RawType("'static")
+  const DafnyType := dafny_runtime.MSel("DafnyType").AsType()
+  const DafnyPrint := dafny_runtime.MSel("DafnyPrint").AsType()
+  const DafnyTypeEq := dafny_runtime.MSel("DafnyTypeEq").AsType()
+  const Eq := std.MSel("cmp").MSel("Eq").AsType()
+  const Hash := std.MSel("hash").MSel("Hash").AsType()
+  const DafnyInt := dafny_runtime.MSel("DafnyInt").AsType()
+
+  function SystemTuple(elements: seq<Expr>): Expr {
+    var size := Strings.OfNat(|elements|);
+    StructBuild(dafny_runtime.MSel("_System").MSel("Tuple" + size).MSel("_T" + size).AsExpr(),
+                seq(|elements|, i requires 0 <= i < |elements| =>
+                  AssignIdentifier("_" + Strings.OfNat(i), elements[i])
+                  )
+    )
+  }
+
+  const MaybeUninitPath := std.MSel("mem").MSel("MaybeUninit")
+  const MaybeUninitPathType := MaybeUninitPath.AsType()
+  const MaybeUninitExpr := MaybeUninitPath.AsExpr()
+
+  function MaybeUninitType(underlying: Type): Type {
+    MaybeUninitPathType.Apply([underlying])
+  }
+  predicate IsMaybeUninitType(tpe: Type) {
+    tpe.TypeApp? && tpe.baseName == MaybeUninitPathType && |tpe.arguments| == 1
+  }
+  function MaybeUninitTypeUnderlying(tpe: Type): Type
+    requires IsMaybeUninitType(tpe)
+  {
+    tpe.arguments[0]
+  }
+  function MaybeUninitNew(underlying: Expr): Expr {
+    MaybeUninitPath.FSel("new").Apply([underlying])
+  }
+
+  const MaybePlaceboPath := dafny_runtime.MSel("MaybePlacebo")
+
+  function MaybePlaceboType(underlying: Type): Type {
+    MaybePlaceboPath.AsType().Apply1(underlying)
+  }
+
+
+  datatype Trait =
+    | Trait(
+        docString: string,
+        attributes: seq<Attribute>,
+        typeParams: seq<TypeParamDecl>,
+        tpe: Type,
+        parents: seq<Type>,
+        body: seq<ImplMember>)
+  {
+    function ToString(ind: string): string {
+      var tpConstraints := Std.Collections.Seq
+                           .Filter((typeParamDecl: TypeParamDecl) reads {} requires true => |typeParamDecl.constraints| > 0, typeParams);
+      var additionalConstraints :=
+        SeqToString(
+          tpConstraints,
+          (t: TypeParamDecl) => t.ToString(ind + IND), ",\n" + ind + IND);
+      var parents := if |parents| == 0 then "" else ": " + SeqToString(
+                       parents,
+                       (t: Type) => t.ToString(ind + IND),
+                       " + "
+                     );
+      var where :=
+        if additionalConstraints == "" then "" else
+        "\n"+ind+IND+"where\n" + ind + IND + additionalConstraints;
+      ToDocstringPrefix(docString, ind) +
+      Attribute.ToStringMultiple(attributes, ind) +
+      "pub trait " + tpe.ToString(ind) + parents + where
+      + " {" +
+      SeqToString(body, (member: ImplMember) => "\n" + ind + IND + member.ToString(ind + IND), "")
+      + (if |body| == 0 then "" else "\n" + ind) + "}"
+    }
+  }
+
+  datatype Impl =
+    | ImplFor(typeParams: seq<TypeParamDecl>, tpe: Type, forType: Type, body: seq<ImplMember>)
+    | Impl(typeParams: seq<TypeParamDecl>, tpe: Type, body: seq<ImplMember>)
+  {
+    function ToString(ind: string): string {
+      "impl" + TypeParamDecl.ToStringMultiple(typeParams, ind) + " " + tpe.ToString(ind)
+      + (if ImplFor? then "\n" + ind + IND + "for " + forType.ToString(ind + IND) else "")
+      + " {" +
+      SeqToString(body, (member: ImplMember) => "\n" + ind + IND + member.ToString(ind + IND), "")
+      + (if |body| == 0 then "" else "\n" + ind) + "}"
+    }
+  }
+  datatype ImplMember =
+    | RawImplMember(content: string)
+    | TypeDeclMember(name: string, rhs: Type) // When implementing traits
+    | FnDecl(docString: string, attributes: seq<Attribute>, pub: Visibility, fun: Fn)
+    | ImplMemberMacro(expr: Expr)
+  {
+    function ToString(ind: string): string {
+      if FnDecl? then
+        ToDocstringPrefix(docString, ind) +
+        Attribute.ToStringMultiple(attributes, ind) +
+        pub.ToString() + fun.ToString(ind)
+      else if ImplMemberMacro? then expr.ToString(ind) + ";"
+      else if TypeDeclMember? then "type " + name + " = " + rhs.ToString(ind) + ";"
+      else assert RawImplMember?; content
+    }
+  }
+  datatype Visibility = PUB | PRIV {
+    function ToString(): string {
+      if PUB? then "pub " else ""
+    }
+  }
+
+  datatype Formal =
+    Formal(name: string, tpe: Type)
+  {
+    static function ImplicitlyTyped(name: string): Formal {
+      Formal(name, TIdentifier("_"))
+    }
+    function Replace(ft: Type -> Type): Formal {
+      Formal(name, tpe.Replace(ft))
+    }
+    function Fold<T(!new)>(acc: T, ft: (T, Type) -> T): T {
+      tpe.Fold(acc, ft)
+    }
+    function ToString(ind: string): string {
+      if name == "self" && tpe.Expand() == SelfOwned then name
+      else if name == "self" && tpe == SelfBorrowed then "&" + name
+      else if name == "self" && tpe == SelfBorrowedMut then "&mut " + name
+      else if tpe.TIdentifier? && tpe.name == "_" then
+        name
+      else
+        name + ": " + tpe.ToString(ind)
+    }
+    static const selfBorrowed := Formal("self", SelfBorrowed)
+    static const selfOwned := Formal("self", SelfOwned)
+    static const selfBorrowedMut := Formal("self", SelfBorrowedMut)
+  }
+
+  datatype Pattern =
+    RawPattern(content: string)
+  {
+    function ToString(ind: string): string {
+      content
+    }
+  }
+
+  datatype MatchCase =
+    MatchCase(pattern: Pattern, rhs: Expr)
+  {
+    function Replace(mapping: Expr -> Expr, mappingType: Type -> Type): MatchCase {
+      MatchCase(pattern, rhs.Replace(mapping, mappingType))
+    }
+    function Fold<T(!new)>(acc: T, f: (T, Expr) -> T, ft: (T, Type) -> T): T {
+      rhs.Fold(acc, f, ft)
+    }
+    function ToString(ind: string): string
+    {
+      var newIndent := if rhs.Block? then ind else ind + IND;
+      var rhsString := rhs.ToString(newIndent);
+
+      pattern.ToString(ind) + " =>" +
+      if '\n' in rhsString && rhsString[0] != '{' then "\n" + ind + IND + rhsString
+      else " " + rhsString
+    }
+  }
+
+  datatype AssignIdentifier =
+    AssignIdentifier(identifier: string, rhs: Expr)
+  {
+    function Replace(f: Expr -> Expr, ft: Type -> Type): AssignIdentifier {
+      AssignIdentifier(identifier, rhs.Replace(f, ft))
+    }
+    function Fold<T(!new)>(acc: T, f: (T, Expr) -> T, ft: (T, Type) -> T): T {
+      rhs.Fold(acc, f, ft)
+    }
+    function ToString(ind: string): string
+    {
+      identifier + ": " + rhs.ToString(ind + IND)
+    }
+  }
+
+  // When a raw stream is given, try to put some indentation on it
+  function AddIndent(raw: string, ind: string): string {
+    if |raw| == 0 then raw
+    else if raw[0] in "[({" then
+      [raw[0]] + AddIndent(raw[1..], ind + IND)
+    else if raw[0] in "})]" && |ind| > 2 then
+      [raw[0]] + AddIndent(raw[1..], ind[..|ind|-2])
+    else if raw[0] == '\n' then
+      [raw[0]] + ind + AddIndent(raw[1..], ind)
+    else
+      [raw[0]] + AddIndent(raw[1..], ind)
+  }
+
+  function max(i: nat, j: nat): nat {
+    if i < j then j else i
+  }
+
+  datatype DeclareType = MUT | CONST
+
+  datatype Associativity = LeftToRight | RightToLeft | RequiresParentheses
+  datatype PrintingInfo =
+    | UnknownPrecedence()
+    | Precedence(precedence: nat)
+    | SuffixPrecedence(precedence: nat)
+    | PrecedenceAssociativity(precedence: nat, associativity: Associativity)
+  {
+    predicate NeedParenthesesFor(underlying: PrintingInfo) {
+      if UnknownPrecedence? then true
+      else if underlying.UnknownPrecedence? then true
+      else if precedence <= underlying.precedence then true
+      else false
+    }
+    predicate NeedParenthesesForLeft(underlying: PrintingInfo) {
+      if UnknownPrecedence? then true
+      else if underlying.UnknownPrecedence? then true
+      else if precedence <= underlying.precedence then
+        precedence < underlying.precedence || !PrecedenceAssociativity? || !associativity.LeftToRight?
+      else false
+    }
+    predicate NeedParenthesesForRight(underlying: PrintingInfo) {
+      if UnknownPrecedence? then true
+      else if underlying.UnknownPrecedence? then true
+      else if precedence <= underlying.precedence then
+        precedence < underlying.precedence || !PrecedenceAssociativity? || !associativity.RightToLeft?
+      else false
+    }
+    lemma Tests()
+      ensures PrecedenceAssociativity(20, LeftToRight)
+              .NeedParenthesesForLeft(PrecedenceAssociativity(20, LeftToRight)) == false
+      ensures PrecedenceAssociativity(20, LeftToRight)
+              .NeedParenthesesForRight(PrecedenceAssociativity(20, LeftToRight)) == true
+      ensures PrecedenceAssociativity(20, RightToLeft)
+              .NeedParenthesesForRight(PrecedenceAssociativity(20, RightToLeft)) == false
+      ensures PrecedenceAssociativity(20, RightToLeft)
+              .NeedParenthesesForLeft(PrecedenceAssociativity(20, RightToLeft)) == true
+      ensures PrecedenceAssociativity(20, LeftToRight)
+              .NeedParenthesesForLeft(PrecedenceAssociativity(30, LeftToRight)) == true
+      ensures PrecedenceAssociativity(20, RightToLeft)
+              .NeedParenthesesForRight(PrecedenceAssociativity(30, RightToLeft)) == true
+    {
+    }
+  }
+
+  function AssignVar(name: string, rhs: Expr): Expr {
+    Expr.Assign(Some(LocalVar(name)), rhs)
+  }
+
+  function AssignMember(on: Expr, field: string, rhs: Expr): Expr {
+    Expr.Assign(Some(SelectMember(on, field)), rhs)
+  }
+
+  datatype AssignLhs =
+    LocalVar(name: string) |
+    SelectMember(on: Expr, field: string) |
+    ExtractTuple(names: seq<string>) |
+    Index(expr: Expr, indices: seq<Expr>)
+
+  datatype Expr =
+      RawExpr(content: string)
+    | ExprFromType(tpe: Type)
+    | Identifier(name: string) // Never empty
+    | Match(matchee: Expr, cases: seq<MatchCase>)
+    | StmtExpr(stmt: Expr, rhs: Expr)
+    | Block(underlying: Expr)
+    | StructBuild(underlying: Expr, assignments: seq<AssignIdentifier>)
+    | Tuple(arguments: seq<Expr>)
+    | UnaryOp(op1: string, underlying: Expr, format: Format.UnaryOpFormat)
+    | BinaryOp(op2: string, left: Expr, right: Expr, format2: Format.BinaryOpFormat)
+    | TypeAscription(left: Expr, tpe: Type)          // underlying as tpe
+    | TraitCast(leftTpe: Type, tpe: Type)            // < leftTpe as tpe >
+    | LiteralInt(value: string)
+    | LiteralBool(bvalue: bool)
+    | LiteralString(value: string, binary: bool, verbatim: bool)
+    | DeclareVar(declareType: DeclareType, name: string, optType: Option<Type>, optRhs: Option<Expr>) // let mut name: optType = optRhs;
+    | Assign(names: Option<AssignLhs>, rhs: Expr)           // name1, name2 = rhs;
+    | IfExpr(cond: Expr, thn: Expr, els: Expr)       // if cond { thn } else { els }
+    | Loop(optCond: Option<Expr>, underlying: Expr)  // loop { body }
+    | For(name: string, range: Expr, body: Expr)     // for name in range { body }
+    | Labelled(lbl: string, underlying: Expr)        // label lbl { expr }
+    | Break(optLbl: Option<string>)                  // break lbl;
+    | Continue(optLbl: Option<string>)               // continue optLabel;
+    | Return(optExpr: Option<Expr>)                  // return optExpr;
+    | CallType(obj: Expr, typeArguments: seq<Type>) // obj::<...type parameters>
+    | Call(obj: Expr, arguments: seq<Expr>)          // obj(...arguments)
+    | Select(obj: Expr, name: string)                // obj.name
+    | SelectIndex(obj: Expr, range: Expr)            // obj[range]
+    | ExprFromPath(path: Path)                       // ::dafny_runtime::int! for example
+    | FunctionSelect(obj: Expr, name: string)        // objType::name
+    | Lambda(params: seq<Formal>, retType: Option<Type>, body: Expr) // move |<params>| -> retType { body }
+  {
+    function Replace(f: Expr -> Expr, ft: Type -> Type): Expr {
+      var r :=
+        match this {
+          case RawExpr(content) => this
+          case ExprFromType(tpe) => ExprFromType(tpe.Replace(ft))
+          case Identifier(name) => this
+          case Match(matchee, cases) =>
+            Match(matchee.Replace(f, ft),
+                  Std.Collections.Seq.Map(
+                    c requires c in cases => c.Replace(f, ft), cases))
+          case StmtExpr(stmt, rhs) =>
+            StmtExpr(stmt.Replace(f, ft), rhs.Replace(f, ft))
+          case Block(underlying) =>
+            Block(underlying.Replace(f, ft))
+          case StructBuild(underlying, assignments) =>
+            StructBuild(underlying.Replace(f, ft), Std.Collections.Seq.Map(
+                          a requires a in assignments =>
+                            a.Replace(f, ft),
+                          assignments))
+          case Tuple(arguments) =>
+            Tuple(
+              Std.Collections.Seq.Map(
+                e requires e in arguments =>
+                  e.Replace(f, ft), arguments))
+          case UnaryOp(op1, underlying, format) =>
+            UnaryOp(op1, underlying.Replace(f, ft), format)
+          case BinaryOp(op2, left, right, format2) =>
+            BinaryOp(op2, left.Replace(f, ft), right.Replace(f, ft), format2)
+          case TypeAscription(left, tpe) => TypeAscription(left.Replace(f, ft), tpe.Replace(ft))
+          case TraitCast(leftTpe, tpe) => TraitCast(leftTpe.Replace(ft), tpe.Replace(ft))
+          case LiteralInt(value) => this
+          case LiteralBool(bvalue) => this
+          case LiteralString(value, binary, verbatim) => this
+          case DeclareVar(declareType, name, optType, optRhs) =>
+            DeclareVar(
+              declareType, name,
+              if optType.None? then optType else Some(optType.value.Replace(ft)),
+              if optRhs.None? then optRhs else Some(optRhs.value.Replace(f, ft)))
+          case Assign(names, rhs) => Assign(names, rhs.Replace(f, ft))
+          case IfExpr(cond, thn, els) => IfExpr(cond.Replace(f, ft), thn.Replace(f, ft), els.Replace(f, ft))
+          case Loop(optCond, underlying) =>
+            Loop(if optCond.None? then None else Some(optCond.value.Replace(f, ft)), underlying.Replace(f, ft))
+          case For(name, range, body) =>
+            For(name, range.Replace(f, ft), body.Replace(f, ft))
+          case Labelled(lbl, underlying) =>
+            Labelled(lbl, underlying.Replace(f, ft))
+          case Break(optLbl) => this
+          case Continue(optLbl) => this
+          case Return(optExpr) => Return(if optExpr.None? then None else Some(optExpr.value.Replace(f, ft)))
+          case CallType(obj, typeArguments) =>
+            CallType(obj.Replace(f, ft), Std.Collections.Seq.Map((tp: Type) => tp.Replace(ft), typeArguments))
+          case Call(obj, arguments) =>
+            Call(
+              obj.Replace(f, ft),
+              Std.Collections.Seq.Map((a: Expr) requires a < this => a.Replace(f, ft), arguments))
+          case Select(obj, name) => Select(obj.Replace(f, ft), name)
+          case SelectIndex(obj, range) => SelectIndex(obj.Replace(f, ft), range.Replace(f, ft))
+          case ExprFromPath(path) => ExprFromPath(path)
+          case FunctionSelect(obj, name) => FunctionSelect(obj.Replace(f, ft), name)
+          case Lambda(params, retType, body) =>
+            Lambda(
+              Std.Collections.Seq.Map(
+                (f: Formal) requires f < this => f.Replace(ft),
+                params),
+              if retType.None? then None else Some(retType.value.Replace(ft)),
+              body.Replace(f, ft))
+        };
+      f(r)
+    }
+    function Fold<T(!new)>(acc: T, f: (T, Expr) -> T, ft: (T, Type) -> T): T {
+      var acc := f(acc, this);
+      match this {
+        case RawExpr(content) => acc
+        case ExprFromType(tpe) => tpe.Fold(acc, ft)
+        case Identifier(name) => acc
+        case Match(matchee, cases) =>
+          var acc := matchee.Fold(acc, f, ft);
+          FoldLeft(
+            (acc: T, c: MatchCase) requires c in cases => c.Fold(acc, f, ft),
+            acc,
+            cases)
+        case StmtExpr(stmt, rhs) =>
+          rhs.Fold(stmt.Fold(acc, f, ft), f, ft)
+        case Block(underlying) => underlying.Fold(acc, f, ft)
+        case StructBuild(underlying, assignments) =>
+          FoldLeft(
+            (acc: T, c: AssignIdentifier) requires c in assignments => c.Fold(acc, f, ft),
+            underlying.Fold(acc, f, ft),
+            assignments
+          )
+        case Tuple(arguments) =>
+          FoldLeft(
+            (acc: T, e: Expr) requires e in arguments => e.Fold(acc, f, ft),
+            acc,
+            arguments
+          )
+        case UnaryOp(op1, underlying, format) => underlying.Fold(acc, f, ft)
+        case BinaryOp(op2, left, right, format2) =>
+          right.Fold(left.Fold(acc, f, ft), f, ft)
+        case TypeAscription(left, tpe) => tpe.Fold(left.Fold(acc, f, ft), ft)
+        case TraitCast(leftTpe, tpe) => tpe.Fold(leftTpe.Fold(acc, ft), ft)
+        case LiteralInt(value) => acc
+        case LiteralBool(bvalue) => acc
+        case LiteralString(value, binary, verbatim) => acc
+        case DeclareVar(declareType, name, optType, optRhs) =>
+          var acc := if optType.None? then acc else optType.value.Fold(acc, ft);
+          if optRhs.None? then acc else optRhs.value.Fold(acc, f, ft)
+        case Assign(names, rhs) => rhs.Fold(acc, f, ft)
+        case IfExpr(cond, thn, els) =>
+          var acc := cond.Fold(acc, f, ft);
+          var acc := thn.Fold(acc, f, ft);
+          els.Fold(acc, f, ft)
+        case Loop(optCond, underlying) =>
+          var acc := if optCond.None? then acc else optCond.value.Fold(acc, f, ft);
+          underlying.Fold(acc, f, ft)
+        case For(name, range, body) =>
+          var acc := range.Fold(acc, f, ft);
+          body.Fold(acc, f, ft)
+        case Labelled(lbl, underlying) => underlying.Fold(acc, f, ft)
+        case Break(optLbl) => acc
+        case Continue(optLbl) => acc
+        case Return(optExpr) => if optExpr.None? then acc else optExpr.value.Fold(acc, f, ft)
+        case CallType(obj, typeArguments) =>
+          var acc := obj.Fold(acc, f, ft);
+          FoldLeft(
+            (acc: T, t: Type) requires t in typeArguments =>
+              t.Fold(acc, ft),
+            acc,
+            typeArguments
+          )
+        case Call(obj, arguments) =>
+          var acc := obj.Fold(acc, f, ft);
+          FoldLeft(
+            (acc: T, e: Expr) requires e in arguments =>
+              e.Fold(acc, f, ft),
+            acc,
+            arguments
+          )
+        case Select(obj, name) =>
+          obj.Fold(acc, f, ft)
+        case SelectIndex(obj, range) =>
+          range.Fold(obj.Fold(acc, f, ft), f, ft)
+        case ExprFromPath(path) => acc
+        case FunctionSelect(obj, name) =>
+          obj.Fold(acc, f, ft)
+        case Lambda(params, retType, body) =>
+          var acc := FoldLeft(
+                       (acc: T, param: Formal) requires param in params =>
+                         param.Fold(acc, ft),
+                       acc, params);
+          var acc := if retType.None? then acc else retType.value.Fold(acc, ft);
+          body.Fold(acc, f, ft)
+      }
+    }
+
+    predicate NoExtraSemicolonAfter() {
+      DeclareVar? || Assign? || Break? || Continue? || Return? || For? ||
+      (RawExpr? && |content| > 0 && content[|content| - 1] == ';')
+    }
+    // Taken from https://doc.rust-lang.org/reference/expressions.html
+    const printingInfo: PrintingInfo :=
+      match this {
+        case RawExpr(_) => UnknownPrecedence()
+        case ExprFromType(_) => Precedence(1)
+        case Identifier(_) => Precedence(1)
+        case LiteralInt(_) => Precedence(1)
+        case LiteralBool(_) => Precedence(1)
+        case LiteralString(_, _, _) => Precedence(1)
+        // Paths => Precedence(1)
+        // Method call => Precedence(2)
+        // Field expression => PrecedenceAssociativity(3, LeftToRight)
+        // case function call | ArrayIndexing => Precedence(4)
+        case UnaryOp(op, underlying, format) =>
+          match op {
+            case "?" => SuffixPrecedence(5)
+            case "-" | "*" | "!" | "&" | "&mut" => Precedence(6)
+            case _ => UnknownPrecedence()
+          }
+        case Select(underlying, name) => PrecedenceAssociativity(2, LeftToRight)
+        case SelectIndex(underlying, range) => PrecedenceAssociativity(2, LeftToRight)
+        case ExprFromPath(underlying) => Precedence(2)
+        case FunctionSelect(underlying, name) => PrecedenceAssociativity(2, LeftToRight)
+        case CallType(_, _) => PrecedenceAssociativity(2, LeftToRight)
+        case Call(_, _) => PrecedenceAssociativity(2, LeftToRight)
+        case TypeAscription(left, tpe) =>
+          PrecedenceAssociativity(10, LeftToRight)
+        case TraitCast(leftTpe, tpe) => Precedence(1)
+        case BinaryOp(op2, left, right, format) =>
+          match op2 {
+            case "*" | "/" | "%" => PrecedenceAssociativity(20, LeftToRight)
+            case "+" | "-" => PrecedenceAssociativity(30, LeftToRight)
+            case "<<" | ">>" =>
+              // x as u16 << 6 is parsed as x as u16<... and expect a generic argument
+              if op2 == "<<" && left.TypeAscription? && left.tpe.EndsWithNameThatCanAcceptGenerics() then
+                PrecedenceAssociativity(9, LeftToRight)
+              else
+                PrecedenceAssociativity(40, LeftToRight)
+            case "&" => PrecedenceAssociativity(50, LeftToRight)
+            case "^" => PrecedenceAssociativity(60, LeftToRight)
+            case "|" => PrecedenceAssociativity(70, LeftToRight)
+            case "==" | "!=" | "<" | ">" | "<=" | ">=" =>
+              if (op2 == "<" || op2 == "<=") && left.TypeAscription? && left.tpe.EndsWithNameThatCanAcceptGenerics() then
+                PrecedenceAssociativity(9, LeftToRight)
+              else
+                PrecedenceAssociativity(80, RequiresParentheses)
+            case "&&" => PrecedenceAssociativity(90, LeftToRight)
+            case "||" => PrecedenceAssociativity(100, LeftToRight)
+            case ".." | "..=" => PrecedenceAssociativity(110, RequiresParentheses)
+            case "=" | "+=" | "-=" | "*=" | "/=" | "%=" | "&=" | "|=" | "^=" | "<<=" | ">>=" =>
+              if op2 == "<<=" && left.TypeAscription? && left.tpe.EndsWithNameThatCanAcceptGenerics() then
+                PrecedenceAssociativity(9, LeftToRight)
+              else
+                PrecedenceAssociativity(110, RightToLeft)
+            case _ => PrecedenceAssociativity(0, RequiresParentheses)
+          }
+        case Lambda(_, _, _) => PrecedenceAssociativity(300, LeftToRight)
+        case _ => UnknownPrecedence()
+      }
+
+    predicate LeftRequiresParentheses(left: Expr) {
+      printingInfo.NeedParenthesesForLeft(left.printingInfo)
+    }
+    function LeftParentheses(left: Expr): (string, string) {
+      if LeftRequiresParentheses(left) then
+        ("(", ")")
+      else
+        ("", "")
+    }
+
+    predicate RightRequiresParentheses(right: Expr) {
+      printingInfo.NeedParenthesesForRight(right.printingInfo)
+    }
+
+
+    function RightParentheses(right: Expr): (string, string) {
+      if RightRequiresParentheses(right) then
+        ("(", ")")
+      else
+        ("", "")
+    }
+
+    function RightMostIdentifier(): Option<string> {
+      match this {
+        case FunctionSelect(_, id) => Some(id)
+        case ExprFromPath(p) => p.RightMostIdentifier()
+        case Identifier(id) => Some(id)
+        case _ => None
+      }
+    }
+
+    static function MaxHashes(s: string, currentHashes: string, mostHashes: string): string {
+      if |s| == 0 then if |currentHashes| < |mostHashes| then mostHashes else currentHashes else
+      if s[0..1] == "#" then MaxHashes(s[1..], currentHashes + "#", mostHashes)
+      else MaxHashes(s[1..], "", if |currentHashes| < |mostHashes| then mostHashes else currentHashes)
+    }
+
+    static function RemoveDoubleQuotes(s: string): string {
+      if |s| <= 1 then s else
+      if s[0..2] == @"""""" then @"""" + RemoveDoubleQuotes(s[2..]) else
+      s[0..1] + RemoveDoubleQuotes(s[1..])
+    }
+
+    function ToString(ind: string): string
+    {
+      match this {
+        case Identifier(name) => name
+        case ExprFromType(t) => t.ToString(ind)
+        case LiteralInt(number) => number
+        case LiteralBool(b) => if b then "true" else "false"
+        case LiteralString(characters, binary, verbatim) =>
+          var hashes := if verbatim then MaxHashes(characters, "", "") + "#" else "";
+          (if binary then "b" else "") + (if verbatim then "r" + hashes else "") +
+          "\"" + (if verbatim then RemoveDoubleQuotes(characters) else characters) + "\"" + hashes
+        case Match(matchee, cases) =>
+          "match " + matchee.ToString(ind + IND) + " {" +
+          SeqToString(cases,
+                      (c: MatchCase) requires c in cases =>
+                        "\n" + ind + IND + c.ToString(ind + IND) + ",", "") +
+          "\n" + ind + "}"
+        case StmtExpr(stmt, rhs) => // They are built like StmtExpr(1, StmtExpr(2, StmtExpr(3, ...)))
+          if stmt.RawExpr? && stmt.content == "" then rhs.ToString(ind) else
+          stmt.ToString(ind) + (if stmt.NoExtraSemicolonAfter() then "" else ";") +
+          "\n" + ind + rhs.ToString(ind)
+        case Block(underlying) =>
+          "{\n" + ind + IND + underlying.ToString(ind + IND) + "\n" + ind + "}"
+        case IfExpr(cond, thn, els) =>
+          "if " + cond.ToString(ind + IND) + " {\n" + ind + IND + thn.ToString(ind + IND) +
+          "\n" + ind + "}" +
+          if els == RawExpr("") then "" else
+          " else {\n" + ind + IND + els.ToString(ind + IND) + "\n" + ind + "}"
+        case StructBuild(name, assignments) =>
+          if |assignments| > 0 && assignments[0].identifier == "0" then
+            // Numeric
+            name.ToString(ind) + " (" +
+            SeqToString(assignments, (assignment: AssignIdentifier)
+                        requires assignment in assignments
+                        =>
+                          "\n" + ind + IND + assignment.rhs.ToString(ind + IND), ",") +
+            (if |assignments| > 1 then "\n" + ind else "") + ")"
+          else
+            name.ToString(ind) + " {" +
+            SeqToString(assignments, (assignment: AssignIdentifier)
+                        requires assignment in assignments
+                        =>
+                          "\n" + ind + IND + assignment.ToString(ind + IND), ",") +
+            (if |assignments| > 0 then "\n" + ind else "") + "}"
+        case Tuple(arguments) =>
+          "(" +
+          SeqToString(arguments, (arg: Expr)
+                      requires arg in arguments
+                      =>
+                        "\n" + ind + IND + arg.ToString(ind + IND), ",") +
+          (if |arguments| > 0 then "\n" + ind else "") + ")"
+
+        case UnaryOp(op, underlying, format) =>
+          var isPattern := |op| >= 1 && op[0..1] == "{";
+          var isUnsafe := op == "unsafe";
+          var (leftP, rightP) :=
+            if !isPattern && !isUnsafe && printingInfo.NeedParenthesesFor(underlying.printingInfo) then
+              ("(", ")")
+            else
+              ("", "");
+          var opToRight := op == "?" || (
+                             |op| >= 2 && op[0..2] == "/*" // comment
+                           ) || isPattern;
+          var leftOp := if opToRight then "" else op;
+          var leftOp := if (op == "&mut" || isUnsafe) && leftP != "(" then leftOp + " " else leftOp;
+          var rightOp := if opToRight then op else "";
+          leftOp + leftP  + underlying.ToString(ind) + rightP + rightOp
+        case TypeAscription(left, tpe) =>
+          var (leftLeftP, leftRightP) := LeftParentheses(left);
+          leftLeftP + left.ToString(IND) + leftRightP + " as " + tpe.ToString(IND)
+        case TraitCast(leftTpe, tpe) =>
+          "<" + leftTpe.ToString(IND) + " as " + tpe.ToString(IND) + ">"
+        case BinaryOp(op2, left, right, format) =>
+          var (leftLeftP, leftRighP) := LeftParentheses(left);
+          var (rightLeftP, rightRightP) := RightParentheses(right);
+          var opRendered := " " + op2 + " ";
+          var indLeft := if leftLeftP == "(" then ind + IND else ind;
+          var indRight := if rightLeftP == "(" then ind + IND else ind;
+          leftLeftP + left.ToString(indLeft) + leftRighP + opRendered + rightLeftP + right.ToString(indRight) + rightRightP
+        case DeclareVar(declareType, name, optType, optExpr) =>
+          "let " + (if declareType == MUT then "mut " else "") +
+          name + (if optType.Some? then ": " + optType.value.ToString(ind + IND) else "") +
+
+          (if optExpr.Some? then
+             var optExprString := optExpr.value.ToString(ind + IND);
+             if optExprString == "" then
+               "= /*issue with empty RHS*/" +
+               if optExpr.value.RawExpr? then "Empty Raw expr" else
+               if optExpr.value.LiteralString? then "Empty string literal" else
+               if optExpr.value.LiteralInt? then "Empty int literal" else
+               "Another case"
+             else " = " + optExprString else "") + ";"
+        case Assign(names, expr) =>
+          var lhs := match names {
+            case Some(LocalVar(name)) => name + " = "
+            case Some(SelectMember(member, field)) =>
+              var (leftP, rightP) := Select(member, field).LeftParentheses(member);
+              leftP + member.ToString(ind) + rightP + "." + field + " = "
+            case Some(ExtractTuple(names)) => "(" + SeqToString(names, (name: string) => name, ",") + ") = "
+            case Some(Index(e, indices)) =>
+              var (leftP, rightP) := Call(e, indices).LeftParentheses(e);
+              leftP + e.ToString(ind) + rightP + "[" + SeqToString(indices,
+                                                                   (index: Expr) requires index in indices => index.ToString(ind + IND), "][")
+              + "] = "
+            case None => "_ = "
+          };
+          lhs + expr.ToString(ind + IND) + ";"
+        case Labelled(name, underlying) =>
+          "'" + name + ": " + underlying.ToString(ind)
+        case Break(optLbl) =>
+          match optLbl {
+            case Some(lbl) => "break '" + lbl + ";"
+            case None => "break;"
+          }
+        case Continue(optLbl) =>
+          match optLbl {
+            case Some(lbl) => "continue '" + lbl + ";"
+            case None => "continue;"
+          }
+        case Loop(optCond, underlying) =>
+          (match optCond {
+             case None => "loop"
+             case Some(c) => "while " + c.ToString(ind + IND)
+           }) + " {\n" + ind + IND + underlying.ToString(ind + IND) + "\n" + ind + "}"
+        case For(name, range, body) =>
+          "for "+ name +" in " + range.ToString(ind + IND) + " {\n" + ind + IND +
+          body.ToString(ind + IND) + "\n" + ind + "}"
+        case Return(optExpr) =>
+          "return" + (if optExpr.Some? then " " + optExpr.value.ToString(ind + IND) else "") + ";"
+        case CallType(expr, tpes) =>
+          var (leftP, rightP) := LeftParentheses(expr);
+          if tpes == [] then expr.ToString(ind) else
+          leftP + expr.ToString(ind) + rightP + "::<" +
+          SeqToString(tpes, (tpe: Type) => tpe.ToString(ind + IND), ", ") +">"
+
+        case Call(expr, args) =>
+          var (leftP, rightP) := LeftParentheses(expr);
+          var (leftCallP, rightCallP) := match expr.RightMostIdentifier() {
+            case Some("seq!") | Some("map!")  =>
+              ("[","]")
+            case Some("set!") | Some("multiset!") =>
+              ("{","}")
+            case _ =>
+              ("(", ")")
+          };
+          leftP + expr.ToString(ind) + rightP +
+          leftCallP + SeqToString(args, (arg: Expr) requires arg in args => arg.ToString(ind + IND), ", ")+ rightCallP
+        case Select(expression, name) =>
+          var (leftP, rightP) := LeftParentheses(expression);
+          leftP + expression.ToString(ind) + rightP + "." + name
+        case SelectIndex(expression, range) =>
+          var (leftP, rightP) := LeftParentheses(expression);
+          var rangeStr := range.ToString(ind + IND);
+          leftP + expression.ToString(ind) + rightP + "[" + rangeStr + "]"
+        case ExprFromPath(path) =>
+          path.ToString()
+        case FunctionSelect(expression, name) =>
+          var (leftP, rightP) := LeftParentheses(expression);
+          leftP + expression.ToString(ind) + rightP + "::" + name
+        case Lambda(params, retType, body) =>
+          "move |" + SeqToString(params, (arg: Formal) => arg.ToString(ind), ",") + "| " +
+          (if retType.Some? then
+             "-> " + retType.value.ToString(ind)
+           else "") +
+          (if retType.Some? && !body.Block? then
+             "{\n" + ind + IND + body.ToString(ind + IND) + "\n" + ind + "}"
+           else body.ToString(ind))
+        case r =>
+          assert r.RawExpr?; AddIndent(r.content, ind)
+      }
+    }
+    function Then(rhs2: Expr): Expr {
+      if this.StmtExpr? then
+        StmtExpr(stmt, rhs.Then(rhs2))
+      else if this == RawExpr("") then
+        rhs2
+      else
+        StmtExpr(this, rhs2)
+    }
+
+    // Helpers
+
+    function Sel(name: string): Expr {
+      Select(this, name)
+    }
+    function FSel(name: string): Expr {
+      FunctionSelect(this, name)
+    }
+    function ApplyType(typeArguments: seq<Type>): Expr {
+      if |typeArguments| == 0 then this else
+      CallType(this, typeArguments)
+    }
+    function ApplyType1(typeArgument: Type): Expr {
+      CallType(this, [typeArgument])
+    }
+    function Apply(arguments: seq<Expr>): Expr {
+      Call(this, arguments)
+    }
+
+    function Apply1(argument: Expr): Expr {
+      Call(this, [argument])
+    }
+
+    function Apply0(): Expr {
+      Call(this, [])
+    }
+
+    predicate IsLhsIdentifier() {
+      || this.Identifier?
+      || (&& this.Call?
+          &&
+             (|| (
+                   && this.obj.ExprFromPath? && this.obj.path == dafny_runtime.MSel("modify!")
+                   && |this.arguments| == 1 // modify!(self)
+                   && this.arguments[0].Identifier?)
+              || (
+                   && this.obj.ExprFromPath? && this.obj.path == dafny_runtime.MSel("md!")
+                   && |this.arguments| == 1 // md!(identifier.clone())
+                   && var lhs := this.arguments[0];
+                   && lhs.Call?
+                   && lhs.obj.Select?
+                   && lhs.obj.obj.Identifier?
+                 )))
+    }
+
+    function LhsIdentifierName(): string requires IsLhsIdentifier() {
+      if this.Identifier? then name
+      else if this.obj.ExprFromPath? && obj.path == dafny_runtime.MSel("modify!") then
+        this.arguments[0].name
+      else
+        this.arguments[0].obj.obj.name
+    }
+
+    function Clone(): Expr {
+      Select(this, "clone").Apply0()
+    }
+
+    predicate IsBorrow() {
+      UnaryOp? && op1 == "&"
+    }
+  }
+
+  function Unsafe(underlying: Expr): Expr {
+    UnaryOp("unsafe", underlying, Format.UnaryOpFormat.NoFormat)
+  }
+
+  const self := Identifier("self")
+
+
+  const crate := Crate()
+  const dafny_runtime_Set := dafny_runtime.MSel("Set").AsExpr()
+  const dafny_runtime_Set_from_array := dafny_runtime_Set.FSel("from_array")
+  const dafny_runtime_Sequence := dafny_runtime.MSel("Sequence").AsExpr()
+  const Sequence_from_array_owned := dafny_runtime_Sequence.FSel("from_array_owned")
+  const Sequence_from_array := dafny_runtime_Sequence.FSel("from_array")
+  const dafny_runtime_Multiset := dafny_runtime.MSel("Multiset").AsExpr()
+  const dafny_runtime_Multiset_from_array := dafny_runtime_Multiset.FSel("from_array")
+
+  function MaybePlacebo(underlying: Expr): Expr {
+    MaybePlaceboPath.FSel("from").Apply1(underlying)
+  }
+
+  const std_rc := std.MSel("rc")
+
+  const std_rc_Rc := std_rc.MSel("Rc")
+
+  const std_rc_Rc_new := std_rc_Rc.FSel("new")
+
+  const std_default_Default_default := std_default_Default.FSel("default").Apply0()
+
+  function RcNew(underlying: Expr): Expr {
+    Call(std_rc_Rc_new, [underlying])
+  }
+
+  function IntoUsize(underlying: Expr): Expr {
+    dafny_runtime.MSel("DafnyUsize").FSel("into_usize").Apply1(underlying)
+  }
+
+  datatype Fn =
+    Fn(name: string, typeParams: seq<TypeParamDecl>, formals: seq<Formal>,
+       returnType: Option<Type>,
+       body: Option<Expr>)
+  {
+    function ToString(ind: string): string {
+      "fn " + name + TypeParamDecl.ToStringMultiple(typeParams, ind) +
+      "(" + SeqToString(formals, (formal: Formal) => formal.ToString(ind), ", ") + ")" +
+      (match returnType case Some(t) => " -> " + t.ToString(ind) case _ => "") +
+      match body {
+        case None => ";"
+        case Some(body) =>
+          " {\n" + ind + IND +
+          body.ToString(ind + IND) +
+          "\n" + ind + "}"
+      }
+    }
+  }
+
+  /** Placeholder when there is no Rust docstring */
+  const NoDoc := ""
+
+  /** Placeholder when there are no Rust attributes */
+  const NoAttr: seq<Attribute> := []
+}
diff --git a/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-utils.dfy b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-utils.dfy
new file mode 100644
index 00000000000..b5064fc6c3d
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust-utils.dfy
@@ -0,0 +1,101 @@
+module DafnyCompilerRustUtils {
+  import Std
+  import opened Std.Wrappers
+  import opened DAST
+  import R = RAST
+
+  // Split a Dafny name along dots
+  function DafnyNameToContainingPathAndName(n: Name, acc: seq<Ident> := []): (seq<Ident>, Name)
+    decreases |n.dafny_name|
+  {
+    var s := n.dafny_name;
+    if |s| == 0 then
+      if |acc| == 0 then ([], Name("")) else (acc[0..|acc|-1], acc[|acc|-1].id)
+    else
+    if s[0] != '.' then
+      if |acc| == 0 then DafnyNameToContainingPathAndName(Name(s[1..]), [Ident.Ident(Name(s[0..1]))]) else
+      DafnyNameToContainingPathAndName(Name(s[1..]), acc[0..|acc|-1] + [Ident.Ident(Name(acc[|acc|-1].id.dafny_name + [s[0]]))])
+    else
+    if |acc| == 0 then DafnyNameToContainingPathAndName(Name(s[1..]), []) else
+    DafnyNameToContainingPathAndName(Name(s[1..]), acc + [Ident.Ident(Name(""))])
+  }
+
+  type ModWithBody = x: R.Mod | x.Mod? witness *
+  type ExternMod = x: R.Mod | x.ExternMod? witness *
+
+  datatype SeqMap<K, V> = SeqMap(keys: seq<K>, values: map<K, V>)
+  {
+    static function Empty(): SeqMap<K, V> {
+      SeqMap([], map[])
+    }
+    static function Single(key: K, value: V): SeqMap<K, V> {
+      SeqMap([key], map[key := value])
+    }
+  }
+
+  datatype GatheringModule =
+    GatheringModule(
+      existingMod: ModWithBody,
+      submodules: SeqMap<string, GatheringModule>
+    ) |
+    ExternMod(m: ExternMod)
+  {
+
+    static function MergeSeqMap(m1: SeqMap<string, GatheringModule>, m2: SeqMap<string, GatheringModule>): SeqMap<string, GatheringModule>
+      decreases m1
+    {
+      SeqMap(
+        m1.keys + Std.Collections.Seq.Filter((k: string) => k !in m1.keys, m2.keys),
+        map k <- m1.values.Keys + m2.values.Keys ::
+          if k in m1.values then
+            if k in m2.values then m1.values[k].Merge(m2.values[k]) else
+            m1.values[k]
+          else
+            m2.values[k])
+    }
+
+
+    static function MergeSeqMapAll(m1: SeqMap<string, GatheringModule>, m2s: seq<SeqMap<string, GatheringModule>>): SeqMap<string, GatheringModule>
+      decreases |m2s|
+    {
+      if |m2s| == 0 then m1 else
+      MergeSeqMapAll(MergeSeqMap(m1, m2s[0]), m2s[1..])
+    }
+
+    function Merge(m2: GatheringModule): GatheringModule
+      decreases this
+    {
+      if !GatheringModule? then m2 else if !m2.GatheringModule? then this else
+      GatheringModule(
+        R.Mod(existingMod.docString + m2.existingMod.docString, existingMod.attributes, existingMod.name, existingMod.body + m2.existingMod.body),
+        MergeSeqMap(submodules, m2.submodules)
+      )
+    }
+
+    static function Wrap(containingPath: seq<string>, rawDecl: R.Mod): SeqMap<string, GatheringModule> {
+      if |containingPath| == 0 then
+        var name := rawDecl.name;
+        if rawDecl.Mod? then
+          SeqMap.Single(name, GatheringModule(rawDecl, SeqMap.Empty()))
+        else
+          SeqMap.Single(name, ExternMod(rawDecl))
+      else
+        var enclosingModule := containingPath[0];
+        SeqMap.Single(enclosingModule,
+                      GatheringModule(R.Mod("", [], enclosingModule, []), Wrap(containingPath[1..], rawDecl)))
+    }
+    function ToRust(): R.Mod {
+      if ExternMod? then m else
+      var keysWithContent := Std.Collections.Seq.Filter(key => key in submodules.values, submodules.keys);
+      existingMod.(body :=
+      existingMod.body +
+      seq(|keysWithContent|, i requires 0 <= i < |keysWithContent| =>
+        var moduleName := keysWithContent[i];
+        var submodule := submodules.values[moduleName].ToRust();
+        R.ModDecl(submodule)
+        )
+      )
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust.dfy b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust.dfy
new file mode 100644
index 00000000000..075eb6937b0
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/Dafny-compiler-rust.dfy
@@ -0,0 +1,4140 @@
+include "../Dafny/AST.dfy"
+
+// Dafny to Rust compilation tenets:
+// - The Compiled Dafny AST should be minimal
+// - The generated code should look idiomatic and close to the original Dafny file if possible
+module {:extern "DCOMP"} DafnyToRustCompiler {
+  import opened DafnyToRustCompilerDefinitions
+  import FactorPathsOptimization
+  import ExpressionOptimization
+
+  import opened DAST
+  import Strings = Std.Strings
+  import Std
+  import opened Std.Wrappers
+  import R = RAST
+  import opened DafnyCompilerRustUtils
+
+  class COMP {
+    const charType: CharType
+    const pointerType: PointerType
+    const rootType: RootType
+
+    const thisFile: R.Path := if rootType.RootCrate? then R.crate else R.crate.MSel(rootType.moduleName)
+    const DafnyChar := if charType.UTF32? then "DafnyChar" else "DafnyCharUTF16"
+    const conversions := if charType.UTF32? then "unicode_chars_true" else "unicode_chars_false"
+    const DafnyCharUnderlying := if charType.UTF32? then R.RawType("char") else R.RawType("u16")
+    const string_of := if charType.UTF32? then "string_of" else "string_utf16_of"
+    const allocate :=
+      if pointerType.Raw? then "allocate" else "allocate_object"
+    const allocate_fn := "_" + allocate
+    const update_field_uninit_macro :=
+      if pointerType.Raw? then "update_field_uninit!" else "update_field_uninit_object!"
+    const update_field_mut_uninit_macro :=
+      if pointerType.Raw? then "update_field_mut_uninit!" else "update_field_mut_uninit_object!"
+    const thisInConstructor :=
+      if pointerType.Raw? then R.Identifier("this") else R.Identifier("this").Clone()
+    const array_construct :=
+      if pointerType.Raw? then "construct" else "construct_object"
+    const modify_macro := R.dafny_runtime.MSel(if pointerType.Raw? then "modify!" else "md!").AsExpr()
+    const read_macro := R.dafny_runtime.MSel(if pointerType.Raw? then "read!" else "rd!").AsExpr()
+    const modify_mutable_field_macro := R.dafny_runtime.MSel("modify_field!").AsExpr()
+    const read_mutable_field_macro := R.dafny_runtime.MSel("read_field!").AsExpr()
+
+    function Object(underlying: R.Type): R.Type {
+      if pointerType.Raw? then R.PtrType(underlying) else R.ObjectType(underlying)
+    }
+    const placebos_usize := if pointerType.Raw? then "placebos_usize" else "placebos_usize_object"
+    const update_field_if_uninit_macro :=
+      if pointerType.Raw? then "update_field_if_uninit!" else "update_field_if_uninit_object!"
+    const update_field_mut_if_uninit_macro :=
+      if pointerType.Raw? then "update_field_mut_if_uninit!" else "update_field_mut_if_uninit_object!"
+    const Upcast :=
+      if pointerType.Raw? then "Upcast" else "UpcastObject"
+    const UpcastFnMacro :=
+      Upcast + "Fn!"
+    const upcast :=
+      if pointerType.Raw? then "upcast" else "upcast_object"
+
+    const downcast :=
+      if pointerType.Raw? then "cast!" else "cast_object!"
+
+
+    var error: Option<string>
+
+    var optimizations: seq<R.Mod -> R.Mod>
+
+    constructor(charType: CharType, pointerType: PointerType, rootType: RootType) {
+      this.charType := charType;
+      this.pointerType := pointerType;
+      this.rootType := rootType;
+      this.error := None; // If error, then the generated code contains <i>Unsupported: .*</i>
+      this.optimizations := [
+        ExpressionOptimization.apply,
+        FactorPathsOptimization.apply(thisFile)];
+      new;
+    }
+
+    predicate HasAttribute(attributes: seq<Attribute>, name: string) {
+      exists attribute <- attributes :: attribute.name == name && |attribute.args| == 0
+    }
+
+    // Returns a top-level gathering module that can be merged with other gathering modules
+    method GenModule(mod: Module, containingPath: seq<Ident>) returns (s: SeqMap<string, GatheringModule>)
+      decreases mod, 1
+      modifies this
+    {
+      var (innerPath, innerName) := DafnyNameToContainingPathAndName(mod.name);
+      var containingPath := containingPath + innerPath;
+      var modName := escapeName(innerName);
+      if mod.body.None? {
+        s := GatheringModule.Wrap(ContainingPathToRust(containingPath), R.ExternMod(modName));
+      } else {
+        assume {:axiom} forall m: ModuleItem <- mod.body.value :: m < mod;
+        var optExtern: ExternAttribute := ExtractExternMod(mod);
+        var attributes := [];
+        if HasAttribute(mod.attributes, "rust_cfg_test") {
+          attributes := [R.RawAttribute("#[cfg(test)]")];
+        }
+        var body, allmodules := GenModuleBody(mod, mod.body.value, containingPath + [Ident.Ident(innerName)]);
+        if optExtern.SimpleExtern? {
+          if mod.requiresExterns {
+            body := [R.UseDecl(R.Use(R.PUB, thisFile.MSel(DAFNY_EXTERN_MODULE).MSels(SplitRustPathElement(ReplaceDotByDoubleColon(optExtern.overrideName))).MSel("*")))] + body;
+          }
+        } else if optExtern.AdvancedExtern? {
+          error := Some("Externs on modules can only have 1 string argument");
+        } else if optExtern.UnsupportedExtern? {
+          error := Some(optExtern.reason);
+        }
+        s := GatheringModule.MergeSeqMap(
+          GatheringModule.Wrap(ContainingPathToRust(containingPath), R.Mod(mod.docString, attributes, modName, body)),
+          allmodules);
+      }
+    }
+
+    method GenModuleBody(ghost parent: Module, body: seq<ModuleItem>, containingPath: seq<Ident>)
+      returns (s: seq<R.ModDecl>, allmodules: SeqMap<string, GatheringModule>)
+      requires forall m: ModuleItem <- body :: m < parent
+      decreases parent, 0
+      modifies this
+    {
+      s := [];
+      allmodules := SeqMap.Empty();
+      for i := 0 to |body| {
+        var generated;
+        match body[i] {
+          case Module(m) =>
+            assume {:axiom} m < parent;
+            var mm := GenModule(m, containingPath);
+            allmodules := GatheringModule.MergeSeqMap(allmodules, mm);
+            generated := [];
+          case Class(c) =>
+            generated := GenClass(c, containingPath + [Ident.Ident(c.name)]);
+          case Trait(t) =>
+            generated := GenTrait(t, containingPath);
+          case Newtype(n) =>
+            generated := GenNewtype(n, containingPath + [Ident.Ident(n.name)]);
+          case SynonymType(s) =>
+            generated := GenSynonymType(s);
+          case Datatype(d) =>
+            generated := GenDatatype(d, containingPath + [Ident.Ident(d.name)]);
+        }
+        s := s + generated;
+      }
+    }
+
+    method GenTypeParam(tp: TypeArgDecl) returns (typeArg: Type, typeParam: R.TypeParamDecl)
+    {
+      typeArg := TypeArg(tp.name);
+      var genTpConstraint := if SupportsEquality in tp.bounds then
+        [R.DafnyTypeEq]
+      else
+        [R.DafnyType];
+      if SupportsDefault in tp.bounds {
+        genTpConstraint := genTpConstraint + [R.DefaultTrait];
+      }
+      typeParam := R.TypeParamDecl(escapeName(tp.name.id), genTpConstraint);
+    }
+
+    method GenTypeParameters(params: seq<TypeArgDecl>)
+      returns (
+        typeParamsSeq: seq<Type>,
+        rTypeParams: seq<R.Type>,
+        rTypeParamsDecls: seq<R.TypeParamDecl>)
+    {
+      typeParamsSeq := [];
+      rTypeParams := [];
+      rTypeParamsDecls := [];
+      if |params| > 0 {
+        for tpI := 0 to |params| {
+          var tp := params[tpI];
+          var typeArg, typeParam := GenTypeParam(tp);
+          var rType := GenType(typeArg, GenTypeContext.default());
+          typeParamsSeq := typeParamsSeq + [typeArg];
+          rTypeParams := rTypeParams + [rType];
+          rTypeParamsDecls := rTypeParamsDecls + [typeParam];
+        }
+      }
+    }
+
+    // If we build a resolved type from this compiler, we won't have access to all
+    // the extended traits, so the equality can be relaxed a bit
+    predicate IsSameResolvedTypeAnyArgs(r1: ResolvedType, r2: ResolvedType) {
+      r1.path == r2.path &&
+      r1.kind == r2.kind
+    }
+
+    // If we build a resolved type from this compiler, we won't have access to all
+    // the extended traits, so the equality can be relaxed a bit
+    predicate IsSameResolvedType(r1: ResolvedType, r2: ResolvedType) {
+      IsSameResolvedTypeAnyArgs(r1, r2)
+      && r1.typeArgs == r2.typeArgs
+    }
+
+    function GatherTypeParamNames(types: set<string>, typ: R.Type): set<string> {
+      typ.Fold(types, (types: set<string>, currentType: R.Type) =>
+                 if currentType.TIdentifier? then
+                   types + {currentType.name}
+                 else
+                   types
+      )
+    }
+
+    method GenField(field: Field) returns (
+        rfield: R.Field, fieldInit: R.AssignIdentifier, usedTypeParams: set<string>)
+      modifies this
+    {
+      usedTypeParams := {};
+      var fieldType := GenType(field.formal.typ, GenTypeContext.default());
+      if !field.isConstant {
+        fieldType := R.dafny_runtime.MSel("Field").AsType().Apply([fieldType]);
+      }
+      usedTypeParams := GatherTypeParamNames(usedTypeParams, fieldType);
+      var fieldRustName := escapeVar(field.formal.name);
+      rfield := R.Field(R.PUB, R.Formal(fieldRustName, fieldType));
+
+      match field.defaultValue {
+        case Some(e) => {
+          // TODO(mikael): Fields must be initialized before the code of the constructor if possible
+          var expr, _, _ := GenExpr(e, NoSelf, Environment.Empty(), OwnershipOwned);
+
+          fieldInit := R.AssignIdentifier(
+            fieldRustName, expr);
+        }
+        case None => {
+          // TODO(mikael) Use type descriptors for default values if generics
+          var default := R.std_default_Default_default;
+          if fieldType.IsObjectOrPointer() {
+            default := fieldType.ToNullExpr();
+          }
+          fieldInit := R.AssignIdentifier(
+            fieldRustName, default);
+        }
+      }
+    }
+
+    method GetName(attributes: seq<Attribute>, name: Name, kind: string) returns (rName: string, extern: ExternAttribute)
+      modifies this
+    {
+      extern := ExtractExtern(attributes, name);
+
+      if extern.SimpleExtern? {
+        rName := extern.overrideName;
+      } else {
+        rName := escapeName(name);
+        if extern.AdvancedExtern? {
+          error := Some("Multi-argument externs not supported for "+kind+" yet");
+        }
+      }
+    }
+
+    method GenTraitImplementations(
+      path: seq<Ident>,
+      rTypeParams: seq<R.Type>,
+      rTypeParamsDecls: seq<R.TypeParamDecl>,
+      superTraitTypes: seq<Type>,
+      traitBodies: map<seq<Ident>, seq<R.ImplMember>>,
+      extern: ExternAttribute,
+      kind: string)
+      returns (s: seq<R.ModDecl>)
+      modifies this
+    {
+      s := [];
+      var genPath := GenPath(path);
+      var genSelfPath := genPath.AsType();
+      var genPathExpr := genPath.AsExpr();
+      for i := 0 to |superTraitTypes| {
+        var superTraitType := superTraitTypes[i];
+        match superTraitType {
+          case UserDefined(ResolvedType(traitPath, typeArgs, Trait(traitType), _, properMethods, _)) => {
+            var pathStr := GenPathType(traitPath);
+            var typeArgs := GenTypeArgs(typeArgs, GenTypeContext.default());
+            var body: seq<R.ImplMember> := [];
+            if traitPath in traitBodies {
+              body := traitBodies[traitPath];
+            }
+
+            var fullTraitPath := R.TypeApp(pathStr, typeArgs);
+            if !extern.NoExtern? { // An extern of some kind
+              // Either the Dafny code implements all the methods of the trait or none,
+              if |body| == 0 && |properMethods| != 0 {
+                continue; // We assume everything is implemented externally
+              }
+              if |body| != |properMethods| {
+                error := Some("Error: In the "+kind+" " + R.SeqToString(path, (s: Ident) => s.id.dafny_name, ".") + ", some proper methods of " +
+                              fullTraitPath.ToString("") + " are marked {:extern} and some are not." +
+                              " For the Rust compiler, please make all methods (" + R.SeqToString(properMethods, (s: Name) => s.dafny_name, ", ") +
+                              ")  bodiless and mark as {:extern} and implement them in a Rust file, "+
+                              "or mark none of them as {:extern} and implement them in Dafny. " +
+                              "Alternatively, you can insert an intermediate trait that performs the partial implementation if feasible.");
+              }
+            }
+            if |body| == 0 {
+              // Extern type, we assume
+            }
+            if traitType.GeneralTrait? {
+              // One more method: Cloning when boxed
+              /*impl Test for Wrapper {
+                  fn _clone(&self) -> Box<dyn Test> {
+                      Box::new(self.clone())
+                  }
+              }*/
+              body := body + [
+                R.FnDecl(
+                  R.NoDoc, R.NoAttr,
+                  R.PRIV,
+                  R.Fn(
+                    "_clone", [], [R.Formal.selfBorrowed], Some(R.Box(R.DynType(fullTraitPath))),
+                    Some(R.BoxNew(R.self.Sel("clone").Apply0()))))
+              ];
+            } else {
+              if kind == "datatype" || kind == "newtype" {
+                var dummy := Error("Cannot extend non-general traits");
+              }
+            }
+
+            var x := R.ImplDecl(
+              R.ImplFor(
+                rTypeParamsDecls,
+                fullTraitPath,
+                R.TypeApp(genSelfPath, rTypeParams),
+                body
+              ));
+            s := s + [x];
+
+            var upcastTraitToImplement, upcastTraitFn;
+            if traitType.GeneralTrait? {
+              upcastTraitToImplement, upcastTraitFn := "UpcastBox", "UpcastStructBoxFn!";
+              s := s + [
+                R.ImplDecl(
+                  R.ImplFor(
+                    rTypeParamsDecls,
+                    R.dafny_runtime.MSel("UpcastBox").AsType().Apply1(R.DynType(fullTraitPath)),
+                    R.TypeApp(genSelfPath, rTypeParams),
+                    [ R.FnDecl(
+                        R.NoDoc, R.NoAttr,
+                        R.PRIV,
+                        R.Fn(
+                          "upcast",
+                          [], [R.Formal.selfBorrowed],
+                          Some(R.Box(R.DynType(fullTraitPath))),
+                          Some(genPathExpr.ApplyType(rTypeParams).FSel("_clone").Apply1(R.self))) // Difference with UpcastStructBox is that there is no .as_ref()
+                      ) ]))
+              ];
+            } else {
+              s := s + [
+                R.ImplDecl(
+                  R.ImplFor(
+                    rTypeParamsDecls,
+                    R.dafny_runtime.MSel(Upcast).AsType().Apply([
+                                                                  R.DynType(fullTraitPath)]),
+                    R.TypeApp(genSelfPath, rTypeParams),
+                    [
+                      R.ImplMemberMacro(
+                        R.dafny_runtime
+                        .MSel(UpcastFnMacro).AsExpr()
+                        .Apply1(R.ExprFromType(R.DynType(fullTraitPath))))
+                    ]
+                  )
+                )
+              ];
+            }
+
+          }
+          case _ => {}
+        }
+      }
+    }
+
+    method GenClass(c: Class, path: seq<Ident>) returns (s: seq<R.ModDecl>)
+      modifies this
+    {
+      var typeParamsSeq, rTypeParams, rTypeParamsDecls := GenTypeParameters(c.typeParams);
+      var constrainedTypeParams := R.TypeParamDecl.ToStringMultiple(rTypeParamsDecls, R.IND + R.IND);
+
+      var fields: seq<R.Field> := [];
+      var fieldInits: seq<R.AssignIdentifier> := [];
+      var usedTypeParams: set<string> := {};
+      for fieldI := 0 to |c.fields| {
+        var field := c.fields[fieldI];
+        var rfield, fieldInit, fieldUsedTypeParams := GenField(field);
+        fields := fields + [rfield];
+        fieldInits := fieldInits + [fieldInit];
+        usedTypeParams := usedTypeParams + fieldUsedTypeParams;
+      }
+
+      // A phantom field is necessary to avoid Rust complaining about no reference to the type parameter.
+      // PhantomData is zero-sized so it won't impact final performance or layout
+      for typeParamI := 0 to |c.typeParams| {
+        var typeArg, typeParam := GenTypeParam(c.typeParams[typeParamI]);
+        var rTypeArg := GenType(typeArg, GenTypeContext.default());
+        if typeParam.name in usedTypeParams {
+          continue;
+        }
+        fields := fields + [
+          R.Field(R.PRIV,
+                  R.Formal("_phantom_type_param_" + Strings.OfNat(typeParamI),
+                           R.TypeApp(R.std.MSel("marker").MSel("PhantomData").AsType(), [rTypeArg])))];
+        fieldInits := fieldInits + [
+          R.AssignIdentifier(
+            "_phantom_type_param_" + Strings.OfNat(typeParamI),
+            R.std.MSel("marker").MSel("PhantomData").AsExpr())];
+      }
+
+      var className, extern := GetName(c.attributes, c.name, "classes");
+
+      var struct := R.Struct(c.docString, [], className, rTypeParamsDecls, R.NamedFields(fields));
+      s := [];
+
+      if extern.NoExtern? {
+        s := s + [R.StructDecl(struct)];
+      }
+
+      var implBody, traitBodies := GenClassImplBody(
+        c.body, false,
+        Type.UserDefined(
+          ResolvedType(
+            path,
+            [],
+            ResolvedTypeBase.Class(),
+            c.attributes,
+            [], [])),
+        typeParamsSeq);
+
+      if extern.NoExtern? && className != "_default" {
+        implBody := [
+          R.FnDecl(
+            "Allocates an UNINITIALIZED instance. Only the Dafny compiler should use that.", R.NoAttr,
+            R.PUB,
+            R.Fn(
+              allocate_fn,
+              [], [], Some(Object(R.SelfOwned)),
+              Some(
+                R.dafny_runtime.MSel(allocate).AsExpr().ApplyType1(R.SelfOwned).Apply0()
+              ))
+          )
+        ] + implBody;
+      }
+
+      var selfTypeForImpl;
+      if extern.NoExtern? || extern.UnsupportedExtern? {
+        selfTypeForImpl := R.TIdentifier(className);
+      } else if extern.AdvancedExtern? {
+        selfTypeForImpl := R.crate.MSels(extern.enclosingModule).MSel(extern.overrideName).AsType();
+      } else if extern.SimpleExtern? {
+        selfTypeForImpl := R.TIdentifier(extern.overrideName);
+      }
+      if |implBody| > 0 {
+        var i := R.Impl(
+          rTypeParamsDecls,
+          R.TypeApp(selfTypeForImpl, rTypeParams),
+          implBody
+        );
+        s := s + [R.ImplDecl(i)];
+      }
+      // Add test methods
+      var testMethods := [];
+      if className == "_default" {
+        for i := 0 to |c.body| {
+          var m := match c.body[i] case Method(m) => m;
+          if HasAttribute(m.attributes, "test") && |m.params| == 0 {
+            var fnName := escapeName(m.name);
+            testMethods := testMethods + [
+              R.TopFnDecl(
+                R.TopFn(
+                  m.docString,
+                  [R.RawAttribute("#[test]")], R.PUB,
+                  R.Fn(
+                    fnName, [], [], None,
+                    Some(R.Identifier("_default").FSel(fnName).Apply([])))
+                ))
+            ];
+          }
+        }
+        s := s + testMethods;
+      }
+      var genSelfPath := GenPathType(path);
+      if className != "_default" {
+        s := s + [
+          R.ImplDecl(
+            R.ImplFor(
+              rTypeParamsDecls,
+              R.dafny_runtime.MSel(Upcast).AsType().Apply([R.DynType(R.AnyTrait)]),
+              R.TypeApp(genSelfPath, rTypeParams),
+              [
+                R.ImplMemberMacro(
+                  R.dafny_runtime
+                  .MSel(UpcastFnMacro).AsExpr()
+                  .Apply1(R.ExprFromType(R.DynType(R.AnyTrait))))
+              ]
+            )
+          )
+        ];
+      }
+      var superTraitTypes := if className == "_default" then [] else c.superTraitTypes;
+      var superTraitImplementations := GenTraitImplementations(
+        path,
+        rTypeParams,
+        rTypeParamsDecls,
+        superTraitTypes,
+        traitBodies,
+        extern,
+        "class");
+      s := s + superTraitImplementations;
+    }
+
+    method GenTrait(t: Trait, containingPath: seq<Ident>) returns (s: seq<R.ModDecl>)
+      modifies this
+    {
+      var typeParamsSeq := [];
+      var rTypeParamsDecls: seq<R.TypeParamDecl> := [];
+      var typeParams: seq<R.Type> := [];
+      if |t.typeParams| > 0 {
+        for tpI := 0 to |t.typeParams| {
+          var tp := t.typeParams[tpI];
+          var typeArg, typeParamDecl := GenTypeParam(tp);
+          typeParamsSeq := typeParamsSeq + [typeArg];
+          rTypeParamsDecls := rTypeParamsDecls + [typeParamDecl];
+          var typeParam := GenType(typeArg, GenTypeContext.default());
+          typeParams := typeParams + [typeParam];
+        }
+      }
+
+      var fullPath := containingPath + [Ident.Ident(t.name)];
+      var name := escapeName(t.name);
+      var traitFulltype := R.TIdentifier(name).Apply(typeParams);
+      var traitFullExpr := R.Identifier(name).ApplyType(typeParams);
+      var implBody, _ := GenClassImplBody(
+        t.body, true,
+        UserDefined(
+          ResolvedType(
+            fullPath, [],
+            ResolvedTypeBase.Trait(t.traitType), t.attributes,
+            [], [])),
+        typeParamsSeq);
+      if t.traitType.GeneralTrait? { // Cloning is boxed
+        // fn _clone(&self) -> Box<dyn Test>;
+        implBody := implBody + [
+          R.FnDecl(
+            R.NoDoc, R.NoAttr,
+            R.PRIV,
+            R.Fn(
+              "_clone", [], [R.Formal.selfBorrowed], Some(R.Box(R.DynType(traitFulltype))),
+              None
+            ))
+        ];
+      }
+      var parents := [];
+      var upcastImplemented := [];
+      for i := 0 to |t.parents| {
+        var parentTyp := t.parents[i];
+        var parentTpe := GenType(parentTyp, GenTypeContext.ForTraitParents());
+        parents := parents + [parentTpe];
+        var upcastTrait := if parentTyp.IsGeneralTrait() then "UpcastBox" else Upcast;
+        parents := parents + [R.dafny_runtime.MSel(upcastTrait).AsType().Apply1(R.DynType(parentTpe))];
+        if parentTyp.IsGeneralTrait() {
+          /*impl UpcastBox<dyn GeneralTraitSuper> for Box<dyn GeneralTrait> {
+              fn upcast(&self) -> ::std::boxed::Box<dyn GeneralTraitSuper> {
+                GeneralTrait::<GeneralTraitSuper>::_clone(self.as_ref())
+              }
+            }*/
+          upcastImplemented := upcastImplemented + [
+            R.ImplDecl(
+              R.ImplFor(
+                rTypeParamsDecls,
+                R.dafny_runtime.MSel("UpcastBox").AsType().Apply1(R.DynType(parentTpe)),
+                R.Box(R.DynType(traitFulltype)),
+                [ R.FnDecl(
+                    R.NoDoc, R.NoAttr,
+                    R.PRIV,
+                    R.Fn(
+                      "upcast",
+                      [], [R.Formal.selfBorrowed],
+                      Some(R.Box(R.DynType(parentTpe))),
+                      Some(traitFullExpr.FSel("_clone").Apply1(R.self.FSel("as_ref").Apply0()))
+                    )
+                  )]))
+          ];
+        }
+      }
+      s := [
+        R.TraitDecl(
+          R.Trait(
+            t.docString, [],
+            rTypeParamsDecls, traitFulltype,
+            parents,
+            implBody
+          ))];
+      if t.traitType.GeneralTrait? {
+        /*impl Clone for Box<dyn Test> {
+            fn clone(&self) -> Box<dyn Test> {
+              Test::_clone(self.as_ref())
+            }
+          }*/
+        s := s + [
+          R.ImplDecl(
+            R.ImplFor(
+              rTypeParamsDecls,
+              R.std.MSel("clone").MSel("Clone").AsType(),
+              R.Box(R.DynType(traitFulltype)),
+              [R.FnDecl(
+                 R.NoDoc, R.NoAttr,
+                 R.PRIV,
+                 R.Fn("clone", [],
+                      [ R.Formal.selfBorrowed ],
+                      Some(R.SelfOwned),
+                      Some(traitFullExpr.FSel("_clone").Apply1(R.self.Sel("as_ref").Apply0()))
+                 ))]))];
+      }
+      s := s + upcastImplemented;
+    }
+
+    method GenNewtype(c: Newtype, path: seq<Ident>) returns (s: seq<R.ModDecl>)
+      modifies this
+    {
+      var typeParamsSeq, rTypeParams, rTypeParamsDecls := GenTypeParameters(c.typeParams);
+      var constrainedTypeParams := R.TypeParamDecl.ToStringMultiple(rTypeParamsDecls, R.IND + R.IND);
+
+      var wrappedType;
+      var rustType := NewtypeRangeToUnwrappedBoundedRustType(c.base, c.range);
+      if rustType.Some? {
+        wrappedType := rustType.value;
+      } else {
+        wrappedType := GenType(c.base, GenTypeContext.default());
+      }
+      var newtypeType: Type :=
+        UserDefined(
+          ResolvedType(
+            path, typeParamsSeq,
+            ResolvedTypeBase.Newtype(c.base, c.range, false),
+            c.attributes, [], []));
+      var newtypeName := escapeName(c.name);
+      var resultingType := R.TypeApp(R.TIdentifier(newtypeName), rTypeParams);
+      var attributes: string;
+      if IsNewtypeCopy(c.range) {
+        attributes := "#[derive(Clone, PartialEq, Copy)]";
+      } else {
+        attributes := "#[derive(Clone, PartialEq)]";
+      }
+      s := [
+        R.StructDecl(
+          R.Struct(
+            c.docString,
+            [
+              R.RawAttribute(attributes),
+              R.RawAttribute("#[repr(transparent)]")
+            ],
+            newtypeName,
+            rTypeParamsDecls,
+            R.NamelessFields([R.NamelessField(R.PUB, wrappedType)])
+          ))];
+
+      var fnBody;
+
+      match c.witnessExpr {
+        case Some(e) => {
+          var e := Convert(e, c.base, newtypeType);
+          // TODO(Mikael): generate statements if any
+          var r, _, _ := GenExpr(e, NoSelf, Environment.Empty(), OwnershipOwned);
+          fnBody := r;
+        }
+        case None => {
+          fnBody := R.Identifier(newtypeName).Apply1(R.std_default_Default_default);
+        }
+      }
+
+      var body :=
+        R.FnDecl(
+          "An element of " + newtypeName, [],
+          R.PRIV,
+          R.Fn(
+            "default", [], [], Some(R.SelfOwned),
+            Some(fnBody)
+          ));
+      match c.constraint {
+        case None =>
+        case Some(NewtypeConstraint(formal, constraintStmts)) =>
+          var rStmts, _, newEnv := GenStmts(constraintStmts, NoSelf, Environment.Empty(), false, None);
+          var rFormals := GenParams([formal]);
+          s := s + [
+            R.ImplDecl(
+              R.Impl(
+                rTypeParamsDecls,
+                resultingType,
+                [
+                  R.FnDecl(
+                    "Constraint check", R.NoAttr,
+                    R.PUB,
+                    R.Fn(
+                      "is", [], rFormals, Some(R.Bool()),
+                      Some(rStmts)
+                    ))
+                ]
+              )
+            )];
+      }
+      s := s + [
+        R.ImplDecl(
+          R.ImplFor(
+            rTypeParamsDecls,
+            R.DefaultTrait,
+            resultingType,
+            [body]))];
+      s := s + [
+        R.ImplDecl(
+          R.ImplFor(
+            rTypeParamsDecls,
+            R.DafnyPrint,
+            resultingType,
+            [R.FnDecl(
+               "For Dafny print statements", R.NoAttr,
+               R.PRIV,
+               R.Fn("fmt_print", [],
+                    [ R.Formal.selfBorrowed,
+                      R.Formal("_formatter", R.BorrowedMut(R.std.MSel("fmt").MSel("Formatter").AsType())),
+                      R.Formal("in_seq", R.Type.Bool)],
+                    Some(R.std.MSel("fmt").MSel("Result").AsType()),
+                    Some(R.dafny_runtime.MSel("DafnyPrint").AsExpr().FSel("fmt_print").Apply(
+                           [ R.Borrow(R.self.Sel("0")),
+                             R.Identifier("_formatter"),
+                             R.Identifier("in_seq")])))
+             )]))];
+      s := s + [
+        R.ImplDecl(
+          R.ImplFor(
+            rTypeParamsDecls,
+            R.std.MSel("ops").MSel("Deref").AsType(),
+            resultingType,
+            [R.TypeDeclMember("Target", wrappedType),
+             R.FnDecl(
+               R.NoDoc, R.NoAttr,
+               R.PRIV,
+               R.Fn("deref", [],
+                    [R.Formal.selfBorrowed], Some(R.Borrowed(R.Self().MSel("Target").AsType())),
+                    Some(R.Borrow(R.self.Sel("0")))))]))];
+
+      // Convert a ref to the underlying type to a ref of the wrapped newtype
+      s := s + [
+        R.ImplDecl(
+          R.Impl(
+            rTypeParamsDecls,
+            resultingType,
+            [R.FnDecl(
+               "SAFETY: The newtype is marked as transparent", R.NoAttr,
+               R.PUB,
+               R.Fn(
+                 "_from_ref", [],
+                 [R.Formal("o", R.Borrowed(wrappedType))],
+                 Some(R.Borrowed(R.Self().AsType())),
+                 Some(
+                   R.Unsafe(
+                     R.Block(
+                       //"The newtype is marked as transparent",
+                       R.std.MSel("mem").MSel("transmute").AsExpr().Apply1(R.Identifier("o")))))))]))];
+      var rTypeParamsDeclsWithHash := R.TypeParamDecl.AddConstraintsMultiple(
+        rTypeParamsDecls, [R.Hash]
+      );
+      s := s + [
+        HashImpl(
+          rTypeParamsDeclsWithHash,
+          resultingType,
+          R.Identifier("self").Sel("0").Sel("hash").Apply1(R.Identifier("_state"))
+        )];
+      if c.range.HasArithmeticOperations() {
+        s := s + [
+          OpsImpl('+', rTypeParamsDecls, resultingType, newtypeName),
+          OpsImpl('-', rTypeParamsDecls, resultingType, newtypeName),
+          OpsImpl('*', rTypeParamsDecls, resultingType, newtypeName),
+          OpsImpl('/', rTypeParamsDecls, resultingType, newtypeName),
+          PartialOrdImpl(rTypeParamsDecls, resultingType, newtypeName)
+        ];
+      }
+      if c.range.Bool? {
+        s := s + [
+          UnaryOpsImpl('!', rTypeParamsDecls, resultingType, newtypeName)
+        ];
+      }
+      var implementation, traitBodies := GenClassImplBody(c.classItems, false, newtypeType, typeParamsSeq);
+      if |traitBodies| > 0 {
+        error := Some("No support for trait in newtypes yet");
+      }
+      if |implementation| > 0 {
+        s := s + [
+          R.ImplDecl(
+            R.Impl(
+              rTypeParamsDecls,
+              R.TypeApp(R.TIdentifier(newtypeName), rTypeParams),
+              implementation
+            )
+          )];
+      }
+    }
+
+    method GenSynonymType(c: SynonymType) returns (s: seq<R.ModDecl>)
+      modifies this
+    {
+      var typeParamsSeq, rTypeParams, rTypeParamsDecls := GenTypeParameters(c.typeParams);
+      var synonymTypeName := escapeName(c.name);
+      var resultingType := GenType(c.base, GenTypeContext.default());
+
+      s := [
+        R.TypeDecl(
+          R.TypeSynonym(
+            c.docString,
+            [],
+            synonymTypeName, rTypeParamsDecls, resultingType
+          ))];
+
+      var defaultConstrainedTypeParams := R.TypeParamDecl.AddConstraintsMultiple(
+        rTypeParamsDecls, [R.DefaultTrait]
+      );
+      match c.witnessExpr {
+        case Some(e) => {
+          var rStmts, _, newEnv := GenStmts(c.witnessStmts, NoSelf, Environment.Empty(), false, None);
+          var rExpr, _, _ := GenExpr(e, NoSelf, newEnv, OwnershipOwned);
+          var constantName := escapeName(Name("_init_" + c.name.dafny_name));
+          s := s + [
+            R.TopFnDecl(
+              R.TopFn(
+                "An element of " + synonymTypeName,
+                [], R.PUB,
+                R.Fn(
+                  constantName, defaultConstrainedTypeParams, [], Some(resultingType),
+                  Some(rStmts.Then(rExpr)))
+              )
+            )
+          ];
+        }
+        case None => {}
+      }
+    }
+
+    predicate TypeIsEq(t: Type)
+      decreases t
+    {
+      match t
+      case UserDefined(_) => true // ResolvedTypes are assumed to support equality
+      case Tuple(ts) => forall t <- ts :: TypeIsEq(t)
+      case Array(t, _) => TypeIsEq(t)
+      case Seq(t) => TypeIsEq(t)
+      case Set(t) => TypeIsEq(t)
+      case Multiset(t) => TypeIsEq(t)
+      case Map(k, v) => TypeIsEq(k) && TypeIsEq(v)
+      case SetBuilder(t) => TypeIsEq(t)
+      case MapBuilder(k, v) => TypeIsEq(k) && TypeIsEq(v)
+      case Arrow(_, _) => false
+      case Primitive(_) => true
+      case Passthrough(_) => true // should be Rust primitive types
+      case TypeArg(i) => true // i(==) is asserted at the point of use by the verifier
+      case Object() => true
+    }
+
+    predicate DatatypeIsEq(c: Datatype) {
+      !c.isCo && forall ctor <- c.ctors, arg <- ctor.args :: TypeIsEq(arg.formal.typ)
+    }
+
+    function write(r: R.Expr, final: bool := false): R.Expr {
+      var result :=
+        R.Identifier("write!").Apply([
+                                       R.Identifier("_formatter"),
+                                       r]);
+      if final then
+        result
+      else
+        R.UnaryOp("?", result, Format.UnaryOpFormat.NoFormat)
+    }
+
+    function writeStr(s: string, final: bool := false): R.Expr {
+      write(R.LiteralString(s, binary := false, verbatim := false))
+    }
+
+    method GenDatatype(c: Datatype, path: seq<Ident>) returns (s: seq<R.ModDecl>)
+      modifies this
+    {
+      var typeParamsSeq, rTypeParams, rTypeParamsDecls := GenTypeParameters(c.typeParams);
+      var datatypeName, extern := GetName(c.attributes, c.name, "datatypes");
+      var ctors: seq<R.EnumCase> := [];
+      var variances := Std.Collections.Seq.Map((typeParamDecl: TypeArgDecl) => typeParamDecl.variance, c.typeParams);
+      var singletonConstructors := [];
+      var usedTypeParams: set<string> := {};
+      for i := 0 to |c.ctors| {
+        var ctor := c.ctors[i];
+        var ctorArgs: seq<R.Field> := [];
+        var isNumeric := false;
+        if |ctor.args| == 0 {
+          var instantiation := R.StructBuild(R.Identifier(datatypeName).FSel(escapeName(ctor.name)), []);
+          if IsRcWrapped(c.attributes) {
+            instantiation := R.RcNew(instantiation);
+          }
+          singletonConstructors := singletonConstructors + [
+            instantiation
+          ];
+        }
+        for j := 0 to |ctor.args| {
+          var dtor := ctor.args[j];
+          var formalType := GenType(dtor.formal.typ, GenTypeContext.default());
+          usedTypeParams := GatherTypeParamNames(usedTypeParams, formalType);
+          var formalName := escapeVar(dtor.formal.name);
+          if j == 0 && "0" == formalName {
+            isNumeric := true;
+          }
+          if j != 0 && isNumeric && Strings.OfNat(j) != formalName {
+            error := Some("Formal extern names were supposed to be numeric but got " + formalName + " instead of " + Strings.OfNat(j));
+            isNumeric := false;
+          }
+          if c.isCo {
+            ctorArgs := ctorArgs + [
+              R.Field(R.PRIV,
+                      R.Formal(formalName,
+                               R.TypeApp(R.dafny_runtime.MSel("LazyFieldWrapper").AsType(), [formalType])))];
+          } else {
+            ctorArgs := ctorArgs + [
+              R.Field(R.PRIV,
+                      R.Formal(formalName, formalType))];
+          }
+        }
+        var namedFields := R.NamedFields(ctorArgs);
+        if isNumeric {
+          namedFields := namedFields.ToNamelessFields();
+        }
+        ctors := ctors + [R.EnumCase(ctor.docString, escapeName(ctor.name), namedFields)];
+      }
+      var unusedTypeParams := (set tp <- rTypeParamsDecls :: tp.name) - usedTypeParams;
+
+      var selfPath := [Ident.Ident(c.name)];
+      var implBodyRaw, traitBodies :=
+        GenClassImplBody(
+          c.body, false,
+          UserDefined(
+            ResolvedType(
+              selfPath,
+              typeParamsSeq,
+              ResolvedTypeBase.Datatype(variances),
+              c.attributes, [], [])),
+          typeParamsSeq);
+      var implBody: seq<R.ImplMember> := implBodyRaw;
+      var emittedFields: set<string> := {};
+      for i := 0 to |c.ctors| {
+        // we know that across all ctors, each any fields with the same name have the same type
+        // so we want to emit methods for each field that pull the appropriate value given
+        // the current variant (and panic if we have a variant with no such field)
+        var ctor := c.ctors[i];
+        for j := 0 to |ctor.args| {
+          var dtor := ctor.args[j];
+          var callName := dtor.callName.GetOr(escapeVar(dtor.formal.name));
+          if !(callName in emittedFields) {
+            emittedFields := emittedFields + {callName};
+
+            var formalType := GenType(dtor.formal.typ, GenTypeContext.default());
+            var cases: seq<R.MatchCase> := [];
+            for k := 0 to |c.ctors| {
+              var ctor2 := c.ctors[k];
+
+              var pattern := datatypeName + "::" + escapeName(ctor2.name);
+              var rhs: R.Expr;
+              var hasMatchingField := None;
+              var patternInner := "";
+              var isNumeric := false;
+              for l := 0 to |ctor2.args| {
+                var dtor2 := ctor2.args[l];
+                var patternName := escapeVar(dtor2.formal.name);
+                if l == 0 && patternName == "0" {
+                  isNumeric := true;
+                }
+                if isNumeric {
+                  patternName := dtor2.callName.GetOr("v" + Strings.OfNat(l));
+                }
+                if dtor.formal.name == dtor2.formal.name {
+                  // Note: here, we use escapeVar because the corresponding destructor uses a non-punned name
+                  hasMatchingField := Some(patternName);
+                }
+                patternInner := patternInner + patternName + ", ";
+              }
+              if isNumeric {
+                pattern := pattern + "(" + patternInner + ")";
+              } else {
+                pattern := pattern + "{" + patternInner + "}";
+              }
+
+              if hasMatchingField.Some? {
+                if c.isCo {
+                  rhs := R.std.MSel("ops").MSel("Deref").AsExpr().FSel("deref").Apply1(R.Borrow(R.Identifier(hasMatchingField.value).Sel("0")));
+                } else {
+                  rhs := R.Identifier(hasMatchingField.value);
+                }
+              } else {
+                rhs := UnreachablePanicIfVerified(pointerType, "field does not exist on this variant");
+              }
+              var ctorMatch := R.MatchCase(R.RawPattern(pattern), rhs);
+              cases := cases + [ctorMatch];
+            }
+
+            if |c.typeParams| > 0 && |unusedTypeParams| > 0 {
+              cases := cases + [
+                R.MatchCase(R.RawPattern(datatypeName + "::_PhantomVariant(..)"), UnreachablePanicIfVerified(pointerType, ""))
+              ];
+            }
+
+            var methodBody := R.Match(
+              R.self,
+              cases
+            );
+
+            implBody := implBody + [
+              R.FnDecl(
+                if |c.ctors| == 1 then
+                  "Returns a borrow of the field " + callName
+                else
+                  "Gets the field " + callName + " for all enum members which have it",
+                [],
+                R.PUB,
+                R.Fn(
+                  callName,
+                  [], [R.Formal.selfBorrowed], Some(R.Borrowed(formalType)),
+                  Some(methodBody)
+                ))];
+          }
+        }
+      }
+      var coerceTypes: seq<R.Type> := [];
+      var rCoerceTypeParams: seq<R.TypeParamDecl> := [];
+      var coerceArguments: seq<R.Formal> := [];
+      var coerceMap: map<Type, Type> := map[];
+      var rCoerceMap: map<R.Type, R.Type> := map[];
+      var coerceMapToArg: map<(R.Type, R.Type), R.Expr> := map[];
+      if |c.typeParams| > 0 {
+        var types: seq<R.Type> := [];
+        for typeI := 0 to |c.typeParams| {
+          var typeParam := c.typeParams[typeI];
+          var typeArg, rTypeParamDecl := GenTypeParam(typeParam);
+          var rTypeArg := GenType(typeArg, GenTypeContext.default());
+          types := types + [R.TypeApp(R.std.MSel("marker").MSel("PhantomData").AsType(), [rTypeArg])];
+          // Coercion arguments
+          if typeI < |variances| && variances[typeI].Nonvariant? {
+            coerceTypes := coerceTypes + [rTypeArg];
+            continue; // We ignore nonvariant arguments
+          }
+          var coerceTypeParam := typeParam.(name := Ident.Ident(Name("_T" + Strings.OfNat(typeI))));
+          var coerceTypeArg, rCoerceTypeParamDecl := GenTypeParam(coerceTypeParam);
+          coerceMap := coerceMap + map[typeArg := coerceTypeArg];
+          var rCoerceType := GenType(coerceTypeArg, GenTypeContext.default());
+          rCoerceMap := rCoerceMap + map[rTypeArg := rCoerceType];
+          coerceTypes := coerceTypes + [rCoerceType];
+          rCoerceTypeParams := rCoerceTypeParams + [rCoerceTypeParamDecl];
+          var coerceFormal := "f_" + Strings.OfNat(typeI);
+          coerceMapToArg := coerceMapToArg + map[
+            (rTypeArg, rCoerceType) := R.Identifier(coerceFormal).Clone()
+          ];
+          coerceArguments := coerceArguments + [
+            R.Formal(
+              coerceFormal,
+              R.Rc(R.IntersectionType(R.ImplType(R.FnType([rTypeArg], rCoerceType)), R.StaticTrait)))
+          ];
+        }
+        if |unusedTypeParams| > 0 {
+          ctors := ctors + [
+            R.EnumCase(
+              "",
+              "_PhantomVariant",
+              R.NamelessFields(
+                Std.Collections.Seq.Map(
+                  tpe => R.NamelessField(R.PRIV, tpe), types))
+            )];
+        }
+      }
+
+      var cIsEq := DatatypeIsEq(c);
+
+      // Derive PartialEq when c supports equality / derive Clone in all cases
+      s :=
+        [R.EnumDecl(
+           R.Enum(
+             c.docString,
+             if cIsEq then
+               [R.RawAttribute("#[derive(PartialEq, Clone)]")]
+             else
+               [R.RawAttribute("#[derive(Clone)]")],
+             datatypeName,
+             rTypeParamsDecls,
+             ctors
+           )),
+         R.ImplDecl(
+           R.Impl(
+             rTypeParamsDecls,
+             R.TypeApp(R.TIdentifier(datatypeName), rTypeParams),
+             implBody
+           ))];
+
+      var printImplBodyCases: seq<R.MatchCase> := [];
+      var hashImplBodyCases: seq<R.MatchCase> := [];
+      var coerceImplBodyCases: seq<R.MatchCase> := [];
+
+      for i := 0 to |c.ctors| {
+        var ctor := c.ctors[i];
+        var ctorMatch := escapeName(ctor.name);
+
+        var modulePrefix := if c.enclosingModule.id.dafny_name == "_module" then "" else c.enclosingModule.id.dafny_name + ".";
+        var ctorName := modulePrefix + c.name.dafny_name + "." + ctor.name.dafny_name;
+        if |ctorName| >= 13 && ctorName[0..13] == "_System.Tuple" {
+          ctorName := "";
+        }
+        var printRhs := writeStr(ctorName + (if ctor.hasAnyArgs then "(" else ""));
+        var hashRhs := InitEmptyExpr();
+        var coerceRhsArgs := [];
+
+        var isNumeric := false;
+        var ctorMatchInner := "";
+        for j := 0 to |ctor.args| {
+          var dtor := ctor.args[j];
+          var patternName := escapeVar(dtor.formal.name);
+          var formalType := dtor.formal.typ;
+          if j == 0 && patternName == "0" {
+            isNumeric := true;
+          }
+          if isNumeric {
+            patternName := dtor.callName.GetOr("v" + Strings.OfNat(j));
+          }
+          hashRhs :=
+            if formalType.Arrow? then
+              hashRhs.Then(R.LiteralInt("0").Sel("hash").Apply1(R.Identifier("_state")))
+            else
+              hashRhs.Then(R.std.MSel("hash").MSel("Hash").AsExpr().FSel("hash").Apply([R.Identifier(patternName), R.Identifier("_state")]));
+
+          ctorMatchInner := ctorMatchInner + patternName + ", ";
+
+          if (j > 0) {
+            printRhs := printRhs.Then(writeStr(", "));
+          }
+
+          printRhs := printRhs.Then(
+            if formalType.Arrow? then
+              writeStr("<function>")
+            else
+              R.UnaryOp("?",
+                        R.dafny_runtime.MSel("DafnyPrint").AsExpr().FSel("fmt_print").Apply([
+                                                                                              R.Identifier(patternName),
+                                                                                              R.Identifier("_formatter"),
+                                                                                              R.LiteralBool(false)
+                                                                                            ]), Format.UnaryOpFormat.NoFormat)
+          );
+
+          var coerceRhsArg: R.Expr;
+
+          //var formalTpe := GenType(formalType, GenTypeContext.default());
+          //var newFormalType :=
+          var formalTpe := GenType(formalType, GenTypeContext.default());
+
+          var newFormalType := formalType.Replace(coerceMap);
+          var newFormalTpe := formalTpe.ReplaceMap(rCoerceMap);
+
+          var upcastConverter := UpcastConversionLambda(formalType, formalTpe, newFormalType, newFormalTpe, coerceMapToArg);
+          if upcastConverter.Success? {
+            var coercionFunction := upcastConverter.value;
+            coerceRhsArg := coercionFunction.Apply1(R.Identifier(patternName));
+          } else {
+            error := Some("Could not generate coercion function for contructor " + Strings.OfNat(j) + " of " + datatypeName);
+            coerceRhsArg := R.Identifier("todo!").Apply1(R.LiteralString(error.value, false, false));
+          }
+
+          coerceRhsArgs := coerceRhsArgs + [R.AssignIdentifier(patternName, coerceRhsArg)];
+        }
+        var coerceRhs := R.StructBuild(R.Identifier(datatypeName).FSel(escapeName(ctor.name)),
+                                       coerceRhsArgs);
+
+        if isNumeric {
+          ctorMatch := ctorMatch + "(" + ctorMatchInner + ")";
+        } else {
+          ctorMatch := ctorMatch + "{" + ctorMatchInner + "}";
+        }
+
+        if (ctor.hasAnyArgs) {
+          printRhs := printRhs.Then(writeStr(")"));
+        }
+
+        printRhs := printRhs.Then(R.Identifier("Ok").Apply([R.Tuple([])]));
+
+        printImplBodyCases := printImplBodyCases + [
+          R.MatchCase(R.RawPattern(datatypeName + "::" + ctorMatch),
+                      R.Block(printRhs))
+        ];
+        hashImplBodyCases := hashImplBodyCases + [
+          R.MatchCase(R.RawPattern(datatypeName + "::" + ctorMatch),
+                      R.Block(hashRhs))
+        ];
+        coerceImplBodyCases := coerceImplBodyCases + [
+          R.MatchCase(R.RawPattern(datatypeName + "::" + ctorMatch),
+                      R.Block(coerceRhs))
+        ];
+      }
+
+      if |c.typeParams| > 0 && |unusedTypeParams| > 0 {
+        var extraCases := [
+          R.MatchCase(
+            R.RawPattern(datatypeName + "::_PhantomVariant(..)"),
+            R.Block(UnreachablePanicIfVerified(pointerType)))
+        ];
+        printImplBodyCases := printImplBodyCases + extraCases;
+        hashImplBodyCases := hashImplBodyCases + extraCases;
+        coerceImplBodyCases := coerceImplBodyCases + extraCases;
+      }
+      var defaultConstrainedTypeParams := R.TypeParamDecl.AddConstraintsMultiple(
+        rTypeParamsDecls, [R.DefaultTrait]
+      );
+      var rTypeParamsDeclsWithEq := R.TypeParamDecl.AddConstraintsMultiple(
+        rTypeParamsDecls, [R.Eq]
+      );
+      var rTypeParamsDeclsWithHash := R.TypeParamDecl.AddConstraintsMultiple(
+        rTypeParamsDecls, [R.Hash]
+      );
+      var printImplBody := R.Match(
+        R.self,
+        printImplBodyCases);
+      var hashImplBody := R.Match(
+        R.self,
+        hashImplBodyCases
+      );
+
+      // Implementation of Debug and Print traits
+      var datatypeType := R.TypeApp(R.TIdentifier(datatypeName), rTypeParams);
+      s := s + [
+        DebugImpl(rTypeParamsDecls, datatypeType, rTypeParams),
+        PrintImpl(rTypeParamsDecls, datatypeType, rTypeParams, printImplBody)
+      ];
+      if |rCoerceTypeParams| > 0 {
+        var coerceImplBody := R.Match(
+          R.Identifier("this"),
+          coerceImplBodyCases);
+        s := s + [
+          CoerceImpl(rTypeParamsDecls, datatypeName, datatypeType, rCoerceTypeParams, coerceArguments, coerceTypes, coerceImplBody)
+        ];
+      }
+
+      if |singletonConstructors| == |c.ctors| {
+        var instantiationType :=
+          if IsRcWrapped(c.attributes) then
+            R.Rc(datatypeType)
+          else
+            datatypeType;
+        s := s + [
+          SingletonsImpl(rTypeParamsDecls, datatypeType, instantiationType, singletonConstructors)];
+      }
+
+      // Implementation of Eq when c supports equality
+      if cIsEq {
+        s := s + [
+          R.ImplDecl(
+            R.ImplFor(
+              rTypeParamsDeclsWithEq,
+              R.Eq,
+              R.TypeApp(R.TIdentifier(datatypeName), rTypeParams),
+              []
+            )
+          )];
+      }
+
+      // Implementation of Hash trait
+      s := s + [
+        HashImpl(
+          rTypeParamsDeclsWithHash,
+          R.TypeApp(R.TIdentifier(datatypeName), rTypeParams),
+          hashImplBody)];
+
+      if |c.ctors| > 0 {
+        var structName := R.Identifier(datatypeName).FSel(escapeName(c.ctors[0].name));
+        var structAssignments: seq<R.AssignIdentifier> := [];
+        for i := 0 to |c.ctors[0].args| {
+          var dtor := c.ctors[0].args[i];
+          structAssignments := structAssignments + [
+            R.AssignIdentifier(
+              escapeVar(dtor.formal.name),
+              R.std.MSel("default").MSel("Default").AsExpr().FSel("default").Apply0())
+          ];
+        }
+        var fullType := R.TypeApp(R.TIdentifier(datatypeName), rTypeParams);
+
+        // Implementation of Default trait when c supports equality
+        if cIsEq {
+          s := s +
+          [ DefaultDatatypeImpl(
+              rTypeParamsDecls,
+              fullType,
+              structName,
+              structAssignments)];
+        }
+
+        // Implementation of AsRef trait
+        s := s + [
+          AsRefDatatypeImpl(
+            rTypeParamsDecls,
+            fullType
+          )];
+      }
+      var superTraitImplementations := GenTraitImplementations(
+        path,
+        rTypeParams,
+        rTypeParamsDecls,
+        c.superTraitTypes,
+        traitBodies,
+        extern,
+        "datatype");
+      s := s + superTraitImplementations;
+    }
+
+    method GenPath(p: seq<Ident>, escape: bool := true) returns (r: R.Path) {
+      if |p| == 0 {
+        return R.Self();
+      } else {
+        var p := p; // Make p mutable
+        var name := p[0].id.dafny_name;
+        if |name| >= 2 && name[0..2] == "::" {
+          r := R.Global();
+          p := p[0 := Ident.Ident(Name(name[2..]))];
+        } else if p[0].id.dafny_name == "_System" {
+          r := R.dafny_runtime;
+        } else {
+          r := thisFile;
+        }
+        for i := 0 to |p| {
+          var name := p[i].id;
+          if escape {
+            var (modules, finalName) := DafnyNameToContainingPathAndName(name);
+            for j := 0 to |modules| {
+              r := r.MSel(escapeName(modules[j].id));
+            }
+            r := r.MSel(escapeName(finalName));
+          } else {
+            // TODO: Try removing this else branch and the escape test.
+            r := r.MSels(SplitRustPathElement(ReplaceDotByDoubleColon(name.dafny_name)));
+          }
+        }
+      }
+    }
+
+    method GenPathType(p: seq<Ident>) returns (t: R.Type) {
+      var p := GenPath(p, true);
+      t := p.AsType();
+    }
+
+    method GenPathExpr(p: seq<Ident>, escape: bool := true) returns (e: R.Expr) {
+      if |p| == 0 {
+        return R.self;
+      }
+      var p := GenPath(p, escape);
+      e := p.AsExpr();
+    }
+
+    method GenTypeArgs(args: seq<Type>, genTypeContext: GenTypeContext) returns (s: seq<R.Type>) {
+      s := [];
+      for i := 0 to |args| {
+        var genTp := GenType(args[i], genTypeContext);
+        s := s + [genTp];
+      }
+    }
+
+    predicate IsRcWrapped(attributes: seq<Attribute>) {
+      (Attribute("auto-nongrowing-size", []) !in attributes &&
+       Attribute("rust_rc", ["false"]) !in attributes) ||
+      Attribute("rust_rc", ["true"]) in attributes
+    }
+
+    /** The type context is useful in the case when we need to generate a type
+        in a position that requires a variant of the given type.
+
+        For now, it makes it possible to ensure that:
+        GenType(UserDefined(ResolveType(["U"], Trait()), ForTrait()) == U
+
+        but
+
+        GenType(UserDefined(ResolveType(["U"], Trait()), default()) == Object<dyn U>
+     
+        so that we can generate U instead of Object<dyn U> in the following context:
+
+        trait U: Any {}
+        trait T: Any + U {}
+
+        The last U is obtained with GenType() with GenTypeContext(forTraitParents := true)
+        Otherwise, we would have had Object<dyn U>, which is not a trait type.
+     */
+    method GenType(c: Type, genTypeContext: GenTypeContext) returns (s: R.Type) {
+      match c {
+        case UserDefined(resolved) => {
+          var t := GenPathType(resolved.path);
+          var typeArgs := GenTypeArgs(resolved.typeArgs, genTypeContext.(forTraitParents := false));
+          s := if |typeArgs| > 0 then R.TypeApp(t, typeArgs) else t;
+
+          match resolved.kind {
+            case Class() => {
+              s := Object(s);
+            }
+            case Datatype(_) => {
+              if IsRcWrapped(resolved.attributes) {
+                s := R.Rc(s);
+              }
+            }
+            case Trait(GeneralTrait()) => {
+              if !genTypeContext.forTraitParents {
+                s := R.Box(R.DynType(s));
+              }
+            }
+            case Trait(ObjectTrait()) => {
+              if resolved.path == [Ident.Ident(Name("_System")), Ident.Ident(Name("object"))] {
+                s := R.AnyTrait;
+              }
+              if !genTypeContext.forTraitParents {
+                s := Object(R.DynType(s));
+              }
+            }
+            case SynonymType(base) => {
+              var underlying := GenType(base, GenTypeContext.default());
+              s := R.TSynonym(s, underlying);
+            }
+            case Newtype(base, range, erased) => {
+              if erased {
+                var unwrappedType := NewtypeRangeToUnwrappedBoundedRustType(base, range);
+                if unwrappedType.Some? {
+                  s := unwrappedType.value;
+                } else {
+                  var unwrappedType := GenType(base, GenTypeContext.default());
+                  s := unwrappedType;
+                }
+              } else if IsNewtypeCopy(range) {
+                s := R.TMetaData(s, copySemantics := true, overflow := range.CanOverflow());
+              }
+            }
+          }
+        }
+        case Object() => {
+          s := R.AnyTrait;
+          if !genTypeContext.forTraitParents {
+            s := Object(R.DynType(s));
+          }
+        }
+        case Tuple(types) => {
+          var args := [];
+          var i := 0;
+          while i < |types| {
+            var generated := GenType(types[i], genTypeContext.(forTraitParents := false));
+            args := args + [generated];
+            i := i + 1;
+          }
+          s := if |types| <= R.MAX_TUPLE_SIZE then R.TupleType(args) else R.SystemTupleType(args);
+        }
+        case Array(element, dims) => {
+          if dims > 16 {
+            s := R.RawType("<i>Array of dimensions greater than 16</i>");
+          } else {
+            var elem := GenType(element, genTypeContext.(forTraitParents := false));
+            if dims == 1 {
+              s := R.Array(elem, None);
+              s := Object(s);
+            } else {
+              var n := "Array" + Strings.OfNat(dims);
+              s := R.dafny_runtime.MSel(n).AsType().Apply([elem]);
+              s := Object(s);
+            }
+          }
+        }
+        case Seq(element) => {
+          var elem := GenType(element, genTypeContext.(forTraitParents := false));
+          s := R.TypeApp(R.dafny_runtime.MSel("Sequence").AsType(), [elem]);
+        }
+        case Set(element) => {
+          var elem := GenType(element, genTypeContext.(forTraitParents := false));
+          s := R.TypeApp(R.dafny_runtime.MSel("Set").AsType(), [elem]);
+        }
+        case Multiset(element) => {
+          var elem := GenType(element, genTypeContext.(forTraitParents := false));
+          s := R.TypeApp(R.dafny_runtime.MSel("Multiset").AsType(), [elem]);
+        }
+        case Map(key, value) => {
+          var keyType := GenType(key, genTypeContext.(forTraitParents := false));
+          var valueType := GenType(value, genTypeContext);
+          s := R.TypeApp(R.dafny_runtime.MSel("Map").AsType(), [keyType, valueType]);
+        }
+        case MapBuilder(key, value) => {
+          var keyType := GenType(key, genTypeContext.(forTraitParents := false));
+          var valueType := GenType(value, genTypeContext);
+          s := R.TypeApp(R.dafny_runtime.MSel("MapBuilder").AsType(), [keyType, valueType]);
+        }
+        case SetBuilder(elem) => {
+          var elemType := GenType(elem, genTypeContext.(forTraitParents := false));
+          s := R.TypeApp(R.dafny_runtime.MSel("SetBuilder").AsType(), [elemType]);
+        }
+        case Arrow(args, result) => {
+          var argTypes := [];
+          var i := 0;
+          while i < |args| {
+
+            var generated := GenType(args[i], genTypeContext.(forTraitParents := false));
+            argTypes := argTypes + [R.Borrowed(generated)];
+            i := i + 1;
+          }
+
+          var resultType := GenType(result, GenTypeContext.default());
+          s :=
+            R.Rc(R.DynType(R.FnType(argTypes, resultType)));
+        }
+        case TypeArg(Ident(name)) => s := R.TIdentifier(escapeName(name));
+        case Primitive(p) => {
+          match p {
+            case Int => s := R.dafny_runtime.MSel("DafnyInt").AsType();
+            case Real => s := R.dafny_runtime.MSel("BigRational").AsType();
+            case String => s := R.TypeApp(R.dafny_runtime.MSel("Sequence").AsType(),
+                                          [R.dafny_runtime.MSel(DafnyChar).AsType()]);
+            case Native => s := R.Type.USIZE;
+            case Bool => s := R.Type.Bool;
+            case Char => s := R.dafny_runtime.MSel(DafnyChar).AsType();
+          }
+        }
+        case Passthrough(v) => s := R.RawType(v);
+      }
+    }
+
+    predicate EnclosingIsTrait(tpe: Type) {
+      tpe.UserDefined? && tpe.resolved.kind.Trait?
+    }
+
+    method GenClassImplBody(body: seq<ClassItem>, forTrait: bool, enclosingType: Type, enclosingTypeParams: seq<Type>)
+      returns (s: seq<R.ImplMember>, traitBodies: map<seq<Ident>, seq<R.ImplMember>>)
+      modifies this
+    {
+      s := [];
+      traitBodies := map[];
+
+      for i := 0 to |body| {
+        match body[i] {
+          case Method(m) => {
+            match m.overridingPath {
+              case Some(p) => {
+                var existing: seq<R.ImplMember> := [];
+                if p in traitBodies {
+                  existing := traitBodies[p];
+                }
+                if |m.typeParams| > 0 && EnclosingIsTrait(enclosingType) {
+                  error := Some("Error: Rust does not support method with generic type parameters in traits");
+                }
+
+                var genMethod := GenMethod(m, true, enclosingType, enclosingTypeParams);
+                existing := existing + [genMethod];
+
+                traitBodies := traitBodies + map[p := existing];
+              }
+              case None => {
+                var generated := GenMethod(m, forTrait, enclosingType, enclosingTypeParams);
+                s := s + [generated];
+              }
+            }
+          }
+        }
+      }
+    }
+
+    // Transform DAST formals to Rust formals
+    method GenParams(params: seq<Formal>, forLambda: bool := false) returns (s: seq<R.Formal>)
+      ensures |s| == |params|
+    {
+      s := [];
+      for i := 0 to |params| invariant |s| == i && i <= |params| {
+        var param := params[i];
+        var paramType := GenType(param.typ, GenTypeContext.default());
+        if (!paramType.CanReadWithoutClone() || forLambda) && AttributeOwned !in param.attributes {
+          paramType := R.Borrowed(paramType);
+        }
+        s := s + [R.Formal(escapeVar(param.name), paramType)];
+      }
+    }
+
+    method GenMethod(m: Method, forTrait: bool, enclosingType: Type, enclosingTypeParams: seq<Type>) returns (s: R.ImplMember)
+      modifies this
+    {
+      var params: seq<R.Formal> := GenParams(m.params);
+      var paramNames := [];
+      var paramTypes := map[];
+      for paramI := 0 to |m.params| {
+        var dafny_formal := m.params[paramI];
+        var formal := params[paramI];
+        var name := formal.name;
+        paramNames := paramNames + [name];
+        paramTypes := paramTypes[name := formal.tpe];
+      }
+      var fnName := escapeName(m.name);
+
+      var selfIdent := NoSelf;
+
+      if (!m.isStatic) {
+        var selfId := "self";
+        if m.outVarsAreUninitFieldsToAssign {
+          // Constructors take a raw pointer, which is not accepted as a self type in Rust
+          selfId := "this";
+        }
+        var instanceType := match enclosingType {
+          case UserDefined(r) =>
+            UserDefined(r.(typeArgs := enclosingTypeParams))
+          case _ => enclosingType
+        };
+        if (forTrait) {
+          var selfFormal := R.Formal.selfBorrowed;
+          params := [selfFormal] + params;
+        } else {
+          var tpe := GenType(instanceType, GenTypeContext.default());
+          if selfId == "this" {
+            if pointerType.RcMut? {
+              tpe := R.Borrowed(tpe);
+            }
+            // For raw pointers, no borrowing is necessary, because it implements the Copy type
+          } else if selfId == "self" {
+            if tpe.IsObjectOrPointer() { // For classes and traits
+              tpe := R.SelfBorrowed;
+            } else { // For Rc-defined datatypes
+              if enclosingType.UserDefined? && enclosingType.resolved.kind.Datatype?
+                 && IsRcWrapped(enclosingType.resolved.attributes) {
+                tpe := R.Borrowed(R.Rc(R.SelfOwned));
+              } else if enclosingType.UserDefined? && enclosingType.resolved.kind.Newtype?
+                        && IsNewtypeCopy(enclosingType.resolved.kind.range) {
+                tpe := R.TMetaData(
+                  R.SelfOwned,
+                  copySemantics := true,
+                  overflow := enclosingType.resolved.kind.range.CanOverflow());
+              } else { // For raw-defined datatypes, non-copy newtypes
+                tpe := R.SelfBorrowed;
+              }
+            }
+          }
+          var formal := R.Formal(selfId, tpe);
+          params := [formal] + params;
+          var name := formal.name;
+          paramNames := [name] + paramNames;
+          paramTypes := paramTypes[name := formal.tpe];
+        }
+        selfIdent := ThisTyped(selfId, instanceType);
+      }
+
+      // TODO: Use mut instead of a tuple for the API of multiple output parameters
+      var retTypeArgs := [];
+      //var retType := if |m.outTypes| != 1 then "(" else "";
+
+      var typeI := 0;
+      while typeI < |m.outTypes| {
+        var typeExpr := GenType(m.outTypes[typeI], GenTypeContext.default());
+        retTypeArgs := retTypeArgs + [typeExpr];
+
+        typeI := typeI + 1;
+      }
+
+      var visibility := if forTrait then R.PRIV else R.PUB;
+
+      var typeParamsFiltered := [];
+      for typeParamI := 0 to |m.typeParams| {
+        var typeParam := m.typeParams[typeParamI];
+        if !(TypeArg(typeParam.name) in enclosingTypeParams) {
+          typeParamsFiltered := typeParamsFiltered + [typeParam];
+        }
+      }
+
+      var typeParams: seq<R.TypeParamDecl> := [];
+
+      if (|typeParamsFiltered| > 0) {
+        for i := 0 to |typeParamsFiltered| {
+          var typeArg, rTypeParamDecl := GenTypeParam(typeParamsFiltered[i]);
+          rTypeParamDecl := rTypeParamDecl.(constraints := rTypeParamDecl.constraints);
+          typeParams := typeParams + [rTypeParamDecl];
+        }
+      }
+
+      var fBody: Option<R.Expr>;
+      var env: Environment;
+      var preBody := InitEmptyExpr();
+      var preAssignNames: seq<string> := [];
+      var preAssignTypes: map<string, R.Type> := map[];
+
+      if m.hasBody {
+        var earlyReturn: Option<seq<string>> := None;
+        match m.outVars {
+          case Some(outVars) => {
+            if m.outVarsAreUninitFieldsToAssign {
+              earlyReturn := Some([]);
+              for outI := 0 to |outVars| {
+                var outVar := outVars[outI];
+                var outName := escapeVar(outVar);
+                var tracker_name := AddAssignedPrefix(outName);
+                preAssignNames := preAssignNames + [tracker_name];
+                preAssignTypes := preAssignTypes[tracker_name := R.Type.Bool];
+
+                preBody := preBody.Then(R.DeclareVar(R.MUT, tracker_name, Some(R.Type.Bool), Some(R.LiteralBool(false))));
+              }
+            } else {
+              var tupleArgs := [];
+              assume {:axiom} |m.outTypes| == |outVars|;
+              var isTailRecursive := |m.body| == 1 && m.body[0].TailRecursive?;
+
+              for outI := 0 to |outVars| {
+                var outVar := outVars[outI];
+                var outTyp := m.outTypes[outI];
+                var outType := GenType(outTyp, GenTypeContext.default());
+                var outName := escapeVar(outVar);
+                if !isTailRecursive {// Out parameters are assigned in the inner block
+                  paramNames := paramNames + [outName];
+                  var outMaybeType := if outType.CanReadWithoutClone() then outType else R.MaybePlaceboType(outType);
+                  paramTypes := paramTypes[outName := outMaybeType];
+                }
+                tupleArgs := tupleArgs + [outName];
+              }
+              earlyReturn := Some(tupleArgs);
+            }
+          }
+          case None => {}
+        }
+        env := Environment(preAssignNames + paramNames, preAssignTypes + paramTypes, {});
+
+        var body, _, _ := GenStmts(m.body, selfIdent, env, true, earlyReturn);
+
+        fBody := Some(preBody.Then(body));
+      } else {
+        env := Environment(paramNames, paramTypes, {});
+        fBody := None;
+      }
+      s := R.FnDecl(
+        m.docString, R.NoAttr,
+        visibility,
+        R.Fn(
+          fnName,
+          typeParams,
+          params,
+          Some(if |retTypeArgs| == 1 then retTypeArgs[0] else R.TupleType(retTypeArgs)),
+          fBody
+        )
+      );
+    }
+
+    method GenStmts(stmts: seq<Statement>, selfIdent: SelfInfo, env: Environment, isLast: bool, earlyReturn: Option<seq<string>>)
+      returns (generated: R.Expr, readIdents: set<string>, newEnv: Environment)
+      decreases stmts, 1, 0
+      modifies this
+    {
+      generated := InitEmptyExpr();
+      var declarations := {};
+      readIdents := {};
+      var i := 0;
+      newEnv := env;
+      while i < |stmts| {
+        var stmt := stmts[i];
+        // Special case "var x: T; x = ...". We need to merge them
+        // because normally x can read a variable named x, and with two statements
+        // this is not possible.
+        if stmt.DeclareVar? && stmt.maybeValue.None? &&
+           i + 1 < |stmts| &&
+           stmts[i + 1].Assign? &&
+           stmts[i + 1].lhs.Ident? &&
+           stmts[i + 1].lhs.ident == stmt.name {
+          var name := stmt.name;
+          var typ := stmt.typ;
+          var stmtExpr, recIdents, newEnv2 := GenDeclareVarAssign(name, typ, stmts[i + 1].value, selfIdent, newEnv);
+          newEnv := newEnv2;
+          readIdents := readIdents + (recIdents - declarations);
+          declarations := declarations + {escapeVar(name)};
+          generated := generated.Then(stmtExpr);
+          i := i + 2;
+        } else {
+          // Avoid maybe placebo wrapping if not necessary
+          match stmt {
+            case DeclareVar(name, optType, None) =>
+              var laterAssignmentStatus := DetectAssignmentStatus(stmts[i + 1..], name);
+              newEnv := newEnv.AddAssignmentStatus(escapeVar(name), laterAssignmentStatus);
+            case DeclareVar(name, optType, Some(InitializationValue(typ))) =>
+              var tpe := GenType(typ, GenTypeContext.default());
+              var varName := escapeVar(name);
+              var laterAssignmentStatus := DetectAssignmentStatus(stmts[i + 1..], name);
+              newEnv := newEnv.AddAssignmentStatus(varName, laterAssignmentStatus);
+            case _ =>
+          }
+          var stmtExpr, recIdents, newEnv2 := GenStmt(stmt, selfIdent, newEnv, isLast && (i == |stmts| - 1), earlyReturn);
+          newEnv := newEnv2;
+
+          match stmt {
+            case DeclareVar(name, _, _) => {
+              declarations := declarations + {escapeVar(name)};
+            }
+            case _ => {}
+          }
+          readIdents := readIdents + (recIdents - declarations);
+          generated := generated.Then(stmtExpr);
+          if stmtExpr.Return? { // The rest of statements is unreachable
+            break;
+          }
+
+          i := i + 1;
+        }
+      }
+    }
+
+    method GenDeclareVarAssign(name: VarName, typ: Type, rhs: Expression, selfIdent: SelfInfo, env: Environment)
+      returns (generated: R.Expr, readIdents: set<string>, newEnv: Environment)
+      decreases rhs
+      modifies this
+    {
+      var tpe := GenType(typ, GenTypeContext.default());
+      var varName := escapeVar(name);
+      var exprRhs;
+      if rhs.InitializationValue? &&
+         tpe.IsObjectOrPointer() {
+        readIdents := {};
+        tpe := if rhs.NewUninitArray? then tpe.TypeAtInitialization() else tpe;
+        exprRhs := tpe.ToNullExpr();
+      } else {
+        var expr, exprOwnership;
+        expr, exprOwnership, readIdents := GenExpr(rhs, selfIdent, env, OwnershipOwned);
+        tpe := if rhs.NewUninitArray? then tpe.TypeAtInitialization() else tpe;
+        exprRhs := expr;
+      }
+      generated := R.DeclareVar(R.MUT, varName, Some(tpe), Some(exprRhs));
+      newEnv := env.AddAssigned(varName, tpe);
+    }
+
+    method GenAssignLhs(lhs: AssignLhs, rhs: R.Expr, selfIdent: SelfInfo, env: Environment) returns (generated: R.Expr, needsIIFE: bool, readIdents: set<string>, newEnv: Environment)
+      decreases lhs, 1
+      modifies this
+    {
+      newEnv := env;
+      match lhs {
+        case Ident(id) => {
+          var idRust := escapeVar(id);
+          if env.IsBorrowed(idRust) || env.IsBorrowedMut(idRust) {
+            generated := R.AssignVar("*" + idRust, rhs);
+          } else {
+            generated := R.AssignVar(idRust, rhs);
+          }
+
+          readIdents := {idRust};
+          needsIIFE := false;
+        }
+
+        case Select(on, field, isConstant) => {
+          var fieldName := escapeVar(field);
+          var onExpr, onOwned, recIdents := GenExpr(on, selfIdent, env, OwnershipAutoBorrowed);
+
+          match onExpr { // Particular case of the constructor, we don't want the previous value to be dropped if it's assigned the first time
+            case Call(Select(Identifier("this"), "clone"), _)
+              | Identifier("this")
+              | UnaryOp("&", Identifier("this"), _) =>
+              var isAssignedVar := AddAssignedPrefix(fieldName);
+              if isAssignedVar in newEnv.names {
+                var update_field_uninit :=
+                  if isConstant then
+                    update_field_uninit_macro
+                  else
+                    update_field_mut_uninit_macro;
+                generated := R.dafny_runtime.MSel(update_field_uninit).AsExpr().Apply(
+                  [ thisInConstructor,
+                    R.Identifier(fieldName),
+                    R.Identifier(isAssignedVar),
+                    rhs]);
+                newEnv := newEnv.RemoveAssigned(isAssignedVar);
+              } else {
+                // Already assigned, safe to override
+                generated := modify_mutable_field_macro.Apply([read_macro.Apply1(thisInConstructor).Sel(fieldName), rhs]);
+              }
+            case _ =>
+              if onExpr != R.Identifier("self") {
+                onExpr := read_macro.Apply1(onExpr);
+              }
+              generated := modify_mutable_field_macro.Apply([onExpr.Sel(fieldName), rhs]);
+          }
+          readIdents := recIdents;
+          needsIIFE := false;
+        }
+
+        case Index(on, indices) => {
+          // Retrieve the pointer to the array
+          var onExpr, onOwned, recIdents := GenExpr(on, selfIdent, env, OwnershipAutoBorrowed);
+          readIdents := recIdents;
+
+          onExpr := modify_macro.Apply1(onExpr);
+
+          var r := InitEmptyExpr();
+
+          var indicesExpr := [];
+          for i := 0 to |indices| {
+            var idx, _, recIdentsIdx := GenExpr(indices[i], selfIdent, env, OwnershipOwned);
+            var varName := "__idx" + Strings.OfNat(i);
+            indicesExpr := indicesExpr + [R.Identifier(varName)];
+            r := r.Then(
+              R.DeclareVar(
+                R.CONST, varName, None,
+                Some(
+                  R.IntoUsize(idx))));
+            readIdents := readIdents + recIdentsIdx;
+          }
+
+          if |indices| > 1 { // Multi-dimensional arrays
+            onExpr := onExpr.Sel("data");
+          }
+
+          generated := r.Then(R.Assign(Some(R.Index(onExpr, indicesExpr)), rhs));
+          needsIIFE := true;
+        }
+      }
+    }
+
+    @IsolateAssertions @ResourceLimit("1e6")
+    method GenOwnedCallPart(ghost e: Expression, on: Expression, selfIdent: SelfInfo, name: CallName, typeArgs: seq<Type>, args: seq<Expression>, env: Environment) returns (r: R.Expr, readIdents: set<string>)
+      requires forall a <- args :: a < e
+      requires on < e
+      modifies this
+      decreases e, 1, 1
+    {
+      var argExprs, recIdents, typeExprs, fullNameQualifier := GenArgs(e, selfIdent, name, typeArgs, args, env);
+      readIdents := recIdents;
+
+      match fullNameQualifier {
+        // Trait calls are fully specified as we can't guarantee traits will be in context
+        case Some(ResolvedType(path, onTypeArgs, base, _, _, _)) =>
+          var fullPath := GenPathExpr(path);
+          var onTypeExprs := GenTypeArgs(onTypeArgs, GenTypeContext.default());
+          var onExpr, recOwnership, recIdents;
+          if (base.Trait? && base.traitType.ObjectTrait?) || base.Class? {
+            // First we own a pointer, then we read it
+            onExpr, recOwnership, recIdents := GenExpr(on, selfIdent, env, OwnershipOwned);
+            onExpr := read_macro.Apply1(onExpr);
+            readIdents := readIdents + recIdents;
+          } else if base.Trait? && base.traitType.GeneralTrait? {
+            // General traits borrow their self, from a Box<dyn TraitName>
+            // The underlying type is a Box<dyn TraitName>, self: Datatype or Rc<Datatype>
+            // 'on' is going to return an owned version of this box.
+            onExpr, recOwnership, recIdents := GenExpr(on, selfIdent, env, OwnershipBorrowed);
+            if onExpr.Identifier? && env.NeedsAsRefForBorrow(onExpr.name) {
+              onExpr := onExpr.Sel("as_ref").Apply0();
+            } else if onExpr.IsBorrow() {
+              // If the resulting expression is a borrow, e.g. &something(), it means the trait was owned.
+              // In our case we want dynamic dispatch, so we need to get the bare reference.
+              // Because "on" is a general trait, we need to call as_ref() instead to get the bare expression
+              // If the onExpr is an identifier but not "self", we apply the same treatment
+              onExpr := R.std.MSel("convert").MSel("AsRef").AsExpr().FSel("as_ref").Apply1(onExpr);
+            }
+            readIdents := readIdents + recIdents;
+          } else if base.Newtype? && IsNewtypeCopy(base.range) {
+            // The self type of a newtype that is copy is also copy
+            onExpr, recOwnership, recIdents := GenExpr(on, selfIdent, env, OwnershipOwned);
+            readIdents := readIdents + recIdents;
+          } else {
+            // The self type of any other type is borrowed
+            onExpr, recOwnership, recIdents := GenExpr(on, selfIdent, env, OwnershipBorrowed);
+            readIdents := readIdents + recIdents;
+          }
+          r := fullPath.ApplyType(onTypeExprs).FSel(escapeName(name.name)).ApplyType(typeExprs).Apply([onExpr] + argExprs);
+        case _ => // Infix call on.name(args)
+          var onExpr, _, recIdents := GenExpr(on, selfIdent, env, OwnershipAutoBorrowed);
+          readIdents := readIdents + recIdents;
+          var renderedName := GetMethodName(on, name);
+          // Pointers in the role of "self" must be converted to borrowed versions.
+          match on {
+            case Companion(_, _) | ExternCompanion(_) => {
+              onExpr := onExpr.FSel(renderedName);
+            }
+            case _ => {
+              if onExpr != R.self { // Self has the reference type already
+                match name {
+                  case CallName(_, Some(tpe), _, _, _) =>
+                    var typ := GenType(tpe, GenTypeContext.default());
+                    if typ.IsObjectOrPointer() && onExpr != R.Identifier("self") {
+                      onExpr := read_macro.Apply1(onExpr);
+                    }
+                  case _ =>
+                }
+              }
+              onExpr := onExpr.Sel(renderedName);
+            }
+          }
+          r := onExpr.ApplyType(typeExprs).Apply(argExprs);
+      }
+    }
+
+    method GenStmt(stmt: Statement, selfIdent: SelfInfo, env: Environment, isLast: bool, earlyReturn: Option<seq<string>>) returns (generated: R.Expr, readIdents: set<string>, newEnv: Environment)
+      decreases stmt, 1, 1
+      modifies this
+    {
+      match stmt {
+        case ConstructorNewSeparator(fields) => {
+          generated := InitEmptyExpr();
+          readIdents := {};
+          newEnv := env;
+          for i := 0 to |fields| {
+            var field := fields[i];
+            var fieldName := escapeVar(field.formal.name);
+            var fieldTyp := GenType(field.formal.typ, GenTypeContext.default());
+            var isAssignedVar := AddAssignedPrefix(fieldName);
+            if isAssignedVar in newEnv.names {
+              assume {:axiom} InitializationValue(field.formal.typ) < stmt; // Needed for termination
+              var rhs, _, _ := GenExpr(InitializationValue(field.formal.typ), selfIdent, env, OwnershipOwned);
+              readIdents := readIdents + {isAssignedVar};
+              var update_if_uninit :=
+                if field.isConstant then update_field_if_uninit_macro else update_field_mut_if_uninit_macro;
+              generated := generated.Then(R.dafny_runtime.MSel(update_if_uninit).AsExpr().Apply(
+                                            [ R.Identifier("this"), R.Identifier(fieldName), R.Identifier(isAssignedVar), rhs]));
+              newEnv := newEnv.RemoveAssigned(isAssignedVar);
+            }
+          }
+        }
+        case DeclareVar(name, typ, Some(expression)) => {
+          var tpe := GenType(typ, GenTypeContext.default());
+          var varName := escapeVar(name);
+          var hasCopySemantics := tpe.CanReadWithoutClone();
+          if expression.InitializationValue? && !hasCopySemantics {
+            // We might be able to just let the variable uninitialized.
+            if env.IsAssignmentStatusKnown(varName) {
+              generated := R.DeclareVar(R.MUT, varName, Some(tpe), None);
+            } else {
+              generated := R.DeclareVar(R.MUT, varName, None, Some(R.MaybePlaceboPath.AsExpr().ApplyType1(tpe).FSel("new").Apply0()));
+              tpe := R.MaybePlaceboType(tpe);
+            }
+            readIdents := {};
+            newEnv := env.AddAssigned(varName, tpe);
+          } else {
+            generated, readIdents, newEnv := GenDeclareVarAssign(name, typ, expression, selfIdent, env);
+            return;
+          }
+        }
+        case DeclareVar(name, typ, None) => {
+          var varName := escapeVar(name);
+          if env.IsAssignmentStatusKnown(varName) {
+            var tpe := GenType(typ, GenTypeContext.default());
+            generated := R.DeclareVar(R.MUT, varName, Some(tpe), None);
+            readIdents := {};
+            newEnv := env.AddAssigned(varName, tpe);
+          } else {
+            var newStmt := DeclareVar(name, typ, Some(InitializationValue(typ)));
+            assume {:axiom} newStmt < stmt;
+            generated, readIdents, newEnv := GenStmt(newStmt, selfIdent, env, isLast, earlyReturn);
+          }
+        }
+        case Assign(lhs, expression) => {
+          var exprGen, _, exprIdents := GenExpr(expression, selfIdent, env, OwnershipOwned);
+          if lhs.Ident? {
+            var rustId := escapeVar(lhs.ident);
+            var tpe := env.GetType(rustId);
+            if tpe.Some? && tpe.value.ExtractMaybePlacebo().Some? {
+              exprGen := R.MaybePlacebo(exprGen);
+            }
+          }
+          if lhs.Index? && lhs.expr.Ident? {
+            var rustId := escapeVar(lhs.expr.name);
+            var tpe := env.GetType(rustId);
+            if tpe.Some? && tpe.value.ExtractMaybeUninitArrayElement().Some? {
+              exprGen := R.MaybeUninitNew(exprGen);
+            }
+          }
+          var lhsGen, needsIIFE, recIdents, resEnv := GenAssignLhs(lhs, exprGen, selfIdent, env);
+          generated := lhsGen;
+          newEnv := resEnv;
+
+          if needsIIFE {
+            generated := R.Block(generated);
+          }
+          readIdents := recIdents + exprIdents;
+        }
+        case If(cond, thnDafny, elsDafny) => {
+          var cond, _, recIdents := GenExpr(cond, selfIdent, env, OwnershipOwned);
+          var condString := cond.ToString(IND);
+
+          readIdents := recIdents;
+          var thn, thnIdents, thnEnv := GenStmts(thnDafny, selfIdent, env, isLast, earlyReturn);
+          readIdents := readIdents + thnIdents;
+          var els, elsIdents, elsEnv := GenStmts(elsDafny, selfIdent, env, isLast, earlyReturn);
+          readIdents := readIdents + elsIdents;
+          newEnv := env;
+          generated := R.IfExpr(cond, thn, els);
+        }
+        case Labeled(lbl, body) => {
+          var body, bodyIdents, env2 := GenStmts(body, selfIdent, env, isLast, earlyReturn);
+          readIdents := bodyIdents;
+          generated := R.Labelled("label_" + lbl, R.Loop(None, R.StmtExpr(body, R.Break(None))));
+          newEnv := env;
+        }
+        case While(cond, body) => {
+          var cond, _, recIdents := GenExpr(cond, selfIdent, env, OwnershipOwned);
+          readIdents := recIdents;
+
+          var bodyExpr, bodyIdents, bodyEnv := GenStmts(body, selfIdent, env, false, earlyReturn);
+
+          newEnv := env;
+          readIdents := readIdents + bodyIdents;
+          generated := R.Loop(Some(cond), bodyExpr);
+        }
+        case Foreach(boundName, boundType, overExpr, body) => {
+          // Variables are usually owned, so we request OwnershipOwned here although it's for each variable.
+          var over, _, recIdents := GenExpr(overExpr, selfIdent, env, OwnershipOwned);
+          if overExpr.MapBoundedPool? || overExpr.SetBoundedPool? {
+            over := over.Sel("cloned").Apply0();
+          }
+
+          var boundTpe := GenType(boundType, GenTypeContext.default());
+
+          readIdents := recIdents;
+          var boundRName: string := escapeVar(boundName);
+          var bodyExpr, bodyIdents, bodyEnv := GenStmts(body, selfIdent, env.AddAssigned(boundRName, boundTpe), false, earlyReturn);
+          readIdents := readIdents + bodyIdents - {boundRName};
+          newEnv := env;
+          generated := R.For(boundRName, over, bodyExpr);
+        }
+        case Break(toLabel) => {
+          match toLabel {
+            case Some(lbl) => {
+              generated := R.Break(Some("label_" + lbl));
+            }
+            case None => {
+              generated := R.Break(None);
+            }
+          }
+          readIdents := {};
+          newEnv := env;
+        }
+        case TailRecursive(body) => {
+          // clone the parameters to make them mutable
+          generated := InitEmptyExpr();
+
+          var oldEnv := env;
+          if selfIdent != NoSelf {
+            var selfClone, _, _ := GenIdent(selfIdent.rSelfName, selfIdent, Environment.Empty(), OwnershipOwned);
+            generated := generated.Then(R.DeclareVar(R.MUT, "_this", None, Some(selfClone)));
+            if selfIdent.rSelfName in oldEnv.names {
+              oldEnv := oldEnv.RemoveAssigned(selfIdent.rSelfName);
+            }
+          }
+          var loopBegin := R.RawExpr("");
+          newEnv := env;
+          for paramI := 0 to |oldEnv.names| {
+            var param := oldEnv.names[paramI];
+            if param == "_accumulator" {
+              continue; // This is an already mutable variable handled by SinglePassCodeGenerator
+            }
+            var paramInit, _, _ := GenIdent(param, selfIdent, oldEnv, OwnershipOwned);
+            var recVar := TailRecursionPrefix + Strings.OfNat(paramI);
+            generated := generated.Then(R.DeclareVar(R.MUT, recVar, None, Some(paramInit)));
+            if param in oldEnv.types {
+              // We made the input type owned by the variable.
+              // so we can remove borrow annotations.
+              var declaredType := oldEnv.types[param].ToOwned();
+              newEnv := newEnv.AddAssigned(param, declaredType);
+              newEnv := newEnv.AddAssigned(recVar, declaredType);
+            }
+            // Redeclare the input parameter, take ownership of the recursive value
+            loopBegin := loopBegin.Then(R.DeclareVar(R.CONST, param, None, Some(R.Identifier(recVar))));
+          }
+          var bodyExpr, bodyIdents, bodyEnv := GenStmts(body, if selfIdent != NoSelf then ThisTyped("_this", selfIdent.dafnyType) else NoSelf, newEnv, false, earlyReturn);
+          readIdents := bodyIdents;
+          generated := generated.Then(
+            R.Labelled("TAIL_CALL_START",
+                       R.Loop(None,
+                              loopBegin.Then(bodyExpr))));
+        }
+        case JumpTailCallStart() => {
+          generated := R.Continue(Some("TAIL_CALL_START"));
+          readIdents := {};
+          newEnv := env;
+        }
+        case Call(on, name, typeArgs, args, maybeOutVars) => {
+          assume {:axiom} Expression.Call(on, name, typeArgs, args) < stmt;
+          generated, readIdents := GenOwnedCallPart(Expression.Call(on, name, typeArgs, args), on, selfIdent, name, typeArgs, args, env);
+
+          newEnv := env;
+          if maybeOutVars.Some? && |maybeOutVars.value| == 1 {
+            var outVar := escapeVar(maybeOutVars.value[0]);
+            if env.IsMaybePlacebo(outVar) {
+              generated := R.MaybePlacebo(generated);
+            }
+            generated := R.AssignVar(outVar, generated);
+          } else if maybeOutVars.None? || |maybeOutVars.value| == 0 {
+            // Nothing to do here.
+          } else { // Multiple variables
+            var tmpVar := "_x";
+            var tmpId := R.Identifier(tmpVar);
+            generated := R.DeclareVar(R.CONST, tmpVar, None, Some(generated));
+            // We emit assignment to each receiver depending on its type, if it could be a placebo or not.
+            var outVars := maybeOutVars.value;
+            for outI := 0 to |outVars| {
+              var outVar := escapeVar(outVars[outI]);
+              var rhs := tmpId.Sel(Strings.OfNat(outI));
+              if env.IsMaybePlacebo(outVar) {
+                rhs := R.MaybePlacebo(rhs);
+              }
+              generated := generated.Then(R.AssignVar(outVar, rhs));
+            }
+          }
+          newEnv := env;
+        }
+        case Return(exprDafny) => {
+          var expr, _, recIdents := GenExpr(exprDafny, selfIdent, env, OwnershipOwned);
+          readIdents := recIdents;
+
+          if isLast {
+            generated := expr;
+          } else {
+            generated := R.Return(Some(expr));
+          }
+          newEnv := env;
+        }
+        case EarlyReturn() => {
+
+          match earlyReturn {
+            case None =>
+              generated := R.Return(None);
+            case Some(rustIdents) =>
+              var tupleArgs := [];
+              for i := 0 to |rustIdents| {
+                var rIdent, _, _ := GenIdent(rustIdents[i], selfIdent, env, OwnershipOwned);
+                tupleArgs := tupleArgs + [rIdent];
+              }
+              if |tupleArgs| == 1 {
+                generated := R.Return(Some(tupleArgs[0]));
+              } else {
+                generated := R.Return(Some(R.Tuple(tupleArgs)));
+              }
+          }
+          readIdents := {};
+          newEnv := env;
+        }
+        case Halt() => {
+          generated := R.Identifier("panic!").Apply1(R.LiteralString("Halt", false, false));
+          readIdents := {};
+          newEnv := env;
+        }
+        case Print(e) => {
+          var printedExpr, recOwnership, recIdents := GenExpr(e, selfIdent, env, OwnershipBorrowed);
+          generated := R.Identifier("print!").Apply([R.LiteralString("{}", false, false),
+                                                     R.dafny_runtime.MSel("DafnyPrintWrapper").AsExpr().Apply1(printedExpr)]);
+          readIdents := recIdents;
+          newEnv := env;
+        }
+      }
+    }
+
+    method FromOwned(r: R.Expr, expectedOwnership: Ownership)
+      returns (out: R.Expr, resultingOwnership: Ownership)
+      modifies this
+      ensures OwnershipGuarantee(expectedOwnership, resultingOwnership)
+    {
+      if expectedOwnership == OwnershipOwned || expectedOwnership == OwnershipAutoBorrowed {
+        out := r;
+        resultingOwnership := OwnershipOwned;
+      } else if expectedOwnership == OwnershipBorrowed {
+        out := R.Borrow(r);
+        resultingOwnership := OwnershipBorrowed;
+      } else {
+        assert expectedOwnership == OwnershipBorrowedMut;
+        out := Error("Conversion from Borrowed or BorrowedMut to BorrowedMut", r);
+        out := modify_macro.Apply1(out);
+        resultingOwnership := OwnershipBorrowedMut;
+      }
+    }
+
+    method FromOwnership(r: R.Expr, ownership: Ownership, expectedOwnership: Ownership)
+      returns (out: R.Expr, resultingOwnership: Ownership)
+      requires ownership != OwnershipAutoBorrowed
+      modifies this
+      ensures OwnershipGuarantee(expectedOwnership, resultingOwnership)
+    {
+      if ownership == expectedOwnership {
+        out := r;
+        resultingOwnership := expectedOwnership;
+        return;
+      }
+      if ownership == OwnershipOwned {
+        out, resultingOwnership := FromOwned(r, expectedOwnership);
+        return;
+      } else if ownership == OwnershipBorrowed || ownership == OwnershipBorrowedMut {
+        if expectedOwnership == OwnershipOwned{
+          resultingOwnership := OwnershipOwned;
+          out := r.Clone();
+        } else if expectedOwnership == ownership
+                  || expectedOwnership == OwnershipAutoBorrowed {
+          resultingOwnership := ownership;
+          out := r;
+        } else if expectedOwnership == OwnershipBorrowed
+                  && ownership == OwnershipBorrowedMut {
+          resultingOwnership := OwnershipBorrowed;
+          out := r;
+        } else {
+          assert expectedOwnership == OwnershipBorrowedMut;
+          resultingOwnership := OwnershipBorrowedMut;
+          out := R.BorrowMut(r); // Not sure if it will ever happen
+        }
+        return;
+      } else {
+        assert false;
+      }
+    }
+
+    method GenExprLiteral(
+      e: Expression,
+      selfIdent: SelfInfo,
+      env: Environment,
+      expectedOwnership: Ownership
+    ) returns (r: R.Expr, resultingOwnership: Ownership, readIdents: set<string>)
+      requires e.Literal?
+      modifies this
+      ensures OwnershipGuarantee(expectedOwnership, resultingOwnership)
+      decreases e, 0
+    {
+      match e {
+        case Literal(BoolLiteral(b)) => {
+          r, resultingOwnership :=
+            FromOwned(R.LiteralBool(b), expectedOwnership);
+          readIdents := {};
+          return;
+        }
+        case Literal(IntLiteral(i, t)) => {
+          match t {
+            case Primitive(Int) => {
+              if |i| <= 4 {
+                r := R.dafny_runtime.MSel("int!").AsExpr().Apply1(R.LiteralInt(i));
+              } else {
+                r := R.dafny_runtime.MSel("int!").AsExpr().Apply1(
+                  R.LiteralString(i, binary := true, verbatim := false));
+              }
+            }
+            case o => {
+              var genType := GenType(o, GenTypeContext.default());
+              r := R.TypeAscription(R.LiteralInt(i), genType);
+            }
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := {};
+          return;
+        }
+        case Literal(DecLiteral(n, d, t)) => {
+          match t {
+            case Primitive(Real) => {
+              r := R.dafny_runtime.MSel("BigRational").AsExpr().FSel("new").Apply(
+                [ R.dafny_runtime.MSel("BigInt").AsExpr().FSel("parse_bytes").Apply(
+                    [ R.LiteralString(n, binary := true, verbatim := false),
+                      R.LiteralInt("10")
+                    ]).Sel("unwrap").Apply0(),
+                  R.dafny_runtime.MSel("BigInt").AsExpr().FSel("parse_bytes").Apply(
+                    [ R.LiteralString(d, binary := true, verbatim := false),
+                      R.LiteralInt("10")
+                    ]).Sel("unwrap").Apply0()
+                ]);
+            }
+            case o => {
+              var genType := GenType(o, GenTypeContext.default());
+              r := R.TypeAscription(
+                R.BinaryOp("/",
+                           R.LiteralInt(n).Sel("0"),
+                           R.LiteralInt(d).Sel("0"), Format.BinaryOpFormat.NoFormat), genType);
+            }
+          }
+
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := {};
+          return;
+        }
+        case Literal(StringLiteral(l, verbatim)) => {
+          r := R.dafny_runtime.MSel(string_of).AsExpr().Apply1(R.LiteralString(l, binary := false, verbatim := verbatim));
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := {};
+          return;
+        }
+        case Literal(CharLiteralUTF16(c)) => {
+          r := R.LiteralInt(Strings.OfNat(c));
+          r := R.TypeAscription(r, R.U16);
+          r := R.dafny_runtime.MSel(DafnyChar).AsExpr().Apply1(r);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := {};
+          return;
+        }
+        case Literal(CharLiteral(c)) => {
+          r := R.LiteralInt(Strings.OfNat(c as nat));
+          if !charType.UTF32? {
+            r := R.TypeAscription(r, R.U16);
+          } else {
+            r :=
+              R.global.MSel("std").MSel("primitive")
+              .MSel("char").FSel("from_u32")
+              .Apply1(r).Sel("unwrap").Apply0();
+          }
+          r := R.dafny_runtime.MSel(DafnyChar).AsExpr().Apply1(r);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := {};
+          return;
+        }
+        case Literal(Null(tpe)) => {
+          var tpeGen := GenType(tpe, GenTypeContext.default());
+          if pointerType.Raw? {
+            r := R.dafny_runtime.MSel("Ptr").AsExpr().FSel("null").Apply([]);
+          } else {
+            r := R.TypeAscription(R.dafny_runtime.MSel("Object").AsExpr().Apply1(R.Identifier("None")), tpeGen);
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := {};
+          return;
+        }
+      }
+    }
+
+    method ToPrimitive(r: R.Expr, typ: Type, primitiveType: Type, env: Environment) returns (out: R.Expr)
+      modifies this
+    {
+      out := r;
+      if typ != primitiveType {
+        var dummy;
+        out, dummy := GenExprConvertTo(r, OwnershipOwned, typ, primitiveType, env, OwnershipOwned);
+      }
+    }
+
+    method ToBool(r: R.Expr, typ: Type, env: Environment) returns (out: R.Expr)
+      modifies this
+    {
+      out := ToPrimitive(r, typ, Primitive(Primitive.Bool), env);
+    }
+
+    method ToInt(r: R.Expr, typ: Type, env: Environment) returns (out: R.Expr)
+      modifies this
+    {
+      out := ToPrimitive(r, typ, Primitive(Primitive.Int), env);
+    }
+
+    method FromPrimitive(r: R.Expr, primitiveType: Type, typ: Type, env: Environment) returns (out: R.Expr)
+      modifies this
+    {
+      out := r;
+      if typ != primitiveType {
+        var dummy;
+        out, dummy := GenExprConvertTo(r, OwnershipOwned, primitiveType, typ, env, OwnershipOwned);
+      }
+    }
+
+    method FromBool(r: R.Expr, typ: Type, env: Environment) returns (out: R.Expr)
+      modifies this
+    {
+      out := FromPrimitive(r, Primitive(Primitive.Bool), typ, env);
+    }
+
+    method FromInt(r: R.Expr, typ: Type, env: Environment) returns (out: R.Expr)
+      modifies this
+    {
+      out := FromPrimitive(r, Primitive(Primitive.Int), typ, env);
+    }
+
+    method GenExprBinary(
+      e: Expression,
+      selfIdent: SelfInfo,
+      env: Environment,
+      expectedOwnership: Ownership
+    ) returns (r: R.Expr, resultingOwnership: Ownership, readIdents: set<string>)
+      requires e.BinOp?
+      modifies this
+      ensures OwnershipGuarantee(expectedOwnership, resultingOwnership)
+      decreases e, 0
+    {
+      var BinOp(TypedBinOp(op, lType, rType, resType), lExpr, rExpr, format) := e;
+      var becomesLeftCallsRight := BecomesLeftCallsRight(op);
+      var becomesRightCallsLeft := BecomesRightCallsLeft(op);
+      var expectedLeftOwnership :=
+        if becomesLeftCallsRight then OwnershipAutoBorrowed
+        else if becomesRightCallsLeft then OwnershipBorrowed
+        else OwnershipOwned;
+      var expectedRightOwnership :=
+        if becomesLeftCallsRight then OwnershipBorrowed
+        else if becomesRightCallsLeft then OwnershipAutoBorrowed
+        else OwnershipOwned;
+      var left, _, recIdentsL := GenExpr(lExpr, selfIdent, env, expectedLeftOwnership);
+      var right, _, recIdentsR := GenExpr(rExpr, selfIdent, env, expectedRightOwnership);
+
+      match op {
+        case In() => {
+          r := right.Sel("contains").Apply1(left);
+        }
+        case SeqProperPrefix() =>
+          r := R.BinaryOp("<", left, right, format);
+        case SeqPrefix() =>
+          r := R.BinaryOp("<=", left, right, format);
+        case SetMerge() => {
+          r := left.Sel("merge").Apply1(right);
+        }
+        case SetSubtraction() => {
+          r := left.Sel("subtract").Apply1(right);
+        }
+        case SetIntersection() => {
+          r := left.Sel("intersect").Apply1(right);
+        }
+        case Subset() => {
+          r := R.BinaryOp("<=", left, right, format);
+        }
+        case ProperSubset() => {
+          r := R.BinaryOp("<", left, right, format);
+        }
+        case SetDisjoint() => {
+          r := left.Sel("disjoint").Apply1(right);
+        }
+        case MapMerge() => {
+          r := left.Sel("merge").Apply1(right);
+        }
+        case MapSubtraction() => {
+          r := left.Sel("subtract").Apply1(right);
+        }
+        case MultisetMerge() => {
+          r := left.Sel("merge").Apply1(right);
+        }
+        case MultisetSubtraction() => {
+          r := left.Sel("subtract").Apply1(right);
+        }
+        case MultisetIntersection() => {
+          r := left.Sel("intersect").Apply1(right);
+        }
+        case Submultiset() => {
+          r := R.BinaryOp("<=", left, right, format);
+        }
+        case ProperSubmultiset() => {
+          r := R.BinaryOp("<", left, right, format);
+        }
+        case MultisetDisjoint() => {
+          r := left.Sel("disjoint").Apply1(right);
+        }
+        case Concat() => {
+          r := left.Sel("concat").Apply1(right);
+        }
+        case _ => {
+          if op in OpTable {
+            if IsBooleanOperator(op) {
+              left := ToBool(left, lType, env);
+              right := ToBool(right, rType, env);
+            }
+            r := R.Expr.BinaryOp(
+              OpTable[op],
+              left,
+              right,
+              format);
+            if IsBooleanOperator(op) {
+              r := FromBool(r, resType, env);
+            }
+          } else {
+            if IsComplexArithmetic(op) {
+              left := ToInt(left, lType, env);
+              right := ToInt(right, rType, env);
+            }
+            match op {
+              case Eq(referential) => {
+                if (referential) {
+                  if pointerType.Raw? {
+                    // Need to make comp/rust/traits.dfy to pass with --raw-pointer)
+                    r := Error("Raw pointer comparison not properly implemented yet");
+                  } else {
+                    r := R.BinaryOp("==", left, right, DAST.Format.BinaryOpFormat.NoFormat());
+                  }
+                } else {
+                  if rExpr.SeqValue? && |rExpr.elements| == 0 {
+                    r := R.BinaryOp("==", left.Sel("to_array").Apply0().Sel("len").Apply0(), R.LiteralInt("0"), DAST.Format.BinaryOpFormat.NoFormat());
+                  } else if lExpr.SeqValue? && |lExpr.elements| == 0 {
+                    r := R.BinaryOp("==", R.LiteralInt("0"), right.Sel("to_array").Apply0().Sel("len").Apply0(), DAST.Format.BinaryOpFormat.NoFormat());
+                  } else {
+                    r := R.BinaryOp("==", left, right, DAST.Format.BinaryOpFormat.NoFormat());
+                    if resType != Primitive(Primitive.Bool) {
+                      r, resultingOwnership := GenExprConvertTo(r, OwnershipOwned, Primitive(Primitive.Bool), resType, env, OwnershipOwned);
+                    }
+                  }
+                }
+              }
+              case Div(true) =>
+                r := left.Sel("wrapping_div").Apply1(right);
+              case Plus(true) =>
+                r := left.Sel("wrapping_add").Apply1(right);
+              case Times(true) =>
+                r := left.Sel("wrapping_mul").Apply1(right);
+              case Minus(true) =>
+                r := left.Sel("wrapping_sub").Apply1(right);
+              case EuclidianDiv() => {
+                r := R.dafny_runtime.MSel("euclidian_division").AsExpr().Apply([left, right]);
+              }
+              case EuclidianMod() => {
+                r := R.dafny_runtime.MSel("euclidian_modulo").AsExpr().Apply([left, right]);
+              }
+              case Passthrough(op) => {
+                r := R.Expr.BinaryOp(op, left, right, format);
+              }
+            }
+            if IsComplexArithmetic(op) {
+              r := FromInt(r, resType, env);
+            }
+          }
+        }
+      }
+      r, resultingOwnership := FromOwned(r, expectedOwnership);
+      readIdents := recIdentsL + recIdentsR;
+      return;
+    }
+
+    // Given an expression that is a newtype, returns the underlying value
+    // Preserves ownership
+    method UnwrapNewtype(
+      expr: R.Expr,
+      exprOwnership: Ownership,
+      fromTpe: Type
+    ) returns (r: R.Expr)
+      requires IsNewtype(fromTpe)
+    {
+      r := expr;
+      if !fromTpe.resolved.kind.erase {
+        r := r.Sel("0");
+        if exprOwnership == OwnershipBorrowed {
+          r := R.Borrow(r);
+        }
+      }
+    }
+
+    // Given an expression that is the underlying value of a newtype, returns the newtype
+    // Preserves ownership
+    method WrapWithNewtype(
+      expr: R.Expr,
+      exprOwnership: Ownership,
+      toTpe: Type
+    ) returns (r: R.Expr)
+      requires IsNewtype(toTpe)
+    {
+      r := expr;
+      var toKind := toTpe.resolved.kind;
+      if !toKind.erase {
+        var fullPath := GenPathExpr(toTpe.resolved.path);
+        if exprOwnership == OwnershipOwned {
+          r := fullPath.Apply1(r);
+        } else {
+          r := fullPath.FSel("_from_ref").Apply1(r); // Keep borrowbility
+        }
+      }
+    }
+
+    // To use when we know that the expression is a Convert(_, _, toTpe)
+    // and toTpe is a newtype
+    method GenExprConvertTo(
+      expr: R.Expr,
+      exprOwnership: Ownership,
+      fromTpe: Type,
+      toTpe: Type,
+      env: Environment,
+      expectedOwnership: Ownership
+    ) returns (r: R.Expr, resultingOwnership: Ownership)
+      requires exprOwnership != OwnershipAutoBorrowed
+      modifies this
+      ensures OwnershipGuarantee(expectedOwnership, resultingOwnership)
+      decreases fromTpe, toTpe // We unwrap newtypes
+    {
+      r := expr;
+      if fromTpe == toTpe {
+        r, resultingOwnership := FromOwnership(r, exprOwnership, expectedOwnership);
+        return;
+      }
+      if fromTpe.UserDefined? && fromTpe.resolved.kind.SynonymType? {
+        r, resultingOwnership := GenExprConvertTo(expr, exprOwnership, fromTpe.resolved.kind.baseType, toTpe, env, expectedOwnership);
+        return;
+      }
+      if toTpe.UserDefined? && toTpe.resolved.kind.SynonymType? {
+        r, resultingOwnership := GenExprConvertTo(expr, exprOwnership, fromTpe, toTpe.resolved.kind.baseType, env, expectedOwnership);
+        return;
+      }
+      if NeedsUnwrappingConversion(fromTpe) {
+        // From type is a newtype but it's not a primitive one.
+        r := UnwrapNewtype(r, exprOwnership, fromTpe);
+        r, resultingOwnership :=
+          GenExprConvertTo(r, exprOwnership, fromTpe.resolved.kind.baseType, toTpe, env, expectedOwnership);
+        return;
+      }
+      if NeedsUnwrappingConversion(toTpe) {
+        var toKind := toTpe.resolved.kind;
+        r, resultingOwnership :=
+          GenExprConvertTo(r, exprOwnership, fromTpe, toKind.baseType, env, expectedOwnership);
+        r := WrapWithNewtype(r, resultingOwnership, toTpe);
+        r, resultingOwnership := FromOwnership(r, resultingOwnership, expectedOwnership);
+        return;
+      }
+      // At this point, our newtypes are either primitives or we have other types.
+      var unwrappedFromType := GetUnwrappedBoundedRustType(fromTpe);
+      var unwrappedToType := GetUnwrappedBoundedRustType(toTpe);
+      if unwrappedToType.Some? {
+        var boundedToType := unwrappedToType.value;
+        if unwrappedFromType.Some? {
+          r := UnwrapNewtype(r, exprOwnership, fromTpe);
+          var inOwnership := exprOwnership;
+          if unwrappedFromType.value != unwrappedToType.value {
+            var asType := boundedToType;
+            if inOwnership == OwnershipBorrowed {
+              match r {
+                case UnaryOp("&", underlying, _) =>
+                  r := underlying;
+                case _ => r := r.Clone();
+              }
+            }
+            r := R.TypeAscription(r, asType);
+            inOwnership := OwnershipOwned;
+          }
+          r := WrapWithNewtype(r, OwnershipOwned, toTpe);
+          r, resultingOwnership := FromOwnership(r, inOwnership, expectedOwnership);
+          return;
+        }
+        assert !IsNewtype(fromTpe);
+        if fromTpe.IsPrimitiveInt() {
+          if exprOwnership == OwnershipBorrowed {
+            r := r.Clone();
+          }
+          r := R.dafny_runtime.MSel("truncate!").AsExpr().Apply([r, R.ExprFromType(boundedToType)]);
+          r := WrapWithNewtype(r, OwnershipOwned, toTpe);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        if fromTpe == Primitive(Char) {
+          r := R.TypeAscription(r.Sel("0"), boundedToType);
+          r := WrapWithNewtype(r, OwnershipOwned, toTpe);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        var fromTpeRust := GenType(fromTpe, GenTypeContext.default());
+        r := Error("No conversion available from "+fromTpeRust.ToString("")+" to " + boundedToType.ToString(""));
+        r, resultingOwnership := FromOwned(r, expectedOwnership);
+        return;
+      }
+      assert !IsNewtype(toTpe);
+      if unwrappedFromType.Some? {
+        if !fromTpe.resolved.kind.erase {
+          r := r.Sel("0");
+        }
+        // Now r is of type unwrappedFromType.value
+        if toTpe == Primitive(Char) {
+          r, resultingOwnership := FromOwnership(
+            R.dafny_runtime.MSel(DafnyChar).AsExpr().Apply1(
+              R.TypeAscription(r, DafnyCharUnderlying)
+            ), exprOwnership, expectedOwnership);
+          return;
+        }
+        if toTpe.IsPrimitiveInt() {
+          r, resultingOwnership := FromOwnership(r, exprOwnership, OwnershipOwned);
+          r := R.dafny_runtime.MSel("int!").AsExpr().Apply1(r);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        var toTpeRust := GenType(toTpe, GenTypeContext.default());
+        r := Error("No conversion available from "+unwrappedFromType.value.ToString("")+" to " + toTpeRust.ToString(""));
+        r, resultingOwnership := FromOwned(r, expectedOwnership);
+        return;
+      }
+      assert !IsNewtype(fromTpe);
+      match (fromTpe, toTpe) {
+        case (Primitive(Int), Primitive(Real)) => {
+          r := R.RcNew(R.dafny_runtime.MSel("BigRational").AsExpr().FSel("from_integer").Apply1(r));
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+        }
+        case (Primitive(Real), Primitive(Int)) => {
+          r := R.dafny_runtime.AsExpr().FSel("dafny_rational_to_int").Apply1(r);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+        }
+        case (Primitive(Int), Primitive(Char)) => {
+          var rhsType := GenType(toTpe, GenTypeContext.default());
+          var uType := if charType.UTF32? then R.U32 else R.U16;
+          if exprOwnership != OwnershipOwned {
+            r := r.Clone();
+          }
+          r := R.TraitCast(uType, R.dafny_runtime.MSel("NumCast").AsType()).FSel("from").Apply1(
+            r
+          ).Sel("unwrap").Apply0();
+          if charType.UTF32? {
+            r := R.Identifier("char").FSel("from_u32").Apply1(r).Sel("unwrap").Apply0();
+          }
+          r := R.dafny_runtime.MSel(DafnyChar).AsExpr().Apply1(r);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+        }
+        case (Primitive(Char), Primitive(Int)) => {
+          var rhsType := GenType(fromTpe, GenTypeContext.default());
+          r := R.dafny_runtime.MSel("int!").AsExpr().Apply1(r.Sel("0"));
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+        }
+        case _ => {
+          r, resultingOwnership := GenExprConvertOther(expr, exprOwnership, fromTpe, toTpe, env, expectedOwnership);
+        }
+      }
+    }
+
+    predicate IsBuiltinCollection(typ: Type) {
+      typ.Seq? || typ.Set? || typ.Map? || typ.Multiset?
+    }
+    function GetBuiltinCollectionElement(typ: Type): Type
+      requires IsBuiltinCollection(typ)
+    {
+      if typ.Map? then typ.value else typ.element
+    }
+
+    predicate SameTypesButDifferentTypeParameters(fromType: Type, fromTpe: R.Type, toType: Type, toTpe: R.Type) {
+      && fromTpe.TypeApp?
+      && toTpe.TypeApp?
+      && fromTpe.baseName == toTpe.baseName
+      && fromType.UserDefined?
+      && toType.UserDefined?
+      && IsSameResolvedTypeAnyArgs(fromType.resolved, toType.resolved)
+      && |fromType.resolved.typeArgs|
+      == |toType.resolved.typeArgs|
+      == |fromTpe.arguments|
+      == |toTpe.arguments|
+    }
+
+    /* Applies a function to every element of a sequence, returning a Result value (which is a
+      failure-compatible type). Returns either a failure, or, if successful at every element,
+      the transformed sequence.  */
+    opaque function SeqResultToResultSeq<T, E>(xs: seq<Result<T, E>>): (result: Result<seq<T>, E>)
+    {
+      if |xs| == 0 then Success([])
+      else
+        var head :- xs[0];
+        var tail :- SeqResultToResultSeq(xs[1..]);
+        Success([head] + tail)
+    }
+
+    function UpcastConversionLambda(fromType: Type, fromTpe: R.Type, toType: Type, toTpe: R.Type, typeParams: map<(R.Type, R.Type), R.Expr>): Result<R.Expr, (Type, R.Type, Type, R.Type, map<(R.Type, R.Type), R.Expr>)>
+    {
+      if fromTpe == toTpe then
+        Success(R.dafny_runtime.MSel("upcast_id").AsExpr().ApplyType([fromTpe]).Apply0())
+      else if toTpe.IsBox() then // General trait
+        var toTpeUnderlying := toTpe.BoxUnderlying();
+        if !toTpeUnderlying.DynType? then Failure((fromType, fromTpe, toType, toTpe, typeParams)) else
+        if fromTpe.IsBox() then
+          var fromTpeUnderlying := fromTpe.BoxUnderlying();
+          if !fromTpeUnderlying.DynType? then Failure((fromType, fromTpe, toType, toTpe, typeParams)) else
+          Success(R.dafny_runtime.MSel("upcast_box_box").AsExpr().ApplyType([fromTpeUnderlying, toTpeUnderlying]).Apply0())
+        else
+          Success(R.dafny_runtime.MSel("upcast_box").AsExpr().ApplyType([fromTpe, toTpeUnderlying]).Apply0())
+      else if fromTpe.IsObjectOrPointer() && toTpe.IsObjectOrPointer() then
+        var toTpeUnderlying := toTpe.ObjectOrPointerUnderlying();
+        if !toTpeUnderlying.DynType? then Failure((fromType, fromTpe, toType, toTpe, typeParams)) else
+        var fromTpeUnderlying := fromTpe.ObjectOrPointerUnderlying();
+        Success(R.dafny_runtime.MSel(upcast).AsExpr().ApplyType([fromTpeUnderlying, toTpeUnderlying]).Apply0())
+      else if (fromTpe, toTpe) in typeParams then
+        Success(typeParams[(fromTpe, toTpe)])
+      else if fromTpe.IsRc() && toTpe.IsRc() then
+        var lambda :- UpcastConversionLambda(fromType, fromTpe.RcUnderlying(), toType, toTpe.RcUnderlying(), typeParams);
+        if fromType.Arrow? then
+          Success(lambda)
+        else
+          Success(R.dafny_runtime.MSel("rc_coerce").AsExpr().Apply1(lambda))
+      else if SameTypesButDifferentTypeParameters(fromType, fromTpe, toType, toTpe) then
+        var indices :=
+          if fromType.UserDefined? && fromType.resolved.kind.Datatype? then
+            Std.Collections.Seq.Filter(i =>
+                                         if 0 <= i < |fromTpe.arguments| then
+                                           (0 <= i < |fromType.resolved.kind.variances| ==>
+                                              !fromType.resolved.kind.variances[i].Nonvariant?)
+                                         else
+                                           false
+                                      , seq(|fromTpe.arguments|, i => i))
+          else
+            seq(|fromTpe.arguments|, i => i);
+        var lambdas :- SeqResultToResultSeq(
+                         seq(|indices|, j requires 0 <= j < |indices| =>
+                           var i := indices[j];
+                           UpcastConversionLambda(
+                             fromType.resolved.typeArgs[i],
+                             fromTpe.arguments[i],
+                             toType.resolved.typeArgs[i],
+                             toTpe.arguments[i],
+                             typeParams
+                           )));
+        Success(R.ExprFromType(fromTpe.baseName).ApplyType(
+                  seq(|fromTpe.arguments|, i requires 0 <= i < |fromTpe.arguments| =>
+                    fromTpe.arguments[i])
+                ).FSel("coerce").Apply(
+                  lambdas
+                ))
+      else if && fromTpe.IsBuiltinCollection() && toTpe.IsBuiltinCollection()
+              && IsBuiltinCollection(fromType) && IsBuiltinCollection(toType) then
+        var newFromTpe := fromTpe.GetBuiltinCollectionElement();
+        var newToTpe := toTpe.GetBuiltinCollectionElement();
+        var newFromType := GetBuiltinCollectionElement(fromType);
+        var newToType := GetBuiltinCollectionElement(toType);
+        var coerceArg :-
+          UpcastConversionLambda(newFromType, newFromTpe, newToType, newToTpe, typeParams);
+        var collectionType := R.dafny_runtime.MSel(fromTpe.Expand().baseName.path.name);
+        var baseType :=
+          if fromTpe.Expand().baseName.path.name == "Map" then
+            collectionType.AsExpr().ApplyType([fromTpe.Expand().arguments[0], newFromTpe])
+          else
+            collectionType.AsExpr().ApplyType([newFromTpe]);
+        Success(baseType.FSel("coerce").Apply1(coerceArg))
+      else if && fromTpe.DynType? && fromTpe.underlying.FnType?
+              && toTpe.DynType? && toTpe.underlying.FnType?
+              && fromTpe.underlying.arguments == toTpe.underlying.arguments // TODO: Support contravariance
+              && fromType.Arrow? && toType.Arrow?
+              && |fromTpe.underlying.arguments| == 1
+              && fromTpe.underlying.arguments[0].Borrowed?
+      then
+        var lambda :- UpcastConversionLambda(fromType.result, fromTpe.underlying.returnType, toType.result, toTpe.underlying.returnType, typeParams);
+        Success(
+          R.dafny_runtime
+          .MSel("fn1_coerce")
+          .AsExpr()
+          .ApplyType([
+                       fromTpe.underlying.arguments[0].underlying,
+                       fromTpe.underlying.returnType,
+                       toTpe.underlying.returnType
+                     ]).Apply1(lambda))
+      else
+        Failure((fromType, fromTpe, toType, toTpe, typeParams))
+    }
+
+    predicate IsDowncastConversion(fromTpe: R.Type, toTpe: R.Type) {
+      if fromTpe.IsObjectOrPointer() && toTpe.IsObjectOrPointer() then
+        fromTpe.ObjectOrPointerUnderlying().DynType? && !toTpe.ObjectOrPointerUnderlying().DynType?
+      else
+        false
+    }
+
+    // Assumes expr to be borrowed. Will return and expression that is owned instead
+    function BorrowedToOwned(expr: R.Expr, env: Environment): (out: R.Expr) {
+      match expr
+      case UnaryOp("&", underlying, _) =>
+        // We need to clone underlying unless it has borrow semantics.
+        if underlying.Identifier? && env.CanReadWithoutClone(underlying.name) then
+          underlying
+        else
+          underlying.Clone() // Auto-borrow allows for implicit code
+      case _ => expr.Clone()
+    }
+
+    method GenExprConvertOther(
+      expr: R.Expr,
+      exprOwnership: Ownership,
+      fromTpe: Type,
+      toTpe: Type,
+      env: Environment,
+      expectedOwnership: Ownership
+    ) returns (r: R.Expr, resultingOwnership: Ownership)
+      requires exprOwnership != OwnershipAutoBorrowed
+      modifies this
+      ensures OwnershipGuarantee(expectedOwnership, resultingOwnership)
+    {
+      r := expr;
+      resultingOwnership := exprOwnership;
+      var fromTpeGen := GenType(fromTpe, GenTypeContext.default());
+      var toTpeGen := GenType(toTpe, GenTypeContext.default());
+      var upcastConverter := UpcastConversionLambda(fromTpe, fromTpeGen, toTpe, toTpeGen, map[]);
+      if upcastConverter.Success? {
+        var conversionLambda := upcastConverter.value;
+        if resultingOwnership == OwnershipBorrowed {
+          // we need the value to be owned for conversion
+          r := BorrowedToOwned(r, env);
+          resultingOwnership := OwnershipOwned;
+        }
+        r := conversionLambda.Apply1(r);
+        r, resultingOwnership := FromOwnership(r, resultingOwnership, expectedOwnership);
+      } else if IsDowncastConversion(fromTpeGen, toTpeGen) {
+        assert toTpeGen.IsObjectOrPointer();
+        toTpeGen := toTpeGen.ObjectOrPointerUnderlying();
+        if resultingOwnership == OwnershipBorrowed {
+          // we need the value to be owned for conversion
+          r := BorrowedToOwned(r, env);
+          resultingOwnership := OwnershipOwned;
+        }
+        r := R.dafny_runtime
+        .MSel(downcast).AsExpr().Apply([r, R.ExprFromType(toTpeGen)]);
+        r, resultingOwnership := FromOwnership(r, OwnershipOwned, expectedOwnership);
+      } else {
+        var Failure((fromType, fromTpeGen, toType, toTpeGen, m)) := upcastConverter;
+        r := Error("<i>Coercion from " + fromTpeGen.ToString(IND) + " to " + toTpeGen.ToString(IND) + "</i> not yet implemented", r);
+        r, resultingOwnership := FromOwned(r, expectedOwnership);
+      }
+    }
+
+    method GenExprConvert(
+      e: Expression,
+      selfIdent: SelfInfo,
+      env: Environment,
+      expectedOwnership: Ownership
+    ) returns (r: R.Expr, resultingOwnership: Ownership, readIdents: set<string>)
+      requires e.Convert?
+      modifies this
+      ensures OwnershipGuarantee(expectedOwnership, resultingOwnership)
+      decreases e, 0
+    {
+      var Convert(expr, fromTpe, toTpe) := e;
+      var argumentOwnership := expectedOwnership;
+      if argumentOwnership == OwnershipAutoBorrowed {
+        argumentOwnership := OwnershipBorrowed;
+        // Otherwise we risk moving a value if it's not borrowed.
+      }
+      var recursiveGen, recOwned, recIdents := GenExpr(expr, selfIdent, env, argumentOwnership);
+      r := recursiveGen;
+      readIdents := recIdents;
+      r, resultingOwnership := GenExprConvertTo(r, recOwned, fromTpe, toTpe, env, expectedOwnership);
+      assert OwnershipGuarantee(expectedOwnership, resultingOwnership);
+      return;
+    }
+
+    method GenIdent(
+      rName: string,
+      selfIdent: SelfInfo,
+      env: Environment,
+      expectedOwnership: Ownership
+    ) returns (r: R.Expr, resultingOwnership: Ownership, readIdents: set<string>)
+      modifies this
+      ensures OwnershipGuarantee(expectedOwnership, resultingOwnership)
+    {
+      r := R.Identifier(rName);
+      var tpe := env.GetType(rName);
+      var placeboOpt := if tpe.Some? then tpe.value.ExtractMaybePlacebo() else None;
+      var currentlyBorrowed := env.IsBorrowed(rName); // Otherwise names are owned
+      var noNeedOfClone := env.CanReadWithoutClone(rName);
+      var isSelf := selfIdent.ThisTyped? && selfIdent.IsSelf() && selfIdent.rSelfName == rName;
+      if placeboOpt.Some? {
+        r := r.Sel("read").Apply0();
+        currentlyBorrowed := false;
+        noNeedOfClone := true; // No need to clone it, it's already owned
+        tpe := Some(placeboOpt.value);
+      }
+      if expectedOwnership == OwnershipAutoBorrowed {
+        resultingOwnership := if currentlyBorrowed then OwnershipBorrowed else OwnershipOwned;
+        // No need to do anything
+      } else if expectedOwnership == OwnershipBorrowedMut {
+        if rName == "self" {
+          resultingOwnership := OwnershipBorrowedMut;
+        } else {
+          if tpe.Some? && tpe.value.IsObjectOrPointer() {
+            r := modify_macro.Apply1(r);
+          } else {
+            r := R.BorrowMut(r); // Needs to be explicit for out-parameters on methods
+          }
+        }
+        resultingOwnership := OwnershipBorrowedMut;
+      } else if expectedOwnership == OwnershipOwned {
+        var needObjectFromRef :=
+          isSelf &&
+          match selfIdent.dafnyType {
+            case UserDefined(ResolvedType(_, _, base, attributes, _, _)) =>
+              base.Class? || (base.Trait? && base.traitType.ObjectTrait?)
+            case _ => false
+          };
+        if needObjectFromRef {
+          r := R.dafny_runtime.MSel("Object").AsExpr().ApplyType([R.TIdentifier("_")]).FSel("from_ref").Apply([r]);
+        } else {
+          if !noNeedOfClone {
+            r := r.Clone(); // We don't transfer the ownership of an identifier
+          }
+        }
+        resultingOwnership := OwnershipOwned;
+      } else if currentlyBorrowed {
+        assert expectedOwnership == OwnershipBorrowed;
+        resultingOwnership := OwnershipBorrowed;
+      } else {
+        assert expectedOwnership == OwnershipBorrowed;
+        var selfIsGeneralTrait :=
+          isSelf &&
+          match selfIdent.dafnyType {
+            case UserDefined(ResolvedType(_, _, base, attributes, _, _)) =>
+              base.Trait? && base.traitType.GeneralTrait?
+            case _ => false
+          };
+        if rName != "self" {
+          // It's currently owned. If it's a pointer, we need to convert it to a borrow
+          if tpe.Some? && tpe.value.IsPointer() {
+            r := read_macro.Apply1(r);
+          } else {
+            r := R.Borrow(r); // Needs to be explicit for out-parameters on methods
+          }
+        }
+        resultingOwnership := OwnershipBorrowed;
+      }
+      readIdents := {rName};
+      return;
+    }
+
+    predicate HasExternAttributeRenamingModule(attributes: seq<Attribute>) {
+      exists attribute <- attributes :: attribute.name == "extern" && |attribute.args| == 2
+    }
+
+    method GenArgs(
+      ghost e: Expression,
+      selfIdent: SelfInfo,
+      name: CallName,
+      typeArgs: seq<Type>,
+      args: seq<Expression>,
+      env: Environment
+    ) returns (argExprs: seq<R.Expr>, readIdents: set<string>, typeExprs: seq<R.Type>, fullNameQualifier: Option<ResolvedType>)
+      modifies this
+      requires forall a <- args :: a < e
+      decreases e, 1, 1, 1
+      ensures fullNameQualifier.Some? ==> name.CallName?
+    {
+      argExprs := [];
+      readIdents := {};
+      var signature :=
+        if name.CallName? then
+          if name.receiverArg.Some? && name.receiverAsArgument then
+            [name.receiverArg.value] + name.signature.parameters
+          else
+            name.signature.parameters
+        else
+          [];
+      for i := 0 to |args| {
+        var argOwnership := OwnershipBorrowed;
+        if i < |signature| {
+          var tpe := GenType(signature[i].typ, GenTypeContext.default());
+          if tpe.CanReadWithoutClone() {
+            argOwnership := OwnershipOwned;
+          }
+        }
+        assert args[i] in args;
+        var argExpr, _, argIdents := GenExpr(args[i], selfIdent, env, argOwnership);
+        argExprs := argExprs + [argExpr];
+        readIdents := readIdents + argIdents;
+      }
+
+      typeExprs := [];
+      for typeI := 0 to |typeArgs| {
+        var typeExpr := GenType(typeArgs[typeI], GenTypeContext.default());
+        typeExprs := typeExprs + [typeExpr];
+      }
+
+      match name {
+        // Calls on traits should be fully specified as we can't guarantee traits will be in context
+        // Calls on non-traits should be also fully specified if the method is not found in the definition of that type
+        case CallName(nameIdent, Some(UserDefined(resolvedType)), _, _, _) =>
+          if resolvedType.kind.Trait? ||
+             nameIdent.dafny_name in builtin_trait_preferred_methods ||
+             forall m <- resolvedType.properMethods :: m != nameIdent {
+            fullNameQualifier := Some(TraitTypeContainingMethod(resolvedType, nameIdent.dafny_name).GetOr(resolvedType));
+          } else {
+            fullNameQualifier := None;
+          }
+        case _ =>
+          fullNameQualifier := None;
+      }
+
+      // If we are in the same context as the trait on which we are making a method call,
+      // we don't need to know the type of self.
+      // One exception is if the method has an extern attribute with two arguments, in which case
+      // we don't simplify it.
+      if && fullNameQualifier.Some?
+         && selfIdent.ThisTyped? && selfIdent.dafnyType.UserDefined?
+         && IsSameResolvedType(selfIdent.dafnyType.resolved, fullNameQualifier.value)
+         && !HasExternAttributeRenamingModule(fullNameQualifier.value.attributes) {
+        fullNameQualifier := None; // We can just use the "infix" annotation
+      }
+    }
+
+    function GetMethodName(on: Expression, name: CallName): string {
+      match name {
+        case CallName(ident, _, _, _, _) =>
+          if on.ExternCompanion? then ident.dafny_name else escapeName(ident)
+        case MapBuilderAdd() | SetBuilderAdd() => "add"
+        case MapBuilderBuild() | SetBuilderBuild() => "build"
+      }
+    }
+
+    method GenExpr(
+      e: Expression,
+      selfIdent: SelfInfo,
+      env: Environment,
+      expectedOwnership: Ownership
+    ) returns (r: R.Expr, resultingOwnership: Ownership, readIdents: set<string>)
+      modifies this
+      ensures OwnershipGuarantee(expectedOwnership, resultingOwnership)
+      decreases e, 1 {
+      match e {
+        case Literal(_) =>
+          r, resultingOwnership, readIdents :=
+            GenExprLiteral(e, selfIdent, env, expectedOwnership);
+        case Ident(name) => {
+          r, resultingOwnership, readIdents := GenIdent(escapeVar(name), selfIdent, env, expectedOwnership);
+        }
+        case ExternCompanion(path) => {
+          r := GenPathExpr(path, false);
+
+          if expectedOwnership == OwnershipBorrowed {
+            resultingOwnership := OwnershipBorrowed;
+          } else if expectedOwnership == OwnershipOwned {
+            resultingOwnership := OwnershipOwned;
+          } else {
+            r, resultingOwnership := FromOwned(r, expectedOwnership);
+          }
+          readIdents := {};
+          return;
+        }
+        case Companion(path, typeArgs) => {
+          r := GenPathExpr(path);
+          if |typeArgs| > 0 {
+            var typeExprs := [];
+            for i := 0 to |typeArgs| {
+              var typeExpr := GenType(typeArgs[i], GenTypeContext.default());
+              typeExprs := typeExprs + [typeExpr];
+            }
+            r := r.ApplyType(typeExprs);
+          }
+          if expectedOwnership == OwnershipBorrowed {
+            resultingOwnership := OwnershipBorrowed;
+          } else if expectedOwnership == OwnershipOwned {
+            resultingOwnership := OwnershipOwned;
+          } else {
+            r, resultingOwnership := FromOwned(r, expectedOwnership);
+          }
+          readIdents := {};
+          return;
+        }
+        case InitializationValue(typ) => {
+          var typExpr := GenType(typ, GenTypeContext.default());
+          r := R.TraitCast(typExpr, R.DefaultTrait).FSel("default").Apply0();
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := {};
+          return;
+        }
+        case Tuple(values) => {
+          var exprs := [];
+          readIdents := {};
+
+          for i := 0 to |values| {
+            var recursiveGen, _, recIdents := GenExpr(values[i], selfIdent, env, OwnershipOwned);
+            exprs := exprs + [recursiveGen];
+            readIdents := readIdents + recIdents;
+          }
+          r := if |values| <= R.MAX_TUPLE_SIZE then R.Tuple(exprs) else R.SystemTuple(exprs);
+
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case New(path, typeArgs, args) => {
+          // args are provided if it is an extern type
+          r := GenPathExpr(path);
+          if |typeArgs| > 0 {
+            var typeExprs := [];
+            for i := 0 to |typeArgs| {
+              var typeExpr := GenType(typeArgs[i], GenTypeContext.default());
+              typeExprs := typeExprs + [typeExpr];
+            }
+            r := r.ApplyType(typeExprs);
+          }
+          r := r.FSel(allocate_fn);
+
+          readIdents := {};
+          var arguments := [];
+          for i := 0 to |args| {
+            var recursiveGen, _, recIdents := GenExpr(args[i], selfIdent, env, OwnershipOwned);
+            arguments := arguments + [recursiveGen];
+            readIdents := readIdents + recIdents;
+          }
+          r := r.Apply(arguments);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case NewUninitArray(dims, typ) => {
+          if 16 < |dims| {
+            r := Error("Unsupported: Creation of arrays of more than 16 dimensions");
+            readIdents := {};
+          } else {
+            r := InitEmptyExpr();
+            var typeGen := GenType(typ, GenTypeContext.default());
+            readIdents := {};
+            var dimExprs := [];
+            for i := 0 to |dims| invariant |dimExprs| == i {
+              var recursiveGen, _, recIdents := GenExpr(dims[i], selfIdent, env, OwnershipOwned);
+              dimExprs := dimExprs + [R.IntoUsize(recursiveGen)];
+              readIdents := readIdents + recIdents;
+            }
+            if |dims| > 1 {
+              var class_name := "Array" + Strings.OfNat(|dims|);
+              r := R.dafny_runtime.MSel(class_name).AsExpr().ApplyType([typeGen]).FSel(placebos_usize).Apply(dimExprs);
+            } else {
+              r := R.dafny_runtime.MSel("array").AsExpr().FSel(placebos_usize).ApplyType([typeGen]).Apply(dimExprs);
+            }
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+        }
+        case ArrayIndexToInt(underlying) => {
+          var recursiveGen, _, recIdents := GenExpr(underlying, selfIdent, env, OwnershipOwned);
+          r := R.dafny_runtime.MSel("int!").AsExpr().Apply1(recursiveGen);
+          readIdents := recIdents;
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+        }
+        case FinalizeNewArray(underlying, typ) => {
+          var tpe := GenType(typ, GenTypeContext.default());
+          var recursiveGen, _, recIdents := GenExpr(underlying, selfIdent, env, OwnershipOwned);
+          readIdents := recIdents;
+          if tpe.IsObjectOrPointer() {
+            var t := tpe.ObjectOrPointerUnderlying();
+            if t.Array? {
+              r := R.dafny_runtime.MSel("array").AsExpr().FSel(array_construct).Apply1(recursiveGen);
+            } else if t.IsMultiArray() {
+              var c := t.MultiArrayClass();
+              r := R.dafny_runtime.MSel(c).AsExpr().FSel(array_construct).Apply1(recursiveGen);
+            } else {
+              r := Error("Finalize New Array with a pointer or object type to something that is not an array or a multi array: " + tpe.ToString(IND));
+            }
+          } else {
+            r := Error("Finalize New Array with a type that is not a pointer or an object: " + tpe.ToString(IND));
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+        }
+        case DatatypeValue(datatypeType, typeArgs, variant, isCo, values) => {
+          r := GenPathExpr(datatypeType.path);
+          var genTypeArgs := [];
+          for i := 0 to |typeArgs| {
+            var typeExpr := GenType(typeArgs[i], GenTypeContext.default());
+            genTypeArgs := genTypeArgs + [typeExpr];
+          }
+          if |typeArgs| > 0 {
+            r := r.ApplyType(genTypeArgs);
+          }
+          r := r.FSel(escapeName(variant));
+          readIdents := {};
+
+          var assignments: seq<R.AssignIdentifier> := [];
+          for i := 0 to |values| {
+            var (name, value) := values[i];
+
+            if isCo {
+              var recursiveGen, _, recIdents := GenExpr(value, selfIdent, Environment.Empty(), OwnershipOwned);
+
+              readIdents := readIdents + recIdents;
+              var allReadCloned := InitEmptyExpr();
+              while recIdents != {} decreases recIdents {
+                var next: string :| next in recIdents;
+                allReadCloned := allReadCloned.Then(
+                  R.DeclareVar(R.CONST, next, None, Some(R.Identifier(next).Clone()))
+                );
+                recIdents := recIdents - {next};
+              }
+              var wasAssigned := R.dafny_runtime.MSel("LazyFieldWrapper").AsExpr().Apply1(
+                R.dafny_runtime.MSel("Lazy").AsExpr().FSel("new").Apply1(
+                  R.std.MSel("boxed").MSel("Box").AsExpr().FSel("new").Apply1(
+                    allReadCloned.Then(
+                      R.Lambda([], None, recursiveGen)
+                    ))));
+              assignments := assignments + [R.AssignIdentifier(escapeVar(name), wasAssigned)];
+            } else {
+              var recursiveGen, _, recIdents := GenExpr(value, selfIdent, env, OwnershipOwned);
+
+              assignments := assignments + [R.AssignIdentifier(escapeVar(name), recursiveGen)];
+              readIdents := readIdents + recIdents;
+            }
+          }
+          r := R.StructBuild(r, assignments);
+          if IsRcWrapped(datatypeType.attributes) {
+            r := R.RcNew(r);
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case Convert(_, _, _) => {
+          r, resultingOwnership, readIdents :=
+            GenExprConvert(e, selfIdent, env, expectedOwnership);
+        }
+        case SeqConstruct(length, expr) => {
+          // seq(length, elemFromIndex)
+          var recursiveGen, _, recIdents := GenExpr(expr, selfIdent, env, OwnershipOwned);
+          var lengthGen, _, lengthIdents := GenExpr(length, selfIdent, env, OwnershipOwned);
+          /* We will generate this
+             {
+              let _initializer = Some(elemFromIndex);
+              integer_range(Zero::zero(), length).map(
+                move |i| => _initializer(&i)
+              ).collect::<Sequence<_>>()
+             }
+           */
+          r := R.DeclareVar(R.CONST, "_initializer", None, Some(recursiveGen));
+          var range := R.dafny_runtime.MSel("integer_range").AsExpr();
+          range := range.Apply([
+                                 R.dafny_runtime.MSel("Zero").AsExpr().FSel("zero").Apply0(),
+                                 lengthGen
+                               ]);
+          range := range.Sel("map");
+          var rangeMap := R.Lambda([R.Formal.ImplicitlyTyped("i")], None, R.Identifier("_initializer").Apply1(R.Borrow(R.Identifier("i"))));
+          range := range.Apply1(
+            rangeMap
+          );
+          range := range.Sel("collect").ApplyType([
+                                                    R.dafny_runtime.MSel("Sequence").AsType().Apply([R.TIdentifier("_")])
+                                                  ]).Apply0();
+          r := R.Block(r.Then(range));
+
+          readIdents := recIdents + lengthIdents;
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case SeqValue(exprs, typ) => {
+          readIdents := {};
+
+          var genTpe := GenType(typ, GenTypeContext.default());
+
+          var i := 0;
+          var args := [];
+          while i < |exprs| {
+            var recursiveGen, _, recIdents := GenExpr(exprs[i], selfIdent, env, OwnershipOwned);
+            readIdents := readIdents + recIdents;
+            args := args + [recursiveGen];
+
+            i := i + 1;
+          }
+          r := R.dafny_runtime.MSel("seq!").AsExpr().Apply(args);
+          if |args| == 0 {
+            r := R.TypeAscription(
+              r,
+              R.dafny_runtime.MSel("Sequence").AsType().Apply1(genTpe));
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case SetValue(exprs) => {
+          var generatedValues := [];
+          readIdents := {};
+          var i := 0;
+          while i < |exprs| {
+            var recursiveGen, _, recIdents := GenExpr(exprs[i], selfIdent, env, OwnershipOwned);
+
+            generatedValues := generatedValues + [recursiveGen];
+            readIdents := readIdents + recIdents;
+            i := i + 1;
+          }
+          r := R.dafny_runtime.MSel("set!").AsExpr().Apply(generatedValues);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case MultisetValue(exprs) => {
+          var generatedValues := [];
+          readIdents := {};
+          var i := 0;
+          while i < |exprs| {
+            var recursiveGen, _, recIdents := GenExpr(exprs[i], selfIdent, env, OwnershipOwned);
+
+            generatedValues := generatedValues + [recursiveGen];
+            readIdents := readIdents + recIdents;
+            i := i + 1;
+          }
+          r := R.dafny_runtime.MSel("multiset!").AsExpr().Apply(generatedValues);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case ToMultiset(expr) => {
+          var recursiveGen, _, recIdents := GenExpr(expr, selfIdent, env, OwnershipAutoBorrowed);
+          r := recursiveGen.Sel("as_dafny_multiset").Apply0();
+          readIdents := recIdents;
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case MapValue(mapElems) => {
+          var generatedValues := [];
+          readIdents := {};
+          var i := 0;
+          while i < |mapElems| {
+            var recursiveGenKey, _, recIdentsKey := GenExpr(mapElems[i].0, selfIdent, env, OwnershipOwned);
+            var recursiveGenValue, _, recIdentsValue := GenExpr(mapElems[i].1, selfIdent, env, OwnershipOwned);
+
+            generatedValues := generatedValues + [(recursiveGenKey, recursiveGenValue)];
+            readIdents := readIdents + recIdentsKey + recIdentsValue;
+            i := i + 1;
+          }
+
+          i := 0;
+          var arguments := [];
+          while i < |generatedValues| {
+            var genKey := generatedValues[i].0;
+            var genValue := generatedValues[i].1;
+
+            arguments := arguments + [R.BinaryOp("=>", genKey, genValue, DAST.Format.BinaryOpFormat.NoFormat())];
+            i := i + 1;
+          }
+          r := R.dafny_runtime.MSel("map!").AsExpr().Apply(arguments);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case SeqUpdate(expr, index, value) => {
+          var exprR, _, exprIdents := GenExpr(expr, selfIdent, env, OwnershipAutoBorrowed);
+          var indexR, indexOwnership, indexIdents := GenExpr(index, selfIdent, env, OwnershipBorrowed);
+          var valueR, valueOwnership, valueIdents := GenExpr(value, selfIdent, env, OwnershipBorrowed);
+          r := exprR.Sel("update_index").Apply([indexR, valueR]);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := exprIdents + indexIdents + valueIdents;
+          return;
+        }
+        case MapUpdate(expr, index, value) => {
+          var exprR, _, exprIdents := GenExpr(expr, selfIdent, env, OwnershipAutoBorrowed);
+          var indexR, indexOwnership, indexIdents := GenExpr(index, selfIdent, env, OwnershipBorrowed);
+          var valueR, valueOwnership, valueIdents := GenExpr(value, selfIdent, env, OwnershipBorrowed);
+          r := exprR.Sel("update_index").Apply([indexR, valueR]);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := exprIdents + indexIdents + valueIdents;
+          return;
+        }
+        case This() => {
+          match selfIdent {
+            case ThisTyped(id, dafnyType) => {
+              r, resultingOwnership, readIdents := GenIdent(id, selfIdent, env, expectedOwnership);
+            }
+            case None => {
+              r := Error("this outside of a method");
+              r, resultingOwnership := FromOwned(r, expectedOwnership);
+              readIdents := {};
+            }
+          }
+          return;
+        }
+        case Ite(cond, t, f) => {
+          // If then else expressions cannot recurse to return something borrowed in their branches
+          // because sometimes the lifetime would be the one of a local variable.
+          // Hence we need to return owned values.
+          assert {:split_here} true;
+          var cond, _, recIdentsCond := GenExpr(cond, selfIdent, env, OwnershipOwned);
+
+          var fExpr, fOwned, recIdentsF := GenExpr(f, selfIdent, env, OwnershipOwned);
+          var tExpr, _, recIdentsT := GenExpr(t, selfIdent, env, OwnershipOwned); // there's a chance that f forced ownership
+
+          r := R.IfExpr(cond, tExpr, fExpr);
+
+          r, resultingOwnership := FromOwnership(r, OwnershipOwned, expectedOwnership);
+          readIdents := recIdentsCond + recIdentsT + recIdentsF;
+          return;
+        }
+        case UnOp(Not, e, format) => {
+          var recursiveGen, _, recIdents := GenExpr(e, selfIdent, env, OwnershipOwned);
+
+          r := R.UnaryOp("!", recursiveGen, format);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case UnOp(BitwiseNot, e, format) => {
+          var recursiveGen, _, recIdents := GenExpr(e, selfIdent, env, OwnershipOwned);
+
+          r := R.UnaryOp("!", recursiveGen, format);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case UnOp(Cardinality, e, format) => {
+          var recursiveGen, recOwned, recIdents := GenExpr(e, selfIdent, env, OwnershipAutoBorrowed);
+
+          r := recursiveGen.Sel("cardinality").Apply0();
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case BinOp(_, _, _, _) =>
+          r, resultingOwnership, readIdents :=
+            GenExprBinary(e, selfIdent, env, expectedOwnership);
+        case ArrayLen(expr, exprType, dim, native) => {
+          var recursiveGen, _, recIdents := GenExpr(expr, selfIdent, env, OwnershipOwned);
+          var arrayType := GenType(exprType, GenTypeContext.default());
+
+          if !arrayType.IsObjectOrPointer() {
+            r := Error("Array length of something not an array but " + arrayType.ToString(IND));
+          } else {
+            var underlying := arrayType.ObjectOrPointerUnderlying();
+            if dim == 0 && underlying.Array? {
+              r := read_macro.Apply1(recursiveGen).Sel("len").Apply0();
+            } else {
+              if dim == 0 {
+                r := read_macro.Apply1(recursiveGen).Sel("data").Sel("len").Apply0();
+              } else {
+                r := read_macro.Apply1(recursiveGen).Sel("length" + Strings.OfNat(dim) + "_usize").Apply0();
+              }
+            }
+            if !native {
+              r := R.dafny_runtime.MSel("int!").AsExpr().Apply1(r);
+            }
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case MapKeys(expr) => {
+          var recursiveGen, _, recIdents := GenExpr(expr, selfIdent, env, OwnershipAutoBorrowed);
+          readIdents := recIdents;
+          r := recursiveGen.Sel("keys").Apply0();
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case MapValues(expr) => {
+          var recursiveGen, _, recIdents := GenExpr(expr, selfIdent, env, OwnershipAutoBorrowed);
+          readIdents := recIdents;
+          r := recursiveGen.Sel("values").Apply0();
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case MapItems(expr) => {
+          var recursiveGen, _, recIdents := GenExpr(expr, selfIdent, env, OwnershipAutoBorrowed);
+          readIdents := recIdents;
+          r := recursiveGen.Sel("items").Apply0();
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case SelectFn(on, field, isDatatype, isStatic, isConstant, arguments) => {
+          // Transforms a function member into a lambda
+          var onExpr, onOwned, recIdents := GenExpr(on, selfIdent, env, OwnershipBorrowed);
+          var onString := onExpr.ToString(IND);
+
+          var lEnv := env;
+          var args := [];
+          var parameters := [];
+          for i := 0 to |arguments| {
+            var ty := GenType(arguments[i], GenTypeContext.default());
+            var bTy := R.Borrowed(ty);
+            var name := "x" + Strings.OfInt(i);
+            lEnv := lEnv.AddAssigned(name, bTy);
+            parameters := parameters + [R.Formal(name, bTy)];
+            args := args + [(name, ty)];
+          }
+          var body :=
+            if isStatic then
+              onExpr.FSel(escapeVar(field))
+            else
+              R.Identifier("callTarget").Sel(escapeVar(field));
+          if isConstant {
+            body := body.Apply0();
+          }
+          var onExprArgs := [];
+          for i := 0 to |args| {
+            var (name, ty) := args[i];
+            var rIdent, _, _ := GenIdent(name, selfIdent, lEnv, if !isConstant && ty.CanReadWithoutClone() then OwnershipOwned else OwnershipBorrowed);
+            onExprArgs := onExprArgs + [rIdent];
+          }
+          body := body.Apply(onExprArgs);
+          r := R.Lambda(parameters, None, body);
+          if isStatic {
+            // Generates |x0: &tp0, ...xn: &tpn| on::field(x0, .... xn) (possibly with some .clone())
+          } else {
+            // Generates
+            // {
+            //   let callTarget = (on); //or (on.clone()) if it was owned.
+            //   move |x0, ...xn| callTarget.field(x0, .... xn) (possibly with some .clone())
+            // }
+            var target := if onOwned == OwnershipOwned then onExpr else onExpr.Clone();
+            r := R.Block(
+              R.DeclareVar(R.CONST, "callTarget", None, Some(target)).Then(
+                r));
+          }
+
+          // as dyn ::std::ops::Fn(&_, ... &_) -> _
+          var typeShapeArgs := [];
+          for i := 0 to |arguments| {
+            typeShapeArgs := typeShapeArgs + [R.Borrowed(R.TIdentifier("_"))];
+          }
+
+          var typeShape := R.DynType(R.FnType(typeShapeArgs, R.TIdentifier("_")));
+
+          r := R.TypeAscription(
+            R.std_rc_Rc_new.Apply1(r),
+            R.std_rc_Rc.AsType().Apply([typeShape]));
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case Select(on, field, fieldMutability, isDatatype, fieldType) => {
+          if on.Companion? || on.ExternCompanion? {
+            var onExpr, onOwned, recIdents := GenExpr(on, selfIdent, env, OwnershipAutoBorrowed);
+
+            // onExpr::field()
+            r := onExpr.FSel(escapeVar(field)).Apply0();
+
+            r, resultingOwnership := FromOwned(r, expectedOwnership);
+            readIdents := recIdents;
+            return;
+          } else if isDatatype {
+            var onExpr, onOwned, recIdents := GenExpr(on, selfIdent, env, OwnershipAutoBorrowed);
+            // onExpr.field()
+            r := onExpr.Sel(escapeVar(field)).Apply0();
+            var originalMutability := OwnershipOwned;
+            match fieldMutability {
+              case ConstantField() => // Good
+              case InternalClassConstantFieldOrDatatypeDestructor() =>
+                originalMutability := OwnershipBorrowed;
+              case ClassMutableField() =>
+                r := Error("datatypes don't have mutable fields");
+            }
+            var typ := GenType(fieldType, GenTypeContext.default());
+            // All fields are returned as addresses for now until we have something more clever
+            r, resultingOwnership := FromOwnership(r, originalMutability, expectedOwnership);
+            readIdents := recIdents;
+          } else {
+            var onExpr, onOwned, recIdents := GenExpr(on, selfIdent, env, OwnershipAutoBorrowed);
+            r := onExpr;
+            if onExpr != R.self {// self are already borrowed or mutably borrowed
+              match onExpr { // Special case, the constructor.
+                case UnaryOp("&", Identifier("this"), _) =>
+                  r := R.Identifier("this");
+                case _ =>
+              }
+              if pointerType.RcMut?  {
+                r := r.Clone();
+              }
+              r := read_macro.Apply1(r);
+            }
+            r := r.Sel(escapeVar(field));
+            match fieldMutability {
+              case ConstantField() =>
+                r := r.Apply0();
+                r := r.Clone();
+              case InternalClassConstantFieldOrDatatypeDestructor() =>
+                r := r.Clone();
+              case ClassMutableField() =>
+                r := read_mutable_field_macro.Apply1(r); // Already contains a clone.
+            }
+            r, resultingOwnership := FromOwned(r, expectedOwnership);
+            readIdents := recIdents;
+          }
+          return;
+        }
+        case Index(on, collKind, indices) => {
+          assert {:split_here} true;
+          var onExpr, onOwned, recIdents := GenExpr(on, selfIdent, env, OwnershipAutoBorrowed);
+          readIdents := recIdents;
+          r := onExpr;
+
+          var hadArray := false;
+          if collKind == CollKind.Array {
+            r := read_macro.Apply1(r);
+            hadArray := true;
+            if |indices| > 1 {
+              r := r.Sel("data");
+            }
+          }
+          for i := 0 to |indices| {
+            if collKind == CollKind.Array {
+              var idx, idxOwned, recIdentsIdx := GenExpr(indices[i], selfIdent, env, OwnershipOwned);
+              idx := R.IntoUsize(idx);
+              r := R.SelectIndex(r, idx);
+              readIdents := readIdents + recIdentsIdx;
+            } else { // Sequence, Maps
+              var idx, idxOwned, recIdentsIdx := GenExpr(indices[i], selfIdent, env, OwnershipBorrowed);
+              r := r.Sel("get").Apply1(idx);
+              readIdents := readIdents + recIdentsIdx;
+            }
+          }
+          if hadArray {
+            r := r.Clone();
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case IndexRange(on, isArray, low, high) => {
+          var onExpectedOwnership :=
+            if isArray then
+              if pointerType.Raw? then
+                OwnershipOwned
+              else
+                OwnershipBorrowed
+            else
+              OwnershipAutoBorrowed;
+          var onExpr, onOwned, recIdents := GenExpr(on, selfIdent, env, onExpectedOwnership);
+          readIdents := recIdents;
+
+          var methodName := if low.Some? then
+            if high.Some? then "slice" else "drop"
+          else if high.Some? then "take" else "";
+
+          var arguments := [];
+          match low {
+            case Some(l) => {
+              var lExpr, _, recIdentsL := GenExpr(l, selfIdent, env, OwnershipBorrowed);
+              arguments := arguments + [lExpr];
+              readIdents := readIdents + recIdentsL;
+            }
+            case None => {}
+          }
+
+          match high {
+            case Some(h) => {
+              var hExpr, _, recIdentsH := GenExpr(h, selfIdent, env, OwnershipBorrowed);
+              arguments := arguments + [hExpr];
+              readIdents := readIdents + recIdentsH;
+            }
+            case None => {}
+          }
+
+          r := onExpr;
+          if isArray {
+            if methodName != "" {
+              methodName := "_" + methodName;
+            }
+            var object_suffix :=
+              if pointerType.Raw? then "" else "_object";
+            r := R.dafny_runtime_Sequence.FSel("from_array"+methodName+object_suffix).Apply([onExpr] + arguments);
+          } else {
+            if methodName != "" {
+              r := r.Sel(methodName).Apply(arguments);
+            } else {
+              r := r.Clone();
+            }
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case TupleSelect(on, idx, fieldType) => {
+          var onExpr, onOwnership, recIdents := GenExpr(on, selfIdent, env, OwnershipAutoBorrowed);
+          var selName := Strings.OfNat(idx); // Rust tuples
+          match fieldType {
+            case Tuple(tps) =>
+              if fieldType.Tuple? && |tps| > R.MAX_TUPLE_SIZE {
+                selName := "_" + selName; // R.SystemTuple
+              }
+            case _ =>
+          }
+          r := onExpr.Sel(selName).Clone(); // If we don't clone, we would move out that field
+          // even if "on" was borrowed, the field is always owned so we need to explicitly borrow it depending on the use case.
+          r, resultingOwnership := FromOwnership(r, OwnershipOwned, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case Call(on, name, typeArgs, args) => {
+          r, readIdents := GenOwnedCallPart(e, on, selfIdent, name, typeArgs, args, env);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case Lambda(paramsDafny, retType, body) => {
+          var params := GenParams(paramsDafny, true);
+          var paramNames := [];
+          var paramTypesMap := map[];
+          for i := 0 to |params| {
+            var name := params[i].name;
+            paramNames := paramNames + [name];
+            paramTypesMap := paramTypesMap[name := params[i].tpe];
+          }
+          var subEnv := env.ToOwned().merge(Environment(paramNames, paramTypesMap, {}));
+
+          var recursiveGen, recIdents, _ := GenStmts(body, if selfIdent != NoSelf then ThisTyped("_this", selfIdent.dafnyType) else NoSelf, subEnv, true, None);
+          readIdents := {};
+          recIdents := recIdents - (set name <- paramNames);
+          var allReadCloned := InitEmptyExpr();
+          while recIdents != {} decreases recIdents {
+            var next: string :| next in recIdents;
+
+            if selfIdent != NoSelf && next == "_this" {
+              var selfCloned, _, _ := GenIdent("self", selfIdent, Environment.Empty(), OwnershipOwned);
+              allReadCloned := allReadCloned.Then(R.DeclareVar(R.MUT, "_this", None, Some(selfCloned)));
+            } else if !(next in paramNames) {
+              var copy := R.Identifier(next).Clone();
+              allReadCloned := allReadCloned.Then(
+                R.DeclareVar(R.MUT, next, None, Some(copy))
+              );
+              readIdents := readIdents + {next};
+            }
+
+            recIdents := recIdents - {next};
+          }
+
+          var retTypeGen := GenType(retType, GenTypeContext.default());
+          r := R.Block(
+            allReadCloned.Then(
+              R.RcNew(
+                R.Lambda(params, Some(retTypeGen), R.Block(recursiveGen))
+              )
+            ));
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case BetaRedex(values, retType, expr) => {
+          var paramNames := [];
+          var paramFormals := GenParams(Std.Collections.Seq.Map(
+                                          (value: (Formal, Expression)) => value.0, values));
+          var paramTypes := map[];
+          var paramNamesSet := {};
+          for i := 0 to |values| {
+            var name := values[i].0.name;
+            var rName := escapeVar(name);
+            paramNames := paramNames + [rName];
+            paramTypes := paramTypes[rName := paramFormals[i].tpe];
+            paramNamesSet := paramNamesSet + {rName};
+          }
+
+          readIdents := {};
+          r := InitEmptyExpr();
+
+          for i := 0 to |values| {
+            var typeGen := GenType(values[i].0.typ, GenTypeContext.default());
+
+            var valueGen, _, recIdents := GenExpr(values[i].1, selfIdent, env, OwnershipOwned);
+            r := r.Then(R.DeclareVar(R.CONST, escapeVar(values[i].0.name), Some(typeGen), Some(valueGen)));
+            readIdents := readIdents + recIdents;
+          }
+
+          var newEnv := Environment(paramNames, paramTypes, {});
+
+          var recGen, recOwned, recIdents := GenExpr(expr, selfIdent, newEnv, expectedOwnership);
+          readIdents := recIdents - paramNamesSet;
+          r := R.Block(r.Then(recGen));
+          r, resultingOwnership := FromOwnership(r, recOwned, expectedOwnership);
+          return;
+        }
+        case IIFE(name, tpe, value, iifeBody) => {
+          var valueGen, _, recIdents := GenExpr(value, selfIdent, env, OwnershipOwned);
+
+          readIdents := recIdents;
+          var valueTypeGen := GenType(tpe, GenTypeContext.default());
+          var iifeVar := escapeVar(name);
+          var bodyGen, _, bodyIdents :=
+            GenExpr(iifeBody, selfIdent, env.AddAssigned(iifeVar, valueTypeGen), OwnershipOwned);
+          readIdents := readIdents + (bodyIdents - {iifeVar});
+          r := R.Block(
+            R.DeclareVar(R.CONST, iifeVar, Some(valueTypeGen), Some(valueGen))
+            .Then(bodyGen));
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case Apply(func, args) => {
+          var funcExpr, _, recIdents := GenExpr(func, selfIdent, env, OwnershipBorrowed);
+          readIdents := recIdents;
+          var rArgs := [];
+          for i := 0 to |args| {
+            var argExpr, argOwned, argIdents := GenExpr(args[i], selfIdent, env, OwnershipBorrowed);
+            rArgs := rArgs + [argExpr];
+            readIdents := readIdents + argIdents;
+          }
+          r := funcExpr.Apply(rArgs);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case TypeTest(on, dType, variant) => {
+          var exprGen, _, recIdents := GenExpr(on, selfIdent, env, OwnershipBorrowed);
+          var variantExprPath := GenPathExpr(dType + [Ident.Ident(variant)]);
+          r := R.Identifier("matches!").Apply(
+            [ exprGen.Sel("as_ref").Apply0(),
+              R.UnaryOp("{ .. }", variantExprPath, Format.UnaryOpFormat.NoFormat)]);
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case Is(expr, fromType, toType) => {
+          var expr, recOwned, recIdents := GenExpr(expr, selfIdent, env, OwnershipOwned);
+          var fromType := GenType(fromType, GenTypeContext.default());
+          var toType := GenType(toType, GenTypeContext.default());
+          if fromType.IsObjectOrPointer() && toType.IsObjectOrPointer() {
+            r := expr.Sel("is_instance_of").ApplyType([toType.ObjectOrPointerUnderlying()]).Apply0();
+          } else {
+            r := Error("Source and/or target types of type test is/are not Object or Ptr");
+            readIdents := {};
+          }
+          r, resultingOwnership := FromOwnership(r, recOwned, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case BoolBoundedPool() => {
+          r := R.RawExpr("[false, true]");
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := {};
+          return;
+        }
+        case SetBoundedPool(of) => {
+          var exprGen, _, recIdents := GenExpr(of, selfIdent, env, OwnershipBorrowed);
+          r := exprGen.Sel("iter").Apply0();
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case SeqBoundedPool(of, includeDuplicates) => {
+          var exprGen, _, recIdents := GenExpr(of, selfIdent, env, OwnershipBorrowed);
+          r := exprGen.Sel("iter").Apply0();
+          if !includeDuplicates {
+            r := R.dafny_runtime.MSel("itertools").MSel("Itertools").AsExpr().FSel("unique").Apply1(r);
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case MultisetBoundedPool(of, includeDuplicates) => {
+          var exprGen, _, recIdents := GenExpr(of, selfIdent, env, OwnershipBorrowed);
+          r := exprGen.Sel("iter").Apply0();
+          if !includeDuplicates {
+            r := R.dafny_runtime.MSel("itertools").MSel("Itertools").AsExpr().FSel("unique").Apply1(r);
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdents;
+          return;
+        }
+        case MapBoundedPool(of) => {
+          var exprGen, _, recIdents := GenExpr(of, selfIdent, env, OwnershipBorrowed);
+          r := exprGen.Sel("keys").Apply0().Sel("iter").Apply0();
+          readIdents := recIdents;
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+        }
+        case ExactBoundedPool(of) => {
+          var exprGen, _, recIdents := GenExpr(of, selfIdent, env, OwnershipOwned);
+          r := R.std.MSel("iter").AsExpr().FSel("once").Apply1(exprGen);
+          readIdents := recIdents;
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+        }
+        case IntRange(typ, lo, hi, up) => {
+          var lo, _, recIdentsLo := GenExpr(lo, selfIdent, env, OwnershipOwned);
+          var hi, _, recIdentsHi := GenExpr(hi, selfIdent, env, OwnershipOwned);
+          if up {
+            r := R.dafny_runtime.MSel("integer_range").AsExpr().Apply([lo, hi]);
+          } else {
+            r := R.dafny_runtime.MSel("integer_range_down").AsExpr().Apply([hi, lo]);
+          }
+          if !typ.Primitive? {
+            var tpe := GenType(typ, GenTypeContext.default());
+            r := r.Sel("map").Apply1(R.std.MSel("convert").MSel("Into").AsExpr().ApplyType([tpe]).FSel("into"));
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdentsLo + recIdentsHi;
+          return;
+        }
+        case UnboundedIntRange(start, up) => {
+          var start, _, recIdentStart := GenExpr(start, selfIdent, env, OwnershipOwned);
+          if up {
+            r := R.dafny_runtime.MSel("integer_range_unbounded").AsExpr().Apply1(start);
+          } else {
+            r := R.dafny_runtime.MSel("integer_range_down_unbounded").AsExpr().Apply1(start);
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := recIdentStart;
+          return;
+        }
+        case MapBuilder(keyType, valueType) => {
+          var kType := GenType(keyType, GenTypeContext.default());
+          var vType := GenType(valueType, GenTypeContext.default());
+          r := R.dafny_runtime.MSel("MapBuilder").AsExpr().ApplyType([kType, vType]).FSel("new").Apply0();
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          readIdents := {};
+          return;
+        }
+        case SetBuilder(elemType) => {
+          var eType := GenType(elemType, GenTypeContext.default());
+          readIdents := {};
+          r := R.dafny_runtime.MSel("SetBuilder").AsExpr().ApplyType([eType]).FSel("new").Apply0();
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+          return;
+        }
+        case Quantifier(elemType, collection, is_forall, lambda) => {
+          var tpe := GenType(elemType, GenTypeContext.default());
+          // Borrowed in this context means that the elements are iterated as borrowed,
+          // because lambda expression takes them borrowed by default.
+          var collectionGen, _, recIdents := GenExpr(collection, selfIdent, env, OwnershipOwned);
+          // Integer collections are owned because they are computed number by number.
+          // Sequence bounded pools are also owned
+          var extraAttributes := [];
+          if collection.IntRange?
+             || collection.UnboundedIntRange?
+             || collection.SeqBoundedPool?
+             || collection.ExactBoundedPool?
+             || collection.MultisetBoundedPool? {
+            extraAttributes := [AttributeOwned];
+          }
+
+          if lambda.Lambda? {
+            // The lambda is supposed to be a raw lambda, arguments are borrowed
+            var formals := lambda.params;
+            var newFormals := [];
+            for i := 0 to |formals| {
+              newFormals := newFormals + [formals[i].(attributes := extraAttributes + formals[i].attributes)];
+            }
+            var newLambda := lambda.(params := newFormals);
+            // TODO: We only add one attribute to each parameter.
+            assume {:axiom} newLambda < lambda;
+            var lambdaGen, _, recLambdaIdents := GenExpr(newLambda, selfIdent, env, OwnershipOwned);
+            var fn := if is_forall then "all" else "any";
+            r := collectionGen.Sel(fn).Apply1(lambdaGen.Sel("as_ref").Apply0());
+            readIdents := recIdents + recLambdaIdents;
+          } else {
+            r := Error("Quantifier without an inline lambda");
+            readIdents := {};
+          }
+          r, resultingOwnership := FromOwned(r, expectedOwnership);
+        }
+      }
+    }
+
+    function InitEmptyExpr(): R.Expr {
+      R.RawExpr("")
+    }
+
+    method Error(message: string, defaultExpr: R.Expr := InitEmptyExpr()) returns (r: R.Expr)
+      modifies this
+    {
+      if error.None? {
+        error := Some(message);
+      }
+      r := R.UnaryOp("/*" + message + "*/", defaultExpr, Format.UnaryOpFormat.NoFormat);
+    }
+
+    method Compile(p: seq<Module>, externalFiles: seq<string>) returns (s: string)
+      modifies this
+    {
+      s := "#![allow(warnings, unconditional_panic)]\n";
+      s := s + "#![allow(nonstandard_style)]\n";
+      s := s + "#![cfg_attr(any(), rustfmt::skip)]\n"; // Because Rustfmt crashes on some generated files
+
+      var externUseDecls := [];
+
+      for i := 0 to |externalFiles| {
+        var externalFile := externalFiles[i];
+        var externalMod := externalFile;
+        if |externalFile| > 3 && externalFile[|externalFile|-3..] == ".rs" {
+          externalMod := externalFile[0..|externalFile|-3];
+        } else {
+          error := Some("Unrecognized external file " + externalFile + ". External file must be *.rs files");
+        }
+        if rootType.RootCrate? {
+          var externMod := R.ExternMod(externalMod);
+          s := s + externMod.ToString("") + "\n";
+        }
+        externUseDecls := externUseDecls + [
+          R.UseDecl(R.Use(R.PUB, R.crate.MSel(externalMod).MSel("*")))
+        ];
+      }
+
+      if externUseDecls != [] {
+        s := s + R.Mod(
+          "Flattens all imported externs so that they can be accessed from this module",
+          [],
+          DAFNY_EXTERN_MODULE, externUseDecls).ToString("") + "\n";
+      }
+
+      var allModules := SeqMap<string, GatheringModule>.Empty();
+      for i := 0 to |p| {
+        var m := GenModule(p[i], []);
+        allModules := GatheringModule.MergeSeqMap(allModules, m);
+      }
+      for i := 0 to |allModules.keys| {
+        if allModules.keys[i] !in allModules.values { // Could be avoided with subset types
+          continue;
+        }
+        var m := allModules.values[allModules.keys[i]].ToRust();
+        for j := 0 to |optimizations| {
+          m := optimizations[j](m);
+        }
+        s := s + "\n";
+        s := s + m.ToString("");
+      }
+    }
+
+    method EmitCallToMain(companion: Expression, mainMethodName: string, hasArgs: bool) returns (s: string)
+      modifies this
+    {
+      s := "\nfn main() {";
+      if hasArgs {
+        s := s + @"
+  let args: Vec<String> = ::std::env::args().collect();
+  let dafny_args =
+    ::dafny_runtime::dafny_runtime_conversions::vec_to_dafny_sequence(
+    &args, |s| 
+  ::dafny_runtime::dafny_runtime_conversions::" + conversions + @"::string_to_dafny_string(s));
+  ";
+      }
+      var call, _, _ := GenExpr(companion, NoSelf, Environment.Empty(), OwnershipOwned);
+      call := call.FSel(mainMethodName);
+      if hasArgs {
+        call := call.Apply1(R.Borrow(R.Identifier("dafny_args")));
+      } else {
+        call := call.Apply([]);
+      }
+      s := s + call.ToString("") + ";\n}";
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/Rust/RustBackend.cs b/Source/DafnyCore/Backends/Rust/RustBackend.cs
new file mode 100644
index 00000000000..c0d06a59631
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/RustBackend.cs
@@ -0,0 +1,203 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.CommandLine;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Microsoft.Dafny.Compilers;
+
+public class RustBackend : DafnyExecutableBackend {
+  protected override bool PreventShadowing => false;
+  protected override string InternalFieldPrefix => "_i_";
+
+  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".rs" };
+  public override string TargetName => "Rust";
+  public override bool IsStable => true;
+  public override bool IsInternal => true;
+  public override string TargetExtension => "rs";
+  public override int TargetIndentSize => 4;
+  public override bool SupportsInMemoryCompilation => false;
+  public override bool TextualTargetIsExecutable => false;
+
+  public static readonly Option<string> RustModuleNameOption = new("--rust-module-name",
+    @"The enclosing Rust module name for the currently translated code, i.e. what goes between crate:: ...  ::module_name".TrimStart()) {
+  };
+  public override IEnumerable<Option<string>> SupportedOptions => new List<Option<string>> { RustModuleNameOption };
+
+  static RustBackend() {
+    OptionRegistry.RegisterOption(RustModuleNameOption, OptionScope.Translation);
+  }
+
+  public override IReadOnlySet<string> SupportedNativeTypes =>
+    new HashSet<string> { "byte", "sbyte", "ushort", "short", "uint", "int", "ulong", "long", "udoublelong", "doublelong" };
+
+  public override string TargetBasename(string dafnyProgramName) =>
+    Regex.Replace(base.TargetBasename(dafnyProgramName), "[^_A-Za-z0-9]", "_");
+
+  public override string TargetBaseDir(string dafnyProgramName) =>
+    $"{Path.GetFileNameWithoutExtension(dafnyProgramName)}-rust/src";
+
+  protected override DafnyWrittenCodeGenerator CreateDafnyWrittenCompiler() {
+    return new RustCodeGenerator(Options);
+  }
+
+  // Knowing that the result of the compilation will be placed in a dafnyProgramName.rs,
+  // and that Dafny needs to import all the OtherFileNames into the same folder, but does not really care about their names,
+  // this function returns a mapping from full paths of Rust files to a unique resulting name.
+  //
+  // For example, if OtherFiles == ["C:\Users\myextern.rs", "C:\Users\path\myextern.rs", "C:\Users\nonconflictextern.rs"] and dafnyProgramName == "myextern.dfy", it will create the dictionary
+  // new Dictionary() {
+  // { "C:\Users\myextern.rs", "myextern_1.rs" },
+  // { "C:\Users\path\myextern.rs", "myextern_2.rs" },
+  // { "C:\Users\myotherextern.rs", "nonconflictingextern.rs" }
+  // }
+  public override Dictionary<string, string> ImportFilesMapping(string dafnyProgramName) {
+    Dictionary<string, string> importedFilesMapping = new();
+    var baseName = Path.GetFileNameWithoutExtension(dafnyProgramName);
+    importedFilesMapping["dummy"] = baseName + ".rs";
+    var keyToRemove = "dummy to lower";
+    importedFilesMapping[keyToRemove] = baseName.ToLower() + ".rs";
+    var toRemove = new List<string> { "dummy", keyToRemove };
+    if (OtherFileNames != null) {
+      foreach (var otherFileFullPath in OtherFileNames) {
+        var otherFileName = Path.GetFileName(otherFileFullPath);
+        if (importedFilesMapping.ContainsValue(otherFileName) || importedFilesMapping.ContainsValue(otherFileName.ToLower())) {
+          var newOtherFileBase = Path.GetFileNameWithoutExtension(otherFileName);
+          var i = 0;
+          do {
+            i++;
+            otherFileName = newOtherFileBase + $"_{i}.rs";
+          } while (importedFilesMapping.ContainsValue(otherFileName) || importedFilesMapping.ContainsValue(otherFileName.ToLower()));
+        }
+        // Ensures we don't have overwrites in case-insensitive systems such as Windows
+        importedFilesMapping[otherFileFullPath] = otherFileName;
+        importedFilesMapping["to lower " + otherFileFullPath] = otherFileName.ToLower();
+        toRemove.Add("to lower " + otherFileFullPath);
+      }
+    }
+
+    foreach (var path in toRemove) {
+      importedFilesMapping.Remove(path);
+    }
+    return importedFilesMapping;
+  }
+
+
+  public override async Task<bool> OnPostGenerate(string dafnyProgramName, string targetDirectory, TextWriter outputWriter) {
+    foreach (var keyValue in ImportFilesMapping(dafnyProgramName)) {
+      var fullRustExternName = keyValue.Key;
+      var expectedRustName = keyValue.Value;
+      File.Copy(fullRustExternName, Path.Combine(targetDirectory, expectedRustName), true);
+    }
+    return await base.OnPostGenerate(dafnyProgramName, targetDirectory, outputWriter);
+  }
+
+  private string ComputeExeName(string targetFilename) {
+    var targetDirectory = Path.GetDirectoryName(Path.GetDirectoryName(targetFilename));
+    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+      return Path.Combine(targetDirectory, "target", "debug", Path.GetFileNameWithoutExtension(targetFilename) + ".exe");
+    } else {
+      return Path.Combine(targetDirectory, "target", "debug", Path.GetFileNameWithoutExtension(targetFilename));
+    }
+  }
+
+  public override async Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText,
+    string callToMain /*?*/, string targetFilename /*?*/, ReadOnlyCollection<string> otherFileNames,
+    bool runAfterCompile, TextWriter outputWriter) {
+    var targetDirectory = Path.GetDirectoryName(Path.GetDirectoryName(targetFilename));
+    var runtimeDirectory = Path.Combine(targetDirectory, "runtime");
+    if (Directory.Exists(runtimeDirectory)) {
+      Directory.Delete(runtimeDirectory, true);
+    }
+    Directory.CreateDirectory(runtimeDirectory);
+
+    var assembly = System.Reflection.Assembly.Load("DafnyPipeline");
+    assembly.GetManifestResourceNames().Where(f => f.StartsWith("DafnyPipeline.DafnyRuntimeRust")).ToList().ForEach(f => {
+      var stream = assembly.GetManifestResourceStream(f);
+      var dotToSlashPath = "";
+      var parts = f.Replace("DafnyPipeline.DafnyRuntimeRust.", "").Split('.');
+      for (var i = 0; i < parts.Length; i++) {
+        dotToSlashPath += parts[i];
+
+        if (i < parts.Length - 2) {
+          dotToSlashPath += "/";
+        } else if (i == parts.Length - 2) {
+          // extension
+          dotToSlashPath += ".";
+        }
+      }
+
+      var containingDirectory = Path.Combine(runtimeDirectory, Path.GetDirectoryName(dotToSlashPath));
+      if (!Directory.Exists(containingDirectory)) {
+        Directory.CreateDirectory(containingDirectory);
+      }
+
+      using var outFile = new FileStream(Path.Combine(runtimeDirectory, dotToSlashPath), FileMode.Create, FileAccess.Write);
+      stream.CopyTo(outFile);
+    });
+
+    await using (var cargoToml = new FileStream(Path.Combine(targetDirectory, "Cargo.toml"), FileMode.Create, FileAccess.Write)) {
+      await using var cargoTomlWriter = new StreamWriter(cargoToml);
+      await cargoTomlWriter.WriteLineAsync("[package]");
+      var packageName = Path.GetFileNameWithoutExtension(targetFilename);
+      // package name cannot start with a digit
+      if (char.IsDigit(packageName[0])) {
+        packageName = "_" + packageName;
+      }
+      await cargoTomlWriter.WriteLineAsync($"name = \"{packageName}\"");
+      await cargoTomlWriter.WriteLineAsync("version = \"0.1.0\"");
+      await cargoTomlWriter.WriteLineAsync("edition = \"2021\"");
+      await cargoTomlWriter.WriteLineAsync();
+      await cargoTomlWriter.WriteLineAsync("[dependencies]");
+      await cargoTomlWriter.WriteLineAsync("dafny_runtime = { path = \"runtime\" }");
+      await cargoTomlWriter.WriteLineAsync();
+
+      if (callToMain == null) {
+        await cargoTomlWriter.WriteLineAsync("[lib]");
+        await cargoTomlWriter.WriteLineAsync("path = \"src/" + Path.GetFileName(targetFilename) + "\"");
+        await cargoTomlWriter.WriteLineAsync();
+      } else {
+        await cargoTomlWriter.WriteLineAsync("[[bin]]");
+        await cargoTomlWriter.WriteLineAsync($"name = \"{Path.GetFileNameWithoutExtension(targetFilename)}\"");
+        await cargoTomlWriter.WriteLineAsync("path = \"src/" + Path.GetFileName(targetFilename) + "\"");
+        await cargoTomlWriter.WriteLineAsync();
+      }
+    }
+
+    var args = new List<string> {
+      "build",
+      "--quiet"
+    };
+
+    if (callToMain == null) {
+      args.Add("--lib");
+    } else {
+      args.Add("--bin");
+      args.Add(Path.GetFileNameWithoutExtension(targetFilename));
+    }
+
+    var psi = PrepareProcessStartInfo("cargo", args);
+    psi.WorkingDirectory = targetDirectory;
+    return (0 == await RunProcess(psi, outputWriter, outputWriter, "Error while compiling Rust files."), null);
+  }
+  public override Encoding OutputWriterEncoding => Encoding.UTF8;
+
+  public override async Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText,
+    string callToMain, /*?*/
+    string targetFilename, ReadOnlyCollection<string> otherFileNames, object compilationResult, TextWriter outputWriter,
+    TextWriter errorWriter) {
+    Contract.Requires(targetFilename != null || otherFileNames.Count == 0);
+    var psi = PrepareProcessStartInfo(ComputeExeName(targetFilename), Options.MainArgs);
+    return 0 == await RunProcess(psi, outputWriter, errorWriter);
+  }
+
+  public RustBackend(DafnyOptions options) : base(options) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/Rust/RustCodeGenerator.cs b/Source/DafnyCore/Backends/Rust/RustCodeGenerator.cs
new file mode 100644
index 00000000000..8dc6839eb87
--- /dev/null
+++ b/Source/DafnyCore/Backends/Rust/RustCodeGenerator.cs
@@ -0,0 +1,56 @@
+using System;
+using System.CommandLine;
+using System.Configuration;
+using System.IO;
+using System.Linq;
+using Dafny;
+using DCOMP;
+
+namespace Microsoft.Dafny.Compilers {
+
+  class RustCodeGenerator : DafnyWrittenCodeGenerator {
+    public DafnyOptions Options { get; set; }
+
+    public RustCodeGenerator(DafnyOptions options) {
+      this.Options = options;
+    }
+
+    private COMP CreateCompiler() {
+      var c = new DCOMP.COMP();
+      var charType = Options.Get(CommonOptionBag.UnicodeCharacters)
+        ? Defs.CharType.create_UTF32()
+        : Defs.CharType.create_UTF16();
+      var pointerType = Options.Get(CommonOptionBag.RawPointers)
+        ? Defs.PointerType.create_Raw()
+        : Defs.PointerType.create_RcMut();
+      var rootType = Options.Get(RustBackend.RustModuleNameOption) is { } opt && opt != "" ?
+        Defs.RootType.create_RootPath(Sequence<Rune>.UnicodeFromString(opt))
+        : Defs.RootType.create_RootCrate();
+      c.__ctor(charType, pointerType, rootType);
+      return c;
+    }
+
+    public override void Compile(Sequence<DAST.Module> program, Sequence<ISequence<Rune>> otherFiles, ConcreteSyntaxTree w) {
+      var c = CreateCompiler();
+      var s = c.Compile(program, otherFiles);
+      if (!Options.Get(CommonOptionBag.EmitUncompilableCode) && c.error.is_Some) {
+        throw new UnsupportedInvalidOperationException(c.error.dtor_value.ToVerbatimString(false));
+      }
+      w.Write(s.ToVerbatimString(false));
+    }
+
+    public override ISequence<Rune> EmitCallToMain(
+      DAST.Expression companion,
+      Sequence<Rune> mainMethodName,
+      bool hasArguments) {
+      var c = CreateCompiler();
+      var result = c.EmitCallToMain(companion, mainMethodName, hasArguments);
+      if (!Options.Get(CommonOptionBag.EmitUncompilableCode) && c.error.is_Some) {
+        throw new UnsupportedInvalidOperationException(c.error.dtor_value.ToVerbatimString(false));
+      }
+
+      return result;
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Backends/SinglePassCodeGenerator/SinglePassCodeGenerator.Expression.cs b/Source/DafnyCore/Backends/SinglePassCodeGenerator/SinglePassCodeGenerator.Expression.cs
new file mode 100644
index 00000000000..2bec6432580
--- /dev/null
+++ b/Source/DafnyCore/Backends/SinglePassCodeGenerator/SinglePassCodeGenerator.Expression.cs
@@ -0,0 +1,744 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.IO;
+using System.Diagnostics.Contracts;
+using DafnyCore;
+using JetBrains.Annotations;
+using Microsoft.BaseTypes;
+using static Microsoft.Dafny.GeneratorErrors;
+
+namespace Microsoft.Dafny.Compilers {
+  public abstract partial class SinglePassCodeGenerator {
+
+    public virtual Type GetRuntimeType(Type tpe) {
+      return tpe.GetRuntimeType();
+    }
+
+    public virtual void EmitExpr(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts) {
+      switch (expr) {
+        case LiteralExpr literalExpr: {
+            LiteralExpr e = literalExpr;
+            EmitLiteralExpr(wr, e);
+            break;
+          }
+        case ThisExpr: {
+            if (thisContext != null) {
+              var instantiatedType = expr.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
+              var contextType = UserDefinedType.FromTopLevelDecl(expr.Origin, thisContext);
+              if (contextType.ResolvedClass is ClassLikeDecl { NonNullTypeDecl: { } } cls) {
+                contextType = UserDefinedType.FromTopLevelDecl(expr.Origin, cls.NonNullTypeDecl);
+              }
+
+              wr = EmitCoercionIfNecessary(contextType, instantiatedType, expr.Origin, wr);
+            }
+
+            EmitThis(wr);
+            break;
+          }
+        case IdentifierExpr identifierExpr: {
+            var e = identifierExpr;
+            if (inLetExprBody && !(e.Var is BoundVar)) {
+              // copy variable to a temp since
+              //   - C# doesn't allow out param in letExpr body, and
+              //   - Java doesn't allow any non-final variable in letExpr body.
+              var name = ProtectedFreshId("_pat_let_tv");
+              EmitIdentifier(name, wr);
+              DeclareLocalVar(name, null, null, false, IdName(e.Var), copyInstrWriters.Peek(), e.Type);
+            } else {
+              EmitIdentifier(IdName(e.Var), wr);
+            }
+
+            break;
+          }
+        case SetDisplayExpr displayExpr: {
+            var e = displayExpr;
+            EmitCollectionDisplay(e.Type.NormalizeToAncestorType().AsSetType, e.Origin, e.Elements, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case MultiSetDisplayExpr displayExpr: {
+            var e = displayExpr;
+            EmitCollectionDisplay(e.Type.NormalizeToAncestorType().AsMultiSetType, e.Origin, e.Elements, inLetExprBody, wr,
+              wStmts);
+            break;
+          }
+        case SeqDisplayExpr displayExpr: {
+            var e = displayExpr;
+            EmitCollectionDisplay(e.Type.NormalizeToAncestorType().AsSeqType, e.Origin, e.Elements, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case MapDisplayExpr displayExpr: {
+            var e = displayExpr;
+            EmitMapDisplay(e.Type.NormalizeToAncestorType().AsMapType, e.Origin, e.Elements, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case MemberSelectExpr selectExpr: {
+            MemberSelectExpr e = selectExpr;
+            SpecialField sf = e.Member as SpecialField;
+            if (sf != null) {
+              GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, e.Obj.Type, out var compiledName, out var preStr,
+                out var postStr);
+              wr.Write(preStr);
+
+              if (sf.IsStatic && !SupportsStaticsInGenericClasses && sf.EnclosingClass.TypeArgs.Count != 0) {
+                var typeArgs = e.TypeApplicationAtEnclosingClass;
+                Contract.Assert(typeArgs.Count == sf.EnclosingClass.TypeArgs.Count);
+                wr.Write("{0}.", TypeName_Companion(e.Obj.Type, wr, e.Origin, sf));
+                EmitNameAndActualTypeArgs(IdName(e.Member), typeArgs, e.Origin, null, false, wr);
+                var tas = TypeArgumentInstantiation.ListFromClass(sf.EnclosingClass, typeArgs);
+                EmitTypeDescriptorsActuals(tas, e.Origin, wr.ForkInParens());
+              } else {
+                void writeObj(ConcreteSyntaxTree w) {
+                  //Contract.Assert(!sf.IsStatic);
+                  w = EmitCoercionIfNecessary(e.Obj.Type, UserDefinedType.UpcastToMemberEnclosingType(e.Obj.Type, e.Member),
+                    e.Origin, w);
+                  TrParenExpr(e.Obj, w, inLetExprBody, wStmts);
+                }
+
+                var typeArgs = CombineAllTypeArguments(e.Member, e.TypeApplicationAtEnclosingClass,
+                  e.TypeApplicationJustMember);
+                EmitMemberSelect(writeObj, e.Obj.Type, e.Member, typeArgs, e.TypeArgumentSubstitutionsWithParents(),
+                  selectExpr.Type).EmitRead(wr);
+              }
+
+              wr.Write(postStr);
+            } else {
+              var typeArgs =
+                CombineAllTypeArguments(e.Member, e.TypeApplicationAtEnclosingClass, e.TypeApplicationJustMember);
+              var typeMap = e.TypeArgumentSubstitutionsWithParents();
+              var customReceiver = NeedsCustomReceiverNotTrait(e.Member);
+              if (!customReceiver && !e.Member.IsStatic) {
+                Action<ConcreteSyntaxTree> obj;
+                // The eta conversion here is to avoid capture of the receiver, because the call to EmitMemberSelect below may generate
+                // a lambda expression in the target language.
+                if (e.Member is Function && typeArgs.Count != 0) {
+                  // need to eta-expand wrap the receiver
+                  var etaReceiver = ProtectedFreshId("_eta_this");
+                  wr = CreateIIFE_ExprBody(etaReceiver, e.Obj.Type, e.Obj.Origin, e.Obj, inLetExprBody, e.Type.Subst(typeMap),
+                    e.Origin, wr, ref wStmts);
+                  obj = w => EmitIdentifier(etaReceiver, w);
+                } else {
+                  obj = w => EmitExpr(e.Obj, inLetExprBody, w, wStmts);
+                }
+
+                EmitMemberSelect(obj, e.Obj.Type, e.Member, typeArgs, typeMap, selectExpr.Type).EmitRead(wr);
+              } else {
+                string customReceiverName = null;
+                if (customReceiver && e.Member is Function) {
+                  // need to eta-expand wrap the receiver
+                  customReceiverName = ProtectedFreshId("_eta_this");
+                  wr = CreateIIFE_ExprBody(customReceiverName, e.Obj.Type, e.Obj.Origin, e.Obj, inLetExprBody,
+                    e.Type.Subst(typeMap), e.Origin, wr, ref wStmts);
+                }
+
+                Action<ConcreteSyntaxTree> obj = w => EmitTypeName_Companion(e.Obj.Type, w, wr, e.Origin, e.Member);
+                EmitMemberSelect(obj, e.Obj.Type, e.Member, typeArgs, typeMap, selectExpr.Type, customReceiverName).EmitRead(wr);
+              }
+            }
+
+            break;
+          }
+        case SeqSelectExpr selectExpr: {
+            SeqSelectExpr e = selectExpr;
+            Contract.Assert(e.Seq.Type != null);
+            if (e.Seq.Type.IsArrayType) {
+              if (e.SelectOne) {
+                Contract.Assert(e.E0 != null && e.E1 == null);
+                var w = EmitArraySelect(new List<Expression>() { e.E0 }, e.Type, inLetExprBody, wr, wStmts);
+                w = EmitCoercionIfNecessary(
+                  e.Seq.Type,
+                  e.Seq.Type.IsNonNullRefType || !e.Seq.Type.IsRefType
+                    ? null
+                    : UserDefinedType.CreateNonNullType((UserDefinedType)e.Seq.Type.NormalizeExpand()),
+                  e.Origin,
+                  w
+                );
+                TrParenExpr(e.Seq, w, inLetExprBody, wStmts);
+              } else {
+                EmitSeqSelectRange(e.Seq, e.E0, e.E1, true, inLetExprBody, wr, wStmts);
+              }
+            } else if (e.SelectOne) {
+              Contract.Assert(e.E0 != null && e.E1 == null);
+              EmitIndexCollectionSelect(e.Seq, e.E0, inLetExprBody, wr, wStmts);
+            } else {
+              EmitSeqSelectRange(e.Seq, e.E0, e.E1, false, inLetExprBody, wr, wStmts);
+            }
+
+            break;
+          }
+        case SeqConstructionExpr constructionExpr: {
+            var e = constructionExpr;
+            EmitSeqConstructionExpr(e, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case MultiSetFormingExpr formingExpr: {
+            var e = formingExpr;
+            EmitMultiSetFormingExpr(e, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case MultiSelectExpr selectExpr: {
+            MultiSelectExpr e = selectExpr;
+            WriteCast(TypeName(e.Type.NormalizeExpand(), wr, e.Origin), wr);
+            var w = EmitArraySelect(e.Indices, e.Type, inLetExprBody, wr, wStmts);
+            TrParenExpr(e.Array, w, inLetExprBody, wStmts);
+            break;
+          }
+        case SeqUpdateExpr updateExpr: {
+            SeqUpdateExpr e = updateExpr;
+            var collectionType = e.Type.NormalizeToAncestorType().AsCollectionType;
+            Contract.Assert(collectionType != null);
+            EmitIndexCollectionUpdate(e.Seq, e.Index, e.Value, collectionType, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case DatatypeUpdateExpr updateExpr: {
+            var e = updateExpr;
+            if (e.Members.All(member => member.IsGhost)) {
+              // all fields to be updated are ghost, which doesn't change the value
+              EmitExpr(e.Root, inLetExprBody, wr, wStmts);
+              return;
+            }
+
+            if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, e.Root.Type.AsDatatype, out var dtor)) {
+              var i = e.Members.IndexOf(dtor);
+              if (0 <= i) {
+                // the datatype is an erasable wrapper and its core destructor is part of the update (which implies everything else must be a ghost),
+                // so proceed as with the rhs
+                Contract.Assert(Enumerable.Range(0, e.Members.Count).All(j => j == i || e.Members[j].IsGhost));
+                Contract.Assert(e.Members.Count == e.Updates.Count);
+                var rhs = e.Updates[i].Item3;
+                EmitExpr(rhs, inLetExprBody, wr, wStmts);
+                return;
+              }
+            }
+
+            // the optimized cases don't apply, so proceed according to the desugaring
+            EmitExpr(e.ResolvedExpression, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case FunctionCallExpr callExpr: {
+            FunctionCallExpr e = callExpr;
+
+            void EmitExpr(Expression e2, ConcreteSyntaxTree wr2, bool inLetExpr, ConcreteSyntaxTree wStmts2) {
+              this.EmitExpr(e2, inLetExpr, wr2, wStmts2);
+            }
+
+            if (e.Function is SpecialFunction) {
+              CompileSpecialFunctionCallExpr(e, wr, inLetExprBody, wStmts, EmitExpr);
+            } else {
+              CompileFunctionCallExpr(e, wr, inLetExprBody, wStmts, EmitExpr);
+            }
+
+            break;
+          }
+        case ApplyExpr applyExpr: {
+            var e = applyExpr;
+            EmitApplyExpr(e.Function.Type, e.Origin, e.Function, e.Args, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case DatatypeValue value: {
+            var dtv = value;
+            Contract.Assert(dtv.Ctor != null); // since dtv has been successfully resolved
+
+            if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dtv.Ctor.EnclosingDatatype, out var dtor)) {
+              var i = dtv.Ctor.Destructors.IndexOf(dtor);
+              Contract.Assert(0 <= i);
+              EmitExpr(dtv.Arguments[i], inLetExprBody, wr, wStmts);
+              return;
+            }
+
+            var wrArgumentList = new ConcreteSyntaxTree();
+            var wTypeDescriptorArguments = new ConcreteSyntaxTree();
+            var typeSubst = TypeParameter.SubstitutionMap(dtv.Ctor.EnclosingDatatype.TypeArgs, dtv.InferredTypeArgs);
+            string sep = "";
+            Contract.Assert(dtv.Ctor.EnclosingDatatype.TypeArgs.Count == dtv.InferredTypeArgs.Count);
+            WriteTypeDescriptors(dtv.Ctor.EnclosingDatatype, dtv.InferredTypeArgs, wTypeDescriptorArguments, ref sep);
+            sep = "";
+            for (var i = 0; i < dtv.Arguments.Count; i++) {
+              var formal = dtv.Ctor.Formals[i];
+              if (!formal.IsGhost) {
+                wrArgumentList.Write(sep);
+                var w = EmitCoercionIfNecessary(from: dtv.Arguments[i].Type, to: dtv.Ctor.Formals[i].Type.Subst(typeSubst),
+                  toOrig: dtv.Ctor.Formals[i].Type, tok: dtv.Origin, wr: wrArgumentList);
+                EmitExpr(dtv.Arguments[i], inLetExprBody, w, wStmts);
+                sep = ", ";
+              }
+            }
+
+            EmitDatatypeValue(dtv, wTypeDescriptorArguments.ToString(), wrArgumentList.ToString(), wr);
+            break;
+          }
+        case OldExpr:
+          Contract.Assert(false);
+          throw new cce.UnreachableException(); // 'old' is always a ghost
+        case UnaryOpExpr opExpr: {
+            var e = opExpr;
+            if (e.ResolvedOp == UnaryOpExpr.ResolvedOpcode.BVNot) {
+              wr = EmitBitvectorTruncation(e.Type.NormalizeToAncestorType().AsBitVectorType, e.Type.AsNativeType(), true,
+                wr);
+            }
+
+            EmitUnaryExpr(UnaryOpCodeMap[e.ResolvedOp], e.E, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case ConversionExpr conversionExpr: {
+            var e = conversionExpr;
+            var fromType = GetRuntimeType(e.E.Type);
+            var toType = GetRuntimeType(e.ToType);
+            Contract.Assert(Options.Get(CommonOptionBag.GeneralTraits) != CommonOptionBag.GeneralTraitsOptions.Legacy ||
+                            toType.IsRefType == fromType.IsRefType ||
+                            (fromType.IsTypeParameter && toType.IsTraitType));
+            if (toType.IsRefType || toType.IsTraitType || fromType.IsTraitType) {
+              var w = EmitCoercionIfNecessary(e.E.Type, e.ToType, e.Origin, wr);
+              w = EmitDowncastIfNecessary(e.E.Type, e.ToType, e.Origin, w);
+              EmitExpr(e.E, inLetExprBody, w, wStmts);
+            } else if (e.E.Type.IsSubtypeOf(e.ToType, false, false)) {
+              // conversion is a no-op -- almost, because it may need a cast to deal with bounded type parameters
+              var w = EmitDowncastIfNecessary(e.E.Type, e.ToType, e.Origin, wr);
+              EmitExpr(e.E, inLetExprBody, w, wStmts);
+            } else {
+              EmitConversionExpr(e.E, fromType, toType, inLetExprBody, wr, wStmts);
+            }
+
+            break;
+          }
+        case TypeTestExpr typeTestExpr:
+          CompileTypeTest(typeTestExpr, inLetExprBody, wr, ref wStmts);
+          break;
+        case BinaryExpr binary:
+          EmitBinaryExpr(inLetExprBody, wr, wStmts, binary);
+          break;
+        case TernaryExpr:
+          Contract.Assume(false); // currently, none of the ternary expressions is compilable
+          break;
+        case LetExpr letExpr: {
+            var e = letExpr;
+            if (e.Exact) {
+              // The Dafny "let" expression
+              //    var Pattern(x,y) := G; E
+              // is translated into C# as:
+              //    LamLet(G, tmp =>
+              //      LamLet(dtorX(tmp), x =>
+              //      LamLet(dtorY(tmp), y => E)))
+              Contract.Assert(e.LHSs.Count == e.RHSs.Count); // checked by resolution
+              var w = wr;
+              for (int i = 0; i < e.LHSs.Count; i++) {
+                var lhs = e.LHSs[i];
+                if (Contract.Exists(lhs.Vars, bv => !bv.IsGhost)) {
+                  var rhsName = $"_pat_let{GetUniqueAstNumber(e)}_{i}";
+                  w = CreateIIFE_ExprBody(rhsName, e.RHSs[i].Type, e.RHSs[i].Origin, e.RHSs[i], inLetExprBody, e.Body.Type,
+                    e.Body.Origin, w, ref wStmts);
+                  w = TrCasePattern(lhs, wr => EmitIdentifier(rhsName, wr), e.RHSs[i].Type, e.Body.Type, w, ref wStmts);
+                }
+              }
+
+              EmitExpr(e.Body, true, w, wStmts);
+            } else if (e.BoundVars.All(bv => bv.IsGhost)) {
+              // The Dafny "let" expression
+              //    ghost var x,y :| Constraint; E
+              // is compiled just like E is, because the resolver has already checked that x,y (or other ghost variables, for that matter) don't
+              // occur in E (moreover, the verifier has checked that values for x,y satisfying Constraint exist).
+              EmitExpr(e.Body, inLetExprBody, wr, wStmts);
+            } else {
+              // The Dafny "let" expression
+              //    var x,y :| Constraint; E
+              // is translated into C# as:
+              //    LamLet(0, dummy => {  // the only purpose of this construction here is to allow us to add some code inside an expression in C#
+              //        var x,y;
+              //        // Embark on computation that fills in x,y according to Constraint; the computation stops when the first
+              //        // such value is found, but since the verifier checks that x,y follows uniquely from Constraint, this is
+              //        // not a source of nondeterminancy.
+              //        return E;
+              //      })
+              Contract.Assert(e.RHSs.Count == 1); // checked by resolution
+              var missingBounds = BoolBoundedPool.MissingBounds(e.BoundVars.ToList<BoundVar>(), e.Constraint_Bounds,
+                BoundedPool.PoolVirtues.Enumerable);
+              if (missingBounds.Count != 0) {
+                foreach (var bv in missingBounds) {
+                  Error(ErrorId.c_let_such_that_is_too_complex, e.Origin,
+                    "this let-such-that expression is too advanced for the current compiler; Dafny's heuristics cannot find any bound for variable '{0}'",
+                    wr, bv.Name);
+                }
+              } else {
+                var w = CreateIIFE1(0, e.Body.Type, e.Body.Origin, "_let_dummy_" + GetUniqueAstNumber(e), wr, wStmts);
+                foreach (var bv in e.BoundVars) {
+                  DeclareLocalVar(IdName(bv), bv.Type, bv.Origin, false, ForcePlaceboValue(bv.Type, wr, bv.Origin, true), w);
+                }
+
+                TrAssignSuchThat(new List<IVariable>(e.BoundVars).ConvertAll(bv => (IVariable)bv), e.RHSs[0],
+                  e.Constraint_Bounds, w, inLetExprBody);
+                EmitReturnExpr(e.Body, e.Body.Type, true, w);
+              }
+            }
+
+            break;
+          }
+        case NestedMatchExpr nestedMatchExpr:
+          EmitNestedMatchExpr(nestedMatchExpr, inLetExprBody, wr, wStmts);
+          break;
+        case MatchExpr matchExpr:
+          EmitMatchExpr(matchExpr, inLetExprBody, wr, wStmts);
+          break;
+        case QuantifierExpr quantifierExpr: {
+            var e = quantifierExpr;
+
+            // Compilation does not check whether a quantifier was split.
+
+            wr = CaptureFreeVariables(quantifierExpr, true, out var su, inLetExprBody, wr, ref wStmts);
+            var logicalBody = su.Substitute(e.LogicalBody(true));
+
+            Contract.Assert(e.Bounds !=
+                            null); // for non-ghost quantifiers, the resolver would have insisted on finding bounds
+            var n = e.BoundVars.Count;
+            Contract.Assert(e.Bounds.Count == n);
+            var wBody = wr;
+            for (int i = 0; i < n; i++) {
+              var bound = e.Bounds[i];
+              var bv = e.BoundVars[i];
+
+              var collectionElementType = CompileCollection(bound, bv, inLetExprBody, false, su, out var collection,
+            out var newtypeConversionsWereExplicit, wStmts,
+                e.Bounds, e.BoundVars, i);
+              wBody = EmitQuantifierExpr(collection, quantifierExpr is ForallExpr, collectionElementType, bv, wBody);
+              var native = AsNativeType(e.BoundVars[i].Type);
+              var tmpVarName = ProtectedFreshId(e is ForallExpr ? "_forall_var_" : "_exists_var_");
+              ConcreteSyntaxTree newWBody = CreateLambda(new List<Type> { collectionElementType }, e.Origin,
+                new List<string> { tmpVarName }, Type.Bool, wBody, wStmts, untyped: true);
+              wStmts = newWBody.Fork();
+              newWBody = MaybeInjectSubtypeConstraintWrtTraits(
+                tmpVarName, collectionElementType, bv.Type,
+                inLetExprBody, e.Origin, newWBody, true, e is ForallExpr);
+              EmitDowncastVariableAssignment(
+                IdName(bv), bv.Type, tmpVarName, collectionElementType, true, e.Origin, newWBody);
+              newWBody = MaybeInjectSubsetConstraint(
+                bv, bv.Type, inLetExprBody, e.Origin, newWBody, newtypeConversionsWereExplicit, isReturning: true, elseReturnValue: e is ForallExpr);
+              wBody = newWBody;
+            }
+
+            EmitExpr(logicalBody, inLetExprBody, wBody, wStmts);
+            break;
+          }
+        case SetComprehension comprehension: {
+            var e = comprehension;
+            // For "set i,j,k,l | R(i,j,k,l) :: Term(i,j,k,l)" where the term has type "G", emit something like:
+            // ((System.Func<Set<G>>)(() => {
+            //   var _coll = new List<G>();
+            //   foreach (var tmp_l in sq.Elements) { L l = (L)tmp_l;
+            //     foreach (var tmp_k in st.Elements) { K k = (K)tmp_k;
+            //       for (BigInteger j = Lo; j < Hi; j++) {
+            //         for (bool i in Helper.AllBooleans) {
+            //           if (R(i,j,k,l)) {
+            //             _coll.Add(Term(i,j,k,l));
+            //           }
+            //         }
+            //       }
+            //     }
+            //   }
+            //   return Dafny.Set<G>.FromCollection(_coll);
+            // }))()
+            // We also split R(i,j,k,l) to evaluate it as early as possible.
+            wr = CaptureFreeVariables(e, true, out var su, inLetExprBody, wr, ref wStmts);
+            e = (SetComprehension)su.Substitute(e);
+
+            Contract.Assert(e.Bounds != null); // the resolver would have insisted on finding bounds
+            var collectionName = ProtectedFreshId("_coll");
+            var setType = e.Type.NormalizeToAncestorType().AsSetType;
+            var bwr = CreateIIFE0(setType, e.Origin, wr, wStmts);
+            wStmts = bwr.Fork();
+            wr = bwr;
+            EmitSetBuilder_New(wr, e, collectionName);
+            var n = e.BoundVars.Count;
+            Contract.Assert(e.Bounds.Count == n);
+            var processedBounds = new HashSet<IVariable>();
+            List<(Expression conj, ISet<IVariable> frees)> unusedConjuncts = Expression.Conjuncts(e.Range)
+              .Select(conj => (conj, ModuleResolver.FreeVariables(conj))).ToList();
+            unusedConjuncts.ForEach(entry => entry.frees.IntersectWith(e.BoundVars));
+            wr = EmitGuardFragment(unusedConjuncts, processedBounds, wr);
+            for (var i = 0; i < n; i++) {
+              var bound = e.Bounds[i];
+              var bv = e.BoundVars[i];
+              processedBounds.Add(bv);
+              var tmpVar = ProtectedFreshId("_compr_");
+              var wStmtsLoop = wr.Fork();
+              var elementType = CompileCollection(bound, bv, inLetExprBody, true, null, out var collection, out var newtypeConversionsWereExplicit, wStmtsLoop);
+              wr = CreateGuardedForeachLoop(tmpVar, elementType, bv, newtypeConversionsWereExplicit, true, inLetExprBody, e.Origin, collection, wr);
+              wr = EmitGuardFragment(unusedConjuncts, processedBounds, wr);
+            }
+
+            EmitSetBuilder_Add(setType, collectionName, e.Term, inLetExprBody, wr);
+            var returned = EmitReturnExpr(bwr);
+            GetCollectionBuilder_Build(setType, e.Origin, collectionName, returned, wStmts);
+            break;
+          }
+        case MapComprehension comprehension: {
+            var e = comprehension;
+            // For "map i | R(i) :: Term(i)" where the term has type "V" and i has type "U", emit something like:
+            // ((System.Func<Map<U, V>>)(() => {
+            //   var _coll = new List<Pair<U,V>>();
+            //   foreach (L l in sq.Elements) {
+            //     foreach (K k in st.Elements) {
+            //       for (BigInteger j = Lo; j < Hi; j++) {
+            //         for (bool i in Helper.AllBooleans) {
+            //           if (R(i,j,k,l)) {
+            //             _coll.Add(new Pair(i, Term(i));
+            //           }
+            //         }
+            //       }
+            //     }
+            //   }
+            //   return Dafny.Map<U, V>.FromCollection(_coll);
+            // }))()
+            // We also split R(i,j,k,l) to evaluate it as early as possible.
+            wr = CaptureFreeVariables(e, true, out var su, inLetExprBody, wr, ref wStmts);
+            e = (MapComprehension)su.Substitute(e);
+
+            Contract.Assert(e.Bounds != null); // the resolver would have insisted on finding bounds
+            var mapType = e.Type.NormalizeToAncestorType().AsMapType;
+            var domtypeName = TypeName(mapType.Domain, wr, e.Origin);
+            var rantypeName = TypeName(mapType.Range, wr, e.Origin);
+            var collection_name = ProtectedFreshId("_coll");
+            var bwr = CreateIIFE0(mapType, e.Origin, wr, wStmts);
+            wStmts = bwr.Fork();
+            wr = bwr;
+            EmitMapBuilder_New(wr, e, collection_name);
+            var n = e.BoundVars.Count;
+            Contract.Assert(e.Bounds.Count == n);
+            var processedBounds = new HashSet<IVariable>();
+            List<(Expression conj, ISet<IVariable> frees)> unusedConjuncts = Expression.Conjuncts(e.Range)
+              .Select(conj => (conj, ModuleResolver.FreeVariables(conj))).ToList();
+            unusedConjuncts.ForEach(entry => entry.frees.IntersectWith(e.BoundVars));
+            wr = EmitGuardFragment(unusedConjuncts, processedBounds, wr);
+            for (var i = 0; i < n; i++) {
+              var bound = e.Bounds[i];
+              var bv = e.BoundVars[i];
+              processedBounds.Add(bv);
+              var tmpVar = ProtectedFreshId("_compr_");
+              var wStmtsLoop = wr.Fork();
+              var elementType = CompileCollection(bound, bv, inLetExprBody, true, null, out var collection, out var newtypeConversionsWereExplicit, wStmtsLoop);
+              wr = CreateGuardedForeachLoop(tmpVar, elementType, bv, newtypeConversionsWereExplicit, true, false, bv.Origin, collection, wr);
+              wr = EmitGuardFragment(unusedConjuncts, processedBounds, wr);
+            }
+
+            var termLeftWriter = EmitMapBuilder_Add(mapType, e.Origin, collection_name, e.Term, inLetExprBody, wr);
+            if (e.TermLeft == null) {
+              Contract.Assert(e.BoundVars.Count == 1);
+              EmitIdentifier(IdName(e.BoundVars[0]), termLeftWriter);
+            } else {
+              EmitExpr(e.TermLeft, inLetExprBody, termLeftWriter, wStmts);
+            }
+
+            var returned = EmitReturnExpr(bwr);
+            GetCollectionBuilder_Build(mapType, e.Origin, collection_name, returned, wStmts);
+            break;
+          }
+        case LambdaExpr lambdaExpr: {
+            var e = lambdaExpr;
+
+            IVariable receiver = null;
+            if (thisContext != null && (enclosingMethod is { IsTailRecursive: true } || enclosingFunction is { IsTailRecursive: true })) {
+              var name = ProtectedFreshId("_this");
+              var ty = ModuleResolver.GetThisType(e.Origin, thisContext);
+              receiver = new LocalVariable(SourceOrigin.NoToken, name, ty, false) {
+                type = ty
+              };
+              var _this = new ThisExpr(thisContext);
+              wr = EmitBetaRedex(new List<string>() { IdName(receiver) }, new List<Expression>() { _this },
+                new List<Type>() { _this.Type }, lambdaExpr.Type, lambdaExpr.Origin, inLetExprBody, wr, ref wStmts);
+            }
+
+            wr = CaptureFreeVariables(e, false, out var su, inLetExprBody, wr, ref wStmts);
+            if (receiver != null) {
+              su = new Substituter(new IdentifierExpr(e.Origin, receiver), su.substMap, su.typeMap);
+            }
+
+            wr = CreateLambda(e.BoundVars.ConvertAll(bv => bv.Type), Token.NoToken, e.BoundVars.ConvertAll(IdName),
+              e.Body.Type, wr, wStmts);
+            wStmts = wr.Fork();
+            wr = EmitReturnExpr(wr);
+            // May need an upcast or boxing conversion to coerce to the generic arrow result type
+            wr = EmitCoercionIfNecessary(e.Body.Type, TypeForCoercion(e.Type.AsArrowType.Result), e.Body.Origin, wr);
+            EmitExpr(su.Substitute(e.Body), inLetExprBody, wr, wStmts);
+            break;
+          }
+        case StmtExpr stmtExpr: {
+            var e = stmtExpr;
+            EmitExpr(e.E, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case ITEExpr iteExpr: {
+            var e = iteExpr;
+            // The ghost-ITE optimization applies only to at "the top" of the expression structure of a function
+            // body. Those cases are handled in TrExprOpt, so we expect the be compiling both branches here.
+            Contract.Assert(e.HowToCompile == ITEExpr.ITECompilation.CompileBothBranches);
+            EmitITE(e.Test, e.Thn, e.Els, e.Type, inLetExprBody, wr, wStmts);
+            break;
+          }
+        case ConcreteSyntaxExpression expression: {
+            var e = expression;
+            EmitExpr(e.ResolvedExpression, inLetExprBody, wr, wStmts);
+            break;
+          }
+        default:
+          Contract.Assert(false);
+          throw new cce.UnreachableException(); // unexpected expression
+      }
+
+      ConcreteSyntaxTree EmitGuardFragment(List<(Expression conj, ISet<IVariable> frees)> unusedConjuncts,
+        HashSet<IVariable> processedBounds, ConcreteSyntaxTree wr) {
+        Expression localGuard = Expression.CreateBoolLiteral(expr.Origin, true);
+
+        foreach (var entry in unusedConjuncts.ToList().Where(entry => entry.frees.IsSubsetOf(processedBounds))) {
+          localGuard = Expression.CreateAnd(localGuard, entry.conj);
+          unusedConjuncts.Remove(entry);
+        }
+
+        if (!LiteralExpr.IsTrue(localGuard)) {
+          wr = EmitIf(out var guardWriter, false, wr);
+          EmitExpr(localGuard, inLetExprBody, guardWriter, wStmts);
+        }
+
+        return wr;
+      }
+    }
+
+    private void EmitBinaryExpr(bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts, BinaryExpr binary) {
+      if (IsComparisonToZero(binary, out var arg, out var sign, out var negated) &&
+          CompareZeroUsingSign(arg.Type)) {
+        // Transform e.g. x < BigInteger.Zero into x.Sign == -1
+        var w = EmitSign(arg.Type, wr);
+        TrParenExpr(arg, w, inLetExprBody, wStmts);
+        wr.Write(negated ? " != " : " == ");
+        wr.Write(sign.ToString());
+      } else {
+        CompileBinOp(binary.ResolvedOp, binary.E0.Type, binary.E1.Type, binary.Origin, GetRuntimeType(binary.Type),
+          out var opString,
+          out var preOpString,
+          out var postOpString,
+          out var callString,
+          out var staticCallString,
+          out var reverseArguments,
+          out var truncateResult,
+          out var convertE1_to_int,
+          out var coerceE1,
+          wr);
+
+        if (truncateResult && binary.Type.NormalizeToAncestorType().AsBitVectorType is { } bitvectorType) {
+          wr = EmitBitvectorTruncation(bitvectorType, binary.Type.AsNativeType(), true, wr);
+        }
+
+        var e0 = reverseArguments ? binary.E1 : binary.E0;
+        var e1 = reverseArguments ? binary.E0 : binary.E1;
+
+        var left = Expr(e0, inLetExprBody, wStmts);
+        ConcreteSyntaxTree right;
+        if (convertE1_to_int) {
+          right = ExprAsNativeInt(e1, inLetExprBody, wStmts);
+        } else {
+          right = Expr(e1, inLetExprBody, wStmts);
+          if (coerceE1) {
+            right = CoercionIfNecessary(e1.Type, TypeForCoercion(e1.Type), e1.Origin, right);
+          }
+        }
+
+        EmitBinaryExprUsingConcreteSyntax(wr, binary.Type, preOpString, opString, left, right, callString, staticCallString, postOpString);
+      }
+    }
+
+    protected void EmitBinaryExprUsingConcreteSyntax(ConcreteSyntaxTree wr, Type resultType, string preOpString,
+      string opString, ICanRender left, ICanRender right, string callString, string staticCallString,
+      string postOpString) {
+      wr.Write(preOpString);
+      if (opString != null) {
+        var nativeType = AsNativeType(resultType);
+        string nativeName = null;
+        bool needsCast = false;
+        if (nativeType != null) {
+          GetNativeInfo(nativeType.Sel, out nativeName, out _, out needsCast);
+        }
+
+        var opResult = ConcreteSyntaxTree.Create($"{left.InParens()} {opString} {right.InParens()}");
+        if (needsCast) {
+          opResult = Cast(new LineSegment(nativeName), opResult);
+        }
+
+        wr.Append(opResult);
+      } else if (callString != null) {
+        wr.Format($"{left.InParens()}.{callString}({right})");
+      } else if (staticCallString != null) {
+        wr.Format($"{staticCallString}({left}, {right})");
+      }
+
+      wr.Write(postOpString);
+    }
+
+    private void EmitMatchExpr(MatchExpr e, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      // ((System.Func<SourceType, TargetType>)((SourceType _source) => {
+      //   if (source.is_Ctor0) {
+      //     FormalType f0 = ((Dt_Ctor0)source._D).a0;
+      //     ...
+      //     return Body0;
+      //   } else if (...) {
+      //     ...
+      //   } else if (true) {
+      //     ...
+      //   }
+      // }))(src)
+
+      EmitLambdaApply(wr, out var wLambda, out var wArg);
+
+      string source = ProtectedFreshId("_source");
+      ConcreteSyntaxTree w;
+      w = CreateLambda(new List<Type>() { e.Source.Type }, e.Origin, new List<string>() { source }, e.Type, wLambda,
+        wStmts);
+
+      if (e.Cases.Count == 0) {
+        // the verifier would have proved we never get here; still, we need some code that will compile
+        EmitAbsurd(null, w);
+      } else {
+        int i = 0;
+        var sourceType = (UserDefinedType)e.Source.Type.NormalizeExpand();
+        foreach (MatchCaseExpr mc in e.Cases) {
+          var wCase = MatchCasePrelude(source, sourceType, mc.Ctor, mc.Arguments, i, e.Cases.Count, w);
+          var continuation = new OptimizedExpressionContinuation(EmitReturnExpr, false);
+          TrExprOpt(mc.Body, mc.Body.Type, wCase, wStmts, inLetExprBody: true, accumulatorVar: null, continuation);
+          i++;
+        }
+      }
+
+      // We end with applying the source expression to the delegate we just built
+      EmitExpr(e.Source, inLetExprBody, wArg, wStmts);
+    }
+
+    protected virtual void EmitNestedMatchExpr(NestedMatchExpr match, bool inLetExprBody, ConcreteSyntaxTree output, ConcreteSyntaxTree wStmts) {
+      var lambdaBody = EmitAppliedLambda(output, wStmts, match.Origin, match.Type);
+      var continuation = new OptimizedExpressionContinuation(EmitReturnExpr, false);
+      TrOptNestedMatchExpr(match, match.Type, lambdaBody, wStmts, inLetExprBody, null, continuation);
+    }
+
+    protected virtual void TrOptNestedMatchExpr(NestedMatchExpr match, Type resultType, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts, bool inLetExprBody, IVariable accumulatorVar, OptimizedExpressionContinuation continuation) {
+
+      wStmts = wr.Fork();
+
+      EmitNestedMatchGeneric(match, continuation.PreventCaseFallThrough, (caseIndex, caseBody) => {
+        var myCase = match.Cases[caseIndex];
+        TrExprOpt(myCase.Body, myCase.Body.Type, caseBody, wStmts, inLetExprBody, accumulatorVar: null, continuation);
+      }, inLetExprBody, wr);
+    }
+
+    private ConcreteSyntaxTree EmitAppliedLambda(ConcreteSyntaxTree output, ConcreteSyntaxTree wStmts,
+      IOrigin token, Type resultType) {
+      EmitLambdaApply(output, out var lambdaApplyTarget, out _);
+      return CreateLambda(new List<Type>(), token, new List<string>(), resultType, lambdaApplyTarget, wStmts);
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/SinglePassCodeGenerator/SinglePassCodeGenerator.Statement.cs b/Source/DafnyCore/Backends/SinglePassCodeGenerator/SinglePassCodeGenerator.Statement.cs
new file mode 100644
index 00000000000..dffe4000596
--- /dev/null
+++ b/Source/DafnyCore/Backends/SinglePassCodeGenerator/SinglePassCodeGenerator.Statement.cs
@@ -0,0 +1,773 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.IO;
+using System.Diagnostics.Contracts;
+using DafnyCore;
+using JetBrains.Annotations;
+using Microsoft.BaseTypes;
+using static Microsoft.Dafny.GeneratorErrors;
+
+namespace Microsoft.Dafny.Compilers {
+  public abstract partial class SinglePassCodeGenerator {
+    private VarDeclStmt enclosingVarDecl = null;
+    private int innerExtractIndex = -1;
+
+    private bool IsExtractStatement(Statement stmt, string expectedLeftName) {
+      return stmt is AssignStatement updateStmt
+             && updateStmt.Rhss.Count() == 1
+             && updateStmt.Lhss.Count() == 1
+             && updateStmt.Lhss[0] is IdentifierExpr { Name: var leftName }
+             && leftName == expectedLeftName
+             && updateStmt.Rhss[0] is ExprRhs { Expr: ApplySuffix { Lhs: ExprDotName { SuffixName: "Extract" } } };
+    }
+
+    private int FindExtractStatement(List<Statement> stmts, string expectedLeftName) {
+      return stmts.FindIndex((stmt) => IsExtractStatement(stmt, expectedLeftName));
+    }
+
+    protected void TrStmt(Statement stmt, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts = null) {
+      Contract.Requires(stmt != null);
+      Contract.Requires(wr != null);
+
+      wStmts ??= wr.Fork();
+
+      if (stmt.IsGhost) {
+        return;
+      }
+      switch (stmt) {
+        case PrintStmt printStmt: {
+            var s = printStmt;
+            foreach (var arg in s.Args) {
+              EmitPrintStmt(wr, arg);
+            }
+
+            break;
+          }
+        case BreakOrContinueStmt breakStmt: {
+            var s = breakStmt;
+            var label = s.TargetStmt.Labels.Data.AssignUniqueId(idGenerator);
+            if (s.IsContinue) {
+              EmitContinue(label, wr);
+            } else {
+              EmitBreak(label, wr);
+            }
+
+            break;
+          }
+        case ProduceStmt produceStmt: {
+            var s = produceStmt;
+            var isTailRecursiveResult = false;
+            if (s.HiddenUpdate != null) {
+              TrStmt(s.HiddenUpdate, wr);
+              var ss = s.HiddenUpdate.ResolvedStatements;
+              if (ss.Count == 1 && ss[0] is SingleAssignStmt assign && assign.Rhs is ExprRhs eRhs && eRhs.Expr.Resolved is FunctionCallExpr fce && IsTailRecursiveByMethodCall(fce)) {
+                isTailRecursiveResult = true;
+              }
+            }
+            if (s is YieldStmt) {
+              EmitYield(wr);
+            } else if (!isTailRecursiveResult) {
+              EmitReturn(this.enclosingMethod.Outs, wr);
+            }
+
+            break;
+          }
+        case AssignStatement updateStmt: {
+            var s = updateStmt;
+            var resolved = s.ResolvedStatements;
+            if (resolved.Count == 1) {
+              TrStmt(resolved[0], wr);
+            } else {
+              var assignStmts = resolved.Cast<SingleAssignStmt>().Where(assignStmt => !assignStmt.IsGhost).ToList();
+              var lhss = new List<Expression>();
+              var rhss = new List<AssignmentRhs>();
+
+              // multi-assignment
+              Contract.Assert(s.Lhss.Count == resolved.Count);
+              Contract.Assert(s.Rhss.Count == resolved.Count);
+              var lhsTypes = new List<Type>();
+              var rhsTypes = new List<Type>();
+              foreach (var assignStmt in assignStmts) {
+                var rhs = assignStmt.Rhs;
+                if (rhs is not HavocRhs) {
+                  var lhs = assignStmt.Lhs;
+                  rhss.Add(rhs);
+                  lhss.Add(lhs);
+                  lhsTypes.Add(lhs.Type);
+                  rhsTypes.Add(TypeOfRhs(rhs));
+                }
+              }
+
+              var wStmtsPre = wStmts.Fork();
+              var lvalues = new List<ILvalue>();
+              foreach (Expression lhs in lhss) {
+                lvalues.Add(CreateLvalue(lhs, wStmts, wStmtsPre));
+              }
+
+              EmitMultiAssignment(lhss, lvalues, lhsTypes, out var wRhss, rhsTypes, wr);
+              for (int i = 0; i < wRhss.Count; i++) {
+                TrRhs(rhss[i], wRhss[i], wStmts);
+              }
+            }
+
+            break;
+          }
+        case SingleAssignStmt assignStmt: {
+            var s = assignStmt;
+            Contract.Assert(s.Lhs is not SeqSelectExpr expr || expr.SelectOne);  // multi-element array assignments are not allowed
+            if (s.Rhs is HavocRhs) {
+            } else if (s.Rhs is TypeRhs typeRhs) {
+              var lvalue = CreateLvalue(s.Lhs, wr, wStmts);
+              wStmts = wr.Fork();
+              var wRhs = EmitAssignment(lvalue, TypeOfLhs(s.Lhs), TypeOfRhs(typeRhs), wr, assignStmt.Origin);
+              TrRhs(typeRhs, wRhs, wStmts);
+            } else {
+              var eRhs = (ExprRhs)s.Rhs;
+              if (eRhs.Expr.Resolved is FunctionCallExpr fce && IsTailRecursiveByMethodCall(fce)) {
+                TrTailCallStmt(s.Origin, fce.Function.ByMethodDecl, fce.Receiver, fce.Args, wr);
+              } else {
+                var lvalue = CreateLvalue(s.Lhs, wr, wStmts);
+                var doAssignment = (Expression e, Type resultType, bool inLetExprBody, ConcreteSyntaxTree wrAssignment) => {
+                  var wStmtsBeforeAssignment = wrAssignment.Fork();
+                  var wRhs = EmitAssignment(lvalue, resultType, e.Type, wrAssignment, assignStmt.Origin);
+                  EmitExpr(e, false, wRhs, wStmtsBeforeAssignment);
+                };
+                var continuation = new OptimizedExpressionContinuation(doAssignment, true);
+                TrExprOpt(eRhs.Expr, TypeOfLhs(s.Lhs), wr, wStmts, false, null, continuation);
+              }
+            }
+
+            break;
+          }
+        case AssignSuchThatStmt thatStmt: {
+            var s = thatStmt;
+            var lhss = s.Lhss.ConvertAll(lhs => ((IdentifierExpr)lhs.Resolved).Var);  // the resolver allows only IdentifierExpr left-hand sides
+            var missingBounds = BoundedPool.MissingBounds(lhss, s.Bounds, BoundedPool.PoolVirtues.Enumerable);
+            if (missingBounds.Count != 0) {
+              foreach (var bv in missingBounds) {
+                Error(ErrorId.c_assign_such_that_is_too_complex, s.Origin, "this assign-such-that statement is too advanced for the current compiler; Dafny's heuristics cannot find any bound for variable '{0}'", wr, bv.Name);
+              }
+            } else {
+              Contract.Assert(s.Bounds != null);
+              TrAssignSuchThat(lhss, s.Expr, s.Bounds, wr, false);
+            }
+
+            break;
+          }
+        case AssignOrReturnStmt assignOrReturnStmt: {
+            var s = assignOrReturnStmt;
+            var stmts = s.ResolvedStatements.ToList();
+            if (innerExtractIndex != -1 &&
+                enclosingVarDecl is { Assign: var stmtUpdate, Locals: { Count: > 0 } locals }
+                && stmtUpdate == assignOrReturnStmt) {
+              // Wrap this UpdateStmt with a VarDecl containing this Local that we haven't emitted yet.
+              stmts[innerExtractIndex] =
+                new VarDeclStmt(enclosingVarDecl.Origin,
+                  new List<LocalVariable>() { locals[0] },
+                  (AssignStatement)stmts[innerExtractIndex]);
+            }
+            TrStmtList(stmts, wr);
+
+            break;
+          }
+        case ExpectStmt expectStmt: {
+            // TODO there's potential here to use target-language specific features such as exceptions
+            // to make it more target-language idiomatic and improve performance
+            // For now, this code prints nicely only in the Rust code generator until we make it work for every code generator
+            var specialExpectEqualHandling = Options.Backend.TargetId == "rs";
+            if (
+              specialExpectEqualHandling &&
+              expectStmt.Expr is BinaryExpr { Op: BinaryExpr.Opcode.Eq, ResolvedOp: var resolvedOp, E0: var e0, E1: var e1 }) {
+              // If it finds "expect a == b", it will rewrite the code to
+              // var _e0 = a;
+              // var _e1 = b;
+              // if _e0 != _e1 {
+              //   print "\nLeft:\n"
+              //   print _e0;
+              //   print "\nRight:\n"
+              //   print _e1;
+              //   <Halt statement>
+              // }
+              var e0Name = ProtectedFreshId("_e0");
+              var e1Name = ProtectedFreshId("_e1");
+              var e0Var = new LocalVariable(new SourceOrigin(Token.NoToken, Token.NoToken), e0Name, e0.Type, false);
+              var e1Var = new LocalVariable(new SourceOrigin(Token.NoToken, Token.NoToken), e1Name, e0.Type, false);
+              DeclareLocalVar(IdName(e0Var), null, e0.Origin, e0, false, wr);
+              DeclareLocalVar(IdName(e1Var), null, e1.Origin, e1, false, wr);
+              var e0Ident = new IdentifierExpr(e0.Origin, e0Name) {
+                Type = e0.Type,
+                Var = e0Var
+              };
+              var e1Ident = new IdentifierExpr(e1.Origin, e0Name) {
+                Type = e1.Type,
+                Var = e1Var
+              };
+
+              ConcreteSyntaxTree bodyWriter = EmitIf(out var guardWriter, false, wr);
+              var negated = new UnaryOpExpr(expectStmt.Origin, UnaryOpExpr.Opcode.Not,
+                new BinaryExpr(expectStmt.Expr.Origin, BinaryExpr.Opcode.Eq,
+                  e0Ident,
+                  e1Ident) {
+                  ResolvedOp = resolvedOp,
+                  Type = Type.Bool
+                }) {
+                Type = Type.Bool
+              };
+              EmitExpr(negated, false, guardWriter, wStmts);
+              EmitPrintStmt(bodyWriter, new StringLiteralExpr(e0.Origin, @"\nLeft:\n", false) {
+                Type = new SeqType(new CharType())
+              });
+              EmitPrintStmt(bodyWriter, e0Ident);
+              EmitPrintStmt(bodyWriter, new StringLiteralExpr(e1.Origin, @"\nRight:\n", false) {
+                Type = new SeqType(new CharType())
+              });
+              EmitPrintStmt(bodyWriter, e1Ident);
+
+              EmitHalt(expectStmt.Origin, expectStmt.Message, bodyWriter);
+            } else {
+              ConcreteSyntaxTree bodyWriter = EmitIf(out var guardWriter, false, wr);
+              var negated = new UnaryOpExpr(expectStmt.Origin, UnaryOpExpr.Opcode.Not, expectStmt.Expr) { Type = Type.Bool };
+              EmitExpr(negated, false, guardWriter, wStmts);
+
+              EmitHalt(expectStmt.Origin, expectStmt.Message, bodyWriter);
+            }
+
+            break;
+          }
+        case CallStmt callStmt: {
+            var s = callStmt;
+            var wrBefore = wr.Fork();
+            var wrCall = wr.Fork();
+            var wrAfter = wr;
+            TrCallStmt(s, null, wrCall, wrBefore, wrAfter);
+            break;
+          }
+        case BlockStmt blockStmt: {
+            var w = EmitBlock(wr);
+            TrStmtList(blockStmt.Body, w);
+            break;
+          }
+        case IfStmt ifStmt: {
+            IfStmt s = ifStmt;
+            if (s.Guard == null) {
+              // we can compile the branch of our choice
+              ConcreteSyntaxTree guardWriter;
+              if (s.Els == null) {
+                // let's compile the "else" branch, since that involves no work
+                // (still, let's leave a marker in the source code to indicate that this is what we did)
+                Coverage.UnusedInstrumentationPoint(s.Thn.Origin, "then branch");
+                var notFalse = (UnaryOpExpr)Expression.CreateNot(s.Thn.Origin, Expression.CreateBoolLiteral(s.Thn.Origin, false));
+                var thenWriter = EmitIf(out guardWriter, false, wr);
+                EmitUnaryExpr(ResolvedUnaryOp.BoolNot, notFalse.E, false, guardWriter, wStmts);
+                Coverage.Instrument(s.Origin, "implicit else branch", wr);
+                thenWriter = EmitIf(out guardWriter, false, thenWriter);
+                EmitUnaryExpr(ResolvedUnaryOp.BoolNot, notFalse.E, false, guardWriter, wStmts);
+                TrStmtList(new List<Statement>(), thenWriter);
+              } else {
+                // let's compile the "then" branch
+                wr = EmitIf(out guardWriter, false, wr);
+                EmitExpr(Expression.CreateBoolLiteral(s.Thn.Origin, true), false, guardWriter, wStmts);
+                Coverage.Instrument(s.Thn.Origin, "then branch", wr);
+                TrStmtList(s.Thn.Body, wr);
+                Coverage.UnusedInstrumentationPoint(s.Els.Origin, "else branch");
+              }
+            } else {
+              var coverageForElse = Coverage.IsRecording && !(s.Els is IfStmt);
+              var thenWriter = EmitIf(out var guardWriter, s.Els != null || coverageForElse, wr);
+              EmitExpr(s.IsBindingGuard ? ((ExistsExpr)s.Guard).AlphaRename("eg_d") : s.Guard, false, guardWriter, wStmts);
+              // We'd like to do "TrStmt(s.Thn, indent)", except we want the scope of any existential variables to come inside the block
+              if (s.IsBindingGuard) {
+                IntroduceAndAssignBoundVars((ExistsExpr)s.Guard, thenWriter);
+              }
+              Coverage.Instrument(s.Thn.Origin, "then branch", thenWriter);
+              TrStmtList(s.Thn.Body, thenWriter);
+
+              if (coverageForElse) {
+                wr = EmitBlock(wr);
+                if (s.Els == null) {
+                  Coverage.Instrument(s.Origin, "implicit else branch", wr);
+                } else {
+                  Coverage.Instrument(s.Els.Origin, "else branch", wr);
+                }
+              }
+              if (s.Els != null) {
+                TrStmtNonempty(s.Els, wr, wStmts);
+              }
+            }
+
+            break;
+          }
+        case AlternativeStmt alternativeStmt: {
+            var s = alternativeStmt;
+            foreach (var alternative in s.Alternatives) {
+              var thn = EmitIf(out var guardWriter, true, wr);
+              EmitExpr(alternative.IsBindingGuard ? ((ExistsExpr)alternative.Guard).AlphaRename("eg_d") : alternative.Guard, false, guardWriter, wStmts);
+              if (alternative.IsBindingGuard) {
+                IntroduceAndAssignBoundVars((ExistsExpr)alternative.Guard, thn);
+              }
+              Coverage.Instrument(alternative.Origin, "if-case branch", thn);
+              TrStmtList(alternative.Body, thn);
+            }
+            var wElse = EmitBlock(wr);
+            EmitAbsurd("unreachable alternative", wElse);
+            break;
+          }
+        case WhileStmt whileStmt: {
+            WhileStmt s = whileStmt;
+            if (s.Body == null) {
+              return;
+            }
+            if (s.Guard == null) {
+              // This loop is allowed to stop iterating at any time. We choose to never iterate, but we still
+              // emit a loop structure. The structure "while (false) { }" comes to mind, but that results in
+              // an "unreachable code" error from Java, so we instead use "while (true) { break; }".
+              var wBody = CreateWhileLoop(out var guardWriter, wr);
+              EmitExpr(Expression.CreateBoolLiteral(s.Body.Origin, true), false, guardWriter, wStmts);
+              EmitBreak(null, wBody);
+              Coverage.UnusedInstrumentationPoint(s.Body.Origin, "while body");
+            } else {
+              var guardWriter = EmitWhile(s.Body.Origin, s.Body.Body, s.Labels, wr);
+              EmitExpr(s.Guard, false, guardWriter, wStmts);
+            }
+
+            break;
+          }
+        case AlternativeLoopStmt loopStmt: {
+            if (loopStmt.Alternatives.Count != 0) {
+              var w = CreateWhileLoop(out var whileGuardWriter, wr);
+              EmitExpr(Expression.CreateBoolLiteral(loopStmt.Origin, true), false, whileGuardWriter, wStmts);
+              w = EmitContinueLabel(loopStmt.Labels, w);
+              foreach (var alternative in loopStmt.Alternatives) {
+                var thn = EmitIf(out var guardWriter, true, w);
+                EmitExpr(alternative.Guard, false, guardWriter, wStmts);
+                Coverage.Instrument(alternative.Origin, "while-case branch", thn);
+                TrStmtList(alternative.Body, thn);
+              }
+              var wElse = EmitBlock(w);
+              {
+                EmitBreak(null, wElse);
+              }
+            }
+
+            break;
+          }
+        case ForLoopStmt loopStmt: {
+            var s = loopStmt;
+            if (s.Body == null) {
+              return;
+            }
+            string endVarName = null;
+            if (s.End != null) {
+              // introduce a variable to hold the value of the end-expression
+              endVarName = ProtectedFreshId(s.GoingUp ? "_hi" : "_lo");
+              wStmts = wr.Fork();
+              EmitExpr(s.End, false, DeclareLocalVar(endVarName, s.End.Type, s.End.Origin, wr), wStmts);
+            }
+            var startExprWriter = EmitForStmt(s.Origin, s.LoopIndex, s.GoingUp, endVarName, s.Body.Body, s.Labels, wr);
+            EmitExpr(s.Start, false, startExprWriter, wStmts);
+            break;
+          }
+        case ForallStmt forallStmt: {
+            var s = forallStmt;
+            if (s.Kind != ForallStmt.BodyKind.Assign) {
+              // Call and Proof have no side effects, so they can simply be optimized away.
+              return;
+            } else if (s.BoundVars.Count == 0) {
+              // the bound variables just spell out a single point, so the forall statement is equivalent to one execution of the body
+              TrStmt(s.Body, wr);
+              return;
+            }
+            var s0 = (SingleAssignStmt)s.S0;
+            if (s0.Rhs is HavocRhs) {
+              // The forall statement says to havoc a bunch of things.  This can be efficiently compiled
+              // into doing nothing.
+              return;
+            }
+            var rhs = ((ExprRhs)s0.Rhs).Expr;
+
+            if (CanSequentializeForall(s.BoundVars, s.Bounds, s.Range, s0.Lhs, rhs)) {
+              // Just put the statement inside the loops
+              var wLoop = CompileGuardedLoops(s.BoundVars, s.Bounds, s.Range, wr);
+              TrStmt(s0, wLoop);
+            } else {
+              // Compile:
+              //   forall (w,x,y,z | Range(w,x,y,z)) {
+              //     LHS(w,x,y,z) := RHS(w,x,y,z);
+              //   }
+              // where w,x,y,z have types seq<W>,set<X>,int,bool and LHS has L-1 top-level subexpressions
+              // (that is, L denotes the number of top-level subexpressions of LHS plus 1),
+              // into:
+              //   var ingredients = new List< L-Tuple >();
+              //   foreach (W w in sq.UniqueElements) {
+              //     foreach (X x in st.Elements) {
+              //       for (BigInteger y = Lo; j < Hi; j++) {
+              //         for (bool z in Helper.AllBooleans) {
+              //           if (Range(w,x,y,z)) {
+              //             ingredients.Add(new L-Tuple( LHS0(w,x,y,z), LHS1(w,x,y,z), ..., RHS(w,x,y,z) ));
+              //           }
+              //         }
+              //       }
+              //     }
+              //   }
+              //   foreach (L-Tuple l in ingredients) {
+              //     LHS[ l0, l1, l2, ..., l(L-2) ] = l(L-1);
+              //   }
+              //
+              // Note, because the .NET Tuple class only supports up to 8 components, the compiler implementation
+              // here supports arrays only up to 6 dimensions.  This does not seem like a serious practical limitation.
+              // However, it may be more noticeable if the forall statement supported forall assignments in its
+              // body.  To support cases where tuples would need more than 8 components, .NET Tuple's would have to
+              // be nested.
+
+              // Temporary names
+              var c = ProtectedFreshNumericId("_ingredients+_tup");
+              string ingredients = "_ingredients" + c;
+              string tup = "_tup" + c;
+
+              // Compute L
+              int L;
+              string tupleTypeArgs;
+              List<Type> tupleTypeArgsList;
+              if (s0.Lhs is MemberSelectExpr) {
+                var lhs = (MemberSelectExpr)s0.Lhs;
+                L = 2;
+                tupleTypeArgs = TypeArgumentName(lhs.Obj.Type, wr, lhs.Origin);
+                tupleTypeArgsList = new List<Type> { lhs.Obj.Type };
+              } else if (s0.Lhs is SeqSelectExpr) {
+                var lhs = (SeqSelectExpr)s0.Lhs;
+                L = 3;
+                // note, we might as well do the BigInteger-to-int cast for array indices here, before putting things into the Tuple rather than when they are extracted from the Tuple
+                tupleTypeArgs = TypeArgumentName(lhs.Seq.Type, wr, lhs.Origin) + IntSelect;
+                tupleTypeArgsList = new List<Type> { lhs.Seq.Type, null };
+              } else {
+                var lhs = (MultiSelectExpr)s0.Lhs;
+                L = 2 + lhs.Indices.Count;
+                if (8 < L) {
+                  Error(ErrorId.c_no_assignments_to_seven_d_arrays, lhs.Origin, "compiler currently does not support assignments to more-than-6-dimensional arrays in forall statements", wr);
+                  return;
+                }
+                tupleTypeArgs = TypeArgumentName(lhs.Array.Type, wr, lhs.Origin);
+                tupleTypeArgsList = new List<Type> { lhs.Array.Type };
+                for (int i = 0; i < lhs.Indices.Count; i++) {
+                  // note, we might as well do the BigInteger-to-int cast for array indices here, before putting things into the Tuple rather than when they are extracted from the Tuple
+                  tupleTypeArgs += IntSelect;
+                  tupleTypeArgsList.Add(null);
+                }
+
+              }
+              tupleTypeArgs += "," + TypeArgumentName(rhs.Type, wr, rhs.Origin);
+              tupleTypeArgsList.Add(rhs.Type);
+
+              // declare and construct "ingredients"
+              var wrOuter = EmitIngredients(wr, ingredients, L, tupleTypeArgs, s, s0, rhs);
+
+              //   foreach (L-Tuple l in ingredients) {
+              //     LHS[ l0, l1, l2, ..., l(L-2) ] = l(L-1);
+              //   }
+              TargetTupleSize = L;
+              wr = CreateForeachIngredientLoop(tup, L, tupleTypeArgs, out var collWriter, wrOuter);
+              collWriter.Write(ingredients);
+              {
+                var wTup = new ConcreteSyntaxTree(wr.RelativeIndentLevel);
+                var wCoerceTup = EmitCoercionToArbitraryTuple(wTup);
+                wCoerceTup.Write(tup);
+                tup = wTup.ToString();
+              }
+              if (s0.Lhs is MemberSelectExpr) {
+                EmitMemberSelect(s0, tupleTypeArgsList, wr, tup);
+              } else if (s0.Lhs is SeqSelectExpr) {
+                EmitSeqSelect(s0, tupleTypeArgsList, wr, tup);
+              } else {
+                EmitMultiSelect(s0, tupleTypeArgsList, wr, tup, L);
+              }
+            }
+
+            break;
+          }
+        case NestedMatchStmt nestedMatchStmt:
+          EmitNestedMatchStmt(nestedMatchStmt, wr);
+          break;
+        case MatchStmt matchStmt:
+          EmitMatchStmt(wr, matchStmt);
+          break;
+        case VarDeclStmt declStmt: {
+            var s = declStmt;
+            var i = 0;
+            // Optimization (especially useful for Rust) so that if we have
+            // var o :- B;
+            // We won't declare o until we assign it with o := tmp.Extract();
+            var indexExtract = -1;
+            if (s.Assign is AssignOrReturnStmt { ResolvedStatements: var stmts }
+                && s.Locals.Count > 0) {
+              indexExtract = FindExtractStatement(stmts, s.Locals[0].Name);
+            }
+
+            foreach (var local in s.Locals) {
+              bool hasRhs = s.Assign is AssignSuchThatStmt || s.Assign is AssignOrReturnStmt;
+              if (!hasRhs && s.Assign is AssignStatement u) {
+                if (i < u.Rhss.Count && u.Rhss[i] is HavocRhs) {
+                  // there's no specific initial value
+                } else {
+                  hasRhs = true;
+                }
+              }
+
+              // The head variable of an elephant assignment will be declared by its desugaring
+              if (i != 0 || indexExtract == -1) {
+                TrLocalVar(local, !hasRhs, wr);
+              }
+
+              i++;
+            }
+
+            enclosingVarDecl = s;
+            innerExtractIndex = indexExtract;
+            if (s.Assign != null) {
+              TrStmt(s.Assign, wr);
+            }
+            enclosingVarDecl = null;
+            innerExtractIndex = -1;
+
+            break;
+          }
+        case VarDeclPattern pattern: {
+            var s = pattern;
+            if (Contract.Exists(s.LHS.Vars, bv => !bv.IsGhost)) {
+              TrCasePatternOpt(s.LHS, s.RHS, wr, false);
+            }
+
+            break;
+          }
+        case ModifyStmt modifyStmt: {
+            var s = modifyStmt;
+            if (s.Body != null) {
+              TrStmt(s.Body, wr);
+            }
+
+            break;
+          }
+        case TryRecoverStatement h:
+          EmitHaltRecoveryStmt(h.TryBody, IdName(h.HaltMessageVar), h.RecoverBody, wr);
+          break;
+        case BlockByProofStmt blockByProofStmt:
+          TrStmt(blockByProofStmt.Body, wr, wStmts);
+          break;
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected statement
+      }
+    }
+
+    private void EmitMatchStmt(ConcreteSyntaxTree wr, MatchStmt s) {
+      // Type source = e;
+      // if (source.is_Ctor0) {
+      //   FormalType f0 = ((Dt_Ctor0)source._D).a0;
+      //   ...
+      //   Body0;
+      // } else if (...) {
+      //   ...
+      // } else if (true) {
+      //   ...
+      // }
+      if (s.Cases.Count != 0) {
+        string source = ProtectedFreshId("_source");
+        DeclareLocalVar(source, s.Source.Type, s.Source.Origin, s.Source, false, wr);
+
+        int i = 0;
+        var sourceType = (UserDefinedType)s.Source.Type.NormalizeExpand();
+        foreach (MatchCaseStmt mc in s.Cases) {
+          var w = MatchCasePrelude(source, sourceType, cce.NonNull(mc.Ctor), mc.Arguments, i, s.Cases.Count, wr);
+          TrStmtList(mc.Body, w);
+          i++;
+        }
+      }
+    }
+
+    protected virtual void EmitNestedMatchStmt(NestedMatchStmt match, ConcreteSyntaxTree writer) {
+      EmitNestedMatchGeneric(match, true, (caseIndex, caseBody) => {
+        TrStmtList(match.Cases[caseIndex].Body, caseBody);
+      }, false, writer);
+    }
+
+    /// <summary>
+    /// Given
+    /// 
+    ///   match a
+    ///   case X(Y(b),Z(W(c)) => body1
+    ///   case r => body2
+    /// 
+    /// If there are no cases, then emit:
+    ///
+    ///   throw ABSURD;
+    ///
+    /// Else, emit:
+    /// 
+    ///   BLOCK {
+    ///     {  // this defines the scope for any new local variables in the case
+    ///       if (a is X) {
+    ///         var x0 = ((X)a).0;
+    ///         if (x0 is Y) {
+    ///           var b = ((Y)x0).0;
+    /// 
+    ///           var x1 = ((X)a).1; 
+    ///           if (x1 is Z) {
+    ///             var xz0 = ((Z)x1).0;
+    ///             if (xz0 is W) {
+    ///               var c = ((W)xz0).0;
+    /// 
+    ///               body1;
+    ///               break BLOCK;
+    ///           }
+    ///         }
+    ///       }
+    ///     }
+    /// 
+    ///     {
+    ///       var r = a;
+    ///       body2;
+    ///     }
+    ///   }
+    /// 
+    /// </summary>
+    private void EmitNestedMatchGeneric(INestedMatch match, bool preventCaseFallThrough, Action<int, ConcreteSyntaxTree> emitBody,
+      bool inLetExprBody, ConcreteSyntaxTree output) {
+      if (match.Cases.Count == 0) {
+        // the verifier would have proved we never get here; still, we need some code that will compile
+        EmitAbsurd(null, output);
+      } else {
+        string sourceName = ProtectedFreshId("_source");
+        DeclareLocalVar(sourceName, match.Source.Type, match.Source.Origin, match.Source, inLetExprBody, output);
+
+        var label = preventCaseFallThrough ? ProtectedFreshId("match") : null;
+        if (label != null) {
+          output = CreateLabeledCode(label, false, output);
+        }
+
+        var sourceType = match.Source.Type.NormalizeExpand();
+        for (var index = 0; index < match.Cases.Count; index++) {
+          var myCase = match.Cases[index];
+          var lastCase = index == match.Cases.Count - 1;
+
+          var caseBlock = EmitBlock(output);
+          var innerWriter = EmitNestedMatchCaseConditions(sourceName, sourceType, myCase.Pat, caseBlock, lastCase);
+          Coverage.Instrument(myCase.Origin, "case body", innerWriter);
+
+          emitBody(index, innerWriter);
+          if (label != null && !lastCase) {
+            EmitBreak(label, innerWriter);
+          }
+        }
+      }
+    }
+
+    private ConcreteSyntaxTree EmitNestedMatchCaseConditions(string sourceName, Type sourceType,
+      ExtendedPattern pattern, ConcreteSyntaxTree writer, bool lastCase) {
+
+      var litExpression = MatchFlattener.GetLiteralExpressionFromPattern(pattern);
+      if (litExpression != null) {
+        if (lastCase) {
+          return writer;
+        }
+
+        var thenWriter = EmitIf(out var guardWriter, false, writer);
+        CompileBinOp(BinaryExpr.ResolvedOpcode.EqCommon, sourceType, litExpression.Type, pattern.Origin, Type.Bool,
+          out var opString, out var preOpString, out var postOpString, out var callString, out var staticCallString,
+          out _, out _, out _, out _,
+          writer);
+        var right = new ConcreteSyntaxTree();
+        EmitExpr(litExpression, false, right, writer);
+        EmitBinaryExprUsingConcreteSyntax(guardWriter, Type.Bool, preOpString, opString, new LineSegment(sourceName), right, callString, staticCallString, postOpString);
+        return thenWriter;
+
+      } else if (pattern is IdPattern idPattern) {
+        if (idPattern.BoundVar == null) {
+          return EmitNestedMatchStmtCaseConstructor(sourceName, sourceType, idPattern, writer, lastCase);
+        }
+
+        var boundVar = idPattern.BoundVar;
+        if (!boundVar.Name.StartsWith(IdPattern.WildcardString)) {
+          var valueWriter = DeclareLocalVar(IdName(boundVar), boundVar.Type, idPattern.Origin, writer);
+          valueWriter.Write(sourceName);
+        }
+        return writer;
+
+      } else if (pattern is DisjunctivePattern disjunctivePattern) {
+        if (lastCase) {
+          return writer;
+        }
+
+        string disjunctiveMatch = ProtectedFreshId("disjunctiveMatch");
+        DeclareLocalVar(disjunctiveMatch, Type.Bool, disjunctivePattern.Origin, Expression.CreateBoolLiteral(disjunctivePattern.Origin, false), false, writer);
+        foreach (var alternative in disjunctivePattern.Alternatives) {
+          var alternativeWriter = EmitNestedMatchCaseConditions(sourceName, sourceType, alternative, writer, lastCase);
+          EmitAssignment(disjunctiveMatch, Type.Bool, True, Type.Bool, alternativeWriter);
+        }
+        writer = EmitIf(out var guardWriter, false, writer);
+        guardWriter.Write(disjunctiveMatch);
+        return writer;
+
+      } else {
+        throw new Exception();
+      }
+    }
+
+    private ConcreteSyntaxTree EmitNestedMatchStmtCaseConstructor(string sourceName, Type sourceType,
+      IdPattern idPattern,
+      ConcreteSyntaxTree result, bool lastCase) {
+      var ctor = idPattern.Ctor;
+
+      if (!lastCase && ctor.EnclosingDatatype.Ctors.Count != 1) {
+        result = EmitIf(out var guardWriter, false, result);
+        EmitConstructorCheck(sourceName, ctor, guardWriter);
+      }
+
+      var userDefinedType = (UserDefinedType)sourceType.NormalizeExpand();
+
+      var typeSubstMap =
+        TypeParameter.SubstitutionMap(userDefinedType.ResolvedClass.TypeArgs, userDefinedType.TypeArgs);
+      int nonGhostIndex = 0; // number of processed non-ghost arguments
+      for (int index = 0; index < ctor.Formals.Count; index++) {
+        var arg = ctor.Formals[index];
+
+        if (arg.IsGhost) {
+          continue;
+        }
+
+        var type = arg.Type.Subst(typeSubstMap);
+        // ((Dt_Ctor0)source._D).a0;
+        var destructor = new ConcreteSyntaxTree();
+        EmitDestructor(wr => EmitIdentifier(sourceName, wr), arg, nonGhostIndex, ctor,
+          () => SelectNonGhost(userDefinedType.ResolvedClass, userDefinedType.TypeArgs), type, destructor);
+
+        if (idPattern.Arguments != null) {
+          string newSourceName;
+          var childPattern = idPattern.Arguments[index];
+          if (childPattern is IdPattern { BoundVar: not null } childIdPattern) {
+            var boundVar = childIdPattern.BoundVar;
+            if (!childIdPattern.BoundVar.Name.StartsWith(IdPattern.WildcardString)) {
+              newSourceName = IdName(boundVar);
+              var valueWriter = DeclareLocalVar(newSourceName, boundVar.Type, idPattern.Origin, result);
+              valueWriter.Append(destructor);
+            }
+          } else {
+            newSourceName = ProtectedFreshId(arg.GetOrCreateCompileName(currentIdGenerator));
+            var valueWriter = DeclareLocalVar(newSourceName, type, idPattern.Origin, result);
+            valueWriter.Append(destructor);
+            result = EmitNestedMatchCaseConditions(newSourceName, type, childPattern, result, lastCase);
+          }
+        }
+        nonGhostIndex++;
+      }
+
+      return result;
+    }
+  }
+}
diff --git a/Source/DafnyCore/Backends/SinglePassCodeGenerator/SinglePassCodeGenerator.cs b/Source/DafnyCore/Backends/SinglePassCodeGenerator/SinglePassCodeGenerator.cs
new file mode 100644
index 00000000000..c500840ef55
--- /dev/null
+++ b/Source/DafnyCore/Backends/SinglePassCodeGenerator/SinglePassCodeGenerator.cs
@@ -0,0 +1,5406 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.IO;
+using System.Diagnostics.Contracts;
+using DafnyCore;
+using DafnyCore.Options;
+using JetBrains.Annotations;
+using Microsoft.BaseTypes;
+using static Microsoft.Dafny.GeneratorErrors;
+
+namespace Microsoft.Dafny.Compilers {
+
+  static class SinglePassCompilerExtensions {
+    public static bool CanCompile(this ModuleDefinition module) {
+      return module.ModuleKind == ModuleKindEnum.Concrete;
+    }
+  }
+
+  public abstract partial class SinglePassCodeGenerator {
+    // Dafny names cannot start with "_". Hence, if an internal Dafny name is problematic in the target language,
+    // we can prefix it with "_".
+    // This prefix can be overridden as necessary by backends.
+    protected virtual string InternalFieldPrefix => "_";
+    public DafnyOptions Options { get; }
+
+    /// <summary>
+    /// Emits a call to <c>mainMethod</c> as the program's entry point, if such an explicit call is
+    /// required in the target language.<<
+    /// </summary>
+    public abstract void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree callToMainTree);
+
+    /// <summary>
+    /// Change <c>name</c> into a valid identifier in the target language.
+    /// </summary>
+    public abstract string PublicIdProtect(string name);
+
+    public static Plugin Plugin =
+      new ConfiguredPlugin(InternalBackendsPluginConfiguration.Singleton);
+
+    public abstract IReadOnlySet<Feature> UnsupportedFeatures { get; }
+
+    /// <summary>
+    /// Whether or not the compiler turns
+    ///     datatype Record = R(oneThing: X)
+    /// into just X, including the case where "Record" is a tuple type with 1 non-ghost component.
+    /// </summary>
+    public virtual bool SupportsDatatypeWrapperErasure => true;
+    public static string DefaultNameMain = "Main";
+
+    public virtual string ModuleSeparator => ".";
+    protected virtual string StaticClassAccessor => ".";
+    protected virtual string InstanceClassAccessor => ".";
+    protected virtual string IsMethodName => "_Is";
+
+    public ErrorReporter Reporter;
+
+    Stack<ConcreteSyntaxTree> copyInstrWriters = new Stack<ConcreteSyntaxTree>(); // a buffer that stores copy instructions generated by letExpr that uses out param.
+    protected TopLevelDeclWithMembers thisContext;  // non-null when type members are being translated
+    protected ModuleDefinition enclosingModule; // non-null when a module body is being translated
+    protected Method enclosingMethod;  // non-null when a method body is being translated
+    protected Function enclosingFunction;  // non-null when a function body is being translated
+    protected Declaration enclosingDeclaration; // non-null when a declaration body is being translated
+
+    protected internal readonly CodeGenIdGenerator idGenerator = new CodeGenIdGenerator();
+
+    protected internal CodeGenIdGenerator currentIdGenerator => enclosingDeclaration?.CodeGenIdGenerator ?? idGenerator;
+
+    private protected string ProtectedFreshId(string prefix) => IdProtect(currentIdGenerator.FreshId(prefix));
+    private protected string ProtectedFreshNumericId(string prefix) => IdProtect(currentIdGenerator.FreshNumericId(prefix));
+
+    Dictionary<Expression, int> uniqueAstNumbers = new Dictionary<Expression, int>();
+    int GetUniqueAstNumber(Expression expr) {
+      Contract.Requires(expr != null);
+      if (!uniqueAstNumbers.TryGetValue(expr, out var n)) {
+        n = uniqueAstNumbers.Count;
+        uniqueAstNumbers.Add(expr, n);
+      }
+      return n;
+    }
+
+    public readonly CoverageInstrumenter Coverage;
+
+    // Common limits on the size of builtins: tuple, arrow, and array types.
+    // Some backends have to enforce limits so that all built-ins can be pre-compiled
+    // into their runtimes.
+    // See CheckCommonSytemModuleLimits().
+
+    protected int MaxTupleNonGhostDims => 20;
+    // This one matches the maximum arity of the C# System.Func<> type used to implement arrows. 
+    protected int MaxArrowArity => 16;
+    // This one is also limited by the maximum arrow arity, since a given array type
+    // uses an arrow of the matching arity for initialization.
+    protected int MaxArrayDims => MaxArrowArity;
+
+    protected SinglePassCodeGenerator(DafnyOptions options, ErrorReporter reporter) {
+      this.Options = options;
+      Reporter = reporter;
+      Coverage = new CoverageInstrumenter(this);
+      System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(GeneratorErrors).TypeHandle);
+    }
+
+    protected static void ReportError(ErrorId errorId, ErrorReporter reporter, IOrigin tok, string msg, ConcreteSyntaxTree/*?*/ wr, params object[] args) {
+      Contract.Requires(msg != null);
+      Contract.Requires(args != null);
+
+      reporter.Error(MessageSource.Compiler, errorId, tok, msg, args);
+      wr?.WriteLine("/* {0} */", string.Format("Compilation error: " + msg, args));
+    }
+
+    public void Error(ErrorId errorId, IOrigin tok, string msg, ConcreteSyntaxTree wr, params object[] args) {
+      ReportError(errorId, Reporter, tok, msg, wr, args);
+    }
+
+    protected void UnsupportedFeatureError(IOrigin tok, Feature feature, string message = null, ConcreteSyntaxTree wr = null, params object[] args) {
+      if (!UnsupportedFeatures.Contains(feature)) {
+        throw new Exception($"'{feature}' is not an element of the {GetType().Name} compiler's UnsupportedFeatures set");
+      }
+
+      message ??= UnsupportedFeatureException.MessagePrefix + FeatureDescriptionAttribute.GetDescription(feature).Description;
+      Error(ErrorId.c_unsupported_feature, tok, message, wr, args);
+    }
+
+    protected string IntSelect = ",int";
+    protected string LambdaExecute = "";
+
+    protected bool UnicodeCharEnabled => Options.Get(CommonOptionBag.UnicodeCharacters);
+
+    protected string CharMethodQualifier => UnicodeCharEnabled ? "Unicode" : "";
+
+    protected virtual void EmitHeader(Program program, ConcreteSyntaxTree wr) { }
+    protected virtual void EmitFooter(Program program, ConcreteSyntaxTree wr) { }
+    /// <summary>
+    /// Emits any supporting code necessary for built-in Dafny elements,
+    /// such as the `nat` subset type, or array and arrow types of various arities.
+    /// These built-in elements are generally declared in the internal _System module
+    /// by the SystemModuleManager.
+    /// Some of them are emitted by compiling their declarations in that module, such as tuples.
+    /// Others have {:compile false} added, so they are not normally given to the compiler at all,
+    /// but instead need special handling in this method.
+    /// 
+    /// It would likely be cleaner in the future to remove all of the {:compile false} attributes
+    /// on built-in declarations, and allow compilers to handle them directly
+    /// (which for many backends just means ignoring many of them).
+    /// </summary>
+    protected virtual void EmitBuiltInDecls(SystemModuleManager systemModuleManager, ConcreteSyntaxTree wr) { }
+
+    protected void CheckCommonSytemModuleLimits(SystemModuleManager systemModuleManager) {
+      // Check that the runtime already has all required builtins
+      if (systemModuleManager.MaxNonGhostTupleSizeUsed > MaxTupleNonGhostDims) {
+        UnsupportedFeatureError(systemModuleManager.MaxNonGhostTupleSizeToken, Feature.TuplesWiderThan20);
+      }
+      var maxArrowArity = systemModuleManager.ArrowTypeDecls.Keys.Max();
+      if (maxArrowArity > MaxArrowArity) {
+        UnsupportedFeatureError(Token.NoToken, Feature.ArrowsWithMoreThan16Arguments);
+      }
+      var maxArraysDims = systemModuleManager.arrayTypeDecls.Keys.Max();
+      if (maxArraysDims > MaxArrayDims) {
+        UnsupportedFeatureError(Token.NoToken, Feature.ArraysWithMoreThan16Dims);
+      }
+    }
+
+    /// <summary>
+    /// Checks that the system module contains all sizes of built-in types up to the maximum.
+    /// See also DafnyRuntime/systemModulePopulator.dfy.
+    /// </summary>
+    protected void CheckSystemModulePopulatedToCommonLimits(SystemModuleManager systemModuleManager) {
+      systemModuleManager.CheckHasAllTupleNonGhostDimsUpTo(MaxTupleNonGhostDims);
+      systemModuleManager.CheckHasAllArrayDimsUpTo(MaxArrayDims);
+      systemModuleManager.CheckHasAllArrowAritiesUpTo(MaxArrowArity);
+    }
+
+    /// <summary>
+    /// Creates a static Main method. The caller will fill the body of this static Main with a
+    /// call to the instance Main method in the enclosing class.
+    /// </summary>
+    protected abstract ConcreteSyntaxTree CreateStaticMain(IClassWriter wr, string argsParameterName);
+
+    protected virtual bool ShouldCompileModule(Program program, ModuleDefinition module) {
+      return module.ShouldCompile(program.Compilation);
+    }
+
+    protected abstract ConcreteSyntaxTree CreateModule(ModuleDefinition module, string moduleName, bool isDefault,
+      ModuleDefinition externModule,
+      string libraryName /*?*/, Attributes moduleAttributes, ConcreteSyntaxTree wr);
+    /// <summary>
+    /// Indicates the current program depends on the given module without creating it.
+    /// Called when a module is out of scope for compilation, such as when using --library.
+    /// </summary>
+    protected virtual void DependOnModule(Program program, ModuleDefinition module, ModuleDefinition externModule,
+      string libraryName /*?*/) { }
+    protected abstract string GetHelperModuleName();
+    protected interface IClassWriter {
+      ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody);
+      ConcreteSyntaxTree/*?*/ SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody);
+      ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody,
+        MemberDecl member, bool forBodyInheritance, bool lookasideBody);
+      ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IOrigin tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance);  // returns null iff !createBody
+      ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance);  // if createBody, then result and setterWriter are non-null, else both are null
+      void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs, Field/*?*/ field);
+      /// <summary>
+      /// InitializeField is called for inherited fields. It is in lieu of calling DeclareField and is called only if
+      /// ClassesRedeclareInheritedFields==false for the compiler.
+      /// </summary>
+      void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass);
+      ConcreteSyntaxTree/*?*/ ErrorWriter();
+      void Finish();
+    }
+    protected virtual bool IncludeExternallyImportedMembers { get => false; }
+    protected virtual bool SupportsStaticsInGenericClasses => true;
+    protected virtual bool TraitRepeatsInheritedDeclarations => false;
+    protected virtual bool InstanceMethodsAllowedToCallTraitMethods => true;
+    protected IClassWriter CreateClass(string moduleName, TopLevelDecl cls, ConcreteSyntaxTree wr) {
+      return CreateClass(moduleName, false, null, cls.TypeArgs,
+        cls, (cls as TopLevelDeclWithMembers)?.ParentTypeInformation.UniqueParentTraits(), null, wr);
+    }
+
+    /// <summary>
+    /// "tok" can be "null" if "superClasses" is.
+    /// </summary>
+    protected abstract IClassWriter CreateClass(string moduleName, bool isExtern, string/*?*/ fullPrintName,
+      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type>/*?*/ superClasses, IOrigin tok, ConcreteSyntaxTree wr);
+
+    /// <summary>
+    /// "tok" can be "null" if "superClasses" is.
+    /// </summary>
+    protected abstract IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
+      TraitDecl trait, List<Type> superClasses /*?*/, IOrigin tok, ConcreteSyntaxTree wr);
+    protected virtual bool SupportsProperties => true;
+    protected abstract ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr);
+    /// <summary>
+    /// Returns an IClassWriter that can be used to write additional members. If "dt" is already written
+    /// in the DafnyRuntime.targetlanguage file, then returns "null".
+    /// </summary>
+    protected abstract IClassWriter/*?*/ DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr);
+    protected virtual bool DatatypeDeclarationAndMemberCompilationAreSeparate => true;
+    /// <summary>
+    /// Returns an IClassWriter that can be used to write additional members.
+    /// </summary>
+    protected abstract IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr);
+    protected abstract void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr);
+    protected string GetNativeTypeName(NativeType nt) {
+      Contract.Requires(nt != null);
+      GetNativeInfo(nt.Sel, out var nativeName, out _, out _);
+      return nativeName;
+    }
+    protected abstract void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic);
+
+    protected List<T> SelectNonGhost<T>(TopLevelDecl cl, List<T> elements) {
+      Contract.Requires(cl != null && elements != null);
+      if (cl is TupleTypeDecl tupleDecl) {
+        Contract.Assert(elements.Count == tupleDecl.Dims);
+        return elements.Where((_, i) => !tupleDecl.ArgumentGhostness[i]).ToList();
+      } else {
+        return elements;
+      }
+    }
+
+    protected virtual List<TypeParameter> UsedTypeParameters(DatatypeDecl dt, bool alsoIncludeAutoInitTypeParameters = false) {
+      Contract.Requires(dt != null);
+
+      var idt = dt as IndDatatypeDecl;
+      if (idt == null) {
+        return dt.TypeArgs;
+      } else {
+        Contract.Assert(idt.TypeArgs.Count == idt.TypeParametersUsedInConstructionByGroundingCtor.Length);
+        var tps = new List<TypeParameter>();
+        for (int i = 0; i < idt.TypeArgs.Count; i++) {
+          if (idt.TypeParametersUsedInConstructionByGroundingCtor[i] || (alsoIncludeAutoInitTypeParameters && NeedsTypeDescriptor(idt.TypeArgs[i]))) {
+            tps.Add(idt.TypeArgs[i]);
+          }
+        }
+        return tps;
+      }
+    }
+
+    protected List<TypeArgumentInstantiation> UsedTypeParameters(DatatypeDecl dt, List<Type> typeArgs, bool alsoIncludeAutoInitTypeParameters = false) {
+      Contract.Requires(dt != null);
+      Contract.Requires(typeArgs != null);
+      Contract.Requires(dt.TypeArgs.Count == typeArgs.Count);
+
+      if (dt is not IndDatatypeDecl idt) {
+        return TypeArgumentInstantiation.ListFromClass(dt, typeArgs);
+      } else {
+        Contract.Assert(typeArgs.Count == idt.TypeParametersUsedInConstructionByGroundingCtor.Length);
+        var r = new List<TypeArgumentInstantiation>();
+        for (int i = 0; i < typeArgs.Count; i++) {
+          if (idt.TypeParametersUsedInConstructionByGroundingCtor[i] || (alsoIncludeAutoInitTypeParameters && NeedsTypeDescriptor(idt.TypeArgs[i]))) {
+            r.Add(new TypeArgumentInstantiation(dt.TypeArgs[i], typeArgs[i]));
+          }
+        }
+        return r;
+      }
+    }
+
+    protected bool NeedsTypeDescriptors(List<TypeArgumentInstantiation> typeArgs) {
+      Contract.Requires(typeArgs != null);
+      return typeArgs.Any(ta => NeedsTypeDescriptor(ta.Formal));
+    }
+
+    protected virtual bool NeedsTypeDescriptor(TypeParameter tp) {
+      Contract.Requires(tp != null);
+      return tp.Characteristics.HasCompiledValue;
+    }
+
+    protected abstract string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IOrigin tok);
+
+    protected void EmitTypeDescriptorsActuals(List<TypeArgumentInstantiation> typeArgs, IOrigin tok, ConcreteSyntaxTree wr, bool useAllTypeArgs = false) {
+      var prefix = "";
+      EmitTypeDescriptorsActuals(typeArgs, tok, wr, ref prefix, useAllTypeArgs);
+    }
+
+    protected void EmitTypeDescriptorsActuals(List<TypeArgumentInstantiation> typeArgs, IOrigin tok, ConcreteSyntaxTree wr, ref string prefix, bool useAllTypeArgs = false) {
+      Contract.Requires(typeArgs != null);
+      Contract.Requires(tok != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(prefix != null);
+
+      foreach (var ta in typeArgs) {
+        if (useAllTypeArgs || NeedsTypeDescriptor(ta.Formal)) {
+          wr.Write("{0}{1}", prefix, TypeDescriptor(ta.Actual, wr, tok));
+          prefix = ", ";
+        }
+      }
+    }
+
+    protected virtual ConcreteSyntaxTree EmitNullTest(bool testIsNull, ConcreteSyntaxTree wr) {
+      var wrTarget = wr.ForkInParens();
+      wr.Write(testIsNull ? " == null" : " != null");
+      return wrTarget;
+    }
+
+    /// <summary>
+    /// EmitTailCallStructure evolves "wr" into a structure that can be used as the jump target
+    /// for tail calls (see EmitJumpToTailCallStart).
+    /// The precondition of the method is:
+    ///     (member is Method m0 && m0.IsTailRecursive) || (member is Function f0 && f0.IsTailRecursive)
+    /// </summary>
+    protected abstract ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr);
+    protected abstract void EmitJumpToTailCallStart(ConcreteSyntaxTree wr);
+
+    internal abstract string TypeName(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member = null);
+    // For cases where a type looks different when it's an argument, such as (*sigh*) Java primitives
+    protected virtual string TypeArgumentName(Type type, ConcreteSyntaxTree wr, IOrigin tok) {
+      return TypeName(type, wr, tok);
+    }
+    /// <summary>
+    /// This method returns the target representation of one possible value of the type.
+    /// Requires: usePlaceboValue || type.HasCompilableValue
+    ///
+    ///   usePlaceboValue - If "true", the default value produced is one that the target language accepts as a value
+    ///                  of the type, but which may not correspond to a Dafny value. This option is used when it is known
+    ///                  that the Dafny program will not use the value (for example, when a field is automatically initialized
+    ///                  but the Dafny program will soon assign a new value).
+    /// </summary>
+    protected abstract string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors);
+
+    protected string TypeName_UDT(string fullCompileName, UserDefinedType udt, ConcreteSyntaxTree wr, IOrigin tok, bool omitTypeArguments = false) {
+      Contract.Requires(fullCompileName != null);
+      Contract.Requires(udt != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(tok != null);
+      Contract.Requires(udt.TypeArgs.Count == (udt.ResolvedClass == null ? 0 : udt.ResolvedClass.TypeArgs.Count));
+      var cl = udt.ResolvedClass;
+      var typeParams = SelectNonGhost(cl, cl.TypeArgs);
+      var typeArgs = SelectNonGhost(cl, udt.TypeArgs);
+      return TypeName_UDT(fullCompileName, typeParams.ConvertAll(tp => tp.Variance), typeArgs, wr, tok, omitTypeArguments);
+    }
+    protected abstract string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
+      ConcreteSyntaxTree wr, IOrigin tok, bool omitTypeArguments);
+    abstract internal string/*?*/ TypeName_Companion(Type type, ConcreteSyntaxTree wr, IOrigin tok, MemberDecl/*?*/ member);
+    protected virtual void EmitTypeName_Companion(Type type, ConcreteSyntaxTree wr, ConcreteSyntaxTree surrounding, IOrigin tok, MemberDecl/*?*/ member) {
+      wr.Write(TypeName_Companion(type, surrounding, tok, member));
+    }
+
+    internal string TypeName_Companion(TopLevelDecl cls, ConcreteSyntaxTree wr, IOrigin tok) {
+      Contract.Requires(cls != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(tok != null);
+      return TypeName_Companion(UserDefinedType.FromTopLevelDecl(tok, cls), wr, tok, null);
+    }
+    /// Return the "native form" of a type, to which EmitCoercionToNativeForm coerces it.
+    protected virtual Type NativeForm(Type type) {
+      return type;
+    }
+
+    protected abstract bool DeclareFormal(string prefix, string name, Type type, IOrigin tok, bool isInParam, ConcreteSyntaxTree wr);
+    /// <summary>
+    /// If "leaveRoomForRhs" is false and "rhs" is null, then generates:
+    ///     type name;
+    /// If "leaveRoomForRhs" is false and "rhs" is non-null, then generates:
+    ///     type name = rhs;
+    /// If "leaveRoomForRhs" is true, in which case "rhs" must be null, then generates:
+    ///     type name
+    /// which is intended to be followed up by a call to EmitAssignmentRhs.
+    /// In the above, if "type" is null, then it is replaced by "var" or "let".
+    /// "tok" is allowed to be null if "type" is.
+    /// </summary>
+    protected abstract void DeclareLocalVar(string name, Type/*?*/ type, IOrigin /*?*/ tok, bool leaveRoomForRhs, string/*?*/ rhs, ConcreteSyntaxTree wr);
+
+    protected virtual void DeclareLocalVar(string name, Type /*?*/ type, IOrigin /*?*/ tok, bool leaveRoomForRhs, string /*?*/ rhs, ConcreteSyntaxTree wr, Type t) {
+      DeclareLocalVar(name, type, tok, leaveRoomForRhs, rhs, wr);
+    }
+    /// <summary>
+    /// Generates:
+    ///     type name = rhs;
+    /// In the above, if "type" is null, then it is replaced by "var" or "let".
+    /// "tok" is allowed to be null if "type" is.
+    /// </summary>
+    protected virtual void DeclareLocalVar(string name, Type/*?*/ type, IOrigin/*?*/ tok, Expression rhs, bool inLetExprBody, ConcreteSyntaxTree wr) {
+      var wStmts = wr.Fork();
+      var w = DeclareLocalVar(name, type ?? rhs.Type, tok, wr);
+      if (type != null && !type.Equals(rhs.Type)) {
+        w = EmitCoercionIfNecessary(rhs.Type, type, rhs.Origin, w);
+      }
+      EmitExpr(rhs, inLetExprBody, w, wStmts);
+    }
+
+    protected virtual void EmitDummyVariableUse(string variableName, ConcreteSyntaxTree wr) {
+      // by default, do nothing
+    }
+
+    /// <summary>
+    /// Generates
+    ///     type name = <<writer returned>>;
+    /// In the above, if "type" is null, then it is replaced by "var" or "let".
+    /// "tok" is allowed to be null if "type" is.
+    /// </summary>
+    protected abstract ConcreteSyntaxTree DeclareLocalVar(string name, Type/*?*/ type, IOrigin/*?*/ tok, ConcreteSyntaxTree wr);
+    protected virtual void DeclareOutCollector(string collectorVarName, ConcreteSyntaxTree wr) { }  // called only for return-style calls
+    protected virtual void DeclareSpecificOutCollector(string collectorVarName, ConcreteSyntaxTree wr, List<Type> formalTypes, List<Type> lhsTypes) { DeclareOutCollector(collectorVarName, wr); } // for languages that don't allow "let" or "var" expressions
+    protected virtual bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => false;
+    protected virtual ConcreteSyntaxTree EmitMethodReturns(Method m, ConcreteSyntaxTree wr) { return wr; } // for languages that need explicit return statements not provided by Dafny
+    protected virtual bool SupportsMultipleReturns { get => false; }
+    protected virtual bool SupportsAmbiguousTypeDecl { get => true; }
+    protected virtual bool ClassesRedeclareInheritedFields => true;
+    public int TargetTupleSize = 0;
+    /// The punctuation that comes at the end of a statement.  Note that
+    /// statements are followed by newlines regardless.
+    protected virtual string StmtTerminator { get => ";"; }
+    protected virtual string True { get => "true"; }
+    protected virtual string False { get => "false"; }
+    protected virtual string Conj { get => "&&"; }
+    protected virtual string AssignmentSymbol { get => " = "; }
+    public void EndStmt(ConcreteSyntaxTree wr) { wr.WriteLine(StmtTerminator); }
+    protected abstract void DeclareLocalOutVar(string name, Type type, IOrigin tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr);
+    protected virtual void EmitActualOutArg(string actualOutParamName, ConcreteSyntaxTree wr) { }  // actualOutParamName is always the name of a local variable; called only for non-return-style outs
+    protected virtual void EmitOutParameterSplits(string outCollector, List<string> actualOutParamNames, ConcreteSyntaxTree wr) { }  // called only for return-style calls
+    protected virtual void EmitCastOutParameterSplits(string outCollector, List<string> actualOutParamNames, ConcreteSyntaxTree wr, List<Type> formalOutParamTypes, List<Type> lhsTypes, IOrigin tok) {
+      EmitOutParameterSplits(outCollector, actualOutParamNames, wr);
+    }
+
+    protected abstract void EmitActualTypeArgs(List<Type> typeArgs, IOrigin tok, ConcreteSyntaxTree wr);
+
+    protected virtual void EmitNameAndActualTypeArgs(string protectedName, List<Type> typeArgs, IOrigin tok,
+      [CanBeNull] Expression replacementReceiver, bool receiverAsArgument, ConcreteSyntaxTree wr) {
+      wr.Write(protectedName);
+      EmitActualTypeArgs(typeArgs, tok, wr);
+    }
+
+    protected virtual ConcreteSyntaxTree EmitAssignment(ILvalue wLhs, Type lhsType /*?*/, Type rhsType /*?*/,
+      ConcreteSyntaxTree wr, IOrigin tok) {
+      var w = wLhs.EmitWrite(wr);
+
+      w = EmitCoercionIfNecessary(rhsType, lhsType, tok, w);
+      w = EmitDowncastIfNecessary(rhsType, lhsType, tok, w);
+      return w;
+    }
+
+    protected virtual void EmitAssignment(out ConcreteSyntaxTree wLhs, Type/*?*/ lhsType, out ConcreteSyntaxTree wRhs, Type/*?*/ rhsType, ConcreteSyntaxTree wr) {
+      wLhs = wr.Fork();
+      wr.Write(AssignmentSymbol);
+      var w = wr;
+      w = EmitCoercionIfNecessary(rhsType, lhsType, Token.NoToken, w);
+      w = EmitDowncastIfNecessary(rhsType, lhsType, Token.NoToken, w);
+      wRhs = w.Fork();
+      EndStmt(wr);
+    }
+    protected virtual void EmitAssignment(string lhs, Type/*?*/ lhsType, string rhs, Type/*?*/ rhsType, ConcreteSyntaxTree wr) {
+      EmitAssignment(out var wLhs, lhsType, out var wRhs, rhsType, wr);
+      wLhs.Write(lhs);
+      wRhs.Write(rhs);
+    }
+    protected void EmitAssignmentRhs(string rhs, ConcreteSyntaxTree wr) {
+      var w = EmitAssignmentRhs(wr);
+      w.Write(rhs);
+    }
+    protected void EmitAssignmentRhs(Expression rhs, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts = null) {
+      wStmts ??= wr.Fork();
+      var w = EmitAssignmentRhs(wr);
+      EmitExpr(rhs, inLetExprBody, w, wStmts);
+    }
+
+    protected virtual ConcreteSyntaxTree EmitAssignmentRhs(ConcreteSyntaxTree wr) {
+      wr.Write(AssignmentSymbol);
+      var w = wr.Fork();
+      EndStmt(wr);
+      return w;
+    }
+
+    protected virtual string EmitAssignmentLhs(Expression e, ConcreteSyntaxTree wr) {
+      var wStmts = wr.Fork();
+      var target = ProtectedFreshId("_lhs");
+      EmitExpr(e, false, DeclareLocalVar(target, e.Type, e.Origin, wr), wStmts);
+      return target;
+    }
+
+    protected virtual void EmitMultiAssignment(List<Expression> lhsExprs, List<ILvalue> lhss, List<Type> lhsTypes, out List<ConcreteSyntaxTree> wRhss,
+      List<Type> rhsTypes, ConcreteSyntaxTree wr) {
+      Contract.Assert(lhss.Count == lhsTypes.Count);
+      Contract.Assert(lhsTypes.Count == rhsTypes.Count);
+
+      wRhss = new List<ConcreteSyntaxTree>();
+      var rhsVars = new List<string>();
+      foreach (var rhsType in rhsTypes) {
+        string target = ProtectedFreshId("_rhs");
+        rhsVars.Add(target);
+        wRhss.Add(DeclareLocalVar(target, rhsType, Token.NoToken, wr));
+      }
+
+      List<ILvalue> lhssn;
+      if (lhss.Count > 1) {
+        lhssn = new List<ILvalue>();
+        for (int i = 0; i < lhss.Count; ++i) {
+          Expression lexpr = lhsExprs[i].Resolved;
+          ILvalue lhs = lhss[i];
+          if (lexpr is IdentifierExpr) {
+            lhssn.Add(lhs);
+
+          } else if (lexpr is MemberSelectExpr memberSelectExpr) {
+            string target = EmitAssignmentLhs(memberSelectExpr.Obj, wr);
+            var typeArgs = TypeArgumentInstantiation.ListFromMember(memberSelectExpr.Member,
+              null, memberSelectExpr.TypeApplicationJustMember);
+            ILvalue newLhs = EmitMemberSelect(w => EmitIdentifier(target, w), memberSelectExpr.Obj.Type, memberSelectExpr.Member, typeArgs,
+              memberSelectExpr.TypeArgumentSubstitutionsWithParents(), memberSelectExpr.Type, internalAccess: enclosingMethod is Constructor);
+            lhssn.Add(newLhs);
+
+          } else if (lexpr is SeqSelectExpr selectExpr) {
+            string targetArray = EmitAssignmentLhs(selectExpr.Seq, wr);
+            string targetIndex = EmitAssignmentLhs(selectExpr.E0, wr);
+            if (selectExpr.Seq.Type.IsArrayType || selectExpr.Seq.Type.NormalizeToAncestorType().AsSeqType != null) {
+              targetIndex = ArrayIndexToNativeInt(targetIndex, selectExpr.E0.Type);
+            }
+            ILvalue newLhs = new ArrayLvalueImpl(this, targetArray, new List<Action<ConcreteSyntaxTree>>() { wIndex => EmitIdentifier(targetIndex, wIndex) }, lhsTypes[i]);
+            lhssn.Add(newLhs);
+
+          } else if (lexpr is MultiSelectExpr multiSelectExpr) {
+            string targetArray = EmitAssignmentLhs(multiSelectExpr.Array, wr);
+            var targetIndices = new List<string>();
+            foreach (var index in multiSelectExpr.Indices) {
+              string targetIndex = EmitAssignmentLhs(index, wr);
+              targetIndex = ArrayIndexToNativeInt(targetIndex, index.Type);
+              targetIndices.Add(targetIndex);
+            }
+            ILvalue newLhs = new ArrayLvalueImpl(this, targetArray, Util.Map<string, Action<ConcreteSyntaxTree>>(targetIndices, i => wIndex => EmitIdentifier(i, wIndex)), lhsTypes[i]);
+            lhssn.Add(newLhs);
+
+          } else {
+            Contract.Assert(false); // Unknown kind of expression
+            lhssn.Add(lhs);
+          }
+        }
+      } else {
+        lhssn = lhss;
+      }
+
+      Contract.Assert(rhsVars.Count == lhsTypes.Count);
+      for (int i = 0; i < rhsVars.Count; i++) {
+        ConcreteSyntaxTree wRhsVar = EmitAssignment(lhssn[i], lhsTypes[i], rhsTypes[i], wr, Token.NoToken);
+        EmitIdentifier(rhsVars[i], wRhsVar);
+      }
+    }
+
+    protected virtual void EmitSetterParameter(ConcreteSyntaxTree wr) {
+      wr.Write("value");
+    }
+    protected abstract void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg);
+    protected abstract void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr);
+    protected void EmitReturnExpr(Expression expr, Type resultType, bool inLetExprBody, ConcreteSyntaxTree wr) {  // emits "return <expr>;" for function bodies
+      var wStmts = wr.Fork();
+      wr = EmitReturnExpr(wr);
+      var fromType = thisContext == null ? expr.Type : expr.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
+      wr = EmitCoercionIfNecessary(fromType, resultType, expr.Origin, wr);
+      wr = EmitDowncastIfNecessary(fromType, resultType, expr.Origin, wr);
+      EmitExpr(expr, inLetExprBody, wr, wStmts);
+    }
+    protected virtual void EmitReturnExpr(string returnExpr, ConcreteSyntaxTree wr) {  // emits "return <returnExpr>;" for function bodies
+      var w = EmitReturnExpr(wr);
+      w.Write(returnExpr);
+    }
+    protected virtual ConcreteSyntaxTree EmitReturnExpr(ConcreteSyntaxTree wr) {
+      // emits "return <returnExpr>;" for function bodies
+      wr.Write("return ");
+      var w = wr.Fork();
+      EndStmt(wr);
+      return w;
+    }
+    /// <summary>
+    /// Labels the code written to the TargetWriter returned, in such that way that any
+    /// emitted break to the label inside that code will abruptly end the execution of the code.
+    /// </summary>
+    protected abstract ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr);
+    protected abstract void EmitBreak(string/*?*/ label, ConcreteSyntaxTree wr);
+    protected abstract void EmitContinue(string label, ConcreteSyntaxTree wr);
+    protected abstract void EmitYield(ConcreteSyntaxTree wr);
+    protected abstract void EmitAbsurd(string/*?*/ message, ConcreteSyntaxTree wr);
+    protected virtual void EmitAbsurd(string message, ConcreteSyntaxTree wr, bool needIterLimit) {
+      EmitAbsurd(message, wr);
+    }
+
+    protected abstract void EmitHalt(IOrigin tok, Expression /*?*/ messageExpr, ConcreteSyntaxTree wr);
+
+    protected ConcreteSyntaxTree EmitIf(string guard, bool hasElse, ConcreteSyntaxTree wr) {
+      var thn = EmitIf(out var guardWriter, hasElse, wr);
+      guardWriter.Write(guard);
+      return thn;
+    }
+    protected virtual ConcreteSyntaxTree EmitIf(out ConcreteSyntaxTree guardWriter, bool hasElse, ConcreteSyntaxTree wr) {
+      wr.Write("if (");
+      guardWriter = wr.Fork();
+      if (hasElse) {
+        var thn = wr.NewBlock(")", " else", BlockStyle.SpaceBrace, BlockStyle.SpaceBrace);
+        return thn;
+      } else {
+        var thn = wr.NewBlock(")");
+        return thn;
+      }
+    }
+
+    protected virtual ConcreteSyntaxTree EmitBlock(ConcreteSyntaxTree wr) {
+      return wr.NewBlock("", open: BlockStyle.Brace);
+    }
+
+    protected virtual ConcreteSyntaxTree EmitWhile(IOrigin tok, List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {  // returns the guard writer
+      var wBody = CreateWhileLoop(out var guardWriter, wr);
+      wBody = EmitContinueLabel(labels, wBody);
+      Coverage.Instrument(tok, "while body", wBody);
+      TrStmtList(body, wBody);
+      return guardWriter;
+    }
+
+    protected abstract ConcreteSyntaxTree EmitForStmt(IOrigin tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
+      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr);
+
+    protected virtual ConcreteSyntaxTree CreateWhileLoop(out ConcreteSyntaxTree guardWriter, ConcreteSyntaxTree wr) {
+      wr.Write("while (");
+      guardWriter = wr.Fork();
+      var wBody = wr.NewBlock(")");
+      return wBody;
+    }
+
+    /// <summary>
+    /// Create a for loop where the type of the index variable, along with "start" and "bound", is the native array-index type.
+    /// </summary>
+    protected abstract ConcreteSyntaxTree CreateForLoop(string indexVar, Action<ConcreteSyntaxTree> bound, ConcreteSyntaxTree wr, string start = null);
+    protected abstract ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr);
+    protected abstract void EmitIncrementVar(string varName, ConcreteSyntaxTree wr);  // increments a BigInteger by 1
+    protected abstract void EmitDecrementVar(string varName, ConcreteSyntaxTree wr);  // decrements a BigInteger by 1
+
+    protected abstract string GetQuantifierName(string bvType);
+
+    /// <summary>
+    /// Emit a loop like this:
+    ///     foreach (tmpVarName:collectionElementType in [[collectionWriter]]) {
+    ///       [[bodyWriter]]
+    ///     }
+    /// where
+    ///   * "[[collectionWriter]]" is the writer returned as "collectionWriter"
+    ///   * "[[bodyWriter]]" is the block writer returned
+    /// </summary>
+    protected abstract ConcreteSyntaxTree CreateForeachLoop(
+      string tmpVarName, Type collectionElementType,
+      IOrigin tok, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr);
+
+    /// <summary>
+    /// Creates a guarded foreach loop that iterates over a collection, and apply required subtype
+    /// and compiled subset types filters. Will not emit intermediate ifs if there is no need.
+    ///
+    ///     foreach(collectionElementType tmpVarName in collectionWriter) {
+    ///       if(tmpVarName is [boundVar.type]) {
+    ///         var [IDName(boundVar)] = ([boundVar.type])(tmpvarName);
+    ///         if(constraints_of_boundvar.Type([IdName(boundVar)])) {
+    ///           ...
+    ///         }
+    ///       }
+    ///     }
+    /// </summary>
+    /// <returns>A writer to write inside the deepest if-then</returns>
+    private ConcreteSyntaxTree CreateGuardedForeachLoop(
+      string tmpVarName, Type collectionElementType,
+      IVariable boundVar,
+      bool newtypeConversionsWereExplicit,
+      bool introduceBoundVar, bool inLetExprBody,
+      IOrigin tok, Action<ConcreteSyntaxTree> collection, ConcreteSyntaxTree wr
+      ) {
+      wr = CreateForeachLoop(tmpVarName, collectionElementType, tok, out var collectionWriter, wr);
+      collection(collectionWriter);
+      wr = MaybeInjectSubtypeConstraintWrtTraits(tmpVarName, collectionElementType, boundVar.Type, inLetExprBody, tok, wr);
+      EmitDowncastVariableAssignment(IdName(boundVar), boundVar.Type, tmpVarName, collectionElementType,
+          introduceBoundVar, tok, wr);
+      wr = MaybeInjectSubsetConstraint(boundVar, boundVar.Type, inLetExprBody, tok, wr, newtypeConversionsWereExplicit);
+      return wr;
+    }
+
+    /// <summary>
+    /// Returns a subtype condition like:
+    ///     tmpVarName is member of type boundVarType
+    /// Returns null if no condition is necessary
+    /// </summary>
+    [CanBeNull]
+    protected abstract Action<ConcreteSyntaxTree> GetSubtypeCondition(
+      string tmpVarName, Type boundVarType, IOrigin tok, ConcreteSyntaxTree wPreconditions);
+
+    /// <summary>
+    /// Emit an upcast or (already verified) downcast assignment like:
+    ///
+    ///     var boundVarName:boundVarType := tmpVarName as boundVarType;
+    ///     [[bodyWriter]]
+    ///
+    /// where
+    ///   * "[[bodyWriter]]" is where the writer wr's position will be next
+    /// </summary>
+    /// <param name="boundVarName">Name of the variable after casting</param>
+    /// <param name="boundVarType">Expected variable type</param>
+    /// <param name="tmpVarName">The collection's variable name</param>
+    /// <param name="sourceType"></param>
+    /// <param name="introduceBoundVar">Whether or not to declare the variable, in languages requiring declarations</param>
+    /// <param name="tok">A position in the AST</param>
+    /// <param name="wr">The concrete syntax tree writer</param>
+    protected abstract void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
+      Type sourceType, bool introduceBoundVar, IOrigin tok, ConcreteSyntaxTree wr);
+
+    /// <summary>
+    /// Emit a simple foreach loop over the elements (which are known as "ingredients") of a collection assembled for
+    /// the purpose of compiling a "forall" statement.
+    ///
+    ///     foreach (boundVarName:boundVarType in [[coll]]) {
+    ///       [[body]]
+    ///     }
+    ///
+    /// where "boundVarType" is an L-tuple whose components are "tupleTypeArgs" (see EmitIngredients). If "boundVarType" can
+    /// be inferred from the ingredients emitted by EmitIngredients, then "L" and "tupleTypeArgs" can be ignored and
+    /// "boundVarType" be replaced by some target-language way of saying "please infer the type" (like "var" in C#).
+    /// </summary>
+    protected abstract ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr);
+
+    /// <summary>
+    /// If "initCall" is non-null, then "initCall.Method is Constructor".
+    /// </summary>
+    protected abstract void EmitNew(Type type, IOrigin tok, CallStmt initCall /*?*/, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts);
+
+    // To support target language constructors without an additional initCall in {:extern} code, we ignore the initCall
+    // and call the constructor with all arguments.
+    protected string ConstructorArguments(CallStmt initCall, ConcreteSyntaxTree wStmts, Constructor ctor, string sep = "") {
+      var arguments = Enumerable.Empty<string>();
+      if (ctor != null && IsExternallyImported(ctor)) {
+        // the arguments of any external constructor are placed here
+        arguments = ctor.Ins.Select((f, i) => (f, i))
+          .Where(tp => !tp.f.IsGhost)
+          .Select(tp => Expr(initCall.Args[tp.i], false, wStmts).ToString());
+      }
+      return (arguments.Any() ? sep : "") + arguments.Comma();
+    }
+
+    protected virtual bool DeterminesArrayTypeFromExampleElement => false;
+
+    protected virtual string ArrayIndexLiteral(int x) => x.ToString();
+
+    /// <summary>
+    /// Allocates a new array with element type "elementType" and lengths "dimensions" in each dimension.
+    /// Note that "elementType" may denote a type parameter.
+    ///
+    /// Each string in "dimensions" is generated as a Dafny "int" (that is, a BigInteger).
+    ///
+    /// If "mustInitialize" is true, then fills each array element with a default value of type "elementType".
+    /// In this case, "exampleElement" must be null.
+    ///
+    /// If "mustInitialize" is false, then the array's elements are left uninitialized.
+    /// In this case, "exampleElement" may be non-null as a guide to figuring out what run-time type the array should have.
+    /// Note that "exampleElement" is not written to the array.
+    ///
+    /// "exampleElement" is always null if "DeterminesArrayTypeFromExampleElement" is false.
+    /// </summary>
+    protected abstract void EmitNewArray(Type elementType, IOrigin tok, List<string> dimensions,
+      bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+
+    /// <summary>
+    /// Same as the EmitNewArray overload above, except that "dimensions" is "List<Expression>" instead of "List<string>".
+    /// </summary>
+    protected virtual void EmitNewArray(Type elementType, IOrigin tok, List<Expression> dimensions,
+      bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+
+      var dimStrings = dimensions.ConvertAll(expr => {
+        var wrDim = new ConcreteSyntaxTree();
+        EmitExpr(expr, false, ExprToInt(expr.Type, wrDim), wStmts);
+        return wrDim.ToString();
+      });
+      EmitNewArray(elementType, tok, dimStrings, mustInitialize, exampleElement, wr, wStmts);
+    }
+
+    protected abstract void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e);
+    protected abstract void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr);
+    protected abstract ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, [CanBeNull] NativeType nativeType,
+      bool surroundByUnchecked, ConcreteSyntaxTree wr);
+    protected delegate void FCE_Arg_Translator(Expression e, ConcreteSyntaxTree wr, bool inLetExpr, ConcreteSyntaxTree wStmts);
+
+    protected abstract void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
+      bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr);
+    /// <summary>
+    /// Return true if x < 0 should be rendered as sign(x) < 0 when x has the
+    /// given type.  Typically, this is only a win at non-native types, since
+    /// BigIntegers benefit from not having to access the number zero.
+    /// </summary>
+    protected virtual bool CompareZeroUsingSign(Type type) {
+      return false;
+    }
+    protected virtual ConcreteSyntaxTree EmitSign(Type type, ConcreteSyntaxTree wr) {
+      // Currently, this should only be called when CompareZeroUsingSign is true
+      Contract.Assert(false);
+      throw new cce.UnreachableException();
+    }
+    protected abstract void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr);
+    protected abstract ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr);
+    protected abstract void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr);
+
+    protected virtual bool NeedsCastFromTypeParameter => false;
+
+    protected virtual bool TargetSubtypingRequiresEqualTypeArguments(Type type) => false;
+
+    protected virtual bool IsCoercionNecessary(Type /*?*/ from, Type /*?*/ to) {
+      return NeedsCastFromTypeParameter;
+    }
+
+    protected virtual Type TypeForCoercion(Type type) {
+      return type;
+    }
+
+    /// <summary>
+    /// If "from" and "to" are both given, and if a "from" needs an explicit coercion in order to become a "to", emit that coercion.
+    /// Needed in languages where either
+    ///   (a) we need to represent upcasts as explicit operations (like Go, or array types in Java), or
+    ///   (b) there's static typing but no parametric polymorphism (like Go) so that lots of things need to be boxed and unboxed.
+    /// "toOrig" is passed to represent the original, unsubstituted type, which is useful for detecting boxing situations in Java
+    /// </summary>
+    protected virtual ConcreteSyntaxTree EmitCoercionIfNecessary(Type/*?*/ from, Type/*?*/ to, IOrigin tok, ConcreteSyntaxTree wr, Type/*?*/ toOrig = null) {
+      if (from != null && to != null && from.IsTraitType && to.AsNewtype != null) {
+        return FromFatPointer(to, wr);
+      }
+      if (from != null && to != null && from.AsNewtype != null && to.IsTraitType && (enclosingMethod != null || enclosingFunction != null)) {
+        return ToFatPointer(from, wr);
+      }
+      return wr;
+    }
+
+    protected ConcreteSyntaxTree CoercionIfNecessary(Type/*?*/ from, Type/*?*/ to, IOrigin tok, ICanRender inner, Type/*?*/ toOrig = null) {
+      if (toOrig == null) {
+        toOrig = to;
+      }
+
+      var result = new ConcreteSyntaxTree();
+      EmitCoercionIfNecessary(from, to, tok, result, toOrig).Append(inner);
+      return result;
+    }
+
+    protected ConcreteSyntaxTree EmitDowncastIfNecessary(Type /*?*/ from, Type /*?*/ to, IOrigin tok, ConcreteSyntaxTree wr) {
+      Contract.Requires(tok != null);
+      Contract.Requires(wr != null);
+      if (from != null && to != null) {
+        from = DatatypeWrapperEraser.SimplifyType(Options, from);
+        to = DatatypeWrapperEraser.SimplifyType(Options, to);
+        if (!IsTargetSupertype(to, from)) {
+          // By the way, it is tempting to think that IsTargetSupertype(from, to)) would hold here, but that's not true.
+          // For one, in a language with NeedsCastFromTypeParameter, "to" and "from" may contain uninstantiated formal type parameters.
+          // Also, it is possible (subject to a check enforced by the verifier) to assign Datatype<X> to Datatype<Y>,
+          // where Datatype is co-variant in its argument type and X and Y are two incomparable types with a common supertype.
+
+          wr = EmitDowncast(from, to, tok, wr);
+        }
+      }
+      return wr;
+    }
+
+    protected virtual ConcreteSyntaxTree UnboxNewtypeValue(ConcreteSyntaxTree wr) {
+      return wr;
+    }
+
+    /// <summary>
+    /// Change from the fat-pointer representation of "type" to the ordinary representation of "type".
+    /// If these are the same, acts as the identity.
+    /// Note, the two representations are different only for newtypes, and only for newtypes that
+    /// extend a trait, see Type.HasFatPointer.
+    /// </summary>
+    protected virtual ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
+      return wr;
+    }
+
+    /// <summary>
+    /// Change from the ordinary representation of "type" to the fat-pointer representation of "type".
+    /// If these are the same, acts as the identity.
+    /// Note, the two representations are different only for newtypes, and only for newtypes that
+    /// extend a trait, see Type.HasFatPointer.
+    /// </summary>
+    protected virtual ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
+      return wr;
+    }
+
+    /// <summary>
+    /// Determine if "to" is a supertype of "from" in the target language, if "!typeEqualityOnly".
+    /// Determine if "to" is equal to "from" in the target language, if "typeEqualityOnly".
+    /// This to similar to Type.IsSupertype and Type.Equals, respectively, but ignores subset types (that
+    /// is, always uses the base type of any subset type).
+    /// </summary>
+    public bool IsTargetSupertype(Type to, Type from, bool typeEqualityOnly = false) {
+      Contract.Requires(from != null);
+      Contract.Requires(to != null);
+      to = to.NormalizeExpand();
+      from = from.NormalizeExpand();
+      if (Type.SameHead(to, from)) {
+        Contract.Assert(to.TypeArgs.Count == from.TypeArgs.Count);
+        var formalTypeParameters = (to as UserDefinedType)?.ResolvedClass?.TypeArgs;
+        Contract.Assert(formalTypeParameters == null || formalTypeParameters.Count == to.TypeArgs.Count);
+        Contract.Assert(formalTypeParameters != null || to.TypeArgs.Count == 0 || to is CollectionType);
+        for (var i = 0; i < to.TypeArgs.Count; i++) {
+          bool okay;
+          if (typeEqualityOnly || TargetSubtypingRequiresEqualTypeArguments(to)) {
+            okay = IsTargetSupertype(to.TypeArgs[i], from.TypeArgs[i], true);
+          } else if (formalTypeParameters == null || formalTypeParameters[i].Variance == TypeParameter.TPVariance.Co) {
+            okay = IsTargetSupertype(to.TypeArgs[i], from.TypeArgs[i]);
+          } else if (formalTypeParameters[i].Variance == TypeParameter.TPVariance.Contra) {
+            okay = IsTargetSupertype(from.TypeArgs[i], to.TypeArgs[i]);
+          } else {
+            okay = IsTargetSupertype(to.TypeArgs[i], from.TypeArgs[i], true);
+          }
+          if (!okay) {
+            return false;
+          }
+        }
+        return true;
+      } else if (typeEqualityOnly) {
+        return false;
+      } else if (to.IsObjectQ) {
+        return true;
+      } else {
+        return from.ParentTypes(false).Any(fromParentType => IsTargetSupertype(to, fromParentType));
+      }
+    }
+
+    protected ConcreteSyntaxTree Downcast(Type from, Type to, IOrigin tok, ICanRender expression) {
+      var result = new ConcreteSyntaxTree();
+      EmitDowncast(from, to, tok, result).Append(expression);
+      return result;
+    }
+
+    protected virtual ConcreteSyntaxTree EmitDowncast(Type from, Type to, IOrigin tok, ConcreteSyntaxTree wr) {
+      Contract.Requires(from != null);
+      Contract.Requires(to != null);
+      Contract.Requires(tok != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(!IsTargetSupertype(to, from));
+      return wr;
+    }
+
+    protected virtual ConcreteSyntaxTree EmitCoercionToNativeInt(ConcreteSyntaxTree wr) {
+      return wr;
+    }
+    /// <summary>
+    /// Emit a coercion of a value to any tuple, returning the writer for the value to coerce.  Needed in translating ForallStmt because some of the tuple components are native ints for which we have no Type object, but Go needs to coerce the value that comes out of the iterator.  Safe to leave this alone in subclasses that don't have the same problem.
+    /// </summary>
+    protected virtual ConcreteSyntaxTree EmitCoercionToArbitraryTuple(ConcreteSyntaxTree wr) {
+      return wr;
+    }
+    protected virtual string IdName(TopLevelDecl d) {
+      Contract.Requires(d != null);
+      return IdProtect(d.GetCompileName(Options));
+    }
+    protected virtual string IdName(MemberDecl member) {
+      Contract.Requires(member != null);
+      return IdProtect(member.GetCompileName(Options));
+    }
+
+    protected virtual string CompanionMemberIdName(MemberDecl member) {
+      return IdName(member);
+    }
+    protected virtual string IdName(TypeParameter tp) {
+      Contract.Requires(tp != null);
+      return IdProtect(tp.GetCompileName(Options));
+    }
+    protected virtual string GetCompileNameNotProtected(IVariable v) {
+      return v.GetOrCreateCompileName(currentIdGenerator);
+    }
+    protected virtual string IdName(IVariable v) {
+      Contract.Requires(v != null);
+      return IdProtect(GetCompileNameNotProtected(v));
+    }
+    protected virtual string IdMemberName(MemberSelectExpr mse) {
+      Contract.Requires(mse != null);
+      return IdProtect(mse.MemberName);
+    }
+    protected virtual string IdProtect(string name) {
+      Contract.Requires(name != null);
+      return name;
+    }
+    protected abstract string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null);
+    protected abstract void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember = false);
+    protected virtual void EmitNull(Type type, ConcreteSyntaxTree wr) {
+      wr.Write("null");
+    }
+    protected virtual void EmitITE(Expression guard, Expression thn, Expression els, Type resultType, bool inLetExprBody,
+        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Requires(guard != null);
+      Contract.Requires(thn != null);
+      Contract.Requires(thn.Type != null);
+      Contract.Requires(els != null);
+      Contract.Requires(resultType != null);
+      Contract.Requires(wr != null);
+
+      resultType = resultType.NormalizeExpand();
+      var thenExpr = Expr(thn, inLetExprBody, wStmts);
+      var castedThenExpr = resultType.Equals(thn.Type.NormalizeExpand()) ? thenExpr : Cast(resultType, thenExpr);
+      var elseExpr = Expr(els, inLetExprBody, wStmts);
+      var castedElseExpr = resultType.Equals(els.Type.NormalizeExpand()) ? elseExpr : Cast(resultType, elseExpr);
+      wr.Format($"(({Expr(guard, inLetExprBody, wStmts)}) ? ({castedThenExpr}) : ({castedElseExpr}))");
+    }
+
+    public ConcreteSyntaxTree Cast(ICanRender toType, ConcreteSyntaxTree expr) {
+      var result = new ConcreteSyntaxTree();
+      EmitCast(toType, result).Append(expr);
+      return result;
+    }
+
+    public ConcreteSyntaxTree Cast(Type toType, ConcreteSyntaxTree expr) {
+      var result = new ConcreteSyntaxTree();
+      EmitCast(new LineSegment(TypeName(toType, result, Token.NoToken)), result).Append(expr);
+      return result;
+    }
+
+    protected virtual ConcreteSyntaxTree EmitCast(ICanRender toType, ConcreteSyntaxTree wr) {
+      wr.Format($"({toType})");
+      return wr.ForkInParens();
+    }
+
+    protected abstract void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr);
+    protected abstract void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString);
+
+    /// <summary>
+    /// A "TypeArgumentInstantiation" is essentially a pair consisting of a formal type parameter and an actual type for that parameter.
+    /// </summary>
+    public class TypeArgumentInstantiation {
+      public readonly TypeParameter Formal;
+      public readonly Type Actual;
+
+      public TypeArgumentInstantiation(TypeParameter formal, Type actual) {
+        Contract.Requires(formal != null);
+        Contract.Requires(actual != null);
+        Formal = formal;
+        Actual = actual;
+      }
+
+      /// <summary>
+      /// Uses "formal" for both formal and actual.
+      /// </summary>
+      public TypeArgumentInstantiation(TypeParameter formal) {
+        Contract.Requires(formal != null);
+        Formal = formal;
+        Actual = new UserDefinedType(formal);
+      }
+
+      public static List<TypeArgumentInstantiation> ListFromMember(MemberDecl member, List<Type> /*?*/ classActuals, List<Type> /*?*/ memberActuals) {
+        Contract.Requires(classActuals == null || classActuals.Count == (member.EnclosingClass == null ? 0 : member.EnclosingClass.TypeArgs.Count));
+        Contract.Requires(memberActuals == null || memberActuals.Count == (member is ICallable ic ? ic.TypeArgs.Count : 0));
+
+        var r = new List<TypeArgumentInstantiation>();
+        void add(List<TypeParameter> formals, List<Type> actuals) {
+          Contract.Assert(formals.Count == actuals.Count);
+          for (var i = 0; i < formals.Count; i++) {
+            r.Add(new TypeArgumentInstantiation(formals[i], actuals[i]));
+          }
+        };
+
+        if (classActuals != null && classActuals.Count != 0) {
+          Contract.Assert(member.EnclosingClass.TypeArgs.TrueForAll(ta => ta.Parent is TopLevelDecl));
+          add(member.EnclosingClass.TypeArgs, classActuals);
+        }
+        if (memberActuals != null && member is ICallable icallable) {
+          Contract.Assert(icallable.TypeArgs.TrueForAll(ta => !(ta.Parent is TopLevelDecl)));
+          add(icallable.TypeArgs, memberActuals);
+        }
+        return r;
+      }
+
+      public static List<TypeArgumentInstantiation> ListFromClass(TopLevelDecl cl, List<Type> actuals) {
+        Contract.Requires(cl != null);
+        Contract.Requires(actuals != null);
+        Contract.Requires(cl.TypeArgs.Count == actuals.Count);
+
+        var r = new List<TypeArgumentInstantiation>();
+        for (var i = 0; i < cl.TypeArgs.Count; i++) {
+          r.Add(new TypeArgumentInstantiation(cl.TypeArgs[i], actuals[i]));
+        }
+        return r;
+      }
+
+      public static List<TypeArgumentInstantiation> ListFromFormals(List<TypeParameter> formals) {
+        Contract.Requires(formals != null);
+        return formals.ConvertAll(tp => new TypeArgumentInstantiation(tp, new UserDefinedType(tp)));
+      }
+
+      public static List<TypeParameter> ToFormals(List<TypeArgumentInstantiation> typeArgs) {
+        Contract.Requires(typeArgs != null);
+        return typeArgs.ConvertAll(ta => ta.Formal);
+      }
+
+      public static List<Type> ToActuals(List<TypeArgumentInstantiation> typeArgs) {
+        Contract.Requires(typeArgs != null);
+        return typeArgs.ConvertAll(ta => ta.Actual);
+      }
+    }
+
+    /// <summary>
+    /// Answers two questions whose answers are used to filter type parameters.
+    /// For a member c, F, or M:
+    ///     (co-)datatype/class/trait <<cl>> {
+    ///       <<isStatic>> const c ...
+    ///       <<isStatic>> function F ...
+    ///       <<isStatic>> method M ...
+    ///     }
+    /// does a type parameter of "cl"
+    ///  - get compiled as a type parameter of the member (needsTypeParameter)
+    ///  - get compiled as a type descriptor of the member (needsTypeDescriptor)
+    /// For a member of a trait with a rhs/body, if "lookasideBody" is "true", the questions are to
+    /// be answered for the member emitted into the companion class, not the signature that goes into
+    /// the target type.
+    /// </summary>
+    protected virtual void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
+      Contract.Requires(cl is DatatypeDecl || cl is ClassLikeDecl);
+      // TODO: Decide whether to express this as a Feature
+      throw new NotImplementedException();
+    }
+
+    protected internal List<TypeArgumentInstantiation> ForTypeParameters(List<TypeArgumentInstantiation> typeArgs, MemberDecl member, bool lookasideBody) {
+      Contract.Requires(member is ConstantField || member is Function || member is Method);
+      Contract.Requires(typeArgs != null);
+      var memberHasBody =
+        (member is ConstantField cf && cf.Rhs != null) ||
+        (member is Function f && f.Body != null) ||
+        (member is Method m && m.Body != null);
+      var r = new List<TypeArgumentInstantiation>();
+      foreach (var ta in typeArgs) {
+        var tp = ta.Formal;
+        if (tp.Parent is TopLevelDeclWithMembers) {
+          TypeArgDescriptorUse(member.IsStatic, lookasideBody, (TopLevelDeclWithMembers)member.EnclosingClass, out var needsTypeParameter, out var _);
+          if (!needsTypeParameter) {
+            continue;
+          }
+        }
+        r.Add(ta);
+      }
+      return r;
+    }
+
+    protected List<TypeArgumentInstantiation> ForTypeDescriptors(List<TypeArgumentInstantiation> typeArgs, TopLevelDecl enclosingClass, MemberDecl member, bool lookasideBody) {
+      Contract.Requires(member is ConstantField || member is Function || member is Method);
+      Contract.Requires(typeArgs != null);
+      var memberHasBody =
+        (member is ConstantField cf && cf.Rhs != null) ||
+        (member is Function f && f.Body != null) ||
+        (member is Method m && m.Body != null);
+      var r = new List<TypeArgumentInstantiation>();
+      foreach (var ta in typeArgs) {
+        var tp = ta.Formal;
+        if (tp.Parent is TopLevelDeclWithMembers) {
+          if (tp.Parent is not TraitDecl && member?.OverriddenMember != null) {
+            continue;
+          }
+          TypeArgDescriptorUse(member == null || member.IsStatic, lookasideBody, (TopLevelDeclWithMembers)enclosingClass, out var _, out var needsTypeDescriptor);
+          if (!needsTypeDescriptor) {
+            continue;
+          }
+        }
+        r.Add(ta);
+      }
+      return r;
+    }
+
+    /// <summary>
+    /// The "additionalCustomParameter" is used when the member is an instance function that requires customer-receiver support.
+    /// This parameter is then to be added between any run-time type descriptors and the "normal" arguments. The caller will
+    /// arrange for "additionalCustomParameter" to be properly bound.
+    /// </summary>
+    protected abstract ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
+      Type expectedType, string/*?*/ additionalCustomParameter = null, bool internalAccess = false);
+
+    /// <summary>
+    /// The "indices" are expected to already be of the native array-index type.
+    /// </summary>
+    protected abstract ConcreteSyntaxTree EmitArraySelect(List<Action<ConcreteSyntaxTree>> indices, Type elmtType, ConcreteSyntaxTree wr);
+    protected abstract ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+
+    /// <summary>
+    /// The "indices" are expected to already be of the native array-index type.
+    /// </summary>
+    protected virtual (ConcreteSyntaxTree wArray, ConcreteSyntaxTree wRhs) EmitArrayUpdate(List<Action<ConcreteSyntaxTree>> indices, Type elementType, ConcreteSyntaxTree wr) {
+      var wArray = EmitArraySelect(indices, elementType, wr);
+      wr.Write(" = ");
+      var wRhs = wr.Fork();
+      return (wArray, wRhs);
+    }
+    protected ConcreteSyntaxTree EmitArrayUpdate(List<Action<ConcreteSyntaxTree>> indices, Expression rhs, ConcreteSyntaxTree wr) {
+      var (wArray, wRhs) = EmitArrayUpdate(indices, rhs.Type, wr);
+      EmitExpr(rhs, false, wRhs, wr);
+      return wArray;
+    }
+    /// <summary>
+    /// wIndex makes it possible to write the target-language expression "arrayIndex" that of the target
+    /// array-index type, and this might wrap that expression to be a Dafny "int" (that is, a BigInteger).
+    /// </summary>
+    protected virtual void EmitArrayIndexToInt(ConcreteSyntaxTree wr, out ConcreteSyntaxTree wIndex) {
+      wIndex = wr;
+    }
+
+    protected virtual void EmitArrayFinalize(ConcreteSyntaxTree wr, out ConcreteSyntaxTree wrArray, Type typeRhsType) {
+      wrArray = wr;
+    }
+
+    protected virtual ConcreteSyntaxTree ExprToInt(Type fromType, ConcreteSyntaxTree wr) {
+      return wr;
+    }
+    protected virtual string ArrayIndexToNativeInt(string arrayIndex, Type fromType) {
+      Contract.Requires(arrayIndex != null);
+      Contract.Requires(fromType != null);
+      return arrayIndex;
+    }
+
+    protected ConcreteSyntaxTree ExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
+      var result = new ConcreteSyntaxTree();
+      EmitExprAsNativeInt(expr, inLetExprBody, result, wStmts);
+      return result;
+    }
+
+    protected abstract void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts);
+    protected abstract void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+    protected abstract void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
+      CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+    protected virtual void EmitIndexCollectionUpdate(Type sourceType, out ConcreteSyntaxTree wSource, out ConcreteSyntaxTree wIndex, out ConcreteSyntaxTree wValue, ConcreteSyntaxTree wr, bool nativeIndex) {
+      wSource = wr.Fork();
+      wr.Write('[');
+      wIndex = wr.Fork();
+      wr.Write("] = ");
+      wValue = wr.Fork();
+    }
+    /// <summary>
+    /// If "fromArray" is false, then "source" is a sequence.
+    /// If "fromArray" is true, then "source" is an array.
+    /// </summary>
+    protected abstract void EmitSeqSelectRange(Expression source, Expression lo /*?*/, Expression hi /*?*/,
+      bool fromArray, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+    protected abstract void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts);
+    protected abstract void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts);
+    protected abstract void EmitApplyExpr(Type functionType, IOrigin tok, Expression function, List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+    protected virtual bool TargetLambdaCanUseEnclosingLocals => true;
+    protected abstract ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments, List<Type> boundTypes,
+      Type resultType, IOrigin resultTok, bool inLetExprBody, ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts);
+    protected virtual void EmitConstructorCheck(string source, DatatypeCtor ctor, ConcreteSyntaxTree wr) {
+      wr.Write("{0}.is_{1}", source, ctor.GetCompileName(Options));
+    }
+    /// <summary>
+    /// EmitDestructor is somewhat similar to following "source" with a call to EmitMemberSelect.
+    /// However, EmitDestructor may also need to perform a cast on "source".
+    /// Furthermore, EmitDestructor also needs to work for anonymous destructors.
+    /// </summary>
+    protected abstract void EmitDestructor(Action<ConcreteSyntaxTree> source,
+      Formal dtor, int formalNonGhostIndex,
+      DatatypeCtor ctor, Func<List<Type>> getTypeArgs, Type bvType, ConcreteSyntaxTree wr);
+    protected abstract ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IOrigin tok, List<string> inNames,
+      Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false);
+
+    /// <summary>
+    /// Emit an "Immediately Invoked Function Expression" with the semantics of
+    ///     var bvName: bvType := <<wrRhs>>; <<wrBody>>
+    /// where <<wrBody>> will have type "bodyType". In many languages, this IIFE will not be a "let" expression but a "lambda" expression like this:
+    ///     ((bvName: bvType) => <<wrBody>>)(<<wrRhs>>)
+    /// </summary>
+    protected abstract void CreateIIFE(string bvName, Type bvType, IOrigin bvTok, Type bodyType, IOrigin bodyTok,
+      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody);
+    protected ConcreteSyntaxTree CreateIIFE_ExprBody(string bvName, Type bvType, IOrigin bvTok, Expression rhs,
+      bool inLetExprBody, Type bodyType, IOrigin bodyTok, ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts) {
+      var innerScope = wStmts.Fork();
+      CreateIIFE(bvName, bvType, bvTok, bodyType, bodyTok, wr, ref wStmts, out var wrRhs, out var wrBody);
+      EmitExpr(rhs, inLetExprBody, wrRhs, innerScope);
+      return wrBody;
+    }
+
+    protected abstract ConcreteSyntaxTree CreateIIFE0(Type resultType, IOrigin resultTok, ConcreteSyntaxTree wr,
+      ConcreteSyntaxTree wStmts);  // Immediately Invoked Function Expression
+    protected abstract ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IOrigin resultTok, string bvName,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);  // Immediately Invoked Function Expression
+    public enum ResolvedUnaryOp { BoolNot, BitwiseNot, Cardinality }
+
+    protected static readonly Dictionary<UnaryOpExpr.ResolvedOpcode, ResolvedUnaryOp> UnaryOpCodeMap = new() {
+      [UnaryOpExpr.ResolvedOpcode.BVNot] = ResolvedUnaryOp.BitwiseNot,
+      [UnaryOpExpr.ResolvedOpcode.BoolNot] = ResolvedUnaryOp.BoolNot,
+      [UnaryOpExpr.ResolvedOpcode.SeqLength] = ResolvedUnaryOp.Cardinality,
+      [UnaryOpExpr.ResolvedOpcode.SetCard] = ResolvedUnaryOp.Cardinality,
+      [UnaryOpExpr.ResolvedOpcode.MultiSetCard] = ResolvedUnaryOp.Cardinality,
+      [UnaryOpExpr.ResolvedOpcode.MapCard] = ResolvedUnaryOp.Cardinality
+    };
+
+    protected abstract void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+
+    protected virtual void CompileBinOp(BinaryExpr.ResolvedOpcode op,
+      Type e0Type, Type e1Type, IOrigin tok, Type resultType,
+      out string opString,
+      out string preOpString,
+      out string postOpString,
+      out string callString,
+      out string staticCallString,
+      out bool reverseArguments,
+      out bool truncateResult,
+      out bool convertE1_to_int,
+      out bool coerceE1,
+      ConcreteSyntaxTree errorWr) {
+
+      // This default implementation does not handle all cases. It handles some cases that look the same
+      // in C-like languages. It also handles cases that can be solved by another operator, but reversing
+      // the arguments or following the operation with a negation.
+      opString = null;
+      preOpString = "";
+      postOpString = "";
+      callString = null;
+      staticCallString = null;
+      reverseArguments = false;
+      truncateResult = false;
+      convertE1_to_int = false;
+      coerceE1 = false;
+
+      BinaryExpr.ResolvedOpcode dualOp = BinaryExpr.ResolvedOpcode.Add;  // NOTE! "Add" is used to say "there is no dual op"
+      BinaryExpr.ResolvedOpcode negatedOp = BinaryExpr.ResolvedOpcode.Add;  // NOTE! "Add" is used to say "there is no negated op"
+
+      switch (op) {
+        case BinaryExpr.ResolvedOpcode.Iff:
+          opString = "=="; break;
+        case BinaryExpr.ResolvedOpcode.Imp:
+          preOpString = "!"; opString = "||"; break;
+        case BinaryExpr.ResolvedOpcode.Or:
+          opString = "||"; break;
+        case BinaryExpr.ResolvedOpcode.And:
+          opString = "&&"; break;
+        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
+          opString = "&"; break;
+        case BinaryExpr.ResolvedOpcode.BitwiseOr:
+          opString = "|"; break;
+        case BinaryExpr.ResolvedOpcode.BitwiseXor:
+          opString = "^"; break;
+
+        case BinaryExpr.ResolvedOpcode.Lt:
+        case BinaryExpr.ResolvedOpcode.LtChar:
+          opString = "<"; break;
+        case BinaryExpr.ResolvedOpcode.Le:
+        case BinaryExpr.ResolvedOpcode.LeChar:
+          opString = "<="; break;
+        case BinaryExpr.ResolvedOpcode.Ge:
+        case BinaryExpr.ResolvedOpcode.GeChar:
+          opString = ">="; break;
+        case BinaryExpr.ResolvedOpcode.Gt:
+        case BinaryExpr.ResolvedOpcode.GtChar:
+          opString = ">"; break;
+
+        case BinaryExpr.ResolvedOpcode.SetNeq:
+          negatedOp = BinaryExpr.ResolvedOpcode.SetEq; break;
+        case BinaryExpr.ResolvedOpcode.MultiSetNeq:
+          negatedOp = BinaryExpr.ResolvedOpcode.MultiSetEq; break;
+        case BinaryExpr.ResolvedOpcode.SeqNeq:
+          negatedOp = BinaryExpr.ResolvedOpcode.SeqEq; break;
+        case BinaryExpr.ResolvedOpcode.MapNeq:
+          negatedOp = BinaryExpr.ResolvedOpcode.MapEq; break;
+
+        case BinaryExpr.ResolvedOpcode.Superset:
+          dualOp = BinaryExpr.ResolvedOpcode.Subset; break;
+        case BinaryExpr.ResolvedOpcode.MultiSuperset:
+          dualOp = BinaryExpr.ResolvedOpcode.MultiSubset; break;
+
+        case BinaryExpr.ResolvedOpcode.ProperSuperset:
+          dualOp = BinaryExpr.ResolvedOpcode.ProperSubset; break;
+        case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
+          dualOp = BinaryExpr.ResolvedOpcode.ProperMultiSubset; break;
+
+        case BinaryExpr.ResolvedOpcode.NotInSet:
+          negatedOp = BinaryExpr.ResolvedOpcode.InSet; break;
+        case BinaryExpr.ResolvedOpcode.NotInMultiSet:
+          negatedOp = BinaryExpr.ResolvedOpcode.InMultiSet; break;
+        case BinaryExpr.ResolvedOpcode.NotInSeq:
+          negatedOp = BinaryExpr.ResolvedOpcode.InSeq; break;
+        case BinaryExpr.ResolvedOpcode.NotInMap:
+          negatedOp = BinaryExpr.ResolvedOpcode.InMap; break;
+
+        default:
+          // The operator is one that needs to be handled in the specific compilers.
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected binary expression
+      }
+
+      if (dualOp != BinaryExpr.ResolvedOpcode.Add) {  // remember from above that Add stands for "there is no dual"
+        Contract.Assert(negatedOp == BinaryExpr.ResolvedOpcode.Add);
+        CompileBinOp(dualOp,
+          e1Type, e0Type, tok, GetRuntimeType(resultType),
+          out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
+          errorWr);
+        reverseArguments = !reverseArguments;
+      } else if (negatedOp != BinaryExpr.ResolvedOpcode.Add) {  // remember from above that Add stands for "there is no negated op"
+        CompileBinOp(negatedOp,
+          e0Type, e1Type, tok, GetRuntimeType(resultType),
+          out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
+          errorWr);
+        preOpString = "!" + preOpString;
+      }
+    }
+
+    protected abstract void EmitIsZero(string varName, ConcreteSyntaxTree wr);
+    protected abstract void EmitConversionExpr(Expression fromExpr, Type fromType, Type toType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+
+    /// <summary>
+    /// "fromType" is assignable to "toType", "fromType" is not a subtype of "toType", and both "fromType" and "toType" refer to
+    /// reference types or subset types thereof.
+    /// This method is used only for traits and reference types.
+    /// </summary>
+    protected abstract void EmitTypeTest(string localName, Type fromType, Type toType, IOrigin tok, ConcreteSyntaxTree wr);
+
+    /// <summary>
+    /// Emit a conjunct that tests if the Dafny real number "source" is an integer, like:
+    ///    "TestIsInteger(source) && "
+    /// It is fine for the target code to repeat the mention of "source", if necessary.
+    /// </summary>
+    protected abstract void EmitIsIntegerTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+
+    /// <summary>
+    /// Emit a conjunct that tests if the Dafny integer "source" is a character, like:
+    ///     "TestIsUnicodeScalarValue(source) && "
+    /// It is fine for the target code to repeat the mention of "source", if necessary.
+    /// </summary>
+    protected abstract void EmitIsUnicodeScalarValueTest(Expression source, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+
+    /// <summary>
+    /// Emit conjuncts that test if the Dafny integer "source" is in the range lo..hi, like:
+    ///     "lo <= source && source < hi && "
+    /// It is fine for the target code to repeat the mention of "source", if necessary.
+    /// </summary>
+    protected abstract void EmitIsInIntegerRange(Expression source, BigInteger lo, BigInteger hi, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+
+    protected abstract void EmitCollectionDisplay(CollectionType ct, IOrigin tok, List<Expression> elements,
+      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);  // used for sets, multisets, and sequences
+    protected abstract void EmitMapDisplay(MapType mt, IOrigin tok, List<ExpressionPair> elements,
+      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+
+    protected abstract void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName);
+    protected abstract void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName);
+
+    protected abstract void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr);
+    protected abstract ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IOrigin tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr);
+
+    /// <summary>
+    /// The "ct" type is either a SetType or a MapType.
+    /// </summary>
+    protected abstract void GetCollectionBuilder_Build(CollectionType ct, IOrigin tok, string collName,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmt);
+
+    /// <summary>
+    /// Returns a pair (ty, f) where
+    ///   * "f" is a closure that, to a given writer, emits code that enumerates an integer-valued range from
+    ///     "wLo" to "wHi" using the target type of "type"
+    ///   * "ty" is a Dafny type whose target type is the same as the target type of "type"
+    /// It is assumed that "type" is some integer-based type (not a bitvector type, for example).
+    /// </summary>
+    protected virtual (Type, Action<ConcreteSyntaxTree>) EmitIntegerRange(Type type, Action<ConcreteSyntaxTree> wLo, Action<ConcreteSyntaxTree> wHi) {
+      Type result;
+      if (AsNativeType(type) != null) {
+        result = type;
+      } else {
+        result = new IntType();
+      }
+
+      return (result, (wr) => {
+        if (AsNativeType(type) != null) {
+          wr.Write("{0}.IntegerRange(", IdProtect(type.AsNewtype.GetFullCompileName(Options)));
+        } else {
+          wr.Write("{0}.IntegerRange(", GetHelperModuleName());
+        }
+
+        wLo(wr);
+        wr.Write(", ");
+        wHi(wr);
+        wr.Write(')');
+      }
+      );
+    }
+    protected abstract void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type,
+      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
+    protected virtual void FinishModule() { }
+
+    protected virtual void DeclareExternType(AbstractTypeDecl d, Expression compileTypeHint, ConcreteSyntaxTree wr) { }
+
+    protected virtual void OrganizeModules(Program program, out List<ModuleDefinition> modules) {
+      modules = program.CompileModules.ToList();
+    }
+
+    public void Compile(Program program, ConcreteSyntaxTree wrx) {
+      Contract.Requires(program != null);
+
+      EmitHeader(program, wrx);
+      EmitBuiltInDecls(program.SystemModuleManager, wrx);
+      var temp = new List<ModuleDefinition>();
+      OrganizeModules(program, out temp);
+      foreach (var m in temp) {
+        EmitModule(program, wrx, m);
+      }
+      EmitFooter(program, wrx);
+    }
+
+
+    public bool IsExternallyImported(IAttributeBearingDeclaration me) {
+      if (me is Function function) {
+        return IsExternallyImported(function);
+      }
+
+      if (me is Method method) {
+        return IsExternallyImported(method);
+      }
+
+      return me.IsExtern(Options);
+    }
+
+    protected virtual bool AllowMixingImportsAndNonImports => true;
+
+    protected (bool ClassIsExtern, bool Included) GetIsExternAndIncluded(ClassLikeDecl cl) {
+      var include = true;
+      var classIsExtern = cl.IsExtern(Options);
+      var nonGhost = cl.Members.Where(m => !m.IsGhost).ToList();
+      var hasNotImported = nonGhost.Any(m => !IsExternallyImported(m));
+      if (classIsExtern && !hasNotImported) {
+        include = false;
+      }
+
+      return (classIsExtern, include);
+    }
+
+    protected bool HasCompilationMaterial(MemberDecl memberDecl) {
+      return !memberDecl.IsGhost && (Options.DisallowExterns || !Attributes.Contains(memberDecl.Attributes, "extern"));
+    }
+
+    protected (bool classIsExtern, bool included) GetIsExternAndIncluded(DefaultClassDecl defaultClassDecl) {
+      var hasCompilationMaterial = defaultClassDecl.Members.Exists(HasCompilationMaterial);
+      var include = hasCompilationMaterial;
+      var classIsExtern = false;
+      if (include) {
+        classIsExtern =
+          (!Options.DisallowExterns && Attributes.Contains(defaultClassDecl.Attributes, "extern")) ||
+          Attributes.Contains(defaultClassDecl.EnclosingModuleDefinition.Attributes, "extern");
+        if (classIsExtern && defaultClassDecl.Members.TrueForAll(member =>
+              member.IsGhost || Attributes.Contains(member.Attributes, "extern"))) {
+          include = false;
+        }
+      }
+
+      return (classIsExtern, include);
+    }
+
+    private void EmitModule(Program program, ConcreteSyntaxTree programNode, ModuleDefinition module) {
+      if (!module.CanCompile()) {
+        // the purpose of an abstract module is to skip compilation
+        return;
+      }
+
+      DetectAndMarkCapitalizationConflicts(module);
+
+      ModuleDefinition externModule = null;
+      string libraryName = null;
+      if (!Options.DisallowExterns) {
+        var args = Attributes.FindExpressions(module.Attributes, "extern");
+        if (args != null) {
+          if (args.Count == 2) {
+            libraryName = (string)(args[1] as StringLiteralExpr)?.Value;
+          }
+
+          externModule = module;
+        }
+      }
+
+      if (!ShouldCompileModule(program, module)) {
+        DependOnModule(program, module, externModule, libraryName);
+        return;
+      }
+
+      Contract.Assert(enclosingModule == null);
+      enclosingModule = module;
+      var wr = CreateModule(module, module.GetCompileName(Options), module.IsDefaultModule, externModule, libraryName, module.Attributes, programNode);
+      var v = new CheckHasNoAssumesVisitor(this, wr);
+      foreach (TopLevelDecl d in module.TopLevelDecls) {
+        if (!ProgramResolver.ShouldCompile(d)) {
+          continue;
+        }
+
+        var newLineWriter = wr.Fork();
+        if (d is AbstractTypeDecl) {
+          var at = (AbstractTypeDecl)d;
+          bool externP = Attributes.Contains(at.Attributes, "extern");
+          if (externP) {
+            var exprs = Attributes.FindExpressions(at.Attributes, "extern");
+            Contract.Assert(exprs != null); // because externP is true
+            if (exprs.Count == 1) {
+              DeclareExternType(at, exprs[0], wr);
+            } else {
+              Error(ErrorId.c_abstract_type_needs_hint, d.Origin,
+                "Abstract type ('{0}') with extern attribute requires a compile hint. Expected {{:extern compile_type_hint}}",
+                wr, at.FullName);
+            }
+
+            v.Visit(exprs);
+          } else {
+            Error(ErrorId.c_abstract_type_cannot_be_compiled, d.Origin,
+              "Abstract type ('{0}') cannot be compiled; perhaps make it a type synonym or use :extern.", wr,
+              at.FullName);
+          }
+        } else if (d is TypeSynonymDecl) {
+          var sst = d as SubsetTypeDecl;
+          if (sst != null) {
+            DeclareSubsetType(sst, wr);
+            v.Visit(sst);
+          } else {
+            continue;
+          }
+        } else if (d is NewtypeDecl) {
+          var nt = (NewtypeDecl)d;
+          var w = DeclareNewtype(nt, wr);
+          v.Visit(nt);
+          CompileClassMembers(program, nt, w);
+          w.Finish();
+        } else if ((d as TupleTypeDecl)?.NonGhostDims == 1 && SupportsDatatypeWrapperErasure &&
+                   Options.Get(CommonOptionBag.OptimizeErasableDatatypeWrapper)) {
+          // ignore this type declaration
+        } else if (d is DatatypeDecl) {
+          var dt = (DatatypeDecl)d;
+
+          if (!DeclaredDatatypes.Add((module, dt.GetCompileName(Options)))) {
+            continue;
+          }
+
+          var w = DeclareDatatype(dt, wr);
+          if (w != null) {
+            CompileClassMembers(program, dt, w);
+            w.Finish();
+          } else if (DatatypeDeclarationAndMemberCompilationAreSeparate) {
+            continue;
+          }
+        } else if (d is IteratorDecl) {
+          var iter = (IteratorDecl)d;
+
+          var wIter = CreateIterator(iter, wr);
+          if (iter.Body == null) {
+            Error(ErrorId.c_iterator_has_no_body, iter.Origin, "iterator {0} has no body", wIter, iter.FullName);
+          } else {
+            TrStmtList(iter.Body.Body, wIter);
+          }
+        } else if (d is TraitDecl trait) {
+          // writing the trait
+          var w = CreateTrait(trait.GetCompileName(Options), trait.IsExtern(Options, out _, out _), trait.TypeArgs,
+            trait, trait.ParentTypeInformation.UniqueParentTraits(), trait.Origin, wr);
+          CompileClassMembers(program, trait, w);
+          w.Finish();
+        } else if (d is DefaultClassDecl defaultClassDecl) {
+          Contract.Assert(defaultClassDecl.InheritedMembers.Count == 0);
+          var (classIsExtern, include) = GetIsExternAndIncluded(defaultClassDecl);
+
+          if (include) {
+            var cw = CreateClass(IdProtect(d.EnclosingModuleDefinition.GetCompileName(Options)),
+              classIsExtern, defaultClassDecl.FullName,
+              defaultClassDecl.TypeArgs, defaultClassDecl,
+              defaultClassDecl.ParentTypeInformation.UniqueParentTraits(), defaultClassDecl.Origin, wr);
+            CompileClassMembers(program, defaultClassDecl, cw);
+            cw.Finish();
+          } else {
+            // still check that given members satisfy compilation rules
+            var abyss = new NullClassWriter(this);
+            CompileClassMembers(program, defaultClassDecl, abyss);
+          }
+        } else if (d is ClassLikeDecl cl) {
+          var (classIsExtern, include) = GetIsExternAndIncluded(cl);
+
+          if (include) {
+            var cw = CreateClass(IdProtect(d.EnclosingModuleDefinition.GetCompileName(Options)),
+              classIsExtern, cl.FullName,
+              cl.TypeArgs, cl, cl.ParentTypeInformation.UniqueParentTraits(), cl.Origin, wr);
+            CompileClassMembers(program, cl, cw);
+            cw.Finish();
+          } else {
+            // still check that given members satisfy compilation rules
+            var abyss = new NullClassWriter(this);
+            CompileClassMembers(program, cl, abyss);
+          }
+        } else if (d is ValuetypeDecl) {
+          // nop
+          continue;
+        } else if (d is ModuleDecl) {
+          // nop
+          continue;
+        } else {
+          Contract.Assert(false);
+        }
+
+        newLineWriter.WriteLine();
+      }
+
+      FinishModule();
+
+      Contract.Assert(enclosingModule == module);
+      enclosingModule = null;
+    }
+
+    private void DetectAndMarkCapitalizationConflicts(ModuleDefinition module) {
+      foreach (TopLevelDecl d in module.TopLevelDecls) {
+        if (d is DatatypeDecl datatypeDecl) {
+          CheckForCapitalizationConflicts(datatypeDecl.Ctors);
+          foreach (var ctor in datatypeDecl.Ctors) {
+            CheckForCapitalizationConflicts(ctor.Destructors);
+          }
+        }
+        if (d is TopLevelDeclWithMembers topLevelDeclWithMembers) {
+          CheckForCapitalizationConflicts(topLevelDeclWithMembers.Members, topLevelDeclWithMembers.InheritedMembers);
+        }
+      }
+    }
+
+    public ISet<(ModuleDefinition, string)> DeclaredDatatypes { get; } = new HashSet<(ModuleDefinition, string)>();
+
+    protected virtual ConcreteSyntaxTree GetNullClassConcreteSyntaxTree() {
+      return new ConcreteSyntaxTree();
+    }
+
+    protected class NullClassWriter : IClassWriter {
+      private readonly ConcreteSyntaxTree abyss;
+      private readonly ConcreteSyntaxTree block;
+
+      public NullClassWriter(SinglePassCodeGenerator parent) {
+        abyss = parent.GetNullClassConcreteSyntaxTree();
+        block = abyss.NewBlock("");
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        return createBody ? block : null;
+      }
+
+      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
+        throw new UnsupportedFeatureException(m.Origin, Feature.MethodSynthesis);
+      }
+
+      public ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IOrigin tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
+        return createBody ? block : null;
+      }
+      public ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IOrigin tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance) {
+        return createBody ? block : null;
+      }
+      public ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IOrigin tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
+        if (createBody) {
+          setterWriter = block;
+          return block;
+        } else {
+          setterWriter = null;
+          return null;
+        }
+      }
+      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IOrigin tok, string rhs, Field field) { }
+
+      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) { }
+
+      public ConcreteSyntaxTree/*?*/ ErrorWriter() {
+        return null; // match the old behavior of Compile() where this is used
+      }
+
+      public void Finish() { }
+    }
+
+    protected void EmitRuntimeSource(String root, ConcreteSyntaxTree wr, bool useFiles = true) {
+      var assembly = System.Reflection.Assembly.Load("DafnyPipeline");
+      var files = assembly.GetManifestResourceNames();
+      // An original source file at <root>/A/B/C.ext will become a manifest resource
+      // with a name like 'DafnyPipeline.<root>.A.B.C.<ext>'
+      String header = $"DafnyPipeline.{root}";
+      foreach (var file in files.Where(f => f.StartsWith(header))) {
+        var parts = file.Split('.');
+        var realName = string.Join('/', parts.SkipLast(1).Skip(2)) + "." + parts.Last();
+        ReadRuntimeSystem(file, useFiles ? wr.NewFile(realName) : wr);
+      }
+    }
+
+    private void ReadRuntimeSystem(string filename, ConcreteSyntaxTree wr) {
+      Contract.Requires(filename != null);
+      Contract.Requires(wr != null);
+
+      var assembly = System.Reflection.Assembly.Load("DafnyPipeline");
+      var stream = assembly.GetManifestResourceStream(filename);
+      if (stream is null) {
+        throw new Exception($"Cannot find embedded resource: {filename}");
+      }
+
+      var rd = new StreamReader(stream);
+      WriteFromStream(rd, wr.Append(new Verbatim()));
+    }
+
+    public static void WriteFromStream(StreamReader rd, TextWriter outputWriter) {
+      while (true) {
+        string s = rd.ReadLine();
+        if (s == null) {
+          return;
+        }
+        outputWriter.WriteLine(s);
+      }
+    }
+
+    // create a varName that is not a duplicate of formals' name
+    protected string GenVarName(string root, List<Formal> formals) {
+      bool finished = false;
+      while (!finished) {
+        finished = true;
+        int i = 0;
+        foreach (var arg in formals) {
+          if (!arg.IsGhost) {
+            // FormalName returns a protected name, so we compare a protected version of "root" to it
+            if (IdProtect(root).Equals(FormalName(arg, i))) {
+              root += root;
+              finished = false;
+            }
+            i++;
+          }
+        }
+      }
+      return root;
+    }
+
+    protected int WriteFormals(string sep, List<Formal> formals, ConcreteSyntaxTree wr, List<Formal>/*?*/ useTheseNamesForFormals = null) {
+      Contract.Requires(sep != null);
+      Contract.Requires(formals != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(useTheseNamesForFormals == null || useTheseNamesForFormals.Count == formals.Count);
+
+      int n = 0;
+      for (var i = 0; i < formals.Count; i++) {
+        var arg = formals[i];
+        if (!arg.IsGhost) {
+          string name = FormalName(useTheseNamesForFormals == null ? arg : useTheseNamesForFormals[i], n);
+          if (DeclareFormal(sep, name, arg.Type, arg.Origin, arg.InParam, wr)) {
+            sep = ", ";
+          }
+          n++;
+        }
+      }
+      return n;  // the number of formals written
+    }
+
+    protected string FormalName(Formal formal, int i) {
+      Contract.Requires(formal != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      return IdProtect(formal.HasName ? formal.CompileName : "_a" + i);
+    }
+
+    public static bool HasMain(Program program, out Method mainMethod) {
+      Contract.Ensures(Contract.Result<bool>() == (Contract.ValueAtReturn(out mainMethod) != null));
+      mainMethod = null;
+      bool hasMain = false;
+      string name = program.Reporter.Options.MainMethod;
+      if (name != null && name == "-") {
+        return false;
+      }
+
+      if (!string.IsNullOrEmpty(name)) {
+        foreach (var module in program.CompileModules) {
+          if (!module.CanCompile()) {
+            // the purpose of an abstract module is to skip compilation
+            continue;
+          }
+          foreach (var decl in module.TopLevelDecls) {
+            if (decl is TopLevelDeclWithMembers c) {
+              foreach (MemberDecl member in c.Members) {
+                if (member is Method m && member.FullDafnyName == name) {
+                  mainMethod = m;
+                  if (!IsPermittedAsMain(program, mainMethod, out string reason)) {
+                    ReportError(ErrorId.c_method_may_not_be_main_method, program.Reporter, mainMethod.Origin, "The method '{0}' is not permitted as a main method ({1}).", null, name, reason);
+                    mainMethod = null;
+                    return false;
+                  } else {
+                    return true;
+                  }
+                }
+              }
+            }
+          }
+        }
+        if (name != RunAllTestsMainMethod.SyntheticTestMainName) {
+          ReportError(ErrorId.c_could_not_find_stipulated_main_method, program.Reporter, program.DefaultModule.Origin, "Could not find the method named by the -Main option: {0}", null, name);
+        }
+      }
+      foreach (var module in program.CompileModules) {
+        if (!module.CanCompile()) {
+          // the purpose of an abstract module is to skip compilation
+          continue;
+        }
+        foreach (var decl in module.TopLevelDecls) {
+          var c = decl as TopLevelDeclWithMembers;
+          if (c != null) {
+            foreach (var member in c.Members) {
+              var m = member as Method;
+              if (m != null && Attributes.Contains(m.Attributes, "main")) {
+                if (mainMethod == null) {
+                  mainMethod = m;
+                  hasMain = true;
+                } else {
+                  // more than one main in the program
+                  ReportError(ErrorId.c_more_than_one_explicit_main_method, program.Reporter, m.Origin, "More than one method is marked {{:main}}. First declaration appeared at {0}.", null,
+                    mainMethod.Origin.TokenToString(program.Options));
+                  hasMain = false;
+                }
+              }
+            }
+          }
+        }
+      }
+      if (hasMain) {
+        if (!IsPermittedAsMain(program, mainMethod, out string reason)) {
+          ReportError(ErrorId.c_method_not_permitted_as_main, program.Reporter, mainMethod.Origin, "This method marked {{:main}} is not permitted as a main method ({0}).", null, reason);
+          mainMethod = null;
+          return false;
+        } else {
+          return true;
+        }
+      }
+      if (mainMethod != null) {
+        mainMethod = null;
+        return false;
+      }
+
+      mainMethod = null;
+      foreach (var module in program.CompileModules) {
+        if (!module.CanCompile()) {
+          // the purpose of an abstract module is to skip compilation
+          continue;
+        }
+        foreach (var decl in module.TopLevelDecls) {
+          var c = decl as TopLevelDeclWithMembers;
+          if (c != null) {
+            foreach (var member in c.Members) {
+              var m = member as Method;
+              if (m != null && m.Name == DefaultNameMain) {
+                if (mainMethod == null) {
+                  mainMethod = m;
+                  hasMain = true;
+                } else {
+                  // more than one main in the program
+                  ReportError(ErrorId.c_more_than_one_default_Main_method, program.Reporter, m.Origin, "More than one method is declared as '{0}'. First declaration appeared at {1}.", null,
+                    DefaultNameMain, mainMethod.Origin.TokenToString(program.Options));
+                  hasMain = false;
+                }
+              }
+            }
+          }
+        }
+      }
+
+      if (hasMain) {
+        if (!IsPermittedAsMain(program, mainMethod, out string reason)) {
+          ReportError(ErrorId.c_Main_method_not_permitted, program.Reporter, mainMethod.Origin, "This method 'Main' is not permitted as a main method ({0}).", null, reason);
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        // make sure "mainMethod" returns as null
+        mainMethod = null;
+        return false;
+      }
+    }
+
+    public static bool IsPermittedAsMain(Program program, Method m, out String reason) {
+      Contract.Requires(m.EnclosingClass is TopLevelDeclWithMembers);
+      // In order to be a legal Main() method, the following must be true:
+      //    The method is not a ghost method
+      //    The method takes no non-ghost parameters and no type parameters
+      //      except at most one array of type "array<string>"
+      //    The enclosing type does not take any type parameters
+      //    If the method is an instance (that is, non-static) method in a class, then the enclosing class must not declare any constructor
+      // In addition, either:
+      //    The method is called "Main"
+      //    The method has no requires clause
+      //    The method has no modifies clause
+      // or:
+      //    The method is annotated with {:main}
+      // Note, in the case where the method is annotated with {:main}, the method is allowed to have preconditions and modifies clauses.
+      // This lets the programmer add some explicit assumptions about the outside world, modeled, for example, via ghost parameters.
+      var cl = (TopLevelDeclWithMembers)m.EnclosingClass;
+      if (m.IsGhost) {
+        reason = "the method is ghost";
+        return false;
+      }
+      if (m.TypeArgs.Count != 0) {
+        reason = "the method has type parameters";
+        return false;
+      }
+      if (cl is AbstractTypeDecl) {
+        reason = "the enclosing type is an abstract type";
+        return false;
+      }
+      if (!m.IsStatic) {
+        if (cl is TraitDecl) {
+          reason = "the method is not static and the enclosing type does not support auto-initialization";
+          return false;
+        } else if (cl is ClassLikeDecl) {
+          if (cl.Members.Exists(f => f is Constructor)) {
+            reason = "the method is not static and the enclosing class has constructors";
+            return false;
+          }
+        } else {
+          var ty = UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(cl);
+          if (!ty.HasCompilableValue) {
+            reason = "the method is not static and the enclosing type does not support auto-initialization";
+            return false;
+          }
+        }
+      }
+      if (!m.Ins.TrueForAll(f => f.IsGhost)) {
+        var nonGhostFormals = m.Ins.Where(f => !f.IsGhost).ToList();
+        if (nonGhostFormals.Count > 1) {
+          reason = "the method has two or more non-ghost parameters";
+          return false;
+        }
+        var typeOfUniqueFormal = nonGhostFormals[0].Type.NormalizeExpandKeepConstraints();
+        if (typeOfUniqueFormal.AsSeqType is not { } seqType ||
+            seqType.Arg.AsSeqType is not { } subSeqType ||
+            !subSeqType.Arg.IsCharType) {
+          reason = "the method's non-ghost argument type should be an seq<string>, got " + typeOfUniqueFormal;
+          return false;
+        }
+      } else {
+        // Need to manually insert the args.
+        var argsType = new SeqType(new SeqType(new CharType()));
+        m.Ins.Add(new ImplicitFormal(m.Origin, "_noArgsParameter", argsType, true, false));
+      }
+      if (!m.Outs.TrueForAll(f => f.IsGhost)) {
+        reason = "the method has non-ghost out parameters";
+        return false;
+      }
+      if (Attributes.Contains(m.Attributes, "main")) {
+        reason = "";
+        return true;
+      }
+      if (m.Req.Count != 0) {
+        reason = "the method has requires clauses";
+        return false;
+      }
+      if (m.Mod.Expressions.Count != 0) {
+        reason = "the method has modifies clauses";
+        return false;
+      }
+      reason = "";
+      return true;
+    }
+
+    void OrderedBySCC(List<MemberDecl> decls, TopLevelDeclWithMembers c) {
+      List<ConstantField> consts = new List<ConstantField>();
+      foreach (var decl in decls) {
+        if (decl is ConstantField) {
+          consts.Add((ConstantField)decl);
+        }
+      }
+      consts.Sort((a, b) => c.EnclosingModuleDefinition.CallGraph.GetSCCRepresentativeId(a) - c.EnclosingModuleDefinition.CallGraph.GetSCCRepresentativeId(b));
+      foreach (var con in consts) {
+        decls.Remove(con);
+      }
+      decls.AddRange(consts);
+    }
+
+    public bool NeedsCustomReceiver(MemberDecl member) {
+      return NeedsCustomReceiverNotTrait(member) || NeedsCustomReceiverInTrait(member);
+    }
+
+    public virtual bool NeedsCustomReceiverInTrait(MemberDecl member) {
+      if (member.IsStatic) {
+        return false;
+      }
+      return member.EnclosingClass is TraitDecl
+             && (member is ConstantField { Rhs: { } }
+               or Function { Body: { } }
+               or Method { Body: { } });
+    }
+
+    public virtual bool NeedsCustomReceiverInDatatype(MemberDecl member) {
+      Contract.Requires(!member.IsStatic && member.EnclosingClass is DatatypeDecl);
+      if (member.EnclosingClass is DatatypeDecl datatypeDecl) {
+        return datatypeDecl.Ctors.Any(ctor => ctor.IsGhost) || DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, datatypeDecl, out _);
+      } else {
+        return false;
+      }
+    }
+
+    public virtual bool NeedsCustomReceiverNotTrait(MemberDecl member) {
+      Contract.Requires(member != null);
+      if (member.EnclosingClass is TraitDecl) {
+        return false;
+      }
+      // One of the limitations in many target language encodings are restrictions to instance members. If an
+      // instance member can't be directly expressed in the target language, we make it a static member with an
+      // additional first argument specifying the `this`, giving it a `CustomReceiver`.
+      // Such backends would typically override this method to return "true" in this case.
+      if (member.IsStatic) {
+        return false;
+      } else if (member.EnclosingClass is TraitDecl) {
+        return false;
+      } else if (member.EnclosingClass is NewtypeDecl newtypeDecl) {
+        return IsNewtypeErased(newtypeDecl);
+      } else if (member.EnclosingClass is DatatypeDecl datatypeDecl) {
+        // An undefined value "o" cannot use this o.F(...) form in most languages.
+        // Also, an erasable wrapper type has a receiver that's not part of the enclosing target class.
+        return NeedsCustomReceiverInDatatype(member);
+      } else {
+        return false;
+      }
+    }
+
+    protected virtual bool IsNewtypeErased(NewtypeDecl newtypeDecl) {
+      return true;
+    }
+
+    protected virtual bool InstanceConstAreStatic() {
+      return true;
+    }
+
+    void CompileClassMembers(Program program, TopLevelDeclWithMembers c, IClassWriter classWriter) {
+      Contract.Requires(c != null);
+      Contract.Requires(classWriter != null);
+      Contract.Requires(thisContext == null);
+      Contract.Ensures(thisContext == null);
+
+      var errorWr = classWriter.ErrorWriter();
+      var v = new CheckHasNoAssumesVisitor(this, errorWr);
+
+      var inheritedMembers = c.InheritedMembers;
+      OrderedBySCC(inheritedMembers, c);
+      OrderedBySCC(c.Members, c);
+
+      if (c is not TraitDecl || TraitRepeatsInheritedDeclarations) {
+        thisContext = c;
+        var canRedeclareMemberDefinedInTrait = c is not ClassLikeDecl and not DatatypeDecl and not NewtypeDecl ||
+                                                InstanceMethodsAllowedToCallTraitMethods;
+        foreach (var member in inheritedMembers.Select(memberx => (memberx as Function)?.ByMethodDecl ?? memberx)) {
+          enclosingDeclaration = member;
+          Contract.Assert(!member.IsStatic);  // only instance members should ever be added to .InheritedMembers
+          if (member.IsGhost) {
+            // skip
+          } else if (c is TraitDecl) {
+            RedeclareInheritedMember(member, classWriter);
+          } else if (member is ConstantField) {
+            var cf = (ConstantField)member;
+            var cfType = cf.Type.Subst(c.ParentFormalTypeParametersToActuals);
+            if (cf.Rhs == null && c is ClassLikeDecl) {
+              // create a backing field, since this constant field may be assigned in constructors
+              Contract.Assert(!cf.IsStatic); // as checked above, only instance members can be inherited
+              classWriter.DeclareField(InternalFieldPrefix + cf.GetCompileName(Options), c, false, false, cfType, cf.Origin, PlaceboValue(cfType, errorWr, cf.Origin, true), cf);
+            }
+            var w = CreateFunctionOrGetter(cf, IdName(cf), c, false, true, true, classWriter);
+            Contract.Assert(w != null);  // since the previous line asked for a body
+            if (cf.Rhs != null) {
+              EmitCallToInheritedConstRHS(cf, w);
+            } else if (!cf.IsStatic && c is ClassLikeDecl) {
+              var sw = EmitReturnExpr(w);
+              sw = EmitCoercionIfNecessary(cfType, cf.Type, cf.Origin, sw);
+              // get { return this._{0}; }
+              EmitThis(sw);
+              sw.Write(".{0}{1}", InternalFieldPrefix, cf.GetCompileName(Options));
+            } else {
+              EmitReturnExpr(PlaceboValue(cfType, errorWr, cf.Origin, true), w);
+            }
+          } else if (member is Field f) {
+            var fType = f.Type.Subst(c.ParentFormalTypeParametersToActuals);
+            // every field is inherited
+            classWriter.DeclareField(InternalFieldPrefix + f.GetCompileName(Options), c, false, false, fType, f.Origin, PlaceboValue(fType, errorWr, f.Origin, true), f);
+            var wGet = classWriter.CreateGetterSetter(IdName(f), f.Type, f.Origin, true, member, out var wSet, true);
+            {
+              var sw = EmitReturnExpr(wGet);
+              sw = EmitCoercionIfNecessary(fType, f.Type, f.Origin, sw);
+              // get { return this._{0}; }
+              EmitThis(sw);
+              sw.Write(".{0}{1}", InternalFieldPrefix, f.GetCompileName(Options));
+            }
+            {
+              // set { this._{0} = value; }
+              EmitThis(wSet);
+              wSet.Write(".{0}{1}", InternalFieldPrefix, f.GetCompileName(Options));
+              var sw = EmitAssignmentRhs(wSet);
+              sw = EmitCoercionIfNecessary(f.Type, fType, f.Origin, sw);
+              EmitSetterParameter(sw);
+            }
+          } else if (member is Function fn) {
+            if (!IsExternallyImported(fn) && canRedeclareMemberDefinedInTrait) {
+              Contract.Assert(fn.Body != null);
+              var w = classWriter.CreateFunction(IdName(fn), CombineAllTypeArguments(fn), fn.Ins, fn.ResultType, fn.Origin, fn.IsStatic, true, fn, true, false);
+              w = EmitReturnExpr(w);
+              EmitCallToInheritedFunction(fn, null, w);
+            }
+          } else if (member is Method method) {
+            if (!IsExternallyImported(method)
+                && canRedeclareMemberDefinedInTrait) {
+              Contract.Assert(method.Body != null);
+              var w = classWriter.CreateMethod(method, CombineAllTypeArguments(member), true, true, false);
+              var wBefore = w.Fork();
+              var wCall = w.Fork();
+              var wAfter = w;
+              EmitCallToInheritedMethod(method, null, wCall, wBefore, wAfter);
+            }
+          } else {
+            Contract.Assert(false);  // unexpected member
+          }
+        }
+        thisContext = null;
+      }
+
+      foreach (MemberDecl memberx in c.Members) {
+        enclosingDeclaration = memberx;
+        var member = (memberx as Function)?.ByMethodDecl ?? memberx;
+        if (!member.IsStatic) {
+          thisContext = c;
+        }
+        if (c is TraitDecl && member.OverriddenMember != null && !member.IsOverrideThatAddsBody) {
+          if (!member.IsGhost && TraitRepeatsInheritedDeclarations) {
+            RedeclareInheritedMember(member, classWriter);
+          } else {
+            // emit nothing in the trait; this member will be emitted in the classes that extend this trait
+          }
+        } else if (member is Field) {
+          var f = (Field)member;
+          if (f.IsGhost) {
+            // emit nothing
+          } else if (!Options.DisallowExterns && Attributes.Contains(f.Attributes, "extern")) {
+            // emit nothing
+          } else if (f is ConstantField) {
+            var cf = (ConstantField)f;
+            if (cf.IsStatic && !SupportsStaticsInGenericClasses && cf.EnclosingClass.TypeArgs.Count != 0) {
+              var wBody = classWriter.CreateFunction(IdName(cf), CombineAllTypeArguments(cf), new List<Formal>(), cf.Type, cf.Origin, true, true, member, false, false);
+              Contract.Assert(wBody != null);  // since the previous line asked for a body
+              if (cf.Rhs != null) {
+                CompileReturnBody(cf.Rhs, f.Type, wBody, null);
+              } else {
+                EmitReturnExpr(PlaceboValue(cf.Type, wBody, cf.Origin, true), wBody);
+              }
+            } else {
+              ConcreteSyntaxTree wBody;
+              if (cf.IsStatic) {
+                wBody = CreateFunctionOrGetter(cf, IdName(cf), c, true, true, false, classWriter);
+                Contract.Assert(wBody != null);  // since the previous line asked for a body
+              } else if (NeedsCustomReceiver(cf)) {
+                // An instance field in a newtype needs to be modeled as a static function that takes a parameter,
+                // because a newtype value is always represented as some existing type.
+                // Likewise, an instance const with a RHS in a trait needs to be modeled as a static function (in the companion class)
+                // that takes a parameter, because trait-equivalents in target languages don't allow implementations.
+                wBody = classWriter.CreateFunction(IdName(cf), CombineAllTypeArguments(cf), new List<Formal>(), cf.Type, cf.Origin, InstanceConstAreStatic(), true, cf, false, true);
+                Contract.Assert(wBody != null);  // since the previous line asked for a body
+                if (c is TraitDecl) {
+                  // also declare a function for the field in the interface
+                  var wBodyInterface = CreateFunctionOrGetter(cf, IdName(cf), c, false, false, false, classWriter);
+                  Contract.Assert(wBodyInterface == null);  // since the previous line said not to create a body
+                }
+              } else if (c is TraitDecl) {
+                wBody = CreateFunctionOrGetter(cf, IdName(cf), c, false, false, false, classWriter);
+                Contract.Assert(wBody == null);  // since the previous line said not to create a body
+              } else if (cf.Rhs == null && c is ClassLikeDecl) {
+                // create a backing field, since this constant field may be assigned in constructors
+                classWriter.DeclareField(InternalFieldPrefix + f.GetCompileName(Options), c, false, false, f.Type, f.Origin, PlaceboValue(f.Type, errorWr, f.Origin, true), f);
+                wBody = CreateFunctionOrGetter(cf, IdName(cf), c, false, true, false, classWriter);
+                Contract.Assert(wBody != null);  // since the previous line asked for a body
+              } else {
+                wBody = CreateFunctionOrGetter(cf, IdName(cf), c, false, true, false, classWriter);
+                Contract.Assert(wBody != null);  // since the previous line asked for a body
+              }
+              if (wBody != null) {
+                if (cf.Rhs != null) {
+                  CompileReturnBody(cf.Rhs, cf.Type, wBody, null);
+                } else if (!cf.IsStatic && c is ClassLikeDecl) {
+                  var sw = EmitReturnExpr(wBody);
+                  var typeSubst = new Dictionary<TypeParameter, Type>();
+                  cf.EnclosingClass.TypeArgs.ForEach(tp => typeSubst.Add(tp, (Type)new UserDefinedType(tp)));
+                  var typeArgs = CombineAllTypeArguments(cf);
+                  EmitMemberSelect(wr => EmitThis(wr), UserDefinedType.FromTopLevelDecl(c.Origin, c), cf,
+                    typeArgs, typeSubst, f.Type, internalAccess: true).EmitRead(sw);
+                } else {
+                  EmitReturnExpr(PlaceboValue(cf.Type, wBody, cf.Origin, true), wBody);
+                }
+              }
+            }
+          } else if (c is TraitDecl) {
+            var wGet = classWriter.CreateGetterSetter(IdName(f), f.Type, f.Origin, false, member, out var wSet, false);
+            Contract.Assert(wSet == null && wGet == null);  // since the previous line specified no body
+          } else {
+            // A trait field is just declared, not initialized. Any other field gets a default value if field's type is an auto-init type and
+            // gets a placebo value if the field's type is not an auto-init type.
+            var rhs = c is TraitDecl ? null : PlaceboValue(f.Type, errorWr, f.Origin, true);
+            classWriter.DeclareField(IdName(f), c, f.IsStatic, false, f.Type, f.Origin, rhs, f);
+          }
+          if (f is ConstantField && ((ConstantField)f).Rhs != null) {
+            v.Visit(((ConstantField)f).Rhs);
+          }
+        } else if (member is Function) {
+          var f = (Function)member;
+          if (f.IsGhost) {
+            if (Attributes.Contains(f.Attributes, "test")) {
+              Error(ErrorId.c_test_function_must_be_compilable, f.Origin,
+                "Function {0} must be compiled to use the {{:test}} attribute", errorWr, f.FullName);
+            }
+          } else if (f.IsVirtual) {
+            if (f.OverriddenMember == null) {
+              var w = classWriter.CreateFunction(IdName(f), CombineAllTypeArguments(f), f.Ins, f.ResultType, f.Origin, false, false, f, false, false);
+              Contract.Assert(w == null); // since we requested no body
+            } else if (TraitRepeatsInheritedDeclarations) {
+              RedeclareInheritedMember(f, classWriter);
+            }
+            if (f.Body != null) {
+              CompileFunction(f, classWriter, true);
+            }
+          } else if (IsExternallyImported(f)) {
+            if (IncludeExternallyImportedMembers) {
+              CompileFunction(f, classWriter, false);
+            }
+          } else if (f.Body == null) {
+            Error(ErrorId.c_function_has_no_body, f.Origin, "Function {0} has no body so it cannot be compiled", errorWr, f.FullName);
+          } else if (c is NewtypeDecl && f != f.Original) {
+            CompileFunction(f, classWriter, false);
+            var w = classWriter.CreateFunction(IdName(f), CombineAllTypeArguments(f), f.Ins, f.ResultType, f.Origin,
+              false, true, f, true, false);
+            w = EmitReturnExpr(w);
+            EmitCallToInheritedFunction(f, c, w);
+          } else {
+            CompileFunction(f, classWriter, false);
+          }
+          v.Visit(f);
+        } else if (member is Method m) {
+          if (Attributes.Contains(m.Attributes, "synthesize")) {
+            if (m.IsStatic && m.Outs.Count > 0 && m.Body == null) {
+              classWriter.SynthesizeMethod(m, CombineAllTypeArguments(m), true, true, false);
+            } else {
+              Error(ErrorId.c_invalid_synthesize_method, m.Origin,
+                "Method {0} is annotated with :synthesize but is not static, has a body, or does not return anything",
+                errorWr, m.FullName);
+            }
+          } else if (m.IsGhost) {
+          } else if (m.IsVirtual) {
+            if (m.OverriddenMember == null) {
+              var w = classWriter.CreateMethod(m, CombineAllTypeArguments(m), false, false, false);
+              Contract.Assert(w == null); // since we requested no body
+            } else if (TraitRepeatsInheritedDeclarations) {
+              RedeclareInheritedMember(m, classWriter);
+            }
+            if (m.Body != null) {
+              CompileMethod(program, m, classWriter, true);
+            }
+          } else if (m.IsExtern(Options) && m.Body == null) {
+            if (IncludeExternallyImportedMembers) {
+              CompileMethod(program, m, classWriter, false);
+            }
+          } else if (m.Body == null) {
+            Error(ErrorId.c_method_has_no_body, m.Origin, "Method {0} has no body so it cannot be compiled", errorWr, m.FullName);
+          } else if (c is NewtypeDecl && m != m.Original) {
+            CompileMethod(program, m, classWriter, false);
+            var w = classWriter.CreateMethod(m, CombineAllTypeArguments(member), true, true, false);
+            var wBefore = w.Fork();
+            var wCall = w.Fork();
+            var wAfter = w;
+            EmitCallToInheritedMethod(m, c, wCall, wBefore, wAfter);
+          } else {
+            CompileMethod(program, m, classWriter, false);
+          }
+          v.Visit(m);
+        } else {
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected member
+        }
+
+        thisContext = null;
+      }
+    }
+
+    protected ConcreteSyntaxTree /*?*/ CreateFunctionOrGetter(ConstantField cf, string name, TopLevelDecl enclosingDecl, bool isStatic,
+      bool createBody, bool forBodyInheritance, IClassWriter classWriter) {
+      var typeArgs = CombineAllTypeArguments(cf);
+      var typeDescriptors = ForTypeDescriptors(typeArgs, cf.EnclosingClass, cf, false);
+      if (NeedsTypeDescriptors(typeDescriptors)) {
+        return classWriter.CreateFunction(name, typeArgs, new List<Formal>(), cf.Type, cf.Origin, isStatic, createBody, cf, forBodyInheritance, false);
+      } else {
+        return classWriter.CreateGetter(name, enclosingDecl, cf.Type, cf.Origin, isStatic, true, createBody, cf, forBodyInheritance);
+      }
+    }
+
+    private void RedeclareInheritedMember(MemberDecl member, IClassWriter classWriter) {
+      Contract.Requires(member != null);
+      Contract.Requires(classWriter != null);
+
+      if (member is ConstantField cf) {
+        var wBody = CreateFunctionOrGetter(cf, IdName(cf), member.EnclosingClass, false, false, false, classWriter);
+        Contract.Assert(wBody == null); // since the previous line said not to create a body
+      } else if (member is Field field) {
+        var wGet = classWriter.CreateGetterSetter(IdName(field), field.Type, field.Origin, false, member, out var wSet, false);
+        Contract.Assert(wGet == null && wSet == null); // since the previous line said not to create a body
+      } else if (member is Function) {
+        var fn = ((Function)member).Original;
+        var wBody = classWriter.CreateFunction(IdName(fn), CombineAllTypeArguments(fn), fn.Ins, fn.ResultType, fn.Origin, fn.IsStatic, false, fn, false, false);
+        Contract.Assert(wBody == null); // since the previous line said not to create a body
+      } else if (member is Method) {
+        var method = ((Method)member).Original;
+        var wBody = classWriter.CreateMethod(method, CombineAllTypeArguments(method), false, false, false);
+        Contract.Assert(wBody == null); // since the previous line said not to create a body
+      } else {
+        Contract.Assert(false); // unexpected member
+      }
+    }
+
+    protected void EmitCallToInheritedConstRHS(ConstantField f, ConcreteSyntaxTree wr) {
+      Contract.Requires(f != null);
+      Contract.Requires(!f.IsStatic);
+      Contract.Requires(f.EnclosingClass is TraitDecl);
+      Contract.Requires(f.Rhs != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(thisContext != null);
+
+      var fOriginal = f;
+
+      // In a target language that requires type coercions, the function declared in "thisContext" has
+      // the same signature as in "fOriginal.EnclosingClass".
+      wr = EmitReturnExpr(wr);
+      wr = EmitCoercionIfNecessary(f.Type, fOriginal.Type, f.Origin, wr);
+
+      var calleeReceiverType = UserDefinedType.FromTopLevelDecl(f.Origin, f.EnclosingClass).Subst(thisContext.ParentFormalTypeParametersToActuals);
+      wr.Write("{0}{1}", TypeName_Companion(calleeReceiverType, wr, f.Origin, f), StaticClassAccessor);
+      var typeArgs = CombineAllTypeArguments(f, thisContext);
+      EmitNameAndActualTypeArgs(IdName(f), TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, f, true)),
+        f.Origin, new ThisExpr(thisContext), true, wr);
+      wr.Write("(");
+      var sep = "";
+      EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, f.EnclosingClass, f, true), f.Origin, wr, ref sep);
+
+      wr.Write(sep);
+      var w = EmitCoercionIfNecessary(UserDefinedType.FromTopLevelDecl(f.Origin, thisContext), calleeReceiverType, f.Origin, wr);
+      EmitThis(w, true);
+      wr.Write(")");
+    }
+
+    /// <summary>
+    /// "heir" is the type declaration that inherits the function. Or, it can be "null" to indicate that the function is declared in
+    /// the type itself, in which case the "call to inherited" is actually a call from the dynamically dispatched function to its implementation.
+    /// </summary>
+    protected virtual void EmitCallToInheritedFunction(Function f, [CanBeNull] TopLevelDeclWithMembers heir, ConcreteSyntaxTree wr) {
+      Contract.Requires(f != null);
+      Contract.Requires(!f.IsStatic);
+      Contract.Requires(f.EnclosingClass is TraitDecl);
+      Contract.Requires(f.Body != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(thisContext != null);
+
+      // There are three types involved.
+      // First, "f.Original.EnclosingClass" is the trait where the function was first declared.
+      // In descendant traits from there on, the function may occur several times, each time with
+      // a strengthening of the specification. Those traits do not play a role here.
+      // Second, there is "f.EnclosingClass", which is the trait where the function is given a body.
+      // Often, "f.EnclosingClass" and "f.Original.EnclosingClass" will be the same.
+      // Third and finally, there is "thisContext", which is the class that inherits "f" and its
+      // implementation, and for which we're about to generate a call to the body compiled for "f".
+
+      // In a target language that requires type coercions, the function declared in "thisContext" has
+      // the same signature as in "f.Original.EnclosingClass".
+      wr = EmitCoercionIfNecessary(f.ResultType, f.Original.ResultType, f.Origin, wr);
+
+      var companionName = CompanionMemberIdName(f);
+      var calleeReceiverType = UserDefinedType.FromTopLevelDecl(f.Origin, f.EnclosingClass).Subst(thisContext.ParentFormalTypeParametersToActuals);
+      wr.Write("{0}{1}", TypeName_Companion(calleeReceiverType, wr, f.Origin, f), StaticClassAccessor);
+      var typeArgs = CombineAllTypeArguments(f, thisContext);
+      EmitNameAndActualTypeArgs(
+        companionName, TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, f, true)),
+      f.Origin, new ThisExpr(thisContext), true, wr);
+      wr.Write("(");
+      var sep = "";
+      EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, f.EnclosingClass, f, true), f.Origin, wr, ref sep);
+
+      wr.Write(sep);
+      var w = EmitCoercionIfNecessary(UserDefinedType.FromTopLevelDecl(f.Origin, thisContext), calleeReceiverType, f.Origin, wr);
+      EmitThis(heir != null ? FromFatPointer(UserDefinedType.FromTopLevelDecl(f.Origin, heir), w) : w, true);
+      sep = ", ";
+
+      for (int j = 0, l = 0; j < f.Ins.Count; j++) {
+        var p = f.Ins[j];
+        if (!p.IsGhost) {
+          wr.Write(sep);
+          w = EmitCoercionIfNecessary(f.Original.Ins[j].Type, f.Ins[j].Type, f.Origin, wr);
+          EmitIdentifier(IdName(p), w);
+          sep = ", ";
+          l++;
+        }
+      }
+      wr.Write(")");
+    }
+
+    protected virtual void EmitCallReturnOuts(List<string> outTmps, ConcreteSyntaxTree wr) {
+      wr.Write("{0} = ", Util.Comma(outTmps));
+    }
+
+    protected virtual void EmitMultiReturnTuple(List<Formal> outs, List<Type> outTypes, List<string> outTmps, IOrigin methodToken, ConcreteSyntaxTree wr) {
+      var wrReturn = EmitReturnExpr(wr);
+      var sep = "";
+      for (int j = 0, l = 0; j < outs.Count; j++) {
+        var p = outs[j];
+        if (!p.IsGhost) {
+          wrReturn.Write(sep);
+          var w = EmitCoercionIfNecessary(outs[j].Type, outTypes[l], methodToken, wrReturn);
+          w.Write(outTmps[l]);
+          sep = ", ";
+          l++;
+        }
+      }
+    }
+
+    /// <summary>
+    /// "heir" is the type declaration that inherits the method. Or, it can be "null" to indicate that the method is declared in
+    /// the type itself, in which case the "call to inherited" is actually a call from the dynamically dispatched method to its implementation.
+    /// </summary>
+    protected virtual void EmitCallToInheritedMethod(Method method, [CanBeNull] TopLevelDeclWithMembers heir, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, ConcreteSyntaxTree wStmtsAfterCall) {
+      Contract.Requires(method != null);
+      Contract.Requires(!method.IsStatic);
+      Contract.Requires(method.EnclosingClass is TraitDecl);
+      Contract.Requires(method.Body != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(thisContext != null);
+
+      // There are three types involved. See comment in EmitCallToInheritedFunction.
+
+      var nonGhostOutParameterCount = method.Outs.Count(p => !p.IsGhost);
+      var returnStyleOuts = UseReturnStyleOuts(method, nonGhostOutParameterCount);
+      var returnStyleOutCollector = nonGhostOutParameterCount > 1 && returnStyleOuts && !SupportsMultipleReturns ? ProtectedFreshId("_outcollector") : null;
+
+      var outTmps = new List<string>();  // contains a name for each non-ghost formal out-parameter
+      var outTypes = new List<Type>();  // contains a type for each non-ghost formal out-parameter
+      for (int i = 0; i < method.Outs.Count; i++) {
+        Formal p = method.Outs[i];
+        if (!p.IsGhost) {
+          var target = returnStyleOutCollector != null ? IdName(p) : ProtectedFreshId("_out");
+          outTmps.Add(target);
+          outTypes.Add(p.Type);
+          DeclareLocalVar(target, p.Type, p.Origin, false, null, wStmts);
+        }
+      }
+      Contract.Assert(outTmps.Count == nonGhostOutParameterCount && outTypes.Count == nonGhostOutParameterCount);
+
+      if (returnStyleOutCollector != null) {
+        DeclareSpecificOutCollector(returnStyleOutCollector, wr, outTypes, outTypes);
+      } else if (nonGhostOutParameterCount > 0 && returnStyleOuts) {
+        EmitCallReturnOuts(outTmps, wr);
+      }
+
+      var companionName = CompanionMemberIdName(method);
+      var calleeReceiverType = UserDefinedType.FromTopLevelDecl(method.Origin, method.EnclosingClass).Subst(thisContext.ParentFormalTypeParametersToActuals);
+      EmitTypeName_Companion(calleeReceiverType, wr, wr, method.Origin, method);
+      wr.Write(StaticClassAccessor);
+
+      var typeArgs = CombineAllTypeArguments(method, thisContext);
+      EmitNameAndActualTypeArgs(companionName, TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, method, true)),
+        method.Origin, new ThisExpr(thisContext), true, wr);
+      wr.Write("(");
+      var sep = "";
+      EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, method.EnclosingClass, method, true), method.Origin, wr, ref sep);
+
+      wr.Write(sep);
+      var w = EmitCoercionIfNecessary(UserDefinedType.FromTopLevelDecl(method.Origin, thisContext), calleeReceiverType, method.Origin, wr);
+      EmitThis(heir != null ? FromFatPointer(UserDefinedType.FromTopLevelDecl(method.Origin, heir), w) : w, true);
+      sep = ", ";
+
+      for (int j = 0, l = 0; j < method.Ins.Count; j++) {
+        var p = method.Ins[j];
+        if (!p.IsGhost) {
+          wr.Write(sep);
+          w = EmitCoercionIfNecessary(method.Original.Ins[j].Type, method.Ins[j].Type, method.Origin, wr);
+          EmitIdentifier(IdName(p), w);
+          sep = ", ";
+          l++;
+        }
+      }
+
+      if (!returnStyleOuts) {
+        foreach (var outTmp in outTmps) {
+          wr.Write(sep);
+          EmitActualOutArg(outTmp, wr);
+          sep = ", ";
+        }
+      }
+      wr.Write(')');
+      EndStmt(wr);
+
+      if (returnStyleOutCollector != null) {
+        EmitCastOutParameterSplits(returnStyleOutCollector, outTmps, wStmtsAfterCall, outTypes, outTypes, method.Origin);
+        EmitReturn(method.Outs, wStmtsAfterCall);
+      } else if (!returnStyleOuts) {
+        for (int j = 0, l = 0; j < method.Outs.Count; j++) {
+          var p = method.Outs[j];
+          if (!p.IsGhost) {
+            EmitAssignment(IdName(p), method.Outs[j].Type, outTmps[l], outTypes[l], wStmtsAfterCall);
+            l++;
+          }
+        }
+      } else {
+        EmitMultiReturnTuple(method.Outs, outTypes, outTmps, method.Origin, wStmtsAfterCall);
+      }
+    }
+
+    protected List<TypeArgumentInstantiation> CombineAllTypeArguments(MemberDecl member) {
+      Contract.Requires(member != null);
+      var classActuals = member.EnclosingClass.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
+      var memberActuals = member is ICallable ic ? ic.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp)) : null;
+      return CombineAllTypeArguments(member, classActuals, memberActuals);
+    }
+
+    protected List<TypeArgumentInstantiation> CombineAllTypeArguments(MemberDecl member, TopLevelDeclWithMembers receiverContext) {
+      Contract.Requires(member is ICallable);
+      Contract.Requires(receiverContext != null);
+      var classActuals = member.EnclosingClass.TypeArgs.ConvertAll(tp => receiverContext.ParentFormalTypeParametersToActuals[tp]);
+      var memberActuals = ((ICallable)member).TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
+      return CombineAllTypeArguments(member, classActuals, memberActuals);
+    }
+
+    protected List<TypeArgumentInstantiation> CombineAllTypeArguments(MemberDecl member, List<Type> typeArgsEnclosingClass, List<Type> typeArgsMember) {
+      Contract.Requires(member != null);
+      Contract.Requires(typeArgsEnclosingClass != null);
+      Contract.Requires(typeArgsMember != null);
+
+      return TypeArgumentInstantiation.ListFromMember(member, typeArgsEnclosingClass, typeArgsMember);
+    }
+
+    protected int WriteRuntimeTypeDescriptorsFormals(List<TypeArgumentInstantiation> typeParams,
+      ConcreteSyntaxTree wr, ref string prefix, Func<TypeParameter, string> formatter) {
+      Contract.Requires(typeParams != null);
+      Contract.Requires(prefix != null);
+      Contract.Requires(wr != null);
+      Contract.Ensures(Contract.ValueAtReturn(out prefix) != null);
+
+      var c = 0;
+      foreach (var ta in typeParams) {
+        var tp = ta.Formal;
+        if (NeedsTypeDescriptor(tp)) {
+          var formatted = formatter(tp);
+          wr.Write($"{prefix}{formatted}");
+          prefix = ", ";
+
+          c++;
+        }
+      }
+      return c;
+    }
+
+    /// <summary>
+    /// Check whether two declarations have the same name if capitalized.
+    /// </summary>
+    /// <param name="canChange">The declarations to check.</param>
+    /// <param name="cantChange">Additional declarations which may conflict, but which can't be given different names.  For example, these may be the inherited members of a class.</param>
+    /// <remarks>
+    /// If two elements of <paramref name="canChange"/> have the same
+    /// capitalization, the lowercase one will get a
+    /// <c>{:_capitalizationConflict}</c> attribute.  If
+    /// <paramref name="cantChange"/> is given and one of its elements conflicts
+    /// with one from <paramref name="canChange"/>, the element from
+    /// <paramref name="canChange"/> gets the attribute whether it is lowercase
+    /// or not.
+    /// </remarks>
+    /// <seealso cref="HasCapitalizationConflict"/>
+    private void CheckForCapitalizationConflicts<T>(IEnumerable<T> canChange, IEnumerable<T> cantChange = null) where T : Declaration {
+      if (cantChange == null) {
+        cantChange = Enumerable.Empty<T>();
+      }
+      IDictionary<string, T> declsByCapName = new Dictionary<string, T>();
+      ISet<string> fixedNames = new HashSet<string>(from decl in cantChange select Capitalize(decl.GetCompileName(Options)));
+
+      foreach (var decl in canChange) {
+        var name = decl.GetCompileName(Options);
+        var capName = Capitalize(name);
+        if (name == capName) {
+          if (fixedNames.Contains(name)) {
+            // Normally we mark the lowercase one, but in this case we can't change that one
+            MarkCapitalizationConflict(decl);
+          } else {
+            if (declsByCapName.TryGetValue(name, out var other)) {
+              // Presume that the other is the lowercase one
+              MarkCapitalizationConflict(other);
+            } else {
+              declsByCapName.Add(name, decl);
+            }
+          }
+        } else {
+          if (declsByCapName.ContainsKey(capName)) {
+            MarkCapitalizationConflict(decl);
+          } else {
+            declsByCapName.Add(capName, decl);
+          }
+        }
+      }
+    }
+
+    protected string Capitalize(string str) {
+      if (!str.Any(c => c != '_')) {
+        return PrefixForForcedCapitalization + str;
+      }
+      var origStr = str;
+      while (str.StartsWith("_")) {
+        str = str.Substring(1) + "_";
+      }
+      if (!char.IsLetter(str[0])) {
+        return PrefixForForcedCapitalization + origStr;
+      } else {
+        return char.ToUpper(str[0]) + str.Substring(1);
+      }
+    }
+
+    protected virtual string PrefixForForcedCapitalization { get => "Cap_"; }
+
+    private static void MarkCapitalizationConflict(Declaration decl) {
+      decl.Attributes = new Attributes(CapitalizationConflictAttribute, new List<Expression>(), decl.Attributes);
+    }
+
+    protected static bool HasCapitalizationConflict(Declaration decl) {
+      return Attributes.Contains(decl.Attributes, CapitalizationConflictAttribute);
+    }
+
+    private static readonly string CapitalizationConflictAttribute = "_capitalizationConflict";
+
+    private void CompileFunction(Function f, IClassWriter cw, bool lookasideBody) {
+      Contract.Requires(f != null);
+      Contract.Requires(cw != null);
+      Contract.Requires(f.Body != null || (IncludeExternallyImportedMembers && Attributes.Contains(f.Attributes, "extern")));
+
+      var w = cw.CreateFunction(IdName(f), CombineAllTypeArguments(f),
+        f.Ins, f.ResultType, f.Origin, f.IsStatic,
+        !IsExternallyImported(f), f, false, lookasideBody);
+      if (w != null) {
+        IVariable accVar = null;
+        if (f.IsTailRecursive) {
+          if (f.IsAccumulatorTailRecursive) {
+            accVar = new LocalVariable(f.Origin, "_accumulator", f.ResultType, false) {
+              type = f.ResultType
+            };
+            var resultType = f.ResultType.NormalizeToAncestorType();
+            Expression unit;
+            if (resultType.IsNumericBased(Type.NumericPersuasion.Int) || resultType.IsBigOrdinalType) {
+              unit = new LiteralExpr(f.Origin, f.TailRecursion == Function.TailStatus.Accumulate_Mul ? 1 : 0);
+              unit.Type = f.ResultType;
+            } else if (resultType.IsNumericBased(Type.NumericPersuasion.Real)) {
+              unit = new LiteralExpr(f.Origin, f.TailRecursion == Function.TailStatus.Accumulate_Mul ? BigDec.FromInt(1) : BigDec.ZERO);
+              unit.Type = f.ResultType;
+            } else if (resultType.IsBitVectorType) {
+              var n = f.TailRecursion == Function.TailStatus.Accumulate_Mul ? 1 : 0;
+              unit = new LiteralExpr(f.Origin, n);
+              unit.Type = f.ResultType;
+            } else if (resultType.AsSetType != null) {
+              unit = new SetDisplayExpr(f.Origin, !resultType.IsISetType, new List<Expression>());
+              unit.Type = f.ResultType;
+            } else if (resultType.AsMultiSetType != null) {
+              unit = new MultiSetDisplayExpr(f.Origin, new List<Expression>());
+              unit.Type = f.ResultType;
+            } else if (resultType.AsSeqType != null) {
+              unit = new SeqDisplayExpr(f.Origin, new List<Expression>());
+              unit.Type = f.ResultType;
+            } else {
+              Contract.Assert(false);  // unexpected type
+              throw new cce.UnreachableException();
+            }
+            DeclareLocalVar(IdName(accVar), accVar.Type, f.Origin, unit, false, w);
+          }
+          w = EmitTailCallStructure(f, w);
+        }
+        Coverage.Instrument(f.Body.Origin, $"entry to function {f.FullName}", w);
+        Contract.Assert(enclosingFunction == null);
+        enclosingFunction = f;
+        CompileReturnBody(f.Body, f.OriginalResultTypeWithRenamings(), w, accVar);
+        Contract.Assert(enclosingFunction == f);
+        enclosingFunction = null;
+      }
+    }
+
+    public const string STATIC_ARGS_NAME = "args";
+
+    private void CompileMethod(Program program, Method m, IClassWriter cw, bool lookasideBody) {
+      Contract.Requires(cw != null);
+      Contract.Requires(m != null);
+      Contract.Requires(m.Body != null || (IncludeExternallyImportedMembers && Attributes.Contains(m.Attributes, "extern")));
+
+      var w = cw.CreateMethod(m, CombineAllTypeArguments(m), !IsExternallyImported(m), false, lookasideBody);
+      if (w != null) {
+        if (m.IsTailRecursive) {
+          w = EmitTailCallStructure(m, w);
+        }
+
+        Coverage.Instrument(m.Body.Origin, $"entry to method {m.FullName}", w);
+
+        var nonGhostOutsCount = m.Outs.Count(p => !p.IsGhost);
+
+        var useReturnStyleOuts = UseReturnStyleOuts(m, nonGhostOutsCount);
+        foreach (var p in m.Outs) {
+          if (!p.IsGhost) {
+            DeclareLocalOutVar(IdName(p), p.Type, p.Origin, PlaceboValue(p.Type, w, p.Origin, true), useReturnStyleOuts, w);
+          }
+        }
+
+        w = EmitMethodReturns(m, w);
+
+        if (m.Body == null) {
+          Error(ErrorId.c_method_has_no_body, m.Origin, "Method {0} has no body so it cannot be compiled", w, m.FullName);
+        } else {
+          Contract.Assert(enclosingMethod == null);
+          enclosingMethod = m;
+          if (m.Body is DividedBlockStmt dividedBlockStmt) {
+            TrDividedBlockStmt((Constructor)m, dividedBlockStmt, w);
+          } else {
+            TrStmtList(m.Body.Body, w);
+          }
+
+          Contract.Assert(enclosingMethod == m);
+          enclosingMethod = null;
+        }
+      }
+
+      HandleCompilingMainMethod(program, m, cw);
+    }
+
+    private void HandleCompilingMainMethod(Program program, Method m, IClassWriter cw) {
+      ConcreteSyntaxTree w;
+      if (m == program.MainMethod && IssueCreateStaticMain(m)) {
+        w = CreateStaticMain(cw, STATIC_ARGS_NAME);
+        var ty = UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(m.EnclosingClass);
+        LocalVariable receiver = null;
+        if (!m.IsStatic) {
+          receiver = new LocalVariable(m.Origin, "b", ty, false) {
+            type = ty
+          };
+          if (m.EnclosingClass is ClassLikeDecl) {
+            var wStmts = w.Fork();
+            var wRhs = DeclareLocalVar(IdName(receiver), ty, m.Origin, w);
+            EmitNew(ty, m.Origin, null, wRhs, wStmts);
+          } else {
+            TrLocalVar(receiver, true, w);
+          }
+        }
+        var typeArgs = CombineAllTypeArguments(m, ty.TypeArgs, m.TypeArgs.ConvertAll(tp => (Type)Type.Bool));
+        bool customReceiver = NeedsCustomReceiverNotTrait(m);
+
+        if (receiver != null && !customReceiver) {
+          w.Write("{0}.", IdName(receiver));
+        } else {
+          var companion = TypeName_Companion(UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(m.EnclosingClass), w, m.Origin, m);
+          w.Write("{0}.", companion);
+        }
+        EmitNameAndActualTypeArgs(IdName(m), TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, m, false)), m.Origin,
+          receiver == null ? null : new IdentifierExpr(receiver.Origin, receiver), customReceiver, w);
+        w.Write("(");
+        var sep = "";
+        if (receiver != null && customReceiver) {
+          EmitIdentifier(IdName(receiver), w);
+          sep = ", ";
+        }
+        EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, m.EnclosingClass, m, false), m.Origin, w, ref sep);
+        w.Write(sep + STATIC_ARGS_NAME);
+        w.Write(")");
+        EndStmt(w);
+      }
+    }
+
+    protected bool IsExternallyImported(Function f) {
+      return f.Body == null && f.IsExtern(Options, out _, out _);
+    }
+
+    protected bool IsExternallyImported(Method m) {
+      return m.Body == null && m.IsExtern(Options, out _, out _);
+    }
+
+    protected virtual bool IssueCreateStaticMain(Method m) {
+      return !m.IsStatic || m.EnclosingClass.TypeArgs.Count != 0;
+    }
+
+    /// <summary>
+    /// This method in a target statement-context version of "TrCasePattern", in the same way that "TrExprOpt" is a
+    /// target statement-context version of "Expr(...)" (see comment by "TrExprOpt").
+    /// </summary>
+    void TrCasePatternOpt<VT>(CasePattern<VT> pat, Expression rhs, ConcreteSyntaxTree wr, bool inLetExprBody)
+      where VT : class, IVariable {
+      TrCasePatternOpt(pat, rhs, null, rhs.Type, rhs.Origin, wr, inLetExprBody);
+    }
+
+    /// <summary>
+    /// This method in a target statement-context version of "TrCasePattern", in the same way that "TrExprOpt" is a
+    /// target statement-context version of "Expr(...)" (see comment by "TrExprOpt").
+    /// </summary>
+    void TrCasePatternOpt<VT>(CasePattern<VT> pat, Expression rhs, Action<ConcreteSyntaxTree> emitRhs, Type rhsType, IOrigin rhsTok, ConcreteSyntaxTree wr, bool inLetExprBody)
+      where VT : class, IVariable {
+      Contract.Requires(pat != null);
+      Contract.Requires(pat.Var != null || rhs != null || emitRhs != null);
+      Contract.Requires(rhs != null || emitRhs != null);
+      Contract.Requires(rhsType != null && rhsTok != null);
+
+      if (pat.Var != null) {
+        // The trivial Dafny "pattern" expression
+        //    var x := G
+        // is translated into C# as:
+        // var x := G;
+        var bv = pat.Var;
+        if (!bv.IsGhost) {
+          var wStmts = wr.Fork();
+          var w = DeclareLocalVar(IdName(bv), bv.Type, rhsTok, wr);
+          if (rhs != null) {
+            w = EmitCoercionIfNecessary(rhs.Type, bv.Type, rhsTok, w);
+            w = EmitDowncastIfNecessary(rhs.Type, bv.Type, rhsTok, w);
+            EmitExpr(rhs, inLetExprBody, w, wStmts);
+          } else {
+            emitRhs(w);
+          }
+        }
+      } else if (pat.Arguments != null) {
+        // The Dafny "pattern" expression
+        //    var Pattern(x,y) := G
+        // is translated into C# as:
+        // var tmp := G;
+        // var x := dtorX(tmp);
+        // var y := dtorY(tmp);
+        var ctor = pat.Ctor;
+        Contract.Assert(ctor != null);  // follows from successful resolution
+        Contract.Assert(pat.Arguments.Count == ctor.Formals.Count);  // follows from successful resolution
+
+        // Create the temporary variable to hold G
+        var tmp_name = ProtectedFreshId("_let_tmp_rhs");
+        if (rhs != null) {
+          DeclareLocalVar(tmp_name, rhs.Type, rhs.Origin, rhs, inLetExprBody, wr);
+        } else {
+          var w = DeclareLocalVar(tmp_name, rhsType, rhsTok, wr);
+          emitRhs(w);
+        }
+
+        var dtv = (DatatypeValue)pat.Expr;
+        var substMap = TypeParameter.SubstitutionMap(ctor.EnclosingDatatype.TypeArgs, dtv.InferredTypeArgs);
+        var k = 0;  // number of non-ghost formals processed
+        for (int i = 0; i < pat.Arguments.Count; i++) {
+          var arg = pat.Arguments[i];
+          var formal = ctor.Formals[i];
+          if (formal.IsGhost) {
+            // nothing to compile, but do a sanity check
+            Contract.Assert(Contract.ForAll(arg.Vars, bv => bv.IsGhost));
+          } else {
+            Type targetType = formal.Type.Subst(substMap);
+            TrCasePatternOpt(arg, null, sw =>
+              EmitDestructor(wr => EmitIdentifier(tmp_name, wr), formal, k, ctor, () => dtv.InferredTypeArgs, arg.Expr.Type, sw),
+              targetType, pat.Expr.Origin, wr, inLetExprBody);
+            k++;
+          }
+        }
+      }
+    }
+
+    public record OptimizedExpressionContinuation(Action<Expression, Type, bool, ConcreteSyntaxTree> Continuation, bool PreventCaseFallThrough);
+
+    /// <summary>
+    /// This method compiles "expr" into a statement context of the target. This typically means that, for example, Dafny let-bound variables can
+    /// be compiled into local variables in the target code, and that Dafny if-then-else expressions can be compiled into if statements in the
+    /// target code.
+    /// In contrast, the "Expr(...)" method compiles its given expression into an expression context of the target. This can result in
+    /// more complicated constructions in target languages that don't support name bindings in expressions (like most of our target
+    /// languages) or that don't support if-then-else expressions (like Go).
+    /// Other than the syntactic differences in the target code, the idea is that "TrExprOpt(...)" and "Expr(...)" generate code with the
+    /// same semantics.
+    /// </summary>
+    protected void TrExprOpt(Expression expr, Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool inLetExprBody,
+      [CanBeNull] IVariable accumulatorVar, OptimizedExpressionContinuation continuation) {
+      Contract.Requires(expr != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(accumulatorVar == null || (enclosingFunction != null && enclosingFunction.IsAccumulatorTailRecursive));
+      Contract.Requires(continuation != null);
+
+      expr = expr.Resolved;
+      if (expr is LetExpr) {
+        var e = (LetExpr)expr;
+        if (e.Exact) {
+          for (int i = 0; i < e.LHSs.Count; i++) {
+            var lhs = e.LHSs[i];
+            if (Contract.Exists(lhs.Vars, bv => !bv.IsGhost)) {
+              TrCasePatternOpt(lhs, e.RHSs[i], wr, inLetExprBody);
+            }
+          }
+          TrExprOpt(e.Body, resultType, wr, wStmts, inLetExprBody, accumulatorVar, continuation);
+        } else {
+          // We haven't optimized the other cases, so fallback to normal compilation
+          continuation.Continuation(e, resultType, inLetExprBody, wr);
+        }
+
+      } else if (expr is ITEExpr) {
+        var e = (ITEExpr)expr;
+        switch (e.HowToCompile) {
+          case ITEExpr.ITECompilation.CompileJustThenBranch:
+            TrExprOpt(e.Thn, resultType, wr, wStmts, inLetExprBody, accumulatorVar, continuation);
+            break;
+          case ITEExpr.ITECompilation.CompileJustElseBranch:
+            TrExprOpt(e.Els, resultType, wr, wStmts, inLetExprBody, accumulatorVar, continuation);
+            break;
+          case ITEExpr.ITECompilation.CompileBothBranches:
+            var thn = EmitIf(out var guardWriter, true, wr);
+            EmitExpr(e.Test, inLetExprBody, guardWriter, wStmts);
+            Coverage.Instrument(e.Thn.Origin, "then branch", thn);
+            TrExprOpt(e.Thn, resultType, thn, wStmts, inLetExprBody, accumulatorVar, continuation);
+            ConcreteSyntaxTree els = wr;
+            if (!(e.Els is ITEExpr { HowToCompile: ITEExpr.ITECompilation.CompileBothBranches })) {
+              els = EmitBlock(wr);
+              Coverage.Instrument(e.Thn.Origin, "else branch", els);
+            }
+            TrExprOpt(e.Els, resultType, els, wStmts, inLetExprBody, accumulatorVar, continuation);
+            break;
+        }
+
+      } else if (expr is NestedMatchExpr nestedMatchExpr) {
+        TrOptNestedMatchExpr(nestedMatchExpr, resultType, wr, wStmts, inLetExprBody, accumulatorVar, continuation);
+      } else if (expr is MatchExpr) {
+        var e = (MatchExpr)expr;
+        //   var _source = E;
+        //   if (source.is_Ctor0) {
+        //     FormalType f0 = ((Dt_Ctor0)source._D).a0;
+        //     ...
+        //     return Body0;
+        //   } else if (...) {
+        //     ...
+        //   } else if (true) {
+        //     ...
+        //   }
+        string source = ProtectedFreshId("_source");
+        DeclareLocalVar(source, e.Source.Type, e.Source.Origin, e.Source, inLetExprBody, wr);
+        wStmts = wr.Fork();
+
+        if (e.Cases.Count == 0) {
+          // the verifier would have proved we never get here; still, we need some code that will compile
+          EmitAbsurd(null, wr);
+        } else {
+          int i = 0;
+          var sourceType = (UserDefinedType)e.Source.Type.NormalizeExpand();
+          foreach (MatchCaseExpr mc in e.Cases) {
+            var w = MatchCasePrelude(source, sourceType, mc.Ctor, mc.Arguments, i, e.Cases.Count, wr);
+            TrExprOpt(mc.Body, resultType, w, wStmts, inLetExprBody, accumulatorVar, continuation);
+            i++;
+          }
+        }
+
+      } else if (expr is StmtExpr) {
+        var e = (StmtExpr)expr;
+        TrExprOpt(e.E, resultType, wr, wStmts, inLetExprBody, accumulatorVar, continuation);
+
+      } else if (expr is FunctionCallExpr fce && fce.Function == enclosingFunction && enclosingFunction.IsTailRecursive) {
+        var e = fce;
+        // compile call as tail-recursive
+        Contract.Assert(!inLetExprBody); // a tail call had better not sit inside a target-code lambda
+        TrTailCall(e.Origin, e.Function.IsStatic, e.Function.Ins, e.Receiver, e.Args, wr);
+
+      } else if (expr is BinaryExpr bin
+                 && bin.AccumulatesForTailRecursion != BinaryExpr.AccumulationOperand.None
+                 && enclosingFunction is { IsAccumulatorTailRecursive: true }
+                 && accumulatorVar != null) {
+        Expression tailTerm;
+        Expression rhs;
+        var acc = new IdentifierExpr(expr.Origin, accumulatorVar);
+        if (bin.AccumulatesForTailRecursion == BinaryExpr.AccumulationOperand.Left) {
+          rhs = new BinaryExpr(bin.Origin, bin.ResolvedOp, acc, bin.E0);
+          tailTerm = bin.E1;
+        } else {
+          switch (bin.ResolvedOp) {
+            case BinaryExpr.ResolvedOpcode.Sub:
+              rhs = new BinaryExpr(bin.Origin, BinaryExpr.ResolvedOpcode.Add, bin.E1, acc);
+              break;
+            case BinaryExpr.ResolvedOpcode.SetDifference:
+              rhs = new BinaryExpr(bin.Origin, BinaryExpr.ResolvedOpcode.Union, bin.E1, acc);
+              break;
+            case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+              rhs = new BinaryExpr(bin.Origin, BinaryExpr.ResolvedOpcode.MultiSetUnion, bin.E1, acc);
+              break;
+            default:
+              rhs = new BinaryExpr(bin.Origin, bin.ResolvedOp, bin.E1, acc);
+              break;
+          }
+          tailTerm = bin.E0;
+        }
+        var wRhs = EmitAssignment(VariableLvalue(accumulatorVar), enclosingFunction.ResultType, enclosingFunction.ResultType, wr, expr.Origin);
+        EmitExpr(rhs, false, wRhs, wStmts);
+        TrExprOpt(tailTerm, resultType, wr, wStmts, inLetExprBody, accumulatorVar, continuation);
+
+      } else {
+        // We haven't optimized any other cases, so fallback to normal compilation
+        if (enclosingFunction != null && enclosingFunction.IsAccumulatorTailRecursive && accumulatorVar != null) {
+          // Include the accumulator
+          var acc = new IdentifierExpr(expr.Origin, accumulatorVar);
+          switch (enclosingFunction.TailRecursion) {
+            case Function.TailStatus.Accumulate_Add:
+              expr = new BinaryExpr(expr.Origin, BinaryExpr.ResolvedOpcode.Add, expr, acc);
+              break;
+            case Function.TailStatus.AccumulateRight_Sub:
+              expr = new BinaryExpr(expr.Origin, BinaryExpr.ResolvedOpcode.Sub, expr, acc);
+              break;
+            case Function.TailStatus.Accumulate_Mul:
+              expr = new BinaryExpr(expr.Origin, BinaryExpr.ResolvedOpcode.Mul, expr, acc);
+              break;
+            case Function.TailStatus.Accumulate_SetUnion:
+              expr = new BinaryExpr(expr.Origin, BinaryExpr.ResolvedOpcode.Union, expr, acc);
+              break;
+            case Function.TailStatus.AccumulateRight_SetDifference:
+              expr = new BinaryExpr(expr.Origin, BinaryExpr.ResolvedOpcode.SetDifference, expr, acc);
+              break;
+            case Function.TailStatus.Accumulate_MultiSetUnion:
+              expr = new BinaryExpr(expr.Origin, BinaryExpr.ResolvedOpcode.MultiSetUnion, expr, acc);
+              break;
+            case Function.TailStatus.AccumulateRight_MultiSetDifference:
+              expr = new BinaryExpr(expr.Origin, BinaryExpr.ResolvedOpcode.MultiSetDifference, expr, acc);
+              break;
+            case Function.TailStatus.AccumulateLeft_Concat:
+              expr = new BinaryExpr(expr.Origin, BinaryExpr.ResolvedOpcode.Concat, acc, expr); // note order of operands
+              break;
+            case Function.TailStatus.AccumulateRight_Concat:
+              expr = new BinaryExpr(expr.Origin, BinaryExpr.ResolvedOpcode.Concat, expr, acc);
+              break;
+            default:
+              Contract.Assert(false); // unexpected TailStatus
+              throw new cce.UnreachableException();
+          }
+        } else {
+          Contract.Assert(accumulatorVar == null);
+        }
+
+        continuation.Continuation(expr, resultType, inLetExprBody, wr);
+      }
+    }
+
+    void CompileReturnBody(Expression body, Type resultType, ConcreteSyntaxTree wr, [CanBeNull] IVariable accumulatorVar) {
+      Contract.Requires(body != null);
+      Contract.Requires(resultType != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(accumulatorVar == null || (enclosingFunction != null && enclosingFunction.IsAccumulatorTailRecursive));
+      copyInstrWriters.Push(wr.Fork());
+      var wStmts = wr.Fork();
+      var continuation = new OptimizedExpressionContinuation(EmitReturnExpr, false);
+      TrExprOpt(body.Resolved, resultType, wr, wStmts, false, accumulatorVar, continuation);
+      copyInstrWriters.Pop();
+    }
+
+    // ----- Type ---------------------------------------------------------------------------------
+
+    protected NativeType AsNativeType(Type typ) {
+      return typ.AsNativeType();
+    }
+
+    protected bool NeedsEuclideanDivision(Type typ) {
+      if (AsNativeType(typ) is { LowerBound: var lb }) {
+        // Dafny's division differs from '/' only on negative numbers
+        return lb < BigInteger.Zero;
+      }
+      // IsNumericBased drills past newtypes, unlike IsIntegerType
+      return typ.IsNumericBased(Type.NumericPersuasion.Int);
+    }
+
+    /// <summary>
+    /// Note, C# and Java reverse the order of brackets in array type names.
+    /// </summary>
+    protected void TypeName_SplitArrayName(Type type, ConcreteSyntaxTree wr, IOrigin tok, out string typeNameSansBrackets, out string brackets) {
+      Contract.Requires(type != null);
+
+      TypeName_SplitArrayName(type, out var innermostElementType, out brackets);
+      typeNameSansBrackets = TypeName(innermostElementType, wr, tok);
+    }
+
+    protected virtual void TypeName_SplitArrayName(Type type, out Type innermostElementType, out string brackets) {
+      Contract.Requires(type != null);
+
+      type = DatatypeWrapperEraser.SimplifyType(Options, type);
+      var at = type.AsArrayType;
+      if (at != null) {
+        var elementType = type.TypeArgs[0];
+        TypeName_SplitArrayName(elementType, out innermostElementType, out brackets);
+        brackets = TypeNameArrayBrackets(at.Dims) + brackets;
+      } else {
+        innermostElementType = type;
+        brackets = "";
+      }
+    }
+
+    protected virtual string TypeNameArrayBrackets(int dims) {
+      Contract.Requires(0 <= dims);
+      return $"[{Util.Repeat(dims - 1, ",")}]";
+    }
+
+    protected bool ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance v, Type t) {
+      Contract.Requires(t != null);
+      return v != TypeParameter.TPVariance.Non && t.IsTraitType;
+    }
+
+    protected string/*!*/ TypeNames(List<Type/*!*/>/*!*/ types, ConcreteSyntaxTree wr, IOrigin tok) {
+      Contract.Requires(cce.NonNullElements(types));
+      Contract.Ensures(Contract.Result<string>() != null);
+      return Util.Comma(types, ty => TypeName(ty, wr, tok));
+    }
+
+    /// <summary>
+    /// If "type" is an auto-init type, then return a default value, else return a placebo value.
+    /// </summary>
+    protected string PlaceboValue(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool constructTypeParameterDefaultsFromTypeDescriptors = false) {
+      if (type.HasCompilableValue) {
+        return DefaultValue(type, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors);
+      } else {
+        return ForcePlaceboValue(type, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors);
+      }
+    }
+
+    protected string ForcePlaceboValue(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool constructTypeParameterDefaultsFromTypeDescriptors = false) {
+      Contract.Requires(type != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(tok != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      type = DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(Options, type);
+      return TypeInitializationValue(type, wr, tok, true, constructTypeParameterDefaultsFromTypeDescriptors);
+    }
+
+    protected string DefaultValue(Type type, ConcreteSyntaxTree wr, IOrigin tok, bool constructTypeParameterDefaultsFromTypeDescriptors = false) {
+      Contract.Requires(type != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(tok != null);
+      Contract.Ensures(Contract.Result<string>() != null);
+
+      // If "type" is a datatype with a ghost grounding constructor, then compile as a placebo for DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(type).
+      // Otherwise, get default value for DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(type), which may itself have a ghost grounding constructor, in
+      // which case the value we produce is a placebo.
+      bool HasGhostGroundingCtor(Type ty) {
+        return (ty.NormalizeExpandKeepConstraints() as UserDefinedType)?.ResolvedClass is DatatypeDecl dt && dt.GetGroundingCtor().IsGhost;
+      }
+
+      var simplifiedType = DatatypeWrapperEraser.SimplifyTypeAndTrimSubsetTypes(Options, type);
+      var usePlaceboValue = HasGhostGroundingCtor(type) || HasGhostGroundingCtor(simplifiedType);
+      return TypeInitializationValue(simplifiedType, wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
+    }
+
+    protected string DefaultValueCoercedIfNecessary(Type type, ConcreteSyntaxTree wr, IOrigin tok,
+      bool constructTypeParameterDefaultsFromTypeDescriptors = false) {
+
+      var resultWr = new ConcreteSyntaxTree();
+      var coercedWr = EmitCoercionIfNecessary(type, TypeForCoercion(type), tok, resultWr);
+      coercedWr.Write(DefaultValue(type, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors));
+      return resultWr.ToString();
+    }
+
+    // ----- Stmt ---------------------------------------------------------------------------------
+
+    public class CheckHasNoAssumesVisitor : BottomUpVisitor {
+      readonly SinglePassCodeGenerator codeGenerator;
+      ConcreteSyntaxTree wr;
+      public CheckHasNoAssumesVisitor(SinglePassCodeGenerator c, ConcreteSyntaxTree wr) {
+        Contract.Requires(c != null);
+        codeGenerator = c;
+        this.wr = wr;
+      }
+
+      protected override void VisitOneStmt(Statement stmt) {
+        if (stmt is ForallStmt) {
+          var s = (ForallStmt)stmt;
+          if (s.Body == null) {
+            codeGenerator.Error(ErrorId.c_forall_statement_has_no_body, stmt.Origin, "a forall statement without a body cannot be compiled", wr);
+          }
+        } else if (stmt is OneBodyLoopStmt) {
+          var s = (OneBodyLoopStmt)stmt;
+          if (s.Body == null) {
+            codeGenerator.Error(ErrorId.c_loop_has_no_body, stmt.Origin, "a loop without a body cannot be compiled", wr);
+          }
+        }
+      }
+    }
+
+    void TrStmtNonempty(Statement stmt, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts = null) {
+      Contract.Requires(stmt != null);
+      Contract.Requires(wr != null);
+      TrStmt(stmt, wr, wStmts);
+      if (stmt.IsGhost) {
+        TrStmtList(new List<Statement>(), EmitBlock(wr));
+      }
+    }
+
+    protected virtual ConcreteSyntaxTree EmitIngredients(ConcreteSyntaxTree wr, string ingredients, int L, string tupleTypeArgs, ForallStmt s, SingleAssignStmt s0, Expression rhs) {
+      var wStmts = wr.Fork();
+      var wrVarInit = DeclareLocalVar(ingredients, null, null, wr);
+      {
+        EmitEmptyTupleList(tupleTypeArgs, wrVarInit);
+      }
+
+      var wrOuter = wr;
+      wr = CompileGuardedLoops(s.BoundVars, s.Bounds, s.Range, wr);
+
+      var wrTuple = EmitAddTupleToList(ingredients, tupleTypeArgs, wr);
+      {
+        if (s0.Lhs is MemberSelectExpr) {
+          var lhs = (MemberSelectExpr)s0.Lhs;
+          EmitExpr(lhs.Obj, false, wrTuple, wStmts);
+        } else if (s0.Lhs is SeqSelectExpr) {
+          var lhs = (SeqSelectExpr)s0.Lhs;
+          EmitExpr(lhs.Seq, false, wrTuple, wStmts);
+          wrTuple.Write(", ");
+          EmitExprAsNativeInt(lhs.E0, false, wrTuple, wStmts);
+        } else {
+          var lhs = (MultiSelectExpr)s0.Lhs;
+          EmitExpr(lhs.Array, false, wrTuple, wStmts);
+          for (int i = 0; i < lhs.Indices.Count; i++) {
+            wrTuple.Write(", ");
+            EmitExprAsNativeInt(lhs.Indices[i], false, wrTuple, wStmts);
+          }
+        }
+
+        wrTuple.Write(", ");
+        EmitExpr(rhs, false, wrTuple, wStmts);
+      }
+
+      return wrOuter;
+    }
+
+    bool IsTailRecursiveByMethodCall(FunctionCallExpr fce) {
+      Contract.Requires(fce != null);
+      return fce.IsByMethodCall && fce.Function.ByMethodDecl == enclosingMethod && fce.Function.ByMethodDecl.IsTailRecursive;
+    }
+
+    protected virtual void EmitMemberSelect(SingleAssignStmt s0, List<Type> tupleTypeArgsList, ConcreteSyntaxTree wr, string tup) {
+      var lhs = (MemberSelectExpr)s0.Lhs;
+
+      var typeArgs = TypeArgumentInstantiation.ListFromMember(lhs.Member, null, lhs.TypeApplicationJustMember);
+      var lvalue = EmitMemberSelect(w => {
+        var wObj = EmitCoercionIfNecessary(from: null, to: tupleTypeArgsList[0], s0.Origin, w);
+        EmitTupleSelect(tup, 0, wObj);
+      }, lhs.Obj.Type, lhs.Member, typeArgs, lhs.TypeArgumentSubstitutionsWithParents(), lhs.Type);
+
+      var wRhs = EmitAssignment(lvalue, lhs.Type, tupleTypeArgsList[1], wr, s0.Origin);
+      var wCoerced = EmitCoercionIfNecessary(from: null, to: tupleTypeArgsList[1], tok: s0.Origin, wr: wRhs);
+      EmitTupleSelect(tup, 1, wCoerced);
+    }
+
+    protected virtual void EmitSeqSelect(SingleAssignStmt s0, List<Type> tupleTypeArgsList, ConcreteSyntaxTree wr, string tup) {
+      var lhs = (SeqSelectExpr)s0.Lhs;
+      EmitIndexCollectionUpdate(lhs.Seq.Type, out var wColl, out var wIndex, out var wValue, wr, nativeIndex: true);
+      var wCoerce = EmitCoercionIfNecessary(from: null, to: lhs.Seq.Type, tok: s0.Origin, wr: wColl);
+      EmitTupleSelect(tup, 0, wCoerce);
+      var wCast = EmitCoercionToNativeInt(wIndex);
+      EmitTupleSelect(tup, 1, wCast);
+      EmitTupleSelect(tup, 2, wValue);
+      EndStmt(wr);
+    }
+
+    protected virtual void EmitMultiSelect(SingleAssignStmt s0, List<Type> tupleTypeArgsList, ConcreteSyntaxTree wr, string tup, int L) {
+      var lhs = (MultiSelectExpr)s0.Lhs;
+      var wArray = new ConcreteSyntaxTree(wr.RelativeIndentLevel);
+      var wCoerced = EmitCoercionIfNecessary(from: null, to: tupleTypeArgsList[0], tok: s0.Origin, wr: wArray);
+      EmitTupleSelect(tup, 0, wCoerced);
+      var array = wArray.ToString();
+      var indices = new List<Action<ConcreteSyntaxTree>>();
+      for (int i = 0; i < lhs.Indices.Count; i++) {
+        var capturedI = i;
+        indices.Add(wIndex => EmitTupleSelect(tup, capturedI + 1, EmitCoercionToNativeInt(wIndex)));
+      }
+      var (wrArray, wrRhs) = EmitArrayUpdate(indices, tupleTypeArgsList[L - 1], wr);
+      EmitTupleSelect(tup, L - 1, wrRhs);
+      wrArray.Write(array);
+      EndStmt(wr);
+    }
+
+    protected ConcreteSyntaxTree CompileGuardedLoops(List<BoundVar> bvs, List<BoundedPool> bounds, Expression range, ConcreteSyntaxTree wr) {
+      var n = bvs.Count;
+      Contract.Assert(bounds.Count == n);
+      for (int i = 0; i < n; i++) {
+        var bound = bounds[i];
+        var bv = bvs[i];
+        var tmpVar = ProtectedFreshId("_guard_loop_");
+        var wStmtsLoop = wr.Fork();
+        var elementType = CompileCollection(bound, bv, false, false, null, out var collection, out var newtypeConversionsWereExplicit, wStmtsLoop, bounds, bvs, i);
+        wr = CreateGuardedForeachLoop(tmpVar, elementType, bv, newtypeConversionsWereExplicit, true, false, range.Origin, collection, wr);
+      }
+
+      // if (range) {
+      //   ingredients.Add(new L-Tuple( LHS0(w,x,y,z), LHS1(w,x,y,z), ..., RHS(w,x,y,z) ));
+      // }
+      ConcreteSyntaxTree guardWriter = new ConcreteSyntaxTree();
+      var wStmts = guardWriter.Fork();
+      wr = EmitIf(out guardWriter, false, wr);
+      foreach (var bvConstraints in bvs.Select(bv => ModuleResolver.GetImpliedTypeConstraint(bv, bv.Type))) {
+        guardWriter = EmitAnd((wr) => TrParenExpr(bvConstraints, wr, false, wStmts), guardWriter);
+      }
+      TrParenExpr(range, guardWriter, false, wStmts);
+
+      return wr;
+    }
+
+    protected virtual ConcreteSyntaxTree EmitAnd(Action<ConcreteSyntaxTree> lhs, ConcreteSyntaxTree wr) {
+      lhs(wr);
+      wr.Write($" {Conj} ");
+      return wr;
+    }
+
+    /// <summary>
+    /// Returns a type whose target type is the same as the target type of the values returned by the emitted enumeration.
+    /// The output value of "collectionWriter" is an action that emits the enumeration.
+    /// Note that, while the values returned by the enumeration have the target representation of "bv.Type", they may
+    /// not be legal "bv.Type" values -- that is, it could be that "bv.Type" has further constraints that need to be checked.
+    /// </summary>
+    Type CompileCollection(BoundedPool bound, IVariable bv, bool inLetExprBody, bool includeDuplicates,
+        Substituter/*?*/ su, out Action<ConcreteSyntaxTree> collectionWriter, out bool newtypeConversionsWereExplicit,
+        ConcreteSyntaxTree wStmts,
+        List<BoundedPool>/*?*/ bounds = null, List<BoundVar>/*?*/ boundVars = null, int boundIndex = 0) {
+      Contract.Requires(bound != null);
+      Contract.Requires(bounds == null || (boundVars != null && bounds.Count == boundVars.Count && 0 <= boundIndex && boundIndex < bounds.Count));
+
+      wStmts = wStmts.Fork();
+
+      var propertySuffix = SupportsProperties ? "" : "()";
+      su = su ?? new Substituter(null, new Dictionary<IVariable, Expression>(), new Dictionary<TypeParameter, Type>());
+
+      newtypeConversionsWereExplicit =
+        bound is SetBoundedPool or MapBoundedPool or SeqBoundedPool or MultiSetBoundedPool;
+
+      if (bound is BoolBoundedPool) {
+        collectionWriter = (wr) => EmitBoolBoundedPool(inLetExprBody, wr, wStmts);
+        return new BoolType();
+      } else if (bound is CharBoundedPool) {
+        collectionWriter = (wr) => EmitCharBoundedPool(inLetExprBody, wr, wStmts);
+        return new CharType();
+      } else if (bound is IntBoundedPool) {
+        var b = (IntBoundedPool)bound;
+        var res = EmitIntegerRange(bv.Type, wLo => {
+          if (b.LowerBound == null) {
+            EmitNull(bv.Type, wLo);
+          } else if (bounds != null) {
+            var low = SubstituteBound(b, bounds, boundVars, boundIndex, true);
+            EmitExpr(su.Substitute(low), inLetExprBody, wLo, wStmts);
+          } else {
+            EmitExpr(su.Substitute(b.LowerBound), inLetExprBody, wLo, wStmts);
+          }
+        }, wHi => {
+          if (b.UpperBound == null) {
+            EmitNull(bv.Type, wHi);
+          } else if (bounds != null) {
+            var high = SubstituteBound(b, bounds, boundVars, boundIndex, false);
+            EmitExpr(su.Substitute(high), inLetExprBody, wHi, wStmts);
+          } else {
+            EmitExpr(su.Substitute(b.UpperBound), inLetExprBody, wHi, wStmts);
+          }
+        });
+
+        collectionWriter = res.Item2;
+
+        return res.Item1;
+      } else if (bound is AssignSuchThatStmt.WiggleWaggleBound) {
+        collectionWriter = (wr) => EmitWiggleWaggleBoundedPool(inLetExprBody, wr, wStmts);
+        return bv.Type;
+      } else if (bound is ExactBoundedPool) {
+        var b = (ExactBoundedPool)bound;
+        collectionWriter = (wr) => EmitSingleValueGenerator(su.Substitute(b.E), inLetExprBody, TypeName(b.E.Type, wr, b.E.Origin), wr, wStmts);
+        return b.E.Type;
+      } else if (bound is SetBoundedPool setBoundedPool) {
+        collectionWriter = (wr) => {
+          EmitSetBoundedPool(su.Substitute(setBoundedPool.Set), propertySuffix, inLetExprBody, wr, wStmts);
+        };
+        return setBoundedPool.CollectionElementType;
+      } else if (bound is MultiSetBoundedPool) {
+        var b = (MultiSetBoundedPool)bound;
+        collectionWriter = (wr) => {
+          EmitMultiSetBoundedPool(su.Substitute(b.MultiSet), includeDuplicates, propertySuffix, inLetExprBody, wr, wStmts);
+        };
+        return b.CollectionElementType;
+      } else if (bound is SubSetBoundedPool) {
+        var b = (SubSetBoundedPool)bound;
+        collectionWriter = (wr) => {
+          EmitSubSetBoundedPool(su.Substitute(b.UpperBound), propertySuffix, inLetExprBody, wr, wStmts);
+        };
+        return b.UpperBound.Type;
+      } else if (bound is MapBoundedPool) {
+        var b = (MapBoundedPool)bound;
+        collectionWriter = (wr) => {
+          EmitMapBoundedPool(su.Substitute(b.Map), propertySuffix, inLetExprBody, wr, wStmts);
+        };
+        return b.CollectionElementType;
+      } else if (bound is SeqBoundedPool) {
+        var b = (SeqBoundedPool)bound;
+        collectionWriter = (wr) => {
+          EmitSeqBoundedPool(su.Substitute(b.Seq), includeDuplicates, propertySuffix, inLetExprBody, wr, wStmts);
+        };
+        return b.CollectionElementType;
+      } else if (bound is DatatypeBoundedPool) {
+        var b = (DatatypeBoundedPool)bound;
+        collectionWriter = (wr) => EmitDatatypeBoundedPool(bv, propertySuffix, inLetExprBody, wr, wStmts);
+        return new UserDefinedType(bv.Origin, new NameSegment(bv.Origin, b.Decl.Name, new())) {
+          ResolvedClass = b.Decl
+        };
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected BoundedPool type
+      }
+    }
+
+    protected virtual void EmitBoolBoundedPool(bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("{0}.AllBooleans()", GetHelperModuleName());
+    }
+
+    protected virtual void EmitCharBoundedPool(bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write($"{GetHelperModuleName()}.All{CharMethodQualifier}Chars()");
+    }
+
+    protected virtual void EmitWiggleWaggleBoundedPool(bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("{0}.AllIntegers()", GetHelperModuleName());
+    }
+
+    protected virtual void EmitSetBoundedPool(Expression of, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(of, wr, inLetExprBody, wStmts);
+      wr.Write(".Elements" + propertySuffix);
+    }
+
+    protected virtual void EmitMultiSetBoundedPool(Expression of, bool includeDuplicates, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(of, wr, inLetExprBody, wStmts);
+      wr.Write((includeDuplicates ? ".Elements" : ".UniqueElements") + propertySuffix);
+    }
+
+    protected virtual void EmitSubSetBoundedPool(Expression of, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(of, wr, inLetExprBody, wStmts);
+      wr.Write($".AllSubsets{propertySuffix}");
+    }
+
+    protected virtual void EmitMapBoundedPool(Expression map, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(map, wr, inLetExprBody, wStmts);
+      GetSpecialFieldInfo(SpecialField.ID.Keys, null, null, out var keyName, out _, out _);
+      wr.Write($".{keyName}.Elements{propertySuffix}");
+    }
+
+    protected virtual void EmitSeqBoundedPool(Expression of, bool includeDuplicates, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      TrParenExpr(of, wr, inLetExprBody, wStmts);
+      wr.Write((includeDuplicates ? ".Elements" : ".UniqueElements") + propertySuffix);
+    }
+
+    protected virtual void EmitDatatypeBoundedPool(IVariable bv, string propertySuffix, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      wr.Write("{0}.AllSingletonConstructors{1}", TypeName_Companion(bv.Type, wr, bv.Origin, null), propertySuffix);
+    }
+
+    private Expression SubstituteBound(IntBoundedPool b, List<BoundedPool> bounds, List<BoundVar> boundVars, int index, bool lowBound) {
+      Contract.Requires(b != null);
+      Contract.Requires((lowBound ? b.LowerBound : b.UpperBound) != null);
+      Contract.Requires(bounds != null);
+      Contract.Requires(boundVars != null);
+      Contract.Requires(bounds.Count == boundVars.Count);
+      Contract.Requires(0 <= index && index < boundVars.Count);
+      // if the outer bound is dependent on the inner boundvar, we need to
+      // substitute the inner boundvar with its bound.
+      var bnd = lowBound ? b.LowerBound : b.UpperBound;
+      var sm = new Dictionary<IVariable, Expression>();
+      for (int i = index + 1; i < boundVars.Count; i++) {
+        var bound = bounds[i];
+        if (bound is IntBoundedPool) {
+          var ib = (IntBoundedPool)bound;
+          var bv = boundVars[i];
+          sm[bv] = lowBound ? ib.LowerBound : ib.UpperBound;
+        }
+      }
+      var su = new Substituter(null, sm, new Dictionary<TypeParameter, Type>());
+      return su.Substitute(bnd);
+    }
+
+    private void IntroduceAndAssignBoundVars(ExistsExpr exists, ConcreteSyntaxTree wr) {
+      Contract.Requires(exists != null);
+      Contract.Assume(exists.Bounds != null);  // follows from successful resolution
+      Contract.Assert(exists.Range == null);  // follows from invariant of class IfStmt
+      foreach (var bv in exists.BoundVars) {
+        TrLocalVar(bv, false, wr);
+      }
+      var ivars = exists.BoundVars.ConvertAll(bv => (IVariable)bv);
+      TrAssignSuchThat(ivars, exists.Term, exists.Bounds, wr, false);
+    }
+
+    private bool CanSequentializeForall(List<BoundVar> bvs, List<BoundedPool> bounds, Expression range, Expression lhs, Expression rhs) {
+      // Given a statement
+      //
+      //   forall i, ... | R {
+      //     L := E;
+      //   }
+      //
+      // we sequentialize if all of these conditions hold:
+      //
+      //   1. There are no calls to functions which may have read effects in R,
+      //      L, or E
+      //   2. Each index value will be produced only once (note that this is
+      //      currently always true thanks to the use of UniqueElements())
+      //   3. If L has the form A[I] for some A and I, then one of the following
+      //      is true:
+      //      a. There are no array dereferences or array-to-sequence
+      //         conversions in R, A, I, or E
+      //      b. All of the following are true:
+      //         i.   There is only one bound variable; call it i
+      //         ii.  I is the variable i
+      //         iii. Each array dereference in R, A, or E has the form B[i] for
+      //              some B
+      //         iv.  There are no array-to-sequence conversions in R, A, or E
+      //   4. If L has the form A[I, J, ...] for some A, I, J, ... then there
+      //      are no multi-D array dereferences in R, A, E, or any of the
+      //      indices I, J, ...
+      //   5. If L has the form O.f for some field f, then one of the following
+      //      is true:
+      //      a. There are no accesses of f in R, O, or E
+      //      b. All of the following are true:
+      //         i.   There is only one bound variable; call it i
+      //         ii.  O is the variable i
+      //         iii. Each access of f in R or E has the form i.f
+      //
+      // TODO It may be possible to weaken rule 4 by adding an alternative
+      // similar to rules 3b and 5b.
+      Contract.Assert(bvs.Count == bounds.Count);
+
+      if (!noImpureFunctionCalls(lhs, rhs, range)) {
+        return false;
+      } else if (lhs is SeqSelectExpr sse) {
+        return
+          no1DArrayAccesses(sse.Seq, sse.E0, range, rhs) ||
+
+          (bvs.Count == 1 &&
+          isVar(bvs[0], sse.E0) &&
+          indexIsAlwaysVar(bvs[0], range, sse.Seq, rhs)); // also covers sequence conversions
+      } else if (lhs is MultiSelectExpr mse) {
+        return
+          noMultiDArrayAccesses(mse.Array, range, rhs) &&
+          noMultiDArrayAccesses(mse.Indices.ToArray());
+      } else {
+        // !@#$#@$% scope rules won't let me call this mse ...
+        var mse2 = (MemberSelectExpr)lhs;
+
+        return
+          noFieldAccesses(mse2.Member, mse2.Obj, range, rhs) ||
+
+          (bvs.Count == 1 &&
+          isVar(bvs[0], mse2.Obj) &&
+          accessedObjectIsAlwaysVar(mse2.Member, bvs[0], range, rhs));
+      }
+
+      bool noImpureFunctionCalls(params Expression[] exprs) {
+        return exprs.All(e => Check<ApplyExpr>(e, ae => {
+          var ty = (UserDefinedType)ae.Function.Type.NormalizeExpandKeepConstraints();
+          return ArrowType.IsPartialArrowTypeName(ty.Name) || ArrowType.IsTotalArrowTypeName(ty.Name);
+        }));
+      }
+
+      bool no1DArrayAccesses(params Expression[] exprs) {
+        return exprs.All(e => Check<SeqSelectExpr>(e, sse => !sse.Seq.Type.IsArrayType)); // allow sequence accesses
+      }
+
+      bool noMultiDArrayAccesses(params Expression[] exprs) {
+        return exprs.All(e => Check<MultiSelectExpr>(e, _ => false));
+      }
+
+      bool noFieldAccesses(MemberDecl member, params Expression[] exprs) {
+        return exprs.All(e => Check<MemberSelectExpr>(e, mse => mse.Member != member));
+      }
+
+      bool isVar(BoundVar var, Expression expr) {
+        return expr.Resolved is IdentifierExpr ie && ie.Var == var;
+      }
+
+      bool indexIsAlwaysVar(BoundVar var, params Expression[] exprs) {
+        return exprs.All(e => Check<SeqSelectExpr>(e, sse2 => sse2.SelectOne && isVar(var, sse2.E0)));
+      }
+
+      bool accessedObjectIsAlwaysVar(MemberDecl member, BoundVar var, params Expression[] exprs) {
+        return exprs.All(e => Check<MemberSelectExpr>(e, mse => mse.Member != member || isVar(var, mse.Obj)));
+      }
+    }
+
+    /// <summary>
+    /// Check all of the given expression's subexpressions of a given type
+    /// using a predicate.  Returns true only if the predicate returns true for
+    /// all subexpressions of type <typeparamref name="E"/>.
+    /// </summary>
+    private static bool Check<E>(Expression e, Predicate<E> pred) where E : Expression {
+      var checker = new Checker<E>(pred);
+      checker.Visit(e, null);
+      return checker.Passing;
+    }
+
+    private class Checker<E> : TopDownVisitor<object> where E : Expression {
+      private readonly Predicate<E> Pred;
+      public bool Passing = true;
+
+      public Checker(Predicate<E> pred) {
+        Pred = pred;
+      }
+
+      protected override bool VisitOneExpr(Expression expr, ref object st) {
+        if (expr is E e && !Pred(e)) {
+          Passing = false;
+          return false;
+        } else {
+          return true;
+        }
+      }
+    }
+
+    private void TrAssignSuchThat(List<IVariable> lhss, Expression constraint, List<BoundedPool> bounds, ConcreteSyntaxTree wr, bool inLetExprBody) {
+      Contract.Requires(lhss != null);
+      Contract.Requires(constraint != null);
+      Contract.Requires(bounds != null);
+      // For "i,j,k,l :| R(i,j,k,l);", emit something like:
+      //
+      // for (BigInteger iterLimit = 5; ; iterLimit *= 2) {
+      //   var il$0 = iterLimit;
+      //   foreach (L l' in sq.Elements) { l = l';
+      //     if (il$0 == 0) { break; }  il$0--;
+      //     var il$1 = iterLimit;
+      //     foreach (K k' in st.Elements) { k = k';
+      //       if (il$1 == 0) { break; }  il$1--;
+      //       var il$2 = iterLimit;
+      //       j = Lo;
+      //       for (;; j++) {
+      //         if (il$2 == 0) { break; }  il$2--;
+      //         foreach (bool i' in Helper.AllBooleans) { i = i';
+      //           if (R(i,j,k,l)) {
+      //             goto ASSIGN_SUCH_THAT_<id>;
+      //           }
+      //         }
+      //       }
+      //     }
+      //   }
+      // }
+      // throw new Exception("assign-such-that search produced no value"); // a verified program never gets here; however, we need this "throw" to please the C# compiler
+      // ASSIGN_SUCH_THAT_<id>: ;
+      //
+      // where the iterLimit loop can be omitted if lhss.Count == 1 or if all bounds are finite.  Further optimizations could be done, but
+      // are omitted for now.
+      //
+      var n = lhss.Count;
+      Contract.Assert(bounds.Count == n);
+      var c = ProtectedFreshNumericId("_ASSIGN_SUCH_THAT_+_iterLimit_");
+      var doneLabel = "_ASSIGN_SUCH_THAT_" + c;
+      var iterLimit = "_iterLimit_" + c;
+
+      bool needIterLimit = lhss.Count != 1 && bounds.Exists(bnd => (bnd.Virtues & BoundedPool.PoolVirtues.Finite) == 0);
+      var currentBlock = wr.Fork();
+      wr = CreateLabeledCode(doneLabel, false, wr);
+      var wrOuter = wr;
+      if (needIterLimit) {
+        wr = CreateDoublingForLoop(iterLimit, 5, wr);
+        currentBlock = wr;
+      }
+
+      for (int i = 0; i < n; i++) {
+        var bound = bounds[i];
+        Contract.Assert((bound.Virtues & BoundedPool.PoolVirtues.Enumerable) != 0);  // if we have got this far, it must be an enumerable bound
+        var bv = lhss[i];
+        if (needIterLimit) {
+          DeclareLocalVar(string.Format("{0}_{1}", iterLimit, i), null, null, false, iterLimit, currentBlock, Type.Int);
+        }
+        var tmpVar = ProtectedFreshId("_assign_such_that_");
+        var wStmts = currentBlock.Fork();
+        var elementType = CompileCollection(bound, bv, inLetExprBody, true, null, out var collection, out var newtypeConversionsWereExplicit, wStmts);
+        wr = CreateGuardedForeachLoop(tmpVar, elementType, bv, newtypeConversionsWereExplicit, false, inLetExprBody, bv.Origin, collection, wr);
+        currentBlock = wr;
+        if (needIterLimit) {
+          var varName = $"{iterLimit}_{i}";
+          var thn = EmitIf(out var isZeroWriter, false, wr);
+          EmitIsZero(varName, isZeroWriter);
+          EmitBreak(null, thn);
+          EmitDecrementVar(varName, wr);
+        }
+      }
+
+      copyInstrWriters.Push(wr.Fork());
+      var wStmtsIf = wr.Fork();
+      var wBody = EmitIf(out var guardWriter, false, wr);
+      EmitExpr(constraint, inLetExprBody, guardWriter, wStmtsIf);
+      EmitBreak(doneLabel, wBody);
+      copyInstrWriters.Pop();
+
+      // Java compiler throws unreachable error when absurd statement is written after unbounded for-loop, so we don't write it then.
+      EmitAbsurd("assign-such-that search produced no value", wrOuter, needIterLimit);
+    }
+
+    protected interface ILvalue {
+      void EmitRead(ConcreteSyntaxTree wr);
+
+      /// Write an assignment expression (or equivalent) for the lvalue,
+      /// returning a TargetWriter for the RHS.  IMPORTANT: Whoever calls
+      /// EmitWrite is responsible for making the types match up (as by
+      /// EmitCoercionIfNecessary), for example by going through the overload
+      /// of EmitAssignment that takes an ILvalue.
+      ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr);
+    }
+
+    protected ILvalue SimpleLvalue(Action<ConcreteSyntaxTree> action) {
+      return new SimpleLvalueImpl(this, action);
+    }
+
+    protected ILvalue SimpleLvalue(Action<ConcreteSyntaxTree> lvalueAction, Action<ConcreteSyntaxTree> rvalueAction) {
+      return new SimpleLvalueImpl(this, lvalueAction, rvalueAction);
+    }
+
+    protected ILvalue VariableLvalue(IVariable var) {
+      return IdentLvalue(IdName(var));
+    }
+
+    protected virtual ILvalue IdentLvalue(string var) {
+      return StringLvalue(var);
+    }
+
+    protected virtual ILvalue SeqSelectLvalue(SeqSelectExpr ll, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var arr = StabilizeExpr(ll.Seq, "_arr", wr, wStmts);
+      var index = StabilizeExpr(ll.E0, "_index", wr, wStmts);
+      if (ll.Seq.Type.IsArrayType || ll.Seq.Type.NormalizeToAncestorType().AsSeqType != null) {
+        index = ArrayIndexToNativeInt(index, ll.E0.Type);
+      }
+      return new ArrayLvalueImpl(this, arr, new List<Action<ConcreteSyntaxTree>>() { wIndex => wIndex.Write(index) }, ll.Type);
+    }
+
+    protected virtual ILvalue MultiSelectLvalue(MultiSelectExpr ll, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      string arr = StabilizeExpr(ll.Array, "_arr", wr, wStmts);
+      var indices = new List<string>();
+      int i = 0;
+      foreach (var idx in ll.Indices) {
+        var index = StabilizeExpr(idx, "_index" + i + "_", wr, wStmts);
+        index = ArrayIndexToNativeInt(index, idx.Type);
+        indices.Add(index);
+        i++;
+      }
+      return new ArrayLvalueImpl(this, arr, Util.Map<string, Action<ConcreteSyntaxTree>>(indices, i => wIndex => wIndex.Write(i)), ll.Type);
+    }
+
+    protected ILvalue StringLvalue(string str) {
+      return new SimpleLvalueImpl(this, wr => wr.Write(str));
+    }
+
+    protected ILvalue SuffixLvalue(Action<ConcreteSyntaxTree> action, string str, params object[] args) {
+      return new SimpleLvalueImpl(this, wr => { action(wr); wr.Write(str, args); });
+    }
+
+    protected ILvalue EnclosedLvalue(string prefix, Action<ConcreteSyntaxTree> action, string suffixStr, params object[] suffixArgs) {
+      return new SimpleLvalueImpl(this, wr => { wr.Write(prefix); action(wr); wr.Write(suffixStr, suffixArgs); });
+    }
+
+    protected ILvalue CoercedLvalue(ILvalue lvalue, Type/*?*/ from, Type/*?*/ to) {
+      return new CoercedLvalueImpl(this, lvalue, from, to);
+    }
+
+    protected ILvalue GetterSetterLvalue(Action<ConcreteSyntaxTree> obj, string getterName, string setterName) {
+      Contract.Requires(obj != null);
+      Contract.Requires(getterName != null);
+      Contract.Requires(setterName != null);
+      return new GetterSetterLvalueImpl(obj, getterName, setterName);
+    }
+
+    private class SimpleLvalueImpl : ILvalue {
+      private readonly SinglePassCodeGenerator codeGenerator;
+      private readonly Action<ConcreteSyntaxTree> LvalueAction, RvalueAction;
+
+      public SimpleLvalueImpl(SinglePassCodeGenerator codeGenerator, Action<ConcreteSyntaxTree> action) {
+        this.codeGenerator = codeGenerator;
+        LvalueAction = action;
+        RvalueAction = action;
+      }
+
+      public SimpleLvalueImpl(SinglePassCodeGenerator codeGenerator, Action<ConcreteSyntaxTree> lvalueAction, Action<ConcreteSyntaxTree> rvalueAction) {
+        this.codeGenerator = codeGenerator;
+        LvalueAction = lvalueAction;
+        RvalueAction = rvalueAction;
+      }
+
+      public void EmitRead(ConcreteSyntaxTree wr) {
+        RvalueAction(wr);
+      }
+
+      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
+        codeGenerator.EmitAssignment(out var wLhs, null, out var wRhs, null, wr);
+        LvalueAction(wLhs);
+        return wRhs;
+      }
+    }
+
+    private class CoercedLvalueImpl : ILvalue {
+      private readonly SinglePassCodeGenerator codeGenerator;
+      private readonly ILvalue lvalue;
+      private readonly Type /*?*/ from;
+      private readonly Type /*?*/ to;
+
+      public CoercedLvalueImpl(SinglePassCodeGenerator codeGenerator, ILvalue lvalue, Type/*?*/ from, Type/*?*/ to) {
+        this.codeGenerator = codeGenerator;
+        this.lvalue = lvalue;
+        this.from = from;
+        this.to = to;
+      }
+
+      public void EmitRead(ConcreteSyntaxTree wr) {
+        wr = codeGenerator.EmitCoercionIfNecessary(from, to, Token.NoToken, wr);
+        lvalue.EmitRead(wr);
+      }
+
+      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
+        return lvalue.EmitWrite(wr);
+      }
+    }
+
+    private class GetterSetterLvalueImpl : ILvalue {
+      private readonly Action<ConcreteSyntaxTree> obj;
+      private readonly string getterName;
+      private readonly string setterName;
+
+      public GetterSetterLvalueImpl(Action<ConcreteSyntaxTree> obj, string getterName, string setterName) {
+        this.obj = obj;
+        this.getterName = getterName;
+        this.setterName = setterName;
+      }
+
+      public void EmitRead(ConcreteSyntaxTree wr) {
+        obj(wr);
+        wr.Write($".{getterName}()");
+      }
+
+      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
+        obj(wr);
+        wr.Write($".{setterName}(");
+        var w = wr.Fork();
+        wr.WriteLine(");");
+        return w;
+      }
+    }
+
+    private class ArrayLvalueImpl : ILvalue {
+      private readonly SinglePassCodeGenerator codeGenerator;
+      private readonly string array;
+      private readonly List<Action<ConcreteSyntaxTree>> indices;
+      private readonly Type lhsType;
+
+      /// <summary>
+      /// The "indices" are expected to already be of the native array-index type.
+      /// </summary>
+      public ArrayLvalueImpl(SinglePassCodeGenerator codeGenerator, string array, List<Action<ConcreteSyntaxTree>> indices, Type lhsType) {
+        this.codeGenerator = codeGenerator;
+        this.array = array;
+        this.indices = indices;
+        this.lhsType = lhsType;
+      }
+
+      public void EmitRead(ConcreteSyntaxTree wr) {
+        var wrArray = codeGenerator.EmitArraySelect(indices, lhsType, wr);
+        codeGenerator.EmitIdentifier(array, wrArray);
+      }
+
+      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
+        var (wrArray, wrRhs) = codeGenerator.EmitArrayUpdate(indices, lhsType, wr);
+        codeGenerator.EmitIdentifier(array, wrArray);
+        codeGenerator.EndStmt(wr);
+        return wrRhs;
+      }
+    }
+
+    ILvalue CreateLvalue(Expression lhs, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Requires(lhs != null);
+      Contract.Requires(wr != null);
+
+      lhs = lhs.Resolved;
+      if (lhs is IdentifierExpr) {
+        var ll = (IdentifierExpr)lhs;
+        return VariableLvalue(ll.Var);
+      } else if (lhs is MemberSelectExpr) {
+        var ll = (MemberSelectExpr)lhs;
+        Contract.Assert(!ll.Member.IsInstanceIndependentConstant);  // instance-independent const's don't have assignment statements
+        var writeStabilized = EmitStabilizedExpr(
+          ll.Obj,
+          ll.Obj.Type.IsNonNullRefType || !ll.Obj.Type.IsRefType ? null : UserDefinedType.CreateNonNullType((UserDefinedType)ll.Obj.Type.NormalizeExpand()),
+          "_obj", wr, wStmts
+        );
+        var typeArgs = TypeArgumentInstantiation.ListFromMember(ll.Member, null, ll.TypeApplicationJustMember);
+        return EmitMemberSelect(writeStabilized, ll.Obj.Type, ll.Member, typeArgs, ll.TypeArgumentSubstitutionsWithParents(), lhs.Type,
+          internalAccess: enclosingMethod is Constructor);
+
+      } else if (lhs is SeqSelectExpr) {
+        var ll = (SeqSelectExpr)lhs;
+        return SeqSelectLvalue(ll, wr, wStmts);
+      } else {
+        var ll = (MultiSelectExpr)lhs;
+        return MultiSelectLvalue(ll, wr, wStmts);
+      }
+    }
+
+    private Action<ConcreteSyntaxTree> EmitStabilizedExpr(Expression e, Type coercedType, string prefix, ConcreteSyntaxTree surrounding, ConcreteSyntaxTree wStmts) {
+      if (IsStableExpr(e)) {
+        return outWr => TrParenExpr(e, EmitCoercionIfNecessary(e.Type, coercedType, null, outWr), false, wStmts);
+      } else {
+        var v = ProtectedFreshId(prefix);
+        var preVarSurrounding = surrounding.Fork();
+        EmitExpr(
+          e, false,
+          EmitCoercionIfNecessary(e.Type, coercedType, null, DeclareLocalVar(v, coercedType ?? e.Type, null, surrounding)),
+          preVarSurrounding
+        );
+        return outWr => EmitIdentifier(v, outWr);
+      }
+    }
+
+    /// <summary>
+    /// If the given expression's value is stable, translate it and return the
+    /// string form.  Otherwise, output code to evaluate the expression, then
+    /// return a fresh variable bound to its value.
+    /// </summary>
+    /// <param name="e">An expression to evaluate</param>
+    /// <param name="prefix">The prefix to give the fresh variable, if
+    /// needed.</param>
+    /// <param name="wr">A writer in a position to write statements
+    /// evaluating the expression</param>
+    /// <returns>A string giving the translated value as a stable
+    /// expression</returns>
+    /// <seealso cref="IsStableExpr"/>
+    private string StabilizeExpr(Expression e, string prefix, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      var localWr = new ConcreteSyntaxTree();
+      EmitStabilizedExpr(e, null, prefix, wr, wStmts)(localWr);
+      return localWr.ToString();
+    }
+
+    /// <summary>
+    /// Returns whether the given expression is <em>stable</em>, that is,
+    /// whether its value is fixed over the course of the evaluation of an
+    /// expression.  Note that anything that could be altered by a function call
+    /// (say, the value of a non-constant field) is unstable.
+    /// </summary>
+    private bool IsStableExpr(Expression e) {
+      if (e is IdentifierExpr || e is ThisExpr || e is LiteralExpr) {
+        return true;
+      } else if (e is MemberSelectExpr mse) {
+        if (!IsStableExpr(mse.Obj)) {
+          return false;
+        }
+        var member = mse.Member;
+        if (member is ConstantField) {
+          return true;
+        } else if (member is SpecialField sf) {
+          switch (sf.SpecialId) {
+            case SpecialField.ID.ArrayLength:
+            case SpecialField.ID.ArrayLengthInt:
+            case SpecialField.ID.Floor:
+            case SpecialField.ID.IsLimit:
+            case SpecialField.ID.IsSucc:
+            case SpecialField.ID.Offset:
+            case SpecialField.ID.IsNat:
+            case SpecialField.ID.Keys:
+            case SpecialField.ID.Values:
+            case SpecialField.ID.Items:
+              return true;
+            default:
+              return false;
+          }
+        } else {
+          return false;
+        }
+      } else if (e is ConcreteSyntaxExpression cse) {
+        return IsStableExpr(cse.ResolvedExpression);
+      } else {
+        return false;
+      }
+    }
+
+    /// <summary>
+    /// Translate the right-hand side of an assignment.
+    /// </summary>
+    /// <param name="rhs">The RHS to translate</param>
+    /// <param name="wr">The writer at the position for the translated RHS</param>
+    /// <param name="wStmts">A writer at an earlier position where extra statements may be written</param>
+    void TrRhs(AssignmentRhs rhs, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Requires(!(rhs is HavocRhs));
+      Contract.Requires(wr != null);
+
+      var typeRhs = rhs as TypeRhs;
+
+      if (typeRhs == null) {
+        var eRhs = (ExprRhs)rhs; // it's not HavocRhs (by the precondition) or TypeRhs (by the "if" test), so it's gotta be ExprRhs
+        EmitExpr(eRhs.Expr, false, wr, wStmts);
+
+      } else if (typeRhs.ArrayDimensions != null) {
+        var nw = ProtectedFreshId("_nw");
+        TrRhsArray(typeRhs, nw, wr, wStmts);
+        EmitArrayFinalize(wr, out var wrFinalize, typeRhs.Type);
+        EmitIdentifier(nw, wrFinalize);
+
+      } else {
+        // Allocate and initialize a new object
+        var nw = ProtectedFreshId("_nw");
+        var wRhs = DeclareLocalVar(nw, typeRhs.Type, rhs.Origin, wStmts);
+        var constructor = typeRhs.InitCall?.Method as Constructor;
+        EmitNew(typeRhs.EType, typeRhs.Origin, constructor != null ? typeRhs.InitCall : null, wRhs, wStmts);
+        // Proceed with initialization
+        if (typeRhs.InitCall != null) {
+          if (constructor != null && IsExternallyImported(constructor)) {
+            // initialization was done at the time of allocation
+          } else {
+            var wrBefore = wStmts.Fork();
+            var wrCall = wStmts.Fork();
+            var wrAfter = wStmts;
+            TrCallStmt(typeRhs.InitCall, nw, wrCall, wrBefore, wrAfter);
+          }
+        }
+        // Assign to the final LHS
+        EmitIdentifier(nw, wr);
+      }
+    }
+
+    /// <summary>
+    /// Translate the right-hand side of an assignment.
+    /// </summary>
+    /// <param name="rhs">The RHS to translate</param>
+    /// <param name="nw">Name of the variable to hold the array to be allocated</param>
+    /// <param name="wr">The writer at the position for the translated RHS</param>
+    /// <param name="wStmts">A writer at an earlier position where extra statements may be written</param>
+    void TrRhsArray(TypeRhs typeRhs, string nw, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
+      Contract.Requires(typeRhs.ArrayDimensions != null);
+
+      if (typeRhs.ElementInit == null &&
+          (typeRhs.InitDisplay == null || typeRhs.InitDisplay.Count == 0)) {
+        // This is either
+        //   * an array with an auto-init element type, where no other initialization is given, or
+        //   * a 0-length array (as evidenced by the given 0-length .InitDisplay or as confirmed by the verifier for a non-auto-init element type).
+        var pwStmts = wStmts.Fork();
+        var wRhs = DeclareLocalVar(nw, typeRhs.Type, typeRhs.Origin, wStmts);
+        EmitNewArray(typeRhs.EType, typeRhs.Origin, typeRhs.ArrayDimensions,
+          typeRhs.EType.HasCompilableValue && !DatatypeWrapperEraser.CanBeLeftUninitialized(Options, typeRhs.EType),
+          null, wRhs, pwStmts);
+        return;
+      }
+
+      if (typeRhs.ElementInit == null) {
+        Contract.Assert((typeRhs.InitDisplay != null && typeRhs.InitDisplay.Count != 0) || DatatypeWrapperEraser.CanBeLeftUninitialized(Options, typeRhs.EType));
+
+        string nwElement0;
+        if (DeterminesArrayTypeFromExampleElement) {
+          // We use the first element of the array as an "example" for the array to be allocated
+          nwElement0 = ProtectedFreshId("_nwElement0_");
+          var wrElement0 = DeclareLocalVar(nwElement0, typeRhs.EType, typeRhs.InitDisplay[0].Origin, wStmts);
+          EmitExpr(typeRhs.InitDisplay[0], false, wrElement0, wStmts);
+        } else {
+          nwElement0 = null;
+        }
+
+        var pwStmts = wStmts.Fork();
+        var wRhs = DeclareLocalVar(nw, typeRhs.Type, typeRhs.Origin, wStmts);
+        EmitNewArray(typeRhs.EType, typeRhs.Origin, typeRhs.ArrayDimensions, false, nwElement0, wRhs, pwStmts);
+
+        var ii = 0;
+        foreach (var v in typeRhs.InitDisplay) {
+          pwStmts = wStmts.Fork();
+          var (wArray, wElement) = EmitArrayUpdate(new List<Action<ConcreteSyntaxTree>> { wIndex => EmitExprAsNativeInt(new LiteralExpr(null, ii) {
+            Type = Type.Int
+          }, false, wIndex, wStmts) }, v.Type, wStmts);
+          if (ii == 0 && nwElement0 != null) {
+            EmitIdentifier(nwElement0, wElement);
+          } else {
+            EmitExpr(v, false, wElement, pwStmts);
+          }
+          EmitIdentifier(nw, wArray);
+          EndStmt(wStmts);
+          ii++;
+        }
+
+      } else if (DeterminesArrayTypeFromExampleElement) { // Not the case for the Rust compiler, for example
+        // For a 3-dimensional array allocation
+        //     m := new X[e0, e1, e2](InitFunction);
+        // generate:
+        //     var _len0 := e0;
+        //     var _len1 := e1;
+        //     var _len2 := e2;
+        //     var _nw;
+        //     if e0 == 0 || e1 == 0 || e2 == 0 {
+        //       _nw := NewArray(X, _len0, _len1, _len2);
+        //     } else {
+        //       var _init := InitFunction;
+        //       var _element0 := _init(0, 0, 0);
+        //       _nw := NewArrayFromExample(X, _element0, _len0, _len1, _len2);
+        //       ArrayUpdate(_nw, _element0, 0, 0, 0);
+        //       var _nativeLen0 := IntToArrayIndex(_len0);
+        //       var _nativeLen1 := IntToArrayIndex(_len1);
+        //       var _nativeLen2 := IntToArrayIndex(_len2);
+        //       var _start := 1;
+        //       for (var _i0 := 0; _i0 < _nativeLen0; _i0++) {
+        //         for (var _i1 := 0; _i1 < _nativeLen1; _i1++) {
+        //           for (var _i2 := _start; _i2 < _nativeLen2; _i2++) {
+        //             ArrayUpdate(_nw, _init(_i0, _i1, _i2), _i0, _i1, _i2);
+        //           }
+        //           _start := 0; // omit, if there's only one dimension
+        //         }
+        //       }
+        //     }
+        // Put the array dimensions into local variables
+        var dimNames = new List<string>();
+        for (var d = 0; d < typeRhs.ArrayDimensions.Count; d++) {
+          var dim = typeRhs.ArrayDimensions[d];
+          var dimName = ProtectedFreshId($"_len{d}_");
+          dimNames.Add(dimName);
+          var wrDim = DeclareLocalVar(dimName, Type.Int, dim.Origin, wStmts);
+          wrDim = ExprToInt(dim.Type, wrDim);
+          EmitExpr(dim, false, wrDim, wStmts);
+        }
+
+        // Declare the _nw variable
+        DeclareLocalVar(nw, typeRhs.Type, typeRhs.Origin, false, null, wStmts);
+
+        // Generate if statement
+        var wThen = EmitIf(out var guardWriter, true, wStmts);
+        for (var d = 0; d < typeRhs.ArrayDimensions.Count; d++) {
+          if (d != 0) {
+            guardWriter.Write(" || ");
+          }
+          EmitIsZero(dimNames[d], guardWriter);
+        }
+        var wRhs = new ConcreteSyntaxTree();
+        EmitNewArray(typeRhs.EType, typeRhs.Origin, dimNames, false, null, wRhs, wThen);
+        EmitAssignment(nw, typeRhs.Type, wRhs.ToString(), typeRhs.Type, wThen);
+
+        var wElse = EmitBlock(wStmts);
+
+        // Put the array-initializing function into a local variable
+        string init = ProtectedFreshId("_init");
+        DeclareLocalVar(init, typeRhs.ElementInit.Type, typeRhs.ElementInit.Origin, typeRhs.ElementInit, false, wElse);
+
+        // var _element0 := _init(0, 0, 0);
+        var initFunctionType = typeRhs.ElementInit.Type.AsArrowType;
+        Contract.Assert(initFunctionType != null && initFunctionType.Arity == typeRhs.ArrayDimensions.Count);
+        var element0 = ProtectedFreshId($"_element0_");
+        wRhs = DeclareLocalVar(element0, null, typeRhs.Origin, wElse);
+        wRhs.Write("{0}{1}({2})", init, LambdaExecute, initFunctionType.Args.Comma(argumentType => {
+          var zero = Expression.CreateIntLiteral(typeRhs.Origin, 0, argumentType);
+          return Expr(zero, false, wElse).ToString();
+        }));
+
+        // _nw := NewArrayFromExample(X, _element0, _len0, _len1, _len2);
+        wRhs = new ConcreteSyntaxTree();
+        EmitNewArray(typeRhs.EType, typeRhs.Origin, dimNames, false, element0, wRhs, wElse);
+        EmitAssignment(nw, typeRhs.Type, wRhs.ToString(), typeRhs.Type, wElse);
+
+        // _nw[0, 0, 0] := _element0;
+        var indices = Util.Map(Enumerable.Range(0, typeRhs.ArrayDimensions.Count), _ => ArrayIndexLiteral(0));
+        var (wArray, wrRhs) = EmitArrayUpdate(Util.Map<string, Action<ConcreteSyntaxTree>>(indices, i => wIndex => wIndex.Write(i)), typeRhs.EType, wElse);
+        EmitIdentifier(element0, wrRhs);
+        EmitIdentifier(nw, wArray);
+        EndStmt(wElse);
+
+        // Compute native array dimensions
+        var nativeDimNames = new List<string>();
+        for (var d = 0; d < typeRhs.ArrayDimensions.Count; d++) {
+          var dim = typeRhs.ArrayDimensions[d];
+          var nativeDimName = ProtectedFreshId($"_nativeLen{d}_");
+          nativeDimNames.Add(nativeDimName);
+          var wrDim = DeclareLocalVar(nativeDimName, null, dim.Origin, wElse);
+          wrDim.Write(ArrayIndexToNativeInt(dimNames[d], Type.Int));
+        }
+
+        // var _start := 1;
+        string startName;
+        if (typeRhs.ArrayDimensions.Count == 1) {
+          startName = ArrayIndexLiteral(1);
+        } else {
+          startName = ProtectedFreshId($"_start");
+          DeclareLocalVar(startName, null, typeRhs.Origin, false, ArrayIndexLiteral(1), wElse);
+        }
+
+        // Build a nested loop that will call the initializer for all indices
+        indices = Util.Map(Enumerable.Range(0, typeRhs.ArrayDimensions.Count), ii => ProtectedFreshId($"_i{ii}_"));
+        var w = wElse;
+        for (var d = 0; d < typeRhs.ArrayDimensions.Count; d++) {
+          var innerMostLoop = d == typeRhs.ArrayDimensions.Count - 1;
+          var wLoopBody = CreateForLoop(indices[d], w => EmitIdentifier(nativeDimNames[d], w), w, innerMostLoop ? startName : null);
+          if (typeRhs.ArrayDimensions.Count != 1 && innerMostLoop) {
+            EmitAssignment(startName, Type.Int, ArrayIndexLiteral(0), Type.Int, w);
+          }
+          w = wLoopBody;
+        }
+        (wArray, wrRhs) = EmitArrayUpdate(Util.Map<string, Action<ConcreteSyntaxTree>>(indices, i => wIndex => wIndex.Write(i)), typeRhs.EType, w);
+        wrRhs.Write("{0}{1}({2})", init, LambdaExecute, Enumerable.Range(0, indices.Count).Comma(
+          idx => {
+            var w = new ConcreteSyntaxTree();
+            EmitArrayIndexToInt(w, out var wIdentifier);
+            wIdentifier.Write(indices[idx]);
+            return w.ToString();
+          }));
+        wArray.Write(nw);
+        EndStmt(w);
+
+      } else {
+        // For a 3-dimensional array allocation
+        //     m := new X[e0, e1, e2](InitFunction);
+        // generate:
+        //     var _init := InitFunction;
+        //     var _nw := NewArray(X, e0, e1, e2);
+        //     for (var _i0 := 0; _i0 < _nw.Length0; _i0++) {
+        //       for (var _i1 := 0; _i1 < _nw.Length1; _i1++) {
+        //         for (var _i2 := 0; _i2 < _nw.Length2; _i2++) {
+        //           ArrayUpdate(_nw, _init(_i0, _i1, _i2), _i0, _i1, _i2);
+        //         }
+        //       }
+        //     }
+
+        // Put the array-initializing function into a local variable
+        string init = ProtectedFreshId("_init");
+        DeclareLocalVar(init, typeRhs.ElementInit.Type, typeRhs.ElementInit.Origin, typeRhs.ElementInit, false, wStmts);
+
+        var pwStmts = wStmts.Fork();
+        var wRhs = DeclareLocalVar(nw, typeRhs.Type, typeRhs.Origin, wStmts);
+        EmitNewArray(typeRhs.EType, typeRhs.Origin, typeRhs.ArrayDimensions, false, null, wRhs, pwStmts);
+
+        // Build a nested loop that will call the initializer for all indices
+        var indices = Util.Map(Enumerable.Range(0, typeRhs.ArrayDimensions.Count), ii => ProtectedFreshId($"_i{ii}_"));
+        var w = wStmts;
+        for (var d = 0; d < typeRhs.ArrayDimensions.Count; d++) {
+          w = CreateForLoop(indices[d], w => {
+            EmitArrayLength(w => EmitIdentifier(nw, w), typeRhs, d, true, w);
+          }, w);
+        }
+        var (wArray, wrRhs) = EmitArrayUpdate(Util.Map<string, Action<ConcreteSyntaxTree>>(indices, i => wIndex => EmitIdentifier(i, wIndex)), typeRhs.EType, w);
+        wrRhs = EmitCoercionIfNecessary(TypeForCoercion(typeRhs.EType), typeRhs.EType, typeRhs.Origin, wrRhs);
+        EmitLambdaApply(wrRhs, out var wLambda, out var wArg);
+        EmitIdentifier(init, wLambda);
+        for (var i = 0; i < indices.Count; i++) {
+          if (i > 0) {
+            wArg.Write(", ");
+          }
+
+          EmitArrayIndexToInt(wArg, out var wIndex);
+          EmitIdentifier(indices[i], wIndex);
+        }
+        EmitIdentifier(nw, wArray);
+        EndStmt(w);
+      }
+    }
+
+    protected virtual void EmitArrayLength(Action<ConcreteSyntaxTree> arr, TypeRhs typeRhs, int d, bool native,
+      ConcreteSyntaxTree w) {
+      GetSpecialFieldInfo(SpecialField.ID.ArrayLength, typeRhs.ArrayDimensions.Count == 1 ? null : d, typeRhs.Type,
+                  out var len, out var pre, out var post);
+      w.Write($"{pre}");
+      arr(w);
+      w.Write($"{(len == "" ? "" : "." + len)}{post}");
+    }
+
+    private static Type TypeOfLhs(Expression lhs) {
+      Contract.Requires(lhs != null);
+      if (lhs is IdentifierExpr) {
+        var e = (IdentifierExpr)lhs;
+        return e.Var.Type;
+      } else if (lhs is MemberSelectExpr) {
+        var e = (MemberSelectExpr)lhs;
+        return ((Field)e.Member).Type.Subst(e.TypeArgumentSubstitutionsWithParents());
+      } else if (lhs is SeqSelectExpr) {
+        var e = (SeqSelectExpr)lhs;
+        return e.Seq.Type.NormalizeExpand().TypeArgs[0];
+      } else {
+        var e = (MultiSelectExpr)lhs;
+        return e.Array.Type.NormalizeExpand().TypeArgs[0];
+      }
+    }
+
+    // to do: Make Type an abstract property of AssignmentRhs.  Unfortunately, this would first require convincing Microsoft that it makes sense for a base class to have a property that's only settable in some subclasses.  Until then, let it be known that Java's "properties" (i.e. getter/setter pairs) are more powerful >:-)
+    private static Type TypeOfRhs(AssignmentRhs rhs) {
+      if (rhs is TypeRhs tRhs) {
+        return tRhs.Type;
+      } else if (rhs is ExprRhs eRhs) {
+        return eRhs.Expr.Type;
+      } else {
+        return null;
+      }
+    }
+
+    protected virtual void EmitStaticExternMethodQualifier(string qual, ConcreteSyntaxTree wr) {
+      wr.Write(qual);
+    }
+
+    /// <summary>
+    /// Emit translation of a call statement.
+    /// The "receiverReplacement" parameter is allowed to be "null". It must be null for tail recursive calls.
+    /// </summary>
+    protected virtual void TrCallStmt(CallStmt s, string receiverReplacement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, ConcreteSyntaxTree wStmtsAfterCall) {
+      Contract.Requires(s != null);
+      Contract.Assert(s.Method != null);  // follows from the fact that stmt has been successfully resolved
+
+      if (s.Method == enclosingMethod && enclosingMethod.IsTailRecursive) {
+        // compile call as tail-recursive
+        Contract.Assert(receiverReplacement == null); // "receiverReplacement" is expected to be "null" for tail recursive calls
+        TrTailCallStmt(s.Origin, s.Method, s.Receiver, s.Args, wr);
+      } else {
+        // compile call as a regular call
+        var lvalues = new List<ILvalue>();  // contains an entry for each non-ghost formal out-parameter, but the entry is null if the actual out-parameter is ghost
+        Contract.Assert(s.Lhs.Count == s.Method.Outs.Count);
+        for (int i = 0; i < s.Method.Outs.Count; i++) {
+          Formal p = s.Method.Outs[i];
+          if (!p.IsGhost) {
+            var lhs = s.Lhs[i].Resolved;
+            if (lhs is IdentifierExpr lhsIE && lhsIE.Var.IsGhost) {
+              lvalues.Add(null);
+            } else if (lhs is MemberSelectExpr lhsMSE && lhsMSE.Member.IsGhost) {
+              lvalues.Add(null);
+            } else {
+              lvalues.Add(CreateLvalue(s.Lhs[i], wStmts, wStmts));
+            }
+          }
+        }
+        var outTmps = new List<string>();  // contains a name for each non-ghost formal out-parameter
+        var outTypes = new List<Type>();  // contains a type for each non-ghost formal out-parameter
+        var outFormalTypes = new List<Type>(); // contains the type as it appears in the method type (possibly includes type parameters)
+        var outLhsTypes = new List<Type>(); // contains the type as it appears on the LHS (may give types for those parameters)
+        for (int i = 0; i < s.Method.Outs.Count; i++) {
+          Formal p = s.Method.Original.Outs[i];
+          if (!p.IsGhost) {
+            string target = ProtectedFreshId("_out");
+            outTmps.Add(target);
+            var instantiatedType = p.Type.Subst(s.MethodSelect.TypeArgumentSubstitutionsWithParents());
+            Type type;
+            if (NeedsCastFromTypeParameter && IsCoercionNecessary(p.Type, instantiatedType)) {
+              //
+              // The type of the parameter will differ from the LHS type in a
+              // situation like this:
+              //
+              //   method Gimmie<R(0)>() returns (r: R) { }
+              //
+              //   var a : int := Gimmie();
+              //
+              // The method Gimme will be compiled down to Go (or JavaScript)
+              // as a function which returns any value (some details omitted):
+              //
+              //   func Gimmie(ty _dafny.Type) any {
+              //     return ty.Default()
+              //   }
+              //
+              // If we naively translate, we get a type error:
+              //
+              //   var lhs int = Gimmie(_dafny.IntType) // error!
+              //
+              // Fortunately, we have the information at hand to do better.  The
+              // LHS does have the actual final type (int in this case), and the
+              // out parameter on the method tells us the compiled type
+              // returned.  Therefore what we want to do is this:
+              //
+              //   var lhs dafny.Int
+              //   var _out any
+              //
+              //   _out = Gimmie(dafny.IntType)
+              //
+              //   lhs = _out.(int) // type cast
+              //
+              // All we have to do now is declare the out variable with the type
+              // from the parameter; later we'll do the type cast.
+              //
+              // None of this is necessary if the language supports parametric
+              // functions to begin with (C#) or has dynamic typing so none of
+              // this comes up (JavaScript), so we only do this if
+              // NeedsCastFromTypeParameter is on.
+              //
+              // This used to just assign p.Type to type, but that was something of a hack
+              // that didn't work in all cases: if p.Type is indeed a type parameter,
+              // it won't be in scope on the caller side. That means you can't generally
+              // declare a local variable with that type; it happened to work for Go
+              // because it would just use interface{}, but Java would try to use the type
+              // parameter directly. The TypeForCoercion() hook was added as a place to
+              // explicitly swap in a target-language type such as java.lang.Object.
+              type = TypeForCoercion(p.Type);
+            } else {
+              type = instantiatedType;
+            }
+
+            outTypes.Add(type);
+            outFormalTypes.Add(p.Type);
+            outLhsTypes.Add(s.Lhs[i].Type);
+            DeclareLocalVar(target, type, s.Lhs[i].Origin, false, null, wStmts);
+          }
+        }
+        Contract.Assert(lvalues.Count == outTmps.Count);
+
+        bool customReceiver = NeedsCustomReceiverNotTrait(s.Method);
+
+        var returnStyleOuts = UseReturnStyleOuts(s.Method, outTmps.Count);
+        var returnStyleOutCollector = outTmps.Count > 1 && returnStyleOuts && !SupportsMultipleReturns ? ProtectedFreshId("_outcollector") : null;
+        if (returnStyleOutCollector != null) {
+          DeclareSpecificOutCollector(returnStyleOutCollector, wr, outFormalTypes, outLhsTypes);
+        } else if (outTmps.Count > 0 && returnStyleOuts) {
+          EmitCallReturnOuts(outTmps, wr);
+        }
+        var wrOrig = wr;
+        if (returnStyleOutCollector == null && outTmps.Count == 1 && returnStyleOuts) {
+          var instantiatedFromType = outFormalTypes[0].Subst(s.MethodSelect.TypeArgumentSubstitutionsWithParents());
+          var toType = outTypes[0];
+          wr = EmitDowncastIfNecessary(instantiatedFromType, toType, s.Origin, wr);
+        }
+        var protectedName = receiverReplacement == null && customReceiver ? CompanionMemberIdName(s.Method) : IdName(s.Method);
+        if (customReceiver) {
+          EmitTypeName_Companion(s.Receiver.Type, wr, wr, s.Origin, s.Method);
+          wr.Write(StaticClassAccessor);
+        } else if (receiverReplacement != null) {
+          EmitIdentifier(IdProtect(receiverReplacement), wr);
+          wr.Write(InstanceClassAccessor);
+        } else if (!s.Method.IsStatic) {
+          wr.Write("(");
+          var wReceiver = wr;
+          if (s.Method.EnclosingClass is TraitDecl traitDecl && s.Receiver.Type.AsTraitType != traitDecl) {
+            wReceiver = EmitCoercionIfNecessary(s.Receiver.Type, UserDefinedType.UpcastToMemberEnclosingType(s.Receiver.Type, s.Method), s.Origin, wr);
+          }
+          EmitExpr(s.Receiver, false, wReceiver, wStmts);
+          wr.Write($"){InstanceClassAccessor}");
+        } else if (s.Method.IsExtern(Options, out var qual, out var compileName) && qual != null) {
+          EmitStaticExternMethodQualifier(qual, wr);
+          wr.Write("{0}", StaticClassAccessor);
+          protectedName = compileName;
+        } else {
+          EmitTypeName_Companion(s.Receiver.Type, wr, wr, s.Origin, s.Method);
+          wr.Write(StaticClassAccessor);
+        }
+        var typeArgs = CombineAllTypeArguments(s.Method, s.MethodSelect.TypeApplicationAtEnclosingClass, s.MethodSelect.TypeApplicationJustMember);
+        var firstReceiverArg = receiverReplacement != null ?
+          new IdentifierExpr(s.Receiver.Origin, receiverReplacement) { Type = s.Receiver.Type } : s.Receiver;
+        EmitNameAndActualTypeArgs(protectedName, TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, s.Method, false)), s.Origin,
+          firstReceiverArg, customReceiver, wr);
+        wr.Write("(");
+        var sep = "";
+        EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, s.Method.EnclosingClass, s.Method, false), s.Origin, wr, ref sep);
+        if (customReceiver) {
+          wr.Write(sep);
+          if (receiverReplacement != null) {
+            // Dafny-to-Dafny specific: Constructors are in the companion and their first argument is uninitialized,
+            // so they can't necessarily be called like an instance method. Rust forbids it for example.
+            // And we don't want to cast pointers to borrowed values, otherwise that would be undefined behavior.
+            EmitIdentifier(IdProtect(receiverReplacement), wr);
+          } else {
+            var w = EmitCoercionIfNecessary(s.Receiver.Type,
+              UserDefinedType.UpcastToMemberEnclosingType(s.Receiver.Type, s.Method), s.Origin, wr);
+            EmitExpr(s.Receiver, false, w, wStmts);
+          }
+
+          sep = ", ";
+        }
+        for (int i = 0; i < s.Method.Ins.Count; i++) {
+          Formal p = s.Method.Ins[i];
+          if (!p.IsGhost) {
+            wr.Write(sep);
+            var fromType = s.Args[i].Type;
+            var toType = s.Method.Ins[i].Type;
+            var instantiatedToType = toType.Subst(s.MethodSelect.TypeArgumentSubstitutionsWithParents());
+            var w = EmitCoercionIfNecessary(fromType, instantiatedToType, s.Origin, wr, toType);
+            w = EmitDowncastIfNecessary(fromType, instantiatedToType, s.Origin, w);
+            EmitExpr(s.Args[i], false, w, wStmts);
+            sep = ", ";
+          }
+        }
+
+        if (!returnStyleOuts) {
+          foreach (var outTmp in outTmps) {
+            wr.Write(sep);
+            EmitActualOutArg(outTmp, wr);
+            sep = ", ";
+          }
+        }
+        wr.Write(')');
+        wr = wrOrig;
+        EndStmt(wr);
+        if (returnStyleOutCollector != null) {
+          EmitCastOutParameterSplits(returnStyleOutCollector, outTmps, wStmtsAfterCall, outFormalTypes, outTypes, s.Origin);
+        }
+
+        // assign to the actual LHSs
+        for (int j = 0, l = 0; j < s.Method.Outs.Count; j++) {
+          var p = s.Method.Outs[j];
+          if (!p.IsGhost) {
+            var lvalue = lvalues[l];
+            if (lvalue != null) {
+              // The type information here takes care both of implicit upcasts and
+              // implicit downcasts from type parameters (see above).
+              ConcreteSyntaxTree wRhs = EmitAssignment(lvalue, s.Lhs[j].Type, outTypes[l], wStmtsAfterCall, s.Origin);
+              EmitIdentifier(outTmps[l], wRhs);
+              // Coercion from the out type to the LHS type is the responsibility
+              // of the EmitAssignment above
+            }
+            l++;
+          }
+        }
+      }
+    }
+
+    void TrTailCallStmt(IOrigin tok, Method method, Expression receiver, List<Expression> args, ConcreteSyntaxTree wr) {
+      Contract.Requires(tok != null);
+      Contract.Requires(method != null);
+      Contract.Requires(receiver != null);
+      Contract.Requires(args != null);
+      Contract.Requires(method.IsTailRecursive);
+      Contract.Requires(wr != null);
+      TrTailCall(tok, method.IsStatic, method.Ins, receiver, args, wr);
+    }
+
+    public virtual string TailRecursiveVar(int inParamIndex, IVariable variable) {
+      return IdName(variable);
+    }
+
+    void TrTailCall(IOrigin tok, bool isStatic, List<Formal> inParameters, Expression receiver, List<Expression> args, ConcreteSyntaxTree wr) {
+      // assign the actual in-parameters to temporary variables
+      var inTmps = new List<string>();
+      var inTypes = new List<Type>();
+      if (!isStatic) {
+        var inTmp = ProtectedFreshId("_in");
+        inTmps.Add(inTmp);
+        inTypes.Add(null);
+        DeclareLocalVar(inTmp, null, null, receiver, false, wr);
+      }
+      for (int i = 0; i < inParameters.Count; i++) {
+        var p = inParameters[i];
+        if (!p.IsGhost) {
+          var inTmp = ProtectedFreshId("_in");
+          inTmps.Add(inTmp);
+          inTypes.Add(args[i].Type);
+          DeclareLocalVar(inTmp, args[i].Type, p.Origin, args[i], false, wr);
+        }
+      }
+      // Now, assign to the formals
+      int n = 0;
+      if (!isStatic) {
+        ConcreteSyntaxTree wRHS = EmitAssignment(IdentLvalue("_this"), null, null, wr, tok);
+        if (thisContext == null) {
+          wRHS = wr;
+        } else {
+          var instantiatedType = receiver.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
+
+          var contextType = UserDefinedType.FromTopLevelDecl(tok, thisContext);
+          if (contextType.ResolvedClass is ClassLikeDecl { NonNullTypeDecl: { } } cls) {
+            contextType = UserDefinedType.FromTopLevelDecl(tok, cls.NonNullTypeDecl);
+          }
+
+          wRHS = EmitCoercionIfNecessary(instantiatedType, contextType, tok, wRHS);
+        }
+        EmitIdentifier(inTmps[n], wRHS);
+        EndStmt(wr);
+        n++;
+      }
+
+      var inParamIndex = 0;
+      foreach (var p in inParameters) {
+        if (!p.IsGhost) {
+          // We want to assign the value to input parameters. However, if input parameters were shadowed
+          // for the compilers that support the same shadowing rules as Dafny (e.g. the Dafny-to-Rust compiler)
+          // we need to assign the result to the temporary and mutable variables instead
+          var wrAssignRhs =
+            EmitAssignment(IdentLvalue(TailRecursiveVar(inParamIndex, p)), p.Type, inTypes[n], wr, tok);
+          EmitIdentifier(inTmps[n], wrAssignRhs);
+          n++;
+          inParamIndex++;
+        }
+      }
+      Contract.Assert(n == inTmps.Count);
+      // finally, the jump back to the head of the method
+      EmitJumpToTailCallStart(wr);
+    }
+
+    protected virtual void TrDividedBlockStmt(Constructor m, DividedBlockStmt dividedBlockStmt, ConcreteSyntaxTree writer) {
+      TrStmtList(dividedBlockStmt.Body, writer);
+    }
+
+    protected virtual void TrStmtList(List<Statement> stmts, ConcreteSyntaxTree writer) {
+      Contract.Requires(cce.NonNullElements(stmts));
+      Contract.Requires(writer != null);
+      foreach (Statement ss in stmts) {
+        // label:        // if any
+        //   <prelude>   // filled via copyInstrWriters -- copies out-parameters used in letexpr to local variables
+        //   ss          // translation of ss has side effect of filling the top copyInstrWriters
+        var w = writer;
+        if (ss.Labels != null && !(ss is VarDeclPattern or VarDeclStmt)) {
+          // We are not breaking out of VarDeclPattern or VarDeclStmt, so the labels there are useless
+          // They were useful for verification
+          w = CreateLabeledCode(ss.Labels.Data.AssignUniqueId(idGenerator), false, w);
+        }
+        var prelude = w.Fork();
+        copyInstrWriters.Push(prelude);
+        TrStmt(ss, w);
+        copyInstrWriters.Pop();
+      }
+    }
+
+    protected ConcreteSyntaxTree EmitContinueLabel(LList<Label> loopLabels, ConcreteSyntaxTree writer) {
+      Contract.Requires(writer != null);
+      if (loopLabels != null) {
+        writer = CreateLabeledCode(loopLabels.Data.AssignUniqueId(idGenerator), true, writer);
+      }
+      return writer;
+    }
+
+    void TrLocalVar(IVariable v, bool alwaysInitialize, ConcreteSyntaxTree wr) {
+      Contract.Requires(v != null);
+      if (v.IsGhost) {
+        // only emit non-ghosts (we get here only for local variables introduced implicitly by call statements)
+        return;
+      }
+      DeclareLocalVar(IdName(v), v.Type, v.Origin, false, alwaysInitialize ? PlaceboValue(v.Type, wr, v.Origin, true) : null, wr);
+    }
+
+    ConcreteSyntaxTree MatchCasePrelude(string source, UserDefinedType sourceType, DatatypeCtor ctor, List<BoundVar> arguments, int caseIndex, int caseCount, ConcreteSyntaxTree wr) {
+      Contract.Requires(source != null);
+      Contract.Requires(sourceType != null);
+      Contract.Requires(ctor != null);
+      Contract.Requires(cce.NonNullElements(arguments));
+      Contract.Requires(0 <= caseIndex && caseIndex < caseCount);
+      // if (source.is_Ctor0) {
+      //   FormalType f0 = ((Dt_Ctor0)source._D).a0;
+      //   ...
+      var lastCase = caseIndex == caseCount - 1;
+      ConcreteSyntaxTree w;
+      if (lastCase) {
+        // Need to avoid if (true) because some languages (Go, someday Java)
+        // pretend that an if (true) isn't a certainty, leading to a complaint
+        // about a missing return statement
+        if (caseCount > 1) {
+          w = EmitBlock(wr);
+        } else {
+          w = wr;
+        }
+      } else {
+        w = EmitIf(out var guardWriter, !lastCase, wr);
+        EmitConstructorCheck(source, ctor, guardWriter);
+      }
+
+      int k = 0;  // number of processed non-ghost arguments
+      for (int m = 0; m < ctor.Formals.Count; m++) {
+        Formal arg = ctor.Formals[m];
+        if (!arg.IsGhost) {
+          BoundVar bv = arguments[m];
+          // FormalType f0 = ((Dt_Ctor0)source._D).a0;
+          var sw = DeclareLocalVar(IdName(bv), bv.Type, bv.Origin, w);
+          EmitDestructor(wr => EmitIdentifier(source, wr), arg, k, ctor, () =>
+            SelectNonGhost(sourceType.ResolvedClass, sourceType.TypeArgs), bv.Type, sw);
+          k++;
+        }
+      }
+      return w;
+    }
+
+    // ----- Expression ---------------------------------------------------------------------------
+
+    /// <summary>
+    /// Before calling TrParenExpr(expr), the caller must have spilled the let variables declared in "expr".
+    /// </summary>
+    protected void TrParenExpr(string prefix, Expression expr, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
+      Contract.Requires(prefix != null);
+      Contract.Requires(expr != null);
+      Contract.Requires(wr != null);
+      wr.Write(prefix);
+      TrParenExpr(expr, wr, inLetExprBody, wStmts);
+    }
+
+    /// <summary>
+    /// Before calling TrParenExpr(expr), the caller must have spilled the let variables declared in "expr".
+    /// </summary>
+    protected void TrParenExpr(Expression expr, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
+      Contract.Requires(expr != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(wStmts != null);
+      EmitExpr(expr, inLetExprBody, wr.ForkInParens(), wStmts);
+    }
+
+    /// <summary>
+    /// Before calling TrExprList(exprs), the caller must have spilled the let variables declared in expressions in "exprs".
+    /// </summary>
+    protected void TrExprList(List<Expression> exprs, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts,
+        Func<int, Type> typeAt = null, bool parens = true) {
+      Contract.Requires(cce.NonNullElements(exprs));
+      if (parens) { wr = wr.ForkInParens(); }
+
+      wr.Comma(exprs, (e, index) => {
+        ConcreteSyntaxTree w;
+        if (typeAt != null) {
+          w = wr.Fork();
+          w = EmitCoercionIfNecessary(e.Type, typeAt(index), e.Origin, w);
+        } else {
+          w = wr;
+        }
+        EmitExpr(e, inLetExprBody, w, wStmts);
+      });
+    }
+
+    protected virtual void WriteCast(string s, ConcreteSyntaxTree wr) { }
+
+    protected ConcreteSyntaxTree CoercedExpr(Expression expr, Type toType, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
+      var result = new ConcreteSyntaxTree();
+      var w = EmitCoercionIfNecessary(expr.Type, toType, expr.Origin, result);
+      w = EmitDowncastIfNecessary(expr.Type, toType, expr.Origin, w);
+      EmitExpr(expr, inLetExprBody, w, wStmts);
+      return result;
+    }
+
+    protected virtual void EmitIdentifier(string ident, ConcreteSyntaxTree wr) {
+      wr.Write(ident);
+    }
+
+    public virtual ConcreteSyntaxTree Expr(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
+      var result = new ConcreteSyntaxTree();
+      EmitExpr(expr, inLetExprBody, result, wStmts);
+      return result;
+    }
+
+    private void CompileTypeTest(TypeTestExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts) {
+      var fromType = expr.E.Type;
+      if (fromType.IsSubtypeOf(expr.ToType, false, false)) {
+        // This is a special case; no checks need to be done
+        EmitExpr(Expression.CreateBoolLiteral(expr.Origin, true), inLetExprBody, wr, wStmts);
+        return;
+      }
+
+      var toType = expr.ToType;
+      var from = expr.E;
+
+      // The "is" check consists of two parts. First, check that "expr.E" can be represented in the target representation of
+      // "expr.ToType". Then, check that the constraints of "expr.ToType" are satisfied by "expr.E as expr.ToType". Note that
+      // this "expr.E as expr.ToType" does a conversion to the target representation of "expr.ToType", even if the value so
+      // produced does not satisfy the constraint of an "expr.ToType"; but this representation conversion has to be done before
+      // the "_Is" can be called.
+
+      // In the following, "ancestor of T" for a type "T" refers to the normalized (that is, following type proxies), expanded
+      // (that is, following type synonyms and subset types), and newtype-trimmed (that is, following newtypes) base type of T.
+      // "Ancestor" does not follow to trait parents.
+      //
+      // If the ancestor of "fromType" is a trait or a reference type, then:
+      //   0. Check if "from" is of the ancestor type of "toType".
+      //      Notes:
+      //       a) Suppose "toType" is "C<X, Y>". Then, because of Dafny's injectivity requirement, this can be done by checking
+      //          if "from" is of some type "C<_, _>". That is, there is no need to check the type arguments "X" and "Y".
+      //       b) "C" can be a trait, a class, a datatype/codatatype, or (when supported by --general-traits=full) a newtype.
+      //       c) In the target language, this test is typically done by an operation like "instanceof". In most cases, the test
+      //          can be done by "from instanceof C", but if "toType" is a reference type, then the test needs to be
+      //          "from == null || from instanceof C". However, the "from == null" disjunct can still be omitted if
+      //            -- "fromType" is a non-null reference type, or
+      //            -- "instanceof" in already checks non-nullness and "toType" is a non-null reference type.
+      //   1. Check that the subset-type constraints of "toType" (from "toType.NormalizeExpand()" to "toType" -- there is no need
+      //      to check any newtype constraints that "toType.NormalizeExpand()" may have, since those are effectively checked already
+      //      by the "instanceof" check performed in step (0)) hold of "from as toType.NormalizeExpand()".
+      //      Notes:
+      //        - The constraint of a non-null reference type can be omitted in some cases, see note (c) above.
+      if (fromType.IsTraitType || fromType.IsRefType) {
+        var name = $"_is_{GetUniqueAstNumber(expr)}";
+        wr = CreateIIFE_ExprBody(name, fromType, expr.Origin, expr.E, inLetExprBody, Type.Bool, expr.Origin, wr, ref wStmts);
+        EmitTypeTest(name, fromType, expr.ToType, expr.Origin, wr);
+        return;
+      }
+
+      var needsIntegralCheck = fromType.IsNumericBased(Type.NumericPersuasion.Real) && !toType.IsNumericBased(Type.NumericPersuasion.Real);
+      var needsCharCheck = fromType.NormalizeToAncestorType() is not CharType && toType.NormalizeToAncestorType() is CharType;
+      var needsRangeCheck =
+        (toType.NormalizeToAncestorType().AsBitVectorType is { } toBitvectorType &&
+         (fromType.NormalizeExpandKeepConstraints().AsBitVectorType is not { } fromBitvectorType ||
+          toBitvectorType.Width < fromBitvectorType.Width)) ||
+        (toType.AsNativeType() != null && fromType.AsNativeType()?.Sel != toType.AsNativeType().Sel);
+
+      if (needsIntegralCheck || needsCharCheck || needsRangeCheck) {
+        // Introduce a name for "from", to make sure "from" is computed just once
+        var boundVariableDecl = new BoundVar(from.Origin, $"_is_{GetUniqueAstNumber(from)}", fromType);
+        var name = IdName(boundVariableDecl);
+        wr = CreateIIFE_ExprBody(name, fromType, expr.Origin, expr.E, inLetExprBody, Type.Bool, expr.Origin, wr, ref wStmts);
+        from = new IdentifierExpr(boundVariableDecl.Origin, boundVariableDecl);
+      }
+
+      if (needsIntegralCheck) {
+        EmitIsIntegerTest(from, wr, wStmts);
+        from = new ConversionExpr(from.Origin, from, Type.Int) { Type = Type.Int };
+      }
+
+      if (needsCharCheck) {
+        var fromAsInt = new ConversionExpr(from.Origin, from, Type.Int) { Type = Type.Int };
+        if (UnicodeCharEnabled) {
+          EmitIsUnicodeScalarValueTest(fromAsInt, wr, wStmts);
+        } else {
+          EmitIsInIntegerRange(fromAsInt, 0, 0x1_0000, wr, wStmts);
+        }
+        from = new ConversionExpr(from.Origin, from, Type.Char) { Type = Type.Char };
+      }
+
+      if (needsRangeCheck) {
+        var nativeType = toType.AsNativeType();
+        var bitvectorType = toType.NormalizeToAncestorType().AsBitVectorType;
+        Contract.Assert(nativeType != null || bitvectorType != null);
+
+        BigInteger lo;
+        BigInteger hi;
+        if (bitvectorType == null) {
+          lo = nativeType.LowerBound;
+          hi = nativeType.UpperBound;
+        } else {
+          lo = 0;
+          hi = BigInteger.One << bitvectorType.Width;
+          if (nativeType != null) {
+            Contract.Assert(nativeType.LowerBound <= 0);
+            if (nativeType.UpperBound < hi) {
+              hi = nativeType.UpperBound;
+            }
+          }
+        }
+
+        var fromAsInt = new ConversionExpr(from.Origin, from, Type.Int) { Type = Type.Int };
+        EmitIsInIntegerRange(fromAsInt, lo, hi, wr, wStmts);
+        from = new ConversionExpr(from.Origin, from, toType) { Type = toType };
+      }
+
+      if (toType.NormalizeExpandKeepConstraints() is UserDefinedType toUdt &&
+          toUdt.ResolvedClass is SubsetTypeDecl or NewtypeDecl) {
+        var declWithConstraints = (RedirectingTypeDecl)toUdt.ResolvedClass;
+        // check the constraints, by calling the _Is method
+        var wrArgument = MaybeEmitCallToIsMethod(declWithConstraints, toUdt.TypeArgs, wr);
+        var targetRepresentationOfFrom = new ConversionExpr(from.Origin, from, toType) { Type = toType };
+        EmitExpr(targetRepresentationOfFrom, false, wrArgument, wStmts);
+      } else {
+        EmitExpr(Expression.CreateBoolLiteral(expr.Origin, true), inLetExprBody, wr, wStmts);
+      }
+    }
+
+    protected virtual ConcreteSyntaxTree EmitQuantifierExpr(Action<ConcreteSyntaxTree> collection, bool isForall, Type collectionElementType, BoundVar bv, ConcreteSyntaxTree wr) {
+      wr.Write("{0}(", GetQuantifierName(TypeName(collectionElementType, wr, bv.Origin)));
+      collection(wr);
+      wr.Write(", {0}, ", isForall ? True : False);
+      var ret = wr.Fork();
+      wr.Write(")");
+      return ret;
+    }
+
+    protected virtual void EmitLambdaApply(ConcreteSyntaxTree wr, out ConcreteSyntaxTree wLambda, out ConcreteSyntaxTree wArg) {
+      wLambda = wr.Fork();
+      wr.Write(LambdaExecute);
+      wArg = wr.ForkInParens();
+    }
+
+    protected void WriteTypeDescriptors(TopLevelDecl decl, List<Type> typeArguments, ConcreteSyntaxTree wrArgumentList, ref string sep) {
+      Contract.Requires(decl.TypeArgs.Count == typeArguments.Count);
+      var typeParameters = decl.TypeArgs;
+      for (var i = 0; i < typeParameters.Count; i++) {
+        if (NeedsTypeDescriptor(typeParameters[i])) {
+          var typeArgument = typeArguments[i];
+          wrArgumentList.Write($"{sep}{TypeDescriptor(typeArgument, wrArgumentList, typeArgument.Origin)}");
+          sep = ", ";
+        }
+      }
+    }
+
+    /// <summary>
+    /// When inside an enumeration like this:
+    /// 
+    ///     foreach(var [tmpVarName]: [collectionElementType] in ...) {
+    ///        ...
+    ///     }
+    /// 
+    /// MaybeInjectSubtypeConstraintWrtTraits emits a subtype constraint that tmpVarName should be of type boundVarType, typically of the form
+    /// 
+    ///       if([tmpVarName] is [boundVarType]) {
+    ///         // This is where 'wr' will write
+    ///       }
+    ///
+    /// If isReturning is true, then it will also insert the "return" statements,
+    /// to use in the lambdas used by forall and exists statements:
+    ///
+    ///       if([tmpVarName] is [boundVarType]) {
+    ///         // This is where 'wr' will write
+    ///       } else {
+    ///         return [elseReturnValue];
+    ///       }
+    ///
+    /// </summary>
+    private ConcreteSyntaxTree MaybeInjectSubtypeConstraintWrtTraits(string tmpVarName, Type collectionElementType, Type boundVarType,
+      bool inLetExprBody, IOrigin tok, ConcreteSyntaxTree wr,
+      bool isReturning = false, bool elseReturnValue = false) {
+
+      if (Type.IsSupertype(boundVarType, collectionElementType)) {
+        // Every value of the collection enumeration is a value of the bound variable's type, so the assignment can be done unconditionally.
+        // (The caller may still need to insert an upcast, depending on the target language.)
+      } else {
+        // We need to perform a run-time check to see if the collection value can be assigned to the bound variable.
+        var preconditions = wr.Fork();
+        var conditions = GetSubtypeCondition(tmpVarName, boundVarType, tok, preconditions);
+        if (conditions == null) {
+          preconditions.Clear();
+        } else {
+          var thenWriter = EmitIf(out var guardWriter, isReturning, wr);
+          conditions(guardWriter);
+          if (isReturning) {
+            wr = EmitBlock(wr);
+            var wStmts = wr.Fork();
+            wr = EmitReturnExpr(wr);
+            var elseLiteral = Expression.CreateBoolLiteral(tok, elseReturnValue);
+            EmitExpr(elseLiteral, inLetExprBody, wr, wStmts);
+          }
+          wr = thenWriter;
+        }
+      }
+      return wr;
+    }
+
+    protected virtual bool RequiresAllVariablesToBeUsed => false;
+
+    /// <summary>
+    /// If needed, emit an if-statement wrapper that checks that the value stored in "boundVar" satisfies any (subset-type or newtype) constraints
+    /// of "boundVarType".
+    /// </summary>
+    private ConcreteSyntaxTree MaybeInjectSubsetConstraint(IVariable boundVar, Type boundVarType,
+      bool inLetExprBody, IOrigin tok, ConcreteSyntaxTree wr, bool newtypeConversionsWereExplicit,
+      bool isReturning = false, bool elseReturnValue = false) {
+
+      if (boundVarType.NormalizeExpandKeepConstraints() is UserDefinedType { ResolvedClass: (SubsetTypeDecl or NewtypeDecl) } udt) {
+        var declWithConstraints = (RedirectingTypeDecl)udt.ResolvedClass;
+
+        if (!newtypeConversionsWereExplicit || declWithConstraints is not NewtypeDecl || RequiresAllVariablesToBeUsed) {
+          var thenWriter = EmitIf(out var guardWriter, hasElse: isReturning, wr);
+
+          var argumentWriter = MaybeEmitCallToIsMethod(declWithConstraints, udt.TypeArgs, guardWriter);
+
+          EmitIdentifier(IdName(boundVar), argumentWriter);
+
+          if (isReturning) {
+            var elseBranch = wr;
+            elseBranch = EmitBlock(elseBranch);
+            var wStmts = elseBranch.Fork();
+            elseBranch = EmitReturnExpr(elseBranch);
+            EmitExpr(Expression.CreateBoolLiteral(tok, elseReturnValue), inLetExprBody, elseBranch, wStmts);
+          }
+          wr = thenWriter;
+        }
+      }
+
+      if (isReturning) {
+        wr = EmitReturnExpr(wr);
+      }
+      return wr;
+    }
+
+    /// <summary>
+    /// Generates the body of an _Is method for a subset type or newtype.
+    /// "wr" is the writer the for body.
+    /// It is assumed that the caller has declared an enclosing method body that includes a parameter "sourceFormal" and having the type
+    /// "declWithConstraints" (with its type parameters as type arguments).
+    /// It is also assumed that the type has a compilable constraint (otherwise, no "_Is" method should be generated).
+    /// </summary>
+    protected void GenerateIsMethodBody(RedirectingTypeDecl declWithConstraints, Formal sourceFormal, ConcreteSyntaxTree wr) {
+      Contract.Requires(declWithConstraints is SubsetTypeDecl or NewtypeDecl);
+      Contract.Requires(declWithConstraints.ConstraintIsCompilable);
+
+      void ReturnBoolLiteral(ConcreteSyntaxTree writer, bool value) {
+        var wrReturn = EmitReturnExpr(writer);
+        EmitLiteralExpr(wrReturn, Expression.CreateBoolLiteral(declWithConstraints.Tok, value));
+      }
+
+      if (declWithConstraints is NewtypeDecl { TargetTypeCoversAllBitPatterns: true }) {
+        // newtype has trivial constraint
+        ReturnBoolLiteral(wr, true);
+        return;
+      }
+
+      IVariable baseTypeVarDecl;
+      Type baseType;
+      if (declWithConstraints.Var != null) {
+        baseTypeVarDecl = declWithConstraints.Var;
+        baseType = baseTypeVarDecl.Type;
+      } else {
+        baseType = ((NewtypeDecl)declWithConstraints).BaseType;
+        baseTypeVarDecl = new BoundVar(declWithConstraints.Origin, "_base", baseType);
+      }
+      baseType = baseType.NormalizeExpandKeepConstraints();
+      var baseTypeVar = new IdentifierExpr(declWithConstraints.Tok, baseTypeVarDecl);
+
+      // var _base = (BaseType)source;
+      var type = UserDefinedType.FromTopLevelDecl(declWithConstraints.Tok, (TopLevelDecl)declWithConstraints);
+      var wStmts = wr.Fork();
+      DeclareLocalVar(IdName(baseTypeVarDecl), baseType, declWithConstraints.Tok, true, null, wr);
+      var wRhs = EmitAssignmentRhs(wr);
+      var source = new IdentifierExpr(sourceFormal.Origin, sourceFormal);
+      EmitConversionExpr(source, type, baseType, false, wRhs, wStmts);
+      EmitDummyVariableUse(IdName(baseTypeVarDecl), wr);
+
+      if (baseType is UserDefinedType { ResolvedClass: SubsetTypeDecl or NewtypeDecl } baseTypeUdt) {
+        wStmts = wr.Fork();
+        var thenWriter = EmitIf(out var guardWriter, hasElse: false, wr);
+        ReturnBoolLiteral(wr, false);
+
+        var wrArgument = MaybeEmitCallToIsMethod((RedirectingTypeDecl)baseTypeUdt.ResolvedClass, baseTypeUdt.TypeArgs, guardWriter);
+        EmitExpr(baseTypeVar, false, wrArgument, wStmts);
+
+        wr = thenWriter;
+      }
+
+      if (declWithConstraints.Var == null) {
+        ReturnBoolLiteral(wr, true);
+      } else {
+        var wStmtsReturn = wr.Fork();
+        var wrReturn = EmitReturnExpr(wr);
+        EmitExpr(declWithConstraints.Constraint, false, wrReturn, wStmtsReturn);
+      }
+    }
+
+    protected virtual ConcreteSyntaxTree EmitCallToIsMethod(RedirectingTypeDecl declWithConstraints, Type type, ConcreteSyntaxTree wr) {
+      EmitTypeName_Companion(type, wr, wr, declWithConstraints.Tok, null);
+      wr.Write(StaticClassAccessor);
+      wr.Write(IsMethodName);
+      var wrArguments = wr.ForkInParens();
+      var sep = "";
+      EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass((TopLevelDecl)declWithConstraints, type.TypeArgs),
+        declWithConstraints.Tok, wrArguments, ref sep);
+      wrArguments.Write(sep);
+      return wrArguments;
+    }
+
+    protected virtual ConcreteSyntaxTree MaybeEmitCallToIsMethod(RedirectingTypeDecl declWithConstraints, List<Type> typeArguments, ConcreteSyntaxTree wr) {
+      Contract.Requires(declWithConstraints is SubsetTypeDecl or NewtypeDecl);
+      Contract.Requires(declWithConstraints.TypeArgs.Count == typeArguments.Count);
+      Contract.Requires(declWithConstraints.ConstraintIsCompilable);
+
+      if (declWithConstraints is NonNullTypeDecl) {
+        // Non-null types don't have a special target class, so we just do the non-null constraint check here.
+        return EmitNullTest(false, wr);
+      }
+
+      if (declWithConstraints is NewtypeDecl { TargetTypeCoversAllBitPatterns: true }) {
+        EmitLiteralExpr(wr, Expression.CreateBoolLiteral(declWithConstraints.Tok, true));
+        var abyssWriter = new ConcreteSyntaxTree();
+        return abyssWriter;
+      }
+
+      // in mind that type parameters are not accessible in static methods in some target languages).
+      var type = UserDefinedType.FromTopLevelDecl(declWithConstraints.Tok, (TopLevelDecl)declWithConstraints, typeArguments);
+      return EmitCallToIsMethod(declWithConstraints, type, wr);
+    }
+
+    protected ConcreteSyntaxTree CaptureFreeVariables(Expression expr, bool captureOnlyAsRequiredByTargetLanguage,
+      out Substituter su, bool inLetExprBody, ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts) {
+      if (captureOnlyAsRequiredByTargetLanguage && TargetLambdaCanUseEnclosingLocals) {
+        // nothing to do
+      } else {
+        CreateFreeVarSubstitution(expr, out var bvars, out var fexprs, out su);
+        if (bvars.Count != 0) {
+          return EmitBetaRedex(bvars.ConvertAll(IdName), fexprs, bvars.ConvertAll(bv => bv.Type), expr.Type, expr.Origin, inLetExprBody, wr, ref wStmts);
+        }
+      }
+      su = Substituter.EMPTY;
+      return wr;
+    }
+
+    void CreateFreeVarSubstitution(Expression expr, out List<BoundVar> bvars, out List<Expression> fexprs, out Substituter su) {
+      Contract.Requires(expr != null);
+
+      var fvs = FreeVariablesUtil.ComputeFreeVariables(Options, expr);
+      var sm = new Dictionary<IVariable, Expression>();
+
+      bvars = new List<BoundVar>();
+      fexprs = new List<Expression>();
+      foreach (var fv in fvs) {
+        if (fv.IsGhost) {
+          continue;
+        }
+        fexprs.Add(new IdentifierExpr(fv.Origin, fv.Name) {
+          Var = fv, // resolved here!
+          Type = fv.Type
+        });
+        var bv = new BoundVar(fv.Origin, fv.Name, fv.Type);
+        bvars.Add(bv);
+        sm[fv] = new IdentifierExpr(bv.Origin, bv.Name) {
+          Var = bv, // resolved here!
+          Type = bv.Type
+        };
+      }
+
+      su = new Substituter(null, sm, new Dictionary<TypeParameter, Type>());
+    }
+
+    protected ConcreteSyntaxTree StringLiteral(StringLiteralExpr str) {
+      var result = new ConcreteSyntaxTree();
+      TrStringLiteral(str, result);
+      return result;
+    }
+
+    protected virtual void TrStringLiteral(StringLiteralExpr str, ConcreteSyntaxTree wr) {
+      Contract.Requires(str != null);
+      Contract.Requires(wr != null);
+      EmitStringLiteral((string)str.Value, str.IsVerbatim, wr);
+    }
+
+    /// <summary>
+    /// Try to evaluate "expr" into one BigInteger.  On success, return it; otherwise, return "null".
+    /// </summary>
+    /// <param name="expr"></param>
+    /// <returns></returns>
+    public static Nullable<BigInteger> PartiallyEvaluate(Expression expr) {
+      Contract.Requires(expr != null);
+      expr = expr.Resolved;
+      if (expr is LiteralExpr) {
+        var e = (LiteralExpr)expr;
+        if (e.Value is BigInteger) {
+          return (BigInteger)e.Value;
+        }
+      } else if (expr is BinaryExpr) {
+        var e = (BinaryExpr)expr;
+        switch (e.ResolvedOp) {
+          case BinaryExpr.ResolvedOpcode.Add:
+          case BinaryExpr.ResolvedOpcode.Sub:
+          case BinaryExpr.ResolvedOpcode.Mul:
+            // possibly the most important case is Sub, since that's how NegationExpression's end up
+            var arg0 = PartiallyEvaluate(e.E0);
+            var arg1 = arg0 == null ? null : PartiallyEvaluate(e.E1);
+            if (arg1 != null) {
+              switch (e.ResolvedOp) {
+                case BinaryExpr.ResolvedOpcode.Add:
+                  return arg0 + arg1;
+                case BinaryExpr.ResolvedOpcode.Sub:
+                  return arg0 - arg1;
+                case BinaryExpr.ResolvedOpcode.Mul:
+                  return arg0 * arg1;
+                default:
+                  Contract.Assert(false);
+                  break;  // please compiler
+              }
+            }
+            break;
+          default:
+            break;
+        }
+      }
+      return null;
+    }
+
+    ConcreteSyntaxTree TrCasePattern(CasePattern<BoundVar> pat, Action<ConcreteSyntaxTree> rhs, Type rhsType, Type bodyType,
+      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts) {
+      Contract.Requires(pat != null);
+      Contract.Requires(rhs != null);
+      Contract.Requires(rhsType != null);
+      Contract.Requires(bodyType != null);
+      Contract.Requires(wr != null);
+
+      if (pat.Var != null) {
+        var bv = pat.Var;
+        if (!bv.IsGhost) {
+          CreateIIFE(IdName(bv), bv.Type, bv.Origin, bodyType, pat.Origin, wr, ref wStmts, out var wrRhs, out var wrBody);
+          wrRhs = EmitDowncastIfNecessary(rhsType, bv.Type, bv.Origin, wrRhs);
+          rhs(wrRhs);
+          return wrBody;
+        }
+      } else if (pat.Arguments != null) {
+        var ctor = pat.Ctor;
+        Contract.Assert(ctor != null);  // follows from successful resolution
+        Contract.Assert(pat.Arguments.Count == ctor.Formals.Count);  // follows from successful resolution
+        Contract.Assert(ctor.EnclosingDatatype.TypeArgs.Count == rhsType.NormalizeExpand().TypeArgs.Count);
+        var typeSubst = TypeParameter.SubstitutionMap(ctor.EnclosingDatatype.TypeArgs, rhsType.NormalizeExpand().TypeArgs);
+        var k = 0;  // number of non-ghost formals processed
+        for (int i = 0; i < pat.Arguments.Count; i++) {
+          var arg = pat.Arguments[i];
+          var formal = ctor.Formals[i];
+          if (formal.IsGhost) {
+            // nothing to compile, but do a sanity check
+            Contract.Assert(!Contract.Exists(arg.Vars, bv => !bv.IsGhost));
+          } else {
+            wr = TrCasePattern(arg, sw =>
+              EmitDestructor(rhs, formal, k, ctor, () => ((DatatypeValue)pat.Expr).InferredTypeArgs, arg.Expr.Type, sw),
+              formal.Type.Subst(typeSubst), bodyType, wr, ref wStmts);
+            k++;
+          }
+        }
+      }
+      return wr;
+    }
+
+    void CompileSpecialFunctionCallExpr(FunctionCallExpr e, ConcreteSyntaxTree wr, bool inLetExprBody,
+        ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
+      string name = e.Function.Name;
+
+      if (name == "RotateLeft") {
+        EmitRotate(e.Receiver, e.Args[0], true, wr, inLetExprBody, wStmts, tr);
+      } else if (name == "RotateRight") {
+        EmitRotate(e.Receiver, e.Args[0], false, wr, inLetExprBody, wStmts, tr);
+      } else {
+        CompileFunctionCallExpr(e, wr, inLetExprBody, wStmts, tr);
+      }
+    }
+
+    protected virtual void CompileFunctionCallExpr(FunctionCallExpr e, ConcreteSyntaxTree wr, bool inLetExprBody,
+        ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr, bool alreadyCoerced = false) {
+      Contract.Requires(e != null && e.Function != null);
+      Contract.Requires(wr != null);
+      Contract.Requires(tr != null);
+      Function f = e.Function;
+
+      if (!alreadyCoerced) {
+        var toType = thisContext == null ? e.Type : e.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
+        wr = EmitCoercionIfNecessary(f.Original.ResultType, toType, e.Origin, wr);
+      }
+
+      var customReceiver = NeedsCustomReceiverNotTrait(f);
+      if (f.Body == null && f.IsExtern(Options, out var qual, out var compileName) && qual != null) {
+        EmitStaticExternMethodQualifier(qual, wr);
+        wr.Write("{1}", qual, ModuleSeparator);
+      } else if (f.IsStatic || customReceiver) {
+        wr.Write("{0}{1}", TypeName_Companion(e.Receiver.Type, wr, e.Origin, f), StaticClassAccessor);
+        compileName = customReceiver ? CompanionMemberIdName(f) : IdName(f);
+      } else {
+        wr.Write("(");
+        var wReceiver = wr;
+        if (f.EnclosingClass is TraitDecl traitDecl && e.Receiver.Type.AsTraitType != traitDecl) {
+          wReceiver = EmitCoercionIfNecessary(e.Receiver.Type, UserDefinedType.UpcastToMemberEnclosingType(e.Receiver.Type, f), e.Origin, wr);
+        }
+        tr(e.Receiver, wReceiver, inLetExprBody, wStmts);
+        wr.Write($"){InstanceClassAccessor}");
+        compileName = IdName(f);
+      }
+      var typeArgs = CombineAllTypeArguments(f, e.TypeApplication_AtEnclosingClass, e.TypeApplication_JustFunction);
+      EmitNameAndActualTypeArgs(compileName, TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, f, false)),
+        f.Origin, e.Receiver, customReceiver, wr);
+      wr.Write("(");
+      var sep = "";
+      EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, f.EnclosingClass, f, false), e.Origin, wr, ref sep);
+      if (customReceiver) {
+        wr.Write(sep);
+        var w = EmitCoercionIfNecessary(e.Receiver.Type, UserDefinedType.UpcastToMemberEnclosingType(e.Receiver.Type, e.Function), e.Origin, wr);
+        EmitExpr(e.Receiver, inLetExprBody, w, wStmts);
+        sep = ", ";
+      }
+      for (int i = 0; i < e.Args.Count; i++) {
+        if (!e.Function.Ins[i].IsGhost) {
+          wr.Write(sep);
+          var fromType = e.Args[i].Type;
+          var instantiatedToType = e.Function.Ins[i].Type.Subst(e.TypeArgumentSubstitutionsWithParents());
+          var w = EmitCoercionIfNecessary(fromType, instantiatedToType, tok: e.Origin, wr: wr, e.Function.Ins[i].Type);
+          w = EmitDowncastIfNecessary(fromType, instantiatedToType, e.Origin, w);
+          tr(e.Args[i], w, inLetExprBody, wStmts);
+          sep = ", ";
+        }
+      }
+      wr.Write(")");
+    }
+
+    private bool IsComparisonToZero(BinaryExpr expr, out Expression/*?*/ arg, out int sign, out bool negated) {
+      if (IsComparisonWithZeroOnRight(expr.Op, expr.E1, out var s, out negated)) {
+        // e.g. x < 0
+        arg = expr.E0;
+        sign = s;
+        return true;
+      } else if (IsComparisonWithZeroOnRight(expr.Op, expr.E0, out s, out negated)) {
+        // e.g. 0 < x, equivalent to x < 0
+        arg = expr.E1;
+        sign = -s;
+        return true;
+      } else {
+        arg = null;
+        sign = 0;
+        return false;
+      }
+    }
+
+    private bool IsComparisonWithZeroOnRight(
+      BinaryExpr.Opcode op, Expression right,
+      out int sign, out bool negated) {
+
+      var rightVal = PartiallyEvaluate(right);
+      if (rightVal == null || rightVal != BigInteger.Zero) {
+        sign = 0; // need to assign something
+        negated = true; // need to assign something
+        return false;
+      } else {
+        switch (op) {
+          case BinaryExpr.Opcode.Lt:
+            // x < 0 <==> sign(x) == -1
+            sign = -1;
+            negated = false;
+            return true;
+          case BinaryExpr.Opcode.Le:
+            // x <= 0 <==> sign(x) != 1
+            sign = 1;
+            negated = true;
+            return true;
+          case BinaryExpr.Opcode.Eq:
+            // x == 0 <==> sign(x) == 0
+            sign = 0;
+            negated = false;
+            return true;
+          case BinaryExpr.Opcode.Neq:
+            // x != 0 <==> sign(x) != 0
+            sign = 0;
+            negated = true;
+            return true;
+          case BinaryExpr.Opcode.Gt:
+            // x > 0 <==> sign(x) == 1
+            sign = 1;
+            negated = false;
+            return true;
+          case BinaryExpr.Opcode.Ge:
+            // x >= 0 <==> sign(x) != -1
+            sign = -1;
+            negated = true;
+            return true;
+          default:
+            sign = 0; // need to assign something
+            negated = false; // ditto
+            return false;
+        }
+      }
+    }
+
+    protected abstract void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr);
+  }
+}
diff --git a/Source/DafnyCore/Coco/Parser.frame b/Source/DafnyCore/Coco/Parser.frame
index 5aec38bbfdd..42b4483eb56 100644
--- a/Source/DafnyCore/Coco/Parser.frame
+++ b/Source/DafnyCore/Coco/Parser.frame
@@ -33,10 +33,11 @@ Coco/R itself) does not fall under the GNU General Public License.
 
 using System;
 using System.Diagnostics.Contracts;
+using System.Threading;
 
 -->namespace
 
-public class Parser {
+public partial class Parser {
 -->constants
   const bool _T = true;
   const bool _x = false;
@@ -44,16 +45,18 @@ public class Parser {
 
   public Scanner scanner;
   public Errors  errors;
+  CancellationToken cancellationToken;
 
-  public IToken t;    // last recognized token
-  public IToken la;   // lookahead token
+  public Token t;    // last recognized token
+  public Token la;   // lookahead token
   int errDist = minErrDist;
 
 -->declarations
 
-  public Parser(Scanner scanner, Errors errors) {
+  public Parser(Scanner scanner, Errors errors, CancellationToken cancellationToken) {
     this.scanner = scanner;
     this.errors = errors;
+    this.cancellationToken = cancellationToken;
     this.la = scanner.FirstToken;
     this.t = scanner.FirstToken; // just to satisfy its non-null constraint
   }
@@ -65,13 +68,14 @@ public class Parser {
     errDist = 0;
   }
   
-  public void SemErr(Enum errorId, IToken tok, string msg) {
+  public void SemErr(Enum errorId, IOrigin tok, string msg) {
     Contract.Requires(tok != null);
     Contract.Requires(msg != null);
     errors.SemErr(errorId, tok, msg);
   }
 
   void Get() {
+    cancellationToken.ThrowIfCancellationRequested();
     for (; ; ) {
       var tmp = la;
       la = scanner.Scan();
@@ -167,14 +171,14 @@ public class Errors {
     return s;
   }
 
-  public void SemErr(string errorId, IToken tok, string msg) {  // semantic errors
+  public void SemErr(string errorId, IOrigin tok, string msg) {  // semantic errors
     Contract.Requires(tok != null);
     Contract.Requires(msg != null);
     ErrorCount++;
     Reporting.Error(MessageSource.Parser, errorId, tok, msg);
   }
   
-  public void SemErr(Enum errorId, IToken tok, string msg) {  // semantic errors
+  public void SemErr(Enum errorId, IOrigin tok, string msg) {  // semantic errors
     Contract.Requires(tok != null);
     Contract.Requires(msg != null);
     ErrorCount++;
@@ -187,13 +191,13 @@ public class Errors {
     Reporting.Error(MessageSource.Parser, errorId, uri, line, col, msg);
   }
 
-  public void Deprecated(Enum errorId, IToken tok, string msg) {
+  public void Deprecated(Enum errorId, IOrigin tok, string msg) {
     Contract.Requires(tok != null);
     Contract.Requires(msg != null);
     Reporting.Deprecated(MessageSource.Parser, errorId, tok, msg);
   }
 
-  public void Warning(ErrorId errorId, IToken tok, string msg) {
+  public void Warning(ErrorId errorId, IOrigin tok, string msg) {
     Contract.Requires(tok != null);
     Contract.Requires(msg != null);
     Reporting.Warning(MessageSource.Parser, errorId, tok, msg);
diff --git a/Source/DafnyCore/Coco/Scanner.frame b/Source/DafnyCore/Coco/Scanner.frame
index 4ad3667ceb0..f72296e14e1 100644
--- a/Source/DafnyCore/Coco/Scanner.frame
+++ b/Source/DafnyCore/Coco/Scanner.frame
@@ -469,7 +469,7 @@ public class Scanner {
           lastWasCr = (ch == '\r');
         }
         NextCh();
-        if(triviaTrailing && triviaNewlines == 2 && (ch != '\n' || !lastWasCr)) {
+        if(triviaTrailing && triviaNewlines == 1 && (ch != '\n' || !lastWasCr)) {
           triviaTrailing = false;
           posTrailingEndLeadingStart = pos;
         }
diff --git a/Source/DafnyCore/CompileNestedMatch/MatchAst.cs b/Source/DafnyCore/CompileNestedMatch/MatchAst.cs
index 3f586890bcd..4db02cd01c5 100644
--- a/Source/DafnyCore/CompileNestedMatch/MatchAst.cs
+++ b/Source/DafnyCore/CompileNestedMatch/MatchAst.cs
@@ -19,15 +19,15 @@ void ObjectInvariant() {
     Contract.Invariant(cce.NonNullElements(MissingCases));
   }
 
-  public MatchExpr(IToken tok, Expression source, [Captured] List<MatchCaseExpr> cases, bool usesOptionalBraces, MatchingContext context = null)
-    : base(tok) {
-    Contract.Requires(tok != null);
+  public MatchExpr(IOrigin origin, Expression source, [Captured] List<MatchCaseExpr> cases, bool usesOptionalBraces, MatchingContext context = null)
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(source != null);
     Contract.Requires(cce.NonNullElements(cases));
     this.source = source;
     this.cases = cases;
-    this.UsesOptionalBraces = usesOptionalBraces;
-    this.Context = context ?? new HoleCtx();
+    UsesOptionalBraces = usesOptionalBraces;
+    Context = context ?? new HoleCtx();
   }
   public MatchExpr(Cloner cloner, MatchExpr original)
     : base(cloner, original) {
@@ -81,33 +81,31 @@ public override IEnumerable<Type> ComponentTypes {
   }
 }
 
-public abstract class MatchCase : TokenNode, IHasUsages {
+public abstract class MatchCase : NodeWithComputedRange, IHasReferences {
   public DatatypeCtor Ctor;
   public List<BoundVar> Arguments;
 
   [ContractInvariantMethod]
   void ObjectInvariant() {
-    Contract.Invariant(tok != null);
+    Contract.Invariant(Origin != null);
     Contract.Invariant(Ctor != null);
     Contract.Invariant(cce.NonNullElements(Arguments));
   }
 
-  public MatchCase(IToken tok, DatatypeCtor ctor, [Captured] List<BoundVar> arguments) {
-    Contract.Requires(tok != null);
+  public MatchCase(IOrigin origin, DatatypeCtor ctor, [Captured] List<BoundVar> arguments) : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(ctor != null);
     Contract.Requires(cce.NonNullElements(arguments));
-    this.tok = tok;
-    this.Ctor = ctor;
-    this.Arguments = arguments;
+    Ctor = ctor;
+    Arguments = arguments;
   }
 
-  public IToken NameToken => tok;
-  public IEnumerable<IDeclarationOrUsage> GetResolvedDeclarations() {
-    return new[] { Ctor };
+  public IEnumerable<Reference> GetReferences() {
+    return new[] { new Reference(Origin, Ctor) };
   }
 }
 
-interface IMatch {
+public interface IMatch {
   IEnumerable<MatchCase> Cases { get; }
   Expression Source { get; }
   List<DatatypeCtor> MissingCases { get; }
@@ -142,28 +140,28 @@ public MatchStmt(Cloner cloner, MatchStmt original) : base(cloner, original) {
     }
   }
 
-  public MatchStmt(RangeToken rangeToken, Expression source, [Captured] List<MatchCaseStmt> cases,
+  public MatchStmt(IOrigin origin, Expression source, [Captured] List<MatchCaseStmt> cases,
     bool usesOptionalBraces, MatchingContext context = null)
-    : base(rangeToken) {
-    Contract.Requires(rangeToken != null);
+    : base(origin) {
+    Contract.Requires(origin != null);
     Contract.Requires(source != null);
     Contract.Requires(cce.NonNullElements(cases));
     this.source = source;
     this.cases = cases;
-    this.UsesOptionalBraces = usesOptionalBraces;
-    this.Context = context is null ? new HoleCtx() : context;
+    UsesOptionalBraces = usesOptionalBraces;
+    Context = context is null ? new HoleCtx() : context;
   }
 
-  public MatchStmt(RangeToken rangeToken, Expression source, [Captured] List<MatchCaseStmt> cases,
+  public MatchStmt(IOrigin origin, Expression source, [Captured] List<MatchCaseStmt> cases,
     bool usesOptionalBraces, Attributes attrs, MatchingContext context = null)
-    : base(rangeToken, attrs) {
-    Contract.Requires(rangeToken != null);
+    : base(origin, attrs) {
+    Contract.Requires(origin != null);
     Contract.Requires(source != null);
     Contract.Requires(cce.NonNullElements(cases));
     this.source = source;
     this.cases = cases;
-    this.UsesOptionalBraces = usesOptionalBraces;
-    this.Context = context is null ? new HoleCtx() : context;
+    UsesOptionalBraces = usesOptionalBraces;
+    Context = context is null ? new HoleCtx() : context;
   }
 
   public Expression Source => source;
@@ -173,6 +171,24 @@ public MatchStmt(RangeToken rangeToken, Expression source, [Captured] List<Match
 
   public override IEnumerable<INode> Children => new[] { Source }.Concat<Node>(Cases);
 
+  public override void ResolveGhostness(ModuleResolver resolver, ErrorReporter reporter, bool mustBeErasable,
+    ICodeContext codeContext, string proofContext,
+    bool allowAssumptionVariables, bool inConstructorInitializationPhase) {
+    IsGhost = mustBeErasable || ExpressionTester.UsesSpecFeatures(Source) || ExpressionTester.FirstCaseThatDependsOnGhostCtor(Cases) != null;
+    if (!mustBeErasable && IsGhost) {
+      reporter.Info(MessageSource.Resolver, Origin, "ghost match");
+    }
+
+    Cases.ForEach(kase => kase.Body.ForEach(ss => ss.ResolveGhostness(resolver, reporter, IsGhost, codeContext,
+      proofContext, allowAssumptionVariables, inConstructorInitializationPhase)));
+    IsGhost = IsGhost || Cases.All(kase => kase.Body.All(ss => ss.IsGhost));
+    if (!IsGhost) {
+      // If there were features in the source expression that are treated differently in ghost and non-ghost
+      // contexts, make sure they get treated for non-ghost use.
+      ExpressionTester.CheckIsCompilable(resolver, reporter, Source, codeContext);
+    }
+  }
+
   // should only be used in desugar in resolve to change the cases of the matchexpr
   public void UpdateSource(Expression source) {
     this.source = source;
@@ -232,16 +248,14 @@ void ObjectInvariant() {
   public override IEnumerable<INode> Children => body;
   public override IEnumerable<INode> PreResolveChildren => Children;
 
-  public MatchCaseStmt(RangeToken rangeToken, DatatypeCtor ctor, bool fromBoundVar, [Captured] List<BoundVar> arguments, [Captured] List<Statement> body, Attributes attrs = null)
-    : base(rangeToken.StartToken, ctor, arguments) {
-    RangeToken = rangeToken;
-    Contract.Requires(tok != null);
+  public MatchCaseStmt(IOrigin rangeOrigin, DatatypeCtor ctor, bool fromBoundVar, [Captured] List<BoundVar> arguments, [Captured] List<Statement> body, Attributes attrs = null)
+    : base(rangeOrigin, ctor, arguments) {
     Contract.Requires(ctor != null);
     Contract.Requires(cce.NonNullElements(arguments));
     Contract.Requires(cce.NonNullElements(body));
     this.body = body;
-    this.Attributes = attrs;
-    this.FromBoundVar = fromBoundVar;
+    Attributes = attrs;
+    FromBoundVar = fromBoundVar;
   }
 
   public List<Statement> Body {
@@ -266,14 +280,14 @@ void ObjectInvariant() {
   public override IEnumerable<INode> Children => Arguments.Concat<Node>(new[] { body });
   public override IEnumerable<INode> PreResolveChildren => Children;
 
-  public MatchCaseExpr(IToken tok, DatatypeCtor ctor, bool FromBoundVar, [Captured] List<BoundVar> arguments, Expression body, Attributes attrs = null)
-    : base(tok, ctor, arguments) {
-    Contract.Requires(tok != null);
+  public MatchCaseExpr(IOrigin origin, DatatypeCtor ctor, bool FromBoundVar, [Captured] List<BoundVar> arguments, Expression body, Attributes attrs = null)
+    : base(origin, ctor, arguments) {
+    Contract.Requires(origin != null);
     Contract.Requires(ctor != null);
     Contract.Requires(cce.NonNullElements(arguments));
     Contract.Requires(body != null);
     this.body = body;
-    this.Attributes = attrs;
+    Attributes = attrs;
     this.FromBoundVar = FromBoundVar;
   }
 
@@ -307,7 +321,7 @@ public virtual MatchingContext AbstractAllHoles() {
   }
 
   public MatchingContext AbstractHole() {
-    return this.FillHole(new ForallCtx());
+    return FillHole(new ForallCtx());
   }
 
   public virtual MatchingContext FillHole(MatchingContext curr) {
@@ -320,7 +334,7 @@ public class LitCtx : MatchingContext {
 
   public LitCtx(LiteralExpr lit) {
     Contract.Requires(lit != null);
-    this.Lit = lit;
+    Lit = lit;
   }
 
   public override string ToString() {
@@ -359,14 +373,14 @@ public class IdCtx : MatchingContext {
   public IdCtx(string id, List<MatchingContext> arguments) {
     Contract.Requires(id != null);
     Contract.Requires(arguments != null); // Arguments can be empty, but shouldn't be null
-    this.Id = id;
-    this.Arguments = arguments;
+    Id = id;
+    Arguments = arguments;
   }
 
   public IdCtx(DatatypeCtor ctor) {
     List<MatchingContext> arguments = Enumerable.Repeat((MatchingContext)new HoleCtx(), ctor.Formals.Count).ToList();
-    this.Id = ctor.Name;
-    this.Arguments = arguments;
+    Id = ctor.Name;
+    Arguments = arguments;
   }
 
   public override string ToString() {
@@ -379,7 +393,7 @@ public override string ToString() {
   }
 
   public override MatchingContext AbstractAllHoles() {
-    return new IdCtx(this.Id, this.Arguments.ConvertAll<MatchingContext>(x => x.AbstractAllHoles()));
+    return new IdCtx(Id, Arguments.ConvertAll<MatchingContext>(x => x.AbstractAllHoles()));
   }
 
   // Find the first (leftmost) occurrence of HoleCtx and replace it with curr
@@ -389,8 +403,8 @@ private bool ReplaceLeftmost(MatchingContext curr, out MatchingContext newContex
     bool foundHole = false;
     int currArgIndex = 0;
 
-    while (!foundHole && currArgIndex < this.Arguments.Count) {
-      var arg = this.Arguments.ElementAt(currArgIndex);
+    while (!foundHole && currArgIndex < Arguments.Count) {
+      var arg = Arguments.ElementAt(currArgIndex);
       switch (arg) {
         case HoleCtx _:
           foundHole = true;
@@ -408,13 +422,13 @@ private bool ReplaceLeftmost(MatchingContext curr, out MatchingContext newContex
     }
 
     if (foundHole) {
-      while (currArgIndex < this.Arguments.Count) {
-        newArguments.Add(this.Arguments.ElementAt(currArgIndex));
+      while (currArgIndex < Arguments.Count) {
+        newArguments.Add(Arguments.ElementAt(currArgIndex));
         currArgIndex++;
       }
     }
 
-    newContext = new IdCtx(this.Id, newArguments);
+    newContext = new IdCtx(Id, newArguments);
     return foundHole;
   }
 
diff --git a/Source/DafnyCore/CompileNestedMatch/MatchFlattener.cs b/Source/DafnyCore/CompileNestedMatch/MatchFlattener.cs
index 650fdc62d49..ebb7252d4fa 100644
--- a/Source/DafnyCore/CompileNestedMatch/MatchFlattener.cs
+++ b/Source/DafnyCore/CompileNestedMatch/MatchFlattener.cs
@@ -41,12 +41,10 @@ namespace Microsoft.Dafny;
 /// </summary>
 public class MatchFlattener : IRewriter {
   private const string NoCasesMessage = "match has no cases and this is only allowed when the verifier can prove the match is unreachable";
-  private readonly FreshIdGenerator idGenerator;
   private ResolutionContext resolutionContext;
 
-  public MatchFlattener(ErrorReporter reporter, FreshIdGenerator idGenerator)
+  public MatchFlattener(ErrorReporter reporter)
     : base(reporter) {
-    this.idGenerator = idGenerator;
   }
 
   internal override void PostResolve(ModuleDefinition module) {
@@ -90,13 +88,13 @@ private Expression CompileNestedMatchExpr(NestedMatchExpr nestedMatchExpr) {
     CaseBody compiledMatch = CompilePatternPaths(state, new HoleCtx(), LinkedLists.Create(nestedMatchExpr.Source), paths);
     if (compiledMatch is null) {
       if (nestedMatchExpr.Source.Type.AsDatatype == null) {
-        var havoc = LetExpr.Havoc(nestedMatchExpr.tok, nestedMatchExpr.Type);
-        return new StmtExpr(nestedMatchExpr.tok, AssertStmt.CreateErrorAssert(nestedMatchExpr, NoCasesMessage), havoc) {
+        var havoc = LetExpr.Havoc(nestedMatchExpr.Origin, nestedMatchExpr.Type);
+        return new StmtExpr(nestedMatchExpr.Origin, AssertStmt.CreateErrorAssert(nestedMatchExpr, NoCasesMessage), havoc) {
           Type = nestedMatchExpr.Type
         };
       }
 
-      return new MatchExpr(nestedMatchExpr.tok, nestedMatchExpr.Source, new List<MatchCaseExpr>(),
+      return new MatchExpr(nestedMatchExpr.Origin, nestedMatchExpr.Source, new List<MatchCaseExpr>(),
         nestedMatchExpr.UsesOptionalBraces) {
         Type = nestedMatchExpr.Type
       };
@@ -128,7 +126,7 @@ private Statement CompileNestedMatchStmt(NestedMatchStmt nestedMatchStmt) {
         return AssertStmt.CreateErrorAssert(nestedMatchStmt, NoCasesMessage);
       }
 
-      return new MatchStmt(nestedMatchStmt.RangeToken, nestedMatchStmt.Source, new List<MatchCaseStmt>(), nestedMatchStmt.UsesOptionalBraces, nestedMatchStmt.Attributes);
+      return new MatchStmt(nestedMatchStmt.Origin, nestedMatchStmt.Source, new List<MatchCaseStmt>(), nestedMatchStmt.UsesOptionalBraces, nestedMatchStmt.Attributes);
     }
 
     if (compiledMatch.Node is Statement statement) {
@@ -140,8 +138,9 @@ private Statement CompileNestedMatchStmt(NestedMatchStmt nestedMatchStmt) {
         }
       }
 
-      new GhostInterestVisitor(resolutionContext.WithGhost(nestedMatchStmt.IsGhost).CodeContext, null, Reporter, false, false).
-        Visit(result, nestedMatchStmt.IsGhost, null);
+      var context = resolutionContext.WithGhost(nestedMatchStmt.IsGhost).CodeContext;
+      result.ResolveGhostness(null, Reporter, nestedMatchStmt.IsGhost, context,
+        null, false, false);
       return result;
     }
     Contract.Assert(false); throw new cce.UnreachableException(); // Returned container should be a StmtContainer
@@ -149,7 +148,7 @@ private Statement CompileNestedMatchStmt(NestedMatchStmt nestedMatchStmt) {
 
   private IEnumerable<NestedMatchCaseStmt> FlattenNestedMatchCaseStmt(NestedMatchCaseStmt c) {
     foreach (var pat in FlattenDisjunctivePatterns(c.Pat)) {
-      yield return new NestedMatchCaseStmt(c.Tok, pat,
+      yield return new NestedMatchCaseStmt(c.Origin, pat,
         c.Body,
         c.Attributes);
     }
@@ -161,12 +160,12 @@ private ExtendedPattern RemoveIllegalSubpatterns(ExtendedPattern pat, bool inDis
         return pat;
       case IdPattern p:
         if (inDisjunctivePattern && p.ResolvedLit == null && p.Arguments == null && !p.IsWildcardPattern) {
-          return new IdPattern(p.Tok, FreshTempVarName("_", null), null, p.IsGhost);
+          return new IdPattern(p.Origin, FreshTempVarName("_", null), null, p.IsGhost);
         }
         var args = p.Arguments?.ConvertAll(a => RemoveIllegalSubpatterns(a, inDisjunctivePattern));
-        return new IdPattern(p.Tok, p.Id, p.Type, args, p.IsGhost) { ResolvedLit = p.ResolvedLit, BoundVar = p.BoundVar };
+        return new IdPattern(p.Origin, p.Id, p.Type, args, p.IsGhost) { ResolvedLit = p.ResolvedLit, BoundVar = p.BoundVar };
       case DisjunctivePattern p:
-        return new IdPattern(p.Tok, FreshTempVarName("_", null), null, p.IsGhost);
+        return new IdPattern(p.Origin, FreshTempVarName("_", null), null, p.IsGhost);
       default:
         Contract.Assert(false);
         return null;
@@ -174,7 +173,7 @@ private ExtendedPattern RemoveIllegalSubpatterns(ExtendedPattern pat, bool inDis
   }
 
   string FreshTempVarName(string prefix, ICodeContext context) {
-    var gen = context is Declaration decl ? decl.IdGenerator : idGenerator;
+    var gen = context.CodeGenIdGenerator;
     var freshTempVarName = gen.FreshId(prefix);
     return freshTempVarName;
   }
@@ -190,7 +189,7 @@ private IEnumerable<ExtendedPattern> FlattenDisjunctivePatterns(ExtendedPattern
 
   private IEnumerable<NestedMatchCaseExpr> FlattenNestedMatchCaseExpr(NestedMatchCaseExpr c) {
     foreach (var pat in FlattenDisjunctivePatterns(c.Pat)) {
-      yield return new NestedMatchCaseExpr(c.Tok, pat, c.Body, c.Attributes);
+      yield return new NestedMatchCaseExpr(c.Origin, pat, c.Body, c.Attributes);
     }
   }
 
@@ -281,7 +280,7 @@ private CaseBody CompilePatternPathsForMatchee(MatchCompilationState state, Matc
             Contract.Assert(false);
             throw new cce.UnreachableException(); // non-nullary constructors of a non-datatype;
           } else {
-            Reporter.Error(MessageSource.Resolver, currPattern.Tok,
+            Reporter.Error(MessageSource.Resolver, currPattern.Origin,
               "Type mismatch: expected constructor of type {0}.  Got {1}.", dtd.Name, currPattern.Id);
           }
         }
@@ -318,9 +317,9 @@ private CaseBody CompileHeadsContainingConstructor(MatchCompilationState mti, Ma
       var constructorPaths = new List<PatternPath>();
 
       // create a bound variable for each formal to use in the MatchCase for this constructor
-      // using the currMatchee.tok to get a location closer to the error if something goes wrong
+      // using the currMatchee.Tok to get a location closer to the error if something goes wrong
       var freshPatBV = ctor.Formals.ConvertAll(
-        x => CreateBoundVariable(headMatchee.tok, x.Type.Subst(subst), mti.CodeContext.CodeContext));
+        x => CreateBoundVariable(headMatchee.Origin, x.Type.Subst(subst), mti.CodeContext.CodeContext));
 
       // rhs to bind to head-patterns that are bound variables
       var rhsExpr = headMatchee;
@@ -359,7 +358,7 @@ private CaseBody CompileHeadsContainingConstructor(MatchCompilationState mti, Ma
             }
 
             var freshArgs = ctor.Formals.ConvertAll(x =>
-              CreateFreshBindingPattern(idPattern.Tok, x.Type.Subst(subst), mti.CodeContext.CodeContext, x.IsGhost));
+              CreateFreshBindingPattern(idPattern.Origin, x.Type.Subst(subst), mti.CodeContext.CodeContext, x.IsGhost));
 
             tail.Patterns.InsertRange(0, freshArgs);
             var newPath = LetBindNonWildCard(idPattern, rhsExpr, tail);
@@ -371,17 +370,17 @@ private CaseBody CompileHeadsContainingConstructor(MatchCompilationState mti, Ma
         }
       }
       // Add variables corresponding to the arguments of the current constructor (ctor) to the matchees
-      var freshMatchees = freshPatBV.ConvertAll(x => new IdentifierExpr(x.tok, x));
+      var freshMatchees = freshPatBV.ConvertAll(x => new IdentifierExpr(x.Origin, x));
       // Update the current context
       var newContext = context.FillHole(new IdCtx(ctor));
-      var body = CompilePatternPaths(mti, newContext, LinkedLists.Concat(freshMatchees, remainingMatchees), constructorPaths);
+      var body = CompilePatternPaths(mti, newContext, LinkedLists.FromList(freshMatchees, remainingMatchees), constructorPaths);
       if (body is null) {
         // If no path matches this constructor, drop the case
         continue;
       }
 
       // Otherwise, add the case the new match created at [3]
-      var tok = body.Tok ?? new AutoGeneratedToken(headMatchee.tok);
+      var tok = body.Tok ?? new AutoGeneratedOrigin(headMatchee.Origin);
       var fromBoundVar = ctorToFromBoundVar.Contains(ctor.Name);
       var newMatchCase = CreateMatchCase(tok, ctor, freshPatBV, body, fromBoundVar);
       newMatchCases.Add(newMatchCase);
@@ -396,12 +395,11 @@ private CaseBody CompileHeadsContainingConstructor(MatchCompilationState mti, Ma
         }
 
         var args = new List<Expression>();
-        var literalExpr = new LiteralExpr(mti.Tok, false);
-        literalExpr.Type = Type.Bool;
+        var literalExpr = Expression.CreateBoolLiteral(mti.Tok, false);
         args.Add(literalExpr);
         c.Attributes = new Attributes("split", args, c.Attributes);
       }
-      var newMatchStmt = new MatchStmt(nestedMatchStmt.RangeToken, headMatchee, newMatchCaseStmts, true, mti.Attributes, context);
+      var newMatchStmt = new MatchStmt(nestedMatchStmt.Origin, headMatchee, newMatchCaseStmts, true, mti.Attributes, context);
       newMatchStmt.IsGhost |= mti.CodeContext.IsGhost;
       return new CaseBody(null, newMatchStmt);
     }
@@ -411,12 +409,12 @@ private CaseBody CompileHeadsContainingConstructor(MatchCompilationState mti, Ma
     return new CaseBody(null, newMatchExpr);
   }
 
-  private MatchCase CreateMatchCase(IToken tok, DatatypeCtor ctor, List<BoundVar> freshPatBV, CaseBody bodyContainer, bool fromBoundVar) {
+  private MatchCase CreateMatchCase(IOrigin tok, DatatypeCtor ctor, List<BoundVar> freshPatBV, CaseBody bodyContainer, bool fromBoundVar) {
     MatchCase newMatchCase;
     var cloner = new Cloner(false, true);
     if (bodyContainer.Node is Statement statement) {
-      var body = UnboxStmt(statement).Select(cloner.CloneStmt).ToList();
-      newMatchCase = new MatchCaseStmt(tok.ToRange(), ctor, fromBoundVar, freshPatBV, body, bodyContainer.Attributes);
+      var body = UnboxStmt(statement).Select(stmt => cloner.CloneStmt(stmt, false)).ToList();
+      newMatchCase = new MatchCaseStmt(tok, ctor, fromBoundVar, freshPatBV, body, bodyContainer.Attributes);
     } else {
       var body = (Expression)(bodyContainer.Node);
       var attrs = bodyContainer.Attributes;
@@ -426,14 +424,14 @@ private MatchCase CreateMatchCase(IToken tok, DatatypeCtor ctor, List<BoundVar>
     return newMatchCase;
   }
 
-  private BoundVar CreateBoundVariable(IToken tok, Type type, ICodeContext codeContext) {
+  private BoundVar CreateBoundVariable(IOrigin tok, Type type, ICodeContext codeContext) {
     var name = FreshTempVarName("_mcc#", codeContext);
-    return new BoundVar(new AutoGeneratedToken(tok), name, type);
+    return new BoundVar(new AutoGeneratedOrigin(tok), name, type);
   }
 
-  private IdPattern CreateFreshBindingPattern(IToken tok, Type type, ICodeContext codeContext, bool isGhost = false) {
+  private IdPattern CreateFreshBindingPattern(IOrigin tok, Type type, ICodeContext codeContext, bool isGhost = false) {
     var name = FreshTempVarName("_mcc#", codeContext);
-    return new IdPattern(new AutoGeneratedToken(tok), name, type, null, isGhost);
+    return new IdPattern(new AutoGeneratedOrigin(tok), name, type, null, isGhost);
   }
 
   /*
@@ -507,12 +505,12 @@ private CaseBody CompileHeadsContainingLiteralPattern(MatchCompilationState mti,
     return CreateIfElseIfChain(mti, context, matchees.Head, ifBlocks, defaultBlock);
   }
 
-  private static LiteralExpr GetLiteralExpressionFromPattern(ExtendedPattern head) {
+  public static LiteralExpr GetLiteralExpressionFromPattern(ExtendedPattern head) {
     LiteralExpr lit = null;
     if (head is LitPattern litPattern) {
       lit = litPattern.OptimisticallyDesugaredLit;
-    } else if (head is IdPattern id && id.ResolvedLit != null) {
-      lit = id.ResolvedLit;
+    } else if (head is IdPattern { ResolvedLit: { } resolvedLit }) {
+      lit = resolvedLit;
     }
 
     return lit;
@@ -525,7 +523,7 @@ private CaseBody CreateIfElseIfChain(MatchCompilationState mti, MatchingContext
     if (blocks.Count == 0) {
       if (defaultBlock?.Node is Statement stmt) {
         // Ensures the statements are wrapped in braces
-        return new CaseBody(null, BlockStmtOfCStmt(stmt.RangeToken, stmt));
+        return new CaseBody(null, BlockStmtOfCStmt(stmt.Origin, stmt));
       }
 
       return defaultBlock;
@@ -534,9 +532,9 @@ private CaseBody CreateIfElseIfChain(MatchCompilationState mti, MatchingContext
     var currBlock = blocks.First();
     blocks = blocks.Skip(1).ToList();
 
-    var tok = matchee.Tok;
-    var range = matchee.Tok.ToRange();
-    var guard = new BinaryExpr(mti.Match.Tok, BinaryExpr.Opcode.Eq, matchee, currBlock.Item1) {
+    var tok = matchee.Origin;
+    var range = matchee.Origin;
+    var guard = new BinaryExpr(mti.Match.Origin, BinaryExpr.Opcode.Eq, matchee, currBlock.Item1) {
       ResolvedOp = BinaryExpr.ResolvedOpcode.EqCommon,
       Type = Type.Bool
     };
@@ -582,11 +580,11 @@ private CaseBody CreateIfElseIfChain(MatchCompilationState mti, MatchingContext
     throw new cce.UnreachableException();
   }
 
-  record CaseBody(IToken Tok, Node Node, Attributes Attributes = null);
+  record CaseBody(IOrigin Tok, Node Node, Attributes Attributes = null);
 
-  private CaseBody PackBody(IToken tok, PatternPath path) {
+  private CaseBody PackBody(IOrigin tok, PatternPath path) {
     if (path is StmtPatternPath br) {
-      return new CaseBody(tok, new BlockStmt(tok.ToRange(), br.Body.ToList()), br.Attributes);
+      return new CaseBody(tok, new BlockStmt(tok, br.Body.ToList()), br.Attributes);
     }
 
     if (path is ExprPatternPath) {
@@ -604,24 +602,24 @@ private List<Statement> UnboxStmt(Statement statement) {
     return new List<Statement>() { statement };
   }
 
-  private BlockStmt BlockStmtOfCStmt(RangeToken rangeToken, Statement stmt) {
+  private BlockStmt BlockStmtOfCStmt(IOrigin rangeOrigin, Statement stmt) {
     if (stmt is BlockStmt) {
       return (BlockStmt)stmt;
     }
 
     var stmts = new List<Statement>();
     stmts.Add(stmt);
-    return new BlockStmt(rangeToken, stmts);
+    return new BlockStmt(rangeOrigin, stmts);
   }
 
   private class MatchCompilationState {
     public INestedMatch Match { get; }
-    public readonly IToken[] CaseTok;
+    public readonly IOrigin[] CaseTok;
     public readonly int[] CaseCopyCount;
 
-    public IToken Tok => Match switch {
-      NestedMatchExpr matchExpr => matchExpr.tok,
-      NestedMatchStmt matchStmt => matchStmt.Tok,
+    public IOrigin Tok => Match switch {
+      NestedMatchExpr matchExpr => matchExpr.Origin,
+      NestedMatchStmt matchStmt => matchStmt.Origin,
       _ => throw new ArgumentOutOfRangeException(nameof(Match))
     };
 
@@ -631,7 +629,7 @@ private class MatchCompilationState {
     public MatchCompilationState(INestedMatch match, IReadOnlyList<NestedMatchCase> flattenedCases, ResolutionContext codeContext,
       Attributes attrs = null) {
       this.Match = match;
-      this.CaseTok = flattenedCases.Select(c => c.Tok).ToArray();
+      this.CaseTok = flattenedCases.Select(c => c.Origin).ToArray();
       this.CaseCopyCount = new int[flattenedCases.Count];
       Array.Fill(CaseCopyCount, 1);
       this.CodeContext = codeContext;
@@ -643,14 +641,14 @@ public void UpdateCaseCopyCount(int caseId, int delta) {
     }
   }
 
-  private abstract record PatternPath(IToken Tok, int CaseId, List<ExtendedPattern> Patterns) {
+  private abstract record PatternPath(IOrigin Tok, int CaseId, List<ExtendedPattern> Patterns) {
   }
 
-  private record StmtPatternPath(IToken Tok, int CaseId, List<ExtendedPattern> Patterns,
+  private record StmtPatternPath(IOrigin Tok, int CaseId, List<ExtendedPattern> Patterns,
     IReadOnlyList<Statement> Body, Attributes Attributes) : PatternPath(Tok, CaseId, Patterns) {
 
     public StmtPatternPath(int caseId, NestedMatchCaseStmt x, Attributes attrs = null) :
-      this(x.Tok, caseId, new List<ExtendedPattern>() { x.Pat },
+      this(x.Origin, caseId, new List<ExtendedPattern>() { x.Pat },
       new List<Statement>(x.Body), attrs) {
       Contract.Requires(!(x.Pat is DisjunctivePattern)); // No nested or patterns
     }
@@ -664,10 +662,10 @@ public override string ToString() {
     }
   }
 
-  private record ExprPatternPath(IToken Tok, int CaseId, List<ExtendedPattern> Patterns,
+  private record ExprPatternPath(IOrigin Tok, int CaseId, List<ExtendedPattern> Patterns,
     Expression Body, Attributes Attributes) : PatternPath(Tok, CaseId, Patterns) {
 
-    public ExprPatternPath(int caseId, NestedMatchCaseExpr x, Attributes attrs = null) : this(x.Tok, caseId,
+    public ExprPatternPath(int caseId, NestedMatchCaseExpr x, Attributes attrs = null) : this(x.Origin, caseId,
       new List<ExtendedPattern>() { x.Pat }, x.Body, attrs) {
     }
 
@@ -705,26 +703,28 @@ private PatternPath LetBind(IdPattern var, Expression genExpr, PatternPath bodyP
     // to point at the bound variable, not at the source expression
     Expression expr = genExpr;
     if (genExpr.Resolved is IdentifierExpr idExpr) {
-      expr = new IdentifierExpr(var.Tok, idExpr.Var);
+      expr = new IdentifierExpr(var.Origin, idExpr.Var);
     }
     if (bodyPath is StmtPatternPath stmtPath) {
       if (stmtPath.Body.Count <= 0 && var.Type is TypeProxy) {
         return stmtPath;
       }
 
-      var caseLocal = new LocalVariable(var.RangeToken, name, type, isGhost);
-      caseLocal.type = type;
-      var casePattern = new CasePattern<LocalVariable>(caseLocal.RangeToken.EndToken, caseLocal);
+      var caseLocal = new LocalVariable(var.Origin, name, type, isGhost) {
+        type = type
+      };
+      var casePattern = new CasePattern<LocalVariable>(caseLocal.Origin.EndToken, caseLocal);
       casePattern.AssembleExpr(new List<Type>());
-      var caseLet = new VarDeclPattern(caseLocal.RangeToken, casePattern, expr, false);
-      caseLet.IsGhost = isGhost;
+      var caseLet = new VarDeclPattern(caseLocal.Origin, casePattern, expr, false) {
+        IsGhost = isGhost
+      };
 
-      var substitutions = new Dictionary<IVariable, Expression>() {
-        { var.BoundVar, new IdentifierExpr(var.BoundVar.Tok, caseLocal)}
+      var substitutions = new Dictionary<IVariable, IVariable>() {
+        { var.BoundVar, caseLocal }
       };
 
       var cloner = new SubstitutingCloner(substitutions, true);
-      var clonedBody = stmtPath.Body.Select(s => cloner.CloneStmt(s)).ToList();
+      var clonedBody = stmtPath.Body.Select(s => cloner.CloneStmt(s, false)).ToList();
 
       return new StmtPatternPath(stmtPath.Tok, stmtPath.CaseId, stmtPath.Patterns, new[] { caseLet }.Concat(clonedBody).ToList(), stmtPath.Attributes);
     }
@@ -732,14 +732,14 @@ private PatternPath LetBind(IdPattern var, Expression genExpr, PatternPath bodyP
     if (bodyPath is ExprPatternPath exprPath) {
       var cBVar = (BoundVar)var.BoundVar;
       cBVar.IsGhost = isGhost;
-      var cPat = new CasePattern<BoundVar>(cBVar.Tok, cBVar);
+      var cPat = new CasePattern<BoundVar>(cBVar.Origin, cBVar);
       cPat.AssembleExpr(new List<Type>());
       var cPats = new List<CasePattern<BoundVar>>();
       cPats.Add(cPat);
       var exprs = new List<Expression>();
       exprs.Add(expr);
 
-      var letExpr = new LetExpr(cBVar.tok, cPats, exprs, exprPath.Body, true);
+      var letExpr = new LetExpr(cBVar.Origin, cPats, exprs, exprPath.Body, true);
       letExpr.Type = exprPath.Body.Type;
       return new ExprPatternPath(exprPath.Tok, exprPath.CaseId, exprPath.Patterns, letExpr, exprPath.Attributes);
     } else {
diff --git a/Source/DafnyCore/Compilers/CSharp/Compiler-Csharp.cs b/Source/DafnyCore/Compilers/CSharp/Compiler-Csharp.cs
deleted file mode 100644
index bd3164593b1..00000000000
--- a/Source/DafnyCore/Compilers/CSharp/Compiler-Csharp.cs
+++ /dev/null
@@ -1,3397 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) Microsoft Corporation.  All Rights Reserved.
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-//
-//-----------------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.IO;
-using System.Diagnostics.Contracts;
-using Microsoft.CodeAnalysis.CSharp;
-using System.Text.RegularExpressions;
-using JetBrains.Annotations;
-using Microsoft.BaseTypes;
-using Microsoft.Boogie;
-using static Microsoft.Dafny.ConcreteSyntaxTreeUtils;
-
-namespace Microsoft.Dafny.Compilers {
-  public class CsharpCompiler : SinglePassCompiler {
-    protected bool Synthesize = false;
-
-    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
-      Feature.SubsetTypeTests,
-      Feature.TuplesWiderThan20
-    };
-
-    public CsharpCompiler(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
-    }
-
-    const string DafnyISet = "Dafny.ISet";
-    const string DafnyIMultiset = "Dafny.IMultiSet";
-    const string DafnyISeq = "Dafny.ISequence";
-    const string DafnyIMap = "Dafny.IMap";
-
-    const string DafnySetClass = "Dafny.Set";
-    const string DafnyMultiSetClass = "Dafny.MultiSet";
-    const string DafnySeqClass = "Dafny.Sequence";
-    const string DafnyMapClass = "Dafny.Map";
-
-    const string DafnyHelpersClass = "Dafny.Helpers";
-
-    static string FormatTypeDescriptorVariable(string typeVarName) => $"_td_{typeVarName}";
-    string FormatTypeDescriptorVariable(TypeParameter tp) => FormatTypeDescriptorVariable(tp.GetCompileName(Options));
-    const string TypeDescriptorMethodName = "_TypeDescriptor";
-
-    string FormatDefaultTypeParameterValue(TopLevelDecl tp) {
-      Contract.Requires(tp is TypeParameter || tp is AbstractTypeDecl);
-      if (tp is AbstractTypeDecl) {
-        // This is unusual. Typically, the compiler never needs to compile an abstract type, but this abstract type
-        // is apparently an :extern (or a compiler error has already been reported and we're just trying to get to
-        // the end of compilation without crashing). It's difficult to say what the compiler could do in this situation, since
-        // it doesn't know how to generate code that produces a legal value of the abstract type. If we don't do
-        // anything different from the common case (the "else" branch below), then the code emitted will not
-        // compile (see github issue #1151). So, to do something a wee bit better, we emit a placebo value. This
-        // will only work when the abstract type is in the same module and has no type parameters.
-        return $"default({tp.EnclosingModuleDefinition.GetCompileName(Options) + "." + tp.GetCompileName(Options)})";
-      } else {
-        // this is the common case
-        return $"_default_{tp.GetCompileName(Options)}";
-      }
-    }
-
-    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
-      wr.WriteLine("// Dafny program {0} compiled into C#", program.Name);
-      wr.WriteLine("// To recompile, you will need the libraries");
-      wr.WriteLine("//     System.Runtime.Numerics.dll System.Collections.Immutable.dll");
-      wr.WriteLine("// but the 'dotnet' tool in net6.0 should pick those up automatically.");
-      wr.WriteLine("// Optionally, you may want to include compiler switches like");
-      wr.WriteLine("//     /debug /nowarn:162,164,168,183,219,436,1717,1718");
-      wr.WriteLine();
-      wr.WriteLine("using System;");
-      wr.WriteLine("using System.Numerics;");
-      wr.WriteLine("using System.Collections;");
-      Synthesize = ProgramHasMethodsWithAttr(program, "synthesize");
-      if (Synthesize) {
-        CsharpSynthesizer.EmitImports(wr);
-      }
-      EmitDafnySourceAttribute(program, wr);
-
-      if (Options.IncludeRuntime) {
-        ReadRuntimeSystem(program, "DafnyRuntime.cs", wr);
-      }
-
-    }
-
-    /// <summary>
-    /// Return true if the AST contains a method annotated with an attribute
-    /// </summary>
-    private static bool ProgramHasMethodsWithAttr(Program p, String attr) {
-      foreach (var module in p.Modules()) {
-        foreach (ICallable callable in ModuleDefinition.AllCallables(
-                   module.TopLevelDecls)) {
-          if ((callable is Method method) &&
-              Attributes.Contains(method.Attributes, attr)) {
-            return true;
-          }
-        }
-      }
-      return false;
-    }
-
-    void EmitDafnySourceAttribute(Program program, ConcreteSyntaxTree wr) {
-      Contract.Requires(program != null);
-      Contract.Requires(wr != null);
-
-      var stringWriter = new StringWriter();
-      stringWriter.NewLine = Environment.NewLine;
-      var oldValue = Options.ShowEnv;
-      Options.ShowEnv = ExecutionEngineOptions.ShowEnvironment.DuringPrint;
-      new Printer(stringWriter, Options, PrintModes.Serialization).PrintProgramLargeStack(program, true);
-      Options.ShowEnv = oldValue;
-      var programString = stringWriter.GetStringBuilder().Replace("\"", "\"\"").ToString();
-
-      wr.WriteLine($"[assembly: DafnyAssembly.DafnySourceAttribute(@\"{programString}\")]");
-      wr.WriteLine();
-    }
-
-    protected override void EmitBuiltInDecls(SystemModuleManager systemModuleManager, ConcreteSyntaxTree wr) {
-      if (systemModuleManager.MaxNonGhostTupleSizeUsed > 20) {
-        UnsupportedFeatureError(systemModuleManager.MaxNonGhostTupleSizeToken, Feature.TuplesWiderThan20);
-      }
-
-      var dafnyNamespace = CreateModule("Dafny", false, false, null, wr);
-      EmitInitNewArrays(systemModuleManager, dafnyNamespace);
-      if (Synthesize) {
-        CsharpSynthesizer.EmitMultiMatcher(dafnyNamespace);
-      }
-      EmitFuncExtensions(systemModuleManager, wr);
-    }
-
-    // Generates casts for functions of those arities present in the program, like:
-    //   public static class FuncExtensions {
-    //     public static Func<U, UResult> DowncastClone<T, TResult, U, UResult>(this Func<T, TResult> F,
-    //         Func<U, T> ArgConv, Func<TResult, UResult> ResConv) {
-    //       return arg => ResConv(F(ArgConv(arg)));
-    //     }
-    //     ...
-    //   }
-    // They aren't in any namespace to make them universally accessible.
-    private void EmitFuncExtensions(SystemModuleManager systemModuleManager, ConcreteSyntaxTree wr) {
-      var funcExtensions = wr.NewNamedBlock("internal static class FuncExtensions");
-      foreach (var kv in systemModuleManager.ArrowTypeDecls) {
-        int arity = kv.Key;
-
-        List<string> TypeParameterList(string prefix) {
-          var l = arity switch {
-            1 => new List<string> { prefix },
-            _ => Enumerable.Range(1, arity).Select(i => $"{prefix}{i}").ToList()
-          };
-          l.Add($"{prefix}Result");
-          return l;
-        }
-
-        var us = TypeParameterList("U");
-        var ts = TypeParameterList("T");
-
-        string ArgConvDecl((string u, string t) tp) => $"Func<{tp.u}, {tp.t}> ArgConv";
-        var argConvDecls = arity switch {
-          0 => "",
-          1 => $"{ArgConvDecl(("U", "T"))}, ",
-          _ => Enumerable.Zip(us.SkipLast(1), ts.SkipLast(1))
-                 .Comma((tp, i) => $"{ArgConvDecl(tp)}{++i}")
-               + ", "
-        };
-
-        var parameters = $"this Func<{ts.Comma()}> F, {argConvDecls}Func<TResult, UResult> ResConv";
-        funcExtensions.Write($"public static Func<{us.Comma()}> DowncastClone<{ts.Concat(us).Comma()}>({parameters})");
-
-        var binder = arity switch { 1 => "arg", _ => $"({Enumerable.Range(1, arity).Comma(i => $"arg{i}")})" };
-        var argConvCalls = arity switch {
-          1 => "ArgConv(arg)",
-          _ => Enumerable.Range(1, arity).Comma(i => $"ArgConv{i}(arg{i})")
-        };
-        funcExtensions.NewBlock().WriteLine($"return {binder} => ResConv(F({argConvCalls}));");
-      }
-    }
-
-    private void EmitInitNewArrays(SystemModuleManager systemModuleManager, ConcreteSyntaxTree dafnyNamespace) {
-      var arrayHelpers = dafnyNamespace.NewNamedBlock("internal class ArrayHelpers");
-      foreach (var decl in systemModuleManager.SystemModule.TopLevelDecls) {
-        if (decl is ArrayClassDecl classDecl) {
-          int dims = classDecl.Dims;
-
-          // Here is an overloading of the method name, where there is an initialValue parameter
-          // public static T[,] InitNewArray2<T>(T z, BigInteger size0, BigInteger size1) {
-          arrayHelpers.Write(
-            $"public static T[{Repeat("", dims, ",")}] InitNewArray{dims}<T>(T z, {Repeat("BigInteger size{0}", dims, ", ")})");
-
-          var w = arrayHelpers.NewBlock();
-          // int s0 = (int)size0;
-          for (int i = 0; i < dims; i++) {
-            w.WriteLine("int s{0} = (int)size{0};", i);
-          }
-
-          // T[,] a = new T[s0, s1];
-          w.WriteLine($"T[{Repeat("", dims, ",")}] a = new T[{Repeat("s{0}", dims, ",")}];");
-
-          // for (int i0 = 0; i0 < s0; i0++) {
-          //   for (int i1 = 0; i1 < s1; i1++) {
-          var wLoopNest = w;
-          for (int i = 0; i < dims; i++) {
-            wLoopNest = wLoopNest.NewNamedBlock("for (int i{0} = 0; i{0} < s{0}; i{0}++)", i);
-          }
-
-          // a[i0,i1] = z;
-          wLoopNest.WriteLine($"a[{Repeat("i{0}", dims, ",")}] = z;");
-          // return a;
-          w.WriteLine("return a;");
-        }
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
-      var wr = ((ClassWriter)cw).StaticMemberWriter;
-      // See EmitCallToMain() - this is named differently because otherwise C# tries
-      // to resolve the reference to the instance-level Main method
-      return wr.NewBlock($"public static void _StaticMain(Dafny.ISequence<Dafny.ISequence<{CharTypeName}>> {argsParameterName})");
-    }
-
-    protected override ConcreteSyntaxTree CreateModule(string moduleName, bool isDefault, bool isExtern, string /*?*/ libraryName, ConcreteSyntaxTree wr) {
-      return wr.NewBlock($"namespace {IdProtect(moduleName)}", " // end of " + $"namespace {IdProtect(moduleName)}");
-    }
-
-    protected override string GetHelperModuleName() => DafnyHelpersClass;
-
-    const string DafnyTypeDescriptor = "Dafny.TypeDescriptor";
-
-    internal string TypeParameters(List<TypeParameter>/*?*/ targs, bool addVariance = false, bool uniqueNames = false) {
-      Contract.Requires(targs == null || cce.NonNullElements(targs));
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      if (targs == null || targs.Count == 0) {
-        return "";
-      }
-
-      string PrintVariance(TypeParameter.TPVariance variance) {
-        if (addVariance) {
-          switch (variance) {
-            case TypeParameter.TPVariance.Co:
-              return "out ";
-            case TypeParameter.TPVariance.Contra:
-              return "in ";
-          }
-        }
-        return "";
-      }
-
-      string PrintTypeParameter(TypeParameter tArg) => $"{PrintVariance(tArg.Variance)}{(uniqueNames ? "__" : "")}{IdName(tArg)}";
-
-      return $"<{targs.Comma(PrintTypeParameter)}>";
-    }
-
-    protected override IClassWriter CreateClass(string moduleName, string name, bool isExtern, string /*?*/ fullPrintName,
-      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type>/*?*/ superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      var wBody = WriteTypeHeader("partial class", name, typeParameters, superClasses, tok, wr);
-
-      ConcreteSyntaxTree/*?*/ wCtorBody = null;
-      if (cls is ClassLikeDecl cl) {
-        if (cl.Members.TrueForAll(member => !(member is Constructor ctor) || !ctor.IsExtern(Options, out var _, out var _))) {
-          // This is a (non-default) class with no :extern constructor, so emit a C# constructor for the target class
-          EmitTypeDescriptorsForClass(typeParameters, cls, out var wTypeFields, out var wCtorParams, out _, out wCtorBody);
-          wBody.Append(wTypeFields);
-          wBody.Format($"public {name}({wCtorParams})").NewBlock().Append(wCtorBody);
-        }
-      }
-
-      return new ClassWriter(this, wBody, wCtorBody);
-    }
-
-    /// <summary>
-    /// For each type parameter X in "typeParametersForClass" that needs a type descriptor,
-    ///   * Write "protected TypeDescriptor<X> _td_X;" to wTypeFields
-    ///     -- each entry is terminated by a newline
-    ///   * Write "TypeDescriptor<X> _td_X" to wCtorParams
-    ///     -- entries are separated by a comma
-    ///   * Write "_td_X" to wCallArguments
-    ///     -- entries are separated by a comma
-    ///   * Write "this._td_X := _td_X;" to wCtorBody
-    ///     -- each entry is terminated by a newline
-    /// The method returns the number type descriptors written.
-    /// </summary>
-    int EmitTypeDescriptorsForClass(List<TypeParameter> typeParametersForClass, TopLevelDecl cls,
-      out ConcreteSyntaxTree wTypeFields, out ConcreteSyntaxTree wCtorParams,
-      out ConcreteSyntaxTree wCallArguments, out ConcreteSyntaxTree wCtorBody,
-      List<TypeParameter> alternateTypeParameters = null) {
-
-      wTypeFields = new ConcreteSyntaxTree();
-      wCtorParams = new ConcreteSyntaxTree();
-      wCallArguments = new ConcreteSyntaxTree();
-      wCtorBody = new ConcreteSyntaxTree();
-      int numberOfEmittedTypeDescriptors = 0;
-      if (typeParametersForClass != null) {
-        var sep = "";
-        foreach (var (ta, index) in TypeArgumentInstantiation.ListFromFormals(typeParametersForClass).Indexed()) {
-          if (NeedsTypeDescriptor(ta.Formal)) {
-            var fieldName = FormatTypeDescriptorVariable((alternateTypeParameters == null ? ta.Formal : alternateTypeParameters[index]).GetCompileName(Options));
-            var actualType = alternateTypeParameters == null ? ta.Actual : new UserDefinedType(ta.Formal.tok, alternateTypeParameters[index]);
-            var paramName = TypeDescriptor(actualType, wCallArguments, ta.Formal.tok);
-            var decl = $"{DafnyTypeDescriptor}<{TypeName(actualType, wTypeFields, ta.Formal.tok)}> {fieldName}";
-
-            wTypeFields.WriteLine($"protected {decl};");
-            if (ta.Formal.Parent == cls) {
-              wCtorParams.Write($"{sep}{decl}");
-            }
-            wCtorBody.WriteLine($"this.{fieldName} = {paramName};");
-            wCallArguments.Write($"{sep}{paramName}");
-
-            sep = ", ";
-            numberOfEmittedTypeDescriptors++;
-          }
-        }
-      }
-      return numberOfEmittedTypeDescriptors;
-    }
-
-    /// <summary>
-    /// Generate the "_TypeDescriptor" method for a generated class.
-    /// </summary>
-    private void EmitTypeDescriptorMethod(TopLevelDecl enclosingTypeDecl, ConcreteSyntaxTree wr) {
-      Contract.Requires(enclosingTypeDecl != null);
-      Contract.Requires(wr != null);
-
-      var type = UserDefinedType.FromTopLevelDecl(enclosingTypeDecl.tok, enclosingTypeDecl);
-      var initializer = DefaultValue(type, wr, enclosingTypeDecl.tok, true);
-
-      var targetTypeName = TypeName(type, wr, enclosingTypeDecl.tok);
-      var typeDescriptorExpr = $"new {DafnyTypeDescriptor}<{targetTypeName}>({initializer})";
-
-      if (enclosingTypeDecl.TypeArgs.Count == 0) {
-        wr.WriteLine($"private static readonly {DafnyTypeDescriptor}<{targetTypeName}> _TYPE = {typeDescriptorExpr};");
-        typeDescriptorExpr = "_TYPE"; // use the precomputed value
-      }
-
-      List<TypeParameter> typeDescriptorParams;
-      if (enclosingTypeDecl is DatatypeDecl dtDecl) {
-        typeDescriptorParams = UsedTypeParameters(dtDecl, true);
-      } else {
-        typeDescriptorParams = enclosingTypeDecl.TypeArgs;
-      }
-
-      var parameters = typeDescriptorParams.Comma(tp => $"{DafnyTypeDescriptor}<{tp.GetCompileName(Options)}> {FormatTypeDescriptorVariable(tp.GetCompileName(Options))}");
-      var wTypeMethodBody = wr.Write($"public static {DafnyTypeDescriptor}<{targetTypeName}> {TypeDescriptorMethodName}({parameters})").NewBlock();
-      wTypeMethodBody.WriteLine($"return {typeDescriptorExpr};");
-    }
-
-    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
-      TraitDecl trait, List<Type> superClasses /*?*/, IToken tok, ConcreteSyntaxTree wr) {
-      var instanceMemberWriter = WriteTypeHeader("interface", name, typeParameters, superClasses, tok, wr);
-
-      //writing the _Companion class
-      wr.Write($"public class _Companion_{name}{TypeParameters(typeParameters)}");
-      var staticMemberWriter = wr.NewBlock();
-
-      return new ClassWriter(this, instanceMemberWriter, null, staticMemberWriter);
-    }
-
-    private ConcreteSyntaxTree WriteTypeHeader(string kind, string name, List<TypeParameter> typeParameters, List<Type>/*?*/ superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      wr.Write($"public {kind} {IdProtect(name)}{TypeParameters(typeParameters)}");
-      var realSuperClasses = superClasses?.Where(trait => !trait.IsObject).ToList() ?? new List<Type>();
-      if (realSuperClasses.Any()) {
-        wr.Write($" : {realSuperClasses.Comma(trait => TypeName(trait, wr, tok))}");
-      }
-      return wr.NewBlock();
-    }
-
-    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
-      // An iterator is compiled as follows:
-      //   public class MyIteratorExample<T>
-      //   {
-      //     public T q;  // in-parameter
-      //     public T x;  // yield-parameter
-      //     public int y;  // yield-parameter
-      //     IEnumerator<object> _iter;
-      //
-      //     public void _MyIteratorExample(T q) {
-      //       this.q = q;
-      //       _iter = TheIterator();
-      //     }
-      //
-      //     public bool MoveNext() {
-      //       return _iter.MoveNext();
-      //     }
-      //
-      //     private IEnumerator<object> TheIterator() {
-      //       // the translation of the body of the iterator, with each "yield" turning into a "yield return null;"
-      //       yield break;
-      //     }
-      //   }
-
-      var cw = (ClassWriter)CreateClass(IdProtect(iter.EnclosingModuleDefinition.GetCompileName(Options)), IdName(iter), iter, wr);
-      var w = cw.InstanceMemberWriter;
-      // here come the fields
-
-      var constructors = iter.Members.OfType<Constructor>().ToList();
-
-      // we're expecting just one constructor 
-      var enumerable = constructors.ToList();
-      Contract.Assert(enumerable.Count == 1);
-      Constructor ct = constructors[0];
-
-      foreach (var member in iter.Members) {
-        if (member is Field f && !f.IsGhost) {
-          cw.DeclareField(IdName(f), iter, false, false, f.Type, f.tok, PlaceboValue(f.Type, w, f.tok, true), f);
-        }
-      }
-
-      w.WriteLine("System.Collections.Generic.IEnumerator<object> _iter;");
-
-      // here we rely on the parameters and the corresponding fields having the same names
-      var nonGhostFormals = ct.Ins.Where(p => !p.IsGhost).ToList();
-      var parameters = nonGhostFormals.Comma(p => $"{TypeName(p.Type, w, p.tok)} {IdName(p)}");
-
-      // here's the initializer method
-      w.Write($"public void {IdName(ct)}({parameters})");
-      var wBody = w.NewBlock();
-      foreach (var p in nonGhostFormals) {
-        wBody.WriteLine("this.{0} = {0};", IdName(p));
-      }
-
-      wBody.WriteLine("this._iter = TheIterator();");
-      // here are the enumerator methods
-      w.WriteLine("public bool MoveNext() { return _iter.MoveNext(); }");
-      var wIter = w.NewBlock("private System.Collections.Generic.IEnumerator<object> TheIterator()");
-      var beforeYield = wIter.Fork();
-      wIter.WriteLine("yield break;");
-      return beforeYield;
-    }
-
-    private string DtTypeName(TopLevelDecl dt, bool typeVariables = true) {
-      var name = "_I" + dt.GetCompileName(Options);
-      if (typeVariables) { name += TypeParameters(SelectNonGhost(dt, dt.TypeArgs)); }
-      return name;
-    }
-
-    protected override IClassWriter/*?*/ DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
-      var w = CompileDatatypeBase(dt, wr);
-      CompileDatatypeConstructors(dt, wr);
-      return w;
-    }
-
-    IClassWriter CompileDatatypeBase(DatatypeDecl dt, ConcreteSyntaxTree wr) {
-      Contract.Requires(dt != null);
-      Contract.Requires(wr != null);
-
-      // public interface _IDt<T> { // T has variance modifier
-      //   _IDt<T> _Get();  // for co-datatypes
-      //
-      //   bool is_Ctor0 { get; }
-      //   ...
-      //
-      //   T0 dtor_Dtor0 { get; }
-      //   ...
-      //
-      //   _IDt<U> DowncastClone<U>(Func<T0, U0> converter0, ...);
-      //
-      //   // Members that don't violate C# variance restrictions
-      // }
-      //
-      // public abstract class Dt<T> : _IDt<T> {  // for record types: drop "abstract"
-      //   public Dt() { }
-      //   #if TypeArgs.Count == 0
-      //     private static _IDt<T> theDefault = ...;
-      //     public static _IDt<T> Default() {
-      //       return theDefault;
-      //     }
-      //   #else
-      //     public static _IDt<T> Default(values...) {
-      //       return ...;
-      //     }
-      //   #endif
-      //   public static TypeDescriptor<_IDt<T>> _TypeDescriptor(typeDescriptors...) {
-      //     return new TypeDescriptor<_IDt<T>>(Default(typeDescriptors...));
-      //   }
-      //   public abstract _IDt<T> _Get();  // for co-datatypes
-      //
-      //   public static _IDt<T> create_Ctor0(field0, field1, ...) {  // for record types: create
-      //     return new Dt_Ctor0(field0, field1, ...);                // for record types: new Dt
-      //   }
-      //   ...
-      //
-      //   public bool is_Ctor0 { get { return this is Dt_Ctor0; } }  // for record types: return true
-      //   ...
-      //
-      //   // if the datatype HasFinitePossibleValues
-      //   public static System.Collections.Generic.IEnumerable<_IDt<T>> AllSingletonConstructors { get {
-      //     yield return _IDt<T>.create_Ctor0();
-      //     ...
-      //   }}
-      //
-      //   public T0 dtor_Dtor0 { get {
-      //       var d = this;         // for inductive datatypes
-      //       var d = this._Get();  // for co-inductive datatypes
-      //       if (d is DT_Ctor0) { return ((DT_Ctor0)d).Dtor0; }
-      //       if (d is DT_Ctor1) { return ((DT_Ctor1)d).Dtor0; }
-      //       ...
-      //       if (d is DT_Ctor(n-2)) { return ((DT_Ctor(n-2))d).Dtor0; }
-      //       return ((DT_Ctor(n-1))d).Dtor0;  // for record types: drop cast
-      //    }}
-      //   ...
-      //
-      //   public abstract _IDt<U> DowncastClone<U>(Func<T0, U0> converter0, ...); // for record types: implementation
-      //
-      //   // Implementations of all members, but possibly (variance) rewritten to be static.
-      // }
-      var nonGhostTypeArgs = SelectNonGhost(dt, dt.TypeArgs);
-      var DtT_TypeArgs = TypeParameters(nonGhostTypeArgs);
-      var DtT_protected = IdName(dt) + DtT_TypeArgs;
-      var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, UserDefinedType.FromTopLevelDecl(dt.tok, dt));
-      var simplifiedTypeName = TypeName(simplifiedType, wr, dt.tok);
-
-      // ConcreteSyntaxTree for the interface
-      wr.Write($"public interface _I{dt.GetCompileName(Options)}{TypeParameters(nonGhostTypeArgs, true)}");
-      var superTraits = dt.ParentTypeInformation.UniqueParentTraits();
-      if (superTraits.Any()) {
-        wr.Write($" : {superTraits.Comma(trait => TypeName(trait, wr, dt.tok))}");
-      }
-      var interfaceTree = wr.NewBlock();
-
-      // from here on, write everything into the new block created here:
-      var btw = wr.NewNamedBlock("public{0} class {1} : {2}", dt.IsRecordType ? "" : " abstract", DtT_protected, DtTypeName(dt));
-      wr = btw;
-
-      // constructor
-      if (dt.IsRecordType) {
-        DatatypeFieldsAndConstructor(dt.Ctors[0], 0, wr);
-      } else {
-        EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out var wTypeFields, out var wCtorParams, out _, out var wCtorBody);
-        wr.Append(wTypeFields);
-        wr.Format($"public {IdName(dt)}({wCtorParams})").NewBlock().Append(wCtorBody);
-      }
-
-      var wDefault = new ConcreteSyntaxTree();
-      ConcreteSyntaxTree wDefaultTypeArguments;
-      var defaultMethodTypeDescriptorCount = 0;
-      if (nonGhostTypeArgs.Count == 0) {
-        wr.FormatLine($"private static readonly {simplifiedTypeName} theDefault = {wDefault};");
-        var w = wr.NewBlock($"public static {simplifiedTypeName} Default()");
-        w.WriteLine("return theDefault;");
-        wDefaultTypeArguments = new ConcreteSyntaxTree();
-      } else {
-        wr.Write($"public static {simplifiedTypeName} Default(");
-        defaultMethodTypeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out _, out var wDefaultParameters, out wDefaultTypeArguments, out _);
-        var usedTypeParameters = UsedTypeParameters(dt);
-        var parameters = usedTypeParameters.Comma(tp => $"{tp.GetCompileName(Options)} {FormatDefaultTypeParameterValue(tp)}");
-        var sep = defaultMethodTypeDescriptorCount != 0 && usedTypeParameters.Count != 0 ? ", " : "";
-        wr.Write($"{wDefaultParameters}{sep}{parameters})");
-        var w = wr.NewBlock();
-        w.FormatLine($"return {wDefault};");
-      }
-
-      var groundingCtor = dt.GetGroundingCtor();
-      if (groundingCtor.IsGhost) {
-        wDefault.Write(ForcePlaceboValue(simplifiedType, wDefault, dt.tok));
-      } else if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
-        wDefault.Write(DefaultValue(innerType, wDefault, dt.tok));
-      } else {
-        if (dt is CoDatatypeDecl) {
-          var wCo = wDefault;
-          var count = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out _, out _, out var lazyTypeDescriptorArguments, out _);
-          var sep = count > 0 ? ", " : "";
-          wDefault = new ConcreteSyntaxTree();
-          wCo.Format($"new {dt.GetFullCompileName(Options)}__Lazy{DtT_TypeArgs}({lazyTypeDescriptorArguments}{sep}() => {{ return {wDefault}; }})");
-        }
-
-        var wDefaultArguments = wDefault.Write(DtCreateName(groundingCtor)).ForkInParens();
-        wDefaultArguments.Append(wDefaultTypeArguments);
-        var nonGhostFormals = groundingCtor.Formals.Where(f => !f.IsGhost).ToList();
-        if (defaultMethodTypeDescriptorCount != 0 && nonGhostFormals.Count != 0) {
-          wDefaultArguments.Write(", ");
-        }
-        wDefaultArguments.Write(nonGhostFormals.Comma(f => DefaultValue(f.Type, wDefault, f.tok)));
-      }
-
-      EmitTypeDescriptorMethod(dt, wr);
-
-      if (dt is CoDatatypeDecl) {
-        interfaceTree.WriteLine($"{DtTypeName(dt)} _Get();");
-        wr.WriteLine($"public abstract {DtTypeName(dt)} _Get();");
-      }
-
-      // create methods
-      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out _, out var wCtorParams, out var wCallArguments, out _);
-        wr.Write($"public static {DtTypeName(dt)} {DtCreateName(ctor)}(");
-        wr.Append(wCtorParams);
-        var formalCount = WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wr);
-        var sep = typeDescriptorCount > 0 && formalCount > 0 ? ", " : "";
-        wr.NewBlock(")")
-          .WriteLine($"return new {DtCtorDeclarationName(ctor)}{DtT_TypeArgs}({wCallArguments}{sep}{ctor.Formals.Where(f => !f.IsGhost).Comma(FormalName)});");
-      }
-
-      if (dt.IsRecordType) {
-        // Also emit a "create_<ctor_name>" method that thunks to "create",
-        // to provide a more uniform interface.
-
-        var ctor = dt.Ctors[0];
-        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out _, out var wCtorParams, out var wCallArguments, out _);
-        wr.Write($"public static {DtTypeName(dt)} create_{ctor.GetCompileName(Options)}(");
-        wr.Append(wCtorParams);
-        var formalCount = WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wr);
-        var sep = typeDescriptorCount > 0 && formalCount > 0 ? ", " : "";
-        wr.NewBlock(")")
-          .WriteLine($"return create({wCallArguments}{sep}{ctor.Formals.Where(f => !f.IsGhost).Comma(FormalName)});");
-      }
-
-      // query properties
-      if (dt is TupleTypeDecl) {
-        // omit the is_ property for tuples, since it cannot be used syntactically in the language
-      } else {
-        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-          interfaceTree.WriteLine($"bool is_{ctor.GetCompileName(Options)} {{ get; }}");
-
-          var returnValue = dt.IsRecordType
-            // public bool is_Ctor0 { get { return true; } }
-            ? "true"
-            // public bool is_Ctor0 { get { return this is Dt_Ctor0; } }
-            : $"this is {dt.GetCompileName(Options)}_{ctor.GetCompileName(Options)}{DtT_TypeArgs}";
-          wr.WriteLine($"public bool is_{ctor.GetCompileName(Options)} {{ get {{ return {returnValue}; }} }}");
-        }
-      }
-
-      if (dt.HasFinitePossibleValues) {
-        Contract.Assert(nonGhostTypeArgs.Count == 0);
-        var w = wr.NewNamedBlock(
-          $"public static System.Collections.Generic.IEnumerable<{DtTypeName(dt)}> AllSingletonConstructors");
-        var wGet = w.NewBlock("get");
-        foreach (var ctor in dt.Ctors) {
-          Contract.Assert(ctor.Formals.Count == 0);
-          var constructor = ctor.IsGhost
-            ? ForcePlaceboValue(UserDefinedType.FromTopLevelDecl(dt.tok, dt), wGet, dt.tok)
-            : $"{DtT_protected}.{DtCreateName(ctor)}()";
-          wGet.WriteLine($"yield return {constructor};");
-        }
-      }
-
-      CompileDatatypeDestructorsAndAddToInterface(dt, wr, interfaceTree, DtT_TypeArgs);
-
-      CompileDatatypeDowncastClone(dt, interfaceTree, nonGhostTypeArgs, toInterface: true);
-      if (!dt.IsRecordType) {
-        CompileDatatypeDowncastClone(dt, wr, nonGhostTypeArgs);
-      }
-
-      CompileDatatypeInterfaceMembers(dt, interfaceTree);
-
-      return new ClassWriter(this, btw, null);
-    }
-
-    /// <summary>
-    /// Generate the "DowncastClone" code for a generated datatype. This includes the exported signature for the interface,
-    /// the abstract method for the abstract class, and the actual implementations for the constructor classes. If the
-    /// datatype is a record type, there is no abstract class, so the method is directly emitted. Contravariant type
-    /// parameters require a CustomReceiver-like treatment involving static methods and can thus require a jump table in
-    /// the abstract class. Erasable type wrappers require the same kind of CustomReceiver-like treatment and operate
-    /// on the unwrapped type.
-    /// toInterface: just the signature for the interface
-    /// lazy: convert the computer of a codatatype's "__Lazy" class
-    /// ctor: constructor to generate the method for
-    /// </summary>
-    private void CompileDatatypeDowncastClone(DatatypeDecl datatype, ConcreteSyntaxTree wr,
-        List<TypeParameter> nonGhostTypeArgs, bool toInterface = false, bool lazy = false, DatatypeCtor ctor = null) {
-      bool InvalidType(Type ty, bool refTy) =>
-        (ty.AsTypeParameter != null && refTy && datatype.TypeArgs.Contains(ty.AsTypeParameter))
-        || ty.TypeArgs.Exists(arg => InvalidType(arg, refTy || ty.IsRefType));
-
-      if (datatype.Ctors.Any(ctor => ctor.Formals.Any(f => !f.IsGhost && InvalidType(f.SyntacticType, false)))) {
-        return;
-      }
-
-      var customReceiver = DowncastCloneNeedsCustomReceiver(datatype);
-      var uTypeArgs = TypeParameters(nonGhostTypeArgs, uniqueNames: true);
-      var typeArgs = TypeParameters(nonGhostTypeArgs);
-      var typeParameterSubstMap = nonGhostTypeArgs.ToDictionary(
-        tp => tp,
-        tp => new TypeParameter(tp.RangeToken, tp.NameNode.Prepend("_"), tp.VarianceSyntax));
-      var typeSubstMap = nonGhostTypeArgs.ToDictionary(
-        tp => tp,
-        tp => (Type)new UserDefinedType(tp.tok, typeParameterSubstMap[tp]));
-      var uTypeParameters = datatype.TypeArgs.ConvertAll(tp => typeParameterSubstMap[tp]);
-
-      var resultType = DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, datatype, out var innerType)
-        ? TypeName(innerType.Subst(typeSubstMap), wr, datatype.tok)
-        : "_I" + datatype.GetCompileName(Options) + uTypeArgs;
-      var converters = $"{nonGhostTypeArgs.Comma((_, i) => $"converter{i}")}";
-      var lazyClass = $"{datatype.GetFullCompileName(Options)}__Lazy";
-      string PrintConverter(TypeParameter tArg, int i) {
-        var name = IdName(tArg);
-        return $"Func<{name}, __{name}> converter{i}";
-      }
-
-      if (!toInterface) {
-        string Modifiers(string abs, string single, string cons) =>
-          (ctor != null || lazy) ? (datatype.IsRecordType ? single : cons) : abs;
-        var modifiers = customReceiver
-          ? Modifiers("static ", "static ", "new static ")
-          : Modifiers("abstract ", "", "override ");
-        wr.Write($"public {modifiers}");
-      }
-
-      if (!(toInterface && customReceiver)) {
-        var typeDescriptorCount = EmitTypeDescriptorsForClass(datatype.TypeArgs, datatype,
-          out _, out var wTypeDescriptorDecls, out _, out _, uTypeParameters);
-
-        string receiver;
-        if (customReceiver) {
-          var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, UserDefinedType.FromTopLevelDecl(datatype.tok, datatype));
-          receiver = $"{TypeName(simplifiedType, wr, datatype.tok)} _this";
-        } else {
-          receiver = "";
-        }
-
-        var comma0 = typeDescriptorCount != 0 && receiver.Length != 0 ? ", " : "";
-        var comma1 = (typeDescriptorCount != 0 || receiver.Length != 0) && nonGhostTypeArgs.Count != 0 ? ", " : "";
-        wr.Write($"{resultType} DowncastClone{uTypeArgs}({wTypeDescriptorDecls}{comma0}{receiver}{comma1}{nonGhostTypeArgs.Comma(PrintConverter)})");
-      }
-
-      if (ctor == null && !lazy) {
-        if (!customReceiver) {
-          wr.WriteLine(";");
-        } else if (!toInterface) {
-          var body = wr.NewBlock();
-
-          ConcreteSyntaxTree NextBlock(string comp) { return body.NewBlock($"if (_this{comp})"); }
-
-          void WriteReturn(ConcreteSyntaxTree wr, string staticClass) {
-            var typeDescriptorCount = EmitTypeDescriptorsForClass(datatype.TypeArgs, datatype,
-              out _, out _, out var wTypeDescriptorArguments, out _, uTypeParameters);
-            var sep0 = typeDescriptorCount != 0 ? ", " : "";
-            var sep1 = converters.Length != 0 ? ", " : "";
-            wr.WriteLine($"return {staticClass}{typeArgs}.DowncastClone{uTypeArgs}({wTypeDescriptorArguments}{sep0}_this{sep1}{converters});");
-          }
-
-          if (datatype is CoDatatypeDecl) {
-            WriteReturn(NextBlock($" is {lazyClass}{typeArgs}"), lazyClass);
-          }
-
-          var nonGhostConstructors = datatype.Ctors.Where(ctor => !ctor.IsGhost).ToList();
-          for (var i = 0; i < nonGhostConstructors.Count; i++) {
-            var ret = body;
-            //The final constructor is chosen as the default
-            if (i + 1 < nonGhostConstructors.Count) {
-              ret = NextBlock($".is_{nonGhostConstructors[i].GetCompileName(Options)}");
-            }
-            WriteReturn(ret, DtCtorDeclarationName(nonGhostConstructors[i]));
-          }
-        }
-        return;
-      }
-
-      string PrintConvertedExpr(string name, Type fromType) {
-        var constructorIndex = nonGhostTypeArgs.IndexOf(fromType.AsTypeParameter);
-        if (constructorIndex != -1) {
-          return $"converter{constructorIndex}({name})";
-        }
-
-        bool ContainsTyVar(TypeParameter tp, Type ty)
-          => (ty.AsTypeParameter != null && ty.AsTypeParameter.Equals(tp))
-             || ty.TypeArgs.Exists(ty => ContainsTyVar(tp, ty));
-        if (nonGhostTypeArgs.Exists(ty => ContainsTyVar(ty, fromType))) {
-          var map = nonGhostTypeArgs.ToDictionary(
-            tp => tp,
-            tp => (Type)new UserDefinedType(tp.tok, new TypeParameter(tp.RangeToken, tp.NameNode.Prepend("_"), tp.VarianceSyntax)));
-          var to = fromType.Subst(map);
-          var downcast = new ConcreteSyntaxTree();
-          EmitDowncast(fromType, to, null, downcast).Write(name);
-          return downcast.ToString();
-        }
-
-        return name;
-      }
-
-      string PrintInvocation(Formal f, int i) {
-        var name = customReceiver
-          ? datatype.IsRecordType || !f.HasName
-            ? $"(({DtCtorDeclarationName(ctor)}{typeArgs}) _this).{FieldName(f, i)}"
-            : $"_this.{DestructorGetterName(f, ctor, i)}"
-          : FieldName(f, i);
-        return PrintConvertedExpr(name, f.Type);
-      }
-
-      if (innerType != null) {
-        var wBody = wr.NewBlock("");
-        wBody.WriteLine($"return {PrintConvertedExpr("_this", innerType)};");
-      } else {
-        var wBody = wr.NewBlock("").WriteLine($"if ({(customReceiver ? "_" : "")}this is {resultType} dt) {{ return dt; }}");
-        var typeDescriptorCount = EmitTypeDescriptorsForClass(datatype.TypeArgs, datatype, out _, out _, out var wCallArguments, out _, uTypeParameters);
-        var typeDescriptorArgumentsStrings = wCallArguments.ToString();
-        string constructorArgs;
-        if (!lazy) {
-          constructorArgs = ctor.Formals.Where(f => !f.IsGhost).Comma(PrintInvocation);
-        } else if (customReceiver) {
-          var sep0 = typeDescriptorCount != 0 ? ", " : "";
-          var sep1 = converters.Length != 0 ? ", " : "";
-          constructorArgs =
-            $"() => {datatype.GetCompileName(Options)}{typeArgs}.DowncastClone{uTypeArgs}({typeDescriptorArgumentsStrings}{sep0}_this._Get(){sep1}{converters})";
-        } else {
-          var sep0 = typeDescriptorCount != 0 && converters.Length != 0 ? ", " : "";
-          constructorArgs = $"() => _Get().DowncastClone{uTypeArgs}({typeDescriptorArgumentsStrings}{sep0}{converters})";
-        }
-        var sep = typeDescriptorCount != 0 && (lazy || ctor.Formals.Any(f => !f.IsGhost)) ? ", " : "";
-        var className = lazy ? lazyClass : DtCtorDeclarationName(ctor);
-        wBody.WriteLine($"return new {className}{uTypeArgs}({typeDescriptorArgumentsStrings}{sep}{constructorArgs});");
-      }
-    }
-
-    // Emits getters for both named and unnamed destructors. The named ones are grouped across constructors by their
-    // name and thus QDtorM = DtorM. This is not possible for unnamed ones, as there is no guarantee about shared return
-    // types, so they are treated individually and their names (QDtorM) are qualified by their respective constructors.
-    private void CompileDatatypeDestructorsAndAddToInterface(DatatypeDecl dt, ConcreteSyntaxTree wr,
-        ConcreteSyntaxTree interfaceTree, string DtT_TypeArgs) {
-      foreach (var ctor in dt.Ctors) {
-        var index = 0;
-        foreach (var dtor in ctor.Destructors.Where(dtor => dtor.EnclosingCtors[0] == ctor)) {
-          var compiledConstructorCount = dtor.EnclosingCtors.Count(constructor => !constructor.IsGhost);
-          if (compiledConstructorCount != 0) {
-            var arg = dtor.CorrespondingFormals[0];
-            if (!arg.IsGhost) {
-              var DtorM = arg.HasName ? "_" + arg.CompileName : FieldName(arg, index);
-              //   TN dtor_QDtorM { get; }
-              interfaceTree.WriteLine($"{TypeName(arg.Type, wr, arg.tok)} {DestructorGetterName(arg, ctor, index)} {{ get; }}");
-
-              //   public TN dtor_QDtorM { get {
-              //       var d = this;         // for inductive datatypes
-              //       var d = this._Get();  // for co-inductive datatypes
-              //       if (d is DT_Ctor0) { return ((DT_Ctor0)d).DtorM; }
-              //       if (d is DT_Ctor1) { return ((DT_Ctor1)d).DtorM; }
-              //       ...
-              //       if (d is DT_Ctor(n-2)) { return ((DT_Ctor(n-2))d).DtorM; }
-              //       return ((DT_Ctor(n-1))d).DtorM;
-              //    }}
-              var wDtor =
-                wr.NewNamedBlock($"public {TypeName(arg.Type, wr, arg.tok)} {DestructorGetterName(arg, ctor, index)}");
-              var wGet = wDtor.NewBlock("get");
-              if (dt.IsRecordType) {
-                if (dt is CoDatatypeDecl) {
-                  wGet.WriteLine($"return this._Get().{IdProtect(DtorM)};");
-                } else {
-                  wGet.WriteLine($"return this.{IdProtect(DtorM)};");
-                }
-              } else {
-                if (dt is CoDatatypeDecl) {
-                  wGet.WriteLine("var d = this._Get();");
-                } else {
-                  wGet.WriteLine("var d = this;");
-                }
-
-                var compiledConstructorsProcessed = 0;
-                for (var i = 0; i < dtor.EnclosingCtors.Count; i++) {
-                  var ctor_i = dtor.EnclosingCtors[i];
-                  Contract.Assert(arg.CompileName == dtor.CorrespondingFormals[i].CompileName);
-                  if (ctor_i.IsGhost) {
-                    continue;
-                  }
-                  var type = $"{dt.GetCompileName(Options)}_{ctor_i.GetCompileName(Options)}{DtT_TypeArgs}";
-                  // TODO use pattern matching to replace cast.
-                  var returnTheValue = $"return (({type})d).{IdProtect(DtorM)};";
-                  if (compiledConstructorsProcessed < compiledConstructorCount - 1) {
-                    wGet.WriteLine($"if (d is {type}) {{ {returnTheValue} }}");
-                  } else {
-                    wGet.WriteLine(returnTheValue);
-                  }
-                  compiledConstructorsProcessed++;
-                }
-              }
-              index++;
-            }
-          }
-        }
-      }
-    }
-
-    private void CompileDatatypeInterfaceMembers(DatatypeDecl dt, ConcreteSyntaxTree interfaceTree) {
-      foreach (var member in dt.Members) {
-        if (member.IsGhost || member.IsStatic) { continue; }
-        if (member is Function fn && !NeedsCustomReceiver(member)) {
-          CreateFunction(IdName(fn), CombineAllTypeArguments(fn), fn.Formals, fn.ResultType, fn.tok, fn.IsStatic,
-            false, fn, interfaceTree, false, false);
-        } else if (member is Method m && !NeedsCustomReceiver(member)) {
-          CreateMethod(m, CombineAllTypeArguments(m), false, interfaceTree, false, false);
-        } else if (member is ConstantField c && !NeedsCustomReceiver(member)) {
-          CreateFunctionOrGetter(c, IdName(c), dt, false, false, false, new ClassWriter(this, interfaceTree, null));
-        }
-      }
-    }
-
-    string NeedsNew(TopLevelDeclWithMembers ty, string memberName) {
-      Contract.Requires(ty != null);
-      Contract.Requires(memberName != null);
-      if (ty.Members.Exists(member => member.Name == memberName)) {
-        return "new ";
-      } else {
-        return "";
-      }
-    }
-
-    public override bool NeedsCustomReceiver(MemberDecl member) {
-      //Dafny and C# have different ideas about variance, so not every datatype member can be in the interface.
-      if (!member.IsStatic && member.EnclosingClass is DatatypeDecl d) {
-        foreach (var tp in d.TypeArgs) {
-          bool InvalidType(Type ty) => (ty.AsTypeParameter != null && ty.AsTypeParameter.Equals(tp))
-                                       || ty.TypeArgs.Exists(InvalidType);
-          bool InvalidFormal(Formal f) => !f.IsGhost && InvalidType(f.SyntacticType);
-          switch (tp.Variance) {
-            //Can only be in output
-            case TypeParameter.TPVariance.Co:
-              if ((member is Function f && f.Formals.Exists(InvalidFormal))
-                  || (member is Method m && m.Ins.Exists(InvalidFormal))
-                  || NeedsTypeDescriptor(tp)) {
-                return true;
-              }
-              break;
-            //Can only be in input
-            case TypeParameter.TPVariance.Contra:
-              if ((member is Function fn && InvalidType(fn.ResultType))
-                  || (member is Method me && me.Outs.Exists(InvalidFormal))
-                  || (member is ConstantField c && InvalidType(c.Type))) {
-                return true;
-              }
-              break;
-          }
-        }
-      }
-
-      return base.NeedsCustomReceiver(member);
-    }
-
-
-    private void CompileDatatypeConstructors(DatatypeDecl dt, ConcreteSyntaxTree wrx) {
-      Contract.Requires(dt != null);
-      var nonGhostTypeArgs = SelectNonGhost(dt, dt.TypeArgs);
-      string typeParams = TypeParameters(nonGhostTypeArgs);
-      if (dt is CoDatatypeDecl) {
-        // public class Dt__Lazy<T> : Dt<T> {
-        //   public delegate _IDt<T> Computer();
-        //   Computer c;
-        //   _IDt<T> d;
-        //   public Dt__Lazy(Computer c) { this.c = c; }
-        //   public override _IDt<U> DowncastClone<U>(Func<T0, U0> converter0, ...) {
-        //     if (this is _IDt<U> dt) { return dt; }
-        //     return new Dt__Lazy<U>(() => c().DowncastClone<U>(converter0, ...));
-        //   }
-        //   public override _IDt<T> _Get() { if (c != null) { d = c(); c = null; } return d; }
-        //   public override string ToString() { return _Get().ToString(); }
-        // }
-        var w = wrx.NewNamedBlock($"public class {dt.GetCompileName(Options)}__Lazy{typeParams} : {IdName(dt)}{typeParams}");
-        w.WriteLine($"public {NeedsNew(dt, "Computer")}delegate {DtTypeName(dt)} Computer();");
-        w.WriteLine($"{NeedsNew(dt, "c")}Computer c;");
-        w.WriteLine($"{NeedsNew(dt, "d")}{DtTypeName(dt)} d;");
-
-        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out _, out var wCtorParams, out var wBaseCallArguments, out _);
-        var sep = typeDescriptorCount > 0 ? ", " : "";
-        w.NewBlock($"public {dt.GetCompileName(Options)}__Lazy({wCtorParams}{sep}Computer c) : base({wBaseCallArguments})")
-          .WriteLine("this.c = c;");
-        CompileDatatypeDowncastClone(dt, w, nonGhostTypeArgs, lazy: true);
-        w.WriteLine($"public override {DtTypeName(dt)} _Get() {{ if (c != null) {{ d = c(); c = null; }} return d; }}");
-        w.WriteLine("public override string ToString() { return _Get().ToString(); }");
-      }
-
-      if (dt.IsRecordType) {
-        // There is only one constructor, and it is populated by CompileDatatypeBase
-        return;
-      }
-
-      int constructorIndex = 0; // used to give each constructor a different name
-      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-        var wr = wrx.NewNamedBlock(
-          $"public class {DtCtorDeclarationName(ctor)}{TypeParameters(nonGhostTypeArgs)} : {IdName(dt)}{typeParams}");
-        DatatypeFieldsAndConstructor(ctor, constructorIndex, wr);
-        constructorIndex++;
-      }
-    }
-
-    void DatatypeFieldsAndConstructor(DatatypeCtor ctor, int constructorIndex, ConcreteSyntaxTree wr) {
-      Contract.Requires(ctor != null);
-      Contract.Requires(0 <= constructorIndex && constructorIndex < ctor.EnclosingDatatype.Ctors.Count);
-      Contract.Requires(wr != null);
-
-      var dt = ctor.EnclosingDatatype;
-      // class Dt_Ctor<T> : Dt<T> {  // This line is to be added by the caller of DatatypeFieldsAndConstructor
-      //   Fields;
-      //   public Dt_Ctor(arguments) {  // for record types: Dt
-      //     Fields = arguments;
-      //   }
-      //   public override _IDt<T> _Get() { return this; }  // for co-datatypes only
-      //   public override _IDt<U> DowncastClone<U>(Func<T0, U0> converter0, ...) {
-      //     if (this is _IDt<U> dt) {
-      //       return dt;
-      //     } else {
-      //       return new Dt_Ctor<U>(converter0(_field0), ...);
-      //     }
-      //   }
-      //   public override bool Equals(object other) {
-      //     var oth = other as Dt_Ctor;  // for record types: Dt
-      //     return oth != null && equals(_field0, oth._field0) && ... ;
-      //   }
-      //   public override int GetHashCode() {
-      //     return base.GetHashCode();  // surely this can be improved
-      //   }
-      //   public override string ToString() {  // only for inductive datatypes
-      //     // ...
-      //   }
-      // }
-
-      var i = 0;
-      foreach (Formal arg in ctor.Formals) {
-        if (!arg.IsGhost) {
-          wr.WriteLine($"public readonly {TypeName(arg.Type, wr, arg.tok)} {FieldName(arg, i)};");
-          i++;
-        }
-      }
-
-      var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, out var wTypeFields, out var wCtorParams, out var wBaseCallArguments, out var wCtorBody);
-      if (ctor.EnclosingDatatype.IsRecordType) {
-        wr.Append(wTypeFields);
-      }
-      var wBaseCall = new ConcreteSyntaxTree();
-      wr.Format($"public {DtCtorDeclarationName(ctor)}({wCtorParams}){wBaseCall}").NewBlock().Append(wCtorBody);
-      if (!ctor.EnclosingDatatype.IsRecordType) {
-        wBaseCall.Write(" : base").ForkInParens().Append(wBaseCallArguments);
-      }
-      WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wCtorParams);
-      {
-        var w = wCtorBody;
-        i = 0;
-        foreach (Formal arg in ctor.Formals) {
-          if (!arg.IsGhost) {
-            w.WriteLine($"this.{FieldName(arg, i)} = {FormalName(arg, i)};");
-            i++;
-          }
-        }
-      }
-
-      var nonGhostTypeArgs = SelectNonGhost(dt, dt.TypeArgs);
-
-      if (dt is CoDatatypeDecl) {
-        wr.WriteLine($"public override {DtTypeName(dt)} _Get() {{ return this; }}");
-      }
-
-      CompileDatatypeDowncastClone(dt, wr, nonGhostTypeArgs, ctor: ctor);
-
-      // Equals method
-      {
-        var w = wr.NewBlock("public override bool Equals(object other)");
-        w.WriteLine($"var oth = other as {DtCtorName(ctor)}{TypeParameters(nonGhostTypeArgs)};");
-        w.Write("return oth != null");
-        i = 0;
-        foreach (var arg in ctor.Formals) {
-          if (!arg.IsGhost) {
-            var nm = FieldName(arg, i);
-            w.Write(IsDirectlyComparable(DatatypeWrapperEraser.SimplifyType(Options, arg.Type))
-              ? $" && this.{nm} == oth.{nm}"
-              : $" && object.Equals(this.{nm}, oth.{nm})");
-
-            i++;
-          }
-        }
-
-        w.WriteLine(";");
-      }
-
-      // GetHashCode method (Uses the djb2 algorithm)
-      {
-        var w = wr.NewBlock("public override int GetHashCode()");
-        w.WriteLine("ulong hash = 5381;");
-        w.WriteLine($"hash = ((hash << 5) + hash) + {constructorIndex};");
-        i = 0;
-        foreach (Formal arg in ctor.Formals) {
-          if (!arg.IsGhost) {
-            string nm = FieldName(arg, i);
-            w.WriteLine($"hash = ((hash << 5) + hash) + ((ulong){DafnyHelpersClass}.GetHashCode(this.{nm}));");
-            i++;
-          }
-        }
-
-        w.WriteLine("return (int) hash;");
-      }
-
-      {
-        var w = wr.NewBlock("public override string ToString()");
-        string nm;
-        if (dt is TupleTypeDecl) {
-          nm = "";
-        } else {
-          nm = (dt.EnclosingModuleDefinition.IsDefaultModule ? "" : dt.EnclosingModuleDefinition.Name + ".") + dt.Name + "." + ctor.Name;
-        }
-
-        switch (dt) {
-          case TupleTypeDecl tupleDt when ctor.Formals.Count == 0:
-            // here we want parentheses and no name
-            w.WriteLine("return \"()\";");
-            break;
-          case CoDatatypeDecl _:
-            w.WriteLine($"return \"{nm}\";");
-            break;
-          default:
-            var tempVar = GenVarName("s", ctor.Formals);
-            w.WriteLine($"string {tempVar} = \"{nm}\";");
-            if (ctor.Formals.Count != 0) {
-              w.WriteLine($"{tempVar} += \"(\";");
-              i = 0;
-              foreach (var arg in ctor.Formals) {
-                if (!arg.IsGhost) {
-                  if (i != 0) {
-                    w.WriteLine($"{tempVar} += \", \";");
-                  }
-
-                  if (arg.Type.IsStringType && UnicodeCharEnabled) {
-                    w.WriteLine($"{tempVar} += this.{FieldName(arg, i)}.ToVerbatimString(true);");
-                  } else {
-                    w.WriteLine($"{tempVar} += {DafnyHelpersClass}.ToString(this.{FieldName(arg, i)});");
-                  }
-
-                  i++;
-                }
-              }
-
-              w.WriteLine($"{tempVar} += \")\";");
-            }
-
-            w.WriteLine($"return {tempVar};");
-            break;
-        }
-      }
-    }
-
-    private string FieldName(Formal formal, int i) {
-      Contract.Requires(formal != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      return IdProtect("_" + (formal.HasName ? formal.CompileName : "a" + i));
-    }
-
-    /// <summary>
-    /// Returns a protected name.
-    /// </summary>
-    string DtCtorDeclarationName(DatatypeCtor ctor) {
-      Contract.Requires(ctor != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      var dt = ctor.EnclosingDatatype;
-      return dt.IsRecordType ? IdName(dt) : dt.GetCompileName(Options) + "_" + ctor.GetCompileName(Options);
-    }
-
-    /// <summary>
-    /// Returns a protected name with type parameters.
-    /// </summary>
-    string DtCtorName(DatatypeCtor ctor, List<Type> typeArgs, ConcreteSyntaxTree wr) {
-      Contract.Requires(ctor != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      var s = DtCtorName(ctor);
-      if (typeArgs != null && typeArgs.Count != 0) {
-        s += $"<{TypeNames(typeArgs, wr, ctor.tok)}>";
-      }
-
-      return s;
-    }
-
-    /// <summary>
-    /// Returns a protected name. (No type parameters.)
-    /// </summary>
-    string DtCtorName(DatatypeCtor ctor) {
-      Contract.Requires(ctor != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      var dt = ctor.EnclosingDatatype;
-      var dtName = dt.EnclosingModuleDefinition.IsDefaultModule ? IdName(dt) : dt.GetFullCompileName(Options);
-      return dt.IsRecordType ? dtName : dtName + "_" + ctor.GetCompileName(Options);
-    }
-
-    string DtCreateName(DatatypeCtor ctor) {
-      Contract.Assert(!ctor.IsGhost); // there should never be an occasion to ask for a ghost constructor
-      if (ctor.EnclosingDatatype.IsRecordType) {
-        return "create";
-      } else {
-        return "create_" + ctor.GetCompileName(Options);
-      }
-    }
-
-    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
-      var cw = (ClassWriter)CreateClass(IdProtect(nt.EnclosingModuleDefinition.GetCompileName(Options)), IdName(nt), nt, wr);
-      var w = cw.StaticMemberWriter;
-      if (nt.NativeType != null) {
-        var wEnum = w.NewBlock($"public static System.Collections.Generic.IEnumerable<{GetNativeTypeName(nt.NativeType)}> IntegerRange(BigInteger lo, BigInteger hi)");
-        wEnum.WriteLine($"for (var j = lo; j < hi; j++) {{ yield return ({GetNativeTypeName(nt.NativeType)})j; }}");
-      }
-      if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-        var wStmts = w.Fork();
-        var witness = Expr(nt.Witness, false, wStmts).ToString();
-        string typeName;
-        if (nt.NativeType == null) {
-          typeName = TypeName(nt.BaseType, cw.StaticMemberWriter, nt.tok);
-        } else {
-          typeName = GetNativeTypeName(nt.NativeType);
-          witness = $"({typeName})({witness})";
-        }
-        DeclareField("Witness", true, true, true, typeName, witness, cw);
-      }
-      EmitTypeDescriptorMethod(nt, w);
-
-      if (nt.ParentTraits.Count != 0) {
-        DeclareBoxedNewtype(nt, cw.InstanceMemberWriter);
-      }
-
-      return cw;
-    }
-
-    void DeclareBoxedNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
-      // instance field:  public TargetRepresentation _value;
-      var targetTypeName = nt.NativeType == null ? TypeName(nt.BaseType, wr, nt.tok) : GetNativeTypeName(nt.NativeType);
-      wr.WriteLine($"public {targetTypeName} _value;");
-
-      // constructor:
-      // public NewType(TargetRepresentation value) {
-      //   _value = value;
-      // }
-      var wBody = wr.NewNamedBlock($"public {IdName(nt)}({targetTypeName} value)");
-      wBody.WriteLine("_value = value;");
-
-      // public override string ToString() {
-      //   return _value.ToString();
-      // }
-      wBody = wr.NewNamedBlock("public override string ToString()");
-      wBody.WriteLine("return _value.ToString();");
-    }
-
-    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
-      var cw = (ClassWriter)CreateClass(IdProtect(sst.EnclosingModuleDefinition.GetCompileName(Options)), IdName(sst), sst, wr);
-      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-        var sw = new ConcreteSyntaxTree(cw.InstanceMemberWriter.RelativeIndentLevel);
-        var wStmts = cw.InstanceMemberWriter.Fork();
-        sw.Append(Expr(sst.Witness, false, wStmts));
-        var witness = sw.ToString();
-        var typeName = TypeName(sst.Rhs, cw.StaticMemberWriter, sst.tok);
-        if (sst.TypeArgs.Count == 0) {
-          DeclareField("Witness", false, true, true, typeName, witness, cw);
-          witness = "Witness";
-        }
-        var w = cw.StaticMemberWriter.NewBlock($"public static {typeName} Default()");
-        w.WriteLine($"return {witness};");
-      }
-      EmitTypeDescriptorMethod(sst, cw.StaticMemberWriter);
-    }
-
-    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
-      switch (sel) {
-        case NativeType.Selection.Byte:
-          name = "byte";
-          literalSuffix = "";
-          needsCastAfterArithmetic = true;
-          break;
-        case NativeType.Selection.SByte:
-          name = "sbyte";
-          literalSuffix = "";
-          needsCastAfterArithmetic = true;
-          break;
-        case NativeType.Selection.UShort:
-          name = "ushort";
-          literalSuffix = "";
-          needsCastAfterArithmetic = true;
-          break;
-        case NativeType.Selection.Short:
-          name = "short";
-          literalSuffix = "";
-          needsCastAfterArithmetic = true;
-          break;
-        case NativeType.Selection.UInt:
-          name = "uint";
-          literalSuffix = "U";
-          needsCastAfterArithmetic = false;
-          break;
-        case NativeType.Selection.Int:
-          name = "int";
-          literalSuffix = "";
-          needsCastAfterArithmetic = false;
-          break;
-        case NativeType.Selection.Number:
-          name = "number";
-          literalSuffix = "";
-          needsCastAfterArithmetic = false;
-          break;
-        case NativeType.Selection.ULong:
-          name = "ulong";
-          literalSuffix = "UL";
-          needsCastAfterArithmetic = false;
-          break;
-        case NativeType.Selection.Long:
-          name = "long";
-          literalSuffix = "L";
-          needsCastAfterArithmetic = false;
-          break;
-        default:
-          Contract.Assert(false); // unexpected native type
-          throw new cce.UnreachableException(); // to please the compiler
-      }
-    }
-
-    protected class ClassWriter : IClassWriter {
-      public readonly CsharpCompiler Compiler;
-      public readonly ConcreteSyntaxTree InstanceMemberWriter;
-      public readonly ConcreteSyntaxTree StaticMemberWriter;
-      public readonly ConcreteSyntaxTree CtorBodyWriter;
-      private readonly CsharpSynthesizer csharpSynthesizer;
-
-      public ClassWriter(CsharpCompiler compiler, ConcreteSyntaxTree instanceMemberWriter, ConcreteSyntaxTree/*?*/ ctorBodyWriter, ConcreteSyntaxTree/*?*/ staticMemberWriter = null) {
-        Contract.Requires(compiler != null);
-        Contract.Requires(instanceMemberWriter != null);
-        this.Compiler = compiler;
-        this.InstanceMemberWriter = instanceMemberWriter;
-        this.CtorBodyWriter = ctorBodyWriter;
-        this.StaticMemberWriter = staticMemberWriter ?? instanceMemberWriter;
-        this.csharpSynthesizer = new CsharpSynthesizer(Compiler, ErrorWriter());
-      }
-
-      public ConcreteSyntaxTree Writer(bool isStatic, bool createBody, MemberDecl/*?*/ member) {
-        if (createBody) {
-          if (isStatic || (member?.EnclosingClass is TraitDecl && Compiler.NeedsCustomReceiver(member))) {
-            return StaticMemberWriter;
-          }
-        }
-
-        return InstanceMemberWriter;
-      }
-
-      public ConcreteSyntaxTree /*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateMethod(m, typeArgs, createBody, Writer(m.IsStatic, createBody, m), forBodyInheritance, lookasideBody);
-      }
-
-      public ConcreteSyntaxTree SynthesizeMethod(Method method, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance,
-        bool lookasideBody) {
-        return csharpSynthesizer.SynthesizeMethod(method, typeArgs, createBody, Writer(method.IsStatic, createBody, method), forBodyInheritance, lookasideBody);
-      }
-
-      public ConcreteSyntaxTree /*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateFunction(name, typeArgs, formals, resultType, tok, isStatic, createBody, member, Writer(isStatic, createBody, member), forBodyInheritance, lookasideBody);
-      }
-
-      public ConcreteSyntaxTree /*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IToken tok, bool isStatic, bool isConst, bool createBody, MemberDecl /*?*/ member, bool forBodyInheritance) {
-        return Compiler.CreateGetter(name, resultType, tok, isStatic, createBody, Writer(isStatic, createBody, member));
-      }
-
-      public ConcreteSyntaxTree /*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody, MemberDecl /*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
-        return Compiler.CreateGetterSetter(name, resultType, tok, createBody, out setterWriter, Writer(false, createBody, member));
-      }
-
-      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IToken tok, string rhs, Field field) {
-        var typeName = Compiler.TypeName(type, this.StaticMemberWriter, tok);
-        Compiler.DeclareField(name, true, isStatic, isConst, typeName, rhs, this);
-      }
-
-      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
-        throw new cce.UnreachableException(); // InitializeField should be called only for those compilers that set ClassesRedeclareInheritedFields to false.
-      }
-
-      public ConcreteSyntaxTree /*?*/ ErrorWriter() => InstanceMemberWriter;
-
-      public void Finish() { }
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
-      var customReceiver = createBody && !forBodyInheritance && NeedsCustomReceiver(m);
-      var keywords = Keywords(createBody, m.IsStatic || customReceiver, false);
-      var returnType = GetTargetReturnTypeReplacement(m, wr);
-      AddTestCheckerIfNeeded(m.Name, m, wr);
-      var typeParameters = TypeParameters(TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, m, lookasideBody)));
-      var parameters = GetMethodParameters(m, typeArgs, lookasideBody, customReceiver, returnType);
-
-      if (!createBody && m is Constructor) { return null; }
-
-      wr.Format($"{keywords}{returnType} {IdName(m)}{typeParameters}({parameters})");
-
-      if (!createBody) {
-        wr.WriteLine(";");
-        return null;
-      }
-
-      var block = wr.NewBlock(open: BlockStyle.NewlineBrace);
-      if (returnType != "void" && !forBodyInheritance) {
-        var beforeReturnBlock = block.Fork();
-        EmitReturn(m.Outs, block);
-        return beforeReturnBlock;
-      }
-
-      return block;
-    }
-
-    internal string Keywords(bool isPublic = false, bool isStatic = false, bool isExtern = false) {
-      return (isPublic ? "public " : "") + (isStatic ? "static " : "") + (isExtern ? "extern " : "") + (Synthesize && !isStatic && isPublic ? "virtual " : "");
-    }
-
-    internal ConcreteSyntaxTree GetMethodParameters(Method m, List<TypeArgumentInstantiation> typeArgs, bool lookasideBody, bool customReceiver, string returnType) {
-      var parameters = GetFunctionParameters(m.Ins, m, typeArgs, lookasideBody, customReceiver);
-      if (returnType == "void") {
-        WriteFormals(parameters.Nodes.Any() ? ", " : "", m.Outs, parameters);
-      }
-      return parameters;
-    }
-
-    private ConcreteSyntaxTree GetFunctionParameters(List<Formal> formals, MemberDecl m, List<TypeArgumentInstantiation> typeArgs, bool lookasideBody, bool customReceiver) {
-      var parameters = new ConcreteSyntaxTree();
-      var sep = "";
-      WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, m.EnclosingClass, m, lookasideBody), parameters, ref sep,
-        tp => $"{DafnyTypeDescriptor}<{tp.GetCompileName(Options)}> {FormatTypeDescriptorVariable(tp)}");
-      if (customReceiver) {
-        var nt = m.EnclosingClass;
-        var receiverType = UserDefinedType.FromTopLevelDecl(m.tok, nt);
-        DeclareFormal(sep, "_this", receiverType, m.tok, true, parameters);
-        sep = ", ";
-      }
-
-      WriteFormals(sep, formals, parameters);
-      return parameters;
-    }
-
-    internal string GetTargetReturnTypeReplacement(Method m, ConcreteSyntaxTree wr) {
-      string/*?*/ targetReturnTypeReplacement = null;
-      foreach (var p in m.Outs) {
-        if (!p.IsGhost) {
-          if (targetReturnTypeReplacement == null) {
-            targetReturnTypeReplacement = TypeName(p.Type, wr, p.tok);
-          } else {
-            // there's more than one out-parameter, so bail
-            targetReturnTypeReplacement = null;
-            break;
-          }
-        }
-      }
-
-      targetReturnTypeReplacement ??= "void";
-      return targetReturnTypeReplacement;
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member, ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
-
-      var customReceiver = createBody && !forBodyInheritance && NeedsCustomReceiver(member);
-
-      AddTestCheckerIfNeeded(name, member, wr);
-      wr.Write(Keywords(createBody, isStatic || customReceiver, false));
-
-      var typeParameters = TypeParameters(TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, member, lookasideBody)));
-      var parameters = GetFunctionParameters(formals, member, typeArgs, lookasideBody, customReceiver);
-
-      wr.Write($"{TypeName(resultType, wr, tok)} {name}{typeParameters}({parameters})");
-      if (!createBody) {
-        wr.WriteLine(";");
-        return null;
-      }
-
-      return wr.NewBlock(open: formals.Count > 1 ? BlockStyle.NewlineBrace : BlockStyle.SpaceBrace);
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateGetter(string name, Type resultType, IToken tok, bool isStatic, bool createBody, ConcreteSyntaxTree wr) {
-      ConcreteSyntaxTree/*?*/ result = null;
-      var body = createBody ? Block(out result, close: BlockStyle.Brace) : new ConcreteSyntaxTree().Write(";");
-      wr.FormatLine($"{Keywords(createBody, isStatic)}{TypeName(resultType, wr, tok)} {name} {{ get{body} }}");
-      return result;
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody, out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree wr) {
-      wr.Write($"{Keywords(createBody)}{TypeName(resultType, wr, tok)} {name}");
-      if (createBody) {
-        var w = wr.NewBlock();
-        var wGet = w.NewBlock("get");
-        var wSet = w.NewBlock("set");
-        setterWriter = wSet;
-        return wGet;
-      } else {
-        wr.WriteLine(" { get; set; }");
-        setterWriter = null;
-        return null;
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
-      Contract.Assume(member is Method { IsTailRecursive: true } or Function { IsTailRecursive: true }); // precondition
-      if (!member.IsStatic && !NeedsCustomReceiver(member)) {
-        var receiverType = member.EnclosingClass is DatatypeDecl dt ? DtTypeName(dt) : "var";
-        wr.WriteLine($"{receiverType} _this = this;");
-      }
-      wr.Fork(-1).WriteLine("TAIL_CALL_START: ;");
-      return wr;
-    }
-
-    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
-      wr.WriteLine("goto TAIL_CALL_START;");
-    }
-
-    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member = null) {
-      Contract.Ensures(Contract.Result<string>() != null);
-      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
-
-      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
-      if (xType is BoolType) {
-        return "bool";
-      } else if (xType is CharType) {
-        return CharTypeName;
-      } else if (xType is IntType || xType is BigOrdinalType) {
-        return "BigInteger";
-      } else if (xType is RealType) {
-        return "Dafny.BigRational";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        return t.NativeType != null ? GetNativeTypeName(t.NativeType) : "BigInteger";
-      } else if (xType.AsNewtype != null && member == null) {  // when member is given, use UserDefinedType case below
-        var nativeType = xType.AsNewtype.NativeType;
-        if (nativeType != null) {
-          return GetNativeTypeName(nativeType);
-        }
-        return TypeName(xType.AsNewtype.BaseType, wr, tok);
-      } else if (xType.IsObjectQ) {
-        return "object";
-      } else if (xType.IsArrayType) {
-        ArrayClassDecl at = xType.AsArrayType;
-        Contract.Assert(at != null);  // follows from type.IsArrayType
-        Type elType = UserDefinedType.ArrayElementType(xType);
-        TypeName_SplitArrayName(elType, wr, tok, out string typeNameSansBrackets, out string brackets);
-        return typeNameSansBrackets + TypeNameArrayBrackets(at.Dims) + brackets;
-      } else if (xType is UserDefinedType udt) {
-        if (udt.ResolvedClass is TypeParameter tp) {
-          if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(tp, out var instantiatedTypeParameter)) {
-            return TypeName(instantiatedTypeParameter, wr, tok, member);
-          }
-        }
-        var s = FullTypeName(udt, member);
-        var cl = udt.ResolvedClass;
-        return TypeName_UDT(s, udt, wr, udt.tok);
-      } else if (xType is SetType) {
-        Type argType = ((SetType)xType).Arg;
-        return DafnyISet + "<" + TypeName(argType, wr, tok) + ">";
-      } else if (xType is SeqType) {
-        Type argType = ((SeqType)xType).Arg;
-        return DafnyISeq + "<" + TypeName(argType, wr, tok) + ">";
-      } else if (xType is MultiSetType) {
-        Type argType = ((MultiSetType)xType).Arg;
-        return DafnyIMultiset + "<" + TypeName(argType, wr, tok) + ">";
-      } else if (xType is MapType) {
-        Type domType = ((MapType)xType).Domain;
-        Type ranType = ((MapType)xType).Range;
-        return DafnyIMap + "<" + TypeName(domType, wr, tok) + "," + TypeName(ranType, wr, tok) + ">";
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    // To improve readability
-    private bool CharIsRune => UnicodeCharEnabled;
-    private string CharTypeName => UnicodeCharEnabled ? "Dafny.Rune" : "char";
-    private string CharTypeDescriptorName => DafnyHelpersClass + (UnicodeCharEnabled ? ".RUNE" : ".CHAR");
-
-    private void ConvertFromChar(Expression e, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
-      if (e.Type.IsCharType && UnicodeCharEnabled) {
-        wr.Write("(");
-        TrParenExpr(e, wr, inLetExprBody, wStmts);
-        wr.Write(".Value)");
-      } else {
-        TrParenExpr(e, wr, inLetExprBody, wStmts);
-      }
-    }
-
-    public string TypeHelperName(Type type, ConcreteSyntaxTree wr, IToken tok, Type/*?*/ otherType = null) {
-      var xType = type.NormalizeExpand();
-      if (xType is SeqType seqType) {
-        return "Dafny.Sequence" + "<" + CommonTypeName(seqType.Arg, otherType?.AsSeqType?.Arg, wr, tok) + ">";
-      } else if (xType is SetType setType) {
-        return $"{DafnySetClass}<{CommonTypeName(setType.Arg, otherType?.AsSetType?.Arg, wr, tok)}>";
-      } else if (xType is MultiSetType msType) {
-        return $"{DafnyMultiSetClass}<{CommonTypeName(msType.Arg, otherType?.AsMultiSetType?.Arg, wr, tok)}>";
-      } else if (xType is MapType mapType) {
-        var domainType = CommonTypeName(mapType.Domain, otherType?.AsMapType?.Domain, wr, tok);
-        var rangeType = CommonTypeName(mapType.Range, otherType?.AsMapType?.Range, wr, tok);
-        return $"{DafnyMapClass}<{domainType}, {rangeType}>";
-      } else {
-        return TypeName(type, wr, tok);
-      }
-    }
-
-    public string CommonTypeName(Type a, Type /*?*/ b, ConcreteSyntaxTree wr, IToken tok) {
-      if (b == null) {
-        return TypeName(a, wr, tok);
-      }
-      a = a.NormalizeExpand();
-      b = b.NormalizeExpand();
-      if (a.Equals(b)) {
-        return TypeName(a, wr, tok);
-      }
-      // It would be nice to use Meet(a, b) here. Unfortunately, Resolver.Meet also needs a Builtins argument, which we
-      // don't have here.
-      Contract.Assert(a.IsRefType);
-      Contract.Assert(b.IsRefType);
-      return "object";
-    }
-
-    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IToken tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
-      var xType = type.NormalizeExpandKeepConstraints();
-
-      if (usePlaceboValue) {
-        return $"default({TypeName(type, wr, tok)})";
-      }
-
-      if (xType is BoolType) {
-        return "false";
-      } else if (xType is CharType) {
-        return UnicodeCharEnabled ? $"new {CharTypeName}({CharType.DefaultValueAsString})" : CharType.DefaultValueAsString;
-      } else if (xType is IntType || xType is BigOrdinalType) {
-        return "BigInteger.Zero";
-      } else if (xType is RealType) {
-        return "Dafny.BigRational.ZERO";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        return t.NativeType != null ? "0" : "BigInteger.Zero";
-      } else if (xType is CollectionType) {
-        return TypeHelperName(xType, wr, tok) + ".Empty";
-      }
-
-      var udt = (UserDefinedType)xType;
-      var cl = udt.ResolvedClass;
-      Contract.Assert(cl != null);
-      if (cl is TypeParameter tp) {
-        if (constructTypeParameterDefaultsFromTypeDescriptors) {
-          return $"{FormatTypeDescriptorVariable(tp.GetCompileName(Options))}.Default()";
-        } else {
-          return FormatDefaultTypeParameterValue(tp);
-        }
-      } else if (cl is AbstractTypeDecl opaque) {
-        return FormatDefaultTypeParameterValue(opaque);
-      } else if (cl is NewtypeDecl) {
-        var td = (NewtypeDecl)cl;
-        if (td.Witness != null) {
-          return TypeName_UDT(FullTypeName(udt), udt, wr, udt.tok) + ".Witness";
-        } else if (td.NativeType != null) {
-          return "0";
-        } else {
-          return TypeInitializationValue(td.BaseType, wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-      } else if (cl is SubsetTypeDecl) {
-        var td = (SubsetTypeDecl)cl;
-        if (td.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-          return TypeName_UDT(FullTypeName(udt), udt, wr, udt.tok) + ".Default()";
-        } else if (td.WitnessKind == SubsetTypeDecl.WKind.Special) {
-          // WKind.Special is only used with -->, ->, and non-null types:
-          Contract.Assert(ArrowType.IsPartialArrowTypeName(td.Name) || ArrowType.IsTotalArrowTypeName(td.Name) || td is NonNullTypeDecl);
-          if (ArrowType.IsPartialArrowTypeName(td.Name)) {
-            return $"(({TypeName(xType, wr, udt.tok)})null)";
-          } else if (ArrowType.IsTotalArrowTypeName(td.Name)) {
-            var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-            // return the lambda expression ((Ty0 x0, Ty1 x1, Ty2 x2) => rangeDefaultValue)
-            var arguments = Util.Comma(udt.TypeArgs.Count - 1, i => $"{TypeName(udt.TypeArgs[i], wr, udt.tok)} x{i}");
-            return $"(({arguments}) => {rangeDefaultValue})";
-          } else if (((NonNullTypeDecl)td).Class is ArrayClassDecl arrayClass) {
-            // non-null array type; we know how to initialize them
-            TypeName_SplitArrayName(udt.TypeArgs[0], wr, udt.tok, out var typeNameSansBrackets, out var brackets);
-            return $"new {typeNameSansBrackets}[{Util.Comma(arrayClass.Dims, _ => "0")}]{brackets}";
-          } else {
-            // non-null (non-array) type
-            // even though the type doesn't necessarily have a known initializer, it could be that the the compiler needs to
-            // lay down some bits to please the C#'s compiler's different definite-assignment rules.
-            return $"default({TypeName(xType, wr, udt.tok)})";
-          }
-        } else {
-          return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-      } else if (cl is ClassLikeDecl or ArrowTypeDecl) {
-        return $"(({TypeName(xType, wr, udt.tok)})null)";
-      } else if (cl is DatatypeDecl dt) {
-        var s = FullTypeName(udt, ignoreInterface: true);
-        var nonGhostTypeArgs = SelectNonGhost(dt, udt.TypeArgs);
-        if (nonGhostTypeArgs.Count != 0) {
-          s += "<" + TypeNames(nonGhostTypeArgs, wr, udt.tok) + ">";
-        }
-
-
-        var wDefaultTypeArguments = new ConcreteSyntaxTree();
-        var sep = "";
-        WriteTypeDescriptors(dt, udt.TypeArgs, wDefaultTypeArguments, ref sep);
-        var relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs);
-        var arguments = relevantTypeArgs.Comma(ta => DefaultValue(ta.Actual, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors));
-        if (relevantTypeArgs.Count == 0) {
-          sep = "";
-        }
-        return string.Format($"{s}.Default({wDefaultTypeArguments}{sep}{arguments})");
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
-      ConcreteSyntaxTree wr, IToken tok, bool omitTypeArguments = false) {
-      Contract.Assume(fullCompileName != null);  // precondition; this ought to be declared as a Requires in the superclass
-      Contract.Assume(variance != null);  // precondition; this ought to be declared as a Requires in the superclass
-      Contract.Assume(typeArgs != null);  // precondition; this ought to be declared as a Requires in the superclass
-      Contract.Assume(variance.Count == typeArgs.Count);
-      string s = IdProtect(fullCompileName);
-      if (typeArgs.Count != 0) {
-        s += "<" + TypeNames(typeArgs, wr, tok) + ">";
-      }
-      return s;
-    }
-
-    protected override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member) {
-      type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
-      if (type is UserDefinedType udt) {
-        var name = udt.ResolvedClass is TraitDecl ? udt.GetFullCompanionCompileName(Options) : FullTypeName(udt, member, true);
-        return TypeName_UDT(name, udt, wr, tok);
-      } else {
-        return TypeName(type, wr, tok, member);
-      }
-    }
-
-    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
-      if (cl is DatatypeDecl) {
-        needsTypeParameter = false;
-        needsTypeDescriptor = true;
-      } else if (cl is TraitDecl) {
-        needsTypeParameter = false;
-        needsTypeDescriptor = isStatic || lookasideBody;
-      } else {
-        Contract.Assert(cl is ClassDecl);
-        needsTypeParameter = false;
-        needsTypeDescriptor = isStatic;
-      }
-    }
-
-    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      type = DatatypeWrapperEraser.SimplifyType(Options, type, true);
-      if (type is BoolType) {
-        return "Dafny.Helpers.BOOL";
-      } else if (type is CharType) {
-        return CharTypeDescriptorName;
-      } else if (type is IntType || type is BigOrdinalType) {
-        return "Dafny.Helpers.INT";
-      } else if (type is RealType) {
-        return "Dafny.Helpers.REAL";
-      } else if (type is BitvectorType) {
-        var t = (BitvectorType)type;
-        if (t.NativeType != null) {
-          return GetNativeTypeDescriptor(AsNativeType(type));
-        } else {
-          return "Dafny.Helpers.INT";
-        }
-      } else if (type is SetType setType) {
-        return $"{DafnySetClass}<{TypeName(setType.Arg, wr, tok)}>.{TypeDescriptorMethodName}()";
-      } else if (type is SeqType seqType) {
-        return $"{DafnySeqClass}<{TypeName(seqType.Arg, wr, tok)}>.{TypeDescriptorMethodName}()";
-      } else if (type is MultiSetType multisetType) {
-        return $"{DafnyMultiSetClass}<{TypeName(multisetType.Arg, wr, tok)}>.{TypeDescriptorMethodName}()";
-      } else if (type is MapType mapType) {
-        return $"{DafnyMapClass}<{TypeName(mapType.Domain, wr, tok)}, {TypeName(mapType.Range, wr, tok)}>.{TypeDescriptorMethodName}()";
-      } else if (type.IsRefType) {
-        return $"Dafny.Helpers.NULL<{TypeName(type, wr, tok)}>()";
-      } else if (type.IsArrayType) {
-        ArrayClassDecl at = type.AsArrayType;
-        var elType = UserDefinedType.ArrayElementType(type);
-        var elTypeName = TypeName(elType, wr, tok);
-        return $"Dafny.Helpers.ARRAY{(at.Dims == 1 ? "" : $"{at.Dims}")}<{elTypeName}>()";
-      } else if (type.IsTypeParameter) {
-        var tp = type.AsTypeParameter;
-        Contract.Assert(tp != null);
-        if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(tp, out var instantiatedTypeParameter)) {
-          return TypeDescriptor(instantiatedTypeParameter, wr, tok);
-        }
-        return FormatTypeDescriptorVariable(type.AsTypeParameter.GetCompileName(Options));
-      } else if (type.IsBuiltinArrowType) {
-        return $"Dafny.Helpers.NULL<{TypeName(type, wr, tok)}>()";
-      } else if (type is UserDefinedType udt) {
-        var cl = udt.ResolvedClass;
-        Contract.Assert(cl != null);
-
-        List<Type> relevantTypeArgs;
-        if (cl is DatatypeDecl dt) {
-          relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs, true).ConvertAll(ta => ta.Actual);
-        } else {
-          relevantTypeArgs = type.TypeArgs;
-        }
-
-        return AddTypeDescriptorArgs(FullTypeName(udt, ignoreInterface: true), udt, relevantTypeArgs, wr, tok);
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();
-      }
-    }
-
-    private string GetNativeTypeDescriptor(NativeType nt) {
-      Contract.Assert(nt != null);
-      switch (nt.Sel) {
-        case NativeType.Selection.SByte:
-          return $"Dafny.Helpers.INT8";
-        case NativeType.Selection.Byte:
-          return $"Dafny.Helpers.UINT8";
-        case NativeType.Selection.Short:
-          return $"Dafny.Helpers.INT16";
-        case NativeType.Selection.UShort:
-          return $"Dafny.Helpers.UINT16";
-        case NativeType.Selection.Int:
-          return $"Dafny.Helpers.INT32";
-        case NativeType.Selection.UInt:
-          return $"Dafny.Helpers.UINT32";
-        case NativeType.Selection.Long:
-          return $"Dafny.Helpers.INT64";
-        case NativeType.Selection.ULong:
-          return $"Dafny.Helpers.UINT64";
-        default:
-          Contract.Assert(false);
-          throw new cce.UnreachableException();
-      }
-    }
-
-    private string AddTypeDescriptorArgs(string fullCompileName, UserDefinedType udt, List<Type> typeDescriptors, ConcreteSyntaxTree wr, IToken tok) {
-      Contract.Requires(fullCompileName != null);
-      Contract.Requires(udt != null);
-      Contract.Requires(typeDescriptors != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(tok != null);
-
-      var s = TypeName_UDT(fullCompileName, udt, wr, tok);
-      s += $".{TypeDescriptorMethodName}({typeDescriptors.Comma(arg => TypeDescriptor(arg, wr, tok))})";
-      return s;
-    }
-
-    // ----- Declarations -------------------------------------------------------------
-
-    protected void DeclareField(string name, bool isPublic, bool isStatic, bool isConst, string typeName, string rhs, ClassWriter cw) {
-      var publik = isPublic ? "public" : "private";
-      var konst = isConst ? " readonly" : "";
-      var virtuall = Synthesize ? " virtual" : "";
-      if (isStatic) {
-        cw.StaticMemberWriter.Write($"{publik} static{konst} {typeName} {name}");
-        if (rhs != null) {
-          cw.StaticMemberWriter.Write($" = {rhs}");
-        }
-        cw.StaticMemberWriter.WriteLine(";");
-      } else {
-        string ending = "";
-        if (isPublic) {
-          if (isConst) {
-            cw.InstanceMemberWriter.Write(
-              $"{publik}{konst}{virtuall} {typeName} {name} {{get;}}");
-          } else {
-            cw.InstanceMemberWriter.Write(
-              $"{publik}{virtuall} {typeName} {name} {{get; set;}}");
-          }
-        } else {
-          cw.InstanceMemberWriter.WriteLine($"{publik}{konst} {typeName} {name}");
-          ending = ";";
-        }
-        if (cw.CtorBodyWriter == null) {
-          if (rhs != null) {
-            cw.InstanceMemberWriter.Write($" = {rhs}");
-            ending = ";";
-          }
-        } else {
-          if (rhs != null) {
-            cw.CtorBodyWriter.WriteLine($"this.{name} = {rhs};");
-          }
-        }
-        cw.InstanceMemberWriter.WriteLine(ending);
-      }
-    }
-
-    protected override bool DeclareFormal(string prefix, string name, Type type, IToken tok, bool isInParam, ConcreteSyntaxTree wr) {
-      wr.Write($"{prefix}{(isInParam ? "" : "out ")}{TypeName(type, wr, tok)} {name}");
-      return true;
-    }
-
-    protected override void DeclareLocalVar(string name, Type/*?*/ type, IToken/*?*/ tok, bool leaveRoomForRhs, string/*?*/ rhs, ConcreteSyntaxTree wr) {
-      wr.Write($"{(type != null ? TypeName(type, wr, tok) : "var")} {name}");
-      if (leaveRoomForRhs) {
-        Contract.Assert(rhs == null);  // follows from precondition
-      } else if (rhs != null) {
-        wr.WriteLine($" = {rhs};");
-      } else {
-        wr.WriteLine(";");
-      }
-    }
-
-    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type/*?*/ type, IToken/*?*/ tok, ConcreteSyntaxTree wr) {
-      var w = new ConcreteSyntaxTree();
-      wr.FormatLine($"{(type != null ? TypeName(type, wr, tok) : "var")} {name} = {w};");
-      return w;
-    }
-
-    protected override void DeclareOutCollector(string collectorVarName, ConcreteSyntaxTree wr) {
-      wr.Write($"var {collectorVarName} = ");
-    }
-
-    protected override void DeclareLocalOutVar(string name, Type type, IToken tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr) {
-      if (useReturnStyleOuts) {
-        DeclareLocalVar(name, type, tok, false, rhs, wr);
-      } else {
-        EmitAssignment(name, type, rhs, null, wr);
-      }
-    }
-
-    protected override void EmitActualOutArg(string actualOutParamName, ConcreteSyntaxTree wr) {
-      wr.Write($"out {actualOutParamName}");
-    }
-
-    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) {
-      return nonGhostOutCount == 1;
-    }
-
-    protected override void EmitOutParameterSplits(string outCollector, List<string> actualOutParamNames, ConcreteSyntaxTree wr) {
-      Contract.Assert(actualOutParamNames.Count == 1);
-      EmitAssignment(actualOutParamNames[0], null, outCollector, null, wr);
-    }
-
-    protected override void EmitActualTypeArgs(List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr) {
-      if (typeArgs.Count != 0) {
-        wr.Write("<" + TypeNames(typeArgs, wr, tok) + ">");
-      }
-    }
-
-    // ----- Statements -------------------------------------------------------------
-
-    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
-      var wStmts = wr.Fork();
-      var typeArgs = arg.Type.AsArrowType == null ? "" : $"<{TypeName(arg.Type, wr, null, null)}>";
-      var suffix = arg.Type.IsStringType && UnicodeCharEnabled ? ".ToVerbatimString(false)" : "";
-      wr.WriteLine($"{DafnyHelpersClass}.Print{typeArgs}(({Expr(arg, false, wStmts)}){suffix});");
-    }
-
-    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
-      outParams = outParams.Where(f => !f.IsGhost).ToList();
-      var returnExpr = outParams.Count == 1 ? IdName(outParams[0]) : "";
-      wr.WriteLine($"return {returnExpr};");
-    }
-
-    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
-      var w = wr.Fork();
-      var prefix = createContinueLabel ? "continue_" : "after_";
-      wr.Fork(-1).WriteLine($"{prefix}{label}: ;");
-      return w;
-    }
-
-    protected override void EmitBreak(string/*?*/ label, ConcreteSyntaxTree wr) {
-      if (label == null) {
-        wr.WriteLine("break;");
-      } else {
-        wr.WriteLine("goto after_{0};", label);
-      }
-    }
-
-    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
-      wr.WriteLine("goto continue_{0};", label);
-    }
-
-    protected override void EmitYield(ConcreteSyntaxTree wr) {
-      wr.WriteLine("yield return null;");
-    }
-
-    protected override void EmitAbsurd(string/*?*/ message, ConcreteSyntaxTree wr) {
-      if (message == null) {
-        message = "unexpected control point";
-      }
-      wr.WriteLine("throw new System.Exception(\"{0}\");", message);
-    }
-
-    protected override void EmitHalt(IToken tok, Expression/*?*/ messageExpr, ConcreteSyntaxTree wr) {
-      var exceptionMessage = Expr(messageExpr, false, wr.Fork());
-      if (tok != null) {
-        exceptionMessage.Prepend(new LineSegment(SymbolDisplay.FormatLiteral(tok.TokenToString(Options) + ": ", true) + " + "));
-      }
-      if (UnicodeCharEnabled && messageExpr.Type.IsStringType) {
-        exceptionMessage.Write(".ToVerbatimString(false)");
-      }
-      wr.Format($"throw new Dafny.HaltException({exceptionMessage});");
-    }
-
-    protected override ConcreteSyntaxTree EmitForStmt(IToken tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
-      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
-
-      wr.Write($"for ({TypeName(loopIndex.Type, wr, tok)} {loopIndex.CompileName} = ");
-      var startWr = wr.Fork();
-      wr.Write($"; ");
-
-      ConcreteSyntaxTree bodyWr;
-      if (goingUp) {
-        wr.Write(endVarName != null ? $"{loopIndex.CompileName} < {endVarName}" : "");
-        bodyWr = wr.NewBlock($"; {loopIndex.CompileName}++)");
-      } else {
-        wr.Write(endVarName != null ? $"{endVarName} < {loopIndex.CompileName}" : "");
-        bodyWr = wr.NewBlock($"; )");
-        bodyWr.WriteLine($"{loopIndex.CompileName}--;");
-      }
-      bodyWr = EmitContinueLabel(labels, bodyWr);
-      TrStmtList(body, bodyWr);
-
-      return startWr;
-    }
-
-    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, string bound, ConcreteSyntaxTree wr, string start = null) {
-      start = start ?? "0";
-      return wr.NewNamedBlock("for (var {0} = {2}; {0} < {1}; {0}++)", indexVar, bound, start);
-    }
-
-    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
-      return wr.NewNamedBlock("for (var {0} = new BigInteger({1}); ; {0} *= 2)", indexVar, start);
-    }
-
-    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine($"{varName}++;");
-    }
-
-    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine($"{varName}--;");
-    }
-
-    protected override string GetQuantifierName(string bvType) {
-      return string.Format($"{DafnyHelpersClass}.Quantifier<{bvType}>");
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IToken tok, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      collectionWriter = new ConcreteSyntaxTree();
-      wr.Format($"foreach ({TypeName(collectionElementType, wr, tok)} {tmpVarName} in {collectionWriter})");
-      return wr.NewBlock();
-    }
-
-    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
-      Type collectionElementType, bool introduceBoundVar, IToken tok, ConcreteSyntaxTree wr) {
-      var typeName = TypeName(boundVarType, wr, tok);
-      wr.WriteLine("{0}{1} = ({2}){3};", introduceBoundVar ? typeName + " " : "", boundVarName, typeName, tmpVarName);
-    }
-
-    [CanBeNull]
-    protected override string GetSubtypeCondition(string tmpVarName, Type boundVarType, IToken tok, ConcreteSyntaxTree wPreconditions) {
-      string typeTest;
-      if (boundVarType.IsRefType) {
-        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
-          typeTest = "true";
-        } else {
-          typeTest = $"{tmpVarName} is {TypeName(boundVarType, wPreconditions, tok)}";
-        }
-        if (boundVarType.IsNonNullRefType) {
-          typeTest = $"{tmpVarName} != null && {typeTest}";
-        } else {
-          typeTest = $"{tmpVarName} == null || {typeTest}";
-        }
-      } else {
-        typeTest = "true";
-      }
-
-      return typeTest == "true" ? null : typeTest;
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      collectionWriter = new ConcreteSyntaxTree();
-      return wr.Format($"foreach (var {boundVarName} in {collectionWriter})").NewBlock();
-    }
-
-    // ----- Expressions -------------------------------------------------------------
-
-    protected override void EmitNew(Type type, IToken tok, CallStmt initCall /*?*/, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var cl = ((UserDefinedType)type.NormalizeExpand()).ResolvedClass;
-      var ctor = (Constructor)initCall?.Method;  // correctness of cast follows from precondition of "EmitNew"
-      var arguments = new ConcreteSyntaxTree();
-      wr.Format($"new {TypeName(type, wr, tok)}({arguments})");
-      var sep = "";
-      EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass(cl, type.TypeArgs), tok, arguments, ref sep);
-      arguments.Write(ConstructorArguments(initCall, wStmts, ctor, sep));
-    }
-
-    protected override void EmitNewArray(Type elementType, IToken tok, List<string> dimensions,
-        bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var wrs = EmitNewArray(elementType, tok, dimensions.Count, mustInitialize, wr);
-      for (var i = 0; i < wrs.Count; i++) {
-        wrs[i].Write(dimensions[i]);
-      }
-    }
-
-    private List<ConcreteSyntaxTree> EmitNewArray(Type elmtType, IToken tok, int dimCount, bool mustInitialize, ConcreteSyntaxTree wr) {
-      ConcreteSyntaxTree EmitSizeCheckWrapper(ConcreteSyntaxTree w) {
-        w.Write($"{DafnyHelpersClass}.ToIntChecked(");
-        var wSize = w.Fork();
-        w.Write(", \"array size exceeds memory limit\")");
-        return wSize;
-      }
-
-      var wrs = new List<ConcreteSyntaxTree>();
-      if (!mustInitialize || HasSimpleZeroInitializer(elmtType)) {
-        TypeName_SplitArrayName(elmtType, wr, tok, out string typeNameSansBrackets, out string brackets);
-        wr.Write("new {0}", typeNameSansBrackets);
-        string prefix = "[";
-        for (var d = 0; d < dimCount; d++) {
-          wr.Write(prefix);
-          wrs.Add(EmitSizeCheckWrapper(wr));
-          prefix = ", ";
-        }
-        wr.Write("]{0}", brackets);
-      } else {
-        wr.Write("Dafny.ArrayHelpers.InitNewArray{0}<{1}>", dimCount, TypeName(elmtType, wr, tok));
-        var inParens = wr.ForkInParens();
-        inParens.Write(DefaultValue(elmtType, inParens, tok, true));
-        for (var d = 0; d < dimCount; d++) {
-          inParens.Write(", ");
-          wrs.Add(EmitSizeCheckWrapper(inParens));
-        }
-      }
-      return wrs;
-    }
-
-    /// <summary>
-    /// Return "true" if the C# all-zero bit pattern is a meaningful value for a Dafny type "t".
-    /// This method is allowed to be conservative; that is, it is allowed to return "false" more often
-    /// than strictly needed.
-    /// </summary>
-    private bool HasSimpleZeroInitializer(Type t) {
-      Contract.Requires(t != null);
-
-      t = t.NormalizeExpandKeepConstraints();
-      if (t is CharType) {
-        // Okay, so '\0' _is_ a value of type "char", but it's so unpleasant to deal with in test files, etc.
-        // By returning false here, a different value will be chosen.
-        return false;
-      } else if (t is BoolType || t is IntType || t is BigOrdinalType || t is RealType || t is BitvectorType) {
-        return true;
-      } else if (t is CollectionType) {
-        return false;
-      }
-
-      var udt = (UserDefinedType)t;
-      var cl = udt.ResolvedClass;
-      Contract.Assert(cl != null);
-      if (cl is NewtypeDecl) {
-        var td = (NewtypeDecl)cl;
-        return td.WitnessKind == SubsetTypeDecl.WKind.CompiledZero;
-      } else if (cl is ClassLikeDecl { IsReferenceTypeDecl: true }) {
-        return true; // null is a value of this type
-      } else {
-        return false;
-      }
-    }
-
-    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
-      if (e is StaticReceiverExpr) {
-        wr.Write(TypeName(e.Type, wr, e.tok));
-      } else if (e.Value == null) {
-        var cl = (e.Type.NormalizeExpand() as UserDefinedType)?.ResolvedClass;
-        wr.Write("({0})null", TypeName(e.Type, wr, e.tok));
-      } else if (e.Value is bool) {
-        wr.Write((bool)e.Value ? "true" : "false");
-      } else if (e is CharLiteralExpr) {
-        var v = (string)e.Value;
-        if (UnicodeCharEnabled) {
-          var codePoint = Util.UnescapedCharacters(Options, v, false).Single();
-          if (codePoint > char.MaxValue) {
-            // C# supports \U, but doesn't allow values that require two UTF-16 code units in character literals.
-            // For such values we construct the Rune value directly from the unescaped codepoint.
-            wr.Write($"new Dafny.Rune(0x{codePoint:x})");
-          } else {
-            wr.Write($"new Dafny.Rune('{Util.ExpandUnicodeEscapes(v, false)}')");
-          }
-        } else {
-          wr.Write($"'{v}'");
-        }
-      } else if (e is StringLiteralExpr str) {
-        wr.Format($"{DafnySeqClass}<{CharTypeName}>.{CharMethodQualifier}FromString({StringLiteral(str)})");
-      } else if (AsNativeType(e.Type) != null) {
-        GetNativeInfo(AsNativeType(e.Type).Sel, out var nativeName, out var literalSuffix, out var needsCastAfterArithmetic);
-        if (needsCastAfterArithmetic) {
-          wr = wr.Write($"({nativeName})").ForkInParens();
-        }
-        wr.Write((BigInteger)e.Value + literalSuffix);
-      } else if (e.Value is BigInteger bigInteger) {
-        EmitIntegerLiteral(bigInteger, wr);
-      } else if (e.Value is BigDec n) {
-        if (0 <= n.Exponent) {
-          wr.Write("new Dafny.BigRational(BigInteger.Parse(\"{0}", n.Mantissa);
-          for (int i = 0; i < n.Exponent; i++) {
-            wr.Write("0");
-          }
-          wr.Write("\"), BigInteger.One)");
-        } else {
-          wr.Write("new Dafny.BigRational(");
-          EmitIntegerLiteral(n.Mantissa, wr);
-          wr.Write(", BigInteger.Parse(\"1");
-          for (int i = n.Exponent; i < 0; i++) {
-            wr.Write("0");
-          }
-          wr.Write("\"))");
-        }
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
-      }
-    }
-
-    void EmitIntegerLiteral(BigInteger i, ConcreteSyntaxTree wr) {
-      Contract.Requires(wr != null);
-      if (i.IsZero) {
-        wr.Write("BigInteger.Zero");
-      } else if (i.IsOne) {
-        wr.Write("BigInteger.One");
-      } else if (int.MinValue <= i && i <= int.MaxValue) {
-        wr.Write($"new BigInteger({i})");
-      } else if (long.MinValue <= i && i <= long.MaxValue) {
-        wr.Write($"new BigInteger({i}L)");
-      } else if (ulong.MinValue <= i && i <= ulong.MaxValue) {
-        wr.Write($"new BigInteger({i}UL)");
-      } else {
-        wr.Write($"BigInteger.Parse(\"{i}\")");
-      }
-    }
-
-    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
-      wr.Write($"{(isVerbatim ? "@" : "")}\"{Util.ExpandUnicodeEscapes(str, false)}\"");
-    }
-
-    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, bool surroundByUnchecked, ConcreteSyntaxTree wr) {
-      string nativeName = null, literalSuffix = null;
-      if (bvType.NativeType != null) {
-        GetNativeInfo(bvType.NativeType.Sel, out nativeName, out literalSuffix, out var needsCastAfterArithmetic);
-      }
-
-      // --- Before
-      if (bvType.NativeType != null) {
-        if (surroundByUnchecked) {
-          // Unfortunately, the following will apply "unchecked" to all subexpressions as well.  There
-          // shouldn't ever be any problem with this, but stylistically it would have been nice to have
-          // applied the "unchecked" only to the actual operation that may overflow.
-          wr = wr.Write("unchecked").ForkInParens();
-        }
-        wr.Write($"({nativeName})");
-      }
-      wr = wr.ForkInParens();
-      // --- Middle
-      var middle = wr.ForkInParens();
-      // --- After
-      // do the truncation, if needed
-      if (bvType.NativeType == null) {
-        wr.Write(" & ((new BigInteger(1) << {0}) - 1)", bvType.Width);
-      } else {
-        if (bvType.NativeType.Bitwidth != bvType.Width) {
-          // print in hex, because that looks nice
-          wr.Write(" & ({2})0x{0:X}{1}", (1UL << bvType.Width) - 1, literalSuffix, nativeName);
-        }
-      }
-
-      return middle;
-    }
-
-    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
-        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      string nativeName = null, literalSuffix = null;
-      bool needsCast = false;
-      var nativeType = AsNativeType(e0.Type);
-      if (nativeType != null) {
-        GetNativeInfo(nativeType.Sel, out nativeName, out literalSuffix, out needsCast);
-      }
-
-      // ( e0 op1 e1) | (e0 op2 (width - e1))
-      if (needsCast) {
-        wr = wr.Write("(" + nativeName + ")").ForkInParens();
-      }
-      EmitShift(e0, e1, isRotateLeft ? "<<" : ">>", isRotateLeft, nativeType, true, wr.ForkInParens(), inLetExprBody, wStmts, tr);
-
-      wr.Write(" | ");
-
-      EmitShift(e0, e1, isRotateLeft ? ">>" : "<<", !isRotateLeft, nativeType, false, wr.ForkInParens(), inLetExprBody, wStmts, tr);
-    }
-
-    void EmitShift(Expression e0, Expression e1, string op, bool truncate, NativeType nativeType /*?*/, bool firstOp,
-        ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      var bv = e0.Type.AsBitVectorType;
-      if (truncate) {
-        wr = EmitBitvectorTruncation(bv, true, wr);
-      }
-      tr(e0, wr, inLetExprBody, wStmts);
-      wr.Write(" {0} ", op);
-      if (!firstOp) {
-        wr = wr.ForkInParens().Write("{0} - ", bv.Width);
-      }
-
-      wr.Write("(int)");
-      tr(e1, wr.ForkInParens(), inLetExprBody, wStmts);
-    }
-
-    protected override bool CompareZeroUsingSign(Type type) {
-      return AsNativeType(type) == null;
-    }
-
-    protected override ConcreteSyntaxTree EmitSign(Type type, ConcreteSyntaxTree wr) {
-      // Should only be called when CompareZeroUsingSign is true
-      Contract.Assert(AsNativeType(type) == null);
-
-      ConcreteSyntaxTree w = wr.Fork();
-      wr.Write(".Sign");
-
-      return w;
-    }
-
-    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      wr.Write($"new System.Collections.Generic.List<System.Tuple<{tupleTypeArgs}>>()");
-    }
-
-    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      var wrTuple = new ConcreteSyntaxTree();
-      wr.FormatLine($"{ingredients}.Add(new System.Tuple<{tupleTypeArgs}>({wrTuple}));");
-      return wrTuple;
-    }
-
-    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
-      wr.Write($"{prefix}.Item{i + 1}");
-    }
-
-    protected override string IdProtect(string name) {
-      return PublicIdProtect(name);
-    }
-    public override string PublicIdProtect(string name) {
-      if (name == "" || name.First() == '_') {
-        return name;  // no need to further protect this name -- we know it's not a C# keyword
-      }
-      switch (name) {
-        // keywords
-        case "base":
-        case "byte":
-        case "catch":
-        case "checked":
-        case "continue":
-        case "decimal":
-        case "default":
-        case "delegate":
-        case "do":
-        case "double":
-        case "enum":
-        case "event":
-        case "explicit":
-        case "extern":
-        case "finally":
-        case "fixed":
-        case "float":
-        case "for":
-        case "foreach":
-        case "goto":
-        case "implicit":
-        case "interface":
-        case "internal":
-        case "is":
-        case "lock":
-        case "long":
-        case "namespace":
-        case "operator":
-        case "out":
-        case "override":
-        case "params":
-        case "private":
-        case "public":
-        case "readonly":
-        case "ref":
-        case "sbyte":
-        case "sealed":
-        case "short":
-        case "sizeof":
-        case "stackalloc":
-        case "struct":
-        case "switch":
-        case "throw":
-        case "try":
-        case "typeof":
-        case "uint":
-        case "ulong":
-        case "unchecked":
-        case "unsafe":
-        case "ushort":
-        case "using":
-        case "virtual":
-        case "void":
-        case "volatile":
-        // contextual keywords
-        case "add":
-        case "alias":
-        case "ascending":
-        case "async":
-        case "await":
-        case "descending":
-        case "dynamic":
-        case "equals":
-        case "from":
-        case "get":
-        case "global":
-        case "group":
-        case "into":
-        case "join":
-        case "let":
-        case "nameof":
-        case "on":
-        case "orderby":
-        case "partial":
-        case "remove":
-        case "select":
-        case "set":
-        case "value":
-        case "when":
-        case "where":
-          return "@" + name;
-        // methods with expected names
-        case "ToString":
-        case "GetHashCode":
-        case "Main":
-          return "_" + name;
-        default:
-          return name;
-      }
-    }
-
-    protected override string FullTypeName(UserDefinedType udt, MemberDecl /*?*/ member = null) {
-      return FullTypeName(udt, member);
-    }
-    private string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null, bool ignoreInterface = false) {
-      Contract.Assume(udt != null);  // precondition; this ought to be declared as a Requires in the superclass
-      if (udt is ArrowType) {
-        return ArrowType.Arrow_FullCompileName;
-      }
-
-      if (member != null && member.IsExtern(Options, out var qualification, out _) && qualification != null) {
-        return qualification;
-      }
-      var cl = udt.ResolvedClass;
-      if (cl is TypeParameter) {
-        return IdProtect(udt.GetCompileName(Options));
-      }
-
-      //Use the interface if applicable (not handwritten, or incompatible variance)
-      if ((cl is DatatypeDecl)
-          && !ignoreInterface
-          && (member is null || !NeedsCustomReceiver(member))) {
-        return (cl.EnclosingModuleDefinition.IsDefaultModule ? "" : IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + ".") + DtTypeName(cl, false);
-      }
-
-      if (cl.EnclosingModuleDefinition.IsDefaultModule) {
-        return IdProtect(cl.GetCompileName(Options));
-      }
-
-      if (cl.IsExtern(Options, out _, out _)) {
-        return cl.EnclosingModuleDefinition.GetCompileName(Options) + "." + cl.GetCompileName(Options);
-      }
-      return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdProtect(cl.GetCompileName(Options));
-    }
-
-    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
-      var custom =
-        (enclosingMethod != null && (enclosingMethod.IsTailRecursive || NeedsCustomReceiver(enclosingMethod))) ||
-        (enclosingFunction != null && (enclosingFunction.IsTailRecursive || NeedsCustomReceiver(enclosingFunction))) ||
-        (thisContext is NewtypeDecl && !callToInheritedMember) ||
-        thisContext is TraitDecl;
-      wr.Write(custom ? "_this" : "this");
-    }
-
-    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
-      var dt = dtv.Ctor.EnclosingDatatype;
-      var dtName = dt.GetFullCompileName(Options);
-
-      var nonGhostInferredTypeArgs = SelectNonGhost(dt, dtv.InferredTypeArgs);
-      var typeParams = nonGhostInferredTypeArgs.Count == 0 ? "" : $"<{TypeNames(nonGhostInferredTypeArgs, wr, dtv.tok)}>";
-      var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
-      if (!dtv.IsCoCall) {
-        // For an ordinary constructor (that is, one that does not guard any co-recursive calls), generate:
-        //   Dt.create_Cons<T>( args )
-        wr.Write($"{dtName}{typeParams}.{DtCreateName(dtv.Ctor)}({typeDescriptorArguments}{sep}{arguments})");
-      } else {
-        var sep0 = typeDescriptorArguments.Length != 0 ? ", " : "";
-        // In the case of a co-recursive call, generate:
-        //     new Dt__Lazy<T>( LAMBDA )
-        // where LAMBDA is:
-        //     () => { return Dt_Cons<T>( ...args... ); }
-        wr.Write($"new {dtName}__Lazy{typeParams}({typeDescriptorArguments}{sep0}");
-        wr.Write("() => { return ");
-        wr.Write($"new {DtCtorName(dtv.Ctor, dtv.InferredTypeArgs, wr)}({typeDescriptorArguments}{sep}{arguments})");
-        wr.Write("; })");
-      }
-    }
-
-
-    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString) {
-      compiledName = "";
-      preString = "";
-      postString = "";
-      switch (id) {
-        case SpecialField.ID.UseIdParam:
-          compiledName = IdProtect((string)idParam);
-          break;
-        case SpecialField.ID.ArrayLength:
-        case SpecialField.ID.ArrayLengthInt:
-          compiledName = idParam == null ? "Length" : $"GetLength({(int)idParam})";
-          if (id == SpecialField.ID.ArrayLength) {
-            preString = "new BigInteger(";
-            postString = ")";
-          }
-          break;
-        case SpecialField.ID.Floor:
-          compiledName = "ToBigInteger()";
-          break;
-        case SpecialField.ID.IsLimit:
-          preString = "Dafny.BigOrdinal.IsLimit(";
-          postString = ")";
-          break;
-        case SpecialField.ID.IsSucc:
-          preString = "Dafny.BigOrdinal.IsSucc(";
-          postString = ")";
-          break;
-        case SpecialField.ID.Offset:
-          preString = "Dafny.BigOrdinal.Offset(";
-          postString = ")";
-          break;
-        case SpecialField.ID.IsNat:
-          preString = "Dafny.BigOrdinal.IsNat(";
-          postString = ")";
-          break;
-        case SpecialField.ID.Keys:
-          compiledName = "Keys";
-          break;
-        case SpecialField.ID.Values:
-          compiledName = "Values";
-          break;
-        case SpecialField.ID.Items:
-          var mapType = receiverType.AsMapType;
-          Contract.Assert(mapType != null);
-          var errorWr = new ConcreteSyntaxTree();
-          var domainType = TypeName(mapType.Domain, errorWr, Token.NoToken);
-          var rangeType = TypeName(mapType.Range, errorWr, Token.NoToken);
-          preString = $"{DafnyMapClass}<{domainType}, {rangeType}>.Items(";
-          postString = ")";
-          break;
-        case SpecialField.ID.Reads:
-          compiledName = "_reads";
-          break;
-        case SpecialField.ID.Modifies:
-          compiledName = "_modifies";
-          break;
-        case SpecialField.ID.New:
-          compiledName = "_new";
-          break;
-        default:
-          Contract.Assert(false); // unexpected ID
-          break;
-      }
-    }
-
-    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
-      Type expectedType, string/*?*/ additionalCustomParameter, bool internalAccess = false) {
-      var memberStatus = DatatypeWrapperEraser.GetMemberStatus(Options, member);
-      if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.Identity) {
-        return SimpleLvalue(obj);
-      } else if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue) {
-        return SimpleLvalue(w => w.Write("true"));
-      } else if (member is SpecialField sf && !(member is ConstantField)) {
-        GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out string compiledName, out string _, out string _);
-        if (compiledName.Length != 0) {
-          return SuffixLvalue(obj, ".{0}", compiledName);
-        } else {
-          // this member selection is handled by some kind of enclosing function call, so nothing to do here
-          return SimpleLvalue(obj);
-        }
-      } else if (member is Function fn) {
-        var wr = new ConcreteSyntaxTree();
-        EmitNameAndActualTypeArgs(IdName(member), TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, member, false)), member.tok, wr);
-        if (typeArgs.Count == 0 && additionalCustomParameter == null) {
-          var nameAndTypeArgs = wr.ToString();
-          return SuffixLvalue(obj, $".{nameAndTypeArgs}");
-        } else {
-          // We need an eta conversion to adjust for the difference in arity.
-          // (T0 a0, T1 a1, ...) => obj.F(additionalCustomParameter, a0, a1, ...)
-          var callArguments = wr.ForkInParens();
-          var sep = "";
-          EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), fn.tok, callArguments, ref sep);
-          if (additionalCustomParameter != null) {
-            callArguments.Write($"{sep}{additionalCustomParameter}");
-            sep = ", ";
-          }
-          var lambdaHeader = new ConcreteSyntaxTree();
-          var prefixSep = "";
-          var arguments = lambdaHeader.ForkInParens();
-          lambdaHeader.Write(" => ");
-
-          foreach (var arg in fn.Formals) {
-            if (!arg.IsGhost) {
-              var name = idGenerator.FreshId("_eta");
-              var ty = arg.Type.Subst(typeMap);
-              arguments.Write($"{prefixSep}{TypeName(ty, arguments, arg.tok)} {name}");
-              callArguments.Write($"{sep}{name}");
-              sep = ", ";
-              prefixSep = ", ";
-            }
-          }
-          return EnclosedLvalue(lambdaHeader.ToString(), obj, $".{wr}");
-        }
-      } else {
-        Contract.Assert(member is Field);
-        if (member.IsStatic) {
-          return SimpleLvalue(w => {
-            w.Write("{0}.{1}", TypeName_Companion(objType, w, member.tok, member), IdName(member));
-            var sep = "(";
-            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.tok, w, ref sep);
-            if (sep != "(") {
-              w.Write(")");
-            }
-          });
-        } else if (NeedsCustomReceiver(member) && !(member.EnclosingClass is TraitDecl)) {
-          // instance const in a newtype or belongs to a datatype
-          Contract.Assert(typeArgs.Count == 0 || member.EnclosingClass is DatatypeDecl);
-          return SimpleLvalue(w => {
-            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.tok, member), IdName(member));
-            obj(w);
-            w.Write(")");
-          });
-        } else if (internalAccess && (member is ConstantField || member.EnclosingClass is TraitDecl)) {
-          return SuffixLvalue(obj, $"._{member.GetCompileName(Options)}");
-        } else {
-          return SimpleLvalue(w => {
-            obj(w);
-            w.Write(".{0}", IdName(member));
-            var sep = "(";
-            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.tok, w, ref sep);
-            if (sep != "(") {
-              w.Write(")");
-            }
-          });
-        }
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<string> indices, Type elmtType, ConcreteSyntaxTree wr) {
-      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
-      var w = wr.Fork();
-      wr.Write("[");
-      var sep = "";
-      foreach (var index in indices) {
-        wr.Write("{0}(int)({1})", sep, index);
-        sep = ", ";
-      }
-      wr.Write("]");
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
-      var w = wr.Fork();
-      wr.Write("[");
-      var sep = "";
-      foreach (var index in indices) {
-        wr.Write("{0}(int)", sep);
-        TrParenExpr(index, wr, inLetExprBody, wStmts);
-        sep = ", ";
-      }
-      wr.Write("]");
-      return w;
-    }
-
-    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr("(int)", expr, wr, inLetExprBody, wStmts);
-    }
-
-    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var xType = source.Type.NormalizeExpand();
-      if (xType is MapType) {
-        var inner = wr.Write(TypeHelperName(xType, wr, source.tok) + ".Select").ForkInParens();
-        inner.Append(Expr(source, inLetExprBody, wStmts));
-        inner.Write(",");
-        inner.Append(Expr(index, inLetExprBody, wStmts));
-      } else {
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-        TrParenExpr(".Select", index, wr, inLetExprBody, wStmts);
-      }
-    }
-
-    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
-        CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var xType = source.Type.NormalizeExpand();
-      if (xType is SeqType || xType is MapType) {
-        wr.Write(TypeHelperName(xType, wr, source.tok) + ".Update");
-        wr.Append(ParensList(
-          Expr(source, inLetExprBody, wStmts),
-          Expr(index, inLetExprBody, wStmts),
-          CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts)));
-      } else {
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-        wr.Write(".Update");
-        wr.Append(ParensList(
-          Expr(index, inLetExprBody, wStmts),
-          CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts)));
-      }
-    }
-
-    protected override void EmitSeqSelectRange(Expression source, Expression lo /*?*/, Expression hi /*?*/,
-      bool fromArray, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (fromArray) {
-        wr.Write($"{DafnyHelpersClass}.SeqFromArray");
-      }
-      TrParenExpr(source, wr, inLetExprBody, wStmts);
-      if (hi != null) {
-        if (lo != null) {
-          wr.Write(".Subsequence");
-          wr.Append(ParensList(Expr(lo, inLetExprBody, wStmts), Expr(hi, inLetExprBody, wStmts)));
-        } else {
-          TrParenExpr(".Take", hi, wr, inLetExprBody, wStmts);
-        }
-      } else {
-        if (lo != null) {
-          TrParenExpr(".Drop", lo, wr, inLetExprBody, wStmts);
-        }
-      }
-    }
-
-    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts) {
-      if (expr.Initializer is LambdaExpr lam) {
-        Contract.Assert(lam.BoundVars.Count == 1);
-        EmitSeqConstructionExprFromLambda(expr.N, lam.BoundVars[0], lam.Body, inLetExprBody, wr);
-      } else {
-        wr.Write($"{DafnySeqClass}<{TypeName(expr.Type.AsSeqType.Arg, wr, expr.tok)}>.Create");
-        wr.Append(ParensList(Expr(expr.N, inLetExprBody, wStmts), Expr(expr.Initializer, inLetExprBody, wStmts)));
-      }
-    }
-
-    // Construct a sequence for the Dafny expression seq(N, F) in the common
-    // case that f is a lambda expression.  In that case, rather than
-    // something like
-    //
-    //   var s = Dafny.Sequence.Create(N, i => ...);
-    //
-    // (which will call the lambda N times), we'd rather write
-    //
-    //   var dim = N;
-    //   var arr = new T[dim];
-    //   for (int i = 0; i < dim; i++) {
-    //     arr[i] = ...;
-    //   }
-    //   var s = Dafny.Sequence<T>.FromArray(a);
-    //
-    // and thus avoid method calls.  Unfortunately, since we can't add
-    // statements easily, we have to settle for the slightly clunkier
-    //
-    //   var s = ((System.Func<Dafny.Sequence<T>>) (() => {
-    //     var dim = N;
-    //     var arr = new T[dim];
-    //     for (int i = 0; i < dim; i++) {
-    //       arr[i] = ...;
-    //     }
-    //     return Dafny.Sequence<T>.FromArray(a);
-    //   }))();
-    private void EmitSeqConstructionExprFromLambda(Expression lengthExpr, BoundVar boundVar, Expression body, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      wr.Format($"((System.Func<{TypeName(new SeqType(body.Type), wr, body.tok)}>) (() =>{ExprBlock(out ConcreteSyntaxTree wrLamBody)}))()");
-
-      var indexType = lengthExpr.Type;
-      var lengthVar = idGenerator.FreshId("dim");
-      DeclareLocalVar(lengthVar, indexType, lengthExpr.tok, lengthExpr, inLetExprBody, wrLamBody);
-      var arrVar = idGenerator.FreshId("arr");
-      wrLamBody.Write($"var {arrVar} = ");
-      var wrDims = EmitNewArray(body.Type, body.tok, dimCount: 1, mustInitialize: false, wr: wrLamBody);
-      Contract.Assert(wrDims.Count == 1);
-      wrDims[0].Write(lengthVar);
-      wrLamBody.WriteLine(";");
-
-      var intIxVar = idGenerator.FreshId("i");
-      var wrLoopBody = wrLamBody.NewBlock(string.Format("for (int {0} = 0; {0} < {1}; {0}++)", intIxVar, lengthVar));
-      var ixVar = IdName(boundVar);
-      wrLoopBody.WriteLine("var {0} = ({1}) {2};",
-        ixVar, TypeName(indexType, wrLoopBody, body.tok), intIxVar);
-      var wrArrName = EmitArrayUpdate(new List<string> { ixVar }, body, wrLoopBody);
-      wrArrName.Write(arrVar);
-      EndStmt(wrLoopBody);
-
-      wrLamBody.WriteLine("return {0}<{1}>.FromArray({2});", DafnySeqClass, TypeName(body.Type, wr, body.tok), arrVar);
-    }
-
-    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-        ConcreteSyntaxTree wStmts) {
-      wr.Write("{0}<{1}>", DafnyMultiSetClass, TypeName(expr.E.Type.AsCollectionType.Arg, wr, expr.tok));
-      var eeType = expr.E.Type.NormalizeExpand();
-      if (eeType is SeqType) {
-        TrParenExpr(".FromSeq", expr.E, wr, inLetExprBody, wStmts);
-      } else if (eeType is SetType) {
-        TrParenExpr(".FromSet", expr.E, wr, inLetExprBody, wStmts);
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();
-      }
-    }
-
-    protected override void EmitApplyExpr(Type functionType, IToken tok, Expression function, List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write($"{DafnyHelpersClass}.Id<{TypeName(functionType, wr, tok)}>({Expr(function, inLetExprBody, wStmts)})");
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-    }
-
-    protected override ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
-      if (type.HasFatPointer) {
-        var w = wr.ForkInParens();
-        wr.Write("._value");
-        return w;
-      } else {
-        return wr;
-      }
-    }
-
-    protected override ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
-      if (type.HasFatPointer) {
-        wr.Write($"new {type.AsNewtype.GetFullCompileName(Options)}");
-        return wr.ForkInParens();
-      } else {
-        return wr;
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitDowncast(Type from, Type to, IToken tok, ConcreteSyntaxTree wr) {
-      from = from.NormalizeExpand();
-      to = to.NormalizeExpand();
-      Contract.Assert(Options.Get(CommonOptionBag.GeneralTraits) || from.IsRefType == to.IsRefType);
-
-      var w = new ConcreteSyntaxTree();
-      if (from.IsTraitType && to.AsNewtype != null) {
-        wr.Format($"(({to.AsNewtype.GetFullCompileName(Options)})({w}))");
-      } else if (to.IsRefType || to.IsTraitType || from.IsTraitType) {
-        wr.Format($"(({TypeName(to, wr, tok)})({w}))");
-      } else {
-        Contract.Assert(Type.SameHead(from, to));
-
-        var typeArgs = from.IsArrowType ? from.TypeArgs.Concat(to.TypeArgs).ToList() : to.TypeArgs;
-        var wTypeArgs = typeArgs.Comma(ta => TypeName(ta, wr, tok));
-        var argPairs = Enumerable.Zip(from.TypeArgs, to.TypeArgs);
-        if (from.IsArrowType) {
-          argPairs = argPairs.Select((tp, i) => ++i < to.TypeArgs.Count ? (tp.Second, tp.First) : tp);
-        }
-        var wConverters = argPairs.Comma(t => DowncastConverter(t.Item1, t.Item2, wr, tok));
-        DatatypeDecl dt = from.AsDatatype;
-        var sep = "";
-        var wTypeDescriptorArguments = new ConcreteSyntaxTree();
-        if (to is UserDefinedType udt) {
-          WriteTypeDescriptors(udt.ResolvedClass, typeArgs, wTypeDescriptorArguments, ref sep);
-        }
-        if (dt != null && DowncastCloneNeedsCustomReceiver(dt)) {
-          wr.Format($"{TypeName_Companion(from, wr, tok, null)}.DowncastClone<{wTypeArgs}>({wTypeDescriptorArguments}{sep}{w}, {wConverters})");
-        } else {
-          wr.Format($"({w}).DowncastClone<{wTypeArgs}>({wTypeDescriptorArguments}{sep}{wConverters})");
-        }
-        Contract.Assert(from.TypeArgs.Count == to.TypeArgs.Count);
-      }
-      return w;
-    }
-
-    bool DowncastCloneNeedsCustomReceiver(DatatypeDecl dt) {
-      return SelectNonGhost(dt, dt.TypeArgs).Any(ty => ty.Variance == TypeParameter.TPVariance.Contra) ||
-             DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _);
-    }
-
-    string DowncastConverter(Type from, Type to, ConcreteSyntaxTree errorWr, IToken tok) {
-      if (IsTargetSupertype(from, to, true)) {
-        return $"Dafny.Helpers.Id<{TypeName(to, errorWr, tok)}>";
-      }
-      if (from.AsCollectionType != null) {
-        var sTo = TypeName(to, errorWr, tok);
-        // (from x) => { return x.DowncastClone<A, B, ...>(aConverter, bConverter, ...); }
-        var wr = new ConcreteSyntaxTree();
-        wr.Format($"({TypeName(@from, errorWr, tok)} x) => {{ return {Downcast(from, to, tok, (LineSegment)"x")}; }}");
-        return wr.ToString();
-      }
-      // use a type
-      return $"Dafny.Helpers.CastConverter<{TypeName(from, errorWr, tok)}, {TypeName(to, errorWr, tok)}>";
-    }
-
-    protected override bool TargetLambdaCanUseEnclosingLocals => false;
-
-    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
-      List<Type> boundTypes, Type resultType, IToken tok, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ref ConcreteSyntaxTree wStmts) {
-      var tas = Util.Snoc(boundTypes, resultType);
-      var typeArgs = TypeName_UDT(ArrowType.Arrow_FullCompileName, tas.ConvertAll(_ => TypeParameter.TPVariance.Non), tas, wr, tok);
-      var result = new ConcreteSyntaxTree();
-      wr.Format($"{DafnyHelpersClass}.Id<{typeArgs}>(({boundVars.Comma()}) => {result})");
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-      return result;
-    }
-
-    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex, DatatypeCtor ctor, List<Type> typeArgs, Type bvType, ConcreteSyntaxTree wr) {
-      if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
-        Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
-        Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
-        source(wr);
-      } else {
-        source(wr);
-        wr.Write($".{DestructorGetterName(dtor, ctor, formalNonGhostIndex)}");
-      }
-    }
-
-    private string DestructorGetterName(Formal dtor, DatatypeCtor ctor, int index) {
-      return $"dtor_{(dtor.HasName ? dtor.CompileName : ctor.GetCompileName(Options) + FieldName(dtor, index))}";
-    }
-
-    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IToken tok, List<string> inNames,
-      Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
-      // (
-      //   (System.Func<inTypes,resultType>)  // cast, which tells C# what the various types involved are
-      //   (
-      //     (inNames) => {
-      //       <<caller fills in body here; must end with a return statement>>
-      //     }
-      //   )
-      // )
-      wr = wr.ForkInParens();
-      if (!untyped) {
-        wr.Write($"(System.Func<{inTypes.Concat(new[] { resultType }).Comma(t => TypeName(t, wr, tok))}>)");
-      }
-      wr.Format($"(({inNames.Comma(nm => nm)}) =>{ExprBlock(out ConcreteSyntaxTree body)})");
-      return body;
-    }
-
-    protected override void CreateIIFE(string bvName, Type bvType, IToken bvTok, Type bodyType, IToken bodyTok,
-      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
-      wrRhs = new ConcreteSyntaxTree();
-      wrBody = new ConcreteSyntaxTree();
-      wr.Format($"{DafnyHelpersClass}.Let<{TypeName(bvType, wr, bvTok)}, {TypeName(bodyType, wr, bodyTok)}>({wrRhs}, {bvName} => {wrBody})");
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IToken resultTok, ConcreteSyntaxTree wr,
-        ConcreteSyntaxTree wStmts) {
-      // (
-      //   (System.Func<resultType>)(() => <<body>>)
-      // )()
-      wr.Format($"((System.Func<{TypeName(resultType, wr, resultTok)}>)(() =>{ExprBlock(out ConcreteSyntaxTree result)}))()");
-      return result;
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IToken resultTok, string bvName,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Format($"{DafnyHelpersClass}.Let<int, {TypeName(resultType, wr, resultTok)}>({source}, {bvName} => {Block(out ConcreteSyntaxTree result)})");
-      return result;
-    }
-
-    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      switch (op) {
-        case ResolvedUnaryOp.BoolNot:
-          TrParenExpr("!", expr, wr, inLetExprBody, wStmts);
-          break;
-        case ResolvedUnaryOp.BitwiseNot:
-          TrParenExpr("~", expr, wr, inLetExprBody, wStmts);
-          break;
-        case ResolvedUnaryOp.Cardinality:
-          if (expr.Type.AsCollectionType is MultiSetType) {
-            TrParenExpr(expr, wr, inLetExprBody, wStmts);
-            wr.Write(".ElementCount");
-          } else {
-            TrParenExpr("new BigInteger(", expr, wr, inLetExprBody, wStmts);
-            wr.Write(".Count)");
-          }
-          break;
-        default:
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
-      }
-    }
-
-    static bool IsDirectlyComparable(Type t) {
-      Contract.Requires(t != null);
-      return t.IsBoolType || t.IsCharType || t.IsIntegerType || t.IsRealType || t.AsNewtype != null || t.IsBitVectorType || t.IsBigOrdinalType || t.IsRefType;
-    }
-
-    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
-      Expression e0, Expression e1, IToken tok, Type resultType,
-      out string opString,
-      out string preOpString,
-      out string postOpString,
-      out string callString,
-      out string staticCallString,
-      out bool reverseArguments,
-      out bool truncateResult,
-      out bool convertE1_to_int,
-      out bool coerceE1,
-      ConcreteSyntaxTree errorWr) {
-
-      opString = null;
-      preOpString = "";
-      postOpString = "";
-      callString = null;
-      staticCallString = null;
-      reverseArguments = false;
-      truncateResult = false;
-      convertE1_to_int = false;
-      coerceE1 = false;
-
-      switch (op) {
-        case BinaryExpr.ResolvedOpcode.EqCommon: {
-            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0.Type);
-            if (eqType.IsRefType) {
-              // Dafny's type rules are slightly different C#, so we may need a cast here.
-              // For example, Dafny allows x==y if x:array<T> and y:array<int> and T is some
-              // type parameter.
-              opString = "== (object)";
-            } else if (IsDirectlyComparable(eqType)) {
-              opString = "==";
-            } else {
-              staticCallString = "object.Equals";
-            }
-            break;
-          }
-        case BinaryExpr.ResolvedOpcode.NeqCommon: {
-            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0.Type);
-            if (eqType.IsRefType) {
-              // Dafny's type rules are slightly different C#, so we may need a cast here.
-              // For example, Dafny allows x==y if x:array<T> and y:array<int> and T is some
-              // type parameter.
-              opString = "!= (object)";
-            } else if (IsDirectlyComparable(eqType)) {
-              opString = "!=";
-            } else {
-              preOpString = "!";
-              staticCallString = "object.Equals";
-            }
-            break;
-          }
-
-        case BinaryExpr.ResolvedOpcode.LeftShift:
-          if (resultType.AsBitVectorType is { Width: var width and (32 or 64) }) {
-            staticCallString = $"{DafnyHelpersClass}.Bv{width}ShiftLeft";
-            convertE1_to_int = true;
-            truncateResult = true;
-          } else {
-            opString = "<<";
-            truncateResult = true;
-            convertE1_to_int = true;
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.RightShift:
-          if (resultType.AsBitVectorType is { Width: var width2 and (32 or 64) }) {
-            staticCallString = $"{DafnyHelpersClass}.Bv{width2}ShiftRight";
-            convertE1_to_int = true;
-          } else {
-            opString = ">>";
-            convertE1_to_int = true;
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Add:
-          if (resultType.IsCharType) {
-            if (CharIsRune) {
-              staticCallString = $"{DafnyHelpersClass}.AddRunes";
-            } else {
-              opString = "+"; truncateResult = true;
-              preOpString = $"(char)(";
-              postOpString = ")";
-            }
-          } else {
-            opString = "+"; truncateResult = true;
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Sub:
-          if (resultType.IsCharType) {
-            if (CharIsRune) {
-              staticCallString = $"{DafnyHelpersClass}.SubtractRunes";
-            } else {
-              opString = "-"; truncateResult = true;
-              preOpString = $"(char)(";
-              postOpString = ")";
-            }
-          } else {
-            opString = "-"; truncateResult = true;
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mul:
-          opString = "*"; truncateResult = true; break;
-        case BinaryExpr.ResolvedOpcode.Div:
-          if (NeedsEuclideanDivision(resultType)) {
-            var suffix = AsNativeType(resultType) != null ? "_" + GetNativeTypeName(AsNativeType(resultType)) : "";
-            staticCallString = $"{DafnyHelpersClass}.EuclideanDivision{suffix}";
-          } else {
-            opString = "/";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mod:
-          if (NeedsEuclideanDivision(resultType)) {
-            var suffix = AsNativeType(resultType) != null ? "_" + GetNativeTypeName(AsNativeType(resultType)) : "";
-            staticCallString = $"{DafnyHelpersClass}.EuclideanModulus{suffix}";
-          } else {
-            opString = "%";
-          }
-          break;
-
-        case BinaryExpr.ResolvedOpcode.SetEq:
-        case BinaryExpr.ResolvedOpcode.MultiSetEq:
-        case BinaryExpr.ResolvedOpcode.SeqEq:
-        case BinaryExpr.ResolvedOpcode.MapEq:
-          callString = "Equals"; break;
-
-        case BinaryExpr.ResolvedOpcode.ProperSubset:
-        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
-          staticCallString = TypeHelperName(e0.Type, errorWr, tok, e1.Type) + ".IsProperSubsetOf"; break;
-        case BinaryExpr.ResolvedOpcode.Subset:
-        case BinaryExpr.ResolvedOpcode.MultiSubset:
-          staticCallString = TypeHelperName(e0.Type, errorWr, tok, e1.Type) + ".IsSubsetOf"; break;
-
-        case BinaryExpr.ResolvedOpcode.Disjoint:
-        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
-          staticCallString = TypeHelperName(e0.Type, errorWr, tok, e1.Type) + ".IsDisjointFrom"; break;
-        case BinaryExpr.ResolvedOpcode.InSet:
-        case BinaryExpr.ResolvedOpcode.InMultiSet:
-        case BinaryExpr.ResolvedOpcode.InMap:
-        case BinaryExpr.ResolvedOpcode.InSeq:
-          callString = "Contains"; reverseArguments = true; break;
-
-        case BinaryExpr.ResolvedOpcode.Union:
-        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-          staticCallString = TypeHelperName(resultType, errorWr, tok) + ".Union"; break;
-        case BinaryExpr.ResolvedOpcode.MapMerge:
-          staticCallString = TypeHelperName(resultType, errorWr, tok) + ".Merge"; break;
-        case BinaryExpr.ResolvedOpcode.Intersection:
-        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-          staticCallString = TypeHelperName(resultType, errorWr, tok) + ".Intersect"; break;
-        case BinaryExpr.ResolvedOpcode.SetDifference:
-        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
-          staticCallString = TypeHelperName(resultType, errorWr, tok) + ".Difference"; break;
-
-        case BinaryExpr.ResolvedOpcode.MapSubtraction:
-          staticCallString = TypeHelperName(resultType, errorWr, tok) + ".Subtract"; break;
-
-        case BinaryExpr.ResolvedOpcode.ProperPrefix:
-          staticCallString = TypeHelperName(e0.Type, errorWr, e0.tok) + ".IsProperPrefixOf"; break;
-        case BinaryExpr.ResolvedOpcode.Prefix:
-          staticCallString = TypeHelperName(e0.Type, errorWr, e0.tok) + ".IsPrefixOf"; break;
-        case BinaryExpr.ResolvedOpcode.Concat:
-          staticCallString = TypeHelperName(e0.Type, errorWr, e0.tok) + ".Concat"; break;
-
-        default:
-          base.CompileBinOp(op, e0, e1, tok, resultType,
-            out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
-            errorWr);
-          break;
-      }
-    }
-
-    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
-      wr.Write("{0} == 0", varName);
-    }
-
-    protected override void EmitConversionExpr(ConversionExpr e, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Int) || e.E.Type.IsBitVectorType || e.E.Type.IsCharType) {
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // (int or bv or char) -> real
-          Contract.Assert(AsNativeType(e.ToType) == null);
-          wr.Write("new Dafny.BigRational(");
-          if (AsNativeType(e.E.Type) != null) {
-            wr.Write("new BigInteger");
-          }
-          ConvertFromChar(e.E, wr, inLetExprBody, wStmts);
-          wr.Write(", BigInteger.One)");
-        } else if (e.ToType.IsCharType) {
-          if (UnicodeCharEnabled) {
-            wr.Write($"new {CharTypeName}((int)");
-            TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-            wr.Write(")");
-          } else {
-            wr.Write($"({CharTypeName})");
-            TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          }
-        } else {
-          // (int or bv or char) -> (int or bv or ORDINAL)
-          var fromNative = AsNativeType(e.E.Type);
-          var toNative = AsNativeType(e.ToType);
-          if (fromNative == null && toNative == null) {
-            if (e.E.Type.IsCharType) {
-              // char -> big-integer (int or bv or ORDINAL)
-              wr.Write("new BigInteger");
-              ConvertFromChar(e.E, wr, inLetExprBody, wStmts);
-            } else {
-              // big-integer (int or bv) -> big-integer (int or bv or ORDINAL), so identity will do
-              wr.Append(Expr(e.E, inLetExprBody, wStmts));
-            }
-          } else if (fromNative != null && toNative == null) {
-            // native (int or bv) -> big-integer (int or bv)
-            wr.Write("new BigInteger");
-            TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          } else {
-            GetNativeInfo(toNative.Sel, out string toNativeName, out string toNativeSuffix, out var toNativeNeedsCast);
-            // any (int or bv) -> native (int or bv)
-            // A cast would do, but we also consider some optimizations
-            wr.Write("({0})", toNativeName);
-
-            var literal = PartiallyEvaluate(e.E);
-            UnaryOpExpr u = e.E.Resolved as UnaryOpExpr;
-            MemberSelectExpr m = e.E.Resolved as MemberSelectExpr;
-            if (literal != null) {
-              // Optimize constant to avoid intermediate BigInteger
-              wr.Write("(" + literal + toNativeSuffix + ")");
-            } else if (u != null && u.Op == UnaryOpExpr.Opcode.Cardinality) {
-              // Optimize .Count to avoid intermediate BigInteger
-              TrParenExpr(u.E, wr, inLetExprBody, wStmts);
-              if (toNative.UpperBound <= new BigInteger(0x80000000U)) {
-                wr.Write(".Count");
-              } else {
-                wr.Write(".LongCount");
-              }
-            } else if (m != null && m.MemberName == "Length" && m.Obj.Type.IsArrayType) {
-              // Optimize .Length to avoid intermediate BigInteger
-              TrParenExpr(m.Obj, wr, inLetExprBody, wStmts);
-              if (toNative.UpperBound <= new BigInteger(0x80000000U)) {
-                wr.Write(".Length");
-              } else {
-                wr.Write(".LongLength");
-              }
-            } else {
-              // no optimization applies; use the standard translation
-              ConvertFromChar(e.E, wr, inLetExprBody, wStmts);
-            }
-          }
-        }
-      } else if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-        Contract.Assert(AsNativeType(e.E.Type) == null);
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // real -> real
-          Contract.Assert(AsNativeType(e.ToType) == null);
-          wr.Append(Expr(e.E, inLetExprBody, wStmts));
-        } else {
-          // real -> (int or bv or char or ordinal)
-          if (e.ToType.IsCharType) {
-            wr.Write($"({CharTypeName})");
-          } else if (AsNativeType(e.ToType) != null) {
-            wr.Write("({0})", GetNativeTypeName(AsNativeType(e.ToType)));
-          }
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          wr.Write(".ToBigInteger()");
-        }
-      } else if (e.E.Type.IsBigOrdinalType) {
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Int) || e.ToType.IsBigOrdinalType) {
-          wr.Append(Expr(e.E, inLetExprBody, wStmts));
-        } else if (e.ToType.IsCharType) {
-          wr.Write($"({CharTypeName})");
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-        } else if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          wr.Write("new Dafny.BigRational(");
-          if (AsNativeType(e.E.Type) != null) {
-            wr.Write("new BigInteger");
-            TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-            wr.Write(", BigInteger.One)");
-          } else {
-            TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-            wr.Write(", 1)");
-          }
-        } else if (e.ToType.IsBitVectorType) {
-          // ordinal -> bv
-          var typename = TypeName(e.ToType, wr, null, null);
-          wr.Write($"({typename})");
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-        } else {
-          Contract.Assert(false, $"not implemented for C#: {e.E.Type} -> {e.ToType}");
-        }
-      } else {
-        Contract.Assert(false, $"not implemented for C#: {e.E.Type} -> {e.ToType}");
-      }
-    }
-
-    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IToken tok, ConcreteSyntaxTree wr) {
-      Contract.Requires(fromType.IsRefType);
-      Contract.Requires(toType.IsRefType);
-
-      // from T to U:   t is U && ...
-      // from T to U?:  t is U && ...                 // since t is known to be non-null, this is fine
-      // from T? to U:  t is U && ...                 // note, "is" implies non-null, so no need for explicit null check
-      // from T? to U?: t == null || (t is U && ...)
-      if (fromType.IsRefType && !fromType.IsNonNullRefType && toType.IsRefType && !toType.IsNonNullRefType) {
-        wr = wr.Write($"{localName} == null || ").ForkInParens();
-      }
-
-      string toTypeString;
-      if (fromType.IsTraitType && toType.AsNewtype != null) {
-        toTypeString = toType.AsNewtype.GetFullCompileName(Options);
-      } else {
-        toTypeString = TypeName(toType, wr, tok);
-      }
-      wr.Write($"{localName} is {toTypeString}");
-
-      localName = $"(({toTypeString}){localName})";
-      var udtTo = (UserDefinedType)toType.NormalizeExpandKeepConstraints();
-      if (udtTo.ResolvedClass is SubsetTypeDecl && !(udtTo.ResolvedClass is NonNullTypeDecl)) {
-        // TODO: test constraints
-        throw new UnsupportedFeatureException(tok, Feature.SubsetTypeTests);
-      }
-    }
-
-    protected override void EmitCollectionDisplay(CollectionType ct, IToken tok, List<Expression> elements,
-        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write("{0}.FromElements", TypeHelperName(ct, wr, tok));
-      TrExprList(elements, wr, inLetExprBody, wStmts, typeAt: _ => ct.Arg);
-    }
-
-    protected override void EmitMapDisplay(MapType mt, IToken tok, List<ExpressionPair> elements,
-        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var arguments = elements.Select(p => {
-        var result = new ConcreteSyntaxTree();
-        result.Format($"new Dafny.Pair{BracketList((LineSegment)TypeName(p.A.Type, result, p.A.tok), (LineSegment)TypeName(p.B.Type, result, p.B.tok))}");
-        result.Append(ParensList(Expr(p.A, inLetExprBody, wStmts), Expr(p.B, inLetExprBody, wStmts)));
-        return result;
-      }).ToArray<ICanRender>();
-      wr.Write($"{TypeHelperName(mt, wr, tok)}.FromElements{ParensList(arguments)}");
-    }
-
-    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
-      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
-      wrVarInit.Write("new System.Collections.Generic.List<{0}>()", TypeName(e.Type.AsSetType.Arg, wrVarInit, e.tok));
-    }
-
-    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
-      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
-      var mt = e.Type.AsMapType;
-      var domtypeName = TypeName(mt.Domain, wrVarInit, e.tok);
-      var rantypeName = TypeName(mt.Range, wrVarInit, e.tok);
-      wrVarInit.Write($"new System.Collections.Generic.List<Dafny.Pair<{domtypeName},{rantypeName}>>()");
-    }
-
-    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      if (ct is SetType) {
-        var wStmts = wr.Fork();
-        wr.FormatLine($"{collName}.Add({Expr(elmt, inLetExprBody, wStmts)});");
-      } else {
-        Contract.Assume(false);  // unexpected collection type
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IToken tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      var domtypeName = TypeName(mt.Domain, wr, tok);
-      var rantypeName = TypeName(mt.Range, wr, tok);
-      var termLeftWriter = new ConcreteSyntaxTree();
-      var wStmts = wr.Fork();
-      wr.FormatLine($"{collName}.Add(new Dafny.Pair<{domtypeName},{rantypeName}>{ParensList(termLeftWriter, Expr(term, inLetExprBody, wStmts))});");
-      return termLeftWriter;
-    }
-
-    protected override string GetCollectionBuilder_Build(CollectionType ct, IToken tok, string collName, ConcreteSyntaxTree wr) {
-      if (ct is SetType) {
-        var typeName = TypeName(ct.Arg, wr, tok);
-        return string.Format($"{DafnySetClass}<{typeName}>.FromCollection({collName})");
-      } else if (ct is MapType) {
-        var mt = (MapType)ct;
-        var domtypeName = TypeName(mt.Domain, wr, tok);
-        var rantypeName = TypeName(mt.Range, wr, tok);
-        return $"{DafnyMapClass}<{domtypeName},{rantypeName}>.FromCollection({collName})";
-      } else {
-        Contract.Assume(false);  // unexpected collection type
-        throw new cce.UnreachableException();  // please compiler
-      }
-    }
-
-    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write($"{DafnyHelpersClass}.SingleValue<{type}>");
-      TrParenExpr(e, wr, inLetExprBody, wStmts);
-    }
-
-    private void AddTestCheckerIfNeeded(string name, Declaration decl, ConcreteSyntaxTree wr) {
-      if (Options.Compile || Options.RunAllTests || !Attributes.Contains(decl.Attributes, "test")) {
-        return;
-      }
-
-      var firstReturnIsFailureCompatible = false;
-      var returnTypesCount = 0;
-
-      if (decl is Function func) {
-        returnTypesCount = 1;
-        firstReturnIsFailureCompatible =
-          func.ResultType?.AsTopLevelTypeWithMembers?.Members?.Any(m => m.Name == "IsFailure") ?? false;
-      } else if (decl is Method method) {
-        returnTypesCount = method.Outs.Count;
-        if (returnTypesCount > 0) {
-          firstReturnIsFailureCompatible =
-            method.Outs[0].Type?.AsTopLevelTypeWithMembers?.Members?.Any(m => m.Name == "IsFailure") ?? false;
-        }
-      }
-
-      wr.WriteLine("[Xunit.Fact]");
-      if (!firstReturnIsFailureCompatible) {
-        return;
-      }
-
-      wr = wr.NewNamedBlock("public static void {0}_CheckForFailureForXunit()", name);
-      var returnsString = string.Join(",", Enumerable.Range(0, returnTypesCount).Select(i => $"r{i}"));
-      wr.FormatLine($"var {returnsString} = {name}();");
-      wr.WriteLine("Xunit.Assert.False(r0.IsFailure(), \"Dafny test failed: \" + r0);");
-
-    }
-
-    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
-      var companion = TypeName_Companion(UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(mainMethod.EnclosingClass), wr, mainMethod.tok, mainMethod);
-      var wClass = wr.NewNamedBlock("class __CallToMain");
-      var wBody = wClass.NewNamedBlock("public static void Main(string[] args)");
-      var modName = mainMethod.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options) == "_module" ? "_module." : "";
-      companion = modName + companion;
-
-      var idName = IssueCreateStaticMain(mainMethod) ? "_StaticMain" : IdName(mainMethod);
-
-      Coverage.EmitSetup(wBody);
-      wBody.WriteLine($"{GetHelperModuleName()}.WithHaltHandling(() => {companion}.{idName}(Dafny.Sequence<Dafny.ISequence<{CharTypeName}>>.{CharMethodQualifier}FromMainArguments(args)));");
-      Coverage.EmitTearDown(wBody);
-    }
-
-    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
-      var tryBlock = wr.NewBlock("try");
-      TrStmt(body, tryBlock);
-      var catchBlock = wr.NewBlock("catch (Dafny.HaltException e)");
-      catchBlock.WriteLine($"var {haltMessageVarName} = Dafny.Sequence<{CharTypeName}>.{CharMethodQualifier}FromString(e.Message);");
-      TrStmt(recoveryBody, catchBlock);
-    }
-
-  }
-}
diff --git a/Source/DafnyCore/Compilers/CSharp/CsharpBackend.cs b/Source/DafnyCore/Compilers/CSharp/CsharpBackend.cs
deleted file mode 100644
index 56a6a403d01..00000000000
--- a/Source/DafnyCore/Compilers/CSharp/CsharpBackend.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Loader;
-using System.Text;
-using System.Text.Json;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-
-namespace Microsoft.Dafny.Compilers;
-
-public class CsharpBackend : ExecutableBackend {
-  protected override SinglePassCompiler CreateCompiler() {
-    return new CsharpCompiler(Options, Reporter);
-  }
-
-  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".cs", ".dll" };
-
-  public override string TargetName => "C#";
-  public override bool IsStable => true;
-  public override string TargetExtension => "cs";
-
-  // True if the most recently visited AST has a method annotated with {:synthesize}:
-
-  public override string GetCompileName(bool isDefaultModule, string moduleName, string compileName) {
-    return isDefaultModule
-      ? PublicIdProtect(compileName)
-      : base.GetCompileName(isDefaultModule, moduleName, compileName);
-  }
-
-  public override bool SupportsInMemoryCompilation => true;
-  public override bool TextualTargetIsExecutable => false;
-
-  public override bool CompileTargetProgram(string dafnyProgramName, string targetProgramText, string/*?*/ callToMain, string/*?*/ targetFilename, ReadOnlyCollection<string> otherFileNames,
-    bool runAfterCompile, TextWriter outputWriter, out object compilationResult) {
-
-    compilationResult = null;
-
-    // .NET Core does not allow C# compilation on all platforms using System.CodeDom. You need to use Roslyn libraries. Context: https://github.com/dotnet/runtime/issues/18768
-    var compilation = CSharpCompilation.Create(Path.GetFileNameWithoutExtension(dafnyProgramName))
-      .WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
-      .AddReferences(
-        MetadataReference.CreateFromFile(typeof(object).GetTypeInfo().Assembly.Location),
-        MetadataReference.CreateFromFile(Assembly.Load("mscorlib").Location));
-
-    compilation = compilation.WithOptions(compilation.Options.WithOutputKind(callToMain != null ? OutputKind.ConsoleApplication : OutputKind.DynamicallyLinkedLibrary));
-
-    var tempCompilationResult = new CSharpCompilationResult();
-    if (!Options.IncludeRuntime) {
-      var libPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-      compilation = compilation.AddReferences(MetadataReference.CreateFromFile(Path.Join(libPath, "DafnyRuntime.dll")));
-      compilation = compilation.AddReferences(MetadataReference.CreateFromFile(Assembly.Load("netstandard").Location));
-    }
-
-    var standardLibraries = new List<string>() {
-      "System.Runtime",
-      "System.Runtime.Numerics",
-      "System.Collections",
-      "System.Collections.Immutable",
-      "System.Console"
-    };
-    compilation = compilation.AddReferences(standardLibraries.Select(fileName => MetadataReference.CreateFromFile(Assembly.Load((string)fileName).Location)));
-
-    if (Options.Optimize) {
-      compilation = compilation.WithOptions(compilation.Options.WithOptimizationLevel(
-        Options.Optimize ? OptimizationLevel.Release : OptimizationLevel.Debug));
-    }
-
-    var otherSourceFiles = new List<string>();
-    foreach (var file in otherFileNames) {
-      string extension = Path.GetExtension(file);
-      if (extension != null) { extension = extension.ToLower(); }
-      if (extension == ".cs") {
-        var normalizedPath = Path.Combine(Path.GetDirectoryName(file), Path.GetFileName(file));
-        if (File.Exists(normalizedPath)) {
-          otherSourceFiles.Add(normalizedPath);
-        } else {
-          outputWriter.WriteLine("Errors compiling program: Could not find {0}", file);
-          return false;
-        }
-      } else if (extension == ".dll") {
-        compilation = compilation.AddReferences(MetadataReference.CreateFromFile(Path.GetFullPath(file)));
-      }
-    }
-
-    var source = callToMain == null ? targetProgramText : targetProgramText + callToMain;
-    compilation = compilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText(source));
-    foreach (var sourceFile in otherSourceFiles) {
-      compilation = compilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText(File.ReadAllText(sourceFile)));
-    }
-    var outputDir = targetFilename == null ? Directory.GetCurrentDirectory() : Path.GetDirectoryName(Path.GetFullPath(targetFilename));
-    var outputPath = Path.Join(outputDir, Path.GetFileNameWithoutExtension(Path.GetFileName(dafnyProgramName)) + ".dll");
-    var outputJson = Path.Join(outputDir, Path.GetFileNameWithoutExtension(Path.GetFileName(dafnyProgramName)) + ".runtimeconfig.json");
-    var emitResult = compilation.Emit(outputPath);
-
-    if (emitResult.Success) {
-      tempCompilationResult.CompiledAssembly = Assembly.LoadFile(outputPath);
-      if (Options.Verbose) {
-        outputWriter.WriteLine("Compiled assembly into {0}.dll", compilation.AssemblyName);
-      }
-
-      try {
-        var configuration = JsonSerializer.Serialize(
-          new {
-            runtimeOptions = new {
-              tfm = "net6.0",
-              framework = new {
-                name = "Microsoft.NETCore.App",
-                version = "6.0.0",
-                rollForward = "LatestMinor"
-              }
-            }
-          }, new JsonSerializerOptions() { WriteIndented = true });
-        File.WriteAllText(outputJson, configuration + Environment.NewLine);
-      } catch (Exception e) {
-        outputWriter.WriteLine($"Error trying to write '{outputJson}': {e.Message}");
-        return false;
-      }
-    } else {
-      outputWriter.WriteLine("Errors compiling program into {0}", compilation.AssemblyName);
-      var errors = emitResult.Diagnostics.Where(d => d.Severity == DiagnosticSeverity.Error).ToList();
-      foreach (var ce in errors) {
-        outputWriter.WriteLine(ce.ToString());
-        outputWriter.WriteLine();
-      }
-
-      return false;
-    }
-
-    compilationResult = tempCompilationResult;
-    return true;
-  }
-
-  private class CSharpCompilationResult {
-    public Assembly CompiledAssembly;
-  }
-
-  public override bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain,
-    string targetFilename /*?*/, ReadOnlyCollection<string> otherFileNames,
-    object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
-
-    var crx = (CSharpCompilationResult)compilationResult;
-
-    foreach (var otherFileName in otherFileNames) {
-      if (Path.GetExtension(otherFileName) == ".dll") {
-        var targetDirectory = Path.GetDirectoryName(crx.CompiledAssembly.Location);
-        File.Copy(otherFileName, Path.Combine(targetDirectory!, Path.GetFileName(otherFileName)), true);
-      }
-    }
-
-    if (crx.CompiledAssembly == null) {
-      throw new Exception("Cannot call run target program on a compilation that failed");
-    }
-    var psi = PrepareProcessStartInfo("dotnet", new[] { crx.CompiledAssembly.Location }.Concat(Options.MainArgs));
-    return RunProcess(psi, outputWriter, errorWriter) == 0;
-  }
-
-  public CsharpBackend(DafnyOptions options) : base(options) {
-  }
-}
diff --git a/Source/DafnyCore/Compilers/CSharp/Synthesizer-Csharp.cs b/Source/DafnyCore/Compilers/CSharp/Synthesizer-Csharp.cs
deleted file mode 100644
index a988b09608a..00000000000
--- a/Source/DafnyCore/Compilers/CSharp/Synthesizer-Csharp.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Microsoft.CodeAnalysis.CSharp;
-
-namespace Microsoft.Dafny.Compilers;
-
-/// <summary>
-/// Below is the full grammar of ensures clauses that can specify
-/// the behavior of an object returned by a synthesize-annotated method
-/// (S is the starting symbol, ID refers to a variable/field/method/type
-/// identifier, EXPR stands for an arbitrary Dafny expression):
-///
-/// S         = FORALL
-///           | EQUALS 
-///           | S && S
-/// EQUALS    = ID.ID (ARGLIST)  == EXPR // stubs a method call
-///           | ID.ID            == EXPR // stubs field access
-///           | EQUALS && EQUALS
-/// FORALL    = forall BOUNDVARS :: EXPR ==> EQUALS
-/// ARGLIST   = ID   // this can be one of the bound variables
-///           | EXPR // this expr may not reference any of the bound variables 
-///           | ARGLIST, ARGLIST
-/// BOUNDVARS = ID : ID 
-///           | BOUNDVARS, BOUNDVARS
-/// 
-/// </summary>
-public class CsharpSynthesizer {
-
-  private readonly CsharpCompiler compiler;
-  private readonly ConcreteSyntaxTree ErrorWriter;
-  // maps identifiers to the names of the corresponding mock:
-  private Dictionary<IVariable, string> objectToMockName = new();
-  // associates a bound variable with the lambda passed to argument matcher
-  private Dictionary<IVariable, string> bounds = new();
-  private Method lastSynthesizedMethod = null;
-  private DafnyOptions Options => compiler.Options;
-
-  public CsharpSynthesizer(CsharpCompiler compiler, ConcreteSyntaxTree errorWriter) {
-    this.compiler = compiler;
-    ErrorWriter = errorWriter;
-  }
-
-  /// <summary>
-  /// Create a body of a method that synthesizes one or more objects.
-  /// For instance, the following Dafny method:
-  /// 
-  /// method {:synthesize} CrossReferentialMock()
-  ///     returns (e1:Even, e2:Even) 
-  ///     ensures fresh(e1) && fresh(e2) 
-  ///     ensures e1.Next() == e2
-  ///     ensures e2.Next() == e1
-  ///
-  /// Gets compiled to the following C# code:
-  /// (Note that e1Return and e2Return are introduced because e1 and e2
-  /// are used inside a lambda and cannot, therefore, be out parameters)
-  ///
-  /// public static void CrossReferentialMock(out Even e1Return,
-  ///                                         out Even e2Return) {
-  ///     var e1Mock = new Mock<Even>();
-  ///     var e1 = e1Mock.Object;
-  ///     var e2Mock = new Mock<Even>();
-  ///     var e2 = e2Mock.Object;
-  ///     e1Mock.Setup(x => x.Next()).Returns(()=>e2);
-  ///     e2Mock.Setup(x => x.Next()).Returns(()=>e1);
-  ///     e1Return = e1;
-  ///     e2Return = e2;
-  /// }
-  /// </summary>
-  public ConcreteSyntaxTree SynthesizeMethod(Method method,
-    List<SinglePassCompiler.TypeArgumentInstantiation> typeArgs, bool createBody,
-    ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
-
-    lastSynthesizedMethod = method;
-    // The following few lines are identical to those in Compiler.CreateMethod:
-    var customReceiver = createBody &&
-                         !forBodyInheritance &&
-                         compiler.NeedsCustomReceiver(method);
-    var keywords = compiler.Keywords(true, true);
-    var returnType = compiler.GetTargetReturnTypeReplacement(method, wr);
-    var typeParameters = compiler.TypeParameters(SinglePassCompiler.TypeArgumentInstantiation.
-      ToFormals(compiler.ForTypeParameters(typeArgs, method, lookasideBody)));
-    var parameters = compiler
-      .GetMethodParameters(method, typeArgs, lookasideBody, customReceiver, returnType);
-
-    // Out parameters cannot be used inside lambda expressions in Csharp
-    // but the mocked objects may appear in lambda expressions during
-    // mocking (e.g. two objects may cross-reference each other).
-    // The solution is to rename the out parameters.
-    var parameterString = parameters.ToString();
-    var objectToReturnName = method.Outs.ToDictionary(o => o,
-      o => compiler.idGenerator.FreshId(o.CompileName + "Return"));
-    foreach (var (obj, returnName) in objectToReturnName) {
-      parameterString = Regex.Replace(parameterString,
-        $"(^|[^a-zA-Z0-9_]){obj.CompileName}([^a-zA-Z0-9_]|$)",
-        "$1" + returnName + "$2");
-    }
-    wr.FormatLine($"{keywords}{returnType} {compiler.PublicIdProtect(method.GetCompileName(Options))}{typeParameters}({parameterString}) {{");
-
-    // Initialize the mocks
-    objectToMockName = method.Outs.ToDictionary(o => (IVariable)o,
-      o => compiler.idGenerator.FreshId(o.CompileName + "Mock"));
-    foreach (var (obj, mockName) in objectToMockName) {
-      var typeName = compiler.TypeName(obj.Type, wr, obj.Tok);
-      // Mocking a trait works only so long as no trait member is accessed
-      if ((method.Outs.First().Type is UserDefinedType userDefinedType) &&
-          userDefinedType.IsTraitType) {
-        wr.FormatLine($"var {mockName} = new Mock<{typeName}>(MockBehavior.Strict);");
-      } else {
-        wr.FormatLine($"var {mockName} = new Mock<{typeName}>();");
-        wr.FormatLine($"{mockName}.CallBase = true;");
-      }
-      wr.FormatLine($"var {obj.CompileName} = {mockName}.Object;");
-    }
-
-    // Stub methods and fields according to the Dafny post-conditions:
-    foreach (var ensureClause in method.Ens) {
-      bounds = new();
-      var wStmts = wr.Fork();
-      SynthesizeExpression(wr, ensureClause.E, wStmts);
-    }
-
-    // Return the mocked objects:
-    if (returnType != "void") {
-      wr.FormatLine($"return {method.Outs[0].CompileName};");
-    } else {
-      foreach (var o in method.Outs) {
-        wr.FormatLine($"{objectToReturnName[o]} = {o.CompileName};");
-      }
-    }
-    wr.WriteLine("}");
-    return wr;
-  }
-
-  /// <summary>
-  /// If the expression is a bound variable identifier, return the
-  /// variable and the string representation of the bounding condition
-  /// </summary>
-  private Tuple<IVariable, string> GetBound(Expression exp) {
-    if (exp is not NameSegment) {
-      return null;
-    }
-    var variable = ((IdentifierExpr)exp.Resolved).Var;
-    if (!bounds.ContainsKey(variable)) {
-      return null;
-    }
-    return new Tuple<IVariable, string>(variable, bounds[variable]);
-  }
-
-  private void SynthesizeExpression(ConcreteSyntaxTree wr, Expression expr, ConcreteSyntaxTree wStmts) {
-    switch (expr) {
-      case LiteralExpr literalExpr:
-        wr.Append(compiler.Expr(literalExpr, false, wStmts));
-        break;
-      case ApplySuffix applySuffix:
-        SynthesizeExpression(wr, applySuffix, wStmts);
-        break;
-      case BinaryExpr binaryExpr:
-        SynthesizeExpression(wr, binaryExpr, wStmts);
-        break;
-      case ForallExpr forallExpr:
-        SynthesizeExpression(wr, forallExpr, wStmts);
-        break;
-      case FreshExpr:
-        break;
-      default:
-        // TODO: Have the resolver reject all these unimplemented cases,
-        // or convert them to UnsupportedFeatureExceptions
-        throw new NotImplementedException();
-    }
-  }
-
-  private void SynthesizeExpression(ConcreteSyntaxTree wr, ApplySuffix applySuffix, ConcreteSyntaxTree wStmts) {
-
-    var methodApp = (ExprDotName)applySuffix.Lhs;
-    var receiver = ((IdentifierExpr)methodApp.Lhs.Resolved).Var;
-    var method = ((MemberSelectExpr)methodApp.Resolved).Member;
-    var methodName = method.GetCompileName(Options);
-
-    if (((Function)method).Ens.Count != 0) {
-      compiler.Error(CompilerErrors.ErrorId.c_possibly_unsatisfied_postconditions, lastSynthesizedMethod.tok,
-        "Post-conditions on function {0} might " +
-        "be unsatisfied when synthesizing code " +
-        "for method {1}",
-        ErrorWriter, methodName, lastSynthesizedMethod.Name);
-    }
-
-    var tmpId = compiler.idGenerator.FreshId("tmp");
-    wr.Format($"{objectToMockName[receiver]}.Setup({tmpId} => {tmpId}.{methodName}(");
-
-    // The remaining part of the method uses Moq's argument matching to
-    // describe the arguments for which the method should be stubbed
-    // (in Dafny, this condition is the antecedent over bound variables)
-    for (int i = 0; i < applySuffix.Args.Count; i++) {
-      var arg = applySuffix.Args[i];
-      var bound = GetBound(arg);
-      if (bound != null) { // if true, arg is a bound variable
-        wr.Write(bound.Item2);
-      } else {
-        wr.Append(compiler.Expr(arg, false, wStmts));
-      }
-      if (i != applySuffix.Args.Count - 1) {
-        wr.Write(", ");
-      }
-    }
-    wr.Write("))");
-  }
-
-  private void SynthesizeExpression(ConcreteSyntaxTree wr, BinaryExpr binaryExpr, ConcreteSyntaxTree wStmts) {
-    if (binaryExpr.Op == BinaryExpr.Opcode.And) {
-      Dictionary<IVariable, string> oldBounds = bounds
-        .ToDictionary(entry => entry.Key, entry => entry.Value);
-      SynthesizeExpression(wr, binaryExpr.E0, wStmts);
-      bounds = oldBounds;
-      SynthesizeExpression(wr, binaryExpr.E1, wStmts);
-      return;
-    }
-    if (binaryExpr.Op != BinaryExpr.Opcode.Eq) {
-      throw new NotImplementedException();
-    }
-    if (binaryExpr.E0 is ExprDotName exprDotName) { // field stubbing
-      var obj = ((IdentifierExpr)exprDotName.Lhs.Resolved).Var;
-      var field = ((MemberSelectExpr)exprDotName.Resolved).Member;
-      var fieldName = field.GetCompileName(Options);
-      compiler.Error(CompilerErrors.ErrorId.c_stubbing_fields_not_recommended, lastSynthesizedMethod.tok,
-        "Stubbing fields is not recommended (field {0} of object {1} inside method {2})",
-        ErrorWriter, fieldName, obj.Name, lastSynthesizedMethod.Name);
-      var tmpId = compiler.idGenerator.FreshId("tmp");
-      wr.Format($"{objectToMockName[obj]}.SetupGet({tmpId} => {tmpId}.@{fieldName}).Returns( ");
-      wr.Append(compiler.Expr(binaryExpr.E1, false, wStmts));
-      wr.WriteLine(");");
-      return;
-    }
-    if (binaryExpr.E0 is not ApplySuffix applySuffix) {
-      throw new NotImplementedException();
-    }
-    SynthesizeExpression(wr, applySuffix, wStmts);
-    wr.Write(".Returns(");
-    wr.Write("(");
-    for (int i = 0; i < applySuffix.Args.Count; i++) {
-      var arg = applySuffix.Args[i];
-      var typeName = compiler.TypeName(arg.Type, wr, arg.tok);
-      var bound = GetBound(arg);
-      if (bound != null) {
-        wr.Format($"{typeName} {bound.Item1.CompileName}");
-      } else {
-        // if the argument is not a bound variable, it is irrelevant to the
-        // expression in the lambda
-        wr.Format($"{typeName} _");
-      }
-      if (i != applySuffix.Args.Count - 1) {
-        wr.Write(", ");
-      }
-    }
-    wr.Write(")=>");
-    wr.Append(compiler.Expr(binaryExpr.E1, false, wStmts));
-    wr.WriteLine(");");
-  }
-
-  private void SynthesizeExpression(ConcreteSyntaxTree wr, ForallExpr forallExpr, ConcreteSyntaxTree wStmts) {
-    if (forallExpr.Term is not BinaryExpr binaryExpr) {
-      throw new NotImplementedException();
-    }
-    var declarations = new List<string>();
-
-    // a MultiMatcher is created to convert an antecedent of the implication
-    // following the forall statement to argument matching calls in Moq
-    var matcherName = compiler.idGenerator.FreshId("matcher");
-
-    var tmpId = compiler.idGenerator.FreshId("tmp");
-    for (int i = 0; i < forallExpr.BoundVars.Count; i++) {
-      var boundVar = forallExpr.BoundVars[i];
-      var varType = compiler.TypeName(boundVar.Type, wr, boundVar.tok);
-      bounds[boundVar] = $"It.Is<{varType}>(x => {matcherName}.Match(x))";
-      declarations.Add($"var {boundVar.CompileName} = ({varType}) {tmpId}[{i}];");
-    }
-
-    wr.WriteLine($"var {matcherName} = new Dafny.MultiMatcher({declarations.Count}, {tmpId} => {{");
-    foreach (var declaration in declarations) {
-      wr.WriteLine($"\t{declaration}");
-    }
-
-    switch (binaryExpr.Op) {
-      case BinaryExpr.Opcode.Imp:
-        wr.Write("\treturn ");
-        wr.Append(compiler.Expr(binaryExpr.E0, false, wStmts));
-        wr.WriteLine(";");
-        binaryExpr = (BinaryExpr)binaryExpr.E1.Resolved;
-        break;
-      case BinaryExpr.Opcode.Eq:
-        wr.WriteLine("\treturn true;");
-        break;
-      default:
-        throw new NotImplementedException();
-    }
-    wr.WriteLine("});");
-    SynthesizeExpression(wr, binaryExpr, wStmts);
-  }
-
-  /// <summary>
-  /// Adds MultiMatcher class to the specified ConcreteSyntaxTree.
-  /// MultiMatcher allows converting one expression over many arguments
-  /// (like ones one finds in Dafny in antecedent of a forall statement)
-  /// to many separate predicates over each argument (which is how argument
-  /// matching is done in expressionC#'s Moq library)
-  /// So, for instance, a Dafny postcondition
-  ///   forall a,b:int :: a > b ==> o.m(a, b) == 4
-  /// is converted to:
-  /// 
-  ///   var matcher = new Dafny.MultiMatcher(2, args => {
-  ///     return args[0] > args[1];
-  ///   });
-  ///   o.Setup(x => x.m(It.Is<int>(a => matcher.Match(a)),
-  ///                    It.Is<int>(b => matcher.Match(b)))).Returns(4);
-  /// 
-  /// </summary>
-  internal static void EmitMultiMatcher(ConcreteSyntaxTree dafnyNamespace) {
-    const string multiMatcher = @"
-    class MultiMatcher {
-
-      private readonly Func<object[], bool> predicate;
-      private readonly int argumentCount;
-      private readonly List<object> collectedArguments;
-
-      public MultiMatcher(int argumentCount, Func<object[], bool> predicate) {
-        this.predicate = predicate;
-        this.argumentCount = argumentCount;
-        collectedArguments = new List<object>();
-      }
-
-      public bool Match(object argument) {
-        collectedArguments.Add(argument);
-        if (collectedArguments.Count != argumentCount) {
-          return true;
-        }
-        bool result = predicate(collectedArguments.ToArray());
-        collectedArguments.Clear();
-        return result;
-      }
-    }";
-    var memberDeclaration = SyntaxFactory.ParseMemberDeclaration(multiMatcher);
-    dafnyNamespace.WriteLine(memberDeclaration.ToFullString());
-  }
-
-  internal static void EmitImports(ConcreteSyntaxTree wr) {
-    wr.WriteLine("using Moq;");
-    wr.WriteLine("using System.Collections.Generic;");
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/CompilerErrors.cs b/Source/DafnyCore/Compilers/CompilerErrors.cs
deleted file mode 100644
index 541ebc83501..00000000000
--- a/Source/DafnyCore/Compilers/CompilerErrors.cs
+++ /dev/null
@@ -1,388 +0,0 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
-using System.Collections.Generic;
-using static Microsoft.Dafny.ErrorRegistry;
-
-namespace Microsoft.Dafny.Compilers;
-
-public class CompilerErrors {
-
-  public enum ErrorId {
-    None,
-    c_process_exit,
-    c_process_failed_to_start,
-    c_unsupported_feature,
-    c_abstract_type_needs_hint,
-    c_abstract_type_cannot_be_compiled,
-    c_iterators_are_not_deterministic,
-    c_iterator_has_no_body,
-    c_constructorless_class_forbidden,
-    c_method_may_not_be_main_method,
-    c_could_not_find_stipulated_main_method,
-    c_more_than_one_explicit_main_method,
-    c_method_not_permitted_as_main,
-    c_more_than_one_default_Main_method,
-    c_Main_method_not_permitted,
-    c_function_has_no_body,
-    c_test_function_must_be_compilable,
-    c_invalid_synthesize_method,
-    c_method_has_no_body,
-    c_assume_statement_may_not_be_compiled,
-    c_forall_statement_has_no_body,
-    c_loop_has_no_body,
-    c_nondeterminism_forbidden,
-    c_assign_such_that_forbidden,
-    c_assign_such_that_is_too_complex,
-    c_nondeterministic_if_forbidden,
-    c_binding_if_forbidden,
-    c_case_based_if_forbidden,
-    c_non_deterministic_loop_forbidden,
-    c_case_based_loop_forbidden,
-    c_no_assignments_to_seven_d_arrays,
-    c_bodyless_modify_statement_forbidden,
-    c_let_such_that_is_too_complex,
-    c_possibly_unsatisfied_postconditions,
-    c_stubbing_fields_not_recommended,
-    c_abstract_type_cannot_be_compiled_extern,
-    c_Go_unsupported_field,
-    c_Go_infeasible_conversion,
-
-    f_unsupported_feature,
-
-  }
-
-  static CompilerErrors() {
-
-    Add(ErrorId.c_process_exit,
-    @"
-The dafny compiler prepares a representation of the Dafny program in the desired target programming
-language and then invokes the target language's compiler on those files as a subsidiary process.
-This error message indicates that the sub-process terminated with an error of some sort.
-This should not ordinarily happen. Some possible causes are
-- lack of resources that caused the underlying compiler to fail
-- lack of or corrupted installation of the underlying compiler
-- a bug in dafny whereby the source code it prepares for the compiler is faulty
-
-There may be additional error messages from the underlying compiler that can help debug this situation.
-You can also attempt to run the target programming language compiler manually in your system 
-to make sure it is functional.
-");
-
-    Add(ErrorId.c_process_failed_to_start,
-    @"
-The dafny compiler prepares a representation of the Dafny program in the desired target programming
-language and then invokes the target language's compiler on those files as a subsidiary process.
-This error message indicates that this sub-process would not start;
-it gives some additional information about what the invoking process was told about the failure to start.
-
-Typically this error happens when the installation of the underlying compiler is not present or is incomplete,
-such as the proper files not having the correct permissions.
-");
-
-    Add(ErrorId.c_unsupported_feature,
-    @"
-This messages indicates two problems:
-- the given feature is not supported in the compiler for the target language but is present in the program,
-so the program will need to be revised to avoid this feature;
-- the feature is not listed in the in-tool list of unsupported features.
-The latter is an omission in the in-tool documentation. Please report this error message and the part of the
-program provoking it to the Dafny team's [issue tracker](https://github.com/dafny-lang/dafny/issues).
-");
-
-    Add(ErrorId.c_abstract_type_needs_hint,
-    @"
-The type needs a name given to know which type in the target language it is associated with.
-");
-
-    Add(ErrorId.c_abstract_type_cannot_be_compiled,
-    @"
-[Abstract types](../DafnyRef/DafnyRef#sec-abstract-types) are declared like `type T`.
-They can be useful in programs where the particular characteristics of the type
-do not matter, such as in manipulating generic collections.
-Such programs can be verified, but in order to be compiled to something executable, 
-the type must be given an actual definition. 
-If the definition really does not matter, just give it a definition like 
-`type T = bool` or `type T = `int`.
-
-Note that some properties of a type an be indicated using a [type characteristic](../DafnyRef/DafnyRef#sec-type-characteristics).
-For example, [`type T(00)` indicates that the type `T` is non-empty](../DafnyRef/DafnyRef#sec-nonempty-types).
-");
-
-    Add(ErrorId.c_iterators_are_not_deterministic,
-    @"
-The `--enforce-determinism` option requires a target program to be deterministic and predictable:
-there may be no program statements that have an arbitrary, even if deterministic, result.
-In an iterator, the yield parameters are initialized with arbitary values and can be read before 
-they are set with actual values, so there is a bit of nondeterminism.
-Consequently, iterators in general are not permitted along with `--enforce-determinism`.
-");
-
-    Add(ErrorId.c_iterator_has_no_body,
-    @"
-Programs containing iterators without bodies can be verified.
-However, a body-less iterator is an unchecked assumption (even if it is ghost).
-Consequently, like body-less functions and loops, dafny will not
-compile a program containing an iterator without a body.
-Furthermore, if the iterator is non-ghost, it cannot be executed if it does not have a body.
-");
-
-    Add(ErrorId.c_constructorless_class_forbidden,
-    @"
-The `--enforce-determinism` option prohibits all non-deterministic operations in a Dafny program.
-One of these operations is the arbitrary values assigned to non-explicitly-initialized fields in a default constructor.
-Consequently an explicit constructor is required.
-");
-
-    Add(ErrorId.c_method_may_not_be_main_method,
-    @"
-To create an executable program, the compiler needs to know which is the method 
-to call to start the program, typically known as the 'main' method or main entry point. 
-`dafny` chooses such a method based on a few rules (cf. [details in the Dafny User Guide](#sec-user-guide-main)).
-
-But there are restrictions on which methods may be used as a main entry point.
-Most importantly
-- the method must take no input arguments or just one argument of type `seq<string>`
-- it must not be ghost
-- the method may be a class method, but then typically it is `static`
-
-Most commonly and for clarity, the intended main method is marked with the attribute `{:main}`.
-");
-
-    Add(ErrorId.c_could_not_find_stipulated_main_method,
-    @"
-In the legacy command-line syntax, the main method may be specified on the command-line.
-When doing so, the name given must be a fully-qualified name.
-For instance. a method `m` in a (top-level) module `M` is named `M.m` 
-or in a class `C` in a module `M` is named `M.C.m`.
-This error message indicates that dafny does not recognize the name given as the name of a method.
-");
-
-    Add(ErrorId.c_more_than_one_explicit_main_method,
-    @"
-When searching all the files in the program (including `include`d ones), dafny found more than one method marked
-with `{:main}`. The error location is that of one of the methods and the error refers to another.
-The tool does not know which one to use. 
-The solution is to remove the `{:main}` attribute from all but one.
-
-Note that entry points that are intended as unit tests can be marked with `{:test}` instead.
-");
-
-    Add(ErrorId.c_method_not_permitted_as_main,
-    @"
-Only some methods may be used as entry points and the one indicated may not.
-The principal restrictions are these ([more details in the Dafny User Guide](#sec-user-guide-main)):
-- the method must take no input arguments or just one argument of type `seq<string>`
-- it must not be ghost
-- the method may be a class method, but then typically it is `static`
-");
-
-    Add(ErrorId.c_more_than_one_default_Main_method,
-    @"
-In the absence of any `{:main}` attributes, dafny chooses a method named `Main` as the main entry point.
-When searching all the files in the program (including `include`d ones), dafny found more than one method named `Main`.
-The error location is that of one of the methods and the error text refers to another.
-The solution is to mark one of them as `{:main}`.
-
-Note that entry points that are intended as unit tests can be marked with `{:test}` instead.
-");
-
-    Add(ErrorId.c_Main_method_not_permitted,
-    @"
-If dafny finds no methods marked `{:main}`, it then looks for a method named `Main`
-to use as the starting point for the program.
-This error occurs if the `Main` method that is found
-does not qualify as a main entry point because it violates one or more of the [rules](#sec-user-guide-main),
-as given by the reason in the error message.
-");
-
-    Add(ErrorId.c_function_has_no_body,
-    @"
-The given function has no body, which is OK for verification, but not OK for compilation 
---- the compiler does not know what content to give it.
-Even ghost functions must have bodies because body-less ghost functions are a form of unchecked assumptions.
-");
-
-    Add(ErrorId.c_test_function_must_be_compilable,
-    @"
-Only compiled functions and methods may be tested using the `dafny test` command, 
-which tests everything marked with `{:test}`.
-However this function is a ghost function, and consequently cannot be tested during execution.
-If you want the function to be compiled,
-declare the function as a `function` instead of `ghost function` in Dafny 4 
-or as `function method` instead of `function` in Dafny 3.
-");
-
-    Add(ErrorId.c_invalid_synthesize_method,
-    @"
-The `{:synthesize}` attribute is an experimental attribute used to create 
-a mock object for methods that do not have bodies.
-It is currently only available for compiling to C# and in conjunction with the Moq library.
-See the [reference manual section on {:synthesize}](../DafnyRef/DafnyRef#sec-synthesize-attr) for more detail.
-");
-
-    Add(ErrorId.c_method_has_no_body,
-    @"
-To be part of a compiled program, each method must have a body.
-Ghost methods are the equivalent of unchecked assumptions
-so they too must have bodies.
-");
-
-    Add(ErrorId.c_assume_statement_may_not_be_compiled,
-    @"
-A method may be parsed and verified even if an [assume statement](../DafnyRef/DafnyRef#sec-assume-statement) is present. 
-However, the assume statement is an explicit, unchecked assumption.
-Dafny does not allow programs with unchecked assumptions, that is, incompletely verified programs, to be compiled.
-The `{:axiom}` attribute can be used to tell Dafny that the assumption is to be considered an
-externally verified _axiom_, with the program author taking responsibility for its validity.
-
-If the assumption marked with `{:axiom}` is not actually valid, then the validity of the entire program is in question.
-");
-
-    Add(ErrorId.c_forall_statement_has_no_body,
-    @"
-A method may be parsed and verified even if a [forall statement](../DafnyRef/DafnyRef#sec-forall-statement) is missing a body. 
-However, the body must be supplied before the program can be compiled,
-even if the method is `ghost`. Body-less foralls in ghost methods are 
-unchecked assumptions.
-");
-
-    Add(ErrorId.c_loop_has_no_body,
-    @"
-A method may be parsed and verified even if a loop is missing a body. 
-Note that a missing body is different than an empty body, which is just `{ }`.
-However, the body must be supplied before the program can be compiled,
-even if the method is `ghost`. 
-Body-less loops in ghost methods are similar to unchecked assumptions.
-");
-
-    Add(ErrorId.c_nondeterminism_forbidden,
-    @"
-The `--enforce-determinism` option requires a target program to be deterministic and predictable:
-there may be no program statements that have an arbitrary, even if deterministic, result.
-Hence this 'assign any legal value' (`... := *`) statement is not permitted with `--enforce-determinism`.
-
-There are a few different forms of this kind of assignment:
-- `x := *;`
-- `x, y, z := 3, *, 42;`
-- `forall i | 0 <= i < a.Length { a[i] := *; }`
-");
-
-    Add(ErrorId.c_assign_such_that_forbidden,
-    @"
-The `--enforce-determinism` option requires a target program to be deterministic and predictable:
-there may be no program statements that have an arbitrary, even if deterministic, result.
-Hence this 'assign any value that satisfies the predicate' (`:|`) statement is not permitted with `--enforce-determinism`,
-even if there is only one such possible value.
-(The tool does not try to determine whether there is just one value and
-whether there is a reasonable way to compute the value.)
-");
-
-    Add(ErrorId.c_assign_such_that_is_too_complex,
-    @"
-To compile an assign-such-that statement, Dafny needs to find some appropriate bounds for each variable.
-However, in this case the expression is too complex for Dafny's heuristics.
-");
-
-    Add(ErrorId.c_nondeterministic_if_forbidden,
-    @"
-The `--enforce-determinism` option requires a target program to be deterministic and predictable:
-there may be no program statements that have an arbitrary, even if deterministic, result.
-Hence this 'non-deterministic if' (`if *`) statement is not permitted with `--enforce-determinism`.
-");
-
-    Add(ErrorId.c_binding_if_forbidden,
-    @"
-The `--enforce-determinism` option requires a target program to be deterministic and predictable:
-there may be no program statements that have an arbitrary, even if deterministic, result.
-The [`if` with a binding guard](../DafnyRef/DafnyRef#sec-binding-guards) (`if ... :| `) checks that the 
-given predicate is satisfiable by some value. If not, then the 'else' branch is executed;
-but if so, the 'then' branch is executed with an arbitrary value that satisifies the predicate.
-Because of this arbitrary selection, the if-with-binding-guard is not permitted with `--enforce-determinism`,
-even if there is exactly one value that satisfies the predicate.
-(The tool does not try to determine whether there is just one value or
-whether there is a reasonable way to compute a value.)
-");
-
-    Add(ErrorId.c_case_based_if_forbidden,
-    @"
-The `--enforce-determinism` option requires a target program to be deterministic and predictable:
-there may be no program statements that have an arbitrary, even if deterministic, result.
-The case-based if statement allows the case guards to be evaluated in an arbitrary order and
-an arbitrary one of those found to be true is chosen to be executed.
-Hence the case-based if is not permitted with `--enforce-determinism`.
-
-To enforce a deterministic order to the evaluation, use a chain of if-then-else statements.
-");
-
-    Add(ErrorId.c_non_deterministic_loop_forbidden,
-    @"
-The `--enforce-determinism` option requires a target program to be deterministic and predictable:
-there may be no program statements that have an arbitrary, even if deterministic, result.
-Hence this 'non-deterministic while' (`while *`) statement is not permitted with `--enforce-determinism`.
-");
-
-    Add(ErrorId.c_case_based_loop_forbidden,
-    @"
-The `--enforce-determinism` option requires a target program to be deterministic and predictable:
-there may be no program statements that have an arbitrary, even if deterministic, result.
-The case-based while statement allows the case guards to be evaluated in an arbitrary order and
-an arbitrary one of those found to be true is chosen to be executed.
-Hence the case-based loop is not permitted with `--enforce-determinism`.
-
-To enforce a deterministic order to the evaluation, use a chain of if-then-else statements
-or series of `if` statements in which the then-branch ends in a continue statement.
-");
-
-    Add(ErrorId.c_no_assignments_to_seven_d_arrays,
-    @"
-_The documentation of this problem is in progress._
-");
-
-    Add(ErrorId.c_bodyless_modify_statement_forbidden,
-    @"
-The `--enforce-determinism` option requires a target program to be deterministic and predictable:
-there may be no program statements that have an arbitrary, even if deterministic, result.
-
-The [`modify` statement](../DafnyRef/DafnyRef#sec-modify-statement) allows the program to modify 
-the state of the given objects in an arbitrary way
-(though each field still has a legal value of its declared type).
-Hence such a statement is not permitted with `--enforce-determinism`.
-
-Note that a `modify` statement with a body is deprecated.
-");
-
-    Add(ErrorId.c_let_such_that_is_too_complex,
-    @"
-_The documentation of this problem is in progress._
-");
-
-    Add(ErrorId.c_possibly_unsatisfied_postconditions,
-    @"
-This message relates to mocking methods in C# with the Moq framework. 
-See the [reference manual section on {:synthesize}](../DafnyRef/DafnyRef#sec-synthesize-attr) for more detail.
-");
-
-    Add(ErrorId.c_stubbing_fields_not_recommended,
-    @"
-This message relates to mocking methods in C# with the Moq framework. 
-See the [reference manual section on {:synthesize}](../DafnyRef/DafnyRef#sec-synthesize-attr) for more detail.
-");
-
-    Add(ErrorId.c_abstract_type_cannot_be_compiled_extern,
-    @"
-The C++ compiler must be told how to translate an abstract type. Typically the value of the extern attribute is ""struct"".
-Note that Dafny's C++ compiler is very preliminary, partial and experimental.
-");
-
-    Add(ErrorId.c_Go_unsupported_field,
-    @"
-_Documentation of the Go compiler errors is in progress._
-");
-
-    Add(ErrorId.c_Go_infeasible_conversion,
-    @"
-_Documentation of the Go compiler errors is in progress._
-");
-  }
-}
diff --git a/Source/DafnyCore/Compilers/CoverageInstrumenter.cs b/Source/DafnyCore/Compilers/CoverageInstrumenter.cs
deleted file mode 100644
index 0167bae5816..00000000000
--- a/Source/DafnyCore/Compilers/CoverageInstrumenter.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.IO;
-
-namespace Microsoft.Dafny.Compilers;
-
-public class CoverageInstrumenter {
-  private readonly SinglePassCompiler compiler;
-  private List<(IToken, string)>/*?*/ legend;  // non-null implies options.CoverageLegendFile is non-null
-
-  public CoverageInstrumenter(SinglePassCompiler compiler) {
-    this.compiler = compiler;
-    if (compiler.Options?.CoverageLegendFile != null) {
-      legend = new List<(IToken, string)>();
-    }
-  }
-
-  public bool IsRecording {
-    get => legend != null;
-  }
-
-  public void Instrument(IToken tok, string description, ConcreteSyntaxTree wr) {
-    Contract.Requires(tok != null);
-    Contract.Requires(description != null);
-    Contract.Requires(wr != null || !IsRecording);
-    if (legend != null) {
-      wr.Write("DafnyProfiling.CodeCoverage.Record({0})", legend.Count);
-      compiler.EndStmt(wr);
-      legend.Add((tok, description));
-    }
-  }
-
-  public void UnusedInstrumentationPoint(IToken tok, string description) {
-    Contract.Requires(tok != null);
-    Contract.Requires(description != null);
-    if (legend != null) {
-      legend.Add((tok, description));
-    }
-  }
-
-  public void InstrumentExpr(IToken tok, string description, bool resultValue, ConcreteSyntaxTree wr) {
-    Contract.Requires(tok != null);
-    Contract.Requires(description != null);
-    Contract.Requires(wr != null || !IsRecording);
-    if (legend != null) {
-      // The "Record" call always returns "true", so we negate it to get the value "false"
-      wr.Write("{1}DafnyProfiling.CodeCoverage.Record({0})", legend.Count, resultValue ? "" : "!");
-      legend.Add((tok, description));
-    }
-  }
-
-  /// <summary>
-  /// Should be called once "n" has reached its final value
-  /// </summary>
-  public void EmitSetup(ConcreteSyntaxTree wr) {
-    Contract.Requires(wr != null);
-    if (legend != null) {
-      wr.Write("DafnyProfiling.CodeCoverage.Setup({0})", legend.Count);
-      compiler.EndStmt(wr);
-    }
-  }
-
-  public void EmitTearDown(ConcreteSyntaxTree wr) {
-    Contract.Requires(wr != null);
-    if (legend != null) {
-      wr.Write("DafnyProfiling.CodeCoverage.TearDown()");
-      compiler.EndStmt(wr);
-    }
-  }
-
-  public void WriteLegendFile() {
-    if (legend != null) {
-      var filename = compiler.Options.CoverageLegendFile;
-      Contract.Assert(filename != null);
-      TextWriter wr = filename == "-" ? compiler.Options.OutputWriter : new StreamWriter(new FileStream(Path.GetFullPath(filename), System.IO.FileMode.Create));
-      {
-        for (var i = 0; i < legend.Count; i++) {
-          var e = legend[i];
-          wr.WriteLine($"{i}: {e.Item1.TokenToString(compiler.Options)}: {e.Item2}");
-        }
-      }
-      legend = null;
-    }
-  }
-}
diff --git a/Source/DafnyCore/Compilers/Cplusplus/Compiler-cpp.cs b/Source/DafnyCore/Compilers/Cplusplus/Compiler-cpp.cs
deleted file mode 100644
index 94c982c4b50..00000000000
--- a/Source/DafnyCore/Compilers/Cplusplus/Compiler-cpp.cs
+++ /dev/null
@@ -1,2453 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-//
-//-----------------------------------------------------------------------------
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.Diagnostics.Contracts;
-using System.Collections.ObjectModel;
-using System.IO;
-using JetBrains.Annotations;
-
-namespace Microsoft.Dafny.Compilers {
-  class CppCompiler : SinglePassCompiler {
-
-    private readonly ReadOnlyCollection<string> headers;
-
-    public CppCompiler(DafnyOptions options, ErrorReporter reporter, ReadOnlyCollection<string> headers) : base(options, reporter) {
-      this.headers = headers;
-    }
-
-    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
-      Feature.UnboundedIntegers,
-      Feature.RealNumbers,
-      Feature.CollectionsOfTraits,
-      Feature.Codatatypes,
-      Feature.Multisets,
-      Feature.ExternalClasses,
-      Feature.Traits,
-      Feature.Iterators,
-      Feature.NonNativeNewtypes,
-      Feature.RuntimeTypeDescriptors,
-      Feature.MultiDimensionalArrays,
-      Feature.CollectionsOfTraits,
-      Feature.Quantifiers,
-      Feature.NewObject,
-      Feature.BitvectorRotateFunctions,
-      Feature.NonSequentializableForallStatements,
-      Feature.FunctionValues,
-      Feature.ArrayLength,
-      Feature.Ordinals,
-      Feature.MapItems,
-      Feature.Codatatypes,
-      Feature.LetSuchThatExpressions,
-      Feature.NonNativeNewtypes,
-      Feature.TypeTests,
-      Feature.SubsetTypeTests,
-      Feature.SequenceDisplaysOfCharacters,
-      Feature.MapComprehensions,
-      Feature.ExactBoundedPool,
-      Feature.RunAllTests,
-      Feature.MethodSynthesis,
-      Feature.UnicodeChars,
-      Feature.ConvertingValuesToStrings
-    };
-
-    private List<DatatypeDecl> datatypeDecls = new();
-    private List<string> classDefaults = new();
-
-    /*
-     * Unlike other Dafny and Dafny's other backends, C++ cares about
-     * the order in which types are declared.  To make this more likely
-     * to succeed, we emit type information as gradually as possible
-     * in hopes that definitions are in place when needed.
-     */
-
-    // Forward declarations of class and struct names
-    private ConcreteSyntaxTree modDeclsWr = null;
-    private ConcreteSyntaxTree modDeclWr = null;
-    // Dafny datatype declarations
-    private ConcreteSyntaxTree dtDeclsWr = null;
-    private ConcreteSyntaxTree dtDeclWr = null;
-    // Dafny class declarations
-    private ConcreteSyntaxTree classDeclsWr = null;
-    private ConcreteSyntaxTree classDeclWr = null;
-    // Dedicated hash-function definitions for each type
-    private ConcreteSyntaxTree hashWr = null;
-
-    const string DafnySetClass = "DafnySet";
-    const string DafnyMultiSetClass = "DafnyMultiset";
-    const string DafnySeqClass = "DafnySequence";
-    const string DafnyMapClass = "DafnyMap";
-
-    protected override string ModuleSeparator => "::";
-    protected override string ClassAccessor => "->";
-
-    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
-      // This seems to be a good place to check for unsupported options
-      if (UnicodeCharEnabled) {
-        throw new UnsupportedFeatureException(program.GetFirstTopLevelToken(), Feature.UnicodeChars);
-      }
-
-      wr.WriteLine("// Dafny program {0} compiled into Cpp", program.Name);
-      wr.WriteLine("#include \"DafnyRuntime.h\"");
-      foreach (var header in this.headers) {
-        wr.WriteLine("#include \"{0}\"", Path.GetFileName(header));
-      }
-
-      // For "..."s string literals, to avoid interpreting /0 as the C end of the string, cstring-style
-      wr.WriteLine("using namespace std::literals;");
-
-      var filenameNoExtension = program.Name.Substring(0, program.Name.Length - 4);
-      var headerFileName = $"{filenameNoExtension}.h";
-      wr.WriteLine("#include \"{0}\"", Path.GetFileName(headerFileName));
-
-      var headerFileWr = wr.NewFile(headerFileName);
-      headerFileWr.WriteLine("// Dafny program {0} compiled into a Cpp header file", program.Name);
-      headerFileWr.WriteLine("#pragma once");
-      headerFileWr.WriteLine("#include \"DafnyRuntime.h\"");
-
-      this.modDeclsWr = headerFileWr.Fork();
-      this.dtDeclsWr = headerFileWr.Fork();
-      this.classDeclsWr = headerFileWr.Fork();
-      this.hashWr = headerFileWr.Fork();
-
-      var rt = wr.NewFile("DafnyRuntime.h");
-
-      if (Options.IncludeRuntime) {
-        ReadRuntimeSystem(program, "DafnyRuntime.h", rt);
-      }
-
-    }
-    protected override void EmitFooter(Program program, ConcreteSyntaxTree wr) {
-      // Define default values for each datatype
-      foreach (var dt in this.datatypeDecls) {
-        var wd = wr.NewBlock(String.Format("template <{0}>\nstruct get_default<{1}::{2}{3} >",
-          TypeParameters(dt.TypeArgs),
-          dt.EnclosingModuleDefinition.GetCompileName(Options),
-          dt.GetCompileName(Options),
-          InstantiateTemplate(dt.TypeArgs)), ";");
-        var wc = wd.NewBlock(String.Format("static {0}::{1}{2} call()",
-          dt.EnclosingModuleDefinition.GetCompileName(Options),
-          dt.GetCompileName(Options),
-          InstantiateTemplate(dt.TypeArgs)));
-        wc.WriteLine("return {0}::{1}{2}();", dt.EnclosingModuleDefinition.GetCompileName(Options), dt.GetCompileName(Options), InstantiateTemplate(dt.TypeArgs));
-      }
-
-      // Define default values for each class
-      foreach (var classDefault in classDefaults) {
-        wr.WriteLine(classDefault);
-      }
-    }
-
-    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
-      var w = wr.NewBlock("int main(int argc, char *argv[])");
-      var tryWr = w.NewBlock("try");
-      tryWr.WriteLine(string.Format("{0}::{1}::{2}(dafny_get_args(argc, argv));", mainMethod.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options), mainMethod.EnclosingClass.GetCompileName(Options), mainMethod.Name));
-      var catchWr = w.NewBlock("catch (DafnyHaltException & e)");
-      catchWr.WriteLine("std::cout << \"Program halted: \" << e.what() << std::endl;");
-    }
-
-    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
-      var wr = (cw as ClassWriter).MethodWriter;
-      return wr.NewBlock($"int main(DafnySequence<DafnySequence<char>> {argsParameterName})");
-    }
-
-    protected override ConcreteSyntaxTree CreateModule(string moduleName, bool isDefault, bool isExtern, string/*?*/ libraryName, ConcreteSyntaxTree wr) {
-      var s = $"namespace {IdProtect(moduleName)} ";
-      string footer = "// end of " + s + " declarations";
-      this.modDeclWr = this.modDeclsWr.NewBlock(s, footer);
-      string footer1 = "// end of " + s + " datatype declarations";
-      this.dtDeclWr = this.dtDeclsWr.NewBlock(s, footer1);
-      string footer2 = "// end of " + s + " class declarations";
-      this.classDeclWr = this.classDeclsWr.NewBlock(s, footer2);
-      string footer3 = "// end of " + s;
-      return wr.NewBlock(s, footer3);
-    }
-
-    private string TypeParameters(List<TypeParameter> targs) {
-      Contract.Requires(cce.NonNullElements(targs));
-      Contract.Ensures(Contract.Result<string>() != null);
-      if (targs != null) {
-        return Util.Comma(targs, tp => "typename " + IdName(tp));
-      } else {
-        return "";
-      }
-    }
-
-    private string DeclareTemplate(List<TypeParameter> typeArgs) {
-      var targs = "";
-      if (typeArgs != null && typeArgs.Count > 0) {
-        targs = String.Format("template <{0}>", TypeParameters(typeArgs));
-      }
-      return targs;
-    }
-
-    private string DeclareTemplate(List<Type> typeArgs) {
-      var targs = "";
-      if (typeArgs != null && typeArgs.Count > 0) {
-        targs = String.Format("template <{0}>", Util.Comma(typeArgs, t => "typename " + TypeName(t, null, null)));
-      }
-      return targs;
-    }
-
-    private string InstantiateTemplate(List<TypeParameter> typeArgs) {
-      if (typeArgs != null) {
-        var targs = "";
-        if (typeArgs.Count > 0) {
-          targs = String.Format("<{0}>", Util.Comma(typeArgs, ta => ta.GetCompileName(Options)));
-        }
-        return targs;
-      } else {
-        return "";
-      }
-    }
-
-    private string InstantiateTemplate(List<Type> typeArgs) {
-      if (typeArgs != null) {
-        var targs = "";
-        if (typeArgs.Count > 0) {
-          targs = String.Format("<{0}>", Util.Comma(typeArgs, ta => TypeName(ta, null, Token.NoToken)));
-        }
-
-        return targs;
-      } else {
-        return "";
-      }
-    }
-
-    protected override string GetHelperModuleName() => "_dafny";
-
-    protected override IClassWriter CreateClass(string moduleName, string name, bool isExtern, string/*?*/ fullPrintName, List<TypeParameter>/*?*/ typeParameters, TopLevelDecl cls, List<Type>/*?*/ superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      if (isExtern) {
-        throw new UnsupportedFeatureException(tok, Feature.ExternalClasses, String.Format("extern in class {0}", name));
-      }
-      if (superClasses != null && superClasses.Any(trait => !trait.IsObject)) {
-        throw new UnsupportedFeatureException(tok, Feature.Traits);
-      }
-
-      var classDeclWriter = modDeclWr;
-      var classDefWriter = this.classDeclWr;
-
-      if (typeParameters != null && typeParameters.Count > 0) {
-        classDeclWriter.WriteLine(DeclareTemplate(typeParameters));
-        classDefWriter.WriteLine(DeclareTemplate(typeParameters));
-      }
-
-      var methodDeclWriter = classDefWriter.NewBlock(string.Format("class {0}", name), ";");
-      var methodDefWriter = wr;
-
-      classDeclWriter.WriteLine("class {0};", name);
-
-      methodDeclWriter.Write("public:\n");
-      methodDeclWriter.WriteLine("// Default constructor");
-      methodDeclWriter.WriteLine("{0}() {{}}", name);
-
-      // Create the code for the specialization of get_default
-      var fullName = moduleName + "::" + name;
-      var getDefaultStr = String.Format("template <{0}>\nstruct get_default<std::shared_ptr<{1}{2} > > {{\n",
-        TypeParameters(typeParameters),
-        fullName,
-        InstantiateTemplate(typeParameters));
-      getDefaultStr += String.Format("static std::shared_ptr<{0}{1} > call() {{\n",
-        fullName,
-        InstantiateTemplate(typeParameters));
-      getDefaultStr += String.Format("return std::shared_ptr<{0}{1} >();", fullName, InstantiateTemplate(typeParameters));
-      getDefaultStr += "}\n};";
-      this.classDefaults.Add(getDefaultStr);
-
-      var fieldWriter = methodDeclWriter;
-
-      return new ClassWriter(name, this, methodDeclWriter, methodDefWriter, fieldWriter, wr);
-    }
-
-    protected override bool SupportsProperties { get => false; }
-
-    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
-      TraitDecl trait, List<Type> superClasses /*?*/, IToken tok, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(tok, Feature.Traits);
-    }
-
-    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(iter.tok, Feature.Iterators);
-    }
-
-    protected bool IsRecursiveConstructor(DatatypeDecl dt, DatatypeCtor ctor) {
-      foreach (var dtor in ctor.Destructors) {
-        if (dtor.Type is UserDefinedType t) {
-          if (t.ResolvedClass == dt) {
-            return true;
-          }
-        }
-      }
-      return false;
-    }
-
-    protected bool IsRecursiveDatatype(DatatypeDecl dt) {
-      foreach (var ctor in dt.Ctors) {
-        if (IsRecursiveConstructor(dt, ctor)) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    // Uniform naming convention
-    protected string DatatypeSubStructName(DatatypeCtor ctor, bool inclTemplateArgs = false) {
-      string args = "";
-      if (inclTemplateArgs) {
-        args = InstantiateTemplate(ctor.EnclosingDatatype.TypeArgs);
-      }
-      return String.Format("{0}_{1}{2}", IdProtect(ctor.EnclosingDatatype.GetCompileName(Options)), ctor.GetCompileName(Options), args);
-    }
-
-    protected override bool DatatypeDeclarationAndMemberCompilationAreSeparate => false;
-    public override bool SupportsDatatypeWrapperErasure => false;
-
-    protected override IClassWriter DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree writer) {
-      if (dt is TupleTypeDecl) {
-        // Tuple types are declared once and for all in DafnyRuntime.h
-        return null;
-      }
-
-      this.datatypeDecls.Add(dt);
-
-      string DtT = dt.GetCompileName(Options);
-      string DtT_protected = IdProtect(DtT);
-
-      // Forward declaration of the type
-      this.modDeclWr.WriteLine("{0}\nstruct {1};", DeclareTemplate(dt.TypeArgs), DtT_protected);
-      var wdecl = this.dtDeclWr;
-      var wdef = writer;
-
-      if (IsRecursiveDatatype(dt)) { // Note that if this is true, there must be more than one constructor!
-        // Add some forward declarations
-        wdecl.WriteLine("{0}\nstruct {1};", DeclareTemplate(dt.TypeArgs), DtT_protected);
-        wdecl.WriteLine("{2}\nbool operator==(const {0}{1} &left, const {0}{1} &right); ", DtT_protected, InstantiateTemplate(dt.TypeArgs), DeclareTemplate(dt.TypeArgs));
-      }
-
-      // Optimize a not-uncommon case
-      if (dt.IsRecordType) {
-        var ctor = dt.Ctors[0];
-        var ws = wdecl.NewBlock(String.Format("{0}\nstruct {1}", DeclareTemplate(dt.TypeArgs), DtT_protected), ";");
-
-        // Declare the struct members
-        var i = 0;
-        var argNames = new List<string>();
-        foreach (Formal arg in ctor.Formals) {
-          if (!arg.IsGhost) {
-            ws.WriteLine("{0} {1};", TypeName(arg.Type, wdecl, arg.tok), FormalName(arg, i));
-            argNames.Add(FormalName(arg, i));
-            i++;
-          }
-        }
-
-        if (argNames.Count > 0) {
-          // Create a constructor with arguments
-          ws.Write("{0}(", DtT_protected);
-          WriteFormals("", ctor.Formals, ws);
-          ws.Write(")");
-          if (argNames.Count > 0) {
-            // Add initializers
-            ws.Write(" :");
-            ws.Write(Util.Comma(argNames, nm => String.Format(" {0} ({0})", IdProtect(nm))));
-          }
-
-          ws.WriteLine(" {}");
-        }
-
-        // Create a constructor with no arguments
-        ws.WriteLine("{0}();", DtT_protected);
-        var wc = wdef.NewNamedBlock("{1}\n{0}{2}::{0}()", DtT_protected, DeclareTemplate(dt.TypeArgs), InstantiateTemplate(dt.TypeArgs));
-        foreach (var arg in ctor.Formals) {
-          if (!arg.IsGhost) {
-            wc.WriteLine("{0} = {1};", arg.CompileName, DefaultValue(arg.Type, wc, arg.tok));
-          }
-        }
-
-        // Overload the comparison operator
-        var wrCompOp = ws.NewNamedBlock("friend bool operator==(const {0} &left, const {0} &right)", DtT_protected);
-        wrCompOp.Write("\treturn true");
-        foreach (var arg in argNames) {
-          wrCompOp.WriteLine("\t\t&& left.{0} == right.{0}", arg);
-        }
-        wrCompOp.WriteLine(";");
-
-        // Overload the not-comparison operator
-        ws.WriteLine("friend bool operator!=(const {0} &left, const {0} &right) {{ return !(left == right); }} ", DtT_protected);
-
-        wdecl.WriteLine("{0}\ninline bool is_{1}(const struct {2}{3} d) {{ (void) d; return true; }}", DeclareTemplate(dt.TypeArgs), ctor.GetCompileName(Options), DtT_protected, InstantiateTemplate(dt.TypeArgs));
-
-        // Define a custom hasher
-        hashWr.WriteLine("template <{0}>", TypeParameters(dt.TypeArgs));
-        var fullName = dt.EnclosingModuleDefinition.GetCompileName(Options) + "::" + DtT_protected + InstantiateTemplate(dt.TypeArgs);
-        var hwr = hashWr.NewBlock(string.Format("struct std::hash<{0}>", fullName), ";");
-        var owr = hwr.NewBlock(string.Format("std::size_t operator()(const {0}& x) const", fullName));
-        owr.WriteLine("size_t seed = 0;");
-        foreach (var arg in ctor.Formals) {
-          if (!arg.IsGhost) {
-            owr.WriteLine("hash_combine<{0}>(seed, x.{1});", TypeName(arg.Type, owr, dt.tok), arg.CompileName);
-          }
-        }
-        owr.WriteLine("return seed;");
-      } else {
-
-        /*** Create one struct for each constructor ***/
-        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-          string structName = DatatypeSubStructName(ctor);
-          var wstruct = wdecl.NewBlock(String.Format("{0}\nstruct {1}", DeclareTemplate(dt.TypeArgs), structName), ";");
-          // Declare the struct members
-          var i = 0;
-          foreach (Formal arg in ctor.Formals) {
-            if (!arg.IsGhost) {
-              if (arg.Type is UserDefinedType udt && udt.ResolvedClass == dt) {  // Recursive declaration needs to use a pointer
-                wstruct.WriteLine("std::shared_ptr<{0}> {1};", TypeName(arg.Type, wdecl, arg.tok), FormalName(arg, i));
-              } else {
-                wstruct.WriteLine("{0} {1};", TypeName(arg.Type, wdecl, arg.tok), FormalName(arg, i));
-              }
-              i++;
-            }
-          }
-
-          // Overload the comparison operator
-          wstruct.WriteLine("friend bool operator==(const {0} &left, const {0} &right) {{ ", structName);
-
-          var preReturn = wstruct.Fork();
-          wstruct.Write("\treturn true ");
-          i = 0;
-          foreach (Formal arg in ctor.Formals) {
-            if (!arg.IsGhost) {
-              if (arg.Type is UserDefinedType udt && udt.ResolvedClass == dt) {  // Recursive destructor needs to use a pointer
-                wstruct.WriteLine("\t\t&& *(left.{0}) == *(right.{0})", FormalName(arg, i));
-              } else {
-                wstruct.WriteLine("\t\t&& left.{0} == right.{0}", FormalName(arg, i));
-              }
-              i++;
-            }
-          }
-
-          if (i == 0) { // Avoid a warning from the C++ compiler
-            preReturn.WriteLine("(void)left; (void) right;");
-          }
-
-          wstruct.WriteLine(";\n}");
-
-          // Overload the not-comparison operator
-          wstruct.WriteLine("friend bool operator!=(const {0} &left, const {0} &right) {{ return !(left == right); }} ", structName);
-
-          // Define a custom hasher
-          hashWr.WriteLine("template <{0}>", TypeParameters(dt.TypeArgs));
-          var fullName = dt.EnclosingModuleDefinition.GetCompileName(Options) + "::" + structName + InstantiateTemplate(dt.TypeArgs);
-          var hwr = hashWr.NewBlock(string.Format("struct std::hash<{0}>", fullName), ";");
-          var owr = hwr.NewBlock(string.Format("std::size_t operator()(const {0}& x) const", fullName));
-          owr.WriteLine("size_t seed = 0;");
-          int argCount = 0;
-          foreach (var arg in ctor.Formals) {
-            if (!arg.IsGhost) {
-              if (arg.Type is UserDefinedType udt && udt.ResolvedClass == dt) {
-                // Recursive destructor needs to use a pointer
-                owr.WriteLine("hash_combine<std::shared_ptr<{0}>>(seed, x.{1});", TypeName(arg.Type, owr, dt.tok), arg.CompileName);
-              } else {
-                owr.WriteLine("hash_combine<{0}>(seed, x.{1});", TypeName(arg.Type, owr, dt.tok), arg.CompileName);
-              }
-              argCount++;
-            }
-          }
-          if (argCount == 0) {
-            owr.WriteLine("(void)x;");
-          }
-          owr.WriteLine("return seed;");
-        }
-
-        /*** Declare the overall tagged union ***/
-        var ws = wdecl.NewBlock(String.Format("{0}\nstruct {1}", DeclareTemplate(dt.TypeArgs), DtT_protected), ";");
-        ws.WriteLine("std::variant<{0}> v;", Util.Comma(dt.Ctors, ctor => DatatypeSubStructName(ctor, true)));
-
-        // Declare static "constructors" for each Dafny constructor
-        foreach (var ctor in dt.Ctors) {
-          var wc = ws.NewNamedBlock("static {0} create_{1}({2})",
-            DtT_protected, ctor.GetCompileName(Options),
-            DeclareFormals(ctor.Formals));
-          wc.WriteLine("{0}{1} COMPILER_result;", DtT_protected, InstantiateTemplate(dt.TypeArgs));
-          wc.WriteLine("{0} COMPILER_result_subStruct;", DatatypeSubStructName(ctor, true));
-
-          foreach (Formal arg in ctor.Formals) {
-            if (!arg.IsGhost) {
-              if (arg.Type is UserDefinedType udt && udt.ResolvedClass == dt) {
-                // This is a recursive destuctor, so we need to allocate space and copy the input in
-                wc.WriteLine("COMPILER_result_subStruct.{0} = std::make_shared<{1}>({0});", arg.CompileName,
-                  DtT_protected);
-              } else {
-                wc.WriteLine("COMPILER_result_subStruct.{0} = {0};", arg.CompileName);
-              }
-            }
-          }
-
-          wc.WriteLine("COMPILER_result.v = COMPILER_result_subStruct;");
-          wc.WriteLine("return COMPILER_result;");
-        }
-
-        // Declare a default constructor
-        ws.WriteLine("{0}();", DtT_protected);
-        var wd = wdef.NewNamedBlock(String.Format("{1}\n{0}{2}::{0}()", DtT_protected, DeclareTemplate(dt.TypeArgs), InstantiateTemplate(dt.TypeArgs)));
-        var default_ctor = dt.Ctors[0]; // Arbitrarily choose the first one
-        wd.WriteLine("{0} COMPILER_result_subStruct;", DatatypeSubStructName(default_ctor, true));
-        foreach (Formal arg in default_ctor.Formals) {
-          if (!arg.IsGhost) {
-            wd.WriteLine("COMPILER_result_subStruct.{0} = {1};", arg.CompileName,
-              DefaultValue(arg.Type, wd, arg.tok));
-          }
-        }
-
-        wd.WriteLine("v = COMPILER_result_subStruct;");
-
-        // Declare a default destructor
-        ws.WriteLine("~{0}() {{}}", DtT_protected);
-
-        {
-          // Declare a default copy constructor (just in case any of our components are non-trivial, i.e., contain smart_ptr)
-          var wcc = ws.NewNamedBlock(String.Format("{0}(const {0} &other)", DtT_protected));
-          wcc.WriteLine("v = other.v;");
-        }
-        {
-          // Declare a default copy assignment operator (just in case any of our components are non-trivial, i.e., contain smart_ptr)
-          var wcc = ws.NewNamedBlock(String.Format("{0}& operator=(const {0} other)", DtT_protected));
-          wcc.WriteLine("v = other.v;");
-          wcc.WriteLine("return *this;");
-        }
-
-        // Declare type queries, both as members and general-purpose functions
-        foreach (var ctor in dt.Ctors) {
-          var name = DatatypeSubStructName(ctor);
-          var holds = String.Format("std::holds_alternative<{0}{1}>", name, InstantiateTemplate(dt.TypeArgs));
-          ws.WriteLine("bool is_{0}() const {{ return {1}(v); }}", name, holds);
-          wdecl.WriteLine("{0}\ninline bool is_{1}(const struct {2}{3} d);", DeclareTemplate(dt.TypeArgs), name, DtT_protected, InstantiateTemplate(dt.TypeArgs));
-          wdef.WriteLine("{0}\ninline bool is_{1}(const struct {2}{3} d) {{ return {4}(d.v); }}",
-            DeclareTemplate(dt.TypeArgs), name, DtT_protected, InstantiateTemplate(dt.TypeArgs), holds);
-        }
-
-        // Overload the comparison operator
-        ws.WriteLine("friend bool operator==(const {0} &left, const {0} &right) {{ ", DtT_protected);
-        ws.WriteLine("\treturn left.v == right.v;\n}");
-
-        // Create destructors
-        foreach (var ctor in dt.Ctors) {
-          foreach (var dtor in ctor.Destructors) {
-            if (dtor.EnclosingCtors[0] == ctor) {
-              var arg = dtor.CorrespondingFormals[0];
-              if (!arg.IsGhost && arg.HasName) {
-                var returnType = TypeName(arg.Type, ws, arg.tok);
-                if (arg.Type is UserDefinedType udt && udt.ResolvedClass == dt) {
-                  // This is a recursive destuctor, so return a pointer
-                  returnType = String.Format("std::shared_ptr<{0}>", returnType);
-                }
-
-                var wDtor = ws.NewNamedBlock("{0} dtor_{1}()", returnType,
-                  arg.CompileName);
-                if (dt.IsRecordType) {
-                  wDtor.WriteLine("return this.{0};", IdName(arg));
-                } else {
-                  var n = dtor.EnclosingCtors.Count;
-                  for (int i = 0; i < n - 1; i++) {
-                    var ctor_i = dtor.EnclosingCtors[i];
-                    var ctor_name = DatatypeSubStructName(ctor_i);
-                    Contract.Assert(arg.CompileName == dtor.CorrespondingFormals[i].CompileName);
-                    wDtor.WriteLine("if (is_{0}()) {{ return std::get<{0}{1}>(v).{2}; }}",
-                      ctor_name, InstantiateTemplate(dt.TypeArgs), IdName(arg));
-                  }
-
-                  Contract.Assert(arg.CompileName == dtor.CorrespondingFormals[n - 1].CompileName);
-                  var final_ctor_name = DatatypeSubStructName(dtor.EnclosingCtors[n - 1], true);
-                  wDtor.WriteLine("return std::get<{0}>(v).{1}; ",
-                    final_ctor_name, IdName(arg));
-                }
-              }
-            }
-          }
-        }
-
-        // Overload the not-comparison operator
-        ws.WriteLine("friend bool operator!=(const {0} &left, const {0} &right) {{ return !(left == right); }} ", DtT_protected);
-
-        // Define a custom hasher for the struct as a whole
-        hashWr.WriteLine("template <{0}>", TypeParameters(dt.TypeArgs));
-        var fullStructName = dt.EnclosingModuleDefinition.GetCompileName(Options) + "::" + DtT_protected;
-        var hwr2 = hashWr.NewBlock(string.Format("struct std::hash<{0}{1}>", fullStructName, InstantiateTemplate(dt.TypeArgs)), ";");
-        var owr2 = hwr2.NewBlock(string.Format("std::size_t operator()(const {0}{1}& x) const", fullStructName, InstantiateTemplate(dt.TypeArgs)));
-        owr2.WriteLine("size_t seed = 0;");
-        var index = 0;
-        foreach (var ctor in dt.Ctors) {
-          var ifwr = owr2.NewBlock(string.Format("if (x.is_{0}())", DatatypeSubStructName(ctor)));
-          ifwr.WriteLine("hash_combine<uint64>(seed, {0});", index);
-          ifwr.WriteLine("hash_combine<struct {0}::{1}>(seed, std::get<{0}::{1}>(x.v));", dt.EnclosingModuleDefinition.GetCompileName(Options), DatatypeSubStructName(ctor, true));
-          index++;
-        }
-        owr2.WriteLine("return seed;");
-
-        if (IsRecursiveDatatype(dt)) {
-          // Emit a custom hasher for a pointer to this type
-          hashWr.WriteLine("template <{0}>", TypeParameters(dt.TypeArgs));
-          hwr2 = hashWr.NewBlock(string.Format("struct std::hash<std::shared_ptr<{0}{1}>>", fullStructName, InstantiateTemplate(dt.TypeArgs)), ";");
-          owr2 = hwr2.NewBlock(string.Format("std::size_t operator()(const std::shared_ptr<{0}{1}>& x) const", fullStructName, InstantiateTemplate(dt.TypeArgs)));
-          owr2.WriteLine("struct std::hash<{0}{1}> hasher;", fullStructName, InstantiateTemplate(dt.TypeArgs));
-          owr2.WriteLine("std::size_t h = hasher(*x);");
-          owr2.WriteLine("return h;");
-        }
-      }
-
-      return null;
-    }
-
-    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
-      if (nt.NativeType != null) {
-        if (nt.NativeType.Name != nt.Name) {
-          GetNativeInfo(nt.NativeType.Sel, out var nt_name_def, out var literalSuffice_def, out var needsCastAfterArithmetic_def);
-          wr.WriteLine("typedef {0} {1};", nt_name_def, nt.Name);
-        }
-      } else {
-        throw new UnsupportedFeatureException(nt.tok, Feature.NonNativeNewtypes);
-      }
-      var className = "class_" + IdName(nt);
-      var cw = CreateClass(nt.EnclosingModuleDefinition.GetCompileName(Options), className, nt, wr) as ClassWriter;
-      var w = cw.MethodDeclWriter;
-      if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-        var witness = new ConcreteSyntaxTree(w.RelativeIndentLevel);
-        var wStmts = w.Fork();
-        if (nt.NativeType == null) {
-          witness.Append(Expr(nt.Witness, false, wStmts));
-        } else {
-          TrParenExpr(nt.Witness, witness, false, wStmts);
-          witness.Write(".toNumber()");
-        }
-        DeclareField(className, nt.TypeArgs, "Witness", true, true, nt.BaseType, nt.tok, witness.ToString(), w, wr);
-      }
-
-      GetNativeInfo(nt.NativeType.Sel, out var nt_name, out var literalSuffice, out var needsCastAfterArithmetic);
-      var wDefault = w.NewBlock(string.Format("static {0} get_Default()", nt_name));
-      var udt = new UserDefinedType(nt.tok, nt.Name, nt, new List<Type>());
-      var d = TypeInitializationValue(udt, wr, nt.tok, false, false);
-      wDefault.WriteLine("return {0};", d);
-
-      return cw;
-    }
-
-    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
-      if (sst.Name == "nat") {
-        return;  // C++ does not support Nats
-      }
-
-      string templateDecl = "";
-      if (sst.Var.Type is SeqType s) {
-        templateDecl = DeclareTemplate(s.TypeArgs[0].TypeArgs);  // We want the type args (if any) for the seq-elt type, not the seq
-      } else {
-        templateDecl = DeclareTemplate(sst.Var.Type.TypeArgs);
-      }
-
-      this.modDeclWr.WriteLine("{0} using {1} = {2};", templateDecl, IdName(sst), TypeName(sst.Var.Type, wr, sst.tok));
-
-      var className = "class_" + IdName(sst);
-      var cw = CreateClass(sst.EnclosingModuleDefinition.GetCompileName(Options), className, sst, wr) as ClassWriter;
-      var w = cw.MethodDeclWriter;
-
-      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-        var witness = new ConcreteSyntaxTree(w.RelativeIndentLevel);
-        witness.Append(Expr(sst.Witness, false, w));
-        DeclareField(className, sst.TypeArgs, "Witness", true, true, sst.Rhs, sst.tok, witness.ToString(), w, wr);
-      }
-
-      var wDefault = w.NewBlock(String.Format("static {0}{1} get_Default()", IdName(sst), InstantiateTemplate(sst.TypeArgs)));
-      var udt = new UserDefinedType(sst.tok, sst.Name, sst,
-        sst.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp)));
-      var d = TypeInitializationValue(udt, wr, sst.tok, false, false);
-      wDefault.WriteLine("return {0};", d);
-    }
-
-    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
-      literalSuffix = "";
-      needsCastAfterArithmetic = false;
-      switch (sel) {
-        case NativeType.Selection.Byte:
-          name = "uint8";
-          break;
-        case NativeType.Selection.SByte:
-          name = "int8";
-          break;
-        case NativeType.Selection.UShort:
-          name = "uint16";
-          break;
-        case NativeType.Selection.Short:
-          name = "int16";
-          break;
-        case NativeType.Selection.UInt:
-          name = "uint32";
-          break;
-        case NativeType.Selection.Int:
-          name = "int32";
-          break;
-        case NativeType.Selection.ULong:
-          name = "uint64";
-          break;
-        case NativeType.Selection.Number:
-        case NativeType.Selection.Long:
-          name = "int64";
-          break;
-        default:
-          Contract.Assert(false);  // unexpected native type
-          throw new cce.UnreachableException();  // to please the compiler
-      }
-    }
-
-    protected class ClassWriter : IClassWriter {
-      public string ClassName;
-      public readonly CppCompiler Compiler;
-      public readonly ConcreteSyntaxTree MethodDeclWriter;
-      public readonly ConcreteSyntaxTree MethodWriter;
-      public readonly ConcreteSyntaxTree FieldWriter;
-      public readonly ConcreteSyntaxTree Finisher;
-
-      public ClassWriter(string className, CppCompiler compiler, ConcreteSyntaxTree methodDeclWriter, ConcreteSyntaxTree methodWriter, ConcreteSyntaxTree fieldWriter, ConcreteSyntaxTree finisher) {
-        Contract.Requires(compiler != null);
-        Contract.Requires(methodDeclWriter != null);
-        Contract.Requires(methodWriter != null);
-        Contract.Requires(fieldWriter != null);
-        this.ClassName = className;
-        this.Compiler = compiler;
-        this.MethodDeclWriter = methodDeclWriter;
-        this.MethodWriter = methodWriter;
-        this.FieldWriter = fieldWriter;
-        this.Finisher = finisher;
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateMethod(m, typeArgs, createBody, MethodDeclWriter, MethodWriter, lookasideBody);
-      }
-
-      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        throw new UnsupportedFeatureException(m.tok, Feature.MethodSynthesis);
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation>/*?*/ typeArgs,
-        List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateFunction(member.EnclosingClass.GetCompileName(Compiler.Options),
-          member.EnclosingClass.TypeArgs, name, typeArgs, formals, resultType, tok, isStatic, createBody, member,
-          MethodDeclWriter, MethodWriter, lookasideBody);
-      }
-      public ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IToken tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance) {
-        return Compiler.CreateGetter(name, enclosingDecl, resultType, tok, isStatic, isConst, createBody, MethodDeclWriter, MethodWriter);
-      }
-      public ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
-        return Compiler.CreateGetterSetter(name, resultType, tok, createBody, out setterWriter, MethodWriter);
-      }
-      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IToken tok, string rhs, Field field) {
-        Compiler.DeclareField(ClassName, enclosingDecl.TypeArgs, name, isStatic, isConst, type, tok, rhs, FieldWriter, Finisher);
-      }
-      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
-        throw new cce.UnreachableException();  // InitializeField should be called only for those compilers that set ClassesRedeclareInheritedFields to false.
-      }
-      public ConcreteSyntaxTree/*?*/ ErrorWriter() => MethodWriter;
-      public void Finish() { }
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, ConcreteSyntaxTree wdr, ConcreteSyntaxTree wr, bool lookasideBody) {
-      List<Formal> nonGhostOuts = m.Outs.Where(o => !o.IsGhost).ToList();
-      string targetReturnTypeReplacement = null;
-      if (nonGhostOuts.Count == 1) {
-        targetReturnTypeReplacement = TypeName(nonGhostOuts[0].Type, wr, nonGhostOuts[0].tok);
-      } else if (nonGhostOuts.Count > 1) {
-        targetReturnTypeReplacement = String.Format("struct Tuple{0}", InstantiateTemplate(nonGhostOuts.ConvertAll(n => n.Type)));
-      }
-
-      if (!createBody) {
-        return null;
-      }
-
-      if (typeArgs.Count != 0) {
-        var formalTypeParameters = TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, m, lookasideBody));
-        // Filter out type parameters we've already emitted at the class level, to avoid shadowing
-        // the class' template parameter (which C++ treats as an error)
-        formalTypeParameters = formalTypeParameters.Where(param =>
-          m.EnclosingClass.TypeArgs == null || !m.EnclosingClass.TypeArgs.Contains(param)).ToList();
-        wdr.WriteLine(DeclareTemplate(formalTypeParameters));
-        wr.WriteLine(DeclareTemplate(formalTypeParameters));
-      }
-
-      if (m.EnclosingClass.TypeArgs != null && m.EnclosingClass.TypeArgs.Count > 0) {
-        wr.WriteLine(DeclareTemplate(m.EnclosingClass.TypeArgs));
-      }
-
-      wr.Write("{0} {1}{2}::{3}",
-        targetReturnTypeReplacement ?? "void",
-        m.EnclosingClass.GetCompileName(Options),
-        InstantiateTemplate(m.EnclosingClass.TypeArgs),
-        IdName(m));
-
-      wdr.Write("{0}{1} {2}",
-        m.IsStatic ? "static " : "",
-        targetReturnTypeReplacement ?? "void",
-        IdName(m));
-
-      wr.Write("(");
-      wdr.Write("(");
-      int nIns = WriteFormals("", m.Ins, wr);
-      WriteFormals("", m.Ins, wdr);
-      if (targetReturnTypeReplacement == null) {
-        WriteFormals(nIns == 0 ? "" : ", ", m.Outs, wr);
-        WriteFormals(nIns == 0 ? "" : ", ", m.Outs, wdr);
-      }
-      wdr.Write(");\n");
-
-      var block = wr.NewBlock(")", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
-
-      if (targetReturnTypeReplacement != null) {
-        var beforeReturnBlock = block.Fork(0);
-        EmitReturn(m.Outs, block);
-        return beforeReturnBlock;
-      }
-      return block;
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateFunction(string className, List<TypeParameter> classArgs, string name, List<TypeArgumentInstantiation>/*?*/ typeArgs, List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member, ConcreteSyntaxTree wdr, ConcreteSyntaxTree wr, bool lookasideBody) {
-      if (!createBody) {
-        return null;
-      }
-
-      if (typeArgs.Count != 0) {
-        var formalTypeParameters = TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, member, lookasideBody));
-        // Filter out type parameters we've already emitted at the class level, to avoid shadowing
-        // the class' template parameter (which C++ treats as an error)
-        formalTypeParameters = formalTypeParameters.Where(param =>
-          !classArgs.Contains(param)).ToList();
-        wdr.WriteLine(DeclareTemplate(formalTypeParameters));
-        wr.WriteLine(DeclareTemplate(formalTypeParameters));
-      }
-      if (classArgs != null && classArgs.Count != 0) {
-        wr.WriteLine(DeclareTemplate(classArgs));
-      }
-
-      wdr.Write("{0}{1} {2}",
-        isStatic ? "static " : "",
-        TypeName(resultType, wr, tok),
-        name);
-      wr.Write("{0} {1}{2}::{3}",
-        TypeName(resultType, wr, tok),
-        className,
-        InstantiateTemplate(classArgs),
-        name);
-
-      wdr.Write("(");
-      wr.Write("(");
-      WriteFormals("", formals, wdr);
-      int nIns = WriteFormals("", formals, wr);
-
-      wdr.Write(");");
-      var w = wr.NewBlock(")", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
-
-      return w;
-    }
-
-    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
-      needsTypeParameter = false;
-      needsTypeDescriptor = false;
-    }
-
-    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      Contract.Requires(type != null);
-      Contract.Requires(tok != null);
-      Contract.Requires(wr != null);
-      throw new UnsupportedFeatureException(tok, Feature.RuntimeTypeDescriptors, string.Format("RuntimeTypeDescriptor {0} not yet supported", type));
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl cls, Type resultType, IToken tok, bool isStatic, bool isConst, bool createBody, ConcreteSyntaxTree wdr, ConcreteSyntaxTree wr) {
-      // Compiler insists on using Getter for constants, but we just use the raw variable name to hold the value,
-      // because o/w Compiler tries to use the Getter function as an Lvalue in assignments
-      // Unfortunately, Compiler doesn't tell us what the initial value is, so we hack around it
-      // by declaring the variable and a function to statically initialize it
-
-      ConcreteSyntaxTree w = null;
-      string postfix = null;
-      if (createBody) {
-        w = wdr.NewNamedBlock("{0}{1} init__{2}()", isStatic ? "static " : "", TypeName(resultType, wr, tok), name);
-        postfix = String.Format(" init__{0}()", name);
-      }
-      DeclareField(cls.GetCompileName(Options), cls.TypeArgs, name, isStatic, isConst, resultType, tok, postfix, wdr, wr);
-      //wdr.Write("{0}{1} {2}{3};", isStatic ? "static " : "", TypeName(resultType, wr, tok), name, postfix);
-      return w;
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody, out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree wr) {
-      // We don't use getter/setter pairs; we just embed the trait's fields.
-      if (createBody) {
-        var abyss = new ConcreteSyntaxTree();
-        setterWriter = abyss;
-        return abyss.NewBlock("");
-      } else {
-        setterWriter = null;
-        return null;
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
-      wr.WriteLine("TAIL_CALL_START:");
-      return wr;
-    }
-
-    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
-      wr.WriteLine("goto TAIL_CALL_START;");
-    }
-
-    protected void Warn(string msg, IToken tok) {
-      Options.ErrorWriter.WriteLine("WARNING: {3} ({0}:{1}:{2})", tok.Filepath, tok.line, tok.col, msg);
-    }
-
-    // Because we use reference counting (via shared_ptr), the TypeName of a class differs
-    // depending on whether we are declaring a variable or talking about the class itself.
-    // Use class_name = true if you want the actual name of the class, not the type used when declaring variables/arguments/etc.
-    protected string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member = null, bool class_name = false) {
-      Contract.Ensures(Contract.Result<string>() != null);
-      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
-
-      var xType = type.NormalizeExpand();
-      if (xType is TypeProxy) {
-        // unresolved proxy; just treat as ref, since no particular type information is apparently needed for this type
-        return "object";
-      }
-
-      if (xType is BoolType) {
-        return "bool";
-      } else if (xType is CharType) {
-        return "char";
-      } else if (xType is IntType || xType is BigOrdinalType) {
-        UnsupportedFeatureError(tok, Feature.UnboundedIntegers);
-        return "BigNumber";
-      } else if (xType is RealType) {
-        UnsupportedFeatureError(tok, Feature.RealNumbers);
-        return "Dafny.BigRational";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        return t.NativeType != null ? GetNativeTypeName(t.NativeType) : "BigNumber";
-      } else if (xType.AsNewtype != null) {
-        NativeType nativeType = xType.AsNewtype.NativeType;
-        if (nativeType != null) {
-          return GetNativeTypeName(nativeType);
-        }
-        return TypeName(xType.AsNewtype.BaseType, wr, tok);
-      } else if (xType.IsObjectQ) {
-        return "object";
-      } else if (xType.IsArrayType) {
-        ArrayClassDecl at = xType.AsArrayType;
-        Contract.Assert(at != null);  // follows from type.IsArrayType
-        Type elType = UserDefinedType.ArrayElementType(xType);
-        if (at.Dims == 1) {
-          return "DafnyArray<" + TypeName(elType, wr, tok, null, false) + ">";
-        } else {
-          throw new UnsupportedFeatureException(tok, Feature.MultiDimensionalArrays);
-        }
-      } else if (xType is UserDefinedType) {
-        var udt = (UserDefinedType)xType;
-        var s = FullTypeName(udt, member);
-        var cl = udt.ResolvedClass;
-        if (class_name || xType.IsTypeParameter || xType.IsAbstractType || xType.IsDatatype) {  // Don't add pointer decorations to class names or type parameters
-          return IdProtect(s) + ActualTypeArgs(xType.TypeArgs);
-        } else {
-          return TypeName_UDT(s, udt, wr, udt.tok);
-        }
-      } else if (xType is SetType) {
-        Type argType = ((SetType)xType).Arg;
-        if (ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance.Co, argType)) {
-          UnsupportedFeatureError(tok, Feature.CollectionsOfTraits, "compilation of set<TRAIT> is not supported; consider introducing a ghost", wr);
-        }
-        return DafnySetClass + "<" + TypeName(argType, wr, tok) + ">";
-      } else if (xType is SeqType) {
-        Type argType = ((SeqType)xType).Arg;
-        if (ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance.Co, argType)) {
-          UnsupportedFeatureError(tok, Feature.CollectionsOfTraits, "compilation of seq<TRAIT> is not supported; consider introducing a ghost", wr);
-        }
-        return DafnySeqClass + "<" + TypeName(argType, wr, tok) + ">";
-      } else if (xType is MultiSetType) {
-        Type argType = ((MultiSetType)xType).Arg;
-        if (ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance.Co, argType)) {
-          UnsupportedFeatureError(tok, Feature.CollectionsOfTraits, "compilation of multiset<TRAIT> is not supported; consider introducing a ghost", wr);
-        }
-        return DafnyMultiSetClass + "<" + TypeName(argType, wr, tok) + ">";
-      } else if (xType is MapType) {
-        Type domType = ((MapType)xType).Domain;
-        Type ranType = ((MapType)xType).Range;
-        if (ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance.Co, domType) || ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance.Co, ranType)) {
-          UnsupportedFeatureError(tok, Feature.CollectionsOfTraits, "compilation of map<TRAIT, _> or map<_, TRAIT> is not supported; consider introducing a ghost", wr);
-        }
-        return DafnyMapClass + "<" + TypeName(domType, wr, tok) + "," + TypeName(ranType, wr, tok) + ">";
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member = null) {
-      Contract.Ensures(Contract.Result<string>() != null);
-      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
-      return TypeName(type, wr, tok, member, false);
-    }
-
-    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IToken tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
-      var xType = type.NormalizeExpandKeepConstraints();
-      if (xType is BoolType) {
-        return "false";
-      } else if (xType is CharType) {
-        return CharType.DefaultValueAsString;
-      } else if (xType is IntType || xType is BigOrdinalType) {
-        UnsupportedFeatureError(tok, Feature.UnboundedIntegers);
-        return "new BigNumber(0)";
-      } else if (xType is RealType) {
-        UnsupportedFeatureError(tok, Feature.RealNumbers);
-        return "_dafny.BigRational.ZERO";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        if (t.NativeType != null) {
-          return "0";
-        } else {
-          Warn("Non-native bitvector type used.  Code will not compile.", tok);
-          return "new BigNumber(0)";
-        }
-      } else if (xType is SetType) {
-        var s = (SetType)xType;
-        return String.Format("DafnySet<{0}>::empty()", TypeName(s.Arg, wr, tok));
-      } else if (xType is MultiSetType) {
-        throw new UnsupportedFeatureException(tok, Feature.Multisets);
-      } else if (xType is SeqType) {
-        return string.Format("DafnySequence<{0}>()", TypeName(xType.AsSeqType.Arg, wr, tok, null, false));
-      } else if (xType is MapType) {
-        var m = (MapType)xType;
-        return String.Format("DafnyMap<{0},{1}>::empty()", TypeName(m.Domain, wr, tok), TypeName(m.Range, wr, tok));
-      }
-
-      var udt = (UserDefinedType)xType;
-      var cl = udt.ResolvedClass;
-      Contract.Assert(cl != null);
-      if (cl is TypeParameter || cl is AbstractTypeDecl) {
-        var hasCompiledValue = (cl is TypeParameter ? ((TypeParameter)cl).Characteristics : ((AbstractTypeDecl)cl).Characteristics).HasCompiledValue;
-        if (Attributes.Contains(udt.ResolvedClass.Attributes, "extern")) {
-          // Assume the external definition includes a default value
-          return String.Format("{1}::get_{0}_default()", IdProtect(udt.Name), udt.ResolvedClass.EnclosingModuleDefinition.GetCompileName(Options));
-        } else if (usePlaceboValue && !hasCompiledValue) {
-          return String.Format("get_default<{0}>::call()", IdProtect(udt.GetCompileName(Options)));
-        } else {
-          return String.Format("get_default<{0}>::call()", IdProtect(udt.GetCompileName(Options)));
-        }
-      } else if (cl is NewtypeDecl) {
-        var td = (NewtypeDecl)cl;
-        if (td.Witness != null) {
-          return td.EnclosingModuleDefinition.GetCompileName(Options) + "::class_" + td.GetCompileName(Options) + "::Witness";
-        } else if (td.NativeType != null) {
-          return "0";
-        } else {
-          return TypeInitializationValue(td.BaseType, wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-      } else if (cl is SubsetTypeDecl) {
-        var td = (SubsetTypeDecl)cl;
-        if (td.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-          return td.EnclosingModuleDefinition.GetCompileName(Options) + "::class_" + td.GetCompileName(Options) + "::Witness";
-        } else if (td.WitnessKind == SubsetTypeDecl.WKind.Special) {
-          // WKind.Special is only used with -->, ->, and non-null types:
-          Contract.Assert(ArrowType.IsPartialArrowTypeName(td.Name) || ArrowType.IsTotalArrowTypeName(td.Name) || td is NonNullTypeDecl);
-          if (ArrowType.IsPartialArrowTypeName(td.Name)) {
-            return "nullptr";
-          } else if (ArrowType.IsTotalArrowTypeName(td.Name)) {
-            var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-            // return the lambda expression ((Ty0 x0, Ty1 x1, Ty2 x2) => rangeDefaultValue)
-            return string.Format("function () {{ return {0}; }}", rangeDefaultValue);
-          } else if (((NonNullTypeDecl)td).Class is ArrayClassDecl) {
-            // non-null array type; we know how to initialize them
-            var arrayClass = (ArrayClassDecl)((NonNullTypeDecl)td).Class;
-            Type elType = UserDefinedType.ArrayElementType(xType);
-            if (arrayClass.Dims == 1) {
-              return string.Format("DafnyArray<{0}>::Null()", TypeName(elType, wr, tok));
-            } else {
-              return string.Format("_dafny.newArray(nullptr, {0})", Util.Comma(arrayClass.Dims, _ => "0"));
-            }
-          } else {
-            // non-null (non-array) type
-            // even though the type doesn't necessarily have a known initializer, it could be that the the compiler needs to
-            // lay down some bits to please the C++ compiler's different definite-assignment rules.
-            return "nullptr";
-          }
-        } else {
-          return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-      } else if (cl is ClassLikeDecl or ArrowTypeDecl) {
-        if (cl is ArrayClassDecl) {
-          var arrayClass = (ArrayClassDecl)cl;
-          Type elType = UserDefinedType.ArrayElementType(xType);
-          if (arrayClass.Dims == 1) {
-            return string.Format("DafnyArray<{0}>::Null()", TypeName(elType, wr, tok));
-          } else {
-            throw new UnsupportedFeatureException(tok, Feature.MultiDimensionalArrays);
-          }
-        } else {
-          return "nullptr";
-        }
-      } else if (cl is DatatypeDecl) {
-        var dt = (DatatypeDecl)cl;
-        var s = dt is TupleTypeDecl ? "Tuple" : FullTypeName(udt);
-        var w = new ConcreteSyntaxTree();
-        w.Write("{0}{1}()", s, InstantiateTemplate(udt.TypeArgs));
-        return w.ToString();
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-
-    }
-
-    private string ActualTypeArgs(List<Type> typeArgs) {
-      return typeArgs.Count > 0
-        ? String.Format(" <{0}> ", Util.Comma(typeArgs, tp => TypeName(tp, null, Token.NoToken))) : "";
-    }
-
-    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
-      ConcreteSyntaxTree wr, IToken tok, bool omitTypeArguments) {
-      Contract.Assume(fullCompileName != null);  // precondition; this ought to be declared as a Requires in the superclass
-      Contract.Assume(typeArgs != null);  // precondition; this ought to be declared as a Requires in the superclass
-      string s = IdProtect(fullCompileName);
-      return String.Format("std::shared_ptr<{0}{1}>", s, ActualTypeArgs(typeArgs));
-    }
-
-    protected override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member) {
-      // There are no companion classes for Cpp
-      var t = TypeName(type, wr, tok, member, true);
-      return t;
-    }
-
-    // ----- Declarations -------------------------------------------------------------
-    protected override void DeclareExternType(AbstractTypeDecl d, Expression compileTypeHint, ConcreteSyntaxTree wr) {
-      if (compileTypeHint.AsStringLiteral() == "struct") {
-        modDeclWr.WriteLine("// Extern declaration of {1}\n{0} struct {1};", DeclareTemplate(d.TypeArgs), d.Name);
-      } else {
-        Error(CompilerErrors.ErrorId.c_abstract_type_cannot_be_compiled_extern, d.tok, "Abstract type ('{0}') with unrecognized extern attribute {1} cannot be compiled.  Expected {{:extern compile_type_hint}}, e.g., 'struct'.", wr, d.FullName, compileTypeHint.AsStringLiteral());
-      }
-    }
-
-    protected void DeclareField(string className, List<TypeParameter> targs, string name, bool isStatic, bool isConst, Type type, IToken tok, string rhs, ConcreteSyntaxTree wr, ConcreteSyntaxTree finisher) {
-      var r = rhs != null ? rhs : DefaultValue(type, wr, tok);
-      var t = TypeName(type, wr, tok);
-      if (isStatic) {
-        wr.WriteLine("static {0} {1};", t, name);
-        finisher.WriteLine("{5} {0} {1}{4}::{2} = {3};", t, className, name, r, InstantiateTemplate(targs), DeclareTemplate(targs));
-      } else {
-        wr.WriteLine("{0} {1} = {2};", t, name, r);
-      }
-    }
-
-    private string DeclareFormalString(string prefix, string name, Type type, IToken tok, bool isInParam) {
-      if (isInParam) {
-        var result = String.Format("{0}{2} {1}", prefix, name, TypeName(type, null, tok));
-        if (name == "__noArgsParameter") {
-          result += " __attribute__((unused))";
-        }
-
-        return result;
-      } else {
-        return null;
-      }
-    }
-
-    protected override bool DeclareFormal(string prefix, string name, Type type, IToken tok, bool isInParam, ConcreteSyntaxTree wr) {
-      var formal_str = DeclareFormalString(prefix, name, type, tok, isInParam);
-      if (formal_str != null) {
-        wr.Write(formal_str);
-        return true;
-      } else {
-        return false;
-      }
-    }
-
-    private string DeclareFormals(List<Formal> formals) {
-      var i = 0;
-      var ret = "";
-      var sep = "";
-      foreach (Formal arg in formals) {
-        if (!arg.IsGhost) {
-          string name = FormalName(arg, i);
-          string decl = DeclareFormalString(sep, name, arg.Type, arg.tok, arg.InParam);
-          if (decl != null) {
-            ret += decl;
-            sep = ", ";
-          }
-          i++;
-        }
-      }
-      return ret;
-    }
-
-    protected override void DeclareLocalVar(string name, Type/*?*/ type, IToken/*?*/ tok, bool leaveRoomForRhs, string/*?*/ rhs, ConcreteSyntaxTree wr) {
-      if (type != null) {
-        wr.Write("{0} ", TypeName(type, wr, tok));
-      } else {
-        wr.Write("auto ");
-      }
-      wr.Write("{0}", name);
-      if (leaveRoomForRhs) {
-        Contract.Assert(rhs == null);  // follows from precondition
-      } else if (rhs != null) {
-        wr.WriteLine(" = {0};", rhs);
-      } else {
-        wr.WriteLine(";");
-      }
-    }
-
-    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type/*?*/ type, IToken/*?*/ tok, ConcreteSyntaxTree wr) {
-      if (type != null) {
-        wr.Write("{0} ", TypeName(type, wr, tok));
-      } else {
-        wr.Write("auto ");
-      }
-      wr.Write("{0} = ", name);
-      var w = wr.Fork();
-      wr.WriteLine(";");
-      return w;
-    }
-
-    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
-
-    protected override void DeclareOutCollector(string collectorVarName, ConcreteSyntaxTree wr) {
-      wr.Write("auto {0} = ", collectorVarName);
-    }
-
-    protected override void DeclareLocalOutVar(string name, Type type, IToken tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr) {
-      DeclareLocalVar(name, type, tok, false, rhs, wr);
-    }
-
-    protected override void EmitOutParameterSplits(string outCollector, List<string> actualOutParamNames, ConcreteSyntaxTree wr) {
-      if (actualOutParamNames.Count == 1) {
-        EmitAssignment(actualOutParamNames[0], null, outCollector, null, wr);
-      } else {
-        for (var i = 0; i < actualOutParamNames.Count; i++) {
-          wr.WriteLine("{0} = {1}.template get<{2}>();", actualOutParamNames[i], outCollector, i);
-        }
-      }
-    }
-
-    protected override void EmitActualTypeArgs(List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr) {
-      wr.Write(ActualTypeArgs(typeArgs));
-    }
-
-    protected void EmitNullText(Type type, ConcreteSyntaxTree wr) {
-      var xType = type.NormalizeExpand();
-      if (xType.IsArrayType) {
-        ArrayClassDecl at = xType.AsArrayType;
-        Contract.Assert(at != null);  // follows from xType.IsArrayType
-        Type elType = UserDefinedType.ArrayElementType(xType);
-        if (at.Dims == 1) {
-          wr.Write("DafnyArray<{0}>::Null()", TypeName(elType, wr, null));
-        } else {
-          throw new UnsupportedFeatureException(Token.NoToken, Feature.MultiDimensionalArrays);
-        }
-      } else {
-        wr.Write("nullptr");
-      }
-    }
-
-    protected override void EmitNull(Type type, ConcreteSyntaxTree wr) {
-      EmitNullText(type, wr);
-    }
-
-    // ----- Statements -------------------------------------------------------------
-
-    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
-      var wStmts = wr.Fork();
-      wr.Write("dafny_print(");
-      wr.Append(Expr(arg, false, wStmts));
-      wr.WriteLine(");");
-    }
-
-    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
-      outParams = outParams.Where(f => !f.IsGhost).ToList();
-      if (!outParams.Any()) {
-        wr.WriteLine("return;");
-      } else if (outParams.Count == 1) {
-        wr.WriteLine("return {0};", IdName(outParams[0]));
-      } else {
-        wr.WriteLine("return Tuple{0}({1});", InstantiateTemplate(outParams.ConvertAll(o => o.Type)), Util.Comma(outParams, IdName));
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
-      var w = wr.Fork();
-      var prefix = createContinueLabel ? "continue_" : "after_";
-      wr.Fork(-1).WriteLine($"{prefix}{label}: ;");
-      return w;
-    }
-
-    protected override void EmitBreak(string/*?*/ label, ConcreteSyntaxTree wr) {
-      if (label == null) {
-        wr.WriteLine("break;");
-      } else {
-        wr.WriteLine("goto after_{0};", label);
-      }
-    }
-
-    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
-      wr.WriteLine("goto continue_{0};", label);
-    }
-
-    protected override void EmitYield(ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.Iterators);
-    }
-
-    protected override void EmitAbsurd(string/*?*/ message, ConcreteSyntaxTree wr) {
-      if (message == null) {
-        message = "unexpected control point";
-      }
-      wr.WriteLine("throw \"{0}\";", message);
-    }
-
-    protected override void EmitHalt(IToken tok, Expression messageExpr, ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      wr.Write("throw DafnyHaltException(");
-      if (tok != null) {
-        wr.Write("\"" + tok.TokenToString(Options) + ": \" + ");
-      }
-
-      if (messageExpr.Type.IsStringType) {
-        wr.Write("ToVerbatimString(");
-        wr.Append(Expr(messageExpr, false, wStmts));
-        wr.Write(")");
-      } else {
-        throw new UnsupportedFeatureException(tok, Feature.ConvertingValuesToStrings);
-      }
-
-      wr.WriteLine(");");
-    }
-
-    protected override ConcreteSyntaxTree EmitForStmt(IToken tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
-      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(tok, Feature.ForLoops, "for loops have not yet been implemented");
-    }
-
-    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, string bound, ConcreteSyntaxTree wr, string start = null) {
-      start = start ?? "0";
-      return wr.NewNamedBlock("for (auto {0} = {2}; {0} < {1}; {0}++)", indexVar, bound, start);
-    }
-
-    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
-      return wr.NewNamedBlock("for (unsigned long long {0} = 1; ; {0} = {0} * 2)", indexVar, start);
-    }
-
-    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine("{0} += 1;", varName);
-    }
-
-    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine("{0} = {0} -= 1;", varName);
-    }
-
-    protected override string GetQuantifierName(string bvType) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.Quantifiers);
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IToken tok,
-      out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      wr.Write("for ({1} {0} : ", tmpVarName, TypeName(collectionElementType, wr, tok));
-      collectionWriter = wr.Fork();
-      var wwr = wr.NewBlock(")");
-      return wwr;
-    }
-
-    [CanBeNull]
-    protected override string GetSubtypeCondition(string tmpVarName, Type boundVarType, IToken tok, ConcreteSyntaxTree wPreconditions) {
-      string typeTest;
-      if (boundVarType.IsRefType) {
-        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
-          typeTest = "true";
-        } else if (boundVarType.IsTraitType) {
-          typeTest = $"_dafny.InstanceOfTrait({tmpVarName}, {TypeName(boundVarType, wPreconditions, tok)})";
-        } else {
-          typeTest = $"typeid({tmpVarName}) is typeid({TypeName(boundVarType, wPreconditions, tok)})";
-        }
-        if (boundVarType.IsNonNullRefType) {
-          typeTest = $"{tmpVarName} != null && {typeTest}";
-        } else {
-          typeTest = $"{tmpVarName} == null || {typeTest}";
-        }
-      } else {
-        typeTest = "true";
-      }
-
-      return typeTest == "true" ? null : typeTest;
-    }
-
-    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
-      Type collectionElementType, bool introduceBoundVar, IToken tok, ConcreteSyntaxTree wr) {
-      var typeName = TypeName(boundVarType, wr, tok);
-      wr.WriteLine("{0}{1} = ({2}){3};", introduceBoundVar ? typeName + " " : "", boundVarName, typeName, tmpVarName);
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      wr.Write($"for (auto {boundVarName} : ");
-      collectionWriter = wr.Fork();
-      return wr.NewBlock(")");
-    }
-
-    // ----- Expressions -------------------------------------------------------------
-
-    protected override void EmitNew(Type type, IToken tok, CallStmt initCall /*?*/, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var cl = (type.NormalizeExpand() as UserDefinedType)?.ResolvedClass;
-      if (cl != null && cl.Name == "object") {
-        //wr.Write("_dafny.NewObject()");
-        throw new UnsupportedFeatureException(tok, Feature.NewObject);
-      } else {
-        var ctor = initCall == null ? null : (Constructor)initCall.Method;  // correctness of cast follows from precondition of "EmitNew"
-        wr.Write("std::make_shared<{0}> (", TypeName(type, wr, tok, null, true));
-        var tas = TypeArgumentInstantiation.ListFromClass(cl, type.TypeArgs);
-        var sep = "";
-        EmitTypeDescriptorsActuals(tas, tok, wr, ref sep);
-        if (ctor != null && ctor.IsExtern(Options, out var q, out var n)) {
-          // the arguments of any external constructor are placed here
-          for (int i = 0; i < ctor.Ins.Count; i++) {
-            Formal p = ctor.Ins[i];
-            if (!p.IsGhost) {
-              wr.Write(sep);
-              wr.Append(Expr(initCall.Args[i], false, wStmts));
-              sep = ", ";
-            }
-          }
-        }
-        wr.Write(")");
-      }
-    }
-
-    protected override void EmitNewArray(Type elementType, IToken tok, List<string> dimensions,
-        bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var initValue = mustInitialize ? DefaultValue(elementType, wr, tok) : null;
-      // TODO: Handle initValue
-      if (dimensions.Count == 1) {
-        // handle the common case of 1-dimensional arrays separately
-        wr.Write($"DafnyArray<{TypeName(elementType, wr, tok)}>::New({dimensions[0]})");
-      } else {
-        throw new UnsupportedFeatureException(tok, Feature.MultiDimensionalArrays);
-      }
-    }
-
-    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
-      if (e is StaticReceiverExpr) {
-        wr.Write(TypeName(e.Type, wr, e.tok));
-      } else if (e.Value == null) {
-        EmitNullText(e.Type, wr);
-      } else if (e.Value is bool) {
-        wr.Write((bool)e.Value ? "true" : "false");
-      } else if (e is CharLiteralExpr) {
-        var v = (string)e.Value;
-        wr.Write("'{0}'", v);
-      } else if (e is StringLiteralExpr) {
-        var str = (StringLiteralExpr)e;
-        wr.Write("DafnySequenceFromString(");
-        TrStringLiteral(str, wr);
-        wr.Write(")");
-      } else if (AsNativeType(e.Type) is NativeType nt) {
-        wr.Write("({0}){1}", GetNativeTypeName(nt), (BigInteger)e.Value);
-        if ((BigInteger)e.Value > 9223372036854775807) {
-          // Avoid compiler warning: integer literal is too large to be represented in a signed integer type
-          wr.Write("U");
-        }
-      } else if (e.Value is BigInteger i) {
-        EmitIntegerLiteral(i, wr);
-      } else if (e.Value is BaseTypes.BigDec) {
-        throw new UnsupportedFeatureException(e.tok, Feature.RealNumbers);
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
-      }
-    }
-    void EmitIntegerLiteral(BigInteger i, ConcreteSyntaxTree wr) {
-      Contract.Requires(wr != null);
-      wr.Write(i.ToString());
-    }
-
-    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
-      var n = str.Length;
-      if (!isVerbatim) {
-        wr.Write($"\"{TranslateEscapes(str)}\"");
-      } else {
-        wr.Write("\"");
-        for (var i = 0; i < n; i++) {
-          if (str[i] == '\"' && i + 1 < n && str[i + 1] == '\"') {
-            wr.Write("\\\"");
-            i++;
-          } else if (str[i] == '\\') {
-            wr.Write("\\\\");
-          } else if (str[i] == '\n') {
-            wr.Write("\\n");
-          } else if (str[i] == '\r') {
-            wr.Write("\\r");
-          } else {
-            wr.Write(str[i]);
-          }
-        }
-        wr.Write("\"");
-      }
-
-      // Use the postfix "..."s operator (operator""s) to convert to std::string values
-      // without interpreting /0 as a terminator:
-      // https://en.cppreference.com/w/cpp/string/basic_string/operator%22%22s
-      wr.Write("s");
-    }
-
-    private static string TranslateEscapes(string s) {
-      s = Util.ReplaceNullEscapesWithCharacterEscapes(s);
-      // TODO: Other cases, once we address the fact that we shouldn't be
-      // using the C++ char as the Dafny 16-bit char in the first place.
-      return s;
-    }
-
-    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, bool surroundByUnchecked, ConcreteSyntaxTree wr) {
-      string nativeName = null, literalSuffix = null;
-      bool needsCastAfterArithmetic = false;
-      if (bvType.NativeType != null) {
-        GetNativeInfo(bvType.NativeType.Sel, out nativeName, out literalSuffix, out needsCastAfterArithmetic);
-      }
-
-      if (bvType.NativeType == null) {
-        throw new UnsupportedFeatureException(Token.NoToken, Feature.UnboundedIntegers, "EmitBitvectorTruncation with BigInteger value");
-      } else if (bvType.NativeType.Bitwidth == bvType.Width) {
-        // no truncation needed
-        return wr;
-      } else {
-        wr.Write("((");
-        var middle = wr.Fork();
-        // print in hex, because that looks nice
-        wr.Write(") & 0x{0:X}{1})", (1UL << bvType.Width) - 1, literalSuffix);
-        return middle;
-      }
-    }
-
-    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
-      bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      throw new UnsupportedFeatureException(e0.tok, Feature.BitvectorRotateFunctions);
-    }
-
-    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.NonSequentializableForallStatements);
-    }
-
-    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.NonSequentializableForallStatements);
-    }
-
-    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.NonSequentializableForallStatements);
-    }
-
-    protected override string IdProtect(string name) {
-      return PublicIdProtect(name);
-    }
-
-    public override string PublicIdProtect(string name) {
-      Contract.Requires(name != null);
-      switch (name) {
-        // Taken from: https://www.w3schools.in/cplusplus-tutorial/keywords/
-        // Keywords
-        case "asm":
-        case "auto":
-        case "bool":
-        case "break":
-        case "case":
-        case "catch":
-        case "char":
-        case "class":
-        case "const":
-        case "const_cast":
-        case "continue":
-        case "default":
-        case "delete":
-        case "do":
-        case "double":
-        case "dynamic_cast":
-        case "else":
-        case "enum":
-        case "explicit":
-        case "export":
-        case "extern":
-        case "false":
-        case "float":
-        case "for":
-        case "friend":
-        case "goto":
-        case "if":
-        case "inline":
-        case "int":
-        case "long":
-        case "mutable":
-        case "namespace":
-        case "new":
-        case "operator":
-        case "private":
-        case "public":
-        case "register":
-        case "reinterpret_cast":
-        case "return":
-        case "short":
-        case "signed":
-        case "sizeof":
-        case "static":
-        case "static_cast":
-        case "struct":
-        case "switch":
-        case "template":
-        case "this":
-        case "throw":
-        case "true":
-        case "try":
-        case "typedef":
-        case "typeid":
-        case "typename":
-        case "union":
-        case "unsigned":
-        case "using":
-        case "virtual":
-        case "void":
-        case "volatile":
-        case "wchar_t":
-        case "while":
-
-        // Also reserved
-        case "And":
-        case "and_eq":
-        case "bitand":
-        case "bitor":
-        case "compl":
-        case "not":
-        case "not_eq":
-        case "or":
-        case "or_eq":
-        case "xor":
-        case "xor_eq":
-          return name + "_";
-        default:
-          return name;
-      }
-    }
-
-    protected override string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null) {
-      Contract.Assume(udt != null);  // precondition; this ought to be declared as a Requires in the superclass
-      if (udt is ArrowType) {
-        throw new UnsupportedFeatureException(udt.tok, Feature.FunctionValues, string.Format("UserDefinedTypeName {0}", udt.Name));
-        //return ArrowType.Arrow_FullCompileName;
-      }
-      var cl = udt.ResolvedClass;
-      if (cl is TypeParameter) {
-        return IdProtect(udt.GetCompileName(Options));
-      } else if (cl is DefaultClassDecl && Attributes.Contains(cl.EnclosingModuleDefinition.Attributes, "extern") &&
-                 member != null && Attributes.Contains(member.Attributes, "extern")) {
-        // omit the default class name ("_default") in extern modules, when the class is used to qualify an extern member
-        Contract.Assert(!cl.EnclosingModuleDefinition.IsDefaultModule); // default module is not marked ":extern"
-        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options));
-      } else if (Attributes.Contains(cl.Attributes, "extern")) {
-        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "::" + IdProtect(cl.Name);
-      } else if (cl is TupleTypeDecl) {
-        if (udt.TypeArgs.Count > 0) {
-          return "Tuple";
-        } else {
-          return "Tuple0"; // Need to special case this, as C++ won't infer the correct type arguments
-        }
-      } else {
-        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "::" + IdProtect(cl.GetCompileName(Options));
-      }
-    }
-
-    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
-      wr.Write("this");
-    }
-
-    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
-      EmitDatatypeValue(dtv, dtv.Ctor, dtv.IsCoCall, arguments, wr);
-    }
-
-    void EmitDatatypeValue(DatatypeValue dtv, DatatypeCtor ctor, bool isCoCall, string arguments, ConcreteSyntaxTree wr) {
-      var dt = dtv.Ctor.EnclosingDatatype;
-      var dtName = dt.GetCompileName(Options);
-      var ctorName = ctor.GetCompileName(Options);
-
-      if (dt is TupleTypeDecl) {
-        var tuple = dt as TupleTypeDecl;
-        var types = new List<Type>();
-        foreach (var arg in dtv.Arguments) {
-          types.Add(arg.Type);
-        }
-
-        if (types.Count == 0) {
-          wr.Write("Tuple0()");
-        } else {
-          wr.Write("Tuple{0}({1})", InstantiateTemplate(types), arguments);
-        }
-      } else if (!isCoCall) {
-        // Ordinary constructor (that is, one that does not guard any co-recursive calls)
-        // Generate:  Dt.create_Ctor(arguments)
-        if (dt.Ctors.Count == 1) {
-          wr.Write("{3}::{0}{1}({2})",
-            dtName,
-            InstantiateTemplate(dt.TypeArgs),
-            arguments,
-            dt.EnclosingModuleDefinition.GetCompileName(Options));
-        } else {
-          wr.Write("{4}::{0}{1}::create_{2}({3})",
-            dtName, ActualTypeArgs(dtv.InferredTypeArgs), ctorName,
-            arguments, dt.EnclosingModuleDefinition.GetCompileName(Options));
-        }
-
-      } else {
-        // Co-recursive call
-        // Generate:  Dt.lazy_Ctor(($dt) => Dt.create_Ctor($dt, args))
-        wr.Write("{0}.lazy_{1}(($dt) => ", dtName, ctorName);
-        wr.Write("{0}.create_{1}($dt{2}{3})", dtName, ctorName, arguments.Length == 0 ? "" : ", ", arguments);
-        wr.Write(")");
-      }
-    }
-
-    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString) {
-      compiledName = "";
-      preString = "";
-      postString = "";
-      switch (id) {
-        case SpecialField.ID.UseIdParam:
-          compiledName = (string)idParam;
-          break;
-        case SpecialField.ID.ArrayLength:
-        case SpecialField.ID.ArrayLengthInt:
-          throw new UnsupportedFeatureException(Token.NoToken, Feature.ArrayLength);
-        case SpecialField.ID.Floor:
-          compiledName = "int()";
-          break;
-        case SpecialField.ID.IsLimit:
-          throw new UnsupportedFeatureException(Token.NoToken, Feature.Ordinals);
-        case SpecialField.ID.IsSucc:
-          throw new UnsupportedFeatureException(Token.NoToken, Feature.Ordinals);
-        case SpecialField.ID.Offset:
-          throw new UnsupportedFeatureException(Token.NoToken, Feature.Ordinals);
-        case SpecialField.ID.IsNat:
-          throw new UnsupportedFeatureException(Token.NoToken, Feature.Ordinals);
-        case SpecialField.ID.Keys:
-          compiledName = "dafnyKeySet()";
-          break;
-        case SpecialField.ID.Values:
-          compiledName = "dafnyValues()";
-          break;
-        case SpecialField.ID.Items:
-          throw new UnsupportedFeatureException(Token.NoToken, Feature.MapItems);
-        case SpecialField.ID.Reads:
-          compiledName = "_reads";
-          break;
-        case SpecialField.ID.Modifies:
-          compiledName = "_modifies";
-          break;
-        case SpecialField.ID.New:
-          compiledName = "_new";
-          break;
-        default:
-          Contract.Assert(false); // unexpected ID
-          break;
-      }
-    }
-
-    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
-      Type expectedType, string/*?*/ additionalCustomParameter = null, bool internalAccess = false) {
-      if (member.IsStatic && member is ConstantField) {
-        // This used to work, but now obj comes in wanting to use TypeName on the class, which results in (std::shared_ptr<_module::MyClass>)::c;
-        //return SuffixLvalue(obj, "::{0}", member.CompileName);
-        return SimpleLvalue(wr => {
-          wr.Write("{0}::{1}::{2}", IdProtect(member.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options)), IdProtect(member.EnclosingClass.GetCompileName(Options)), IdProtect(member.GetCompileName(Options)));
-        });
-      } else if (member is DatatypeDestructor dtor && dtor.EnclosingClass is TupleTypeDecl) {
-        return SuffixLvalue(obj, ".get<{0}>()", dtor.Name);
-      } else if (member is SpecialField sf2 && sf2.SpecialId == SpecialField.ID.UseIdParam && sf2.IdParam is string fieldName
-                 && fieldName.StartsWith("is_")) {
-        // Ugly hack of a check to figure out if this is a datatype query: f.Constructor?
-        return SuffixLvalue(obj, ".is_{0}_{1}()", IdProtect(sf2.EnclosingClass.GetCompileName(Options)), fieldName.Substring(3));
-      } else if (member is SpecialField sf) {
-        GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out var preStr, out var postStr);
-        if (sf.SpecialId == SpecialField.ID.Keys || sf.SpecialId == SpecialField.ID.Values) {
-          return SuffixLvalue(obj, ".{0}", compiledName);
-        } else if (sf is DatatypeDestructor dtor2) {
-          if (!(dtor2.EnclosingClass is IndDatatypeDecl)) {
-            UnsupportedFeatureError(dtor2.tok, Feature.Codatatypes,
-              String.Format("Unexpected use of a destructor {0} that isn't for an inductive datatype.  Panic!",
-                member.Name));
-          }
-
-          var dt = dtor2.EnclosingClass as IndDatatypeDecl;
-          return SimpleLvalue(wr => {
-            if (dt.Ctors.Count > 1) {
-              if (dtor2.Type is UserDefinedType udt && udt.ResolvedClass == dt) {
-                // This a recursively defined datatype; need to dereference the pointer
-                wr.Write("*");
-              }
-
-              wr.Write("(");
-              obj(wr);
-              wr.Write(".dtor_{0}()", sf.GetCompileName(Options));
-            } else {
-              wr.Write("(");
-              obj(wr);
-              wr.Write(".{0}", sf.GetCompileName(Options));
-            }
-
-            wr.Write(")");
-          });
-        } else if (!member.IsStatic && compiledName.Length != 0) {
-          return SuffixLvalue(obj, "->{0}", compiledName);
-        } else if (compiledName.Length != 0) {
-          return SuffixLvalue(obj, "::{0}", compiledName);
-        } else {
-          // this member selection is handled by some kind of enclosing function call, so nothing to do here
-          return SimpleLvalue(obj);
-        }
-      } else if (member is Function) {
-        return StringLvalue(String.Format("{0}::{1}::{2}",
-          IdProtect(member.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options)),
-          IdName(member.EnclosingClass),
-          IdName(member)
-        ));
-      } else {
-        return SuffixLvalue(obj, "->{0}", IdName(member));
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<string> indices, Type elmtType, ConcreteSyntaxTree wr) {
-      var w = wr.Fork();
-      foreach (var index in indices) {
-        wr.Write(".at({0})", index);
-      }
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
-      var w = wr.Fork();
-      foreach (var index in indices) {
-        wr.Write(".at(");
-        wr.Append(Expr(index, inLetExprBody, wStmts));
-        wr.Write(")");
-      }
-      return w;
-    }
-
-    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(expr, wr, inLetExprBody, wStmts);
-      if (AsNativeType(expr.Type) == null) {
-        wr.Write(".toNumber()");
-      }
-    }
-
-    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(source, wr, inLetExprBody, wStmts);
-      if (source.Type.NormalizeExpand() is SeqType) {
-        // seq
-        wr.Write(".select(");
-        wr.Append(Expr(index, inLetExprBody, wStmts));
-        wr.Write(")");
-      } else {
-        // map or imap
-        wr.Write(".get(");
-        wr.Append(Expr(index, inLetExprBody, wStmts));
-        wr.Write(")");
-      }
-    }
-
-    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
-        CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(source, wr, inLetExprBody, wStmts);
-      wr.Write(".update(");
-      wr.Append(Expr(index, inLetExprBody, wStmts));
-      wr.Write(", ");
-      wr.Append(CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts));
-      wr.Write(")");
-    }
-
-    protected override void EmitSeqSelectRange(Expression source, Expression lo /*?*/, Expression hi /*?*/,
-        bool fromArray, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (fromArray) {
-        string typeName = "";
-
-        if (source.Type.TypeArgs.Count == 0 && source.Type is UserDefinedType udt && udt.ResolvedClass != null &&
-            udt.ResolvedClass is TypeSynonymDecl tsd) {
-          // Hack to workaround type synonyms wrapped around the actual array type
-          // TODO: Come up with a more systematic way of resolving this!
-          typeName = TypeName(tsd.Rhs.TypeArgs[0], wr, source.tok, null, false);
-        } else {
-          typeName = TypeName(source.Type.TypeArgs[0], wr, source.tok, null, false);
-        }
-        if (lo == null) {
-          if (hi == null) {
-            wr.Write("DafnySequence<{0}>::SeqFromArray", typeName);
-            TrParenExpr(source, wr, inLetExprBody, wStmts);
-          } else {
-            wr.Write("DafnySequence<{0}>::SeqFromArrayPrefix(", typeName);
-            TrParenExpr(source, wr, inLetExprBody, wStmts);
-            wr.Write(",");
-            TrParenExpr(hi, wr, inLetExprBody, wStmts);
-            wr.Write(")");
-          }
-        } else {
-          if (hi == null) {
-            wr.Write("DafnySequence<{0}>::SeqFromArraySuffix(", typeName);
-            TrParenExpr(source, wr, inLetExprBody, wStmts);
-            wr.Write(",");
-            TrParenExpr(lo, wr, inLetExprBody, wStmts);
-            wr.Write(")");
-          } else {
-            wr.Write("DafnySequence<{0}>::SeqFromArraySlice(", typeName);
-            TrParenExpr(source, wr, inLetExprBody, wStmts);
-            wr.Write(",");
-            TrParenExpr(lo, wr, inLetExprBody, wStmts);
-            wr.Write(",");
-            TrParenExpr(hi, wr, inLetExprBody, wStmts);
-            wr.Write(")");
-          }
-        }
-      } else {
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-
-        if (hi != null) {
-          TrParenExpr(".take", hi, wr, inLetExprBody, wStmts);
-        }
-        if (lo != null) {
-          TrParenExpr(".drop", lo, wr, inLetExprBody, wStmts);
-        }
-      }
-    }
-
-    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write("DafnySequence<{0}>::Create(", TypeName(expr.Type, wr, expr.tok, null, false));
-      wr.Append(Expr(expr.N, inLetExprBody, wStmts));
-      wr.Write(", ");
-      wr.Append(Expr(expr.Initializer, inLetExprBody, wStmts));
-      wr.Write(")");
-    }
-
-    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts) {
-      throw new UnsupportedFeatureException(expr.tok, Feature.Multisets);
-    }
-
-    protected override void EmitApplyExpr(Type functionType, IToken tok, Expression function, List<Expression> arguments,
-        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(function, wr, inLetExprBody, wStmts);
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-    }
-
-    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
-      List<Type> boundTypes, Type resultType, IToken tok, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ref ConcreteSyntaxTree wStmts) {
-      wr.Write("(({0}) => ", Util.Comma(boundVars));
-      var w = wr.Fork();
-      wr.Write(")");
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-      return w;
-    }
-
-    protected override void EmitConstructorCheck(string source, DatatypeCtor ctor, ConcreteSyntaxTree wr) {
-      wr.Write("is_{1}({0})", source, DatatypeSubStructName(ctor));
-    }
-
-    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex, DatatypeCtor ctor, List<Type> typeArgs, Type bvType, ConcreteSyntaxTree wr) {
-      if (ctor.EnclosingDatatype is TupleTypeDecl) {
-        wr.Write("(");
-        source(wr);
-        wr.Write(").template get<{0}>()", formalNonGhostIndex);
-      } else {
-        var dtorName = FormalName(dtor, formalNonGhostIndex);
-        if (dtor.Type is UserDefinedType udt && udt.ResolvedClass == ctor.EnclosingDatatype) {
-          // Recursively defined datatype requires a dereference here
-          wr.Write("*");
-        }
-
-        if (ctor.EnclosingDatatype.Ctors.Count > 1) {
-          wr.Write("((");
-          source(wr);
-          wr.Write(").dtor_{0}())", dtorName);
-        } else {
-          wr.Write("((");
-          source(wr);
-          wr.Write(").{0})", dtorName);
-        }
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IToken tok, List<string> inNames,
-        Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
-      wr.Write("function (");
-      Contract.Assert(inTypes.Count == inNames.Count);  // guaranteed by precondition
-      for (var i = 0; i < inNames.Count; i++) {
-        wr.Write("{0}{1}", i == 0 ? "" : ", ", inNames[i]);
-      }
-      var w = wr.NewExprBlock(")");
-      return w;
-    }
-
-    protected override void CreateIIFE(string bvName, Type bvType, IToken bvTok, Type bodyType, IToken bodyTok,
-      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
-      var w = wr.NewExprBlock("[&]({0} {1}) -> {2} ", TypeName(bvType, wr, bvTok), bvName, TypeName(bodyType, wr, bodyTok));
-      wStmts = w.Fork();
-      w.Write("return ");
-      wrBody = w.Fork();
-      w.WriteLine(";");
-      wr.Write("(");
-      wrRhs = wr.Fork();
-      wr.Write(")");
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IToken resultTok, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var w = wr.NewBigExprBlock("[&] ", " ()");
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IToken resultTok, string bvName,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new UnsupportedFeatureException(resultTok, Feature.LetSuchThatExpressions);
-    }
-
-    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      switch (op) {
-        case ResolvedUnaryOp.BoolNot:
-          TrParenExpr("!", expr, wr, inLetExprBody, wStmts);
-          break;
-        case ResolvedUnaryOp.BitwiseNot:
-          if (AsNativeType(expr.Type) != null) {
-            wr.Write("~ ");
-            TrParenExpr(expr, wr, inLetExprBody, wStmts);
-          } else {
-            TrParenExpr(expr, wr, inLetExprBody, wStmts);
-            wr.Write(".Not()");
-          }
-          break;
-        case ResolvedUnaryOp.Cardinality:
-          TrParenExpr(expr, wr, inLetExprBody, wStmts);
-          wr.Write(".size()");
-          break;
-        default:
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
-      }
-    }
-
-    bool IsDirectlyComparable(Type t) {
-      Contract.Requires(t != null);
-      return t.IsBoolType || t.IsCharType || AsNativeType(t) != null;
-    }
-
-    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
-      Expression e0, Expression e1, IToken tok, Type resultType,
-      out string opString,
-      out string preOpString,
-      out string postOpString,
-      out string callString,
-      out string staticCallString,
-      out bool reverseArguments,
-      out bool truncateResult,
-      out bool convertE1_to_int,
-      out bool coerceE1,
-      ConcreteSyntaxTree errorWr) {
-
-      opString = null;
-      preOpString = "";
-      postOpString = "";
-      callString = null;
-      staticCallString = null;
-      reverseArguments = false;
-      truncateResult = false;
-      convertE1_to_int = false;
-      coerceE1 = false;
-
-      switch (op) {
-        case BinaryExpr.ResolvedOpcode.Iff:
-          opString = "=="; break;
-        case BinaryExpr.ResolvedOpcode.Imp:
-          preOpString = "!"; opString = "||"; break;
-        case BinaryExpr.ResolvedOpcode.Or:
-          opString = "||"; break;
-        case BinaryExpr.ResolvedOpcode.And:
-          opString = "&&"; break;
-        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
-          if (AsNativeType(resultType) != null) {
-            opString = "&";
-          } else {
-            callString = "And";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.BitwiseOr:
-          if (AsNativeType(resultType) != null) {
-            opString = "|";
-          } else {
-            callString = "Or";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.BitwiseXor:
-          if (AsNativeType(resultType) != null) {
-            opString = "^";
-          } else {
-            callString = "Xor";
-          }
-          break;
-
-        case BinaryExpr.ResolvedOpcode.EqCommon: {
-            if (IsDirectlyComparable(e0.Type)) {
-              opString = "==";
-            } else if (e0.Type.IsRefType) {
-              opString = "==";
-            } else {
-              //staticCallString = "==";
-              opString = "==";
-            }
-            break;
-          }
-        case BinaryExpr.ResolvedOpcode.NeqCommon: {
-            if (IsDirectlyComparable(e0.Type)) {
-              opString = "!=";
-            } else if (e0.Type.IsRefType) {
-              opString = "!=";
-            } else {
-              opString = "!=";
-            }
-            break;
-          }
-
-        case BinaryExpr.ResolvedOpcode.Lt:
-        case BinaryExpr.ResolvedOpcode.LtChar:
-          opString = "<";
-          break;
-        case BinaryExpr.ResolvedOpcode.Le:
-        case BinaryExpr.ResolvedOpcode.LeChar:
-          opString = "<=";
-          break;
-        case BinaryExpr.ResolvedOpcode.Ge:
-        case BinaryExpr.ResolvedOpcode.GeChar:
-          opString = ">=";
-          break;
-        case BinaryExpr.ResolvedOpcode.Gt:
-        case BinaryExpr.ResolvedOpcode.GtChar:
-          opString = ">";
-          break;
-        case BinaryExpr.ResolvedOpcode.LeftShift:
-          if (resultType.IsBitVectorType) {
-            truncateResult = true;
-          }
-          if (AsNativeType(resultType) != null) {
-            opString = "<<";
-          } else {
-            throw new UnsupportedFeatureException(tok, Feature.NonNativeNewtypes,
-              "LeftShift of non-native type");
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.RightShift:
-          if (AsNativeType(resultType) != null) {
-            opString = ">>";
-            if (AsNativeType(e1.Type) == null) {
-              postOpString = ".Uint64()";
-            }
-          } else {
-            throw new UnsupportedFeatureException(tok, Feature.NonNativeNewtypes,
-              "LeftShift of non-native type");
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Add:
-          if (resultType.IsBitVectorType) {
-            truncateResult = true;
-          }
-          if (resultType.IsCharType || AsNativeType(resultType) != null) {
-            opString = "+";
-          } else {
-            throw new UnsupportedFeatureException(tok, Feature.NonNativeNewtypes,
-              "Add of non-native type");
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Sub:
-          if (resultType.IsBitVectorType) {
-            truncateResult = true;
-          }
-          if (resultType.IsCharType || AsNativeType(resultType) != null) {
-            opString = "-";
-          } else {
-            throw new UnsupportedFeatureException(tok, Feature.NonNativeNewtypes);
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mul:
-          if (resultType.IsBitVectorType) {
-            truncateResult = true;
-          }
-          if (AsNativeType(resultType) != null) {
-            opString = "*";
-          } else {
-            throw new UnsupportedFeatureException(tok, Feature.NonNativeNewtypes);
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Div:
-          if (AsNativeType(resultType) != null) {
-            var nt = AsNativeType(resultType);
-            if (nt.LowerBound < BigInteger.Zero) {
-              // Want Euclidean division for signed types
-              staticCallString = "EuclideanDivision_" + GetNativeTypeName(AsNativeType(resultType));
-            } else {
-              // Native division is fine for unsigned
-              opString = "/";
-            }
-          } else {
-            callString = "DivBy";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mod:
-          if (AsNativeType(resultType) != null) {
-            var nt = AsNativeType(resultType);
-            if (nt.LowerBound < BigInteger.Zero) {
-              // Want Euclidean division for signed types
-              staticCallString = "_dafny.Mod" + Capitalize(GetNativeTypeName(AsNativeType(resultType)));
-            } else {
-              // Native division is fine for unsigned
-              opString = "%";
-            }
-          } else {
-            callString = "Modulo";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.SetEq:
-        case BinaryExpr.ResolvedOpcode.MultiSetEq:
-        case BinaryExpr.ResolvedOpcode.MapEq:
-        case BinaryExpr.ResolvedOpcode.SeqEq:
-          callString = "equals"; break;
-        case BinaryExpr.ResolvedOpcode.SetNeq:
-        case BinaryExpr.ResolvedOpcode.MultiSetNeq:
-        case BinaryExpr.ResolvedOpcode.MapNeq:
-        case BinaryExpr.ResolvedOpcode.SeqNeq:
-          preOpString = "!"; callString = "equals"; break;
-        case BinaryExpr.ResolvedOpcode.ProperSubset:
-        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
-          callString = "IsProperSubsetOf"; break;
-        case BinaryExpr.ResolvedOpcode.Subset:
-        case BinaryExpr.ResolvedOpcode.MultiSubset:
-          callString = "IsSubsetOf"; break;
-        case BinaryExpr.ResolvedOpcode.Superset:
-        case BinaryExpr.ResolvedOpcode.MultiSuperset:
-          callString = "IsSupersetOf"; break;
-        case BinaryExpr.ResolvedOpcode.ProperSuperset:
-        case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
-          callString = "IsProperSupersetOf"; break;
-        case BinaryExpr.ResolvedOpcode.Disjoint:
-        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
-          callString = "IsDisjointFrom"; break;
-        case BinaryExpr.ResolvedOpcode.InSet:
-        case BinaryExpr.ResolvedOpcode.InMultiSet:
-        case BinaryExpr.ResolvedOpcode.InMap:
-          callString = "contains"; reverseArguments = true; break;
-        case BinaryExpr.ResolvedOpcode.NotInSet:
-        case BinaryExpr.ResolvedOpcode.NotInMultiSet:
-        case BinaryExpr.ResolvedOpcode.NotInMap:
-          preOpString = "!"; callString = "contains"; reverseArguments = true; break;
-        case BinaryExpr.ResolvedOpcode.Union:
-        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-          callString = "Union"; break;
-        case BinaryExpr.ResolvedOpcode.MapMerge:
-          callString = "Merge"; break;
-        case BinaryExpr.ResolvedOpcode.Intersection:
-        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-          callString = "Intersection"; break;
-        case BinaryExpr.ResolvedOpcode.SetDifference:
-        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
-          callString = "Difference"; break;
-        case BinaryExpr.ResolvedOpcode.MapSubtraction:
-          callString = "Subtract"; break;
-
-        case BinaryExpr.ResolvedOpcode.ProperPrefix:
-          callString = "IsProperPrefixOf"; break;
-        case BinaryExpr.ResolvedOpcode.Prefix:
-          callString = "IsPrefixOf"; break;
-        case BinaryExpr.ResolvedOpcode.Concat:
-          callString = "concatenate"; break;
-        case BinaryExpr.ResolvedOpcode.InSeq:
-          callString = "contains"; reverseArguments = true; break;
-        case BinaryExpr.ResolvedOpcode.NotInSeq:
-          preOpString = "!"; callString = "contains"; reverseArguments = true; break;
-
-        default:
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected binary expression
-      }
-    }
-
-    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
-      wr.Write("{0} == 0", varName);
-    }
-
-    protected override void EmitConversionExpr(ConversionExpr e, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Int) || e.E.Type.IsBitVectorType || e.E.Type.IsCharType) {
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          throw new UnsupportedFeatureException(e.tok, Feature.RealNumbers);
-        } else if (e.ToType.IsCharType) {
-          wr.Write("(char)");
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-        } else {
-          // (int or bv or char) -> (int or bv or ORDINAL)
-          var fromNative = AsNativeType(e.E.Type);
-          var toNative = AsNativeType(e.ToType);
-          if (fromNative != null && toNative != null) {
-            // from a native, to a native -- simple!
-            wr.Write(GetNativeTypeName(toNative));
-            TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          } else if (e.E.Type.IsCharType) {
-            Contract.Assert(fromNative == null);
-            if (toNative == null) {
-              throw new UnsupportedFeatureException(e.tok, Feature.UnboundedIntegers);
-            } else {
-              // char -> native
-              wr.Write($"({GetNativeTypeName(toNative)})");
-              TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-            }
-          } else if (fromNative == null && toNative == null) {
-            // big-integer (int or bv) -> big-integer (int or bv or ORDINAL), so identity will do
-            wr.Append(Expr(e.E, inLetExprBody, wStmts));
-          } else if (fromNative != null) {
-            Contract.Assert(toNative == null); // follows from other checks
-
-            // native (int or bv) -> big-integer (int or bv)
-            wr.Write("_dafny.IntOf{0}(", Capitalize(GetNativeTypeName(fromNative)));
-            wr.Append(Expr(e.E, inLetExprBody, wStmts));
-            wr.Write(')');
-          } else {
-            // any (int or bv) -> native (int or bv)
-            // Consider some optimizations
-            var literal = PartiallyEvaluate(e.E);
-            UnaryOpExpr u = e.E.Resolved as UnaryOpExpr;
-            MemberSelectExpr m = e.E.Resolved as MemberSelectExpr;
-            if (literal != null) {
-              // Optimize constant to avoid intermediate BigInteger
-              wr.Write("{0}({1})", GetNativeTypeName(toNative), literal);
-            } else if (u != null && u.Op == UnaryOpExpr.Opcode.Cardinality) {
-              wr.Write("({0})(", GetNativeTypeName(toNative));
-              TrParenExpr(u.E, wr, inLetExprBody, wStmts);
-              wr.Write(".size())");
-            } else if (m != null && m.MemberName == "Length" && m.Obj.Type.IsArrayType) {
-              // Optimize .Length to avoid intermediate BigInteger
-              wr.Write("({0})(", GetNativeTypeName(toNative));
-              TrParenExpr(m.Obj, wr, inLetExprBody, wStmts);
-              wr.Write(".size())");
-            } else {
-              // no optimization applies; use the standard translation
-              TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-              wr.Write(".{0}()", Capitalize(GetNativeTypeName(toNative)));
-            }
-
-          }
-        }
-      } else if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-        Contract.Assert(AsNativeType(e.E.Type) == null);
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // real -> real
-          Contract.Assert(AsNativeType(e.ToType) == null);
-          wr.Append(Expr(e.E, inLetExprBody, wStmts));
-        } else {
-          // real -> (int or bv)
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          wr.Write(".Int()");
-          if (AsNativeType(e.ToType) is NativeType nt) {
-            wr.Write(".{0}()", Capitalize(GetNativeTypeName(nt)));
-          }
-        }
-      } else {
-        Contract.Assert(e.E.Type.IsBigOrdinalType);
-        Contract.Assert(e.ToType.IsNumericBased(Type.NumericPersuasion.Int));
-        // identity will do
-        wr.Append(Expr(e.E, inLetExprBody, wStmts));
-      }
-    }
-
-    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IToken tok, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(tok, Feature.TypeTests);
-    }
-
-    protected override void EmitCollectionDisplay(CollectionType ct, IToken tok, List<Expression> elements,
-      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (ct is SetType) {
-        wr.Write("DafnySet<{0}>::Create({{", TypeName(ct.TypeArgs[0], wr, tok, null, false));
-        for (var i = 0; i < elements.Count; i++) {
-          wr.Append(Expr(elements[i], inLetExprBody, wStmts));
-          if (i < elements.Count - 1) {
-            wr.Write(",");
-          }
-        }
-        wr.Write("})");
-      } else if (ct is MultiSetType) {
-        throw new UnsupportedFeatureException(tok, Feature.Multisets);
-      } else {
-        Contract.Assert(ct is SeqType);  // follows from precondition
-        if (ct.Arg.IsCharType) {
-          throw new UnsupportedFeatureException(tok, Feature.SequenceDisplaysOfCharacters);
-        } else {
-          wr.Write("DafnySequence<{0}>::Create({{", TypeName(ct.TypeArgs[0], wr, tok, null, false));
-          for (var i = 0; i < elements.Count; i++) {
-            wr.Append(Expr(elements[i], inLetExprBody, wStmts));
-            if (i < elements.Count - 1) {
-              wr.Write(",");
-            }
-          }
-          wr.Write("})");
-        }
-      }
-    }
-
-    protected override void EmitMapDisplay(MapType mt, IToken tok, List<ExpressionPair> elements,
-      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write("DafnyMap<{0},{1}>::Create({{",
-               TypeName(mt.TypeArgs[0], wr, tok, null, false),
-               TypeName(mt.TypeArgs[1], wr, tok, null, false));
-      string sep = "";
-      foreach (ExpressionPair p in elements) {
-        wr.Write(sep);
-        wr.Write("{");
-        wr.Append(Expr(p.A, inLetExprBody, wStmts));
-        wr.Write(",");
-        wr.Append(Expr(p.B, inLetExprBody, wStmts));
-        wr.Write("}");
-        sep = ", ";
-      }
-      wr.Write("})");
-    }
-
-    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
-      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
-      wrVarInit.Write("DafnySet<{0}>()", TypeName(e.Type.AsSetType.Arg, wrVarInit, e.tok, null, false));
-    }
-
-    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
-      throw new UnsupportedFeatureException(e.tok, Feature.MapComprehensions);
-    }
-
-    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      Contract.Assume(ct is SetType || ct is MultiSetType);  // follows from precondition
-      if (ct is MultiSetType) {
-        // This should never occur since there is no syntax for multiset comprehensions yet
-        throw new cce.UnreachableException();
-      }
-      var wStmts = wr.Fork();
-      wr.Write("{0}.set.emplace(", collName);
-      wr.Append(Expr(elmt, inLetExprBody, wStmts));
-      wr.WriteLine(");");
-    }
-
-    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IToken tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(tok, Feature.MapComprehensions);
-    }
-
-    protected override string GetCollectionBuilder_Build(CollectionType ct, IToken tok, string collName, ConcreteSyntaxTree wr) {
-      // collections are built in place
-      return collName;
-    }
-
-    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.ExactBoundedPool);
-    }
-
-    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.RunAllTests);
-    }
-  }
-}
diff --git a/Source/DafnyCore/Compilers/Cplusplus/CppCompilerBackend.cs b/Source/DafnyCore/Compilers/Cplusplus/CppCompilerBackend.cs
deleted file mode 100644
index df428361347..00000000000
--- a/Source/DafnyCore/Compilers/Cplusplus/CppCompilerBackend.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics.Contracts;
-using System.IO;
-
-namespace Microsoft.Dafny.Compilers;
-
-public class CppCompilerBackend : ExecutableBackend {
-  protected override SinglePassCompiler CreateCompiler() {
-    return new CppCompiler(Options, Reporter, OtherFileNames);
-  }
-
-  private string ComputeExeName(string targetFilename) {
-    return Path.ChangeExtension(Path.GetFullPath(targetFilename), "exe");
-  }
-
-  public override bool CompileTargetProgram(string dafnyProgramName, string targetProgramText,
-    string/*?*/ callToMain, string/*?*/ targetFilename, ReadOnlyCollection<string> otherFileNames,
-    bool runAfterCompile, TextWriter outputWriter, out object compilationResult) {
-    var assemblyLocation = System.Reflection.Assembly.GetExecutingAssembly().Location;
-    Contract.Assert(assemblyLocation != null);
-    var codebase = Path.GetDirectoryName(assemblyLocation);
-    Contract.Assert(codebase != null);
-    compilationResult = null;
-    var psi = PrepareProcessStartInfo("g++", new List<string> {
-      "-Wall",
-      "-Wextra",
-      "-Wpedantic",
-      "-Wno-unused-variable",
-      "-Wno-deprecated-copy",
-      "-Wno-unused-label",
-      "-Wno-unused-but-set-variable",
-      "-Wno-unknown-warning-option",
-      "-g",
-      "-std=c++17",
-      "-I", codebase,
-      "-o", ComputeExeName(targetFilename),
-      targetFilename
-    });
-    return 0 == RunProcess(psi, outputWriter, outputWriter, "Error while compiling C++ files.");
-  }
-
-  public override bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain /*?*/,
-    string targetFilename, ReadOnlyCollection<string> otherFileNames,
-    object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
-    var psi = PrepareProcessStartInfo(ComputeExeName(targetFilename), Options.MainArgs);
-    return 0 == RunProcess(psi, outputWriter, errorWriter);
-  }
-
-  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".h" };
-
-  public override string TargetName => "C++";
-  public override bool IsStable => true;
-  public override string TargetExtension => "cpp";
-
-  public override bool SupportsInMemoryCompilation => false;
-
-  public override bool TextualTargetIsExecutable => false;
-
-  public CppCompilerBackend(DafnyOptions options) : base(options) {
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/Dafny/AST.dfy b/Source/DafnyCore/Compilers/Dafny/AST.dfy
deleted file mode 100644
index fed8be7fd59..00000000000
--- a/Source/DafnyCore/Compilers/Dafny/AST.dfy
+++ /dev/null
@@ -1,82 +0,0 @@
-module {:extern "DAST"} DAST {
-  datatype Module = Module(name: string, body: seq<ModuleItem>)
-
-  datatype ModuleItem = Module(Module) | Class(Class) | Trait(Trait) | Newtype(Newtype) | Datatype(Datatype)
-
-  datatype Newtype = Newtype(name: string, typeParams: seq<Type>, base: Type, witnessStmts: seq<Statement>, witnessExpr: Optional<Expression>)
-
-  datatype Type =
-    Path(seq<Ident>, typeArgs: seq<Type>, resolved: ResolvedType) |
-    Tuple(seq<Type>) |
-    Array(element: Type) |
-    Seq(element: Type) |
-    Set(element: Type) |
-    Multiset(element: Type) |
-    Map(key: Type, value: Type) |
-    Arrow(args: seq<Type>, result: Type) |
-    Primitive(Primitive) | Passthrough(string) |
-    TypeArg(Ident)
-
-  datatype Primitive = String | Bool | Char
-
-  datatype ResolvedType = Datatype(path: seq<Ident>) | Trait(path: seq<Ident>) | Newtype
-
-  datatype Ident = Ident(id: string)
-
-  datatype Class = Class(name: string, superClasses: seq<Type>, body: seq<ClassItem>)
-
-  datatype Trait = Trait(name: string, typeParams: seq<Type>, body: seq<ClassItem>)
-
-  datatype Datatype = Datatype(name: string, enclosingModule: Ident, typeParams: seq<Type>, ctors: seq<DatatypeCtor>, body: seq<ClassItem>, isCo: bool)
-
-  datatype DatatypeCtor = DatatypeCtor(name: string, args: seq<Formal>, hasAnyArgs: bool /* includes ghost */)
-
-  datatype ClassItem = Method(Method) | Field(Formal)
-
-  datatype Formal = Formal(name: string, typ: Type)
-
-  datatype Method = Method(isStatic: bool, hasBody: bool, overridingPath: Optional<seq<Ident>>, name: string, typeParams: seq<Type>, params: seq<Formal>, body: seq<Statement>, outTypes: seq<Type>, outVars: Optional<seq<Ident>>)
-
-  datatype Optional<T> = Some(T) | None
-
-  datatype Statement =
-    DeclareVar(name: string, typ: Type, maybeValue: Optional<Expression>) |
-    Assign(name: string, value: Expression) |
-    If(cond: Expression, thn: seq<Statement>, els: seq<Statement>) |
-    While(cond: Expression, body: seq<Statement>) |
-    Call(on: Expression, name: string, typeArgs: seq<Type>, args: seq<Expression>, outs: Optional<seq<Ident>>) |
-    Return(expr: Expression) |
-    EarlyReturn() |
-    Halt() |
-    Print(Expression)
-
-  datatype Expression =
-    Literal(Literal) |
-    Ident(string) |
-    Companion(seq<Ident>) |
-    Tuple(seq<Expression>) |
-    New(path: seq<Ident>, args: seq<Expression>) |
-    NewArray(dims: seq<Expression>) |
-    DatatypeValue(path: seq<Ident>, variant: string, isCo: bool, contents: seq<(string, Expression)>) |
-    SubsetUpgrade(value: Expression, typ: Type) |
-    SubsetDowngrade(value: Expression) |
-    SeqValue(elements: seq<Expression>) |
-    SetValue(elements: seq<Expression>) |
-    This() |
-    Ite(cond: Expression, thn: Expression, els: Expression) |
-    UnOp(unOp: UnaryOp, expr: Expression) |
-    BinOp(op: string, left: Expression, right: Expression) |
-    Select(expr: Expression, field: string, onDatatype: bool) |
-    SelectFn(expr: Expression, field: string, onDatatype: bool, isStatic: bool, arity: nat) |
-    TupleSelect(expr: Expression, index: nat) |
-    Call(on: Expression, name: Ident, typeArgs: seq<Type>, args: seq<Expression>) |
-    Lambda(params: seq<Formal>, retType: Type, body: seq<Statement>) |
-    IIFE(name: Ident, typ: Type, value: Expression, iifeBody: Expression) |
-    Apply(expr: Expression, args: seq<Expression>) |
-    TypeTest(on: Expression, dType: seq<Ident>, variant: string) |
-    InitializationValue(typ: Type)
-
-  datatype UnaryOp = Not | BitwiseNot | Cardinality
-
-  datatype Literal = BoolLiteral(bool) | IntLiteral(int) | DecLiteral(string) | StringLiteral(string) | CharLiteral(char) | Null
-}
diff --git a/Source/DafnyCore/Compilers/Dafny/ASTBuilder.cs b/Source/DafnyCore/Compilers/Dafny/ASTBuilder.cs
deleted file mode 100644
index a644181607b..00000000000
--- a/Source/DafnyCore/Compilers/Dafny/ASTBuilder.cs
+++ /dev/null
@@ -1,1100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Dafny;
-using DAST;
-using Microsoft.Dafny.Compilers;
-
-namespace Microsoft.Dafny.Compilers {
-
-  class ProgramBuilder : ModuleContainer {
-    readonly List<Module> items = new();
-
-    public void AddModule(Module item) {
-      items.Add(item);
-    }
-
-    public List<Module> Finish() {
-      return items;
-    }
-  }
-
-  interface ModuleContainer {
-    void AddModule(Module item);
-
-    public ModuleBuilder Module(string name) {
-      return new ModuleBuilder(this, name);
-    }
-  }
-
-  class ModuleBuilder : ClassContainer, TraitContainer, NewtypeContainer, DatatypeContainer {
-    readonly ModuleContainer parent;
-    readonly string name;
-    readonly List<ModuleItem> body = new();
-
-    public ModuleBuilder(ModuleContainer parent, string name) {
-      this.parent = parent;
-      this.name = name;
-    }
-
-    public void AddModule(Module item) {
-      body.Add((ModuleItem)ModuleItem.create_Module(item));
-    }
-
-    public void AddClass(Class item) {
-      body.Add((ModuleItem)ModuleItem.create_Class(item));
-    }
-
-    public void AddTrait(Trait item) {
-      body.Add((ModuleItem)ModuleItem.create_Trait(item));
-    }
-
-    public void AddNewtype(Newtype item) {
-      body.Add((ModuleItem)ModuleItem.create_Newtype(item));
-    }
-
-    public void AddDatatype(Datatype item) {
-      body.Add((ModuleItem)ModuleItem.create_Datatype(item));
-    }
-
-    public object Finish() {
-      parent.AddModule((Module)Module.create(Sequence<Rune>.UnicodeFromString(this.name), Sequence<ModuleItem>.FromArray(body.ToArray())));
-      return parent;
-    }
-  }
-
-  interface ClassContainer {
-    void AddClass(Class item);
-
-    public ClassBuilder Class(string name, List<DAST.Type> superClasses) {
-      return new ClassBuilder(this, name, superClasses);
-    }
-  }
-
-  class ClassBuilder : ClassLike {
-    readonly ClassContainer parent;
-    readonly string name;
-    readonly List<DAST.Type> superClasses;
-    readonly List<ClassItem> body = new();
-
-    public ClassBuilder(ClassContainer parent, string name, List<DAST.Type> superClasses) {
-      this.parent = parent;
-      this.name = name;
-      this.superClasses = superClasses;
-    }
-
-    public void AddMethod(DAST.Method item) {
-      body.Add((ClassItem)ClassItem.create_Method(item));
-    }
-
-    public void AddField(DAST.Formal item) {
-      body.Add((ClassItem)ClassItem.create_Field(item));
-    }
-
-    public object Finish() {
-      parent.AddClass((Class)Class.create(
-        Sequence<Rune>.UnicodeFromString(this.name),
-        Sequence<DAST.Type>.FromArray(this.superClasses.ToArray()),
-        Sequence<ClassItem>.FromArray(body.ToArray())
-      ));
-      return parent;
-    }
-  }
-
-  interface TraitContainer {
-    void AddTrait(Trait item);
-
-    public TraitBuilder Trait(string name, List<DAST.Type> typeParams) {
-      return new TraitBuilder(this, name, typeParams);
-    }
-  }
-
-  class TraitBuilder : ClassLike {
-    readonly TraitContainer parent;
-    readonly string name;
-    readonly List<DAST.Type> typeParams;
-    readonly List<ClassItem> body = new();
-
-    public TraitBuilder(TraitContainer parent, string name, List<DAST.Type> typeParams) {
-      this.parent = parent;
-      this.name = name;
-      this.typeParams = typeParams;
-    }
-
-    public void AddMethod(DAST.Method item) {
-      // remove existing method with the same name, because we're going to define an implementation
-      for (int i = 0; i < body.Count; i++) {
-        if (body[i].is_Method && body[i].dtor_Method_a0.dtor_name.Equals(item.dtor_name)) {
-          body.RemoveAt(i);
-          break;
-        }
-      }
-
-      body.Add((ClassItem)ClassItem.create_Method(item));
-    }
-
-    public void AddField(DAST.Formal item) {
-      throw new NotImplementedException();
-    }
-
-    public object Finish() {
-      parent.AddTrait((Trait)Trait.create(
-        Sequence<Rune>.UnicodeFromString(this.name),
-        Sequence<DAST.Type>.FromArray(typeParams.ToArray()),
-        Sequence<ClassItem>.FromArray(body.ToArray()))
-      );
-      return parent;
-    }
-  }
-
-  interface NewtypeContainer {
-    void AddNewtype(Newtype item);
-
-    public NewtypeBuilder Newtype(string name, List<DAST.Type> typeParams, DAST.Type baseType, List<DAST.Statement> witnessStmts, DAST.Expression witness) {
-      return new NewtypeBuilder(this, name, typeParams, baseType, witnessStmts, witness);
-    }
-  }
-
-  class NewtypeBuilder : ClassLike {
-    readonly NewtypeContainer parent;
-    readonly string name;
-    readonly List<DAST.Type> typeParams;
-    readonly DAST.Type baseType;
-    readonly List<DAST.Statement> witnessStmts;
-    readonly DAST.Expression witness;
-
-    public NewtypeBuilder(NewtypeContainer parent, string name, List<DAST.Type> typeParams, DAST.Type baseType, List<DAST.Statement> statements, DAST.Expression witness) {
-      this.parent = parent;
-      this.name = name;
-      this.typeParams = typeParams;
-      this.baseType = baseType;
-      this.witnessStmts = statements;
-      this.witness = witness;
-    }
-
-    public void AddMethod(DAST.Method item) {
-      throw new NotImplementedException();
-    }
-
-    public void AddField(DAST.Formal item) {
-      throw new NotImplementedException();
-    }
-
-    public object Finish() {
-      parent.AddNewtype((Newtype)Newtype.create(
-        Sequence<Rune>.UnicodeFromString(this.name),
-        Sequence<DAST.Type>.FromArray(this.typeParams.ToArray()),
-        this.baseType,
-        Sequence<DAST.Statement>.FromArray(this.witnessStmts.ToArray()),
-        this.witness == null ? Optional<DAST._IExpression>.create_None() : Optional<DAST._IExpression>.create_Some(this.witness)
-      ));
-      return parent;
-    }
-  }
-
-  interface DatatypeContainer {
-    void AddDatatype(Datatype item);
-
-    public DatatypeBuilder Datatype(string name, ISequence<Rune> enclosingModule, List<DAST.Type> typeParams, List<DAST.DatatypeCtor> ctors, bool isCo) {
-      return new DatatypeBuilder(this, name, enclosingModule, typeParams, ctors, isCo);
-    }
-  }
-
-  class DatatypeBuilder : ClassLike {
-    readonly DatatypeContainer parent;
-    readonly string name;
-    readonly ISequence<Rune> enclosingModule;
-    readonly List<DAST.Type> typeParams;
-    readonly List<DAST.DatatypeCtor> ctors;
-    readonly bool isCo;
-    readonly List<ClassItem> body = new();
-
-    public DatatypeBuilder(DatatypeContainer parent, string name, ISequence<Rune> enclosingModule, List<DAST.Type> typeParams, List<DAST.DatatypeCtor> ctors, bool isCo) {
-      this.parent = parent;
-      this.name = name;
-      this.typeParams = typeParams;
-      this.enclosingModule = enclosingModule;
-      this.ctors = ctors;
-      this.isCo = isCo;
-    }
-
-    public void AddMethod(DAST.Method item) {
-      body.Add((ClassItem)ClassItem.create_Method(item));
-    }
-
-    public void AddField(DAST.Formal item) {
-      throw new NotImplementedException();
-    }
-
-    public object Finish() {
-      parent.AddDatatype((Datatype)Datatype.create(
-        Sequence<Rune>.UnicodeFromString(this.name),
-        this.enclosingModule,
-        Sequence<DAST.Type>.FromArray(typeParams.ToArray()),
-        Sequence<DAST.DatatypeCtor>.FromArray(ctors.ToArray()),
-        Sequence<ClassItem>.FromArray(body.ToArray()),
-        this.isCo
-      ));
-      return parent;
-    }
-  }
-
-  interface ClassLike {
-    void AddMethod(DAST.Method item);
-
-    void AddField(DAST.Formal item);
-
-    public MethodBuilder Method(
-      bool isStatic, bool hasBody,
-      ISequence<ISequence<Rune>> overridingPath,
-      string name,
-      List<DAST.Type> typeArgs,
-      List<DAST.Formal> params_,
-      List<DAST.Type> outTypes, List<ISequence<Rune>> outVars
-    ) {
-      return new MethodBuilder(this, isStatic, hasBody, overridingPath, name, typeArgs, params_, outTypes, outVars);
-    }
-
-    public object Finish();
-  }
-
-  class MethodBuilder : StatementContainer {
-    readonly ClassLike parent;
-    readonly string name;
-    readonly bool isStatic;
-    readonly bool hasBody;
-    readonly ISequence<ISequence<Rune>> overridingPath;
-    readonly List<DAST.Type> typeArgs;
-    readonly List<DAST.Formal> params_;
-    readonly List<DAST.Type> outTypes;
-    readonly List<ISequence<Rune>> outVars;
-    readonly List<object> body = new();
-
-    public MethodBuilder(
-      ClassLike parent,
-      bool isStatic, bool hasBody,
-      ISequence<ISequence<Rune>> overridingPath,
-      string name,
-      List<DAST.Type> typeArgs,
-      List<DAST.Formal> params_,
-      List<DAST.Type> outTypes, List<ISequence<Rune>> outVars
-    ) {
-      this.parent = parent;
-      this.isStatic = isStatic;
-      this.hasBody = hasBody;
-      this.overridingPath = overridingPath;
-      this.name = name;
-      this.typeArgs = typeArgs;
-      this.params_ = params_;
-      this.outTypes = outTypes;
-      this.outVars = outVars;
-    }
-
-    public List<object> ForkList() {
-      var ret = new List<object>();
-      body.Add(ret);
-      return ret;
-    }
-
-    public void AddStatement(DAST.Statement item) {
-      body.Add(item);
-    }
-
-    public void AddBuildable(BuildableStatement item) {
-      body.Add(item);
-    }
-
-    public DAST.Method Build() {
-      List<DAST.Statement> builtStatements = new();
-      StatementContainer.RecursivelyBuild(body, builtStatements);
-
-      return (DAST.Method)DAST.Method.create(
-        isStatic,
-        hasBody,
-        overridingPath != null ? Optional<ISequence<ISequence<Rune>>>.create_Some(overridingPath) : Optional<ISequence<ISequence<Rune>>>.create_None(),
-        Sequence<Rune>.UnicodeFromString(this.name),
-        Sequence<DAST.Type>.FromArray(typeArgs.ToArray()),
-        Sequence<DAST.Formal>.FromArray(params_.ToArray()),
-        Sequence<DAST.Statement>.FromArray(builtStatements.ToArray()),
-        Sequence<DAST.Type>.FromArray(outTypes.ToArray()),
-        outVars != null ? Optional<ISequence<ISequence<Rune>>>.create_Some(Sequence<ISequence<Rune>>.FromArray(outVars.ToArray())) : Optional<ISequence<ISequence<Rune>>>.create_None()
-      );
-    }
-  }
-
-  interface StatementContainer {
-    void AddStatement(DAST.Statement item);
-
-    void AddBuildable(BuildableStatement item);
-
-    List<object> ForkList();
-
-    public StatementContainer Fork() {
-      return new ForkedStatementContainer(ForkList());
-    }
-
-    protected static void RecursivelyBuild(List<object> body, List<DAST.Statement> builtStatements) {
-      foreach (var maybeBuilt in body) {
-        if (maybeBuilt is DAST.Statement built) {
-          builtStatements.Add(built);
-        } else if (maybeBuilt is BuildableStatement buildable) {
-          builtStatements.Add(buildable.Build());
-        } else if (maybeBuilt is List<object> rec) {
-          RecursivelyBuild(rec, builtStatements);
-        } else {
-          throw new InvalidOperationException("Unknown buildable type");
-        }
-      }
-    }
-
-    public void Print(DAST.Expression expr) {
-      AddStatement((DAST.Statement)DAST.Statement.create_Print(expr));
-    }
-
-    public AssignBuilder Assign() {
-      var ret = new AssignBuilder(false, null);
-      AddBuildable(ret);
-      return ret;
-    }
-
-    public AssignBuilder DeclareAndAssign(DAST.Type type) {
-      var ret = new AssignBuilder(true, type);
-      AddBuildable(ret);
-      return ret;
-    }
-
-    public IfElseBuilder IfElse() {
-      var ret = new IfElseBuilder();
-      AddBuildable(ret);
-      return ret;
-    }
-
-    public WhileBuilder While() {
-      var ret = new WhileBuilder();
-      AddBuildable(ret);
-      return ret;
-    }
-
-    public CallStmtBuilder Call() {
-      var ret = new CallStmtBuilder();
-      AddBuildable(ret);
-      return ret;
-    }
-
-    public ReturnBuilder Return() {
-      var ret = new ReturnBuilder();
-      AddBuildable(ret);
-      return ret;
-    }
-  }
-
-  interface BuildableStatement {
-    DAST.Statement Build();
-  }
-
-  class ForkedStatementContainer : StatementContainer {
-    readonly List<object> list;
-
-    public ForkedStatementContainer(List<object> list) {
-      this.list = list;
-    }
-
-    public void AddStatement(DAST.Statement item) {
-      list.Add(item);
-    }
-
-    public void AddBuildable(BuildableStatement item) {
-      list.Add(item);
-    }
-
-    public List<object> ForkList() {
-      return new List<object>();
-    }
-  }
-
-  class AssignBuilder : ExprContainer, BuildableStatement {
-    readonly bool isDeclare;
-    readonly DAST.Type type;
-    string name = null;
-    public object value;
-
-    public AssignBuilder(bool isDeclare, DAST.Type type) {
-      this.isDeclare = isDeclare;
-      this.type = type;
-    }
-
-    public void SetName(string name) {
-      if (this.name != null && this.name != name) {
-        throw new InvalidOperationException("Cannot change name of variable in assignment: " + this.name + " -> " + name);
-      } else {
-        this.name = name;
-      }
-    }
-
-    public void AddExpr(DAST.Expression value) {
-      if (this.value != null) {
-        throw new InvalidOperationException();
-      } else {
-        this.value = value;
-      }
-    }
-
-    public void AddBuildable(BuildableExpr value) {
-      if (this.value != null) {
-        throw new InvalidOperationException();
-      } else {
-        this.value = value;
-      }
-    }
-
-    public DAST.Statement Build() {
-      if (isDeclare) {
-        if (this.value == null) {
-          return (DAST.Statement)DAST.Statement.create_DeclareVar(Sequence<Rune>.UnicodeFromString(name), type, DAST.Optional<DAST._IExpression>.create_None());
-        } else {
-          var builtValue = new List<DAST.Expression>();
-          ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
-          return (DAST.Statement)DAST.Statement.create_DeclareVar(Sequence<Rune>.UnicodeFromString(name), type, DAST.Optional<DAST._IExpression>.create_Some(builtValue[0]));
-        }
-      } else {
-        if (this.value == null) {
-          throw new InvalidOperationException("Cannot assign null value to variable: " + name);
-        } else {
-          var builtValue = new List<DAST.Expression>();
-          ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
-          return (DAST.Statement)DAST.Statement.create_Assign(Sequence<Rune>.UnicodeFromString(name), builtValue[0]);
-        }
-      }
-    }
-  }
-
-  class IfElseBuilder : ExprContainer, StatementContainer, BuildableStatement {
-    object condition = null;
-    readonly List<object> ifBody = new();
-    readonly List<object> elseBody = new();
-
-    public IfElseBuilder() { }
-
-    public void AddExpr(DAST.Expression value) {
-      if (condition != null) {
-        throw new InvalidOperationException();
-      } else {
-        condition = value;
-      }
-    }
-
-    public void AddBuildable(BuildableExpr value) {
-      if (condition != null) {
-        throw new InvalidOperationException();
-      } else {
-        condition = value;
-      }
-    }
-
-    public void AddStatement(DAST.Statement item) {
-      ifBody.Add(item);
-    }
-
-    public void AddBuildable(BuildableStatement item) {
-      ifBody.Add(item);
-    }
-
-    public List<object> ForkList() {
-      var ret = new List<object>();
-      this.ifBody.Add(ret);
-      return ret;
-    }
-
-    public void AddElseStatement(DAST.Statement item) {
-      elseBody.Add(item);
-    }
-
-    public void AddElseBuildable(BuildableStatement item) {
-      elseBody.Add(item);
-    }
-
-    public List<object> ElseForkList() {
-      var ret = new List<object>();
-      this.elseBody.Add(ret);
-      return ret;
-    }
-
-    public ElseBuilder Else() {
-      return new ElseBuilder(this);
-    }
-
-    public DAST.Statement Build() {
-      List<DAST.Expression> builtCondition = new();
-      ExprContainer.RecursivelyBuild(new List<object> { condition }, builtCondition);
-
-      List<DAST.Statement> builtIfStatements = new();
-      StatementContainer.RecursivelyBuild(ifBody, builtIfStatements);
-
-      List<DAST.Statement> builtElseStatements = new();
-      StatementContainer.RecursivelyBuild(elseBody, builtElseStatements);
-
-      return (DAST.Statement)DAST.Statement.create_If(
-        builtCondition[0],
-        Sequence<DAST.Statement>.FromArray(builtIfStatements.ToArray()),
-        Sequence<DAST.Statement>.FromArray(builtElseStatements.ToArray())
-      );
-    }
-  }
-
-  class ElseBuilder : StatementContainer {
-    public readonly IfElseBuilder parent;
-
-    public ElseBuilder(IfElseBuilder parent) {
-      this.parent = parent;
-    }
-
-    public List<object> ForkList() {
-      return parent.ElseForkList();
-    }
-
-    public void AddStatement(DAST.Statement item) {
-      parent.AddElseStatement(item);
-    }
-
-    public void AddBuildable(BuildableStatement item) {
-      parent.AddElseBuildable(item);
-    }
-  }
-
-  class WhileBuilder : ExprContainer, StatementContainer, BuildableStatement {
-    object condition = null;
-    readonly List<object> body = new();
-
-    public WhileBuilder() { }
-
-    public void AddExpr(DAST.Expression value) {
-      if (condition != null) {
-        throw new InvalidOperationException();
-      } else {
-        condition = value;
-      }
-    }
-
-    public void AddBuildable(BuildableExpr value) {
-      if (condition != null) {
-        throw new InvalidOperationException();
-      } else {
-        condition = value;
-      }
-    }
-
-    public void AddStatement(DAST.Statement item) {
-      body.Add(item);
-    }
-
-    public void AddBuildable(BuildableStatement item) {
-      body.Add(item);
-    }
-
-    public List<object> ForkList() {
-      var ret = new List<object>();
-      this.body.Add(ret);
-      return ret;
-    }
-
-    public DAST.Statement Build() {
-      List<DAST.Expression> builtCondition = new();
-      ExprContainer.RecursivelyBuild(new List<object> { condition }, builtCondition);
-
-      List<DAST.Statement> builtStatements = new();
-      StatementContainer.RecursivelyBuild(body, builtStatements);
-
-      return (DAST.Statement)DAST.Statement.create_While(
-        builtCondition[0],
-        Sequence<DAST.Statement>.FromArray(builtStatements.ToArray())
-      );
-    }
-  }
-
-  class CallStmtBuilder : ExprContainer, BuildableStatement {
-    object on = null;
-    string name = null;
-    List<DAST.Type> typeArgs = null;
-    readonly List<object> args = new();
-    List<ISequence<Rune>> outs = null;
-
-    public CallStmtBuilder() { }
-
-    public void SetName(string name) {
-      if (this.name != null) {
-        throw new InvalidOperationException();
-      } else {
-        this.name = name;
-      }
-    }
-
-    public void SetTypeArgs(List<DAST.Type> typeArgs) {
-      if (this.typeArgs != null) {
-        throw new InvalidOperationException();
-      } else {
-        this.typeArgs = typeArgs;
-      }
-    }
-
-    public void AddExpr(DAST.Expression value) {
-      if (on == null) {
-        on = value;
-      } else {
-        args.Add(value);
-      }
-    }
-
-    public void AddBuildable(BuildableExpr value) {
-      if (on == null) {
-        on = value;
-      } else {
-        args.Add(value);
-      }
-    }
-
-    public void SetOuts(List<ISequence<Rune>> outs) {
-      if (this.outs != null) {
-        throw new InvalidOperationException();
-      } else {
-        this.outs = outs;
-      }
-    }
-
-    public DAST.Statement Build() {
-      List<DAST.Expression> builtOn = new();
-      ExprContainer.RecursivelyBuild(new List<object> { on }, builtOn);
-
-      List<DAST.Expression> builtArgs = new();
-      ExprContainer.RecursivelyBuild(args, builtArgs);
-
-      return (DAST.Statement)DAST.Statement.create_Call(
-        builtOn[0],
-        Sequence<Rune>.UnicodeFromString(name),
-        Sequence<DAST.Type>.FromArray(typeArgs.ToArray()),
-        Sequence<DAST.Expression>.FromArray(builtArgs.ToArray()),
-        outs == null ? DAST.Optional<ISequence<ISequence<Rune>>>.create_None() : DAST.Optional<ISequence<ISequence<Rune>>>.create_Some(Sequence<ISequence<Rune>>.FromArray(outs.ToArray()))
-      );
-    }
-  }
-
-  class ReturnBuilder : ExprContainer, BuildableStatement {
-    object value = null;
-
-    public ReturnBuilder() { }
-
-    public void AddExpr(DAST.Expression value) {
-      if (this.value != null) {
-        throw new InvalidOperationException();
-      } else {
-        this.value = value;
-      }
-    }
-
-    public void AddBuildable(BuildableExpr value) {
-      if (this.value != null) {
-        throw new InvalidOperationException();
-      } else {
-        this.value = value;
-      }
-    }
-
-    public DAST.Statement Build() {
-      var builtValue = new List<DAST.Expression>();
-      ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
-
-      return (DAST.Statement)DAST.Statement.create_Return(builtValue[0]);
-    }
-  }
-
-  class StatementBuffer : StatementContainer {
-    readonly List<object> statements = new();
-
-    public void AddStatement(DAST.Statement item) {
-      statements.Add(item);
-    }
-
-    public void AddBuildable(BuildableStatement item) {
-      statements.Add(item);
-    }
-
-    public List<object> ForkList() {
-      var ret = new List<object>();
-      statements.Add(ret);
-      return ret;
-    }
-
-    public List<DAST.Statement> PopAll() {
-      var builtResult = new List<DAST.Statement>();
-      StatementContainer.RecursivelyBuild(statements, builtResult);
-
-      return builtResult;
-    }
-  }
-
-  class ExprBuffer : ExprContainer {
-    Stack<object> exprs = new();
-    public readonly object parent;
-
-    public ExprBuffer(object returnTo) {
-      this.parent = returnTo;
-    }
-
-    public void AddExpr(DAST.Expression item) {
-      exprs.Push(item);
-    }
-
-    public void AddBuildable(BuildableExpr item) {
-      exprs.Push(item);
-    }
-
-    public List<DAST.Expression> PopN(int n) {
-      if (exprs.Count < n) {
-        throw new InvalidOperationException();
-      } else {
-        var result = new List<object>();
-        for (int i = 0; i < n; i++) {
-          result.Insert(0, exprs.Pop());
-        }
-
-        var builtResult = new List<DAST.Expression>();
-        ExprContainer.RecursivelyBuild(result, builtResult);
-
-        return builtResult;
-      }
-    }
-
-    public List<DAST.Expression> PopAll() {
-      return PopN(exprs.Count);
-    }
-
-    public DAST.Expression Finish() {
-      if (exprs.Count != 1) {
-        throw new InvalidOperationException("Expected exactly one expression in buffer, got " + exprs.Comma(e => e.ToString()));
-      } else {
-        return PopN(1)[0];
-      }
-    }
-  }
-
-  interface ExprContainer {
-    void AddExpr(DAST.Expression item);
-
-    void AddBuildable(BuildableExpr item);
-
-    BinOpBuilder BinOp(string op) {
-      var ret = new BinOpBuilder(op);
-      AddBuildable(ret);
-      return ret;
-    }
-
-    CallExprBuilder Call() {
-      var ret = new CallExprBuilder();
-      AddBuildable(ret);
-      return ret;
-    }
-
-    LambdaExprBuilder Lambda(List<DAST.Formal> formals, DAST.Type retType) {
-      var ret = new LambdaExprBuilder(formals, retType);
-      AddBuildable(ret);
-      return ret;
-    }
-
-    IIFEExprBuilder IIFE(string name, DAST.Type tpe) {
-      var ret = new IIFEExprBuilder(name, tpe);
-      AddBuildable(ret);
-      return ret;
-    }
-
-    SubsetUpgradeBuilder SubsetUpgrade(DAST.Type tpe) {
-      var ret = new SubsetUpgradeBuilder(tpe);
-      AddBuildable(ret);
-      return ret;
-    }
-
-    SubsetDowngradeBuilder SubsetDowngrade() {
-      var ret = new SubsetDowngradeBuilder();
-      AddBuildable(ret);
-      return ret;
-    }
-
-    protected static void RecursivelyBuild(List<object> body, List<DAST.Expression> builtExprs) {
-      foreach (var maybeBuilt in body) {
-        if (maybeBuilt is DAST.Expression built) {
-          builtExprs.Add(built);
-        } else if (maybeBuilt is BuildableExpr buildable) {
-          builtExprs.Add(buildable.Build());
-        } else {
-          throw new InvalidOperationException("Unknown buildable type: " + maybeBuilt.GetType());
-        }
-      }
-    }
-  }
-
-  interface BuildableExpr {
-    DAST.Expression Build();
-  }
-
-  class BinOpBuilder : ExprContainer, BuildableExpr {
-    readonly string op;
-    readonly List<object> operands = new();
-
-    public BinOpBuilder(string op) {
-      this.op = op;
-    }
-
-    public void AddExpr(DAST.Expression item) {
-      operands.Add(item);
-    }
-
-    public void AddBuildable(BuildableExpr item) {
-      operands.Add(item);
-    }
-
-    public DAST.Expression Build() {
-      if (operands.Count != 2) {
-        throw new InvalidOperationException("Expected exactly two operands, got " + operands.Comma(o => o.ToString()));
-      }
-
-      var builtOperands = new List<DAST.Expression>();
-      ExprContainer.RecursivelyBuild(operands, builtOperands);
-      return (DAST.Expression)DAST.Expression.create_BinOp(Sequence<Rune>.UnicodeFromString(op), builtOperands[0], builtOperands[1]);
-    }
-  }
-
-  class CallExprBuilder : ExprContainer, BuildableExpr {
-    object on = null;
-    string name = null;
-    List<DAST.Type> typeArgs = null;
-    readonly List<object> args = new();
-    List<ISequence<Rune>> outs = null;
-
-    public CallExprBuilder() { }
-
-    public void SetName(string name) {
-      if (this.name != null) {
-        throw new InvalidOperationException();
-      } else {
-        this.name = name;
-      }
-    }
-
-    public void SetTypeArgs(List<DAST.Type> typeArgs) {
-      if (this.typeArgs != null) {
-        throw new InvalidOperationException();
-      } else {
-        this.typeArgs = typeArgs;
-      }
-    }
-
-    public void AddExpr(DAST.Expression value) {
-      if (on == null) {
-        on = value;
-      } else {
-        args.Add(value);
-      }
-    }
-
-    public void AddBuildable(BuildableExpr value) {
-      if (on == null) {
-        on = value;
-      } else {
-        args.Add(value);
-      }
-    }
-
-    public void SetOuts(List<ISequence<Rune>> outs) {
-      if (this.outs != null) {
-        throw new InvalidOperationException();
-      } else {
-        this.outs = outs;
-      }
-    }
-
-    public DAST.Expression Build() {
-      var builtOn = new List<DAST.Expression>();
-      ExprContainer.RecursivelyBuild(new List<object> { on }, builtOn);
-
-      var builtArgs = new List<DAST.Expression>();
-      ExprContainer.RecursivelyBuild(args, builtArgs);
-
-      return (DAST.Expression)DAST.Expression.create_Call(
-        builtOn[0],
-        Sequence<Rune>.UnicodeFromString(name),
-        Sequence<DAST.Type>.FromArray(typeArgs.ToArray()),
-        Sequence<DAST.Expression>.FromArray(builtArgs.ToArray())
-      );
-    }
-  }
-
-}
-
-class LambdaExprBuilder : StatementContainer, BuildableExpr {
-  readonly List<DAST.Formal> formals;
-  readonly DAST.Type retType;
-  readonly List<object> body = new();
-
-  public LambdaExprBuilder(List<DAST.Formal> formals, DAST.Type retType) {
-    this.formals = formals;
-    this.retType = retType;
-  }
-
-  public void AddStatement(DAST.Statement item) {
-    body.Add(item);
-  }
-
-  public void AddBuildable(BuildableStatement item) {
-    body.Add(item);
-  }
-
-  public List<object> ForkList() {
-    var ret = new List<object>();
-    body.Add(ret);
-    return ret;
-  }
-
-  public DAST.Expression Build() {
-    var builtBody = new List<DAST.Statement>();
-    StatementContainer.RecursivelyBuild(body, builtBody);
-
-    return (DAST.Expression)DAST.Expression.create_Lambda(
-      Sequence<DAST.Formal>.FromArray(formals.ToArray()),
-      retType,
-      Sequence<DAST.Statement>.FromArray(builtBody.ToArray())
-    );
-  }
-}
-
-class IIFEExprBuilder : ExprContainer, BuildableExpr {
-  readonly string name;
-  readonly DAST.Type tpe;
-
-  object body = null;
-  public object value = null;
-
-  public IIFEExprBuilder(string name, DAST.Type tpe) {
-    this.name = name;
-    this.tpe = tpe;
-  }
-
-  public IIFEExprRhs RhsBuilder() {
-    return new IIFEExprRhs(this);
-  }
-
-  public void AddExpr(DAST.Expression item) {
-    if (body != null) {
-      throw new InvalidOperationException();
-    } else {
-      body = item;
-    }
-  }
-
-  public void AddBuildable(BuildableExpr item) {
-    if (body != null) {
-      throw new InvalidOperationException();
-    } else {
-      body = item;
-    }
-  }
-
-  public DAST.Expression Build() {
-    var builtBody = new List<DAST.Expression>();
-    ExprContainer.RecursivelyBuild(new List<object> { body }, builtBody);
-
-    var builtValue = new List<DAST.Expression>();
-    ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
-
-    return (DAST.Expression)DAST.Expression.create_IIFE(
-      Sequence<Rune>.UnicodeFromString(name),
-      tpe,
-      builtValue[0],
-      builtBody[0]
-    );
-  }
-}
-
-class IIFEExprRhs : ExprContainer {
-  readonly IIFEExprBuilder parent;
-
-  public IIFEExprRhs(IIFEExprBuilder parent) {
-    this.parent = parent;
-  }
-
-  public void AddExpr(DAST.Expression item) {
-    if (parent.value != null) {
-      throw new InvalidOperationException();
-    } else {
-      parent.value = item;
-    }
-  }
-
-  public void AddBuildable(BuildableExpr item) {
-    if (parent.value != null) {
-      throw new InvalidOperationException();
-    } else {
-      parent.value = item;
-    }
-  }
-}
-
-class SubsetUpgradeBuilder : ExprContainer, BuildableExpr {
-  readonly DAST.Type tpe;
-  object value = null;
-
-  public SubsetUpgradeBuilder(DAST.Type tpe) {
-    this.tpe = tpe;
-  }
-
-  public void AddExpr(DAST.Expression item) {
-    if (value != null) {
-      throw new InvalidOperationException();
-    } else {
-      value = item;
-    }
-  }
-
-  public void AddBuildable(BuildableExpr item) {
-    if (value != null) {
-      throw new InvalidOperationException();
-    } else {
-      value = item;
-    }
-  }
-
-  public DAST.Expression Build() {
-    var builtValue = new List<DAST.Expression>();
-    ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
-
-    return (DAST.Expression)DAST.Expression.create_SubsetUpgrade(
-      builtValue[0],
-      tpe
-    );
-  }
-}
-
-class SubsetDowngradeBuilder : ExprContainer, BuildableExpr {
-  object value = null;
-
-  public void AddExpr(DAST.Expression item) {
-    if (value != null) {
-      throw new InvalidOperationException();
-    } else {
-      value = item;
-    }
-  }
-
-  public void AddBuildable(BuildableExpr item) {
-    if (value != null) {
-      throw new InvalidOperationException();
-    } else {
-      value = item;
-    }
-  }
-
-  public DAST.Expression Build() {
-    var builtValue = new List<DAST.Expression>();
-    ExprContainer.RecursivelyBuild(new List<object> { value }, builtValue);
-
-    return (DAST.Expression)DAST.Expression.create_SubsetDowngrade(
-      builtValue[0]
-    );
-  }
-}
diff --git a/Source/DafnyCore/Compilers/Dafny/Compiler-dafny.cs b/Source/DafnyCore/Compilers/Dafny/Compiler-dafny.cs
deleted file mode 100644
index 2a7df063b9f..00000000000
--- a/Source/DafnyCore/Compilers/Dafny/Compiler-dafny.cs
+++ /dev/null
@@ -1,1599 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Dafny;
-using JetBrains.Annotations;
-using DAST;
-using System.Numerics;
-using Microsoft.BaseTypes;
-using System.Linq;
-using System.Diagnostics.Contracts;
-
-namespace Microsoft.Dafny.Compilers {
-
-  class BuilderSyntaxTree<T> : ConcreteSyntaxTree {
-    public readonly T Builder;
-
-    public BuilderSyntaxTree(T builder) {
-      Builder = builder;
-    }
-
-    public override ConcreteSyntaxTree Fork(int relativeIndent = 0) {
-      if (Builder is StatementContainer statementContainer) {
-        return new BuilderSyntaxTree<StatementContainer>(statementContainer.Fork());
-      } else {
-        throw new InvalidOperationException("Cannot fork builder of type " + Builder.GetType());
-      }
-    }
-
-    public override ConcreteSyntaxTree ForkInParens() {
-      // TODO(shadaj): perhaps should check if we are an expr container
-      return new BuilderSyntaxTree<T>(Builder);
-    }
-  }
-
-  class DafnyCompiler : SinglePassCompiler {
-    ProgramBuilder items;
-    public object currentBuilder;
-
-    public void Start() {
-      if (items != null) {
-        throw new InvalidOperationException("");
-      }
-
-      items = new ProgramBuilder();
-      this.currentBuilder = items;
-    }
-
-    public List<Module> Build() {
-      var res = items.Finish();
-      items = null;
-      this.currentBuilder = null;
-      return res;
-    }
-
-    public DafnyCompiler(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
-      if (Options?.CoverageLegendFile != null) {
-        Imports.Add("DafnyProfiling");
-      }
-    }
-
-    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
-      Feature.Ordinals,
-      Feature.Iterators,
-      Feature.Multisets,
-      Feature.MapComprehensions,
-      Feature.LetSuchThatExpressions,
-      Feature.MethodSynthesis,
-      Feature.ExternalClasses,
-      Feature.NewObject,
-      Feature.NonSequentializableForallStatements,
-      Feature.MapItems,
-      Feature.RunAllTests,
-      Feature.IntBoundedPool,
-      Feature.ExactBoundedPool,
-      Feature.SequenceDisplaysOfCharacters,
-      Feature.TypeTests,
-      Feature.SubsetTypeTests,
-      Feature.Quantifiers,
-      Feature.BitvectorRotateFunctions,
-      Feature.ForLoops,
-      Feature.ContinueStatements,
-      Feature.AssignSuchThatWithNonFiniteBounds,
-      Feature.SequenceUpdateExpressions,
-      Feature.SequenceConstructionsWithNonLambdaInitializers,
-      Feature.ExternalConstructors,
-      Feature.SubtypeConstraintsInQuantifiers,
-      Feature.TuplesWiderThan20,
-    };
-
-    private readonly List<string> Imports = new() { DafnyDefaultModule };
-
-    private const string DafnyRuntimeModule = "_dafny";
-    private const string DafnyDefaultModule = "module_";
-
-    protected override string AssignmentSymbol { get => null; }
-
-    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
-    }
-
-    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
-      throw new NotImplementedException();
-    }
-
-    protected override ConcreteSyntaxTree CreateModule(string moduleName, bool isDefault, bool isExtern,
-        string libraryName, ConcreteSyntaxTree wr) {
-      if (currentBuilder is ModuleContainer moduleBuilder) {
-        currentBuilder = moduleBuilder.Module(moduleName);
-      } else {
-        throw new NotImplementedException();
-      }
-
-      return wr;
-    }
-
-    protected override void FinishModule() {
-      if (currentBuilder is ModuleBuilder builder) {
-        currentBuilder = builder.Finish();
-      } else {
-        throw new NotImplementedException();
-      }
-    }
-
-    protected override string GetHelperModuleName() => DafnyRuntimeModule;
-
-    private static string MangleName(string name) {
-      return name;
-    }
-
-    protected override ConcreteSyntaxTree EmitCoercionIfNecessary(Type from, Type to, IToken tok, ConcreteSyntaxTree wr) {
-      if (from.AsSubsetType == null && to.AsSubsetType != null) {
-        if (wr is BuilderSyntaxTree<ExprContainer> stmt) {
-          return new BuilderSyntaxTree<ExprContainer>(stmt.Builder.SubsetUpgrade(GenType(to)));
-        } else {
-          return base.EmitCoercionIfNecessary(from, to, tok, wr);
-        }
-      } else if (from.AsSubsetType != null && to.AsSubsetType == null) {
-        if (wr is BuilderSyntaxTree<ExprContainer> stmt) {
-          return new BuilderSyntaxTree<ExprContainer>(stmt.Builder.SubsetDowngrade());
-        } else {
-          return base.EmitCoercionIfNecessary(from, to, tok, wr);
-        }
-      } else {
-        return base.EmitCoercionIfNecessary(from, to, tok, wr);
-      }
-    }
-
-    protected override IClassWriter CreateClass(string moduleName, string name, bool isExtern, string fullPrintName,
-      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type> superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      if (currentBuilder is ClassContainer builder) {
-        return new ClassWriter(this, builder.Class(name, superClasses.Select(t => GenType(t)).ToList()));
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters,
-      TraitDecl trait, List<Type> superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      if (currentBuilder is TraitContainer builder) {
-        List<DAST.Type> typeParams = new();
-        foreach (var tp in trait.TypeArgs) {
-          typeParams.Add((DAST.Type)DAST.Type.create_TypeArg(Sequence<Rune>.UnicodeFromString(IdProtect(tp.GetCompileName(Options)))));
-        }
-
-        return new ClassWriter(this, builder.Trait(name, typeParams));
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.Iterators);
-    }
-
-    protected override IClassWriter DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
-      if (currentBuilder is DatatypeContainer builder) {
-        List<DAST.Type> typeParams = new();
-        foreach (var tp in dt.TypeArgs) {
-          typeParams.Add((DAST.Type)DAST.Type.create_TypeArg(Sequence<Rune>.UnicodeFromString(IdProtect(tp.GetCompileName(Options)))));
-        }
-
-        List<DAST.DatatypeCtor> ctors = new();
-        foreach (var ctor in dt.Ctors) {
-          List<DAST.Formal> args = new();
-          foreach (var arg in ctor.Formals) {
-            if (!arg.IsGhost) {
-              args.Add((DAST.Formal)DAST.Formal.create_Formal(Sequence<Rune>.UnicodeFromString(arg.CompileName), GenType(arg.Type)));
-            }
-          }
-          ctors.Add((DAST.DatatypeCtor)DAST.DatatypeCtor.create_DatatypeCtor(Sequence<Rune>.UnicodeFromString(ctor.GetCompileName(Options)), Sequence<DAST.Formal>.FromArray(args.ToArray()), ctor.Formals.Count > 0));
-        }
-
-        return new ClassWriter(this, builder.Datatype(
-          dt.GetCompileName(Options),
-          Sequence<Rune>.UnicodeFromString(dt.EnclosingModuleDefinition.GetCompileName(Options)),
-          typeParams,
-          ctors,
-          dt is CoDatatypeDecl
-        ));
-      } else {
-        throw new InvalidOperationException("Cannot declare datatype outside of a module: " + currentBuilder);
-      }
-    }
-
-    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
-      if (currentBuilder is NewtypeContainer builder) {
-        List<DAST.Statement> witnessStmts = new();
-        DAST.Expression witness = null;
-        if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-          var buf = new ExprBuffer(null);
-          var statementBuf = new StatementBuffer();
-          EmitExpr(nt.Witness, false, new BuilderSyntaxTree<ExprContainer>(buf), new BuilderSyntaxTree<StatementContainer>(statementBuf));
-          witness = buf.Finish();
-          witnessStmts = statementBuf.PopAll();
-        }
-
-        return new ClassWriter(this, builder.Newtype(nt.GetCompileName(Options), new(), GenType(nt.BaseType), witnessStmts, witness));
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    private DAST.Type GenType(Type typ) {
-      // TODO(shadaj): this is leaking Rust types into the AST, but we do need native types
-      var xType = DatatypeWrapperEraser.SimplifyType(Options, typ, true);
-
-      if (xType is BoolType) {
-        return (DAST.Type)DAST.Type.create_Primitive(DAST.Primitive.create_Bool());
-      } else if (xType is IntType) {
-        return (DAST.Type)DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString("i64"));
-      } else if (xType is RealType) {
-        return (DAST.Type)DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString("f32"));
-      } else if (xType.IsStringType) {
-        return (DAST.Type)DAST.Type.create_Primitive(DAST.Primitive.create_String());
-      } else if (xType.IsCharType) {
-        return (DAST.Type)DAST.Type.create_Primitive(DAST.Primitive.create_Char());
-      } else if (xType is UserDefinedType udt) {
-        if (udt.ResolvedClass is TypeParameter tp) {
-          if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(tp, out var instantiatedTypeParameter)) {
-            return GenType(instantiatedTypeParameter);
-          }
-        }
-
-        return FullTypeNameAST(udt, null);
-      } else if (AsNativeType(typ) != null) {
-        return (DAST.Type)(AsNativeType(typ).Sel switch {
-          NativeType.Selection.Byte => DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString("u8")),
-          NativeType.Selection.SByte => DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString("i8")),
-          NativeType.Selection.Short => DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString("i16")),
-          NativeType.Selection.UShort => DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString("u16")),
-          NativeType.Selection.Int => DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString("i32")),
-          NativeType.Selection.UInt => DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString("u32")),
-          NativeType.Selection.Long => DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString("i64")),
-          NativeType.Selection.ULong => DAST.Type.create_Passthrough(Sequence<Rune>.UnicodeFromString("u64")),
-          _ => throw new InvalidOperationException(),
-        });
-      } else if (xType is SeqType seq) {
-        var argType = seq.Arg;
-        return (DAST.Type)DAST.Type.create_Seq(GenType(argType));
-      } else if (xType is SetType set) {
-        var argType = set.Arg;
-        return (DAST.Type)DAST.Type.create_Set(GenType(argType));
-      } else if (xType is MultiSetType multiSet) {
-        var argType = multiSet.Arg;
-        return (DAST.Type)DAST.Type.create_Multiset(GenType(argType));
-      } else if (xType is MapType map) {
-        var keyType = map.Domain;
-        var valueType = map.Range;
-        return (DAST.Type)DAST.Type.create_Map(GenType(keyType), GenType(valueType));
-      } else {
-        throw new NotImplementedException("Type name for " + xType + " (" + typ.GetType() + ")");
-      }
-    }
-
-    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
-      if (currentBuilder is NewtypeContainer builder) {
-        List<DAST.Statement> witnessStmts = new();
-        DAST.Expression witness = null;
-        if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-          var statementBuf = new StatementBuffer();
-          var buf = new ExprBuffer(null);
-          EmitExpr(sst.Witness, false, new BuilderSyntaxTree<ExprContainer>(buf), new BuilderSyntaxTree<StatementContainer>(statementBuf));
-          witness = buf.Finish();
-          witnessStmts = statementBuf.PopAll();
-        }
-
-        List<DAST.Type> typeParams = new();
-        foreach (var tp in sst.TypeArgs) {
-          typeParams.Add((DAST.Type)DAST.Type.create_TypeArg(Sequence<Rune>.UnicodeFromString(tp.Name)));
-        }
-
-        builder.Newtype(sst.GetCompileName(Options), typeParams, GenType(sst.Rhs), witnessStmts, witness).Finish();
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
-      name = null;
-      literalSuffix = null;
-      needsCastAfterArithmetic = false;
-    }
-
-    private class ClassWriter : IClassWriter {
-      private readonly DafnyCompiler compiler;
-      private readonly ClassLike builder;
-      private readonly List<MethodBuilder> methods = new();
-
-      public ClassWriter(DafnyCompiler compiler, ClassLike builder) {
-        this.compiler = compiler;
-        this.builder = builder;
-      }
-
-      public ConcreteSyntaxTree CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody,
-        bool forBodyInheritance, bool lookasideBody) {
-        List<DAST.Type> astTypeArgs = new();
-        foreach (var typeArg in typeArgs) {
-          astTypeArgs.Add((DAST.Type)DAST.Type.create_TypeArg(Sequence<Rune>.UnicodeFromString(compiler.IdProtect(typeArg.Formal.GetCompileName(compiler.Options)))));
-        }
-
-        List<DAST.Formal> params_ = new();
-        foreach (var param in m.Ins) {
-          if (param is not ImplicitFormal && !param.IsGhost) {
-            params_.Add((DAST.Formal)DAST.Formal.create_Formal(Sequence<Rune>.UnicodeFromString(compiler.IdProtect(param.CompileName)), compiler.GenType(param.Type)));
-          }
-        }
-
-        List<ISequence<Rune>> outVars = new();
-        List<DAST.Type> outTypes = new();
-        foreach (var outVar in m.Outs) {
-          if (!outVar.IsGhost) {
-            outVars.Add(Sequence<Rune>.UnicodeFromString(compiler.IdProtect(outVar.CompileName)));
-            outTypes.Add(compiler.GenType(outVar.Type));
-          }
-        }
-
-        var overridingTrait = m.OverriddenMethod?.EnclosingClass;
-        var builder = this.builder.Method(
-          m.IsStatic, createBody,
-          overridingTrait != null ? compiler.PathFromTopLevel(overridingTrait) : null,
-          m.GetCompileName(compiler.Options),
-          astTypeArgs, params_,
-          outTypes, outVars
-        );
-        methods.Add(builder);
-
-        if (createBody) {
-          return new BuilderSyntaxTree<StatementContainer>(builder);
-        } else {
-          // TODO(shadaj): actually create a trait
-          return null;
-        }
-      }
-
-      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        throw new UnsupportedFeatureException(Token.NoToken, Feature.MethodSynthesis);
-      }
-
-      public ConcreteSyntaxTree CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs,
-          List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member,
-          bool forBodyInheritance, bool lookasideBody) {
-        List<DAST.Type> astTypeArgs = new();
-        foreach (var typeArg in typeArgs) {
-          astTypeArgs.Add((DAST.Type)DAST.Type.create_TypeArg(Sequence<Rune>.UnicodeFromString(compiler.IdProtect(typeArg.Formal.GetCompileName(compiler.Options)))));
-        }
-
-        List<DAST.Formal> params_ = new();
-        foreach (var param in formals) {
-          if (!param.IsGhost) {
-            params_.Add((DAST.Formal)DAST.Formal.create_Formal(Sequence<Rune>.UnicodeFromString(compiler.IdProtect(param.CompileName)), compiler.GenType(param.Type)));
-          }
-        }
-
-        var overridingTrait = member.OverriddenMember?.EnclosingClass;
-
-        var builder = this.builder.Method(
-          isStatic, createBody,
-          overridingTrait != null ? compiler.PathFromTopLevel(overridingTrait) : null,
-          name,
-          astTypeArgs, params_,
-          new() {
-            compiler.GenType(resultType)
-          }, null
-        );
-        methods.Add(builder);
-
-        if (createBody) {
-          return new BuilderSyntaxTree<StatementContainer>(builder);
-        } else {
-          return null;
-        }
-      }
-
-      public ConcreteSyntaxTree CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IToken tok,
-          bool isStatic, bool isConst, bool createBody, MemberDecl member, bool forBodyInheritance) {
-        throw new NotImplementedException();
-      }
-
-      public ConcreteSyntaxTree CreateGetterSetter(string name, Type resultType, IToken tok,
-          bool createBody, MemberDecl member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
-        throw new NotImplementedException();
-      }
-
-      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type,
-          IToken tok, string rhs, Field field) {
-        DAST.Expression rhsExpr = null;
-        if (rhs != null) {
-          rhsExpr = compiler.bufferedInitializationValue;
-          compiler.bufferedInitializationValue = null;
-
-          if (rhsExpr == null) {
-            throw new InvalidOperationException();
-          }
-        }
-
-        if (rhsExpr != null) {
-          // TODO(shadaj): do something with rhsExpr
-          throw new NotImplementedException();
-        }
-
-        builder.AddField((DAST.Formal)DAST.Formal.create_Formal(
-          Sequence<Rune>.UnicodeFromString(name),
-          compiler.GenType(type)
-        ));
-      }
-
-      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
-        throw new cce.UnreachableException();
-      }
-
-      public ConcreteSyntaxTree ErrorWriter() => null;
-
-      public void Finish() {
-        foreach (var method in methods) {
-          builder.AddMethod(method.Build());
-        }
-
-        compiler.currentBuilder = builder.Finish();
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitReturnExpr(ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
-        return new BuilderSyntaxTree<ExprContainer>(stmtContainer.Builder.Return());
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      type = DatatypeWrapperEraser.SimplifyType(Options, type);
-      return type.ToString();
-    }
-
-    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member = null) {
-      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
-
-      if (xType.IsObjectQ) {
-        return "object";
-      }
-
-      switch (xType) {
-        case BoolType:
-          return "bool";
-        case CharType:
-          return "str";
-        case IntType or BigOrdinalType or BitvectorType:
-          return "int";
-        case RealType:
-          return $"{DafnyRuntimeModule}.BigRational";
-        case UserDefinedType udt: {
-            var s = FullTypeName(udt, member);
-            return TypeName_UDT(s, udt, wr, udt.tok);
-          }
-        case CollectionType:
-          throw new NotImplementedException();
-      }
-
-      throw new cce.UnreachableException();
-    }
-
-    // sometimes, the compiler generates the initial value before the declaration,
-    // so we buffer it here
-    DAST.Expression bufferedInitializationValue = null;
-
-    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IToken tok,
-        bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
-      if (bufferedInitializationValue != null) {
-        throw new InvalidOperationException();
-      } else {
-        type = type.NormalizeExpandKeepConstraints();
-        if (type.AsNewtype != null && type.AsNewtype.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-          var buf = new ExprBuffer(null);
-          EmitExpr(type.AsNewtype.Witness, false, new BuilderSyntaxTree<ExprContainer>(buf), null);
-          bufferedInitializationValue = buf.Finish();
-        } else if (type.AsSubsetType != null && type.AsSubsetType.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-          var buf = new ExprBuffer(null);
-          EmitExpr(type.AsSubsetType.Witness, false, new BuilderSyntaxTree<ExprContainer>(buf), null);
-          bufferedInitializationValue = buf.Finish();
-        } else if (type.AsDatatype != null && type.AsDatatype.Ctors.Count == 1 && type.AsDatatype.Ctors[0].EnclosingDatatype is TupleTypeDecl tupleDecl) {
-          var elems = new List<DAST.Expression>();
-          for (var i = 0; i < tupleDecl.Ctors[0].Formals.Count; i++) {
-            if (!tupleDecl.Ctors[0].Formals[i].IsGhost) {
-              TypeInitializationValue(type.TypeArgs[i], wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-              elems.Add(bufferedInitializationValue);
-              bufferedInitializationValue = null;
-            }
-          }
-
-          bufferedInitializationValue = (DAST.Expression)DAST.Expression.create_Tuple(Sequence<DAST.Expression>.FromArray(elems.ToArray()));
-        } else {
-          bufferedInitializationValue = (DAST.Expression)DAST.Expression.create_InitializationValue(GenType(type));
-        }
-        return ""; // used by DeclareLocal(Out)Var
-      }
-    }
-
-    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance,
-        List<Type> typeArgs, ConcreteSyntaxTree wr, IToken tok, bool omitTypeArguments) {
-      return fullCompileName;
-    }
-
-    protected override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl member) {
-      ExprContainer actualBuilder;
-      if (wr is BuilderSyntaxTree<ExprContainer> st) {
-        actualBuilder = st.Builder;
-      } else {
-        throw new InvalidOperationException();
-      }
-
-      EmitTypeName_Companion(type, new BuilderSyntaxTree<ExprContainer>(actualBuilder), wr, tok, member);
-      return "";
-    }
-
-    protected override void EmitTypeName_Companion(Type type, ConcreteSyntaxTree wr, ConcreteSyntaxTree surrounding, IToken tok, MemberDecl member) {
-      if (wr is BuilderSyntaxTree<ExprContainer> container) {
-        type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
-
-        if (type.NormalizeExpandKeepConstraints() is UserDefinedType udt && udt.ResolvedClass is DatatypeDecl dt &&
-            DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _)) {
-          container.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Companion(PathFromTopLevel(udt.ResolvedClass)));
-        } else {
-          container.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Companion(PathFromTopLevel(type.AsTopLevelTypeWithMembers)));
-        }
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void EmitNameAndActualTypeArgs(string protectedName, List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<ExprContainer> st && st.Builder is CallExprBuilder callExpr) {
-        callExpr.SetName(protectedName);
-      } else if (wr is BuilderSyntaxTree<ExprContainer> st2 && st2.Builder is CallStmtBuilder callStmt) {
-        callStmt.SetName(protectedName);
-      } else {
-        throw new InvalidOperationException();
-      }
-
-      base.EmitNameAndActualTypeArgs(protectedName, typeArgs, tok, wr);
-    }
-
-    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
-      needsTypeParameter = false;
-      needsTypeDescriptor = false;
-    }
-
-    protected override bool DeclareFormal(string prefix, string name, Type type, IToken tok, bool isInParam, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void DeclareLocalVar(string name, Type type, IToken tok, bool leaveRoomForRhs, string rhs,
-        ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
-        var typ = GenType(type);
-
-        if (rhs == null) {
-          // we expect an initializer to come *after* this declaration
-          var variable = stmtContainer.Builder.DeclareAndAssign(typ);
-          variable.SetName(name);
-
-          if (leaveRoomForRhs) {
-            throw new InvalidOperationException();
-          }
-        } else {
-          if (bufferedInitializationValue == null) {
-            throw new InvalidOperationException("Expected a buffered value to have been populated because rhs != null");
-          }
-
-          var rhsValue = bufferedInitializationValue;
-          bufferedInitializationValue = null;
-
-          stmtContainer.Builder.AddStatement(
-            (DAST.Statement)DAST.Statement.create_DeclareVar(
-              Sequence<Rune>.UnicodeFromString(name),
-              typ,
-              DAST.Optional<DAST._IExpression>.create_Some(rhsValue)
-            )
-          );
-        }
-      } else {
-        throw new InvalidOperationException("Cannot declare local var outside of a statement container: " + wr);
-      }
-    }
-
-    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type type, IToken tok, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
-        var variable = stmtContainer.Builder.DeclareAndAssign(GenType(type));
-        variable.SetName(name);
-        return new BuilderSyntaxTree<ExprContainer>(variable);
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
-    protected override bool SupportsMultipleReturns => true;
-
-    protected override void DeclareLocalOutVar(string name, Type type, IToken tok, string rhs, bool useReturnStyleOuts,
-        ConcreteSyntaxTree wr) {
-      DeclareLocalVar(name, type, tok, true, rhs, wr);
-    }
-
-    protected override void EmitCallReturnOuts(List<string> outTmps, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder && builder.Builder is CallStmtBuilder call) {
-        call.SetOuts(outTmps.Select(i => Sequence<Rune>.UnicodeFromString(i)).ToList());
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void TrCallStmt(CallStmt s, string receiverReplacement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wrStmts, ConcreteSyntaxTree wrStmtsAfterCall) {
-      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
-        var callBuilder = stmtContainer.Builder.Call();
-        base.TrCallStmt(s, receiverReplacement, new BuilderSyntaxTree<ExprContainer>(callBuilder), wrStmts, wrStmtsAfterCall);
-      } else {
-        throw new InvalidOperationException("Cannot call statement in this context: " + currentBuilder);
-      }
-    }
-
-    protected override void EmitCallToInheritedMethod(Method method, [CanBeNull] TopLevelDeclWithMembers heir, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, ConcreteSyntaxTree wStmtsAfterCall) {
-      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
-        var callBuilder = stmtContainer.Builder.Call();
-        base.EmitCallToInheritedMethod(method, heir, new BuilderSyntaxTree<ExprContainer>(callBuilder), wStmts, wStmtsAfterCall);
-      } else {
-        throw new InvalidOperationException("Cannot call statement in this context: " + currentBuilder);
-      }
-    }
-
-    protected override void EmitMultiReturnTuple(List<Formal> outs, List<Type> outTypes, List<string> outTmps, IToken methodToken, ConcreteSyntaxTree wr) {
-      // nothing to do, we auto-emit a return for the method
-    }
-
-    protected override void CompileFunctionCallExpr(FunctionCallExpr e, ConcreteSyntaxTree wr, bool inLetExprBody,
-        ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        var callBuilder = builder.Builder.Call();
-        base.CompileFunctionCallExpr(e, new BuilderSyntaxTree<ExprContainer>(callBuilder), inLetExprBody, wStmts, tr);
-      } else {
-        throw new InvalidOperationException("Cannot call function in this context: " + currentBuilder);
-      }
-    }
-
-    protected override void EmitActualTypeArgs(List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<ExprContainer> st && st.Builder is CallExprBuilder callExpr) {
-        callExpr.SetTypeArgs(typeArgs.Select(GenType).ToList());
-      } else if (wr is BuilderSyntaxTree<ExprContainer> st2 && st2.Builder is CallStmtBuilder callStmt) {
-        callStmt.SetTypeArgs(typeArgs.Select(GenType).ToList());
-      } else {
-        throw new InvalidOperationException("Cannot emit actual type args in this context: " + currentBuilder);
-      }
-    }
-
-    private class BuilderLvalue : ILvalue {
-      readonly DafnyCompiler compiler;
-      readonly string name;
-
-      public BuilderLvalue(DafnyCompiler compiler, string name) {
-        this.compiler = compiler;
-        this.name = name;
-      }
-
-      public void EmitRead(ConcreteSyntaxTree wr) {
-        throw new NotImplementedException();
-      }
-
-      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
-        if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
-          var assign = stmtContainer.Builder.Assign();
-          assign.SetName(name);
-          return new BuilderSyntaxTree<ExprContainer>(assign);
-        } else {
-          throw new InvalidOperationException();
-        }
-      }
-    }
-
-    private class ExprLvalue : ILvalue {
-      readonly DAST.Expression expr;
-
-      public ExprLvalue(DAST.Expression expr) {
-        this.expr = expr;
-      }
-
-      public void EmitRead(ConcreteSyntaxTree wr) {
-        if (wr is BuilderSyntaxTree<ExprContainer> exprContainer) {
-          exprContainer.Builder.AddExpr(expr);
-        } else {
-          throw new InvalidOperationException();
-        }
-      }
-
-      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
-        throw new NotImplementedException();
-      }
-    }
-
-    protected override ILvalue IdentLvalue(string var) {
-      return new BuilderLvalue(this, var);
-    }
-
-    protected override ILvalue SeqSelectLvalue(SeqSelectExpr ll, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new NotImplementedException();
-    }
-
-    protected override ILvalue MultiSelectLvalue(MultiSelectExpr ll, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
-      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
-        ExprBuffer buffer = new(null);
-        EmitExpr(arg, false, new BuilderSyntaxTree<ExprContainer>(buffer), wr);
-        stmtContainer.Builder.Print(buffer.Finish());
-      } else {
-        throw new InvalidOperationException("Cannot print outside of a statement container: " + currentBuilder);
-      }
-    }
-
-    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<StatementContainer> stmtContainer) {
-        stmtContainer.Builder.AddStatement((DAST.Statement)DAST.Statement.create_EarlyReturn());
-      } else {
-        throw new InvalidOperationException("Cannot return outside of a statement container: " + currentBuilder);
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitBreak(string label, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.ContinueStatements);
-    }
-
-    protected override void EmitYield(ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.Iterators);
-    }
-
-    protected override void EmitAbsurd(string message, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitHalt(IToken tok, Expression messageExpr, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<StatementContainer> container) {
-        container.Builder.AddStatement((DAST.Statement)DAST.Statement.create_Halt());
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    private readonly Stack<ElseBuilder> elseBuilderStack = new();
-
-    protected override ConcreteSyntaxTree EmitIf(out ConcreteSyntaxTree guardWriter, bool hasElse, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<StatementContainer> statementContainer) {
-        var ifBuilder = statementContainer.Builder.IfElse();
-        if (hasElse) {
-          elseBuilderStack.Push(ifBuilder.Else());
-        }
-
-        guardWriter = new BuilderSyntaxTree<ExprContainer>(ifBuilder);
-        return new BuilderSyntaxTree<StatementContainer>(ifBuilder);
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitBlock(ConcreteSyntaxTree wr) {
-      if (elseBuilderStack.Count > 0) {
-        return new BuilderSyntaxTree<StatementContainer>(elseBuilderStack.Pop());
-      } else {
-        throw new NotImplementedException();
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitForStmt(IToken tok, IVariable loopIndex, bool goingUp, string endVarName,
-      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
-      // var direction = goingUp ? "to" : "downto";
-      // var lowWr = new ConcreteSyntaxTree();
-      // wr.Format($"for {IdName(loopIndex)} := {lowWr} {direction} {endVarName}");
-      // var bodyWr = wr.NewBlock();
-      // TrStmtList(body, bodyWr);
-      // return lowWr;
-      throw new NotImplementedException();
-    }
-
-    protected override ConcreteSyntaxTree CreateWhileLoop(out ConcreteSyntaxTree guardWriter, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<StatementContainer> statementContainer) {
-        var whileBuilder = statementContainer.Builder.While();
-        guardWriter = new BuilderSyntaxTree<ExprContainer>(whileBuilder);
-        return new BuilderSyntaxTree<StatementContainer>(whileBuilder);
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, string bound, ConcreteSyntaxTree wr, string start = null) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.ForLoops);
-    }
-
-    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.ForLoops);
-    }
-
-    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override string GetQuantifierName(string bvType) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.Quantifiers);
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IToken tok,
-      out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
-      Type collectionElementType, bool introduceBoundVar, IToken tok, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs,
-        out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitNew(Type type, IToken tok, CallStmt initCall, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        var ctor = (Constructor)initCall?.Method;
-        var arguments = Enumerable.Empty<DAST.Expression>();
-        if (ctor != null && ctor.IsExtern(Options, out _, out _)) {
-          // the arguments of any external constructor are placed here
-          arguments = ctor.Ins.Select((f, i) => (f, i))
-            .Where(tp => !tp.f.IsGhost)
-            .Select(tp => {
-              var buf = new ExprBuffer(null);
-              var localWriter = new BuilderSyntaxTree<ExprContainer>(buf);
-              EmitExpr(initCall.Args[tp.i], false, localWriter, wStmts);
-              return buf.Finish();
-            });
-        }
-
-        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_New(
-          PathFromTopLevel(type.AsTopLevelTypeWithMembers),
-          Sequence<DAST.Expression>.FromArray(arguments.ToArray())
-        ));
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void EmitNewArray(Type elementType, IToken tok, List<string> dimensions,
-      bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new InvalidOperationException();
-    }
-
-    protected override void EmitNewArray(Type elementType, IToken tok, List<Expression> dimensions, bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        var dimensionsAST = dimensions.Select(d => {
-          var buf = new ExprBuffer(null);
-          var localWriter = new BuilderSyntaxTree<ExprContainer>(buf);
-          EmitExpr(d, false, localWriter, wStmts);
-          return buf.Finish();
-        }).ToArray();
-
-        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_NewArray(
-          Sequence<DAST.Expression>.FromArray(dimensionsAST)
-        ));
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void EmitIdentifier(string ident, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Ident(
-          Sequence<Rune>.UnicodeFromString(ident)
-        ));
-      } else {
-        throw new InvalidOperationException("Expected ExprContainer, got " + wr.GetType());
-      }
-    }
-
-    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        DAST.Expression baseExpr;
-        switch (e) {
-          case CharLiteralExpr c:
-            var codePoint = Util.UnescapedCharacters(Options, (string)c.Value, false).Single();
-            baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_CharLiteral(
-              new Rune(codePoint)
-            ));
-            break;
-          case StringLiteralExpr str:
-            baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_StringLiteral(
-              Sequence<Rune>.UnicodeFromString(str.AsStringLiteral())
-            ));
-            break;
-          case StaticReceiverExpr:
-            throw new NotImplementedException();
-          default:
-            switch (e.Value) {
-              case null:
-                baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_Null());
-                break;
-              case bool value:
-                baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_BoolLiteral(value));
-                break;
-              case BigInteger integer:
-                baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_IntLiteral(integer));
-                break;
-              case BigDec n:
-                baseExpr = (DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_DecLiteral(
-                  Sequence<Rune>.UnicodeFromString(n.ToString())
-                ));
-                break;
-              default:
-                // TODO: This may not be exhaustive
-                throw new cce.UnreachableException();
-            }
-            break;
-        }
-
-        if (e.Type.AsNewtype != null || e.Type.AsSubsetType != null) {
-          baseExpr = (DAST.Expression)DAST.Expression.create_SubsetUpgrade(baseExpr, GenType(e.Type));
-        }
-
-        builder.Builder.AddExpr(baseExpr);
-      } else {
-        throw new InvalidOperationException("Cannot emit literal expression outside of expression context: " + wr.GetType());
-      }
-    }
-
-    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, bool surroundByUnchecked, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
-        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      throw new UnsupportedFeatureException(e0.tok, Feature.BitvectorRotateFunctions);
-    }
-
-    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.NonSequentializableForallStatements);
-    }
-
-    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.NonSequentializableForallStatements);
-    }
-
-    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.NonSequentializableForallStatements);
-    }
-
-    protected override string IdProtect(string name) {
-      return PublicIdProtect(name);
-    }
-
-    public override string PublicIdProtect(string name) {
-      return MangleName(name);
-    }
-
-    protected override string FullTypeName(UserDefinedType udt, MemberDecl member = null) {
-      throw new NotImplementedException();
-    }
-
-    private DAST.Type FullTypeNameAST(UserDefinedType udt, MemberDecl member = null) {
-      if (udt.IsArrowType) {
-        var arrow = udt.AsArrowType;
-        return (DAST.Type)DAST.Type.create_Arrow(
-          Sequence<DAST.Type>.FromArray(arrow.Args.Select(m => GenType(m)).ToArray()),
-          GenType(arrow.Result)
-        );
-      }
-
-      var cl = udt.ResolvedClass;
-      switch (cl) {
-        case TypeParameter:
-          return (DAST.Type)DAST.Type.create_TypeArg(Sequence<Rune>.UnicodeFromString(IdProtect(udt.GetCompileName(Options))));
-        case ArrayClassDecl:
-          return (DAST.Type)DAST.Type.create_Array(GenType(udt.TypeArgs[0]));
-        case TupleTypeDecl:
-          return (DAST.Type)DAST.Type.create_Tuple(Sequence<DAST.Type>.FromArray(
-            udt.TypeArgs.Select(m => GenType(m)).ToArray()
-          ));
-        default:
-          return TypeNameASTFromTopLevel(cl, udt.TypeArgs);
-      }
-    }
-
-    private ISequence<ISequence<Rune>> PathFromTopLevel(TopLevelDecl topLevel) {
-      List<ISequence<Rune>> path = new();
-      path.Add(Sequence<Rune>.UnicodeFromString(topLevel.EnclosingModuleDefinition.GetCompileName(Options)));
-      path.Add(Sequence<Rune>.UnicodeFromString(topLevel.GetCompileName(Options)));
-      return Sequence<ISequence<Rune>>.FromArray(path.ToArray());
-    }
-
-    private DAST.Type TypeNameASTFromTopLevel(TopLevelDecl topLevel, List<Type> typeArgs) {
-      var path = PathFromTopLevel(topLevel);
-
-      // TODO(shadaj): do something with nullable references
-      // bool nonNull = false;
-      if (topLevel is NonNullTypeDecl non) {
-        // nonNull = true;
-        topLevel = non.Rhs.AsTopLevelTypeWithMembers;
-      }
-
-      ResolvedType resolvedType;
-      if (topLevel is NewtypeDecl) {
-        resolvedType = (DAST.ResolvedType)DAST.ResolvedType.create_Newtype();
-      } else if (topLevel is TraitDecl) {
-        resolvedType = (DAST.ResolvedType)DAST.ResolvedType.create_Trait(path);
-      } else if (topLevel is DatatypeDecl) {
-        resolvedType = (DAST.ResolvedType)DAST.ResolvedType.create_Datatype(path);
-      } else if (topLevel is ClassDecl) {
-        // TODO(shadaj): have a separate type when we properly support classes
-        resolvedType = (DAST.ResolvedType)DAST.ResolvedType.create_Datatype(path);
-      } else if (topLevel is SubsetTypeDecl) {
-        resolvedType = (DAST.ResolvedType)DAST.ResolvedType.create_Newtype();
-      } else {
-        throw new InvalidOperationException(topLevel.GetType().ToString());
-      }
-
-      return (DAST.Type)DAST.Type.create_Path(
-        path,
-        Sequence<DAST.Type>.FromArray(typeArgs.Select(m => GenType(m)).ToArray()),
-        resolvedType
-      );
-    }
-
-    public override ConcreteSyntaxTree Expr(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
-      if (currentBuilder is ExprContainer container) {
-        EmitExpr(expr, inLetExprBody, new BuilderSyntaxTree<ExprContainer>(container), wStmts);
-        return new ConcreteSyntaxTree();
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    public override void EmitExpr(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var actualWr = wr;
-      if (currentBuilder is ExprBuffer buf && wr is not BuilderSyntaxTree<ExprContainer>) {
-        // the writers are not currently wired properly for DatatypeValue
-        actualWr = new BuilderSyntaxTree<ExprContainer>(buf);
-      }
-
-      if (expr is DatatypeValue) {
-        ExprBuffer buffer = new(currentBuilder);
-        var origBuilder = currentBuilder;
-        currentBuilder = buffer;
-        base.EmitExpr(expr, inLetExprBody, actualWr, wStmts);
-
-        if (currentBuilder == buffer) {
-          // sometimes, we don't actually call EmitDatatypeValue
-          currentBuilder = origBuilder;
-        }
-      } else if (expr is BinaryExpr bin) {
-        var origBuilder = currentBuilder;
-        base.EmitExpr(expr, inLetExprBody, actualWr, wStmts);
-        currentBuilder = origBuilder;
-      } else if (expr is IdentifierExpr) {
-        // we don't need to create a copy of the identifier, that's language specific
-        base.EmitExpr(expr, false, actualWr, wStmts);
-      } else {
-        base.EmitExpr(expr, inLetExprBody, actualWr, wStmts);
-      }
-    }
-
-    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_This());
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder && currentBuilder is ExprBuffer buf) {
-        List<DAST.Expression> contents = buf.PopAll();
-        currentBuilder = buf.parent; // pop early to make sure the receiving builder is in the expected state
-        List<_System._ITuple2<ISequence<Rune>, DAST.Expression>> namedContents = new();
-
-        int argI = 0;
-        for (int i = 0; i < dtv.Ctor.Formals.Count; i++) {
-          var formal = dtv.Ctor.Formals[i];
-          if (formal.IsGhost) {
-            continue;
-          }
-
-          var actual = contents[argI];
-          namedContents.Add(_System.Tuple2<ISequence<Rune>, DAST.Expression>.create(
-            Sequence<Rune>.UnicodeFromString(formal.CompileName),
-            actual
-          ));
-
-          argI++;
-        }
-
-        if (argI != contents.Count) {
-          throw new InvalidOperationException("Datatype constructor " + dtv.Ctor.Name + " expects " + dtv.Ctor.Formals.Count + " arguments, but " + contents.Count + " were provided");
-        }
-
-        if (dtv.Ctor.EnclosingDatatype is TupleTypeDecl tupleDecl) {
-          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Tuple(
-            Sequence<DAST.Expression>.FromArray(namedContents.Select(x => x.dtor__1).ToArray())
-          ));
-        } else {
-          var dtPath = PathFromTopLevel(dtv.Ctor.EnclosingDatatype);
-          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_DatatypeValue(
-            dtPath,
-            Sequence<Rune>.UnicodeFromString(dtv.Ctor.GetCompileName(Options)),
-            dtv.Ctor.EnclosingDatatype is CoDatatypeDecl,
-            Sequence<_System._ITuple2<ISequence<Rune>, DAST.Expression>>.FromArray(namedContents.ToArray())
-          ));
-        }
-      } else {
-        throw new InvalidOperationException("Cannot emit datatype value outside of expression context: " + wr.GetType() + ", " + currentBuilder);
-      }
-    }
-
-    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType,
-        out string compiledName, out string preString, out string postString) {
-      compiledName = "";
-      preString = "";
-      postString = "";
-      switch (id) {
-        case SpecialField.ID.UseIdParam:
-          compiledName = (string)idParam;
-          break;
-        default:
-          throw new NotImplementedException("Special field: " + id);
-      }
-    }
-
-    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member,
-      List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap, Type expectedType,
-      string additionalCustomParameter = null, bool internalAccess = false) {
-      var objReceiver = new ExprBuffer(null);
-      obj(new BuilderSyntaxTree<ExprContainer>(objReceiver));
-      var objExpr = objReceiver.Finish();
-
-      var memberStatus = DatatypeWrapperEraser.GetMemberStatus(Options, member);
-
-      if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.Identity) {
-        return new ExprLvalue(objExpr);
-      } else if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue) {
-        return new ExprLvalue((DAST.Expression)DAST.Expression.create_Literal(DAST.Literal.create_BoolLiteral(true)));
-      } else if (member is DatatypeDestructor dtor) {
-        if (dtor.EnclosingClass is TupleTypeDecl) {
-          return new ExprLvalue((DAST.Expression)DAST.Expression.create_TupleSelect(
-            objExpr,
-            int.Parse(dtor.CorrespondingFormals[0].NameForCompilation)
-          ));
-        } else {
-          return new ExprLvalue((DAST.Expression)DAST.Expression.create_Select(
-            objExpr,
-            Sequence<Rune>.UnicodeFromString(member.GetCompileName(Options)),
-            member.EnclosingClass is DatatypeDecl
-          ));
-        }
-      } else if (member is SpecialField sf && sf.SpecialId != SpecialField.ID.UseIdParam) {
-        GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out _, out _);
-        return new ExprLvalue((DAST.Expression)DAST.Expression.create_Select(
-          objExpr,
-          Sequence<Rune>.UnicodeFromString(compiledName),
-          member.EnclosingClass is DatatypeDecl
-        ));
-      } else if (member is SpecialField sf2 && sf2.SpecialId == SpecialField.ID.UseIdParam && sf2.IdParam is string fieldName && fieldName.StartsWith("is_")) {
-        return new ExprLvalue((DAST.Expression)DAST.Expression.create_TypeTest(
-          objExpr,
-          PathFromTopLevel(objType.AsTopLevelTypeWithMembers),
-          Sequence<Rune>.UnicodeFromString(fieldName.Substring(3))
-        ));
-      } else {
-        if (expectedType.IsArrowType) {
-          return new ExprLvalue((DAST.Expression)DAST.Expression.create_SelectFn(
-            objExpr,
-            Sequence<Rune>.UnicodeFromString(member.GetCompileName(Options)),
-            member.EnclosingClass is DatatypeDecl,
-            member.IsStatic,
-            expectedType.AsArrowType.Arity
-          ));
-        } else {
-          return new ExprLvalue((DAST.Expression)DAST.Expression.create_Select(
-            objExpr,
-            Sequence<Rune>.UnicodeFromString(member.GetCompileName(Options)),
-            member.EnclosingClass is DatatypeDecl
-          ));
-        }
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<string> indices, Type elmtType, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
-      CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitSeqSelectRange(Expression source, Expression lo, Expression hi, bool fromArray,
-      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts) {
-      throw new UnsupportedFeatureException(expr.tok, Feature.Multisets);
-    }
-
-    protected override void EmitApplyExpr(Type functionType, IToken tok, Expression function,
-        List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        var argsAST = new List<DAST.Expression>();
-        foreach (var arg in arguments) {
-          var argReceiver = new ExprBuffer(null);
-          EmitExpr(arg, inLetExprBody, new BuilderSyntaxTree<ExprContainer>(argReceiver), wStmts);
-          argsAST.Add(argReceiver.Finish());
-        }
-
-        var funcReceiver = new ExprBuffer(null);
-        EmitExpr(function, inLetExprBody, new BuilderSyntaxTree<ExprContainer>(funcReceiver), wStmts);
-        var funcAST = funcReceiver.Finish();
-
-        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Apply(funcAST, Sequence<DAST.Expression>.FromArray(argsAST.ToArray())));
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
-      List<Type> boundTypes, Type resultType, IToken resultTok, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ref ConcreteSyntaxTree wStmts) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex, DatatypeCtor ctor,
-        List<Type> typeArgs, Type bvType, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
-          Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
-          Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
-          source(wr);
-        } else {
-          var buf = new ExprBuffer(null);
-          source(new BuilderSyntaxTree<ExprContainer>(buf));
-          var sourceAST = buf.Finish();
-          if (ctor.EnclosingDatatype is TupleTypeDecl) {
-            builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_TupleSelect(
-              sourceAST,
-              int.Parse(dtor.NameForCompilation)
-            ));
-          } else {
-            builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Select(
-              sourceAST,
-              Sequence<Rune>.UnicodeFromString(dtor.CompileName),
-              true
-            ));
-          }
-        }
-      }
-    }
-
-    protected override bool TargetLambdasRestrictedToExpressions => true;
-    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IToken tok, List<string> inNames,
-        Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        var formals = new List<DAST.Formal>();
-        for (int i = 0; i < inTypes.Count; ++i) {
-          formals.Add((DAST.Formal)DAST.Formal.create_Formal(
-            Sequence<Rune>.UnicodeFromString(inNames[i]),
-            GenType(inTypes[i])
-          ));
-        }
-
-        var retType = GenType(resultType);
-
-        return new BuilderSyntaxTree<StatementContainer>(builder.Builder.Lambda(formals, retType));
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void CreateIIFE(string bvName, Type bvType, IToken bvTok, Type bodyType, IToken bodyTok,
-      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        var iife = builder.Builder.IIFE(bvName, GenType(bvType));
-        wrRhs = new BuilderSyntaxTree<ExprContainer>(iife.RhsBuilder());
-        wrBody = new BuilderSyntaxTree<ExprContainer>(iife);
-      } else {
-        throw new InvalidOperationException("Invalid context for IIFE: " + wr.GetType());
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IToken resultTok, ConcreteSyntaxTree wr,
-        ConcreteSyntaxTree wStmts) {
-      throw new UnsupportedFeatureException(resultTok, Feature.LetSuchThatExpressions);
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IToken resultTok, string bvName,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new UnsupportedFeatureException(resultTok, Feature.LetSuchThatExpressions);
-    }
-
-    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (wr is BuilderSyntaxTree<ExprContainer> container) {
-        var buf = new ExprBuffer(null);
-        EmitExpr(expr, inLetExprBody, new BuilderSyntaxTree<ExprContainer>(buf), null);
-
-        switch (op) {
-          case ResolvedUnaryOp.BoolNot: {
-              container.Builder.AddExpr((DAST.Expression)DAST.Expression.create_UnOp(
-                UnaryOp.create_Not(),
-                buf.Finish()
-              ));
-              break;
-            }
-          case ResolvedUnaryOp.BitwiseNot: {
-              container.Builder.AddExpr((DAST.Expression)DAST.Expression.create_UnOp(
-                UnaryOp.create_BitwiseNot(),
-                buf.Finish()
-              ));
-              break;
-            }
-          case ResolvedUnaryOp.Cardinality: {
-              container.Builder.AddExpr((DAST.Expression)DAST.Expression.create_UnOp(
-                UnaryOp.create_Cardinality(),
-                buf.Finish()
-              ));
-              break;
-            }
-        }
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
-      Expression e0, Expression e1, IToken tok, Type resultType,
-      out string opString,
-      out string preOpString,
-      out string postOpString,
-      out string callString,
-      out string staticCallString,
-      out bool reverseArguments,
-      out bool truncateResult,
-      out bool convertE1_to_int,
-      out bool coerceE1,
-      ConcreteSyntaxTree errorWr) {
-      if (errorWr is BuilderSyntaxTree<ExprContainer> builder) {
-        opString = null;
-        preOpString = "";
-        postOpString = "";
-        callString = null;
-        staticCallString = null;
-        reverseArguments = false;
-        truncateResult = false;
-        convertE1_to_int = false;
-        coerceE1 = false;
-
-        opString = op switch {
-          BinaryExpr.ResolvedOpcode.Iff => "<==>",
-          BinaryExpr.ResolvedOpcode.Imp => "==>",
-          BinaryExpr.ResolvedOpcode.And => "&&",
-          BinaryExpr.ResolvedOpcode.Or => "||",
-          BinaryExpr.ResolvedOpcode.BitwiseAnd => "&",
-          BinaryExpr.ResolvedOpcode.BitwiseOr => "|",
-          BinaryExpr.ResolvedOpcode.BitwiseXor => "^",
-          BinaryExpr.ResolvedOpcode.EqCommon => "==",
-          BinaryExpr.ResolvedOpcode.NeqCommon => "!=",
-          BinaryExpr.ResolvedOpcode.Lt => "<",
-          BinaryExpr.ResolvedOpcode.Le => "<=",
-          BinaryExpr.ResolvedOpcode.Ge => ">=",
-          BinaryExpr.ResolvedOpcode.Gt => ">",
-          BinaryExpr.ResolvedOpcode.LeftShift => "<<",
-          BinaryExpr.ResolvedOpcode.RightShift => ">>",
-          BinaryExpr.ResolvedOpcode.Add => "+",
-          BinaryExpr.ResolvedOpcode.Sub => "-",
-          BinaryExpr.ResolvedOpcode.Mul => "*",
-          BinaryExpr.ResolvedOpcode.Div => "/",
-          BinaryExpr.ResolvedOpcode.Mod => "%",
-          BinaryExpr.ResolvedOpcode.SetEq => "==",
-          BinaryExpr.ResolvedOpcode.MultiSetEq => "==",
-          BinaryExpr.ResolvedOpcode.SeqEq => "==",
-          BinaryExpr.ResolvedOpcode.MapEq => "==",
-          BinaryExpr.ResolvedOpcode.ProperSubset => "<",
-          BinaryExpr.ResolvedOpcode.ProperMultiSubset => "<",
-          BinaryExpr.ResolvedOpcode.Subset => "<=",
-          BinaryExpr.ResolvedOpcode.MultiSubset => "<=",
-          BinaryExpr.ResolvedOpcode.Disjoint => "!!",
-          BinaryExpr.ResolvedOpcode.MultiSetDisjoint => "!!",
-          BinaryExpr.ResolvedOpcode.InSet => "in",
-          BinaryExpr.ResolvedOpcode.InMultiSet => "in",
-          BinaryExpr.ResolvedOpcode.InMap => "in",
-          BinaryExpr.ResolvedOpcode.Union => "+",
-          BinaryExpr.ResolvedOpcode.MultiSetUnion => "+",
-          BinaryExpr.ResolvedOpcode.MapMerge => "+",
-          BinaryExpr.ResolvedOpcode.Intersection => "*",
-          BinaryExpr.ResolvedOpcode.MultiSetIntersection => "*",
-          BinaryExpr.ResolvedOpcode.SetDifference => "-",
-          BinaryExpr.ResolvedOpcode.MultiSetDifference => "-",
-          BinaryExpr.ResolvedOpcode.MapSubtraction => "-",
-          BinaryExpr.ResolvedOpcode.ProperPrefix => "<=",
-          BinaryExpr.ResolvedOpcode.Prefix => "<",
-          BinaryExpr.ResolvedOpcode.Concat => "+",
-          BinaryExpr.ResolvedOpcode.InSeq => "in",
-          _ => throw new NotImplementedException(),
-        };
-
-        currentBuilder = builder.Builder.BinOp(opString);
-        // cleaned up by EmitExpr
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void EmitITE(Expression guard, Expression thn, Expression els, Type resultType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        var guardBuffer = new ExprBuffer(null);
-        var thnBuffer = new ExprBuffer(null);
-        var elsBuffer = new ExprBuffer(null);
-        EmitExpr(guard, false, new BuilderSyntaxTree<ExprContainer>(guardBuffer), wStmts);
-        EmitExpr(thn, false, new BuilderSyntaxTree<ExprContainer>(thnBuffer), wStmts);
-        EmitExpr(els, false, new BuilderSyntaxTree<ExprContainer>(elsBuffer), wStmts);
-        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_Ite(
-          guardBuffer.Finish(),
-          thnBuffer.Finish(),
-          elsBuffer.Finish()
-        ));
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitConversionExpr(ConversionExpr e, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        throw new NotImplementedException();
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void EmitConstructorCheck(string source, DatatypeCtor ctor, ConcreteSyntaxTree wr) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_TypeTest(
-          DAST.Expression.create_Ident(Sequence<Rune>.UnicodeFromString(source)),
-          PathFromTopLevel(ctor.EnclosingDatatype),
-          Sequence<Rune>.UnicodeFromString(ctor.GetCompileName(Options))
-        ));
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IToken tok, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(tok, Feature.TypeTests);
-    }
-
-    protected override void EmitCollectionDisplay(CollectionType ct, IToken tok, List<Expression> elements,
-      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (wr is BuilderSyntaxTree<ExprContainer> builder) {
-        var elementsAST = new List<DAST.Expression>();
-        foreach (var e in elements) {
-          var buffer = new ExprBuffer(null);
-          EmitExpr(e, false, new BuilderSyntaxTree<ExprContainer>(buffer), wStmts);
-          elementsAST.Add(buffer.Finish());
-        }
-
-        if (ct is SetType set) {
-          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_SetValue(
-            Sequence<DAST.Expression>.FromArray(elementsAST.ToArray())
-          ));
-        } else if (ct is MultiSetType multiSet) {
-          throw new NotImplementedException();
-        } else if (ct is SeqType seq) {
-          builder.Builder.AddExpr((DAST.Expression)DAST.Expression.create_SeqValue(
-            Sequence<DAST.Expression>.FromArray(elementsAST.ToArray())
-          ));
-        } else {
-          throw new InvalidOperationException();
-        }
-      } else {
-        throw new InvalidOperationException();
-      }
-    }
-
-    protected override void EmitMapDisplay(MapType mt, IToken tok, List<ExpressionPair> elements, bool inLetExprBody,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody,
-        ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IToken tok, string collName, Expression term,
-        bool inLetExprBody, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override string GetSubtypeCondition(string tmpVarName, Type boundVarType, IToken tok, ConcreteSyntaxTree wPreconditions) {
-      throw new NotImplementedException();
-    }
-
-    protected override string GetCollectionBuilder_Build(CollectionType ct, IToken tok, string collName, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override Type EmitIntegerRange(Type type, out ConcreteSyntaxTree wLo, out ConcreteSyntaxTree wHi, ConcreteSyntaxTree wr) {
-      throw new NotImplementedException();
-    }
-
-    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.ExactBoundedPool);
-    }
-
-    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.RunAllTests);
-    }
-
-  }
-}
diff --git a/Source/DafnyCore/Compilers/DafnyExecutableBackend.cs b/Source/DafnyCore/Compilers/DafnyExecutableBackend.cs
deleted file mode 100644
index 9383689548f..00000000000
--- a/Source/DafnyCore/Compilers/DafnyExecutableBackend.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Linq;
-using Dafny;
-
-namespace Microsoft.Dafny.Compilers;
-
-public abstract class DafnyExecutableBackend : ExecutableBackend {
-
-  protected DafnyWrittenCompiler dafnyCompiler;
-
-  protected DafnyExecutableBackend(DafnyOptions options) : base(options) {
-  }
-
-  protected override SinglePassCompiler CreateCompiler() {
-    // becomes this.compiler
-    return new DafnyCompiler(Options, Reporter);
-  }
-
-  protected abstract DafnyWrittenCompiler CreateDafnyWrittenCompiler();
-
-  public override void OnPreCompile(ErrorReporter reporter, ReadOnlyCollection<string> otherFileNames) {
-    base.OnPreCompile(reporter, otherFileNames);
-    dafnyCompiler = CreateDafnyWrittenCompiler();
-  }
-
-  public override void Compile(Program dafnyProgram, ConcreteSyntaxTree output) {
-    ((DafnyCompiler)compiler).Start();
-    compiler.Compile(dafnyProgram, new ConcreteSyntaxTree());
-    var dast = ((DafnyCompiler)compiler).Build();
-    var o = dafnyCompiler.Compile((Sequence<DAST.Module>)Sequence<DAST.Module>.FromArray(dast.ToArray()));
-    output.Write(o.ToVerbatimString(false));
-  }
-
-  public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree output) {
-    var o = dafnyCompiler.EmitCallToMain(mainMethod.FullSanitizedName);
-    output.Write(o.ToVerbatimString(false));
-  }
-
-}
diff --git a/Source/DafnyCore/Compilers/DafnyWrittenCompiler.cs b/Source/DafnyCore/Compilers/DafnyWrittenCompiler.cs
deleted file mode 100644
index 22514ff848b..00000000000
--- a/Source/DafnyCore/Compilers/DafnyWrittenCompiler.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-
-using Dafny;
-
-namespace Microsoft.Dafny.Compilers {
-
-  public abstract class DafnyWrittenCompiler {
-
-    public abstract ISequence<Rune> Compile(Sequence<DAST.Module> program);
-
-    public abstract ISequence<Rune> EmitCallToMain(string fullName);
-
-  }
-
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/ExecutableBackend.cs b/Source/DafnyCore/Compilers/ExecutableBackend.cs
deleted file mode 100644
index 0fe0b82bcc4..00000000000
--- a/Source/DafnyCore/Compilers/ExecutableBackend.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Dafny.Plugins;
-using Microsoft.Win32;
-
-namespace Microsoft.Dafny.Compilers;
-
-public abstract class ExecutableBackend : Plugins.IExecutableBackend {
-  // May be null for backends that don't use the single-pass compiler logic
-  protected SinglePassCompiler compiler;
-
-  protected ExecutableBackend(DafnyOptions options) {
-    Options = options;
-  }
-
-  public DafnyOptions Options { get; }
-
-  public override IReadOnlySet<Feature> UnsupportedFeatures => CreateCompiler().UnsupportedFeatures;
-
-  public override bool SupportsDatatypeWrapperErasure =>
-    CreateCompiler()?.SupportsDatatypeWrapperErasure ?? base.SupportsDatatypeWrapperErasure;
-
-  public override void Compile(Program dafnyProgram, ConcreteSyntaxTree output) {
-    compiler.Compile(dafnyProgram, output);
-  }
-
-  public override void OnPreCompile(ErrorReporter reporter, ReadOnlyCollection<string> otherFileNames) {
-    base.OnPreCompile(reporter, otherFileNames);
-    compiler = CreateCompiler();
-  }
-
-  public override void OnPostCompile() {
-    base.OnPostCompile();
-    compiler.Coverage.WriteLegendFile();
-  }
-
-  protected abstract SinglePassCompiler CreateCompiler();
-
-  public override string PublicIdProtect(string name) {
-    return compiler.PublicIdProtect(name);
-  }
-
-  public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree callToMainTree) {
-    compiler.EmitCallToMain(mainMethod, baseName, callToMainTree);
-  }
-
-  public ProcessStartInfo PrepareProcessStartInfo(string programName, IEnumerable<string> args = null) {
-    var psi = new ProcessStartInfo(programName) {
-      UseShellExecute = false,
-      CreateNoWindow = false, // https://github.com/dotnet/runtime/issues/68259
-      RedirectStandardOutput = true,
-    };
-    foreach (var arg in args ?? Enumerable.Empty<string>()) {
-      psi.ArgumentList.Add(arg);
-    }
-    return psi;
-  }
-
-  public int RunProcess(ProcessStartInfo psi,
-    TextWriter outputWriter,
-    TextWriter errorWriter,
-    string errorMessage = null) {
-    return StartProcess(psi, outputWriter) is { } process ?
-      WaitForExit(process, outputWriter, errorWriter, errorMessage) : -1;
-  }
-
-  public int WaitForExit(Process process, TextWriter outputWriter, TextWriter errorWriter, string errorMessage = null) {
-
-    var errorProcessing = Task.Run(() => {
-      PassthroughBuffer(process.StandardError, errorWriter);
-    });
-    PassthroughBuffer(process.StandardOutput, outputWriter);
-    process.WaitForExit();
-    if (process.ExitCode != 0 && errorMessage != null) {
-      outputWriter.WriteLine("{0} Process exited with exit code {1}", errorMessage, process.ExitCode);
-    }
-
-    errorProcessing.Wait();
-    return process.ExitCode;
-  }
-
-
-  // We read character by character because we did not find a way to ensure
-  // final newlines are kept when reading line by line
-  protected static void PassthroughBuffer(TextReader input, TextWriter output) {
-    int current;
-    while ((current = input.Read()) != -1) {
-      output.Write((char)current);
-    }
-  }
-
-  public Process StartProcess(ProcessStartInfo psi, TextWriter outputWriter) {
-    string additionalInfo = "";
-
-    try {
-      psi.RedirectStandardError = true;
-      if (Process.Start(psi) is { } process) {
-        return process;
-      }
-    } catch (System.ComponentModel.Win32Exception e) {
-      additionalInfo = $": {e.Message}";
-    }
-
-    outputWriter.WriteLine($"Error: Unable to start {psi.FileName}{additionalInfo}");
-    return null;
-  }
-
-  public override bool CompileTargetProgram(string dafnyProgramName, string targetProgramText, string/*?*/ callToMain, string/*?*/ targetFilename,
-    ReadOnlyCollection<string> otherFileNames,
-    bool runAfterCompile, TextWriter outputWriter, out object compilationResult) {
-    Contract.Requires(dafnyProgramName != null);
-    Contract.Requires(targetProgramText != null);
-    Contract.Requires(otherFileNames != null);
-    Contract.Requires(otherFileNames.Count == 0 || targetFilename != null);
-    Contract.Requires(this.SupportsInMemoryCompilation || targetFilename != null);
-    Contract.Requires(!runAfterCompile || callToMain != null);
-    Contract.Requires(outputWriter != null);
-
-    compilationResult = null;
-    return true;
-  }
-
-  public override bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain /*?*/,
-    string targetFilename /*?*/, ReadOnlyCollection<string> otherFileNames,
-    object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
-    Contract.Requires(dafnyProgramName != null);
-    Contract.Requires(targetProgramText != null);
-    Contract.Requires(otherFileNames != null);
-    Contract.Requires(otherFileNames.Count == 0 || targetFilename != null);
-    Contract.Requires(outputWriter != null);
-    return true;
-  }
-
-  public override void InstrumentCompiler(CompilerInstrumenter instrumenter, Program dafnyProgram) {
-    if (compiler == null) {
-      return;
-    }
-
-    instrumenter.Instrument(this, compiler, dafnyProgram);
-  }
-
-  protected static void WriteFromFile(string inputFilename, TextWriter outputWriter) {
-    var rd = new StreamReader(new FileStream(inputFilename, FileMode.Open, FileAccess.Read));
-    SinglePassCompiler.WriteFromStream(rd, outputWriter);
-  }
-
-  protected bool RunTargetDafnyProgram(string targetFilename, TextWriter outputWriter, TextWriter errorWriter, bool verify) {
-
-    /*
-     * In order to work for the continuous integration, we need to call the Dafny compiler using dotnet
-     * because dafny is not currently in the path
-     */
-
-    var where = System.Reflection.Assembly.GetExecutingAssembly().Location;
-    where = Path.GetDirectoryName(where);
-    var dafny = where + "/Dafny.dll";
-
-    var opt = Options;
-    var args = opt.MainArgs
-      .Prepend(targetFilename);
-    if (!verify) {
-      args = args.Prepend("--no-verify");
-    }
-    args = args
-      .Prepend("--target:cs")
-      .Prepend("run")
-      .Prepend(dafny);
-    var psi = PrepareProcessStartInfo("dotnet", args);
-    Console.Out.WriteLine(string.Join(", ", psi.ArgumentList));
-    /*
-     * When this code was written, the Dafny compiler cannot be made completely silent.
-     * This is a problem for this specific compiler and the integration tests because the second
-     * call to the compiler makes unexpected writes to the output.
-     * The following code is catching the output from the second compiler call (the one that executes the code)
-     * and stripping out the first two lines and the last line.
-     */
-
-    psi.RedirectStandardOutput = true;
-    var process = new Process();
-    process.StartInfo = psi;
-    var outputBuilder = new List<string>();
-    var errorBuilder = new List<string>();
-    process.OutputDataReceived += (sender, args) => outputBuilder.Add(args.Data);
-    process.ErrorDataReceived += (sender, args) => errorBuilder.Add(args.Data);
-
-    try {
-      process.Start();
-      process.BeginOutputReadLine();
-      process.BeginErrorReadLine();
-      process.WaitForExit();
-      process.CancelOutputRead();
-      process.CancelErrorRead();
-
-      for (int i = 2; i < outputBuilder.Count - 1; i++) {
-        outputWriter.WriteLine(outputBuilder[i]);
-      }
-
-      for (int i = 0; i < errorBuilder.Count - 1; i++) {
-        errorWriter.WriteLine(errorBuilder[i]);
-      }
-
-      if (process.ExitCode != 0) {
-        outputWriter.WriteLine("{0} Process exited with exit code {1}", "", process.ExitCode);
-        return false;
-      }
-
-    } catch (System.ComponentModel.Win32Exception e) {
-      string additionalInfo = $": {e.Message}";
-      outputWriter.WriteLine($"Error: Unable to start {psi.FileName}{additionalInfo}");
-      return false;
-    }
-
-    return true;
-  }
-}
diff --git a/Source/DafnyCore/Compilers/GoLang/Compiler-go.cs b/Source/DafnyCore/Compilers/GoLang/Compiler-go.cs
deleted file mode 100644
index b25267075c5..00000000000
--- a/Source/DafnyCore/Compilers/GoLang/Compiler-go.cs
+++ /dev/null
@@ -1,3817 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-//
-//-----------------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.IO;
-using System.Diagnostics.Contracts;
-using System.Collections.ObjectModel;
-using System.Text.RegularExpressions;
-using JetBrains.Annotations;
-using static Microsoft.Dafny.ConcreteSyntaxTreeUtils;
-
-namespace Microsoft.Dafny.Compilers {
-  class GoCompiler : SinglePassCompiler {
-    public GoCompiler(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
-      if (Options?.CoverageLegendFile != null) {
-        Imports.Add(new Import { Name = "DafnyProfiling", Path = "DafnyProfiling" });
-      }
-    }
-
-    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
-      Feature.MethodSynthesis,
-      Feature.ExternalConstructors,
-      Feature.SubsetTypeTests,
-      Feature.AllUnderscoreExternalModuleNames
-    };
-
-    string FormatDefaultTypeParameterValue(TopLevelDecl tp) {
-      Contract.Requires(tp is TypeParameter || tp is AbstractTypeDecl);
-      return $"_default_{tp.GetCompileName(Options)}";
-    }
-
-    private readonly List<Import> Imports = new List<Import>(StandardImports);
-    private string ModuleName;
-    private ConcreteSyntaxTree RootImportWriter;
-    private ConcreteSyntaxTree RootImportDummyWriter;
-
-    private string MainModuleName;
-    private static List<Import> StandardImports =
-      new List<Import> {
-        new Import { Name = "_dafny", Path = "dafny" },
-        new Import { Name = "os", Path = "os" },
-      };
-    private static string DummyTypeName = "Dummy__";
-
-    private struct Import {
-      public string Name, Path;
-      public bool SuppressDummy;
-    }
-
-    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
-      wr.WriteLine("// Dafny program {0} compiled into Go", program.Name);
-
-      ModuleName = MainModuleName = program.MainMethod != null ? "main" : TransformToClassName(Path.GetFileNameWithoutExtension(program.Name));
-
-      wr.WriteLine("package {0}", ModuleName);
-      wr.WriteLine();
-      // Keep the import writers so that we can import subsequent modules into the main one
-      EmitImports(wr, out RootImportWriter, out RootImportDummyWriter);
-
-      if (Options.IncludeRuntime) {
-        var rt = wr.NewFile("dafny/dafny.go");
-        ReadRuntimeSystem(program, "DafnyRuntime.go", rt);
-        rt = wr.NewFile("dafny/dafnyFromDafny.go");
-        ReadRuntimeSystem(program, "DafnyRuntimeFromDafny.go", rt);
-      }
-    }
-
-    protected override void EmitBuiltInDecls(SystemModuleManager systemModuleManager, ConcreteSyntaxTree wr) {
-    }
-
-    private string DafnyTypeDescriptor => $"{HelperModulePrefix}TypeDescriptor";
-
-    // The implementation of seq<T> is now in DafnyRuntimeDafny/src/dafnyRuntime.dfy.
-    // We have to special-case compiling this code a little bit in places to work around
-    // features Dafny doesn't support, such as customizing the definition of equality.
-    private bool IsDafnySequence(TopLevelDecl d) =>
-      Options.Get(DeveloperOptionBag.Bootstrapping) && d.GetFullCompileName(Options) == "dafny.Sequence";
-
-    private string DafnySequenceCompanion => $"{HelperModulePrefix}Companion_Sequence_";
-
-    void EmitModuleHeader(ConcreteSyntaxTree wr) {
-      wr.WriteLine("// Package {0}", ModuleName);
-      wr.WriteLine("// Dafny module {0} compiled into Go", ModuleName);
-      wr.WriteLine();
-      wr.WriteLine("package {0}", ModuleName);
-      wr.WriteLine();
-      // This is a non-main module; it only imports things declared before it, so we don't need these writers
-      EmitImports(wr, out _, out _);
-      wr.WriteLine();
-      wr.WriteLine("type {0} struct{{}}", DummyTypeName);
-      wr.WriteLine();
-    }
-
-    void EmitImports(ConcreteSyntaxTree wr, out ConcreteSyntaxTree importWriter, out ConcreteSyntaxTree importDummyWriter) {
-      wr.WriteLine("import (");
-      importWriter = wr.Fork(1);
-      wr.WriteLine(")");
-      importDummyWriter = wr.Fork();
-      if (ModuleName != "dafny") {
-        foreach (var import in Imports) {
-          EmitImport(import, importWriter, importDummyWriter);
-        }
-      }
-    }
-
-    public static string TransformToClassName(string baseName) =>
-      Regex.Replace(baseName, "[^_A-Za-z0-9$]", "_");
-
-    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
-      var companion = TypeName_Companion(UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(mainMethod.EnclosingClass), wr, mainMethod.tok, mainMethod);
-
-      var wBody = wr.NewNamedBlock("func main()");
-      wBody.WriteLine("defer _dafny.CatchHalt()");
-
-      var idName = IssueCreateStaticMain(mainMethod) ? "Main" : IdName(mainMethod);
-
-      Coverage.EmitSetup(wBody);
-      wBody.WriteLine($"{companion}.{idName}({GetHelperModuleName()}.{CharMethodQualifier}FromMainArguments(os.Args))");
-      Coverage.EmitTearDown(wBody);
-    }
-
-    ConcreteSyntaxTree CreateDescribedSection(string desc, ConcreteSyntaxTree wr, params object[] args) {
-      var body = wr.Fork();
-      var str = string.Format(desc, args);
-      body.WriteLine("// Definition of {0}", str);
-      wr.WriteLine("// End of {0}", str);
-      return body;
-    }
-
-    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
-      var wr = ((GoCompiler.ClassWriter)cw).ConcreteMethodWriter;
-      return wr.NewNamedBlock("func (_this * {0}) Main({1} _dafny.Sequence)", FormatCompanionTypeName(((GoCompiler.ClassWriter)cw).ClassName), argsParameterName);
-    }
-
-    private Import CreateImport(string moduleName, bool isDefault, bool isExtern, string /*?*/ libraryName) {
-      string pkgName;
-      if (libraryName != null) {
-        pkgName = libraryName;
-      } else {
-        // Go ignores all filenames starting with underscores.  So we're forced
-        // to rewrite "__default" to "default__".
-        pkgName = moduleName;
-        if (pkgName != "" && pkgName.All(c => c == '_')) {
-          throw new UnsupportedFeatureException(Token.NoToken, Feature.AllUnderscoreExternalModuleNames,
-            $"Cannot have a package name with only underscores: {pkgName}");
-        }
-        while (pkgName.StartsWith("_")) {
-          pkgName = pkgName.Substring(1) + "_";
-        }
-      }
-
-      var import = new Import { Name = moduleName, Path = pkgName };
-      if (isExtern) {
-        // Allow the library name to be "" to import built-in things like the error type
-        if (pkgName != "") {
-          import.SuppressDummy = true;
-        }
-      }
-
-      return import;
-    }
-
-    protected override ConcreteSyntaxTree CreateModule(string moduleName, bool isDefault, bool isExtern, string/*?*/ libraryName, ConcreteSyntaxTree wr) {
-      if (isDefault) {
-        // Fold the default module into the main module
-        return wr;
-      }
-
-      var import = CreateImport(moduleName, isDefault, isExtern, libraryName);
-
-      var filename = string.Format("{0}/{0}.go", import.Path);
-      var w = wr.NewFile(filename);
-      ModuleName = moduleName;
-      EmitModuleHeader(w);
-
-      AddImport(import);
-
-      return w;
-    }
-
-    protected override void DependOnModule(string moduleName, bool isDefault, bool isExtern, string libraryName) {
-      var import = CreateImport(moduleName, isDefault, isExtern, libraryName);
-      AddImport(import);
-    }
-
-    protected override void FinishModule() {
-      ModuleName = MainModuleName;
-    }
-
-    private void AddImport(Import import) {
-      // Import in root module
-      EmitImport(import, RootImportWriter, RootImportDummyWriter);
-      // Import in all subsequent modules
-      Imports.Add(import);
-    }
-
-    private void EmitImport(Import import, ConcreteSyntaxTree importWriter, ConcreteSyntaxTree importDummyWriter) {
-      var id = IdProtect(import.Name);
-      var path = import.Path;
-
-      importWriter.WriteLine("{0} \"{1}\"", id, path);
-
-      if (!import.SuppressDummy) {
-        if (id == "os") {
-          importDummyWriter.WriteLine("var _ = os.Args");
-        } else {
-          importDummyWriter.WriteLine("var _ {0}.{1}", id, DummyTypeName);
-        }
-      }
-    }
-
-    protected override string GetHelperModuleName() => "_dafny";
-
-    private string HelperModulePrefix => ModuleName == "dafny" ? "" : $"{GetHelperModuleName()}.";
-
-    protected override IClassWriter CreateClass(string moduleName, string name, bool isExtern, string/*?*/ fullPrintName,
-      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type>/*?*/ superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      var isDefaultClass = cls is DefaultClassDecl;
-
-      bool isSequence = superClasses.Any(superClass => superClass is UserDefinedType udt && IsDafnySequence(udt.ResolvedClass));
-      return CreateClass(cls, name, isExtern, fullPrintName, typeParameters, superClasses, tok, wr, includeRtd: !isDefaultClass, includeEquals: !isSequence, includeString: !isSequence);
-    }
-
-    // TODO Consider splitting this into two functions; most things seem to be passing includeRtd: false, includeEquals: false and includeString: true.
-    private GoCompiler.ClassWriter CreateClass(TopLevelDecl classContext, string name, bool isExtern, string/*?*/ fullPrintName, List<TypeParameter>/*?*/ typeParameters, List<Type>/*?*/ superClasses, IToken tok, ConcreteSyntaxTree wr, bool includeRtd, bool includeEquals, bool includeString) {
-      // See docs/Compilation/ReferenceTypes.md for a description of how instance members of classes and traits are compiled into Go.
-      //
-      // func New_Class_(Type0 _dafny.TypeDescriptor, Type1 _dafny.TypeDescriptor) *Class {
-      //   _this := Class{}
-      //
-      //   // Have to do it this way because some default values (namely type
-      //   // parameters) assume that _this points to the current value
-      //   _this.Type0 = Type0
-      //   _this.Type1 = Type1
-      //   _this.Field0 = ...
-      //   _this.Field1 = ...
-      //   return &_this
-      // }
-      //
-      // func (_this *Class) InstanceMethod(param0 type0, ...) returnType {
-      //   ...
-      // }
-      //
-      // func (_this *CompanionStruct_Class) StaticMethod(param0 type0, ...) returnType {
-      //   ...
-      // }
-      //
-      // func (*Class) String() string {
-      //   return "module.Class"
-      // }
-      //
-      // func Type_Class_(Type0 _dafny.TypeDescriptor, Type1 _dafny.TypeDescriptor) _dafny.TypeDescriptor {
-      //   return type_Class_{Type0, Type1}
-      // }
-      //
-      // type type_Class_ struct{
-      //   Type0 _dafny.TypeDescriptor
-      //   Type1 _dafny.TypeDescriptor
-      // }
-      //
-      // func (_this type_Class_) Default() any {
-      //   return (*Class)(nil)
-      // }
-      //
-      // func (_this type_Class_) String() string {
-      //   return "module.Class"
-      // }
-      //
-      name = Capitalize(name);
-
-      var w = CreateDescribedSection("class {0}", wr, name);
-
-      var instanceFieldWriter = w.NewBlock(string.Format("type {0} struct", name));
-
-      w.WriteLine();
-      CreateInitializer(classContext, name, w, out var instanceFieldInitWriter, out var traitInitWriter, out var rtdParamWriter);
-
-      var isNewtypeWithTraits = classContext is NewtypeDecl { ParentTraits: { Count: > 0 } };
-
-      var rtdCount = 0;
-      if (typeParameters != null) {
-        rtdCount = WriteRuntimeTypeDescriptorsFields(typeParameters, false, instanceFieldWriter, instanceFieldInitWriter, rtdParamWriter);
-      }
-      if (isNewtypeWithTraits) {
-        var udt = UserDefinedType.FromTopLevelDecl(classContext.tok, classContext);
-        rtdParamWriter.Write($"value {TypeName(udt, rtdParamWriter, classContext.tok)}");
-      }
-
-      w.WriteLine();
-      var staticFieldWriter = w.NewNamedBlock("type {0} struct", FormatCompanionTypeName(name));
-      var staticFieldInitWriter = w.NewNamedBlock("var {0} = {1}", FormatCompanionName(name), FormatCompanionTypeName(name));
-
-      if (includeEquals) {
-        // This Equals() is so simple that we could just use == instead, but uniformity is good and it'll get inlined anyway.
-
-        w.WriteLine();
-        var wEquals = w.NewNamedBlock("func (_this *{0}) Equals(other *{0}) bool", name);
-        wEquals.WriteLine("return _this == other");
-
-        w.WriteLine();
-        var wEqualsGeneric = w.NewNamedBlock("func (_this *{0}) EqualsGeneric(x interface{{}}) bool", name);
-        wEqualsGeneric.WriteLine("other, ok := x.(*{0})", name);
-        wEqualsGeneric.WriteLine("return ok && _this.Equals(other)");
-      }
-
-      w.WriteLine();
-      if (includeString) {
-        if (isNewtypeWithTraits) {
-          var wString = w.NewNamedBlock("func (_this *{0}) String() string", name);
-          wString.WriteLine("return _dafny.String(_this._value)");
-        } else {
-          var wString = w.NewNamedBlock("func (*{0}) String() string", name);
-          // Be consistent with other back ends, which don't fold _module into the main module
-          var module = ModuleName == MainModuleName ? "_module" : ModuleName;
-          wString.WriteLine("return \"{0}.{1}\"", module, name);
-        }
-      }
-
-      if (includeRtd) {
-        CreateRTD(name, typeParameters, out var wDefault, w);
-
-        wDefault.WriteLine("return (*{0})(nil)", name);
-      }
-
-      var cw = new ClassWriter(this, classContext, tok != null, name, isExtern, null, w, instanceFieldWriter, instanceFieldInitWriter, traitInitWriter, staticFieldWriter, staticFieldInitWriter);
-
-      if (superClasses != null) {
-        superClasses = superClasses.Where(trait => !trait.IsObject).ToList();
-        EmitParentTraits(tok, name, true, superClasses, w);
-      }
-      return cw;
-    }
-
-    private void EmitParentTraits(IToken tok, string childName, bool childIsUsedAsPointer, List<Type> parentTraits, ConcreteSyntaxTree wr) {
-      var star = childIsUsedAsPointer ? "*" : "";
-      var addressOf = childIsUsedAsPointer ? "&" : "";
-      // Emit a method that returns the ID of each parent trait
-      var parentTraitsWriter = wr.NewBlock($"func (_this {star}{childName}) ParentTraits_() []*{HelperModulePrefix}TraitID");
-      parentTraitsWriter.WriteLine("return [](*{0}TraitID){{{1}}};", HelperModulePrefix, Util.Comma(parentTraits, parent => {
-        var trait = ((UserDefinedType)parent).ResolvedClass;
-        return TypeName_Companion(trait, parentTraitsWriter, tok) + ".TraitID_";
-      }));
-
-      foreach (Type typ in parentTraits) {
-        // Emit a compile-time sanity check that the class emitted does indeed have the methods required by the parent trait
-        wr.WriteLine($"var _ {TypeName(typ, wr, tok)} = {addressOf}{childName}{{}}");
-      }
-
-      wr.WriteLine($"var _ {HelperModulePrefix}TraitOffspring = {addressOf}{childName}{{}}");
-
-      wr.WriteLine();
-    }
-
-    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
-      TraitDecl trait, List<Type> superClasses /*?*/, IToken tok, ConcreteSyntaxTree wr) {
-      //
-      // type Trait interface {
-      //   String() string
-      //   AbstractMethod0(param0 type0, ...) returnType0
-      //   ...
-      // }
-      //
-      // type companionStruct_Trait_ struct {
-      //   StaticField0 type0
-      //   StaticField1 type1
-      //   ...
-      // }
-      //
-      // var Companion_Trait_ = companionStruct_Trait{
-      //   StaticField0: ...,
-      //   StaticField1: ...,
-      // }
-      //
-      // func (_static *companionStruct_Trait) CastTo_(x any) Trait {
-      //   var t Trait
-      //   t, _ = x.(Trait)
-      //   return t
-      // }
-      //
-      // func (_static *companionStruct_Trait) ConcreteInstanceMethod(_this Trait, ...) ... {
-      //   ...
-      // }
-      //
-      // func (_static *companionStruct_Trait) StaticMethod(...) ... {
-      //   ...
-      // }
-      wr = CreateDescribedSection("trait {0}", wr, name);
-      var abstractMethodWriter = wr.NewNamedBlock("type {0} interface", name);
-      var concreteMethodWriter = wr.Fork();
-      abstractMethodWriter.WriteLine("String() string");
-      if (IsDafnySequence(trait)) {
-        abstractMethodWriter.WriteLine("Equals(other Sequence) bool");
-        abstractMethodWriter.WriteLine("EqualsGeneric(x interface{}) bool");
-        abstractMethodWriter.WriteLine("VerbatimString(isLiteral bool) string");
-      }
-
-      var staticFieldWriter = wr.NewNamedBlock("type {0} struct", FormatCompanionTypeName(name));
-      var staticFieldInitWriter = wr.NewNamedBlock("var {0} = {1}", FormatCompanionName(name), FormatCompanionTypeName(name));
-      var wCastTo = wr.NewNamedBlock("func ({0}) CastTo_(x interface{{}}) {1}", FormatCompanionTypeName(name), name);
-      wCastTo.WriteLine("var t {0}", name);
-      wCastTo.WriteLine("t, _ = x.({0})", name);
-      wCastTo.WriteLine("return t");
-
-
-      var cw = new ClassWriter(this, trait, false, name, isExtern, abstractMethodWriter, concreteMethodWriter, null, null, null, staticFieldWriter, staticFieldInitWriter);
-      staticFieldWriter.WriteLine($"TraitID_ *{HelperModulePrefix}TraitID");
-      staticFieldInitWriter.WriteLine($"TraitID_: &{HelperModulePrefix}TraitID{{}},");
-      return cw;
-    }
-
-    protected void CreateInitializer(TopLevelDecl classContext, string name, ConcreteSyntaxTree wr,
-      out ConcreteSyntaxTree instanceFieldInitWriter, out ConcreteSyntaxTree traitInitWriter, out ConcreteSyntaxTree rtdParamWriter) {
-      wr.Write("func {0}(", FormatInitializerName(name));
-      rtdParamWriter = wr.Fork();
-      var w = wr.NewNamedBlock(") *{0}", name);
-      var parameters = classContext is NewtypeDecl { ParentTraits: { Count: > 0 } } ? "value" : "";
-      w.WriteLine($"_this := {name}{{{parameters}}}");
-
-      w.WriteLine();
-      instanceFieldInitWriter = w.Fork();
-      traitInitWriter = w.Fork();
-      w.WriteLine("return &_this");
-    }
-
-    protected override bool SupportsProperties => false;
-
-    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
-      // FIXME: There should be tests to make sure that the finalizer mechanism achieves what I hope it does, namely allowing the iterator's goroutine to be garbage-collected along with the iterator.
-      //
-      // type MyIteratorExample struct {
-      //   cont chan<- struct{}
-      //   yielded <-chan struct{}
-      //
-      //   // Fields
-      // }
-      //
-      // func (_this * MyIteratorExample) Ctor__(/* params */) {
-      //   _cont := make(chan struct{})
-      //   _yielded := make(chan struct{})
-      //   _this.cont = _cont
-      //   _this.yielded = _yielded
-      //   // assign params
-      //
-      //   go _this.run(_cont, _yielded)
-      //
-      //   _dafny.SetFinalizer(this_, func(_ MyIteratorExample) {
-      //     close(_cont) // will cause the iterator to return and close _yielded
-      //   })
-      // }
-      //
-      // func (_this * MyIteratorExample) MoveNext() bool {
-      //   _this.cont <- struct{}{}
-      //   _, ok <- _this.yielded
-      //
-      //   return ok
-      // }
-      //
-      // func (_this * MyIteratorExample) run(_cont <-chan struct{}, _yielded chan<- struct{}) {
-      //   defer close(_yielded)
-      //
-      //   var _ok bool
-      //   _, _ok = <- _cont
-      //   if !_ok { return }
-      //
-      //   // Statements ... yield becomes:
-      //   _yielded <- struct{}{}
-      //   _, _ok = <- _cont
-      //   if !_ok { return }
-      //
-      //   // break becomes:
-      //   return
-      // }()
-      var cw = CreateClass(iter, IdName(iter), false, null, iter.TypeArgs, null, null, wr, includeRtd: false, includeEquals: false, includeString: true);
-
-      cw.InstanceFieldWriter.WriteLine("cont chan<- struct{}");
-      cw.InstanceFieldWriter.WriteLine("yielded <-chan struct{}");
-
-      Constructor ct = null;
-      foreach (var member in iter.Members) {
-        if (member is Field f && !f.IsGhost) {
-          cw.DeclareField(IdName(f), iter, false, false, f.Type, f.tok, PlaceboValue(f.Type, wr, f.tok, true), f);
-        } else if (member is Constructor c) {
-          Contract.Assert(ct == null);
-          ct = c;
-        }
-      }
-      Contract.Assert(ct != null);
-
-      cw.ConcreteMethodWriter.Write("func (_this * {0}) {1}(", IdName(iter), IdName(ct));
-      string sep = "";
-      foreach (var p in ct.Ins) {
-        if (!p.IsGhost) {
-          // here we rely on the parameters and the corresponding fields having the same names
-          cw.ConcreteMethodWriter.Write("{0}{1} {2}", sep, IdName(p), TypeName(p.Type, wr, p.tok));
-          sep = ", ";
-        }
-      }
-      var wCtor = cw.ConcreteMethodWriter.NewBlock(")");
-      wCtor.WriteLine("_cont := make(chan struct{})");
-      wCtor.WriteLine("_yielded := make(chan struct{})");
-      wCtor.WriteLine("_this.cont = _cont");
-      wCtor.WriteLine("_this.yielded = _yielded");
-      wCtor.WriteLine();
-      foreach (var p in ct.Ins) {
-        if (!p.IsGhost) {
-          wCtor.WriteLine("_this.{0} = {1}", Capitalize(IdName(p)), IdName(p));
-        }
-      }
-      wCtor.WriteLine();
-      wCtor.WriteLine("go _this.run(_cont, _yielded)");
-      wCtor.WriteLine();
-      wCtor.WriteLine("_dafny.SetFinalizer(_this, func(_ * {0}) {{ close(_cont) }})", IdName(iter));
-
-      var wMoveNext = cw.ConcreteMethodWriter.NewNamedBlock("func (_this * {0}) MoveNext() bool", IdName(iter));
-      wMoveNext.WriteLine("_this.cont <- struct{}{}");
-      wMoveNext.WriteLine("_, ok := <- _this.yielded");
-      wMoveNext.WriteLine();
-      wMoveNext.WriteLine("return ok");
-
-      var wRun = cw.ConcreteMethodWriter.NewNamedBlock("func (_this * {0}) run(_cont <-chan struct{{}}, _yielded chan<- struct{{}})", IdName(iter));
-      wRun.WriteLine("defer close(_yielded)");
-      wRun.WriteLine();
-      wRun.WriteLine("_, _ok := <- _cont");
-      wRun.WriteLine("if !_ok { return }");
-      wRun.WriteLine();
-
-      return wRun;
-    }
-
-    protected override IClassWriter/*?*/ DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
-      // ===== For inductive datatypes:
-      //
-      // type Dt struct {
-      //   Data_Dt_
-      // }
-      //
-      // type Data_Dt_ interface {
-      //   isDt()
-      // }
-      //
-      // // For uniformity with co-datatypes
-      // func (_this Dt) Get_() Data_Dt_ {
-      //   return _this.Data_Dt_
-      // }
-      //
-      // type CompanionStruct_Dt_ struct {}
-      //
-      // var Companion_Dt_ = CompanionStruct_Dt_ {}
-      //
-      // ...
-      //
-      // type Dt_Ctor0 struct {
-      //   Field0 type0
-      //   Field1 type1
-      //   ...
-      // }
-      //
-      // func (Dt_Ctor0) isDt() {}
-      //
-      // func (_ CompanionStruct_Dt_) CreateCtor0(field0 type0, field1 type1) Dt {
-      //   return Dt{Dt_Ctor0{type0, type1}}
-      // }
-      //
-      // func (_this Dt) IsCtor0() bool {
-      //   _, ok := _this.Data_Dt_.(Dt_Ctor0)
-      //   return ok
-      // }
-      //
-      // type Dt_Ctor1 struct {
-      //   ...
-      // }
-      //
-      // ...
-      //
-      // func (_this Dt) DtorDtor0() (dtor0Type, bool) {
-      //   return _this.Data_Dt_.(Dt_Ctor0).Field0
-      // }
-      //
-      // func (_this Dt) DtorDtor1() (dtor1Type, bool) {
-      //   switch data := _this.Data_Dt_.(type) {
-      //   case Dt_Ctor0:
-      //     return data.Field1
-      //   default:
-      //     return data.(Dt_Ctor1).Field0
-      //   }
-      // }
-      //
-      // func (_this Dt) String() { ... }
-      //
-      // func (_this Dt) EqualsGeneric(other any) bool { ... }
-      //
-      // func (CompanionStruct_Dt_) AllSingletonConstructors() _dafny.Iterator {
-      //   i := -1
-      //   return func() (any, bool) {
-      //     i++
-      //     switch i {
-      //       case 0:
-      //         return Companion_Dt_.Create_Ctor0(), true
-      //       case 1:
-      //         return Companion_Dt_.Create_Ctor1(), true
-      //       ...
-      //       default:
-      //         return Dt{}, false
-      //     }
-      //   }
-      // }
-      //
-      // func Type_Dt_(tyArg0 Type, tyArg1 Type, ...) _dafny.TypeDescriptor {
-      //   return type_Dt_{tyArg0, tyArg1, ...}
-      // }
-      //
-      // type type_Dt_ struct {
-      //   tyArg0 Type
-      //   tyArg1 Type
-      // }
-      //
-      // func (ty type_Dt_) Default() any {
-      //   tyArg0 := ty.tyArg0
-      //   tyArg1 := ty.tyArg1
-      //   return Companion_Dt_.Create_CtorK(...)
-      // }
-      //
-      // func (ty type_Dt_) String() string {
-      //   return "module.Dt"
-      // }
-      //
-      // TODO Optimize record types
-      //
-      // ===== For co-inductive datatypes:
-      //
-      // type Dt struct {
-      //   Iface_Dt_
-      // }
-      //
-      // type Iface_Dt_ interface {
-      //   Get_() Data_Dt_
-      // }
-      //
-      // type lazyDt struct {
-      //   value Iface_Dt_
-      //   init func() Dt
-      // }
-      //
-      // func (_this * lazyDt) Get_() *Iface_Dt {
-      //   if _this.value == nil {
-      //      _this.value = _this.init().Get_()
-      //      _this.init = nil // allow GC of values in closure
-      //   }
-      //   return _this.value
-      // }
-      //
-      // ...
-      //
-      // func (_ CompanionStruct_Dt_) LazyDt(f func() Dt) Dt {
-      //   return Dt{*lazyDt{nil, f}}
-      // }
-      //
-      // func (_ CompanionStruct_Dt_) CreateCtor0(field0 type0, field1 type1) Dt {
-      //   return Dt{*Dt_Ctor0{type0, type1}}
-      // }
-      //
-      // func (_this * Dt_Ctor0) Get_() Dt {
-      //   return _this
-      // }
-      if (dt is TupleTypeDecl) {
-        // Tuple types are declared once and for all in DafnyRuntime.go
-        return null;
-      }
-
-      string name = Capitalize(dt.GetCompileName(Options));
-      string companionTypeName = FormatCompanionTypeName(name);
-      string dataName = FormatDatatypeInterfaceName(name);
-      string ifaceName = FormatLazyInterfaceName(name);
-      var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, UserDefinedType.FromTopLevelDecl(dt.tok, dt));
-      var simplifiedTypeName = TypeName(simplifiedType, wr, dt.tok);
-
-      string StructOfCtor(DatatypeCtor ctor) {
-        return string.Format("{0}{1}_{2}", dt is CoDatatypeDecl ? "*" : "", name, ctor.GetCompileName(Options));
-      }
-
-      // from here on, write everything into the new block created here:
-      wr = CreateDescribedSection("{0} {1}", wr, dt.WhatKind, name);
-
-      if (dt is IndDatatypeDecl) {
-        var wStruct = wr.NewNamedBlock("type {0} struct", name);
-        WriteRuntimeTypeDescriptorsFields(dt.TypeArgs, false, wStruct, null, null);
-        wStruct.WriteLine(dataName);
-
-        wr.WriteLine();
-        var wGet = wr.NewNamedBlock("func (_this {0}) Get_() {1}", name, dataName);
-        wGet.WriteLine("return _this.{0}", dataName);
-      } else {
-        var wDt = wr.NewNamedBlock("type {0} struct", name);
-        WriteRuntimeTypeDescriptorsFields(dt.TypeArgs, false, wDt, null, null);
-        wDt.WriteLine(ifaceName);
-
-        wr.WriteLine();
-        var wIface = wr.NewNamedBlock("type {0} interface", ifaceName);
-        wIface.WriteLine("Get_() {0}", dataName);
-
-        wr.WriteLine();
-        var wLazy = wr.NewNamedBlock("type lazy_{0}_ struct", name);
-        wLazy.WriteLine("value {0}", dataName);
-        wLazy.WriteLine("init func() {0}", name);
-
-        wr.WriteLine();
-        var wLazyGet = wr.NewNamedBlock("func (_this *lazy_{0}_) Get_() {1}", name, dataName);
-        var wIf = wLazyGet.NewBlock("if _this.value == nil");
-        wIf.WriteLine("_this.value = _this.init().Get_()");
-        wIf.WriteLine("_this.init = nil"); // allow GC of values in closure
-
-        wLazyGet.WriteLine("return _this.value");
-
-        wr.WriteLine();
-        var typeDescriptorCount = WriteRuntimeTypeDescriptorsFormals(dt.TypeArgs, false, out var wrFormals, out var wrActuals);
-        var sep = typeDescriptorCount > 0 ? ", " : "";
-        var wLazyCreate = wr.NewNamedBlock($"func ({companionTypeName}) {FormatLazyConstructorName(name)}({wrFormals}{sep}f func () {name}) {name}");
-        wLazyCreate.WriteLine($"return {name}{{{wrActuals}{sep}&lazy_{name}_{{nil, f}}}}");
-      }
-
-      {
-        wr.WriteLine();
-        var wIface = wr.NewNamedBlock("type {0} interface", dataName);
-        wIface.WriteLine("is{0}()", name);
-      }
-
-      wr.WriteLine();
-      var staticFieldWriter = wr.NewNamedBlock("type {0} struct", companionTypeName);
-      var staticFieldInitWriter = wr.NewNamedBlock("var {0} = {1}", FormatCompanionName(name), companionTypeName);
-
-      string typeDescriptorDeclarations;
-      string typeDescriptorUses;
-      {
-        WriteRuntimeTypeDescriptorsFormals(dt.TypeArgs, false, out var wTypeDescriptorDeclarations, out var wTypeDescriptorUses);
-        typeDescriptorDeclarations = wTypeDescriptorDeclarations.ToString();
-        typeDescriptorUses = wTypeDescriptorUses.ToString();
-      }
-
-      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-        var ctorStructName = name + "_" + ctor.GetCompileName(Options);
-        wr.WriteLine();
-        var wStruct = wr.NewNamedBlock("type {0} struct", ctorStructName);
-        var k = 0;
-        foreach (var formal in ctor.Formals) {
-          if (!formal.IsGhost) {
-            wStruct.WriteLine("{0} {1}", DatatypeFieldName(formal, k), TypeName(formal.Type, wr, formal.Tok));
-            k++;
-          }
-        }
-
-        wr.WriteLine();
-        wr.WriteLine("func ({0}{1}) is{2}() {{}}", dt is CoDatatypeDecl ? "*" : "", ctorStructName, name);
-        wr.WriteLine();
-
-        wr.Write($"func ({companionTypeName}) {FormatDatatypeConstructorName(ctor.GetCompileName(Options))}({typeDescriptorDeclarations}");
-        var sep = typeDescriptorDeclarations.Length != 0 ? ", " : "";
-        var argNames = new List<string>();
-        k = 0;
-        foreach (var formal in ctor.Formals) {
-          if (!formal.IsGhost) {
-            var formalName = DatatypeFieldName(formal, k);
-
-            wr.Write($"{sep}{formalName} {TypeName(formal.Type, wr, formal.Tok)}");
-
-            argNames.Add(formalName);
-            sep = ", ";
-            k++;
-          }
-        }
-        var wCreateBody = wr.NewNamedBlock(") {0}", name);
-        sep = typeDescriptorDeclarations.Length != 0 ? ", " : "";
-        var co = dt is CoDatatypeDecl ? "&" : "";
-        wCreateBody.WriteLine($"return {name}{{{typeDescriptorUses}{sep}{co}{ctorStructName}{{{Util.Comma(argNames)}}}}}");
-
-        wr.WriteLine();
-        var wCheck = wr.NewNamedBlock("func (_this {0}) {1}() bool", name, FormatDatatypeConstructorCheckName(ctor.GetCompileName(Options)));
-        wCheck.WriteLine("_, ok := _this.Get_().({0})", StructOfCtor(ctor));
-        wCheck.WriteLine("return ok");
-
-        if (dt is CoDatatypeDecl) {
-          wr.WriteLine();
-          var wGet = wr.NewNamedBlock("func (_this *{0}) Get_() {1}", ctorStructName, dataName);
-          wGet.WriteLine("return _this");
-        }
-      }
-
-      /* func (_static CompanionStruct_Dt_) Default(_default_A any, _default_B any) Dt {
-       *   return Dt{Dt_GroundingCtor{...}}
-       * }
-       */
-      wr.WriteLine();
-      wr.Write($"func ({companionTypeName}) Default({typeDescriptorDeclarations}");
-      var usedParameters = UsedTypeParameters(dt);
-      if (typeDescriptorDeclarations.Length != 0 && usedParameters.Count != 0) {
-        wr.Write(", ");
-      }
-      wr.Write(usedParameters.Comma(tp => $"{FormatDefaultTypeParameterValue(tp)} interface{{}}"));
-      {
-        var wDefault = wr.NewBlock($") {simplifiedTypeName}");
-        wDefault.Write("return ");
-        var groundingCtor = dt.GetGroundingCtor();
-        if (groundingCtor.IsGhost) {
-          wDefault.Write(ForcePlaceboValue(simplifiedType, wDefault, dt.tok));
-        } else if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
-          wDefault.Write(DefaultValue(innerType, wDefault, dt.tok));
-        } else {
-          var nonGhostFormals = groundingCtor.Formals.Where(f => !f.IsGhost).ToList();
-          var arguments = nonGhostFormals.Comma(f => DefaultValue(f.Type, wDefault, f.tok));
-          EmitDatatypeValue(dt, groundingCtor, dt is CoDatatypeDecl, typeDescriptorUses, arguments, wDefault);
-        }
-        wDefault.WriteLine();
-      }
-
-      if (dt.HasFinitePossibleValues) {
-        wr.WriteLine();
-        var wSingles = wr.NewNamedBlock("func (_ {0}) AllSingletonConstructors() _dafny.Iterator", companionTypeName);
-        wSingles.WriteLine("i := -1");
-        wSingles = wSingles.NewNamedBlock("return func() (interface{{}}, bool)");
-        wSingles.WriteLine("i++");
-        wSingles = wSingles.NewNamedBlock("switch i");
-        var i = 0;
-        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-          wSingles.WriteLine("case {0}: return {1}.{2}(), true", i, FormatCompanionName(name), FormatDatatypeConstructorName(ctor.GetCompileName(Options)));
-          i++;
-        }
-        wSingles.WriteLine("default: return {0}{{}}, false", name);
-      }
-
-      // destructors
-      foreach (var ctor in dt.Ctors) {
-        foreach (var dtor in ctor.Destructors.Where(dtor => dtor.EnclosingCtors[0] == ctor)) {
-          var compiledConstructorCount = dtor.EnclosingCtors.Count(constructor => !constructor.IsGhost);
-          if (compiledConstructorCount != 0) {
-            var arg = dtor.CorrespondingFormals[0];
-            if (!arg.IsGhost && arg.HasName) {
-              wr.WriteLine();
-              var wDtor = wr.NewNamedBlock("func (_this {0}) {1}() {2}", name, FormatDatatypeDestructorName(arg.CompileName), TypeName(arg.Type, wr, arg.tok));
-              var n = dtor.EnclosingCtors.Count;
-              if (n == 1) {
-                wDtor.WriteLine("return _this.Get_().({0}).{1}", StructOfCtor(dtor.EnclosingCtors[0]), DatatypeFieldName(arg));
-              } else {
-                wDtor = wDtor.NewBlock("switch data := _this.Get_().(type)");
-                var compiledConstructorsProcessed = 0;
-                for (var i = 0; i < n; i++) {
-                  var ctor_i = dtor.EnclosingCtors[i];
-                  Contract.Assert(arg.CompileName == dtor.CorrespondingFormals[i].CompileName);
-                  if (ctor_i.IsGhost) {
-                    continue;
-                  }
-                  if (compiledConstructorsProcessed < compiledConstructorCount - 1) {
-                    wDtor.WriteLine("case {0}: return data.{1}", StructOfCtor(ctor_i), DatatypeFieldName(arg));
-                  } else {
-                    wDtor.WriteLine("default: return data.({0}).{1}", StructOfCtor(ctor_i), DatatypeFieldName(arg));
-                  }
-                  compiledConstructorsProcessed++;
-                }
-              }
-            }
-          }
-        }
-      }
-
-      {
-        // String() method
-        wr.WriteLine();
-        var w = wr.NewNamedBlock("func (_this {0}) String() string", name);
-        // TODO Avoid switch if only one branch
-        var needData = dt is IndDatatypeDecl && dt.Ctors.Exists(ctor => !ctor.IsGhost && ctor.Formals.Exists(arg => !arg.IsGhost));
-        w = w.NewNamedBlock("switch {0}_this.Get_().(type)", needData ? "data := " : "");
-        w.WriteLine("case nil: return \"null\"");
-        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-          var wCase = w.NewNamedBlock("case {0}:", StructOfCtor(ctor));
-          var nm = (dt.EnclosingModuleDefinition.IsDefaultModule ? "" : dt.EnclosingModuleDefinition.Name + ".") + dt.Name + "." + ctor.Name;
-          if (dt is CoDatatypeDecl) {
-            wCase.WriteLine("return \"{0}\"", nm);
-          } else {
-            wCase.Write("return \"{0}\"", nm);
-            var sep = " + \"(\" + ";
-            var anyFormals = false;
-            var k = 0;
-            foreach (var arg in ctor.Formals) {
-              if (!arg.IsGhost) {
-                anyFormals = true;
-                if (UnicodeCharEnabled && arg.Type.IsStringType) {
-                  wCase.Write($"{sep}data.{DatatypeFieldName(arg, k)}.VerbatimString(true)");
-                } else {
-                  wCase.Write($"{sep}{HelperModulePrefix}String(data.{DatatypeFieldName(arg, k)})");
-                }
-
-                sep = " + \", \" + ";
-                k++;
-              }
-            }
-            if (anyFormals) {
-              wCase.Write(" + \")\"");
-            }
-            wCase.WriteLine();
-          }
-        }
-        var wDefault = w.NewBlock("default:");
-        if (dt is CoDatatypeDecl) {
-          wDefault.WriteLine("return \"{0}.{1}.unexpected\"", dt.EnclosingModuleDefinition.GetCompileName(Options), dt.GetCompileName(Options));
-        } else {
-          wDefault.WriteLine("return \"<unexpected>\"");
-        }
-      }
-
-      // Equals method
-      {
-        wr.WriteLine();
-        var wEquals = wr.NewNamedBlock("func (_this {0}) Equals(other {0}) bool", name);
-        // TODO: Way to implement shortcut check for address equality?
-        var needData1 = dt.Ctors.Exists(ctor => !ctor.IsGhost && ctor.Formals.Exists(arg => !arg.IsGhost));
-
-        wEquals = wEquals.NewNamedBlock("switch {0}_this.Get_().(type)", needData1 ? "data1 := " : "");
-        foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-          var wCase = wEquals.NewNamedBlock("case {0}:", StructOfCtor(ctor));
-
-          var needData2 = ctor.Formals.Exists(arg => !arg.IsGhost);
-
-          wCase.WriteLine("{0}, ok := other.Get_().({1})", needData2 ? "data2" : "_", StructOfCtor(ctor));
-          wCase.Write("return ok");
-          var k = 0;
-          foreach (Formal arg in ctor.Formals) {
-            if (!arg.IsGhost) {
-              wCase.Write(" && ");
-              string nm = DatatypeFieldName(arg, k);
-              var eqType = DatatypeWrapperEraser.SimplifyType(Options, arg.Type);
-              if (IsDirectlyComparable(eqType)) {
-                wCase.Write("data1.{0} == data2.{0}", nm);
-              } else if (IsOrderedByCmp(eqType)) {
-                wCase.Write("data1.{0}.Cmp(data2.{0}) == 0", nm);
-              } else if (IsComparedByEquals(eqType)) {
-                wCase.Write("data1.{0}.Equals(data2.{0})", nm);
-              } else {
-                wCase.Write("{0}AreEqual(data1.{1}, data2.{1})", HelperModulePrefix, nm);
-              }
-              k++;
-            }
-          }
-          wCase.WriteLine();
-        }
-        var wDefault = wEquals.NewNamedBlock("default:");
-        wDefault.WriteLine("return false; // unexpected");
-
-        wr.WriteLine();
-        var wEqualsGeneric = wr.NewNamedBlock("func (_this {0}) EqualsGeneric(other interface{{}}) bool", name);
-        wEqualsGeneric.WriteLine("typed, ok := other.({0})", name);
-        wEqualsGeneric.WriteLine("return ok && _this.Equals(typed)");
-      }
-
-      // RTD
-      {
-        var usedOrAutoInitTypeParams = UsedTypeParameters(dt, true);
-        CreateRTD(name, usedOrAutoInitTypeParams, out var wDefault, wr);
-
-        WriteRuntimeTypeDescriptorsLocals(usedOrAutoInitTypeParams, true, wDefault);
-
-        var usedTypeParams = UsedTypeParameters(dt);
-        var sep = typeDescriptorUses.Length != 0 && usedTypeParams.Count != 0 ? ", " : "";
-        var arguments = usedTypeParams.Comma(tp => DefaultValue(new UserDefinedType(tp), wDefault, dt.tok, true));
-        wDefault.WriteLine($"return {TypeName_Companion(dt, wr, dt.tok)}.Default({typeDescriptorUses}{sep}{arguments});");
-      }
-
-      EmitParentTraits(dt.tok, name, false, dt.ParentTraits, wr);
-
-      return new ClassWriter(this, dt, false, name, dt.IsExtern(Options, out _, out _), null,
-        wr, wr, wr, wr, staticFieldWriter, staticFieldInitWriter);
-    }
-
-    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
-      var cw = CreateClass(nt, IdName(nt), false, null, nt.TypeArgs,
-        nt.ParentTypeInformation.UniqueParentTraits(), null, wr, includeRtd: false, includeEquals: false, includeString: true);
-      var w = cw.ConcreteMethodWriter;
-      var nativeType = nt.NativeType != null ? GetNativeTypeName(nt.NativeType) : null;
-      if (nt.NativeType != null) {
-        var intType = $"{HelperModulePrefix}Int";
-        var wIntegerRangeBody = w.NewNamedBlock($"func (_this *{FormatCompanionTypeName(IdName(nt))}) IntegerRange(lo {intType}, hi {intType}) {HelperModulePrefix}Iterator");
-        wIntegerRangeBody.WriteLine($"iter := {HelperModulePrefix}IntegerRange(lo, hi)");
-        var wIterFuncBody = wIntegerRangeBody.NewBlock($"return func() ({AnyType}, bool)");
-        wIterFuncBody.WriteLine("next, ok := iter()");
-        wIterFuncBody.WriteLine("if !ok {{ return {0}(0), false }}", nativeType);
-        wIterFuncBody.WriteLine($"return next.({intType}).{Capitalize(nativeType)}(), true");
-      }
-      if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-        var retType = nativeType ?? TypeName(nt.BaseType, w, nt.tok);
-        var wWitness = w.NewNamedBlock("func (_this *{0}) Witness() {1}", FormatCompanionTypeName(IdName(nt)), retType);
-        var wStmts = wWitness.Fork();
-        wWitness.Write("return ");
-        if (nt.NativeType == null) {
-          wWitness.Append(Expr(nt.Witness, false, wStmts));
-          wWitness.WriteLine();
-        } else {
-          TrParenExpr(nt.Witness, wWitness, false, wStmts);
-          wWitness.WriteLine(".{0}()", Capitalize(GetNativeTypeName(nt.NativeType)));
-        }
-      }
-
-      var udt = UserDefinedType.FromTopLevelDecl(nt.tok, nt);
-      // RTD
-      {
-        CreateRTD(IdName(nt), null, out var wDefaultBody, wr);
-        var d = TypeInitializationValue(udt, wr, nt.tok, false, true);
-        wDefaultBody.WriteLine("return {0}", d);
-      }
-
-      if (nt.ParentTraits.Count != 0) {
-        cw.InstanceFieldWriter.WriteLine($"_value {TypeName(udt, cw.InstanceFieldWriter, nt.tok)}");
-      }
-
-      return cw;
-    }
-
-    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
-      var cw = CreateClass(sst, IdName(sst), false, null, sst.TypeArgs, null, null, wr, includeRtd: false, includeEquals: false, includeString: true);
-      var w = cw.ConcreteMethodWriter;
-      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-        var witness = new ConcreteSyntaxTree(w.RelativeIndentLevel);
-        var wStmts = w.Fork();
-        witness.Append(Expr(sst.Witness, false, wStmts));
-        DeclareField("Witness", false, true, true, sst.Rhs, sst.tok, witness.ToString(), cw.ClassName, cw.StaticFieldWriter, cw.StaticFieldInitWriter, cw.ConcreteMethodWriter);
-      }
-      // RTD
-      {
-        CreateRTD(IdName(sst), sst.TypeArgs, out var wDefaultBody, wr);
-        var udt = UserDefinedType.FromTopLevelDecl(sst.tok, sst);
-        var d = TypeInitializationValue(udt, wr, sst.tok, false, true);
-        wDefaultBody.WriteLine("return {0}", d);
-      }
-    }
-
-    private void CreateRTD(string typeName, List<TypeParameter>/*?*/ usedParams, out ConcreteSyntaxTree wDefaultBody, ConcreteSyntaxTree wr) {
-      Contract.Requires(typeName != null);
-      Contract.Requires(wr != null);
-      Contract.Ensures(Contract.ValueAtReturn(out wDefaultBody) != null);
-
-      usedParams ??= new List<TypeParameter>();
-
-      wr.WriteLine();
-      wr.Write($"func {FormatRTDName(typeName)}(");
-      WriteRuntimeTypeDescriptorsFormals(usedParams, true, out var wrFormals, out _);
-      wr.Append(wrFormals);
-      var wTypeMethod = wr.NewBlock($") {DafnyTypeDescriptor}");
-      wTypeMethod.WriteLine($"return type_{typeName}_{{{usedParams.Comma(tp => FormatRTDName(tp.GetCompileName(Options)))}}}");
-
-      wr.WriteLine();
-      var wType = wr.NewNamedBlock($"type type_{typeName}_ struct");
-      WriteRuntimeTypeDescriptorsFields(usedParams, true, wType, null, null);
-
-      wr.WriteLine();
-      wDefaultBody = wr.NewNamedBlock("func (_this type_{0}_) Default() interface{{}}", typeName);
-
-      wr.WriteLine();
-      var wString = wr.NewNamedBlock($"func (_this type_{typeName}_) String() string");
-      wString.WriteLine($"return \"{ModuleName}.{typeName}\"");
-    }
-
-    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
-      literalSuffix = "";
-      needsCastAfterArithmetic = false;
-      switch (sel) {
-        case NativeType.Selection.Byte:
-          name = "uint8";
-          break;
-        case NativeType.Selection.SByte:
-          name = "int8";
-          break;
-        case NativeType.Selection.UShort:
-          name = "uint16";
-          break;
-        case NativeType.Selection.Short:
-          name = "int16";
-          break;
-        case NativeType.Selection.UInt:
-          name = "uint32";
-          break;
-        case NativeType.Selection.Int:
-          name = "int32";
-          break;
-        case NativeType.Selection.ULong:
-          name = "uint64";
-          break;
-        case NativeType.Selection.Long:
-          name = "int64";
-          break;
-        default:
-          Contract.Assert(false);  // unexpected native type
-          throw new cce.UnreachableException();  // to please the compiler
-      }
-    }
-    protected class ClassWriter : IClassWriter {
-      public readonly GoCompiler Compiler;
-      public readonly TopLevelDecl ClassContext;
-      public readonly bool IsClass;
-      public readonly string ClassName;
-      public readonly bool IsExtern;
-      public readonly ConcreteSyntaxTree/*?*/ AbstractMethodWriter, ConcreteMethodWriter, InstanceFieldWriter, InstanceFieldInitWriter, TraitInitWriter, StaticFieldWriter, StaticFieldInitWriter;
-      public bool AnyInstanceFields { get; private set; } = false;
-
-      public ClassWriter(GoCompiler compiler, TopLevelDecl classContext, bool isClass, string className, bool isExtern, ConcreteSyntaxTree abstractMethodWriter, ConcreteSyntaxTree concreteMethodWriter,
-        ConcreteSyntaxTree/*?*/ instanceFieldWriter, ConcreteSyntaxTree/*?*/ instanceFieldInitWriter, ConcreteSyntaxTree/*?*/ traitInitWriter,
-        ConcreteSyntaxTree staticFieldWriter, ConcreteSyntaxTree staticFieldInitWriter) {
-        Contract.Requires(compiler != null);
-        Contract.Requires(className != null);
-        this.Compiler = compiler;
-        this.ClassContext = classContext;
-        this.IsClass = isClass;
-        this.ClassName = className;
-        this.IsExtern = isExtern;
-        this.AbstractMethodWriter = abstractMethodWriter;
-        this.ConcreteMethodWriter = concreteMethodWriter;
-        this.InstanceFieldWriter = instanceFieldWriter;
-        this.InstanceFieldInitWriter = instanceFieldInitWriter;
-        this.TraitInitWriter = traitInitWriter;
-        this.StaticFieldWriter = staticFieldWriter;
-        this.StaticFieldInitWriter = staticFieldInitWriter;
-      }
-
-      public ConcreteSyntaxTree FieldWriter(bool isStatic) {
-        return isStatic ? StaticFieldWriter : InstanceFieldWriter;
-      }
-
-      public ConcreteSyntaxTree FieldInitWriter(bool isStatic) {
-        return isStatic ? StaticFieldInitWriter : InstanceFieldInitWriter;
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateMethod(m, typeArgs, createBody, ClassContext, ClassName, AbstractMethodWriter, ConcreteMethodWriter, forBodyInheritance, lookasideBody);
-      }
-
-      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        throw new UnsupportedFeatureException(m.tok, Feature.MethodSynthesis);
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateFunction(name, typeArgs, formals, resultType, tok, isStatic, createBody, member, ClassContext, ClassName, AbstractMethodWriter, ConcreteMethodWriter, forBodyInheritance, lookasideBody);
-      }
-      public ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IToken tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance) {
-        return Compiler.CreateGetter(name, resultType, tok, isStatic, createBody, member, ClassContext, ClassName, AbstractMethodWriter, ConcreteMethodWriter, forBodyInheritance);
-      }
-      public ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
-        return Compiler.CreateGetterSetter(name, resultType, tok, createBody, member, ClassContext, ClassName, out setterWriter, AbstractMethodWriter, ConcreteMethodWriter, forBodyInheritance);
-      }
-      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IToken tok, string rhs, Field field) {
-        // FIXME: This should probably be done in Compiler.DeclareField().
-        // Should just have these delegate methods take the ClassWriter as an
-        // argument.
-        if (!isStatic) {
-          AnyInstanceFields = true;
-        }
-        Compiler.DeclareField(name, IsExtern, isStatic, isConst, type, tok, rhs, ClassName, FieldWriter(isStatic), FieldInitWriter(isStatic), ConcreteMethodWriter);
-      }
-
-      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
-        var tok = field.tok;
-        var lvalue = Compiler.EmitMemberSelect(w => w.Write("_this"), UserDefinedType.FromTopLevelDecl(tok, enclosingClass), field,
-        new List<TypeArgumentInstantiation>(), enclosingClass.ParentFormalTypeParametersToActuals, instantiatedFieldType);
-        var wRHS = lvalue.EmitWrite(FieldInitWriter(false));
-        Compiler.EmitCoercionIfNecessary(instantiatedFieldType, field.Type, tok, wRHS);
-        wRHS.Write(Compiler.PlaceboValue(instantiatedFieldType, ErrorWriter(), tok));
-      }
-
-      public ConcreteSyntaxTree/*?*/ ErrorWriter() => ConcreteMethodWriter;
-
-      public void Finish() {
-        Compiler.FinishClass(this);
-      }
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody,
-      TopLevelDecl ownerContext, string ownerName,
-      ConcreteSyntaxTree abstractWriter, ConcreteSyntaxTree concreteWriter, bool forBodyInheritance, bool lookasideBody) {
-      var overriddenIns = m.EnclosingClass is TraitDecl && !forBodyInheritance ? null : m.OverriddenMethod?.Original.Ins;
-      var overriddenOuts = m.EnclosingClass is TraitDecl && !forBodyInheritance ? null : m.OverriddenMethod?.Original.Outs;
-      return CreateSubroutine(IdName(m), typeArgs, m.Ins, m.Outs, null,
-        overriddenIns, overriddenOuts, null,
-        m.tok, m.IsStatic, createBody, ownerContext, ownerName, m, abstractWriter, concreteWriter, forBodyInheritance, lookasideBody);
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType,
-      IToken tok, bool isStatic, bool createBody, MemberDecl member, TopLevelDecl ownerContext, string ownerName,
-      ConcreteSyntaxTree abstractWriter, ConcreteSyntaxTree concreteWriter, bool forBodyInheritance, bool lookasideBody) {
-
-      var fnOverridden = (member as Function)?.OverriddenFunction?.Original;
-      return CreateSubroutine(name, typeArgs, formals, new List<Formal>(), resultType,
-        fnOverridden?.Formals, fnOverridden == null ? null : new List<Formal>(), fnOverridden?.ResultType,
-        tok, isStatic, createBody, ownerContext, ownerName, member, abstractWriter, concreteWriter, forBodyInheritance, lookasideBody);
-    }
-
-    private ConcreteSyntaxTree CreateSubroutine(string name, List<TypeArgumentInstantiation> typeArgs,
-      List<Formal> inParams, List<Formal> outParams, Type/*?*/ resultType,
-      List<Formal>/*?*/ overriddenInParams, List<Formal>/*?*/ overriddenOutParams, Type/*?*/ overriddenResultType,
-      IToken tok, bool isStatic, bool createBody, TopLevelDecl ownerContext, string ownerName, MemberDecl/*?*/ member,
-      ConcreteSyntaxTree abstractWriter, ConcreteSyntaxTree concreteWriter,
-      bool forBodyInheritance, bool lookasideBody) {
-      Contract.Requires(name != null);
-      Contract.Requires(typeArgs != null);
-      Contract.Requires(inParams != null);
-      Contract.Requires(outParams != null);
-      Contract.Requires(overriddenInParams == null || overriddenInParams.Count == inParams.Count);
-      Contract.Requires(overriddenOutParams == null || overriddenOutParams.Count == outParams.Count);
-      Contract.Requires(tok != null);
-      Contract.Requires(ownerName != null);
-      Contract.Requires(abstractWriter != null || concreteWriter != null);
-
-      var customReceiver = createBody && !forBodyInheritance && member != null && NeedsCustomReceiver(member);
-      ConcreteSyntaxTree wr;
-      if (createBody || abstractWriter == null) {
-        wr = concreteWriter;
-        string receiver = isStatic || customReceiver ? FormatCompanionTypeName(ownerName) : ownerName;
-        if (member != null && ownerContext is DatatypeDecl) {
-          wr.Write("func ({0} {1}) ", isStatic || customReceiver ? "_static" : "_this", receiver);
-        } else {
-          wr.Write("func ({0} *{1}) ", isStatic || customReceiver ? "_static" : "_this", receiver);
-        }
-      } else {
-        wr = abstractWriter;
-      }
-      wr.Write("{0}(", name);
-      var prefix = "";
-      var nTypes = WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, lookasideBody), wr, ref prefix, tp => $"{FormatRTDName(tp.GetCompileName(Options))} {DafnyTypeDescriptor}");
-      if (customReceiver) {
-        wr.Write("{0}_this {1}", nTypes != 0 ? ", " : "", TypeName(UserDefinedType.FromTopLevelDecl(tok, member.EnclosingClass), wr, tok));
-      }
-      var _ = WriteFormals(nTypes != 0 || customReceiver ? ", " : "", overriddenInParams ?? inParams, wr, inParams);
-      wr.Write(")");
-
-      // TODO: Maybe consider using named result parameters, since they're actually close to how Dafny method outs work
-      if (overriddenOutParams != null) {
-        WriteOutTypes(overriddenOutParams, overriddenResultType, wr, tok);
-      } else {
-        WriteOutTypes(outParams, resultType, wr, tok);
-      }
-
-      if (createBody) {
-        var w = wr.NewBlock("");
-        // Go doesn't have type parameters. Instead, the empty interface type is used as the type of what would have been type parameters.
-        // If this is a routine inherited from a trait, then the Dafny signature of the method may have replaced the trait's type parameters.
-        // Go has no direct support for this idiom. Instead, we re-declare the in-parameters with the actual type, let the re-declarations
-        // shadow the given (generic) in-parameters, and then do a cast on entry to the body.
-        // If the routine only contains a call to an inherited body, then we omit the conversions here.
-        if (forBodyInheritance) {
-          // don't do any conversions
-        } else if (thisContext != null) {
-          w = w.NewBlock("", open: BlockStyle.Brace);
-          for (var i = 0; i < inParams.Count; i++) {
-            var p = (overriddenInParams ?? inParams)[i];
-            var instantiatedType = p.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
-            if (!instantiatedType.Equals(p.Type)) {
-              // var p instantiatedType = p.(instantiatedType)
-              var pName = IdName(inParams[i]);
-              DeclareLocalVar(pName, instantiatedType, p.tok, true, null, w);
-              var wRhs = EmitAssignmentRhs(w);
-              wRhs = EmitCoercionIfNecessary(p.Type, instantiatedType, p.tok, wRhs);
-              wRhs.Write(pName);
-              EmitDummyVariableUse(pName, w);
-            }
-          }
-        } else {
-          Contract.Assert(overriddenInParams == null);
-        }
-        if (outParams.Any() && !forBodyInheritance) {
-          var beforeReturn = w.Fork(0);
-          EmitReturnWithCoercions(outParams, overriddenOutParams, thisContext?.ParentFormalTypeParametersToActuals, w);
-          return beforeReturn;
-        }
-        return w;
-      } else {
-        wr.WriteLine();
-        return null;
-      }
-    }
-
-    protected void WriteOutTypes(List<Formal> outParams, Type/*?*/ resultType, ConcreteSyntaxTree wr, IToken tok) {
-      var outTypes = new List<Type>();
-      if (resultType != null) {
-        outTypes.Add(resultType);
-      }
-
-      foreach (Formal f in outParams) {
-        if (!f.IsGhost) {
-          outTypes.Add(f.Type);
-        }
-      }
-      if (outTypes.Count > 0) {
-        wr.Write(' ');
-        if (outTypes.Count > 1) {
-          wr.Write('(');
-        }
-        wr.Write(Util.Comma(outTypes, ty => TypeName(ty, wr, tok)));
-        if (outTypes.Count > 1) {
-          wr.Write(')');
-        }
-      }
-    }
-
-    int WriteRuntimeTypeDescriptorsFields(List<TypeParameter> typeParams, bool useAllTypeArgs, ConcreteSyntaxTree/*?*/ wr, ConcreteSyntaxTree/*?*/ wInit, ConcreteSyntaxTree/*?*/ wParams) {
-      Contract.Requires(typeParams != null);
-
-      var count = 0;
-      var sep = "";
-      foreach (var tp in typeParams) {
-        if (useAllTypeArgs || NeedsTypeDescriptor(tp)) {
-          var name = FormatRTDName(tp.GetCompileName(Options));
-          wr?.WriteLine($"{name} {DafnyTypeDescriptor}");
-          wInit?.WriteLine("_this.{0} = {0}", name);
-          wParams?.Write($"{sep}{name} {DafnyTypeDescriptor}");
-          sep = ", ";
-          count++;
-        }
-      }
-      return count;
-    }
-
-    int WriteRuntimeTypeDescriptorsFormals(List<TypeParameter> typeParams, bool useAllTypeArgs,
-      out ConcreteSyntaxTree wrFormals, out ConcreteSyntaxTree wrActuals) {
-      Contract.Requires(typeParams != null);
-
-      wrFormals = new ConcreteSyntaxTree();
-      wrActuals = new ConcreteSyntaxTree();
-      var count = 0;
-      var prefix = "";
-      foreach (var tp in typeParams) {
-        if (useAllTypeArgs || NeedsTypeDescriptor(tp)) {
-          var parameterName = FormatRTDName(tp.GetCompileName(Options));
-          wrFormals.Write($"{prefix}{parameterName} {DafnyTypeDescriptor}");
-          wrActuals.Write($"{prefix}{parameterName}");
-          prefix = ", ";
-          count++;
-        }
-      }
-      return count;
-    }
-
-    void WriteRuntimeTypeDescriptorsLocals(List<TypeParameter> typeParams, bool useAllTypeArgs, ConcreteSyntaxTree wr) {
-      Contract.Requires(typeParams != null);
-      Contract.Requires(wr != null);
-
-      foreach (var tp in typeParams) {
-        if (useAllTypeArgs || NeedsTypeDescriptor(tp)) {
-          wr.WriteLine("{0} := _this.{0}", FormatRTDName(tp.GetCompileName(Options)));
-          EmitDummyVariableUse(FormatRTDName(tp.GetCompileName(Options)), wr);
-        }
-      }
-    }
-
-    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
-      if (cl is DatatypeDecl) {
-        needsTypeParameter = false;
-        needsTypeDescriptor = true;
-      } else if (cl is TraitDecl) {
-        needsTypeParameter = false;
-        needsTypeDescriptor = isStatic || lookasideBody;
-      } else {
-        Contract.Assert(cl is ClassDecl);
-        needsTypeParameter = false;
-        needsTypeDescriptor = isStatic;
-      }
-    }
-
-    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      var xType = DatatypeWrapperEraser.SimplifyType(Options, type, true);
-      if (xType is BoolType) {
-        return "_dafny.BoolType";
-      } else if (xType is CharType) {
-        return CharTypeDescriptorName;
-      } else if (xType is IntType) {
-        return "_dafny.IntType";
-      } else if (xType is BigOrdinalType) {
-        return "_dafny.IntType";
-      } else if (xType is RealType) {
-        return "_dafny.RealType";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        if (t.NativeType != null) {
-          return string.Format("_dafny.{0}Type", Capitalize(GetNativeTypeName(t.NativeType)));
-        } else {
-          return "_dafny.IntType";
-        }
-      } else if (xType is SetType) {
-        return "_dafny.SetType";
-      } else if (xType is MultiSetType) {
-        return "_dafny.MultiSetType";
-      } else if (xType is SeqType) {
-        return "_dafny.SeqType";
-      } else if (xType is MapType) {
-        return "_dafny.MapType";
-      } else if (xType.IsRefType) {
-        return string.Format("_dafny.CreateStandardTypeDescriptor({0})", TypeInitializationValue(xType, wr, tok, false, true));
-      } else if (xType.IsArrayType) {
-        return "_dafny.ArrayType";
-      } else if (xType.IsTypeParameter) {
-        var tp = type.AsTypeParameter;
-        Contract.Assert(tp != null);
-        string th;
-        if (thisContext != null && tp.Parent is TopLevelDeclWithMembers and not TraitDecl) {
-          th = "_this.";
-        } else if (thisContext == null && tp.Parent is SubsetTypeDecl) {
-          th = "_this.";
-        } else {
-          th = "";
-        }
-        return string.Format("{0}{1}", th, FormatRTDName(tp.GetCompileName(Options)));
-      } else if (xType.IsBuiltinArrowType) {
-        return string.Format("_dafny.CreateStandardTypeDescriptor({0})", TypeInitializationValue(xType, wr, tok, false, true));
-      } else if (xType is UserDefinedType udt) {
-        var cl = udt.ResolvedClass;
-        Contract.Assert(cl != null);
-
-        var w = new ConcreteSyntaxTree();
-        w.Write("{0}(", cl is TupleTypeDecl ? "_dafny.TupleType" : TypeName_RTD(xType, w, tok));
-        var typeArgs = cl is DatatypeDecl dt ? UsedTypeParameters(dt, udt.TypeArgs, true) : TypeArgumentInstantiation.ListFromClass(cl, udt.TypeArgs);
-        EmitTypeDescriptorsActuals(typeArgs, udt.tok, w, true);
-        w.Write(")");
-        return w.ToString();
-
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateGetter(string name, Type resultType, IToken tok, bool isStatic, bool createBody,
-      MemberDecl/*?*/ member, TopLevelDecl ownerContext, string ownerName,
-      ConcreteSyntaxTree abstractWriter, ConcreteSyntaxTree concreteWriter, bool forBodyInheritance) {
-      return CreateFunction(name, new List<TypeArgumentInstantiation>(), new List<Formal>(), resultType,
-        tok, isStatic, createBody, member, ownerContext, ownerName, abstractWriter, concreteWriter, forBodyInheritance, false);
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody,
-      MemberDecl/*?*/ member, TopLevelDecl ownerContext, string ownerName,
-      out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree abstractWriter, ConcreteSyntaxTree concreteWriter, bool forBodyInheritance) {
-
-      var getterWriter = CreateGetter(name, resultType, tok, false, createBody, member, ownerContext, ownerName, abstractWriter, concreteWriter, forBodyInheritance);
-
-      var valueParam = new Formal(tok, "value", resultType, true, false, null);
-      setterWriter = CreateSubroutine(name + "_set_", new List<TypeArgumentInstantiation>(), new List<Formal>() { valueParam }, new List<Formal>(), null,
-        new List<Formal>() { valueParam }, new List<Formal>(), null,
-        tok, false, createBody, ownerContext, ownerName, member,
-        abstractWriter, concreteWriter, forBodyInheritance, false);
-      return getterWriter;
-    }
-
-    protected override bool SupportsStaticsInGenericClasses => false;
-    protected override bool TraitRepeatsInheritedDeclarations => true;
-
-    private void FinishClass(GoCompiler.ClassWriter cw) {
-      // Go gets weird about zero-length structs.  In particular, it likes to
-      // make all pointers to a zero-length struct the same.  Irritatingly, this
-      // forces us to waste space here.
-      if (cw.IsClass && !cw.AnyInstanceFields) {
-        cw.InstanceFieldWriter.WriteLine("dummy byte");
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
-      wr.WriteLine("goto TAIL_CALL_START");
-      wr.WriteLine("TAIL_CALL_START:");
-      return wr;
-    }
-
-    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
-      wr.WriteLine("goto TAIL_CALL_START");
-    }
-
-    private const string AnyType = "interface{}"; // In Go 1.18, this type can be written as "any"
-
-    private string CharTypeName => $"_dafny.{CharTypeNameProper}";
-    private string CharTypeDescriptorName => $"_dafny.{CharTypeNameProper}Type";
-    private string CharTypeNameProper => UnicodeCharEnabled ? "CodePoint" : "Char";
-
-    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member = null) {
-      Contract.Ensures(Contract.Result<string>() != null);
-      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
-
-      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
-      if (xType is BoolType) {
-        return "bool";
-      } else if (xType is CharType) {
-        return CharTypeName;
-      } else if (xType is IntType) {
-        return $"{HelperModulePrefix}Int";
-      } else if (xType is BigOrdinalType) {
-        return "_dafny.Ord";
-      } else if (xType is RealType) {
-        return "_dafny.Real";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        return t.NativeType != null ? GetNativeTypeName(t.NativeType) : "_dafny.BV";
-      } else if (xType.AsNewtype != null && member == null) {  // when member is given, use UserDefinedType case below
-        NativeType nativeType = xType.AsNewtype.NativeType;
-        if (nativeType != null) {
-          return GetNativeTypeName(nativeType);
-        }
-        return TypeName(xType.AsNewtype.BaseType, wr, tok);
-      } else if (xType.IsObjectQ) {
-        return AnyType;
-      } else if (xType.IsArrayType) {
-        return "_dafny.Array";
-      } else if (xType is UserDefinedType udt) {
-        var s = FullTypeName(udt, member);
-        var cl = udt.ResolvedClass;
-        if (xType is ArrowType at) {
-          return string.Format("func ({0}) {1}", Util.Comma(at.Args, arg => TypeName(arg, wr, tok)), TypeName(at.Result, wr, tok));
-        } else if (udt.IsTypeParameter) {
-          return AnyType;
-        } else if (cl is TupleTypeDecl tupleTypeDecl) {
-          return HelperModulePrefix + "Tuple";
-        }
-        if (udt.IsTraitType && udt.ResolvedClass.IsExtern(Options, out _, out _)) {
-          // To use an external interface, we need to have values of the
-          // interface type, so we treat an extern trait as a plain interface
-          // value, not a pointer (a Go interface value is basically a typed
-          // pointer anyway).
-          //
-          // Also don't use IdProtect so that we can have it be a built-in
-          // name like error.
-          return s;
-        } else if (udt.IsDatatype || udt.IsTraitType) {
-          // Don't return a pointer to the datatype because the datatype is
-          // already represented using a pointer
-          return IdProtect(s);
-        } else {
-          return "*" + IdProtect(s);
-        }
-      } else if (xType is SetType) {
-        return HelperModulePrefix + "Set";
-      } else if (xType is SeqType) {
-        return HelperModulePrefix + "Sequence";
-      } else if (xType is MultiSetType) {
-        return HelperModulePrefix + "MultiSet";
-      } else if (xType is MapType) {
-        return "_dafny.Map";
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IToken tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
-      // When returning nil, explicitly cast the nil so that type assertions work
-      string nil() {
-        return string.Format("({0})(nil)", TypeName(type, wr, tok));
-      }
-
-      var xType = type.NormalizeExpandKeepConstraints();
-      if (xType is BoolType) {
-        return "false";
-      } else if (xType is CharType) {
-        return $"{CharTypeName}({CharType.DefaultValueAsString})";
-      } else if (xType is IntType || xType is BigOrdinalType) {
-        return "_dafny.Zero";
-      } else if (xType is RealType) {
-        return "_dafny.ZeroReal";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        return t.NativeType != null ? "0" : "_dafny.Zero";
-      } else if (xType is SetType) {
-        return "_dafny.EmptySet";
-      } else if (xType is MultiSetType) {
-        return "_dafny.EmptyMultiSet";
-      } else if (xType is SeqType seq) {
-        if (seq.Arg.IsCharType && !UnicodeCharEnabled) {
-          return "_dafny.EmptySeq.SetString()";
-        }
-        return "_dafny.EmptySeq";
-      } else if (xType is MapType) {
-        return "_dafny.EmptyMap";
-      }
-
-      var udt = (UserDefinedType)xType;
-      var cl = udt.ResolvedClass;
-      Contract.Assert(cl != null);
-      if (cl is TypeParameter tp) {
-        if (usePlaceboValue && !tp.Characteristics.HasCompiledValue) {
-          return nil();
-        } else if (constructTypeParameterDefaultsFromTypeDescriptors) {
-          var w = new ConcreteSyntaxTree();
-          w = EmitCoercionIfNecessary(from: null, to: xType, tok: tok, wr: w);
-          w.Write(TypeDescriptor(udt, wr, udt.tok));
-          w.Write(".Default()");
-          return w.ToString();
-        } else {
-          return FormatDefaultTypeParameterValue(tp);
-        }
-      } else if (cl is AbstractTypeDecl opaque) {
-        return FormatDefaultTypeParameterValue(opaque);
-      } else if (cl is NewtypeDecl) {
-        var td = (NewtypeDecl)cl;
-        if (td.Witness != null) {
-          return TypeName_Companion(cl, wr, tok) + ".Witness()";
-        } else if (td.NativeType != null) {
-          return GetNativeTypeName(td.NativeType) + "(0)";
-        } else {
-          return TypeInitializationValue(td.BaseType, wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-      } else if (cl is SubsetTypeDecl) {
-        var td = (SubsetTypeDecl)cl;
-        if (td.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-          return TypeName_Companion(cl, wr, tok) + ".Witness()";
-        } else if (td.WitnessKind == SubsetTypeDecl.WKind.Special) {
-          // WKind.Special is only used with -->, ->, and non-null types:
-          Contract.Assert(ArrowType.IsPartialArrowTypeName(td.Name) || ArrowType.IsTotalArrowTypeName(td.Name) || td is NonNullTypeDecl);
-          if (ArrowType.IsPartialArrowTypeName(td.Name)) {
-            return nil();
-          } else if (ArrowType.IsTotalArrowTypeName(td.Name)) {
-            var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-            // return the lambda expression ((Ty0 x0, Ty1 x1, Ty2 x2) => rangeDefaultValue)
-            return string.Format("func ({0}) {1} {{ return {2}; }}", Util.Comma(udt.TypeArgs.GetRange(0, udt.TypeArgs.Count - 1), tp => TypeName(tp, wr, tok)), TypeName(udt.TypeArgs.Last(), wr, tok), rangeDefaultValue);
-          } else if (((NonNullTypeDecl)td).Class is ArrayClassDecl arrayClass) {
-            // non-null array type; we know how to initialize them
-            return string.Format("_dafny.NewArrayWithValue(nil, {0})", Util.Comma(arrayClass.Dims, d => string.Format("_dafny.IntOf(0)")));
-          } else {
-            return nil();
-          }
-        } else {
-          return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-      } else if (cl is ClassLikeDecl or ArrowTypeDecl) {
-        return nil();
-      } else if (cl is DatatypeDecl) {
-        var dt = (DatatypeDecl)cl;
-        if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
-          var typeSubstMap = TypeParameter.SubstitutionMap(dt.TypeArgs, udt.TypeArgs);
-          return TypeInitializationValue(innerType.Subst(typeSubstMap), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-        // In an auto-init context (like a field initializer), we may not have
-        // access to all the type descriptors, so we can't construct the
-        // default value, but then an empty structure is an acceptable default, since
-        // Dafny proves the value won't be accessed.
-        if (usePlaceboValue) {
-          return string.Format("{0}{{}}", TypeName(udt, wr, tok));
-        }
-        var n = dt is TupleTypeDecl ? "_dafny.TupleOf" : $"{TypeName_Companion(dt, wr, tok)}.Default";
-        var wTypeDescriptorArguments = new ConcreteSyntaxTree();
-        var sep = "";
-        WriteTypeDescriptors(dt, udt.TypeArgs, wTypeDescriptorArguments, ref sep);
-        var relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs);
-        if (relevantTypeArgs.Count == 0) {
-          sep = "";
-        }
-        var arguments = relevantTypeArgs.Comma(ta => DefaultValue(ta.Actual, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors));
-        return $"{n}({wTypeDescriptorArguments}{sep}{arguments})";
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
-      ConcreteSyntaxTree wr, IToken tok, bool omitTypeArguments) {
-      Contract.Assume(fullCompileName != null);  // precondition; this ought to be declared as a Requires in the superclass
-      Contract.Assume(typeArgs != null);  // precondition; this ought to be declared as a Requires in the superclass
-      string s = "*" + IdProtect(fullCompileName);
-      return s;
-    }
-
-    protected static string FormatCompanionName(string clsName) =>
-      string.Format("Companion_{0}_", clsName);
-    protected static string FormatCompanionTypeName(string clsName) =>
-      // Need to export this because it could be for a trait that could be
-      // derived from in another module
-      string.Format("CompanionStruct_{0}_", clsName);
-    protected static string FormatDatatypeConstructorName(string ctorName) =>
-      string.Format("Create_{0}_", ctorName);
-    protected static string FormatDatatypeConstructorCheckName(string ctorName) =>
-      string.Format("Is_{0}", ctorName);
-    protected static string FormatDatatypeDestructorName(string dtorName) =>
-      string.Format("Dtor_{0}", dtorName);
-    protected static string FormatDatatypeInterfaceName(string typeName) =>
-      string.Format("Data_{0}_", typeName);
-    protected static string FormatDefaultName(string typeName) =>
-      string.Format("Default_{0}_", typeName);
-    protected static string FormatInitializerName(string clsName) =>
-      string.Format("New_{0}_", clsName);
-    protected static string FormatLazyConstructorName(string datatypeName) =>
-      string.Format("Lazy_{0}_", datatypeName);
-    protected static string FormatLazyInterfaceName(string traitName) =>
-      string.Format("Iface_{0}_", traitName);
-    protected static string FormatRTDName(string formalName) =>
-      string.Format("Type_{0}_", formalName);
-
-    protected string TypeName_Related(Func<string, string> formatter, Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member = null) {
-      Contract.Requires(formatter != null);
-      Contract.Requires(type != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      // FIXME This is a hacky bit of string munging.
-
-      string name = ClassName(type, wr, tok, member);
-      string prefix, baseName;
-      var periodIx = name.LastIndexOf('.');
-      if (periodIx >= 0) {
-        prefix = name.Substring(0, periodIx + 1);
-        baseName = name.Substring(periodIx + 1);
-      } else {
-        prefix = "";
-        baseName = name;
-      }
-
-      return prefix + formatter(baseName);
-    }
-
-    protected string TypeName_Constructor(DatatypeCtor ctor, ConcreteSyntaxTree wr) {
-      var ptr = ctor.EnclosingDatatype is CoDatatypeDecl ? "*" : "";
-      return string.Format("{0}{1}_{2}", ptr, TypeName(UserDefinedType.FromTopLevelDecl(ctor.tok, ctor.EnclosingDatatype), wr, ctor.tok), ctor.GetCompileName(Options));
-    }
-
-    protected override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member) {
-      type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
-      // XXX This duplicates some of the logic in UserDefinedTypeName, but if we
-      // don't do it here, we end up passing the name of the module to
-      // FormatCompanionName, which doesn't help anyone
-      if (type is UserDefinedType udt && udt.ResolvedClass != null && IsExternMemberOfExternModule(member, udt.ResolvedClass)) {
-        // omit the default class name ("_default") in extern modules, when the class is used to qualify an extern member
-        Contract.Assert(!udt.ResolvedClass.EnclosingModuleDefinition.IsDefaultModule);  // default module is not marked ":extern"
-        return IdProtect(udt.ResolvedClass.EnclosingModuleDefinition.GetCompileName(Options));
-      }
-      return TypeName_Related(FormatCompanionName, type, wr, tok, member);
-    }
-
-    protected string TypeName_CompanionType(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      return TypeName_Related(FormatCompanionTypeName, type, wr, tok);
-    }
-
-    protected string TypeName_Initializer(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      return TypeName_Related(FormatInitializerName, type, wr, tok);
-    }
-
-    protected string TypeName_RTD(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      return TypeName_Related(FormatRTDName, type, wr, tok);
-    }
-
-    protected string ClassName(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member = null) {
-      return type is UserDefinedType udt ? FullTypeName(udt, member) : TypeName(type, wr, tok, member);
-    }
-
-    protected string UnqualifiedClassName(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      return type is UserDefinedType udt ? UnqualifiedTypeName(udt) : TypeName(type, wr, tok);
-    }
-
-    protected string DatatypeFieldName(Formal formal, int formalNonGhostIndex) {
-      // Don't rely on base.FormalName because it needlessly (for us) passes the
-      // value through IdProtect when we're going to capitalize it
-      return formal.HasName ? Capitalize(formal.CompileName) : "A" + formalNonGhostIndex + "_";
-    }
-
-    protected string DatatypeFieldName(Formal formal) {
-      Contract.Assert(formal.HasName);
-      return Capitalize(formal.CompileName);
-    }
-
-    // ----- Declarations -------------------------------------------------------------
-
-    protected void DeclareField(string name, bool isExtern, bool isStatic, bool isConst, Type type, IToken tok, string/*?*/ rhs, string className, ConcreteSyntaxTree wr, ConcreteSyntaxTree initWriter, ConcreteSyntaxTree concreteMethodWriter) {
-      if (isExtern) {
-        Error(CompilerErrors.ErrorId.c_Go_unsupported_field, tok, "Unsupported field {0} in extern trait", wr, name);
-      }
-
-      if (isConst && rhs != null) {
-        var receiver = isStatic ? FormatCompanionTypeName(className) : className;
-        var wBody = concreteMethodWriter.NewNamedBlock("func (_this *{0}) {1}() {2}", receiver, name, TypeName(type, concreteMethodWriter, tok));
-        wBody.WriteLine("return {0}", rhs);
-      } else {
-        wr.WriteLine("{0} {1}", name, TypeName(type, initWriter, tok));
-
-        if (isStatic) {
-          initWriter.WriteLine("{0}: {1},", name, rhs ?? PlaceboValue(type, initWriter, tok));
-        } else if (rhs != null) {
-          initWriter.WriteLine("_this.{0} = {1}", name, rhs);
-        }
-      }
-    }
-
-    protected override bool DeclareFormal(string prefix, string name, Type type, IToken tok, bool isInParam, ConcreteSyntaxTree wr) {
-      if (isInParam) {
-        wr.Write("{0}{1} {2}", prefix, name, TypeName(type, wr, tok));
-        return true;
-      } else {
-        return false;
-      }
-    }
-
-    private ConcreteSyntaxTree/*?*/ DeclareLocalVar(string name, Type/*?*/ type, IToken/*?*/ tok, bool includeRhs, bool leaveRoomForRhs, ConcreteSyntaxTree wr) {
-      wr.Write("var {0}", name);
-
-      if (type != null) {
-        // Always specify the type in case the rhs is nil
-        wr.Write(" {0}", TypeName(type, wr, tok));
-      }
-
-      ConcreteSyntaxTree w;
-      if (includeRhs) {
-        if (!leaveRoomForRhs) {
-          wr.Write(" = ");
-        }
-        w = wr.Fork();
-      } else {
-        w = null;
-      }
-
-      if (!leaveRoomForRhs) {
-        wr.WriteLine();
-        EmitDummyVariableUse(name, wr);
-      }
-
-      return w;
-    }
-
-    void EmitDummyVariableUse(string variableName, ConcreteSyntaxTree wr) {
-      Contract.Requires(variableName != null);
-      Contract.Requires(wr != null);
-
-      wr.WriteLine("_ = {0}", variableName);
-    }
-
-    protected override void DeclareLocalVar(string name, Type type, IToken tok, bool leaveRoomForRhs, string rhs, ConcreteSyntaxTree wr) {
-      var w = DeclareLocalVar(name, type, tok, includeRhs: (rhs != null || leaveRoomForRhs), leaveRoomForRhs: leaveRoomForRhs, wr: wr);
-      if (rhs != null) {
-        w.Write(rhs);
-      }
-    }
-
-    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type/*?*/ type, IToken/*?*/ tok, ConcreteSyntaxTree wr) {
-      return DeclareLocalVar(name, type, tok, includeRhs: true, leaveRoomForRhs: false, wr: wr);
-    }
-
-    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
-
-    protected override bool NeedsCastFromTypeParameter => true;
-    protected override bool SupportsMultipleReturns => true;
-    protected override string StmtTerminator => "";
-
-    protected override void DeclareLocalOutVar(string name, Type type, IToken tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr) {
-      DeclareLocalVar(name, type, tok, false, rhs, wr);
-    }
-
-    protected override void EmitActualTypeArgs(List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr) {
-      // emit nothing; this is only for actual parametric polymorphism, not RTDs
-    }
-
-    // ----- Statements -------------------------------------------------------------
-
-    protected override void EmitMultiAssignment(List<Expression> lhsExprs, List<ILvalue> wLhss, List<Type> lhsTypes, out List<ConcreteSyntaxTree> wRhss, List<Type> rhsTypes, ConcreteSyntaxTree wr) {
-      // TODO Go actually supports multi-assignment, but that will only work
-      // in the simple (but very typical) case where an lvalue represents an
-      // actual lvalue that is written via an assignment statement.  (Actually,
-      // currently *all* Go lvalues work this way, but in the future we could
-      // implement getters and setters via ILvalueWriter.)
-      //
-      // Given a way to inquire whether a given lvalue is an actual lvalue in
-      // the target, we could implement multi-assignment for the special case
-      // where all lvalues are real lvalues.
-      base.EmitMultiAssignment(lhsExprs, wLhss, lhsTypes, out wRhss, rhsTypes, wr);
-    }
-
-    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
-      var isString = arg.Type.IsStringType;
-      var wStmts = wr.Fork();
-      if (isString && UnicodeCharEnabled) {
-        wr.Write("_dafny.Print(");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.WriteLine(".VerbatimString(false))");
-      } else if (!isString ||
-                 (arg.Resolved is MemberSelectExpr mse &&
-                  mse.Member.IsExtern(Options, out _, out _))) {
-        wr.Write("_dafny.Print(");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.WriteLine(")");
-      } else {
-        wr.Write("_dafny.Print((");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.Write(")");
-        if (!UnicodeCharEnabled) {
-          wr.Write(".SetString()");
-        }
-        wr.WriteLine(")");
-      }
-    }
-
-    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
-      EmitReturnWithCoercions(outParams, null, null, wr);
-    }
-
-    protected override void EmitReturnExpr(Expression expr, Type resultType, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      var w = EmitReturnExpr(wr);
-      var fromType = thisContext == null ? expr.Type : expr.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
-      w = EmitCoercionIfNecessary(fromType, resultType, expr.tok, w);
-      w.Append(Expr(expr, inLetExprBody, wStmts));
-    }
-
-    protected void EmitReturnWithCoercions(List<Formal> outParams, List<Formal>/*?*/ overriddenOutParams, Dictionary<TypeParameter, Type>/*?*/ typeMap, ConcreteSyntaxTree wr) {
-      wr.Write("return");
-      var sep = " ";
-      for (var i = 0; i < outParams.Count; i++) {
-        var f = outParams[i];
-        if (!f.IsGhost) {
-          wr.Write(sep);
-          ConcreteSyntaxTree wOutParam;
-          if (overriddenOutParams == null && typeMap != null) {
-            wOutParam = EmitCoercionIfNecessary(f.Type.Subst(typeMap), f.Type, f.tok, wr);
-          } else if (overriddenOutParams != null) {
-            // ignore typeMap
-            wOutParam = EmitCoercionIfNecessary(f.Type, overriddenOutParams[i].Type, f.tok, wr);
-          } else {
-            wOutParam = wr;
-          }
-          wOutParam.Write(IdName(f));
-          sep = ", ";
-        }
-      }
-      wr.WriteLine();
-    }
-
-    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
-      var wBody = wr.NewBlock(open: BlockStyle.Brace);
-      var w = wBody.Fork();
-      var prefix = createContinueLabel ? "C" : "L";
-      wBody.WriteLine($"goto {prefix}{label};");
-      wr.Fork(-1).WriteLine($"{prefix}{label}:");
-      return w;
-    }
-
-    protected override void EmitBreak(string/*?*/ label, ConcreteSyntaxTree wr) {
-      if (label == null) {
-        wr.WriteLine("break");
-      } else {
-        wr.WriteLine("goto L{0}", label);
-      }
-    }
-
-    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
-      wr.WriteLine("goto C{0};", label);
-    }
-
-    protected override void EmitYield(ConcreteSyntaxTree wr) {
-      wr.WriteLine("_yielded <- struct{}{}");
-      wr.WriteLine("_, _ok = <- _cont");
-      wr.WriteLine("if !_ok { return }");
-    }
-
-    protected override void EmitAbsurd(string/*?*/ message, ConcreteSyntaxTree wr) {
-      if (message == null) {
-        message = "unexpected control point";
-      }
-      wr.WriteLine("panic(\"{0}\")", message);
-    }
-
-    protected override void EmitHalt(IToken tok, Expression messageExpr, ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      wr.Write("panic(");
-      if (tok != null) {
-        wr.Write("\"" + tok.TokenToString(Options) + ": \" + ");
-      }
-
-      TrParenExpr(messageExpr, wr, false, wStmts);
-      if (UnicodeCharEnabled && messageExpr.Type.IsStringType) {
-        wr.Write(".VerbatimString(false))");
-      } else {
-        wr.WriteLine(".String())");
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateWhileLoop(out ConcreteSyntaxTree guardWriter, ConcreteSyntaxTree wr) {
-      wr.Write("for ");
-      guardWriter = wr.Fork();
-      var wBody = wr.NewBlock("");
-      return wBody;
-    }
-
-    protected override ConcreteSyntaxTree EmitForStmt(IToken tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
-      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
-
-      wr.Write($"for {loopIndex.CompileName} := ");
-      var startWr = wr.Fork();
-      wr.Write($"; ");
-
-      ConcreteSyntaxTree bodyWr;
-      if (goingUp) {
-        if (endVarName == null) {
-          wr.Write("true");
-        } else if (IsOrderedByCmp(loopIndex.Type)) {
-          wr.Write($"{loopIndex.CompileName}.Cmp({endVarName}) < 0");
-        } else {
-          wr.Write($"{loopIndex.CompileName} < {endVarName}");
-        }
-        if (AsNativeType(loopIndex.Type) == null) {
-          bodyWr = wr.NewBlock($"; {loopIndex.CompileName} = {loopIndex.CompileName}.Plus(_dafny.One)");
-        } else {
-          bodyWr = wr.NewBlock($"; {loopIndex.CompileName}++");
-        }
-      } else {
-        if (endVarName == null) {
-          wr.Write("true");
-        } else if (IsOrderedByCmp(loopIndex.Type)) {
-          wr.Write($"{endVarName}.Cmp({loopIndex.CompileName}) < 0");
-        } else {
-          wr.Write($"{endVarName} < {loopIndex.CompileName}");
-        }
-        bodyWr = wr.NewBlock($"; ");
-        if (AsNativeType(loopIndex.Type) == null) {
-          bodyWr.WriteLine($"{loopIndex.CompileName} = {loopIndex.CompileName}.Minus(_dafny.One)");
-        } else {
-          bodyWr.WriteLine($"{loopIndex.CompileName}--");
-        }
-      }
-      bodyWr = EmitContinueLabel(labels, bodyWr);
-      TrStmtList(body, bodyWr);
-
-      return startWr;
-    }
-
-    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, string bound, ConcreteSyntaxTree wr, string start = null) {
-      start = start ?? "0";
-      return wr.NewNamedBlock("for {0} := {2}; {0} < {1}; {0}++", indexVar, bound, start);
-    }
-
-    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
-      return wr.NewNamedBlock("for {0} := _dafny.IntOf({1}); ; {0} = {0}.Times(_dafny.Two)", indexVar, start);
-    }
-
-    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine("{0} = {0}.Plus(_dafny.One)", varName);
-    }
-
-    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine("{0} = {0}.Minus(_dafny.One)", varName);
-    }
-
-    protected override string GetQuantifierName(string bvType) {
-      return "_dafny.Quantifier";
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IToken tok,
-      out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-
-      var okVar = idGenerator.FreshId("_ok");
-      var iterVar = idGenerator.FreshId("_iter");
-      wr.Write("for {0} := _dafny.Iterate(", iterVar);
-      collectionWriter = wr.Fork();
-      var wBody = wr.NewBlock(");;");
-      wBody.WriteLine("{0}, {1} := {2}()", tmpVarName, okVar, iterVar);
-      wBody.WriteLine("if !{0} {{ break }}", okVar);
-      return wBody;
-    }
-
-    [CanBeNull]
-    protected override string GetSubtypeCondition(string tmpVarName, Type boundVarType, IToken tok, ConcreteSyntaxTree wPreconditions) {
-      var conditions = new List<string> { };
-      if (boundVarType.IsNonNullRefType) {
-        conditions.Add($"!_dafny.IsDafnyNull({tmpVarName})");
-      }
-
-      if (boundVarType.IsRefType) {
-        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
-          // Nothing more to test
-        } else if (boundVarType.IsTraitType) {
-          var trait = boundVarType.AsTraitType;
-          conditions.Add(
-            $"{HelperModulePrefix}InstanceOfTrait/*1*/({tmpVarName}.(_dafny.TraitOffspring), {TypeName_Companion(trait, wPreconditions, tok)}.TraitID_)");
-        } else {
-          var typeAssertSucceeds = idGenerator.FreshId("_typeAssertSucceeds");
-          wPreconditions.WriteLine(
-            $@"{typeAssertSucceeds} := func(param interface{{}}) bool {{ var ok bool; _, ok = param.({TypeName(boundVarType, wPreconditions, tok)}); return ok}}");
-          conditions.Add($"{typeAssertSucceeds}({tmpVarName})");
-        }
-      }
-
-      if (!conditions.Any()) {
-        conditions.Add("true");
-      }
-
-      var typeTest = string.Join("&&", conditions);
-      if (boundVarType.IsRefType && !boundVarType.IsNonNullRefType && typeTest != "true") {
-        typeTest = $"_dafny.IsDafnyNull({tmpVarName}) || " + typeTest;
-      }
-      return typeTest == "true" ? null : typeTest;
-    }
-
-    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
-      Type collectionElementType, bool introduceBoundVar, IToken tok, ConcreteSyntaxTree wr) {
-
-      if (introduceBoundVar) {
-        wr.WriteLine("var {0} {1}", boundVarName, TypeName(boundVarType, wr, tok));
-      }
-
-      var wrAssign = wr;
-      if (boundVarType.IsRefType && !boundVarType.IsNonNullRefType) {
-        var wIf = EmitIf($"_dafny.IsDafnyNull({tmpVarName})", true, wr);
-        wIf.WriteLine("{0} = ({1})(nil)", boundVarName, TypeName(boundVarType, wr, tok));
-        wrAssign = wr.NewBlock("", open: BlockStyle.Brace);
-      }
-
-      var cast = $".({TypeName(boundVarType, wrAssign, tok)})";
-      tmpVarName = $"interface{{}}({tmpVarName})";
-      wrAssign.WriteLine("{0} = {1}{2}", boundVarName, tmpVarName, cast);
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      var okVar = idGenerator.FreshId("_ok");
-      var iterVar = idGenerator.FreshId("_iter");
-      wr.Write("for {0} := _dafny.Iterate(", iterVar);
-      collectionWriter = wr.Fork();
-      var wBody = wr.NewBlock(");;");
-      wBody.WriteLine("{0}, {1} := {2}()", boundVarName, okVar, iterVar);
-      wBody.WriteLine("if !{0} {{ break }}", okVar);
-      return wBody;
-    }
-
-    // ----- Expressions -------------------------------------------------------------
-
-    protected override void EmitNew(Type type, IToken tok, CallStmt initCall /*?*/, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts) {
-      var cl = ((UserDefinedType)type.NormalizeExpand()).ResolvedClass;
-      Contract.Assert(cl != null);
-      if (cl is TraitDecl { IsObjectTrait: true }) {
-        wr.Write("_dafny.New_Object()");
-      } else {
-        wr.Write("{0}(", TypeName_Initializer(type, wr, tok));
-        EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass(cl, type.TypeArgs), tok, wr);
-        wr.Write(")");
-      }
-    }
-
-    protected override bool DeterminesArrayTypeFromExampleElement => true;
-
-    protected override void EmitNewArray(Type elementType, IToken tok, List<string> dimensions,
-        bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-
-      string sep;
-      if (mustInitialize) {
-        var initValue = DefaultValue(elementType, wr, tok, true);
-        wr.Write("_dafny.NewArrayWithValue({0}", initValue);
-        sep = ", ";
-      } else if (exampleElement != null) {
-        wr.Write("_dafny.NewArrayFromExample({0}, nil", exampleElement);
-        sep = ", ";
-      } else {
-        wr.Write("_dafny.NewArray(");
-        sep = "";
-      }
-
-      foreach (var dim in dimensions) {
-        wr.Write($"{sep}{dim}");
-        sep = ", ";
-      }
-
-      wr.Write(")");
-    }
-
-    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
-      if (e is StaticReceiverExpr) {
-        wr.Write("{0}", TypeName_Companion(((UserDefinedType)e.Type).ResolvedClass, wr, e.tok));
-      } else if (e.Value == null) {
-        wr.Write("({0})(nil)", TypeName(e.Type, wr, e.tok));
-      } else if (e.Value is bool) {
-        wr.Write((bool)e.Value ? "true" : "false");
-      } else if (e is CharLiteralExpr chrLit) {
-        TrCharLiteral(chrLit, wr);
-      } else if (e is StringLiteralExpr strLit) {
-        TrStringLiteral(strLit, wr);
-      } else if (AsNativeType(e.Type) is NativeType nt) {
-        wr.Write("{0}({1})", GetNativeTypeName(nt), (BigInteger)e.Value);
-      } else if (e.Value is BigInteger i) {
-        EmitIntegerLiteral(i, wr);
-      } else if (e.Value is BaseTypes.BigDec n) {
-        var zeros = Repeat("0", Math.Abs(n.Exponent));
-        string str;
-        if (n.Exponent >= 0) {
-          str = n.Mantissa + zeros;
-        } else {
-          str = n.Mantissa + "/1" + zeros;
-        }
-        wr.Write("_dafny.RealOfString(\"{0}\")", str);
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
-      }
-    }
-    void EmitIntegerLiteral(BigInteger i, ConcreteSyntaxTree wr) {
-      Contract.Requires(wr != null);
-      if (i.IsZero) {
-        wr.Write($"{HelperModulePrefix}Zero");
-      } else if (i.IsOne) {
-        wr.Write($"{HelperModulePrefix}One");
-      } else if (long.MinValue <= i && i <= long.MaxValue) {
-        wr.Write($"{HelperModulePrefix}IntOfInt64({i})");
-      } else {
-        wr.Write("_dafny.IntOfString(\"{0}\")", i);
-      }
-    }
-
-    protected void TrCharLiteral(CharLiteralExpr chr, ConcreteSyntaxTree wr) {
-      var v = (string)chr.Value;
-      wr.Write($"{CharTypeName}(");
-      // See comment in TrStringLiteral for why we can't just translate directly sometimes.
-      if (!UnicodeCharEnabled && Util.MightContainNonAsciiCharacters(v, false)) {
-        var c = Util.UnescapedCharacters(Options, v, false).Single();
-        wr.Write($"{c}");
-      } else {
-        wr.Write("'{0}'", TranslateEscapes(v, isChar: true));
-      }
-      wr.Write(")");
-    }
-
-    protected override void TrStringLiteral(StringLiteralExpr str, ConcreteSyntaxTree wr) {
-      Contract.Requires(str != null);
-      Contract.Requires(wr != null);
-      var s = (string)str.Value;
-      if (UnicodeCharEnabled) {
-        wr.Write($"_dafny.UnicodeSeqOfUtf8Bytes(");
-        EmitStringLiteral(s, str.IsVerbatim, wr);
-        wr.Write(")");
-      } else {
-        // When --unicode-char is false, it may not be possible to translate a Dafny string into a valid Go string,
-        // since Go string literals have to be encodable in UTF-8,
-        // but Dafny allows invalid sequences of surrogate characters.
-        // In addition, _dafny.SeqOfString iterates over the runes in the Go string
-        // rather than the equivalent UTF-16 code units.
-        // That means in many cases we can't create a Dafny string value by emitting
-        // _dafny.SeqOfString("..."), since there's no way to encode the right data in the Go string literal.
-        // Instead, if any non-ascii characters might be present, just emit a sequence of the direct UTF-16 code units instead.
-        if (Util.MightContainNonAsciiCharacters(s, false)) {
-          wr.Write($"_dafny.SeqOfChars(");
-          var comma = "";
-          foreach (var c in Util.UnescapedCharacters(Options, s, str.IsVerbatim)) {
-            wr.Write(comma);
-            wr.Write($"{c}");
-            comma = ", ";
-          }
-
-          wr.Write(")");
-        } else {
-          wr.Write($"{HelperModulePrefix}SeqOfString(");
-          EmitStringLiteral(s, str.IsVerbatim, wr);
-          wr.Write(")");
-        }
-      }
-    }
-
-    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
-      var n = str.Length;
-      if (!isVerbatim) {
-        wr.Write("\"{0}\"", TranslateEscapes(str, isChar: false));
-      } else {
-        wr.Write("\"");
-        for (var i = 0; i < n; i++) {
-          if (str[i] == '\"' && i + 1 < n && str[i + 1] == '\"') {
-            wr.Write("\\\"");
-            i++;
-          } else if (str[i] == '\\') {
-            wr.Write("\\\\");
-          } else if (str[i] == '\n') {
-            wr.Write("\\n");
-          } else if (str[i] == '\r') {
-            wr.Write("\\r");
-          } else {
-            wr.Write(str[i]);
-          }
-        }
-        wr.Write("\"");
-      }
-    }
-
-    private static string TranslateEscapes(string s, bool isChar) {
-      if (isChar) {
-        s = s.Replace("\\\"", "\"");
-      } else {
-        s = s.Replace("\\'", "'");
-      }
-
-      s = Util.ReplaceNullEscapesWithCharacterEscapes(s);
-
-      s = Util.ExpandUnicodeEscapes(s, false);
-
-      return s;
-    }
-
-    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, bool surroundByUnchecked, ConcreteSyntaxTree wr) {
-      string literalSuffix = null;
-      if (bvType.NativeType != null) {
-        GetNativeInfo(bvType.NativeType.Sel, out _, out literalSuffix, out _);
-      }
-
-      if (bvType.NativeType == null) {
-        wr.Write('(');
-        var middle = wr.Fork();
-        wr.Write(").Modulo(_dafny.One.Lsh(_dafny.IntOf({0})))", bvType.Width);
-        return middle;
-      } else if (bvType.NativeType.Bitwidth == bvType.Width) {
-        // no truncation needed
-        return wr;
-      } else {
-        wr.Write("((");
-        var middle = wr.Fork();
-        // print in hex, because that looks nice
-        wr.Write(") & 0x{0:X}{1})", (1UL << bvType.Width) - 1, literalSuffix);
-        return middle;
-      }
-    }
-
-    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
-        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      bool needsCast = false;
-      var nativeType = AsNativeType(e0.Type);
-      if (nativeType != null) {
-        GetNativeInfo(nativeType.Sel, out _, out _, out needsCast);
-      }
-
-      var bv = e0.Type.AsBitVectorType;
-      if (bv.Width == 0) {
-        tr(e0, wr, inLetExprBody, wStmts);
-      } else {
-        ConcreteSyntaxTree wFirstArg;
-        if (bv.NativeType != null) {
-          wr.Write("_dafny.{0}{1}(", isRotateLeft ? "Lrot" : "Rrot", Capitalize(GetNativeTypeName(bv.NativeType)));
-          wFirstArg = wr.Fork();
-          wr.Write(", ");
-        } else {
-          wr.Write('(');
-          wFirstArg = wr.Fork();
-          wr.Write(").{0}(", isRotateLeft ? "Lrot" : "Rrot");
-        }
-        wFirstArg.Append(Expr(e0, inLetExprBody, wStmts));
-        wr.Append(Expr(e1, inLetExprBody, wStmts));
-        wr.Write(", {0})", bv.Width);
-
-        if (needsCast) {
-          wr.Write(".Int64()");
-        }
-      }
-    }
-
-    protected override bool CompareZeroUsingSign(Type type) {
-      return AsNativeType(type) == null;
-    }
-
-    protected override ConcreteSyntaxTree EmitSign(Type type, ConcreteSyntaxTree wr) {
-      // This is only called when CompareZeroUsingSign returns true
-      Contract.Assert(AsNativeType(type) == null);
-
-      var w = wr.Fork();
-      wr.Write(".Sign()");
-      return w;
-    }
-
-    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      wr.Write("_dafny.NewBuilder()");
-    }
-
-    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      wr.Write("{0}.Add(_dafny.TupleOf(", ingredients);
-      var wrTuple = wr.Fork();
-      wr.WriteLine("))");
-      return wrTuple;
-    }
-
-    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
-      wr.Write("(*({0}).IndexInt({1}))", prefix, i);
-    }
-
-    protected override string IdName(TopLevelDecl d) {
-      return IdName((Declaration)d);
-    }
-
-    protected override string IdName(MemberDecl member) {
-      return IdName((Declaration)member);
-    }
-
-    private string IdName(Declaration decl) {
-      if (HasCapitalizationConflict(decl)) {
-        // Don't use Go_ because Capitalize might use it and we know there's a conflict
-        return "Go__" + decl.GetCompileName(Options);
-      } else {
-        return Capitalize(decl.GetCompileName(Options));
-      }
-    }
-
-    protected override string PrefixForForcedCapitalization => "Go_";
-
-    protected override string IdMemberName(MemberSelectExpr mse) {
-      return Capitalize(mse.MemberName);
-    }
-
-    protected override string IdProtect(string name) {
-      return PublicIdProtect(name);
-    }
-    public override string PublicIdProtect(string name) {
-      Contract.Requires(name != null);
-
-      switch (name) {
-        // Keywords
-        case "break":
-        case "case":
-        case "chan":
-        case "const":
-        case "continue":
-        case "default":
-        case "defer":
-        case "else":
-        case "fallthrough":
-        case "for":
-        case "func":
-        case "go":
-        case "goto":
-        case "if":
-        case "import":
-        case "interface":
-        case "map":
-        case "package":
-        case "range":
-        case "return":
-        case "select":
-        case "struct":
-        case "switch":
-        case "type":
-        case "var":
-
-        // Built-in functions
-        case "append":
-        case "cap":
-        case "close":
-        case "complex":
-        case "copy":
-        case "delete":
-        case "imag":
-        case "len":
-        case "make":
-        case "new":
-        case "panic":
-        case "print":
-        case "println":
-        case "real":
-        case "recover":
-
-        case "String":
-        case "Equals":
-        case "EqualsGeneric":
-
-        // Built-in types (can also be used as functions)
-        case "bool":
-        case "byte":
-        case "complex64":
-        case "complex128":
-        case "error":
-        case "float32":
-        case "float64":
-        case "int":
-        case "int8":
-        case "int16":
-        case "int32":
-        case "int64":
-        case "rune":
-        case "string":
-        case "uint":
-        case "uint8":
-        case "uint16":
-        case "uint32":
-        case "uint64":
-        case "uintptr":
-          return name + "_";
-        default:
-          return name;
-      }
-    }
-
-    protected override string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null) {
-      return UserDefinedTypeName(udt, full: true, member: member);
-    }
-
-    private string UnqualifiedTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null) {
-      return UserDefinedTypeName(udt, full: false, member: member);
-    }
-
-    private string UserDefinedTypeName(UserDefinedType udt, bool full, MemberDecl/*?*/ member = null) {
-      Contract.Requires(udt != null);
-      if (udt is ArrowType) {
-        return ArrowType.Arrow_FullCompileName;
-      }
-      var cl = udt.ResolvedClass;
-      if (cl is TypeParameter) {
-        return IdProtect(udt.GetCompileName(Options));
-      } else {
-        return UserDefinedTypeName(cl, full, member);
-      }
-    }
-
-    private string UserDefinedTypeName(TopLevelDecl cl, bool full, MemberDecl/*?*/ member = null) {
-      if (IsExternMemberOfExternModule(member, cl)) {
-        // omit the default class name ("_default") in extern modules, when the class is used to qualify an extern member
-        Contract.Assert(!cl.EnclosingModuleDefinition.IsDefaultModule);  // default module is not marked ":extern"
-        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options));
-      } else {
-        if (cl.IsExtern(Options, out var qual, out _)) {
-          // No need to take into account the second argument to extern, since
-          // it'll already be cl.CompileName
-          if (qual == null) {
-            if (this.ModuleName == cl.EnclosingModuleDefinition.GetCompileName(Options)) {
-              qual = "";
-            } else {
-              qual = cl.EnclosingModuleDefinition.GetCompileName(Options);
-            }
-          }
-          // Don't use IdName since that'll capitalize, which is unhelpful for
-          // built-in types
-          return qual + (qual == "" ? "" : ".") + cl.GetCompileName(Options);
-        } else if (!full || cl.EnclosingModuleDefinition.IsDefaultModule || this.ModuleName == cl.EnclosingModuleDefinition.GetCompileName(Options)) {
-          return IdName(cl);
-        } else {
-          return cl.EnclosingModuleDefinition.GetCompileName(Options) + "." + IdName(cl);
-        }
-      }
-    }
-
-    private bool IsExternMemberOfExternModule(MemberDecl/*?*/ member, TopLevelDecl cl) {
-      return cl is DefaultClassDecl && Attributes.Contains(cl.EnclosingModuleDefinition.Attributes, "extern") &&
-             member != null && member.IsExtern(Options, out _, out _);
-    }
-
-    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
-      wr.Write("_this");
-    }
-
-    protected override void EmitNull(Type type, ConcreteSyntaxTree wr) {
-      if (type.IsIntegerType || type.IsBitVectorType || type.AsNewtype != null) {
-        wr.Write("_dafny.NilInt");
-      } else if (type.IsRealType) {
-        wr.Write("_dafny.NilReal");
-      } else {
-        wr.Write("({0})(nil)", TypeName(type, wr, tok: null));
-      }
-    }
-
-    protected override void EmitITE(Expression guard, Expression thn, Expression els, Type resultType, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write("(func () {0} {{ if ", TypeName(resultType, wr, null));
-      wr.Append(Expr(guard, inLetExprBody, wStmts));
-      wr.Write(" { return ");
-      var wBranch = EmitCoercionIfNecessary(thn.Type, resultType, thn.tok, wr);
-      wBranch.Append(Expr(thn, inLetExprBody, wStmts));
-      wr.Write(" }; return ");
-      wBranch = EmitCoercionIfNecessary(els.Type, resultType, thn.tok, wr);
-      wBranch.Append(Expr(els, inLetExprBody, wStmts));
-      wr.Write(" })() ");
-    }
-
-    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
-      EmitDatatypeValue(dtv.Ctor.EnclosingDatatype, dtv.Ctor, dtv.IsCoCall, typeDescriptorArguments, arguments, wr);
-    }
-
-    void EmitDatatypeValue(DatatypeDecl dt, DatatypeCtor ctor, bool isCoCall, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
-      var ctorName = ctor.GetCompileName(Options);
-      var companionName = TypeName_Companion(dt, wr, dt.tok);
-
-      var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
-      if (dt is TupleTypeDecl) {
-        wr.Write("_dafny.TupleOf({0})", arguments);
-      } else if (!isCoCall) {
-        // Ordinary constructor (that is, one that does not guard any co-recursive calls)
-        // Generate: Companion_Dt_.CreateCtor(args)
-        wr.Write($"{companionName}.{FormatDatatypeConstructorName(ctorName)}({typeDescriptorArguments}{sep}{arguments})");
-      } else {
-        // Co-recursive call
-        // Generate:  Companion_Dt_.LazyDt(func () Dt => Companion_Dt_.CreateCtor(args))
-        wr.Write("{0}.{1}({2}{3}func () {4} ", companionName, FormatLazyConstructorName(dt.GetCompileName(Options)),
-          typeDescriptorArguments, sep,
-          TypeName(UserDefinedType.FromTopLevelDecl(dt.tok, dt), wr, dt.tok));
-        wr.Write("{{ return {0}.{1}({2}{3}{4}) }}", companionName, FormatDatatypeConstructorName(ctorName), typeDescriptorArguments, sep, arguments);
-        wr.Write(')');
-      }
-    }
-
-    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString) {
-      compiledName = "";
-      preString = "";
-      postString = "";
-      switch (id) {
-        case SpecialField.ID.UseIdParam:
-          compiledName = IdProtect((string)idParam);
-          break;
-        case SpecialField.ID.ArrayLength:
-        case SpecialField.ID.ArrayLengthInt:
-          preString = "_dafny.ArrayLen(";
-          postString = string.Format(", {0}){1}", idParam == null ? 0 : (int)idParam,
-            id == SpecialField.ID.ArrayLengthInt ? ".Int()" : "");
-          break;
-        case SpecialField.ID.Floor:
-          compiledName = "Int()";
-          break;
-        case SpecialField.ID.IsLimit:
-          compiledName = "IsLimitOrd()";
-          break;
-        case SpecialField.ID.IsSucc:
-          compiledName = "IsSuccOrd()";
-          break;
-        case SpecialField.ID.Offset:
-          compiledName = "OrdOffset()";
-          break;
-        case SpecialField.ID.IsNat:
-          compiledName = "IsNatOrd()";
-          break;
-        case SpecialField.ID.Keys:
-          compiledName = "Keys()";
-          break;
-        case SpecialField.ID.Values:
-          compiledName = "Values()";
-          break;
-        case SpecialField.ID.Items:
-          compiledName = "Items()";
-          break;
-        case SpecialField.ID.Reads:
-          compiledName = "_reads";
-          break;
-        case SpecialField.ID.Modifies:
-          compiledName = "_modifies";
-          break;
-        case SpecialField.ID.New:
-          compiledName = "_new";
-          break;
-        default:
-          Contract.Assert(false); // unexpected ID
-          break;
-      }
-    }
-
-    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
-      Type expectedType, string/*?*/ additionalCustomParameter = null, bool internalAccess = false) {
-      var memberStatus = DatatypeWrapperEraser.GetMemberStatus(Options, member);
-      if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.Identity) {
-        return SimpleLvalue(obj);
-      } else if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue) {
-        return SimpleLvalue(w => w.Write("true"));
-      } else if (member is DatatypeDestructor dtor) {
-        return SimpleLvalue(wr => {
-          wr = EmitCoercionIfNecessary(dtor.Type, expectedType, Token.NoToken, wr);
-          if (dtor.EnclosingClass is TupleTypeDecl) {
-            Contract.Assert(dtor.CorrespondingFormals.Count == 1);
-            var formal = dtor.CorrespondingFormals[0];
-            wr.Write("(*(");
-            obj(wr);
-            wr.Write(").IndexInt({0}))", formal.NameForCompilation);
-          } else {
-            obj(wr);
-            wr.Write(".{0}()", FormatDatatypeDestructorName(dtor.GetCompileName(Options)));
-          }
-        });
-      } else if (member is SpecialField sf && sf.SpecialId != SpecialField.ID.UseIdParam) {
-        return SimpleLvalue(wr => {
-          wr = EmitCoercionIfNecessary(sf.Type, expectedType, Token.NoToken, wr);
-          obj(wr);
-          GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out _, out _);
-          if (compiledName.Length != 0) {
-            wr.Write(".{0}", Capitalize(compiledName));
-          } else {
-            // this member selection is handled by some kind of enclosing function call, so nothing to do here
-          }
-        });
-      } else if (member is SpecialField sf2 && sf2.SpecialId == SpecialField.ID.UseIdParam && sf2.IdParam is string fieldName && fieldName.StartsWith("is_")) {
-        // sf2 is needed here only because the scope rules for these pattern matches are asinine: sf is *still in scope* but it's useless because it may not have been assigned to!
-        return SimpleLvalue(wr => {
-          wr = EmitCoercionIfNecessary(sf2.Type, expectedType, Token.NoToken, wr);
-          obj(wr);
-          // FIXME This is a pretty awful string hack.
-          wr.Write(".{0}()", FormatDatatypeConstructorCheckName(fieldName.Substring(3)));
-        });
-      } else if (member is Function fn) {
-        typeArgs = typeArgs.Where(ta => NeedsTypeDescriptor(ta.Formal)).ToList();
-        if (typeArgs.Count == 0 && additionalCustomParameter == null) {
-          var lvalue = SuffixLvalue(obj, ".{0}", IdName(member));
-          return CoercedLvalue(lvalue, fn.GetMemberType((ArrowTypeDecl)expectedType.AsArrowType.ResolvedClass), expectedType);
-        } else {
-          // We need an eta conversion to adjust for the difference in arity.
-          // func (a0 T0, a1 T1, ...) ResultType { return obj.F(rtd0, rtd1, ..., a0, a1, ...); }
-          // Start by writing to the suffix:  F(rtd0, rtd1, ...
-          var suffixWr = new ConcreteSyntaxTree();
-          suffixWr.Write(IdName(member));
-          suffixWr.Write("(");
-          var suffixSep = "";
-          EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), fn.tok, suffixWr, ref suffixSep);
-          if (additionalCustomParameter != null) {
-            suffixWr.Write("{0}{1}", suffixSep, additionalCustomParameter);
-            suffixSep = ", ";
-          }
-          // Write the prefix and the rest of the suffix
-          var prefixWr = new ConcreteSyntaxTree();
-          var prefixSep = "";
-          prefixWr.Write("func (");
-          foreach (var arg in fn.Formals) {
-            if (!arg.IsGhost) {
-              var name = idGenerator.FreshId("_eta");
-              var ty = arg.Type.Subst(typeMap);
-              prefixWr.Write($"{prefixSep}{name} {TypeName(ty, prefixWr, arg.tok)}");
-              suffixWr.Write("{0}{1}", suffixSep, name);
-              suffixSep = ", ";
-              prefixSep = ", ";
-            }
-          }
-          var resultType = fn.ResultType.Subst(typeMap);
-          prefixWr.Write(") {0} {{ return ", TypeName(resultType, prefixWr, fn.tok));
-          suffixWr.Write(")");
-          var suffix = suffixWr.ToString();
-          return EnclosedLvalue(
-            prefixWr.ToString(),
-            wr => {
-              var wCall = EmitCoercionIfNecessary(fn.ResultType, resultType, Token.NoToken, wr: wr);
-              obj(wCall);
-              wCall.Write(".");
-              wCall.Write(suffix);
-              wr.Write("; }");
-            },
-            "");
-        }
-      } else {
-        var field = (Field)member;
-        ILvalue lvalue;
-        if (member.IsStatic) {
-          lvalue = SimpleLvalue(w => {
-            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.tok, member), IdName(member));
-            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.tok, w);
-            w.Write(")");
-          });
-        } else if (NeedsCustomReceiver(member) && !(member.EnclosingClass is TraitDecl)) {
-          // instance const in a newtype
-          Contract.Assert(typeArgs.Count == 0);
-          lvalue = SimpleLvalue(w => {
-            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.tok, member), IdName(member));
-            obj(w);
-            w.Write(")");
-          });
-        } else if (internalAccess && (member is ConstantField || member.EnclosingClass is TraitDecl)) {
-          lvalue = SuffixLvalue(obj, $"._{member.GetCompileName(Options)}");
-        } else if (internalAccess) {
-          lvalue = SuffixLvalue(obj, $".{IdName(member)}");
-        } else if (member is ConstantField) {
-          lvalue = SimpleLvalue(w => {
-            obj(w);
-            w.Write(".{0}(", IdName(member));
-            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.tok, w);
-            w.Write(")");
-          });
-        } else if (member.EnclosingClass is TraitDecl) {
-          lvalue = GetterSetterLvalue(obj, IdName(member), $"{IdName(member)}_set_");
-        } else {
-          lvalue = SuffixLvalue(obj, $".{IdName(member)}");
-        }
-        return CoercedLvalue(lvalue, field.Type, expectedType);
-      }
-    }
-
-    protected override string ArrayIndexToNativeInt(string s, Type type) {
-      var nt = AsNativeType(type);
-      if (nt == null) {
-        return $"({s}).Int()";
-      } else {
-        return $"int({s})";
-      }
-    }
-
-    protected override ConcreteSyntaxTree ExprToInt(Type fromType, ConcreteSyntaxTree wr) {
-      if (AsNativeType(fromType) == null) {
-        return wr;
-      }
-      wr.Write("_dafny.IntOfAny");
-      return wr.ForkInParens();
-    }
-
-    /// <summary>
-    /// Emit to "wr" a call
-    ///     _dafny.ArrayGet( <<wArray>>, <<wArguments>> )        // if isGet
-    /// or
-    ///     _dafny.ArraySet( <<wArray>>, <<wArguments>> )        // if !isGet
-    /// and return (wArray, wArguments). Optimize these calls based on "dimensionCount" and "elementType".
-    /// "elementType" is allowed to be "null", which says to not specialize based on the element type.
-    /// </summary>
-    private (ConcreteSyntaxTree wArray, ConcreteSyntaxTree wArguments) CallArrayGetOrSet(bool isGet,
-      int dimensionCount, [CanBeNull] Type elementType, ConcreteSyntaxTree wr) {
-
-      var typeSpecialization = "";
-      if (dimensionCount == 1 && elementType != null) {
-        if (elementType.IsCharType) {
-          typeSpecialization = CharTypeNameProper;
-        } else {
-          var nt = AsNativeType(elementType);
-          if (nt != null && nt.Sel == NativeType.Selection.Byte) {
-            typeSpecialization = "Byte";
-          }
-        }
-      }
-      if (isGet && typeSpecialization == "") {
-        wr = EmitCoercionIfNecessary(null, elementType, Token.NoToken, wr);
-      }
-
-      ConcreteSyntaxTree wArray;
-      if (dimensionCount != 1) {
-        // use a general call, which uses a varargs for the indices
-        wr.Write(isGet ? "_dafny.ArrayGet(" : "_dafny.ArraySet(");
-        wArray = wr.Fork();
-        wr.Write(", ");
-      } else {
-        // specialize to a call with exactly one index argument
-        wArray = wr.ForkInParens();
-        wr.Write($"{(isGet ? ".ArrayGet1" : ".ArraySet1")}{typeSpecialization}(");
-      }
-      var wArguments = wr.Fork();
-      wr.Write(")");
-      return (wArray, wArguments);
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<string> indices, Type elmtType, ConcreteSyntaxTree wr) {
-      // Note, the indices are formulated in the native array-index type.
-      var (wArray, wArguments) = CallArrayGetOrSet(true, indices.Count, elmtType, wr);
-      wArguments.Write(indices.Comma(s => s));
-      return wArray;
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
-      var (wArray, wArguments) = CallArrayGetOrSet(true, indices.Count, elmtType, wr);
-      wArguments.Write(indices.Comma(index => {
-        var idx = Expr(index, inLetExprBody, wStmts).ToString();
-        return ArrayIndexToNativeInt(idx, index.Type);
-      }));
-      return wArray;
-    }
-
-    protected override (ConcreteSyntaxTree/*array*/, ConcreteSyntaxTree/*rhs*/) EmitArrayUpdate(List<string> indices, Type elementType, ConcreteSyntaxTree wr) {
-      var (wArray, wArguments) = CallArrayGetOrSet(false, indices.Count, elementType, wr);
-      var wRhs = wArguments.Fork();
-      wArguments.Write(", {0}", indices.Comma(s => s));
-      return (wArray, wRhs);
-    }
-
-    protected override string ArrayIndexToInt(string arrayIndex) => $"_dafny.IntOf({arrayIndex})";
-
-    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (expr is LiteralExpr lit) {
-        wr.Write(lit.Value.ToString());
-      } else {
-        TrParenExpr(expr, wr, inLetExprBody, wStmts);
-        if (AsNativeType(expr.Type) == null) {
-          wr.Write(".Int()");
-        }
-      }
-    }
-
-    // This will probably move up to the superclass once more compilers are using dafnyRuntime.dfy
-    protected void TrExprToSizeT(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (expr is LiteralExpr lit) {
-        wr.Write(lit.Value.ToString());
-      } else {
-        if (AsNativeType(expr.Type) == null) {
-          TrParenExpr(expr, wr, inLetExprBody, wStmts);
-          wr.Write(".Uint32()");
-        } else {
-          wr.Write("uint32(");
-          wr.Append(Expr(expr, inLetExprBody, wStmts));
-          wr.Write(")");
-        }
-      }
-    }
-
-    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var type = source.Type.NormalizeExpand();
-      if (type is SeqType seqType) {
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-        wr.Write(".Select(");
-        TrExprToSizeT(index, inLetExprBody, wr, wStmts);
-        wr.Write(").({0})", TypeName(seqType.Arg, wr, null));
-      } else if (type is MultiSetType) {
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-        wr.Write(".Multiplicity(");
-        wr.Append(Expr(index, inLetExprBody, wStmts));
-        wr.Write(")");
-      } else {
-        Contract.Assert(type is MapType);
-        // map or imap
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-        wr.Write(".Get(");
-        wr.Append(Expr(index, inLetExprBody, wStmts));
-        wr.Write(").({0})", TypeName(((MapType)type).Range, wr, null));
-      }
-    }
-
-    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
-        CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (source.Type.AsSeqType != null) {
-        wr.Write($"{DafnySequenceCompanion}.Update(");
-        wr.Append(Expr(source, inLetExprBody, wStmts));
-        wr.Write(", ");
-        TrExprToSizeT(index, inLetExprBody, wr, wStmts);
-        wr.Write(", ");
-        wr.Append(CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts));
-        wr.Write(")");
-      } else if (source.Type.AsMapType != null) {
-        EmitIndexCollectionUpdate(source.Type, out var wSource, out var wIndex, out var wValue, wr, false);
-        TrParenExpr(source, wSource, inLetExprBody, wSource);
-        wIndex.Append(CoercedExpr(index, ((MapType)resultCollectionType).Domain, inLetExprBody, wSource));
-        wValue.Append(CoercedExpr(value, ((MapType)resultCollectionType).Range, inLetExprBody, wSource));
-      } else {
-        Contract.Assert(source.Type.AsMultiSetType != null);
-        EmitIndexCollectionUpdate(source.Type, out var wSource, out var wIndex, out var wValue, wr, false);
-        TrParenExpr(source, wSource, inLetExprBody, wSource);
-        wIndex.Append(CoercedExpr(index, resultCollectionType.Arg, inLetExprBody, wSource));
-        wValue.Append(Expr(value, inLetExprBody, wSource));
-      }
-    }
-
-    protected override void EmitIndexCollectionUpdate(Type sourceType, out ConcreteSyntaxTree wSource, out ConcreteSyntaxTree wIndex, out ConcreteSyntaxTree wValue, ConcreteSyntaxTree wr, bool nativeIndex) {
-      if (sourceType.IsArrayType) {
-        Contract.Assume(nativeIndex);
-        (wSource, var wArguments) = CallArrayGetOrSet(false, 1, null, wr);
-        wValue = wArguments.Fork();
-        wArguments.Write(", ");
-        wIndex = wArguments.Fork();
-      } else {
-        wSource = wr.ForkInParens();
-        wr.Write(nativeIndex ? ".UpdateInt(" : ".Update(");
-        wIndex = wr.Fork();
-        wr.Write(", ");
-        wValue = wr.Fork();
-        wr.Write(")");
-      }
-    }
-
-    protected override void EmitSeqSelectRange(Expression source, Expression lo /*?*/, Expression hi /*?*/,
-        bool fromArray, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (fromArray) {
-        wr.Write("_dafny.ArrayRangeToSeq(");
-        wr.Append(Expr(source, inLetExprBody, wStmts));
-        wr.Write(", ");
-
-        if (lo == null) {
-          wr.Write("_dafny.NilInt");
-        } else {
-          TrExprToBigInt(lo, wr, inLetExprBody);
-        }
-
-        wr.Write(", ");
-
-        if (hi == null) {
-          wr.Write("_dafny.NilInt");
-        } else {
-          TrExprToBigInt(hi, wr, inLetExprBody);
-        }
-
-        wr.Write(")");
-      } else {
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-
-        if (lo == null) {
-          if (hi == null) {
-            return;
-          }
-
-          wr.Write(".Take(");
-          TrExprToSizeT(hi, inLetExprBody, wr, wStmts);
-          wr.Write(")");
-        } else {
-          if (hi == null) {
-            wr.Write(".Drop(");
-            TrExprToSizeT(lo, inLetExprBody, wr, wStmts);
-            wr.Write(")");
-          } else {
-            wr.Write(".Subsequence(");
-            TrExprToSizeT(lo, inLetExprBody, wr, wStmts);
-            wr.Write(", ");
-            TrExprToSizeT(hi, inLetExprBody, wr, wStmts);
-            wr.Write(")");
-          }
-        }
-      }
-    }
-
-    void TrExprToBigInt(Expression e, ConcreteSyntaxTree wr, bool inLetExprBody) {
-      var wStmts = wr.Fork();
-      var nativeType = AsNativeType(e.Type);
-      if (nativeType != null) {
-        switch (nativeType.Sel) {
-          case NativeType.Selection.Byte:
-            wr.Write("_dafny.IntOfUint8(");
-            break;
-          case NativeType.Selection.UShort:
-            wr.Write("_dafny.IntOfUint16(");
-            break;
-          case NativeType.Selection.UInt:
-            wr.Write("_dafny.IntOfUint32(");
-            break;
-          case NativeType.Selection.ULong:
-            wr.Write("_dafny.IntOfUint64(");
-            break;
-          case NativeType.Selection.SByte:
-            wr.Write("_dafny.IntOfInt8(");
-            break;
-          case NativeType.Selection.Short:
-            wr.Write("_dafny.IntOfInt16(");
-            break;
-          case NativeType.Selection.Int:
-            wr.Write("_dafny.IntOfInt32(");
-            break;
-          case NativeType.Selection.Long:
-            wr.Write($"{HelperModulePrefix}IntOfInt64(");
-            break;
-          default:
-            throw new cce.UnreachableException();  // unexpected nativeType.Selection value
-        }
-      }
-
-      TrParenExpr(e, wr, inLetExprBody, wStmts);
-
-      if (nativeType != null) {
-        wr.Write(")");
-      }
-    }
-
-    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write($"{HelperModulePrefix}SeqCreate(");
-      TrExprToSizeT(expr.N, inLetExprBody, wr, wStmts);
-      wr.Write(", ");
-      var fromType = (ArrowType)expr.Initializer.Type.NormalizeExpand();
-      var atd = (ArrowTypeDecl)fromType.ResolvedClass;
-      var tParam = new UserDefinedType(expr.tok, new TypeParameter(expr.RangeToken, new Name("X"), TypeParameter.TPVarianceSyntax.NonVariant_Strict));
-      var toType = new ArrowType(expr.tok, atd, new List<Type>() { Type.Int }, tParam);
-      var initWr = EmitCoercionIfNecessary(fromType, toType, expr.tok, wr);
-      initWr.Append(Expr(expr.Initializer, inLetExprBody, wStmts));
-      wr.Write(")");
-      if (fromType.Result.IsCharType && !UnicodeCharEnabled) {
-        // Tag this sequence as being a string at runtime,
-        // but only if --unicode-char is false.
-        // See "Printing strings and characters" in docs/Compilation/StringsAndChars.md.
-        wr.Write(".SetString()");
-      }
-    }
-
-    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var eeType = expr.E.Type.NormalizeExpand();
-      if (eeType is SeqType) {
-        TrParenExpr("_dafny.MultiSetFromSeq", expr.E, wr, inLetExprBody, wStmts);
-      } else if (eeType is SetType) {
-        TrParenExpr("_dafny.MultiSetFromSet", expr.E, wr, inLetExprBody, wStmts);
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();
-      }
-    }
-
-    protected override void EmitApplyExpr(Type functionType, IToken tok, Expression function, List<Expression> arguments,
-        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(function, wr, inLetExprBody, wStmts);
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-    }
-
-    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
-      List<Type> boundTypes, Type type, IToken tok, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ref ConcreteSyntaxTree wStmts) {
-      Contract.Assert(boundVars.Count == boundTypes.Count);
-      wr.Write("(func (");
-      for (int i = 0; i < boundVars.Count; i++) {
-        if (i > 0) {
-          wr.Write(", ");
-        }
-        wr.Write("{0} {1}", boundVars[i], TypeName(boundTypes[i], wr, tok));
-      }
-
-      wr.Write(") {0}", TypeName(type, wr, tok));
-      var wLambdaBody = wr.NewBigExprBlock("", ")");
-      var w = EmitReturnExpr(wLambdaBody);
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-      return w;
-    }
-
-    protected override void EmitConstructorCheck(string source, DatatypeCtor ctor, ConcreteSyntaxTree wr) {
-      wr.Write("{0}.{1}()", source, FormatDatatypeConstructorCheckName(ctor.GetCompileName(Options)));
-    }
-
-    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex, DatatypeCtor ctor, List<Type> typeArgs, Type bvType, ConcreteSyntaxTree wr) {
-      if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
-        Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
-        Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
-        source(wr);
-      } else if (ctor.EnclosingDatatype is TupleTypeDecl tupleTypeDecl) {
-        Contract.Assert(tupleTypeDecl.NonGhostDims != 1); // such a tuple is an erasable-wrapper type, handled above
-        wr.Write("(*(");
-        source(wr);
-        wr.Write(").IndexInt({0})).({1})", formalNonGhostIndex, TypeName(typeArgs[formalNonGhostIndex], wr, Token.NoToken));
-      } else {
-        var dtorName = DatatypeFieldName(dtor, formalNonGhostIndex);
-        wr = EmitCoercionIfNecessary(from: dtor.Type, to: bvType, tok: dtor.tok, wr: wr);
-        source(wr);
-        wr.Write(".Get_().({0}).{1}", TypeName_Constructor(ctor, wr), dtorName);
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IToken tok, List<string> inNames,
-      Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
-      wr.Write("func (");
-      Contract.Assert(inTypes.Count == inNames.Count);  // guaranteed by precondition
-      for (var i = 0; i < inNames.Count; i++) {
-        wr.Write("{0}{1} {2}", i == 0 ? "" : ", ", inNames[i], TypeName(inTypes[i], wr, tok));
-      }
-      var w = wr.NewExprBlock(") {0}", TypeName(resultType, wr, tok));
-      return w;
-    }
-
-    protected override void CreateIIFE(string bvName, Type bvType, IToken bvTok, Type bodyType, IToken bodyTok,
-      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
-      var w = wr.NewExprBlock("func ({0} {1}) {2}", bvName, TypeName(bvType, wr, bvTok), TypeName(bodyType, wr, bodyTok));
-      wStmts = w.Fork();
-      w.Write("return ");
-      wrBody = w.Fork();
-      w.WriteLine();
-      wr.Write('(');
-      wrRhs = wr.Fork();
-      wr.Write(')');
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IToken resultTok, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts) {
-      var w = wr.NewBigExprBlock("func () " + TypeName(resultType, wr, resultTok), "()");
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IToken resultTok, string bvName,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var w = wr.NewExprBlock("func ({0} int) {1}", bvName, TypeName(resultType, wr, resultTok));
-      wr.Write("({0})", source);
-      return w;
-    }
-
-    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      switch (op) {
-        case ResolvedUnaryOp.BoolNot:
-          TrParenExpr("!", expr, wr, inLetExprBody, wStmts);
-          break;
-        case ResolvedUnaryOp.BitwiseNot:
-          if (AsNativeType(expr.Type) != null) {
-            wr.Write("^ ");
-            TrParenExpr(expr, wr, inLetExprBody, wStmts);
-          } else {
-            TrParenExpr(expr, wr, inLetExprBody, wStmts);
-            wr.Write(".Not()");
-          }
-          break;
-        case ResolvedUnaryOp.Cardinality:
-          if (expr.Type.AsSeqType != null) {
-            wr.Write($"{HelperModulePrefix}IntOfUint32(");
-            TrParenExpr(expr, wr, inLetExprBody, wStmts);
-            wr.Write(".Cardinality())");
-          } else {
-            TrParenExpr(expr, wr, inLetExprBody, wStmts);
-            wr.Write(".Cardinality()");
-          }
-
-          break;
-        default:
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
-      }
-    }
-
-    private bool IsDirectlyComparable(Type t) {
-      Contract.Requires(t != null);
-      return t.IsBoolType || t.IsCharType || AsNativeType(t) != null || t.IsArrayType ||
-             t.NormalizeExpand() is UserDefinedType { ResolvedClass: ClassDecl };
-    }
-
-    private bool IsOrderedByCmp(Type t) {
-      return t.IsIntegerType || t.IsRealType || t.IsBigOrdinalType || (t.IsBitVectorType && t.AsBitVectorType.NativeType == null) || (t.AsNewtype is NewtypeDecl nt && nt.NativeType == null);
-    }
-
-    private bool IsComparedByEquals(Type t) {
-      return t.IsIndDatatype || t.NormalizeExpand() is CollectionType;
-    }
-
-    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
-      Expression e0, Expression e1, IToken tok, Type resultType,
-      out string opString,
-      out string preOpString,
-      out string postOpString,
-      out string callString,
-      out string staticCallString,
-      out bool reverseArguments,
-      out bool truncateResult,
-      out bool convertE1_to_int,
-      out bool coerceE1,
-      ConcreteSyntaxTree errorWr) {
-
-      opString = null;
-      preOpString = "";
-      postOpString = "";
-      callString = null;
-      staticCallString = null;
-      reverseArguments = false;
-      truncateResult = false;
-      convertE1_to_int = false;
-      coerceE1 = false;
-
-      switch (op) {
-        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
-          if (AsNativeType(resultType) != null) {
-            opString = "&";
-          } else {
-            callString = "And";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.BitwiseOr:
-          if (AsNativeType(resultType) != null) {
-            opString = "|";
-          } else {
-            callString = "Or";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.BitwiseXor:
-          if (AsNativeType(resultType) != null) {
-            opString = "^";
-          } else {
-            callString = "Xor";
-          }
-          break;
-
-        case BinaryExpr.ResolvedOpcode.EqCommon: {
-            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0.Type);
-            if (!EqualsUpToParameters(eqType, DatatypeWrapperEraser.SimplifyType(Options, e1.Type))) {
-              staticCallString = $"{HelperModulePrefix}AreEqual";
-            } else if (IsOrderedByCmp(eqType)) {
-              callString = "Cmp";
-              postOpString = " == 0";
-            } else if (IsComparedByEquals(eqType)) {
-              callString = "Equals";
-            } else if (IsDirectlyComparable(eqType)) {
-              opString = "==";
-            } else {
-              staticCallString = $"{HelperModulePrefix}AreEqual";
-            }
-            break;
-          }
-        case BinaryExpr.ResolvedOpcode.NeqCommon: {
-            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0.Type);
-            if (!EqualsUpToParameters(eqType, DatatypeWrapperEraser.SimplifyType(Options, e1.Type))) {
-              preOpString = "!";
-              staticCallString = $"{HelperModulePrefix}AreEqual";
-            } else if (IsDirectlyComparable(eqType)) {
-              opString = "!=";
-              postOpString = "/* dircomp */";
-            } else if (IsOrderedByCmp(eqType)) {
-              callString = "Cmp";
-              postOpString = " != 0";
-            } else if (IsComparedByEquals(eqType)) {
-              preOpString = "!";
-              callString = "Equals";
-            } else {
-              preOpString = "!";
-              staticCallString = $"{HelperModulePrefix}AreEqual";
-            }
-            break;
-          }
-
-        case BinaryExpr.ResolvedOpcode.Lt:
-          if (IsOrderedByCmp(e0.Type)) {
-            callString = "Cmp";
-            postOpString = " < 0";
-          } else {
-            opString = "<";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Le:
-          if (IsOrderedByCmp(e0.Type)) {
-            callString = "Cmp";
-            postOpString = " <= 0";
-          } else {
-            opString = "<=";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Ge:
-          if (IsOrderedByCmp(e0.Type)) {
-            callString = "Cmp";
-            postOpString = " >= 0";
-          } else {
-            opString = ">=";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Gt:
-          if (IsOrderedByCmp(e0.Type)) {
-            callString = "Cmp";
-            postOpString = " > 0";
-          } else {
-            opString = ">";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.LeftShift:
-          if (resultType.IsBitVectorType) {
-            truncateResult = true;
-          }
-          if (AsNativeType(resultType) != null) {
-            opString = "<<";
-            if (AsNativeType(e1.Type) == null) {
-              postOpString = ".Uint64()";
-            }
-          } else {
-            if (AsNativeType(e1.Type) != null) {
-              callString = "Lsh(_dafny.IntOfUint64(uint64";
-              postOpString = "))";
-            } else {
-              callString = "Lsh";
-            }
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.RightShift:
-          if (AsNativeType(resultType) != null) {
-            opString = ">>";
-            if (AsNativeType(e1.Type) == null) {
-              postOpString = ".Uint64()";
-            }
-          } else {
-            if (AsNativeType(e1.Type) != null) {
-              callString = "Rsh(_dafny.IntOfUint64(uint64";
-              postOpString = "))";
-            } else {
-              callString = "Rsh";
-            }
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Add:
-          if (resultType.IsBitVectorType) {
-            truncateResult = true;
-          }
-          if (resultType.IsCharType || AsNativeType(resultType) != null) {
-            opString = "+";
-          } else {
-            callString = "Plus";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Sub:
-          if (resultType.IsBitVectorType) {
-            truncateResult = true;
-          }
-          if (AsNativeType(resultType) != null) {
-            if (AsNativeType(resultType).LowerBound == BigInteger.Zero) {
-              // Go is a PITA about subtracting unsigned integers---it complains
-              // if they're constant and the substraction underflows.  Hiding
-              // one of the arguments behind a thunk is kind of hideous but
-              // it does prevent constant folding.
-              opString = string.Format("- (func () {0} {{ return ", GetNativeTypeName(AsNativeType(resultType)));
-              postOpString = " })()";
-            } else {
-              opString = "-";
-            }
-          } else if (resultType.IsCharType) {
-            opString = "-";
-          } else {
-            callString = "Minus";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mul:
-          if (resultType.IsBitVectorType) {
-            truncateResult = true;
-          }
-          if (AsNativeType(resultType) != null) {
-            opString = "*";
-          } else {
-            callString = "Times";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Div:
-          if (AsNativeType(resultType) != null) {
-            var nt = AsNativeType(resultType);
-            if (nt.LowerBound < BigInteger.Zero) {
-              // Want Euclidean division for signed types
-              staticCallString = "_dafny.Div" + Capitalize(GetNativeTypeName(AsNativeType(resultType)));
-            } else {
-              // Native division is fine for unsigned
-              opString = "/";
-            }
-          } else {
-            callString = "DivBy";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mod:
-          if (AsNativeType(resultType) != null) {
-            var nt = AsNativeType(resultType);
-            if (nt.LowerBound < BigInteger.Zero) {
-              // Want Euclidean division for signed types
-              staticCallString = "_dafny.Mod" + Capitalize(GetNativeTypeName(AsNativeType(resultType)));
-            } else {
-              // Native division is fine for unsigned
-              opString = "%";
-            }
-          } else {
-            callString = "Modulo";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.SetEq:
-        case BinaryExpr.ResolvedOpcode.MultiSetEq:
-        case BinaryExpr.ResolvedOpcode.MapEq:
-          callString = "Equals"; break;
-        case BinaryExpr.ResolvedOpcode.SeqEq:
-          staticCallString = $"{DafnySequenceCompanion}.Equal"; break;
-        case BinaryExpr.ResolvedOpcode.ProperSubset:
-        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
-          callString = "IsProperSubsetOf"; break;
-        case BinaryExpr.ResolvedOpcode.Subset:
-        case BinaryExpr.ResolvedOpcode.MultiSubset:
-          callString = "IsSubsetOf"; break;
-        case BinaryExpr.ResolvedOpcode.Disjoint:
-        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
-          callString = "IsDisjointFrom"; break;
-        case BinaryExpr.ResolvedOpcode.InSet:
-        case BinaryExpr.ResolvedOpcode.InMultiSet:
-        case BinaryExpr.ResolvedOpcode.InMap:
-          callString = "Contains"; reverseArguments = true; break;
-        case BinaryExpr.ResolvedOpcode.Union:
-        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-          callString = "Union"; break;
-        case BinaryExpr.ResolvedOpcode.MapMerge:
-          callString = "Merge"; break;
-        case BinaryExpr.ResolvedOpcode.Intersection:
-        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-          callString = "Intersection"; break;
-        case BinaryExpr.ResolvedOpcode.SetDifference:
-        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
-          callString = "Difference"; break;
-        case BinaryExpr.ResolvedOpcode.MapSubtraction:
-          callString = "Subtract"; break;
-
-        case BinaryExpr.ResolvedOpcode.ProperPrefix:
-          staticCallString = $"{DafnySequenceCompanion}.IsProperPrefixOf"; break;
-        case BinaryExpr.ResolvedOpcode.Prefix:
-          staticCallString = $"{DafnySequenceCompanion}.IsPrefixOf"; break;
-        case BinaryExpr.ResolvedOpcode.Concat:
-          staticCallString = $"{DafnySequenceCompanion}.Concatenate"; break;
-        case BinaryExpr.ResolvedOpcode.InSeq:
-          staticCallString = $"{DafnySequenceCompanion}.Contains"; reverseArguments = true; break;
-
-        default:
-          base.CompileBinOp(op, e0, e1, tok, resultType,
-            out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
-            errorWr);
-          break;
-      }
-    }
-
-    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
-      wr.Write("{0}.Cmp(_dafny.Zero) == 0", varName);
-    }
-
-    protected override void EmitConversionExpr(ConversionExpr e, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (e.ToType.Equals(e.E.Type)) {
-        TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-      } else if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Int) || e.E.Type.IsBitVectorType || e.E.Type.IsCharType || e.E.Type.IsBigOrdinalType) {
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // (int or bv or char) -> real
-          Contract.Assert(AsNativeType(e.ToType) == null);
-          wr.Write("_dafny.RealOfFrac(");
-          ConcreteSyntaxTree w;
-          if (e.E.Type.IsCharType) {
-            wr.Write("_dafny.IntOfInt32(rune");
-            w = wr.Fork();
-            wr.Write(")");
-          } else if (AsNativeType(e.E.Type) is NativeType nt) {
-            wr.Write("_dafny.IntOf{0}(", Capitalize(GetNativeTypeName(nt)));
-            w = wr.Fork();
-            wr.Write(")");
-          } else {
-            w = wr;
-          }
-          TrParenExpr(e.E, w, inLetExprBody, wStmts);
-          wr.Write(", _dafny.One)");
-        } else if (e.ToType.IsCharType) {
-          wr.Write($"{CharTypeName}(");
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          if (AsNativeType(e.E.Type) == null) {
-            wr.Write(".Int32()");
-          }
-          wr.Write(")");
-        } else {
-          // (int or bv or char) -> (int or bv or ORDINAL)
-          var fromNative = AsNativeType(e.E.Type);
-          var toNative = AsNativeType(e.ToType);
-          if (fromNative != null && toNative != null) {
-            // from a native, to a native -- simple!
-            wr.Write(GetNativeTypeName(toNative));
-            TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          } else if (e.E.Type.IsCharType) {
-            Contract.Assert(fromNative == null);
-            if (toNative == null) {
-              // char -> big-integer (int or bv or ORDINAL)
-              wr.Write("_dafny.IntOfInt32(rune(");
-              wr.Append(Expr(e.E, inLetExprBody, wStmts));
-              wr.Write("))");
-            } else {
-              // char -> native
-              wr.Write(GetNativeTypeName(toNative));
-              TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-            }
-          } else if (fromNative == null && toNative == null) {
-            // big-integer (int or bv) -> big-integer (int or bv or ORDINAL), so identity will do
-            wr.Append(Expr(e.E, inLetExprBody, wStmts));
-          } else if (fromNative != null) {
-            Contract.Assert(toNative == null); // follows from other checks
-            // native (int or bv) -> big-integer (int or bv)
-            wr.Write("_dafny.IntOf{0}(", Capitalize(GetNativeTypeName(fromNative)));
-            wr.Append(Expr(e.E, inLetExprBody, wStmts));
-            wr.Write(')');
-          } else {
-            // any (int or bv) -> native (int or bv)
-            // Consider some optimizations
-            var literal = PartiallyEvaluate(e.E);
-            UnaryOpExpr u = e.E.Resolved as UnaryOpExpr;
-            MemberSelectExpr m = e.E.Resolved as MemberSelectExpr;
-            if (literal != null) {
-              // Optimize constant to avoid intermediate BigInteger
-              wr.Write("{0}({1})", GetNativeTypeName(toNative), literal);
-            } else if (u != null && u.Op == UnaryOpExpr.Opcode.Cardinality) {
-              // Optimize .Count to avoid intermediate BigInteger
-              wr.Write("{0}(", GetNativeTypeName(toNative));
-              TrParenExpr(u.E, wr, inLetExprBody, wStmts);
-              wr.Write(u.E.Type.AsSeqType != null ? ".Cardinality())" : ".CardinalityInt())");
-            } else if (m != null && m.MemberName == "Length" && m.Obj.Type.IsArrayType) {
-              // Optimize .Length to avoid intermediate BigInteger
-              wr.Write("{0}(_dafny.ArrayLenInt(", GetNativeTypeName(toNative));
-              wr.Append(Expr(m.Obj, inLetExprBody, wStmts));
-              wr.Write(", 0))");
-            } else {
-              // no optimization applies; use the standard translation
-              TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-              wr.Write(".{0}()", Capitalize(GetNativeTypeName(toNative)));
-            }
-          }
-        }
-      } else if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-        Contract.Assert(AsNativeType(e.E.Type) == null);
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // real -> real
-          Contract.Assert(AsNativeType(e.ToType) == null);
-          wr.Append(Expr(e.E, inLetExprBody, wStmts));
-        } else if (e.ToType.IsCharType) {
-          wr.Write($"{CharTypeName}(");
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          wr.Write(".Int().Int32())");
-        } else {
-          // real -> (int or bv)
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          wr.Write(".Int()");
-          if (AsNativeType(e.ToType) is NativeType nt) {
-            wr.Write(".{0}()", Capitalize(GetNativeTypeName(nt)));
-          }
-        }
-      } else {
-        Contract.Assert(false, $"not implemented for go: {e.E.Type} -> {e.ToType}");
-      }
-    }
-
-    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IToken tok, ConcreteSyntaxTree wr) {
-      Contract.Requires(fromType.IsRefType);
-      Contract.Requires(toType.IsRefType);
-
-      if (fromType.IsRefType && !fromType.IsNonNullRefType) {
-        if (toType.IsNonNullRefType) {
-          wr.Write($"!_dafny.IsDafnyNull({localName}) && ");
-        } else {
-          wr.Write($"_dafny.IsDafnyNull({localName}) || ");
-        }
-      }
-
-      if (fromType.IsSubtypeOf(toType, true, true)) {
-        wr.Write("true");
-      } else if (toType.IsTraitType) {
-        wr.Write($"{HelperModulePrefix}InstanceOfTrait({localName}.(_dafny.TraitOffspring), {TypeName_Companion(toType.AsTraitType, wr, tok)}.TraitID_)");
-      } else if (toType.IsRefType) {
-        wr.Write($"{HelperModulePrefix}InstanceOf({localName}, ({TypeName(toType, wr, tok)})(nil))");
-      } else if (fromType.IsTraitType && toType.AsNewtype != null) {
-        wr.Write($"{HelperModulePrefix}InstanceOf({localName}, (*{ClassName(toType, wr, tok)})(nil))");
-      } else {
-        wr.Write($"{HelperModulePrefix}InstanceOf({localName}, {TypeName(toType, wr, tok)}{{}})");
-      }
-
-      var udtTo = (UserDefinedType)toType.NormalizeExpandKeepConstraints();
-      if (udtTo.ResolvedClass is SubsetTypeDecl && !(udtTo.ResolvedClass is NonNullTypeDecl)) {
-        // TODO: test constraints
-        throw new UnsupportedFeatureException(tok, Feature.SubsetTypeTests);
-      }
-    }
-
-    private static bool EqualsUpToParameters(Type type1, Type type2) {
-      // TODO Consider whether Type.SameHead should return true in this case
-      return Type.SameHead(type1, type2) || (type1.IsArrayType && type1.IsArrayType);
-    }
-
-    protected override ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
-      if (type.HasFatPointer) {
-        var w = wr.ForkInParens();
-        wr.Write("._value");
-        return w;
-      } else {
-        return wr;
-      }
-    }
-
-    protected override ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
-      if (type.HasFatPointer) {
-        wr.Write(TypeName_Initializer(type, wr, type.AsNewtype.tok));
-        return wr.ForkInParens();
-      } else {
-        return wr;
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitCoercionIfNecessary(Type/*?*/ from, Type/*?*/ to, IToken tok, ConcreteSyntaxTree wr) {
-      if (to == null) {
-        return wr;
-      }
-
-      if (from != null && from.IsTraitType && to.AsNewtype != null) {
-        wr = FromFatPointer(to, wr);
-        var w = wr.ForkInParens();
-        wr.Write($".(*{UserDefinedTypeName(to.AsNewtype, true)})");
-        return w;
-      }
-      if (from != null && from.AsNewtype != null && to.IsTraitType && (enclosingMethod != null || enclosingFunction != null)) {
-        return ToFatPointer(from, wr);
-      }
-
-      from = from == null ? null : DatatypeWrapperEraser.SimplifyType(Options, from);
-      to = DatatypeWrapperEraser.SimplifyType(Options, to);
-      if (from != null && from.IsArrowType && to.IsArrowType && !from.Equals(to)) {
-        // Need to convert functions more often, so do this before the
-        // EqualsUpToParameters check below
-        ArrowType fat = from.AsArrowType, tat = to.AsArrowType;
-        // We must wrap the whole conversion in an IIFE to avoid capturing the source expression
-        var bvName = idGenerator.FreshId("coer");
-        // Nothing interesting should be written to wStmts
-        var blackHole = new ConcreteSyntaxTree();
-        CreateIIFE(bvName, fat, tok, tat, tok, wr, ref blackHole, out var ans, out wr);
-
-        wr.Write("func (");
-        var sep = "";
-        var args = new List<string>();
-        foreach (Type toArgType in tat.Args) {
-          var arg = idGenerator.FreshId("arg");
-          args.Add(arg);
-          wr.Write("{0}{1} {2}", sep, arg, TypeName(toArgType, wr, tok));
-          sep = ", ";
-        }
-        wr.Write(')');
-        if (tat.Result != null) {
-          wr.Write(" {0}", TypeName(tat.Result, wr, tok));
-        }
-        var wBody = wr.NewExprBlock("");
-        ConcreteSyntaxTree wCall;
-        if (fat.Result == null) {
-          wCall = wBody;
-        } else {
-          wBody.Write("return ");
-          wCall = EmitCoercionIfNecessary(@from: fat.Result, to: tat.Result, tok: tok, wr: wBody);
-        }
-        wCall.Write("{0}(", bvName);
-        Contract.Assert(fat.Args.Count == tat.Args.Count);
-        sep = "";
-        for (int i = 0; i < fat.Args.Count; i++) {
-          var fromArgType = fat.Args[i];
-          var toArgType = tat.Args[i];
-          wCall.Write(sep);
-          var w = EmitCoercionIfNecessary(@from: toArgType, to: fromArgType, tok: tok, wr: wCall);
-          w.Write(args[i]);
-          sep = ", ";
-        }
-        wCall.Write(')');
-        wBody.WriteLine();
-        return ans;
-      } else if (to.IsTypeParameter || (from != null && EqualsUpToParameters(from, to))) {
-        // do nothing
-        return wr;
-      } else if (from != null && from.IsSubtypeOf(to, true, true)) {
-        // upcast
-        return wr;
-      } else if (from == null || from.IsTypeParameter || to.IsSubtypeOf(from, true, true)) {
-        // downcast (allowed?) or implicit cast from parameter
-        if (to.IsObjectQ || to.IsObject) {
-          // a cast to any can be omitted
-          return wr;
-        } else if (to.IsTraitType) {
-          wr.Write("{0}.CastTo_(", TypeName_Companion(to.AsTraitType, wr, tok));
-          var w = wr.Fork();
-          wr.Write(")");
-          return w;
-        } else if (to.IsArrayType) {
-          wr.Write("_dafny.ArrayCastTo(");
-          var w = wr.Fork();
-          wr.Write(")");
-          return w;
-        } else {
-          var w = wr.Fork();
-          wr.Write(".({0})", TypeName(to, wr, tok));
-          return w;
-        }
-      } else {
-        // It's unclear to me whether it's possible to hit this case with a valid Dafny program,
-        // so I'm not using UnsupportedFeatureError for now.
-        Error(CompilerErrors.ErrorId.c_Go_infeasible_conversion, tok, "Cannot convert from {0} to {1}", wr, from, to);
-        return wr;
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitCoercionToNativeInt(ConcreteSyntaxTree wr) {
-      var w = wr.Fork();
-      wr.Write(".(int)");
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree EmitCoercionToArbitraryTuple(ConcreteSyntaxTree wr) {
-      var w = wr.Fork();
-      wr.Write(".(_dafny.Tuple)");
-      return w;
-    }
-
-    protected override void EmitCollectionDisplay(CollectionType ct, IToken tok, List<Expression> elements,
-        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (ct is SetType) {
-        wr.Write("_dafny.SetOf");
-      } else if (ct is MultiSetType) {
-        wr.Write("_dafny.MultiSetOf");
-      } else {
-        Contract.Assert(ct is SeqType);  // follows from precondition
-        if (ct.Arg.IsCharType && !UnicodeCharEnabled) {
-          wr.Write("_dafny.SeqOfChars");
-        } else {
-          wr.Write("_dafny.SeqOf");
-        }
-      }
-      TrExprList(elements, wr, inLetExprBody, wStmts, typeAt: _ => ct.Arg);
-    }
-
-    protected override void EmitMapDisplay(MapType mt, IToken tok, List<ExpressionPair> elements,
-        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write("_dafny.NewMapBuilder()");
-      foreach (ExpressionPair p in elements) {
-        wr.Write(".Add(");
-        wr.Append(Expr(p.A, inLetExprBody, wStmts));
-        wr.Write(", ");
-        wr.Append(Expr(p.B, inLetExprBody, wStmts));
-        wr.Write(')');
-      }
-      wr.Write(".ToMap()");
-    }
-
-    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
-      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
-      wrVarInit.Write("_dafny.NewBuilder()");
-    }
-
-    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
-      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
-      wrVarInit.Write("_dafny.NewMapBuilder()");
-    }
-
-    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      Contract.Assume(ct is SetType || ct is MultiSetType);  // follows from precondition
-      var wStmts = wr.Fork();
-      wr.Write("{0}.Add(", collName);
-      wr.Append(Expr(elmt, inLetExprBody, wStmts));
-      wr.WriteLine(")");
-    }
-
-    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IToken tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      wr.Write("{0}.Add(", collName);
-      var termLeftWriter = wr.Fork();
-      wr.Write(",");
-      wr.Append(Expr(term, inLetExprBody, wStmts));
-      wr.WriteLine(")");
-      return termLeftWriter;
-    }
-
-    protected override string GetCollectionBuilder_Build(CollectionType ct, IToken tok, string collName, ConcreteSyntaxTree wr) {
-      if (ct is SetType) {
-        return collName + ".ToSet()";
-      } else {
-        Contract.Assert(ct is MapType);
-        return collName + ".ToMap()";
-      }
-    }
-
-    protected override Type EmitIntegerRange(Type type, out ConcreteSyntaxTree wLo, out ConcreteSyntaxTree wHi, ConcreteSyntaxTree wr) {
-      Type result;
-      if (AsNativeType(type) != null) {
-        wr.Write("{0}.IntegerRange(", TypeName_Companion(type.AsNewtype, wr, tok: Token.NoToken));
-        result = type;
-      } else {
-        wr.Write($"{HelperModulePrefix}IntegerRange(");
-        result = new IntType();
-      }
-      wLo = wr.Fork();
-      wr.Write(", ");
-      wHi = wr.Fork();
-      wr.Write(')');
-      return result;
-    }
-
-    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr("_dafny.SingleValue", e, wr, inLetExprBody, wStmts);
-    }
-
-    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
-      var funcBlock = wr.NewBlock("func()", close: BlockStyle.Brace);
-      var deferBlock = funcBlock.NewBlock("defer func()", close: BlockStyle.Brace);
-      var ifRecoverBlock = deferBlock.NewBlock("if r := recover(); r != nil");
-      var stringMaker = UnicodeCharEnabled ? "UnicodeSeqOfUtf8Bytes" : "SeqOfString";
-      ifRecoverBlock.WriteLine($"var {haltMessageVarName} = {HelperModulePrefix}{stringMaker}(r.(string))");
-      TrStmt(recoveryBody, ifRecoverBlock);
-      funcBlock.WriteLine("()");
-      TrStmt(body, funcBlock);
-      wr.WriteLine("()");
-    }
-  }
-}
diff --git a/Source/DafnyCore/Compilers/GoLang/GoBackend.cs b/Source/DafnyCore/Compilers/GoLang/GoBackend.cs
deleted file mode 100644
index ca1faac6d0f..00000000000
--- a/Source/DafnyCore/Compilers/GoLang/GoBackend.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Text.RegularExpressions;
-
-namespace Microsoft.Dafny.Compilers;
-
-public class GoBackend : ExecutableBackend {
-
-  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".go" };
-
-  public override string TargetName => "Go";
-  public override bool IsStable => true;
-  public override string TargetExtension => "go";
-  public override string TargetBaseDir(string dafnyProgramName) =>
-    $"{Path.GetFileNameWithoutExtension(dafnyProgramName)}-go/src";
-
-  public override bool SupportsInMemoryCompilation => false;
-  public override bool TextualTargetIsExecutable => false;
-  protected override SinglePassCompiler CreateCompiler() {
-    return new GoCompiler(Options, Reporter);
-  }
-
-  public override bool CompileTargetProgram(string dafnyProgramName, string targetProgramText, string/*?*/ callToMain,
-    string/*?*/ targetFilename, ReadOnlyCollection<string> otherFileNames,
-    bool runAfterCompile, TextWriter outputWriter, out object compilationResult) {
-    compilationResult = null;
-    if (runAfterCompile) {
-      Contract.Assert(callToMain != null);  // this is part of the contract of CompileTargetProgram
-      // Since the program is to be run soon, nothing further is done here. Any compilation errors (that is, any errors
-      // in the emitted program--this should never happen if the compiler itself is correct) will be reported as 'go run'
-      // will run the program.
-      return true;
-    } else {
-      // compile now
-      return SendToNewGoProcess(dafnyProgramName, targetFilename, otherFileNames,
-        outputWriter, outputWriter, callToMain != null, run: false);
-    }
-  }
-
-  public override bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain /*?*/,
-    string targetFilename, ReadOnlyCollection<string> otherFileNames,
-    object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
-
-    return SendToNewGoProcess(dafnyProgramName, targetFilename, otherFileNames, outputWriter, errorWriter, hasMain: true, run: true);
-  }
-
-  private bool SendToNewGoProcess(string dafnyProgramName, string targetFilename,
-    ReadOnlyCollection<string> otherFileNames,
-    TextWriter outputWriter, TextWriter errorWriter, bool hasMain, bool run) {
-    Contract.Requires(targetFilename != null);
-
-    foreach (var otherFileName in otherFileNames) {
-      if (Path.GetExtension(otherFileName) != ".go") {
-        outputWriter.WriteLine("Unrecognized file as extra input for Go compilation: {0}", otherFileName);
-        return false;
-      }
-
-      if (!CopyExternLibraryIntoPlace(mainProgram: targetFilename, externFilename: otherFileName, outputWriter: outputWriter)) {
-        return false;
-      }
-    }
-
-    List<string> goArgs = new();
-    if (run) {
-      goArgs.Add("run");
-    } else {
-      string output;
-      var outputToFile = !Options.RunAfterCompile;
-
-      if (outputToFile) {
-        string extension;
-        if (hasMain) {
-          switch (Environment.OSVersion.Platform) {
-            case PlatformID.Unix:
-            case PlatformID.MacOSX:
-            case (PlatformID)128: // early Mono
-              extension = null;
-              break;
-            default:
-              extension = "exe";
-              break;
-          }
-        } else {
-          extension = "a";
-        }
-        output = Path.ChangeExtension(dafnyProgramName, extension);
-      } else {
-        switch (Environment.OSVersion.Platform) {
-          case PlatformID.Unix:
-          case PlatformID.MacOSX:
-          case (PlatformID)128: // early Mono
-            output = "/dev/null";
-            break;
-          default:
-            output = "NUL";
-            break;
-        }
-      }
-
-      goArgs.Add("build");
-      goArgs.Add("-o");
-      goArgs.Add(output);
-    }
-
-    goArgs.Add(targetFilename);
-    goArgs.AddRange(Options.MainArgs);
-
-    var psi = PrepareProcessStartInfo("go", goArgs);
-
-    psi.EnvironmentVariables["GOPATH"] = GoPath(targetFilename);
-    // Dafny compiles to the old Go package system, whereas Go has moved on to a module
-    // system. Until Dafny's Go compiler catches up, the GO111MODULE variable has to be set.
-    psi.EnvironmentVariables["GO111MODULE"] = "auto";
-
-    return 0 == RunProcess(psi, outputWriter, errorWriter);
-  }
-
-  static string GoPath(string filename) {
-    var dirName = Path.GetDirectoryName(Path.GetDirectoryName(filename));
-
-    Contract.Assert(dirName != null);
-
-    // Filename is Foo-go/src/Foo.go, so go two directories up
-    return Path.GetFullPath(dirName);
-  }
-
-  bool CopyExternLibraryIntoPlace(string externFilename, string mainProgram, TextWriter outputWriter) {
-    // Grossly, we need to look in the file to figure out where to put it
-    var pkgName = FindPackageName(externFilename);
-    if (pkgName == null) {
-      outputWriter.WriteLine("Unable to determine package name: {0}", externFilename);
-      return false;
-    }
-    if (pkgName.StartsWith("_")) {
-      // Check this here because otherwise Go acts like the package simply doesn't exist, which is confusing
-      outputWriter.WriteLine("Go packages can't start with underscores: {0}", pkgName);
-      return false;
-    }
-
-    var mainDir = Path.GetDirectoryName(mainProgram);
-
-    Contract.Assert(mainDir != null);
-
-    var tgtDir = Path.Combine(mainDir, pkgName);
-    var tgtFilename = Path.Combine(tgtDir, pkgName + ".go");
-
-    Directory.CreateDirectory(tgtDir);
-    File.Copy(externFilename, tgtFilename, overwrite: true);
-
-    string relTgtFilename;
-    var cwd = Directory.GetCurrentDirectory();
-    if (tgtFilename.StartsWith(cwd)) {
-      relTgtFilename = tgtFilename.Substring(cwd.Length + 1); // chop off relative path and '/'
-    } else {
-      relTgtFilename = tgtFilename;
-    }
-    if (Options.Verbose) {
-      outputWriter.WriteLine("Additional input {0} copied to {1}", externFilename, relTgtFilename);
-    }
-    return true;
-  }
-
-  private static string FindPackageName(string externFilename) {
-    using var rd = new StreamReader(new FileStream(externFilename, FileMode.Open, FileAccess.Read));
-    while (rd.ReadLine() is string line) {
-      var match = PackageLine.Match(line);
-      if (match.Success) {
-        return match.Groups[1].Value;
-      }
-    }
-    return null;
-  }
-
-  private static readonly Regex PackageLine = new Regex(@"^\s*package\s+([a-zA-Z0-9_]+)\s*$");
-
-  public GoBackend(DafnyOptions options) : base(options) {
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/InternalCompilersPluginConfiguration.cs b/Source/DafnyCore/Compilers/InternalCompilersPluginConfiguration.cs
deleted file mode 100644
index 7f63afc3888..00000000000
--- a/Source/DafnyCore/Compilers/InternalCompilersPluginConfiguration.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Microsoft.Dafny.Plugins;
-
-namespace Microsoft.Dafny.Compilers;
-
-internal class InternalCompilersPluginConfiguration : Plugins.PluginConfiguration {
-  public static readonly InternalCompilersPluginConfiguration Singleton = new();
-
-  public override IExecutableBackend[] GetCompilers(DafnyOptions options) {
-    return new Plugins.IExecutableBackend[] {
-      new CsharpBackend(options),
-      new JavaScriptBackend(options),
-      new GoBackend(options),
-      new JavaBackend(options),
-      new PythonBackend(options),
-      new CppCompilerBackend(options),
-      new LibraryBackend(options),
-      new RustBackend(options),
-    };
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/Java/Compiler-java.cs b/Source/DafnyCore/Compilers/Java/Compiler-java.cs
deleted file mode 100644
index 46147acb9b4..00000000000
--- a/Source/DafnyCore/Compilers/Java/Compiler-java.cs
+++ /dev/null
@@ -1,4261 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-//
-//-----------------------------------------------------------------------------
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.IO;
-using System.Diagnostics.Contracts;
-using System.Collections.ObjectModel;
-using System.Text.RegularExpressions;
-using JetBrains.Annotations;
-using static Microsoft.Dafny.ConcreteSyntaxTreeUtils;
-
-namespace Microsoft.Dafny.Compilers {
-  public class JavaCompiler : SinglePassCompiler {
-    public JavaCompiler(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
-      IntSelect = ",java.math.BigInteger";
-      LambdaExecute = ".apply";
-    }
-
-    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
-      Feature.Iterators,
-      Feature.SubsetTypeTests,
-      Feature.MethodSynthesis,
-      Feature.TuplesWiderThan20
-    };
-
-    const string DafnySetClass = "dafny.DafnySet";
-    const string DafnyMultiSetClass = "dafny.DafnyMultiset";
-    const string DafnySeqClass = "dafny.DafnySequence";
-    const string DafnyMapClass = "dafny.DafnyMap";
-
-    const string DafnyBigRationalClass = "dafny.BigRational";
-    const string DafnyEuclideanClass = "dafny.DafnyEuclidean";
-    const string DafnyHelpersClass = "dafny.Helpers";
-    const string DafnyTypeDescriptor = "dafny.TypeDescriptor";
-    string FormatDefaultTypeParameterValue(TypeParameter tp) => FormatDefaultTypeParameterValueName(tp.GetCompileName(Options));
-    static string FormatDefaultTypeParameterValueName(string tpName) => $"_default_{tpName}";
-
-    const string DafnyFunctionIfacePrefix = "dafny.Function";
-    const string DafnyMultiArrayClassPrefix = "dafny.Array";
-    const string DafnyTupleClassPrefix = "dafny.Tuple";
-
-    string DafnyMultiArrayClass(int dim) => DafnyMultiArrayClassPrefix + dim;
-    string DafnyTupleClass(int size) => DafnyTupleClassPrefix + size;
-
-    string DafnyFunctionIface(int arity) =>
-      arity == 1 ? "java.util.function.Function" : DafnyFunctionIfacePrefix + arity;
-
-    static string FormatExternBaseClassName(string externClassName) =>
-      $"_ExternBase_{externClassName}";
-    static string FormatTypeDescriptorVariable(string typeVarName) =>
-      $"_td_{typeVarName}";
-    string FormatTypeDescriptorVariable(TypeParameter tp) =>
-      FormatTypeDescriptorVariable(tp.GetCompileName(Options));
-
-    const string TypeMethodName = "_typeDescriptor";
-
-    private string ModuleName;
-    private string ModulePath;
-    private int FileCount = 0;
-    private Import ModuleImport;
-    private HashSet<int> tuples = new HashSet<int>();
-    private HashSet<int> functions = new HashSet<int>();
-    private HashSet<int> arrays = new HashSet<int>();
-
-    private readonly List<Import> Imports = new List<Import>();
-
-    //RootImportWriter writes additional imports to the main file.
-    private ConcreteSyntaxTree RootImportWriter;
-
-    private record Import(string Name, string Path);
-
-    private readonly List<GenericCompilationInstrumenter> Instrumenters = new();
-
-    public void AddInstrumenter(GenericCompilationInstrumenter compilationInstrumenter) {
-      Instrumenters.Add(compilationInstrumenter);
-    }
-
-    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
-
-
-    protected override bool SupportsAmbiguousTypeDecl => false;
-    protected override bool SupportsProperties => false;
-
-    private enum JavaNativeType { Byte, Short, Int, Long }
-
-    private static JavaNativeType AsJavaNativeType(NativeType.Selection sel) {
-      switch (sel) {
-        case NativeType.Selection.Byte:
-        case NativeType.Selection.SByte:
-          return JavaNativeType.Byte;
-        case NativeType.Selection.Short:
-        case NativeType.Selection.UShort:
-          return JavaNativeType.Short;
-        case NativeType.Selection.Int:
-        case NativeType.Selection.UInt:
-          return JavaNativeType.Int;
-        case NativeType.Selection.Long:
-        case NativeType.Selection.ULong:
-          return JavaNativeType.Long;
-        default:
-          Contract.Assert(false);
-          throw new cce.UnreachableException();
-      }
-    }
-
-    private static bool IsUnsignedJavaNativeType(NativeType nt) {
-      Contract.Requires(nt != null);
-      switch (nt.Sel) {
-        case NativeType.Selection.Byte:
-        case NativeType.Selection.UShort:
-        case NativeType.Selection.UInt:
-        case NativeType.Selection.ULong:
-          return true;
-        default:
-          return false;
-      }
-    }
-
-    private static JavaNativeType AsJavaNativeType(NativeType nt) {
-      return AsJavaNativeType(nt.Sel);
-    }
-
-    private JavaNativeType? AsJavaNativeType(Type type) {
-      var nt = AsNativeType(type);
-      if (nt == null) {
-        return null;
-      } else {
-        return AsJavaNativeType(nt);
-      }
-    }
-
-    protected override void DeclareSpecificOutCollector(string collectorVarName, ConcreteSyntaxTree wr, List<Type> formalTypes, List<Type> lhsTypes) {
-      // If the method returns an array of parameter type, and we're assigning
-      // to a variable with a more specific type, we need to insert a cast:
-      //
-      // Array<Integer> outcollector42 = obj.Method(); // <-- you are here
-      // int[] out43 = (int[]) outcollector42.unwrap();
-      var returnedTypes = new List<string>();
-      Contract.Assert(formalTypes.Count == lhsTypes.Count);
-      for (var i = 0; i < formalTypes.Count; i++) {
-        var formalType = formalTypes[i];
-        var lhsType = lhsTypes[i];
-        if (formalType.IsArrayType && formalType.AsArrayType.Dims == 1 && UserDefinedType.ArrayElementType(formalType).IsTypeParameter) {
-          returnedTypes.Add("java.lang.Object");
-        } else {
-          returnedTypes.Add(TypeName(lhsType, wr, Token.NoToken, boxed: formalTypes.Count > 1));
-        }
-      }
-      if (formalTypes.Count > 1) {
-        tuples.Add(formalTypes.Count);
-        wr.Write($"{DafnyTupleClass(formalTypes.Count)}<{Util.Comma(returnedTypes)}> {collectorVarName} = ");
-      } else {
-        wr.Write($"{returnedTypes[0]} {collectorVarName} = ");
-      }
-    }
-    protected override void EmitCastOutParameterSplits(string outCollector, List<string> lhsNames,
-      ConcreteSyntaxTree wr, List<Type> formalTypes, List<Type> lhsTypes, IToken tok) {
-      var wOuts = new List<ConcreteSyntaxTree>();
-      for (var i = 0; i < lhsNames.Count; i++) {
-        wr.Write($"{lhsNames[i]} = ");
-        //
-        // Suppose we have:
-        //
-        //   method Foo<A>(a : A) returns (arr : array<A>)
-        //
-        // This is compiled to:
-        //
-        //   public <A> Object Foo(A a)
-        //
-        // (There's also an argument for the type descriptor, but I'm omitting
-        // it for clarity.)  Foo returns Object, not A[], since A could be
-        // primitive and primitives cannot be generic parameters in Java
-        // (*sigh*).  So when we call it:
-        //
-        //   var arr : int[] := Foo(42);
-        //
-        // we have to add a type cast:
-        //
-        //   BigInteger[] arr = (BigInteger[]) Foo(new BigInteger(42));
-        //
-        // Things can get more complicated than this, however.  If the method returns
-        // the array as part of a tuple:
-        //
-        //   method Foo<A>(a : A) returns (pair : (array<A>, array<A>))
-        //
-        // then we get:
-        //
-        //   public <A> Tuple2<Object, Object> Foo(A a)
-        //
-        // and we have to write:
-        //
-        //   BigInteger[] arr = (Pair<BigInteger[], BigInteger[]>) (Object) Foo(new BigInteger(42));
-        //
-        // (Note the extra cast to Object, since Java doesn't allow a cast to
-        // change a type parameter, as that's unsound in general.  It just
-        // happens to be okay here!)
-        //
-        // Rather than try and exhaustively check for all the circumstances
-        // where a cast is necessary, for the moment we just always cast to the
-        // LHS type via Object, which is redundant 99% of the time but not
-        // harmful.
-        if (lhsTypes[i] == null) {
-          wr.Write($"(Object) ");
-        } else {
-          wr.Write($"({TypeName(lhsTypes[i], wr, Token.NoToken)}) (Object) ");
-        }
-
-        if (lhsNames.Count == 1) {
-          wr.Write(outCollector);
-        } else {
-          wr.Write($"{outCollector}.dtor__{i}()");
-        }
-        EndStmt(wr);
-      }
-    }
-
-    protected override void EmitSeqSelect(AssignStmt s0, List<Type> tupleTypeArgsList, ConcreteSyntaxTree wr, string tup) {
-      wr.Write("(");
-      var lhs = (SeqSelectExpr)s0.Lhs;
-      EmitIndexCollectionUpdate(lhs.Seq.Type, out var wColl, out var wIndex, out var wValue, wr, nativeIndex: true);
-      var wCoerce = EmitCoercionIfNecessary(from: NativeObjectType, to: lhs.Seq.Type, tok: s0.Tok, wr: wColl);
-      wCoerce.Write($"({TypeName(lhs.Seq.Type.NormalizeExpand(), wCoerce, s0.Tok)})");
-      EmitTupleSelect(tup, 0, wCoerce);
-      wColl.Write(")");
-      var wCast = EmitCoercionToNativeInt(wIndex);
-      EmitTupleSelect(tup, 1, wCast);
-      wValue.Write($"({TypeName(tupleTypeArgsList[2].NormalizeExpand(), wValue, s0.Tok)})");
-      EmitTupleSelect(tup, 2, wValue);
-      EndStmt(wr);
-    }
-
-    protected override void EmitMultiSelect(AssignStmt s0, List<Type> tupleTypeArgsList, ConcreteSyntaxTree wr, string tup, int L) {
-      var arrayType = tupleTypeArgsList[0];
-      var rhsType = tupleTypeArgsList[L - 1];
-
-      var lhs = (MultiSelectExpr)s0.Lhs;
-      var indices = new List<string>();
-      for (var i = 0; i < lhs.Indices.Count; i++) {
-        var wIndex = new ConcreteSyntaxTree();
-        wIndex.Write("((java.math.BigInteger)");
-        EmitTupleSelect(tup, i + 1, wIndex);
-        wIndex.Write(")");
-        indices.Add(wIndex.ToString());
-      }
-
-      var (wArray, wRhs) = EmitArrayUpdate(indices, rhsType, wr);
-      wArray = EmitCoercionIfNecessary(from: null, to: arrayType, tok: s0.Tok, wr: wArray);
-      wArray.Write($"({TypeName(arrayType.NormalizeExpand(), wArray, s0.Tok)})");
-      EmitTupleSelect(tup, 0, wArray);
-
-      wRhs.Write($"({TypeName(rhsType, wr, s0.Tok)})");
-      EmitTupleSelect(tup, L - 1, wRhs);
-
-      EndStmt(wr);
-    }
-
-    protected override void WriteCast(string s, ConcreteSyntaxTree wr) {
-      wr.Write($"({s})");
-    }
-
-    protected override ConcreteSyntaxTree EmitIngredients(ConcreteSyntaxTree wr, string ingredients, int L, string tupleTypeArgs, ForallStmt s, AssignStmt s0, Expression rhs) {
-      var wStmts = wr.Fork();
-      var wrVarInit = wr;
-      wrVarInit.Write($"java.util.ArrayList<{DafnyTupleClass(L)}<{tupleTypeArgs}>> {ingredients} = ");
-      AddTupleToSet(L);
-      EmitEmptyTupleList(tupleTypeArgs, wrVarInit);
-      var wrOuter = wr;
-      wr = CompileGuardedLoops(s.BoundVars, s.Bounds, s.Range, wr);
-      var wrTuple = EmitAddTupleToList(ingredients, tupleTypeArgs, wr);
-      wrTuple.Write($"{L}<{tupleTypeArgs}>(");
-      if (s0.Lhs is MemberSelectExpr lhs1) {
-        wrTuple.Append(Expr(lhs1.Obj, false, wStmts));
-      } else if (s0.Lhs is SeqSelectExpr lhs2) {
-        wrTuple.Append(Expr(lhs2.Seq, false, wStmts));
-        wrTuple.Write(", ");
-        TrParenExpr(lhs2.E0, wrTuple, false, wStmts);
-      } else {
-        var lhs = (MultiSelectExpr)s0.Lhs;
-        wrTuple.Append(Expr(lhs.Array, false, wStmts));
-        foreach (var t in lhs.Indices) {
-          wrTuple.Write(", ");
-          TrParenExpr(t, wrTuple, false, wStmts);
-        }
-      }
-
-      wrTuple.Write(", ");
-      if (rhs is MultiSelectExpr) {
-        Type t = rhs.Type.NormalizeExpand();
-        wrTuple.Write($"({TypeName(t, wrTuple, rhs.tok)})");
-      }
-
-      wrTuple.Append(Expr(rhs, false, wStmts));
-      return wrOuter;
-    }
-
-    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
-      if (Options.IncludeRuntime) {
-        EmitRuntimeSource(program, wr);
-      }
-      wr.WriteLine($"// Dafny program {program.Name} compiled into Java");
-      ModuleName = program.MainMethod != null ? "main" : Path.GetFileNameWithoutExtension(program.Name);
-      wr.WriteLine();
-      // Keep the import writers so that we can import subsequent modules into the main one
-      EmitImports(wr, out RootImportWriter);
-      wr.WriteLine();
-    }
-
-    private void EmitRuntimeSource(Program program, ConcreteSyntaxTree wr) {
-      var assembly = System.Reflection.Assembly.Load("DafnyPipeline");
-      var files = assembly.GetManifestResourceNames();
-      const string header = "DafnyPipeline.java";
-      // Files in 'files' have the form 'DafnyPipeline.java.dafny.Array.java'
-      foreach (var file in files.Where(f => f.StartsWith(header))) {
-        var parts = file.Split('.');
-        var realName = string.Join('/', parts.SkipLast(1).Skip(2)) + "." + parts.Last();
-        var fileNode = wr.NewFile(realName);
-        ReadRuntimeSystem(program, file, fileNode);
-      }
-    }
-
-    // Only exists to make sure method is overriden
-    protected override void EmitBuiltInDecls(SystemModuleManager systemModuleManager, ConcreteSyntaxTree wr) {
-      if (systemModuleManager.MaxNonGhostTupleSizeUsed > 20) {
-        UnsupportedFeatureError(systemModuleManager.MaxNonGhostTupleSizeToken, Feature.TuplesWiderThan20);
-      }
-    }
-
-    public static string TransformToClassName(string baseName) {
-      baseName = PublicIdProtectAux(baseName);
-      var sanitizedName = Regex.Replace(baseName, "[^_A-Za-z0-9$]", "_");
-      if (!Regex.IsMatch(sanitizedName, "^[_A-Za-z]")) {
-        sanitizedName = "_" + sanitizedName;
-      }
-      return sanitizedName;
-    }
-
-    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
-      var className = TransformToClassName(baseName);
-      wr = wr.NewBlock($"public class {className}");
-
-      var companion = TypeName_Companion(UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(mainMethod.EnclosingClass), wr, mainMethod.tok, mainMethod);
-      var wBody = wr.NewNamedBlock("public static void main(String[] args)");
-      var modName = mainMethod.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options) == "_module" ? "_System." : "";
-      companion = modName + companion;
-      Coverage.EmitSetup(wBody);
-      wBody.WriteLine($"{DafnyHelpersClass}.withHaltHandling(() -> {{ {companion}.__Main({DafnyHelpersClass}.{CharMethodQualifier}FromMainArguments(args)); }} );");
-      Coverage.EmitTearDown(wBody);
-    }
-
-    void EmitImports(ConcreteSyntaxTree wr, out ConcreteSyntaxTree importWriter) {
-      importWriter = wr.Fork();
-      foreach (var import in Imports) {
-        if (import.Name != ModuleName) {
-          EmitImport(import, importWriter);
-        }
-      }
-    }
-
-    private void EmitImport(Import import, ConcreteSyntaxTree importWriter) {
-      importWriter.WriteLine($"import {import.Path.Replace('/', '.')}.*;");
-    }
-
-    protected override ConcreteSyntaxTree CreateModule(string moduleName, bool isDefault, bool isExtern, string /*?*/ libraryName, ConcreteSyntaxTree wr) {
-      if (isDefault) {
-        // Fold the default module into the main module
-        return wr;
-      }
-      var pkgName = libraryName ?? IdProtect(moduleName);
-      var path = pkgName.Replace('.', '/');
-      var import = new Import(moduleName, path);
-      ModuleName = IdProtect(moduleName);
-      ModulePath = path;
-      ModuleImport = import;
-      FileCount = 0;
-      return wr;
-    }
-
-    protected override void FinishModule() {
-      if (FileCount > 0) {
-        AddImport(ModuleImport);
-      }
-      FileCount = 0;
-    }
-
-    private void AddImport(Import import) {
-      if (!Imports.Contains(import)) {
-        EmitImport(import, RootImportWriter);
-        Imports.Add(import);
-      }
-    }
-
-    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
-      var cw = (ClassWriter)CreateClass(IdProtect(sst.EnclosingModuleDefinition.GetCompileName(Options)), IdName(sst), sst, wr);
-      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-        var sw = new ConcreteSyntaxTree(cw.InstanceMemberWriter.RelativeIndentLevel);
-        var wStmts = cw.InstanceMemberWriter.Fork();
-        sw.Append(Expr(sst.Witness, false, wStmts));
-        var witness = sw.ToString();
-        var typeName = TypeName(sst.Rhs, cw.StaticMemberWriter, sst.tok);
-        if (sst.TypeArgs.Count == 0) {
-          cw.DeclareField("Witness", sst, true, true, sst.Rhs, sst.tok, witness, null);
-          witness = "Witness";
-        }
-        cw.StaticMemberWriter.Write($"public static {TypeParameters(sst.TypeArgs, " ")}{typeName} defaultValue(");
-        var typeDescriptorParams = sst.TypeArgs.Where(NeedsTypeDescriptor);
-        cw.StaticMemberWriter.Write(typeDescriptorParams.Comma(tp =>
-          $"{DafnyTypeDescriptor}<{tp.GetCompileName(Options)}> {FormatTypeDescriptorVariable(tp.GetCompileName(Options))}"));
-        var w = cw.StaticMemberWriter.NewBlock(")");
-        w.WriteLine($"return {witness};");
-      }
-    }
-
-    protected class ClassWriter : IClassWriter {
-      public readonly JavaCompiler Compiler;
-      public readonly ConcreteSyntaxTree InstanceMemberWriter;
-      public readonly ConcreteSyntaxTree StaticMemberWriter;
-      public readonly ConcreteSyntaxTree CtorBodyWriter;
-
-      public ClassWriter(JavaCompiler compiler, ConcreteSyntaxTree instanceMemberWriter, ConcreteSyntaxTree ctorBodyWriter, ConcreteSyntaxTree staticMemberWriter = null) {
-        Contract.Requires(compiler != null);
-        Contract.Requires(instanceMemberWriter != null);
-        this.Compiler = compiler;
-        this.InstanceMemberWriter = instanceMemberWriter;
-        this.CtorBodyWriter = ctorBodyWriter;
-        this.StaticMemberWriter = staticMemberWriter ?? instanceMemberWriter;
-      }
-
-      public ConcreteSyntaxTree Writer(bool isStatic, bool createBody, MemberDecl/*?*/ member) {
-        if (createBody) {
-          if (isStatic || (member != null && member.EnclosingClass is TraitDecl && Compiler.NeedsCustomReceiver(member))) {
-            return StaticMemberWriter;
-          }
-        }
-        return InstanceMemberWriter;
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateMethod(m, typeArgs, createBody, Writer(m.IsStatic, createBody, m), forBodyInheritance, lookasideBody);
-      }
-
-      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        throw new UnsupportedFeatureException(m.tok, Feature.MethodSynthesis);
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateFunction(name, typeArgs, formals, resultType, tok, isStatic, createBody, member, Writer(isStatic, createBody, member), forBodyInheritance, lookasideBody);
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IToken tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance) {
-        return Compiler.CreateGetter(name, resultType, tok, isStatic, createBody, Writer(isStatic, createBody, member));
-      }
-      public ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
-        return Compiler.CreateGetterSetter(name, resultType, tok, createBody, out setterWriter, Writer(false, createBody, member));
-      }
-      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IToken tok, string rhs, Field field) {
-        Compiler.DeclareField(name, isStatic, isConst, type, tok, rhs, this);
-      }
-      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
-        throw new cce.UnreachableException();  // InitializeField should be called only for those compilers that set ClassesRedeclareInheritedFields to false.
-      }
-      public ConcreteSyntaxTree/*?*/ ErrorWriter() => InstanceMemberWriter;
-
-      public void Finish() { }
-    }
-
-    protected override bool SupportsStaticsInGenericClasses => false;
-
-    protected ConcreteSyntaxTree CreateGetter(string name, Type resultType, IToken tok, bool isStatic,
-      bool createBody, ConcreteSyntaxTree wr) {
-      wr.Write("public {0}{1} {2}()", isStatic ? "static " : "", TypeName(resultType, wr, tok), name);
-      if (createBody) {
-        var w = wr.NewBlock("", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
-        return w;
-      } else {
-        wr.WriteLine(";");
-        return null;
-      }
-    }
-
-    protected override void DeclareLocalVar(string name, Type /*?*/ type, IToken /*?*/ tok, Expression rhs,
-        bool inLetExprBody, ConcreteSyntaxTree wr) {
-      if (type == null) {
-        type = rhs.Type;
-      }
-      var wStmts = wr.Fork();
-      var w = DeclareLocalVar(name, type, tok, wr);
-      w.Append(Expr(rhs, inLetExprBody, wStmts));
-    }
-
-    public ConcreteSyntaxTree /*?*/ CreateGetterSetter(string name, Type resultType, IToken tok,
-      bool createBody, out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree wr) {
-      wr.Write($"public {TypeName(resultType, wr, tok)} {name}()");
-      ConcreteSyntaxTree wGet = null;
-      if (createBody) {
-        wGet = wr.NewBlock("", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
-      } else {
-        wr.WriteLine(";");
-      }
-      wr.Write($"public void set_{name}({TypeName(resultType, wr, tok)} value)");
-      if (createBody) {
-        setterWriter = wr.NewBlock("", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
-      } else {
-        wr.WriteLine(";");
-        setterWriter = null;
-      }
-      return wGet;
-    }
-    protected ConcreteSyntaxTree CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
-      if (m.IsExtern(Options, out _, out _) && (m.IsStatic || m is Constructor)) {
-        // No need for an abstract version of a static method or a constructor
-        return null;
-      }
-      string targetReturnTypeReplacement = null;
-      int nonGhostOuts = 0;
-      int nonGhostIndex = 0;
-      for (int i = 0; i < m.Outs.Count; i++) {
-        if (!m.Outs[i].IsGhost) {
-          nonGhostOuts += 1;
-          nonGhostIndex = i;
-        }
-      }
-      if (nonGhostOuts == 1) {
-        targetReturnTypeReplacement = TypeName(m.Outs[nonGhostIndex].Type, wr, m.Outs[nonGhostIndex].tok);
-      } else if (nonGhostOuts > 1) {
-        targetReturnTypeReplacement = DafnyTupleClass(nonGhostOuts);
-      }
-      var customReceiver = createBody && !forBodyInheritance && NeedsCustomReceiver(m);
-      var receiverType = UserDefinedType.FromTopLevelDecl(m.tok, m.EnclosingClass);
-      foreach (var instrumenter in Instrumenters) {
-        instrumenter.BeforeMethod(m, wr);
-      }
-      wr.Write("public {0}{1}", !createBody && !(m.EnclosingClass is TraitDecl) ? "abstract " : "", m.IsStatic || customReceiver ? "static " : "");
-      wr.Write(TypeParameters(TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, m, lookasideBody)), " "));
-      wr.Write("{0} {1}", targetReturnTypeReplacement ?? "void", IdName(m));
-      wr.Write("(");
-      var sep = "";
-      WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, m.EnclosingClass, m, lookasideBody), wr, ref sep, tp => $"{DafnyTypeDescriptor}<{tp.GetCompileName(Options)}> {FormatTypeDescriptorVariable(tp)}");
-      if (customReceiver) {
-        DeclareFormal(sep, "_this", receiverType, m.tok, true, wr);
-        sep = ", ";
-      }
-      WriteFormals(sep, m.Ins, wr);
-      if (!createBody) {
-        wr.WriteLine(");");
-        return null; // We do not want to write a function body, so instead of returning a BTW, we return null.
-      } else {
-        return wr.NewBlock(")", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitMethodReturns(Method m, ConcreteSyntaxTree wr) {
-      int nonGhostOuts = 0;
-      foreach (var t in m.Outs) {
-        if (t.IsGhost) {
-          continue;
-        }
-
-        nonGhostOuts += 1;
-        break;
-      }
-      if (!m.Body.Body.OfType<ReturnStmt>().Any() && (nonGhostOuts > 0 || m.IsTailRecursive)) { // If method has out parameters or is tail-recursive but no explicit return statement in Dafny
-        var beforeReturn = wr.NewBlock("if(true)"); // Ensure no unreachable error is thrown for the return statement
-        EmitReturn(m.Outs, wr);
-        return beforeReturn;
-      }
-      return wr;
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs,
-      List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member,
-      ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
-      if (member.IsExtern(Options, out _, out _) && isStatic) {
-        // No need for abstract version of static method
-        return null;
-      }
-      var customReceiver = createBody && !forBodyInheritance && NeedsCustomReceiver(member);
-      var receiverType = UserDefinedType.FromTopLevelDecl(member.tok, member.EnclosingClass);
-      wr.Write("public {0}{1}", !createBody && !(member.EnclosingClass is TraitDecl) ? "abstract " : "", isStatic || customReceiver ? "static " : "");
-      wr.Write(TypeParameters(TypeArgumentInstantiation.ToFormals(ForTypeParameters(typeArgs, member, lookasideBody)), " "));
-      wr.Write($"{TypeName(resultType, wr, tok)} {name}(");
-      var sep = "";
-      var argCount = WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, lookasideBody), wr, ref sep, tp => $"{DafnyTypeDescriptor}<{tp.GetCompileName(Options)}> {FormatTypeDescriptorVariable(tp)}");
-      if (customReceiver) {
-        DeclareFormal(sep, "_this", receiverType, tok, true, wr);
-        sep = ", ";
-        argCount++;
-      }
-      argCount += WriteFormals(sep, formals, wr);
-      if (!createBody) {
-        wr.WriteLine(");");
-        return null; // We do not want to write a function body, so instead of returning a BTW, we return null.
-      } else {
-        ConcreteSyntaxTree w;
-        if (argCount > 1) {
-          w = wr.NewBlock(")", null, BlockStyle.NewlineBrace, BlockStyle.NewlineBrace);
-        } else {
-          w = wr.NewBlock(")");
-        }
-        return w;
-      }
-    }
-
-    protected void DeclareField(string name, bool isStatic, bool isConst, Type type, IToken tok, string rhs, ClassWriter cw) {
-      if (isStatic) {
-        var r = rhs ?? DefaultValue(type, cw.StaticMemberWriter, tok);
-        var t = StripTypeParameters(TypeName(type, cw.StaticMemberWriter, tok));
-        cw.StaticMemberWriter.WriteLine($"public static {t} {name} = {r};");
-      } else {
-        Contract.Assert(cw.CtorBodyWriter != null, "Unexpected instance field");
-        cw.InstanceMemberWriter.WriteLine("public {0} {1};", TypeName(type, cw.InstanceMemberWriter, tok), name);
-        cw.CtorBodyWriter.WriteLine("this.{0} = {1};", name, rhs ?? PlaceboValue(type, cw.CtorBodyWriter, tok));
-      }
-    }
-
-    private string StripTypeParameters(string s) {
-      Contract.Requires(s != null);
-      return Regex.Replace(s, @"<.+>", "");
-    }
-
-    private void EmitSuppression(ConcreteSyntaxTree wr) {
-      wr.WriteLine("@SuppressWarnings({\"unchecked\", \"deprecation\"})");
-    }
-
-    string TypeParameters(List<TypeParameter>/*?*/ targs, string suffix = "") {
-      Contract.Requires(targs == null || cce.NonNullElements(targs));
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      if (targs == null || targs.Count == 0) {
-        return "";  // ignore suffix
-      }
-      return $"<{Util.Comma(targs, IdName)}>{suffix}";
-    }
-
-    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member = null) {
-      return TypeName(type, wr, tok, boxed: false, member);
-    }
-
-    private string BoxedTypeName(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      return TypeName(type, wr, tok, boxed: true);
-    }
-
-    private string ActualTypeArgument(Type type, TypeParameter.TPVariance variance, ConcreteSyntaxTree wr, IToken tok) {
-      Contract.Requires(type != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(tok != null);
-      var typeName = BoxedTypeName(type, wr, tok);
-      if (variance == TypeParameter.TPVariance.Co) {
-        return "? extends " + typeName;
-      } else if (variance == TypeParameter.TPVariance.Contra) {
-        if (type.IsRefType) {
-          return "? super " + typeName;
-        }
-      }
-      return typeName;
-    }
-
-    private string BoxedTypeNames(List<Type> types, ConcreteSyntaxTree wr, IToken tok) {
-      return Util.Comma(types, t => BoxedTypeName(t, wr, tok));
-    }
-
-    protected override string TypeArgumentName(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      return BoxedTypeName(type, wr, tok);
-    }
-
-    private string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, bool boxed, MemberDecl /*?*/ member = null) {
-      return TypeName(type, wr, tok, boxed, false, member);
-    }
-
-    private string CharTypeName(bool boxed) {
-      if (UnicodeCharEnabled) {
-        return boxed ? "dafny.CodePoint" : "int";
-      } else {
-        return boxed ? "Character" : "char";
-      }
-    }
-
-    private string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, bool boxed, bool erased, MemberDecl/*?*/ member = null) {
-      Contract.Ensures(Contract.Result<string>() != null);
-      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
-
-      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
-      if (xType is BoolType) {
-        return boxed ? "Boolean" : "boolean";
-      } else if (xType is CharType) {
-        return CharTypeName(boxed);
-      } else if (xType is IntType || xType is BigOrdinalType) {
-        return "java.math.BigInteger";
-      } else if (xType is RealType) {
-        return DafnyBigRationalClass;
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        return t.NativeType != null ? GetNativeTypeName(t.NativeType, boxed) : "java.math.BigInteger";
-      } else if (member == null && xType.AsNewtype != null) {
-        var nativeType = xType.AsNewtype.NativeType;
-        if (nativeType != null) {
-          return GetNativeTypeName(nativeType, boxed);
-        }
-        return TypeName(xType.AsNewtype.BaseType, wr, tok, boxed, erased);
-      } else if (xType.IsObjectQ) {
-        return "Object";
-      } else if (xType.IsArrayType) {
-        ArrayClassDecl at = xType.AsArrayType;
-        Contract.Assert(at != null);  // follows from type.IsArrayType
-        Type elType = UserDefinedType.ArrayElementType(xType);
-        return ArrayTypeName(elType, at.Dims, wr, tok, erased);
-      } else if (xType is UserDefinedType udt) {
-        if (udt.ResolvedClass is TypeParameter tp) {
-          if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(tp, out var instantiatedTypeParameter)) {
-            return TypeName(instantiatedTypeParameter, wr, tok, true, member);
-          }
-        }
-        var s = FullTypeName(udt, member);
-        if (s.Equals("string")) {
-          return "String";
-        }
-        var cl = udt.ResolvedClass;
-        if (cl is TupleTypeDecl tupleDecl) {
-          s = DafnyTupleClass(tupleDecl.NonGhostDims);
-        }
-        // When accessing a static member, leave off the type arguments
-        if (member != null) {
-          return TypeName_UDT(s, new List<TypeParameter.TPVariance>(), new List<Type>(), wr, udt.tok, erased);
-        } else {
-          return TypeName_UDT(s, udt, wr, udt.tok, erased);
-        }
-      } else if (xType is SetType) {
-        var argType = ((SetType)xType).Arg;
-        if (erased) {
-          return DafnySetClass;
-        }
-        return $"{DafnySetClass}<{ActualTypeArgument(argType, TypeParameter.TPVariance.Co, wr, tok)}>";
-      } else if (xType is SeqType) {
-        var argType = ((SeqType)xType).Arg;
-        if (erased) {
-          return DafnySeqClass;
-        }
-        return $"{DafnySeqClass}<{ActualTypeArgument(argType, TypeParameter.TPVariance.Co, wr, tok)}>";
-      } else if (xType is MultiSetType) {
-        var argType = ((MultiSetType)xType).Arg;
-        if (erased) {
-          return DafnyMultiSetClass;
-        }
-        return $"{DafnyMultiSetClass}<{ActualTypeArgument(argType, TypeParameter.TPVariance.Co, wr, tok)}>";
-      } else if (xType is MapType) {
-        var domType = ((MapType)xType).Domain;
-        var ranType = ((MapType)xType).Range;
-        if (erased) {
-          return DafnyMapClass;
-        }
-        return $"{DafnyMapClass}<{ActualTypeArgument(domType, TypeParameter.TPVariance.Co, wr, tok)}, {ActualTypeArgument(ranType, TypeParameter.TPVariance.Co, wr, tok)}>";
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    string ArrayTypeName(Type elType, int dims, ConcreteSyntaxTree wr, IToken tok, bool erased) {
-      elType = DatatypeWrapperEraser.SimplifyType(Options, elType);
-      if (dims > 1) {
-        arrays.Add(dims);
-        if (erased) {
-          return DafnyMultiArrayClass(dims);
-        } else {
-          return $"{DafnyMultiArrayClass(dims)}<{ActualTypeArgument(elType, TypeParameter.TPVariance.Non, wr, tok)}>";
-        }
-      } else if (elType.IsTypeParameter) {
-        return "java.lang.Object";
-      } else {
-        return $"{TypeName(elType, wr, tok, false, erased)}[]";
-      }
-    }
-
-    protected string CollectionTypeUnparameterizedName(CollectionType ct) {
-      if (ct is SeqType) {
-        return DafnySeqClass;
-      } else if (ct is SetType) {
-        return DafnySetClass;
-      } else if (ct is MultiSetType) {
-        return DafnyMultiSetClass;
-      } else if (ct is MapType) {
-        return DafnyMapClass;
-      } else {
-        Contract.Assert(false);  // unexpected collection type
-        throw new cce.UnreachableException();  // to please the compiler
-      }
-    }
-
-    protected override string FullTypeName(UserDefinedType udt, MemberDecl /*?*/ member = null) {
-      return FullTypeName(udt, member, false);
-    }
-
-    protected string FullTypeName(UserDefinedType udt, MemberDecl member, bool useCompanionName) {
-      Contract.Requires(udt != null);
-      if (udt.IsBuiltinArrowType) {
-        functions.Add(udt.TypeArgs.Count - 1);
-        return DafnyFunctionIface(udt.TypeArgs.Count - 1);
-      }
-
-      if (member != null && member.IsExtern(Options, out var qualification, out _) && qualification != null) {
-        return qualification;
-      }
-      var cl = udt.ResolvedClass;
-      if (cl is NonNullTypeDecl nntd) {
-        cl = nntd.Class;
-      }
-      if (cl is TypeParameter) {
-        return IdProtect(udt.GetCompileName(Options));
-      } else if (cl is TupleTypeDecl tupleDecl) {
-        return DafnyTupleClass(tupleDecl.NonGhostDims);
-      } else if (cl is TraitDecl && useCompanionName) {
-        return IdProtect(udt.GetFullCompanionCompileName(Options));
-      } else if (cl.EnclosingModuleDefinition.GetCompileName(Options) == ModuleName || cl.EnclosingModuleDefinition.IsDefaultModule) {
-        return IdProtect(cl.GetCompileName(Options));
-      } else {
-        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdProtect(cl.GetCompileName(Options));
-      }
-    }
-
-    protected override void TypeName_SplitArrayName(Type type, out Type innermostElementType, out string brackets) {
-      Contract.Requires(type != null);
-
-      type = DatatypeWrapperEraser.SimplifyType(Options, type);
-      var at = type.AsArrayType;
-      if (at != null && at.Dims == 1 && !DatatypeWrapperEraser.SimplifyType(Options, type.TypeArgs[0]).IsTypeParameter) {
-        TypeName_SplitArrayName(type.TypeArgs[0], out innermostElementType, out brackets);
-        brackets = TypeNameArrayBrackets(at.Dims) + brackets;
-      } else {
-        innermostElementType = type;
-        brackets = "";
-      }
-    }
-
-    protected override string TypeNameArrayBrackets(int dims) {
-      return Util.Repeat(dims, "[]");
-    }
-
-    protected override bool DeclareFormal(string prefix, string name, Type type, IToken tok, bool isInParam, ConcreteSyntaxTree wr) {
-      if (!isInParam) {
-        return false;
-      }
-
-      wr.Write($"{prefix}{TypeName(type, wr, tok)} {name}");
-      return true;
-    }
-
-    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
-      ConcreteSyntaxTree wr, IToken tok, bool omitTypeArguments) {
-      Contract.Assume(fullCompileName != null);  // precondition; this ought to be declared as a Requires in the superclass
-      Contract.Assume(variance != null);  // precondition; this ought to be declared as a Requires in the superclass
-      Contract.Assume(typeArgs != null);  // precondition; this ought to be declared as a Requires in the superclass
-      Contract.Assume(variance.Count == typeArgs.Count);
-      string s = IdProtect(fullCompileName);
-      if (typeArgs.Count != 0 && !omitTypeArguments) {
-        s += "<" + BoxedTypeNames(typeArgs, wr, tok) + ">";
-      }
-      return s;
-    }
-
-    // We write an extern class as a base class that the actual extern class
-    // needs to extend, so the extern methods and functions need to be abstract
-    // in the base class
-    protected override bool IncludeExternMembers { get => true; }
-
-    //
-    // An example to show how type parameters are dealt with:
-    //
-    //   class Class<T /* needs auto-initializer */, U /* does not */> {
-    //     private String sT; // type descriptor for T
-    //
-    //     // Fields are assigned in the constructor because some will
-    //     // depend on a type parameter
-    //     public T t;
-    //     public U u;
-    //
-    //     public Class(String sT) {
-    //       this.sT = sT;
-    //       this.t = dafny.Helpers.getDefault(sT);
-    //       // Note: The field must be assigned a real value before being read!
-    //       this.u = null;
-    //     }
-    //
-    //     public __ctor(U u) {
-    //       this.u = u;
-    //     }
-    //   }
-    //
-    protected override IClassWriter CreateClass(string moduleName, string name, bool isExtern, string /*?*/ fullPrintName,
-      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type> /*?*/ superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      var javaName = isExtern ? FormatExternBaseClassName(name) : name;
-      var filename = $"{ModulePath}/{javaName}.java";
-      var w = wr.NewFile(filename);
-      FileCount += 1;
-      w.WriteLine($"// Class {javaName}");
-      w.WriteLine($"// Dafny class {name} compiled into Java");
-      w.WriteLine($"package {ModuleName};");
-      w.WriteLine();
-      EmitImports(w, out _);
-      w.WriteLine();
-      //TODO: Fix implementations so they do not need this suppression
-      EmitSuppression(w);
-      foreach (var instrumenter in Instrumenters) {
-        instrumenter.BeforeClass(cls, w);
-      }
-      var abstractness = isExtern ? "abstract " : "";
-      w.Write($"public {abstractness}class {javaName}{TypeParameters(typeParameters)}");
-      string sep;
-      // Since Java does not support multiple inheritance, we are assuming a list of "superclasses" is a list of interfaces
-      if (superClasses != null) {
-        sep = " implements ";
-        foreach (var trait in superClasses) {
-          if (!trait.IsObject) {
-            w.Write($"{sep}{TypeName(trait, w, tok)}");
-            sep = ", ";
-          }
-        }
-      }
-      var wBody = w.NewBlock("");
-      var wTypeFields = wBody.Fork();
-
-      wBody.Write($"public {javaName}(");
-      var wCtorParams = wBody.Fork();
-      var wCtorBody = wBody.NewBlock(")", "");
-
-      EmitTypeDescriptorsForClass(typeParameters, cls, wTypeFields, wCtorParams, null, wCtorBody);
-
-      // make sure the (static fields associated with the) type method come after the Witness static field
-      var wTypeMethod = wBody;
-      var wRestOfBody = wBody.Fork();
-      if (cls is DefaultClassDecl or (ClassLikeDecl and not ArrayClassDecl)) {
-        // don't emit a type-descriptor method
-      } else {
-        EmitTypeDescriptorMethod(cls, typeParameters, null, null, wTypeMethod);
-      }
-
-      if (fullPrintName != null) {
-        // By emitting a toString() method, printing an object will give the same output as with other target languages.
-        EmitToString(fullPrintName, wBody);
-      }
-
-      return new ClassWriter(this, wRestOfBody, wCtorBody);
-    }
-
-    /// <summary>
-    /// For each type parameter X in "typeParametersForClass" that needs a type descriptor,
-    ///   * Write "protected TypeDescriptor<X> _td_X;" to wTypeFields
-    ///     -- each entry is terminated by a newline
-    ///   * Write "TypeDescriptor<X> _td_X" to wCtorParams
-    ///     -- entries are separated by a comma
-    ///   * Write "_td_X" to wCallArguments
-    ///     -- entries are separated by a comma
-    ///   * Write "this._td_X := _td_X;" to wCtorBody
-    ///     -- each entry is terminated by a newline
-    /// Any of the writer parameters may be null, so long as at least one is non-null.
-    /// The method returns the number type descriptors written.
-    /// </summary>
-    int EmitTypeDescriptorsForClass(List<TypeParameter> typeParametersForClass, TopLevelDecl cls,
-      [CanBeNull] ConcreteSyntaxTree wTypeFields, [CanBeNull] ConcreteSyntaxTree wCtorParams,
-      [CanBeNull] ConcreteSyntaxTree wCallArguments, [CanBeNull] ConcreteSyntaxTree wCtorBody,
-      string namePrefix = null) {
-
-      namePrefix ??= "";
-
-      var wError = wTypeFields ?? wCtorParams ?? wCallArguments ?? wCtorBody;
-      int numberOfEmittedTypeDescriptors = 0;
-      if (typeParametersForClass != null) {
-        var sep = "";
-        foreach (var ta in TypeArgumentInstantiation.ListFromFormals(typeParametersForClass)) {
-          if (NeedsTypeDescriptor(ta.Formal)) {
-            var fieldName = FormatTypeDescriptorVariable(ta.Formal.GetCompileName(Options));
-            var paramName = TypeDescriptor(ta.Actual, wError, ta.Formal.tok);
-            var decl = $"{DafnyTypeDescriptor}<{namePrefix}{BoxedTypeName(ta.Actual, wError, ta.Formal.tok)}> {fieldName}";
-
-            wTypeFields?.WriteLine($"protected {decl};");
-            if (ta.Formal.Parent == cls) {
-              wCtorParams?.Write($"{sep}{decl}");
-            }
-            wCtorBody?.WriteLine($"this.{fieldName} = {paramName};");
-            wCallArguments?.Write($"{sep}{paramName}");
-
-            sep = ", ";
-            numberOfEmittedTypeDescriptors++;
-          }
-        }
-      }
-      return numberOfEmittedTypeDescriptors;
-    }
-
-    private void EmitToString(string fullPrintName, ConcreteSyntaxTree wr) {
-      wr.WriteLine("@Override");
-      wr.NewBlock("public java.lang.String toString()")
-        .WriteLine($"return \"{fullPrintName}\";");
-    }
-
-    /// <summary>
-    /// Generate the "_typeDescriptor" method for a generated class.
-    /// "enclosingType" is allowed to be "null", in which case the target values are assumed to be references.
-    /// If "enclosingType" is null, then "targetTypeName" is expected to be the name of the Java type representing the type.
-    /// If "enclosingType" is non-null, then "targetTypeName" is expected to be null.
-    /// </summary>
-    private void EmitTypeDescriptorMethod([CanBeNull] TopLevelDecl enclosingTypeDecl, List<TypeParameter> typeParams, string targetTypeName,
-      [CanBeNull] string initializer, ConcreteSyntaxTree wr) {
-      Contract.Requires((enclosingTypeDecl != null) != (targetTypeName != null));
-
-      string typeDescriptorExpr;
-      if (enclosingTypeDecl == null) {
-        Contract.Assert(targetTypeName != null);
-        // use reference type
-        typeDescriptorExpr = $"{DafnyTypeDescriptor}.referenceWithInitializer({StripTypeParameters(targetTypeName)}.class, () -> {initializer ?? "null"})";
-      } else {
-        Contract.Assert(targetTypeName == null);
-        var enclosingTypeWithItsOwnTypeArguments = UserDefinedType.FromTopLevelDecl(enclosingTypeDecl.tok, enclosingTypeDecl);
-        var targetType = DatatypeWrapperEraser.SimplifyType(Options, enclosingTypeWithItsOwnTypeArguments, true);
-        var targetTypeIgnoringConstraints = DatatypeWrapperEraser.SimplifyType(Options, enclosingTypeWithItsOwnTypeArguments, false);
-        targetTypeName = BoxedTypeName(targetTypeIgnoringConstraints, wr, enclosingTypeDecl.tok);
-        var w = (enclosingTypeDecl as RedirectingTypeDecl)?.Witness != null ? "Witness" : null;
-        switch (AsJavaNativeType(targetType)) {
-          case JavaNativeType.Byte:
-            typeDescriptorExpr = $"{DafnyTypeDescriptor}.byteWithDefault({w ?? "(byte)0"})";
-            break;
-          case JavaNativeType.Short:
-            typeDescriptorExpr = $"{DafnyTypeDescriptor}.shortWithDefault({w ?? "(short)0"})";
-            break;
-          case JavaNativeType.Int:
-            typeDescriptorExpr = $"{DafnyTypeDescriptor}.intWithDefault({w ?? "0"})";
-            break;
-          case JavaNativeType.Long:
-            typeDescriptorExpr = $"{DafnyTypeDescriptor}.longWithDefault({w ?? "0L"})";
-            break;
-          case null:
-            if (targetType.IsBoolType) {
-              typeDescriptorExpr = $"{DafnyTypeDescriptor}.booleanWithDefault({w ?? "false"})";
-            } else if (targetType.IsCharType) {
-              if (UnicodeCharEnabled) {
-                typeDescriptorExpr = $"{DafnyTypeDescriptor}.unicodeCharWithDefault((int){w ?? CharType.DefaultValueAsString})";
-              } else {
-                typeDescriptorExpr = $"{DafnyTypeDescriptor}.charWithDefault({w ?? CharType.DefaultValueAsString})";
-              }
-            } else {
-              var d = initializer ?? DefaultValue(targetType, wr, enclosingTypeDecl.tok, true);
-              // We'd like to say, essentially, targetTypeName.class. But this is not legal Java if targetTypeName is a type parameter.
-              // So, we detect that case here and use the corresponding type descriptor instead (because method
-              // referenceWithInitializerAndTypeDescriptor will use the .boxedClass of that type descriptor, which gives the Class<T> object
-              // we're looking for).
-              var tp = targetTypeIgnoringConstraints.AsTypeParameter;
-              if (tp == null) {
-                typeDescriptorExpr = $"{DafnyTypeDescriptor}.<{targetTypeName}>referenceWithInitializer({StripTypeParameters(targetTypeName)}.class, () -> {d})";
-              } else {
-                var td = FormatTypeDescriptorVariable(tp.GetCompileName(Options));
-                typeDescriptorExpr = $"{DafnyTypeDescriptor}.<{targetTypeName}>referenceWithInitializerAndTypeDescriptor({td}, () -> {d})";
-              }
-            }
-            break;
-          default:
-            Contract.Assert(false); // unexpected case
-            throw new cce.UnreachableException();
-        }
-      }
-
-      if (typeParams.Count == 0) {
-        // a static context in Java does not see the enclosing type parameters
-        wr.WriteLine($"private static final {DafnyTypeDescriptor}<{targetTypeName}> _TYPE = {typeDescriptorExpr};");
-        typeDescriptorExpr = "_TYPE";
-      }
-      wr.Write($"public static {TypeParameters(typeParams, " ")}{DafnyTypeDescriptor}<{targetTypeName}> {TypeMethodName}(");
-      EmitTypeDescriptorsForClass(typeParams, enclosingTypeDecl, null, wr, null, null);
-      var wTypeMethodBody = wr.NewBlock(")", "");
-      var typeDescriptorCast = $"({DafnyTypeDescriptor}<{targetTypeName}>) ({DafnyTypeDescriptor}<?>)";
-      wTypeMethodBody.WriteLine($"return {typeDescriptorCast} {typeDescriptorExpr};");
-    }
-
-    private string CastIfSmallNativeType(Type t) {
-      var nt = AsNativeType(t);
-      return nt == null ? "" : CastIfSmallNativeType(nt);
-    }
-
-    private string CastIfSmallNativeType(NativeType nt) {
-      switch (AsJavaNativeType(nt)) {
-        case JavaNativeType.Byte: return "(byte) ";
-        case JavaNativeType.Short: return "(short) ";
-        default: return "";
-      }
-    }
-
-    private static string TranslateEscapes(string s) {
-      s = Util.ReplaceNullEscapesWithCharacterEscapes(s);
-
-      s = Util.UnicodeEscapesToUtf16Escapes(s);
-
-      // Java \u escapes are translated before parsing, so we need to convert to escapes
-      // that aren't for characters that will mess up paring the string or character literal.
-      s = Util.ReplaceTokensWithEscapes(s, Util.Utf16Escape, match => {
-        return match.Value switch {
-          "\\u000a" => "\\n",
-          "\\u000d" => "\\r",
-          "\\u0022" => "\\\"",
-          "\\u0027" => "\\\'",
-          "\\u005c" => "\\\\",
-          _ => match.Value
-        };
-      });
-
-      return s;
-    }
-
-    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
-      if (e is StaticReceiverExpr) {
-        wr.Write(TypeName(e.Type, wr, e.tok));
-      } else if (e.Value == null) {
-        wr.Write($"({TypeName(e.Type, wr, e.tok)}) null");
-      } else if (e.Value is bool value) {
-        wr.Write(value ? "true" : "false");
-      } else if (e is CharLiteralExpr) {
-        var v = (string)e.Value;
-        if (UnicodeCharEnabled && Util.MightContainNonAsciiCharacters(v, false)) {
-          wr.Write($"{Util.UnescapedCharacters(Options, v, false).Single()}");
-        } else {
-          wr.Write($"'{TranslateEscapes(v)}'");
-        }
-      } else if (e is StringLiteralExpr str) {
-        wr.Write(UnicodeCharEnabled ? $"{DafnySeqClass}.asUnicodeString(" : $"{DafnySeqClass}.asString(");
-        TrStringLiteral(str, wr);
-        wr.Write(")");
-      } else if (AsNativeType(e.Type) is NativeType nt) {
-        EmitNativeIntegerLiteral((BigInteger)e.Value, nt, wr);
-      } else if (e.Value is BigInteger i) {
-        if (i.IsZero) {
-          wr.Write("java.math.BigInteger.ZERO");
-        } else if (i.IsOne) {
-          wr.Write("java.math.BigInteger.ONE");
-        } else if (long.MinValue <= i && i <= long.MaxValue) {
-          wr.Write($"java.math.BigInteger.valueOf({i}L)");
-        } else {
-          wr.Write($"new java.math.BigInteger(\"{i}\")");
-        }
-      } else if (e.Value is BaseTypes.BigDec n) {
-        if (0 <= n.Exponent) {
-          wr.Write($"new {DafnyBigRationalClass}(new java.math.BigInteger(\"{n.Mantissa}");
-          for (int j = 0; j < n.Exponent; j++) {
-            wr.Write("0");
-          }
-          wr.Write("\"), java.math.BigInteger.ONE)");
-        } else {
-          wr.Write($"new {DafnyBigRationalClass}(");
-          wr.Write($"new java.math.BigInteger(\"{n.Mantissa}\")");
-          wr.Write(", new java.math.BigInteger(\"1");
-          for (int j = n.Exponent; j < 0; j++) {
-            wr.Write("0");
-          }
-          wr.Write("\"))");
-        }
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
-      }
-    }
-
-    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
-      if (!isVerbatim) {
-        wr.Write($"\"{TranslateEscapes(str)}\"");
-      } else {
-        //TODO: This is taken from Go and JS since Java doesn't have raw string literals, modify and make better if possible.
-        var n = str.Length;
-        wr.Write("\"");
-        for (var i = 0; i < n; i++) {
-          if (str[i] == '\"' && i + 1 < n && str[i + 1] == '\"') {
-            wr.Write("\\\"");
-            i++;
-          } else if (str[i] == '\\') {
-            wr.Write("\\\\");
-          } else if (str[i] == '\n') {
-            wr.Write("\\n");
-          } else if (str[i] == '\r') {
-            wr.Write("\\r");
-          } else {
-            wr.Write(str[i]);
-          }
-        }
-        wr.Write("\"");
-      }
-    }
-
-    void EmitNativeIntegerLiteral(BigInteger value, NativeType nt, ConcreteSyntaxTree wr) {
-      GetNativeInfo(nt.Sel, out var name, out var literalSuffix, out _);
-      var intValue = value;
-      if (intValue > long.MaxValue) {
-        // The value must be a 64-bit unsigned integer, since it has a native
-        // type and unsigned long is the biggest native type
-        Contract.Assert(intValue <= ulong.MaxValue);
-
-        // Represent the value as a signed 64-bit integer
-        intValue -= ulong.MaxValue + BigInteger.One;
-      } else if (nt.Sel == NativeType.Selection.UInt && intValue > int.MaxValue) {
-        // Represent the value as a signed 32-bit integer
-        intValue -= uint.MaxValue + BigInteger.One;
-      }
-      wr.Write($"{CastIfSmallNativeType(nt)}{intValue}{literalSuffix}");
-    }
-
-    protected string GetNativeDefault(NativeType nt) {
-      switch (AsJavaNativeType(nt)) {
-        case JavaNativeType.Byte: return "(byte) 0";
-        case JavaNativeType.Short: return "(short) 0";
-        case JavaNativeType.Int: return "0";
-        case JavaNativeType.Long: return "0L";
-        default:
-          Contract.Assert(false);  // unexpected native type
-          throw new cce.UnreachableException();  // to please the compiler
-      }
-    }
-
-    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix,
-      out bool needsCastAfterArithmetic) {
-      literalSuffix = "";
-      needsCastAfterArithmetic = false;
-      switch (AsJavaNativeType(sel)) {
-        case JavaNativeType.Byte: name = "byte"; needsCastAfterArithmetic = true; break;
-        case JavaNativeType.Short: name = "short"; needsCastAfterArithmetic = true; break;
-        case JavaNativeType.Int: name = "int"; break;
-        case JavaNativeType.Long: name = "long"; literalSuffix = "L"; break;
-        default:
-          Contract.Assert(false);  // unexpected native type
-          throw new cce.UnreachableException();  // to please the compiler
-      }
-    }
-
-    private string GetNativeTypeName(NativeType nt, bool boxed = false) {
-      return boxed ? GetBoxedNativeTypeName(nt) : base.GetNativeTypeName(nt);
-    }
-
-    private string GetBoxedNativeTypeName(NativeType nt) {
-      switch (AsJavaNativeType(nt)) {
-        case JavaNativeType.Byte: return "java.lang.Byte";
-        case JavaNativeType.Short: return "java.lang.Short";
-        case JavaNativeType.Int: return "java.lang.Integer";
-        case JavaNativeType.Long: return "java.lang.Long";
-        default:
-          Contract.Assert(false);  // unexpected native type
-          throw new cce.UnreachableException();  // to please the compiler
-      }
-    }
-
-    // Note the (semantically iffy) distinction between a *primitive type*,
-    // being one of the eight Java primitive types, and a NativeType, which can
-    // only be one of the integer types.
-    // Note also that in --unicode-char mode, we have our own CodePoint boxing type
-    // that boxes int values that are actually Dafny char values.
-    private bool IsJavaPrimitiveType(Type type) {
-      return type.IsBoolType || type.IsCharType || AsNativeType(type) != null;
-    }
-
-    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
-      var custom =
-        (enclosingMethod != null && (enclosingMethod.IsTailRecursive || NeedsCustomReceiver(enclosingMethod))) ||
-        (enclosingFunction != null && (enclosingFunction.IsTailRecursive || NeedsCustomReceiver(enclosingFunction))) ||
-        (thisContext is NewtypeDecl && !callToInheritedMember) ||
-        thisContext is TraitDecl;
-      wr.Write(custom ? "_this" : "this");
-    }
-
-    protected override void DeclareLocalVar(string name, Type /*?*/ type, IToken /*?*/ tok, bool leaveRoomForRhs,
-      string /*?*/ rhs, ConcreteSyntaxTree wr) {
-      // Note that type can be null to represent the native object type.
-      // See comment on NativeObjectType.
-      if (type is { AsArrayType: { } }) {
-        arrays.Add(type.AsArrayType.Dims);
-      }
-      if (type is { IsDatatype: true, AsDatatype: TupleTypeDecl tupleDecl }) {
-        tuples.Add(tupleDecl.NonGhostDims);
-      }
-      if (type is { IsTypeParameter: true }) {
-        EmitSuppression(wr);
-      }
-      wr.Write("{0} {1}", type != null ? TypeName(type, wr, tok) : "Object", name);
-      if (leaveRoomForRhs) {
-        Contract.Assert(rhs == null); // follows from precondition
-      } else if (rhs != null) {
-        wr.WriteLine($" = {rhs};");
-      } else if (type is { IsIntegerType: true }) {
-        wr.WriteLine(" = java.math.BigInteger.ZERO;");
-      } else {
-        wr.WriteLine(";");
-      }
-    }
-
-    protected override void DeclareLocalVar(string name, Type /*?*/ type, IToken /*?*/ tok, bool leaveRoomForRhs,
-      string /*?*/ rhs, ConcreteSyntaxTree wr, Type t) {
-      DeclareLocalVar(name, t, tok, leaveRoomForRhs, rhs, wr);
-    }
-
-    protected override void EmitCollectionDisplay(CollectionType ct, IToken tok, List<Expression> elements,
-        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (elements.Count == 0) {
-        wr.Write($"{CollectionTypeUnparameterizedName(ct)}.<{BoxedTypeName(ct.Arg, wr, tok)}> empty(");
-        if (ct is SeqType) {
-          wr.Write(TypeDescriptor(ct.Arg, wr, tok));
-        }
-        wr.Write(")");
-        return;
-      }
-      wr.Write($"{CollectionTypeUnparameterizedName(ct)}.of(");
-      string sep = "";
-      if (ct is SeqType && (!IsJavaPrimitiveType(ct.Arg) || (UnicodeCharEnabled && ct.Arg.IsCharType))) {
-        wr.Write(TypeDescriptor(ct.Arg, wr, tok));
-        sep = ", ";
-      }
-
-      if (elements.Count != 0) {
-        wr.Write(sep);
-      }
-      TrExprList(elements, wr, inLetExprBody, wStmts, typeAt: _ => NativeObjectType, parens: false);
-
-      wr.Write(")");
-    }
-
-    protected override void EmitMapDisplay(MapType mt, IToken tok, List<ExpressionPair> elements, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write($"{DafnyMapClass}.fromElements");
-      wr.Write("(");
-      string sep = "";
-      foreach (ExpressionPair p in elements) {
-        wr.Write(sep);
-        wr.Write($"new {DafnyTupleClass(2)}(");
-        wr.Append(Expr(p.A, inLetExprBody, wStmts));
-        wr.Write(", ");
-        wr.Append(Expr(p.B, inLetExprBody, wStmts));
-        wr.Write(")");
-        sep = ", ";
-      }
-      wr.Write(")");
-    }
-
-    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString) {
-      compiledName = "";
-      preString = "";
-      postString = "";
-      switch (id) {
-        case SpecialField.ID.UseIdParam:
-          compiledName = IdProtect((string)idParam);
-          break;
-        case SpecialField.ID.ArrayLength:
-        case SpecialField.ID.ArrayLengthInt:
-          if (idParam == null) {
-            // Works on both fixed array types like array<int> (=> BigInteger[])
-            // or generic array types like array<A> (=> Object) and (unlike most
-            // of java.lang.reflect.Array) is fast
-            preString = "java.lang.reflect.Array.getLength(";
-            postString = ")";
-          } else {
-            compiledName = "dim" + (int)idParam;
-          }
-          if (id == SpecialField.ID.ArrayLength) {
-            preString = "java.math.BigInteger.valueOf(" + preString;
-            postString = postString + ")";
-          }
-          break;
-        case SpecialField.ID.Floor:
-          compiledName = "ToBigInteger()";
-          break;
-        case SpecialField.ID.IsLimit:
-          preString = "dafny.BigOrdinal.IsLimit(";
-          postString = ")";
-          break;
-        case SpecialField.ID.IsSucc:
-          preString = "dafny.BigOrdinal.IsSucc(";
-          postString = ")";
-          break;
-        case SpecialField.ID.Offset:
-          preString = "dafny.BigOrdinal.Offset(";
-          postString = ")";
-          break;
-        case SpecialField.ID.IsNat:
-          preString = "dafny.BigOrdinal.IsNat(";
-          postString = ")";
-          break;
-        case SpecialField.ID.Keys:
-          compiledName = "keySet()";
-          break;
-        case SpecialField.ID.Values:
-          compiledName = "valueSet()";
-          break;
-        case SpecialField.ID.Items:
-          var mapType = receiverType.AsMapType;
-          Contract.Assert(mapType != null);
-          var errorWr = new ConcreteSyntaxTree();
-          compiledName = $"<{BoxedTypeName(mapType.Domain, errorWr, Token.NoToken)}, {BoxedTypeName(mapType.Range, errorWr, Token.NoToken)}>entrySet()";
-          break;
-        case SpecialField.ID.Reads:
-          compiledName = "_reads";
-          break;
-        case SpecialField.ID.Modifies:
-          compiledName = "_modifies";
-          break;
-        case SpecialField.ID.New:
-          compiledName = "_new";
-          break;
-        default:
-          Contract.Assert(false); // unexpected ID
-          break;
-      }
-    }
-
-    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
-      Type expectedType, string/*?*/ additionalCustomParameter, bool internalAccess = false) {
-      var memberStatus = DatatypeWrapperEraser.GetMemberStatus(Options, member);
-      if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.Identity) {
-        return SimpleLvalue(obj);
-      } else if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue) {
-        return SimpleLvalue(w => w.Write("true"));
-      } else if (member is SpecialField sf && !(member is ConstantField)) {
-        GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out _, out _);
-        if (compiledName.Length != 0) {
-          if (member.EnclosingClass is DatatypeDecl) {
-            if (member.EnclosingClass is TupleTypeDecl && sf.Type.Subst(typeMap).IsCharType && UnicodeCharEnabled) {
-              return SuffixLvalue(obj, $".{compiledName}().value()");
-            } else {
-              return SuffixLvalue(obj, $".{compiledName}()");
-            }
-          } else {
-            return SuffixLvalue(obj, $".{compiledName}");
-          }
-        } else {
-          // Assume it's already handled by the caller
-          return SimpleLvalue(obj);
-        }
-      } else if (member is Function fn) {
-        var wr = new ConcreteSyntaxTree();
-        EmitNameAndActualTypeArgs(IdName(member), TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, member, false)), member.tok, wr);
-        var needsEtaConversion = typeArgs.Any()
-               || additionalCustomParameter != null
-               || (UnicodeCharEnabled &&
-                  (fn.ResultType.IsCharType || fn.Formals.Any(f => f.Type.IsCharType)));
-        if (!needsEtaConversion) {
-          var nameAndTypeArgs = wr.ToString();
-          return SuffixLvalue(obj, $"::{nameAndTypeArgs}");
-        } else {
-          // We need an eta conversion to adjust for the difference in arity or coerce inputs/outputs.
-          // (T0 a0, T1 a1, ...) -> obj.F(rtd0, rtd1, ..., additionalCustomParameter, a0, a1, ...)
-          wr.Write("(");
-          var sep = "";
-          EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), fn.tok, wr, ref sep);
-          if (additionalCustomParameter != null) {
-            wr.Write("{0}{1}", sep, additionalCustomParameter);
-            sep = ", ";
-          }
-          var prefixWr = new ConcreteSyntaxTree();
-          var prefixSep = "";
-          prefixWr.Write("(");
-          foreach (var arg in fn.Formals) {
-            if (!arg.IsGhost) {
-              var name = idGenerator.FreshId("_eta");
-              var ty = arg.Type.Subst(typeMap);
-              prefixWr.Write($"{prefixSep}{BoxedTypeName(ty, prefixWr, arg.tok)} {name}");
-              wr.Write(sep);
-              var coercedWr = EmitCoercionIfNecessary(NativeObjectType, ty, arg.tok, wr);
-              coercedWr.Write(name);
-              sep = ", ";
-              prefixSep = ", ";
-            }
-          }
-          prefixWr.Write(") -> ");
-          wr.Write(")");
-
-          if (fn.ResultType.IsCharType && UnicodeCharEnabled) {
-            prefixWr.Write("dafny.CodePoint.valueOf(");
-            wr.Write(")");
-          }
-
-          return EnclosedLvalue(prefixWr.ToString(), obj, $".{wr}");
-        }
-      } else {
-        var field = (Field)member;
-        ILvalue lvalue;
-        if (member.IsStatic) {
-          lvalue = SimpleLvalue(w => {
-            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.tok, member), IdName(member));
-            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.tok, w);
-            w.Write(")");
-          });
-        } else if (NeedsCustomReceiver(member) && !(member.EnclosingClass is TraitDecl)) {
-          // instance const in a newtype
-          Contract.Assert(typeArgs.Count == 0);
-          lvalue = SimpleLvalue(w => {
-            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.tok, member), IdName(member));
-            obj(w);
-            w.Write(")");
-          });
-        } else if (internalAccess && (member is ConstantField || member.EnclosingClass is TraitDecl)) {
-          lvalue = SuffixLvalue(obj, $"._{member.GetCompileName(Options)}");
-        } else if (internalAccess) {
-          lvalue = SuffixLvalue(obj, $".{IdName(member)}");
-        } else if (member is ConstantField) {
-          lvalue = SimpleLvalue(w => {
-            obj(w);
-            w.Write(".{0}(", IdName(member));
-            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.tok, w);
-            w.Write(")");
-          });
-        } else if (member.EnclosingClass is TraitDecl) {
-          lvalue = GetterSetterLvalue(obj, IdName(member), $"set_{IdName(member)}");
-        } else {
-          lvalue = SuffixLvalue(obj, $".{IdName(member)}");
-        }
-        return CoercedLvalue(lvalue, field.Type, expectedType);
-      }
-    }
-
-    protected override void EmitConstructorCheck(string source, DatatypeCtor ctor, ConcreteSyntaxTree wr) {
-      wr.Write($"{source}.is_{ctor.GetCompileName(Options)}()");
-    }
-
-    protected override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member) {
-      type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
-      if (type is UserDefinedType udt) {
-        var name = udt.ResolvedClass is TraitDecl ? udt.GetFullCompanionCompileName(Options) : FullTypeName(udt, member, true);
-        return TypeName_UDT(name, udt, wr, tok, true);
-      } else {
-        return TypeName(type, wr, tok, member);
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<string> indices, Type elmtType, ConcreteSyntaxTree wr) {
-      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
-      var w = EmitArraySelect(indices.Count, out var wIndices, elmtType, wr);
-      for (int i = 0; i < indices.Count; i++) {
-        if (!int.TryParse(indices[i], out _)) {
-          wIndices[i].Write($"{DafnyHelpersClass}.toInt({indices[i]})");
-        } else {
-          wIndices[i].Write(indices[i]);
-        }
-      }
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
-      var w = EmitArraySelect(indices.Count, out var wIndices, elmtType, wr);
-
-      for (int i = 0; i < indices.Count; i++) {
-        TrParenExprAsInt(indices[i], wIndices[i], inLetExprBody, wStmts);
-      }
-
-      return w;
-    }
-
-    private ConcreteSyntaxTree EmitArraySelect(int dimCount, out List<ConcreteSyntaxTree> wIndices, Type elmtType, ConcreteSyntaxTree wr) {
-      elmtType = DatatypeWrapperEraser.SimplifyType(Options, elmtType);
-      wIndices = new List<ConcreteSyntaxTree>();
-      ConcreteSyntaxTree w;
-      if (dimCount == 1) {
-        if (elmtType.IsTypeParameter) {
-          wr.Write($"{FormatTypeDescriptorVariable(elmtType.AsTypeParameter)}.getArrayElement(");
-          w = wr.Fork();
-          wr.Write(", ");
-          wIndices.Add(wr.Fork());
-          wr.Write(")");
-        } else {
-          w = wr.Fork();
-          wr.Write("[");
-          wIndices.Add(wr.Fork());
-          wr.Write("]");
-        }
-      } else {
-        if (elmtType.IsTypeParameter) {
-          w = wr.Fork();
-          wr.Write(".get(");
-          for (int i = 0; i < dimCount; i++) {
-            if (i > 0) {
-              wr.Write(", ");
-            }
-            wIndices.Add(wr.Fork());
-          }
-          wr.Write(")");
-        } else {
-          wr.Write($"(({TypeName(elmtType, wr, Token.NoToken)}{Repeat("[]", dimCount)}) ((");
-          w = wr.Fork();
-          wr.Write(").elmts))");
-          for (int i = 0; i < dimCount; i++) {
-            wr.Write("[");
-            wIndices.Add(wr.Fork());
-            wr.Write("]");
-          }
-        }
-      }
-      return w;
-    }
-
-    protected override (ConcreteSyntaxTree/*array*/, ConcreteSyntaxTree/*rhs*/) EmitArrayUpdate(List<string> indices, Type elementType, ConcreteSyntaxTree wr) {
-      elementType = DatatypeWrapperEraser.SimplifyType(Options, elementType);
-      ConcreteSyntaxTree wArray, wRhs;
-      if (indices.Count == 1) {
-        if (elementType.IsTypeParameter) {
-          wr.Write($"{FormatTypeDescriptorVariable(elementType.AsTypeParameter)}.setArrayElement(");
-          wArray = wr.Fork();
-          wr.Write($", {DafnyHelpersClass}.toInt({indices[0]}), ");
-          wRhs = wr.Fork();
-          wr.Write(")");
-        } else {
-          wArray = wr.Fork();
-          wr.Write($"[{DafnyHelpersClass}.toInt({indices[0]})] = ");
-          wRhs = wr.Fork();
-        }
-      } else {
-        if (elementType.IsTypeParameter) {
-          wArray = wr.Fork();
-          wr.Write($".set({indices.Comma(ix => $"{DafnyHelpersClass}.toInt({ix})")}, ");
-          wRhs = wr.Fork();
-          wr.Write(")");
-        } else {
-          wr.Write($"(({TypeName(elementType, wr, Token.NoToken)}{Repeat("[]", indices.Count)}) (");
-          wArray = wr.Fork();
-          wr.Write($").elmts){Util.Comma("", indices, ix => $"[{DafnyHelpersClass}.toInt({ix})]")} = ");
-          wRhs = wr.Fork();
-        }
-      }
-      return (wArray, wRhs);
-    }
-
-    protected override void EmitSeqSelectRange(Expression source, Expression lo, Expression hi, bool fromArray,
-        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (fromArray) {
-        wr.Write($"{DafnySeqClass}.fromRawArrayRange({TypeDescriptor(source.Type.NormalizeExpand().TypeArgs[0], wr, source.tok)}, ");
-      }
-      TrParenExpr(source, wr, inLetExprBody, wStmts);
-      if (fromArray) {
-        wr.Write(", ");
-        if (lo != null) {
-          TrExprAsInt(lo, wr, inLetExprBody, wStmts);
-        } else {
-          wr.Write("0");
-        }
-        wr.Write(", ");
-        if (hi != null) {
-          TrExprAsInt(hi, wr, inLetExprBody, wStmts);
-        } else {
-          wr.Write("java.lang.reflect.Array.getLength");
-          TrParenExpr(source, wr, inLetExprBody, wStmts);
-        }
-        wr.Write(")");
-      } else {
-        if (lo != null && hi != null) {
-          wr.Write(".subsequence(");
-          TrExprAsInt(lo, wr, inLetExprBody, wStmts);
-          wr.Write(", ");
-          TrExprAsInt(hi, wr, inLetExprBody, wStmts);
-          wr.Write(")");
-        } else if (lo != null) {
-          wr.Write(".drop");
-          TrParenExpr(lo, wr, inLetExprBody, wStmts);
-        } else if (hi != null) {
-          wr.Write(".take");
-          TrParenExpr(hi, wr, inLetExprBody, wStmts);
-        }
-      }
-    }
-
-    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      // Taken from C# compiler, assuming source is a DafnySequence type.
-      if (source.Type.AsMultiSetType != null) {
-        wr = EmitCoercionIfNecessary(from: NativeObjectType, to: Type.Int, tok: source.tok, wr: wr);
-        wr.Write($"{DafnyMultiSetClass}.<{BoxedTypeName(source.Type.AsMultiSetType.Arg, wr, Token.NoToken)}>multiplicity(");
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-        wr.Write(", ");
-        wr.Append(Expr(index, inLetExprBody, wStmts));
-        wr.Write(")");
-      } else if (source.Type.AsMapType != null) {
-        wr = EmitCoercionIfNecessary(from: NativeObjectType, to: source.Type.AsMapType.Range, tok: source.tok, wr: wr);
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-        TrParenExpr(".get", index, wr, inLetExprBody, wStmts);
-      } else {
-        wr = EmitCoercionIfNecessary(from: NativeObjectType, to: source.Type.AsCollectionType.Arg, tok: source.tok, wr: wr);
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-        wr.Write(".select");
-        TrParenExprAsInt(index, wr, inLetExprBody, wStmts);
-      }
-    }
-
-    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-        ConcreteSyntaxTree wStmts) {
-      TrParenExpr(expr.E, wr, inLetExprBody, wStmts);
-      wr.Write(".asDafnyMultiset()");
-    }
-
-    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
-        CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (source.Type.AsSeqType != null) {
-        wr.Write($"{DafnySeqClass}.<{BoxedTypeName(resultCollectionType.Arg, wr, Token.NoToken)}>update(");
-        wr.Append(Expr(source, inLetExprBody, wStmts));
-        wr.Write(", ");
-        TrExprAsInt(index, wr, inLetExprBody, wStmts);
-      } else if (source.Type.AsMapType != null) {
-        var mapType = (MapType)resultCollectionType;
-        wr.Write($"{DafnyMapClass}.<{BoxedTypeName(mapType.Domain, wr, Token.NoToken)}, {BoxedTypeName(mapType.Range, wr, Token.NoToken)}>update(");
-        wr.Append(Expr(source, inLetExprBody, wStmts));
-        wr.Write(", ");
-        wr.Append(Expr(index, inLetExprBody, wStmts));
-      } else {
-        Contract.Assert(source.Type.AsMultiSetType != null);
-        wr.Write($"{DafnyMultiSetClass}.<{BoxedTypeName(resultCollectionType.Arg, wr, Token.NoToken)}>update(");
-        wr.Append(Expr(source, inLetExprBody, wStmts));
-        wr.Write(", ");
-        wr.Append(Expr(index, inLetExprBody, wStmts));
-      }
-      wr.Write(", ");
-      wr.Append(CoercedExpr(value, NativeObjectType, inLetExprBody, wStmts));
-      wr.Write(")");
-    }
-
-    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
-      bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      string nativeName = null, literalSuffix = null;
-      bool needsCast = false;
-      var nativeType = AsNativeType(e0.Type);
-      if (nativeType != null) {
-        GetNativeInfo(nativeType.Sel, out nativeName, out literalSuffix, out needsCast);
-      }
-      var leftShift = nativeType == null ? ".shiftLeft" : "<<";
-      var rightShift = nativeType == null ? ".shiftRight" : ">>>";
-      // ( e0 op1 e1) | (e0 op2 (width - e1))
-      if (needsCast) {
-        wr.Write("(" + nativeName + ")(" + CastIfSmallNativeType(e0.Type) + "(");
-      }
-      wr.Write("(");
-      EmitShift(e0, e1, isRotateLeft ? leftShift : rightShift, isRotateLeft, nativeType, true, wr, inLetExprBody, wStmts, tr);
-      wr.Write(")");
-      if (nativeType == null) {
-        wr.Write(".or");
-      } else {
-        wr.Write("|");
-      }
-      wr.Write("(");
-      EmitShift(e0, e1, isRotateLeft ? rightShift : leftShift, !isRotateLeft, nativeType, false, wr, inLetExprBody, wStmts, tr);
-      wr.Write(")))");
-      if (needsCast) {
-        wr.Write("))");
-      }
-    }
-
-    void EmitShift(Expression e0, Expression e1, string op, bool truncate, NativeType nativeType /*?*/, bool firstOp,
-        ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      var bv = e0.Type.AsBitVectorType;
-      if (truncate) {
-        wr = EmitBitvectorTruncation(bv, true, wr);
-      }
-      tr(e0, wr, inLetExprBody, wStmts);
-      wr.Write($" {op} ");
-      if (!firstOp) {
-        wr.Write($"({bv.Width} - ");
-      }
-      wr.Write("((");
-      tr(e1, wr, inLetExprBody, wStmts);
-      wr.Write(")");
-      if (AsNativeType(e1.Type) == null) {
-        wr.Write(".intValue()");
-      }
-      if (!firstOp) {
-        wr.Write(")");
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, bool surroundByUnchecked, ConcreteSyntaxTree wr) {
-      string nativeName = null, literalSuffix = null;
-      bool needsCastAfterArithmetic = false;
-      if (bvType.NativeType != null) {
-        GetNativeInfo(bvType.NativeType.Sel, out nativeName, out literalSuffix, out needsCastAfterArithmetic);
-      }
-      // --- Before
-      if (bvType.NativeType == null) {
-        wr.Write("((");
-      } else {
-        wr.Write($"({nativeName}) {CastIfSmallNativeType(bvType)}((");
-      }
-      // --- Middle
-      var middle = wr.Fork();
-      // --- After
-      // do the truncation, if needed
-      if (bvType.NativeType == null) {
-        wr.Write($").and((java.math.BigInteger.ONE.shiftLeft({bvType.Width})).subtract(java.math.BigInteger.ONE)))");
-      } else {
-        if (bvType.NativeType.Bitwidth != bvType.Width) {
-          // print in hex, because that looks nice
-          wr.Write($") & {CastIfSmallNativeType(bvType)}0x{(1UL << bvType.Width) - 1:X}{literalSuffix})");
-        } else {
-          wr.Write("))");  // close the parentheses for the cast
-        }
-      }
-      return middle;
-    }
-
-    protected override bool CompareZeroUsingSign(Type type) {
-      // Everything is boxed, so everything benefits from avoiding explicit 0
-      return true;
-    }
-
-    protected override ConcreteSyntaxTree EmitSign(Type type, ConcreteSyntaxTree wr) {
-      ConcreteSyntaxTree w;
-      var nt = AsNativeType(type);
-      if (nt == null) {
-        w = wr.Fork();
-        wr.Write(".signum()");
-      } else if (nt.LowerBound >= 0) {
-        wr.Write("(");
-        w = wr.Fork();
-        wr.Write(" == 0 ? 0 : 1)");
-      } else {
-        wr.Write($"{HelperClass(nt)}.signum(");
-        w = wr.Fork();
-        wr.Write(")");
-      }
-      return w;
-    }
-
-    protected override IClassWriter/*?*/ DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
-      var w = CompileDatatypeBase(dt, wr);
-      CompileDatatypeConstructors(dt, wr);
-      return w;
-    }
-
-    IClassWriter CompileDatatypeBase(DatatypeDecl dt, ConcreteSyntaxTree wr) {
-      var DtT_TypeArgs = TypeParameters(dt.TypeArgs);
-      var justTypeArgs = dt.TypeArgs.Count == 0 ? "" : " " + DtT_TypeArgs;
-      var DtT_protected = IdName(dt) + DtT_TypeArgs;
-      var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, UserDefinedType.FromTopLevelDecl(dt.tok, dt));
-      var simplifiedTypeName = TypeName(simplifiedType, wr, dt.tok);
-
-      var filename = $"{ModulePath}/{IdName(dt)}.java";
-      wr = wr.NewFile(filename);
-      FileCount += 1;
-      wr.WriteLine($"// Class {DtT_protected}");
-      wr.WriteLine($"// Dafny class {DtT_protected} compiled into Java");
-      wr.WriteLine($"package {ModuleName};");
-      wr.WriteLine();
-      EmitImports(wr, out _);
-      wr.WriteLine();
-      //TODO: Figure out how to resolve type checking warnings
-      // from here on, write everything into the new block created here:
-      EmitSuppression(wr);
-      wr.Write("public{0} class {1}", dt.IsRecordType ? "" : " abstract", DtT_protected);
-      var superTraits = dt.ParentTypeInformation.UniqueParentTraits();
-      if (superTraits.Any()) {
-        wr.Write($" implements {superTraits.Comma(trait => TypeName(trait, wr, dt.tok))}");
-      }
-      var btw = wr.NewBlock();
-      wr = btw;
-
-      // constructor
-      if (dt.IsRecordType) {
-        DatatypeFieldsAndConstructor(dt.Ctors[0], 0, wr);
-      } else {
-        var wTypeFields = wr.Fork();
-        var wCtorParams = new ConcreteSyntaxTree();
-        var wCtorBody = wr.Format($"public {IdName(dt)}({wCtorParams})").NewBlock();
-        EmitTypeDescriptorsForClass(dt.TypeArgs, dt, wTypeFields, wCtorParams, null, wCtorBody);
-      }
-
-      var wDefaultTypeArguments = new ConcreteSyntaxTree();
-      var defaultMethodTypeDescriptorCount = 0;
-      var usedTypeArgs = UsedTypeParameters(dt);
-      ConcreteSyntaxTree wDefault;
-      wr.WriteLine();
-      if (dt.TypeArgs.Count == 0) {
-        wr.Write($"private static final {simplifiedTypeName} theDefault = ");
-        wDefault = wr.Fork();
-        wr.WriteLine(";");
-        var w = wr.NewBlock($"public static {simplifiedTypeName} Default()");
-        w.WriteLine("return theDefault;");
-      } else {
-        wr.Write($"public static{justTypeArgs} {simplifiedTypeName} Default(");
-        defaultMethodTypeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, null, wr, wDefaultTypeArguments, null);
-        var typeParameters = usedTypeArgs.Comma(tp => $"{tp.GetCompileName(Options)} {FormatDefaultTypeParameterValue(tp)}");
-        var sep = defaultMethodTypeDescriptorCount != 0 && typeParameters.Length != 0 ? ", " : "";
-        wr.Write($"{sep}{typeParameters}");
-        var w = wr.NewBlock(")");
-        w.Write("return ");
-        wDefault = w.Fork();
-        w.WriteLine(";");
-      }
-      var groundingCtor = dt.GetGroundingCtor();
-      if (groundingCtor.IsGhost) {
-        wDefault.Write(ForcePlaceboValue(simplifiedType, wDefault, dt.tok));
-      } else if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
-        wDefault.Write(DefaultValue(innerType, wDefault, dt.tok));
-      } else {
-        var nonGhostFormals = groundingCtor.Formals.Where(f => !f.IsGhost).ToList();
-        var args = nonGhostFormals.Comma(f => DefaultValue(f.Type, wDefault, f.tok));
-        EmitDatatypeValue(dt, groundingCtor,
-          dt.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(dt.tok, tp)),
-          dt is CoDatatypeDecl, $"{wDefaultTypeArguments}", args, wDefault);
-      }
-
-      EmitTypeDescriptorMethod(dt, dt.TypeArgs, null, null, wr);
-
-      // create methods
-      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-        var wCtorParams = new ConcreteSyntaxTree();
-        var wCallArguments = new ConcreteSyntaxTree();
-        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, null, wCtorParams, wCallArguments, null);
-        wr.Write($"public static{justTypeArgs} {DtT_protected} {DtCreateName(ctor)}(");
-        wr.Append(wCtorParams);
-        var formalCount = WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wr);
-        var sep = typeDescriptorCount > 0 && formalCount > 0 ? ", " : "";
-        wr.NewBlock(")")
-          .WriteLine($"return new {DtCtorDeclarationName(ctor, dt.TypeArgs)}({wCallArguments}{sep}{ctor.Formals.Where(f => !f.IsGhost).Comma(FormalName)});");
-      }
-
-      if (dt.IsRecordType) {
-        // Also emit a "create_<ctor_name>" method that thunks to "create",
-        // to provide a more uniform interface.
-
-        var ctor = dt.Ctors[0];
-        var wCtorParams = new ConcreteSyntaxTree();
-        var wCallArguments = new ConcreteSyntaxTree();
-        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, null, wCtorParams, wCallArguments, null);
-        wr.Write($"public static{justTypeArgs} {DtT_protected} create_{ctor.GetCompileName(Options)}(");
-        wr.Append(wCtorParams);
-        var formalCount = WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wr);
-        var sep = typeDescriptorCount > 0 && formalCount > 0 ? ", " : "";
-        wr.NewBlock(")")
-          .WriteLine($"return create({wCallArguments}{sep}{ctor.Formals.Where(f => !f.IsGhost).Comma(FormalName)});");
-      }
-
-      // query properties
-      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-        if (dt.IsRecordType) {
-          wr.WriteLine($"public boolean is_{ctor.GetCompileName(Options)}() {{ return true; }}");
-        } else {
-          wr.WriteLine($"public boolean is_{ctor.GetCompileName(Options)}() {{ return this instanceof {dt.GetCompileName(Options)}_{ctor.GetCompileName(Options)}; }}");
-        }
-      }
-      if (dt is CoDatatypeDecl) {
-        wr.WriteLine($"public abstract {DtT_protected} Get();");
-      }
-      if (dt.HasFinitePossibleValues) {
-        Contract.Assert(dt.TypeArgs.Count == 0);
-        var w = wr.NewNamedBlock($"public static java.util.ArrayList<{DtT_protected}> AllSingletonConstructors()");
-        string arraylist = "singleton_iterator";
-        w.WriteLine($"java.util.ArrayList<{DtT_protected}> {arraylist} = new java.util.ArrayList<>();");
-        foreach (var ctor in dt.Ctors) {
-          Contract.Assert(ctor.Formals.Count == 0);
-          if (ctor.IsGhost) {
-            w.WriteLine("{0}.add({1});", arraylist, ForcePlaceboValue(UserDefinedType.FromTopLevelDecl(dt.tok, dt), w, dt.tok));
-          } else {
-            w.WriteLine("{0}.add(new {1}{2}());", arraylist, DtT_protected, dt.IsRecordType ? "" : $"_{ctor.GetCompileName(Options)}");
-          }
-        }
-        w.WriteLine($"return {arraylist};");
-      }
-      // destructors
-      foreach (var ctor in dt.Ctors) {
-        foreach (var dtor in ctor.Destructors.Where(dtor => dtor.EnclosingCtors[0] == ctor)) {
-          var compiledConstructorCount = dtor.EnclosingCtors.Count(constructor => !constructor.IsGhost);
-          if (compiledConstructorCount != 0) {
-            var arg = dtor.CorrespondingFormals[0];
-            if (!arg.IsGhost && arg.HasName) {
-              var wDtor = wr.NewNamedBlock($"public {TypeName(arg.Type, wr, arg.tok)} dtor_{arg.CompileName}()");
-              if (dt.IsRecordType) {
-                wDtor.WriteLine($"return this.{FieldName(arg, 0)};");
-              } else {
-                wDtor.WriteLine("{0} d = this{1};", DtT_protected, dt is CoDatatypeDecl ? ".Get()" : "");
-                var compiledConstructorsProcessed = 0;
-                for (var i = 0; i < dtor.EnclosingCtors.Count; i++) {
-                  var ctor_i = dtor.EnclosingCtors[i];
-                  Contract.Assert(arg.CompileName == dtor.CorrespondingFormals[i].CompileName);
-                  if (ctor_i.IsGhost) {
-                    continue;
-                  }
-                  if (compiledConstructorsProcessed < compiledConstructorCount - 1) {
-                    wDtor.WriteLine("if (d instanceof {0}_{1}) {{ return (({0}_{1}{2})d).{3}; }}", dt.GetCompileName(Options),
-                      ctor_i.GetCompileName(Options), DtT_TypeArgs, FieldName(arg, i));
-                  } else {
-                    wDtor.WriteLine($"return (({dt.GetCompileName(Options)}_{ctor_i.GetCompileName(Options)}{DtT_TypeArgs})d).{FieldName(arg, 0)};");
-                  }
-                  compiledConstructorsProcessed++;
-                }
-              }
-            }
-          }
-        }
-      }
-
-      // FIXME: This is dodgy.  We can set the constructor body writer to null
-      // only because we don't expect to use it, which is only because we don't
-      // expect there to be fields.
-      return new ClassWriter(this, btw, ctorBodyWriter: null);
-    }
-
-    void CompileDatatypeConstructors(DatatypeDecl dt, ConcreteSyntaxTree wrx) {
-      Contract.Requires(dt != null);
-      string typeParams = TypeParameters(dt.TypeArgs);
-      if (dt.IsRecordType) {
-        // There is only one constructor, and it is populated by CompileDatatypeBase
-        return;
-      }
-      int constructorIndex = 0; // used to give each constructor a different name
-      foreach (DatatypeCtor ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-        var filename = $"{ModulePath}/{DtCtorDeclarationName(ctor)}.java";
-        var wr = wrx.NewFile(filename);
-        FileCount += 1;
-        wr.WriteLine($"// Class {DtCtorDeclarationName(ctor, dt.TypeArgs)}");
-        wr.WriteLine($"// Dafny class {DtCtorDeclarationName(ctor, dt.TypeArgs)} compiled into Java");
-        wr.WriteLine($"package {ModuleName};");
-        wr.WriteLine();
-        EmitImports(wr, out _);
-        wr.WriteLine();
-        EmitSuppression(wr);
-        var w = wr.NewNamedBlock($"public class {DtCtorDeclarationName(ctor, dt.TypeArgs)} extends {IdName(dt)}{typeParams}");
-        DatatypeFieldsAndConstructor(ctor, constructorIndex, w);
-        constructorIndex++;
-      }
-      if (dt is CoDatatypeDecl) {
-        var filename = $"{ModulePath}/{dt.GetCompileName(Options)}__Lazy.java";
-        var wr = wrx.NewFile(filename);
-        FileCount += 1;
-        wr.WriteLine($"// Class {dt.GetCompileName(Options)}__Lazy");
-        wr.WriteLine($"// Dafny class {dt.GetCompileName(Options)}__Lazy compiled into Java");
-        wr.WriteLine($"package {ModuleName};");
-        wr.WriteLine();
-        EmitImports(wr, out _);
-        wr.WriteLine();
-        EmitSuppression(wr); //TODO: Fix implementations so they do not need this suppression
-        var w = wr.NewNamedBlock($"public class {dt.GetCompileName(Options)}__Lazy{typeParams} extends {IdName(dt)}{typeParams}");
-        w.WriteLine($"public interface Computer {{ {dt.GetCompileName(Options)} run(); }}");
-        w.WriteLine("Computer c;");
-        w.WriteLine($"{dt.GetCompileName(Options)}{typeParams} d;");
-
-        var wCtorParams = new ConcreteSyntaxTree();
-        var wBaseCallArguments = new ConcreteSyntaxTree();
-        var typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, null, wCtorParams, wBaseCallArguments, null);
-        var sep = typeDescriptorCount > 0 ? ", " : "";
-        var wCtorBody = w.NewBlock($"public {dt.GetCompileName(Options)}__Lazy({wCtorParams}{sep}Computer c)");
-        wCtorBody.WriteLine($"super({wBaseCallArguments});");
-        wCtorBody.WriteLine("this.c = c;");
-        w.WriteLine($"public {dt.GetCompileName(Options)}{typeParams} Get() {{ if (c != null) {{ d = c.run(); c = null; }} return d; }}");
-        w.WriteLine("public String toString() { return Get().toString(); }");
-      }
-    }
-
-    void DatatypeFieldsAndConstructor(DatatypeCtor ctor, int constructorIndex, ConcreteSyntaxTree wr) {
-      Contract.Requires(ctor != null);
-      Contract.Requires(0 <= constructorIndex && constructorIndex < ctor.EnclosingDatatype.Ctors.Count);
-      Contract.Requires(wr != null);
-      var dt = ctor.EnclosingDatatype;
-      var i = 0;
-      foreach (Formal arg in ctor.Formals) {
-        if (!arg.IsGhost) {
-          wr.WriteLine($"public {TypeName(arg.Type, wr, arg.tok)} {FieldName(arg, i)};");
-          i++;
-        }
-      }
-
-      var wTypeFields = wr.Fork();
-      var wCtorParams = new ConcreteSyntaxTree();
-      var wCtorBody = wr.Format($"public {DtCtorDeclarationName(ctor)} ({wCtorParams})").NewBlock();
-      int typeDescriptorCount;
-      if (ctor.EnclosingDatatype.IsRecordType) {
-        typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, wTypeFields, wCtorParams, null, wCtorBody);
-      } else {
-        var wBaseCallArguments = wCtorBody.Write("super").ForkInParens();
-        wCtorBody.WriteLine(";");
-        typeDescriptorCount = EmitTypeDescriptorsForClass(dt.TypeArgs, dt, null, wCtorParams, wBaseCallArguments, null);
-      }
-      WriteFormals(typeDescriptorCount > 0 ? ", " : "", ctor.Formals, wCtorParams);
-      {
-        var w = wCtorBody;
-        i = 0;
-        foreach (Formal arg in ctor.Formals) {
-          if (!arg.IsGhost) {
-            w.WriteLine($"this.{FieldName(arg, i)} = {FormalName(arg, i)};");
-            i++;
-          }
-        }
-      }
-      if (dt is CoDatatypeDecl) {
-        string typeParams = TypeParameters(dt.TypeArgs);
-        wr.WriteLine($"public {dt.GetCompileName(Options)}{typeParams} Get() {{ return this; }}");
-      }
-      // Equals method
-      wr.WriteLine();
-      wr.WriteLine("@Override");
-      {
-        var w = wr.NewBlock("public boolean equals(Object other)");
-        w.WriteLine("if (this == other) return true;");
-        w.WriteLine("if (other == null) return false;");
-        w.WriteLine("if (getClass() != other.getClass()) return false;");
-        string typeParams = TypeParameters(dt.TypeArgs);
-        w.WriteLine("{0} o = ({0})other;", DtCtorDeclarationName(ctor, dt.TypeArgs));
-        w.Write("return true");
-        i = 0;
-        foreach (var arg in ctor.Formals) {
-          if (!arg.IsGhost) {
-            var nm = FieldName(arg, i);
-            w.Write(" && ");
-            if (IsDirectlyComparable(DatatypeWrapperEraser.SimplifyType(Options, arg.Type))) {
-              w.Write($"this.{nm} == o.{nm}");
-            } else {
-              w.Write($"java.util.Objects.equals(this.{nm}, o.{nm})");
-            }
-            i++;
-          }
-        }
-        w.WriteLine(";");
-      }
-      // GetHashCode method (Uses the djb2 algorithm)
-      wr.WriteLine("@Override");
-      {
-        var w = wr.NewBlock("public int hashCode()");
-        w.WriteLine("long hash = 5381;");
-        w.WriteLine($"hash = ((hash << 5) + hash) + {constructorIndex};");
-        i = 0;
-        foreach (Formal arg in ctor.Formals) {
-          if (!arg.IsGhost) {
-            string nm = FieldName(arg, i);
-            w.Write("hash = ((hash << 5) + hash) + ");
-            if (IsJavaPrimitiveType(arg.Type)) {
-              w.WriteLine($"{BoxedTypeName(arg.Type, w, Token.NoToken)}.hashCode(this.{nm});");
-            } else {
-              w.WriteLine($"java.util.Objects.hashCode(this.{nm});");
-            }
-            i++;
-          }
-        }
-        w.WriteLine("return (int)hash;");
-      }
-
-      wr.WriteLine();
-      wr.WriteLine("@Override");
-      {
-        var w = wr.NewBlock("public String toString()");
-        string nm;
-        if (dt is TupleTypeDecl) {
-          nm = "";
-        } else {
-          nm = (dt.EnclosingModuleDefinition.IsDefaultModule ? "" : dt.EnclosingModuleDefinition.Name + ".") + dt.Name + "." + ctor.Name;
-        }
-        if (dt is TupleTypeDecl && ctor.Formals.Count == 0) {
-          // here we want parentheses and no name
-          w.WriteLine("return \"()\";");
-        } else if (dt is CoDatatypeDecl) {
-          w.WriteLine($"return \"{nm}\";");
-        } else {
-          var tempVar = GenVarName("s", ctor.Formals);
-          w.WriteLine($"StringBuilder {tempVar} = new StringBuilder();");
-          w.WriteLine($"{tempVar}.append(\"{nm}\");");
-          if (ctor.Formals.Count != 0) {
-            w.WriteLine($"{tempVar}.append(\"(\");");
-            i = 0;
-            foreach (var arg in ctor.Formals) {
-              if (!arg.IsGhost) {
-                if (i != 0) {
-                  w.WriteLine($"{tempVar}.append(\", \");");
-                }
-                w.Write($"{tempVar}.append(");
-                var memberName = FieldName(arg, i);
-                if (UnicodeCharEnabled && arg.Type.IsCharType) {
-                  w.Write($"{DafnyHelpersClass}.ToCharLiteral(this.{memberName})");
-                } else if (UnicodeCharEnabled && arg.Type.IsStringType) {
-                  w.Write($"{DafnyHelpersClass}.ToStringLiteral(this.{memberName})");
-                } else if (IsJavaPrimitiveType(arg.Type)) {
-                  w.Write($"this.{memberName}");
-                } else {
-                  w.Write($"{DafnyHelpersClass}.toString(this.{memberName})");
-                }
-                w.WriteLine(");");
-                i++;
-              }
-            }
-            w.WriteLine($"{tempVar}.append(\")\");");
-          }
-          w.WriteLine($"return {tempVar}.toString();");
-        }
-      }
-    }
-
-    string DtCtorDeclarationName(DatatypeCtor ctor, List<TypeParameter>/*?*/ typeParams) {
-      Contract.Requires(ctor != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      return DtCtorDeclarationName(ctor) + TypeParameters(typeParams);
-    }
-    string DtCtorDeclarationName(DatatypeCtor ctor) {
-      Contract.Requires(ctor != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      var dt = ctor.EnclosingDatatype;
-      return dt.IsRecordType ? IdName(dt) : dt.GetCompileName(Options) + "_" + ctor.GetCompileName(Options);
-    }
-    string DtCtorName(DatatypeCtor ctor, List<Type> typeArgs, ConcreteSyntaxTree wr) {
-      Contract.Requires(ctor != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      var s = DtCtorName(ctor);
-      if (typeArgs != null && typeArgs.Count != 0) {
-        s += "<" + BoxedTypeNames(typeArgs, wr, ctor.tok) + ">";
-      }
-      return s;
-    }
-    string DtCtorName(DatatypeCtor ctor) {
-      Contract.Requires(ctor != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      var dt = ctor.EnclosingDatatype;
-      if (dt is TupleTypeDecl tupleDecl) {
-        return DafnyTupleClass(tupleDecl.NonGhostDims);
-      }
-      var dtName = IdProtect(dt.GetFullCompileName(Options));
-      return dt.IsRecordType ? dtName : dtName + "_" + ctor.GetCompileName(Options);
-    }
-    string DtCreateName(DatatypeCtor ctor) {
-      Contract.Assert(!ctor.IsGhost); // there should never be an occasion to ask for a ghost constructor
-      if (ctor.EnclosingDatatype.IsRecordType) {
-        return "create";
-      }
-      return "create_" + ctor.GetCompileName(Options);
-    }
-
-    private string FieldName(Formal formal, int i) {
-      Contract.Requires(formal != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      return IdProtect("_" + (formal.HasName ? formal.CompileName : "a" + i));
-    }
-
-    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
-      var wStmts = wr.Fork();
-      wr.Write("System.out.print(");
-      EmitToString(wr, arg, wStmts);
-      wr.WriteLine(");");
-    }
-
-    protected void EmitToString(ConcreteSyntaxTree wr, Expression arg, ConcreteSyntaxTree wStmts) {
-      if (arg.Type.IsArrowType) {
-        var expr = arg.Resolved;
-        if (expr is IdentifierExpr id) {
-          wr.Write(IdName(id.Var) + " == null ? null : \"Function\"");
-        } else {
-          wr.Write("\"Function\"");
-        }
-      } else {
-        var argumentWriter = EmitToString(wr, arg.Type);
-        argumentWriter.Append(Expr(arg, false, wStmts));
-      }
-    }
-
-    private ConcreteSyntaxTree EmitToString(ConcreteSyntaxTree wr, Type type) {
-      Contract.Requires(!type.IsArrayType);
-      ConcreteSyntaxTree argumentWriter;
-      type = DatatypeWrapperEraser.SimplifyType(Options, type, true);
-      if (AsNativeType(type) != null && AsNativeType(type).LowerBound >= 0) {
-        var nativeName = GetNativeTypeName(AsNativeType(type));
-        switch (AsNativeType(type).Sel) {
-          case NativeType.Selection.Byte:
-            wr.Write("java.lang.Integer.toUnsignedString(java.lang.Byte.toUnsignedInt(");
-            argumentWriter = wr.Fork();
-            wr.Write("))");
-            break;
-          case NativeType.Selection.UShort:
-            wr.Write("java.lang.Integer.toUnsignedString(java.lang.Short.toUnsignedInt(");
-            argumentWriter = wr.Fork();
-            wr.Write("))");
-            break;
-          case NativeType.Selection.UInt:
-            wr.Write("java.lang.Integer.toUnsignedString(");
-            argumentWriter = wr.Fork();
-            wr.Write(")");
-            break;
-          case NativeType.Selection.ULong:
-            wr.Write("java.lang.Long.toUnsignedString(");
-            argumentWriter = wr.Fork();
-            wr.Write(")");
-            break;
-          default:
-            // Should be an unsigned type by assumption
-            Contract.Assert(false);
-            throw new cce.UnreachableException();
-        }
-      } else {
-        bool isGeneric = type.AsSeqType is { Arg: { IsTypeParameter: true } };
-        if (type.IsStringType) {
-          argumentWriter = wr.ForkInParens();
-          wr.Write(".verbatimString()");
-        } else if (type.IsCharType && UnicodeCharEnabled) {
-          wr.Write($"{DafnyHelpersClass}.ToCharLiteral(");
-          argumentWriter = wr.Fork();
-          wr.Write(")");
-        } else if (isGeneric && !UnicodeCharEnabled) {
-          wr.Write($"((java.util.function.Function<{DafnySeqClass}<?>,String>)(_s -> (_s.elementType().defaultValue().getClass() == java.lang.Character.class ? _s.verbatimString() : String.valueOf(_s)))).apply(");
-          argumentWriter = wr.Fork();
-          wr.Write(")");
-        } else {
-          wr.Write("java.lang.String.valueOf(");
-          argumentWriter = wr.Fork();
-          wr.Write(")");
-        }
-      }
-      return argumentWriter;
-    }
-
-    protected override string IdProtect(string name) {
-      return PublicIdProtectAux(name);
-    }
-
-    public override string PublicIdProtect(string name) {
-      return PublicIdProtectAux(name);
-    }
-
-    private static string PublicIdProtectAux(string name) {
-      name = name.Replace("_module", "_System");
-      if (name == "" || name.First() == '_') {
-        return name; // no need to further protect this name
-      }
-
-      // TODO: Finish with all the public IDs that need to be protected
-      switch (name) {
-        // keywords Java 8 and before
-        // https://docs.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
-        case "abstract":
-        case "assert":
-        case "break":
-        case "byte":
-        case "case":
-        case "catch":
-        case "char":
-        case "class":
-        case "continue":
-        case "default":
-        case "do":
-        case "double":
-        case "else":
-        case "enum":
-        case "extends":
-        case "final":
-        case "finally":
-        case "float":
-        case "for":
-        case "if":
-        case "implements":
-        case "import":
-        case "instanceof":
-        case "int":
-        case "interface":
-        case "long":
-        case "native":
-        case "new":
-        case "package":
-        case "private":
-        case "public":
-        case "return":
-        case "short":
-        case "static":
-        case "strictfp":
-        case "super":
-        case "switch":
-        case "synchronized":
-        case "this":
-        case "throw":
-        case "throws":
-        case "transient":
-        case "try":
-        case "void":
-        case "volatile":
-        case "while":
-        // keywords since Java 9
-        case "exports":
-        case "module":
-        case "requires":
-        // no longer used in Java but still reserved as keywords
-        case "const":
-        case "goto":
-        // special identifiers since Java 10
-        case "var":
-        // literal values
-        case "false":
-        case "null":
-        case "true":
-        case "toString":
-        case "equals":
-        case "hashCode":
-          return name + "_"; // TODO: figure out what to do here (C# uses @, Go uses _, JS uses _$$_)
-        default:
-          return name; // Package name is not a keyword, so it can be used
-      }
-    }
-
-    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
-      outParams = outParams.Where(f => !f.IsGhost).ToList();
-      if (outParams.Count == 0) {
-        wr.WriteLine("return;");
-      } else if (outParams.Count == 1) {
-        wr.WriteLine($"return {IdName(outParams[0])};");
-      } else {
-        tuples.Add(outParams.Count);
-        wr.WriteLine($"return new {DafnyTupleClass(outParams.Count)}<>({Util.Comma(outParams, IdName)});");
-      }
-    }
-
-    // TODO: See if more types need to be added
-    bool IsDirectlyComparable(Type t) {
-      Contract.Requires(t != null);
-      return t.IsBoolType || t.IsCharType || t.IsRefType || AsJavaNativeType(t) != null;
-    }
-
-    protected override void EmitActualTypeArgs(List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr) {
-      if (typeArgs.Count != 0) {
-        wr.Write("<" + BoxedTypeNames(typeArgs, wr, tok) + ">");
-      }
-    }
-
-    protected override void EmitNameAndActualTypeArgs(string protectedName, List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr) {
-      EmitActualTypeArgs(typeArgs, tok, wr);
-      wr.Write(protectedName);
-    }
-
-    protected override void EmitNew(Type type, IToken tok, CallStmt initCall, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var ctor = (Constructor)initCall?.Method; // correctness of cast follows from precondition of "EmitNew"
-      wr.Write($"new {TypeName(type, wr, tok)}(");
-      var sep = "";
-      if (type is UserDefinedType definedType) {
-        var typeArguments = TypeArgumentInstantiation.ListFromClass(definedType.ResolvedClass, definedType.TypeArgs);
-        EmitTypeDescriptorsActuals(typeArguments, tok, wr, ref sep);
-      }
-      wr.Write(ConstructorArguments(initCall, wStmts, ctor, sep));
-      wr.Write(")");
-    }
-
-    /// <summary>
-    /// Returns whether or not there is a run-time type descriptor corresponding to "tp".
-    ///
-    /// Note, one might think that this method should return "tp.Characteristics.HasCompiledValue".
-    /// However, currently, all built-in collection types in Java use type descriptors for their arguments.
-    /// To get this threaded through everywhere, all type arguments must always be passed with a
-    /// corresponding type descriptor. :(  Thus, this method returns "true".
-    /// </summary>
-    protected override bool NeedsTypeDescriptor(TypeParameter tp) {
-      return tp.Parent is not TupleTypeDecl;
-    }
-
-    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
-      if (cl is DatatypeDecl dt) {
-        needsTypeParameter = isStatic || DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _);
-        needsTypeDescriptor = true;
-      } else if (cl is TraitDecl) {
-        needsTypeParameter = isStatic || lookasideBody;
-        needsTypeDescriptor = isStatic || lookasideBody;
-      } else {
-        Contract.Assert(cl is ClassDecl);
-        needsTypeParameter = isStatic;
-        needsTypeDescriptor = isStatic;
-      }
-    }
-
-    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      type = DatatypeWrapperEraser.SimplifyType(Options, type, true);
-      if (type is BoolType) {
-        return $"{DafnyTypeDescriptor}.BOOLEAN";
-      } else if (type is CharType) {
-        return UnicodeCharEnabled ? $"{DafnyTypeDescriptor}.UNICODE_CHAR" : $"{DafnyTypeDescriptor}.CHAR";
-      } else if (type is IntType or BigOrdinalType) {
-        return $"{DafnyTypeDescriptor}.BIG_INTEGER";
-      } else if (type is RealType) {
-        return $"{DafnyTypeDescriptor}.BIG_RATIONAL";
-      } else if (type is BitvectorType) {
-        var t = (BitvectorType)type;
-        if (t.NativeType != null) {
-          return GetNativeTypeDescriptor(AsNativeType(type));
-        } else {
-          return $"{DafnyTypeDescriptor}.BIG_INTEGER";
-        }
-      } else if (type is SetType setType) {
-        return AddTypeDescriptorArgs(DafnySetClass, setType.TypeArgs, setType.TypeArgs, wr, tok);
-      } else if (type is SeqType seqType) {
-        return AddTypeDescriptorArgs(DafnySeqClass, seqType.TypeArgs, seqType.TypeArgs, wr, tok);
-      } else if (type is MultiSetType multiSetType) {
-        return AddTypeDescriptorArgs(DafnyMultiSetClass, multiSetType.TypeArgs, multiSetType.TypeArgs, wr, tok);
-      } else if (type is MapType mapType) {
-        return AddTypeDescriptorArgs(DafnyMapClass, mapType.TypeArgs, mapType.TypeArgs, wr, tok);
-      } else if (type.IsArrayType) {
-        ArrayClassDecl at = type.AsArrayType;
-        var elType = UserDefinedType.ArrayElementType(type);
-        var elTypeName = TypeName(elType, wr, tok, true);
-        if (at.Dims > 1) {
-          arrays.Add(at.Dims);
-          return $"{DafnyMultiArrayClass(at.Dims)}.<{elTypeName}>{TypeMethodName}()";
-        } else if (elType.IsBoolType) {
-          return $"{DafnyTypeDescriptor}.BOOLEAN_ARRAY";
-        } else if (elType.IsCharType) {
-          return $"{DafnyTypeDescriptor}.CHAR_ARRAY";
-        } else if (AsNativeType(elType) != null) {
-          switch (AsJavaNativeType(elType)) {
-            case JavaNativeType.Byte: return $"{DafnyTypeDescriptor}.BYTE_ARRAY";
-            case JavaNativeType.Short: return $"{DafnyTypeDescriptor}.SHORT_ARRAY";
-            case JavaNativeType.Int: return $"{DafnyTypeDescriptor}.INT_ARRAY";
-            case JavaNativeType.Long: return $"{DafnyTypeDescriptor}.LONG_ARRAY";
-            default:
-              Contract.Assert(false);
-              throw new cce.UnreachableException();
-          }
-        } else {
-          return $"(({DafnyTypeDescriptor}<{BoxedTypeName(type, wr, tok)}>)({TypeDescriptor(elType, wr, tok)}).arrayType())";
-        }
-      } else if (type.IsObjectQ || type.IsObject) {
-        return $"{DafnyTypeDescriptor}.OBJECT";
-      } else if (type.IsRefType || type.IsTraitType) {
-        var typeName = TypeName(type, wr, tok);
-        var typeNameSansTypeParameters = StripTypeParameters(typeName);
-        return $"(({DafnyTypeDescriptor}<{typeName}>)" +
-               "(java.lang.Object)" +
-               $"{DafnyTypeDescriptor}.reference({typeNameSansTypeParameters}.class))";
-      } else if (type.IsTypeParameter) {
-        var tp = type.AsTypeParameter;
-        Contract.Assert(tp != null);
-        if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(tp, out var instantiatedTypeParameter)) {
-          return TypeDescriptor(instantiatedTypeParameter, wr, tok);
-        }
-        return FormatTypeDescriptorVariable(type.AsTypeParameter.GetCompileName(Options));
-      } else if (type.IsBuiltinArrowType && type.AsArrowType.Arity == 1) {
-        // Can't go the usual route because java.util.function.Function doesn't have a _typeDescriptor() method
-        var arrowType = type.AsArrowType;
-        return $"{DafnyTypeDescriptor}.function({TypeDescriptor(arrowType.Args[0], wr, tok)}, {TypeDescriptor(arrowType.Result, wr, tok)})";
-      } else if (type is UserDefinedType udt) {
-        var s = FullTypeName(udt, null, true);
-        var cl = udt.ResolvedClass;
-        Contract.Assert(cl != null);
-
-        if (cl.IsExtern(Options, out _, out _)) {
-          var td = $"{DafnyTypeDescriptor}.<{BoxedTypeName(type, wr, tok)}> findType({s}.class";
-          if (udt.TypeArgs != null && udt.TypeArgs.Count > 0) {
-            td += $", {Util.Comma(udt.TypeArgs, arg => TypeDescriptor(arg, wr, tok))}";
-          }
-          return td + ")";
-        }
-
-        List<Type> relevantTypeArgs;
-        if (type.IsBuiltinArrowType) {
-          relevantTypeArgs = type.TypeArgs;
-        } else if (cl is DatatypeDecl dt) {
-          relevantTypeArgs = udt.TypeArgs;
-        } else {
-          relevantTypeArgs = new List<Type>();
-          for (int i = 0; i < cl.TypeArgs.Count; i++) {
-            if (NeedsTypeDescriptor(cl.TypeArgs[i])) {
-              relevantTypeArgs.Add(udt.TypeArgs[i]);
-            }
-          }
-        }
-
-        return AddTypeDescriptorArgs(s, udt.TypeArgs, relevantTypeArgs, wr, udt.tok);
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();
-      }
-    }
-
-    private string GetNativeTypeDescriptor(NativeType nt) {
-      switch (AsJavaNativeType(nt)) {
-        case JavaNativeType.Byte: return $"{DafnyTypeDescriptor}.BYTE";
-        case JavaNativeType.Short: return $"{DafnyTypeDescriptor}.SHORT";
-        case JavaNativeType.Int: return $"{DafnyTypeDescriptor}.INT";
-        case JavaNativeType.Long: return $"{DafnyTypeDescriptor}.LONG";
-        default: Contract.Assert(false); throw new cce.UnreachableException();
-      }
-    }
-
-    private string AddTypeDescriptorArgs(string fullCompileName, List<Type> typeArgs, List<Type> relevantTypeArgs, ConcreteSyntaxTree wr, IToken tok) {
-      Contract.Requires(fullCompileName != null);
-      Contract.Requires(typeArgs != null);
-      Contract.Requires(relevantTypeArgs != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(tok != null);
-
-      string s = $"{IdProtect(fullCompileName)}.";
-      if (typeArgs != null && typeArgs.Count != 0) {
-        s += $"<{BoxedTypeNames(typeArgs, wr, tok)}>";
-      }
-      s += $"{TypeMethodName}(";
-      s += Util.Comma(relevantTypeArgs, arg => TypeDescriptor(arg, wr, tok));
-      return s + ")";
-    }
-
-    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
-      wr.WriteLine($"java.util.ArrayList<{BoxedTypeName(e.Type.AsSetType.Arg, wr, e.tok)}> {collectionName} = new java.util.ArrayList<>();");
-    }
-
-    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
-      var mt = e.Type.AsMapType;
-      var domType = mt.Domain;
-      var ranType = mt.Range;
-      wr.WriteLine($"java.util.HashMap<{BoxedTypeName(domType, wr, e.tok)}, {BoxedTypeName(ranType, wr, e.tok)}> {collectionName} = new java.util.HashMap<>();");
-    }
-
-    protected override void OrganizeModules(Program program, out List<ModuleDefinition> modules) {
-      modules = new List<ModuleDefinition>();
-      foreach (var m in program.CompileModules) {
-        if (!m.IsDefaultModule && !m.Name.Equals("_System")) {
-          modules.Add(m);
-        }
-      }
-      foreach (var m in program.CompileModules) {
-        if (m.Name.Equals("_System")) {
-          modules.Add(m);
-        }
-      }
-      foreach (var m in program.CompileModules) {
-        if (m.IsDefaultModule) {
-          modules.Add(m);
-        }
-      }
-    }
-
-    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
-      var dt = dtv.Ctor.EnclosingDatatype;
-      var typeArgs = SelectNonGhost(dt, dtv.InferredTypeArgs);
-      EmitDatatypeValue(dt, dtv.Ctor, typeArgs, dtv.IsCoCall, typeDescriptorArguments, arguments, wr);
-    }
-
-    void EmitDatatypeValue(DatatypeDecl dt, DatatypeCtor ctor, List<Type> typeArgs, bool isCoCall,
-      string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
-      var dtName = dt is TupleTypeDecl tupleDecl ? DafnyTupleClass(tupleDecl.NonGhostDims) : dt.GetFullCompileName(Options);
-      var typeParams = typeArgs.Count == 0 ? "" : $"<{BoxedTypeNames(typeArgs, wr, dt.tok)}>";
-      var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
-      if (!isCoCall) {
-        // For an ordinary constructor (that is, one that does not guard any co-recursive calls), generate:
-        //   Dt.<T>create_Cons( args )
-        wr.Write($"{dtName}.{typeParams}{DtCreateName(ctor)}({typeDescriptorArguments}{sep}{arguments})");
-      } else {
-        var sep0 = typeDescriptorArguments.Length != 0 ? ", " : "";
-        wr.Write($"new {dt.GetCompileName(Options)}__Lazy({typeDescriptorArguments}{sep0}");
-        wr.Write("() -> { return ");
-        wr.Write($"new {DtCtorName(ctor)}{typeParams}({typeDescriptorArguments}{sep}{arguments})");
-        wr.Write("; })");
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IToken tok, List<string> inNames,
-        Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
-      // TODO: there may be an opportunity to share code with CreateIIFE,
-      // which may be worth it given all the necessary coercions.
-
-      if (inTypes.Count != 1) {
-        functions.Add(inTypes.Count);
-      }
-      wr.Write('(');
-      if (!untyped) {
-        wr.Write("({0}<{1}{2}>)", DafnyFunctionIface(inTypes.Count), Util.Comma("", inTypes, t => BoxedTypeName(t, wr, tok) + ", "), BoxedTypeName(resultType, wr, tok));
-      }
-      var boxedInNames = inNames.Select(inName => ProtectedFreshId(inName + "_boxed")).ToList();
-      wr.Write($"({boxedInNames.Comma(nm => nm)}) ->");
-      var w = wr.NewExprBlock("");
-      wr.Write(")");
-
-      for (var i = 0; i < inNames.Count; i++) {
-        w.Write($"{TypeName(inTypes[i], w, tok)} {inNames[i]} = ");
-        var coercedW = EmitCoercionIfNecessary(NativeObjectType, inTypes[i], tok, w);
-        coercedW.Write(boxedInNames[i]);
-        w.WriteLine(";");
-      }
-
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IToken resultTok, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      functions.Add(0);
-      wr.Write($"(({DafnyFunctionIface(0)}<{BoxedTypeName(resultType, wr, resultTok)}>)(() ->");
-      var w = wr.NewBigExprBlock("", ")).apply()");
-      return w;
-    }
-
-    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      switch (op) {
-        case ResolvedUnaryOp.BoolNot:
-          TrParenExpr("!", expr, wr, inLetExprBody, wStmts);
-          break;
-        case ResolvedUnaryOp.BitwiseNot:
-          if (AsNativeType(expr.Type) != null) {
-            TrParenExpr(CastIfSmallNativeType(expr.Type) + "~", expr, wr, inLetExprBody, wStmts);
-          } else {
-            TrParenExpr("", expr, wr, inLetExprBody, wStmts);
-            wr.Write(".not()");
-          }
-          break;
-        case ResolvedUnaryOp.Cardinality:
-          if (expr.Type.AsCollectionType is MultiSetType) {
-            TrParenExpr("", expr, wr, inLetExprBody, wStmts);
-            wr.Write(".cardinality()");
-          } else if (expr.Type.AsCollectionType is SetType || expr.Type.AsCollectionType is MapType) {
-            TrParenExpr("java.math.BigInteger.valueOf(", expr, wr, inLetExprBody, wStmts);
-            wr.Write(".size())");
-          } else if (expr.Type.IsArrayType) {
-            TrParenExpr("java.math.BigInteger.valueOf(java.lang.reflect.Array.getLength", expr, wr, inLetExprBody, wStmts);
-            wr.Write(")");
-          } else {
-            TrParenExpr("java.math.BigInteger.valueOf(", expr, wr, inLetExprBody, wStmts);
-            wr.Write(".length())");
-          }
-          break;
-        default:
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
-      }
-    }
-
-    // Find the class with static methods like "divideUnsigned" for the type
-    private string HelperClass(NativeType nt) {
-      return AsJavaNativeType(nt) == JavaNativeType.Long ? "java.lang.Long" : "java.lang.Integer";
-    }
-
-    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op, Expression e0, Expression e1, IToken tok,
-      Type resultType, out string opString,
-      out string preOpString, out string postOpString, out string callString, out string staticCallString,
-      out bool reverseArguments, out bool truncateResult, out bool convertE1_to_int, out bool coerceE1, ConcreteSyntaxTree errorWr) {
-      opString = null;
-      preOpString = "";
-      postOpString = "";
-      callString = null;
-      staticCallString = null;
-      reverseArguments = false;
-      truncateResult = false;
-      convertE1_to_int = false;
-      coerceE1 = false;
-
-      void doPossiblyNativeBinOp(string o, string name, out string preOpS, out string opS,
-        out string postOpS, out string callS, out string staticCallS) {
-        if (AsNativeType(resultType) != null) {
-          var nativeName = GetNativeTypeName(AsNativeType(resultType));
-          if (o == ">>>" && resultType.AsBitVectorType is { Width: var width and (8 or 16 or 32 or 64) }) {
-            // Solves https://github.com/dafny-lang/dafny/issues/3734
-            preOpS = CastIfSmallNativeType(resultType);
-            opS = null;
-            postOpS = "";
-            callS = null;
-            staticCallS = $"{DafnyHelpersClass}.bv{width}ShiftRight";
-          } else if (o == "<<" && resultType.AsBitVectorType is { Width: var width2 and (32 or 64) }) {
-            // Solves https://github.com/dafny-lang/dafny/issues/3734
-            preOpS = CastIfSmallNativeType(resultType);
-            opS = null;
-            postOpS = "";
-            callS = null;
-            staticCallS = $"{DafnyHelpersClass}.bv{width2}ShiftLeft";
-          } else {
-            preOpS = $"({nativeName}) {CastIfSmallNativeType(resultType)} (";
-            opS = o;
-            postOpS = ")";
-            callS = null;
-            staticCallS = null;
-          }
-        } else {
-          callS = name;
-          preOpS = "";
-          opS = null;
-          postOpS = "";
-          staticCallS = null;
-        }
-      }
-
-      switch (op) {
-        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
-          doPossiblyNativeBinOp("&", "and", out preOpString, out opString, out postOpString, out callString, out staticCallString);
-          break;
-        case BinaryExpr.ResolvedOpcode.BitwiseOr:
-          doPossiblyNativeBinOp("|", "or", out preOpString, out opString, out postOpString, out callString, out staticCallString);
-          break;
-        case BinaryExpr.ResolvedOpcode.BitwiseXor:
-          doPossiblyNativeBinOp("^", "xor", out preOpString, out opString, out postOpString, out callString, out staticCallString);
-          break;
-        case BinaryExpr.ResolvedOpcode.EqCommon: {
-            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0.Type);
-            if (eqType.IsRefType) {
-              opString = "== (Object) ";
-            } else if (IsDirectlyComparable(eqType)) {
-              opString = "==";
-            } else {
-              staticCallString = "java.util.Objects.equals";
-            }
-            break;
-          }
-        case BinaryExpr.ResolvedOpcode.NeqCommon: {
-            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0.Type);
-            if (eqType.IsRefType) {
-              opString = "!= (Object) ";
-            } else if (IsDirectlyComparable(eqType)) {
-              opString = "!=";
-            } else {
-              preOpString = "!";
-              staticCallString = "java.util.Objects.equals";
-            }
-            break;
-          }
-        case BinaryExpr.ResolvedOpcode.Lt:
-        case BinaryExpr.ResolvedOpcode.Le:
-        case BinaryExpr.ResolvedOpcode.Ge:
-        case BinaryExpr.ResolvedOpcode.Gt:
-          var call = false;
-          var argNative = AsNativeType(e0.Type);
-          if (argNative != null && argNative.LowerBound >= 0) {
-            staticCallString = HelperClass(argNative) + ".compareUnsigned";
-            call = true;
-          } else if (argNative == null) {
-            callString = "compareTo";
-            call = true;
-          }
-          if (call) {
-            switch (op) {
-              case BinaryExpr.ResolvedOpcode.Lt:
-                postOpString = " < 0";
-                break;
-              case BinaryExpr.ResolvedOpcode.Le:
-                postOpString = " <= 0";
-                break;
-              case BinaryExpr.ResolvedOpcode.Ge:
-                postOpString = " >= 0";
-                break;
-              case BinaryExpr.ResolvedOpcode.Gt:
-                postOpString = " > 0";
-                break;
-              default:
-                Contract.Assert(false);
-                throw new cce.UnreachableException();
-            }
-          } else {
-            switch (op) {
-              case BinaryExpr.ResolvedOpcode.Lt:
-                opString = "<";
-                break;
-              case BinaryExpr.ResolvedOpcode.Le:
-                opString = "<=";
-                break;
-              case BinaryExpr.ResolvedOpcode.Ge:
-                opString = ">=";
-                break;
-              case BinaryExpr.ResolvedOpcode.Gt:
-                opString = ">";
-                break;
-              default:
-                Contract.Assert(false);
-                throw new cce.UnreachableException();
-            }
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.LeftShift:
-          doPossiblyNativeBinOp("<<", "shiftLeft", out preOpString, out opString, out postOpString, out callString, out staticCallString);
-          truncateResult = true;
-          convertE1_to_int = AsNativeType(e1.Type) == null;
-          break;
-        case BinaryExpr.ResolvedOpcode.RightShift:
-          doPossiblyNativeBinOp(">>>", "shiftRight", out preOpString, out opString, out postOpString, out callString, out staticCallString);
-          convertE1_to_int = AsNativeType(e1.Type) == null;
-          break;
-        case BinaryExpr.ResolvedOpcode.Add:
-          truncateResult = true;
-          if (resultType.IsCharType) {
-            preOpString = $"({CharTypeName(false)}) (";
-            postOpString = ")";
-            opString = "+";
-          } else {
-            doPossiblyNativeBinOp("+", "add", out preOpString, out opString, out postOpString, out callString, out staticCallString);
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Sub:
-          truncateResult = true;
-          if (resultType.IsCharType) {
-            preOpString = $"({CharTypeName(false)}) (";
-            opString = "-";
-            postOpString = ")";
-          } else {
-            doPossiblyNativeBinOp("-", "subtract", out preOpString, out opString, out postOpString, out callString, out staticCallString);
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mul:
-          doPossiblyNativeBinOp("*", "multiply", out preOpString, out opString, out postOpString, out callString, out staticCallString);
-          truncateResult = true;
-          break;
-        case BinaryExpr.ResolvedOpcode.Div:
-          if (NeedsEuclideanDivision(resultType)) {
-            staticCallString = $"{DafnyEuclideanClass}.EuclideanDivision";
-          } else if (AsNativeType(resultType) != null) {
-            var nt = AsNativeType(resultType);
-            if (nt.Sel == NativeType.Selection.Byte) {
-              staticCallString = $"{DafnyHelpersClass}.divideUnsignedByte";
-            } else if (nt.Sel == NativeType.Selection.UShort) {
-              staticCallString = $"{DafnyHelpersClass}.divideUnsignedShort";
-            } else {
-              preOpString = CastIfSmallNativeType(resultType);
-              staticCallString = HelperClass(AsNativeType(resultType)) + ".divideUnsigned";
-            }
-          } else {
-            callString = "divide";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mod:
-          if (NeedsEuclideanDivision(resultType)) {
-            staticCallString = $"{DafnyEuclideanClass}.EuclideanModulus";
-          } else if (AsNativeType(resultType) != null) {
-            var nt = AsNativeType(resultType);
-            if (nt.Sel == NativeType.Selection.Byte) {
-              staticCallString = $"{DafnyHelpersClass}.remainderUnsignedByte";
-            } else if (nt.Sel == NativeType.Selection.UShort) {
-              staticCallString = $"{DafnyHelpersClass}.remainderUnsignedShort";
-            } else {
-              preOpString = CastIfSmallNativeType(resultType);
-              staticCallString = HelperClass(AsNativeType(resultType)) + ".remainderUnsigned";
-            }
-          } else {
-            callString = "mod";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.SetEq:
-        case BinaryExpr.ResolvedOpcode.MultiSetEq:
-        case BinaryExpr.ResolvedOpcode.SeqEq:
-        case BinaryExpr.ResolvedOpcode.MapEq:
-          callString = "equals";
-          break;
-        case BinaryExpr.ResolvedOpcode.ProperSubset:
-        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
-          callString = "isProperSubsetOf";
-          break;
-        case BinaryExpr.ResolvedOpcode.Subset:
-        case BinaryExpr.ResolvedOpcode.MultiSubset:
-          callString = "isSubsetOf";
-          break;
-        case BinaryExpr.ResolvedOpcode.Disjoint:
-        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
-          callString = $"<{BoxedTypeName(e1.Type.AsCollectionType.Arg, errorWr, tok)}>disjoint";
-          break;
-        case BinaryExpr.ResolvedOpcode.InSet:
-        case BinaryExpr.ResolvedOpcode.InMultiSet:
-        case BinaryExpr.ResolvedOpcode.InMap:
-          callString = $"<{BoxedTypeName(e0.Type, errorWr, tok)}>contains";
-          reverseArguments = true;
-          coerceE1 = true;
-          break;
-
-        case BinaryExpr.ResolvedOpcode.Union:
-          staticCallString = $"{DafnySetClass}.<{BoxedTypeName(resultType.AsSetType.Arg, errorWr, tok)}>union";
-          break;
-        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-          staticCallString = $"{DafnyMultiSetClass}.<{BoxedTypeName(resultType.AsMultiSetType.Arg, errorWr, tok)}>union";
-          break;
-        case BinaryExpr.ResolvedOpcode.MapMerge:
-          staticCallString = $"{DafnyMapClass}.<{BoxedTypeName(resultType.AsMapType.Domain, errorWr, tok)}, {BoxedTypeName(resultType.AsMapType.Range, errorWr, tok)}>merge";
-          break;
-        case BinaryExpr.ResolvedOpcode.Intersection:
-          staticCallString = $"{DafnySetClass}.<{BoxedTypeName(resultType.AsSetType.Arg, errorWr, tok)}>intersection";
-          break;
-        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-          staticCallString = $"{DafnyMultiSetClass}.<{BoxedTypeName(resultType.AsMultiSetType.Arg, errorWr, tok)}>intersection";
-          break;
-        case BinaryExpr.ResolvedOpcode.SetDifference:
-          staticCallString = $"{DafnySetClass}.<{BoxedTypeName(resultType.AsSetType.Arg, errorWr, tok)}>difference";
-          break;
-        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
-          staticCallString = $"{DafnyMultiSetClass}.<{BoxedTypeName(resultType.AsMultiSetType.Arg, errorWr, tok)}>difference";
-          break;
-        case BinaryExpr.ResolvedOpcode.MapSubtraction:
-          staticCallString = $"{DafnyMapClass}.<{BoxedTypeName(resultType.AsMapType.Domain, errorWr, tok)}, {BoxedTypeName(resultType.AsMapType.Range, errorWr, tok)}>subtract";
-          break;
-
-        case BinaryExpr.ResolvedOpcode.ProperPrefix:
-          callString = "isProperPrefixOf";
-          break;
-        case BinaryExpr.ResolvedOpcode.Prefix:
-          callString = "isPrefixOf";
-          break;
-        case BinaryExpr.ResolvedOpcode.Concat:
-          staticCallString = $"{DafnySeqClass}.<{BoxedTypeName(resultType.AsSeqType.Arg, errorWr, tok)}>concatenate";
-          break;
-        case BinaryExpr.ResolvedOpcode.InSeq:
-          callString = "contains";
-          reverseArguments = true;
-          coerceE1 = true;
-          break;
-        default:
-          base.CompileBinOp(op, e0, e1, tok, resultType,
-            out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
-            errorWr);
-          break;
-      }
-    }
-
-    protected override void EmitFooter(Program program, ConcreteSyntaxTree wr) {
-      // Emit tuples
-      foreach (int i in tuples) {
-        if (i <= 20) {
-          continue; // Tuple2 and Tuple3 already exist in DafnyRuntime.jar, so don't remake these files.
-        }
-        CreateTuple(i, wr);
-      }
-
-      // Emit function interfaces
-      foreach (var i in functions) {
-        CreateLambdaFunctionInterface(i, wr);
-      }
-
-      // Emit arrays
-      foreach (var i in arrays) {
-        CreateDafnyArrays(i, wr);
-      }
-    }
-
-    private void CreateTuple(int i, ConcreteSyntaxTree outputWr) {
-      Contract.Requires(0 <= i);
-      Contract.Requires(outputWr != null);
-
-      var wrTop = outputWr.NewFile(Path.Combine("dafny", $"Tuple{i}.java"));
-
-      wrTop.WriteLine("package dafny;");
-      wrTop.WriteLine();
-      EmitSuppression(wrTop);
-      wrTop.Write($"public class Tuple{i}");
-      if (i != 0) {
-        wrTop.Write("<{0}>", Util.Comma(i, j => $"T{j}"));
-      }
-
-      var wr = wrTop.NewBlock("");
-      for (var j = 0; j < i; j++) {
-        wr.WriteLine("private T{0} _{0};", j);
-      }
-      wr.WriteLine();
-
-      wr.Write("public Tuple{0}({1}", i, Util.Comma(i, j => $"T{j} _{j}"));
-      var wrCtor = wr.NewBlock(")");
-      for (var j = 0; j < i; j++) {
-        wrCtor.WriteLine("this._{0} = _{0};", j);
-      }
-
-      wr.WriteLine();
-      var typeParams = new List<TypeParameter>();
-      for (var j = 0; j < i; j++) {
-        typeParams.Add(new TypeParameter(RangeToken.NoToken, new Name($"T{j}"), TypeParameter.TPVarianceSyntax.Covariant_Permissive));
-      }
-      var typeParamString = TypeParameters(typeParams);
-      var initializer = string.Format("Default({0})", Util.Comma(i, j => $"_td_T{j}.defaultValue()"));
-      EmitTypeDescriptorMethod(null, typeParams, $"Tuple{i}{typeParamString}", initializer, wr);
-
-      // public static Tuple4<T0, T1, T2, T3> Default(dafny.TypeDescriptor<T0> _td_T0, dafny.TypeDescriptor<T1> _td_T1, dafny.TypeDescriptor<T2> _td_T2, dafny.TypeDescriptor<T3> _td_T3) {
-      //   return new Tuple4<>(_td_T0.defaultValue(), _td_T1.defaultValue(), _td_T2.defaultValue(), _td_T3.defaultValue());
-      // }
-      wr.WriteLine();
-      if (i == 0) {
-        wr.Write("public static Tuple0");
-      } else {
-        wr.Write("public static <{1}> Tuple{0}<{1}>", i, Util.Comma(i, j => $"T{j}"));
-      }
-      wr.Write(" Default({0})", Util.Comma(i, j => $"T{j} {FormatDefaultTypeParameterValueName($"T{j}")}"));
-      {
-        var w = wr.NewBlock("");
-        w.WriteLine("return create({0});", Util.Comma(i, j => $"{FormatDefaultTypeParameterValueName($"T{j}")}"));
-      }
-
-      // create method
-      wr.WriteLine();
-      if (i == 0) {
-        wr.Write("public static Tuple0");
-      } else {
-        wr.Write("public static <{1}> Tuple{0}<{1}>", i, Util.Comma(i, j => $"T{j}"));
-      }
-      wr.Write(" create({0})", Util.Comma(i, j => $"T{j} _{j}"));
-      {
-        var w = wr.NewBlock("");
-        w.WriteLine("return new Tuple{0}({1});", i, Util.Comma(i, j => $"_{j}"));
-      }
-
-      wr.WriteLine();
-      wr.WriteLine("@Override");
-      var wrEquals = wr.NewBlock("public boolean equals(Object obj)");
-      wrEquals.WriteLine("if (this == obj) return true;");
-      wrEquals.WriteLine("if (obj == null) return false;");
-      wrEquals.WriteLine("if (getClass() != obj.getClass()) return false;");
-      wrEquals.WriteLine($"Tuple{i} o = (Tuple{i}) obj;");
-      if (i != 0) {
-        wrEquals.WriteLine("return {0};", Util.Comma(" && ", i, j => $"java.util.Objects.equals(this._{j}, o._{j})"));
-      } else {
-        wrEquals.WriteLine("return true;");
-      }
-
-      wr.WriteLine();
-      wr.WriteLine("@Override");
-      var wrToString = wr.NewBlock("public String toString()");
-      wrToString.WriteLine("StringBuilder sb = new StringBuilder();");
-      wrToString.WriteLine("sb.append(\"(\");");
-      for (int j = 0; j < i; j++) {
-        wrToString.WriteLine($"sb.append(_{j} == null ? \"null\" : _{j}.toString());");
-        if (j != i - 1) {
-          wrToString.WriteLine("sb.append(\", \");");
-        }
-      }
-
-      wrToString.WriteLine("sb.append(\")\");");
-      wrToString.WriteLine("return sb.toString();");
-
-      wr.WriteLine();
-      wr.WriteLine("@Override");
-      var wrHashCode = wr.NewBlock("public int hashCode()");
-      wrHashCode.WriteLine("// GetHashCode method (Uses the djb2 algorithm)");
-      wrHashCode.WriteLine(
-        "// https://stackoverflow.com/questions/1579721/why-are-5381-and-33-so-important-in-the-djb2-algorithm");
-      wrHashCode.WriteLine("long hash = 5381;");
-      wrHashCode.WriteLine(
-        "hash = ((hash << 5) + hash) + 0;"); // this is constructor 0 (in fact, it's the only constructor)
-      for (int j = 0; j < i; j++) {
-        wrHashCode.WriteLine("hash = ((hash << 5) + hash) + java.util.Objects.hashCode(this._" + j + ");");
-      }
-
-      wrHashCode.WriteLine("return (int)hash;");
-
-      for (int j = 0; j < i; j++) {
-        wr.WriteLine();
-        wr.WriteLine("public T" + j + " dtor__" + j + "() { return this._" + j + "; }");
-      }
-    }
-
-    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IToken tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
-      var xType = type.NormalizeExpandKeepConstraints();
-      if (xType is BoolType) {
-        return "false";
-      } else if (xType is CharType) {
-        return UnicodeCharEnabled ? $"((int){CharType.DefaultValueAsString})" : CharType.DefaultValueAsString;
-      } else if (xType is IntType || xType is BigOrdinalType) {
-        return "java.math.BigInteger.ZERO";
-      } else if (xType is RealType) {
-        return $"{DafnyBigRationalClass}.ZERO";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        return t.NativeType != null ? $"{CastIfSmallNativeType(t)}0" : "java.math.BigInteger.ZERO";
-      } else if (xType is CollectionType collType) {
-        string collName = CollectionTypeUnparameterizedName(collType);
-        string argNames = BoxedTypeName(collType.Arg, wr, tok);
-        if (xType is MapType mapType) {
-          argNames += "," + BoxedTypeName(mapType.Range, wr, tok);
-        }
-        string td = "";
-        if (xType is SeqType) {
-          td = TypeDescriptor(collType.Arg, wr, tok);
-        }
-        return $"{collName}.<{argNames}> empty({td})";
-      }
-
-      var udt = (UserDefinedType)xType;
-      var cl = udt.ResolvedClass;
-      Contract.Assert(cl != null);
-      if (cl is TypeParameter tp) {
-        if (usePlaceboValue && !tp.Characteristics.HasCompiledValue) {
-          return "null";
-        } else if (constructTypeParameterDefaultsFromTypeDescriptors) {
-          return $"{FormatTypeDescriptorVariable(tp.GetCompileName(Options))}.defaultValue()";
-        } else {
-          return FormatDefaultTypeParameterValue(tp);
-        }
-      } else if (cl is AbstractTypeDecl opaque) {
-        return FormatDefaultTypeParameterValueName(opaque.GetCompileName(Options));
-      } else if (cl is NewtypeDecl) {
-        var td = (NewtypeDecl)cl;
-        if (td.Witness != null) {
-          return FullTypeName(udt) + ".Witness";
-        } else if (td.NativeType != null) {
-          return GetNativeDefault(td.NativeType);
-        } else {
-          return TypeInitializationValue(td.BaseType, wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-      } else if (cl is SubsetTypeDecl) {
-        var td = (SubsetTypeDecl)cl;
-        if (td.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-          var relevantTypeArgs = new List<Type>();
-          for (int i = 0; i < td.TypeArgs.Count; i++) {
-            if (NeedsTypeDescriptor(td.TypeArgs[i])) {
-              relevantTypeArgs.Add(udt.TypeArgs[i]);
-            }
-          }
-          string typeParameters = Util.Comma(relevantTypeArgs, arg => TypeDescriptor(arg, wr, tok));
-          return $"{FullTypeName(udt)}.defaultValue({typeParameters})";
-        } else if (td.WitnessKind == SubsetTypeDecl.WKind.Special) {
-          // WKind.Special is only used with -->, ->, and non-null types:
-          Contract.Assert(ArrowType.IsPartialArrowTypeName(td.Name) || ArrowType.IsTotalArrowTypeName(td.Name) || td is NonNullTypeDecl);
-          if (ArrowType.IsPartialArrowTypeName(td.Name)) {
-            return $"(({BoxedTypeName(xType, wr, udt.tok)}) null)";
-          } else if (ArrowType.IsTotalArrowTypeName(td.Name)) {
-            var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-            // return the lambda expression ((Ty0 x0, Ty1 x1, Ty2 x2) -> rangeDefaultValue)
-            return $"(({Util.Comma(udt.TypeArgs.Count - 1, i => $"{BoxedTypeName(udt.TypeArgs[i], wr, udt.tok)} x{i}")}) -> {rangeDefaultValue})";
-          } else if (((NonNullTypeDecl)td).Class is ArrayClassDecl arrayClass) {
-            // non-null array type; we know how to initialize them
-            var elType = udt.TypeArgs[0];
-            TypeName_SplitArrayName(elType, out var innermostElementType, out var brackets);
-            string bareArray;
-            brackets += Util.Repeat(arrayClass.Dims - 1, "[]");
-            if (innermostElementType.IsTypeParameter) {
-              var cast = $"(java.lang.Object{brackets})";
-              bareArray = $"{cast}{FormatTypeDescriptorVariable(innermostElementType.AsTypeParameter)}.newArray({Util.Comma(arrayClass.Dims, _ => "0")})";
-            } else {
-              var typeNameSansBrackets = TypeName(innermostElementType, wr, udt.tok, false, true);
-              bareArray = $"new {typeNameSansBrackets}[0]{brackets}";
-            }
-            if (arrayClass.Dims == 1) {
-              return bareArray;
-            } else {
-              var zeros = Util.Repeat(arrayClass.Dims, "0, ");
-              return $"new {DafnyMultiArrayClass(arrayClass.Dims)}<>({TypeDescriptor(elType, wr, tok)}, {zeros}{bareArray})";
-            }
-          } else {
-            return "null";
-          }
-        } else {
-          return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-      } else if (cl is ClassLikeDecl or ArrowTypeDecl) {
-        return $"({BoxedTypeName(xType, wr, udt.tok)}) null";
-      } else if (cl is DatatypeDecl dt) {
-        if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
-          var typeSubstMap = TypeParameter.SubstitutionMap(dt.TypeArgs, udt.TypeArgs);
-          return TypeInitializationValue(innerType.Subst(typeSubstMap), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-        var s = FullTypeName(udt);
-        var typeargs = "";
-        var nonGhostTypeArgs = SelectNonGhost(cl, udt.TypeArgs);
-        if (nonGhostTypeArgs.Count != 0) {
-          typeargs = $"<{BoxedTypeNames(nonGhostTypeArgs, wr, udt.tok)}>";
-        }
-        // In an auto-init context (like a field initializer), we may not have
-        // access to all the type descriptors, so we can't construct the
-        // default value, but then null is an acceptable default, since
-        // Dafny proves the value won't be accessed.
-        if (usePlaceboValue) {
-          return $"({s}{typeargs})null";
-        }
-        var wDefaultTypeArguments = new ConcreteSyntaxTree();
-        var sep = "";
-        WriteTypeDescriptors(dt, udt.TypeArgs, wDefaultTypeArguments, ref sep);
-        var relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs);
-        var arguments = relevantTypeArgs.Comma(ta => DefaultValueCoercedIfNecessary(ta.Actual, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors));
-        if (relevantTypeArgs.Count == 0) {
-          sep = "";
-        }
-        return $"{s}.{typeargs}Default({wDefaultTypeArguments}{sep}{arguments})";
-      } else {
-        Contract.Assert(false);
-        throw new cce.UnreachableException(); // unexpected type
-      }
-    }
-
-    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type type, IToken tok, ConcreteSyntaxTree wr) {
-      wr.Write("{0} {1} = ", type != null ? TypeName(type, wr, tok, false, false, null) : "var", name);
-      var w = wr.Fork();
-      wr.WriteLine(";");
-      return w;
-    }
-
-    protected override void DeclareLocalOutVar(string name, Type type, IToken tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr) {
-      DeclareLocalVar(name, type, tok, false, rhs, wr);
-    }
-
-    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
-      TraitDecl trait, List<Type> superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      var filename = $"{ModulePath}/{IdProtect(name)}.java";
-      var w = wr.NewFile(filename);
-      FileCount += 1;
-      w.WriteLine($"// Interface {name}");
-      w.WriteLine($"// Dafny trait {name} compiled into Java");
-      w.WriteLine($"package {ModuleName};");
-      w.WriteLine();
-      EmitImports(w, out _);
-      w.WriteLine();
-      EmitSuppression(w); //TODO: Fix implementations so they do not need this suppression
-      var typeParamString = TypeParameters(typeParameters);
-      w.Write($"public interface {IdProtect(name)}{typeParamString}");
-      if (superClasses != null) {
-        string sep = " extends ";
-        foreach (var tr in superClasses) {
-          if (!tr.IsObject) {
-            w.Write($"{sep}{TypeName(tr, w, tok)}");
-            sep = ", ";
-          }
-        }
-      }
-      var instanceMemberWriter = w.NewBlock("");
-      //writing the _Companion class
-      filename = $"{ModulePath}/_Companion_{name}.java";
-      w = w.NewFile(filename);
-      FileCount += 1;
-      w.WriteLine($"// Interface {name}");
-      w.WriteLine($"// Dafny trait {name} compiled into Java");
-      w.WriteLine($"package {ModuleName};");
-      w.WriteLine();
-      EmitImports(w, out _);
-      w.WriteLine();
-      EmitSuppression(w); //TODO: Fix implementations so they do not need this suppression
-      w.Write($"public class _Companion_{name}{typeParamString}");
-      var staticMemberWriter = w.NewBlock("");
-      var ctorBodyWriter = staticMemberWriter.NewBlock($"public _Companion_{name}()");
-
-      return new ClassWriter(this, instanceMemberWriter, ctorBodyWriter, staticMemberWriter);
-    }
-
-    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex, DatatypeCtor ctor, List<Type> typeArgs, Type bvType, ConcreteSyntaxTree wr) {
-      if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
-        Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
-        Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
-        source(wr);
-        return;
-      }
-      string dtorName;
-      if (ctor.EnclosingDatatype is TupleTypeDecl tupleTypeDecl) {
-        Contract.Assert(tupleTypeDecl.NonGhostDims != 1); // such a tuple is an erasable-wrapper type, handled above
-        dtorName = $"dtor__{dtor.NameForCompilation}()";
-        wr = EmitCoercionIfNecessary(NativeObjectType, bvType, dtor.tok, wr);
-      } else {
-        dtorName = FieldName(dtor, formalNonGhostIndex);
-      }
-      wr.Write("(({0})", DtCtorName(ctor, typeArgs, wr));
-      source(wr);
-      wr.Write("{0}).{1}", ctor.EnclosingDatatype is CoDatatypeDecl ? ".Get()" : "", dtorName);
-    }
-
-    private void CreateLambdaFunctionInterface(int i, ConcreteSyntaxTree outputWr) {
-      Contract.Requires(0 <= i);
-      Contract.Requires(outputWr != null);
-
-      var functionName = $"Function{i}";
-      var wr = outputWr.NewFile(Path.Combine("dafny", $"{functionName}.java"));
-
-      var typeArgs = "<" + Util.Comma(i + 1, j => $"T{j}") + ">";
-
-      wr.WriteLine("package dafny;");
-      wr.WriteLine();
-      wr.WriteLine("@FunctionalInterface");
-      wr.Write($"public interface {functionName}{typeArgs}");
-      var wrMembers = wr.NewBlock("");
-      wrMembers.Write($"public T{i} apply(");
-      wrMembers.Write(Util.Comma(i, j => $"T{j} t{j}"));
-      wrMembers.WriteLine(");");
-
-      EmitSuppression(wrMembers);
-      wrMembers.Write($"public static {typeArgs} {DafnyTypeDescriptor}<{functionName}{typeArgs}> {TypeMethodName}(");
-      wrMembers.Write(Util.Comma(i + 1, j => $"{DafnyTypeDescriptor}<T{j}> t{j}"));
-      var wrTypeBody = wrMembers.NewBlock(")", "");
-      // XXX This seems to allow non-nullable types to have null values (since
-      // arrow types are allowed as "(0)"-constrained type arguments), but it's
-      // consistent with other backends.
-      wrTypeBody.Write($"return ({DafnyTypeDescriptor}<{functionName}{typeArgs}>) ({DafnyTypeDescriptor}<?>) {DafnyTypeDescriptor}.reference({functionName}.class);");
-    }
-
-    private void CreateDafnyArrays(int i, ConcreteSyntaxTree outputWr) {
-      Contract.Requires(0 <= i);
-      Contract.Requires(outputWr != null);
-
-      var wrTop = outputWr.NewFile(Path.Combine("dafny", $"Array{i}.java"));
-
-      wrTop.WriteLine("package dafny;");
-      wrTop.WriteLine();
-
-      // All brackets on the underlying "real" array type, minus the innermost
-      // pair.  The innermost array must be represented as an Object since it
-      // could be of primitive type.
-      var outerBrackets = Repeat("[]", i - 1);
-
-      var dims = Enumerable.Range(0, i);
-      var outerDims = Enumerable.Range(0, i - 1);
-
-      var wr = wrTop.NewBlock($"public final class Array{i}<T>");
-
-      wr.WriteLine($"public final Object{outerBrackets} elmts;");
-      wr.WriteLine($"private final {DafnyTypeDescriptor}<T> elmtType;");
-
-      foreach (var j in dims) {
-        wr.WriteLine($"public final int dim{j};");
-      }
-      {
-        var wrBody = wr.NewBlock($"public Array{i}({DafnyTypeDescriptor}<T> elmtType, {Util.Comma(dims, j => $"int dim{j}")}, Object{outerBrackets} elmts)");
-        wrBody.WriteLine("assert elmts.getClass().isArray();");
-        wrBody.WriteLine("this.elmtType = elmtType;");
-        foreach (var j in dims) {
-          wrBody.WriteLine($"this.dim{j} = dim{j};");
-        }
-        wrBody.WriteLine("this.elmts = elmts;");
-      }
-
-      {
-        var wrBody = wr.NewBlock($"public T get({Util.Comma(dims, j => $"int i{j}")})");
-        wrBody.Write("return elmtType.getArrayElement(elmts");
-        foreach (var j in outerDims) {
-          wrBody.Write($"[i{j}]");
-        }
-        wrBody.WriteLine($", i{i - 1});");
-      }
-
-      {
-        var wrBody = wr.NewBlock($"public void set({Util.Comma(dims, j => $"int i{j}")}, T value)");
-        wrBody.Write("elmtType.setArrayElement(elmts");
-        foreach (var j in outerDims) {
-          wrBody.Write($"[i{j}]");
-        }
-        wrBody.WriteLine($", i{i - 1}, value);");
-      }
-
-      {
-        var body = wr.NewBlock("public void fill(T z)");
-        var forBodyWr = body;
-        for (int j = 0; j < i - 1; j++) {
-          forBodyWr = forBodyWr.NewBlock($"for(int i{j} = 0; i{j} < dim{j}; i{j}++)");
-        }
-        forBodyWr.Write($"elmtType.fillArray(elmts");
-        for (int j = 0; j < i - 1; j++) {
-          forBodyWr.Write($"[i{j}]");
-        }
-        forBodyWr.WriteLine(", z);");
-      }
-
-      {
-        var body = wr.NewBlock($"public Array{i} fillThenReturn(T z)");
-        body.WriteLine("fill(z);");
-        body.WriteLine("return this;");
-      }
-
-      EmitSuppression(wr);
-      wr.WriteLine($"private static final {DafnyTypeDescriptor}<Array{i}<?>> TYPE = ({DafnyTypeDescriptor}<Array{i}<?>>) ({DafnyTypeDescriptor}<?>) {DafnyTypeDescriptor}.reference(Array{i}.class);");
-      EmitSuppression(wr);
-      var wrTypeMethod = wr.NewBlock($"public static <T> {DafnyTypeDescriptor}<Array{i}<T>> {TypeMethodName}()");
-      wrTypeMethod.WriteLine($"return ({DafnyTypeDescriptor}<Array{i}<T>>) ({DafnyTypeDescriptor}<?>) TYPE;");
-    }
-
-    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
-      if (!member.IsStatic && !NeedsCustomReceiver(member)) {
-        var receiverType = UserDefinedType.FromTopLevelDecl(member.tok, member.EnclosingClass);
-        var receiverTypeName = TypeName(receiverType, wr, member.tok);
-        if (member.EnclosingClass.IsExtern(Options, out _, out _)) {
-          receiverTypeName = FormatExternBaseClassName(receiverTypeName);
-        }
-        wr.WriteLine("{0} _this = this;", receiverTypeName);
-      }
-      return wr.NewBlock("TAIL_CALL_START: while (true)");
-    }
-
-    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
-      wr.WriteLine("continue TAIL_CALL_START;");
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachLoop(
-      string tmpVarName, Type collectionElementType, IToken tok, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-
-      // We may have to coerce from the boxed type used in collections
-      var needsCoercion = IsCoercionNecessary(NativeObjectType, collectionElementType);
-      var boxedType = BoxedTypeName(collectionElementType, wr, tok);
-      var loopVarName = needsCoercion ? ProtectedFreshId(tmpVarName + "_boxed") : tmpVarName;
-      wr.Write($"for ({boxedType} {loopVarName} : ");
-      collectionWriter = wr.Fork();
-      var wwr = wr.NewBlock(")");
-      if (needsCoercion) {
-        wwr.Write($"{TypeName(collectionElementType, wr, tok)} {tmpVarName} = ");
-        var coercedWwr = EmitCoercionIfNecessary(NativeObjectType, collectionElementType, tok, wwr);
-        coercedWwr.Write(loopVarName);
-        wwr.WriteLine(";");
-      }
-      return wwr;
-    }
-
-    protected override string GetSubtypeCondition(string tmpVarName, Type boundVarType, IToken tok, ConcreteSyntaxTree wPreconditions) {
-      string typeTest;
-
-      if (boundVarType.IsRefType) {
-        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
-          typeTest = "true";
-        } else {
-          typeTest = $"{tmpVarName} instanceof {TypeName(boundVarType, wPreconditions, tok)}";
-        }
-        if (boundVarType.IsNonNullRefType) {
-          typeTest = $"{tmpVarName} != null && {typeTest}";
-        } else {
-          typeTest = $"{tmpVarName} == null || {typeTest}";
-        }
-      } else {
-        typeTest = "true";
-      }
-      return typeTest;
-    }
-
-    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
-      Type collectionElementType, bool introduceBoundVar, IToken tok, ConcreteSyntaxTree wr) {
-
-      var typeName = TypeName(boundVarType, wr, tok);
-      wr.WriteLine("{0}{1} = ({2}){3};", introduceBoundVar ? typeName + " " : "", boundVarName, typeName, tmpVarName);
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      wr.Write($"for ({DafnyTupleClass(L)}<{tupleTypeArgs}> {boundVarName} : ");
-      collectionWriter = wr.Fork();
-      return wr.NewBlock(")");
-    }
-
-    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      if (ct is SetType) {
-        var wStmts = wr.Fork();
-        wr.Write($"{collName}.add(");
-        var coercedWr = EmitCoercionIfNecessary(elmt.Type, NativeObjectType, elmt.tok, wr);
-        coercedWr.Append(Expr(elmt, inLetExprBody, wStmts));
-        wr.WriteLine(");");
-      } else {
-        Contract.Assume(false);  // unexpected collection type
-      }
-    }
-
-    protected override string GetCollectionBuilder_Build(CollectionType ct, IToken tok, string collName, ConcreteSyntaxTree wr) {
-      if (ct is SetType) {
-        var typeName = BoxedTypeName(ct.Arg, wr, tok);
-        return $"new {DafnySetClass}<{typeName}>({collName})";
-      } else if (ct is MapType) {
-        var mt = (MapType)ct;
-        var domtypeName = BoxedTypeName(mt.Domain, wr, tok);
-        var rantypeName = BoxedTypeName(mt.Range, wr, tok);
-        return $"new {DafnyMapClass}<{domtypeName},{rantypeName}>({collName})";
-      } else {
-        Contract.Assume(false);  // unexpected collection type
-        throw new cce.UnreachableException();  // please compiler
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
-      var prefix = createContinueLabel ? "continue_" : "goto_";
-      return wr.NewNamedBlock($"{prefix}{label}:");
-    }
-
-    protected override void EmitBreak(string label, ConcreteSyntaxTree wr) {
-      wr.WriteLine(label == null ? "break;" : $"break goto_{label};");
-    }
-
-    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
-      wr.WriteLine($"break continue_{label};");
-    }
-
-    protected override void EmitAbsurd(string message, ConcreteSyntaxTree wr) {
-      if (message == null) {
-        message = "unexpected control point";
-      }
-
-      wr.WriteLine($"throw new IllegalArgumentException(\"{message}\");");
-    }
-
-    protected override void EmitAbsurd(string message, ConcreteSyntaxTree wr, bool needIterLimit) {
-      if (!needIterLimit) {
-        EmitAbsurd(message, wr);
-      }
-    }
-
-    protected override void EmitHalt(IToken tok, Expression messageExpr, ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      wr.Write("throw new dafny.DafnyHaltException(");
-      if (tok != null) {
-        EmitStringLiteral(tok.TokenToString(Options) + ": ", true, wr);
-        wr.Write(" + ");
-      }
-
-      EmitToString(wr, messageExpr, wStmts);
-      wr.WriteLine(");");
-    }
-
-    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
-      var cw = (ClassWriter)CreateClass(IdProtect(nt.EnclosingModuleDefinition.GetCompileName(Options)), IdName(nt), nt, wr);
-      var w = cw.StaticMemberWriter;
-      if (nt.NativeType != null) {
-        var nativeType = GetBoxedNativeTypeName(nt.NativeType);
-        var wEnum = w.NewNamedBlock($"public static java.util.ArrayList<{nativeType}> IntegerRange(java.math.BigInteger lo, java.math.BigInteger hi)");
-        wEnum.WriteLine($"java.util.ArrayList<{nativeType}> arr = new java.util.ArrayList<>();");
-        var numberval = $"{GetNativeTypeName(nt.NativeType)}Value()";
-        wEnum.WriteLine($"for (java.math.BigInteger j = lo; j.compareTo(hi) < 0; j = j.add(java.math.BigInteger.ONE)) {{ arr.add({nativeType}.valueOf(j.{numberval})); }}");
-        wEnum.WriteLine("return arr;");
-      }
-      if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-        var wStmts = w.Fork();
-        var witness = new ConcreteSyntaxTree(w.RelativeIndentLevel);
-        witness.Append(Expr(nt.Witness, false, wStmts));
-        if (nt.NativeType == null) {
-          cw.DeclareField("Witness", nt, true, true, nt.BaseType, nt.tok, witness.ToString(), null);
-        } else {
-          var nativeType = GetNativeTypeName(nt.NativeType);
-          // Hacky way of doing the conversion from any (including BigInteger) to any
-          w.Write("public static {0} Witness = ((java.lang.Number) (", nativeType);
-          w.Append(witness);
-          w.WriteLine($")).{nativeType}Value();");
-        }
-      }
-
-      if (nt.ParentTraits.Count != 0) {
-        DeclareBoxedNewtype(nt, cw.InstanceMemberWriter);
-      }
-
-      return cw;
-    }
-
-    void DeclareBoxedNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
-      // instance field:  public TargetRepresentation _value;
-      var targetTypeName = nt.NativeType == null ? TypeName(nt.BaseType, wr, nt.tok) : GetNativeTypeName(nt.NativeType);
-      wr.WriteLine($"public {targetTypeName} _value;");
-
-      // constructor:
-      // public NewType(TargetRepresentation value) {
-      //   _value = value;
-      // }
-      wr.NewNamedBlock($"public {IdName(nt)}({targetTypeName} value)")
-        .WriteLine("_value = value;");
-
-      // @Override
-      // public java.lang.String toString() {
-      //   return java.lang.String.valueOf(_value);
-      // }
-      wr.WriteLine("@Override");
-      var wBody = wr.NewNamedBlock("public java.lang.String toString()");
-      wBody.Write("return ");
-      EmitToString(wBody, UserDefinedType.FromTopLevelDecl(nt.tok, nt))
-        .Write("_value");
-      wBody.WriteLine(";");
-    }
-
-    protected override string ArrayIndexToNativeInt(string s, Type type) {
-      var nt = AsNativeType(type);
-      if (nt == null) {
-        return $"({s}).intValue()";
-      } else if (nt.Sel == NativeType.Selection.Int || nt.Sel == NativeType.Selection.UInt) {
-        return s;
-      } else if (IsUnsignedJavaNativeType(nt)) {
-        return $"{DafnyHelpersClass}.unsignedToInt({s})";
-      } else {
-        return $"{DafnyHelpersClass}.toInt({s})";
-      }
-    }
-
-    // if checkRange is false, msg is ignored
-    // if checkRange is true and msg is null and the value is out of range, a generic message is emitted
-    // if checkRange is true and msg is not null and the value is out of range, msg is emitted in the error message
-    private void TrExprAsInt(Expression expr, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts,
-      bool checkRange = false, string msg = null) {
-      var wrExpr = new ConcreteSyntaxTree();
-      wrExpr.Append(Expr(expr, inLetExprBody, wStmts));
-      TrExprAsInt(wrExpr.ToString(), expr.Type, wr, checkRange, msg);
-    }
-
-    // if checkRange is false, msg is ignored
-    // if checkRange is true and msg is null and the value is out of range, a generic message is emitted
-    // if checkRange is true and msg is not null and the value is out of range, msg is emitted in the error message
-    private void TrExprAsInt(string expr, Type type, ConcreteSyntaxTree wr, bool checkRange = false, string msg = null) {
-      var nt = AsNativeType(type);
-      if (nt == null) {
-        wr.Write($"{DafnyHelpersClass}.toInt" + (checkRange ? "Checked(" : "("));
-        wr.Write($"({expr})");
-        if (checkRange) {
-          wr.Write(msg == null ? ", null" : $", \"{msg}\"");
-        }
-
-        wr.Write(")");
-      } else if (nt.Sel == NativeType.Selection.Int || nt.Sel == NativeType.Selection.UInt) {
-        wr.Write(expr);
-      } else if (IsUnsignedJavaNativeType(nt)) {
-        wr.Write($"{DafnyHelpersClass}.unsignedToInt" + (checkRange ? "Checked(" : "("));
-        wr.Write(expr);
-        if (checkRange) {
-          wr.Write(msg == null ? ", null" : $", \"{msg}\"");
-        }
-
-        wr.Write(")");
-      } else {
-        wr.Write($"{DafnyHelpersClass}.toInt" + (checkRange ? "Checked(" : "("));
-        wr.Write(expr);
-        if (checkRange) {
-          wr.Write(msg == null ? ", null" : $", \"{msg}\"");
-        }
-
-        wr.Write(")");
-      }
-    }
-
-    private void TrParenExprAsInt(Expression expr, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
-      wr.Write("(");
-      TrExprAsInt(expr, wr, inLetExprBody, wStmts);
-      wr.Write(")");
-    }
-
-    protected override void EmitNewArray(Type elementType, IToken tok, List<string> dimensions,
-        bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      // Where to put the array to be wrapped
-      ConcreteSyntaxTree wBareArray;
-      if (dimensions.Count > 1) {
-        arrays.Add(dimensions.Count);
-        wr.Write($"new {DafnyMultiArrayClass(dimensions.Count)}<>({TypeDescriptor(elementType, wr, tok)}, ");
-        foreach (var dim in dimensions) {
-          TrExprAsInt(dim, Type.Int, wr, checkRange: true, msg: "Java arrays may be no larger than the maximum 32-bit signed int");
-          wr.Write(", ");
-        }
-        wBareArray = wr.Fork();
-        wr.Write(")");
-        if (mustInitialize) {
-          wr.Write($".fillThenReturn({DefaultValueCoercedIfNecessary(elementType, wr, tok, true)})");
-        }
-      } else {
-        wr.Write($"({ArrayTypeName(elementType, dimensions.Count, wr, tok, false)}) ");
-        if (mustInitialize) {
-          wr.Write($"{TypeDescriptor(elementType, wr, tok)}.fillThenReturnArray(");
-        }
-        wBareArray = wr.Fork();
-        if (mustInitialize) {
-          wr.Write($", {DefaultValueCoercedIfNecessary(elementType, wr, tok, true)})");
-        }
-      }
-
-      if (dimensions.Count > 1) {
-        wBareArray.Write($"(Object{Repeat("[]", dimensions.Count - 1)}) ");
-      }
-      wBareArray.Write($"{TypeDescriptor(elementType, wr, tok)}.newArray(");
-      var sep = "";
-      foreach (var dim in dimensions) {
-        wBareArray.Write(sep);
-        TrExprAsInt(dim, Type.Int, wBareArray, checkRange: true, msg: "Java arrays may be no larger than the maximum 32-bit signed int");
-        sep = ", ";
-      }
-      wBareArray.Write(")");
-    }
-
-    protected override bool TargetLambdaCanUseEnclosingLocals => false;
-
-    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
-      List<Type> boundTypes, Type resultType, IToken resultTok, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ref ConcreteSyntaxTree wStmts) {
-      if (boundTypes.Count != 1) {
-        functions.Add(boundTypes.Count);
-      }
-      wr.Write("(({0}<{1}{2}>)", DafnyFunctionIface(boundTypes.Count), Util.Comma("", boundTypes, t => BoxedTypeName(t, wr, resultTok) + ", "), BoxedTypeName(resultType, wr, resultTok));
-      wr.Write($"({Util.Comma(boundVars)}) -> ");
-      var w = wr.Fork();
-      wr.Write(").apply");
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, string bound, ConcreteSyntaxTree wr, string start = null) {
-      start = start ?? "java.math.BigInteger.ZERO";
-      return wr.NewNamedBlock($"for (java.math.BigInteger {indexVar} = {start}; {indexVar}.compareTo({bound}) < 0; {indexVar} = {indexVar}.add(java.math.BigInteger.ONE))");
-    }
-
-    protected override ConcreteSyntaxTree EmitForStmt(IToken tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
-      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
-
-      var nativeType = AsNativeType(loopIndex.Type);
-
-      wr.Write($"for ({TypeName(loopIndex.Type, wr, tok)} {loopIndex.CompileName} = ");
-      var startWr = wr.Fork();
-      wr.Write($"; ");
-
-      ConcreteSyntaxTree bodyWr;
-      if (goingUp) {
-        if (endVarName == null) {
-          wr.Write("");
-        } else if (nativeType == null) {
-          wr.Write($"{loopIndex.CompileName}.compareTo({endVarName}) < 0");
-        } else if (0 <= nativeType.LowerBound) {
-          wr.Write($"{HelperClass(nativeType)}.compareUnsigned({loopIndex.CompileName}, {endVarName}) < 0");
-        } else {
-          wr.Write($"{loopIndex.CompileName} < {endVarName}");
-        }
-        if (nativeType == null) {
-          bodyWr = wr.NewBlock($"; {loopIndex.CompileName} = {loopIndex.CompileName}.add(java.math.BigInteger.ONE))");
-        } else {
-          bodyWr = wr.NewBlock($"; {loopIndex.CompileName}++)");
-        }
-      } else {
-        if (endVarName == null) {
-          wr.Write("");
-        } else if (nativeType == null) {
-          wr.Write($"{endVarName}.compareTo({loopIndex.CompileName}) < 0");
-        } else if (0 <= nativeType.LowerBound) {
-          wr.Write($"{HelperClass(nativeType)}.compareUnsigned({endVarName}, {loopIndex.CompileName}) < 0");
-        } else {
-          wr.Write($"{endVarName} < {loopIndex.CompileName}");
-        }
-        bodyWr = wr.NewBlock($"; )");
-        if (nativeType == null) {
-          bodyWr.WriteLine($"{loopIndex.CompileName} = {loopIndex.CompileName}.subtract(java.math.BigInteger.ONE);");
-        } else {
-          bodyWr.WriteLine($"{loopIndex.CompileName}--;");
-        }
-      }
-      bodyWr = EmitContinueLabel(labels, bodyWr);
-      TrStmtList(body, bodyWr);
-
-      return startWr;
-    }
-
-    protected override string GetHelperModuleName() => DafnyHelpersClass;
-
-    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      wr.WriteLine("new java.util.ArrayList<>();");
-    }
-
-    protected override void AddTupleToSet(int i) {
-      tuples.Add(i);
-    }
-
-    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      // FIXME: tupleTypeArgs is wrong because it already got generated from
-      // TypeName (with unboxed being the default)  :-(
-      wr.Write($"{ingredients}.add(new {DafnyTupleClassPrefix}");
-      var wrTuple = wr.Fork();
-      wr.Write("));");
-      return wrTuple;
-    }
-
-    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(expr, wr, inLetExprBody, wStmts);
-      wr.Write(".intValue()");
-    }
-
-    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
-      wr.Write($"{prefix}.dtor__{i}()");
-    }
-
-    protected override void EmitApplyExpr(Type functionType, IToken tok, Expression function, List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr = EmitCoercionIfNecessary(NativeObjectType, functionType.AsArrowType.Result, tok, wr);
-      TrParenExpr(function, wr, inLetExprBody, wStmts);
-      wr.Write(".apply");
-      TrExprList(arguments, wr, inLetExprBody, wStmts, typeAt: _ => NativeObjectType);
-    }
-
-    protected override bool NeedsCastFromTypeParameter => true;
-
-    protected override bool TargetSubtypingRequiresEqualTypeArguments(Type type) {
-      return type.AsCollectionType == null;
-    }
-
-    protected override bool IsCoercionNecessary(Type/*?*/ from, Type/*?*/ to) {
-      from = from == null ? null : DatatypeWrapperEraser.SimplifyType(Options, from);
-      to = to == null ? null : DatatypeWrapperEraser.SimplifyType(Options, to);
-
-      if (to == NativeObjectType) {
-        return false;
-      }
-      if (from == NativeObjectType) {
-        return true;
-      }
-
-      if (UnicodeCharEnabled && ((IsNativeObjectType(from) && to.IsCharType) || (from.IsCharType && IsNativeObjectType(to)))) {
-        // Need to box from int to CodePoint, or unbox from CodePoint to int
-        return true;
-      }
-
-      if (from.IsArrayType && to.IsArrayType) {
-        var dims = from.AsArrayType.Dims;
-        Contract.Assert(dims == to.AsArrayType.Dims);
-        if (dims > 1) {
-          return false;
-        }
-
-        var udtFrom = (UserDefinedType)from.NormalizeExpand();
-        var udtTo = (UserDefinedType)to.NormalizeExpand();
-        return udtFrom.TypeArgs[0].IsTypeParameter && !udtTo.TypeArgs[0].IsTypeParameter;
-      }
-
-      return false;
-    }
-
-    protected override Type TypeForCoercion(Type type) {
-      return NativeObjectType;
-    }
-
-    // We use null to represent java.lang.Object, as that's a decent
-    // default native type for "no type information".
-    // We don't use the SpecialNativeType approach that the Go compiler
-    // uses for string because that kind of compiler-specific Type implementation
-    // doesn't fit well into the generic logic on Types
-    // (see for example https://github.com/dafny-lang/dafny/issues/2989).
-    private static readonly Type NativeObjectType = null;
-
-    private bool IsNativeObjectType(Type type) {
-      return type == NativeObjectType || type.IsTypeParameter;
-    }
-
-    protected override ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
-      if (type.HasFatPointer) {
-        var w = wr.ForkInParens();
-        wr.Write("._value");
-        return w;
-      } else {
-        return wr;
-      }
-    }
-
-    protected override ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
-      if (type.HasFatPointer) {
-        wr.Write($"new {type.AsNewtype.GetFullCompileName(Options)}");
-        return wr.ForkInParens();
-      } else {
-        return wr;
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitCoercionIfNecessary(Type/*?*/ from, Type/*?*/ to, IToken tok, ConcreteSyntaxTree wr) {
-      if (from != null && to != null && from.IsTraitType && to.AsNewtype != null) {
-        return FromFatPointer(to, wr);
-      }
-      if (from != null && to != null && from.AsNewtype != null && to.IsTraitType && (enclosingMethod != null || enclosingFunction != null)) {
-        return ToFatPointer(from, wr);
-      }
-
-      from = from == null ? null : DatatypeWrapperEraser.SimplifyType(Options, from);
-      to = to == null ? null : DatatypeWrapperEraser.SimplifyType(Options, to);
-
-      if (UnicodeCharEnabled) {
-        // Need to box from int to CodePoint, or unbox from CodePoint to int
-
-        if (IsNativeObjectType(from) && to is { IsCharType: true }) {
-          wr.Write("((dafny.CodePoint)(");
-          var w = wr.Fork();
-          wr.Write(")).value()");
-          return w;
-        }
-
-        if (from is { IsCharType: true } && IsNativeObjectType(to)) {
-          wr.Write("dafny.CodePoint.valueOf(");
-          var w = wr.Fork();
-          wr.Write(")");
-          return w;
-        }
-      }
-
-      if (IsCoercionNecessary(from, to)) {
-        return EmitDowncast(from, to, tok, wr);
-      }
-
-      return wr;
-    }
-
-    protected override ConcreteSyntaxTree EmitDowncast(Type from, Type to, IToken tok, ConcreteSyntaxTree wr) {
-      var w = new ConcreteSyntaxTree();
-      if (from != null && to != null && from.IsTraitType && to.AsNewtype != null) {
-        wr.Format($"(({to.AsNewtype.GetFullCompileName(Options)})({w}))");
-      } else if (from != null && to != null && from.AsNewtype != null && to.IsTraitType) {
-        wr.Format($"(({TypeName(to, wr, tok)})({w}))");
-      } else {
-        wr.Write($"(({TypeName(to, wr, tok)})(java.lang.Object)(");
-        w = wr.Fork();
-        wr.Write("))");
-      }
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree EmitCoercionToNativeInt(ConcreteSyntaxTree wr) {
-      wr.Write("((java.math.BigInteger)");
-      var w = wr.Fork();
-      wr.Write(").intValue()");
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
-      return wr.NewNamedBlock($"for (java.math.BigInteger {indexVar} = java.math.BigInteger.valueOf({start}); ; {indexVar} = {indexVar}.multiply(new java.math.BigInteger(\"2\")))");
-    }
-
-    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
-      wr.Write($"{varName}.equals(java.math.BigInteger.ZERO)");
-    }
-
-    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine($"{varName} = {varName}.subtract(java.math.BigInteger.ONE);");
-    }
-
-    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine($"{varName} = {varName}.add(java.math.BigInteger.ONE);");
-    }
-
-    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write("java.util.Arrays.asList");
-      TrParenExpr(e, wr, inLetExprBody, wStmts);
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IToken resultTok, string bvName,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write($"((java.util.function.Function<java.math.BigInteger, {BoxedTypeName(resultType, wr, resultTok)}>)(({bvName}) ->");
-      var w = wr.NewBigExprBlock("", $")).apply(java.math.BigInteger.valueOf({source}))");
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IToken tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      wr.Write($"{collName}.put(");
-      var termLeftWriter = wr.Fork();
-      wr.Write(",");
-      wr.Append(Expr(term, inLetExprBody, wStmts));
-      wr.WriteLine(");");
-      return termLeftWriter;
-    }
-
-    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write($"{DafnySeqClass}.Create({TypeDescriptor(expr.Type.AsCollectionType.Arg, wr, expr.tok)}, ");
-      wr.Append(Expr(expr.N, inLetExprBody, wStmts));
-      wr.Write(", ");
-      wr.Append(Expr(expr.Initializer, inLetExprBody, wStmts));
-      wr.Write(")");
-    }
-
-    // Warning: NOT the same as NativeType.Bitwidth, which is zero except for
-    // bitvector types
-    private static int NativeTypeSize(NativeType nt) {
-      switch (AsJavaNativeType(nt)) {
-        case JavaNativeType.Byte: return 8;
-        case JavaNativeType.Short: return 16;
-        case JavaNativeType.Int: return 32;
-        case JavaNativeType.Long: return 64;
-        default: Contract.Assert(false); throw new cce.UnreachableException();
-      }
-    }
-
-    protected override void EmitConversionExpr(ConversionExpr e, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Expression arg = e.E;
-      Type fromType = e.E.Type;
-      Type toType = e.ToType;
-      if (fromType.IsNumericBased(Type.NumericPersuasion.Int) || fromType.IsBitVectorType || fromType.IsCharType) {
-        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // (int or bv or char) -> real
-          Contract.Assert(AsNativeType(toType) == null);
-          var fromNative = AsNativeType(fromType);
-          wr.Write($"new {DafnyBigRationalClass}(");
-          if (fromNative != null) {
-            wr.Write(fromNative.LowerBound >= 0
-              ? $"{DafnyHelpersClass}.unsignedToBigInteger"
-              : "java.math.BigInteger.valueOf");
-            TrParenExpr(arg, wr, inLetExprBody, wStmts);
-            wr.Write(", java.math.BigInteger.ONE)");
-          } else if (fromType.IsCharType) {
-            wr.Append(Expr(arg, inLetExprBody, wStmts));
-            wr.Write(", 1)");
-          } else {
-            wr.Append(Expr(arg, inLetExprBody, wStmts));
-            wr.Write(", java.math.BigInteger.ONE)");
-          }
-        } else if (toType.IsCharType) {
-          // (int or bv or char) -> char
-          // Painfully, Java sign-extends bytes when casting to chars ...
-          if (fromType.IsCharType) {
-            TrParenExpr(arg, wr, inLetExprBody, wStmts);
-          } else {
-            var fromNative = AsNativeType(fromType);
-            wr.Write($"({CharTypeName(false)})");
-            if (fromNative != null && fromNative.Sel == NativeType.Selection.Byte) {
-              wr.Write("java.lang.Byte.toUnsignedInt");
-              TrParenExpr(arg, wr, inLetExprBody, wStmts);
-            } else {
-              TrExprAsInt(arg, wr, inLetExprBody, wStmts);
-            }
-          }
-        } else {
-          // (int or bv or char) -> (int or bv or ORDINAL)
-          var fromNative = AsNativeType(e.E.Type);
-          var toNative = AsNativeType(e.ToType);
-          if (fromNative == null && toNative == null) {
-            if (fromType.IsCharType) {
-              // char -> big-integer (int or bv or ORDINAL)
-              wr.Write("java.math.BigInteger.valueOf");
-              TrParenExpr(arg, wr, inLetExprBody, wStmts);
-            } else {
-              // big-integer (int or bv) -> big-integer (int or bv or ORDINAL), so identity will do
-              wr.Append(Expr(arg, inLetExprBody, wStmts));
-            }
-          } else if (fromNative != null && toNative == null) {
-            // native (int or bv) -> big-integer (int or bv)
-            wr.Write(fromNative.LowerBound >= 0
-              ? $"{DafnyHelpersClass}.unsignedToBigInteger"
-              : "java.math.BigInteger.valueOf");
-            TrParenExpr(arg, wr, inLetExprBody, wStmts);
-          } else if (fromNative != null && NativeTypeSize(toNative) == NativeTypeSize(fromNative)) {
-            // native (int or bv) -> native (int or bv)
-            // Cast between signed and unsigned, which have the same Java type
-            TrParenExpr(arg, wr, inLetExprBody, wStmts);
-          } else {
-            GetNativeInfo(toNative.Sel, out var toNativeName, out var toNativeSuffix, out var toNativeNeedsCast);
-            // any (int or bv) -> native (int or bv)
-            // A cast would do, but we also consider some optimizations
-            var literal = PartiallyEvaluate(arg);
-            UnaryOpExpr u = arg.Resolved as UnaryOpExpr;
-            MemberSelectExpr m = arg.Resolved as MemberSelectExpr;
-            if (literal != null) {
-              // Optimize constant to avoid intermediate BigInteger
-              EmitNativeIntegerLiteral((BigInteger)literal, toNative, wr);
-            } else if (u != null && u.Op == UnaryOpExpr.Opcode.Cardinality) {
-              // Optimize || to avoid intermediate BigInteger
-              wr.Write(CastIfSmallNativeType(toType));
-              TrParenExpr("", u.E, wr, inLetExprBody, wStmts);
-              wr.Write(".cardinalityInt()");
-            } else if (m != null && m.MemberName == "Length" && m.Obj.Type.IsArrayType) {
-              // Optimize .length to avoid intermediate BigInteger
-              wr.Write(CastIfSmallNativeType(toType));
-              var elmtType = UserDefinedType.ArrayElementType(m.Obj.Type);
-              ConcreteSyntaxTree w;
-              if (elmtType.IsTypeParameter) {
-                wr.Write($"{FormatTypeDescriptorVariable(elmtType.AsTypeParameter)}.getArrayLength(");
-                w = wr.Fork();
-                wr.Write(")");
-              } else {
-                w = wr.Fork();
-                wr.Write(".length");
-              }
-              TrParenExpr(m.Obj, w, inLetExprBody, wStmts);
-            } else {
-              // no optimization applies; use the standard translation
-              if (fromNative != null && fromNative.LowerBound >= 0 && NativeTypeSize(fromNative) < NativeTypeSize(toNative)) {
-                // Widening an unsigned value; careful!!
-                wr.Write($"{CastIfSmallNativeType(e.ToType)}{GetBoxedNativeTypeName(fromNative)}");
-                if (NativeTypeSize(toNative) == 64) {
-                  wr.Write(".toUnsignedLong");
-                } else {
-                  wr.Write(".toUnsignedInt");
-                }
-                TrParenExpr(arg, wr, inLetExprBody, wStmts);
-              } else {
-                if (fromNative == null && !fromType.IsCharType) {
-                  TrParenExpr(arg, wr, inLetExprBody, wStmts);
-                  wr.Write($".{toNativeName}Value()");
-                } else {
-                  wr.Write($"(({toNativeName}) ");
-                  TrParenExpr(arg, wr, inLetExprBody, wStmts);
-                  wr.Write(")");
-                }
-              }
-            }
-          }
-        }
-      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
-        Contract.Assert(AsNativeType(fromType) == null);
-        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // real -> real
-          Contract.Assert(AsNativeType(toType) == null);
-          wr.Append(Expr(arg, inLetExprBody, wStmts));
-        } else if (toType.IsCharType) {
-          // real -> char
-          // Painfully, Java sign-extends bytes when casting to chars ...
-          wr.Write($"({CharTypeName(false)})");
-          TrParenExpr(arg, wr, inLetExprBody, wStmts);
-          wr.Write(".ToBigInteger().intValue()");
-        } else if (toType.IsBigOrdinalType) {
-          TrParenExpr(arg, wr, inLetExprBody, wStmts);
-          wr.Write(".ToBigInteger()");
-        } else {
-          // real -> (int or bv)
-          TrParenExpr(arg, wr, inLetExprBody, wStmts);
-          wr.Write(".ToBigInteger()");
-          if (AsNativeType(toType) != null) {
-            wr.Write($".{GetNativeTypeName(AsNativeType(toType))}Value()");
-          }
-        }
-      } else if (fromType.IsBigOrdinalType) {
-        if (toType.IsNumericBased(Type.NumericPersuasion.Int) || toType.IsCharType) {
-          // ordinal -> int, char
-          if (AsNativeType(toType) != null) {
-            TrParenExpr(arg, wr, inLetExprBody, wStmts);
-            wr.Write($".{GetNativeTypeName(AsNativeType(toType))}Value()");
-          } else if (toType.IsCharType) {
-            wr.Write($"({CharTypeName(false)})");
-            TrParenExpr(arg, wr, inLetExprBody, wStmts);
-            wr.Write(".intValue()");
-          } else {
-            TrParenExpr(arg, wr, inLetExprBody, wStmts);
-          }
-        } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // ordinal -> real
-          wr.Write($"new {DafnyBigRationalClass}(");
-          wr.Append(Expr(arg, inLetExprBody, wStmts));
-          wr.Write(", java.math.BigInteger.ONE)");
-        } else if (toType.IsBitVectorType) {
-          // ordinal -> bv
-          if (AsNativeType(toType) != null) {
-            TrParenExpr(arg, wr, inLetExprBody, wStmts);
-            wr.Write($".{GetNativeTypeName(AsNativeType(toType))}Value()");
-          } else {
-            TrParenExpr(arg, wr, inLetExprBody, wStmts);
-          }
-        } else if (toType.IsBigOrdinalType) {
-          TrParenExpr(arg, wr, inLetExprBody, wStmts);
-        } else {
-          Contract.Assert(false, $"not implemented for java: {fromType} -> {toType}");
-        }
-      } else {
-        Contract.Assert(false, $"not implemented for java: {fromType} -> {toType}");
-      }
-    }
-
-    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IToken tok, ConcreteSyntaxTree wr) {
-      Contract.Requires(fromType.IsRefType);
-      Contract.Requires(toType.IsRefType);
-
-      // from T to U:   t instanceof U && ...
-      // from T to U?:  t instanceof U && ...                 // since t is known to be non-null, this is fine
-      // from T? to U:  t instanceof U && ...                 // note, "instanceof" implies non-null, so no need for explicit null check
-      // from T? to U?: t == null || (t instanceof U && ...)
-      if (fromType.IsRefType && !fromType.IsNonNullRefType && toType.IsRefType && !toType.IsNonNullRefType) {
-        wr = wr.Write($"{localName} == null || ").ForkInParens();
-      }
-
-      if (toType.IsObjectQ) {
-        wr.Write("true");
-      } else {
-        var typeName = toType.IsObject ? "Object" : FullTypeName((UserDefinedType)toType.NormalizeExpand());
-        wr.Write($"{localName} instanceof {typeName}");
-        localName = $"(({typeName}){localName})";
-      }
-
-      var udtTo = (UserDefinedType)toType.NormalizeExpandKeepConstraints();
-      if (udtTo.ResolvedClass is SubsetTypeDecl && !(udtTo.ResolvedClass is NonNullTypeDecl)) {
-        // TODO: test constraints
-        throw new UnsupportedFeatureException(tok, Feature.SubsetTypeTests);
-      }
-    }
-
-    protected override bool IssueCreateStaticMain(Method m) {
-      return true;
-    }
-    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
-      var wr = ((ClassWriter)cw).StaticMemberWriter;
-      return wr.NewBlock($"public static void __Main(dafny.DafnySequence<? extends dafny.DafnySequence<? extends {CharTypeName(true)}>> {argsParameterName})");
-    }
-
-    protected override void CreateIIFE(string bvName, Type bvType, IToken bvTok, Type bodyType, IToken bodyTok,
-      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
-      wr = EmitCoercionIfNecessary(NativeObjectType, bodyType, bvTok, wr);
-      var boxedBvType = BoxedTypeName(bvType, wr, bvTok);
-      wr.Write("{0}.<{1}, {2}>Let(", DafnyHelpersClass, boxedBvType, BoxedTypeName(bodyType, wr, bodyTok));
-      wrRhs = wr.Fork();
-      wrRhs = EmitCoercionIfNecessary(bvType, NativeObjectType, bvTok, wrRhs);
-
-      var boxedBvName = idGenerator.FreshId("boxed");
-      wr.Write($", {boxedBvName} ->");
-      var wrBodyWithCoercion = wr.NewBlock();
-      wrBodyWithCoercion.Write($"{TypeName(bvType, wr, bvTok)} {bvName} = ");
-      var wrUnboxed = EmitCoercionIfNecessary(NativeObjectType, bvType, bvTok, wrBodyWithCoercion.Fork());
-      wrUnboxed.Write(boxedBvName);
-      wrBodyWithCoercion.WriteLine(";");
-
-      wrBodyWithCoercion.Write("return ");
-      wrBody = wrBodyWithCoercion.Fork();
-      wrBody = EmitCoercionIfNecessary(bodyType, NativeObjectType, bodyTok, wrBody);
-      wrBodyWithCoercion.WriteLine(";");
-      wr.Write(")");
-    }
-
-    protected override string GetQuantifierName(string bvType) {
-      return $"{DafnyHelpersClass}.Quantifier";
-    }
-
-    // ABSTRACT METHOD DECLARATIONS FOR THE SAKE OF BUILDING PROGRAM
-
-    protected override void EmitYield(ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(Token.NoToken, Feature.Iterators);
-    }
-
-    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
-      throw new UnsupportedFeatureException(iter.tok, Feature.Iterators);
-    }
-
-    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
-      var tryBlock = wr.NewBlock("try");
-      TrStmt(body, tryBlock);
-      var catchBlock = wr.NewBlock("catch (dafny.DafnyHaltException e)");
-      catchBlock.WriteLine($"dafny.DafnySequence<Character> {haltMessageVarName} = dafny.DafnySequence.asString(e.getMessage());");
-      TrStmt(recoveryBody, catchBlock);
-    }
-  }
-}
diff --git a/Source/DafnyCore/Compilers/JavaScript/Compiler-js.cs b/Source/DafnyCore/Compilers/JavaScript/Compiler-js.cs
deleted file mode 100644
index fa7f0465afc..00000000000
--- a/Source/DafnyCore/Compilers/JavaScript/Compiler-js.cs
+++ /dev/null
@@ -1,2556 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-//
-//-----------------------------------------------------------------------------
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.IO;
-using System.Diagnostics.Contracts;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Text;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-
-namespace Microsoft.Dafny.Compilers {
-  class JavaScriptCompiler : SinglePassCompiler {
-    public JavaScriptCompiler(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
-    }
-
-    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
-      Feature.MethodSynthesis,
-      Feature.ExternalConstructors,
-      Feature.SubsetTypeTests,
-      Feature.SeparateCompilation
-    };
-
-    const string DafnySetClass = "_dafny.Set";
-    const string DafnyMultiSetClass = "_dafny.MultiSet";
-    const string DafnySeqClass = "_dafny.Seq";
-    const string DafnyMapClass = "_dafny.Map";
-
-    string FormatDefaultTypeParameterValue(TopLevelDecl tp) {
-      Contract.Requires(tp is TypeParameter || tp is AbstractTypeDecl);
-      return $"_default_{tp.GetCompileName(Options)}";
-    }
-
-    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
-      wr.WriteLine("// Dafny program {0} compiled into JavaScript", program.Name);
-      if (Options.IncludeRuntime) {
-        ReadRuntimeSystem(program, "DafnyRuntime.js", wr);
-      }
-    }
-
-    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
-      Coverage.EmitSetup(wr);
-      wr.WriteLine($"_dafny.HandleHaltExceptions(() => {mainMethod.EnclosingClass.GetFullCompileName(Options)}.{(mainMethod.IsStatic ? IdName(mainMethod) : "Main")}(_dafny.{CharMethodQualifier}FromMainArguments(require('process').argv)));");
-      Coverage.EmitTearDown(wr);
-    }
-
-    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
-      var wr = (cw as JavaScriptCompiler.ClassWriter).MethodWriter;
-      return wr.NewBlock($"static Main({argsParameterName})");
-    }
-
-    protected override ConcreteSyntaxTree CreateModule(string moduleName, bool isDefault, bool isExtern, string/*?*/ libraryName, ConcreteSyntaxTree wr) {
-      moduleName = IdProtect(moduleName);
-      if (!isExtern || libraryName != null) {
-        wr.Write("let {0} = ", moduleName);
-      }
-
-      string footer = ")(); // end of module " + moduleName;
-      var block = wr.NewBlock("(function()", footer);
-      var beforeReturnBody = block.Fork(0);
-      if (!isExtern) {
-        // create new module here
-        beforeReturnBody.WriteLine("let $module = {};");
-      } else if (libraryName == null) {
-        // extend a module provided in another .js file
-        beforeReturnBody.WriteLine("let $module = {0};", moduleName);
-      } else {
-        // require a library
-        beforeReturnBody.WriteLine("let $module = require(\"{0}\");", libraryName);
-      }
-      block.WriteLine("return $module;");
-      return beforeReturnBody;
-    }
-
-    protected override string GetHelperModuleName() => "_dafny";
-
-    protected override IClassWriter CreateClass(string moduleName, string name, bool isExtern, string/*?*/ fullPrintName,
-      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type>/*?*/ superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      var w = wr.NewBlock(string.Format("$module.{0} = class {0}" + (isExtern ? " extends $module.{0}" : ""), name), ";");
-      w.Write("constructor (");
-      var sep = "";
-      if (typeParameters != null && WriteRuntimeTypeDescriptorsFormals(typeParameters, false, w) > 0) {
-        sep = ", ";
-      }
-      if (cls is NewtypeDecl { ParentTraits: { } parentTraits } && parentTraits.Count > 0) {
-        w.Write($"{sep}value");
-      }
-      var fieldWriter = w.NewBlock(")");
-      if (isExtern) {
-        fieldWriter.Write("super(");
-        if (typeParameters != null) {
-          WriteRuntimeTypeDescriptorsFormals(typeParameters, false, w);
-        }
-        fieldWriter.WriteLine(");");
-      }
-      if (fullPrintName != null) {
-        fieldWriter.WriteLine("this._tname = \"{0}\";", fullPrintName);
-      }
-      if (typeParameters != null) {
-        foreach (var tp in typeParameters) {
-          if (NeedsTypeDescriptor(tp)) {
-            fieldWriter.WriteLine("this.{0} = {0};", "rtd$_" + tp.GetCompileName(Options));
-          }
-        }
-      }
-      if (superClasses != null) {
-        superClasses = superClasses.Where(trait => !trait.IsObject).ToList();
-        var parentTraitsWriter = w.NewBlock("_parentTraits()");
-        parentTraitsWriter.WriteLine("return [{0}];", Util.Comma(superClasses, parent => TypeName(parent, parentTraitsWriter, tok)));
-      }
-      var methodWriter = w;
-      return new ClassWriter(this, methodWriter, fieldWriter);
-    }
-
-    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
-      TraitDecl trait, List<Type> superClasses /*?*/, IToken tok, ConcreteSyntaxTree wr) {
-      var w = wr.NewBlock(string.Format("$module.{0} = class {0}", IdProtect(name)), ";");
-      var fieldWriter = w;  // not used for traits, but we need a value to give to the ClassWriter
-      var methodWriter = w;
-      return new ClassWriter(this, methodWriter, fieldWriter);
-    }
-
-    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
-      // An iterator is compiled as follows:
-      //   public class MyIteratorExample
-      //   {
-      //     public T q;  // in-parameter
-      //     public T x;  // yield-parameter
-      //     public int y;  // yield-parameter
-      //     IEnumerator<object> _iter;
-      //
-      //     public void _MyIteratorExample(T q) {
-      //       this.q = q;
-      //       _iter = TheIterator();
-      //     }
-      //
-      //     public void MoveNext(out bool more) {
-      //       more =_iter.MoveNext();
-      //     }
-      //
-      //     private IEnumerator<object> TheIterator() {
-      //       // the translation of the body of the iterator, with each "yield" turning into a "yield return null;"
-      //       yield break;
-      //     }
-      //   }
-
-      var cw = CreateClass(IdProtect(iter.EnclosingModuleDefinition.GetCompileName(Options)), IdName(iter), iter, wr) as JavaScriptCompiler.ClassWriter;
-      var w = cw.MethodWriter;
-      var instanceFieldsWriter = cw.FieldWriter;
-      // here come the fields
-      Constructor ct = null;
-      foreach (var member in iter.Members) {
-        var f = member as Field;
-        if (f != null && !f.IsGhost) {
-          DeclareField(IdName(f), false, false, f.Type, f.tok, PlaceboValue(f.Type, instanceFieldsWriter, f.tok, true), instanceFieldsWriter);
-        } else if (member is Constructor) {
-          Contract.Assert(ct == null);  // we're expecting just one constructor
-          ct = (Constructor)member;
-        }
-      }
-      Contract.Assert(ct != null);  // we do expect a constructor
-      instanceFieldsWriter.WriteLine("this._iter = undefined;");
-
-      // here's the initializer method
-      w.Write("{0}(", IdName(ct));
-      string sep = "";
-      foreach (var p in ct.Ins) {
-        if (!p.IsGhost) {
-          // here we rely on the parameters and the corresponding fields having the same names
-          w.Write("{0}{1}", sep, IdName(p));
-          sep = ", ";
-        }
-      }
-      {
-        var wBody = w.NewBlock(")");
-        foreach (var p in ct.Ins) {
-          if (!p.IsGhost) {
-            wBody.WriteLine("this.{0} = {0};", IdName(p));
-          }
-        }
-        wBody.WriteLine("this.__iter = this.TheIterator();");
-      }
-      // here are the enumerator methods
-      {
-        var wBody = w.NewBlock("MoveNext()");
-        wBody.WriteLine("let r = this.__iter.next();");
-        wBody.WriteLine("return !r.done;");
-      }
-      var wIter = w.NewBlock("*TheIterator()");
-      wIter.WriteLine("let _this = this;");
-      return wIter;
-    }
-
-    protected override IClassWriter/*?*/ DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
-      // ===== For inductive datatypes:
-      //
-      // $module.Dt = class Dt {
-      //   constructor(tag) {
-      //     this.$tag = tag;
-      //   }
-      //   static create_Ctor0(field0, field1, ...) {
-      //     let $dt = new Dt(0);
-      //     $dt.field0 = field0;
-      //     $dt.field1 = field1;
-      //     ...
-      //     return $dt;
-      //   }
-      //   static create_Ctor1(...) {
-      //     let $dt = new Dt(1);
-      //     ...
-      //   }
-      //   ...
-      //
-      //   get is_Ctor0 { return this.$tag === 0; }
-      //   get is_Ctor1 { return this.$tag === 1; }
-      //   ...
-      //
-      //   static get AllSingletonConstructors() {
-      //     return this.AllSingletonConstructors_();
-      //   }
-      //   static *AllSingletonConstructors_() {
-      //     yield Berry.create_Ctor0();
-      //     ...
-      //   }
-      //
-      //   get dtor_Dtor0() { return this.Dtor0; }
-      //   get dtor_Dtor1() { return this.Dtor1; }
-      //   ...
-      //
-      //   toString() {
-      //     ...
-      //   }
-      //   equals(other) {
-      //     ...
-      //   }
-      //   static Rtd(rtd...) {
-      //     return class {
-      //       static get Default() { return Dt.create_CtorK(...); }
-      //     };
-      //   }
-      // }
-      //
-      // ===== For co-inductive datatypes:
-      //
-      // $module.Dt = class Dt {
-      //   constructor(tag) {
-      //     this.$tag = tag;
-      //   }
-      //   _D() {
-      //     if (this._d === undefined) {
-      //       this._d = this._initializer(this);
-      //       delete this._initializer;
-      //     }
-      //     return this._d;
-      //   }
-      //   static create_Ctor0($dt, field0, field1, ...) {
-      //     if ($dt === null) {
-      //       $dt = new Dt(0);
-      //       $dt._d = $dt;
-      //     }
-      //     $dt.field0 = field0;
-      //     $dt.field1 = field1;
-      //     ...
-      //     return $dt;
-      //   }
-      //   static lazy_Ctor0(initializer) {
-      //     let dt = new Dt(0);
-      //     dt._initializer = initializer;
-      //     return dt;
-      //   }
-      //   static create_Ctor1(initializer) {
-      //     let $dt = new Dt(1);
-      //     ...
-      //   }
-      //   ...
-      //
-      //   get is_Ctor0() { return this.$tag === 0; }
-      //   get is_Ctor1() { return this.$tag === 1; }
-      //   ...
-      //
-      //   static get AllSingletonConstructors() {
-      //     return this.AllSingletonConstructors_();
-      //   }
-      //   static *AllSingletonConstructors_() {
-      //     yield Berry.create_Ctor0(null);
-      //     ...
-      //   }
-      //
-      //   get dtor_Dtor0() { return this._D().Dtor0; }
-      //   get dtor_Dtor1() { return this._D().Dtor1; }
-      //   ...
-      //
-      //   toString() {
-      //     if ($tag == 0) {
-      //       return "module.Dt.Ctor0";
-      //     } else if ...
-      //   }
-      //   equals(other) {
-      //     ...
-      //   }
-      //   static Rtd(rtd...) {
-      //     return class {
-      //       static get Default() { return Dt.create_CtorK(...); }
-      //     };
-      //   }
-      // }
-      if (dt is TupleTypeDecl) {
-        // Tuple types are declared once and for all in DafnyRuntime.js
-        return null;
-      }
-
-      string DtT = dt.GetCompileName(Options);
-      string DtT_protected = IdProtect(DtT);
-      var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, UserDefinedType.FromTopLevelDecl(dt.tok, dt));
-
-      // from here on, write everything into the new block created here:
-      var btw = wr.NewNamedBlock("$module.{0} = class {0}", DtT_protected);
-      wr = btw;
-
-      var wTypeDescriptors = new ConcreteSyntaxTree();
-      var typeDescriptorComma = WriteRuntimeTypeDescriptorsFormals(dt.TypeArgs, false, wTypeDescriptors) != 0 ? ", " : "";
-      var typeDescriptors = wTypeDescriptors.ToString();
-
-      var wBody = wr.NewBlock($"constructor(tag{typeDescriptorComma}{typeDescriptors})");
-      wBody.WriteLine("this.$tag = tag;");
-      foreach (var tp in dt.TypeArgs.Where(NeedsTypeDescriptor)) {
-        wBody.WriteLine("this.{0} = {0};", "rtd$_" + tp.GetCompileName(Options));
-      }
-
-      if (dt is CoDatatypeDecl) {
-        var w0 = wr.NewBlock("_D()");
-        var w1 = EmitIf("this._d === undefined", false, w0);
-        w1.WriteLine("this._d = this._initializer(this);");
-        w1.WriteLine("delete this._initializer;");
-        w0.WriteLine("return this._d");
-      }
-
-      // create methods
-      var i = 0;
-      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-        // collect the names of non-ghost arguments
-        var argNames = new List<string>();
-        var k = 0;
-        foreach (var formal in ctor.Formals) {
-          if (!formal.IsGhost) {
-            argNames.Add(FormalName(formal, k));
-            k++;
-          }
-        }
-        // datatype:
-        //   static create_Ctor0(params) { let $dt = new Dt(tag); $dt.param0 = param0; ...; return $dt; }
-        // codatatype:
-        //   static create_Ctor0(params) { if ($dt === null) { $dt = new Dt(tag); $dt._d = $dt; } $dt.param0 = param0; ...; return $dt; }
-        //   static lazy_Ctor0(initializer) { let dt = new Dt(tag); dt._initializer = initializer; return dt; }
-        wr.Write($"static create_{ctor.GetCompileName(Options)}(");
-        wr.Write(typeDescriptors);
-        var sep = typeDescriptorComma;
-        if (dt is CoDatatypeDecl) {
-          wr.Write($"{sep}$dt");
-          sep = ", ";
-        }
-        if (argNames.Count != 0) {
-          wr.Write(sep);
-        }
-        wr.Write(Util.Comma(argNames, nm => nm));
-        var w = wr.NewBlock(")");
-        if (dt is CoDatatypeDecl) {
-          var wThen = EmitIf("$dt === null", false, w);
-          wThen.WriteLine($"$dt = new {DtT_protected}({i}{typeDescriptorComma}{typeDescriptors});");
-          wThen.WriteLine("$dt._d = $dt;");
-        } else {
-          w.WriteLine($"let $dt = new {DtT_protected}({i}{typeDescriptorComma}{typeDescriptors});");
-        }
-        foreach (var arg in argNames) {
-          w.WriteLine("$dt.{0} = {0};", arg);
-        }
-        w.WriteLine("return $dt;");
-        if (dt is CoDatatypeDecl) {
-          wBody = wr.NewNamedBlock("static lazy_{0}(initializer)", ctor.GetCompileName(Options));
-          wBody.WriteLine("let dt = new {0}({1});", DtT_protected, i);
-          wBody.WriteLine("dt._initializer = initializer;");
-          wBody.WriteLine("return dt;");
-        }
-        i++;
-      }
-
-      // query properties
-      i = 0;
-      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-        // get is_Ctor0() { return _D is Dt_Ctor0; }
-        wr.WriteLine("get is_{0}() {{ return this.$tag === {1}; }}", ctor.GetCompileName(Options), i);
-        i++;
-      }
-
-      if (dt.HasFinitePossibleValues) {
-        Contract.Assert(dt.TypeArgs.Count == 0);
-        {
-          var w = wr.NewNamedBlock("static get AllSingletonConstructors()");
-          w.WriteLine("return this.AllSingletonConstructors_();");
-        }
-        {
-          var w = wr.NewNamedBlock("static *AllSingletonConstructors_()");
-          foreach (var ctor in dt.Ctors) {
-            Contract.Assert(ctor.Formals.Count == 0);
-            if (ctor.IsGhost) {
-              w.WriteLine("yield {0};", ForcePlaceboValue(UserDefinedType.FromTopLevelDecl(dt.tok, dt), w, dt.tok));
-            } else {
-              w.WriteLine("yield {0}.create_{1}({2});", DtT_protected, ctor.GetCompileName(Options), dt is CoDatatypeDecl ? "null" : "");
-            }
-          }
-        }
-      }
-
-      // destructors
-      foreach (var ctor in dt.Ctors) {
-        foreach (var dtor in ctor.Destructors.Where(dtor => dtor.EnclosingCtors[0] == ctor)) {
-          var compiledConstructorCount = dtor.EnclosingCtors.Count(constructor => !constructor.IsGhost);
-          if (compiledConstructorCount != 0) {
-            var arg = dtor.CorrespondingFormals[0];
-            if (!arg.IsGhost && arg.HasName) {
-              // datatype:   get dtor_Dtor0() { return this.Dtor0; }
-              // codatatype: get dtor_Dtor0() { return this._D().Dtor0; }
-              wr.WriteLine("get dtor_{0}() {{ return this{2}.{1}; }}", arg.CompileName, IdName(arg), dt is CoDatatypeDecl ? "._D()" : "");
-            }
-          }
-        }
-      }
-
-      if (dt is CoDatatypeDecl) {
-        // toString method
-        var w = wr.NewBlock("toString()");
-        i = 0;
-        foreach (var ctor in dt.Ctors) {
-          var thn = EmitIf(string.Format("this.$tag === {0}", i), true, w);
-          var nm = (dt.EnclosingModuleDefinition.IsDefaultModule ? "" : dt.EnclosingModuleDefinition.Name + ".") +
-                   dt.Name + "." + ctor.Name;
-          thn.WriteLine("return \"{0}\";", nm);
-          i++;
-        }
-        var els = w.NewBlock("");
-        els.WriteLine("return \"{0}.{1}.unexpected\";", dt.EnclosingModuleDefinition.GetCompileName(Options), DtT);
-
-      } else if (dt is IndDatatypeDecl) {
-        // toString method
-        var w = wr.NewBlock("toString()");
-        i = 0;
-        foreach (var ctor in dt.Ctors) {
-          var cw = EmitIf(string.Format("this.$tag === {0}", i), true, w);
-          var nm = (dt.EnclosingModuleDefinition.IsDefaultModule ? "" : dt.EnclosingModuleDefinition.Name + ".") +
-                   dt.Name + "." + ctor.Name;
-          cw.Write("return \"{0}\"", nm);
-          var sep = " + \"(\" + ";
-          var anyFormals = false;
-          var k = 0;
-          foreach (var arg in ctor.Formals) {
-            if (!arg.IsGhost) {
-              anyFormals = true;
-              if (arg.Type.IsStringType && UnicodeCharEnabled) {
-                cw.Write("{0}this.{1}.toVerbatimString(true)", sep, FormalName(arg, k));
-              } else {
-                cw.Write("{0}_dafny.toString(this.{1})", sep, FormalName(arg, k));
-              }
-
-              sep = " + \", \" + ";
-              k++;
-            }
-          }
-
-          if (anyFormals) {
-            cw.Write(" + \")\"");
-          }
-
-          cw.WriteLine(";");
-          i++;
-        }
-
-        var wElse = w.NewBlock("");
-        wElse.WriteLine("return \"<unexpected>\";");
-      }
-
-      // equals method
-      {
-        var w = wr.NewBlock("equals(other)");
-        {
-          var thn = EmitIf("this === other", true, w);
-          EmitReturnExpr("true", thn);
-        }
-        i = 0;
-        foreach (var ctor in dt.Ctors) {
-          var thn = EmitIf(string.Format("this.$tag === {0}", i), true, w);
-          var guard = EmitReturnExpr(thn);
-          guard.Write("other.$tag === {0}", i);
-          var k = 0;
-          foreach (Formal arg in ctor.Formals) {
-            if (!arg.IsGhost) {
-              string nm = FormalName(arg, k);
-              if (IsDirectlyComparable(DatatypeWrapperEraser.SimplifyType(Options, arg.Type))) {
-                guard.Write(" && this.{0} === other.{0}", nm);
-              } else {
-                guard.Write(" && _dafny.areEqual(this.{0}, other.{0})", nm);
-              }
-              k++;
-            }
-          }
-          i++;
-        }
-        var els = w.NewBlock("");
-        els.WriteLine("return false; // unexpected");
-      }
-
-      // static Default(defaultValues...) {  // where defaultValues are the parameters to the grounding constructor
-      //   return Dt.create_GroundingCtor(defaultValues...);
-      // }
-      wr.Write($"static Default(");
-      var usedTypeParameters = UsedTypeParameters(dt);
-      if (WriteRuntimeTypeDescriptorsFormals(dt.TypeArgs, false, wr) != 0 && usedTypeParameters.Count != 0) {
-        wr.Write(", ");
-      }
-      wr.Write(usedTypeParameters.Comma(FormatDefaultTypeParameterValue));
-      {
-        var wDefault = wr.NewBlock(")");
-        wDefault.Write("return ");
-        var groundingCtor = dt.GetGroundingCtor();
-        if (groundingCtor.IsGhost) {
-          wDefault.Write(ForcePlaceboValue(simplifiedType, wDefault, dt.tok));
-        } else if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
-          wDefault.Write(DefaultValue(innerType, wDefault, dt.tok));
-        } else {
-          var nonGhostFormals = groundingCtor.Formals.Where(f => !f.IsGhost).ToList();
-          var arguments = nonGhostFormals.Comma(f => DefaultValue(f.Type, wDefault, f.tok));
-          EmitDatatypeValue(dt, groundingCtor, dt is CoDatatypeDecl, typeDescriptors, arguments, wDefault);
-        }
-        wDefault.WriteLine(";");
-      }
-
-      // Note: It is important that the following be a class with a static getter Default(), as opposed
-      // to a simple "{ Default: ... }" object, because we need for any recursive calls in the default
-      // expression to be evaluated lazily. (More precisely, not evaluated at all, but that will sort
-      // itself out due to the restrictions placed by the resolver.)
-      //
-      // static Rtd(rtd...) {
-      //   return class {
-      //     static get Default() { return Dt.create_CtorK(...); }
-      //   };
-      // }
-      wr.Write("static Rtd(");
-      WriteRuntimeTypeDescriptorsFormals(UsedTypeParameters(dt, true), true, wr);
-      var wRtd = wr.NewBlock(")");
-      var wClass = wRtd.NewBlock("return class", ";");
-      {
-        var wDefault = wClass.NewBlock("static get Default()");
-        var sep = typeDescriptors.Length != 0 && usedTypeParameters.Count != 0 ? ", " : "";
-        var arguments = usedTypeParameters.Comma(
-          tp => DefaultValue(new UserDefinedType(tp), wDefault, dt.tok, true));
-        wDefault.WriteLine($"return {DtT_protected}.Default({typeDescriptors}{typeDescriptorComma}{arguments});");
-      }
-
-      return new ClassWriter(this, btw, btw);
-    }
-
-    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
-      var cw = (ClassWriter)CreateClass(IdProtect(nt.EnclosingModuleDefinition.GetCompileName(Options)), IdName(nt), nt, wr);
-      var w = cw.MethodWriter;
-      if (nt.NativeType != null) {
-        var wIntegerRangeBody = w.NewBlock("static *IntegerRange(lo, hi)");
-        var wLoopBody = wIntegerRangeBody.NewBlock("while (lo.isLessThan(hi))");
-        wLoopBody.WriteLine("yield lo.toNumber();");
-        EmitIncrementVar("lo", wLoopBody);
-      }
-      if (nt.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-        var witness = new ConcreteSyntaxTree(w.RelativeIndentLevel);
-        var wStmts = w.Fork();
-        if (nt.NativeType == null) {
-          witness.Append(Expr(nt.Witness, false, wStmts));
-        } else {
-          TrParenExpr(nt.Witness, witness, false, wStmts);
-          witness.Write(".toNumber()");
-        }
-        DeclareField("Witness", true, true, nt.BaseType, nt.tok, witness.ToString(), w);
-      }
-      // In JavaScript, the companion class of a newtype (which is what is being declared here) doubles as a
-      // type descriptor for the newtype. The Default() method for that type descriptor is declared here.
-      var wDefault = w.NewBlock("static get Default()");
-      var udt = new UserDefinedType(nt.tok, nt.Name, nt, new List<Type>());
-      var d = TypeInitializationValue(udt, wr, nt.tok, false, false);
-      wDefault.WriteLine("return {0};", d);
-
-      if (nt.ParentTraits.Count != 0) {
-        // in constructor:
-        //   this._value = value;
-        cw.FieldWriter.WriteLine("this._value = value;");
-
-        // toString() {
-        //   return _dafny.toString(this._value)
-        // }
-        var wBody = cw.MethodWriter.NewNamedBlock("toString()");
-        wBody.WriteLine("return _dafny.toString(this._value)");
-      }
-
-      return cw;
-    }
-
-    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
-      var cw = (ClassWriter)CreateClass(IdProtect(sst.EnclosingModuleDefinition.GetCompileName(Options)), IdName(sst), sst, wr);
-      var w = cw.MethodWriter;
-      var udt = UserDefinedType.FromTopLevelDecl(sst.tok, sst);
-      string d;
-      if (sst.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-        var sw = new ConcreteSyntaxTree(w.RelativeIndentLevel);
-        var wStmts = w.Fork();
-        sw.Append(Expr(sst.Witness, false, wStmts));
-        DeclareField("Witness", true, true, sst.Rhs, sst.tok, sw.ToString(), w);
-        d = TypeName_UDT(FullTypeName(udt), udt, wr, udt.tok) + ".Witness";
-      } else {
-        d = TypeInitializationValue(udt, wr, sst.tok, false, false);
-      }
-      w.NewBlock("static get Default()").WriteLine($"return {d};");
-    }
-
-    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
-      literalSuffix = "";
-      needsCastAfterArithmetic = false;
-      switch (sel) {
-        case NativeType.Selection.Number:
-          name = "number";
-          break;
-        default:
-          Contract.Assert(false);  // unexpected native type
-          throw new cce.UnreachableException();  // to please the compiler
-      }
-    }
-
-    protected class ClassWriter : IClassWriter {
-      public readonly JavaScriptCompiler Compiler;
-      public readonly ConcreteSyntaxTree MethodWriter;
-      public readonly ConcreteSyntaxTree FieldWriter;
-
-      public ClassWriter(JavaScriptCompiler compiler, ConcreteSyntaxTree methodWriter, ConcreteSyntaxTree fieldWriter) {
-        Contract.Requires(compiler != null);
-        Contract.Requires(methodWriter != null);
-        Contract.Requires(fieldWriter != null);
-        this.Compiler = compiler;
-        this.MethodWriter = methodWriter;
-        this.FieldWriter = fieldWriter;
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateMethod(m, typeArgs, createBody, MethodWriter, forBodyInheritance, lookasideBody);
-      }
-
-      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        throw new UnsupportedFeatureException(m.tok, Feature.MethodSynthesis);
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateFunction(name, typeArgs, formals, resultType, tok, isStatic, createBody, member, MethodWriter, forBodyInheritance, lookasideBody);
-      }
-      public ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IToken tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance) {
-        return Compiler.CreateGetter(name, resultType, tok, isStatic, createBody, MethodWriter);
-      }
-      public ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
-        return Compiler.CreateGetterSetter(name, resultType, tok, createBody, out setterWriter, MethodWriter);
-      }
-      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IToken tok, string rhs, Field field) {
-        Compiler.DeclareField(name, isStatic, isConst, type, tok, rhs, FieldWriter);
-      }
-      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
-        throw new cce.UnreachableException();  // InitializeField should be called only for those compilers that set ClassesRedeclareInheritedFields to false.
-      }
-      public ConcreteSyntaxTree/*?*/ ErrorWriter() => MethodWriter;
-      public void Finish() { }
-    }
-
-    protected override bool SupportsStaticsInGenericClasses => false;
-
-    protected ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
-      if (!createBody) {
-        return null;
-      }
-
-      var customReceiver = !forBodyInheritance && NeedsCustomReceiver(m);
-      wr.Write("{0}{1}(", m.IsStatic || customReceiver ? "static " : "", IdName(m));
-      var sep = "";
-      WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, m.EnclosingClass, m, lookasideBody), wr, ref sep, tp => $"rtd$_{tp.GetCompileName(Options)}");
-      if (customReceiver) {
-        var nt = m.EnclosingClass;
-        var receiverType = UserDefinedType.FromTopLevelDecl(m.tok, nt);
-        DeclareFormal(sep, "_this", receiverType, m.tok, true, wr);
-        sep = ", ";
-      }
-      WriteFormals(sep, m.Ins, wr);
-      var w = wr.NewBlock(")");
-
-      if (!m.IsStatic && !customReceiver) {
-        w.WriteLine("let _this = this;");
-      }
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree EmitMethodReturns(Method m, ConcreteSyntaxTree wr) {
-      var beforeReturnBlock = wr.Fork(0);
-      EmitReturn(m.Outs, wr);
-      return beforeReturnBlock;
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member, ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
-      if (!createBody) {
-        return null;
-      }
-
-      var customReceiver = !forBodyInheritance && NeedsCustomReceiver(member);
-      wr.Write("{0}{1}(", isStatic || customReceiver ? "static " : "", name);
-      var sep = "";
-      WriteRuntimeTypeDescriptorsFormals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, lookasideBody), wr, ref sep,
-        tp => $"rtd$_{tp.GetCompileName(Options)}");
-      if (customReceiver) {
-        var nt = member.EnclosingClass;
-        var receiverType = UserDefinedType.FromTopLevelDecl(tok, nt);
-        DeclareFormal(sep, "_this", receiverType, tok, true, wr);
-        sep = ", ";
-      }
-      WriteFormals(sep, formals, wr);
-      var w = wr.NewBlock(")", ";");
-      if (!isStatic && !customReceiver) {
-        w.WriteLine("let _this = this;");
-      }
-      return w;
-    }
-
-    int WriteRuntimeTypeDescriptorsFormals(List<TypeParameter> typeParams, bool useAllTypeArgs, ConcreteSyntaxTree wr, string prefix = "") {
-      Contract.Requires(typeParams != null);
-      Contract.Requires(wr != null);
-
-      int c = 0;
-      foreach (var tp in typeParams) {
-        if (useAllTypeArgs || NeedsTypeDescriptor(tp)) {
-          wr.Write($"{prefix}rtd$_{tp.GetCompileName(Options)}");
-          prefix = ", ";
-          c++;
-        }
-      }
-      return c;
-    }
-
-    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
-      if (cl is DatatypeDecl) {
-        needsTypeParameter = false;
-        needsTypeDescriptor = true;
-      } else if (cl is TraitDecl) {
-        needsTypeParameter = false;
-        needsTypeDescriptor = isStatic || lookasideBody;
-      } else {
-        Contract.Assert(cl is ClassDecl);
-        needsTypeParameter = false;
-        needsTypeDescriptor = isStatic;
-      }
-    }
-
-    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      Contract.Requires(type != null);
-      Contract.Requires(tok != null);
-      Contract.Requires(wr != null);
-
-      var xType = DatatypeWrapperEraser.SimplifyType(Options, type, true);
-      if (xType is BoolType) {
-        return "_dafny.Rtd_bool";
-      } else if (xType is CharType) {
-        return UnicodeCharEnabled ? "_dafny.Rtd_codepoint" : "_dafny.Rtd_char";
-      } else if (xType is IntType) {
-        return "_dafny.Rtd_int";
-      } else if (xType is BigOrdinalType) {
-        return "_dafny.BigOrdinal";
-      } else if (xType is RealType) {
-        return "_dafny.BigRational";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        if (t.NativeType != null) {
-          return "_dafny.Rtd_number";
-        } else {
-          return "_dafny.Rtd_int";
-        }
-      } else if (xType is SetType) {
-        return DafnySetClass;
-      } else if (xType is MultiSetType) {
-        return DafnyMultiSetClass;
-      } else if (xType is SeqType) {
-        return DafnySeqClass;
-      } else if (xType is MapType) {
-        return DafnyMapClass;
-      } else if (xType.IsBuiltinArrowType) {
-        return "_dafny.Rtd_ref";  // null suffices as a default value, since the function will never be called
-      } else if (xType is UserDefinedType) {
-        var udt = (UserDefinedType)xType;
-        if (udt.ResolvedClass is TypeParameter tp) {
-          var receiver = thisContext != null && tp.Parent is TopLevelDeclWithMembers and not TraitDecl ? "this." : "";
-          return string.Format($"{receiver}rtd$_{tp.GetCompileName(Options)}");
-        }
-        var cl = udt.ResolvedClass;
-        Contract.Assert(cl != null);
-        if (cl is ClassLikeDecl) {
-          return "_dafny.Rtd_ref";
-        } else if (cl is DatatypeDecl) {
-          var dt = (DatatypeDecl)cl;
-          var w = new ConcreteSyntaxTree();
-          w.Write("{0}.Rtd(", dt is TupleTypeDecl ? "_dafny.Tuple" : FullTypeName(udt));
-          EmitTypeDescriptorsActuals(UsedTypeParameters(dt, udt.TypeArgs, true), udt.tok, w, true);
-          w.Write(")");
-          return w.ToString();
-        } else if (xType.IsNonNullRefType) {
-          // what we emit here will only be used to construct a dummy value that programmer-supplied code will overwrite later
-          return "_dafny.Rtd_ref/*not used*/";
-        } else {
-          Contract.Assert(cl is NewtypeDecl || cl is SubsetTypeDecl);
-          return TypeName_UDT(FullTypeName(udt), udt, wr, udt.tok);
-        }
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateGetter(string name, Type resultType, IToken tok, bool isStatic, bool createBody, ConcreteSyntaxTree wr) {
-      if (createBody) {
-        wr.Write("{0}get {1}()", isStatic ? "static " : "", name);
-        var w = wr.NewBlock("", ";");
-        if (!isStatic) {
-          w.WriteLine("let _this = this;");
-        }
-        return w;
-      } else {
-        return null;
-      }
-    }
-
-    protected ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody, out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree wr) {
-      if (createBody) {
-        wr.Write($"get {name}()");
-        var wGet = wr.NewBlock("", ";");
-        wGet.WriteLine("let _this = this;");
-
-        wr.Write($"set {name}(value)");
-        var wSet = wr.NewBlock("", ";");
-        wSet.WriteLine("let _this = this;");
-
-        setterWriter = wSet;
-        return wGet;
-      } else {
-        setterWriter = null;
-        return null;
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
-      var block = wr.NewBlock("TAIL_CALL_START: while (true)");
-      if (member is Method m) {
-        var beforeReturnBlock = block.Fork(0);
-        EmitReturn(m.Outs, block);
-        return beforeReturnBlock;
-      }
-      return block;
-    }
-
-    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
-      wr.WriteLine("continue TAIL_CALL_START;");
-    }
-
-    private string CharFromNumberMethodName() {
-      return UnicodeCharEnabled ? "new _dafny.CodePoint" : "String.fromCharCode";
-    }
-
-    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl /*?*/ member = null) {
-      Contract.Ensures(Contract.Result<string>() != null);
-      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
-
-      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
-      if (xType is BoolType) {
-        return "bool";
-      } else if (xType is CharType) {
-        return "char";
-      } else if (xType is IntType || xType is BigOrdinalType) {
-        return "BigNumber";
-      } else if (xType is RealType) {
-        return "Dafny.BigRational";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        return t.NativeType != null ? GetNativeTypeName(t.NativeType) : "BigNumber";
-      } else if (xType.AsNewtype != null && member == null) {  // when member is given, use UserDefinedType case below
-        NativeType nativeType = xType.AsNewtype.NativeType;
-        if (nativeType != null) {
-          return GetNativeTypeName(nativeType);
-        }
-        return TypeName(xType.AsNewtype.BaseType, wr, tok);
-      } else if (xType.IsObjectQ) {
-        return "object";
-      } else if (xType.IsArrayType) {
-        return "Array";
-      } else if (xType is UserDefinedType udt) {
-        var s = FullTypeName(udt, member);
-        return TypeName_UDT(s, udt, wr, udt.tok);
-      } else if (xType is SetType) {
-        Type argType = ((SetType)xType).Arg;
-        return DafnySetClass;
-      } else if (xType is SeqType) {
-        Type argType = ((SeqType)xType).Arg;
-        return DafnySeqClass;
-      } else if (xType is MultiSetType) {
-        Type argType = ((MultiSetType)xType).Arg;
-        return DafnyMultiSetClass;
-      } else if (xType is MapType) {
-        return DafnyMapClass;
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IToken tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
-      if (usePlaceboValue) {
-        return "undefined";
-      }
-
-      var xType = type.NormalizeExpandKeepConstraints();
-
-      if (xType is BoolType) {
-        return "false";
-      } else if (xType is CharType) {
-        return $"{CharFromNumberMethodName()}({CharType.DefaultValueAsString}.codePointAt(0))";
-      } else if (xType is IntType || xType is BigOrdinalType) {
-        return IntegerLiteral(0);
-      } else if (xType is RealType) {
-        return "_dafny.BigRational.ZERO";
-      } else if (xType is BitvectorType) {
-        var t = (BitvectorType)xType;
-        return t.NativeType != null ? "0" : IntegerLiteral(0);
-      } else if (xType is SetType) {
-        return $"{DafnySetClass}.Empty";
-      } else if (xType is MultiSetType) {
-        return $"{DafnyMultiSetClass}.Empty";
-      } else if (xType is SeqType seq) {
-        if (seq.Arg.IsCharType) {
-          return "''";
-        }
-        return $"{DafnySeqClass}.of()";
-      } else if (xType is MapType) {
-        return $"{DafnyMapClass}.Empty";
-      }
-
-      var udt = (UserDefinedType)xType;
-      var cl = udt.ResolvedClass;
-      Contract.Assert(cl != null);
-      if (cl is TypeParameter) {
-        if (constructTypeParameterDefaultsFromTypeDescriptors) {
-          return string.Format("{0}.Default", TypeDescriptor(udt, wr, udt.tok));
-        } else {
-          return FormatDefaultTypeParameterValue((TypeParameter)udt.ResolvedClass);
-        }
-      } else if (cl is AbstractTypeDecl opaque) {
-        return FormatDefaultTypeParameterValue(opaque);
-      } else if (cl is NewtypeDecl) {
-        var td = (NewtypeDecl)cl;
-        if (td.Witness != null) {
-          return TypeName_UDT(FullTypeName(udt), udt, wr, udt.tok) + ".Witness";
-        } else if (td.NativeType != null) {
-          return "0";
-        } else {
-          return TypeInitializationValue(td.BaseType, wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-      } else if (cl is SubsetTypeDecl) {
-        var td = (SubsetTypeDecl)cl;
-        if (td.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-          return TypeName_UDT(FullTypeName(udt), udt, wr, udt.tok) + ".Default";
-        } else if (td.WitnessKind == SubsetTypeDecl.WKind.Special) {
-          // WKind.Special is only used with -->, ->, and non-null types:
-          Contract.Assert(ArrowType.IsPartialArrowTypeName(td.Name) || ArrowType.IsTotalArrowTypeName(td.Name) || td is NonNullTypeDecl);
-          if (ArrowType.IsPartialArrowTypeName(td.Name)) {
-            return "null";
-          } else if (ArrowType.IsTotalArrowTypeName(td.Name)) {
-            var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-            // return the lambda expression ((Ty0 x0, Ty1 x1, Ty2 x2) => rangeDefaultValue)
-            return string.Format("function () {{ return {0}; }}", rangeDefaultValue);
-          } else if (((NonNullTypeDecl)td).Class is ArrayClassDecl) {
-            // non-null array type; we know how to initialize them
-            var arrayClass = (ArrayClassDecl)((NonNullTypeDecl)td).Class;
-            if (arrayClass.Dims == 1) {
-              return "[]";
-            } else {
-              return string.Format("_dafny.newArray(undefined, {0})", Util.Comma(arrayClass.Dims, _ => "_dafny.ZERO"));
-            }
-          } else {
-            // non-null (non-array) type
-            // even though the type doesn't necessarily have a known initializer, it could be that the the compiler needs to
-            // lay down some bits to please the C#'s compiler's different definite-assignment rules.
-            return "null";
-          }
-        } else {
-          return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-        }
-      } else if (cl is ClassLikeDecl or ArrowTypeDecl) {
-        return "null";
-      } else if (cl is DatatypeDecl) {
-        var dt = (DatatypeDecl)cl;
-        var s = dt is TupleTypeDecl ? "_dafny.Tuple" : FullTypeName(udt);
-        var relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs).ConvertAll(ta => ta.Actual);
-
-        var wTypeDescriptors = new ConcreteSyntaxTree();
-        EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass(dt, udt.TypeArgs), tok, wTypeDescriptors);
-        var typeDescriptors = wTypeDescriptors.ToString();
-
-        var sep = typeDescriptors.Length != 0 && relevantTypeArgs.Count != 0 ? ", " : "";
-        var arguments = relevantTypeArgs.Comma(arg => DefaultValue(arg, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors));
-        return string.Format($"{s}.Default({typeDescriptors}{sep}{arguments})");
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-
-    }
-
-    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
-      ConcreteSyntaxTree wr, IToken tok, bool omitTypeArguments) {
-      Contract.Assume(fullCompileName != null);  // precondition; this ought to be declared as a Requires in the superclass
-      Contract.Assume(typeArgs != null);  // precondition; this ought to be declared as a Requires in the superclass
-      string s = IdProtect(fullCompileName);
-      return s;
-    }
-
-    protected override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member) {
-      // Companion classes in JavaScript are just the same as the type, except for erasable type wrappers
-      type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
-      if (type.NormalizeExpandKeepConstraints() is UserDefinedType udt && udt.ResolvedClass is DatatypeDecl dt &&
-          DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _)) {
-        var s = FullTypeName(udt, member);
-        return TypeName_UDT(s, udt, wr, udt.tok);
-      } else {
-        return TypeName(type, wr, tok, member);
-      }
-    }
-
-    // ----- Declarations -------------------------------------------------------------
-
-    protected void DeclareField(string name, bool isStatic, bool isConst, Type type, IToken tok, string rhs, ConcreteSyntaxTree wr) {
-      if (isStatic) {
-        var w = wr.NewNamedBlock("static get {0}()", name);
-        EmitReturnExpr(rhs, w);
-      } else {
-        wr.WriteLine("this.{0} = {1};", name, rhs);
-      }
-    }
-
-    protected override bool DeclareFormal(string prefix, string name, Type type, IToken tok, bool isInParam, ConcreteSyntaxTree wr) {
-      if (isInParam) {
-        wr.Write("{0}{1}", prefix, name);
-        return true;
-      } else {
-        return false;
-      }
-    }
-
-    protected override void DeclareLocalVar(string name, Type/*?*/ type, IToken/*?*/ tok, bool leaveRoomForRhs, string/*?*/ rhs, ConcreteSyntaxTree wr) {
-      wr.Write("let {0}", name);
-      if (leaveRoomForRhs) {
-        Contract.Assert(rhs == null);  // follows from precondition
-      } else if (rhs != null) {
-        wr.WriteLine(" = {0};", rhs);
-      } else {
-        wr.WriteLine(";");
-      }
-    }
-
-    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type/*?*/ type, IToken/*?*/ tok, ConcreteSyntaxTree wr) {
-      wr.Write("let {0} = ", name);
-      var w = wr.Fork();
-      wr.WriteLine(";");
-      return w;
-    }
-
-    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
-
-    protected override void DeclareOutCollector(string collectorVarName, ConcreteSyntaxTree wr) {
-      wr.Write("let {0} = ", collectorVarName);
-    }
-
-    protected override void DeclareLocalOutVar(string name, Type type, IToken tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr) {
-      DeclareLocalVar(name, type, tok, false, rhs, wr);
-    }
-
-    protected override void EmitOutParameterSplits(string outCollector, List<string> actualOutParamNames, ConcreteSyntaxTree wr) {
-      if (actualOutParamNames.Count == 1) {
-        EmitAssignment(actualOutParamNames[0], null, outCollector, null, wr);
-      } else {
-        for (var i = 0; i < actualOutParamNames.Count; i++) {
-          wr.WriteLine("{0} = {1}[{2}];", actualOutParamNames[i], outCollector, i);
-        }
-      }
-    }
-
-    protected override void EmitActualTypeArgs(List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr) {
-      // emit nothing
-    }
-
-    // ----- Statements -------------------------------------------------------------
-
-    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
-      bool isString = arg.Type.IsStringType;
-      bool isStringLiteral = arg is StringLiteralExpr;
-      bool isGeneric = arg.Type.AsSeqType != null &&
-                       arg.Type.AsSeqType.Arg.IsTypeParameter;
-      var wStmts = wr.Fork();
-      if (isStringLiteral && !UnicodeCharEnabled) {
-        // process.stdout.write(_dafny.toString(x));
-        wr.Write("process.stdout.write(_dafny.toString(");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.WriteLine("));");
-      } else if (isString) {
-        if (UnicodeCharEnabled) {
-          wr.Write($"process.stdout.write(");
-          TrParenExpr(arg, wr, false, wStmts);
-          wr.WriteLine(".toVerbatimString(false));");
-        } else {
-          wr.Write($"process.stdout.write(_dafny.toString({DafnySeqClass}.JoinIfPossible(");
-          wr.Append(Expr(arg, false, wStmts));
-          wr.WriteLine(")));");
-        }
-      } else if (isGeneric && !UnicodeCharEnabled) {
-        // try { process.stdout.write(_dafny.toString(((x) instanceof Array && typeof((x)[0]) == \"string\") ? (x).join("") : (x))); } catch (_error) { process.stdout.write(_dafny.toString(x)); }
-        wr.Write("try { process.stdout.write(_dafny.toString(");
-        wr.Write("(");
-        wr.Write("(");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.Write(") instanceof Array && typeof((");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.Write(")[0]) == \"string\") ? ");
-        wr.Write("(");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.Write(").join(\"\")");
-        wr.Write(":");
-        wr.Write("(");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.Write(")));");
-        wr.Write("} catch (_error) { process.stdout.write(_dafny.toString(");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.WriteLine("));}");
-      } else { // !isString && !isGeneric
-        // process.stdout.write(_dafny.toString(x));
-        wr.Write("process.stdout.write(_dafny.toString(");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.WriteLine("));");
-      }
-    }
-
-    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
-      outParams = outParams.Where(f => !f.IsGhost).ToList();
-      if (outParams.Count == 0) {
-        wr.WriteLine("return;");
-      } else if (outParams.Count == 1) {
-        wr.WriteLine("return {0};", IdName(outParams[0]));
-      } else {
-        wr.WriteLine("return [{0}];", Util.Comma(outParams, IdName));
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
-      var prefix = createContinueLabel ? "C" : "L";
-      return wr.NewNamedBlock($"{prefix}{label}:");
-    }
-
-    protected override void EmitBreak(string/*?*/ label, ConcreteSyntaxTree wr) {
-      if (label == null) {
-        wr.WriteLine("break;");
-      } else {
-        wr.WriteLine("break L{0};", label);
-      }
-    }
-
-    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
-      wr.WriteLine("break C{0};", label);
-    }
-
-    protected override void EmitYield(ConcreteSyntaxTree wr) {
-      wr.WriteLine("yield null;");
-    }
-
-    protected override void EmitAbsurd(string/*?*/ message, ConcreteSyntaxTree wr) {
-      if (message == null) {
-        message = "unexpected control point";
-      }
-      wr.WriteLine("throw new Error(\"{0}\");", message);
-    }
-
-    protected override void EmitHalt(IToken tok, Expression/*?*/ messageExpr, ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      wr.Write("throw new _dafny.HaltException(");
-      if (tok != null) {
-        wr.Write("\"" + tok.TokenToString(Options) + ": \" + ");
-      }
-
-      TrParenExpr(messageExpr, wr, false, wStmts);
-      if (UnicodeCharEnabled && messageExpr.Type.IsStringType) {
-        wr.Write(".toVerbatimString(false)");
-      }
-      wr.WriteLine(");");
-    }
-
-    protected override ConcreteSyntaxTree EmitForStmt(IToken tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
-      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
-
-      var nativeType = AsNativeType(loopIndex.Type);
-
-      wr.Write($"for (let {loopIndex.CompileName} = ");
-      var startWr = wr.Fork();
-      wr.Write($"; ");
-
-      ConcreteSyntaxTree bodyWr;
-      if (goingUp) {
-        if (endVarName == null) {
-          wr.Write("true");
-        } else if (nativeType == null) {
-          wr.Write($"{loopIndex.CompileName}.isLessThan({endVarName})");
-        } else {
-          wr.Write($"{loopIndex.CompileName} < {endVarName}");
-        }
-        if (nativeType == null) {
-          bodyWr = wr.NewBlock($"; {loopIndex.CompileName} = {loopIndex.CompileName}.plus(_dafny.ONE))");
-        } else {
-          bodyWr = wr.NewBlock($"; {loopIndex.CompileName}++)");
-        }
-      } else {
-        if (endVarName == null) {
-          wr.Write("true");
-        } else if (nativeType == null) {
-          wr.Write($"{endVarName}.isLessThan({loopIndex.CompileName})");
-        } else {
-          wr.Write($"{endVarName} < {loopIndex.CompileName}");
-        }
-        bodyWr = wr.NewBlock($"; )");
-        if (nativeType == null) {
-          bodyWr.WriteLine($"{loopIndex.CompileName} = {loopIndex.CompileName}.minus(_dafny.ONE);");
-        } else {
-          bodyWr.WriteLine($"{loopIndex.CompileName}--;");
-        }
-      }
-      bodyWr = EmitContinueLabel(labels, bodyWr);
-      TrStmtList(body, bodyWr);
-
-      return startWr;
-    }
-
-    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, string bound, ConcreteSyntaxTree wr, string start = null) {
-      start = start ?? "0";
-      return wr.NewNamedBlock("for (let {0} = {2}; {0} < {1}; {0}++)", indexVar, bound, start);
-    }
-
-    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
-      return wr.NewNamedBlock("for (let {0} = new BigNumber({1}); ; {0} = {0}.multipliedBy(2))", indexVar, start);
-    }
-
-    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine("{0} = {0}.plus(1);", varName);
-    }
-
-    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine("{0} = {0}.minus(1);", varName);
-    }
-
-    protected override string GetQuantifierName(string bvType) {
-      return string.Format("_dafny.Quantifier");
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IToken tok,
-      out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      wr.Write("for (const {0} of ", tmpVarName);
-      collectionWriter = wr.Fork();
-      var wwr = wr.NewBlock(")");
-      return wwr;
-    }
-
-    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
-      Type collectionElementType, bool introduceBoundVar, IToken tok, ConcreteSyntaxTree wr) {
-      wr.WriteLine("{0}{1} = {2};", introduceBoundVar ? "let " : "", boundVarName, tmpVarName);
-    }
-
-    [CanBeNull]
-    protected override string GetSubtypeCondition(string tmpVarName, Type boundVarType, IToken tok, ConcreteSyntaxTree preconditions) {
-      string typeTest;
-      if (boundVarType.IsRefType) {
-        if (boundVarType.IsObject || boundVarType.IsObjectQ) {
-          typeTest = "true";
-        } else if (boundVarType.IsTraitType) {
-          typeTest = $"_dafny.InstanceOfTrait({tmpVarName}, {TypeName(boundVarType, preconditions, tok)})";
-        } else {
-          typeTest = $"{tmpVarName} instanceof {TypeName(boundVarType, preconditions, tok)}";
-        }
-
-        if (boundVarType.IsNonNullRefType) {
-          typeTest = $"{tmpVarName} !== null && " + typeTest;
-        } else {
-          typeTest = $"{tmpVarName} === null || " + typeTest;
-        }
-      } else {
-        typeTest = "true";
-      }
-      return typeTest == "true" ? null : typeTest;
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      wr.Write("for (const {0} of ", boundVarName);
-      collectionWriter = wr.Fork();
-      return wr.NewBlock(")");
-    }
-
-    // ----- Expressions -------------------------------------------------------------
-
-    protected override void EmitNew(Type type, IToken tok, CallStmt initCall /*?*/, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts) {
-      var cl = ((UserDefinedType)type.NormalizeExpand()).ResolvedClass;
-      if (cl.Name == "object") {
-        wr.Write("_dafny.NewObject()");
-      } else {
-        wr.Write("new {0}(", TypeName(type, wr, tok));
-        EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass(cl, type.TypeArgs), tok, wr);
-        wr.Write(")");
-      }
-    }
-
-    protected override void EmitNewArray(Type elementType, IToken tok, List<string> dimensions,
-        bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var initValue = mustInitialize ? DefaultValue(elementType, wr, tok, true) : null;
-      if (dimensions.Count == 1) {
-        // handle the common case of 1-dimensional arrays separately
-        wr.Write($"Array(({dimensions[0]}).toNumber())");
-        if (initValue != null) {
-          wr.Write(".fill({0})", initValue);
-        }
-      } else {
-        // the general case
-        wr.Write("_dafny.newArray({0}, {1})", initValue ?? "undefined", dimensions.Comma(s => s));
-      }
-    }
-
-    protected string TranslateEscapes(string s) {
-      s = Util.ReplaceNullEscapesWithCharacterEscapes(s);
-
-      s = Util.UnicodeEscapesToLowercase(s);
-
-      return s;
-    }
-
-    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
-      if (e is StaticReceiverExpr) {
-        wr.Write(TypeName(e.Type, wr, e.tok));
-      } else if (e.Value == null) {
-        wr.Write("null");
-      } else if (e.Value is bool) {
-        wr.Write((bool)e.Value ? "true" : "false");
-      } else if (e is CharLiteralExpr) {
-        var escaped = TranslateEscapes((string)e.Value);
-        if (UnicodeCharEnabled) {
-          wr.Write($"new _dafny.CodePoint('{escaped}'.codePointAt(0))");
-        } else {
-          wr.Write($"'{escaped}'");
-        }
-      } else if (e is StringLiteralExpr) {
-        var str = (StringLiteralExpr)e;
-        if (UnicodeCharEnabled) {
-          wr.Write($"_dafny.Seq.UnicodeFromString(");
-          TrStringLiteral(str, wr);
-          wr.Write(")");
-        } else {
-          TrStringLiteral(str, wr);
-        }
-      } else if (AsNativeType(e.Type) != null) {
-        wr.Write(e.Value.ToString());
-      } else if (e.Value is BigInteger) {
-        var i = (BigInteger)e.Value;
-        wr.Write(IntegerLiteral(i));
-      } else if (e.Value is BaseTypes.BigDec) {
-        var n = (BaseTypes.BigDec)e.Value;
-        if (0 <= n.Exponent) {
-          wr.Write("new _dafny.BigRational(new BigNumber(\"{0}", n.Mantissa);
-          for (int i = 0; i < n.Exponent; i++) {
-            wr.Write("0");
-          }
-          wr.Write("\"))");
-        } else {
-          wr.Write($"new _dafny.BigRational({IntegerLiteral(n.Mantissa)}, new BigNumber(\"1");
-          for (int i = n.Exponent; i < 0; i++) {
-            wr.Write("0");
-          }
-          wr.Write("\"))");
-        }
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
-      }
-    }
-    string IntegerLiteral(BigInteger i) {
-      if (i.IsZero) {
-        return "_dafny.ZERO";
-      } else if (i.IsOne) {
-        return "_dafny.ONE";
-      } else if (-0x20_0000_0000_0000L < i && i < 0x20_0000_0000_0000L) {  // 53 bits, plus sign
-        return $"new BigNumber({i})";
-      } else {
-        return $"new BigNumber(\"{i}\")";
-      }
-    }
-
-    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
-      var n = str.Length;
-      if (!isVerbatim) {
-        wr.Write($"\"{TranslateEscapes(str)}\"");
-      } else {
-        wr.Write("\"");
-        for (var i = 0; i < n; i++) {
-          if (str[i] == '\"' && i + 1 < n && str[i + 1] == '\"') {
-            wr.Write("\\\"");
-            i++;
-          } else if (str[i] == '\\') {
-            wr.Write("\\\\");
-          } else if (str[i] == '\n') {
-            wr.Write("\\n");
-          } else if (str[i] == '\r') {
-            wr.Write("\\r");
-          } else {
-            wr.Write(str[i]);
-          }
-        }
-        wr.Write("\"");
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, bool surroundByUnchecked, ConcreteSyntaxTree wr) {
-      string nativeName = null, literalSuffix = null;
-      bool needsCastAfterArithmetic = false;
-      if (bvType.NativeType != null) {
-        GetNativeInfo(bvType.NativeType.Sel, out nativeName, out literalSuffix, out needsCastAfterArithmetic);
-      }
-
-      if (bvType.NativeType == null) {
-        wr.Write("(");
-        var middle = wr.Fork();
-        wr.Write(").mod(new BigNumber(2).exponentiatedBy({0}))", bvType.Width);
-        return middle;
-      } else if (bvType.NativeType.Bitwidth != bvType.Width) {
-        // no truncation needed
-        return wr;
-      } else {
-        wr.Write("((");
-        var middle = wr.Fork();
-        // print in hex, because that looks nice
-        wr.Write(") & 0x{0:X}{1})", (1UL << bvType.Width) - 1, literalSuffix);
-        return middle;
-      }
-    }
-
-    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
-        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      string nativeName = null, literalSuffix = null;
-      bool needsCast = false;
-      var nativeType = AsNativeType(e0.Type);
-      if (nativeType != null) {
-        GetNativeInfo(nativeType.Sel, out nativeName, out literalSuffix, out needsCast);
-      }
-
-      var bv = e0.Type.AsBitVectorType;
-      if (bv.Width == 0) {
-        tr(e0, wr, inLetExprBody, wStmts);
-      } else {
-        wr.Write("_dafny.{0}(", isRotateLeft ? "RotateLeft" : "RotateRight");
-        tr(e0, wr, inLetExprBody, wStmts);
-        wr.Write(", (");
-        tr(e1, wr, inLetExprBody, wStmts);
-        wr.Write(").toNumber(), {0})", bv.Width);
-        if (needsCast) {
-          wr.Write(".toNumber()");
-        }
-      }
-    }
-
-    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      wr.Write("[]", tupleTypeArgs);
-    }
-
-    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      wr.Write("{0}.push(_dafny.Tuple.of(", ingredients, tupleTypeArgs);
-      var wrTuple = wr.Fork();
-      wr.WriteLine("));");
-      return wrTuple;
-    }
-
-    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
-      wr.Write("{0}[{1}]", prefix, i);
-    }
-
-    protected override string IdProtect(string name) {
-      return PublicIdProtect(name);
-    }
-    public override string PublicIdProtect(string name) {
-      Contract.Requires(name != null);
-      switch (name) {
-        case "arguments":
-        case "await":
-        case "boolean":
-        case "byte":
-        case "catch":
-        case "continue":
-        case "debugger":
-        case "default":
-        case "delete":
-        case "do":
-        case "double":
-        case "enum":
-        case "eval":
-        case "final":
-        case "finally":
-        case "float":
-        case "for":
-        case "goto":
-        case "implements":
-        case "instanceof":
-        case "interface":
-        case "let":
-        case "long":
-        case "native":
-        case "package":
-        case "private":
-        case "public":
-        case "short":
-        case "super":
-        case "switch":
-        case "synchronized":
-        case "throw":
-        case "throws":
-        case "transient":
-        case "try":
-        case "typeof":
-        case "void":
-        case "volatile":
-        case "with":
-        case "toString":
-        case "equals":
-          return "_$$_" + name;
-        default:
-          return name;
-      }
-    }
-
-    protected override string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null) {
-      Contract.Assume(udt != null);  // precondition; this ought to be declared as a Requires in the superclass
-      if (udt is ArrowType) {
-        return ArrowType.Arrow_FullCompileName;
-      }
-      var cl = udt.ResolvedClass;
-      if (cl is TypeParameter) {
-        return IdProtect(udt.GetCompileName(Options));
-      } else if (cl is DefaultClassDecl && Attributes.Contains(cl.EnclosingModuleDefinition.Attributes, "extern") &&
-                 member != null && Attributes.Contains(member.Attributes, "extern")) {
-        // omit the default class name ("_default") in extern modules, when the class is used to qualify an extern member
-        Contract.Assert(!cl.EnclosingModuleDefinition.IsDefaultModule); // default module is not marked ":extern"
-        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options));
-      } else {
-        return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdProtect(cl.GetCompileName(Options));
-      }
-    }
-
-    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
-      wr.Write("_this");
-    }
-
-    protected override ConcreteSyntaxTree EmitCast(ICanRender toType, ConcreteSyntaxTree wr) {
-      return wr;
-    }
-
-    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
-      var dt = dtv.Ctor.EnclosingDatatype;
-      EmitDatatypeValue(dt, dtv.Ctor, dtv.IsCoCall, typeDescriptorArguments, arguments, wr);
-    }
-
-    void EmitDatatypeValue(DatatypeDecl dt, DatatypeCtor ctor, bool isCoCall, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
-      var dtName = dt.GetFullCompileName(Options);
-      var ctorName = ctor.GetCompileName(Options);
-
-      var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
-      if (dt is TupleTypeDecl) {
-        Contract.Assert(typeDescriptorArguments.Length == 0);
-        wr.Write($"_dafny.Tuple.of({arguments})");
-      } else if (!isCoCall) {
-        // Ordinary constructor (that is, one that does not guard any co-recursive calls)
-        // Generate: Dt.create_Ctor(arguments)
-        var lazyArgument = dt is IndDatatypeDecl ? "" : arguments.Length == 0 ? "null" : "null, ";
-        wr.Write($"{dtName}.create_{ctorName}({lazyArgument}{typeDescriptorArguments}{sep}{arguments})");
-      } else {
-        var sep0 = typeDescriptorArguments.Length != 0 ? ", " : "";
-        // Co-recursive call
-        // Generate:  Dt.lazy_Ctor(($dt) => Dt.create_Ctor($dt, args))
-        wr.Write($"{dtName}.lazy_{ctorName}(($dt{sep0}{typeDescriptorArguments}) => ");
-        wr.Write("{0}.create_{1}($dt{2}{3}{4}{5})", dtName, ctorName, arguments.Length == 0 ? "" : ", ", typeDescriptorArguments, sep, arguments);
-        wr.Write(")");
-      }
-    }
-
-    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString) {
-      compiledName = "";
-      preString = "";
-      postString = "";
-      switch (id) {
-        case SpecialField.ID.UseIdParam:
-          compiledName = IdProtect((string)idParam);
-          break;
-        case SpecialField.ID.ArrayLength:
-        case SpecialField.ID.ArrayLengthInt:
-          if (idParam == null) {
-            compiledName = "length";
-          } else {
-            compiledName = "dims[" + (int)idParam + "]";
-          }
-          if (id == SpecialField.ID.ArrayLength) {
-            preString = "new BigNumber(";
-            postString = ")";
-          }
-          break;
-        case SpecialField.ID.Floor:
-          compiledName = "toBigNumber()";
-          break;
-        case SpecialField.ID.IsLimit:
-          preString = "_dafny.BigOrdinal.IsLimit(";
-          postString = ")";
-          break;
-        case SpecialField.ID.IsSucc:
-          preString = "_dafny.BigOrdinal.IsSucc(";
-          postString = ")";
-          break;
-        case SpecialField.ID.Offset:
-          preString = "_dafny.BigOrdinal.Offset(";
-          postString = ")";
-          break;
-        case SpecialField.ID.IsNat:
-          preString = "_dafny.BigOrdinal.IsNat(";
-          postString = ")";
-          break;
-        case SpecialField.ID.Keys:
-          compiledName = "Keys";
-          break;
-        case SpecialField.ID.Values:
-          compiledName = "Values";
-          break;
-        case SpecialField.ID.Items:
-          compiledName = "Items";
-          break;
-        case SpecialField.ID.Reads:
-          compiledName = "_reads";
-          break;
-        case SpecialField.ID.Modifies:
-          compiledName = "_modifies";
-          break;
-        case SpecialField.ID.New:
-          compiledName = "_new";
-          break;
-        default:
-          Contract.Assert(false); // unexpected ID
-          break;
-      }
-    }
-
-    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
-      Type expectedType, string/*?*/ additionalCustomParameter, bool internalAccess = false) {
-      var memberStatus = DatatypeWrapperEraser.GetMemberStatus(Options, member);
-      if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.Identity) {
-        return SimpleLvalue(obj);
-      } else if (memberStatus == DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue) {
-        return SimpleLvalue(w => w.Write("true"));
-      } else if (member is DatatypeDestructor dtor && dtor.EnclosingClass is TupleTypeDecl) {
-        Contract.Assert(dtor.CorrespondingFormals.Count == 1);
-        var formal = dtor.CorrespondingFormals[0];
-        return SuffixLvalue(obj, "[{0}]", formal.NameForCompilation);
-      } else if (member is SpecialField sf && !(member is ConstantField)) {
-        GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out var preStr, out var postStr);
-        if (compiledName.Length != 0) {
-          return SuffixLvalue(obj, ".{0}", compiledName);
-        } else {
-          // this member selection is handled by some kind of enclosing function call, so nothing to do here
-          return SimpleLvalue(obj);
-        }
-      } else if (member is Function fn) {
-        typeArgs = typeArgs.Where(ta => NeedsTypeDescriptor(ta.Formal)).ToList();
-        if (typeArgs.Count == 0 && additionalCustomParameter == null) {
-          if (member.IsStatic) {
-            return SuffixLvalue(obj, ".{0}", IdName(member));
-          } else {
-            // generate: obj.F.bind(obj)
-            return SimpleLvalue(w => {
-              var objWriter = new ConcreteSyntaxTree();
-              obj(objWriter);
-              var objString = objWriter.ToString();
-              w.Write("{0}.{1}.bind({0})", objString, IdName(member));
-            });
-          }
-        } else {
-          // We need an eta conversion to adjust for the difference in arity.
-          // (T0 a0, T1 a1, ...) -> obj.F(rtd0, rtd1, ..., additionalCustomParameter, a0, a1, ...)
-          // Start by writing to the suffix:  F(rtd0, rtd1, ...
-          var suffixWr = new ConcreteSyntaxTree();
-          suffixWr.Write(IdName(member));
-          suffixWr.Write("(");
-          var suffixSep = "";
-          EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), fn.tok, suffixWr, ref suffixSep);
-          if (additionalCustomParameter != null) {
-            suffixWr.Write("{0}{1}", suffixSep, additionalCustomParameter);
-            suffixSep = ", ";
-          }
-          // Write the prefix and the rest of the suffix
-          var prefixWr = new ConcreteSyntaxTree();
-          var prefixSep = "";
-          prefixWr.Write("(");
-          foreach (var arg in fn.Formals) {
-            if (!arg.IsGhost) {
-              var name = idGenerator.FreshId("_eta");
-              prefixWr.Write("{0}{1}", prefixSep, name);
-              suffixWr.Write("{0}{1}", suffixSep, name);
-              suffixSep = ", ";
-              prefixSep = ", ";
-            }
-          }
-          prefixWr.Write(") => ");
-          suffixWr.Write(")");
-          return EnclosedLvalue(prefixWr.ToString(), obj, $".{suffixWr.ToString()}");
-        }
-      } else {
-        Contract.Assert(member is Field);
-        if (member.IsStatic) {
-          return SimpleLvalue(w => {
-            w.Write("{0}.{1}", TypeName_Companion(objType, w, member.tok, member), IdName(member));
-            var sep = "(";
-            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.tok, w, ref sep);
-            if (sep != "(") {
-              w.Write(")");
-            }
-          });
-        } else if (NeedsCustomReceiver(member) && !(member.EnclosingClass is TraitDecl)) {
-          // instance const in a newtype
-          return SimpleLvalue(w => {
-            w.Write("{0}.{1}(", TypeName_Companion(objType, w, member.tok, member), IdName(member));
-            obj(w);
-            w.Write(")");
-          });
-        } else if (internalAccess && (member is ConstantField || member.EnclosingClass is TraitDecl)) {
-          return SuffixLvalue(obj, $"._{member.GetCompileName(Options)}");
-        } else {
-          return SimpleLvalue(w => {
-            obj(w);
-            w.Write(".{0}", IdName(member));
-            var sep = "(";
-            EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.tok, w, ref sep);
-            if (sep != "(") {
-              w.Write(")");
-            }
-          });
-        }
-      }
-    }
-
-    protected override ConcreteSyntaxTree ExprToInt(Type fromType, ConcreteSyntaxTree wr) {
-      if (AsNativeType(fromType) == null) {
-        return wr;
-      }
-      wr.Write("BigNumber");
-      return wr.ForkInParens();
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<string> indices, Type elmtType, ConcreteSyntaxTree wr) {
-      var w = wr.Fork();
-      if (indices.Count == 1) {
-        wr.Write("[{0}]", indices[0]);
-      } else {
-        wr.Write(".elmts");
-        foreach (var index in indices) {
-          wr.Write("[{0}]", index);
-        }
-      }
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Assert(indices != null && 1 <= indices.Count);  // follows from precondition
-      var w = wr.Fork();
-      if (indices.Count == 1) {
-        wr.Write("[");
-        wr.Append(Expr(indices[0], inLetExprBody, wStmts));
-        wr.Write("]");
-      } else {
-        wr.Write(".elmts");
-        foreach (var index in indices) {
-          wr.Write("[");
-          wr.Append(Expr(index, inLetExprBody, wStmts));
-          wr.Write("]");
-        }
-      }
-      return w;
-    }
-
-    protected override string ArrayIndexToInt(string arrayIndex) => $"new BigNumber({arrayIndex})";
-
-    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(expr, wr, inLetExprBody, wStmts);
-      if (AsNativeType(expr.Type) == null) {
-        wr.Write(".toNumber()");
-      }
-    }
-
-    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(source, wr, inLetExprBody, wStmts);
-      if (source.Type.NormalizeExpand() is SeqType) {
-        // seq
-        wr.Write("[");
-        wr.Append(Expr(index, inLetExprBody, wStmts));
-        wr.Write("]");
-      } else {
-        // map or imap
-        wr.Write(".get(");
-        wr.Append(Expr(index, inLetExprBody, wStmts));
-        wr.Write(")");
-      }
-    }
-
-    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
-        CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (source.Type.AsSeqType != null) {
-        wr.Write($"{DafnySeqClass}.update(");
-        wr.Append(Expr(source, inLetExprBody, wStmts));
-        wr.Write(", ");
-      } else {
-        TrParenExpr(source, wr, inLetExprBody, wStmts);
-        wr.Write(".update(");
-      }
-      wr.Append(Expr(index, inLetExprBody, wStmts));
-      wr.Write(", ");
-      wr.Append(CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts));
-      wr.Write(")");
-    }
-
-    protected override void EmitSeqSelectRange(Expression source, Expression lo /*?*/, Expression hi /*?*/,
-        bool fromArray, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (fromArray) {
-        wr.Write($"{DafnySeqClass}.of(...");
-      }
-      TrParenExpr(source, wr, inLetExprBody, wStmts);
-      if (lo != null) {
-        wr.Write(".slice(");
-        wr.Append(Expr(lo, inLetExprBody, wStmts));
-        if (hi != null) {
-          wr.Write(", ");
-          wr.Append(Expr(hi, inLetExprBody, wStmts));
-        }
-        wr.Write(")");
-      } else if (hi != null) {
-        wr.Write(".slice(0, ");
-        wr.Append(Expr(hi, inLetExprBody, wStmts));
-        wr.Write(")");
-      } else if (fromArray) {
-        wr.Write(".slice()");
-      }
-      if (fromArray) {
-        wr.Write(")");
-      }
-    }
-
-    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var fromType = (ArrowType)expr.Initializer.Type.NormalizeExpand();
-      wr.Write($"{DafnySeqClass}.Create(");
-      wr.Append(Expr(expr.N, inLetExprBody, wStmts));
-      wr.Write(", ");
-      wr.Append(Expr(expr.Initializer, inLetExprBody, wStmts));
-      wr.Write(")");
-      if (fromType.Result.IsCharType && !UnicodeCharEnabled) {
-        wr.Write(".join('')");
-      }
-    }
-
-    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr($"{DafnyMultiSetClass}.FromArray", expr.E, wr, inLetExprBody, wStmts);
-    }
-
-    protected override void EmitApplyExpr(Type functionType, IToken tok, Expression function,
-        List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(function, wr, inLetExprBody, wStmts);
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-    }
-
-    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
-      List<Type> boundTypes, Type resultType, IToken tok, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ref ConcreteSyntaxTree wStmts) {
-      wr.Write("(({0}) => ", Util.Comma(boundVars));
-      var w = wr.Fork();
-      wr.Write(")");
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-      return w;
-    }
-
-    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex, DatatypeCtor ctor, List<Type> typeArgs, Type bvType, ConcreteSyntaxTree wr) {
-      if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
-        Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
-        Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
-        source(wr);
-      } else if (ctor.EnclosingDatatype is TupleTypeDecl tupleTypeDecl) {
-        Contract.Assert(tupleTypeDecl.NonGhostDims != 1); // such a tuple is an erasable-wrapper type, handled above
-        wr.Write("(");
-        source(wr);
-        wr.Write(")[{0}]", formalNonGhostIndex);
-      } else {
-        var dtorName = FormalName(dtor, formalNonGhostIndex);
-        wr.Write("(");
-        source(wr);
-        wr.Write("){0}.{1}", ctor.EnclosingDatatype is CoDatatypeDecl ? "._D()" : "", dtorName);
-      }
-    }
-
-    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IToken tok, List<string> inNames,
-        Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
-      wr.Write("function (");
-      Contract.Assert(inTypes.Count == inNames.Count);  // guaranteed by precondition
-      for (var i = 0; i < inNames.Count; i++) {
-        wr.Write("{0}{1}", i == 0 ? "" : ", ", inNames[i]);
-      }
-      var w = wr.NewExprBlock(")");
-      return w;
-    }
-
-    protected override void CreateIIFE(string bvName, Type bvType, IToken bvTok, Type bodyType, IToken bodyTok,
-      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
-      var w = wr.NewExprBlock("function ({0})", bvName);
-      wStmts = w.Fork();
-      w.Write("return ");
-      wrBody = w.Fork();
-      w.WriteLine(";");
-      wr.Write("(");
-      wrRhs = wr.Fork();
-      wr.Write(")");
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IToken resultTok, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var w = wr.NewBigExprBlock("function ()", "()");
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IToken resultTok, string bvName,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var w = wr.NewExprBlock("function ({0})", bvName);
-      wr.Write("({0})", source);
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
-      if (type.HasFatPointer) {
-        var w = wr.ForkInParens();
-        wr.Write("._value");
-        return w;
-      } else {
-        return wr;
-      }
-    }
-
-    protected override ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
-      if (type.HasFatPointer) {
-        wr.Write($"new {type.AsNewtype.GetFullCompileName(Options)}");
-        return wr.ForkInParens();
-      } else {
-        return wr;
-      }
-
-    }
-
-    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      switch (op) {
-        case ResolvedUnaryOp.BoolNot:
-          TrParenExpr("!", expr, wr, inLetExprBody, wStmts);
-          break;
-        case ResolvedUnaryOp.BitwiseNot:
-          if (AsNativeType(expr.Type) != null) {
-            // JavaScript bitwise operators are weird (numeric operands are first converted into
-            // signed 32-bit values), and it could be easy to forget how weird they are.
-            // Therefore, as a protective measure, the following assert is here to catch against any future
-            // change that would render this translation incorrect.
-            Contract.Assert(expr.Type.AsBitVectorType.Width == 0);
-            wr.Write("0");
-          } else {
-            wr.Write("_dafny.BitwiseNot(");
-            wr.Append(Expr(expr, inLetExprBody, wStmts));
-            wr.Write(", {0})", expr.Type.AsBitVectorType.Width);
-          }
-          break;
-        case ResolvedUnaryOp.Cardinality:
-          TrParenExpr("new BigNumber(", expr, wr, inLetExprBody, wStmts);
-          if (expr.Type.AsMultiSetType != null) {
-            wr.Write(".cardinality())");
-          } else {
-            wr.Write(".length)");
-          }
-          break;
-        default:
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
-      }
-    }
-
-    bool IsDirectlyComparable(Type t) {
-      Contract.Requires(t != null);
-      return t.IsBoolType || (t.IsCharType && !UnicodeCharEnabled) || AsNativeType(t) != null || t.IsRefType;
-    }
-
-    bool IsRepresentedAsBigNumber(Type t) {
-      if (AsNativeType(t) != null) {
-        return false;
-      } else if (t.AsBitVectorType is { } bvt) {
-        return bvt.NativeType == null;
-      } else {
-        return t.IsNumericBased(Type.NumericPersuasion.Int)
-          || t.IsBitVectorType
-          || t.IsBigOrdinalType;
-      }
-    }
-
-    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
-      Expression e0, Expression e1, IToken tok, Type resultType,
-      out string opString,
-      out string preOpString,
-      out string postOpString,
-      out string callString,
-      out string staticCallString,
-      out bool reverseArguments,
-      out bool truncateResult,
-      out bool convertE1_to_int,
-      out bool coerceE1,
-      ConcreteSyntaxTree errorWr) {
-
-      opString = null;
-      preOpString = "";
-      postOpString = "";
-      callString = null;
-      staticCallString = null;
-      reverseArguments = false;
-      truncateResult = false;
-      convertE1_to_int = false;
-      coerceE1 = false;
-
-      switch (op) {
-        case BinaryExpr.ResolvedOpcode.Iff:
-          opString = "==="; break;
-        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
-          if (AsNativeType(resultType) != null) {
-            // JavaScript bitwise operators are weird (numeric operands are first converted into
-            // signed 32-bit values), and it could be easy to forget how weird they are.
-            // Therefore, as a protective measure, the following assert is here to catch against any future
-            // change that would render this translation incorrect.
-            Contract.Assert(resultType.AsBitVectorType.Width < 32);
-            opString = "&";
-          } else {
-            staticCallString = "_dafny.BitwiseAnd";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.BitwiseOr:
-          if (AsNativeType(resultType) != null) {
-            // JavaScript bitwise operators are weird (numeric operands are first converted into
-            // signed 32-bit values), and it could be easy to forget how weird they are.
-            // Therefore, as a protective measure, the following assert is here to catch against any future
-            // change that would render this translation incorrect.
-            Contract.Assert(resultType.AsBitVectorType.Width < 32);
-            opString = "|";
-          } else {
-            staticCallString = "_dafny.BitwiseOr";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.BitwiseXor:
-          if (AsNativeType(resultType) != null) {
-            // JavaScript bitwise operators are weird (numeric operands are first converted into
-            // signed 32-bit values), and it could be easy to forget how weird they are.
-            // Therefore, as a protective measure, the following assert is here to catch against any future
-            // change that would render this translation incorrect.
-            Contract.Assert(resultType.AsBitVectorType.Width < 32);
-            opString = "^";
-          } else {
-            staticCallString = "_dafny.BitwiseXor";
-          }
-          break;
-
-        case BinaryExpr.ResolvedOpcode.EqCommon: {
-            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0.Type);
-            if (IsDirectlyComparable(eqType)) {
-              opString = "===";
-            } else if (eqType.IsIntegerType || eqType.IsBitVectorType) {
-              callString = "isEqualTo";
-            } else if (eqType.IsRealType) {
-              callString = "equals";
-            } else {
-              staticCallString = "_dafny.areEqual";
-            }
-            break;
-          }
-        case BinaryExpr.ResolvedOpcode.NeqCommon: {
-            var eqType = DatatypeWrapperEraser.SimplifyType(Options, e0.Type);
-            if (IsDirectlyComparable(eqType)) {
-              opString = "!==";
-            } else if (eqType.IsIntegerType) {
-              preOpString = "!";
-              callString = "isEqualTo";
-            } else if (eqType.IsRealType) {
-              preOpString = "!";
-              callString = "equals";
-            } else {
-              preOpString = "!";
-              staticCallString = "_dafny.areEqual";
-            }
-            break;
-          }
-
-        case BinaryExpr.ResolvedOpcode.Lt:
-          if (AsNativeType(e0.Type) != null) {
-            opString = "<";
-          } else if (IsRepresentedAsBigNumber(e0.Type) || e0.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-            callString = "isLessThan";
-          } else {
-            Contract.Assert(false); throw new cce.UnreachableException();
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Le:
-          if (AsNativeType(e0.Type) != null) {
-            opString = "<=";
-          } else if (IsRepresentedAsBigNumber(e0.Type)) {
-            callString = "isLessThanOrEqualTo";
-          } else if (e0.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-            callString = "isAtMost";
-          } else {
-            Contract.Assert(false); throw new cce.UnreachableException();
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Ge:
-          if (AsNativeType(e0.Type) != null) {
-            opString = ">=";
-          } else if (IsRepresentedAsBigNumber(e0.Type)) {
-            callString = "isLessThanOrEqualTo";
-            reverseArguments = true;
-          } else if (e0.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-            callString = "isAtMost";
-            reverseArguments = true;
-          } else {
-            Contract.Assert(false); throw new cce.UnreachableException();
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Gt:
-          if (AsNativeType(e0.Type) != null) {
-            opString = ">";
-          } else if (IsRepresentedAsBigNumber(e0.Type) || e0.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-            callString = "isLessThan";
-            reverseArguments = true;
-          } else {
-            Contract.Assert(false); throw new cce.UnreachableException();
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.LtChar when UnicodeCharEnabled:
-          callString = "isLessThan";
-          break;
-        case BinaryExpr.ResolvedOpcode.LeChar when UnicodeCharEnabled:
-          callString = "isLessThanOrEqual";
-          break;
-        case BinaryExpr.ResolvedOpcode.GtChar when UnicodeCharEnabled:
-          callString = "isLessThan";
-          reverseArguments = true;
-          break;
-        case BinaryExpr.ResolvedOpcode.GeChar when UnicodeCharEnabled:
-          callString = "isLessThanOrEqual";
-          reverseArguments = true;
-          break;
-        case BinaryExpr.ResolvedOpcode.LeftShift:
-          if (AsNativeType(resultType) != null) {
-            // JavaScript bitwise operators are weird (numeric operands are first converted into
-            // signed 32-bit values), and it could be easy to forget how weird they are.
-            // Therefore, as a protective measure, the following assert is here to catch against any future
-            // change that would render this translation incorrect.
-            Contract.Assert(resultType.AsBitVectorType.Width == 0);
-            opString = "+";  // 0 + 0 == 0 == 0 << 0
-            convertE1_to_int = true;
-          } else {
-            staticCallString = "_dafny.ShiftLeft";
-            truncateResult = true; convertE1_to_int = true;
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.RightShift:
-          if (AsNativeType(resultType) != null) {
-            // JavaScript bitwise operators are weird (numeric operands are first converted into
-            // signed 32-bit values), and it could be easy to forget how weird they are.
-            // Therefore, as a protective measure, the following assert is here to catch against any future
-            // change that would render this translation incorrect.
-            Contract.Assert(resultType.AsBitVectorType.Width == 0);
-            opString = "+";  // 0 + 0 == 0 == 0 << 0
-            convertE1_to_int = true;
-          } else {
-            staticCallString = "_dafny.ShiftRight";
-            truncateResult = true; convertE1_to_int = true;
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Add:
-          if (resultType.IsIntegerType || resultType.IsRealType || resultType.IsBigOrdinalType) {
-            callString = "plus"; truncateResult = true;
-          } else if (AsNativeType(resultType) != null) {
-            opString = "+";
-          } else if (resultType.IsCharType) {
-            staticCallString = $"_dafny.{CharMethodQualifier}PlusChar";
-          } else {
-            callString = "plus"; truncateResult = true;
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Sub:
-          if (resultType.IsIntegerType || resultType.IsRealType || resultType.IsBigOrdinalType) {
-            callString = "minus"; truncateResult = true;
-          } else if (AsNativeType(resultType) != null) {
-            opString = "-";
-          } else if (resultType.IsCharType) {
-            staticCallString = $"_dafny.{CharMethodQualifier}MinusChar";
-          } else {
-            callString = "minus"; truncateResult = true;
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mul:
-          if (resultType.IsIntegerType || resultType.IsRealType) {
-            callString = "multipliedBy"; truncateResult = true;
-          } else if (AsNativeType(resultType) != null) {
-            opString = "*";
-          } else {
-            callString = "multipliedBy"; truncateResult = true;
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Div:
-          if (resultType.IsNumericBased(Type.NumericPersuasion.Real)) {
-            callString = "dividedBy";
-          } else if (resultType.IsIntegerType || AsNativeType(resultType) == null) {
-            staticCallString = "_dafny.EuclideanDivision";
-          } else if (AsNativeType(resultType).LowerBound < BigInteger.Zero) {
-            staticCallString = "_dafny.EuclideanDivisionNumber";
-          } else {
-            opString = "/";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mod:
-          if (resultType.IsIntegerType) {
-            callString = "mod";
-          } else if (AsNativeType(resultType) == null) {
-            callString = "mod";
-          } else if (AsNativeType(resultType).LowerBound < BigInteger.Zero) {
-            staticCallString = "_dafny.EuclideanModuloNumber";
-          } else {
-            opString = "%";
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.SetEq:
-        case BinaryExpr.ResolvedOpcode.MultiSetEq:
-        case BinaryExpr.ResolvedOpcode.MapEq:
-          callString = "equals"; break;
-        case BinaryExpr.ResolvedOpcode.SeqEq:
-          // a sequence may be represented as an array or as a string
-          staticCallString = "_dafny.areEqual"; break;
-
-        case BinaryExpr.ResolvedOpcode.ProperSubset:
-        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
-          callString = "IsProperSubsetOf"; break;
-        case BinaryExpr.ResolvedOpcode.Subset:
-        case BinaryExpr.ResolvedOpcode.MultiSubset:
-          callString = "IsSubsetOf"; break;
-        case BinaryExpr.ResolvedOpcode.Disjoint:
-        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
-          callString = "IsDisjointFrom"; break;
-        case BinaryExpr.ResolvedOpcode.InSet:
-        case BinaryExpr.ResolvedOpcode.InMultiSet:
-        case BinaryExpr.ResolvedOpcode.InMap:
-          callString = "contains"; reverseArguments = true; break;
-        case BinaryExpr.ResolvedOpcode.Union:
-        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-          callString = "Union"; break;
-        case BinaryExpr.ResolvedOpcode.MapMerge:
-          callString = "Merge"; break;
-        case BinaryExpr.ResolvedOpcode.Intersection:
-        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-          callString = "Intersect"; break;
-        case BinaryExpr.ResolvedOpcode.SetDifference:
-        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
-          callString = "Difference"; break;
-        case BinaryExpr.ResolvedOpcode.MapSubtraction:
-          callString = "Subtract"; break;
-
-        case BinaryExpr.ResolvedOpcode.ProperPrefix:
-          staticCallString = $"{DafnySeqClass}.IsProperPrefixOf"; break;
-        case BinaryExpr.ResolvedOpcode.Prefix:
-          staticCallString = $"{DafnySeqClass}.IsPrefixOf"; break;
-        case BinaryExpr.ResolvedOpcode.Concat:
-          staticCallString = $"{DafnySeqClass}.Concat"; break;
-        case BinaryExpr.ResolvedOpcode.InSeq:
-          staticCallString = $"{DafnySeqClass}.contains"; reverseArguments = true; break;
-
-        default:
-          base.CompileBinOp(op, e0, e1, tok, resultType,
-            out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
-            errorWr);
-          break;
-      }
-    }
-
-    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
-      wr.Write("{0}.isZero()", varName);
-    }
-
-    protected override void EmitConversionExpr(ConversionExpr e, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Int) || e.E.Type.IsBitVectorType || e.E.Type.IsCharType || e.E.Type.IsBigOrdinalType) {
-        if (e.ToType.Equals(e.E.Type)) {
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-        } else if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // (int or bv or char) -> real
-          Contract.Assert(AsNativeType(e.ToType) == null);
-          wr.Write("new _dafny.BigRational(");
-          if (AsNativeType(e.E.Type) != null || e.E.Type.IsCharType) {
-            wr.Write("new BigNumber");
-          }
-          if (e.E.Type.IsCharType) {
-            wr.Write("(");
-          }
-
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          if (e.E.Type.IsCharType) {
-            wr.Write(UnicodeCharEnabled ? ".value)" : ".charCodeAt(0))");
-          }
-
-          wr.Write(", new BigNumber(1))");
-        } else if (e.ToType.IsCharType) {
-          wr.Write($"{CharFromNumberMethodName()}(");
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          if (AsNativeType(e.E.Type) == null) {
-            wr.Write(".toNumber()");
-          }
-          wr.Write(")");
-        } else {
-          // (int or bv or char) -> (int or bv or ORDINAL)
-          var fromNative = AsNativeType(e.E.Type);
-          var toNative = AsNativeType(e.ToType);
-          if (fromNative != null && toNative != null) {
-            // from a native, to a native -- simple!
-            wr.Append(Expr(e.E, inLetExprBody, wStmts));
-          } else if (e.E.Type.IsCharType) {
-            Contract.Assert(fromNative == null);
-            if (toNative == null) {
-              // char -> big-integer (int or bv or ORDINAL)
-              wr.Write("new BigNumber(");
-              TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-              wr.Write(UnicodeCharEnabled ? ".value)" : ".charCodeAt(0))");
-            } else {
-              // char -> native
-              TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-              wr.Write(UnicodeCharEnabled ? ".value" : ".charCodeAt(0)");
-            }
-          } else if (fromNative == null && toNative == null) {
-            // big-integer (int or bv) -> big-integer (int or bv or ORDINAL), so identity will do
-            wr.Append(Expr(e.E, inLetExprBody, wStmts));
-          } else if (fromNative != null && toNative == null) {
-            // native (int or bv) -> big-integer (int or bv)
-            wr.Write("new BigNumber");
-            TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          } else {
-            // any (int or bv) -> native (int or bv)
-            // Consider some optimizations
-            var literal = PartiallyEvaluate(e.E);
-            UnaryOpExpr u = e.E.Resolved as UnaryOpExpr;
-            MemberSelectExpr m = e.E.Resolved as MemberSelectExpr;
-            if (literal != null) {
-              // Optimize constant to avoid intermediate BigInteger
-              wr.Write("(" + literal + ")");
-            } else if (u != null && u.Op == UnaryOpExpr.Opcode.Cardinality) {
-              // Optimize .Count to avoid intermediate BigInteger
-              TrParenExpr(u.E, wr, inLetExprBody, wStmts);
-              wr.Write(".length");
-            } else if (m != null && m.MemberName == "Length" && m.Obj.Type.IsArrayType) {
-              // Optimize .Length to avoid intermediate BigInteger
-              TrParenExpr(m.Obj, wr, inLetExprBody, wStmts);
-              wr.Write(".length");
-            } else {
-              // no optimization applies; use the standard translation
-              TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-              wr.Write(".toNumber()");
-            }
-          }
-        }
-      } else if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-        Contract.Assert(AsNativeType(e.E.Type) == null);
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // real -> real
-          Contract.Assert(AsNativeType(e.ToType) == null);
-          wr.Append(Expr(e.E, inLetExprBody, wStmts));
-        } else if (e.ToType.IsCharType) {
-          wr.Write($"{CharFromNumberMethodName()}(");
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          wr.Write(".toBigNumber().toNumber())");
-        } else {
-          // real -> (int or bv)
-          TrParenExpr(e.E, wr, inLetExprBody, wStmts);
-          wr.Write(".toBigNumber()");
-          if (AsNativeType(e.ToType) != null) {
-            wr.Write(".toNumber()");
-          }
-        }
-      } else if (e.E.Type.IsBigOrdinalType) {
-        if (e.ToType.IsCharType) {
-          wr.Write($"{CharFromNumberMethodName()}((");
-        }
-
-        wr.Append(Expr(e.E, inLetExprBody, wStmts));
-        if (e.ToType.IsCharType) {
-          wr.Write(").toNumber())");
-        }
-      } else {
-        Contract.Assert(false, $"not implemented for javascript: {e.E.Type} -> {e.ToType}");
-      }
-    }
-
-    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IToken tok, ConcreteSyntaxTree wr) {
-      Contract.Requires(fromType.IsRefType);
-      Contract.Requires(toType.IsRefType);
-
-      if (fromType.IsRefType && !fromType.IsNonNullRefType && toType.IsRefType) {
-        if (toType.IsNonNullRefType) {
-          wr.Write($"{localName} != null && ");
-        } else {
-          wr = wr.Write($"{localName} == null || ").ForkInParens();
-        }
-      }
-
-      if (toType.IsObject || toType.IsObjectQ) {
-        wr.Write("true");
-      } else if (toType.IsTraitType) {
-        wr.Write($"_dafny.InstanceOfTrait({localName}, {TypeName(toType, wr, tok)})");
-      } else if (fromType.IsTraitType && toType.AsNewtype != null) {
-        wr.Write($"{localName} instanceof {toType.AsNewtype.GetFullCompileName(Options)}");
-      } else {
-        wr.Write($"{localName} instanceof {TypeName(toType, wr, tok)}");
-      }
-
-      var udtTo = (UserDefinedType)toType.NormalizeExpandKeepConstraints();
-      if (udtTo.ResolvedClass is SubsetTypeDecl && !(udtTo.ResolvedClass is NonNullTypeDecl)) {
-        // TODO: test constraints
-        throw new UnsupportedFeatureException(tok, Feature.SubsetTypeTests);
-      }
-    }
-
-    protected override void EmitCollectionDisplay(CollectionType ct, IToken tok, List<Expression> elements,
-        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (ct is SetType) {
-        wr.Write($"{DafnySetClass}.fromElements");
-        TrExprList(elements, wr, inLetExprBody, wStmts);
-      } else if (ct is MultiSetType) {
-        wr.Write($"{DafnyMultiSetClass}.fromElements");
-        TrExprList(elements, wr, inLetExprBody, wStmts);
-      } else {
-        Contract.Assert(ct is SeqType);  // follows from precondition
-        ConcreteSyntaxTree wrElements;
-        if (ct.Arg.IsCharType && !UnicodeCharEnabled) {
-          // We're really constructing a string.
-          // TODO: It may be that ct.Arg is a type parameter that may stand for char. We currently don't catch that case here.
-          wr.Write("[");
-          wrElements = wr.Fork();
-          wr.Write("].join(\"\")");
-        } else {
-          wr.Write($"{DafnySeqClass}.of(");
-          wrElements = wr.Fork();
-          wr.Write(")");
-        }
-        TrExprList(elements, wrElements, inLetExprBody, wStmts, typeAt: _ => ct.Arg, parens: false);
-      }
-    }
-
-    protected override void EmitMapDisplay(MapType mt, IToken tok, List<ExpressionPair> elements,
-        bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write($"{DafnyMapClass}.of(");
-      string sep = "";
-      foreach (ExpressionPair p in elements) {
-        wr.Write(sep);
-        wr.Write("[");
-        wr.Append(Expr(p.A, inLetExprBody, wStmts));
-        wr.Write(",");
-        wr.Append(Expr(p.B, inLetExprBody, wStmts));
-        wr.Write("]");
-        sep = ", ";
-      }
-      wr.Write(")");
-    }
-
-    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
-      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
-      wrVarInit.Write($"new {DafnySetClass}()");
-    }
-
-    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
-      var wrVarInit = DeclareLocalVar(collectionName, null, null, wr);
-      wrVarInit.Write($"new {DafnyMapClass}()");
-    }
-
-    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      Contract.Assume(ct is SetType || ct is MultiSetType);  // follows from precondition
-      var wStmts = wr.Fork();
-      wr.Write("{0}.add(", collName);
-      wr.Append(Expr(elmt, inLetExprBody, wStmts));
-      wr.WriteLine(");");
-    }
-
-    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IToken tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      wr.Write("{0}.push([", collName);
-      var termLeftWriter = wr.Fork();
-      wr.Write(",");
-      wr.Append(Expr(term, inLetExprBody, wStmts));
-      wr.WriteLine("]);");
-      return termLeftWriter;
-    }
-
-    protected override string GetCollectionBuilder_Build(CollectionType ct, IToken tok, string collName, ConcreteSyntaxTree wr) {
-      // collections are built in place
-      return collName;
-    }
-
-    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr("_dafny.SingleValue", e, wr, inLetExprBody, wStmts);
-    }
-
-    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
-      var tryBlock = wr.NewBlock("try");
-      TrStmt(body, tryBlock);
-      var catchBlock = wr.NewBlock("catch (e)");
-      var ifBlock = catchBlock.NewBlock("if (e instanceof _dafny.HaltException)");
-      ifBlock.Write($"let {haltMessageVarName} = ");
-      if (UnicodeCharEnabled) {
-        ifBlock.Write("_dafny.Seq.UnicodeFromString(e.message)");
-      } else {
-        ifBlock.Write("e.message");
-      }
-      ifBlock.WriteLine(";");
-
-      TrStmt(recoveryBody, ifBlock);
-      var elseBlock = catchBlock.NewBlock("else");
-      elseBlock.WriteLine("throw e");
-    }
-
-    public string ToStringLiteral(string s) {
-      var wr = new ConcreteSyntaxTree();
-      EmitStringLiteral(s, false, wr);
-      return wr.ToString();
-    }
-  }
-}
diff --git a/Source/DafnyCore/Compilers/JavaScript/JavaScriptBackend.cs b/Source/DafnyCore/Compilers/JavaScript/JavaScriptBackend.cs
deleted file mode 100644
index 7401a01626c..00000000000
--- a/Source/DafnyCore/Compilers/JavaScript/JavaScriptBackend.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.Dafny.Compilers;
-
-public class JavaScriptBackend : ExecutableBackend {
-  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".js" };
-
-  public override string TargetName => "JavaScript";
-  public override bool IsStable => true;
-  public override string TargetExtension => "js";
-
-  public override bool SupportsInMemoryCompilation => true;
-  public override bool TextualTargetIsExecutable => true;
-
-  public override IReadOnlySet<string> SupportedNativeTypes =>
-    new HashSet<string>(new List<string> { "number" });
-
-  protected override SinglePassCompiler CreateCompiler() {
-    return new JavaScriptCompiler(Options, Reporter);
-  }
-
-  public override bool CompileTargetProgram(string dafnyProgramName, string targetProgramText, string/*?*/ callToMain, string/*?*/ targetFilename, ReadOnlyCollection<string> otherFileNames,
-    bool runAfterCompile, TextWriter outputWriter, out object compilationResult) {
-    compilationResult = null;
-    if (runAfterCompile) {
-      Contract.Assert(callToMain != null);  // this is part of the contract of CompileTargetProgram
-                                            // Since the program is to be run soon, nothing further is done here. Any compilation errors (that is, any errors
-                                            // in the emitted program--this should never happen if the compiler itself is correct) will be reported as 'node'
-                                            // will run the program.
-      return true;
-    } else {
-      // compile now
-      return SendToNewNodeProcess(dafnyProgramName, targetProgramText, null, targetFilename, otherFileNames, outputWriter);
-    }
-  }
-
-  public override bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain /*?*/,
-    string targetFilename, ReadOnlyCollection<string> otherFileNames,
-    object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
-
-    return SendToNewNodeProcess(dafnyProgramName, targetProgramText, callToMain, targetFilename, otherFileNames, outputWriter);
-  }
-
-  bool SendToNewNodeProcess(string dafnyProgramName, string targetProgramText, string/*?*/ callToMain, string targetFilename, ReadOnlyCollection<string> otherFileNames,
-    TextWriter outputWriter) {
-    Contract.Requires(targetFilename != null || otherFileNames.Count == 0);
-
-    var psi = new ProcessStartInfo("node", "") {
-      RedirectStandardInput = true,
-      RedirectStandardOutput = true,
-      RedirectStandardError = true,
-      StandardInputEncoding = Encoding.UTF8,
-    };
-
-    try {
-      Process nodeProcess = Process.Start(psi);
-      foreach (var filename in otherFileNames) {
-        WriteFromFile(filename, nodeProcess.StandardInput);
-      }
-      nodeProcess.StandardInput.Write(targetProgramText);
-      if (callToMain != null && Options.RunAfterCompile) {
-        nodeProcess.StandardInput.WriteLine("require('process').stdout.setEncoding(\"utf-8\");");
-        nodeProcess.StandardInput.WriteLine("require('process').argv = [\"node\",\"stdin\", " + string.Join(",", Options.MainArgs.Select(((JavaScriptCompiler)compiler).ToStringLiteral)) + "];");
-        nodeProcess.StandardInput.Write(callToMain);
-      }
-      nodeProcess.StandardInput.Flush();
-      nodeProcess.StandardInput.Close();
-      // Fixes a problem of Node on Windows, where Node does not prints to the parent console its standard outputs.
-      var errorProcessing = Task.Run(() => {
-        PassthroughBuffer(nodeProcess.StandardError, Options.ErrorWriter);
-      });
-      PassthroughBuffer(nodeProcess.StandardOutput, Options.OutputWriter);
-      nodeProcess.WaitForExit();
-#pragma warning disable VSTHRD002
-      errorProcessing.Wait();
-#pragma warning restore VSTHRD002
-      return nodeProcess.ExitCode == 0;
-    } catch (System.ComponentModel.Win32Exception e) {
-      outputWriter.WriteLine("Error: Unable to start node.js ({0}): {1}", psi.FileName, e.Message);
-      return false;
-    }
-  }
-
-  public JavaScriptBackend(DafnyOptions options) : base(options) {
-  }
-}
diff --git a/Source/DafnyCore/Compilers/Library/LibraryBackend.cs b/Source/DafnyCore/Compilers/Library/LibraryBackend.cs
deleted file mode 100644
index 44d7547db97..00000000000
--- a/Source/DafnyCore/Compilers/Library/LibraryBackend.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using DafnyCore;
-
-namespace Microsoft.Dafny.Compilers; 
-
-public class LibraryBackend : ExecutableBackend {
-  public LibraryBackend(DafnyOptions options) : base(options) {
-  }
-
-  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { };
-
-  public override string TargetName => "Dafny Library (.doo)";
-  public override bool IsStable => false;
-
-  public override string TargetExtension => "doo";
-  public override string TargetId => "lib";
-
-  public override string TargetBaseDir(string dafnyProgramName) =>
-    $"{Path.GetFileNameWithoutExtension(dafnyProgramName)}-lib";
-
-  public override bool TextualTargetIsExecutable => false;
-
-  public override bool SupportsInMemoryCompilation => false;
-
-  public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
-    Feature.LegacyCLI
-  };
-
-  protected override SinglePassCompiler CreateCompiler() {
-    return null;
-  }
-
-  public override void OnPostCompile() {
-    // Not calling base.OnPostCompile() since it references `compiler`
-  }
-
-  public override string PublicIdProtect(string name) {
-    throw new NotSupportedException();
-  }
-
-  public override void Compile(Program dafnyProgram, ConcreteSyntaxTree output) {
-    if (!Options.UsingNewCli) {
-      throw new UnsupportedFeatureException(dafnyProgram.GetFirstTopLevelToken(), Feature.LegacyCLI);
-    }
-
-    var disallowedAssumptions = dafnyProgram.Assumptions(null)
-      .Where(a => !a.desc.allowedInLibraries);
-    foreach (var assumption in disallowedAssumptions) {
-      var message = assumption.desc.issue.Replace("{", "{{").Replace("}", "}}");
-      Reporter.Error(MessageSource.Compiler, assumption.tok, message, message);
-    }
-
-    var dooFile = new DooFile(dafnyProgram);
-    dooFile.Write(output);
-  }
-
-  public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree callToMainTree) {
-    // No-op
-  }
-
-  private string DooFilePath(string dafnyProgramName) {
-    return Path.GetFullPath(Path.ChangeExtension(dafnyProgramName, ".doo"));
-  }
-
-  public override bool CompileTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain, string targetFilename,
-    ReadOnlyCollection<string> otherFileNames, bool runAfterCompile, TextWriter outputWriter, out object compilationResult) {
-
-    var targetDirectory = Path.GetFullPath(Path.GetDirectoryName(targetFilename));
-    var dooPath = DooFilePath(dafnyProgramName);
-
-    File.Delete(dooPath);
-    ZipFile.CreateFromDirectory(targetDirectory, dooPath);
-
-    compilationResult = null;
-    return true;
-  }
-
-  public override bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain, string targetFilename,
-    ReadOnlyCollection<string> otherFileNames, object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
-    var dooPath = DooFilePath(dafnyProgramName);
-    return RunTargetDafnyProgram(dooPath, outputWriter, errorWriter, true);
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/Python/Compiler-python.cs b/Source/DafnyCore/Compilers/Python/Compiler-python.cs
deleted file mode 100644
index cb63dcda004..00000000000
--- a/Source/DafnyCore/Compilers/Python/Compiler-python.cs
+++ /dev/null
@@ -1,1835 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Linq;
-using System.Numerics;
-using System.Text.RegularExpressions;
-using JetBrains.Annotations;
-using ExtensionMethods;
-using Microsoft.BaseTypes;
-using Microsoft.Boogie;
-
-namespace ExtensionMethods {
-  using Microsoft.Dafny;
-  public static class PythonExtensions {
-    public static ConcreteSyntaxTree NewBlockPy(this ConcreteSyntaxTree tree, string header = "", string footer = "",
-      BlockStyle open = BlockStyle.Newline,
-      BlockStyle close = BlockStyle.Nothing) {
-      return tree.NewBlock(header, footer, open, close);
-    }
-  }
-}
-
-namespace Microsoft.Dafny.Compilers {
-  class PythonCompiler : SinglePassCompiler {
-    public PythonCompiler(DafnyOptions options, ErrorReporter reporter) : base(options, reporter) {
-      if (Options?.CoverageLegendFile != null) {
-        Imports.Add("DafnyProfiling");
-      }
-    }
-
-    private readonly List<string> Imports = new() { DafnyDefaultModule };
-
-    public override IReadOnlySet<Feature> UnsupportedFeatures => new HashSet<Feature> {
-      Feature.SubsetTypeTests,
-      Feature.MethodSynthesis
-    };
-
-    private const string DafnyRuntimeModule = "_dafny";
-    private const string DafnyDefaultModule = "module_";
-    const string DafnySetClass = $"{DafnyRuntimeModule}.Set";
-    const string DafnyMultiSetClass = $"{DafnyRuntimeModule}.MultiSet";
-    const string DafnySeqClass = $"{DafnyRuntimeModule}.Seq";
-    private string DafnySeqMakerFunction => UnicodeCharEnabled ? $"{DafnyRuntimeModule}.SeqWithoutIsStrInference" : DafnySeqClass;
-    const string DafnyArrayClass = $"{DafnyRuntimeModule}.Array";
-    const string DafnyMapClass = $"{DafnyRuntimeModule}.Map";
-    const string DafnyDefaults = $"{DafnyRuntimeModule}.defaults";
-    string FormatDefaultTypeParameterValue(TopLevelDecl tp) {
-      Contract.Requires(tp is TypeParameter or AbstractTypeDecl);
-      return $"default_{tp.GetCompileName(Options)}";
-    }
-    protected override string StmtTerminator { get => ""; }
-    protected override string True { get => "True"; }
-    protected override string False { get => "False"; }
-    protected override string Conj { get => "and"; }
-    protected override void EmitHeader(Program program, ConcreteSyntaxTree wr) {
-      wr.WriteLine($"# Dafny program {program.Name} compiled into Python");
-      if (Options.IncludeRuntime) {
-        ReadRuntimeSystem(program, "DafnyRuntime.py", wr.NewFile($"{DafnyRuntimeModule}.py"));
-      }
-
-      Imports.Add(DafnyRuntimeModule);
-      EmitImports(null, wr);
-      wr.WriteLine();
-    }
-
-    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree wr) {
-      Coverage.EmitSetup(wr);
-      var moduleName = IdProtect(mainMethod.EnclosingClass.EnclosingModuleDefinition.GetCompileName(Options));
-      if (moduleName != DafnyDefaultModule) {
-        wr.WriteLine($"import {moduleName}");
-      }
-      wr.NewBlockPy("try:")
-        .WriteLine($"dafnyArgs = [{DafnyRuntimeModule}.Seq(a) for a in sys.argv]")
-        .WriteLine($"{mainMethod.EnclosingClass.GetFullCompileName(Options)}.{(IssueCreateStaticMain(mainMethod) ? "StaticMain" : IdName(mainMethod))}(dafnyArgs)");
-      wr.NewBlockPy($"except {DafnyRuntimeModule}.HaltException as e:")
-        .WriteLine($"{DafnyRuntimeModule}.print(\"[Program halted] \" + e.message + \"\\n\")")
-        .WriteLine("sys.exit(1)");
-      Coverage.EmitTearDown(wr);
-    }
-
-    protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string argsParameterName) {
-      var mw = ((ClassWriter)cw).MethodWriter.WriteLine("@staticmethod");
-      return mw.NewBlockPy($"def StaticMain({argsParameterName}):");
-    }
-
-    protected override ConcreteSyntaxTree CreateModule(string moduleName, bool isDefault, bool isExtern,
-        string libraryName, ConcreteSyntaxTree wr) {
-      moduleName = IdProtect(moduleName);
-      var modulePath = moduleName.Replace('.', Path.DirectorySeparatorChar);
-      var file = wr.NewFile($"{modulePath}.py");
-      EmitImports(moduleName, file);
-      return file;
-    }
-
-    protected override void DependOnModule(string moduleName, bool isDefault, bool isExtern, string libraryName) {
-      Imports.Add(moduleName);
-    }
-
-    private void EmitImports(string moduleName, ConcreteSyntaxTree wr) {
-      wr.WriteLine("import sys");
-      wr.WriteLine("from typing import Callable, Any, TypeVar, NamedTuple");
-      wr.WriteLine("from math import floor");
-      wr.WriteLine("from itertools import count");
-      wr.WriteLine();
-      Imports.ForEach(module => wr.WriteLine($"import {module}"));
-      if (moduleName != null) {
-        wr.WriteLine();
-        wr.WriteLine($"assert \"{moduleName}\" == __name__");
-        if (!moduleName.Contains('.')) {
-          wr.WriteLine($"{moduleName} = sys.modules[__name__]");
-        }
-
-        Imports.Add(moduleName);
-      }
-    }
-
-    protected override string GetHelperModuleName() => DafnyRuntimeModule;
-
-    private static string MangleName(string name) {
-      switch (name) {
-        case "False":
-        case "None":
-        case "True":
-        case "and":
-        case "as":
-        case "assert":
-        case "async":
-        case "await":
-        case "break":
-        case "class":
-        case "continue":
-        case "def":
-        case "del":
-        case "elif":
-        case "else":
-        case "except":
-        case "finally":
-        case "for":
-        case "from":
-        case "global":
-        case "if":
-        case "import":
-        case "in":
-        case "is":
-        case "lambda":
-        case "nonlocal":
-        case "not":
-        case "or":
-        case "pass":
-        case "raise":
-        case "return":
-        case "try":
-        case "while":
-        case "with":
-        case "yield":
-          name = $"{name}_";
-          break;
-        default:
-          while (name.StartsWith("_")) {
-            name = $"{name[1..]}_";
-          }
-          if (name.Length > 0 && char.IsDigit(name[0])) {
-            name = $"d_{name}";
-          }
-          break;
-      }
-      return name;
-    }
-
-    protected override IClassWriter CreateClass(string moduleName, string name, bool isExtern, string/*?*/ fullPrintName,
-      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type> superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      var realSuperClasses = superClasses?.Where(trait => !trait.IsObject).ToList() ?? new List<Type>();
-      var baseClasses = realSuperClasses.Any()
-        ? $"({realSuperClasses.Comma(trait => TypeName(trait, wr, tok))})"
-        : "";
-      var methodWriter = wr.NewBlockPy(header: $"class {IdProtect(name)}{baseClasses}:");
-
-      var relevantTypeParameters = typeParameters.Where(NeedsTypeDescriptor);
-      var args = relevantTypeParameters.Comma(tp => tp.GetCompileName(Options));
-      if (!string.IsNullOrEmpty(args)) { args = $", {args}"; }
-      var isNewtypeWithTraits = cls is NewtypeDecl { ParentTraits: { Count: > 0 } };
-      if (isNewtypeWithTraits) {
-        args += ", value";
-      }
-      var block = methodWriter.NewBlockPy(header: $"def  __init__(self{args}):", close: BlockStyle.Newline);
-      foreach (var tp in relevantTypeParameters) {
-        block.WriteLine("self.{0} = {0}", tp.GetCompileName(Options));
-      }
-      var constructorWriter = block.Fork();
-      block.WriteLine("pass");
-
-      if (cls is not DefaultClassDecl && (fullPrintName != null || isNewtypeWithTraits)) {
-        var wBody = methodWriter.NewBlockPy("def __dafnystr__(self) -> str:");
-        if (isNewtypeWithTraits) {
-          wBody.WriteLine("return _dafny.string_of(self._value)");
-        } else {
-          wBody.WriteLine($"return \"{fullPrintName}\"");
-        }
-      }
-
-      return new ClassWriter(this, constructorWriter, methodWriter);
-    }
-
-    protected override IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters,
-      TraitDecl trait, List<Type> superClasses, IToken tok, ConcreteSyntaxTree wr) {
-      var methodWriter = wr.NewBlockPy(header: $"class {IdProtect(name)}:");
-      // Avoids problems with member-less traits 
-      if (trait is TraitDecl tr && tr.Members.All(m => m.IsGhost || !m.IsStatic)) {
-        methodWriter.WriteLine("pass");
-      }
-      return new ClassWriter(this, methodWriter, methodWriter);
-    }
-
-    protected override ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr) {
-      var cw = (ClassWriter)CreateClass(IdProtect(iter.EnclosingModuleDefinition.GetCompileName(Options)), IdName(iter), false,
-        iter.FullName, iter.TypeArgs, iter, null, iter.tok, wr);
-      var constructorWriter = cw.ConstructorWriter;
-      var w = cw.MethodWriter;
-      // here come the fields
-      Constructor ct = null;
-      foreach (var member in iter.Members) {
-        switch (member) {
-          case Field { IsGhost: false } f:
-            DeclareField(IdName(f), false, false, f.Type, f.tok, PlaceboValue(f.Type, constructorWriter, f.tok, true), constructorWriter);
-            break;
-          case Constructor constructor:
-            Contract.Assert(ct == null);  // we're expecting just one constructor
-            ct = constructor;
-            break;
-        }
-      }
-      Contract.Assert(ct != null);  // we do expect a constructor
-      constructorWriter.WriteLine("self._iter = None");
-
-      var nonNullIns = ct.Ins.Where(f => !f.IsGhost).ToList();
-      var args = nonNullIns.Select(IdName).Prepend("self").Comma();
-      var wCtor = w.NewBlockPy($"def {IdName(ct)}({args}):");
-      foreach (var p in nonNullIns) {
-        wCtor.WriteLine("self.{0} = {0}", IdName(p));
-      }
-      wCtor.WriteLine("self._iter = self.TheIterator()");
-
-      var wMoveNext = w.NewBlockPy("def MoveNext(self):");
-      wMoveNext.NewBlockPy("try:")
-        .WriteLine("next(self._iter)")
-        .WriteLine("return True");
-      wMoveNext.NewBlockPy("except (StopIteration, TypeError) as e:")
-        .WriteLine("return False");
-
-      return w.NewBlockPy("def TheIterator(self):");
-    }
-
-    protected override IClassWriter DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr) {
-
-      if (dt is TupleTypeDecl) {
-        return null;
-      }
-
-      var DtT = dt.GetCompileName(Options);
-
-      var baseClasses = dt.ParentTypeInformation.UniqueParentTraits().Any()
-        ? $"({dt.ParentTypeInformation.UniqueParentTraits().Comma(trait => TypeName(trait, wr, dt.tok))})"
-        : "";
-      var btw = wr.NewBlockPy($"class {DtT}{baseClasses}:", close: BlockStyle.Newline);
-
-      if (dt.HasFinitePossibleValues) {
-        btw.WriteLine($"@{DafnyRuntimeModule}.classproperty");
-        var w = btw.NewBlockPy(
-          $"def AllSingletonConstructors(cls):");
-        var values = dt.Ctors.Select(ctor =>
-          ctor.IsGhost
-          ? ForcePlaceboValue(UserDefinedType.FromTopLevelDecl(dt.tok, dt), w, dt.tok)
-          : $"{DtCtorDeclarationName(ctor, false)}()");
-        w.WriteLine($"return [{values.Comma()}]");
-      }
-
-      btw.WriteLine($"@classmethod");
-      var wDefault = btw.NewBlockPy($"def default(cls, {UsedTypeParameters(dt, true).Comma(FormatDefaultTypeParameterValue)}):");
-      var groundingCtor = dt.GetGroundingCtor();
-      if (groundingCtor.IsGhost) {
-        wDefault.WriteLine($"return lambda: {ForcePlaceboValue(UserDefinedType.FromTopLevelDecl(dt.tok, dt), wDefault, dt.tok)}");
-      } else if (DatatypeWrapperEraser.GetInnerTypeOfErasableDatatypeWrapper(Options, dt, out var innerType)) {
-        wDefault.WriteLine($"return lambda: {DefaultValue(innerType, wDefault, dt.tok)}");
-      } else {
-        var wTypeDescriptors = new ConcreteSyntaxTree();
-        var typeDescriptorComma = "";
-        WriteRuntimeTypeDescriptorsFormals(TypeArgumentInstantiation.ListFromFormals(dt.TypeArgs),
-          wTypeDescriptors, ref typeDescriptorComma, FormatDefaultTypeParameterValue);
-        var typeDescriptorUses = wTypeDescriptors.ToString();
-
-        var nonGhostFormals = groundingCtor.Formals.Where(f => !f.IsGhost).ToList();
-        var arguments = nonGhostFormals.Comma(f => DefaultValue(f.Type, wDefault, f.tok));
-        wDefault.Write("return lambda: ");
-        EmitDatatypeValue(dt, groundingCtor, dt is CoDatatypeDecl, typeDescriptorUses, arguments, wDefault, false);
-        wDefault.WriteLine();
-      }
-
-      // Ensures the inequality is based on equality defined in the constructor
-      btw.NewBlockPy("def __ne__(self, __o: object) -> bool:")
-        .WriteLine("return not self.__eq__(__o)");
-
-      if (dt is CoDatatypeDecl) {
-        var w = wr.NewBlockPy($"class {dt.GetCompileName(Options)}__Lazy({IdName(dt)}):");
-        w.NewBlockPy("def __init__(self, _c):")
-          .WriteLine("self._c = _c")
-          .WriteLine("self._d = None");
-        var get = w.NewBlockPy($"def _get(self):");
-        get.NewBlockPy("if self._c is not None:")
-          .WriteLine("self._d = self._c()")
-          .WriteLine("self._c = None");
-        get.WriteLine("return self._d");
-        w.NewBlockPy("def __dafnystr__(self) -> str:")
-          .WriteLine($"return {DafnyRuntimeModule}.string_of(self._get())");
-        foreach (var destructor in from ctor in dt.Ctors
-                                   let index = 0
-                                   from dtor in ctor.Destructors
-                                   where dtor.EnclosingCtors[0] == ctor
-                                   select dtor.CorrespondingFormals[0] into arg
-                                   where !arg.IsGhost
-                                   select IdProtect(arg.CompileName)) {
-          w.WriteLine("@property");
-          w.NewBlockPy($"def {destructor}(self):")
-            .WriteLine($"return self._get().{destructor}");
-        }
-      }
-
-      foreach (var ctor in dt.Ctors.Where(ctor => !ctor.IsGhost)) {
-        // Class-level fields don't work in all python version due to metaclasses.
-        // Adding a more restrictive type would be desirable, but Python expects their definition to precede this.
-        var argListX = dt.TypeArgs.Where(NeedsTypeDescriptor)
-          .Select(tp => $"('{IdProtect(tp.GetCompileName(Options))}', Any)");
-        var argListY = ctor.Destructors.Where(d => !d.IsGhost)
-          .Select(d => $"('{IdProtect(d.GetCompileName(Options))}', Any)");
-        var argList = argListX.Concat(argListY).Comma();
-        var namedtuple = $"NamedTuple('{IdProtect(ctor.GetCompileName(Options))}', [{argList}])";
-        var header = $"class {DtCtorDeclarationName(ctor, false)}({DtT}, {namedtuple}):";
-        var constructor = wr.NewBlockPy(header, close: BlockStyle.Newline);
-        DatatypeFieldsAndConstructor(ctor, constructor);
-
-        // @property
-        // def is_Ctor0(self) -> bool:
-        //   return isinstance(self, Dt_Ctor0) }
-        btw.WriteLine("@property");
-        btw.NewBlockPy($"def is_{ctor.GetCompileName(Options)}(self) -> bool:")
-          .WriteLine($"return isinstance(self, {DtCtorDeclarationName(ctor)})");
-      }
-
-      return new ClassWriter(this, btw, btw);
-    }
-
-    private void DatatypeFieldsAndConstructor(DatatypeCtor ctor, ConcreteSyntaxTree wr) {
-      var dt = ctor.EnclosingDatatype;
-
-      // Dt.Ctor
-      var fString = (dt.EnclosingModuleDefinition.IsDefaultModule ? "" : dt.EnclosingModuleDefinition.Name + ".") +
-                dt.Name + "." + ctor.Name;
-
-      // {self.Dtor0}, {self.Dtor1}, ..., {self.DtorN}
-      var args = ctor.Formals
-        .Where(f => !f.IsGhost)
-        .Select(f => {
-          if (f.Type.IsStringType && UnicodeCharEnabled) {
-            return $"{{self.{IdProtect(f.CompileName)}.VerbatimString(True)}}";
-          } else {
-            return $"{{{DafnyRuntimeModule}.string_of(self.{IdProtect(f.CompileName)})}}";
-          }
-        })
-        .Comma();
-
-      if (args.Length > 0 && dt is not CoDatatypeDecl) {
-        fString += $"({args})";
-      }
-
-      wr.NewBlockPy("def __dafnystr__(self) -> str:")
-        .WriteLine($"return f\'{fString.Replace("\'", "\\\'")}\'");
-
-      var argList = ctor.Formals
-        .Where(f => !f.IsGhost)
-        .Select(f => $"self.{IdProtect(f.CompileName)} == __o.{IdProtect(f.CompileName)}");
-      var suffix = args.Length > 0 ? $" and {string.Join(" and ", argList)}" : "";
-
-      wr.NewBlockPy("def __eq__(self, __o: object) -> bool:")
-        .WriteLine($"return isinstance(__o, {DtCtorDeclarationName(ctor)}){suffix}");
-
-      wr.NewBlockPy("def __hash__(self) -> int:")
-        .WriteLine("return super().__hash__()");
-    }
-
-    private string DtCtorDeclarationName(DatatypeCtor ctor, bool full = true) {
-      var dt = ctor.EnclosingDatatype;
-      return $"{(full ? dt.GetFullCompileName(Options) : dt.GetCompileName(Options))}_{ctor.GetCompileName(Options)}";
-    }
-
-    protected IClassWriter DeclareType(TopLevelDecl d, SubsetTypeDecl.WKind witnessKind, Expression witness, ConcreteSyntaxTree wr) {
-      var cw = (ClassWriter)CreateClass(IdProtect(d.EnclosingModuleDefinition.GetCompileName(Options)), IdName(d), d, wr);
-      var w = cw.MethodWriter;
-      var udt = UserDefinedType.FromTopLevelDecl(d.tok, d);
-      w.WriteLine("@staticmethod");
-      var block = w.NewBlockPy("def default():");
-      var wStmts = block.Fork();
-      block.Write("return ");
-      if (witnessKind == SubsetTypeDecl.WKind.Compiled) {
-        block.Append(Expr(witness, false, wStmts));
-      } else {
-        block.Write(TypeInitializationValue(udt, wr, d.tok, false, false));
-      }
-      block.WriteLine();
-
-      if (d is NewtypeDecl newtypeDecl && newtypeDecl.ParentTraits.Count != 0) {
-        // in constructor:
-        //   self._value = value
-        cw.ConstructorWriter.WriteLine("self._value = value");
-      }
-
-      return cw;
-    }
-
-    protected override IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr) {
-      return DeclareType(nt, nt.WitnessKind, nt.Witness, wr);
-    }
-
-    protected override void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr) {
-      DeclareType(sst, sst.WitnessKind, sst.Witness, wr);
-    }
-
-    protected override void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic) {
-      literalSuffix = "";
-      needsCastAfterArithmetic = false;
-      switch (sel) {
-        case NativeType.Selection.Byte:
-        case NativeType.Selection.SByte:
-        case NativeType.Selection.UShort:
-        case NativeType.Selection.Short:
-        case NativeType.Selection.UInt:
-        case NativeType.Selection.Int:
-        case NativeType.Selection.Number:
-        case NativeType.Selection.ULong:
-        case NativeType.Selection.Long:
-          name = "int"; break;
-        default:
-          Contract.Assert(false); // unexpected native type
-          throw new cce.UnreachableException(); // to please the compiler
-      }
-    }
-
-    private class ClassWriter : IClassWriter {
-      private readonly PythonCompiler Compiler;
-      public readonly ConcreteSyntaxTree ConstructorWriter;
-      public readonly ConcreteSyntaxTree MethodWriter;
-
-      public ClassWriter(PythonCompiler compiler, ConcreteSyntaxTree constructorWriter, ConcreteSyntaxTree methodWriter) {
-        Contract.Requires(compiler != null);
-        Contract.Requires(methodWriter != null);
-        Contract.Requires(constructorWriter != null);
-        Compiler = compiler;
-        ConstructorWriter = constructorWriter;
-        MethodWriter = methodWriter;
-      }
-
-      public ConcreteSyntaxTree CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody,
-        bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateMethod(m, typeArgs, createBody, MethodWriter, forBodyInheritance, lookasideBody);
-      }
-
-      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        throw new UnsupportedFeatureException(Token.NoToken, Feature.MethodSynthesis);
-      }
-
-      public ConcreteSyntaxTree CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs,
-          List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member,
-          bool forBodyInheritance, bool lookasideBody) {
-        return Compiler.CreateFunction(name, typeArgs, formals, resultType, tok, isStatic, createBody, member,
-          MethodWriter, forBodyInheritance, lookasideBody);
-      }
-
-      public ConcreteSyntaxTree CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IToken tok,
-          bool isStatic, bool isConst, bool createBody, MemberDecl member, bool forBodyInheritance) {
-        return Compiler.CreateGetter(name, resultType, tok, isStatic, createBody, MethodWriter);
-      }
-
-      public ConcreteSyntaxTree CreateGetterSetter(string name, Type resultType, IToken tok,
-          bool createBody, MemberDecl member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
-        return Compiler.CreateGetterSetter(name, createBody, out setterWriter, methodWriter: MethodWriter);
-      }
-
-      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type,
-          IToken tok, string rhs, Field field) {
-        Compiler.DeclareField(name, isStatic, isConst, type, tok, rhs, ConstructorWriter);
-      }
-
-      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) {
-        throw new cce.UnreachableException();
-      }
-
-      public ConcreteSyntaxTree ErrorWriter() => MethodWriter;
-
-      public void Finish() {
-
-      }
-    }
-
-    protected override string CompanionMemberIdName(MemberDecl member) {
-      if (member.EnclosingClass is NewtypeDecl && member.OverriddenMember != null) {
-        return "_Companion_" + IdName(member);
-      }
-      return base.CompanionMemberIdName(member);
-    }
-
-    private void DeclareField(string name, bool isStatic, bool isConst, Type type, IToken tok, string rhs,
-        ConcreteSyntaxTree fieldWriter) {
-      fieldWriter.Write($"self.{name}: {TypeName(type, fieldWriter, tok)}");
-      if (rhs != null) {
-        fieldWriter.Write($" = {rhs}");
-      }
-      fieldWriter.WriteLine();
-    }
-
-    private ConcreteSyntaxTree CreateGetterSetter(string name, bool createBody, out ConcreteSyntaxTree setterWriter, ConcreteSyntaxTree methodWriter) {
-      methodWriter.WriteLine("@property");
-      var getterWriter = methodWriter.NewBlockPy(header: $"def {name}(self):");
-      methodWriter.WriteLine($"@{name}.setter");
-      setterWriter = methodWriter.NewBlockPy(header: $"def {name}(self, value):");
-      if (createBody) {
-        return getterWriter;
-      }
-      getterWriter.WriteLine($"return self._{name}");
-      setterWriter.WriteLine($"self._{name} = value");
-      setterWriter = null;
-      return null;
-    }
-
-    private ConcreteSyntaxTree CreateGetter(string name, Type resultType, IToken tok, bool isStatic, bool createBody, ConcreteSyntaxTree methodWriter) {
-      if (!createBody) { return null; }
-      methodWriter.WriteLine(isStatic ? $"@{DafnyRuntimeModule}.classproperty" : "@property");
-      return methodWriter.NewBlockPy(header: $"def {name}({(isStatic ? "instance" : "self")}):");
-    }
-
-    private ConcreteSyntaxTree CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody,
-        ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
-      var customReceiver = !forBodyInheritance && NeedsCustomReceiver(m);
-      if (m.IsStatic || customReceiver) { wr.WriteLine("@staticmethod"); }
-      var protectedName = !forBodyInheritance ? CompanionMemberIdName(m) : IdName(m);
-      wr.Write($"def {protectedName}(");
-      var sep = "";
-      WriteFormals(ForTypeDescriptors(typeArgs, m.EnclosingClass, m, lookasideBody), m.Ins, m.IsStatic, customReceiver, ref sep, wr);
-      var body = wr.NewBlockPy("):", close: BlockStyle.Newline);
-      if (createBody) {
-        if (m.Body.Body.All(s => s.IsGhost)) {
-          body.WriteLine("pass");
-        }
-        return body;
-      }
-      body.WriteLine("pass");
-      return null;
-    }
-
-    protected override ConcreteSyntaxTree EmitMethodReturns(Method m, ConcreteSyntaxTree wr) {
-      if (m.Outs.Any(f => !f.IsGhost)) {
-        var beforeReturnBlock = wr.Fork();
-        EmitReturn(m.Outs, wr);
-        return beforeReturnBlock;
-      }
-      return wr;
-    }
-
-    private void WriteFormals(List<TypeArgumentInstantiation> typeParams, List<Formal> formals, bool isStatic,
-      bool customReceiver, ref string sep, ConcreteSyntaxTree wr) {
-      if (!isStatic && !customReceiver) {
-        wr.Write(sep + "self");
-        sep = ", ";
-      }
-      WriteRuntimeTypeDescriptorsFormals(typeParams, wr, ref sep, FormatDefaultTypeParameterValue);
-      if (customReceiver) {
-        wr.Write(sep + "self");
-        sep = ", ";
-      }
-      WriteFormals(sep, formals, wr);
-    }
-
-    private ConcreteSyntaxTree CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs,
-      List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member,
-      ConcreteSyntaxTree wr, bool forBodyInheritance, bool lookasideBody) {
-      if (!createBody) { return null; }
-      var customReceiver = !forBodyInheritance && NeedsCustomReceiver(member);
-      if (isStatic || customReceiver) { wr.WriteLine("@staticmethod"); }
-      var protectedName = !forBodyInheritance ? CompanionMemberIdName(member) : IdName(member);
-      wr.Write($"def {protectedName}(");
-      var sep = "";
-      WriteFormals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, lookasideBody), formals, isStatic, customReceiver, ref sep, wr);
-      return wr.NewBlockPy("):", close: BlockStyle.Newline);
-    }
-
-    // Unlike the other compilers, we use lambdas to model type descriptors here.
-    protected override string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      Contract.Requires(type != null);
-      Contract.Requires(tok != null);
-      Contract.Requires(wr != null);
-
-      return DatatypeWrapperEraser.SimplifyType(Options, type, true) switch {
-        var x when x.IsBuiltinArrowType => $"{DafnyDefaults}.pointer",
-        // unresolved proxy; just treat as bool, since no particular type information is apparently needed for this type
-        BoolType or TypeProxy => $"{DafnyDefaults}.bool",
-        CharType => UnicodeCharEnabled ? $"{DafnyDefaults}.codepoint" : $"{DafnyDefaults}.char",
-        IntType or BitvectorType => $"{DafnyDefaults}.int",
-        RealType => $"{DafnyDefaults}.real",
-        SeqType or SetType or MultiSetType or MapType => CollectionTypeDescriptor(),
-        UserDefinedType udt => udt.ResolvedClass switch {
-          TypeParameter tp => TypeParameterDescriptor(tp),
-          ClassLikeDecl or NonNullTypeDecl => $"{DafnyDefaults}.pointer",
-          DatatypeDecl => DatatypeDescriptor(udt, udt.TypeArgs, udt.tok),
-          NewtypeDecl or SubsetTypeDecl => CustomDescriptor(udt),
-          _ => throw new cce.UnreachableException()
-        },
-        _ => throw new cce.UnreachableException()
-      };
-
-      string CollectionTypeDescriptor() {
-        return TypeHelperName(type.NormalizeExpandKeepConstraints());
-      }
-
-      string TypeParameterDescriptor(TypeParameter typeParameter) {
-        if ((thisContext != null && typeParameter.Parent is TopLevelDeclWithMembers and not TraitDecl) || typeParameter.Parent is IteratorDecl) {
-          return $"self.{typeParameter.GetCompileName(Options)}";
-        }
-        if (thisContext != null && thisContext.ParentFormalTypeParametersToActuals.TryGetValue(typeParameter, out var instantiatedTypeParameter)) {
-          return TypeDescriptor(instantiatedTypeParameter, wr, tok);
-        }
-        return FormatDefaultTypeParameterValue(type.AsTypeParameter);
-      }
-
-      string CustomDescriptor(UserDefinedType userDefinedType) {
-        return $"{TypeName_UDT(FullTypeName(userDefinedType), userDefinedType, wr, userDefinedType.tok)}.default";
-      }
-
-      string DatatypeDescriptor(UserDefinedType udt, List<Type> typeArgs, IToken tok) {
-        var dt = (DatatypeDecl)udt.ResolvedClass;
-        var w = new ConcreteSyntaxTree();
-        if (dt is TupleTypeDecl) {
-          w.Write($"{DafnyDefaults}.tuple(");
-        } else {
-          w.Write($"{TypeName_UDT(FullTypeName(udt), udt, wr, tok)}.default(");
-        }
-        EmitTypeDescriptorsActuals(UsedTypeParameters(dt, typeArgs, true), tok, w, true);
-        w.Write(")");
-        return w.ToString();
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr) {
-      if (!member.IsStatic) {
-        wr.WriteLine("_this = self");
-      }
-      wr = wr.NewBlockPy($"while True:").NewBlockPy($"with {DafnyRuntimeModule}.label():");
-      var body = wr.Fork();
-      wr.WriteLine("break");
-      return body;
-    }
-
-    protected override void EmitJumpToTailCallStart(ConcreteSyntaxTree wr) {
-      wr.WriteLine($"raise {DafnyRuntimeModule}.TailCall()");
-    }
-
-    internal override string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member = null) {
-      Contract.Ensures(Contract.Result<string>() != null);
-      Contract.Assume(type != null);  // precondition; this ought to be declared as a Requires in the superclass
-
-      var xType = DatatypeWrapperEraser.SimplifyType(Options, type);
-
-      if (xType.IsObjectQ) {
-        return "object";
-      }
-
-      if (xType.AsNewtype != null && member == null) {
-        // when member is given, use UserDefinedType case below
-        var nativeType = xType.AsNewtype.NativeType;
-        if (nativeType != null) {
-          return GetNativeTypeName(nativeType);
-        }
-        return TypeName(xType.AsNewtype.BaseType, wr, tok, member);
-      }
-
-      switch (xType) {
-        case BoolType:
-          return "bool";
-        case CharType:
-          return "str";
-        case IntType or BigOrdinalType or BitvectorType:
-          return "int";
-        case RealType:
-          return $"{DafnyRuntimeModule}.BigRational";
-        case UserDefinedType udt: {
-            var s = FullTypeName(udt, member);
-            return TypeName_UDT(s, udt, wr, udt.tok);
-          }
-        case CollectionType:
-          return TypeHelperName(xType);
-      }
-
-      // TODO: I'm not 100% sure this is exhaustive yet
-      Contract.Assert(false);
-      throw new cce.UnreachableException();
-    }
-
-    protected override string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IToken tok,
-        bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors) {
-
-      if (usePlaceboValue) {
-        return "None";
-      }
-
-      var xType = type.NormalizeExpandKeepConstraints();
-
-      if (xType.IsObjectQ) {
-        return "None";
-      }
-
-      switch (xType) {
-        case BoolType:
-          return "False";
-        case CharType:
-          return UnicodeCharEnabled ? $"{DafnyRuntimeModule}.CodePoint({CharType.DefaultValueAsString})" : CharType.DefaultValueAsString;
-        case IntType or BigOrdinalType or BitvectorType:
-          return "int(0)";
-        case RealType:
-          return $"{DafnyRuntimeModule}.BigRational()";
-        case CollectionType:
-          return $"{TypeHelperName(xType)}({{}})";
-        case UserDefinedType udt: {
-            var cl = udt.ResolvedClass;
-            Contract.Assert(cl != null);
-            switch (cl) {
-              case SubsetTypeDecl td:
-                switch (td.WitnessKind) {
-                  case SubsetTypeDecl.WKind.Compiled:
-                    return TypeName_UDT(FullTypeName(udt), udt, wr, udt.tok) + ".default()";
-                  case SubsetTypeDecl.WKind.Special:
-                    if (ArrowType.IsPartialArrowTypeName(td.Name)) {
-                      return "None";
-                    }
-                    if (td is NonNullTypeDecl decl) {
-                      if (decl.Class is ArrayClassDecl arr) {
-                        return $"{DafnyArrayClass}(None, {Enumerable.Repeat("0", arr.Dims).Comma()})";
-                      }
-                      return "None";
-                    }
-                    Contract.Assert(udt.TypeArgs.Any() && ArrowType.IsTotalArrowTypeName(td.Name));
-                    var rangeDefaultValue = TypeInitializationValue(udt.TypeArgs.Last(), wr, tok, usePlaceboValue,
-                      constructTypeParameterDefaultsFromTypeDescriptors);
-                    // The final TypeArg contains the result type
-                    var arguments = udt.TypeArgs.SkipLast(1).Comma((_, i) => $"x{i}");
-                    return $"(lambda {arguments}: {rangeDefaultValue})";
-                  default:
-                    return TypeInitializationValue(td.RhsWithArgument(udt.TypeArgs), wr, tok, usePlaceboValue,
-                      constructTypeParameterDefaultsFromTypeDescriptors);
-                }
-
-              case NewtypeDecl td:
-                if (td.Witness != null) {
-                  return TypeName_UDT(FullTypeName(udt), udt, wr, udt.tok) + ".default()";
-                } else {
-                  return TypeInitializationValue(td.BaseType, wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-                }
-
-              case DatatypeDecl dt:
-                var relevantTypeArgs = UsedTypeParameters(dt, udt.TypeArgs, true).ConvertAll(ta => ta.Actual);
-                return dt is TupleTypeDecl
-                  ? $"({relevantTypeArgs.Comma(arg => DefaultValue(arg, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors))}{(relevantTypeArgs.Count == 1 ? "," : "")})"
-                  : $"{dt.GetFullCompileName(Options)}.default({relevantTypeArgs.Comma(arg => TypeDescriptor(arg, wr, tok))})()";
-
-              case TypeParameter tp:
-                return constructTypeParameterDefaultsFromTypeDescriptors
-                  ? $"{TypeDescriptor(udt, wr, tok)}()"
-                  : $"{FormatDefaultTypeParameterValue(tp)}()";
-
-              case AbstractTypeDecl opaque:
-                return FormatDefaultTypeParameterValue(opaque);
-
-              case ClassDecl:
-              case TraitDecl:
-              case ArrowTypeDecl:
-                return "None";
-            }
-            break;
-          }
-      }
-
-      Contract.Assert(false);
-      throw new cce.UnreachableException();  // unexpected type
-    }
-
-    protected override string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance,
-        List<Type> typeArgs, ConcreteSyntaxTree wr, IToken tok, bool omitTypeArguments) {
-      return fullCompileName;
-    }
-
-    protected override string TypeName_Companion(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl member) {
-      type = UserDefinedType.UpcastToMemberEnclosingType(type, member);
-      if (type.NormalizeExpandKeepConstraints() is UserDefinedType { ResolvedClass: DatatypeDecl dt } udt &&
-          DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dt, out _)) {
-        var s = FullTypeName(udt, member);
-        return TypeName_UDT(s, udt, wr, udt.tok);
-      } else {
-        return TypeName(type, wr, tok, member);
-      }
-    }
-
-    protected override void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
-      needsTypeDescriptor = false;
-      needsTypeParameter = false;
-      switch (cl) {
-        case DatatypeDecl:
-          needsTypeDescriptor = true;
-          break;
-        case TraitDecl:
-          needsTypeDescriptor = isStatic || lookasideBody;
-          break;
-        case ClassDecl:
-          needsTypeDescriptor = isStatic;
-          break;
-      }
-    }
-
-    protected override bool DeclareFormal(string prefix, string name, Type type, IToken tok, bool isInParam, ConcreteSyntaxTree wr) {
-      if (isInParam) {
-        wr.Write($"{prefix}{name}");
-        return true;
-      } else {
-        return false;
-      }
-    }
-
-    protected override void DeclareLocalVar(string name, Type type, IToken tok, bool leaveRoomForRhs, string rhs,
-        ConcreteSyntaxTree wr) {
-      wr.Write(name);
-      if (type != null) { wr.Write($": {TypeName(type, wr, tok)}"); }
-      if (rhs != null) { wr.Write($" = {rhs}"); }
-      wr.WriteLine();
-    }
-
-    protected override ConcreteSyntaxTree DeclareLocalVar(string name, Type type, IToken tok, ConcreteSyntaxTree wr) {
-      var w = new ConcreteSyntaxTree();
-      wr.FormatLine($"{name} = {w}");
-      return w;
-    }
-
-    protected override bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => true;
-    protected override bool SupportsMultipleReturns => true;
-
-    protected override void DeclareLocalOutVar(string name, Type type, IToken tok, string rhs, bool useReturnStyleOuts,
-        ConcreteSyntaxTree wr) {
-      DeclareLocalVar(name, type, tok, false, rhs, wr);
-    }
-
-    protected override void EmitActualTypeArgs(List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr) {
-      // emit nothing
-    }
-
-    protected override void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg) {
-      var wStmts = wr.Fork();
-      wr.Write($"{DafnyRuntimeModule}.print(");
-      EmitToString(wr, arg, wStmts);
-      wr.WriteLine(")");
-    }
-
-    private void EmitToString(ConcreteSyntaxTree wr, Expression arg, ConcreteSyntaxTree wStmts) {
-      if (UnicodeCharEnabled && arg.Type.IsStringType) {
-        TrParenExpr(arg, wr, false, wStmts);
-        wr.Write(".VerbatimString(False)");
-      } else {
-        wr.Write($"{DafnyRuntimeModule}.string_of(");
-        wr.Append(Expr(arg, false, wStmts));
-        wr.Write(")");
-      }
-    }
-
-    protected override void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr) {
-      outParams = outParams.Where(f => !f.IsGhost).ToList();
-      wr.Write("return");
-      if (outParams.Count > 0) {
-        wr.Write($" {outParams.Comma(IdName)}");
-      }
-      wr.WriteLine();
-    }
-
-    protected override ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr) {
-      var manager = createContinueLabel ? "c_label" : "label";
-      var block = wr.NewBlockPy($"with {DafnyRuntimeModule}.{manager}(\"{label}\"):");
-      var core = block.Fork();
-      block.WriteLine("pass");
-      return core;
-    }
-
-    protected override void EmitBreak(string label, ConcreteSyntaxTree wr) {
-      wr.WriteLine(label != null ? $"raise {DafnyRuntimeModule}.Break(\"{label}\")" : "break");
-    }
-
-    protected override void EmitContinue(string label, ConcreteSyntaxTree wr) {
-      wr.WriteLine($"raise {DafnyRuntimeModule}.Continue(\"{label}\")");
-    }
-
-    protected override void EmitYield(ConcreteSyntaxTree wr) {
-      wr.WriteLine("yield");
-    }
-
-    protected override void EmitAbsurd(string message, ConcreteSyntaxTree wr) {
-      if (message == null) {
-        message = "unexpected control point";
-      }
-      wr.WriteLine($"raise Exception(\"{message}\")");
-    }
-
-    protected override void EmitHalt(IToken tok, Expression messageExpr, ConcreteSyntaxTree wr) {
-      Contract.Requires(tok != null);
-      var wStmts = wr.Fork();
-      wr.Write($"raise {DafnyRuntimeModule}.HaltException(");
-      wr.Write($"\"{tok.TokenToString(Options)}: \" + ");
-      EmitToString(wr, messageExpr, wStmts);
-      wr.WriteLine(")");
-    }
-
-    protected override ConcreteSyntaxTree EmitIf(out ConcreteSyntaxTree guardWriter, bool hasElse, ConcreteSyntaxTree wr) {
-      wr.Write("if ");
-      guardWriter = wr.Fork();
-      return wr.NewBlockPy(":", hasElse ? "el" : "");
-    }
-
-    protected override ConcreteSyntaxTree EmitBlock(ConcreteSyntaxTree wr) {
-      //This encoding does not provide a new scope
-      return wr.NewBlockPy("if True:");
-    }
-
-    protected override ConcreteSyntaxTree EmitForStmt(IToken tok, IVariable loopIndex, bool goingUp, string endVarName,
-      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {
-      string iterator;
-      var lowWr = new ConcreteSyntaxTree();
-      string argumentRemainder;
-      if (endVarName == null) {
-        iterator = "count";
-        argumentRemainder = goingUp ? "" : "-1, -1";
-      } else {
-        iterator = "range";
-        argumentRemainder = goingUp ? $", {endVarName}" : $"-1, {endVarName}-1, -1";
-      }
-      wr.Format($"for {IdName(loopIndex)} in {iterator}({lowWr}{argumentRemainder})");
-      var bodyWr = wr.NewBlockPy($":");
-      bodyWr = EmitContinueLabel(labels, bodyWr);
-      TrStmtList(body, bodyWr);
-
-      return lowWr;
-    }
-
-    protected override ConcreteSyntaxTree CreateWhileLoop(out ConcreteSyntaxTree guardWriter, ConcreteSyntaxTree wr) {
-      wr.Write("while ");
-      guardWriter = wr.Fork();
-      var wBody = wr.NewBlockPy(":");
-      return wBody;
-    }
-
-    protected override ConcreteSyntaxTree CreateForLoop(string indexVar, string bound, ConcreteSyntaxTree wr, string start = null) {
-      var lowerBound = start == null ? "" : start + ", ";
-      return wr.NewBlockPy($"for {indexVar} in range({lowerBound}{bound}):");
-    }
-
-    protected override ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr) {
-      return wr.NewBlockPy($"for {indexVar} in {DafnyRuntimeModule}.Doubler({start}):");
-    }
-
-    protected override void EmitIncrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine($"{varName} += 1");
-    }
-
-    protected override void EmitDecrementVar(string varName, ConcreteSyntaxTree wr) {
-      wr.WriteLine($"{varName} -= 1");
-    }
-
-    protected override string GetQuantifierName(string bvType) {
-      return $"{DafnyRuntimeModule}.quantifier";
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachLoop(string tmpVarName, Type collectionElementType, IToken tok,
-      out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      collectionWriter = new ConcreteSyntaxTree();
-      wr.WriteLine($"{tmpVarName}: {TypeName(collectionElementType, wr, tok)}")
-        .Format($"for {tmpVarName} in {collectionWriter}:");
-      return wr.NewBlockPy();
-    }
-
-    protected override void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
-      Type collectionElementType, bool introduceBoundVar, IToken tok, ConcreteSyntaxTree wr) {
-      wr.WriteLine($"{boundVarName}{(introduceBoundVar ? $": {TypeName(boundVarType, wr, tok)}" : "")} = {tmpVarName}");
-    }
-
-    protected override ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs,
-        out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr) {
-      collectionWriter = new ConcreteSyntaxTree();
-      return wr.Format($"for {boundVarName} in {collectionWriter}:").NewBlockPy();
-    }
-
-    protected override void EmitNew(Type type, IToken tok, CallStmt initCall, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var cl = ((UserDefinedType)type.NormalizeExpand()).ResolvedClass;
-      var ctor = (Constructor)initCall?.Method;  // correctness of cast follows from precondition of "EmitNew"
-      var sep = "";
-      wr.Write($"{TypeName(type, wr, tok)}(");
-      EmitTypeDescriptorsActuals(TypeArgumentInstantiation.ListFromClass(cl, type.TypeArgs), tok, wr, ref sep);
-      wr.Write(ConstructorArguments(initCall, wStmts, ctor, sep));
-      wr.Write(")");
-    }
-
-    protected override void EmitNewArray(Type elementType, IToken tok, List<string> dimensions,
-      bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var initValue = mustInitialize ? DefaultValue(elementType, wr, tok, true) : "None";
-      wr.Write($"{DafnyArrayClass}({initValue}, {dimensions.Comma(s => s)})");
-    }
-
-    protected static string TranslateEscapes(string s) {
-      s = Util.ReplaceNullEscapesWithCharacterEscapes(s);
-
-      s = Util.ExpandUnicodeEscapes(s, false);
-
-      return s;
-    }
-
-    protected override void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e) {
-      switch (e) {
-        case CharLiteralExpr:
-          var escaped = TranslateEscapes((string)e.Value);
-          if (UnicodeCharEnabled) {
-            wr.Write($"{DafnyRuntimeModule}.CodePoint('{escaped}')");
-          } else {
-            wr.Write($"'{escaped}'");
-          }
-          break;
-        case StringLiteralExpr str:
-          if (UnicodeCharEnabled) {
-            wr.Write($"{DafnySeqMakerFunction}(map({DafnyRuntimeModule}.CodePoint, ");
-            TrStringLiteral(str, wr);
-            wr.Write("))");
-          } else {
-            wr.Write($"{DafnySeqMakerFunction}(");
-            TrStringLiteral(str, wr);
-            wr.Write(")");
-          }
-
-          break;
-        case StaticReceiverExpr:
-          wr.Write(TypeName(e.Type, wr, e.tok));
-          break;
-        default:
-          switch (e.Value) {
-            case null:
-              wr.Write("None");
-              break;
-            case bool value:
-              wr.Write($"{value}");
-              break;
-            case BigInteger integer:
-              wr.Write($"{integer}");
-              break;
-            case BigDec n:
-              wr.Write($"{DafnyRuntimeModule}.BigRational('{n.Mantissa}e{n.Exponent}')");
-              break;
-            default:
-              // TODO: This may not be exhaustive
-              throw new cce.UnreachableException();
-          }
-          break;
-      }
-    }
-
-    protected override void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr) {
-      if (!isVerbatim) {
-        wr.Write($"\"{TranslateEscapes(str)}\"");
-      } else {
-        var n = str.Length;
-        wr.Write("\"");
-        for (var i = 0; i < n; i++) {
-          if (str[i] == '\"' && i + 1 < n && str[i + 1] == '\"') {
-            wr.Write("\\\"");
-            i++;
-          } else if (str[i] == '\\') {
-            wr.Write("\\\\");
-          } else if (str[i] == '\n') {
-            wr.Write("\\n");
-          } else if (str[i] == '\r') {
-            wr.Write("\\r");
-          } else {
-            wr.Write(str[i]);
-          }
-        }
-        wr.Write("\"");
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, bool surroundByUnchecked, ConcreteSyntaxTree wr) {
-      var vec = wr.ForkInParens();
-      wr.Write($" & ((1 << {bvType.Width}) - 1)");
-      return vec;
-    }
-
-    protected override void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
-        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      // (( e0 op1 e1) | (e0 op2 (width - e1)))
-      wr = wr.ForkInParens();
-      EmitShift(e0, e1, isRotateLeft ? "<<" : ">>", isRotateLeft, true, wr.ForkInParens(), inLetExprBody, wStmts, tr);
-      wr.Write(" | ");
-      EmitShift(e0, e1, isRotateLeft ? ">>" : "<<", !isRotateLeft, false, wr.ForkInParens(), inLetExprBody, wStmts, tr);
-    }
-
-    void EmitShift(Expression e0, Expression e1, string op, bool truncate, bool firstOp, ConcreteSyntaxTree wr,
-        bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      var bv = e0.Type.AsBitVectorType;
-      if (truncate) {
-        wr = EmitBitvectorTruncation(bv, true, wr);
-      }
-      tr(e0, wr, inLetExprBody, wStmts);
-      wr.Write($" {op} ");
-      if (!firstOp) {
-        wr = wr.ForkInParens().Write($"{bv.Width} - ");
-      }
-
-      tr(e1, wr.ForkInParens(), inLetExprBody, wStmts);
-    }
-
-    protected override void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      wr.Write("[]");
-    }
-
-    protected override ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr) {
-      var wrTuple = new ConcreteSyntaxTree();
-      wr.FormatLine($"{ingredients}.append(({wrTuple}))");
-      return wrTuple;
-    }
-
-    protected override void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr) {
-      wr.Write("{0}[{1}]", prefix, i);
-    }
-
-    protected override string IdProtect(string name) {
-      return PublicIdProtect(name);
-    }
-
-    public override string PublicIdProtect(string name) {
-      Contract.Requires(name != null);
-      return name switch {
-        _ => MangleName(name)
-      };
-    }
-
-    protected override string FullTypeName(UserDefinedType udt, MemberDecl member = null) {
-      if (udt is ArrowType) {
-        //TODO: Add deeper types
-        return "Callable";
-      }
-
-      var cl = udt.ResolvedClass;
-      return cl switch {
-        TypeParameter => $"TypeVar(\'{IdProtect(cl.GetCompileName(Options))}\')",
-        ArrayClassDecl => DafnyArrayClass,
-        TupleTypeDecl => "tuple",
-        _ => IdProtect(cl.GetFullCompileName(Options))
-      };
-    }
-
-    protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
-      var isTailRecursive = enclosingMethod is { IsTailRecursive: true } || enclosingFunction is { IsTailRecursive: true };
-      wr.Write(isTailRecursive ? "_this" : "self");
-    }
-
-    protected override void EmitNull(Type _, ConcreteSyntaxTree wr) {
-      wr.Write("None");
-    }
-
-    protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
-      EmitDatatypeValue(dtv.Ctor.EnclosingDatatype, dtv.Ctor, dtv.IsCoCall, typeDescriptorArguments, arguments, wr);
-    }
-
-    void EmitDatatypeValue(DatatypeDecl dt, DatatypeCtor ctor, bool isCoCall, string typeDescriptorArguments, string arguments,
-      ConcreteSyntaxTree wr, bool qualifiedName = true) {
-      if (isCoCall) {
-        wr.Write($"{dt.GetFullCompileName(Options)}__Lazy(lambda: ");
-        var end = wr.Fork();
-        wr.Write(")");
-        wr = end;
-      }
-      if (dt is not TupleTypeDecl) {
-        wr.Write($"{DtCtorDeclarationName(ctor, qualifiedName)}");
-      } else if (ctor.Destructors.Count(d => !d.IsGhost) == 1) {
-        // 1-tuples need this this for disambiguation
-        arguments += ",";
-      }
-      var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
-      wr.Write($"({typeDescriptorArguments}{sep}{arguments})");
-    }
-
-    protected override void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType,
-        out string compiledName, out string preString, out string postString) {
-      compiledName = "";
-      preString = "";
-      postString = "";
-      switch (id) {
-        case SpecialField.ID.UseIdParam:
-          compiledName = IdProtect((string)idParam);
-          break;
-        case SpecialField.ID.Keys:
-          compiledName = "keys";
-          break;
-        case SpecialField.ID.Values:
-          compiledName = "values";
-          break;
-        case SpecialField.ID.Items:
-          compiledName = "items";
-          break;
-        case SpecialField.ID.Floor:
-          preString = "floor(";
-          postString = ")";
-          break;
-        case SpecialField.ID.IsLimit:
-          preString = $"{DafnyRuntimeModule}.BigOrdinal.is_limit(";
-          postString = ")";
-          break;
-        case SpecialField.ID.IsSucc:
-          preString = $"{DafnyRuntimeModule}.BigOrdinal.is_succ(";
-          postString = ")";
-          break;
-        case SpecialField.ID.Offset:
-          preString = $"{DafnyRuntimeModule}.BigOrdinal.offset(";
-          postString = ")";
-          break;
-        case SpecialField.ID.IsNat:
-          preString = $"{DafnyRuntimeModule}.BigOrdinal.is_nat(";
-          postString = ")";
-          break;
-        case SpecialField.ID.ArrayLength:
-        case SpecialField.ID.ArrayLengthInt:
-          var dim = idParam is int d and > 0 ? d : 0;
-          compiledName = $"length({dim})";
-          break;
-        default:
-          Contract.Assert(false); // unexpected ID
-          break;
-      }
-    }
-
-    protected override ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member,
-      List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap, Type expectedType,
-      string additionalCustomParameter = null, bool internalAccess = false) {
-      switch (DatatypeWrapperEraser.GetMemberStatus(Options, member)) {
-        case DatatypeWrapperEraser.MemberCompileStatus.Identity:
-          return SimpleLvalue(obj);
-        case DatatypeWrapperEraser.MemberCompileStatus.AlwaysTrue:
-          return StringLvalue(True);
-        default:
-          break;
-      }
-      switch (member) {
-        case DatatypeDestructor dd: {
-            var dest = dd.EnclosingClass switch {
-              TupleTypeDecl => $"[{dd.CorrespondingFormals[0].NameForCompilation}]",
-              _ => $".{IdProtect(dd.GetCompileName(Options))}"
-            };
-            return SuffixLvalue(obj, dest);
-          }
-        case SpecialField sf: {
-            GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, objType, out var compiledName, out _, out _);
-            return SimpleLvalue(w => {
-              var customReceiver = NeedsCustomReceiver(sf) && sf.EnclosingClass is not TraitDecl;
-              if (sf.IsStatic || customReceiver) {
-                w.Write(TypeName_Companion(objType, w, member.tok, member));
-              } else {
-                obj(w);
-              }
-              if (compiledName.Length > 0) {
-                w.Write($".{(sf is ConstantField && internalAccess ? "_" : "")}{compiledName}");
-              }
-              var sep = "(";
-              EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), member.tok, w, ref sep);
-              if (customReceiver) {
-                w.Write(sep);
-                obj(w);
-                sep = ", ";
-              }
-              if (sep != "(") {
-                w.Write(")");
-              }
-            });
-          }
-        case Field: {
-            return SimpleLvalue(w => {
-              if (member.IsStatic) { w.Write(TypeName_Companion(objType, w, member.tok, member)); } else { obj(w); }
-              w.Write($".{IdName(member)}");
-            });
-          }
-        case Function fn: {
-            if (additionalCustomParameter == null && typeArgs.Count == 0) {
-              return SuffixLvalue(obj, $".{IdName(fn)}");
-            }
-            return SimpleLvalue(w => {
-              var args = fn.Formals
-                .Where(f => !f.IsGhost)
-                .Select(_ => ProtectedFreshId("_eta"))
-                .Comma();
-              w.Write($"lambda {args}: ");
-              obj(w);
-              w.Write($".{IdName(fn)}(");
-              var sep = "";
-              EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, member.EnclosingClass, member, false), fn.tok, w, ref sep);
-              if (additionalCustomParameter != null) {
-                w.Write(sep + additionalCustomParameter);
-                sep = ", ";
-              }
-              if (args.Length > 0) {
-                w.Write(sep);
-              }
-              w.Write(args + ")");
-            });
-          }
-        default:
-          return SimpleLvalue(w => {
-            w.Write($"{TypeName_Companion(objType, w, member.tok, member)}.{IdName(member)}({additionalCustomParameter ?? ""})");
-          });
-      }
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<string> indices, Type elmtType, ConcreteSyntaxTree wr) {
-      Contract.Assert(indices is { Count: >= 1 });
-      var w = wr.Fork();
-      wr.Write($"[{indices.Comma()}]");
-      return w;
-    }
-
-    protected override ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Assert(indices != null);  // follows from precondition
-      var strings = indices.Select(index => Expr(index, inLetExprBody, wStmts).ToString());
-      return EmitArraySelect(strings.ToList(), elmtType, wr);
-    }
-
-    protected override void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts) {
-      // This is also used for bit shift operators, or more generally any binary operation where CompileBinOp()
-      // sets the convertE1_to_int out parameter to true. This compiler always sets that to false, however,
-      // so this method is only called for non-sequentializable forall statements.
-      TrParenExpr("int", expr, wr, inLetExprBody, wStmts);
-    }
-
-    protected override void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(source, wr, inLetExprBody, wStmts);
-      wr.Write("[");
-      wr.Append(Expr(index, inLetExprBody, wStmts));
-      wr.Write("]");
-    }
-
-    protected override void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
-      CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      TrParenExpr(source, wr, inLetExprBody, wStmts);
-      wr.Write(".set(");
-      wr.Append(Expr(index, inLetExprBody, wStmts));
-      wr.Write(", ");
-      wr.Append(CoercedExpr(value, resultCollectionType.ValueArg, inLetExprBody, wStmts));
-      wr.Write(")");
-    }
-
-    protected override void EmitSeqSelectRange(Expression source, Expression lo, Expression hi, bool fromArray,
-      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write($"{DafnySeqMakerFunction}(");
-      TrParenExpr(source, wr, inLetExprBody, wStmts);
-      wr.Write("[");
-      if (lo != null) { wr.Append(Expr(lo, inLetExprBody, wStmts)); }
-      wr.Write(":");
-      if (hi != null) { wr.Append(Expr(hi, inLetExprBody, wStmts)); }
-
-      wr.Write(":])");
-    }
-
-    protected override void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      ConcreteSyntaxTree valueExpression;
-      var range = $"range({Expr(expr.N, inLetExprBody, wStmts)})";
-      wr.Write(DafnySeqMakerFunction);
-      if (expr.Initializer is LambdaExpr lam) {
-        valueExpression = Expr(lam.Body, inLetExprBody, wStmts);
-        var binder = IdProtect(lam.BoundVars[0].CompileName);
-        wr.Write($"([{valueExpression} for {binder} in {range}])");
-      } else {
-        valueExpression = Expr(expr.Initializer, inLetExprBody, wStmts);
-        wr.Write($"(tuple(map({valueExpression}, {range})))");
-      }
-    }
-
-    protected override void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts) {
-      TrParenExpr(DafnyMultiSetClass, expr.E, wr, inLetExprBody, wStmts);
-    }
-
-    protected override void EmitApplyExpr(Type functionType, IToken tok, Expression function,
-        List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Append(Expr(function, inLetExprBody, wStmts));
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-    }
-
-    protected override ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments,
-      List<Type> boundTypes, Type resultType, IToken resultTok, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ref ConcreteSyntaxTree wStmts) {
-      var functionName = ProtectedFreshId("_lambda");
-      wr.Write($"{functionName}");
-      TrExprList(arguments, wr, inLetExprBody, wStmts);
-      var wrBody = wStmts.NewBlockPy($"def {functionName}({boundVars.Comma()}):", close: BlockStyle.Newline);
-      wStmts = wrBody.Fork();
-      return EmitReturnExpr(wrBody);
-    }
-
-    protected override void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex, DatatypeCtor ctor,
-        List<Type> typeArgs, Type bvType, ConcreteSyntaxTree wr) {
-      source(wr);
-      if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, ctor.EnclosingDatatype, out var coreDtor)) {
-        Contract.Assert(coreDtor.CorrespondingFormals.Count == 1);
-        Contract.Assert(dtor == coreDtor.CorrespondingFormals[0]); // any other destructor is a ghost
-      } else {
-        wr.Write(ctor.EnclosingDatatype is TupleTypeDecl ? $"[{dtor.NameForCompilation}]" : $".{IdProtect(dtor.CompileName)}");
-      }
-    }
-
-    protected override bool TargetLambdasRestrictedToExpressions => true;
-    protected override ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IToken tok, List<string> inNames,
-        Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false) {
-      var functionName = ProtectedFreshId("_lambda");
-      wr.Write(functionName);
-      return wStmts.NewBlockPy($"def {functionName}({inNames.Comma()}):", close: BlockStyle.Newline);
-    }
-
-    protected override void CreateIIFE(string bvName, Type bvType, IToken bvTok, Type bodyType, IToken bodyTok,
-      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody) {
-      wrRhs = new ConcreteSyntaxTree();
-      var functionName = ProtectedFreshId("_iife");
-      wr.Format($"{functionName}({wrRhs})");
-      wrBody = wStmts.NewBlockPy($"def {functionName}({bvName}):");
-      wStmts = wrBody.Fork();
-      wrBody = EmitReturnExpr(wrBody);
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE0(Type resultType, IToken resultTok, ConcreteSyntaxTree wr,
-        ConcreteSyntaxTree wStmts) {
-      var functionName = ProtectedFreshId("_iife");
-      wr.WriteLine($"{functionName}()");
-      return wStmts.NewBlockPy($"def {functionName}():");
-    }
-
-    protected override ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IToken resultTok, string bvName,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var functionName = ProtectedFreshId("_iife");
-      wr.WriteLine($"{functionName}({source})");
-      return wStmts.NewBlockPy($"def {functionName}({bvName}):");
-    }
-
-    protected override ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
-      if (type.HasFatPointer) {
-        var w = wr.ForkInParens();
-        wr.Write("._value");
-        return w;
-      } else {
-        return wr;
-      }
-    }
-
-    protected override ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
-      if (type.HasFatPointer) {
-        wr.Write(type.AsNewtype.GetFullCompileName(Options));
-        return wr.ForkInParens();
-      } else {
-        return wr;
-      }
-    }
-
-    protected override void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      switch (op) {
-        case ResolvedUnaryOp.Cardinality:
-          var multiset = expr.Type.AsMultiSetType != null;
-          if (!multiset) { wr.Write("len"); }
-          TrParenExpr(expr, wr, inLetExprBody, wStmts);
-          if (multiset) { wr.Write(".cardinality"); }
-          break;
-        case ResolvedUnaryOp.BitwiseNot:
-          TrParenExpr("~", expr, wr, inLetExprBody, wStmts);
-          break;
-        case ResolvedUnaryOp.BoolNot:
-          TrParenExpr("not", expr, wr, inLetExprBody, wStmts);
-          break;
-        default:
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
-      }
-    }
-
-    protected override void CompileBinOp(BinaryExpr.ResolvedOpcode op,
-      Expression e0, Expression e1, IToken tok, Type resultType,
-      out string opString,
-      out string preOpString,
-      out string postOpString,
-      out string callString,
-      out string staticCallString,
-      out bool reverseArguments,
-      out bool truncateResult,
-      out bool convertE1_to_int,
-      out bool coerceE1,
-      ConcreteSyntaxTree errorWr) {
-
-      opString = null;
-      preOpString = "";
-      postOpString = "";
-      callString = null;
-      staticCallString = null;
-      reverseArguments = false;
-      truncateResult = false;
-      convertE1_to_int = false;
-      coerceE1 = false;
-
-      switch (op) {
-        case BinaryExpr.ResolvedOpcode.And:
-          opString = "and";
-          break;
-
-        case BinaryExpr.ResolvedOpcode.Or:
-          opString = "or";
-          break;
-
-        case BinaryExpr.ResolvedOpcode.Imp:
-          preOpString = "not ";
-          opString = "or";
-          break;
-
-        case BinaryExpr.ResolvedOpcode.LeftShift:
-          opString = "<<";
-          truncateResult = true;
-          break;
-
-        case BinaryExpr.ResolvedOpcode.RightShift:
-          opString = ">>";
-          break;
-
-        case BinaryExpr.ResolvedOpcode.Add:
-        case BinaryExpr.ResolvedOpcode.Concat:
-          if (resultType.IsCharType && !UnicodeCharEnabled) {
-            staticCallString = $"{DafnyRuntimeModule}.plus_char";
-          } else {
-            if (resultType.IsNumericBased() || resultType.IsBitVectorType || resultType.IsBigOrdinalType) {
-              truncateResult = true;
-            }
-            opString = "+";
-          }
-          break;
-
-        case BinaryExpr.ResolvedOpcode.Sub:
-        case BinaryExpr.ResolvedOpcode.SetDifference:
-        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
-        case BinaryExpr.ResolvedOpcode.MapSubtraction:
-          if (resultType.IsCharType && !UnicodeCharEnabled) {
-            staticCallString = $"{DafnyRuntimeModule}.minus_char";
-          } else {
-            if (resultType.IsNumericBased() || resultType.IsBitVectorType || resultType.IsBigOrdinalType) {
-              truncateResult = true;
-            }
-            opString = "-";
-          }
-          break;
-
-        case BinaryExpr.ResolvedOpcode.Mul:
-          opString = "*";
-          truncateResult = true;
-          break;
-
-        case BinaryExpr.ResolvedOpcode.Div:
-          if (resultType.IsNumericBased(Type.NumericPersuasion.Int) || resultType.IsBitVectorType) {
-            staticCallString = $"{DafnyRuntimeModule}.euclidian_division";
-          } else {
-            opString = "/";
-          }
-          break;
-
-        case BinaryExpr.ResolvedOpcode.Mod:
-          staticCallString = $"{DafnyRuntimeModule}.euclidian_modulus"; break;
-
-        case BinaryExpr.ResolvedOpcode.ProperPrefix:
-          opString = "<"; break;
-
-        case BinaryExpr.ResolvedOpcode.Prefix:
-          opString = "<="; break;
-
-        case BinaryExpr.ResolvedOpcode.SeqEq:
-        case BinaryExpr.ResolvedOpcode.SetEq:
-        case BinaryExpr.ResolvedOpcode.MapEq:
-        case BinaryExpr.ResolvedOpcode.EqCommon:
-        case BinaryExpr.ResolvedOpcode.MultiSetEq:
-          opString = "=="; break;
-
-        case BinaryExpr.ResolvedOpcode.NeqCommon:
-        case BinaryExpr.ResolvedOpcode.SeqNeq:
-        case BinaryExpr.ResolvedOpcode.SetNeq:
-        case BinaryExpr.ResolvedOpcode.MapNeq:
-        case BinaryExpr.ResolvedOpcode.MultiSetNeq:
-          opString = "!="; break;
-
-        case BinaryExpr.ResolvedOpcode.Union:
-        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-        case BinaryExpr.ResolvedOpcode.MapMerge:
-          opString = "|"; break;
-
-        case BinaryExpr.ResolvedOpcode.InSet:
-        case BinaryExpr.ResolvedOpcode.InMultiSet:
-        case BinaryExpr.ResolvedOpcode.InSeq:
-        case BinaryExpr.ResolvedOpcode.InMap:
-          opString = "in"; break;
-
-        case BinaryExpr.ResolvedOpcode.NotInSet:
-        case BinaryExpr.ResolvedOpcode.NotInMultiSet:
-        case BinaryExpr.ResolvedOpcode.NotInSeq:
-        case BinaryExpr.ResolvedOpcode.NotInMap:
-          opString = "not in"; break;
-
-        case BinaryExpr.ResolvedOpcode.Intersection:
-        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-          callString = "intersection"; break;
-
-        case BinaryExpr.ResolvedOpcode.Disjoint:
-        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
-          callString = "isdisjoint"; break;
-
-        case BinaryExpr.ResolvedOpcode.Subset:
-        case BinaryExpr.ResolvedOpcode.MultiSubset:
-          callString = "issubset"; break;
-
-        case BinaryExpr.ResolvedOpcode.ProperSubset:
-        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
-          callString = "ispropersubset"; break;
-
-
-        default:
-          base.CompileBinOp(op, e0, e1, tok, resultType,
-            out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments,
-            out truncateResult, out convertE1_to_int, out coerceE1,
-            errorWr);
-          break;
-      }
-    }
-
-    protected override void TrStmtList(List<Statement> stmts, ConcreteSyntaxTree writer) {
-      Contract.Requires(cce.NonNullElements(stmts));
-      Contract.Requires(writer != null);
-      var listWriter = new ConcreteSyntaxTree();
-      base.TrStmtList(stmts, listWriter);
-      if (listWriter.Descendants.OfType<LineSegment>().Any()) {
-        writer.Append(listWriter);
-      } else {
-        writer.WriteLine("pass");
-      }
-    }
-
-    protected override void EmitITE(Expression guard, Expression thn, Expression els, Type resultType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Requires(guard != null);
-      Contract.Requires(thn != null);
-      Contract.Requires(els != null);
-      Contract.Requires(wr != null);
-
-      ConcreteSyntaxTree Tree(Expression e) => Expr(e, inLetExprBody, wStmts);
-
-      wr.Format($"({Tree(thn)} if {Tree(guard)} else {Tree(els)})");
-    }
-
-    protected override void EmitIsZero(string varName, ConcreteSyntaxTree wr) {
-      wr.Write($"{varName} == 0");
-    }
-
-    protected override void EmitConversionExpr(ConversionExpr e, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var (pre, post) = ("", "");
-      if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Int) || e.E.Type.IsBitVectorType || e.E.Type.IsBigOrdinalType) {
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          (pre, post) = ($"{DafnyRuntimeModule}.BigRational(", ", 1)");
-        } else if (e.ToType.IsCharType) {
-          if (UnicodeCharEnabled) {
-            (pre, post) = ($"{DafnyRuntimeModule}.CodePoint(chr(", "))");
-          } else {
-            (pre, post) = ("chr(", ")");
-          }
-        }
-      } else if (e.E.Type.IsCharType) {
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Int) || e.ToType.IsBitVectorType || e.ToType.IsBigOrdinalType) {
-          (pre, post) = ("ord(", ")");
-        } else if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          (pre, post) = ($"{DafnyRuntimeModule}.BigRational(ord(", "), 1)");
-        }
-      } else if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-        if (e.ToType.IsNumericBased(Type.NumericPersuasion.Int) || e.ToType.IsBitVectorType || e.ToType.IsBigOrdinalType) {
-          (pre, post) = ("int(", ")");
-        } else if (e.ToType.IsCharType) {
-          if (UnicodeCharEnabled) {
-            (pre, post) = ($"{DafnyRuntimeModule}.CodePoint(chr(floor(", ")))");
-          } else {
-            (pre, post) = ("chr(floor(", "))");
-          }
-        }
-      }
-      wr.Write(pre);
-      wr.Append(Expr(e.E, inLetExprBody, wStmts));
-      wr.Write(post);
-    }
-
-    protected override void EmitTypeTest(string localName, Type fromType, Type toType, IToken tok, ConcreteSyntaxTree wr) {
-      if (fromType.IsRefType && !fromType.IsNonNullRefType && toType.IsRefType) {
-        wr = wr.Write($"{localName} is {(toType.IsNonNullRefType ? "not None and" : "None or")} ").ForkInParens();
-      }
-
-      if (fromType.IsTraitType && toType.AsNewtype != null) {
-        wr.Write($"isinstance({localName}, {toType.AsNewtype.GetFullCompileName(Options)})");
-      } else {
-        wr.Write($"isinstance({localName}, {TypeName(toType, wr, tok)})");
-      }
-
-      var udtTo = (UserDefinedType)toType.NormalizeExpandKeepConstraints();
-      if (udtTo.ResolvedClass is SubsetTypeDecl and not NonNullTypeDecl) {
-        // TODO: test constraints
-        throw new UnsupportedFeatureException(Token.NoToken, Feature.SubsetTypeTests);
-      }
-    }
-
-    protected override void EmitCollectionDisplay(CollectionType ct, IToken tok, List<Expression> elements,
-      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var (open, close) = ct switch {
-        SeqType or MultiSetType => ("[", "]"),
-        _ => ("{", "}")
-      };
-      wr.Write(ct is SeqType ? DafnySeqMakerFunction : TypeHelperName(ct));
-      wr.Write("(");
-      wr.Write(open);
-      TrExprList(elements, wr, inLetExprBody, wStmts, typeAt: _ => ct.Arg, parens: false);
-      wr.Write(close);
-      wr.Write(")");
-    }
-
-    private static string TypeHelperName(Type ct) {
-      return ct switch {
-        SetType => DafnySetClass,
-        SeqType => DafnySeqClass,
-        MapType => DafnyMapClass,
-        MultiSetType => DafnyMultiSetClass,
-        _ => throw new NotImplementedException()
-      };
-    }
-
-    protected override void EmitMapDisplay(MapType mt, IToken tok, List<ExpressionPair> elements, bool inLetExprBody,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write($"{DafnyMapClass}({{");
-      var sep = "";
-      foreach (var p in elements) {
-        wr.Write(sep);
-        wr.Append(Expr(p.A, inLetExprBody, wStmts));
-        wr.Write(": ");
-        wr.Append(Expr(p.B, inLetExprBody, wStmts));
-        sep = ", ";
-      }
-      wr.Write("})");
-    }
-
-    protected override void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName) {
-      wr.WriteLine($"{collectionName} = {DafnySetClass}()");
-    }
-
-    protected override void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName) {
-      wr.WriteLine($"{collectionName} = {DafnyMapClass}()");
-    }
-
-    protected override void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody,
-        ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      wr.WriteLine($"{collName} = {collName}.union({DafnySetClass}([{Expr(elmt, inLetExprBody, wStmts)}]))");
-    }
-
-    protected override ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IToken tok, string collName, Expression term,
-        bool inLetExprBody, ConcreteSyntaxTree wr) {
-      var termLeftWriter = new ConcreteSyntaxTree();
-      var wStmts = wr.Fork();
-      wr.FormatLine($"{collName}[{termLeftWriter}] = {Expr(term, inLetExprBody, wStmts)}");
-      return termLeftWriter;
-    }
-
-    [CanBeNull]
-    protected override string GetSubtypeCondition(string tmpVarName, Type boundVarType, IToken tok, ConcreteSyntaxTree wPreconditions) {
-      if (!boundVarType.IsRefType) {
-        return null;
-      }
-
-      var typeTest = boundVarType.IsObject || boundVarType.IsObjectQ
-        ? True
-        : $"isinstance({tmpVarName}, {TypeName(boundVarType, wPreconditions, tok)})";
-      return boundVarType.IsNonNullRefType
-        ? $"{tmpVarName} is not None and {typeTest}"
-        : $"{tmpVarName} is None or {typeTest}";
-    }
-
-    protected override string GetCollectionBuilder_Build(CollectionType ct, IToken tok, string collName, ConcreteSyntaxTree wr) {
-      return TypeHelperName(ct) + $"({collName})";
-    }
-
-    protected override Type EmitIntegerRange(Type type, out ConcreteSyntaxTree wLo, out ConcreteSyntaxTree wHi, ConcreteSyntaxTree wr) {
-      wr.Write($"{DafnyRuntimeModule}.IntegerRange(");
-      wLo = wr.Fork();
-      wr.Write(", ");
-      wHi = wr.Fork();
-      wr.Write(')');
-      return new IntType();
-    }
-
-    protected override void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      wr.Write("[");
-      wr.Append(Expr(e, inLetExprBody, wStmts));
-      wr.Write("]");
-    }
-
-    protected override void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr) {
-      var tryBlock = wr.NewBlockPy("try:");
-      TrStmt(body, tryBlock);
-      var exceptBlock = wr.NewBlockPy($"except {DafnyRuntimeModule}.HaltException as e:");
-      exceptBlock.Write($"{IdProtect(haltMessageVarName)} = ");
-      if (UnicodeCharEnabled) {
-        exceptBlock.Write($"{DafnySeqMakerFunction}(map({DafnyRuntimeModule}.CodePoint, e.message))");
-      } else {
-        exceptBlock.Write("e.message");
-      }
-      exceptBlock.WriteLine();
-      TrStmt(recoveryBody, exceptBlock);
-    }
-  }
-}
diff --git a/Source/DafnyCore/Compilers/Python/PythonBackend.cs b/Source/DafnyCore/Compilers/Python/PythonBackend.cs
deleted file mode 100644
index 9fbac042499..00000000000
--- a/Source/DafnyCore/Compilers/Python/PythonBackend.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace Microsoft.Dafny.Compilers;
-
-public class PythonBackend : ExecutableBackend {
-
-  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".py" };
-
-  public override string TargetName => "Python";
-  public override bool IsStable => true;
-  public override string TargetExtension => "py";
-  public override int TargetIndentSize => 4;
-
-  public override string TargetBaseDir(string dafnyProgramName) =>
-    $"{Path.GetFileNameWithoutExtension(dafnyProgramName)}-py";
-
-  public override string TargetBasename(string dafnyProgramName) => "__main__";
-
-  public override bool SupportsInMemoryCompilation => false;
-  public override bool TextualTargetIsExecutable => true;
-
-  public override IReadOnlySet<string> SupportedNativeTypes =>
-    new HashSet<string> { "byte", "sbyte", "ushort", "short", "uint", "int", "number", "ulong", "long" };
-
-  protected override SinglePassCompiler CreateCompiler() {
-    return new PythonCompiler(Options, Reporter);
-  }
-
-  private static readonly Regex ModuleLine = new(@"^\s*assert\s+""([a-zA-Z0-9_]+(.[a-zA-Z0-9_]+)*)""\s*==\s*__name__\s*$");
-
-  private static string FindModuleName(string externFilename) {
-    using var rd = new StreamReader(new FileStream(externFilename, FileMode.Open, FileAccess.Read));
-    while (rd.ReadLine() is { } line) {
-      var match = ModuleLine.Match(line);
-      if (match.Success) {
-        rd.Close();
-        return match.Groups[1].Value;
-      }
-    }
-    rd.Close();
-    return Path.GetExtension(externFilename) == ".py" ? Path.GetFileNameWithoutExtension(externFilename) : null;
-  }
-
-  bool CopyExternLibraryIntoPlace(string externFilename, string mainProgram, TextWriter outputWriter) {
-    // Grossly, we need to look in the file to figure out where to put it
-    var moduleName = FindModuleName(externFilename);
-    if (moduleName == null) {
-      outputWriter.WriteLine($"Unable to determine module name: {externFilename}");
-      return false;
-    }
-    var mainDir = Path.GetDirectoryName(mainProgram);
-    Contract.Assert(mainDir != null);
-    var modulePath = moduleName.Replace('.', Path.DirectorySeparatorChar);
-    var tgtFilename = Path.Combine(mainDir, $"{modulePath}.py");
-    var file = new FileInfo(externFilename);
-    Directory.CreateDirectory(Path.GetDirectoryName(tgtFilename)!);
-    file.CopyTo(tgtFilename, true);
-    if (Options.Verbose) {
-      outputWriter.WriteLine($"Additional input {externFilename} copied to {tgtFilename}");
-    }
-    return true;
-  }
-
-  public override void CleanSourceDirectory(string sourceDirectory) {
-    var cacheDirectory = Path.Combine(sourceDirectory, "__pycache__");
-    try {
-      Directory.Delete(cacheDirectory, true);
-    } catch (DirectoryNotFoundException) {
-    }
-  }
-
-  public override bool CompileTargetProgram(string dafnyProgramName, string targetProgramText,
-      string /*?*/ callToMain, string /*?*/ targetFilename, ReadOnlyCollection<string> otherFileNames,
-      bool runAfterCompile, TextWriter outputWriter, out object compilationResult) {
-    compilationResult = null;
-    foreach (var otherFileName in otherFileNames) {
-      if (Path.GetExtension(otherFileName) != ".py") {
-        outputWriter.WriteLine($"Unrecognized file as extra input for Python compilation: {otherFileName}");
-        return false;
-      }
-      if (!CopyExternLibraryIntoPlace(otherFileName, targetFilename, outputWriter)) {
-        return false;
-      }
-    }
-    if (!runAfterCompile) {
-      var psi = PrepareProcessStartInfo("python3");
-      psi.Arguments = $"-m compileall -q {Path.GetDirectoryName(targetFilename)}";
-      return 0 == RunProcess(psi, outputWriter, outputWriter, "Error while compiling Python files.");
-    }
-    return true;
-  }
-
-  public override bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain, /*?*/
-    string targetFilename, ReadOnlyCollection<string> otherFileNames, object compilationResult, TextWriter outputWriter,
-    TextWriter errorWriter) {
-    Contract.Requires(targetFilename != null || otherFileNames.Count == 0);
-    var psi = PrepareProcessStartInfo("python3", Options.MainArgs.Prepend(targetFilename));
-    psi.EnvironmentVariables["PYTHONIOENCODING"] = "utf8";
-    return 0 == RunProcess(psi, outputWriter, errorWriter);
-  }
-
-  public PythonBackend(DafnyOptions options) : base(options) {
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/Rust/Compiler-rust.cs b/Source/DafnyCore/Compilers/Rust/Compiler-rust.cs
deleted file mode 100644
index 53855bb1162..00000000000
--- a/Source/DafnyCore/Compilers/Rust/Compiler-rust.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using Dafny;
-using DCOMP;
-
-namespace Microsoft.Dafny.Compilers {
-
-  class RustCompiler : DafnyWrittenCompiler {
-
-    public override ISequence<Rune> Compile(Sequence<DAST.Module> program) {
-      return COMP.Compile(program);
-    }
-
-    public override ISequence<Rune> EmitCallToMain(string fullName) {
-      var splitByDot = fullName.Split('.');
-      var convertedToUnicode = Sequence<Sequence<Rune>>.FromArray(splitByDot.Select(s => (Sequence<Rune>)Sequence<Rune>.UnicodeFromString(s)).ToArray());
-      return COMP.EmitCallToMain(convertedToUnicode);
-    }
-
-  }
-
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/Rust/Dafny-compiler-rust.dfy b/Source/DafnyCore/Compilers/Rust/Dafny-compiler-rust.dfy
deleted file mode 100644
index df615ddf0ca..00000000000
--- a/Source/DafnyCore/Compilers/Rust/Dafny-compiler-rust.dfy
+++ /dev/null
@@ -1,1428 +0,0 @@
-include "../Dafny/AST.dfy"
-
-module {:extern "DCOMP"} DCOMP {
-  import opened DAST
-
-  // https://stackoverflow.com/questions/62722832/convert-numbers-to-strings
-  type stringNat = s: string |
-      |s| > 0 && (|s| > 1 ==> s[0] != '0') &&
-      forall i | 0 <= i < |s| :: s[i] in "0123456789"
-    witness "1"
-
-  function natToString(n: nat): stringNat {
-    match n
-    case 0 => "0" case 1 => "1" case 2 => "2" case 3 => "3" case 4 => "4"
-    case 5 => "5" case 6 => "6" case 7 => "7" case 8 => "8" case 9 => "9"
-    case _ => natToString(n / 10) + natToString(n % 10)
-  }
-
-  class COMP {
-    static method GenModule(mod: Module, containingPath: seq<Ident>) returns (s: string) {
-      var body := GenModuleBody(mod.body, containingPath + [Ident.Ident(mod.name)]);
-      s := "mod r#" + mod.name + " {\n" + body + "\n}";
-    }
-
-    static method GenModuleBody(body: seq<ModuleItem>, containingPath: seq<Ident>) returns (s: string) {
-      s := "";
-      var i := 0;
-      while i < |body| {
-        var generated: string;
-        match body[i] {
-          case Module(m) => generated := GenModule(m, containingPath);
-          case Class(c) => generated := GenClass(c, containingPath + [Ident.Ident(c.name)]);
-          case Trait(t) => generated := GenTrait(t, containingPath);
-          case Newtype(n) => generated := GenNewtype(n);
-          case Datatype(d) => generated := GenDatatype(d);
-        }
-
-        if i > 0 {
-          s := s + "\n";
-        }
-
-        s := s + generated;
-        i := i + 1;
-      }
-    }
-
-    static method GenClass(c: Class, path: seq<Ident>) returns (s: string) {
-      var implBody, traitBodies := GenClassImplBody(c.body, false, Type.Path(path, [], ResolvedType.Datatype(path)), {});
-      implBody := "pub fn new() -> Self {\n" + "r#" + c.name + " {\n" + "" + "\n}\n}\n" + implBody;
-      s := "pub struct r#" + c.name + " {\n" + "" +  "\n}" + "\n" + "impl r#" + c.name + " {\n" + implBody + "\n}";
-      if (|c.superClasses| > 0) {
-        var i := 0;
-        while i < |c.superClasses| {
-          var superClass := c.superClasses[i];
-          match superClass {
-            case Path(traitPath, typeArgs, Trait(_)) => {
-              var pathStr := GenPath(traitPath);
-              var typeArgs := GenTypeArgs(typeArgs, false, false);
-              var body := "";
-              if traitPath in traitBodies {
-                body := traitBodies[traitPath];
-              }
-
-              var genSelfPath := GenPath(path);
-              s := s + "\nimpl " + pathStr + typeArgs + " for ::std::rc::Rc<" + genSelfPath + "> {\n" + body + "\n}";
-            }
-            case _ => {}
-          }
-          i := i + 1;
-        }
-      }
-    }
-
-    static method GenTrait(t: Trait, containingPath: seq<Ident>) returns (s: string) {
-      var typeParamsSet := {};
-      var typeParams := "";
-      var tpI := 0;
-      if |t.typeParams| > 0 {
-        typeParams := "<";
-        while tpI < |t.typeParams| {
-          var tp := t.typeParams[tpI];
-          typeParamsSet := typeParamsSet + {tp};
-          var genTp := GenType(tp, false, false);
-          typeParams := typeParams + genTp + ", ";
-          tpI := tpI + 1;
-        }
-        typeParams := typeParams + ">";
-      }
-
-      var fullPath := containingPath + [Ident.Ident(t.name)];
-      var implBody, _ := GenClassImplBody(t.body, true, Type.Path(fullPath, [], ResolvedType.Trait(fullPath)), typeParamsSet);
-      s := "pub trait r#" + t.name + typeParams + " {\n" + implBody +  "\n}";
-    }
-
-    static method GenNewtype(c: Newtype) returns (s: string) {
-      var typeParamsSet := {};
-      var typeParams := "";
-      var constrainedTypeParams := "";
-      var tpI := 0;
-      if |c.typeParams| > 0 {
-        typeParams := "<";
-        constrainedTypeParams := "<";
-        while tpI < |c.typeParams| {
-          var tp := c.typeParams[tpI];
-          typeParamsSet := typeParamsSet + {tp};
-          var genTp := GenType(tp, false, false);
-          typeParams := typeParams + genTp + ", ";
-          constrainedTypeParams := constrainedTypeParams + genTp + ": ::dafny_runtime::DafnyErasable + ::dafny_runtime::DafnyUnerasable<" + genTp + "> + Clone + ::std::cmp::PartialEq + ::dafny_runtime::DafnyPrint + ::std::default::Default + 'static, ";
-          tpI := tpI + 1;
-        }
-        typeParams := typeParams + ">";
-        constrainedTypeParams := constrainedTypeParams + ">";
-      }
-
-      var underlyingType := GenType(c.base, false, false);
-      s := "#[derive(Clone, PartialEq)]\n#[repr(transparent)]\npub struct r#" + c.name + typeParams + "(pub " + underlyingType +  ");\n";
-      s := s + "impl " + constrainedTypeParams + " ::dafny_runtime::DafnyErasable for r#" + c.name + typeParams + " {\n";
-      s := s + "type Erased = " + underlyingType + ";\n";
-      s := s + "#[inline]\nfn erase(&self) -> &Self::Erased {\n";
-      s := s + "&self.0\n";
-      s := s + "}\n";
-      s := s + "#[inline]\nfn erase_owned(self) -> Self::Erased {\n";
-      s := s + "self.0\n";
-      s := s + "}\n";
-      s := s + "}\n";
-      s := s + "impl " + constrainedTypeParams + " ::dafny_runtime::DafnyUnerasable<" + underlyingType + "> for r#" + c.name + typeParams + " {\n";
-      s := s + "#[inline]\nfn unerase(x: &" + underlyingType + ") -> &Self {\n";
-      s := s + "unsafe { &*(x as *const " + underlyingType + " as *const r#" + c.name + typeParams + ") }\n";
-      s := s + "}\n";
-      s := s + "#[inline]\nfn unerase_owned(x: " + underlyingType + ") -> Self {\n";
-      s := s + "r#" + c.name + "(x)\n";
-      s := s + "}\n";
-      s := s + "}\n";
-      s := s + "impl " + constrainedTypeParams + " ::dafny_runtime::DafnyUnerasable<r#" + c.name + typeParams + "> for r#" + c.name + typeParams + " {\n";
-      s := s + "#[inline]\nfn unerase(x: &r#" + c.name + typeParams + ") -> &Self {\n";
-      s := s + "x\n";
-      s := s + "}\n";
-      s := s + "#[inline]\nfn unerase_owned(x: r#" + c.name + typeParams + ") -> Self {\n";
-      s := s + "x\n";
-      s := s + "}\n";
-      s := s + "}\n";
-      s := s + "impl " + constrainedTypeParams + " ::std::default::Default for r#" + c.name + typeParams + " {\n";
-      s := s + "fn default() -> Self {\n";
-
-      match c.witnessExpr {
-        case Some(e) => {
-          // TODO(shadaj): generate statements
-          var eStr, _, _, _ := GenExpr(e, [], true);
-          s := s + "r#" + c.name + "(" + eStr + ")\n";
-        }
-        case None => {
-          s := s + "r#" + c.name + "(::std::default::Default::default())\n";
-        }
-      }
-
-      s := s + "}\n";
-      s := s + "}\n";
-      s := s + "impl " + constrainedTypeParams + " ::dafny_runtime::DafnyPrint for r#" + c.name + typeParams + " {\n";
-      s := s + "fn fmt_print(&self, __fmt_print_formatter: &mut ::std::fmt::Formatter, in_seq: bool) -> ::std::fmt::Result {\n";
-      s := s + "::dafny_runtime::DafnyPrint::fmt_print(&self.0, __fmt_print_formatter, in_seq)\n";
-      s := s + "}\n";
-      s := s + "}\n";
-    }
-
-    static method GenDatatype(c: Datatype) returns (s: string) {
-      var typeParamsSet := {};
-      var typeParams := "";
-      var tpI := 0;
-      if |c.typeParams| > 0 {
-        typeParams := "<";
-        while tpI < |c.typeParams| {
-          var tp := c.typeParams[tpI];
-          typeParamsSet := typeParamsSet + {tp};
-          var genTp := GenType(tp, false, false);
-          typeParams := typeParams + genTp + ", ";
-          tpI := tpI + 1;
-        }
-        typeParams := typeParams + ">";
-      }
-
-      var ctors := "";
-      var i := 0;
-      while i < |c.ctors| {
-        var ctor := c.ctors[i];
-        var ctorBody := "r#" + ctor.name + " { ";
-        var j := 0;
-        while j < |ctor.args| {
-          var formal := ctor.args[j];
-          var formalType := GenType(formal.typ, false, false);
-          if c.isCo {
-            ctorBody := ctorBody + "r#" + formal.name + ": ::dafny_runtime::LazyFieldWrapper<" + formalType + ">, ";
-          } else {
-            ctorBody := ctorBody + "r#" + formal.name + ": " + formalType + ", ";
-          }
-          j := j + 1;
-        }
-
-        ctorBody := ctorBody + "}";
-
-        ctors := ctors + ctorBody + ",\n";
-        i := i + 1;
-      }
-
-      var selfPath := [Ident.Ident(c.name)];
-      var implBody, traitBodies := GenClassImplBody(c.body, false, Type.Path([], [], ResolvedType.Datatype(selfPath)), typeParamsSet);
-      i := 0;
-      var emittedFields: set<string> := {};
-      while i < |c.ctors| {
-        // we know that across all ctors, each any fields with the same name have the same type
-        // so we want to emit methods for each field that pull the appropriate value given
-        // the current variant (and panic if we have a variant with no such field)
-        var ctor := c.ctors[i];
-        var j := 0;
-        while j < |ctor.args| {
-          var formal := ctor.args[j];
-          if !(formal.name in emittedFields) {
-            emittedFields := emittedFields + {formal.name};
-
-            var formalType := GenType(formal.typ, false, false);
-            var methodBody := "match self {\n";
-            var k := 0;
-            while k < |c.ctors| {
-              var ctor2 := c.ctors[k];
-              var ctorMatch := "r#" + c.name + "::" + "r#" + ctor2.name + " { ";
-              var l := 0;
-              var hasMatchingField := false;
-              while l < |ctor2.args| {
-                var formal2 := ctor2.args[l];
-                if formal.name == formal2.name {
-                  hasMatchingField := true;
-                }
-                ctorMatch := ctorMatch + "r#" + formal2.name + ", ";
-                l := l + 1;
-              }
-
-              if hasMatchingField {
-                if c.isCo {
-                  ctorMatch := ctorMatch + "} => ::std::ops::Deref::deref(&" + formal.name + ".0),\n";
-                } else {
-                  ctorMatch := ctorMatch + "} => " + formal.name + ",\n";
-                }
-              } else {
-                ctorMatch := ctorMatch + "} => panic!(\"field does not exist on this variant\"),\n";
-              }
-              methodBody := methodBody + ctorMatch;
-              k := k + 1;
-            }
-
-            methodBody := methodBody + "}\n";
-
-            implBody := implBody + "pub fn r#" + formal.name + "(&self) -> &" + formalType + " {\n" + methodBody + "}\n";
-          }
-          j := j + 1;
-        }
-
-        i := i + 1;
-      }
-
-      var constrainedTypeParams := "";
-      if |c.typeParams| > 0 {
-        tpI := 0;
-        constrainedTypeParams := "<";
-        while tpI < |c.typeParams| {
-          if tpI > 0 {
-            constrainedTypeParams := constrainedTypeParams + ", ";
-          }
-
-          var tp := c.typeParams[tpI];
-          var genTp := GenType(tp, false, false);
-          constrainedTypeParams := constrainedTypeParams + genTp + ": ::dafny_runtime::DafnyErasable + ::dafny_runtime::DafnyUnerasable<" + genTp + "> + Clone + ::std::cmp::PartialEq + ::dafny_runtime::DafnyPrint + ::std::default::Default + 'static";
-          tpI := tpI + 1;
-        }
-        constrainedTypeParams := constrainedTypeParams + ">";
-      }
-
-      var enumBody := "#[derive(PartialEq)]\npub enum r#" + c.name + typeParams + " {\n" + ctors +  "\n}" + "\n" + "impl " + constrainedTypeParams + " r#" + c.name + typeParams + " {\n" + implBody + "\n}";
-
-      var identEraseImpls := "impl " + constrainedTypeParams + " ::dafny_runtime::DafnyErasable for r#" + c.name + typeParams + " {\n" + "type Erased = Self;\nfn erase(&self) -> &Self::Erased { self }\nfn erase_owned(self) -> Self::Erased { self }}\n";
-      identEraseImpls := identEraseImpls + "impl " + constrainedTypeParams + " ::dafny_runtime::DafnyUnerasable<r#" + c.name + typeParams + "> for r#" + c.name + typeParams + " {\n" + "fn unerase(x: &Self) -> &Self { x }\nfn unerase_owned(x: Self) -> Self { x }}\n";
-
-      var printImpl := "impl " + constrainedTypeParams + " ::dafny_runtime::DafnyPrint for r#" + c.name + typeParams + " {\n" + "fn fmt_print(&self, __fmt_print_formatter: &mut ::std::fmt::Formatter, _in_seq: bool) -> std::fmt::Result {\n" + "match self {\n";
-      i := 0;
-      while i < |c.ctors| {
-        var ctor := c.ctors[i];
-        var ctorMatch := "r#" + ctor.name + " { ";
-
-        var modulePrefix := if c.enclosingModule.id == "_module" then "" else c.enclosingModule.id + ".";
-        var printRhs := "write!(__fmt_print_formatter, \"" + modulePrefix + c.name + "." + ctor.name + (if ctor.hasAnyArgs then "(\")?;" else "\")?;");
-
-        var j := 0;
-        while j < |ctor.args| {
-          var formal := ctor.args[j];
-          ctorMatch := ctorMatch + formal.name + ", ";
-
-          if (j > 0) {
-            printRhs := printRhs + "\nwrite!(__fmt_print_formatter, \", \")?;";
-          }
-          printRhs := printRhs + "\n::dafny_runtime::DafnyPrint::fmt_print(" + formal.name + ", __fmt_print_formatter, false)?;";
-
-          j := j + 1;
-        }
-
-        ctorMatch := ctorMatch + "}";
-
-        if (ctor.hasAnyArgs) {
-          printRhs := printRhs + "\nwrite!(__fmt_print_formatter, \")\")?;";
-        }
-
-        printRhs := printRhs + "\nOk(())";
-
-        printImpl := printImpl + "r#" + c.name + "::" + ctorMatch + " => {\n" + printRhs + "\n}\n";
-        i := i + 1;
-      }
-
-      printImpl := printImpl + "}\n}\n}\n";
-
-      var defaultImpl := "";
-      if |c.ctors| > 0 {
-        defaultImpl := "impl " + constrainedTypeParams + " ::std::default::Default for r#" + c.name + typeParams + " {\n" + "fn default() -> Self {\n" + "r#" + c.name + "::r#" + c.ctors[0].name + " {\n";
-        i := 0;
-        while i < |c.ctors[0].args| {
-          var formal := c.ctors[0].args[i];
-          defaultImpl := defaultImpl + formal.name + ": std::default::Default::default(),\n";
-          i := i + 1;
-        }
-
-        defaultImpl := defaultImpl + "}\n}\n}\n";
-      }
-
-      s := enumBody + "\n" + identEraseImpls + "\n" + printImpl + "\n" + defaultImpl;
-    }
-
-    static method GenPath(p: seq<Ident>) returns (s: string) {
-      if |p| == 0 {
-        // TODO(shadaj): this special casing is not great
-        return "Self";
-      } else {
-        s := "super::";
-        var i := 0;
-        while i < |p| {
-          if i > 0 {
-            s := s + "::";
-          }
-
-          s := s + "r#" + p[i].id;
-
-          i := i + 1;
-        }
-      }
-    }
-
-    static method GenTypeArgs(args: seq<Type>, inBinding: bool, inFn: bool) returns (s: string) {
-      s := "";
-      if |args| > 0 {
-        s := s + "<";
-        var i := 0;
-        while i < |args| {
-          if i > 0 {
-            s := s + ", ";
-          }
-
-          var genTp := GenType(args[i], inBinding, inFn);
-          s := s + genTp;
-          i := i + 1;
-        }
-        s := s + ">";
-      }
-    }
-
-    static method GenType(c: Type, inBinding: bool, inFn: bool) returns (s: string) {
-      match c {
-        case Path(p, args, resolved) => {
-          s := GenPath(p);
-
-          var typeArgs := GenTypeArgs(args, inBinding, inFn);
-          s := s + typeArgs;
-
-          match resolved {
-            case Datatype(_) => {
-              s := "::std::rc::Rc<" + s + ">";
-            }
-            case Trait(_) => {
-              if inBinding {
-                // impl trait in bindings is not stable
-                s := "_";
-              } else {
-                s := "impl " + s + "";
-              }
-            }
-            case Primitive => {}
-          }
-        }
-        case Tuple(types) => {
-          s := "(";
-          var i := 0;
-          while i < |types| {
-            if i > 0 {
-              s := s + " ";
-            }
-
-            var generated := GenType(types[i], inBinding, inFn);
-            s := s + generated + ",";
-            i := i + 1;
-          }
-
-          s := s + ")";
-        }
-        case Array(element) => {
-          var elemStr := GenType(element, inBinding, inFn);
-          s := "::std::vec::Vec<" + elemStr + ">";
-        }
-        case Seq(element) => {
-          var elemStr := GenType(element, inBinding, inFn);
-          s := "::std::vec::Vec<" + elemStr + ">";
-        }
-        case Set(element) => {
-          var elemStr := GenType(element, inBinding, inFn);
-          s := "::std::collections::HashSet<" + elemStr + ">";
-        }
-        case Multiset(element) => {
-          var elemStr := GenType(element, inBinding, inFn);
-          s := "::std::collections::HashMap<" + elemStr + ", u64>";
-        }
-        case Map(key, value) => {
-          var keyStr := GenType(key, inBinding, inFn);
-          var valueStr := GenType(value, inBinding, inFn);
-          s := "::std::collections::HashMap<" + keyStr + ", " + valueStr + ">";
-        }
-        case Arrow(args, result) => {
-          if inBinding {
-            s := "::dafny_runtime::FunctionWrapper<_>";
-          } else {
-            if inFn {
-              s := "::dafny_runtime::FunctionWrapper<::std::boxed::Box<dyn ::std::ops::Fn(";
-            } else {
-              s := "::dafny_runtime::FunctionWrapper<impl ::std::ops::Fn(";
-            }
-
-            var i := 0;
-            while i < |args| {
-              if i > 0 {
-                s := s + ", ";
-              }
-
-              var generated := GenType(args[i], inBinding, true);
-              s := s + "&" + generated;
-              i := i + 1;
-            }
-
-            var resultType := GenType(result, inBinding, inFn);
-
-            if inFn {
-              s := s + ") -> " + resultType + " + 'static>>";
-            } else {
-              s := s + ") -> " + resultType + " + Clone + 'static>";
-            }
-          }
-        }
-        case TypeArg(Ident(name)) => s := "r#" + name;
-        case Primitive(p) => {
-          match p {
-            case String => s := "Vec<char>";
-            case Bool => s := "bool";
-            case Char => s := "char";
-          }
-        }
-        case Passthrough(v) => s := v;
-      }
-    }
-
-    static method GenClassImplBody(body: seq<ClassItem>, forTrait: bool, enclosingType: Type, enclosingTypeParams: set<Type>) returns (s: string, traitBodies: map<seq<Ident>, string>) {
-      s := "";
-      traitBodies := map[];
-
-      var i := 0;
-      while i < |body| {
-        match body[i] {
-          case Method(m) => {
-            match m.overridingPath {
-              case Some(p) => {
-                var existing := "";
-                if p in traitBodies {
-                  existing := traitBodies[p];
-                }
-
-                if |existing| > 0 {
-                  existing := existing + "\n";
-                }
-
-                var genMethod := GenMethod(m, true, enclosingType, enclosingTypeParams);
-                existing := existing + genMethod;
-
-                traitBodies := traitBodies + map[p := existing];
-              }
-              case None => {
-                var generated := GenMethod(m, forTrait, enclosingType, enclosingTypeParams);
-                s := s + generated;
-              }
-            }
-          }
-          case Field(f) => { /* TODO */ }
-        }
-
-        if |s| > 0 {
-          s := s + "\n";
-        }
-
-        i := i + 1;
-      }
-    }
-
-    static method GenParams(params: seq<Formal>) returns (s: string) {
-      s := "";
-      var i := 0;
-      while i < |params| {
-        var param := params[i];
-        var paramType := GenType(param.typ, false, false);
-        s := s + "r#" + param.name + ": &" + paramType;
-
-        if i < |params| - 1 {
-          s := s + ", ";
-        }
-
-        i := i + 1;
-      }
-    }
-
-    static method GenMethod(m: Method, forTrait: bool, enclosingType: Type, enclosingTypeParams: set<Type>) returns (s: string) {
-      var params := GenParams(m.params);
-      var paramNames := [];
-      var paramI := 0;
-      while paramI < |m.params| {
-        paramNames := paramNames + [m.params[paramI].name];
-        paramI := paramI + 1;
-      }
-
-      if (!m.isStatic) {
-        if (forTrait) {
-          params := "&self" + ", " + params;
-        } else {
-          var enclosingTypeString := GenType(enclosingType, false, false);
-          params := "self: &" + enclosingTypeString + ", " + params;
-        }
-      }
-
-      var retType := if |m.outTypes| != 1 then "(" else "";
-
-      var typeI := 0;
-      while typeI < |m.outTypes| {
-        if typeI > 0 {
-          retType := retType + ", ";
-        }
-
-        var typeString := GenType(m.outTypes[typeI], false, false);
-        retType := retType + typeString;
-
-        typeI := typeI + 1;
-      }
-
-      if |m.outTypes| != 1 {
-        retType := retType + ")";
-      }
-
-      if forTrait {
-        s := "fn r#" + m.name;
-      } else {
-        s := "pub fn r#" + m.name;
-      }
-
-      var typeParamsFiltered := [];
-      var typeParamI := 0;
-      while typeParamI < |m.typeParams| {
-        var typeParam := m.typeParams[typeParamI];
-        if !(typeParam in enclosingTypeParams) {
-          typeParamsFiltered := typeParamsFiltered + [typeParam];
-        }
-
-        typeParamI := typeParamI + 1;
-      }
-
-      if (|typeParamsFiltered| > 0) {
-        s := s + "<";
-
-        var i := 0;
-        while i < |typeParamsFiltered| {
-          if i > 0 {
-            s := s + ", ";
-          }
-
-          var typeString := GenType(typeParamsFiltered[i], false, false);
-          s := s + typeString + ": ::dafny_runtime::DafnyErasable + ::dafny_runtime::DafnyUnerasable<" + typeString + "> + Clone + ::std::cmp::PartialEq + ::dafny_runtime::DafnyPrint + ::std::default::Default + 'static";
-
-          i := i + 1;
-        }
-
-        s := s + ">";
-      }
-
-      s := s + "(" + params + ") -> " + retType;
-
-      if m.hasBody {
-        var earlyReturn := "return;";
-        match m.outVars {
-          case Some(outVars) => {
-            earlyReturn := "return (";
-            var outI := 0;
-            while outI < |outVars| {
-              if outI > 0 {
-                earlyReturn := earlyReturn + ", ";
-              }
-
-              var outVar := outVars[outI];
-              earlyReturn := earlyReturn + "r#" + outVar.id;
-
-              outI := outI + 1;
-            }
-            earlyReturn := earlyReturn + ");";
-          }
-          case None => {}
-        }
-
-        var body, _ := GenStmts(m.body, paramNames, true, earlyReturn);
-        match m.outVars {
-          case Some(outVars) => {
-            body := body + "\n" + earlyReturn;
-          }
-          case None => {}
-        }
-
-        s := s + " {\n" + body + "\n}\n";
-      } else {
-        s := s + ";\n";
-      }
-    }
-
-    static method GenStmts(stmts: seq<Statement>, params: seq<string>, isLast: bool, earlyReturn: string) returns (generated: string, readIdents: set<string>) {
-      generated := "";
-      readIdents := {};
-      var i := 0;
-      while i < |stmts| {
-        var stmt := stmts[i];
-        var stmtString, recIdents := GenStmt(stmt, params, isLast && (i == |stmts| - 1), earlyReturn);
-        readIdents := readIdents + recIdents;
-
-        if i > 0 {
-          generated := generated + "\n";
-        }
-
-        generated := generated + stmtString;
-        i := i + 1;
-      }
-    }
-
-    static method GenStmt(stmt: Statement, params: seq<string>, isLast: bool, earlyReturn: string) returns (generated: string, readIdents: set<string>) {
-      match stmt {
-        case DeclareVar(name, typ, Some(expression)) => {
-          var expr, _, recErased, recIdents := GenExpr(expression, params, true);
-          if recErased {
-            expr := "::dafny_runtime::DafnyUnerasable::<_>::unerase_owned(" + expr + ")";
-          }
-
-          var typeString := GenType(typ, true, false);
-          generated := "let mut r#" + name + ": " + typeString + " = " + expr + ";";
-          readIdents := recIdents;
-        }
-        case DeclareVar(name, typ, None) => {
-          var typeString := GenType(typ, true, false);
-          generated := "let mut r#" + name + ": " + typeString + ";";
-          readIdents := {};
-        }
-        case Assign(name, expression) => {
-          var expr, _, recErased, recIdents := GenExpr(expression, params, true);
-          if recErased {
-            expr := "::dafny_runtime::DafnyUnerasable::<_>::unerase_owned(" + expr + ")";
-          }
-
-          generated := "r#" + name + " = " + expr + ";";
-          readIdents := recIdents;
-        }
-        case If(cond, thn, els) => {
-          var condString, _, condErased, recIdents := GenExpr(cond, params, true);
-          if !condErased {
-            condString := "::dafny_runtime::DafnyErasable::erase_owned(" + condString + ")";
-          }
-
-          readIdents := recIdents;
-          var thnString, thnIdents := GenStmts(thn, params, isLast, earlyReturn);
-          readIdents := readIdents + thnIdents;
-          var elsString, elsIdents := GenStmts(els, params, isLast, earlyReturn);
-          readIdents := readIdents + elsIdents;
-          generated := "if " + condString + " {\n" + thnString + "\n} else {\n" + elsString + "\n}";
-        }
-        case While(cond, body) => {
-          var condString, _, condErased, recIdents := GenExpr(cond, params, true);
-          if !condErased {
-            condString := "::dafny_runtime::DafnyErasable::erase(" + condString + ")";
-          }
-
-          readIdents := recIdents;
-          var bodyString, bodyIdents := GenStmts(body, params, false, earlyReturn);
-          readIdents := readIdents + bodyIdents;
-          generated := "while " + condString + " {\n" + bodyString + "\n}";
-        }
-        case Call(on, name, typeArgs, args, maybeOutVars) => {
-          readIdents := {};
-
-          var typeArgString := "";
-          if (|typeArgs| >= 1) {
-            var typeI := 0;
-            typeArgString := "::<";
-            while typeI < |typeArgs| {
-              if typeI > 0 {
-                typeArgString := typeArgString + ", ";
-              }
-
-              var typeString := GenType(typeArgs[typeI], false, false);
-              typeArgString := typeArgString + typeString;
-
-              typeI := typeI + 1;
-            }
-            typeArgString := typeArgString + ">";
-          }
-
-          var argString := "";
-          var i := 0;
-          while i < |args| {
-            if i > 0 {
-              argString := argString + ", ";
-            }
-
-            var argExpr, isOwned, argErased, argIdents := GenExpr(args[i], params, false);
-            if isOwned {
-              argExpr := "&" + argExpr;
-            }
-
-            argString := argString + argExpr;
-            readIdents := readIdents + argIdents;
-
-            i := i + 1;
-          }
-
-          var enclosingString, _, _, enclosingIdents := GenExpr(on, params, true);
-          readIdents := readIdents + enclosingIdents;
-          match on {
-            case Companion(_) => {
-              enclosingString := enclosingString + "::";
-            }
-            case _ => {
-              enclosingString := "(" + enclosingString + ").";
-            }
-          }
-
-          var receiver := "";
-          match maybeOutVars {
-            case Some(outVars) => {
-              if (|outVars| > 1) {
-                receiver := "(";
-              }
-              var outI := 0;
-              while outI < |outVars| {
-                if outI > 0 {
-                  receiver := receiver + ", ";
-                }
-
-                var outVar := outVars[outI];
-                receiver := receiver + outVar.id;
-
-                outI := outI + 1;
-              }
-              if (|outVars| > 1) {
-                receiver := receiver + ")";
-              }
-            }
-            case None => {}
-          }
-
-          generated :=
-            (if receiver != "" then (receiver + " = ") else "") +
-            enclosingString + "r#" + name + typeArgString + "(" + argString + ");";
-        }
-        case Return(expr) => {
-          var exprString, _, recErased, recIdents := GenExpr(expr, params, true);
-          exprString := "::dafny_runtime::DafnyUnerasable::<_>::unerase_owned(" + exprString + ")";
-          readIdents := recIdents;
-
-          if isLast {
-            generated := exprString;
-          } else {
-            generated := "return " + exprString + ";";
-          }
-        }
-        case EarlyReturn() => {
-          generated := earlyReturn;
-          readIdents := {};
-        }
-        case Halt() => {
-          generated := "panic!(\"Halt\");";
-          readIdents := {};
-        }
-        case Print(e) => {
-          var printedExpr, isOwned, _, recIdents := GenExpr(e, params, false);
-          generated := "print!(\"{}\", ::dafny_runtime::DafnyPrintWrapper(" + (if isOwned then "&" else "") + printedExpr + "));";
-          readIdents := recIdents;
-        }
-      }
-    }
-
-    static method GenExpr(e: Expression, params: seq<string>, mustOwn: bool) returns (s: string, isOwned: bool, isErased: bool, readIdents: set<string>) {
-      match e {
-        case Literal(BoolLiteral(false)) => {
-          s := "false";
-          isOwned := true;
-          isErased := true;
-          readIdents := {};
-        }
-        case Literal(BoolLiteral(true)) => {
-          s := "true";
-          isOwned := true;
-          isErased := true;
-          readIdents := {};
-        }
-        case Literal(IntLiteral(i)) => {
-          if (i < 0) {
-            s := "-" + natToString(-i);
-          } else {
-            s := natToString(i);
-          }
-
-          isOwned := true;
-          isErased := true;
-          readIdents := {};
-        }
-        case Literal(DecLiteral(l)) => {
-          s := l;
-          isOwned := true;
-          isErased := true;
-          readIdents := {};
-        }
-        case Literal(StringLiteral(l)) => {
-          // TODO(shadaj): handle unicode properly
-          s := "\"" + l + "\".chars().collect::<Vec<char>>()";
-          isOwned := true;
-          isErased := true;
-          readIdents := {};
-        }
-        case Literal(CharLiteral(c)) => {
-          s := "::std::primitive::char::from_u32(" + natToString(c as nat) + ").unwrap()";
-          isOwned := true;
-          isErased := true;
-          readIdents := {};
-        }
-        case Literal(Null) => {
-          s := "None";
-          isOwned := true;
-          isErased := true;
-          readIdents := {};
-        }
-        case Ident(name) => {
-          s := "r#" + name;
-          if !(name in params) {
-            s := "(&" + s + ")";
-          }
-
-          if mustOwn {
-            s := s + ".clone()";
-            isOwned := true;
-          } else {
-            isOwned := false;
-          }
-
-          isErased := false;
-
-          readIdents := {name};
-        }
-        case Companion(path) => {
-          s := GenPath(path);
-          isOwned := true;
-          isErased := true;
-          readIdents := {};
-        }
-        case InitializationValue(typ) => {
-          var typString := GenType(typ, false, false);
-          s := "<" + typString + " as std::default::Default>::default()";
-          isOwned := true;
-          isErased := false;
-          readIdents := {};
-        }
-        case Tuple(values) => {
-          s := "(";
-          readIdents := {};
-          var i := 0;
-
-          var allErased := true;
-          while i < |values| {
-            var _, _, isErased, _ := GenExpr(values[i], params, true);
-            allErased := allErased && isErased;
-            i := i + 1;
-          }
-
-          i := 0;
-          while i < |values| {
-            if i > 0 {
-              s := s + " ";
-            }
-
-            var recursiveGen, _, isErased, recIdents := GenExpr(values[i], params, true);
-            if isErased && !allErased {
-              recursiveGen := "::dafny_runtime::DafnyUnerasable::<_>::unerase_owned(" + recursiveGen + ")";
-            }
-
-            s := s + recursiveGen + ",";
-            readIdents := readIdents + recIdents;
-
-            i := i + 1;
-          }
-          s := s + ")";
-          isOwned := true;
-          isErased := allErased;
-        }
-        case New(path, args) => {
-          var path := GenPath(path);
-          s := "::std::rc::Rc::new(" + path + "::new(";
-          readIdents := {};
-          var i := 0;
-          while i < |args| {
-            if i > 0 {
-              s := s + ", ";
-            }
-
-            var recursiveGen, _, isErased, recIdents := GenExpr(args[i], params, true);
-            if isErased {
-              recursiveGen := "::dafny_runtime::DafnyUnerasable::<_>::unerase_owned(" + recursiveGen + ")";
-            }
-            s := s + recursiveGen;
-            readIdents := readIdents + recIdents;
-
-            i := i + 1;
-          }
-          s := s + "))";
-          isOwned := true;
-          isErased := true;
-        }
-        case NewArray(dims) => {
-          var i := |dims| - 1;
-          s := "::std::default::Default::default()";
-          readIdents := {};
-          while i >= 0 {
-            var recursiveGen, _, isErased, recIdents := GenExpr(dims[i], params, true);
-            if !isErased {
-              recursiveGen := "::dafny_runtime::DafnyErasable::erase_owned(" + recursiveGen + ")";
-            }
-
-            s := "vec![" + s + "; (" + recursiveGen + ") as usize]";
-            readIdents := readIdents + recIdents;
-
-            i := i - 1;
-          }
-
-          isOwned := true;
-          isErased := true;
-        }
-        case DatatypeValue(path, variant, isCo, values) => {
-          var path := GenPath(path);
-          s := "::std::rc::Rc::new(" + path + "::r#" + variant;
-          readIdents := {};
-
-          var i := 0;
-          s := s + " {";
-          while i < |values| {
-            var (name, value) := values[i];
-            if i > 0 {
-              s := s + ", ";
-            }
-
-            if isCo {
-              var recursiveGen, _, isErased, recIdents := GenExpr(value, [], true);
-              if !isErased {
-                recursiveGen := "::dafny_runtime::DafnyErasable::erase_owned(" + recursiveGen + ")";
-              }
-              recursiveGen := "::dafny_runtime::DafnyUnerasable::<_>::unerase_owned(" + recursiveGen + ")";
-
-              readIdents := readIdents + recIdents;
-              var allReadCloned := "";
-              while recIdents != {} decreases recIdents {
-                var next: string :| next in recIdents;
-                allReadCloned := allReadCloned + "let r#" + next + " = r#" + next + ".clone();\n";
-                recIdents := recIdents - {next};
-              }
-              s := s + "r#" + name + ": ::dafny_runtime::LazyFieldWrapper(::dafny_runtime::Lazy::new(::std::boxed::Box::new({\n" + allReadCloned + "move || (" + recursiveGen + ")})))";
-            } else {
-              var recursiveGen, _, isErased, recIdents := GenExpr(value, params, true);
-              if !isErased {
-                recursiveGen := "::dafny_runtime::DafnyErasable::erase_owned(" + recursiveGen + ")";
-              }
-              recursiveGen := "::dafny_runtime::DafnyUnerasable::<_>::unerase_owned(" + recursiveGen + ")";
-
-              s := s + "r#" + name + ": " + "(" + recursiveGen + ")";
-              readIdents := readIdents + recIdents;
-            }
-            i := i + 1;
-          }
-          s := s + " })";
-          isOwned := true;
-          isErased := true;
-        }
-        case SubsetUpgrade(expr, tpe) => {
-          var tpeGen := GenType(tpe, true, false);
-          var recursiveGen, recOwned, recErased, recIdents := GenExpr(expr, params, false);
-          var uneraseFn := if recOwned then "unerase_owned" else "unerase";
-          s := "<" + tpeGen + " as ::dafny_runtime::DafnyUnerasable<_>>::" + uneraseFn + "(" + recursiveGen + ")";
-          isOwned := recOwned;
-          isErased := false;
-          readIdents := recIdents;
-        }
-        case SubsetDowngrade(expr) => {
-          var recursiveGen, recOwned, recErased, recIdents := GenExpr(expr, params, false);
-          var eraseFn := if recOwned then "erase_owned" else "erase";
-          s := "::dafny_runtime::DafnyErasable::" + eraseFn + "(" + recursiveGen + ")";
-          isOwned := recOwned;
-          isErased := true;
-          readIdents := recIdents;
-        }
-        case SeqValue(exprs) => {
-          var generatedValues := [];
-          readIdents := {};
-          var i := 0;
-          var allErased := true;
-          while i < |exprs| {
-            var recursiveGen, _, isErased, recIdents := GenExpr(exprs[i], params, true);
-            allErased := allErased && isErased;
-
-            generatedValues := generatedValues + [(recursiveGen, isErased)];
-            readIdents := readIdents + recIdents;
-            i := i + 1;
-          }
-
-          s := "vec![";
-          i := 0;
-          while i < |generatedValues| {
-            if i > 0 {
-              s := s + ", ";
-            }
-
-            var gen := generatedValues[i].0;
-            if generatedValues[i].1 && !allErased {
-              gen := "::dafny_runtime::DafnyUnerasable::<_>::unerase_owned(" + gen + ")";
-            }
-
-            s := s + gen;
-            i := i + 1;
-          }
-          s := s + "]";
-
-          isOwned := true;
-          isErased := allErased;
-        }
-        case SetValue(exprs) => {
-          var generatedValues := [];
-          readIdents := {};
-          var i := 0;
-          var allErased := true;
-          while i < |exprs| {
-            var recursiveGen, _, isErased, recIdents := GenExpr(exprs[i], params, true);
-            allErased := allErased && isErased;
-
-            generatedValues := generatedValues + [(recursiveGen, isErased)];
-            readIdents := readIdents + recIdents;
-            i := i + 1;
-          }
-
-          s := "vec![";
-          i := 0;
-          while i < |generatedValues| {
-            if i > 0 {
-              s := s + ", ";
-            }
-
-            var gen := generatedValues[i].0;
-            if generatedValues[i].1 && !allErased {
-              gen := "::dafny_runtime::DafnyUnerasable::<_>::unerase_owned(" + gen + ")";
-            }
-
-            s := s + gen;
-            i := i + 1;
-          }
-          s := s + "].into_iter().collect::<std::collections::HashSet<_>>()";
-
-          isOwned := true;
-          isErased := true;
-        }
-        case This() => {
-          if mustOwn {
-            s := "self.clone()";
-            isOwned := true;
-          } else {
-            s := "self";
-            isOwned := false;
-          }
-
-          readIdents := {"self"};
-          isErased := false;
-        }
-        case Ite(cond, t, f) => {
-          var condString, _, condErased, recIdentsCond := GenExpr(cond, params, true);
-          if !condErased {
-            condString := "::dafny_runtime::DafnyErasable::erase_owned(" + condString + ")";
-          }
-
-          var _, tHasToBeOwned, _, _ := GenExpr(t, params, mustOwn); // check if t has to be owned even if not requested
-          var fString, fOwned, fErased, recIdentsF := GenExpr(f, params, tHasToBeOwned);
-          var tString, _, tErased, recIdentsT := GenExpr(t, params, fOwned); // there's a chance that f forced ownership
-
-          if !fErased || !tErased {
-            if fErased {
-              fString := "::dafny_runtime::DafnyErasable::erase_owned(" + fString + ")";
-            }
-
-            if tErased {
-              tString := "::dafny_runtime::DafnyErasable::erase_owned(" + tString + ")";
-            }
-          }
-
-          s := "(if " + condString + " {\n" + tString + "\n} else {\n" + fString + "\n})";
-          isOwned := fOwned;
-          readIdents := recIdentsCond + recIdentsT + recIdentsF;
-          isErased := fErased || tErased;
-        }
-        case UnOp(Not, e) => {
-          var recursiveGen, _, recErased, recIdents := GenExpr(e, params, true);
-          if !recErased {
-            recursiveGen := "::dafny_runtime::DafnyErasable::erase_owned(" + recursiveGen + ")";
-          }
-
-          s := "!(" + recursiveGen + ")";
-          isOwned := true;
-          readIdents := recIdents;
-          isErased := true;
-        }
-        case UnOp(BitwiseNot, e) => {
-          var recursiveGen, _, recErased, recIdents := GenExpr(e, params, true);
-          if !recErased {
-            recursiveGen := "::dafny_runtime::DafnyErasable::erase_owned(" + recursiveGen + ")";
-          }
-
-          s := "~(" + recursiveGen + ")";
-          isOwned := true;
-          readIdents := recIdents;
-          isErased := true;
-        }
-        case UnOp(Cardinality, e) => {
-          var recursiveGen, _, recErased, recIdents := GenExpr(e, params, false);
-          if !recErased {
-            recursiveGen := "::dafny_runtime::DafnyErasable::erase_owned(" + recursiveGen + ")";
-          }
-
-          s := "(" + recursiveGen + ").len()";
-          isOwned := true;
-          readIdents := recIdents;
-          isErased := true;
-        }
-        case BinOp(op, l, r) => {
-          var left, _, leftErased, recIdentsL := GenExpr(l, params, true);
-          var right, _, rightErased, recIdentsR := GenExpr(r, params, true);
-
-          if !leftErased {
-            left := "::dafny_runtime::DafnyErasable::erase_owned(" + left + ")";
-          }
-
-          if !rightErased {
-            right := "::dafny_runtime::DafnyErasable::erase_owned(" + right + ")";
-          }
-
-          s := "(" + left + " " + op + " " + right + ")";
-          isOwned := true;
-          readIdents := recIdentsL + recIdentsR;
-          isErased := true;
-        }
-        case SelectFn(on, field, isDatatype, isStatic, arity) => {
-          var onString, onOwned, _, recIdents := GenExpr(on, params, false);
-
-          if isStatic {
-            s := onString + "::" + field;
-          } else {
-            s := "{\n";
-            s := s + "let callTarget = (" + onString + (if onOwned then ")" else ").clone()") + ";\n";
-            var args := "";
-            var i := 0;
-            while i < arity {
-              if i > 0 {
-                args := args + ", ";
-              }
-              args := args + "arg" + natToString(i);
-              i := i + 1;
-            }
-            s := s + "move |" + args + "| {\n";
-            s := s + "callTarget." + field + "(" + args + ")\n";
-            s := s + "}\n";
-            s := s + "}";
-          }
-
-          s := "::dafny_runtime::FunctionWrapper(" + s + ")";
-
-          isOwned := true;
-          isErased := true;
-          readIdents := recIdents;
-        }
-        case Select(on, field, isDatatype) => {
-          var onString, onOwned, onErased, recIdents := GenExpr(on, params, false);
-          if !onErased {
-            var eraseFn := if onOwned then "erase_owned" else "erase";
-            onString := "::dafny_runtime::DafnyErasable::" + eraseFn + "(" + onString + ")";
-          }
-
-          if isDatatype {
-            s := "(" + onString + ")" + ".r#" + field + "()";
-            if mustOwn {
-              s := "(" + s + ").clone()";
-              isOwned := true;
-            } else {
-              isOwned := false;
-            }
-          } else {
-            s := "(" + onString + ")" + ".r#" + field;
-            if mustOwn {
-              s := "(" + s + ").clone()";
-              isOwned := true;
-            } else {
-              isOwned := false;
-            }
-          }
-
-          isErased := false;
-          readIdents := recIdents;
-        }
-        case TupleSelect(on, idx) => {
-          var onString, _, tupErased, recIdents := GenExpr(on, params, false);
-          s := "(" + onString + ")." + natToString(idx);
-          if mustOwn {
-            s := "(" + s + ")" + ".clone()";
-            isOwned := true;
-          } else {
-            s := "&" + s;
-            isOwned := false;
-          }
-          isErased := tupErased;
-          readIdents := recIdents;
-        }
-        case Call(on, name, typeArgs, args) => {
-          readIdents := {};
-
-          var typeArgString := "";
-          if (|typeArgs| >= 1) {
-            var typeI := 0;
-            typeArgString := "::<";
-            while typeI < |typeArgs| {
-              if typeI > 0 {
-                typeArgString := typeArgString + ", ";
-              }
-
-              var typeString := GenType(typeArgs[typeI], false, false);
-              typeArgString := typeArgString + typeString;
-
-              typeI := typeI + 1;
-            }
-            typeArgString := typeArgString + ">";
-          }
-
-          var argString := "";
-          var i := 0;
-          while i < |args| {
-            if i > 0 {
-              argString := argString + ", ";
-            }
-
-            var argExpr, isOwned, argErased, argIdents := GenExpr(args[i], params, false);
-            if isOwned {
-              argExpr := "&" + argExpr;
-            }
-
-            argString := argString + argExpr;
-            readIdents := readIdents + argIdents;
-
-            i := i + 1;
-          }
-
-          var enclosingString, _, _, recIdents := GenExpr(on, params, false);
-          readIdents := readIdents + recIdents;
-          match on {
-            case Companion(_) => {
-              enclosingString := enclosingString + "::";
-            }
-            case _ => {
-              enclosingString := "(" + enclosingString + ").";
-            }
-          }
-
-          s := enclosingString + "r#" + name.id + typeArgString + "(" + argString + ")";
-          isOwned := true;
-          isErased := false;
-        }
-        case Lambda(params, retType, body) => {
-          var paramNames := [];
-          var i := 0;
-          while i < |params| {
-            paramNames := paramNames + [params[i].name];
-            i := i + 1;
-          }
-
-          var recursiveGen, recIdents := GenStmts(body, paramNames, true, "");
-          readIdents := {};
-          var allReadCloned := "";
-          while recIdents != {} decreases recIdents {
-            var next: string :| next in recIdents;
-
-            if !(next in paramNames) {
-              allReadCloned := allReadCloned + "let r#" + next + " = r#" + next + ".clone();\n";
-              readIdents := readIdents + {next};
-            }
-
-            recIdents := recIdents - {next};
-          }
-
-          var paramsString := "";
-          i := 0;
-          while i < |params| {
-            if i > 0 {
-              paramsString := paramsString + ", ";
-            }
-
-            var typStr := GenType(params[i].typ, false, true);
-
-            paramsString := paramsString + params[i].name + ": &" + typStr;
-            i := i + 1;
-          }
-
-          var retTypeGen := GenType(retType, false, true);
-
-          s := "::dafny_runtime::FunctionWrapper({\n" + allReadCloned + "::std::boxed::Box::new(move |" + paramsString + "| -> " + retTypeGen + " {\n" + recursiveGen + "\n})})";
-          isOwned := true;
-          isErased := true;
-        }
-        case IIFE(name, tpe, value, iifeBody) => {
-          var valueGen, valueOwned, valueErased, recIdents := GenExpr(value, params, false);
-          if valueErased {
-            var eraseFn := if valueOwned then "unerase_owned" else "unerase";
-            valueGen := "::dafny_runtime::DafnyUnerasable::<_>::" + eraseFn + "(" + valueGen + ")";
-          }
-
-          readIdents := recIdents;
-          var valueTypeGen := GenType(tpe, false, true);
-          var bodyGen, bodyOwned, bodyErased, bodyIdents := GenExpr(iifeBody, params + if valueOwned then [] else [name.id], mustOwn);
-          readIdents := readIdents + bodyIdents;
-
-          var eraseFn := if valueOwned then "unerase_owned" else "unerase";
-
-          s := "{\nlet r#" + name.id + ": " + (if valueOwned then "" else "&") + valueTypeGen + " = " + valueGen + ";\n" + bodyGen + "\n}";
-          isOwned := bodyOwned;
-          isErased := bodyErased;
-        }
-        case Apply(func, args) => {
-          var funcString, _, funcErased, recIdents := GenExpr(func, params, false);
-          readIdents := recIdents;
-
-          var argString := "";
-          var i := 0;
-          while i < |args| {
-            if i > 0 {
-              argString := argString + ", ";
-            }
-
-            var argExpr, isOwned, argErased, argIdents := GenExpr(args[i], params, false);
-            if isOwned {
-              argExpr := "&" + argExpr;
-            }
-
-            argString := argString + argExpr;
-            readIdents := readIdents + argIdents;
-
-            i := i + 1;
-          }
-
-          s := "((" + funcString + ").0" + "(" + argString + "))";
-          isOwned := true;
-          isErased := false;
-        }
-        case TypeTest(on, dType, variant) => {
-          var exprGen, _, exprErased, recIdents := GenExpr(on, params, false);
-          var dTypePath := GenPath(dType);
-          s := "matches!(" + exprGen + ".as_ref(), " + dTypePath + "::r#" + variant + "{ .. })";
-          isOwned := true;
-          isErased := true;
-          readIdents := recIdents;
-        }
-      }
-    }
-
-    static method Compile(p: seq<Module>) returns (s: string) {
-      s := "#![allow(warnings, unconditional_panic)]\n";
-      s := s + "extern crate dafny_runtime;\n";
-
-      var i := 0;
-      while i < |p| {
-        var generated: string;
-        generated := GenModule(p[i], []);
-
-        if i > 0 {
-          s := s + "\n";
-        }
-
-        s := s + generated;
-        i := i + 1;
-      }
-    }
-
-    static method EmitCallToMain(fullName: seq<string>) returns (s: string) {
-      s := "\nfn main() {\n";
-      var i := 0;
-      while i < |fullName| {
-        if i > 0 {
-          s := s + "::";
-        }
-        s := s + fullName[i];
-        i := i + 1;
-      }
-      s := s + "();\n}";
-    }
-  }
-}
diff --git a/Source/DafnyCore/Compilers/Rust/RustBackend.cs b/Source/DafnyCore/Compilers/Rust/RustBackend.cs
deleted file mode 100644
index 22757405f20..00000000000
--- a/Source/DafnyCore/Compilers/Rust/RustBackend.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
-
-namespace Microsoft.Dafny.Compilers;
-
-public class RustBackend : DafnyExecutableBackend {
-
-  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string> { ".rs" };
-  public override string TargetName => "Rust";
-  public override bool IsStable => false;
-  public override string TargetExtension => "rs";
-  public override int TargetIndentSize => 4;
-  public override bool SupportsInMemoryCompilation => false;
-  public override bool TextualTargetIsExecutable => false;
-
-  public override string TargetBasename(string dafnyProgramName) =>
-    Regex.Replace(base.TargetBasename(dafnyProgramName), "[^_A-Za-z0-9]", "_");
-
-  public override string TargetBaseDir(string dafnyProgramName) =>
-    $"{Path.GetFileNameWithoutExtension(dafnyProgramName)}-rust/src";
-
-  protected override DafnyWrittenCompiler CreateDafnyWrittenCompiler() {
-    return new RustCompiler();
-  }
-
-  private string ComputeExeName(string targetFilename) {
-    var targetDirectory = Path.GetDirectoryName(Path.GetDirectoryName(targetFilename));
-    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
-      return Path.Combine(targetDirectory, "target", "debug", Path.GetFileNameWithoutExtension(targetFilename) + ".exe");
-    } else {
-      return Path.Combine(targetDirectory, "target", "debug", Path.GetFileNameWithoutExtension(targetFilename));
-    }
-  }
-
-  public override bool CompileTargetProgram(string dafnyProgramName, string targetProgramText,
-      string /*?*/ callToMain, string /*?*/ targetFilename, ReadOnlyCollection<string> otherFileNames,
-      bool runAfterCompile, TextWriter outputWriter, out object compilationResult) {
-    var targetDirectory = Path.GetDirectoryName(Path.GetDirectoryName(targetFilename));
-    var runtimeDirectory = Path.Combine(targetDirectory, "runtime");
-    if (Directory.Exists(runtimeDirectory)) {
-      Directory.Delete(runtimeDirectory, true);
-    }
-    Directory.CreateDirectory(runtimeDirectory);
-
-    var assembly = System.Reflection.Assembly.Load("DafnyPipeline");
-    assembly.GetManifestResourceNames().Where(f => f.StartsWith("DafnyPipeline.DafnyRuntimeRust")).ToList().ForEach(f => {
-      var stream = assembly.GetManifestResourceStream(f);
-      var dotToSlashPath = "";
-      var parts = f.Replace("DafnyPipeline.DafnyRuntimeRust.", "").Split('.');
-      for (var i = 0; i < parts.Length; i++) {
-        dotToSlashPath += parts[i];
-
-        if (i < parts.Length - 2) {
-          dotToSlashPath += "/";
-        } else if (i == parts.Length - 2) {
-          // extension
-          dotToSlashPath += ".";
-        }
-      }
-
-      var containingDirectory = Path.Combine(runtimeDirectory, Path.GetDirectoryName(dotToSlashPath));
-      if (!Directory.Exists(containingDirectory)) {
-        Directory.CreateDirectory(containingDirectory);
-      }
-
-      using var outFile = new FileStream(Path.Combine(runtimeDirectory, dotToSlashPath), FileMode.Create, FileAccess.Write);
-      stream.CopyTo(outFile);
-    });
-
-    using (var cargoToml = new FileStream(Path.Combine(targetDirectory, "Cargo.toml"), FileMode.Create, FileAccess.Write)) {
-      using var cargoTomlWriter = new StreamWriter(cargoToml);
-      cargoTomlWriter.WriteLine("[package]");
-      var packageName = Path.GetFileNameWithoutExtension(targetFilename);
-      // package name cannot start with a digit
-      if (char.IsDigit(packageName[0])) {
-        packageName = "_" + packageName;
-      }
-      cargoTomlWriter.WriteLine("name = \"{0}\"", packageName);
-      cargoTomlWriter.WriteLine("version = \"0.1.0\"");
-      cargoTomlWriter.WriteLine("edition = \"2021\"");
-      cargoTomlWriter.WriteLine();
-      cargoTomlWriter.WriteLine("[dependencies]");
-      cargoTomlWriter.WriteLine("dafny_runtime = { path = \"runtime\" }");
-      cargoTomlWriter.WriteLine();
-
-      if (callToMain == null) {
-        cargoTomlWriter.WriteLine("[lib]");
-        cargoTomlWriter.WriteLine("path = \"src/" + Path.GetFileName(targetFilename) + "\"");
-        cargoTomlWriter.WriteLine();
-      } else {
-        cargoTomlWriter.WriteLine("[[bin]]");
-        cargoTomlWriter.WriteLine("name = \"{0}\"", Path.GetFileNameWithoutExtension(targetFilename));
-        cargoTomlWriter.WriteLine("path = \"src/" + Path.GetFileName(targetFilename) + "\"");
-        cargoTomlWriter.WriteLine();
-      }
-    }
-
-    compilationResult = null;
-    var args = new List<string> {
-      "build",
-      "--quiet"
-    };
-
-    if (callToMain == null) {
-      args.Add("--lib");
-    } else {
-      args.Add("--bin");
-      args.Add(Path.GetFileNameWithoutExtension(targetFilename));
-    }
-
-    var psi = PrepareProcessStartInfo("cargo", args);
-    psi.WorkingDirectory = targetDirectory;
-    return 0 == RunProcess(psi, outputWriter, outputWriter, "Error while compiling Rust files.");
-  }
-
-  public override bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string /*?*/ callToMain,
-    string targetFilename, ReadOnlyCollection<string> otherFileNames, object compilationResult, TextWriter outputWriter, TextWriter errorWriter) {
-    Contract.Requires(targetFilename != null || otherFileNames.Count == 0);
-    var psi = PrepareProcessStartInfo(ComputeExeName(targetFilename), Options.MainArgs);
-    return 0 == RunProcess(psi, outputWriter, errorWriter);
-  }
-
-  public RustBackend(DafnyOptions options) : base(options) {
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Compilers/SinglePassCompiler.cs b/Source/DafnyCore/Compilers/SinglePassCompiler.cs
deleted file mode 100644
index f7dbb5be29a..00000000000
--- a/Source/DafnyCore/Compilers/SinglePassCompiler.cs
+++ /dev/null
@@ -1,5804 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) Microsoft Corporation.  All Rights Reserved.
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-//
-//-----------------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.IO;
-using System.Diagnostics.Contracts;
-using JetBrains.Annotations;
-using Microsoft.BaseTypes;
-using static Microsoft.Dafny.Compilers.CompilerErrors;
-
-
-namespace Microsoft.Dafny.Compilers {
-  public abstract class SinglePassCompiler {
-    public DafnyOptions Options { get; }
-
-    /// <summary>
-    /// Emits a call to <c>mainMethod</c> as the program's entry point, if such an explicit call is
-    /// required in the target language.
-    /// </summary>
-    public abstract void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree callToMainTree);
-
-    /// <summary>
-    /// Change <c>name</c> into a valid identifier in the target language.
-    /// </summary>
-    public abstract string PublicIdProtect(string name);
-
-    public static Plugin Plugin =
-      new ConfiguredPlugin(InternalCompilersPluginConfiguration.Singleton);
-
-    public abstract IReadOnlySet<Feature> UnsupportedFeatures { get; }
-
-    /// <summary>
-    /// Whether or not the compiler turns
-    ///     datatype Record = R(oneThing: X)
-    /// into just X, including the case where "Record" is a tuple type with 1 non-ghost component.
-    /// </summary>
-    public virtual bool SupportsDatatypeWrapperErasure => true;
-    public static string DefaultNameMain = "Main";
-
-    protected virtual string ModuleSeparator { get => "."; }
-    protected virtual string ClassAccessor { get => "."; }
-
-    protected ErrorReporter Reporter;
-
-    Stack<ConcreteSyntaxTree> copyInstrWriters = new Stack<ConcreteSyntaxTree>(); // a buffer that stores copy instructions generated by letExpr that uses out param.
-    protected TopLevelDeclWithMembers thisContext;  // non-null when type members are being translated
-    protected Method enclosingMethod;  // non-null when a method body is being translated
-    protected Function enclosingFunction;  // non-null when a function body is being translated
-
-    protected internal readonly FreshIdGenerator idGenerator = new FreshIdGenerator();
-
-    private protected string ProtectedFreshId(string prefix) => IdProtect(idGenerator.FreshId(prefix));
-    private protected string ProtectedFreshNumericId(string prefix) => IdProtect(idGenerator.FreshNumericId(prefix));
-
-    Dictionary<Expression, int> uniqueAstNumbers = new Dictionary<Expression, int>();
-    int GetUniqueAstNumber(Expression expr) {
-      Contract.Requires(expr != null);
-      if (!uniqueAstNumbers.TryGetValue(expr, out var n)) {
-        n = uniqueAstNumbers.Count;
-        uniqueAstNumbers.Add(expr, n);
-      }
-      return n;
-    }
-
-    public readonly CoverageInstrumenter Coverage;
-
-    protected SinglePassCompiler(DafnyOptions options, ErrorReporter reporter) {
-      this.Options = options;
-      Reporter = reporter;
-      Coverage = new CoverageInstrumenter(this);
-      System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(CompilerErrors).TypeHandle);
-    }
-
-    protected static void ReportError(ErrorId errorId, ErrorReporter reporter, IToken tok, string msg, ConcreteSyntaxTree/*?*/ wr, params object[] args) {
-      Contract.Requires(msg != null);
-      Contract.Requires(args != null);
-
-      reporter.Error(MessageSource.Compiler, errorId, tok, msg, args);
-      wr?.WriteLine("/* {0} */", string.Format("Compilation error: " + msg, args));
-    }
-
-    public void Error(ErrorId errorId, IToken tok, string msg, ConcreteSyntaxTree wr, params object[] args) {
-      ReportError(errorId, Reporter, tok, msg, wr, args);
-    }
-
-    protected void UnsupportedFeatureError(IToken tok, Feature feature, string message = null, ConcreteSyntaxTree wr = null, params object[] args) {
-      if (!UnsupportedFeatures.Contains(feature)) {
-        throw new Exception($"'{feature}' is not an element of the {GetType().Name} compiler's UnsupportedFeatures set");
-      }
-
-      message ??= UnsupportedFeatureException.MessagePrefix + FeatureDescriptionAttribute.GetDescription(feature).Description;
-      Error(ErrorId.c_unsupported_feature, tok, message, wr, args);
-    }
-
-    protected string IntSelect = ",int";
-    protected string LambdaExecute = "";
-
-    protected bool UnicodeCharEnabled => Options.Get(CommonOptionBag.UnicodeCharacters);
-
-    protected string CharMethodQualifier => UnicodeCharEnabled ? "Unicode" : "";
-
-    protected virtual void EmitHeader(Program program, ConcreteSyntaxTree wr) { }
-    protected virtual void EmitFooter(Program program, ConcreteSyntaxTree wr) { }
-    protected virtual void EmitBuiltInDecls(SystemModuleManager systemModuleManager, ConcreteSyntaxTree wr) { }
-
-    /// <summary>
-    /// Creates a static Main method. The caller will fill the body of this static Main with a
-    /// call to the instance Main method in the enclosing class.
-    /// </summary>
-    protected abstract ConcreteSyntaxTree CreateStaticMain(IClassWriter wr, string argsParameterName);
-    protected abstract ConcreteSyntaxTree CreateModule(string moduleName, bool isDefault, bool isExtern, string/*?*/ libraryName, ConcreteSyntaxTree wr);
-    /// <summary>
-    /// Indicates the current program depends on the given module without creating it.
-    /// Called when a module is out of scope for compilation, such as when using --library.
-    /// </summary>
-    protected virtual void DependOnModule(string moduleName, bool isDefault, bool isExtern, string/*?*/ libraryName) { }
-    protected abstract string GetHelperModuleName();
-    protected interface IClassWriter {
-      ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody);
-      ConcreteSyntaxTree/*?*/ SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody);
-      ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody,
-        MemberDecl member, bool forBodyInheritance, bool lookasideBody);
-      ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IToken tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance);  // returns null iff !createBody
-      ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance);  // if createBody, then result and setterWriter are non-null, else both are null
-      void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IToken tok, string rhs, Field/*?*/ field);
-      /// <summary>
-      /// InitializeField is called for inherited fields. It is in lieu of calling DeclareField and is called only if
-      /// ClassesRedeclareInheritedFields==false for the compiler.
-      /// </summary>
-      void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass);
-      ConcreteSyntaxTree/*?*/ ErrorWriter();
-      void Finish();
-    }
-    protected virtual bool IncludeExternMembers { get => false; }
-    protected virtual bool SupportsStaticsInGenericClasses => true;
-    protected virtual bool TraitRepeatsInheritedDeclarations => false;
-    protected IClassWriter CreateClass(string moduleName, string name, TopLevelDecl cls, ConcreteSyntaxTree wr) {
-      return CreateClass(moduleName, name, false, null, cls.TypeArgs,
-        cls, (cls as TopLevelDeclWithMembers)?.ParentTypeInformation.UniqueParentTraits(), null, wr);
-    }
-
-    /// <summary>
-    /// "tok" can be "null" if "superClasses" is.
-    /// </summary>
-    protected abstract IClassWriter CreateClass(string moduleName, string name, bool isExtern, string/*?*/ fullPrintName,
-      List<TypeParameter> typeParameters, TopLevelDecl cls, List<Type>/*?*/ superClasses, IToken tok, ConcreteSyntaxTree wr);
-
-    /// <summary>
-    /// "tok" can be "null" if "superClasses" is.
-    /// </summary>
-    protected abstract IClassWriter CreateTrait(string name, bool isExtern, List<TypeParameter> typeParameters /*?*/,
-      TraitDecl trait, List<Type> superClasses /*?*/, IToken tok, ConcreteSyntaxTree wr);
-    protected virtual bool SupportsProperties => true;
-    protected abstract ConcreteSyntaxTree CreateIterator(IteratorDecl iter, ConcreteSyntaxTree wr);
-    /// <summary>
-    /// Returns an IClassWriter that can be used to write additional members. If "dt" is already written
-    /// in the DafnyRuntime.targetlanguage file, then returns "null".
-    /// </summary>
-    protected abstract IClassWriter/*?*/ DeclareDatatype(DatatypeDecl dt, ConcreteSyntaxTree wr);
-    protected virtual bool DatatypeDeclarationAndMemberCompilationAreSeparate => true;
-    /// <summary>
-    /// Returns an IClassWriter that can be used to write additional members.
-    /// </summary>
-    protected abstract IClassWriter DeclareNewtype(NewtypeDecl nt, ConcreteSyntaxTree wr);
-    protected abstract void DeclareSubsetType(SubsetTypeDecl sst, ConcreteSyntaxTree wr);
-    protected string GetNativeTypeName(NativeType nt) {
-      Contract.Requires(nt != null);
-      GetNativeInfo(nt.Sel, out var nativeName, out _, out _);
-      return nativeName;
-    }
-    protected abstract void GetNativeInfo(NativeType.Selection sel, out string name, out string literalSuffix, out bool needsCastAfterArithmetic);
-
-    protected List<T> SelectNonGhost<T>(TopLevelDecl cl, List<T> elements) {
-      Contract.Requires(cl != null && elements != null);
-      if (cl is TupleTypeDecl tupleDecl) {
-        Contract.Assert(elements.Count == tupleDecl.Dims);
-        return elements.Where((_, i) => !tupleDecl.ArgumentGhostness[i]).ToList();
-      } else {
-        return elements;
-      }
-    }
-
-    protected virtual List<TypeParameter> UsedTypeParameters(DatatypeDecl dt, bool alsoIncludeAutoInitTypeParameters = false) {
-      Contract.Requires(dt != null);
-
-      var idt = dt as IndDatatypeDecl;
-      if (idt == null) {
-        return dt.TypeArgs;
-      } else {
-        Contract.Assert(idt.TypeArgs.Count == idt.TypeParametersUsedInConstructionByGroundingCtor.Length);
-        var tps = new List<TypeParameter>();
-        for (int i = 0; i < idt.TypeArgs.Count; i++) {
-          if (idt.TypeParametersUsedInConstructionByGroundingCtor[i] || (alsoIncludeAutoInitTypeParameters && NeedsTypeDescriptor(idt.TypeArgs[i]))) {
-            tps.Add(idt.TypeArgs[i]);
-          }
-        }
-        return tps;
-      }
-    }
-
-    protected List<TypeArgumentInstantiation> UsedTypeParameters(DatatypeDecl dt, List<Type> typeArgs, bool alsoIncludeAutoInitTypeParameters = false) {
-      Contract.Requires(dt != null);
-      Contract.Requires(typeArgs != null);
-      Contract.Requires(dt.TypeArgs.Count == typeArgs.Count);
-
-      if (dt is not IndDatatypeDecl idt) {
-        return TypeArgumentInstantiation.ListFromClass(dt, typeArgs);
-      } else {
-        Contract.Assert(typeArgs.Count == idt.TypeParametersUsedInConstructionByGroundingCtor.Length);
-        var r = new List<TypeArgumentInstantiation>();
-        for (int i = 0; i < typeArgs.Count; i++) {
-          if (idt.TypeParametersUsedInConstructionByGroundingCtor[i] || (alsoIncludeAutoInitTypeParameters && NeedsTypeDescriptor(idt.TypeArgs[i]))) {
-            r.Add(new TypeArgumentInstantiation(dt.TypeArgs[i], typeArgs[i]));
-          }
-        }
-        return r;
-      }
-    }
-
-    protected bool NeedsTypeDescriptors(List<TypeArgumentInstantiation> typeArgs) {
-      Contract.Requires(typeArgs != null);
-      return typeArgs.Any(ta => NeedsTypeDescriptor(ta.Formal));
-    }
-
-    protected virtual bool NeedsTypeDescriptor(TypeParameter tp) {
-      Contract.Requires(tp != null);
-      return tp.Characteristics.HasCompiledValue;
-    }
-
-    protected abstract string TypeDescriptor(Type type, ConcreteSyntaxTree wr, IToken tok);
-
-    protected void EmitTypeDescriptorsActuals(List<TypeArgumentInstantiation> typeArgs, IToken tok, ConcreteSyntaxTree wr, bool useAllTypeArgs = false) {
-      var prefix = "";
-      EmitTypeDescriptorsActuals(typeArgs, tok, wr, ref prefix, useAllTypeArgs);
-    }
-
-    protected void EmitTypeDescriptorsActuals(List<TypeArgumentInstantiation> typeArgs, IToken tok, ConcreteSyntaxTree wr, ref string prefix, bool useAllTypeArgs = false) {
-      Contract.Requires(typeArgs != null);
-      Contract.Requires(tok != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(prefix != null);
-
-      foreach (var ta in typeArgs) {
-        if (useAllTypeArgs || NeedsTypeDescriptor(ta.Formal)) {
-          wr.Write("{0}{1}", prefix, TypeDescriptor(ta.Actual, wr, tok));
-          prefix = ", ";
-        }
-      }
-    }
-
-    /// <summary>
-    /// EmitTailCallStructure evolves "wr" into a structure that can be used as the jump target
-    /// for tail calls (see EmitJumpToTailCallStart).
-    /// The precondition of the method is:
-    ///     (member is Method m0 && m0.IsTailRecursive) || (member is Function f0 && f0.IsTailRecursive)
-    /// </summary>
-    protected abstract ConcreteSyntaxTree EmitTailCallStructure(MemberDecl member, ConcreteSyntaxTree wr);
-    protected abstract void EmitJumpToTailCallStart(ConcreteSyntaxTree wr);
-
-    internal abstract string TypeName(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member = null);
-    // For cases where a type looks different when it's an argument, such as (*sigh*) Java primitives
-    protected virtual string TypeArgumentName(Type type, ConcreteSyntaxTree wr, IToken tok) {
-      return TypeName(type, wr, tok);
-    }
-    /// <summary>
-    /// This method returns the target representation of one possible value of the type.
-    /// Requires: usePlaceboValue || type.HasCompilableValue
-    ///
-    ///   usePlaceboValue - If "true", the default value produced is one that the target language accepts as a value
-    ///                  of the type, but which may not correspond to a Dafny value. This option is used when it is known
-    ///                  that the Dafny program will not use the value (for example, when a field is automatically initialized
-    ///                  but the Dafny program will soon assign a new value).
-    /// </summary>
-    protected abstract string TypeInitializationValue(Type type, ConcreteSyntaxTree wr, IToken tok, bool usePlaceboValue, bool constructTypeParameterDefaultsFromTypeDescriptors);
-
-    protected string TypeName_UDT(string fullCompileName, UserDefinedType udt, ConcreteSyntaxTree wr, IToken tok, bool omitTypeArguments = false) {
-      Contract.Requires(fullCompileName != null);
-      Contract.Requires(udt != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(tok != null);
-      Contract.Requires(udt.TypeArgs.Count == (udt.ResolvedClass == null ? 0 : udt.ResolvedClass.TypeArgs.Count));
-      var cl = udt.ResolvedClass;
-      var typeParams = SelectNonGhost(cl, cl.TypeArgs);
-      var typeArgs = SelectNonGhost(cl, udt.TypeArgs);
-      return TypeName_UDT(fullCompileName, typeParams.ConvertAll(tp => tp.Variance), typeArgs, wr, tok, omitTypeArguments);
-    }
-    protected abstract string TypeName_UDT(string fullCompileName, List<TypeParameter.TPVariance> variance, List<Type> typeArgs,
-      ConcreteSyntaxTree wr, IToken tok, bool omitTypeArguments);
-    protected abstract string/*?*/ TypeName_Companion(Type type, ConcreteSyntaxTree wr, IToken tok, MemberDecl/*?*/ member);
-    protected virtual void EmitTypeName_Companion(Type type, ConcreteSyntaxTree wr, ConcreteSyntaxTree surrounding, IToken tok, MemberDecl/*?*/ member) {
-      wr.Write(TypeName_Companion(type, surrounding, tok, member));
-    }
-
-    protected string TypeName_Companion(TopLevelDecl cls, ConcreteSyntaxTree wr, IToken tok) {
-      Contract.Requires(cls != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(tok != null);
-      return TypeName_Companion(UserDefinedType.FromTopLevelDecl(tok, cls), wr, tok, null);
-    }
-    /// Return the "native form" of a type, to which EmitCoercionToNativeForm coerces it.
-    protected virtual Type NativeForm(Type type) {
-      return type;
-    }
-
-    protected abstract bool DeclareFormal(string prefix, string name, Type type, IToken tok, bool isInParam, ConcreteSyntaxTree wr);
-    /// <summary>
-    /// If "leaveRoomForRhs" is false and "rhs" is null, then generates:
-    ///     type name;
-    /// If "leaveRoomForRhs" is false and "rhs" is non-null, then generates:
-    ///     type name = rhs;
-    /// If "leaveRoomForRhs" is true, in which case "rhs" must be null, then generates:
-    ///     type name
-    /// which is intended to be followed up by a call to EmitAssignmentRhs.
-    /// In the above, if "type" is null, then it is replaced by "var" or "let".
-    /// "tok" is allowed to be null if "type" is.
-    /// </summary>
-    protected abstract void DeclareLocalVar(string name, Type/*?*/ type, IToken /*?*/ tok, bool leaveRoomForRhs, string/*?*/ rhs, ConcreteSyntaxTree wr);
-
-    protected virtual void DeclareLocalVar(string name, Type /*?*/ type, IToken /*?*/ tok, bool leaveRoomForRhs, string /*?*/ rhs, ConcreteSyntaxTree wr, Type t) {
-      DeclareLocalVar(name, type, tok, leaveRoomForRhs, rhs, wr);
-    }
-    /// <summary>
-    /// Generates:
-    ///     type name = rhs;
-    /// In the above, if "type" is null, then it is replaced by "var" or "let".
-    /// "tok" is allowed to be null if "type" is.
-    /// </summary>
-    protected virtual void DeclareLocalVar(string name, Type/*?*/ type, IToken/*?*/ tok, Expression rhs, bool inLetExprBody, ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      var w = DeclareLocalVar(name, type, tok, wr);
-      EmitExpr(rhs, inLetExprBody, w, wStmts);
-    }
-
-    /// <summary>
-    /// Generates
-    ///     type name = <<writer returned>>;
-    /// In the above, if "type" is null, then it is replaced by "var" or "let".
-    /// "tok" is allowed to be null if "type" is.
-    /// </summary>
-    protected abstract ConcreteSyntaxTree DeclareLocalVar(string name, Type/*?*/ type, IToken/*?*/ tok, ConcreteSyntaxTree wr);
-    protected virtual void DeclareOutCollector(string collectorVarName, ConcreteSyntaxTree wr) { }  // called only for return-style calls
-    protected virtual void DeclareSpecificOutCollector(string collectorVarName, ConcreteSyntaxTree wr, List<Type> formalTypes, List<Type> lhsTypes) { DeclareOutCollector(collectorVarName, wr); } // for languages that don't allow "let" or "var" expressions
-    protected virtual bool UseReturnStyleOuts(Method m, int nonGhostOutCount) => false;
-    protected virtual ConcreteSyntaxTree EmitMethodReturns(Method m, ConcreteSyntaxTree wr) { return wr; } // for languages that need explicit return statements not provided by Dafny
-    protected virtual bool SupportsMultipleReturns { get => false; }
-    protected virtual bool SupportsAmbiguousTypeDecl { get => true; }
-    protected virtual bool ClassesRedeclareInheritedFields => true;
-    protected virtual void AddTupleToSet(int i) { }
-    public int TargetTupleSize = 0;
-    /// The punctuation that comes at the end of a statement.  Note that
-    /// statements are followed by newlines regardless.
-    protected virtual string StmtTerminator { get => ";"; }
-    protected virtual string True { get => "true"; }
-    protected virtual string False { get => "false"; }
-    protected virtual string Conj { get => "&&"; }
-    protected virtual string AssignmentSymbol { get => " = "; }
-    public void EndStmt(ConcreteSyntaxTree wr) { wr.WriteLine(StmtTerminator); }
-    protected abstract void DeclareLocalOutVar(string name, Type type, IToken tok, string rhs, bool useReturnStyleOuts, ConcreteSyntaxTree wr);
-    protected virtual void EmitActualOutArg(string actualOutParamName, ConcreteSyntaxTree wr) { }  // actualOutParamName is always the name of a local variable; called only for non-return-style outs
-    protected virtual void EmitOutParameterSplits(string outCollector, List<string> actualOutParamNames, ConcreteSyntaxTree wr) { }  // called only for return-style calls
-    protected virtual void EmitCastOutParameterSplits(string outCollector, List<string> actualOutParamNames, ConcreteSyntaxTree wr, List<Type> formalOutParamTypes, List<Type> lhsTypes, IToken tok) {
-      EmitOutParameterSplits(outCollector, actualOutParamNames, wr);
-    }
-
-    protected abstract void EmitActualTypeArgs(List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr);
-
-    protected virtual void EmitNameAndActualTypeArgs(string protectedName, List<Type> typeArgs, IToken tok, ConcreteSyntaxTree wr) {
-      wr.Write(protectedName);
-      EmitActualTypeArgs(typeArgs, tok, wr);
-    }
-
-    protected virtual ConcreteSyntaxTree EmitAssignment(ILvalue wLhs, Type lhsType /*?*/, Type rhsType /*?*/,
-      ConcreteSyntaxTree wr, IToken tok) {
-      var w = wLhs.EmitWrite(wr);
-
-      w = EmitCoercionIfNecessary(rhsType, lhsType, tok, w);
-      w = EmitDowncastIfNecessary(rhsType, lhsType, tok, w);
-      return w;
-    }
-
-    protected virtual void EmitAssignment(out ConcreteSyntaxTree wLhs, Type/*?*/ lhsType, out ConcreteSyntaxTree wRhs, Type/*?*/ rhsType, ConcreteSyntaxTree wr) {
-      wLhs = wr.Fork();
-      wr.Write(AssignmentSymbol);
-      var w = wr;
-      w = EmitCoercionIfNecessary(rhsType, lhsType, Token.NoToken, w);
-      w = EmitDowncastIfNecessary(rhsType, lhsType, Token.NoToken, w);
-      wRhs = w.Fork();
-      EndStmt(wr);
-    }
-    protected void EmitAssignment(string lhs, Type/*?*/ lhsType, string rhs, Type/*?*/ rhsType, ConcreteSyntaxTree wr) {
-      EmitAssignment(out var wLhs, lhsType, out var wRhs, rhsType, wr);
-      wLhs.Write(lhs);
-      wRhs.Write(rhs);
-    }
-    protected void EmitAssignmentRhs(string rhs, ConcreteSyntaxTree wr) {
-      var w = EmitAssignmentRhs(wr);
-      w.Write(rhs);
-    }
-    protected void EmitAssignmentRhs(Expression rhs, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts = null) {
-      wStmts ??= wr.Fork();
-      var w = EmitAssignmentRhs(wr);
-      EmitExpr(rhs, inLetExprBody, w, wStmts);
-    }
-
-    protected virtual ConcreteSyntaxTree EmitAssignmentRhs(ConcreteSyntaxTree wr) {
-      wr.Write(AssignmentSymbol);
-      var w = wr.Fork();
-      EndStmt(wr);
-      return w;
-    }
-
-    protected virtual string EmitAssignmentLhs(Expression e, ConcreteSyntaxTree wr) {
-      var wStmts = wr.Fork();
-      var target = ProtectedFreshId("_lhs");
-      EmitExpr(e, false, DeclareLocalVar(target, e.Type, e.tok, wr), wStmts);
-      return target;
-    }
-
-    protected virtual void EmitMultiAssignment(List<Expression> lhsExprs, List<ILvalue> lhss, List<Type> lhsTypes, out List<ConcreteSyntaxTree> wRhss,
-      List<Type> rhsTypes, ConcreteSyntaxTree wr) {
-      Contract.Assert(lhss.Count == lhsTypes.Count);
-      Contract.Assert(lhsTypes.Count == rhsTypes.Count);
-
-      wRhss = new List<ConcreteSyntaxTree>();
-      var rhsVars = new List<string>();
-      foreach (var rhsType in rhsTypes) {
-        string target = ProtectedFreshId("_rhs");
-        rhsVars.Add(target);
-        wRhss.Add(DeclareLocalVar(target, rhsType, Token.NoToken, wr));
-      }
-
-      List<ILvalue> lhssn;
-      if (lhss.Count > 1) {
-        lhssn = new List<ILvalue>();
-        for (int i = 0; i < lhss.Count; ++i) {
-          Expression lexpr = lhsExprs[i].Resolved;
-          ILvalue lhs = lhss[i];
-          if (lexpr is IdentifierExpr) {
-            lhssn.Add(lhs);
-
-          } else if (lexpr is MemberSelectExpr memberSelectExpr) {
-            string target = EmitAssignmentLhs(memberSelectExpr.Obj, wr);
-            var typeArgs = TypeArgumentInstantiation.ListFromMember(memberSelectExpr.Member,
-              null, memberSelectExpr.TypeApplication_JustMember);
-            ILvalue newLhs = EmitMemberSelect(w => EmitIdentifier(target, w), memberSelectExpr.Obj.Type, memberSelectExpr.Member, typeArgs,
-              memberSelectExpr.TypeArgumentSubstitutionsWithParents(), memberSelectExpr.Type, internalAccess: enclosingMethod is Constructor);
-            lhssn.Add(newLhs);
-
-          } else if (lexpr is SeqSelectExpr selectExpr) {
-            string targetArray = EmitAssignmentLhs(selectExpr.Seq, wr);
-            string targetIndex = EmitAssignmentLhs(selectExpr.E0, wr);
-            if (selectExpr.Seq.Type.IsArrayType || selectExpr.Seq.Type.AsSeqType != null) {
-              targetIndex = ArrayIndexToNativeInt(targetIndex, selectExpr.E0.Type);
-            }
-            ILvalue newLhs = new ArrayLvalueImpl(this, targetArray, new List<string>() { targetIndex }, lhsTypes[i]);
-            lhssn.Add(newLhs);
-
-          } else if (lexpr is MultiSelectExpr multiSelectExpr) {
-            string targetArray = EmitAssignmentLhs(multiSelectExpr.Array, wr);
-            var targetIndices = new List<string>();
-            foreach (var index in multiSelectExpr.Indices) {
-              string targetIndex = EmitAssignmentLhs(index, wr);
-              targetIndex = ArrayIndexToNativeInt(targetIndex, index.Type);
-              targetIndices.Add(targetIndex);
-            }
-            ILvalue newLhs = new ArrayLvalueImpl(this, targetArray, targetIndices, lhsTypes[i]);
-            lhssn.Add(newLhs);
-
-          } else {
-            Contract.Assert(false); // Unknown kind of expression
-            lhssn.Add(lhs);
-          }
-        }
-      } else {
-        lhssn = lhss;
-      }
-
-      Contract.Assert(rhsVars.Count == lhsTypes.Count);
-      for (int i = 0; i < rhsVars.Count; i++) {
-        ConcreteSyntaxTree wRhsVar = EmitAssignment(lhssn[i], lhsTypes[i], rhsTypes[i], wr, Token.NoToken);
-        EmitIdentifier(rhsVars[i], wRhsVar);
-      }
-    }
-
-    protected virtual void EmitSetterParameter(ConcreteSyntaxTree wr) {
-      wr.Write("value");
-    }
-    protected abstract void EmitPrintStmt(ConcreteSyntaxTree wr, Expression arg);
-    protected abstract void EmitReturn(List<Formal> outParams, ConcreteSyntaxTree wr);
-    protected virtual void EmitReturnExpr(Expression expr, Type resultType, bool inLetExprBody, ConcreteSyntaxTree wr) {  // emits "return <expr>;" for function bodies
-      var wStmts = wr.Fork();
-      var w = EmitReturnExpr(wr);
-      EmitExpr(expr, inLetExprBody, w, wStmts);
-    }
-    protected virtual void EmitReturnExpr(string returnExpr, ConcreteSyntaxTree wr) {  // emits "return <returnExpr>;" for function bodies
-      var w = EmitReturnExpr(wr);
-      w.Write(returnExpr);
-    }
-    protected virtual ConcreteSyntaxTree EmitReturnExpr(ConcreteSyntaxTree wr) {
-      // emits "return <returnExpr>;" for function bodies
-      wr.Write("return ");
-      var w = wr.Fork();
-      EndStmt(wr);
-      return w;
-    }
-    /// <summary>
-    /// Labels the code written to the TargetWriter returned, in such that way that any
-    /// emitted break to the label inside that code will abruptly end the execution of the code.
-    /// </summary>
-    protected abstract ConcreteSyntaxTree CreateLabeledCode(string label, bool createContinueLabel, ConcreteSyntaxTree wr);
-    protected abstract void EmitBreak(string/*?*/ label, ConcreteSyntaxTree wr);
-    protected abstract void EmitContinue(string label, ConcreteSyntaxTree wr);
-    protected abstract void EmitYield(ConcreteSyntaxTree wr);
-    protected abstract void EmitAbsurd(string/*?*/ message, ConcreteSyntaxTree wr);
-    protected virtual void EmitAbsurd(string message, ConcreteSyntaxTree wr, bool needIterLimit) {
-      EmitAbsurd(message, wr);
-    }
-
-    protected abstract void EmitHalt(IToken tok, Expression /*?*/ messageExpr, ConcreteSyntaxTree wr);
-
-    protected ConcreteSyntaxTree EmitIf(string guard, bool hasElse, ConcreteSyntaxTree wr) {
-      var thn = EmitIf(out var guardWriter, hasElse, wr);
-      guardWriter.Write(guard);
-      return thn;
-    }
-    protected virtual ConcreteSyntaxTree EmitIf(out ConcreteSyntaxTree guardWriter, bool hasElse, ConcreteSyntaxTree wr) {
-      wr.Write("if (");
-      guardWriter = wr.Fork();
-      if (hasElse) {
-        var thn = wr.NewBlock(")", " else", BlockStyle.SpaceBrace, BlockStyle.SpaceBrace);
-        return thn;
-      } else {
-        var thn = wr.NewBlock(")");
-        return thn;
-      }
-    }
-
-    protected virtual ConcreteSyntaxTree EmitBlock(ConcreteSyntaxTree wr) {
-      return wr.NewBlock("", open: BlockStyle.Brace);
-    }
-
-    protected virtual ConcreteSyntaxTree EmitWhile(IToken tok, List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr) {  // returns the guard writer
-      var wBody = CreateWhileLoop(out var guardWriter, wr);
-      wBody = EmitContinueLabel(labels, wBody);
-      Coverage.Instrument(tok, "while body", wBody);
-      TrStmtList(body, wBody);
-      return guardWriter;
-    }
-
-    protected abstract ConcreteSyntaxTree EmitForStmt(IToken tok, IVariable loopIndex, bool goingUp, string /*?*/ endVarName,
-      List<Statement> body, LList<Label> labels, ConcreteSyntaxTree wr);
-
-    protected virtual ConcreteSyntaxTree CreateWhileLoop(out ConcreteSyntaxTree guardWriter, ConcreteSyntaxTree wr) {
-      wr.Write("while (");
-      guardWriter = wr.Fork();
-      var wBody = wr.NewBlock(")");
-      return wBody;
-    }
-
-    /// <summary>
-    /// Create a for loop where the type of the index variable, along with "start" and "bound", is the native array-index type.
-    /// </summary>
-    protected abstract ConcreteSyntaxTree CreateForLoop(string indexVar, string bound, ConcreteSyntaxTree wr, string start = null);
-    protected abstract ConcreteSyntaxTree CreateDoublingForLoop(string indexVar, int start, ConcreteSyntaxTree wr);
-    protected abstract void EmitIncrementVar(string varName, ConcreteSyntaxTree wr);  // increments a BigInteger by 1
-    protected abstract void EmitDecrementVar(string varName, ConcreteSyntaxTree wr);  // decrements a BigInteger by 1
-
-    protected abstract string GetQuantifierName(string bvType);
-
-    /// <summary>
-    /// Emit a loop like this:
-    ///     foreach (tmpVarName:collectionElementType in [[collectionWriter]]) {
-    ///       [[bodyWriter]]
-    ///     }
-    /// where
-    ///   * "[[collectionWriter]]" is the writer returned as "collectionWriter"
-    ///   * "[[bodyWriter]]" is the block writer returned
-    /// </summary>
-    protected abstract ConcreteSyntaxTree CreateForeachLoop(
-      string tmpVarName, Type collectionElementType,
-      IToken tok, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr);
-
-    /// <summary>
-    /// Creates a guarded foreach loop that iterates over a collection, and apply required subtype
-    /// and compiled subset types filters. Will not emit intermediate ifs if there is no need.
-    ///
-    ///     foreach(collectionElementType tmpVarName in collectionWriter) {
-    ///       if(tmpVarName is [boundVar.type]) {
-    ///         var [IDName(boundVar)] = ([boundVar.type])(tmpvarName);
-    ///         if(constraints_of_boundvar.Type([IdName(boundVar)])) {
-    ///           ...
-    ///         }
-    ///       }
-    ///     }
-    /// </summary>
-    /// <returns>A writer to write inside the deepest if-then</returns>
-    private ConcreteSyntaxTree CreateGuardedForeachLoop(
-      string tmpVarName, Type collectionElementType,
-      IVariable boundVar,
-      bool introduceBoundVar, bool inLetExprBody,
-      IToken tok, ConcreteSyntaxTree collection, ConcreteSyntaxTree wr
-      ) {
-      wr = CreateForeachLoop(tmpVarName, collectionElementType, tok, out var collectionWriter, wr);
-      collectionWriter.Append(collection);
-      wr = MaybeInjectSubtypeConstraint(tmpVarName, collectionElementType, boundVar.Type, inLetExprBody, tok, wr);
-      EmitDowncastVariableAssignment(IdName(boundVar), boundVar.Type, tmpVarName, collectionElementType,
-          introduceBoundVar, tok, wr);
-      wr = MaybeInjectSubsetConstraint(boundVar, boundVar.Type, collectionElementType, inLetExprBody, tok, wr);
-      return wr;
-    }
-
-    /// <summary>
-    /// Returns a subtype condition like:
-    ///     tmpVarName is member of type boundVarType
-    /// Returns null if no condition is necessary
-    /// </summary>
-    [CanBeNull]
-    protected abstract string GetSubtypeCondition(
-      string tmpVarName, Type boundVarType, IToken tok, ConcreteSyntaxTree wPreconditions);
-
-    /// <summary>
-    /// Emit an (already verified) downcast assignment like:
-    /// 
-    ///     var boundVarName:boundVarType := tmpVarName as boundVarType;
-    ///     [[bodyWriter]]
-    /// 
-    /// where
-    ///   * "[[bodyWriter]]" is where the writer wr's position will be next
-    /// </summary>
-    /// <param name="boundVarName">Name of the variable after casting</param>
-    /// <param name="boundVarType">Expected variable type</param>
-    /// <param name="tmpVarName">The collection's variable name</param>
-    /// <param name="collectionElementType">type this variable is casted from, in case it is useful</param>
-    /// <param name="introduceBoundVar">Whether or not to declare the variable, in languages requiring declarations</param>
-    /// <param name="tok">A position in the AST</param>
-    /// <param name="wr">The concrete syntax tree writer</param>
-    protected abstract void EmitDowncastVariableAssignment(string boundVarName, Type boundVarType, string tmpVarName,
-      Type collectionElementType, bool introduceBoundVar, IToken tok, ConcreteSyntaxTree wr);
-
-    /// <summary>
-    /// Emit a simple foreach loop over the elements (which are known as "ingredients") of a collection assembled for
-    /// the purpose of compiling a "forall" statement.
-    ///
-    ///     foreach (boundVarName:boundVarType in [[coll]]) {
-    ///       [[body]]
-    ///     }
-    ///
-    /// where "boundVarType" is an L-tuple whose components are "tupleTypeArgs" (see EmitIngredients). If "boundVarType" can
-    /// be inferred from the ingredients emitted by EmitIngredients, then "L" and "tupleTypeArgs" can be ignored and
-    /// "boundVarType" be replaced by some target-language way of saying "please infer the type" (like "var" in C#).
-    /// </summary>
-    protected abstract ConcreteSyntaxTree CreateForeachIngredientLoop(string boundVarName, int L, string tupleTypeArgs, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wr);
-
-    /// <summary>
-    /// If "initCall" is non-null, then "initCall.Method is Constructor".
-    /// </summary>
-    protected abstract void EmitNew(Type type, IToken tok, CallStmt initCall /*?*/, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts);
-
-    // To support target language constructors without an additional initCall in {:extern} code, we ignore the initCall
-    // and call the constructor with all arguments.
-    protected string ConstructorArguments(CallStmt initCall, ConcreteSyntaxTree wStmts, Constructor ctor, string sep = "") {
-      var arguments = Enumerable.Empty<string>();
-      if (ctor != null && ctor.IsExtern(Options, out _, out _)) {
-        // the arguments of any external constructor are placed here
-        arguments = ctor.Ins.Select((f, i) => (f, i))
-          .Where(tp => !tp.f.IsGhost)
-          .Select(tp => Expr(initCall.Args[tp.i], false, wStmts).ToString());
-      }
-      return (arguments.Any() ? sep : "") + arguments.Comma();
-    }
-
-    protected virtual bool DeterminesArrayTypeFromExampleElement => false;
-
-    protected virtual string ArrayIndexLiteral(int x) => x.ToString();
-
-    /// <summary>
-    /// Allocates a new array with element type "elementType" and lengths "dimensions" in each dimension.
-    /// Note that "elementType" may denote a type parameter.
-    ///
-    /// Each string in "dimensions" is generated as a Dafny "int" (that is, a BigInteger).
-    ///
-    /// If "mustInitialize" is true, then fills each array element with a default value of type "elementType".
-    /// In this case, "exampleElement" must be null.
-    ///
-    /// If "mustInitialize" is false, then the array's elements are left uninitialized.
-    /// In this case, "exampleElement" may be non-null as a guide to figuring out what run-time type the array should have.
-    /// Note that "exampleElement" is not written to the array.
-    ///
-    /// "exampleElement" is always null if "DeterminesArrayTypeFromExampleElement" is false.
-    /// </summary>
-    protected abstract void EmitNewArray(Type elementType, IToken tok, List<string> dimensions,
-      bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
-
-    /// <summary>
-    /// Same as the EmitNewArray overload above, except that "dimensions" is "List<Expression>" instead of "List<string>".
-    /// </summary>
-    protected virtual void EmitNewArray(Type elementType, IToken tok, List<Expression> dimensions,
-      bool mustInitialize, [CanBeNull] string exampleElement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-
-      var dimStrings = dimensions.ConvertAll(expr => {
-        var wrDim = new ConcreteSyntaxTree();
-        EmitExpr(expr, false, ExprToInt(expr.Type, wrDim), wStmts);
-        return wrDim.ToString();
-      });
-      EmitNewArray(elementType, tok, dimStrings, mustInitialize, exampleElement, wr, wStmts);
-    }
-
-    protected abstract void EmitLiteralExpr(ConcreteSyntaxTree wr, LiteralExpr e);
-    protected abstract void EmitStringLiteral(string str, bool isVerbatim, ConcreteSyntaxTree wr);
-    protected abstract ConcreteSyntaxTree EmitBitvectorTruncation(BitvectorType bvType, bool surroundByUnchecked, ConcreteSyntaxTree wr);
-    protected delegate void FCE_Arg_Translator(Expression e, ConcreteSyntaxTree wr, bool inLetExpr, ConcreteSyntaxTree wStmts);
-
-    protected abstract void EmitRotate(Expression e0, Expression e1, bool isRotateLeft, ConcreteSyntaxTree wr,
-      bool inLetExprBody, ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr);
-    /// <summary>
-    /// Return true if x < 0 should be rendered as sign(x) < 0 when x has the
-    /// given type.  Typically, this is only a win at non-native types, since
-    /// BigIntegers benefit from not having to access the number zero.
-    /// </summary>
-    protected virtual bool CompareZeroUsingSign(Type type) {
-      return false;
-    }
-    protected virtual ConcreteSyntaxTree EmitSign(Type type, ConcreteSyntaxTree wr) {
-      // Currently, this should only be called when CompareZeroUsingSign is true
-      Contract.Assert(false);
-      throw new cce.UnreachableException();
-    }
-    protected abstract void EmitEmptyTupleList(string tupleTypeArgs, ConcreteSyntaxTree wr);
-    protected abstract ConcreteSyntaxTree EmitAddTupleToList(string ingredients, string tupleTypeArgs, ConcreteSyntaxTree wr);
-    protected abstract void EmitTupleSelect(string prefix, int i, ConcreteSyntaxTree wr);
-
-    protected virtual bool NeedsCastFromTypeParameter => false;
-
-    protected virtual bool TargetSubtypingRequiresEqualTypeArguments(Type type) => false;
-
-    protected virtual bool IsCoercionNecessary(Type /*?*/ from, Type /*?*/ to) {
-      return NeedsCastFromTypeParameter;
-    }
-
-    protected virtual Type TypeForCoercion(Type type) {
-      return type;
-    }
-
-    /// <summary>
-    /// If "from" and "to" are both given, and if a "from" needs an explicit coercion in order to become a "to", emit that coercion.
-    /// Needed in languages where either
-    ///   (a) we need to represent upcasts as explicit operations (like Go, or array types in Java), or
-    ///   (b) there's static typing but no parametric polymorphism (like Go) so that lots of things need to be boxed and unboxed.
-    /// </summary>
-    protected virtual ConcreteSyntaxTree EmitCoercionIfNecessary(Type/*?*/ from, Type/*?*/ to, IToken tok, ConcreteSyntaxTree wr) {
-      if (from != null && to != null && from.IsTraitType && to.AsNewtype != null) {
-        return FromFatPointer(to, wr);
-      }
-      if (from != null && to != null && from.AsNewtype != null && to.IsTraitType && (enclosingMethod != null || enclosingFunction != null)) {
-        return ToFatPointer(from, wr);
-      }
-      return wr;
-    }
-
-    protected ConcreteSyntaxTree CoercionIfNecessary(Type/*?*/ from, Type/*?*/ to, IToken tok, ICanRender inner) {
-      var result = new ConcreteSyntaxTree();
-      EmitCoercionIfNecessary(from, to, tok, result).Append(inner);
-      return result;
-    }
-
-    protected ConcreteSyntaxTree EmitDowncastIfNecessary(Type /*?*/ from, Type /*?*/ to, IToken tok, ConcreteSyntaxTree wr) {
-      Contract.Requires(tok != null);
-      Contract.Requires(wr != null);
-      if (from != null && to != null) {
-        from = DatatypeWrapperEraser.SimplifyType(Options, from);
-        to = DatatypeWrapperEraser.SimplifyType(Options, to);
-        if (!IsTargetSupertype(to, from)) {
-          // By the way, it is tempting to think that IsTargetSupertype(from, to)) would hold here, but that's not true.
-          // For one, in a language with NeedsCastFromTypeParameter, "to" and "from" may contain uninstantiated formal type parameters.
-          // Also, it is possible (subject to a check enforced by the verifier) to assign Datatype<X> to Datatype<Y>,
-          // where Datatype is co-variant in its argument type and X and Y are two incomparable types with a common supertype.
-
-          wr = EmitDowncast(from, to, tok, wr);
-        }
-      }
-      return wr;
-    }
-
-    protected virtual ConcreteSyntaxTree UnboxNewtypeValue(ConcreteSyntaxTree wr) {
-      return wr;
-    }
-
-    /// <summary>
-    /// Change from the fat-pointer representation of "type" to the ordinary representation of "type".
-    /// If these are the same, acts as the identity.
-    /// Note, the two representations are different only for newtypes, and only for newtypes that
-    /// extend a trait, see Type.HasFatPointer.
-    /// </summary>
-    protected virtual ConcreteSyntaxTree FromFatPointer(Type type, ConcreteSyntaxTree wr) {
-      return wr;
-    }
-
-    /// <summary>
-    /// Change from the ordinary representation of "type" to the fat-pointer representation of "type".
-    /// If these are the same, acts as the identity.
-    /// Note, the two representations are different only for newtypes, and only for newtypes that
-    /// extend a trait, see Type.HasFatPointer.
-    /// </summary>
-    protected virtual ConcreteSyntaxTree ToFatPointer(Type type, ConcreteSyntaxTree wr) {
-      return wr;
-    }
-
-    /// <summary>
-    /// Determine if "to" is a supertype of "from" in the target language, if "!typeEqualityOnly".
-    /// Determine if "to" is equal to "from" in the target language, if "typeEqualityOnly".
-    /// This to similar to Type.IsSupertype and Type.Equals, respectively, but ignores subset types (that
-    /// is, always uses the base type of any subset type).
-    /// </summary>
-    public bool IsTargetSupertype(Type to, Type from, bool typeEqualityOnly = false) {
-      Contract.Requires(from != null);
-      Contract.Requires(to != null);
-      to = to.NormalizeExpand();
-      from = from.NormalizeExpand();
-      if (Type.SameHead(to, from)) {
-        Contract.Assert(to.TypeArgs.Count == from.TypeArgs.Count);
-        var formalTypeParameters = (to as UserDefinedType)?.ResolvedClass?.TypeArgs;
-        Contract.Assert(formalTypeParameters == null || formalTypeParameters.Count == to.TypeArgs.Count);
-        Contract.Assert(formalTypeParameters != null || to.TypeArgs.Count == 0 || to is CollectionType);
-        for (var i = 0; i < to.TypeArgs.Count; i++) {
-          bool okay;
-          if (typeEqualityOnly || TargetSubtypingRequiresEqualTypeArguments(to)) {
-            okay = IsTargetSupertype(to.TypeArgs[i], from.TypeArgs[i], true);
-          } else if (formalTypeParameters == null || formalTypeParameters[i].Variance == TypeParameter.TPVariance.Co) {
-            okay = IsTargetSupertype(to.TypeArgs[i], from.TypeArgs[i]);
-          } else if (formalTypeParameters[i].Variance == TypeParameter.TPVariance.Contra) {
-            okay = IsTargetSupertype(from.TypeArgs[i], to.TypeArgs[i]);
-          } else {
-            okay = IsTargetSupertype(to.TypeArgs[i], from.TypeArgs[i], true);
-          }
-          if (!okay) {
-            return false;
-          }
-        }
-        return true;
-      } else if (typeEqualityOnly) {
-        return false;
-      } else if (to.IsObjectQ) {
-        return true;
-      } else {
-        return from.ParentTypes().Any(fromParentType => IsTargetSupertype(to, fromParentType));
-      }
-    }
-
-    protected ConcreteSyntaxTree Downcast(Type from, Type to, IToken tok, ICanRender expression) {
-      var result = new ConcreteSyntaxTree();
-      EmitDowncast(from, to, tok, result).Append(expression);
-      return result;
-    }
-
-    protected virtual ConcreteSyntaxTree EmitDowncast(Type from, Type to, IToken tok, ConcreteSyntaxTree wr) {
-      Contract.Requires(from != null);
-      Contract.Requires(to != null);
-      Contract.Requires(tok != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(!IsTargetSupertype(to, from));
-      return wr;
-    }
-
-    protected virtual ConcreteSyntaxTree EmitCoercionToNativeInt(ConcreteSyntaxTree wr) {
-      return wr;
-    }
-    /// <summary>
-    /// Emit a coercion of a value to any tuple, returning the writer for the value to coerce.  Needed in translating ForallStmt because some of the tuple components are native ints for which we have no Type object, but Go needs to coerce the value that comes out of the iterator.  Safe to leave this alone in subclasses that don't have the same problem.
-    /// </summary>
-    protected virtual ConcreteSyntaxTree EmitCoercionToArbitraryTuple(ConcreteSyntaxTree wr) {
-      return wr;
-    }
-    protected virtual string IdName(TopLevelDecl d) {
-      Contract.Requires(d != null);
-      return IdProtect(d.GetCompileName(Options));
-    }
-    protected virtual string IdName(MemberDecl member) {
-      Contract.Requires(member != null);
-      return IdProtect(member.GetCompileName(Options));
-    }
-
-    protected virtual string CompanionMemberIdName(MemberDecl member) {
-      return IdName(member);
-    }
-    protected virtual string IdName(TypeParameter tp) {
-      Contract.Requires(tp != null);
-      return IdProtect(tp.GetCompileName(Options));
-    }
-    protected virtual string IdName(IVariable v) {
-      Contract.Requires(v != null);
-      return IdProtect(v.CompileName);
-    }
-    protected virtual string IdMemberName(MemberSelectExpr mse) {
-      Contract.Requires(mse != null);
-      return IdProtect(mse.MemberName);
-    }
-    protected virtual string IdProtect(string name) {
-      Contract.Requires(name != null);
-      return name;
-    }
-    protected abstract string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null);
-    protected abstract void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember = false);
-    protected virtual void EmitNull(Type type, ConcreteSyntaxTree wr) {
-      wr.Write("null");
-    }
-    protected virtual void EmitITE(Expression guard, Expression thn, Expression els, Type resultType, bool inLetExprBody,
-        ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Requires(guard != null);
-      Contract.Requires(thn != null);
-      Contract.Requires(thn.Type != null);
-      Contract.Requires(els != null);
-      Contract.Requires(resultType != null);
-      Contract.Requires(wr != null);
-
-      resultType = resultType.NormalizeExpand();
-      var thenExpr = Expr(thn, inLetExprBody, wStmts);
-      var castedThenExpr = resultType.Equals(thn.Type.NormalizeExpand()) ? thenExpr : Cast(resultType, thenExpr);
-      var elseExpr = Expr(els, inLetExprBody, wStmts);
-      var castedElseExpr = resultType.Equals(els.Type.NormalizeExpand()) ? elseExpr : Cast(resultType, elseExpr);
-      wr.Format($"(({Expr(guard, inLetExprBody, wStmts)}) ? ({castedThenExpr}) : ({castedElseExpr}))");
-    }
-
-    public ConcreteSyntaxTree Cast(ICanRender toType, ConcreteSyntaxTree expr) {
-      var result = new ConcreteSyntaxTree();
-      EmitCast(toType, result).Append(expr);
-      return result;
-    }
-
-    public ConcreteSyntaxTree Cast(Type toType, ConcreteSyntaxTree expr) {
-      var result = new ConcreteSyntaxTree();
-      EmitCast(new LineSegment(TypeName(toType, result, Token.NoToken)), result).Append(expr);
-      return result;
-    }
-
-    protected virtual ConcreteSyntaxTree EmitCast(ICanRender toType, ConcreteSyntaxTree wr) {
-      wr.Format($"({toType})");
-      return wr.ForkInParens();
-    }
-
-    protected abstract void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr);
-    protected abstract void GetSpecialFieldInfo(SpecialField.ID id, object idParam, Type receiverType, out string compiledName, out string preString, out string postString);
-
-    /// <summary>
-    /// A "TypeArgumentInstantiation" is essentially a pair consisting of a formal type parameter and an actual type for that parameter.
-    /// </summary>
-    public class TypeArgumentInstantiation {
-      public readonly TypeParameter Formal;
-      public readonly Type Actual;
-
-      public TypeArgumentInstantiation(TypeParameter formal, Type actual) {
-        Contract.Requires(formal != null);
-        Contract.Requires(actual != null);
-        Formal = formal;
-        Actual = actual;
-      }
-
-      /// <summary>
-      /// Uses "formal" for both formal and actual.
-      /// </summary>
-      public TypeArgumentInstantiation(TypeParameter formal) {
-        Contract.Requires(formal != null);
-        Formal = formal;
-        Actual = new UserDefinedType(formal);
-      }
-
-      public static List<TypeArgumentInstantiation> ListFromMember(MemberDecl member, List<Type> /*?*/ classActuals, List<Type> /*?*/ memberActuals) {
-        Contract.Requires(classActuals == null || classActuals.Count == (member.EnclosingClass == null ? 0 : member.EnclosingClass.TypeArgs.Count));
-        Contract.Requires(memberActuals == null || memberActuals.Count == (member is ICallable ic ? ic.TypeArgs.Count : 0));
-
-        var r = new List<TypeArgumentInstantiation>();
-        void add(List<TypeParameter> formals, List<Type> actuals) {
-          Contract.Assert(formals.Count == actuals.Count);
-          for (var i = 0; i < formals.Count; i++) {
-            r.Add(new TypeArgumentInstantiation(formals[i], actuals[i]));
-          }
-        };
-
-        if (classActuals != null && classActuals.Count != 0) {
-          Contract.Assert(member.EnclosingClass.TypeArgs.TrueForAll(ta => ta.Parent is TopLevelDecl));
-          add(member.EnclosingClass.TypeArgs, classActuals);
-        }
-        if (memberActuals != null && member is ICallable icallable) {
-          Contract.Assert(icallable.TypeArgs.TrueForAll(ta => !(ta.Parent is TopLevelDecl)));
-          add(icallable.TypeArgs, memberActuals);
-        }
-        return r;
-      }
-
-      public static List<TypeArgumentInstantiation> ListFromClass(TopLevelDecl cl, List<Type> actuals) {
-        Contract.Requires(cl != null);
-        Contract.Requires(actuals != null);
-        Contract.Requires(cl.TypeArgs.Count == actuals.Count);
-
-        var r = new List<TypeArgumentInstantiation>();
-        for (var i = 0; i < cl.TypeArgs.Count; i++) {
-          r.Add(new TypeArgumentInstantiation(cl.TypeArgs[i], actuals[i]));
-        }
-        return r;
-      }
-
-      public static List<TypeArgumentInstantiation> ListFromFormals(List<TypeParameter> formals) {
-        Contract.Requires(formals != null);
-        return formals.ConvertAll(tp => new TypeArgumentInstantiation(tp, new UserDefinedType(tp)));
-      }
-
-      public static List<TypeParameter> ToFormals(List<TypeArgumentInstantiation> typeArgs) {
-        Contract.Requires(typeArgs != null);
-        return typeArgs.ConvertAll(ta => ta.Formal);
-      }
-
-      public static List<Type> ToActuals(List<TypeArgumentInstantiation> typeArgs) {
-        Contract.Requires(typeArgs != null);
-        return typeArgs.ConvertAll(ta => ta.Actual);
-      }
-    }
-
-    /// <summary>
-    /// Answers two questions whose answers are used to filter type parameters.
-    /// For a member c, F, or M:
-    ///     (co-)datatype/class/trait <<cl>> {
-    ///       <<isStatic>> const c ...
-    ///       <<isStatic>> function F ...
-    ///       <<isStatic>> method M ...
-    ///     }
-    /// does a type parameter of "cl"
-    ///  - get compiled as a type parameter of the member (needsTypeParameter)
-    ///  - get compiled as a type descriptor of the member (needsTypeDescriptor)
-    /// For a member of a trait with a rhs/body, if "lookasideBody" is "true", the questions are to
-    /// be answered for the member emitted into the companion class, not the signature that goes into
-    /// the target type.
-    /// </summary>
-    protected virtual void TypeArgDescriptorUse(bool isStatic, bool lookasideBody, TopLevelDeclWithMembers cl, out bool needsTypeParameter, out bool needsTypeDescriptor) {
-      Contract.Requires(cl is DatatypeDecl || cl is ClassLikeDecl);
-      // TODO: Decide whether to express this as a Feature
-      throw new NotImplementedException();
-    }
-
-    protected internal List<TypeArgumentInstantiation> ForTypeParameters(List<TypeArgumentInstantiation> typeArgs, MemberDecl member, bool lookasideBody) {
-      Contract.Requires(member is ConstantField || member is Function || member is Method);
-      Contract.Requires(typeArgs != null);
-      var memberHasBody =
-        (member is ConstantField cf && cf.Rhs != null) ||
-        (member is Function f && f.Body != null) ||
-        (member is Method m && m.Body != null);
-      var r = new List<TypeArgumentInstantiation>();
-      foreach (var ta in typeArgs) {
-        var tp = ta.Formal;
-        if (tp.Parent is TopLevelDeclWithMembers) {
-          TypeArgDescriptorUse(member.IsStatic, lookasideBody, (TopLevelDeclWithMembers)member.EnclosingClass, out var needsTypeParameter, out var _);
-          if (!needsTypeParameter) {
-            continue;
-          }
-        }
-        r.Add(ta);
-      }
-      return r;
-    }
-
-    protected List<TypeArgumentInstantiation> ForTypeDescriptors(List<TypeArgumentInstantiation> typeArgs, TopLevelDecl enclosingClass, MemberDecl member, bool lookasideBody) {
-      Contract.Requires(member is ConstantField || member is Function || member is Method);
-      Contract.Requires(typeArgs != null);
-      var memberHasBody =
-        (member is ConstantField cf && cf.Rhs != null) ||
-        (member is Function f && f.Body != null) ||
-        (member is Method m && m.Body != null);
-      var r = new List<TypeArgumentInstantiation>();
-      foreach (var ta in typeArgs) {
-        var tp = ta.Formal;
-        if (tp.Parent is TopLevelDeclWithMembers) {
-          if (tp.Parent is not TraitDecl && member?.OverriddenMember != null) {
-            continue;
-          }
-          TypeArgDescriptorUse(member == null || member.IsStatic, lookasideBody, (TopLevelDeclWithMembers)enclosingClass, out var _, out var needsTypeDescriptor);
-          if (!needsTypeDescriptor) {
-            continue;
-          }
-        }
-        r.Add(ta);
-      }
-      return r;
-    }
-
-    /// <summary>
-    /// The "additionalCustomParameter" is used when the member is an instance function that requires customer-receiver support.
-    /// This parameter is then to be added between any run-time type descriptors and the "normal" arguments. The caller will
-    /// arrange for "additionalCustomParameter" to be properly bound.
-    /// </summary>
-    protected abstract ILvalue EmitMemberSelect(Action<ConcreteSyntaxTree> obj, Type objType, MemberDecl member, List<TypeArgumentInstantiation> typeArgs, Dictionary<TypeParameter, Type> typeMap,
-      Type expectedType, string/*?*/ additionalCustomParameter = null, bool internalAccess = false);
-
-    /// <summary>
-    /// The "indices" are expected to already be of the native array-index type.
-    /// </summary>
-    protected abstract ConcreteSyntaxTree EmitArraySelect(List<string> indices, Type elmtType, ConcreteSyntaxTree wr);
-    protected abstract ConcreteSyntaxTree EmitArraySelect(List<Expression> indices, Type elmtType, bool inLetExprBody,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
-
-    /// <summary>
-    /// The "indices" are expected to already be of the native array-index type.
-    /// </summary>
-    protected virtual (ConcreteSyntaxTree wArray, ConcreteSyntaxTree wRhs) EmitArrayUpdate(List<string> indices, Type elementType, ConcreteSyntaxTree wr) {
-      var wArray = EmitArraySelect(indices, elementType, wr);
-      wr.Write(" = ");
-      var wRhs = wr.Fork();
-      return (wArray, wRhs);
-    }
-    protected ConcreteSyntaxTree EmitArrayUpdate(List<string> indices, Expression rhs, ConcreteSyntaxTree wr) {
-      var (wArray, wRhs) = EmitArrayUpdate(indices, rhs.Type, wr);
-      EmitExpr(rhs, false, wRhs, wr);
-      return wArray;
-    }
-    /// <summary>
-    /// Given a target-language expression "arrayIndex" that of the target array-index type, return an
-    /// expression that denotes "arrayIndex" as a Dafny "int" (that is, a BigInteger).
-    /// </summary>
-    protected virtual string ArrayIndexToInt(string arrayIndex) {
-      Contract.Requires(arrayIndex != null);
-      return arrayIndex;
-    }
-
-    protected virtual ConcreteSyntaxTree ExprToInt(Type fromType, ConcreteSyntaxTree wr) {
-      return wr;
-    }
-    protected virtual string ArrayIndexToNativeInt(string arrayIndex, Type fromType) {
-      Contract.Requires(arrayIndex != null);
-      Contract.Requires(fromType != null);
-      return arrayIndex;
-    }
-
-    protected ConcreteSyntaxTree ExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
-      var result = new ConcreteSyntaxTree();
-      EmitExprAsNativeInt(expr, inLetExprBody, result, wStmts);
-      return result;
-    }
-
-    protected abstract void EmitExprAsNativeInt(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts);
-    protected abstract void EmitIndexCollectionSelect(Expression source, Expression index, bool inLetExprBody,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
-    protected abstract void EmitIndexCollectionUpdate(Expression source, Expression index, Expression value,
-      CollectionType resultCollectionType, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
-    protected virtual void EmitIndexCollectionUpdate(Type sourceType, out ConcreteSyntaxTree wSource, out ConcreteSyntaxTree wIndex, out ConcreteSyntaxTree wValue, ConcreteSyntaxTree wr, bool nativeIndex) {
-      wSource = wr.Fork();
-      wr.Write('[');
-      wIndex = wr.Fork();
-      wr.Write("] = ");
-      wValue = wr.Fork();
-    }
-    /// <summary>
-    /// If "fromArray" is false, then "source" is a sequence.
-    /// If "fromArray" is true, then "source" is an array.
-    /// </summary>
-    protected abstract void EmitSeqSelectRange(Expression source, Expression lo /*?*/, Expression hi /*?*/,
-      bool fromArray, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
-    protected abstract void EmitSeqConstructionExpr(SeqConstructionExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts);
-    protected abstract void EmitMultiSetFormingExpr(MultiSetFormingExpr expr, bool inLetExprBody, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts);
-    protected abstract void EmitApplyExpr(Type functionType, IToken tok, Expression function, List<Expression> arguments, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
-    protected virtual bool TargetLambdaCanUseEnclosingLocals => true;
-    protected abstract ConcreteSyntaxTree EmitBetaRedex(List<string> boundVars, List<Expression> arguments, List<Type> boundTypes,
-      Type resultType, IToken resultTok, bool inLetExprBody, ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts);
-    protected virtual void EmitConstructorCheck(string source, DatatypeCtor ctor, ConcreteSyntaxTree wr) {
-      wr.Write("{0}.is_{1}", source, ctor.GetCompileName(Options));
-    }
-    /// <summary>
-    /// EmitDestructor is somewhat similar to following "source" with a call to EmitMemberSelect.
-    /// However, EmitDestructor may also need to perform a cast on "source".
-    /// Furthermore, EmitDestructor also needs to work for anonymous destructors.
-    /// </summary>
-    protected abstract void EmitDestructor(Action<ConcreteSyntaxTree> source, Formal dtor, int formalNonGhostIndex, DatatypeCtor ctor, List<Type> typeArgs, Type bvType, ConcreteSyntaxTree wr);
-    protected virtual bool TargetLambdasRestrictedToExpressions => false;
-    protected abstract ConcreteSyntaxTree CreateLambda(List<Type> inTypes, IToken tok, List<string> inNames,
-      Type resultType, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, bool untyped = false);
-
-    /// <summary>
-    /// Emit an "Immediately Invoked Function Expression" with the semantics of
-    ///     var bvName: bvType := <<wrRhs>>; <<wrBody>>
-    /// where <<wrBody>> will have type "bodyType". In many languages, this IIFE will not be a "let" expression but a "lambda" expression like this:
-    ///     ((bvName: bvType) => <<wrBody>>)(<<wrRhs>>)
-    /// </summary>
-    protected abstract void CreateIIFE(string bvName, Type bvType, IToken bvTok, Type bodyType, IToken bodyTok,
-      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts, out ConcreteSyntaxTree wrRhs, out ConcreteSyntaxTree wrBody);
-    protected ConcreteSyntaxTree CreateIIFE_ExprBody(string bvName, Type bvType, IToken bvTok, Expression rhs,
-      bool inLetExprBody, Type bodyType, IToken bodyTok, ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts) {
-      var innerScope = wStmts.Fork();
-      CreateIIFE(bvName, bvType, bvTok, bodyType, bodyTok, wr, ref wStmts, out var wrRhs, out var wrBody);
-      EmitExpr(rhs, inLetExprBody, wrRhs, innerScope);
-      return wrBody;
-    }
-
-    protected abstract ConcreteSyntaxTree CreateIIFE0(Type resultType, IToken resultTok, ConcreteSyntaxTree wr,
-      ConcreteSyntaxTree wStmts);  // Immediately Invoked Function Expression
-    protected abstract ConcreteSyntaxTree CreateIIFE1(int source, Type resultType, IToken resultTok, string bvName,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);  // Immediately Invoked Function Expression
-    public enum ResolvedUnaryOp { BoolNot, BitwiseNot, Cardinality }
-
-    protected static readonly Dictionary<UnaryOpExpr.ResolvedOpcode, ResolvedUnaryOp> UnaryOpCodeMap = new() {
-      [UnaryOpExpr.ResolvedOpcode.BVNot] = ResolvedUnaryOp.BitwiseNot,
-      [UnaryOpExpr.ResolvedOpcode.BoolNot] = ResolvedUnaryOp.BoolNot,
-      [UnaryOpExpr.ResolvedOpcode.SeqLength] = ResolvedUnaryOp.Cardinality,
-      [UnaryOpExpr.ResolvedOpcode.SetCard] = ResolvedUnaryOp.Cardinality,
-      [UnaryOpExpr.ResolvedOpcode.MultiSetCard] = ResolvedUnaryOp.Cardinality,
-      [UnaryOpExpr.ResolvedOpcode.MapCard] = ResolvedUnaryOp.Cardinality
-    };
-
-    protected abstract void EmitUnaryExpr(ResolvedUnaryOp op, Expression expr, bool inLetExprBody,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
-
-    protected virtual void CompileBinOp(BinaryExpr.ResolvedOpcode op,
-      Expression e0, Expression e1, IToken tok, Type resultType,
-      out string opString,
-      out string preOpString,
-      out string postOpString,
-      out string callString,
-      out string staticCallString,
-      out bool reverseArguments,
-      out bool truncateResult,
-      out bool convertE1_to_int,
-      out bool coerceE1,
-      ConcreteSyntaxTree errorWr) {
-
-      // This default implementation does not handle all cases. It handles some cases that look the same
-      // in C-like languages. It also handles cases that can be solved by another operator, but reversing
-      // the arguments or following the operation with a negation.
-      opString = null;
-      preOpString = "";
-      postOpString = "";
-      callString = null;
-      staticCallString = null;
-      reverseArguments = false;
-      truncateResult = false;
-      convertE1_to_int = false;
-      coerceE1 = false;
-
-      BinaryExpr.ResolvedOpcode dualOp = BinaryExpr.ResolvedOpcode.Add;  // NOTE! "Add" is used to say "there is no dual op"
-      BinaryExpr.ResolvedOpcode negatedOp = BinaryExpr.ResolvedOpcode.Add;  // NOTE! "Add" is used to say "there is no negated op"
-
-      switch (op) {
-        case BinaryExpr.ResolvedOpcode.Iff:
-          opString = "=="; break;
-        case BinaryExpr.ResolvedOpcode.Imp:
-          preOpString = "!"; opString = "||"; break;
-        case BinaryExpr.ResolvedOpcode.Or:
-          opString = "||"; break;
-        case BinaryExpr.ResolvedOpcode.And:
-          opString = "&&"; break;
-        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
-          opString = "&"; break;
-        case BinaryExpr.ResolvedOpcode.BitwiseOr:
-          opString = "|"; break;
-        case BinaryExpr.ResolvedOpcode.BitwiseXor:
-          opString = "^"; break;
-
-        case BinaryExpr.ResolvedOpcode.Lt:
-        case BinaryExpr.ResolvedOpcode.LtChar:
-          opString = "<"; break;
-        case BinaryExpr.ResolvedOpcode.Le:
-        case BinaryExpr.ResolvedOpcode.LeChar:
-          opString = "<="; break;
-        case BinaryExpr.ResolvedOpcode.Ge:
-        case BinaryExpr.ResolvedOpcode.GeChar:
-          opString = ">="; break;
-        case BinaryExpr.ResolvedOpcode.Gt:
-        case BinaryExpr.ResolvedOpcode.GtChar:
-          opString = ">"; break;
-
-        case BinaryExpr.ResolvedOpcode.SetNeq:
-          negatedOp = BinaryExpr.ResolvedOpcode.SetEq; break;
-        case BinaryExpr.ResolvedOpcode.MultiSetNeq:
-          negatedOp = BinaryExpr.ResolvedOpcode.MultiSetEq; break;
-        case BinaryExpr.ResolvedOpcode.SeqNeq:
-          negatedOp = BinaryExpr.ResolvedOpcode.SeqEq; break;
-        case BinaryExpr.ResolvedOpcode.MapNeq:
-          negatedOp = BinaryExpr.ResolvedOpcode.MapEq; break;
-
-        case BinaryExpr.ResolvedOpcode.Superset:
-          dualOp = BinaryExpr.ResolvedOpcode.Subset; break;
-        case BinaryExpr.ResolvedOpcode.MultiSuperset:
-          dualOp = BinaryExpr.ResolvedOpcode.MultiSubset; break;
-
-        case BinaryExpr.ResolvedOpcode.ProperSuperset:
-          dualOp = BinaryExpr.ResolvedOpcode.ProperSubset; break;
-        case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
-          dualOp = BinaryExpr.ResolvedOpcode.ProperMultiSubset; break;
-
-        case BinaryExpr.ResolvedOpcode.NotInSet:
-          negatedOp = BinaryExpr.ResolvedOpcode.InSet; break;
-        case BinaryExpr.ResolvedOpcode.NotInMultiSet:
-          negatedOp = BinaryExpr.ResolvedOpcode.InMultiSet; break;
-        case BinaryExpr.ResolvedOpcode.NotInSeq:
-          negatedOp = BinaryExpr.ResolvedOpcode.InSeq; break;
-        case BinaryExpr.ResolvedOpcode.NotInMap:
-          negatedOp = BinaryExpr.ResolvedOpcode.InMap; break;
-
-        default:
-          // The operator is one that needs to be handled in the specific compilers.
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected binary expression
-      }
-
-      if (dualOp != BinaryExpr.ResolvedOpcode.Add) {  // remember from above that Add stands for "there is no dual"
-        Contract.Assert(negatedOp == BinaryExpr.ResolvedOpcode.Add);
-        CompileBinOp(dualOp,
-          e1, e0, tok, resultType,
-          out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
-          errorWr);
-        reverseArguments = !reverseArguments;
-      } else if (negatedOp != BinaryExpr.ResolvedOpcode.Add) {  // remember from above that Add stands for "there is no negated op"
-        CompileBinOp(negatedOp,
-          e0, e1, tok, resultType,
-          out opString, out preOpString, out postOpString, out callString, out staticCallString, out reverseArguments, out truncateResult, out convertE1_to_int, out coerceE1,
-          errorWr);
-        preOpString = "!" + preOpString;
-      }
-    }
-
-    protected abstract void EmitIsZero(string varName, ConcreteSyntaxTree wr);
-    protected abstract void EmitConversionExpr(ConversionExpr e, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
-    /// <summary>
-    /// "fromType" is assignable to "toType", "fromType" is not a subtype of "toType", and both "fromType" and "toType" refer to
-    /// reference types or subset types thereof.
-    /// </summary>
-    protected abstract void EmitTypeTest(string localName, Type fromType, Type toType, IToken tok, ConcreteSyntaxTree wr);
-    protected abstract void EmitCollectionDisplay(CollectionType ct, IToken tok, List<Expression> elements,
-      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);  // used for sets, multisets, and sequences
-    protected abstract void EmitMapDisplay(MapType mt, IToken tok, List<ExpressionPair> elements,
-      bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
-
-    protected abstract void EmitSetBuilder_New(ConcreteSyntaxTree wr, SetComprehension e, string collectionName);
-    protected abstract void EmitMapBuilder_New(ConcreteSyntaxTree wr, MapComprehension e, string collectionName);
-
-    protected abstract void EmitSetBuilder_Add(CollectionType ct, string collName, Expression elmt, bool inLetExprBody, ConcreteSyntaxTree wr);
-    protected abstract ConcreteSyntaxTree EmitMapBuilder_Add(MapType mt, IToken tok, string collName, Expression term, bool inLetExprBody, ConcreteSyntaxTree wr);
-
-    /// <summary>
-    /// The "ct" type is either a SetType or a MapType.
-    /// </summary>
-    protected abstract string GetCollectionBuilder_Build(CollectionType ct, IToken tok, string collName, ConcreteSyntaxTree wr);
-
-    protected virtual Type EmitIntegerRange(Type type, out ConcreteSyntaxTree wLo, out ConcreteSyntaxTree wHi, ConcreteSyntaxTree wr) {
-      Type result;
-      if (AsNativeType(type) != null) {
-        wr.Write("{0}.IntegerRange(", IdProtect(type.AsNewtype.GetFullCompileName(Options)));
-        result = type;
-      } else {
-        wr.Write("{0}.IntegerRange(", GetHelperModuleName());
-        result = new IntType();
-      }
-      wLo = wr.Fork();
-      wr.Write(", ");
-      wHi = wr.Fork();
-      wr.Write(')');
-      return result;
-    }
-    protected abstract void EmitSingleValueGenerator(Expression e, bool inLetExprBody, string type,
-      ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts);
-    protected virtual void FinishModule() { }
-
-    protected virtual void DeclareExternType(AbstractTypeDecl d, Expression compileTypeHint, ConcreteSyntaxTree wr) { }
-
-    protected virtual void OrganizeModules(Program program, out List<ModuleDefinition> modules) {
-      modules = program.CompileModules.ToList();
-    }
-
-    public void Compile(Program program, ConcreteSyntaxTree wrx) {
-      Contract.Requires(program != null);
-
-      EmitHeader(program, wrx);
-      EmitBuiltInDecls(program.SystemModuleManager, wrx);
-      var temp = new List<ModuleDefinition>();
-      OrganizeModules(program, out temp);
-      foreach (var m in temp) {
-        if (m.IsAbstract) {
-          // the purpose of an abstract module is to skip compilation
-          continue;
-        }
-
-        DetectAndMarkCapitalizationConflicts(m);
-
-        var moduleIsExtern = false;
-        string libraryName = null;
-        if (!Options.DisallowExterns) {
-          var args = Attributes.FindExpressions(m.Attributes, "extern");
-          if (args != null) {
-            if (args.Count == 2) {
-              libraryName = (string)(args[1] as StringLiteralExpr)?.Value;
-            }
-            moduleIsExtern = true;
-          }
-        }
-        if (!m.ShouldCompile(program.Compilation)) {
-          DependOnModule(m.GetCompileName(Options), m.IsDefaultModule, moduleIsExtern, libraryName);
-          continue;
-        }
-        var wr = CreateModule(m.GetCompileName(Options), m.IsDefaultModule, moduleIsExtern, libraryName, wrx);
-        var v = new CheckHasNoAssumes_Visitor(this, wr);
-        foreach (TopLevelDecl d in m.TopLevelDecls) {
-          bool compileIt = true;
-          if (Attributes.ContainsBool(d.Attributes, "compile", ref compileIt) && !compileIt) {
-            continue;
-          }
-          var newLineWriter = wr.Fork();
-          if (d is AbstractTypeDecl) {
-            var at = (AbstractTypeDecl)d;
-            bool externP = Attributes.Contains(at.Attributes, "extern");
-            if (externP) {
-              var exprs = Attributes.FindExpressions(at.Attributes, "extern");
-              Contract.Assert(exprs != null);  // because externP is true
-              if (exprs.Count == 1) {
-                DeclareExternType(at, exprs[0], wr);
-              } else {
-                Error(ErrorId.c_abstract_type_needs_hint, d.tok, "Abstract type ('{0}') with extern attribute requires a compile hint. Expected {{:extern compile_type_hint}}", wr, at.FullName);
-              }
-              v.Visit(exprs);
-            } else {
-              Error(ErrorId.c_abstract_type_cannot_be_compiled, d.tok, "Abstract type ('{0}') cannot be compiled; perhaps make it a type synonym or use :extern.", wr, at.FullName);
-            }
-          } else if (d is TypeSynonymDecl) {
-            var sst = d as SubsetTypeDecl;
-            if (sst != null) {
-              DeclareSubsetType(sst, wr);
-              v.Visit(sst);
-            } else {
-              continue;
-            }
-          } else if (d is NewtypeDecl) {
-            var nt = (NewtypeDecl)d;
-            var w = DeclareNewtype(nt, wr);
-            v.Visit(nt);
-            CompileClassMembers(program, nt, w);
-            w.Finish();
-          } else if ((d as TupleTypeDecl)?.NonGhostDims == 1 && SupportsDatatypeWrapperErasure && Options.Get(CommonOptionBag.OptimizeErasableDatatypeWrapper)) {
-            // ignore this type declaration
-          } else if (d is DatatypeDecl) {
-            var dt = (DatatypeDecl)d;
-
-            if (!DeclaredDatatypes.Add((m, dt.GetCompileName(Options)))) {
-              continue;
-            }
-            var w = DeclareDatatype(dt, wr);
-            if (w != null) {
-              CompileClassMembers(program, dt, w);
-              w.Finish();
-            } else if (DatatypeDeclarationAndMemberCompilationAreSeparate) {
-              continue;
-            }
-          } else if (d is IteratorDecl) {
-            var iter = (IteratorDecl)d;
-            if (Options.ForbidNondeterminism && iter.Outs.Count > 0) {
-              Error(ErrorId.c_iterators_are_not_deterministic, iter.tok, "since yield parameters are initialized arbitrarily, iterators are forbidden by the --enforce-determinism option", wr);
-            }
-
-            var wIter = CreateIterator(iter, wr);
-            if (iter.Body == null) {
-              Error(ErrorId.c_iterator_has_no_body, iter.tok, "iterator {0} has no body", wIter, iter.FullName);
-            } else {
-              TrStmtList(iter.Body.Body, wIter);
-            }
-
-          } else if (d is TraitDecl trait) {
-            // writing the trait
-            var w = CreateTrait(trait.GetCompileName(Options), trait.IsExtern(Options, out _, out _), trait.TypeArgs, trait, trait.ParentTypeInformation.UniqueParentTraits(), trait.tok, wr);
-            CompileClassMembers(program, trait, w);
-            w.Finish();
-          } else if (d is DefaultClassDecl defaultClassDecl) {
-            Contract.Assert(defaultClassDecl.InheritedMembers.Count == 0);
-            Predicate<MemberDecl> compilationMaterial = x =>
-              !x.IsGhost && (Options.DisallowExterns || !Attributes.Contains(x.Attributes, "extern"));
-            var include = defaultClassDecl.Members.Exists(compilationMaterial);
-            var classIsExtern = false;
-            if (include) {
-              classIsExtern =
-                (!Options.DisallowExterns && Attributes.Contains(defaultClassDecl.Attributes, "extern")) ||
-                Attributes.Contains(defaultClassDecl.EnclosingModuleDefinition.Attributes, "extern");
-              if (classIsExtern && defaultClassDecl.Members.TrueForAll(member => member.IsGhost || Attributes.Contains(member.Attributes, "extern"))) {
-                include = false;
-              }
-            }
-            if (include) {
-              var cw = CreateClass(IdProtect(d.EnclosingModuleDefinition.GetCompileName(Options)), IdName(defaultClassDecl),
-                classIsExtern, defaultClassDecl.FullName,
-                defaultClassDecl.TypeArgs, defaultClassDecl, defaultClassDecl.ParentTypeInformation.UniqueParentTraits(), defaultClassDecl.tok, wr);
-              CompileClassMembers(program, defaultClassDecl, cw);
-              cw.Finish();
-            } else {
-              // still check that given members satisfy compilation rules
-              var abyss = new NullClassWriter();
-              CompileClassMembers(program, defaultClassDecl, abyss);
-            }
-
-          } else if (d is ClassLikeDecl cl) {
-            var include = true;
-            var classIsExtern = false;
-            if (include) {
-              classIsExtern = !Options.DisallowExterns && Attributes.Contains(cl.Attributes, "extern");
-              if (classIsExtern && cl.Members.TrueForAll(member => member.IsGhost || Attributes.Contains(member.Attributes, "extern"))) {
-                include = false;
-              }
-            }
-            if (Options.ForbidNondeterminism &&
-                !classIsExtern &&
-                !cl.Members.Exists(member => member is Constructor) &&
-                cl.Members.Exists(member => member is Field && !(member is ConstantField { Rhs: not null }))) {
-              Error(ErrorId.c_constructorless_class_forbidden, cl.tok, "since fields are initialized arbitrarily, constructor-less classes are forbidden by the --enforce-determinism option", wr);
-            }
-            if (include) {
-              var cw = CreateClass(IdProtect(d.EnclosingModuleDefinition.GetCompileName(Options)), IdName(cl), classIsExtern, cl.FullName,
-                cl.TypeArgs, cl, cl.ParentTypeInformation.UniqueParentTraits(), cl.tok, wr);
-              CompileClassMembers(program, cl, cw);
-              cw.Finish();
-            } else {
-              // still check that given members satisfy compilation rules
-              var abyss = new NullClassWriter();
-              CompileClassMembers(program, cl, abyss);
-            }
-          } else if (d is ValuetypeDecl) {
-            // nop
-            continue;
-          } else if (d is ModuleDecl) {
-            // nop
-            continue;
-          } else { Contract.Assert(false); }
-
-          newLineWriter.WriteLine();
-        }
-
-        FinishModule();
-      }
-      EmitFooter(program, wrx);
-    }
-
-    private void DetectAndMarkCapitalizationConflicts(ModuleDefinition module) {
-      foreach (TopLevelDecl d in module.TopLevelDecls) {
-        if (d is DatatypeDecl datatypeDecl) {
-          CheckForCapitalizationConflicts(datatypeDecl.Ctors);
-          foreach (var ctor in datatypeDecl.Ctors) {
-            CheckForCapitalizationConflicts(ctor.Destructors);
-          }
-        }
-        if (d is TopLevelDeclWithMembers topLevelDeclWithMembers) {
-          CheckForCapitalizationConflicts(topLevelDeclWithMembers.Members, topLevelDeclWithMembers.InheritedMembers);
-        }
-      }
-    }
-
-    public ISet<(ModuleDefinition, string)> DeclaredDatatypes { get; } = new HashSet<(ModuleDefinition, string)>();
-
-    protected class NullClassWriter : IClassWriter {
-      private readonly ConcreteSyntaxTree abyss = new ConcreteSyntaxTree();
-      private readonly ConcreteSyntaxTree block;
-
-      public NullClassWriter() {
-        block = abyss.NewBlock("");
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        return createBody ? block : null;
-      }
-
-      public ConcreteSyntaxTree SynthesizeMethod(Method m, List<TypeArgumentInstantiation> typeArgs, bool createBody, bool forBodyInheritance, bool lookasideBody) {
-        throw new UnsupportedFeatureException(m.tok, Feature.MethodSynthesis);
-      }
-
-      public ConcreteSyntaxTree/*?*/ CreateFunction(string name, List<TypeArgumentInstantiation> typeArgs, List<Formal> formals, Type resultType, IToken tok, bool isStatic, bool createBody, MemberDecl member, bool forBodyInheritance, bool lookasideBody) {
-        return createBody ? block : null;
-      }
-      public ConcreteSyntaxTree/*?*/ CreateGetter(string name, TopLevelDecl enclosingDecl, Type resultType, IToken tok, bool isStatic, bool isConst, bool createBody, MemberDecl/*?*/ member, bool forBodyInheritance) {
-        return createBody ? block : null;
-      }
-      public ConcreteSyntaxTree/*?*/ CreateGetterSetter(string name, Type resultType, IToken tok, bool createBody, MemberDecl/*?*/ member, out ConcreteSyntaxTree setterWriter, bool forBodyInheritance) {
-        if (createBody) {
-          setterWriter = block;
-          return block;
-        } else {
-          setterWriter = null;
-          return null;
-        }
-      }
-      public void DeclareField(string name, TopLevelDecl enclosingDecl, bool isStatic, bool isConst, Type type, IToken tok, string rhs, Field field) { }
-
-      public void InitializeField(Field field, Type instantiatedFieldType, TopLevelDeclWithMembers enclosingClass) { }
-
-      public ConcreteSyntaxTree/*?*/ ErrorWriter() {
-        return null; // match the old behavior of Compile() where this is used
-      }
-
-      public void Finish() { }
-    }
-
-    protected void ReadRuntimeSystem(Program program, string filename, ConcreteSyntaxTree wr) {
-      Contract.Requires(filename != null);
-      Contract.Requires(wr != null);
-
-      var assembly = System.Reflection.Assembly.Load("DafnyPipeline");
-      var stream = assembly.GetManifestResourceStream(filename);
-      if (stream is null) {
-        throw new Exception($"Cannot find embedded resource: {filename}");
-      }
-
-      var rd = new StreamReader(stream);
-      WriteFromStream(rd, wr.Append(new Verbatim()));
-    }
-
-    public static void WriteFromStream(StreamReader rd, TextWriter outputWriter) {
-      while (true) {
-        string s = rd.ReadLine();
-        if (s == null) {
-          return;
-        }
-        outputWriter.WriteLine(s);
-      }
-    }
-
-    // create a varName that is not a duplicate of formals' name
-    protected string GenVarName(string root, List<Formal> formals) {
-      bool finished = false;
-      while (!finished) {
-        finished = true;
-        int i = 0;
-        foreach (var arg in formals) {
-          if (!arg.IsGhost) {
-            // FormalName returns a protected name, so we compare a protected version of "root" to it
-            if (IdProtect(root).Equals(FormalName(arg, i))) {
-              root += root;
-              finished = false;
-            }
-            i++;
-          }
-        }
-      }
-      return root;
-    }
-
-    protected int WriteFormals(string sep, List<Formal> formals, ConcreteSyntaxTree wr, List<Formal>/*?*/ useTheseNamesForFormals = null) {
-      Contract.Requires(sep != null);
-      Contract.Requires(formals != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(useTheseNamesForFormals == null || useTheseNamesForFormals.Count == formals.Count);
-
-      int n = 0;
-      for (var i = 0; i < formals.Count; i++) {
-        var arg = formals[i];
-        if (!arg.IsGhost) {
-          string name = FormalName(useTheseNamesForFormals == null ? arg : useTheseNamesForFormals[i], n);
-          if (DeclareFormal(sep, name, arg.Type, arg.tok, arg.InParam, wr)) {
-            sep = ", ";
-          }
-          n++;
-        }
-      }
-      return n;  // the number of formals written
-    }
-
-    protected string FormalName(Formal formal, int i) {
-      Contract.Requires(formal != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      return IdProtect(formal.HasName ? formal.CompileName : "_a" + i);
-    }
-
-    public static bool HasMain(Program program, out Method mainMethod) {
-      Contract.Ensures(Contract.Result<bool>() == (Contract.ValueAtReturn(out mainMethod) != null));
-      mainMethod = null;
-      bool hasMain = false;
-      string name = program.Reporter.Options.MainMethod;
-      if (name != null && name == "-") {
-        return false;
-      }
-
-      if (!string.IsNullOrEmpty(name)) {
-        foreach (var module in program.CompileModules) {
-          if (module.IsAbstract) {
-            // the purpose of an abstract module is to skip compilation
-            continue;
-          }
-          foreach (var decl in module.TopLevelDecls) {
-            if (decl is TopLevelDeclWithMembers c) {
-              foreach (MemberDecl member in c.Members) {
-                if (member is Method m && member.FullDafnyName == name) {
-                  mainMethod = m;
-                  if (!IsPermittedAsMain(program, mainMethod, out string reason)) {
-                    ReportError(ErrorId.c_method_may_not_be_main_method, program.Reporter, mainMethod.tok, "The method '{0}' is not permitted as a main method ({1}).", null, name, reason);
-                    mainMethod = null;
-                    return false;
-                  } else {
-                    return true;
-                  }
-                }
-              }
-            }
-          }
-        }
-        if (name != RunAllTestsMainMethod.SyntheticTestMainName) {
-          ReportError(ErrorId.c_could_not_find_stipulated_main_method, program.Reporter, program.DefaultModule.tok, "Could not find the method named by the -Main option: {0}", null, name);
-        }
-      }
-      foreach (var module in program.CompileModules) {
-        if (module.IsAbstract) {
-          // the purpose of an abstract module is to skip compilation
-          continue;
-        }
-        foreach (var decl in module.TopLevelDecls) {
-          var c = decl as TopLevelDeclWithMembers;
-          if (c != null) {
-            foreach (var member in c.Members) {
-              var m = member as Method;
-              if (m != null && Attributes.Contains(m.Attributes, "main")) {
-                if (mainMethod == null) {
-                  mainMethod = m;
-                  hasMain = true;
-                } else {
-                  // more than one main in the program
-                  ReportError(ErrorId.c_more_than_one_explicit_main_method, program.Reporter, m.tok, "More than one method is marked {{:main}}. First declaration appeared at {0}.", null,
-                    mainMethod.tok.TokenToString(program.Options));
-                  hasMain = false;
-                }
-              }
-            }
-          }
-        }
-      }
-      if (hasMain) {
-        if (!IsPermittedAsMain(program, mainMethod, out string reason)) {
-          ReportError(ErrorId.c_method_not_permitted_as_main, program.Reporter, mainMethod.tok, "This method marked {{:main}} is not permitted as a main method ({0}).", null, reason);
-          mainMethod = null;
-          return false;
-        } else {
-          return true;
-        }
-      }
-      if (mainMethod != null) {
-        mainMethod = null;
-        return false;
-      }
-
-      mainMethod = null;
-      foreach (var module in program.CompileModules) {
-        if (module.IsAbstract) {
-          // the purpose of an abstract module is to skip compilation
-          continue;
-        }
-        foreach (var decl in module.TopLevelDecls) {
-          var c = decl as TopLevelDeclWithMembers;
-          if (c != null) {
-            foreach (var member in c.Members) {
-              var m = member as Method;
-              if (m != null && m.Name == DefaultNameMain) {
-                if (mainMethod == null) {
-                  mainMethod = m;
-                  hasMain = true;
-                } else {
-                  // more than one main in the program
-                  ReportError(ErrorId.c_more_than_one_default_Main_method, program.Reporter, m.tok, "More than one method is declared as '{0}'. First declaration appeared at {1}.", null,
-                    DefaultNameMain, mainMethod.tok.TokenToString(program.Options));
-                  hasMain = false;
-                }
-              }
-            }
-          }
-        }
-      }
-
-      if (hasMain) {
-        if (!IsPermittedAsMain(program, mainMethod, out string reason)) {
-          ReportError(ErrorId.c_Main_method_not_permitted, program.Reporter, mainMethod.tok, "This method 'Main' is not permitted as a main method ({0}).", null, reason);
-          return false;
-        } else {
-          return true;
-        }
-      } else {
-        // make sure "mainMethod" returns as null
-        mainMethod = null;
-        return false;
-      }
-    }
-
-    public static bool IsPermittedAsMain(Program program, Method m, out String reason) {
-      Contract.Requires(m.EnclosingClass is TopLevelDeclWithMembers);
-      // In order to be a legal Main() method, the following must be true:
-      //    The method is not a ghost method
-      //    The method takes no non-ghost parameters and no type parameters
-      //      except at most one array of type "array<string>"
-      //    The enclosing type does not take any type parameters
-      //    If the method is an instance (that is, non-static) method in a class, then the enclosing class must not declare any constructor
-      // In addition, either:
-      //    The method is called "Main"
-      //    The method has no requires clause
-      //    The method has no modifies clause
-      // or:
-      //    The method is annotated with {:main}
-      // Note, in the case where the method is annotated with {:main}, the method is allowed to have preconditions and modifies clauses.
-      // This lets the programmer add some explicit assumptions about the outside world, modeled, for example, via ghost parameters.
-      var cl = (TopLevelDeclWithMembers)m.EnclosingClass;
-      if (m.IsGhost) {
-        reason = "the method is ghost";
-        return false;
-      }
-      if (m.TypeArgs.Count != 0) {
-        reason = "the method has type parameters";
-        return false;
-      }
-      if (cl is AbstractTypeDecl) {
-        reason = "the enclosing type is an abstract type";
-        return false;
-      }
-      if (!m.IsStatic) {
-        if (cl is TraitDecl) {
-          reason = "the method is not static and the enclosing type does not support auto-initialization";
-          return false;
-        } else if (cl is ClassLikeDecl) {
-          if (cl.Members.Exists(f => f is Constructor)) {
-            reason = "the method is not static and the enclosing class has constructors";
-            return false;
-          }
-        } else {
-          var ty = UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(cl);
-          if (!ty.HasCompilableValue) {
-            reason = "the method is not static and the enclosing type does not support auto-initialization";
-            return false;
-          }
-        }
-      }
-      if (!m.Ins.TrueForAll(f => f.IsGhost)) {
-        var nonGhostFormals = m.Ins.Where(f => !f.IsGhost).ToList();
-        if (nonGhostFormals.Count > 1) {
-          reason = "the method has two or more non-ghost parameters";
-          return false;
-        }
-        var typeOfUniqueFormal = nonGhostFormals[0].Type.NormalizeExpandKeepConstraints();
-        if (typeOfUniqueFormal.AsSeqType is not { } seqType ||
-            seqType.Arg.AsSeqType is not { } subSeqType ||
-            !subSeqType.Arg.IsCharType) {
-          reason = "the method's non-ghost argument type should be an seq<string>, got " + typeOfUniqueFormal;
-          return false;
-        }
-      } else {
-        // Need to manually insert the args.
-        var argsType = new SeqType(new SeqType(new CharType()));
-        m.Ins.Add(new ImplicitFormal(m.tok, "_noArgsParameter", argsType, true, false));
-      }
-      if (!m.Outs.TrueForAll(f => f.IsGhost)) {
-        reason = "the method has non-ghost out parameters";
-        return false;
-      }
-      if (Attributes.Contains(m.Attributes, "main")) {
-        reason = "";
-        return true;
-      }
-      if (m.Req.Count != 0) {
-        reason = "the method has requires clauses";
-        return false;
-      }
-      if (m.Mod.Expressions.Count != 0) {
-        reason = "the method has modifies clauses";
-        return false;
-      }
-      reason = "";
-      return true;
-    }
-
-    void OrderedBySCC(List<MemberDecl> decls, TopLevelDeclWithMembers c) {
-      List<ConstantField> consts = new List<ConstantField>();
-      foreach (var decl in decls) {
-        if (decl is ConstantField) {
-          consts.Add((ConstantField)decl);
-        }
-      }
-      consts.Sort((a, b) => c.EnclosingModuleDefinition.CallGraph.GetSCCRepresentativeId(a) - c.EnclosingModuleDefinition.CallGraph.GetSCCRepresentativeId(b));
-      foreach (var con in consts) {
-        decls.Remove(con);
-      }
-      decls.AddRange(consts);
-    }
-
-    public virtual bool NeedsCustomReceiver(MemberDecl member) {
-      Contract.Requires(member != null);
-      // One of the limitations in many target language encodings are restrictions to instance members. If an
-      // instance member can't be directly expressed in the target language, we make it a static member with an
-      // additional first argument specifying the `this`, giving it a `CustomReceiver`.
-      if (member.IsStatic) {
-        return false;
-      } else if (member.EnclosingClass is NewtypeDecl) {
-        return true;
-      } else if (member.EnclosingClass is TraitDecl) {
-        return member is ConstantField { Rhs: { } } or Function { Body: { } } or Method { Body: { } };
-      } else if (member.EnclosingClass is DatatypeDecl datatypeDecl) {
-        // An undefined value "o" cannot use this o.F(...) form in most languages.
-        // Also, an erasable wrapper type has a receiver that's not part of the enclosing target class.
-        return datatypeDecl.Ctors.Any(ctor => ctor.IsGhost) || DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, datatypeDecl, out _);
-      } else {
-        return false;
-      }
-    }
-
-    void CompileClassMembers(Program program, TopLevelDeclWithMembers c, IClassWriter classWriter) {
-      Contract.Requires(c != null);
-      Contract.Requires(classWriter != null);
-      Contract.Requires(thisContext == null);
-      Contract.Ensures(thisContext == null);
-
-      var errorWr = classWriter.ErrorWriter();
-      var v = new CheckHasNoAssumes_Visitor(this, errorWr);
-
-      var inheritedMembers = c.InheritedMembers;
-      OrderedBySCC(inheritedMembers, c);
-      OrderedBySCC(c.Members, c);
-
-      if (c is not TraitDecl || TraitRepeatsInheritedDeclarations) {
-        thisContext = c;
-        foreach (var member in inheritedMembers.Select(memberx => (memberx as Function)?.ByMethodDecl ?? memberx)) {
-          Contract.Assert(!member.IsStatic);  // only instance members should ever be added to .InheritedMembers
-          if (member.IsGhost) {
-            // skip
-          } else if (c is TraitDecl) {
-            RedeclareInheritedMember(member, classWriter);
-          } else if (member is ConstantField) {
-            var cf = (ConstantField)member;
-            var cfType = cf.Type.Subst(c.ParentFormalTypeParametersToActuals);
-            if (cf.Rhs == null && c is ClassLikeDecl) {
-              // create a backing field, since this constant field may be assigned in constructors
-              Contract.Assert(!cf.IsStatic); // as checked above, only instance members can be inherited
-              classWriter.DeclareField("_" + cf.GetCompileName(Options), c, false, false, cfType, cf.tok, PlaceboValue(cfType, errorWr, cf.tok, true), cf);
-            }
-            var w = CreateFunctionOrGetter(cf, IdName(cf), c, false, true, true, classWriter);
-            Contract.Assert(w != null);  // since the previous line asked for a body
-            if (cf.Rhs != null) {
-              EmitCallToInheritedConstRHS(cf, w);
-            } else if (!cf.IsStatic && c is ClassLikeDecl) {
-              var sw = EmitReturnExpr(w);
-              sw = EmitCoercionIfNecessary(cfType, cf.Type, cf.tok, sw);
-              // get { return this._{0}; }
-              EmitThis(sw);
-              sw.Write("._{0}", cf.GetCompileName(Options));
-            } else {
-              EmitReturnExpr(PlaceboValue(cfType, errorWr, cf.tok, true), w);
-            }
-          } else if (member is Field f) {
-            var fType = f.Type.Subst(c.ParentFormalTypeParametersToActuals);
-            // every field is inherited
-            classWriter.DeclareField("_" + f.GetCompileName(Options), c, false, false, fType, f.tok, PlaceboValue(fType, errorWr, f.tok, true), f);
-            var wGet = classWriter.CreateGetterSetter(IdName(f), f.Type, f.tok, true, member, out var wSet, true);
-            {
-              var sw = EmitReturnExpr(wGet);
-              sw = EmitCoercionIfNecessary(fType, f.Type, f.tok, sw);
-              // get { return this._{0}; }
-              EmitThis(sw);
-              sw.Write("._{0}", f.GetCompileName(Options));
-            }
-            {
-              // set { this._{0} = value; }
-              EmitThis(wSet);
-              wSet.Write("._{0}", f.GetCompileName(Options));
-              var sw = EmitAssignmentRhs(wSet);
-              sw = EmitCoercionIfNecessary(f.Type, fType, f.tok, sw);
-              EmitSetterParameter(sw);
-            }
-          } else if (member is Function fn) {
-            if (!Attributes.Contains(fn.Attributes, "extern")) {
-              Contract.Assert(fn.Body != null);
-              var w = classWriter.CreateFunction(IdName(fn), CombineAllTypeArguments(fn), fn.Formals, fn.ResultType, fn.tok, fn.IsStatic, true, fn, true, false);
-              EmitCallToInheritedFunction(fn, null, w);
-            }
-          } else if (member is Method method) {
-            if (!Attributes.Contains(method.Attributes, "extern")) {
-              Contract.Assert(method.Body != null);
-              var w = classWriter.CreateMethod(method, CombineAllTypeArguments(member), true, true, false);
-              var wBefore = w.Fork();
-              var wCall = w.Fork();
-              var wAfter = w;
-              EmitCallToInheritedMethod(method, null, wCall, wBefore, wAfter);
-            }
-          } else {
-            Contract.Assert(false);  // unexpected member
-          }
-        }
-        thisContext = null;
-      }
-
-      foreach (MemberDecl memberx in c.Members) {
-        var member = (memberx as Function)?.ByMethodDecl ?? memberx;
-        if (!member.IsStatic) {
-          thisContext = c;
-        }
-        if (c is TraitDecl && member.OverriddenMember != null && !member.IsOverrideThatAddsBody) {
-          if (!member.IsGhost && TraitRepeatsInheritedDeclarations) {
-            RedeclareInheritedMember(member, classWriter);
-          } else {
-            // emit nothing in the trait; this member will be emitted in the classes that extend this trait
-          }
-        } else if (member is Field) {
-          var f = (Field)member;
-          if (f.IsGhost) {
-            // emit nothing
-          } else if (!Options.DisallowExterns && Attributes.Contains(f.Attributes, "extern")) {
-            // emit nothing
-          } else if (f is ConstantField) {
-            var cf = (ConstantField)f;
-            if (cf.IsStatic && !SupportsStaticsInGenericClasses && cf.EnclosingClass.TypeArgs.Count != 0) {
-              var wBody = classWriter.CreateFunction(IdName(cf), CombineAllTypeArguments(cf), new List<Formal>(), cf.Type, cf.tok, true, true, member, false, false);
-              Contract.Assert(wBody != null);  // since the previous line asked for a body
-              if (cf.Rhs != null) {
-                CompileReturnBody(cf.Rhs, f.Type, wBody, null);
-              } else {
-                EmitReturnExpr(PlaceboValue(cf.Type, wBody, cf.tok, true), wBody);
-              }
-            } else {
-              ConcreteSyntaxTree wBody;
-              if (cf.IsStatic) {
-                wBody = CreateFunctionOrGetter(cf, IdName(cf), c, true, true, false, classWriter);
-                Contract.Assert(wBody != null);  // since the previous line asked for a body
-              } else if (NeedsCustomReceiver(cf)) {
-                // An instance field in a newtype needs to be modeled as a static function that takes a parameter,
-                // because a newtype value is always represented as some existing type.
-                // Likewise, an instance const with a RHS in a trait needs to be modeled as a static function (in the companion class)
-                // that takes a parameter, because trait-equivalents in target languages don't allow implementations.
-                wBody = classWriter.CreateFunction(IdName(cf), CombineAllTypeArguments(cf), new List<Formal>(), cf.Type, cf.tok, true, true, cf, false, true);
-                Contract.Assert(wBody != null);  // since the previous line asked for a body
-                if (c is TraitDecl) {
-                  // also declare a function for the field in the interface
-                  var wBodyInterface = CreateFunctionOrGetter(cf, IdName(cf), c, false, false, false, classWriter);
-                  Contract.Assert(wBodyInterface == null);  // since the previous line said not to create a body
-                }
-              } else if (c is TraitDecl) {
-                wBody = CreateFunctionOrGetter(cf, IdName(cf), c, false, false, false, classWriter);
-                Contract.Assert(wBody == null);  // since the previous line said not to create a body
-              } else if (cf.Rhs == null && c is ClassLikeDecl) {
-                // create a backing field, since this constant field may be assigned in constructors
-                classWriter.DeclareField("_" + f.GetCompileName(Options), c, false, false, f.Type, f.tok, PlaceboValue(f.Type, errorWr, f.tok, true), f);
-                wBody = CreateFunctionOrGetter(cf, IdName(cf), c, false, true, false, classWriter);
-                Contract.Assert(wBody != null);  // since the previous line asked for a body
-              } else {
-                wBody = CreateFunctionOrGetter(cf, IdName(cf), c, false, true, false, classWriter);
-                Contract.Assert(wBody != null);  // since the previous line asked for a body
-              }
-              if (wBody != null) {
-                if (cf.Rhs != null) {
-                  CompileReturnBody(cf.Rhs, cf.Type, wBody, null);
-                } else if (!cf.IsStatic && c is ClassLikeDecl) {
-                  var sw = EmitReturnExpr(wBody);
-                  var typeSubst = new Dictionary<TypeParameter, Type>();
-                  cf.EnclosingClass.TypeArgs.ForEach(tp => typeSubst.Add(tp, (Type)new UserDefinedType(tp)));
-                  var typeArgs = CombineAllTypeArguments(cf);
-                  EmitMemberSelect(wr => EmitThis(wr), UserDefinedType.FromTopLevelDecl(c.tok, c), cf,
-                    typeArgs, typeSubst, f.Type, internalAccess: true).EmitRead(sw);
-                } else {
-                  EmitReturnExpr(PlaceboValue(cf.Type, wBody, cf.tok, true), wBody);
-                }
-              }
-            }
-          } else if (c is TraitDecl) {
-            var wGet = classWriter.CreateGetterSetter(IdName(f), f.Type, f.tok, false, member, out var wSet, false);
-            Contract.Assert(wSet == null && wGet == null);  // since the previous line specified no body
-          } else {
-            // A trait field is just declared, not initialized. Any other field gets a default value if field's type is an auto-init type and
-            // gets a placebo value if the field's type is not an auto-init type.
-            var rhs = c is TraitDecl ? null : PlaceboValue(f.Type, errorWr, f.tok, true);
-            classWriter.DeclareField(IdName(f), c, f.IsStatic, false, f.Type, f.tok, rhs, f);
-          }
-          if (f is ConstantField && ((ConstantField)f).Rhs != null) {
-            v.Visit(((ConstantField)f).Rhs);
-          }
-        } else if (member is Function) {
-          var f = (Function)member;
-          if (f.Body == null && !(c is TraitDecl && !f.IsStatic) &&
-              !(!Options.DisallowExterns && IncludeExternMembers && Attributes.Contains(f.Attributes, "extern"))) {
-            // A (ghost or non-ghost) function must always have a body, except if it's an instance function in a trait.
-            if (Attributes.Contains(f.Attributes, "axiom") || (!Options.DisallowExterns && Attributes.Contains(f.Attributes, "extern"))) {
-              // suppress error message
-            } else {
-              Error(ErrorId.c_function_has_no_body, f.tok, "Function {0} has no body", errorWr, f.FullName);
-            }
-          } else if (f.IsGhost) {
-            // nothing to compile, but we do check for assumes
-            if (f.Body == null) {
-              Contract.Assert((c is TraitDecl && !f.IsStatic) || Attributes.Contains(f.Attributes, "extern"));
-            }
-
-            if (Attributes.Contains(f.Attributes, "test")) {
-              Error(ErrorId.c_test_function_must_be_compilable, f.tok,
-                "Function {0} must be compiled to use the {{:test}} attribute", errorWr, f.FullName);
-            }
-          } else if (c is TraitDecl && !f.IsStatic) {
-            if (f.OverriddenMember == null) {
-              var w = classWriter.CreateFunction(IdName(f), CombineAllTypeArguments(f), f.Formals, f.ResultType, f.tok, false, false, f, false, false);
-              Contract.Assert(w == null); // since we requested no body
-            } else if (TraitRepeatsInheritedDeclarations) {
-              RedeclareInheritedMember(f, classWriter);
-            }
-            if (f.Body != null) {
-              CompileFunction(f, classWriter, true);
-            }
-          } else if (c is NewtypeDecl && f != f.Original) {
-            CompileFunction(f, classWriter, false);
-            var w = classWriter.CreateFunction(IdName(f), CombineAllTypeArguments(f), f.Formals, f.ResultType, f.tok,
-              false, true, f, true, false);
-            EmitCallToInheritedFunction(f, c, w);
-          } else {
-            CompileFunction(f, classWriter, false);
-          }
-          v.Visit(f);
-        } else if (member is Method m) {
-          if (Attributes.Contains(m.Attributes, "synthesize")) {
-            if (m.IsStatic && m.Outs.Count > 0 && m.Body == null) {
-              classWriter.SynthesizeMethod(m, CombineAllTypeArguments(m), true, true, false);
-            } else {
-              Error(ErrorId.c_invalid_synthesize_method, m.tok,
-                "Method {0} is annotated with :synthesize but is not static, has a body, or does not return anything",
-                errorWr, m.FullName);
-            }
-          } else if (m.Body == null && !(c is TraitDecl && !m.IsStatic) &&
-                     !(!Options.DisallowExterns && IncludeExternMembers && Attributes.Contains(m.Attributes, "extern"))) {
-            // A (ghost or non-ghost) method must always have a body, except if it's an instance method in a trait.
-            if (Attributes.Contains(m.Attributes, "axiom") || (!Options.DisallowExterns && Attributes.Contains(m.Attributes, "extern"))) {
-              // suppress error message
-            } else {
-              Error(ErrorId.c_method_has_no_body, m.tok, "Method {0} has no body", errorWr, m.FullName);
-            }
-          } else if (m.IsGhost) {
-            if (m.Body == null) {
-              Contract.Assert(c is TraitDecl && !m.IsStatic);
-            }
-          } else if (c is TraitDecl && !m.IsStatic) {
-            if (m.OverriddenMember == null) {
-              var w = classWriter.CreateMethod(m, CombineAllTypeArguments(m), false, false, false);
-              Contract.Assert(w == null); // since we requested no body
-            } else if (TraitRepeatsInheritedDeclarations) {
-              RedeclareInheritedMember(m, classWriter);
-            }
-            if (m.Body != null) {
-              CompileMethod(program, m, classWriter, true);
-            }
-          } else if (c is NewtypeDecl && m != m.Original) {
-            CompileMethod(program, m, classWriter, false);
-            var w = classWriter.CreateMethod(m, CombineAllTypeArguments(member), true, true, false);
-            var wBefore = w.Fork();
-            var wCall = w.Fork();
-            var wAfter = w;
-            EmitCallToInheritedMethod(m, c, wCall, wBefore, wAfter);
-          } else {
-            CompileMethod(program, m, classWriter, false);
-          }
-          v.Visit(m);
-        } else {
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected member
-        }
-
-        thisContext = null;
-      }
-    }
-
-    protected ConcreteSyntaxTree /*?*/ CreateFunctionOrGetter(ConstantField cf, string name, TopLevelDecl enclosingDecl, bool isStatic,
-      bool createBody, bool forBodyInheritance, IClassWriter classWriter) {
-      var typeArgs = CombineAllTypeArguments(cf);
-      var typeDescriptors = ForTypeDescriptors(typeArgs, cf.EnclosingClass, cf, false);
-      if (NeedsTypeDescriptors(typeDescriptors)) {
-        return classWriter.CreateFunction(name, typeArgs, new List<Formal>(), cf.Type, cf.tok, isStatic, createBody, cf, forBodyInheritance, false);
-      } else {
-        return classWriter.CreateGetter(name, enclosingDecl, cf.Type, cf.tok, isStatic, true, createBody, cf, forBodyInheritance);
-      }
-    }
-
-    private void RedeclareInheritedMember(MemberDecl member, IClassWriter classWriter) {
-      Contract.Requires(member != null);
-      Contract.Requires(classWriter != null);
-
-      if (member is ConstantField cf) {
-        var wBody = CreateFunctionOrGetter(cf, IdName(cf), member.EnclosingClass, false, false, false, classWriter);
-        Contract.Assert(wBody == null); // since the previous line said not to create a body
-      } else if (member is Field field) {
-        var wGet = classWriter.CreateGetterSetter(IdName(field), field.Type, field.tok, false, member, out var wSet, false);
-        Contract.Assert(wGet == null && wSet == null); // since the previous line said not to create a body
-      } else if (member is Function) {
-        var fn = ((Function)member).Original;
-        var wBody = classWriter.CreateFunction(IdName(fn), CombineAllTypeArguments(fn), fn.Formals, fn.ResultType, fn.tok, fn.IsStatic, false, fn, false, false);
-        Contract.Assert(wBody == null); // since the previous line said not to create a body
-      } else if (member is Method) {
-        var method = ((Method)member).Original;
-        var wBody = classWriter.CreateMethod(method, CombineAllTypeArguments(method), false, false, false);
-        Contract.Assert(wBody == null); // since the previous line said not to create a body
-      } else {
-        Contract.Assert(false); // unexpected member
-      }
-    }
-
-    protected void EmitCallToInheritedConstRHS(ConstantField f, ConcreteSyntaxTree wr) {
-      Contract.Requires(f != null);
-      Contract.Requires(!f.IsStatic);
-      Contract.Requires(f.EnclosingClass is TraitDecl);
-      Contract.Requires(f.Rhs != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(thisContext != null);
-
-      var fOriginal = f;
-
-      // In a target language that requires type coercions, the function declared in "thisContext" has
-      // the same signature as in "fOriginal.EnclosingClass".
-      wr = EmitReturnExpr(wr);
-      wr = EmitCoercionIfNecessary(f.Type, fOriginal.Type, f.tok, wr);
-
-      var calleeReceiverType = UserDefinedType.FromTopLevelDecl(f.tok, f.EnclosingClass).Subst(thisContext.ParentFormalTypeParametersToActuals);
-      wr.Write("{0}{1}", TypeName_Companion(calleeReceiverType, wr, f.tok, f), ModuleSeparator);
-      var typeArgs = CombineAllTypeArguments(f, thisContext);
-      EmitNameAndActualTypeArgs(IdName(f), TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, f, true)), f.tok, wr);
-      wr.Write("(");
-      var sep = "";
-      EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, f.EnclosingClass, f, true), f.tok, wr, ref sep);
-
-      wr.Write(sep);
-      var w = EmitCoercionIfNecessary(UserDefinedType.FromTopLevelDecl(f.tok, thisContext), calleeReceiverType, f.tok, wr);
-      EmitThis(w, true);
-      wr.Write(")");
-    }
-
-    /// <summary>
-    /// "heir" is the type declaration that inherits the function. Or, it can be "null" to indicate that the function is declared in
-    /// the type itself, in which case the "call to inherited" is actually a call from the dynamically dispatched function to its implementation.
-    /// </summary>
-    protected void EmitCallToInheritedFunction(Function f, [CanBeNull] TopLevelDeclWithMembers heir, ConcreteSyntaxTree wr) {
-      Contract.Requires(f != null);
-      Contract.Requires(!f.IsStatic);
-      Contract.Requires(f.EnclosingClass is TraitDecl);
-      Contract.Requires(f.Body != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(thisContext != null);
-
-      // There are three types involved.
-      // First, "f.Original.EnclosingClass" is the trait where the function was first declared.
-      // In descendant traits from there on, the function may occur several times, each time with
-      // a strengthening of the specification. Those traits do not play a role here.
-      // Second, there is "f.EnclosingClass", which is the trait where the function is given a body.
-      // Often, "f.EnclosingClass" and "f.Original.EnclosingClass" will be the same.
-      // Third and finally, there is "thisContext", which is the class that inherits "f" and its
-      // implementation, and for which we're about to generate a call to the body compiled for "f".
-
-      // In a target language that requires type coercions, the function declared in "thisContext" has
-      // the same signature as in "f.Original.EnclosingClass".
-      wr = EmitReturnExpr(wr);
-      wr = EmitCoercionIfNecessary(f.ResultType, f.Original.ResultType, f.tok, wr);
-
-      var companionName = CompanionMemberIdName(f);
-      var calleeReceiverType = UserDefinedType.FromTopLevelDecl(f.tok, f.EnclosingClass).Subst(thisContext.ParentFormalTypeParametersToActuals);
-      wr.Write("{0}{1}", TypeName_Companion(calleeReceiverType, wr, f.tok, f), ModuleSeparator);
-      var typeArgs = CombineAllTypeArguments(f, thisContext);
-      EmitNameAndActualTypeArgs(companionName, TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, f, true)), f.tok, wr);
-      wr.Write("(");
-      var sep = "";
-      EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, f.EnclosingClass, f, true), f.tok, wr, ref sep);
-
-      wr.Write(sep);
-      var w = EmitCoercionIfNecessary(UserDefinedType.FromTopLevelDecl(f.tok, thisContext), calleeReceiverType, f.tok, wr);
-      EmitThis(heir != null ? FromFatPointer(UserDefinedType.FromTopLevelDecl(f.tok, heir), w) : w, true);
-      sep = ", ";
-
-      for (int j = 0, l = 0; j < f.Formals.Count; j++) {
-        var p = f.Formals[j];
-        if (!p.IsGhost) {
-          wr.Write(sep);
-          w = EmitCoercionIfNecessary(f.Original.Formals[j].Type, f.Formals[j].Type, f.tok, wr);
-          w.Write(IdName(p));
-          sep = ", ";
-          l++;
-        }
-      }
-      wr.Write(")");
-    }
-
-    protected virtual void EmitCallReturnOuts(List<string> outTmps, ConcreteSyntaxTree wr) {
-      wr.Write("{0} = ", Util.Comma(outTmps));
-    }
-
-    protected virtual void EmitMultiReturnTuple(List<Formal> outs, List<Type> outTypes, List<string> outTmps, IToken methodToken, ConcreteSyntaxTree wr) {
-      var wrReturn = EmitReturnExpr(wr);
-      var sep = "";
-      for (int j = 0, l = 0; j < outs.Count; j++) {
-        var p = outs[j];
-        if (!p.IsGhost) {
-          wrReturn.Write(sep);
-          var w = EmitCoercionIfNecessary(outs[j].Type, outTypes[l], methodToken, wrReturn);
-          w.Write(outTmps[l]);
-          sep = ", ";
-          l++;
-        }
-      }
-    }
-
-    /// <summary>
-    /// "heir" is the type declaration that inherits the method. Or, it can be "null" to indicate that the method is declared in
-    /// the type itself, in which case the "call to inherited" is actually a call from the dynamically dispatched method to its implementation.
-    /// </summary>
-    protected virtual void EmitCallToInheritedMethod(Method method, [CanBeNull] TopLevelDeclWithMembers heir, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, ConcreteSyntaxTree wStmtsAfterCall) {
-      Contract.Requires(method != null);
-      Contract.Requires(!method.IsStatic);
-      Contract.Requires(method.EnclosingClass is TraitDecl);
-      Contract.Requires(method.Body != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(thisContext != null);
-
-      // There are three types involved. See comment in EmitCallToInheritedFunction.
-
-      var nonGhostOutParameterCount = method.Outs.Count(p => !p.IsGhost);
-      var returnStyleOuts = UseReturnStyleOuts(method, nonGhostOutParameterCount);
-      var returnStyleOutCollector = nonGhostOutParameterCount > 1 && returnStyleOuts && !SupportsMultipleReturns ? ProtectedFreshId("_outcollector") : null;
-
-      var outTmps = new List<string>();  // contains a name for each non-ghost formal out-parameter
-      var outTypes = new List<Type>();  // contains a type for each non-ghost formal out-parameter
-      for (int i = 0; i < method.Outs.Count; i++) {
-        Formal p = method.Outs[i];
-        if (!p.IsGhost) {
-          var target = returnStyleOutCollector != null ? IdName(p) : ProtectedFreshId("_out");
-          outTmps.Add(target);
-          outTypes.Add(p.Type);
-          DeclareLocalVar(target, p.Type, p.tok, false, null, wStmts);
-        }
-      }
-      Contract.Assert(outTmps.Count == nonGhostOutParameterCount && outTypes.Count == nonGhostOutParameterCount);
-
-      if (returnStyleOutCollector != null) {
-        DeclareSpecificOutCollector(returnStyleOutCollector, wr, outTypes, outTypes);
-      } else if (nonGhostOutParameterCount > 0 && returnStyleOuts) {
-        EmitCallReturnOuts(outTmps, wr);
-      }
-
-      var companionName = CompanionMemberIdName(method);
-      var calleeReceiverType = UserDefinedType.FromTopLevelDecl(method.tok, method.EnclosingClass).Subst(thisContext.ParentFormalTypeParametersToActuals);
-      EmitTypeName_Companion(calleeReceiverType, wr, wr, method.tok, method);
-      wr.Write(ClassAccessor);
-
-      var typeArgs = CombineAllTypeArguments(method, thisContext);
-      EmitNameAndActualTypeArgs(companionName, TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, method, true)), method.tok, wr);
-      wr.Write("(");
-      var sep = "";
-      EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, method.EnclosingClass, method, true), method.tok, wr, ref sep);
-
-      wr.Write(sep);
-      var w = EmitCoercionIfNecessary(UserDefinedType.FromTopLevelDecl(method.tok, thisContext), calleeReceiverType, method.tok, wr);
-      EmitThis(heir != null ? FromFatPointer(UserDefinedType.FromTopLevelDecl(method.tok, heir), w) : w, true);
-      sep = ", ";
-
-      for (int j = 0, l = 0; j < method.Ins.Count; j++) {
-        var p = method.Ins[j];
-        if (!p.IsGhost) {
-          wr.Write(sep);
-          w = EmitCoercionIfNecessary(method.Original.Ins[j].Type, method.Ins[j].Type, method.tok, wr);
-          EmitIdentifier(IdName(p), w);
-          sep = ", ";
-          l++;
-        }
-      }
-
-      if (!returnStyleOuts) {
-        foreach (var outTmp in outTmps) {
-          wr.Write(sep);
-          EmitActualOutArg(outTmp, wr);
-          sep = ", ";
-        }
-      }
-      wr.Write(')');
-      EndStmt(wr);
-
-      if (returnStyleOutCollector != null) {
-        EmitCastOutParameterSplits(returnStyleOutCollector, outTmps, wStmtsAfterCall, outTypes, outTypes, method.tok);
-        EmitReturn(method.Outs, wStmtsAfterCall);
-      } else if (!returnStyleOuts) {
-        for (int j = 0, l = 0; j < method.Outs.Count; j++) {
-          var p = method.Outs[j];
-          if (!p.IsGhost) {
-            EmitAssignment(IdName(p), method.Outs[j].Type, outTmps[l], outTypes[l], wStmtsAfterCall);
-            l++;
-          }
-        }
-      } else {
-        EmitMultiReturnTuple(method.Outs, outTypes, outTmps, method.tok, wStmtsAfterCall);
-      }
-    }
-
-    protected List<TypeArgumentInstantiation> CombineAllTypeArguments(MemberDecl member) {
-      Contract.Requires(member != null);
-      var classActuals = member.EnclosingClass.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
-      var memberActuals = member is ICallable ic ? ic.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp)) : null;
-      return CombineAllTypeArguments(member, classActuals, memberActuals);
-    }
-
-    protected List<TypeArgumentInstantiation> CombineAllTypeArguments(MemberDecl member, TopLevelDeclWithMembers receiverContext) {
-      Contract.Requires(member is ICallable);
-      Contract.Requires(receiverContext != null);
-      var classActuals = member.EnclosingClass.TypeArgs.ConvertAll(tp => receiverContext.ParentFormalTypeParametersToActuals[tp]);
-      var memberActuals = ((ICallable)member).TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
-      return CombineAllTypeArguments(member, classActuals, memberActuals);
-    }
-
-    protected List<TypeArgumentInstantiation> CombineAllTypeArguments(MemberDecl member, List<Type> typeArgsEnclosingClass, List<Type> typeArgsMember) {
-      Contract.Requires(member != null);
-      Contract.Requires(typeArgsEnclosingClass != null);
-      Contract.Requires(typeArgsMember != null);
-
-      return TypeArgumentInstantiation.ListFromMember(member, typeArgsEnclosingClass, typeArgsMember);
-    }
-
-    protected int WriteRuntimeTypeDescriptorsFormals(List<TypeArgumentInstantiation> typeParams,
-      ConcreteSyntaxTree wr, ref string prefix, Func<TypeParameter, string> formatter) {
-      Contract.Requires(typeParams != null);
-      Contract.Requires(prefix != null);
-      Contract.Requires(wr != null);
-      Contract.Ensures(Contract.ValueAtReturn(out prefix) != null);
-
-      var c = 0;
-      foreach (var ta in typeParams) {
-        var tp = ta.Formal;
-        if (NeedsTypeDescriptor(tp)) {
-          var formatted = formatter(tp);
-          wr.Write($"{prefix}{formatted}");
-          prefix = ", ";
-
-          c++;
-        }
-      }
-      return c;
-    }
-
-    /// <summary>
-    /// Check whether two declarations have the same name if capitalized.
-    /// </summary>
-    /// <param name="canChange">The declarations to check.</param>
-    /// <param name="cantChange">Additional declarations which may conflict, but which can't be given different names.  For example, these may be the inherited members of a class.</param>
-    /// <remarks>
-    /// If two elements of <paramref name="canChange"/> have the same
-    /// capitalization, the lowercase one will get a
-    /// <c>{:_capitalizationConflict}</c> attribute.  If
-    /// <paramref name="cantChange"/> is given and one of its elements conflicts
-    /// with one from <paramref name="canChange"/>, the element from
-    /// <paramref name="canChange"/> gets the attribute whether it is lowercase
-    /// or not.
-    /// </remarks>
-    /// <seealso cref="HasCapitalizationConflict"/>
-    private void CheckForCapitalizationConflicts<T>(IEnumerable<T> canChange, IEnumerable<T> cantChange = null) where T : Declaration {
-      if (cantChange == null) {
-        cantChange = Enumerable.Empty<T>();
-      }
-      IDictionary<string, T> declsByCapName = new Dictionary<string, T>();
-      ISet<string> fixedNames = new HashSet<string>(from decl in cantChange select Capitalize(decl.GetCompileName(Options)));
-
-      foreach (var decl in canChange) {
-        var name = decl.GetCompileName(Options);
-        var capName = Capitalize(name);
-        if (name == capName) {
-          if (fixedNames.Contains(name)) {
-            // Normally we mark the lowercase one, but in this case we can't change that one
-            MarkCapitalizationConflict(decl);
-          } else {
-            if (declsByCapName.TryGetValue(name, out var other)) {
-              // Presume that the other is the lowercase one
-              MarkCapitalizationConflict(other);
-            } else {
-              declsByCapName.Add(name, decl);
-            }
-          }
-        } else {
-          if (declsByCapName.ContainsKey(capName)) {
-            MarkCapitalizationConflict(decl);
-          } else {
-            declsByCapName.Add(capName, decl);
-          }
-        }
-      }
-    }
-
-    protected string Capitalize(string str) {
-      if (!str.Any(c => c != '_')) {
-        return PrefixForForcedCapitalization + str;
-      }
-      var origStr = str;
-      while (str.StartsWith("_")) {
-        str = str.Substring(1) + "_";
-      }
-      if (!char.IsLetter(str[0])) {
-        return PrefixForForcedCapitalization + origStr;
-      } else {
-        return char.ToUpper(str[0]) + str.Substring(1);
-      }
-    }
-
-    protected virtual string PrefixForForcedCapitalization { get => "Cap_"; }
-
-    private static void MarkCapitalizationConflict(Declaration decl) {
-      decl.Attributes = new Attributes(CapitalizationConflictAttribute, new List<Expression>(), decl.Attributes);
-    }
-
-    protected static bool HasCapitalizationConflict(Declaration decl) {
-      return Attributes.Contains(decl.Attributes, CapitalizationConflictAttribute);
-    }
-
-    private static readonly string CapitalizationConflictAttribute = "_capitalizationConflict";
-
-    private void CompileFunction(Function f, IClassWriter cw, bool lookasideBody) {
-      Contract.Requires(f != null);
-      Contract.Requires(cw != null);
-      Contract.Requires(f.Body != null || (IncludeExternMembers && Attributes.Contains(f.Attributes, "extern")));
-
-      var w = cw.CreateFunction(IdName(f), CombineAllTypeArguments(f),
-        f.Formals, f.ResultType, f.tok, f.IsStatic,
-        !f.IsExtern(Options, out _, out _), f, false, lookasideBody);
-      if (w != null) {
-        IVariable accVar = null;
-        if (f.IsTailRecursive) {
-          if (f.IsAccumulatorTailRecursive) {
-            accVar = new LocalVariable(f.RangeToken, "_accumulator", f.ResultType, false) {
-              type = f.ResultType
-            };
-            Expression unit;
-            if (f.ResultType.IsNumericBased(Type.NumericPersuasion.Int) || f.ResultType.IsBigOrdinalType) {
-              unit = new LiteralExpr(f.tok, f.TailRecursion == Function.TailStatus.Accumulate_Mul ? 1 : 0);
-              unit.Type = f.ResultType;
-            } else if (f.ResultType.IsNumericBased(Type.NumericPersuasion.Real)) {
-              unit = new LiteralExpr(f.tok, f.TailRecursion == Function.TailStatus.Accumulate_Mul ? BigDec.FromInt(1) : BigDec.ZERO);
-              unit.Type = f.ResultType;
-            } else if (f.ResultType.IsBitVectorType) {
-              var n = f.TailRecursion == Function.TailStatus.Accumulate_Mul ? 1 : 0;
-              unit = new LiteralExpr(f.tok, n);
-              unit.Type = f.ResultType;
-            } else if (f.ResultType.AsSetType != null) {
-              unit = new SetDisplayExpr(f.tok, !f.ResultType.IsISetType, new List<Expression>());
-              unit.Type = f.ResultType;
-            } else if (f.ResultType.AsMultiSetType != null) {
-              unit = new MultiSetDisplayExpr(f.tok, new List<Expression>());
-              unit.Type = f.ResultType;
-            } else if (f.ResultType.AsSeqType != null) {
-              unit = new SeqDisplayExpr(f.tok, new List<Expression>());
-              unit.Type = f.ResultType;
-            } else {
-              Contract.Assert(false);  // unexpected type
-              throw new cce.UnreachableException();
-            }
-            DeclareLocalVar(IdName(accVar), accVar.Type, f.tok, unit, false, w);
-          }
-          w = EmitTailCallStructure(f, w);
-        }
-        Coverage.Instrument(f.Body.tok, $"entry to function {f.FullName}", w);
-        Contract.Assert(enclosingFunction == null);
-        enclosingFunction = f;
-        CompileReturnBody(f.Body, f.Original.ResultType, w, accVar);
-        Contract.Assert(enclosingFunction == f);
-        enclosingFunction = null;
-      }
-    }
-
-    public const string STATIC_ARGS_NAME = "args";
-
-    private void CompileMethod(Program program, Method m, IClassWriter cw, bool lookasideBody) {
-      Contract.Requires(cw != null);
-      Contract.Requires(m != null);
-      Contract.Requires(m.Body != null || (IncludeExternMembers && Attributes.Contains(m.Attributes, "extern")));
-
-      var w = cw.CreateMethod(m, CombineAllTypeArguments(m), !m.IsExtern(Options, out _, out _), false, lookasideBody);
-      if (w != null) {
-        if (m.IsTailRecursive) {
-          w = EmitTailCallStructure(m, w);
-        }
-
-        Coverage.Instrument(m.Body.Tok, $"entry to method {m.FullName}", w);
-
-        var nonGhostOutsCount = m.Outs.Count(p => !p.IsGhost);
-
-        var useReturnStyleOuts = UseReturnStyleOuts(m, nonGhostOutsCount);
-        foreach (var p in m.Outs) {
-          if (!p.IsGhost) {
-            DeclareLocalOutVar(IdName(p), p.Type, p.tok, PlaceboValue(p.Type, w, p.tok, true), useReturnStyleOuts, w);
-          }
-        }
-
-        w = EmitMethodReturns(m, w);
-
-        if (m.Body == null) {
-          // Is this feasible? -- note the expression m.Body.Tok above
-          Error(ErrorId.c_method_has_no_body, m.tok, "Method {0} has no body", w, m.FullName);
-        } else {
-          Contract.Assert(enclosingMethod == null);
-          enclosingMethod = m;
-          TrStmtList(m.Body.Body, w);
-          Contract.Assert(enclosingMethod == m);
-          enclosingMethod = null;
-        }
-      }
-
-      if (m == program.MainMethod && IssueCreateStaticMain(m)) {
-        w = CreateStaticMain(cw, STATIC_ARGS_NAME);
-        var ty = UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(m.EnclosingClass);
-        LocalVariable receiver = null;
-        if (!m.IsStatic) {
-          receiver = new LocalVariable(m.RangeToken, "b", ty, false) {
-            type = ty
-          };
-          if (m.EnclosingClass is ClassLikeDecl) {
-            var wStmts = w.Fork();
-            var wRhs = DeclareLocalVar(IdName(receiver), ty, m.tok, w);
-            EmitNew(ty, m.tok, null, wRhs, wStmts);
-          } else {
-            TrLocalVar(receiver, true, w);
-          }
-        }
-        var typeArgs = CombineAllTypeArguments(m, ty.TypeArgs, m.TypeArgs.ConvertAll(tp => (Type)Type.Bool));
-        bool customReceiver = !(m.EnclosingClass is TraitDecl) && NeedsCustomReceiver(m);
-
-        if (receiver != null && !customReceiver) {
-          w.Write("{0}.", IdName(receiver));
-        } else {
-          var companion = TypeName_Companion(UserDefinedType.FromTopLevelDeclWithAllBooleanTypeParameters(m.EnclosingClass), w, m.tok, m);
-          w.Write("{0}.", companion);
-        }
-        EmitNameAndActualTypeArgs(IdName(m), TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, m, false)), m.tok, w);
-        w.Write("(");
-        var sep = "";
-        if (receiver != null && customReceiver) {
-          w.Write("{0}", IdName(receiver));
-          sep = ", ";
-        }
-        EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, m.EnclosingClass, m, false), m.tok, w, ref sep);
-        w.Write(sep + STATIC_ARGS_NAME);
-        w.Write(")");
-        EndStmt(w);
-      }
-    }
-
-    protected virtual bool IssueCreateStaticMain(Method m) {
-      return !m.IsStatic || m.EnclosingClass.TypeArgs.Count != 0;
-    }
-
-    void TrCasePatternOpt<VT>(CasePattern<VT> pat, Expression rhs, ConcreteSyntaxTree wr, bool inLetExprBody)
-      where VT : class, IVariable {
-      TrCasePatternOpt(pat, rhs, null, rhs.Type, rhs.tok, wr, inLetExprBody);
-    }
-
-    void TrCasePatternOpt<VT>(CasePattern<VT> pat, Expression rhs, Action<ConcreteSyntaxTree> emitRhs, Type rhsType, IToken rhsTok, ConcreteSyntaxTree wr, bool inLetExprBody)
-      where VT : class, IVariable {
-      Contract.Requires(pat != null);
-      Contract.Requires(pat.Var != null || rhs != null || emitRhs != null);
-      Contract.Requires(rhs != null || emitRhs != null);
-      Contract.Requires(rhsType != null && rhsTok != null);
-
-      if (pat.Var != null) {
-        // The trivial Dafny "pattern" expression
-        //    var x := G
-        // is translated into C# as:
-        // var x := G;
-        var bv = pat.Var;
-        if (!bv.IsGhost) {
-          var wStmts = wr.Fork();
-          var w = DeclareLocalVar(IdProtect(bv.CompileName), bv.Type, rhsTok, wr);
-          if (rhs != null) {
-            w = EmitCoercionIfNecessary(from: rhs.Type, to: bv.Type, tok: rhsTok, wr: w);
-            EmitExpr(rhs, inLetExprBody, w, wStmts);
-          } else {
-            emitRhs(w);
-          }
-        }
-      } else if (pat.Arguments != null) {
-        // The Dafny "pattern" expression
-        //    var Pattern(x,y) := G
-        // is translated into C# as:
-        // var tmp := G;
-        // var x := dtorX(tmp);
-        // var y := dtorY(tmp);
-        var ctor = pat.Ctor;
-        Contract.Assert(ctor != null);  // follows from successful resolution
-        Contract.Assert(pat.Arguments.Count == ctor.Formals.Count);  // follows from successful resolution
-
-        // Create the temporary variable to hold G
-        var tmp_name = ProtectedFreshId("_let_tmp_rhs");
-        if (rhs != null) {
-          DeclareLocalVar(tmp_name, rhs.Type, rhs.tok, rhs, inLetExprBody, wr);
-        } else {
-          var w = DeclareLocalVar(tmp_name, rhsType, rhsTok, wr);
-          emitRhs(w);
-        }
-
-        var dtv = (DatatypeValue)pat.Expr;
-        var substMap = TypeParameter.SubstitutionMap(ctor.EnclosingDatatype.TypeArgs, dtv.InferredTypeArgs);
-        var k = 0;  // number of non-ghost formals processed
-        for (int i = 0; i < pat.Arguments.Count; i++) {
-          var arg = pat.Arguments[i];
-          var formal = ctor.Formals[i];
-          if (formal.IsGhost) {
-            // nothing to compile, but do a sanity check
-            Contract.Assert(Contract.ForAll(arg.Vars, bv => bv.IsGhost));
-          } else {
-            Type targetType = formal.Type.Subst(substMap);
-            TrCasePatternOpt(arg, null, sw => EmitDestructor(wr => EmitIdentifier(tmp_name, wr), formal, k, ctor, dtv.InferredTypeArgs, arg.Expr.Type, sw), targetType, pat.Expr.tok, wr, inLetExprBody);
-            k++;
-          }
-        }
-      }
-    }
-
-    void TrExprOpt(Expression expr, Type resultType, ConcreteSyntaxTree wr, IVariable/*?*/ accumulatorVar) {
-      Contract.Requires(expr != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(resultType != null);
-      Contract.Requires(accumulatorVar == null || (enclosingFunction != null && enclosingFunction.IsAccumulatorTailRecursive));
-
-      expr = expr.Resolved;
-      if (expr is LetExpr) {
-        var e = (LetExpr)expr;
-        if (e.Exact) {
-          for (int i = 0; i < e.LHSs.Count; i++) {
-            var lhs = e.LHSs[i];
-            if (Contract.Exists(lhs.Vars, bv => !bv.IsGhost)) {
-              TrCasePatternOpt(lhs, e.RHSs[i], wr, false);
-            }
-          }
-          TrExprOpt(e.Body, resultType, wr, accumulatorVar);
-        } else {
-          // We haven't optimized the other cases, so fallback to normal compilation
-          EmitReturnExpr(e, resultType, false, wr);
-        }
-
-      } else if (expr is ITEExpr) {
-        var e = (ITEExpr)expr;
-        switch (e.HowToCompile) {
-          case ITEExpr.ITECompilation.CompileJustThenBranch:
-            TrExprOpt(e.Thn, resultType, wr, accumulatorVar);
-            break;
-          case ITEExpr.ITECompilation.CompileJustElseBranch:
-            TrExprOpt(e.Els, resultType, wr, accumulatorVar);
-            break;
-          case ITEExpr.ITECompilation.CompileBothBranches:
-            var wStmts = wr.Fork();
-            var thn = EmitIf(out var guardWriter, true, wr);
-            EmitExpr(e.Test, false, guardWriter, wStmts);
-            Coverage.Instrument(e.Thn.tok, "then branch", thn);
-            TrExprOpt(e.Thn, resultType, thn, accumulatorVar);
-            ConcreteSyntaxTree els = wr;
-            if (!(e.Els is ITEExpr { HowToCompile: ITEExpr.ITECompilation.CompileBothBranches })) {
-              els = EmitBlock(wr);
-              Coverage.Instrument(e.Thn.tok, "else branch", els);
-            }
-            TrExprOpt(e.Els, resultType, els, accumulatorVar);
-            break;
-        }
-
-      } else if (expr is NestedMatchExpr nestedMatchExpr) {
-        TrExprOpt(nestedMatchExpr.Flattened, resultType, wr, accumulatorVar);
-      } else if (expr is MatchExpr) {
-        var e = (MatchExpr)expr;
-        //   var _source = E;
-        //   if (source.is_Ctor0) {
-        //     FormalType f0 = ((Dt_Ctor0)source._D).a0;
-        //     ...
-        //     return Body0;
-        //   } else if (...) {
-        //     ...
-        //   } else if (true) {
-        //     ...
-        //   }
-        string source = ProtectedFreshId("_source");
-        DeclareLocalVar(source, e.Source.Type, e.Source.tok, e.Source, false, wr);
-
-        if (e.Cases.Count == 0) {
-          // the verifier would have proved we never get here; still, we need some code that will compile
-          EmitAbsurd(null, wr);
-        } else {
-          int i = 0;
-          var sourceType = (UserDefinedType)e.Source.Type.NormalizeExpand();
-          foreach (MatchCaseExpr mc in e.Cases) {
-            var w = MatchCasePrelude(source, sourceType, mc.Ctor, mc.Arguments, i, e.Cases.Count, wr);
-            TrExprOpt(mc.Body, resultType, w, accumulatorVar);
-            i++;
-          }
-        }
-
-      } else if (expr is StmtExpr) {
-        var e = (StmtExpr)expr;
-        TrExprOpt(e.E, resultType, wr, accumulatorVar);
-
-      } else if (expr is FunctionCallExpr fce && fce.Function == enclosingFunction && enclosingFunction.IsTailRecursive) {
-        var e = fce;
-        // compile call as tail-recursive
-
-        // assign the actual in-parameters to temporary variables
-        var inTmps = new List<string>();
-        var inTypes = new List<Type/*?*/>();
-        if (!e.Function.IsStatic) {
-          string inTmp = ProtectedFreshId("_in");
-          inTmps.Add(inTmp);
-          inTypes.Add(null);
-          DeclareLocalVar(inTmp, null, null, e.Receiver, false, wr);
-        }
-        for (int i = 0; i < e.Function.Formals.Count; i++) {
-          Formal p = e.Function.Formals[i];
-          if (!p.IsGhost) {
-            string inTmp = ProtectedFreshId("_in");
-            inTmps.Add(inTmp);
-            inTypes.Add(e.Args[i].Type);
-            DeclareLocalVar(inTmp, e.Args[i].Type, p.tok, e.Args[i], false, wr);
-          }
-        }
-        // Now, assign to the formals
-        int n = 0;
-        if (!e.Function.IsStatic) {
-          wr.Write("_this = ");
-          ConcreteSyntaxTree wRHS;
-          if (thisContext == null) {
-            wRHS = wr;
-          } else {
-            var instantiatedType = e.Receiver.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
-            wRHS = EmitCoercionIfNecessary(instantiatedType, UserDefinedType.FromTopLevelDecl(e.tok, thisContext), e.tok, wr);
-          }
-          wRHS.Write(inTmps[n]);
-          EndStmt(wr);
-          n++;
-        }
-        foreach (var p in e.Function.Formals) {
-          if (!p.IsGhost) {
-            EmitAssignment(IdName(p), p.Type, inTmps[n], inTypes[n], wr);
-            n++;
-          }
-        }
-        Contract.Assert(n == inTmps.Count);
-        // finally, the jump back to the head of the function
-        EmitJumpToTailCallStart(wr);
-
-      } else if (expr is BinaryExpr bin
-                 && bin.AccumulatesForTailRecursion != BinaryExpr.AccumulationOperand.None
-                 && enclosingFunction is { IsAccumulatorTailRecursive: true }) {
-        Contract.Assert(accumulatorVar != null);
-        Expression tailTerm;
-        Expression rhs;
-        var acc = new IdentifierExpr(expr.tok, accumulatorVar);
-        if (bin.AccumulatesForTailRecursion == BinaryExpr.AccumulationOperand.Left) {
-          rhs = new BinaryExpr(bin.tok, bin.ResolvedOp, acc, bin.E0);
-          tailTerm = bin.E1;
-        } else {
-          switch (bin.ResolvedOp) {
-            case BinaryExpr.ResolvedOpcode.Sub:
-              rhs = new BinaryExpr(bin.tok, BinaryExpr.ResolvedOpcode.Add, bin.E1, acc);
-              break;
-            case BinaryExpr.ResolvedOpcode.SetDifference:
-              rhs = new BinaryExpr(bin.tok, BinaryExpr.ResolvedOpcode.Union, bin.E1, acc);
-              break;
-            case BinaryExpr.ResolvedOpcode.MultiSetDifference:
-              rhs = new BinaryExpr(bin.tok, BinaryExpr.ResolvedOpcode.MultiSetUnion, bin.E1, acc);
-              break;
-            default:
-              rhs = new BinaryExpr(bin.tok, bin.ResolvedOp, bin.E1, acc);
-              break;
-          }
-          tailTerm = bin.E0;
-        }
-
-        var wStmts = wr.Fork();
-        EmitAssignment(out var wLhs, enclosingFunction.ResultType, out var wRhs, enclosingFunction.ResultType, wr);
-        EmitExpr(acc, false, wLhs, wStmts);
-        EmitExpr(rhs, false, wRhs, wStmts);
-        TrExprOpt(tailTerm, resultType, wr, accumulatorVar);
-
-      } else {
-        // We haven't optimized any other cases, so fallback to normal compilation
-        if (enclosingFunction != null && enclosingFunction.IsAccumulatorTailRecursive) {
-          // Remember to include the accumulator
-          Contract.Assert(accumulatorVar != null);
-          var acc = new IdentifierExpr(expr.tok, accumulatorVar);
-          switch (enclosingFunction.TailRecursion) {
-            case Function.TailStatus.Accumulate_Add:
-              expr = new BinaryExpr(expr.tok, BinaryExpr.ResolvedOpcode.Add, expr, acc);
-              break;
-            case Function.TailStatus.AccumulateRight_Sub:
-              expr = new BinaryExpr(expr.tok, BinaryExpr.ResolvedOpcode.Sub, expr, acc);
-              break;
-            case Function.TailStatus.Accumulate_Mul:
-              expr = new BinaryExpr(expr.tok, BinaryExpr.ResolvedOpcode.Mul, expr, acc);
-              break;
-            case Function.TailStatus.Accumulate_SetUnion:
-              expr = new BinaryExpr(expr.tok, BinaryExpr.ResolvedOpcode.Union, expr, acc);
-              break;
-            case Function.TailStatus.AccumulateRight_SetDifference:
-              expr = new BinaryExpr(expr.tok, BinaryExpr.ResolvedOpcode.SetDifference, expr, acc);
-              break;
-            case Function.TailStatus.Accumulate_MultiSetUnion:
-              expr = new BinaryExpr(expr.tok, BinaryExpr.ResolvedOpcode.MultiSetUnion, expr, acc);
-              break;
-            case Function.TailStatus.AccumulateRight_MultiSetDifference:
-              expr = new BinaryExpr(expr.tok, BinaryExpr.ResolvedOpcode.MultiSetDifference, expr, acc);
-              break;
-            case Function.TailStatus.AccumulateLeft_Concat:
-              expr = new BinaryExpr(expr.tok, BinaryExpr.ResolvedOpcode.Concat, acc, expr); // note order of operands
-              break;
-            case Function.TailStatus.AccumulateRight_Concat:
-              expr = new BinaryExpr(expr.tok, BinaryExpr.ResolvedOpcode.Concat, expr, acc);
-              break;
-            default:
-              Contract.Assert(false); // unexpected TailStatus
-              throw new cce.UnreachableException();
-          }
-        } else {
-          Contract.Assert(accumulatorVar == null);
-        }
-        EmitReturnExpr(expr, resultType, false, wr);
-      }
-    }
-
-    void CompileReturnBody(Expression body, Type originalResultType, ConcreteSyntaxTree wr, IVariable/*?*/ accumulatorVar) {
-      Contract.Requires(body != null);
-      Contract.Requires(originalResultType != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(accumulatorVar == null || (enclosingFunction != null && enclosingFunction.IsAccumulatorTailRecursive));
-      copyInstrWriters.Push(wr.Fork());
-      TrExprOpt(body.Resolved, originalResultType, wr, accumulatorVar);
-      copyInstrWriters.Pop();
-    }
-
-    // ----- Type ---------------------------------------------------------------------------------
-
-    protected NativeType AsNativeType(Type typ) {
-      Contract.Requires(typ != null);
-      if (typ.AsNewtype != null) {
-        return typ.AsNewtype.NativeType;
-      } else if (typ.IsBitVectorType) {
-        return typ.AsBitVectorType.NativeType;
-      }
-      return null;
-    }
-
-    protected bool NeedsEuclideanDivision(Type typ) {
-      if (AsNativeType(typ) is { LowerBound: var lb }) {
-        // Dafny's division differs from '/' only on negative numbers
-        return lb < BigInteger.Zero;
-      }
-      // IsNumericBased drills past newtypes, unlike IsIntegerType
-      return typ.IsNumericBased(Type.NumericPersuasion.Int);
-    }
-
-    /// <summary>
-    /// Note, C# and Java reverse the order of brackets in array type names.
-    /// </summary>
-    protected void TypeName_SplitArrayName(Type type, ConcreteSyntaxTree wr, IToken tok, out string typeNameSansBrackets, out string brackets) {
-      Contract.Requires(type != null);
-
-      TypeName_SplitArrayName(type, out var innermostElementType, out brackets);
-      typeNameSansBrackets = TypeName(innermostElementType, wr, tok);
-    }
-
-    protected virtual void TypeName_SplitArrayName(Type type, out Type innermostElementType, out string brackets) {
-      Contract.Requires(type != null);
-
-      type = DatatypeWrapperEraser.SimplifyType(Options, type);
-      var at = type.AsArrayType;
-      if (at != null) {
-        var elementType = type.TypeArgs[0];
-        TypeName_SplitArrayName(elementType, out innermostElementType, out brackets);
-        brackets = TypeNameArrayBrackets(at.Dims) + brackets;
-      } else {
-        innermostElementType = type;
-        brackets = "";
-      }
-    }
-
-    protected virtual string TypeNameArrayBrackets(int dims) {
-      Contract.Requires(0 <= dims);
-      return $"[{Util.Repeat(dims - 1, ",")}]";
-    }
-
-    protected bool ComplicatedTypeParameterForCompilation(TypeParameter.TPVariance v, Type t) {
-      Contract.Requires(t != null);
-      return v != TypeParameter.TPVariance.Non && t.IsTraitType;
-    }
-
-    protected string/*!*/ TypeNames(List<Type/*!*/>/*!*/ types, ConcreteSyntaxTree wr, IToken tok) {
-      Contract.Requires(cce.NonNullElements(types));
-      Contract.Ensures(Contract.Result<string>() != null);
-      return Util.Comma(types, ty => TypeName(ty, wr, tok));
-    }
-
-    /// <summary>
-    /// If "type" is an auto-init type, then return a default value, else return a placebo value.
-    /// </summary>
-    protected string PlaceboValue(Type type, ConcreteSyntaxTree wr, IToken tok, bool constructTypeParameterDefaultsFromTypeDescriptors = false) {
-      if (type.HasCompilableValue) {
-        return DefaultValue(type, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors);
-      } else {
-        return ForcePlaceboValue(type, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors);
-      }
-    }
-
-    protected string ForcePlaceboValue(Type type, ConcreteSyntaxTree wr, IToken tok, bool constructTypeParameterDefaultsFromTypeDescriptors = false) {
-      Contract.Requires(type != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(tok != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      type = DatatypeWrapperEraser.SimplifyType(Options, type, true);
-      return TypeInitializationValue(type, wr, tok, true, constructTypeParameterDefaultsFromTypeDescriptors);
-    }
-
-    protected string DefaultValue(Type type, ConcreteSyntaxTree wr, IToken tok, bool constructTypeParameterDefaultsFromTypeDescriptors = false) {
-      Contract.Requires(type != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(tok != null);
-      Contract.Ensures(Contract.Result<string>() != null);
-
-      // If "type" is a datatype with a ghost grounding constructor, then compile as a placebo for DatatypeWrapperEraser.SimplifyType(type, true).
-      // Otherwise, get default value for DatatypeWrapperEraser.SimplifyType(type, true), which may itself have a ghost grounding constructor, in
-      // which case the value we produce is a placebo.
-      bool HasGhostGroundingCtor(Type ty) {
-        return (ty.NormalizeExpandKeepConstraints() as UserDefinedType)?.ResolvedClass is DatatypeDecl dt && dt.GetGroundingCtor().IsGhost;
-      }
-
-      var simplifiedType = DatatypeWrapperEraser.SimplifyType(Options, type, true);
-      var usePlaceboValue = HasGhostGroundingCtor(type) || HasGhostGroundingCtor(simplifiedType);
-      return TypeInitializationValue(simplifiedType, wr, tok, usePlaceboValue, constructTypeParameterDefaultsFromTypeDescriptors);
-    }
-
-    protected string DefaultValueCoercedIfNecessary(Type type, ConcreteSyntaxTree wr, IToken tok,
-      bool constructTypeParameterDefaultsFromTypeDescriptors = false) {
-
-      var resultWr = new ConcreteSyntaxTree();
-      var coercedWr = EmitCoercionIfNecessary(type, TypeForCoercion(type), tok, resultWr);
-      coercedWr.Write(DefaultValue(type, wr, tok, constructTypeParameterDefaultsFromTypeDescriptors));
-      return resultWr.ToString();
-    }
-
-    // ----- Stmt ---------------------------------------------------------------------------------
-
-    public class CheckHasNoAssumes_Visitor : BottomUpVisitor {
-      readonly SinglePassCompiler compiler;
-      ConcreteSyntaxTree wr;
-      public CheckHasNoAssumes_Visitor(SinglePassCompiler c, ConcreteSyntaxTree wr) {
-        Contract.Requires(c != null);
-        compiler = c;
-        this.wr = wr;
-      }
-      private void RejectAssume(IToken tok, Attributes attributes, ConcreteSyntaxTree wr) {
-        if (!Attributes.Contains(attributes, "axiom")) {
-          compiler.Error(ErrorId.c_assume_statement_may_not_be_compiled, tok, "an assume statement cannot be compiled (use the {{:axiom}} attribute to let the compiler ignore the statement)", wr);
-        }
-      }
-      protected override void VisitOneStmt(Statement stmt) {
-        if (stmt is AssumeStmt) {
-          RejectAssume(stmt.Tok, stmt.Attributes, wr);
-        } else if (stmt is AssignSuchThatStmt { AssumeToken: { Attrs: var attrs } }) {
-          RejectAssume(stmt.Tok, attrs, wr);
-        } else if (stmt is ForallStmt) {
-          var s = (ForallStmt)stmt;
-          if (s.Body == null) {
-            compiler.Error(ErrorId.c_forall_statement_has_no_body, stmt.Tok, "a forall statement without a body cannot be compiled", wr);
-          }
-        } else if (stmt is OneBodyLoopStmt) {
-          var s = (OneBodyLoopStmt)stmt;
-          if (s.Body == null) {
-            compiler.Error(ErrorId.c_loop_has_no_body, stmt.Tok, "a loop without a body cannot be compiled", wr);
-          }
-        }
-      }
-    }
-
-    void TrStmtNonempty(Statement stmt, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts = null) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(wr != null);
-      TrStmt(stmt, wr, wStmts);
-      if (stmt.IsGhost) {
-        TrStmtList(new List<Statement>(), EmitBlock(wr));
-      }
-    }
-
-    protected void TrStmt(Statement stmt, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts = null) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(wr != null);
-
-      wStmts ??= wr.Fork();
-
-      if (stmt.IsGhost) {
-        return;
-      }
-      if (stmt is PrintStmt) {
-        var s = (PrintStmt)stmt;
-        foreach (var arg in s.Args) {
-          EmitPrintStmt(wr, arg);
-        }
-      } else if (stmt is BreakStmt) {
-        var s = (BreakStmt)stmt;
-        var label = s.TargetStmt.Labels.Data.AssignUniqueId(idGenerator);
-        if (s.IsContinue) {
-          EmitContinue(label, wr);
-        } else {
-          EmitBreak(label, wr);
-        }
-      } else if (stmt is ProduceStmt) {
-        var s = (ProduceStmt)stmt;
-        var isTailRecursiveResult = false;
-        if (s.HiddenUpdate != null) {
-          TrStmt(s.HiddenUpdate, wr);
-          var ss = s.HiddenUpdate.ResolvedStatements;
-          if (ss.Count == 1 && ss[0] is AssignStmt assign && assign.Rhs is ExprRhs eRhs && eRhs.Expr.Resolved is FunctionCallExpr fce && IsTailRecursiveByMethodCall(fce)) {
-            isTailRecursiveResult = true;
-          }
-        }
-        if (s is YieldStmt) {
-          EmitYield(wr);
-        } else if (!isTailRecursiveResult) {
-          EmitReturn(this.enclosingMethod.Outs, wr);
-        }
-      } else if (stmt is UpdateStmt) {
-        var s = (UpdateStmt)stmt;
-        var resolved = s.ResolvedStatements;
-        if (resolved.Count == 1) {
-          TrStmt(resolved[0], wr);
-        } else {
-          var assignStmts = resolved.Cast<AssignStmt>().Where(assignStmt => !assignStmt.IsGhost).ToList();
-          var lhss = new List<Expression>();
-          var rhss = new List<AssignmentRhs>();
-
-          // multi-assignment
-          Contract.Assert(s.Lhss.Count == resolved.Count);
-          Contract.Assert(s.Rhss.Count == resolved.Count);
-          var lhsTypes = new List<Type>();
-          var rhsTypes = new List<Type>();
-          foreach (var assignStmt in assignStmts) {
-            var rhs = assignStmt.Rhs;
-            if (rhs is HavocRhs) {
-              if (Options.ForbidNondeterminism) {
-                Error(ErrorId.c_nondeterminism_forbidden, rhs.Tok, "nondeterministic assignment forbidden by the --enforce-determinism option", wr);
-              }
-            } else {
-              var lhs = assignStmt.Lhs;
-              rhss.Add(rhs);
-              lhss.Add(lhs);
-              lhsTypes.Add(lhs.Type);
-              rhsTypes.Add(TypeOfRhs(rhs));
-            }
-          }
-
-          var wStmtsPre = wStmts.Fork();
-          var lvalues = new List<ILvalue>();
-          foreach (Expression lhs in lhss) {
-            lvalues.Add(CreateLvalue(lhs, wStmts, wStmtsPre));
-          }
-
-          EmitMultiAssignment(lhss, lvalues, lhsTypes, out var wRhss, rhsTypes, wr);
-          for (int i = 0; i < wRhss.Count; i++) {
-            TrRhs(rhss[i], wRhss[i], wStmts);
-          }
-        }
-      } else if (stmt is AssignStmt) {
-        var s = (AssignStmt)stmt;
-        Contract.Assert(s.Lhs is not SeqSelectExpr expr || expr.SelectOne);  // multi-element array assignments are not allowed
-        if (s.Rhs is HavocRhs) {
-          if (Options.ForbidNondeterminism) {
-            Error(ErrorId.c_nondeterminism_forbidden, s.Rhs.Tok, "nondeterministic assignment forbidden by the --enforce-determinism option", wr);
-          }
-        } else if (s.Rhs is ExprRhs eRhs && eRhs.Expr.Resolved is FunctionCallExpr fce && IsTailRecursiveByMethodCall(fce)) {
-          TrTailCallStmt(s.Tok, fce.Function.ByMethodDecl, fce.Receiver, fce.Args, null, wr);
-        } else {
-          var lvalue = CreateLvalue(s.Lhs, wr, wStmts);
-          wStmts = wr.Fork();
-          var wRhs = EmitAssignment(lvalue, TypeOfLhs(s.Lhs), TypeOfRhs(s.Rhs), wr, stmt.Tok);
-          TrRhs(s.Rhs, wRhs, wStmts);
-        }
-
-      } else if (stmt is AssignSuchThatStmt) {
-        var s = (AssignSuchThatStmt)stmt;
-        if (Options.ForbidNondeterminism) {
-          Error(ErrorId.c_assign_such_that_forbidden, s.Tok, "assign-such-that statement forbidden by the --enforce-determinism option", wr);
-        }
-        var lhss = s.Lhss.ConvertAll(lhs => ((IdentifierExpr)lhs.Resolved).Var);  // the resolver allows only IdentifierExpr left-hand sides
-        var missingBounds = ComprehensionExpr.BoundedPool.MissingBounds(lhss, s.Bounds, ComprehensionExpr.BoundedPool.PoolVirtues.Enumerable);
-        if (missingBounds.Count != 0) {
-          foreach (var bv in missingBounds) {
-            Error(ErrorId.c_assign_such_that_is_too_complex, s.Tok, "this assign-such-that statement is too advanced for the current compiler; Dafny's heuristics cannot find any bound for variable '{0}'", wr, bv.Name);
-          }
-        } else {
-          Contract.Assert(s.Bounds != null);
-          TrAssignSuchThat(lhss, s.Expr, s.Bounds, s.Tok.line, wr, false);
-        }
-      } else if (stmt is AssignOrReturnStmt) {
-        var s = (AssignOrReturnStmt)stmt;
-        // TODO there's potential here to use target-language specific features such as exceptions
-        // to make it more target-language idiomatic and improve performance
-        TrStmtList(s.ResolvedStatements, wr);
-
-      } else if (stmt is ExpectStmt) {
-        var s = (ExpectStmt)stmt;
-        // TODO there's potential here to use target-language specific features such as exceptions
-        // to make it more target-language idiomatic and improve performance
-        ConcreteSyntaxTree bodyWriter = EmitIf(out var guardWriter, false, wr);
-        var negated = new UnaryOpExpr(s.Tok, UnaryOpExpr.Opcode.Not, s.Expr);
-        negated.Type = Type.Bool;
-        EmitExpr(negated, false, guardWriter, wStmts);
-        EmitHalt(s.Tok, s.Message, bodyWriter);
-
-      } else if (stmt is CallStmt) {
-        var s = (CallStmt)stmt;
-        var wrBefore = wr.Fork();
-        var wrCall = wr.Fork();
-        var wrAfter = wr;
-        TrCallStmt(s, null, wrCall, wrBefore, wrAfter);
-
-      } else if (stmt is BlockStmt) {
-        var w = EmitBlock(wr);
-        TrStmtList(((BlockStmt)stmt).Body, w);
-
-      } else if (stmt is IfStmt) {
-        IfStmt s = (IfStmt)stmt;
-        if (s.Guard == null) {
-          if (Options.ForbidNondeterminism) {
-            Error(ErrorId.c_nondeterministic_if_forbidden, s.Tok, "nondeterministic if statement forbidden by the --enforce-determinism option", wr);
-          }
-          // we can compile the branch of our choice
-          ConcreteSyntaxTree guardWriter;
-          if (s.Els == null) {
-            // let's compile the "else" branch, since that involves no work
-            // (still, let's leave a marker in the source code to indicate that this is what we did)
-            Coverage.UnusedInstrumentationPoint(s.Thn.Tok, "then branch");
-            var notFalse = (UnaryOpExpr)Expression.CreateNot(s.Thn.Tok, new LiteralExpr(s.Thn.Tok, false));
-            var thenWriter = EmitIf(out guardWriter, false, wr);
-            EmitUnaryExpr(ResolvedUnaryOp.BoolNot, notFalse.E, false, guardWriter, wStmts);
-            Coverage.Instrument(s.Tok, "implicit else branch", wr);
-            thenWriter = EmitIf(out guardWriter, false, thenWriter);
-            EmitUnaryExpr(ResolvedUnaryOp.BoolNot, notFalse.E, false, guardWriter, wStmts);
-            TrStmtList(new List<Statement>(), thenWriter);
-          } else {
-            // let's compile the "then" branch
-            wr = EmitIf(out guardWriter, false, wr);
-            guardWriter.Write(True);
-            Coverage.Instrument(s.Thn.Tok, "then branch", wr);
-            TrStmtList(s.Thn.Body, wr);
-            Coverage.UnusedInstrumentationPoint(s.Els.Tok, "else branch");
-          }
-        } else {
-          if (s.IsBindingGuard && Options.ForbidNondeterminism) {
-            Error(ErrorId.c_binding_if_forbidden, s.Tok, "binding if statement forbidden by the --enforce-determinism option", wr);
-          }
-
-          var coverageForElse = Coverage.IsRecording && !(s.Els is IfStmt);
-          var thenWriter = EmitIf(out var guardWriter, s.Els != null || coverageForElse, wr);
-          EmitExpr(s.IsBindingGuard ? Translator.AlphaRename((ExistsExpr)s.Guard, "eg_d") : s.Guard, false, guardWriter, wStmts);
-          // We'd like to do "TrStmt(s.Thn, indent)", except we want the scope of any existential variables to come inside the block
-          if (s.IsBindingGuard) {
-            IntroduceAndAssignBoundVars((ExistsExpr)s.Guard, thenWriter);
-          }
-          Coverage.Instrument(s.Thn.Tok, "then branch", thenWriter);
-          TrStmtList(s.Thn.Body, thenWriter);
-
-          if (coverageForElse) {
-            wr = EmitBlock(wr);
-            if (s.Els == null) {
-              Coverage.Instrument(s.Tok, "implicit else branch", wr);
-            } else {
-              Coverage.Instrument(s.Els.Tok, "else branch", wr);
-            }
-          }
-          if (s.Els != null) {
-            TrStmtNonempty(s.Els, wr, wStmts);
-          }
-        }
-
-      } else if (stmt is AlternativeStmt) {
-        var s = (AlternativeStmt)stmt;
-        if (Options.ForbidNondeterminism && 2 <= s.Alternatives.Count) {
-          Error(ErrorId.c_case_based_if_forbidden, s.Tok, "case-based if statement forbidden by the --enforce-determinism option", wr);
-        }
-        foreach (var alternative in s.Alternatives) {
-          var thn = EmitIf(out var guardWriter, true, wr);
-          EmitExpr(alternative.IsBindingGuard ? Translator.AlphaRename((ExistsExpr)alternative.Guard, "eg_d") : alternative.Guard, false, guardWriter, wStmts);
-          if (alternative.IsBindingGuard) {
-            IntroduceAndAssignBoundVars((ExistsExpr)alternative.Guard, thn);
-          }
-          Coverage.Instrument(alternative.Tok, "if-case branch", thn);
-          TrStmtList(alternative.Body, thn);
-        }
-        var wElse = EmitBlock(wr);
-        EmitAbsurd("unreachable alternative", wElse);
-
-      } else if (stmt is WhileStmt) {
-        WhileStmt s = (WhileStmt)stmt;
-        if (s.Body == null) {
-          return;
-        }
-        if (s.Guard == null) {
-          if (Options.ForbidNondeterminism) {
-            Error(ErrorId.c_non_deterministic_loop_forbidden, s.Tok, "nondeterministic loop forbidden by the --enforce-determinism option", wr);
-          }
-          // This loop is allowed to stop iterating at any time. We choose to never iterate, but we still
-          // emit a loop structure. The structure "while (false) { }" comes to mind, but that results in
-          // an "unreachable code" error from Java, so we instead use "while (true) { break; }".
-          var wBody = CreateWhileLoop(out var guardWriter, wr);
-          guardWriter.Write(True);
-          EmitBreak(null, wBody);
-          Coverage.UnusedInstrumentationPoint(s.Body.Tok, "while body");
-        } else {
-          var guardWriter = EmitWhile(s.Body.Tok, s.Body.Body, s.Labels, wr);
-          EmitExpr(s.Guard, false, guardWriter, wStmts);
-        }
-
-      } else if (stmt is AlternativeLoopStmt loopStmt) {
-        if (Options.ForbidNondeterminism) {
-          Error(ErrorId.c_case_based_loop_forbidden, loopStmt.Tok, "case-based loop forbidden by the --enforce-determinism option", wr);
-        }
-        if (loopStmt.Alternatives.Count != 0) {
-          var w = CreateWhileLoop(out var whileGuardWriter, wr);
-          whileGuardWriter.Write(True);
-          w = EmitContinueLabel(loopStmt.Labels, w);
-          foreach (var alternative in loopStmt.Alternatives) {
-            var thn = EmitIf(out var guardWriter, true, w);
-            EmitExpr(alternative.Guard, false, guardWriter, wStmts);
-            Coverage.Instrument(alternative.Tok, "while-case branch", thn);
-            TrStmtList(alternative.Body, thn);
-          }
-          var wElse = EmitBlock(w);
-          {
-            EmitBreak(null, wElse);
-          }
-        }
-
-      } else if (stmt is ForLoopStmt) {
-        var s = (ForLoopStmt)stmt;
-        if (s.Body == null) {
-          return;
-        }
-        string endVarName = null;
-        if (s.End != null) {
-          // introduce a variable to hold the value of the end-expression
-          endVarName = ProtectedFreshId(s.GoingUp ? "_hi" : "_lo");
-          wStmts = wr.Fork();
-          EmitExpr(s.End, false, DeclareLocalVar(endVarName, s.End.Type, s.End.tok, wr), wStmts);
-        }
-        var startExprWriter = EmitForStmt(s.Tok, s.LoopIndex, s.GoingUp, endVarName, s.Body.Body, s.Labels, wr);
-        EmitExpr(s.Start, false, startExprWriter, wStmts);
-
-      } else if (stmt is ForallStmt) {
-        var s = (ForallStmt)stmt;
-        if (s.Kind != ForallStmt.BodyKind.Assign) {
-          // Call and Proof have no side effects, so they can simply be optimized away.
-          return;
-        } else if (s.BoundVars.Count == 0) {
-          // the bound variables just spell out a single point, so the forall statement is equivalent to one execution of the body
-          TrStmt(s.Body, wr);
-          return;
-        }
-        var s0 = (AssignStmt)s.S0;
-        if (s0.Rhs is HavocRhs) {
-          if (Options.ForbidNondeterminism) {
-            Error(ErrorId.c_nondeterminism_forbidden, s0.Rhs.Tok, "nondeterministic assignment forbidden by --enforce-determinism", wr);
-          }
-          // The forall statement says to havoc a bunch of things.  This can be efficiently compiled
-          // into doing nothing.
-          return;
-        }
-        var rhs = ((ExprRhs)s0.Rhs).Expr;
-
-        if (CanSequentializeForall(s.BoundVars, s.Bounds, s.Range, s0.Lhs, rhs)) {
-          // Just put the statement inside the loops
-          var wLoop = CompileGuardedLoops(s.BoundVars, s.Bounds, s.Range, wr);
-          TrStmt(s0, wLoop);
-        } else {
-          // Compile:
-          //   forall (w,x,y,z | Range(w,x,y,z)) {
-          //     LHS(w,x,y,z) := RHS(w,x,y,z);
-          //   }
-          // where w,x,y,z have types seq<W>,set<X>,int,bool and LHS has L-1 top-level subexpressions
-          // (that is, L denotes the number of top-level subexpressions of LHS plus 1),
-          // into:
-          //   var ingredients = new List< L-Tuple >();
-          //   foreach (W w in sq.UniqueElements) {
-          //     foreach (X x in st.Elements) {
-          //       for (BigInteger y = Lo; j < Hi; j++) {
-          //         for (bool z in Helper.AllBooleans) {
-          //           if (Range(w,x,y,z)) {
-          //             ingredients.Add(new L-Tuple( LHS0(w,x,y,z), LHS1(w,x,y,z), ..., RHS(w,x,y,z) ));
-          //           }
-          //         }
-          //       }
-          //     }
-          //   }
-          //   foreach (L-Tuple l in ingredients) {
-          //     LHS[ l0, l1, l2, ..., l(L-2) ] = l(L-1);
-          //   }
-          //
-          // Note, because the .NET Tuple class only supports up to 8 components, the compiler implementation
-          // here supports arrays only up to 6 dimensions.  This does not seem like a serious practical limitation.
-          // However, it may be more noticeable if the forall statement supported forall assignments in its
-          // body.  To support cases where tuples would need more than 8 components, .NET Tuple's would have to
-          // be nested.
-
-          // Temporary names
-          var c = ProtectedFreshNumericId("_ingredients+_tup");
-          string ingredients = "_ingredients" + c;
-          string tup = "_tup" + c;
-
-          // Compute L
-          int L;
-          string tupleTypeArgs;
-          List<Type> tupleTypeArgsList;
-          if (s0.Lhs is MemberSelectExpr) {
-            var lhs = (MemberSelectExpr)s0.Lhs;
-            L = 2;
-            tupleTypeArgs = TypeArgumentName(lhs.Obj.Type, wr, lhs.tok);
-            tupleTypeArgsList = new List<Type> { lhs.Obj.Type };
-          } else if (s0.Lhs is SeqSelectExpr) {
-            var lhs = (SeqSelectExpr)s0.Lhs;
-            L = 3;
-            // note, we might as well do the BigInteger-to-int cast for array indices here, before putting things into the Tuple rather than when they are extracted from the Tuple
-            tupleTypeArgs = TypeArgumentName(lhs.Seq.Type, wr, lhs.tok) + IntSelect;
-            tupleTypeArgsList = new List<Type> { lhs.Seq.Type, null };
-          } else {
-            var lhs = (MultiSelectExpr)s0.Lhs;
-            L = 2 + lhs.Indices.Count;
-            if (8 < L) {
-              Error(ErrorId.c_no_assignments_to_seven_d_arrays, lhs.tok, "compiler currently does not support assignments to more-than-6-dimensional arrays in forall statements", wr);
-              return;
-            }
-            tupleTypeArgs = TypeArgumentName(lhs.Array.Type, wr, lhs.tok);
-            tupleTypeArgsList = new List<Type> { lhs.Array.Type };
-            for (int i = 0; i < lhs.Indices.Count; i++) {
-              // note, we might as well do the BigInteger-to-int cast for array indices here, before putting things into the Tuple rather than when they are extracted from the Tuple
-              tupleTypeArgs += IntSelect;
-              tupleTypeArgsList.Add(null);
-            }
-
-          }
-          tupleTypeArgs += "," + TypeArgumentName(rhs.Type, wr, rhs.tok);
-          tupleTypeArgsList.Add(rhs.Type);
-
-          // declare and construct "ingredients"
-          var wrOuter = EmitIngredients(wr, ingredients, L, tupleTypeArgs, s, s0, rhs);
-
-          //   foreach (L-Tuple l in ingredients) {
-          //     LHS[ l0, l1, l2, ..., l(L-2) ] = l(L-1);
-          //   }
-          TargetTupleSize = L;
-          wr = CreateForeachIngredientLoop(tup, L, tupleTypeArgs, out var collWriter, wrOuter);
-          collWriter.Write(ingredients);
-          {
-            var wTup = new ConcreteSyntaxTree(wr.RelativeIndentLevel);
-            var wCoerceTup = EmitCoercionToArbitraryTuple(wTup);
-            wCoerceTup.Write(tup);
-            tup = wTup.ToString();
-          }
-          if (s0.Lhs is MemberSelectExpr) {
-            EmitMemberSelect(s0, tupleTypeArgsList, wr, tup);
-          } else if (s0.Lhs is SeqSelectExpr) {
-            EmitSeqSelect(s0, tupleTypeArgsList, wr, tup);
-          } else {
-            EmitMultiSelect(s0, tupleTypeArgsList, wr, tup, L);
-          }
-        }
-      } else if (stmt is NestedMatchStmt nestedMatchStmt) {
-        TrStmt(nestedMatchStmt.Flattened, wr, wStmts);
-      } else if (stmt is MatchStmt) {
-        MatchStmt s = (MatchStmt)stmt;
-        // Type source = e;
-        // if (source.is_Ctor0) {
-        //   FormalType f0 = ((Dt_Ctor0)source._D).a0;
-        //   ...
-        //   Body0;
-        // } else if (...) {
-        //   ...
-        // } else if (true) {
-        //   ...
-        // }
-        if (s.Cases.Count != 0) {
-          string source = ProtectedFreshId("_source");
-          DeclareLocalVar(source, s.Source.Type, s.Source.tok, s.Source, false, wr);
-
-          int i = 0;
-          var sourceType = (UserDefinedType)s.Source.Type.NormalizeExpand();
-          foreach (MatchCaseStmt mc in s.Cases) {
-            var w = MatchCasePrelude(source, sourceType, cce.NonNull(mc.Ctor), mc.Arguments, i, s.Cases.Count, wr);
-            TrStmtList(mc.Body, w);
-            i++;
-          }
-        }
-
-      } else if (stmt is VarDeclStmt) {
-        var s = (VarDeclStmt)stmt;
-        var i = 0;
-        foreach (var local in s.Locals) {
-          bool hasRhs = s.Update is AssignSuchThatStmt || s.Update is AssignOrReturnStmt;
-          if (!hasRhs && s.Update is UpdateStmt u) {
-            if (i < u.Rhss.Count && u.Rhss[i] is HavocRhs) {
-              // there's no specific initial value
-            } else {
-              hasRhs = true;
-            }
-          }
-          TrLocalVar(local, !hasRhs, wr);
-          i++;
-        }
-        if (s.Update != null) {
-          TrStmt(s.Update, wr);
-        }
-
-      } else if (stmt is VarDeclPattern) {
-        var s = (VarDeclPattern)stmt;
-        if (Contract.Exists(s.LHS.Vars, bv => !bv.IsGhost)) {
-          TrCasePatternOpt(s.LHS, s.RHS, wr, false);
-        }
-      } else if (stmt is ModifyStmt) {
-        var s = (ModifyStmt)stmt;
-        if (s.Body != null) {
-          TrStmt(s.Body, wr);
-        } else if (Options.ForbidNondeterminism) {
-          Error(ErrorId.c_bodyless_modify_statement_forbidden, s.Tok, "modify statement without a body forbidden by the --enforce-determinism option", wr);
-        }
-      } else if (stmt is TryRecoverStatement h) {
-        EmitHaltRecoveryStmt(h.TryBody, h.HaltMessageVar.CompileName, h.RecoverBody, wr);
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected statement
-      }
-    }
-
-    protected virtual ConcreteSyntaxTree EmitIngredients(ConcreteSyntaxTree wr, string ingredients, int L, string tupleTypeArgs, ForallStmt s, AssignStmt s0, Expression rhs) {
-      var wStmts = wr.Fork();
-      var wrVarInit = DeclareLocalVar(ingredients, null, null, wr);
-      {
-        EmitEmptyTupleList(tupleTypeArgs, wrVarInit);
-      }
-
-      var wrOuter = wr;
-      wr = CompileGuardedLoops(s.BoundVars, s.Bounds, s.Range, wr);
-
-      var wrTuple = EmitAddTupleToList(ingredients, tupleTypeArgs, wr);
-      {
-        if (s0.Lhs is MemberSelectExpr) {
-          var lhs = (MemberSelectExpr)s0.Lhs;
-          EmitExpr(lhs.Obj, false, wrTuple, wStmts);
-        } else if (s0.Lhs is SeqSelectExpr) {
-          var lhs = (SeqSelectExpr)s0.Lhs;
-          EmitExpr(lhs.Seq, false, wrTuple, wStmts);
-          wrTuple.Write(", ");
-          EmitExprAsNativeInt(lhs.E0, false, wrTuple, wStmts);
-        } else {
-          var lhs = (MultiSelectExpr)s0.Lhs;
-          EmitExpr(lhs.Array, false, wrTuple, wStmts);
-          for (int i = 0; i < lhs.Indices.Count; i++) {
-            wrTuple.Write(", ");
-            EmitExprAsNativeInt(lhs.Indices[i], false, wrTuple, wStmts);
-          }
-        }
-
-        wrTuple.Write(", ");
-        EmitExpr(rhs, false, wrTuple, wStmts);
-      }
-
-      return wrOuter;
-    }
-
-    bool IsTailRecursiveByMethodCall(FunctionCallExpr fce) {
-      Contract.Requires(fce != null);
-      return fce.IsByMethodCall && fce.Function.ByMethodDecl == enclosingMethod && fce.Function.ByMethodDecl.IsTailRecursive;
-    }
-
-    protected virtual void EmitMemberSelect(AssignStmt s0, List<Type> tupleTypeArgsList, ConcreteSyntaxTree wr, string tup) {
-      var lhs = (MemberSelectExpr)s0.Lhs;
-
-      var typeArgs = TypeArgumentInstantiation.ListFromMember(lhs.Member, null, lhs.TypeApplication_JustMember);
-      var lvalue = EmitMemberSelect(w => {
-        var wObj = EmitCoercionIfNecessary(from: null, to: tupleTypeArgsList[0], s0.Tok, w);
-        EmitTupleSelect(tup, 0, wObj);
-      }, lhs.Obj.Type, lhs.Member, typeArgs, lhs.TypeArgumentSubstitutionsWithParents(), lhs.Type);
-
-      var wRhs = EmitAssignment(lvalue, lhs.Type, tupleTypeArgsList[1], wr, s0.Tok);
-      var wCoerced = EmitCoercionIfNecessary(from: null, to: tupleTypeArgsList[1], tok: s0.Tok, wr: wRhs);
-      EmitTupleSelect(tup, 1, wCoerced);
-    }
-
-    protected virtual void EmitSeqSelect(AssignStmt s0, List<Type> tupleTypeArgsList, ConcreteSyntaxTree wr, string tup) {
-      var lhs = (SeqSelectExpr)s0.Lhs;
-      EmitIndexCollectionUpdate(lhs.Seq.Type, out var wColl, out var wIndex, out var wValue, wr, nativeIndex: true);
-      var wCoerce = EmitCoercionIfNecessary(from: null, to: lhs.Seq.Type, tok: s0.Tok, wr: wColl);
-      EmitTupleSelect(tup, 0, wCoerce);
-      var wCast = EmitCoercionToNativeInt(wIndex);
-      EmitTupleSelect(tup, 1, wCast);
-      EmitTupleSelect(tup, 2, wValue);
-      EndStmt(wr);
-    }
-
-    protected virtual void EmitMultiSelect(AssignStmt s0, List<Type> tupleTypeArgsList, ConcreteSyntaxTree wr, string tup, int L) {
-      var lhs = (MultiSelectExpr)s0.Lhs;
-      var wArray = new ConcreteSyntaxTree(wr.RelativeIndentLevel);
-      var wCoerced = EmitCoercionIfNecessary(from: null, to: tupleTypeArgsList[0], tok: s0.Tok, wr: wArray);
-      EmitTupleSelect(tup, 0, wCoerced);
-      var array = wArray.ToString();
-      var indices = new List<string>();
-      for (int i = 0; i < lhs.Indices.Count; i++) {
-        var wIndex = new ConcreteSyntaxTree();
-        EmitTupleSelect(tup, i + 1, EmitCoercionToNativeInt(wIndex));
-        indices.Add(wIndex.ToString());
-      }
-      var (wrArray, wrRhs) = EmitArrayUpdate(indices, tupleTypeArgsList[L - 1], wr);
-      EmitTupleSelect(tup, L - 1, wrRhs);
-      wrArray.Write(array);
-      EndStmt(wr);
-    }
-
-    protected ConcreteSyntaxTree CompileGuardedLoops(List<BoundVar> bvs, List<ComprehensionExpr.BoundedPool> bounds, Expression range, ConcreteSyntaxTree wr) {
-      var n = bvs.Count;
-      Contract.Assert(bounds.Count == n);
-      for (int i = 0; i < n; i++) {
-        var bound = bounds[i];
-        var bv = bvs[i];
-        var tmpVar = ProtectedFreshId("_guard_loop_");
-        var wStmtsLoop = wr.Fork();
-        var elementType = CompileCollection(bound, bv, false, false, null, out var collection, wStmtsLoop, bounds, bvs, i);
-        wr = CreateGuardedForeachLoop(tmpVar, elementType, bv, true, false, range.tok, collection, wr);
-      }
-
-      // if (range) {
-      //   ingredients.Add(new L-Tuple( LHS0(w,x,y,z), LHS1(w,x,y,z), ..., RHS(w,x,y,z) ));
-      // }
-      ConcreteSyntaxTree guardWriter = new ConcreteSyntaxTree();
-      var wStmts = guardWriter.Fork();
-      wr = EmitIf(out guardWriter, false, wr);
-      foreach (var bvConstraints in bvs.Select(bv => ModuleResolver.GetImpliedTypeConstraint(bv, bv.Type))) {
-        TrParenExpr(bvConstraints, guardWriter, false, wStmts);
-        guardWriter.Write($" {Conj} ");
-      }
-      TrParenExpr(range, guardWriter, false, wStmts);
-
-      return wr;
-    }
-
-    Type CompileCollection(ComprehensionExpr.BoundedPool bound, IVariable bv, bool inLetExprBody, bool includeDuplicates,
-        Substituter/*?*/ su, out ConcreteSyntaxTree collectionWriter, ConcreteSyntaxTree wStmts,
-        List<ComprehensionExpr.BoundedPool>/*?*/ bounds = null, List<BoundVar>/*?*/ boundVars = null, int boundIndex = 0) {
-      Contract.Requires(bound != null);
-      Contract.Requires(bounds == null || (boundVars != null && bounds.Count == boundVars.Count && 0 <= boundIndex && boundIndex < bounds.Count));
-
-      collectionWriter = new ConcreteSyntaxTree();
-
-      var propertySuffix = SupportsProperties ? "" : "()";
-      su = su ?? new Substituter(null, new Dictionary<IVariable, Expression>(), new Dictionary<TypeParameter, Type>());
-
-      if (bound is ComprehensionExpr.BoolBoundedPool) {
-        collectionWriter.Write("{0}.AllBooleans()", GetHelperModuleName());
-        return new BoolType();
-      } else if (bound is ComprehensionExpr.CharBoundedPool) {
-        collectionWriter.Write($"{GetHelperModuleName()}.All{CharMethodQualifier}Chars()");
-        return new CharType();
-      } else if (bound is ComprehensionExpr.IntBoundedPool) {
-        var b = (ComprehensionExpr.IntBoundedPool)bound;
-        var type = EmitIntegerRange(bv.Type, out var wLo, out var wHi, collectionWriter);
-        if (b.LowerBound == null) {
-          EmitNull(bv.Type, wLo);
-        } else if (bounds != null) {
-          var low = SubstituteBound(b, bounds, boundVars, boundIndex, true);
-          EmitExpr(su.Substitute(low), inLetExprBody, wLo, wStmts);
-        } else {
-          EmitExpr(su.Substitute(b.LowerBound), inLetExprBody, wLo, wStmts);
-        }
-        if (b.UpperBound == null) {
-          EmitNull(bv.Type, wHi);
-        } else if (bounds != null) {
-          var high = SubstituteBound(b, bounds, boundVars, boundIndex, false);
-          EmitExpr(su.Substitute(high), inLetExprBody, wHi, wStmts);
-        } else {
-          EmitExpr(su.Substitute(b.UpperBound), inLetExprBody, wHi, wStmts);
-        }
-        return type;
-      } else if (bound is AssignSuchThatStmt.WiggleWaggleBound) {
-        collectionWriter.Write("{0}.AllIntegers()", GetHelperModuleName());
-        return bv.Type;
-      } else if (bound is ComprehensionExpr.ExactBoundedPool) {
-        var b = (ComprehensionExpr.ExactBoundedPool)bound;
-        EmitSingleValueGenerator(su.Substitute(b.E), inLetExprBody, TypeName(b.E.Type, collectionWriter, b.E.tok), collectionWriter, wStmts);
-        return b.E.Type;
-      } else if (bound is ComprehensionExpr.SetBoundedPool setBoundedPool) {
-        TrParenExpr(su.Substitute(setBoundedPool.Set), collectionWriter, inLetExprBody, wStmts);
-        collectionWriter.Write(".Elements" + propertySuffix);
-        return setBoundedPool.CollectionElementType;
-      } else if (bound is ComprehensionExpr.MultiSetBoundedPool) {
-        var b = (ComprehensionExpr.MultiSetBoundedPool)bound;
-        TrParenExpr(su.Substitute(b.MultiSet), collectionWriter, inLetExprBody, wStmts);
-        collectionWriter.Write((includeDuplicates ? ".Elements" : ".UniqueElements") + propertySuffix);
-        return b.CollectionElementType;
-      } else if (bound is ComprehensionExpr.SubSetBoundedPool) {
-        var b = (ComprehensionExpr.SubSetBoundedPool)bound;
-        TrParenExpr(su.Substitute(b.UpperBound), collectionWriter, inLetExprBody, wStmts);
-        collectionWriter.Write(".AllSubsets" + propertySuffix);
-        return b.UpperBound.Type;
-      } else if (bound is ComprehensionExpr.MapBoundedPool) {
-        var b = (ComprehensionExpr.MapBoundedPool)bound;
-        TrParenExpr(su.Substitute(b.Map), collectionWriter, inLetExprBody, wStmts);
-        GetSpecialFieldInfo(SpecialField.ID.Keys, null, null, out var keyName, out _, out _);
-        collectionWriter.Write($".{keyName}.Elements{propertySuffix}");
-        return b.CollectionElementType;
-      } else if (bound is ComprehensionExpr.SeqBoundedPool) {
-        var b = (ComprehensionExpr.SeqBoundedPool)bound;
-        TrParenExpr(su.Substitute(b.Seq), collectionWriter, inLetExprBody, wStmts);
-        collectionWriter.Write((includeDuplicates ? ".Elements" : ".UniqueElements") + propertySuffix);
-        return b.CollectionElementType;
-      } else if (bound is ComprehensionExpr.DatatypeBoundedPool) {
-        var b = (ComprehensionExpr.DatatypeBoundedPool)bound;
-        collectionWriter.Write("{0}.AllSingletonConstructors{1}", TypeName_Companion(bv.Type, collectionWriter, bv.Tok, null), propertySuffix);
-        return new UserDefinedType(bv.Tok, new NameSegment(bv.Tok, b.Decl.Name, new())) {
-          ResolvedClass = b.Decl
-        };
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected BoundedPool type
-      }
-    }
-
-    private Expression SubstituteBound(ComprehensionExpr.IntBoundedPool b, List<ComprehensionExpr.BoundedPool> bounds, List<BoundVar> boundVars, int index, bool lowBound) {
-      Contract.Requires(b != null);
-      Contract.Requires((lowBound ? b.LowerBound : b.UpperBound) != null);
-      Contract.Requires(bounds != null);
-      Contract.Requires(boundVars != null);
-      Contract.Requires(bounds.Count == boundVars.Count);
-      Contract.Requires(0 <= index && index < boundVars.Count);
-      // if the outer bound is dependent on the inner boundvar, we need to
-      // substitute the inner boundvar with its bound.
-      var bnd = lowBound ? b.LowerBound : b.UpperBound;
-      var sm = new Dictionary<IVariable, Expression>();
-      for (int i = index + 1; i < boundVars.Count; i++) {
-        var bound = bounds[i];
-        if (bound is ComprehensionExpr.IntBoundedPool) {
-          var ib = (ComprehensionExpr.IntBoundedPool)bound;
-          var bv = boundVars[i];
-          sm[bv] = lowBound ? ib.LowerBound : ib.UpperBound;
-        }
-      }
-      var su = new Substituter(null, sm, new Dictionary<TypeParameter, Type>());
-      return su.Substitute(bnd);
-    }
-
-    private void IntroduceAndAssignBoundVars(ExistsExpr exists, ConcreteSyntaxTree wr) {
-      Contract.Requires(exists != null);
-      Contract.Assume(exists.Bounds != null);  // follows from successful resolution
-      Contract.Assert(exists.Range == null);  // follows from invariant of class IfStmt
-      foreach (var bv in exists.BoundVars) {
-        TrLocalVar(bv, false, wr);
-      }
-      var ivars = exists.BoundVars.ConvertAll(bv => (IVariable)bv);
-      TrAssignSuchThat(ivars, exists.Term, exists.Bounds, exists.tok.line, wr, false);
-    }
-
-    private bool CanSequentializeForall(List<BoundVar> bvs, List<ComprehensionExpr.BoundedPool> bounds, Expression range, Expression lhs, Expression rhs) {
-      // Given a statement
-      //
-      //   forall i, ... | R {
-      //     L := E;
-      //   }
-      //
-      // we sequentialize if all of these conditions hold:
-      //
-      //   1. There are no calls to functions which may have read effects in R,
-      //      L, or E
-      //   2. Each index value will be produced only once (note that this is
-      //      currently always true thanks to the use of UniqueElements())
-      //   3. If L has the form A[I] for some A and I, then one of the following
-      //      is true:
-      //      a. There are no array dereferences or array-to-sequence
-      //         conversions in R, A, I, or E
-      //      b. All of the following are true:
-      //         i.   There is only one bound variable; call it i
-      //         ii.  I is the variable i
-      //         iii. Each array dereference in R, A, or E has the form B[i] for
-      //              some B
-      //         iv.  There are no array-to-sequence conversions in R, A, or E
-      //   4. If L has the form A[I, J, ...] for some A, I, J, ... then there
-      //      are no multi-D array dereferences in R, A, E, or any of the
-      //      indices I, J, ...
-      //   5. If L has the form O.f for some field f, then one of the following
-      //      is true:
-      //      a. There are no accesses of f in R, O, or E
-      //      b. All of the following are true:
-      //         i.   There is only one bound variable; call it i
-      //         ii.  O is the variable i
-      //         iii. Each access of f in R or E has the form i.f
-      //
-      // TODO It may be possible to weaken rule 4 by adding an alternative
-      // similar to rules 3b and 5b.
-      Contract.Assert(bvs.Count == bounds.Count);
-
-      if (!noImpureFunctionCalls(lhs, rhs, range)) {
-        return false;
-      } else if (lhs is SeqSelectExpr sse) {
-        return
-          no1DArrayAccesses(sse.Seq, sse.E0, range, rhs) ||
-
-          (bvs.Count == 1 &&
-          isVar(bvs[0], sse.E0) &&
-          indexIsAlwaysVar(bvs[0], range, sse.Seq, rhs)); // also covers sequence conversions
-      } else if (lhs is MultiSelectExpr mse) {
-        return
-          noMultiDArrayAccesses(mse.Array, range, rhs) &&
-          noMultiDArrayAccesses(mse.Indices.ToArray());
-      } else {
-        // !@#$#@$% scope rules won't let me call this mse ...
-        var mse2 = (MemberSelectExpr)lhs;
-
-        return
-          noFieldAccesses(mse2.Member, mse2.Obj, range, rhs) ||
-
-          (bvs.Count == 1 &&
-          isVar(bvs[0], mse2.Obj) &&
-          accessedObjectIsAlwaysVar(mse2.Member, bvs[0], range, rhs));
-      }
-
-      bool noImpureFunctionCalls(params Expression[] exprs) {
-        return exprs.All(e => Check<ApplyExpr>(e, ae => {
-          var ty = (UserDefinedType)ae.Function.Type.NormalizeExpandKeepConstraints();
-          return ArrowType.IsPartialArrowTypeName(ty.Name) || ArrowType.IsTotalArrowTypeName(ty.Name);
-        }));
-      }
-
-      bool no1DArrayAccesses(params Expression[] exprs) {
-        return exprs.All(e => Check<SeqSelectExpr>(e, sse => !sse.Seq.Type.IsArrayType)); // allow sequence accesses
-      }
-
-      bool noMultiDArrayAccesses(params Expression[] exprs) {
-        return exprs.All(e => Check<MultiSelectExpr>(e, _ => false));
-      }
-
-      bool noFieldAccesses(MemberDecl member, params Expression[] exprs) {
-        return exprs.All(e => Check<MemberSelectExpr>(e, mse => mse.Member != member));
-      }
-
-      bool isVar(BoundVar var, Expression expr) {
-        return expr.Resolved is IdentifierExpr ie && ie.Var == var;
-      }
-
-      bool indexIsAlwaysVar(BoundVar var, params Expression[] exprs) {
-        return exprs.All(e => Check<SeqSelectExpr>(e, sse2 => sse2.SelectOne && isVar(var, sse2.E0)));
-      }
-
-      bool accessedObjectIsAlwaysVar(MemberDecl member, BoundVar var, params Expression[] exprs) {
-        return exprs.All(e => Check<MemberSelectExpr>(e, mse => mse.Member != member || isVar(var, mse.Obj)));
-      }
-    }
-
-    /// <summary>
-    /// Check all of the given expression's subexpressions of a given type
-    /// using a predicate.  Returns true only if the predicate returns true for
-    /// all subexpressions of type <typeparamref name="E"/>.
-    /// </summary>
-    private static bool Check<E>(Expression e, Predicate<E> pred) where E : Expression {
-      var checker = new Checker<E>(pred);
-      checker.Visit(e, null);
-      return checker.Passing;
-    }
-
-    private class Checker<E> : TopDownVisitor<object> where E : Expression {
-      private readonly Predicate<E> Pred;
-      public bool Passing = true;
-
-      public Checker(Predicate<E> pred) {
-        Pred = pred;
-      }
-
-      protected override bool VisitOneExpr(Expression expr, ref object st) {
-        if (expr is E e && !Pred(e)) {
-          Passing = false;
-          return false;
-        } else {
-          return true;
-        }
-      }
-    }
-
-    private void TrAssignSuchThat(List<IVariable> lhss, Expression constraint, List<ComprehensionExpr.BoundedPool> bounds, int debuginfoLine, ConcreteSyntaxTree wr, bool inLetExprBody) {
-      Contract.Requires(lhss != null);
-      Contract.Requires(constraint != null);
-      Contract.Requires(bounds != null);
-      // For "i,j,k,l :| R(i,j,k,l);", emit something like:
-      //
-      // for (BigInteger iterLimit = 5; ; iterLimit *= 2) {
-      //   var il$0 = iterLimit;
-      //   foreach (L l' in sq.Elements) { l = l';
-      //     if (il$0 == 0) { break; }  il$0--;
-      //     var il$1 = iterLimit;
-      //     foreach (K k' in st.Elements) { k = k';
-      //       if (il$1 == 0) { break; }  il$1--;
-      //       var il$2 = iterLimit;
-      //       j = Lo;
-      //       for (;; j++) {
-      //         if (il$2 == 0) { break; }  il$2--;
-      //         foreach (bool i' in Helper.AllBooleans) { i = i';
-      //           if (R(i,j,k,l)) {
-      //             goto ASSIGN_SUCH_THAT_<id>;
-      //           }
-      //         }
-      //       }
-      //     }
-      //   }
-      // }
-      // throw new Exception("assign-such-that search produced no value"); // a verified program never gets here; however, we need this "throw" to please the C# compiler
-      // ASSIGN_SUCH_THAT_<id>: ;
-      //
-      // where the iterLimit loop can be omitted if lhss.Count == 1 or if all bounds are finite.  Further optimizations could be done, but
-      // are omitted for now.
-      //
-      var n = lhss.Count;
-      Contract.Assert(bounds.Count == n);
-      var c = ProtectedFreshNumericId("_ASSIGN_SUCH_THAT_+_iterLimit_");
-      var doneLabel = "_ASSIGN_SUCH_THAT_" + c;
-      var iterLimit = "_iterLimit_" + c;
-
-      bool needIterLimit = lhss.Count != 1 && bounds.Exists(bnd => (bnd.Virtues & ComprehensionExpr.BoundedPool.PoolVirtues.Finite) == 0);
-      wr = CreateLabeledCode(doneLabel, false, wr);
-      var wrOuter = wr;
-      if (needIterLimit) {
-        wr = CreateDoublingForLoop(iterLimit, 5, wr);
-      }
-
-      for (int i = 0; i < n; i++) {
-        var bound = bounds[i];
-        Contract.Assert((bound.Virtues & ComprehensionExpr.BoundedPool.PoolVirtues.Enumerable) != 0);  // if we have got this far, it must be an enumerable bound
-        var bv = lhss[i];
-        if (needIterLimit) {
-          DeclareLocalVar(string.Format("{0}_{1}", iterLimit, i), null, null, false, iterLimit, wr, Type.Int);
-        }
-        var tmpVar = ProtectedFreshId("_assign_such_that_");
-        var wStmts = wr.Fork();
-        var elementType = CompileCollection(bound, bv, inLetExprBody, true, null, out var collection, wStmts);
-        wr = CreateGuardedForeachLoop(tmpVar, elementType, bv, false, inLetExprBody, bv.Tok, collection, wr);
-        if (needIterLimit) {
-          var varName = $"{iterLimit}_{i}";
-          var thn = EmitIf(out var isZeroWriter, false, wr);
-          EmitIsZero(varName, isZeroWriter);
-          EmitBreak(null, thn);
-          EmitDecrementVar(varName, wr);
-        }
-      }
-
-      copyInstrWriters.Push(wr.Fork());
-      var wStmtsIf = wr.Fork();
-      var wBody = EmitIf(out var guardWriter, false, wr);
-      EmitExpr(constraint, inLetExprBody, guardWriter, wStmtsIf);
-      EmitBreak(doneLabel, wBody);
-      copyInstrWriters.Pop();
-
-      // Java compiler throws unreachable error when absurd statement is written after unbounded for-loop, so we don't write it then.
-      EmitAbsurd(string.Format("assign-such-that search produced no value (line {0})", debuginfoLine), wrOuter, needIterLimit);
-    }
-
-    protected interface ILvalue {
-      void EmitRead(ConcreteSyntaxTree wr);
-
-      /// Write an assignment expression (or equivalent) for the lvalue,
-      /// returning a TargetWriter for the RHS.  IMPORTANT: Whoever calls
-      /// EmitWrite is responsible for making the types match up (as by
-      /// EmitCoercionIfNecessary), for example by going through the overload
-      /// of EmitAssignment that takes an ILvalue.
-      ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr);
-    }
-
-    protected ILvalue SimpleLvalue(Action<ConcreteSyntaxTree> action) {
-      return new SimpleLvalueImpl(this, action);
-    }
-
-    protected ILvalue SimpleLvalue(Action<ConcreteSyntaxTree> lvalueAction, Action<ConcreteSyntaxTree> rvalueAction) {
-      return new SimpleLvalueImpl(this, lvalueAction, rvalueAction);
-    }
-
-    protected ILvalue VariableLvalue(IVariable var) {
-      return IdentLvalue(IdName(var));
-    }
-
-    protected virtual ILvalue IdentLvalue(string var) {
-      return StringLvalue(var);
-    }
-
-    protected virtual ILvalue SeqSelectLvalue(SeqSelectExpr ll, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var arr = StabilizeExpr(ll.Seq, "_arr", wr, wStmts);
-      var index = StabilizeExpr(ll.E0, "_index", wr, wStmts);
-      if (ll.Seq.Type.IsArrayType || ll.Seq.Type.AsSeqType != null) {
-        index = ArrayIndexToNativeInt(index, ll.E0.Type);
-      }
-      return new ArrayLvalueImpl(this, arr, new List<string>() { index }, ll.Type);
-    }
-
-    protected virtual ILvalue MultiSelectLvalue(MultiSelectExpr ll, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      string arr = StabilizeExpr(ll.Array, "_arr", wr, wStmts);
-      var indices = new List<string>();
-      int i = 0;
-      foreach (var idx in ll.Indices) {
-        var index = StabilizeExpr(idx, "_index" + i + "_", wr, wStmts);
-        index = ArrayIndexToNativeInt(index, idx.Type);
-        indices.Add(index);
-        i++;
-      }
-      return new ArrayLvalueImpl(this, arr, indices, ll.Type);
-    }
-
-    protected ILvalue StringLvalue(string str) {
-      return new SimpleLvalueImpl(this, wr => wr.Write(str));
-    }
-
-    protected ILvalue SuffixLvalue(Action<ConcreteSyntaxTree> action, string str, params object[] args) {
-      return new SimpleLvalueImpl(this, wr => { action(wr); wr.Write(str, args); });
-    }
-
-    protected ILvalue EnclosedLvalue(string prefix, Action<ConcreteSyntaxTree> action, string suffixStr, params object[] suffixArgs) {
-      return new SimpleLvalueImpl(this, wr => { wr.Write(prefix); action(wr); wr.Write(suffixStr, suffixArgs); });
-    }
-
-    protected ILvalue CoercedLvalue(ILvalue lvalue, Type/*?*/ from, Type/*?*/ to) {
-      return new CoercedLvalueImpl(this, lvalue, from, to);
-    }
-
-    protected ILvalue GetterSetterLvalue(Action<ConcreteSyntaxTree> obj, string getterName, string setterName) {
-      Contract.Requires(obj != null);
-      Contract.Requires(getterName != null);
-      Contract.Requires(setterName != null);
-      return new GetterSetterLvalueImpl(obj, getterName, setterName);
-    }
-
-    private class SimpleLvalueImpl : ILvalue {
-      private readonly SinglePassCompiler Compiler;
-      private readonly Action<ConcreteSyntaxTree> LvalueAction, RvalueAction;
-
-      public SimpleLvalueImpl(SinglePassCompiler compiler, Action<ConcreteSyntaxTree> action) {
-        Compiler = compiler;
-        LvalueAction = action;
-        RvalueAction = action;
-      }
-
-      public SimpleLvalueImpl(SinglePassCompiler compiler, Action<ConcreteSyntaxTree> lvalueAction, Action<ConcreteSyntaxTree> rvalueAction) {
-        Compiler = compiler;
-        LvalueAction = lvalueAction;
-        RvalueAction = rvalueAction;
-      }
-
-      public void EmitRead(ConcreteSyntaxTree wr) {
-        RvalueAction(wr);
-      }
-
-      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
-        Compiler.EmitAssignment(out var wLhs, null, out var wRhs, null, wr);
-        LvalueAction(wLhs);
-        return wRhs;
-      }
-    }
-
-    private class CoercedLvalueImpl : ILvalue {
-      private readonly SinglePassCompiler Compiler;
-      private readonly ILvalue lvalue;
-      private readonly Type /*?*/ from;
-      private readonly Type /*?*/ to;
-
-      public CoercedLvalueImpl(SinglePassCompiler compiler, ILvalue lvalue, Type/*?*/ from, Type/*?*/ to) {
-        Compiler = compiler;
-        this.lvalue = lvalue;
-        this.from = from;
-        this.to = to;
-      }
-
-      public void EmitRead(ConcreteSyntaxTree wr) {
-        wr = Compiler.EmitCoercionIfNecessary(from, to, Token.NoToken, wr);
-        lvalue.EmitRead(wr);
-      }
-
-      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
-        return lvalue.EmitWrite(wr);
-      }
-    }
-
-    private class GetterSetterLvalueImpl : ILvalue {
-      private readonly Action<ConcreteSyntaxTree> obj;
-      private readonly string getterName;
-      private readonly string setterName;
-
-      public GetterSetterLvalueImpl(Action<ConcreteSyntaxTree> obj, string getterName, string setterName) {
-        this.obj = obj;
-        this.getterName = getterName;
-        this.setterName = setterName;
-      }
-
-      public void EmitRead(ConcreteSyntaxTree wr) {
-        obj(wr);
-        wr.Write($".{getterName}()");
-      }
-
-      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
-        obj(wr);
-        wr.Write($".{setterName}(");
-        var w = wr.Fork();
-        wr.WriteLine(");");
-        return w;
-      }
-    }
-
-    private class ArrayLvalueImpl : ILvalue {
-      private readonly SinglePassCompiler compiler;
-      private readonly string array;
-      private readonly List<string> indices;
-      private readonly Type lhsType;
-
-      /// <summary>
-      /// The "indices" are expected to already be of the native array-index type.
-      /// </summary>
-      public ArrayLvalueImpl(SinglePassCompiler compiler, string array, List<string> indices, Type lhsType) {
-        this.compiler = compiler;
-        this.array = array;
-        this.indices = indices;
-        this.lhsType = lhsType;
-      }
-
-      public void EmitRead(ConcreteSyntaxTree wr) {
-        var wrArray = compiler.EmitArraySelect(indices, lhsType, wr);
-        wrArray.Write(array);
-      }
-
-      public ConcreteSyntaxTree EmitWrite(ConcreteSyntaxTree wr) {
-        var (wrArray, wrRhs) = compiler.EmitArrayUpdate(indices, lhsType, wr);
-        wrArray.Write(array);
-        compiler.EndStmt(wr);
-        return wrRhs;
-      }
-    }
-
-    ILvalue CreateLvalue(Expression lhs, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Requires(lhs != null);
-      Contract.Requires(wr != null);
-
-      lhs = lhs.Resolved;
-      if (lhs is IdentifierExpr) {
-        var ll = (IdentifierExpr)lhs;
-        return VariableLvalue(ll.Var);
-      } else if (lhs is MemberSelectExpr) {
-        var ll = (MemberSelectExpr)lhs;
-        Contract.Assert(!ll.Member.IsInstanceIndependentConstant);  // instance-independent const's don't have assignment statements
-        var writeStabilized = EmitStabilizedExpr(ll.Obj, "_obj", wr, wStmts);
-        var typeArgs = TypeArgumentInstantiation.ListFromMember(ll.Member, null, ll.TypeApplication_JustMember);
-        return EmitMemberSelect(writeStabilized, ll.Obj.Type, ll.Member, typeArgs, ll.TypeArgumentSubstitutionsWithParents(), lhs.Type,
-          internalAccess: enclosingMethod is Constructor);
-
-      } else if (lhs is SeqSelectExpr) {
-        var ll = (SeqSelectExpr)lhs;
-        return SeqSelectLvalue(ll, wr, wStmts);
-      } else {
-        var ll = (MultiSelectExpr)lhs;
-        return MultiSelectLvalue(ll, wr, wStmts);
-      }
-    }
-
-    private Action<ConcreteSyntaxTree> EmitStabilizedExpr(Expression e, string prefix, ConcreteSyntaxTree surrounding, ConcreteSyntaxTree wStmts) {
-      if (IsStableExpr(e)) {
-        return outWr => TrParenExpr(e, outWr, false, wStmts);
-      } else {
-        var v = ProtectedFreshId(prefix);
-        DeclareLocalVar(v, null, null, e, false, surrounding);
-        return outWr => EmitIdentifier(v, outWr);
-      }
-    }
-
-    /// <summary>
-    /// If the given expression's value is stable, translate it and return the
-    /// string form.  Otherwise, output code to evaluate the expression, then
-    /// return a fresh variable bound to its value.
-    /// </summary>
-    /// <param name="e">An expression to evaluate</param>
-    /// <param name="prefix">The prefix to give the fresh variable, if
-    /// needed.</param>
-    /// <param name="wr">A writer in a position to write statements
-    /// evaluating the expression</param>
-    /// <returns>A string giving the translated value as a stable
-    /// expression</returns>
-    /// <seealso cref="IsStableExpr"/>
-    private string StabilizeExpr(Expression e, string prefix, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      var localWr = new ConcreteSyntaxTree();
-      EmitStabilizedExpr(e, prefix, wr, wStmts)(localWr);
-      return localWr.ToString();
-    }
-
-    /// <summary>
-    /// Returns whether the given expression is <em>stable</em>, that is,
-    /// whether its value is fixed over the course of the evaluation of an
-    /// expression.  Note that anything that could be altered by a function call
-    /// (say, the value of a non-constant field) is unstable.
-    /// </summary>
-    private bool IsStableExpr(Expression e) {
-      if (e is IdentifierExpr || e is ThisExpr || e is LiteralExpr) {
-        return true;
-      } else if (e is MemberSelectExpr mse) {
-        if (!IsStableExpr(mse.Obj)) {
-          return false;
-        }
-        var member = mse.Member;
-        if (member is ConstantField) {
-          return true;
-        } else if (member is SpecialField sf) {
-          switch (sf.SpecialId) {
-            case SpecialField.ID.ArrayLength:
-            case SpecialField.ID.ArrayLengthInt:
-            case SpecialField.ID.Floor:
-            case SpecialField.ID.IsLimit:
-            case SpecialField.ID.IsSucc:
-            case SpecialField.ID.Offset:
-            case SpecialField.ID.IsNat:
-            case SpecialField.ID.Keys:
-            case SpecialField.ID.Values:
-            case SpecialField.ID.Items:
-              return true;
-            default:
-              return false;
-          }
-        } else {
-          return false;
-        }
-      } else if (e is ConcreteSyntaxExpression cse) {
-        return IsStableExpr(cse.ResolvedExpression);
-      } else {
-        return false;
-      }
-    }
-
-    /// <summary>
-    /// Translate the right-hand side of an assignment.
-    /// </summary>
-    /// <param name="rhs">The RHS to translate</param>
-    /// <param name="wr">The writer at the position for the translated RHS</param>
-    /// <param name="wStmts">A writer at an earlier position where extra statements may be written</param>
-    void TrRhs(AssignmentRhs rhs, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Requires(!(rhs is HavocRhs));
-      Contract.Requires(wr != null);
-
-      var typeRhs = rhs as TypeRhs;
-
-      if (typeRhs == null) {
-        var eRhs = (ExprRhs)rhs; // it's not HavocRhs (by the precondition) or TypeRhs (by the "if" test), so it's gotta be ExprRhs
-        EmitExpr(eRhs.Expr, false, wr, wStmts);
-
-      } else if (typeRhs.ArrayDimensions != null) {
-        var nw = ProtectedFreshId("_nw");
-        TrRhsArray(typeRhs, nw, wr, wStmts);
-        EmitIdentifier(nw, wr);
-
-      } else {
-        // Allocate and initialize a new object
-        var nw = ProtectedFreshId("_nw");
-        var wRhs = DeclareLocalVar(nw, typeRhs.Type, rhs.Tok, wStmts);
-        var constructor = typeRhs.InitCall?.Method as Constructor;
-        EmitNew(typeRhs.EType, typeRhs.Tok, constructor != null ? typeRhs.InitCall : null, wRhs, wStmts);
-        // Proceed with initialization
-        if (typeRhs.InitCall != null) {
-          if (constructor != null && constructor.IsExtern(Options, out _, out _)) {
-            // initialization was done at the time of allocation
-          } else {
-            var wrBefore = wStmts.Fork();
-            var wrCall = wStmts.Fork();
-            var wrAfter = wStmts;
-            TrCallStmt(typeRhs.InitCall, nw, wrCall, wrBefore, wrAfter);
-          }
-        }
-        // Assign to the final LHS
-        EmitIdentifier(nw, wr);
-      }
-    }
-
-    /// <summary>
-    /// Translate the right-hand side of an assignment.
-    /// </summary>
-    /// <param name="rhs">The RHS to translate</param>
-    /// <param name="nw">Name of the variable to hold the array to be allocated</param>
-    /// <param name="wr">The writer at the position for the translated RHS</param>
-    /// <param name="wStmts">A writer at an earlier position where extra statements may be written</param>
-    void TrRhsArray(TypeRhs typeRhs, string nw, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      Contract.Requires(typeRhs.ArrayDimensions != null);
-
-      if (typeRhs.ElementInit == null &&
-          (typeRhs.InitDisplay == null || typeRhs.InitDisplay.Count == 0)) {
-        // This is either
-        //   * an array with an auto-init element type, where no other initialization is given, or
-        //   * a 0-length array (as evidenced by the given 0-length .InitDisplay or as confirmed by the verifier for a non-auto-init element type).
-        var pwStmts = wStmts.Fork();
-        var wRhs = DeclareLocalVar(nw, typeRhs.Type, typeRhs.Tok, wStmts);
-        EmitNewArray(typeRhs.EType, typeRhs.Tok, typeRhs.ArrayDimensions,
-          typeRhs.EType.HasCompilableValue && !DatatypeWrapperEraser.CanBeLeftUninitialized(Options, typeRhs.EType),
-          null, wRhs, pwStmts);
-        return;
-      }
-
-      if (typeRhs.ElementInit == null) {
-        Contract.Assert((typeRhs.InitDisplay != null && typeRhs.InitDisplay.Count != 0) || DatatypeWrapperEraser.CanBeLeftUninitialized(Options, typeRhs.EType));
-
-        string nwElement0;
-        if (DeterminesArrayTypeFromExampleElement) {
-          // We use the first element of the array as an "example" for the array to be allocated
-          nwElement0 = ProtectedFreshId("_nwElement0_");
-          var wrElement0 = DeclareLocalVar(nwElement0, typeRhs.EType, typeRhs.InitDisplay[0].tok, wStmts);
-          EmitExpr(typeRhs.InitDisplay[0], false, wrElement0, wStmts);
-        } else {
-          nwElement0 = null;
-        }
-
-        var pwStmts = wStmts.Fork();
-        var wRhs = DeclareLocalVar(nw, typeRhs.Type, typeRhs.Tok, wStmts);
-        EmitNewArray(typeRhs.EType, typeRhs.Tok, typeRhs.ArrayDimensions, false, nwElement0, wRhs, pwStmts);
-
-        var ii = 0;
-        foreach (var v in typeRhs.InitDisplay) {
-          pwStmts = wStmts.Fork();
-          var (wArray, wElement) = EmitArrayUpdate(new List<string> { ii.ToString() }, v.Type, wStmts);
-          if (ii == 0 && nwElement0 != null) {
-            wElement.Write(nwElement0);
-          } else {
-            EmitExpr(v, false, wElement, pwStmts);
-          }
-          wArray.Write(nw);
-          EndStmt(wStmts);
-          ii++;
-        }
-
-      } else if (DeterminesArrayTypeFromExampleElement) {
-        // For a 3-dimensional array allocation
-        //     m := new X[e0, e1, e2](InitFunction);
-        // generate:
-        //     var _len0 := e0;
-        //     var _len1 := e1;
-        //     var _len2 := e2;
-        //     var _nw;
-        //     if e0 == 0 || e1 == 0 || e2 == 0 {
-        //       _nw := NewArray(X, _len0, _len1, _len2);
-        //     } else {
-        //       var _init := InitFunction;
-        //       var _element0 := _init(0, 0, 0);
-        //       _nw := NewArrayFromExample(X, _element0, _len0, _len1, _len2);
-        //       ArrayUpdate(_nw, _element0, 0, 0, 0);
-        //       var _nativeLen0 := IntToArrayIndex(_len0);
-        //       var _nativeLen1 := IntToArrayIndex(_len1);
-        //       var _nativeLen2 := IntToArrayIndex(_len2);
-        //       var _start := 1;
-        //       for (var _i0 := 0; _i0 < _nativeLen0; _i0++) {
-        //         for (var _i1 := 0; _i1 < _nativeLen1; _i1++) {
-        //           for (var _i2 := _start; _i2 < _nativeLen2; _i2++) {
-        //             ArrayUpdate(_nw, _init(_i0, _i1, _i2), _i0, _i1, _i2);
-        //           }
-        //           _start := 0; // omit, if there's only one dimension
-        //         }
-        //       }
-        //     }
-        // Put the array dimensions into local variables
-        var dimNames = new List<string>();
-        for (var d = 0; d < typeRhs.ArrayDimensions.Count; d++) {
-          var dim = typeRhs.ArrayDimensions[d];
-          var dimName = ProtectedFreshId($"_len{d}_");
-          dimNames.Add(dimName);
-          var wrDim = DeclareLocalVar(dimName, Type.Int, dim.tok, wStmts);
-          wrDim = ExprToInt(dim.Type, wrDim);
-          EmitExpr(dim, false, wrDim, wStmts);
-        }
-
-        // Declare the _nw variable
-        DeclareLocalVar(nw, typeRhs.Type, typeRhs.Tok, false, null, wStmts);
-
-        // Generate if statement
-        var wThen = EmitIf(out var guardWriter, true, wStmts);
-        for (var d = 0; d < typeRhs.ArrayDimensions.Count; d++) {
-          if (d != 0) {
-            guardWriter.Write(" || ");
-          }
-          EmitIsZero(dimNames[d], guardWriter);
-        }
-        var wRhs = new ConcreteSyntaxTree();
-        EmitNewArray(typeRhs.EType, typeRhs.Tok, dimNames, false, null, wRhs, wThen);
-        EmitAssignment(nw, typeRhs.Type, wRhs.ToString(), typeRhs.Type, wThen);
-
-        var wElse = EmitBlock(wStmts);
-
-        // Put the array-initializing function into a local variable
-        string init = ProtectedFreshId("_init");
-        DeclareLocalVar(init, typeRhs.ElementInit.Type, typeRhs.ElementInit.tok, typeRhs.ElementInit, false, wElse);
-
-        // var _element0 := _init(0, 0, 0);
-        var initFunctionType = typeRhs.ElementInit.Type.AsArrowType;
-        Contract.Assert(initFunctionType != null && initFunctionType.Arity == typeRhs.ArrayDimensions.Count);
-        var element0 = ProtectedFreshId($"_element0_");
-        wRhs = DeclareLocalVar(element0, null, typeRhs.Tok, wElse);
-        wRhs.Write("{0}{1}({2})", init, LambdaExecute, initFunctionType.Args.Comma(argumentType => {
-          var zero = Expression.CreateIntLiteral(typeRhs.Tok, 0, argumentType);
-          return Expr(zero, false, wElse).ToString();
-        }));
-
-        // _nw := NewArrayFromExample(X, _element0, _len0, _len1, _len2);
-        wRhs = new ConcreteSyntaxTree();
-        EmitNewArray(typeRhs.EType, typeRhs.Tok, dimNames, false, element0, wRhs, wElse);
-        EmitAssignment(nw, typeRhs.Type, wRhs.ToString(), typeRhs.Type, wElse);
-
-        // _nw[0, 0, 0] := _element0;
-        var indices = Util.Map(Enumerable.Range(0, typeRhs.ArrayDimensions.Count), _ => ArrayIndexLiteral(0));
-        var (wArray, wrRhs) = EmitArrayUpdate(indices, typeRhs.EType, wElse);
-        wrRhs.Write(element0);
-        wArray.Write(nw);
-        EndStmt(wElse);
-
-        // Compute native array dimensions
-        var nativeDimNames = new List<string>();
-        for (var d = 0; d < typeRhs.ArrayDimensions.Count; d++) {
-          var dim = typeRhs.ArrayDimensions[d];
-          var nativeDimName = ProtectedFreshId($"_nativeLen{d}_");
-          nativeDimNames.Add(nativeDimName);
-          var wrDim = DeclareLocalVar(nativeDimName, null, dim.tok, wElse);
-          wrDim.Write(ArrayIndexToNativeInt(dimNames[d], Type.Int));
-        }
-
-        // var _start := 1;
-        string startName;
-        if (typeRhs.ArrayDimensions.Count == 1) {
-          startName = ArrayIndexLiteral(1);
-        } else {
-          startName = ProtectedFreshId($"_start");
-          DeclareLocalVar(startName, null, typeRhs.Tok, false, ArrayIndexLiteral(1), wElse);
-        }
-
-        // Build a nested loop that will call the initializer for all indices
-        indices = Util.Map(Enumerable.Range(0, typeRhs.ArrayDimensions.Count), ii => ProtectedFreshId($"_i{ii}_"));
-        var w = wElse;
-        for (var d = 0; d < typeRhs.ArrayDimensions.Count; d++) {
-          var innerMostLoop = d == typeRhs.ArrayDimensions.Count - 1;
-          var wLoopBody = CreateForLoop(indices[d], nativeDimNames[d], w, innerMostLoop ? startName : null);
-          if (typeRhs.ArrayDimensions.Count != 1 && innerMostLoop) {
-            EmitAssignment(startName, Type.Int, ArrayIndexLiteral(0), Type.Int, w);
-          }
-          w = wLoopBody;
-        }
-        (wArray, wrRhs) = EmitArrayUpdate(indices, typeRhs.EType, w);
-        wrRhs.Write("{0}{1}({2})", init, LambdaExecute, Enumerable.Range(0, indices.Count).Comma(idx => ArrayIndexToInt(indices[idx])));
-        wArray.Write(nw);
-        EndStmt(w);
-
-      } else {
-        // For a 3-dimensional array allocation
-        //     m := new X[e0, e1, e2](InitFunction);
-        // generate:
-        //     var _init := InitFunction;
-        //     var _nw := NewArray(X, e0, e1, e2);
-        //     for (var _i0 := 0; _i0 < _nw.Length0; _i0++) {
-        //       for (var _i1 := 0; _i1 < _nw.Length1; _i1++) {
-        //         for (var _i2 := 0; _i2 < _nw.Length2; _i2++) {
-        //           ArrayUpdate(_nw, _init(_i0, _i1, _i2), _i0, _i1, _i2);
-        //         }
-        //       }
-        //     }
-
-        // Put the array-initializing function into a local variable
-        string init = ProtectedFreshId("_init");
-        DeclareLocalVar(init, typeRhs.ElementInit.Type, typeRhs.ElementInit.tok, typeRhs.ElementInit, false, wStmts);
-
-        var pwStmts = wStmts.Fork();
-        var wRhs = DeclareLocalVar(nw, typeRhs.Type, typeRhs.Tok, wStmts);
-        EmitNewArray(typeRhs.EType, typeRhs.Tok, typeRhs.ArrayDimensions, false, null, wRhs, pwStmts);
-
-        // Build a nested loop that will call the initializer for all indices
-        var indices = Util.Map(Enumerable.Range(0, typeRhs.ArrayDimensions.Count), ii => ProtectedFreshId($"_i{ii}_"));
-        var w = wStmts;
-        for (var d = 0; d < typeRhs.ArrayDimensions.Count; d++) {
-          GetSpecialFieldInfo(SpecialField.ID.ArrayLength, typeRhs.ArrayDimensions.Count == 1 ? null : d, typeRhs.Type,
-            out var len, out var pre, out var post);
-          var bound = $"{pre}{nw}{(len == "" ? "" : "." + len)}{post}";
-          w = CreateForLoop(indices[d], bound, w);
-        }
-        var (wArray, wrRhs) = EmitArrayUpdate(indices, typeRhs.EType, w);
-        wrRhs = EmitCoercionIfNecessary(TypeForCoercion(typeRhs.EType), typeRhs.EType, typeRhs.Tok, wrRhs);
-        wrRhs.Write("{0}{1}({2})", init, LambdaExecute, indices.Comma(idx => ArrayIndexToInt(idx)));
-        wArray.Write(nw);
-        EndStmt(w);
-      }
-    }
-
-    private static Type TypeOfLhs(Expression lhs) {
-      Contract.Requires(lhs != null);
-      if (lhs is IdentifierExpr) {
-        var e = (IdentifierExpr)lhs;
-        return e.Var.Type;
-      } else if (lhs is MemberSelectExpr) {
-        var e = (MemberSelectExpr)lhs;
-        return ((Field)e.Member).Type.Subst(e.TypeArgumentSubstitutionsWithParents());
-      } else if (lhs is SeqSelectExpr) {
-        var e = (SeqSelectExpr)lhs;
-        return e.Seq.Type.NormalizeExpand().TypeArgs[0];
-      } else {
-        var e = (MultiSelectExpr)lhs;
-        return e.Array.Type.NormalizeExpand().TypeArgs[0];
-      }
-    }
-
-    // to do: Make Type an abstract property of AssignmentRhs.  Unfortunately, this would first require convincing Microsoft that it makes sense for a base class to have a property that's only settable in some subclasses.  Until then, let it be known that Java's "properties" (i.e. getter/setter pairs) are more powerful >:-)
-    private static Type TypeOfRhs(AssignmentRhs rhs) {
-      if (rhs is TypeRhs tRhs) {
-        return tRhs.Type;
-      } else if (rhs is ExprRhs eRhs) {
-        return eRhs.Expr.Type;
-      } else {
-        return null;
-      }
-    }
-
-    protected virtual void TrCallStmt(CallStmt s, string receiverReplacement, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts, ConcreteSyntaxTree wStmtsAfterCall) {
-      Contract.Requires(s != null);
-      Contract.Assert(s.Method != null);  // follows from the fact that stmt has been successfully resolved
-
-      if (s.Method == enclosingMethod && enclosingMethod.IsTailRecursive) {
-        // compile call as tail-recursive
-        TrTailCallStmt(s.Tok, s.Method, s.Receiver, s.Args, receiverReplacement, wr);
-      } else {
-        // compile call as a regular call
-        var lvalues = new List<ILvalue>();  // contains an entry for each non-ghost formal out-parameter, but the entry is null if the actual out-parameter is ghost
-        Contract.Assert(s.Lhs.Count == s.Method.Outs.Count);
-        for (int i = 0; i < s.Method.Outs.Count; i++) {
-          Formal p = s.Method.Outs[i];
-          if (!p.IsGhost) {
-            var lhs = s.Lhs[i].Resolved;
-            if (lhs is IdentifierExpr lhsIE && lhsIE.Var.IsGhost) {
-              lvalues.Add(null);
-            } else if (lhs is MemberSelectExpr lhsMSE && lhsMSE.Member.IsGhost) {
-              lvalues.Add(null);
-            } else {
-              lvalues.Add(CreateLvalue(s.Lhs[i], wStmts, wStmts));
-            }
-          }
-        }
-        var outTmps = new List<string>();  // contains a name for each non-ghost formal out-parameter
-        var outTypes = new List<Type>();  // contains a type for each non-ghost formal out-parameter
-        var outFormalTypes = new List<Type>(); // contains the type as it appears in the method type (possibly includes type parameters)
-        var outLhsTypes = new List<Type>(); // contains the type as it appears on the LHS (may give types for those parameters)
-        for (int i = 0; i < s.Method.Outs.Count; i++) {
-          Formal p = s.Method.Original.Outs[i];
-          if (!p.IsGhost) {
-            string target = ProtectedFreshId("_out");
-            outTmps.Add(target);
-            var instantiatedType = p.Type.Subst(s.MethodSelect.TypeArgumentSubstitutionsWithParents());
-            Type type;
-            if (NeedsCastFromTypeParameter && IsCoercionNecessary(p.Type, instantiatedType)) {
-              //
-              // The type of the parameter will differ from the LHS type in a
-              // situation like this:
-              //
-              //   method Gimmie<R(0)>() returns (r: R) { }
-              //
-              //   var a : int := Gimmie();
-              //
-              // The method Gimme will be compiled down to Go (or JavaScript)
-              // as a function which returns any value (some details omitted):
-              //
-              //   func Gimmie(ty _dafny.Type) any {
-              //     return ty.Default()
-              //   }
-              //
-              // If we naively translate, we get a type error:
-              //
-              //   var lhs int = Gimmie(_dafny.IntType) // error!
-              //
-              // Fortunately, we have the information at hand to do better.  The
-              // LHS does have the actual final type (int in this case), and the
-              // out parameter on the method tells us the compiled type
-              // returned.  Therefore what we want to do is this:
-              //
-              //   var lhs dafny.Int
-              //   var _out any
-              //
-              //   _out = Gimmie(dafny.IntType)
-              //
-              //   lhs = _out.(int) // type cast
-              //
-              // All we have to do now is declare the out variable with the type
-              // from the parameter; later we'll do the type cast.
-              //
-              // None of this is necessary if the language supports parametric
-              // functions to begin with (C#) or has dynamic typing so none of
-              // this comes up (JavaScript), so we only do this if
-              // NeedsCastFromTypeParameter is on.
-              //
-              // This used to just assign p.Type to type, but that was something of a hack
-              // that didn't work in all cases: if p.Type is indeed a type parameter,
-              // it won't be in scope on the caller side. That means you can't generally
-              // declare a local variable with that type; it happened to work for Go
-              // because it would just use interface{}, but Java would try to use the type
-              // parameter directly. The TypeForCoercion() hook was added as a place to
-              // explicitly swap in a target-language type such as java.lang.Object.
-              type = TypeForCoercion(p.Type);
-            } else {
-              type = instantiatedType;
-            }
-
-            outTypes.Add(type);
-            outFormalTypes.Add(p.Type);
-            outLhsTypes.Add(s.Lhs[i].Type);
-            DeclareLocalVar(target, type, s.Lhs[i].tok, false, null, wStmts);
-          }
-        }
-        Contract.Assert(lvalues.Count == outTmps.Count);
-
-        bool customReceiver = !(s.Method.EnclosingClass is TraitDecl) && NeedsCustomReceiver(s.Method);
-        Contract.Assert(receiverReplacement == null || !customReceiver);  // What would be done in this case? It doesn't ever happen, right?
-
-        var returnStyleOuts = UseReturnStyleOuts(s.Method, outTmps.Count);
-        var returnStyleOutCollector = outTmps.Count > 1 && returnStyleOuts && !SupportsMultipleReturns ? ProtectedFreshId("_outcollector") : null;
-        if (returnStyleOutCollector != null) {
-          DeclareSpecificOutCollector(returnStyleOutCollector, wr, outFormalTypes, outLhsTypes);
-        } else if (outTmps.Count > 0 && returnStyleOuts) {
-          EmitCallReturnOuts(outTmps, wr);
-        }
-        var wrOrig = wr;
-        if (returnStyleOutCollector == null && outTmps.Count == 1 && returnStyleOuts) {
-          var instantiatedFromType = outFormalTypes[0].Subst(s.MethodSelect.TypeArgumentSubstitutionsWithParents());
-          var toType = outTypes[0];
-          wr = EmitDowncastIfNecessary(instantiatedFromType, toType, s.Tok, wr);
-        }
-        var protectedName = receiverReplacement == null && customReceiver ? CompanionMemberIdName(s.Method) : IdName(s.Method);
-        if (receiverReplacement != null) {
-          EmitIdentifier(IdProtect(receiverReplacement), wr);
-          wr.Write(ClassAccessor);
-        } else if (customReceiver) {
-          EmitTypeName_Companion(s.Receiver.Type, wr, wr, s.Tok, s.Method);
-          wr.Write(ClassAccessor);
-        } else if (!s.Method.IsStatic) {
-          wr.Write("(");
-          var wReceiver = wr;
-          if (s.Method.EnclosingClass is TraitDecl traitDecl && s.Receiver.Type.AsTraitType != traitDecl) {
-            wReceiver = EmitCoercionIfNecessary(s.Receiver.Type, UserDefinedType.UpcastToMemberEnclosingType(s.Receiver.Type, s.Method), s.Tok, wr);
-          }
-          EmitExpr(s.Receiver, false, wReceiver, wStmts);
-          wr.Write($"){ClassAccessor}");
-        } else if (s.Method.IsExtern(Options, out var qual, out var compileName) && qual != null) {
-          wr.Write("{0}{1}", qual, ModuleSeparator);
-          protectedName = compileName;
-        } else {
-          EmitTypeName_Companion(s.Receiver.Type, wr, wr, s.Tok, s.Method);
-          wr.Write(ModuleSeparator);
-        }
-        var typeArgs = CombineAllTypeArguments(s.Method, s.MethodSelect.TypeApplication_AtEnclosingClass, s.MethodSelect.TypeApplication_JustMember);
-        EmitNameAndActualTypeArgs(protectedName, TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, s.Method, false)), s.Tok, wr);
-        wr.Write("(");
-        var sep = "";
-        EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, s.Method.EnclosingClass, s.Method, false), s.Tok, wr, ref sep);
-        if (customReceiver) {
-          wr.Write(sep);
-          var w = EmitCoercionIfNecessary(s.Receiver.Type, UserDefinedType.UpcastToMemberEnclosingType(s.Receiver.Type, s.Method), s.Tok, wr);
-          EmitExpr(s.Receiver, false, w, wStmts);
-          sep = ", ";
-        }
-        for (int i = 0; i < s.Method.Ins.Count; i++) {
-          Formal p = s.Method.Ins[i];
-          if (!p.IsGhost) {
-            wr.Write(sep);
-            var fromType = s.Args[i].Type;
-            var toType = s.Method.Ins[i].Type;
-            var instantiatedToType = toType.Subst(s.MethodSelect.TypeArgumentSubstitutionsWithParents());
-            var w = EmitCoercionIfNecessary(fromType, toType, s.Tok, wr);
-            w = EmitDowncastIfNecessary(fromType, instantiatedToType, s.Tok, w);
-            EmitExpr(s.Args[i], false, w, wStmts);
-            sep = ", ";
-          }
-        }
-
-        if (!returnStyleOuts) {
-          foreach (var outTmp in outTmps) {
-            wr.Write(sep);
-            EmitActualOutArg(outTmp, wr);
-            sep = ", ";
-          }
-        }
-        wr.Write(')');
-        wr = wrOrig;
-        EndStmt(wr);
-        if (returnStyleOutCollector != null) {
-          EmitCastOutParameterSplits(returnStyleOutCollector, outTmps, wStmtsAfterCall, outFormalTypes, outTypes, s.Tok);
-        }
-
-        // assign to the actual LHSs
-        for (int j = 0, l = 0; j < s.Method.Outs.Count; j++) {
-          var p = s.Method.Outs[j];
-          if (!p.IsGhost) {
-            var lvalue = lvalues[l];
-            if (lvalue != null) {
-              // The type information here takes care both of implicit upcasts and
-              // implicit downcasts from type parameters (see above).
-              ConcreteSyntaxTree wRhs = EmitAssignment(lvalue, s.Lhs[j].Type, outTypes[l], wStmtsAfterCall, s.Tok);
-              EmitIdentifier(outTmps[l], wRhs);
-              // Coercion from the out type to the LHS type is the responsibility
-              // of the EmitAssignment above
-            }
-            l++;
-          }
-        }
-      }
-    }
-
-    void TrTailCallStmt(IToken tok, Method method, Expression receiver, List<Expression> args, string receiverReplacement, ConcreteSyntaxTree wr) {
-      Contract.Requires(tok != null);
-      Contract.Requires(method != null);
-      Contract.Requires(receiver != null);
-      Contract.Requires(args != null);
-      Contract.Requires(method.IsTailRecursive);
-      Contract.Requires(wr != null);
-
-      // assign the actual in-parameters to temporary variables
-      var inTmps = new List<string>();
-      var inTypes = new List<Type/*?*/>();
-      if (receiverReplacement != null) {
-        // TODO:  What to do here?  When does this happen, what does it mean?
-      } else if (!method.IsStatic) {
-        string inTmp = ProtectedFreshId("_in");
-        inTmps.Add(inTmp);
-        inTypes.Add(null);
-        DeclareLocalVar(inTmp, null, null, receiver, false, wr);
-      }
-      for (int i = 0; i < method.Ins.Count; i++) {
-        Formal p = method.Ins[i];
-        if (!p.IsGhost) {
-          string inTmp = ProtectedFreshId("_in");
-          inTmps.Add(inTmp);
-          inTypes.Add(args[i].Type);
-          DeclareLocalVar(inTmp, args[i].Type, p.tok, args[i], false, wr);
-        }
-      }
-      // Now, assign to the formals
-      int n = 0;
-      if (!method.IsStatic) {
-        wr.Write("_this = ");
-        ConcreteSyntaxTree wRHS;
-        if (thisContext == null) {
-          wRHS = wr;
-        } else {
-          var instantiatedType = receiver.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
-          wRHS = EmitCoercionIfNecessary(instantiatedType, UserDefinedType.FromTopLevelDecl(tok, thisContext), tok, wr);
-        }
-        wRHS.Write(inTmps[n]);
-        EndStmt(wr);
-        n++;
-      }
-      foreach (var p in method.Ins) {
-        if (!p.IsGhost) {
-          EmitAssignment(IdName(p), p.Type, inTmps[n], inTypes[n], wr);
-          n++;
-        }
-      }
-      Contract.Assert(n == inTmps.Count);
-      // finally, the jump back to the head of the method
-      EmitJumpToTailCallStart(wr);
-    }
-
-    protected virtual void TrStmtList(List<Statement> stmts, ConcreteSyntaxTree writer) {
-      Contract.Requires(cce.NonNullElements(stmts));
-      Contract.Requires(writer != null);
-      foreach (Statement ss in stmts) {
-        // label:        // if any
-        //   <prelude>   // filled via copyInstrWriters -- copies out-parameters used in letexpr to local variables
-        //   ss          // translation of ss has side effect of filling the top copyInstrWriters
-        var w = writer;
-        if (ss.Labels != null && !(ss is VarDeclPattern or VarDeclStmt)) {
-          // We are not breaking out of VarDeclPattern or VarDeclStmt, so the labels there are useless
-          // They were useful for verification
-          w = CreateLabeledCode(ss.Labels.Data.AssignUniqueId(idGenerator), false, w);
-        }
-        var prelude = w.Fork();
-        copyInstrWriters.Push(prelude);
-        TrStmt(ss, w);
-        copyInstrWriters.Pop();
-      }
-    }
-
-    protected ConcreteSyntaxTree EmitContinueLabel(LList<Label> loopLabels, ConcreteSyntaxTree writer) {
-      Contract.Requires(writer != null);
-      if (loopLabels != null) {
-        writer = CreateLabeledCode(loopLabels.Data.AssignUniqueId(idGenerator), true, writer);
-      }
-      return writer;
-    }
-
-    void TrLocalVar(IVariable v, bool alwaysInitialize, ConcreteSyntaxTree wr) {
-      Contract.Requires(v != null);
-      if (v.IsGhost) {
-        // only emit non-ghosts (we get here only for local variables introduced implicitly by call statements)
-        return;
-      }
-      DeclareLocalVar(IdName(v), v.Type, v.Tok, false, alwaysInitialize ? PlaceboValue(v.Type, wr, v.Tok, true) : null, wr);
-    }
-
-    ConcreteSyntaxTree MatchCasePrelude(string source, UserDefinedType sourceType, DatatypeCtor ctor, List<BoundVar> arguments, int caseIndex, int caseCount, ConcreteSyntaxTree wr) {
-      Contract.Requires(source != null);
-      Contract.Requires(sourceType != null);
-      Contract.Requires(ctor != null);
-      Contract.Requires(cce.NonNullElements(arguments));
-      Contract.Requires(0 <= caseIndex && caseIndex < caseCount);
-      // if (source.is_Ctor0) {
-      //   FormalType f0 = ((Dt_Ctor0)source._D).a0;
-      //   ...
-      var lastCase = caseIndex == caseCount - 1;
-      ConcreteSyntaxTree w;
-      if (lastCase) {
-        // Need to avoid if (true) because some languages (Go, someday Java)
-        // pretend that an if (true) isn't a certainty, leading to a complaint
-        // about a missing return statement
-        if (caseCount > 1) {
-          w = EmitBlock(wr);
-        } else {
-          w = wr;
-        }
-      } else {
-        w = EmitIf(out var guardWriter, !lastCase, wr);
-        EmitConstructorCheck(source, ctor, guardWriter);
-      }
-
-      int k = 0;  // number of processed non-ghost arguments
-      for (int m = 0; m < ctor.Formals.Count; m++) {
-        Formal arg = ctor.Formals[m];
-        if (!arg.IsGhost) {
-          BoundVar bv = arguments[m];
-          // FormalType f0 = ((Dt_Ctor0)source._D).a0;
-          var sw = DeclareLocalVar(IdName(bv), bv.Type, bv.Tok, w);
-          EmitDestructor(wr => EmitIdentifier(source, wr), arg, k, ctor, SelectNonGhost(sourceType.ResolvedClass, sourceType.TypeArgs), bv.Type, sw);
-          k++;
-        }
-      }
-      return w;
-    }
-
-    // ----- Expression ---------------------------------------------------------------------------
-
-    /// <summary>
-    /// Before calling TrParenExpr(expr), the caller must have spilled the let variables declared in "expr".
-    /// </summary>
-    protected void TrParenExpr(string prefix, Expression expr, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
-      Contract.Requires(prefix != null);
-      Contract.Requires(expr != null);
-      Contract.Requires(wr != null);
-      wr.Write(prefix);
-      TrParenExpr(expr, wr, inLetExprBody, wStmts);
-    }
-
-    /// <summary>
-    /// Before calling TrParenExpr(expr), the caller must have spilled the let variables declared in "expr".
-    /// </summary>
-    protected void TrParenExpr(Expression expr, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
-      Contract.Requires(expr != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(wStmts != null);
-      EmitExpr(expr, inLetExprBody, wr.ForkInParens(), wStmts);
-    }
-
-    /// <summary>
-    /// Before calling TrExprList(exprs), the caller must have spilled the let variables declared in expressions in "exprs".
-    /// </summary>
-    protected void TrExprList(List<Expression> exprs, ConcreteSyntaxTree wr, bool inLetExprBody, ConcreteSyntaxTree wStmts,
-        Func<int, Type> typeAt = null, bool parens = true) {
-      Contract.Requires(cce.NonNullElements(exprs));
-      if (parens) { wr = wr.ForkInParens(); }
-
-      wr.Comma(exprs, (e, index) => {
-        ConcreteSyntaxTree w;
-        if (typeAt != null) {
-          w = wr.Fork();
-          w = EmitCoercionIfNecessary(e.Type, typeAt(index), e.tok, w);
-        } else {
-          w = wr;
-        }
-        EmitExpr(e, inLetExprBody, w, wStmts);
-      });
-    }
-
-    protected virtual void WriteCast(string s, ConcreteSyntaxTree wr) { }
-
-    protected ConcreteSyntaxTree CoercedExpr(Expression expr, Type toType, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
-      var result = new ConcreteSyntaxTree();
-      var w = EmitCoercionIfNecessary(expr.Type, toType, expr.tok, result);
-      EmitExpr(expr, inLetExprBody, w, wStmts);
-      return result;
-    }
-
-    protected virtual void EmitIdentifier(string ident, ConcreteSyntaxTree wr) {
-      wr.Write(ident);
-    }
-
-    public virtual ConcreteSyntaxTree Expr(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wStmts) {
-      var result = new ConcreteSyntaxTree();
-      var wr = result;
-      EmitExpr(expr, inLetExprBody, wr, wStmts);
-      return result;
-    }
-
-    public virtual void EmitExpr(Expression expr, bool inLetExprBody, ConcreteSyntaxTree wr, ConcreteSyntaxTree wStmts) {
-      if (expr is LiteralExpr) {
-        LiteralExpr e = (LiteralExpr)expr;
-        EmitLiteralExpr(wr, e);
-
-      } else if (expr is ThisExpr) {
-        if (thisContext != null) {
-          var instantiatedType = expr.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
-          wr = EmitCoercionIfNecessary(UserDefinedType.FromTopLevelDecl(expr.tok, thisContext), instantiatedType, expr.tok, wr);
-        }
-        EmitThis(wr);
-
-      } else if (expr is IdentifierExpr) {
-        var e = (IdentifierExpr)expr;
-        if (inLetExprBody && !(e.Var is BoundVar)) {
-          // copy variable to a temp since
-          //   - C# doesn't allow out param in letExpr body, and
-          //   - Java doesn't allow any non-final variable in letExpr body.
-          var name = ProtectedFreshId("_pat_let_tv");
-          EmitIdentifier(name, wr);
-          DeclareLocalVar(name, null, null, false, IdName(e.Var), copyInstrWriters.Peek(), e.Type);
-        } else {
-          EmitIdentifier(IdName(e.Var), wr);
-        }
-      } else if (expr is SetDisplayExpr) {
-        var e = (SetDisplayExpr)expr;
-        EmitCollectionDisplay(e.Type.AsSetType, e.tok, e.Elements, inLetExprBody, wr, wStmts);
-
-      } else if (expr is MultiSetDisplayExpr) {
-        var e = (MultiSetDisplayExpr)expr;
-        EmitCollectionDisplay(e.Type.AsMultiSetType, e.tok, e.Elements, inLetExprBody, wr, wStmts);
-
-      } else if (expr is SeqDisplayExpr) {
-        var e = (SeqDisplayExpr)expr;
-        EmitCollectionDisplay(e.Type.AsSeqType, e.tok, e.Elements, inLetExprBody, wr, wStmts);
-
-      } else if (expr is MapDisplayExpr) {
-        var e = (MapDisplayExpr)expr;
-        EmitMapDisplay(e.Type.AsMapType, e.tok, e.Elements, inLetExprBody, wr, wStmts);
-
-      } else if (expr is MemberSelectExpr) {
-        MemberSelectExpr e = (MemberSelectExpr)expr;
-        SpecialField sf = e.Member as SpecialField;
-        if (sf != null) {
-          GetSpecialFieldInfo(sf.SpecialId, sf.IdParam, e.Obj.Type, out var compiledName, out var preStr, out var postStr);
-          wr.Write(preStr);
-
-          if (sf.IsStatic && !SupportsStaticsInGenericClasses && sf.EnclosingClass.TypeArgs.Count != 0) {
-            var typeArgs = e.TypeApplication_AtEnclosingClass;
-            Contract.Assert(typeArgs.Count == sf.EnclosingClass.TypeArgs.Count);
-            wr.Write("{0}.", TypeName_Companion(e.Obj.Type, wr, e.tok, sf));
-            EmitNameAndActualTypeArgs(IdName(e.Member), typeArgs, e.tok, wr);
-            var tas = TypeArgumentInstantiation.ListFromClass(sf.EnclosingClass, typeArgs);
-            EmitTypeDescriptorsActuals(tas, e.tok, wr.ForkInParens());
-          } else {
-            void writeObj(ConcreteSyntaxTree w) {
-              //Contract.Assert(!sf.IsStatic);
-              w = EmitCoercionIfNecessary(e.Obj.Type, UserDefinedType.UpcastToMemberEnclosingType(e.Obj.Type, e.Member), e.tok, w);
-              TrParenExpr(e.Obj, w, inLetExprBody, wStmts);
-            }
-
-            var typeArgs = CombineAllTypeArguments(e.Member, e.TypeApplication_AtEnclosingClass, e.TypeApplication_JustMember);
-            EmitMemberSelect(writeObj, e.Obj.Type, e.Member, typeArgs, e.TypeArgumentSubstitutionsWithParents(), expr.Type).EmitRead(wr);
-          }
-
-          wr.Write(postStr);
-        } else {
-          var typeArgs = CombineAllTypeArguments(e.Member, e.TypeApplication_AtEnclosingClass, e.TypeApplication_JustMember);
-          var typeMap = e.TypeArgumentSubstitutionsWithParents();
-          var customReceiver = NeedsCustomReceiver(e.Member) && !(e.Member.EnclosingClass is TraitDecl);
-          if (!customReceiver && !e.Member.IsStatic) {
-            Action<ConcreteSyntaxTree> obj;
-            // The eta conversion here is to avoid capture of the receiver, because the call to EmitMemberSelect below may generate
-            // a lambda expression in the target language.
-            if (e.Member is Function && typeArgs.Count != 0) {
-              // need to eta-expand wrap the receiver
-              var etaReceiver = ProtectedFreshId("_eta_this");
-              wr = CreateIIFE_ExprBody(etaReceiver, e.Obj.Type, e.Obj.tok, e.Obj, inLetExprBody, e.Type.Subst(typeMap), e.tok, wr, ref wStmts);
-              obj = w => w.Write(etaReceiver);
-            } else {
-              obj = w => EmitExpr(e.Obj, inLetExprBody, w, wStmts);
-            }
-            EmitMemberSelect(obj, e.Obj.Type, e.Member, typeArgs, typeMap, expr.Type).EmitRead(wr);
-          } else {
-            string customReceiverName = null;
-            if (customReceiver && e.Member is Function) {
-              // need to eta-expand wrap the receiver
-              customReceiverName = ProtectedFreshId("_eta_this");
-              wr = CreateIIFE_ExprBody(customReceiverName, e.Obj.Type, e.Obj.tok, e.Obj, inLetExprBody, e.Type.Subst(typeMap), e.tok, wr, ref wStmts);
-            }
-            Action<ConcreteSyntaxTree> obj = w => EmitTypeName_Companion(e.Obj.Type, w, wr, e.tok, e.Member);
-            EmitMemberSelect(obj, e.Obj.Type, e.Member, typeArgs, typeMap, expr.Type, customReceiverName).EmitRead(wr);
-          }
-        }
-      } else if (expr is SeqSelectExpr) {
-        SeqSelectExpr e = (SeqSelectExpr)expr;
-        Contract.Assert(e.Seq.Type != null);
-        if (e.Seq.Type.IsArrayType) {
-          if (e.SelectOne) {
-            Contract.Assert(e.E0 != null && e.E1 == null);
-            var w = EmitArraySelect(new List<Expression>() { e.E0 }, e.Type, inLetExprBody, wr, wStmts);
-            TrParenExpr(e.Seq, w, inLetExprBody, wStmts);
-          } else {
-            EmitSeqSelectRange(e.Seq, e.E0, e.E1, true, inLetExprBody, wr, wStmts);
-          }
-        } else if (e.SelectOne) {
-          Contract.Assert(e.E0 != null && e.E1 == null);
-          EmitIndexCollectionSelect(e.Seq, e.E0, inLetExprBody, wr, wStmts);
-        } else {
-          EmitSeqSelectRange(e.Seq, e.E0, e.E1, false, inLetExprBody, wr, wStmts);
-        }
-      } else if (expr is SeqConstructionExpr) {
-        var e = (SeqConstructionExpr)expr;
-        EmitSeqConstructionExpr(e, inLetExprBody, wr, wStmts);
-      } else if (expr is MultiSetFormingExpr) {
-        var e = (MultiSetFormingExpr)expr;
-        EmitMultiSetFormingExpr(e, inLetExprBody, wr, wStmts);
-      } else if (expr is MultiSelectExpr) {
-        MultiSelectExpr e = (MultiSelectExpr)expr;
-        WriteCast(TypeName(e.Type.NormalizeExpand(), wr, e.tok), wr);
-        var w = EmitArraySelect(e.Indices, e.Type, inLetExprBody, wr, wStmts);
-        TrParenExpr(e.Array, w, inLetExprBody, wStmts);
-
-      } else if (expr is SeqUpdateExpr) {
-        SeqUpdateExpr e = (SeqUpdateExpr)expr;
-        var collectionType = e.Type.AsCollectionType;
-        Contract.Assert(collectionType != null);
-        EmitIndexCollectionUpdate(e.Seq, e.Index, e.Value, collectionType, inLetExprBody, wr, wStmts);
-      } else if (expr is DatatypeUpdateExpr) {
-        var e = (DatatypeUpdateExpr)expr;
-        if (e.Members.All(member => member.IsGhost)) {
-          // all fields to be updated are ghost, which doesn't change the value
-          EmitExpr(e.Root, inLetExprBody, wr, wStmts);
-          return;
-        }
-        if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, e.Root.Type.AsDatatype, out var dtor)) {
-          var i = e.Members.IndexOf(dtor);
-          if (0 <= i) {
-            // the datatype is an erasable wrapper and its core destructor is part of the update (which implies everything else must be a ghost),
-            // so proceed as with the rhs
-            Contract.Assert(Enumerable.Range(0, e.Members.Count).All(j => j == i || e.Members[j].IsGhost));
-            Contract.Assert(e.Members.Count == e.Updates.Count);
-            var rhs = e.Updates[i].Item3;
-            EmitExpr(rhs, inLetExprBody, wr, wStmts);
-            return;
-          }
-        }
-        // the optimized cases don't apply, so proceed according to the desugaring
-        EmitExpr(e.ResolvedExpression, inLetExprBody, wr, wStmts);
-      } else if (expr is FunctionCallExpr) {
-        FunctionCallExpr e = (FunctionCallExpr)expr;
-
-        void EmitExpr(Expression e2, ConcreteSyntaxTree wr2, bool inLetExpr, ConcreteSyntaxTree wStmts2) {
-          this.EmitExpr(e2, inLetExpr, wr2, wStmts2);
-        }
-
-        if (e.Function is SpecialFunction) {
-          CompileSpecialFunctionCallExpr(e, wr, inLetExprBody, wStmts, EmitExpr);
-        } else {
-          CompileFunctionCallExpr(e, wr, inLetExprBody, wStmts, EmitExpr);
-        }
-
-      } else if (expr is ApplyExpr) {
-        var e = expr as ApplyExpr;
-        EmitApplyExpr(e.Function.Type, e.tok, e.Function, e.Args, inLetExprBody, wr, wStmts);
-
-      } else if (expr is DatatypeValue) {
-        var dtv = (DatatypeValue)expr;
-        Contract.Assert(dtv.Ctor != null);  // since dtv has been successfully resolved
-
-        if (DatatypeWrapperEraser.IsErasableDatatypeWrapper(Options, dtv.Ctor.EnclosingDatatype, out var dtor)) {
-          var i = dtv.Ctor.Destructors.IndexOf(dtor);
-          Contract.Assert(0 <= i);
-          EmitExpr(dtv.Arguments[i], inLetExprBody, wr, wStmts);
-          return;
-        }
-
-        var wrArgumentList = new ConcreteSyntaxTree();
-        var wTypeDescriptorArguments = new ConcreteSyntaxTree();
-        string sep = "";
-        Contract.Assert(dtv.Ctor.EnclosingDatatype.TypeArgs.Count == dtv.InferredTypeArgs.Count);
-        WriteTypeDescriptors(dtv.Ctor.EnclosingDatatype, dtv.InferredTypeArgs, wTypeDescriptorArguments, ref sep);
-        sep = "";
-        for (var i = 0; i < dtv.Arguments.Count; i++) {
-          var formal = dtv.Ctor.Formals[i];
-          if (!formal.IsGhost) {
-            wrArgumentList.Write(sep);
-            var w = EmitCoercionIfNecessary(@from: dtv.Arguments[i].Type, to: dtv.Ctor.Formals[i].Type, tok: dtv.tok, wr: wrArgumentList);
-            EmitExpr(dtv.Arguments[i], inLetExprBody, w, wStmts);
-            sep = ", ";
-          }
-        }
-        EmitDatatypeValue(dtv, wTypeDescriptorArguments.ToString(), wrArgumentList.ToString(), wr);
-
-      } else if (expr is OldExpr) {
-        Contract.Assert(false); throw new cce.UnreachableException();  // 'old' is always a ghost
-
-      } else if (expr is UnaryOpExpr) {
-        var e = (UnaryOpExpr)expr;
-        if (e.ResolvedOp == UnaryOpExpr.ResolvedOpcode.BVNot) {
-          wr = EmitBitvectorTruncation(e.Type.AsBitVectorType, false, wr);
-        }
-        EmitUnaryExpr(UnaryOpCodeMap[e.ResolvedOp], e.E, inLetExprBody, wr, wStmts);
-      } else if (expr is ConversionExpr) {
-        var e = (ConversionExpr)expr;
-        Contract.Assert(Options.Get(CommonOptionBag.GeneralTraits) || e.ToType.IsRefType == e.E.Type.IsRefType);
-        if (e.ToType.IsRefType || e.ToType.IsTraitType || e.E.Type.IsTraitType) {
-          var w = EmitCoercionIfNecessary(e.E.Type, e.ToType, e.tok, wr);
-          w = EmitDowncastIfNecessary(e.E.Type, e.ToType, e.tok, w);
-          EmitExpr(e.E, inLetExprBody, w, wStmts);
-        } else {
-          EmitConversionExpr(e, inLetExprBody, wr, wStmts);
-        }
-
-      } else if (expr is TypeTestExpr) {
-        var e = (TypeTestExpr)expr;
-        var fromType = e.E.Type;
-        if (fromType.IsSubtypeOf(e.ToType, false, false)) {
-          EmitExpr(Expression.CreateBoolLiteral(e.tok, true), inLetExprBody, wr, wStmts);
-        } else {
-          var name = $"_is_{GetUniqueAstNumber(e)}";
-          wr = CreateIIFE_ExprBody(name, fromType, e.tok, e.E, inLetExprBody, Type.Bool, e.tok, wr, ref wStmts);
-          EmitTypeTest(name, e.E.Type, e.ToType, e.tok, wr);
-        }
-
-      } else if (expr is BinaryExpr) {
-        var e = (BinaryExpr)expr;
-
-        if (IsComparisonToZero(e, out var arg, out var sign, out var negated) &&
-            CompareZeroUsingSign(arg.Type)) {
-          // Transform e.g. x < BigInteger.Zero into x.Sign == -1
-          var w = EmitSign(arg.Type, wr);
-          TrParenExpr(arg, w, inLetExprBody, wStmts);
-          wr.Write(negated ? " != " : " == ");
-          wr.Write(sign.ToString());
-        } else {
-          CompileBinOp(e.ResolvedOp, e.E0, e.E1, e.tok, expr.Type,
-            out var opString,
-            out var preOpString,
-            out var postOpString,
-            out var callString,
-            out var staticCallString,
-            out var reverseArguments,
-            out var truncateResult,
-            out var convertE1_to_int,
-            out var coerceE1,
-            wr);
-
-          if (truncateResult && e.Type.IsBitVectorType) {
-            wr = EmitBitvectorTruncation(e.Type.AsBitVectorType, true, wr);
-          }
-          var e0 = reverseArguments ? e.E1 : e.E0;
-          var e1 = reverseArguments ? e.E0 : e.E1;
-
-          var left = Expr(e0, inLetExprBody, wStmts);
-          ConcreteSyntaxTree right;
-          if (convertE1_to_int) {
-            right = ExprAsNativeInt(e1, inLetExprBody, wStmts);
-          } else {
-            right = Expr(e1, inLetExprBody, wStmts);
-            if (coerceE1) {
-              right = CoercionIfNecessary(e1.Type, TypeForCoercion(e1.Type), e1.tok, right);
-            }
-          }
-
-          wr.Write(preOpString);
-          if (opString != null) {
-            var nativeType = AsNativeType(e.Type);
-            string nativeName = null;
-            bool needsCast = false;
-            if (nativeType != null) {
-              GetNativeInfo(nativeType.Sel, out nativeName, out _, out needsCast);
-            }
-
-            var opResult = ConcreteSyntaxTree.Create($"{left.InParens()} {opString} {right.InParens()}");
-            if (needsCast) {
-              opResult = Cast(new LineSegment(nativeName), opResult);
-            }
-
-            wr.Append(opResult);
-          } else if (callString != null) {
-            wr.Format($"{left.InParens()}.{callString}({right})");
-          } else if (staticCallString != null) {
-            wr.Format($"{staticCallString}({left}, {right})");
-          }
-          wr.Write(postOpString);
-        }
-      } else if (expr is TernaryExpr) {
-        Contract.Assume(false);  // currently, none of the ternary expressions is compilable
-
-      } else if (expr is LetExpr) {
-        var e = (LetExpr)expr;
-        if (e.Exact) {
-          // The Dafny "let" expression
-          //    var Pattern(x,y) := G; E
-          // is translated into C# as:
-          //    LamLet(G, tmp =>
-          //      LamLet(dtorX(tmp), x =>
-          //      LamLet(dtorY(tmp), y => E)))
-          Contract.Assert(e.LHSs.Count == e.RHSs.Count);  // checked by resolution
-          var w = wr;
-          for (int i = 0; i < e.LHSs.Count; i++) {
-            var lhs = e.LHSs[i];
-            if (Contract.Exists(lhs.Vars, bv => !bv.IsGhost)) {
-              var rhsName = $"_pat_let{GetUniqueAstNumber(e)}_{i}";
-              w = CreateIIFE_ExprBody(rhsName, e.RHSs[i].Type, e.RHSs[i].tok, e.RHSs[i], inLetExprBody, e.Body.Type, e.Body.tok, w, ref wStmts);
-              w = TrCasePattern(lhs, wr => EmitIdentifier(rhsName, wr), e.RHSs[i].Type, e.Body.Type, w, ref wStmts);
-            }
-          }
-          EmitExpr(e.Body, true, w, wStmts);
-        } else if (e.BoundVars.All(bv => bv.IsGhost)) {
-          // The Dafny "let" expression
-          //    ghost var x,y :| Constraint; E
-          // is compiled just like E is, because the resolver has already checked that x,y (or other ghost variables, for that matter) don't
-          // occur in E (moreover, the verifier has checked that values for x,y satisfying Constraint exist).
-          EmitExpr(e.Body, inLetExprBody, wr, wStmts);
-        } else {
-          // The Dafny "let" expression
-          //    var x,y :| Constraint; E
-          // is translated into C# as:
-          //    LamLet(0, dummy => {  // the only purpose of this construction here is to allow us to add some code inside an expression in C#
-          //        var x,y;
-          //        // Embark on computation that fills in x,y according to Constraint; the computation stops when the first
-          //        // such value is found, but since the verifier checks that x,y follows uniquely from Constraint, this is
-          //        // not a source of nondeterminancy.
-          //        return E;
-          //      })
-          Contract.Assert(e.RHSs.Count == 1);  // checked by resolution
-          var missingBounds = ComprehensionExpr.BoolBoundedPool.MissingBounds(e.BoundVars.ToList<BoundVar>(), e.Constraint_Bounds, ComprehensionExpr.BoundedPool.PoolVirtues.Enumerable);
-          if (missingBounds.Count != 0) {
-            foreach (var bv in missingBounds) {
-              Error(ErrorId.c_let_such_that_is_too_complex, e.tok, "this let-such-that expression is too advanced for the current compiler; Dafny's heuristics cannot find any bound for variable '{0}'", wr, bv.Name);
-            }
-          } else {
-            var w = CreateIIFE1(0, e.Body.Type, e.Body.tok, "_let_dummy_" + GetUniqueAstNumber(e), wr, wStmts);
-            foreach (var bv in e.BoundVars) {
-              DeclareLocalVar(IdName(bv), bv.Type, bv.tok, false, ForcePlaceboValue(bv.Type, wr, bv.tok, true), w);
-            }
-            TrAssignSuchThat(new List<IVariable>(e.BoundVars).ConvertAll(bv => (IVariable)bv), e.RHSs[0], e.Constraint_Bounds, e.tok.line, w, inLetExprBody);
-            EmitReturnExpr(e.Body, e.Body.Type, true, w);
-          }
-        }
-      } else if (expr is NestedMatchExpr nestedMatchExpr) {
-        EmitExpr(nestedMatchExpr.Flattened, inLetExprBody, wr, wStmts);
-      } else if (expr is MatchExpr) {
-        var e = (MatchExpr)expr;
-        // ((System.Func<SourceType, TargetType>)((SourceType _source) => {
-        //   if (source.is_Ctor0) {
-        //     FormalType f0 = ((Dt_Ctor0)source._D).a0;
-        //     ...
-        //     return Body0;
-        //   } else if (...) {
-        //     ...
-        //   } else if (true) {
-        //     ...
-        //   }
-        // }))(src)
-
-        string source = ProtectedFreshId("_source");
-        ConcreteSyntaxTree w;
-        w = CreateLambda(new List<Type>() { e.Source.Type }, e.tok, new List<string>() { source }, e.Type, wr, wStmts);
-
-        if (e.Cases.Count == 0) {
-          // the verifier would have proved we never get here; still, we need some code that will compile
-          EmitAbsurd(null, w);
-        } else {
-          int i = 0;
-          var sourceType = (UserDefinedType)e.Source.Type.NormalizeExpand();
-          foreach (MatchCaseExpr mc in e.Cases) {
-            var wCase = MatchCasePrelude(source, sourceType, mc.Ctor, mc.Arguments, i, e.Cases.Count, w);
-            EmitReturnExpr(mc.Body, mc.Body.Type, inLetExprBody, wCase);
-            i++;
-          }
-        }
-        // We end with applying the source expression to the delegate we just built
-        wr.Write(LambdaExecute);
-        TrParenExpr(e.Source, wr, inLetExprBody, wStmts);
-
-      } else if (expr is QuantifierExpr) {
-        var e = (QuantifierExpr)expr;
-
-        // Compilation does not check whether a quantifier was split.
-
-        wr = CaptureFreeVariables(expr, true, out var su, inLetExprBody, wr, ref wStmts);
-        var logicalBody = su.Substitute(e.LogicalBody(true));
-
-        Contract.Assert(e.Bounds != null);  // for non-ghost quantifiers, the resolver would have insisted on finding bounds
-        var n = e.BoundVars.Count;
-        Contract.Assert(e.Bounds.Count == n);
-        var wBody = wr;
-        for (int i = 0; i < n; i++) {
-          var bound = e.Bounds[i];
-          var bv = e.BoundVars[i];
-
-          var collectionElementType = CompileCollection(bound, bv, inLetExprBody, false, su, out var collection, wStmts, e.Bounds, e.BoundVars, i);
-          wBody.Write("{0}(", GetQuantifierName(TypeName(collectionElementType, wBody, bv.tok)));
-          wBody.Append(collection);
-          wBody.Write(", {0}, ", expr is ForallExpr ? True : False);
-          var native = AsNativeType(e.BoundVars[i].Type);
-          var tmpVarName = ProtectedFreshId(e is ForallExpr ? "_forall_var_" : "_exists_var_");
-          ConcreteSyntaxTree newWBody = CreateLambda(new List<Type> { collectionElementType }, e.tok, new List<string> { tmpVarName }, Type.Bool, wBody, wStmts, untyped: true);
-          wStmts = newWBody.Fork();
-          newWBody = MaybeInjectSubtypeConstraint(
-            tmpVarName, collectionElementType, bv.Type,
-            inLetExprBody, e.tok, newWBody, true, e is ForallExpr);
-          EmitDowncastVariableAssignment(
-            IdName(bv), bv.Type, tmpVarName, collectionElementType, true, e.tok, newWBody);
-          newWBody = MaybeInjectSubsetConstraint(
-            bv, bv.Type, collectionElementType, inLetExprBody, e.tok, newWBody, true, e is ForallExpr);
-          wBody.Write(')');
-          wBody = newWBody;
-        }
-        EmitExpr(logicalBody, inLetExprBody, wBody, wStmts);
-
-      } else if (expr is SetComprehension) {
-        var e = (SetComprehension)expr;
-        // For "set i,j,k,l | R(i,j,k,l) :: Term(i,j,k,l)" where the term has type "G", emit something like:
-        // ((System.Func<Set<G>>)(() => {
-        //   var _coll = new List<G>();
-        //   foreach (var tmp_l in sq.Elements) { L l = (L)tmp_l;
-        //     foreach (var tmp_k in st.Elements) { K k = (K)tmp_k;
-        //       for (BigInteger j = Lo; j < Hi; j++) {
-        //         for (bool i in Helper.AllBooleans) {
-        //           if (R(i,j,k,l)) {
-        //             _coll.Add(Term(i,j,k,l));
-        //           }
-        //         }
-        //       }
-        //     }
-        //   }
-        //   return Dafny.Set<G>.FromCollection(_coll);
-        // }))()
-        wr = CaptureFreeVariables(e, true, out var su, inLetExprBody, wr, ref wStmts);
-        e = (SetComprehension)su.Substitute(e);
-
-        Contract.Assert(e.Bounds != null);  // the resolver would have insisted on finding bounds
-        var collectionName = ProtectedFreshId("_coll");
-        var bwr = CreateIIFE0(e.Type.AsSetType, e.tok, wr, wStmts);
-        wr = bwr;
-        EmitSetBuilder_New(wr, e, collectionName);
-        var n = e.BoundVars.Count;
-        Contract.Assert(e.Bounds.Count == n);
-        for (var i = 0; i < n; i++) {
-          var bound = e.Bounds[i];
-          var bv = e.BoundVars[i];
-          var tmpVar = ProtectedFreshId("_compr_");
-          var wStmtsLoop = wr.Fork();
-          var elementType = CompileCollection(bound, bv, inLetExprBody, true, null, out var collection, wStmtsLoop);
-          wr = CreateGuardedForeachLoop(tmpVar, elementType, bv, true, inLetExprBody, e.tok, collection, wr);
-        }
-
-        var thn = EmitIf(out var guardWriter, false, wr);
-        EmitExpr(e.Range, inLetExprBody, guardWriter, wStmts);
-        EmitSetBuilder_Add(e.Type.AsSetType, collectionName, e.Term, inLetExprBody, thn);
-        var s = GetCollectionBuilder_Build(e.Type.AsSetType, e.tok, collectionName, wr);
-        EmitReturnExpr(s, bwr);
-
-      } else if (expr is MapComprehension) {
-        var e = (MapComprehension)expr;
-        // For "map i | R(i) :: Term(i)" where the term has type "V" and i has type "U", emit something like:
-        // ((System.Func<Map<U, V>>)(() => {
-        //   var _coll = new List<Pair<U,V>>();
-        //   foreach (L l in sq.Elements) {
-        //     foreach (K k in st.Elements) {
-        //       for (BigInteger j = Lo; j < Hi; j++) {
-        //         for (bool i in Helper.AllBooleans) {
-        //           if (R(i,j,k,l)) {
-        //             _coll.Add(new Pair(i, Term(i));
-        //           }
-        //         }
-        //       }
-        //     }
-        //   }
-        //   return Dafny.Map<U, V>.FromCollection(_coll);
-        // }))()
-        wr = CaptureFreeVariables(e, true, out var su, inLetExprBody, wr, ref wStmts);
-        e = (MapComprehension)su.Substitute(e);
-
-        Contract.Assert(e.Bounds != null);  // the resolver would have insisted on finding bounds
-        var domtypeName = TypeName(e.Type.AsMapType.Domain, wr, e.tok);
-        var rantypeName = TypeName(e.Type.AsMapType.Range, wr, e.tok);
-        var collection_name = ProtectedFreshId("_coll");
-        var bwr = CreateIIFE0(e.Type.AsMapType, e.tok, wr, wStmts);
-        wr = bwr;
-        EmitMapBuilder_New(wr, e, collection_name);
-        var n = e.BoundVars.Count;
-        Contract.Assert(e.Bounds.Count == n);
-        for (var i = 0; i < n; i++) {
-          var bound = e.Bounds[i];
-          var bv = e.BoundVars[i];
-          var tmpVar = ProtectedFreshId("_compr_");
-          var wStmtsLoop = wr.Fork();
-          var elementType = CompileCollection(bound, bv, inLetExprBody, true, null, out var collection, wStmtsLoop);
-          wr = CreateGuardedForeachLoop(tmpVar, elementType, bv, true, false, bv.tok, collection, wr);
-        }
-
-        var thn = EmitIf(out var guardWriter, false, wr);
-        EmitExpr(e.Range, inLetExprBody, guardWriter, wStmts);
-        var termLeftWriter = EmitMapBuilder_Add(e.Type.AsMapType, e.tok, collection_name, e.Term, inLetExprBody, thn);
-        if (e.TermLeft == null) {
-          Contract.Assert(e.BoundVars.Count == 1);
-          termLeftWriter.Write(IdName(e.BoundVars[0]));
-        } else {
-          EmitExpr(e.TermLeft, inLetExprBody, termLeftWriter, wStmts);
-        }
-
-        var s = GetCollectionBuilder_Build(e.Type.AsMapType, e.tok, collection_name, wr);
-        EmitReturnExpr(s, bwr);
-
-      } else if (expr is LambdaExpr) {
-        var e = (LambdaExpr)expr;
-
-        wr = CaptureFreeVariables(e, false, out var su, inLetExprBody, wr, ref wStmts);
-        wr = CreateLambda(e.BoundVars.ConvertAll(bv => bv.Type), Token.NoToken, e.BoundVars.ConvertAll(IdName), e.Body.Type, wr, wStmts);
-        wStmts = wr.Fork();
-        wr = EmitReturnExpr(wr);
-        // May need an upcast or boxing conversion to coerce to the generic arrow result type
-        wr = EmitCoercionIfNecessary(e.Body.Type, TypeForCoercion(e.Type.AsArrowType.Result), e.Body.tok, wr);
-        EmitExpr(su.Substitute(e.Body), inLetExprBody, wr, wStmts);
-
-      } else if (expr is StmtExpr) {
-        var e = (StmtExpr)expr;
-        EmitExpr(e.E, inLetExprBody, wr, wStmts);
-
-      } else if (expr is ITEExpr) {
-        var e = (ITEExpr)expr;
-        // The ghost-ITE optimization applies only to at "the top" of the expression structure of a function
-        // body. Those cases are handled in TrExprOpt, so we expect the be compiling both branches here.
-        Contract.Assert(e.HowToCompile == ITEExpr.ITECompilation.CompileBothBranches);
-        EmitITE(e.Test, e.Thn, e.Els, e.Type, inLetExprBody, wr, wStmts);
-
-      } else if (expr is ConcreteSyntaxExpression) {
-        var e = (ConcreteSyntaxExpression)expr;
-        EmitExpr(e.ResolvedExpression, inLetExprBody, wr, wStmts);
-
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
-      }
-    }
-
-    protected void WriteTypeDescriptors(TopLevelDecl decl, List<Type> typeArguments, ConcreteSyntaxTree wrArgumentList, ref string sep) {
-      Contract.Requires(decl.TypeArgs.Count == typeArguments.Count);
-      var typeParameters = decl.TypeArgs;
-      for (var i = 0; i < typeParameters.Count; i++) {
-        if (NeedsTypeDescriptor(typeParameters[i])) {
-          var typeArgument = typeArguments[i];
-          wrArgumentList.Write($"{sep}{TypeDescriptor(typeArgument, wrArgumentList, typeArgument.tok)}");
-          sep = ", ";
-        }
-      }
-    }
-
-    /// <summary>
-    /// When inside an enumeration like this:
-    /// 
-    ///     foreach(var [tmpVarName]: [collectionElementType] in ...) {
-    ///        ...
-    ///     }
-    /// 
-    /// MaybeInjectSubtypeConstraint emits a subtype constraint that tmpVarName should be of type boundVarType, typically of the form
-    /// 
-    ///       if([tmpVarName] is [boundVarType]) {
-    ///         // This is where 'wr' will write
-    ///       }
-    ///
-    /// If isReturning is true, then it will also insert the "return" statements,
-    /// to use in the lambdas used by forall and exists statements:
-    ///
-    ///       if([tmpVarName] is [boundVarType]) {
-    ///         return // This is where 'wr' will write
-    ///       } else {
-    ///         return [elseReturnValue];
-    ///       }
-    ///
-    /// </summary>
-    /// <returns></returns>
-    private ConcreteSyntaxTree MaybeInjectSubtypeConstraint(string tmpVarName,
-      Type collectionElementType, Type boundVarType, bool inLetExprBody,
-      IToken tok, ConcreteSyntaxTree wr, bool isReturning = false, bool elseReturnValue = false
-      ) {
-      var iterationValuesNeedToBeChecked = IsTargetSupertype(collectionElementType, boundVarType);
-      if (iterationValuesNeedToBeChecked) {
-        var preconditions = wr.Fork();
-        var conditions = GetSubtypeCondition(tmpVarName, boundVarType, tok, preconditions);
-        if (conditions == null) {
-          preconditions.Clear();
-        } else {
-          var thenWriter = EmitIf(out var guardWriter, isReturning, wr);
-          guardWriter.Write(conditions);
-          if (isReturning) {
-            wr = EmitBlock(wr);
-            var wStmts = wr.Fork();
-            wr = EmitReturnExpr(wr);
-            EmitExpr(new LiteralExpr(tok, elseReturnValue), inLetExprBody, wr, wStmts);
-          }
-          wr = thenWriter;
-        }
-      }
-      return wr;
-    }
-
-    private ConcreteSyntaxTree MaybeInjectSubsetConstraint(IVariable boundVar, Type boundVarType,
-      Type collectionElementType, bool inLetExprBody,
-      IToken tok, ConcreteSyntaxTree wr, bool isReturning = false, bool elseReturnValue = false,
-      bool isSubfiltering = false) {
-      if (!boundVarType.Equals(collectionElementType, true) &&
-          boundVarType.NormalizeExpand(true) is UserDefinedType
-          {
-            TypeArgs: var typeArgs,
-            ResolvedClass:
-            SubsetTypeDecl
-            {
-              TypeArgs: var typeParametersArgs,
-              Var: var variable,
-              Constraint: var constraint
-            }
-          }) {
-        if (variable.Type.NormalizeExpandKeepConstraints() is UserDefinedType
-          {
-            ResolvedClass: SubsetTypeDecl
-          } normalizedVariableType) {
-          wr = MaybeInjectSubsetConstraint(boundVar, normalizedVariableType, collectionElementType,
-              inLetExprBody, tok, wr, isReturning, elseReturnValue, true);
-        }
-
-        var bvIdentifier = new IdentifierExpr(tok, boundVar);
-        var typeParameters = TypeParameter.SubstitutionMap(typeParametersArgs, typeArgs);
-        var subContract = new Substituter(null,
-          new Dictionary<IVariable, Expression>()
-          {
-            {variable, bvIdentifier}
-          },
-          new Dictionary<TypeParameter, Type>(
-            typeParameters
-          )
-        );
-        var constraintInContext = subContract.Substitute(constraint);
-        var wStmts = wr.Fork();
-        var thenWriter = EmitIf(out var guardWriter, hasElse: isReturning, wr);
-        EmitExpr(constraintInContext, inLetExprBody, guardWriter, wStmts);
-        if (isReturning) {
-          var elseBranch = wr;
-          elseBranch = EmitBlock(elseBranch);
-          elseBranch = EmitReturnExpr(elseBranch);
-          wStmts = elseBranch.Fork();
-          EmitExpr(new LiteralExpr(tok, elseReturnValue), inLetExprBody, elseBranch, wStmts);
-        }
-        wr = thenWriter;
-      }
-
-      if (isReturning && !isSubfiltering) {
-        wr = EmitReturnExpr(wr);
-      }
-      return wr;
-    }
-
-    protected ConcreteSyntaxTree CaptureFreeVariables(Expression expr, bool captureOnlyAsRequiredByTargetLanguage,
-      out Substituter su, bool inLetExprBody, ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts) {
-      if (captureOnlyAsRequiredByTargetLanguage && TargetLambdaCanUseEnclosingLocals) {
-        // nothing to do
-      } else {
-        CreateFreeVarSubstitution(expr, out var bvars, out var fexprs, out su);
-        if (bvars.Count != 0) {
-          return EmitBetaRedex(bvars.ConvertAll(IdName), fexprs, bvars.ConvertAll(bv => bv.Type), expr.Type, expr.tok, inLetExprBody, wr, ref wStmts);
-        }
-      }
-      su = Substituter.EMPTY;
-      return wr;
-    }
-
-    void CreateFreeVarSubstitution(Expression expr, out List<BoundVar> bvars, out List<Expression> fexprs, out Substituter su) {
-      Contract.Requires(expr != null);
-
-      var fvs = FreeVariablesUtil.ComputeFreeVariables(Options, expr);
-      var sm = new Dictionary<IVariable, Expression>();
-
-      bvars = new List<BoundVar>();
-      fexprs = new List<Expression>();
-      foreach (var fv in fvs) {
-        if (fv.IsGhost) {
-          continue;
-        }
-        fexprs.Add(new IdentifierExpr(fv.Tok, fv.Name) {
-          Var = fv, // resolved here!
-          Type = fv.Type
-        });
-        var bv = new BoundVar(fv.Tok, fv.Name, fv.Type);
-        bvars.Add(bv);
-        sm[fv] = new IdentifierExpr(bv.Tok, bv.Name) {
-          Var = bv, // resolved here!
-          Type = bv.Type
-        };
-      }
-
-      su = new Substituter(null, sm, new Dictionary<TypeParameter, Type>());
-    }
-
-    protected ConcreteSyntaxTree StringLiteral(StringLiteralExpr str) {
-      var result = new ConcreteSyntaxTree();
-      TrStringLiteral(str, result);
-      return result;
-    }
-
-    protected virtual void TrStringLiteral(StringLiteralExpr str, ConcreteSyntaxTree wr) {
-      Contract.Requires(str != null);
-      Contract.Requires(wr != null);
-      EmitStringLiteral((string)str.Value, str.IsVerbatim, wr);
-    }
-
-    /// <summary>
-    /// Try to evaluate "expr" into one BigInteger.  On success, return it; otherwise, return "null".
-    /// </summary>
-    /// <param name="expr"></param>
-    /// <returns></returns>
-    public static Nullable<BigInteger> PartiallyEvaluate(Expression expr) {
-      Contract.Requires(expr != null);
-      expr = expr.Resolved;
-      if (expr is LiteralExpr) {
-        var e = (LiteralExpr)expr;
-        if (e.Value is BigInteger) {
-          return (BigInteger)e.Value;
-        }
-      } else if (expr is BinaryExpr) {
-        var e = (BinaryExpr)expr;
-        switch (e.ResolvedOp) {
-          case BinaryExpr.ResolvedOpcode.Add:
-          case BinaryExpr.ResolvedOpcode.Sub:
-          case BinaryExpr.ResolvedOpcode.Mul:
-            // possibly the most important case is Sub, since that's how NegationExpression's end up
-            var arg0 = PartiallyEvaluate(e.E0);
-            var arg1 = arg0 == null ? null : PartiallyEvaluate(e.E1);
-            if (arg1 != null) {
-              switch (e.ResolvedOp) {
-                case BinaryExpr.ResolvedOpcode.Add:
-                  return arg0 + arg1;
-                case BinaryExpr.ResolvedOpcode.Sub:
-                  return arg0 - arg1;
-                case BinaryExpr.ResolvedOpcode.Mul:
-                  return arg0 * arg1;
-                default:
-                  Contract.Assert(false);
-                  break;  // please compiler
-              }
-            }
-            break;
-          default:
-            break;
-        }
-      }
-      return null;
-    }
-
-    ConcreteSyntaxTree TrCasePattern(CasePattern<BoundVar> pat, Action<ConcreteSyntaxTree> rhs, Type rhsType, Type bodyType,
-      ConcreteSyntaxTree wr, ref ConcreteSyntaxTree wStmts) {
-      Contract.Requires(pat != null);
-      Contract.Requires(rhs != null);
-      Contract.Requires(rhsType != null);
-      Contract.Requires(bodyType != null);
-      Contract.Requires(wr != null);
-
-      if (pat.Var != null) {
-        var bv = pat.Var;
-        if (!bv.IsGhost) {
-          CreateIIFE(IdProtect(bv.CompileName), bv.Type, bv.Tok, bodyType, pat.tok, wr, ref wStmts, out var wrRhs, out var wrBody);
-          wrRhs = EmitDowncastIfNecessary(rhsType, bv.Type, bv.tok, wrRhs);
-          rhs(wrRhs);
-          return wrBody;
-        }
-      } else if (pat.Arguments != null) {
-        var ctor = pat.Ctor;
-        Contract.Assert(ctor != null);  // follows from successful resolution
-        Contract.Assert(pat.Arguments.Count == ctor.Formals.Count);  // follows from successful resolution
-        Contract.Assert(ctor.EnclosingDatatype.TypeArgs.Count == rhsType.NormalizeExpand().TypeArgs.Count);
-        var typeSubst = TypeParameter.SubstitutionMap(ctor.EnclosingDatatype.TypeArgs, rhsType.NormalizeExpand().TypeArgs);
-        var k = 0;  // number of non-ghost formals processed
-        for (int i = 0; i < pat.Arguments.Count; i++) {
-          var arg = pat.Arguments[i];
-          var formal = ctor.Formals[i];
-          if (formal.IsGhost) {
-            // nothing to compile, but do a sanity check
-            Contract.Assert(!Contract.Exists(arg.Vars, bv => !bv.IsGhost));
-          } else {
-            wr = TrCasePattern(arg, sw => EmitDestructor(rhs, formal, k, ctor, ((DatatypeValue)pat.Expr).InferredTypeArgs, arg.Expr.Type, sw), formal.Type.Subst(typeSubst), bodyType, wr, ref wStmts);
-            k++;
-          }
-        }
-      }
-      return wr;
-    }
-
-    void CompileSpecialFunctionCallExpr(FunctionCallExpr e, ConcreteSyntaxTree wr, bool inLetExprBody,
-        ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      string name = e.Function.Name;
-
-      if (name == "RotateLeft") {
-        EmitRotate(e.Receiver, e.Args[0], true, wr, inLetExprBody, wStmts, tr);
-      } else if (name == "RotateRight") {
-        EmitRotate(e.Receiver, e.Args[0], false, wr, inLetExprBody, wStmts, tr);
-      } else {
-        CompileFunctionCallExpr(e, wr, inLetExprBody, wStmts, tr);
-      }
-    }
-
-    protected virtual void CompileFunctionCallExpr(FunctionCallExpr e, ConcreteSyntaxTree wr, bool inLetExprBody,
-        ConcreteSyntaxTree wStmts, FCE_Arg_Translator tr) {
-      Contract.Requires(e != null && e.Function != null);
-      Contract.Requires(wr != null);
-      Contract.Requires(tr != null);
-      Function f = e.Function;
-
-      var toType = thisContext == null ? e.Type : e.Type.Subst(thisContext.ParentFormalTypeParametersToActuals);
-      wr = EmitCoercionIfNecessary(f.Original.ResultType, toType, e.tok, wr);
-
-      var customReceiver = !(f.EnclosingClass is TraitDecl) && NeedsCustomReceiver(f);
-      string qual = "";
-      string compileName = "";
-      if (f.IsExtern(Options, out qual, out compileName) && qual != null) {
-        wr.Write("{0}{1}", qual, ModuleSeparator);
-      } else if (f.IsStatic || customReceiver) {
-        wr.Write("{0}{1}", TypeName_Companion(e.Receiver.Type, wr, e.tok, f), ModuleSeparator);
-        compileName = customReceiver ? CompanionMemberIdName(f) : IdName(f);
-      } else {
-        wr.Write("(");
-        var wReceiver = wr;
-        if (f.EnclosingClass is TraitDecl traitDecl && e.Receiver.Type.AsTraitType != traitDecl) {
-          wReceiver = EmitCoercionIfNecessary(e.Receiver.Type, UserDefinedType.UpcastToMemberEnclosingType(e.Receiver.Type, f), e.tok, wr);
-        }
-        tr(e.Receiver, wReceiver, inLetExprBody, wStmts);
-        wr.Write($"){ClassAccessor}");
-        compileName = IdName(f);
-      }
-      var typeArgs = CombineAllTypeArguments(f, e.TypeApplication_AtEnclosingClass, e.TypeApplication_JustFunction);
-      EmitNameAndActualTypeArgs(compileName, TypeArgumentInstantiation.ToActuals(ForTypeParameters(typeArgs, f, false)), f.tok, wr);
-      wr.Write("(");
-      var sep = "";
-      EmitTypeDescriptorsActuals(ForTypeDescriptors(typeArgs, f.EnclosingClass, f, false), e.tok, wr, ref sep);
-      if (customReceiver) {
-        wr.Write(sep);
-        var w = EmitCoercionIfNecessary(e.Receiver.Type, UserDefinedType.UpcastToMemberEnclosingType(e.Receiver.Type, e.Function), e.tok, wr);
-        EmitExpr(e.Receiver, inLetExprBody, w, wStmts);
-        sep = ", ";
-      }
-      for (int i = 0; i < e.Args.Count; i++) {
-        if (!e.Function.Formals[i].IsGhost) {
-          wr.Write(sep);
-          var fromType = e.Args[i].Type;
-          var w = EmitCoercionIfNecessary(fromType, e.Function.Formals[i].Type, tok: e.tok, wr: wr);
-          var instantiatedToType = e.Function.Formals[i].Type.Subst(e.TypeArgumentSubstitutionsWithParents());
-          w = EmitDowncastIfNecessary(fromType, instantiatedToType, e.tok, w);
-          tr(e.Args[i], w, inLetExprBody, wStmts);
-          sep = ", ";
-        }
-      }
-      wr.Write(")");
-    }
-
-    private bool IsComparisonToZero(BinaryExpr expr, out Expression/*?*/ arg, out int sign, out bool negated) {
-      if (IsComparisonWithZeroOnRight(expr.Op, expr.E1, out var s, out negated)) {
-        // e.g. x < 0
-        arg = expr.E0;
-        sign = s;
-        return true;
-      } else if (IsComparisonWithZeroOnRight(expr.Op, expr.E0, out s, out negated)) {
-        // e.g. 0 < x, equivalent to x < 0
-        arg = expr.E1;
-        sign = -s;
-        return true;
-      } else {
-        arg = null;
-        sign = 0;
-        return false;
-      }
-    }
-
-    private bool IsComparisonWithZeroOnRight(
-      BinaryExpr.Opcode op, Expression right,
-      out int sign, out bool negated) {
-
-      var rightVal = PartiallyEvaluate(right);
-      if (rightVal == null || rightVal != BigInteger.Zero) {
-        sign = 0; // need to assign something
-        negated = true; // need to assign something
-        return false;
-      } else {
-        switch (op) {
-          case BinaryExpr.Opcode.Lt:
-            // x < 0 <==> sign(x) == -1
-            sign = -1;
-            negated = false;
-            return true;
-          case BinaryExpr.Opcode.Le:
-            // x <= 0 <==> sign(x) != 1
-            sign = 1;
-            negated = true;
-            return true;
-          case BinaryExpr.Opcode.Eq:
-            // x == 0 <==> sign(x) == 0
-            sign = 0;
-            negated = false;
-            return true;
-          case BinaryExpr.Opcode.Neq:
-            // x != 0 <==> sign(x) != 0
-            sign = 0;
-            negated = true;
-            return true;
-          case BinaryExpr.Opcode.Gt:
-            // x > 0 <==> sign(x) == 1
-            sign = 1;
-            negated = false;
-            return true;
-          case BinaryExpr.Opcode.Ge:
-            // x >= 0 <==> sign(x) != -1
-            sign = -1;
-            negated = true;
-            return true;
-          default:
-            sign = 0; // need to assign something
-            negated = false; // ditto
-            return false;
-        }
-      }
-    }
-
-    protected abstract void EmitHaltRecoveryStmt(Statement body, string haltMessageVarName, Statement recoveryBody, ConcreteSyntaxTree wr);
-
-  }
-}
diff --git a/Source/DafnyCore/ConcreteSyntax/ConcreteSyntaxTree.cs b/Source/DafnyCore/ConcreteSyntax/ConcreteSyntaxTree.cs
index 77cc8315297..d7860896aa3 100644
--- a/Source/DafnyCore/ConcreteSyntax/ConcreteSyntaxTree.cs
+++ b/Source/DafnyCore/ConcreteSyntax/ConcreteSyntaxTree.cs
@@ -15,6 +15,12 @@ public enum BlockStyle {
     NewlineBrace
   }
 
+  public static class CanRenderExtensions {
+    public static ConcreteSyntaxTree InParens(this ICanRender canRender) {
+      return ConcreteSyntaxTree.Create($"({canRender})");
+    }
+  }
+
   public class ConcreteSyntaxTree : ICanRender {
     public ConcreteSyntaxTree(int relativeIndent = 0) {
       RelativeIndentLevel = relativeIndent;
@@ -152,10 +158,6 @@ public ConcreteSyntaxTree Write(char value) {
       return this;
     }
 
-    public ConcreteSyntaxTree InParens() {
-      return Create($"({this})");
-    }
-
     // ----- Nested blocks ------------------------------
 
     public virtual ConcreteSyntaxTree ForkInParens() {
@@ -166,7 +168,7 @@ public virtual ConcreteSyntaxTree ForkInParens() {
       return result;
     }
 
-    public ConcreteSyntaxTree NewBlock(string header = "", string footer = "",
+    public virtual ConcreteSyntaxTree NewBlock(string header = "", string footer = "",
       BlockStyle open = BlockStyle.SpaceBrace,
       BlockStyle close = BlockStyle.NewlineBrace) {
       Contract.Requires(header != null);
diff --git a/Source/DafnyCore/CounterExampleGeneration/Constraint.cs b/Source/DafnyCore/CounterExampleGeneration/Constraint.cs
new file mode 100644
index 00000000000..ca41a5d6f78
--- /dev/null
+++ b/Source/DafnyCore/CounterExampleGeneration/Constraint.cs
@@ -0,0 +1,595 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+#nullable enable
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// This class represents constraints over partial values in the counterexample model.
+/// A constraint is a Boolean expression over partial values.
+/// </summary>
+public abstract class Constraint {
+
+  // We cannot add a constraint to the counterexample assumption until we know how to refer to each of the
+  // partial values referenced by the constraint:
+  private readonly List<PartialValue> referencedValues;
+  public IEnumerable<PartialValue> ReferencedValues => referencedValues.AsEnumerable();
+
+  protected Constraint(IEnumerable<PartialValue> referencedValues, bool isWellFormedNessConstraint = false) {
+    this.referencedValues = referencedValues.ToList();
+    if (isWellFormedNessConstraint) {
+      return;
+    }
+    foreach (var partialValue in this.referencedValues) {
+      partialValue.Constraints.Add(this);
+    }
+  }
+
+  /// <summary> Return the Dafny expression corresponding to the constraint. </summary>
+  /// <param name="definitions"></param> Maps a partial value to a Dafny expression by which we can refer to this value.
+  /// <returns></returns>
+  public Expression? AsExpression(Dictionary<PartialValue, Expression> definitions) {
+    if (referencedValues.Any(value => !definitions.ContainsKey(value))) {
+      return null;
+    }
+    var expression = AsExpressionHelper(definitions);
+    expression.Type = Type.Bool;
+    return expression;
+  }
+
+  /// <summary> This is intended for debugging as we don't know apriori how to refer to partial values </summary>
+  public override string ToString() {
+    var temporaryIds = new Dictionary<PartialValue, Expression>();
+    foreach (var partialValue in referencedValues) {
+      temporaryIds[partialValue] = new IdentifierExpr(Token.NoToken, "E#" + partialValue.Element.Id);
+    }
+    if (this is DefinitionConstraint definitionConstraint) {
+      return definitionConstraint.RightHandSide(temporaryIds).ToString() ?? "";
+    }
+    return AsExpression(temporaryIds)?.ToString() ?? "";
+  }
+
+  protected abstract Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions);
+
+
+  /// <summary>
+  /// Take a list of constraints and a dictionary of known ways to refer to partial values.
+  /// Update the dictionary according to the constraints in the list and return an ordered list of constraints that
+  /// can form a counterexample assumption.
+  /// </summary>
+  /// <param name="knownDefinitions"></param>
+  /// <param name="constraints"></param>
+  /// <param name="allowNewIdentifiers"></param> If false, do not allow new referring to partial values by identifiers
+  /// <param name="prune"></param> if True, remove constraints over literal values, since those should be self-evident
+  /// that are not already in knownDefinitions map
+  public static List<Constraint> ResolveAndOrder(
+    Dictionary<PartialValue, Expression> knownDefinitions,
+    List<Constraint> constraints,
+    bool allowNewIdentifiers,
+    bool prune) {
+    Constraint? newConstraint = null;
+    var oldConstraints = new List<Constraint>();
+    oldConstraints.AddRange(constraints.Where(constraint =>
+      allowNewIdentifiers || constraint is not IdentifierExprConstraint));
+    var newConstraints = new List<Constraint>();
+    var knownAsLiteral = new HashSet<PartialValue>();
+    do {
+      if (newConstraint != null) {
+        oldConstraints.Remove(newConstraint);
+      }
+
+      // Prioritize literals and display expressions
+      var displayConstraint = oldConstraints
+        .OfType<DefinitionConstraint>()
+        .Where(constraint => constraint is LiteralExprConstraint ||
+                             constraint is SeqDisplayConstraint ||
+                             constraint is DatatypeValueConstraint)
+        .FirstOrDefault(constraint => !knownDefinitions.ContainsKey(constraint.DefinedValue)
+                                      && constraint.ReferencedValues.All(knownDefinitions.ContainsKey));
+      if (displayConstraint != null) {
+        knownAsLiteral.Add(displayConstraint.DefinedValue);
+        knownDefinitions[displayConstraint.DefinedValue] = displayConstraint.RightHandSide(knownDefinitions);
+        knownDefinitions[displayConstraint.DefinedValue].Type = displayConstraint.DefinedValue.Type;
+        newConstraint = displayConstraint;
+        continue;
+      }
+
+      // Add all constrains where we know how to refer to each referenced value
+      newConstraint = oldConstraints.Where(constraint =>
+        constraint is not DefinitionConstraint &&
+        constraint.ReferencedValues.All(knownDefinitions.ContainsKey))
+        .FirstOrDefault(constraint => !prune || constraint is IdentifierExprConstraint || constraint.ReferencedValues.Any(value => !knownAsLiteral.Contains(value)));
+      if (newConstraint != null) {
+        newConstraints.Add(newConstraint);
+        continue;
+      }
+
+      // update knownDefinitions map with new definitions
+      var definition = oldConstraints.OfType<DefinitionConstraint>().FirstOrDefault(definition =>
+        !knownDefinitions.ContainsKey(definition.DefinedValue) &&
+        definition.ReferencedValues.All(knownDefinitions.ContainsKey));
+      if (definition != null) {
+        if (!prune || definition is FunctionCallConstraint ||
+            definition.referencedValues.Any(value => !knownAsLiteral.Contains(value))) {
+          newConstraints.AddRange(definition.WellFormed);
+        }
+        knownDefinitions[definition.DefinedValue] = definition.RightHandSide(knownDefinitions);
+        knownDefinitions[definition.DefinedValue].Type = definition.DefinedValue.Type;
+        newConstraint = definition;
+        continue;
+      }
+
+      // append all other constraints  to the end
+      newConstraint = oldConstraints.FirstOrDefault(constraint => !prune || constraint is FunctionCallConstraint || constraint is IdentifierExprConstraint || constraint.referencedValues.Any(value => !knownAsLiteral.Contains(value)));
+      if (newConstraint != null) {
+        if (newConstraint is DefinitionConstraint definitionConstraint) {
+          newConstraints.AddRange(definitionConstraint.WellFormed);
+        }
+
+        newConstraints.Add(newConstraint);
+      }
+    } while (newConstraint != null);
+
+    return newConstraints;
+  }
+
+}
+
+/// <summary>
+/// Definition Constraint is a constraint that identifies a partial value with an expression over other partial values
+/// </summary>
+public abstract class DefinitionConstraint : Constraint {
+
+  public readonly PartialValue DefinedValue;
+  public readonly List<Constraint> WellFormed;
+
+  protected DefinitionConstraint(
+    IEnumerable<PartialValue> referencedValues,
+    PartialValue definedValue,
+    List<Constraint> wellFormed) : base(referencedValues) {
+    DefinedValue = definedValue;
+    DefinedValue.Constraints.Add(this);
+    WellFormed = wellFormed;
+  }
+
+  public abstract Expression RightHandSide(Dictionary<PartialValue, Expression> definitions);
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    var expression = RightHandSide(definitions);
+    expression.Type = DefinedValue.Type;
+    var binaryExpr = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Eq, definitions[DefinedValue], expression) {
+      Type = Type.Bool
+    };
+    return binaryExpr;
+  }
+}
+
+public class IdentifierExprConstraint : DefinitionConstraint {
+  private readonly string name;
+
+  public IdentifierExprConstraint(PartialValue definedValue, string name)
+    : base(new List<PartialValue>(), definedValue, new List<Constraint>()) {
+    this.name = name;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    return new IdentifierExpr(Token.NoToken, name);
+  }
+}
+
+public class ArraySelectionConstraint : DefinitionConstraint {
+  public PartialValue Array;
+  public List<LiteralExpr> indices;
+
+  public ArraySelectionConstraint(PartialValue definedValue, PartialValue array, List<LiteralExpr> indices)
+    : base(new List<PartialValue>() { array }, definedValue,
+      new List<Constraint>() { new ArrayLengthConstraint(array, indices) }) {
+    Array = array;
+    this.indices = indices;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    if (indices.Count == 1) {
+      return new SeqSelectExpr(Token.NoToken, true, definitions[Array], indices.First(), null, Token.NoToken);
+    }
+    return new MultiSelectExpr(Token.NoToken, definitions[Array], indices.OfType<Expression>().ToList());
+  }
+}
+
+public class LiteralExprConstraint : DefinitionConstraint {
+
+  public readonly Expression LiteralExpr;
+  public LiteralExprConstraint(PartialValue definedValue, Expression literalExpr)
+    : base(new List<PartialValue>(), definedValue, new List<Constraint>()) {
+    LiteralExpr = literalExpr;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    return LiteralExpr;
+  }
+}
+
+public abstract class MemberSelectExprConstraint : DefinitionConstraint {
+
+  public readonly PartialValue Obj;
+  public readonly string MemberName;
+
+  protected MemberSelectExprConstraint(
+    PartialValue definedValue,
+    PartialValue obj,
+    string memberName,
+    List<Constraint> constraint) : base(new List<PartialValue> { obj }, definedValue, constraint) {
+    Obj = obj;
+    MemberName = memberName;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    return new MemberSelectExpr(Token.NoToken, definitions[Obj], new Name(MemberName));
+  }
+}
+
+public class MemberSelectExprDatatypeConstraint : MemberSelectExprConstraint {
+  public MemberSelectExprDatatypeConstraint(PartialValue definedValue, PartialValue obj, string memberName)
+    : base(definedValue, obj, memberName, new List<Constraint>()) { }
+}
+
+public class MemberSelectExprClassConstraint : MemberSelectExprConstraint {
+  public MemberSelectExprClassConstraint(PartialValue definedValue, PartialValue obj, string memberName)
+    : base(definedValue, obj, memberName, new List<Constraint> { new NotNullConstraint(obj) }) {
+  }
+}
+
+public class DatatypeValueConstraint : DefinitionConstraint {
+
+  public readonly IEnumerable<PartialValue> UnnamedDestructors;
+  private readonly string constructorName;
+  private readonly string datatypeName;
+
+  public DatatypeValueConstraint(
+    PartialValue definedValue,
+    string datatypeName,
+    string constructorName,
+    IReadOnlyCollection<PartialValue> unnamedDestructors)
+    : base(unnamedDestructors, definedValue, new List<Constraint>()) {
+    UnnamedDestructors = unnamedDestructors;
+    this.constructorName = constructorName;
+    this.datatypeName = datatypeName;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    return new DatatypeValue(Token.NoToken, datatypeName,
+      constructorName,
+      UnnamedDestructors.Select(destructor => definitions[destructor]).ToList());
+  }
+}
+
+public class SeqSelectExprConstraint : DefinitionConstraint {
+
+  public readonly PartialValue Seq;
+  public readonly PartialValue Index;
+
+
+  public SeqSelectExprConstraint(PartialValue definedValue, PartialValue seq, PartialValue index) : base(
+    new List<PartialValue> { seq, index }, definedValue,
+    new List<Constraint> { new CardinalityGtThanConstraint(seq, index) }) {
+    Seq = seq;
+    Index = index;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    return new SeqSelectExpr(
+      Token.NoToken,
+      true,
+      definitions[Seq],
+      definitions[Index],
+      null,
+      Token.NoToken);
+  }
+}
+
+public class MapSelectExprConstraint : DefinitionConstraint {
+
+  public readonly PartialValue Map;
+  public readonly PartialValue Key;
+
+
+  public MapSelectExprConstraint(PartialValue definedValue, PartialValue map, PartialValue key) : base(
+    new List<PartialValue> { map, key }, definedValue, new List<Constraint> {
+      new ContainmentConstraint(key, map, true)
+    }) {
+    Map = map;
+    Key = key;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    return new SeqSelectExpr(Token.NoToken, true, definitions[Map], definitions[Key], null, Token.NoToken);
+  }
+}
+
+public class SeqSelectExprWithLiteralConstraint : DefinitionConstraint {
+
+  public readonly PartialValue Seq;
+  public readonly LiteralExpr Index;
+
+
+  public SeqSelectExprWithLiteralConstraint(PartialValue definedValue, PartialValue seq, LiteralExpr index) : base(
+    new List<PartialValue> { seq }, definedValue,
+    new List<Constraint> { new CardinalityGtThanLiteralConstraint(seq, index) }) {
+    Seq = seq;
+    Index = index;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    return new SeqSelectExpr(Token.NoToken, true, definitions[Seq], Index, null, Token.NoToken);
+  }
+}
+
+public class CardinalityConstraint : DefinitionConstraint {
+
+  public readonly PartialValue Collection;
+
+
+  public CardinalityConstraint(PartialValue definedValue, PartialValue collection) : base(
+    new List<PartialValue> { collection }, definedValue, new List<Constraint>()) {
+    Collection = collection;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    return new UnaryOpExpr(Token.NoToken, UnaryOpExpr.Opcode.Cardinality, definitions[Collection]);
+  }
+}
+
+public class SeqDisplayConstraint : DefinitionConstraint {
+  private readonly List<PartialValue> elements;
+
+
+  public SeqDisplayConstraint(PartialValue definedValue, List<PartialValue> elements) : base(elements, definedValue,
+    new List<Constraint>()) {
+    this.elements = elements;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    return new SeqDisplayExpr(Token.NoToken, elements.ConvertAll(element => definitions[element]));
+  }
+}
+
+public class SetDisplayConstraint : Constraint {
+  private readonly List<PartialValue> elements;
+  private readonly PartialValue set;
+
+
+  public SetDisplayConstraint(PartialValue set, List<PartialValue> elements) : base(elements.Append(set)) {
+    this.elements = elements;
+    this.set = set;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    var setDisplayExpr = new SetDisplayExpr(Token.NoToken, true, elements.ConvertAll(element => definitions[element]));
+    setDisplayExpr.Type = set.Type;
+    return new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Eq, definitions[set], setDisplayExpr);
+  }
+}
+
+public class MapKeysDisplayConstraint : Constraint {
+  private readonly List<PartialValue> elements;
+  private readonly PartialValue map;
+
+
+  public MapKeysDisplayConstraint(PartialValue map, List<PartialValue> elements) : base(elements.Append(map)) {
+    this.elements = elements;
+    this.map = map;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    var setDisplayExpr = new SetDisplayExpr(Token.NoToken, true, elements.ConvertAll(element => definitions[element]));
+    setDisplayExpr.Type = new SetType(true, map.Type.TypeArgs[0]);
+    var memberSelectExpr = new MemberSelectExpr(Token.NoToken, definitions[map], new Name("Keys"));
+    memberSelectExpr.Type = new SetType(true, map.Type.TypeArgs[0]);
+    return new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Eq, memberSelectExpr, setDisplayExpr);
+  }
+}
+
+public class FunctionCallConstraint : DefinitionConstraint {
+  private readonly List<PartialValue> args;
+  private readonly PartialValue receiver;
+  private readonly string functionName;
+
+
+  public FunctionCallConstraint(
+    PartialValue definedValue,
+    PartialValue receiver,
+    List<PartialValue> args,
+    string functionName,
+    bool receiverIsReferenceType) : base(args.Append(receiver), definedValue,
+    receiverIsReferenceType
+      ? new List<Constraint>
+        { new NotNullConstraint(receiver), new FunctionCallRequiresConstraint(receiver, args, functionName) }
+      : new List<Constraint> { new FunctionCallRequiresConstraint(receiver, args, functionName) }) {
+    this.args = args;
+    this.receiver = receiver;
+    this.functionName = functionName;
+  }
+
+  public override Expression RightHandSide(Dictionary<PartialValue, Expression> definitions) {
+    return new ApplySuffix(
+      Token.NoToken,
+      null,
+      new ExprDotName(Token.NoToken, definitions[receiver], new Name(functionName), null),
+      args.Select(formal =>
+        new ActualBinding(null, definitions[formal])).ToList(),
+      Token.NoToken);
+  }
+}
+
+public class FunctionCallRequiresConstraint : Constraint {
+  private readonly List<PartialValue> args;
+  private readonly PartialValue receiver;
+  private readonly string functionName;
+
+
+  public FunctionCallRequiresConstraint(PartialValue receiver, List<PartialValue> args, string functionName)
+    : base(args.Append(receiver), true) {
+    this.args = args;
+    this.receiver = receiver;
+    this.functionName = functionName;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    return new ApplySuffix(
+      Token.NoToken,
+      null,
+      new ExprDotName(Token.NoToken, definitions[receiver], new Name(functionName + ".requires"), null),
+      args.Select(formal =>
+        new ActualBinding(null, definitions[formal])).ToList(),
+      Token.NoToken);
+  }
+}
+
+public class ContainmentConstraint : Constraint {
+
+  public readonly PartialValue Element, Set;
+  public readonly bool IsIn;
+  public ContainmentConstraint(PartialValue element, PartialValue set, bool isIn)
+    : base(new List<PartialValue> { element, set }) {
+    Element = element;
+    Set = set;
+    this.IsIn = isIn;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    return new BinaryExpr(
+      Token.NoToken,
+      IsIn ? BinaryExpr.Opcode.In : BinaryExpr.Opcode.NotIn,
+      definitions[Element],
+      definitions[Set]);
+  }
+}
+
+public class ArrayLengthConstraint : Constraint {
+
+  public PartialValue Array;
+  public List<LiteralExpr> indices;
+
+  public ArrayLengthConstraint(PartialValue array, List<LiteralExpr> indices)
+    : base(new List<PartialValue> { array }) {
+    Array = array;
+    this.indices = indices;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    var length0 = new MemberSelectExpr(Token.NoToken, definitions[Array], new Name(indices.Count == 1 ? "Length" : "Length0"));
+    length0.Type = Type.Int;
+    var constraint = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Gt, length0, indices.First());
+    constraint.Type = Type.Bool;
+    for (int i = 1; i < indices.Count; i++) {
+      var length = new MemberSelectExpr(Token.NoToken, definitions[Array], new Name($"Length{i}"));
+      length.Type = Type.Int;
+      var newConstraint = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Gt, length, indices[i]);
+      newConstraint.Type = Type.Bool;
+      constraint = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, constraint, newConstraint);
+      constraint.Type = Type.Bool;
+    }
+    return constraint;
+  }
+}
+
+public class NeqConstraint : Constraint {
+  private readonly PartialValue value;
+  private readonly PartialValue neq;
+  public NeqConstraint(PartialValue value, PartialValue neq) : base(new List<PartialValue> { value, neq }) {
+    this.value = value;
+    this.neq = neq;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    return new BinaryExpr(
+      Token.NoToken,
+      BinaryExpr.Opcode.Neq,
+      definitions[value],
+      definitions[neq]);
+  }
+}
+
+
+public class DatatypeConstructorCheckConstraint : Constraint {
+  private readonly PartialValue obj;
+  public readonly string ConstructorName;
+
+  public DatatypeConstructorCheckConstraint(PartialValue obj, string constructorName)
+    : base(new List<PartialValue> { obj }) {
+    this.obj = obj;
+    ConstructorName = constructorName;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    return new MemberSelectExpr(Token.NoToken, definitions[obj], new Name(ConstructorName + "?"));
+  }
+}
+
+public class CardinalityGtThanConstraint : Constraint {
+  private readonly PartialValue collection;
+  private readonly PartialValue bound;
+
+  public CardinalityGtThanConstraint(PartialValue collection, PartialValue bound)
+    : base(new List<PartialValue> { collection, bound }) {
+    this.collection = collection;
+    this.bound = bound;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    var cardinalityExpr = new UnaryOpExpr(Token.NoToken, UnaryOpExpr.Opcode.Cardinality, definitions[collection]) {
+      Type = Type.Int
+    };
+    return new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Gt, cardinalityExpr, definitions[bound]);
+  }
+}
+
+public class CardinalityGtThanLiteralConstraint : Constraint {
+  private readonly PartialValue collection;
+  private readonly LiteralExpr bound;
+
+  public CardinalityGtThanLiteralConstraint(PartialValue collection, LiteralExpr bound)
+    : base(new List<PartialValue> { collection }) {
+    this.collection = collection;
+    this.bound = bound;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    var cardinalityExpr = new UnaryOpExpr(Token.NoToken, UnaryOpExpr.Opcode.Cardinality, definitions[collection]) {
+      Type = Type.Int
+    };
+    return new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Gt, cardinalityExpr, bound);
+  }
+}
+
+public class TypeTestConstraint : Constraint {
+  public readonly Type Type;
+  private readonly PartialValue value;
+  public TypeTestConstraint(PartialValue value, Type type) : base(new List<PartialValue> { value }) {
+    Type = type;
+    this.value = value;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    return new TypeTestExpr(Token.NoToken, definitions[value], Type);
+  }
+}
+
+public class NotNullConstraint : Constraint {
+  private readonly PartialValue value;
+
+  public NotNullConstraint(PartialValue value) : base(new List<PartialValue> { value }) {
+    this.value = value;
+  }
+
+  protected override Expression AsExpressionHelper(Dictionary<PartialValue, Expression> definitions) {
+    var nullValue = new LiteralExpr(Token.NoToken) {
+      Type = new InferredTypeProxy()
+    };
+    return new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Neq, definitions[value], nullValue);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/CounterExampleGeneration/DafnyModel.cs b/Source/DafnyCore/CounterExampleGeneration/DafnyModel.cs
new file mode 100644
index 00000000000..db9cfd2ab7a
--- /dev/null
+++ b/Source/DafnyCore/CounterExampleGeneration/DafnyModel.cs
@@ -0,0 +1,952 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Text.RegularExpressions;
+using Microsoft.BaseTypes;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny {
+
+  /// <summary>
+  /// A wrapper around Boogie's Model class that allows extracting
+  /// types and values of Elements representing Dafny variables. The three core
+  /// methods are: GetDafnyType, DatatypeConstructorName, and GetExpansion
+  /// </summary>
+  public class DafnyModel {
+    public readonly List<string> LoopGuards;
+    private readonly DafnyOptions options;
+    public readonly Model Model;
+    public readonly List<PartialState> States = new();
+    public static readonly UserDefinedType UnknownType =
+      new(new Token(), "?", null);
+    private readonly ModelFuncWrapper fSelect, fSetMember, fSeqLength, fSeqIndex, fBox,
+      fDim, fIndexField, fMultiIndexField, fDtype, fCharToInt, fTag, fBv,
+      fNull, fSetUnion, fSetIntersection, fSetDifference, fSetUnionOne,
+      fSetEmpty, fSeqEmpty, fSeqBuild, fSeqAppend, fSeqDrop, fSeqTake,
+      fSeqUpdate, fSeqCreate, fU2Real, fU2Bool, fU2Int,
+      fMapDomain, fMapElements, fMapValues, fMapBuild, fMapEmpty, fIs, fIsBox, fUnbox, fLs, fLz;
+    private readonly Dictionary<Model.Element, Model.FuncTuple> datatypeValues = new();
+    private readonly List<Model.Func> bitvectorFunctions = new();
+
+    // the model will begin assigning characters starting from this utf value
+    private static readonly Regex UnderscoreRemovalRegex = new("__");
+
+    // This set is used by GetDafnyType to prevent infinite recursion
+    private HashSet<Model.Element> exploredElements = new();
+
+    private readonly Dictionary<Model.Element, LiteralExpr> concretizedValues = new();
+
+    public DafnyModel(Model model, DafnyOptions options) {
+      Model = model;
+      this.options = options;
+      var tyArgMultiplier = options.TypeEncodingMethod switch {
+        CoreOptions.TypeEncoding.Arguments => 1,
+        _ => 0
+      };
+      fSelect = ModelFuncWrapper.MergeFunctions(this, new List<string> { "MapType0Select", "MapType1Select" }, 2);
+      fSetMember = new ModelFuncWrapper(this, "Set#IsMember", 2, 0);
+      fSeqLength = new ModelFuncWrapper(this, "Seq#Length", 1, 0);
+      fSeqBuild = new ModelFuncWrapper(this, "Seq#Build", 2, 0);
+      fSeqAppend = new ModelFuncWrapper(this, "Seq#Append", 2, 0);
+      fSeqDrop = new ModelFuncWrapper(this, "Seq#Drop", 2, 0);
+      fSeqTake = new ModelFuncWrapper(this, "Seq#Take", 2, 0);
+      fSeqIndex = new ModelFuncWrapper(this, "Seq#Index", 2, 0);
+      fSeqUpdate = new ModelFuncWrapper(this, "Seq#Update", 3, 0);
+      fSeqCreate = new ModelFuncWrapper(this, "Seq#Create", 4, 0);
+      fSeqEmpty = new ModelFuncWrapper(this, "Seq#Empty", 0, 0);
+      fSetEmpty = new ModelFuncWrapper(this, "Set#Empty", 0, 0);
+      fSetUnion = new ModelFuncWrapper(this, "Set#Union", 2, 0);
+      fSetUnionOne = new ModelFuncWrapper(this, "Set#UnionOne", 2, 0);
+      fSetIntersection = new ModelFuncWrapper(this, "Set#Intersection", 2, 0);
+      fSetDifference = new ModelFuncWrapper(this, "Set#Difference", 2, 0);
+      fMapDomain = new ModelFuncWrapper(this, "Map#Domain", 1, 0);
+      fMapElements = new ModelFuncWrapper(this, "Map#Elements", 1, 0);
+      fMapValues = new ModelFuncWrapper(this, "Map#Values", 1, 0);
+      fMapBuild = new ModelFuncWrapper(this, "Map#Build", 3, 0);
+      fMapEmpty = new ModelFuncWrapper(this, "Map#Empty", 0, 0);
+      fIs = new ModelFuncWrapper(this, "$Is", 2, tyArgMultiplier);
+      fIsBox = new ModelFuncWrapper(this, "$IsBox", 2, 0);
+      fBox = new ModelFuncWrapper(this, BoogieGenerator.BoxFunctionName, 1, tyArgMultiplier);
+      fDim = new ModelFuncWrapper(this, "FDim", 1, 0);
+      fIndexField = new ModelFuncWrapper(this, "IndexField", 1, 0);
+      fMultiIndexField = new ModelFuncWrapper(this, "MultiIndexField", 2, 0);
+      fDtype = new ModelFuncWrapper(this, "dtype", 1, 0);
+      fNull = new ModelFuncWrapper(this, "null", 0, 0);
+      fCharToInt = new ModelFuncWrapper(this, "char#ToInt", 1, 0);
+      fU2Real = new ModelFuncWrapper(this, "U_2_real", 1, 0);
+      fU2Bool = new ModelFuncWrapper(this, "U_2_bool", 1, 0);
+      fU2Int = new ModelFuncWrapper(this, "U_2_int", 1, 0);
+      fTag = new ModelFuncWrapper(this, "Tag", 1, 0);
+      fBv = new ModelFuncWrapper(this, "TBitvector", 1, 0);
+      fUnbox = new ModelFuncWrapper(this, BoogieGenerator.UnboxFunctionName, 2, 0);
+      fLs = new ModelFuncWrapper(this, "$LS", 1, 0);
+      fLz = new ModelFuncWrapper(this, "$LZ", 0, 0);
+      InitDataTypes();
+      RegisterReservedBitVectors();
+      LoopGuards = new List<string>();
+      foreach (var s in model.States) {
+        var sn = new PartialState(this, s);
+        States.Add(sn);
+        if (sn.IsLoopEntryState) {
+          LoopGuards.Add("counterexampleLoopGuard" + LoopGuards.Count);
+        }
+        sn.LoopGuards = LoopGuards.ToList();
+      }
+    }
+
+    public void AssignConcretePrimitiveValues() {
+      bool isTrueReserved = false;
+      foreach (var app in fU2Bool.Apps) {
+        isTrueReserved |= ((Model.Boolean)app.Result).Value;
+      }
+      foreach (var element in Model.Elements) {
+        var type = GetFormattedDafnyType(element);
+        if (type is BoolType && GetLiteralExpression(element, type) == null) {
+          if (isTrueReserved) {
+            concretizedValues[element] = new LiteralExpr(Token.NoToken, false);
+          } else {
+            concretizedValues[element] = new LiteralExpr(Token.NoToken, true);
+          }
+          continue;
+        }
+        if (GetLiteralExpression(element, type) != null) {
+          continue;
+        }
+        ModelFuncWrapper? otherValuesFunction = null;
+        switch (type) {
+          case BitvectorType bitvectorType: {
+              var funcName = "U_2_bv" + bitvectorType.Width;
+              if (Model.HasFunc(funcName)) {
+                otherValuesFunction = new ModelFuncWrapper(Model.GetFunc(funcName), 0);
+              }
+              break;
+            }
+          case CharType:
+            otherValuesFunction = fCharToInt;
+            break;
+          case RealType:
+            otherValuesFunction = fU2Real;
+            break;
+          case IntType:
+            otherValuesFunction = fU2Int;
+            break;
+          default:
+            continue;
+        }
+        var reservedValues = otherValuesFunction!.Apps
+          .Select(app => GetLiteralExpression(app.Result, type))
+          .OfType<Expression>()
+          .Select(literal => literal.ToString()).ToHashSet();
+        reservedValues.UnionWith(concretizedValues.Values.Select(literal => literal.ToString()));
+        int numericalValue = -1;
+        LiteralExpr? literal = null;
+        bool literalIsReserved = true;
+        while (literalIsReserved) {
+          numericalValue++;
+          switch (type) {
+            case BitvectorType:
+            case IntType: {
+                literal = new LiteralExpr(Token.NoToken, BigInteger.Parse(numericalValue.ToString()));
+                break;
+              }
+            case CharType:
+              literal = new CharLiteralExpr(Token.NoToken, PrettyPrintChar(numericalValue));
+              break;
+            case RealType:
+              literal = new LiteralExpr(Token.NoToken, BigDec.FromString(numericalValue.ToString()));
+              break;
+          }
+          if (!reservedValues.Contains(literal!.ToString())) {
+            literalIsReserved = false;
+          }
+        }
+        concretizedValues[element] = literal!;
+      }
+    }
+
+    /// <summary>
+    /// Extract and parse the first Dafny model recorded in the model view file.
+    /// </summary>
+    public static DafnyModel ExtractModel(DafnyOptions options, string mv) {
+      const string begin = "*** MODEL";
+      const string end = "*** END_MODEL";
+      int beginIndex = mv.IndexOf(begin, StringComparison.Ordinal);
+      int endIndex = mv.IndexOf(end, StringComparison.Ordinal);
+      var modelString = mv.Substring(beginIndex, endIndex + end.Length - beginIndex);
+      var model = Model.ParseModels(new StringReader(modelString)).First();
+      return new DafnyModel(model, options);
+    }
+
+    public override string ToString() {
+      var result = new StringBuilder();
+      AssignConcretePrimitiveValues();
+      result.AppendLine("WARNING: the following counterexample may be inconsistent or invalid. See dafny.org/dafny/DafnyRef/DafnyRef#sec-counterexamples");
+      if (LoopGuards.Count > 0) {
+        result.AppendLine("Temporary variables to describe counterexamples: ");
+        foreach (var loopGuard in LoopGuards) {
+          result.AppendLine($"ghost var {loopGuard} : bool := false;");
+        }
+      }
+      foreach (var state in States.Where(state => state.StateContainsPosition())) {
+        result.AppendLine(state.FullStateName + ":");
+        result.AppendLine(state.AsAssumption().ToString());
+      }
+      return result.ToString();
+    }
+
+    /// <summary>
+    /// Collect the array dimensions from the various array.Length functions,
+    /// and collect all known datatype values
+    /// </summary>
+    private void InitDataTypes() {
+      const string datatypeConstructorPrefix = "#";
+      const string reservedVariablePrefix = "##";
+      const string accessorString = ".";
+      foreach (var fn in Model.Functions) {
+        if (fn.Name.StartsWith(datatypeConstructorPrefix) &&
+            !fn.Name.StartsWith(reservedVariablePrefix) &&
+            fn.Name.Contains(accessorString)) {
+          foreach (var tpl in fn.Apps) {
+            var elt = tpl.Result;
+            datatypeValues[elt] = tpl;
+          }
+        }
+      }
+    }
+
+    /// <summary>
+    /// Return the character representation of a UTF code understood by Dafny
+    /// This is either the character itself, if it is a parsable ASCII,
+    /// Escaped character, for the cases specified in Dafny manual,
+    /// Or escaped UTF code otherwise
+    /// </summary>
+    private static string PrettyPrintChar(int utfCode) {
+      switch (utfCode) {
+        case 0:
+          return "\\0";
+        case 9:
+          return "\\t";
+        case 10:
+          return "\\n";
+        case 13:
+          return "\\r";
+        case 34:
+          return "\\\"";
+        case 39:
+          return "\\\'";
+        case 92:
+          return "\\\\";
+        default:
+          if (utfCode is >= 32 and <= 126) {
+            return $"{Convert.ToChar(utfCode)}";
+          }
+          return $"\\U{{{utfCode:X4}}}";
+      }
+    }
+
+    /// <summary> Registered all bv values specified by the model </summary>
+    private void RegisterReservedBitVectors() {
+      var bvFuncName = new Regex("^U_2_bv[0-9]+$");
+      foreach (var func in Model.Functions) {
+        if (!bvFuncName.IsMatch(func.Name)) {
+          continue;
+        }
+        bitvectorFunctions.Add(func);
+      }
+    }
+
+    /// <summary>
+    /// Return the name of a 0-arity type function that maps to the element if such
+    /// a function exists and is unique. Return null otherwise.
+    /// </summary>
+    private static string? GetTrueTypeName(Model.Element element) {
+      return element.Names.FirstOrDefault(funcTuple => funcTuple.Func.Arity == 0)?.Func.Name;
+    }
+
+    /// <summary> Get the Dafny type of an element </summary>
+    internal Type GetFormattedDafnyType(Model.Element element) {
+      exploredElements = new HashSet<Model.Element>();
+      return DafnyModelTypeUtils.GetInDafnyFormat(GetDafnyType(element));
+    }
+
+    internal void AddTypeConstraints(PartialValue partialValue) {
+      foreach (var typeElement in GetIsResults(partialValue.Element)) {
+        var reconstructedType = DafnyModelTypeUtils.GetInDafnyFormat(ReconstructType(typeElement));
+        if (reconstructedType.ToString() != partialValue.Type.ToString()) {
+          var _ = new TypeTestConstraint(partialValue, reconstructedType);
+        }
+      }
+    }
+
+    /// <summary> Get the Dafny type of an element </summary>
+    private Type GetDafnyType(Model.Element element) {
+      if (exploredElements.Contains(element)) {
+        return UnknownType;
+      }
+      exploredElements.Add(element);
+      switch (element.Kind) {
+        case Model.ElementKind.Boolean:
+          return Type.Bool;
+        case Model.ElementKind.Integer:
+          return Type.Int;
+        case Model.ElementKind.Real:
+          return Type.Real;
+        case Model.ElementKind.BitVector:
+          return new BitvectorType(options, ((Model.BitVector)element).Size);
+        case Model.ElementKind.Uninterpreted:
+          return GetDafnyType((element as Model.Uninterpreted)!);
+        case Model.ElementKind.DataValue:
+          if (((Model.DatatypeValue)element).ConstructorName is "-" or "/") {
+            return GetDafnyType(
+              ((Model.DatatypeValue)element).Arguments.First());
+          }
+          return UnknownType;
+        default:
+          return UnknownType;
+      }
+    }
+
+    /// <summary>
+    /// Return all elements x that satisfy ($Is element x)
+    /// </summary>
+    private List<Model.Element> GetIsResults(Model.Element element) {
+      List<Model.Element> result = new();
+      foreach (var tuple in fIs.AppsWithArg(0, element)) {
+        if (((Model.Boolean)tuple.Result).Value) {
+          result.Add(tuple.Args[1]);
+        }
+      }
+      return result;
+    }
+
+    private Expression? GetLiteralExpression(Model.Element element, Type type) {
+      var result = GetLiteralExpressionHelper(element, type);
+      if (concretizedValues.ContainsKey(element) && result == null) {
+        result = concretizedValues[element];
+      }
+      if (result != null) {
+        result.Type = type;
+      }
+      return result;
+    }
+
+    /// <summary>
+    /// If the provided <param name="element"></param> represents a literal in Dafny, return that literal.
+    /// Otherwise, return null.
+    /// </summary>
+    private Expression? GetLiteralExpressionHelper(Model.Element element, Type type) {
+      if (Equals(element, fNull.GetConstant())) {
+        return new LiteralExpr(Token.NoToken);
+      }
+
+      if (element is not Model.Real && element is Model.Number number) {
+        return new LiteralExpr(Token.NoToken, BigInteger.Parse(number.Numeral));
+      }
+
+      if (element is Model.Real real) {
+        return new LiteralExpr(Token.NoToken, BigDec.FromString(real.ToString()));
+      }
+
+      if (element is Model.Boolean boolean) {
+        return new LiteralExpr(Token.NoToken, boolean.Value);
+      }
+
+      if (element.Kind == Model.ElementKind.DataValue) {
+        var datatypeValue = (Model.DatatypeValue)element;
+        switch (datatypeValue.ConstructorName) {
+          case "-":
+            return new NegationExpression(Token.NoToken,
+              GetLiteralExpression(datatypeValue.Arguments.First(), type));
+          case "/":
+            return new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Div,
+              GetLiteralExpression(datatypeValue.Arguments[0], type),
+              GetLiteralExpression(datatypeValue.Arguments[1], type));
+        }
+      }
+
+      var unboxedValue = fU2Int.OptEval(element);
+      unboxedValue ??= fU2Bool.OptEval(element);
+      unboxedValue ??= fU2Real.OptEval(element);
+      if (unboxedValue != null) {
+        return GetLiteralExpression(unboxedValue, type);
+      }
+
+      if (fCharToInt.OptEval(element) is Model.Integer literalCharValue) {
+        if (int.TryParse(literalCharValue.Numeral,
+              out var utfCode) && utfCode is <= char.MaxValue and >= 0) {
+          return new CharLiteralExpr(Token.NoToken, PrettyPrintChar(utfCode));
+        }
+      }
+
+      foreach (var bitvectorFunction in bitvectorFunctions) {
+        if (bitvectorFunction.OptEval(element) is Model.Number literalBitVectorValur) {
+          return new LiteralExpr(Token.NoToken,
+            BigInteger.Parse(literalBitVectorValur.Numeral));
+        }
+      }
+
+      return null;
+    }
+
+    public void GetExpansion(PartialState state, PartialValue value) {
+      var literalExpr = GetLiteralExpression(value.Element, value.Type);
+      if (literalExpr != null) {
+        var _ = new LiteralExprConstraint(value, literalExpr);
+        return;
+      }
+
+      if (value.Nullable) {
+        var _ = new NotNullConstraint(value);
+      }
+
+      if (value.Type is BitvectorType || value.Type is CharType || value.Type is RealType || value.Type is BoolType || value.Type is IntType) {
+        foreach (var element in Model.Elements.Where(element => !Equals(element, value.Element))) {
+          var elementType = GetFormattedDafnyType(element);
+          if (elementType.ToString() == value.Type.ToString()) {
+            var partialValue = PartialValue.Get(element, state);
+            var _ = new NeqConstraint(value, partialValue);
+          }
+        }
+        return;
+      }
+
+      var valueIsDatatype = datatypeValues.TryGetValue(value.Element, out var fnTuple);
+
+      var layerValue = fLz.GetConstant();
+      while (layerValue != null && fLs.AppWithArg(0, layerValue) != null && !Equals(fLs.AppWithArg(0, layerValue)!.Result, fLz.GetConstant())) {
+        layerValue = fLs.AppWithArg(0, layerValue)!.Result;
+      }
+      var functionApplications = GetFunctionConstants(value.Element, layerValue);
+      foreach (var functionApplication in functionApplications) {
+        var result = PartialValue.Get(functionApplication.Result, state);
+        var args = functionApplication.Args.Select(arg => PartialValue.Get(arg, state)).ToList();
+        args = Equals(functionApplication.Args[0], layerValue) ? args.Skip(2).ToList() : args.Skip(1).ToList();
+        var _ = new FunctionCallConstraint(result, value, args, functionApplication.Func.Name.Split(".").Last(), !valueIsDatatype);
+      }
+
+      if (valueIsDatatype) {
+        var __ = new DatatypeConstructorCheckConstraint(value, fnTuple!.Func.Name.Split(".").Last());
+        // Elt is a datatype value
+        var destructors = GetDestructorFunctions(value.Element).OrderBy(f => f.Name).ToList();
+        if (destructors.Count > fnTuple.Args.Length) {
+          // Try to filter out predicate functions
+          // (that follow a format very similar to that of destructor names)
+          destructors = destructors.Where(destructor =>
+              fnTuple.Args.Any(arg => Equals(destructor.OptEval(value.Element), arg)))
+            .ToList();
+        }
+
+        var elements = new List<PartialValue>();
+        if (destructors.Count == fnTuple.Args.Length) {
+          // we know all destructor names
+          foreach (var func in destructors) {
+            if (func.OptEval(value.Element) is not { } modelElement) {
+              continue;
+            }
+            var element = PartialValue.Get(UnboxNotNull(modelElement), state);
+            elements.Add(element);
+            var elementName = UnderscoreRemovalRegex.Replace(func.Name.Split(".").Last(), "_");
+            var _ = new MemberSelectExprDatatypeConstraint(element, value, elementName);
+          }
+        } else {
+          // we don't know destructor names, so we use indices instead
+          for (int i = 0; i < fnTuple.Args.Length; i++) {
+            var element = PartialValue.Get(UnboxNotNull(fnTuple.Args[i]), state);
+            elements.Add(element);
+          }
+        }
+        var ___ = new DatatypeValueConstraint(value, value.Type.ToString(), fnTuple.Func.Name.Split(".").Last(), elements);
+        return;
+      }
+
+      switch (value.Type) {
+        case SeqType: {
+            if (fSeqEmpty.AppWithResult(value.Element) != null) {
+              var _ = new LiteralExprConstraint(value, new SeqDisplayExpr(Token.NoToken, new List<Expression>()));
+              return;
+            }
+            var lenghtTuple = fSeqLength.AppWithArg(0, value.Element);
+            BigNum seqLength = BigNum.MINUS_ONE;
+            if (lenghtTuple != null) {
+              var lengthValue = PartialValue.Get(lenghtTuple.Result, state);
+              var lengthValueLiteral = GetLiteralExpression(lengthValue.Element, lengthValue.Type);
+              if (lengthValueLiteral != null) {
+                BigNum.TryParse(lengthValueLiteral.ToString(), out seqLength);
+              }
+              var _ = new CardinalityConstraint(lengthValue, value);
+            }
+
+            // Sequences can be constructed with the build operator:
+            List<PartialValue> elements = new();
+
+            Model.Element substring = value.Element;
+            while (fSeqBuild.AppWithResult(substring) != null) {
+              elements.Insert(0, PartialValue.Get(UnboxNotNull(fSeqBuild.AppWithResult(substring)!.Args[1]), state));
+              substring = fSeqBuild.AppWithResult(substring)!.Args[0];
+            }
+
+            for (int i = 0; i < elements.Count; i++) {
+              var index = new LiteralExpr(Token.NoToken, i) {
+                Type = Type.Int
+              };
+              var _ = new SeqSelectExprWithLiteralConstraint(elements[i], value, index);
+            }
+
+            if (elements.Count == 0) {
+              foreach (var funcTuple in fSeqIndex.AppsWithArg(0, value.Element)) {
+                var elementId = PartialValue.Get(funcTuple.Args[1], state);
+                var elementIdTry = GetLiteralExpression(funcTuple.Args[1], Type.Int);
+                if (elementIdTry != null && elementIdTry.ToString().Contains("-")) {
+                  continue;
+                }
+                if (elementIdTry != null && BigNum.TryParse(elementIdTry.ToString(), out var elementIdTryBigNum)) {
+                  if (!seqLength.Equals(BigNum.MINUS_ONE) && !(elementIdTryBigNum - seqLength).IsNegative) {
+                    continue; // element out of bounds for sequence
+                  }
+                }
+                var element = PartialValue.Get(UnboxNotNull(funcTuple.Result), state);
+                var _ = new SeqSelectExprConstraint(element, value, elementId);
+              }
+            } else {
+              var _ = new SeqDisplayConstraint(value, elements);
+            }
+
+            return;
+          }
+        case SetType: {
+            if (fMapDomain.AppsWithResult(value.Element).Any()) {
+              foreach (var map in fMapDomain.AppsWithResult(value.Element)) {
+                var mapValue = PartialValue.Get(map.Args[0], state);
+                var _ = new MemberSelectExprDatatypeConstraint(value, mapValue, "Keys");
+              }
+              return;
+            }
+            if (fMapValues.AppsWithResult(value.Element).Any()) {
+              foreach (var map in fMapValues.AppsWithResult(value.Element)) {
+                var mapValue = PartialValue.Get(map.Args[0], state);
+                var _ = new MemberSelectExprDatatypeConstraint(value, mapValue, "Values");
+              }
+            }
+            if (fSetEmpty.AppWithResult(value.Element) != null) {
+              var _ = new LiteralExprConstraint(value, new SetDisplayExpr(Token.NoToken, true, new List<Expression>()));
+              return;
+            }
+
+            foreach (var tpl in fSetMember.AppsWithArg(0, value.Element)) {
+              var setElement = PartialValue.Get(UnboxNotNull(tpl.Args[1]), state);
+              var containment = tpl.Result;
+              if (containment is Model.Boolean boolean) {
+                var _ = new ContainmentConstraint(setElement, value, boolean.Value);
+              }
+            }
+
+            return;
+          }
+        case MapType: {
+            var mapKeysAdded = new HashSet<Model.Element>(); // prevents mapping a key to multiple values
+            var mapsElementsVisited = new HashSet<Model.Element>(); // prevents infinite recursion
+            var current = value.Element;
+            var mapBuilds = fMapBuild.AppsWithResult(current).ToList();
+            var result = new List<PartialValue>();
+            while (mapBuilds.Count != 0) {
+              foreach (var mapBuild in mapBuilds.Where(m => Equals(m.Args[0], current))) {
+                result.AddRange(AddMappingHelper(
+                  state,
+                  value,
+                  Unbox(mapBuild.Args[1]),
+                  Unbox(mapBuild.Args[2]),
+                  mapKeysAdded));
+              }
+
+              mapsElementsVisited.Add(current);
+              var nextMapBuild = mapBuilds.FirstOrDefault(m => !mapsElementsVisited.Contains(m.Args[0]));
+              if (nextMapBuild == null) {
+                return;
+              }
+
+              current = nextMapBuild.Args[0];
+              mapBuilds = fMapBuild.AppsWithResult(nextMapBuild.Args[0])
+                .Where(m => !mapsElementsVisited.Contains(m.Args[0])).ToList();
+              result.AddRange(AddMappingHelper(
+                state,
+                value,
+                Unbox(nextMapBuild.Args[1]),
+                Unbox(nextMapBuild.Args[2]),
+                mapKeysAdded));
+            }
+
+            var mapDomain = fMapDomain.OptEval(current);
+            var mapElements = fMapElements.OptEval(current);
+            if (mapDomain != null && mapElements != null) {
+              foreach (var app in fSetMember.AppsWithArg(0, mapDomain)) {
+                var valueElement = fSelect.OptEval(mapElements, app.Args[1]);
+                if (valueElement != null) {
+                  valueElement = Unbox(valueElement);
+                }
+                result.AddRange(AddMappingHelper(
+                  state,
+                  value,
+                  Unbox(app.Args[1]),
+                  valueElement,
+                  mapKeysAdded, !((Model.Boolean)app.Result).Value));
+              }
+            }
+
+
+            if (!result.Any() && fMapEmpty.AppWithResult(value.Element) != null) {
+              var _ = new LiteralExprConstraint(value, new MapDisplayExpr(Token.NoToken, true, new List<ExpressionPair>()));
+            }
+
+            return;
+
+          }
+        default: {
+
+            var heap = state.State.TryGet("$Heap");
+            // Elt is an array or an object:
+            if (heap == null) {
+              return;
+            }
+
+            var constantFields = GetDestructorFunctions(value.Element).OrderBy(f => f.Name).ToList();
+            var fields = fSelect.AppsWithArgs(0, heap, 1, value.Element).ToList();
+
+            foreach (var fieldFunc in constantFields) {
+              if (fieldFunc.OptEval(value.Element) is not { } modelElement) {
+                continue;
+              }
+              var field = PartialValue.Get(UnboxNotNull(modelElement), state);
+              var fieldName = UnderscoreRemovalRegex.Replace(fieldFunc.Name.Split(".").Last(), "_");
+              if (fieldName.Contains("#")) {
+                continue;
+              }
+              var _ = new MemberSelectExprClassConstraint(field, value, fieldName);
+            }
+
+            if (!fields.Any()) {
+              return;
+            }
+
+            foreach (var tpl in fSelect.AppsWithArg(0, fields.ToList()[0].Result)) {
+              foreach (var fieldName in GetFieldNames(tpl.Args[1])) {
+                if (fieldName != "alloc") {
+                  var field = PartialValue.Get(UnboxNotNull(tpl.Result), state);
+                  // make sure the field in quetion is not an array index
+                  if (fieldName.Contains("#")) {
+                    continue;
+                  }
+                  if (fieldName.StartsWith('[') && fieldName.EndsWith(']')) {
+                    var indexStrings = fieldName.TrimStart('[').TrimEnd(']').Split(",");
+                    var indices = new List<LiteralExpr>();
+                    foreach (var indexString in indexStrings) {
+                      if (BigInteger.TryParse(indexString, out var index)) {
+                        var indexLiteral = new LiteralExpr(Token.NoToken, index);
+                        indexLiteral.Type = Type.Int;
+                        indices.Add(indexLiteral);
+                      }
+                    }
+                    if (indices.Count != indexStrings.Length) {
+                      continue;
+                    }
+                    var _ = new ArraySelectionConstraint(field, value, indices);
+                  } else {
+                    var _ = new MemberSelectExprClassConstraint(field, value, fieldName);
+                  }
+                }
+              }
+            }
+            return;
+          }
+      }
+    }
+
+    /// <summary>
+    /// Get the Dafny type of the value indicated by <param name="element"></param>
+    /// This is in contrast to ReconstructType, which returns the type indicated by the element itself.
+    /// This method tries to extract the base type (so sequence of characters instead of string)
+    /// </summary>
+    private Type GetDafnyType(Model.Uninterpreted element) {
+      var finalResult = UnknownType;
+      foreach (var typeElement in GetIsResults(element)) {
+        var reconstructedType = ReconstructType(typeElement);
+        if (reconstructedType is not UserDefinedType userDefinedType) {
+          return reconstructedType;
+        }
+        if (finalResult.Name.EndsWith("?") || finalResult == UnknownType) {
+          finalResult = userDefinedType;
+        }
+      }
+      var seqOperation = fSeqAppend.AppWithResult(element);
+      if (seqOperation != null && !exploredElements.Contains(seqOperation.Args[0])) { return GetDafnyType(seqOperation.Args[0]); }
+      seqOperation = fSeqDrop.AppWithResult(element);
+      if (seqOperation != null && !exploredElements.Contains(seqOperation.Args[0])) { return GetDafnyType(seqOperation.Args[0]); }
+      seqOperation = fSeqTake.AppWithResult(element);
+      if (seqOperation != null && !exploredElements.Contains(seqOperation.Args[0])) { return GetDafnyType(seqOperation.Args[0]); }
+      seqOperation = fSeqUpdate.AppWithResult(element);
+      if (seqOperation != null && !exploredElements.Contains(seqOperation.Args[0])) { return GetDafnyType(seqOperation.Args[0]); }
+      seqOperation = fSeqBuild.AppWithResult(element);
+      if (seqOperation != null && !exploredElements.Contains(UnboxNotNull(seqOperation.Args[1]))) { return new SeqType(GetDafnyType(UnboxNotNull(seqOperation.Args[1]))); }
+      seqOperation = fSeqCreate.AppWithResult(element);
+      if (seqOperation != null && !exploredElements.Contains(UnboxNotNull(seqOperation.Args.First()))) { return new SeqType(ReconstructType(seqOperation.Args.First())); }
+      if (fSeqEmpty.AppWithResult(element) != null) { return new SeqType(null); }
+      var setOperation = fSetUnion.AppWithResult(element);
+      if (setOperation != null && !exploredElements.Contains(setOperation.Args[0])) { return GetDafnyType(setOperation.Args[0]); }
+      setOperation = fSetIntersection.AppWithResult(element);
+      if (setOperation != null && !exploredElements.Contains(setOperation.Args[0])) { return GetDafnyType(setOperation.Args[0]); }
+      setOperation = fSetDifference.AppWithResult(element);
+      if (setOperation != null && !exploredElements.Contains(setOperation.Args[0])) { return GetDafnyType(setOperation.Args[0]); }
+      setOperation = fSetUnionOne.AppWithResult(element);
+      if (setOperation != null && !exploredElements.Contains(setOperation.Args[1])) { return new SetType(true, GetDafnyType(UnboxNotNull(setOperation.Args[1]))); }
+      if (fSetEmpty.AppWithResult(element) != null) { return new SetType(true, null); }
+      var mapOperation = fMapBuild.AppWithResult(element);
+      if (mapOperation != null) {
+        return new MapType(true, GetDafnyType(UnboxNotNull(mapOperation.Args[1])), GetDafnyType(UnboxNotNull(mapOperation.Args[2])));
+      }
+      var unboxedTypes = fIsBox.AppsWithArg(0, element)
+        .Where(tuple => ((Model.Boolean)tuple.Result).Value)
+        .Select(tuple => tuple.Args[1]).ToList();
+      if (unboxedTypes.Count == 1) {
+        return ReconstructType(unboxedTypes[0]);
+      }
+      if (fCharToInt.OptEval(element) != null) {
+        return Type.Char;
+      }
+      if (finalResult != UnknownType) {
+        return finalResult;
+      }
+      var dtypeElement = fDtype.OptEval(element);
+      if (dtypeElement != null) {
+        ReconstructType(dtypeElement);
+      }
+      if (datatypeValues.TryGetValue(element, out var fnTuple)) {
+        var fullyQualifiedPath = fnTuple.Func.Name[1..].Split(".");
+        return new UserDefinedType(Token.NoToken, string.Join(".", fullyQualifiedPath.Take(fullyQualifiedPath.Count() - 1)), null);
+      }
+      return finalResult;
+    }
+
+    /// <summary>
+    /// Reconstruct Dafny type from an element that represents a type in Z3
+    /// </summary>
+    private Type ReconstructType(Model.Element? typeElement) {
+      if (typeElement == null) {
+        return UnknownType;
+      }
+      var fullName = GetTrueTypeName(typeElement);
+      if (fullName is { Length: > 7 } && fullName[..7].Equals("Tclass.")) {
+        return new UserDefinedType(new Token(), fullName[7..], null);
+      }
+      switch (fullName) {
+        case "TInt":
+          return Type.Int;
+        case "TBool":
+          return Type.Bool;
+        case "TReal":
+          return Type.Real;
+        case "TChar":
+          return Type.Char;
+      }
+      if (fBv.AppWithResult(typeElement) is { } tupleWrapper) {
+        return new BitvectorType(options, ((Model.Integer)tupleWrapper.Args[0]).AsInt());
+      }
+
+      Type fallBackType = UnknownType; // to be returned in the event all else fails
+      if (fullName != null) { // this means this is a type variable
+        fallBackType = new UserDefinedType(new Token(), fullName, null);
+      }
+      var tagElement = fTag.OptEval(typeElement);
+      if (tagElement == null) {
+        return fallBackType;
+      }
+      var tagName = GetTrueTypeName(tagElement);
+      if (tagName == null || (tagName.Length < 10 && tagName != "TagSeq" &&
+                              tagName != "TagSet" &&
+                              tagName != "TagBitVector" &&
+                              tagName != "TagMap")) {
+        return fallBackType;
+      }
+      var typeArgs = Model.GetFunc("T" + tagName.Substring(3))?.
+        AppWithResult(typeElement)?.
+        Args.Select(ReconstructType).ToList();
+      if (typeArgs == null) {
+        return new UserDefinedType(new Token(), tagName.Substring(9), null);
+      }
+
+      switch (tagName) {
+        case "TagSeq":
+          return new SeqType(typeArgs.First());
+        case "TagMap":
+          return new MapType(true, typeArgs[0], typeArgs[1]);
+        case "TagSet":
+          return new SetType(true, typeArgs.First());
+        default:
+          tagName = tagName.Substring(9);
+          if (tagName.StartsWith("_System.___hFunc") ||
+              tagName.StartsWith("_System.___hTotalFunc") ||
+              tagName.StartsWith("_System.___hPartialFunc")) {
+            return new ArrowType(new Token(), typeArgs.SkipLast(1).ToList(),
+              typeArgs.Last());
+          }
+          return new UserDefinedType(new Token(), tagName, typeArgs);
+      }
+    }
+
+    /// <summary>
+    /// Perform operations necessary to add a mapping to a map variable,
+    /// return newly created PartialValue objects
+    /// </summary>
+    private IEnumerable<PartialValue> AddMappingHelper(PartialState state, PartialValue? mapVariable, Model.Element? keyElement, Model.Element? valueElement, HashSet<Model.Element> keySet, bool keyNotPresent = false) {
+      if (mapVariable == null || keyElement == null || keySet.Contains(keyElement)) {
+        yield break;
+      }
+      var key = PartialValue.Get(keyElement, state);
+      var opcode = keyNotPresent ? BinaryExpr.Opcode.NotIn : BinaryExpr.Opcode.In;
+      var _ = new ContainmentConstraint(key, mapVariable, opcode == BinaryExpr.Opcode.In);
+      // Note that it is possible for valueElement to not be null while the element is not present in the set!
+      if (valueElement != null && !keyNotPresent) {
+        var value = PartialValue.Get(valueElement, state);
+        var __ = new MapSelectExprConstraint(value, mapVariable, key);
+        yield return value;
+      }
+      keySet.Add(keyElement);
+      yield return key;
+    }
+
+    /// <summary>
+    /// Return all functions application relevant to an element. These can be:
+    /// 1) destructor values of a datatype
+    /// 2) constant fields of an object
+    /// 3) function applications
+    /// </summary>
+    private List<Model.Func> GetDestructorFunctions(Model.Element element) {
+      var possibleTypeIdentifiers = GetIsResults(element);
+      if (fDtype.OptEval(element) != null) {
+        possibleTypeIdentifiers.Add(fDtype.OptEval(element)!);
+      }
+      var possiblyNullableTypes = possibleTypeIdentifiers
+        .Select(ReconstructType).OfType<UserDefinedType>()
+        .Where(type => type.Name != UnknownType.Name);
+      var types = possiblyNullableTypes.Select(DafnyModelTypeUtils.GetNonNullable).OfType<UserDefinedType>().ToList();
+      List<Model.Func> result = new();
+      var builtInDatatypeDestructor = new Regex("^.*[^_](__)*_q$");
+      var canCallFunctions = new HashSet<string>();
+      foreach (var app in element.References) {
+        if (app.Func.Arity != 1 || !Equals(app.Args[0], element) ||
+            !types.Any(type => app.Func.Name.StartsWith(type.Name + ".")) ||
+            builtInDatatypeDestructor.IsMatch(app.Func.Name.Split(".").Last()) ||
+            app.Func.Name.Split(".").Last().StartsWith("_")) {
+          continue;
+        }
+
+        if (app.Func.Name.EndsWith("#canCall")) {
+          canCallFunctions.Add(app.Func.Name);
+        } else {
+          result.Add(app.Func);
+        }
+      }
+      return result.Where(func => canCallFunctions.All(canCall => !canCall.StartsWith(func.Name))).ToList();
+    }
+
+    /// <summary>
+    /// Return all function applications relevant to an element. 
+    /// </summary>
+    private List<Model.FuncTuple> GetFunctionConstants(Model.Element element, Model.Element? heap) {
+      var possibleTypeIdentifiers = GetIsResults(element);
+      if (fDtype.OptEval(element) != null) {
+        possibleTypeIdentifiers.Add(fDtype.OptEval(element)!);
+      }
+      var possiblyNullableTypes = possibleTypeIdentifiers
+        .Select(ReconstructType).OfType<UserDefinedType>()
+        .Where(type => type.Name != UnknownType.Name);
+      var types = possiblyNullableTypes.Select(DafnyModelTypeUtils.GetNonNullable).OfType<UserDefinedType>().ToList();
+      List<Model.FuncTuple> applications = new();
+      List<Model.FuncTuple> wellFormed = new();
+      foreach (var app in element.References) {
+        if (app.Args.Length == 0 || (!Equals(app.Args[0], element) && (heap == null || !Equals(app.Args[0], heap) || app.Args.Length == 1 || !Equals(app.Args[1], element))) ||
+            !types.Any(type => app.Func.Name.StartsWith(type.Name + ".")) ||
+            app.Func.Name.Split(".").Last().StartsWith("_")) {
+          continue;
+        }
+
+        if (app.Func.Name.EndsWith("#canCall")) {
+          if (app.Result is Model.Boolean { Value: true }) {
+            wellFormed.Add(app);
+          }
+        } else {
+          applications.Add(app);
+        }
+      }
+
+      return applications.Where(application =>
+        wellFormed.Any(wellFormedTuple => wellFormedTuple.Func.Name == application.Func.Name + "#canCall" &&
+                                          ((wellFormedTuple.Args.Length == application.Args.Length &&
+                                           wellFormedTuple.Args.SequenceEqual(application.Args)) ||
+                                          (wellFormedTuple.Args.Length == application.Args.Length - 1 &&
+                                           wellFormedTuple.Args.SequenceEqual(application.Args[1..]))))
+      ).ToList();
+    }
+
+    /// <summary>
+    /// Return the name of the field represented by the given element.
+    /// Special care is required if the element represents an array index
+    /// </summary>
+    private List<string> GetFieldNames(Model.Element? elt) {
+      if (elt == null) {
+        return new List<string>();
+      }
+      var dims = fDim.OptEval(elt)?.AsInt();
+      if (dims is null or 0) { // meaning elt is not an array index
+        return elt.Names.Where(tuple =>
+          tuple.Func.Arity == 0 && !tuple.Func.Name.Contains("$"))
+          .Select(tuple => UnderscoreRemovalRegex
+            .Replace(tuple.Func.Name.Split(".").Last(), "_"))
+          .ToList();
+      }
+      // Reaching this code means elt is an index into an array
+      var indices = new Model.Element?[(int)dims];
+      for (int i = (int)dims; 0 <= --i;) {
+        ModelFuncWrapper.ModelFuncTupleWrapper? dimTuple;
+        if (i == 0) {
+          dimTuple = fIndexField.AppWithResult(elt);
+          if (dimTuple == null) {
+            continue;
+          }
+          indices[i] = dimTuple.Args[0];
+        } else {
+          dimTuple = fMultiIndexField.AppWithResult(elt);
+          if (dimTuple == null) {
+            continue;
+          }
+          indices[i] = dimTuple.Args[1];
+          elt = dimTuple.Args[0];
+        }
+      }
+      return new List<string>() {
+        "[" + string.Join(",",
+          indices.ToList().ConvertAll(element => element == null ? "null" : element.ToString())) + "]"
+      };
+    }
+
+    /// <summary> Unboxes an element, if possible </summary>
+    private Model.Element? Unbox(Model.Element? elt) {
+      return elt == null ? null : UnboxNotNull(elt);
+    }
+
+    /// <summary> Unboxes an element, if possible </summary>
+    private Model.Element UnboxNotNull(Model.Element elt) {
+      var unboxed = fBox.AppWithResult(elt);
+      if (unboxed != null) {
+        return UnboxNotNull(unboxed.Args[0]);
+      }
+      unboxed = fUnbox.AppWithArg(1, elt);
+      return unboxed != null ? UnboxNotNull(unboxed.Result) : elt;
+    }
+  }
+}
diff --git a/Source/DafnyCore/CounterExampleGeneration/DafnyModelTypeUtils.cs b/Source/DafnyCore/CounterExampleGeneration/DafnyModelTypeUtils.cs
new file mode 100644
index 00000000000..c2da461ff7d
--- /dev/null
+++ b/Source/DafnyCore/CounterExampleGeneration/DafnyModelTypeUtils.cs
@@ -0,0 +1,138 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+#nullable enable
+
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.Dafny {
+
+  /// <summary>
+  /// This class stores various transformations that could be useful to perform
+  /// on types extracted from DafnyModel (e.g. to convert Boogie type names
+  /// back to the original Dafny names)
+  /// </summary>
+  public static class DafnyModelTypeUtils {
+
+    private static readonly Regex ModuleSeparatorRegex = new("(?<=[^_](__)*)_m");
+    private static readonly Regex UnderscoreRemovalRegex = new("__");
+    private static readonly Regex TupleRegex = new("_[Ss]ystem\\._?[Tt]uple#?");
+
+    public static Type GetNonNullable(Type type) {
+      if (type is not UserDefinedType userType) {
+        return type;
+      }
+
+      return new UserDefinedType(new Token(),
+        userType.Name.TrimEnd('?'), userType.TypeArgs);
+    }
+
+    public static Type ReplaceTypeVariables(Type type, Type with) {
+      var result = ReplaceType(type, t => t.Name.Contains('$'), _ => with);
+      FillInTypeArgs(result, with);
+      return result;
+    }
+
+    /// <summary>
+    /// Recursively replace all types within <param>type</param> that satisfy
+    /// <param>condition</param>
+    /// </summary>
+    public static Type ReplaceType(Type type, Func<UserDefinedType, Boolean> condition,
+      Func<UserDefinedType, Type> replacement) {
+      if ((type is not UserDefinedType userType) || (type is ArrowType) || (type.AsArrowType != null)) {
+        return TransformType(type, t => ReplaceType(t, condition, replacement));
+      }
+      var newType = condition(userType) ? replacement(userType) : type;
+      newType.TypeArgs = newType.TypeArgs.ConvertAll(t =>
+        TransformType(t, t => ReplaceType(t, condition, replacement)));
+      if (newType is not UserDefinedType newUserType) {
+        return newType;
+      }
+      return new UserDefinedType(newUserType.Origin, newUserType.Name,
+        newUserType.TypeArgs);
+    }
+
+    public static Type GetInDafnyFormat(Type type) {
+      if ((type is not UserDefinedType userType) || (type is ArrowType) || (type.AsArrowType != null)) {
+        return TransformType(type, GetInDafnyFormat);
+      }
+      // The line below converts "_m" used in boogie to separate modules to ".":
+      var newName = ModuleSeparatorRegex.Replace(userType.Name, ".");
+      // strip everything after @, this is done for type variables:
+      newName = newName.Split("@")[0];
+      // The code below converts every "__" to "_":
+      newName = UnderscoreRemovalRegex.Replace(newName, "_");
+      newName = ConvertTupleName(newName);
+      newName = string.Join(".", newName.Split(".")
+        .Where(part => part != "_module" && part != "_default" && part != "_System"));
+      return new UserDefinedType(new Token(), newName,
+        type.TypeArgs.ConvertAll(t => TransformType(t, GetInDafnyFormat)));
+    }
+
+    public static string ConvertTupleName(string name) {
+      return TupleRegex.Replace(name, "_tuple#");
+    }
+
+    /// <summary>
+    /// Recursively transform all UserDefinedType objects within a given type
+    /// </summary>
+    private static Type TransformType(Type type, Func<UserDefinedType, Type> transform) {
+      if (type is ArrowType || type.AsArrowType != null) {
+        var arrowType = type.AsArrowType;
+        return new ArrowType(new Token(),
+          arrowType.Args.Select(t => TransformType(t, transform)).ToList(),
+          TransformType(arrowType.Result, transform));
+      }
+      switch (type) {
+        case BasicType:
+          return type;
+        case MapType mapType when mapType.HasTypeArg():
+          return new MapType(mapType.Finite,
+            TransformType(mapType.Domain, transform),
+            TransformType(mapType.Range, transform));
+        case SeqType seqType when seqType.HasTypeArg():
+          return new SeqType(TransformType(seqType.Arg, transform));
+        case SetType setType when setType.HasTypeArg():
+          return new SetType(setType.Finite, TransformType(setType.Arg, transform));
+        case MultiSetType multiSetType when multiSetType.HasTypeArg():
+          return new MultiSetType(TransformType(multiSetType, transform));
+        case UserDefinedType userDefinedType:
+          return transform(userDefinedType);
+        case InferredTypeProxy inferredTypeProxy:
+          var tmp = new InferredTypeProxy();
+          tmp.T = TransformType(inferredTypeProxy.T, transform);
+          return tmp;
+      }
+      return type;
+    }
+
+    /// <summary>
+    /// Whenever a collection type does not have an argument, fill it in with the provided arg type
+    /// </summary>
+    private static void FillInTypeArgs(Type type, Type arg) {
+      switch (type) {
+        case BasicType:
+          return;
+        case MapType mapType when !mapType.HasTypeArg():
+          mapType.SetTypeArgs(arg, arg);
+          return;
+        case SeqType seqType when !seqType.HasTypeArg():
+          seqType.SetTypeArg(arg);
+          return;
+        case SetType setType when !setType.HasTypeArg():
+          setType.SetTypeArg(arg);
+          return;
+        case MultiSetType multiSetType when !multiSetType.HasTypeArg():
+          multiSetType.SetTypeArg(arg);
+          return;
+        case UserDefinedType userDefinedType:
+          userDefinedType.TypeArgs.ForEach(typ => FillInTypeArgs(typ, arg));
+          return;
+        case InferredTypeProxy inferredTypeProxy:
+          FillInTypeArgs(inferredTypeProxy.T, arg);
+          return;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/CounterExampleGeneration/ModelFuncWrapper.cs b/Source/DafnyCore/CounterExampleGeneration/ModelFuncWrapper.cs
similarity index 78%
rename from Source/DafnyLanguageServer/CounterExampleGeneration/ModelFuncWrapper.cs
rename to Source/DafnyCore/CounterExampleGeneration/ModelFuncWrapper.cs
index a6747f8b92e..5970115bc65 100644
--- a/Source/DafnyLanguageServer/CounterExampleGeneration/ModelFuncWrapper.cs
+++ b/Source/DafnyCore/CounterExampleGeneration/ModelFuncWrapper.cs
@@ -1,13 +1,13 @@
 // Copyright by the contributors to the Dafny Project
 // SPDX-License-Identifier: MIT
+#nullable enable
 
-#nullable disable
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Boogie;
 
-namespace Microsoft.Dafny.LanguageServer.CounterExampleGeneration;
+namespace Microsoft.Dafny;
 
 
 /// <summary>
@@ -29,25 +29,30 @@ public ModelFuncWrapper(DafnyModel model, string name, int arity, int argsToSkip
     func = model.Model.MkFunc(name, arity + this.argsToSkip);
   }
 
-  private ModelFuncTupleWrapper ConvertFuncTuple(Model.FuncTuple tuple) {
-    return tuple == null ? null : new ModelFuncTupleWrapper(func, tuple.Result, tuple.Args[argsToSkip..]);
+  public ModelFuncWrapper(Model.Func func, int argsToSkip) {
+    this.func = func;
+    this.argsToSkip = argsToSkip;
+  }
+
+  private ModelFuncTupleWrapper? ConvertFuncTuple(Model.FuncTuple? tuple) {
+    return tuple == null ? null : new ModelFuncTupleWrapper(tuple.Result, tuple.Args[argsToSkip..]);
   }
 
-  public ModelFuncTupleWrapper AppWithResult(Model.Element element) {
+  public ModelFuncTupleWrapper? AppWithResult(Model.Element element) {
     return ConvertFuncTuple(func.AppWithResult(element));
   }
 
   public IEnumerable<ModelFuncTupleWrapper> AppsWithResult(Model.Element element) {
-    return func.AppsWithResult(element).Select(ConvertFuncTuple);
+    return func.AppsWithResult(element).Select(ConvertFuncTuple).OfType<ModelFuncTupleWrapper>();
   }
 
-  public IEnumerable<ModelFuncTupleWrapper> Apps => func.Apps.Select(ConvertFuncTuple);
+  public IEnumerable<ModelFuncTupleWrapper> Apps => func.Apps.Select(ConvertFuncTuple).OfType<ModelFuncTupleWrapper>();
 
-  public Model.Element GetConstant() {
+  public Model.Element? GetConstant() {
     return func.GetConstant();
   }
 
-  public Model.Element OptEval(Model.Element element) {
+  public Model.Element? OptEval(Model.Element? element) {
     if (element == null) {
       return null;
     }
@@ -55,11 +60,11 @@ public Model.Element OptEval(Model.Element element) {
     return app?.Result;
   }
 
-  public ModelFuncTupleWrapper AppWithArg(int index, Model.Element element) {
+  public ModelFuncTupleWrapper? AppWithArg(int index, Model.Element element) {
     return ConvertFuncTuple(func.AppWithArg(argsToSkip + index, element));
   }
 
-  public Model.Element OptEval(Model.Element first, Model.Element second) {
+  public Model.Element? OptEval(Model.Element? first, Model.Element? second) {
     if (first == null || second == null) {
       return null;
     }
@@ -68,11 +73,11 @@ public Model.Element OptEval(Model.Element first, Model.Element second) {
   }
 
   public IEnumerable<ModelFuncTupleWrapper> AppsWithArg(int i, Model.Element element) {
-    return func.AppsWithArg(i + argsToSkip, element).Select(ConvertFuncTuple);
+    return func.AppsWithArg(i + argsToSkip, element).Select(ConvertFuncTuple).OfType<ModelFuncTupleWrapper>();
   }
 
   public IEnumerable<ModelFuncTupleWrapper> AppsWithArgs(int i0, Model.Element element0, int i1, Model.Element element1) {
-    return func.AppsWithArgs(i0 + argsToSkip, element0, i1 + argsToSkip, element1).Select(ConvertFuncTuple);
+    return func.AppsWithArgs(i0 + argsToSkip, element0, i1 + argsToSkip, element1).Select(ConvertFuncTuple).OfType<ModelFuncTupleWrapper>();
   }
 
   /// <summary>
@@ -108,13 +113,11 @@ public class ModelFuncTupleWrapper {
 
     static readonly Model.Element[] EmptyArgs = Array.Empty<Model.Element>();
 
-    public readonly Model.Func Func;
-    public Model.Element Result;
+    public readonly Model.Element Result;
     public readonly Model.Element[] Args;
 
-    public ModelFuncTupleWrapper(Model.Func func, Model.Element res, Model.Element[] args) {
+    public ModelFuncTupleWrapper(Model.Element res, Model.Element[] args) {
       Args = args ?? EmptyArgs;
-      Func = func;
       Result = res;
     }
   }
diff --git a/Source/DafnyCore/CounterExampleGeneration/PartialState.cs b/Source/DafnyCore/CounterExampleGeneration/PartialState.cs
new file mode 100644
index 00000000000..381207828e1
--- /dev/null
+++ b/Source/DafnyCore/CounterExampleGeneration/PartialState.cs
@@ -0,0 +1,324 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+public class PartialState {
+
+  public bool IsLoopEntryState => FullStateName.Contains(CaptureStateExtensions.AfterLoopIterationsStateMarker);
+  // ghost variables introduced by the counterexample whose values must be true for the counterexample to hold:
+  public List<string> LoopGuards = new();
+  public readonly Dictionary<PartialValue, List<string>> KnownVariableNames = new();
+  private readonly List<PartialValue> initialPartialValues;
+  internal readonly DafnyModel Model;
+  internal readonly Model.CapturedState State;
+  private const string InitialStateName = "<initial>";
+  private static readonly Regex StatePositionRegex = new(
+    @".*\((?<line>\d+),(?<character>\d+)\)",
+    RegexOptions.IgnoreCase | RegexOptions.Singleline
+  );
+  internal readonly Dictionary<Model.Element, PartialValue> AllPartialValues = new();
+
+  private const string BoundVarPrefix = "boundVar";
+
+  internal PartialState(DafnyModel model, Model.CapturedState state) {
+    Model = model;
+    State = state;
+    initialPartialValues = new List<PartialValue>();
+    SetupBoundVars();
+    SetupVars();
+  }
+
+  /// <summary>
+  /// Start with the union of vars and boundVars and expand the set by adding 
+  /// all partial values that are necessary to fully constrain the counterexample.
+  /// </summary>
+  /// <returns>Set of partial values</returns>
+  public HashSet<PartialValue> ExpandedVariableSet() {
+    HashSet<PartialValue> expandedSet = new();
+    // The following is the queue for elements to be added to the set. The 2nd
+    // element of a tuple is the depth of the variable w.r.t. the original set
+    List<Tuple<PartialValue, int>> varsToAdd = new();
+    initialPartialValues.ForEach(variable => varsToAdd.Add(new(variable, 0)));
+    while (varsToAdd.Count != 0) {
+      var (next, depth) = varsToAdd[0];
+      varsToAdd.RemoveAt(0);
+      if (expandedSet.Contains(next)) {
+        continue;
+      }
+      expandedSet.Add(next);
+      // fields of primitive types are skipped:
+      foreach (var v in next.GetRelatedValues().
+          Where(variable => !expandedSet.Contains(variable))) {
+        varsToAdd.Add(new(v, depth + 1));
+      }
+    }
+    return expandedSet;
+  }
+
+  /// <summary>
+  /// Return a conjunction of expression that is represented by a balanced AST. This is intended to prevent
+  /// stackoverflow errors that occur if multiple conjuncts are joined in a linked list fashion.
+  /// </summary>
+  /// <returns></returns>
+  private Expression GetCompactConjunction(List<Expression> conjuncts) {
+    if (!conjuncts.Any()) {
+      return new LiteralExpr(Token.NoToken, true);
+    }
+
+    if (conjuncts.Count() == 1) {
+      return conjuncts.First();
+    }
+
+    var middle = conjuncts.Count() / 2;
+    var left = GetCompactConjunction(conjuncts.Take(middle).ToList());
+    var right = GetCompactConjunction(conjuncts.Skip(middle).ToList());
+    return new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, left, right);
+  }
+
+  /// <summary>
+  /// Convert this counterexample state into an assumption that could be inserted in Dafny source code
+  /// </summary>
+  public Statement AsAssumption() {
+    var allVariableNames = new Dictionary<PartialValue, Expression>();
+    var variables = ExpandedVariableSet().ToArray();
+    var constraintSet = new HashSet<Constraint>();
+
+    // Collect all constraints into one list:
+    foreach (var variable in variables) {
+      foreach (var constraint in variable.Constraints) {
+        constraintSet.Add(constraint);
+      }
+    }
+
+    // Ignore TypeTest constraints because they make the counterexample too verbose
+    var constraints = constraintSet.Where(constraint => constraint is not TypeTestConstraint).ToList();
+    constraints = Constraint.ResolveAndOrder(allVariableNames, constraints, true, true);
+
+    // Create a bound variable for every partial value that we cannot otherwise refer to using variables in scope
+    var boundVars = new List<BoundVar>();
+    for (int i = 0; i < variables.Length; i++) {
+      if (!allVariableNames.ContainsKey(variables[i])) {
+        boundVars.Add(new BoundVar(Token.NoToken, BoundVarPrefix + boundVars.Count, variables[i].Type));
+        allVariableNames[variables[i]] = new IdentifierExpr(Token.NoToken, boundVars.Last());
+      }
+    }
+
+    // Translate all constraints to Dafny expressions, removing any duplicates:
+    var constraintsAsExpressions = new List<Expression>();
+    var constraintsAsStrings = new HashSet<String>();
+    foreach (var constraint in constraints) {
+      var constraintAsExpression = constraint.AsExpression(allVariableNames);
+      if (constraintAsExpression == null) {
+        continue;
+      }
+      var constraintAsString = constraintAsExpression.ToString();
+      if (constraintsAsStrings.Contains(constraintAsString)) {
+        continue;
+      }
+
+      constraintsAsStrings.Add(constraintAsString);
+      constraintsAsExpressions.Add(constraintAsExpression);
+    }
+
+    // Convert the constraints into one conjunction
+    Expression expression = GetCompactConjunction(constraintsAsExpressions);
+
+    if (constraintsAsExpressions.Count > 0 && boundVars.Count > 0) {
+      expression = new ExistsExpr(Token.NoToken, boundVars, null, expression, null);
+    }
+
+    if ((LoopGuards.Count != 0 && !IsLoopEntryState) || LoopGuards.Count > 1) {
+      Expression loopGuard = new IdentifierExpr(Token.NoToken, LoopGuards[0]);
+      for (int i = 1; i < LoopGuards.Count; i++) {
+        if (i == LoopGuards.Count - 1 && IsLoopEntryState) {
+          continue;
+        }
+        loopGuard = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, loopGuard,
+          new IdentifierExpr(Token.NoToken, LoopGuards[i]));
+      }
+      expression = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Imp, loopGuard, expression);
+    }
+
+    if (!IsLoopEntryState) {
+      return new AssumeStmt(SourceOrigin.NoToken, expression, null);
+    }
+    return new AssignStatement(SourceOrigin.NoToken, new List<Expression>() { new IdentifierExpr(Token.NoToken, LoopGuards.Last()) },
+        new List<AssignmentRhs>() { new ExprRhs(expression) });
+  }
+
+  /// <summary>
+  /// Initialize the vars list, which stores all variables relevant to
+  /// the counterexample except for the bound variables
+  /// </summary>
+  private void SetupVars() {
+    var names = Enumerable.Empty<string>();
+    foreach (var partialState in Model.States) {
+      names = names.Concat(partialState.State.Variables);
+    }
+    names = names.Concat(State.Variables).Distinct().ToList();
+    var notDefinitelyAssigned = new HashSet<string>();
+    foreach (var name in names.Where(name => name.StartsWith(BoogieGenerator.DefassPrefix))) {
+      var val = State.TryGet(name);
+      if (val == null) {
+        continue;
+      }
+      if (val is Model.Boolean { Value: false }) {
+        notDefinitelyAssigned.Add(name[7..]);
+      }
+    }
+    foreach (var v in names) {
+      if (!IsUserVariableName(v) || notDefinitelyAssigned.Contains(v)) {
+        continue;
+      }
+      var val = State.TryGet(v);
+      if (val == null) {
+        continue; // This variable has no value in the model, so ignore it.
+      }
+
+      var value = PartialValue.Get(val, this);
+      initialPartialValues.Add(value);
+      var _ = new IdentifierExprConstraint(value, v.Split("#").First());
+      if (!KnownVariableNames.ContainsKey(value)) {
+        KnownVariableNames[value] = new List<string>();
+      }
+      KnownVariableNames[value].Add(v.Split("#").First());
+    }
+  }
+
+  /// <summary>
+  /// Return True iff the variable name is referring to a variable that has
+  /// a direct analog in Dafny source (i.e. not $Heap, $_Frame, $nw, etc.)
+  /// </summary>
+  private static bool IsUserVariableName(string name) =>
+    !name.Contains("$") && name.Count(c => c == '#') <= 1;
+
+  /// <summary>
+  /// Instantiate BoundVariables
+  /// </summary>
+  private void SetupBoundVars() {
+    foreach (var f in Model.Model.Functions) {
+      if (f.Arity != 0) {
+        continue;
+      }
+      int n = f.Name.IndexOf('!');
+      if (n == -1) {
+        continue;
+      }
+      var name = f.Name[..n];
+      if (!name.Contains('#') || name.Contains('$')) {
+        continue;
+      }
+
+      var value = PartialValue.Get(f.GetConstant(), this);
+      initialPartialValues.Add(value);
+      var _ = new IdentifierExprConstraint(value, name);
+      if (!KnownVariableNames.ContainsKey(value)) {
+        KnownVariableNames[value] = new();
+      }
+      KnownVariableNames[value].Add(name);
+    }
+  }
+
+  public string FullStateName => State.Name;
+
+  private string ShortenedStateName => ShortenName(State.Name, 20);
+
+  public bool IsInitialState => FullStateName.Equals(InitialStateName);
+
+  public bool StateContainsPosition() {
+    return StatePositionRegex.Match(ShortenedStateName).Success;
+  }
+
+  public int GetLineId() {
+    var match = StatePositionRegex.Match(ShortenedStateName);
+    if (!match.Success) {
+      throw new ArgumentException(
+        $"state does not contain position: {ShortenedStateName}");
+    }
+    return int.Parse(match.Groups["line"].Value);
+  }
+
+  public int GetCharId() {
+    var match = StatePositionRegex.Match(ShortenedStateName);
+    if (!match.Success) {
+      throw new ArgumentException(
+        $"state does not contain position: {ShortenedStateName}");
+    }
+    return int.Parse(match.Groups["character"].Value);
+  }
+
+  private static string ShortenName(string name, int fnLimit) {
+    var loc = TryParseSourceLocation(name);
+    if (loc != null) {
+      var fn = loc.Filename;
+      int idx = fn.LastIndexOfAny(new[] { '\\', '/' });
+      if (idx > 0) {
+        fn = fn[(idx + 1)..];
+      }
+      if (fn.Length > fnLimit) {
+        fn = fn[..fnLimit] + "..";
+      }
+      var addInfo = loc.AddInfo;
+      if (addInfo != "") {
+        addInfo = ":" + addInfo;
+      }
+      return $"{fn}({loc.Line},{loc.Column}){addInfo}";
+    }
+    return name;
+  }
+
+  /// <summary>
+  /// Parse a string (typically the name of the captured state in Boogie) to
+  /// extract a SourceLocation from it. An example of a string to be parsed:
+  /// @"c:\users\foo\bar.c(12,10) : random string"
+  /// The ": random string" part is optional.
+  /// </summary>
+  private static SourceLocation? TryParseSourceLocation(string name) {
+    int par = name.LastIndexOf('(');
+    if (par <= 0) {
+      return null;
+    }
+    // var res = new SourceLocation { Filename = name[..par] };
+    var words = name[(par + 1)..]
+      .Split(',', ')', ':')
+      .Where(x => x != "")
+      .ToArray();
+    if (words.Length < 2) {
+      return null;
+    }
+    if (!int.TryParse(words[0], out var line) ||
+        !int.TryParse(words[1], out var column)) {
+      return null;
+    }
+    int colon = name.IndexOf(':', par);
+    var res = new SourceLocation(
+      name[..par],
+      colon > 0 ? name[(colon + 1)..].Trim() : "",
+      line,
+      column);
+    return res;
+  }
+
+  private class SourceLocation {
+    public readonly string Filename;
+    public readonly string AddInfo;
+    public readonly int Line;
+    public readonly int Column;
+
+    public SourceLocation(string filename, string addInfo, int line, int column) {
+      Filename = filename;
+      AddInfo = addInfo;
+      Line = line;
+      Column = column;
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/CounterExampleGeneration/PartialValue.cs b/Source/DafnyCore/CounterExampleGeneration/PartialValue.cs
new file mode 100644
index 00000000000..c8125fbd65b
--- /dev/null
+++ b/Source/DafnyCore/CounterExampleGeneration/PartialValue.cs
@@ -0,0 +1,180 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+#nullable enable
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// Each PartialValue corresponds to an Element in the counterexample model returned by Boogie and represents a
+/// Dafny value about which we might have limited information (e.g. a sequence of which we only know one element)
+/// </summary>
+public class PartialValue {
+
+  public readonly Model.Element Element; // the element in the counterexample model associated with the value
+  public readonly List<Constraint> Constraints; // constraints describing this value
+  public readonly PartialState state; // corresponding state in the counterexample model
+  private readonly Type type; // Dafny type associated with the value
+  private bool haveExpanded;
+
+  /// <summary>
+  /// This factory method ensures we don't create duplicate partial value objects for the same element and state in the
+  /// counterexample model
+  /// </summary>
+  public static PartialValue Get(Model.Element element, PartialState state) {
+    if (state.AllPartialValues.TryGetValue(element, out var value)) {
+      return value;
+    }
+
+    return new PartialValue(element, state);
+  }
+
+  private PartialValue(Model.Element element, PartialState state) {
+    Element = element;
+    this.state = state;
+    Constraints = new();
+    haveExpanded = false;
+    state.AllPartialValues[element] = this;
+    type = state.Model.GetFormattedDafnyType(element);
+    var _ = new TypeTestConstraint(this, type);
+    state.Model.AddTypeConstraints(this);
+  }
+
+  /// <summary>
+  /// Return all partial values that appear in any of the constraints describing this element
+  /// </summary>
+  public IEnumerable<PartialValue> GetRelatedValues() {
+    var relatedValues = new HashSet<PartialValue>() { this };
+    if (!haveExpanded) {
+      state.Model.GetExpansion(state, this);
+      haveExpanded = true;
+    }
+
+    foreach (var constraint in Constraints) {
+      foreach (var value in constraint.ReferencedValues) {
+        if (!relatedValues.Contains(value)) {
+          relatedValues.Add(value);
+          yield return value;
+        }
+      }
+
+      if (constraint is DefinitionConstraint definitionConstraint &&
+          !relatedValues.Contains(definitionConstraint.DefinedValue)) {
+        relatedValues.Add(definitionConstraint.DefinedValue);
+        yield return definitionConstraint.DefinedValue;
+      }
+    }
+  }
+
+  public bool Nullable => Constraints.OfType<TypeTestConstraint>()
+    .Any(test => test.Type is UserDefinedType userDefinedType && userDefinedType.Name.EndsWith("?"));
+
+  public Type Type => type;
+
+  public string PrimitiveLiteral {
+    get {
+      return Constraints.OfType<LiteralExprConstraint>()
+        .Select(literal => literal.LiteralExpr.ToString()).FirstOrDefault() ?? "";
+    }
+  }
+
+  public Dictionary<string, PartialValue> Fields() {
+    var fields = new Dictionary<string, PartialValue>();
+    foreach (var memberSelectExpr in Constraints.OfType<MemberSelectExprConstraint>()
+               .Where(constraint => Equals(constraint.Obj, this))) {
+      fields[memberSelectExpr.MemberName] = memberSelectExpr.DefinedValue;
+    }
+
+    return fields;
+  }
+
+  public IEnumerable<PartialValue> UnnamedDestructors() {
+    var datatypeValue = Constraints.OfType<DatatypeValueConstraint>()
+      .FirstOrDefault(constraint => Equals(constraint.DefinedValue, this));
+    if (datatypeValue != null) {
+      foreach (var destructor in datatypeValue.UnnamedDestructors) {
+        yield return destructor;
+      }
+    }
+  }
+
+  public IEnumerable<PartialValue> SetElements() {
+    return Constraints.OfType<ContainmentConstraint>()
+      .Where(containment => Equals(containment.Set, this))
+      .Select(containment => containment.Element);
+  }
+
+  public string DatatypeConstructorName() {
+    return Constraints.OfType<DatatypeConstructorCheckConstraint>()
+      .Select(constructorCheck => constructorCheck.ConstructorName).FirstOrDefault() ?? "";
+  }
+
+  public IEnumerable<(PartialValue Key, PartialValue Value)> Mappings() {
+    foreach (var mapping in Constraints.OfType<MapSelectExprConstraint>().Where(constraint => Equals(constraint.Map, this))) {
+      yield return new(mapping.Key, mapping.DefinedValue);
+    }
+  }
+
+  public int? Cardinality() {
+    if (Constraints.OfType<LiteralExprConstraint>().Any(constraint =>
+          (constraint.LiteralExpr is DisplayExpression displayExpression && !displayExpression.SubExpressions.Any()) ||
+          (constraint.LiteralExpr is MapDisplayExpr mapDisplayExpr && !mapDisplayExpr.Elements.Any()))) {
+      return 0;
+    }
+
+    var cardinality = Constraints.OfType<CardinalityConstraint>()
+      .FirstOrDefault(constraint => Equals(constraint.Collection, this))?.DefinedValue;
+    if (cardinality == null) {
+      return -1;
+    }
+
+    var cardinalityLiteral =
+      cardinality.Constraints.OfType<LiteralExprConstraint>().FirstOrDefault()?.LiteralExpr as LiteralExpr;
+    if (cardinalityLiteral == null) {
+      return -1;
+    }
+
+    if (cardinalityLiteral.Value is not BigInteger bigInteger ||
+        !bigInteger.LessThanOrEquals(new BigInteger(int.MaxValue))) {
+      return -1;
+    }
+
+    return (int)bigInteger;
+  }
+
+
+  public PartialValue? this[int i] {
+    get {
+      foreach (var seqSelectConstraint in Constraints.OfType<SeqSelectExprWithLiteralConstraint>()
+                 .Where(constraint => Equals(constraint.Seq, this))) {
+        if (seqSelectConstraint.Index.ToString() == i.ToString()) {
+          return seqSelectConstraint.DefinedValue;
+        }
+      }
+
+      foreach (var seqSelectConstraint in Constraints.OfType<SeqSelectExprConstraint>()
+                 .Where(constraint => Equals(constraint.Seq, this))) {
+        var indexLiteral = seqSelectConstraint.Index.Constraints.OfType<LiteralExprConstraint>().FirstOrDefault()
+          ?.LiteralExpr;
+        if (indexLiteral != null && indexLiteral.ToString() == i.ToString()) {
+          return seqSelectConstraint.DefinedValue;
+        }
+      }
+
+      return null;
+    }
+  }
+
+  public override bool Equals(object? obj) {
+    return obj is PartialValue other && other.Element == Element && other.state == state;
+  }
+
+  public override int GetHashCode() {
+    return Element.GetHashCode();
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/CoverageReport/CoverageLabel.cs b/Source/DafnyCore/CoverageReport/CoverageLabel.cs
new file mode 100644
index 00000000000..a8a53d63933
--- /dev/null
+++ b/Source/DafnyCore/CoverageReport/CoverageLabel.cs
@@ -0,0 +1,43 @@
+#nullable disable
+
+namespace Microsoft.Dafny;
+
+public enum CoverageLabel {
+  None,
+  NotApplicable,
+  FullyCovered,
+  NotCovered,
+  PartiallyCovered,
+}
+
+public static class CoverageLabelExtension {
+
+  /// <summary>
+  /// Combine coverage labels. E.g. FullyCovered + NotCovered = PartiallyCovered
+  /// </summary>
+  public static CoverageLabel Combine(CoverageLabel one, CoverageLabel two) {
+    if (one == CoverageLabel.NotApplicable || two == CoverageLabel.NotApplicable) {
+      return CoverageLabel.NotApplicable;
+    }
+    if (one == CoverageLabel.None) {
+      return two;
+    }
+    if (two == CoverageLabel.None) {
+      return one;
+    }
+    if (one == CoverageLabel.PartiallyCovered || two == CoverageLabel.PartiallyCovered || one != two) {
+      return CoverageLabel.PartiallyCovered;
+    }
+    return one;
+  }
+
+  public static string ToString(CoverageLabel label) {
+    return label switch {
+      CoverageLabel.FullyCovered => "fully covered",
+      CoverageLabel.NotCovered => "not covered",
+      CoverageLabel.PartiallyCovered => "partially covered",
+      _ => ""
+    };
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/CoverageReport/CoverageReport.cs b/Source/DafnyCore/CoverageReport/CoverageReport.cs
new file mode 100644
index 00000000000..9b5db49f03b
--- /dev/null
+++ b/Source/DafnyCore/CoverageReport/CoverageReport.cs
@@ -0,0 +1,92 @@
+#nullable disable
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+public class CoverageReport {
+
+  private readonly Dictionary<Uri, List<CoverageSpan>> labelsByFile;
+  private readonly Dictionary<Uri, HashSet<ModuleDefinition>> modulesByFile;
+  public readonly string Name; // the name to assign to this coverage report
+  public readonly string Units; // the units of coverage (plural). This will be written in the coverage report table.
+
+  public string Suffix { get; }
+
+  public string ActualPath { get; private set; }
+
+  public string ActualIndexPath { get; private set; }
+
+  /// <summary>
+  /// Generate a new empty coverage report for a given program.
+  /// If not null, scan the <param name="program"></param> for the list of files it consists of and populate the
+  /// labelsByFile dictionary. <param name="name"></param> is the title of the coverage report displayed in HTML files,
+  /// <param name="units"></param> are the units of coverage this report uses (to be displayed in the index HTML file),
+  /// <param name="suffix"></param> is the suffix to add to files that are part of this coverage report. 
+  /// </summary>
+  public CoverageReport(string name, string units, string suffix, Program program) {
+    Name = name;
+    Units = units;
+    this.Suffix = suffix;
+    labelsByFile = new();
+    modulesByFile = new();
+    if (program != null) {
+      RegisterFiles(program);
+    }
+  }
+
+  /// <summary>
+  /// Assign a coverage label to the code indicated by the <param name="span"></param> range token.
+  /// </summary>
+  public void LabelCode(IOrigin span, CoverageLabel label) {
+    Contract.Assert(labelsByFile.ContainsKey(span.Uri));
+    var labeledFile = labelsByFile[span.Uri];
+    var coverageSpan = new CoverageSpan(span, label);
+    labeledFile.Add(coverageSpan);
+  }
+
+  public IEnumerable<CoverageSpan> CoverageSpansForFile(Uri uri) {
+    return labelsByFile.GetOrDefault(uri, () => new List<CoverageSpan>());
+  }
+
+  public IEnumerable<ModuleDefinition> ModulesInFile(Uri uri) {
+    return modulesByFile.GetOrDefault(uri, () => new HashSet<ModuleDefinition>());
+  }
+
+  public IEnumerable<Uri> AllFiles() {
+    return labelsByFile.Keys;
+  }
+
+  public void RegisterFiles(Program program) {
+    RegisterFiles(program.DefaultModuleDef);
+  }
+
+  public void RegisterFile(Uri uri) {
+    if (!labelsByFile.ContainsKey(uri)) {
+      labelsByFile[uri] = new List<CoverageSpan>();
+    }
+  }
+
+  private void RegisterFiles(Node astNode) {
+    if (astNode.StartToken.ActualFilename != null) {
+      labelsByFile.GetOrCreate(astNode.StartToken.Uri, () => new List<CoverageSpan>());
+    }
+
+    if (astNode is LiteralModuleDecl moduleDecl) {
+      if (astNode.StartToken.ActualFilename != null) {
+        modulesByFile.GetOrCreate(astNode.StartToken.Uri, () => new HashSet<ModuleDefinition>()).Add(moduleDecl.ModuleDef);
+      }
+
+      RegisterFiles(moduleDecl.ModuleDef);
+    }
+
+    foreach (var declaration in astNode.Children.OfType<LiteralModuleDecl>()) {
+      RegisterFiles(declaration);
+    }
+    foreach (var declaration in astNode.Children.OfType<Declaration>()) {
+      RegisterFiles(declaration);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/CoverageReport/CoverageSpan.cs b/Source/DafnyCore/CoverageReport/CoverageSpan.cs
new file mode 100644
index 00000000000..c2345141535
--- /dev/null
+++ b/Source/DafnyCore/CoverageReport/CoverageSpan.cs
@@ -0,0 +1,23 @@
+#nullable disable
+using System;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public class CoverageSpan : IComparable<CoverageSpan> {
+
+  public readonly IOrigin Span;
+  public readonly CoverageLabel Label;
+
+  public CoverageSpan(IOrigin span, CoverageLabel label) {
+    Contract.Assert(span.Uri != null);
+    Contract.Assert(span.StartToken != null);
+    Contract.Assert(span.EndToken != null);
+    Span = span;
+    Label = label;
+  }
+
+  public int CompareTo(CoverageSpan other) {
+    return Span.StartToken.CompareTo(other.Span.StartToken);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Dafny.atg b/Source/DafnyCore/Dafny.atg
index ee0f32311d1..2f45f035fd3 100644
--- a/Source/DafnyCore/Dafny.atg
+++ b/Source/DafnyCore/Dafny.atg
@@ -20,727 +20,6 @@ using Microsoft.Dafny;
 using System.CommandLine;
 using static Microsoft.Dafny.ParseErrors;
 COMPILER Dafny
-/*--------------------------------------------------------------------------*/
-readonly Expression/*!*/ dummyExpr;
-readonly AssignmentRhs/*!*/ dummyRhs;
-readonly FrameExpression/*!*/ dummyFrameExpr;
-readonly Statement/*!*/ dummyStmt;
-readonly Statement/*!*/ dummyIfStmt;
-public readonly FileModuleDefinition theModule;
-public readonly List<Action<SystemModuleManager>> SystemModuleModifiers = new();
-DafnyOptions theOptions;
-int anonymousIds = 0;
-
-/// <summary>
-/// Holds the modifiers given for a declaration
-///
-/// Not all modifiers are applicable to all kinds of declarations.
-/// Errors are given when a modify does not apply.
-/// We also record the tokens for the specified modifiers so that
-/// they can be used in error messages.
-/// </summary>
-class DeclModifierData {
-  public bool IsAbstract;
-  public IToken AbstractToken;
-  public bool IsGhost;
-  public IToken GhostToken;
-  public bool IsStatic;
-  public IToken StaticToken;
-  public bool IsOpaque;
-  public IToken OpaqueToken;
-  public IToken FirstToken;
-}
-
-// Check that token has not been set, then set it.
-public void CheckAndSetToken(ref IToken token)
-{
-    if (token != null) {
-      SemErr(ErrorId.p_duplicate_modifier, t, "Duplicate declaration modifier: " + t.val);
-    }
-    token = t;
-}
-
-// Check that token has not been set, then set it, but just ignores if it was set already
-public void CheckAndSetTokenOnce(ref IToken token)
-{
-    if (token == null) {
-      token = t;
-    }
-}
-
-/// <summary>
-// A flags type used to tell what declaration modifiers are allowed for a declaration.
-/// </summary>
-[Flags]
-enum AllowedDeclModifiers {
-  None = 0,
-  Abstract = 1,
-  Ghost = 2,
-
-  // Means ghost not allowed because already implicitly ghost.
-  AlreadyGhost = 4,
-  Static = 8,
-  Opaque = 16
-};
-
-/// <summary>
-/// Check the declaration modifiers against those that are allowed.
-///
-/// The 'allowed' parameter specifies which declaration modifiers are allowed.
-/// The 'declCaption' parameter should be a string describing the kind of declaration.
-/// It is used in error messages.
-/// Any declaration modifiers that are present but not allowed are cleared.
-///</summary>
-void CheckDeclModifiers(ref DeclModifierData dmod, string declCaption, AllowedDeclModifiers allowed)
-{
-  declCaption = (declCaption.StartsWith("i") || declCaption.StartsWith("o") ? "an " : "a ") + declCaption;
-  if (dmod.IsAbstract && ((allowed & AllowedDeclModifiers.Abstract) == 0)) {
-    SemErr(ErrorId.p_abstract_not_allowed, dmod.AbstractToken, $"{declCaption} cannot be declared 'abstract'");
-    dmod.IsAbstract = false;
-  }
-  if (dmod.IsGhost) {
-    if ((allowed & AllowedDeclModifiers.AlreadyGhost) != 0) {
-      if (declCaption.Contains("-by-method")) {
-        SemErr(ErrorId.p_no_ghost_for_by_method, dmod.GhostToken,
-          $"{declCaption} has a ghost function body and a non-ghost method body; {declCaption} declaration does not use the 'ghost' keyword.");
-      } else if (declCaption == "a function" || declCaption == "a predicate") {
-        SemErr(ErrorId.p_ghost_forbidden_default_3, dmod.GhostToken, $"{declCaption} cannot be declared 'ghost' (it is 'ghost' by default when using --function-syntax:3)");
-      } else {
-        SemErr(ErrorId.p_ghost_forbidden_default, dmod.GhostToken, $"{declCaption} cannot be declared 'ghost' (it is 'ghost' by default)");
-      }
-      dmod.IsGhost = false;
-    } else if ((allowed & AllowedDeclModifiers.Ghost) == 0) {
-      SemErr(ErrorId.p_ghost_forbidden, dmod.GhostToken, $"{declCaption} cannot be declared 'ghost'");
-      dmod.IsGhost = false;
-    }
-  }
-  if (dmod.IsStatic && ((allowed & AllowedDeclModifiers.Static) == 0)) {
-    SemErr(ErrorId.p_no_static, dmod.StaticToken, $"{declCaption} cannot be declared 'static'");
-    dmod.IsStatic = false;
-  }
-  if (dmod.IsOpaque && ((allowed & AllowedDeclModifiers.Opaque) == 0)) {
-    SemErr(ErrorId.p_no_opaque, dmod.OpaqueToken, $"{declCaption} cannot be declared 'opaque'");
-    dmod.IsOpaque = false;
-  }
-}
-
-bool CheckAttribute(Errors errors, IToken attr, RangeToken range) {
-  // attr is the identifier of the Attribute
-  // range is from opening brace to closing brace
-  if (attr.val == "ignore") {
-    errors.Warning(ErrorId.p_deprecated_attribute, 
-      range,
-      $"attribute :{attr.val} is deprecated");
-    return false;
-  }
-  return true;
-}
-
-bool IsAssumeTypeKeyword(IToken la) {
-  return la.kind == _assume || la.kind == _assert || la.kind == _expect;
-}
-
-public void ApplyOptionsFromAttributes(Attributes attrs) {
-  var overrides = attrs.AsEnumerable().Where(a => a.Name == "options")
-    .Reverse().Select(a =>
-      (token: (a as UserSuppliedAttributes)?.tok,
-       options: a.Args.Select(arg => {
-         if (arg is not LiteralExpr {Value: string optStr}) {
-           SemErr(ErrorId.p_literal_string_required, arg.tok, "argument to :options attribute must be a literal string");
-           return null;
-         }
-         return optStr;
-       }).Where(opt => opt != null).ToArray()))
-    .Where(opts => opts.options.Any());
-
-  if (overrides.Any()) {
-    var options = new DafnyAttributeOptions(theOptions, errors);
-    foreach (var (token, opts) in overrides) {
-
-      var newOptionsCommand = new RootCommand();
-      newOptionsCommand.AddOption(CommonOptionBag.QuantifierSyntax);
-      newOptionsCommand.AddOption(Function.FunctionSyntaxOption);
-      var result = newOptionsCommand.Parse(string.Join(' ', opts));
-
-      if (!result.Errors.Any()) {
-        foreach (var option in newOptionsCommand.Options) {
-          var value = result.GetValueForOption(option);
-          options.Options.OptionArguments[option] = value;
-          options.ApplyBinding(option);
-        }
-        continue;
-      }
-
-      options.Token = token;
-      options.Parse(opts);
-    }
-    theOptions = options;
-  }
-}
-
-public Parser(DafnyOptions options, Scanner/*!*/ scanner, Errors/*!*/ errors)
-  : this(scanner, errors)  // the real work
-{
-  // initialize readonly fields
-  dummyExpr = new LiteralExpr(Token.NoToken);
-  dummyRhs = new ExprRhs(dummyExpr);
-  dummyFrameExpr = new FrameExpression(dummyExpr.tok, dummyExpr, null);
-  dummyStmt = new ReturnStmt(Token.NoToken.ToRange(), null);
-  var dummyBlockStmt = new BlockStmt(Token.NoToken.ToRange(), new List<Statement>());
-  dummyIfStmt = new IfStmt(Token.NoToken.ToRange(), false, null, dummyBlockStmt, null);
-  
-  theModule = new FileModuleDefinition(scanner.FirstToken);
-  theOptions = new DafnyOptions(options);
-}
-
-bool IsIdentifier(int kind) {
-  return kind == _ident || kind == _least || kind == _greatest || kind == _older || kind == _opaque;
-}
-
-bool IsQuantifierVariableDecl(QuantifiedVar previousVar) {
-  // Introducing per-quantified variable ranges creates some ambiguities in the grammar,
-  // since before that the range would terminate the quantifed domain. For example, the following statement:
-  //
-  // print set x | E, y;
-  //
-  // This would previously parse as two separate arguments to the print statement, but
-  // could now also be parsed as a single set comprehension argument with two quantified variables
-  // (and an invalid one since it would need an explicit ":: <Term>" section).
-  //
-  // Even worse:
-  //
-  // print set x | E, y <- C;
-  //
-  // This was a valid statement before as well, because "y <- C" would be parsed as the expression
-  // "y < (-C)".
-  //
-  // The /quantifierSyntax option is used to help migrate this otherwise breaking change:
-  // * /quantifierSyntax:3 keeps the old behaviour where a "| <Range>" always terminates the list of quantified variables.
-  // * /quantifierSyntax:4 instead attempts to parse additional quantified variables.
-  if (previousVar.Range != null && theOptions.QuantifierSyntax == QuantifierSyntaxOptions.Version3) {
-    return false;
-  }
-
-  scanner.ResetPeek();
-  IToken x = scanner.Peek();
-  return la.kind == _comma && IsIdentifier(x.kind);
-}
-
-// Checks for "<-", which has to be parsed as two separate tokens,
-// but ensures no whitespace between them.
-bool IsFromArrow() {
-  scanner.ResetPeek();
-  IToken x = scanner.Peek();
-  return la.kind == _openAngleBracket && x.kind == _minus
-    && la.line == x.line && la.col == x.col - 1; 
-}
-
-bool IsLabel(bool allowLabel) {
-  if (!allowLabel) {
-    return false;
-  }
-  scanner.ResetPeek();
-  IToken x = scanner.Peek();
-  return (IsIdentifier(la.kind) || la.kind == _digits) && x.kind == _colon;
-}
-
-bool IsKeywordForFormal() {
-  scanner.ResetPeek();
-  if (la.kind == _ghost || la.kind == _new || la.kind == _nameonly) {
-    return true;
-  } else if (la.kind == _older) {
-    // "older" is just a contextual keyword, so don't recognize it as a keyword if it must be an identifier
-    IToken x = scanner.Peek();
-    return x.kind != _colon;
-  }
-  return false;
-}
-
-bool IsBinding() {
-  scanner.ResetPeek();
-  IToken x = scanner.Peek();
-  return (IsIdentifier(la.kind) || la.kind == _digits) && x.kind == _gets;
-}
-
-bool IsAlternative() {
-  IToken x = scanner.Peek();
-  return (la.kind == _lbrace && x.kind == _case)
-      || la.kind == _case;
-}
-
-bool IsParenIdentsColon() {
-  IToken x = la;
-  if(x.kind != _openparen) {
-    return false;
-  }
-  x = scanner.Peek();
-  var oneOrMoreIdentifiers = false;
-  while(IsIdentifier(x.kind) || x.kind == _ghost) { /* ghost is illegal here, but checking for it allows better error messages and recovery */
-    x = scanner.Peek();
-    oneOrMoreIdentifiers = true;
-  }
-  return oneOrMoreIdentifiers && x.kind == _colon;
-}
-
-bool IsGets() {
-  return la.kind == _gets;
-}
-
-bool IsPeekVar() {
-  scanner.ResetPeek();
-  IToken x = scanner.Peek();
-  return x.kind == _var;
-}
-
-// an existential guard starts with an identifier and is then followed by
-// * a colon (if the first identifier is given an explicit type),
-// * a comma (if there's a list of bound variables and the first one is not given an explicit type),
-// * a start-attribute (if there's one bound variable and it is not given an explicit type and there are attributes), or
-// * a bored smiley (if there's one bound variable and it is not given an explicit type).
-bool IsBindingGuard() {
-  scanner.ResetPeek();
-  if (IsIdentifier(la.kind)) {
-    Token x = scanner.Peek();
-    if (x.kind == _colon || x.kind == _comma || x.kind == _boredSmiley || x.kind == _lbracecolon) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool IsLoopSpec() {
-  return la.kind == _invariant || la.kind == _decreases || la.kind == _modifies;
-}
-
-bool IsWitness() {
-  scanner.ResetPeek();
-  if (la.kind == _witness) {
-    return true;
-  } else if (la.kind == _ghost) {
-    Token x = scanner.Peek();
-    return x.kind == _witness;
-  }
-  return false;
-}
-
-bool IsFunctionDecl() {
-  switch (la.kind) {
-    case _function:
-    case _predicate:
-    case _copredicate:
-      return true;
-    case _least:
-    case _greatest:
-    case _inductive:
-      return scanner.Peek().kind != _lemma;
-    case _twostate:
-      var x = scanner.Peek();
-      return x.kind == _function || x.kind == _predicate;
-    default:
-      return false;
-  }
-}
-
-bool IsParenStar() {
-  scanner.ResetPeek();
-  Token x = scanner.Peek();
-  return la.kind == _openparen && x.kind == _star;
-}
-
-bool IsEquivOp() => IsEquivOp(la);
-bool IsImpliesOp() => IsImpliesOp(la);
-bool IsExpliesOp() => IsExpliesOp(la);
-bool IsAndOp() => IsAndOp(la);
-bool IsOrOp() => IsOrOp(la);
-static bool IsEquivOp(IToken la) {
-  return la.val == "<==>";
-}
-static bool IsImpliesOp(IToken la) {
-  return la.val == "==>";
-}
-static bool IsExpliesOp(IToken la) {
-  return la.val == "<==";
-}
-static bool IsAndOp(IToken la) {
-  return la.val == "&&";
-}
-static bool IsOrOp(IToken la) {
-  return la.val == "||";
-}
-bool IsBitwiseAndOp() {
-  return la.val == "&";
-}
-bool IsBitwiseOrOp() {
-  return la.val == "|";
-}
-bool IsBitwiseXorOp() {
-  return la.val == "^";
-}
-bool IsBitwiseOp() {
-  return IsBitwiseAndOp() || IsBitwiseOrOp() || IsBitwiseXorOp();
-}
-bool IsAsOrIs() {
-  return la.kind == _as || la.kind == _is;
-}
-bool IsRelOp() {
-  return la.val == "=="
-      || la.val == "<"
-      || la.val == ">"
-      || la.val == "<="
-      || la.val == ">="
-      || la.val == "!="
-      || la.val == "in"
-      || la.kind == _notIn
-      || la.val == "!";
-}
-bool IsShiftOp() {
-  if (la.kind == _openAngleBracket) {
-  } else if (la.kind == _closeAngleBracket) {
-  } else {
-    return false;
-  }
-  scanner.ResetPeek();
-  var x = scanner.Peek();
-  if (x.kind != la.kind) {
-    return false;
-  }
-  return x.pos == la.pos + 1;  // return true only if the tokens are adjacent to each other
-}
-bool IsAddOp() {
-  return la.val == "+" || la.val == "-";
-}
-bool IsMulOp() {
-  return la.kind == _star || la.val == "/" || la.val == "%";
-}
-bool IsQSep() {
-  return la.kind == _doublecolon;
-}
-
-bool IsNonFinalColon() {
-  return la.kind == _colon && scanner.Peek().kind != _rbracket;
-}
-
-bool ExprIsMapDisplay() {
-  scanner.ResetPeek();
-  return (la.kind == _map || la.kind == _imap) && scanner.Peek().kind == _lbracket;
-}
-
-bool ExprIsSetDisplay() {
-  scanner.ResetPeek();
-  if (la.kind == _lbrace) return true;
-  int k = scanner.Peek().kind;
-  if (la.kind == _iset && k == _lbrace) return true;
-  if (la.kind == _multiset) return true;
-  return false;
-}
-
-bool IsSuffix() {
-  return la.kind == _dot || la.kind == _lbracket || la.kind == _openparen;
-}
-
-string UnwildIdent(IToken x, bool allowWildcardId) {
-  if (x.val.StartsWith("_")) {
-    if (allowWildcardId && x.val.Length == 1) {
-      return "_v" + anonymousIds++;
-    } else {
-      SemErr(ErrorId.p_no_leading_underscore, x, "cannot declare identifier beginning with underscore");
-    }
-  }
-  return x.val;
-}
-
-bool IsLambda(bool allowLambda)
-{
-  if (!allowLambda) {
-    return false;
-  }
-  scanner.ResetPeek();
-  Token x;
-  // peek at what might be a signature of a lambda expression
-  if (IsIdentifier(la.kind)) {
-    // cool, that's the entire candidate signature
-  } else if (la.kind != _openparen) {
-    return false;  // this is not a lambda expression
-  } else {
-    int identCount = 0;
-    x = scanner.Peek();
-    while (x.kind != _closeparen) {
-      if (identCount != 0) {
-        if (x.kind != _comma) {
-          return false;  // not the signature of a lambda
-        }
-        x = scanner.Peek();
-      }
-      if (!IsIdentifier(x.kind)) {
-        return false;  // not a lambda expression
-      }
-      identCount++;
-      x = scanner.Peek();
-      if (x.kind == _colon) {
-        // a colon belongs only in a lamdba signature, so this must be a lambda (or something ill-formed)
-        return true;
-      }
-    }
-  }
-  // What we have seen so far could have been a lambda signature or could have been some
-  // other expression (in particular, an identifier, a parenthesized identifier, or a
-  // tuple all of whose subexpressions are identifiers).
-  // It is a lambda expression if what follows is something that must be a lambda.
-  x = scanner.Peek();
-  return x.kind == _darrow || x.kind == _reads || x.kind == _requires;
-}
-
-bool IsIdentParen() {
-  scanner.ResetPeek();
-  Token x = scanner.Peek();
-  return IsIdentifier(la.kind) && x.kind == _openparen;
-}
-
-/* Used to disambiguate the LHS of a VarDeclStmt. If it looks like the start of a CasePattern,
- * we consider it to be a VarDeclPattern. But if we are looking at a simple identifier, then we
- * consider it to be a VarDeclStmt.
- */
-bool IsPatternDecl() {
-  return IsIdentParen() || la.kind == _openparen;
-}
-
-bool IsIdentColonOrBar() {
-  Token x = scanner.Peek();
-  return IsIdentifier(la.kind) && (x.kind == _colon || x.kind == _verticalbar);
-}
-
-bool SemiFollowsCall(bool allowLemma, Expression e) {
-  return allowLemma && la.kind == _semicolon && e is ApplySuffix;
-}
-
-bool IsNotEndOfCase() {
-  return la.kind != _EOF && la.kind != _rbrace && la.kind != _case;
-}
-
-/* The following is the largest lookahead there is. It needs to check if what follows
- * can be nothing but "<" Type { "," Type } ">".
- * If inExpressionContext == true, it also checks the token immediately after
- * the ">" to help disambiguate some cases (see implementation comment).   
- */
-bool IsGenericInstantiation(bool inExpressionContext) {
-  scanner.ResetPeek();
-  IToken pt = la;
-  if (!IsTypeList(ref pt)) {
-    return false;
-  }
-  if (!inExpressionContext) {
-    return true;
-  }  
-  /* There are ambiguities in the parsing.  For example:
-   *     F( a < b , c > (d) )
-   * can either be a unary function F whose argument is a function "a" with type arguments "<b,c>" and
-   * parameter "d", or can be a binary function F with the two boolean arguments "a < b" and "c > (d)".
-   * To make the situation a little better, we (somewhat heuristically) look at the character that
-   * follows the ">".  Note that if we, contrary to a user's intentions, pick "a<b,c>" out as a function
-   * with a type instantiation, the user can disambiguate it by making sure the ">" sits inside some
-   * parentheses, like:
-   *     F( a < b , (c > (d)) )
-   */
-  // In the following cases, we're sure we must have read a type instantiation that just ended an expression
-  if (IsEquivOp(pt) || IsImpliesOp(pt) || IsExpliesOp(pt) || IsAndOp(pt) || IsOrOp(pt)) {
-    return true;
-  }
-  switch (pt.kind) {
-    case _dot:  // here, we're sure it must have been a type instantiation we saw, because an expression cannot begin with dot
-    case _openparen:  // it was probably a type instantiation of a function/method
-    case _lbracket:  // it is possible that it was a type instantiation
-    case _lbrace:  // it was probably a type instantiation of a function/method
-    case _at:
-    // In the following cases, we're sure we must have read a type instantiation that just ended an expression
-    case _closeparen:
-    case _rbracket:
-    case _rbrace:
-    case _comma:
-    case _semicolon:
-    case _then:
-    case _else:
-    case _case:
-    case _eq:
-    case _neq:
-    case _as:
-    case _is:
-    case _darrow:
-    case _by:
-    case _in:
-    case _openAngleBracket:
-    case _closeAngleBracket:
-    case _EOF:
-    // (specification clauses that can follow an expression)
-    case _decreases:
-    case _modifies:
-    case _reads:
-    case _requires:
-    case _ensures:
-    case _invariant:
-    case _witness:
-    // (top-level declarations that can follow an expression)
-    case _function:
-    case _predicate:
-    case _least:
-    case _greatest:
-    case _inductive:
-    case _twostate:
-    case _lemma:
-    case _copredicate:
-    case _ghost:
-    case _static:
-    case _import:
-    case _export:
-    case _class:
-    case _trait:
-    case _datatype:
-    case _codatatype:
-    case _var:
-    case _const:
-    case _newtype:
-    case _type:
-    case _iterator:
-    case _method:
-    case _colemma:
-    case _constructor:
-      return true;
-    default:
-      return false;
-  }
-}
-/* Returns true if the next thing is of the form:
- *     "<" Type { "," Type } ">"
- */
-bool IsTypeList(ref IToken pt) {
-  if (pt.kind != _openAngleBracket) {
-    return false;
-  }
-  pt = scanner.Peek();
-  return IsTypeSequence(ref pt, _closeAngleBracket);
-}
-/* Returns true if the next thing is of the form:
- *     [ "ghost" ] Type { "," [ "ghost" ] Type }
- * followed by an endBracketKind.
- */
-bool IsTypeSequence(ref IToken pt, int endBracketKind) {
-  while (true) {
-    if (pt.kind == _ghost) {
-      pt = scanner.Peek();
-    }
-    if (!IsType(ref pt)) {
-      return false;
-    }
-    if (pt.kind == endBracketKind) {
-      // end of type list
-      pt = scanner.Peek();
-      return true;
-    } else if (pt.kind == _comma) {
-      // type list continues
-      pt = scanner.Peek();
-    } else {
-      // not a type list
-      return false;
-    }
-  }
-}
-
-bool IsType(ref IToken pt) {
-  if (!IsNonArrowType(ref pt)) return false;
-  while (pt.kind == _sarrow || pt.kind == _qarrow || pt.kind == _larrow) {
-    pt = scanner.Peek();
-    if (!IsNonArrowType(ref pt)) return false;
-  }
-  return true;
-}
-
-bool IsNonArrowType(ref IToken pt) {
-  switch (pt.kind) {
-    case _bool:
-    case _char:
-    case _nat:
-    case _int:
-    case _real:
-    case _ORDINAL:
-    case _string:
-    case _object_q:
-    case _object:
-      pt = scanner.Peek();
-      return true;
-    case _arrayToken:
-    case _bvToken:
-    case _set:
-    case _iset:
-    case _multiset:
-    case _seq:
-    case _map:
-    case _imap:
-      pt = scanner.Peek();
-      return pt.kind != _openAngleBracket || IsTypeList(ref pt);
-    case _ident:
-    case _least:
-    case _greatest:
-      while (true) {
-        // invariant: next token is an identifier (_ident, _least, or _greatest)
-        pt = scanner.Peek();
-        if (pt.kind == _openAngleBracket && !IsTypeList(ref pt)) {
-          return false;
-        }
-        if (pt.kind != _dot) {
-          // end of the type
-          return true;
-        }
-        pt = scanner.Peek();  // get the _dot
-        if (!IsIdentifier(pt.kind)) {
-          return false;
-        }
-      }
-    case _openparen:
-      pt = scanner.Peek();
-      if (pt.kind == _closeparen) {
-        // end of type list
-        pt = scanner.Peek();
-        return true;
-      }
-      return IsTypeSequence(ref pt, _closeparen);
-    default:
-      return false;
-  }
-}
-
-
-void ConvertKeywordTokenToIdent() {
-  var oldKind = la.kind;
-  la.kind = _ident;
-
-  // call CheckLiteral with la
-  var origT = t;
-  t = la;
-  scanner.CheckLiteral();
-  t = origT;
-
-  if (la.kind != _ident) {
-    // it has been changed by CheckLiteral, which means it was a keyword
-    la.kind = _ident;  // convert it to an ident
-  } else {
-    // la was something other than a keyword
-    la.kind = oldKind;
-  }
-}
-
-int StringToInt(string s, int defaultValue, string errString, IToken tok) {
-  Contract.Requires(s != null);
-  Contract.Requires(errString != null);
-  try {
-    if (s != "") {
-      defaultValue = int.Parse(s);
-    }
-  } catch (System.OverflowException) {
-    SemErr(errString.Contains("array") ? ErrorId.p_array_dimension_too_large
-                                       : ErrorId.p_bitvector_too_large, 
-      tok, string.Format("sorry, {0} ({1}) are not supported", errString, s));
-  }
-  return defaultValue;
-}
 
 /*--------------------------------------------------------------------------*/
 CHARACTERS
@@ -865,6 +144,7 @@ TOKENS
   by = "by".
   in = "in".
   decreases = "decreases".
+  nonincreases = "nonincreases".
   invariant = "invariant".
   function = "function".
   predicate = "predicate".
@@ -919,6 +199,7 @@ TOKENS
   notIn = "!in" CONTEXT (nonidchar).
   ellipsis = "...".
   reveal = "reveal".
+  hide = "hide".
   expect = "expect".
   sarrow = "->".
   qarrow = "~>".
@@ -930,8 +211,9 @@ IGNORE cr + lf + tab
 /*------------------------------------------------------------------------*/
 PRODUCTIONS
 Dafny
-= (. IToken includeStartToken;
-     IToken fileStartToken = t;
+= (. Token includeStartToken;
+     Token fileStartToken = t;
+     Attributes attrs = null;
   .)
   { "include"                 (. includeStartToken = t; .)
     stringToken               (. {
@@ -944,15 +226,17 @@ Dafny
                                    string basePath = parsedFile.Scheme == "stdin" ? "" : Path.GetDirectoryName(parsedFile.LocalPath);
                                    includedFile = Path.Combine(basePath, includedFile);
                                  }
-                                 var oneInclude = new Include(t, parsedFile, new Uri(Path.GetFullPath(includedFile)));
-                                 oneInclude.RangeToken = new RangeToken(includeStartToken, t);
+                                 var oneInclude = new Include(new SourceOrigin(includeStartToken, t, t), 
+                                   parsedFile, new Uri(Path.GetFullPath(includedFile)), theOptions);
                                  theModule.Includes.Add(oneInclude);
                                }
                             .)
   }
-  { TopDecl<theModule, /* isTopLevel */ true, /* isAbstract */ false> }
+  { AtAttributes<ref attrs>
+    TopDecl<theModule, /* isTopLevel */ true, ref attrs> }
+  (. CheckNoAttributes(ref attrs); .)
   (. 
-    theModule.RangeToken = new RangeToken(fileStartToken.Next, t);
+    theModule.SetOrigin(new SourceOrigin(fileStartToken.Next, t));
   .)
   SYNC
   EOF
@@ -960,16 +244,20 @@ Dafny
 
 /*------------------------------------------------------------------------*/
 DeclModifier<ref DeclModifierData dmod>
-= ( "abstract"                             (. dmod.IsAbstract = true;  CheckAndSetToken(ref dmod.AbstractToken); CheckAndSetTokenOnce(ref dmod.FirstToken); .)
-  | "ghost"                                (. dmod.IsGhost = true;  CheckAndSetToken(ref dmod.GhostToken); CheckAndSetTokenOnce(ref dmod.FirstToken); .)
-  | "static"                               (. dmod.IsStatic = true; CheckAndSetToken(ref dmod.StaticToken); CheckAndSetTokenOnce(ref dmod.FirstToken); .)
-  | "opaque"                               (. dmod.IsOpaque = true; CheckAndSetToken(ref dmod.OpaqueToken); CheckAndSetTokenOnce(ref dmod.FirstToken); .)
+= ( "abstract"                             (. dmod.IsAbstract = true;  CheckAndSetToken(ref dmod.AbstractToken); CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+  | "replaceable"                          (. dmod.IsReplaceable = true;  CheckAndSetToken(ref dmod.ReplaceableToken); CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+  | "ghost"                                (. dmod.IsGhost = true;  CheckAndSetToken(ref dmod.GhostToken); CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+  | "static"                               (. dmod.IsStatic = true; CheckAndSetToken(ref dmod.StaticToken); CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+  | "opaque"                               (. dmod.IsOpaque = true; CheckAndSetToken(ref dmod.OpaqueToken); CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
   )
   .
 
 /*------------------------------------------------------------------------*/
-TopDecl<. ModuleDefinition module, bool isTopLevel, bool isAbstract .>
-= (. DeclModifierData dmod = new DeclModifierData(); ModuleDecl submodule;
+TopDecl<ModuleDefinition module, bool isTopLevel, ref Attributes attrs>
+= (. DeclModifierData dmod = new DeclModifierData() {
+       Attributes = Consume(ref attrs)
+     };
+     ModuleDecl submodule;
      DatatypeDecl/*!*/ dt; TopLevelDecl td; IteratorDecl iter;
      TraitDecl/*!*/ trait;
   .)
@@ -977,7 +265,7 @@ TopDecl<. ModuleDefinition module, bool isTopLevel, bool isAbstract .>
   ( SubModuleDecl<dmod, module, out submodule, isTopLevel>
                                                (. var litmod = submodule as LiteralModuleDecl;
                                                   if (litmod != null && litmod.ModuleDef.PrefixIds.Count != 0) {
-                                                    var prefixModule = new PrefixNameModule(litmod.ModuleDef.PrefixIds, litmod);
+                                                    var prefixModule = new PrefixNameModule(theOptions, litmod.ModuleDef.PrefixIds, litmod);
                                                     module.PrefixNamedModules.Add(prefixModule);
                                                   } else {
                                                     if (submodule != null) {
@@ -1020,7 +308,7 @@ SubModuleDecl<DeclModifierData dmod, ModuleDefinition parent, out ModuleDecl sub
   ( ModuleDefinition<dmod, parent, out submodule>
   | ModuleImport<parent, out submodule>
   | ModuleExport<parent, out submodule>
-    (. if (isTopLevel) SemErr(ErrorId.p_superfluous_export, submodule.RangeToken,
+    (. if (isTopLevel) SemErr(ErrorId.p_superfluous_export, submodule.Origin,
           "There is no point to an export declaration at the top level");
     .)
   )
@@ -1029,40 +317,40 @@ SubModuleDecl<DeclModifierData dmod, ModuleDefinition parent, out ModuleDecl sub
 /*------------------------------------------------------------------------*/
 ModuleDefinition<DeclModifierData dmod, ModuleDefinition parent, out ModuleDecl submodule>
 =  "module"
-   (. CheckAndSetTokenOnce(ref dmod.FirstToken);
+   (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes);
      Attributes attrs = null;
-     IToken/*!*/ iderr;
-     IToken tokenWithTrailingDocString;
-     var prefixIds = new List<IToken>();
+     Token/*!*/ iderr;
+     var prefixIds = new List<IOrigin>();
      List<Name> idRefined = null;
      ModuleDefinition module;
+     ImplementationKind implementationKind = ImplementationKind.Refinement;
      submodule = null; // appease compiler
-     bool isAbstract = dmod.IsAbstract;
      var dafnyOptionsBackup = theOptions;
-     CheckDeclModifiers(ref dmod, "module", AllowedDeclModifiers.Abstract);
+     CheckDeclModifiers(ref dmod, "module", AllowedDeclModifiers.Abstract | AllowedDeclModifiers.Replaceable);
    .)
-   { Attribute<ref attrs> }            (. ApplyOptionsFromAttributes(attrs); .)
+   { Attribute<ref dmod.Attributes> }            (. ApplyOptionsFromAttributes(dmod.Attributes); .)
    ModuleQualifiedName<out var names>
    (. var name = names[^1];
-      prefixIds = names.GetRange(0,names.Count-1).Select(n => n.StartToken).ToList();
+      prefixIds = names.GetRange(0,names.Count-1).Select(n => (IOrigin)n.StartToken).ToList();
    .)
 
-   [ "refines" ModuleQualifiedName<out idRefined>
+   [ "refines" ModuleQualifiedName<out idRefined> (. implementationKind = ImplementationKind.Refinement; .)
+   | "replaces" ModuleQualifiedName<out idRefined> (. implementationKind = ImplementationKind.Replacement; .)
    | Ident<out iderr> (. SemErr(ErrorId.p_bad_module_decl, t, $"expected either a '{{' or a 'refines' keyword here, found {iderr.val}"); .)
    ]
-   (. module = new ModuleDefinition(RangeToken.NoToken, name, prefixIds, isAbstract, false,
-                                        idRefined == null ? null : new ModuleQualifiedId(idRefined), parent, attrs,
-                                        false);
+   (. module = new ModuleDefinition(SourceOrigin.NoToken, name, prefixIds, GetModuleKind(dmod), false,
+                                        idRefined == null ? null : new Implements(implementationKind, new ModuleQualifiedId(idRefined)), parent, dmod.Attributes);
    .)
-   SYNC                                (. tokenWithTrailingDocString = t; .)
+   SYNC
    "{"                                 (. module.BodyStartTok = t; .)
-     { TopDecl<module, /* isTopLevel */ false, isAbstract>}
+     { AtAttributes<ref attrs>
+       TopDecl<module, /* isTopLevel */ false, ref attrs>}
    "}"
+   (. CheckNoAttributes(ref attrs); .)
     (.
-      module.RangeToken = new RangeToken(dmod.FirstToken, t);
-      module.TokenWithTrailingDocString = tokenWithTrailingDocString;
-      submodule = new LiteralModuleDecl(module, parent, Guid.NewGuid());
-      submodule.RangeToken = module.RangeToken;
+      module.SetOrigin(new SourceOrigin(dmod.FirstToken, t, name.Center));
+      submodule = new LiteralModuleDecl(theOptions, module, parent, Guid.NewGuid());
+      submodule.SetOrigin(module.Origin);
       theOptions = dafnyOptionsBackup;
     .)
   .
@@ -1070,7 +358,7 @@ ModuleDefinition<DeclModifierData dmod, ModuleDefinition parent, out ModuleDecl
 /*------------------------------------------------------------------------*/
 ModuleImport<ModuleDefinition parent, out ModuleDecl submodule>
 =  "import"                          (.bool opened = false;
-                                      List<IToken> idExports = new List<IToken>();
+                                      var idExports = new List<IOrigin>();
                                       var startToken = t;
                                       submodule = null;
                                      .)
@@ -1080,39 +368,39 @@ ModuleImport<ModuleDefinition parent, out ModuleDecl submodule>
       ModuleName<out var name>
       ":"
       QualifiedModuleExport<out var namePath, out idExports>
-          (. submodule = new AbstractModuleDecl(new RangeToken(startToken, t), new ModuleQualifiedId(namePath),
+          (. submodule = new AbstractModuleDecl(theOptions, new SourceOrigin(startToken, t, name.Center), new ModuleQualifiedId(namePath),
                                                name, parent, opened, idExports, Guid.NewGuid()); .)
     | IF(lookAhead == _singleeq)
       ModuleName<out var name>
       "="
       QualifiedModuleExport<out var namePath, out idExports>
-          (. submodule = new AliasModuleDecl(new RangeToken(startToken, t), new ModuleQualifiedId(namePath),
+          (. submodule = new AliasModuleDecl(theOptions, new SourceOrigin(startToken, t, name.Center), new ModuleQualifiedId(namePath),
                                                name, parent, opened, idExports, Guid.NewGuid()); .)
     |
       QualifiedModuleExport<out var namePath, out idExports>
-          (. submodule = new AliasModuleDecl(new RangeToken(startToken, t), new ModuleQualifiedId(namePath),
-                                         namePath[^1], parent, opened, idExports, Guid.NewGuid());
+          (. submodule = new AliasModuleDecl(theOptions, new SourceOrigin(startToken, t), new ModuleQualifiedId(namePath),
+                                         new Name(SourceOrigin.NoToken, namePath[^1].Value), parent, opened, idExports, Guid.NewGuid());
           .)
     )
     .
 
 /*------------------------------------------------------------------------*/
-ExportId<out IToken id> = NoUSIdentOrDigits<out id> .
+ExportId<out Token id> = NoUSIdentOrDigits<out id> .
 
 ModuleExport<ModuleDefinition parent, out ModuleDecl submodule>
 = "export"
   (.
-    IToken exportId = t;
-    IToken/*!*/ id;
+    Token exportId = t;
+    Token/*!*/ id;
     List<ExportSignature> exports = new List<ExportSignature>();;
-    List<IToken> extends = new List<IToken>();
+    var extends = new List<IOrigin>();
     var startToken = t;
     bool provideAll = false;
     bool revealAll = false;
     bool isDefault = false;
     bool isRefining = false;
     ExportSignature exsig;
-    IToken laa;
+    Token laa;
   .)
   [ IF(IsIdentifier(la.kind) || la.kind==_digits) ExportId<out exportId>   // If the next token is 'least' or 'greatest' use it as the export id, 
                                                                            // not the beginning of a subsequent extreme predicate declaration
@@ -1162,11 +450,11 @@ ModuleExport<ModuleDefinition parent, out ModuleDecl submodule>
      Name name;
      if (exportId.val == "export" || exportId.val == parent.Name) {
        isDefault = true;
-       name = new Name(exportId.ToRange(), parent.Name);
+       name = new Name(exportId, parent.Name);
      } else {
        name = new Name(exportId);
      }
-     submodule = new ModuleExportDecl(new RangeToken(startToken, t), name, parent, exports, extends, provideAll, revealAll, isDefault, isRefining, Guid.NewGuid());
+     submodule = new ModuleExportDecl(theOptions, new SourceOrigin(startToken, t, name.Center), name, parent, exports, extends, provideAll, revealAll, isDefault, isRefining, Guid.NewGuid());
   .)
   // LL Warning: 'least' and 'greatest' are not keywords. They can be the identifier that is the last ExportId of the ModuleExport.
   // Those words can also be the first word of a declaration (e.g. least predicate) that follows the MOduleExport.
@@ -1180,17 +468,16 @@ ModuleExport<ModuleDefinition parent, out ModuleDecl submodule>
 // matching any permitted member name
 
 ExportSignature<bool opaque, out ExportSignature exsig>
-= (. IToken prefix; IToken suffix = null; IToken startToken = null;
+= (. Token prefix; Token suffix = null; Token startToken = null;
   .)
   TypeNameOrCtorSuffix<out prefix> (. startToken = t; .)
   [ "."
     TypeNameOrCtorSuffix<out suffix>]
   (. if (suffix != null) {
-       exsig = new ExportSignature(prefix, prefix.val, suffix, suffix.val, opaque);
+       exsig = new ExportSignature(new SourceOrigin(startToken, t, prefix), prefix.val, suffix, suffix.val, opaque);
      } else {
-       exsig = new ExportSignature(prefix, prefix.val, opaque);
+       exsig = new ExportSignature(new SourceOrigin(startToken, t, prefix), prefix.val, opaque);
      }
-     exsig.RangeToken = new RangeToken(startToken, t);
   .)
   .
 
@@ -1206,16 +493,16 @@ ModuleQualifiedName<.out List<Name> names.>
   .
 
 /*------------------------------------------------------------------------*/
-QualifiedModuleExport<.out List<Name> namePath, out List<IToken> exports.>
-= (. exports = new List<IToken>();
+QualifiedModuleExport<.out List<Name> namePath, out List<IOrigin> exports.>
+= (. exports = new List<IOrigin>();
   .)
   ModuleQualifiedName<out namePath>
   [ "`" ModuleExportSuffix<exports> ]
   .
 
 /*------------------------------------------------------------------------*/
-ModuleExportSuffix<. List<IToken> exports.>
-=                              (. IToken id; .)
+ModuleExportSuffix<. List<IOrigin> exports.>
+=                              (. Token id; .)
     ( ExportId<out id>       (. exports.Add(id); .)
     | "{" ExportId<out id>   (. exports.Add(id); .)
        { "," ExportId<out id> (. exports.Add(id); .) }
@@ -1230,47 +517,51 @@ ClassDecl<DeclModifierData dmodClass, ModuleDefinition/*!*/ module, out TopLevel
 = (. Contract.Requires(module != null);
      Contract.Ensures(Contract.ValueAtReturn(out c) != null);
      Name/*!*/ name;
-     IToken tokenWithTrailingDocString = Token.NoToken;
      List<Type> parentTraits = new List<Type>();
-     Attributes attrs = null;
      bool isRefining = false;
      List<TypeParameter> typeArgs = new List<TypeParameter>();
      List<MemberDecl> members = new List<MemberDecl>();
-     IToken bodyStart;
+     Token bodyStart;
      CheckDeclModifiers(ref dmodClass, "class", AllowedDeclModifiers.None);
      DeclModifierData dmod;
   .)
   SYNC
-  "class" (. CheckAndSetTokenOnce(ref dmodClass.FirstToken); .)
-  { Attribute<ref attrs> }
-  ClassName<out name>                     (. tokenWithTrailingDocString = t; .)
-  [ GenericParameters<typeArgs, true> ] (. tokenWithTrailingDocString = t; .)
-  [ ExtendsClause<parentTraits, out tokenWithTrailingDocString, null>
-  | ellipsis                    (. isRefining = true; tokenWithTrailingDocString = t; .)
+  "class" (. CheckAndSetTokenOnce(ref dmodClass.FirstTokenExceptAttributes); .)
+  { Attribute<ref dmodClass.Attributes> }
+  ClassName<out name>
+  [ GenericParameters<typeArgs, true> ]
+  [ ExtendsClause<parentTraits, null>
+  | ellipsis                    (. isRefining = true; .)
   ]
   SYNC
   "{"                                            (. bodyStart = t;  .)
-    { (. dmod = new DeclModifierData(); .)
+    {
+      (. dmod = new DeclModifierData(); .)
+      AtAttributes<ref dmod.Attributes>
       { DeclModifier<ref dmod> }
       ClassMemberDecl<dmod, members, true, false>
     }
   "}"
-  (. c = new ClassDecl(new RangeToken(dmodClass.FirstToken, t), name, module, typeArgs, members, attrs, isRefining, parentTraits);
+  (. c = new ClassDecl(new SourceOrigin(dmodClass.FirstToken, t, name.Center), name, module, typeArgs, members, dmodClass.Attributes, isRefining, parentTraits);
      c.BodyStartTok = bodyStart;
-     c.TokenWithTrailingDocString = tokenWithTrailingDocString;
   .)
   .
 
-ExtendsClause<. List<Type> parentTraits, out IToken tokenWithTrailingDocString, string requiresNonReferenceTraitsFor .>
+ExtendsClause<. List<Type> parentTraits, string requiresNonReferenceTraitsFor .>
 = (. Type parentTrait;
   .)
-  "extends"                   (. if (requiresNonReferenceTraitsFor != null && !theOptions.Get(CommonOptionBag.GeneralTraits)) {
-                                   SemErr(ErrorId.p_general_traits_beta, t,
-                                     $"{requiresNonReferenceTraitsFor} extending traits is a beta feature; use /generalTraits:1 to engage");
-                                 }
-                              .)
-  Type<out parentTrait>       (. parentTraits.Add(parentTrait); tokenWithTrailingDocString = t; .)
-  {"," Type<out parentTrait>  (. parentTraits.Add(parentTrait); tokenWithTrailingDocString = t; .) }
+  "extends"
+    (. if (requiresNonReferenceTraitsFor == "newtype" && theOptions.Get(CommonOptionBag.GeneralTraits) != CommonOptionBag.GeneralTraitsOptions.Full) {
+       SemErr(ErrorId.p_general_traits_full, t,
+         $"{requiresNonReferenceTraitsFor} extending traits is not fully supported (specifically, compilation of such types is not supported); " +
+         "to use them for verification only, use --general-traits=full");
+     } else if (requiresNonReferenceTraitsFor != null && theOptions.Get(CommonOptionBag.GeneralTraits) == CommonOptionBag.GeneralTraitsOptions.Legacy) {
+       SemErr(ErrorId.p_general_traits_datatype, t,
+         $"{requiresNonReferenceTraitsFor} extending traits is not yet enabled by default; use --general-traits=datatype to enable it");
+     }
+    .)
+  Type<out parentTrait>       (. parentTraits.Add(parentTrait); .)
+  {"," Type<out parentTrait>  (. parentTraits.Add(parentTrait); .) }
   .
 
 /*------------------------------------------------------------------------*/
@@ -1278,32 +569,30 @@ TraitDecl<DeclModifierData dmodIn, ModuleDefinition/*!*/ module, out TraitDecl/*
 = (. Contract.Requires(module != null);
      Contract.Ensures(Contract.ValueAtReturn(out trait) != null);
      CheckDeclModifiers(ref dmodIn, "trait", AllowedDeclModifiers.None);
-     IToken/*!*/ tokenWithTrailingDocString;
      List<Type> parentTraits = new List<Type>();
-     Attributes attrs = null;
      bool isRefining = false;
      List<TypeParameter/*!*/> typeArgs = new List<TypeParameter/*!*/>(); //traits should not support type parameters at the moment
      List<MemberDecl/*!*/> members = new List<MemberDecl/*!*/>();
-     IToken bodyStart;
+     Token bodyStart;
      DeclModifierData dmod;
   .)
   SYNC
-  "trait"                       (. CheckAndSetTokenOnce(ref dmodIn.FirstToken); .)
-  { Attribute<ref attrs> }
-  ClassName<out var name>                         (. tokenWithTrailingDocString = t; .)
-  [ GenericParameters<typeArgs, true> ]     (. tokenWithTrailingDocString = t; .)
-  [ ExtendsClause<parentTraits, out tokenWithTrailingDocString, null>
-  | ellipsis                    (. isRefining = true; tokenWithTrailingDocString = t; .)
+  "trait"                       (. CheckAndSetTokenOnce(ref dmodIn.FirstTokenExceptAttributes); .)
+  { Attribute<ref dmodIn.Attributes> }
+  ClassName<out var name>
+  [ GenericParameters<typeArgs, true> ]
+  [ ExtendsClause<parentTraits, null>
+  | ellipsis                    (. isRefining = true; .)
   ]
   "{"                                            (. bodyStart = t; .)
-    { (. dmod  = new DeclModifierData(); .)
+    { (. dmod = new DeclModifierData(); .)
+      AtAttributes<ref dmod.Attributes>
       { DeclModifier<ref dmod> }
       ClassMemberDecl<dmod, members, true, false>
     }
   "}"
-  (. trait = new TraitDecl(new RangeToken(dmodIn.FirstToken, t), name, module, typeArgs, members, attrs, isRefining, parentTraits);
+  (. trait = new TraitDecl(new SourceOrigin(dmodIn.FirstToken, t, name.Center), name, module, typeArgs, members, dmodIn.Attributes, isRefining, parentTraits);
      trait.BodyStartTok = bodyStart;
-     trait.TokenWithTrailingDocString = tokenWithTrailingDocString;
     .)
   .
 
@@ -1343,11 +632,10 @@ DatatypeDecl<DeclModifierData dmod, ModuleDefinition/*!*/ module, out DatatypeDe
 = (. Contract.Requires(module != null);
      Contract.Ensures(Contract.ValueAtReturn(out dt)!=null);
      Name/*!*/ name;
-     Attributes attrs = null;
      List<TypeParameter/*!*/> typeArgs = new List<TypeParameter/*!*/>();
      List<Type> parentTraits = new List<Type>();
      List<DatatypeCtor/*!*/> ctors = new List<DatatypeCtor/*!*/>();
-     IToken bodyStart = Token.NoToken;  // dummy assignment
+     Token bodyStart = Token.NoToken;  // dummy assignment
      bool isRefining = false;
      bool co = false;
      CheckDeclModifiers(ref dmod, "datatype or codatatype", AllowedDeclModifiers.None);
@@ -1356,11 +644,11 @@ DatatypeDecl<DeclModifierData dmod, ModuleDefinition/*!*/ module, out DatatypeDe
   SYNC
   ( "datatype"
   | "codatatype"     (. co = true; .)
-  )                                        (. CheckAndSetTokenOnce(ref dmod.FirstToken); .)
-  { Attribute<ref attrs> }
+  )                                        (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+  { Attribute<ref dmod.Attributes> }
   DatatypeName<out name>
   [ GenericParameters<typeArgs, true> ]
-  [ ExtendsClause<parentTraits, out _, co ? "codatatype" : "datatype"> ]
+  [ ExtendsClause<parentTraits, co ? "codatatype" : "datatype"> ]
   (
   "="                                      (. bodyStart = t; .)
   [ ellipsis                               (. SemErr(ErrorId.p_bad_datatype_refinement, t, // Help users adjust to the new syntax
@@ -1372,22 +660,21 @@ DatatypeDecl<DeclModifierData dmod, ModuleDefinition/*!*/ module, out DatatypeDe
   )
   [ TypeMembers<module, members> ]
   (. if (co) {
-       dt = new CoDatatypeDecl(new RangeToken(dmod.FirstToken, t), name, module, typeArgs, ctors, parentTraits, members, attrs, isRefining);
+       dt = new CoDatatypeDecl(new SourceOrigin(dmod.FirstToken, t, name.Center), name, module, typeArgs, ctors, parentTraits, members, dmod.Attributes, isRefining);
      } else {
-       dt = new IndDatatypeDecl(new RangeToken(dmod.FirstToken, t), name, module, typeArgs, ctors, parentTraits, members, attrs, isRefining);
+       dt = new IndDatatypeDecl(new SourceOrigin(dmod.FirstToken, t, name.Center), name, module, typeArgs, ctors, parentTraits, members, dmod.Attributes, isRefining);
      }
      dt.BodyStartTok = bodyStart;
-     dt.TokenWithTrailingDocString = bodyStart;
   .)
   .
 
 /*------------------------------------------------------------------------*/
-DatatypeMemberName<out IToken id> = NoUSIdentOrDigits<out id> .
+DatatypeMemberName<out Token id> = NoUSIdentOrDigits<out id> .
 
 DatatypeMemberDecl<.List<DatatypeCtor/*!*/>/*!*/ ctors.>
 = (. Contract.Requires(cce.NonNullElements(ctors));
      Attributes attrs = null;
-     IToken/*!*/ id;
+     Token/*!*/ id;
      List<Formal/*!*/> formals = new List<Formal/*!*/>();
      var isGhost = false;
   .)
@@ -1398,7 +685,7 @@ DatatypeMemberDecl<.List<DatatypeCtor/*!*/>/*!*/ ctors.>
   { Attribute<ref attrs> }
   DatatypeMemberName<out id>
   [ FormalsOptionalIds<formals> ]
-  (. var ctor = new DatatypeCtor(new RangeToken(id, t), new Name(id), isGhost, formals, attrs);
+  (. var ctor = new DatatypeCtor(new SourceOrigin(id, t), new Name(id), isGhost, formals, attrs);
      ctors.Add(ctor); .)
   .
 
@@ -1407,7 +694,9 @@ TypeMembers<. ModuleDefinition/*!*/ module, List<MemberDecl> members .>
 = (. DeclModifierData dmod;
   .)
   "{"
-  { (. dmod = new DeclModifierData(); .)
+  { (. dmod = new DeclModifierData();
+    .)
+    AtAttributes<ref dmod.Attributes>
     { DeclModifier<ref dmod> }
     ClassMemberDecl<dmod, members, false, false>
   }
@@ -1426,12 +715,12 @@ FieldDecl<.DeclModifierData dmod, List<MemberDecl> mm.>
   SYNC
   "var"                                (. startToken = startToken ?? t; .)
   { Attribute<ref attrs> }
-  FIdentType<out name, out ty>         (. var f = new Field(new RangeToken(startToken, t), name, dmod.IsGhost, ty, attrs);
-                                          mm.Add(f); f.TokenWithTrailingDocString = t;
+  FIdentType<out name, out ty>         (. var f = new Field(new SourceOrigin(startToken, t, name.Center), name, dmod.IsGhost, ty, attrs);
+                                          mm.Add(f);
                                        .)
   { ","                                (. startToken = t; .)
-    FIdentType<out name, out ty>       (. f = new Field(new RangeToken(startToken, t), name, dmod.IsGhost, ty, attrs);
-                                          mm.Add(f); f.TokenWithTrailingDocString = t;
+    FIdentType<out name, out ty>       (. f = new Field(new SourceOrigin(startToken, t, name.Center), name, dmod.IsGhost, ty, attrs);
+                                          mm.Add(f);
                                        .)
   }
   OldSemi
@@ -1440,7 +729,6 @@ FieldDecl<.DeclModifierData dmod, List<MemberDecl> mm.>
 /*------------------------------------------------------------------------*/
 ConstantFieldDecl<.DeclModifierData dmod, List<MemberDecl/*!*/>/*!*/ mm, bool moduleLevelDecl.>
 = (. Contract.Requires(cce.NonNullElements(mm));
-     Attributes attrs = null;
      Type/*!*/ ty;
      Expression e = null;
      if (moduleLevelDecl && dmod.StaticToken != null) {
@@ -1450,8 +738,8 @@ ConstantFieldDecl<.DeclModifierData dmod, List<MemberDecl/*!*/>/*!*/ mm, bool mo
      CheckDeclModifiers(ref dmod, "field", AllowedDeclModifiers.Ghost | AllowedDeclModifiers.Static | AllowedDeclModifiers.Opaque);
   .)
   SYNC
-  "const"                                    (. CheckAndSetTokenOnce(ref dmod.FirstToken); .)
-  { Attribute<ref attrs> }
+  "const"                                    (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+  { Attribute<ref dmod.Attributes> }
   ( IF(!IsIdentifier(la.kind) && la.kind != _digits)
     (. SemErr(ErrorId.p_const_decl_missing_identifier, la, "expected an identifier after 'const' and any attributes"); .)
   |
@@ -1462,21 +750,20 @@ ConstantFieldDecl<.DeclModifierData dmod, List<MemberDecl/*!*/>/*!*/ mm, bool mo
                                              (. if (e == null && ty is InferredTypeProxy) {
                                                   SemErr(ErrorId.p_const_is_missing_type_or_init, name.StartToken, "a const declaration must have a type or a RHS value");
                                                 }
-                                                var c = new ConstantField(new RangeToken(dmod.FirstToken, t), name, e, dmod.IsStatic, dmod.IsGhost, dmod.IsOpaque, ty, attrs);
+                                                var c = new ConstantField(new SourceOrigin(dmod.FirstToken, t, name.Center), name, e, dmod.IsStatic, dmod.IsGhost, dmod.IsOpaque, ty, dmod.Attributes);
                                                 mm.Add(c);
                                              .)
-    OldSemi                                  (. c.TokenWithTrailingDocString = t; .)
+    OldSemi
   )
   .
 
 /*------------------------------------------------------------------------*/
 NewtypeName<out Name name> = Name<out name> .
-LocalVarName<out IToken id> = NoUSIdent<out id> .
+LocalVarName<out Token id> = NoUSIdent<out id> .
   
 NewtypeDecl<DeclModifierData dmod, ModuleDefinition module, out TopLevelDecl td>
 = (. Name name;
-     IToken bvId;
-     Attributes attrs = null;
+     Token bvId;
      td = null;
      Type baseType = null;
      Expression constraint;
@@ -1484,11 +771,13 @@ NewtypeDecl<DeclModifierData dmod, ModuleDefinition module, out TopLevelDecl td>
      CheckDeclModifiers(ref dmod, "newtype", AllowedDeclModifiers.None);
      List<Type> parentTraits = new List<Type>();
      var members = new List<MemberDecl>();
+     var typeParameters = new List<TypeParameter>();
   .)
-  "newtype" (. CheckAndSetTokenOnce(ref dmod.FirstToken); .)
-  { Attribute<ref attrs> }
+  "newtype" (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+  { Attribute<ref dmod.Attributes> }
   NewtypeName<out name>
-  [ ExtendsClause<parentTraits, out _, "newtype"> ]
+  [ GenericParameters<typeParameters, true> ]
+  [ ExtendsClause<parentTraits, "newtype"> ]
   (
   "="
   [ ellipsis                               (. SemErr(ErrorId.p_misplaced_ellipsis_in_newtype, t, // Help users adjust to the new syntax
@@ -1496,38 +785,30 @@ NewtypeDecl<DeclModifierData dmod, ModuleDefinition module, out TopLevelDecl td>
   ]
   ( IF(IsIdentColonOrBar())
     LocalVarName<out bvId>
-    [ ":" Type<out baseType> ]       (. if (baseType == null) { baseType = new InferredTypeProxy(); } .)
+    [ ":" Type<out baseType> ]
     "|"
     Expression<out constraint, false, true>
-    (. var witnessKind = SubsetTypeDecl.WKind.CompiledZero; .)
-    [ IF(IsWitness())
-      ( "ghost" "witness"                            (. witnessKind = SubsetTypeDecl.WKind.Ghost; .)
-        Expression<out witness, false, true>
-      | "witness"
-        ( "*"                                        (. witnessKind = SubsetTypeDecl.WKind.OptOut; .)
-        | Expression<out witness, false, true>       (. witnessKind = SubsetTypeDecl.WKind.Compiled; .)
-        )
-      )
-    ]
+    WitnessClause<out var witnessKind, out witness>
     [ TypeMembers<module, members> ]
-    (. td = new NewtypeDecl(new RangeToken(dmod.FirstToken, t), name, module, 
-         new BoundVar(bvId, bvId.val, baseType){ 
-            IsTypeExplicit = true 
-         }, 
-         constraint, witnessKind, witness, parentTraits, members, attrs, isRefining: false);
+    (. td = new NewtypeDecl(new SourceOrigin(dmod.FirstToken, t, name.Center), name, typeParameters, module,
+         new BoundVar(bvId, bvId.val, baseType),
+         constraint, witnessKind, witness, parentTraits, members, dmod.Attributes, isRefining: false);
     .)
   | Type<out baseType>
+    WitnessClause<out var witnessKind, out witness>
     [ TypeMembers<module, members> ]
-    (. td = new NewtypeDecl(new RangeToken(dmod.FirstToken, t), name, module, baseType, parentTraits, members, attrs, isRefining: false); .)
+    (. td = new NewtypeDecl(new SourceOrigin(dmod.FirstToken, t, name.Center), name, typeParameters, module,
+         baseType, witnessKind, witness, parentTraits, members, dmod.Attributes, isRefining: false);
+    .)
   )
   | ellipsis
     [ TypeMembers<module, members> ]
     (. baseType = null; // Base type is not known yet
-       td = new NewtypeDecl(new RangeToken(dmod.FirstToken, t), name, module, baseType, parentTraits, members, attrs, isRefining: true);
+       td = new NewtypeDecl(new SourceOrigin(dmod.FirstToken, t, name.Center), name, typeParameters, module, baseType,
+         SubsetTypeDecl.WKind.CompiledZero, null,
+         parentTraits, members, dmod.Attributes, isRefining: true);
     .)
-  )  (. if (td != null) {
-          td.TokenWithTrailingDocString = t; 
-        }   .)
+  )
   .
 
 /*------------------------------------------------------------------------*/
@@ -1535,8 +816,7 @@ SynonymTypeName<out Name name> = Name<out name> .
 
 // The following includes Opaque type definitions
 SynonymTypeDecl<DeclModifierData dmod, ModuleDefinition module, out TopLevelDecl td>
-= (. IToken bvId;
-     Attributes attrs = null;
+= (. Token bvId;
      var characteristics = new TypeParameter.TypeParameterCharacteristics(false);
      var typeArgs = new List<TypeParameter>();
      td = null;
@@ -1548,40 +828,31 @@ SynonymTypeDecl<DeclModifierData dmod, ModuleDefinition module, out TopLevelDecl
      var members = new List<MemberDecl>();
      var isRefining = false;
   .)
-  "type"                      (. CheckAndSetTokenOnce(ref dmod.FirstToken); .)
-  { Attribute<ref attrs> }
+  "type"                      (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+  { Attribute<ref dmod.Attributes> }
   SynonymTypeName<out var name>
   { TypeParameterCharacteristics<ref characteristics> }
   [ GenericParameters<typeArgs, true> ]
   [ "="
     ( IF(IsIdentColonOrBar())
       LocalVarName<out bvId>
-      [ ":" Type<out ty> ]   (. if (ty == null) { ty = new InferredTypeProxy(); } .)
+      [ ":" Type<out ty> ]
       "|"
       Expression<out constraint, false, true>
-      (. var witnessKind = SubsetTypeDecl.WKind.CompiledZero; .)
-      [ IF(IsWitness())
-        ( "ghost" "witness"                            (. witnessKind = SubsetTypeDecl.WKind.Ghost; .)
-          Expression<out witness, false, true>
-        | "witness"
-          ( "*"                                        (. witnessKind = SubsetTypeDecl.WKind.OptOut; .)
-          | Expression<out witness, false, true>       (. witnessKind = SubsetTypeDecl.WKind.Compiled; .)
-          )
-        )
-      ]
-      (. td = new SubsetTypeDecl(new RangeToken(dmod.FirstToken, t), name, characteristics, typeArgs, module, 
-            new BoundVar(bvId, bvId.val, ty){ IsTypeExplicit = !(ty is InferredTypeProxy) }, constraint, witnessKind, witness, attrs);
+      WitnessClause<out var witnessKind, out witness>
+      (. td = new SubsetTypeDecl(new SourceOrigin(dmod.FirstToken, t, name.Center), name, characteristics, typeArgs, module, 
+            new BoundVar(bvId, bvId.val, ty), constraint, witnessKind, witness, dmod.Attributes);
          kind = "subset type";
       .)
     |
       Type<out ty>
-      (. td = new TypeSynonymDecl(new RangeToken(dmod.FirstToken, t), name, characteristics, typeArgs, module, ty, attrs);
+      (. td = new TypeSynonymDecl(new SourceOrigin(dmod.FirstToken, t, name.Center), name, characteristics, typeArgs, module, ty, dmod.Attributes);
          kind = "type synonym";
       .)
     )
   | ellipsis                               (. isRefining = true; .)
     [ TypeMembers<module, members> ]
-  | ExtendsClause<parentTraits, out _, "abstract type">
+  | ExtendsClause<parentTraits, "abstract type">
     [ TypeMembers<module, members> ]
   | TypeMembers<module, members>
   ]
@@ -1590,21 +861,35 @@ SynonymTypeDecl<DeclModifierData dmod, ModuleDefinition module, out TopLevelDecl
          // abstract type declarations at the very outermost program scope get an automatic (!new)
          characteristics.ContainsNoReferenceTypes = true;
        }
-       td = new AbstractTypeDecl(new RangeToken(dmod.FirstToken, t), name, module, characteristics, typeArgs, parentTraits, members, attrs, isRefining);
+       td = new AbstractTypeDecl(new SourceOrigin(dmod.FirstToken, t, name.Center), name, module, characteristics, typeArgs, parentTraits, members, dmod.Attributes, isRefining);
      }
-     td.TokenWithTrailingDocString = t;
   .)
   (. CheckDeclModifiers(ref dmod, kind, AllowedDeclModifiers.None); .)
   .
 
+WitnessClause<out SubsetTypeDecl.WKind witnessKind, out Expression witness>
+= (. witnessKind = SubsetTypeDecl.WKind.CompiledZero;
+     witness = null;
+  .)
+  [ IF(IsWitness())
+    ( "ghost" "witness"                            (. witnessKind = SubsetTypeDecl.WKind.Ghost; .)
+      Expression<out witness, false, true>
+    | "witness"
+      ( "*"                                        (. witnessKind = SubsetTypeDecl.WKind.OptOut; .)
+      | Expression<out witness, false, true>       (. witnessKind = SubsetTypeDecl.WKind.Compiled; .)
+      )
+    )
+  ]
+  .
+
 /*------------------------------------------------------------------------*/
 GIdentType<bool allowGhostKeyword, bool allowNewKeyword, bool allowNameOnlyKeyword, bool allowOlderKeyword,
-           out RangeToken range, out Name/*!*/ name, out Type/*!*/ ty, out bool isGhost, out bool isOld, out bool isNameOnly, out bool isOlder>
+           out SourceOrigin range, out Name/*!*/ name, out Type/*!*/ ty, out bool isGhost, out bool isOld, out bool isNameOnly, out bool isOlder>
 /* isGhost always returns as false if allowGhostKeyword is false */
 = (. Contract.Ensures(Contract.ValueAtReturn(out name)!=null);
      Contract.Ensures(Contract.ValueAtReturn(out ty)!=null);
      isGhost = false; isOld = allowNewKeyword; isNameOnly = false; isOlder = false;
-     IToken startToken = t.Next;
+     Token startToken = t.Next;
   .)
   { IF(IsKeywordForFormal())
     ( "ghost"                    (. if (allowGhostKeyword) { isGhost = true; } else { SemErr(ErrorId.p_output_of_function_not_ghost, t, "formal cannot be declared 'ghost' in this context"); } .)
@@ -1614,7 +899,7 @@ GIdentType<bool allowGhostKeyword, bool allowNewKeyword, bool allowNameOnlyKeywo
     )
   }
   IdentType<out var id, out var originalId, out ty, false> 
-                                (. range = new RangeToken(startToken, ty.EndToken);
+                                (. range = new SourceOrigin(startToken, ty.EndToken, id);
                                    name = new Name(id);
                                 .)
   .
@@ -1626,7 +911,7 @@ FIdentType<out Name/*!*/ name, out Type/*!*/ ty>
   )
   [ ( ":=" | "=" ) (. var optoken = t; Expression e; .)
     Expression<out e, true, true> 
-      (.              var erange = new RangeToken(optoken, e.EndToken);
+      (.              var erange = new SourceOrigin(optoken, e.EndToken);
                       SemErr(ErrorId.p_no_init_for_var_field, erange, "a mutable field may not have an initializer"); 
       .) 
   ]
@@ -1642,7 +927,7 @@ CIdentType<out Name/*!*/ name, out Type ty>
   ]
   .
 
-IdentType<out IToken/*!*/ id, out IToken originalId, out Type/*!*/ ty, bool allowWildcardId>
+IdentType<out Token/*!*/ id, out Token originalId, out Type/*!*/ ty, bool allowWildcardId>
 = (.Contract.Ensures(Contract.ValueAtReturn(out id) != null); Contract.Ensures(Contract.ValueAtReturn(out ty) != null);.)
   WildIdent<out id, allowWildcardId> (. originalId = t; .)
   ":"
@@ -1650,24 +935,22 @@ IdentType<out IToken/*!*/ id, out IToken originalId, out Type/*!*/ ty, bool allo
   .
 
 LocalIdentTypeOptional<out LocalVariable var, bool isGhost, bool allowWild=true>
-= (. IToken id;  Type ty;  Type optType = null;
-     IToken startToken = null;
+= (. Token id;  Type ty = null;
+     Token startToken = null;
   .)
   WildIdent<out id, allowWild> (. startToken = t; .)
-  [ ":" Type<out ty>             (. optType = ty; .)
+  [ ":" Type<out ty>
   ]
-  (. var = new LocalVariable(new RangeToken(startToken, t), id.val, optType == null ? new InferredTypeProxy() : optType, isGhost) {
-       IsTypeExplicit = optType != null
-     };
+  (. var = new LocalVariable(new SourceOrigin(startToken, t), id.val, ty, isGhost);
   .)
   .
 
 IdentTypeOptional<out BoundVar var>
 = (. Contract.Ensures(Contract.ValueAtReturn(out var) != null);
-     Type ty;  Type optType = null;
+     Type ty = null;
   .)
   WildIdentN<out var name, true>
-  [ IF( la.kind == _colon) ":" Type<out ty>             (. optType = ty; .)
+  [ IF( la.kind == _colon) ":" Type<out ty>
      // CoCo warns about this optional ':', because it is ambiguous with a ':' that follows the IdentTypeOptional.
      // An IdentTypeOptional can be the last thing in an Expression (a SetComprehension)
      // Also, a ':' can follow an Expression in a slices-by-length construct. So a ':' here might be the start
@@ -1675,22 +958,22 @@ IdentTypeOptional<out BoundVar var>
      // disambiguate, it makes sense to force the colon to consider the ': type' here. Hence the semantic predicate.
      // Also a SetComprehension would be the wrong type in a slices-by-length construct.
   ]
-  (. var = new BoundVar(name.Tok, name.Value, optType == null ? new InferredTypeProxy() : optType) {
-       IsTypeExplicit = optType != null,
-       RangeToken = new RangeToken(name.StartToken, t)
-     }; .)
+  (. var = new BoundVar(new SourceOrigin(name.StartToken, t, name.Center), name.Value, ty); .)
   .
 
-TypeIdentOptional<out RangeToken/*!*/ range, out Name/*!*/ identName, out Type/*!*/ ty, out bool isGhost, out Expression defaultValue, out bool isNameOnly>
+TypeIdentOptional<out SourceOrigin/*!*/ range, out Name/*!*/ identName, out Type/*!*/ ty, 
+  out bool isGhost, out Expression defaultValue, out bool isNameOnly, out Attributes attributes>
 = (.Contract.Ensures(Contract.ValueAtReturn(out range)!=null);
      Contract.Ensures(Contract.ValueAtReturn(out ty)!=null);
      Contract.Ensures(Contract.ValueAtReturn(out identName)!=null);
-     IToken nameToken = null; ty = new BoolType()/*dummy*/; isGhost = false;
-     IToken nameonlyToken = null;
+     Token nameToken = null; ty = new BoolType()/*dummy*/; isGhost = false;
+     Token nameonlyToken = null;
+     attributes = null;
      identName = null;
      defaultValue = null;
   .)
   (. var beforeStartToken = t; .)
+  { Attribute<ref attributes> }
   { "ghost"                            (. isGhost = true; .)
   | "nameonly"                         (. nameonlyToken = t; .)
   }
@@ -1712,7 +995,7 @@ TypeIdentOptional<out RangeToken/*!*/ range, out Name/*!*/ identName, out Type/*
     Type<out ty>
     ParameterDefaultValue<true, out defaultValue>
   )
-  (. range = new RangeToken(beforeStartToken.Next, t);
+  (. range = new SourceOrigin(beforeStartToken.Next, t, nameToken);
      if (nameToken != null) {
        identName = new Name(nameToken);
        isNameOnly = nameonlyToken != null;
@@ -1747,14 +1030,14 @@ IteratorDecl<DeclModifierData dmod, ModuleDefinition module, out IteratorDecl/*!
      Attributes modAttrs = null;
      Attributes decrAttrs = null;
      BlockStmt body = null;
-     IToken signatureEllipsis = null;
-     IToken bodyStart = Token.NoToken;
-     IToken bodyEnd = Token.NoToken;
+     Token signatureEllipsis = null;
+     Token bodyStart = Token.NoToken;
+     Token bodyEnd = Token.NoToken;
      CheckDeclModifiers(ref dmod, "iterator", AllowedDeclModifiers.None);
   .)
   SYNC
-  "iterator"                (. CheckAndSetTokenOnce(ref dmod.FirstToken); .)
-  { Attribute<ref attrs> }
+  "iterator"                (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+  { Attribute<ref dmod.Attributes> }    (. MergeInto(ref attrs, ref dmod.Attributes); .)
   IteratorName<out var name>
   (
     [ GenericParameters<typeArgs, true> ]
@@ -1769,12 +1052,12 @@ IteratorDecl<DeclModifierData dmod, ModuleDefinition module, out IteratorDecl/*!
   IteratorSpec<reads, mod, decreases, req, ens, yieldReq, yieldEns, ref readsAttrs, ref modAttrs, ref decrAttrs>
   [ BlockStmt<out body, out bodyStart, out bodyEnd>
   ]
-  (. iter = new IteratorDecl(new RangeToken(dmod.FirstToken, t), name, module, typeArgs, ins, outs,
+  (. iter = new IteratorDecl(new SourceOrigin(dmod.FirstToken, t, name.Center), name, module, typeArgs, ins, outs,
                              new Specification<FrameExpression>(reads, readsAttrs),
                              new Specification<FrameExpression>(mod, modAttrs),
                              new Specification<Expression>(decreases, decrAttrs),
                              req, ens, yieldReq, yieldEns,
-                             body, attrs, signatureEllipsis);
+                             body, dmod.Attributes, signatureEllipsis);
      iter.BodyStartTok = bodyStart;
  .)
   .
@@ -1782,40 +1065,41 @@ IteratorDecl<DeclModifierData dmod, ModuleDefinition module, out IteratorDecl/*!
 /*------------------------------------------------------------------------*/
 TypeVariableName<out Name name> = Name<out name> .
 
-GenericParameters<.List<TypeParameter/*!*/>/*!*/ typeArgs, bool allowVariance.>
-= (. Contract.Requires(cce.NonNullElements(typeArgs));
-     TypeParameter.TypeParameterCharacteristics characteristics;
-     TypeParameter.TPVarianceSyntax variance = TypeParameter.TPVarianceSyntax.NonVariant_Strict;  // assignment is to please compiler
-     characteristics = new TypeParameter.TypeParameterCharacteristics(false);
-     
-     Name name;
-  .)
+GenericParameters<.List<TypeParameter> typeParameters, bool allowVariance.>
+= (. Contract.Requires(cce.NonNullElements(typeParameters)); .)
   // If a "<" combined with a Variance symbol could be a new token, then the parser here will need to be more complex,
   // since, for example, a < followed immediately by a Variance symbol would scan as the wrong token.
   // Fortunately that is not currently the case.
   // (Only because we parse the new "<-" symbol as separate "<" "-" tokens precisely to avoid this issue :)
-  "<"   (. IToken startToken = t.Next; .)
-  [ Variance<out variance>  (.
-            if (!allowVariance) { SemErr(ErrorId.p_type_parameter_variance_forbidden, t, "type-parameter variance is not allowed to be specified in this context"); }  
-          .)
+  "<"
+  OneTypeParameter<typeParameters, allowVariance>
+  { ","
+    OneTypeParameter<typeParameters, allowVariance>
+  }
+  ">"
+  .
+
+OneTypeParameter<.List<TypeParameter> typeParameters, bool allowVariance.>
+= (. var variance = TypeParameter.TPVarianceSyntax.NonVariant_Strict; // assignment is to please compiler
+     var characteristics = new TypeParameter.TypeParameterCharacteristics(false);
+     Name name;
+     Type typeBound;
+     var typeBounds = new List<Type>();
+     var startToken = t.Next;
+  .)
+  [ Variance<out variance>
+    (. if (!allowVariance) {
+         SemErr(ErrorId.p_type_parameter_variance_forbidden, t, "type-parameter variance is not allowed to be specified in this context");
+       }
+    .)
   ]
   TypeVariableName<out name>
   { TypeParameterCharacteristics<ref characteristics> }
-  (. typeArgs.Add(new TypeParameter(new RangeToken(startToken, t), name, variance, characteristics)); .)
-  { ","
-    (. variance = TypeParameter.TPVarianceSyntax.NonVariant_Strict;
-       characteristics = new TypeParameter.TypeParameterCharacteristics(false);
-       startToken = t.Next; 
-    .)
-    [ Variance<out variance>  (. 
-            if (!allowVariance) { SemErr(ErrorId.p_type_parameter_variance_forbidden, t, "type-parameter variance is not allowed to be specified in this context"); } 
-        .)
-    ]
-    TypeVariableName<out name>
-    { TypeParameterCharacteristics<ref characteristics> }
-    (. typeArgs.Add(new TypeParameter(new RangeToken(startToken, t), name, variance, characteristics)); .)
+  { "extends"
+    Type<out typeBound>
+    (. typeBounds.Add(typeBound); .)
   }
-  ">"
+  (. typeParameters.Add(new TypeParameter(new SourceOrigin(startToken, t, name.Center), name, variance, characteristics, typeBounds)); .)
   .
 
 /*------------------------------------------------------------------------*/
@@ -1836,7 +1120,7 @@ TypeParameterCharacteristics<ref TypeParameter.TypeParameterCharacteristics char
   { ","
     TPCharOption<ref characteristics>
   }
-  ")" (. characteristics.RangeToken = new RangeToken(startToken, t); .)
+  ")" (. characteristics.SourceOrigin = new SourceOrigin(startToken, t); .)
   .
 
 TPCharOption<ref TypeParameter.TypeParameterCharacteristics characteristics>
@@ -1864,17 +1148,18 @@ MethodDecl<DeclModifierData dmod, bool allowConstructor, out Method/*!*/ m>
 = (. Contract.Ensures(Contract.ValueAtReturn(out m) !=null);
      bool hasName = false;
      Name name = new Name("<noNameGiven>");  
-     IToken keywordToken;
-     Attributes attrs = null;
+     Token keywordToken;
      List<TypeParameter/*!*/>/*!*/ typeArgs = new List<TypeParameter/*!*/>();
      List<Formal/*!*/> ins = new List<Formal/*!*/>();
      List<Formal/*!*/> outs = new List<Formal/*!*/>();
      List<AttributedExpression/*!*/> req = new List<AttributedExpression/*!*/>();
+     List<FrameExpression/*!*/> reads = new List<FrameExpression/*!*/>();
      List<FrameExpression/*!*/> mod = new List<FrameExpression/*!*/>();
      List<AttributedExpression/*!*/> ens = new List<AttributedExpression/*!*/>();
      List<Expression/*!*/> dec = new List<Expression/*!*/>();
      Attributes decAttrs = null;
      Attributes modAttrs = null;
+     Attributes readsAttrs = null;
      BlockStmt body = null;
      bool isPlainOlMethod = false;
      bool isLemma = false;
@@ -1882,41 +1167,40 @@ MethodDecl<DeclModifierData dmod, bool allowConstructor, out Method/*!*/ m>
      bool isConstructor = false;
      bool isLeastLemma = false;
      bool isGreatestLemma = false;
-     IToken signatureEllipsis = null;
-     IToken tokenWithTrailingDocString = Token.NoToken;
-     IToken bodyStart = Token.NoToken;
-     IToken bodyEnd = Token.NoToken;
+     Token signatureEllipsis = null;
+     Token bodyStart = Token.NoToken;
+     Token bodyEnd = Token.NoToken;
      AllowedDeclModifiers allowed = AllowedDeclModifiers.None;
      string caption = "";
      ExtremePredicate.KType kType = ExtremePredicate.KType.Unspecified;
   .)
   SYNC
   ( "method"                        (. isPlainOlMethod = true; caption = "method";
-                                       CheckAndSetTokenOnce(ref dmod.FirstToken);
+                                       CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes);
                                        allowed = AllowedDeclModifiers.Ghost | AllowedDeclModifiers.Static; .)
   | "lemma"                         (. isLemma = true; caption = "lemma";
-                                       CheckAndSetTokenOnce(ref dmod.FirstToken);
+                                       CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes);
                                        allowed = AllowedDeclModifiers.AlreadyGhost | AllowedDeclModifiers.Static; .)
-  | ( "greatest"                    (. CheckAndSetTokenOnce(ref dmod.FirstToken); .)
+  | ( "greatest"                    (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
       "lemma"
-    | "colemma"                     (. CheckAndSetTokenOnce(ref dmod.FirstToken); 
+    | "colemma"                     (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); 
                                        errors.Deprecated(ErrorId.p_deprecated_colemma, t, "the old keyword 'colemma' has been renamed to the keyword phrase 'greatest lemma'"); 
                                     .)
     )
                                     (. isGreatestLemma = true; caption = "greatest lemma";
                                        allowed = AllowedDeclModifiers.AlreadyGhost | AllowedDeclModifiers.Static; .)
-  | ( "least"                       (. CheckAndSetTokenOnce(ref dmod.FirstToken); .)
-    | "inductive"                   (. CheckAndSetTokenOnce(ref dmod.FirstToken);
+  | ( "least"                       (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+    | "inductive"                   (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes);
                                        errors.Deprecated(ErrorId.p_deprecated_inductive_lemma, t, "the old keyword phrase 'inductive lemma' has been renamed to 'least lemma'"); 
                                     .)
     )
     "lemma"
                                     (. isLeastLemma = true;  caption = "least lemma";
                                        allowed = AllowedDeclModifiers.AlreadyGhost | AllowedDeclModifiers.Static;.)
-  | "twostate"                      (. CheckAndSetTokenOnce(ref dmod.FirstToken); .)
+  | "twostate"                      (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
     "lemma"                         (. isTwoStateLemma = true; caption = "two-state lemma";
                                        allowed = AllowedDeclModifiers.AlreadyGhost | AllowedDeclModifiers.Static; .)
-  | "constructor"                   (. CheckAndSetTokenOnce(ref dmod.FirstToken);
+  | "constructor"                   (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes);
                                        if (allowConstructor) {
                                          isConstructor = true;
                                        } else {
@@ -1927,7 +1211,7 @@ MethodDecl<DeclModifierData dmod, bool allowConstructor, out Method/*!*/ m>
                                     .)
   )                                 (. keywordToken = t;
                                        CheckDeclModifiers(ref dmod, caption, allowed); .)
-  { Attribute<ref attrs> }
+  { Attribute<ref dmod.Attributes> }
   [ MethodFunctionName<out name>               (. hasName = true; .)
   ]
   (. if (!hasName) {
@@ -1938,12 +1222,12 @@ MethodDecl<DeclModifierData dmod, bool allowConstructor, out Method/*!*/ m>
   .)
   (
     [ GenericParameters<typeArgs, false> ]
-    [ KType<ref kType, out IToken openBracket, out IToken closeBracket>              
+    [ KType<ref kType, out Token openBracket, out Token closeBracket>              
                                     (. if (!(isGreatestLemma || isLeastLemma)) { 
                                          // Note: When ranges are refactored, make the first use of openBracket a range
                                          // that extends through closeBracket
                                          SemErr(ErrorId.p_extraneous_k, 
-                                                new RangeToken(openBracket, closeBracket), 
+                                                new SourceOrigin(openBracket, closeBracket), 
                                                 "type of _k can only be specified for least and greatest lemmas"); 
                                        } 
                                     .)
@@ -1952,46 +1236,50 @@ MethodDecl<DeclModifierData dmod, bool allowConstructor, out Method/*!*/ m>
     Formals<true, isCompilable, isTwoStateLemma, false, ins>
     [ "returns"                                 (. var returnsToken = t; .)
       Formals<false, isCompilable, false, false, outs>
-      (. if (isConstructor) { SemErr(ErrorId.p_constructors_have_no_out_parameters, new RangeToken(returnsToken, t), "constructors cannot have out-parameters"); } .)
+      (. if (isConstructor) { SemErr(ErrorId.p_constructors_have_no_out_parameters, new SourceOrigin(returnsToken, t), "constructors cannot have out-parameters"); } .)
     ]
   | ellipsis                                    (. signatureEllipsis = t; .)
-  )                                             (. tokenWithTrailingDocString = t; .)
+  )
   MethodSpec<dmod.IsGhost || isLemma || isTwoStateLemma || isLeastLemma || isGreatestLemma,
-             req, mod, ens, dec, ref decAttrs, ref modAttrs, caption, isConstructor>
+             req, reads, mod, ens, dec, ref decAttrs, ref modAttrs, ref readsAttrs, caption, isConstructor>
   [ IF(isConstructor)
     (. DividedBlockStmt dividedBody; .)
     DividedBlockStmt<out dividedBody, out bodyStart, out bodyEnd>
     (. body = dividedBody; .)
   | BlockStmt<out body, out bodyStart, out bodyEnd>
   ]
-  (. var range = new RangeToken(dmod.FirstToken, t);
+  (. var range = new SourceOrigin(dmod.FirstToken, t, hasName ? name.Center : null);
      if (isConstructor) {
-       m = new Constructor(range, hasName ? name : new Name(dmod.FirstToken.ToRange(), "_ctor"), dmod.IsGhost, typeArgs, ins,
-                           req, new Specification<FrameExpression>(mod, modAttrs), ens, new Specification<Expression>(dec, decAttrs), (DividedBlockStmt)body, attrs, signatureEllipsis);
+       m = new Constructor(range, hasName ? name : new Name(dmod.FirstToken, "_ctor"), dmod.IsGhost, typeArgs, ins,
+                           req, new Specification<FrameExpression>(reads, readsAttrs), 
+                           new Specification<FrameExpression>(mod, modAttrs), ens, 
+                           new Specification<Expression>(dec, decAttrs), 
+                           (DividedBlockStmt)body, dmod.Attributes, signatureEllipsis);
      } else if (isLeastLemma) {
        m = new LeastLemma(range, name, dmod.IsStatic, kType, typeArgs, ins, outs,
-                          req, new Specification<FrameExpression>(mod, modAttrs), ens, new Specification<Expression>(dec, decAttrs), body, attrs, signatureEllipsis);
+                          req, new Specification<FrameExpression>(reads, readsAttrs), new Specification<FrameExpression>(mod, modAttrs), ens, new Specification<Expression>(dec, decAttrs), body, dmod.Attributes, signatureEllipsis);
      } else if (isGreatestLemma) {
        m = new GreatestLemma(range, name, dmod.IsStatic, kType, typeArgs, ins, outs,
-                             req, new Specification<FrameExpression>(mod, modAttrs), ens, new Specification<Expression>(dec, decAttrs), body, attrs, signatureEllipsis);
+                             req, new Specification<FrameExpression>(reads, readsAttrs), new Specification<FrameExpression>(mod, modAttrs), ens, new Specification<Expression>(dec, decAttrs), body, dmod.Attributes, signatureEllipsis);
      } else if (isLemma) {
        m = new Lemma(range, name, dmod.IsStatic, typeArgs, ins, outs,
-                     req, new Specification<FrameExpression>(mod, modAttrs), ens, new Specification<Expression>(dec, decAttrs), body, attrs, signatureEllipsis);
+                     req, new Specification<FrameExpression>(reads, readsAttrs), new Specification<FrameExpression>(mod, modAttrs), ens, new Specification<Expression>(dec, decAttrs), body, dmod.Attributes, signatureEllipsis);
      } else if (isTwoStateLemma) {
        m = new TwoStateLemma(range, name, dmod.IsStatic, typeArgs, ins, outs,
-                             req, new Specification<FrameExpression>(mod, modAttrs),
-                             ens, new Specification<Expression>(dec, decAttrs), body, attrs, signatureEllipsis);
+                             req, new Specification<FrameExpression>(reads, readsAttrs), new Specification<FrameExpression>(mod, modAttrs),
+                             ens, new Specification<Expression>(dec, decAttrs), body, dmod.Attributes, signatureEllipsis);
      } else {
        m = new Method(range, name, dmod.IsStatic, dmod.IsGhost, typeArgs, ins, outs,
-                      req, new Specification<FrameExpression>(mod, modAttrs), ens, new Specification<Expression>(dec, decAttrs), body, attrs, signatureEllipsis);
+                      req, new Specification<FrameExpression>(reads, readsAttrs), 
+                      new Specification<FrameExpression>(mod, modAttrs), ens, 
+                      new Specification<Expression>(dec, decAttrs), body, dmod.Attributes, signatureEllipsis);
      }
      m.BodyStartTok = bodyStart;
-     m.TokenWithTrailingDocString = tokenWithTrailingDocString;
  .)
   .
 
 /*------------------------------------------------------------------------*/
-KType<ref ExtremePredicate.KType kType, out IToken openBracket, out IToken closeBracket>
+KType<ref ExtremePredicate.KType kType, out Token openBracket, out Token closeBracket>
 = "["           (. openBracket = t; .)
   ( "nat"       (. kType = ExtremePredicate.KType.Nat; .)
   | "ORDINAL"   (. kType = ExtremePredicate.KType.ORDINAL; .)
@@ -2001,8 +1289,8 @@ KType<ref ExtremePredicate.KType kType, out IToken openBracket, out IToken close
 
 /*------------------------------------------------------------------------*/
 RequiresClause<.List<AttributedExpression> req, bool allowLabel.>
-= "requires"    (. IToken lbl = null;
-                   IToken first = t;
+= "requires"    (. Token lbl = null;
+                   Token first = t;
                    Attributes attrs = null;
                    Expression e;
                  .)
@@ -2047,15 +1335,16 @@ DecreasesClause<.List<Expression> decreases, ref Attributes attrs,
   .
 
 /*------------------------------------------------------------------------*/
-ReadsClause<.List<FrameExpression/*!*/>/*!*/ reads,
+ReadsClause<.List<FrameExpression/*!*/>/*!*/ reads, ref Attributes attrs,
                   bool allowLemma, bool allowLambda, bool allowWild.>
 = "reads"
   (. FrameExpression fe; .)
+  { Attribute<ref attrs> }
   PossiblyWildFrameExpression<out fe, allowLemma, allowLambda, allowWild>          (. reads.Add(fe); .)
   { "," PossiblyWildFrameExpression<out fe, allowLemma, allowLambda, allowWild>    (. reads.Add(fe); .)
   }
   (. if (allowWild && reads.Count > 1 && reads.Exists(fe => fe.E is WildcardExpr)) {
-       SemErr(ErrorId.p_reads_star_must_be_alone, reads.First(fe => fe.E is WildcardExpr).tok, "A 'reads' clause that contains '*' is not allowed to contain any other expressions");
+       SemErr(ErrorId.p_reads_star_must_be_alone, reads.First(fe => fe.E is WildcardExpr).Origin, "A 'reads' clause that contains '*' is not allowed to contain any other expressions");
      }
   .)
   OldSemi
@@ -2072,15 +1361,17 @@ InvariantClause<. List<AttributedExpression> invariants.> =
   .
 
 /*------------------------------------------------------------------------*/
-MethodSpec<.bool isGhost, List<AttributedExpression> req, List<FrameExpression> mod, List<AttributedExpression> ens,
-            List<Expression> decreases, ref Attributes decAttrs, ref Attributes modAttrs, string caption, bool performThisDeprecatedCheck.>
+MethodSpec<.bool isGhost, List<AttributedExpression> req, List<FrameExpression> reads, List<FrameExpression> mod, List<AttributedExpression> ens,
+            List<Expression> decreases, ref Attributes decAttrs, ref Attributes modAttrs, ref Attributes readsAttrs, string caption, bool performThisDeprecatedCheck.>
 = (. Contract.Requires(cce.NonNullElements(req));
+     Contract.Requires(cce.NonNullElements(reads));
      Contract.Requires(cce.NonNullElements(mod));
      Contract.Requires(cce.NonNullElements(ens));
      Contract.Requires(cce.NonNullElements(decreases));
   .)
   SYNC
-  { ModifiesClause<ref mod, ref modAttrs, false, performThisDeprecatedCheck>
+  { ReadsClause<reads, ref readsAttrs, false, false, true>
+  | ModifiesClause<ref mod, ref modAttrs, false, performThisDeprecatedCheck>
   | RequiresClause<req, true>
   | EnsuresClause<ens, false>
   | DecreasesClause<decreases, ref decAttrs, !isGhost, false>
@@ -2094,7 +1385,7 @@ IteratorSpec<.List<FrameExpression/*!*/>/*!*/ reads, List<FrameExpression/*!*/>/
               ref Attributes readsAttrs, ref Attributes modAttrs, ref Attributes decrAttrs.>
 =
   SYNC
-  { ReadsClause<reads, false, false, false>
+  { ReadsClause<reads, ref readsAttrs, false, false, false>
   | ModifiesClause<ref mod, ref modAttrs, false, false>
   | (. bool isYield = false; .)
     [ "yield"                                                (. isYield = true; .)
@@ -2115,33 +1406,40 @@ Formals<.bool incoming, bool allowGhostKeyword, bool allowNewKeyword, bool allow
      Expression defaultValue;
      bool isNameOnly;
      bool isOlder;
-     RangeToken range;
+     Attributes attrs = null;
+     SourceOrigin range;
      Name name;
   .)
   "("
   [
+    { Attribute<ref attrs> }
     GIdentType<allowGhostKeyword, allowNewKeyword, incoming, allowOlderKeyword, out range, out name, out ty, out isGhost, out isOld, out isNameOnly, out isOlder>
     ParameterDefaultValue<incoming, out defaultValue>
-                 (. formals.Add(new Formal(name.Tok, name.Value, ty, incoming, isGhost, defaultValue, isOld, isNameOnly, isOlder)
-                        { RangeToken = defaultValue != null ? new RangeToken(range.StartToken, defaultValue.EndToken) : range, IsTypeExplicit = ty != null }
-                    ); .)
-    { "," GIdentType<allowGhostKeyword, allowNewKeyword, incoming, allowOlderKeyword, out range, out name, out ty, out isGhost, out isOld, out isNameOnly, out isOlder>
-    ParameterDefaultValue<incoming, out defaultValue>
-                 (. formals.Add(new Formal(name.Tok, name.Value, ty, incoming, isGhost, defaultValue, isOld, isNameOnly, isOlder)
-                        { RangeToken = defaultValue != null ? new RangeToken(range.StartToken, defaultValue.EndToken) : range, IsTypeExplicit = ty != null }
-                    ); .)
+                 (. var origin = defaultValue == null ? range 
+                      : new SourceOrigin(range.StartToken, defaultValue.EndToken, name.Center);
+                    formals.Add(new Formal(origin, name, ty, incoming, isGhost, defaultValue, attrs, isOld, isNameOnly, isOlder));
+                 .)
+    { ","
+      { Attribute<ref attrs> }
+      GIdentType<allowGhostKeyword, allowNewKeyword, incoming, allowOlderKeyword, out range, out name, out ty, out isGhost, out isOld, out isNameOnly, out isOlder>
+      ParameterDefaultValue<incoming, out defaultValue>
+      
+                 (. var origin2 = defaultValue == null ? range 
+                      : new SourceOrigin(range.StartToken, defaultValue.EndToken, name.Center);
+                    formals.Add(new Formal(origin2, name, ty, incoming, isGhost, defaultValue, attrs, isOld, isNameOnly, isOlder)); 
+                 .)
     }
   ]
   ")"
   .
 
 ParameterDefaultValue<bool incoming, out Expression defaultValue>
-= (. defaultValue = null; IToken tok;
+= (. defaultValue = null; Token tok;
   .)
   [ ":="        (. tok = t; .)
     Expression<out defaultValue, true, true>
     (. if (!incoming) {
-         SemErr(ErrorId.p_no_defaults_for_out_parameters, new RangeToken(tok,t), "out-parameters cannot have default-value expressions");
+         SemErr(ErrorId.p_no_defaults_for_out_parameters, new SourceOrigin(tok,t), "out-parameters cannot have default-value expressions");
          defaultValue = null;
        }
     .)
@@ -2151,19 +1449,18 @@ ParameterDefaultValue<bool incoming, out Expression defaultValue>
 /*------------------------------------------------------------------------*/
 FormalsOptionalIds<.List<Formal/*!*/>/*!*/ formals.>
 = (. Contract.Requires(cce.NonNullElements(formals));
-     RangeToken/*!*/ range;  Type/*!*/ ty;  Name/*!*/ name;  bool isGhost;  Expression/*?*/ defaultValue;
+     SourceOrigin/*!*/ range;  Type/*!*/ ty;  Name/*!*/ name;  bool isGhost;  Expression/*?*/ defaultValue;
      bool isNameOnly;
+     Attributes attributes;
   .)
   "("
   [
-    TypeIdentOptional<out range, out name, out ty, out isGhost, out defaultValue, out isNameOnly>
-            (. formals.Add(new Formal(name.Tok, name.Value, ty, true, isGhost, defaultValue, false, isNameOnly) 
-                    { RangeToken = range, IsTypeExplicit = ty != null}
+    TypeIdentOptional<out range, out name, out ty, out isGhost, out defaultValue, out isNameOnly, out attributes>
+            (. formals.Add(new Formal(range, name, ty, true, isGhost, defaultValue, attributes, false, isNameOnly)
                ); 
             .)
-    { "," TypeIdentOptional<out range, out name, out ty, out isGhost, out defaultValue, out isNameOnly>
-            (. formals.Add(new Formal(name.Tok, name.Value, ty, true, isGhost, defaultValue, false, isNameOnly)
-                    { RangeToken = range, IsTypeExplicit = ty != null}
+    { "," TypeIdentOptional<out range, out name, out ty, out isGhost, out defaultValue, out isNameOnly, out attributes>
+            (. formals.Add(new Formal(range, name, ty, true, isGhost, defaultValue, attributes, false, isNameOnly)
                ); 
             .)
     }
@@ -2173,76 +1470,82 @@ FormalsOptionalIds<.List<Formal/*!*/>/*!*/ formals.>
 
 /*------------------------------------------------------------------------*/
 Type<out Type ty>
-= (. Contract.Ensures(Contract.ValueAtReturn(out ty) != null); IToken/*!*/ tok; .)
+= (. Contract.Ensures(Contract.ValueAtReturn(out ty) != null); Token/*!*/ tok; .)
   TypeAndToken<out tok, out ty, false>
   .
 
-TypeAndToken<out IToken tok, out Type ty, bool inExpressionContext>
+TypeAndToken<out Token tok, out Type ty, bool inExpressionContext>
 = (. Contract.Ensures(Contract.ValueAtReturn(out tok)!=null);
      Contract.Ensures(Contract.ValueAtReturn(out ty) != null);
      tok = Token.NoToken;
      ty = new BoolType();  /*keep compiler happy*/
-     IToken startToken = null;
+     Token startToken = null;
      List<Type> gt;
      List<Type> tupleArgTypes = null;
-     List<IToken> argumentGhostTokens = null;
-  .)
-  ( "bool"                          (. tok = t; startToken = t; .)
-  | "char"                          (. tok = t; startToken = t;  ty = new CharType(); .)
-  | "int"                           (. tok = t; startToken = t;  ty = new IntType(); .)
-  | "nat"                           (. tok = t; startToken = t;  ty = new UserDefinedType(tok, tok.val, null); .)
-  | "real"                          (. tok = t; startToken = t;  ty = new RealType(); .)
-  | "ORDINAL"                       (. tok = t; startToken = t;  ty = new BigOrdinalType(); .)
+     List<Token> argumentGhostTokens = null;
+  .)
+  ( "bool"                          (. tok = t; startToken = t; ty = new BoolType(); ty.SetOrigin(t); .)
+  | "char"                          (. tok = t; startToken = t; ty = new CharType(); ty.SetOrigin(t); .)
+  | "int"                           (. tok = t; startToken = t; ty = new IntType(); ty.SetOrigin(t); .)
+  | "nat"                           (. tok = t; startToken = t; ty = new UserDefinedType(tok, tok.val, null); .)
+  | "real"                          (. tok = t; startToken = t; ty = new RealType(); ty.SetOrigin(t); .)
+  | "ORDINAL"                       (. tok = t; startToken = t; ty = new BigOrdinalType(); ty.SetOrigin(t); .)
   | bvToken                         (. tok = t; startToken = t;
                                        int w = StringToInt(tok.val.Substring(2), 0, "bitvectors that wide", startToken);
                                        ty = new BitvectorType(theOptions, w);
+                                       ty.SetOrigin(t);
                                     .)
   | "set"                           (. tok = t; startToken = t; .)
     OptGenericInstantiation<out gt, inExpressionContext>
                                     (. if (gt != null && gt.Count > 1) {
                                          SemErr(ErrorId.p_set_only_one_type_parameter, 
-                                           new RangeToken(startToken.Next, t), "set type expects only one type argument");
+                                           new SourceOrigin(startToken.Next, t), "set type expects only one type argument");
                                        }
                                        ty = new SetType(true, gt != null ?gt[0] : null);
+                                       ty.SetOrigin(new SourceOrigin(startToken, t));
                                     .)
   | "iset"                          (. tok = t; startToken = t; .)
     OptGenericInstantiation<out gt, inExpressionContext>
                                     (. if (gt != null && gt.Count > 1) {
                                          SemErr(ErrorId.p_iset_only_one_type_parameter, 
-                                           new RangeToken(startToken.Next, t), "iset type expects only one type argument");
+                                           new SourceOrigin(startToken.Next, t), "iset type expects only one type argument");
                                        }
                                        ty = new SetType(false, gt != null ? gt[0] : null);
+                                       ty.SetOrigin(new SourceOrigin(startToken, t));
                                     .)
   | "multiset"                      (. tok = t; startToken = t; .)
     OptGenericInstantiation<out gt, inExpressionContext>
                                     (. if (gt != null && gt.Count > 1) {
                                          SemErr(ErrorId.p_multiset_only_one_type_parameter, 
-                                           new RangeToken(startToken.Next, t), "multiset type expects only one type argument");
+                                           new SourceOrigin(startToken.Next, t), "multiset type expects only one type argument");
                                        }
                                        ty = new MultiSetType(gt != null ? gt[0] : null);
+                                       ty.SetOrigin(new SourceOrigin(startToken, t));
                                     .)
   | "seq"                           (. tok = t; startToken = t; .)
     OptGenericInstantiation<out gt, inExpressionContext>
                                     (. if (gt != null && gt.Count > 1) {
                                          SemErr(ErrorId.p_seq_only_one_type_parameter, 
-                                           new RangeToken(startToken.Next, t), "seq type expects only one type argument");
+                                           new SourceOrigin(startToken.Next, t), "seq type expects only one type argument");
                                        }
                                        ty = new SeqType(gt != null ? gt[0] : null);
+                                       ty.SetOrigin(new SourceOrigin(startToken, t));
                                     .)
-  | "string"                        (. tok = t; startToken = t;  ty = new UserDefinedType(tok, tok.val, null); .)
-  | "object"                        (. tok = t; startToken = t;  ty = new UserDefinedType(tok, tok.val, null); .)
-  | "object?"                       (. tok = t; startToken = t;  ty = new UserDefinedType(tok, tok.val, null); .)
+  | "string"                        (. tok = t; startToken = t; ty = new UserDefinedType(new SourceOrigin(startToken, t), tok.val, null); .)
+  | "object"                        (. tok = t; startToken = t; ty = new UserDefinedType(new SourceOrigin(startToken, t), tok.val, null); .)
+  | "object?"                       (. tok = t; startToken = t; ty = new UserDefinedType(new SourceOrigin(startToken, t), tok.val, null); .)
   | "map"                           (. tok = t; startToken = t; .)
     OptGenericInstantiation<out gt, inExpressionContext>
                                     (. if (gt == null) {
                                          ty = new MapType(true, null, null);
                                        } else if (gt.Count != 2) {
                                          SemErr(ErrorId.p_map_needs_two_type_parameters, 
-                                           new RangeToken(startToken.Next, t), "map type expects two type arguments");
+                                           new SourceOrigin(startToken.Next, t), "map type expects two type arguments");
                                          ty = new MapType(true, gt[0], gt.Count == 1 ? new InferredTypeProxy() : gt[1]);
                                        } else {
                                          ty = new MapType(true, gt[0], gt[1]);
                                        }
+                                       ty.SetOrigin(new SourceOrigin(startToken, t));
                                     .)
   | "imap"                          (. tok = t; startToken = t; .)
     OptGenericInstantiation<out gt, inExpressionContext>
@@ -2250,11 +1553,12 @@ TypeAndToken<out IToken tok, out Type ty, bool inExpressionContext>
                                          ty = new MapType(false, null, null);
                                        } else if (gt.Count != 2) {
                                          SemErr(ErrorId.p_imap_needs_two_type_parameters, 
-                                           new RangeToken(startToken.Next, t), "imap type expects two type arguments");
+                                           new SourceOrigin(startToken.Next, t), "imap type expects two type arguments");
                                          ty = new MapType(false, gt[0], gt.Count == 1 ? new InferredTypeProxy() : gt[1]);
                                        } else {
                                          ty = new MapType(false, gt[0], gt[1]);
                                        }
+                                       ty.SetOrigin(new SourceOrigin(startToken, t));
                                     .)
   | arrayToken                      (. tok = t; startToken = t; .)
     OptGenericInstantiation<out gt, inExpressionContext>
@@ -2265,12 +1569,12 @@ TypeAndToken<out IToken tok, out Type ty, bool inExpressionContext>
                                        int dims = StringToInt(dimString, 1, "arrays of that many dimensions", startToken);
                                        (ty, var bMod) = SystemModuleManager.ArrayType(tok, dims, gt, true, q);
                                        SystemModuleModifiers.Add(bMod);
+                                       ty.SetOrigin(new SourceOrigin(startToken, t));
                                     .)
   | TupleType<out ty, out tok, out tupleArgTypes, out argumentGhostTokens>
   | NamedType<out ty, out tok, inExpressionContext>
   )
   (. startToken = startToken ?? ty.StartToken ?? tok;
-     ty.RangeToken = new RangeToken(startToken, t);
   .)
   [ (. int arrowKind = 0; /* 0: any, 1: partial, 2: total */
        Type t2;
@@ -2301,19 +1605,19 @@ TypeAndToken<out IToken tok, out Type ty, bool inExpressionContext>
            ty = new UserDefinedType(tok, ArrowType.TotalArrowTypeName(arity), gt);
          }
        }
-       ty.RangeToken = new RangeToken(startToken, t);
+       ty.SetOrigin(new SourceOrigin(startToken, t, tok));
     .)
   ]
   .
 
 /*------------------------------------------------------------------------*/
 
-TupleType<.out Type ty, out IToken tok, out List<Type> tupleArgTypes, out List<IToken> argumentGhostTokens.> =
+TupleType<.out Type ty, out Token tok, out List<Type> tupleArgTypes, out List<Token> argumentGhostTokens.> =
   "("                             (. tok = t;
                                      ty = null; // To keep compiler happy
                                      tupleArgTypes = new List<Type>();
-                                     IToken ghostToken = null;
-                                     argumentGhostTokens = new List<IToken>();
+                                     Token ghostToken = null;
+                                     argumentGhostTokens = new List<Token>();
                                   .)
   [ [ "ghost"                     (. ghostToken = t; .)
     ]
@@ -2337,16 +1641,15 @@ TupleType<.out Type ty, out IToken tok, out List<Type> tupleArgTypes, out List<I
   .
 
 /*------------------------------------------------------------------------*/
-NamedType<.out Type ty, out IToken tok, bool inExpressionContext.> =
-  (. Expression e; IToken startToken = null; .)
+NamedType<.out Type ty, out Token tok, bool inExpressionContext.> =
+  (. Expression e; Token startToken = null; .)
   NameSegmentForTypeName<out e, inExpressionContext>  (. tok = t; startToken = e.StartToken; .)
   { "."
     TypeNameOrCtorSuffix<out tok>       (. List<Type> typeArgs; .)
     OptGenericInstantiation<out typeArgs, inExpressionContext>
-    (. e = new ExprDotName(tok, e, tok.val, typeArgs); .)
+    (. e = new ExprDotName(new SourceOrigin(startToken, tok, tok), e, new Name(tok), typeArgs); .)
   }
-  (. ty = new UserDefinedType(e.tok, e);
-     ty.RangeToken = new RangeToken(startToken, t);
+  (. ty = new UserDefinedType(e.Origin, e);
    .)
   .
 
@@ -2376,7 +1679,6 @@ GenericInstantiation<.List<Type> gt.>
 /*------------------------------------------------------------------------*/
 FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
 = (. Contract.Ensures(Contract.ValueAtReturn(out f) != null);
-     Attributes attrs = null;
      Name name = null; // To please compiler
      List<TypeParameter> typeArgs = new List<TypeParameter>();
      List<Formal> formals = new List<Formal>();
@@ -2387,14 +1689,14 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
      List<FrameExpression> reads = new List<FrameExpression>();
      List<Expression> decreases;
      Attributes decAttrs = null;
+     Attributes readsAttrs = null;
      Expression body = null;
      bool isPredicate = false; bool isLeastPredicate = false; bool isGreatestPredicate = false;
-     IToken/*?*/ headToken = null; // used only for a basic "function" or "predicate"
-     IToken/*?*/ functionMethodToken = null; // used only for a basic "function" or "predicate"
-     IToken tokenWithTrailingDocString = Token.NoToken;
-     IToken bodyStart = Token.NoToken;
-     IToken bodyEnd = Token.NoToken;
-     IToken signatureEllipsis = null;
+     Token/*?*/ headToken = null; // used only for a basic "function" or "predicate"
+     Token/*?*/ functionMethodToken = null; // used only for a basic "function" or "predicate"
+     Token bodyStart = Token.NoToken;
+     Token bodyEnd = Token.NoToken;
+     Token signatureEllipsis = null;
      bool isTwoState = false;
      ExtremePredicate.KType kType = ExtremePredicate.KType.Unspecified;
   .)
@@ -2436,12 +1738,12 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
    */
 
   /* ----- function ----- */
-  [ "twostate"   (. isTwoState = true; CheckAndSetTokenOnce(ref dmod.FirstToken); .)
+  [ "twostate"   (. isTwoState = true; CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
   ]
-  ( "function"   (. headToken = t; CheckAndSetTokenOnce(ref dmod.FirstToken); .)
+  ( "function"   (. headToken = t; CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
     [ "method"   (. functionMethodToken = t; .)
     ]
-    { Attribute<ref attrs> }
+    { Attribute<ref dmod.Attributes> }
     MethodFunctionName<out name>
     (
       [ GenericParameters<typeArgs, false> ]
@@ -2451,8 +1753,7 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
          "("
            GIdentType<false, false, false, false, out var range2, out var resultName, out var ty, out var resultIsGhost, out var isOld, out var isNameOnly, out var isOlder>
            (. Contract.Assert(!resultIsGhost && !isOld && !isNameOnly && !isOlder);
-              result = new Formal(resultName.Tok, resultName.Value, ty, false, false, null, false)
-                { RangeToken = range2, IsTypeExplicit = ty != null };
+              result = new Formal(range2, resultName, ty, false, false, null, null, false);
            .)
          ")"
          | Type<out returnType>
@@ -2461,21 +1762,20 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
     )
 
   /* ----- predicate ----- */
-  | "predicate"  (. headToken = t; isPredicate = true; CheckAndSetTokenOnce(ref dmod.FirstToken); .)
+  | "predicate"  (. headToken = t; isPredicate = true; CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
     [ "method"   (. functionMethodToken = t; .)
     ]
-    { Attribute<ref attrs> }
+    { Attribute<ref dmod.Attributes> }
     MethodFunctionName<out name>
     (
       [ GenericParameters<typeArgs, false> ]
-      [ KType<ref kType, out IToken openBracket, out IToken closeBracket> 
+      [ KType<ref kType, out Token openBracket, out Token closeBracket> 
         (. SemErr(ErrorId.p_formal_ktype_only_in_least_and_greatest_predicates,
-                  new RangeToken(openBracket, t), 
+                  new SourceOrigin(openBracket, t), 
                   "a formal [ ] declaration is only allowed for least and greatest predicates");
         .)
       ]
-      [ Formals<true, true, isTwoState, true, formals>
-      ]
+      Formals<true, true, isTwoState, true, formals>
       [ PredicateResult<"predicate", out result> ]
     | ellipsis   (. signatureEllipsis = t; .)
     )
@@ -2483,16 +1783,16 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
   /* ----- least predicate ----- */
   | (. Contract.Assert(!isTwoState);  // the IsFunctionDecl check checks that "twostate" is not followed by "least"
     .)
-    ( "least"                  (. CheckAndSetTokenOnce(ref dmod.FirstToken); .)
-    | "inductive"              (. CheckAndSetTokenOnce(ref dmod.FirstToken); errors.Deprecated(ErrorId.p_deprecated_inductive_predicate, t, "the old keyword phrase 'inductive predicate' has been renamed to 'least predicate'"); .)
+    ( "least"                  (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
+    | "inductive"              (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); errors.Deprecated(ErrorId.p_deprecated_inductive_predicate, t, "the old keyword phrase 'inductive predicate' has been renamed to 'least predicate'"); .)
     )
     "predicate"
     (. isLeastPredicate = true; .)
-    { Attribute<ref attrs> }
+    { Attribute<ref dmod.Attributes> }
     MethodFunctionName<out name>
     (
       [ GenericParameters<typeArgs, false> ]
-      [ KType<ref kType, out IToken openBracket, out IToken closeBracket> ]
+      [ KType<ref kType, out Token openBracket, out Token closeBracket> ]
       Formals<true, false, false, false, formals>
       [ PredicateResult<"least predicate", out result> ]
     | ellipsis                 (. signatureEllipsis = t; .)
@@ -2501,16 +1801,16 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
   /* ----- greatest predicate ----- */
   | (. Contract.Assert(!isTwoState);  // the IsFunctionDecl check checks that "twostate" is not followed by "greatest"
     .)
-    ( "greatest"                 (. CheckAndSetTokenOnce(ref dmod.FirstToken); .)
+    ( "greatest"                 (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); .)
       "predicate"     
-    | "copredicate"              (. CheckAndSetTokenOnce(ref dmod.FirstToken); errors.Deprecated(ErrorId.p_deprecated_copredicate, t, "the old keyword 'copredicate' has been renamed to the keyword phrase 'greatest predicate'"); .)
+    | "copredicate"              (. CheckAndSetTokenOnce(ref dmod.FirstTokenExceptAttributes); errors.Deprecated(ErrorId.p_deprecated_copredicate, t, "the old keyword 'copredicate' has been renamed to the keyword phrase 'greatest predicate'"); .)
     )
     (. isGreatestPredicate = true; .)
-    { Attribute<ref attrs> }
+    { Attribute<ref dmod.Attributes> }
     MethodFunctionName<out name>
     (
       [ GenericParameters<typeArgs, false> ]
-      [ KType<ref kType, out IToken openBracket, out IToken closeBracket> ]
+      [ KType<ref kType, out Token openBracket, out Token closeBracket> ]
       Formals<true, false, false, false, formals>
       [ PredicateResult<"greatest predicate", out result> ]
     | ellipsis                 (. signatureEllipsis = t; .)
@@ -2518,10 +1818,9 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
   )
 
   (. decreases = isLeastPredicate || isGreatestPredicate ? null : new List<Expression/*!*/>();
-     tokenWithTrailingDocString = t;
   .)
-  FunctionSpec<reqs, reads, ens, decreases, ref decAttrs>
-  (. IToken byMethodTok = null; BlockStmt byMethodBody = null; .)
+  FunctionSpec<reqs, reads, ens, decreases, ref decAttrs, ref readsAttrs>
+  (. Token byMethodTok = null; BlockStmt byMethodBody = null; .)
   [ FunctionBody<out body, out bodyStart, out bodyEnd, out byMethodTok, out byMethodBody> ]
 
   (. /* ========================================
@@ -2534,13 +1833,13 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
        var what = isPredicate || isLeastPredicate || isGreatestPredicate ? "predicate" : "function";
  
        if (isTwoState) {
-         var byrange = new RangeToken(byMethodTok, byMethodBody.EndToken);
+         var byrange = new SourceOrigin(byMethodTok, byMethodBody.EndToken);
          SemErr(ErrorId.p_no_by_method_in_twostate, byrange, $"a 'by method' implementation is not allowed on a twostate {what}");
          byMethodBody = null;
          functionMethodToken = null; // to avoid a confusing error message below, drop the "method" keyword, if present
 
        } else if (isLeastPredicate || isGreatestPredicate) {
-         var byrange = new RangeToken(byMethodTok, byMethodBody.EndToken);
+         var byrange = new SourceOrigin(byMethodTok, byMethodBody.EndToken);
          SemErr(ErrorId.p_no_by_method_in_extreme_predicate, byrange, "a 'by method' implementation is not allowed on an extreme predicate");
          byMethodBody = null;
          functionMethodToken = null; // to avoid a confusing error message below, drop the "method" keyword, if present
@@ -2581,7 +1880,7 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
              dmod.IsGhost = false; // don't report errors about 'ghost', too
            } else if (theOptions.FunctionSyntax == FunctionSyntaxOptions.Version4 ||
                       theOptions.FunctionSyntax == FunctionSyntaxOptions.ExperimentalPredicateAlwaysGhost) {
-             var erange = new RangeToken(functionMethodToken.Prev, functionMethodToken);
+             var erange = new SourceOrigin(functionMethodToken.Prev, functionMethodToken);
              if (isPredicate) {
               SemErr(ErrorId.p_deprecating_predicate_method, erange, $"the phrase '{what} method' is not allowed when using --function-syntax:4; to declare a compiled {what}, use just '{what}'");
              } else {
@@ -2589,7 +1888,7 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
              }
              functionMethodToken = null;
            } else if (dmod.IsGhost && theOptions.FunctionSyntax != FunctionSyntaxOptions.Version3) {
-             var erange = new RangeToken(headToken, functionMethodToken);
+             var erange = new SourceOrigin(headToken, functionMethodToken);
              if (isPredicate) {
               SemErr(ErrorId.p_no_ghost_predicate_method, erange, $"there is no such thing as a 'ghost {what} method'");
              } else {
@@ -2660,8 +1959,8 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
      if (isGhost) {
        foreach (var formal in formals) {
          if (formal.IsGhost) {
-           IToken t = formal.tok;
-           IToken ghostToken = null;
+           IOrigin t = formal.Origin;
+           IOrigin ghostToken = null;
            while (t != null && t.val != "," && t.val != "(") {
             if (t.val == "ghost") {
               ghostToken = t;
@@ -2669,7 +1968,7 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
             }
             t = t.Prev;
            }
-           SemErr(ErrorId.p_no_ghost_formal, ghostToken ?? formal.tok, "formal cannot be declared 'ghost' in this context");
+           SemErr(ErrorId.p_no_ghost_formal, ghostToken ?? formal.Origin, "formal cannot be declared 'ghost' in this context");
          }
        }
      }
@@ -2677,39 +1976,40 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
      /* =========================================
       * Finally, we create the AST node for the function declaration we parsed.
       */
-
-     var range = new RangeToken(dmod.FirstToken, t);
+     var range = new SourceOrigin(dmod.FirstToken, t, name.Center);
      if (isTwoState && isPredicate) {
        Contract.Assert(functionMethodToken == null && !dmod.IsGhost);
        f = new TwoStatePredicate(range, name, dmod.IsStatic, dmod.IsOpaque, typeArgs, formals, result,
-                                 reqs, reads, ens, new Specification<Expression>(decreases, decAttrs), body, attrs, signatureEllipsis);
+                                 reqs, new Specification<FrameExpression>(reads, readsAttrs), ens, 
+                                 new Specification<Expression>(decreases, decAttrs), body, dmod.Attributes, signatureEllipsis);
      } else if (isTwoState) {
        Contract.Assert(functionMethodToken == null && !dmod.IsGhost);
        f = new TwoStateFunction(range, name, dmod.IsStatic, dmod.IsOpaque, typeArgs, formals, result, returnType,
-                                reqs, reads, ens, new Specification<Expression>(decreases, decAttrs), body, attrs, signatureEllipsis);
+                                reqs, new Specification<FrameExpression>(reads, readsAttrs), ens, 
+                                new Specification<Expression>(decreases, decAttrs), body, dmod.Attributes, signatureEllipsis);
      } else if (isPredicate) {
        Contract.Assert(functionMethodToken == null || !dmod.IsGhost);
        f = new Predicate(range, name, dmod.IsStatic, isGhost, dmod.IsOpaque, typeArgs, formals, result,
-                         reqs, reads, ens, new Specification<Expression>(decreases, decAttrs), body, Predicate.BodyOriginKind.OriginalOrInherited,
-                         byMethodTok, byMethodBody, attrs, signatureEllipsis);
+                         reqs, new Specification<FrameExpression>(reads, readsAttrs), ens, 
+                         new Specification<Expression>(decreases, decAttrs), body, Predicate.BodyOriginKind.OriginalOrInherited,
+                         byMethodTok, byMethodBody, dmod.Attributes, signatureEllipsis);
      } else if (isLeastPredicate) {
        Contract.Assert(functionMethodToken == null && !dmod.IsGhost);
        f = new LeastPredicate(range, name, dmod.IsStatic, dmod.IsOpaque, kType, typeArgs, formals, result,
-                              reqs, reads, ens, body, attrs, signatureEllipsis);
+                              reqs, new Specification<FrameExpression>(reads, readsAttrs), ens, body, dmod.Attributes, signatureEllipsis);
      } else if (isGreatestPredicate) {
        Contract.Assert(functionMethodToken == null && !dmod.IsGhost);
        f = new GreatestPredicate(range, name, dmod.IsStatic, dmod.IsOpaque, kType, typeArgs, formals, result,
-                                 reqs, reads, ens, body, attrs, signatureEllipsis);
+                                 reqs, new Specification<FrameExpression>(reads, readsAttrs), ens, body, dmod.Attributes, signatureEllipsis);
      } else {
        Contract.Assert(functionMethodToken == null || !dmod.IsGhost);
        f = new Function(range, name, dmod.IsStatic, isGhost, dmod.IsOpaque,
                         typeArgs, formals, result, returnType,
-                        reqs, reads, ens, new Specification<Expression>(decreases, decAttrs), body,
+                        reqs, new Specification<FrameExpression>(reads, readsAttrs), ens, new Specification<Expression>(decreases, decAttrs), body,
                         byMethodTok, byMethodBody,
-                        attrs, signatureEllipsis);
+                        dmod.Attributes, signatureEllipsis);
      }
      f.BodyStartTok = bodyStart;
-     f.TokenWithTrailingDocString = tokenWithTrailingDocString;
      SystemModuleModifiers.Add(b => b.CreateArrowTypeDecl(formals.Count));
      if (isLeastPredicate || isGreatestPredicate) {
        // also create an arrow type for the corresponding prefix predicate
@@ -2719,14 +2019,14 @@ FunctionDecl<DeclModifierData dmod, out Function/*!*/ f>
   .
 
 /*------------------------------------------------------------------------*/
-FunctionSpec<.List<AttributedExpression> reqs, List<FrameExpression> reads, List<AttributedExpression> ens, List<Expression> decreases, ref Attributes decAttrs.>
+FunctionSpec<.List<AttributedExpression> reqs, List<FrameExpression> reads, List<AttributedExpression> ens, List<Expression> decreases, ref Attributes decAttrs, ref Attributes readsAttrs.>
 = (. Contract.Requires(cce.NonNullElements(reqs));
      Contract.Requires(cce.NonNullElements(reads));
      Contract.Requires(decreases == null || cce.NonNullElements(decreases));
   .)
   SYNC
   { RequiresClause<reqs, true>
-  | ReadsClause<reads, false, false, true>
+  | ReadsClause<reads, ref readsAttrs, false, false, true>
   | EnsuresClause<ens, false>
   | (. var decreasesToken = la;
        var decreasesForbidden = decreases == null;
@@ -2736,7 +2036,7 @@ FunctionSpec<.List<AttributedExpression> reqs, List<FrameExpression> reads, List
     .)
     DecreasesClause<decreases, ref decAttrs, false, false>
     (. if (decreasesForbidden) {
-       var erange = new RangeToken(decreasesToken, t);
+       var erange = new SourceOrigin(decreasesToken, t);
        SemErr(ErrorId.p_no_decreases_for_extreme_predicates, erange, "'decreases' clauses are meaningless for least and greatest predicates, so they are not allowed");
     }.)
   }
@@ -2746,20 +2046,21 @@ FunctionSpec<.List<AttributedExpression> reqs, List<FrameExpression> reads, List
 PredicateResult<string name, out Formal result>
 = (. Type/*!*/ returnType = new BoolType();
      result = null;
+     Attributes attributes = null;
   .)
   ":"
   (  IF(IsParenIdentsColon())
      "("
+       { Attribute<ref attributes> }
        GIdentType<false, false, false, false, out var range, out var nameId, out var ty, out var resultIsGhost, out var isOld, out var isNameOnly, out var isOlder>
        (.
           if (ty is not BoolType) {
-            SemErr(ErrorId.p_predicate_return_type_must_be_bool, new RangeToken(ty.StartToken, t), $"{name} return type should be bool, got {ty}");
+            SemErr(ErrorId.p_predicate_return_type_must_be_bool, new SourceOrigin(ty.StartToken, t), $"{name} return type should be bool, got {ty}");
           }
-          result = new Formal(nameId.Tok, nameId.Value, ty, false, false, null, false)
-            { RangeToken = range, IsTypeExplicit = ty != null };
+          result = new Formal(range, nameId, ty, false, false, null, attributes, false);
        .)
      ")"
-     | Type<out returnType> (. SemErr(ErrorId.p_no_return_type_for_predicate, new RangeToken(returnType.StartToken, t), $"{name}s do not have an explicitly declared return type; it is always bool. Unless you want to name the result: ': (result: bool)'"); .)
+     | Type<out returnType> (. SemErr(ErrorId.p_no_return_type_for_predicate, new SourceOrigin(returnType.StartToken, t), $"{name}s do not have an explicitly declared return type; it is always bool. Unless you want to name the result: ': (result: bool)'"); .)
   )
   .
 
@@ -2772,7 +2073,7 @@ PossiblyWildExpression<out Expression e, bool allowLambda, bool allowWild>
    */
   ( "*"                        (. e = new WildcardExpr(t);
                                   if (!allowWild) {
-                                    SemErr(ErrorId.p_no_wild_expression, e.tok, "A '*' expression is not allowed here");
+                                    SemErr(ErrorId.p_no_wild_expression, e.Origin, "A '*' expression is not allowed here");
                                   }
                                .)
   | Expression<out e, false, allowLambda>
@@ -2799,17 +2100,17 @@ PossiblyWildFrameExpression<out FrameExpression fe, bool allowLemma,
   .
 
 /*------------------------------------------------------------------------*/
-FrameField<out IToken id> = "`" IdentOrDigits<out id>.
+FrameField<out Token id> = "`" IdentOrDigits<out id>.
 
 FrameExpression<out FrameExpression fe, bool allowLemma, bool allowLambda>
 = (. Contract.Ensures(Contract.ValueAtReturn(out fe) != null);
      Expression/*!*/ e;
-     IToken/*!*/ id;
+     Token/*!*/ id;
      string fieldName = null;
-     IToken feTok = null;
+     IOrigin feTok = null;
      fe = dummyFrameExpr;
   .)
-  ( Expression<out e, allowLemma, allowLambda>   (. feTok = e.tok; .)
+  ( Expression<out e, allowLemma, allowLambda>   (. feTok = e.Origin; .)
     [ FrameField<out id>        (. fieldName = id.val;  feTok = id; .)
     ]                           (. fe = new FrameExpression(feTok, e, fieldName); .)
   |
@@ -2819,7 +2120,7 @@ FrameExpression<out FrameExpression fe, bool allowLemma, bool allowLambda>
   .
 
 /*------------------------------------------------------------------------*/
-FunctionBody<out Expression/*!*/ e, out IToken bodyStart, out IToken bodyEnd, out IToken/*?*/ byMethodTok, out BlockStmt/*?*/ byMethodBody>
+FunctionBody<out Expression/*!*/ e, out Token bodyStart, out Token bodyEnd, out Token/*?*/ byMethodTok, out BlockStmt/*?*/ byMethodBody>
 = (. Contract.Ensures(Contract.ValueAtReturn(out e) != null); e = dummyExpr;
      byMethodTok = null; byMethodBody = null;
   .)
@@ -2832,23 +2133,45 @@ FunctionBody<out Expression/*!*/ e, out IToken bodyStart, out IToken bodyEnd, ou
   ]
   .
 
+
 /*------------------------------------------------------------------------*/
-BlockStmt<out BlockStmt/*!*/ block, out IToken bodyStart, out IToken bodyEnd>
+BlockStmt<out BlockStmt/*!*/ block, out Token bodyStart, out Token bodyEnd>
 = (. Contract.Ensures(Contract.ValueAtReturn(out block) != null);
      List<Statement/*!*/> body = new List<Statement/*!*/>();
   .)
   "{"                                  (. bodyStart = t; .)
   { Stmt<body> }
   "}"                                  (. bodyEnd = t;
-                                          block = new BlockStmt(new RangeToken(bodyStart, bodyEnd), body);
+                                          block = new BlockStmt(new SourceOrigin(bodyStart, bodyEnd), body);
                                           .)
   .
 
+OpaqueBlock<out Statement s>
+= (.
+    List<Statement/*!*/> body = new List<Statement/*!*/>();
+    List<AttributedExpression> ensures = new();
+    List<FrameExpression/*!*/> modifies = new List<FrameExpression/*!*/>();
+    Attributes modifiesAttributes = null;
+    Token start;
+  .)
+  "opaque" (. start = t; .)
+  { ModifiesClause<ref modifies, ref modifiesAttributes, false, false>
+  | EnsuresClause<ensures, false>
+  }
+  "{"
+  { Stmt<body> }
+  "}"
+  (. 
+    s = new OpaqueBlock(new SourceOrigin(start, t), body, ensures, 
+      new Specification<FrameExpression>(modifies, modifiesAttributes));
+  .)
+  .
+
 /*------------------------------------------------------------------------*/
-DividedBlockStmt<out DividedBlockStmt body, out IToken bodyStart, out IToken bodyEnd>
+DividedBlockStmt<out DividedBlockStmt body, out Token bodyStart, out Token bodyEnd>
 = (. Contract.Ensures(Contract.ValueAtReturn(out body) != null);
      List<Statement> bodyInit = new List<Statement>();
-     IToken separatorTok = null;
+     Token separatorTok = null;
      List<Statement> bodyProper = new List<Statement>();
   .)
   "{"                                  (. bodyStart = t; .)
@@ -2858,7 +2181,7 @@ DividedBlockStmt<out DividedBlockStmt body, out IToken bodyStart, out IToken bod
     { Stmt<bodyProper> }
   ]
   "}"                                  (. bodyEnd = t; .)
-  (. body = new DividedBlockStmt(new RangeToken(bodyStart, t), bodyInit, separatorTok, bodyProper); .)
+  (. body = new DividedBlockStmt(new SourceOrigin(bodyStart, t), bodyInit, separatorTok, bodyProper); .)
   .
 
 /*------------------------------------------------------------------------*/
@@ -2873,11 +2196,13 @@ OneStmt<out Statement/*!*/ s>
 = (. Contract.Ensures(Contract.ValueAtReturn(out s) != null);
      s = dummyStmt;  /* to please the compiler */
      BlockStmt bs;
-     IToken bodyStart, bodyEnd;
+     Token bodyStart, bodyEnd;
   .)
   SYNC
   ( BlockStmt<out bs, out bodyStart, out bodyEnd>  (. s = bs; .)
-  | UpdateStmt<out s>     // includes UpdateFailure
+  | OpaqueBlock<out s>
+  | IF(IsReveal(scanner.Peek())) RevealStmt<out s>
+  | AssignStatement<out s>     // includes UpdateFailure
   | VarDeclStatement<out s>
   | ReturnStmt<out s>
   | IfStmt<out s>
@@ -2885,7 +2210,7 @@ OneStmt<out Statement/*!*/ s>
   | ForLoopStmt<out s>
   | AssertStmt<out s>
   | AssumeStmt<out s>
-  | BreakStmt<out s>
+  | BreakOrContinueStmt<out s>
   | CalcStmt<out s>
   | ExpectStmt<out s>
   | ForallStmt<out s>
@@ -2893,7 +2218,6 @@ OneStmt<out Statement/*!*/ s>
   | MatchStmt<out s>
   | ModifyStmt<out s>
   | PrintStmt<out s>
-  | RevealStmt<out s>
   | SkeletonStmt<out s>
   | YieldStmt<out s>
   )
@@ -2901,36 +2225,38 @@ OneStmt<out Statement/*!*/ s>
 
 /*------------------------------------------------------------------------*/
 LabeledStmt<out Statement s>
-= (. IToken colonToken;
-     IToken labelToken;
+= (. Token colonToken;
+     Token labelToken;
   .)
-  "label"  (. IToken id; labelToken = t; .)
+  "label"  (. Token id; labelToken = t; .)
   LabelName<out id> ":" (. colonToken = t; .)
   OneStmt<out s>
   (. s.Labels = new LList<Label>(new Label(id, id.val), s.Labels);
      s.PostLabelToken = s.StartToken;
-     s.RangeToken = new RangeToken(labelToken, t);
+     s.SetOrigin(new SourceOrigin(labelToken, t, s.PostLabelToken));
   .)
   .
 
 /*------------------------------------------------------------------------*/
 SkeletonStmt<out Statement s>
-= (. IToken dotdotdot; .)
+= (. Token dotdotdot; .)
   ellipsis                             (. dotdotdot = t; .)
   ";"
-  (. s = new SkeletonStatement(new RangeToken(dotdotdot, t));
+  (. s = new SkeletonStatement(new SourceOrigin(dotdotdot, t));
      errors.Deprecated(ErrorId.p_deprecated_statement_refinement, t, "the ... refinement feature in statements is deprecated");
   .)
   .
 
 /*------------------------------------------------------------------------*/
-BreakStmt<out Statement/*!*/ s>
+BreakOrContinueStmt<out Statement/*!*/ s>
 = (. var isContinue = false;
-     IToken start = Token.NoToken;
-     IToken label = null;
+     Token start = Token.NoToken;
+     Token label = null;
      int breakAndContinueCount = 1;
+     Attributes attributes = null;
   .)
   ( "continue"              (. start = t; isContinue = true; .)
+    [ Attribute<ref attributes> ]
     [ LabelName<out label> ]
   | "break"                 (. start = t; .)
     ( LabelName<out label>
@@ -2944,8 +2270,8 @@ BreakStmt<out Statement/*!*/ s>
   ";"
   (. Contract.Assert(label == null || breakAndContinueCount == 1);
      s = label != null ?
-       new BreakStmt(new RangeToken(start, t), label, isContinue) :
-       new BreakStmt(new RangeToken(start, t), breakAndContinueCount, isContinue);
+       new BreakOrContinueStmt(new SourceOrigin(start, t), label, isContinue) :
+       new BreakOrContinueStmt(new SourceOrigin(start, t), breakAndContinueCount, isContinue, attributes);
   .)
   .
 
@@ -2953,17 +2279,19 @@ BreakStmt<out Statement/*!*/ s>
 ReturnStmt<out Statement/*!*/ s>
 = "return"
        (.
-         IToken returnTok = t;
+         Token returnTok = t;
          List<AssignmentRhs> rhss = null;
          AssignmentRhs r;
+         Attributes attributes = null;
        .)
+  [ Attribute<ref attributes> ]
   [ Rhs<out r>                       (. rhss = new List<AssignmentRhs>();
                                         rhss.Add(r);
                                      .)
     { "," Rhs<out r>                 (. rhss.Add(r); .)
     }
   ]
-  ";"                                (. s = new ReturnStmt(new RangeToken(returnTok, t), rhss);
+  ";"                                (. s = new ReturnStmt(new SourceOrigin(returnTok, t), rhss, attributes);
                                      .)
   .
 
@@ -2971,7 +2299,7 @@ ReturnStmt<out Statement/*!*/ s>
 YieldStmt<out Statement/*!*/ s>
 = "yield"
        (.
-         IToken yieldTok = t;
+         Token yieldTok = t;
          List<AssignmentRhs> rhss = null;
          AssignmentRhs r;
        .)
@@ -2981,19 +2309,20 @@ YieldStmt<out Statement/*!*/ s>
     { "," Rhs<out r>                 (. rhss.Add(r); .)
     }
   ]
-  ";"                                (. s = new YieldStmt(new RangeToken(yieldTok, t), rhss);
+  ";"                                (. s = new YieldStmt(new SourceOrigin(yieldTok, t), rhss);
                                      .)
   .
 
 /*------------------------------------------------------------------------*/
-UpdateStmt<out Statement/*!*/ s>
+AssignStatement<out Statement/*!*/ s>
 = (. List<Expression> lhss = new List<Expression>();
      List<AssignmentRhs> rhss = new List<AssignmentRhs>();
      Expression e;
      AssignmentRhs r;
-     IToken x = Token.NoToken;
-     IToken endTok = Token.NoToken;
-     IToken startToken = Token.NoToken;
+     BlockStmt proof = null;
+     Token operatorToken = Token.NoToken;
+     Token endTok = Token.NoToken;
+     Token startToken = Token.NoToken;
      Attributes attrs = null;
      Attributes tokenAttrs = null;
      AttributedToken suchThatAssume = null;
@@ -3001,24 +2330,24 @@ UpdateStmt<out Statement/*!*/ s>
      AttributedToken keywordToken = null;
      Expression exceptionExpr = null;
      ExprRhs exceptionRhs = null;
-     IToken endToken = Token.NoToken;
+     Token endToken = Token.NoToken;
   .)
-( Lhs<out e>                       (. x = e.tok; startToken = e.StartToken; endToken = t; .)
+( Lhs<out e>                       (. operatorToken = e.Center; startToken = e.StartToken; endToken = t; .)
   ( 
                                    (. lhss.Add(e); .)
     { "," Lhs<out e>               (. lhss.Add(e); .)
     }
-    ( ":="                         (. x = t; .)
+    ( ":="                         (. operatorToken = t; .)
       Rhs<out r>                   (. rhss.Add(r); .)
       { "," Rhs<out r>             (. rhss.Add(r); .)
       }
-    | ":|"                         (. x = t; .)
+    | ":|"                         (. operatorToken = t; .)
       [ IF(la.kind == _assume)     /* an Expression can also begin with an "assume", so this says to resolve it to pick up any "assume" here */
         "assume"                      (. var tok = t; .)
         { Attribute<ref tokenAttrs> } (. suchThatAssume = new AttributedToken(tok, tokenAttrs); .)
       ]
       Expression<out suchThat, false, true>
-    | ":-"                         (. x = t; .)
+    | ":-"                         (. operatorToken = t; .)
       [ IF(IsAssumeTypeKeyword(la))   /* an Expression can also begin with these keywords, so this says to resolve it to pick up the keyword here */
         ("expect"|"assert"|"assume")  (. var tok = t; .)
         { Attribute<ref tokenAttrs> } (. keywordToken = new AttributedToken(tok, tokenAttrs); .)
@@ -3028,16 +2357,22 @@ UpdateStmt<out Statement/*!*/ s>
       { "," Rhs<out r>             (. rhss.Add(r); .)
       }
     )
-    ";"                            (. endTok = t; .)
-  | ":"                            (. SemErr(ErrorId.p_invalid_colon, new RangeToken(startToken, t), "invalid statement beginning here (is a 'label' keyword missing? or a 'const' or 'var' keyword?)"); .)
+    (
+      "by" BlockStmt<out proof, out _, out _>
+    | ";"
+    )
+  | ":"                            (. SemErr(ErrorId.p_invalid_colon, new SourceOrigin(startToken, t), "invalid statement beginning here (is a 'label' keyword missing? or a 'const' or 'var' keyword?)"); .)
   | { Attribute<ref attrs> }       (. endToken = t; .)
-    ";"                            (. endTok = t; rhss.Add(new ExprRhs(e, attrs) { RangeToken = new RangeToken(e.StartToken, endToken) }); .)   
+    (
+      "by" BlockStmt<out proof, out _, out _>
+    | ";"
+    )                              (. endTok = t; var rhs = new ExprRhs(e, attrs); rhs.SetOrigin(new SourceOrigin(e.StartToken, endToken)); rhss.Add(rhs); .)
   | { Attribute<ref attrs> }       (. endToken = t; .)
-                                   (. endTok = t; rhss.Add(new ExprRhs(e, attrs) { RangeToken = new RangeToken(e.StartToken, endToken) });
-                                      SemErr(ErrorId.p_missing_semicolon, new RangeToken(startToken, t), "missing semicolon at end of statement");
+                                   (. endTok = t; var rhs2 = new ExprRhs(e, attrs); rhs2.SetOrigin(new SourceOrigin(e.StartToken, endToken)); rhss.Add(rhs2);
+                                      SemErr(ErrorId.p_missing_semicolon, new SourceOrigin(startToken, t), "missing semicolon at end of statement");
                                    .)   
   )
-| ":-"                             (. x = t; startToken = t; .)
+| ":-"                             (. operatorToken = t; startToken = t; .)
    [ IF(IsAssumeTypeKeyword(la))      /* an Expression can also begin with these keywords, so this says to resolve it to pick up the keyword here */
       ("expect"|"assert"|"assume")    (. var tok = t; .)
       { Attribute<ref tokenAttrs> }   (. keywordToken = new AttributedToken(tok, tokenAttrs); .)
@@ -3046,9 +2381,12 @@ UpdateStmt<out Statement/*!*/ s>
    { Attribute<ref attrs> }        (. exceptionRhs = new ExprRhs(exceptionExpr, attrs); .)
    { "," Rhs<out r>                (. rhss.Add(r); .)
    }
-   ";"                             (. endTok = t; .)
+   (
+     "by" BlockStmt<out proof, out _, out _>
+   | ";"                           (. endTok = t; .)
+   )                           
 )
-  (. var rangeToken = new RangeToken(startToken, t);
+  (. var rangeToken = new SourceOrigin(startToken, t, operatorToken);
      if (suchThat != null) {
        s = new AssignSuchThatStmt(rangeToken, lhss, suchThat, suchThatAssume, null);
      } else if (exceptionRhs != null) {
@@ -3057,16 +2395,19 @@ UpdateStmt<out Statement/*!*/ s>
        if (lhss.Count == 0 && rhss.Count == 0) {
          s = new BlockStmt(rangeToken, new List<Statement>()); // error, give empty statement
        } else {
-         s = new UpdateStmt(rangeToken, lhss, rhss);
+         s = new AssignStatement(rangeToken, lhss, rhss);
        }
      }
+     if (proof != null) {
+       s = new BlockByProofStmt(rangeToken, proof, s);
+     }
   .)
   .
 
 /*------------------------------------------------------------------------*/
 Rhs<out AssignmentRhs r>
 = (. Contract.Ensures(Contract.ValueAtReturn<AssignmentRhs>(out r) != null);
-     IToken/*!*/ x, newToken;  Expression/*!*/ e;
+     Token/*!*/ x, newToken;  Expression/*!*/ e;
      Type ty = new InferredTypeProxy();
      List<Expression> ee = null;
      List<ActualBinding> args = null;
@@ -3074,7 +2415,7 @@ Rhs<out AssignmentRhs r>
      List<Expression> display = null;
      r = dummyRhs;  // to please compiler
      Attributes attrs = null;
-     IToken startToken = null;
+     Token startToken = null;
   .)
   ( IF(la.val == "new")
     "new"                              (. newToken = t; startToken = t; .)
@@ -3103,7 +2444,7 @@ Rhs<out AssignmentRhs r>
   | Expression<out e, false, true>     (. r = new ExprRhs(e); startToken = e.StartToken; .)
   )
   { Attribute<ref attrs> }             (. r.Attributes = attrs;
-                                          r.RangeToken = new RangeToken(startToken ?? t, t); .)
+                                          r.SetOrigin(new SourceOrigin(startToken ?? t, t, r.Center)); .)
   .
 
 /*------------------------------------------------------------------------*/
@@ -3111,14 +2452,14 @@ NewArray<. out List<Expression> ee, out Expression arrayElementInit, out List<Ex
 = (. ee = new List<Expression>();
      arrayElementInit = null;
      display = null;
-     IToken x;
+     Token x;
   .)
   "["                                (. x = t; .)
   ( "]"                              /* no size is given; this is allowed as long as an initialization display is given */
     "["                              (. display = new List<Expression>(); .)
     [ Expressions<display> ]
     "]"                              (. // we fill in the size
-                                        ee.Add(new LiteralExpr(new AutoGeneratedToken(x), display.Count));
+                                        ee.Add(new LiteralExpr(new AutoGeneratedOrigin(x), display.Count));
                                      .)
   | Expressions<ee>
     "]"                              (. // make sure an array class with this dimensionality exists
@@ -3138,14 +2479,14 @@ NewArray<. out List<Expression> ee, out Expression arrayElementInit, out List<Ex
   )
   (. if (ee.Count == 0) {
        // an error occurred while parsing, but we still want to make sure to return a nonempty "ee"
-       ee.Add(new LiteralExpr(new AutoGeneratedToken(x), 0));
+       ee.Add(new LiteralExpr(new AutoGeneratedOrigin(x), 0));
      }
   .)
   .
 
 /*------------------------------------------------------------------------*/
 VarDeclStatement<.out Statement/*!*/ s.>
-= (. IToken x = null, assignTok = null;  bool isGhost = false;
+= (. Token x = null, assignTok = null;  bool isGhost = false;
      LocalVariable d;
      AssignmentRhs r;
      List<LocalVariable> lhss = new List<LocalVariable>();
@@ -3157,8 +2498,9 @@ VarDeclStatement<.out Statement/*!*/ s.>
      ExprRhs exceptionRhs = null;
      Attributes attrs = null;
      Attributes tokenAttrs = null;
-     IToken endTok;
-     IToken startToken = null;
+     BlockStmt proof = null;
+     Token endTok;
+     Token startToken = null;
      s = dummyStmt;
   .)
   [ "ghost"                                 (. isGhost = true;  x = t; startToken = t; .)
@@ -3193,61 +2535,69 @@ VarDeclStatement<.out Statement/*!*/ s.>
       { "," Rhs<out r>               (. rhss.Add(r); .)
       }
     ]
-    SYNC ";"                         (. endTok = t; .)
-    (. ConcreteUpdateStatement update;
+    SYNC ( "by"
+      BlockStmt<out proof, out _, out _>
+    | ";"                            (. endTok = t; .)
+    )
+    (. ConcreteAssignStatement assignment;
        var lhsExprs = new List<Expression>();
        if (isGhost || (rhss.Count == 0 && exceptionRhs == null && suchThat == null)) { // explicitly ghost or no init
          foreach (var lhs in lhss) {
-           lhsExprs.Add(new IdentifierExpr(lhs.Tok, lhs.Name) { RangeToken = new RangeToken(lhs.Tok, lhs.Tok) } );
+           lhsExprs.Add(new IdentifierExpr(lhs.Center, lhs.Name));
          }
        } else { // not explicitly ghost, but with init - so auto-ghost
          foreach (var lhs in lhss) {
-           lhsExprs.Add(new AutoGhostIdentifierExpr(lhs.Tok, lhs.Name) { RangeToken = new RangeToken(lhs.Tok, lhs.Tok) } );
+           lhsExprs.Add(new AutoGhostIdentifierExpr(lhs.Center, lhs.Name) );
          }
        }
-       var rangeToken = new RangeToken(startToken, t);
-       var updateRangeToken = new RangeToken(assignTok, t);
+       var rangeToken = new SourceOrigin(startToken, t);
        if (suchThat != null) {
-         update = new AssignSuchThatStmt(updateRangeToken, lhsExprs, suchThat, suchThatAssume, attrs);
+         var updateOrigin = new SourceOrigin(assignTok, t);
+         assignment = new AssignSuchThatStmt(updateOrigin, lhsExprs, suchThat, suchThatAssume, attrs);
        } else if (exceptionRhs != null) {
-         update = new AssignOrReturnStmt(updateRangeToken, lhsExprs, exceptionRhs, keywordToken, rhss);
+         var updateOrigin = new SourceOrigin(assignTok, t);
+         assignment = new AssignOrReturnStmt(updateOrigin, lhsExprs, exceptionRhs, keywordToken, rhss);
        } else if (rhss.Count == 0) {
-         update = null;
+         assignment = null;
        } else {
-         update = new UpdateStmt(updateRangeToken, lhsExprs, rhss);
+         var updateOrigin = new SourceOrigin(assignTok, t);
+         assignment = new AssignStatement(updateOrigin, lhsExprs, rhss);
+       }
+       s = new VarDeclStmt(rangeToken, lhss, assignment);
+       if (proof != null) {
+         s = new BlockByProofStmt(s.Origin, proof, s);
        }
-       s = new VarDeclStmt(rangeToken, lhss, update);
     .)
   | (. CasePattern<LocalVariable> pat;
        Expression e = dummyExpr;
-       IToken id = t;
+       Token id = t;
     .)
     CasePatternLocal<out pat, isGhost>
     ( ":="
     | { Attribute<ref attrs> }
-      ":|"                          (.  SemErr(ErrorId.p_no_patterns_and_such_that, pat.tok, "LHS of assign-such-that expression must be variables, not general patterns"); .)
+      ":|"                          (.  SemErr(ErrorId.p_no_patterns_and_such_that, pat.Origin, "LHS of assign-such-that expression must be variables, not general patterns"); .)
     )
     Expression<out e, false, true>
 
     ";"
-    (. s = new VarDeclPattern(e.RangeToken, pat, e, isGhost);
-       s.RangeToken = new RangeToken(pat.StartToken, t); .)
+    (. s = new VarDeclPattern(e.Origin, pat, e, isGhost);
+       s.SetOrigin(new SourceOrigin(pat.StartToken, t)); .)
   )
   .
 
 /*------------------------------------------------------------------------*/
 IfStmt<out Statement/*!*/ ifStmt>
-= (. Contract.Ensures(Contract.ValueAtReturn(out ifStmt) != null); IToken/*!*/ x;
-     Expression guard = null;  IToken guardEllipsis = null;  bool isBindingGuard = false;
+= (. Contract.Ensures(Contract.ValueAtReturn(out ifStmt) != null); Token/*!*/ x;
+     Expression guard = null;  Token guardEllipsis = null;  bool isBindingGuard = false;
      BlockStmt/*!*/ thn;
      BlockStmt/*!*/ bs;
      Statement/*!*/ s;
      Statement els = null;
      Attributes attrs = null;
      Attributes elsattrs = null;
-     IToken bodyStart, bodyEnd;
-     IToken endTok;
-     IToken startToken;
+     Token bodyStart, bodyEnd;
+     Token endTok;
+     Token startToken;
      List<GuardedAlternative> alternatives;
      ifStmt = dummyIfStmt;  // to please the compiler
      bool usesOptionalBraces;
@@ -3257,7 +2607,7 @@ IfStmt<out Statement/*!*/ ifStmt>
   (
     IF(IsAlternative())
     AlternativeBlock<true, out alternatives, out usesOptionalBraces, out endTok>
-    (. ifStmt = new AlternativeStmt(new RangeToken(startToken, t), alternatives, usesOptionalBraces, attrs);
+    (. ifStmt = new AlternativeStmt(new SourceOrigin(startToken, t), alternatives, usesOptionalBraces, attrs);
     .)
   |
     ( IF(IsBindingGuard())
@@ -3277,7 +2627,7 @@ IfStmt<out Statement/*!*/ ifStmt>
        if (els != null && !(els is IfStmt)) {
         els.Attributes = elsattrs;
        }
-       var rangeToken = new RangeToken(startToken, t);
+       var rangeToken = new SourceOrigin(startToken, t);
        if (guardEllipsis != null) {
          ifStmt = new IfStmt(rangeToken, isBindingGuard, guard, thn, els);
          ifStmt = new SkeletonStatement(ifStmt, guardEllipsis, null);
@@ -3289,7 +2639,7 @@ IfStmt<out Statement/*!*/ ifStmt>
   .
 
 /*------------------------------------------------------------------------*/
-AlternativeBlock<.bool allowBindingGuards, out List<GuardedAlternative> alternatives, out bool usesOptionalBraces, out IToken endTok.>
+AlternativeBlock<.bool allowBindingGuards, out List<GuardedAlternative> alternatives, out bool usesOptionalBraces, out Token endTok.>
 = (. alternatives = new List<GuardedAlternative>();
      endTok = null;
      usesOptionalBraces = false;
@@ -3314,7 +2664,7 @@ AlternativeBlock<.bool allowBindingGuards, out List<GuardedAlternative> alternat
 
 /*------------------------------------------------------------------------*/
 AlternativeBlockCase<.bool allowBindingGuards, out GuardedAlternative alt.>
-= (. IToken x;
+= (. Token x;
      Expression e; bool isBindingGuard;
      List<Statement> body;
      Attributes attrs = null;
@@ -3340,18 +2690,18 @@ AlternativeBlockCase<.bool allowBindingGuards, out GuardedAlternative alt.>
 
 /*------------------------------------------------------------------------*/
 WhileStmt<out Statement stmt>
-= (. Contract.Ensures(Contract.ValueAtReturn(out stmt) != null); IToken x;
-     Expression guard = null;  IToken guardEllipsis = null;
+= (. Contract.Ensures(Contract.ValueAtReturn(out stmt) != null); Token x;
+     Expression guard = null;  Token guardEllipsis = null;
      Attributes attrs = null;
      List<AttributedExpression> invariants = new List<AttributedExpression>();
      List<Expression> decreases = new List<Expression>();
-     IToken startToken = null;
+     Token startToken = null;
      Attributes decAttrs = null;
      Attributes modAttrs = null;
      List<FrameExpression> mod = null;
-     BlockStmt body = null;  IToken bodyEllipsis = null;
-     IToken bodyStart = null, bodyEnd = null;
-     IToken endTok;
+     BlockStmt body = null;  Token bodyEllipsis = null;
+     Token bodyStart = null, bodyEnd = null;
+     Token endTok;
      List<GuardedAlternative> alternatives;
      stmt = dummyStmt;  // to please the compiler
      bool isDirtyLoop = true;
@@ -3363,7 +2713,7 @@ WhileStmt<out Statement stmt>
     IF(IsLoopSpec() || IsAlternative())
     LoopSpec<invariants, decreases, ref mod, ref decAttrs, ref modAttrs>
     AlternativeBlock<false, out alternatives, out usesOptionalBraces, out endTok>
-    (. stmt = new AlternativeLoopStmt(new RangeToken(startToken, t), invariants, new Specification<Expression>(decreases, decAttrs), new Specification<FrameExpression>(mod, modAttrs), alternatives, usesOptionalBraces, attrs);
+    (. stmt = new AlternativeLoopStmt(new SourceOrigin(startToken, t), invariants, new Specification<Expression>(decreases, decAttrs), new Specification<FrameExpression>(mod, modAttrs), alternatives, usesOptionalBraces, attrs);
        .)
   |
     ( Guard<out guard>           (. Contract.Assume(guard == null || cce.Owner.None(guard)); .)
@@ -3381,10 +2731,10 @@ WhileStmt<out Statement stmt>
     | /* go body-less */
     )
     (.
-      var rangeToken = new RangeToken(startToken, t);
+      var rangeToken = new SourceOrigin(startToken, t);
       if (guardEllipsis != null || bodyEllipsis != null) {
         if (mod != null) {
-          SemErr(ErrorId.p_no_modifies_on_refining_loops, mod[0].E.tok, "'modifies' clauses are not allowed on refining loops");
+          SemErr(ErrorId.p_no_modifies_on_refining_loops, mod[0].E.Origin, "'modifies' clauses are not allowed on refining loops");
         }
         if (body == null && !isDirtyLoop) {
           body = new BlockStmt(rangeToken, new List<Statement>());
@@ -3404,7 +2754,7 @@ WhileStmt<out Statement stmt>
 
 ForLoopStmt<out Statement stmt>
 = (. Contract.Ensures(Contract.ValueAtReturn(out stmt) != null);
-     IToken x;
+     Token x;
      BoundVar loopIndex;
      Expression start;
      Expression end = null;
@@ -3414,13 +2764,13 @@ ForLoopStmt<out Statement stmt>
 
      List<AttributedExpression> invariants = new List<AttributedExpression>();
      List<Expression> decreases = new List<Expression>();
-     IToken startToken = null;
+     Token startToken = null;
      Attributes decAttrs = null;
      Attributes modAttrs = null;
      List<FrameExpression> mod = null;
 
      BlockStmt body = null;
-     IToken bodyStart = null, bodyEnd = null;
+     Token bodyStart = null, bodyEnd = null;
      stmt = dummyStmt;  // to please the compiler
      bool isDirtyLoop = true;
   .)
@@ -3439,7 +2789,7 @@ ForLoopStmt<out Statement stmt>
   | /* go body-less */
   )
   (.
-    var rangeToken = new RangeToken(startToken, t);
+    var rangeToken = new SourceOrigin(startToken, t);
     // The following statement protects against crashes in case of parsing errors
     if (body == null && !isDirtyLoop) {
       body = new BlockStmt(rangeToken, new List<Statement>());
@@ -3478,7 +2828,7 @@ DecreasesList<.List<Expression> decreases, bool allowWildcard, bool allowLambda.
   { "," PossiblyWildExpression<out e, allowLambda, allowWildcard> (. decreases.Add(e); .)
   }
   (. if (allowWildcard && decreases.Count > 1 && decreases.Exists(e => e is WildcardExpr)) {
-       SemErr(ErrorId.p_no_decreases_expressions_with_star, e.tok, "A 'decreases' clause that contains '*' is not allowed to contain any other expressions");
+       SemErr(ErrorId.p_no_decreases_expressions_with_star, e.Origin, "A 'decreases' clause that contains '*' is not allowed to contain any other expressions");
      }
   .)
   .
@@ -3495,24 +2845,25 @@ Guard<out Expression e>   /* null represents demonic-choice */
 /*------------------------------------------------------------------------*/
 BindingGuard<out Expression e, bool allowLambda>
 = (. var bvars = new List<BoundVar>();
-     BoundVar bv;  IToken x;
+     BoundVar bv;  
+     Token x;
      Attributes attrs = null;
      Expression body;
   .)
-  IdentTypeOptional<out bv>                    (. bvars.Add(bv); x = bv.tok; .)
+  IdentTypeOptional<out bv>                    (. bvars.Add(bv); x = bv.StartToken; .)
   { ","
     IdentTypeOptional<out bv>                  (. bvars.Add(bv); .)
   }
   { Attribute<ref attrs> }
   ":|"
   Expression<out body, true, allowLambda>
-  (. e = new ExistsExpr(x, new RangeToken(x, t), bvars, null, body, attrs); .)
+  (. e = new ExistsExpr(new SourceOrigin(x, t), bvars, null, body, attrs); .)
   .
 
 
 /*------------------------------------------------------------------------*/
 SingleExtendedPattern<.out ExtendedPattern pat.>
-= (. IToken id; List<ExtendedPattern> arguments;
+= (. Token id; List<ExtendedPattern> arguments;
     Expression lit; BoundVar bv;
     pat = null;
   .)
@@ -3536,8 +2887,8 @@ SingleExtendedPattern<.out ExtendedPattern pat.>
       ]
      ")"
                                            (. pat = new IdPattern(id, id.val, arguments, false, true); .)
-  | PossiblyNegatedLiteralExpr<out lit>    (. pat = new LitPattern(lit.tok, lit); .)
-  | IdentTypeOptional<out bv>              (. pat = new IdPattern(bv.tok, bv.Name, bv.SyntacticType, null); .)
+  | PossiblyNegatedLiteralExpr<out lit>    (. pat = new LitPattern(lit.Origin, lit); .)
+  | IdentTypeOptional<out bv>              (. pat = new IdPattern(bv.Origin, bv.Name, bv.SyntacticType, null); .)
   )
   (. // In case of parsing errors, make sure 'pat' still returns as non-null
     if (pat == null) {
@@ -3554,16 +2905,16 @@ ExtendedPattern<.out ExtendedPattern pat.>
   { "|"                                    (. branches ??= new() { branch }; .)
     SingleExtendedPattern<out branch>      (. branches.Add(branch); .)
   }
-  (. pat = branches == null ? branch : new DisjunctivePattern(branches[0].Tok, branches); .)
+  (. pat = branches == null ? branch : new DisjunctivePattern(branches[0].Origin, branches); .)
   .
 
 /*------------------------------------------------------------------------*/
 MatchStmt<out Statement/*!*/ s>
 = (. Contract.Ensures(Contract.ValueAtReturn(out s) != null);
-     IToken x; Expression/*!*/ e; NestedMatchCaseStmt/*!*/ c;
+     Token x; Expression/*!*/ e; NestedMatchCaseStmt/*!*/ c;
      List<NestedMatchCaseStmt/*!*/> cases = new List<NestedMatchCaseStmt/*!*/>();
      bool usesOptionalBraces = false;
-     IToken startToken = null;
+     Token startToken = null;
      Attributes attrs = null;
   .)
   "match"                     (. x = t; startToken = t; .)
@@ -3577,14 +2928,14 @@ MatchStmt<out Statement/*!*/ s>
           CaseStmt<out c> (. cases.Add(c); .)
         }
   )
-  (. s = new NestedMatchStmt(new RangeToken(startToken, t), e, cases, usesOptionalBraces, attrs);
+  (. s = new NestedMatchStmt(new SourceOrigin(startToken, t), e, cases, usesOptionalBraces, attrs);
   .)
   .
 
 /*------------------------------------------------------------------------*/
 CaseStmt<out NestedMatchCaseStmt/*!*/ c>
 = (. Contract.Ensures(Contract.ValueAtReturn(out c) != null);
-     IToken/*!*/ x;
+     Token/*!*/ x;
      ExtendedPattern/*!*/ pat = null;
      var body = new List<Statement/*!*/>();
      Attributes attrs = null;
@@ -3606,13 +2957,13 @@ CaseStmt<out NestedMatchCaseStmt/*!*/ c>
 
 /*------------------------------------------------------------------------*/
 AssertStmt<out Statement/*!*/ s>
-= (. Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x;
+= (. Contract.Ensures(Contract.ValueAtReturn(out s) != null); Token/*!*/ x;
      Expression e = dummyExpr; Attributes attrs = null;
-     IToken dotdotdot = null;
+     Token dotdotdot = null;
      BlockStmt proof = null;
-     IToken startToken = null;
-     IToken proofStart, proofEnd;
-     IToken lbl = null;
+     Token startToken = null;
+     Token proofStart, proofEnd;
+     Token lbl = null;
   .)
   "assert"                                     (. x = t; startToken = t; .)
   { Attribute<ref attrs> }
@@ -3633,20 +2984,23 @@ AssertStmt<out Statement/*!*/ s>
     ";"
   )
   (. if (dotdotdot != null) {
-       s = new AssertStmt(new RangeToken(startToken, t), new LiteralExpr(x, true), null, null, attrs);
+       s = new AssertStmt(new SourceOrigin(startToken, t), new LiteralExpr(x, true), null, attrs);
        s = new SkeletonStatement(s, dotdotdot, null);
      } else {
-       s = new AssertStmt(new RangeToken(startToken, t), e, proof, lbl == null ? null : new AssertLabel(lbl, lbl.val), attrs);
+       s = new AssertStmt(new SourceOrigin(startToken, t), e, lbl == null ? null : new AssertLabel(lbl, lbl.val), attrs);
+       if (proof != null) {
+         s = new BlockByProofStmt(s.Origin, proof, s);
+       }
      }
   .)
   .
 
 /*------------------------------------------------------------------------*/
 ExpectStmt<out Statement/*!*/ s>
-= (. Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x;
+= (. Contract.Ensures(Contract.ValueAtReturn(out s) != null); Token/*!*/ x;
      Expression e = dummyExpr; Expression m = null; Attributes attrs = null;
-     IToken dotdotdot = null;
-     IToken startToken = null;
+     Token dotdotdot = null;
+     Token startToken = null;
   .)
   "expect"                                     (. x = t; startToken = t; .)
   { Attribute<ref attrs> }
@@ -3658,34 +3012,34 @@ ExpectStmt<out Statement/*!*/ s>
   [ "," Expression<out m, false, true> ]
   ";"
   (. if (dotdotdot != null) {
-       s = new ExpectStmt(new RangeToken(startToken, t), new LiteralExpr(x, true), m, attrs);
+       s = new ExpectStmt(new SourceOrigin(startToken, t), new LiteralExpr(x, true), m, attrs);
        s = new SkeletonStatement(s, dotdotdot, null);
      } else {
-       s = new ExpectStmt(new RangeToken(startToken, t), e, m, attrs);
+       s = new ExpectStmt(new SourceOrigin(startToken, t, startToken), e, m, attrs);
      }
   .)
   .
 
 /*------------------------------------------------------------------------*/
 AssumeStmt<out Statement/*!*/ s>
-= (. Contract.Ensures(Contract.ValueAtReturn(out s) != null); IToken/*!*/ x;
+= (. Contract.Ensures(Contract.ValueAtReturn(out s) != null); Token/*!*/ x;
      Expression e = dummyExpr; Attributes attrs = null;
-     IToken dotdotdot = null;
-     IToken startToken = null;
+     Token dotdotdot = null;
+     Token startToken = null;
   .)
   "assume"                                     (. x = t; startToken = t; .)
   { Attribute<ref attrs> }
-  ( Expression<out e, false, true>
+  ( Expression<out e, false, false>
   | ellipsis                                   (. dotdotdot = t; 
                                                   errors.Deprecated(ErrorId.p_deprecated_statement_refinement, t, "the ... refinement feature in statements is deprecated");
                                                 .)
   )
   ";"
   (. if (dotdotdot != null) {
-       s = new AssumeStmt(new RangeToken(startToken, t), new LiteralExpr(x, true), attrs);
+       s = new AssumeStmt(new SourceOrigin(startToken, t), new LiteralExpr(x, true), attrs);
        s = new SkeletonStatement(s, dotdotdot, null);
      } else {
-       s = new AssumeStmt(new RangeToken(startToken, t), e, attrs);
+       s = new AssumeStmt(new SourceOrigin(startToken, t), e, attrs);
      }
   .)
   .
@@ -3693,82 +3047,95 @@ AssumeStmt<out Statement/*!*/ s>
 /*------------------------------------------------------------------------*/
 PrintStmt<out Statement s>
 = (. Contract.Ensures(Contract.ValueAtReturn(out s) != null);
-     IToken x;  Expression e;
+     Token x;  Expression e;
      var args = new List<Expression>();
-     IToken startToken = null;
+     Token startToken = null;
   .)
   "print"                                      (. x = t; startToken = t; .)
   Expression<out e, false, true>               (. args.Add(e); .)
   { "," Expression<out e, false, true>         (. args.Add(e); .)
   }
   ";"                                          (.
-    s = new PrintStmt(new RangeToken(startToken, t), args);
+    s = new PrintStmt(new SourceOrigin(startToken, t), args);
     .)
   .
 
 /*------------------------------------------------------------------------*/
 RevealStmt<out Statement s>
 = (. Contract.Ensures(Contract.ValueAtReturn(out s) != null);
-     IToken x; Expression e; var es = new List<Expression>();
-     IToken startToken = null;
+     Token x; Expression e; var es = new List<Expression>();
+     Token startToken = null;
+     HideRevealCmd.Modes mode = HideRevealCmd.Modes.Reveal;
+     s = null;
   .)
-  "reveal"                                      (. x = t; startToken = t; .)
-  Expression<out e, false, true>                (. es.Add(e); .)
-  { "," Expression<out e, false, true>          (. es.Add(e); .)
-  }
-  ";"                                           (.
-    s = new RevealStmt(new RangeToken(startToken, t), es);
-    .)
+  ( "reveal"                                    (. x = t; startToken = t; mode = HideRevealCmd.Modes.Reveal; .)
+  | "hide"                                      (. x = t; startToken = t; mode = HideRevealCmd.Modes.Hide; .)
+  )
+  ( Expression<out e, false, true>                (. es.Add(e); .)
+    { "," Expression<out e, false, true>          (. es.Add(e); .)
+    }                                           (. s = new HideRevealStmt(new SourceOrigin(startToken, t), es, mode); .)
+  | "*"                                         (. s = new HideRevealStmt(new SourceOrigin(startToken, t), mode); .)
+  )
+  ";"                                           
   .
 
 /*------------------------------------------------------------------------*/
-ForallStmt<out Statement/*!*/ s>
+ForallStmt<out Statement s>
 = (. Contract.Ensures(Contract.ValueAtReturn(out s) != null);
-     IToken/*!*/ x = Token.NoToken;
      List<BoundVar> bvars = null;
      Attributes qattrs = null;
      Expression range = null;
-     var ens = new List<AttributedExpression/*!*/>();
-     IToken startToken = null;
-     BlockStmt block = null;
-     IToken bodyStart, bodyEnd;
-     IToken tok = Token.NoToken;
+     Token startToken = null;
   .)
-  "forall"                                  (. x = t; tok = x; startToken = t; .)
+  "forall"                                  (. startToken = t; .)
 
   ( IF(la.kind == _openparen)  /* disambiguation needed, because of the possibility of a body-less forall statement */
-    "(" [ QuantifierDomain<out bvars, out qattrs, out range, true, true, true> ] ")"
-  |     [ IF(IsIdentifier(la.kind))  /* disambiguation needed, because of the possibility of a body-less forall statement */
-          QuantifierDomain<out bvars, out qattrs, out range, true, true, true>
-        ]
+    "("   (. errors.Deprecated(ErrorId.p_deprecated_forall_statement_with_parentheses_around_bound_variables, t,
+               "parentheses around the forall-statement bound variables are deprecated and not needed");
+          .)
+    [ QuantifierDomain<out bvars, out qattrs, out range, true, true, true> ]
+    ")"
+  | [ IF(IsIdentifier(la.kind))  /* disambiguation needed, because of the possibility of a body-less forall statement */
+      QuantifierDomain<out bvars, out qattrs, out range, true, true, true>
+    ]
   )
-  (. if (bvars == null) errors.Deprecated(ErrorId.p_deprecated_forall_with_no_bound_variables, startToken, "a forall statement with no bound variables is deprecated; use an 'assert by' statement instead");
-     if (bvars == null) { bvars = new List<BoundVar>(); }
-     if (range == null) { range = new LiteralExpr(x, true); }
+  (. if (bvars == null) {
+       errors.Deprecated(ErrorId.p_deprecated_forall_with_no_bound_variables, startToken,
+       "a forall statement with no bound variables is deprecated; use an 'assert by' statement instead");
+     }
+     bvars ??= new List<BoundVar>();
   .)
 
+  ForallStatementEnsuresAndBody<out s, startToken, bvars, qattrs, range>
+  .
+
+ForallStatementEnsuresAndBody<.out Statement s, Token startToken, List<BoundVar> bvars, Attributes qattrs, Expression/*?*/ range.>
+= (. var ens = new List<AttributedExpression/*!*/>();
+     BlockStmt block = null;
+     range ??= new LiteralExpr(startToken, true);
+  .)
   {
     EnsuresClause<ens, true>
   }
   [ IF(la.kind == _lbrace)  /* if the input continues like a block statement, take it to be the body of the forall statement; a body-less forall statement must continue in some other way */
-    BlockStmt<out block, out bodyStart, out bodyEnd>
+    BlockStmt<out block, out _, out _>
   ]
   (. if (theOptions.DisallowSoundnessCheating && block == null && 0 < ens.Count) {
         SemErr(ErrorId.p_forall_with_ensures_must_have_body, t, "a forall statement with an ensures clause must have a body");
      }
 
-     s = new ForallStmt(new RangeToken(startToken, t), bvars, qattrs, range, ens, block);
+     s = new ForallStmt(new SourceOrigin(startToken, t), bvars, qattrs, range, ens, block);
   .)
   .
 
 /*------------------------------------------------------------------------*/
 ModifyStmt<out Statement s>
-= (. IToken tok;  IToken endTok = Token.NoToken;
+= (. Token tok;  Token endTok = Token.NoToken;
      Attributes attrs = null;
      FrameExpression fe;  var mod = new List<FrameExpression>();
-     BlockStmt body = null;  IToken bodyStart;
-     IToken ellipsisToken = null;
-     IToken startToken = null;
+     BlockStmt body = null;  Token bodyStart;
+     Token ellipsisToken = null;
+     Token startToken = null;
   .)
   "modify"           (. tok = t; startToken = t; .)
   { Attribute<ref attrs> }
@@ -3788,7 +3155,7 @@ ModifyStmt<out Statement s>
                                          .)
   | SYNC ";"         (. endTok = t; .)
   )
-  (. s = new ModifyStmt(new RangeToken(startToken, t), mod, attrs, body);
+  (. s = new ModifyStmt(new SourceOrigin(startToken, t), mod, attrs, body);
      if (ellipsisToken != null) {
        s = new SkeletonStatement(s, ellipsisToken, null);
      }
@@ -3798,17 +3165,17 @@ ModifyStmt<out Statement s>
 /*------------------------------------------------------------------------*/
 CalcStmt<out Statement s>
 = (. Contract.Ensures(Contract.ValueAtReturn(out s) != null);
-     IToken x;
+     Token x;
      Attributes attrs = null;
      CalcStmt.CalcOp op, userSuppliedOp = null, resOp = Microsoft.Dafny.CalcStmt.DefaultOp;
      var lines = new List<Expression>();
      var hints = new List<BlockStmt>();
      CalcStmt.CalcOp stepOp;
      var stepOps = new List<CalcStmt.CalcOp>();
-     IToken startToken = null;
+     Token startToken = null;
      Expression e;
-     IToken opTok;
-     IToken danglingOperator = null;
+     Token opTok;
+     Token danglingOperator = null;
   .)
   "calc"                                                  (. x = t; startToken = t; .)
   { Attribute<ref attrs> }
@@ -3835,8 +3202,9 @@ CalcStmt<out Statement s>
 
     /* now for the hint, which we build up as a possibly empty sequence of statements placed into one BlockStmt */
     (. var subhints = new List<Statement>();
-       IToken hintStart = la;  IToken hintEnd = hintStart.Prev;
-       IToken t0, t1;
+       Token hintStart = la;  
+       Token hintEnd = hintStart.Prev;
+       Token t0, t1;
        BlockStmt subBlock; Statement subCalc;
     .)
     { IF(la.kind == _lbrace || la.kind == _calc)  /* Grab as a hint if possible, not a next line in the calculation whose expression begins with an open brace
@@ -3846,7 +3214,7 @@ CalcStmt<out Statement s>
       | CalcStmt<out subCalc>                     (. hintEnd = subCalc.EndToken; subhints.Add(subCalc); .)
       )
     }
-    (. var h = new BlockStmt(new RangeToken(hintStart, hintEnd), subhints); // if the hint is empty, hintStart is the first token of the next line, but it doesn't matter because the block statement is just used as a container
+    (. var h = new BlockStmt(new SourceOrigin(hintStart, hintEnd), subhints); // if the hint is empty, hintStart is the first token of the next line, but it doesn't matter because the block statement is just used as a container
        hints.Add(h);
        if (h.Body.Count != 0) { danglingOperator = null; }
     .)
@@ -3860,12 +3228,12 @@ CalcStmt<out Statement s>
       // Repeat the last line to create a dummy line for the dangling hint
       lines.Add(lines[lines.Count - 1]);
     }
-    s = new CalcStmt(new RangeToken(startToken, t), userSuppliedOp, lines, hints, stepOps, attrs);
+    s = new CalcStmt(new SourceOrigin(startToken, t), userSuppliedOp, lines, hints, stepOps, attrs);
   .)
   .
 
 /*------------------------------------------------------------------------*/
-CalcOp<out IToken x, out CalcStmt.CalcOp/*!*/ op>
+CalcOp<out Token x, out CalcStmt.CalcOp/*!*/ op>
 = (. var binOp = BinaryExpr.Opcode.Eq; // Returns Eq if parsing fails because it is compatible with any other operator
      Expression k = null;
      x = null;
@@ -3924,40 +3292,47 @@ QSep = "::".
  * at the top level of this expression. It is passed in as "false" only inside
  * cardinality brackets, that is, "|expr|".
  */
-Expression<out Expression e, bool allowLemma, bool allowLambda, bool allowBitwiseOps = true>
-= (. Expression e0; IToken semiToken; .)
+Expression<out Expression e, bool allowLemma, bool allowLambda, bool allowBitwiseOps = true, bool allowDecreasesTo = true>
+= (. Expression e0; Token semiToken; .)
   [ "new" (. SemErr(ErrorId.p_no_side_effects_in_expressions, t, "Calls with side-effects such as constructors are not allowed in expressions."); .) ]
   EquivExpression<out e, allowLemma, allowLambda, allowBitwiseOps>
+  [ IF(allowDecreasesTo && IsDecreasesTo())
+    DecreasesTo<out var decreasesToToken, out var allowNoChange>
+    EquivExpression<out e0, allowLemma, allowLambda, allowBitwiseOps>
+    (. e = new DecreasesToExpr(decreasesToToken, new List<Expression>() { e }, new List<Expression>() { e0 }, allowNoChange); .)
+  ]
   [ IF(SemiFollowsCall(allowLemma, e))
     /* here we parse the ";E" that is part of a "LemmaCall;E" expression (other "S;E" expressions are parsed elsewhere) */
     ";"                       (. semiToken = t; .)
     Expression<out e0, allowLemma, allowLambda>
     (. var startToken = e.StartToken;
-       e = new StmtExpr(e0.Tok,
-             new UpdateStmt(e.RangeToken, new List<Expression>(), new List<AssignmentRhs>() { new ExprRhs(e) }),
+       e = new StmtExpr(new SourceOrigin(startToken, e0.EndToken, e0.Center),
+             new AssignStatement(e.Origin, new List<Expression>(), new List<AssignmentRhs>() { new ExprRhs(e) }),
              e0);
-       e.RangeToken = new RangeToken(startToken, e0.EndToken);
     .)
   ]
   .
 
 /*------------------------------------------------------------------------*/
 EquivExpression<out Expression e0, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1; .)
+= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); 
+     Token/*!*/ x;  
+     Expression/*!*/ e1; 
+  .)
   ImpliesExpliesExpression<out e0, allowLemma, allowLambda, allowBitwiseOps>
   { IF(IsEquivOp())  /* read an EquivExpression as far as possible */
     EquivOp                                                   (. x = t; .)
     ImpliesExpliesExpression<out e1, allowLemma, allowLambda, allowBitwiseOps>  (.
       var startToken = e0.StartToken;
-      e0 = new BinaryExpr(x, BinaryExpr.Opcode.Iff, e0, e1);
-      e0.RangeToken = new RangeToken(startToken, t); .)
+      e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), BinaryExpr.Opcode.Iff, e0, e1);
+    .)
   }
   .
 
 /*------------------------------------------------------------------------*/
 ImpliesExpliesExpression<out Expression e0, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
 = (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null);
-     IToken/*!*/ x;
+     Token/*!*/ x;
      Expression/*!*/ e1; .)
   LogicalExpression<out e0, allowLemma, allowLambda, allowBitwiseOps>
   [ IF(IsImpliesOp() || IsExpliesOp())  /* read an ImpliesExpliesExpression as far as possible */
@@ -3966,19 +3341,18 @@ ImpliesExpliesExpression<out Expression e0, bool allowLemma, bool allowLambda, b
      */
     ( ImpliesOp                                               (. x = t; .)
       ImpliesExpression<out e1, allowLemma, allowLambda, allowBitwiseOps>       (. var startToken = e0.StartToken;
-                                                                                   e0 = new BinaryExpr(x, BinaryExpr.Opcode.Imp, e0, e1);
-                                                                                   e0.RangeToken = new RangeToken(startToken, t); .)
+                                                                                   e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), BinaryExpr.Opcode.Imp, e0, e1);
+                                                                                .)
     | ExpliesOp                                               (. x = t; .)
       LogicalExpression<out e1, allowLemma, allowLambda, allowBitwiseOps>       (. // The order of operands is reversed so that it can be turned into implication during resolution
                                                                  var startToken = e0.StartToken;
-                                                                 e0 = new BinaryExpr(x, BinaryExpr.Opcode.Exp, e1, e0);
-                                                                 e0.RangeToken = new RangeToken(startToken, t); .)
+                                                                 e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), BinaryExpr.Opcode.Exp, e1, e0);
+                                                              .)
       { IF(IsExpliesOp())  /* read a reverse implication as far as possible */
         ExpliesOp                                             (. x = t; .)
         LogicalExpression<out e1, allowLemma, allowLambda, allowBitwiseOps>     (. //The order of operands is reversed so that it can be turned into implication during resolution
                                                                  startToken = e0.StartToken;
-                                                                 e0 = new BinaryExpr(x, BinaryExpr.Opcode.Exp, e1, e0);
-                                                                 e0.RangeToken = new RangeToken(startToken, t);
+                                                                 e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), BinaryExpr.Opcode.Exp, e1, e0);
                                                               .)
       }
       [ IF(IsImpliesOp()) ImpliesOp (. SemErr(ErrorId.p_ambiguous_implies, t, "Ambiguous use of ==> and <==. Use parentheses to disambiguate."); .) 
@@ -3990,24 +3364,24 @@ ImpliesExpliesExpression<out Expression e0, bool allowLemma, bool allowLambda, b
 
 /*------------------------------------------------------------------------*/
 ImpliesExpression<out Expression e0, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1; .)
+= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); Token/*!*/ x;  Expression/*!*/ e1; .)
   LogicalExpression<out e0, allowLemma, allowLambda, allowBitwiseOps>
   [ IF(IsImpliesOp() || IsExpliesOp())
     ( ImpliesOp | ExpliesOp (. SemErr(ErrorId.p_ambiguous_implies_2, t, "Ambiguous use of ==> and <==. Use parentheses to disambiguate."); .) )
     (. x = t; .)
     ImpliesExpression<out e1, allowLemma, allowLambda, allowBitwiseOps>       (. var startToken = e0.StartToken;
-                                                                                 e0 = new BinaryExpr(x, BinaryExpr.Opcode.Imp, e0, e1); 
-                                                                                 e0.RangeToken = new RangeToken(startToken, t);.)
+                                                                                 e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), BinaryExpr.Opcode.Imp, e0, e1);
+                                                                              .)
   ]
   .
 
 /*------------------------------------------------------------------------*/
 LogicalExpression<out Expression e0, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x = null;  Expression/*!*/ e1;
+= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); Token/*!*/ x = null;  Expression/*!*/ e1;
      Expression first;
-     IToken startToken = null;
-     IToken/*!*/ firstOp = null;
-     IToken/*!*/ prefixOp = null;
+     Token startToken = null;
+     Token/*!*/ firstOp = null;
+     Token/*!*/ prefixOp = null;
      e0 = dummyExpr; /* mute the warning */
   .)
     // This extra AndOp will belong to the first binary expression
@@ -4021,20 +3395,18 @@ LogicalExpression<out Expression e0, bool allowLemma, bool allowLambda, bool all
                      .)
     RelationalExpression<out e1, allowLemma, allowLambda, allowBitwiseOps>
          (. startToken = e0.StartToken;
-            e0 = new BinaryExpr(x, firstOp.val == "&&" ? BinaryExpr.Opcode.And : BinaryExpr.Opcode.Or, e0, e1);
-            e0.RangeToken = new RangeToken(startToken, t);
+            e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), firstOp.val == "&&" ? BinaryExpr.Opcode.And : BinaryExpr.Opcode.Or, e0, e1);
          .)
   }
   (.
        if (e0 == first && prefixOp != null) {
          // There was only one conjunct. To make sure that the type checker still checks it to
          // be a boolean, we conjoin "true" of "false" to its left.
-         if (firstOp.val == "&&") e0 = new BinaryExpr(x, BinaryExpr.Opcode.And, new LiteralExpr(new AutoGeneratedToken(x), true), e0);
-         else e0 = new BinaryExpr(x, BinaryExpr.Opcode.Or, new LiteralExpr(new AutoGeneratedToken(x), false), e0);
-         e0.RangeToken = new RangeToken(firstOp, t);
+         if (firstOp.val == "&&") e0 = new BinaryExpr(x, BinaryExpr.Opcode.And, new LiteralExpr(new AutoGeneratedOrigin(x), true), e0);
+         else e0 = new BinaryExpr(new SourceOrigin(firstOp, t, x), BinaryExpr.Opcode.Or, new LiteralExpr(new AutoGeneratedOrigin(x), false), e0);
          e0.FormatTokens = new[] { firstOp };
        } else if(prefixOp != null) {
-         e0.RangeToken = new RangeToken(prefixOp, e0.EndToken);
+         e0.SetOrigin(new SourceOrigin(prefixOp, e0.EndToken, e0.Center));
        }
   .)
   .
@@ -4042,12 +3414,12 @@ LogicalExpression<out Expression e0, bool allowLemma, bool allowLambda, bool all
 /*------------------------------------------------------------------------*/
 RelationalExpression<out Expression e, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
 = (. Contract.Ensures(Contract.ValueAtReturn(out e) != null);
-     IToken x = null;  Expression e0, e1 = null;  BinaryExpr.Opcode op;
+     Token x = null;  Expression e0, e1 = null;  BinaryExpr.Opcode op;
      List<Expression> chain = null;
      List<BinaryExpr.Opcode> ops = null;
-     List<IToken> opLocs = null;
+     List<IOrigin> opLocs = null;
      List<Expression/*?*/> prefixLimits = null;
-     IToken startToken = null;
+     Token startToken = null;
      Expression k;
      int kind = 0;  // 0 ("uncommitted") indicates chain of ==, possibly with one !=
                     // 1 ("ascending")   indicates chain of ==, <, <=, possibly with one !=
@@ -4062,19 +3434,19 @@ RelationalExpression<out Expression e, bool allowLemma, bool allowLambda, bool a
     RelOp<out x, out op, out k>
     ShiftTerm<out e1, allowLemma, allowLambda, allowBitwiseOps>
                                    (. startToken = e0.StartToken;
+                                      var origin = new SourceOrigin(startToken, t, x);
                                       if (k == null) {
-                                        e = new BinaryExpr(x, op, e0, e1);
+                                        e = new BinaryExpr(origin, op, e0, e1);
                                       } else {
                                         Contract.Assert(op == BinaryExpr.Opcode.Eq || op == BinaryExpr.Opcode.Neq);
-                                        e = new TernaryExpr(x, op == BinaryExpr.Opcode.Eq ? TernaryExpr.Opcode.PrefixEqOp : TernaryExpr.Opcode.PrefixNeqOp, k, e0, e1);
+                                        e = new TernaryExpr(origin, op == BinaryExpr.Opcode.Eq ? TernaryExpr.Opcode.PrefixEqOp : TernaryExpr.Opcode.PrefixNeqOp, k, e0, e1);
                                       }
-                                      e.RangeToken = new RangeToken(startToken, t);
                                    .)
     { IF(IsRelOp())  /* read a RelationalExpression as far as possible */
                                    (. if (chain == null) {
                                         chain = new List<Expression>();
                                         ops = new List<BinaryExpr.Opcode>();
-                                        opLocs = new List<IToken>();
+                                        opLocs = new List<IOrigin>();
                                         prefixLimits = new List<Expression>();
                                         chain.Add(e0); ops.Add(op); opLocs.Add(x); prefixLimits.Add(k); chain.Add(e1);
                                         switch (op) {
@@ -4129,15 +3501,15 @@ RelationalExpression<out Expression e, bool allowLemma, bool allowLambda, bool a
   (. if (chain != null && kind != 3) {
        e = new ChainingExpression(opLocs[0], chain, ops, opLocs, prefixLimits);
      }
-     e.RangeToken = new RangeToken(startToken, t);
+     e.SetOrigin(new SourceOrigin(startToken, t, e.Center));
   .)
   .
 
 /*------------------------------------------------------------------------*/
-RelOp<out IToken/*!*/ x, out BinaryExpr.Opcode op, out Expression k>
+RelOp<out Token/*!*/ x, out BinaryExpr.Opcode op, out Expression k>
 = (. Contract.Ensures(Contract.ValueAtReturn(out x) != null);
      x = Token.NoToken;  op = BinaryExpr.Opcode.Add/*(dummy)*/;
-     IToken y;
+     Token y;
      k = null;
   .)
   ( "=="           (. x = t;  op = BinaryExpr.Opcode.Eq; .)
@@ -4158,7 +3530,7 @@ RelOp<out IToken/*!*/ x, out BinaryExpr.Opcode op, out Expression k>
     ]              (. if (y == Token.NoToken) {
                         SemErr(ErrorId.p_bang_not_a_relational_op, x, "invalid relational operator");
                       } else if (y.pos != x.pos + 1) {
-                        SemErr(ErrorId.p_invalid_relational_op, new RangeToken(x,y), "invalid relational operator (perhaps you intended \"!!\" with no intervening whitespace?)");
+                        SemErr(ErrorId.p_invalid_relational_op, new SourceOrigin(x,y), "invalid relational operator (perhaps you intended \"!!\" with no intervening whitespace?)");
                       } else {
                         x.val = "!!";
                         y.val = "";
@@ -4171,7 +3543,7 @@ RelOp<out IToken/*!*/ x, out BinaryExpr.Opcode op, out Expression k>
 /*------------------------------------------------------------------------*/
 ShiftTerm<out Expression e0, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
 = (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null);
-     IToken x = Token.NoToken;  Expression e1;  BinaryExpr.Opcode op = BinaryExpr.Opcode.LeftShift/*(dummy)*/;
+     Token x = Token.NoToken;  Expression e1;  BinaryExpr.Opcode op = BinaryExpr.Opcode.LeftShift/*(dummy)*/;
   .)
   Term<out e0, allowLemma, allowLambda, allowBitwiseOps>
   { IF(IsShiftOp())  /* read a Term as far as possible */
@@ -4192,27 +3564,26 @@ ShiftTerm<out Expression e0, bool allowLemma, bool allowLambda, bool allowBitwis
     )
     Term<out e1, allowLemma, allowLambda, allowBitwiseOps> (.
       var startToken = e0.StartToken;
-      e0 = new BinaryExpr(x, op, e0, e1);
-      e0.RangeToken = new RangeToken(startToken, t);
+      e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), op, e0, e1);
      .)
   }
   .
 
 /*------------------------------------------------------------------------*/
 Term<out Expression e0, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1;  BinaryExpr.Opcode op; .)
+= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); Token/*!*/ x;  Expression/*!*/ e1;  BinaryExpr.Opcode op; .)
   Factor<out e0, allowLemma, allowLambda, allowBitwiseOps>
   { IF(IsAddOp())  /* read a Term as far as possible */
     AddOp<out x, out op>
     Factor<out e1, allowLemma, allowLambda, allowBitwiseOps>
     (. var startToken = e0.StartToken;
-       e0 = new BinaryExpr(x, op, e0, e1);
-       e0.RangeToken = new RangeToken(startToken, t); .)
+       e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), op, e0, e1);
+    .)
   }
   .
 
 /*------------------------------------------------------------------------*/
-AddOp<out IToken x, out BinaryExpr.Opcode op>
+AddOp<out Token x, out BinaryExpr.Opcode op>
 = (. Contract.Ensures(Contract.ValueAtReturn(out x) != null); x = Token.NoToken;  op=BinaryExpr.Opcode.Add/*(dummy)*/; .)
   ( "+"            (. x = t;  op = BinaryExpr.Opcode.Add; .)
   | "-"            (. x = t;  op = BinaryExpr.Opcode.Sub; .)
@@ -4221,21 +3592,20 @@ AddOp<out IToken x, out BinaryExpr.Opcode op>
 
 /*------------------------------------------------------------------------*/
 Factor<out Expression e0, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x;  Expression/*!*/ e1;  BinaryExpr.Opcode op; .)
+= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); Token/*!*/ x;  Expression/*!*/ e1;  BinaryExpr.Opcode op; .)
   BitvectorFactor<out e0, allowLemma, allowLambda, allowBitwiseOps>
   { IF(IsMulOp())  /* read a Factor as far as possible */
     MulOp<out x, out op>
     BitvectorFactor<out e1, allowLemma, allowLambda, allowBitwiseOps>
     (. 
       var startToken = e0.StartToken;
-      e0 = new BinaryExpr(x, op, e0, e1);
-      e0.RangeToken = new RangeToken(startToken, t);
+      e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), op, e0, e1);
     .)
   }
   .
 
 /*------------------------------------------------------------------------*/
-MulOp<out IToken x, out BinaryExpr.Opcode op>
+MulOp<out Token x, out BinaryExpr.Opcode op>
 = (. Contract.Ensures(Contract.ValueAtReturn(out x) != null); x = Token.NoToken;  op = BinaryExpr.Opcode.Add/*(dummy)*/; .)
   ( "*"            (. x = t;  op = BinaryExpr.Opcode.Mul; .)
   | "/"            (. x = t;  op = BinaryExpr.Opcode.Div; .)
@@ -4245,42 +3615,42 @@ MulOp<out IToken x, out BinaryExpr.Opcode op>
 
 /*------------------------------------------------------------------------*/
 BitvectorFactor<out Expression e0, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); IToken/*!*/ x = null;  Expression/*!*/ e1;  BinaryExpr.Opcode op; bool ambig = false; op = BinaryExpr.Opcode.BitwiseAnd; .)
+= (. Contract.Ensures(Contract.ValueAtReturn(out e0) != null); Token/*!*/ x = null;  Expression/*!*/ e1;  BinaryExpr.Opcode op; bool ambig = false; op = BinaryExpr.Opcode.BitwiseAnd; .)
   AsExpression<out e0, allowLemma, allowLambda, allowBitwiseOps>
   [ IF(allowBitwiseOps && IsBitwiseOp())  /* read a BitvectorFactor as far as possible, but not in the context inside a |.| size expression */
     ( "&"                                                (. op = BinaryExpr.Opcode.BitwiseAnd; x = t; .)
     | "|"                                                (. op = BinaryExpr.Opcode.BitwiseOr; x = t; .)
     | "^"                                                (. op = BinaryExpr.Opcode.BitwiseXor; x = t; .)
     )
-    AsExpression<out e1, allowLemma, allowLambda, allowBitwiseOps>   (. var startToken = e0.StartToken; e0 = new BinaryExpr(x, op, e0, e1); e0.RangeToken = new RangeToken(startToken, t); .)
+    AsExpression<out e1, allowLemma, allowLambda, allowBitwiseOps>   (. var startToken = e0.StartToken; e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), op, e0, e1); .)
     { IF(IsBitwiseOp())
       ( "&" | "|" | "^" )                                (. if (x.kind != t.kind && !ambig) { ambig = true; SemErr(ErrorId.p_ambiguous_bitop, t, "Ambiguous use of &, |, ^. Use parentheses to disambiguate."); }
                                                             x = t; .)
-      AsExpression<out e1, allowLemma, allowLambda, allowBitwiseOps> (. startToken = e0.StartToken; e0 = new BinaryExpr(x, op, e0, e1); e0.RangeToken = new RangeToken(startToken, t); .)
+      AsExpression<out e1, allowLemma, allowLambda, allowBitwiseOps> (. startToken = e0.StartToken; e0 = new BinaryExpr(new SourceOrigin(startToken, t, x), op, e0, e1); .)
     }
   ]
   .
 
 /*------------------------------------------------------------------------*/
 AsExpression<out Expression e, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. IToken tok; IToken x; Type toType; .)
+= (. Token tok; Token x; Type toType; .)
   UnaryExpression<out e, allowLemma, allowLambda, allowBitwiseOps>
   { IF(IsAsOrIs())
     ( "as"                                  (. tok = t; .)
-      TypeAndToken<out x, out toType, true> (. e = new ConversionExpr(tok, e, toType) { RangeToken = new RangeToken(e.StartToken, t)}; .)
+      TypeAndToken<out x, out toType, true> (. e = new ConversionExpr(new SourceOrigin(e.StartToken, t, tok), e, toType); .)
     | "is"                                  (. tok = t; .)
-      TypeAndToken<out x, out toType, true> (. e = new TypeTestExpr(tok, e, toType) { RangeToken = new RangeToken(e.StartToken, t)}; .)
+      TypeAndToken<out x, out toType, true> (. e = new TypeTestExpr(new SourceOrigin(e.StartToken, t, tok), e, toType); .)
     )
   }
   .
 
 /*------------------------------------------------------------------------*/
 UnaryExpression<out Expression e, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. Contract.Ensures(Contract.ValueAtReturn(out e) != null); IToken/*!*/ x;  e = dummyExpr; .)
+= (. Contract.Ensures(Contract.ValueAtReturn(out e) != null); Token/*!*/ x;  e = dummyExpr; .)
   ( "-"                                             (. x = t; .)
-    UnaryExpression<out e, allowLemma, allowLambda, allowBitwiseOps>  (. e = new NegationExpression(x, e) { RangeToken = new RangeToken(x, t) }; .)
+    UnaryExpression<out e, allowLemma, allowLambda, allowBitwiseOps>  (. e = new NegationExpression(new SourceOrigin(x, t, x), e); .)
   | NegOp                                           (. x = t; .)
-    UnaryExpression<out e, allowLemma, allowLambda, allowBitwiseOps>  (. e = new UnaryOpExpr(x, UnaryOpExpr.Opcode.Not, e) { RangeToken = new RangeToken(x, t) }; .)
+    UnaryExpression<out e, allowLemma, allowLambda, allowBitwiseOps>  (. e = new UnaryOpExpr(new SourceOrigin(x, t, x), UnaryOpExpr.Opcode.Not, e); .)
   | PrimaryExpression<out e, allowLemma, allowLambda, allowBitwiseOps>
   )
   .
@@ -4322,31 +3692,33 @@ Lhs<out Expression e>
 /* A ConstAtomExpression is never an l-value, and does not start with an identifier. */
 ConstAtomExpression<out Expression e>
 = (. Contract.Ensures(Contract.ValueAtReturn(out e) != null);
-     IToken/*!*/ x = null;
+     Token/*!*/ x = null;
      e = dummyExpr;
   .)
   ( LiteralExpression<out e>
   | "this"                                     (. x = t; e = new ThisExpr(t); .)
   | "allocated"                                (. x = t; .)
     "(" Expression<out e, true, true> ")"      (. e = new UnaryOpExpr(x, UnaryOpExpr.Opcode.Allocated, e); .)
-  | "fresh"                                    (. x = t; IToken atLabel = null; .)
+  | "fresh"                                    (. x = t; Token atLabel = null; .)
     [ "@" LabelName<out atLabel> ]
     "(" Expression<out e, true, true> ")"      (. e = new FreshExpr(x, e, atLabel?.val); .)
-  | "unchanged"                                (. x = t; FrameExpression fe; var mod = new List<FrameExpression>(); IToken atLabel = null; .)
+  | "unchanged"                                (. x = t; FrameExpression fe; var mod = new List<FrameExpression>(); Token atLabel = null; .)
     [ "@" LabelName<out atLabel> ]
     "("
       FrameExpression<out fe, false, false>         (. mod.Add(fe); .)
       { "," FrameExpression<out fe, false, false>   (. mod.Add(fe); .)
       }
     ")"                                        (. e = new UnchangedExpr(x, mod, atLabel?.val); .)
-  | "old"                                      (. x = t; IToken atLabel = null; .)
+  | "old"                                      (. x = t; Token atLabel = null; .)
     [ "@" LabelName<out atLabel> ]
     "(" Expression<out e, true, true> ")"      (. e = new OldExpr(x, e, atLabel?.val); .)
   | "|"                                        (. x = t; .)
       Expression<out e, true, true, false>     (. e = new UnaryOpExpr(x, UnaryOpExpr.Opcode.Cardinality, e); .)
     "|"
+  | "assigned"                                 (. x = t; .)
+    "(" NameSegment<out e> ")"                 (. e = new UnaryOpExpr(x, UnaryOpExpr.Opcode.Assigned, e); .)
   | ParensExpression<out e>
-  ) (. if(x!= null) { e.RangeToken = new RangeToken(x, t); } .)
+  ) (. if(x!= null) { e.SetOrigin(new SourceOrigin(x, t, e.Center)); } .)
   .
 
 /*------------------------------------------------------------------------*/
@@ -4370,7 +3742,7 @@ LiteralExpression<out Expression e>
                                                   Util.ValidateEscaping(theOptions, t, s, isVerbatimString, errors);
                                                   e = new StringLiteralExpr(t, s, isVerbatimString);
                                                .)
-  ) (. e.RangeToken = new RangeToken(t, t); .)
+  ) (. e.SetOrigin(new SourceOrigin(t, t, e.Center)); .)
   .
 
 /*------------------------------------------------------------------------*/
@@ -4388,14 +3760,15 @@ PossiblyNegatedLiteralExpr<out Expression e>
 
 /*------------------------------------------------------------------------*/
 LambdaExpression<out Expression e, bool allowLemma, bool allowBitwiseOps>
-= (. IToken x = Token.NoToken;
-     IToken id;  BoundVar bv;
+= (. Token x = Token.NoToken;
+     Token id;  BoundVar bv;
      var bvs = new List<BoundVar>();
      var reads = new List<FrameExpression>();
+     Attributes readsAttrs = null;
      Expression req = null;
      Expression body = null;
   .)
-  ( WildIdent<out id, true>                  (. x = t; bvs.Add(new BoundVar(id, id.val, new InferredTypeProxy()) {RangeToken = new RangeToken(x, x)}); .)
+  ( WildIdent<out id, true>                  (. x = t; bvs.Add(new BoundVar(new SourceOrigin(x, x, id), id.val, new InferredTypeProxy())); .)
   | "("                                      (. x = t; .)
       [
         IdentTypeOptional<out bv>            (. bvs.Add(bv); .)
@@ -4404,83 +3777,118 @@ LambdaExpression<out Expression e, bool allowLemma, bool allowBitwiseOps>
       ]
     ")"
   )
-  LambdaSpec<ref reads, ref req>
+  LambdaSpec<ref reads, ref readsAttrs, ref req>
   "=>"
   Expression<out body, allowLemma, true, allowBitwiseOps>
-  (. e = new LambdaExpr(x, new RangeToken(x, t), bvs, req, reads, body);
+  (. e = new LambdaExpr(new SourceOrigin(x, t), bvs, req, new Specification<FrameExpression>(reads, readsAttrs), body);
      SystemModuleModifiers.Add(b => b.CreateArrowTypeDecl(bvs.Count));
   .)
   .
 
 // Coco says LambdaSpec is deletable. This is OK (it might be empty).
-LambdaSpec<.ref List<FrameExpression> reads, ref Expression req.>
-= { ReadsClause<reads, true, false, true>
+LambdaSpec<.ref List<FrameExpression> reads, ref Attributes readsAttrs, ref Expression req.>
+= { ReadsClause<reads, ref readsAttrs, true, false, true>
   | "requires"                             (. Expression ee; .)
-    Expression<out ee, true, false>        (. req = req == null ? ee : new BinaryExpr(req.tok, BinaryExpr.Opcode.And, req, ee) { RangeToken = new RangeToken(req.StartToken, ee.EndToken) } ; .)
+    Expression<out ee, true, false>        (. req = req == null ? ee : new BinaryExpr(new SourceOrigin(req.StartToken, ee.EndToken, req.Center), BinaryExpr.Opcode.And, req, ee); .)
   }
   .
 
 /*------------------------------------------------------------------------*/
 ParensExpression<out Expression e>
-= (. IToken lp; IToken rp;
+= (. Token lp = null; Token rp = null;
      var args = new List<ActualBinding>();
+     e = dummyExpr;
+     var isDecreasesToExpr = false;
+     Token decreasesToToken = null;
+     var allowNoChange = false;
+     List<Expression> oldExprs = null;
+     List<Expression> newExprs = null;
   .)
-  "("                                        (. lp = t; .)
-  [ TupleArgs<args> ]
-  ")"                                        (. rp = t; .)
-  (. if (args.Count == 1 && !args[0].IsGhost) {
-       if (args[0].FormalParameterName != null) {
-         SemErr(ErrorId.p_no_parenthesized_binding, new RangeToken(lp,rp), "binding not allowed in parenthesized expression");
-       }
-       e = new ParensExpression(lp, args[0].Actual);
-     } else {
-       // Compute the actual position of ghost arguments
-       var ghostness = new bool[args.Count];
-       for (var i = 0; i < args.Count; i++) {
-         ghostness[i] = false;
-       }
-       for (var i = 0; i < args.Count; i++) {
-         var arg = args[i];
-         if (arg.IsGhost) {
-           if (arg.FormalParameterName == null) {
-             ghostness[i] = true;
-           } else {
-             var success = int.TryParse(arg.FormalParameterName.val, out var index);
-             if (success && 0 <= index && index < args.Count) {
-               ghostness[index] = true;
-             }
+  "("                                       (. lp = t; .)
+  ( ")"                                     (. rp = t; .)
+
+  | (. isDecreasesToExpr = true;
+       oldExprs = new();
+    .)
+    DecreasesTo<out decreasesToToken, out allowNoChange>
+    DecreasesToExpressionList<out newExprs>
+    ")"                                     (. rp = t; .)
+
+  | TupleArgs<args>
+    [ (. isDecreasesToExpr = true; .)
+      DecreasesTo<out decreasesToToken, out allowNoChange>
+      (. foreach (var binding in args) {
+           if (binding.FormalParameterName != null) {
+             SemErr(ErrorId.p_binding_in_decreases_to, binding.FormalParameterName,
+               $"bindings are not allowed in `{decreasesToToken.val} to` expressions.");
+           } else if (binding.IsGhost) {
+             SemErr(ErrorId.p_ghost_in_decreases_to, binding.Actual.Origin, // we don't have the token of "ghost" :(
+               $"'ghost' components are not allowed in `{decreasesToToken.val} to` expressions.");
            }
          }
+         oldExprs = args.Select(arg => arg.Actual).ToList();
+      .)
+      DecreasesToExpressionList<out newExprs>
+    ]
+    ")"                                     (. rp = t; .)
+  )
+
+  (. if (isDecreasesToExpr) {
+       e = new DecreasesToExpr(decreasesToToken, oldExprs, newExprs, allowNoChange);
+     } else {
+       e = ProcessTupleArgs(args, lp);
+       if (e is not DatatypeValue) { // here, a DatatypeValue is a tuple expression
+         e = new ParensExpression(lp, e);
        }
-       var argumentGhostness = ghostness.ToList();
-       // make sure the corresponding tuple type exists
-       SystemModuleModifiers.Add(b => b.TupleType(lp, args.Count, true, argumentGhostness));
-       e = new DatatypeValue(lp, SystemModuleManager.TupleTypeName(argumentGhostness), SystemModuleManager.TupleTypeCtorName(args.Count), args);
      }
+     e.SetOrigin(new SourceOrigin(lp, rp, e.Center));
   .)
   .
 
-/*------------------------------------------------------------------------*/
 TupleArgs<.List<ActualBinding> args.>
 = (. ActualBinding binding; bool isGhost = false; .)
   // The IF is to distinguish between `(ghost var x := 5; x + x)` and (ghost x), both of which begin with `( ghost`.
   [ IF(la.kind == _ghost && !IsPeekVar())
-    "ghost"                             (. isGhost = true; .)
+    "ghost"                                     (. isGhost = true; .)
   ]
-  ActualBinding<out binding, isGhost>   (. args.Add(binding); .)
-  { ","                                 (. isGhost = false; .)
+  ActualBinding<out binding, isGhost, false>    (. args.Add(binding); .)
+  { ","                                         (. isGhost = false; .)
     [ IF(la.kind == _ghost && !IsPeekVar())
-      "ghost"                           (. isGhost = true; .)
+      "ghost"                                   (. isGhost = true; .)
     ]
-    ActualBinding<out binding, isGhost> (. args.Add(binding); .)
+    ActualBinding<out binding, isGhost, false>  (. args.Add(binding); .)
   }
   .
 
+// the DecreasesTo production can be anticipated by IsDecreasesTo()
+DecreasesTo<out Token x, out bool allowNoChange>
+= (. allowNoChange = false; .)
+  ( "decreases"
+  | "nonincreases"                (. allowNoChange = true; .)
+  )                               (. x = t; .)
+  ident
+  (. if (t.val != "to") {
+       SemErr(ErrorId.p_decreases_without_to, t, "expected 'to'");
+     }
+  .)
+  .
+
+DecreasesToExpressionList<.out List<Expression> newExprs.>
+= (. newExprs = new();
+     Expression expr;
+  .)
+  [ Expression<out expr, false, false>                   (. newExprs.Add(expr); .)
+    { ","
+      Expression<out expr, false, false>                 (. newExprs.Add(expr); .)
+    }
+  ]
+  .
+
 /*------------------------------------------------------------------------*/
 SetDisplayExpr<out Expression e>
 = (. Contract.Ensures(Contract.ValueAtReturn(out e) != null);
-     IToken token = null;
-     IToken x = null, startToken = null;
+     Token token = null;
+     Token x = null, startToken = null;
      e = dummyExpr;
   .)
   [ ( "iset" | "multiset" )                  (. token = t; startToken = t; x = t; .)
@@ -4509,14 +3917,14 @@ SetDisplayExpr<out Expression e>
                                                .)
     ")"
   )
-  (. e.RangeToken = new RangeToken(startToken, t); .)
+  (. e.SetOrigin(new SourceOrigin(startToken, t, e.Center)); .)
   .
 
 /*------------------------------------------------------------------------*/
 SeqDisplayExpr<out Expression e>
 = (. Contract.Ensures(Contract.ValueAtReturn(out e) != null);
-     IToken x = null;
-     IToken startInstantiation = null;
+     Token x = null;
+     Token startInstantiation = null;
      Type explicitTypeArg = null;
      Expression n, f;
      e = dummyExpr;
@@ -4525,7 +3933,7 @@ SeqDisplayExpr<out Expression e>
     "seq"                          (. x = t; .)
     [ (. var gt = new List<Type>(); startInstantiation = la; .)
     GenericInstantiation<gt>     (. if (gt.Count > 1) {
-                                      SemErr(ErrorId.p_seq_display_has_one_type_argument, new RangeToken(startInstantiation,t), "seq type expects only one type argument");
+                                      SemErr(ErrorId.p_seq_display_has_one_type_argument, new SourceOrigin(startInstantiation,t), "seq type expects only one type argument");
                                     } else {
                                       explicitTypeArg = gt[0];
                                     }
@@ -4545,7 +3953,7 @@ SeqDisplayExpr<out Expression e>
                                              .)
     "]"
   )
-  (.  e.RangeToken = new RangeToken(x, t); .)
+  (.  e.SetOrigin(new SourceOrigin(x, t, e.Center)); .)
   .
 
 /*------------------------------------------------------------------------*/
@@ -4554,11 +3962,10 @@ MapDisplayExpr<out Expression e>
      List<ExpressionPair/*!*/>/*!*/ elements= new List<ExpressionPair/*!*/>() ;
      e = dummyExpr;
   .)
-  ( "map" | "imap" ) (. IToken mapToken = t; .)
+  ( "map" | "imap" ) (. Token mapToken = t; .)
   "["
-    [ MapLiteralExpressions<out elements> ] 
-                     (. e = new MapDisplayExpr(mapToken, mapToken.kind == _map, elements);.)
-  "]"                (. e.RangeToken = new RangeToken(mapToken, t); .)
+    [ MapLiteralExpressions<out elements> ]
+  "]"                (. e = new MapDisplayExpr(new SourceOrigin(mapToken, t), mapToken.kind == _map, elements); .)
   .
 
 /*------------------------------------------------------------------------*/
@@ -4581,8 +3988,8 @@ MapComprehensionExpr<out Expression e, bool allowLemma, bool allowLambda, bool a
      Attributes attrs = null;
      bool finite = true;
   .)
-  ( "map" | "imap" (. finite = false; .) )     (. IToken mapToken = t; .)
-  QuantifierDomain<out bvars, out attrs, out range, allowLemma, allowLambda, allowBitwiseOps>
+  ( "map" | "imap" (. finite = false; .) )     (. Token mapToken = t; .)
+  QuantifierDomain<out bvars, out attrs, out range, true, true, true>
   QSep
   Expression<out bodyRight, allowLemma, allowLambda, allowBitwiseOps>
   [ IF(IsGets())  /* greedily parse ":=" */    (. bodyLeft = bodyRight; .)
@@ -4592,7 +3999,7 @@ MapComprehensionExpr<out Expression e, bool allowLemma, bool allowLambda, bool a
        SemErr(ErrorId.p_map_comprehension_must_have_term_expression, t, "a map comprehension with more than one bound variable must have a term expression of the form 'Expr := Expr'");
        e = dummyExpr;
      } else {
-       e = new MapComprehension(mapToken, new RangeToken(mapToken, t), finite, bvars, range ?? new LiteralExpr(Token.NoToken, true), bodyLeft, bodyRight, attrs);
+       e = new MapComprehension(new SourceOrigin(mapToken, t), finite, bvars, range ?? new LiteralExpr(Token.NoToken, true), bodyLeft, bodyRight, attrs);
      }
   .)
   .
@@ -4607,7 +4014,8 @@ EndlessExpression<out Expression e, bool allowLemma, bool allowLambda, bool allo
   | QuantifierExpression<out e, allowLemma, allowLambda>  /* types are such that we can allow bitwise operations in the quantifier body */
   | SetComprehensionExpr<out e, allowLemma, allowLambda, allowBitwiseOps>
   | StmtInExpr<out s>
-    Expression<out e, allowLemma, allowLambda, allowBitwiseOps>    (. e = new StmtExpr(s.Tok, s, e) { RangeToken = new RangeToken(s.StartToken, e.EndToken) }; .)
+    Expression<out e, allowLemma, allowLambda, allowBitwiseOps>
+    (. e = new StmtExpr(s.Origin, s, e); .)
   | LetExpression<out e, allowLemma, allowLambda, allowBitwiseOps>
   | MapComprehensionExpr<out e, allowLemma, allowLambda, allowBitwiseOps>
   )
@@ -4615,7 +4023,7 @@ EndlessExpression<out Expression e, bool allowLemma, bool allowLambda, bool allo
 
 /*------------------------------------------------------------------------*/
 IfExpression<out Expression e, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= "if"   (. IToken x = t; Expression e0; Expression e1;
+= "if"   (. Token x = t; Expression e0; Expression e1;
             bool isBindingGuard = false;
             e = dummyExpr;
          .)
@@ -4629,13 +4037,12 @@ IfExpression<out Expression e, bool allowLemma, bool allowLambda, bool allowBitw
                      var exists = (ExistsExpr) e;
                      var LHSs = new List<CasePattern<BoundVar>>();
                      foreach (var v in exists.BoundVars) {
-                       LHSs.Add(new CasePattern<BoundVar>(e.tok, v));
+                       LHSs.Add(new CasePattern<BoundVar>(e.Origin, v));
                      }
-                     e0 = new LetExpr(e.tok, LHSs, new List<Expression>() {
-                       exists.Term }, e0, false) { RangeToken = exists.RangeToken};
+                     e0 = new LetExpr(e.Origin, LHSs, new List<Expression>() {
+                       exists.Term }, e0, false);
                  }
-                 e = new ITEExpr(x, isBindingGuard, e, e0, e1);
-                 e.RangeToken = new RangeToken(x, t);
+                 e = new ITEExpr(new SourceOrigin(x, t), isBindingGuard, e, e0, e1);
                 .)
   .
 /*------------------------------------------------------------------------*/
@@ -4658,12 +4065,12 @@ LetExpression<out Expression e, bool allowLemma, bool allowLambda, bool allowBit
 
 /*------------------------------------------------------------------------*/
 LetExprWithLHS<out Expression e, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. IToken x = null;
+= (. Token x = null;
      bool isGhost = false;
      var letLHSs = new List<CasePattern<BoundVar>>();
      var letRHSs = new List<Expression>();
-     IToken lastLHS = null;
-     IToken lastRHS = null;
+     Token lastLHS = null;
+     Token lastRHS = null;
      CasePattern<BoundVar> pat;
      bool exact = true;
      bool isLetOrFail = false;
@@ -4686,7 +4093,7 @@ LetExprWithLHS<out Expression e, bool allowLemma, bool allowLambda, bool allowBi
       ":|"                          (. exact = false;
                                        foreach (var lhs in letLHSs) {
                                          if (lhs.Arguments != null) {
-                                           SemErr(ErrorId.p_no_patterns_in_let_such_that, lhs.tok, "LHS of let-such-that expression must be variables, not general patterns");
+                                           SemErr(ErrorId.p_no_patterns_in_let_such_that, lhs.Origin, "LHS of let-such-that expression must be variables, not general patterns");
                                          }
                                        }
                                     .)
@@ -4705,7 +4112,7 @@ LetExprWithLHS<out Expression e, bool allowLemma, bool allowLambda, bool allowBi
       if (letLHSs.Count == 1) {
         lhs = letLHSs[0];
       } else {
-        var erange = new RangeToken(letLHSs[1].StartToken.Prev, letLHSs[^1].EndToken);
+        var erange = new SourceOrigin(letLHSs[1].StartToken.Prev, letLHSs[^1].EndToken);
         SemErr(ErrorId.p_elephant_has_one_lhs, erange, "':-' can have at most one left-hand side");
       }
       Expression rhs = null;
@@ -4713,20 +4120,19 @@ LetExprWithLHS<out Expression e, bool allowLemma, bool allowLambda, bool allowBi
       if (letRHSs.Count == 1) {
         rhs = letRHSs[0];
       } else {
-        var erange = new RangeToken(letRHSs[0].EndToken.Next, letRHSs[^1].EndToken);
+        var erange = new SourceOrigin(letRHSs[0].EndToken.Next, letRHSs[^1].EndToken);
         SemErr(ErrorId.p_elephant_has_one_rhs, erange, "':-' must have exactly one right-hand side");
       }
-      e = new LetOrFailExpr(x, lhs, rhs, e);
+      e = new LetOrFailExpr(new SourceOrigin(x, t), lhs, rhs, e);
     } else {
-      e = new LetExpr(x, letLHSs, letRHSs, e, exact, attrs);
+      e = new LetExpr(new SourceOrigin(x, t), letLHSs, letRHSs, e, exact, attrs);
     }
-    e.RangeToken = new RangeToken(x, t);
   .)
   .
 
 /*------------------------------------------------------------------------*/
 LetExprWithoutLHS<out Expression e, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. IToken x;
+= (. Token x;
      Expression rhs;
      Expression body;
   .)
@@ -4734,14 +4140,13 @@ LetExprWithoutLHS<out Expression e, bool allowLemma, bool allowLambda, bool allo
   Expression<out rhs, false, true>
   ";"
   Expression<out body, allowLemma, allowLambda, allowBitwiseOps>
-  (. e = new LetOrFailExpr(x, null, rhs, body);
-     e.RangeToken = new RangeToken(x, t);
+  (. e = new LetOrFailExpr(new SourceOrigin(x, t), null, rhs, body);
    .)
   .
 
 /*------------------------------------------------------------------------*/
 MatchExpression<out Expression e, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. Contract.Ensures(Contract.ValueAtReturn(out e) != null); IToken/*!*/ x;  NestedMatchCaseExpr/*!*/ c;
+= (. Contract.Ensures(Contract.ValueAtReturn(out e) != null); Token/*!*/ x;  NestedMatchCaseExpr/*!*/ c;
      List<NestedMatchCaseExpr/*!*/> cases = new List<NestedMatchCaseExpr/*!*/>();
      bool usesOptionalBraces = false;
   .)
@@ -4755,13 +4160,12 @@ MatchExpression<out Expression e, bool allowLemma, bool allowLambda, bool allowB
           CaseExpression<out c, allowLemma, allowLambda, allowBitwiseOps> (. cases.Add(c); .)
         }
   )
-  (. e = new NestedMatchExpr(x, e, cases, usesOptionalBraces);
-     e.RangeToken = new RangeToken(x, t); .)
+  (. e = new NestedMatchExpr(new SourceOrigin(x, t), e, cases, usesOptionalBraces); .)
 .
 
 /*------------------------------------------------------------------------*/
 CaseExpression<out NestedMatchCaseExpr c, bool allowLemma, bool allowLambda, bool allowBitwiseOps>
-= (. Contract.Ensures(Contract.ValueAtReturn(out c) != null); IToken/*!*/ x;
+= (. Contract.Ensures(Contract.ValueAtReturn(out c) != null); Token/*!*/ x;
      ExtendedPattern/*!*/ pat = null;
      Expression/*!*/ body;
      Attributes attrs = null;
@@ -4775,7 +4179,7 @@ CaseExpression<out NestedMatchCaseExpr c, bool allowLemma, bool allowLambda, boo
 
 /*------------------------------------------------------------------------*/
 CasePattern<.out CasePattern<BoundVar> pat.>
-= (. IToken id;  List<CasePattern<BoundVar>> arguments;
+= (. Token id;  List<CasePattern<BoundVar>> arguments;
      BoundVar bv;
      pat = null;
   .)
@@ -4803,7 +4207,7 @@ CasePattern<.out CasePattern<BoundVar> pat.>
                                           // later if resolution finds the CasePattern to denote a parameter-less constructor), because this
                                           // (in particular, bv.IsGhost) is the place where a LetExpr records whether or not the "ghost"
                                           // keyword was used in the declaration.
-                                          pat = new CasePattern<BoundVar>(bv.tok, bv);
+                                          pat = new CasePattern<BoundVar>(bv.Origin, bv);
                                        .)
   )
   (. // In case of parsing errors, make sure 'pat' still returns as non-null
@@ -4818,7 +4222,7 @@ CasePattern<.out CasePattern<BoundVar> pat.>
  * not have a way to make the patterns take a bounded type parameter.
  */
 CasePatternLocal<.out CasePattern<LocalVariable> pat, bool isGhost.>
-= (. IToken id; List<CasePattern<LocalVariable>> arguments;
+= (. Token id; List<CasePattern<LocalVariable>> arguments;
      LocalVariable local;
      pat = null;
   .)
@@ -4847,7 +4251,7 @@ CasePatternLocal<.out CasePattern<LocalVariable> pat, bool isGhost.>
                                           // later if resolution finds the CasePattern to denote a parameter-less constructor), because this
                                           // (in particular, local.IsGhost) is the place where a LetExpr records whether or not the "ghost"
                                           // keyword was used in the declaration.
-                                          pat = new CasePattern<LocalVariable>(local.Tok, local);
+                                          pat = new CasePattern<LocalVariable>(local.Origin, local);
                                        .)
   )
   (. // In case of parsing errors, make sure 'pat' still returns as non-null
@@ -4859,37 +4263,37 @@ CasePatternLocal<.out CasePattern<LocalVariable> pat, bool isGhost.>
 
 /*------------------------------------------------------------------------*/
 NameSegment<out Expression e>
-= (. IToken id;
-     IToken openParen = null; IToken atLabel = null;
+= (. Token id;
+     Token openParen = null; Token atLabel = null;
      List<Type> typeArgs = null; List<ActualBinding> args = null;
   .)
   Ident<out id>
   ( IF(IsGenericInstantiation(true))
     (. typeArgs = new List<Type>(); .)
     GenericInstantiation<typeArgs>
-    [ AtCall<out atLabel, out openParen, out args> ]
+    [ IF(IsAtCall())
+      AtCall<out atLabel, out openParen, out args> ]
   | HashCall<id, out openParen, out typeArgs, out args>
-  | [ AtCall<out atLabel, out openParen, out args> ]
+  | [ IF(IsAtCall())
+      AtCall<out atLabel, out openParen, out args> ]
   )
   /* Note, since HashCall updates id.val, we make sure not to use id.val until after the possibility of calling HashCall. */
-  (. e = new NameSegment(id, id.val, typeArgs);
+  (. e = new NameSegment(new SourceOrigin(id, t), id.val, typeArgs);
      if (openParen != null) {
-       e = new ApplySuffix(openParen, atLabel, e, args, t);
+       e = new ApplySuffix(new SourceOrigin(id, t, openParen), atLabel, e, args, t);
      } else {
        Contract.Assert(atLabel == null);
      }
-     e.RangeToken = new RangeToken(id, t);
   .)
   .
 
 /*------------------------------------------------------------------------*/
 /* NameSegmentForTypeName is like the production NameSegment, except that it does not allow HashCall */
 NameSegmentForTypeName<out Expression e, bool inExpressionContext>
-= (. IToken id;  List<Type> typeArgs; .)
+= (. Token id;  List<Type> typeArgs; .)
   Ident<out id>
   OptGenericInstantiation<out typeArgs, inExpressionContext>
-  (. e = new NameSegment(id, id.val, typeArgs);
-     e.RangeToken = new RangeToken(id, t);
+  (. e = new NameSegment(new SourceOrigin(id, t), id.val, typeArgs);
   .)
   .
 
@@ -4903,7 +4307,7 @@ NameSegmentForTypeName<out Expression e, bool inExpressionContext>
  * expression, just like for other function applications.
  * Note: This grammar production mutates the id.val field to append the hash sign.
  */
-HashCall<.IToken id, out IToken openParen, out List<Type> typeArgs, out List<ActualBinding> args.>
+HashCall<.Token id, out Token openParen, out List<Type> typeArgs, out List<ActualBinding> args.>
 = (. Expression k; args = new List<ActualBinding>(); typeArgs = null; .)
   "#"                                      (. id.val = id.val + "#"; t.val = ""; t.pos = t.pos+1; t.col = t.col+1; .)
   [                                        (. typeArgs = new List<Type>(); .)
@@ -4916,7 +4320,7 @@ HashCall<.IToken id, out IToken openParen, out List<Type> typeArgs, out List<Act
   .
 
 /*------------------------------------------------------------------------*/
-AtCall<.out IToken atLabel, out IToken openParen, out List<ActualBinding> args.>
+AtCall<.out Token atLabel, out Token openParen, out List<ActualBinding> args.>
 = (. atLabel = null;
      openParen = null;
      args = new List<ActualBinding>();
@@ -4930,45 +4334,43 @@ AtCall<.out IToken atLabel, out IToken openParen, out List<ActualBinding> args.>
 /*------------------------------------------------------------------------*/
 Suffix<ref Expression e>
 = (. Contract.Requires(e != null); Contract.Ensures(e!=null);
-     IToken id, x;
+     Token id, x;
      Expression e0 = null;  Expression e1 = null;  Expression ee;  bool anyDots = false;
      List<Expression> multipleLengths = null; bool takeRest = false; // takeRest is relevant only if multipleLengths is non-null
      List<Expression> multipleIndices = null;
-     List<Tuple<IToken, string, Expression>> updates;
+     List<Tuple<IOrigin, string, Expression>> updates;
      var startToken = e.StartToken;
      Expression v;
   .)
   ( "."
-    ( "("                                             (. x = t; updates = new List<Tuple<IToken, string, Expression>>(); .)
-        MemberBindingUpdate<out id, out v>            (. updates.Add(Tuple.Create(id, id.val, v)); .)
-        { "," MemberBindingUpdate<out id, out v>      (. updates.Add(Tuple.Create(id, id.val, v)); .)
+    ( "("                                             (. x = t; updates = new List<Tuple<IOrigin, string, Expression>>(); .)
+        MemberBindingUpdate<out id, out v>            (. updates.Add(Tuple.Create((IOrigin)id, id.val, v)); .)
+        { "," MemberBindingUpdate<out id, out v>      (. updates.Add(Tuple.Create((IOrigin)id, id.val, v)); .)
         }
       ")"
-      (. e = new DatatypeUpdateExpr(x, e, updates) { RangeToken = new RangeToken(startToken, t)}; .)
+      (. e = new DatatypeUpdateExpr(new SourceOrigin(startToken, t, x), e, updates); .)
     | DotSuffix<out id, out x>                 (. if (x != null) {
                                                     // process id as a Suffix in its own right
-                                                    e = new ExprDotName(id, e, id.val, null) { RangeToken = new RangeToken(startToken, t)};
+                                                    e = new ExprDotName(new SourceOrigin(startToken, t, id), e, new Name(id), null);
                                                     id = x;  // move to the next Suffix
                                                   }
-                                                  IToken openParen = null;  List<Type> typeArgs = null;
+                                                  Token openParen = null;  List<Type> typeArgs = null;
                                                   List<ActualBinding> args = null;
-                                                  IToken atLabel = null;
+                                                  Token atLabel = null;
                                                .)
 
       ( IF(IsGenericInstantiation(true))
         (. typeArgs = new List<Type>(); .)
         GenericInstantiation<typeArgs>
-        [ AtCall<out atLabel, out openParen, out args> ]
+        [ IF(IsAtCall())
+          AtCall<out atLabel, out openParen, out args> ]
       | HashCall<id, out openParen, out typeArgs, out args>
-      | [ AtCall<out atLabel, out openParen, out args> ]
+      | [ IF(IsAtCall())
+          AtCall<out atLabel, out openParen, out args> ]
       )
-      (. e = new ExprDotName(id, e, id.val, typeArgs) {
-           RangeToken = new RangeToken(startToken, id)
-         };
+      (. e = new ExprDotName(new SourceOrigin(startToken, id, id), e, new Name(id), typeArgs);
          if (openParen != null) {
-           e = new ApplySuffix(openParen, atLabel, e, args, t) {
-             RangeToken = new RangeToken(startToken, t)
-           };
+           e = new ApplySuffix(new SourceOrigin(startToken, t, openParen), atLabel, e, args, t);
          } else {
            Contract.Assert(atLabel == null);
          }
@@ -5006,8 +4408,10 @@ Suffix<ref Expression e>
         ]
       )
     "]"
-      (. if (multipleIndices != null) {
-           e = new MultiSelectExpr(x, e, multipleIndices);
+      (. 
+         var origin = new SourceOrigin(startToken, t, x); 
+         if (multipleIndices != null) {
+           e = new MultiSelectExpr(origin, e, multipleIndices);
            // make sure an array class with this dimensionality exists
            SystemModuleModifiers.Add(b => b.ArrayType(multipleIndices.Count, new IntType(), true));
          } else {
@@ -5018,39 +4422,32 @@ Suffix<ref Expression e>
            Contract.Assert(anyDots || e0 != null);
            if (anyDots) {
              //Contract.Assert(e0 != null || e1 != null);
-             e = new SeqSelectExpr(x, false, e, e0, e1, t);
+             e = new SeqSelectExpr(origin, false, e, e0, e1, t);
            } else if (multipleLengths != null) {
              Expression prev = null;
              List<Expression> seqs = new List<Expression>();
               foreach (var len in multipleLengths) {
-                var end = prev == null ? len : new BinaryExpr(x, BinaryExpr.Opcode.Add, prev, len) {
-                  RangeToken = new RangeToken(prev.StartToken, len.EndToken)
-                };
-                seqs.Add(new SeqSelectExpr(x, false, e, prev, end, t) {
-                  RangeToken = new RangeToken(e.StartToken, t)
-                });
+                var end = prev == null ? len : new BinaryExpr(new SourceOrigin(prev.StartToken, len.EndToken, x), 
+                BinaryExpr.Opcode.Add, prev, len);
+                seqs.Add(new SeqSelectExpr(origin, false, e, prev, end, t));
                 prev = end;
               }
              if (takeRest) {
-               seqs.Add(new SeqSelectExpr(x, false, e, prev, null, t) {
-                 RangeToken = new RangeToken(e.StartToken, t)
-               });
+               seqs.Add(new SeqSelectExpr(origin, false, e, prev, null, t));
              }
-             e = new SeqDisplayExpr(x, seqs);
+             e = new SeqDisplayExpr(origin, seqs);
            } else if (e1 == null) {
              Contract.Assert(e0 != null);
-             e = new SeqSelectExpr(x, true, e, e0, null, t);
+             e = new SeqSelectExpr(origin, true, e, e0, null, t);
            } else {
              Contract.Assert(e0 != null);
-             e = new SeqUpdateExpr(x, e, e0, e1);
+             e = new SeqUpdateExpr(origin, e, e0, e1);
            }
          }
-         e.RangeToken = new RangeToken(startToken, t);
       .)
-  | "("                                    (. IToken openParen = t; var args = new List<ActualBinding>(); .)
+  | "("                                    (. Token openParen = t; var args = new List<ActualBinding>(); .)
     [ ActualBindings<args> ]
-    ")"                                    (. e = new ApplySuffix(openParen, null, e, args, t);
-                                              e.RangeToken = new RangeToken(startToken, t);
+    ")"                                    (. e = new ApplySuffix(new SourceOrigin(startToken, t, openParen), null, e, args, t);
                                            .)
   )
   .
@@ -5058,43 +4455,51 @@ Suffix<ref Expression e>
 /*------------------------------------------------------------------------*/
 ActualBindings<.List<ActualBinding> bindings.>
 = (. ActualBinding binding; .)
-  ActualBinding<out binding>                      (. bindings.Add(binding); .)
-  { "," ActualBinding<out binding>                (. bindings.Add(binding); .)
+  ActualBinding<out binding, false, true>            (. bindings.Add(binding); .)
+  { "," ActualBinding<out binding, false, true>      (. bindings.Add(binding); .)
   }
   .
 
-ActualBinding<out ActualBinding binding, bool isGhost = false>
-= (. IToken id = null; Expression e; .)
+ActualBinding<out ActualBinding binding, bool isGhost, bool allowDecreasesTo>
+= (. Token id = null; Expression e; .)
   [ IF(IsBinding())
     NoUSIdentOrDigits<out id>
     ":="
   ]
-  Expression<out e, true, true>
+  Expression<out e, true, true, allowDecreasesTo: allowDecreasesTo>
   (. binding = new ActualBinding(id, e, isGhost); .)
   .
 
 /*------------------------------------------------------------------------*/
 QuantifierExpression<out Expression q, bool allowLemma, bool allowLambda>
 = (. Contract.Ensures(Contract.ValueAtReturn(out q) != null);
-     IToken/*!*/ x = Token.NoToken;
+     Token/*!*/ x = Token.NoToken;
      bool univ = false;
      List<BoundVar/*!*/> bvars;
      Attributes attrs;
      Expression range;
-     Expression/*!*/ body;
+     q = dummyExpr;
   .)
   ( Forall                                     (. x = t;  univ = true; .)
   | Exists                                     (. x = t; .)
   )
-  QuantifierDomain<out bvars, out attrs, out range, allowLemma, allowLambda, true>
-  QSep
-  Expression<out body, allowLemma, allowLambda>
-  (. if (univ) {
-       q = new ForallExpr(x, new RangeToken(x, t), bvars, range, body, attrs);
-     } else {
-       q = new ExistsExpr(x, new RangeToken(x, t), bvars, range, body, attrs);
-     }
-  .)
+  QuantifierDomain<out bvars, out attrs, out range, true, true, true>
+  ( IF(univ && (la.kind == _ensures || la.kind == _lbrace))
+    // It's a forall statement. Parse it as part of a StmtExpr.
+    ForallStatementEnsuresAndBody<out var forallStatement, x, bvars, attrs, range>
+    Expression<out var expr, allowLemma, allowLambda>
+    (. q = new StmtExpr(forallStatement.Origin, forallStatement, expr);
+    .)
+
+  | QSep
+    Expression<out var body, allowLemma, allowLambda>
+    (. if (univ) {
+         q = new ForallExpr(new SourceOrigin(x, t), bvars, range, body, attrs);
+       } else {
+         q = new ExistsExpr(new SourceOrigin(x, t), bvars, range, body, attrs);
+       }
+    .)
+  )
   .
 
 /*------------------------------------------------------------------------*/
@@ -5133,7 +4538,7 @@ QuantifierVariableDecl<.out QuantifiedVar qvar, ref Attributes attrs, bool allow
   { IF( la.kind == _lbracecolon) Attribute<ref attrs> } // Ambiguity -- if the next optional block is not present, 
                                                         // this {Attribute} ends a QuantifierVariableDecl so it can end a SetComprehensionExpr
                                                         // so it can end an Expression
-                                                        // But an Expression can be followed by {Attribute} as in VarDeclStatement, Rhs, UpdateStmt
+                                                        // But an Expression can be followed by {Attribute} as in VarDeclStatement, Rhs, AssignStatement
   [ // Coco complains about this ambiguity, thinking that a "|" can follow a body-less forall statement. 
     // That can happen because the grammar allows a QuantifierDecl to end a QuantifierDomain, which can end
     // a SetComprehensionExpr, and a Expression can be followed by a bitvector '|'. 
@@ -5143,7 +4548,7 @@ QuantifierVariableDecl<.out QuantifiedVar qvar, ref Attributes attrs, bool allow
     "|"
     Expression<out range, allowLemma, allowLambda, allowBitwiseOps>
   ]
-  (. qvar = new QuantifiedVar(bv.tok, bv.Name, bv.SyntacticType, domain, range); .)
+  (. qvar = new QuantifiedVar(bv.Origin, bv.Name, bv.SyntacticType, domain, range); .)
   .
 
 /*------------------------------------------------------------------------*/
@@ -5155,7 +4560,7 @@ SetComprehensionExpr<out Expression q, bool allowLemma, bool allowLambda, bool a
      Attributes attrs = null;
      bool finite = true;
   .)
-  ( "set" | "iset" (. finite = false; .) )     (. IToken setToken = t; .)
+  ( "set" | "iset" (. finite = false; .) )     (. Token setToken = t; .)
   QuantifierDomain<out bvars, out attrs, out range, allowLemma, allowLambda, allowBitwiseOps>
   [ IF(IsQSep())  /* let any given body bind to the closest enclosing set comprehension */
     QSep
@@ -5168,10 +4573,8 @@ SetComprehensionExpr<out Expression q, bool allowLemma, bool allowLambda, bool a
        // This production used to have its own version of QuantifierDomain in which the
        // range was not optional, so we map null to "true" here so that the rest of the
        // logic doesn't hit exceptions.
-       if (range == null) {
-         range = LiteralExpr.CreateBoolLiteral(new AutoGeneratedToken(t), true);
-       }
-       q = new SetComprehension(setToken, new RangeToken(setToken, t), finite, bvars, range, body, attrs);
+       range ??= LiteralExpr.CreateBoolLiteral(new AutoGeneratedOrigin(t), true);
+       q = new SetComprehension(new SourceOrigin(setToken, t), finite, bvars, range, body, attrs);
      }
   .)
   .
@@ -5185,11 +4588,11 @@ Expressions<.List<Expression> args.>
   .
 
 /*------------------------------------------------------------------------*/
-AttributeName<out IToken id> = NoUSIdent<out id>.
+AttributeName<out Token id> = NoUSIdent<out id>.
 
 Attribute<ref Attributes attrs>
-= (. IToken openBrace, closeBrace;
-     IToken x = null;
+= (. Token openBrace, closeBrace;
+     Token x = null;
      var args = new List<Expression>();
   .)
   "{:"                         (. openBrace = t; .)
@@ -5198,15 +4601,36 @@ Attribute<ref Attributes attrs>
   [ Expressions<args> ]
   "}"                         (. closeBrace = t; .)
   (. 
-     var rtok = new RangeToken(openBrace, t);
-     if (!CheckAttribute(errors, x, rtok)) return;
-     attrs = new UserSuppliedAttributes(x, openBrace, closeBrace, args, attrs);
-     attrs.RangeToken = rtok;
+     var rtok = new SourceOrigin(openBrace, t, x);
+     var rtok2 = new SourceOrigin(openBrace, t, /* change to x */ openBrace);
+     if (!CheckAttribute(errors, x, rtok2)) return;
+     attrs = new UserSuppliedAttributes(rtok, openBrace, closeBrace, args, attrs);
+  .)
+  .
+
+AtAttributes<ref Attributes attrs>
+= { AtAttribute<ref attrs> }
+  .
+
+/* After literals that start a block, we usually add this
+   Note that it will parse all at-attributes at once since expression parsing
+   return attributes parsed after them. No need to wrap in a repeat statement
+*/
+AtAttribute<ref Attributes attrs>
+= (. Token atToken = null;
+     Expression arg;
+  .)
+  "@"
+  (. atToken = t; .)
+  Expression<out arg, false, false, false>
+  (. 
+     var rtok = new SourceOrigin(atToken, t, atToken);
+     attrs = new UserSuppliedAtAttribute(rtok, arg, attrs);
   .)
   .
 
 /*------------------------------------------------------------------------*/
-Ident<out IToken/*!*/ x>
+Ident<out Token/*!*/ x>
 = (. Contract.Ensures(Contract.ValueAtReturn(out x) != null); .)
   ( ident
   | "least"      (. t.kind = _ident; .) // convert it to an ident
@@ -5214,6 +4638,9 @@ Ident<out IToken/*!*/ x>
   | "older"      (. t.kind = _ident; .) // convert it to an ident
   | "opaque"     (. t.kind = _ident; .) // convert it to an ident
                  (. errors.Deprecated(ErrorId.p_deprecated_opaque_as_identifier, t, "opaque is deprecated as an identifier. It will soon become a reserved word. Use a different name."); .)
+  | "hide"       (. t.kind = _ident; .) // convert it to an ident
+  | "reveal"     (. t.kind = _ident; .) // convert it to an ident
+                 
   )
   (. x = t; .)
   .
@@ -5228,7 +4655,7 @@ Ident<out IToken/*!*/ x>
 // In the third case, x and y return as the tokens for the first and second digits.
 // This parser production solves a problem where the scanner might parse a real number instead
 // of stopping at the decimal point.
-DotSuffix<out IToken x, out IToken y>
+DotSuffix<out Token x, out Token y>
 = (. Contract.Ensures(Contract.ValueAtReturn(out x) != null);
      x = Token.NoToken;
      y = null;
@@ -5297,7 +4724,7 @@ Name<out Name name>
   .
   
 // Identifier, disallowing leading underscores
-NoUSIdent<out IToken/*!*/ x>
+NoUSIdent<out Token/*!*/ x>
 = (. Contract.Ensures(Contract.ValueAtReturn(out x) != null); .)
   Ident<out x>     (. if (x.val.StartsWith("_")) {
                         SemErr(ErrorId.p_no_leading_underscore_2, x, 
@@ -5307,7 +4734,7 @@ NoUSIdent<out IToken/*!*/ x>
   .
 
 /*------------------------------------------------------------------------*/
-IdentOrDigits<out IToken id>
+IdentOrDigits<out Token id>
 = (. id = Token.NoToken; .)
   ( Ident<out id>
   | digits         (. id = t; .)
@@ -5316,11 +4743,11 @@ IdentOrDigits<out IToken id>
 
 /*------------------------------------------------------------------------*/
 NoDigitName<out Name x>
-       = (. IToken t; .)
+       = (. Token t; .)
          NoUSIdentOrDigits<out t> (. x = new Name(t); .)
          .
          
-NoUSIdentOrDigits<out IToken id>
+NoUSIdentOrDigits<out Token id>
 = (. id = Token.NoToken; .)
   ( NoUSIdent<out id>
   | digits         (. id = t; .)
@@ -5328,7 +4755,7 @@ NoUSIdentOrDigits<out IToken id>
   .
 
 /*------------------------------------------------------------------------*/
-MemberBindingUpdate<out IToken id, out Expression e>
+MemberBindingUpdate<out Token id, out Expression e>
 = (. id = Token.NoToken; e = dummyExpr; .)
   NoUSIdentOrDigits<out id>
   ":="
@@ -5336,7 +4763,7 @@ MemberBindingUpdate<out IToken id, out Expression e>
   .
 
 /*------------------------------------------------------------------------*/
-LabelName<out IToken id>
+LabelName<out Token id>
 = NoUSIdentOrDigits<out id>
   .
 
@@ -5346,7 +4773,7 @@ MethodFunctionName<out Name name>
   .
 
 /*------------------------------------------------------------------------*/
-TypeNameOrCtorSuffix<out IToken id>
+TypeNameOrCtorSuffix<out Token id>
 = (. id = Token.NoToken; .)
   IdentOrDigits<out id>
   .
@@ -5357,9 +4784,9 @@ WildIdentN<out Name name, bool allowWildcardId>
 = WildIdent<out var x, allowWildcardId>     (. name = new Name(x); .) .
   
 // Identifier, disallowing leading underscores, except possibly the "wildcard" identifier "_"
-WildIdent<out IToken x, bool allowWildcardId>
+WildIdent<out Token x, bool allowWildcardId>
 = (. Contract.Ensures(Contract.ValueAtReturn(out x) != null); .)
-  Ident<out x>     (. x = t.WithVal(UnwildIdent(t, allowWildcardId)); .)
+  Ident<out x>     (. x = (Token)t.WithVal(UnwildIdent(t, allowWildcardId)); .)
   .
 
 /*------------------------------------------------------------------------*/
@@ -5413,4 +4840,4 @@ Dec<out BaseTypes.BigDec d>
   .
 
 /*------------------------------------------------------------------------*/
-END Dafny.
+END Dafny.
\ No newline at end of file
diff --git a/Source/DafnyCore/DafnyConsolePrinter.cs b/Source/DafnyCore/DafnyConsolePrinter.cs
index 31d05c7c133..46e5e233631 100644
--- a/Source/DafnyCore/DafnyConsolePrinter.cs
+++ b/Source/DafnyCore/DafnyConsolePrinter.cs
@@ -1,14 +1,25 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.CommandLine;
 using System.IO;
 using System.Linq;
 using DafnyCore;
 using Microsoft.Boogie;
+using VC;
 
 namespace Microsoft.Dafny;
 
+public record AssertCmdPartialCopy(Boogie.IToken Tok, string Description, string Id);
+public record VerificationRunResultPartialCopy(
+  int VCNum,
+  DateTime StartTime,
+  TimeSpan RunTime,
+  SolverOutcome Outcome,
+  List<AssertCmdPartialCopy> Asserts,
+  IEnumerable<TrackedNodeComponent> CoveredElements,
+  IEnumerable<Axiom> AvailableAxioms,
+  int ResourceCount);
+
 public class DafnyConsolePrinter : ConsolePrinter {
   public new DafnyOptions Options {
     get => options;
@@ -18,9 +29,38 @@ public class DafnyConsolePrinter : ConsolePrinter {
     }
   }
 
-  private readonly ConcurrentDictionary<string, List<string>> fsCache = new();
   private DafnyOptions options;
-  public ConcurrentBag<(Implementation, VerificationResult)> VerificationResults { get; } = new();
+
+  public record ImplementationLogEntry(string Name, Boogie.IToken Tok);
+  public record VerificationResultLogEntry(
+    VcOutcome Outcome,
+    TimeSpan RunTime,
+    int ResourceCount,
+    List<VerificationRunResultPartialCopy> VCResults,
+    List<Counterexample> Counterexamples);
+  public record ConsoleLogEntry(ImplementationLogEntry Implementation, VerificationResultLogEntry Result);
+
+  public static VerificationResultLogEntry DistillVerificationResult(ImplementationRunResult verificationResult) {
+    return new VerificationResultLogEntry(
+      verificationResult.VcOutcome, verificationResult.End - verificationResult.Start,
+      verificationResult.ResourceCount, verificationResult.RunResults.Select(DistillVCResult).ToList(), verificationResult.Errors);
+  }
+
+  public static VerificationRunResultPartialCopy DistillVCResult(VerificationRunResult r) {
+    return new VerificationRunResultPartialCopy(r.VcNum, r.StartTime, r.RunTime, r.Outcome,
+        r.Asserts.Select(a => new AssertCmdPartialCopy(a.tok, a.Description.SuccessDescription, GetId(a))).ToList(), r.CoveredElements,
+        r.DeclarationsAfterPruning.OfType<Axiom>(), r.ResourceCount);
+
+    string GetId(ICarriesAttributes construct) {
+      var values = construct.FindAllAttributes("id");
+      if (!values.Any()) {
+        return "";
+      }
+      return (string)values.Last().Params.First();
+    }
+  }
+
+  public ConcurrentBag<ConsoleLogEntry> VerificationResults { get; } = new();
 
   public override void AdvisoryWriteLine(TextWriter output, string format, params object[] args) {
     if (output == Console.Out) {
@@ -33,57 +73,13 @@ public override void AdvisoryWriteLine(TextWriter output, string format, params
     }
   }
 
-  private string GetFileLine(string filename, int lineIndex) {
-    List<string> lines = fsCache.GetOrAdd(filename, key => {
-      try {
-        // Note: This is not guaranteed to be the same file that Dafny parsed. To ensure that, Dafny should keep
-        // an in-memory version of each file it parses.
-        lines = File.ReadLines(filename).ToList();
-      } catch (Exception) {
-        lines = new List<string>();
-      }
-      return lines;
-    });
-    if (0 <= lineIndex && lineIndex < lines.Count) {
-      return lines[lineIndex];
-    }
-    return "<nonexistent line>";
-  }
-
-  public void WriteSourceCodeSnippet(IToken tok, TextWriter tw) {
-    string line = GetFileLine(tok.Filepath, tok.line - 1);
-    string lineNumber = tok.line.ToString();
-    string lineNumberSpaces = new string(' ', lineNumber.Length);
-    string columnSpaces = new string(' ', tok.col - 1);
-    var lineStartPos = tok.pos - tok.col + 1;
-    var lineEndPos = lineStartPos + line.Length;
-    var tokEndPos = tok.pos + tok.val.Length;
-    var underlineLength = Math.Max(1, Math.Min(tokEndPos - tok.pos, lineEndPos - tok.pos));
-    string underline = new string('^', underlineLength);
-    tw.WriteLine($"{lineNumberSpaces} |");
-    tw.WriteLine($"{lineNumber} | {line}");
-    tw.WriteLine($"{lineNumberSpaces} | {columnSpaces}{underline}");
-    tw.WriteLine("");
-  }
-
-  public static readonly Option<bool> ShowSnippets = new("--show-snippets", () => true,
-    "Show a source code snippet for each Dafny message.");
 
-  static DafnyConsolePrinter() {
-    DooFile.RegisterNoChecksNeeded(ShowSnippets);
-  }
 
   public DafnyConsolePrinter(DafnyOptions options) {
     Options = options;
   }
 
   public override void ReportBplError(Boogie.IToken tok, string message, bool error, TextWriter tw, string category = null) {
-    // Dafny has 0-indexed columns, but Boogie counts from 1
-    var realigned_tok = new Boogie.Token(tok.line, tok.col - 1);
-    realigned_tok.kind = tok.kind;
-    realigned_tok.pos = tok.pos;
-    realigned_tok.val = tok.val;
-    realigned_tok.filename = tok.filename;
 
     if (Options.Verbosity == CoreOptions.VerbosityLevel.Silent) {
       return;
@@ -93,7 +89,8 @@ public override void ReportBplError(Boogie.IToken tok, string message, bool erro
       message = $"{category}: {message}";
     }
 
-    message = $"{tok.TokenToString(Options)}: {message}";
+    var dafnyToken = BoogieGenerator.ToDafnyToken(options.Get(Snippets.ShowSnippets), tok);
+    message = $"{dafnyToken.TokenToString(Options)}: {message}";
 
     if (error) {
       ErrorWriteLine(tw, message);
@@ -101,21 +98,21 @@ public override void ReportBplError(Boogie.IToken tok, string message, bool erro
       tw.WriteLine(message);
     }
 
-    if (Options.Get(ShowSnippets)) {
-      if (tok is IToken dafnyTok) {
-        WriteSourceCodeSnippet(dafnyTok, tw);
+    if (Options.Get(Snippets.ShowSnippets)) {
+      if (tok is IOrigin dafnyTok) {
+        Snippets.WriteSourceCodeSnippet(Options, dafnyTok, tw);
       } else {
         ErrorWriteLine(tw, "No Dafny location information, so snippet can't be generated.");
       }
     }
 
-    if (tok is Dafny.NestedToken) {
-      var nt = (Dafny.NestedToken)tok;
-      ReportBplError(nt.Inner, "Related location", false, tw);
+    if (tok is NestedOrigin nestedToken) {
+      ReportBplError(nestedToken.Inner, "Related location", false, tw);
     }
   }
 
-  public override void ReportEndVerifyImplementation(Implementation implementation, Boogie.VerificationResult result) {
-    VerificationResults.Add((implementation, result));
+  public override void ReportEndVerifyImplementation(Implementation implementation, ImplementationRunResult result) {
+    var impl = new ImplementationLogEntry(implementation.VerboseName, implementation.tok);
+    VerificationResults.Add(new ConsoleLogEntry(impl, DistillVerificationResult(result)));
   }
-}
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/DafnyCore.csproj b/Source/DafnyCore/DafnyCore.csproj
index 49ad7566759..56f845c656d 100644
--- a/Source/DafnyCore/DafnyCore.csproj
+++ b/Source/DafnyCore/DafnyCore.csproj
@@ -17,23 +17,26 @@
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <OutputPath>..\..\Binaries\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <TargetFramework>net6.0</TargetFramework>
+    <RollForward>Major</RollForward>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     
-    <NoWarn>$(NoWarn);NU5104</NoWarn> <!-- Required because System.CommandLine is in beta. -->
+    <NoWarn>$(NoWarn);NU5104;CS8981</NoWarn>
+    <!-- NU5104 required because System.CommandLine is in beta. -->
+    <!-- CS8981 required because Dafny code can use lowercase type names -->
     <IsPackable>true</IsPackable>
   </PropertyGroup>
   
   <ItemGroup>
       <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
-      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
       <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0" />
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
+      <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.5" />
+      <PackageReference Include="Serilog" Version="2.12.0" />
       <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
       <PackageReference Include="System.Runtime.Numerics" Version="4.3.0" />
-      <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
-      <PackageReference Include="Boogie.ExecutionEngine" Version="3.0.0" />
-      <PackageReference Include="Tomlyn" Version="0.16.2" />
+      <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
+      <PackageReference Include="Boogie.ExecutionEngine" Version="3.4.3" />
+      <PackageReference Include="Tomlyn" Version="0.17.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/DafnyCore/DafnyFile.cs b/Source/DafnyCore/DafnyFile.cs
index cabba34701e..180ddd2c298 100644
--- a/Source/DafnyCore/DafnyFile.cs
+++ b/Source/DafnyCore/DafnyFile.cs
@@ -1,95 +1,263 @@
+#nullable enable
+
 using System;
 using System.Collections.Generic;
+using System.CommandLine;
 using System.IO;
-using System.Linq;
+using System.Reflection;
 using System.Reflection.Metadata;
 using System.Reflection.PortableExecutable;
+using System.Threading.Tasks;
+using DafnyAssembly;
 using DafnyCore;
+using DafnyCore.Options;
 
 namespace Microsoft.Dafny;
 
 public class DafnyFile {
-  public string FilePath { get; private set; }
-  public string CanonicalPath { get; private set; }
+  public const string DafnyFileExtension = ".dfy";
+  public string FilePath => CanonicalPath;
+  public string Extension { get; private set; }
+  public string CanonicalPath { get; }
   public string BaseName { get; private set; }
-  public bool IsPreverified { get; set; }
-  public bool IsPrecompiled { get; set; }
-  public TextReader Content { get; set; }
-  public Uri Uri { get; }
+  public bool ShouldNotVerify { get; private set; }
+  public bool ShouldNotCompile { get; private set; }
+  public DafnyOptions FileOptions { get; private set; }
+  public Func<FileSnapshot> GetContent { get; set; }
+  public Uri Uri { get; private set; }
+  public IOrigin? Origin { get; }
 
-  public DafnyFile(DafnyOptions options, Uri uri, TextReader contentOverride = null) {
-    Uri = uri;
-    var filePath = uri.LocalPath;
+  private static readonly Dictionary<Uri, Uri> ExternallyVisibleEmbeddedFiles = new();
+
+  static DafnyFile() {
+    OptionRegistry.RegisterGlobalOption(DoNotVerifyDependencies, OptionCompatibility.OptionLibraryImpliesLocalError);
+  }
+
+  public static Uri ExposeInternalUri(string externalName, Uri internalUri) {
+    var externalUri = new Uri("dafny:" + externalName);
+    ExternallyVisibleEmbeddedFiles[externalUri] = internalUri;
+    return externalUri;
+  }
+
+  public delegate IAsyncEnumerable<DafnyFile> HandleExtension(DafnyOptions options, IFileSystem
+    fileSystem, ErrorReporter reporter, Uri uri, IOrigin origin, bool asLibrary);
+
+  private static readonly Dictionary<string, HandleExtension> ExtensionHandlers = new();
+
+  public static void RegisterExtensionHandler(string extension, HandleExtension handler) {
+    ExtensionHandlers[extension] = handler;
+  }
+
+  public static async IAsyncEnumerable<DafnyFile> CreateAndValidate(IFileSystem fileSystem,
+    ErrorReporter reporter,
+    DafnyOptions options, Uri uri, IOrigin? uriOrigin,
+    bool asLibrary = false, string? errorOnNotRecognized = null) {
 
-    var extension = ".dfy";
+    var embeddedFile = ExternallyVisibleEmbeddedFiles.GetValueOrDefault(uri);
+    if (embeddedFile != null) {
+      var embeddedResults = CreateAndValidate(fileSystem, reporter, options, embeddedFile, uriOrigin, asLibrary, errorOnNotRecognized);
+      await foreach (var result in embeddedResults) {
+        result.Uri = uri;
+        yield return result;
+      }
+      yield break;
+    }
+
+    uriOrigin ??= Token.NoToken;
+
+    string extension;
     if (uri.IsFile) {
       extension = Path.GetExtension(uri.LocalPath).ToLower();
-      BaseName = Path.GetFileName(uri.LocalPath);
-    }
-    if (uri.Scheme == "stdin") {
-      contentOverride = options.Input;
-      BaseName = "<stdin>";
-    }
-
-    // Normalizing symbolic links appears to be not
-    // supported in .Net APIs, because it is very difficult in general
-    // So we will just use the absolute path, lowercased for all file systems.
-    // cf. IncludeComparer.CompareTo
-    CanonicalPath = contentOverride == null ? Canonicalize(filePath).LocalPath : "<stdin>";
-    FilePath = CanonicalPath;
-
-    var filePathForErrors = options.UseBaseNameForFileName ? Path.GetFileName(filePath) : filePath;
-    if (contentOverride != null) {
-      IsPreverified = false;
-      IsPrecompiled = false;
-      Content = contentOverride;
-    } else if (extension == ".dfy" || extension == ".dfyi") {
-      IsPreverified = false;
-      IsPrecompiled = false;
-      if (!File.Exists(filePath)) {
-        if (0 < options.VerifySnapshots) {
-          // For snapshots, we first create broken DafnyFile without content,
-          // then look for the real files and create DafnuFiles for them.
-          // TODO prevent creating the broken DafnyFiles for snapshots
-          return;
-        }
+    } else if (uri.Scheme == "dllresource") {
+      extension = Path.GetExtension(uri.LocalPath).ToLower();
+    } else {
+      extension = DafnyFileExtension;
+    }
 
-        options.Printer.ErrorWriteLine(options.OutputWriter, $"*** Error: file {filePathForErrors} not found");
-        throw new IllegalDafnyFile(true);
-      } else {
-        Content = new StreamReader(filePath);
+    if (uri.Scheme == "untitled" || extension == DafnyFileExtension || extension == ".dfyi") {
+      var file = HandleDafnyFile(fileSystem, reporter, options, uri, uriOrigin, asLibrary);
+      if (file != null) {
+        yield return file;
       }
-    } else if (extension == ".doo") {
-      IsPreverified = true;
-      IsPrecompiled = false;
+      yield break;
+    }
 
-      if (!File.Exists(filePath)) {
-        options.Printer.ErrorWriteLine(options.OutputWriter, $"*** Error: file {filePathForErrors} not found");
-        throw new IllegalDafnyFile(true);
+    if (extension == DooFile.Extension) {
+      await foreach (var dooResult in HandleDooFile(fileSystem, reporter, options, uri, uriOrigin, asLibrary)) {
+        yield return dooResult;
       }
-      var dooFile = DooFile.Read(filePath);
-      if (!dooFile.Validate(filePathForErrors, options, options.CurrentCommand)) {
-        throw new IllegalDafnyFile(true);
+      yield break;
+    }
+
+    if (extension == ".dll") {
+      var dllResult = HandleDll(options, uri, uriOrigin);
+      if (dllResult != null) {
+        yield return dllResult;
+      }
+      yield break;
+    }
+
+    var handler = ExtensionHandlers.GetValueOrDefault(extension);
+    if (handler != null) {
+      await foreach (var result in handler(options, fileSystem, reporter, uri, uriOrigin, asLibrary)) {
+        yield return result;
+      }
+      yield break;
+    }
+    if (errorOnNotRecognized != null) {
+      reporter.Error(MessageSource.Project, Token.Cli, errorOnNotRecognized);
+    }
+  }
+
+  public static readonly Option<bool> DoNotVerifyDependencies = new("--dont-verify-dependencies",
+    "Allows Dafny to accept dependencies that may not have been previously verified, which can be useful during development.");
+
+  public static DafnyFile? HandleDafnyFile(IFileSystem fileSystem,
+    ErrorReporter reporter,
+    DafnyOptions options,
+    Uri uri, IOrigin origin, bool asLibrary = false, bool warnLibrary = true) {
+    string canonicalPath;
+    string baseName;
+    if (uri.IsFile) {
+      baseName = Path.GetFileName(uri.LocalPath);
+      // Normalizing symbolic links appears to be not
+      // supported in .Net APIs, because it is very difficult in general
+      // So we will just use the absolute path, lowercased for all file systems.
+      // cf. IncludeComparer.CompareTo
+      canonicalPath = Canonicalize(uri.LocalPath).LocalPath;
+    } else {
+      canonicalPath = "";
+      baseName = "";
+    }
+
+    var filePath = uri.LocalPath;
+    if (!fileSystem.Exists(uri)) {
+      if (0 < options.VerifySnapshots) {
+        // For snapshots, we first create broken DafnyFile without content,
+        // then look for the real files and create DafnuFiles for them.
+        return new DafnyFile(DafnyFileExtension, canonicalPath, baseName, null!, uri, origin, null!);
+      }
+
+      reporter.Error(MessageSource.Project, origin, $"file {options.GetPrintPath(filePath)} not found");
+      return null;
+    }
+
+    if (!options.Get(DoNotVerifyDependencies) && asLibrary && warnLibrary) {
+      reporter.Warning(MessageSource.Project, "", origin,
+        $"The file '{options.GetPrintPath(filePath)}' was passed to --library. " +
+        $"Verification for that file might have used options incompatible with the current ones, or might have been skipped entirely. " +
+        $"Use a .doo file to enable Dafny to check that compatible options were used");
+    }
+
+    return new DafnyFile(DafnyFileExtension, canonicalPath, baseName, () => fileSystem.ReadFile(uri), uri, origin, options) {
+      ShouldNotCompile = asLibrary,
+      ShouldNotVerify = asLibrary,
+    };
+  }
+
+  public static DafnyFile HandleStandardInput(DafnyOptions options, IOrigin origin) {
+    return new DafnyFile(DafnyFileExtension, "<stdin>", "<stdin>",
+      () => new FileSnapshot(options.Input, null), new Uri("stdin:///"), origin, options) {
+      ShouldNotCompile = false,
+      ShouldNotVerify = false,
+    };
+  }
+
+  /// <summary>
+  /// Technically only for C#, this is for backwards compatability
+  /// </summary>
+  private static DafnyFile? HandleDll(DafnyOptions parseOptions, Uri uri, IOrigin origin) {
+
+    string baseName;
+    string canonicalPath;
+    if (uri.IsFile) {
+      baseName = Path.GetFileName(uri.LocalPath);
+      // Normalizing symbolic links appears to be not
+      // supported in .Net APIs, because it is very difficult in general
+      // So we will just use the absolute path, lowercased for all file systems.
+      // cf. IncludeComparer.CompareTo
+      canonicalPath = Canonicalize(uri.LocalPath).LocalPath;
+    } else {
+      canonicalPath = "";
+      baseName = "";
+    }
+
+    var filePath = uri.LocalPath;
+    var sourceText = GetDafnySourceAttributeText(filePath);
+    if (sourceText == null) {
+      return null;
+    }
+
+    return new DafnyFile(".dll", canonicalPath, baseName,
+      () => new FileSnapshot(new StringReader(sourceText), null), uri, origin, parseOptions) {
+      ShouldNotCompile = true,
+      ShouldNotVerify = true,
+    };
+  }
+
+  public delegate Task<int> Executor(TextWriter outputWriter, TextWriter errorWriter, string[] arguments);
+
+  public static async IAsyncEnumerable<DafnyFile> HandleDooFile(IFileSystem fileSystem,
+    ErrorReporter reporter,
+    DafnyOptions options,
+    Uri uri, IOrigin origin, bool asLibrary) {
+    DooFile dooFile;
+    var filePath = uri.LocalPath;
+
+    if (uri.Scheme == "dllresource") {
+      var assembly = Assembly.Load(uri.Host);
+      // Skip the leading "/"
+      var resourceName = uri.LocalPath[1..];
+      await using var stream = assembly.GetManifestResourceStream(resourceName);
+      if (stream is null) {
+        throw new Exception($"Cannot find embedded resource: {resourceName}");
       }
 
-      // For now it's simpler to let the rest of the pipeline parse the
-      // program text back into the AST representation.
-      // At some point we'll likely want to serialize a program
-      // more efficiently inside a .doo file, at which point
-      // the DooFile class should encapsulate the serialization logic better
-      // and expose a Program instead of the program text.
-      Content = new StringReader(dooFile.ProgramText);
-    } else if (extension == ".dll") {
-      IsPreverified = true;
-      // Technically only for C#, this is for backwards compatability
-      IsPrecompiled = true;
-
-      var sourceText = GetDafnySourceAttributeText(filePath);
-      if (sourceText == null) { throw new IllegalDafnyFile(); }
-      Content = new StringReader(sourceText);
+      dooFile = await DooFile.Read(stream);
     } else {
-      throw new IllegalDafnyFile();
+      if (!fileSystem.Exists(uri)) {
+        reporter.Error(MessageSource.Project, origin, $"file {options.GetPrintPath(filePath)} not found");
+        yield break;
+      }
+
+      try {
+        dooFile = await DooFile.Read(filePath);
+      } catch (InvalidDataException) {
+        reporter.Error(MessageSource.Project, origin, $"malformed doo file {options.GetPrintPath(filePath)}");
+        yield break;
+      } catch (ArgumentException e) {
+        reporter.Error(MessageSource.Project, origin, e.Message);
+        yield break;
+      }
+    }
+
+    var validDooOptions = dooFile.Validate(reporter, uri, options, origin);
+    if (validDooOptions == null) {
+      yield break;
     }
+
+    // For now it's simpler to let the rest of the pipeline parse the
+    // program text back into the AST representation.
+    // At some point we'll likely want to serialize a program
+    // more efficiently inside a .doo file, at which point
+    // the DooFile class should encapsulate the serialization logic better
+    // and expose a Program instead of the program text.
+    yield return new DafnyFile(DooFile.Extension, Canonicalize(uri.LocalPath).LocalPath, Path.GetFileName(uri.LocalPath),
+      () => new FileSnapshot(new StringReader(dooFile.ProgramText), null), uri, origin, validDooOptions) {
+      ShouldNotCompile = asLibrary,
+      ShouldNotVerify = true,
+    };
+  }
+
+  protected DafnyFile(string extension, string canonicalPath, string baseName,
+    Func<FileSnapshot> getContent, Uri uri, IOrigin? origin, DafnyOptions fileOptions) {
+    Extension = extension;
+    CanonicalPath = canonicalPath;
+    BaseName = baseName;
+    GetContent = getContent;
+    Uri = uri;
+    Origin = origin;
+    FileOptions = fileOptions;
   }
 
   // Returns a canonical string for the given file path, namely one which is the same
@@ -97,9 +265,9 @@ public DafnyFile(DafnyOptions options, Uri uri, TextReader contentOverride = nul
   // make the path absolute -- detecting case and canonicalizing symbolic and hard
   // links are difficult across file systems (which may mount parts of other filesystems,
   // with different characteristics) and is not supported by .Net libraries
-  public static Uri Canonicalize(string filePath) {
+  public static Uri Canonicalize(string? filePath) {
     if (filePath == null || !filePath.StartsWith("file:")) {
-      return new Uri(Path.GetFullPath(filePath));
+      return new Uri(Path.GetFullPath(filePath!));
     }
 
     if (Uri.IsWellFormedUriString(filePath, UriKind.RelativeOrAbsolute)) {
@@ -128,71 +296,22 @@ public static List<string> FileNames(IReadOnlyList<DafnyFile> dafnyFiles) {
     return sourceFiles;
   }
 
-  private static string GetDafnySourceAttributeText(string dllPath) {
+  private static string? GetDafnySourceAttributeText(string dllPath) {
     if (!File.Exists(dllPath)) {
-      throw new IllegalDafnyFile();
+      return null;
     }
-    using var dllFs = new FileStream(dllPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-    using var dllPeReader = new PEReader(dllFs);
-    var dllMetadataReader = dllPeReader.GetMetadataReader();
 
-    foreach (var attrHandle in dllMetadataReader.CustomAttributes) {
-      var attr = dllMetadataReader.GetCustomAttribute(attrHandle);
-      try {
-        /* The cast from EntityHandle to MemberReferenceHandle is overriden, uses private members, and throws
-         * an InvalidCastException if it fails. We have no other option than to use it and catch the exception.
-         */
-        var constructor = dllMetadataReader.GetMemberReference((MemberReferenceHandle)attr.Constructor);
-        var attrType = dllMetadataReader.GetTypeReference((TypeReferenceHandle)constructor.Parent);
-        if (dllMetadataReader.GetString(attrType.Name) == "DafnySourceAttribute") {
-          var decoded = attr.DecodeValue(new StringOnlyCustomAttributeTypeProvider());
-          return (string)decoded.FixedArguments[0].Value;
-        }
-      } catch (InvalidCastException) {
-        // Ignore - the Handle casts are handled as custom explicit operators,
-        // and there's no way I can see to test if the cases will succeed ahead of time.
+    try {
+      var assembly = Assembly.LoadFile(dllPath);
+
+      foreach (DafnySourceAttribute attr in assembly.GetCustomAttributes(typeof(DafnySourceAttribute), true)) {
+        return attr.dafnySourceText;
       }
+    } catch (Exception) {
+      // ignored
     }
 
     return null;
   }
 
-  // Dummy implementation of ICustomAttributeTypeProvider, providing just enough
-  // functionality to successfully decode a DafnySourceAttribute value.
-  private class StringOnlyCustomAttributeTypeProvider : ICustomAttributeTypeProvider<System.Type> {
-    public System.Type GetPrimitiveType(PrimitiveTypeCode typeCode) {
-      if (typeCode == PrimitiveTypeCode.String) {
-        return typeof(string);
-      }
-      throw new NotImplementedException();
-    }
-
-    public System.Type GetTypeFromDefinition(MetadataReader reader, TypeDefinitionHandle handle, byte rawTypeKind) {
-      throw new NotImplementedException();
-    }
-
-    public System.Type GetTypeFromReference(MetadataReader reader, TypeReferenceHandle handle, byte rawTypeKind) {
-      throw new NotImplementedException();
-    }
-
-    public System.Type GetSZArrayType(System.Type elementType) {
-      throw new NotImplementedException();
-    }
-
-    public System.Type GetSystemType() {
-      throw new NotImplementedException();
-    }
-
-    public System.Type GetTypeFromSerializedName(string name) {
-      throw new NotImplementedException();
-    }
-
-    public PrimitiveTypeCode GetUnderlyingEnumType(System.Type type) {
-      throw new NotImplementedException();
-    }
-
-    public bool IsSystemType(System.Type type) {
-      throw new NotImplementedException();
-    }
-  }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/DafnyGeneratedFromDafny.sh b/Source/DafnyCore/DafnyGeneratedFromDafny.sh
old mode 100644
new mode 100755
index 95f6bcf3872..44210dad646
--- a/Source/DafnyCore/DafnyGeneratedFromDafny.sh
+++ b/Source/DafnyCore/DafnyGeneratedFromDafny.sh
@@ -1,15 +1,23 @@
-#! /bin/bash
+#! /usr/bin/env bash
 # Until we get proper dependency to previous Dafny, you have to generate the file GeneratedFromDafny.cs
 # To remove this manual build process, when it will be appropriate:
 # 1. Delete the file GeneratedFromDafny.cs
-# 2. Add a dependcy to 
+# 2. Add a dependency to 
 #      <PackageReference Include="dafny.msbuild" Version="1.0.0" />
-# That's it! The same file will now be automatically generated as obj/Debug/net6.0/GeneratedFromDafny.cs
+# That's it! The same file will now be automatically generated as obj/Debug/net8.0/GeneratedFromDafny.cs
 # 3. Remove the following dependencies that are being taken care by dafny-msbuild
 #       <PackageReference Include="Microsoft.Build.Framework" Version="16.5.0" PrivateAssets="All" />
 #       <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.5.0" PrivateAssets="All" />
 #       <PackageReference Include="System.Linq.Parallel" Version="4.3.0" PrivateAssets="All" />
 
+# If the argument --no-verify is passed to the script, we pop it and will pass it to the dafny command below
+if [ "$#" != 0 ] && [ "$1" == "--no-verify" ]; then
+  noverify="--no-verify"
+  shift
+else
+  noverify=""
+fi
+  
 # If an argument is passed to the script, store it in this variable. Otherwise use the default "GeneratedFromDafny.cs"
 # Something like output = if no arguments then  "GeneratedFromDafny.cs" else first argument
 
@@ -19,20 +27,10 @@ else
   output="GeneratedFromDafny"
 fi
 
-../../Scripts/dafny translate cs --output $output.cs AST/Formatting.dfy
-../../Scripts/dafny translate cs --output "${output}Rust.cs" Compilers/Rust/Dafny-compiler-rust.dfy
-python3 -c "
-import re
-with open ('$output.cs', 'r' ) as f:
-  content = f.read()
-  content_new = re.sub('\\[assembly[\\s\\S]*?(?=namespace Formatting)|namespace\\s+\\w+\\s*\\{\\s*\\}\\s*//.*|_\\d_', '', content, flags = re.M)
-with open('$output.cs', 'w') as w:
-  w.write(content_new)
+../../Scripts/dafny translate cs dfyconfig.toml --output $output.cs $noverify
+# Exit with error code if the previous command fails
+if [ $? -ne 0 ]; then
+  exit 1
+fi
 
-with open ('${output}Rust.cs', 'r' ) as f:
-  content = f.read()
-  content_new = re.sub('\\[assembly[\\s\\S]*?(?=namespace DAST)|namespace\\s+\\w+\\s*\\{\\s*\\}\\s*//.*|_\\d_', '', content, flags = re.M)
-with open('${output}Rust.cs', 'w') as w:
-  w.write(content_new)
-"
-dotnet tool run dotnet-format -w --include $output.cs ${output}Rust.cs
+python3 DafnyGeneratedFromDafnyPost.py $output
\ No newline at end of file
diff --git a/Source/DafnyCore/DafnyGeneratedFromDafnyPost.py b/Source/DafnyCore/DafnyGeneratedFromDafnyPost.py
new file mode 100644
index 00000000000..9486726fc45
--- /dev/null
+++ b/Source/DafnyCore/DafnyGeneratedFromDafnyPost.py
@@ -0,0 +1,88 @@
+import re
+import os
+import sys
+# Define output as the first command-line argument
+output = sys.argv[1]
+
+# We will remove all the namespaces Std.* except Std.Wrappers
+# Also, we will replace every Dafny.HaltException("Backends\\Rust\\ by Dafny.HaltException("Backends/Rust/
+# to ensure the source is built the same on linux
+# It requires 16 backslashes for escaping because
+# - 2 as there are two backslashes
+# - 2 as it's a bash string
+# - 2 as it's a python string
+# - 2 as it's an escaped backslash
+# Last step is to split the generated file by namespace and put each in a separate directory inside Generated/
+# according to the namespace. It will make formatting easier.
+
+# test if the file exists before opening it. If not, fail gracefully
+if not os.path.exists(output + '.cs'):
+  print(f"File {output}.cs was not generated. Fix issues and re-run ./DafnyGeneratedFromDafny.sh")
+  exit()
+
+if os.path.exists(output + '-cs.dtr'):
+    os.remove(output + '-cs.dtr')
+    print("File deleted: " + output + '-cs.dtr')
+
+with open(output + '.cs', 'r' ) as f:
+  content = f.read()
+  content_trimmed = re.sub('\[assembly[\s\S]*?(?=namespace Formatting)|namespace\s+\w+\s*\{\s*\}\s*//.*', '', content, flags = re.M)
+  content_new = re.sub('\r?\nnamespace\s+(Std\.(?!Wrappers)(?!Strings)(?!Collections.Seq)(?!Arithmetic)(?!Math)\S+)\s*\{[\s\S]*?\}\s*// end of namespace \\1', '', content_trimmed, flags = re.M)
+  content_new = re.sub('Backends\\\\\\\\Rust\\\\\\\\', 'Backends/Rust/', content_new, flags = re.M)
+
+  # Any test looking like "  if()"
+
+  test_output = "../DafnyCore.Test/"
+
+  if not os.path.exists(output):
+    os.makedirs(output)
+  
+  if not os.path.exists(test_output+output):
+    os.makedirs(test_output+output)
+
+  prelude_match = re.match(r'(.*?)\nnamespace', content_new, re.DOTALL)
+  prelude = prelude_match.group(1).strip() if prelude_match else ""
+  prelude = (prelude +
+    "\n#pragma warning disable CS0164 // This label has not been referenced" +
+    "\n#pragma warning disable CS0162 // Unreachable code detected" +
+    "\n#pragma warning disable CS1717 // Assignment made to same variable")
+
+  # Define a regular expression to match the prelude and namespace blocks
+  pattern = re.compile(r'(namespace\s+([\w.]+)\s*{[\s\S]*?}\s*//\s*end\s*of\s*namespace\s+\2)')
+  # Find the prelude and namespace blocks
+  matches = pattern.findall(content_new)
+
+  # Iterate over matches and create files for each namespace
+  for match in matches:
+    namespace_content = match[0]  # Entire namespace block
+    namespace_name = match[1]
+    file_content = f"{prelude}\n\n{namespace_content}"
+
+    # If the name of the namespace ends with "coverage", we move this test
+    # to ../DafnyCore.Test/{output}/....
+    file_path_prefix = ""
+    if namespace_name.endswith("Coverage") or namespace_name.endswith("Test"):
+      file_path_prefix = test_output
+    
+    # Write content to a file
+    file_path = f"{file_path_prefix}{output}/{namespace_name.replace('.', '_')}.cs"  # Replace dots with underscores in file name
+    with open(file_path, 'w') as file:
+      file.write(file_content)
+
+    print(f"File generated: {file_path}")
+
+  # Special-case the FuncExtensions class, which isn't declared inside a namespace
+  func_extensions_pattern = re.compile(r'(internal\s+static\s+class\s+FuncExtensions\s*{[\s\S]*?}\s*//\s*end\s*of\s*class\s*FuncExtensions)')
+  match = func_extensions_pattern.search(content)
+  func_extensions_content = match[0]
+
+  file_content = f"{prelude}\n\n{func_extensions_content}"
+  file_path = f"{output}/FuncExtensions.cs"
+  with open(file_path, 'w') as file:
+    file.write(file_content)
+
+  print(f"File generated: {file_path}")
+
+# Now delete the file output.cs
+os.remove(output + '.cs')
+print("File deleted: " + output + '.cs')
diff --git a/Source/DafnyCore/DafnyMain.cs b/Source/DafnyCore/DafnyMain.cs
index ad53637fe1d..a7a149b0d1d 100644
--- a/Source/DafnyCore/DafnyMain.cs
+++ b/Source/DafnyCore/DafnyMain.cs
@@ -9,25 +9,23 @@
 using System.IO;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using DafnyCore;
 using Microsoft.Boogie;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Microsoft.Dafny {
 
-  public class IllegalDafnyFile : Exception {
-    public bool ProcessingError { get; }
-
-    public IllegalDafnyFile(bool processingError = false) {
-      this.ProcessingError = processingError;
-    }
-  }
-
   public class DafnyMain {
+    public static readonly Dictionary<string, Uri> StandardLibrariesDooUriTarget = new();
+    public static readonly Uri StandardLibrariesDooUri = DafnyFile.ExposeInternalUri("DafnyStandardLibraries.dfy",
+      new("dllresource://DafnyPipeline/DafnyStandardLibraries.doo"));
+
+    static DafnyMain() {
+      foreach (var target in new[] { "cs", "java", "go", "py", "js", "notarget" }) {
+        StandardLibrariesDooUriTarget[target] = DafnyFile.ExposeInternalUri($"DafnyStandardLibraries-{target}.dfy",
+          new($"dllresource://DafnyPipeline/DafnyStandardLibraries-{target}.doo"));
+      }
+    }
 
     public static void MaybePrintProgram(Program program, string filename, bool afterResolver) {
       if (filename == null) {
@@ -37,28 +35,31 @@ public static void MaybePrintProgram(Program program, string filename, bool afte
       var tw = filename == "-" ? program.Options.OutputWriter : new StreamWriter(filename);
       var pr = new Printer(tw, program.Options, program.Options.PrintMode);
       pr.PrintProgramLargeStack(program, afterResolver);
+      if (filename != "-") {
+        tw.Dispose();
+      }
     }
 
     /// <summary>
     /// Returns null on success, or an error string otherwise.
     /// </summary>
-    public static string ParseCheck(TextReader stdIn, IReadOnlyList<DafnyFile /*!*/> /*!*/ files, string /*!*/ programName,
-        DafnyOptions options, out Program program)
+    public static async Task<(Program Program, string Error)> ParseCheck(TextReader stdIn,
+        IReadOnlyList<DafnyFile /*!*/> /*!*/ files, string /*!*/ programName,
+        DafnyOptions options)
     //modifies Bpl.options.XmlSink.*;
     {
-      string err = Parse(files, programName, options, out program);
+      var (program, err) = await Parse(files, programName, options);
       if (err != null) {
-        return err;
+        return (program, err);
       }
 
-      return Resolve(program);
+      return (program, Resolve(program));
     }
 
-    public static string Parse(IReadOnlyList<DafnyFile> files, string programName, DafnyOptions options,
-      out Program program) {
+    public static async Task<(Program Program, string Error)> Parse(IReadOnlyList<DafnyFile> files,
+      string programName, DafnyOptions options) {
       Contract.Requires(programName != null);
       Contract.Requires(files != null);
-      program = null;
 
       ErrorReporter reporter = options.DiagnosticsFormat switch {
         DafnyOptions.DiagnosticsFormats.PlainText => new ConsoleErrorReporter(options),
@@ -66,58 +67,52 @@ public static string Parse(IReadOnlyList<DafnyFile> files, string programName, D
         _ => throw new ArgumentOutOfRangeException()
       };
 
-      program = new ProgramParser().ParseFiles(programName, files, reporter, CancellationToken.None);
+      var parseResult = await new ProgramParser().ParseFiles(programName, files, reporter, CancellationToken.None);
+      var program = parseResult.Program;
       var errorCount = program.Reporter.ErrorCount;
       if (errorCount != 0) {
-        return $"{errorCount} parse errors detected in {program.Name}";
+        return (program, $"{errorCount} parse errors detected in {program.Name}");
       }
-      return null;
+      return (program, null);
     }
 
-    private static readonly TaskScheduler largeThreadScheduler =
+    public static readonly TaskScheduler LargeThreadScheduler =
       CustomStackSizePoolTaskScheduler.Create(0x10000000, Environment.ProcessorCount);
 
     public static readonly TaskFactory LargeStackFactory = new(CancellationToken.None,
-      TaskCreationOptions.DenyChildAttach, TaskContinuationOptions.None, largeThreadScheduler);
+      TaskCreationOptions.DenyChildAttach, TaskContinuationOptions.None, LargeThreadScheduler);
 
     public static string Resolve(Program program) {
       if (program.Options.NoResolve || program.Options.NoTypecheck) {
         return null;
       }
 
+      if (program.Options.Get(CommonOptionBag.GeneralNewtypes) && !program.Options.Get(CommonOptionBag.TypeSystemRefresh)) {
+        return "use of --general-newtypes requires --type-system-refresh";
+      }
+
       var programResolver = new ProgramResolver(program);
+#pragma warning disable VSTHRD002
       LargeStackFactory.StartNew(() => programResolver.Resolve(CancellationToken.None)).Wait();
+#pragma warning restore VSTHRD002
       MaybePrintProgram(program, program.Options.DafnyPrintResolvedFile, true);
 
-      if (program.Reporter.ErrorCountUntilResolver != 0) {
-        return string.Format("{0} resolution/type errors detected in {1}", program.Reporter.Count(ErrorLevel.Error),
-          program.Name);
+      var errorCount = program.Reporter.CountExceptVerifierAndCompiler(ErrorLevel.Error);
+      if (errorCount != 0) {
+        return $"{errorCount} resolution/type errors detected in {program.Name}";
       }
 
       return null; // success
     }
 
     public static async Task<(PipelineOutcome Outcome, PipelineStatistics Statistics)> BoogieOnce(
-      DafnyOptions options,
+      ErrorReporter errorReporter, DafnyOptions options,
       TextWriter output,
       ExecutionEngine engine,
       string baseFile,
       string moduleName,
-      Microsoft.Boogie.Program boogieProgram, string programId) {
+      Boogie.Program boogieProgram, string programId) {
       var moduleId = (programId ?? "main_program_id") + "_" + moduleName;
-      var z3NotFoundMessage = $@"
-Z3 not found. Please either provide a path to the `z3` executable using
-the `--solver-path <path>` option, manually place the `z3` directory
-next to the `dafny` executable you are using (this directory should
-contain `bin/z3-{DafnyOptions.DefaultZ3Version}` or `bin/z3-{DafnyOptions.DefaultZ3Version}.exe`), or set the PATH environment variable
-to also include a directory containing the `z3` executable.
-";
-
-      var proverPath = options.ProverOptions.Find(o => o.StartsWith("PROVER_PATH="));
-      if (proverPath is null && options.Verify) {
-        options.OutputWriter.WriteLine(z3NotFoundMessage);
-        return (PipelineOutcome.FatalError, new PipelineStatistics());
-      }
 
       string bplFilename;
       if (options.PrintFile != null) {
@@ -202,6 +197,5 @@ await options.OutputWriter.WriteLineAsync(
           throw new cce.UnreachableException(); // unexpected outcome
       }
     }
-
   }
 }
diff --git a/Source/DafnyCore/DafnyOptions.cs b/Source/DafnyCore/DafnyOptions.cs
index 5e859b45a87..6a043edbbeb 100644
--- a/Source/DafnyCore/DafnyOptions.cs
+++ b/Source/DafnyCore/DafnyOptions.cs
@@ -7,6 +7,7 @@
 using System.Collections.ObjectModel;
 using System.CommandLine;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.IO;
 using System.Reflection;
@@ -32,99 +33,31 @@ public enum QuantifierSyntaxOptions {
     Version4,
   }
 
-  public record Options(IDictionary<Option, object> OptionArguments, IDictionary<Argument, object> Arguments);
+  public record Options(Dictionary<Option, object> OptionArguments, Dictionary<Argument, object> Arguments);
 
   public class DafnyOptions : Bpl.CommandLineOptions {
-    public TextWriter ErrorWriter { get; }
+
+    public string GetPrintPath(string path) => UseBaseNameForFileName ? Path.GetFileName(path) : path;
+    public TextWriter ErrorWriter { get; set; }
     public TextReader Input { get; }
     public static readonly DafnyOptions Default = new(TextReader.Null, TextWriter.Null, TextWriter.Null);
 
     public IList<Uri> CliRootSourceUris = new List<Uri>();
 
     public DafnyProject DafnyProject { get; set; }
-    public Command CurrentCommand { get; set; }
-
-    static DafnyOptions() {
-      RegisterLegacyUi(CommonOptionBag.Target, ParseString, "Compilation options", "compileTarget", @"
-cs (default) - Compile to .NET via C#.
-go - Compile to Go.
-js - Compile to JavaScript.
-java - Compile to Java.
-py - Compile to Python.
-cpp - Compile to C++.
-dfy - Compile to Dafny.
-
-Note that the C++ backend has various limitations (see
-Docs/Compilation/Cpp.md). This includes lack of support for
-BigIntegers (aka int), most higher order functions, and advanced
-features like traits or co-inductive types.".TrimStart(), "cs");
-
-      RegisterLegacyUi(CommonOptionBag.OptimizeErasableDatatypeWrapper, ParseBoolean, "Compilation options", "optimizeErasableDatatypeWrapper", @"
-0 - Include all non-ghost datatype constructors in the compiled code
-1 (default) - In the compiled target code, transform any non-extern
-    datatype with a single non-ghost constructor that has a single
-    non-ghost parameter into just that parameter. For example, the type
-        datatype Record = Record(x: int)
-    is transformed into just 'int' in the target code.".TrimStart(), defaultValue: true);
-
-      RegisterLegacyUi(CommonOptionBag.Output, ParseFileInfo, "Compilation options", "out");
-      RegisterLegacyUi(CommonOptionBag.UnicodeCharacters, ParseBoolean, "Language feature selection", "unicodeChar", @"
-0 - The char type represents any UTF-16 code unit.
-1 (default) - The char type represents any Unicode scalar value.".TrimStart(), defaultValue: true);
-      RegisterLegacyUi(CommonOptionBag.TypeSystemRefresh, ParseBoolean, "Language feature selection", "typeSystemRefresh", @"
-0 (default) - The type-inference engine and supported types are those of Dafny 4.0.
-1 - Use an updated type-inference engine. Warning: This mode is under construction and probably won't work at this time.".TrimStart(), defaultValue: false);
-      RegisterLegacyUi(CommonOptionBag.GeneralTraits, ParseBoolean, "Language feature selection", "generalTraits", @"
-0 (default) - Every trait implicitly extends 'object', and thus is a reference type. Only traits and classes can extend traits.
-1 - A trait is a reference type iff it or one of its ancestor traits is 'object'. Any type with members can extend traits.".TrimStart(), false);
-      RegisterLegacyUi(CommonOptionBag.TypeInferenceDebug, ParseBoolean, "Language feature selection", "titrace", @"
-0 (default) - Don't print type-inference debug information.
-1 - Print type-inference debug information.".TrimStart(), defaultValue: false);
-      RegisterLegacyUi(CommonOptionBag.NewTypeInferenceDebug, ParseBoolean, "Language feature selection", "ntitrace", @"
-0 (default) - Don't print debug information for the new type system.
-1 - Print debug information for the new type system.".TrimStart(), defaultValue: false);
-      RegisterLegacyUi(CommonOptionBag.Plugin, ParseStringElement, "Plugins", defaultValue: new List<string>());
-      RegisterLegacyUi(CommonOptionBag.Prelude, ParseFileInfo, "Input configuration", "dprelude");
-
-      RegisterLegacyUi(CommonOptionBag.Libraries, ParseFileInfoElement, "Compilation options", defaultValue: new List<FileInfo>());
-      RegisterLegacyUi(DeveloperOptionBag.ResolvedPrint, ParseString, "Overall reporting and printing", "rprint");
-      RegisterLegacyUi(DeveloperOptionBag.Print, ParseString, "Overall reporting and printing", "dprint");
-
-      RegisterLegacyUi(DafnyConsolePrinter.ShowSnippets, ParseBoolean, "Overall reporting and printing", "showSnippets", @"
-0 (default) - Don't show source code snippets for Dafny messages.
-1 - Show a source code snippet for each Dafny message.".TrimStart());
-
-      RegisterLegacyUi(Microsoft.Dafny.Printer.PrintMode, ParsePrintMode, "Overall reporting and printing", "printMode", legacyDescription: @"
-Everything (default) - Print everything listed below.
-DllEmbed - print the source that will be included in a compiled dll.
-NoIncludes - disable printing of {:verify false} methods
-    incorporated via the include mechanism, as well as datatypes and
-    fields included from other files.
-NoGhost - disable printing of functions, ghost methods, and proof
-    statements in implementation methods. It also disables anything
-    NoIncludes disables.".TrimStart(),
-        argumentName: "Everything|DllEmbed|NoIncludes|NoGhost",
-        defaultValue: PrintModes.Everything);
-
-      void ParsePrintMode(Option<PrintModes> option, Bpl.CommandLineParseState ps, DafnyOptions options) {
-        if (ps.ConfirmArgumentCount(1)) {
-          if (ps.args[ps.i].Equals("Everything")) {
-            options.Set(option, PrintModes.Everything);
-          } else if (ps.args[ps.i].Equals("NoIncludes")) {
-            options.Set(option, PrintModes.NoIncludes);
-          } else if (ps.args[ps.i].Equals("NoGhost")) {
-            options.Set(option, PrintModes.NoGhost);
-          } else if (ps.args[ps.i].Equals("DllEmbed")) {
-            // This is called DllEmbed because it was previously only used inside Dafny-compiled .dll files for C#,
-            // but it is now used by the LibraryBackend when building .doo files as well. 
-            options.Set(option, PrintModes.Serialization);
-          } else {
-            InvalidArgumentError(option.Name, ps);
-          }
+
+    public static void ParseDefaultFunctionOpacity(Option<CommonOptionBag.DefaultFunctionOpacityOptions> option, Bpl.CommandLineParseState ps, DafnyOptions options) {
+      if (ps.ConfirmArgumentCount(1)) {
+        if (ps.args[ps.i].Equals("transparent")) {
+          options.Set(option, CommonOptionBag.DefaultFunctionOpacityOptions.Transparent);
+        } else if (ps.args[ps.i].Equals("autoRevealDependencies")) {
+          options.Set(option, CommonOptionBag.DefaultFunctionOpacityOptions.AutoRevealDependencies);
+        } else if (ps.args[ps.i].Equals("opaque")) {
+          options.Set(option, CommonOptionBag.DefaultFunctionOpacityOptions.Opaque);
+        } else {
+          InvalidArgumentError(option.Name, ps);
         }
       }
-
-      RegisterLegacyUi(CommonOptionBag.AddCompileSuffix, ParseBoolean, "Compilation options", "compileSuffix");
     }
 
     public void ApplyBinding(Option option) {
@@ -134,12 +67,12 @@ public void ApplyBinding(Option option) {
     }
 
     public T Get<T>(Argument<T> argument) {
-      return (T)Options.Arguments.GetOrCreate(argument, () => default(T));
+      return (T)Options.Arguments.GetOrDefault(argument, () => (object)default(T));
     }
 
 
     public T Get<T>(Option<T> option) {
-      return (T)Options.OptionArguments.GetOrCreate(option, () => default(T));
+      return (T)Options.OptionArguments.GetOrDefault(option, () => (object)default(T));
     }
 
     public object Get(Option option) {
@@ -155,7 +88,7 @@ public void Set<T>(Option<T> option, T value) {
     }
 
     protected override void AddFile(string file, Bpl.CommandLineParseState ps) {
-      this.CliRootSourceUris.Add(new Uri(Path.GetFullPath(file)));
+      CliRootSourceUris.Add(new Uri(Path.GetFullPath(file)));
       base.AddFile(file, ps);
     }
 
@@ -190,6 +123,10 @@ public static void ParseStringElement(Option<IList<string>> option, Bpl.CommandL
       }
     }
 
+    public static void ParseImplicitEnable(Option<bool> option, Bpl.CommandLineParseState ps, DafnyOptions options) {
+      options.Set(option, true);
+    }
+
     public static void ParseBoolean(Option<bool> option, Bpl.CommandLineParseState ps, DafnyOptions options) {
       int result = 0;
       if (ps.GetIntArgument(ref result, 2)) {
@@ -197,12 +134,31 @@ public static void ParseBoolean(Option<bool> option, Bpl.CommandLineParseState p
       }
     }
 
-    private static readonly List<LegacyUiForOption> legacyUis = new();
+    public static void ParseGeneralTraitsOption(Option<CommonOptionBag.GeneralTraitsOptions> option, Bpl.CommandLineParseState ps, DafnyOptions options) {
+      if (ps.ConfirmArgumentCount(1)) {
+        switch (ps.args[ps.i]) {
+          case "legacy":
+            options.Set(option, CommonOptionBag.GeneralTraitsOptions.Legacy);
+            break;
+          case "datatype":
+            options.Set(option, CommonOptionBag.GeneralTraitsOptions.Datatype);
+            break;
+          case "full":
+            options.Set(option, CommonOptionBag.GeneralTraitsOptions.Full);
+            break;
+          default:
+            InvalidArgumentError(option.Name, ps);
+            break;
+        }
+      }
+    }
+
+    private static readonly List<LegacyUiForOption> LegacyUis = new();
 
     public static void RegisterLegacyUi<T>(Option<T> option,
       Action<Option<T>, Bpl.CommandLineParseState, DafnyOptions> parse,
       string category, string legacyName = null, string legacyDescription = null, T defaultValue = default(T), string argumentName = null) {
-      legacyUis.Add(new LegacyUiForOption(
+      LegacyUis.Add(new LegacyUiForOption(
         option,
         (state, options) => parse(option, state, options),
         category,
@@ -213,9 +169,9 @@ public static void RegisterLegacyUi<T>(Option<T> option,
     }
 
     private static DafnyOptions defaultImmutableOptions;
-    public static DafnyOptions DefaultImmutableOptions => defaultImmutableOptions ??= Create(Console.Out, Console.In);
+    public static DafnyOptions DefaultImmutableOptions => defaultImmutableOptions ??= CreateUsingOldParser(Console.Out, Console.In);
 
-    public static DafnyOptions Create(TextWriter outputWriter, TextReader input = null, params string[] arguments) {
+    public static DafnyOptions CreateUsingOldParser(TextWriter outputWriter, TextReader input = null, params string[] arguments) {
       input ??= TextReader.Null;
       var result = new DafnyOptions(input, outputWriter, outputWriter);
       result.Parse(arguments);
@@ -232,16 +188,81 @@ public override bool Parse(string[] arguments) {
 
       try {
         if (i >= arguments.Length) {
-          return base.Parse(arguments);
+          return BaseParse(arguments, true);
         }
         MainArgs = arguments.Skip(i + 1).ToList();
-        return base.Parse(arguments.Take(i).ToArray());
+        return BaseParse(arguments.Take(i).ToArray(), true);
       } catch (Exception e) {
         ErrorWriter.WriteLine("Invalid filename: " + e.Message);
         return false;
       }
     }
 
+    protected override Bpl.CommandLineParseState InitializeCommandLineParseState(string[] args) {
+      return new TextWriterParseState(args, ToolName, ErrorWriter);
+    }
+
+    /// <summary>
+    /// Needed because the Boogie version writes to Console.Error
+    /// </summary>
+    class TextWriterParseState : Bpl.CommandLineParseState {
+      private readonly TextWriter errorWriter;
+
+      public TextWriterParseState(string[] args, string toolName, TextWriter errorWriter) : base(args, toolName) {
+        this.errorWriter = errorWriter;
+      }
+
+      public override void Error(string message, params string[] args) {
+        errorWriter.WriteLine("{0}: Error: {1}", ToolName, string.Format(message, args));
+        EncounteredErrors = true;
+      }
+    }
+
+    /// <summary>
+    /// Customized version of Microsoft.Boogie.CommandLineOptions.Parse
+    /// Needed because the Boogie version writes to Console.Error
+    /// </summary>
+    public bool BaseParse(string[] args, bool allowFile) {
+      Environment = Environment + "Command Line Options: " + string.Join(" ", args);
+      args = cce.NonNull<string[]>((string[])args.Clone());
+      Bpl.CommandLineParseState state;
+      for (state = InitializeCommandLineParseState(args); state.i < args.Length; state.i = state.nextIndex) {
+        cce.LoopInvariant(state.args == args);
+        string file = args[state.i];
+        state.s = file.Trim();
+        bool flag = state.s.StartsWith("-") || state.s.StartsWith("/");
+        int length = state.s.IndexOf(':');
+        if (0 <= length & flag) {
+          state.hasColonArgument = true;
+          args[state.i] = state.s.Substring(length + 1);
+          state.s = state.s.Substring(0, length);
+        } else {
+          ++state.i;
+          state.hasColonArgument = false;
+        }
+        state.nextIndex = state.i;
+        if (flag) {
+          if (!ParseOption(state.s.Substring(1), state)) {
+            if (Path.DirectorySeparatorChar == '/' && state.s.StartsWith("/")) {
+              AddFile(file, state);
+            } else {
+              UnknownSwitch(state);
+            }
+          }
+        } else if (allowFile) {
+          AddFile(file, state);
+        } else {
+          state.Error($"Boogie option '{state.s}' must start with - or /");
+        }
+      }
+      if (state.EncounteredErrors) {
+        ErrorWriter.WriteLine("Use /help for available options");
+        return false;
+      }
+      ApplyDefaultOptions();
+      return true;
+    }
+
     public DafnyOptions(TextReader inputReader, TextWriter outputWriter, TextWriter errorWriter)
       : base(outputWriter, "dafny", "Dafny program verifier", new Bpl.ConsolePrinter()) {
       Input = inputReader;
@@ -252,13 +273,12 @@ public DafnyOptions(TextReader inputReader, TextWriter outputWriter, TextWriter
       NormalizeNames = true;
       EmitDebugInformation = false;
       Backend = new CsharpBackend(this);
-      Printer = new DafnyConsolePrinter(this);
-      Printer.Options = this;
+      Printer = new NullPrinter();
     }
 
     public override string VersionNumber {
       get {
-        return System.Diagnostics.FileVersionInfo
+        return FileVersionInfo
           .GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion;
       }
     }
@@ -303,8 +323,6 @@ public enum ContractTestingMode {
     public List<string> DafnyPrintExportedViews = new List<string>();
     public bool Compile = true;
     public List<string> MainArgs = new List<string>();
-    public Command Command = null;
-    public bool Format = false;
     public bool FormatCheck = false;
 
     public string CompilerName;
@@ -314,12 +332,12 @@ public enum ContractTestingMode {
     public string DafnyPrintCompiledFile = null;
     public string CoverageLegendFile = null;
     public string MainMethod = null;
-    public bool RunAllTests = false;
     public bool ForceCompile = false;
     public bool RunAfterCompile = false;
     public uint SpillTargetCode = 0; // [0..4]
     public bool DisallowIncludes = false;
     public bool DisallowExterns = false;
+    public bool AllowExterns => !DisallowExterns;
     public bool DisableNLarith = false;
     public int ArithMode = 1; // [0..10]
     public string AutoReqPrintFile = null;
@@ -335,7 +353,8 @@ public enum ContractTestingMode {
     public bool WarnShadowing = false;
     public FunctionSyntaxOptions FunctionSyntax = FunctionSyntaxOptions.Version4;
     public QuantifierSyntaxOptions QuantifierSyntax = QuantifierSyntaxOptions.Version4;
-    public int DefiniteAssignmentLevel = 1; // [0..5] 2 and 3 have the same effect, 4 turns off an array initialisation check and field initialization check, unless --enforce-determinism is used.
+
+    public int DefiniteAssignmentLevel { get; set; } = 1;
     public HashSet<string> LibraryFiles { get; set; } = new();
     public ContractTestingMode TestContracts = ContractTestingMode.None;
 
@@ -354,31 +373,33 @@ public enum IncludesModes {
     public IncludesModes PrintIncludesMode = IncludesModes.None;
     public int OptimizeResolution = 2;
     public bool IncludeRuntime = true;
+    public CommonOptionBag.SystemModuleMode SystemModuleTranslationMode = CommonOptionBag.SystemModuleMode.Omit;
     public bool UseJavadocLikeDocstringRewriter = false;
     public bool DisableScopes = false;
     public bool UseStdin = false;
-    public bool WarningsAsErrors = false;
+    public bool FailOnWarnings = false;
     [CanBeNull] private TestGenerationOptions testGenOptions = null;
     public bool ExtractCounterexample = false;
-    public List<string> VerificationLoggerConfigs = new();
+
+    public bool ShowProofObligationExpressions = false;
 
     public bool AuditProgram = false;
 
     public static string DefaultZ3Version = "4.12.1";
     // Not directly user-configurable, only recorded once we discover it
     public string SolverIdentifier { get; private set; }
-    public Version SolverVersion { get; private set; }
+    public Version SolverVersion { get; set; }
 
     public static readonly ReadOnlyCollection<Plugin> DefaultPlugins =
-      new(new[] { SinglePassCompiler.Plugin, InternalDocstringRewritersPluginConfiguration.Plugin });
+      new(new[] { SinglePassCodeGenerator.Plugin, InternalDocstringRewritersPluginConfiguration.Plugin });
     private IList<Plugin> cliPluginCache;
-    public IList<Plugin> Plugins => cliPluginCache ??= ComputePlugins();
+    public IList<Plugin> Plugins => cliPluginCache ??= ComputePlugins(AdditionalPlugins, AdditionalPluginArguments);
     public List<Plugin> AdditionalPlugins = new();
     public IList<string> AdditionalPluginArguments = new List<string>();
 
-    IList<Plugin> ComputePlugins() {
-      var result = new List<Plugin>(DefaultPlugins.Concat(AdditionalPlugins));
-      foreach (var pluginAndArgument in AdditionalPluginArguments) {
+    public static IList<Plugin> ComputePlugins(List<Plugin> additionalPlugins, IList<string> allArguments) {
+      var result = new List<Plugin>(DefaultPlugins.Concat(additionalPlugins));
+      foreach (var pluginAndArgument in allArguments) {
         try {
           var pluginArray = pluginAndArgument.Split(',');
           var pluginPath = pluginArray[0];
@@ -411,11 +432,16 @@ private static string[] ParsePluginArguments(string argumentsString) {
       ).ToArray();
     }
 
+    public static bool TryParseResourceCount(string value, out uint result) {
+      return uint.TryParse(value, NumberStyles.AllowExponent, null, out result);
+    }
+
     /// <summary>
     /// Automatic shallow-copy constructor
     /// </summary>
-    public DafnyOptions(DafnyOptions src) : this(src.Input, src.OutputWriter, src.ErrorWriter) {
-      src.CopyTo(this);
+    public DafnyOptions(DafnyOptions src, bool useNullWriters = false) : this(
+      src.Input, src.OutputWriter, src.ErrorWriter) {
+      src.CopyTo(this, useNullWriters);
       CliRootSourceUris = new List<Uri>(src.CliRootSourceUris);
       ProverOptions = new List<string>(src.ProverOptions);
       Options = new Options(
@@ -423,12 +449,17 @@ public DafnyOptions(DafnyOptions src) : this(src.Input, src.OutputWriter, src.Er
         src.Options.Arguments.ToDictionary(kv => kv.Key, kv => kv.Value));
     }
 
-    public void CopyTo(DafnyOptions dst) {
+    private void CopyTo(DafnyOptions dst, bool useNullWriters) {
       var type = typeof(DafnyOptions);
       while (type != null) {
         var fields = type.GetFields(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
         foreach (var fi in fields) {
-          fi.SetValue(dst, fi.GetValue(this));
+          var value = fi.GetValue(this);
+          // This hacky code is necessary until we switch to a Boogie version that implements https://github.com/boogie-org/boogie/pull/788
+          if (useNullWriters && fi.Name is "<ErrorWriter>k__BackingField" or "<OutputWriter>k__BackingField") {
+            value = TextWriter.Null;
+          }
+          fi.SetValue(dst, value);
         }
         type = type.BaseType;
       }
@@ -442,7 +473,7 @@ protected override bool ParseOption(string name, Bpl.CommandLineParseState ps) {
         return true;
       }
 
-      foreach (var option in legacyUis.Where(o => o.Name == name)) {
+      foreach (var option in LegacyUis.Where(o => o.Name == name)) {
         option.Parse(ps, this);
         return true;
       }
@@ -450,12 +481,12 @@ protected override bool ParseOption(string name, Bpl.CommandLineParseState ps) {
       return ParseBoogieOption(name, ps);
     }
 
-    protected bool ParseBoogieOption(string name, Bpl.CommandLineParseState ps) {
+    private bool ParseBoogieOption(string name, Bpl.CommandLineParseState ps) {
       return base.ParseOption(name, ps);
     }
 
-    public override string Help => "Use 'dafny --help' to see help for a newer Dafny CLI format.\n" +
-      LegacyUiForOption.GenerateHelp(base.Help, legacyUis, true);
+    public override string Help => "Use 'dafny --help' to see help for the new Dafny CLI format.\n" +
+      LegacyUiForOption.GenerateHelp(base.Help, LegacyUis, true);
 
     protected bool ParseDafnySpecificOption(string name, Bpl.CommandLineParseState ps) {
       var args = ps.args; // convenient synonym
@@ -515,15 +546,6 @@ protected bool ParseDafnySpecificOption(string name, Bpl.CommandLineParseState p
             return true;
           }
 
-        case "runAllTests": {
-            int runAllTests = 0;
-            if (ps.GetIntArgument(ref runAllTests, 2)) {
-              RunAllTests = runAllTests != 0; // convert to boolean
-            }
-
-            return true;
-          }
-
         case "dafnyVerify": {
             int verify = 0;
             if (ps.GetIntArgument(ref verify, 2)) {
@@ -633,6 +655,10 @@ protected bool ParseDafnySpecificOption(string name, Bpl.CommandLineParseState p
           VerifyAllModules = true;
           return true;
 
+        case "emitUncompilableCode":
+          this.Set(CommonOptionBag.EmitUncompilableCode, true);
+          return true;
+
         case "separateModuleOutput":
           SeparateModuleOutput = true;
           return true;
@@ -769,21 +795,16 @@ protected bool ParseDafnySpecificOption(string name, Bpl.CommandLineParseState p
           }
 
         case "warningsAsErrors":
-          WarningsAsErrors = true;
+          FailOnWarnings = true;
           return true;
 
         case "extractCounterexample":
           ExtractCounterexample = true;
+          EnhancedErrorMessages = 1;
           return true;
 
-        case "verificationLogger":
-          if (ps.ConfirmArgumentCount(1)) {
-            if (args[ps.i].StartsWith("trx") || args[ps.i].StartsWith("csv") || args[ps.i].StartsWith("text")) {
-              VerificationLoggerConfigs.Add(args[ps.i]);
-            } else {
-              InvalidArgumentError(name, ps);
-            }
-          }
+        case "showProofObligationExpressions":
+          ShowProofObligationExpressions = true;
           return true;
 
         case "testContracts":
@@ -815,12 +836,12 @@ private static string[] ParseInnerArguments(string argumentsString) {
       ).ToArray();
     }
 
-    protected static void InvalidArgumentError(string name, Bpl.CommandLineParseState ps) {
+    public static void InvalidArgumentError(string name, Bpl.CommandLineParseState ps) {
       ps.Error("Invalid argument \"{0}\" to option {1}", ps.args[ps.i], name);
     }
 
     public override void ApplyDefaultOptions() {
-      foreach (var legacyUiOption in legacyUis) {
+      foreach (var legacyUiOption in LegacyUis) {
         if (!Options.OptionArguments.ContainsKey(legacyUiOption.Option)) {
           Options.OptionArguments[legacyUiOption.Option] = legacyUiOption.DefaultValue;
         }
@@ -837,17 +858,20 @@ public void ApplyDefaultOptionsWithoutSettingsDefault() {
       base.ApplyDefaultOptions();
 
       Backend ??= new CsharpBackend(this);
+      // Ask Boogie to perform abstract interpretation
+      UseAbstractInterpretation = true;
+      Ai.J_Intervals = true;
+    }
 
-      // expand macros in filenames, now that LogPrefix is fully determined
+    public bool IsUsingZ3() {
+      return !ProverOptions.Any(x => x.StartsWith("SOLVER=") && !x.EndsWith("=z3"));
+    }
 
-      if (!ProverOptions.Any(x => x.StartsWith("SOLVER=") && !x.EndsWith("=z3"))) {
-        var z3Version = SetZ3ExecutablePath();
+    public void ProcessSolverOptions(ErrorReporter errorReporter, IOrigin token) {
+      if (IsUsingZ3()) {
+        var z3Version = SetZ3ExecutablePath(errorReporter, token);
         SetZ3Options(z3Version);
       }
-
-      // Ask Boogie to perform abstract interpretation
-      UseAbstractInterpretation = true;
-      Ai.J_Intervals = true;
     }
 
     public override string AttributeHelp =>
@@ -1078,14 +1102,15 @@ in such cases in the verifier being faster.
       TODO".Replace("%SUPPORTED_OPTIONS%",
         string.Join(", ", DafnyAttributeOptions.KnownOptions));
 
-    private static ConcurrentDictionary<string, Version> z3VersionPerPath = new ConcurrentDictionary<string, Version>();
+    private static ConcurrentDictionary<string, Version> z3VersionPerPath = new();
     /// <summary>
     /// Dafny releases come with their own copy of Z3, to save users the trouble of having to install extra dependencies.
     /// For this to work, Dafny first tries any prover path explicitly provided by the user, then looks for for the copy
     /// distributed with Dafny, and finally looks in any directory in the system PATH environment variable.
     /// </summary>
-    private Version SetZ3ExecutablePath() {
+    private Version SetZ3ExecutablePath(ErrorReporter errorReporter, IOrigin token) {
       string confirmedProverPath = null;
+      string nextStepsMessage = $"Please either provide a path to the `z3` executable using the `--solver-path <path>` option, manually place the `z3` directory next to the `dafny` executable you are using (this directory should contain `bin/z3-{DefaultZ3Version}` or `bin/z3-{DefaultZ3Version}.exe`), or set the PATH environment variable to also include a directory containing the `z3` executable.";
 
       // Try an explicitly provided prover path, if there is one.
       var pp = "PROVER_PATH=";
@@ -1096,6 +1121,7 @@ private Version SetZ3ExecutablePath() {
         // However, by at least checking if the file exists, we can produce a better error message in common scenarios.
         // Unfortunately, there doesn't seem to be a portable way of checking whether it's executable.
         if (!File.Exists(proverPath)) {
+          errorReporter.Error(MessageSource.Verifier, token, $"Z3 not found at {proverPath}. " + nextStepsMessage);
           return null;
         }
 
@@ -1133,6 +1159,7 @@ private Version SetZ3ExecutablePath() {
         return z3VersionPerPath.GetOrAdd(confirmedProverPath, GetZ3Version);
       }
 
+      errorReporter.Error(MessageSource.Verifier, DafnyProject.StartingToken, "Z3 is not found. " + nextStepsMessage);
       return null;
     }
 
@@ -1172,7 +1199,7 @@ private void SetZ3Option(string name, string value) {
       }
     }
 
-    private void SetZ3Options(Version z3Version) {
+    public void SetZ3Options(Version z3Version) {
       // Don't allow changing this once set, just in case:
       // a DooFile will record this and will get confused if it changes.
       if ((SolverIdentifier != null && SolverIdentifier != "Z3")
@@ -1193,17 +1220,19 @@ private void SetZ3Options(Version z3Version) {
       SetZ3Option("type_check", "true");
       SetZ3Option("smt.qi.eager_threshold", "100"); // TODO: try lowering
       SetZ3Option("smt.delay_units", "true");
+      SetZ3Option("model_evaluator.completion", "true");
+      SetZ3Option("model.completion", "true");
+      if (z3Version is null || z3Version < new Version(4, 8, 6)) {
+        SetZ3Option("model_compress", "false");
+      } else {
+        SetZ3Option("model.compact", "false");
+      }
 
       // This option helps avoid "time travelling triggers".
       // See: https://github.com/dafny-lang/dafny/discussions/3362
       SetZ3Option("smt.case_split", "3");
 
-      // This option tends to lead to the best all-around arithmetic
-      // performance, though some programs can be verified more quickly
-      // (or verified at all) using a different solver.
-      SetZ3Option("smt.arith.solver", "2");
-
-      if (DisableNLarith || 3 <= ArithMode) {
+      if (3 <= ArithMode) {
         SetZ3Option("smt.arith.nl", "false");
       }
     }
@@ -1345,34 +1374,15 @@ Treat warnings as errors.
 /verifyAllModules
     Verify modules that come from an include directive.
 
+/emitUncompilableCode
+    Allow compilers to emit uncompilable code that usually contain useful
+    information about what feature is missing, rather than
+    stopping on the first problem
+
 /separateModuleOutput
     Output verification results for each module separately, rather than
     aggregating them after they are all finished.
 
-/verificationLogger:<configuration string>
-    Logs verification results to the given test result logger. The
-    currently supported loggers are `trx`, `csv`, and `text`. These are
-    the XML-based format commonly used for test results for .NET
-    languages, a custom CSV schema, and a textual format meant for human
-    consumption. You can provide configuration using the same string
-    format as when using the --logger option for dotnet test, such as:
-
-        /verificationLogger:trx;LogFileName=<...>.
-
-    The exact mapping of verification concepts to these formats is
-    experimental and subject to change!
-
-    The `trx` and `csv` loggers automatically choose an output file name
-    by default, and print the name of this file to the console. The
-    `text` logger prints its output to the console by default, but can
-    send output to a file given the `LogFileName` option.
-
-    The `text` logger also includes a more detailed breakdown of what
-    assertions appear in each assertion batch. When combined with the
-    `/vcsSplitOnEveryAssert` option, it will provide approximate time
-    and resource use costs for each assertion, allowing identification
-    of especially expensive assertions.
-
 /noCheating:<n>
     0 (default) - Allow assume statements and free invariants.
     1 - Treat all assumptions as asserts, and drop free.
@@ -1464,10 +1474,7 @@ focal predicate P to P#[_k-1].
 
 /extractCounterexample
     If verification fails, report a detailed counterexample for the
-    first failing assertion. Requires specifying the /mv:<file> option as well
-    as /proverOpt:O:model_compress=false (for z3 version < 4.8.7) or
-    /proverOpt:O:model.compact=false (for z3 version >= 4.8.7), and
-    /proverOpt:O:model.completion=true.
+    first failing assertion (experimental).
 
 ---- Compilation options ---------------------------------------------------
 
@@ -1491,15 +1498,6 @@ A Main method can have at most one (non-ghost) argument of type `seq<string>`
     When running a Dafny file through /compile:3 or /compile:4, '--args' provides
     all arguments after it to the Main function, at index starting at 1.
     Index 0 is used to store the executable's name if it exists.
-/runAllTests:<n> (experimental)
-    0 (default) - Annotates compiled methods with the {{:test}}
-        attribute such that they can be tested using a testing framework
-        in the target language (e.g. xUnit for C#).
-    1 - Emits a main method in the target language that will execute
-        every method in the program with the {{:test}} attribute. Cannot
-        be used if the program already contains a main method. Note that
-        /compile:3 or 4 must be provided as well to actually execute
-        this main method!
 
 /compileVerbose:<n>
     0 - Don't print status of compilation to the console.
@@ -1566,9 +1564,9 @@ Dafny generally accepts Boogie options and passes these on to Boogie.
 
 class ErrorReportingCommandLineParseState : Bpl.CommandLineParseState {
   private readonly Errors errors;
-  private IToken token;
+  private IOrigin token;
 
-  public ErrorReportingCommandLineParseState(string[] args, string toolName, Errors errors, IToken token)
+  public ErrorReportingCommandLineParseState(string[] args, string toolName, Errors errors, IOrigin token)
     : base(args, toolName) {
     this.errors = errors;
     this.token = token;
@@ -1591,7 +1589,7 @@ class DafnyAttributeOptions : DafnyOptions {
   };
 
   private readonly Errors errors;
-  public IToken Token { get; set; }
+  public IOrigin Token { get; set; }
 
   public DafnyAttributeOptions(DafnyOptions opts, Errors errors) : base(opts) {
     this.errors = errors;
diff --git a/Source/DafnyCore/DafnyPrelude.bpl b/Source/DafnyCore/DafnyPrelude.bpl
index 43259bb02d7..45c0538cecf 100644
--- a/Source/DafnyCore/DafnyPrelude.bpl
+++ b/Source/DafnyCore/DafnyPrelude.bpl
@@ -7,8 +7,9 @@
 // Copyright by the contributors to the Dafny Project
 // SPDX-License-Identifier: MIT
 
-const $$Language$Dafny: bool;  // To be recognizable to the ModelViewer as
-axiom $$Language$Dafny;        // coming from a Dafny program.
+const $$Language$Dafny: bool uses {  // To be recognizable to the ModelViewer as
+  axiom $$Language$Dafny;            // coming from a Dafny program.
+}
 
 // ---------------------------------------------------------------
 // -- Types ------------------------------------------------------
@@ -33,35 +34,35 @@ const unique TORDINAL  : Ty uses {
   axiom Tag(TORDINAL) == TagORDINAL;
 }
 // See for which axioms we can make use of the trigger to determine the connection.
-function TBitvector(int) : Ty uses {
-  axiom (forall w: int :: { TBitvector(w) } Inv0_TBitvector(TBitvector(w)) == w);
-}
-function TSet(Ty)      : Ty uses {
-  axiom (forall t: Ty :: { TSet(t) } Inv0_TSet(TSet(t)) == t);
-  axiom (forall t: Ty    :: { TSet(t) }      Tag(TSet(t))      == TagSet);
-}
-function TISet(Ty)     : Ty uses {
-  axiom (forall t: Ty :: { TISet(t) } Inv0_TISet(TISet(t)) == t);
-  axiom (forall t: Ty    :: { TISet(t) }     Tag(TISet(t))     == TagISet);
-}
-function TMultiSet(Ty) : Ty uses {
-  axiom (forall t: Ty :: { TMultiSet(t) } Inv0_TMultiSet(TMultiSet(t)) == t);
-  axiom (forall t: Ty    :: { TMultiSet(t) } Tag(TMultiSet(t)) == TagMultiSet);
-}
-function TSeq(Ty)      : Ty uses {
-  axiom (forall t: Ty :: { TSeq(t) } Inv0_TSeq(TSeq(t)) == t);
-  axiom (forall t: Ty    :: { TSeq(t) }      Tag(TSeq(t))      == TagSeq);
-}
-function TMap(Ty, Ty)  : Ty uses {
-  axiom (forall t, u: Ty :: { TMap(t,u) } Inv0_TMap(TMap(t,u)) == t);
-  axiom (forall t, u: Ty :: { TMap(t,u) } Inv1_TMap(TMap(t,u)) == u);
-  axiom (forall t, u: Ty :: { TMap(t,u) }    Tag(TMap(t,u))    == TagMap);
-}
-function TIMap(Ty, Ty) : Ty uses {
-  axiom (forall t, u: Ty :: { TIMap(t,u) } Inv0_TIMap(TIMap(t,u)) == t);
-  axiom (forall t, u: Ty :: { TIMap(t,u) } Inv1_TIMap(TIMap(t,u)) == u);
-  axiom (forall t, u: Ty :: { TIMap(t,u) }   Tag(TIMap(t,u))   == TagIMap);
-}
+function TBitvector(int) : Ty;
+axiom (forall w: int :: { TBitvector(w) } Inv0_TBitvector(TBitvector(w)) == w);
+
+function TSet(Ty) : Ty;
+axiom (forall t: Ty :: { TSet(t) } Inv0_TSet(TSet(t)) == t);
+axiom (forall t: Ty :: { TSet(t) }      Tag(TSet(t))      == TagSet);
+
+function TISet(Ty) : Ty;
+axiom (forall t: Ty :: { TISet(t) } Inv0_TISet(TISet(t)) == t);
+axiom (forall t: Ty :: { TISet(t) }     Tag(TISet(t))     == TagISet);
+
+function TMultiSet(Ty) : Ty;
+axiom (forall t: Ty :: { TMultiSet(t) } Inv0_TMultiSet(TMultiSet(t)) == t);
+axiom (forall t: Ty :: { TMultiSet(t) } Tag(TMultiSet(t)) == TagMultiSet);
+
+function TSeq(Ty) : Ty;
+axiom (forall t: Ty :: { TSeq(t) } Inv0_TSeq(TSeq(t)) == t);
+axiom (forall t: Ty :: { TSeq(t) } Tag(TSeq(t)) == TagSeq);
+
+function TMap(Ty, Ty) : Ty;
+axiom (forall t, u: Ty :: { TMap(t,u) } Inv0_TMap(TMap(t,u)) == t);
+axiom (forall t, u: Ty :: { TMap(t,u) } Inv1_TMap(TMap(t,u)) == u);
+axiom (forall t, u: Ty :: { TMap(t,u) } Tag(TMap(t,u)) == TagMap);
+
+function TIMap(Ty, Ty) : Ty;
+axiom (forall t, u: Ty :: { TIMap(t,u) } Inv0_TIMap(TIMap(t,u)) == t);
+axiom (forall t, u: Ty :: { TIMap(t,u) } Inv1_TIMap(TIMap(t,u)) == u);
+axiom (forall t, u: Ty :: { TIMap(t,u) } Tag(TIMap(t,u)) == TagIMap);
+
 
 function Inv0_TBitvector(Ty) : int;
 function Inv0_TSet(Ty) : Ty;
@@ -98,19 +99,17 @@ function TagFamily(Ty): TyTagFamily;
 // ---------------------------------------------------------------
 // -- Literals ---------------------------------------------------
 // ---------------------------------------------------------------
-function {:identity} Lit<T>(x: T): T { x } uses {
-  axiom (forall<T> x: T :: { $Box(Lit(x)) } $Box(Lit(x)) == Lit($Box(x)) );
-}
+function {:identity} Lit<T>(x: T): T { x }
+axiom (forall<T> x: T :: { $Box(Lit(x)) } $Box(Lit(x)) == Lit($Box(x)) );
 
 // Specialize Lit to concrete types.
 // These aren't logically required, but on some examples improve
 // verification speed
-function {:identity} LitInt(x: int): int { x } uses {
-  axiom (forall x: int :: { $Box(LitInt(x)) } $Box(LitInt(x)) == Lit($Box(x)) );
-}
-function {:identity} LitReal(x: real): real { x } uses {
-  axiom (forall x: real :: { $Box(LitReal(x)) } $Box(LitReal(x)) == Lit($Box(x)) );
-}
+function {:identity} LitInt(x: int): int { x }
+axiom (forall x: int :: { $Box(LitInt(x)) } $Box(LitInt(x)) == Lit($Box(x)) );
+
+function {:identity} LitReal(x: real): real { x }
+axiom (forall x: real :: { $Box(LitReal(x)) } $Box(LitReal(x)) == Lit($Box(x)) );
 
 // ---------------------------------------------------------------
 // -- Characters -------------------------------------------------
@@ -118,7 +117,7 @@ function {:identity} LitReal(x: real): real { x } uses {
 
 #if UNICODE_CHAR
 function {:inline} char#IsChar(n: int): bool {
-  (0                  <= n && n < 55296   /* 0xD800 */) || 
+  (0                  <= n && n < 55296   /* 0xD800 */) ||
   (57344 /* 0xE000 */ <= n && n < 1114112 /* 0x11_0000 */ )
 }
 #else
@@ -128,29 +127,26 @@ function {:inline} char#IsChar(n: int): bool {
 #endif
 
 type char;
-function char#FromInt(int): char uses {
-  axiom (forall n: int ::
-    { char#FromInt(n) }
-    char#IsChar(n) ==> char#ToInt(char#FromInt(n)) == n);
-}
-
-function char#ToInt(char): int uses {
-  axiom (forall ch: char ::
-    { char#ToInt(ch) }
-    char#FromInt(char#ToInt(ch)) == ch &&
-    char#IsChar(char#ToInt(ch)));
-}  
-
-function char#Plus(char, char): char uses {
-  axiom (forall a: char, b: char ::
-    { char#Plus(a, b) }
-    char#Plus(a, b) == char#FromInt(char#ToInt(a) + char#ToInt(b)));
-}
-function char#Minus(char, char): char uses {
-  axiom (forall a: char, b: char ::
-    { char#Minus(a, b) }
-    char#Minus(a, b) == char#FromInt(char#ToInt(a) - char#ToInt(b)));
-}
+function char#FromInt(int): char;
+axiom (forall n: int ::
+  { char#FromInt(n) }
+  char#IsChar(n) ==> char#ToInt(char#FromInt(n)) == n);
+
+function char#ToInt(char): int;
+axiom (forall ch: char ::
+  { char#ToInt(ch) }
+  char#FromInt(char#ToInt(ch)) == ch &&
+  char#IsChar(char#ToInt(ch)));
+
+function char#Plus(char, char): char;
+axiom (forall a: char, b: char ::
+  { char#Plus(a, b) }
+  char#Plus(a, b) == char#FromInt(char#ToInt(a) + char#ToInt(b)));
+
+function char#Minus(char, char): char;
+axiom (forall a: char, b: char ::
+  { char#Minus(a, b) }
+  char#Minus(a, b) == char#FromInt(char#ToInt(a) - char#ToInt(b)));
 
 // ---------------------------------------------------------------
 // -- References -------------------------------------------------
@@ -166,15 +162,16 @@ const null: ref;
 type Box;
 const $ArbitraryBoxValue: Box;
 
-function $Box<T>(T): Box uses {
-  axiom (forall<T> x : T :: { $Box(x) } $Unbox($Box(x)) == x);
-}
+function $Box<T>(T): Box;
 function $Unbox<T>(Box): T;
+axiom (forall<T> x : T   :: { $Box(x) } $Unbox($Box(x)) == x);
+axiom (forall<T> x : Box :: { $Unbox(x): T} $Box($Unbox(x): T) == x);
+
 
 // Corresponding entries for boxes...
 // This could probably be solved by having Box also inhabit Ty
-function $IsBox<T>(T,Ty): bool;
-function $IsAllocBox<T>(T,Ty,Heap): bool;
+function $IsBox(Box,Ty): bool;
+function $IsAllocBox(Box,Ty,Heap): bool;
 
 axiom (forall bx : Box ::
     { $IsBox(bx, TInt) }
@@ -193,26 +190,26 @@ axiom (forall bx : Box ::
 // generated programmatically. Except, Bv0 is given here.
 axiom (forall bx : Box ::
     { $IsBox(bx, TBitvector(0)) }
-    ( $IsBox(bx, TBitvector(0)) ==> $Box($Unbox(bx) : Bv0) == bx && $Is($Unbox(bx) : Set Box, TBitvector(0))));
+    ( $IsBox(bx, TBitvector(0)) ==> $Box($Unbox(bx) : Bv0) == bx && $Is($Unbox(bx) : Bv0, TBitvector(0))));
 
 axiom (forall bx : Box, t : Ty ::
     { $IsBox(bx, TSet(t)) }
-    ( $IsBox(bx, TSet(t)) ==> $Box($Unbox(bx) : Set Box) == bx && $Is($Unbox(bx) : Set Box, TSet(t))));
+    ( $IsBox(bx, TSet(t)) ==> $Box($Unbox(bx) : Set) == bx && $Is($Unbox(bx) : Set, TSet(t))));
 axiom (forall bx : Box, t : Ty ::
     { $IsBox(bx, TISet(t)) }
-    ( $IsBox(bx, TISet(t)) ==> $Box($Unbox(bx) : ISet Box) == bx && $Is($Unbox(bx) : ISet Box, TISet(t))));
+    ( $IsBox(bx, TISet(t)) ==> $Box($Unbox(bx) : ISet) == bx && $Is($Unbox(bx) : ISet, TISet(t))));
 axiom (forall bx : Box, t : Ty ::
     { $IsBox(bx, TMultiSet(t)) }
-    ( $IsBox(bx, TMultiSet(t)) ==> $Box($Unbox(bx) : MultiSet Box) == bx && $Is($Unbox(bx) : MultiSet Box, TMultiSet(t))));
+    ( $IsBox(bx, TMultiSet(t)) ==> $Box($Unbox(bx) : MultiSet) == bx && $Is($Unbox(bx) : MultiSet, TMultiSet(t))));
 axiom (forall bx : Box, t : Ty ::
     { $IsBox(bx, TSeq(t)) }
-    ( $IsBox(bx, TSeq(t)) ==> $Box($Unbox(bx) : Seq Box) == bx && $Is($Unbox(bx) : Seq Box, TSeq(t))));
+    ( $IsBox(bx, TSeq(t)) ==> $Box($Unbox(bx) : Seq) == bx && $Is($Unbox(bx) : Seq, TSeq(t))));
 axiom (forall bx : Box, s : Ty, t : Ty ::
     { $IsBox(bx, TMap(s, t)) }
-    ( $IsBox(bx, TMap(s, t)) ==> $Box($Unbox(bx) : Map Box Box) == bx && $Is($Unbox(bx) : Map Box Box, TMap(s, t))));
+    ( $IsBox(bx, TMap(s, t)) ==> $Box($Unbox(bx) : Map) == bx && $Is($Unbox(bx) : Map, TMap(s, t))));
 axiom (forall bx : Box, s : Ty, t : Ty ::
     { $IsBox(bx, TIMap(s, t)) }
-    ( $IsBox(bx, TIMap(s, t)) ==> $Box($Unbox(bx) : IMap Box Box) == bx && $Is($Unbox(bx) : IMap Box Box, TIMap(s, t))));
+    ( $IsBox(bx, TIMap(s, t)) ==> $Box($Unbox(bx) : IMap) == bx && $Is($Unbox(bx) : IMap, TIMap(s, t))));
 
 axiom (forall<T> v : T, t : Ty ::
     { $IsBox($Box(v), t) }
@@ -227,118 +224,117 @@ axiom (forall<T> v : T, t : Ty, h : Heap ::
 
 // Type-argument to $Is is the /representation type/,
 // the second value argument to $Is is the actual type.
-function $Is<T>(T,Ty): bool uses {           // no heap for now
-    axiom(forall v : int  :: { $Is(v,TInt) }  $Is(v,TInt));
-    axiom(forall v : real :: { $Is(v,TReal) } $Is(v,TReal));
-    axiom(forall v : bool :: { $Is(v,TBool) } $Is(v,TBool));
-    axiom(forall v : char :: { $Is(v,TChar) } $Is(v,TChar));
-    axiom(forall v : ORDINAL :: { $Is(v,TORDINAL) } $Is(v,TORDINAL));
-    
-    // Since every bitvector type is a separate type in Boogie, the $Is/$IsAlloc axioms
-    // for bitvectors are generated programatically. Except, TBitvector(0) is given here.
-    axiom (forall v: Bv0 :: { $Is(v, TBitvector(0)) } $Is(v, TBitvector(0)));
-
-    axiom (forall v: Set Box, t0: Ty :: { $Is(v, TSet(t0)) }
-      $Is(v, TSet(t0)) <==>
-      (forall bx: Box :: { v[bx] }
-        v[bx] ==> $IsBox(bx, t0)));
-    axiom (forall v: ISet Box, t0: Ty :: { $Is(v, TISet(t0)) }
-      $Is(v, TISet(t0)) <==>
-      (forall bx: Box :: { v[bx] }
-        v[bx] ==> $IsBox(bx, t0)));
-    axiom (forall v: MultiSet Box, t0: Ty :: { $Is(v, TMultiSet(t0)) }
-      $Is(v, TMultiSet(t0)) <==>
-      (forall bx: Box :: { v[bx] }
-        0 < v[bx] ==> $IsBox(bx, t0)));
-    axiom (forall v: MultiSet Box, t0: Ty :: { $Is(v, TMultiSet(t0)) }
-      $Is(v, TMultiSet(t0)) ==> $IsGoodMultiSet(v));
-    axiom (forall v: Seq Box, t0: Ty :: { $Is(v, TSeq(t0)) }
-      $Is(v, TSeq(t0)) <==>
-      (forall i : int :: { Seq#Index(v, i) }
-        0 <= i && i < Seq#Length(v) ==>
-        $IsBox(Seq#Index(v, i), t0)));
-        
-    axiom (forall v: Map Box Box, t0: Ty, t1: Ty ::
-      { $Is(v, TMap(t0, t1)) }
-      $Is(v, TMap(t0, t1))
-         <==> (forall bx: Box ::
-          { Map#Elements(v)[bx] } { Map#Domain(v)[bx] }
-          Map#Domain(v)[bx] ==>
-            $IsBox(Map#Elements(v)[bx], t1) &&
-            $IsBox(bx, t0)));
-            
-    axiom (forall v: Map Box Box, t0: Ty, t1: Ty ::
-      { $Is(v, TMap(t0, t1)) }
-      $Is(v, TMap(t0, t1)) ==>
-        $Is(Map#Domain(v), TSet(t0)) &&
-        $Is(Map#Values(v), TSet(t1)) &&
-        $Is(Map#Items(v), TSet(Tclass._System.Tuple2(t0, t1))));
-    axiom (forall v: IMap Box Box, t0: Ty, t1: Ty ::
-      { $Is(v, TIMap(t0, t1)) }
-      $Is(v, TIMap(t0, t1))
-         <==> (forall bx: Box ::
-          { IMap#Elements(v)[bx] } { IMap#Domain(v)[bx] }
-          IMap#Domain(v)[bx] ==>
-            $IsBox(IMap#Elements(v)[bx], t1) &&
-            $IsBox(bx, t0)));
-    axiom (forall v: IMap Box Box, t0: Ty, t1: Ty ::
-      { $Is(v, TIMap(t0, t1)) }
-      $Is(v, TIMap(t0, t1)) ==>
-        $Is(IMap#Domain(v), TISet(t0)) &&
-        $Is(IMap#Values(v), TISet(t1)) &&
-        $Is(IMap#Items(v), TISet(Tclass._System.Tuple2(t0, t1))));
-}
-function $IsAlloc<T>(T,Ty,Heap): bool uses {
-    axiom(forall h : Heap, v : int  :: { $IsAlloc(v,TInt,h) }  $IsAlloc(v,TInt,h));
-    axiom(forall h : Heap, v : real :: { $IsAlloc(v,TReal,h) } $IsAlloc(v,TReal,h));
-    axiom(forall h : Heap, v : bool :: { $IsAlloc(v,TBool,h) } $IsAlloc(v,TBool,h));
-    axiom(forall h : Heap, v : char :: { $IsAlloc(v,TChar,h) } $IsAlloc(v,TChar,h));
-    axiom(forall h : Heap, v : ORDINAL :: { $IsAlloc(v,TORDINAL,h) } $IsAlloc(v,TORDINAL,h));
-    
-    axiom (forall v: Bv0, h: Heap :: { $IsAlloc(v, TBitvector(0), h) } $IsAlloc(v, TBitvector(0), h));
-    
-    axiom (forall v: Set Box, t0: Ty, h: Heap :: { $IsAlloc(v, TSet(t0), h) }
-      $IsAlloc(v, TSet(t0), h) <==>
-      (forall bx: Box :: { v[bx] }
-        v[bx] ==> $IsAllocBox(bx, t0, h)));
-    axiom (forall v: ISet Box, t0: Ty, h: Heap :: { $IsAlloc(v, TISet(t0), h) }
-      $IsAlloc(v, TISet(t0), h) <==>
-      (forall bx: Box :: { v[bx] }
-        v[bx] ==> $IsAllocBox(bx, t0, h)));
-    axiom (forall v: MultiSet Box, t0: Ty, h: Heap :: { $IsAlloc(v, TMultiSet(t0), h) }
-      $IsAlloc(v, TMultiSet(t0), h) <==>
-      (forall bx: Box :: { v[bx] }
-        0 < v[bx] ==> $IsAllocBox(bx, t0, h)));
-    axiom (forall v: Seq Box, t0: Ty, h: Heap :: { $IsAlloc(v, TSeq(t0), h) }
-      $IsAlloc(v, TSeq(t0), h) <==>
-      (forall i : int :: { Seq#Index(v, i) }
-        0 <= i && i < Seq#Length(v) ==>
-    	$IsAllocBox(Seq#Index(v, i), t0, h)));
-    	
-    axiom (forall v: Map Box Box, t0: Ty, t1: Ty, h: Heap ::
-      { $IsAlloc(v, TMap(t0, t1), h) }
-      $IsAlloc(v, TMap(t0, t1), h)
-         <==> (forall bx: Box ::
-          { Map#Elements(v)[bx] } { Map#Domain(v)[bx] }
-          Map#Domain(v)[bx] ==>
-            $IsAllocBox(Map#Elements(v)[bx], t1, h) &&
-            $IsAllocBox(bx, t0, h)));
-            
-    axiom (forall v: IMap Box Box, t0: Ty, t1: Ty, h: Heap ::
-      { $IsAlloc(v, TIMap(t0, t1), h) }
-      $IsAlloc(v, TIMap(t0, t1), h)
-         <==> (forall bx: Box ::
-          { IMap#Elements(v)[bx] } { IMap#Domain(v)[bx] }
-          IMap#Domain(v)[bx] ==>
-            $IsAllocBox(IMap#Elements(v)[bx], t1, h) &&
-            $IsAllocBox(bx, t0, h)));
-}
-
-function $AlwaysAllocated(Ty): bool uses {
-    axiom (forall ty: Ty :: { $AlwaysAllocated(ty) }
-      $AlwaysAllocated(ty) ==>
-      (forall h: Heap, v: Box  :: { $IsAllocBox(v, ty, h) }  $IsBox(v, ty) ==> $IsAllocBox(v, ty, h)));
-}
+function $Is<T>(T,Ty): bool;           // no heap for now
+axiom(forall v : int  :: { $Is(v,TInt) }  $Is(v,TInt));
+axiom(forall v : real :: { $Is(v,TReal) } $Is(v,TReal));
+axiom(forall v : bool :: { $Is(v,TBool) } $Is(v,TBool));
+axiom(forall v : char :: { $Is(v,TChar) } $Is(v,TChar));
+axiom(forall v : ORDINAL :: { $Is(v,TORDINAL) } $Is(v,TORDINAL));
+
+// Since every bitvector type is a separate type in Boogie, the $Is/$IsAlloc axioms
+// for bitvectors are generated programatically. Except, TBitvector(0) is given here.
+axiom (forall v: Bv0 :: { $Is(v, TBitvector(0)) } $Is(v, TBitvector(0)));
+
+axiom (forall v: Set, t0: Ty :: { $Is(v, TSet(t0)) }
+  $Is(v, TSet(t0)) <==>
+  (forall bx: Box :: { Set#IsMember(v, bx) }
+    Set#IsMember(v, bx) ==> $IsBox(bx, t0)));
+axiom (forall v: ISet, t0: Ty :: { $Is(v, TISet(t0)) }
+  $Is(v, TISet(t0)) <==>
+  (forall bx: Box :: { v[bx] }
+    v[bx] ==> $IsBox(bx, t0)));
+axiom (forall v: MultiSet, t0: Ty :: { $Is(v, TMultiSet(t0)) }
+  $Is(v, TMultiSet(t0)) <==>
+  (forall bx: Box :: { MultiSet#Multiplicity(v, bx) }
+    0 < MultiSet#Multiplicity(v, bx) ==> $IsBox(bx, t0)));
+axiom (forall v: MultiSet, t0: Ty :: { $Is(v, TMultiSet(t0)) }
+  $Is(v, TMultiSet(t0)) ==> $IsGoodMultiSet(v));
+axiom (forall v: Seq, t0: Ty :: { $Is(v, TSeq(t0)) }
+  $Is(v, TSeq(t0)) <==>
+  (forall i : int :: { Seq#Index(v, i) }
+    0 <= i && i < Seq#Length(v) ==>
+    $IsBox(Seq#Index(v, i), t0)));
+
+axiom (forall v: Map, t0: Ty, t1: Ty ::
+  { $Is(v, TMap(t0, t1)) }
+  $Is(v, TMap(t0, t1))
+     <==> (forall bx: Box ::
+      { Map#Elements(v)[bx] } { Set#IsMember(Map#Domain(v), bx) }
+      Set#IsMember(Map#Domain(v), bx) ==>
+        $IsBox(Map#Elements(v)[bx], t1) &&
+        $IsBox(bx, t0)));
+
+axiom (forall v: Map, t0: Ty, t1: Ty ::
+  { $Is(v, TMap(t0, t1)) }
+  $Is(v, TMap(t0, t1)) ==>
+    $Is(Map#Domain(v), TSet(t0)) &&
+    $Is(Map#Values(v), TSet(t1)) &&
+    $Is(Map#Items(v), TSet(Tclass._System.Tuple2(t0, t1))));
+axiom (forall v: IMap, t0: Ty, t1: Ty ::
+  { $Is(v, TIMap(t0, t1)) }
+  $Is(v, TIMap(t0, t1))
+     <==> (forall bx: Box ::
+      { IMap#Elements(v)[bx] } { IMap#Domain(v)[bx] }
+      IMap#Domain(v)[bx] ==>
+        $IsBox(IMap#Elements(v)[bx], t1) &&
+        $IsBox(bx, t0)));
+axiom (forall v: IMap, t0: Ty, t1: Ty ::
+  { $Is(v, TIMap(t0, t1)) }
+  $Is(v, TIMap(t0, t1)) ==>
+    $Is(IMap#Domain(v), TISet(t0)) &&
+    $Is(IMap#Values(v), TISet(t1)) &&
+    $Is(IMap#Items(v), TISet(Tclass._System.Tuple2(t0, t1))));
+
+function $IsAlloc<T>(T,Ty,Heap): bool;
+axiom(forall h : Heap, v : int  :: { $IsAlloc(v,TInt,h) }  $IsAlloc(v,TInt,h));
+axiom(forall h : Heap, v : real :: { $IsAlloc(v,TReal,h) } $IsAlloc(v,TReal,h));
+axiom(forall h : Heap, v : bool :: { $IsAlloc(v,TBool,h) } $IsAlloc(v,TBool,h));
+axiom(forall h : Heap, v : char :: { $IsAlloc(v,TChar,h) } $IsAlloc(v,TChar,h));
+axiom(forall h : Heap, v : ORDINAL :: { $IsAlloc(v,TORDINAL,h) } $IsAlloc(v,TORDINAL,h));
+
+axiom (forall v: Bv0, h: Heap :: { $IsAlloc(v, TBitvector(0), h) } $IsAlloc(v, TBitvector(0), h));
+
+axiom (forall v: Set, t0: Ty, h: Heap :: { $IsAlloc(v, TSet(t0), h) }
+  $IsAlloc(v, TSet(t0), h) <==>
+  (forall bx: Box :: { Set#IsMember(v, bx) }
+    Set#IsMember(v, bx) ==> $IsAllocBox(bx, t0, h)));
+axiom (forall v: ISet, t0: Ty, h: Heap :: { $IsAlloc(v, TISet(t0), h) }
+  $IsAlloc(v, TISet(t0), h) <==>
+  (forall bx: Box :: { v[bx] }
+    v[bx] ==> $IsAllocBox(bx, t0, h)));
+axiom (forall v: MultiSet, t0: Ty, h: Heap :: { $IsAlloc(v, TMultiSet(t0), h) }
+  $IsAlloc(v, TMultiSet(t0), h) <==>
+  (forall bx: Box :: { MultiSet#Multiplicity(v, bx) }
+    0 < MultiSet#Multiplicity(v, bx) ==> $IsAllocBox(bx, t0, h)));
+axiom (forall v: Seq, t0: Ty, h: Heap :: { $IsAlloc(v, TSeq(t0), h) }
+  $IsAlloc(v, TSeq(t0), h) <==>
+  (forall i : int :: { Seq#Index(v, i) }
+    0 <= i && i < Seq#Length(v) ==>
+	$IsAllocBox(Seq#Index(v, i), t0, h)));
+	
+axiom (forall v: Map, t0: Ty, t1: Ty, h: Heap ::
+  { $IsAlloc(v, TMap(t0, t1), h) }
+  $IsAlloc(v, TMap(t0, t1), h)
+     <==> (forall bx: Box ::
+      { Map#Elements(v)[bx] } { Set#IsMember(Map#Domain(v), bx) }
+      Set#IsMember(Map#Domain(v), bx) ==>
+        $IsAllocBox(Map#Elements(v)[bx], t1, h) &&
+        $IsAllocBox(bx, t0, h)));
+
+axiom (forall v: IMap, t0: Ty, t1: Ty, h: Heap ::
+  { $IsAlloc(v, TIMap(t0, t1), h) }
+  $IsAlloc(v, TIMap(t0, t1), h)
+     <==> (forall bx: Box ::
+      { IMap#Elements(v)[bx] } { IMap#Domain(v)[bx] }
+      IMap#Domain(v)[bx] ==>
+        $IsAllocBox(IMap#Elements(v)[bx], t1, h) &&
+        $IsAllocBox(bx, t0, h)));
+
+
+function $AlwaysAllocated(Ty): bool;
+  axiom (forall ty: Ty :: { $AlwaysAllocated(ty) }
+    $AlwaysAllocated(ty) ==>
+    (forall h: Heap, v: Box  :: { $IsAllocBox(v, ty, h) }  $IsBox(v, ty) ==> $IsAllocBox(v, ty, h)));
 
 function $OlderTag(Heap): bool;
 
@@ -370,9 +366,9 @@ axiom (forall a: ClassName, b: ClassName :: { TypeTuple(a,b) }
 
 type HandleType;
 
-function SetRef_to_SetBox(s: [ref]bool): Set Box;
-axiom (forall s: [ref]bool, bx: Box :: { SetRef_to_SetBox(s)[bx] }
-  SetRef_to_SetBox(s)[bx] == s[$Unbox(bx): ref]);
+function SetRef_to_SetBox(s: [ref]bool): Set;
+axiom (forall s: [ref]bool, bx: Box :: { Set#IsMember(SetRef_to_SetBox(s), bx) }
+  Set#IsMember(SetRef_to_SetBox(s), bx) == s[$Unbox(bx): ref]);
 axiom (forall s: [ref]bool :: { SetRef_to_SetBox(s) }
   $Is(SetRef_to_SetBox(s), TSet(Tclass._System.object?())));
 
@@ -484,14 +480,6 @@ axiom (forall o: ORDINAL, m,n: int ::
     (0 <= m - n ==> ORD#Plus(ORD#Minus(o, ORD#FromNat(m)), ORD#FromNat(n)) == ORD#Minus(o, ORD#FromNat(m-n))) &&
     (m - n <= 0 ==> ORD#Plus(ORD#Minus(o, ORD#FromNat(m)), ORD#FromNat(n)) == ORD#Plus(o, ORD#FromNat(n-m))));
 
-// ---------------------------------------------------------------
-// -- Axiom contexts ---------------------------------------------
-// ---------------------------------------------------------------
-
-// used to make sure function axioms are not used while their consistency is being checked
-const $ModuleContextHeight: int;
-const $FunctionContextHeight: int;
-
 // ---------------------------------------------------------------
 // -- Layers of function encodings -------------------------------
 // ---------------------------------------------------------------
@@ -509,45 +497,44 @@ axiom (forall<A> f : [LayerType]A, ly : LayerType :: { AtLayer(f,$LS(ly)) } AtLa
 // -- Fields -----------------------------------------------------
 // ---------------------------------------------------------------
 
-type Field alpha;
+type Field;
 
-function FDim<T>(Field T): int uses {
+function FDim(Field): int uses {
   axiom FDim(alloc) == 0;
 }
 
-function IndexField(int): Field Box;
+function IndexField(int): Field;
 axiom (forall i: int :: { IndexField(i) } FDim(IndexField(i)) == 1);
-function IndexField_Inverse<T>(Field T): int;
+function IndexField_Inverse(Field): int;
 axiom (forall i: int :: { IndexField(i) } IndexField_Inverse(IndexField(i)) == i);
 
-function MultiIndexField(Field Box, int): Field Box;
-axiom (forall f: Field Box, i: int :: { MultiIndexField(f,i) } FDim(MultiIndexField(f,i)) == FDim(f) + 1);
-function MultiIndexField_Inverse0<T>(Field T): Field T;
-function MultiIndexField_Inverse1<T>(Field T): int;
-axiom (forall f: Field Box, i: int :: { MultiIndexField(f,i) }
+function MultiIndexField(Field, int): Field;
+axiom (forall f: Field, i: int :: { MultiIndexField(f,i) } FDim(MultiIndexField(f,i)) == FDim(f) + 1);
+function MultiIndexField_Inverse0(Field): Field;
+function MultiIndexField_Inverse1(Field): int;
+axiom (forall f: Field, i: int :: { MultiIndexField(f,i) }
   MultiIndexField_Inverse0(MultiIndexField(f,i)) == f &&
   MultiIndexField_Inverse1(MultiIndexField(f,i)) == i);
 
-function DeclType<T>(Field T): ClassName;
+function DeclType(Field): ClassName;
 
 type NameFamily;
-function DeclName<T>(Field T): NameFamily uses {
+function DeclName(Field): NameFamily uses {
   axiom DeclName(alloc) == allocName;
 }
-function FieldOfDecl<alpha>(ClassName, NameFamily): Field alpha;
-axiom (forall<T> cl : ClassName, nm: NameFamily ::
-   {FieldOfDecl(cl, nm): Field T}
-   DeclType(FieldOfDecl(cl, nm): Field T) == cl && DeclName(FieldOfDecl(cl, nm): Field T) == nm);
+function FieldOfDecl(ClassName, NameFamily): Field;
+axiom (forall cl : ClassName, nm: NameFamily ::
+   {FieldOfDecl(cl, nm): Field}
+   DeclType(FieldOfDecl(cl, nm): Field) == cl && DeclName(FieldOfDecl(cl, nm): Field) == nm);
 
-function $IsGhostField<T>(Field T): bool uses {
+function $IsGhostField(Field): bool uses {
    axiom $IsGhostField(alloc); // treat as ghost field, since it is allowed to be changed by ghost code
-  
-   axiom (forall h: Heap, k: Heap :: { $HeapSuccGhost(h,k) }
-      $HeapSuccGhost(h,k) ==>
-        $HeapSucc(h,k) &&
-        (forall<alpha> o: ref, f: Field alpha :: { read(k, o, f) }
-          !$IsGhostField(f) ==> read(h, o, f) == read(k, o, f)));
 }
+axiom (forall h: Heap, k: Heap :: { $HeapSuccGhost(h,k) }
+  $HeapSuccGhost(h,k) ==>
+    $HeapSucc(h,k) &&
+    (forall o: ref, f: Field :: { read(k, o, f) }
+      !$IsGhostField(f) ==> read(h, o, f) == read(k, o, f)));
 
 // ---------------------------------------------------------------
 // -- Allocatedness and Heap Succession --------------------------
@@ -565,16 +552,16 @@ axiom (forall h, k : Heap, bx : Box, t : Ty ::
 
 // No axioms for $Is and $IsBox since they don't talk about the heap.
 
-const unique alloc: Field bool;
+const unique alloc: Field;
 const unique allocName: NameFamily;
 
 // ---------------------------------------------------------------
 // -- Arrays -----------------------------------------------------
 // ---------------------------------------------------------------
 
-function _System.array.Length(a: ref): int uses {
-  axiom (forall o: ref :: 0 <= _System.array.Length(o));
-}
+function _System.array.Length(a: ref): int;
+axiom (forall o: ref :: {_System.array.Length(o)} 0 <= _System.array.Length(o));
+
 
 // ---------------------------------------------------------------
 // -- Reals ------------------------------------------------------
@@ -589,9 +576,9 @@ function {:inline} _System.real.Floor(x: real): int { Int(x) }
 // ---------------------------------------------------------------
 // -- The heap ---------------------------------------------------
 // ---------------------------------------------------------------
-type Heap = [ref]<alpha>[Field alpha]Box;
-function {:inline} read<alpha>(H: Heap, r: ref, f: Field alpha) : alpha { $Unbox(H[r][f]) }
-function {:inline} update<alpha>(H:Heap, r:ref, f:Field alpha, v:alpha): Heap { H[r := H[r][f := $Box(v)]] }
+type Heap = [ref][Field]Box;
+function {:inline} read(H: Heap, r: ref, f: Field) : Box { H[r][f] }
+function {:inline} update(H:Heap, r:ref, f: Field, v: Box) : Heap { H[r := H[r][f := v]] }
 
 function $IsGoodHeap(Heap): bool;
 function $IsHeapAnchor(Heap): bool;
@@ -605,13 +592,13 @@ const $OneHeap: Heap uses {
 }
 
 function $HeapSucc(Heap, Heap): bool;
-axiom (forall<alpha> h: Heap, r: ref, f: Field alpha, x: alpha :: { update(h, r, f, x) }
+axiom (forall h: Heap, r: ref, f: Field, x: Box :: { update(h, r, f, x) }
   $IsGoodHeap(update(h, r, f, x)) ==>
   $HeapSucc(h, update(h, r, f, x)));
 axiom (forall a,b,c: Heap :: { $HeapSucc(a,b), $HeapSucc(b,c) }
   a != c ==> $HeapSucc(a,b) && $HeapSucc(b,c) ==> $HeapSucc(a,c));
 axiom (forall h: Heap, k: Heap :: { $HeapSucc(h,k) }
-  $HeapSucc(h,k) ==> (forall o: ref :: { read(k, o, alloc) } read(h, o, alloc) ==> read(k, o, alloc)));
+  $HeapSucc(h,k) ==> (forall o: ref :: { read(k, o, alloc) } $Unbox(read(h, o, alloc)) ==> $Unbox(read(k, o, alloc))));
 
 function $HeapSuccGhost(Heap, Heap): bool;
 
@@ -620,37 +607,37 @@ function $HeapSuccGhost(Heap, Heap): bool;
 // ---------------------------------------------------------------
 
 // havoc everything in $Heap, except {this}+rds+nw
-procedure $YieldHavoc(this: ref, rds: Set Box, nw: Set Box);
+procedure $YieldHavoc(this: ref, rds: Set, nw: Set);
   modifies $Heap;
-  ensures (forall<alpha> $o: ref, $f: Field alpha :: { read($Heap, $o, $f) }
-            $o != null && read(old($Heap), $o, alloc) ==>
-            $o == this || rds[$Box($o)] || nw[$Box($o)] ==>
+  ensures (forall $o: ref, $f: Field :: { read($Heap, $o, $f) }
+            $o != null && $Unbox(read(old($Heap), $o, alloc)) ==>
+            $o == this || Set#IsMember(rds, $Box($o)) || Set#IsMember(nw, $Box($o)) ==>
               read($Heap, $o, $f) == read(old($Heap), $o, $f));
   ensures $HeapSucc(old($Heap), $Heap);
 
 // havoc everything in $Heap, except rds-modi-{this}
-procedure $IterHavoc0(this: ref, rds: Set Box, modi: Set Box);
+procedure $IterHavoc0(this: ref, rds: Set, modi: Set);
   modifies $Heap;
-  ensures (forall<alpha> $o: ref, $f: Field alpha :: { read($Heap, $o, $f) }
-            $o != null && read(old($Heap), $o, alloc) ==>
-            rds[$Box($o)] && !modi[$Box($o)] && $o != this ==>
+  ensures (forall $o: ref, $f: Field :: { read($Heap, $o, $f) }
+            $o != null && $Unbox(read(old($Heap), $o, alloc)) ==>
+            Set#IsMember(rds, $Box($o)) && !Set#IsMember(modi, $Box($o)) && $o != this ==>
               read($Heap, $o, $f) == read(old($Heap), $o, $f));
   ensures $HeapSucc(old($Heap), $Heap);
 
 // havoc $Heap at {this}+modi+nw
-procedure $IterHavoc1(this: ref, modi: Set Box, nw: Set Box);
+procedure $IterHavoc1(this: ref, modi: Set, nw: Set);
   modifies $Heap;
-  ensures (forall<alpha> $o: ref, $f: Field alpha :: { read($Heap, $o, $f) }
-            $o != null && read(old($Heap), $o, alloc) ==>
+  ensures (forall $o: ref, $f: Field :: { read($Heap, $o, $f) }
+            $o != null && $Unbox(read(old($Heap), $o, alloc)) ==>
               read($Heap, $o, $f) == read(old($Heap), $o, $f) ||
-              $o == this || modi[$Box($o)] || nw[$Box($o)]);
+              $o == this || Set#IsMember(modi, $Box($o)) || Set#IsMember(nw, $Box($o)));
   ensures $HeapSucc(old($Heap), $Heap);
 
-procedure $IterCollectNewObjects(prevHeap: Heap, newHeap: Heap, this: ref, NW: Field (Set Box))
-                        returns (s: Set Box);
-  ensures (forall bx: Box :: { s[bx] } s[bx] <==>
-              (read(newHeap, this, NW) : Set Box)[bx] ||
-              ($Unbox(bx) != null && !read(prevHeap, $Unbox(bx):ref, alloc) && read(newHeap, $Unbox(bx):ref, alloc)));
+procedure $IterCollectNewObjects(prevHeap: Heap, newHeap: Heap, this: ref, NW: Field)
+                        returns (s: Set);
+  ensures (forall bx: Box :: { Set#IsMember(s, bx) } Set#IsMember(s, bx) <==>
+              Set#IsMember($Unbox(read(newHeap, this, NW)) : Set, bx) ||
+              ($Unbox(bx) != null && !$Unbox(read(prevHeap, $Unbox(bx):ref, alloc)) && $Unbox(read(newHeap, $Unbox(bx):ref, alloc))));
 
 // ---------------------------------------------------------------
 // -- Axiomatizations --------------------------------------------
@@ -660,454 +647,671 @@ procedure $IterCollectNewObjects(prevHeap: Heap, newHeap: Heap, this: ref, NW: F
 // -- Axiomatization of sets -------------------------------------
 // ---------------------------------------------------------------
 
-type Set T = [T]bool;
-
-function Set#Card<T>(Set T): int;
-axiom (forall<T> s: Set T :: { Set#Card(s) } 0 <= Set#Card(s));
-
-function Set#Empty<T>(): Set T;
-axiom (forall<T> o: T :: { Set#Empty()[o] } !Set#Empty()[o]);
-axiom (forall<T> s: Set T :: { Set#Card(s) }
-  (Set#Card(s) == 0 <==> s == Set#Empty()) &&
-  (Set#Card(s) != 0 ==> (exists x: T :: s[x])));
-
-// the empty set could be of anything
-//axiom (forall<T> t: Ty :: { $Is(Set#Empty() : [T]bool, TSet(t)) } $Is(Set#Empty() : [T]bool, TSet(t)));
-
-function Set#Singleton<T>(T): Set T;
-axiom (forall<T> r: T :: { Set#Singleton(r) } Set#Singleton(r)[r]);
-axiom (forall<T> r: T, o: T :: { Set#Singleton(r)[o] } Set#Singleton(r)[o] <==> r == o);
-axiom (forall<T> r: T :: { Set#Card(Set#Singleton(r)) } Set#Card(Set#Singleton(r)) == 1);
-
-function Set#UnionOne<T>(Set T, T): Set T;
-axiom (forall<T> a: Set T, x: T, o: T :: { Set#UnionOne(a,x)[o] }
-  Set#UnionOne(a,x)[o] <==> o == x || a[o]);
-axiom (forall<T> a: Set T, x: T :: { Set#UnionOne(a, x) }
-  Set#UnionOne(a, x)[x]);
-axiom (forall<T> a: Set T, x: T, y: T :: { Set#UnionOne(a, x), a[y] }
-  a[y] ==> Set#UnionOne(a, x)[y]);
-axiom (forall<T> a: Set T, x: T :: { Set#Card(Set#UnionOne(a, x)) }
-  a[x] ==> Set#Card(Set#UnionOne(a, x)) == Set#Card(a));
-axiom (forall<T> a: Set T, x: T :: { Set#Card(Set#UnionOne(a, x)) }
-  !a[x] ==> Set#Card(Set#UnionOne(a, x)) == Set#Card(a) + 1);
-
-function Set#Union<T>(Set T, Set T): Set T;
-axiom (forall<T> a: Set T, b: Set T, o: T :: { Set#Union(a,b)[o] }
-  Set#Union(a,b)[o] <==> a[o] || b[o]);
-axiom (forall<T> a, b: Set T, y: T :: { Set#Union(a, b), a[y] }
-  a[y] ==> Set#Union(a, b)[y]);
-axiom (forall<T> a, b: Set T, y: T :: { Set#Union(a, b), b[y] }
-  b[y] ==> Set#Union(a, b)[y]);
-axiom (forall<T> a, b: Set T :: { Set#Union(a, b) }
-  Set#Disjoint(a, b) ==>
-    Set#Difference(Set#Union(a, b), a) == b &&
-    Set#Difference(Set#Union(a, b), b) == a);
-// Follows from the general union axiom, but might be still worth including, because disjoint union is a common case:
-// axiom (forall<T> a, b: Set T :: { Set#Card(Set#Union(a, b)) }
-//   Set#Disjoint(a, b) ==>
-//     Set#Card(Set#Union(a, b)) == Set#Card(a) + Set#Card(b));
-
-function Set#Intersection<T>(Set T, Set T): Set T;
-axiom (forall<T> a: Set T, b: Set T, o: T :: { Set#Intersection(a,b)[o] }
-  Set#Intersection(a,b)[o] <==> a[o] && b[o]);
-
-axiom (forall<T> a, b: Set T :: { Set#Union(Set#Union(a, b), b) }
+
+
+type Set;
+
+function Set#Card(s: Set) : int;
+
+axiom (forall s: Set :: { Set#Card(s) } 0 <= Set#Card(s));
+
+function Set#Empty() : Set;
+
+function Set#IsMember(s: Set, o: Box) : bool;
+
+axiom (forall o: Box ::
+  { Set#IsMember(Set#Empty(), o) }
+  !Set#IsMember(Set#Empty(), o));
+
+axiom (forall s: Set ::
+  { Set#Card(s) }
+  (Set#Card(s) == 0 <==> s == Set#Empty())
+     && (Set#Card(s) != 0
+       ==> (exists x: Box :: { Set#IsMember(s, x) } Set#IsMember(s, x))));
+
+function Set#UnionOne(s: Set, o: Box) : Set;
+
+axiom (forall a: Set, x: Box, o: Box ::
+  { Set#IsMember(Set#UnionOne(a, x), o) }
+  Set#IsMember(Set#UnionOne(a, x), o) <==> o == x || Set#IsMember(a, o));
+
+axiom (forall a: Set, x: Box ::
+  { Set#UnionOne(a, x) }
+  Set#IsMember(Set#UnionOne(a, x), x));
+
+axiom (forall a: Set, x: Box, y: Box ::
+  { Set#UnionOne(a, x), Set#IsMember(a, y) }
+  Set#IsMember(a, y) ==> Set#IsMember(Set#UnionOne(a, x), y));
+
+axiom (forall a: Set, x: Box ::
+  { Set#Card(Set#UnionOne(a, x)) }
+  Set#IsMember(a, x) ==> Set#Card(Set#UnionOne(a, x)) == Set#Card(a));
+
+axiom (forall a: Set, x: Box ::
+  { Set#Card(Set#UnionOne(a, x)) }
+  !Set#IsMember(a, x) ==> Set#Card(Set#UnionOne(a, x)) == Set#Card(a) + 1);
+
+function Set#Union(a: Set, b: Set) : Set;
+
+axiom (forall a: Set, b: Set, o: Box ::
+  { Set#IsMember(Set#Union(a, b), o) }
+  Set#IsMember(Set#Union(a, b), o) <==> Set#IsMember(a, o) || Set#IsMember(b, o));
+
+axiom (forall a: Set, b: Set, y: Box ::
+  { Set#Union(a, b), Set#IsMember(a, y) }
+  Set#IsMember(a, y) ==> Set#IsMember(Set#Union(a, b), y));
+
+axiom (forall a: Set, b: Set, y: Box ::
+  { Set#Union(a, b), Set#IsMember(b, y) }
+  Set#IsMember(b, y) ==> Set#IsMember(Set#Union(a, b), y));
+
+axiom (forall a: Set, b: Set ::
+  { Set#Union(a, b) }
+  Set#Disjoint(a, b)
+     ==> Set#Difference(Set#Union(a, b), a) == b
+       && Set#Difference(Set#Union(a, b), b) == a);
+
+function Set#Intersection(a: Set, b: Set) : Set;
+
+axiom (forall a: Set, b: Set, o: Box ::
+  { Set#IsMember(Set#Intersection(a, b), o) }
+  Set#IsMember(Set#Intersection(a, b), o)
+     <==> Set#IsMember(a, o) && Set#IsMember(b, o));
+
+axiom (forall a: Set, b: Set ::
+  { Set#Union(Set#Union(a, b), b) }
   Set#Union(Set#Union(a, b), b) == Set#Union(a, b));
-axiom (forall<T> a, b: Set T :: { Set#Union(a, Set#Union(a, b)) }
+
+axiom (forall a: Set, b: Set ::
+  { Set#Union(a, Set#Union(a, b)) }
   Set#Union(a, Set#Union(a, b)) == Set#Union(a, b));
-axiom (forall<T> a, b: Set T :: { Set#Intersection(Set#Intersection(a, b), b) }
+
+axiom (forall a: Set, b: Set ::
+  { Set#Intersection(Set#Intersection(a, b), b) }
   Set#Intersection(Set#Intersection(a, b), b) == Set#Intersection(a, b));
-axiom (forall<T> a, b: Set T :: { Set#Intersection(a, Set#Intersection(a, b)) }
+
+axiom (forall a: Set, b: Set ::
+  { Set#Intersection(a, Set#Intersection(a, b)) }
   Set#Intersection(a, Set#Intersection(a, b)) == Set#Intersection(a, b));
-axiom (forall<T> a, b: Set T :: { Set#Card(Set#Union(a, b)) }{ Set#Card(Set#Intersection(a, b)) }
-  Set#Card(Set#Union(a, b)) + Set#Card(Set#Intersection(a, b)) == Set#Card(a) + Set#Card(b));
-
-function Set#Difference<T>(Set T, Set T): Set T;
-axiom (forall<T> a: Set T, b: Set T, o: T :: { Set#Difference(a,b)[o] }
-  Set#Difference(a,b)[o] <==> a[o] && !b[o]);
-axiom (forall<T> a, b: Set T, y: T :: { Set#Difference(a, b), b[y] }
-  b[y] ==> !Set#Difference(a, b)[y] );
-axiom (forall<T> a, b: Set T ::
-  { Set#Card(Set#Difference(a, b)) }
-  Set#Card(Set#Difference(a, b)) + Set#Card(Set#Difference(b, a))
-  + Set#Card(Set#Intersection(a, b))
-    == Set#Card(Set#Union(a, b)) &&
-  Set#Card(Set#Difference(a, b)) == Set#Card(a) - Set#Card(Set#Intersection(a, b)));
 
-function Set#Subset<T>(Set T, Set T): bool;
-axiom (forall<T> a: Set T, b: Set T :: { Set#Subset(a,b) }
-  Set#Subset(a,b) <==> (forall o: T :: {a[o]} {b[o]} a[o] ==> b[o]));
-// axiom(forall<T> a: Set T, b: Set T ::
-//   { Set#Subset(a,b), Set#Card(a), Set#Card(b) }  // very restrictive trigger
-//   Set#Subset(a,b) ==> Set#Card(a) <= Set#Card(b));
+axiom (forall a: Set, b: Set ::
+  { Set#Card(Set#Union(a, b)) } { Set#Card(Set#Intersection(a, b)) }
+  Set#Card(Set#Union(a, b)) + Set#Card(Set#Intersection(a, b))
+     == Set#Card(a) + Set#Card(b));
+
+function Set#Difference(a: Set, b: Set) : Set;
 
+axiom (forall a: Set, b: Set, o: Box ::
+  { Set#IsMember(Set#Difference(a, b), o) }
+  Set#IsMember(Set#Difference(a, b), o)
+     <==> Set#IsMember(a, o) && !Set#IsMember(b, o));
 
-function Set#Equal<T>(Set T, Set T): bool;
-axiom (forall<T> a: Set T, b: Set T :: { Set#Equal(a,b) }
-  Set#Equal(a,b) <==> (forall o: T :: {a[o]} {b[o]} a[o] <==> b[o]));
-axiom (forall<T> a: Set T, b: Set T :: { Set#Equal(a,b) }  // extensionality axiom for sets
-  Set#Equal(a,b) ==> a == b);
+axiom (forall a: Set, b: Set, y: Box ::
+  { Set#Difference(a, b), Set#IsMember(b, y) }
+  Set#IsMember(b, y) ==> !Set#IsMember(Set#Difference(a, b), y));
 
-function Set#Disjoint<T>(Set T, Set T): bool;
-axiom (forall<T> a: Set T, b: Set T :: { Set#Disjoint(a,b) }
-  Set#Disjoint(a,b) <==> (forall o: T :: {a[o]} {b[o]} !a[o] || !b[o]));
+axiom (forall a: Set, b: Set ::
+  { Set#Card(Set#Difference(a, b)) }
+  Set#Card(Set#Difference(a, b))
+         + Set#Card(Set#Difference(b, a))
+         + Set#Card(Set#Intersection(a, b))
+       == Set#Card(Set#Union(a, b))
+     && Set#Card(Set#Difference(a, b)) == Set#Card(a) - Set#Card(Set#Intersection(a, b)));
+
+function Set#Subset(a: Set, b: Set) : bool;
+
+axiom (forall a: Set, b: Set ::
+  { Set#Subset(a, b) }
+  Set#Subset(a, b)
+     <==> (forall o: Box ::
+      { Set#IsMember(a, o) } { Set#IsMember(b, o) }
+      Set#IsMember(a, o) ==> Set#IsMember(b, o)));
+
+function Set#Equal(a: Set, b: Set) : bool;
+
+axiom (forall a: Set, b: Set ::
+  { Set#Equal(a, b) }
+  Set#Equal(a, b)
+     <==> (forall o: Box ::
+      { Set#IsMember(a, o) } { Set#IsMember(b, o) }
+      Set#IsMember(a, o) <==> Set#IsMember(b, o)));
+
+axiom (forall a: Set, b: Set :: { Set#Equal(a, b) } Set#Equal(a, b) ==> a == b);
+
+function Set#Disjoint(a: Set, b: Set) : bool;
+
+axiom (forall a: Set, b: Set ::
+  { Set#Disjoint(a, b) }
+  Set#Disjoint(a, b)
+     <==> (forall o: Box ::
+      { Set#IsMember(a, o) } { Set#IsMember(b, o) }
+      !Set#IsMember(a, o) || !Set#IsMember(b, o)));
+
+
+// FIXME: Finite-set comprehensions are translated into Boogie lambda expressions for Boogie maps and then converted,
+// using function Set#FromBoogieMap, to a set. The use of Boogie lambda expressions is convenient, since Boogie
+// performs lambda lifting on them. However, this is NOT right, because it allows ANY lambda to be converted
+// into a finite set. This should be fixed by doing the lambda lifting directly in Dafny and not use Boogie lambda
+// expressions.
+function Set#FromBoogieMap([Box]bool): Set;
+axiom (forall m: [Box]bool, bx: Box ::
+  { Set#IsMember(Set#FromBoogieMap(m), bx) }
+  Set#IsMember(Set#FromBoogieMap(m), bx) == m[bx]);
 
 // ---------------------------------------------------------------
 // -- Axiomatization of isets -------------------------------------
 // ---------------------------------------------------------------
 
-type ISet T = [T]bool;
+type ISet = [Box]bool;
 
-function ISet#Empty<T>(): Set T;
-axiom (forall<T> o: T :: { ISet#Empty()[o] } !ISet#Empty()[o]);
+function ISet#Empty(): ISet;
+axiom (forall o: Box :: { ISet#Empty()[o] } !ISet#Empty()[o]);
 
-// the empty set could be of anything
-//axiom (forall<T> t: Ty :: { $Is(ISet#Empty() : [T]bool, TISet(t)) } $Is(ISet#Empty() : [T]bool, TISet(t)));
+function ISet#FromSet(Set): ISet;
+axiom (forall s: Set, bx: Box ::
+  { ISet#FromSet(s)[bx] }
+  ISet#FromSet(s)[bx] == Set#IsMember(s, bx));
 
-
-function ISet#UnionOne<T>(ISet T, T): ISet T;
-axiom (forall<T> a: ISet T, x: T, o: T :: { ISet#UnionOne(a,x)[o] }
+function ISet#UnionOne(ISet, Box): ISet;
+axiom (forall a: ISet, x: Box, o: Box :: { ISet#UnionOne(a,x)[o] }
   ISet#UnionOne(a,x)[o] <==> o == x || a[o]);
-axiom (forall<T> a: ISet T, x: T :: { ISet#UnionOne(a, x) }
+axiom (forall a: ISet, x: Box :: { ISet#UnionOne(a, x) }
   ISet#UnionOne(a, x)[x]);
-axiom (forall<T> a: ISet T, x: T, y: T :: { ISet#UnionOne(a, x), a[y] }
+axiom (forall a: ISet, x: Box, y: Box :: { ISet#UnionOne(a, x), a[y] }
   a[y] ==> ISet#UnionOne(a, x)[y]);
 
-function ISet#Union<T>(ISet T, ISet T): ISet T;
-axiom (forall<T> a: ISet T, b: ISet T, o: T :: { ISet#Union(a,b)[o] }
+function ISet#Union(ISet, ISet): ISet;
+axiom (forall a: ISet, b: ISet, o: Box :: { ISet#Union(a,b)[o] }
   ISet#Union(a,b)[o] <==> a[o] || b[o]);
-axiom (forall<T> a, b: ISet T, y: T :: { ISet#Union(a, b), a[y] }
+axiom (forall a, b: ISet, y: Box :: { ISet#Union(a, b), a[y] }
   a[y] ==> ISet#Union(a, b)[y]);
-axiom (forall<T> a, b: Set T, y: T :: { ISet#Union(a, b), b[y] }
+axiom (forall a, b: ISet, y: Box :: { ISet#Union(a, b), b[y] }
   b[y] ==> ISet#Union(a, b)[y]);
-axiom (forall<T> a, b: ISet T :: { ISet#Union(a, b) }
+axiom (forall a, b: ISet :: { ISet#Union(a, b) }
   ISet#Disjoint(a, b) ==>
     ISet#Difference(ISet#Union(a, b), a) == b &&
     ISet#Difference(ISet#Union(a, b), b) == a);
 
-function ISet#Intersection<T>(ISet T, ISet T): ISet T;
-axiom (forall<T> a: ISet T, b: ISet T, o: T :: { ISet#Intersection(a,b)[o] }
+function ISet#Intersection(ISet, ISet): ISet;
+axiom (forall a: ISet, b: ISet, o: Box :: { ISet#Intersection(a,b)[o] }
   ISet#Intersection(a,b)[o] <==> a[o] && b[o]);
 
-axiom (forall<T> a, b: ISet T :: { ISet#Union(ISet#Union(a, b), b) }
+axiom (forall a, b: ISet :: { ISet#Union(ISet#Union(a, b), b) }
   ISet#Union(ISet#Union(a, b), b) == ISet#Union(a, b));
-axiom (forall<T> a, b: Set T :: { ISet#Union(a, ISet#Union(a, b)) }
+axiom (forall a, b: ISet :: { ISet#Union(a, ISet#Union(a, b)) }
   ISet#Union(a, ISet#Union(a, b)) == ISet#Union(a, b));
-axiom (forall<T> a, b: ISet T :: { ISet#Intersection(ISet#Intersection(a, b), b) }
+axiom (forall a, b: ISet :: { ISet#Intersection(ISet#Intersection(a, b), b) }
   ISet#Intersection(ISet#Intersection(a, b), b) == ISet#Intersection(a, b));
-axiom (forall<T> a, b: ISet T :: { ISet#Intersection(a, ISet#Intersection(a, b)) }
+axiom (forall a, b: ISet :: { ISet#Intersection(a, ISet#Intersection(a, b)) }
   ISet#Intersection(a, ISet#Intersection(a, b)) == ISet#Intersection(a, b));
 
 
-function ISet#Difference<T>(ISet T, ISet T): ISet T;
-axiom (forall<T> a: ISet T, b: ISet T, o: T :: { ISet#Difference(a,b)[o] }
+function ISet#Difference(ISet, ISet): ISet;
+axiom (forall a: ISet, b: ISet, o: Box :: { ISet#Difference(a,b)[o] }
   ISet#Difference(a,b)[o] <==> a[o] && !b[o]);
-axiom (forall<T> a, b: ISet T, y: T :: { ISet#Difference(a, b), b[y] }
+axiom (forall a, b: ISet, y: Box :: { ISet#Difference(a, b), b[y] }
   b[y] ==> !ISet#Difference(a, b)[y] );
 
-function ISet#Subset<T>(ISet T, ISet T): bool;
-axiom (forall<T> a: ISet T, b: ISet T :: { ISet#Subset(a,b) }
-  ISet#Subset(a,b) <==> (forall o: T :: {a[o]} {b[o]} a[o] ==> b[o]));
+function ISet#Subset(ISet, ISet): bool;
+axiom (forall a: ISet, b: ISet :: { ISet#Subset(a,b) }
+  ISet#Subset(a,b) <==> (forall o: Box :: {a[o]} {b[o]} a[o] ==> b[o]));
 
-function ISet#Equal<T>(ISet T, ISet T): bool;
-axiom (forall<T> a: ISet T, b: ISet T :: { ISet#Equal(a,b) }
-  ISet#Equal(a,b) <==> (forall o: T :: {a[o]} {b[o]} a[o] <==> b[o]));
-axiom (forall<T> a: ISet T, b: ISet T :: { ISet#Equal(a,b) }  // extensionality axiom for sets
+function ISet#Equal(ISet, ISet): bool;
+axiom (forall a: ISet, b: ISet :: { ISet#Equal(a,b) }
+  ISet#Equal(a,b) <==> (forall o: Box :: {a[o]} {b[o]} a[o] <==> b[o]));
+axiom (forall a: ISet, b: ISet :: { ISet#Equal(a,b) }  // extensionality axiom for sets
   ISet#Equal(a,b) ==> a == b);
 
-function ISet#Disjoint<T>(ISet T, ISet T): bool;
-axiom (forall<T> a: ISet T, b: ISet T :: { ISet#Disjoint(a,b) }
-  ISet#Disjoint(a,b) <==> (forall o: T :: {a[o]} {b[o]} !a[o] || !b[o]));
+function ISet#Disjoint(ISet, ISet): bool;
+axiom (forall a: ISet, b: ISet :: { ISet#Disjoint(a,b) }
+  ISet#Disjoint(a,b) <==> (forall o: Box :: {a[o]} {b[o]} !a[o] || !b[o]));
 
 // ---------------------------------------------------------------
 // -- Axiomatization of multisets --------------------------------
 // ---------------------------------------------------------------
 
-function Math#min(a: int, b: int): int;
+
+
+function Math#min(a: int, b: int) : int;
+
 axiom (forall a: int, b: int :: { Math#min(a, b) } a <= b <==> Math#min(a, b) == a);
+
 axiom (forall a: int, b: int :: { Math#min(a, b) } b <= a <==> Math#min(a, b) == b);
-axiom (forall a: int, b: int :: { Math#min(a, b) } Math#min(a, b) == a || Math#min(a, b) == b);
 
-function Math#clip(a: int): int;
+axiom (forall a: int, b: int ::
+  { Math#min(a, b) }
+  Math#min(a, b) == a || Math#min(a, b) == b);
+
+function Math#clip(a: int) : int;
+
 axiom (forall a: int :: { Math#clip(a) } 0 <= a ==> Math#clip(a) == a);
-axiom (forall a: int :: { Math#clip(a) } a < 0  ==> Math#clip(a) == 0);
-
-type MultiSet T = [T]int;
-
-function $IsGoodMultiSet<T>(ms: MultiSet T): bool;
-// ints are non-negative, used after havocing, and for conversion from sequences to multisets.
-axiom (forall<T> ms: MultiSet T :: { $IsGoodMultiSet(ms) }
-  $IsGoodMultiSet(ms) <==>
-  (forall bx: T :: { ms[bx] } 0 <= ms[bx] && ms[bx] <= MultiSet#Card(ms)));
-
-function MultiSet#Card<T>(MultiSet T): int;
-axiom (forall<T> s: MultiSet T :: { MultiSet#Card(s) } 0 <= MultiSet#Card(s));
-axiom (forall<T> s: MultiSet T, x: T, n: int :: { MultiSet#Card(s[x := n]) }
-  0 <= n ==> MultiSet#Card(s[x := n]) == MultiSet#Card(s) - s[x] + n);
-
-function MultiSet#Empty<T>(): MultiSet T;
-axiom (forall<T> o: T :: { MultiSet#Empty()[o] } MultiSet#Empty()[o] == 0);
-axiom (forall<T> s: MultiSet T :: { MultiSet#Card(s) }
-  (MultiSet#Card(s) == 0 <==> s == MultiSet#Empty()) &&
-  (MultiSet#Card(s) != 0 ==> (exists x: T :: 0 < s[x])));
-
-function MultiSet#Singleton<T>(T): MultiSet T;
-axiom (forall<T> r: T, o: T :: { MultiSet#Singleton(r)[o] } (MultiSet#Singleton(r)[o] == 1 <==> r == o) &&
-                                                            (MultiSet#Singleton(r)[o] == 0 <==> r != o));
-axiom (forall<T> r: T :: { MultiSet#Singleton(r) } MultiSet#Singleton(r) == MultiSet#UnionOne(MultiSet#Empty(), r));
-
-function MultiSet#UnionOne<T>(MultiSet T, T): MultiSet T;
-// pure containment axiom (in the original multiset or is the added element)
-axiom (forall<T> a: MultiSet T, x: T, o: T :: { MultiSet#UnionOne(a,x)[o] }
-  0 < MultiSet#UnionOne(a,x)[o] <==> o == x || 0 < a[o]);
-// union-ing increases count by one
-axiom (forall<T> a: MultiSet T, x: T :: { MultiSet#UnionOne(a, x) }
-  MultiSet#UnionOne(a, x)[x] == a[x] + 1);
-// non-decreasing
-axiom (forall<T> a: MultiSet T, x: T, y: T :: { MultiSet#UnionOne(a, x), a[y] }
-  0 < a[y] ==> 0 < MultiSet#UnionOne(a, x)[y]);
-// other elements unchanged
-axiom (forall<T> a: MultiSet T, x: T, y: T :: { MultiSet#UnionOne(a, x), a[y] }
-  x != y ==> a[y] == MultiSet#UnionOne(a, x)[y]);
-axiom (forall<T> a: MultiSet T, x: T :: { MultiSet#Card(MultiSet#UnionOne(a, x)) }
+
+axiom (forall a: int :: { Math#clip(a) } a < 0 ==> Math#clip(a) == 0);
+
+
+
+
+type MultiSet;
+
+function MultiSet#Multiplicity(m: MultiSet, o: Box) : int;
+
+function MultiSet#UpdateMultiplicity(m: MultiSet, o: Box, n: int) : MultiSet;
+
+axiom (forall m: MultiSet, o: Box, n: int, p: Box ::
+  { MultiSet#Multiplicity(MultiSet#UpdateMultiplicity(m, o, n), p) }
+  0 <= n
+     ==> (o == p ==> MultiSet#Multiplicity(MultiSet#UpdateMultiplicity(m, o, n), p) == n)
+       && (o != p
+         ==> MultiSet#Multiplicity(MultiSet#UpdateMultiplicity(m, o, n), p)
+           == MultiSet#Multiplicity(m, p)));
+
+function $IsGoodMultiSet(ms: MultiSet) : bool;
+
+axiom (forall ms: MultiSet ::
+  { $IsGoodMultiSet(ms) }
+  $IsGoodMultiSet(ms)
+     <==> (forall bx: Box ::
+      { MultiSet#Multiplicity(ms, bx) }
+      0 <= MultiSet#Multiplicity(ms, bx)
+         && MultiSet#Multiplicity(ms, bx) <= MultiSet#Card(ms)));
+
+function MultiSet#Card(m: MultiSet) : int;
+
+axiom (forall s: MultiSet :: { MultiSet#Card(s) } 0 <= MultiSet#Card(s));
+
+axiom (forall s: MultiSet, x: Box, n: int ::
+  { MultiSet#Card(MultiSet#UpdateMultiplicity(s, x, n)) }
+  0 <= n
+     ==> MultiSet#Card(MultiSet#UpdateMultiplicity(s, x, n))
+       == MultiSet#Card(s) - MultiSet#Multiplicity(s, x) + n);
+
+function MultiSet#Empty() : MultiSet;
+
+axiom (forall o: Box ::
+  { MultiSet#Multiplicity(MultiSet#Empty(), o) }
+  MultiSet#Multiplicity(MultiSet#Empty(), o) == 0);
+
+axiom (forall s: MultiSet ::
+  { MultiSet#Card(s) }
+  (MultiSet#Card(s) == 0 <==> s == MultiSet#Empty())
+     && (MultiSet#Card(s) != 0
+       ==> (exists x: Box ::
+        { MultiSet#Multiplicity(s, x) }
+        0 < MultiSet#Multiplicity(s, x))));
+
+function MultiSet#Singleton(o: Box) : MultiSet;
+
+axiom (forall r: Box, o: Box ::
+  { MultiSet#Multiplicity(MultiSet#Singleton(r), o) }
+  (MultiSet#Multiplicity(MultiSet#Singleton(r), o) == 1 <==> r == o)
+     && (MultiSet#Multiplicity(MultiSet#Singleton(r), o) == 0 <==> r != o));
+
+axiom (forall r: Box ::
+  { MultiSet#Singleton(r) }
+  MultiSet#Singleton(r) == MultiSet#UnionOne(MultiSet#Empty(), r));
+
+function MultiSet#UnionOne(m: MultiSet, o: Box) : MultiSet;
+
+axiom (forall a: MultiSet, x: Box, o: Box ::
+  { MultiSet#Multiplicity(MultiSet#UnionOne(a, x), o) }
+  0 < MultiSet#Multiplicity(MultiSet#UnionOne(a, x), o)
+     <==> o == x || 0 < MultiSet#Multiplicity(a, o));
+
+axiom (forall a: MultiSet, x: Box ::
+  { MultiSet#UnionOne(a, x) }
+  MultiSet#Multiplicity(MultiSet#UnionOne(a, x), x)
+     == MultiSet#Multiplicity(a, x) + 1);
+
+axiom (forall a: MultiSet, x: Box, y: Box ::
+  { MultiSet#UnionOne(a, x), MultiSet#Multiplicity(a, y) }
+  0 < MultiSet#Multiplicity(a, y)
+     ==> 0 < MultiSet#Multiplicity(MultiSet#UnionOne(a, x), y));
+
+axiom (forall a: MultiSet, x: Box, y: Box ::
+  { MultiSet#UnionOne(a, x), MultiSet#Multiplicity(a, y) }
+  x != y
+     ==> MultiSet#Multiplicity(a, y) == MultiSet#Multiplicity(MultiSet#UnionOne(a, x), y));
+
+axiom (forall a: MultiSet, x: Box ::
+  { MultiSet#Card(MultiSet#UnionOne(a, x)) }
   MultiSet#Card(MultiSet#UnionOne(a, x)) == MultiSet#Card(a) + 1);
 
+function MultiSet#Union(a: MultiSet, b: MultiSet) : MultiSet;
+
+axiom (forall a: MultiSet, b: MultiSet, o: Box ::
+  { MultiSet#Multiplicity(MultiSet#Union(a, b), o) }
+  MultiSet#Multiplicity(MultiSet#Union(a, b), o)
+     == MultiSet#Multiplicity(a, o) + MultiSet#Multiplicity(b, o));
+
+axiom (forall a: MultiSet, b: MultiSet ::
+  { MultiSet#Card(MultiSet#Union(a, b)) }
+  MultiSet#Card(MultiSet#Union(a, b)) == MultiSet#Card(a) + MultiSet#Card(b));
 
-function MultiSet#Union<T>(MultiSet T, MultiSet T): MultiSet T;
-// union-ing is the sum of the contents
-axiom (forall<T> a: MultiSet T, b: MultiSet T, o: T :: { MultiSet#Union(a,b)[o] }
-  MultiSet#Union(a,b)[o] == a[o] + b[o]);
-axiom (forall<T> a: MultiSet T, b: MultiSet T :: { MultiSet#Card(MultiSet#Union(a,b)) }
-  MultiSet#Card(MultiSet#Union(a,b)) == MultiSet#Card(a) + MultiSet#Card(b));
-
-function MultiSet#Intersection<T>(MultiSet T, MultiSet T): MultiSet T;
-axiom (forall<T> a: MultiSet T, b: MultiSet T, o: T :: { MultiSet#Intersection(a,b)[o] }
-  MultiSet#Intersection(a,b)[o] == Math#min(a[o],  b[o]));
-
-// left and right pseudo-idempotence
-axiom (forall<T> a, b: MultiSet T :: { MultiSet#Intersection(MultiSet#Intersection(a, b), b) }
-  MultiSet#Intersection(MultiSet#Intersection(a, b), b) == MultiSet#Intersection(a, b));
-axiom (forall<T> a, b: MultiSet T :: { MultiSet#Intersection(a, MultiSet#Intersection(a, b)) }
-  MultiSet#Intersection(a, MultiSet#Intersection(a, b)) == MultiSet#Intersection(a, b));
-
-// multiset difference, a - b. clip() makes it positive.
-function MultiSet#Difference<T>(MultiSet T, MultiSet T): MultiSet T;
-axiom (forall<T> a: MultiSet T, b: MultiSet T, o: T :: { MultiSet#Difference(a,b)[o] }
-  MultiSet#Difference(a,b)[o] == Math#clip(a[o] - b[o]));
-axiom (forall<T> a, b: MultiSet T, y: T :: { MultiSet#Difference(a, b), b[y], a[y] }
-  a[y] <= b[y] ==> MultiSet#Difference(a, b)[y] == 0 );
-axiom (forall<T> a, b: MultiSet T ::
+function MultiSet#Intersection(a: MultiSet, b: MultiSet) : MultiSet;
+
+axiom (forall a: MultiSet, b: MultiSet, o: Box ::
+  { MultiSet#Multiplicity(MultiSet#Intersection(a, b), o) }
+  MultiSet#Multiplicity(MultiSet#Intersection(a, b), o)
+     == Math#min(MultiSet#Multiplicity(a, o), MultiSet#Multiplicity(b, o)));
+
+axiom (forall a: MultiSet, b: MultiSet ::
+  { MultiSet#Intersection(MultiSet#Intersection(a, b), b) }
+  MultiSet#Intersection(MultiSet#Intersection(a, b), b)
+     == MultiSet#Intersection(a, b));
+
+axiom (forall a: MultiSet, b: MultiSet ::
+  { MultiSet#Intersection(a, MultiSet#Intersection(a, b)) }
+  MultiSet#Intersection(a, MultiSet#Intersection(a, b))
+     == MultiSet#Intersection(a, b));
+
+function MultiSet#Difference(a: MultiSet, b: MultiSet) : MultiSet;
+
+axiom (forall a: MultiSet, b: MultiSet, o: Box ::
+  { MultiSet#Multiplicity(MultiSet#Difference(a, b), o) }
+  MultiSet#Multiplicity(MultiSet#Difference(a, b), o)
+     == Math#clip(MultiSet#Multiplicity(a, o) - MultiSet#Multiplicity(b, o)));
+
+axiom (forall a: MultiSet, b: MultiSet, y: Box ::
+  { MultiSet#Difference(a, b), MultiSet#Multiplicity(b, y), MultiSet#Multiplicity(a, y) }
+  MultiSet#Multiplicity(a, y) <= MultiSet#Multiplicity(b, y)
+     ==> MultiSet#Multiplicity(MultiSet#Difference(a, b), y) == 0);
+
+axiom (forall a: MultiSet, b: MultiSet ::
   { MultiSet#Card(MultiSet#Difference(a, b)) }
-  MultiSet#Card(MultiSet#Difference(a, b)) + MultiSet#Card(MultiSet#Difference(b, a))
-  + 2 * MultiSet#Card(MultiSet#Intersection(a, b))
-    == MultiSet#Card(MultiSet#Union(a, b)) &&
-  MultiSet#Card(MultiSet#Difference(a, b)) == MultiSet#Card(a) - MultiSet#Card(MultiSet#Intersection(a, b)));
-
-// multiset subset means a must have at most as many of each element as b
-function MultiSet#Subset<T>(MultiSet T, MultiSet T): bool;
-axiom (forall<T> a: MultiSet T, b: MultiSet T :: { MultiSet#Subset(a,b) }
-  MultiSet#Subset(a,b) <==> (forall o: T :: {a[o]} {b[o]} a[o] <= b[o]));
-
-function MultiSet#Equal<T>(MultiSet T, MultiSet T): bool;
-axiom (forall<T> a: MultiSet T, b: MultiSet T :: { MultiSet#Equal(a,b) }
-  MultiSet#Equal(a,b) <==> (forall o: T :: {a[o]} {b[o]} a[o] == b[o]));
-// extensionality axiom for multisets
-axiom (forall<T> a: MultiSet T, b: MultiSet T :: { MultiSet#Equal(a,b) }
-  MultiSet#Equal(a,b) ==> a == b);
-
-function MultiSet#Disjoint<T>(MultiSet T, MultiSet T): bool;
-axiom (forall<T> a: MultiSet T, b: MultiSet T :: { MultiSet#Disjoint(a,b) }
-  MultiSet#Disjoint(a,b) <==> (forall o: T :: {a[o]} {b[o]} a[o] == 0 || b[o] == 0));
-
-// conversion to a multiset. each element in the original set has duplicity 1.
-function MultiSet#FromSet<T>(Set T): MultiSet T;
-axiom (forall<T> s: Set T, a: T :: { MultiSet#FromSet(s)[a] }
-  (MultiSet#FromSet(s)[a] == 0 <==> !s[a]) &&
-  (MultiSet#FromSet(s)[a] == 1 <==> s[a]));
-axiom (forall<T> s: Set T :: { MultiSet#Card(MultiSet#FromSet(s)) }
+  MultiSet#Card(MultiSet#Difference(a, b))
+         + MultiSet#Card(MultiSet#Difference(b, a))
+         + 2 * MultiSet#Card(MultiSet#Intersection(a, b))
+       == MultiSet#Card(MultiSet#Union(a, b))
+     && MultiSet#Card(MultiSet#Difference(a, b))
+       == MultiSet#Card(a) - MultiSet#Card(MultiSet#Intersection(a, b)));
+
+function MultiSet#Subset(a: MultiSet, b: MultiSet) : bool;
+
+axiom (forall a: MultiSet, b: MultiSet ::
+  { MultiSet#Subset(a, b) }
+  MultiSet#Subset(a, b)
+     <==> (forall o: Box ::
+      { MultiSet#Multiplicity(a, o) } { MultiSet#Multiplicity(b, o) }
+      MultiSet#Multiplicity(a, o) <= MultiSet#Multiplicity(b, o)));
+
+function MultiSet#Equal(a: MultiSet, b: MultiSet) : bool;
+
+axiom (forall a: MultiSet, b: MultiSet ::
+  { MultiSet#Equal(a, b) }
+  MultiSet#Equal(a, b)
+     <==> (forall o: Box ::
+      { MultiSet#Multiplicity(a, o) } { MultiSet#Multiplicity(b, o) }
+      MultiSet#Multiplicity(a, o) == MultiSet#Multiplicity(b, o)));
+
+axiom (forall a: MultiSet, b: MultiSet ::
+  { MultiSet#Equal(a, b) }
+  MultiSet#Equal(a, b) ==> a == b);
+
+function MultiSet#Disjoint(a: MultiSet, b: MultiSet) : bool;
+
+axiom (forall a: MultiSet, b: MultiSet ::
+  { MultiSet#Disjoint(a, b) }
+  MultiSet#Disjoint(a, b)
+     <==> (forall o: Box ::
+      { MultiSet#Multiplicity(a, o) } { MultiSet#Multiplicity(b, o) }
+      MultiSet#Multiplicity(a, o) == 0 || MultiSet#Multiplicity(b, o) == 0));
+
+function MultiSet#FromSet(s: Set) : MultiSet;
+
+axiom (forall s: Set, a: Box ::
+  { MultiSet#Multiplicity(MultiSet#FromSet(s), a) }
+  (MultiSet#Multiplicity(MultiSet#FromSet(s), a) == 0 <==> !Set#IsMember(s, a))
+     && (MultiSet#Multiplicity(MultiSet#FromSet(s), a) == 1 <==> Set#IsMember(s, a)));
+
+axiom (forall s: Set ::
+  { MultiSet#Card(MultiSet#FromSet(s)) }
   MultiSet#Card(MultiSet#FromSet(s)) == Set#Card(s));
 
-// conversion to a multiset, from a sequence.
-function MultiSet#FromSeq<T>(Seq T): MultiSet T uses {
-  axiom (forall<T> :: MultiSet#FromSeq(Seq#Empty(): Seq T) == MultiSet#Empty(): MultiSet T);
+function MultiSet#FromSeq(s: Seq) : MultiSet
+uses {
+axiom MultiSet#FromSeq(Seq#Empty()) == MultiSet#Empty();
 }
-// conversion produces a good map.
-axiom (forall<T> s: Seq T :: { MultiSet#FromSeq(s) } $IsGoodMultiSet(MultiSet#FromSeq(s)) );
-// cardinality axiom
-axiom (forall<T> s: Seq T ::
+
+axiom (forall s: Seq :: { MultiSet#FromSeq(s) } $IsGoodMultiSet(MultiSet#FromSeq(s)));
+
+axiom (forall s: Seq ::
   { MultiSet#Card(MultiSet#FromSeq(s)) }
-    MultiSet#Card(MultiSet#FromSeq(s)) == Seq#Length(s));
-// building axiom
-axiom (forall<T> s: Seq T, v: T ::
+  MultiSet#Card(MultiSet#FromSeq(s)) == Seq#Length(s));
+
+axiom (forall s: Seq, v: Box ::
   { MultiSet#FromSeq(Seq#Build(s, v)) }
-    MultiSet#FromSeq(Seq#Build(s, v)) == MultiSet#UnionOne(MultiSet#FromSeq(s), v)
-  );
+  MultiSet#FromSeq(Seq#Build(s, v)) == MultiSet#UnionOne(MultiSet#FromSeq(s), v));
 
-// concatenation axiom
-axiom (forall<T> a: Seq T, b: Seq T ::
+axiom (forall a: Seq, b: Seq ::
   { MultiSet#FromSeq(Seq#Append(a, b)) }
-    MultiSet#FromSeq(Seq#Append(a, b)) == MultiSet#Union(MultiSet#FromSeq(a), MultiSet#FromSeq(b)) );
-
-// update axiom
-axiom (forall<T> s: Seq T, i: int, v: T, x: T ::
-  { MultiSet#FromSeq(Seq#Update(s, i, v))[x] }
-    0 <= i && i < Seq#Length(s) ==>
-    MultiSet#FromSeq(Seq#Update(s, i, v))[x] ==
-      MultiSet#Union(MultiSet#Difference(MultiSet#FromSeq(s), MultiSet#Singleton(Seq#Index(s,i))), MultiSet#Singleton(v))[x] );
-  // i.e. MS(Update(s, i, v)) == MS(s) - {{s[i]}} + {{v}}
-axiom (forall<T> s: Seq T, x: T :: { MultiSet#FromSeq(s)[x] }
-  (exists i : int :: { Seq#Index(s,i) } 0 <= i && i < Seq#Length(s) && x == Seq#Index(s,i)) <==> 0 < MultiSet#FromSeq(s)[x] );
+  MultiSet#FromSeq(Seq#Append(a, b))
+     == MultiSet#Union(MultiSet#FromSeq(a), MultiSet#FromSeq(b)));
+
+axiom (forall s: Seq, i: int, v: Box, x: Box ::
+  { MultiSet#Multiplicity(MultiSet#FromSeq(Seq#Update(s, i, v)), x) }
+  0 <= i && i < Seq#Length(s)
+     ==> MultiSet#Multiplicity(MultiSet#FromSeq(Seq#Update(s, i, v)), x)
+       == MultiSet#Multiplicity(MultiSet#Union(MultiSet#Difference(MultiSet#FromSeq(s), MultiSet#Singleton(Seq#Index(s, i))),
+          MultiSet#Singleton(v)),
+        x));
+
+axiom (forall s: Seq, x: Box ::
+  { MultiSet#Multiplicity(MultiSet#FromSeq(s), x) }
+  (exists i: int ::
+      { Seq#Index(s, i) }
+      0 <= i && i < Seq#Length(s) && x == Seq#Index(s, i))
+     <==> 0 < MultiSet#Multiplicity(MultiSet#FromSeq(s), x));
+
 
 // ---------------------------------------------------------------
 // -- Axiomatization of sequences --------------------------------
 // ---------------------------------------------------------------
 
-type Seq T;
 
-function Seq#Length<T>(Seq T): int;
-axiom (forall<T> s: Seq T :: { Seq#Length(s) } 0 <= Seq#Length(s));
 
-function Seq#Empty<T>(): Seq T uses {
-  axiom (forall<T> :: { Seq#Empty(): Seq T } Seq#Length(Seq#Empty(): Seq T) == 0);
+type Seq;
+
+function Seq#Length(s: Seq) : int;
+
+axiom (forall s: Seq :: { Seq#Length(s) } 0 <= Seq#Length(s));
+
+function Seq#Empty() : Seq
+uses {
+axiom Seq#Length(Seq#Empty()) == 0;
 }
-axiom (forall<T> s: Seq T :: { Seq#Length(s) }
-  (Seq#Length(s) == 0 ==> s == Seq#Empty())
-// The following would be a nice fact to include, because it would enable verifying the
-// GenericPick.SeqPick* methods in Test/dafny0/SmallTests.dfy.  However, it substantially
-// slows down performance on some other tests, including running seemingly forever on
-// some.
-//  && (Seq#Length(s) != 0 ==> (exists x: T :: Seq#Contains(s, x)))
-  );
 
-// The empty sequence $Is any type
-//axiom (forall<T> t: Ty :: {$Is(Seq#Empty(): Seq T, TSeq(t))} $Is(Seq#Empty(): Seq T, TSeq(t)));
+axiom (forall s: Seq :: { Seq#Length(s) } Seq#Length(s) == 0 ==> s == Seq#Empty());
 
-function Seq#Singleton<T>(T): Seq T;
-axiom (forall<T> t: T :: { Seq#Length(Seq#Singleton(t)) } Seq#Length(Seq#Singleton(t)) == 1);
+function Seq#Build(s: Seq, val: Box) : Seq;
 
-function Seq#Build<T>(s: Seq T, val: T): Seq T;
-function Seq#Build_inv0<T>(s: Seq T) : Seq T;
-function Seq#Build_inv1<T>(s: Seq T) : T;
-axiom (forall<T> s: Seq T, val: T ::
+function Seq#Build_inv0(s: Seq) : Seq;
+
+function Seq#Build_inv1(s: Seq) : Box;
+
+axiom (forall s: Seq, val: Box ::
   { Seq#Build(s, val) }
-  Seq#Build_inv0(Seq#Build(s, val)) == s &&
-  Seq#Build_inv1(Seq#Build(s, val)) == val);
+  Seq#Build_inv0(Seq#Build(s, val)) == s
+     && Seq#Build_inv1(Seq#Build(s, val)) == val);
 
-axiom (forall<T> s: Seq T, v: T ::
-  { Seq#Build(s,v) }
-  Seq#Length(Seq#Build(s,v)) == 1 + Seq#Length(s));
-axiom (forall<T> s: Seq T, i: int, v: T :: { Seq#Index(Seq#Build(s,v), i) }
-  (i == Seq#Length(s) ==> Seq#Index(Seq#Build(s,v), i) == v) &&
-  (i != Seq#Length(s) ==> Seq#Index(Seq#Build(s,v), i) == Seq#Index(s, i)));
+axiom (forall s: Seq, v: Box ::
+  { Seq#Build(s, v) }
+  Seq#Length(Seq#Build(s, v)) == 1 + Seq#Length(s));
 
-// Build preserves $Is
-axiom (forall s: Seq Box, bx: Box, t: Ty :: { $Is(Seq#Build(s,bx),TSeq(t)) }
-    $Is(s,TSeq(t)) && $IsBox(bx,t) ==> $Is(Seq#Build(s,bx),TSeq(t)));
+axiom (forall s: Seq, i: int, v: Box ::
+  { Seq#Index(Seq#Build(s, v), i) }
+  (i == Seq#Length(s) ==> Seq#Index(Seq#Build(s, v), i) == v)
+     && (i != Seq#Length(s) ==> Seq#Index(Seq#Build(s, v), i) == Seq#Index(s, i)));
 
-function Seq#Create(ty: Ty, heap: Heap, len: int, init: HandleType): Seq Box;
-axiom (forall ty: Ty, heap: Heap, len: int, init: HandleType ::
-  { Seq#Length(Seq#Create(ty, heap, len, init): Seq Box) }
-  $IsGoodHeap(heap) && 0 <= len ==>
-  Seq#Length(Seq#Create(ty, heap, len, init): Seq Box) == len);
-axiom (forall ty: Ty, heap: Heap, len: int, init: HandleType, i: int ::
-  { Seq#Index(Seq#Create(ty, heap, len, init), i) }
-  $IsGoodHeap(heap) && 0 <= i && i < len ==>
-  Seq#Index(Seq#Create(ty, heap, len, init), i) == Apply1(TInt, ty, heap, init, $Box(i)));
+axiom (forall s0: Seq, s1: Seq ::
+  { Seq#Length(Seq#Append(s0, s1)) }
+  Seq#Length(Seq#Append(s0, s1)) == Seq#Length(s0) + Seq#Length(s1));
+
+function Seq#Index(s: Seq, i: int) : Box;
+
+axiom (forall s0: Seq, s1: Seq, n: int ::
+  { Seq#Index(Seq#Append(s0, s1), n) }
+  (n < Seq#Length(s0) ==> Seq#Index(Seq#Append(s0, s1), n) == Seq#Index(s0, n))
+     && (Seq#Length(s0) <= n
+       ==> Seq#Index(Seq#Append(s0, s1), n) == Seq#Index(s1, n - Seq#Length(s0))));
+
+function Seq#Update(s: Seq, i: int, val: Box) : Seq;
+
+axiom (forall s: Seq, i: int, v: Box ::
+  { Seq#Length(Seq#Update(s, i, v)) }
+  0 <= i && i < Seq#Length(s) ==> Seq#Length(Seq#Update(s, i, v)) == Seq#Length(s));
+
+axiom (forall s: Seq, i: int, v: Box, n: int ::
+  { Seq#Index(Seq#Update(s, i, v), n) }
+  0 <= n && n < Seq#Length(s)
+     ==> (i == n ==> Seq#Index(Seq#Update(s, i, v), n) == v)
+       && (i != n ==> Seq#Index(Seq#Update(s, i, v), n) == Seq#Index(s, n)));
+
+function Seq#Append(s0: Seq, s1: Seq) : Seq;
 
-function Seq#Append<T>(Seq T, Seq T): Seq T;
-axiom (forall<T> s0: Seq T, s1: Seq T :: { Seq#Length(Seq#Append(s0,s1)) }
-  Seq#Length(Seq#Append(s0,s1)) == Seq#Length(s0) + Seq#Length(s1));
-
-function Seq#Index<T>(Seq T, int): T;
-axiom (forall<T> t: T :: { Seq#Index(Seq#Singleton(t), 0) } Seq#Index(Seq#Singleton(t), 0) == t);
-axiom (forall<T> s0: Seq T, s1: Seq T, n: int :: { Seq#Index(Seq#Append(s0,s1), n) }
-  (n < Seq#Length(s0) ==> Seq#Index(Seq#Append(s0,s1), n) == Seq#Index(s0, n)) &&
-  (Seq#Length(s0) <= n ==> Seq#Index(Seq#Append(s0,s1), n) == Seq#Index(s1, n - Seq#Length(s0))));
-
-function Seq#Update<T>(Seq T, int, T): Seq T;
-axiom (forall<T> s: Seq T, i: int, v: T :: { Seq#Length(Seq#Update(s,i,v)) }
-  0 <= i && i < Seq#Length(s) ==> Seq#Length(Seq#Update(s,i,v)) == Seq#Length(s));
-axiom (forall<T> s: Seq T, i: int, v: T, n: int :: { Seq#Index(Seq#Update(s,i,v),n) }
-  0 <= n && n < Seq#Length(s) ==>
-    (i == n ==> Seq#Index(Seq#Update(s,i,v),n) == v) &&
-    (i != n ==> Seq#Index(Seq#Update(s,i,v),n) == Seq#Index(s,n)));
-
-function Seq#Contains<T>(Seq T, T): bool;
-axiom (forall<T> s: Seq T, x: T :: { Seq#Contains(s,x) }
-  Seq#Contains(s,x) <==>
-    (exists i: int :: { Seq#Index(s,i) } 0 <= i && i < Seq#Length(s) && Seq#Index(s,i) == x));
-axiom (forall<T> x: T ::
+function Seq#Contains(s: Seq, val: Box) : bool;
+
+axiom (forall s: Seq, x: Box ::
+  { Seq#Contains(s, x) }
+  Seq#Contains(s, x)
+     <==> (exists i: int ::
+      { Seq#Index(s, i) }
+      0 <= i && i < Seq#Length(s) && Seq#Index(s, i) == x));
+
+axiom (forall x: Box ::
   { Seq#Contains(Seq#Empty(), x) }
   !Seq#Contains(Seq#Empty(), x));
 
-axiom (forall<T> s0: Seq T, s1: Seq T, x: T ::
+axiom (forall s0: Seq, s1: Seq, x: Box ::
   { Seq#Contains(Seq#Append(s0, s1), x) }
-  Seq#Contains(Seq#Append(s0, s1), x) <==>
-    Seq#Contains(s0, x) || Seq#Contains(s1, x));
+  Seq#Contains(Seq#Append(s0, s1), x)
+     <==> Seq#Contains(s0, x) || Seq#Contains(s1, x));
 
-axiom (forall<T> s: Seq T, v: T, x: T ::  // needed to prove things like '4 in [2,3,4]', see method TestSequences0 in SmallTests.dfy
+axiom (forall s: Seq, v: Box, x: Box ::
   { Seq#Contains(Seq#Build(s, v), x) }
-    Seq#Contains(Seq#Build(s, v), x) <==> (v == x || Seq#Contains(s, x)));
+  Seq#Contains(Seq#Build(s, v), x) <==> v == x || Seq#Contains(s, x));
 
-axiom (forall<T> s: Seq T, n: int, x: T ::
+axiom (forall s: Seq, n: int, x: Box ::
   { Seq#Contains(Seq#Take(s, n), x) }
-  Seq#Contains(Seq#Take(s, n), x) <==>
-    (exists i: int :: { Seq#Index(s, i) }
+  Seq#Contains(Seq#Take(s, n), x)
+     <==> (exists i: int ::
+      { Seq#Index(s, i) }
       0 <= i && i < n && i < Seq#Length(s) && Seq#Index(s, i) == x));
-axiom (forall<T> s: Seq T, n: int, x: T ::
+
+axiom (forall s: Seq, n: int, x: Box ::
   { Seq#Contains(Seq#Drop(s, n), x) }
-  Seq#Contains(Seq#Drop(s, n), x) <==>
-    (exists i: int :: { Seq#Index(s, i) }
+  Seq#Contains(Seq#Drop(s, n), x)
+     <==> (exists i: int ::
+      { Seq#Index(s, i) }
       0 <= n && n <= i && i < Seq#Length(s) && Seq#Index(s, i) == x));
 
-function Seq#Equal<T>(Seq T, Seq T): bool;
-axiom (forall<T> s0: Seq T, s1: Seq T :: { Seq#Equal(s0,s1) }
-  Seq#Equal(s0,s1) <==>
-    Seq#Length(s0) == Seq#Length(s1) &&
-    (forall j: int :: { Seq#Index(s0,j) } { Seq#Index(s1,j) }
-        0 <= j && j < Seq#Length(s0) ==> Seq#Index(s0,j) == Seq#Index(s1,j)));
-axiom (forall<T> a: Seq T, b: Seq T :: { Seq#Equal(a,b) }  // extensionality axiom for sequences
-  Seq#Equal(a,b) ==> a == b);
-
-function Seq#SameUntil<T>(Seq T, Seq T, int): bool;
-axiom (forall<T> s0: Seq T, s1: Seq T, n: int :: { Seq#SameUntil(s0,s1,n) }
-  Seq#SameUntil(s0,s1,n) <==>
-    (forall j: int :: { Seq#Index(s0,j) } { Seq#Index(s1,j) }
-        0 <= j && j < n ==> Seq#Index(s0,j) == Seq#Index(s1,j)));
-
-function Seq#Take<T>(s: Seq T, howMany: int): Seq T;
-axiom (forall<T> s: Seq T, n: int :: { Seq#Length(Seq#Take(s,n)) }
-  0 <= n && n <= Seq#Length(s) ==> Seq#Length(Seq#Take(s,n)) == n);
-axiom (forall<T> s: Seq T, n: int, j: int ::
-  {:weight 25}
-  { Seq#Index(Seq#Take(s,n), j) }
-  { Seq#Index(s, j), Seq#Take(s,n) }
-  0 <= j && j < n && j < Seq#Length(s) ==>
-    Seq#Index(Seq#Take(s,n), j) == Seq#Index(s, j));
-
-function Seq#Drop<T>(s: Seq T, howMany: int): Seq T;
-axiom (forall<T> s: Seq T, n: int :: { Seq#Length(Seq#Drop(s,n)) }
-  0 <= n && n <= Seq#Length(s) ==> Seq#Length(Seq#Drop(s,n)) == Seq#Length(s) - n);
-axiom (forall<T> s: Seq T, n: int, j: int ::
-  {:weight 25}
-  { Seq#Index(Seq#Drop(s,n), j) }
-  0 <= n && 0 <= j && j < Seq#Length(s)-n ==>
-    Seq#Index(Seq#Drop(s,n), j) == Seq#Index(s, j+n));
-axiom (forall<T> s: Seq T, n: int, k: int ::
-  {:weight 25}
-  { Seq#Index(s, k), Seq#Drop(s,n) }
-  0 <= n && n <= k && k < Seq#Length(s) ==>
-    Seq#Index(Seq#Drop(s,n), k-n) == Seq#Index(s, k));
-
-axiom (forall<T> s, t: Seq T, n: int ::
-  { Seq#Take(Seq#Append(s, t), n) }
-  { Seq#Drop(Seq#Append(s, t), n) }
+function Seq#Equal(s0: Seq, s1: Seq) : bool;
+
+axiom (forall s0: Seq, s1: Seq ::
+  { Seq#Equal(s0, s1) }
+  Seq#Equal(s0, s1)
+     <==> Seq#Length(s0) == Seq#Length(s1)
+       && (forall j: int ::
+        { Seq#Index(s0, j) } { Seq#Index(s1, j) }
+        0 <= j && j < Seq#Length(s0) ==> Seq#Index(s0, j) == Seq#Index(s1, j)));
+
+axiom (forall a: Seq, b: Seq :: { Seq#Equal(a, b) } Seq#Equal(a, b) ==> a == b);
+
+function Seq#SameUntil(s0: Seq, s1: Seq, n: int) : bool;
+
+axiom (forall s0: Seq, s1: Seq, n: int ::
+  { Seq#SameUntil(s0, s1, n) }
+  Seq#SameUntil(s0, s1, n)
+     <==> (forall j: int ::
+      { Seq#Index(s0, j) } { Seq#Index(s1, j) }
+      0 <= j && j < n ==> Seq#Index(s0, j) == Seq#Index(s1, j)));
+
+function Seq#Take(s: Seq, howMany: int) : Seq;
+
+axiom (forall s: Seq, n: int ::
+  { Seq#Length(Seq#Take(s, n)) }
+  0 <= n && n <= Seq#Length(s) ==> Seq#Length(Seq#Take(s, n)) == n);
+
+axiom (forall s: Seq, n: int, j: int ::
+  {:weight 25} { Seq#Index(Seq#Take(s, n), j) } { Seq#Index(s, j), Seq#Take(s, n) }
+  0 <= j && j < n && j < Seq#Length(s)
+     ==> Seq#Index(Seq#Take(s, n), j) == Seq#Index(s, j));
+
+function Seq#Drop(s: Seq, howMany: int) : Seq;
+
+axiom (forall s: Seq, n: int ::
+  { Seq#Length(Seq#Drop(s, n)) }
+  0 <= n && n <= Seq#Length(s) ==> Seq#Length(Seq#Drop(s, n)) == Seq#Length(s) - n);
+
+axiom (forall s: Seq, n: int, j: int ::
+  {:weight 25} { Seq#Index(Seq#Drop(s, n), j) }
+  0 <= n && 0 <= j && j < Seq#Length(s) - n
+     ==> Seq#Index(Seq#Drop(s, n), j) == Seq#Index(s, j + n));
+
+axiom (forall s: Seq, n: int, k: int ::
+  {:weight 25} { Seq#Index(s, k), Seq#Drop(s, n) }
+  0 <= n && n <= k && k < Seq#Length(s)
+     ==> Seq#Index(Seq#Drop(s, n), k - n) == Seq#Index(s, k));
+
+axiom (forall s: Seq, t: Seq, n: int ::
+  { Seq#Take(Seq#Append(s, t), n) } { Seq#Drop(Seq#Append(s, t), n) }
   n == Seq#Length(s)
-  ==>
-  Seq#Take(Seq#Append(s, t), n) == s &&
-  Seq#Drop(Seq#Append(s, t), n) == t);
+     ==> Seq#Take(Seq#Append(s, t), n) == s && Seq#Drop(Seq#Append(s, t), n) == t);
+
+axiom (forall s: Seq, i: int, v: Box, n: int ::
+  { Seq#Take(Seq#Update(s, i, v), n) }
+  0 <= i && i < n && n <= Seq#Length(s)
+     ==> Seq#Take(Seq#Update(s, i, v), n) == Seq#Update(Seq#Take(s, n), i, v));
+
+axiom (forall s: Seq, i: int, v: Box, n: int ::
+  { Seq#Take(Seq#Update(s, i, v), n) }
+  n <= i && i < Seq#Length(s)
+     ==> Seq#Take(Seq#Update(s, i, v), n) == Seq#Take(s, n));
+
+axiom (forall s: Seq, i: int, v: Box, n: int ::
+  { Seq#Drop(Seq#Update(s, i, v), n) }
+  0 <= n && n <= i && i < Seq#Length(s)
+     ==> Seq#Drop(Seq#Update(s, i, v), n) == Seq#Update(Seq#Drop(s, n), i - n, v));
+
+axiom (forall s: Seq, i: int, v: Box, n: int ::
+  { Seq#Drop(Seq#Update(s, i, v), n) }
+  0 <= i && i < n && n <= Seq#Length(s)
+     ==> Seq#Drop(Seq#Update(s, i, v), n) == Seq#Drop(s, n));
+
+axiom (forall s: Seq, v: Box, n: int ::
+  { Seq#Drop(Seq#Build(s, v), n) }
+  0 <= n && n <= Seq#Length(s)
+     ==> Seq#Drop(Seq#Build(s, v), n) == Seq#Build(Seq#Drop(s, n), v));
 
-function Seq#FromArray(h: Heap, a: ref): Seq Box;
+axiom (forall s: Seq, n: int :: { Seq#Drop(s, n) } n == 0 ==> Seq#Drop(s, n) == s);
+
+axiom (forall s: Seq, n: int ::
+  { Seq#Take(s, n) }
+  n == 0 ==> Seq#Take(s, n) == Seq#Empty());
+
+axiom (forall s: Seq, m: int, n: int ::
+  { Seq#Drop(Seq#Drop(s, m), n) }
+  0 <= m && 0 <= n && m + n <= Seq#Length(s)
+     ==> Seq#Drop(Seq#Drop(s, m), n) == Seq#Drop(s, m + n));
+
+
+// The empty sequence $Is any type
+//axiom (forall t: Ty :: {$Is(Seq#Empty(): Seq, TSeq(t))} $Is(Seq#Empty(): Seq, TSeq(t)));
+
+// Build preserves $Is
+axiom (forall s: Seq, bx: Box, t: Ty :: { $Is(Seq#Build(s, bx), TSeq(t)) }
+    $Is(s, TSeq(t)) && $IsBox(bx, t) ==> $Is(Seq#Build(s, bx), TSeq(t)));
+
+function Seq#Create(ty: Ty, heap: Heap, len: int, init: HandleType): Seq;
+axiom (forall ty: Ty, heap: Heap, len: int, init: HandleType ::
+  { Seq#Length(Seq#Create(ty, heap, len, init): Seq) }
+  $IsGoodHeap(heap) && 0 <= len ==>
+  Seq#Length(Seq#Create(ty, heap, len, init): Seq) == len);
+axiom (forall ty: Ty, heap: Heap, len: int, init: HandleType, i: int ::
+  { Seq#Index(Seq#Create(ty, heap, len, init), i) }
+  $IsGoodHeap(heap) && 0 <= i && i < len ==>
+  Seq#Index(Seq#Create(ty, heap, len, init), i) == Apply1(TInt, ty, heap, init, $Box(i)));
+
+function Seq#FromArray(h: Heap, a: ref): Seq;
 axiom (forall h: Heap, a: ref ::
   { Seq#Length(Seq#FromArray(h,a)) }
   Seq#Length(Seq#FromArray(h, a)) == _System.array.Length(a));
@@ -1118,7 +1322,7 @@ axiom (forall h: Heap, a: ref ::
     // the relation between the array and the sequence can be proved in either
     // direction
     { read(h, a, IndexField(i)) }
-    { Seq#Index(Seq#FromArray(h, a): Seq Box, i) }
+    { Seq#Index(Seq#FromArray(h, a): Seq, i) }
     0 <= i &&
     i < Seq#Length(Seq#FromArray(h, a))  // this will trigger the previous axiom to get a connection with _System.array.Length(a)
     ==>
@@ -1132,271 +1336,239 @@ axiom (forall h: Heap, i: int, v: Box, a: ref ::
   { Seq#FromArray(update(h, a, IndexField(i), v), a) }
     0 <= i && i < _System.array.Length(a) ==> Seq#FromArray(update(h, a, IndexField(i), v), a) == Seq#Update(Seq#FromArray(h, a), i, v) );
 
-// Commutability of Take and Drop with Update.
-axiom (forall<T> s: Seq T, i: int, v: T, n: int ::
-        { Seq#Take(Seq#Update(s, i, v), n) }
-        0 <= i && i < n && n <= Seq#Length(s) ==> Seq#Take(Seq#Update(s, i, v), n) == Seq#Update(Seq#Take(s, n), i, v) );
-axiom (forall<T> s: Seq T, i: int, v: T, n: int ::
-        { Seq#Take(Seq#Update(s, i, v), n) }
-        n <= i && i < Seq#Length(s) ==> Seq#Take(Seq#Update(s, i, v), n) == Seq#Take(s, n));
-axiom (forall<T> s: Seq T, i: int, v: T, n: int ::
-        { Seq#Drop(Seq#Update(s, i, v), n) }
-        0 <= n && n <= i && i < Seq#Length(s) ==> Seq#Drop(Seq#Update(s, i, v), n) == Seq#Update(Seq#Drop(s, n), i-n, v) );
-axiom (forall<T> s: Seq T, i: int, v: T, n: int ::
-        { Seq#Drop(Seq#Update(s, i, v), n) }
-        0 <= i && i < n && n <= Seq#Length(s) ==> Seq#Drop(Seq#Update(s, i, v), n) == Seq#Drop(s, n));
 // Extension axiom, triggers only on Takes from arrays.
 axiom (forall h: Heap, a: ref, n0, n1: int ::
         { Seq#Take(Seq#FromArray(h, a), n0), Seq#Take(Seq#FromArray(h, a), n1) }
-        n0 + 1 == n1 && 0 <= n0 && n1 <= _System.array.Length(a) ==> Seq#Take(Seq#FromArray(h, a), n1) == Seq#Build(Seq#Take(Seq#FromArray(h, a), n0), read(h, a, IndexField(n0): Field Box)) );
-// drop commutes with build.
-axiom (forall<T> s: Seq T, v: T, n: int ::
-        { Seq#Drop(Seq#Build(s, v), n) }
-        0 <= n && n <= Seq#Length(s) ==> Seq#Drop(Seq#Build(s, v), n) == Seq#Build(Seq#Drop(s, n), v) );
-
-function Seq#Rank<T>(Seq T): int;
-axiom (forall s: Seq Box, i: int ::
+        n0 + 1 == n1 && 0 <= n0 && n1 <= _System.array.Length(a) ==> Seq#Take(Seq#FromArray(h, a), n1) == Seq#Build(Seq#Take(Seq#FromArray(h, a), n0), read(h, a, IndexField(n0): Field)) );
+
+function Seq#Rank(Seq): int;
+axiom (forall s: Seq, i: int ::
         { DtRank($Unbox(Seq#Index(s, i)): DatatypeType) }
         0 <= i && i < Seq#Length(s) ==> DtRank($Unbox(Seq#Index(s, i)): DatatypeType) < Seq#Rank(s) );
-axiom (forall<T> s: Seq T, i: int ::
+axiom (forall s: Seq, i: int ::
         { Seq#Rank(Seq#Drop(s, i)) }
         0 < i && i <= Seq#Length(s) ==> Seq#Rank(Seq#Drop(s, i)) < Seq#Rank(s) );
-axiom (forall<T> s: Seq T, i: int ::
+axiom (forall s: Seq, i: int ::
         { Seq#Rank(Seq#Take(s, i)) }
         0 <= i && i < Seq#Length(s) ==> Seq#Rank(Seq#Take(s, i)) < Seq#Rank(s) );
-axiom (forall<T> s: Seq T, i: int, j: int ::
+axiom (forall s: Seq, i: int, j: int ::
         { Seq#Rank(Seq#Append(Seq#Take(s, i), Seq#Drop(s, j))) }
         0 <= i && i < j && j <= Seq#Length(s) ==> Seq#Rank(Seq#Append(Seq#Take(s, i), Seq#Drop(s, j))) < Seq#Rank(s) );
 
-// Additional axioms about common things
-axiom (forall<T> s: Seq T, n: int :: { Seq#Drop(s, n) }
-        n == 0 ==> Seq#Drop(s, n) == s);
-axiom (forall<T> s: Seq T, n: int :: { Seq#Take(s, n) }
-        n == 0 ==> Seq#Take(s, n) == Seq#Empty());
-axiom (forall<T> s: Seq T, m, n: int :: { Seq#Drop(Seq#Drop(s, m), n) }
-        0 <= m && 0 <= n && m+n <= Seq#Length(s) ==>
-        Seq#Drop(Seq#Drop(s, m), n) == Seq#Drop(s, m+n));
-
 // ---------------------------------------------------------------
 // -- Axiomatization of Maps -------------------------------------
 // ---------------------------------------------------------------
 
-type Map U V;
+type Map;
 
 // A Map is defined by three functions, Map#Domain, Map#Elements, and #Map#Card.
 
-function Map#Domain<U,V>(Map U V) : Set U;
+function Map#Domain(Map) : Set;
 
-function Map#Elements<U,V>(Map U V) : [U]V;
+function Map#Elements(Map) : [Box]Box;
 
-function Map#Card<U,V>(Map U V) : int;
+function Map#Card(Map) : int;
 
-axiom (forall<U,V> m: Map U V :: { Map#Card(m) } 0 <= Map#Card(m));
+axiom (forall m: Map :: { Map#Card(m) } 0 <= Map#Card(m));
 
-axiom (forall<U, V> m: Map U V ::
+axiom (forall m: Map ::
   { Map#Card(m) }
   Map#Card(m) == 0 <==> m == Map#Empty());
 
-axiom (forall<U, V> m: Map U V ::
+axiom (forall m: Map ::
   { Map#Domain(m) }
-  m == Map#Empty() || (exists k: U :: Map#Domain(m)[k]));
-axiom (forall<U, V> m: Map U V ::
+  m == Map#Empty() || (exists k: Box :: Set#IsMember(Map#Domain(m), k)));
+axiom (forall m: Map ::
   { Map#Values(m) }
-  m == Map#Empty() || (exists v: V :: Map#Values(m)[v]));
-axiom (forall<U, V> m: Map U V ::
+  m == Map#Empty() || (exists v: Box :: Set#IsMember(Map#Values(m), v)));
+axiom (forall m: Map ::
   { Map#Items(m) }
-  m == Map#Empty() || (exists k, v: Box :: Map#Items(m)[$Box(#_System._tuple#2._#Make2(k, v))]));
+  m == Map#Empty() || (exists k, v: Box :: Set#IsMember(Map#Items(m), $Box(#_System._tuple#2._#Make2(k, v)))));
 
-axiom (forall<U, V> m: Map U V ::
+axiom (forall m: Map ::
   { Set#Card(Map#Domain(m)) } { Map#Card(m) }
   Set#Card(Map#Domain(m)) == Map#Card(m));
-axiom (forall<U, V> m: Map U V ::
+axiom (forall m: Map ::
   { Set#Card(Map#Values(m)) } { Map#Card(m) }
   Set#Card(Map#Values(m)) <= Map#Card(m));
-axiom (forall<U, V> m: Map U V ::
+axiom (forall m: Map ::
   { Set#Card(Map#Items(m)) } { Map#Card(m) }
   Set#Card(Map#Items(m)) == Map#Card(m));
 
 // The set of Values of a Map can be obtained by the function Map#Values, which is
-// defined as follows.  Remember, a Set is defined by membership (using Boogie's
-// square brackets) and Map#Card, so we need to define what these mean for the Set
-// returned by Map#Values.
+// defined as follows.  Remember, a Set is defined by Set#IsMember and Map#Card, so
+// we need to define what these mean for the Set returned by Map#Values.
 
-function Map#Values<U,V>(Map U V) : Set V;
+function Map#Values(Map) : Set;
 
-axiom (forall<U,V> m: Map U V, v: V :: { Map#Values(m)[v] }
-  Map#Values(m)[v] ==
-	(exists u: U :: { Map#Domain(m)[u] } { Map#Elements(m)[u] }
-	  Map#Domain(m)[u] &&
+axiom (forall m: Map, v: Box :: { Set#IsMember(Map#Values(m), v) }
+  Set#IsMember(Map#Values(m), v) ==
+	(exists u: Box :: { Set#IsMember(Map#Domain(m), u) } { Map#Elements(m)[u] }
+	  Set#IsMember(Map#Domain(m), u) &&
     v == Map#Elements(m)[u]));
 
 // The set of Items--that is, (key,value) pairs--of a Map can be obtained by the
-// function Map#Items.  Again, we need to define membership of Set#Card for this
-// set.  Everywhere else in this axiomatization, Map is parameterized by types U V,
-// even though Dafny only ever instantiates U V with Box Box.  This makes the
-// axiomatization more generic.  Function Map#Items, however, returns a set of
-// pairs, and the axiomatization of pairs is Dafny specific.  Therefore, the
-// definition of Map#Items here is to be considered Dafny specific.  Also, note
+// function Map#Items.  Again, we need to define Set#IsMember and Set#Card for this
+// set. Function Map#Items returns a set of pairs, and the axiomatization of pairs is Dafny specific.
+// Therefore, the definition of Map#Items here is to be considered Dafny specific.  Also, note
 // that it relies on the two destructors for 2-tuples.
 
-function Map#Items<U,V>(Map U V) : Set Box;
+function Map#Items(Map) : Set;
 
 function #_System._tuple#2._#Make2(Box, Box) : DatatypeType;
 function _System.Tuple2._0(DatatypeType) : Box;
 function _System.Tuple2._1(DatatypeType) : Box;
 
-axiom (forall m: Map Box Box, item: Box :: { Map#Items(m)[item] }
-  Map#Items(m)[item] <==>
-    Map#Domain(m)[_System.Tuple2._0($Unbox(item))] &&
+axiom (forall m: Map, item: Box :: { Set#IsMember(Map#Items(m), item) }
+  Set#IsMember(Map#Items(m), item) <==>
+    Set#IsMember(Map#Domain(m), _System.Tuple2._0($Unbox(item))) &&
     Map#Elements(m)[_System.Tuple2._0($Unbox(item))] == _System.Tuple2._1($Unbox(item)));
 
 // Here are the operations that produce Map values.
 
-function Map#Empty<U, V>(): Map U V;
-axiom (forall<U, V> u: U ::
-        { Map#Domain(Map#Empty(): Map U V)[u] }
-        !Map#Domain(Map#Empty(): Map U V)[u]);
+function Map#Empty(): Map;
+axiom (forall u: Box ::
+        { Set#IsMember(Map#Domain(Map#Empty(): Map), u) }
+        !Set#IsMember(Map#Domain(Map#Empty(): Map), u));
 
-function Map#Glue<U, V>([U]bool, [U]V, Ty): Map U V;
-axiom (forall<U, V> a: [U]bool, b: [U]V, t: Ty ::
+function Map#Glue(Set, [Box]Box, Ty): Map;
+axiom (forall a: Set, b: [Box]Box, t: Ty ::
   { Map#Domain(Map#Glue(a, b, t)) }
   Map#Domain(Map#Glue(a, b, t)) == a);
-axiom (forall<U, V> a: [U]bool, b: [U]V, t: Ty ::
+axiom (forall a: Set, b: [Box]Box, t: Ty ::
   { Map#Elements(Map#Glue(a, b, t)) }
   Map#Elements(Map#Glue(a, b, t)) == b);
-axiom (forall a: [Box]bool, b: [Box]Box, t0, t1: Ty ::
+axiom (forall a: Set, b: [Box]Box, t0, t1: Ty ::
   { Map#Glue(a, b, TMap(t0, t1)) }
   // In the following line, no trigger needed, since the quantifier only gets used in negative contexts
-  (forall bx: Box :: a[bx] ==> $IsBox(bx, t0) && $IsBox(b[bx], t1))
+  (forall bx: Box :: Set#IsMember(a, bx) ==> $IsBox(bx, t0) && $IsBox(b[bx], t1))
   ==>
   $Is(Map#Glue(a, b, TMap(t0, t1)), TMap(t0, t1)));
 
 
 //Build is used in displays, and for map updates
-function Map#Build<U, V>(Map U V, U, V): Map U V;
-/*axiom (forall<U, V> m: Map U V, u: U, v: V ::
+function Map#Build(Map, Box, Box): Map;
+/*axiom (forall m: Map, u: Box, v: Box ::
   { Map#Domain(Map#Build(m, u, v))[u] } { Map#Elements(Map#Build(m, u, v))[u] }
   Map#Domain(Map#Build(m, u, v))[u] && Map#Elements(Map#Build(m, u, v))[u] == v);*/
 
-axiom (forall<U, V> m: Map U V, u: U, u': U, v: V ::
-  { Map#Domain(Map#Build(m, u, v))[u'] } { Map#Elements(Map#Build(m, u, v))[u'] }
-  (u' == u ==> Map#Domain(Map#Build(m, u, v))[u'] &&
+axiom (forall m: Map, u: Box, u': Box, v: Box ::
+  { Set#IsMember(Map#Domain(Map#Build(m, u, v)), u') } { Map#Elements(Map#Build(m, u, v))[u'] }
+  (u' == u ==> Set#IsMember(Map#Domain(Map#Build(m, u, v)), u') &&
                Map#Elements(Map#Build(m, u, v))[u'] == v) &&
-  (u' != u ==> Map#Domain(Map#Build(m, u, v))[u'] == Map#Domain(m)[u'] &&
+  (u' != u ==> Set#IsMember(Map#Domain(Map#Build(m, u, v)), u') == Set#IsMember(Map#Domain(m), u') &&
                Map#Elements(Map#Build(m, u, v))[u'] == Map#Elements(m)[u']));
-axiom (forall<U, V> m: Map U V, u: U, v: V :: { Map#Card(Map#Build(m, u, v)) }
-  Map#Domain(m)[u] ==> Map#Card(Map#Build(m, u, v)) == Map#Card(m));
-axiom (forall<U, V> m: Map U V, u: U, v: V :: { Map#Card(Map#Build(m, u, v)) }
-  !Map#Domain(m)[u] ==> Map#Card(Map#Build(m, u, v)) == Map#Card(m) + 1);
+axiom (forall m: Map, u: Box, v: Box :: { Map#Card(Map#Build(m, u, v)) }
+  Set#IsMember(Map#Domain(m), u) ==> Map#Card(Map#Build(m, u, v)) == Map#Card(m));
+axiom (forall m: Map, u: Box, v: Box :: { Map#Card(Map#Build(m, u, v)) }
+  !Set#IsMember(Map#Domain(m), u) ==> Map#Card(Map#Build(m, u, v)) == Map#Card(m) + 1);
 
 // Map operations
-function Map#Merge<U, V>(Map U V, Map U V): Map U V;
-axiom (forall<U, V> m: Map U V, n: Map U V ::
+function Map#Merge(Map, Map): Map;
+axiom (forall m: Map, n: Map ::
   { Map#Domain(Map#Merge(m, n)) }
   Map#Domain(Map#Merge(m, n)) == Set#Union(Map#Domain(m), Map#Domain(n)));
-axiom (forall<U, V> m: Map U V, n: Map U V, u: U ::
+axiom (forall m: Map, n: Map, u: Box ::
   { Map#Elements(Map#Merge(m, n))[u] }
-  Map#Domain(Map#Merge(m, n))[u] ==>
-    (!Map#Domain(n)[u] ==> Map#Elements(Map#Merge(m, n))[u] == Map#Elements(m)[u]) &&
-    (Map#Domain(n)[u] ==> Map#Elements(Map#Merge(m, n))[u] == Map#Elements(n)[u]));
+  Set#IsMember(Map#Domain(Map#Merge(m, n)), u) ==>
+    (!Set#IsMember(Map#Domain(n), u) ==> Map#Elements(Map#Merge(m, n))[u] == Map#Elements(m)[u]) &&
+    (Set#IsMember(Map#Domain(n), u) ==> Map#Elements(Map#Merge(m, n))[u] == Map#Elements(n)[u]));
 
-function Map#Subtract<U, V>(Map U V, Set U): Map U V;
-axiom (forall<U, V> m: Map U V, s: Set U ::
+function Map#Subtract(Map, Set): Map;
+axiom (forall m: Map, s: Set ::
   { Map#Domain(Map#Subtract(m, s)) }
   Map#Domain(Map#Subtract(m, s)) == Set#Difference(Map#Domain(m), s));
-axiom (forall<U, V> m: Map U V, s: Set U, u: U ::
+axiom (forall m: Map, s: Set, u: Box ::
   { Map#Elements(Map#Subtract(m, s))[u] }
-  Map#Domain(Map#Subtract(m, s))[u] ==>
+  Set#IsMember(Map#Domain(Map#Subtract(m, s)), u) ==>
     Map#Elements(Map#Subtract(m, s))[u] == Map#Elements(m)[u]);
 
 //equality for maps
-function Map#Equal<U, V>(Map U V, Map U V): bool;
-axiom (forall<U, V> m: Map U V, m': Map U V::
+function Map#Equal(Map, Map): bool;
+axiom (forall m: Map, m': Map::
   { Map#Equal(m, m') }
-    Map#Equal(m, m') <==> (forall u : U :: Map#Domain(m)[u] == Map#Domain(m')[u]) &&
-                          (forall u : U :: Map#Domain(m)[u] ==> Map#Elements(m)[u] == Map#Elements(m')[u]));
+    Map#Equal(m, m') <==> (forall u : Box :: Set#IsMember(Map#Domain(m), u) == Set#IsMember(Map#Domain(m'), u)) &&
+                          (forall u : Box :: Set#IsMember(Map#Domain(m), u) ==> Map#Elements(m)[u] == Map#Elements(m')[u]));
 // extensionality
-axiom (forall<U, V> m: Map U V, m': Map U V::
+axiom (forall m: Map, m': Map::
   { Map#Equal(m, m') }
     Map#Equal(m, m') ==> m == m');
 
-function Map#Disjoint<U, V>(Map U V, Map U V): bool;
-axiom (forall<U, V> m: Map U V, m': Map U V ::
+function Map#Disjoint(Map, Map): bool;
+axiom (forall m: Map, m': Map ::
   { Map#Disjoint(m, m') }
-    Map#Disjoint(m, m') <==> (forall o: U :: {Map#Domain(m)[o]} {Map#Domain(m')[o]} !Map#Domain(m)[o] || !Map#Domain(m')[o]));
+    Map#Disjoint(m, m') <==>
+    (forall o: Box :: {Set#IsMember(Map#Domain(m), o)} {Set#IsMember(Map#Domain(m'), o)} !Set#IsMember(Map#Domain(m), o) || !Set#IsMember(Map#Domain(m'), o)));
 
 // ---------------------------------------------------------------
 // -- Axiomatization of IMaps ------------------------------------
 // ---------------------------------------------------------------
 
-type IMap U V;
+type IMap;
 
 // A IMap is defined by two functions, Map#Domain and Map#Elements.
 
-function IMap#Domain<U,V>(IMap U V) : Set U;
+function IMap#Domain(IMap) : ISet;
 
-function IMap#Elements<U,V>(IMap U V) : [U]V;
+function IMap#Elements(IMap) : [Box]Box;
 
-axiom (forall<U, V> m: IMap U V ::
+axiom (forall m: IMap ::
   { IMap#Domain(m) }
-  m == IMap#Empty() || (exists k: U :: IMap#Domain(m)[k]));
-axiom (forall<U, V> m: IMap U V ::
+  m == IMap#Empty() || (exists k: Box :: IMap#Domain(m)[k]));
+axiom (forall m: IMap ::
   { IMap#Values(m) }
-  m == IMap#Empty() || (exists v: V :: IMap#Values(m)[v]));
-axiom (forall<U, V> m: IMap U V ::
+  m == IMap#Empty() || (exists v: Box :: IMap#Values(m)[v]));
+axiom (forall m: IMap ::
   { IMap#Items(m) }
   m == IMap#Empty() || (exists k, v: Box :: IMap#Items(m)[$Box(#_System._tuple#2._#Make2(k, v))]));
 
-axiom (forall<U, V> m: IMap U V ::
+axiom (forall m: IMap ::
   { IMap#Domain(m) }
   m == IMap#Empty() <==> IMap#Domain(m) == ISet#Empty());
-axiom (forall<U, V> m: IMap U V ::
+axiom (forall m: IMap ::
   { IMap#Values(m) }
   m == IMap#Empty() <==> IMap#Values(m) == ISet#Empty());
-axiom (forall<U, V> m: IMap U V ::
+axiom (forall m: IMap ::
   { IMap#Items(m) }
   m == IMap#Empty() <==> IMap#Items(m) == ISet#Empty());
 
-// The set of Values of a IMap can be obtained by the function IMap#Values, which is
-// defined as follows.  Remember, a ISet is defined by membership (using Boogie's
-// square brackets) so we need to define what these mean for the Set
-// returned by Map#Values.
+// The set of Values of an IMap can be obtained by the function IMap#Values, which is
+// defined as follows.  Remember, an ISet is defined by membership (using Boogie's
+// square brackets) so we need to define what these mean for the ISet
+// returned by IMap#Values.
 
-function IMap#Values<U,V>(IMap U V) : Set V;
+function IMap#Values(IMap) : ISet;
 
-axiom (forall<U,V> m: IMap U V, v: V :: { IMap#Values(m)[v] }
+axiom (forall m: IMap, v: Box :: { IMap#Values(m)[v] }
   IMap#Values(m)[v] ==
-	(exists u: U :: { IMap#Domain(m)[u] } { IMap#Elements(m)[u] }
+	(exists u: Box :: { IMap#Domain(m)[u] } { IMap#Elements(m)[u] }
 	  IMap#Domain(m)[u] &&
     v == IMap#Elements(m)[u]));
 
 // The set of Items--that is, (key,value) pairs--of a Map can be obtained by the
-// function IMap#Items.
-// Everywhere else in this axiomatization, IMap is parameterized by types U V,
-// even though Dafny only ever instantiates U V with Box Box.  This makes the
-// axiomatization more generic.  Function IMap#Items, however, returns a set of
+// function IMap#Items. Function IMap#Items returns a set of
 // pairs, and the axiomatization of pairs is Dafny specific.  Therefore, the
 // definition of IMap#Items here is to be considered Dafny specific.  Also, note
 // that it relies on the two destructors for 2-tuples.
 
-function IMap#Items<U,V>(IMap U V) : Set Box;
+function IMap#Items(IMap) : ISet;
 
-axiom (forall m: IMap Box Box, item: Box :: { IMap#Items(m)[item] }
+axiom (forall m: IMap, item: Box :: { IMap#Items(m)[item] }
   IMap#Items(m)[item] <==>
     IMap#Domain(m)[_System.Tuple2._0($Unbox(item))] &&
     IMap#Elements(m)[_System.Tuple2._0($Unbox(item))] == _System.Tuple2._1($Unbox(item)));
 
 // Here are the operations that produce Map values.
-function IMap#Empty<U, V>(): IMap U V;
-axiom (forall<U, V> u: U ::
-        { IMap#Domain(IMap#Empty(): IMap U V)[u] }
-        !IMap#Domain(IMap#Empty(): IMap U V)[u]);
+function IMap#Empty(): IMap;
+axiom (forall u: Box ::
+        { IMap#Domain(IMap#Empty(): IMap)[u] }
+        !IMap#Domain(IMap#Empty(): IMap)[u]);
 
-function IMap#Glue<U, V>([U] bool, [U]V, Ty): IMap U V;
-axiom (forall<U, V> a: [U]bool, b: [U]V, t: Ty ::
+function IMap#Glue([Box] bool, [Box]Box, Ty): IMap;
+axiom (forall a: [Box]bool, b: [Box]Box, t: Ty ::
   { IMap#Domain(IMap#Glue(a, b, t)) }
   IMap#Domain(IMap#Glue(a, b, t)) == a);
-axiom (forall<U, V> a: [U]bool, b: [U]V, t: Ty ::
+axiom (forall a: [Box]bool, b: [Box]Box, t: Ty ::
   { IMap#Elements(IMap#Glue(a, b, t)) }
   IMap#Elements(IMap#Glue(a, b, t)) == b);
 axiom (forall a: [Box]bool, b: [Box]Box, t0, t1: Ty ::
@@ -1404,15 +1576,15 @@ axiom (forall a: [Box]bool, b: [Box]Box, t0, t1: Ty ::
   // In the following line, no trigger needed, since the quantifier only gets used in negative contexts
   (forall bx: Box :: a[bx] ==> $IsBox(bx, t0) && $IsBox(b[bx], t1))
   ==>
-  $Is(Map#Glue(a, b, TIMap(t0, t1)), TIMap(t0, t1)));
+  $Is(IMap#Glue(a, b, TIMap(t0, t1)), TIMap(t0, t1)));
 
 //Build is used in displays
-function IMap#Build<U, V>(IMap U V, U, V): IMap U V;
-/*axiom (forall<U, V> m: IMap U V, u: U, v: V ::
+function IMap#Build(IMap, Box, Box): IMap;
+/*axiom (forall m: IMap, u: Box, v: Box ::
   { IMap#Domain(IMap#Build(m, u, v))[u] } { IMap#Elements(IMap#Build(m, u, v))[u] }
   IMap#Domain(IMap#Build(m, u, v))[u] && IMap#Elements(IMap#Build(m, u, v))[u] == v);*/
 
-axiom (forall<U, V> m: IMap U V, u: U, u': U, v: V ::
+axiom (forall m: IMap, u: Box, u': Box, v: Box ::
   { IMap#Domain(IMap#Build(m, u, v))[u'] } { IMap#Elements(IMap#Build(m, u, v))[u'] }
   (u' == u ==> IMap#Domain(IMap#Build(m, u, v))[u'] &&
                IMap#Elements(IMap#Build(m, u, v))[u'] == v) &&
@@ -1420,32 +1592,32 @@ axiom (forall<U, V> m: IMap U V, u: U, u': U, v: V ::
                IMap#Elements(IMap#Build(m, u, v))[u'] == IMap#Elements(m)[u']));
 
 //equality for imaps
-function IMap#Equal<U, V>(IMap U V, IMap U V): bool;
-axiom (forall<U, V> m: IMap U V, m': IMap U V::
+function IMap#Equal(IMap, IMap): bool;
+axiom (forall m: IMap, m': IMap::
   { IMap#Equal(m, m') }
-    IMap#Equal(m, m') <==> (forall u : U :: IMap#Domain(m)[u] == IMap#Domain(m')[u]) &&
-                          (forall u : U :: IMap#Domain(m)[u] ==> IMap#Elements(m)[u] == IMap#Elements(m')[u]));
+    IMap#Equal(m, m') <==> (forall u : Box :: IMap#Domain(m)[u] == IMap#Domain(m')[u]) &&
+                          (forall u : Box :: IMap#Domain(m)[u] ==> IMap#Elements(m)[u] == IMap#Elements(m')[u]));
 // extensionality
-axiom (forall<U, V> m: IMap U V, m': IMap U V::
+axiom (forall m: IMap, m': IMap::
   { IMap#Equal(m, m') }
     IMap#Equal(m, m') ==> m == m');
 
 // IMap operations
-function IMap#Merge<U, V>(IMap U V, IMap U V): IMap U V;
-axiom (forall<U, V> m: IMap U V, n: IMap U V ::
+function IMap#Merge(IMap, IMap): IMap;
+axiom (forall m: IMap, n: IMap ::
   { IMap#Domain(IMap#Merge(m, n)) }
-  IMap#Domain(IMap#Merge(m, n)) == Set#Union(IMap#Domain(m), IMap#Domain(n)));
-axiom (forall<U, V> m: IMap U V, n: IMap U V, u: U ::
+  IMap#Domain(IMap#Merge(m, n)) == ISet#Union(IMap#Domain(m), IMap#Domain(n)));
+axiom (forall m: IMap, n: IMap, u: Box ::
   { IMap#Elements(IMap#Merge(m, n))[u] }
   IMap#Domain(IMap#Merge(m, n))[u] ==>
     (!IMap#Domain(n)[u] ==> IMap#Elements(IMap#Merge(m, n))[u] == IMap#Elements(m)[u]) &&
     (IMap#Domain(n)[u] ==> IMap#Elements(IMap#Merge(m, n))[u] == IMap#Elements(n)[u]));
 
-function IMap#Subtract<U, V>(IMap U V, Set U): IMap U V;
-axiom (forall<U, V> m: IMap U V, s: Set U ::
+function IMap#Subtract(IMap, Set): IMap;
+axiom (forall m: IMap, s: Set ::
   { IMap#Domain(IMap#Subtract(m, s)) }
-  IMap#Domain(IMap#Subtract(m, s)) == Set#Difference(IMap#Domain(m), s));
-axiom (forall<U, V> m: IMap U V, s: Set U, u: U ::
+  IMap#Domain(IMap#Subtract(m, s)) == ISet#Difference(IMap#Domain(m), ISet#FromSet(s)));
+axiom (forall m: IMap, s: Set, u: Box ::
   { IMap#Elements(IMap#Subtract(m, s))[u] }
   IMap#Domain(IMap#Subtract(m, s))[u] ==>
     IMap#Elements(IMap#Subtract(m, s))[u] == IMap#Elements(m)[u]);
@@ -1505,3 +1677,4 @@ axiom (forall x, y, z: int ::
 #endif
 
 // -------------------------------------------------------------------------
+
diff --git a/Source/DafnyCore/DooFile.cs b/Source/DafnyCore/DooFile.cs
index 07d5dde5049..2ba2775ab22 100644
--- a/Source/DafnyCore/DooFile.cs
+++ b/Source/DafnyCore/DooFile.cs
@@ -1,24 +1,25 @@
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Binding;
-using System.Configuration;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Text;
-using System.Threading;
+using System.Threading.Tasks;
+using DafnyCore.Options;
 using Microsoft.Dafny;
-using Microsoft.Dafny.Auditor;
 using Tomlyn;
+using Tomlyn.Helpers;
 using Tomlyn.Model;
-using Type = System.Type;
 
-namespace DafnyCore; 
+namespace DafnyCore;
 
 // Model class for the .doo file format for Dafny libraries.
 // Contains the validation logic for safely consuming libraries as well.
 public class DooFile {
+  public const string Extension = ".doo";
 
   private const string ProgramFileEntry = "program";
 
@@ -30,13 +31,20 @@ public class ManifestData {
 
     public string DafnyVersion { get; set; }
 
-    public string SolverIdentifier { get; set; }
-    public string SolverVersion { get; set; }
+    public string? SolverIdentifier { get; set; }
+    public string? SolverVersion { get; set; }
 
     public Dictionary<string, object> Options { get; set; }
 
+    static ManifestData() {
+      CommonOptionBag.EnsureStaticConstructorHasRun();
+    }
+
     public ManifestData() {
       // Only for TOML deserialization!
+      DooFileVersion = null!;
+      DafnyVersion = null!;
+      Options = null!;
     }
 
     public ManifestData(DafnyOptions options) {
@@ -44,11 +52,30 @@ public ManifestData(DafnyOptions options) {
       DafnyVersion = options.VersionNumber;
 
       SolverIdentifier = options.SolverIdentifier;
-      SolverVersion = options.SolverVersion.ToString();
+      // options.SolverVersion may be null (if --no-verify is used for example)
+      SolverVersion = options.SolverVersion?.ToString();
 
       Options = new Dictionary<string, object>();
-      foreach (var (option, _) in OptionChecks) {
-        var optionValue = GetOptionValue(options, option);
+      foreach (var option in OptionRegistry.GlobalOptions.Concat(OptionRegistry.ModuleOptions)) {
+        if (option == CommonOptionBag.Libraries) {
+          // We don't want to serialize the FileInfo objects of this option
+          // For now we add an option specific exception here so we do not need to change
+          // the option registration system.
+          // When improve soundness through https://github.com/dafny-lang/dafny/issues/5335
+          // Then we'll get back to this
+          continue;
+        }
+        var optionValue = options.Get((dynamic)option);
+        if (option == CommonOptionBag.QuantifierSyntax) {
+          switch (optionValue) {
+            case QuantifierSyntaxOptions.Version4:
+              optionValue = "4";
+              break;
+            case QuantifierSyntaxOptions.Version3:
+              optionValue = "3";
+              break;
+          }
+        }
         Options.Add(option.Name, optionValue);
       }
     }
@@ -58,7 +85,17 @@ public static ManifestData Read(TextReader reader) {
     }
 
     public void Write(TextWriter writer) {
-      writer.Write(Toml.FromModel(this, new TomlModelOptions()));
+      var content = Toml.FromModel(this, new TomlModelOptions() {
+        ConvertToToml = obj => {
+          if (obj is Enum) {
+            TomlFormatHelper.ToString(obj.ToString()!, TomlPropertyDisplayKind.Default);
+            return obj.ToString();
+          }
+
+          return obj;
+        }
+      }).Replace("\r\n", "\n");
+      writer.Write(content);
     }
   }
 
@@ -66,40 +103,48 @@ public void Write(TextWriter writer) {
 
   public string ProgramText { get; set; }
 
-  // This must be independent from any user-provided options,
-  // and remain fixed over the lifetime of a single .doo file format version.
-  // We don't want to attempt to read the program text using --function-syntax:3 for example.
-  // If we change default option values in future Dafny major version bumps,
-  // this must be configured to stay the same.
-  private static DafnyOptions ProgramSerializationOptions => DafnyOptions.Default;
+  public static async Task<DooFile> Read(string path) {
+    using var archive = ZipFile.Open(path, ZipArchiveMode.Read);
+    return await Read(archive);
+  }
+
+  public static async Task<DooFile> Read(Stream stream) {
+    using var archive = new ZipArchive(stream);
+    return await Read(archive);
+  }
 
-  public static DooFile Read(string path) {
-    var result = new DooFile();
+  private static async Task<DooFile> Read(ZipArchive archive) {
 
-    using var archive = ZipFile.Open(path, ZipArchiveMode.Read);
     var manifestEntry = archive.GetEntry(ManifestFileEntry);
     if (manifestEntry == null) {
       throw new ArgumentException(".doo file missing manifest entry");
     }
-    using (var manifestStream = manifestEntry.Open()) {
-      result.Manifest = ManifestData.Read(new StreamReader(manifestStream, Encoding.UTF8));
+
+    ManifestData manifest;
+    await using (var manifestStream = manifestEntry.Open()) {
+      manifest = ManifestData.Read(new StreamReader(manifestStream, Encoding.UTF8));
     }
 
     var programTextEntry = archive.GetEntry(ProgramFileEntry);
     if (programTextEntry == null) {
       throw new ArgumentException(".doo file missing program text entry");
     }
-    using (var programTextStream = programTextEntry.Open()) {
+
+    string programText;
+    await using (var programTextStream = programTextEntry.Open()) {
       var reader = new StreamReader(programTextStream, Encoding.UTF8);
-      result.ProgramText = reader.ReadToEnd();
+      programText = await reader.ReadToEndAsync();
     }
 
+    var result = new DooFile(manifest, programText);
     return result;
   }
 
   public DooFile(Program dafnyProgram) {
-    var tw = new StringWriter();
-    var pr = new Printer(tw, ProgramSerializationOptions, PrintModes.Serialization);
+    var tw = new StringWriter {
+      NewLine = "\n"
+    };
+    var pr = new Printer(tw, dafnyProgram.Options, PrintModes.Serialization);
     // afterResolver is false because we don't yet have a way to safely skip resolution
     // when reading the program back into memory.
     // It's probably worth serializing a program in a more efficient way first
@@ -109,71 +154,83 @@ public DooFile(Program dafnyProgram) {
     Manifest = new ManifestData(dafnyProgram.Options);
   }
 
-  private DooFile() {
+  public DooFile(ManifestData manifest, string programText) {
+    Manifest = manifest;
+    ProgramText = programText;
   }
 
-  public bool Validate(string filePath, DafnyOptions options, Command currentCommand) {
-    if (currentCommand == null) {
-      options.Printer.ErrorWriteLine(Console.Out, $"Cannot load {filePath}: .doo files cannot be used with the legacy CLI");
-      return false;
+  /// <summary>
+  /// Returns the options as specified by the DooFile
+  /// </summary>
+  public DafnyOptions? Validate(ErrorReporter reporter, Uri file, DafnyOptions options, IOrigin origin) {
+    if (!options.UsingNewCli) {
+      reporter.Error(MessageSource.Project, origin,
+        $"cannot load {options.GetPrintPath(file.LocalPath)}: .doo files cannot be used with the legacy CLI");
+      return null;
     }
 
     if (options.VersionNumber != Manifest.DafnyVersion) {
-      options.Printer.ErrorWriteLine(Console.Out, $"Cannot load {filePath}: it was built with Dafny {Manifest.DafnyVersion}, which cannot be used by Dafny {options.VersionNumber}");
-      return false;
+      reporter.Error(MessageSource.Project, origin,
+        $"cannot load {options.GetPrintPath(file.LocalPath)}: it was built with Dafny {Manifest.DafnyVersion}, which cannot be used by Dafny {options.VersionNumber}");
+      return null;
     }
 
+    return CheckAndGetLibraryOptions(reporter, file, options, origin, Manifest.Options);
+  }
+
+  public static DafnyOptions? CheckAndGetLibraryOptions(ErrorReporter reporter,
+    Uri libraryFile,
+    DafnyOptions options, IOrigin origin,
+    IDictionary<string, object> libraryOptions) {
+    var result = new DafnyOptions(options);
     var success = true;
-    var revelantOptions = currentCommand.Options.ToHashSet();
-    foreach (var (option, check) in OptionChecks) {
+
+    var relevantOptions = options.Options.OptionArguments.Keys.ToHashSet();
+    foreach (var option in OptionRegistry.GlobalOptions.Concat(OptionRegistry.ModuleOptions)) {
       // It's important to only look at the options the current command uses,
       // because other options won't be initialized to the correct default value.
       // See CommandRegistry.Create().
-      if (!revelantOptions.Contains(option)) {
+      if (!relevantOptions.Contains(option)) {
         continue;
       }
-
       var localValue = options.Get(option);
 
-      object libraryValue = null;
-      if (Manifest.Options.TryGetValue(option.Name, out var manifestValue)) {
-        if (!DafnyProject.TryGetValueFromToml(Console.Out, null,
-              option.Name, option.ValueType, manifestValue, out libraryValue)) {
-          return false;
+      object? libraryValue;
+      if (libraryOptions.TryGetValue(option.Name, out var manifestValue)) {
+        var printTomlValue = DafnyProject.PrintTomlOptionToCliValue(libraryFile, manifestValue, option);
+        var parseResult = option.Parse(printTomlValue.ToArray());
+        if (parseResult.Errors.Any()) {
+          reporter.Error(MessageSource.Project, origin, $"could not parse value '{manifestValue}' for option '{option.Name}' that has type '{option.ValueType.Name}'");
+          return null;
         }
-      } else if (option.ValueType == typeof(IEnumerable<string>)) {
-        // This can happen because Tomlyn will drop aggregate properties with no values.
-        libraryValue = Array.Empty<string>();
+        // By using the dynamic keyword, we can use the generic version of GetValueForOption which does type conversion,
+        // which is sadly not accessible without generics.
+        libraryValue = parseResult.GetValueForOption((dynamic)option);
+      } else {
+        // This else can occur because Tomlyn will drop aggregate properties with no values.
+        // When this happens, use the default value
+        libraryValue = option.Parse("").GetValueForOption(option)!;
       }
-      success = success && check(options, option, localValue, filePath, libraryValue);
-    }
-    return success;
-  }
 
-  private static object GetOptionValue(DafnyOptions options, Option option) {
-    // This is annoyingly necessary because only DafnyOptions.Get<T>(Option<T> option)
-    // handles falling back to the configured default option value,
-    // whereas the non-generic DafnyOptions.Get(Option option) doesn't.
-    // TODO: Move somewhere more generic if this is useful in other cases?
-    var optionType = option.ValueType;
-    if (optionType == typeof(bool)) {
-      return options.Get((Option<bool>)option);
-    }
-    if (optionType == typeof(string)) {
-      return options.Get((Option<string>)option);
+      result.Options.OptionArguments[option] = libraryValue;
+      result.ApplyBinding(option);
+      var prefix = $"cannot load {options.GetPrintPath(libraryFile.LocalPath)}";
+      var checkpasses = OptionRegistry.GlobalCheck(option)?.Invoke(reporter, origin, prefix, option, localValue, libraryValue) ?? true;
+      success = success && checkpasses;
     }
-    if (optionType == typeof(IEnumerable<string>)) {
-      return options.Get((Option<IEnumerable<string>>)option);
+
+    if (!success) {
+      return null;
     }
 
-    throw new ArgumentException();
+    return result;
   }
 
   public void Write(ConcreteSyntaxTree wr) {
     var manifestWr = wr.NewFile(ManifestFileEntry);
     using var manifestWriter = new StringWriter();
     Manifest.Write(manifestWriter);
-    manifestWr.Write(manifestWriter.ToString());
+    manifestWr.Write(manifestWriter.ToString().Replace("\r\n", "\n"));
 
     var programTextWr = wr.NewFile(ProgramFileEntry);
     programTextWr.Write(ProgramText);
@@ -198,71 +255,4 @@ public void Write(string path) {
     }
   }
 
-  // Partitioning of all options into subsets that must be recorded in a .doo file
-  // to guard against unsafe usage.
-  // Note that legacy CLI options are not as cleanly enumerated and therefore
-  // more difficult to completely categorize, which is the main reason the LibraryBackend
-  // is restricted to only the new CLI.
-
-  public delegate bool OptionCheck(DafnyOptions options, Option option, object localValue, string libraryFile, object libraryValue);
-  private static readonly Dictionary<Option, OptionCheck> OptionChecks = new();
-  private static readonly HashSet<Option> NoChecksNeeded = new();
-
-  public static bool CheckOptionMatches(DafnyOptions options, Option option, object localValue, string libraryFile, object libraryValue) {
-    if (OptionValuesEqual(option, localValue, libraryValue)) {
-      return true;
-    }
-
-    options.Printer.ErrorWriteLine(Console.Out, $"*** Error: Cannot load {libraryFile}: --{option.Name} is set locally to {OptionValueToString(option, localValue)}, but the library was built with {OptionValueToString(option, libraryValue)}");
-    return false;
-  }
-
-  private static bool OptionValuesEqual(Option option, object first, object second) {
-    if (first.Equals(second)) {
-      return true;
-    }
-
-    if (option.ValueType == typeof(IEnumerable<string>)) {
-      return ((IEnumerable<string>)first).SequenceEqual((IEnumerable<string>)second);
-    }
-
-    return false;
-  }
-
-  private static string OptionValueToString(Option option, object value) {
-    if (option.ValueType == typeof(IEnumerable<string>)) {
-      var values = (IEnumerable<string>)value;
-      return $"[{string.Join(',', values)}]";
-    }
-
-    return value.ToString();
-  }
-
-  public static void RegisterLibraryChecks(IDictionary<Option, OptionCheck> checks) {
-    foreach (var (option, check) in checks) {
-      if (NoChecksNeeded.Contains(option)) {
-        throw new ArgumentException($"Option already registered as not needing a library check: {option.Name}");
-      }
-      OptionChecks.Add(option, check);
-    }
-  }
-
-  public static void RegisterNoChecksNeeded(params Option[] options) {
-    foreach (var option in options) {
-      if (OptionChecks.ContainsKey(option)) {
-        throw new ArgumentException($"Option already registered as needing a library check: {option.Name}");
-      }
-      NoChecksNeeded.Add(option);
-    }
-  }
-
-  public static void CheckOptions(IEnumerable<Option> allOptions) {
-    var unsupportedOptions = allOptions.ToHashSet()
-      .Where(o =>
-        !OptionChecks.ContainsKey(o) && !NoChecksNeeded.Contains(o))
-      .ToList();
-    if (unsupportedOptions.Any()) {
-      throw new Exception($"Internal error - unsupported options registered: {{\n{string.Join(",\n", unsupportedOptions)}\n}}");
-    }
-  }
 }
diff --git a/Source/DafnyCore/Feature.cs b/Source/DafnyCore/Feature.cs
index 856b02e7edf..bac81125071 100644
--- a/Source/DafnyCore/Feature.cs
+++ b/Source/DafnyCore/Feature.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics.Contracts;
 using System.Linq;
-using Microsoft.Boogie;
 
 namespace Microsoft.Dafny;
 
@@ -98,8 +97,7 @@ public enum Feature {
     with the statement's body directly inside. The alternative, default compilation strategy
     is to calculate the quantified variable bindings separately as a collection of tuples,
     and then execute the statement's body for each tuple.
-    Not all `forall` statements can be sequentialized; See [the implementation](https://github.com/dafny-lang/dafny/blob/master/Source/Dafny/Compilers/SinglePassCompiler.cs#L3493-L3528)
-    for details.")]
+    Not all `forall` statements can be sequentialized.")]
   NonSequentializableForallStatements,
 
   [FeatureDescription("Taking an array's length", "sec-array-type")]
@@ -163,9 +161,15 @@ and where at least one variable has potentially infinite bounds.
   [FeatureDescription("Subtype constraints in quantifiers", "sec-quantifier-expression")]
   SubtypeConstraintsInQuantifiers,
 
-  [FeatureDescription("Tuples with more than 20 arguments", "sec-tuple-types")]
+  [FeatureDescription("Tuples with more than 20 arguments", "#sec-compilation-built-ins")]
   TuplesWiderThan20,
 
+  [FeatureDescription("Arrays with more than 16 dimensions", "#sec-compilation-built-ins")]
+  ArraysWithMoreThan16Dims,
+
+  [FeatureDescription("Arrow types with more than 16 arguments", "#sec-compilation-built-ins")]
+  ArrowsWithMoreThan16Arguments,
+
   [FeatureDescription("Unicode chars", "#sec-characters")]
   UnicodeChars,
 
@@ -177,7 +181,13 @@ and where at least one variable has potentially infinite bounds.
   LegacyCLI,
 
   [FeatureDescription("Separate compilation", "sec-compilation")]
-  SeparateCompilation
+  SeparateCompilation,
+
+  [FeatureDescription("All built-in types in runtime library", "sec-compilation-built-ins")]
+  BuiltinsInRuntime,
+
+  [FeatureDescription("Execution coverage report", "sec-dafny-test")]
+  RuntimeCoverageReport
 }
 
 public class UnsupportedFeatureException : Exception {
@@ -185,16 +195,32 @@ public class UnsupportedFeatureException : Exception {
   public const string MessagePrefix =
     "Feature not supported for this compilation target: ";
 
-  public readonly IToken Token;
+  public readonly IOrigin Token;
   public readonly Feature Feature;
 
-  public UnsupportedFeatureException(IToken token, Feature feature)
+  public UnsupportedFeatureException(IOrigin token, Feature feature)
     : this(token, feature, MessagePrefix + FeatureDescriptionAttribute.GetDescription(feature).Description) {
 
   }
 
-  public UnsupportedFeatureException(IToken token, Feature feature, string message) : base(message) {
+  public UnsupportedFeatureException(IOrigin token, Feature feature, string message) : base(message) {
     Token = token;
     Feature = feature;
   }
 }
+
+
+
+public class RecoverableUnsupportedFeatureException : UnsupportedFeatureException {
+
+  public static readonly string MessageSuffix = ". To continue despite this issue, you can compile with the option --" +
+                                       CommonOptionBag.EmitUncompilableCode.Name;
+  public RecoverableUnsupportedFeatureException(IOrigin token, Feature feature)
+    : base(token, feature, MessagePrefix + FeatureDescriptionAttribute.GetDescription(feature).Description + MessageSuffix) {
+  }
+}
+
+public class UnsupportedInvalidOperationException : InvalidOperationException {
+  public UnsupportedInvalidOperationException(string why) : base(typeof(UnsupportedInvalidOperationException).FullName! + ": " + why) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny.cs b/Source/DafnyCore/GeneratedFromDafny.cs
deleted file mode 100644
index 91d0c2ad3ea..00000000000
--- a/Source/DafnyCore/GeneratedFromDafny.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Dafny program Formatting.dfy compiled into C#
-// To recompile, you will need the libraries
-//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
-// but the 'dotnet' tool in net6.0 should pick those up automatically.
-// Optionally, you may want to include compiler switches like
-//     /debug /nowarn:162,164,168,183,219,436,1717,1718
-
-using System;
-using System.Numerics;
-using System.Collections;
-namespace Formatting {
-
-  public partial class __default {
-    public static System.String ReindentProgramFromFirstToken(Microsoft.Dafny.IToken firstToken, Formatting.IIndentationFormatter reindent) {
-      System.String s = default(System.String);
-      Microsoft.Dafny.IToken token;
-      token = firstToken;
-      System.Text.StringBuilder sb;
-      System.Text.StringBuilder _nw0 = new System.Text.StringBuilder();
-      sb = _nw0;
-      while ((token) != (object)((Microsoft.Dafny.IToken)null)) {
-        System.String newLeadingTrivia;
-        newLeadingTrivia = (reindent).GetNewLeadingTrivia(token);
-        System.String newTrailingTrivia;
-        newTrailingTrivia = (reindent).GetNewTrailingTrivia(token);
-        (sb).Append(newLeadingTrivia);
-        (sb).Append(token.val);
-        (sb).Append(newTrailingTrivia);
-        token = token.Next;
-      }
-      System.String _out0;
-      _out0 = (sb).ToString().ToString();
-      s = _out0;
-      return s;
-    }
-  }
-
-  public interface IIndentationFormatter {
-    System.String GetNewLeadingTrivia(Microsoft.Dafny.IToken token);
-    System.String GetNewTrailingTrivia(Microsoft.Dafny.IToken token);
-  }
-  public class _Companion_IIndentationFormatter {
-  }
-} // end of namespace Formatting
-
-
-
diff --git a/Source/DafnyCore/GeneratedFromDafny/D2DPrettyPrinter.cs b/Source/DafnyCore/GeneratedFromDafny/D2DPrettyPrinter.cs
new file mode 100644
index 00000000000..9216519c02e
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/D2DPrettyPrinter.cs
@@ -0,0 +1,26 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace D2DPrettyPrinter {
+
+  public partial class __default {
+    public static Dafny.ISequence<Dafny.Rune> PrettyPrint(Dafny.ISequence<DAST._IModule> d)
+    {
+      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
+      Microsoft.Dafny.Compilers.WrapException.Throw();
+      s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Not Implemented Yet");
+      return s;
+    }
+  }
+} // end of namespace D2DPrettyPrinter
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/DAST.cs b/Source/DafnyCore/GeneratedFromDafny/DAST.cs
new file mode 100644
index 00000000000..b6152f6d382
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/DAST.cs
@@ -0,0 +1,9432 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace DAST {
+
+
+  public interface _IName {
+    bool is_Name { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_dafny__name { get; }
+  }
+  public class Name : _IName {
+    public readonly Dafny.ISequence<Dafny.Rune> _dafny__name;
+    public Name(Dafny.ISequence<Dafny.Rune> dafny__name) {
+      this._dafny__name = dafny__name;
+    }
+    public static Dafny.ISequence<Dafny.Rune> DowncastClone(Dafny.ISequence<Dafny.Rune> _this) {
+      return _this;
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Name;
+      return oth != null && object.Equals(this._dafny__name, oth._dafny__name);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._dafny__name));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Name.Name";
+      s += "(";
+      s += this._dafny__name.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+    private static readonly Dafny.ISequence<Dafny.Rune> theDefault = Dafny.Sequence<Dafny.Rune>.Empty;
+    public static Dafny.ISequence<Dafny.Rune> Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TYPE = new Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>>(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IName create(Dafny.ISequence<Dafny.Rune> dafny__name) {
+      return new Name(dafny__name);
+    }
+    public static _IName create_Name(Dafny.ISequence<Dafny.Rune> dafny__name) {
+      return create(dafny__name);
+    }
+    public bool is_Name { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_dafny__name {
+      get {
+        return this._dafny__name;
+      }
+    }
+  }
+
+  public interface _IVarName {
+    bool is_VarName { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_dafny__name { get; }
+  }
+  public class VarName : _IVarName {
+    public readonly Dafny.ISequence<Dafny.Rune> _dafny__name;
+    public VarName(Dafny.ISequence<Dafny.Rune> dafny__name) {
+      this._dafny__name = dafny__name;
+    }
+    public static Dafny.ISequence<Dafny.Rune> DowncastClone(Dafny.ISequence<Dafny.Rune> _this) {
+      return _this;
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.VarName;
+      return oth != null && object.Equals(this._dafny__name, oth._dafny__name);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._dafny__name));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.VarName.VarName";
+      s += "(";
+      s += this._dafny__name.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+    private static readonly Dafny.ISequence<Dafny.Rune> theDefault = Dafny.Sequence<Dafny.Rune>.Empty;
+    public static Dafny.ISequence<Dafny.Rune> Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TYPE = new Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>>(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IVarName create(Dafny.ISequence<Dafny.Rune> dafny__name) {
+      return new VarName(dafny__name);
+    }
+    public static _IVarName create_VarName(Dafny.ISequence<Dafny.Rune> dafny__name) {
+      return create(dafny__name);
+    }
+    public bool is_VarName { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_dafny__name {
+      get {
+        return this._dafny__name;
+      }
+    }
+  }
+
+  public interface _IModule {
+    bool is_Module { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<DAST._IAttribute> dtor_attributes { get; }
+    bool dtor_requiresExterns { get; }
+    Std.Wrappers._IOption<Dafny.ISequence<DAST._IModuleItem>> dtor_body { get; }
+    _IModule DowncastClone();
+  }
+  public class Module : _IModule {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<DAST._IAttribute> _attributes;
+    public readonly bool _requiresExterns;
+    public readonly Std.Wrappers._IOption<Dafny.ISequence<DAST._IModuleItem>> _body;
+    public Module(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._IAttribute> attributes, bool requiresExterns, Std.Wrappers._IOption<Dafny.ISequence<DAST._IModuleItem>> body) {
+      this._name = name;
+      this._docString = docString;
+      this._attributes = attributes;
+      this._requiresExterns = requiresExterns;
+      this._body = body;
+    }
+    public _IModule DowncastClone() {
+      if (this is _IModule dt) { return dt; }
+      return new Module(_name, _docString, _attributes, _requiresExterns, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Module;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._docString, oth._docString) && object.Equals(this._attributes, oth._attributes) && this._requiresExterns == oth._requiresExterns && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._requiresExterns));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Module.Module";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._requiresExterns);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IModule theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._IAttribute>.Empty, false, Std.Wrappers.Option<Dafny.ISequence<DAST._IModuleItem>>.Default());
+    public static DAST._IModule Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IModule> _TYPE = new Dafny.TypeDescriptor<DAST._IModule>(DAST.Module.Default());
+    public static Dafny.TypeDescriptor<DAST._IModule> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IModule create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._IAttribute> attributes, bool requiresExterns, Std.Wrappers._IOption<Dafny.ISequence<DAST._IModuleItem>> body) {
+      return new Module(name, docString, attributes, requiresExterns, body);
+    }
+    public static _IModule create_Module(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._IAttribute> attributes, bool requiresExterns, Std.Wrappers._IOption<Dafny.ISequence<DAST._IModuleItem>> body) {
+      return create(name, docString, attributes, requiresExterns, body);
+    }
+    public bool is_Module { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<DAST._IAttribute> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public bool dtor_requiresExterns {
+      get {
+        return this._requiresExterns;
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<DAST._IModuleItem>> dtor_body {
+      get {
+        return this._body;
+      }
+    }
+  }
+
+  public interface _IModuleItem {
+    bool is_Module { get; }
+    bool is_Class { get; }
+    bool is_Trait { get; }
+    bool is_Newtype { get; }
+    bool is_SynonymType { get; }
+    bool is_Datatype { get; }
+    DAST._IModule dtor_Module_a0 { get; }
+    DAST._IClass dtor_Class_a0 { get; }
+    DAST._ITrait dtor_Trait_a0 { get; }
+    DAST._INewtype dtor_Newtype_a0 { get; }
+    DAST._ISynonymType dtor_SynonymType_a0 { get; }
+    DAST._IDatatype dtor_Datatype_a0 { get; }
+    _IModuleItem DowncastClone();
+    Dafny.ISequence<Dafny.Rune> name();
+    Dafny.ISequence<DAST._IAttribute> attributes();
+  }
+  public abstract class ModuleItem : _IModuleItem {
+    public ModuleItem() {
+    }
+    private static readonly DAST._IModuleItem theDefault = create_Module(DAST.Module.Default());
+    public static DAST._IModuleItem Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IModuleItem> _TYPE = new Dafny.TypeDescriptor<DAST._IModuleItem>(DAST.ModuleItem.Default());
+    public static Dafny.TypeDescriptor<DAST._IModuleItem> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IModuleItem create_Module(DAST._IModule _a0) {
+      return new ModuleItem_Module(_a0);
+    }
+    public static _IModuleItem create_Class(DAST._IClass _a0) {
+      return new ModuleItem_Class(_a0);
+    }
+    public static _IModuleItem create_Trait(DAST._ITrait _a0) {
+      return new ModuleItem_Trait(_a0);
+    }
+    public static _IModuleItem create_Newtype(DAST._INewtype _a0) {
+      return new ModuleItem_Newtype(_a0);
+    }
+    public static _IModuleItem create_SynonymType(DAST._ISynonymType _a0) {
+      return new ModuleItem_SynonymType(_a0);
+    }
+    public static _IModuleItem create_Datatype(DAST._IDatatype _a0) {
+      return new ModuleItem_Datatype(_a0);
+    }
+    public bool is_Module { get { return this is ModuleItem_Module; } }
+    public bool is_Class { get { return this is ModuleItem_Class; } }
+    public bool is_Trait { get { return this is ModuleItem_Trait; } }
+    public bool is_Newtype { get { return this is ModuleItem_Newtype; } }
+    public bool is_SynonymType { get { return this is ModuleItem_SynonymType; } }
+    public bool is_Datatype { get { return this is ModuleItem_Datatype; } }
+    public DAST._IModule dtor_Module_a0 {
+      get {
+        var d = this;
+        return ((ModuleItem_Module)d)._a0;
+      }
+    }
+    public DAST._IClass dtor_Class_a0 {
+      get {
+        var d = this;
+        return ((ModuleItem_Class)d)._a0;
+      }
+    }
+    public DAST._ITrait dtor_Trait_a0 {
+      get {
+        var d = this;
+        return ((ModuleItem_Trait)d)._a0;
+      }
+    }
+    public DAST._INewtype dtor_Newtype_a0 {
+      get {
+        var d = this;
+        return ((ModuleItem_Newtype)d)._a0;
+      }
+    }
+    public DAST._ISynonymType dtor_SynonymType_a0 {
+      get {
+        var d = this;
+        return ((ModuleItem_SynonymType)d)._a0;
+      }
+    }
+    public DAST._IDatatype dtor_Datatype_a0 {
+      get {
+        var d = this;
+        return ((ModuleItem_Datatype)d)._a0;
+      }
+    }
+    public abstract _IModuleItem DowncastClone();
+    public Dafny.ISequence<Dafny.Rune> name() {
+      DAST._IModuleItem _source0 = this;
+      {
+        if (_source0.is_Module) {
+          DAST._IModule _0_m = _source0.dtor_Module_a0;
+          return (_0_m).dtor_name;
+        }
+      }
+      {
+        if (_source0.is_Class) {
+          DAST._IClass _1_m = _source0.dtor_Class_a0;
+          return (_1_m).dtor_name;
+        }
+      }
+      {
+        if (_source0.is_Trait) {
+          DAST._ITrait _2_m = _source0.dtor_Trait_a0;
+          return (_2_m).dtor_name;
+        }
+      }
+      {
+        if (_source0.is_Newtype) {
+          DAST._INewtype _3_m = _source0.dtor_Newtype_a0;
+          return (_3_m).dtor_name;
+        }
+      }
+      {
+        if (_source0.is_SynonymType) {
+          DAST._ISynonymType _4_m = _source0.dtor_SynonymType_a0;
+          return (_4_m).dtor_name;
+        }
+      }
+      {
+        DAST._IDatatype _5_m = _source0.dtor_Datatype_a0;
+        return (_5_m).dtor_name;
+      }
+    }
+    public Dafny.ISequence<DAST._IAttribute> attributes() {
+      DAST._IModuleItem _source0 = this;
+      {
+        if (_source0.is_Module) {
+          DAST._IModule _0_m = _source0.dtor_Module_a0;
+          return (_0_m).dtor_attributes;
+        }
+      }
+      {
+        if (_source0.is_Class) {
+          DAST._IClass _1_m = _source0.dtor_Class_a0;
+          return (_1_m).dtor_attributes;
+        }
+      }
+      {
+        if (_source0.is_Trait) {
+          DAST._ITrait _2_m = _source0.dtor_Trait_a0;
+          return (_2_m).dtor_attributes;
+        }
+      }
+      {
+        if (_source0.is_Newtype) {
+          DAST._INewtype _3_m = _source0.dtor_Newtype_a0;
+          return (_3_m).dtor_attributes;
+        }
+      }
+      {
+        if (_source0.is_SynonymType) {
+          DAST._ISynonymType _4_m = _source0.dtor_SynonymType_a0;
+          return (_4_m).dtor_attributes;
+        }
+      }
+      {
+        DAST._IDatatype _5_m = _source0.dtor_Datatype_a0;
+        return (_5_m).dtor_attributes;
+      }
+    }
+  }
+  public class ModuleItem_Module : ModuleItem {
+    public readonly DAST._IModule _a0;
+    public ModuleItem_Module(DAST._IModule _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IModuleItem DowncastClone() {
+      if (this is _IModuleItem dt) { return dt; }
+      return new ModuleItem_Module(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ModuleItem_Module;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ModuleItem.Module";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModuleItem_Class : ModuleItem {
+    public readonly DAST._IClass _a0;
+    public ModuleItem_Class(DAST._IClass _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IModuleItem DowncastClone() {
+      if (this is _IModuleItem dt) { return dt; }
+      return new ModuleItem_Class(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ModuleItem_Class;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ModuleItem.Class";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModuleItem_Trait : ModuleItem {
+    public readonly DAST._ITrait _a0;
+    public ModuleItem_Trait(DAST._ITrait _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IModuleItem DowncastClone() {
+      if (this is _IModuleItem dt) { return dt; }
+      return new ModuleItem_Trait(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ModuleItem_Trait;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ModuleItem.Trait";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModuleItem_Newtype : ModuleItem {
+    public readonly DAST._INewtype _a0;
+    public ModuleItem_Newtype(DAST._INewtype _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IModuleItem DowncastClone() {
+      if (this is _IModuleItem dt) { return dt; }
+      return new ModuleItem_Newtype(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ModuleItem_Newtype;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ModuleItem.Newtype";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModuleItem_SynonymType : ModuleItem {
+    public readonly DAST._ISynonymType _a0;
+    public ModuleItem_SynonymType(DAST._ISynonymType _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IModuleItem DowncastClone() {
+      if (this is _IModuleItem dt) { return dt; }
+      return new ModuleItem_SynonymType(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ModuleItem_SynonymType;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ModuleItem.SynonymType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModuleItem_Datatype : ModuleItem {
+    public readonly DAST._IDatatype _a0;
+    public ModuleItem_Datatype(DAST._IDatatype _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IModuleItem DowncastClone() {
+      if (this is _IModuleItem dt) { return dt; }
+      return new ModuleItem_Datatype(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ModuleItem_Datatype;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ModuleItem.Datatype";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IType {
+    bool is_UserDefined { get; }
+    bool is_Tuple { get; }
+    bool is_Array { get; }
+    bool is_Seq { get; }
+    bool is_Set { get; }
+    bool is_Multiset { get; }
+    bool is_Map { get; }
+    bool is_SetBuilder { get; }
+    bool is_MapBuilder { get; }
+    bool is_Arrow { get; }
+    bool is_Primitive { get; }
+    bool is_Passthrough { get; }
+    bool is_TypeArg { get; }
+    bool is_Object { get; }
+    DAST._IResolvedType dtor_resolved { get; }
+    Dafny.ISequence<DAST._IType> dtor_Tuple_a0 { get; }
+    DAST._IType dtor_element { get; }
+    BigInteger dtor_dims { get; }
+    DAST._IType dtor_key { get; }
+    DAST._IType dtor_value { get; }
+    Dafny.ISequence<DAST._IType> dtor_args { get; }
+    DAST._IType dtor_result { get; }
+    DAST._IPrimitive dtor_Primitive_a0 { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_Passthrough_a0 { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_TypeArg_a0 { get; }
+    _IType DowncastClone();
+    DAST._IType Replace(Dafny.IMap<DAST._IType,DAST._IType> mapping);
+    bool IsPrimitiveInt();
+    bool IsGeneralTrait();
+  }
+  public abstract class Type : _IType {
+    public Type() {
+    }
+    private static readonly DAST._IType theDefault = create_UserDefined(DAST.ResolvedType.Default());
+    public static DAST._IType Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IType> _TYPE = new Dafny.TypeDescriptor<DAST._IType>(DAST.Type.Default());
+    public static Dafny.TypeDescriptor<DAST._IType> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IType create_UserDefined(DAST._IResolvedType resolved) {
+      return new Type_UserDefined(resolved);
+    }
+    public static _IType create_Tuple(Dafny.ISequence<DAST._IType> _a0) {
+      return new Type_Tuple(_a0);
+    }
+    public static _IType create_Array(DAST._IType element, BigInteger dims) {
+      return new Type_Array(element, dims);
+    }
+    public static _IType create_Seq(DAST._IType element) {
+      return new Type_Seq(element);
+    }
+    public static _IType create_Set(DAST._IType element) {
+      return new Type_Set(element);
+    }
+    public static _IType create_Multiset(DAST._IType element) {
+      return new Type_Multiset(element);
+    }
+    public static _IType create_Map(DAST._IType key, DAST._IType @value) {
+      return new Type_Map(key, @value);
+    }
+    public static _IType create_SetBuilder(DAST._IType element) {
+      return new Type_SetBuilder(element);
+    }
+    public static _IType create_MapBuilder(DAST._IType key, DAST._IType @value) {
+      return new Type_MapBuilder(key, @value);
+    }
+    public static _IType create_Arrow(Dafny.ISequence<DAST._IType> args, DAST._IType result) {
+      return new Type_Arrow(args, result);
+    }
+    public static _IType create_Primitive(DAST._IPrimitive _a0) {
+      return new Type_Primitive(_a0);
+    }
+    public static _IType create_Passthrough(Dafny.ISequence<Dafny.Rune> _a0) {
+      return new Type_Passthrough(_a0);
+    }
+    public static _IType create_TypeArg(Dafny.ISequence<Dafny.Rune> _a0) {
+      return new Type_TypeArg(_a0);
+    }
+    public static _IType create_Object() {
+      return new Type_Object();
+    }
+    public bool is_UserDefined { get { return this is Type_UserDefined; } }
+    public bool is_Tuple { get { return this is Type_Tuple; } }
+    public bool is_Array { get { return this is Type_Array; } }
+    public bool is_Seq { get { return this is Type_Seq; } }
+    public bool is_Set { get { return this is Type_Set; } }
+    public bool is_Multiset { get { return this is Type_Multiset; } }
+    public bool is_Map { get { return this is Type_Map; } }
+    public bool is_SetBuilder { get { return this is Type_SetBuilder; } }
+    public bool is_MapBuilder { get { return this is Type_MapBuilder; } }
+    public bool is_Arrow { get { return this is Type_Arrow; } }
+    public bool is_Primitive { get { return this is Type_Primitive; } }
+    public bool is_Passthrough { get { return this is Type_Passthrough; } }
+    public bool is_TypeArg { get { return this is Type_TypeArg; } }
+    public bool is_Object { get { return this is Type_Object; } }
+    public DAST._IResolvedType dtor_resolved {
+      get {
+        var d = this;
+        return ((Type_UserDefined)d)._resolved;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_Tuple_a0 {
+      get {
+        var d = this;
+        return ((Type_Tuple)d)._a0;
+      }
+    }
+    public DAST._IType dtor_element {
+      get {
+        var d = this;
+        if (d is Type_Array) { return ((Type_Array)d)._element; }
+        if (d is Type_Seq) { return ((Type_Seq)d)._element; }
+        if (d is Type_Set) { return ((Type_Set)d)._element; }
+        if (d is Type_Multiset) { return ((Type_Multiset)d)._element; }
+        return ((Type_SetBuilder)d)._element;
+      }
+    }
+    public BigInteger dtor_dims {
+      get {
+        var d = this;
+        return ((Type_Array)d)._dims;
+      }
+    }
+    public DAST._IType dtor_key {
+      get {
+        var d = this;
+        if (d is Type_Map) { return ((Type_Map)d)._key; }
+        return ((Type_MapBuilder)d)._key;
+      }
+    }
+    public DAST._IType dtor_value {
+      get {
+        var d = this;
+        if (d is Type_Map) { return ((Type_Map)d)._value; }
+        return ((Type_MapBuilder)d)._value;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_args {
+      get {
+        var d = this;
+        return ((Type_Arrow)d)._args;
+      }
+    }
+    public DAST._IType dtor_result {
+      get {
+        var d = this;
+        return ((Type_Arrow)d)._result;
+      }
+    }
+    public DAST._IPrimitive dtor_Primitive_a0 {
+      get {
+        var d = this;
+        return ((Type_Primitive)d)._a0;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_Passthrough_a0 {
+      get {
+        var d = this;
+        return ((Type_Passthrough)d)._a0;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_TypeArg_a0 {
+      get {
+        var d = this;
+        return ((Type_TypeArg)d)._a0;
+      }
+    }
+    public abstract _IType DowncastClone();
+    public DAST._IType Replace(Dafny.IMap<DAST._IType,DAST._IType> mapping) {
+      if ((mapping).Contains(this)) {
+        return Dafny.Map<DAST._IType, DAST._IType>.Select(mapping,this);
+      } else {
+        DAST._IType _source0 = this;
+        {
+          if (_source0.is_UserDefined) {
+            DAST._IResolvedType _0_resolved = _source0.dtor_resolved;
+            return DAST.Type.create_UserDefined((_0_resolved).Replace(mapping));
+          }
+        }
+        {
+          if (_source0.is_Tuple) {
+            Dafny.ISequence<DAST._IType> _1_arguments = _source0.dtor_Tuple_a0;
+            return DAST.Type.create_Tuple(Std.Collections.Seq.__default.Map<DAST._IType, DAST._IType>(Dafny.Helpers.Id<Func<Dafny.IMap<DAST._IType,DAST._IType>, Dafny.ISequence<DAST._IType>, Func<DAST._IType, DAST._IType>>>((_2_mapping, _3_arguments) => ((System.Func<DAST._IType, DAST._IType>)((_4_t) => {
+  return (_4_t).Replace(_2_mapping);
+})))(mapping, _1_arguments), _1_arguments));
+          }
+        }
+        {
+          if (_source0.is_Array) {
+            DAST._IType _5_element = _source0.dtor_element;
+            BigInteger _6_dims = _source0.dtor_dims;
+            return DAST.Type.create_Array((_5_element).Replace(mapping), _6_dims);
+          }
+        }
+        {
+          if (_source0.is_Seq) {
+            DAST._IType _7_element = _source0.dtor_element;
+            return DAST.Type.create_Seq((_7_element).Replace(mapping));
+          }
+        }
+        {
+          if (_source0.is_Set) {
+            DAST._IType _8_element = _source0.dtor_element;
+            return DAST.Type.create_Set((_8_element).Replace(mapping));
+          }
+        }
+        {
+          if (_source0.is_Multiset) {
+            DAST._IType _9_element = _source0.dtor_element;
+            return DAST.Type.create_Multiset((_9_element).Replace(mapping));
+          }
+        }
+        {
+          if (_source0.is_Map) {
+            DAST._IType _10_key = _source0.dtor_key;
+            DAST._IType _11_value = _source0.dtor_value;
+            return DAST.Type.create_Map((_10_key).Replace(mapping), (_11_value).Replace(mapping));
+          }
+        }
+        {
+          if (_source0.is_SetBuilder) {
+            DAST._IType _12_element = _source0.dtor_element;
+            return DAST.Type.create_SetBuilder((_12_element).Replace(mapping));
+          }
+        }
+        {
+          if (_source0.is_MapBuilder) {
+            DAST._IType _13_key = _source0.dtor_key;
+            DAST._IType _14_value = _source0.dtor_value;
+            return DAST.Type.create_MapBuilder((_13_key).Replace(mapping), (_14_value).Replace(mapping));
+          }
+        }
+        {
+          if (_source0.is_Arrow) {
+            Dafny.ISequence<DAST._IType> _15_args = _source0.dtor_args;
+            DAST._IType _16_result = _source0.dtor_result;
+            return DAST.Type.create_Arrow(Std.Collections.Seq.__default.Map<DAST._IType, DAST._IType>(Dafny.Helpers.Id<Func<Dafny.IMap<DAST._IType,DAST._IType>, Dafny.ISequence<DAST._IType>, Func<DAST._IType, DAST._IType>>>((_17_mapping, _18_args) => ((System.Func<DAST._IType, DAST._IType>)((_19_t) => {
+  return (_19_t).Replace(_17_mapping);
+})))(mapping, _15_args), _15_args), (_16_result).Replace(mapping));
+          }
+        }
+        {
+          return this;
+        }
+      }
+    }
+    public bool IsPrimitiveInt() {
+      _IType _this = this;
+    TAIL_CALL_START: ;
+      DAST._IType _source0 = _this;
+      {
+        if (_source0.is_Primitive) {
+          DAST._IPrimitive _h70 = _source0.dtor_Primitive_a0;
+          if (_h70.is_Int) {
+            return true;
+          }
+        }
+      }
+      {
+        if (_source0.is_UserDefined) {
+          DAST._IResolvedType resolved0 = _source0.dtor_resolved;
+          DAST._IResolvedTypeBase kind0 = resolved0.dtor_kind;
+          if (kind0.is_SynonymType) {
+            DAST._IType _0_typ = kind0.dtor_baseType;
+            DAST._IType _in0 = _0_typ;
+            _this = _in0;
+            ;
+            goto TAIL_CALL_START;
+          }
+        }
+      }
+      {
+        return false;
+      }
+    }
+    public bool IsGeneralTrait() {
+      _IType _this = this;
+    TAIL_CALL_START: ;
+      DAST._IType _source0 = _this;
+      {
+        if (_source0.is_UserDefined) {
+          DAST._IResolvedType resolved0 = _source0.dtor_resolved;
+          DAST._IResolvedTypeBase _0_typeKind = resolved0.dtor_kind;
+          DAST._IResolvedTypeBase _source1 = _0_typeKind;
+          {
+            if (_source1.is_SynonymType) {
+              DAST._IType _1_typ = _source1.dtor_baseType;
+              DAST._IType _in0 = _1_typ;
+              _this = _in0;
+              ;
+              goto TAIL_CALL_START;
+            }
+          }
+          {
+            if (_source1.is_Trait) {
+              DAST._ITraitType traitType0 = _source1.dtor_traitType;
+              if (traitType0.is_GeneralTrait) {
+                return true;
+              }
+            }
+          }
+          {
+            return false;
+          }
+        }
+      }
+      {
+        return false;
+      }
+    }
+  }
+  public class Type_UserDefined : Type {
+    public readonly DAST._IResolvedType _resolved;
+    public Type_UserDefined(DAST._IResolvedType resolved) : base() {
+      this._resolved = resolved;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_UserDefined(_resolved);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_UserDefined;
+      return oth != null && object.Equals(this._resolved, oth._resolved);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._resolved));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.UserDefined";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._resolved);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Tuple : Type {
+    public readonly Dafny.ISequence<DAST._IType> _a0;
+    public Type_Tuple(Dafny.ISequence<DAST._IType> _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Tuple(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_Tuple;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.Tuple";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Array : Type {
+    public readonly DAST._IType _element;
+    public readonly BigInteger _dims;
+    public Type_Array(DAST._IType element, BigInteger dims) : base() {
+      this._element = element;
+      this._dims = dims;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Array(_element, _dims);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_Array;
+      return oth != null && object.Equals(this._element, oth._element) && this._dims == oth._dims;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._element));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._dims));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.Array";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._element);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._dims);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Seq : Type {
+    public readonly DAST._IType _element;
+    public Type_Seq(DAST._IType element) : base() {
+      this._element = element;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Seq(_element);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_Seq;
+      return oth != null && object.Equals(this._element, oth._element);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._element));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.Seq";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._element);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Set : Type {
+    public readonly DAST._IType _element;
+    public Type_Set(DAST._IType element) : base() {
+      this._element = element;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Set(_element);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_Set;
+      return oth != null && object.Equals(this._element, oth._element);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._element));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.Set";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._element);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Multiset : Type {
+    public readonly DAST._IType _element;
+    public Type_Multiset(DAST._IType element) : base() {
+      this._element = element;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Multiset(_element);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_Multiset;
+      return oth != null && object.Equals(this._element, oth._element);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._element));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.Multiset";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._element);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Map : Type {
+    public readonly DAST._IType _key;
+    public readonly DAST._IType _value;
+    public Type_Map(DAST._IType key, DAST._IType @value) : base() {
+      this._key = key;
+      this._value = @value;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Map(_key, _value);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_Map;
+      return oth != null && object.Equals(this._key, oth._key) && object.Equals(this._value, oth._value);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 6;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._key));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.Map";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._key);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_SetBuilder : Type {
+    public readonly DAST._IType _element;
+    public Type_SetBuilder(DAST._IType element) : base() {
+      this._element = element;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_SetBuilder(_element);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_SetBuilder;
+      return oth != null && object.Equals(this._element, oth._element);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 7;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._element));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.SetBuilder";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._element);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_MapBuilder : Type {
+    public readonly DAST._IType _key;
+    public readonly DAST._IType _value;
+    public Type_MapBuilder(DAST._IType key, DAST._IType @value) : base() {
+      this._key = key;
+      this._value = @value;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_MapBuilder(_key, _value);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_MapBuilder;
+      return oth != null && object.Equals(this._key, oth._key) && object.Equals(this._value, oth._value);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 8;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._key));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.MapBuilder";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._key);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Arrow : Type {
+    public readonly Dafny.ISequence<DAST._IType> _args;
+    public readonly DAST._IType _result;
+    public Type_Arrow(Dafny.ISequence<DAST._IType> args, DAST._IType result) : base() {
+      this._args = args;
+      this._result = result;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Arrow(_args, _result);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_Arrow;
+      return oth != null && object.Equals(this._args, oth._args) && object.Equals(this._result, oth._result);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 9;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._result));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.Arrow";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._args);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._result);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Primitive : Type {
+    public readonly DAST._IPrimitive _a0;
+    public Type_Primitive(DAST._IPrimitive _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Primitive(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_Primitive;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 10;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.Primitive";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Passthrough : Type {
+    public readonly Dafny.ISequence<Dafny.Rune> _a0;
+    public Type_Passthrough(Dafny.ISequence<Dafny.Rune> _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Passthrough(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_Passthrough;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 11;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.Passthrough";
+      s += "(";
+      s += this._a0.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_TypeArg : Type {
+    public readonly Dafny.ISequence<Dafny.Rune> _a0;
+    public Type_TypeArg(Dafny.ISequence<Dafny.Rune> _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_TypeArg(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_TypeArg;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 12;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.TypeArg";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Object : Type {
+    public Type_Object() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Object();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Type_Object;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 13;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Type.Object";
+      return s;
+    }
+  }
+
+  public interface _IVariance {
+    bool is_Nonvariant { get; }
+    bool is_Covariant { get; }
+    bool is_Contravariant { get; }
+    _IVariance DowncastClone();
+  }
+  public abstract class Variance : _IVariance {
+    public Variance() {
+    }
+    private static readonly DAST._IVariance theDefault = create_Nonvariant();
+    public static DAST._IVariance Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IVariance> _TYPE = new Dafny.TypeDescriptor<DAST._IVariance>(DAST.Variance.Default());
+    public static Dafny.TypeDescriptor<DAST._IVariance> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IVariance create_Nonvariant() {
+      return new Variance_Nonvariant();
+    }
+    public static _IVariance create_Covariant() {
+      return new Variance_Covariant();
+    }
+    public static _IVariance create_Contravariant() {
+      return new Variance_Contravariant();
+    }
+    public bool is_Nonvariant { get { return this is Variance_Nonvariant; } }
+    public bool is_Covariant { get { return this is Variance_Covariant; } }
+    public bool is_Contravariant { get { return this is Variance_Contravariant; } }
+    public static System.Collections.Generic.IEnumerable<_IVariance> AllSingletonConstructors {
+      get {
+        yield return Variance.create_Nonvariant();
+        yield return Variance.create_Covariant();
+        yield return Variance.create_Contravariant();
+      }
+    }
+    public abstract _IVariance DowncastClone();
+  }
+  public class Variance_Nonvariant : Variance {
+    public Variance_Nonvariant() : base() {
+    }
+    public override _IVariance DowncastClone() {
+      if (this is _IVariance dt) { return dt; }
+      return new Variance_Nonvariant();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Variance_Nonvariant;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Variance.Nonvariant";
+      return s;
+    }
+  }
+  public class Variance_Covariant : Variance {
+    public Variance_Covariant() : base() {
+    }
+    public override _IVariance DowncastClone() {
+      if (this is _IVariance dt) { return dt; }
+      return new Variance_Covariant();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Variance_Covariant;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Variance.Covariant";
+      return s;
+    }
+  }
+  public class Variance_Contravariant : Variance {
+    public Variance_Contravariant() : base() {
+    }
+    public override _IVariance DowncastClone() {
+      if (this is _IVariance dt) { return dt; }
+      return new Variance_Contravariant();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Variance_Contravariant;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Variance.Contravariant";
+      return s;
+    }
+  }
+
+  public interface _ITypeArgDecl {
+    bool is_TypeArgDecl { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<DAST._ITypeArgBound> dtor_bounds { get; }
+    DAST._IVariance dtor_variance { get; }
+    _ITypeArgDecl DowncastClone();
+  }
+  public class TypeArgDecl : _ITypeArgDecl {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<DAST._ITypeArgBound> _bounds;
+    public readonly DAST._IVariance _variance;
+    public TypeArgDecl(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._ITypeArgBound> bounds, DAST._IVariance variance) {
+      this._name = name;
+      this._bounds = bounds;
+      this._variance = variance;
+    }
+    public _ITypeArgDecl DowncastClone() {
+      if (this is _ITypeArgDecl dt) { return dt; }
+      return new TypeArgDecl(_name, _bounds, _variance);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.TypeArgDecl;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._bounds, oth._bounds) && object.Equals(this._variance, oth._variance);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._bounds));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._variance));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.TypeArgDecl.TypeArgDecl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._bounds);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._variance);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._ITypeArgDecl theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._ITypeArgBound>.Empty, DAST.Variance.Default());
+    public static DAST._ITypeArgDecl Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._ITypeArgDecl> _TYPE = new Dafny.TypeDescriptor<DAST._ITypeArgDecl>(DAST.TypeArgDecl.Default());
+    public static Dafny.TypeDescriptor<DAST._ITypeArgDecl> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ITypeArgDecl create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._ITypeArgBound> bounds, DAST._IVariance variance) {
+      return new TypeArgDecl(name, bounds, variance);
+    }
+    public static _ITypeArgDecl create_TypeArgDecl(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._ITypeArgBound> bounds, DAST._IVariance variance) {
+      return create(name, bounds, variance);
+    }
+    public bool is_TypeArgDecl { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<DAST._ITypeArgBound> dtor_bounds {
+      get {
+        return this._bounds;
+      }
+    }
+    public DAST._IVariance dtor_variance {
+      get {
+        return this._variance;
+      }
+    }
+  }
+
+  public interface _ITypeArgBound {
+    bool is_SupportsEquality { get; }
+    bool is_SupportsDefault { get; }
+    _ITypeArgBound DowncastClone();
+  }
+  public abstract class TypeArgBound : _ITypeArgBound {
+    public TypeArgBound() {
+    }
+    private static readonly DAST._ITypeArgBound theDefault = create_SupportsEquality();
+    public static DAST._ITypeArgBound Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._ITypeArgBound> _TYPE = new Dafny.TypeDescriptor<DAST._ITypeArgBound>(DAST.TypeArgBound.Default());
+    public static Dafny.TypeDescriptor<DAST._ITypeArgBound> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ITypeArgBound create_SupportsEquality() {
+      return new TypeArgBound_SupportsEquality();
+    }
+    public static _ITypeArgBound create_SupportsDefault() {
+      return new TypeArgBound_SupportsDefault();
+    }
+    public bool is_SupportsEquality { get { return this is TypeArgBound_SupportsEquality; } }
+    public bool is_SupportsDefault { get { return this is TypeArgBound_SupportsDefault; } }
+    public static System.Collections.Generic.IEnumerable<_ITypeArgBound> AllSingletonConstructors {
+      get {
+        yield return TypeArgBound.create_SupportsEquality();
+        yield return TypeArgBound.create_SupportsDefault();
+      }
+    }
+    public abstract _ITypeArgBound DowncastClone();
+  }
+  public class TypeArgBound_SupportsEquality : TypeArgBound {
+    public TypeArgBound_SupportsEquality() : base() {
+    }
+    public override _ITypeArgBound DowncastClone() {
+      if (this is _ITypeArgBound dt) { return dt; }
+      return new TypeArgBound_SupportsEquality();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.TypeArgBound_SupportsEquality;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.TypeArgBound.SupportsEquality";
+      return s;
+    }
+  }
+  public class TypeArgBound_SupportsDefault : TypeArgBound {
+    public TypeArgBound_SupportsDefault() : base() {
+    }
+    public override _ITypeArgBound DowncastClone() {
+      if (this is _ITypeArgBound dt) { return dt; }
+      return new TypeArgBound_SupportsDefault();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.TypeArgBound_SupportsDefault;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.TypeArgBound.SupportsDefault";
+      return s;
+    }
+  }
+
+  public interface _IPrimitive {
+    bool is_Int { get; }
+    bool is_Real { get; }
+    bool is_String { get; }
+    bool is_Bool { get; }
+    bool is_Char { get; }
+    bool is_Native { get; }
+    _IPrimitive DowncastClone();
+  }
+  public abstract class Primitive : _IPrimitive {
+    public Primitive() {
+    }
+    private static readonly DAST._IPrimitive theDefault = create_Int();
+    public static DAST._IPrimitive Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IPrimitive> _TYPE = new Dafny.TypeDescriptor<DAST._IPrimitive>(DAST.Primitive.Default());
+    public static Dafny.TypeDescriptor<DAST._IPrimitive> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IPrimitive create_Int() {
+      return new Primitive_Int();
+    }
+    public static _IPrimitive create_Real() {
+      return new Primitive_Real();
+    }
+    public static _IPrimitive create_String() {
+      return new Primitive_String();
+    }
+    public static _IPrimitive create_Bool() {
+      return new Primitive_Bool();
+    }
+    public static _IPrimitive create_Char() {
+      return new Primitive_Char();
+    }
+    public static _IPrimitive create_Native() {
+      return new Primitive_Native();
+    }
+    public bool is_Int { get { return this is Primitive_Int; } }
+    public bool is_Real { get { return this is Primitive_Real; } }
+    public bool is_String { get { return this is Primitive_String; } }
+    public bool is_Bool { get { return this is Primitive_Bool; } }
+    public bool is_Char { get { return this is Primitive_Char; } }
+    public bool is_Native { get { return this is Primitive_Native; } }
+    public static System.Collections.Generic.IEnumerable<_IPrimitive> AllSingletonConstructors {
+      get {
+        yield return Primitive.create_Int();
+        yield return Primitive.create_Real();
+        yield return Primitive.create_String();
+        yield return Primitive.create_Bool();
+        yield return Primitive.create_Char();
+        yield return Primitive.create_Native();
+      }
+    }
+    public abstract _IPrimitive DowncastClone();
+  }
+  public class Primitive_Int : Primitive {
+    public Primitive_Int() : base() {
+    }
+    public override _IPrimitive DowncastClone() {
+      if (this is _IPrimitive dt) { return dt; }
+      return new Primitive_Int();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Primitive_Int;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Primitive.Int";
+      return s;
+    }
+  }
+  public class Primitive_Real : Primitive {
+    public Primitive_Real() : base() {
+    }
+    public override _IPrimitive DowncastClone() {
+      if (this is _IPrimitive dt) { return dt; }
+      return new Primitive_Real();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Primitive_Real;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Primitive.Real";
+      return s;
+    }
+  }
+  public class Primitive_String : Primitive {
+    public Primitive_String() : base() {
+    }
+    public override _IPrimitive DowncastClone() {
+      if (this is _IPrimitive dt) { return dt; }
+      return new Primitive_String();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Primitive_String;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Primitive.String";
+      return s;
+    }
+  }
+  public class Primitive_Bool : Primitive {
+    public Primitive_Bool() : base() {
+    }
+    public override _IPrimitive DowncastClone() {
+      if (this is _IPrimitive dt) { return dt; }
+      return new Primitive_Bool();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Primitive_Bool;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Primitive.Bool";
+      return s;
+    }
+  }
+  public class Primitive_Char : Primitive {
+    public Primitive_Char() : base() {
+    }
+    public override _IPrimitive DowncastClone() {
+      if (this is _IPrimitive dt) { return dt; }
+      return new Primitive_Char();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Primitive_Char;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Primitive.Char";
+      return s;
+    }
+  }
+  public class Primitive_Native : Primitive {
+    public Primitive_Native() : base() {
+    }
+    public override _IPrimitive DowncastClone() {
+      if (this is _IPrimitive dt) { return dt; }
+      return new Primitive_Native();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Primitive_Native;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Primitive.Native";
+      return s;
+    }
+  }
+
+  public interface _INewtypeRange {
+    bool is_U8 { get; }
+    bool is_I8 { get; }
+    bool is_U16 { get; }
+    bool is_I16 { get; }
+    bool is_U32 { get; }
+    bool is_I32 { get; }
+    bool is_U64 { get; }
+    bool is_I64 { get; }
+    bool is_U128 { get; }
+    bool is_I128 { get; }
+    bool is_NativeArrayIndex { get; }
+    bool is_BigInt { get; }
+    bool is_Bool { get; }
+    bool is_NoRange { get; }
+    bool dtor_overflow { get; }
+    _INewtypeRange DowncastClone();
+    bool CanOverflow();
+    bool HasArithmeticOperations();
+  }
+  public abstract class NewtypeRange : _INewtypeRange {
+    public NewtypeRange() {
+    }
+    private static readonly DAST._INewtypeRange theDefault = create_U8(false);
+    public static DAST._INewtypeRange Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._INewtypeRange> _TYPE = new Dafny.TypeDescriptor<DAST._INewtypeRange>(DAST.NewtypeRange.Default());
+    public static Dafny.TypeDescriptor<DAST._INewtypeRange> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _INewtypeRange create_U8(bool overflow) {
+      return new NewtypeRange_U8(overflow);
+    }
+    public static _INewtypeRange create_I8(bool overflow) {
+      return new NewtypeRange_I8(overflow);
+    }
+    public static _INewtypeRange create_U16(bool overflow) {
+      return new NewtypeRange_U16(overflow);
+    }
+    public static _INewtypeRange create_I16(bool overflow) {
+      return new NewtypeRange_I16(overflow);
+    }
+    public static _INewtypeRange create_U32(bool overflow) {
+      return new NewtypeRange_U32(overflow);
+    }
+    public static _INewtypeRange create_I32(bool overflow) {
+      return new NewtypeRange_I32(overflow);
+    }
+    public static _INewtypeRange create_U64(bool overflow) {
+      return new NewtypeRange_U64(overflow);
+    }
+    public static _INewtypeRange create_I64(bool overflow) {
+      return new NewtypeRange_I64(overflow);
+    }
+    public static _INewtypeRange create_U128(bool overflow) {
+      return new NewtypeRange_U128(overflow);
+    }
+    public static _INewtypeRange create_I128(bool overflow) {
+      return new NewtypeRange_I128(overflow);
+    }
+    public static _INewtypeRange create_NativeArrayIndex() {
+      return new NewtypeRange_NativeArrayIndex();
+    }
+    public static _INewtypeRange create_BigInt() {
+      return new NewtypeRange_BigInt();
+    }
+    public static _INewtypeRange create_Bool() {
+      return new NewtypeRange_Bool();
+    }
+    public static _INewtypeRange create_NoRange() {
+      return new NewtypeRange_NoRange();
+    }
+    public bool is_U8 { get { return this is NewtypeRange_U8; } }
+    public bool is_I8 { get { return this is NewtypeRange_I8; } }
+    public bool is_U16 { get { return this is NewtypeRange_U16; } }
+    public bool is_I16 { get { return this is NewtypeRange_I16; } }
+    public bool is_U32 { get { return this is NewtypeRange_U32; } }
+    public bool is_I32 { get { return this is NewtypeRange_I32; } }
+    public bool is_U64 { get { return this is NewtypeRange_U64; } }
+    public bool is_I64 { get { return this is NewtypeRange_I64; } }
+    public bool is_U128 { get { return this is NewtypeRange_U128; } }
+    public bool is_I128 { get { return this is NewtypeRange_I128; } }
+    public bool is_NativeArrayIndex { get { return this is NewtypeRange_NativeArrayIndex; } }
+    public bool is_BigInt { get { return this is NewtypeRange_BigInt; } }
+    public bool is_Bool { get { return this is NewtypeRange_Bool; } }
+    public bool is_NoRange { get { return this is NewtypeRange_NoRange; } }
+    public bool dtor_overflow {
+      get {
+        var d = this;
+        if (d is NewtypeRange_U8) { return ((NewtypeRange_U8)d)._overflow; }
+        if (d is NewtypeRange_I8) { return ((NewtypeRange_I8)d)._overflow; }
+        if (d is NewtypeRange_U16) { return ((NewtypeRange_U16)d)._overflow; }
+        if (d is NewtypeRange_I16) { return ((NewtypeRange_I16)d)._overflow; }
+        if (d is NewtypeRange_U32) { return ((NewtypeRange_U32)d)._overflow; }
+        if (d is NewtypeRange_I32) { return ((NewtypeRange_I32)d)._overflow; }
+        if (d is NewtypeRange_U64) { return ((NewtypeRange_U64)d)._overflow; }
+        if (d is NewtypeRange_I64) { return ((NewtypeRange_I64)d)._overflow; }
+        if (d is NewtypeRange_U128) { return ((NewtypeRange_U128)d)._overflow; }
+        return ((NewtypeRange_I128)d)._overflow;
+      }
+    }
+    public abstract _INewtypeRange DowncastClone();
+    public bool CanOverflow() {
+      return (((((((((((this).is_U8) || ((this).is_I8)) || ((this).is_U16)) || ((this).is_I16)) || ((this).is_U32)) || ((this).is_I32)) || ((this).is_U64)) || ((this).is_I64)) || ((this).is_U128)) || ((this).is_I128)) && ((this).dtor_overflow);
+    }
+    public bool HasArithmeticOperations() {
+      return !((this).is_Bool);
+    }
+  }
+  public class NewtypeRange_U8 : NewtypeRange {
+    public readonly bool _overflow;
+    public NewtypeRange_U8(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_U8(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_U8;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.U8";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class NewtypeRange_I8 : NewtypeRange {
+    public readonly bool _overflow;
+    public NewtypeRange_I8(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_I8(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_I8;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.I8";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class NewtypeRange_U16 : NewtypeRange {
+    public readonly bool _overflow;
+    public NewtypeRange_U16(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_U16(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_U16;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.U16";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class NewtypeRange_I16 : NewtypeRange {
+    public readonly bool _overflow;
+    public NewtypeRange_I16(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_I16(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_I16;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.I16";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class NewtypeRange_U32 : NewtypeRange {
+    public readonly bool _overflow;
+    public NewtypeRange_U32(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_U32(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_U32;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.U32";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class NewtypeRange_I32 : NewtypeRange {
+    public readonly bool _overflow;
+    public NewtypeRange_I32(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_I32(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_I32;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.I32";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class NewtypeRange_U64 : NewtypeRange {
+    public readonly bool _overflow;
+    public NewtypeRange_U64(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_U64(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_U64;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 6;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.U64";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class NewtypeRange_I64 : NewtypeRange {
+    public readonly bool _overflow;
+    public NewtypeRange_I64(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_I64(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_I64;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 7;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.I64";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class NewtypeRange_U128 : NewtypeRange {
+    public readonly bool _overflow;
+    public NewtypeRange_U128(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_U128(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_U128;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 8;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.U128";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class NewtypeRange_I128 : NewtypeRange {
+    public readonly bool _overflow;
+    public NewtypeRange_I128(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_I128(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_I128;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 9;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.I128";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class NewtypeRange_NativeArrayIndex : NewtypeRange {
+    public NewtypeRange_NativeArrayIndex() : base() {
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_NativeArrayIndex();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_NativeArrayIndex;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 10;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.NativeArrayIndex";
+      return s;
+    }
+  }
+  public class NewtypeRange_BigInt : NewtypeRange {
+    public NewtypeRange_BigInt() : base() {
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_BigInt();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_BigInt;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 11;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.BigInt";
+      return s;
+    }
+  }
+  public class NewtypeRange_Bool : NewtypeRange {
+    public NewtypeRange_Bool() : base() {
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_Bool();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_Bool;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 12;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.Bool";
+      return s;
+    }
+  }
+  public class NewtypeRange_NoRange : NewtypeRange {
+    public NewtypeRange_NoRange() : base() {
+    }
+    public override _INewtypeRange DowncastClone() {
+      if (this is _INewtypeRange dt) { return dt; }
+      return new NewtypeRange_NoRange();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeRange_NoRange;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 13;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeRange.NoRange";
+      return s;
+    }
+  }
+
+  public interface _IAttribute {
+    bool is_Attribute { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_args { get; }
+    _IAttribute DowncastClone();
+  }
+  public class Attribute : _IAttribute {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _args;
+    public Attribute(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> args) {
+      this._name = name;
+      this._args = args;
+    }
+    public _IAttribute DowncastClone() {
+      if (this is _IAttribute dt) { return dt; }
+      return new Attribute(_name, _args);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Attribute;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._args, oth._args);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Attribute.Attribute";
+      s += "(";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._args);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IAttribute theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty);
+    public static DAST._IAttribute Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IAttribute> _TYPE = new Dafny.TypeDescriptor<DAST._IAttribute>(DAST.Attribute.Default());
+    public static Dafny.TypeDescriptor<DAST._IAttribute> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IAttribute create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> args) {
+      return new Attribute(name, args);
+    }
+    public static _IAttribute create_Attribute(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> args) {
+      return create(name, args);
+    }
+    public bool is_Attribute { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_args {
+      get {
+        return this._args;
+      }
+    }
+  }
+
+  public interface _INewtypeType {
+    bool is_NewtypeType { get; }
+    DAST._IType dtor_baseType { get; }
+    DAST._INewtypeRange dtor_range { get; }
+    bool dtor_erase { get; }
+    _INewtypeType DowncastClone();
+  }
+  public class NewtypeType : _INewtypeType {
+    public readonly DAST._IType _baseType;
+    public readonly DAST._INewtypeRange _range;
+    public readonly bool _erase;
+    public NewtypeType(DAST._IType baseType, DAST._INewtypeRange range, bool erase) {
+      this._baseType = baseType;
+      this._range = range;
+      this._erase = erase;
+    }
+    public _INewtypeType DowncastClone() {
+      if (this is _INewtypeType dt) { return dt; }
+      return new NewtypeType(_baseType, _range, _erase);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeType;
+      return oth != null && object.Equals(this._baseType, oth._baseType) && object.Equals(this._range, oth._range) && this._erase == oth._erase;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._baseType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._range));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._erase));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeType.NewtypeType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._baseType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._range);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._erase);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._INewtypeType theDefault = create(DAST.Type.Default(), DAST.NewtypeRange.Default(), false);
+    public static DAST._INewtypeType Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._INewtypeType> _TYPE = new Dafny.TypeDescriptor<DAST._INewtypeType>(DAST.NewtypeType.Default());
+    public static Dafny.TypeDescriptor<DAST._INewtypeType> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _INewtypeType create(DAST._IType baseType, DAST._INewtypeRange range, bool erase) {
+      return new NewtypeType(baseType, range, erase);
+    }
+    public static _INewtypeType create_NewtypeType(DAST._IType baseType, DAST._INewtypeRange range, bool erase) {
+      return create(baseType, range, erase);
+    }
+    public bool is_NewtypeType { get { return true; } }
+    public DAST._IType dtor_baseType {
+      get {
+        return this._baseType;
+      }
+    }
+    public DAST._INewtypeRange dtor_range {
+      get {
+        return this._range;
+      }
+    }
+    public bool dtor_erase {
+      get {
+        return this._erase;
+      }
+    }
+  }
+
+  public interface _ITraitType {
+    bool is_ObjectTrait { get; }
+    bool is_GeneralTrait { get; }
+    _ITraitType DowncastClone();
+  }
+  public abstract class TraitType : _ITraitType {
+    public TraitType() {
+    }
+    private static readonly DAST._ITraitType theDefault = create_ObjectTrait();
+    public static DAST._ITraitType Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._ITraitType> _TYPE = new Dafny.TypeDescriptor<DAST._ITraitType>(DAST.TraitType.Default());
+    public static Dafny.TypeDescriptor<DAST._ITraitType> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ITraitType create_ObjectTrait() {
+      return new TraitType_ObjectTrait();
+    }
+    public static _ITraitType create_GeneralTrait() {
+      return new TraitType_GeneralTrait();
+    }
+    public bool is_ObjectTrait { get { return this is TraitType_ObjectTrait; } }
+    public bool is_GeneralTrait { get { return this is TraitType_GeneralTrait; } }
+    public static System.Collections.Generic.IEnumerable<_ITraitType> AllSingletonConstructors {
+      get {
+        yield return TraitType.create_ObjectTrait();
+        yield return TraitType.create_GeneralTrait();
+      }
+    }
+    public abstract _ITraitType DowncastClone();
+  }
+  public class TraitType_ObjectTrait : TraitType {
+    public TraitType_ObjectTrait() : base() {
+    }
+    public override _ITraitType DowncastClone() {
+      if (this is _ITraitType dt) { return dt; }
+      return new TraitType_ObjectTrait();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.TraitType_ObjectTrait;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.TraitType.ObjectTrait";
+      return s;
+    }
+  }
+  public class TraitType_GeneralTrait : TraitType {
+    public TraitType_GeneralTrait() : base() {
+    }
+    public override _ITraitType DowncastClone() {
+      if (this is _ITraitType dt) { return dt; }
+      return new TraitType_GeneralTrait();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.TraitType_GeneralTrait;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.TraitType.GeneralTrait";
+      return s;
+    }
+  }
+
+  public interface _IResolvedTypeBase {
+    bool is_Class { get; }
+    bool is_Datatype { get; }
+    bool is_Trait { get; }
+    bool is_SynonymType { get; }
+    bool is_Newtype { get; }
+    Dafny.ISequence<DAST._IVariance> dtor_variances { get; }
+    DAST._ITraitType dtor_traitType { get; }
+    DAST._IType dtor_baseType { get; }
+    DAST._INewtypeRange dtor_range { get; }
+    bool dtor_erase { get; }
+    _IResolvedTypeBase DowncastClone();
+  }
+  public abstract class ResolvedTypeBase : _IResolvedTypeBase {
+    public ResolvedTypeBase() {
+    }
+    private static readonly DAST._IResolvedTypeBase theDefault = create_Class();
+    public static DAST._IResolvedTypeBase Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IResolvedTypeBase> _TYPE = new Dafny.TypeDescriptor<DAST._IResolvedTypeBase>(DAST.ResolvedTypeBase.Default());
+    public static Dafny.TypeDescriptor<DAST._IResolvedTypeBase> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IResolvedTypeBase create_Class() {
+      return new ResolvedTypeBase_Class();
+    }
+    public static _IResolvedTypeBase create_Datatype(Dafny.ISequence<DAST._IVariance> variances) {
+      return new ResolvedTypeBase_Datatype(variances);
+    }
+    public static _IResolvedTypeBase create_Trait(DAST._ITraitType traitType) {
+      return new ResolvedTypeBase_Trait(traitType);
+    }
+    public static _IResolvedTypeBase create_SynonymType(DAST._IType baseType) {
+      return new ResolvedTypeBase_SynonymType(baseType);
+    }
+    public static _IResolvedTypeBase create_Newtype(DAST._IType baseType, DAST._INewtypeRange range, bool erase) {
+      return new ResolvedTypeBase_Newtype(baseType, range, erase);
+    }
+    public bool is_Class { get { return this is ResolvedTypeBase_Class; } }
+    public bool is_Datatype { get { return this is ResolvedTypeBase_Datatype; } }
+    public bool is_Trait { get { return this is ResolvedTypeBase_Trait; } }
+    public bool is_SynonymType { get { return this is ResolvedTypeBase_SynonymType; } }
+    public bool is_Newtype { get { return this is ResolvedTypeBase_Newtype; } }
+    public Dafny.ISequence<DAST._IVariance> dtor_variances {
+      get {
+        var d = this;
+        return ((ResolvedTypeBase_Datatype)d)._variances;
+      }
+    }
+    public DAST._ITraitType dtor_traitType {
+      get {
+        var d = this;
+        return ((ResolvedTypeBase_Trait)d)._traitType;
+      }
+    }
+    public DAST._IType dtor_baseType {
+      get {
+        var d = this;
+        if (d is ResolvedTypeBase_SynonymType) { return ((ResolvedTypeBase_SynonymType)d)._baseType; }
+        return ((ResolvedTypeBase_Newtype)d)._baseType;
+      }
+    }
+    public DAST._INewtypeRange dtor_range {
+      get {
+        var d = this;
+        return ((ResolvedTypeBase_Newtype)d)._range;
+      }
+    }
+    public bool dtor_erase {
+      get {
+        var d = this;
+        return ((ResolvedTypeBase_Newtype)d)._erase;
+      }
+    }
+    public abstract _IResolvedTypeBase DowncastClone();
+  }
+  public class ResolvedTypeBase_Class : ResolvedTypeBase {
+    public ResolvedTypeBase_Class() : base() {
+    }
+    public override _IResolvedTypeBase DowncastClone() {
+      if (this is _IResolvedTypeBase dt) { return dt; }
+      return new ResolvedTypeBase_Class();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ResolvedTypeBase_Class;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ResolvedTypeBase.Class";
+      return s;
+    }
+  }
+  public class ResolvedTypeBase_Datatype : ResolvedTypeBase {
+    public readonly Dafny.ISequence<DAST._IVariance> _variances;
+    public ResolvedTypeBase_Datatype(Dafny.ISequence<DAST._IVariance> variances) : base() {
+      this._variances = variances;
+    }
+    public override _IResolvedTypeBase DowncastClone() {
+      if (this is _IResolvedTypeBase dt) { return dt; }
+      return new ResolvedTypeBase_Datatype(_variances);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ResolvedTypeBase_Datatype;
+      return oth != null && object.Equals(this._variances, oth._variances);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._variances));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ResolvedTypeBase.Datatype";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._variances);
+      s += ")";
+      return s;
+    }
+  }
+  public class ResolvedTypeBase_Trait : ResolvedTypeBase {
+    public readonly DAST._ITraitType _traitType;
+    public ResolvedTypeBase_Trait(DAST._ITraitType traitType) : base() {
+      this._traitType = traitType;
+    }
+    public override _IResolvedTypeBase DowncastClone() {
+      if (this is _IResolvedTypeBase dt) { return dt; }
+      return new ResolvedTypeBase_Trait(_traitType);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ResolvedTypeBase_Trait;
+      return oth != null && object.Equals(this._traitType, oth._traitType);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._traitType));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ResolvedTypeBase.Trait";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._traitType);
+      s += ")";
+      return s;
+    }
+  }
+  public class ResolvedTypeBase_SynonymType : ResolvedTypeBase {
+    public readonly DAST._IType _baseType;
+    public ResolvedTypeBase_SynonymType(DAST._IType baseType) : base() {
+      this._baseType = baseType;
+    }
+    public override _IResolvedTypeBase DowncastClone() {
+      if (this is _IResolvedTypeBase dt) { return dt; }
+      return new ResolvedTypeBase_SynonymType(_baseType);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ResolvedTypeBase_SynonymType;
+      return oth != null && object.Equals(this._baseType, oth._baseType);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._baseType));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ResolvedTypeBase.SynonymType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._baseType);
+      s += ")";
+      return s;
+    }
+  }
+  public class ResolvedTypeBase_Newtype : ResolvedTypeBase {
+    public readonly DAST._IType _baseType;
+    public readonly DAST._INewtypeRange _range;
+    public readonly bool _erase;
+    public ResolvedTypeBase_Newtype(DAST._IType baseType, DAST._INewtypeRange range, bool erase) : base() {
+      this._baseType = baseType;
+      this._range = range;
+      this._erase = erase;
+    }
+    public override _IResolvedTypeBase DowncastClone() {
+      if (this is _IResolvedTypeBase dt) { return dt; }
+      return new ResolvedTypeBase_Newtype(_baseType, _range, _erase);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ResolvedTypeBase_Newtype;
+      return oth != null && object.Equals(this._baseType, oth._baseType) && object.Equals(this._range, oth._range) && this._erase == oth._erase;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._baseType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._range));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._erase));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ResolvedTypeBase.Newtype";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._baseType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._range);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._erase);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IResolvedType {
+    bool is_ResolvedType { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_path { get; }
+    Dafny.ISequence<DAST._IType> dtor_typeArgs { get; }
+    DAST._IResolvedTypeBase dtor_kind { get; }
+    Dafny.ISequence<DAST._IAttribute> dtor_attributes { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_properMethods { get; }
+    Dafny.ISequence<DAST._IType> dtor_extendedTypes { get; }
+    _IResolvedType DowncastClone();
+    DAST._IResolvedType Replace(Dafny.IMap<DAST._IType,DAST._IType> mapping);
+  }
+  public class ResolvedType : _IResolvedType {
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _path;
+    public readonly Dafny.ISequence<DAST._IType> _typeArgs;
+    public readonly DAST._IResolvedTypeBase _kind;
+    public readonly Dafny.ISequence<DAST._IAttribute> _attributes;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _properMethods;
+    public readonly Dafny.ISequence<DAST._IType> _extendedTypes;
+    public ResolvedType(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path, Dafny.ISequence<DAST._IType> typeArgs, DAST._IResolvedTypeBase kind, Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> properMethods, Dafny.ISequence<DAST._IType> extendedTypes) {
+      this._path = path;
+      this._typeArgs = typeArgs;
+      this._kind = kind;
+      this._attributes = attributes;
+      this._properMethods = properMethods;
+      this._extendedTypes = extendedTypes;
+    }
+    public _IResolvedType DowncastClone() {
+      if (this is _IResolvedType dt) { return dt; }
+      return new ResolvedType(_path, _typeArgs, _kind, _attributes, _properMethods, _extendedTypes);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ResolvedType;
+      return oth != null && object.Equals(this._path, oth._path) && object.Equals(this._typeArgs, oth._typeArgs) && object.Equals(this._kind, oth._kind) && object.Equals(this._attributes, oth._attributes) && object.Equals(this._properMethods, oth._properMethods) && object.Equals(this._extendedTypes, oth._extendedTypes);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._path));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeArgs));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._kind));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._properMethods));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._extendedTypes));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ResolvedType.ResolvedType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._path);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeArgs);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._kind);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._properMethods);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._extendedTypes);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IResolvedType theDefault = create(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, Dafny.Sequence<DAST._IType>.Empty, DAST.ResolvedTypeBase.Default(), Dafny.Sequence<DAST._IAttribute>.Empty, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, Dafny.Sequence<DAST._IType>.Empty);
+    public static DAST._IResolvedType Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IResolvedType> _TYPE = new Dafny.TypeDescriptor<DAST._IResolvedType>(DAST.ResolvedType.Default());
+    public static Dafny.TypeDescriptor<DAST._IResolvedType> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IResolvedType create(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path, Dafny.ISequence<DAST._IType> typeArgs, DAST._IResolvedTypeBase kind, Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> properMethods, Dafny.ISequence<DAST._IType> extendedTypes) {
+      return new ResolvedType(path, typeArgs, kind, attributes, properMethods, extendedTypes);
+    }
+    public static _IResolvedType create_ResolvedType(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path, Dafny.ISequence<DAST._IType> typeArgs, DAST._IResolvedTypeBase kind, Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> properMethods, Dafny.ISequence<DAST._IType> extendedTypes) {
+      return create(path, typeArgs, kind, attributes, properMethods, extendedTypes);
+    }
+    public bool is_ResolvedType { get { return true; } }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_path {
+      get {
+        return this._path;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_typeArgs {
+      get {
+        return this._typeArgs;
+      }
+    }
+    public DAST._IResolvedTypeBase dtor_kind {
+      get {
+        return this._kind;
+      }
+    }
+    public Dafny.ISequence<DAST._IAttribute> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_properMethods {
+      get {
+        return this._properMethods;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_extendedTypes {
+      get {
+        return this._extendedTypes;
+      }
+    }
+    public DAST._IResolvedType Replace(Dafny.IMap<DAST._IType,DAST._IType> mapping) {
+      return DAST.ResolvedType.create((this).dtor_path, Std.Collections.Seq.__default.Map<DAST._IType, DAST._IType>(Dafny.Helpers.Id<Func<Dafny.IMap<DAST._IType,DAST._IType>, Func<DAST._IType, DAST._IType>>>((_0_mapping) => ((System.Func<DAST._IType, DAST._IType>)((_1_t) => {
+  return (_1_t).Replace(_0_mapping);
+})))(mapping), (this).dtor_typeArgs), ((System.Func<DAST._IResolvedTypeBase>)(() => {
+  DAST._IResolvedTypeBase _source0 = (this).dtor_kind;
+  {
+    if (_source0.is_Newtype) {
+      DAST._IType _2_baseType = _source0.dtor_baseType;
+      DAST._INewtypeRange _3_range = _source0.dtor_range;
+      bool _4_erase = _source0.dtor_erase;
+      return DAST.ResolvedTypeBase.create_Newtype((_2_baseType).Replace(mapping), _3_range, _4_erase);
+    }
+  }
+  {
+    return (this).dtor_kind;
+  }
+}))(), (this).dtor_attributes, (this).dtor_properMethods, Std.Collections.Seq.__default.Map<DAST._IType, DAST._IType>(Dafny.Helpers.Id<Func<Dafny.IMap<DAST._IType,DAST._IType>, Func<DAST._IType, DAST._IType>>>((_5_mapping) => ((System.Func<DAST._IType, DAST._IType>)((_6_t) => {
+  return (_6_t).Replace(_5_mapping);
+})))(mapping), (this).dtor_extendedTypes));
+    }
+  }
+
+  public interface _IIdent {
+    bool is_Ident { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_id { get; }
+  }
+  public class Ident : _IIdent {
+    public readonly Dafny.ISequence<Dafny.Rune> _id;
+    public Ident(Dafny.ISequence<Dafny.Rune> id) {
+      this._id = id;
+    }
+    public static Dafny.ISequence<Dafny.Rune> DowncastClone(Dafny.ISequence<Dafny.Rune> _this) {
+      return _this;
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Ident;
+      return oth != null && object.Equals(this._id, oth._id);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._id));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Ident.Ident";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._id);
+      s += ")";
+      return s;
+    }
+    private static readonly Dafny.ISequence<Dafny.Rune> theDefault = Dafny.Sequence<Dafny.Rune>.Empty;
+    public static Dafny.ISequence<Dafny.Rune> Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TYPE = new Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>>(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IIdent create(Dafny.ISequence<Dafny.Rune> id) {
+      return new Ident(id);
+    }
+    public static _IIdent create_Ident(Dafny.ISequence<Dafny.Rune> id) {
+      return create(id);
+    }
+    public bool is_Ident { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_id {
+      get {
+        return this._id;
+      }
+    }
+  }
+
+  public interface _IClass {
+    bool is_Class { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_enclosingModule { get; }
+    Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams { get; }
+    Dafny.ISequence<DAST._IType> dtor_superTraitTypes { get; }
+    Dafny.ISequence<DAST._IField> dtor_fields { get; }
+    Dafny.ISequence<DAST._IMethod> dtor_body { get; }
+    Dafny.ISequence<DAST._IAttribute> dtor_attributes { get; }
+    _IClass DowncastClone();
+  }
+  public class Class : _IClass {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.Rune> _enclosingModule;
+    public readonly Dafny.ISequence<DAST._ITypeArgDecl> _typeParams;
+    public readonly Dafny.ISequence<DAST._IType> _superTraitTypes;
+    public readonly Dafny.ISequence<DAST._IField> _fields;
+    public readonly Dafny.ISequence<DAST._IMethod> _body;
+    public readonly Dafny.ISequence<DAST._IAttribute> _attributes;
+    public Class(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.Rune> enclosingModule, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, Dafny.ISequence<DAST._IType> superTraitTypes, Dafny.ISequence<DAST._IField> fields, Dafny.ISequence<DAST._IMethod> body, Dafny.ISequence<DAST._IAttribute> attributes) {
+      this._name = name;
+      this._docString = docString;
+      this._enclosingModule = enclosingModule;
+      this._typeParams = typeParams;
+      this._superTraitTypes = superTraitTypes;
+      this._fields = fields;
+      this._body = body;
+      this._attributes = attributes;
+    }
+    public _IClass DowncastClone() {
+      if (this is _IClass dt) { return dt; }
+      return new Class(_name, _docString, _enclosingModule, _typeParams, _superTraitTypes, _fields, _body, _attributes);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Class;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._docString, oth._docString) && object.Equals(this._enclosingModule, oth._enclosingModule) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._superTraitTypes, oth._superTraitTypes) && object.Equals(this._fields, oth._fields) && object.Equals(this._body, oth._body) && object.Equals(this._attributes, oth._attributes);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._enclosingModule));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._superTraitTypes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fields));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Class.Class";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._enclosingModule);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._superTraitTypes);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._fields);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IClass theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._ITypeArgDecl>.Empty, Dafny.Sequence<DAST._IType>.Empty, Dafny.Sequence<DAST._IField>.Empty, Dafny.Sequence<DAST._IMethod>.Empty, Dafny.Sequence<DAST._IAttribute>.Empty);
+    public static DAST._IClass Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IClass> _TYPE = new Dafny.TypeDescriptor<DAST._IClass>(DAST.Class.Default());
+    public static Dafny.TypeDescriptor<DAST._IClass> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IClass create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.Rune> enclosingModule, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, Dafny.ISequence<DAST._IType> superTraitTypes, Dafny.ISequence<DAST._IField> fields, Dafny.ISequence<DAST._IMethod> body, Dafny.ISequence<DAST._IAttribute> attributes) {
+      return new Class(name, docString, enclosingModule, typeParams, superTraitTypes, fields, body, attributes);
+    }
+    public static _IClass create_Class(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.Rune> enclosingModule, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, Dafny.ISequence<DAST._IType> superTraitTypes, Dafny.ISequence<DAST._IField> fields, Dafny.ISequence<DAST._IMethod> body, Dafny.ISequence<DAST._IAttribute> attributes) {
+      return create(name, docString, enclosingModule, typeParams, superTraitTypes, fields, body, attributes);
+    }
+    public bool is_Class { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_enclosingModule {
+      get {
+        return this._enclosingModule;
+      }
+    }
+    public Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_superTraitTypes {
+      get {
+        return this._superTraitTypes;
+      }
+    }
+    public Dafny.ISequence<DAST._IField> dtor_fields {
+      get {
+        return this._fields;
+      }
+    }
+    public Dafny.ISequence<DAST._IMethod> dtor_body {
+      get {
+        return this._body;
+      }
+    }
+    public Dafny.ISequence<DAST._IAttribute> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+  }
+
+  public interface _ITrait {
+    bool is_Trait { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams { get; }
+    DAST._ITraitType dtor_traitType { get; }
+    Dafny.ISequence<DAST._IType> dtor_parents { get; }
+    Dafny.ISequence<DAST._IMethod> dtor_body { get; }
+    Dafny.ISequence<DAST._IAttribute> dtor_attributes { get; }
+    _ITrait DowncastClone();
+  }
+  public class Trait : _ITrait {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<DAST._ITypeArgDecl> _typeParams;
+    public readonly DAST._ITraitType _traitType;
+    public readonly Dafny.ISequence<DAST._IType> _parents;
+    public readonly Dafny.ISequence<DAST._IMethod> _body;
+    public readonly Dafny.ISequence<DAST._IAttribute> _attributes;
+    public Trait(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, DAST._ITraitType traitType, Dafny.ISequence<DAST._IType> parents, Dafny.ISequence<DAST._IMethod> body, Dafny.ISequence<DAST._IAttribute> attributes) {
+      this._name = name;
+      this._docString = docString;
+      this._typeParams = typeParams;
+      this._traitType = traitType;
+      this._parents = parents;
+      this._body = body;
+      this._attributes = attributes;
+    }
+    public _ITrait DowncastClone() {
+      if (this is _ITrait dt) { return dt; }
+      return new Trait(_name, _docString, _typeParams, _traitType, _parents, _body, _attributes);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Trait;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._docString, oth._docString) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._traitType, oth._traitType) && object.Equals(this._parents, oth._parents) && object.Equals(this._body, oth._body) && object.Equals(this._attributes, oth._attributes);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._traitType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._parents));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Trait.Trait";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._traitType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._parents);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._ITrait theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._ITypeArgDecl>.Empty, DAST.TraitType.Default(), Dafny.Sequence<DAST._IType>.Empty, Dafny.Sequence<DAST._IMethod>.Empty, Dafny.Sequence<DAST._IAttribute>.Empty);
+    public static DAST._ITrait Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._ITrait> _TYPE = new Dafny.TypeDescriptor<DAST._ITrait>(DAST.Trait.Default());
+    public static Dafny.TypeDescriptor<DAST._ITrait> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ITrait create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, DAST._ITraitType traitType, Dafny.ISequence<DAST._IType> parents, Dafny.ISequence<DAST._IMethod> body, Dafny.ISequence<DAST._IAttribute> attributes) {
+      return new Trait(name, docString, typeParams, traitType, parents, body, attributes);
+    }
+    public static _ITrait create_Trait(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, DAST._ITraitType traitType, Dafny.ISequence<DAST._IType> parents, Dafny.ISequence<DAST._IMethod> body, Dafny.ISequence<DAST._IAttribute> attributes) {
+      return create(name, docString, typeParams, traitType, parents, body, attributes);
+    }
+    public bool is_Trait { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public DAST._ITraitType dtor_traitType {
+      get {
+        return this._traitType;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_parents {
+      get {
+        return this._parents;
+      }
+    }
+    public Dafny.ISequence<DAST._IMethod> dtor_body {
+      get {
+        return this._body;
+      }
+    }
+    public Dafny.ISequence<DAST._IAttribute> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+  }
+
+  public interface _IDatatype {
+    bool is_Datatype { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_enclosingModule { get; }
+    Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams { get; }
+    Dafny.ISequence<DAST._IDatatypeCtor> dtor_ctors { get; }
+    Dafny.ISequence<DAST._IMethod> dtor_body { get; }
+    bool dtor_isCo { get; }
+    Dafny.ISequence<DAST._IAttribute> dtor_attributes { get; }
+    Dafny.ISequence<DAST._IType> dtor_superTraitTypes { get; }
+    _IDatatype DowncastClone();
+  }
+  public class Datatype : _IDatatype {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.Rune> _enclosingModule;
+    public readonly Dafny.ISequence<DAST._ITypeArgDecl> _typeParams;
+    public readonly Dafny.ISequence<DAST._IDatatypeCtor> _ctors;
+    public readonly Dafny.ISequence<DAST._IMethod> _body;
+    public readonly bool _isCo;
+    public readonly Dafny.ISequence<DAST._IAttribute> _attributes;
+    public readonly Dafny.ISequence<DAST._IType> _superTraitTypes;
+    public Datatype(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.Rune> enclosingModule, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, Dafny.ISequence<DAST._IDatatypeCtor> ctors, Dafny.ISequence<DAST._IMethod> body, bool isCo, Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<DAST._IType> superTraitTypes) {
+      this._name = name;
+      this._docString = docString;
+      this._enclosingModule = enclosingModule;
+      this._typeParams = typeParams;
+      this._ctors = ctors;
+      this._body = body;
+      this._isCo = isCo;
+      this._attributes = attributes;
+      this._superTraitTypes = superTraitTypes;
+    }
+    public _IDatatype DowncastClone() {
+      if (this is _IDatatype dt) { return dt; }
+      return new Datatype(_name, _docString, _enclosingModule, _typeParams, _ctors, _body, _isCo, _attributes, _superTraitTypes);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Datatype;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._docString, oth._docString) && object.Equals(this._enclosingModule, oth._enclosingModule) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._ctors, oth._ctors) && object.Equals(this._body, oth._body) && this._isCo == oth._isCo && object.Equals(this._attributes, oth._attributes) && object.Equals(this._superTraitTypes, oth._superTraitTypes);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._enclosingModule));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._ctors));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isCo));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._superTraitTypes));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Datatype.Datatype";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._enclosingModule);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._ctors);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._isCo);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._superTraitTypes);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IDatatype theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._ITypeArgDecl>.Empty, Dafny.Sequence<DAST._IDatatypeCtor>.Empty, Dafny.Sequence<DAST._IMethod>.Empty, false, Dafny.Sequence<DAST._IAttribute>.Empty, Dafny.Sequence<DAST._IType>.Empty);
+    public static DAST._IDatatype Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IDatatype> _TYPE = new Dafny.TypeDescriptor<DAST._IDatatype>(DAST.Datatype.Default());
+    public static Dafny.TypeDescriptor<DAST._IDatatype> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IDatatype create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.Rune> enclosingModule, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, Dafny.ISequence<DAST._IDatatypeCtor> ctors, Dafny.ISequence<DAST._IMethod> body, bool isCo, Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<DAST._IType> superTraitTypes) {
+      return new Datatype(name, docString, enclosingModule, typeParams, ctors, body, isCo, attributes, superTraitTypes);
+    }
+    public static _IDatatype create_Datatype(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.Rune> enclosingModule, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, Dafny.ISequence<DAST._IDatatypeCtor> ctors, Dafny.ISequence<DAST._IMethod> body, bool isCo, Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<DAST._IType> superTraitTypes) {
+      return create(name, docString, enclosingModule, typeParams, ctors, body, isCo, attributes, superTraitTypes);
+    }
+    public bool is_Datatype { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_enclosingModule {
+      get {
+        return this._enclosingModule;
+      }
+    }
+    public Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public Dafny.ISequence<DAST._IDatatypeCtor> dtor_ctors {
+      get {
+        return this._ctors;
+      }
+    }
+    public Dafny.ISequence<DAST._IMethod> dtor_body {
+      get {
+        return this._body;
+      }
+    }
+    public bool dtor_isCo {
+      get {
+        return this._isCo;
+      }
+    }
+    public Dafny.ISequence<DAST._IAttribute> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_superTraitTypes {
+      get {
+        return this._superTraitTypes;
+      }
+    }
+  }
+
+  public interface _IDatatypeDtor {
+    bool is_DatatypeDtor { get; }
+    DAST._IFormal dtor_formal { get; }
+    Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> dtor_callName { get; }
+    _IDatatypeDtor DowncastClone();
+  }
+  public class DatatypeDtor : _IDatatypeDtor {
+    public readonly DAST._IFormal _formal;
+    public readonly Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _callName;
+    public DatatypeDtor(DAST._IFormal formal, Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> callName) {
+      this._formal = formal;
+      this._callName = callName;
+    }
+    public _IDatatypeDtor DowncastClone() {
+      if (this is _IDatatypeDtor dt) { return dt; }
+      return new DatatypeDtor(_formal, _callName);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.DatatypeDtor;
+      return oth != null && object.Equals(this._formal, oth._formal) && object.Equals(this._callName, oth._callName);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._formal));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._callName));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.DatatypeDtor.DatatypeDtor";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._formal);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._callName);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IDatatypeDtor theDefault = create(DAST.Formal.Default(), Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.Default());
+    public static DAST._IDatatypeDtor Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IDatatypeDtor> _TYPE = new Dafny.TypeDescriptor<DAST._IDatatypeDtor>(DAST.DatatypeDtor.Default());
+    public static Dafny.TypeDescriptor<DAST._IDatatypeDtor> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IDatatypeDtor create(DAST._IFormal formal, Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> callName) {
+      return new DatatypeDtor(formal, callName);
+    }
+    public static _IDatatypeDtor create_DatatypeDtor(DAST._IFormal formal, Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> callName) {
+      return create(formal, callName);
+    }
+    public bool is_DatatypeDtor { get { return true; } }
+    public DAST._IFormal dtor_formal {
+      get {
+        return this._formal;
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> dtor_callName {
+      get {
+        return this._callName;
+      }
+    }
+  }
+
+  public interface _IDatatypeCtor {
+    bool is_DatatypeCtor { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<DAST._IDatatypeDtor> dtor_args { get; }
+    bool dtor_hasAnyArgs { get; }
+    _IDatatypeCtor DowncastClone();
+  }
+  public class DatatypeCtor : _IDatatypeCtor {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<DAST._IDatatypeDtor> _args;
+    public readonly bool _hasAnyArgs;
+    public DatatypeCtor(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._IDatatypeDtor> args, bool hasAnyArgs) {
+      this._name = name;
+      this._docString = docString;
+      this._args = args;
+      this._hasAnyArgs = hasAnyArgs;
+    }
+    public _IDatatypeCtor DowncastClone() {
+      if (this is _IDatatypeCtor dt) { return dt; }
+      return new DatatypeCtor(_name, _docString, _args, _hasAnyArgs);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.DatatypeCtor;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._docString, oth._docString) && object.Equals(this._args, oth._args) && this._hasAnyArgs == oth._hasAnyArgs;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._hasAnyArgs));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.DatatypeCtor.DatatypeCtor";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._args);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._hasAnyArgs);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IDatatypeCtor theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._IDatatypeDtor>.Empty, false);
+    public static DAST._IDatatypeCtor Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IDatatypeCtor> _TYPE = new Dafny.TypeDescriptor<DAST._IDatatypeCtor>(DAST.DatatypeCtor.Default());
+    public static Dafny.TypeDescriptor<DAST._IDatatypeCtor> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IDatatypeCtor create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._IDatatypeDtor> args, bool hasAnyArgs) {
+      return new DatatypeCtor(name, docString, args, hasAnyArgs);
+    }
+    public static _IDatatypeCtor create_DatatypeCtor(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._IDatatypeDtor> args, bool hasAnyArgs) {
+      return create(name, docString, args, hasAnyArgs);
+    }
+    public bool is_DatatypeCtor { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<DAST._IDatatypeDtor> dtor_args {
+      get {
+        return this._args;
+      }
+    }
+    public bool dtor_hasAnyArgs {
+      get {
+        return this._hasAnyArgs;
+      }
+    }
+  }
+
+  public interface _INewtype {
+    bool is_Newtype { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams { get; }
+    DAST._IType dtor_base { get; }
+    DAST._INewtypeRange dtor_range { get; }
+    Std.Wrappers._IOption<DAST._INewtypeConstraint> dtor_constraint { get; }
+    Dafny.ISequence<DAST._IStatement> dtor_witnessStmts { get; }
+    Std.Wrappers._IOption<DAST._IExpression> dtor_witnessExpr { get; }
+    Dafny.ISequence<DAST._IAttribute> dtor_attributes { get; }
+    Dafny.ISequence<DAST._IMethod> dtor_classItems { get; }
+    _INewtype DowncastClone();
+  }
+  public class Newtype : _INewtype {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<DAST._ITypeArgDecl> _typeParams;
+    public readonly DAST._IType _base;
+    public readonly DAST._INewtypeRange _range;
+    public readonly Std.Wrappers._IOption<DAST._INewtypeConstraint> _constraint;
+    public readonly Dafny.ISequence<DAST._IStatement> _witnessStmts;
+    public readonly Std.Wrappers._IOption<DAST._IExpression> _witnessExpr;
+    public readonly Dafny.ISequence<DAST._IAttribute> _attributes;
+    public readonly Dafny.ISequence<DAST._IMethod> _classItems;
+    public Newtype(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, DAST._IType @base, DAST._INewtypeRange range, Std.Wrappers._IOption<DAST._INewtypeConstraint> constraint, Dafny.ISequence<DAST._IStatement> witnessStmts, Std.Wrappers._IOption<DAST._IExpression> witnessExpr, Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<DAST._IMethod> classItems) {
+      this._name = name;
+      this._docString = docString;
+      this._typeParams = typeParams;
+      this._base = @base;
+      this._range = range;
+      this._constraint = constraint;
+      this._witnessStmts = witnessStmts;
+      this._witnessExpr = witnessExpr;
+      this._attributes = attributes;
+      this._classItems = classItems;
+    }
+    public _INewtype DowncastClone() {
+      if (this is _INewtype dt) { return dt; }
+      return new Newtype(_name, _docString, _typeParams, _base, _range, _constraint, _witnessStmts, _witnessExpr, _attributes, _classItems);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Newtype;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._docString, oth._docString) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._base, oth._base) && object.Equals(this._range, oth._range) && object.Equals(this._constraint, oth._constraint) && object.Equals(this._witnessStmts, oth._witnessStmts) && object.Equals(this._witnessExpr, oth._witnessExpr) && object.Equals(this._attributes, oth._attributes) && object.Equals(this._classItems, oth._classItems);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._base));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._range));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._constraint));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._witnessStmts));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._witnessExpr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._classItems));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Newtype.Newtype";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._base);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._range);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._constraint);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._witnessStmts);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._witnessExpr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._classItems);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._INewtype theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._ITypeArgDecl>.Empty, DAST.Type.Default(), DAST.NewtypeRange.Default(), Std.Wrappers.Option<DAST._INewtypeConstraint>.Default(), Dafny.Sequence<DAST._IStatement>.Empty, Std.Wrappers.Option<DAST._IExpression>.Default(), Dafny.Sequence<DAST._IAttribute>.Empty, Dafny.Sequence<DAST._IMethod>.Empty);
+    public static DAST._INewtype Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._INewtype> _TYPE = new Dafny.TypeDescriptor<DAST._INewtype>(DAST.Newtype.Default());
+    public static Dafny.TypeDescriptor<DAST._INewtype> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _INewtype create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, DAST._IType @base, DAST._INewtypeRange range, Std.Wrappers._IOption<DAST._INewtypeConstraint> constraint, Dafny.ISequence<DAST._IStatement> witnessStmts, Std.Wrappers._IOption<DAST._IExpression> witnessExpr, Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<DAST._IMethod> classItems) {
+      return new Newtype(name, docString, typeParams, @base, range, constraint, witnessStmts, witnessExpr, attributes, classItems);
+    }
+    public static _INewtype create_Newtype(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, DAST._IType @base, DAST._INewtypeRange range, Std.Wrappers._IOption<DAST._INewtypeConstraint> constraint, Dafny.ISequence<DAST._IStatement> witnessStmts, Std.Wrappers._IOption<DAST._IExpression> witnessExpr, Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<DAST._IMethod> classItems) {
+      return create(name, docString, typeParams, @base, range, constraint, witnessStmts, witnessExpr, attributes, classItems);
+    }
+    public bool is_Newtype { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public DAST._IType dtor_base {
+      get {
+        return this._base;
+      }
+    }
+    public DAST._INewtypeRange dtor_range {
+      get {
+        return this._range;
+      }
+    }
+    public Std.Wrappers._IOption<DAST._INewtypeConstraint> dtor_constraint {
+      get {
+        return this._constraint;
+      }
+    }
+    public Dafny.ISequence<DAST._IStatement> dtor_witnessStmts {
+      get {
+        return this._witnessStmts;
+      }
+    }
+    public Std.Wrappers._IOption<DAST._IExpression> dtor_witnessExpr {
+      get {
+        return this._witnessExpr;
+      }
+    }
+    public Dafny.ISequence<DAST._IAttribute> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public Dafny.ISequence<DAST._IMethod> dtor_classItems {
+      get {
+        return this._classItems;
+      }
+    }
+  }
+
+  public interface _INewtypeConstraint {
+    bool is_NewtypeConstraint { get; }
+    DAST._IFormal dtor_variable { get; }
+    Dafny.ISequence<DAST._IStatement> dtor_constraintStmts { get; }
+    _INewtypeConstraint DowncastClone();
+  }
+  public class NewtypeConstraint : _INewtypeConstraint {
+    public readonly DAST._IFormal _variable;
+    public readonly Dafny.ISequence<DAST._IStatement> _constraintStmts;
+    public NewtypeConstraint(DAST._IFormal variable, Dafny.ISequence<DAST._IStatement> constraintStmts) {
+      this._variable = variable;
+      this._constraintStmts = constraintStmts;
+    }
+    public _INewtypeConstraint DowncastClone() {
+      if (this is _INewtypeConstraint dt) { return dt; }
+      return new NewtypeConstraint(_variable, _constraintStmts);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.NewtypeConstraint;
+      return oth != null && object.Equals(this._variable, oth._variable) && object.Equals(this._constraintStmts, oth._constraintStmts);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._variable));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._constraintStmts));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.NewtypeConstraint.NewtypeConstraint";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._variable);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._constraintStmts);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._INewtypeConstraint theDefault = create(DAST.Formal.Default(), Dafny.Sequence<DAST._IStatement>.Empty);
+    public static DAST._INewtypeConstraint Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._INewtypeConstraint> _TYPE = new Dafny.TypeDescriptor<DAST._INewtypeConstraint>(DAST.NewtypeConstraint.Default());
+    public static Dafny.TypeDescriptor<DAST._INewtypeConstraint> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _INewtypeConstraint create(DAST._IFormal variable, Dafny.ISequence<DAST._IStatement> constraintStmts) {
+      return new NewtypeConstraint(variable, constraintStmts);
+    }
+    public static _INewtypeConstraint create_NewtypeConstraint(DAST._IFormal variable, Dafny.ISequence<DAST._IStatement> constraintStmts) {
+      return create(variable, constraintStmts);
+    }
+    public bool is_NewtypeConstraint { get { return true; } }
+    public DAST._IFormal dtor_variable {
+      get {
+        return this._variable;
+      }
+    }
+    public Dafny.ISequence<DAST._IStatement> dtor_constraintStmts {
+      get {
+        return this._constraintStmts;
+      }
+    }
+  }
+
+  public interface _ISynonymType {
+    bool is_SynonymType { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams { get; }
+    DAST._IType dtor_base { get; }
+    Dafny.ISequence<DAST._IStatement> dtor_witnessStmts { get; }
+    Std.Wrappers._IOption<DAST._IExpression> dtor_witnessExpr { get; }
+    Dafny.ISequence<DAST._IAttribute> dtor_attributes { get; }
+    _ISynonymType DowncastClone();
+  }
+  public class SynonymType : _ISynonymType {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<DAST._ITypeArgDecl> _typeParams;
+    public readonly DAST._IType _base;
+    public readonly Dafny.ISequence<DAST._IStatement> _witnessStmts;
+    public readonly Std.Wrappers._IOption<DAST._IExpression> _witnessExpr;
+    public readonly Dafny.ISequence<DAST._IAttribute> _attributes;
+    public SynonymType(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, DAST._IType @base, Dafny.ISequence<DAST._IStatement> witnessStmts, Std.Wrappers._IOption<DAST._IExpression> witnessExpr, Dafny.ISequence<DAST._IAttribute> attributes) {
+      this._name = name;
+      this._docString = docString;
+      this._typeParams = typeParams;
+      this._base = @base;
+      this._witnessStmts = witnessStmts;
+      this._witnessExpr = witnessExpr;
+      this._attributes = attributes;
+    }
+    public _ISynonymType DowncastClone() {
+      if (this is _ISynonymType dt) { return dt; }
+      return new SynonymType(_name, _docString, _typeParams, _base, _witnessStmts, _witnessExpr, _attributes);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.SynonymType;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._docString, oth._docString) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._base, oth._base) && object.Equals(this._witnessStmts, oth._witnessStmts) && object.Equals(this._witnessExpr, oth._witnessExpr) && object.Equals(this._attributes, oth._attributes);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._base));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._witnessStmts));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._witnessExpr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.SynonymType.SynonymType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._base);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._witnessStmts);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._witnessExpr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._ISynonymType theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._ITypeArgDecl>.Empty, DAST.Type.Default(), Dafny.Sequence<DAST._IStatement>.Empty, Std.Wrappers.Option<DAST._IExpression>.Default(), Dafny.Sequence<DAST._IAttribute>.Empty);
+    public static DAST._ISynonymType Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._ISynonymType> _TYPE = new Dafny.TypeDescriptor<DAST._ISynonymType>(DAST.SynonymType.Default());
+    public static Dafny.TypeDescriptor<DAST._ISynonymType> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ISynonymType create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, DAST._IType @base, Dafny.ISequence<DAST._IStatement> witnessStmts, Std.Wrappers._IOption<DAST._IExpression> witnessExpr, Dafny.ISequence<DAST._IAttribute> attributes) {
+      return new SynonymType(name, docString, typeParams, @base, witnessStmts, witnessExpr, attributes);
+    }
+    public static _ISynonymType create_SynonymType(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, DAST._IType @base, Dafny.ISequence<DAST._IStatement> witnessStmts, Std.Wrappers._IOption<DAST._IExpression> witnessExpr, Dafny.ISequence<DAST._IAttribute> attributes) {
+      return create(name, docString, typeParams, @base, witnessStmts, witnessExpr, attributes);
+    }
+    public bool is_SynonymType { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public DAST._IType dtor_base {
+      get {
+        return this._base;
+      }
+    }
+    public Dafny.ISequence<DAST._IStatement> dtor_witnessStmts {
+      get {
+        return this._witnessStmts;
+      }
+    }
+    public Std.Wrappers._IOption<DAST._IExpression> dtor_witnessExpr {
+      get {
+        return this._witnessExpr;
+      }
+    }
+    public Dafny.ISequence<DAST._IAttribute> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+  }
+
+  public interface _IClassItem {
+    bool is_Method { get; }
+    DAST._IMethod dtor_Method_a0 { get; }
+  }
+  public class ClassItem : _IClassItem {
+    public readonly DAST._IMethod _a0;
+    public ClassItem(DAST._IMethod _a0) {
+      this._a0 = _a0;
+    }
+    public static DAST._IMethod DowncastClone(DAST._IMethod _this) {
+      return _this;
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.ClassItem;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.ClassItem.Method";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IMethod theDefault = DAST.Method.Default();
+    public static DAST._IMethod Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IMethod> _TYPE = new Dafny.TypeDescriptor<DAST._IMethod>(DAST.Method.Default());
+    public static Dafny.TypeDescriptor<DAST._IMethod> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IClassItem create(DAST._IMethod _a0) {
+      return new ClassItem(_a0);
+    }
+    public static _IClassItem create_Method(DAST._IMethod _a0) {
+      return create(_a0);
+    }
+    public bool is_Method { get { return true; } }
+    public DAST._IMethod dtor_Method_a0 {
+      get {
+        return this._a0;
+      }
+    }
+  }
+
+  public interface _IField {
+    bool is_Field { get; }
+    DAST._IFormal dtor_formal { get; }
+    bool dtor_isConstant { get; }
+    Std.Wrappers._IOption<DAST._IExpression> dtor_defaultValue { get; }
+    bool dtor_isStatic { get; }
+    _IField DowncastClone();
+  }
+  public class Field : _IField {
+    public readonly DAST._IFormal _formal;
+    public readonly bool _isConstant;
+    public readonly Std.Wrappers._IOption<DAST._IExpression> _defaultValue;
+    public readonly bool _isStatic;
+    public Field(DAST._IFormal formal, bool isConstant, Std.Wrappers._IOption<DAST._IExpression> defaultValue, bool isStatic) {
+      this._formal = formal;
+      this._isConstant = isConstant;
+      this._defaultValue = defaultValue;
+      this._isStatic = isStatic;
+    }
+    public _IField DowncastClone() {
+      if (this is _IField dt) { return dt; }
+      return new Field(_formal, _isConstant, _defaultValue, _isStatic);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Field;
+      return oth != null && object.Equals(this._formal, oth._formal) && this._isConstant == oth._isConstant && object.Equals(this._defaultValue, oth._defaultValue) && this._isStatic == oth._isStatic;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._formal));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isConstant));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._defaultValue));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isStatic));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Field.Field";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._formal);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._isConstant);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._defaultValue);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._isStatic);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IField theDefault = create(DAST.Formal.Default(), false, Std.Wrappers.Option<DAST._IExpression>.Default(), false);
+    public static DAST._IField Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IField> _TYPE = new Dafny.TypeDescriptor<DAST._IField>(DAST.Field.Default());
+    public static Dafny.TypeDescriptor<DAST._IField> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IField create(DAST._IFormal formal, bool isConstant, Std.Wrappers._IOption<DAST._IExpression> defaultValue, bool isStatic) {
+      return new Field(formal, isConstant, defaultValue, isStatic);
+    }
+    public static _IField create_Field(DAST._IFormal formal, bool isConstant, Std.Wrappers._IOption<DAST._IExpression> defaultValue, bool isStatic) {
+      return create(formal, isConstant, defaultValue, isStatic);
+    }
+    public bool is_Field { get { return true; } }
+    public DAST._IFormal dtor_formal {
+      get {
+        return this._formal;
+      }
+    }
+    public bool dtor_isConstant {
+      get {
+        return this._isConstant;
+      }
+    }
+    public Std.Wrappers._IOption<DAST._IExpression> dtor_defaultValue {
+      get {
+        return this._defaultValue;
+      }
+    }
+    public bool dtor_isStatic {
+      get {
+        return this._isStatic;
+      }
+    }
+  }
+
+  public interface _IFormal {
+    bool is_Formal { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    DAST._IType dtor_typ { get; }
+    Dafny.ISequence<DAST._IAttribute> dtor_attributes { get; }
+    _IFormal DowncastClone();
+  }
+  public class Formal : _IFormal {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly DAST._IType _typ;
+    public readonly Dafny.ISequence<DAST._IAttribute> _attributes;
+    public Formal(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ, Dafny.ISequence<DAST._IAttribute> attributes) {
+      this._name = name;
+      this._typ = typ;
+      this._attributes = attributes;
+    }
+    public _IFormal DowncastClone() {
+      if (this is _IFormal dt) { return dt; }
+      return new Formal(_name, _typ, _attributes);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Formal;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._typ, oth._typ) && object.Equals(this._attributes, oth._attributes);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Formal.Formal";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typ);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IFormal theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, DAST.Type.Default(), Dafny.Sequence<DAST._IAttribute>.Empty);
+    public static DAST._IFormal Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IFormal> _TYPE = new Dafny.TypeDescriptor<DAST._IFormal>(DAST.Formal.Default());
+    public static Dafny.TypeDescriptor<DAST._IFormal> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IFormal create(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ, Dafny.ISequence<DAST._IAttribute> attributes) {
+      return new Formal(name, typ, attributes);
+    }
+    public static _IFormal create_Formal(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ, Dafny.ISequence<DAST._IAttribute> attributes) {
+      return create(name, typ, attributes);
+    }
+    public bool is_Formal { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public DAST._IType dtor_typ {
+      get {
+        return this._typ;
+      }
+    }
+    public Dafny.ISequence<DAST._IAttribute> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+  }
+
+  public interface _IMethod {
+    bool is_Method { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<DAST._IAttribute> dtor_attributes { get; }
+    bool dtor_isStatic { get; }
+    bool dtor_hasBody { get; }
+    bool dtor_outVarsAreUninitFieldsToAssign { get; }
+    bool dtor_wasFunction { get; }
+    Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_overridingPath { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams { get; }
+    Dafny.ISequence<DAST._IFormal> dtor_params { get; }
+    Dafny.ISequence<DAST._IStatement> dtor_body { get; }
+    Dafny.ISequence<DAST._IType> dtor_outTypes { get; }
+    Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_outVars { get; }
+    _IMethod DowncastClone();
+  }
+  public class Method : _IMethod {
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<DAST._IAttribute> _attributes;
+    public readonly bool _isStatic;
+    public readonly bool _hasBody;
+    public readonly bool _outVarsAreUninitFieldsToAssign;
+    public readonly bool _wasFunction;
+    public readonly Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _overridingPath;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<DAST._ITypeArgDecl> _typeParams;
+    public readonly Dafny.ISequence<DAST._IFormal> _params;
+    public readonly Dafny.ISequence<DAST._IStatement> _body;
+    public readonly Dafny.ISequence<DAST._IType> _outTypes;
+    public readonly Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _outVars;
+    public Method(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._IAttribute> attributes, bool isStatic, bool hasBody, bool outVarsAreUninitFieldsToAssign, bool wasFunction, Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> overridingPath, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, Dafny.ISequence<DAST._IFormal> @params, Dafny.ISequence<DAST._IStatement> body, Dafny.ISequence<DAST._IType> outTypes, Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> outVars) {
+      this._docString = docString;
+      this._attributes = attributes;
+      this._isStatic = isStatic;
+      this._hasBody = hasBody;
+      this._outVarsAreUninitFieldsToAssign = outVarsAreUninitFieldsToAssign;
+      this._wasFunction = wasFunction;
+      this._overridingPath = overridingPath;
+      this._name = name;
+      this._typeParams = typeParams;
+      this._params = @params;
+      this._body = body;
+      this._outTypes = outTypes;
+      this._outVars = outVars;
+    }
+    public _IMethod DowncastClone() {
+      if (this is _IMethod dt) { return dt; }
+      return new Method(_docString, _attributes, _isStatic, _hasBody, _outVarsAreUninitFieldsToAssign, _wasFunction, _overridingPath, _name, _typeParams, _params, _body, _outTypes, _outVars);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Method;
+      return oth != null && object.Equals(this._docString, oth._docString) && object.Equals(this._attributes, oth._attributes) && this._isStatic == oth._isStatic && this._hasBody == oth._hasBody && this._outVarsAreUninitFieldsToAssign == oth._outVarsAreUninitFieldsToAssign && this._wasFunction == oth._wasFunction && object.Equals(this._overridingPath, oth._overridingPath) && object.Equals(this._name, oth._name) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._params, oth._params) && object.Equals(this._body, oth._body) && object.Equals(this._outTypes, oth._outTypes) && object.Equals(this._outVars, oth._outVars);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isStatic));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._hasBody));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._outVarsAreUninitFieldsToAssign));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._wasFunction));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overridingPath));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._params));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._outTypes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._outVars));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Method.Method";
+      s += "(";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._isStatic);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._hasBody);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._outVarsAreUninitFieldsToAssign);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._wasFunction);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._overridingPath);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._params);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._outTypes);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._outVars);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._IMethod theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._IAttribute>.Empty, false, false, false, false, Std.Wrappers.Option<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.Default(), Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._ITypeArgDecl>.Empty, Dafny.Sequence<DAST._IFormal>.Empty, Dafny.Sequence<DAST._IStatement>.Empty, Dafny.Sequence<DAST._IType>.Empty, Std.Wrappers.Option<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.Default());
+    public static DAST._IMethod Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IMethod> _TYPE = new Dafny.TypeDescriptor<DAST._IMethod>(DAST.Method.Default());
+    public static Dafny.TypeDescriptor<DAST._IMethod> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IMethod create(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._IAttribute> attributes, bool isStatic, bool hasBody, bool outVarsAreUninitFieldsToAssign, bool wasFunction, Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> overridingPath, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, Dafny.ISequence<DAST._IFormal> @params, Dafny.ISequence<DAST._IStatement> body, Dafny.ISequence<DAST._IType> outTypes, Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> outVars) {
+      return new Method(docString, attributes, isStatic, hasBody, outVarsAreUninitFieldsToAssign, wasFunction, overridingPath, name, typeParams, @params, body, outTypes, outVars);
+    }
+    public static _IMethod create_Method(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<DAST._IAttribute> attributes, bool isStatic, bool hasBody, bool outVarsAreUninitFieldsToAssign, bool wasFunction, Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> overridingPath, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._ITypeArgDecl> typeParams, Dafny.ISequence<DAST._IFormal> @params, Dafny.ISequence<DAST._IStatement> body, Dafny.ISequence<DAST._IType> outTypes, Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> outVars) {
+      return create(docString, attributes, isStatic, hasBody, outVarsAreUninitFieldsToAssign, wasFunction, overridingPath, name, typeParams, @params, body, outTypes, outVars);
+    }
+    public bool is_Method { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<DAST._IAttribute> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public bool dtor_isStatic {
+      get {
+        return this._isStatic;
+      }
+    }
+    public bool dtor_hasBody {
+      get {
+        return this._hasBody;
+      }
+    }
+    public bool dtor_outVarsAreUninitFieldsToAssign {
+      get {
+        return this._outVarsAreUninitFieldsToAssign;
+      }
+    }
+    public bool dtor_wasFunction {
+      get {
+        return this._wasFunction;
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_overridingPath {
+      get {
+        return this._overridingPath;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<DAST._ITypeArgDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public Dafny.ISequence<DAST._IFormal> dtor_params {
+      get {
+        return this._params;
+      }
+    }
+    public Dafny.ISequence<DAST._IStatement> dtor_body {
+      get {
+        return this._body;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_outTypes {
+      get {
+        return this._outTypes;
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_outVars {
+      get {
+        return this._outVars;
+      }
+    }
+  }
+
+  public interface _ICallSignature {
+    bool is_CallSignature { get; }
+    Dafny.ISequence<DAST._IFormal> dtor_parameters { get; }
+  }
+  public class CallSignature : _ICallSignature {
+    public readonly Dafny.ISequence<DAST._IFormal> _parameters;
+    public CallSignature(Dafny.ISequence<DAST._IFormal> parameters) {
+      this._parameters = parameters;
+    }
+    public static Dafny.ISequence<DAST._IFormal> DowncastClone(Dafny.ISequence<DAST._IFormal> _this) {
+      return _this;
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.CallSignature;
+      return oth != null && object.Equals(this._parameters, oth._parameters);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._parameters));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.CallSignature.CallSignature";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._parameters);
+      s += ")";
+      return s;
+    }
+    private static readonly Dafny.ISequence<DAST._IFormal> theDefault = Dafny.Sequence<DAST._IFormal>.Empty;
+    public static Dafny.ISequence<DAST._IFormal> Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Dafny.ISequence<DAST._IFormal>> _TYPE = new Dafny.TypeDescriptor<Dafny.ISequence<DAST._IFormal>>(Dafny.Sequence<DAST._IFormal>.Empty);
+    public static Dafny.TypeDescriptor<Dafny.ISequence<DAST._IFormal>> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ICallSignature create(Dafny.ISequence<DAST._IFormal> parameters) {
+      return new CallSignature(parameters);
+    }
+    public static _ICallSignature create_CallSignature(Dafny.ISequence<DAST._IFormal> parameters) {
+      return create(parameters);
+    }
+    public bool is_CallSignature { get { return true; } }
+    public Dafny.ISequence<DAST._IFormal> dtor_parameters {
+      get {
+        return this._parameters;
+      }
+    }
+  }
+
+  public interface _ICallName {
+    bool is_CallName { get; }
+    bool is_MapBuilderAdd { get; }
+    bool is_MapBuilderBuild { get; }
+    bool is_SetBuilderAdd { get; }
+    bool is_SetBuilderBuild { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Std.Wrappers._IOption<DAST._IType> dtor_onType { get; }
+    Std.Wrappers._IOption<DAST._IFormal> dtor_receiverArg { get; }
+    bool dtor_receiverAsArgument { get; }
+    Dafny.ISequence<DAST._IFormal> dtor_signature { get; }
+    _ICallName DowncastClone();
+  }
+  public abstract class CallName : _ICallName {
+    public CallName() {
+    }
+    private static readonly DAST._ICallName theDefault = create_CallName(Dafny.Sequence<Dafny.Rune>.Empty, Std.Wrappers.Option<DAST._IType>.Default(), Std.Wrappers.Option<DAST._IFormal>.Default(), false, Dafny.Sequence<DAST._IFormal>.Empty);
+    public static DAST._ICallName Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._ICallName> _TYPE = new Dafny.TypeDescriptor<DAST._ICallName>(DAST.CallName.Default());
+    public static Dafny.TypeDescriptor<DAST._ICallName> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ICallName create_CallName(Dafny.ISequence<Dafny.Rune> name, Std.Wrappers._IOption<DAST._IType> onType, Std.Wrappers._IOption<DAST._IFormal> receiverArg, bool receiverAsArgument, Dafny.ISequence<DAST._IFormal> signature) {
+      return new CallName_CallName(name, onType, receiverArg, receiverAsArgument, signature);
+    }
+    public static _ICallName create_MapBuilderAdd() {
+      return new CallName_MapBuilderAdd();
+    }
+    public static _ICallName create_MapBuilderBuild() {
+      return new CallName_MapBuilderBuild();
+    }
+    public static _ICallName create_SetBuilderAdd() {
+      return new CallName_SetBuilderAdd();
+    }
+    public static _ICallName create_SetBuilderBuild() {
+      return new CallName_SetBuilderBuild();
+    }
+    public bool is_CallName { get { return this is CallName_CallName; } }
+    public bool is_MapBuilderAdd { get { return this is CallName_MapBuilderAdd; } }
+    public bool is_MapBuilderBuild { get { return this is CallName_MapBuilderBuild; } }
+    public bool is_SetBuilderAdd { get { return this is CallName_SetBuilderAdd; } }
+    public bool is_SetBuilderBuild { get { return this is CallName_SetBuilderBuild; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        var d = this;
+        return ((CallName_CallName)d)._name;
+      }
+    }
+    public Std.Wrappers._IOption<DAST._IType> dtor_onType {
+      get {
+        var d = this;
+        return ((CallName_CallName)d)._onType;
+      }
+    }
+    public Std.Wrappers._IOption<DAST._IFormal> dtor_receiverArg {
+      get {
+        var d = this;
+        return ((CallName_CallName)d)._receiverArg;
+      }
+    }
+    public bool dtor_receiverAsArgument {
+      get {
+        var d = this;
+        return ((CallName_CallName)d)._receiverAsArgument;
+      }
+    }
+    public Dafny.ISequence<DAST._IFormal> dtor_signature {
+      get {
+        var d = this;
+        return ((CallName_CallName)d)._signature;
+      }
+    }
+    public abstract _ICallName DowncastClone();
+  }
+  public class CallName_CallName : CallName {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Std.Wrappers._IOption<DAST._IType> _onType;
+    public readonly Std.Wrappers._IOption<DAST._IFormal> _receiverArg;
+    public readonly bool _receiverAsArgument;
+    public readonly Dafny.ISequence<DAST._IFormal> _signature;
+    public CallName_CallName(Dafny.ISequence<Dafny.Rune> name, Std.Wrappers._IOption<DAST._IType> onType, Std.Wrappers._IOption<DAST._IFormal> receiverArg, bool receiverAsArgument, Dafny.ISequence<DAST._IFormal> signature) : base() {
+      this._name = name;
+      this._onType = onType;
+      this._receiverArg = receiverArg;
+      this._receiverAsArgument = receiverAsArgument;
+      this._signature = signature;
+    }
+    public override _ICallName DowncastClone() {
+      if (this is _ICallName dt) { return dt; }
+      return new CallName_CallName(_name, _onType, _receiverArg, _receiverAsArgument, _signature);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.CallName_CallName;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._onType, oth._onType) && object.Equals(this._receiverArg, oth._receiverArg) && this._receiverAsArgument == oth._receiverAsArgument && object.Equals(this._signature, oth._signature);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._onType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._receiverArg));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._receiverAsArgument));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._signature));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.CallName.CallName";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._onType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._receiverArg);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._receiverAsArgument);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._signature);
+      s += ")";
+      return s;
+    }
+  }
+  public class CallName_MapBuilderAdd : CallName {
+    public CallName_MapBuilderAdd() : base() {
+    }
+    public override _ICallName DowncastClone() {
+      if (this is _ICallName dt) { return dt; }
+      return new CallName_MapBuilderAdd();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.CallName_MapBuilderAdd;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.CallName.MapBuilderAdd";
+      return s;
+    }
+  }
+  public class CallName_MapBuilderBuild : CallName {
+    public CallName_MapBuilderBuild() : base() {
+    }
+    public override _ICallName DowncastClone() {
+      if (this is _ICallName dt) { return dt; }
+      return new CallName_MapBuilderBuild();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.CallName_MapBuilderBuild;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.CallName.MapBuilderBuild";
+      return s;
+    }
+  }
+  public class CallName_SetBuilderAdd : CallName {
+    public CallName_SetBuilderAdd() : base() {
+    }
+    public override _ICallName DowncastClone() {
+      if (this is _ICallName dt) { return dt; }
+      return new CallName_SetBuilderAdd();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.CallName_SetBuilderAdd;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.CallName.SetBuilderAdd";
+      return s;
+    }
+  }
+  public class CallName_SetBuilderBuild : CallName {
+    public CallName_SetBuilderBuild() : base() {
+    }
+    public override _ICallName DowncastClone() {
+      if (this is _ICallName dt) { return dt; }
+      return new CallName_SetBuilderBuild();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.CallName_SetBuilderBuild;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.CallName.SetBuilderBuild";
+      return s;
+    }
+  }
+
+  public interface _IStatement {
+    bool is_DeclareVar { get; }
+    bool is_Assign { get; }
+    bool is_If { get; }
+    bool is_Labeled { get; }
+    bool is_While { get; }
+    bool is_Foreach { get; }
+    bool is_Call { get; }
+    bool is_Return { get; }
+    bool is_EarlyReturn { get; }
+    bool is_Break { get; }
+    bool is_TailRecursive { get; }
+    bool is_JumpTailCallStart { get; }
+    bool is_Halt { get; }
+    bool is_Print { get; }
+    bool is_ConstructorNewSeparator { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    DAST._IType dtor_typ { get; }
+    Std.Wrappers._IOption<DAST._IExpression> dtor_maybeValue { get; }
+    DAST._IAssignLhs dtor_lhs { get; }
+    DAST._IExpression dtor_value { get; }
+    DAST._IExpression dtor_cond { get; }
+    Dafny.ISequence<DAST._IStatement> dtor_thn { get; }
+    Dafny.ISequence<DAST._IStatement> dtor_els { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_lbl { get; }
+    Dafny.ISequence<DAST._IStatement> dtor_body { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_boundName { get; }
+    DAST._IType dtor_boundType { get; }
+    DAST._IExpression dtor_over { get; }
+    DAST._IExpression dtor_on { get; }
+    DAST._ICallName dtor_callName { get; }
+    Dafny.ISequence<DAST._IType> dtor_typeArgs { get; }
+    Dafny.ISequence<DAST._IExpression> dtor_args { get; }
+    Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_outs { get; }
+    DAST._IExpression dtor_expr { get; }
+    Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> dtor_toLabel { get; }
+    DAST._IExpression dtor_Print_a0 { get; }
+    Dafny.ISequence<DAST._IField> dtor_fields { get; }
+    _IStatement DowncastClone();
+  }
+  public abstract class Statement : _IStatement {
+    public Statement() {
+    }
+    private static readonly DAST._IStatement theDefault = create_DeclareVar(Dafny.Sequence<Dafny.Rune>.Empty, DAST.Type.Default(), Std.Wrappers.Option<DAST._IExpression>.Default());
+    public static DAST._IStatement Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IStatement> _TYPE = new Dafny.TypeDescriptor<DAST._IStatement>(DAST.Statement.Default());
+    public static Dafny.TypeDescriptor<DAST._IStatement> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IStatement create_DeclareVar(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ, Std.Wrappers._IOption<DAST._IExpression> maybeValue) {
+      return new Statement_DeclareVar(name, typ, maybeValue);
+    }
+    public static _IStatement create_Assign(DAST._IAssignLhs lhs, DAST._IExpression @value) {
+      return new Statement_Assign(lhs, @value);
+    }
+    public static _IStatement create_If(DAST._IExpression cond, Dafny.ISequence<DAST._IStatement> thn, Dafny.ISequence<DAST._IStatement> els) {
+      return new Statement_If(cond, thn, els);
+    }
+    public static _IStatement create_Labeled(Dafny.ISequence<Dafny.Rune> lbl, Dafny.ISequence<DAST._IStatement> body) {
+      return new Statement_Labeled(lbl, body);
+    }
+    public static _IStatement create_While(DAST._IExpression cond, Dafny.ISequence<DAST._IStatement> body) {
+      return new Statement_While(cond, body);
+    }
+    public static _IStatement create_Foreach(Dafny.ISequence<Dafny.Rune> boundName, DAST._IType boundType, DAST._IExpression over, Dafny.ISequence<DAST._IStatement> body) {
+      return new Statement_Foreach(boundName, boundType, over, body);
+    }
+    public static _IStatement create_Call(DAST._IExpression @on, DAST._ICallName callName, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args, Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> outs) {
+      return new Statement_Call(@on, callName, typeArgs, args, outs);
+    }
+    public static _IStatement create_Return(DAST._IExpression expr) {
+      return new Statement_Return(expr);
+    }
+    public static _IStatement create_EarlyReturn() {
+      return new Statement_EarlyReturn();
+    }
+    public static _IStatement create_Break(Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> toLabel) {
+      return new Statement_Break(toLabel);
+    }
+    public static _IStatement create_TailRecursive(Dafny.ISequence<DAST._IStatement> body) {
+      return new Statement_TailRecursive(body);
+    }
+    public static _IStatement create_JumpTailCallStart() {
+      return new Statement_JumpTailCallStart();
+    }
+    public static _IStatement create_Halt() {
+      return new Statement_Halt();
+    }
+    public static _IStatement create_Print(DAST._IExpression _a0) {
+      return new Statement_Print(_a0);
+    }
+    public static _IStatement create_ConstructorNewSeparator(Dafny.ISequence<DAST._IField> fields) {
+      return new Statement_ConstructorNewSeparator(fields);
+    }
+    public bool is_DeclareVar { get { return this is Statement_DeclareVar; } }
+    public bool is_Assign { get { return this is Statement_Assign; } }
+    public bool is_If { get { return this is Statement_If; } }
+    public bool is_Labeled { get { return this is Statement_Labeled; } }
+    public bool is_While { get { return this is Statement_While; } }
+    public bool is_Foreach { get { return this is Statement_Foreach; } }
+    public bool is_Call { get { return this is Statement_Call; } }
+    public bool is_Return { get { return this is Statement_Return; } }
+    public bool is_EarlyReturn { get { return this is Statement_EarlyReturn; } }
+    public bool is_Break { get { return this is Statement_Break; } }
+    public bool is_TailRecursive { get { return this is Statement_TailRecursive; } }
+    public bool is_JumpTailCallStart { get { return this is Statement_JumpTailCallStart; } }
+    public bool is_Halt { get { return this is Statement_Halt; } }
+    public bool is_Print { get { return this is Statement_Print; } }
+    public bool is_ConstructorNewSeparator { get { return this is Statement_ConstructorNewSeparator; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        var d = this;
+        return ((Statement_DeclareVar)d)._name;
+      }
+    }
+    public DAST._IType dtor_typ {
+      get {
+        var d = this;
+        return ((Statement_DeclareVar)d)._typ;
+      }
+    }
+    public Std.Wrappers._IOption<DAST._IExpression> dtor_maybeValue {
+      get {
+        var d = this;
+        return ((Statement_DeclareVar)d)._maybeValue;
+      }
+    }
+    public DAST._IAssignLhs dtor_lhs {
+      get {
+        var d = this;
+        return ((Statement_Assign)d)._lhs;
+      }
+    }
+    public DAST._IExpression dtor_value {
+      get {
+        var d = this;
+        return ((Statement_Assign)d)._value;
+      }
+    }
+    public DAST._IExpression dtor_cond {
+      get {
+        var d = this;
+        if (d is Statement_If) { return ((Statement_If)d)._cond; }
+        return ((Statement_While)d)._cond;
+      }
+    }
+    public Dafny.ISequence<DAST._IStatement> dtor_thn {
+      get {
+        var d = this;
+        return ((Statement_If)d)._thn;
+      }
+    }
+    public Dafny.ISequence<DAST._IStatement> dtor_els {
+      get {
+        var d = this;
+        return ((Statement_If)d)._els;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_lbl {
+      get {
+        var d = this;
+        return ((Statement_Labeled)d)._lbl;
+      }
+    }
+    public Dafny.ISequence<DAST._IStatement> dtor_body {
+      get {
+        var d = this;
+        if (d is Statement_Labeled) { return ((Statement_Labeled)d)._body; }
+        if (d is Statement_While) { return ((Statement_While)d)._body; }
+        if (d is Statement_Foreach) { return ((Statement_Foreach)d)._body; }
+        return ((Statement_TailRecursive)d)._body;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_boundName {
+      get {
+        var d = this;
+        return ((Statement_Foreach)d)._boundName;
+      }
+    }
+    public DAST._IType dtor_boundType {
+      get {
+        var d = this;
+        return ((Statement_Foreach)d)._boundType;
+      }
+    }
+    public DAST._IExpression dtor_over {
+      get {
+        var d = this;
+        return ((Statement_Foreach)d)._over;
+      }
+    }
+    public DAST._IExpression dtor_on {
+      get {
+        var d = this;
+        return ((Statement_Call)d)._on;
+      }
+    }
+    public DAST._ICallName dtor_callName {
+      get {
+        var d = this;
+        return ((Statement_Call)d)._callName;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_typeArgs {
+      get {
+        var d = this;
+        return ((Statement_Call)d)._typeArgs;
+      }
+    }
+    public Dafny.ISequence<DAST._IExpression> dtor_args {
+      get {
+        var d = this;
+        return ((Statement_Call)d)._args;
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_outs {
+      get {
+        var d = this;
+        return ((Statement_Call)d)._outs;
+      }
+    }
+    public DAST._IExpression dtor_expr {
+      get {
+        var d = this;
+        return ((Statement_Return)d)._expr;
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> dtor_toLabel {
+      get {
+        var d = this;
+        return ((Statement_Break)d)._toLabel;
+      }
+    }
+    public DAST._IExpression dtor_Print_a0 {
+      get {
+        var d = this;
+        return ((Statement_Print)d)._a0;
+      }
+    }
+    public Dafny.ISequence<DAST._IField> dtor_fields {
+      get {
+        var d = this;
+        return ((Statement_ConstructorNewSeparator)d)._fields;
+      }
+    }
+    public abstract _IStatement DowncastClone();
+  }
+  public class Statement_DeclareVar : Statement {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly DAST._IType _typ;
+    public readonly Std.Wrappers._IOption<DAST._IExpression> _maybeValue;
+    public Statement_DeclareVar(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ, Std.Wrappers._IOption<DAST._IExpression> maybeValue) : base() {
+      this._name = name;
+      this._typ = typ;
+      this._maybeValue = maybeValue;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_DeclareVar(_name, _typ, _maybeValue);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_DeclareVar;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._typ, oth._typ) && object.Equals(this._maybeValue, oth._maybeValue);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._maybeValue));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.DeclareVar";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typ);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._maybeValue);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_Assign : Statement {
+    public readonly DAST._IAssignLhs _lhs;
+    public readonly DAST._IExpression _value;
+    public Statement_Assign(DAST._IAssignLhs lhs, DAST._IExpression @value) : base() {
+      this._lhs = lhs;
+      this._value = @value;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_Assign(_lhs, _value);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_Assign;
+      return oth != null && object.Equals(this._lhs, oth._lhs) && object.Equals(this._value, oth._value);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._lhs));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.Assign";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._lhs);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_If : Statement {
+    public readonly DAST._IExpression _cond;
+    public readonly Dafny.ISequence<DAST._IStatement> _thn;
+    public readonly Dafny.ISequence<DAST._IStatement> _els;
+    public Statement_If(DAST._IExpression cond, Dafny.ISequence<DAST._IStatement> thn, Dafny.ISequence<DAST._IStatement> els) : base() {
+      this._cond = cond;
+      this._thn = thn;
+      this._els = els;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_If(_cond, _thn, _els);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_If;
+      return oth != null && object.Equals(this._cond, oth._cond) && object.Equals(this._thn, oth._thn) && object.Equals(this._els, oth._els);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._cond));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._thn));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._els));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.If";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._cond);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._thn);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._els);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_Labeled : Statement {
+    public readonly Dafny.ISequence<Dafny.Rune> _lbl;
+    public readonly Dafny.ISequence<DAST._IStatement> _body;
+    public Statement_Labeled(Dafny.ISequence<Dafny.Rune> lbl, Dafny.ISequence<DAST._IStatement> body) : base() {
+      this._lbl = lbl;
+      this._body = body;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_Labeled(_lbl, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_Labeled;
+      return oth != null && object.Equals(this._lbl, oth._lbl) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._lbl));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.Labeled";
+      s += "(";
+      s += this._lbl.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_While : Statement {
+    public readonly DAST._IExpression _cond;
+    public readonly Dafny.ISequence<DAST._IStatement> _body;
+    public Statement_While(DAST._IExpression cond, Dafny.ISequence<DAST._IStatement> body) : base() {
+      this._cond = cond;
+      this._body = body;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_While(_cond, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_While;
+      return oth != null && object.Equals(this._cond, oth._cond) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._cond));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.While";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._cond);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_Foreach : Statement {
+    public readonly Dafny.ISequence<Dafny.Rune> _boundName;
+    public readonly DAST._IType _boundType;
+    public readonly DAST._IExpression _over;
+    public readonly Dafny.ISequence<DAST._IStatement> _body;
+    public Statement_Foreach(Dafny.ISequence<Dafny.Rune> boundName, DAST._IType boundType, DAST._IExpression over, Dafny.ISequence<DAST._IStatement> body) : base() {
+      this._boundName = boundName;
+      this._boundType = boundType;
+      this._over = over;
+      this._body = body;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_Foreach(_boundName, _boundType, _over, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_Foreach;
+      return oth != null && object.Equals(this._boundName, oth._boundName) && object.Equals(this._boundType, oth._boundType) && object.Equals(this._over, oth._over) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._boundName));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._boundType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._over));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.Foreach";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._boundName);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._boundType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._over);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_Call : Statement {
+    public readonly DAST._IExpression _on;
+    public readonly DAST._ICallName _callName;
+    public readonly Dafny.ISequence<DAST._IType> _typeArgs;
+    public readonly Dafny.ISequence<DAST._IExpression> _args;
+    public readonly Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _outs;
+    public Statement_Call(DAST._IExpression @on, DAST._ICallName callName, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args, Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> outs) : base() {
+      this._on = @on;
+      this._callName = callName;
+      this._typeArgs = typeArgs;
+      this._args = args;
+      this._outs = outs;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_Call(_on, _callName, _typeArgs, _args, _outs);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_Call;
+      return oth != null && object.Equals(this._on, oth._on) && object.Equals(this._callName, oth._callName) && object.Equals(this._typeArgs, oth._typeArgs) && object.Equals(this._args, oth._args) && object.Equals(this._outs, oth._outs);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 6;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._on));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._callName));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeArgs));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._outs));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.Call";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._on);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._callName);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeArgs);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._args);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._outs);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_Return : Statement {
+    public readonly DAST._IExpression _expr;
+    public Statement_Return(DAST._IExpression expr) : base() {
+      this._expr = expr;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_Return(_expr);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_Return;
+      return oth != null && object.Equals(this._expr, oth._expr);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 7;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.Return";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_EarlyReturn : Statement {
+    public Statement_EarlyReturn() : base() {
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_EarlyReturn();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_EarlyReturn;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 8;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.EarlyReturn";
+      return s;
+    }
+  }
+  public class Statement_Break : Statement {
+    public readonly Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _toLabel;
+    public Statement_Break(Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> toLabel) : base() {
+      this._toLabel = toLabel;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_Break(_toLabel);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_Break;
+      return oth != null && object.Equals(this._toLabel, oth._toLabel);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 9;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._toLabel));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.Break";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._toLabel);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_TailRecursive : Statement {
+    public readonly Dafny.ISequence<DAST._IStatement> _body;
+    public Statement_TailRecursive(Dafny.ISequence<DAST._IStatement> body) : base() {
+      this._body = body;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_TailRecursive(_body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_TailRecursive;
+      return oth != null && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 10;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.TailRecursive";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_JumpTailCallStart : Statement {
+    public Statement_JumpTailCallStart() : base() {
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_JumpTailCallStart();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_JumpTailCallStart;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 11;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.JumpTailCallStart";
+      return s;
+    }
+  }
+  public class Statement_Halt : Statement {
+    public Statement_Halt() : base() {
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_Halt();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_Halt;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 12;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.Halt";
+      return s;
+    }
+  }
+  public class Statement_Print : Statement {
+    public readonly DAST._IExpression _a0;
+    public Statement_Print(DAST._IExpression _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_Print(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_Print;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 13;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.Print";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Statement_ConstructorNewSeparator : Statement {
+    public readonly Dafny.ISequence<DAST._IField> _fields;
+    public Statement_ConstructorNewSeparator(Dafny.ISequence<DAST._IField> fields) : base() {
+      this._fields = fields;
+    }
+    public override _IStatement DowncastClone() {
+      if (this is _IStatement dt) { return dt; }
+      return new Statement_ConstructorNewSeparator(_fields);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Statement_ConstructorNewSeparator;
+      return oth != null && object.Equals(this._fields, oth._fields);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 14;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fields));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Statement.ConstructorNewSeparator";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._fields);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IAssignLhs {
+    bool is_Ident { get; }
+    bool is_Select { get; }
+    bool is_Index { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_ident { get; }
+    DAST._IExpression dtor_expr { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_field { get; }
+    bool dtor_isConstant { get; }
+    Dafny.ISequence<DAST._IExpression> dtor_indices { get; }
+    _IAssignLhs DowncastClone();
+  }
+  public abstract class AssignLhs : _IAssignLhs {
+    public AssignLhs() {
+    }
+    private static readonly DAST._IAssignLhs theDefault = create_Ident(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static DAST._IAssignLhs Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IAssignLhs> _TYPE = new Dafny.TypeDescriptor<DAST._IAssignLhs>(DAST.AssignLhs.Default());
+    public static Dafny.TypeDescriptor<DAST._IAssignLhs> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IAssignLhs create_Ident(Dafny.ISequence<Dafny.Rune> ident) {
+      return new AssignLhs_Ident(ident);
+    }
+    public static _IAssignLhs create_Select(DAST._IExpression expr, Dafny.ISequence<Dafny.Rune> field, bool isConstant) {
+      return new AssignLhs_Select(expr, field, isConstant);
+    }
+    public static _IAssignLhs create_Index(DAST._IExpression expr, Dafny.ISequence<DAST._IExpression> indices) {
+      return new AssignLhs_Index(expr, indices);
+    }
+    public bool is_Ident { get { return this is AssignLhs_Ident; } }
+    public bool is_Select { get { return this is AssignLhs_Select; } }
+    public bool is_Index { get { return this is AssignLhs_Index; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_ident {
+      get {
+        var d = this;
+        return ((AssignLhs_Ident)d)._ident;
+      }
+    }
+    public DAST._IExpression dtor_expr {
+      get {
+        var d = this;
+        if (d is AssignLhs_Select) { return ((AssignLhs_Select)d)._expr; }
+        return ((AssignLhs_Index)d)._expr;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_field {
+      get {
+        var d = this;
+        return ((AssignLhs_Select)d)._field;
+      }
+    }
+    public bool dtor_isConstant {
+      get {
+        var d = this;
+        return ((AssignLhs_Select)d)._isConstant;
+      }
+    }
+    public Dafny.ISequence<DAST._IExpression> dtor_indices {
+      get {
+        var d = this;
+        return ((AssignLhs_Index)d)._indices;
+      }
+    }
+    public abstract _IAssignLhs DowncastClone();
+  }
+  public class AssignLhs_Ident : AssignLhs {
+    public readonly Dafny.ISequence<Dafny.Rune> _ident;
+    public AssignLhs_Ident(Dafny.ISequence<Dafny.Rune> ident) : base() {
+      this._ident = ident;
+    }
+    public override _IAssignLhs DowncastClone() {
+      if (this is _IAssignLhs dt) { return dt; }
+      return new AssignLhs_Ident(_ident);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.AssignLhs_Ident;
+      return oth != null && object.Equals(this._ident, oth._ident);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._ident));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.AssignLhs.Ident";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._ident);
+      s += ")";
+      return s;
+    }
+  }
+  public class AssignLhs_Select : AssignLhs {
+    public readonly DAST._IExpression _expr;
+    public readonly Dafny.ISequence<Dafny.Rune> _field;
+    public readonly bool _isConstant;
+    public AssignLhs_Select(DAST._IExpression expr, Dafny.ISequence<Dafny.Rune> field, bool isConstant) : base() {
+      this._expr = expr;
+      this._field = field;
+      this._isConstant = isConstant;
+    }
+    public override _IAssignLhs DowncastClone() {
+      if (this is _IAssignLhs dt) { return dt; }
+      return new AssignLhs_Select(_expr, _field, _isConstant);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.AssignLhs_Select;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._field, oth._field) && this._isConstant == oth._isConstant;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._field));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isConstant));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.AssignLhs.Select";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._field);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._isConstant);
+      s += ")";
+      return s;
+    }
+  }
+  public class AssignLhs_Index : AssignLhs {
+    public readonly DAST._IExpression _expr;
+    public readonly Dafny.ISequence<DAST._IExpression> _indices;
+    public AssignLhs_Index(DAST._IExpression expr, Dafny.ISequence<DAST._IExpression> indices) : base() {
+      this._expr = expr;
+      this._indices = indices;
+    }
+    public override _IAssignLhs DowncastClone() {
+      if (this is _IAssignLhs dt) { return dt; }
+      return new AssignLhs_Index(_expr, _indices);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.AssignLhs_Index;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._indices, oth._indices);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._indices));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.AssignLhs.Index";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._indices);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _ICollKind {
+    bool is_Seq { get; }
+    bool is_Array { get; }
+    bool is_Map { get; }
+    _ICollKind DowncastClone();
+  }
+  public abstract class CollKind : _ICollKind {
+    public CollKind() {
+    }
+    private static readonly DAST._ICollKind theDefault = create_Seq();
+    public static DAST._ICollKind Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._ICollKind> _TYPE = new Dafny.TypeDescriptor<DAST._ICollKind>(DAST.CollKind.Default());
+    public static Dafny.TypeDescriptor<DAST._ICollKind> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ICollKind create_Seq() {
+      return new CollKind_Seq();
+    }
+    public static _ICollKind create_Array() {
+      return new CollKind_Array();
+    }
+    public static _ICollKind create_Map() {
+      return new CollKind_Map();
+    }
+    public bool is_Seq { get { return this is CollKind_Seq; } }
+    public bool is_Array { get { return this is CollKind_Array; } }
+    public bool is_Map { get { return this is CollKind_Map; } }
+    public static System.Collections.Generic.IEnumerable<_ICollKind> AllSingletonConstructors {
+      get {
+        yield return CollKind.create_Seq();
+        yield return CollKind.create_Array();
+        yield return CollKind.create_Map();
+      }
+    }
+    public abstract _ICollKind DowncastClone();
+  }
+  public class CollKind_Seq : CollKind {
+    public CollKind_Seq() : base() {
+    }
+    public override _ICollKind DowncastClone() {
+      if (this is _ICollKind dt) { return dt; }
+      return new CollKind_Seq();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.CollKind_Seq;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.CollKind.Seq";
+      return s;
+    }
+  }
+  public class CollKind_Array : CollKind {
+    public CollKind_Array() : base() {
+    }
+    public override _ICollKind DowncastClone() {
+      if (this is _ICollKind dt) { return dt; }
+      return new CollKind_Array();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.CollKind_Array;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.CollKind.Array";
+      return s;
+    }
+  }
+  public class CollKind_Map : CollKind {
+    public CollKind_Map() : base() {
+    }
+    public override _ICollKind DowncastClone() {
+      if (this is _ICollKind dt) { return dt; }
+      return new CollKind_Map();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.CollKind_Map;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.CollKind.Map";
+      return s;
+    }
+  }
+
+  public interface _ITypedBinOp {
+    bool is_TypedBinOp { get; }
+    DAST._IBinOp dtor_op { get; }
+    DAST._IType dtor_leftType { get; }
+    DAST._IType dtor_rightType { get; }
+    DAST._IType dtor_resultType { get; }
+    _ITypedBinOp DowncastClone();
+  }
+  public class TypedBinOp : _ITypedBinOp {
+    public readonly DAST._IBinOp _op;
+    public readonly DAST._IType _leftType;
+    public readonly DAST._IType _rightType;
+    public readonly DAST._IType _resultType;
+    public TypedBinOp(DAST._IBinOp op, DAST._IType leftType, DAST._IType rightType, DAST._IType resultType) {
+      this._op = op;
+      this._leftType = leftType;
+      this._rightType = rightType;
+      this._resultType = resultType;
+    }
+    public _ITypedBinOp DowncastClone() {
+      if (this is _ITypedBinOp dt) { return dt; }
+      return new TypedBinOp(_op, _leftType, _rightType, _resultType);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.TypedBinOp;
+      return oth != null && object.Equals(this._op, oth._op) && object.Equals(this._leftType, oth._leftType) && object.Equals(this._rightType, oth._rightType) && object.Equals(this._resultType, oth._resultType);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._op));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._leftType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._rightType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._resultType));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.TypedBinOp.TypedBinOp";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._op);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._leftType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._rightType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._resultType);
+      s += ")";
+      return s;
+    }
+    private static readonly DAST._ITypedBinOp theDefault = create(DAST.BinOp.Default(), DAST.Type.Default(), DAST.Type.Default(), DAST.Type.Default());
+    public static DAST._ITypedBinOp Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._ITypedBinOp> _TYPE = new Dafny.TypeDescriptor<DAST._ITypedBinOp>(DAST.TypedBinOp.Default());
+    public static Dafny.TypeDescriptor<DAST._ITypedBinOp> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ITypedBinOp create(DAST._IBinOp op, DAST._IType leftType, DAST._IType rightType, DAST._IType resultType) {
+      return new TypedBinOp(op, leftType, rightType, resultType);
+    }
+    public static _ITypedBinOp create_TypedBinOp(DAST._IBinOp op, DAST._IType leftType, DAST._IType rightType, DAST._IType resultType) {
+      return create(op, leftType, rightType, resultType);
+    }
+    public bool is_TypedBinOp { get { return true; } }
+    public DAST._IBinOp dtor_op {
+      get {
+        return this._op;
+      }
+    }
+    public DAST._IType dtor_leftType {
+      get {
+        return this._leftType;
+      }
+    }
+    public DAST._IType dtor_rightType {
+      get {
+        return this._rightType;
+      }
+    }
+    public DAST._IType dtor_resultType {
+      get {
+        return this._resultType;
+      }
+    }
+  }
+
+  public interface _IBinOp {
+    bool is_Eq { get; }
+    bool is_Div { get; }
+    bool is_EuclidianDiv { get; }
+    bool is_Mod { get; }
+    bool is_EuclidianMod { get; }
+    bool is_Lt { get; }
+    bool is_LtChar { get; }
+    bool is_Plus { get; }
+    bool is_Minus { get; }
+    bool is_Times { get; }
+    bool is_BitwiseAnd { get; }
+    bool is_BitwiseOr { get; }
+    bool is_BitwiseXor { get; }
+    bool is_BitwiseShiftRight { get; }
+    bool is_BitwiseShiftLeft { get; }
+    bool is_And { get; }
+    bool is_Or { get; }
+    bool is_In { get; }
+    bool is_SeqProperPrefix { get; }
+    bool is_SeqPrefix { get; }
+    bool is_SetMerge { get; }
+    bool is_SetSubtraction { get; }
+    bool is_SetIntersection { get; }
+    bool is_Subset { get; }
+    bool is_ProperSubset { get; }
+    bool is_SetDisjoint { get; }
+    bool is_MapMerge { get; }
+    bool is_MapSubtraction { get; }
+    bool is_MultisetMerge { get; }
+    bool is_MultisetSubtraction { get; }
+    bool is_MultisetIntersection { get; }
+    bool is_Submultiset { get; }
+    bool is_ProperSubmultiset { get; }
+    bool is_MultisetDisjoint { get; }
+    bool is_Concat { get; }
+    bool is_Passthrough { get; }
+    bool dtor_referential { get; }
+    bool dtor_overflow { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_Passthrough_a0 { get; }
+    _IBinOp DowncastClone();
+  }
+  public abstract class BinOp : _IBinOp {
+    public BinOp() {
+    }
+    private static readonly DAST._IBinOp theDefault = create_Eq(false);
+    public static DAST._IBinOp Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IBinOp> _TYPE = new Dafny.TypeDescriptor<DAST._IBinOp>(DAST.BinOp.Default());
+    public static Dafny.TypeDescriptor<DAST._IBinOp> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IBinOp create_Eq(bool referential) {
+      return new BinOp_Eq(referential);
+    }
+    public static _IBinOp create_Div(bool overflow) {
+      return new BinOp_Div(overflow);
+    }
+    public static _IBinOp create_EuclidianDiv() {
+      return new BinOp_EuclidianDiv();
+    }
+    public static _IBinOp create_Mod() {
+      return new BinOp_Mod();
+    }
+    public static _IBinOp create_EuclidianMod() {
+      return new BinOp_EuclidianMod();
+    }
+    public static _IBinOp create_Lt() {
+      return new BinOp_Lt();
+    }
+    public static _IBinOp create_LtChar() {
+      return new BinOp_LtChar();
+    }
+    public static _IBinOp create_Plus(bool overflow) {
+      return new BinOp_Plus(overflow);
+    }
+    public static _IBinOp create_Minus(bool overflow) {
+      return new BinOp_Minus(overflow);
+    }
+    public static _IBinOp create_Times(bool overflow) {
+      return new BinOp_Times(overflow);
+    }
+    public static _IBinOp create_BitwiseAnd() {
+      return new BinOp_BitwiseAnd();
+    }
+    public static _IBinOp create_BitwiseOr() {
+      return new BinOp_BitwiseOr();
+    }
+    public static _IBinOp create_BitwiseXor() {
+      return new BinOp_BitwiseXor();
+    }
+    public static _IBinOp create_BitwiseShiftRight() {
+      return new BinOp_BitwiseShiftRight();
+    }
+    public static _IBinOp create_BitwiseShiftLeft() {
+      return new BinOp_BitwiseShiftLeft();
+    }
+    public static _IBinOp create_And() {
+      return new BinOp_And();
+    }
+    public static _IBinOp create_Or() {
+      return new BinOp_Or();
+    }
+    public static _IBinOp create_In() {
+      return new BinOp_In();
+    }
+    public static _IBinOp create_SeqProperPrefix() {
+      return new BinOp_SeqProperPrefix();
+    }
+    public static _IBinOp create_SeqPrefix() {
+      return new BinOp_SeqPrefix();
+    }
+    public static _IBinOp create_SetMerge() {
+      return new BinOp_SetMerge();
+    }
+    public static _IBinOp create_SetSubtraction() {
+      return new BinOp_SetSubtraction();
+    }
+    public static _IBinOp create_SetIntersection() {
+      return new BinOp_SetIntersection();
+    }
+    public static _IBinOp create_Subset() {
+      return new BinOp_Subset();
+    }
+    public static _IBinOp create_ProperSubset() {
+      return new BinOp_ProperSubset();
+    }
+    public static _IBinOp create_SetDisjoint() {
+      return new BinOp_SetDisjoint();
+    }
+    public static _IBinOp create_MapMerge() {
+      return new BinOp_MapMerge();
+    }
+    public static _IBinOp create_MapSubtraction() {
+      return new BinOp_MapSubtraction();
+    }
+    public static _IBinOp create_MultisetMerge() {
+      return new BinOp_MultisetMerge();
+    }
+    public static _IBinOp create_MultisetSubtraction() {
+      return new BinOp_MultisetSubtraction();
+    }
+    public static _IBinOp create_MultisetIntersection() {
+      return new BinOp_MultisetIntersection();
+    }
+    public static _IBinOp create_Submultiset() {
+      return new BinOp_Submultiset();
+    }
+    public static _IBinOp create_ProperSubmultiset() {
+      return new BinOp_ProperSubmultiset();
+    }
+    public static _IBinOp create_MultisetDisjoint() {
+      return new BinOp_MultisetDisjoint();
+    }
+    public static _IBinOp create_Concat() {
+      return new BinOp_Concat();
+    }
+    public static _IBinOp create_Passthrough(Dafny.ISequence<Dafny.Rune> _a0) {
+      return new BinOp_Passthrough(_a0);
+    }
+    public bool is_Eq { get { return this is BinOp_Eq; } }
+    public bool is_Div { get { return this is BinOp_Div; } }
+    public bool is_EuclidianDiv { get { return this is BinOp_EuclidianDiv; } }
+    public bool is_Mod { get { return this is BinOp_Mod; } }
+    public bool is_EuclidianMod { get { return this is BinOp_EuclidianMod; } }
+    public bool is_Lt { get { return this is BinOp_Lt; } }
+    public bool is_LtChar { get { return this is BinOp_LtChar; } }
+    public bool is_Plus { get { return this is BinOp_Plus; } }
+    public bool is_Minus { get { return this is BinOp_Minus; } }
+    public bool is_Times { get { return this is BinOp_Times; } }
+    public bool is_BitwiseAnd { get { return this is BinOp_BitwiseAnd; } }
+    public bool is_BitwiseOr { get { return this is BinOp_BitwiseOr; } }
+    public bool is_BitwiseXor { get { return this is BinOp_BitwiseXor; } }
+    public bool is_BitwiseShiftRight { get { return this is BinOp_BitwiseShiftRight; } }
+    public bool is_BitwiseShiftLeft { get { return this is BinOp_BitwiseShiftLeft; } }
+    public bool is_And { get { return this is BinOp_And; } }
+    public bool is_Or { get { return this is BinOp_Or; } }
+    public bool is_In { get { return this is BinOp_In; } }
+    public bool is_SeqProperPrefix { get { return this is BinOp_SeqProperPrefix; } }
+    public bool is_SeqPrefix { get { return this is BinOp_SeqPrefix; } }
+    public bool is_SetMerge { get { return this is BinOp_SetMerge; } }
+    public bool is_SetSubtraction { get { return this is BinOp_SetSubtraction; } }
+    public bool is_SetIntersection { get { return this is BinOp_SetIntersection; } }
+    public bool is_Subset { get { return this is BinOp_Subset; } }
+    public bool is_ProperSubset { get { return this is BinOp_ProperSubset; } }
+    public bool is_SetDisjoint { get { return this is BinOp_SetDisjoint; } }
+    public bool is_MapMerge { get { return this is BinOp_MapMerge; } }
+    public bool is_MapSubtraction { get { return this is BinOp_MapSubtraction; } }
+    public bool is_MultisetMerge { get { return this is BinOp_MultisetMerge; } }
+    public bool is_MultisetSubtraction { get { return this is BinOp_MultisetSubtraction; } }
+    public bool is_MultisetIntersection { get { return this is BinOp_MultisetIntersection; } }
+    public bool is_Submultiset { get { return this is BinOp_Submultiset; } }
+    public bool is_ProperSubmultiset { get { return this is BinOp_ProperSubmultiset; } }
+    public bool is_MultisetDisjoint { get { return this is BinOp_MultisetDisjoint; } }
+    public bool is_Concat { get { return this is BinOp_Concat; } }
+    public bool is_Passthrough { get { return this is BinOp_Passthrough; } }
+    public bool dtor_referential {
+      get {
+        var d = this;
+        return ((BinOp_Eq)d)._referential;
+      }
+    }
+    public bool dtor_overflow {
+      get {
+        var d = this;
+        if (d is BinOp_Div) { return ((BinOp_Div)d)._overflow; }
+        if (d is BinOp_Plus) { return ((BinOp_Plus)d)._overflow; }
+        if (d is BinOp_Minus) { return ((BinOp_Minus)d)._overflow; }
+        return ((BinOp_Times)d)._overflow;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_Passthrough_a0 {
+      get {
+        var d = this;
+        return ((BinOp_Passthrough)d)._a0;
+      }
+    }
+    public abstract _IBinOp DowncastClone();
+  }
+  public class BinOp_Eq : BinOp {
+    public readonly bool _referential;
+    public BinOp_Eq(bool referential) : base() {
+      this._referential = referential;
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Eq(_referential);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Eq;
+      return oth != null && this._referential == oth._referential;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._referential));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Eq";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._referential);
+      s += ")";
+      return s;
+    }
+  }
+  public class BinOp_Div : BinOp {
+    public readonly bool _overflow;
+    public BinOp_Div(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Div(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Div;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Div";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class BinOp_EuclidianDiv : BinOp {
+    public BinOp_EuclidianDiv() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_EuclidianDiv();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_EuclidianDiv;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.EuclidianDiv";
+      return s;
+    }
+  }
+  public class BinOp_Mod : BinOp {
+    public BinOp_Mod() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Mod();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Mod;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Mod";
+      return s;
+    }
+  }
+  public class BinOp_EuclidianMod : BinOp {
+    public BinOp_EuclidianMod() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_EuclidianMod();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_EuclidianMod;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.EuclidianMod";
+      return s;
+    }
+  }
+  public class BinOp_Lt : BinOp {
+    public BinOp_Lt() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Lt();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Lt;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Lt";
+      return s;
+    }
+  }
+  public class BinOp_LtChar : BinOp {
+    public BinOp_LtChar() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_LtChar();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_LtChar;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 6;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.LtChar";
+      return s;
+    }
+  }
+  public class BinOp_Plus : BinOp {
+    public readonly bool _overflow;
+    public BinOp_Plus(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Plus(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Plus;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 7;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Plus";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class BinOp_Minus : BinOp {
+    public readonly bool _overflow;
+    public BinOp_Minus(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Minus(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Minus;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 8;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Minus";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class BinOp_Times : BinOp {
+    public readonly bool _overflow;
+    public BinOp_Times(bool overflow) : base() {
+      this._overflow = overflow;
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Times(_overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Times;
+      return oth != null && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 9;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Times";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+  public class BinOp_BitwiseAnd : BinOp {
+    public BinOp_BitwiseAnd() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_BitwiseAnd();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_BitwiseAnd;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 10;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.BitwiseAnd";
+      return s;
+    }
+  }
+  public class BinOp_BitwiseOr : BinOp {
+    public BinOp_BitwiseOr() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_BitwiseOr();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_BitwiseOr;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 11;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.BitwiseOr";
+      return s;
+    }
+  }
+  public class BinOp_BitwiseXor : BinOp {
+    public BinOp_BitwiseXor() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_BitwiseXor();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_BitwiseXor;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 12;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.BitwiseXor";
+      return s;
+    }
+  }
+  public class BinOp_BitwiseShiftRight : BinOp {
+    public BinOp_BitwiseShiftRight() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_BitwiseShiftRight();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_BitwiseShiftRight;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 13;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.BitwiseShiftRight";
+      return s;
+    }
+  }
+  public class BinOp_BitwiseShiftLeft : BinOp {
+    public BinOp_BitwiseShiftLeft() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_BitwiseShiftLeft();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_BitwiseShiftLeft;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 14;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.BitwiseShiftLeft";
+      return s;
+    }
+  }
+  public class BinOp_And : BinOp {
+    public BinOp_And() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_And();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_And;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 15;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.And";
+      return s;
+    }
+  }
+  public class BinOp_Or : BinOp {
+    public BinOp_Or() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Or();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Or;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 16;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Or";
+      return s;
+    }
+  }
+  public class BinOp_In : BinOp {
+    public BinOp_In() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_In();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_In;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 17;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.In";
+      return s;
+    }
+  }
+  public class BinOp_SeqProperPrefix : BinOp {
+    public BinOp_SeqProperPrefix() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_SeqProperPrefix();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_SeqProperPrefix;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 18;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.SeqProperPrefix";
+      return s;
+    }
+  }
+  public class BinOp_SeqPrefix : BinOp {
+    public BinOp_SeqPrefix() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_SeqPrefix();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_SeqPrefix;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 19;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.SeqPrefix";
+      return s;
+    }
+  }
+  public class BinOp_SetMerge : BinOp {
+    public BinOp_SetMerge() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_SetMerge();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_SetMerge;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 20;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.SetMerge";
+      return s;
+    }
+  }
+  public class BinOp_SetSubtraction : BinOp {
+    public BinOp_SetSubtraction() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_SetSubtraction();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_SetSubtraction;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 21;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.SetSubtraction";
+      return s;
+    }
+  }
+  public class BinOp_SetIntersection : BinOp {
+    public BinOp_SetIntersection() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_SetIntersection();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_SetIntersection;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 22;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.SetIntersection";
+      return s;
+    }
+  }
+  public class BinOp_Subset : BinOp {
+    public BinOp_Subset() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Subset();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Subset;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 23;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Subset";
+      return s;
+    }
+  }
+  public class BinOp_ProperSubset : BinOp {
+    public BinOp_ProperSubset() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_ProperSubset();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_ProperSubset;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 24;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.ProperSubset";
+      return s;
+    }
+  }
+  public class BinOp_SetDisjoint : BinOp {
+    public BinOp_SetDisjoint() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_SetDisjoint();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_SetDisjoint;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 25;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.SetDisjoint";
+      return s;
+    }
+  }
+  public class BinOp_MapMerge : BinOp {
+    public BinOp_MapMerge() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_MapMerge();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_MapMerge;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 26;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.MapMerge";
+      return s;
+    }
+  }
+  public class BinOp_MapSubtraction : BinOp {
+    public BinOp_MapSubtraction() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_MapSubtraction();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_MapSubtraction;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 27;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.MapSubtraction";
+      return s;
+    }
+  }
+  public class BinOp_MultisetMerge : BinOp {
+    public BinOp_MultisetMerge() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_MultisetMerge();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_MultisetMerge;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 28;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.MultisetMerge";
+      return s;
+    }
+  }
+  public class BinOp_MultisetSubtraction : BinOp {
+    public BinOp_MultisetSubtraction() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_MultisetSubtraction();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_MultisetSubtraction;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 29;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.MultisetSubtraction";
+      return s;
+    }
+  }
+  public class BinOp_MultisetIntersection : BinOp {
+    public BinOp_MultisetIntersection() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_MultisetIntersection();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_MultisetIntersection;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 30;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.MultisetIntersection";
+      return s;
+    }
+  }
+  public class BinOp_Submultiset : BinOp {
+    public BinOp_Submultiset() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Submultiset();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Submultiset;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 31;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Submultiset";
+      return s;
+    }
+  }
+  public class BinOp_ProperSubmultiset : BinOp {
+    public BinOp_ProperSubmultiset() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_ProperSubmultiset();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_ProperSubmultiset;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 32;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.ProperSubmultiset";
+      return s;
+    }
+  }
+  public class BinOp_MultisetDisjoint : BinOp {
+    public BinOp_MultisetDisjoint() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_MultisetDisjoint();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_MultisetDisjoint;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 33;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.MultisetDisjoint";
+      return s;
+    }
+  }
+  public class BinOp_Concat : BinOp {
+    public BinOp_Concat() : base() {
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Concat();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Concat;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 34;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Concat";
+      return s;
+    }
+  }
+  public class BinOp_Passthrough : BinOp {
+    public readonly Dafny.ISequence<Dafny.Rune> _a0;
+    public BinOp_Passthrough(Dafny.ISequence<Dafny.Rune> _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IBinOp DowncastClone() {
+      if (this is _IBinOp dt) { return dt; }
+      return new BinOp_Passthrough(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.BinOp_Passthrough;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 35;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.BinOp.Passthrough";
+      s += "(";
+      s += this._a0.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IExpression {
+    bool is_Literal { get; }
+    bool is_Ident { get; }
+    bool is_Companion { get; }
+    bool is_ExternCompanion { get; }
+    bool is_Tuple { get; }
+    bool is_New { get; }
+    bool is_NewUninitArray { get; }
+    bool is_ArrayIndexToInt { get; }
+    bool is_FinalizeNewArray { get; }
+    bool is_DatatypeValue { get; }
+    bool is_Convert { get; }
+    bool is_SeqConstruct { get; }
+    bool is_SeqValue { get; }
+    bool is_SetValue { get; }
+    bool is_MultisetValue { get; }
+    bool is_MapValue { get; }
+    bool is_MapBuilder { get; }
+    bool is_SeqUpdate { get; }
+    bool is_MapUpdate { get; }
+    bool is_SetBuilder { get; }
+    bool is_ToMultiset { get; }
+    bool is_This { get; }
+    bool is_Ite { get; }
+    bool is_UnOp { get; }
+    bool is_BinOp { get; }
+    bool is_ArrayLen { get; }
+    bool is_MapKeys { get; }
+    bool is_MapValues { get; }
+    bool is_MapItems { get; }
+    bool is_Select { get; }
+    bool is_SelectFn { get; }
+    bool is_Index { get; }
+    bool is_IndexRange { get; }
+    bool is_TupleSelect { get; }
+    bool is_Call { get; }
+    bool is_Lambda { get; }
+    bool is_BetaRedex { get; }
+    bool is_IIFE { get; }
+    bool is_Apply { get; }
+    bool is_TypeTest { get; }
+    bool is_Is { get; }
+    bool is_InitializationValue { get; }
+    bool is_BoolBoundedPool { get; }
+    bool is_SetBoundedPool { get; }
+    bool is_MapBoundedPool { get; }
+    bool is_SeqBoundedPool { get; }
+    bool is_MultisetBoundedPool { get; }
+    bool is_ExactBoundedPool { get; }
+    bool is_IntRange { get; }
+    bool is_UnboundedIntRange { get; }
+    bool is_Quantifier { get; }
+    DAST._ILiteral dtor_Literal_a0 { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_Companion_a0 { get; }
+    Dafny.ISequence<DAST._IType> dtor_typeArgs { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_ExternCompanion_a0 { get; }
+    Dafny.ISequence<DAST._IExpression> dtor_Tuple_a0 { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_path { get; }
+    Dafny.ISequence<DAST._IExpression> dtor_args { get; }
+    Dafny.ISequence<DAST._IExpression> dtor_dims { get; }
+    DAST._IType dtor_typ { get; }
+    DAST._IExpression dtor_value { get; }
+    DAST._IResolvedType dtor_datatypeType { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_variant { get; }
+    bool dtor_isCo { get; }
+    Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> dtor_contents { get; }
+    DAST._IType dtor_from { get; }
+    DAST._IExpression dtor_length { get; }
+    DAST._IExpression dtor_elem { get; }
+    Dafny.ISequence<DAST._IExpression> dtor_elements { get; }
+    Dafny.ISequence<_System._ITuple2<DAST._IExpression, DAST._IExpression>> dtor_mapElems { get; }
+    DAST._IType dtor_keyType { get; }
+    DAST._IType dtor_valueType { get; }
+    DAST._IExpression dtor_expr { get; }
+    DAST._IExpression dtor_indexExpr { get; }
+    DAST._IType dtor_elemType { get; }
+    DAST._IExpression dtor_ToMultiset_a0 { get; }
+    DAST._IExpression dtor_cond { get; }
+    DAST._IExpression dtor_thn { get; }
+    DAST._IExpression dtor_els { get; }
+    DAST._IUnaryOp dtor_unOp { get; }
+    DAST.Format._IUnaryOpFormat dtor_format1 { get; }
+    DAST._ITypedBinOp dtor_op { get; }
+    DAST._IExpression dtor_left { get; }
+    DAST._IExpression dtor_right { get; }
+    DAST.Format._IBinaryOpFormat dtor_format2 { get; }
+    DAST._IType dtor_exprType { get; }
+    BigInteger dtor_dim { get; }
+    bool dtor_native { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_field { get; }
+    DAST._IFieldMutability dtor_fieldMutability { get; }
+    bool dtor_isDatatype { get; }
+    DAST._IType dtor_fieldType { get; }
+    bool dtor_onDatatype { get; }
+    bool dtor_isStatic { get; }
+    bool dtor_isConstant { get; }
+    Dafny.ISequence<DAST._IType> dtor_arguments { get; }
+    DAST._ICollKind dtor_collKind { get; }
+    Dafny.ISequence<DAST._IExpression> dtor_indices { get; }
+    bool dtor_isArray { get; }
+    Std.Wrappers._IOption<DAST._IExpression> dtor_low { get; }
+    Std.Wrappers._IOption<DAST._IExpression> dtor_high { get; }
+    BigInteger dtor_index { get; }
+    DAST._IExpression dtor_on { get; }
+    DAST._ICallName dtor_callName { get; }
+    Dafny.ISequence<DAST._IFormal> dtor_params { get; }
+    DAST._IType dtor_retType { get; }
+    Dafny.ISequence<DAST._IStatement> dtor_body { get; }
+    Dafny.ISequence<_System._ITuple2<DAST._IFormal, DAST._IExpression>> dtor_values { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_ident { get; }
+    DAST._IExpression dtor_iifeBody { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_dType { get; }
+    DAST._IType dtor_fromType { get; }
+    DAST._IType dtor_toType { get; }
+    DAST._IExpression dtor_of { get; }
+    bool dtor_includeDuplicates { get; }
+    DAST._IExpression dtor_lo { get; }
+    DAST._IExpression dtor_hi { get; }
+    bool dtor_up { get; }
+    DAST._IExpression dtor_start { get; }
+    DAST._IExpression dtor_collection { get; }
+    bool dtor_is__forall { get; }
+    DAST._IExpression dtor_lambda { get; }
+    _IExpression DowncastClone();
+  }
+  public abstract class Expression : _IExpression {
+    public Expression() {
+    }
+    private static readonly DAST._IExpression theDefault = create_Literal(DAST.Literal.Default());
+    public static DAST._IExpression Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IExpression> _TYPE = new Dafny.TypeDescriptor<DAST._IExpression>(DAST.Expression.Default());
+    public static Dafny.TypeDescriptor<DAST._IExpression> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IExpression create_Literal(DAST._ILiteral _a0) {
+      return new Expression_Literal(_a0);
+    }
+    public static _IExpression create_Ident(Dafny.ISequence<Dafny.Rune> name) {
+      return new Expression_Ident(name);
+    }
+    public static _IExpression create_Companion(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0, Dafny.ISequence<DAST._IType> typeArgs) {
+      return new Expression_Companion(_a0, typeArgs);
+    }
+    public static _IExpression create_ExternCompanion(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0) {
+      return new Expression_ExternCompanion(_a0);
+    }
+    public static _IExpression create_Tuple(Dafny.ISequence<DAST._IExpression> _a0) {
+      return new Expression_Tuple(_a0);
+    }
+    public static _IExpression create_New(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args) {
+      return new Expression_New(path, typeArgs, args);
+    }
+    public static _IExpression create_NewUninitArray(Dafny.ISequence<DAST._IExpression> dims, DAST._IType typ) {
+      return new Expression_NewUninitArray(dims, typ);
+    }
+    public static _IExpression create_ArrayIndexToInt(DAST._IExpression @value) {
+      return new Expression_ArrayIndexToInt(@value);
+    }
+    public static _IExpression create_FinalizeNewArray(DAST._IExpression @value, DAST._IType typ) {
+      return new Expression_FinalizeNewArray(@value, typ);
+    }
+    public static _IExpression create_DatatypeValue(DAST._IResolvedType datatypeType, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<Dafny.Rune> variant, bool isCo, Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> contents) {
+      return new Expression_DatatypeValue(datatypeType, typeArgs, variant, isCo, contents);
+    }
+    public static _IExpression create_Convert(DAST._IExpression @value, DAST._IType @from, DAST._IType typ) {
+      return new Expression_Convert(@value, @from, typ);
+    }
+    public static _IExpression create_SeqConstruct(DAST._IExpression length, DAST._IExpression elem) {
+      return new Expression_SeqConstruct(length, elem);
+    }
+    public static _IExpression create_SeqValue(Dafny.ISequence<DAST._IExpression> elements, DAST._IType typ) {
+      return new Expression_SeqValue(elements, typ);
+    }
+    public static _IExpression create_SetValue(Dafny.ISequence<DAST._IExpression> elements) {
+      return new Expression_SetValue(elements);
+    }
+    public static _IExpression create_MultisetValue(Dafny.ISequence<DAST._IExpression> elements) {
+      return new Expression_MultisetValue(elements);
+    }
+    public static _IExpression create_MapValue(Dafny.ISequence<_System._ITuple2<DAST._IExpression, DAST._IExpression>> mapElems) {
+      return new Expression_MapValue(mapElems);
+    }
+    public static _IExpression create_MapBuilder(DAST._IType keyType, DAST._IType valueType) {
+      return new Expression_MapBuilder(keyType, valueType);
+    }
+    public static _IExpression create_SeqUpdate(DAST._IExpression expr, DAST._IExpression indexExpr, DAST._IExpression @value) {
+      return new Expression_SeqUpdate(expr, indexExpr, @value);
+    }
+    public static _IExpression create_MapUpdate(DAST._IExpression expr, DAST._IExpression indexExpr, DAST._IExpression @value) {
+      return new Expression_MapUpdate(expr, indexExpr, @value);
+    }
+    public static _IExpression create_SetBuilder(DAST._IType elemType) {
+      return new Expression_SetBuilder(elemType);
+    }
+    public static _IExpression create_ToMultiset(DAST._IExpression _a0) {
+      return new Expression_ToMultiset(_a0);
+    }
+    public static _IExpression create_This() {
+      return new Expression_This();
+    }
+    public static _IExpression create_Ite(DAST._IExpression cond, DAST._IExpression thn, DAST._IExpression els) {
+      return new Expression_Ite(cond, thn, els);
+    }
+    public static _IExpression create_UnOp(DAST._IUnaryOp unOp, DAST._IExpression expr, DAST.Format._IUnaryOpFormat format1) {
+      return new Expression_UnOp(unOp, expr, format1);
+    }
+    public static _IExpression create_BinOp(DAST._ITypedBinOp op, DAST._IExpression left, DAST._IExpression right, DAST.Format._IBinaryOpFormat format2) {
+      return new Expression_BinOp(op, left, right, format2);
+    }
+    public static _IExpression create_ArrayLen(DAST._IExpression expr, DAST._IType exprType, BigInteger dim, bool native) {
+      return new Expression_ArrayLen(expr, exprType, dim, native);
+    }
+    public static _IExpression create_MapKeys(DAST._IExpression expr) {
+      return new Expression_MapKeys(expr);
+    }
+    public static _IExpression create_MapValues(DAST._IExpression expr) {
+      return new Expression_MapValues(expr);
+    }
+    public static _IExpression create_MapItems(DAST._IExpression expr) {
+      return new Expression_MapItems(expr);
+    }
+    public static _IExpression create_Select(DAST._IExpression expr, Dafny.ISequence<Dafny.Rune> field, DAST._IFieldMutability fieldMutability, bool isDatatype, DAST._IType fieldType) {
+      return new Expression_Select(expr, field, fieldMutability, isDatatype, fieldType);
+    }
+    public static _IExpression create_SelectFn(DAST._IExpression expr, Dafny.ISequence<Dafny.Rune> field, bool onDatatype, bool isStatic, bool isConstant, Dafny.ISequence<DAST._IType> arguments) {
+      return new Expression_SelectFn(expr, field, onDatatype, isStatic, isConstant, arguments);
+    }
+    public static _IExpression create_Index(DAST._IExpression expr, DAST._ICollKind collKind, Dafny.ISequence<DAST._IExpression> indices) {
+      return new Expression_Index(expr, collKind, indices);
+    }
+    public static _IExpression create_IndexRange(DAST._IExpression expr, bool isArray, Std.Wrappers._IOption<DAST._IExpression> low, Std.Wrappers._IOption<DAST._IExpression> high) {
+      return new Expression_IndexRange(expr, isArray, low, high);
+    }
+    public static _IExpression create_TupleSelect(DAST._IExpression expr, BigInteger index, DAST._IType fieldType) {
+      return new Expression_TupleSelect(expr, index, fieldType);
+    }
+    public static _IExpression create_Call(DAST._IExpression @on, DAST._ICallName callName, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args) {
+      return new Expression_Call(@on, callName, typeArgs, args);
+    }
+    public static _IExpression create_Lambda(Dafny.ISequence<DAST._IFormal> @params, DAST._IType retType, Dafny.ISequence<DAST._IStatement> body) {
+      return new Expression_Lambda(@params, retType, body);
+    }
+    public static _IExpression create_BetaRedex(Dafny.ISequence<_System._ITuple2<DAST._IFormal, DAST._IExpression>> values, DAST._IType retType, DAST._IExpression expr) {
+      return new Expression_BetaRedex(values, retType, expr);
+    }
+    public static _IExpression create_IIFE(Dafny.ISequence<Dafny.Rune> ident, DAST._IType typ, DAST._IExpression @value, DAST._IExpression iifeBody) {
+      return new Expression_IIFE(ident, typ, @value, iifeBody);
+    }
+    public static _IExpression create_Apply(DAST._IExpression expr, Dafny.ISequence<DAST._IExpression> args) {
+      return new Expression_Apply(expr, args);
+    }
+    public static _IExpression create_TypeTest(DAST._IExpression @on, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dType, Dafny.ISequence<Dafny.Rune> variant) {
+      return new Expression_TypeTest(@on, dType, variant);
+    }
+    public static _IExpression create_Is(DAST._IExpression expr, DAST._IType fromType, DAST._IType toType) {
+      return new Expression_Is(expr, fromType, toType);
+    }
+    public static _IExpression create_InitializationValue(DAST._IType typ) {
+      return new Expression_InitializationValue(typ);
+    }
+    public static _IExpression create_BoolBoundedPool() {
+      return new Expression_BoolBoundedPool();
+    }
+    public static _IExpression create_SetBoundedPool(DAST._IExpression of) {
+      return new Expression_SetBoundedPool(of);
+    }
+    public static _IExpression create_MapBoundedPool(DAST._IExpression of) {
+      return new Expression_MapBoundedPool(of);
+    }
+    public static _IExpression create_SeqBoundedPool(DAST._IExpression of, bool includeDuplicates) {
+      return new Expression_SeqBoundedPool(of, includeDuplicates);
+    }
+    public static _IExpression create_MultisetBoundedPool(DAST._IExpression of, bool includeDuplicates) {
+      return new Expression_MultisetBoundedPool(of, includeDuplicates);
+    }
+    public static _IExpression create_ExactBoundedPool(DAST._IExpression of) {
+      return new Expression_ExactBoundedPool(of);
+    }
+    public static _IExpression create_IntRange(DAST._IType elemType, DAST._IExpression lo, DAST._IExpression hi, bool up) {
+      return new Expression_IntRange(elemType, lo, hi, up);
+    }
+    public static _IExpression create_UnboundedIntRange(DAST._IExpression start, bool up) {
+      return new Expression_UnboundedIntRange(start, up);
+    }
+    public static _IExpression create_Quantifier(DAST._IType elemType, DAST._IExpression collection, bool is__forall, DAST._IExpression lambda) {
+      return new Expression_Quantifier(elemType, collection, is__forall, lambda);
+    }
+    public bool is_Literal { get { return this is Expression_Literal; } }
+    public bool is_Ident { get { return this is Expression_Ident; } }
+    public bool is_Companion { get { return this is Expression_Companion; } }
+    public bool is_ExternCompanion { get { return this is Expression_ExternCompanion; } }
+    public bool is_Tuple { get { return this is Expression_Tuple; } }
+    public bool is_New { get { return this is Expression_New; } }
+    public bool is_NewUninitArray { get { return this is Expression_NewUninitArray; } }
+    public bool is_ArrayIndexToInt { get { return this is Expression_ArrayIndexToInt; } }
+    public bool is_FinalizeNewArray { get { return this is Expression_FinalizeNewArray; } }
+    public bool is_DatatypeValue { get { return this is Expression_DatatypeValue; } }
+    public bool is_Convert { get { return this is Expression_Convert; } }
+    public bool is_SeqConstruct { get { return this is Expression_SeqConstruct; } }
+    public bool is_SeqValue { get { return this is Expression_SeqValue; } }
+    public bool is_SetValue { get { return this is Expression_SetValue; } }
+    public bool is_MultisetValue { get { return this is Expression_MultisetValue; } }
+    public bool is_MapValue { get { return this is Expression_MapValue; } }
+    public bool is_MapBuilder { get { return this is Expression_MapBuilder; } }
+    public bool is_SeqUpdate { get { return this is Expression_SeqUpdate; } }
+    public bool is_MapUpdate { get { return this is Expression_MapUpdate; } }
+    public bool is_SetBuilder { get { return this is Expression_SetBuilder; } }
+    public bool is_ToMultiset { get { return this is Expression_ToMultiset; } }
+    public bool is_This { get { return this is Expression_This; } }
+    public bool is_Ite { get { return this is Expression_Ite; } }
+    public bool is_UnOp { get { return this is Expression_UnOp; } }
+    public bool is_BinOp { get { return this is Expression_BinOp; } }
+    public bool is_ArrayLen { get { return this is Expression_ArrayLen; } }
+    public bool is_MapKeys { get { return this is Expression_MapKeys; } }
+    public bool is_MapValues { get { return this is Expression_MapValues; } }
+    public bool is_MapItems { get { return this is Expression_MapItems; } }
+    public bool is_Select { get { return this is Expression_Select; } }
+    public bool is_SelectFn { get { return this is Expression_SelectFn; } }
+    public bool is_Index { get { return this is Expression_Index; } }
+    public bool is_IndexRange { get { return this is Expression_IndexRange; } }
+    public bool is_TupleSelect { get { return this is Expression_TupleSelect; } }
+    public bool is_Call { get { return this is Expression_Call; } }
+    public bool is_Lambda { get { return this is Expression_Lambda; } }
+    public bool is_BetaRedex { get { return this is Expression_BetaRedex; } }
+    public bool is_IIFE { get { return this is Expression_IIFE; } }
+    public bool is_Apply { get { return this is Expression_Apply; } }
+    public bool is_TypeTest { get { return this is Expression_TypeTest; } }
+    public bool is_Is { get { return this is Expression_Is; } }
+    public bool is_InitializationValue { get { return this is Expression_InitializationValue; } }
+    public bool is_BoolBoundedPool { get { return this is Expression_BoolBoundedPool; } }
+    public bool is_SetBoundedPool { get { return this is Expression_SetBoundedPool; } }
+    public bool is_MapBoundedPool { get { return this is Expression_MapBoundedPool; } }
+    public bool is_SeqBoundedPool { get { return this is Expression_SeqBoundedPool; } }
+    public bool is_MultisetBoundedPool { get { return this is Expression_MultisetBoundedPool; } }
+    public bool is_ExactBoundedPool { get { return this is Expression_ExactBoundedPool; } }
+    public bool is_IntRange { get { return this is Expression_IntRange; } }
+    public bool is_UnboundedIntRange { get { return this is Expression_UnboundedIntRange; } }
+    public bool is_Quantifier { get { return this is Expression_Quantifier; } }
+    public DAST._ILiteral dtor_Literal_a0 {
+      get {
+        var d = this;
+        return ((Expression_Literal)d)._a0;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        var d = this;
+        return ((Expression_Ident)d)._name;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_Companion_a0 {
+      get {
+        var d = this;
+        return ((Expression_Companion)d)._a0;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_typeArgs {
+      get {
+        var d = this;
+        if (d is Expression_Companion) { return ((Expression_Companion)d)._typeArgs; }
+        if (d is Expression_New) { return ((Expression_New)d)._typeArgs; }
+        if (d is Expression_DatatypeValue) { return ((Expression_DatatypeValue)d)._typeArgs; }
+        return ((Expression_Call)d)._typeArgs;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_ExternCompanion_a0 {
+      get {
+        var d = this;
+        return ((Expression_ExternCompanion)d)._a0;
+      }
+    }
+    public Dafny.ISequence<DAST._IExpression> dtor_Tuple_a0 {
+      get {
+        var d = this;
+        return ((Expression_Tuple)d)._a0;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_path {
+      get {
+        var d = this;
+        return ((Expression_New)d)._path;
+      }
+    }
+    public Dafny.ISequence<DAST._IExpression> dtor_args {
+      get {
+        var d = this;
+        if (d is Expression_New) { return ((Expression_New)d)._args; }
+        if (d is Expression_Call) { return ((Expression_Call)d)._args; }
+        return ((Expression_Apply)d)._args;
+      }
+    }
+    public Dafny.ISequence<DAST._IExpression> dtor_dims {
+      get {
+        var d = this;
+        return ((Expression_NewUninitArray)d)._dims;
+      }
+    }
+    public DAST._IType dtor_typ {
+      get {
+        var d = this;
+        if (d is Expression_NewUninitArray) { return ((Expression_NewUninitArray)d)._typ; }
+        if (d is Expression_FinalizeNewArray) { return ((Expression_FinalizeNewArray)d)._typ; }
+        if (d is Expression_Convert) { return ((Expression_Convert)d)._typ; }
+        if (d is Expression_SeqValue) { return ((Expression_SeqValue)d)._typ; }
+        if (d is Expression_IIFE) { return ((Expression_IIFE)d)._typ; }
+        return ((Expression_InitializationValue)d)._typ;
+      }
+    }
+    public DAST._IExpression dtor_value {
+      get {
+        var d = this;
+        if (d is Expression_ArrayIndexToInt) { return ((Expression_ArrayIndexToInt)d)._value; }
+        if (d is Expression_FinalizeNewArray) { return ((Expression_FinalizeNewArray)d)._value; }
+        if (d is Expression_Convert) { return ((Expression_Convert)d)._value; }
+        if (d is Expression_SeqUpdate) { return ((Expression_SeqUpdate)d)._value; }
+        if (d is Expression_MapUpdate) { return ((Expression_MapUpdate)d)._value; }
+        return ((Expression_IIFE)d)._value;
+      }
+    }
+    public DAST._IResolvedType dtor_datatypeType {
+      get {
+        var d = this;
+        return ((Expression_DatatypeValue)d)._datatypeType;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_variant {
+      get {
+        var d = this;
+        if (d is Expression_DatatypeValue) { return ((Expression_DatatypeValue)d)._variant; }
+        return ((Expression_TypeTest)d)._variant;
+      }
+    }
+    public bool dtor_isCo {
+      get {
+        var d = this;
+        return ((Expression_DatatypeValue)d)._isCo;
+      }
+    }
+    public Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> dtor_contents {
+      get {
+        var d = this;
+        return ((Expression_DatatypeValue)d)._contents;
+      }
+    }
+    public DAST._IType dtor_from {
+      get {
+        var d = this;
+        return ((Expression_Convert)d)._from;
+      }
+    }
+    public DAST._IExpression dtor_length {
+      get {
+        var d = this;
+        return ((Expression_SeqConstruct)d)._length;
+      }
+    }
+    public DAST._IExpression dtor_elem {
+      get {
+        var d = this;
+        return ((Expression_SeqConstruct)d)._elem;
+      }
+    }
+    public Dafny.ISequence<DAST._IExpression> dtor_elements {
+      get {
+        var d = this;
+        if (d is Expression_SeqValue) { return ((Expression_SeqValue)d)._elements; }
+        if (d is Expression_SetValue) { return ((Expression_SetValue)d)._elements; }
+        return ((Expression_MultisetValue)d)._elements;
+      }
+    }
+    public Dafny.ISequence<_System._ITuple2<DAST._IExpression, DAST._IExpression>> dtor_mapElems {
+      get {
+        var d = this;
+        return ((Expression_MapValue)d)._mapElems;
+      }
+    }
+    public DAST._IType dtor_keyType {
+      get {
+        var d = this;
+        return ((Expression_MapBuilder)d)._keyType;
+      }
+    }
+    public DAST._IType dtor_valueType {
+      get {
+        var d = this;
+        return ((Expression_MapBuilder)d)._valueType;
+      }
+    }
+    public DAST._IExpression dtor_expr {
+      get {
+        var d = this;
+        if (d is Expression_SeqUpdate) { return ((Expression_SeqUpdate)d)._expr; }
+        if (d is Expression_MapUpdate) { return ((Expression_MapUpdate)d)._expr; }
+        if (d is Expression_UnOp) { return ((Expression_UnOp)d)._expr; }
+        if (d is Expression_ArrayLen) { return ((Expression_ArrayLen)d)._expr; }
+        if (d is Expression_MapKeys) { return ((Expression_MapKeys)d)._expr; }
+        if (d is Expression_MapValues) { return ((Expression_MapValues)d)._expr; }
+        if (d is Expression_MapItems) { return ((Expression_MapItems)d)._expr; }
+        if (d is Expression_Select) { return ((Expression_Select)d)._expr; }
+        if (d is Expression_SelectFn) { return ((Expression_SelectFn)d)._expr; }
+        if (d is Expression_Index) { return ((Expression_Index)d)._expr; }
+        if (d is Expression_IndexRange) { return ((Expression_IndexRange)d)._expr; }
+        if (d is Expression_TupleSelect) { return ((Expression_TupleSelect)d)._expr; }
+        if (d is Expression_BetaRedex) { return ((Expression_BetaRedex)d)._expr; }
+        if (d is Expression_Apply) { return ((Expression_Apply)d)._expr; }
+        return ((Expression_Is)d)._expr;
+      }
+    }
+    public DAST._IExpression dtor_indexExpr {
+      get {
+        var d = this;
+        if (d is Expression_SeqUpdate) { return ((Expression_SeqUpdate)d)._indexExpr; }
+        return ((Expression_MapUpdate)d)._indexExpr;
+      }
+    }
+    public DAST._IType dtor_elemType {
+      get {
+        var d = this;
+        if (d is Expression_SetBuilder) { return ((Expression_SetBuilder)d)._elemType; }
+        if (d is Expression_IntRange) { return ((Expression_IntRange)d)._elemType; }
+        return ((Expression_Quantifier)d)._elemType;
+      }
+    }
+    public DAST._IExpression dtor_ToMultiset_a0 {
+      get {
+        var d = this;
+        return ((Expression_ToMultiset)d)._a0;
+      }
+    }
+    public DAST._IExpression dtor_cond {
+      get {
+        var d = this;
+        return ((Expression_Ite)d)._cond;
+      }
+    }
+    public DAST._IExpression dtor_thn {
+      get {
+        var d = this;
+        return ((Expression_Ite)d)._thn;
+      }
+    }
+    public DAST._IExpression dtor_els {
+      get {
+        var d = this;
+        return ((Expression_Ite)d)._els;
+      }
+    }
+    public DAST._IUnaryOp dtor_unOp {
+      get {
+        var d = this;
+        return ((Expression_UnOp)d)._unOp;
+      }
+    }
+    public DAST.Format._IUnaryOpFormat dtor_format1 {
+      get {
+        var d = this;
+        return ((Expression_UnOp)d)._format1;
+      }
+    }
+    public DAST._ITypedBinOp dtor_op {
+      get {
+        var d = this;
+        return ((Expression_BinOp)d)._op;
+      }
+    }
+    public DAST._IExpression dtor_left {
+      get {
+        var d = this;
+        return ((Expression_BinOp)d)._left;
+      }
+    }
+    public DAST._IExpression dtor_right {
+      get {
+        var d = this;
+        return ((Expression_BinOp)d)._right;
+      }
+    }
+    public DAST.Format._IBinaryOpFormat dtor_format2 {
+      get {
+        var d = this;
+        return ((Expression_BinOp)d)._format2;
+      }
+    }
+    public DAST._IType dtor_exprType {
+      get {
+        var d = this;
+        return ((Expression_ArrayLen)d)._exprType;
+      }
+    }
+    public BigInteger dtor_dim {
+      get {
+        var d = this;
+        return ((Expression_ArrayLen)d)._dim;
+      }
+    }
+    public bool dtor_native {
+      get {
+        var d = this;
+        return ((Expression_ArrayLen)d)._native;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_field {
+      get {
+        var d = this;
+        if (d is Expression_Select) { return ((Expression_Select)d)._field; }
+        return ((Expression_SelectFn)d)._field;
+      }
+    }
+    public DAST._IFieldMutability dtor_fieldMutability {
+      get {
+        var d = this;
+        return ((Expression_Select)d)._fieldMutability;
+      }
+    }
+    public bool dtor_isDatatype {
+      get {
+        var d = this;
+        return ((Expression_Select)d)._isDatatype;
+      }
+    }
+    public DAST._IType dtor_fieldType {
+      get {
+        var d = this;
+        if (d is Expression_Select) { return ((Expression_Select)d)._fieldType; }
+        return ((Expression_TupleSelect)d)._fieldType;
+      }
+    }
+    public bool dtor_onDatatype {
+      get {
+        var d = this;
+        return ((Expression_SelectFn)d)._onDatatype;
+      }
+    }
+    public bool dtor_isStatic {
+      get {
+        var d = this;
+        return ((Expression_SelectFn)d)._isStatic;
+      }
+    }
+    public bool dtor_isConstant {
+      get {
+        var d = this;
+        return ((Expression_SelectFn)d)._isConstant;
+      }
+    }
+    public Dafny.ISequence<DAST._IType> dtor_arguments {
+      get {
+        var d = this;
+        return ((Expression_SelectFn)d)._arguments;
+      }
+    }
+    public DAST._ICollKind dtor_collKind {
+      get {
+        var d = this;
+        return ((Expression_Index)d)._collKind;
+      }
+    }
+    public Dafny.ISequence<DAST._IExpression> dtor_indices {
+      get {
+        var d = this;
+        return ((Expression_Index)d)._indices;
+      }
+    }
+    public bool dtor_isArray {
+      get {
+        var d = this;
+        return ((Expression_IndexRange)d)._isArray;
+      }
+    }
+    public Std.Wrappers._IOption<DAST._IExpression> dtor_low {
+      get {
+        var d = this;
+        return ((Expression_IndexRange)d)._low;
+      }
+    }
+    public Std.Wrappers._IOption<DAST._IExpression> dtor_high {
+      get {
+        var d = this;
+        return ((Expression_IndexRange)d)._high;
+      }
+    }
+    public BigInteger dtor_index {
+      get {
+        var d = this;
+        return ((Expression_TupleSelect)d)._index;
+      }
+    }
+    public DAST._IExpression dtor_on {
+      get {
+        var d = this;
+        if (d is Expression_Call) { return ((Expression_Call)d)._on; }
+        return ((Expression_TypeTest)d)._on;
+      }
+    }
+    public DAST._ICallName dtor_callName {
+      get {
+        var d = this;
+        return ((Expression_Call)d)._callName;
+      }
+    }
+    public Dafny.ISequence<DAST._IFormal> dtor_params {
+      get {
+        var d = this;
+        return ((Expression_Lambda)d)._params;
+      }
+    }
+    public DAST._IType dtor_retType {
+      get {
+        var d = this;
+        if (d is Expression_Lambda) { return ((Expression_Lambda)d)._retType; }
+        return ((Expression_BetaRedex)d)._retType;
+      }
+    }
+    public Dafny.ISequence<DAST._IStatement> dtor_body {
+      get {
+        var d = this;
+        return ((Expression_Lambda)d)._body;
+      }
+    }
+    public Dafny.ISequence<_System._ITuple2<DAST._IFormal, DAST._IExpression>> dtor_values {
+      get {
+        var d = this;
+        return ((Expression_BetaRedex)d)._values;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_ident {
+      get {
+        var d = this;
+        return ((Expression_IIFE)d)._ident;
+      }
+    }
+    public DAST._IExpression dtor_iifeBody {
+      get {
+        var d = this;
+        return ((Expression_IIFE)d)._iifeBody;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_dType {
+      get {
+        var d = this;
+        return ((Expression_TypeTest)d)._dType;
+      }
+    }
+    public DAST._IType dtor_fromType {
+      get {
+        var d = this;
+        return ((Expression_Is)d)._fromType;
+      }
+    }
+    public DAST._IType dtor_toType {
+      get {
+        var d = this;
+        return ((Expression_Is)d)._toType;
+      }
+    }
+    public DAST._IExpression dtor_of {
+      get {
+        var d = this;
+        if (d is Expression_SetBoundedPool) { return ((Expression_SetBoundedPool)d)._of; }
+        if (d is Expression_MapBoundedPool) { return ((Expression_MapBoundedPool)d)._of; }
+        if (d is Expression_SeqBoundedPool) { return ((Expression_SeqBoundedPool)d)._of; }
+        if (d is Expression_MultisetBoundedPool) { return ((Expression_MultisetBoundedPool)d)._of; }
+        return ((Expression_ExactBoundedPool)d)._of;
+      }
+    }
+    public bool dtor_includeDuplicates {
+      get {
+        var d = this;
+        if (d is Expression_SeqBoundedPool) { return ((Expression_SeqBoundedPool)d)._includeDuplicates; }
+        return ((Expression_MultisetBoundedPool)d)._includeDuplicates;
+      }
+    }
+    public DAST._IExpression dtor_lo {
+      get {
+        var d = this;
+        return ((Expression_IntRange)d)._lo;
+      }
+    }
+    public DAST._IExpression dtor_hi {
+      get {
+        var d = this;
+        return ((Expression_IntRange)d)._hi;
+      }
+    }
+    public bool dtor_up {
+      get {
+        var d = this;
+        if (d is Expression_IntRange) { return ((Expression_IntRange)d)._up; }
+        return ((Expression_UnboundedIntRange)d)._up;
+      }
+    }
+    public DAST._IExpression dtor_start {
+      get {
+        var d = this;
+        return ((Expression_UnboundedIntRange)d)._start;
+      }
+    }
+    public DAST._IExpression dtor_collection {
+      get {
+        var d = this;
+        return ((Expression_Quantifier)d)._collection;
+      }
+    }
+    public bool dtor_is__forall {
+      get {
+        var d = this;
+        return ((Expression_Quantifier)d)._is__forall;
+      }
+    }
+    public DAST._IExpression dtor_lambda {
+      get {
+        var d = this;
+        return ((Expression_Quantifier)d)._lambda;
+      }
+    }
+    public abstract _IExpression DowncastClone();
+  }
+  public class Expression_Literal : Expression {
+    public readonly DAST._ILiteral _a0;
+    public Expression_Literal(DAST._ILiteral _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Literal(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Literal;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Literal";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Ident : Expression {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public Expression_Ident(Dafny.ISequence<Dafny.Rune> name) : base() {
+      this._name = name;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Ident(_name);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Ident;
+      return oth != null && object.Equals(this._name, oth._name);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Ident";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._name);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Companion : Expression {
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0;
+    public readonly Dafny.ISequence<DAST._IType> _typeArgs;
+    public Expression_Companion(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0, Dafny.ISequence<DAST._IType> typeArgs) : base() {
+      this._a0 = _a0;
+      this._typeArgs = typeArgs;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Companion(_a0, _typeArgs);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Companion;
+      return oth != null && object.Equals(this._a0, oth._a0) && object.Equals(this._typeArgs, oth._typeArgs);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeArgs));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Companion";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeArgs);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_ExternCompanion : Expression {
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0;
+    public Expression_ExternCompanion(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_ExternCompanion(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_ExternCompanion;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.ExternCompanion";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Tuple : Expression {
+    public readonly Dafny.ISequence<DAST._IExpression> _a0;
+    public Expression_Tuple(Dafny.ISequence<DAST._IExpression> _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Tuple(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Tuple;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Tuple";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_New : Expression {
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _path;
+    public readonly Dafny.ISequence<DAST._IType> _typeArgs;
+    public readonly Dafny.ISequence<DAST._IExpression> _args;
+    public Expression_New(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args) : base() {
+      this._path = path;
+      this._typeArgs = typeArgs;
+      this._args = args;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_New(_path, _typeArgs, _args);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_New;
+      return oth != null && object.Equals(this._path, oth._path) && object.Equals(this._typeArgs, oth._typeArgs) && object.Equals(this._args, oth._args);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._path));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeArgs));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.New";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._path);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeArgs);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._args);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_NewUninitArray : Expression {
+    public readonly Dafny.ISequence<DAST._IExpression> _dims;
+    public readonly DAST._IType _typ;
+    public Expression_NewUninitArray(Dafny.ISequence<DAST._IExpression> dims, DAST._IType typ) : base() {
+      this._dims = dims;
+      this._typ = typ;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_NewUninitArray(_dims, _typ);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_NewUninitArray;
+      return oth != null && object.Equals(this._dims, oth._dims) && object.Equals(this._typ, oth._typ);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 6;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._dims));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.NewUninitArray";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._dims);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typ);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_ArrayIndexToInt : Expression {
+    public readonly DAST._IExpression _value;
+    public Expression_ArrayIndexToInt(DAST._IExpression @value) : base() {
+      this._value = @value;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_ArrayIndexToInt(_value);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_ArrayIndexToInt;
+      return oth != null && object.Equals(this._value, oth._value);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 7;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.ArrayIndexToInt";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_FinalizeNewArray : Expression {
+    public readonly DAST._IExpression _value;
+    public readonly DAST._IType _typ;
+    public Expression_FinalizeNewArray(DAST._IExpression @value, DAST._IType typ) : base() {
+      this._value = @value;
+      this._typ = typ;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_FinalizeNewArray(_value, _typ);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_FinalizeNewArray;
+      return oth != null && object.Equals(this._value, oth._value) && object.Equals(this._typ, oth._typ);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 8;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.FinalizeNewArray";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typ);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_DatatypeValue : Expression {
+    public readonly DAST._IResolvedType _datatypeType;
+    public readonly Dafny.ISequence<DAST._IType> _typeArgs;
+    public readonly Dafny.ISequence<Dafny.Rune> _variant;
+    public readonly bool _isCo;
+    public readonly Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> _contents;
+    public Expression_DatatypeValue(DAST._IResolvedType datatypeType, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<Dafny.Rune> variant, bool isCo, Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> contents) : base() {
+      this._datatypeType = datatypeType;
+      this._typeArgs = typeArgs;
+      this._variant = variant;
+      this._isCo = isCo;
+      this._contents = contents;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_DatatypeValue(_datatypeType, _typeArgs, _variant, _isCo, _contents);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_DatatypeValue;
+      return oth != null && object.Equals(this._datatypeType, oth._datatypeType) && object.Equals(this._typeArgs, oth._typeArgs) && object.Equals(this._variant, oth._variant) && this._isCo == oth._isCo && object.Equals(this._contents, oth._contents);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 9;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._datatypeType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeArgs));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._variant));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isCo));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._contents));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.DatatypeValue";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._datatypeType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeArgs);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._variant);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._isCo);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._contents);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Convert : Expression {
+    public readonly DAST._IExpression _value;
+    public readonly DAST._IType _from;
+    public readonly DAST._IType _typ;
+    public Expression_Convert(DAST._IExpression @value, DAST._IType @from, DAST._IType typ) : base() {
+      this._value = @value;
+      this._from = @from;
+      this._typ = typ;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Convert(_value, _from, _typ);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Convert;
+      return oth != null && object.Equals(this._value, oth._value) && object.Equals(this._from, oth._from) && object.Equals(this._typ, oth._typ);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 10;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._from));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Convert";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._from);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typ);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_SeqConstruct : Expression {
+    public readonly DAST._IExpression _length;
+    public readonly DAST._IExpression _elem;
+    public Expression_SeqConstruct(DAST._IExpression length, DAST._IExpression elem) : base() {
+      this._length = length;
+      this._elem = elem;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_SeqConstruct(_length, _elem);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_SeqConstruct;
+      return oth != null && object.Equals(this._length, oth._length) && object.Equals(this._elem, oth._elem);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 11;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._length));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._elem));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.SeqConstruct";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._length);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._elem);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_SeqValue : Expression {
+    public readonly Dafny.ISequence<DAST._IExpression> _elements;
+    public readonly DAST._IType _typ;
+    public Expression_SeqValue(Dafny.ISequence<DAST._IExpression> elements, DAST._IType typ) : base() {
+      this._elements = elements;
+      this._typ = typ;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_SeqValue(_elements, _typ);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_SeqValue;
+      return oth != null && object.Equals(this._elements, oth._elements) && object.Equals(this._typ, oth._typ);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 12;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._elements));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.SeqValue";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._elements);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typ);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_SetValue : Expression {
+    public readonly Dafny.ISequence<DAST._IExpression> _elements;
+    public Expression_SetValue(Dafny.ISequence<DAST._IExpression> elements) : base() {
+      this._elements = elements;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_SetValue(_elements);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_SetValue;
+      return oth != null && object.Equals(this._elements, oth._elements);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 13;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._elements));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.SetValue";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._elements);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_MultisetValue : Expression {
+    public readonly Dafny.ISequence<DAST._IExpression> _elements;
+    public Expression_MultisetValue(Dafny.ISequence<DAST._IExpression> elements) : base() {
+      this._elements = elements;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_MultisetValue(_elements);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_MultisetValue;
+      return oth != null && object.Equals(this._elements, oth._elements);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 14;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._elements));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.MultisetValue";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._elements);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_MapValue : Expression {
+    public readonly Dafny.ISequence<_System._ITuple2<DAST._IExpression, DAST._IExpression>> _mapElems;
+    public Expression_MapValue(Dafny.ISequence<_System._ITuple2<DAST._IExpression, DAST._IExpression>> mapElems) : base() {
+      this._mapElems = mapElems;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_MapValue(_mapElems);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_MapValue;
+      return oth != null && object.Equals(this._mapElems, oth._mapElems);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 15;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._mapElems));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.MapValue";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._mapElems);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_MapBuilder : Expression {
+    public readonly DAST._IType _keyType;
+    public readonly DAST._IType _valueType;
+    public Expression_MapBuilder(DAST._IType keyType, DAST._IType valueType) : base() {
+      this._keyType = keyType;
+      this._valueType = valueType;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_MapBuilder(_keyType, _valueType);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_MapBuilder;
+      return oth != null && object.Equals(this._keyType, oth._keyType) && object.Equals(this._valueType, oth._valueType);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 16;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._keyType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._valueType));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.MapBuilder";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._keyType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._valueType);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_SeqUpdate : Expression {
+    public readonly DAST._IExpression _expr;
+    public readonly DAST._IExpression _indexExpr;
+    public readonly DAST._IExpression _value;
+    public Expression_SeqUpdate(DAST._IExpression expr, DAST._IExpression indexExpr, DAST._IExpression @value) : base() {
+      this._expr = expr;
+      this._indexExpr = indexExpr;
+      this._value = @value;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_SeqUpdate(_expr, _indexExpr, _value);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_SeqUpdate;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._indexExpr, oth._indexExpr) && object.Equals(this._value, oth._value);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 17;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._indexExpr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.SeqUpdate";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._indexExpr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_MapUpdate : Expression {
+    public readonly DAST._IExpression _expr;
+    public readonly DAST._IExpression _indexExpr;
+    public readonly DAST._IExpression _value;
+    public Expression_MapUpdate(DAST._IExpression expr, DAST._IExpression indexExpr, DAST._IExpression @value) : base() {
+      this._expr = expr;
+      this._indexExpr = indexExpr;
+      this._value = @value;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_MapUpdate(_expr, _indexExpr, _value);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_MapUpdate;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._indexExpr, oth._indexExpr) && object.Equals(this._value, oth._value);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 18;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._indexExpr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.MapUpdate";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._indexExpr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_SetBuilder : Expression {
+    public readonly DAST._IType _elemType;
+    public Expression_SetBuilder(DAST._IType elemType) : base() {
+      this._elemType = elemType;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_SetBuilder(_elemType);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_SetBuilder;
+      return oth != null && object.Equals(this._elemType, oth._elemType);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 19;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._elemType));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.SetBuilder";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._elemType);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_ToMultiset : Expression {
+    public readonly DAST._IExpression _a0;
+    public Expression_ToMultiset(DAST._IExpression _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_ToMultiset(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_ToMultiset;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 20;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.ToMultiset";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_This : Expression {
+    public Expression_This() : base() {
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_This();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_This;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 21;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.This";
+      return s;
+    }
+  }
+  public class Expression_Ite : Expression {
+    public readonly DAST._IExpression _cond;
+    public readonly DAST._IExpression _thn;
+    public readonly DAST._IExpression _els;
+    public Expression_Ite(DAST._IExpression cond, DAST._IExpression thn, DAST._IExpression els) : base() {
+      this._cond = cond;
+      this._thn = thn;
+      this._els = els;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Ite(_cond, _thn, _els);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Ite;
+      return oth != null && object.Equals(this._cond, oth._cond) && object.Equals(this._thn, oth._thn) && object.Equals(this._els, oth._els);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 22;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._cond));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._thn));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._els));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Ite";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._cond);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._thn);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._els);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_UnOp : Expression {
+    public readonly DAST._IUnaryOp _unOp;
+    public readonly DAST._IExpression _expr;
+    public readonly DAST.Format._IUnaryOpFormat _format1;
+    public Expression_UnOp(DAST._IUnaryOp unOp, DAST._IExpression expr, DAST.Format._IUnaryOpFormat format1) : base() {
+      this._unOp = unOp;
+      this._expr = expr;
+      this._format1 = format1;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_UnOp(_unOp, _expr, _format1);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_UnOp;
+      return oth != null && object.Equals(this._unOp, oth._unOp) && object.Equals(this._expr, oth._expr) && object.Equals(this._format1, oth._format1);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 23;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._unOp));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._format1));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.UnOp";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._unOp);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._format1);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_BinOp : Expression {
+    public readonly DAST._ITypedBinOp _op;
+    public readonly DAST._IExpression _left;
+    public readonly DAST._IExpression _right;
+    public readonly DAST.Format._IBinaryOpFormat _format2;
+    public Expression_BinOp(DAST._ITypedBinOp op, DAST._IExpression left, DAST._IExpression right, DAST.Format._IBinaryOpFormat format2) : base() {
+      this._op = op;
+      this._left = left;
+      this._right = right;
+      this._format2 = format2;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_BinOp(_op, _left, _right, _format2);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_BinOp;
+      return oth != null && object.Equals(this._op, oth._op) && object.Equals(this._left, oth._left) && object.Equals(this._right, oth._right) && object.Equals(this._format2, oth._format2);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 24;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._op));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._left));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._right));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._format2));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.BinOp";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._op);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._left);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._right);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._format2);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_ArrayLen : Expression {
+    public readonly DAST._IExpression _expr;
+    public readonly DAST._IType _exprType;
+    public readonly BigInteger _dim;
+    public readonly bool _native;
+    public Expression_ArrayLen(DAST._IExpression expr, DAST._IType exprType, BigInteger dim, bool native) : base() {
+      this._expr = expr;
+      this._exprType = exprType;
+      this._dim = dim;
+      this._native = native;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_ArrayLen(_expr, _exprType, _dim, _native);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_ArrayLen;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._exprType, oth._exprType) && this._dim == oth._dim && this._native == oth._native;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 25;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._exprType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._dim));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._native));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.ArrayLen";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._exprType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._dim);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._native);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_MapKeys : Expression {
+    public readonly DAST._IExpression _expr;
+    public Expression_MapKeys(DAST._IExpression expr) : base() {
+      this._expr = expr;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_MapKeys(_expr);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_MapKeys;
+      return oth != null && object.Equals(this._expr, oth._expr);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 26;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.MapKeys";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_MapValues : Expression {
+    public readonly DAST._IExpression _expr;
+    public Expression_MapValues(DAST._IExpression expr) : base() {
+      this._expr = expr;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_MapValues(_expr);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_MapValues;
+      return oth != null && object.Equals(this._expr, oth._expr);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 27;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.MapValues";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_MapItems : Expression {
+    public readonly DAST._IExpression _expr;
+    public Expression_MapItems(DAST._IExpression expr) : base() {
+      this._expr = expr;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_MapItems(_expr);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_MapItems;
+      return oth != null && object.Equals(this._expr, oth._expr);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 28;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.MapItems";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Select : Expression {
+    public readonly DAST._IExpression _expr;
+    public readonly Dafny.ISequence<Dafny.Rune> _field;
+    public readonly DAST._IFieldMutability _fieldMutability;
+    public readonly bool _isDatatype;
+    public readonly DAST._IType _fieldType;
+    public Expression_Select(DAST._IExpression expr, Dafny.ISequence<Dafny.Rune> field, DAST._IFieldMutability fieldMutability, bool isDatatype, DAST._IType fieldType) : base() {
+      this._expr = expr;
+      this._field = field;
+      this._fieldMutability = fieldMutability;
+      this._isDatatype = isDatatype;
+      this._fieldType = fieldType;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Select(_expr, _field, _fieldMutability, _isDatatype, _fieldType);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Select;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._field, oth._field) && object.Equals(this._fieldMutability, oth._fieldMutability) && this._isDatatype == oth._isDatatype && object.Equals(this._fieldType, oth._fieldType);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 29;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._field));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fieldMutability));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isDatatype));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fieldType));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Select";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._field);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._fieldMutability);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._isDatatype);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._fieldType);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_SelectFn : Expression {
+    public readonly DAST._IExpression _expr;
+    public readonly Dafny.ISequence<Dafny.Rune> _field;
+    public readonly bool _onDatatype;
+    public readonly bool _isStatic;
+    public readonly bool _isConstant;
+    public readonly Dafny.ISequence<DAST._IType> _arguments;
+    public Expression_SelectFn(DAST._IExpression expr, Dafny.ISequence<Dafny.Rune> field, bool onDatatype, bool isStatic, bool isConstant, Dafny.ISequence<DAST._IType> arguments) : base() {
+      this._expr = expr;
+      this._field = field;
+      this._onDatatype = onDatatype;
+      this._isStatic = isStatic;
+      this._isConstant = isConstant;
+      this._arguments = arguments;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_SelectFn(_expr, _field, _onDatatype, _isStatic, _isConstant, _arguments);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_SelectFn;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._field, oth._field) && this._onDatatype == oth._onDatatype && this._isStatic == oth._isStatic && this._isConstant == oth._isConstant && object.Equals(this._arguments, oth._arguments);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 30;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._field));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._onDatatype));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isStatic));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isConstant));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._arguments));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.SelectFn";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._field);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._onDatatype);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._isStatic);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._isConstant);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._arguments);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Index : Expression {
+    public readonly DAST._IExpression _expr;
+    public readonly DAST._ICollKind _collKind;
+    public readonly Dafny.ISequence<DAST._IExpression> _indices;
+    public Expression_Index(DAST._IExpression expr, DAST._ICollKind collKind, Dafny.ISequence<DAST._IExpression> indices) : base() {
+      this._expr = expr;
+      this._collKind = collKind;
+      this._indices = indices;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Index(_expr, _collKind, _indices);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Index;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._collKind, oth._collKind) && object.Equals(this._indices, oth._indices);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 31;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._collKind));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._indices));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Index";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._collKind);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._indices);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_IndexRange : Expression {
+    public readonly DAST._IExpression _expr;
+    public readonly bool _isArray;
+    public readonly Std.Wrappers._IOption<DAST._IExpression> _low;
+    public readonly Std.Wrappers._IOption<DAST._IExpression> _high;
+    public Expression_IndexRange(DAST._IExpression expr, bool isArray, Std.Wrappers._IOption<DAST._IExpression> low, Std.Wrappers._IOption<DAST._IExpression> high) : base() {
+      this._expr = expr;
+      this._isArray = isArray;
+      this._low = low;
+      this._high = high;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_IndexRange(_expr, _isArray, _low, _high);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_IndexRange;
+      return oth != null && object.Equals(this._expr, oth._expr) && this._isArray == oth._isArray && object.Equals(this._low, oth._low) && object.Equals(this._high, oth._high);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 32;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isArray));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._low));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._high));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.IndexRange";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._isArray);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._low);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._high);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_TupleSelect : Expression {
+    public readonly DAST._IExpression _expr;
+    public readonly BigInteger _index;
+    public readonly DAST._IType _fieldType;
+    public Expression_TupleSelect(DAST._IExpression expr, BigInteger index, DAST._IType fieldType) : base() {
+      this._expr = expr;
+      this._index = index;
+      this._fieldType = fieldType;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_TupleSelect(_expr, _index, _fieldType);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_TupleSelect;
+      return oth != null && object.Equals(this._expr, oth._expr) && this._index == oth._index && object.Equals(this._fieldType, oth._fieldType);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 33;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._index));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fieldType));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.TupleSelect";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._index);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._fieldType);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Call : Expression {
+    public readonly DAST._IExpression _on;
+    public readonly DAST._ICallName _callName;
+    public readonly Dafny.ISequence<DAST._IType> _typeArgs;
+    public readonly Dafny.ISequence<DAST._IExpression> _args;
+    public Expression_Call(DAST._IExpression @on, DAST._ICallName callName, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args) : base() {
+      this._on = @on;
+      this._callName = callName;
+      this._typeArgs = typeArgs;
+      this._args = args;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Call(_on, _callName, _typeArgs, _args);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Call;
+      return oth != null && object.Equals(this._on, oth._on) && object.Equals(this._callName, oth._callName) && object.Equals(this._typeArgs, oth._typeArgs) && object.Equals(this._args, oth._args);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 34;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._on));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._callName));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeArgs));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Call";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._on);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._callName);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeArgs);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._args);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Lambda : Expression {
+    public readonly Dafny.ISequence<DAST._IFormal> _params;
+    public readonly DAST._IType _retType;
+    public readonly Dafny.ISequence<DAST._IStatement> _body;
+    public Expression_Lambda(Dafny.ISequence<DAST._IFormal> @params, DAST._IType retType, Dafny.ISequence<DAST._IStatement> body) : base() {
+      this._params = @params;
+      this._retType = retType;
+      this._body = body;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Lambda(_params, _retType, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Lambda;
+      return oth != null && object.Equals(this._params, oth._params) && object.Equals(this._retType, oth._retType) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 35;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._params));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._retType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Lambda";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._params);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._retType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_BetaRedex : Expression {
+    public readonly Dafny.ISequence<_System._ITuple2<DAST._IFormal, DAST._IExpression>> _values;
+    public readonly DAST._IType _retType;
+    public readonly DAST._IExpression _expr;
+    public Expression_BetaRedex(Dafny.ISequence<_System._ITuple2<DAST._IFormal, DAST._IExpression>> values, DAST._IType retType, DAST._IExpression expr) : base() {
+      this._values = values;
+      this._retType = retType;
+      this._expr = expr;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_BetaRedex(_values, _retType, _expr);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_BetaRedex;
+      return oth != null && object.Equals(this._values, oth._values) && object.Equals(this._retType, oth._retType) && object.Equals(this._expr, oth._expr);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 36;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._values));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._retType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.BetaRedex";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._values);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._retType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_IIFE : Expression {
+    public readonly Dafny.ISequence<Dafny.Rune> _ident;
+    public readonly DAST._IType _typ;
+    public readonly DAST._IExpression _value;
+    public readonly DAST._IExpression _iifeBody;
+    public Expression_IIFE(Dafny.ISequence<Dafny.Rune> ident, DAST._IType typ, DAST._IExpression @value, DAST._IExpression iifeBody) : base() {
+      this._ident = ident;
+      this._typ = typ;
+      this._value = @value;
+      this._iifeBody = iifeBody;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_IIFE(_ident, _typ, _value, _iifeBody);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_IIFE;
+      return oth != null && object.Equals(this._ident, oth._ident) && object.Equals(this._typ, oth._typ) && object.Equals(this._value, oth._value) && object.Equals(this._iifeBody, oth._iifeBody);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 37;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._ident));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._iifeBody));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.IIFE";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._ident);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typ);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._iifeBody);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Apply : Expression {
+    public readonly DAST._IExpression _expr;
+    public readonly Dafny.ISequence<DAST._IExpression> _args;
+    public Expression_Apply(DAST._IExpression expr, Dafny.ISequence<DAST._IExpression> args) : base() {
+      this._expr = expr;
+      this._args = args;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Apply(_expr, _args);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Apply;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._args, oth._args);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 38;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Apply";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._args);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_TypeTest : Expression {
+    public readonly DAST._IExpression _on;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _dType;
+    public readonly Dafny.ISequence<Dafny.Rune> _variant;
+    public Expression_TypeTest(DAST._IExpression @on, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dType, Dafny.ISequence<Dafny.Rune> variant) : base() {
+      this._on = @on;
+      this._dType = dType;
+      this._variant = variant;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_TypeTest(_on, _dType, _variant);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_TypeTest;
+      return oth != null && object.Equals(this._on, oth._on) && object.Equals(this._dType, oth._dType) && object.Equals(this._variant, oth._variant);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 39;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._on));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._dType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._variant));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.TypeTest";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._on);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._dType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._variant);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Is : Expression {
+    public readonly DAST._IExpression _expr;
+    public readonly DAST._IType _fromType;
+    public readonly DAST._IType _toType;
+    public Expression_Is(DAST._IExpression expr, DAST._IType fromType, DAST._IType toType) : base() {
+      this._expr = expr;
+      this._fromType = fromType;
+      this._toType = toType;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Is(_expr, _fromType, _toType);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Is;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._fromType, oth._fromType) && object.Equals(this._toType, oth._toType);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 40;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fromType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._toType));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Is";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._fromType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._toType);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_InitializationValue : Expression {
+    public readonly DAST._IType _typ;
+    public Expression_InitializationValue(DAST._IType typ) : base() {
+      this._typ = typ;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_InitializationValue(_typ);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_InitializationValue;
+      return oth != null && object.Equals(this._typ, oth._typ);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 41;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.InitializationValue";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._typ);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_BoolBoundedPool : Expression {
+    public Expression_BoolBoundedPool() : base() {
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_BoolBoundedPool();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_BoolBoundedPool;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 42;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.BoolBoundedPool";
+      return s;
+    }
+  }
+  public class Expression_SetBoundedPool : Expression {
+    public readonly DAST._IExpression _of;
+    public Expression_SetBoundedPool(DAST._IExpression of) : base() {
+      this._of = of;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_SetBoundedPool(_of);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_SetBoundedPool;
+      return oth != null && object.Equals(this._of, oth._of);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 43;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._of));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.SetBoundedPool";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._of);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_MapBoundedPool : Expression {
+    public readonly DAST._IExpression _of;
+    public Expression_MapBoundedPool(DAST._IExpression of) : base() {
+      this._of = of;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_MapBoundedPool(_of);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_MapBoundedPool;
+      return oth != null && object.Equals(this._of, oth._of);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 44;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._of));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.MapBoundedPool";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._of);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_SeqBoundedPool : Expression {
+    public readonly DAST._IExpression _of;
+    public readonly bool _includeDuplicates;
+    public Expression_SeqBoundedPool(DAST._IExpression of, bool includeDuplicates) : base() {
+      this._of = of;
+      this._includeDuplicates = includeDuplicates;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_SeqBoundedPool(_of, _includeDuplicates);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_SeqBoundedPool;
+      return oth != null && object.Equals(this._of, oth._of) && this._includeDuplicates == oth._includeDuplicates;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 45;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._of));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._includeDuplicates));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.SeqBoundedPool";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._of);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._includeDuplicates);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_MultisetBoundedPool : Expression {
+    public readonly DAST._IExpression _of;
+    public readonly bool _includeDuplicates;
+    public Expression_MultisetBoundedPool(DAST._IExpression of, bool includeDuplicates) : base() {
+      this._of = of;
+      this._includeDuplicates = includeDuplicates;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_MultisetBoundedPool(_of, _includeDuplicates);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_MultisetBoundedPool;
+      return oth != null && object.Equals(this._of, oth._of) && this._includeDuplicates == oth._includeDuplicates;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 46;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._of));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._includeDuplicates));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.MultisetBoundedPool";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._of);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._includeDuplicates);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_ExactBoundedPool : Expression {
+    public readonly DAST._IExpression _of;
+    public Expression_ExactBoundedPool(DAST._IExpression of) : base() {
+      this._of = of;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_ExactBoundedPool(_of);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_ExactBoundedPool;
+      return oth != null && object.Equals(this._of, oth._of);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 47;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._of));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.ExactBoundedPool";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._of);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_IntRange : Expression {
+    public readonly DAST._IType _elemType;
+    public readonly DAST._IExpression _lo;
+    public readonly DAST._IExpression _hi;
+    public readonly bool _up;
+    public Expression_IntRange(DAST._IType elemType, DAST._IExpression lo, DAST._IExpression hi, bool up) : base() {
+      this._elemType = elemType;
+      this._lo = lo;
+      this._hi = hi;
+      this._up = up;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_IntRange(_elemType, _lo, _hi, _up);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_IntRange;
+      return oth != null && object.Equals(this._elemType, oth._elemType) && object.Equals(this._lo, oth._lo) && object.Equals(this._hi, oth._hi) && this._up == oth._up;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 48;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._elemType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._lo));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._hi));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._up));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.IntRange";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._elemType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._lo);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._hi);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._up);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_UnboundedIntRange : Expression {
+    public readonly DAST._IExpression _start;
+    public readonly bool _up;
+    public Expression_UnboundedIntRange(DAST._IExpression start, bool up) : base() {
+      this._start = start;
+      this._up = up;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_UnboundedIntRange(_start, _up);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_UnboundedIntRange;
+      return oth != null && object.Equals(this._start, oth._start) && this._up == oth._up;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 49;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._start));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._up));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.UnboundedIntRange";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._start);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._up);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expression_Quantifier : Expression {
+    public readonly DAST._IType _elemType;
+    public readonly DAST._IExpression _collection;
+    public readonly bool _is__forall;
+    public readonly DAST._IExpression _lambda;
+    public Expression_Quantifier(DAST._IType elemType, DAST._IExpression collection, bool is__forall, DAST._IExpression lambda) : base() {
+      this._elemType = elemType;
+      this._collection = collection;
+      this._is__forall = is__forall;
+      this._lambda = lambda;
+    }
+    public override _IExpression DowncastClone() {
+      if (this is _IExpression dt) { return dt; }
+      return new Expression_Quantifier(_elemType, _collection, _is__forall, _lambda);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Expression_Quantifier;
+      return oth != null && object.Equals(this._elemType, oth._elemType) && object.Equals(this._collection, oth._collection) && this._is__forall == oth._is__forall && object.Equals(this._lambda, oth._lambda);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 50;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._elemType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._collection));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._is__forall));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._lambda));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Expression.Quantifier";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._elemType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._collection);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._is__forall);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._lambda);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IFieldMutability {
+    bool is_ConstantField { get; }
+    bool is_InternalClassConstantFieldOrDatatypeDestructor { get; }
+    bool is_ClassMutableField { get; }
+    _IFieldMutability DowncastClone();
+  }
+  public abstract class FieldMutability : _IFieldMutability {
+    public FieldMutability() {
+    }
+    private static readonly DAST._IFieldMutability theDefault = create_ConstantField();
+    public static DAST._IFieldMutability Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IFieldMutability> _TYPE = new Dafny.TypeDescriptor<DAST._IFieldMutability>(DAST.FieldMutability.Default());
+    public static Dafny.TypeDescriptor<DAST._IFieldMutability> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IFieldMutability create_ConstantField() {
+      return new FieldMutability_ConstantField();
+    }
+    public static _IFieldMutability create_InternalClassConstantFieldOrDatatypeDestructor() {
+      return new FieldMutability_InternalClassConstantFieldOrDatatypeDestructor();
+    }
+    public static _IFieldMutability create_ClassMutableField() {
+      return new FieldMutability_ClassMutableField();
+    }
+    public bool is_ConstantField { get { return this is FieldMutability_ConstantField; } }
+    public bool is_InternalClassConstantFieldOrDatatypeDestructor { get { return this is FieldMutability_InternalClassConstantFieldOrDatatypeDestructor; } }
+    public bool is_ClassMutableField { get { return this is FieldMutability_ClassMutableField; } }
+    public static System.Collections.Generic.IEnumerable<_IFieldMutability> AllSingletonConstructors {
+      get {
+        yield return FieldMutability.create_ConstantField();
+        yield return FieldMutability.create_InternalClassConstantFieldOrDatatypeDestructor();
+        yield return FieldMutability.create_ClassMutableField();
+      }
+    }
+    public abstract _IFieldMutability DowncastClone();
+  }
+  public class FieldMutability_ConstantField : FieldMutability {
+    public FieldMutability_ConstantField() : base() {
+    }
+    public override _IFieldMutability DowncastClone() {
+      if (this is _IFieldMutability dt) { return dt; }
+      return new FieldMutability_ConstantField();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.FieldMutability_ConstantField;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.FieldMutability.ConstantField";
+      return s;
+    }
+  }
+  public class FieldMutability_InternalClassConstantFieldOrDatatypeDestructor : FieldMutability {
+    public FieldMutability_InternalClassConstantFieldOrDatatypeDestructor() : base() {
+    }
+    public override _IFieldMutability DowncastClone() {
+      if (this is _IFieldMutability dt) { return dt; }
+      return new FieldMutability_InternalClassConstantFieldOrDatatypeDestructor();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.FieldMutability_InternalClassConstantFieldOrDatatypeDestructor;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.FieldMutability.InternalClassConstantFieldOrDatatypeDestructor";
+      return s;
+    }
+  }
+  public class FieldMutability_ClassMutableField : FieldMutability {
+    public FieldMutability_ClassMutableField() : base() {
+    }
+    public override _IFieldMutability DowncastClone() {
+      if (this is _IFieldMutability dt) { return dt; }
+      return new FieldMutability_ClassMutableField();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.FieldMutability_ClassMutableField;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.FieldMutability.ClassMutableField";
+      return s;
+    }
+  }
+
+  public interface _IUnaryOp {
+    bool is_Not { get; }
+    bool is_BitwiseNot { get; }
+    bool is_Cardinality { get; }
+    _IUnaryOp DowncastClone();
+  }
+  public abstract class UnaryOp : _IUnaryOp {
+    public UnaryOp() {
+    }
+    private static readonly DAST._IUnaryOp theDefault = create_Not();
+    public static DAST._IUnaryOp Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._IUnaryOp> _TYPE = new Dafny.TypeDescriptor<DAST._IUnaryOp>(DAST.UnaryOp.Default());
+    public static Dafny.TypeDescriptor<DAST._IUnaryOp> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IUnaryOp create_Not() {
+      return new UnaryOp_Not();
+    }
+    public static _IUnaryOp create_BitwiseNot() {
+      return new UnaryOp_BitwiseNot();
+    }
+    public static _IUnaryOp create_Cardinality() {
+      return new UnaryOp_Cardinality();
+    }
+    public bool is_Not { get { return this is UnaryOp_Not; } }
+    public bool is_BitwiseNot { get { return this is UnaryOp_BitwiseNot; } }
+    public bool is_Cardinality { get { return this is UnaryOp_Cardinality; } }
+    public static System.Collections.Generic.IEnumerable<_IUnaryOp> AllSingletonConstructors {
+      get {
+        yield return UnaryOp.create_Not();
+        yield return UnaryOp.create_BitwiseNot();
+        yield return UnaryOp.create_Cardinality();
+      }
+    }
+    public abstract _IUnaryOp DowncastClone();
+  }
+  public class UnaryOp_Not : UnaryOp {
+    public UnaryOp_Not() : base() {
+    }
+    public override _IUnaryOp DowncastClone() {
+      if (this is _IUnaryOp dt) { return dt; }
+      return new UnaryOp_Not();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.UnaryOp_Not;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.UnaryOp.Not";
+      return s;
+    }
+  }
+  public class UnaryOp_BitwiseNot : UnaryOp {
+    public UnaryOp_BitwiseNot() : base() {
+    }
+    public override _IUnaryOp DowncastClone() {
+      if (this is _IUnaryOp dt) { return dt; }
+      return new UnaryOp_BitwiseNot();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.UnaryOp_BitwiseNot;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.UnaryOp.BitwiseNot";
+      return s;
+    }
+  }
+  public class UnaryOp_Cardinality : UnaryOp {
+    public UnaryOp_Cardinality() : base() {
+    }
+    public override _IUnaryOp DowncastClone() {
+      if (this is _IUnaryOp dt) { return dt; }
+      return new UnaryOp_Cardinality();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.UnaryOp_Cardinality;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.UnaryOp.Cardinality";
+      return s;
+    }
+  }
+
+  public interface _ILiteral {
+    bool is_BoolLiteral { get; }
+    bool is_IntLiteral { get; }
+    bool is_DecLiteral { get; }
+    bool is_StringLiteral { get; }
+    bool is_CharLiteral { get; }
+    bool is_CharLiteralUTF16 { get; }
+    bool is_Null { get; }
+    bool dtor_BoolLiteral_a0 { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_IntLiteral_a0 { get; }
+    DAST._IType dtor_IntLiteral_a1 { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_DecLiteral_a0 { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_DecLiteral_a1 { get; }
+    DAST._IType dtor_DecLiteral_a2 { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_StringLiteral_a0 { get; }
+    bool dtor_verbatim { get; }
+    Dafny.Rune dtor_CharLiteral_a0 { get; }
+    BigInteger dtor_CharLiteralUTF16_a0 { get; }
+    DAST._IType dtor_Null_a0 { get; }
+    _ILiteral DowncastClone();
+  }
+  public abstract class Literal : _ILiteral {
+    public Literal() {
+    }
+    private static readonly DAST._ILiteral theDefault = create_BoolLiteral(false);
+    public static DAST._ILiteral Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST._ILiteral> _TYPE = new Dafny.TypeDescriptor<DAST._ILiteral>(DAST.Literal.Default());
+    public static Dafny.TypeDescriptor<DAST._ILiteral> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ILiteral create_BoolLiteral(bool _a0) {
+      return new Literal_BoolLiteral(_a0);
+    }
+    public static _ILiteral create_IntLiteral(Dafny.ISequence<Dafny.Rune> _a0, DAST._IType _a1) {
+      return new Literal_IntLiteral(_a0, _a1);
+    }
+    public static _ILiteral create_DecLiteral(Dafny.ISequence<Dafny.Rune> _a0, Dafny.ISequence<Dafny.Rune> _a1, DAST._IType _a2) {
+      return new Literal_DecLiteral(_a0, _a1, _a2);
+    }
+    public static _ILiteral create_StringLiteral(Dafny.ISequence<Dafny.Rune> _a0, bool verbatim) {
+      return new Literal_StringLiteral(_a0, verbatim);
+    }
+    public static _ILiteral create_CharLiteral(Dafny.Rune _a0) {
+      return new Literal_CharLiteral(_a0);
+    }
+    public static _ILiteral create_CharLiteralUTF16(BigInteger _a0) {
+      return new Literal_CharLiteralUTF16(_a0);
+    }
+    public static _ILiteral create_Null(DAST._IType _a0) {
+      return new Literal_Null(_a0);
+    }
+    public bool is_BoolLiteral { get { return this is Literal_BoolLiteral; } }
+    public bool is_IntLiteral { get { return this is Literal_IntLiteral; } }
+    public bool is_DecLiteral { get { return this is Literal_DecLiteral; } }
+    public bool is_StringLiteral { get { return this is Literal_StringLiteral; } }
+    public bool is_CharLiteral { get { return this is Literal_CharLiteral; } }
+    public bool is_CharLiteralUTF16 { get { return this is Literal_CharLiteralUTF16; } }
+    public bool is_Null { get { return this is Literal_Null; } }
+    public bool dtor_BoolLiteral_a0 {
+      get {
+        var d = this;
+        return ((Literal_BoolLiteral)d)._a0;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_IntLiteral_a0 {
+      get {
+        var d = this;
+        return ((Literal_IntLiteral)d)._a0;
+      }
+    }
+    public DAST._IType dtor_IntLiteral_a1 {
+      get {
+        var d = this;
+        return ((Literal_IntLiteral)d)._a1;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_DecLiteral_a0 {
+      get {
+        var d = this;
+        return ((Literal_DecLiteral)d)._a0;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_DecLiteral_a1 {
+      get {
+        var d = this;
+        return ((Literal_DecLiteral)d)._a1;
+      }
+    }
+    public DAST._IType dtor_DecLiteral_a2 {
+      get {
+        var d = this;
+        return ((Literal_DecLiteral)d)._a2;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_StringLiteral_a0 {
+      get {
+        var d = this;
+        return ((Literal_StringLiteral)d)._a0;
+      }
+    }
+    public bool dtor_verbatim {
+      get {
+        var d = this;
+        return ((Literal_StringLiteral)d)._verbatim;
+      }
+    }
+    public Dafny.Rune dtor_CharLiteral_a0 {
+      get {
+        var d = this;
+        return ((Literal_CharLiteral)d)._a0;
+      }
+    }
+    public BigInteger dtor_CharLiteralUTF16_a0 {
+      get {
+        var d = this;
+        return ((Literal_CharLiteralUTF16)d)._a0;
+      }
+    }
+    public DAST._IType dtor_Null_a0 {
+      get {
+        var d = this;
+        return ((Literal_Null)d)._a0;
+      }
+    }
+    public abstract _ILiteral DowncastClone();
+  }
+  public class Literal_BoolLiteral : Literal {
+    public readonly bool _a0;
+    public Literal_BoolLiteral(bool _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _ILiteral DowncastClone() {
+      if (this is _ILiteral dt) { return dt; }
+      return new Literal_BoolLiteral(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Literal_BoolLiteral;
+      return oth != null && this._a0 == oth._a0;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Literal.BoolLiteral";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Literal_IntLiteral : Literal {
+    public readonly Dafny.ISequence<Dafny.Rune> _a0;
+    public readonly DAST._IType _a1;
+    public Literal_IntLiteral(Dafny.ISequence<Dafny.Rune> _a0, DAST._IType _a1) : base() {
+      this._a0 = _a0;
+      this._a1 = _a1;
+    }
+    public override _ILiteral DowncastClone() {
+      if (this is _ILiteral dt) { return dt; }
+      return new Literal_IntLiteral(_a0, _a1);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Literal_IntLiteral;
+      return oth != null && object.Equals(this._a0, oth._a0) && object.Equals(this._a1, oth._a1);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a1));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Literal.IntLiteral";
+      s += "(";
+      s += this._a0.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._a1);
+      s += ")";
+      return s;
+    }
+  }
+  public class Literal_DecLiteral : Literal {
+    public readonly Dafny.ISequence<Dafny.Rune> _a0;
+    public readonly Dafny.ISequence<Dafny.Rune> _a1;
+    public readonly DAST._IType _a2;
+    public Literal_DecLiteral(Dafny.ISequence<Dafny.Rune> _a0, Dafny.ISequence<Dafny.Rune> _a1, DAST._IType _a2) : base() {
+      this._a0 = _a0;
+      this._a1 = _a1;
+      this._a2 = _a2;
+    }
+    public override _ILiteral DowncastClone() {
+      if (this is _ILiteral dt) { return dt; }
+      return new Literal_DecLiteral(_a0, _a1, _a2);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Literal_DecLiteral;
+      return oth != null && object.Equals(this._a0, oth._a0) && object.Equals(this._a1, oth._a1) && object.Equals(this._a2, oth._a2);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a2));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Literal.DecLiteral";
+      s += "(";
+      s += this._a0.ToVerbatimString(true);
+      s += ", ";
+      s += this._a1.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._a2);
+      s += ")";
+      return s;
+    }
+  }
+  public class Literal_StringLiteral : Literal {
+    public readonly Dafny.ISequence<Dafny.Rune> _a0;
+    public readonly bool _verbatim;
+    public Literal_StringLiteral(Dafny.ISequence<Dafny.Rune> _a0, bool verbatim) : base() {
+      this._a0 = _a0;
+      this._verbatim = verbatim;
+    }
+    public override _ILiteral DowncastClone() {
+      if (this is _ILiteral dt) { return dt; }
+      return new Literal_StringLiteral(_a0, _verbatim);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Literal_StringLiteral;
+      return oth != null && object.Equals(this._a0, oth._a0) && this._verbatim == oth._verbatim;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._verbatim));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Literal.StringLiteral";
+      s += "(";
+      s += this._a0.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._verbatim);
+      s += ")";
+      return s;
+    }
+  }
+  public class Literal_CharLiteral : Literal {
+    public readonly Dafny.Rune _a0;
+    public Literal_CharLiteral(Dafny.Rune _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _ILiteral DowncastClone() {
+      if (this is _ILiteral dt) { return dt; }
+      return new Literal_CharLiteral(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Literal_CharLiteral;
+      return oth != null && this._a0 == oth._a0;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Literal.CharLiteral";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Literal_CharLiteralUTF16 : Literal {
+    public readonly BigInteger _a0;
+    public Literal_CharLiteralUTF16(BigInteger _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _ILiteral DowncastClone() {
+      if (this is _ILiteral dt) { return dt; }
+      return new Literal_CharLiteralUTF16(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Literal_CharLiteralUTF16;
+      return oth != null && this._a0 == oth._a0;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Literal.CharLiteralUTF16";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+  public class Literal_Null : Literal {
+    public readonly DAST._IType _a0;
+    public Literal_Null(DAST._IType _a0) : base() {
+      this._a0 = _a0;
+    }
+    public override _ILiteral DowncastClone() {
+      if (this is _ILiteral dt) { return dt; }
+      return new Literal_Null(_a0);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Literal_Null;
+      return oth != null && object.Equals(this._a0, oth._a0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 6;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DAST.Literal.Null";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._a0);
+      s += ")";
+      return s;
+    }
+  }
+} // end of namespace DAST
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/DAST_Format.cs b/Source/DafnyCore/GeneratedFromDafny/DAST_Format.cs
new file mode 100644
index 00000000000..b7550c51a94
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/DAST_Format.cs
@@ -0,0 +1,237 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace DAST.Format {
+
+  public partial class __default {
+    public static BigInteger SeqToHeight<__T>(Dafny.ISequence<__T> s, Func<__T, BigInteger> f)
+    {
+      if ((new BigInteger((s).Count)).Sign == 0) {
+        return BigInteger.Zero;
+      } else {
+        BigInteger _0_i = Dafny.Helpers.Id<Func<__T, BigInteger>>(f)((s).Select(BigInteger.Zero));
+        BigInteger _1_j = DAST.Format.__default.SeqToHeight<__T>((s).Drop(BigInteger.One), f);
+        if ((_0_i) < (_1_j)) {
+          return _1_j;
+        } else {
+          return _0_i;
+        }
+      }
+    }
+  }
+
+  public interface _IUnaryOpFormat {
+    bool is_NoFormat { get; }
+    bool is_CombineFormat { get; }
+    _IUnaryOpFormat DowncastClone();
+  }
+  public abstract class UnaryOpFormat : _IUnaryOpFormat {
+    public UnaryOpFormat() {
+    }
+    private static readonly DAST.Format._IUnaryOpFormat theDefault = create_NoFormat();
+    public static DAST.Format._IUnaryOpFormat Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST.Format._IUnaryOpFormat> _TYPE = new Dafny.TypeDescriptor<DAST.Format._IUnaryOpFormat>(DAST.Format.UnaryOpFormat.Default());
+    public static Dafny.TypeDescriptor<DAST.Format._IUnaryOpFormat> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IUnaryOpFormat create_NoFormat() {
+      return new UnaryOpFormat_NoFormat();
+    }
+    public static _IUnaryOpFormat create_CombineFormat() {
+      return new UnaryOpFormat_CombineFormat();
+    }
+    public bool is_NoFormat { get { return this is UnaryOpFormat_NoFormat; } }
+    public bool is_CombineFormat { get { return this is UnaryOpFormat_CombineFormat; } }
+    public static System.Collections.Generic.IEnumerable<_IUnaryOpFormat> AllSingletonConstructors {
+      get {
+        yield return UnaryOpFormat.create_NoFormat();
+        yield return UnaryOpFormat.create_CombineFormat();
+      }
+    }
+    public abstract _IUnaryOpFormat DowncastClone();
+  }
+  public class UnaryOpFormat_NoFormat : UnaryOpFormat {
+    public UnaryOpFormat_NoFormat() : base() {
+    }
+    public override _IUnaryOpFormat DowncastClone() {
+      if (this is _IUnaryOpFormat dt) { return dt; }
+      return new UnaryOpFormat_NoFormat();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Format.UnaryOpFormat_NoFormat;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Format.UnaryOpFormat.NoFormat";
+      return s;
+    }
+  }
+  public class UnaryOpFormat_CombineFormat : UnaryOpFormat {
+    public UnaryOpFormat_CombineFormat() : base() {
+    }
+    public override _IUnaryOpFormat DowncastClone() {
+      if (this is _IUnaryOpFormat dt) { return dt; }
+      return new UnaryOpFormat_CombineFormat();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Format.UnaryOpFormat_CombineFormat;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Format.UnaryOpFormat.CombineFormat";
+      return s;
+    }
+  }
+
+  public interface _IBinaryOpFormat {
+    bool is_NoFormat { get; }
+    bool is_ImpliesFormat { get; }
+    bool is_EquivalenceFormat { get; }
+    bool is_ReverseFormat { get; }
+    _IBinaryOpFormat DowncastClone();
+  }
+  public abstract class BinaryOpFormat : _IBinaryOpFormat {
+    public BinaryOpFormat() {
+    }
+    private static readonly DAST.Format._IBinaryOpFormat theDefault = create_NoFormat();
+    public static DAST.Format._IBinaryOpFormat Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DAST.Format._IBinaryOpFormat> _TYPE = new Dafny.TypeDescriptor<DAST.Format._IBinaryOpFormat>(DAST.Format.BinaryOpFormat.Default());
+    public static Dafny.TypeDescriptor<DAST.Format._IBinaryOpFormat> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IBinaryOpFormat create_NoFormat() {
+      return new BinaryOpFormat_NoFormat();
+    }
+    public static _IBinaryOpFormat create_ImpliesFormat() {
+      return new BinaryOpFormat_ImpliesFormat();
+    }
+    public static _IBinaryOpFormat create_EquivalenceFormat() {
+      return new BinaryOpFormat_EquivalenceFormat();
+    }
+    public static _IBinaryOpFormat create_ReverseFormat() {
+      return new BinaryOpFormat_ReverseFormat();
+    }
+    public bool is_NoFormat { get { return this is BinaryOpFormat_NoFormat; } }
+    public bool is_ImpliesFormat { get { return this is BinaryOpFormat_ImpliesFormat; } }
+    public bool is_EquivalenceFormat { get { return this is BinaryOpFormat_EquivalenceFormat; } }
+    public bool is_ReverseFormat { get { return this is BinaryOpFormat_ReverseFormat; } }
+    public static System.Collections.Generic.IEnumerable<_IBinaryOpFormat> AllSingletonConstructors {
+      get {
+        yield return BinaryOpFormat.create_NoFormat();
+        yield return BinaryOpFormat.create_ImpliesFormat();
+        yield return BinaryOpFormat.create_EquivalenceFormat();
+        yield return BinaryOpFormat.create_ReverseFormat();
+      }
+    }
+    public abstract _IBinaryOpFormat DowncastClone();
+  }
+  public class BinaryOpFormat_NoFormat : BinaryOpFormat {
+    public BinaryOpFormat_NoFormat() : base() {
+    }
+    public override _IBinaryOpFormat DowncastClone() {
+      if (this is _IBinaryOpFormat dt) { return dt; }
+      return new BinaryOpFormat_NoFormat();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Format.BinaryOpFormat_NoFormat;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Format.BinaryOpFormat.NoFormat";
+      return s;
+    }
+  }
+  public class BinaryOpFormat_ImpliesFormat : BinaryOpFormat {
+    public BinaryOpFormat_ImpliesFormat() : base() {
+    }
+    public override _IBinaryOpFormat DowncastClone() {
+      if (this is _IBinaryOpFormat dt) { return dt; }
+      return new BinaryOpFormat_ImpliesFormat();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Format.BinaryOpFormat_ImpliesFormat;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Format.BinaryOpFormat.ImpliesFormat";
+      return s;
+    }
+  }
+  public class BinaryOpFormat_EquivalenceFormat : BinaryOpFormat {
+    public BinaryOpFormat_EquivalenceFormat() : base() {
+    }
+    public override _IBinaryOpFormat DowncastClone() {
+      if (this is _IBinaryOpFormat dt) { return dt; }
+      return new BinaryOpFormat_EquivalenceFormat();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Format.BinaryOpFormat_EquivalenceFormat;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Format.BinaryOpFormat.EquivalenceFormat";
+      return s;
+    }
+  }
+  public class BinaryOpFormat_ReverseFormat : BinaryOpFormat {
+    public BinaryOpFormat_ReverseFormat() : base() {
+    }
+    public override _IBinaryOpFormat DowncastClone() {
+      if (this is _IBinaryOpFormat dt) { return dt; }
+      return new BinaryOpFormat_ReverseFormat();
+    }
+    public override bool Equals(object other) {
+      var oth = other as DAST.Format.BinaryOpFormat_ReverseFormat;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Format.BinaryOpFormat.ReverseFormat";
+      return s;
+    }
+  }
+} // end of namespace DAST.Format
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/DCOMP.cs b/Source/DafnyCore/GeneratedFromDafny/DCOMP.cs
new file mode 100644
index 00000000000..79d6b696273
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/DCOMP.cs
@@ -0,0 +1,6994 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace DCOMP {
+
+
+  public partial class COMP {
+    public COMP() {
+      this.error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.Default();
+      this.optimizations = Dafny.Sequence<Func<RAST._IMod, RAST._IMod>>.Empty;
+      this._rootType = Defs.RootType.Default();
+      this._charType = Defs.CharType.Default();
+      this._pointerType = Defs.PointerType.Default();
+    }
+    public RAST._IType Object(RAST._IType underlying) {
+      if (((this).pointerType).is_Raw) {
+        return RAST.__default.PtrType(underlying);
+      } else {
+        return RAST.__default.ObjectType(underlying);
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> error {get; set;}
+    public Dafny.ISequence<Func<RAST._IMod, RAST._IMod>> optimizations {get; set;}
+    public void __ctor(Defs._ICharType charType, Defs._IPointerType pointerType, Defs._IRootType rootType)
+    {
+      (this)._charType = charType;
+      (this)._pointerType = pointerType;
+      (this)._rootType = rootType;
+      (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None();
+      (this).optimizations = Dafny.Sequence<Func<RAST._IMod, RAST._IMod>>.FromElements(ExpressionOptimization.__default.apply, FactorPathsOptimization.__default.apply((this).thisFile));
+    }
+    public bool HasAttribute(Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<Dafny.Rune> name)
+    {
+      return Dafny.Helpers.Id<Func<Dafny.ISequence<DAST._IAttribute>, Dafny.ISequence<Dafny.Rune>, bool>>((_0_attributes, _1_name) => Dafny.Helpers.Quantifier<DAST._IAttribute>((_0_attributes).UniqueElements, false, (((_exists_var_0) => {
+        DAST._IAttribute _2_attribute = (DAST._IAttribute)_exists_var_0;
+        return ((_0_attributes).Contains(_2_attribute)) && ((((_2_attribute).dtor_name).Equals(_1_name)) && ((new BigInteger(((_2_attribute).dtor_args).Count)).Sign == 0));
+      }))))(attributes, name);
+    }
+    public DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> GenModule(DAST._IModule mod, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> containingPath)
+    {
+      DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> s = DafnyCompilerRustUtils.SeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Default();
+      _System._ITuple2<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs0 = DafnyCompilerRustUtils.__default.DafnyNameToContainingPathAndName((mod).dtor_name, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements());
+      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _0_innerPath = _let_tmp_rhs0.dtor__0;
+      Dafny.ISequence<Dafny.Rune> _1_innerName = _let_tmp_rhs0.dtor__1;
+      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _2_containingPath;
+      _2_containingPath = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(containingPath, _0_innerPath);
+      Dafny.ISequence<Dafny.Rune> _3_modName;
+      _3_modName = Defs.__default.escapeName(_1_innerName);
+      if (((mod).dtor_body).is_None) {
+        s = DafnyCompilerRustUtils.GatheringModule.Wrap(Defs.__default.ContainingPathToRust(_2_containingPath), RAST.Mod.create_ExternMod(_3_modName));
+      } else {
+        Defs._IExternAttribute _4_optExtern;
+        _4_optExtern = Defs.__default.ExtractExternMod(mod);
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _5_attributes;
+        _5_attributes = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements();
+        if ((this).HasAttribute((mod).dtor_attributes, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("rust_cfg_test"))) {
+          _5_attributes = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[cfg(test)]"));
+        }
+        Dafny.ISequence<RAST._IModDecl> _6_body;
+        DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> _7_allmodules;
+        Dafny.ISequence<RAST._IModDecl> _out0;
+        DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> _out1;
+        (this).GenModuleBody(((mod).dtor_body).dtor_value, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_2_containingPath, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_1_innerName)), out _out0, out _out1);
+        _6_body = _out0;
+        _7_allmodules = _out1;
+        if ((_4_optExtern).is_SimpleExtern) {
+          if ((mod).dtor_requiresExterns) {
+            _6_body = Dafny.Sequence<RAST._IModDecl>.Concat(Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), ((((this).thisFile).MSel(Defs.__default.DAFNY__EXTERN__MODULE)).MSels(Defs.__default.SplitRustPathElement(Defs.__default.ReplaceDotByDoubleColon((_4_optExtern).dtor_overrideName), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*"))))), _6_body);
+          }
+        } else if ((_4_optExtern).is_AdvancedExtern) {
+          (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Externs on modules can only have 1 string argument"));
+        } else if ((_4_optExtern).is_UnsupportedExtern) {
+          (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some((_4_optExtern).dtor_reason);
+        }
+        s = DafnyCompilerRustUtils.GatheringModule.MergeSeqMap(DafnyCompilerRustUtils.GatheringModule.Wrap(Defs.__default.ContainingPathToRust(_2_containingPath), RAST.Mod.create_Mod((mod).dtor_docString, _5_attributes, _3_modName, _6_body)), _7_allmodules);
+      }
+      return s;
+    }
+    public void GenModuleBody(Dafny.ISequence<DAST._IModuleItem> body, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> containingPath, out Dafny.ISequence<RAST._IModDecl> s, out DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> allmodules)
+    {
+      s = Dafny.Sequence<RAST._IModDecl>.Empty;
+      allmodules = DafnyCompilerRustUtils.SeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Default();
+      s = Dafny.Sequence<RAST._IModDecl>.FromElements();
+      allmodules = DafnyCompilerRustUtils.SeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Empty();
+      BigInteger _hi0 = new BigInteger((body).Count);
+      for (BigInteger _0_i = BigInteger.Zero; _0_i < _hi0; _0_i++) {
+        Dafny.ISequence<RAST._IModDecl> _1_generated = Dafny.Sequence<RAST._IModDecl>.Empty;
+        DAST._IModuleItem _source0 = (body).Select(_0_i);
+        {
+          if (_source0.is_Module) {
+            DAST._IModule _2_m = _source0.dtor_Module_a0;
+            DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> _3_mm;
+            DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> _out0;
+            _out0 = (this).GenModule(_2_m, containingPath);
+            _3_mm = _out0;
+            allmodules = DafnyCompilerRustUtils.GatheringModule.MergeSeqMap(allmodules, _3_mm);
+            _1_generated = Dafny.Sequence<RAST._IModDecl>.FromElements();
+            goto after_match0;
+          }
+        }
+        {
+          if (_source0.is_Class) {
+            DAST._IClass _4_c = _source0.dtor_Class_a0;
+            Dafny.ISequence<RAST._IModDecl> _out1;
+            _out1 = (this).GenClass(_4_c, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(containingPath, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((_4_c).dtor_name)));
+            _1_generated = _out1;
+            goto after_match0;
+          }
+        }
+        {
+          if (_source0.is_Trait) {
+            DAST._ITrait _5_t = _source0.dtor_Trait_a0;
+            Dafny.ISequence<RAST._IModDecl> _out2;
+            _out2 = (this).GenTrait(_5_t, containingPath);
+            _1_generated = _out2;
+            goto after_match0;
+          }
+        }
+        {
+          if (_source0.is_Newtype) {
+            DAST._INewtype _6_n = _source0.dtor_Newtype_a0;
+            Dafny.ISequence<RAST._IModDecl> _out3;
+            _out3 = (this).GenNewtype(_6_n, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(containingPath, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((_6_n).dtor_name)));
+            _1_generated = _out3;
+            goto after_match0;
+          }
+        }
+        {
+          if (_source0.is_SynonymType) {
+            DAST._ISynonymType _7_s = _source0.dtor_SynonymType_a0;
+            Dafny.ISequence<RAST._IModDecl> _out4;
+            _out4 = (this).GenSynonymType(_7_s);
+            _1_generated = _out4;
+            goto after_match0;
+          }
+        }
+        {
+          DAST._IDatatype _8_d = _source0.dtor_Datatype_a0;
+          Dafny.ISequence<RAST._IModDecl> _out5;
+          _out5 = (this).GenDatatype(_8_d, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(containingPath, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((_8_d).dtor_name)));
+          _1_generated = _out5;
+        }
+      after_match0: ;
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, _1_generated);
+      }
+    }
+    public void GenTypeParam(DAST._ITypeArgDecl tp, out DAST._IType typeArg, out RAST._ITypeParamDecl typeParam)
+    {
+      typeArg = DAST.Type.Default();
+      typeParam = RAST.TypeParamDecl.Default();
+      typeArg = DAST.Type.create_TypeArg((tp).dtor_name);
+      Dafny.ISequence<RAST._IType> _0_genTpConstraint;
+      if (((tp).dtor_bounds).Contains(DAST.TypeArgBound.create_SupportsEquality())) {
+        _0_genTpConstraint = Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.DafnyTypeEq);
+      } else {
+        _0_genTpConstraint = Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.DafnyType);
+      }
+      if (((tp).dtor_bounds).Contains(DAST.TypeArgBound.create_SupportsDefault())) {
+        _0_genTpConstraint = Dafny.Sequence<RAST._IType>.Concat(_0_genTpConstraint, Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.DefaultTrait));
+      }
+      typeParam = RAST.TypeParamDecl.create(Defs.__default.escapeName(((tp).dtor_name)), _0_genTpConstraint);
+    }
+    public void GenTypeParameters(Dafny.ISequence<DAST._ITypeArgDecl> @params, out Dafny.ISequence<DAST._IType> typeParamsSeq, out Dafny.ISequence<RAST._IType> rTypeParams, out Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls)
+    {
+      typeParamsSeq = Dafny.Sequence<DAST._IType>.Empty;
+      rTypeParams = Dafny.Sequence<RAST._IType>.Empty;
+      rTypeParamsDecls = Dafny.Sequence<RAST._ITypeParamDecl>.Empty;
+      typeParamsSeq = Dafny.Sequence<DAST._IType>.FromElements();
+      rTypeParams = Dafny.Sequence<RAST._IType>.FromElements();
+      rTypeParamsDecls = Dafny.Sequence<RAST._ITypeParamDecl>.FromElements();
+      if ((new BigInteger((@params).Count)).Sign == 1) {
+        BigInteger _hi0 = new BigInteger((@params).Count);
+        for (BigInteger _0_tpI = BigInteger.Zero; _0_tpI < _hi0; _0_tpI++) {
+          DAST._ITypeArgDecl _1_tp;
+          _1_tp = (@params).Select(_0_tpI);
+          DAST._IType _2_typeArg;
+          RAST._ITypeParamDecl _3_typeParam;
+          DAST._IType _out0;
+          RAST._ITypeParamDecl _out1;
+          (this).GenTypeParam(_1_tp, out _out0, out _out1);
+          _2_typeArg = _out0;
+          _3_typeParam = _out1;
+          RAST._IType _4_rType;
+          RAST._IType _out2;
+          _out2 = (this).GenType(_2_typeArg, Defs.GenTypeContext.@default());
+          _4_rType = _out2;
+          typeParamsSeq = Dafny.Sequence<DAST._IType>.Concat(typeParamsSeq, Dafny.Sequence<DAST._IType>.FromElements(_2_typeArg));
+          rTypeParams = Dafny.Sequence<RAST._IType>.Concat(rTypeParams, Dafny.Sequence<RAST._IType>.FromElements(_4_rType));
+          rTypeParamsDecls = Dafny.Sequence<RAST._ITypeParamDecl>.Concat(rTypeParamsDecls, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_3_typeParam));
+        }
+      }
+    }
+    public bool IsSameResolvedTypeAnyArgs(DAST._IResolvedType r1, DAST._IResolvedType r2)
+    {
+      return (((r1).dtor_path).Equals((r2).dtor_path)) && (object.Equals((r1).dtor_kind, (r2).dtor_kind));
+    }
+    public bool IsSameResolvedType(DAST._IResolvedType r1, DAST._IResolvedType r2)
+    {
+      return ((this).IsSameResolvedTypeAnyArgs(r1, r2)) && (((r1).dtor_typeArgs).Equals((r2).dtor_typeArgs));
+    }
+    public Dafny.ISet<Dafny.ISequence<Dafny.Rune>> GatherTypeParamNames(Dafny.ISet<Dafny.ISequence<Dafny.Rune>> types, RAST._IType typ)
+    {
+      return (typ).Fold<Dafny.ISet<Dafny.ISequence<Dafny.Rune>>>(types, ((System.Func<Dafny.ISet<Dafny.ISequence<Dafny.Rune>>, RAST._IType, Dafny.ISet<Dafny.ISequence<Dafny.Rune>>>)((_0_types, _1_currentType) => {
+        return (((_1_currentType).is_TIdentifier) ? (Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_0_types, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements((_1_currentType).dtor_name))) : (_0_types));
+      })));
+    }
+    public void GenField(DAST._IField field, out RAST._IField rfield, out RAST._IAssignIdentifier fieldInit, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> usedTypeParams)
+    {
+      rfield = RAST.Field.Default();
+      fieldInit = RAST.AssignIdentifier.Default();
+      usedTypeParams = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      usedTypeParams = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+      RAST._IType _0_fieldType;
+      RAST._IType _out0;
+      _out0 = (this).GenType(((field).dtor_formal).dtor_typ, Defs.GenTypeContext.@default());
+      _0_fieldType = _out0;
+      if (!((field).dtor_isConstant)) {
+        _0_fieldType = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Field"))).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(_0_fieldType));
+      }
+      usedTypeParams = (this).GatherTypeParamNames(usedTypeParams, _0_fieldType);
+      Dafny.ISequence<Dafny.Rune> _1_fieldRustName;
+      _1_fieldRustName = Defs.__default.escapeVar(((field).dtor_formal).dtor_name);
+      rfield = RAST.Field.create(RAST.Visibility.create_PUB(), RAST.Formal.create(_1_fieldRustName, _0_fieldType));
+      Std.Wrappers._IOption<DAST._IExpression> _source0 = (field).dtor_defaultValue;
+      {
+        if (_source0.is_Some) {
+          DAST._IExpression _2_e = _source0.dtor_value;
+          {
+            RAST._IExpr _3_expr;
+            Defs._IOwnership _4___v0;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _5___v1;
+            RAST._IExpr _out1;
+            Defs._IOwnership _out2;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out3;
+            (this).GenExpr(_2_e, Defs.SelfInfo.create_NoSelf(), Defs.Environment.Empty(), Defs.Ownership.create_OwnershipOwned(), out _out1, out _out2, out _out3);
+            _3_expr = _out1;
+            _4___v0 = _out2;
+            _5___v1 = _out3;
+            fieldInit = RAST.AssignIdentifier.create(_1_fieldRustName, _3_expr);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        {
+          RAST._IExpr _6_default;
+          _6_default = RAST.__default.std__default__Default__default;
+          if ((_0_fieldType).IsObjectOrPointer()) {
+            _6_default = (_0_fieldType).ToNullExpr();
+          }
+          fieldInit = RAST.AssignIdentifier.create(_1_fieldRustName, _6_default);
+        }
+      }
+    after_match0: ;
+    }
+    public void GetName(Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> kind, out Dafny.ISequence<Dafny.Rune> rName, out Defs._IExternAttribute @extern)
+    {
+      rName = Dafny.Sequence<Dafny.Rune>.Empty;
+      @extern = Defs.ExternAttribute.Default();
+      @extern = Defs.__default.ExtractExtern(attributes, name);
+      if ((@extern).is_SimpleExtern) {
+        rName = (@extern).dtor_overrideName;
+      } else {
+        rName = Defs.__default.escapeName(name);
+        if ((@extern).is_AdvancedExtern) {
+          (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Multi-argument externs not supported for "), kind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" yet")));
+        }
+      }
+    }
+    public Dafny.ISequence<RAST._IModDecl> GenTraitImplementations(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path, Dafny.ISequence<RAST._IType> rTypeParams, Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls, Dafny.ISequence<DAST._IType> superTraitTypes, Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>,Dafny.ISequence<RAST._IImplMember>> traitBodies, Defs._IExternAttribute @extern, Dafny.ISequence<Dafny.Rune> kind)
+    {
+      Dafny.ISequence<RAST._IModDecl> s = Dafny.Sequence<RAST._IModDecl>.Empty;
+      s = Dafny.Sequence<RAST._IModDecl>.FromElements();
+      RAST._IPath _0_genPath;
+      RAST._IPath _out0;
+      _out0 = (this).GenPath(path, true);
+      _0_genPath = _out0;
+      RAST._IType _1_genSelfPath;
+      _1_genSelfPath = (_0_genPath).AsType();
+      RAST._IExpr _2_genPathExpr;
+      _2_genPathExpr = (_0_genPath).AsExpr();
+      BigInteger _hi0 = new BigInteger((superTraitTypes).Count);
+      for (BigInteger _3_i = BigInteger.Zero; _3_i < _hi0; _3_i++) {
+        DAST._IType _4_superTraitType;
+        _4_superTraitType = (superTraitTypes).Select(_3_i);
+        DAST._IType _source0 = _4_superTraitType;
+        {
+          if (_source0.is_UserDefined) {
+            DAST._IResolvedType resolved0 = _source0.dtor_resolved;
+            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _5_traitPath = resolved0.dtor_path;
+            Dafny.ISequence<DAST._IType> _6_typeArgs = resolved0.dtor_typeArgs;
+            DAST._IResolvedTypeBase kind0 = resolved0.dtor_kind;
+            if (kind0.is_Trait) {
+              DAST._ITraitType _7_traitType = kind0.dtor_traitType;
+              Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _8_properMethods = resolved0.dtor_properMethods;
+              {
+                RAST._IType _9_pathStr;
+                RAST._IType _out1;
+                _out1 = (this).GenPathType(_5_traitPath);
+                _9_pathStr = _out1;
+                Dafny.ISequence<RAST._IType> _10_typeArgs;
+                Dafny.ISequence<RAST._IType> _out2;
+                _out2 = (this).GenTypeArgs(_6_typeArgs, Defs.GenTypeContext.@default());
+                _10_typeArgs = _out2;
+                Dafny.ISequence<RAST._IImplMember> _11_body;
+                _11_body = Dafny.Sequence<RAST._IImplMember>.FromElements();
+                if ((traitBodies).Contains(_5_traitPath)) {
+                  _11_body = Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<RAST._IImplMember>>.Select(traitBodies,_5_traitPath);
+                }
+                RAST._IType _12_fullTraitPath;
+                _12_fullTraitPath = RAST.Type.create_TypeApp(_9_pathStr, _10_typeArgs);
+                if (!((@extern).is_NoExtern)) {
+                  if (((new BigInteger((_11_body).Count)).Sign == 0) && ((new BigInteger((_8_properMethods).Count)).Sign != 0)) {
+                    goto continue_0;
+                  }
+                  if ((new BigInteger((_11_body).Count)) != (new BigInteger((_8_properMethods).Count))) {
+                    (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Error: In the "), kind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ")), RAST.__default.SeqToString<Dafny.ISequence<Dafny.Rune>>(path, ((System.Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>)((_13_s) => {
+  return ((_13_s));
+})), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("."))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", some proper methods of ")), (_12_fullTraitPath)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" are marked {:extern} and some are not.")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" For the Rust compiler, please make all methods (")), RAST.__default.SeqToString<Dafny.ISequence<Dafny.Rune>>(_8_properMethods, ((System.Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>)((_14_s) => {
+  return (_14_s);
+})), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")  bodiless and mark as {:extern} and implement them in a Rust file, ")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("or mark none of them as {:extern} and implement them in Dafny. ")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Alternatively, you can insert an intermediate trait that performs the partial implementation if feasible.")));
+                  }
+                }
+                if ((_7_traitType).is_GeneralTrait) {
+                  _11_body = Dafny.Sequence<RAST._IImplMember>.Concat(_11_body, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_clone"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.Box(RAST.Type.create_DynType(_12_fullTraitPath))), Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.__default.BoxNew(((RAST.__default.self).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("clone"))).Apply0()))))));
+                } else {
+                  if (((kind).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("datatype"))) || ((kind).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("newtype")))) {
+                    RAST._IExpr _15_dummy;
+                    RAST._IExpr _out3;
+                    _out3 = (this).Error(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Cannot extend non-general traits"), (this).InitEmptyExpr());
+                    _15_dummy = _out3;
+                  }
+                }
+                RAST._IModDecl _16_x;
+                _16_x = RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(rTypeParamsDecls, _12_fullTraitPath, RAST.Type.create_TypeApp(_1_genSelfPath, rTypeParams), _11_body));
+                s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(_16_x));
+                Dafny.ISequence<Dafny.Rune> _17_upcastTraitToImplement = Dafny.Sequence<Dafny.Rune>.Empty;
+                Dafny.ISequence<Dafny.Rune> _18_upcastTraitFn = Dafny.Sequence<Dafny.Rune>.Empty;
+                if ((_7_traitType).is_GeneralTrait) {
+                  Dafny.ISequence<Dafny.Rune> _rhs0 = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("UpcastBox");
+                  Dafny.ISequence<Dafny.Rune> _rhs1 = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("UpcastStructBoxFn!");
+                  _17_upcastTraitToImplement = _rhs0;
+                  _18_upcastTraitFn = _rhs1;
+                  s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(rTypeParamsDecls, (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("UpcastBox"))).AsType()).Apply1(RAST.Type.create_DynType(_12_fullTraitPath)), RAST.Type.create_TypeApp(_1_genSelfPath, rTypeParams), Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("upcast"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.Box(RAST.Type.create_DynType(_12_fullTraitPath))), Std.Wrappers.Option<RAST._IExpr>.create_Some((((_2_genPathExpr).ApplyType(rTypeParams)).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_clone"))).Apply1(RAST.__default.self)))))))));
+                } else {
+                  s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(rTypeParamsDecls, (((RAST.__default.dafny__runtime).MSel((this).Upcast)).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_DynType(_12_fullTraitPath))), RAST.Type.create_TypeApp(_1_genSelfPath, rTypeParams), Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_ImplMemberMacro((((RAST.__default.dafny__runtime).MSel((this).UpcastFnMacro)).AsExpr()).Apply1(RAST.Expr.create_ExprFromType(RAST.Type.create_DynType(_12_fullTraitPath)))))))));
+                }
+              }
+              goto after_match0;
+            }
+          }
+        }
+        {
+        }
+      after_match0: ;
+      continue_0: ;
+      }
+    after_0: ;
+      return s;
+    }
+    public Dafny.ISequence<RAST._IModDecl> GenClass(DAST._IClass c, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path)
+    {
+      Dafny.ISequence<RAST._IModDecl> s = Dafny.Sequence<RAST._IModDecl>.Empty;
+      Dafny.ISequence<DAST._IType> _0_typeParamsSeq;
+      Dafny.ISequence<RAST._IType> _1_rTypeParams;
+      Dafny.ISequence<RAST._ITypeParamDecl> _2_rTypeParamsDecls;
+      Dafny.ISequence<DAST._IType> _out0;
+      Dafny.ISequence<RAST._IType> _out1;
+      Dafny.ISequence<RAST._ITypeParamDecl> _out2;
+      (this).GenTypeParameters((c).dtor_typeParams, out _out0, out _out1, out _out2);
+      _0_typeParamsSeq = _out0;
+      _1_rTypeParams = _out1;
+      _2_rTypeParamsDecls = _out2;
+      Dafny.ISequence<Dafny.Rune> _3_constrainedTypeParams;
+      _3_constrainedTypeParams = RAST.TypeParamDecl.ToStringMultiple(_2_rTypeParamsDecls, Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.IND, RAST.__default.IND));
+      Dafny.ISequence<RAST._IField> _4_fields;
+      _4_fields = Dafny.Sequence<RAST._IField>.FromElements();
+      Dafny.ISequence<RAST._IAssignIdentifier> _5_fieldInits;
+      _5_fieldInits = Dafny.Sequence<RAST._IAssignIdentifier>.FromElements();
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _6_usedTypeParams;
+      _6_usedTypeParams = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+      BigInteger _hi0 = new BigInteger(((c).dtor_fields).Count);
+      for (BigInteger _7_fieldI = BigInteger.Zero; _7_fieldI < _hi0; _7_fieldI++) {
+        DAST._IField _8_field;
+        _8_field = ((c).dtor_fields).Select(_7_fieldI);
+        RAST._IField _9_rfield;
+        RAST._IAssignIdentifier _10_fieldInit;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _11_fieldUsedTypeParams;
+        RAST._IField _out3;
+        RAST._IAssignIdentifier _out4;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out5;
+        (this).GenField(_8_field, out _out3, out _out4, out _out5);
+        _9_rfield = _out3;
+        _10_fieldInit = _out4;
+        _11_fieldUsedTypeParams = _out5;
+        _4_fields = Dafny.Sequence<RAST._IField>.Concat(_4_fields, Dafny.Sequence<RAST._IField>.FromElements(_9_rfield));
+        _5_fieldInits = Dafny.Sequence<RAST._IAssignIdentifier>.Concat(_5_fieldInits, Dafny.Sequence<RAST._IAssignIdentifier>.FromElements(_10_fieldInit));
+        _6_usedTypeParams = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_6_usedTypeParams, _11_fieldUsedTypeParams);
+      }
+      BigInteger _hi1 = new BigInteger(((c).dtor_typeParams).Count);
+      for (BigInteger _12_typeParamI = BigInteger.Zero; _12_typeParamI < _hi1; _12_typeParamI++) {
+        DAST._IType _13_typeArg;
+        RAST._ITypeParamDecl _14_typeParam;
+        DAST._IType _out6;
+        RAST._ITypeParamDecl _out7;
+        (this).GenTypeParam(((c).dtor_typeParams).Select(_12_typeParamI), out _out6, out _out7);
+        _13_typeArg = _out6;
+        _14_typeParam = _out7;
+        RAST._IType _15_rTypeArg;
+        RAST._IType _out8;
+        _out8 = (this).GenType(_13_typeArg, Defs.GenTypeContext.@default());
+        _15_rTypeArg = _out8;
+        if ((_6_usedTypeParams).Contains((_14_typeParam).dtor_name)) {
+          goto continue_0;
+        }
+        _4_fields = Dafny.Sequence<RAST._IField>.Concat(_4_fields, Dafny.Sequence<RAST._IField>.FromElements(RAST.Field.create(RAST.Visibility.create_PRIV(), RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_phantom_type_param_"), Std.Strings.__default.OfNat(_12_typeParamI)), RAST.Type.create_TypeApp((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("marker"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("PhantomData"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(_15_rTypeArg))))));
+        _5_fieldInits = Dafny.Sequence<RAST._IAssignIdentifier>.Concat(_5_fieldInits, Dafny.Sequence<RAST._IAssignIdentifier>.FromElements(RAST.AssignIdentifier.create(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_phantom_type_param_"), Std.Strings.__default.OfNat(_12_typeParamI)), (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("marker"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("PhantomData"))).AsExpr())));
+      continue_0: ;
+      }
+    after_0: ;
+      Dafny.ISequence<Dafny.Rune> _16_className;
+      Defs._IExternAttribute _17_extern;
+      Dafny.ISequence<Dafny.Rune> _out9;
+      Defs._IExternAttribute _out10;
+      (this).GetName((c).dtor_attributes, (c).dtor_name, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("classes"), out _out9, out _out10);
+      _16_className = _out9;
+      _17_extern = _out10;
+      RAST._IStruct _18_struct;
+      _18_struct = RAST.Struct.create((c).dtor_docString, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), _16_className, _2_rTypeParamsDecls, RAST.Fields.create_NamedFields(_4_fields));
+      s = Dafny.Sequence<RAST._IModDecl>.FromElements();
+      if ((_17_extern).is_NoExtern) {
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_StructDecl(_18_struct)));
+      }
+      Dafny.ISequence<RAST._IImplMember> _19_implBody;
+      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>,Dafny.ISequence<RAST._IImplMember>> _20_traitBodies;
+      Dafny.ISequence<RAST._IImplMember> _out11;
+      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>,Dafny.ISequence<RAST._IImplMember>> _out12;
+      (this).GenClassImplBody((c).dtor_body, false, DAST.Type.create_UserDefined(DAST.ResolvedType.create(path, Dafny.Sequence<DAST._IType>.FromElements(), DAST.ResolvedTypeBase.create_Class(), (c).dtor_attributes, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<DAST._IType>.FromElements())), _0_typeParamsSeq, out _out11, out _out12);
+      _19_implBody = _out11;
+      _20_traitBodies = _out12;
+      if (((_17_extern).is_NoExtern) && (!(_16_className).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_default")))) {
+        _19_implBody = Dafny.Sequence<RAST._IImplMember>.Concat(Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Allocates an UNINITIALIZED instance. Only the Dafny compiler should use that."), RAST.__default.NoAttr, RAST.Visibility.create_PUB(), RAST.Fn.create((this).allocate__fn, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(), Std.Wrappers.Option<RAST._IType>.create_Some((this).Object(RAST.__default.SelfOwned)), Std.Wrappers.Option<RAST._IExpr>.create_Some(((((RAST.__default.dafny__runtime).MSel((this).allocate)).AsExpr()).ApplyType1(RAST.__default.SelfOwned)).Apply0())))), _19_implBody);
+      }
+      RAST._IType _21_selfTypeForImpl = RAST.Type.Default();
+      if (((_17_extern).is_NoExtern) || ((_17_extern).is_UnsupportedExtern)) {
+        _21_selfTypeForImpl = RAST.Type.create_TIdentifier(_16_className);
+      } else if ((_17_extern).is_AdvancedExtern) {
+        _21_selfTypeForImpl = (((RAST.__default.crate).MSels((_17_extern).dtor_enclosingModule)).MSel((_17_extern).dtor_overrideName)).AsType();
+      } else if ((_17_extern).is_SimpleExtern) {
+        _21_selfTypeForImpl = RAST.Type.create_TIdentifier((_17_extern).dtor_overrideName);
+      }
+      if ((new BigInteger((_19_implBody).Count)).Sign == 1) {
+        RAST._IImpl _22_i;
+        _22_i = RAST.Impl.create_Impl(_2_rTypeParamsDecls, RAST.Type.create_TypeApp(_21_selfTypeForImpl, _1_rTypeParams), _19_implBody);
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(_22_i)));
+      }
+      Dafny.ISequence<RAST._IModDecl> _23_testMethods;
+      _23_testMethods = Dafny.Sequence<RAST._IModDecl>.FromElements();
+      if ((_16_className).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_default"))) {
+        BigInteger _hi2 = new BigInteger(((c).dtor_body).Count);
+        for (BigInteger _24_i = BigInteger.Zero; _24_i < _hi2; _24_i++) {
+          DAST._IMethod _25_m;
+          DAST._IMethod _source0 = ((c).dtor_body).Select(_24_i);
+          {
+            DAST._IMethod _26_m = _source0;
+            _25_m = _26_m;
+          }
+        after_match0: ;
+          if (((this).HasAttribute((_25_m).dtor_attributes, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("test"))) && ((new BigInteger(((_25_m).dtor_params).Count)).Sign == 0)) {
+            Dafny.ISequence<Dafny.Rune> _27_fnName;
+            _27_fnName = Defs.__default.escapeName((_25_m).dtor_name);
+            _23_testMethods = Dafny.Sequence<RAST._IModDecl>.Concat(_23_testMethods, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_TopFnDecl(RAST.TopFnDecl.create((_25_m).dtor_docString, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[test]")), RAST.Visibility.create_PUB(), RAST.Fn.create(_27_fnName, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(), Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(((RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_default"))).FSel(_27_fnName)).Apply(Dafny.Sequence<RAST._IExpr>.FromElements())))))));
+          }
+        }
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, _23_testMethods);
+      }
+      RAST._IType _28_genSelfPath;
+      RAST._IType _out13;
+      _out13 = (this).GenPathType(path);
+      _28_genSelfPath = _out13;
+      if (!(_16_className).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_default"))) {
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(_2_rTypeParamsDecls, (((RAST.__default.dafny__runtime).MSel((this).Upcast)).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_DynType(RAST.__default.AnyTrait))), RAST.Type.create_TypeApp(_28_genSelfPath, _1_rTypeParams), Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_ImplMemberMacro((((RAST.__default.dafny__runtime).MSel((this).UpcastFnMacro)).AsExpr()).Apply1(RAST.Expr.create_ExprFromType(RAST.Type.create_DynType(RAST.__default.AnyTrait)))))))));
+      }
+      Dafny.ISequence<DAST._IType> _29_superTraitTypes;
+      if ((_16_className).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_default"))) {
+        _29_superTraitTypes = Dafny.Sequence<DAST._IType>.FromElements();
+      } else {
+        _29_superTraitTypes = (c).dtor_superTraitTypes;
+      }
+      Dafny.ISequence<RAST._IModDecl> _30_superTraitImplementations;
+      Dafny.ISequence<RAST._IModDecl> _out14;
+      _out14 = (this).GenTraitImplementations(path, _1_rTypeParams, _2_rTypeParamsDecls, _29_superTraitTypes, _20_traitBodies, _17_extern, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("class"));
+      _30_superTraitImplementations = _out14;
+      s = Dafny.Sequence<RAST._IModDecl>.Concat(s, _30_superTraitImplementations);
+      return s;
+    }
+    public Dafny.ISequence<RAST._IModDecl> GenTrait(DAST._ITrait t, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> containingPath)
+    {
+      Dafny.ISequence<RAST._IModDecl> s = Dafny.Sequence<RAST._IModDecl>.Empty;
+      Dafny.ISequence<DAST._IType> _0_typeParamsSeq;
+      _0_typeParamsSeq = Dafny.Sequence<DAST._IType>.FromElements();
+      Dafny.ISequence<RAST._ITypeParamDecl> _1_rTypeParamsDecls;
+      _1_rTypeParamsDecls = Dafny.Sequence<RAST._ITypeParamDecl>.FromElements();
+      Dafny.ISequence<RAST._IType> _2_typeParams;
+      _2_typeParams = Dafny.Sequence<RAST._IType>.FromElements();
+      if ((new BigInteger(((t).dtor_typeParams).Count)).Sign == 1) {
+        BigInteger _hi0 = new BigInteger(((t).dtor_typeParams).Count);
+        for (BigInteger _3_tpI = BigInteger.Zero; _3_tpI < _hi0; _3_tpI++) {
+          DAST._ITypeArgDecl _4_tp;
+          _4_tp = ((t).dtor_typeParams).Select(_3_tpI);
+          DAST._IType _5_typeArg;
+          RAST._ITypeParamDecl _6_typeParamDecl;
+          DAST._IType _out0;
+          RAST._ITypeParamDecl _out1;
+          (this).GenTypeParam(_4_tp, out _out0, out _out1);
+          _5_typeArg = _out0;
+          _6_typeParamDecl = _out1;
+          _0_typeParamsSeq = Dafny.Sequence<DAST._IType>.Concat(_0_typeParamsSeq, Dafny.Sequence<DAST._IType>.FromElements(_5_typeArg));
+          _1_rTypeParamsDecls = Dafny.Sequence<RAST._ITypeParamDecl>.Concat(_1_rTypeParamsDecls, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_6_typeParamDecl));
+          RAST._IType _7_typeParam;
+          RAST._IType _out2;
+          _out2 = (this).GenType(_5_typeArg, Defs.GenTypeContext.@default());
+          _7_typeParam = _out2;
+          _2_typeParams = Dafny.Sequence<RAST._IType>.Concat(_2_typeParams, Dafny.Sequence<RAST._IType>.FromElements(_7_typeParam));
+        }
+      }
+      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _8_fullPath;
+      _8_fullPath = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(containingPath, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((t).dtor_name));
+      Dafny.ISequence<Dafny.Rune> _9_name;
+      _9_name = Defs.__default.escapeName((t).dtor_name);
+      RAST._IType _10_traitFulltype;
+      _10_traitFulltype = (RAST.Type.create_TIdentifier(_9_name)).Apply(_2_typeParams);
+      RAST._IExpr _11_traitFullExpr;
+      _11_traitFullExpr = (RAST.Expr.create_Identifier(_9_name)).ApplyType(_2_typeParams);
+      Dafny.ISequence<RAST._IImplMember> _12_implBody;
+      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>,Dafny.ISequence<RAST._IImplMember>> _13___v5;
+      Dafny.ISequence<RAST._IImplMember> _out3;
+      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>,Dafny.ISequence<RAST._IImplMember>> _out4;
+      (this).GenClassImplBody((t).dtor_body, true, DAST.Type.create_UserDefined(DAST.ResolvedType.create(_8_fullPath, Dafny.Sequence<DAST._IType>.FromElements(), DAST.ResolvedTypeBase.create_Trait((t).dtor_traitType), (t).dtor_attributes, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<DAST._IType>.FromElements())), _0_typeParamsSeq, out _out3, out _out4);
+      _12_implBody = _out3;
+      _13___v5 = _out4;
+      if (((t).dtor_traitType).is_GeneralTrait) {
+        _12_implBody = Dafny.Sequence<RAST._IImplMember>.Concat(_12_implBody, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_clone"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.Box(RAST.Type.create_DynType(_10_traitFulltype))), Std.Wrappers.Option<RAST._IExpr>.create_None()))));
+      }
+      Dafny.ISequence<RAST._IType> _14_parents;
+      _14_parents = Dafny.Sequence<RAST._IType>.FromElements();
+      Dafny.ISequence<RAST._IModDecl> _15_upcastImplemented;
+      _15_upcastImplemented = Dafny.Sequence<RAST._IModDecl>.FromElements();
+      BigInteger _hi1 = new BigInteger(((t).dtor_parents).Count);
+      for (BigInteger _16_i = BigInteger.Zero; _16_i < _hi1; _16_i++) {
+        DAST._IType _17_parentTyp;
+        _17_parentTyp = ((t).dtor_parents).Select(_16_i);
+        RAST._IType _18_parentTpe;
+        RAST._IType _out5;
+        _out5 = (this).GenType(_17_parentTyp, Defs.GenTypeContext.ForTraitParents());
+        _18_parentTpe = _out5;
+        _14_parents = Dafny.Sequence<RAST._IType>.Concat(_14_parents, Dafny.Sequence<RAST._IType>.FromElements(_18_parentTpe));
+        Dafny.ISequence<Dafny.Rune> _19_upcastTrait;
+        if ((_17_parentTyp).IsGeneralTrait()) {
+          _19_upcastTrait = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("UpcastBox");
+        } else {
+          _19_upcastTrait = (this).Upcast;
+        }
+        _14_parents = Dafny.Sequence<RAST._IType>.Concat(_14_parents, Dafny.Sequence<RAST._IType>.FromElements((((RAST.__default.dafny__runtime).MSel(_19_upcastTrait)).AsType()).Apply1(RAST.Type.create_DynType(_18_parentTpe))));
+        if ((_17_parentTyp).IsGeneralTrait()) {
+          _15_upcastImplemented = Dafny.Sequence<RAST._IModDecl>.Concat(_15_upcastImplemented, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(_1_rTypeParamsDecls, (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("UpcastBox"))).AsType()).Apply1(RAST.Type.create_DynType(_18_parentTpe)), RAST.__default.Box(RAST.Type.create_DynType(_10_traitFulltype)), Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("upcast"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.Box(RAST.Type.create_DynType(_18_parentTpe))), Std.Wrappers.Option<RAST._IExpr>.create_Some(((_11_traitFullExpr).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_clone"))).Apply1(((RAST.__default.self).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("as_ref"))).Apply0())))))))));
+        }
+      }
+      s = Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_TraitDecl(RAST.Trait.create((t).dtor_docString, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), _1_rTypeParamsDecls, _10_traitFulltype, _14_parents, _12_implBody)));
+      if (((t).dtor_traitType).is_GeneralTrait) {
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(_1_rTypeParamsDecls, (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("clone"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Clone"))).AsType(), RAST.__default.Box(RAST.Type.create_DynType(_10_traitFulltype)), Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("clone"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.SelfOwned), Std.Wrappers.Option<RAST._IExpr>.create_Some(((_11_traitFullExpr).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_clone"))).Apply1(((RAST.__default.self).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("as_ref"))).Apply0())))))))));
+      }
+      s = Dafny.Sequence<RAST._IModDecl>.Concat(s, _15_upcastImplemented);
+      return s;
+    }
+    public Dafny.ISequence<RAST._IModDecl> GenNewtype(DAST._INewtype c, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path)
+    {
+      Dafny.ISequence<RAST._IModDecl> s = Dafny.Sequence<RAST._IModDecl>.Empty;
+      Dafny.ISequence<DAST._IType> _0_typeParamsSeq;
+      Dafny.ISequence<RAST._IType> _1_rTypeParams;
+      Dafny.ISequence<RAST._ITypeParamDecl> _2_rTypeParamsDecls;
+      Dafny.ISequence<DAST._IType> _out0;
+      Dafny.ISequence<RAST._IType> _out1;
+      Dafny.ISequence<RAST._ITypeParamDecl> _out2;
+      (this).GenTypeParameters((c).dtor_typeParams, out _out0, out _out1, out _out2);
+      _0_typeParamsSeq = _out0;
+      _1_rTypeParams = _out1;
+      _2_rTypeParamsDecls = _out2;
+      Dafny.ISequence<Dafny.Rune> _3_constrainedTypeParams;
+      _3_constrainedTypeParams = RAST.TypeParamDecl.ToStringMultiple(_2_rTypeParamsDecls, Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.IND, RAST.__default.IND));
+      RAST._IType _4_wrappedType = RAST.Type.Default();
+      Std.Wrappers._IOption<RAST._IType> _5_rustType;
+      _5_rustType = Defs.__default.NewtypeRangeToUnwrappedBoundedRustType((c).dtor_base, (c).dtor_range);
+      if ((_5_rustType).is_Some) {
+        _4_wrappedType = (_5_rustType).dtor_value;
+      } else {
+        RAST._IType _out3;
+        _out3 = (this).GenType((c).dtor_base, Defs.GenTypeContext.@default());
+        _4_wrappedType = _out3;
+      }
+      DAST._IType _6_newtypeType;
+      _6_newtypeType = DAST.Type.create_UserDefined(DAST.ResolvedType.create(path, _0_typeParamsSeq, DAST.ResolvedTypeBase.create_Newtype((c).dtor_base, (c).dtor_range, false), (c).dtor_attributes, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<DAST._IType>.FromElements()));
+      Dafny.ISequence<Dafny.Rune> _7_newtypeName;
+      _7_newtypeName = Defs.__default.escapeName((c).dtor_name);
+      RAST._IType _8_resultingType;
+      _8_resultingType = RAST.Type.create_TypeApp(RAST.Type.create_TIdentifier(_7_newtypeName), _1_rTypeParams);
+      Dafny.ISequence<Dafny.Rune> _9_attributes = Dafny.Sequence<Dafny.Rune>.Empty;
+      if (Defs.__default.IsNewtypeCopy((c).dtor_range)) {
+        _9_attributes = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[derive(Clone, PartialEq, Copy)]");
+      } else {
+        _9_attributes = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[derive(Clone, PartialEq)]");
+      }
+      s = Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_StructDecl(RAST.Struct.create((c).dtor_docString, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_9_attributes, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[repr(transparent)]")), _7_newtypeName, _2_rTypeParamsDecls, RAST.Fields.create_NamelessFields(Dafny.Sequence<RAST._INamelessField>.FromElements(RAST.NamelessField.create(RAST.Visibility.create_PUB(), _4_wrappedType))))));
+      RAST._IExpr _10_fnBody = RAST.Expr.Default();
+      Std.Wrappers._IOption<DAST._IExpression> _source0 = (c).dtor_witnessExpr;
+      {
+        if (_source0.is_Some) {
+          DAST._IExpression _11_e = _source0.dtor_value;
+          {
+            DAST._IExpression _12_e;
+            _12_e = DAST.Expression.create_Convert(_11_e, (c).dtor_base, _6_newtypeType);
+            RAST._IExpr _13_r;
+            Defs._IOwnership _14___v6;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _15___v7;
+            RAST._IExpr _out4;
+            Defs._IOwnership _out5;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out6;
+            (this).GenExpr(_12_e, Defs.SelfInfo.create_NoSelf(), Defs.Environment.Empty(), Defs.Ownership.create_OwnershipOwned(), out _out4, out _out5, out _out6);
+            _13_r = _out4;
+            _14___v6 = _out5;
+            _15___v7 = _out6;
+            _10_fnBody = _13_r;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        {
+          _10_fnBody = (RAST.Expr.create_Identifier(_7_newtypeName)).Apply1(RAST.__default.std__default__Default__default);
+        }
+      }
+    after_match0: ;
+      RAST._IImplMember _16_body;
+      _16_body = RAST.ImplMember.create_FnDecl(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("An element of "), _7_newtypeName), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("default"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.SelfOwned), Std.Wrappers.Option<RAST._IExpr>.create_Some(_10_fnBody)));
+      Std.Wrappers._IOption<DAST._INewtypeConstraint> _source1 = (c).dtor_constraint;
+      {
+        if (_source1.is_None) {
+          goto after_match1;
+        }
+      }
+      {
+        DAST._INewtypeConstraint value0 = _source1.dtor_value;
+        DAST._IFormal _17_formal = value0.dtor_variable;
+        Dafny.ISequence<DAST._IStatement> _18_constraintStmts = value0.dtor_constraintStmts;
+        RAST._IExpr _19_rStmts;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _20___v8;
+        Defs._IEnvironment _21_newEnv;
+        RAST._IExpr _out7;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out8;
+        Defs._IEnvironment _out9;
+        (this).GenStmts(_18_constraintStmts, Defs.SelfInfo.create_NoSelf(), Defs.Environment.Empty(), false, Std.Wrappers.Option<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.create_None(), out _out7, out _out8, out _out9);
+        _19_rStmts = _out7;
+        _20___v8 = _out8;
+        _21_newEnv = _out9;
+        Dafny.ISequence<RAST._IFormal> _22_rFormals;
+        Dafny.ISequence<RAST._IFormal> _out10;
+        _out10 = (this).GenParams(Dafny.Sequence<DAST._IFormal>.FromElements(_17_formal), false);
+        _22_rFormals = _out10;
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_Impl(_2_rTypeParamsDecls, _8_resultingType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Constraint check"), RAST.__default.NoAttr, RAST.Visibility.create_PUB(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("is"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), _22_rFormals, Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_Bool()), Std.Wrappers.Option<RAST._IExpr>.create_Some(_19_rStmts))))))));
+      }
+    after_match1: ;
+      s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(_2_rTypeParamsDecls, RAST.__default.DefaultTrait, _8_resultingType, Dafny.Sequence<RAST._IImplMember>.FromElements(_16_body)))));
+      s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(_2_rTypeParamsDecls, RAST.__default.DafnyPrint, _8_resultingType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("For Dafny print statements"), RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt_print"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed, RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_formatter"), RAST.Type.create_BorrowedMut((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Formatter"))).AsType())), RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("in_seq"), RAST.Type.create_Bool())), Std.Wrappers.Option<RAST._IType>.create_Some((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Result"))).AsType()), Std.Wrappers.Option<RAST._IExpr>.create_Some(((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyPrint"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt_print"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.__default.Borrow((RAST.__default.self).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0"))), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_formatter")), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("in_seq"))))))))))));
+      s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(_2_rTypeParamsDecls, (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("ops"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Deref"))).AsType(), _8_resultingType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_TypeDeclMember(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Target"), _4_wrappedType), RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("deref"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_Borrowed(((RAST.Path.create_Self()).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Target"))).AsType())), Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.__default.Borrow((RAST.__default.self).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")))))))))));
+      s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_Impl(_2_rTypeParamsDecls, _8_resultingType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("SAFETY: The newtype is marked as transparent"), RAST.__default.NoAttr, RAST.Visibility.create_PUB(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_from_ref"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("o"), RAST.Type.create_Borrowed(_4_wrappedType))), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_Borrowed((RAST.Path.create_Self()).AsType())), Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.__default.Unsafe(RAST.Expr.create_Block(((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("mem"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("transmute"))).AsExpr()).Apply1(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("o")))))))))))));
+      Dafny.ISequence<RAST._ITypeParamDecl> _23_rTypeParamsDeclsWithHash;
+      _23_rTypeParamsDeclsWithHash = RAST.TypeParamDecl.AddConstraintsMultiple(_2_rTypeParamsDecls, Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.Hash));
+      s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(Defs.__default.HashImpl(_23_rTypeParamsDeclsWithHash, _8_resultingType, (((RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"))).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0"))).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("hash"))).Apply1(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_state"))))));
+      if (((c).dtor_range).HasArithmeticOperations()) {
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(Defs.__default.OpsImpl(new Dafny.Rune('+'), _2_rTypeParamsDecls, _8_resultingType, _7_newtypeName), Defs.__default.OpsImpl(new Dafny.Rune('-'), _2_rTypeParamsDecls, _8_resultingType, _7_newtypeName), Defs.__default.OpsImpl(new Dafny.Rune('*'), _2_rTypeParamsDecls, _8_resultingType, _7_newtypeName), Defs.__default.OpsImpl(new Dafny.Rune('/'), _2_rTypeParamsDecls, _8_resultingType, _7_newtypeName), Defs.__default.PartialOrdImpl(_2_rTypeParamsDecls, _8_resultingType, _7_newtypeName)));
+      }
+      if (((c).dtor_range).is_Bool) {
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(Defs.__default.UnaryOpsImpl(new Dafny.Rune('!'), _2_rTypeParamsDecls, _8_resultingType, _7_newtypeName)));
+      }
+      Dafny.ISequence<RAST._IImplMember> _24_implementation;
+      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>,Dafny.ISequence<RAST._IImplMember>> _25_traitBodies;
+      Dafny.ISequence<RAST._IImplMember> _out11;
+      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>,Dafny.ISequence<RAST._IImplMember>> _out12;
+      (this).GenClassImplBody((c).dtor_classItems, false, _6_newtypeType, _0_typeParamsSeq, out _out11, out _out12);
+      _24_implementation = _out11;
+      _25_traitBodies = _out12;
+      if ((new BigInteger((_25_traitBodies).Count)).Sign == 1) {
+        (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("No support for trait in newtypes yet"));
+      }
+      if ((new BigInteger((_24_implementation).Count)).Sign == 1) {
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_Impl(_2_rTypeParamsDecls, RAST.Type.create_TypeApp(RAST.Type.create_TIdentifier(_7_newtypeName), _1_rTypeParams), _24_implementation))));
+      }
+      return s;
+    }
+    public Dafny.ISequence<RAST._IModDecl> GenSynonymType(DAST._ISynonymType c)
+    {
+      Dafny.ISequence<RAST._IModDecl> s = Dafny.Sequence<RAST._IModDecl>.Empty;
+      Dafny.ISequence<DAST._IType> _0_typeParamsSeq;
+      Dafny.ISequence<RAST._IType> _1_rTypeParams;
+      Dafny.ISequence<RAST._ITypeParamDecl> _2_rTypeParamsDecls;
+      Dafny.ISequence<DAST._IType> _out0;
+      Dafny.ISequence<RAST._IType> _out1;
+      Dafny.ISequence<RAST._ITypeParamDecl> _out2;
+      (this).GenTypeParameters((c).dtor_typeParams, out _out0, out _out1, out _out2);
+      _0_typeParamsSeq = _out0;
+      _1_rTypeParams = _out1;
+      _2_rTypeParamsDecls = _out2;
+      Dafny.ISequence<Dafny.Rune> _3_synonymTypeName;
+      _3_synonymTypeName = Defs.__default.escapeName((c).dtor_name);
+      RAST._IType _4_resultingType;
+      RAST._IType _out3;
+      _out3 = (this).GenType((c).dtor_base, Defs.GenTypeContext.@default());
+      _4_resultingType = _out3;
+      s = Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_TypeDecl(RAST.TypeSynonym.create((c).dtor_docString, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), _3_synonymTypeName, _2_rTypeParamsDecls, _4_resultingType)));
+      Dafny.ISequence<RAST._ITypeParamDecl> _5_defaultConstrainedTypeParams;
+      _5_defaultConstrainedTypeParams = RAST.TypeParamDecl.AddConstraintsMultiple(_2_rTypeParamsDecls, Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.DefaultTrait));
+      Std.Wrappers._IOption<DAST._IExpression> _source0 = (c).dtor_witnessExpr;
+      {
+        if (_source0.is_Some) {
+          DAST._IExpression _6_e = _source0.dtor_value;
+          {
+            RAST._IExpr _7_rStmts;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _8___v9;
+            Defs._IEnvironment _9_newEnv;
+            RAST._IExpr _out4;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out5;
+            Defs._IEnvironment _out6;
+            (this).GenStmts((c).dtor_witnessStmts, Defs.SelfInfo.create_NoSelf(), Defs.Environment.Empty(), false, Std.Wrappers.Option<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.create_None(), out _out4, out _out5, out _out6);
+            _7_rStmts = _out4;
+            _8___v9 = _out5;
+            _9_newEnv = _out6;
+            RAST._IExpr _10_rExpr;
+            Defs._IOwnership _11___v10;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _12___v11;
+            RAST._IExpr _out7;
+            Defs._IOwnership _out8;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out9;
+            (this).GenExpr(_6_e, Defs.SelfInfo.create_NoSelf(), _9_newEnv, Defs.Ownership.create_OwnershipOwned(), out _out7, out _out8, out _out9);
+            _10_rExpr = _out7;
+            _11___v10 = _out8;
+            _12___v11 = _out9;
+            Dafny.ISequence<Dafny.Rune> _13_constantName;
+            _13_constantName = Defs.__default.escapeName(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_init_"), ((c).dtor_name)));
+            s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_TopFnDecl(RAST.TopFnDecl.create(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("An element of "), _3_synonymTypeName), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), RAST.Visibility.create_PUB(), RAST.Fn.create(_13_constantName, _5_defaultConstrainedTypeParams, Dafny.Sequence<RAST._IFormal>.FromElements(), Std.Wrappers.Option<RAST._IType>.create_Some(_4_resultingType), Std.Wrappers.Option<RAST._IExpr>.create_Some((_7_rStmts).Then(_10_rExpr)))))));
+          }
+          goto after_match0;
+        }
+      }
+      {
+      }
+    after_match0: ;
+      return s;
+    }
+    public bool TypeIsEq(DAST._IType t) {
+      DAST._IType _source0 = t;
+      {
+        if (_source0.is_UserDefined) {
+          return true;
+        }
+      }
+      {
+        if (_source0.is_Tuple) {
+          Dafny.ISequence<DAST._IType> _0_ts = _source0.dtor_Tuple_a0;
+          return Dafny.Helpers.Id<Func<Dafny.ISequence<DAST._IType>, bool>>((_1_ts) => Dafny.Helpers.Quantifier<DAST._IType>((_1_ts).UniqueElements, true, (((_forall_var_0) => {
+            DAST._IType _2_t = (DAST._IType)_forall_var_0;
+            return !((_1_ts).Contains(_2_t)) || ((this).TypeIsEq(_2_t));
+          }))))(_0_ts);
+        }
+      }
+      {
+        if (_source0.is_Array) {
+          DAST._IType _3_t = _source0.dtor_element;
+          return (this).TypeIsEq(_3_t);
+        }
+      }
+      {
+        if (_source0.is_Seq) {
+          DAST._IType _4_t = _source0.dtor_element;
+          return (this).TypeIsEq(_4_t);
+        }
+      }
+      {
+        if (_source0.is_Set) {
+          DAST._IType _5_t = _source0.dtor_element;
+          return (this).TypeIsEq(_5_t);
+        }
+      }
+      {
+        if (_source0.is_Multiset) {
+          DAST._IType _6_t = _source0.dtor_element;
+          return (this).TypeIsEq(_6_t);
+        }
+      }
+      {
+        if (_source0.is_Map) {
+          DAST._IType _7_k = _source0.dtor_key;
+          DAST._IType _8_v = _source0.dtor_value;
+          return ((this).TypeIsEq(_7_k)) && ((this).TypeIsEq(_8_v));
+        }
+      }
+      {
+        if (_source0.is_SetBuilder) {
+          DAST._IType _9_t = _source0.dtor_element;
+          return (this).TypeIsEq(_9_t);
+        }
+      }
+      {
+        if (_source0.is_MapBuilder) {
+          DAST._IType _10_k = _source0.dtor_key;
+          DAST._IType _11_v = _source0.dtor_value;
+          return ((this).TypeIsEq(_10_k)) && ((this).TypeIsEq(_11_v));
+        }
+      }
+      {
+        if (_source0.is_Arrow) {
+          return false;
+        }
+      }
+      {
+        if (_source0.is_Primitive) {
+          return true;
+        }
+      }
+      {
+        if (_source0.is_Passthrough) {
+          return true;
+        }
+      }
+      {
+        if (_source0.is_TypeArg) {
+          Dafny.ISequence<Dafny.Rune> _12_i = _source0.dtor_TypeArg_a0;
+          return true;
+        }
+      }
+      {
+        return true;
+      }
+    }
+    public bool DatatypeIsEq(DAST._IDatatype c) {
+      return (!((c).dtor_isCo)) && (Dafny.Helpers.Id<Func<DAST._IDatatype, bool>>((_0_c) => Dafny.Helpers.Quantifier<DAST._IDatatypeCtor>(((_0_c).dtor_ctors).UniqueElements, true, (((_forall_var_0) => {
+        DAST._IDatatypeCtor _1_ctor = (DAST._IDatatypeCtor)_forall_var_0;
+        return Dafny.Helpers.Quantifier<DAST._IDatatypeDtor>(((_1_ctor).dtor_args).UniqueElements, true, (((_forall_var_1) => {
+          DAST._IDatatypeDtor _2_arg = (DAST._IDatatypeDtor)_forall_var_1;
+          return !((((_0_c).dtor_ctors).Contains(_1_ctor)) && (((_1_ctor).dtor_args).Contains(_2_arg))) || ((this).TypeIsEq(((_2_arg).dtor_formal).dtor_typ));
+        })));
+      }))))(c));
+    }
+    public RAST._IExpr write(RAST._IExpr r, bool final)
+    {
+      RAST._IExpr _0_result = (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("write!"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_formatter")), r));
+      if (final) {
+        return _0_result;
+      } else {
+        return RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("?"), _0_result, DAST.Format.UnaryOpFormat.create_NoFormat());
+      }
+    }
+    public RAST._IExpr writeStr(Dafny.ISequence<Dafny.Rune> s, bool final)
+    {
+      return (this).write(RAST.Expr.create_LiteralString(s, false, false), false);
+    }
+    public Dafny.ISequence<RAST._IModDecl> GenDatatype(DAST._IDatatype c, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path)
+    {
+      Dafny.ISequence<RAST._IModDecl> s = Dafny.Sequence<RAST._IModDecl>.Empty;
+      Dafny.ISequence<DAST._IType> _0_typeParamsSeq;
+      Dafny.ISequence<RAST._IType> _1_rTypeParams;
+      Dafny.ISequence<RAST._ITypeParamDecl> _2_rTypeParamsDecls;
+      Dafny.ISequence<DAST._IType> _out0;
+      Dafny.ISequence<RAST._IType> _out1;
+      Dafny.ISequence<RAST._ITypeParamDecl> _out2;
+      (this).GenTypeParameters((c).dtor_typeParams, out _out0, out _out1, out _out2);
+      _0_typeParamsSeq = _out0;
+      _1_rTypeParams = _out1;
+      _2_rTypeParamsDecls = _out2;
+      Dafny.ISequence<Dafny.Rune> _3_datatypeName;
+      Defs._IExternAttribute _4_extern;
+      Dafny.ISequence<Dafny.Rune> _out3;
+      Defs._IExternAttribute _out4;
+      (this).GetName((c).dtor_attributes, (c).dtor_name, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("datatypes"), out _out3, out _out4);
+      _3_datatypeName = _out3;
+      _4_extern = _out4;
+      Dafny.ISequence<RAST._IEnumCase> _5_ctors;
+      _5_ctors = Dafny.Sequence<RAST._IEnumCase>.FromElements();
+      Dafny.ISequence<DAST._IVariance> _6_variances;
+      _6_variances = Std.Collections.Seq.__default.Map<DAST._ITypeArgDecl, DAST._IVariance>(((System.Func<DAST._ITypeArgDecl, DAST._IVariance>)((_7_typeParamDecl) => {
+        return (_7_typeParamDecl).dtor_variance;
+      })), (c).dtor_typeParams);
+      Dafny.ISequence<RAST._IExpr> _8_singletonConstructors;
+      _8_singletonConstructors = Dafny.Sequence<RAST._IExpr>.FromElements();
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _9_usedTypeParams;
+      _9_usedTypeParams = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+      BigInteger _hi0 = new BigInteger(((c).dtor_ctors).Count);
+      for (BigInteger _10_i = BigInteger.Zero; _10_i < _hi0; _10_i++) {
+        DAST._IDatatypeCtor _11_ctor;
+        _11_ctor = ((c).dtor_ctors).Select(_10_i);
+        Dafny.ISequence<RAST._IField> _12_ctorArgs;
+        _12_ctorArgs = Dafny.Sequence<RAST._IField>.FromElements();
+        bool _13_isNumeric;
+        _13_isNumeric = false;
+        if ((new BigInteger(((_11_ctor).dtor_args).Count)).Sign == 0) {
+          RAST._IExpr _14_instantiation;
+          _14_instantiation = RAST.Expr.create_StructBuild((RAST.Expr.create_Identifier(_3_datatypeName)).FSel(Defs.__default.escapeName((_11_ctor).dtor_name)), Dafny.Sequence<RAST._IAssignIdentifier>.FromElements());
+          if ((this).IsRcWrapped((c).dtor_attributes)) {
+            _14_instantiation = RAST.__default.RcNew(_14_instantiation);
+          }
+          _8_singletonConstructors = Dafny.Sequence<RAST._IExpr>.Concat(_8_singletonConstructors, Dafny.Sequence<RAST._IExpr>.FromElements(_14_instantiation));
+        }
+        BigInteger _hi1 = new BigInteger(((_11_ctor).dtor_args).Count);
+        for (BigInteger _15_j = BigInteger.Zero; _15_j < _hi1; _15_j++) {
+          DAST._IDatatypeDtor _16_dtor;
+          _16_dtor = ((_11_ctor).dtor_args).Select(_15_j);
+          RAST._IType _17_formalType;
+          RAST._IType _out5;
+          _out5 = (this).GenType(((_16_dtor).dtor_formal).dtor_typ, Defs.GenTypeContext.@default());
+          _17_formalType = _out5;
+          _9_usedTypeParams = (this).GatherTypeParamNames(_9_usedTypeParams, _17_formalType);
+          Dafny.ISequence<Dafny.Rune> _18_formalName;
+          _18_formalName = Defs.__default.escapeVar(((_16_dtor).dtor_formal).dtor_name);
+          if (((_15_j).Sign == 0) && ((Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")).Equals(_18_formalName))) {
+            _13_isNumeric = true;
+          }
+          if ((((_15_j).Sign != 0) && (_13_isNumeric)) && (!(Std.Strings.__default.OfNat(_15_j)).Equals(_18_formalName))) {
+            (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Formal extern names were supposed to be numeric but got "), _18_formalName), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" instead of ")), Std.Strings.__default.OfNat(_15_j)));
+            _13_isNumeric = false;
+          }
+          if ((c).dtor_isCo) {
+            _12_ctorArgs = Dafny.Sequence<RAST._IField>.Concat(_12_ctorArgs, Dafny.Sequence<RAST._IField>.FromElements(RAST.Field.create(RAST.Visibility.create_PRIV(), RAST.Formal.create(_18_formalName, RAST.Type.create_TypeApp(((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("LazyFieldWrapper"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(_17_formalType))))));
+          } else {
+            _12_ctorArgs = Dafny.Sequence<RAST._IField>.Concat(_12_ctorArgs, Dafny.Sequence<RAST._IField>.FromElements(RAST.Field.create(RAST.Visibility.create_PRIV(), RAST.Formal.create(_18_formalName, _17_formalType))));
+          }
+        }
+        RAST._IFields _19_namedFields;
+        _19_namedFields = RAST.Fields.create_NamedFields(_12_ctorArgs);
+        if (_13_isNumeric) {
+          _19_namedFields = (_19_namedFields).ToNamelessFields();
+        }
+        _5_ctors = Dafny.Sequence<RAST._IEnumCase>.Concat(_5_ctors, Dafny.Sequence<RAST._IEnumCase>.FromElements(RAST.EnumCase.create((_11_ctor).dtor_docString, Defs.__default.escapeName((_11_ctor).dtor_name), _19_namedFields)));
+      }
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _20_unusedTypeParams;
+      _20_unusedTypeParams = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(Dafny.Helpers.Id<Func<Dafny.ISequence<RAST._ITypeParamDecl>, Dafny.ISet<Dafny.ISequence<Dafny.Rune>>>>((_21_rTypeParamsDecls) => ((System.Func<Dafny.ISet<Dafny.ISequence<Dafny.Rune>>>)(() => {
+        var _coll0 = new System.Collections.Generic.List<Dafny.ISequence<Dafny.Rune>>();
+        foreach (RAST._ITypeParamDecl _compr_0 in (_21_rTypeParamsDecls).CloneAsArray()) {
+          RAST._ITypeParamDecl _22_tp = (RAST._ITypeParamDecl)_compr_0;
+          if ((_21_rTypeParamsDecls).Contains(_22_tp)) {
+            _coll0.Add((_22_tp).dtor_name);
+          }
+        }
+        return Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromCollection(_coll0);
+      }))())(_2_rTypeParamsDecls), _9_usedTypeParams);
+      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _23_selfPath;
+      _23_selfPath = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((c).dtor_name);
+      Dafny.ISequence<RAST._IImplMember> _24_implBodyRaw;
+      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>,Dafny.ISequence<RAST._IImplMember>> _25_traitBodies;
+      Dafny.ISequence<RAST._IImplMember> _out6;
+      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>,Dafny.ISequence<RAST._IImplMember>> _out7;
+      (this).GenClassImplBody((c).dtor_body, false, DAST.Type.create_UserDefined(DAST.ResolvedType.create(_23_selfPath, _0_typeParamsSeq, DAST.ResolvedTypeBase.create_Datatype(_6_variances), (c).dtor_attributes, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<DAST._IType>.FromElements())), _0_typeParamsSeq, out _out6, out _out7);
+      _24_implBodyRaw = _out6;
+      _25_traitBodies = _out7;
+      Dafny.ISequence<RAST._IImplMember> _26_implBody;
+      _26_implBody = _24_implBodyRaw;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _27_emittedFields;
+      _27_emittedFields = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+      BigInteger _hi2 = new BigInteger(((c).dtor_ctors).Count);
+      for (BigInteger _28_i = BigInteger.Zero; _28_i < _hi2; _28_i++) {
+        DAST._IDatatypeCtor _29_ctor;
+        _29_ctor = ((c).dtor_ctors).Select(_28_i);
+        BigInteger _hi3 = new BigInteger(((_29_ctor).dtor_args).Count);
+        for (BigInteger _30_j = BigInteger.Zero; _30_j < _hi3; _30_j++) {
+          DAST._IDatatypeDtor _31_dtor;
+          _31_dtor = ((_29_ctor).dtor_args).Select(_30_j);
+          Dafny.ISequence<Dafny.Rune> _32_callName;
+          _32_callName = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.GetOr((_31_dtor).dtor_callName, Defs.__default.escapeVar(((_31_dtor).dtor_formal).dtor_name));
+          if (!((_27_emittedFields).Contains(_32_callName))) {
+            _27_emittedFields = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_27_emittedFields, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_32_callName));
+            RAST._IType _33_formalType;
+            RAST._IType _out8;
+            _out8 = (this).GenType(((_31_dtor).dtor_formal).dtor_typ, Defs.GenTypeContext.@default());
+            _33_formalType = _out8;
+            Dafny.ISequence<RAST._IMatchCase> _34_cases;
+            _34_cases = Dafny.Sequence<RAST._IMatchCase>.FromElements();
+            BigInteger _hi4 = new BigInteger(((c).dtor_ctors).Count);
+            for (BigInteger _35_k = BigInteger.Zero; _35_k < _hi4; _35_k++) {
+              DAST._IDatatypeCtor _36_ctor2;
+              _36_ctor2 = ((c).dtor_ctors).Select(_35_k);
+              Dafny.ISequence<Dafny.Rune> _37_pattern;
+              _37_pattern = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_3_datatypeName, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")), Defs.__default.escapeName((_36_ctor2).dtor_name));
+              RAST._IExpr _38_rhs = RAST.Expr.Default();
+              Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _39_hasMatchingField;
+              _39_hasMatchingField = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None();
+              Dafny.ISequence<Dafny.Rune> _40_patternInner;
+              _40_patternInner = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+              bool _41_isNumeric;
+              _41_isNumeric = false;
+              BigInteger _hi5 = new BigInteger(((_36_ctor2).dtor_args).Count);
+              for (BigInteger _42_l = BigInteger.Zero; _42_l < _hi5; _42_l++) {
+                DAST._IDatatypeDtor _43_dtor2;
+                _43_dtor2 = ((_36_ctor2).dtor_args).Select(_42_l);
+                Dafny.ISequence<Dafny.Rune> _44_patternName;
+                _44_patternName = Defs.__default.escapeVar(((_43_dtor2).dtor_formal).dtor_name);
+                if (((_42_l).Sign == 0) && ((_44_patternName).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")))) {
+                  _41_isNumeric = true;
+                }
+                if (_41_isNumeric) {
+                  _44_patternName = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.GetOr((_43_dtor2).dtor_callName, Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("v"), Std.Strings.__default.OfNat(_42_l)));
+                }
+                if (object.Equals(((_31_dtor).dtor_formal).dtor_name, ((_43_dtor2).dtor_formal).dtor_name)) {
+                  _39_hasMatchingField = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(_44_patternName);
+                }
+                _40_patternInner = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_40_patternInner, _44_patternName), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
+              }
+              if (_41_isNumeric) {
+                _37_pattern = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_37_pattern, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _40_patternInner), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
+              } else {
+                _37_pattern = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_37_pattern, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{")), _40_patternInner), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+              }
+              if ((_39_hasMatchingField).is_Some) {
+                if ((c).dtor_isCo) {
+                  _38_rhs = (((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("ops"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Deref"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("deref"))).Apply1(RAST.__default.Borrow((RAST.Expr.create_Identifier((_39_hasMatchingField).dtor_value)).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0"))));
+                } else {
+                  _38_rhs = RAST.Expr.create_Identifier((_39_hasMatchingField).dtor_value);
+                }
+              } else {
+                _38_rhs = Defs.__default.UnreachablePanicIfVerified((this).pointerType, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("field does not exist on this variant"));
+              }
+              RAST._IMatchCase _45_ctorMatch;
+              _45_ctorMatch = RAST.MatchCase.create(_37_pattern, _38_rhs);
+              _34_cases = Dafny.Sequence<RAST._IMatchCase>.Concat(_34_cases, Dafny.Sequence<RAST._IMatchCase>.FromElements(_45_ctorMatch));
+            }
+            if (((new BigInteger(((c).dtor_typeParams).Count)).Sign == 1) && ((new BigInteger((_20_unusedTypeParams).Count)).Sign == 1)) {
+              _34_cases = Dafny.Sequence<RAST._IMatchCase>.Concat(_34_cases, Dafny.Sequence<RAST._IMatchCase>.FromElements(RAST.MatchCase.create(Dafny.Sequence<Dafny.Rune>.Concat(_3_datatypeName, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::_PhantomVariant(..)")), Defs.__default.UnreachablePanicIfVerified((this).pointerType, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))));
+            }
+            RAST._IExpr _46_methodBody;
+            _46_methodBody = RAST.Expr.create_Match(RAST.__default.self, _34_cases);
+            _26_implBody = Dafny.Sequence<RAST._IImplMember>.Concat(_26_implBody, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl((((new BigInteger(((c).dtor_ctors).Count)) == (BigInteger.One)) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Returns a borrow of the field "), _32_callName)) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Gets the field "), _32_callName), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" for all enum members which have it")))), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), RAST.Visibility.create_PUB(), RAST.Fn.create(_32_callName, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_Borrowed(_33_formalType)), Std.Wrappers.Option<RAST._IExpr>.create_Some(_46_methodBody)))));
+          }
+        }
+      }
+      Dafny.ISequence<RAST._IType> _47_coerceTypes;
+      _47_coerceTypes = Dafny.Sequence<RAST._IType>.FromElements();
+      Dafny.ISequence<RAST._ITypeParamDecl> _48_rCoerceTypeParams;
+      _48_rCoerceTypeParams = Dafny.Sequence<RAST._ITypeParamDecl>.FromElements();
+      Dafny.ISequence<RAST._IFormal> _49_coerceArguments;
+      _49_coerceArguments = Dafny.Sequence<RAST._IFormal>.FromElements();
+      Dafny.IMap<DAST._IType,DAST._IType> _50_coerceMap;
+      _50_coerceMap = Dafny.Map<DAST._IType, DAST._IType>.FromElements();
+      Dafny.IMap<RAST._IType,RAST._IType> _51_rCoerceMap;
+      _51_rCoerceMap = Dafny.Map<RAST._IType, RAST._IType>.FromElements();
+      Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr> _52_coerceMapToArg;
+      _52_coerceMapToArg = Dafny.Map<_System._ITuple2<RAST._IType, RAST._IType>, RAST._IExpr>.FromElements();
+      if ((new BigInteger(((c).dtor_typeParams).Count)).Sign == 1) {
+        Dafny.ISequence<RAST._IType> _53_types;
+        _53_types = Dafny.Sequence<RAST._IType>.FromElements();
+        BigInteger _hi6 = new BigInteger(((c).dtor_typeParams).Count);
+        for (BigInteger _54_typeI = BigInteger.Zero; _54_typeI < _hi6; _54_typeI++) {
+          DAST._ITypeArgDecl _55_typeParam;
+          _55_typeParam = ((c).dtor_typeParams).Select(_54_typeI);
+          DAST._IType _56_typeArg;
+          RAST._ITypeParamDecl _57_rTypeParamDecl;
+          DAST._IType _out9;
+          RAST._ITypeParamDecl _out10;
+          (this).GenTypeParam(_55_typeParam, out _out9, out _out10);
+          _56_typeArg = _out9;
+          _57_rTypeParamDecl = _out10;
+          RAST._IType _58_rTypeArg;
+          RAST._IType _out11;
+          _out11 = (this).GenType(_56_typeArg, Defs.GenTypeContext.@default());
+          _58_rTypeArg = _out11;
+          _53_types = Dafny.Sequence<RAST._IType>.Concat(_53_types, Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_TypeApp((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("marker"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("PhantomData"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(_58_rTypeArg))));
+          if (((_54_typeI) < (new BigInteger((_6_variances).Count))) && (((_6_variances).Select(_54_typeI)).is_Nonvariant)) {
+            _47_coerceTypes = Dafny.Sequence<RAST._IType>.Concat(_47_coerceTypes, Dafny.Sequence<RAST._IType>.FromElements(_58_rTypeArg));
+            goto continue_2_0;
+          }
+          DAST._ITypeArgDecl _59_coerceTypeParam;
+          DAST._ITypeArgDecl _60_dt__update__tmp_h0 = _55_typeParam;
+          Dafny.ISequence<Dafny.Rune> _61_dt__update_hname_h0 = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_T"), Std.Strings.__default.OfNat(_54_typeI));
+          _59_coerceTypeParam = DAST.TypeArgDecl.create(_61_dt__update_hname_h0, (_60_dt__update__tmp_h0).dtor_bounds, (_60_dt__update__tmp_h0).dtor_variance);
+          DAST._IType _62_coerceTypeArg;
+          RAST._ITypeParamDecl _63_rCoerceTypeParamDecl;
+          DAST._IType _out12;
+          RAST._ITypeParamDecl _out13;
+          (this).GenTypeParam(_59_coerceTypeParam, out _out12, out _out13);
+          _62_coerceTypeArg = _out12;
+          _63_rCoerceTypeParamDecl = _out13;
+          _50_coerceMap = Dafny.Map<DAST._IType, DAST._IType>.Merge(_50_coerceMap, Dafny.Map<DAST._IType, DAST._IType>.FromElements(new Dafny.Pair<DAST._IType, DAST._IType>(_56_typeArg, _62_coerceTypeArg)));
+          RAST._IType _64_rCoerceType;
+          RAST._IType _out14;
+          _out14 = (this).GenType(_62_coerceTypeArg, Defs.GenTypeContext.@default());
+          _64_rCoerceType = _out14;
+          _51_rCoerceMap = Dafny.Map<RAST._IType, RAST._IType>.Merge(_51_rCoerceMap, Dafny.Map<RAST._IType, RAST._IType>.FromElements(new Dafny.Pair<RAST._IType, RAST._IType>(_58_rTypeArg, _64_rCoerceType)));
+          _47_coerceTypes = Dafny.Sequence<RAST._IType>.Concat(_47_coerceTypes, Dafny.Sequence<RAST._IType>.FromElements(_64_rCoerceType));
+          _48_rCoerceTypeParams = Dafny.Sequence<RAST._ITypeParamDecl>.Concat(_48_rCoerceTypeParams, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_63_rCoerceTypeParamDecl));
+          Dafny.ISequence<Dafny.Rune> _65_coerceFormal;
+          _65_coerceFormal = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("f_"), Std.Strings.__default.OfNat(_54_typeI));
+          _52_coerceMapToArg = Dafny.Map<_System._ITuple2<RAST._IType, RAST._IType>, RAST._IExpr>.Merge(_52_coerceMapToArg, Dafny.Map<_System._ITuple2<RAST._IType, RAST._IType>, RAST._IExpr>.FromElements(new Dafny.Pair<_System._ITuple2<RAST._IType, RAST._IType>, RAST._IExpr>(_System.Tuple2<RAST._IType, RAST._IType>.create(_58_rTypeArg, _64_rCoerceType), (RAST.Expr.create_Identifier(_65_coerceFormal)).Clone())));
+          _49_coerceArguments = Dafny.Sequence<RAST._IFormal>.Concat(_49_coerceArguments, Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.create(_65_coerceFormal, RAST.__default.Rc(RAST.Type.create_IntersectionType(RAST.Type.create_ImplType(RAST.Type.create_FnType(Dafny.Sequence<RAST._IType>.FromElements(_58_rTypeArg), _64_rCoerceType)), RAST.__default.StaticTrait)))));
+        continue_2_0: ;
+        }
+      after_2_0: ;
+        if ((new BigInteger((_20_unusedTypeParams).Count)).Sign == 1) {
+          _5_ctors = Dafny.Sequence<RAST._IEnumCase>.Concat(_5_ctors, Dafny.Sequence<RAST._IEnumCase>.FromElements(RAST.EnumCase.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_PhantomVariant"), RAST.Fields.create_NamelessFields(Std.Collections.Seq.__default.Map<RAST._IType, RAST._INamelessField>(((System.Func<RAST._IType, RAST._INamelessField>)((_66_tpe) => {
+  return RAST.NamelessField.create(RAST.Visibility.create_PRIV(), _66_tpe);
+})), _53_types)))));
+        }
+      }
+      bool _67_cIsEq;
+      _67_cIsEq = (this).DatatypeIsEq(c);
+      s = Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_EnumDecl(RAST.Enum.create((c).dtor_docString, ((_67_cIsEq) ? (Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[derive(PartialEq, Clone)]"))) : (Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[derive(Clone)]")))), _3_datatypeName, _2_rTypeParamsDecls, _5_ctors)), RAST.ModDecl.create_ImplDecl(RAST.Impl.create_Impl(_2_rTypeParamsDecls, RAST.Type.create_TypeApp(RAST.Type.create_TIdentifier(_3_datatypeName), _1_rTypeParams), _26_implBody)));
+      Dafny.ISequence<RAST._IMatchCase> _68_printImplBodyCases;
+      _68_printImplBodyCases = Dafny.Sequence<RAST._IMatchCase>.FromElements();
+      Dafny.ISequence<RAST._IMatchCase> _69_hashImplBodyCases;
+      _69_hashImplBodyCases = Dafny.Sequence<RAST._IMatchCase>.FromElements();
+      Dafny.ISequence<RAST._IMatchCase> _70_coerceImplBodyCases;
+      _70_coerceImplBodyCases = Dafny.Sequence<RAST._IMatchCase>.FromElements();
+      BigInteger _hi7 = new BigInteger(((c).dtor_ctors).Count);
+      for (BigInteger _71_i = BigInteger.Zero; _71_i < _hi7; _71_i++) {
+        DAST._IDatatypeCtor _72_ctor;
+        _72_ctor = ((c).dtor_ctors).Select(_71_i);
+        Dafny.ISequence<Dafny.Rune> _73_ctorMatch;
+        _73_ctorMatch = Defs.__default.escapeName((_72_ctor).dtor_name);
+        Dafny.ISequence<Dafny.Rune> _74_modulePrefix;
+        if (((((c).dtor_enclosingModule))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_module"))) {
+          _74_modulePrefix = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+        } else {
+          _74_modulePrefix = Dafny.Sequence<Dafny.Rune>.Concat((((c).dtor_enclosingModule)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("."));
+        }
+        Dafny.ISequence<Dafny.Rune> _75_ctorName;
+        _75_ctorName = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_74_modulePrefix, ((c).dtor_name)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".")), ((_72_ctor).dtor_name));
+        if (((new BigInteger((_75_ctorName).Count)) >= (new BigInteger(13))) && (((_75_ctorName).Subsequence(BigInteger.Zero, new BigInteger(13))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_System.Tuple")))) {
+          _75_ctorName = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+        }
+        RAST._IExpr _76_printRhs;
+        _76_printRhs = (this).writeStr(Dafny.Sequence<Dafny.Rune>.Concat(_75_ctorName, (((_72_ctor).dtor_hasAnyArgs) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), false);
+        RAST._IExpr _77_hashRhs;
+        _77_hashRhs = (this).InitEmptyExpr();
+        Dafny.ISequence<RAST._IAssignIdentifier> _78_coerceRhsArgs;
+        _78_coerceRhsArgs = Dafny.Sequence<RAST._IAssignIdentifier>.FromElements();
+        bool _79_isNumeric;
+        _79_isNumeric = false;
+        Dafny.ISequence<Dafny.Rune> _80_ctorMatchInner;
+        _80_ctorMatchInner = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+        BigInteger _hi8 = new BigInteger(((_72_ctor).dtor_args).Count);
+        for (BigInteger _81_j = BigInteger.Zero; _81_j < _hi8; _81_j++) {
+          DAST._IDatatypeDtor _82_dtor;
+          _82_dtor = ((_72_ctor).dtor_args).Select(_81_j);
+          Dafny.ISequence<Dafny.Rune> _83_patternName;
+          _83_patternName = Defs.__default.escapeVar(((_82_dtor).dtor_formal).dtor_name);
+          DAST._IType _84_formalType;
+          _84_formalType = ((_82_dtor).dtor_formal).dtor_typ;
+          if (((_81_j).Sign == 0) && ((_83_patternName).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")))) {
+            _79_isNumeric = true;
+          }
+          if (_79_isNumeric) {
+            _83_patternName = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.GetOr((_82_dtor).dtor_callName, Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("v"), Std.Strings.__default.OfNat(_81_j)));
+          }
+          if ((_84_formalType).is_Arrow) {
+            _77_hashRhs = (_77_hashRhs).Then(((RAST.Expr.create_LiteralInt(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0"))).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("hash"))).Apply1(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_state"))));
+          } else {
+            _77_hashRhs = (_77_hashRhs).Then((((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("hash"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Hash"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("hash"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_Identifier(_83_patternName), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_state")))));
+          }
+          _80_ctorMatchInner = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_80_ctorMatchInner, _83_patternName), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
+          if ((_81_j).Sign == 1) {
+            _76_printRhs = (_76_printRhs).Then((this).writeStr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "), false));
+          }
+          _76_printRhs = (_76_printRhs).Then((((_84_formalType).is_Arrow) ? ((this).writeStr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<function>"), false)) : (RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("?"), ((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyPrint"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt_print"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_Identifier(_83_patternName), RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_formatter")), RAST.Expr.create_LiteralBool(false))), DAST.Format.UnaryOpFormat.create_NoFormat()))));
+          RAST._IExpr _85_coerceRhsArg = RAST.Expr.Default();
+          RAST._IType _86_formalTpe;
+          RAST._IType _out15;
+          _out15 = (this).GenType(_84_formalType, Defs.GenTypeContext.@default());
+          _86_formalTpe = _out15;
+          DAST._IType _87_newFormalType;
+          _87_newFormalType = (_84_formalType).Replace(_50_coerceMap);
+          RAST._IType _88_newFormalTpe;
+          _88_newFormalTpe = (_86_formalTpe).ReplaceMap(_51_rCoerceMap);
+          Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>> _89_upcastConverter;
+          _89_upcastConverter = (this).UpcastConversionLambda(_84_formalType, _86_formalTpe, _87_newFormalType, _88_newFormalTpe, _52_coerceMapToArg);
+          if ((_89_upcastConverter).is_Success) {
+            RAST._IExpr _90_coercionFunction;
+            _90_coercionFunction = (_89_upcastConverter).dtor_value;
+            _85_coerceRhsArg = (_90_coercionFunction).Apply1(RAST.Expr.create_Identifier(_83_patternName));
+          } else {
+            (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Could not generate coercion function for contructor "), Std.Strings.__default.OfNat(_81_j)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" of ")), _3_datatypeName));
+            _85_coerceRhsArg = (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("todo!"))).Apply1(RAST.Expr.create_LiteralString((this.error).dtor_value, false, false));
+          }
+          _78_coerceRhsArgs = Dafny.Sequence<RAST._IAssignIdentifier>.Concat(_78_coerceRhsArgs, Dafny.Sequence<RAST._IAssignIdentifier>.FromElements(RAST.AssignIdentifier.create(_83_patternName, _85_coerceRhsArg)));
+        }
+        RAST._IExpr _91_coerceRhs;
+        _91_coerceRhs = RAST.Expr.create_StructBuild((RAST.Expr.create_Identifier(_3_datatypeName)).FSel(Defs.__default.escapeName((_72_ctor).dtor_name)), _78_coerceRhsArgs);
+        if (_79_isNumeric) {
+          _73_ctorMatch = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_73_ctorMatch, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _80_ctorMatchInner), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
+        } else {
+          _73_ctorMatch = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_73_ctorMatch, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{")), _80_ctorMatchInner), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+        }
+        if ((_72_ctor).dtor_hasAnyArgs) {
+          _76_printRhs = (_76_printRhs).Then((this).writeStr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"), false));
+        }
+        _76_printRhs = (_76_printRhs).Then((RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Ok"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_Tuple(Dafny.Sequence<RAST._IExpr>.FromElements()))));
+        _68_printImplBodyCases = Dafny.Sequence<RAST._IMatchCase>.Concat(_68_printImplBodyCases, Dafny.Sequence<RAST._IMatchCase>.FromElements(RAST.MatchCase.create(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_3_datatypeName, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")), _73_ctorMatch), RAST.Expr.create_Block(_76_printRhs))));
+        _69_hashImplBodyCases = Dafny.Sequence<RAST._IMatchCase>.Concat(_69_hashImplBodyCases, Dafny.Sequence<RAST._IMatchCase>.FromElements(RAST.MatchCase.create(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_3_datatypeName, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")), _73_ctorMatch), RAST.Expr.create_Block(_77_hashRhs))));
+        _70_coerceImplBodyCases = Dafny.Sequence<RAST._IMatchCase>.Concat(_70_coerceImplBodyCases, Dafny.Sequence<RAST._IMatchCase>.FromElements(RAST.MatchCase.create(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_3_datatypeName, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")), _73_ctorMatch), RAST.Expr.create_Block(_91_coerceRhs))));
+      }
+      if (((new BigInteger(((c).dtor_typeParams).Count)).Sign == 1) && ((new BigInteger((_20_unusedTypeParams).Count)).Sign == 1)) {
+        Dafny.ISequence<RAST._IMatchCase> _92_extraCases;
+        _92_extraCases = Dafny.Sequence<RAST._IMatchCase>.FromElements(RAST.MatchCase.create(Dafny.Sequence<Dafny.Rune>.Concat(_3_datatypeName, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::_PhantomVariant(..)")), RAST.Expr.create_Block(Defs.__default.UnreachablePanicIfVerified((this).pointerType, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))));
+        _68_printImplBodyCases = Dafny.Sequence<RAST._IMatchCase>.Concat(_68_printImplBodyCases, _92_extraCases);
+        _69_hashImplBodyCases = Dafny.Sequence<RAST._IMatchCase>.Concat(_69_hashImplBodyCases, _92_extraCases);
+        _70_coerceImplBodyCases = Dafny.Sequence<RAST._IMatchCase>.Concat(_70_coerceImplBodyCases, _92_extraCases);
+      }
+      Dafny.ISequence<RAST._ITypeParamDecl> _93_defaultConstrainedTypeParams;
+      _93_defaultConstrainedTypeParams = RAST.TypeParamDecl.AddConstraintsMultiple(_2_rTypeParamsDecls, Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.DefaultTrait));
+      Dafny.ISequence<RAST._ITypeParamDecl> _94_rTypeParamsDeclsWithEq;
+      _94_rTypeParamsDeclsWithEq = RAST.TypeParamDecl.AddConstraintsMultiple(_2_rTypeParamsDecls, Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.Eq));
+      Dafny.ISequence<RAST._ITypeParamDecl> _95_rTypeParamsDeclsWithHash;
+      _95_rTypeParamsDeclsWithHash = RAST.TypeParamDecl.AddConstraintsMultiple(_2_rTypeParamsDecls, Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.Hash));
+      RAST._IExpr _96_printImplBody;
+      _96_printImplBody = RAST.Expr.create_Match(RAST.__default.self, _68_printImplBodyCases);
+      RAST._IExpr _97_hashImplBody;
+      _97_hashImplBody = RAST.Expr.create_Match(RAST.__default.self, _69_hashImplBodyCases);
+      RAST._IType _98_datatypeType;
+      _98_datatypeType = RAST.Type.create_TypeApp(RAST.Type.create_TIdentifier(_3_datatypeName), _1_rTypeParams);
+      s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(Defs.__default.DebugImpl(_2_rTypeParamsDecls, _98_datatypeType, _1_rTypeParams), Defs.__default.PrintImpl(_2_rTypeParamsDecls, _98_datatypeType, _1_rTypeParams, _96_printImplBody)));
+      if ((new BigInteger((_48_rCoerceTypeParams).Count)).Sign == 1) {
+        RAST._IExpr _99_coerceImplBody;
+        _99_coerceImplBody = RAST.Expr.create_Match(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this")), _70_coerceImplBodyCases);
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(Defs.__default.CoerceImpl(_2_rTypeParamsDecls, _3_datatypeName, _98_datatypeType, _48_rCoerceTypeParams, _49_coerceArguments, _47_coerceTypes, _99_coerceImplBody)));
+      }
+      if ((new BigInteger((_8_singletonConstructors).Count)) == (new BigInteger(((c).dtor_ctors).Count))) {
+        RAST._IType _100_instantiationType;
+        if ((this).IsRcWrapped((c).dtor_attributes)) {
+          _100_instantiationType = RAST.__default.Rc(_98_datatypeType);
+        } else {
+          _100_instantiationType = _98_datatypeType;
+        }
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(Defs.__default.SingletonsImpl(_2_rTypeParamsDecls, _98_datatypeType, _100_instantiationType, _8_singletonConstructors)));
+      }
+      if (_67_cIsEq) {
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(_94_rTypeParamsDeclsWithEq, RAST.__default.Eq, RAST.Type.create_TypeApp(RAST.Type.create_TIdentifier(_3_datatypeName), _1_rTypeParams), Dafny.Sequence<RAST._IImplMember>.FromElements()))));
+      }
+      s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(Defs.__default.HashImpl(_95_rTypeParamsDeclsWithHash, RAST.Type.create_TypeApp(RAST.Type.create_TIdentifier(_3_datatypeName), _1_rTypeParams), _97_hashImplBody)));
+      if ((new BigInteger(((c).dtor_ctors).Count)).Sign == 1) {
+        RAST._IExpr _101_structName;
+        _101_structName = (RAST.Expr.create_Identifier(_3_datatypeName)).FSel(Defs.__default.escapeName((((c).dtor_ctors).Select(BigInteger.Zero)).dtor_name));
+        Dafny.ISequence<RAST._IAssignIdentifier> _102_structAssignments;
+        _102_structAssignments = Dafny.Sequence<RAST._IAssignIdentifier>.FromElements();
+        BigInteger _hi9 = new BigInteger(((((c).dtor_ctors).Select(BigInteger.Zero)).dtor_args).Count);
+        for (BigInteger _103_i = BigInteger.Zero; _103_i < _hi9; _103_i++) {
+          DAST._IDatatypeDtor _104_dtor;
+          _104_dtor = ((((c).dtor_ctors).Select(BigInteger.Zero)).dtor_args).Select(_103_i);
+          _102_structAssignments = Dafny.Sequence<RAST._IAssignIdentifier>.Concat(_102_structAssignments, Dafny.Sequence<RAST._IAssignIdentifier>.FromElements(RAST.AssignIdentifier.create(Defs.__default.escapeVar(((_104_dtor).dtor_formal).dtor_name), (((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("default"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Default"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("default"))).Apply0())));
+        }
+        RAST._IType _105_fullType;
+        _105_fullType = RAST.Type.create_TypeApp(RAST.Type.create_TIdentifier(_3_datatypeName), _1_rTypeParams);
+        if (_67_cIsEq) {
+          s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(Defs.__default.DefaultDatatypeImpl(_2_rTypeParamsDecls, _105_fullType, _101_structName, _102_structAssignments)));
+        }
+        s = Dafny.Sequence<RAST._IModDecl>.Concat(s, Dafny.Sequence<RAST._IModDecl>.FromElements(Defs.__default.AsRefDatatypeImpl(_2_rTypeParamsDecls, _105_fullType)));
+      }
+      Dafny.ISequence<RAST._IModDecl> _106_superTraitImplementations;
+      Dafny.ISequence<RAST._IModDecl> _out16;
+      _out16 = (this).GenTraitImplementations(path, _1_rTypeParams, _2_rTypeParamsDecls, (c).dtor_superTraitTypes, _25_traitBodies, _4_extern, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("datatype"));
+      _106_superTraitImplementations = _out16;
+      s = Dafny.Sequence<RAST._IModDecl>.Concat(s, _106_superTraitImplementations);
+      return s;
+    }
+    public RAST._IPath GenPath(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> p, bool escape)
+    {
+      RAST._IPath r = RAST.Path.Default();
+      if ((new BigInteger((p).Count)).Sign == 0) {
+        r = RAST.Path.create_Self();
+        return r;
+      } else {
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _0_p;
+        _0_p = p;
+        Dafny.ISequence<Dafny.Rune> _1_name;
+        _1_name = (((_0_p).Select(BigInteger.Zero)));
+        if (((new BigInteger((_1_name).Count)) >= (new BigInteger(2))) && (((_1_name).Subsequence(BigInteger.Zero, new BigInteger(2))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")))) {
+          r = RAST.Path.create_Global();
+          _0_p = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Update(_0_p, BigInteger.Zero, (_1_name).Drop(new BigInteger(2)));
+        } else if (((((_0_p).Select(BigInteger.Zero)))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_System"))) {
+          r = RAST.__default.dafny__runtime;
+        } else {
+          r = (this).thisFile;
+        }
+        BigInteger _hi0 = new BigInteger((_0_p).Count);
+        for (BigInteger _2_i = BigInteger.Zero; _2_i < _hi0; _2_i++) {
+          Dafny.ISequence<Dafny.Rune> _3_name;
+          _3_name = ((_0_p).Select(_2_i));
+          if (escape) {
+            _System._ITuple2<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs0 = DafnyCompilerRustUtils.__default.DafnyNameToContainingPathAndName(_3_name, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements());
+            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _4_modules = _let_tmp_rhs0.dtor__0;
+            Dafny.ISequence<Dafny.Rune> _5_finalName = _let_tmp_rhs0.dtor__1;
+            BigInteger _hi1 = new BigInteger((_4_modules).Count);
+            for (BigInteger _6_j = BigInteger.Zero; _6_j < _hi1; _6_j++) {
+              r = (r).MSel(Defs.__default.escapeName(((_4_modules).Select(_6_j))));
+            }
+            r = (r).MSel(Defs.__default.escapeName(_5_finalName));
+          } else {
+            r = (r).MSels(Defs.__default.SplitRustPathElement(Defs.__default.ReplaceDotByDoubleColon((_3_name)), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")));
+          }
+        }
+      }
+      return r;
+    }
+    public RAST._IType GenPathType(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> p)
+    {
+      RAST._IType t = RAST.Type.Default();
+      RAST._IPath _0_p;
+      RAST._IPath _out0;
+      _out0 = (this).GenPath(p, true);
+      _0_p = _out0;
+      t = (_0_p).AsType();
+      return t;
+    }
+    public RAST._IExpr GenPathExpr(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> p, bool escape)
+    {
+      RAST._IExpr e = RAST.Expr.Default();
+      if ((new BigInteger((p).Count)).Sign == 0) {
+        e = RAST.__default.self;
+        return e;
+      }
+      RAST._IPath _0_p;
+      RAST._IPath _out0;
+      _out0 = (this).GenPath(p, escape);
+      _0_p = _out0;
+      e = (_0_p).AsExpr();
+      return e;
+    }
+    public Dafny.ISequence<RAST._IType> GenTypeArgs(Dafny.ISequence<DAST._IType> args, bool genTypeContext)
+    {
+      Dafny.ISequence<RAST._IType> s = Dafny.Sequence<RAST._IType>.Empty;
+      s = Dafny.Sequence<RAST._IType>.FromElements();
+      BigInteger _hi0 = new BigInteger((args).Count);
+      for (BigInteger _0_i = BigInteger.Zero; _0_i < _hi0; _0_i++) {
+        RAST._IType _1_genTp;
+        RAST._IType _out0;
+        _out0 = (this).GenType((args).Select(_0_i), genTypeContext);
+        _1_genTp = _out0;
+        s = Dafny.Sequence<RAST._IType>.Concat(s, Dafny.Sequence<RAST._IType>.FromElements(_1_genTp));
+      }
+      return s;
+    }
+    public bool IsRcWrapped(Dafny.ISequence<DAST._IAttribute> attributes) {
+      return ((!(attributes).Contains(DAST.Attribute.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("auto-nongrowing-size"), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements()))) && (!(attributes).Contains(DAST.Attribute.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("rust_rc"), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("false")))))) || ((attributes).Contains(DAST.Attribute.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("rust_rc"), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("true")))));
+    }
+    public RAST._IType GenType(DAST._IType c, bool genTypeContext)
+    {
+      RAST._IType s = RAST.Type.Default();
+      DAST._IType _source0 = c;
+      {
+        if (_source0.is_UserDefined) {
+          DAST._IResolvedType _0_resolved = _source0.dtor_resolved;
+          {
+            RAST._IType _1_t;
+            RAST._IType _out0;
+            _out0 = (this).GenPathType((_0_resolved).dtor_path);
+            _1_t = _out0;
+            Dafny.ISequence<RAST._IType> _2_typeArgs;
+            Dafny.ISequence<RAST._IType> _out1;
+            _out1 = (this).GenTypeArgs((_0_resolved).dtor_typeArgs, false);
+            _2_typeArgs = _out1;
+            if ((new BigInteger((_2_typeArgs).Count)).Sign == 1) {
+              s = RAST.Type.create_TypeApp(_1_t, _2_typeArgs);
+            } else {
+              s = _1_t;
+            }
+            DAST._IResolvedTypeBase _source1 = (_0_resolved).dtor_kind;
+            {
+              if (_source1.is_Class) {
+                {
+                  s = (this).Object(s);
+                }
+                goto after_match1;
+              }
+            }
+            {
+              if (_source1.is_Datatype) {
+                {
+                  if ((this).IsRcWrapped((_0_resolved).dtor_attributes)) {
+                    s = RAST.__default.Rc(s);
+                  }
+                }
+                goto after_match1;
+              }
+            }
+            {
+              if (_source1.is_Trait) {
+                DAST._ITraitType traitType0 = _source1.dtor_traitType;
+                if (traitType0.is_GeneralTrait) {
+                  {
+                    if (!((genTypeContext))) {
+                      s = RAST.__default.Box(RAST.Type.create_DynType(s));
+                    }
+                  }
+                  goto after_match1;
+                }
+              }
+            }
+            {
+              if (_source1.is_Trait) {
+                DAST._ITraitType traitType1 = _source1.dtor_traitType;
+                if (traitType1.is_ObjectTrait) {
+                  {
+                    if (((_0_resolved).dtor_path).Equals(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_System"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("object")))) {
+                      s = RAST.__default.AnyTrait;
+                    }
+                    if (!((genTypeContext))) {
+                      s = (this).Object(RAST.Type.create_DynType(s));
+                    }
+                  }
+                  goto after_match1;
+                }
+              }
+            }
+            {
+              if (_source1.is_SynonymType) {
+                DAST._IType _3_base = _source1.dtor_baseType;
+                {
+                  RAST._IType _4_underlying;
+                  RAST._IType _out2;
+                  _out2 = (this).GenType(_3_base, Defs.GenTypeContext.@default());
+                  _4_underlying = _out2;
+                  s = RAST.Type.create_TSynonym(s, _4_underlying);
+                }
+                goto after_match1;
+              }
+            }
+            {
+              DAST._IType _5_base = _source1.dtor_baseType;
+              DAST._INewtypeRange _6_range = _source1.dtor_range;
+              bool _7_erased = _source1.dtor_erase;
+              {
+                if (_7_erased) {
+                  Std.Wrappers._IOption<RAST._IType> _8_unwrappedType;
+                  _8_unwrappedType = Defs.__default.NewtypeRangeToUnwrappedBoundedRustType(_5_base, _6_range);
+                  if ((_8_unwrappedType).is_Some) {
+                    s = (_8_unwrappedType).dtor_value;
+                  } else {
+                    RAST._IType _9_unwrappedType;
+                    RAST._IType _out3;
+                    _out3 = (this).GenType(_5_base, Defs.GenTypeContext.@default());
+                    _9_unwrappedType = _out3;
+                    s = _9_unwrappedType;
+                  }
+                } else if (Defs.__default.IsNewtypeCopy(_6_range)) {
+                  s = RAST.Type.create_TMetaData(s, true, (_6_range).CanOverflow());
+                }
+              }
+            }
+          after_match1: ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Object) {
+          {
+            s = RAST.__default.AnyTrait;
+            if (!((genTypeContext))) {
+              s = (this).Object(RAST.Type.create_DynType(s));
+            }
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Tuple) {
+          Dafny.ISequence<DAST._IType> _10_types = _source0.dtor_Tuple_a0;
+          {
+            Dafny.ISequence<RAST._IType> _11_args;
+            _11_args = Dafny.Sequence<RAST._IType>.FromElements();
+            BigInteger _12_i;
+            _12_i = BigInteger.Zero;
+            while ((_12_i) < (new BigInteger((_10_types).Count))) {
+              RAST._IType _13_generated;
+              RAST._IType _out4;
+              _out4 = (this).GenType((_10_types).Select(_12_i), false);
+              _13_generated = _out4;
+              _11_args = Dafny.Sequence<RAST._IType>.Concat(_11_args, Dafny.Sequence<RAST._IType>.FromElements(_13_generated));
+              _12_i = (_12_i) + (BigInteger.One);
+            }
+            if ((new BigInteger((_10_types).Count)) <= (RAST.__default.MAX__TUPLE__SIZE)) {
+              s = RAST.Type.create_TupleType(_11_args);
+            } else {
+              s = RAST.__default.SystemTupleType(_11_args);
+            }
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Array) {
+          DAST._IType _14_element = _source0.dtor_element;
+          BigInteger _15_dims = _source0.dtor_dims;
+          {
+            if ((_15_dims) > (new BigInteger(16))) {
+              s = RAST.__default.RawType(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<i>Array of dimensions greater than 16</i>"));
+            } else {
+              RAST._IType _16_elem;
+              RAST._IType _out5;
+              _out5 = (this).GenType(_14_element, false);
+              _16_elem = _out5;
+              if ((_15_dims) == (BigInteger.One)) {
+                s = RAST.Type.create_Array(_16_elem, Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None());
+                s = (this).Object(s);
+              } else {
+                Dafny.ISequence<Dafny.Rune> _17_n;
+                _17_n = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Array"), Std.Strings.__default.OfNat(_15_dims));
+                s = (((RAST.__default.dafny__runtime).MSel(_17_n)).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(_16_elem));
+                s = (this).Object(s);
+              }
+            }
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Seq) {
+          DAST._IType _18_element = _source0.dtor_element;
+          {
+            RAST._IType _19_elem;
+            RAST._IType _out6;
+            _out6 = (this).GenType(_18_element, false);
+            _19_elem = _out6;
+            s = RAST.Type.create_TypeApp(((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Sequence"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(_19_elem));
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Set) {
+          DAST._IType _20_element = _source0.dtor_element;
+          {
+            RAST._IType _21_elem;
+            RAST._IType _out7;
+            _out7 = (this).GenType(_20_element, false);
+            _21_elem = _out7;
+            s = RAST.Type.create_TypeApp(((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Set"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(_21_elem));
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Multiset) {
+          DAST._IType _22_element = _source0.dtor_element;
+          {
+            RAST._IType _23_elem;
+            RAST._IType _out8;
+            _out8 = (this).GenType(_22_element, false);
+            _23_elem = _out8;
+            s = RAST.Type.create_TypeApp(((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Multiset"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(_23_elem));
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Map) {
+          DAST._IType _24_key = _source0.dtor_key;
+          DAST._IType _25_value = _source0.dtor_value;
+          {
+            RAST._IType _26_keyType;
+            RAST._IType _out9;
+            _out9 = (this).GenType(_24_key, false);
+            _26_keyType = _out9;
+            RAST._IType _27_valueType;
+            RAST._IType _out10;
+            _out10 = (this).GenType(_25_value, genTypeContext);
+            _27_valueType = _out10;
+            s = RAST.Type.create_TypeApp(((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Map"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(_26_keyType, _27_valueType));
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MapBuilder) {
+          DAST._IType _28_key = _source0.dtor_key;
+          DAST._IType _29_value = _source0.dtor_value;
+          {
+            RAST._IType _30_keyType;
+            RAST._IType _out11;
+            _out11 = (this).GenType(_28_key, false);
+            _30_keyType = _out11;
+            RAST._IType _31_valueType;
+            RAST._IType _out12;
+            _out12 = (this).GenType(_29_value, genTypeContext);
+            _31_valueType = _out12;
+            s = RAST.Type.create_TypeApp(((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("MapBuilder"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(_30_keyType, _31_valueType));
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SetBuilder) {
+          DAST._IType _32_elem = _source0.dtor_element;
+          {
+            RAST._IType _33_elemType;
+            RAST._IType _out13;
+            _out13 = (this).GenType(_32_elem, false);
+            _33_elemType = _out13;
+            s = RAST.Type.create_TypeApp(((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("SetBuilder"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(_33_elemType));
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Arrow) {
+          Dafny.ISequence<DAST._IType> _34_args = _source0.dtor_args;
+          DAST._IType _35_result = _source0.dtor_result;
+          {
+            Dafny.ISequence<RAST._IType> _36_argTypes;
+            _36_argTypes = Dafny.Sequence<RAST._IType>.FromElements();
+            BigInteger _37_i;
+            _37_i = BigInteger.Zero;
+            while ((_37_i) < (new BigInteger((_34_args).Count))) {
+              RAST._IType _38_generated;
+              RAST._IType _out14;
+              _out14 = (this).GenType((_34_args).Select(_37_i), false);
+              _38_generated = _out14;
+              _36_argTypes = Dafny.Sequence<RAST._IType>.Concat(_36_argTypes, Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_Borrowed(_38_generated)));
+              _37_i = (_37_i) + (BigInteger.One);
+            }
+            RAST._IType _39_resultType;
+            RAST._IType _out15;
+            _out15 = (this).GenType(_35_result, Defs.GenTypeContext.@default());
+            _39_resultType = _out15;
+            s = RAST.__default.Rc(RAST.Type.create_DynType(RAST.Type.create_FnType(_36_argTypes, _39_resultType)));
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_TypeArg) {
+          Dafny.ISequence<Dafny.Rune> _h90 = _source0.dtor_TypeArg_a0;
+          Dafny.ISequence<Dafny.Rune> _40_name = _h90;
+          s = RAST.Type.create_TIdentifier(Defs.__default.escapeName(_40_name));
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Primitive) {
+          DAST._IPrimitive _41_p = _source0.dtor_Primitive_a0;
+          {
+            DAST._IPrimitive _source2 = _41_p;
+            {
+              if (_source2.is_Int) {
+                s = ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyInt"))).AsType();
+                goto after_match2;
+              }
+            }
+            {
+              if (_source2.is_Real) {
+                s = ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("BigRational"))).AsType();
+                goto after_match2;
+              }
+            }
+            {
+              if (_source2.is_String) {
+                s = RAST.Type.create_TypeApp(((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Sequence"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(((RAST.__default.dafny__runtime).MSel((this).DafnyChar)).AsType()));
+                goto after_match2;
+              }
+            }
+            {
+              if (_source2.is_Native) {
+                s = RAST.Type.create_USIZE();
+                goto after_match2;
+              }
+            }
+            {
+              if (_source2.is_Bool) {
+                s = RAST.Type.create_Bool();
+                goto after_match2;
+              }
+            }
+            {
+              s = ((RAST.__default.dafny__runtime).MSel((this).DafnyChar)).AsType();
+            }
+          after_match2: ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        Dafny.ISequence<Dafny.Rune> _42_v = _source0.dtor_Passthrough_a0;
+        s = RAST.__default.RawType(_42_v);
+      }
+    after_match0: ;
+      return s;
+    }
+    public bool EnclosingIsTrait(DAST._IType tpe) {
+      return ((tpe).is_UserDefined) && ((((tpe).dtor_resolved).dtor_kind).is_Trait);
+    }
+    public void GenClassImplBody(Dafny.ISequence<DAST._IMethod> body, bool forTrait, DAST._IType enclosingType, Dafny.ISequence<DAST._IType> enclosingTypeParams, out Dafny.ISequence<RAST._IImplMember> s, out Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>,Dafny.ISequence<RAST._IImplMember>> traitBodies)
+    {
+      s = Dafny.Sequence<RAST._IImplMember>.Empty;
+      traitBodies = Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<RAST._IImplMember>>.Empty;
+      s = Dafny.Sequence<RAST._IImplMember>.FromElements();
+      traitBodies = Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<RAST._IImplMember>>.FromElements();
+      BigInteger _hi0 = new BigInteger((body).Count);
+      for (BigInteger _0_i = BigInteger.Zero; _0_i < _hi0; _0_i++) {
+        DAST._IMethod _source0 = (body).Select(_0_i);
+        {
+          DAST._IMethod _1_m = _source0;
+          {
+            Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _source1 = (_1_m).dtor_overridingPath;
+            {
+              if (_source1.is_Some) {
+                Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _2_p = _source1.dtor_value;
+                {
+                  Dafny.ISequence<RAST._IImplMember> _3_existing;
+                  _3_existing = Dafny.Sequence<RAST._IImplMember>.FromElements();
+                  if ((traitBodies).Contains(_2_p)) {
+                    _3_existing = Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<RAST._IImplMember>>.Select(traitBodies,_2_p);
+                  }
+                  if (((new BigInteger(((_1_m).dtor_typeParams).Count)).Sign == 1) && ((this).EnclosingIsTrait(enclosingType))) {
+                    (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Error: Rust does not support method with generic type parameters in traits"));
+                  }
+                  RAST._IImplMember _4_genMethod;
+                  RAST._IImplMember _out0;
+                  _out0 = (this).GenMethod(_1_m, true, enclosingType, enclosingTypeParams);
+                  _4_genMethod = _out0;
+                  _3_existing = Dafny.Sequence<RAST._IImplMember>.Concat(_3_existing, Dafny.Sequence<RAST._IImplMember>.FromElements(_4_genMethod));
+                  traitBodies = Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<RAST._IImplMember>>.Merge(traitBodies, Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<RAST._IImplMember>>.FromElements(new Dafny.Pair<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<RAST._IImplMember>>(_2_p, _3_existing)));
+                }
+                goto after_match1;
+              }
+            }
+            {
+              {
+                RAST._IImplMember _5_generated;
+                RAST._IImplMember _out1;
+                _out1 = (this).GenMethod(_1_m, forTrait, enclosingType, enclosingTypeParams);
+                _5_generated = _out1;
+                s = Dafny.Sequence<RAST._IImplMember>.Concat(s, Dafny.Sequence<RAST._IImplMember>.FromElements(_5_generated));
+              }
+            }
+          after_match1: ;
+          }
+        }
+      after_match0: ;
+      }
+    }
+    public Dafny.ISequence<RAST._IFormal> GenParams(Dafny.ISequence<DAST._IFormal> @params, bool forLambda)
+    {
+      Dafny.ISequence<RAST._IFormal> s = Dafny.Sequence<RAST._IFormal>.Empty;
+      s = Dafny.Sequence<RAST._IFormal>.FromElements();
+      BigInteger _hi0 = new BigInteger((@params).Count);
+      for (BigInteger _0_i = BigInteger.Zero; _0_i < _hi0; _0_i++) {
+        DAST._IFormal _1_param;
+        _1_param = (@params).Select(_0_i);
+        RAST._IType _2_paramType;
+        RAST._IType _out0;
+        _out0 = (this).GenType((_1_param).dtor_typ, Defs.GenTypeContext.@default());
+        _2_paramType = _out0;
+        if (((!((_2_paramType).CanReadWithoutClone())) || (forLambda)) && (!((_1_param).dtor_attributes).Contains(Defs.__default.AttributeOwned))) {
+          _2_paramType = RAST.Type.create_Borrowed(_2_paramType);
+        }
+        s = Dafny.Sequence<RAST._IFormal>.Concat(s, Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.create(Defs.__default.escapeVar((_1_param).dtor_name), _2_paramType)));
+      }
+      return s;
+    }
+    public RAST._IImplMember GenMethod(DAST._IMethod m, bool forTrait, DAST._IType enclosingType, Dafny.ISequence<DAST._IType> enclosingTypeParams)
+    {
+      RAST._IImplMember s = RAST.ImplMember.Default();
+      Dafny.ISequence<RAST._IFormal> _0_params;
+      Dafny.ISequence<RAST._IFormal> _out0;
+      _out0 = (this).GenParams((m).dtor_params, false);
+      _0_params = _out0;
+      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _1_paramNames;
+      _1_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements();
+      Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> _2_paramTypes;
+      _2_paramTypes = Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.FromElements();
+      BigInteger _hi0 = new BigInteger(((m).dtor_params).Count);
+      for (BigInteger _3_paramI = BigInteger.Zero; _3_paramI < _hi0; _3_paramI++) {
+        DAST._IFormal _4_dafny__formal;
+        _4_dafny__formal = ((m).dtor_params).Select(_3_paramI);
+        RAST._IFormal _5_formal;
+        _5_formal = (_0_params).Select(_3_paramI);
+        Dafny.ISequence<Dafny.Rune> _6_name;
+        _6_name = (_5_formal).dtor_name;
+        _1_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_1_paramNames, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_6_name));
+        _2_paramTypes = Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Update(_2_paramTypes, _6_name, (_5_formal).dtor_tpe);
+      }
+      Dafny.ISequence<Dafny.Rune> _7_fnName;
+      _7_fnName = Defs.__default.escapeName((m).dtor_name);
+      Defs._ISelfInfo _8_selfIdent;
+      _8_selfIdent = Defs.SelfInfo.create_NoSelf();
+      if (!((m).dtor_isStatic)) {
+        Dafny.ISequence<Dafny.Rune> _9_selfId;
+        _9_selfId = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self");
+        if ((m).dtor_outVarsAreUninitFieldsToAssign) {
+          _9_selfId = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this");
+        }
+        var _pat_let_tv0 = enclosingTypeParams;
+        DAST._IType _10_instanceType;
+        DAST._IType _source0 = enclosingType;
+        {
+          if (_source0.is_UserDefined) {
+            DAST._IResolvedType _11_r = _source0.dtor_resolved;
+            _10_instanceType = DAST.Type.create_UserDefined(Dafny.Helpers.Let<DAST._IResolvedType, DAST._IResolvedType>(_11_r, _pat_let25_0 => Dafny.Helpers.Let<DAST._IResolvedType, DAST._IResolvedType>(_pat_let25_0, _12_dt__update__tmp_h0 => Dafny.Helpers.Let<Dafny.ISequence<DAST._IType>, DAST._IResolvedType>(_pat_let_tv0, _pat_let26_0 => Dafny.Helpers.Let<Dafny.ISequence<DAST._IType>, DAST._IResolvedType>(_pat_let26_0, _13_dt__update_htypeArgs_h0 => DAST.ResolvedType.create((_12_dt__update__tmp_h0).dtor_path, _13_dt__update_htypeArgs_h0, (_12_dt__update__tmp_h0).dtor_kind, (_12_dt__update__tmp_h0).dtor_attributes, (_12_dt__update__tmp_h0).dtor_properMethods, (_12_dt__update__tmp_h0).dtor_extendedTypes))))));
+            goto after_match0;
+          }
+        }
+        {
+          _10_instanceType = enclosingType;
+        }
+      after_match0: ;
+        if (forTrait) {
+          RAST._IFormal _14_selfFormal;
+          _14_selfFormal = RAST.Formal.selfBorrowed;
+          _0_params = Dafny.Sequence<RAST._IFormal>.Concat(Dafny.Sequence<RAST._IFormal>.FromElements(_14_selfFormal), _0_params);
+        } else {
+          RAST._IType _15_tpe;
+          RAST._IType _out1;
+          _out1 = (this).GenType(_10_instanceType, Defs.GenTypeContext.@default());
+          _15_tpe = _out1;
+          if ((_9_selfId).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this"))) {
+            if (((this).pointerType).is_RcMut) {
+              _15_tpe = RAST.Type.create_Borrowed(_15_tpe);
+            }
+          } else if ((_9_selfId).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"))) {
+            if ((_15_tpe).IsObjectOrPointer()) {
+              _15_tpe = RAST.__default.SelfBorrowed;
+            } else {
+              if ((((enclosingType).is_UserDefined) && ((((enclosingType).dtor_resolved).dtor_kind).is_Datatype)) && ((this).IsRcWrapped(((enclosingType).dtor_resolved).dtor_attributes))) {
+                _15_tpe = RAST.Type.create_Borrowed(RAST.__default.Rc(RAST.__default.SelfOwned));
+              } else if ((((enclosingType).is_UserDefined) && ((((enclosingType).dtor_resolved).dtor_kind).is_Newtype)) && (Defs.__default.IsNewtypeCopy((((enclosingType).dtor_resolved).dtor_kind).dtor_range))) {
+                _15_tpe = RAST.Type.create_TMetaData(RAST.__default.SelfOwned, true, ((((enclosingType).dtor_resolved).dtor_kind).dtor_range).CanOverflow());
+              } else {
+                _15_tpe = RAST.__default.SelfBorrowed;
+              }
+            }
+          }
+          RAST._IFormal _16_formal;
+          _16_formal = RAST.Formal.create(_9_selfId, _15_tpe);
+          _0_params = Dafny.Sequence<RAST._IFormal>.Concat(Dafny.Sequence<RAST._IFormal>.FromElements(_16_formal), _0_params);
+          Dafny.ISequence<Dafny.Rune> _17_name;
+          _17_name = (_16_formal).dtor_name;
+          _1_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_17_name), _1_paramNames);
+          _2_paramTypes = Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Update(_2_paramTypes, _17_name, (_16_formal).dtor_tpe);
+        }
+        _8_selfIdent = Defs.SelfInfo.create_ThisTyped(_9_selfId, _10_instanceType);
+      }
+      Dafny.ISequence<RAST._IType> _18_retTypeArgs;
+      _18_retTypeArgs = Dafny.Sequence<RAST._IType>.FromElements();
+      BigInteger _19_typeI;
+      _19_typeI = BigInteger.Zero;
+      while ((_19_typeI) < (new BigInteger(((m).dtor_outTypes).Count))) {
+        RAST._IType _20_typeExpr;
+        RAST._IType _out2;
+        _out2 = (this).GenType(((m).dtor_outTypes).Select(_19_typeI), Defs.GenTypeContext.@default());
+        _20_typeExpr = _out2;
+        _18_retTypeArgs = Dafny.Sequence<RAST._IType>.Concat(_18_retTypeArgs, Dafny.Sequence<RAST._IType>.FromElements(_20_typeExpr));
+        _19_typeI = (_19_typeI) + (BigInteger.One);
+      }
+      RAST._IVisibility _21_visibility;
+      if (forTrait) {
+        _21_visibility = RAST.Visibility.create_PRIV();
+      } else {
+        _21_visibility = RAST.Visibility.create_PUB();
+      }
+      Dafny.ISequence<DAST._ITypeArgDecl> _22_typeParamsFiltered;
+      _22_typeParamsFiltered = Dafny.Sequence<DAST._ITypeArgDecl>.FromElements();
+      BigInteger _hi1 = new BigInteger(((m).dtor_typeParams).Count);
+      for (BigInteger _23_typeParamI = BigInteger.Zero; _23_typeParamI < _hi1; _23_typeParamI++) {
+        DAST._ITypeArgDecl _24_typeParam;
+        _24_typeParam = ((m).dtor_typeParams).Select(_23_typeParamI);
+        if (!((enclosingTypeParams).Contains(DAST.Type.create_TypeArg((_24_typeParam).dtor_name)))) {
+          _22_typeParamsFiltered = Dafny.Sequence<DAST._ITypeArgDecl>.Concat(_22_typeParamsFiltered, Dafny.Sequence<DAST._ITypeArgDecl>.FromElements(_24_typeParam));
+        }
+      }
+      Dafny.ISequence<RAST._ITypeParamDecl> _25_typeParams;
+      _25_typeParams = Dafny.Sequence<RAST._ITypeParamDecl>.FromElements();
+      if ((new BigInteger((_22_typeParamsFiltered).Count)).Sign == 1) {
+        BigInteger _hi2 = new BigInteger((_22_typeParamsFiltered).Count);
+        for (BigInteger _26_i = BigInteger.Zero; _26_i < _hi2; _26_i++) {
+          DAST._IType _27_typeArg;
+          RAST._ITypeParamDecl _28_rTypeParamDecl;
+          DAST._IType _out3;
+          RAST._ITypeParamDecl _out4;
+          (this).GenTypeParam((_22_typeParamsFiltered).Select(_26_i), out _out3, out _out4);
+          _27_typeArg = _out3;
+          _28_rTypeParamDecl = _out4;
+          RAST._ITypeParamDecl _29_dt__update__tmp_h1 = _28_rTypeParamDecl;
+          Dafny.ISequence<RAST._IType> _30_dt__update_hconstraints_h0 = (_28_rTypeParamDecl).dtor_constraints;
+          _28_rTypeParamDecl = RAST.TypeParamDecl.create((_29_dt__update__tmp_h1).dtor_name, _30_dt__update_hconstraints_h0);
+          _25_typeParams = Dafny.Sequence<RAST._ITypeParamDecl>.Concat(_25_typeParams, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(_28_rTypeParamDecl));
+        }
+      }
+      Std.Wrappers._IOption<RAST._IExpr> _31_fBody = Std.Wrappers.Option<RAST._IExpr>.Default();
+      Defs._IEnvironment _32_env = Defs.Environment.Default();
+      RAST._IExpr _33_preBody;
+      _33_preBody = (this).InitEmptyExpr();
+      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _34_preAssignNames;
+      _34_preAssignNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements();
+      Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> _35_preAssignTypes;
+      _35_preAssignTypes = Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.FromElements();
+      if ((m).dtor_hasBody) {
+        Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _36_earlyReturn;
+        _36_earlyReturn = Std.Wrappers.Option<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.create_None();
+        Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _source1 = (m).dtor_outVars;
+        {
+          if (_source1.is_Some) {
+            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _37_outVars = _source1.dtor_value;
+            {
+              if ((m).dtor_outVarsAreUninitFieldsToAssign) {
+                _36_earlyReturn = Std.Wrappers.Option<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.create_Some(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements());
+                BigInteger _hi3 = new BigInteger((_37_outVars).Count);
+                for (BigInteger _38_outI = BigInteger.Zero; _38_outI < _hi3; _38_outI++) {
+                  Dafny.ISequence<Dafny.Rune> _39_outVar;
+                  _39_outVar = (_37_outVars).Select(_38_outI);
+                  Dafny.ISequence<Dafny.Rune> _40_outName;
+                  _40_outName = Defs.__default.escapeVar(_39_outVar);
+                  Dafny.ISequence<Dafny.Rune> _41_tracker__name;
+                  _41_tracker__name = Defs.__default.AddAssignedPrefix(_40_outName);
+                  _34_preAssignNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_34_preAssignNames, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_41_tracker__name));
+                  _35_preAssignTypes = Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Update(_35_preAssignTypes, _41_tracker__name, RAST.Type.create_Bool());
+                  _33_preBody = (_33_preBody).Then(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), _41_tracker__name, Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_Bool()), Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.Expr.create_LiteralBool(false))));
+                }
+              } else {
+                Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _42_tupleArgs;
+                _42_tupleArgs = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements();
+                bool _43_isTailRecursive;
+                _43_isTailRecursive = ((new BigInteger(((m).dtor_body).Count)) == (BigInteger.One)) && ((((m).dtor_body).Select(BigInteger.Zero)).is_TailRecursive);
+                BigInteger _hi4 = new BigInteger((_37_outVars).Count);
+                for (BigInteger _44_outI = BigInteger.Zero; _44_outI < _hi4; _44_outI++) {
+                  Dafny.ISequence<Dafny.Rune> _45_outVar;
+                  _45_outVar = (_37_outVars).Select(_44_outI);
+                  DAST._IType _46_outTyp;
+                  _46_outTyp = ((m).dtor_outTypes).Select(_44_outI);
+                  RAST._IType _47_outType;
+                  RAST._IType _out5;
+                  _out5 = (this).GenType(_46_outTyp, Defs.GenTypeContext.@default());
+                  _47_outType = _out5;
+                  Dafny.ISequence<Dafny.Rune> _48_outName;
+                  _48_outName = Defs.__default.escapeVar(_45_outVar);
+                  if (!(_43_isTailRecursive)) {
+                    _1_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_1_paramNames, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_48_outName));
+                    RAST._IType _49_outMaybeType;
+                    if ((_47_outType).CanReadWithoutClone()) {
+                      _49_outMaybeType = _47_outType;
+                    } else {
+                      _49_outMaybeType = RAST.__default.MaybePlaceboType(_47_outType);
+                    }
+                    _2_paramTypes = Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Update(_2_paramTypes, _48_outName, _49_outMaybeType);
+                  }
+                  _42_tupleArgs = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_42_tupleArgs, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_48_outName));
+                }
+                _36_earlyReturn = Std.Wrappers.Option<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.create_Some(_42_tupleArgs);
+              }
+            }
+            goto after_match1;
+          }
+        }
+        {
+        }
+      after_match1: ;
+        _32_env = Defs.Environment.create(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_34_preAssignNames, _1_paramNames), Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Merge(_35_preAssignTypes, _2_paramTypes), Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements());
+        RAST._IExpr _50_body;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _51___v20;
+        Defs._IEnvironment _52___v21;
+        RAST._IExpr _out6;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out7;
+        Defs._IEnvironment _out8;
+        (this).GenStmts((m).dtor_body, _8_selfIdent, _32_env, true, _36_earlyReturn, out _out6, out _out7, out _out8);
+        _50_body = _out6;
+        _51___v20 = _out7;
+        _52___v21 = _out8;
+        _31_fBody = Std.Wrappers.Option<RAST._IExpr>.create_Some((_33_preBody).Then(_50_body));
+      } else {
+        _32_env = Defs.Environment.create(_1_paramNames, _2_paramTypes, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements());
+        _31_fBody = Std.Wrappers.Option<RAST._IExpr>.create_None();
+      }
+      s = RAST.ImplMember.create_FnDecl((m).dtor_docString, RAST.__default.NoAttr, _21_visibility, RAST.Fn.create(_7_fnName, _25_typeParams, _0_params, Std.Wrappers.Option<RAST._IType>.create_Some((((new BigInteger((_18_retTypeArgs).Count)) == (BigInteger.One)) ? ((_18_retTypeArgs).Select(BigInteger.Zero)) : (RAST.Type.create_TupleType(_18_retTypeArgs)))), _31_fBody));
+      return s;
+    }
+    public void GenStmts(Dafny.ISequence<DAST._IStatement> stmts, Defs._ISelfInfo selfIdent, Defs._IEnvironment env, bool isLast, Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> earlyReturn, out RAST._IExpr generated, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents, out Defs._IEnvironment newEnv)
+    {
+      generated = RAST.Expr.Default();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      newEnv = Defs.Environment.Default();
+      generated = (this).InitEmptyExpr();
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _0_declarations;
+      _0_declarations = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+      BigInteger _1_i;
+      _1_i = BigInteger.Zero;
+      newEnv = env;
+      while ((_1_i) < (new BigInteger((stmts).Count))) {
+        DAST._IStatement _2_stmt;
+        _2_stmt = (stmts).Select(_1_i);
+        if (((((((_2_stmt).is_DeclareVar) && (((_2_stmt).dtor_maybeValue).is_None)) && (((_1_i) + (BigInteger.One)) < (new BigInteger((stmts).Count)))) && (((stmts).Select((_1_i) + (BigInteger.One))).is_Assign)) && ((((stmts).Select((_1_i) + (BigInteger.One))).dtor_lhs).is_Ident)) && (object.Equals((((stmts).Select((_1_i) + (BigInteger.One))).dtor_lhs).dtor_ident, (_2_stmt).dtor_name))) {
+          Dafny.ISequence<Dafny.Rune> _3_name;
+          _3_name = (_2_stmt).dtor_name;
+          DAST._IType _4_typ;
+          _4_typ = (_2_stmt).dtor_typ;
+          RAST._IExpr _5_stmtExpr;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _6_recIdents;
+          Defs._IEnvironment _7_newEnv2;
+          RAST._IExpr _out0;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out1;
+          Defs._IEnvironment _out2;
+          (this).GenDeclareVarAssign(_3_name, _4_typ, ((stmts).Select((_1_i) + (BigInteger.One))).dtor_value, selfIdent, newEnv, out _out0, out _out1, out _out2);
+          _5_stmtExpr = _out0;
+          _6_recIdents = _out1;
+          _7_newEnv2 = _out2;
+          newEnv = _7_newEnv2;
+          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(_6_recIdents, _0_declarations));
+          _0_declarations = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_0_declarations, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(Defs.__default.escapeVar(_3_name)));
+          generated = (generated).Then(_5_stmtExpr);
+          _1_i = (_1_i) + (new BigInteger(2));
+        } else {
+          DAST._IStatement _source0 = _2_stmt;
+          {
+            if (_source0.is_DeclareVar) {
+              Dafny.ISequence<Dafny.Rune> _8_name = _source0.dtor_name;
+              DAST._IType _9_optType = _source0.dtor_typ;
+              Std.Wrappers._IOption<DAST._IExpression> maybeValue0 = _source0.dtor_maybeValue;
+              if (maybeValue0.is_None) {
+                Defs._IAssignmentStatus _10_laterAssignmentStatus;
+                _10_laterAssignmentStatus = Defs.__default.DetectAssignmentStatus((stmts).Drop((_1_i) + (BigInteger.One)), _8_name);
+                newEnv = (newEnv).AddAssignmentStatus(Defs.__default.escapeVar(_8_name), _10_laterAssignmentStatus);
+                goto after_match0;
+              }
+            }
+          }
+          {
+            if (_source0.is_DeclareVar) {
+              Dafny.ISequence<Dafny.Rune> _11_name = _source0.dtor_name;
+              DAST._IType _12_optType = _source0.dtor_typ;
+              Std.Wrappers._IOption<DAST._IExpression> maybeValue1 = _source0.dtor_maybeValue;
+              if (maybeValue1.is_Some) {
+                DAST._IExpression value0 = maybeValue1.dtor_value;
+                if (value0.is_InitializationValue) {
+                  DAST._IType _13_typ = value0.dtor_typ;
+                  RAST._IType _14_tpe;
+                  RAST._IType _out3;
+                  _out3 = (this).GenType(_13_typ, Defs.GenTypeContext.@default());
+                  _14_tpe = _out3;
+                  Dafny.ISequence<Dafny.Rune> _15_varName;
+                  _15_varName = Defs.__default.escapeVar(_11_name);
+                  Defs._IAssignmentStatus _16_laterAssignmentStatus;
+                  _16_laterAssignmentStatus = Defs.__default.DetectAssignmentStatus((stmts).Drop((_1_i) + (BigInteger.One)), _11_name);
+                  newEnv = (newEnv).AddAssignmentStatus(_15_varName, _16_laterAssignmentStatus);
+                  goto after_match0;
+                }
+              }
+            }
+          }
+          {
+          }
+        after_match0: ;
+          RAST._IExpr _17_stmtExpr;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _18_recIdents;
+          Defs._IEnvironment _19_newEnv2;
+          RAST._IExpr _out4;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out5;
+          Defs._IEnvironment _out6;
+          (this).GenStmt(_2_stmt, selfIdent, newEnv, (isLast) && ((_1_i) == ((new BigInteger((stmts).Count)) - (BigInteger.One))), earlyReturn, out _out4, out _out5, out _out6);
+          _17_stmtExpr = _out4;
+          _18_recIdents = _out5;
+          _19_newEnv2 = _out6;
+          newEnv = _19_newEnv2;
+          DAST._IStatement _source1 = _2_stmt;
+          {
+            if (_source1.is_DeclareVar) {
+              Dafny.ISequence<Dafny.Rune> _20_name = _source1.dtor_name;
+              {
+                _0_declarations = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_0_declarations, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(Defs.__default.escapeVar(_20_name)));
+              }
+              goto after_match1;
+            }
+          }
+          {
+          }
+        after_match1: ;
+          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(_18_recIdents, _0_declarations));
+          generated = (generated).Then(_17_stmtExpr);
+          if ((_17_stmtExpr).is_Return) {
+            goto after_0;
+          }
+          _1_i = (_1_i) + (BigInteger.One);
+        }
+      continue_0: ;
+      }
+    after_0: ;
+    }
+    public void GenDeclareVarAssign(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ, DAST._IExpression rhs, Defs._ISelfInfo selfIdent, Defs._IEnvironment env, out RAST._IExpr generated, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents, out Defs._IEnvironment newEnv)
+    {
+      generated = RAST.Expr.Default();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      newEnv = Defs.Environment.Default();
+      RAST._IType _0_tpe;
+      RAST._IType _out0;
+      _out0 = (this).GenType(typ, Defs.GenTypeContext.@default());
+      _0_tpe = _out0;
+      Dafny.ISequence<Dafny.Rune> _1_varName;
+      _1_varName = Defs.__default.escapeVar(name);
+      RAST._IExpr _2_exprRhs = RAST.Expr.Default();
+      if (((rhs).is_InitializationValue) && ((_0_tpe).IsObjectOrPointer())) {
+        readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+        if ((rhs).is_NewUninitArray) {
+          _0_tpe = (_0_tpe).TypeAtInitialization();
+        } else {
+          _0_tpe = _0_tpe;
+        }
+        _2_exprRhs = (_0_tpe).ToNullExpr();
+      } else {
+        RAST._IExpr _3_expr = RAST.Expr.Default();
+        Defs._IOwnership _4_exprOwnership = Defs.Ownership.Default();
+        RAST._IExpr _out1;
+        Defs._IOwnership _out2;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out3;
+        (this).GenExpr(rhs, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out1, out _out2, out _out3);
+        _3_expr = _out1;
+        _4_exprOwnership = _out2;
+        readIdents = _out3;
+        if ((rhs).is_NewUninitArray) {
+          _0_tpe = (_0_tpe).TypeAtInitialization();
+        } else {
+          _0_tpe = _0_tpe;
+        }
+        _2_exprRhs = _3_expr;
+      }
+      generated = RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), _1_varName, Std.Wrappers.Option<RAST._IType>.create_Some(_0_tpe), Std.Wrappers.Option<RAST._IExpr>.create_Some(_2_exprRhs));
+      newEnv = (env).AddAssigned(_1_varName, _0_tpe);
+    }
+    public void GenAssignLhs(DAST._IAssignLhs lhs, RAST._IExpr rhs, Defs._ISelfInfo selfIdent, Defs._IEnvironment env, out RAST._IExpr generated, out bool needsIIFE, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents, out Defs._IEnvironment newEnv)
+    {
+      generated = RAST.Expr.Default();
+      needsIIFE = false;
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      newEnv = Defs.Environment.Default();
+      newEnv = env;
+      DAST._IAssignLhs _source0 = lhs;
+      {
+        if (_source0.is_Ident) {
+          Dafny.ISequence<Dafny.Rune> _0_id = _source0.dtor_ident;
+          {
+            Dafny.ISequence<Dafny.Rune> _1_idRust;
+            _1_idRust = Defs.__default.escapeVar(_0_id);
+            if (((env).IsBorrowed(_1_idRust)) || ((env).IsBorrowedMut(_1_idRust))) {
+              generated = RAST.__default.AssignVar(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*"), _1_idRust), rhs);
+            } else {
+              generated = RAST.__default.AssignVar(_1_idRust, rhs);
+            }
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_1_idRust);
+            needsIIFE = false;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Select) {
+          DAST._IExpression _2_on = _source0.dtor_expr;
+          Dafny.ISequence<Dafny.Rune> _3_field = _source0.dtor_field;
+          bool _4_isConstant = _source0.dtor_isConstant;
+          {
+            Dafny.ISequence<Dafny.Rune> _5_fieldName;
+            _5_fieldName = Defs.__default.escapeVar(_3_field);
+            RAST._IExpr _6_onExpr;
+            Defs._IOwnership _7_onOwned;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _8_recIdents;
+            RAST._IExpr _out0;
+            Defs._IOwnership _out1;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out2;
+            (this).GenExpr(_2_on, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out0, out _out1, out _out2);
+            _6_onExpr = _out0;
+            _7_onOwned = _out1;
+            _8_recIdents = _out2;
+            RAST._IExpr _source1 = _6_onExpr;
+            {
+              bool disjunctiveMatch0 = false;
+              if (_source1.is_Call) {
+                RAST._IExpr obj0 = _source1.dtor_obj;
+                if (obj0.is_Select) {
+                  RAST._IExpr obj1 = obj0.dtor_obj;
+                  if (obj1.is_Identifier) {
+                    Dafny.ISequence<Dafny.Rune> name0 = obj1.dtor_name;
+                    if (object.Equals(name0, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this"))) {
+                      Dafny.ISequence<Dafny.Rune> name1 = obj0.dtor_name;
+                      if (object.Equals(name1, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("clone"))) {
+                        disjunctiveMatch0 = true;
+                      }
+                    }
+                  }
+                }
+              }
+              if (_source1.is_Identifier) {
+                Dafny.ISequence<Dafny.Rune> name2 = _source1.dtor_name;
+                if (object.Equals(name2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this"))) {
+                  disjunctiveMatch0 = true;
+                }
+              }
+              if (_source1.is_UnaryOp) {
+                Dafny.ISequence<Dafny.Rune> op10 = _source1.dtor_op1;
+                if (object.Equals(op10, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"))) {
+                  RAST._IExpr underlying0 = _source1.dtor_underlying;
+                  if (underlying0.is_Identifier) {
+                    Dafny.ISequence<Dafny.Rune> name3 = underlying0.dtor_name;
+                    if (object.Equals(name3, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this"))) {
+                      disjunctiveMatch0 = true;
+                    }
+                  }
+                }
+              }
+              if (disjunctiveMatch0) {
+                Dafny.ISequence<Dafny.Rune> _9_isAssignedVar;
+                _9_isAssignedVar = Defs.__default.AddAssignedPrefix(_5_fieldName);
+                if (((newEnv).dtor_names).Contains(_9_isAssignedVar)) {
+                  Dafny.ISequence<Dafny.Rune> _10_update__field__uninit;
+                  if (_4_isConstant) {
+                    _10_update__field__uninit = (this).update__field__uninit__macro;
+                  } else {
+                    _10_update__field__uninit = (this).update__field__mut__uninit__macro;
+                  }
+                  generated = (((RAST.__default.dafny__runtime).MSel(_10_update__field__uninit)).AsExpr()).Apply(Dafny.Sequence<RAST._IExpr>.FromElements((this).thisInConstructor, RAST.Expr.create_Identifier(_5_fieldName), RAST.Expr.create_Identifier(_9_isAssignedVar), rhs));
+                  newEnv = (newEnv).RemoveAssigned(_9_isAssignedVar);
+                } else {
+                  generated = ((this).modify__mutable__field__macro).Apply(Dafny.Sequence<RAST._IExpr>.FromElements((((this).read__macro).Apply1((this).thisInConstructor)).Sel(_5_fieldName), rhs));
+                }
+                goto after_match1;
+              }
+            }
+            {
+              if (!object.Equals(_6_onExpr, RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self")))) {
+                _6_onExpr = ((this).read__macro).Apply1(_6_onExpr);
+              }
+              generated = ((this).modify__mutable__field__macro).Apply(Dafny.Sequence<RAST._IExpr>.FromElements((_6_onExpr).Sel(_5_fieldName), rhs));
+            }
+          after_match1: ;
+            readIdents = _8_recIdents;
+            needsIIFE = false;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        DAST._IExpression _11_on = _source0.dtor_expr;
+        Dafny.ISequence<DAST._IExpression> _12_indices = _source0.dtor_indices;
+        {
+          RAST._IExpr _13_onExpr;
+          Defs._IOwnership _14_onOwned;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _15_recIdents;
+          RAST._IExpr _out3;
+          Defs._IOwnership _out4;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out5;
+          (this).GenExpr(_11_on, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out3, out _out4, out _out5);
+          _13_onExpr = _out3;
+          _14_onOwned = _out4;
+          _15_recIdents = _out5;
+          readIdents = _15_recIdents;
+          _13_onExpr = ((this).modify__macro).Apply1(_13_onExpr);
+          RAST._IExpr _16_r;
+          _16_r = (this).InitEmptyExpr();
+          Dafny.ISequence<RAST._IExpr> _17_indicesExpr;
+          _17_indicesExpr = Dafny.Sequence<RAST._IExpr>.FromElements();
+          BigInteger _hi0 = new BigInteger((_12_indices).Count);
+          for (BigInteger _18_i = BigInteger.Zero; _18_i < _hi0; _18_i++) {
+            RAST._IExpr _19_idx;
+            Defs._IOwnership _20___v29;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _21_recIdentsIdx;
+            RAST._IExpr _out6;
+            Defs._IOwnership _out7;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out8;
+            (this).GenExpr((_12_indices).Select(_18_i), selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out6, out _out7, out _out8);
+            _19_idx = _out6;
+            _20___v29 = _out7;
+            _21_recIdentsIdx = _out8;
+            Dafny.ISequence<Dafny.Rune> _22_varName;
+            _22_varName = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("__idx"), Std.Strings.__default.OfNat(_18_i));
+            _17_indicesExpr = Dafny.Sequence<RAST._IExpr>.Concat(_17_indicesExpr, Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_Identifier(_22_varName)));
+            _16_r = (_16_r).Then(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_CONST(), _22_varName, Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.__default.IntoUsize(_19_idx))));
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _21_recIdentsIdx);
+          }
+          if ((new BigInteger((_12_indices).Count)) > (BigInteger.One)) {
+            _13_onExpr = (_13_onExpr).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("data"));
+          }
+          generated = (_16_r).Then(RAST.Expr.create_Assign(Std.Wrappers.Option<RAST._IAssignLhs>.create_Some(RAST.AssignLhs.create_Index(_13_onExpr, _17_indicesExpr)), rhs));
+          needsIIFE = true;
+        }
+      }
+    after_match0: ;
+    }
+    public void GenOwnedCallPart(DAST._IExpression @on, Defs._ISelfInfo selfIdent, DAST._ICallName name, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args, Defs._IEnvironment env, out RAST._IExpr r, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents)
+    {
+      r = RAST.Expr.Default();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      Dafny.ISequence<RAST._IExpr> _0_argExprs;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _1_recIdents;
+      Dafny.ISequence<RAST._IType> _2_typeExprs;
+      Std.Wrappers._IOption<DAST._IResolvedType> _3_fullNameQualifier;
+      Dafny.ISequence<RAST._IExpr> _out0;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out1;
+      Dafny.ISequence<RAST._IType> _out2;
+      Std.Wrappers._IOption<DAST._IResolvedType> _out3;
+      (this).GenArgs(selfIdent, name, typeArgs, args, env, out _out0, out _out1, out _out2, out _out3);
+      _0_argExprs = _out0;
+      _1_recIdents = _out1;
+      _2_typeExprs = _out2;
+      _3_fullNameQualifier = _out3;
+      readIdents = _1_recIdents;
+      Std.Wrappers._IOption<DAST._IResolvedType> _source0 = _3_fullNameQualifier;
+      {
+        if (_source0.is_Some) {
+          DAST._IResolvedType value0 = _source0.dtor_value;
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _4_path = value0.dtor_path;
+          Dafny.ISequence<DAST._IType> _5_onTypeArgs = value0.dtor_typeArgs;
+          DAST._IResolvedTypeBase _6_base = value0.dtor_kind;
+          RAST._IExpr _7_fullPath;
+          RAST._IExpr _out4;
+          _out4 = (this).GenPathExpr(_4_path, true);
+          _7_fullPath = _out4;
+          Dafny.ISequence<RAST._IType> _8_onTypeExprs;
+          Dafny.ISequence<RAST._IType> _out5;
+          _out5 = (this).GenTypeArgs(_5_onTypeArgs, Defs.GenTypeContext.@default());
+          _8_onTypeExprs = _out5;
+          RAST._IExpr _9_onExpr = RAST.Expr.Default();
+          Defs._IOwnership _10_recOwnership = Defs.Ownership.Default();
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _11_recIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+          if ((((_6_base).is_Trait) && (((_6_base).dtor_traitType).is_ObjectTrait)) || ((_6_base).is_Class)) {
+            RAST._IExpr _out6;
+            Defs._IOwnership _out7;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out8;
+            (this).GenExpr(@on, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out6, out _out7, out _out8);
+            _9_onExpr = _out6;
+            _10_recOwnership = _out7;
+            _11_recIdents = _out8;
+            _9_onExpr = ((this).read__macro).Apply1(_9_onExpr);
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _11_recIdents);
+          } else if (((_6_base).is_Trait) && (((_6_base).dtor_traitType).is_GeneralTrait)) {
+            RAST._IExpr _out9;
+            Defs._IOwnership _out10;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out11;
+            (this).GenExpr(@on, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out9, out _out10, out _out11);
+            _9_onExpr = _out9;
+            _10_recOwnership = _out10;
+            _11_recIdents = _out11;
+            if (((_9_onExpr).is_Identifier) && ((env).NeedsAsRefForBorrow((_9_onExpr).dtor_name))) {
+              _9_onExpr = ((_9_onExpr).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("as_ref"))).Apply0();
+            } else if ((_9_onExpr).IsBorrow()) {
+              _9_onExpr = (((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("convert"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("AsRef"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("as_ref"))).Apply1(_9_onExpr);
+            }
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _11_recIdents);
+          } else if (((_6_base).is_Newtype) && (Defs.__default.IsNewtypeCopy((_6_base).dtor_range))) {
+            RAST._IExpr _out12;
+            Defs._IOwnership _out13;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out14;
+            (this).GenExpr(@on, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out12, out _out13, out _out14);
+            _9_onExpr = _out12;
+            _10_recOwnership = _out13;
+            _11_recIdents = _out14;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _11_recIdents);
+          } else {
+            RAST._IExpr _out15;
+            Defs._IOwnership _out16;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out17;
+            (this).GenExpr(@on, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out15, out _out16, out _out17);
+            _9_onExpr = _out15;
+            _10_recOwnership = _out16;
+            _11_recIdents = _out17;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _11_recIdents);
+          }
+          r = ((((_7_fullPath).ApplyType(_8_onTypeExprs)).FSel(Defs.__default.escapeName((name).dtor_name))).ApplyType(_2_typeExprs)).Apply(Dafny.Sequence<RAST._IExpr>.Concat(Dafny.Sequence<RAST._IExpr>.FromElements(_9_onExpr), _0_argExprs));
+          goto after_match0;
+        }
+      }
+      {
+        RAST._IExpr _12_onExpr;
+        Defs._IOwnership _13___v34;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _14_recIdents;
+        RAST._IExpr _out18;
+        Defs._IOwnership _out19;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out20;
+        (this).GenExpr(@on, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out18, out _out19, out _out20);
+        _12_onExpr = _out18;
+        _13___v34 = _out19;
+        _14_recIdents = _out20;
+        readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _14_recIdents);
+        Dafny.ISequence<Dafny.Rune> _15_renderedName;
+        _15_renderedName = (this).GetMethodName(@on, name);
+        DAST._IExpression _source1 = @on;
+        {
+          bool disjunctiveMatch0 = false;
+          if (_source1.is_Companion) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source1.is_ExternCompanion) {
+            disjunctiveMatch0 = true;
+          }
+          if (disjunctiveMatch0) {
+            {
+              _12_onExpr = (_12_onExpr).FSel(_15_renderedName);
+            }
+            goto after_match1;
+          }
+        }
+        {
+          {
+            if (!object.Equals(_12_onExpr, RAST.__default.self)) {
+              DAST._ICallName _source2 = name;
+              {
+                if (_source2.is_CallName) {
+                  Std.Wrappers._IOption<DAST._IType> onType0 = _source2.dtor_onType;
+                  if (onType0.is_Some) {
+                    DAST._IType _16_tpe = onType0.dtor_value;
+                    RAST._IType _17_typ;
+                    RAST._IType _out21;
+                    _out21 = (this).GenType(_16_tpe, Defs.GenTypeContext.@default());
+                    _17_typ = _out21;
+                    if (((_17_typ).IsObjectOrPointer()) && (!object.Equals(_12_onExpr, RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"))))) {
+                      _12_onExpr = ((this).read__macro).Apply1(_12_onExpr);
+                    }
+                    goto after_match2;
+                  }
+                }
+              }
+              {
+              }
+            after_match2: ;
+            }
+            _12_onExpr = (_12_onExpr).Sel(_15_renderedName);
+          }
+        }
+      after_match1: ;
+        r = ((_12_onExpr).ApplyType(_2_typeExprs)).Apply(_0_argExprs);
+      }
+    after_match0: ;
+    }
+    public void GenStmt(DAST._IStatement stmt, Defs._ISelfInfo selfIdent, Defs._IEnvironment env, bool isLast, Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> earlyReturn, out RAST._IExpr generated, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents, out Defs._IEnvironment newEnv)
+    {
+      generated = RAST.Expr.Default();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      newEnv = Defs.Environment.Default();
+      DAST._IStatement _source0 = stmt;
+      {
+        if (_source0.is_ConstructorNewSeparator) {
+          Dafny.ISequence<DAST._IField> _0_fields = _source0.dtor_fields;
+          {
+            generated = (this).InitEmptyExpr();
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            newEnv = env;
+            BigInteger _hi0 = new BigInteger((_0_fields).Count);
+            for (BigInteger _1_i = BigInteger.Zero; _1_i < _hi0; _1_i++) {
+              DAST._IField _2_field;
+              _2_field = (_0_fields).Select(_1_i);
+              Dafny.ISequence<Dafny.Rune> _3_fieldName;
+              _3_fieldName = Defs.__default.escapeVar(((_2_field).dtor_formal).dtor_name);
+              RAST._IType _4_fieldTyp;
+              RAST._IType _out0;
+              _out0 = (this).GenType(((_2_field).dtor_formal).dtor_typ, Defs.GenTypeContext.@default());
+              _4_fieldTyp = _out0;
+              Dafny.ISequence<Dafny.Rune> _5_isAssignedVar;
+              _5_isAssignedVar = Defs.__default.AddAssignedPrefix(_3_fieldName);
+              if (((newEnv).dtor_names).Contains(_5_isAssignedVar)) {
+                RAST._IExpr _6_rhs;
+                Defs._IOwnership _7___v44;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _8___v45;
+                RAST._IExpr _out1;
+                Defs._IOwnership _out2;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out3;
+                (this).GenExpr(DAST.Expression.create_InitializationValue(((_2_field).dtor_formal).dtor_typ), selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out1, out _out2, out _out3);
+                _6_rhs = _out1;
+                _7___v44 = _out2;
+                _8___v45 = _out3;
+                readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_5_isAssignedVar));
+                Dafny.ISequence<Dafny.Rune> _9_update__if__uninit;
+                if ((_2_field).dtor_isConstant) {
+                  _9_update__if__uninit = (this).update__field__if__uninit__macro;
+                } else {
+                  _9_update__if__uninit = (this).update__field__mut__if__uninit__macro;
+                }
+                generated = (generated).Then((((RAST.__default.dafny__runtime).MSel(_9_update__if__uninit)).AsExpr()).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this")), RAST.Expr.create_Identifier(_3_fieldName), RAST.Expr.create_Identifier(_5_isAssignedVar), _6_rhs)));
+                newEnv = (newEnv).RemoveAssigned(_5_isAssignedVar);
+              }
+            }
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_DeclareVar) {
+          Dafny.ISequence<Dafny.Rune> _10_name = _source0.dtor_name;
+          DAST._IType _11_typ = _source0.dtor_typ;
+          Std.Wrappers._IOption<DAST._IExpression> maybeValue0 = _source0.dtor_maybeValue;
+          if (maybeValue0.is_Some) {
+            DAST._IExpression _12_expression = maybeValue0.dtor_value;
+            {
+              RAST._IType _13_tpe;
+              RAST._IType _out4;
+              _out4 = (this).GenType(_11_typ, Defs.GenTypeContext.@default());
+              _13_tpe = _out4;
+              Dafny.ISequence<Dafny.Rune> _14_varName;
+              _14_varName = Defs.__default.escapeVar(_10_name);
+              bool _15_hasCopySemantics;
+              _15_hasCopySemantics = (_13_tpe).CanReadWithoutClone();
+              if (((_12_expression).is_InitializationValue) && (!(_15_hasCopySemantics))) {
+                if ((env).IsAssignmentStatusKnown(_14_varName)) {
+                  generated = RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), _14_varName, Std.Wrappers.Option<RAST._IType>.create_Some(_13_tpe), Std.Wrappers.Option<RAST._IExpr>.create_None());
+                } else {
+                  generated = RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), _14_varName, Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(((((RAST.__default.MaybePlaceboPath).AsExpr()).ApplyType1(_13_tpe)).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("new"))).Apply0()));
+                  _13_tpe = RAST.__default.MaybePlaceboType(_13_tpe);
+                }
+                readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+                newEnv = (env).AddAssigned(_14_varName, _13_tpe);
+              } else {
+                RAST._IExpr _out5;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out6;
+                Defs._IEnvironment _out7;
+                (this).GenDeclareVarAssign(_10_name, _11_typ, _12_expression, selfIdent, env, out _out5, out _out6, out _out7);
+                generated = _out5;
+                readIdents = _out6;
+                newEnv = _out7;
+                return ;
+              }
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        if (_source0.is_DeclareVar) {
+          Dafny.ISequence<Dafny.Rune> _16_name = _source0.dtor_name;
+          DAST._IType _17_typ = _source0.dtor_typ;
+          Std.Wrappers._IOption<DAST._IExpression> maybeValue1 = _source0.dtor_maybeValue;
+          if (maybeValue1.is_None) {
+            {
+              Dafny.ISequence<Dafny.Rune> _18_varName;
+              _18_varName = Defs.__default.escapeVar(_16_name);
+              if ((env).IsAssignmentStatusKnown(_18_varName)) {
+                RAST._IType _19_tpe;
+                RAST._IType _out8;
+                _out8 = (this).GenType(_17_typ, Defs.GenTypeContext.@default());
+                _19_tpe = _out8;
+                generated = RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), _18_varName, Std.Wrappers.Option<RAST._IType>.create_Some(_19_tpe), Std.Wrappers.Option<RAST._IExpr>.create_None());
+                readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+                newEnv = (env).AddAssigned(_18_varName, _19_tpe);
+              } else {
+                DAST._IStatement _20_newStmt;
+                _20_newStmt = DAST.Statement.create_DeclareVar(_16_name, _17_typ, Std.Wrappers.Option<DAST._IExpression>.create_Some(DAST.Expression.create_InitializationValue(_17_typ)));
+                RAST._IExpr _out9;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out10;
+                Defs._IEnvironment _out11;
+                (this).GenStmt(_20_newStmt, selfIdent, env, isLast, earlyReturn, out _out9, out _out10, out _out11);
+                generated = _out9;
+                readIdents = _out10;
+                newEnv = _out11;
+              }
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        if (_source0.is_Assign) {
+          DAST._IAssignLhs _21_lhs = _source0.dtor_lhs;
+          DAST._IExpression _22_expression = _source0.dtor_value;
+          {
+            RAST._IExpr _23_exprGen;
+            Defs._IOwnership _24___v46;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _25_exprIdents;
+            RAST._IExpr _out12;
+            Defs._IOwnership _out13;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out14;
+            (this).GenExpr(_22_expression, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out12, out _out13, out _out14);
+            _23_exprGen = _out12;
+            _24___v46 = _out13;
+            _25_exprIdents = _out14;
+            if ((_21_lhs).is_Ident) {
+              Dafny.ISequence<Dafny.Rune> _26_rustId;
+              _26_rustId = Defs.__default.escapeVar((_21_lhs).dtor_ident);
+              Std.Wrappers._IOption<RAST._IType> _27_tpe;
+              _27_tpe = (env).GetType(_26_rustId);
+              if (((_27_tpe).is_Some) && ((((_27_tpe).dtor_value).ExtractMaybePlacebo()).is_Some)) {
+                _23_exprGen = RAST.__default.MaybePlacebo(_23_exprGen);
+              }
+            }
+            if (((_21_lhs).is_Index) && (((_21_lhs).dtor_expr).is_Ident)) {
+              Dafny.ISequence<Dafny.Rune> _28_rustId;
+              _28_rustId = Defs.__default.escapeVar(((_21_lhs).dtor_expr).dtor_name);
+              Std.Wrappers._IOption<RAST._IType> _29_tpe;
+              _29_tpe = (env).GetType(_28_rustId);
+              if (((_29_tpe).is_Some) && ((((_29_tpe).dtor_value).ExtractMaybeUninitArrayElement()).is_Some)) {
+                _23_exprGen = RAST.__default.MaybeUninitNew(_23_exprGen);
+              }
+            }
+            RAST._IExpr _30_lhsGen;
+            bool _31_needsIIFE;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _32_recIdents;
+            Defs._IEnvironment _33_resEnv;
+            RAST._IExpr _out15;
+            bool _out16;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out17;
+            Defs._IEnvironment _out18;
+            (this).GenAssignLhs(_21_lhs, _23_exprGen, selfIdent, env, out _out15, out _out16, out _out17, out _out18);
+            _30_lhsGen = _out15;
+            _31_needsIIFE = _out16;
+            _32_recIdents = _out17;
+            _33_resEnv = _out18;
+            generated = _30_lhsGen;
+            newEnv = _33_resEnv;
+            if (_31_needsIIFE) {
+              generated = RAST.Expr.create_Block(generated);
+            }
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_32_recIdents, _25_exprIdents);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_If) {
+          DAST._IExpression _34_cond = _source0.dtor_cond;
+          Dafny.ISequence<DAST._IStatement> _35_thnDafny = _source0.dtor_thn;
+          Dafny.ISequence<DAST._IStatement> _36_elsDafny = _source0.dtor_els;
+          {
+            RAST._IExpr _37_cond;
+            Defs._IOwnership _38___v47;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _39_recIdents;
+            RAST._IExpr _out19;
+            Defs._IOwnership _out20;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out21;
+            (this).GenExpr(_34_cond, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out19, out _out20, out _out21);
+            _37_cond = _out19;
+            _38___v47 = _out20;
+            _39_recIdents = _out21;
+            Dafny.ISequence<Dafny.Rune> _40_condString;
+            _40_condString = (_37_cond)._ToString(Defs.__default.IND);
+            readIdents = _39_recIdents;
+            RAST._IExpr _41_thn;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _42_thnIdents;
+            Defs._IEnvironment _43_thnEnv;
+            RAST._IExpr _out22;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out23;
+            Defs._IEnvironment _out24;
+            (this).GenStmts(_35_thnDafny, selfIdent, env, isLast, earlyReturn, out _out22, out _out23, out _out24);
+            _41_thn = _out22;
+            _42_thnIdents = _out23;
+            _43_thnEnv = _out24;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _42_thnIdents);
+            RAST._IExpr _44_els;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _45_elsIdents;
+            Defs._IEnvironment _46_elsEnv;
+            RAST._IExpr _out25;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out26;
+            Defs._IEnvironment _out27;
+            (this).GenStmts(_36_elsDafny, selfIdent, env, isLast, earlyReturn, out _out25, out _out26, out _out27);
+            _44_els = _out25;
+            _45_elsIdents = _out26;
+            _46_elsEnv = _out27;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _45_elsIdents);
+            newEnv = env;
+            generated = RAST.Expr.create_IfExpr(_37_cond, _41_thn, _44_els);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Labeled) {
+          Dafny.ISequence<Dafny.Rune> _47_lbl = _source0.dtor_lbl;
+          Dafny.ISequence<DAST._IStatement> _48_body = _source0.dtor_body;
+          {
+            RAST._IExpr _49_body;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _50_bodyIdents;
+            Defs._IEnvironment _51_env2;
+            RAST._IExpr _out28;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out29;
+            Defs._IEnvironment _out30;
+            (this).GenStmts(_48_body, selfIdent, env, isLast, earlyReturn, out _out28, out _out29, out _out30);
+            _49_body = _out28;
+            _50_bodyIdents = _out29;
+            _51_env2 = _out30;
+            readIdents = _50_bodyIdents;
+            generated = RAST.Expr.create_Labelled(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("label_"), _47_lbl), RAST.Expr.create_Loop(Std.Wrappers.Option<RAST._IExpr>.create_None(), RAST.Expr.create_StmtExpr(_49_body, RAST.Expr.create_Break(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None()))));
+            newEnv = env;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_While) {
+          DAST._IExpression _52_cond = _source0.dtor_cond;
+          Dafny.ISequence<DAST._IStatement> _53_body = _source0.dtor_body;
+          {
+            RAST._IExpr _54_cond;
+            Defs._IOwnership _55___v48;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _56_recIdents;
+            RAST._IExpr _out31;
+            Defs._IOwnership _out32;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out33;
+            (this).GenExpr(_52_cond, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out31, out _out32, out _out33);
+            _54_cond = _out31;
+            _55___v48 = _out32;
+            _56_recIdents = _out33;
+            readIdents = _56_recIdents;
+            RAST._IExpr _57_bodyExpr;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _58_bodyIdents;
+            Defs._IEnvironment _59_bodyEnv;
+            RAST._IExpr _out34;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out35;
+            Defs._IEnvironment _out36;
+            (this).GenStmts(_53_body, selfIdent, env, false, earlyReturn, out _out34, out _out35, out _out36);
+            _57_bodyExpr = _out34;
+            _58_bodyIdents = _out35;
+            _59_bodyEnv = _out36;
+            newEnv = env;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _58_bodyIdents);
+            generated = RAST.Expr.create_Loop(Std.Wrappers.Option<RAST._IExpr>.create_Some(_54_cond), _57_bodyExpr);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Foreach) {
+          Dafny.ISequence<Dafny.Rune> _60_boundName = _source0.dtor_boundName;
+          DAST._IType _61_boundType = _source0.dtor_boundType;
+          DAST._IExpression _62_overExpr = _source0.dtor_over;
+          Dafny.ISequence<DAST._IStatement> _63_body = _source0.dtor_body;
+          {
+            RAST._IExpr _64_over;
+            Defs._IOwnership _65___v49;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _66_recIdents;
+            RAST._IExpr _out37;
+            Defs._IOwnership _out38;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out39;
+            (this).GenExpr(_62_overExpr, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out37, out _out38, out _out39);
+            _64_over = _out37;
+            _65___v49 = _out38;
+            _66_recIdents = _out39;
+            if (((_62_overExpr).is_MapBoundedPool) || ((_62_overExpr).is_SetBoundedPool)) {
+              _64_over = ((_64_over).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("cloned"))).Apply0();
+            }
+            RAST._IType _67_boundTpe;
+            RAST._IType _out40;
+            _out40 = (this).GenType(_61_boundType, Defs.GenTypeContext.@default());
+            _67_boundTpe = _out40;
+            readIdents = _66_recIdents;
+            Dafny.ISequence<Dafny.Rune> _68_boundRName;
+            _68_boundRName = Defs.__default.escapeVar(_60_boundName);
+            RAST._IExpr _69_bodyExpr;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _70_bodyIdents;
+            Defs._IEnvironment _71_bodyEnv;
+            RAST._IExpr _out41;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out42;
+            Defs._IEnvironment _out43;
+            (this).GenStmts(_63_body, selfIdent, (env).AddAssigned(_68_boundRName, _67_boundTpe), false, earlyReturn, out _out41, out _out42, out _out43);
+            _69_bodyExpr = _out41;
+            _70_bodyIdents = _out42;
+            _71_bodyEnv = _out43;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _70_bodyIdents), Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_68_boundRName));
+            newEnv = env;
+            generated = RAST.Expr.create_For(_68_boundRName, _64_over, _69_bodyExpr);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Break) {
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _72_toLabel = _source0.dtor_toLabel;
+          {
+            Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _source1 = _72_toLabel;
+            {
+              if (_source1.is_Some) {
+                Dafny.ISequence<Dafny.Rune> _73_lbl = _source1.dtor_value;
+                {
+                  generated = RAST.Expr.create_Break(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("label_"), _73_lbl)));
+                }
+                goto after_match1;
+              }
+            }
+            {
+              {
+                generated = RAST.Expr.create_Break(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None());
+              }
+            }
+          after_match1: ;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            newEnv = env;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_TailRecursive) {
+          Dafny.ISequence<DAST._IStatement> _74_body = _source0.dtor_body;
+          {
+            generated = (this).InitEmptyExpr();
+            Defs._IEnvironment _75_oldEnv;
+            _75_oldEnv = env;
+            if (!object.Equals(selfIdent, Defs.SelfInfo.create_NoSelf())) {
+              RAST._IExpr _76_selfClone;
+              Defs._IOwnership _77___v50;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _78___v51;
+              RAST._IExpr _out44;
+              Defs._IOwnership _out45;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out46;
+              (this).GenIdent((selfIdent).dtor_rSelfName, selfIdent, Defs.Environment.Empty(), Defs.Ownership.create_OwnershipOwned(), out _out44, out _out45, out _out46);
+              _76_selfClone = _out44;
+              _77___v50 = _out45;
+              _78___v51 = _out46;
+              generated = (generated).Then(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_this"), Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(_76_selfClone)));
+              if (((_75_oldEnv).dtor_names).Contains((selfIdent).dtor_rSelfName)) {
+                _75_oldEnv = (_75_oldEnv).RemoveAssigned((selfIdent).dtor_rSelfName);
+              }
+            }
+            RAST._IExpr _79_loopBegin;
+            _79_loopBegin = RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+            newEnv = env;
+            BigInteger _hi1 = new BigInteger(((_75_oldEnv).dtor_names).Count);
+            for (BigInteger _80_paramI = BigInteger.Zero; _80_paramI < _hi1; _80_paramI++) {
+              Dafny.ISequence<Dafny.Rune> _81_param;
+              _81_param = ((_75_oldEnv).dtor_names).Select(_80_paramI);
+              if ((_81_param).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_accumulator"))) {
+                goto continue_4_0;
+              }
+              RAST._IExpr _82_paramInit;
+              Defs._IOwnership _83___v52;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _84___v53;
+              RAST._IExpr _out47;
+              Defs._IOwnership _out48;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out49;
+              (this).GenIdent(_81_param, selfIdent, _75_oldEnv, Defs.Ownership.create_OwnershipOwned(), out _out47, out _out48, out _out49);
+              _82_paramInit = _out47;
+              _83___v52 = _out48;
+              _84___v53 = _out49;
+              Dafny.ISequence<Dafny.Rune> _85_recVar;
+              _85_recVar = Dafny.Sequence<Dafny.Rune>.Concat(Defs.__default.TailRecursionPrefix, Std.Strings.__default.OfNat(_80_paramI));
+              generated = (generated).Then(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), _85_recVar, Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(_82_paramInit)));
+              if (((_75_oldEnv).dtor_types).Contains(_81_param)) {
+                RAST._IType _86_declaredType;
+                _86_declaredType = (Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Select((_75_oldEnv).dtor_types,_81_param)).ToOwned();
+                newEnv = (newEnv).AddAssigned(_81_param, _86_declaredType);
+                newEnv = (newEnv).AddAssigned(_85_recVar, _86_declaredType);
+              }
+              _79_loopBegin = (_79_loopBegin).Then(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_CONST(), _81_param, Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.Expr.create_Identifier(_85_recVar))));
+            continue_4_0: ;
+            }
+          after_4_0: ;
+            RAST._IExpr _87_bodyExpr;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _88_bodyIdents;
+            Defs._IEnvironment _89_bodyEnv;
+            RAST._IExpr _out50;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out51;
+            Defs._IEnvironment _out52;
+            (this).GenStmts(_74_body, ((!object.Equals(selfIdent, Defs.SelfInfo.create_NoSelf())) ? (Defs.SelfInfo.create_ThisTyped(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_this"), (selfIdent).dtor_dafnyType)) : (Defs.SelfInfo.create_NoSelf())), newEnv, false, earlyReturn, out _out50, out _out51, out _out52);
+            _87_bodyExpr = _out50;
+            _88_bodyIdents = _out51;
+            _89_bodyEnv = _out52;
+            readIdents = _88_bodyIdents;
+            generated = (generated).Then(RAST.Expr.create_Labelled(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("TAIL_CALL_START"), RAST.Expr.create_Loop(Std.Wrappers.Option<RAST._IExpr>.create_None(), (_79_loopBegin).Then(_87_bodyExpr))));
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_JumpTailCallStart) {
+          {
+            generated = RAST.Expr.create_Continue(Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("TAIL_CALL_START")));
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            newEnv = env;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Call) {
+          DAST._IExpression _90_on = _source0.dtor_on;
+          DAST._ICallName _91_name = _source0.dtor_callName;
+          Dafny.ISequence<DAST._IType> _92_typeArgs = _source0.dtor_typeArgs;
+          Dafny.ISequence<DAST._IExpression> _93_args = _source0.dtor_args;
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _94_maybeOutVars = _source0.dtor_outs;
+          {
+            RAST._IExpr _out53;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out54;
+            (this).GenOwnedCallPart(_90_on, selfIdent, _91_name, _92_typeArgs, _93_args, env, out _out53, out _out54);
+            generated = _out53;
+            readIdents = _out54;
+            newEnv = env;
+            if (((_94_maybeOutVars).is_Some) && ((new BigInteger(((_94_maybeOutVars).dtor_value).Count)) == (BigInteger.One))) {
+              Dafny.ISequence<Dafny.Rune> _95_outVar;
+              _95_outVar = Defs.__default.escapeVar(((_94_maybeOutVars).dtor_value).Select(BigInteger.Zero));
+              if ((env).IsMaybePlacebo(_95_outVar)) {
+                generated = RAST.__default.MaybePlacebo(generated);
+              }
+              generated = RAST.__default.AssignVar(_95_outVar, generated);
+            } else if (((_94_maybeOutVars).is_None) || ((new BigInteger(((_94_maybeOutVars).dtor_value).Count)).Sign == 0)) {
+            } else {
+              Dafny.ISequence<Dafny.Rune> _96_tmpVar;
+              _96_tmpVar = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_x");
+              RAST._IExpr _97_tmpId;
+              _97_tmpId = RAST.Expr.create_Identifier(_96_tmpVar);
+              generated = RAST.Expr.create_DeclareVar(RAST.DeclareType.create_CONST(), _96_tmpVar, Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(generated));
+              Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _98_outVars;
+              _98_outVars = (_94_maybeOutVars).dtor_value;
+              BigInteger _hi2 = new BigInteger((_98_outVars).Count);
+              for (BigInteger _99_outI = BigInteger.Zero; _99_outI < _hi2; _99_outI++) {
+                Dafny.ISequence<Dafny.Rune> _100_outVar;
+                _100_outVar = Defs.__default.escapeVar((_98_outVars).Select(_99_outI));
+                RAST._IExpr _101_rhs;
+                _101_rhs = (_97_tmpId).Sel(Std.Strings.__default.OfNat(_99_outI));
+                if ((env).IsMaybePlacebo(_100_outVar)) {
+                  _101_rhs = RAST.__default.MaybePlacebo(_101_rhs);
+                }
+                generated = (generated).Then(RAST.__default.AssignVar(_100_outVar, _101_rhs));
+              }
+            }
+            newEnv = env;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Return) {
+          DAST._IExpression _102_exprDafny = _source0.dtor_expr;
+          {
+            RAST._IExpr _103_expr;
+            Defs._IOwnership _104___v54;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _105_recIdents;
+            RAST._IExpr _out55;
+            Defs._IOwnership _out56;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out57;
+            (this).GenExpr(_102_exprDafny, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out55, out _out56, out _out57);
+            _103_expr = _out55;
+            _104___v54 = _out56;
+            _105_recIdents = _out57;
+            readIdents = _105_recIdents;
+            if (isLast) {
+              generated = _103_expr;
+            } else {
+              generated = RAST.Expr.create_Return(Std.Wrappers.Option<RAST._IExpr>.create_Some(_103_expr));
+            }
+            newEnv = env;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_EarlyReturn) {
+          {
+            Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _source2 = earlyReturn;
+            {
+              if (_source2.is_None) {
+                generated = RAST.Expr.create_Return(Std.Wrappers.Option<RAST._IExpr>.create_None());
+                goto after_match2;
+              }
+            }
+            {
+              Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _106_rustIdents = _source2.dtor_value;
+              Dafny.ISequence<RAST._IExpr> _107_tupleArgs;
+              _107_tupleArgs = Dafny.Sequence<RAST._IExpr>.FromElements();
+              BigInteger _hi3 = new BigInteger((_106_rustIdents).Count);
+              for (BigInteger _108_i = BigInteger.Zero; _108_i < _hi3; _108_i++) {
+                RAST._IExpr _109_rIdent;
+                Defs._IOwnership _110___v55;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _111___v56;
+                RAST._IExpr _out58;
+                Defs._IOwnership _out59;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out60;
+                (this).GenIdent((_106_rustIdents).Select(_108_i), selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out58, out _out59, out _out60);
+                _109_rIdent = _out58;
+                _110___v55 = _out59;
+                _111___v56 = _out60;
+                _107_tupleArgs = Dafny.Sequence<RAST._IExpr>.Concat(_107_tupleArgs, Dafny.Sequence<RAST._IExpr>.FromElements(_109_rIdent));
+              }
+              if ((new BigInteger((_107_tupleArgs).Count)) == (BigInteger.One)) {
+                generated = RAST.Expr.create_Return(Std.Wrappers.Option<RAST._IExpr>.create_Some((_107_tupleArgs).Select(BigInteger.Zero)));
+              } else {
+                generated = RAST.Expr.create_Return(Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.Expr.create_Tuple(_107_tupleArgs)));
+              }
+            }
+          after_match2: ;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            newEnv = env;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Halt) {
+          {
+            generated = (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("panic!"))).Apply1(RAST.Expr.create_LiteralString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Halt"), false, false));
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            newEnv = env;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        DAST._IExpression _112_e = _source0.dtor_Print_a0;
+        {
+          RAST._IExpr _113_printedExpr;
+          Defs._IOwnership _114_recOwnership;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _115_recIdents;
+          RAST._IExpr _out61;
+          Defs._IOwnership _out62;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out63;
+          (this).GenExpr(_112_e, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out61, out _out62, out _out63);
+          _113_printedExpr = _out61;
+          _114_recOwnership = _out62;
+          _115_recIdents = _out63;
+          generated = (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("print!"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_LiteralString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{}"), false, false), (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyPrintWrapper"))).AsExpr()).Apply1(_113_printedExpr)));
+          readIdents = _115_recIdents;
+          newEnv = env;
+        }
+      }
+    after_match0: ;
+    }
+    public void FromOwned(RAST._IExpr r, Defs._IOwnership expectedOwnership, out RAST._IExpr @out, out Defs._IOwnership resultingOwnership)
+    {
+      @out = RAST.Expr.Default();
+      resultingOwnership = Defs.Ownership.Default();
+      if ((object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipOwned())) || (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipAutoBorrowed()))) {
+        @out = r;
+        resultingOwnership = Defs.Ownership.create_OwnershipOwned();
+      } else if (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipBorrowed())) {
+        @out = RAST.__default.Borrow(r);
+        resultingOwnership = Defs.Ownership.create_OwnershipBorrowed();
+      } else {
+        RAST._IExpr _out0;
+        _out0 = (this).Error(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Conversion from Borrowed or BorrowedMut to BorrowedMut"), r);
+        @out = _out0;
+        @out = ((this).modify__macro).Apply1(@out);
+        resultingOwnership = Defs.Ownership.create_OwnershipBorrowedMut();
+      }
+    }
+    public void FromOwnership(RAST._IExpr r, Defs._IOwnership ownership, Defs._IOwnership expectedOwnership, out RAST._IExpr @out, out Defs._IOwnership resultingOwnership)
+    {
+      @out = RAST.Expr.Default();
+      resultingOwnership = Defs.Ownership.Default();
+      if (object.Equals(ownership, expectedOwnership)) {
+        @out = r;
+        resultingOwnership = expectedOwnership;
+        return ;
+      }
+      if (object.Equals(ownership, Defs.Ownership.create_OwnershipOwned())) {
+        RAST._IExpr _out0;
+        Defs._IOwnership _out1;
+        (this).FromOwned(r, expectedOwnership, out _out0, out _out1);
+        @out = _out0;
+        resultingOwnership = _out1;
+        return ;
+      } else if ((object.Equals(ownership, Defs.Ownership.create_OwnershipBorrowed())) || (object.Equals(ownership, Defs.Ownership.create_OwnershipBorrowedMut()))) {
+        if (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipOwned())) {
+          resultingOwnership = Defs.Ownership.create_OwnershipOwned();
+          @out = (r).Clone();
+        } else if ((object.Equals(expectedOwnership, ownership)) || (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipAutoBorrowed()))) {
+          resultingOwnership = ownership;
+          @out = r;
+        } else if ((object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipBorrowed())) && (object.Equals(ownership, Defs.Ownership.create_OwnershipBorrowedMut()))) {
+          resultingOwnership = Defs.Ownership.create_OwnershipBorrowed();
+          @out = r;
+        } else {
+          resultingOwnership = Defs.Ownership.create_OwnershipBorrowedMut();
+          @out = RAST.__default.BorrowMut(r);
+        }
+        return ;
+      } else {
+      }
+    }
+    public void GenExprLiteral(DAST._IExpression e, Defs._ISelfInfo selfIdent, Defs._IEnvironment env, Defs._IOwnership expectedOwnership, out RAST._IExpr r, out Defs._IOwnership resultingOwnership, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents)
+    {
+      r = RAST.Expr.Default();
+      resultingOwnership = Defs.Ownership.Default();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      DAST._IExpression _source0 = e;
+      {
+        if (_source0.is_Literal) {
+          DAST._ILiteral _h300 = _source0.dtor_Literal_a0;
+          if (_h300.is_BoolLiteral) {
+            bool _0_b = _h300.dtor_BoolLiteral_a0;
+            {
+              RAST._IExpr _out0;
+              Defs._IOwnership _out1;
+              (this).FromOwned(RAST.Expr.create_LiteralBool(_0_b), expectedOwnership, out _out0, out _out1);
+              r = _out0;
+              resultingOwnership = _out1;
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+              return ;
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        if (_source0.is_Literal) {
+          DAST._ILiteral _h301 = _source0.dtor_Literal_a0;
+          if (_h301.is_IntLiteral) {
+            Dafny.ISequence<Dafny.Rune> _1_i = _h301.dtor_IntLiteral_a0;
+            DAST._IType _2_t = _h301.dtor_IntLiteral_a1;
+            {
+              DAST._IType _source1 = _2_t;
+              {
+                if (_source1.is_Primitive) {
+                  DAST._IPrimitive _h70 = _source1.dtor_Primitive_a0;
+                  if (_h70.is_Int) {
+                    {
+                      if ((new BigInteger((_1_i).Count)) <= (new BigInteger(4))) {
+                        r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("int!"))).AsExpr()).Apply1(RAST.Expr.create_LiteralInt(_1_i));
+                      } else {
+                        r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("int!"))).AsExpr()).Apply1(RAST.Expr.create_LiteralString(_1_i, true, false));
+                      }
+                    }
+                    goto after_match1;
+                  }
+                }
+              }
+              {
+                DAST._IType _3_o = _source1;
+                {
+                  RAST._IType _4_genType;
+                  RAST._IType _out2;
+                  _out2 = (this).GenType(_3_o, Defs.GenTypeContext.@default());
+                  _4_genType = _out2;
+                  r = RAST.Expr.create_TypeAscription(RAST.Expr.create_LiteralInt(_1_i), _4_genType);
+                }
+              }
+            after_match1: ;
+              RAST._IExpr _out3;
+              Defs._IOwnership _out4;
+              (this).FromOwned(r, expectedOwnership, out _out3, out _out4);
+              r = _out3;
+              resultingOwnership = _out4;
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+              return ;
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        if (_source0.is_Literal) {
+          DAST._ILiteral _h302 = _source0.dtor_Literal_a0;
+          if (_h302.is_DecLiteral) {
+            Dafny.ISequence<Dafny.Rune> _5_n = _h302.dtor_DecLiteral_a0;
+            Dafny.ISequence<Dafny.Rune> _6_d = _h302.dtor_DecLiteral_a1;
+            DAST._IType _7_t = _h302.dtor_DecLiteral_a2;
+            {
+              DAST._IType _source2 = _7_t;
+              {
+                if (_source2.is_Primitive) {
+                  DAST._IPrimitive _h71 = _source2.dtor_Primitive_a0;
+                  if (_h71.is_Real) {
+                    {
+                      r = ((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("BigRational"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("new"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(((((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("BigInt"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("parse_bytes"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_LiteralString(_5_n, true, false), RAST.Expr.create_LiteralInt(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("10"))))).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unwrap"))).Apply0(), ((((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("BigInt"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("parse_bytes"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_LiteralString(_6_d, true, false), RAST.Expr.create_LiteralInt(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("10"))))).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unwrap"))).Apply0()));
+                    }
+                    goto after_match2;
+                  }
+                }
+              }
+              {
+                DAST._IType _8_o = _source2;
+                {
+                  RAST._IType _9_genType;
+                  RAST._IType _out5;
+                  _out5 = (this).GenType(_8_o, Defs.GenTypeContext.@default());
+                  _9_genType = _out5;
+                  r = RAST.Expr.create_TypeAscription(RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("/"), (RAST.Expr.create_LiteralInt(_5_n)).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")), (RAST.Expr.create_LiteralInt(_6_d)).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")), DAST.Format.BinaryOpFormat.create_NoFormat()), _9_genType);
+                }
+              }
+            after_match2: ;
+              RAST._IExpr _out6;
+              Defs._IOwnership _out7;
+              (this).FromOwned(r, expectedOwnership, out _out6, out _out7);
+              r = _out6;
+              resultingOwnership = _out7;
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+              return ;
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        if (_source0.is_Literal) {
+          DAST._ILiteral _h303 = _source0.dtor_Literal_a0;
+          if (_h303.is_StringLiteral) {
+            Dafny.ISequence<Dafny.Rune> _10_l = _h303.dtor_StringLiteral_a0;
+            bool _11_verbatim = _h303.dtor_verbatim;
+            {
+              r = (((RAST.__default.dafny__runtime).MSel((this).string__of)).AsExpr()).Apply1(RAST.Expr.create_LiteralString(_10_l, false, _11_verbatim));
+              RAST._IExpr _out8;
+              Defs._IOwnership _out9;
+              (this).FromOwned(r, expectedOwnership, out _out8, out _out9);
+              r = _out8;
+              resultingOwnership = _out9;
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+              return ;
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        if (_source0.is_Literal) {
+          DAST._ILiteral _h304 = _source0.dtor_Literal_a0;
+          if (_h304.is_CharLiteralUTF16) {
+            BigInteger _12_c = _h304.dtor_CharLiteralUTF16_a0;
+            {
+              r = RAST.Expr.create_LiteralInt(Std.Strings.__default.OfNat(_12_c));
+              r = RAST.Expr.create_TypeAscription(r, RAST.Type.create_U16());
+              r = (((RAST.__default.dafny__runtime).MSel((this).DafnyChar)).AsExpr()).Apply1(r);
+              RAST._IExpr _out10;
+              Defs._IOwnership _out11;
+              (this).FromOwned(r, expectedOwnership, out _out10, out _out11);
+              r = _out10;
+              resultingOwnership = _out11;
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+              return ;
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        if (_source0.is_Literal) {
+          DAST._ILiteral _h305 = _source0.dtor_Literal_a0;
+          if (_h305.is_CharLiteral) {
+            Dafny.Rune _13_c = _h305.dtor_CharLiteral_a0;
+            {
+              r = RAST.Expr.create_LiteralInt(Std.Strings.__default.OfNat(new BigInteger((_13_c).Value)));
+              if (!(((this).charType).is_UTF32)) {
+                r = RAST.Expr.create_TypeAscription(r, RAST.Type.create_U16());
+              } else {
+                r = (((((((RAST.__default.@global).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("std"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("primitive"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("char"))).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from_u32"))).Apply1(r)).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unwrap"))).Apply0();
+              }
+              r = (((RAST.__default.dafny__runtime).MSel((this).DafnyChar)).AsExpr()).Apply1(r);
+              RAST._IExpr _out12;
+              Defs._IOwnership _out13;
+              (this).FromOwned(r, expectedOwnership, out _out12, out _out13);
+              r = _out12;
+              resultingOwnership = _out13;
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+              return ;
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        DAST._ILiteral _h306 = _source0.dtor_Literal_a0;
+        DAST._IType _14_tpe = _h306.dtor_Null_a0;
+        {
+          RAST._IType _15_tpeGen;
+          RAST._IType _out14;
+          _out14 = (this).GenType(_14_tpe, Defs.GenTypeContext.@default());
+          _15_tpeGen = _out14;
+          if (((this).pointerType).is_Raw) {
+            r = ((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Ptr"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("null"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements());
+          } else {
+            r = RAST.Expr.create_TypeAscription((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Object"))).AsExpr()).Apply1(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("None"))), _15_tpeGen);
+          }
+          RAST._IExpr _out15;
+          Defs._IOwnership _out16;
+          (this).FromOwned(r, expectedOwnership, out _out15, out _out16);
+          r = _out15;
+          resultingOwnership = _out16;
+          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+          return ;
+        }
+      }
+    after_match0: ;
+    }
+    public RAST._IExpr ToPrimitive(RAST._IExpr r, DAST._IType typ, DAST._IType primitiveType, Defs._IEnvironment env)
+    {
+      RAST._IExpr @out = RAST.Expr.Default();
+      @out = r;
+      if (!object.Equals(typ, primitiveType)) {
+        Defs._IOwnership _0_dummy = Defs.Ownership.Default();
+        RAST._IExpr _out0;
+        Defs._IOwnership _out1;
+        (this).GenExprConvertTo(r, Defs.Ownership.create_OwnershipOwned(), typ, primitiveType, env, Defs.Ownership.create_OwnershipOwned(), out _out0, out _out1);
+        @out = _out0;
+        _0_dummy = _out1;
+      }
+      return @out;
+    }
+    public RAST._IExpr ToBool(RAST._IExpr r, DAST._IType typ, Defs._IEnvironment env)
+    {
+      RAST._IExpr @out = RAST.Expr.Default();
+      RAST._IExpr _out0;
+      _out0 = (this).ToPrimitive(r, typ, DAST.Type.create_Primitive(DAST.Primitive.create_Bool()), env);
+      @out = _out0;
+      return @out;
+    }
+    public RAST._IExpr ToInt(RAST._IExpr r, DAST._IType typ, Defs._IEnvironment env)
+    {
+      RAST._IExpr @out = RAST.Expr.Default();
+      RAST._IExpr _out0;
+      _out0 = (this).ToPrimitive(r, typ, DAST.Type.create_Primitive(DAST.Primitive.create_Int()), env);
+      @out = _out0;
+      return @out;
+    }
+    public RAST._IExpr FromPrimitive(RAST._IExpr r, DAST._IType primitiveType, DAST._IType typ, Defs._IEnvironment env)
+    {
+      RAST._IExpr @out = RAST.Expr.Default();
+      @out = r;
+      if (!object.Equals(typ, primitiveType)) {
+        Defs._IOwnership _0_dummy = Defs.Ownership.Default();
+        RAST._IExpr _out0;
+        Defs._IOwnership _out1;
+        (this).GenExprConvertTo(r, Defs.Ownership.create_OwnershipOwned(), primitiveType, typ, env, Defs.Ownership.create_OwnershipOwned(), out _out0, out _out1);
+        @out = _out0;
+        _0_dummy = _out1;
+      }
+      return @out;
+    }
+    public RAST._IExpr FromBool(RAST._IExpr r, DAST._IType typ, Defs._IEnvironment env)
+    {
+      RAST._IExpr @out = RAST.Expr.Default();
+      RAST._IExpr _out0;
+      _out0 = (this).FromPrimitive(r, DAST.Type.create_Primitive(DAST.Primitive.create_Bool()), typ, env);
+      @out = _out0;
+      return @out;
+    }
+    public RAST._IExpr FromInt(RAST._IExpr r, DAST._IType typ, Defs._IEnvironment env)
+    {
+      RAST._IExpr @out = RAST.Expr.Default();
+      RAST._IExpr _out0;
+      _out0 = (this).FromPrimitive(r, DAST.Type.create_Primitive(DAST.Primitive.create_Int()), typ, env);
+      @out = _out0;
+      return @out;
+    }
+    public void GenExprBinary(DAST._IExpression e, Defs._ISelfInfo selfIdent, Defs._IEnvironment env, Defs._IOwnership expectedOwnership, out RAST._IExpr r, out Defs._IOwnership resultingOwnership, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents)
+    {
+      r = RAST.Expr.Default();
+      resultingOwnership = Defs.Ownership.Default();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      DAST._IExpression _let_tmp_rhs0 = e;
+      DAST._ITypedBinOp _let_tmp_rhs1 = _let_tmp_rhs0.dtor_op;
+      DAST._IBinOp _0_op = _let_tmp_rhs1.dtor_op;
+      DAST._IType _1_lType = _let_tmp_rhs1.dtor_leftType;
+      DAST._IType _2_rType = _let_tmp_rhs1.dtor_rightType;
+      DAST._IType _3_resType = _let_tmp_rhs1.dtor_resultType;
+      DAST._IExpression _4_lExpr = _let_tmp_rhs0.dtor_left;
+      DAST._IExpression _5_rExpr = _let_tmp_rhs0.dtor_right;
+      DAST.Format._IBinaryOpFormat _6_format = _let_tmp_rhs0.dtor_format2;
+      bool _7_becomesLeftCallsRight;
+      _7_becomesLeftCallsRight = Defs.__default.BecomesLeftCallsRight(_0_op);
+      bool _8_becomesRightCallsLeft;
+      _8_becomesRightCallsLeft = Defs.__default.BecomesRightCallsLeft(_0_op);
+      Defs._IOwnership _9_expectedLeftOwnership;
+      if (_7_becomesLeftCallsRight) {
+        _9_expectedLeftOwnership = Defs.Ownership.create_OwnershipAutoBorrowed();
+      } else if (_8_becomesRightCallsLeft) {
+        _9_expectedLeftOwnership = Defs.Ownership.create_OwnershipBorrowed();
+      } else {
+        _9_expectedLeftOwnership = Defs.Ownership.create_OwnershipOwned();
+      }
+      Defs._IOwnership _10_expectedRightOwnership;
+      if (_7_becomesLeftCallsRight) {
+        _10_expectedRightOwnership = Defs.Ownership.create_OwnershipBorrowed();
+      } else if (_8_becomesRightCallsLeft) {
+        _10_expectedRightOwnership = Defs.Ownership.create_OwnershipAutoBorrowed();
+      } else {
+        _10_expectedRightOwnership = Defs.Ownership.create_OwnershipOwned();
+      }
+      RAST._IExpr _11_left;
+      Defs._IOwnership _12___v57;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _13_recIdentsL;
+      RAST._IExpr _out0;
+      Defs._IOwnership _out1;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out2;
+      (this).GenExpr(_4_lExpr, selfIdent, env, _9_expectedLeftOwnership, out _out0, out _out1, out _out2);
+      _11_left = _out0;
+      _12___v57 = _out1;
+      _13_recIdentsL = _out2;
+      RAST._IExpr _14_right;
+      Defs._IOwnership _15___v58;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _16_recIdentsR;
+      RAST._IExpr _out3;
+      Defs._IOwnership _out4;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out5;
+      (this).GenExpr(_5_rExpr, selfIdent, env, _10_expectedRightOwnership, out _out3, out _out4, out _out5);
+      _14_right = _out3;
+      _15___v58 = _out4;
+      _16_recIdentsR = _out5;
+      DAST._IBinOp _source0 = _0_op;
+      {
+        if (_source0.is_In) {
+          {
+            r = ((_14_right).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("contains"))).Apply1(_11_left);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SeqProperPrefix) {
+          r = RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), _11_left, _14_right, _6_format);
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SeqPrefix) {
+          r = RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<="), _11_left, _14_right, _6_format);
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SetMerge) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("merge"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SetSubtraction) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("subtract"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SetIntersection) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("intersect"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Subset) {
+          {
+            r = RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<="), _11_left, _14_right, _6_format);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_ProperSubset) {
+          {
+            r = RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), _11_left, _14_right, _6_format);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SetDisjoint) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("disjoint"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MapMerge) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("merge"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MapSubtraction) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("subtract"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MultisetMerge) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("merge"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MultisetSubtraction) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("subtract"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MultisetIntersection) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("intersect"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Submultiset) {
+          {
+            r = RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<="), _11_left, _14_right, _6_format);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_ProperSubmultiset) {
+          {
+            r = RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), _11_left, _14_right, _6_format);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MultisetDisjoint) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("disjoint"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Concat) {
+          {
+            r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("concat"))).Apply1(_14_right);
+          }
+          goto after_match0;
+        }
+      }
+      {
+        {
+          if ((Defs.__default.OpTable).Contains(_0_op)) {
+            if (Defs.__default.IsBooleanOperator(_0_op)) {
+              RAST._IExpr _out6;
+              _out6 = (this).ToBool(_11_left, _1_lType, env);
+              _11_left = _out6;
+              RAST._IExpr _out7;
+              _out7 = (this).ToBool(_14_right, _2_rType, env);
+              _14_right = _out7;
+            }
+            r = RAST.Expr.create_BinaryOp(Dafny.Map<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>.Select(Defs.__default.OpTable,_0_op), _11_left, _14_right, _6_format);
+            if (Defs.__default.IsBooleanOperator(_0_op)) {
+              RAST._IExpr _out8;
+              _out8 = (this).FromBool(r, _3_resType, env);
+              r = _out8;
+            }
+          } else {
+            if (Defs.__default.IsComplexArithmetic(_0_op)) {
+              RAST._IExpr _out9;
+              _out9 = (this).ToInt(_11_left, _1_lType, env);
+              _11_left = _out9;
+              RAST._IExpr _out10;
+              _out10 = (this).ToInt(_14_right, _2_rType, env);
+              _14_right = _out10;
+            }
+            DAST._IBinOp _source1 = _0_op;
+            {
+              if (_source1.is_Eq) {
+                bool _17_referential = _source1.dtor_referential;
+                {
+                  if (_17_referential) {
+                    if (((this).pointerType).is_Raw) {
+                      RAST._IExpr _out11;
+                      _out11 = (this).Error(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Raw pointer comparison not properly implemented yet"), (this).InitEmptyExpr());
+                      r = _out11;
+                    } else {
+                      r = RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("=="), _11_left, _14_right, DAST.Format.BinaryOpFormat.create_NoFormat());
+                    }
+                  } else {
+                    if (((_5_rExpr).is_SeqValue) && ((new BigInteger(((_5_rExpr).dtor_elements).Count)).Sign == 0)) {
+                      r = RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("=="), ((((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("to_array"))).Apply0()).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("len"))).Apply0(), RAST.Expr.create_LiteralInt(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")), DAST.Format.BinaryOpFormat.create_NoFormat());
+                    } else if (((_4_lExpr).is_SeqValue) && ((new BigInteger(((_4_lExpr).dtor_elements).Count)).Sign == 0)) {
+                      r = RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("=="), RAST.Expr.create_LiteralInt(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")), ((((_14_right).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("to_array"))).Apply0()).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("len"))).Apply0(), DAST.Format.BinaryOpFormat.create_NoFormat());
+                    } else {
+                      r = RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("=="), _11_left, _14_right, DAST.Format.BinaryOpFormat.create_NoFormat());
+                      if (!object.Equals(_3_resType, DAST.Type.create_Primitive(DAST.Primitive.create_Bool()))) {
+                        RAST._IExpr _out12;
+                        Defs._IOwnership _out13;
+                        (this).GenExprConvertTo(r, Defs.Ownership.create_OwnershipOwned(), DAST.Type.create_Primitive(DAST.Primitive.create_Bool()), _3_resType, env, Defs.Ownership.create_OwnershipOwned(), out _out12, out _out13);
+                        r = _out12;
+                        resultingOwnership = _out13;
+                      }
+                    }
+                  }
+                }
+                goto after_match1;
+              }
+            }
+            {
+              if (_source1.is_Div) {
+                bool overflow0 = _source1.dtor_overflow;
+                if ((overflow0) == (true)) {
+                  r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("wrapping_div"))).Apply1(_14_right);
+                  goto after_match1;
+                }
+              }
+            }
+            {
+              if (_source1.is_Plus) {
+                bool overflow1 = _source1.dtor_overflow;
+                if ((overflow1) == (true)) {
+                  r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("wrapping_add"))).Apply1(_14_right);
+                  goto after_match1;
+                }
+              }
+            }
+            {
+              if (_source1.is_Times) {
+                bool overflow2 = _source1.dtor_overflow;
+                if ((overflow2) == (true)) {
+                  r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("wrapping_mul"))).Apply1(_14_right);
+                  goto after_match1;
+                }
+              }
+            }
+            {
+              if (_source1.is_Minus) {
+                bool overflow3 = _source1.dtor_overflow;
+                if ((overflow3) == (true)) {
+                  r = ((_11_left).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("wrapping_sub"))).Apply1(_14_right);
+                  goto after_match1;
+                }
+              }
+            }
+            {
+              if (_source1.is_EuclidianDiv) {
+                {
+                  r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("euclidian_division"))).AsExpr()).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(_11_left, _14_right));
+                }
+                goto after_match1;
+              }
+            }
+            {
+              if (_source1.is_EuclidianMod) {
+                {
+                  r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("euclidian_modulo"))).AsExpr()).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(_11_left, _14_right));
+                }
+                goto after_match1;
+              }
+            }
+            {
+              Dafny.ISequence<Dafny.Rune> _18_op = _source1.dtor_Passthrough_a0;
+              {
+                r = RAST.Expr.create_BinaryOp(_18_op, _11_left, _14_right, _6_format);
+              }
+            }
+          after_match1: ;
+            if (Defs.__default.IsComplexArithmetic(_0_op)) {
+              RAST._IExpr _out14;
+              _out14 = (this).FromInt(r, _3_resType, env);
+              r = _out14;
+            }
+          }
+        }
+      }
+    after_match0: ;
+      RAST._IExpr _out15;
+      Defs._IOwnership _out16;
+      (this).FromOwned(r, expectedOwnership, out _out15, out _out16);
+      r = _out15;
+      resultingOwnership = _out16;
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_13_recIdentsL, _16_recIdentsR);
+      return ;
+    }
+    public RAST._IExpr UnwrapNewtype(RAST._IExpr expr, Defs._IOwnership exprOwnership, DAST._IType fromTpe)
+    {
+      RAST._IExpr r = RAST.Expr.Default();
+      r = expr;
+      if (!((((fromTpe).dtor_resolved).dtor_kind).dtor_erase)) {
+        r = (r).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0"));
+        if (object.Equals(exprOwnership, Defs.Ownership.create_OwnershipBorrowed())) {
+          r = RAST.__default.Borrow(r);
+        }
+      }
+      return r;
+    }
+    public RAST._IExpr WrapWithNewtype(RAST._IExpr expr, Defs._IOwnership exprOwnership, DAST._IType toTpe)
+    {
+      RAST._IExpr r = RAST.Expr.Default();
+      r = expr;
+      DAST._IResolvedTypeBase _0_toKind;
+      _0_toKind = ((toTpe).dtor_resolved).dtor_kind;
+      if (!((_0_toKind).dtor_erase)) {
+        RAST._IExpr _1_fullPath;
+        RAST._IExpr _out0;
+        _out0 = (this).GenPathExpr(((toTpe).dtor_resolved).dtor_path, true);
+        _1_fullPath = _out0;
+        if (object.Equals(exprOwnership, Defs.Ownership.create_OwnershipOwned())) {
+          r = (_1_fullPath).Apply1(r);
+        } else {
+          r = ((_1_fullPath).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_from_ref"))).Apply1(r);
+        }
+      }
+      return r;
+    }
+    public void GenExprConvertTo(RAST._IExpr expr, Defs._IOwnership exprOwnership, DAST._IType fromTpe, DAST._IType toTpe, Defs._IEnvironment env, Defs._IOwnership expectedOwnership, out RAST._IExpr r, out Defs._IOwnership resultingOwnership)
+    {
+      r = RAST.Expr.Default();
+      resultingOwnership = Defs.Ownership.Default();
+      r = expr;
+      if (object.Equals(fromTpe, toTpe)) {
+        RAST._IExpr _out0;
+        Defs._IOwnership _out1;
+        (this).FromOwnership(r, exprOwnership, expectedOwnership, out _out0, out _out1);
+        r = _out0;
+        resultingOwnership = _out1;
+        return ;
+      }
+      if (((fromTpe).is_UserDefined) && ((((fromTpe).dtor_resolved).dtor_kind).is_SynonymType)) {
+        RAST._IExpr _out2;
+        Defs._IOwnership _out3;
+        (this).GenExprConvertTo(expr, exprOwnership, (((fromTpe).dtor_resolved).dtor_kind).dtor_baseType, toTpe, env, expectedOwnership, out _out2, out _out3);
+        r = _out2;
+        resultingOwnership = _out3;
+        return ;
+      }
+      if (((toTpe).is_UserDefined) && ((((toTpe).dtor_resolved).dtor_kind).is_SynonymType)) {
+        RAST._IExpr _out4;
+        Defs._IOwnership _out5;
+        (this).GenExprConvertTo(expr, exprOwnership, fromTpe, (((toTpe).dtor_resolved).dtor_kind).dtor_baseType, env, expectedOwnership, out _out4, out _out5);
+        r = _out4;
+        resultingOwnership = _out5;
+        return ;
+      }
+      if (Defs.__default.NeedsUnwrappingConversion(fromTpe)) {
+        RAST._IExpr _out6;
+        _out6 = (this).UnwrapNewtype(r, exprOwnership, fromTpe);
+        r = _out6;
+        RAST._IExpr _out7;
+        Defs._IOwnership _out8;
+        (this).GenExprConvertTo(r, exprOwnership, (((fromTpe).dtor_resolved).dtor_kind).dtor_baseType, toTpe, env, expectedOwnership, out _out7, out _out8);
+        r = _out7;
+        resultingOwnership = _out8;
+        return ;
+      }
+      if (Defs.__default.NeedsUnwrappingConversion(toTpe)) {
+        DAST._IResolvedTypeBase _0_toKind;
+        _0_toKind = ((toTpe).dtor_resolved).dtor_kind;
+        RAST._IExpr _out9;
+        Defs._IOwnership _out10;
+        (this).GenExprConvertTo(r, exprOwnership, fromTpe, (_0_toKind).dtor_baseType, env, expectedOwnership, out _out9, out _out10);
+        r = _out9;
+        resultingOwnership = _out10;
+        RAST._IExpr _out11;
+        _out11 = (this).WrapWithNewtype(r, resultingOwnership, toTpe);
+        r = _out11;
+        RAST._IExpr _out12;
+        Defs._IOwnership _out13;
+        (this).FromOwnership(r, resultingOwnership, expectedOwnership, out _out12, out _out13);
+        r = _out12;
+        resultingOwnership = _out13;
+        return ;
+      }
+      Std.Wrappers._IOption<RAST._IType> _1_unwrappedFromType;
+      _1_unwrappedFromType = Defs.__default.GetUnwrappedBoundedRustType(fromTpe);
+      Std.Wrappers._IOption<RAST._IType> _2_unwrappedToType;
+      _2_unwrappedToType = Defs.__default.GetUnwrappedBoundedRustType(toTpe);
+      if ((_2_unwrappedToType).is_Some) {
+        RAST._IType _3_boundedToType;
+        _3_boundedToType = (_2_unwrappedToType).dtor_value;
+        if ((_1_unwrappedFromType).is_Some) {
+          RAST._IExpr _out14;
+          _out14 = (this).UnwrapNewtype(r, exprOwnership, fromTpe);
+          r = _out14;
+          Defs._IOwnership _4_inOwnership;
+          _4_inOwnership = exprOwnership;
+          if (!object.Equals((_1_unwrappedFromType).dtor_value, (_2_unwrappedToType).dtor_value)) {
+            RAST._IType _5_asType;
+            _5_asType = _3_boundedToType;
+            if (object.Equals(_4_inOwnership, Defs.Ownership.create_OwnershipBorrowed())) {
+              RAST._IExpr _source0 = r;
+              {
+                if (_source0.is_UnaryOp) {
+                  Dafny.ISequence<Dafny.Rune> op10 = _source0.dtor_op1;
+                  if (object.Equals(op10, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"))) {
+                    RAST._IExpr _6_underlying = _source0.dtor_underlying;
+                    r = _6_underlying;
+                    goto after_match0;
+                  }
+                }
+              }
+              {
+                r = (r).Clone();
+              }
+            after_match0: ;
+            }
+            r = RAST.Expr.create_TypeAscription(r, _5_asType);
+            _4_inOwnership = Defs.Ownership.create_OwnershipOwned();
+          }
+          RAST._IExpr _out15;
+          _out15 = (this).WrapWithNewtype(r, Defs.Ownership.create_OwnershipOwned(), toTpe);
+          r = _out15;
+          RAST._IExpr _out16;
+          Defs._IOwnership _out17;
+          (this).FromOwnership(r, _4_inOwnership, expectedOwnership, out _out16, out _out17);
+          r = _out16;
+          resultingOwnership = _out17;
+          return ;
+        }
+        if ((fromTpe).IsPrimitiveInt()) {
+          if (object.Equals(exprOwnership, Defs.Ownership.create_OwnershipBorrowed())) {
+            r = (r).Clone();
+          }
+          r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("truncate!"))).AsExpr()).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(r, RAST.Expr.create_ExprFromType(_3_boundedToType)));
+          RAST._IExpr _out18;
+          _out18 = (this).WrapWithNewtype(r, Defs.Ownership.create_OwnershipOwned(), toTpe);
+          r = _out18;
+          RAST._IExpr _out19;
+          Defs._IOwnership _out20;
+          (this).FromOwned(r, expectedOwnership, out _out19, out _out20);
+          r = _out19;
+          resultingOwnership = _out20;
+          return ;
+        }
+        if (object.Equals(fromTpe, DAST.Type.create_Primitive(DAST.Primitive.create_Char()))) {
+          r = RAST.Expr.create_TypeAscription((r).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")), _3_boundedToType);
+          RAST._IExpr _out21;
+          _out21 = (this).WrapWithNewtype(r, Defs.Ownership.create_OwnershipOwned(), toTpe);
+          r = _out21;
+          RAST._IExpr _out22;
+          Defs._IOwnership _out23;
+          (this).FromOwned(r, expectedOwnership, out _out22, out _out23);
+          r = _out22;
+          resultingOwnership = _out23;
+          return ;
+        }
+        RAST._IType _7_fromTpeRust;
+        RAST._IType _out24;
+        _out24 = (this).GenType(fromTpe, Defs.GenTypeContext.@default());
+        _7_fromTpeRust = _out24;
+        RAST._IExpr _out25;
+        _out25 = (this).Error(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("No conversion available from "), (_7_fromTpeRust)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" to ")), (_3_boundedToType)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), (this).InitEmptyExpr());
+        r = _out25;
+        RAST._IExpr _out26;
+        Defs._IOwnership _out27;
+        (this).FromOwned(r, expectedOwnership, out _out26, out _out27);
+        r = _out26;
+        resultingOwnership = _out27;
+        return ;
+      }
+      if ((_1_unwrappedFromType).is_Some) {
+        if (!((((fromTpe).dtor_resolved).dtor_kind).dtor_erase)) {
+          r = (r).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0"));
+        }
+        if (object.Equals(toTpe, DAST.Type.create_Primitive(DAST.Primitive.create_Char()))) {
+          RAST._IExpr _out28;
+          Defs._IOwnership _out29;
+          (this).FromOwnership((((RAST.__default.dafny__runtime).MSel((this).DafnyChar)).AsExpr()).Apply1(RAST.Expr.create_TypeAscription(r, (this).DafnyCharUnderlying)), exprOwnership, expectedOwnership, out _out28, out _out29);
+          r = _out28;
+          resultingOwnership = _out29;
+          return ;
+        }
+        if ((toTpe).IsPrimitiveInt()) {
+          RAST._IExpr _out30;
+          Defs._IOwnership _out31;
+          (this).FromOwnership(r, exprOwnership, Defs.Ownership.create_OwnershipOwned(), out _out30, out _out31);
+          r = _out30;
+          resultingOwnership = _out31;
+          r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("int!"))).AsExpr()).Apply1(r);
+          RAST._IExpr _out32;
+          Defs._IOwnership _out33;
+          (this).FromOwned(r, expectedOwnership, out _out32, out _out33);
+          r = _out32;
+          resultingOwnership = _out33;
+          return ;
+        }
+        RAST._IType _8_toTpeRust;
+        RAST._IType _out34;
+        _out34 = (this).GenType(toTpe, Defs.GenTypeContext.@default());
+        _8_toTpeRust = _out34;
+        RAST._IExpr _out35;
+        _out35 = (this).Error(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("No conversion available from "), ((_1_unwrappedFromType).dtor_value)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" to ")), (_8_toTpeRust)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), (this).InitEmptyExpr());
+        r = _out35;
+        RAST._IExpr _out36;
+        Defs._IOwnership _out37;
+        (this).FromOwned(r, expectedOwnership, out _out36, out _out37);
+        r = _out36;
+        resultingOwnership = _out37;
+        return ;
+      }
+      _System._ITuple2<DAST._IType, DAST._IType> _source1 = _System.Tuple2<DAST._IType, DAST._IType>.create(fromTpe, toTpe);
+      {
+        DAST._IType _00 = _source1.dtor__0;
+        if (_00.is_Primitive) {
+          DAST._IPrimitive _h70 = _00.dtor_Primitive_a0;
+          if (_h70.is_Int) {
+            DAST._IType _10 = _source1.dtor__1;
+            if (_10.is_Primitive) {
+              DAST._IPrimitive _h71 = _10.dtor_Primitive_a0;
+              if (_h71.is_Real) {
+                {
+                  r = RAST.__default.RcNew(((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("BigRational"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from_integer"))).Apply1(r));
+                  RAST._IExpr _out38;
+                  Defs._IOwnership _out39;
+                  (this).FromOwned(r, expectedOwnership, out _out38, out _out39);
+                  r = _out38;
+                  resultingOwnership = _out39;
+                }
+                goto after_match1;
+              }
+            }
+          }
+        }
+      }
+      {
+        DAST._IType _01 = _source1.dtor__0;
+        if (_01.is_Primitive) {
+          DAST._IPrimitive _h72 = _01.dtor_Primitive_a0;
+          if (_h72.is_Real) {
+            DAST._IType _11 = _source1.dtor__1;
+            if (_11.is_Primitive) {
+              DAST._IPrimitive _h73 = _11.dtor_Primitive_a0;
+              if (_h73.is_Int) {
+                {
+                  r = (((RAST.__default.dafny__runtime).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dafny_rational_to_int"))).Apply1(r);
+                  RAST._IExpr _out40;
+                  Defs._IOwnership _out41;
+                  (this).FromOwned(r, expectedOwnership, out _out40, out _out41);
+                  r = _out40;
+                  resultingOwnership = _out41;
+                }
+                goto after_match1;
+              }
+            }
+          }
+        }
+      }
+      {
+        DAST._IType _02 = _source1.dtor__0;
+        if (_02.is_Primitive) {
+          DAST._IPrimitive _h74 = _02.dtor_Primitive_a0;
+          if (_h74.is_Int) {
+            DAST._IType _12 = _source1.dtor__1;
+            if (_12.is_Primitive) {
+              DAST._IPrimitive _h75 = _12.dtor_Primitive_a0;
+              if (_h75.is_Char) {
+                {
+                  RAST._IType _9_rhsType;
+                  RAST._IType _out42;
+                  _out42 = (this).GenType(toTpe, Defs.GenTypeContext.@default());
+                  _9_rhsType = _out42;
+                  RAST._IType _10_uType;
+                  if (((this).charType).is_UTF32) {
+                    _10_uType = RAST.Type.create_U32();
+                  } else {
+                    _10_uType = RAST.Type.create_U16();
+                  }
+                  if (!object.Equals(exprOwnership, Defs.Ownership.create_OwnershipOwned())) {
+                    r = (r).Clone();
+                  }
+                  r = ((((RAST.Expr.create_TraitCast(_10_uType, ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("NumCast"))).AsType())).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from"))).Apply1(r)).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unwrap"))).Apply0();
+                  if (((this).charType).is_UTF32) {
+                    r = ((((RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("char"))).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from_u32"))).Apply1(r)).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unwrap"))).Apply0();
+                  }
+                  r = (((RAST.__default.dafny__runtime).MSel((this).DafnyChar)).AsExpr()).Apply1(r);
+                  RAST._IExpr _out43;
+                  Defs._IOwnership _out44;
+                  (this).FromOwned(r, expectedOwnership, out _out43, out _out44);
+                  r = _out43;
+                  resultingOwnership = _out44;
+                }
+                goto after_match1;
+              }
+            }
+          }
+        }
+      }
+      {
+        DAST._IType _03 = _source1.dtor__0;
+        if (_03.is_Primitive) {
+          DAST._IPrimitive _h76 = _03.dtor_Primitive_a0;
+          if (_h76.is_Char) {
+            DAST._IType _13 = _source1.dtor__1;
+            if (_13.is_Primitive) {
+              DAST._IPrimitive _h77 = _13.dtor_Primitive_a0;
+              if (_h77.is_Int) {
+                {
+                  RAST._IType _11_rhsType;
+                  RAST._IType _out45;
+                  _out45 = (this).GenType(fromTpe, Defs.GenTypeContext.@default());
+                  _11_rhsType = _out45;
+                  r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("int!"))).AsExpr()).Apply1((r).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")));
+                  RAST._IExpr _out46;
+                  Defs._IOwnership _out47;
+                  (this).FromOwned(r, expectedOwnership, out _out46, out _out47);
+                  r = _out46;
+                  resultingOwnership = _out47;
+                }
+                goto after_match1;
+              }
+            }
+          }
+        }
+      }
+      {
+        {
+          RAST._IExpr _out48;
+          Defs._IOwnership _out49;
+          (this).GenExprConvertOther(expr, exprOwnership, fromTpe, toTpe, env, expectedOwnership, out _out48, out _out49);
+          r = _out48;
+          resultingOwnership = _out49;
+        }
+      }
+    after_match1: ;
+    }
+    public bool IsBuiltinCollection(DAST._IType typ) {
+      return ((((typ).is_Seq) || ((typ).is_Set)) || ((typ).is_Map)) || ((typ).is_Multiset);
+    }
+    public DAST._IType GetBuiltinCollectionElement(DAST._IType typ) {
+      if ((typ).is_Map) {
+        return (typ).dtor_value;
+      } else {
+        return (typ).dtor_element;
+      }
+    }
+    public bool SameTypesButDifferentTypeParameters(DAST._IType fromType, RAST._IType fromTpe, DAST._IType toType, RAST._IType toTpe)
+    {
+      return (((((((fromTpe).is_TypeApp) && ((toTpe).is_TypeApp)) && (object.Equals((fromTpe).dtor_baseName, (toTpe).dtor_baseName))) && ((fromType).is_UserDefined)) && ((toType).is_UserDefined)) && ((this).IsSameResolvedTypeAnyArgs((fromType).dtor_resolved, (toType).dtor_resolved))) && ((((new BigInteger((((fromType).dtor_resolved).dtor_typeArgs).Count)) == (new BigInteger((((toType).dtor_resolved).dtor_typeArgs).Count))) && ((new BigInteger((((toType).dtor_resolved).dtor_typeArgs).Count)) == (new BigInteger(((fromTpe).dtor_arguments).Count)))) && ((new BigInteger(((fromTpe).dtor_arguments).Count)) == (new BigInteger(((toTpe).dtor_arguments).Count))));
+    }
+    public Std.Wrappers._IResult<Dafny.ISequence<__T>, __E> SeqResultToResultSeq<__T, __E>(Dafny.ISequence<Std.Wrappers._IResult<__T, __E>> xs) {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return Std.Wrappers.Result<Dafny.ISequence<__T>, __E>.create_Success(Dafny.Sequence<__T>.FromElements());
+      } else {
+        Std.Wrappers._IResult<__T, __E> _0_valueOrError0 = (xs).Select(BigInteger.Zero);
+        if ((_0_valueOrError0).IsFailure()) {
+          return (_0_valueOrError0).PropagateFailure<Dafny.ISequence<__T>>();
+        } else {
+          __T _1_head = (_0_valueOrError0).Extract();
+          Std.Wrappers._IResult<Dafny.ISequence<__T>, __E> _2_valueOrError1 = (this).SeqResultToResultSeq<__T, __E>((xs).Drop(BigInteger.One));
+          if ((_2_valueOrError1).IsFailure()) {
+            return (_2_valueOrError1).PropagateFailure<Dafny.ISequence<__T>>();
+          } else {
+            Dafny.ISequence<__T> _3_tail = (_2_valueOrError1).Extract();
+            return Std.Wrappers.Result<Dafny.ISequence<__T>, __E>.create_Success(Dafny.Sequence<__T>.Concat(Dafny.Sequence<__T>.FromElements(_1_head), _3_tail));
+          }
+        }
+      }
+    }
+    public Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>> UpcastConversionLambda(DAST._IType fromType, RAST._IType fromTpe, DAST._IType toType, RAST._IType toTpe, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr> typeParams)
+    {
+      var _pat_let_tv0 = fromType;
+      var _pat_let_tv1 = fromTpe;
+      var _pat_let_tv2 = toType;
+      var _pat_let_tv3 = toTpe;
+      var _pat_let_tv4 = typeParams;
+      if (object.Equals(fromTpe, toTpe)) {
+        return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Success(((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("upcast_id"))).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(fromTpe))).Apply0());
+      } else if ((toTpe).IsBox()) {
+        RAST._IType _0_toTpeUnderlying = (toTpe).BoxUnderlying();
+        if (!((_0_toTpeUnderlying).is_DynType)) {
+          return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Failure(_System.Tuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>.create(fromType, fromTpe, toType, toTpe, typeParams));
+        } else if ((fromTpe).IsBox()) {
+          RAST._IType _1_fromTpeUnderlying = (fromTpe).BoxUnderlying();
+          if (!((_1_fromTpeUnderlying).is_DynType)) {
+            return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Failure(_System.Tuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>.create(fromType, fromTpe, toType, toTpe, typeParams));
+          } else {
+            return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Success(((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("upcast_box_box"))).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(_1_fromTpeUnderlying, _0_toTpeUnderlying))).Apply0());
+          }
+        } else {
+          return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Success(((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("upcast_box"))).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(fromTpe, _0_toTpeUnderlying))).Apply0());
+        }
+      } else if (((fromTpe).IsObjectOrPointer()) && ((toTpe).IsObjectOrPointer())) {
+        RAST._IType _2_toTpeUnderlying = (toTpe).ObjectOrPointerUnderlying();
+        if (!((_2_toTpeUnderlying).is_DynType)) {
+          return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Failure(_System.Tuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>.create(fromType, fromTpe, toType, toTpe, typeParams));
+        } else {
+          RAST._IType _3_fromTpeUnderlying = (fromTpe).ObjectOrPointerUnderlying();
+          return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Success(((((RAST.__default.dafny__runtime).MSel((this).upcast)).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(_3_fromTpeUnderlying, _2_toTpeUnderlying))).Apply0());
+        }
+      } else if ((typeParams).Contains(_System.Tuple2<RAST._IType, RAST._IType>.create(fromTpe, toTpe))) {
+        return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Success(Dafny.Map<_System._ITuple2<RAST._IType, RAST._IType>, RAST._IExpr>.Select(typeParams,_System.Tuple2<RAST._IType, RAST._IType>.create(fromTpe, toTpe)));
+      } else if (((fromTpe).IsRc()) && ((toTpe).IsRc())) {
+        Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>> _4_valueOrError0 = (this).UpcastConversionLambda(fromType, (fromTpe).RcUnderlying(), toType, (toTpe).RcUnderlying(), typeParams);
+        if ((_4_valueOrError0).IsFailure()) {
+          return (_4_valueOrError0).PropagateFailure<RAST._IExpr>();
+        } else {
+          RAST._IExpr _5_lambda = (_4_valueOrError0).Extract();
+          if ((fromType).is_Arrow) {
+            return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Success(_5_lambda);
+          } else {
+            return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Success((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("rc_coerce"))).AsExpr()).Apply1(_5_lambda));
+          }
+        }
+      } else if ((this).SameTypesButDifferentTypeParameters(fromType, fromTpe, toType, toTpe)) {
+        Dafny.ISequence<BigInteger> _6_indices = ((((fromType).is_UserDefined) && ((((fromType).dtor_resolved).dtor_kind).is_Datatype)) ? (Std.Collections.Seq.__default.Filter<BigInteger>(Dafny.Helpers.Id<Func<RAST._IType, DAST._IType, Func<BigInteger, bool>>>((_7_fromTpe, _8_fromType) => ((System.Func<BigInteger, bool>)((_9_i) => {
+          return ((((_9_i).Sign != -1) && ((_9_i) < (new BigInteger(((_7_fromTpe).dtor_arguments).Count)))) ? (!(((_9_i).Sign != -1) && ((_9_i) < (new BigInteger(((((_8_fromType).dtor_resolved).dtor_kind).dtor_variances).Count)))) || (!((((((_8_fromType).dtor_resolved).dtor_kind).dtor_variances).Select(_9_i)).is_Nonvariant))) : (false));
+        })))(fromTpe, fromType), ((System.Func<Dafny.ISequence<BigInteger>>) (() => {
+          BigInteger dim14 = new BigInteger(((fromTpe).dtor_arguments).Count);
+          var arr14 = new BigInteger[Dafny.Helpers.ToIntChecked(dim14, "array size exceeds memory limit")];
+          for (int i14 = 0; i14 < dim14; i14++) {
+            var _10_i = (BigInteger) i14;
+            arr14[(int)(_10_i)] = _10_i;
+          }
+          return Dafny.Sequence<BigInteger>.FromArray(arr14);
+        }))())) : (((System.Func<Dafny.ISequence<BigInteger>>) (() => {
+          BigInteger dim15 = new BigInteger(((fromTpe).dtor_arguments).Count);
+          var arr15 = new BigInteger[Dafny.Helpers.ToIntChecked(dim15, "array size exceeds memory limit")];
+          for (int i15 = 0; i15 < dim15; i15++) {
+            var _11_i = (BigInteger) i15;
+            arr15[(int)(_11_i)] = _11_i;
+          }
+          return Dafny.Sequence<BigInteger>.FromArray(arr15);
+        }))()));
+        Std.Wrappers._IResult<Dafny.ISequence<RAST._IExpr>, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>> _12_valueOrError1 = (this).SeqResultToResultSeq<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>(((System.Func<Dafny.ISequence<Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>>>) (() => {
+          BigInteger dim16 = new BigInteger((_6_indices).Count);
+          var arr16 = new Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>[Dafny.Helpers.ToIntChecked(dim16, "array size exceeds memory limit")];
+          for (int i16 = 0; i16 < dim16; i16++) {
+            var _13_j = (BigInteger) i16;
+            arr16[(int)(_13_j)] = Dafny.Helpers.Let<BigInteger, Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>>((_6_indices).Select(_13_j), _pat_let27_0 => Dafny.Helpers.Let<BigInteger, Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>>(_pat_let27_0, _14_i => (this).UpcastConversionLambda((((_pat_let_tv0).dtor_resolved).dtor_typeArgs).Select(_14_i), ((_pat_let_tv1).dtor_arguments).Select(_14_i), (((_pat_let_tv2).dtor_resolved).dtor_typeArgs).Select(_14_i), ((_pat_let_tv3).dtor_arguments).Select(_14_i), _pat_let_tv4)));
+          }
+          return Dafny.Sequence<Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>>.FromArray(arr16);
+        }))());
+        if ((_12_valueOrError1).IsFailure()) {
+          return (_12_valueOrError1).PropagateFailure<RAST._IExpr>();
+        } else {
+          Dafny.ISequence<RAST._IExpr> _15_lambdas = (_12_valueOrError1).Extract();
+          return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Success((((RAST.Expr.create_ExprFromType((fromTpe).dtor_baseName)).ApplyType(((System.Func<Dafny.ISequence<RAST._IType>>) (() => {
+  BigInteger dim17 = new BigInteger(((fromTpe).dtor_arguments).Count);
+  var arr17 = new RAST._IType[Dafny.Helpers.ToIntChecked(dim17, "array size exceeds memory limit")];
+  for (int i17 = 0; i17 < dim17; i17++) {
+    var _16_i = (BigInteger) i17;
+    arr17[(int)(_16_i)] = ((fromTpe).dtor_arguments).Select(_16_i);
+  }
+  return Dafny.Sequence<RAST._IType>.FromArray(arr17);
+}))())).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("coerce"))).Apply(_15_lambdas));
+        }
+      } else if (((((fromTpe).IsBuiltinCollection()) && ((toTpe).IsBuiltinCollection())) && ((this).IsBuiltinCollection(fromType))) && ((this).IsBuiltinCollection(toType))) {
+        RAST._IType _17_newFromTpe = (fromTpe).GetBuiltinCollectionElement();
+        RAST._IType _18_newToTpe = (toTpe).GetBuiltinCollectionElement();
+        DAST._IType _19_newFromType = (this).GetBuiltinCollectionElement(fromType);
+        DAST._IType _20_newToType = (this).GetBuiltinCollectionElement(toType);
+        Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>> _21_valueOrError2 = (this).UpcastConversionLambda(_19_newFromType, _17_newFromTpe, _20_newToType, _18_newToTpe, typeParams);
+        if ((_21_valueOrError2).IsFailure()) {
+          return (_21_valueOrError2).PropagateFailure<RAST._IExpr>();
+        } else {
+          RAST._IExpr _22_coerceArg = (_21_valueOrError2).Extract();
+          RAST._IPath _23_collectionType = (RAST.__default.dafny__runtime).MSel(((((fromTpe).Expand()).dtor_baseName).dtor_path).dtor_name);
+          RAST._IExpr _24_baseType = (((((((fromTpe).Expand()).dtor_baseName).dtor_path).dtor_name).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Map"))) ? (((_23_collectionType).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements((((fromTpe).Expand()).dtor_arguments).Select(BigInteger.Zero), _17_newFromTpe))) : (((_23_collectionType).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(_17_newFromTpe))));
+          return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Success(((_24_baseType).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("coerce"))).Apply1(_22_coerceArg));
+        }
+      } else if ((((((((((fromTpe).is_DynType) && (((fromTpe).dtor_underlying).is_FnType)) && ((toTpe).is_DynType)) && (((toTpe).dtor_underlying).is_FnType)) && ((((fromTpe).dtor_underlying).dtor_arguments).Equals(((toTpe).dtor_underlying).dtor_arguments))) && ((fromType).is_Arrow)) && ((toType).is_Arrow)) && ((new BigInteger((((fromTpe).dtor_underlying).dtor_arguments).Count)) == (BigInteger.One))) && (((((fromTpe).dtor_underlying).dtor_arguments).Select(BigInteger.Zero)).is_Borrowed)) {
+        Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>> _25_valueOrError3 = (this).UpcastConversionLambda((fromType).dtor_result, ((fromTpe).dtor_underlying).dtor_returnType, (toType).dtor_result, ((toTpe).dtor_underlying).dtor_returnType, typeParams);
+        if ((_25_valueOrError3).IsFailure()) {
+          return (_25_valueOrError3).PropagateFailure<RAST._IExpr>();
+        } else {
+          RAST._IExpr _26_lambda = (_25_valueOrError3).Extract();
+          return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Success(((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fn1_coerce"))).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(((((fromTpe).dtor_underlying).dtor_arguments).Select(BigInteger.Zero)).dtor_underlying, ((fromTpe).dtor_underlying).dtor_returnType, ((toTpe).dtor_underlying).dtor_returnType))).Apply1(_26_lambda));
+        }
+      } else {
+        return Std.Wrappers.Result<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>>.create_Failure(_System.Tuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>.create(fromType, fromTpe, toType, toTpe, typeParams));
+      }
+    }
+    public bool IsDowncastConversion(RAST._IType fromTpe, RAST._IType toTpe)
+    {
+      if (((fromTpe).IsObjectOrPointer()) && ((toTpe).IsObjectOrPointer())) {
+        return (((fromTpe).ObjectOrPointerUnderlying()).is_DynType) && (!(((toTpe).ObjectOrPointerUnderlying()).is_DynType));
+      } else {
+        return false;
+      }
+    }
+    public RAST._IExpr BorrowedToOwned(RAST._IExpr expr, Defs._IEnvironment env)
+    {
+      RAST._IExpr _source0 = expr;
+      {
+        if (_source0.is_UnaryOp) {
+          Dafny.ISequence<Dafny.Rune> op10 = _source0.dtor_op1;
+          if (object.Equals(op10, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"))) {
+            RAST._IExpr _0_underlying = _source0.dtor_underlying;
+            if (((_0_underlying).is_Identifier) && ((env).CanReadWithoutClone((_0_underlying).dtor_name))) {
+              return _0_underlying;
+            } else {
+              return (_0_underlying).Clone();
+            }
+          }
+        }
+      }
+      {
+        return (expr).Clone();
+      }
+    }
+    public void GenExprConvertOther(RAST._IExpr expr, Defs._IOwnership exprOwnership, DAST._IType fromTpe, DAST._IType toTpe, Defs._IEnvironment env, Defs._IOwnership expectedOwnership, out RAST._IExpr r, out Defs._IOwnership resultingOwnership)
+    {
+      r = RAST.Expr.Default();
+      resultingOwnership = Defs.Ownership.Default();
+      r = expr;
+      resultingOwnership = exprOwnership;
+      RAST._IType _0_fromTpeGen;
+      RAST._IType _out0;
+      _out0 = (this).GenType(fromTpe, Defs.GenTypeContext.@default());
+      _0_fromTpeGen = _out0;
+      RAST._IType _1_toTpeGen;
+      RAST._IType _out1;
+      _out1 = (this).GenType(toTpe, Defs.GenTypeContext.@default());
+      _1_toTpeGen = _out1;
+      Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>> _2_upcastConverter;
+      _2_upcastConverter = (this).UpcastConversionLambda(fromTpe, _0_fromTpeGen, toTpe, _1_toTpeGen, Dafny.Map<_System._ITuple2<RAST._IType, RAST._IType>, RAST._IExpr>.FromElements());
+      if ((_2_upcastConverter).is_Success) {
+        RAST._IExpr _3_conversionLambda;
+        _3_conversionLambda = (_2_upcastConverter).dtor_value;
+        if (object.Equals(resultingOwnership, Defs.Ownership.create_OwnershipBorrowed())) {
+          r = (this).BorrowedToOwned(r, env);
+          resultingOwnership = Defs.Ownership.create_OwnershipOwned();
+        }
+        r = (_3_conversionLambda).Apply1(r);
+        RAST._IExpr _out2;
+        Defs._IOwnership _out3;
+        (this).FromOwnership(r, resultingOwnership, expectedOwnership, out _out2, out _out3);
+        r = _out2;
+        resultingOwnership = _out3;
+      } else if ((this).IsDowncastConversion(_0_fromTpeGen, _1_toTpeGen)) {
+        _1_toTpeGen = (_1_toTpeGen).ObjectOrPointerUnderlying();
+        if (object.Equals(resultingOwnership, Defs.Ownership.create_OwnershipBorrowed())) {
+          r = (this).BorrowedToOwned(r, env);
+          resultingOwnership = Defs.Ownership.create_OwnershipOwned();
+        }
+        r = (((RAST.__default.dafny__runtime).MSel((this).downcast)).AsExpr()).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(r, RAST.Expr.create_ExprFromType(_1_toTpeGen)));
+        RAST._IExpr _out4;
+        Defs._IOwnership _out5;
+        (this).FromOwnership(r, Defs.Ownership.create_OwnershipOwned(), expectedOwnership, out _out4, out _out5);
+        r = _out4;
+        resultingOwnership = _out5;
+      } else {
+        Std.Wrappers._IResult<RAST._IExpr, _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>>> _let_tmp_rhs0 = _2_upcastConverter;
+        _System._ITuple5<DAST._IType, RAST._IType, DAST._IType, RAST._IType, Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr>> _let_tmp_rhs1 = _let_tmp_rhs0.dtor_error;
+        DAST._IType _4_fromType = _let_tmp_rhs1.dtor__0;
+        RAST._IType _5_fromTpeGen = _let_tmp_rhs1.dtor__1;
+        DAST._IType _6_toType = _let_tmp_rhs1.dtor__2;
+        RAST._IType _7_toTpeGen = _let_tmp_rhs1.dtor__3;
+        Dafny.IMap<_System._ITuple2<RAST._IType, RAST._IType>,RAST._IExpr> _8_m = _let_tmp_rhs1.dtor__4;
+        RAST._IExpr _out6;
+        _out6 = (this).Error(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<i>Coercion from "), (_5_fromTpeGen)._ToString(Defs.__default.IND)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" to ")), (_7_toTpeGen)._ToString(Defs.__default.IND)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("</i> not yet implemented")), r);
+        r = _out6;
+        RAST._IExpr _out7;
+        Defs._IOwnership _out8;
+        (this).FromOwned(r, expectedOwnership, out _out7, out _out8);
+        r = _out7;
+        resultingOwnership = _out8;
+      }
+    }
+    public void GenExprConvert(DAST._IExpression e, Defs._ISelfInfo selfIdent, Defs._IEnvironment env, Defs._IOwnership expectedOwnership, out RAST._IExpr r, out Defs._IOwnership resultingOwnership, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents)
+    {
+      r = RAST.Expr.Default();
+      resultingOwnership = Defs.Ownership.Default();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      DAST._IExpression _let_tmp_rhs0 = e;
+      DAST._IExpression _0_expr = _let_tmp_rhs0.dtor_value;
+      DAST._IType _1_fromTpe = _let_tmp_rhs0.dtor_from;
+      DAST._IType _2_toTpe = _let_tmp_rhs0.dtor_typ;
+      Defs._IOwnership _3_argumentOwnership;
+      _3_argumentOwnership = expectedOwnership;
+      if (object.Equals(_3_argumentOwnership, Defs.Ownership.create_OwnershipAutoBorrowed())) {
+        _3_argumentOwnership = Defs.Ownership.create_OwnershipBorrowed();
+      }
+      RAST._IExpr _4_recursiveGen;
+      Defs._IOwnership _5_recOwned;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _6_recIdents;
+      RAST._IExpr _out0;
+      Defs._IOwnership _out1;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out2;
+      (this).GenExpr(_0_expr, selfIdent, env, _3_argumentOwnership, out _out0, out _out1, out _out2);
+      _4_recursiveGen = _out0;
+      _5_recOwned = _out1;
+      _6_recIdents = _out2;
+      r = _4_recursiveGen;
+      readIdents = _6_recIdents;
+      RAST._IExpr _out3;
+      Defs._IOwnership _out4;
+      (this).GenExprConvertTo(r, _5_recOwned, _1_fromTpe, _2_toTpe, env, expectedOwnership, out _out3, out _out4);
+      r = _out3;
+      resultingOwnership = _out4;
+      return ;
+    }
+    public void GenIdent(Dafny.ISequence<Dafny.Rune> rName, Defs._ISelfInfo selfIdent, Defs._IEnvironment env, Defs._IOwnership expectedOwnership, out RAST._IExpr r, out Defs._IOwnership resultingOwnership, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents)
+    {
+      r = RAST.Expr.Default();
+      resultingOwnership = Defs.Ownership.Default();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      r = RAST.Expr.create_Identifier(rName);
+      Std.Wrappers._IOption<RAST._IType> _0_tpe;
+      _0_tpe = (env).GetType(rName);
+      Std.Wrappers._IOption<RAST._IType> _1_placeboOpt;
+      if ((_0_tpe).is_Some) {
+        _1_placeboOpt = ((_0_tpe).dtor_value).ExtractMaybePlacebo();
+      } else {
+        _1_placeboOpt = Std.Wrappers.Option<RAST._IType>.create_None();
+      }
+      bool _2_currentlyBorrowed;
+      _2_currentlyBorrowed = (env).IsBorrowed(rName);
+      bool _3_noNeedOfClone;
+      _3_noNeedOfClone = (env).CanReadWithoutClone(rName);
+      bool _4_isSelf;
+      _4_isSelf = (((selfIdent).is_ThisTyped) && ((selfIdent).IsSelf())) && (((selfIdent).dtor_rSelfName).Equals(rName));
+      if ((_1_placeboOpt).is_Some) {
+        r = ((r).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("read"))).Apply0();
+        _2_currentlyBorrowed = false;
+        _3_noNeedOfClone = true;
+        _0_tpe = Std.Wrappers.Option<RAST._IType>.create_Some((_1_placeboOpt).dtor_value);
+      }
+      if (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipAutoBorrowed())) {
+        if (_2_currentlyBorrowed) {
+          resultingOwnership = Defs.Ownership.create_OwnershipBorrowed();
+        } else {
+          resultingOwnership = Defs.Ownership.create_OwnershipOwned();
+        }
+      } else if (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipBorrowedMut())) {
+        if ((rName).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"))) {
+          resultingOwnership = Defs.Ownership.create_OwnershipBorrowedMut();
+        } else {
+          if (((_0_tpe).is_Some) && (((_0_tpe).dtor_value).IsObjectOrPointer())) {
+            r = ((this).modify__macro).Apply1(r);
+          } else {
+            r = RAST.__default.BorrowMut(r);
+          }
+        }
+        resultingOwnership = Defs.Ownership.create_OwnershipBorrowedMut();
+      } else if (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipOwned())) {
+        bool _5_needObjectFromRef;
+        _5_needObjectFromRef = (_4_isSelf) && (((System.Func<bool>)(() => {
+          DAST._IType _source0 = (selfIdent).dtor_dafnyType;
+          {
+            if (_source0.is_UserDefined) {
+              DAST._IResolvedType resolved0 = _source0.dtor_resolved;
+              DAST._IResolvedTypeBase _6_base = resolved0.dtor_kind;
+              Dafny.ISequence<DAST._IAttribute> _7_attributes = resolved0.dtor_attributes;
+              return ((_6_base).is_Class) || (((_6_base).is_Trait) && (((_6_base).dtor_traitType).is_ObjectTrait));
+            }
+          }
+          {
+            return false;
+          }
+        }))());
+        if (_5_needObjectFromRef) {
+          r = (((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Object"))).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"))))).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from_ref"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(r));
+        } else {
+          if (!(_3_noNeedOfClone)) {
+            r = (r).Clone();
+          }
+        }
+        resultingOwnership = Defs.Ownership.create_OwnershipOwned();
+      } else if (_2_currentlyBorrowed) {
+        resultingOwnership = Defs.Ownership.create_OwnershipBorrowed();
+      } else {
+        bool _8_selfIsGeneralTrait;
+        _8_selfIsGeneralTrait = (_4_isSelf) && (((System.Func<bool>)(() => {
+          DAST._IType _source1 = (selfIdent).dtor_dafnyType;
+          {
+            if (_source1.is_UserDefined) {
+              DAST._IResolvedType resolved1 = _source1.dtor_resolved;
+              DAST._IResolvedTypeBase _9_base = resolved1.dtor_kind;
+              Dafny.ISequence<DAST._IAttribute> _10_attributes = resolved1.dtor_attributes;
+              return ((_9_base).is_Trait) && (((_9_base).dtor_traitType).is_GeneralTrait);
+            }
+          }
+          {
+            return false;
+          }
+        }))());
+        if (!(rName).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"))) {
+          if (((_0_tpe).is_Some) && (((_0_tpe).dtor_value).IsPointer())) {
+            r = ((this).read__macro).Apply1(r);
+          } else {
+            r = RAST.__default.Borrow(r);
+          }
+        }
+        resultingOwnership = Defs.Ownership.create_OwnershipBorrowed();
+      }
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(rName);
+      return ;
+    }
+    public bool HasExternAttributeRenamingModule(Dafny.ISequence<DAST._IAttribute> attributes) {
+      return Dafny.Helpers.Id<Func<Dafny.ISequence<DAST._IAttribute>, bool>>((_0_attributes) => Dafny.Helpers.Quantifier<DAST._IAttribute>((_0_attributes).UniqueElements, false, (((_exists_var_0) => {
+        DAST._IAttribute _1_attribute = (DAST._IAttribute)_exists_var_0;
+        return ((_0_attributes).Contains(_1_attribute)) && ((((_1_attribute).dtor_name).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("extern"))) && ((new BigInteger(((_1_attribute).dtor_args).Count)) == (new BigInteger(2))));
+      }))))(attributes);
+    }
+    public void GenArgs(Defs._ISelfInfo selfIdent, DAST._ICallName name, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args, Defs._IEnvironment env, out Dafny.ISequence<RAST._IExpr> argExprs, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents, out Dafny.ISequence<RAST._IType> typeExprs, out Std.Wrappers._IOption<DAST._IResolvedType> fullNameQualifier)
+    {
+      argExprs = Dafny.Sequence<RAST._IExpr>.Empty;
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      typeExprs = Dafny.Sequence<RAST._IType>.Empty;
+      fullNameQualifier = Std.Wrappers.Option<DAST._IResolvedType>.Default();
+      argExprs = Dafny.Sequence<RAST._IExpr>.FromElements();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+      Dafny.ISequence<DAST._IFormal> _0_signature;
+      if ((name).is_CallName) {
+        if ((((name).dtor_receiverArg).is_Some) && ((name).dtor_receiverAsArgument)) {
+          _0_signature = Dafny.Sequence<DAST._IFormal>.Concat(Dafny.Sequence<DAST._IFormal>.FromElements(((name).dtor_receiverArg).dtor_value), ((name).dtor_signature));
+        } else {
+          _0_signature = ((name).dtor_signature);
+        }
+      } else {
+        _0_signature = Dafny.Sequence<DAST._IFormal>.FromElements();
+      }
+      BigInteger _hi0 = new BigInteger((args).Count);
+      for (BigInteger _1_i = BigInteger.Zero; _1_i < _hi0; _1_i++) {
+        Defs._IOwnership _2_argOwnership;
+        _2_argOwnership = Defs.Ownership.create_OwnershipBorrowed();
+        if ((_1_i) < (new BigInteger((_0_signature).Count))) {
+          RAST._IType _3_tpe;
+          RAST._IType _out0;
+          _out0 = (this).GenType(((_0_signature).Select(_1_i)).dtor_typ, Defs.GenTypeContext.@default());
+          _3_tpe = _out0;
+          if ((_3_tpe).CanReadWithoutClone()) {
+            _2_argOwnership = Defs.Ownership.create_OwnershipOwned();
+          }
+        }
+        RAST._IExpr _4_argExpr;
+        Defs._IOwnership _5___v75;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _6_argIdents;
+        RAST._IExpr _out1;
+        Defs._IOwnership _out2;
+        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out3;
+        (this).GenExpr((args).Select(_1_i), selfIdent, env, _2_argOwnership, out _out1, out _out2, out _out3);
+        _4_argExpr = _out1;
+        _5___v75 = _out2;
+        _6_argIdents = _out3;
+        argExprs = Dafny.Sequence<RAST._IExpr>.Concat(argExprs, Dafny.Sequence<RAST._IExpr>.FromElements(_4_argExpr));
+        readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _6_argIdents);
+      }
+      typeExprs = Dafny.Sequence<RAST._IType>.FromElements();
+      BigInteger _hi1 = new BigInteger((typeArgs).Count);
+      for (BigInteger _7_typeI = BigInteger.Zero; _7_typeI < _hi1; _7_typeI++) {
+        RAST._IType _8_typeExpr;
+        RAST._IType _out4;
+        _out4 = (this).GenType((typeArgs).Select(_7_typeI), Defs.GenTypeContext.@default());
+        _8_typeExpr = _out4;
+        typeExprs = Dafny.Sequence<RAST._IType>.Concat(typeExprs, Dafny.Sequence<RAST._IType>.FromElements(_8_typeExpr));
+      }
+      DAST._ICallName _source0 = name;
+      {
+        if (_source0.is_CallName) {
+          Dafny.ISequence<Dafny.Rune> _9_nameIdent = _source0.dtor_name;
+          Std.Wrappers._IOption<DAST._IType> onType0 = _source0.dtor_onType;
+          if (onType0.is_Some) {
+            DAST._IType value0 = onType0.dtor_value;
+            if (value0.is_UserDefined) {
+              DAST._IResolvedType _10_resolvedType = value0.dtor_resolved;
+              if (((((_10_resolvedType).dtor_kind).is_Trait) || ((Defs.__default.builtin__trait__preferred__methods).Contains((_9_nameIdent)))) || (Dafny.Helpers.Id<Func<DAST._IResolvedType, Dafny.ISequence<Dafny.Rune>, bool>>((_11_resolvedType, _12_nameIdent) => Dafny.Helpers.Quantifier<Dafny.ISequence<Dafny.Rune>>(Dafny.Helpers.SingleValue<Dafny.ISequence<Dafny.Rune>>(_12_nameIdent), true, (((_forall_var_0) => {
+                Dafny.ISequence<Dafny.Rune> _13_m = (Dafny.ISequence<Dafny.Rune>)_forall_var_0;
+                return !(((_11_resolvedType).dtor_properMethods).Contains(_13_m)) || (!object.Equals(_13_m, _12_nameIdent));
+              }))))(_10_resolvedType, _9_nameIdent))) {
+                fullNameQualifier = Std.Wrappers.Option<DAST._IResolvedType>.create_Some(Std.Wrappers.Option<DAST._IResolvedType>.GetOr(Defs.__default.TraitTypeContainingMethod(_10_resolvedType, (_9_nameIdent)), _10_resolvedType));
+              } else {
+                fullNameQualifier = Std.Wrappers.Option<DAST._IResolvedType>.create_None();
+              }
+              goto after_match0;
+            }
+          }
+        }
+      }
+      {
+        fullNameQualifier = Std.Wrappers.Option<DAST._IResolvedType>.create_None();
+      }
+    after_match0: ;
+      if ((((((fullNameQualifier).is_Some) && ((selfIdent).is_ThisTyped)) && (((selfIdent).dtor_dafnyType).is_UserDefined)) && ((this).IsSameResolvedType(((selfIdent).dtor_dafnyType).dtor_resolved, (fullNameQualifier).dtor_value))) && (!((this).HasExternAttributeRenamingModule(((fullNameQualifier).dtor_value).dtor_attributes)))) {
+        fullNameQualifier = Std.Wrappers.Option<DAST._IResolvedType>.create_None();
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> GetMethodName(DAST._IExpression @on, DAST._ICallName name)
+    {
+      DAST._ICallName _source0 = name;
+      {
+        if (_source0.is_CallName) {
+          Dafny.ISequence<Dafny.Rune> _0_ident = _source0.dtor_name;
+          if ((@on).is_ExternCompanion) {
+            return (_0_ident);
+          } else {
+            return Defs.__default.escapeName(_0_ident);
+          }
+        }
+      }
+      {
+        bool disjunctiveMatch0 = false;
+        if (_source0.is_MapBuilderAdd) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_SetBuilderAdd) {
+          disjunctiveMatch0 = true;
+        }
+        if (disjunctiveMatch0) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("add");
+        }
+      }
+      {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("build");
+      }
+    }
+    public void GenExpr(DAST._IExpression e, Defs._ISelfInfo selfIdent, Defs._IEnvironment env, Defs._IOwnership expectedOwnership, out RAST._IExpr r, out Defs._IOwnership resultingOwnership, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents)
+    {
+      r = RAST.Expr.Default();
+      resultingOwnership = Defs.Ownership.Default();
+      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
+      DAST._IExpression _source0 = e;
+      {
+        if (_source0.is_Literal) {
+          RAST._IExpr _out0;
+          Defs._IOwnership _out1;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out2;
+          (this).GenExprLiteral(e, selfIdent, env, expectedOwnership, out _out0, out _out1, out _out2);
+          r = _out0;
+          resultingOwnership = _out1;
+          readIdents = _out2;
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Ident) {
+          Dafny.ISequence<Dafny.Rune> _0_name = _source0.dtor_name;
+          {
+            RAST._IExpr _out3;
+            Defs._IOwnership _out4;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out5;
+            (this).GenIdent(Defs.__default.escapeVar(_0_name), selfIdent, env, expectedOwnership, out _out3, out _out4, out _out5);
+            r = _out3;
+            resultingOwnership = _out4;
+            readIdents = _out5;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_ExternCompanion) {
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _1_path = _source0.dtor_ExternCompanion_a0;
+          {
+            RAST._IExpr _out6;
+            _out6 = (this).GenPathExpr(_1_path, false);
+            r = _out6;
+            if (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipBorrowed())) {
+              resultingOwnership = Defs.Ownership.create_OwnershipBorrowed();
+            } else if (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipOwned())) {
+              resultingOwnership = Defs.Ownership.create_OwnershipOwned();
+            } else {
+              RAST._IExpr _out7;
+              Defs._IOwnership _out8;
+              (this).FromOwned(r, expectedOwnership, out _out7, out _out8);
+              r = _out7;
+              resultingOwnership = _out8;
+            }
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Companion) {
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _2_path = _source0.dtor_Companion_a0;
+          Dafny.ISequence<DAST._IType> _3_typeArgs = _source0.dtor_typeArgs;
+          {
+            RAST._IExpr _out9;
+            _out9 = (this).GenPathExpr(_2_path, true);
+            r = _out9;
+            if ((new BigInteger((_3_typeArgs).Count)).Sign == 1) {
+              Dafny.ISequence<RAST._IType> _4_typeExprs;
+              _4_typeExprs = Dafny.Sequence<RAST._IType>.FromElements();
+              BigInteger _hi0 = new BigInteger((_3_typeArgs).Count);
+              for (BigInteger _5_i = BigInteger.Zero; _5_i < _hi0; _5_i++) {
+                RAST._IType _6_typeExpr;
+                RAST._IType _out10;
+                _out10 = (this).GenType((_3_typeArgs).Select(_5_i), Defs.GenTypeContext.@default());
+                _6_typeExpr = _out10;
+                _4_typeExprs = Dafny.Sequence<RAST._IType>.Concat(_4_typeExprs, Dafny.Sequence<RAST._IType>.FromElements(_6_typeExpr));
+              }
+              r = (r).ApplyType(_4_typeExprs);
+            }
+            if (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipBorrowed())) {
+              resultingOwnership = Defs.Ownership.create_OwnershipBorrowed();
+            } else if (object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipOwned())) {
+              resultingOwnership = Defs.Ownership.create_OwnershipOwned();
+            } else {
+              RAST._IExpr _out11;
+              Defs._IOwnership _out12;
+              (this).FromOwned(r, expectedOwnership, out _out11, out _out12);
+              r = _out11;
+              resultingOwnership = _out12;
+            }
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_InitializationValue) {
+          DAST._IType _7_typ = _source0.dtor_typ;
+          {
+            RAST._IType _8_typExpr;
+            RAST._IType _out13;
+            _out13 = (this).GenType(_7_typ, Defs.GenTypeContext.@default());
+            _8_typExpr = _out13;
+            r = ((RAST.Expr.create_TraitCast(_8_typExpr, RAST.__default.DefaultTrait)).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("default"))).Apply0();
+            RAST._IExpr _out14;
+            Defs._IOwnership _out15;
+            (this).FromOwned(r, expectedOwnership, out _out14, out _out15);
+            r = _out14;
+            resultingOwnership = _out15;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Tuple) {
+          Dafny.ISequence<DAST._IExpression> _9_values = _source0.dtor_Tuple_a0;
+          {
+            Dafny.ISequence<RAST._IExpr> _10_exprs;
+            _10_exprs = Dafny.Sequence<RAST._IExpr>.FromElements();
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            BigInteger _hi1 = new BigInteger((_9_values).Count);
+            for (BigInteger _11_i = BigInteger.Zero; _11_i < _hi1; _11_i++) {
+              RAST._IExpr _12_recursiveGen;
+              Defs._IOwnership _13___v85;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _14_recIdents;
+              RAST._IExpr _out16;
+              Defs._IOwnership _out17;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out18;
+              (this).GenExpr((_9_values).Select(_11_i), selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out16, out _out17, out _out18);
+              _12_recursiveGen = _out16;
+              _13___v85 = _out17;
+              _14_recIdents = _out18;
+              _10_exprs = Dafny.Sequence<RAST._IExpr>.Concat(_10_exprs, Dafny.Sequence<RAST._IExpr>.FromElements(_12_recursiveGen));
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _14_recIdents);
+            }
+            if ((new BigInteger((_9_values).Count)) <= (RAST.__default.MAX__TUPLE__SIZE)) {
+              r = RAST.Expr.create_Tuple(_10_exprs);
+            } else {
+              r = RAST.__default.SystemTuple(_10_exprs);
+            }
+            RAST._IExpr _out19;
+            Defs._IOwnership _out20;
+            (this).FromOwned(r, expectedOwnership, out _out19, out _out20);
+            r = _out19;
+            resultingOwnership = _out20;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_New) {
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _15_path = _source0.dtor_path;
+          Dafny.ISequence<DAST._IType> _16_typeArgs = _source0.dtor_typeArgs;
+          Dafny.ISequence<DAST._IExpression> _17_args = _source0.dtor_args;
+          {
+            RAST._IExpr _out21;
+            _out21 = (this).GenPathExpr(_15_path, true);
+            r = _out21;
+            if ((new BigInteger((_16_typeArgs).Count)).Sign == 1) {
+              Dafny.ISequence<RAST._IType> _18_typeExprs;
+              _18_typeExprs = Dafny.Sequence<RAST._IType>.FromElements();
+              BigInteger _hi2 = new BigInteger((_16_typeArgs).Count);
+              for (BigInteger _19_i = BigInteger.Zero; _19_i < _hi2; _19_i++) {
+                RAST._IType _20_typeExpr;
+                RAST._IType _out22;
+                _out22 = (this).GenType((_16_typeArgs).Select(_19_i), Defs.GenTypeContext.@default());
+                _20_typeExpr = _out22;
+                _18_typeExprs = Dafny.Sequence<RAST._IType>.Concat(_18_typeExprs, Dafny.Sequence<RAST._IType>.FromElements(_20_typeExpr));
+              }
+              r = (r).ApplyType(_18_typeExprs);
+            }
+            r = (r).FSel((this).allocate__fn);
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            Dafny.ISequence<RAST._IExpr> _21_arguments;
+            _21_arguments = Dafny.Sequence<RAST._IExpr>.FromElements();
+            BigInteger _hi3 = new BigInteger((_17_args).Count);
+            for (BigInteger _22_i = BigInteger.Zero; _22_i < _hi3; _22_i++) {
+              RAST._IExpr _23_recursiveGen;
+              Defs._IOwnership _24___v86;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _25_recIdents;
+              RAST._IExpr _out23;
+              Defs._IOwnership _out24;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out25;
+              (this).GenExpr((_17_args).Select(_22_i), selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out23, out _out24, out _out25);
+              _23_recursiveGen = _out23;
+              _24___v86 = _out24;
+              _25_recIdents = _out25;
+              _21_arguments = Dafny.Sequence<RAST._IExpr>.Concat(_21_arguments, Dafny.Sequence<RAST._IExpr>.FromElements(_23_recursiveGen));
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _25_recIdents);
+            }
+            r = (r).Apply(_21_arguments);
+            RAST._IExpr _out26;
+            Defs._IOwnership _out27;
+            (this).FromOwned(r, expectedOwnership, out _out26, out _out27);
+            r = _out26;
+            resultingOwnership = _out27;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_NewUninitArray) {
+          Dafny.ISequence<DAST._IExpression> _26_dims = _source0.dtor_dims;
+          DAST._IType _27_typ = _source0.dtor_typ;
+          {
+            if ((new BigInteger(16)) < (new BigInteger((_26_dims).Count))) {
+              RAST._IExpr _out28;
+              _out28 = (this).Error(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Unsupported: Creation of arrays of more than 16 dimensions"), (this).InitEmptyExpr());
+              r = _out28;
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            } else {
+              r = (this).InitEmptyExpr();
+              RAST._IType _28_typeGen;
+              RAST._IType _out29;
+              _out29 = (this).GenType(_27_typ, Defs.GenTypeContext.@default());
+              _28_typeGen = _out29;
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+              Dafny.ISequence<RAST._IExpr> _29_dimExprs;
+              _29_dimExprs = Dafny.Sequence<RAST._IExpr>.FromElements();
+              BigInteger _hi4 = new BigInteger((_26_dims).Count);
+              for (BigInteger _30_i = BigInteger.Zero; _30_i < _hi4; _30_i++) {
+                RAST._IExpr _31_recursiveGen;
+                Defs._IOwnership _32___v87;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _33_recIdents;
+                RAST._IExpr _out30;
+                Defs._IOwnership _out31;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out32;
+                (this).GenExpr((_26_dims).Select(_30_i), selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out30, out _out31, out _out32);
+                _31_recursiveGen = _out30;
+                _32___v87 = _out31;
+                _33_recIdents = _out32;
+                _29_dimExprs = Dafny.Sequence<RAST._IExpr>.Concat(_29_dimExprs, Dafny.Sequence<RAST._IExpr>.FromElements(RAST.__default.IntoUsize(_31_recursiveGen)));
+                readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _33_recIdents);
+              }
+              if ((new BigInteger((_26_dims).Count)) > (BigInteger.One)) {
+                Dafny.ISequence<Dafny.Rune> _34_class__name;
+                _34_class__name = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Array"), Std.Strings.__default.OfNat(new BigInteger((_26_dims).Count)));
+                r = (((((RAST.__default.dafny__runtime).MSel(_34_class__name)).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(_28_typeGen))).FSel((this).placebos__usize)).Apply(_29_dimExprs);
+              } else {
+                r = (((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("array"))).AsExpr()).FSel((this).placebos__usize)).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(_28_typeGen))).Apply(_29_dimExprs);
+              }
+            }
+            RAST._IExpr _out33;
+            Defs._IOwnership _out34;
+            (this).FromOwned(r, expectedOwnership, out _out33, out _out34);
+            r = _out33;
+            resultingOwnership = _out34;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_ArrayIndexToInt) {
+          DAST._IExpression _35_underlying = _source0.dtor_value;
+          {
+            RAST._IExpr _36_recursiveGen;
+            Defs._IOwnership _37___v88;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _38_recIdents;
+            RAST._IExpr _out35;
+            Defs._IOwnership _out36;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out37;
+            (this).GenExpr(_35_underlying, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out35, out _out36, out _out37);
+            _36_recursiveGen = _out35;
+            _37___v88 = _out36;
+            _38_recIdents = _out37;
+            r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("int!"))).AsExpr()).Apply1(_36_recursiveGen);
+            readIdents = _38_recIdents;
+            RAST._IExpr _out38;
+            Defs._IOwnership _out39;
+            (this).FromOwned(r, expectedOwnership, out _out38, out _out39);
+            r = _out38;
+            resultingOwnership = _out39;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_FinalizeNewArray) {
+          DAST._IExpression _39_underlying = _source0.dtor_value;
+          DAST._IType _40_typ = _source0.dtor_typ;
+          {
+            RAST._IType _41_tpe;
+            RAST._IType _out40;
+            _out40 = (this).GenType(_40_typ, Defs.GenTypeContext.@default());
+            _41_tpe = _out40;
+            RAST._IExpr _42_recursiveGen;
+            Defs._IOwnership _43___v89;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _44_recIdents;
+            RAST._IExpr _out41;
+            Defs._IOwnership _out42;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out43;
+            (this).GenExpr(_39_underlying, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out41, out _out42, out _out43);
+            _42_recursiveGen = _out41;
+            _43___v89 = _out42;
+            _44_recIdents = _out43;
+            readIdents = _44_recIdents;
+            if ((_41_tpe).IsObjectOrPointer()) {
+              RAST._IType _45_t;
+              _45_t = (_41_tpe).ObjectOrPointerUnderlying();
+              if ((_45_t).is_Array) {
+                r = ((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("array"))).AsExpr()).FSel((this).array__construct)).Apply1(_42_recursiveGen);
+              } else if ((_45_t).IsMultiArray()) {
+                Dafny.ISequence<Dafny.Rune> _46_c;
+                _46_c = (_45_t).MultiArrayClass();
+                r = ((((RAST.__default.dafny__runtime).MSel(_46_c)).AsExpr()).FSel((this).array__construct)).Apply1(_42_recursiveGen);
+              } else {
+                RAST._IExpr _out44;
+                _out44 = (this).Error(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Finalize New Array with a pointer or object type to something that is not an array or a multi array: "), (_41_tpe)._ToString(Defs.__default.IND)), (this).InitEmptyExpr());
+                r = _out44;
+              }
+            } else {
+              RAST._IExpr _out45;
+              _out45 = (this).Error(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Finalize New Array with a type that is not a pointer or an object: "), (_41_tpe)._ToString(Defs.__default.IND)), (this).InitEmptyExpr());
+              r = _out45;
+            }
+            RAST._IExpr _out46;
+            Defs._IOwnership _out47;
+            (this).FromOwned(r, expectedOwnership, out _out46, out _out47);
+            r = _out46;
+            resultingOwnership = _out47;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_DatatypeValue) {
+          DAST._IResolvedType _47_datatypeType = _source0.dtor_datatypeType;
+          Dafny.ISequence<DAST._IType> _48_typeArgs = _source0.dtor_typeArgs;
+          Dafny.ISequence<Dafny.Rune> _49_variant = _source0.dtor_variant;
+          bool _50_isCo = _source0.dtor_isCo;
+          Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> _51_values = _source0.dtor_contents;
+          {
+            RAST._IExpr _out48;
+            _out48 = (this).GenPathExpr((_47_datatypeType).dtor_path, true);
+            r = _out48;
+            Dafny.ISequence<RAST._IType> _52_genTypeArgs;
+            _52_genTypeArgs = Dafny.Sequence<RAST._IType>.FromElements();
+            BigInteger _hi5 = new BigInteger((_48_typeArgs).Count);
+            for (BigInteger _53_i = BigInteger.Zero; _53_i < _hi5; _53_i++) {
+              RAST._IType _54_typeExpr;
+              RAST._IType _out49;
+              _out49 = (this).GenType((_48_typeArgs).Select(_53_i), Defs.GenTypeContext.@default());
+              _54_typeExpr = _out49;
+              _52_genTypeArgs = Dafny.Sequence<RAST._IType>.Concat(_52_genTypeArgs, Dafny.Sequence<RAST._IType>.FromElements(_54_typeExpr));
+            }
+            if ((new BigInteger((_48_typeArgs).Count)).Sign == 1) {
+              r = (r).ApplyType(_52_genTypeArgs);
+            }
+            r = (r).FSel(Defs.__default.escapeName(_49_variant));
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            Dafny.ISequence<RAST._IAssignIdentifier> _55_assignments;
+            _55_assignments = Dafny.Sequence<RAST._IAssignIdentifier>.FromElements();
+            BigInteger _hi6 = new BigInteger((_51_values).Count);
+            for (BigInteger _56_i = BigInteger.Zero; _56_i < _hi6; _56_i++) {
+              _System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression> _let_tmp_rhs0 = (_51_values).Select(_56_i);
+              Dafny.ISequence<Dafny.Rune> _57_name = _let_tmp_rhs0.dtor__0;
+              DAST._IExpression _58_value = _let_tmp_rhs0.dtor__1;
+              if (_50_isCo) {
+                RAST._IExpr _59_recursiveGen;
+                Defs._IOwnership _60___v90;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _61_recIdents;
+                RAST._IExpr _out50;
+                Defs._IOwnership _out51;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out52;
+                (this).GenExpr(_58_value, selfIdent, Defs.Environment.Empty(), Defs.Ownership.create_OwnershipOwned(), out _out50, out _out51, out _out52);
+                _59_recursiveGen = _out50;
+                _60___v90 = _out51;
+                _61_recIdents = _out52;
+                readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _61_recIdents);
+                RAST._IExpr _62_allReadCloned;
+                _62_allReadCloned = (this).InitEmptyExpr();
+                while (!(_61_recIdents).Equals(Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements())) {
+                  Dafny.ISequence<Dafny.Rune> _63_next;
+                  foreach (Dafny.ISequence<Dafny.Rune> _assign_such_that_0 in (_61_recIdents).Elements) {
+                    _63_next = (Dafny.ISequence<Dafny.Rune>)_assign_such_that_0;
+                    if ((_61_recIdents).Contains(_63_next)) {
+                      goto after__ASSIGN_SUCH_THAT_0;
+                    }
+                  }
+                  throw new System.Exception("assign-such-that search produced no value");
+                after__ASSIGN_SUCH_THAT_0: ;
+                  _62_allReadCloned = (_62_allReadCloned).Then(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_CONST(), _63_next, Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some((RAST.Expr.create_Identifier(_63_next)).Clone())));
+                  _61_recIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(_61_recIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_63_next));
+                }
+                RAST._IExpr _64_wasAssigned;
+                _64_wasAssigned = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("LazyFieldWrapper"))).AsExpr()).Apply1(((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Lazy"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("new"))).Apply1((((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("boxed"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Box"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("new"))).Apply1((_62_allReadCloned).Then(RAST.Expr.create_Lambda(Dafny.Sequence<RAST._IFormal>.FromElements(), Std.Wrappers.Option<RAST._IType>.create_None(), _59_recursiveGen)))));
+                _55_assignments = Dafny.Sequence<RAST._IAssignIdentifier>.Concat(_55_assignments, Dafny.Sequence<RAST._IAssignIdentifier>.FromElements(RAST.AssignIdentifier.create(Defs.__default.escapeVar(_57_name), _64_wasAssigned)));
+              } else {
+                RAST._IExpr _65_recursiveGen;
+                Defs._IOwnership _66___v91;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _67_recIdents;
+                RAST._IExpr _out53;
+                Defs._IOwnership _out54;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out55;
+                (this).GenExpr(_58_value, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out53, out _out54, out _out55);
+                _65_recursiveGen = _out53;
+                _66___v91 = _out54;
+                _67_recIdents = _out55;
+                _55_assignments = Dafny.Sequence<RAST._IAssignIdentifier>.Concat(_55_assignments, Dafny.Sequence<RAST._IAssignIdentifier>.FromElements(RAST.AssignIdentifier.create(Defs.__default.escapeVar(_57_name), _65_recursiveGen)));
+                readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _67_recIdents);
+              }
+            }
+            r = RAST.Expr.create_StructBuild(r, _55_assignments);
+            if ((this).IsRcWrapped((_47_datatypeType).dtor_attributes)) {
+              r = RAST.__default.RcNew(r);
+            }
+            RAST._IExpr _out56;
+            Defs._IOwnership _out57;
+            (this).FromOwned(r, expectedOwnership, out _out56, out _out57);
+            r = _out56;
+            resultingOwnership = _out57;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Convert) {
+          {
+            RAST._IExpr _out58;
+            Defs._IOwnership _out59;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out60;
+            (this).GenExprConvert(e, selfIdent, env, expectedOwnership, out _out58, out _out59, out _out60);
+            r = _out58;
+            resultingOwnership = _out59;
+            readIdents = _out60;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SeqConstruct) {
+          DAST._IExpression _68_length = _source0.dtor_length;
+          DAST._IExpression _69_expr = _source0.dtor_elem;
+          {
+            RAST._IExpr _70_recursiveGen;
+            Defs._IOwnership _71___v95;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _72_recIdents;
+            RAST._IExpr _out61;
+            Defs._IOwnership _out62;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out63;
+            (this).GenExpr(_69_expr, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out61, out _out62, out _out63);
+            _70_recursiveGen = _out61;
+            _71___v95 = _out62;
+            _72_recIdents = _out63;
+            RAST._IExpr _73_lengthGen;
+            Defs._IOwnership _74___v96;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _75_lengthIdents;
+            RAST._IExpr _out64;
+            Defs._IOwnership _out65;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out66;
+            (this).GenExpr(_68_length, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out64, out _out65, out _out66);
+            _73_lengthGen = _out64;
+            _74___v96 = _out65;
+            _75_lengthIdents = _out66;
+            r = RAST.Expr.create_DeclareVar(RAST.DeclareType.create_CONST(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_initializer"), Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(_70_recursiveGen));
+            RAST._IExpr _76_range;
+            _76_range = ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("integer_range"))).AsExpr();
+            _76_range = (_76_range).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Zero"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("zero"))).Apply0(), _73_lengthGen));
+            _76_range = (_76_range).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("map"));
+            RAST._IExpr _77_rangeMap;
+            _77_rangeMap = RAST.Expr.create_Lambda(Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.ImplicitlyTyped(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i"))), Std.Wrappers.Option<RAST._IType>.create_None(), (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_initializer"))).Apply1(RAST.__default.Borrow(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i")))));
+            _76_range = (_76_range).Apply1(_77_rangeMap);
+            _76_range = (((_76_range).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("collect"))).ApplyType(Dafny.Sequence<RAST._IType>.FromElements((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Sequence"))).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"))))))).Apply0();
+            r = RAST.Expr.create_Block((r).Then(_76_range));
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_72_recIdents, _75_lengthIdents);
+            RAST._IExpr _out67;
+            Defs._IOwnership _out68;
+            (this).FromOwned(r, expectedOwnership, out _out67, out _out68);
+            r = _out67;
+            resultingOwnership = _out68;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SeqValue) {
+          Dafny.ISequence<DAST._IExpression> _78_exprs = _source0.dtor_elements;
+          DAST._IType _79_typ = _source0.dtor_typ;
+          {
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            RAST._IType _80_genTpe;
+            RAST._IType _out69;
+            _out69 = (this).GenType(_79_typ, Defs.GenTypeContext.@default());
+            _80_genTpe = _out69;
+            BigInteger _81_i;
+            _81_i = BigInteger.Zero;
+            Dafny.ISequence<RAST._IExpr> _82_args;
+            _82_args = Dafny.Sequence<RAST._IExpr>.FromElements();
+            while ((_81_i) < (new BigInteger((_78_exprs).Count))) {
+              RAST._IExpr _83_recursiveGen;
+              Defs._IOwnership _84___v97;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _85_recIdents;
+              RAST._IExpr _out70;
+              Defs._IOwnership _out71;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out72;
+              (this).GenExpr((_78_exprs).Select(_81_i), selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out70, out _out71, out _out72);
+              _83_recursiveGen = _out70;
+              _84___v97 = _out71;
+              _85_recIdents = _out72;
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _85_recIdents);
+              _82_args = Dafny.Sequence<RAST._IExpr>.Concat(_82_args, Dafny.Sequence<RAST._IExpr>.FromElements(_83_recursiveGen));
+              _81_i = (_81_i) + (BigInteger.One);
+            }
+            r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("seq!"))).AsExpr()).Apply(_82_args);
+            if ((new BigInteger((_82_args).Count)).Sign == 0) {
+              r = RAST.Expr.create_TypeAscription(r, (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Sequence"))).AsType()).Apply1(_80_genTpe));
+            }
+            RAST._IExpr _out73;
+            Defs._IOwnership _out74;
+            (this).FromOwned(r, expectedOwnership, out _out73, out _out74);
+            r = _out73;
+            resultingOwnership = _out74;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SetValue) {
+          Dafny.ISequence<DAST._IExpression> _86_exprs = _source0.dtor_elements;
+          {
+            Dafny.ISequence<RAST._IExpr> _87_generatedValues;
+            _87_generatedValues = Dafny.Sequence<RAST._IExpr>.FromElements();
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            BigInteger _88_i;
+            _88_i = BigInteger.Zero;
+            while ((_88_i) < (new BigInteger((_86_exprs).Count))) {
+              RAST._IExpr _89_recursiveGen;
+              Defs._IOwnership _90___v98;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _91_recIdents;
+              RAST._IExpr _out75;
+              Defs._IOwnership _out76;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out77;
+              (this).GenExpr((_86_exprs).Select(_88_i), selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out75, out _out76, out _out77);
+              _89_recursiveGen = _out75;
+              _90___v98 = _out76;
+              _91_recIdents = _out77;
+              _87_generatedValues = Dafny.Sequence<RAST._IExpr>.Concat(_87_generatedValues, Dafny.Sequence<RAST._IExpr>.FromElements(_89_recursiveGen));
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _91_recIdents);
+              _88_i = (_88_i) + (BigInteger.One);
+            }
+            r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("set!"))).AsExpr()).Apply(_87_generatedValues);
+            RAST._IExpr _out78;
+            Defs._IOwnership _out79;
+            (this).FromOwned(r, expectedOwnership, out _out78, out _out79);
+            r = _out78;
+            resultingOwnership = _out79;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MultisetValue) {
+          Dafny.ISequence<DAST._IExpression> _92_exprs = _source0.dtor_elements;
+          {
+            Dafny.ISequence<RAST._IExpr> _93_generatedValues;
+            _93_generatedValues = Dafny.Sequence<RAST._IExpr>.FromElements();
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            BigInteger _94_i;
+            _94_i = BigInteger.Zero;
+            while ((_94_i) < (new BigInteger((_92_exprs).Count))) {
+              RAST._IExpr _95_recursiveGen;
+              Defs._IOwnership _96___v99;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _97_recIdents;
+              RAST._IExpr _out80;
+              Defs._IOwnership _out81;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out82;
+              (this).GenExpr((_92_exprs).Select(_94_i), selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out80, out _out81, out _out82);
+              _95_recursiveGen = _out80;
+              _96___v99 = _out81;
+              _97_recIdents = _out82;
+              _93_generatedValues = Dafny.Sequence<RAST._IExpr>.Concat(_93_generatedValues, Dafny.Sequence<RAST._IExpr>.FromElements(_95_recursiveGen));
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _97_recIdents);
+              _94_i = (_94_i) + (BigInteger.One);
+            }
+            r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("multiset!"))).AsExpr()).Apply(_93_generatedValues);
+            RAST._IExpr _out83;
+            Defs._IOwnership _out84;
+            (this).FromOwned(r, expectedOwnership, out _out83, out _out84);
+            r = _out83;
+            resultingOwnership = _out84;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_ToMultiset) {
+          DAST._IExpression _98_expr = _source0.dtor_ToMultiset_a0;
+          {
+            RAST._IExpr _99_recursiveGen;
+            Defs._IOwnership _100___v100;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _101_recIdents;
+            RAST._IExpr _out85;
+            Defs._IOwnership _out86;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out87;
+            (this).GenExpr(_98_expr, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out85, out _out86, out _out87);
+            _99_recursiveGen = _out85;
+            _100___v100 = _out86;
+            _101_recIdents = _out87;
+            r = ((_99_recursiveGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("as_dafny_multiset"))).Apply0();
+            readIdents = _101_recIdents;
+            RAST._IExpr _out88;
+            Defs._IOwnership _out89;
+            (this).FromOwned(r, expectedOwnership, out _out88, out _out89);
+            r = _out88;
+            resultingOwnership = _out89;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MapValue) {
+          Dafny.ISequence<_System._ITuple2<DAST._IExpression, DAST._IExpression>> _102_mapElems = _source0.dtor_mapElems;
+          {
+            Dafny.ISequence<_System._ITuple2<RAST._IExpr, RAST._IExpr>> _103_generatedValues;
+            _103_generatedValues = Dafny.Sequence<_System._ITuple2<RAST._IExpr, RAST._IExpr>>.FromElements();
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            BigInteger _104_i;
+            _104_i = BigInteger.Zero;
+            while ((_104_i) < (new BigInteger((_102_mapElems).Count))) {
+              RAST._IExpr _105_recursiveGenKey;
+              Defs._IOwnership _106___v101;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _107_recIdentsKey;
+              RAST._IExpr _out90;
+              Defs._IOwnership _out91;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out92;
+              (this).GenExpr(((_102_mapElems).Select(_104_i)).dtor__0, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out90, out _out91, out _out92);
+              _105_recursiveGenKey = _out90;
+              _106___v101 = _out91;
+              _107_recIdentsKey = _out92;
+              RAST._IExpr _108_recursiveGenValue;
+              Defs._IOwnership _109___v102;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _110_recIdentsValue;
+              RAST._IExpr _out93;
+              Defs._IOwnership _out94;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out95;
+              (this).GenExpr(((_102_mapElems).Select(_104_i)).dtor__1, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out93, out _out94, out _out95);
+              _108_recursiveGenValue = _out93;
+              _109___v102 = _out94;
+              _110_recIdentsValue = _out95;
+              _103_generatedValues = Dafny.Sequence<_System._ITuple2<RAST._IExpr, RAST._IExpr>>.Concat(_103_generatedValues, Dafny.Sequence<_System._ITuple2<RAST._IExpr, RAST._IExpr>>.FromElements(_System.Tuple2<RAST._IExpr, RAST._IExpr>.create(_105_recursiveGenKey, _108_recursiveGenValue)));
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _107_recIdentsKey), _110_recIdentsValue);
+              _104_i = (_104_i) + (BigInteger.One);
+            }
+            _104_i = BigInteger.Zero;
+            Dafny.ISequence<RAST._IExpr> _111_arguments;
+            _111_arguments = Dafny.Sequence<RAST._IExpr>.FromElements();
+            while ((_104_i) < (new BigInteger((_103_generatedValues).Count))) {
+              RAST._IExpr _112_genKey;
+              _112_genKey = ((_103_generatedValues).Select(_104_i)).dtor__0;
+              RAST._IExpr _113_genValue;
+              _113_genValue = ((_103_generatedValues).Select(_104_i)).dtor__1;
+              _111_arguments = Dafny.Sequence<RAST._IExpr>.Concat(_111_arguments, Dafny.Sequence<RAST._IExpr>.FromElements(RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("=>"), _112_genKey, _113_genValue, DAST.Format.BinaryOpFormat.create_NoFormat())));
+              _104_i = (_104_i) + (BigInteger.One);
+            }
+            r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("map!"))).AsExpr()).Apply(_111_arguments);
+            RAST._IExpr _out96;
+            Defs._IOwnership _out97;
+            (this).FromOwned(r, expectedOwnership, out _out96, out _out97);
+            r = _out96;
+            resultingOwnership = _out97;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SeqUpdate) {
+          DAST._IExpression _114_expr = _source0.dtor_expr;
+          DAST._IExpression _115_index = _source0.dtor_indexExpr;
+          DAST._IExpression _116_value = _source0.dtor_value;
+          {
+            RAST._IExpr _117_exprR;
+            Defs._IOwnership _118___v103;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _119_exprIdents;
+            RAST._IExpr _out98;
+            Defs._IOwnership _out99;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out100;
+            (this).GenExpr(_114_expr, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out98, out _out99, out _out100);
+            _117_exprR = _out98;
+            _118___v103 = _out99;
+            _119_exprIdents = _out100;
+            RAST._IExpr _120_indexR;
+            Defs._IOwnership _121_indexOwnership;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _122_indexIdents;
+            RAST._IExpr _out101;
+            Defs._IOwnership _out102;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out103;
+            (this).GenExpr(_115_index, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out101, out _out102, out _out103);
+            _120_indexR = _out101;
+            _121_indexOwnership = _out102;
+            _122_indexIdents = _out103;
+            RAST._IExpr _123_valueR;
+            Defs._IOwnership _124_valueOwnership;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _125_valueIdents;
+            RAST._IExpr _out104;
+            Defs._IOwnership _out105;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out106;
+            (this).GenExpr(_116_value, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out104, out _out105, out _out106);
+            _123_valueR = _out104;
+            _124_valueOwnership = _out105;
+            _125_valueIdents = _out106;
+            r = ((_117_exprR).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("update_index"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(_120_indexR, _123_valueR));
+            RAST._IExpr _out107;
+            Defs._IOwnership _out108;
+            (this).FromOwned(r, expectedOwnership, out _out107, out _out108);
+            r = _out107;
+            resultingOwnership = _out108;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_119_exprIdents, _122_indexIdents), _125_valueIdents);
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MapUpdate) {
+          DAST._IExpression _126_expr = _source0.dtor_expr;
+          DAST._IExpression _127_index = _source0.dtor_indexExpr;
+          DAST._IExpression _128_value = _source0.dtor_value;
+          {
+            RAST._IExpr _129_exprR;
+            Defs._IOwnership _130___v104;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _131_exprIdents;
+            RAST._IExpr _out109;
+            Defs._IOwnership _out110;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out111;
+            (this).GenExpr(_126_expr, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out109, out _out110, out _out111);
+            _129_exprR = _out109;
+            _130___v104 = _out110;
+            _131_exprIdents = _out111;
+            RAST._IExpr _132_indexR;
+            Defs._IOwnership _133_indexOwnership;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _134_indexIdents;
+            RAST._IExpr _out112;
+            Defs._IOwnership _out113;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out114;
+            (this).GenExpr(_127_index, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out112, out _out113, out _out114);
+            _132_indexR = _out112;
+            _133_indexOwnership = _out113;
+            _134_indexIdents = _out114;
+            RAST._IExpr _135_valueR;
+            Defs._IOwnership _136_valueOwnership;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _137_valueIdents;
+            RAST._IExpr _out115;
+            Defs._IOwnership _out116;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out117;
+            (this).GenExpr(_128_value, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out115, out _out116, out _out117);
+            _135_valueR = _out115;
+            _136_valueOwnership = _out116;
+            _137_valueIdents = _out117;
+            r = ((_129_exprR).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("update_index"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(_132_indexR, _135_valueR));
+            RAST._IExpr _out118;
+            Defs._IOwnership _out119;
+            (this).FromOwned(r, expectedOwnership, out _out118, out _out119);
+            r = _out118;
+            resultingOwnership = _out119;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_131_exprIdents, _134_indexIdents), _137_valueIdents);
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_This) {
+          {
+            Defs._ISelfInfo _source1 = selfIdent;
+            {
+              if (_source1.is_ThisTyped) {
+                Dafny.ISequence<Dafny.Rune> _138_id = _source1.dtor_rSelfName;
+                DAST._IType _139_dafnyType = _source1.dtor_dafnyType;
+                {
+                  RAST._IExpr _out120;
+                  Defs._IOwnership _out121;
+                  Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out122;
+                  (this).GenIdent(_138_id, selfIdent, env, expectedOwnership, out _out120, out _out121, out _out122);
+                  r = _out120;
+                  resultingOwnership = _out121;
+                  readIdents = _out122;
+                }
+                goto after_match1;
+              }
+            }
+            {
+              Defs._ISelfInfo _140_None = _source1;
+              {
+                RAST._IExpr _out123;
+                _out123 = (this).Error(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this outside of a method"), (this).InitEmptyExpr());
+                r = _out123;
+                RAST._IExpr _out124;
+                Defs._IOwnership _out125;
+                (this).FromOwned(r, expectedOwnership, out _out124, out _out125);
+                r = _out124;
+                resultingOwnership = _out125;
+                readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+              }
+            }
+          after_match1: ;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Ite) {
+          DAST._IExpression _141_cond = _source0.dtor_cond;
+          DAST._IExpression _142_t = _source0.dtor_thn;
+          DAST._IExpression _143_f = _source0.dtor_els;
+          {
+            RAST._IExpr _144_cond;
+            Defs._IOwnership _145___v105;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _146_recIdentsCond;
+            RAST._IExpr _out126;
+            Defs._IOwnership _out127;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out128;
+            (this).GenExpr(_141_cond, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out126, out _out127, out _out128);
+            _144_cond = _out126;
+            _145___v105 = _out127;
+            _146_recIdentsCond = _out128;
+            RAST._IExpr _147_fExpr;
+            Defs._IOwnership _148_fOwned;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _149_recIdentsF;
+            RAST._IExpr _out129;
+            Defs._IOwnership _out130;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out131;
+            (this).GenExpr(_143_f, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out129, out _out130, out _out131);
+            _147_fExpr = _out129;
+            _148_fOwned = _out130;
+            _149_recIdentsF = _out131;
+            RAST._IExpr _150_tExpr;
+            Defs._IOwnership _151___v106;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _152_recIdentsT;
+            RAST._IExpr _out132;
+            Defs._IOwnership _out133;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out134;
+            (this).GenExpr(_142_t, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out132, out _out133, out _out134);
+            _150_tExpr = _out132;
+            _151___v106 = _out133;
+            _152_recIdentsT = _out134;
+            r = RAST.Expr.create_IfExpr(_144_cond, _150_tExpr, _147_fExpr);
+            RAST._IExpr _out135;
+            Defs._IOwnership _out136;
+            (this).FromOwnership(r, Defs.Ownership.create_OwnershipOwned(), expectedOwnership, out _out135, out _out136);
+            r = _out135;
+            resultingOwnership = _out136;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_146_recIdentsCond, _152_recIdentsT), _149_recIdentsF);
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_UnOp) {
+          DAST._IUnaryOp unOp0 = _source0.dtor_unOp;
+          if (unOp0.is_Not) {
+            DAST._IExpression _153_e = _source0.dtor_expr;
+            DAST.Format._IUnaryOpFormat _154_format = _source0.dtor_format1;
+            {
+              RAST._IExpr _155_recursiveGen;
+              Defs._IOwnership _156___v107;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _157_recIdents;
+              RAST._IExpr _out137;
+              Defs._IOwnership _out138;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out139;
+              (this).GenExpr(_153_e, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out137, out _out138, out _out139);
+              _155_recursiveGen = _out137;
+              _156___v107 = _out138;
+              _157_recIdents = _out139;
+              r = RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!"), _155_recursiveGen, _154_format);
+              RAST._IExpr _out140;
+              Defs._IOwnership _out141;
+              (this).FromOwned(r, expectedOwnership, out _out140, out _out141);
+              r = _out140;
+              resultingOwnership = _out141;
+              readIdents = _157_recIdents;
+              return ;
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        if (_source0.is_UnOp) {
+          DAST._IUnaryOp unOp1 = _source0.dtor_unOp;
+          if (unOp1.is_BitwiseNot) {
+            DAST._IExpression _158_e = _source0.dtor_expr;
+            DAST.Format._IUnaryOpFormat _159_format = _source0.dtor_format1;
+            {
+              RAST._IExpr _160_recursiveGen;
+              Defs._IOwnership _161___v108;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _162_recIdents;
+              RAST._IExpr _out142;
+              Defs._IOwnership _out143;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out144;
+              (this).GenExpr(_158_e, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out142, out _out143, out _out144);
+              _160_recursiveGen = _out142;
+              _161___v108 = _out143;
+              _162_recIdents = _out144;
+              r = RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!"), _160_recursiveGen, _159_format);
+              RAST._IExpr _out145;
+              Defs._IOwnership _out146;
+              (this).FromOwned(r, expectedOwnership, out _out145, out _out146);
+              r = _out145;
+              resultingOwnership = _out146;
+              readIdents = _162_recIdents;
+              return ;
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        if (_source0.is_UnOp) {
+          DAST._IUnaryOp unOp2 = _source0.dtor_unOp;
+          if (unOp2.is_Cardinality) {
+            DAST._IExpression _163_e = _source0.dtor_expr;
+            DAST.Format._IUnaryOpFormat _164_format = _source0.dtor_format1;
+            {
+              RAST._IExpr _165_recursiveGen;
+              Defs._IOwnership _166_recOwned;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _167_recIdents;
+              RAST._IExpr _out147;
+              Defs._IOwnership _out148;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out149;
+              (this).GenExpr(_163_e, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out147, out _out148, out _out149);
+              _165_recursiveGen = _out147;
+              _166_recOwned = _out148;
+              _167_recIdents = _out149;
+              r = ((_165_recursiveGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("cardinality"))).Apply0();
+              RAST._IExpr _out150;
+              Defs._IOwnership _out151;
+              (this).FromOwned(r, expectedOwnership, out _out150, out _out151);
+              r = _out150;
+              resultingOwnership = _out151;
+              readIdents = _167_recIdents;
+              return ;
+            }
+            goto after_match0;
+          }
+        }
+      }
+      {
+        if (_source0.is_BinOp) {
+          RAST._IExpr _out152;
+          Defs._IOwnership _out153;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out154;
+          (this).GenExprBinary(e, selfIdent, env, expectedOwnership, out _out152, out _out153, out _out154);
+          r = _out152;
+          resultingOwnership = _out153;
+          readIdents = _out154;
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_ArrayLen) {
+          DAST._IExpression _168_expr = _source0.dtor_expr;
+          DAST._IType _169_exprType = _source0.dtor_exprType;
+          BigInteger _170_dim = _source0.dtor_dim;
+          bool _171_native = _source0.dtor_native;
+          {
+            RAST._IExpr _172_recursiveGen;
+            Defs._IOwnership _173___v113;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _174_recIdents;
+            RAST._IExpr _out155;
+            Defs._IOwnership _out156;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out157;
+            (this).GenExpr(_168_expr, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out155, out _out156, out _out157);
+            _172_recursiveGen = _out155;
+            _173___v113 = _out156;
+            _174_recIdents = _out157;
+            RAST._IType _175_arrayType;
+            RAST._IType _out158;
+            _out158 = (this).GenType(_169_exprType, Defs.GenTypeContext.@default());
+            _175_arrayType = _out158;
+            if (!((_175_arrayType).IsObjectOrPointer())) {
+              RAST._IExpr _out159;
+              _out159 = (this).Error(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Array length of something not an array but "), (_175_arrayType)._ToString(Defs.__default.IND)), (this).InitEmptyExpr());
+              r = _out159;
+            } else {
+              RAST._IType _176_underlying;
+              _176_underlying = (_175_arrayType).ObjectOrPointerUnderlying();
+              if (((_170_dim).Sign == 0) && ((_176_underlying).is_Array)) {
+                r = ((((this).read__macro).Apply1(_172_recursiveGen)).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("len"))).Apply0();
+              } else {
+                if ((_170_dim).Sign == 0) {
+                  r = (((((this).read__macro).Apply1(_172_recursiveGen)).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("data"))).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("len"))).Apply0();
+                } else {
+                  r = ((((this).read__macro).Apply1(_172_recursiveGen)).Sel(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("length"), Std.Strings.__default.OfNat(_170_dim)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_usize")))).Apply0();
+                }
+              }
+              if (!(_171_native)) {
+                r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("int!"))).AsExpr()).Apply1(r);
+              }
+            }
+            RAST._IExpr _out160;
+            Defs._IOwnership _out161;
+            (this).FromOwned(r, expectedOwnership, out _out160, out _out161);
+            r = _out160;
+            resultingOwnership = _out161;
+            readIdents = _174_recIdents;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MapKeys) {
+          DAST._IExpression _177_expr = _source0.dtor_expr;
+          {
+            RAST._IExpr _178_recursiveGen;
+            Defs._IOwnership _179___v114;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _180_recIdents;
+            RAST._IExpr _out162;
+            Defs._IOwnership _out163;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out164;
+            (this).GenExpr(_177_expr, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out162, out _out163, out _out164);
+            _178_recursiveGen = _out162;
+            _179___v114 = _out163;
+            _180_recIdents = _out164;
+            readIdents = _180_recIdents;
+            r = ((_178_recursiveGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("keys"))).Apply0();
+            RAST._IExpr _out165;
+            Defs._IOwnership _out166;
+            (this).FromOwned(r, expectedOwnership, out _out165, out _out166);
+            r = _out165;
+            resultingOwnership = _out166;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MapValues) {
+          DAST._IExpression _181_expr = _source0.dtor_expr;
+          {
+            RAST._IExpr _182_recursiveGen;
+            Defs._IOwnership _183___v115;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _184_recIdents;
+            RAST._IExpr _out167;
+            Defs._IOwnership _out168;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out169;
+            (this).GenExpr(_181_expr, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out167, out _out168, out _out169);
+            _182_recursiveGen = _out167;
+            _183___v115 = _out168;
+            _184_recIdents = _out169;
+            readIdents = _184_recIdents;
+            r = ((_182_recursiveGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("values"))).Apply0();
+            RAST._IExpr _out170;
+            Defs._IOwnership _out171;
+            (this).FromOwned(r, expectedOwnership, out _out170, out _out171);
+            r = _out170;
+            resultingOwnership = _out171;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MapItems) {
+          DAST._IExpression _185_expr = _source0.dtor_expr;
+          {
+            RAST._IExpr _186_recursiveGen;
+            Defs._IOwnership _187___v116;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _188_recIdents;
+            RAST._IExpr _out172;
+            Defs._IOwnership _out173;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out174;
+            (this).GenExpr(_185_expr, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out172, out _out173, out _out174);
+            _186_recursiveGen = _out172;
+            _187___v116 = _out173;
+            _188_recIdents = _out174;
+            readIdents = _188_recIdents;
+            r = ((_186_recursiveGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("items"))).Apply0();
+            RAST._IExpr _out175;
+            Defs._IOwnership _out176;
+            (this).FromOwned(r, expectedOwnership, out _out175, out _out176);
+            r = _out175;
+            resultingOwnership = _out176;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SelectFn) {
+          DAST._IExpression _189_on = _source0.dtor_expr;
+          Dafny.ISequence<Dafny.Rune> _190_field = _source0.dtor_field;
+          bool _191_isDatatype = _source0.dtor_onDatatype;
+          bool _192_isStatic = _source0.dtor_isStatic;
+          bool _193_isConstant = _source0.dtor_isConstant;
+          Dafny.ISequence<DAST._IType> _194_arguments = _source0.dtor_arguments;
+          {
+            RAST._IExpr _195_onExpr;
+            Defs._IOwnership _196_onOwned;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _197_recIdents;
+            RAST._IExpr _out177;
+            Defs._IOwnership _out178;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out179;
+            (this).GenExpr(_189_on, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out177, out _out178, out _out179);
+            _195_onExpr = _out177;
+            _196_onOwned = _out178;
+            _197_recIdents = _out179;
+            Dafny.ISequence<Dafny.Rune> _198_onString;
+            _198_onString = (_195_onExpr)._ToString(Defs.__default.IND);
+            Defs._IEnvironment _199_lEnv;
+            _199_lEnv = env;
+            Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, RAST._IType>> _200_args;
+            _200_args = Dafny.Sequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, RAST._IType>>.FromElements();
+            Dafny.ISequence<RAST._IFormal> _201_parameters;
+            _201_parameters = Dafny.Sequence<RAST._IFormal>.FromElements();
+            BigInteger _hi7 = new BigInteger((_194_arguments).Count);
+            for (BigInteger _202_i = BigInteger.Zero; _202_i < _hi7; _202_i++) {
+              RAST._IType _203_ty;
+              RAST._IType _out180;
+              _out180 = (this).GenType((_194_arguments).Select(_202_i), Defs.GenTypeContext.@default());
+              _203_ty = _out180;
+              RAST._IType _204_bTy;
+              _204_bTy = RAST.Type.create_Borrowed(_203_ty);
+              Dafny.ISequence<Dafny.Rune> _205_name;
+              _205_name = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x"), Std.Strings.__default.OfInt(_202_i));
+              _199_lEnv = (_199_lEnv).AddAssigned(_205_name, _204_bTy);
+              _201_parameters = Dafny.Sequence<RAST._IFormal>.Concat(_201_parameters, Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.create(_205_name, _204_bTy)));
+              _200_args = Dafny.Sequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, RAST._IType>>.Concat(_200_args, Dafny.Sequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, RAST._IType>>.FromElements(_System.Tuple2<Dafny.ISequence<Dafny.Rune>, RAST._IType>.create(_205_name, _203_ty)));
+            }
+            RAST._IExpr _206_body;
+            if (_192_isStatic) {
+              _206_body = (_195_onExpr).FSel(Defs.__default.escapeVar(_190_field));
+            } else {
+              _206_body = (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("callTarget"))).Sel(Defs.__default.escapeVar(_190_field));
+            }
+            if (_193_isConstant) {
+              _206_body = (_206_body).Apply0();
+            }
+            Dafny.ISequence<RAST._IExpr> _207_onExprArgs;
+            _207_onExprArgs = Dafny.Sequence<RAST._IExpr>.FromElements();
+            BigInteger _hi8 = new BigInteger((_200_args).Count);
+            for (BigInteger _208_i = BigInteger.Zero; _208_i < _hi8; _208_i++) {
+              _System._ITuple2<Dafny.ISequence<Dafny.Rune>, RAST._IType> _let_tmp_rhs1 = (_200_args).Select(_208_i);
+              Dafny.ISequence<Dafny.Rune> _209_name = _let_tmp_rhs1.dtor__0;
+              RAST._IType _210_ty = _let_tmp_rhs1.dtor__1;
+              RAST._IExpr _211_rIdent;
+              Defs._IOwnership _212___v117;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _213___v118;
+              RAST._IExpr _out181;
+              Defs._IOwnership _out182;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out183;
+              (this).GenIdent(_209_name, selfIdent, _199_lEnv, (((!(_193_isConstant)) && ((_210_ty).CanReadWithoutClone())) ? (Defs.Ownership.create_OwnershipOwned()) : (Defs.Ownership.create_OwnershipBorrowed())), out _out181, out _out182, out _out183);
+              _211_rIdent = _out181;
+              _212___v117 = _out182;
+              _213___v118 = _out183;
+              _207_onExprArgs = Dafny.Sequence<RAST._IExpr>.Concat(_207_onExprArgs, Dafny.Sequence<RAST._IExpr>.FromElements(_211_rIdent));
+            }
+            _206_body = (_206_body).Apply(_207_onExprArgs);
+            r = RAST.Expr.create_Lambda(_201_parameters, Std.Wrappers.Option<RAST._IType>.create_None(), _206_body);
+            if (_192_isStatic) {
+            } else {
+              RAST._IExpr _214_target;
+              if (object.Equals(_196_onOwned, Defs.Ownership.create_OwnershipOwned())) {
+                _214_target = _195_onExpr;
+              } else {
+                _214_target = (_195_onExpr).Clone();
+              }
+              r = RAST.Expr.create_Block((RAST.Expr.create_DeclareVar(RAST.DeclareType.create_CONST(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("callTarget"), Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(_214_target))).Then(r));
+            }
+            Dafny.ISequence<RAST._IType> _215_typeShapeArgs;
+            _215_typeShapeArgs = Dafny.Sequence<RAST._IType>.FromElements();
+            BigInteger _hi9 = new BigInteger((_194_arguments).Count);
+            for (BigInteger _216_i = BigInteger.Zero; _216_i < _hi9; _216_i++) {
+              _215_typeShapeArgs = Dafny.Sequence<RAST._IType>.Concat(_215_typeShapeArgs, Dafny.Sequence<RAST._IType>.FromElements(RAST.Type.create_Borrowed(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_")))));
+            }
+            RAST._IType _217_typeShape;
+            _217_typeShape = RAST.Type.create_DynType(RAST.Type.create_FnType(_215_typeShapeArgs, RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"))));
+            r = RAST.Expr.create_TypeAscription((RAST.__default.std__rc__Rc__new).Apply1(r), ((RAST.__default.std__rc__Rc).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(_217_typeShape)));
+            RAST._IExpr _out184;
+            Defs._IOwnership _out185;
+            (this).FromOwned(r, expectedOwnership, out _out184, out _out185);
+            r = _out184;
+            resultingOwnership = _out185;
+            readIdents = _197_recIdents;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Select) {
+          DAST._IExpression _218_on = _source0.dtor_expr;
+          Dafny.ISequence<Dafny.Rune> _219_field = _source0.dtor_field;
+          DAST._IFieldMutability _220_fieldMutability = _source0.dtor_fieldMutability;
+          bool _221_isDatatype = _source0.dtor_isDatatype;
+          DAST._IType _222_fieldType = _source0.dtor_fieldType;
+          {
+            if (((_218_on).is_Companion) || ((_218_on).is_ExternCompanion)) {
+              RAST._IExpr _223_onExpr;
+              Defs._IOwnership _224_onOwned;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _225_recIdents;
+              RAST._IExpr _out186;
+              Defs._IOwnership _out187;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out188;
+              (this).GenExpr(_218_on, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out186, out _out187, out _out188);
+              _223_onExpr = _out186;
+              _224_onOwned = _out187;
+              _225_recIdents = _out188;
+              r = ((_223_onExpr).FSel(Defs.__default.escapeVar(_219_field))).Apply0();
+              RAST._IExpr _out189;
+              Defs._IOwnership _out190;
+              (this).FromOwned(r, expectedOwnership, out _out189, out _out190);
+              r = _out189;
+              resultingOwnership = _out190;
+              readIdents = _225_recIdents;
+              return ;
+            } else if (_221_isDatatype) {
+              RAST._IExpr _226_onExpr;
+              Defs._IOwnership _227_onOwned;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _228_recIdents;
+              RAST._IExpr _out191;
+              Defs._IOwnership _out192;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out193;
+              (this).GenExpr(_218_on, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out191, out _out192, out _out193);
+              _226_onExpr = _out191;
+              _227_onOwned = _out192;
+              _228_recIdents = _out193;
+              r = ((_226_onExpr).Sel(Defs.__default.escapeVar(_219_field))).Apply0();
+              Defs._IOwnership _229_originalMutability;
+              _229_originalMutability = Defs.Ownership.create_OwnershipOwned();
+              DAST._IFieldMutability _source2 = _220_fieldMutability;
+              {
+                if (_source2.is_ConstantField) {
+                  goto after_match2;
+                }
+              }
+              {
+                if (_source2.is_InternalClassConstantFieldOrDatatypeDestructor) {
+                  _229_originalMutability = Defs.Ownership.create_OwnershipBorrowed();
+                  goto after_match2;
+                }
+              }
+              {
+                RAST._IExpr _out194;
+                _out194 = (this).Error(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("datatypes don't have mutable fields"), (this).InitEmptyExpr());
+                r = _out194;
+              }
+            after_match2: ;
+              RAST._IType _230_typ;
+              RAST._IType _out195;
+              _out195 = (this).GenType(_222_fieldType, Defs.GenTypeContext.@default());
+              _230_typ = _out195;
+              RAST._IExpr _out196;
+              Defs._IOwnership _out197;
+              (this).FromOwnership(r, _229_originalMutability, expectedOwnership, out _out196, out _out197);
+              r = _out196;
+              resultingOwnership = _out197;
+              readIdents = _228_recIdents;
+            } else {
+              RAST._IExpr _231_onExpr;
+              Defs._IOwnership _232_onOwned;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _233_recIdents;
+              RAST._IExpr _out198;
+              Defs._IOwnership _out199;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out200;
+              (this).GenExpr(_218_on, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out198, out _out199, out _out200);
+              _231_onExpr = _out198;
+              _232_onOwned = _out199;
+              _233_recIdents = _out200;
+              r = _231_onExpr;
+              if (!object.Equals(_231_onExpr, RAST.__default.self)) {
+                RAST._IExpr _source3 = _231_onExpr;
+                {
+                  if (_source3.is_UnaryOp) {
+                    Dafny.ISequence<Dafny.Rune> op10 = _source3.dtor_op1;
+                    if (object.Equals(op10, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"))) {
+                      RAST._IExpr underlying0 = _source3.dtor_underlying;
+                      if (underlying0.is_Identifier) {
+                        Dafny.ISequence<Dafny.Rune> name0 = underlying0.dtor_name;
+                        if (object.Equals(name0, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this"))) {
+                          r = RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this"));
+                          goto after_match3;
+                        }
+                      }
+                    }
+                  }
+                }
+                {
+                }
+              after_match3: ;
+                if (((this).pointerType).is_RcMut) {
+                  r = (r).Clone();
+                }
+                r = ((this).read__macro).Apply1(r);
+              }
+              r = (r).Sel(Defs.__default.escapeVar(_219_field));
+              DAST._IFieldMutability _source4 = _220_fieldMutability;
+              {
+                if (_source4.is_ConstantField) {
+                  r = (r).Apply0();
+                  r = (r).Clone();
+                  goto after_match4;
+                }
+              }
+              {
+                if (_source4.is_InternalClassConstantFieldOrDatatypeDestructor) {
+                  r = (r).Clone();
+                  goto after_match4;
+                }
+              }
+              {
+                r = ((this).read__mutable__field__macro).Apply1(r);
+              }
+            after_match4: ;
+              RAST._IExpr _out201;
+              Defs._IOwnership _out202;
+              (this).FromOwned(r, expectedOwnership, out _out201, out _out202);
+              r = _out201;
+              resultingOwnership = _out202;
+              readIdents = _233_recIdents;
+            }
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Index) {
+          DAST._IExpression _234_on = _source0.dtor_expr;
+          DAST._ICollKind _235_collKind = _source0.dtor_collKind;
+          Dafny.ISequence<DAST._IExpression> _236_indices = _source0.dtor_indices;
+          {
+            RAST._IExpr _237_onExpr;
+            Defs._IOwnership _238_onOwned;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _239_recIdents;
+            RAST._IExpr _out203;
+            Defs._IOwnership _out204;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out205;
+            (this).GenExpr(_234_on, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out203, out _out204, out _out205);
+            _237_onExpr = _out203;
+            _238_onOwned = _out204;
+            _239_recIdents = _out205;
+            readIdents = _239_recIdents;
+            r = _237_onExpr;
+            bool _240_hadArray;
+            _240_hadArray = false;
+            if (object.Equals(_235_collKind, DAST.CollKind.create_Array())) {
+              r = ((this).read__macro).Apply1(r);
+              _240_hadArray = true;
+              if ((new BigInteger((_236_indices).Count)) > (BigInteger.One)) {
+                r = (r).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("data"));
+              }
+            }
+            BigInteger _hi10 = new BigInteger((_236_indices).Count);
+            for (BigInteger _241_i = BigInteger.Zero; _241_i < _hi10; _241_i++) {
+              if (object.Equals(_235_collKind, DAST.CollKind.create_Array())) {
+                RAST._IExpr _242_idx;
+                Defs._IOwnership _243_idxOwned;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _244_recIdentsIdx;
+                RAST._IExpr _out206;
+                Defs._IOwnership _out207;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out208;
+                (this).GenExpr((_236_indices).Select(_241_i), selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out206, out _out207, out _out208);
+                _242_idx = _out206;
+                _243_idxOwned = _out207;
+                _244_recIdentsIdx = _out208;
+                _242_idx = RAST.__default.IntoUsize(_242_idx);
+                r = RAST.Expr.create_SelectIndex(r, _242_idx);
+                readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _244_recIdentsIdx);
+              } else {
+                RAST._IExpr _245_idx;
+                Defs._IOwnership _246_idxOwned;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _247_recIdentsIdx;
+                RAST._IExpr _out209;
+                Defs._IOwnership _out210;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out211;
+                (this).GenExpr((_236_indices).Select(_241_i), selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out209, out _out210, out _out211);
+                _245_idx = _out209;
+                _246_idxOwned = _out210;
+                _247_recIdentsIdx = _out211;
+                r = ((r).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("get"))).Apply1(_245_idx);
+                readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _247_recIdentsIdx);
+              }
+            }
+            if (_240_hadArray) {
+              r = (r).Clone();
+            }
+            RAST._IExpr _out212;
+            Defs._IOwnership _out213;
+            (this).FromOwned(r, expectedOwnership, out _out212, out _out213);
+            r = _out212;
+            resultingOwnership = _out213;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_IndexRange) {
+          DAST._IExpression _248_on = _source0.dtor_expr;
+          bool _249_isArray = _source0.dtor_isArray;
+          Std.Wrappers._IOption<DAST._IExpression> _250_low = _source0.dtor_low;
+          Std.Wrappers._IOption<DAST._IExpression> _251_high = _source0.dtor_high;
+          {
+            Defs._IOwnership _252_onExpectedOwnership;
+            if (_249_isArray) {
+              if (((this).pointerType).is_Raw) {
+                _252_onExpectedOwnership = Defs.Ownership.create_OwnershipOwned();
+              } else {
+                _252_onExpectedOwnership = Defs.Ownership.create_OwnershipBorrowed();
+              }
+            } else {
+              _252_onExpectedOwnership = Defs.Ownership.create_OwnershipAutoBorrowed();
+            }
+            RAST._IExpr _253_onExpr;
+            Defs._IOwnership _254_onOwned;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _255_recIdents;
+            RAST._IExpr _out214;
+            Defs._IOwnership _out215;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out216;
+            (this).GenExpr(_248_on, selfIdent, env, _252_onExpectedOwnership, out _out214, out _out215, out _out216);
+            _253_onExpr = _out214;
+            _254_onOwned = _out215;
+            _255_recIdents = _out216;
+            readIdents = _255_recIdents;
+            Dafny.ISequence<Dafny.Rune> _256_methodName;
+            if ((_250_low).is_Some) {
+              if ((_251_high).is_Some) {
+                _256_methodName = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("slice");
+              } else {
+                _256_methodName = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("drop");
+              }
+            } else if ((_251_high).is_Some) {
+              _256_methodName = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("take");
+            } else {
+              _256_methodName = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+            }
+            Dafny.ISequence<RAST._IExpr> _257_arguments;
+            _257_arguments = Dafny.Sequence<RAST._IExpr>.FromElements();
+            Std.Wrappers._IOption<DAST._IExpression> _source5 = _250_low;
+            {
+              if (_source5.is_Some) {
+                DAST._IExpression _258_l = _source5.dtor_value;
+                {
+                  RAST._IExpr _259_lExpr;
+                  Defs._IOwnership _260___v121;
+                  Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _261_recIdentsL;
+                  RAST._IExpr _out217;
+                  Defs._IOwnership _out218;
+                  Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out219;
+                  (this).GenExpr(_258_l, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out217, out _out218, out _out219);
+                  _259_lExpr = _out217;
+                  _260___v121 = _out218;
+                  _261_recIdentsL = _out219;
+                  _257_arguments = Dafny.Sequence<RAST._IExpr>.Concat(_257_arguments, Dafny.Sequence<RAST._IExpr>.FromElements(_259_lExpr));
+                  readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _261_recIdentsL);
+                }
+                goto after_match5;
+              }
+            }
+            {
+            }
+          after_match5: ;
+            Std.Wrappers._IOption<DAST._IExpression> _source6 = _251_high;
+            {
+              if (_source6.is_Some) {
+                DAST._IExpression _262_h = _source6.dtor_value;
+                {
+                  RAST._IExpr _263_hExpr;
+                  Defs._IOwnership _264___v122;
+                  Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _265_recIdentsH;
+                  RAST._IExpr _out220;
+                  Defs._IOwnership _out221;
+                  Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out222;
+                  (this).GenExpr(_262_h, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out220, out _out221, out _out222);
+                  _263_hExpr = _out220;
+                  _264___v122 = _out221;
+                  _265_recIdentsH = _out222;
+                  _257_arguments = Dafny.Sequence<RAST._IExpr>.Concat(_257_arguments, Dafny.Sequence<RAST._IExpr>.FromElements(_263_hExpr));
+                  readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _265_recIdentsH);
+                }
+                goto after_match6;
+              }
+            }
+            {
+            }
+          after_match6: ;
+            r = _253_onExpr;
+            if (_249_isArray) {
+              if (!(_256_methodName).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))) {
+                _256_methodName = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"), _256_methodName);
+              }
+              Dafny.ISequence<Dafny.Rune> _266_object__suffix;
+              if (((this).pointerType).is_Raw) {
+                _266_object__suffix = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+              } else {
+                _266_object__suffix = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_object");
+              }
+              r = ((RAST.__default.dafny__runtime__Sequence).FSel(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from_array"), _256_methodName), _266_object__suffix))).Apply(Dafny.Sequence<RAST._IExpr>.Concat(Dafny.Sequence<RAST._IExpr>.FromElements(_253_onExpr), _257_arguments));
+            } else {
+              if (!(_256_methodName).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))) {
+                r = ((r).Sel(_256_methodName)).Apply(_257_arguments);
+              } else {
+                r = (r).Clone();
+              }
+            }
+            RAST._IExpr _out223;
+            Defs._IOwnership _out224;
+            (this).FromOwned(r, expectedOwnership, out _out223, out _out224);
+            r = _out223;
+            resultingOwnership = _out224;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_TupleSelect) {
+          DAST._IExpression _267_on = _source0.dtor_expr;
+          BigInteger _268_idx = _source0.dtor_index;
+          DAST._IType _269_fieldType = _source0.dtor_fieldType;
+          {
+            RAST._IExpr _270_onExpr;
+            Defs._IOwnership _271_onOwnership;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _272_recIdents;
+            RAST._IExpr _out225;
+            Defs._IOwnership _out226;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out227;
+            (this).GenExpr(_267_on, selfIdent, env, Defs.Ownership.create_OwnershipAutoBorrowed(), out _out225, out _out226, out _out227);
+            _270_onExpr = _out225;
+            _271_onOwnership = _out226;
+            _272_recIdents = _out227;
+            Dafny.ISequence<Dafny.Rune> _273_selName;
+            _273_selName = Std.Strings.__default.OfNat(_268_idx);
+            DAST._IType _source7 = _269_fieldType;
+            {
+              if (_source7.is_Tuple) {
+                Dafny.ISequence<DAST._IType> _274_tps = _source7.dtor_Tuple_a0;
+                if (((_269_fieldType).is_Tuple) && ((new BigInteger((_274_tps).Count)) > (RAST.__default.MAX__TUPLE__SIZE))) {
+                  _273_selName = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"), _273_selName);
+                }
+                goto after_match7;
+              }
+            }
+            {
+            }
+          after_match7: ;
+            r = ((_270_onExpr).Sel(_273_selName)).Clone();
+            RAST._IExpr _out228;
+            Defs._IOwnership _out229;
+            (this).FromOwnership(r, Defs.Ownership.create_OwnershipOwned(), expectedOwnership, out _out228, out _out229);
+            r = _out228;
+            resultingOwnership = _out229;
+            readIdents = _272_recIdents;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Call) {
+          DAST._IExpression _275_on = _source0.dtor_on;
+          DAST._ICallName _276_name = _source0.dtor_callName;
+          Dafny.ISequence<DAST._IType> _277_typeArgs = _source0.dtor_typeArgs;
+          Dafny.ISequence<DAST._IExpression> _278_args = _source0.dtor_args;
+          {
+            RAST._IExpr _out230;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out231;
+            (this).GenOwnedCallPart(_275_on, selfIdent, _276_name, _277_typeArgs, _278_args, env, out _out230, out _out231);
+            r = _out230;
+            readIdents = _out231;
+            RAST._IExpr _out232;
+            Defs._IOwnership _out233;
+            (this).FromOwned(r, expectedOwnership, out _out232, out _out233);
+            r = _out232;
+            resultingOwnership = _out233;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Lambda) {
+          Dafny.ISequence<DAST._IFormal> _279_paramsDafny = _source0.dtor_params;
+          DAST._IType _280_retType = _source0.dtor_retType;
+          Dafny.ISequence<DAST._IStatement> _281_body = _source0.dtor_body;
+          {
+            Dafny.ISequence<RAST._IFormal> _282_params;
+            Dafny.ISequence<RAST._IFormal> _out234;
+            _out234 = (this).GenParams(_279_paramsDafny, true);
+            _282_params = _out234;
+            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _283_paramNames;
+            _283_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> _284_paramTypesMap;
+            _284_paramTypesMap = Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.FromElements();
+            BigInteger _hi11 = new BigInteger((_282_params).Count);
+            for (BigInteger _285_i = BigInteger.Zero; _285_i < _hi11; _285_i++) {
+              Dafny.ISequence<Dafny.Rune> _286_name;
+              _286_name = ((_282_params).Select(_285_i)).dtor_name;
+              _283_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_283_paramNames, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_286_name));
+              _284_paramTypesMap = Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Update(_284_paramTypesMap, _286_name, ((_282_params).Select(_285_i)).dtor_tpe);
+            }
+            Defs._IEnvironment _287_subEnv;
+            _287_subEnv = ((env).ToOwned()).merge(Defs.Environment.create(_283_paramNames, _284_paramTypesMap, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements()));
+            RAST._IExpr _288_recursiveGen;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _289_recIdents;
+            Defs._IEnvironment _290___v124;
+            RAST._IExpr _out235;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out236;
+            Defs._IEnvironment _out237;
+            (this).GenStmts(_281_body, ((!object.Equals(selfIdent, Defs.SelfInfo.create_NoSelf())) ? (Defs.SelfInfo.create_ThisTyped(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_this"), (selfIdent).dtor_dafnyType)) : (Defs.SelfInfo.create_NoSelf())), _287_subEnv, true, Std.Wrappers.Option<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.create_None(), out _out235, out _out236, out _out237);
+            _288_recursiveGen = _out235;
+            _289_recIdents = _out236;
+            _290___v124 = _out237;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            _289_recIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(_289_recIdents, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISet<Dafny.ISequence<Dafny.Rune>>>>((_291_paramNames) => ((System.Func<Dafny.ISet<Dafny.ISequence<Dafny.Rune>>>)(() => {
+              var _coll0 = new System.Collections.Generic.List<Dafny.ISequence<Dafny.Rune>>();
+              foreach (Dafny.ISequence<Dafny.Rune> _compr_0 in (_291_paramNames).CloneAsArray()) {
+                Dafny.ISequence<Dafny.Rune> _292_name = (Dafny.ISequence<Dafny.Rune>)_compr_0;
+                if ((_291_paramNames).Contains(_292_name)) {
+                  _coll0.Add(_292_name);
+                }
+              }
+              return Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromCollection(_coll0);
+            }))())(_283_paramNames));
+            RAST._IExpr _293_allReadCloned;
+            _293_allReadCloned = (this).InitEmptyExpr();
+            while (!(_289_recIdents).Equals(Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements())) {
+              Dafny.ISequence<Dafny.Rune> _294_next;
+              foreach (Dafny.ISequence<Dafny.Rune> _assign_such_that_1 in (_289_recIdents).Elements) {
+                _294_next = (Dafny.ISequence<Dafny.Rune>)_assign_such_that_1;
+                if ((_289_recIdents).Contains(_294_next)) {
+                  goto after__ASSIGN_SUCH_THAT_1;
+                }
+              }
+              throw new System.Exception("assign-such-that search produced no value");
+            after__ASSIGN_SUCH_THAT_1: ;
+              if ((!object.Equals(selfIdent, Defs.SelfInfo.create_NoSelf())) && ((_294_next).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_this")))) {
+                RAST._IExpr _295_selfCloned;
+                Defs._IOwnership _296___v125;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _297___v126;
+                RAST._IExpr _out238;
+                Defs._IOwnership _out239;
+                Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out240;
+                (this).GenIdent(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"), selfIdent, Defs.Environment.Empty(), Defs.Ownership.create_OwnershipOwned(), out _out238, out _out239, out _out240);
+                _295_selfCloned = _out238;
+                _296___v125 = _out239;
+                _297___v126 = _out240;
+                _293_allReadCloned = (_293_allReadCloned).Then(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_this"), Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(_295_selfCloned)));
+              } else if (!((_283_paramNames).Contains(_294_next))) {
+                RAST._IExpr _298_copy;
+                _298_copy = (RAST.Expr.create_Identifier(_294_next)).Clone();
+                _293_allReadCloned = (_293_allReadCloned).Then(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_MUT(), _294_next, Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(_298_copy)));
+                readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_294_next));
+              }
+              _289_recIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(_289_recIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_294_next));
+            }
+            RAST._IType _299_retTypeGen;
+            RAST._IType _out241;
+            _out241 = (this).GenType(_280_retType, Defs.GenTypeContext.@default());
+            _299_retTypeGen = _out241;
+            r = RAST.Expr.create_Block((_293_allReadCloned).Then(RAST.__default.RcNew(RAST.Expr.create_Lambda(_282_params, Std.Wrappers.Option<RAST._IType>.create_Some(_299_retTypeGen), RAST.Expr.create_Block(_288_recursiveGen)))));
+            RAST._IExpr _out242;
+            Defs._IOwnership _out243;
+            (this).FromOwned(r, expectedOwnership, out _out242, out _out243);
+            r = _out242;
+            resultingOwnership = _out243;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_BetaRedex) {
+          Dafny.ISequence<_System._ITuple2<DAST._IFormal, DAST._IExpression>> _300_values = _source0.dtor_values;
+          DAST._IType _301_retType = _source0.dtor_retType;
+          DAST._IExpression _302_expr = _source0.dtor_expr;
+          {
+            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _303_paramNames;
+            _303_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            Dafny.ISequence<RAST._IFormal> _304_paramFormals;
+            Dafny.ISequence<RAST._IFormal> _out244;
+            _out244 = (this).GenParams(Std.Collections.Seq.__default.Map<_System._ITuple2<DAST._IFormal, DAST._IExpression>, DAST._IFormal>(((System.Func<_System._ITuple2<DAST._IFormal, DAST._IExpression>, DAST._IFormal>)((_305_value) => {
+              return (_305_value).dtor__0;
+            })), _300_values), false);
+            _304_paramFormals = _out244;
+            Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> _306_paramTypes;
+            _306_paramTypes = Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.FromElements();
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _307_paramNamesSet;
+            _307_paramNamesSet = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            BigInteger _hi12 = new BigInteger((_300_values).Count);
+            for (BigInteger _308_i = BigInteger.Zero; _308_i < _hi12; _308_i++) {
+              Dafny.ISequence<Dafny.Rune> _309_name;
+              _309_name = (((_300_values).Select(_308_i)).dtor__0).dtor_name;
+              Dafny.ISequence<Dafny.Rune> _310_rName;
+              _310_rName = Defs.__default.escapeVar(_309_name);
+              _303_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_303_paramNames, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_310_rName));
+              _306_paramTypes = Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Update(_306_paramTypes, _310_rName, ((_304_paramFormals).Select(_308_i)).dtor_tpe);
+              _307_paramNamesSet = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_307_paramNamesSet, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_310_rName));
+            }
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            r = (this).InitEmptyExpr();
+            BigInteger _hi13 = new BigInteger((_300_values).Count);
+            for (BigInteger _311_i = BigInteger.Zero; _311_i < _hi13; _311_i++) {
+              RAST._IType _312_typeGen;
+              RAST._IType _out245;
+              _out245 = (this).GenType((((_300_values).Select(_311_i)).dtor__0).dtor_typ, Defs.GenTypeContext.@default());
+              _312_typeGen = _out245;
+              RAST._IExpr _313_valueGen;
+              Defs._IOwnership _314___v127;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _315_recIdents;
+              RAST._IExpr _out246;
+              Defs._IOwnership _out247;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out248;
+              (this).GenExpr(((_300_values).Select(_311_i)).dtor__1, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out246, out _out247, out _out248);
+              _313_valueGen = _out246;
+              _314___v127 = _out247;
+              _315_recIdents = _out248;
+              r = (r).Then(RAST.Expr.create_DeclareVar(RAST.DeclareType.create_CONST(), Defs.__default.escapeVar((((_300_values).Select(_311_i)).dtor__0).dtor_name), Std.Wrappers.Option<RAST._IType>.create_Some(_312_typeGen), Std.Wrappers.Option<RAST._IExpr>.create_Some(_313_valueGen)));
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _315_recIdents);
+            }
+            Defs._IEnvironment _316_newEnv;
+            _316_newEnv = Defs.Environment.create(_303_paramNames, _306_paramTypes, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements());
+            RAST._IExpr _317_recGen;
+            Defs._IOwnership _318_recOwned;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _319_recIdents;
+            RAST._IExpr _out249;
+            Defs._IOwnership _out250;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out251;
+            (this).GenExpr(_302_expr, selfIdent, _316_newEnv, expectedOwnership, out _out249, out _out250, out _out251);
+            _317_recGen = _out249;
+            _318_recOwned = _out250;
+            _319_recIdents = _out251;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(_319_recIdents, _307_paramNamesSet);
+            r = RAST.Expr.create_Block((r).Then(_317_recGen));
+            RAST._IExpr _out252;
+            Defs._IOwnership _out253;
+            (this).FromOwnership(r, _318_recOwned, expectedOwnership, out _out252, out _out253);
+            r = _out252;
+            resultingOwnership = _out253;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_IIFE) {
+          Dafny.ISequence<Dafny.Rune> _320_name = _source0.dtor_ident;
+          DAST._IType _321_tpe = _source0.dtor_typ;
+          DAST._IExpression _322_value = _source0.dtor_value;
+          DAST._IExpression _323_iifeBody = _source0.dtor_iifeBody;
+          {
+            RAST._IExpr _324_valueGen;
+            Defs._IOwnership _325___v128;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _326_recIdents;
+            RAST._IExpr _out254;
+            Defs._IOwnership _out255;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out256;
+            (this).GenExpr(_322_value, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out254, out _out255, out _out256);
+            _324_valueGen = _out254;
+            _325___v128 = _out255;
+            _326_recIdents = _out256;
+            readIdents = _326_recIdents;
+            RAST._IType _327_valueTypeGen;
+            RAST._IType _out257;
+            _out257 = (this).GenType(_321_tpe, Defs.GenTypeContext.@default());
+            _327_valueTypeGen = _out257;
+            Dafny.ISequence<Dafny.Rune> _328_iifeVar;
+            _328_iifeVar = Defs.__default.escapeVar(_320_name);
+            RAST._IExpr _329_bodyGen;
+            Defs._IOwnership _330___v129;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _331_bodyIdents;
+            RAST._IExpr _out258;
+            Defs._IOwnership _out259;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out260;
+            (this).GenExpr(_323_iifeBody, selfIdent, (env).AddAssigned(_328_iifeVar, _327_valueTypeGen), Defs.Ownership.create_OwnershipOwned(), out _out258, out _out259, out _out260);
+            _329_bodyGen = _out258;
+            _330___v129 = _out259;
+            _331_bodyIdents = _out260;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(_331_bodyIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_328_iifeVar)));
+            r = RAST.Expr.create_Block((RAST.Expr.create_DeclareVar(RAST.DeclareType.create_CONST(), _328_iifeVar, Std.Wrappers.Option<RAST._IType>.create_Some(_327_valueTypeGen), Std.Wrappers.Option<RAST._IExpr>.create_Some(_324_valueGen))).Then(_329_bodyGen));
+            RAST._IExpr _out261;
+            Defs._IOwnership _out262;
+            (this).FromOwned(r, expectedOwnership, out _out261, out _out262);
+            r = _out261;
+            resultingOwnership = _out262;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Apply) {
+          DAST._IExpression _332_func = _source0.dtor_expr;
+          Dafny.ISequence<DAST._IExpression> _333_args = _source0.dtor_args;
+          {
+            RAST._IExpr _334_funcExpr;
+            Defs._IOwnership _335___v130;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _336_recIdents;
+            RAST._IExpr _out263;
+            Defs._IOwnership _out264;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out265;
+            (this).GenExpr(_332_func, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out263, out _out264, out _out265);
+            _334_funcExpr = _out263;
+            _335___v130 = _out264;
+            _336_recIdents = _out265;
+            readIdents = _336_recIdents;
+            Dafny.ISequence<RAST._IExpr> _337_rArgs;
+            _337_rArgs = Dafny.Sequence<RAST._IExpr>.FromElements();
+            BigInteger _hi14 = new BigInteger((_333_args).Count);
+            for (BigInteger _338_i = BigInteger.Zero; _338_i < _hi14; _338_i++) {
+              RAST._IExpr _339_argExpr;
+              Defs._IOwnership _340_argOwned;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _341_argIdents;
+              RAST._IExpr _out266;
+              Defs._IOwnership _out267;
+              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out268;
+              (this).GenExpr((_333_args).Select(_338_i), selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out266, out _out267, out _out268);
+              _339_argExpr = _out266;
+              _340_argOwned = _out267;
+              _341_argIdents = _out268;
+              _337_rArgs = Dafny.Sequence<RAST._IExpr>.Concat(_337_rArgs, Dafny.Sequence<RAST._IExpr>.FromElements(_339_argExpr));
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _341_argIdents);
+            }
+            r = (_334_funcExpr).Apply(_337_rArgs);
+            RAST._IExpr _out269;
+            Defs._IOwnership _out270;
+            (this).FromOwned(r, expectedOwnership, out _out269, out _out270);
+            r = _out269;
+            resultingOwnership = _out270;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_TypeTest) {
+          DAST._IExpression _342_on = _source0.dtor_on;
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _343_dType = _source0.dtor_dType;
+          Dafny.ISequence<Dafny.Rune> _344_variant = _source0.dtor_variant;
+          {
+            RAST._IExpr _345_exprGen;
+            Defs._IOwnership _346___v131;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _347_recIdents;
+            RAST._IExpr _out271;
+            Defs._IOwnership _out272;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out273;
+            (this).GenExpr(_342_on, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out271, out _out272, out _out273);
+            _345_exprGen = _out271;
+            _346___v131 = _out272;
+            _347_recIdents = _out273;
+            RAST._IExpr _348_variantExprPath;
+            RAST._IExpr _out274;
+            _out274 = (this).GenPathExpr(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_343_dType, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(_344_variant)), true);
+            _348_variantExprPath = _out274;
+            r = (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("matches!"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(((_345_exprGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("as_ref"))).Apply0(), RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{ .. }"), _348_variantExprPath, DAST.Format.UnaryOpFormat.create_NoFormat())));
+            RAST._IExpr _out275;
+            Defs._IOwnership _out276;
+            (this).FromOwned(r, expectedOwnership, out _out275, out _out276);
+            r = _out275;
+            resultingOwnership = _out276;
+            readIdents = _347_recIdents;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_Is) {
+          DAST._IExpression _349_expr = _source0.dtor_expr;
+          DAST._IType _350_fromType = _source0.dtor_fromType;
+          DAST._IType _351_toType = _source0.dtor_toType;
+          {
+            RAST._IExpr _352_expr;
+            Defs._IOwnership _353_recOwned;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _354_recIdents;
+            RAST._IExpr _out277;
+            Defs._IOwnership _out278;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out279;
+            (this).GenExpr(_349_expr, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out277, out _out278, out _out279);
+            _352_expr = _out277;
+            _353_recOwned = _out278;
+            _354_recIdents = _out279;
+            RAST._IType _355_fromType;
+            RAST._IType _out280;
+            _out280 = (this).GenType(_350_fromType, Defs.GenTypeContext.@default());
+            _355_fromType = _out280;
+            RAST._IType _356_toType;
+            RAST._IType _out281;
+            _out281 = (this).GenType(_351_toType, Defs.GenTypeContext.@default());
+            _356_toType = _out281;
+            if (((_355_fromType).IsObjectOrPointer()) && ((_356_toType).IsObjectOrPointer())) {
+              r = (((_352_expr).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("is_instance_of"))).ApplyType(Dafny.Sequence<RAST._IType>.FromElements((_356_toType).ObjectOrPointerUnderlying()))).Apply0();
+            } else {
+              RAST._IExpr _out282;
+              _out282 = (this).Error(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Source and/or target types of type test is/are not Object or Ptr"), (this).InitEmptyExpr());
+              r = _out282;
+              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            }
+            RAST._IExpr _out283;
+            Defs._IOwnership _out284;
+            (this).FromOwnership(r, _353_recOwned, expectedOwnership, out _out283, out _out284);
+            r = _out283;
+            resultingOwnership = _out284;
+            readIdents = _354_recIdents;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_BoolBoundedPool) {
+          {
+            r = RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("[false, true]"));
+            RAST._IExpr _out285;
+            Defs._IOwnership _out286;
+            (this).FromOwned(r, expectedOwnership, out _out285, out _out286);
+            r = _out285;
+            resultingOwnership = _out286;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SetBoundedPool) {
+          DAST._IExpression _357_of = _source0.dtor_of;
+          {
+            RAST._IExpr _358_exprGen;
+            Defs._IOwnership _359___v132;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _360_recIdents;
+            RAST._IExpr _out287;
+            Defs._IOwnership _out288;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out289;
+            (this).GenExpr(_357_of, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out287, out _out288, out _out289);
+            _358_exprGen = _out287;
+            _359___v132 = _out288;
+            _360_recIdents = _out289;
+            r = ((_358_exprGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("iter"))).Apply0();
+            RAST._IExpr _out290;
+            Defs._IOwnership _out291;
+            (this).FromOwned(r, expectedOwnership, out _out290, out _out291);
+            r = _out290;
+            resultingOwnership = _out291;
+            readIdents = _360_recIdents;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SeqBoundedPool) {
+          DAST._IExpression _361_of = _source0.dtor_of;
+          bool _362_includeDuplicates = _source0.dtor_includeDuplicates;
+          {
+            RAST._IExpr _363_exprGen;
+            Defs._IOwnership _364___v133;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _365_recIdents;
+            RAST._IExpr _out292;
+            Defs._IOwnership _out293;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out294;
+            (this).GenExpr(_361_of, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out292, out _out293, out _out294);
+            _363_exprGen = _out292;
+            _364___v133 = _out293;
+            _365_recIdents = _out294;
+            r = ((_363_exprGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("iter"))).Apply0();
+            if (!(_362_includeDuplicates)) {
+              r = (((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("itertools"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Itertools"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unique"))).Apply1(r);
+            }
+            RAST._IExpr _out295;
+            Defs._IOwnership _out296;
+            (this).FromOwned(r, expectedOwnership, out _out295, out _out296);
+            r = _out295;
+            resultingOwnership = _out296;
+            readIdents = _365_recIdents;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MultisetBoundedPool) {
+          DAST._IExpression _366_of = _source0.dtor_of;
+          bool _367_includeDuplicates = _source0.dtor_includeDuplicates;
+          {
+            RAST._IExpr _368_exprGen;
+            Defs._IOwnership _369___v134;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _370_recIdents;
+            RAST._IExpr _out297;
+            Defs._IOwnership _out298;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out299;
+            (this).GenExpr(_366_of, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out297, out _out298, out _out299);
+            _368_exprGen = _out297;
+            _369___v134 = _out298;
+            _370_recIdents = _out299;
+            r = ((_368_exprGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("iter"))).Apply0();
+            if (!(_367_includeDuplicates)) {
+              r = (((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("itertools"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Itertools"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unique"))).Apply1(r);
+            }
+            RAST._IExpr _out300;
+            Defs._IOwnership _out301;
+            (this).FromOwned(r, expectedOwnership, out _out300, out _out301);
+            r = _out300;
+            resultingOwnership = _out301;
+            readIdents = _370_recIdents;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MapBoundedPool) {
+          DAST._IExpression _371_of = _source0.dtor_of;
+          {
+            RAST._IExpr _372_exprGen;
+            Defs._IOwnership _373___v135;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _374_recIdents;
+            RAST._IExpr _out302;
+            Defs._IOwnership _out303;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out304;
+            (this).GenExpr(_371_of, selfIdent, env, Defs.Ownership.create_OwnershipBorrowed(), out _out302, out _out303, out _out304);
+            _372_exprGen = _out302;
+            _373___v135 = _out303;
+            _374_recIdents = _out304;
+            r = ((((_372_exprGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("keys"))).Apply0()).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("iter"))).Apply0();
+            readIdents = _374_recIdents;
+            RAST._IExpr _out305;
+            Defs._IOwnership _out306;
+            (this).FromOwned(r, expectedOwnership, out _out305, out _out306);
+            r = _out305;
+            resultingOwnership = _out306;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_ExactBoundedPool) {
+          DAST._IExpression _375_of = _source0.dtor_of;
+          {
+            RAST._IExpr _376_exprGen;
+            Defs._IOwnership _377___v136;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _378_recIdents;
+            RAST._IExpr _out307;
+            Defs._IOwnership _out308;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out309;
+            (this).GenExpr(_375_of, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out307, out _out308, out _out309);
+            _376_exprGen = _out307;
+            _377___v136 = _out308;
+            _378_recIdents = _out309;
+            r = ((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("iter"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("once"))).Apply1(_376_exprGen);
+            readIdents = _378_recIdents;
+            RAST._IExpr _out310;
+            Defs._IOwnership _out311;
+            (this).FromOwned(r, expectedOwnership, out _out310, out _out311);
+            r = _out310;
+            resultingOwnership = _out311;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_IntRange) {
+          DAST._IType _379_typ = _source0.dtor_elemType;
+          DAST._IExpression _380_lo = _source0.dtor_lo;
+          DAST._IExpression _381_hi = _source0.dtor_hi;
+          bool _382_up = _source0.dtor_up;
+          {
+            RAST._IExpr _383_lo;
+            Defs._IOwnership _384___v137;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _385_recIdentsLo;
+            RAST._IExpr _out312;
+            Defs._IOwnership _out313;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out314;
+            (this).GenExpr(_380_lo, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out312, out _out313, out _out314);
+            _383_lo = _out312;
+            _384___v137 = _out313;
+            _385_recIdentsLo = _out314;
+            RAST._IExpr _386_hi;
+            Defs._IOwnership _387___v138;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _388_recIdentsHi;
+            RAST._IExpr _out315;
+            Defs._IOwnership _out316;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out317;
+            (this).GenExpr(_381_hi, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out315, out _out316, out _out317);
+            _386_hi = _out315;
+            _387___v138 = _out316;
+            _388_recIdentsHi = _out317;
+            if (_382_up) {
+              r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("integer_range"))).AsExpr()).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(_383_lo, _386_hi));
+            } else {
+              r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("integer_range_down"))).AsExpr()).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(_386_hi, _383_lo));
+            }
+            if (!((_379_typ).is_Primitive)) {
+              RAST._IType _389_tpe;
+              RAST._IType _out318;
+              _out318 = (this).GenType(_379_typ, Defs.GenTypeContext.@default());
+              _389_tpe = _out318;
+              r = ((r).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("map"))).Apply1((((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("convert"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Into"))).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(_389_tpe))).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("into")));
+            }
+            RAST._IExpr _out319;
+            Defs._IOwnership _out320;
+            (this).FromOwned(r, expectedOwnership, out _out319, out _out320);
+            r = _out319;
+            resultingOwnership = _out320;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_385_recIdentsLo, _388_recIdentsHi);
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_UnboundedIntRange) {
+          DAST._IExpression _390_start = _source0.dtor_start;
+          bool _391_up = _source0.dtor_up;
+          {
+            RAST._IExpr _392_start;
+            Defs._IOwnership _393___v139;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _394_recIdentStart;
+            RAST._IExpr _out321;
+            Defs._IOwnership _out322;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out323;
+            (this).GenExpr(_390_start, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out321, out _out322, out _out323);
+            _392_start = _out321;
+            _393___v139 = _out322;
+            _394_recIdentStart = _out323;
+            if (_391_up) {
+              r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("integer_range_unbounded"))).AsExpr()).Apply1(_392_start);
+            } else {
+              r = (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("integer_range_down_unbounded"))).AsExpr()).Apply1(_392_start);
+            }
+            RAST._IExpr _out324;
+            Defs._IOwnership _out325;
+            (this).FromOwned(r, expectedOwnership, out _out324, out _out325);
+            r = _out324;
+            resultingOwnership = _out325;
+            readIdents = _394_recIdentStart;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_MapBuilder) {
+          DAST._IType _395_keyType = _source0.dtor_keyType;
+          DAST._IType _396_valueType = _source0.dtor_valueType;
+          {
+            RAST._IType _397_kType;
+            RAST._IType _out326;
+            _out326 = (this).GenType(_395_keyType, Defs.GenTypeContext.@default());
+            _397_kType = _out326;
+            RAST._IType _398_vType;
+            RAST._IType _out327;
+            _out327 = (this).GenType(_396_valueType, Defs.GenTypeContext.@default());
+            _398_vType = _out327;
+            r = (((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("MapBuilder"))).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(_397_kType, _398_vType))).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("new"))).Apply0();
+            RAST._IExpr _out328;
+            Defs._IOwnership _out329;
+            (this).FromOwned(r, expectedOwnership, out _out328, out _out329);
+            r = _out328;
+            resultingOwnership = _out329;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        if (_source0.is_SetBuilder) {
+          DAST._IType _399_elemType = _source0.dtor_elemType;
+          {
+            RAST._IType _400_eType;
+            RAST._IType _out330;
+            _out330 = (this).GenType(_399_elemType, Defs.GenTypeContext.@default());
+            _400_eType = _out330;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+            r = (((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("SetBuilder"))).AsExpr()).ApplyType(Dafny.Sequence<RAST._IType>.FromElements(_400_eType))).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("new"))).Apply0();
+            RAST._IExpr _out331;
+            Defs._IOwnership _out332;
+            (this).FromOwned(r, expectedOwnership, out _out331, out _out332);
+            r = _out331;
+            resultingOwnership = _out332;
+            return ;
+          }
+          goto after_match0;
+        }
+      }
+      {
+        DAST._IType _401_elemType = _source0.dtor_elemType;
+        DAST._IExpression _402_collection = _source0.dtor_collection;
+        bool _403_is__forall = _source0.dtor_is__forall;
+        DAST._IExpression _404_lambda = _source0.dtor_lambda;
+        {
+          RAST._IType _405_tpe;
+          RAST._IType _out333;
+          _out333 = (this).GenType(_401_elemType, Defs.GenTypeContext.@default());
+          _405_tpe = _out333;
+          RAST._IExpr _406_collectionGen;
+          Defs._IOwnership _407___v140;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _408_recIdents;
+          RAST._IExpr _out334;
+          Defs._IOwnership _out335;
+          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out336;
+          (this).GenExpr(_402_collection, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out334, out _out335, out _out336);
+          _406_collectionGen = _out334;
+          _407___v140 = _out335;
+          _408_recIdents = _out336;
+          Dafny.ISequence<DAST._IAttribute> _409_extraAttributes;
+          _409_extraAttributes = Dafny.Sequence<DAST._IAttribute>.FromElements();
+          if ((((((_402_collection).is_IntRange) || ((_402_collection).is_UnboundedIntRange)) || ((_402_collection).is_SeqBoundedPool)) || ((_402_collection).is_ExactBoundedPool)) || ((_402_collection).is_MultisetBoundedPool)) {
+            _409_extraAttributes = Dafny.Sequence<DAST._IAttribute>.FromElements(Defs.__default.AttributeOwned);
+          }
+          if ((_404_lambda).is_Lambda) {
+            Dafny.ISequence<DAST._IFormal> _410_formals;
+            _410_formals = (_404_lambda).dtor_params;
+            Dafny.ISequence<DAST._IFormal> _411_newFormals;
+            _411_newFormals = Dafny.Sequence<DAST._IFormal>.FromElements();
+            BigInteger _hi15 = new BigInteger((_410_formals).Count);
+            for (BigInteger _412_i = BigInteger.Zero; _412_i < _hi15; _412_i++) {
+              var _pat_let_tv0 = _409_extraAttributes;
+              var _pat_let_tv1 = _410_formals;
+              _411_newFormals = Dafny.Sequence<DAST._IFormal>.Concat(_411_newFormals, Dafny.Sequence<DAST._IFormal>.FromElements(Dafny.Helpers.Let<DAST._IFormal, DAST._IFormal>((_410_formals).Select(_412_i), _pat_let28_0 => Dafny.Helpers.Let<DAST._IFormal, DAST._IFormal>(_pat_let28_0, _413_dt__update__tmp_h0 => Dafny.Helpers.Let<Dafny.ISequence<DAST._IAttribute>, DAST._IFormal>(Dafny.Sequence<DAST._IAttribute>.Concat(_pat_let_tv0, ((_pat_let_tv1).Select(_412_i)).dtor_attributes), _pat_let29_0 => Dafny.Helpers.Let<Dafny.ISequence<DAST._IAttribute>, DAST._IFormal>(_pat_let29_0, _414_dt__update_hattributes_h0 => DAST.Formal.create((_413_dt__update__tmp_h0).dtor_name, (_413_dt__update__tmp_h0).dtor_typ, _414_dt__update_hattributes_h0)))))));
+            }
+            DAST._IExpression _415_newLambda;
+            DAST._IExpression _416_dt__update__tmp_h1 = _404_lambda;
+            Dafny.ISequence<DAST._IFormal> _417_dt__update_hparams_h0 = _411_newFormals;
+            _415_newLambda = DAST.Expression.create_Lambda(_417_dt__update_hparams_h0, (_416_dt__update__tmp_h1).dtor_retType, (_416_dt__update__tmp_h1).dtor_body);
+            RAST._IExpr _418_lambdaGen;
+            Defs._IOwnership _419___v141;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _420_recLambdaIdents;
+            RAST._IExpr _out337;
+            Defs._IOwnership _out338;
+            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out339;
+            (this).GenExpr(_415_newLambda, selfIdent, env, Defs.Ownership.create_OwnershipOwned(), out _out337, out _out338, out _out339);
+            _418_lambdaGen = _out337;
+            _419___v141 = _out338;
+            _420_recLambdaIdents = _out339;
+            Dafny.ISequence<Dafny.Rune> _421_fn;
+            if (_403_is__forall) {
+              _421_fn = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("all");
+            } else {
+              _421_fn = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("any");
+            }
+            r = ((_406_collectionGen).Sel(_421_fn)).Apply1(((_418_lambdaGen).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("as_ref"))).Apply0());
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_408_recIdents, _420_recLambdaIdents);
+          } else {
+            RAST._IExpr _out340;
+            _out340 = (this).Error(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Quantifier without an inline lambda"), (this).InitEmptyExpr());
+            r = _out340;
+            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
+          }
+          RAST._IExpr _out341;
+          Defs._IOwnership _out342;
+          (this).FromOwned(r, expectedOwnership, out _out341, out _out342);
+          r = _out341;
+          resultingOwnership = _out342;
+        }
+      }
+    after_match0: ;
+    }
+    public RAST._IExpr InitEmptyExpr() {
+      return RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+    }
+    public RAST._IExpr Error(Dafny.ISequence<Dafny.Rune> message, RAST._IExpr defaultExpr)
+    {
+      RAST._IExpr r = RAST.Expr.Default();
+      if ((this.error).is_None) {
+        (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(message);
+      }
+      r = RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("/*"), message), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*/")), defaultExpr, DAST.Format.UnaryOpFormat.create_NoFormat());
+      return r;
+    }
+    public Dafny.ISequence<Dafny.Rune> Compile(Dafny.ISequence<DAST._IModule> p, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> externalFiles)
+    {
+      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
+      s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#![allow(warnings, unconditional_panic)]\n");
+      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#![allow(nonstandard_style)]\n"));
+      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#![cfg_attr(any(), rustfmt::skip)]\n"));
+      Dafny.ISequence<RAST._IModDecl> _0_externUseDecls;
+      _0_externUseDecls = Dafny.Sequence<RAST._IModDecl>.FromElements();
+      BigInteger _hi0 = new BigInteger((externalFiles).Count);
+      for (BigInteger _1_i = BigInteger.Zero; _1_i < _hi0; _1_i++) {
+        Dafny.ISequence<Dafny.Rune> _2_externalFile;
+        _2_externalFile = (externalFiles).Select(_1_i);
+        Dafny.ISequence<Dafny.Rune> _3_externalMod;
+        _3_externalMod = _2_externalFile;
+        if (((new BigInteger((_2_externalFile).Count)) > (new BigInteger(3))) && (((_2_externalFile).Drop((new BigInteger((_2_externalFile).Count)) - (new BigInteger(3)))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".rs")))) {
+          _3_externalMod = (_2_externalFile).Subsequence(BigInteger.Zero, (new BigInteger((_2_externalFile).Count)) - (new BigInteger(3)));
+        } else {
+          (this).error = Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Unrecognized external file "), _2_externalFile), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(". External file must be *.rs files")));
+        }
+        if (((this).rootType).is_RootCrate) {
+          RAST._IMod _4_externMod;
+          _4_externMod = RAST.Mod.create_ExternMod(_3_externalMod);
+          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, (_4_externMod)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"));
+        }
+        _0_externUseDecls = Dafny.Sequence<RAST._IModDecl>.Concat(_0_externUseDecls, Dafny.Sequence<RAST._IModDecl>.FromElements(RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), ((RAST.__default.crate).MSel(_3_externalMod)).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*"))))));
+      }
+      if (!(_0_externUseDecls).Equals(Dafny.Sequence<RAST._IModDecl>.FromElements())) {
+        s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, (RAST.Mod.create_Mod(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Flattens all imported externs so that they can be accessed from this module"), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Defs.__default.DAFNY__EXTERN__MODULE, _0_externUseDecls))._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"));
+      }
+      DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> _5_allModules;
+      _5_allModules = DafnyCompilerRustUtils.SeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Empty();
+      BigInteger _hi1 = new BigInteger((p).Count);
+      for (BigInteger _6_i = BigInteger.Zero; _6_i < _hi1; _6_i++) {
+        DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> _7_m;
+        DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> _out0;
+        _out0 = (this).GenModule((p).Select(_6_i), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements());
+        _7_m = _out0;
+        _5_allModules = DafnyCompilerRustUtils.GatheringModule.MergeSeqMap(_5_allModules, _7_m);
+      }
+      BigInteger _hi2 = new BigInteger(((_5_allModules).dtor_keys).Count);
+      for (BigInteger _8_i = BigInteger.Zero; _8_i < _hi2; _8_i++) {
+        if (!((_5_allModules).dtor_values).Contains(((_5_allModules).dtor_keys).Select(_8_i))) {
+          goto continue_0;
+        }
+        RAST._IMod _9_m;
+        _9_m = (Dafny.Map<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Select((_5_allModules).dtor_values,((_5_allModules).dtor_keys).Select(_8_i))).ToRust();
+        BigInteger _hi3 = new BigInteger((this.optimizations).Count);
+        for (BigInteger _10_j = BigInteger.Zero; _10_j < _hi3; _10_j++) {
+          _9_m = Dafny.Helpers.Id<Func<RAST._IMod, RAST._IMod>>((this.optimizations).Select(_10_j))(_9_m);
+        }
+        s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"));
+        s = Dafny.Sequence<Dafny.Rune>.Concat(s, (_9_m)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")));
+      continue_0: ;
+      }
+    after_0: ;
+      return s;
+    }
+    public Dafny.ISequence<Dafny.Rune> EmitCallToMain(DAST._IExpression companion, Dafny.ISequence<Dafny.Rune> mainMethodName, bool hasArgs)
+    {
+      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
+      s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\nfn main() {");
+      if (hasArgs) {
+        s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(@"
+  let args: Vec<String> = ::std::env::args().collect();
+  let dafny_args =
+    ::dafny_runtime::dafny_runtime_conversions::vec_to_dafny_sequence(
+    &args, |s| 
+  ::dafny_runtime::dafny_runtime_conversions::")), (this).conversions), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(@"::string_to_dafny_string(s));
+  "));
+      }
+      RAST._IExpr _0_call;
+      Defs._IOwnership _1___v142;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _2___v143;
+      RAST._IExpr _out0;
+      Defs._IOwnership _out1;
+      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out2;
+      (this).GenExpr(companion, Defs.SelfInfo.create_NoSelf(), Defs.Environment.Empty(), Defs.Ownership.create_OwnershipOwned(), out _out0, out _out1, out _out2);
+      _0_call = _out0;
+      _1___v142 = _out1;
+      _2___v143 = _out2;
+      _0_call = (_0_call).FSel(mainMethodName);
+      if (hasArgs) {
+        _0_call = (_0_call).Apply1(RAST.__default.Borrow(RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dafny_args"))));
+      } else {
+        _0_call = (_0_call).Apply(Dafny.Sequence<RAST._IExpr>.FromElements());
+      }
+      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, (_0_call)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";\n}"));
+      return s;
+    }
+    public Defs._IRootType _rootType {get; set;}
+    public Defs._IRootType rootType { get {
+      return this._rootType;
+    } }
+    public RAST._IPath thisFile { get {
+      if (((this).rootType).is_RootCrate) {
+        return RAST.__default.crate;
+      } else {
+        return (RAST.__default.crate).MSel(((this).rootType).dtor_moduleName);
+      }
+    } }
+    public Defs._ICharType _charType {get; set;}
+    public Defs._ICharType charType { get {
+      return this._charType;
+    } }
+    public Dafny.ISequence<Dafny.Rune> DafnyChar { get {
+      if (((this).charType).is_UTF32) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyChar");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyCharUTF16");
+      }
+    } }
+    public Dafny.ISequence<Dafny.Rune> conversions { get {
+      if (((this).charType).is_UTF32) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unicode_chars_true");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unicode_chars_false");
+      }
+    } }
+    public RAST._IType DafnyCharUnderlying { get {
+      if (((this).charType).is_UTF32) {
+        return RAST.__default.RawType(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("char"));
+      } else {
+        return RAST.__default.RawType(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u16"));
+      }
+    } }
+    public Dafny.ISequence<Dafny.Rune> string__of { get {
+      if (((this).charType).is_UTF32) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("string_of");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("string_utf16_of");
+      }
+    } }
+    public Defs._IPointerType _pointerType {get; set;}
+    public Defs._IPointerType pointerType { get {
+      return this._pointerType;
+    } }
+    public Dafny.ISequence<Dafny.Rune> allocate { get {
+      if (((this).pointerType).is_Raw) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("allocate");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("allocate_object");
+      }
+    } }
+    public Dafny.ISequence<Dafny.Rune> allocate__fn { get {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"), (this).allocate);
+    } }
+    public Dafny.ISequence<Dafny.Rune> update__field__uninit__macro { get {
+      if (((this).pointerType).is_Raw) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("update_field_uninit!");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("update_field_uninit_object!");
+      }
+    } }
+    public Dafny.ISequence<Dafny.Rune> update__field__mut__uninit__macro { get {
+      if (((this).pointerType).is_Raw) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("update_field_mut_uninit!");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("update_field_mut_uninit_object!");
+      }
+    } }
+    public RAST._IExpr thisInConstructor { get {
+      if (((this).pointerType).is_Raw) {
+        return RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this"));
+      } else {
+        return (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this"))).Clone();
+      }
+    } }
+    public Dafny.ISequence<Dafny.Rune> array__construct { get {
+      if (((this).pointerType).is_Raw) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("construct");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("construct_object");
+      }
+    } }
+    public RAST._IExpr modify__macro { get {
+      return ((RAST.__default.dafny__runtime).MSel(((((this).pointerType).is_Raw) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("modify!")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("md!"))))).AsExpr();
+    } }
+    public RAST._IExpr read__macro { get {
+      return ((RAST.__default.dafny__runtime).MSel(((((this).pointerType).is_Raw) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("read!")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("rd!"))))).AsExpr();
+    } }
+    public Dafny.ISequence<Dafny.Rune> placebos__usize { get {
+      if (((this).pointerType).is_Raw) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("placebos_usize");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("placebos_usize_object");
+      }
+    } }
+    public Dafny.ISequence<Dafny.Rune> update__field__if__uninit__macro { get {
+      if (((this).pointerType).is_Raw) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("update_field_if_uninit!");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("update_field_if_uninit_object!");
+      }
+    } }
+    public Dafny.ISequence<Dafny.Rune> update__field__mut__if__uninit__macro { get {
+      if (((this).pointerType).is_Raw) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("update_field_mut_if_uninit!");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("update_field_mut_if_uninit_object!");
+      }
+    } }
+    public Dafny.ISequence<Dafny.Rune> Upcast { get {
+      if (((this).pointerType).is_Raw) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Upcast");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("UpcastObject");
+      }
+    } }
+    public Dafny.ISequence<Dafny.Rune> UpcastFnMacro { get {
+      return Dafny.Sequence<Dafny.Rune>.Concat((this).Upcast, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Fn!"));
+    } }
+    public Dafny.ISequence<Dafny.Rune> upcast { get {
+      if (((this).pointerType).is_Raw) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("upcast");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("upcast_object");
+      }
+    } }
+    public Dafny.ISequence<Dafny.Rune> downcast { get {
+      if (((this).pointerType).is_Raw) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("cast!");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("cast_object!");
+      }
+    } }
+    public RAST._IExpr read__mutable__field__macro { get {
+      return ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("read_field!"))).AsExpr();
+    } }
+    public RAST._IExpr modify__mutable__field__macro { get {
+      return ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("modify_field!"))).AsExpr();
+    } }
+  }
+} // end of namespace DCOMP
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/DafnyCompilerRustUtils.cs b/Source/DafnyCore/GeneratedFromDafny/DafnyCompilerRustUtils.cs
new file mode 100644
index 00000000000..e83a87fbeb1
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/DafnyCompilerRustUtils.cs
@@ -0,0 +1,328 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace DafnyCompilerRustUtils {
+
+  public partial class __default {
+    public static _System._ITuple2<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>> DafnyNameToContainingPathAndName(Dafny.ISequence<Dafny.Rune> n, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> acc)
+    {
+    TAIL_CALL_START: ;
+      Dafny.ISequence<Dafny.Rune> _0_s = (n);
+      if ((new BigInteger((_0_s).Count)).Sign == 0) {
+        if ((new BigInteger((acc).Count)).Sign == 0) {
+          return _System.Tuple2<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+        } else {
+          return _System.Tuple2<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>>.create((acc).Subsequence(BigInteger.Zero, (new BigInteger((acc).Count)) - (BigInteger.One)), ((acc).Select((new BigInteger((acc).Count)) - (BigInteger.One))));
+        }
+      } else if (((_0_s).Select(BigInteger.Zero)) != (new Dafny.Rune('.'))) {
+        if ((new BigInteger((acc).Count)).Sign == 0) {
+          Dafny.ISequence<Dafny.Rune> _in0 = (_0_s).Drop(BigInteger.One);
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _in1 = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((_0_s).Subsequence(BigInteger.Zero, BigInteger.One));
+          n = _in0;
+          acc = _in1;
+          goto TAIL_CALL_START;
+        } else {
+          Dafny.ISequence<Dafny.Rune> _in2 = (_0_s).Drop(BigInteger.One);
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _in3 = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat((acc).Subsequence(BigInteger.Zero, (new BigInteger((acc).Count)) - (BigInteger.One)), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.Concat((((acc).Select((new BigInteger((acc).Count)) - (BigInteger.One)))), Dafny.Sequence<Dafny.Rune>.FromElements((_0_s).Select(BigInteger.Zero)))));
+          n = _in2;
+          acc = _in3;
+          goto TAIL_CALL_START;
+        }
+      } else if ((new BigInteger((acc).Count)).Sign == 0) {
+        Dafny.ISequence<Dafny.Rune> _in4 = (_0_s).Drop(BigInteger.One);
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _in5 = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements();
+        n = _in4;
+        acc = _in5;
+        goto TAIL_CALL_START;
+      } else {
+        Dafny.ISequence<Dafny.Rune> _in6 = (_0_s).Drop(BigInteger.One);
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _in7 = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(acc, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")));
+        n = _in6;
+        acc = _in7;
+        goto TAIL_CALL_START;
+      }
+    }
+  }
+
+  public partial class ModWithBody {
+    private static readonly Dafny.TypeDescriptor<RAST._IMod> _TYPE = new Dafny.TypeDescriptor<RAST._IMod>(RAST.Mod.Default());
+    public static Dafny.TypeDescriptor<RAST._IMod> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static bool _Is(RAST._IMod __source) {
+      RAST._IMod _1_x = __source;
+      return (_1_x).is_Mod;
+    }
+  }
+
+  public partial class ExternMod {
+    private static readonly Dafny.TypeDescriptor<RAST._IMod> _TYPE = new Dafny.TypeDescriptor<RAST._IMod>(RAST.Mod.Default());
+    public static Dafny.TypeDescriptor<RAST._IMod> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static bool _Is(RAST._IMod __source) {
+      RAST._IMod _2_x = __source;
+      return (_2_x).is_ExternMod;
+    }
+  }
+
+  public interface _ISeqMap<K, V> {
+    bool is_SeqMap { get; }
+    Dafny.ISequence<K> dtor_keys { get; }
+    Dafny.IMap<K,V> dtor_values { get; }
+    _ISeqMap<__K, __V> DowncastClone<__K, __V>(Func<K, __K> converter0, Func<V, __V> converter1);
+  }
+  public class SeqMap<K, V> : _ISeqMap<K, V> {
+    public readonly Dafny.ISequence<K> _keys;
+    public readonly Dafny.IMap<K,V> _values;
+    public SeqMap(Dafny.ISequence<K> keys, Dafny.IMap<K,V> values) {
+      this._keys = keys;
+      this._values = values;
+    }
+    public _ISeqMap<__K, __V> DowncastClone<__K, __V>(Func<K, __K> converter0, Func<V, __V> converter1) {
+      if (this is _ISeqMap<__K, __V> dt) { return dt; }
+      return new SeqMap<__K, __V>((_keys).DowncastClone<__K>(Dafny.Helpers.CastConverter<K, __K>), (_values).DowncastClone<__K, __V>(Dafny.Helpers.CastConverter<K, __K>, Dafny.Helpers.CastConverter<V, __V>));
+    }
+    public override bool Equals(object other) {
+      var oth = other as DafnyCompilerRustUtils.SeqMap<K, V>;
+      return oth != null && object.Equals(this._keys, oth._keys) && object.Equals(this._values, oth._values);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._keys));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._values));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyCompilerRustUtils.SeqMap.SeqMap";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._keys);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._values);
+      s += ")";
+      return s;
+    }
+    public static DafnyCompilerRustUtils._ISeqMap<K, V> Default() {
+      return create(Dafny.Sequence<K>.Empty, Dafny.Map<K, V>.Empty);
+    }
+    public static Dafny.TypeDescriptor<DafnyCompilerRustUtils._ISeqMap<K, V>> _TypeDescriptor() {
+      return new Dafny.TypeDescriptor<DafnyCompilerRustUtils._ISeqMap<K, V>>(DafnyCompilerRustUtils.SeqMap<K, V>.Default());
+    }
+    public static _ISeqMap<K, V> create(Dafny.ISequence<K> keys, Dafny.IMap<K,V> values) {
+      return new SeqMap<K, V>(keys, values);
+    }
+    public static _ISeqMap<K, V> create_SeqMap(Dafny.ISequence<K> keys, Dafny.IMap<K,V> values) {
+      return create(keys, values);
+    }
+    public bool is_SeqMap { get { return true; } }
+    public Dafny.ISequence<K> dtor_keys {
+      get {
+        return this._keys;
+      }
+    }
+    public Dafny.IMap<K,V> dtor_values {
+      get {
+        return this._values;
+      }
+    }
+    public static DafnyCompilerRustUtils._ISeqMap<K, V> Empty() {
+      return DafnyCompilerRustUtils.SeqMap<K, V>.create(Dafny.Sequence<K>.FromElements(), Dafny.Map<K, V>.FromElements());
+    }
+    public static DafnyCompilerRustUtils._ISeqMap<K, V> Single(K key, V @value)
+    {
+      return DafnyCompilerRustUtils.SeqMap<K, V>.create(Dafny.Sequence<K>.FromElements(key), Dafny.Map<K, V>.FromElements(new Dafny.Pair<K, V>(key, @value)));
+    }
+  }
+
+  public interface _IGatheringModule {
+    bool is_GatheringModule { get; }
+    bool is_ExternMod { get; }
+    RAST._IMod dtor_existingMod { get; }
+    DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> dtor_submodules { get; }
+    RAST._IMod dtor_m { get; }
+    _IGatheringModule DowncastClone();
+    DafnyCompilerRustUtils._IGatheringModule Merge(DafnyCompilerRustUtils._IGatheringModule m2);
+    RAST._IMod ToRust();
+  }
+  public abstract class GatheringModule : _IGatheringModule {
+    public GatheringModule() {
+    }
+    private static readonly DafnyCompilerRustUtils._IGatheringModule theDefault = create_GatheringModule(RAST.Mod.Default(), DafnyCompilerRustUtils.SeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Default());
+    public static DafnyCompilerRustUtils._IGatheringModule Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<DafnyCompilerRustUtils._IGatheringModule> _TYPE = new Dafny.TypeDescriptor<DafnyCompilerRustUtils._IGatheringModule>(DafnyCompilerRustUtils.GatheringModule.Default());
+    public static Dafny.TypeDescriptor<DafnyCompilerRustUtils._IGatheringModule> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IGatheringModule create_GatheringModule(RAST._IMod existingMod, DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> submodules) {
+      return new GatheringModule_GatheringModule(existingMod, submodules);
+    }
+    public static _IGatheringModule create_ExternMod(RAST._IMod m) {
+      return new GatheringModule_ExternMod(m);
+    }
+    public bool is_GatheringModule { get { return this is GatheringModule_GatheringModule; } }
+    public bool is_ExternMod { get { return this is GatheringModule_ExternMod; } }
+    public RAST._IMod dtor_existingMod {
+      get {
+        var d = this;
+        return ((GatheringModule_GatheringModule)d)._existingMod;
+      }
+    }
+    public DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> dtor_submodules {
+      get {
+        var d = this;
+        return ((GatheringModule_GatheringModule)d)._submodules;
+      }
+    }
+    public RAST._IMod dtor_m {
+      get {
+        var d = this;
+        return ((GatheringModule_ExternMod)d)._m;
+      }
+    }
+    public abstract _IGatheringModule DowncastClone();
+    public static DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> MergeSeqMap(DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> m1, DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> m2)
+    {
+      return DafnyCompilerRustUtils.SeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.create(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat((m1).dtor_keys, Std.Collections.Seq.__default.Filter<Dafny.ISequence<Dafny.Rune>>(Dafny.Helpers.Id<Func<DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>, Func<Dafny.ISequence<Dafny.Rune>, bool>>>((_0_m1) => ((System.Func<Dafny.ISequence<Dafny.Rune>, bool>)((_1_k) => {
+  return !((_0_m1).dtor_keys).Contains(_1_k);
+})))(m1), (m2).dtor_keys)), Dafny.Helpers.Id<Func<DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>, DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>, Dafny.IMap<Dafny.ISequence<Dafny.Rune>,DafnyCompilerRustUtils._IGatheringModule>>>((_2_m1, _3_m2) => ((System.Func<Dafny.IMap<Dafny.ISequence<Dafny.Rune>,DafnyCompilerRustUtils._IGatheringModule>>)(() => {
+  var _coll0 = new System.Collections.Generic.List<Dafny.Pair<Dafny.ISequence<Dafny.Rune>,DafnyCompilerRustUtils._IGatheringModule>>();
+  foreach (Dafny.ISequence<Dafny.Rune> _compr_0 in (Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(((_2_m1).dtor_values).Keys, ((_3_m2).dtor_values).Keys)).Elements) {
+    Dafny.ISequence<Dafny.Rune> _4_k = (Dafny.ISequence<Dafny.Rune>)_compr_0;
+    if ((Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(((_2_m1).dtor_values).Keys, ((_3_m2).dtor_values).Keys)).Contains(_4_k)) {
+      _coll0.Add(new Dafny.Pair<Dafny.ISequence<Dafny.Rune>,DafnyCompilerRustUtils._IGatheringModule>(_4_k, ((((_2_m1).dtor_values).Contains(_4_k)) ? (((((_3_m2).dtor_values).Contains(_4_k)) ? ((Dafny.Map<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Select((_2_m1).dtor_values,_4_k)).Merge(Dafny.Map<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Select((_3_m2).dtor_values,_4_k))) : (Dafny.Map<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Select((_2_m1).dtor_values,_4_k)))) : (Dafny.Map<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Select((_3_m2).dtor_values,_4_k)))));
+    }
+  }
+  return Dafny.Map<Dafny.ISequence<Dafny.Rune>,DafnyCompilerRustUtils._IGatheringModule>.FromCollection(_coll0);
+}))())(m1, m2));
+    }
+    public static DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> MergeSeqMapAll(DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> m1, Dafny.ISequence<DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>> m2s)
+    {
+    TAIL_CALL_START: ;
+      if ((new BigInteger((m2s).Count)).Sign == 0) {
+        return m1;
+      } else {
+        DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> _in0 = DafnyCompilerRustUtils.GatheringModule.MergeSeqMap(m1, (m2s).Select(BigInteger.Zero));
+        Dafny.ISequence<DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>> _in1 = (m2s).Drop(BigInteger.One);
+        m1 = _in0;
+        m2s = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public DafnyCompilerRustUtils._IGatheringModule Merge(DafnyCompilerRustUtils._IGatheringModule m2) {
+      if (!((this).is_GatheringModule)) {
+        return m2;
+      } else if (!((m2).is_GatheringModule)) {
+        return this;
+      } else {
+        return DafnyCompilerRustUtils.GatheringModule.create_GatheringModule(RAST.Mod.create_Mod(Dafny.Sequence<Dafny.Rune>.Concat(((this).dtor_existingMod).dtor_docString, ((m2).dtor_existingMod).dtor_docString), ((this).dtor_existingMod).dtor_attributes, ((this).dtor_existingMod).dtor_name, Dafny.Sequence<RAST._IModDecl>.Concat(((this).dtor_existingMod).dtor_body, ((m2).dtor_existingMod).dtor_body)), DafnyCompilerRustUtils.GatheringModule.MergeSeqMap((this).dtor_submodules, (m2).dtor_submodules));
+      }
+    }
+    public static DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> Wrap(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> containingPath, RAST._IMod rawDecl)
+    {
+      if ((new BigInteger((containingPath).Count)).Sign == 0) {
+        Dafny.ISequence<Dafny.Rune> _0_name = (rawDecl).dtor_name;
+        if ((rawDecl).is_Mod) {
+          return DafnyCompilerRustUtils.SeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Single(_0_name, DafnyCompilerRustUtils.GatheringModule.create_GatheringModule(rawDecl, DafnyCompilerRustUtils.SeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Empty()));
+        } else {
+          return DafnyCompilerRustUtils.SeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Single(_0_name, DafnyCompilerRustUtils.GatheringModule.create_ExternMod(rawDecl));
+        }
+      } else {
+        Dafny.ISequence<Dafny.Rune> _1_enclosingModule = (containingPath).Select(BigInteger.Zero);
+        return DafnyCompilerRustUtils.SeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Single(_1_enclosingModule, DafnyCompilerRustUtils.GatheringModule.create_GatheringModule(RAST.Mod.create_Mod(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), _1_enclosingModule, Dafny.Sequence<RAST._IModDecl>.FromElements()), DafnyCompilerRustUtils.GatheringModule.Wrap((containingPath).Drop(BigInteger.One), rawDecl)));
+      }
+    }
+    public RAST._IMod ToRust() {
+      if ((this).is_ExternMod) {
+        return (this).dtor_m;
+      } else {
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _0_keysWithContent = Std.Collections.Seq.__default.Filter<Dafny.ISequence<Dafny.Rune>>(((System.Func<Dafny.ISequence<Dafny.Rune>, bool>)((_1_key) => {
+          return (((this).dtor_submodules).dtor_values).Contains(_1_key);
+        })), ((this).dtor_submodules).dtor_keys);
+        RAST._IMod _2_dt__update__tmp_h0 = (this).dtor_existingMod;
+        Dafny.ISequence<RAST._IModDecl> _3_dt__update_hbody_h0 = Dafny.Sequence<RAST._IModDecl>.Concat(((this).dtor_existingMod).dtor_body, ((System.Func<Dafny.ISequence<RAST._IModDecl>>) (() => {
+          BigInteger dim13 = new BigInteger((_0_keysWithContent).Count);
+          var arr13 = new RAST._IModDecl[Dafny.Helpers.ToIntChecked(dim13, "array size exceeds memory limit")];
+          for (int i13 = 0; i13 < dim13; i13++) {
+            var _4_i = (BigInteger) i13;
+            arr13[(int)(_4_i)] = Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, RAST._IModDecl>((_0_keysWithContent).Select(_4_i), _pat_let23_0 => Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, RAST._IModDecl>(_pat_let23_0, _5_moduleName => Dafny.Helpers.Let<RAST._IMod, RAST._IModDecl>((Dafny.Map<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule>.Select(((this).dtor_submodules).dtor_values,_5_moduleName)).ToRust(), _pat_let24_0 => Dafny.Helpers.Let<RAST._IMod, RAST._IModDecl>(_pat_let24_0, _6_submodule => RAST.ModDecl.create_ModDecl(_6_submodule)))));
+          }
+          return Dafny.Sequence<RAST._IModDecl>.FromArray(arr13);
+        }))());
+        return RAST.Mod.create_Mod((_2_dt__update__tmp_h0).dtor_docString, (_2_dt__update__tmp_h0).dtor_attributes, (_2_dt__update__tmp_h0).dtor_name, _3_dt__update_hbody_h0);
+      }
+    }
+  }
+  public class GatheringModule_GatheringModule : GatheringModule {
+    public readonly RAST._IMod _existingMod;
+    public readonly DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> _submodules;
+    public GatheringModule_GatheringModule(RAST._IMod existingMod, DafnyCompilerRustUtils._ISeqMap<Dafny.ISequence<Dafny.Rune>, DafnyCompilerRustUtils._IGatheringModule> submodules) : base() {
+      this._existingMod = existingMod;
+      this._submodules = submodules;
+    }
+    public override _IGatheringModule DowncastClone() {
+      if (this is _IGatheringModule dt) { return dt; }
+      return new GatheringModule_GatheringModule(_existingMod, _submodules);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DafnyCompilerRustUtils.GatheringModule_GatheringModule;
+      return oth != null && object.Equals(this._existingMod, oth._existingMod) && object.Equals(this._submodules, oth._submodules);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._existingMod));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._submodules));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyCompilerRustUtils.GatheringModule.GatheringModule";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._existingMod);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._submodules);
+      s += ")";
+      return s;
+    }
+  }
+  public class GatheringModule_ExternMod : GatheringModule {
+    public readonly RAST._IMod _m;
+    public GatheringModule_ExternMod(RAST._IMod m) : base() {
+      this._m = m;
+    }
+    public override _IGatheringModule DowncastClone() {
+      if (this is _IGatheringModule dt) { return dt; }
+      return new GatheringModule_ExternMod(_m);
+    }
+    public override bool Equals(object other) {
+      var oth = other as DafnyCompilerRustUtils.GatheringModule_ExternMod;
+      return oth != null && object.Equals(this._m, oth._m);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._m));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyCompilerRustUtils.GatheringModule.ExternMod";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._m);
+      s += ")";
+      return s;
+    }
+  }
+} // end of namespace DafnyCompilerRustUtils
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Defs.cs b/Source/DafnyCore/GeneratedFromDafny/Defs.cs
new file mode 100644
index 00000000000..e8e90c99a84
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Defs.cs
@@ -0,0 +1,1647 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Defs {
+
+  public partial class __default {
+    public static bool is__tuple__numeric(Dafny.ISequence<Dafny.Rune> i) {
+      return ((((new BigInteger((i).Count)) >= (new BigInteger(2))) && (((i).Select(BigInteger.Zero)) == (new Dafny.Rune('_')))) && ((Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0123456789")).Contains((i).Select(BigInteger.One)))) && (((new BigInteger((i).Count)) == (new BigInteger(2))) || (((new BigInteger((i).Count)) == (new BigInteger(3))) && ((Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0123456789")).Contains((i).Select(new BigInteger(2))))));
+    }
+    public static bool has__special(Dafny.ISequence<Dafny.Rune> i) {
+    TAIL_CALL_START: ;
+      if ((new BigInteger((i).Count)).Sign == 0) {
+        return false;
+      } else if (((i).Select(BigInteger.Zero)) == (new Dafny.Rune('.'))) {
+        return true;
+      } else if (((i).Select(BigInteger.Zero)) == (new Dafny.Rune('#'))) {
+        return true;
+      } else if (((i).Select(BigInteger.Zero)) == (new Dafny.Rune('_'))) {
+        if ((new BigInteger(2)) <= (new BigInteger((i).Count))) {
+          if (((i).Select(BigInteger.One)) == (new Dafny.Rune('_'))) {
+            Dafny.ISequence<Dafny.Rune> _in0 = (i).Drop(new BigInteger(2));
+            i = _in0;
+            goto TAIL_CALL_START;
+          } else {
+            return true;
+          }
+        } else {
+          return true;
+        }
+      } else {
+        Dafny.ISequence<Dafny.Rune> _in1 = (i).Drop(BigInteger.One);
+        i = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> idiomatic__rust(Dafny.ISequence<Dafny.Rune> i) {
+      Dafny.ISequence<Dafny.Rune> _0___accumulator = Dafny.Sequence<Dafny.Rune>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((i).Count)).Sign == 0) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+      } else if (((i).Select(BigInteger.Zero)) == (new Dafny.Rune('_'))) {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"));
+        Dafny.ISequence<Dafny.Rune> _in0 = (i).Drop(new BigInteger(2));
+        i = _in0;
+        goto TAIL_CALL_START;
+      } else {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.FromElements((i).Select(BigInteger.Zero)));
+        Dafny.ISequence<Dafny.Rune> _in1 = (i).Drop(BigInteger.One);
+        i = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> replaceDots(Dafny.ISequence<Dafny.Rune> i) {
+      Dafny.ISequence<Dafny.Rune> _0___accumulator = Dafny.Sequence<Dafny.Rune>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((i).Count)).Sign == 0) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+      } else if (((i).Select(BigInteger.Zero)) == (new Dafny.Rune('.'))) {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_d"));
+        Dafny.ISequence<Dafny.Rune> _in0 = (i).Drop(BigInteger.One);
+        i = _in0;
+        goto TAIL_CALL_START;
+      } else {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.FromElements((i).Select(BigInteger.Zero)));
+        Dafny.ISequence<Dafny.Rune> _in1 = (i).Drop(BigInteger.One);
+        i = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static bool is__tuple__builder(Dafny.ISequence<Dafny.Rune> i) {
+      return ((((new BigInteger((i).Count)) >= (new BigInteger(9))) && (((i).Take(new BigInteger(8))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("___hMake")))) && ((Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0123456789")).Contains((i).Select(new BigInteger(8))))) && (((new BigInteger((i).Count)) == (new BigInteger(9))) || (((new BigInteger((i).Count)) == (new BigInteger(10))) && ((Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0123456789")).Contains((i).Select(new BigInteger(9))))));
+    }
+    public static Dafny.ISequence<Dafny.Rune> better__tuple__builder__name(Dafny.ISequence<Dafny.Rune> i) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_T"), (i).Drop(new BigInteger(8)));
+    }
+    public static bool is__dafny__generated__id(Dafny.ISequence<Dafny.Rune> i) {
+      return (((((new BigInteger((i).Count)).Sign == 1) && (((i).Select(BigInteger.Zero)) == (new Dafny.Rune('_')))) && (!(Defs.__default.has__special((i).Drop(BigInteger.One))))) && ((!(i).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_self"))) && (!(i).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_Self"))))) && (!((new BigInteger((i).Count)) >= (new BigInteger(2))) || (((i).Select(BigInteger.One)) != (new Dafny.Rune('T'))));
+    }
+    public static bool is__idiomatic__rust__id(Dafny.ISequence<Dafny.Rune> i) {
+      return ((((new BigInteger((i).Count)).Sign == 1) && (!(Defs.__default.has__special(i)))) && (!(Defs.__default.reserved__rust).Contains(i))) && (!(Defs.__default.reserved__rust__need__prefix).Contains(i));
+    }
+    public static Dafny.ISequence<Dafny.Rune> escapeName(Dafny.ISequence<Dafny.Rune> n) {
+      return Defs.__default.escapeIdent((n));
+    }
+    public static Dafny.ISequence<Dafny.Rune> escapeIdent(Dafny.ISequence<Dafny.Rune> i) {
+      if (Defs.__default.is__tuple__numeric(i)) {
+        return i;
+      } else if (Defs.__default.is__tuple__builder(i)) {
+        return Defs.__default.better__tuple__builder__name(i);
+      } else if (((i).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"))) || ((i).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Self")))) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"), i);
+      } else if ((Defs.__default.reserved__rust).Contains(i)) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#"), i);
+      } else if (Defs.__default.is__idiomatic__rust__id(i)) {
+        return Defs.__default.idiomatic__rust(i);
+      } else if (Defs.__default.is__dafny__generated__id(i)) {
+        return i;
+      } else {
+        Dafny.ISequence<Dafny.Rune> _0_r = Defs.__default.replaceDots(i);
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"), _0_r);
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> escapeVar(Dafny.ISequence<Dafny.Rune> f) {
+      Dafny.ISequence<Dafny.Rune> _0_r = (f);
+      if ((Defs.__default.reserved__vars).Contains(_0_r)) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"), _0_r);
+      } else {
+        return Defs.__default.escapeIdent((f));
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> AddAssignedPrefix(Dafny.ISequence<Dafny.Rune> rustName) {
+      if (((new BigInteger((rustName).Count)) >= (new BigInteger(2))) && (((rustName).Subsequence(BigInteger.Zero, new BigInteger(2))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")))) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Defs.__default.ASSIGNED__PREFIX, (rustName).Drop(new BigInteger(2)));
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Defs.__default.ASSIGNED__PREFIX, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_")), rustName);
+      }
+    }
+    public static Std.Wrappers._IOption<DAST._IResolvedType> TraitTypeContainingMethodAux(Dafny.ISequence<DAST._IType> rs, Dafny.ISequence<Dafny.Rune> dafnyName)
+    {
+      if ((new BigInteger((rs).Count)).Sign == 0) {
+        return Std.Wrappers.Option<DAST._IResolvedType>.create_None();
+      } else {
+        Std.Wrappers._IOption<DAST._IResolvedType> _0_res = ((System.Func<Std.Wrappers._IOption<DAST._IResolvedType>>)(() => {
+          DAST._IType _source0 = (rs).Select(BigInteger.Zero);
+          {
+            if (_source0.is_UserDefined) {
+              DAST._IResolvedType _1_resolvedType = _source0.dtor_resolved;
+              return Defs.__default.TraitTypeContainingMethod(_1_resolvedType, dafnyName);
+            }
+          }
+          {
+            return Std.Wrappers.Option<DAST._IResolvedType>.create_None();
+          }
+        }))();
+        Std.Wrappers._IOption<DAST._IResolvedType> _source1 = _0_res;
+        {
+          if (_source1.is_Some) {
+            return _0_res;
+          }
+        }
+        {
+          return Defs.__default.TraitTypeContainingMethodAux((rs).Drop(BigInteger.One), dafnyName);
+        }
+      }
+    }
+    public static Std.Wrappers._IOption<DAST._IResolvedType> TraitTypeContainingMethod(DAST._IResolvedType r, Dafny.ISequence<Dafny.Rune> dafnyName)
+    {
+      DAST._IResolvedType _let_tmp_rhs0 = r;
+      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _0_path = _let_tmp_rhs0.dtor_path;
+      Dafny.ISequence<DAST._IType> _1_typeArgs = _let_tmp_rhs0.dtor_typeArgs;
+      DAST._IResolvedTypeBase _2_kind = _let_tmp_rhs0.dtor_kind;
+      Dafny.ISequence<DAST._IAttribute> _3_attributes = _let_tmp_rhs0.dtor_attributes;
+      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _4_properMethods = _let_tmp_rhs0.dtor_properMethods;
+      Dafny.ISequence<DAST._IType> _5_extendedTypes = _let_tmp_rhs0.dtor_extendedTypes;
+      if ((_4_properMethods).Contains(dafnyName)) {
+        return Std.Wrappers.Option<DAST._IResolvedType>.create_Some(r);
+      } else {
+        return Defs.__default.TraitTypeContainingMethodAux(_5_extendedTypes, dafnyName);
+      }
+    }
+    public static Std.Wrappers._IOption<Defs._IExternAttribute> OptExtern(DAST._IAttribute attr, Dafny.ISequence<Dafny.Rune> dafnyName)
+    {
+      if (((attr).dtor_name).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("extern"))) {
+        return Std.Wrappers.Option<Defs._IExternAttribute>.create_Some((((new BigInteger(((attr).dtor_args).Count)).Sign == 0) ? (Defs.ExternAttribute.create_SimpleExtern(Defs.__default.escapeName(dafnyName))) : ((((new BigInteger(((attr).dtor_args).Count)) == (BigInteger.One)) ? (Defs.ExternAttribute.create_SimpleExtern(((attr).dtor_args).Select(BigInteger.Zero))) : ((((new BigInteger(((attr).dtor_args).Count)) == (new BigInteger(2))) ? (Defs.ExternAttribute.create_AdvancedExtern(Defs.__default.SplitRustPathElement(Defs.__default.ReplaceDotByDoubleColon(((attr).dtor_args).Select(BigInteger.Zero)), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")), ((attr).dtor_args).Select(BigInteger.One))) : (Defs.ExternAttribute.create_UnsupportedExtern(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{:extern} supports only 0, 1 or 2 attributes, got "), Std.Strings.__default.OfNat(new BigInteger(((attr).dtor_args).Count)))))))))));
+      } else {
+        return Std.Wrappers.Option<Defs._IExternAttribute>.create_None();
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> ReplaceDotByDoubleColon(Dafny.ISequence<Dafny.Rune> s) {
+      Dafny.ISequence<Dafny.Rune> _0___accumulator = Dafny.Sequence<Dafny.Rune>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((s).Count)).Sign == 0) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+      } else if (((s).Select(BigInteger.Zero)) == (new Dafny.Rune(' '))) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, s);
+      } else {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, ((((s).Select(BigInteger.Zero)) == (new Dafny.Rune('.'))) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")) : (Dafny.Sequence<Dafny.Rune>.FromElements((s).Select(BigInteger.Zero)))));
+        Dafny.ISequence<Dafny.Rune> _in0 = (s).Drop(BigInteger.One);
+        s = _in0;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> SplitRustPathElement(Dafny.ISequence<Dafny.Rune> s, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> result, Dafny.ISequence<Dafny.Rune> acc)
+    {
+    TAIL_CALL_START: ;
+      if ((new BigInteger((s).Count)).Sign == 0) {
+        if ((acc).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))) {
+          return result;
+        } else {
+          return Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(result, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(acc));
+        }
+      } else if (((new BigInteger((s).Count)) >= (new BigInteger(2))) && (((s).Subsequence(BigInteger.Zero, new BigInteger(2))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")))) {
+        Dafny.ISequence<Dafny.Rune> _in0 = (s).Drop(new BigInteger(2));
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _in1 = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(result, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(acc));
+        Dafny.ISequence<Dafny.Rune> _in2 = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+        s = _in0;
+        result = _in1;
+        acc = _in2;
+        goto TAIL_CALL_START;
+      } else {
+        Dafny.ISequence<Dafny.Rune> _in3 = (s).Drop(BigInteger.One);
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _in4 = result;
+        Dafny.ISequence<Dafny.Rune> _in5 = Dafny.Sequence<Dafny.Rune>.Concat(acc, Dafny.Sequence<Dafny.Rune>.FromElements((s).Select(BigInteger.Zero)));
+        s = _in3;
+        result = _in4;
+        acc = _in5;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Defs._IExternAttribute ExtractExtern(Dafny.ISequence<DAST._IAttribute> attributes, Dafny.ISequence<Dafny.Rune> dafnyName)
+    {
+      Defs._IExternAttribute res = Defs.ExternAttribute.Default();
+      BigInteger _hi0 = new BigInteger((attributes).Count);
+      for (BigInteger _0_i = BigInteger.Zero; _0_i < _hi0; _0_i++) {
+        Std.Wrappers._IOption<Defs._IExternAttribute> _1_attr;
+        _1_attr = Defs.__default.OptExtern((attributes).Select(_0_i), dafnyName);
+        Std.Wrappers._IOption<Defs._IExternAttribute> _source0 = _1_attr;
+        {
+          if (_source0.is_Some) {
+            Defs._IExternAttribute _2_n = _source0.dtor_value;
+            res = _2_n;
+            return res;
+            goto after_match0;
+          }
+        }
+        {
+        }
+      after_match0: ;
+      }
+      res = Defs.ExternAttribute.create_NoExtern();
+      return res;
+    }
+    public static Defs._IExternAttribute ExtractExternMod(DAST._IModule mod) {
+      return Defs.__default.ExtractExtern((mod).dtor_attributes, (mod).dtor_name);
+    }
+    public static Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> ContainingPathToRust(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> containingPath) {
+      return Std.Collections.Seq.__default.Map<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(((System.Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>)((_0_i) => {
+        return Defs.__default.escapeName((_0_i));
+      })), containingPath);
+    }
+    public static RAST._IType AddOverflow(RAST._IType tpe, bool overflow)
+    {
+      if (!(overflow)) {
+        return tpe;
+      } else {
+        return RAST.Type.create_TMetaData(tpe, true, true);
+      }
+    }
+    public static Std.Wrappers._IOption<RAST._IType> NewtypeRangeToUnwrappedBoundedRustType(DAST._IType @base, DAST._INewtypeRange range)
+    {
+      if ((@base).IsPrimitiveInt()) {
+        return Defs.__default.NewtypeRangeToRustType(range);
+      } else {
+        return Std.Wrappers.Option<RAST._IType>.create_None();
+      }
+    }
+    public static Std.Wrappers._IOption<RAST._IType> NewtypeRangeToRustType(DAST._INewtypeRange range) {
+      DAST._INewtypeRange _source0 = range;
+      {
+        if (_source0.is_NoRange) {
+          return Std.Wrappers.Option<RAST._IType>.create_None();
+        }
+      }
+      {
+        if (_source0.is_U8) {
+          bool _0_overflow = _source0.dtor_overflow;
+          return Std.Wrappers.Option<RAST._IType>.create_Some(Defs.__default.AddOverflow(RAST.Type.create_U8(), _0_overflow));
+        }
+      }
+      {
+        if (_source0.is_U16) {
+          bool _1_overflow = _source0.dtor_overflow;
+          return Std.Wrappers.Option<RAST._IType>.create_Some(Defs.__default.AddOverflow(RAST.Type.create_U16(), _1_overflow));
+        }
+      }
+      {
+        if (_source0.is_U32) {
+          bool _2_overflow = _source0.dtor_overflow;
+          return Std.Wrappers.Option<RAST._IType>.create_Some(Defs.__default.AddOverflow(RAST.Type.create_U32(), _2_overflow));
+        }
+      }
+      {
+        if (_source0.is_U64) {
+          bool _3_overflow = _source0.dtor_overflow;
+          return Std.Wrappers.Option<RAST._IType>.create_Some(Defs.__default.AddOverflow(RAST.Type.create_U64(), _3_overflow));
+        }
+      }
+      {
+        if (_source0.is_U128) {
+          bool _4_overflow = _source0.dtor_overflow;
+          return Std.Wrappers.Option<RAST._IType>.create_Some(Defs.__default.AddOverflow(RAST.Type.create_U128(), _4_overflow));
+        }
+      }
+      {
+        if (_source0.is_I8) {
+          bool _5_overflow = _source0.dtor_overflow;
+          return Std.Wrappers.Option<RAST._IType>.create_Some(Defs.__default.AddOverflow(RAST.Type.create_I8(), _5_overflow));
+        }
+      }
+      {
+        if (_source0.is_I16) {
+          bool _6_overflow = _source0.dtor_overflow;
+          return Std.Wrappers.Option<RAST._IType>.create_Some(Defs.__default.AddOverflow(RAST.Type.create_I16(), _6_overflow));
+        }
+      }
+      {
+        if (_source0.is_I32) {
+          bool _7_overflow = _source0.dtor_overflow;
+          return Std.Wrappers.Option<RAST._IType>.create_Some(Defs.__default.AddOverflow(RAST.Type.create_I32(), _7_overflow));
+        }
+      }
+      {
+        if (_source0.is_I64) {
+          bool _8_overflow = _source0.dtor_overflow;
+          return Std.Wrappers.Option<RAST._IType>.create_Some(Defs.__default.AddOverflow(RAST.Type.create_I64(), _8_overflow));
+        }
+      }
+      {
+        if (_source0.is_I128) {
+          bool _9_overflow = _source0.dtor_overflow;
+          return Std.Wrappers.Option<RAST._IType>.create_Some(Defs.__default.AddOverflow(RAST.Type.create_I128(), _9_overflow));
+        }
+      }
+      {
+        if (_source0.is_NativeArrayIndex) {
+          return Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_USIZE());
+        }
+      }
+      {
+        if (_source0.is_Bool) {
+          return Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_Bool());
+        }
+      }
+      {
+        return Std.Wrappers.Option<RAST._IType>.create_None();
+      }
+    }
+    public static bool IsBooleanOperator(DAST._IBinOp op) {
+      return ((op).is_And) || ((op).is_Or);
+    }
+    public static bool IsComplexArithmetic(DAST._IBinOp op) {
+      return ((op).is_EuclidianDiv) || ((op).is_EuclidianMod);
+    }
+    public static Std.Wrappers._IOption<RAST._IType> GetUnwrappedBoundedRustType(DAST._IType tpe) {
+      DAST._IType _source0 = tpe;
+      {
+        if (_source0.is_UserDefined) {
+          DAST._IResolvedType resolved0 = _source0.dtor_resolved;
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _0_path = resolved0.dtor_path;
+          Dafny.ISequence<DAST._IType> _1_typeArgs = resolved0.dtor_typeArgs;
+          DAST._IResolvedTypeBase kind0 = resolved0.dtor_kind;
+          if (kind0.is_Newtype) {
+            DAST._IType _2_base = kind0.dtor_baseType;
+            DAST._INewtypeRange _3_range = kind0.dtor_range;
+            bool _4_erase = kind0.dtor_erase;
+            return Defs.__default.NewtypeRangeToUnwrappedBoundedRustType(_2_base, _3_range);
+          }
+        }
+      }
+      {
+        return Std.Wrappers.Option<RAST._IType>.create_None();
+      }
+    }
+    public static bool NeedsUnwrappingConversion(DAST._IType tpe) {
+      DAST._IType _source0 = tpe;
+      {
+        if (_source0.is_UserDefined) {
+          DAST._IResolvedType resolved0 = _source0.dtor_resolved;
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _0_path = resolved0.dtor_path;
+          Dafny.ISequence<DAST._IType> _1_typeArgs = resolved0.dtor_typeArgs;
+          DAST._IResolvedTypeBase kind0 = resolved0.dtor_kind;
+          if (kind0.is_Newtype) {
+            DAST._IType _2_base = kind0.dtor_baseType;
+            DAST._INewtypeRange _3_range = kind0.dtor_range;
+            bool _4_erase = kind0.dtor_erase;
+            return (Defs.__default.NewtypeRangeToUnwrappedBoundedRustType(_2_base, _3_range)).is_None;
+          }
+        }
+      }
+      {
+        return false;
+      }
+    }
+    public static bool IsNewtype(DAST._IType tpe) {
+      return ((tpe).is_UserDefined) && ((((tpe).dtor_resolved).dtor_kind).is_Newtype);
+    }
+    public static bool IsNewtypeCopy(DAST._INewtypeRange range) {
+      return ((Defs.__default.NewtypeRangeToRustType(range)).is_Some) && (((range).HasArithmeticOperations()) || ((range).is_Bool));
+    }
+    public static bool OwnershipGuarantee(Defs._IOwnership expectedOwnership, Defs._IOwnership resultingOwnership)
+    {
+      return (!(!object.Equals(expectedOwnership, Defs.Ownership.create_OwnershipAutoBorrowed())) || (object.Equals(resultingOwnership, expectedOwnership))) && (!object.Equals(resultingOwnership, Defs.Ownership.create_OwnershipAutoBorrowed()));
+    }
+    public static bool BecomesLeftCallsRight(DAST._IBinOp op) {
+      DAST._IBinOp _source0 = op;
+      {
+        bool disjunctiveMatch0 = false;
+        if (_source0.is_SetMerge) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_SetSubtraction) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_SetIntersection) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_SetDisjoint) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_MapMerge) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_MapSubtraction) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_MultisetMerge) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_MultisetSubtraction) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_MultisetIntersection) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_MultisetDisjoint) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_Concat) {
+          disjunctiveMatch0 = true;
+        }
+        if (disjunctiveMatch0) {
+          return true;
+        }
+      }
+      {
+        return false;
+      }
+    }
+    public static bool BecomesRightCallsLeft(DAST._IBinOp op) {
+      DAST._IBinOp _source0 = op;
+      {
+        if (_source0.is_In) {
+          return true;
+        }
+      }
+      {
+        return false;
+      }
+    }
+    public static RAST._IExpr UnreachablePanicIfVerified(Defs._IPointerType pointerType, Dafny.ISequence<Dafny.Rune> optText)
+    {
+      if ((pointerType).is_Raw) {
+        return RAST.__default.Unsafe(RAST.Expr.create_Block(((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("hint"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unreachable_unchecked"))).Apply0()));
+      } else if ((optText).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))) {
+        return (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("panic!"))).Apply0();
+      } else {
+        return (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("panic!"))).Apply1(RAST.Expr.create_LiteralString(optText, false, false));
+      }
+    }
+    public static RAST._IModDecl DefaultDatatypeImpl(Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls, RAST._IType datatypeType, RAST._IExpr datatypeName, Dafny.ISequence<RAST._IAssignIdentifier> structAssignments)
+    {
+      Dafny.ISequence<RAST._ITypeParamDecl> _0_defaultConstrainedTypeParams = RAST.TypeParamDecl.AddConstraintsMultiple(rTypeParamsDecls, Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.DefaultTrait));
+      return RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(_0_defaultConstrainedTypeParams, RAST.__default.DefaultTrait, datatypeType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("default"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(), Std.Wrappers.Option<RAST._IType>.create_Some(datatypeType), Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.Expr.create_StructBuild(datatypeName, structAssignments)))))));
+    }
+    public static RAST._IModDecl AsRefDatatypeImpl(Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls, RAST._IType datatypeType)
+    {
+      return RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(rTypeParamsDecls, ((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("convert"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("AsRef"))).AsType()).Apply1(datatypeType), datatypeType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("as_ref"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.SelfBorrowed), Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.__default.self))))));
+    }
+    public static RAST._IModDecl DebugImpl(Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls, RAST._IType datatypeType, Dafny.ISequence<RAST._IType> rTypeParams)
+    {
+      return RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(rTypeParamsDecls, (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Debug"))).AsType(), datatypeType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed, RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("f"), RAST.Type.create_BorrowedMut((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Formatter"))).AsType()))), Std.Wrappers.Option<RAST._IType>.create_Some((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Result"))).AsType()), Std.Wrappers.Option<RAST._IExpr>.create_Some(((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyPrint"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt_print"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.__default.self, RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("f")), RAST.Expr.create_LiteralBool(true)))))))));
+    }
+    public static RAST._IModDecl PrintImpl(Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls, RAST._IType datatypeType, Dafny.ISequence<RAST._IType> rTypeParams, RAST._IExpr printImplBody)
+    {
+      return RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(rTypeParamsDecls, RAST.__default.DafnyPrint, datatypeType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt_print"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed, RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_formatter"), RAST.Type.create_BorrowedMut((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fmt"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Formatter"))).AsType())), RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_in_seq"), RAST.Type.create_Bool())), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.RawType(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("std::fmt::Result"))), Std.Wrappers.Option<RAST._IExpr>.create_Some(printImplBody))))));
+    }
+    public static RAST._IModDecl CoerceImpl(Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls, Dafny.ISequence<Dafny.Rune> datatypeName, RAST._IType datatypeType, Dafny.ISequence<RAST._ITypeParamDecl> rCoerceTypeParams, Dafny.ISequence<RAST._IFormal> coerceArguments, Dafny.ISequence<RAST._IType> coerceTypes, RAST._IExpr coerceImplBody)
+    {
+      return RAST.ModDecl.create_ImplDecl(RAST.Impl.create_Impl(rTypeParamsDecls, datatypeType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Given type parameter conversions, returns a lambda to convert this structure"), RAST.__default.NoAttr, RAST.Visibility.create_PUB(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("coerce"), rCoerceTypeParams, coerceArguments, Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.Rc(RAST.Type.create_ImplType(RAST.Type.create_FnType(Dafny.Sequence<RAST._IType>.FromElements(datatypeType), RAST.Type.create_TypeApp(RAST.Type.create_TIdentifier(datatypeName), coerceTypes))))), Std.Wrappers.Option<RAST._IExpr>.create_Some(RAST.__default.RcNew(RAST.Expr.create_Lambda(Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("this"), RAST.__default.SelfOwned)), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.Type.create_TypeApp(RAST.Type.create_TIdentifier(datatypeName), coerceTypes)), coerceImplBody))))))));
+    }
+    public static RAST._IModDecl SingletonsImpl(Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls, RAST._IType datatypeType, RAST._IType instantiationType, Dafny.ISequence<RAST._IExpr> singletonConstructors)
+    {
+      return RAST.ModDecl.create_ImplDecl(RAST.Impl.create_Impl(rTypeParamsDecls, datatypeType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Enumerates all possible values of "), (datatypeType)._ToString(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), RAST.Visibility.create_PUB(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_AllSingletonConstructors"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(), Std.Wrappers.Option<RAST._IType>.create_Some((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("SequenceIter"))).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(instantiationType))), Std.Wrappers.Option<RAST._IExpr>.create_Some((((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("seq!"))).AsExpr()).Apply(singletonConstructors)).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("iter"))).Apply0()))))));
+    }
+    public static RAST._IModDecl HashImpl(Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDeclsWithHash, RAST._IType datatypeOrNewtypeType, RAST._IExpr hashImplBody)
+    {
+      return RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(rTypeParamsDeclsWithHash, RAST.__default.Hash, datatypeOrNewtypeType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("hash"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(RAST.TypeParamDecl.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_H"), Dafny.Sequence<RAST._IType>.FromElements((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("hash"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Hasher"))).AsType()))), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed, RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_state"), RAST.Type.create_BorrowedMut(RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_H"))))), Std.Wrappers.Option<RAST._IType>.create_None(), Std.Wrappers.Option<RAST._IExpr>.create_Some(hashImplBody))))));
+    }
+    public static RAST._IModDecl UnaryOpsImpl(Dafny.Rune op, Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls, RAST._IType newtypeType, Dafny.ISequence<Dafny.Rune> newtypeConstructor)
+    {
+      _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs0 = ((System.Func<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>>)(() => {
+        Dafny.Rune _source0 = op;
+        {
+          return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Not"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("not"));
+        }
+      }))();
+      Dafny.ISequence<Dafny.Rune> _0_traitName = _let_tmp_rhs0.dtor__0;
+      Dafny.ISequence<Dafny.Rune> _1_methodName = _let_tmp_rhs0.dtor__1;
+      return RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(rTypeParamsDecls, (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("ops"))).MSel(_0_traitName)).AsType(), newtypeType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_TypeDeclMember(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Output"), newtypeType), RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(_1_methodName, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfOwned), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.SelfOwned), Std.Wrappers.Option<RAST._IExpr>.create_Some((RAST.Expr.create_Identifier(newtypeConstructor)).Apply1(RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.FromElements(op), (RAST.__default.self).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")), DAST.Format.UnaryOpFormat.create_NoFormat()))))))));
+    }
+    public static RAST._IModDecl OpsImpl(Dafny.Rune op, Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls, RAST._IType newtypeType, Dafny.ISequence<Dafny.Rune> newtypeConstructor)
+    {
+      _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs0 = ((System.Func<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>>)(() => {
+        Dafny.Rune _source0 = op;
+        {
+          if ((_source0) == (new Dafny.Rune('+'))) {
+            return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Add"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("add"));
+          }
+        }
+        {
+          if ((_source0) == (new Dafny.Rune('-'))) {
+            return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Sub"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("sub"));
+          }
+        }
+        {
+          if ((_source0) == (new Dafny.Rune('/'))) {
+            return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Div"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("div"));
+          }
+        }
+        {
+          return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Mul"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("mul"));
+        }
+      }))();
+      Dafny.ISequence<Dafny.Rune> _0_traitName = _let_tmp_rhs0.dtor__0;
+      Dafny.ISequence<Dafny.Rune> _1_methodName = _let_tmp_rhs0.dtor__1;
+      return RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(rTypeParamsDecls, (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("ops"))).MSel(_0_traitName)).AsType(), newtypeType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_TypeDeclMember(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Output"), newtypeType), RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(_1_methodName, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfOwned, RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("other"), RAST.__default.SelfOwned)), Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.SelfOwned), Std.Wrappers.Option<RAST._IExpr>.create_Some((RAST.Expr.create_Identifier(newtypeConstructor)).Apply1(RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.FromElements(op), (RAST.__default.self).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")), (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("other"))).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")), DAST.Format.BinaryOpFormat.create_NoFormat()))))))));
+    }
+    public static RAST._IModDecl PartialOrdImpl(Dafny.ISequence<RAST._ITypeParamDecl> rTypeParamsDecls, RAST._IType newtypeType, Dafny.ISequence<Dafny.Rune> newtypeConstructor)
+    {
+      return RAST.ModDecl.create_ImplDecl(RAST.Impl.create_ImplFor(rTypeParamsDecls, (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("cmp"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("PartialOrd"))).AsType(), newtypeType, Dafny.Sequence<RAST._IImplMember>.FromElements(RAST.ImplMember.create_FnDecl(RAST.__default.NoDoc, RAST.__default.NoAttr, RAST.Visibility.create_PRIV(), RAST.Fn.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("partial_cmp"), Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(), Dafny.Sequence<RAST._IFormal>.FromElements(RAST.Formal.selfBorrowed, RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("other"), RAST.__default.SelfBorrowed)), Std.Wrappers.Option<RAST._IType>.create_Some(((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("option"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Option"))).AsType()).Apply1((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("cmp"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Ordering"))).AsType())), Std.Wrappers.Option<RAST._IExpr>.create_Some((((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("cmp"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("PartialOrd"))).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("partial_cmp"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(RAST.__default.Borrow((RAST.__default.self).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0"))), RAST.__default.Borrow((RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("other"))).Sel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")))))))))));
+    }
+    public static Defs._IAssignmentStatus DetectAssignmentStatus(Dafny.ISequence<DAST._IStatement> stmts__remainder, Dafny.ISequence<Dafny.Rune> dafny__name)
+    {
+      Defs._IAssignmentStatus _hresult = Defs.AssignmentStatus.Default();
+      BigInteger _hi0 = new BigInteger((stmts__remainder).Count);
+      for (BigInteger _0_i = BigInteger.Zero; _0_i < _hi0; _0_i++) {
+        DAST._IStatement _1_stmt;
+        _1_stmt = (stmts__remainder).Select(_0_i);
+        DAST._IStatement _source0 = _1_stmt;
+        {
+          if (_source0.is_Assign) {
+            DAST._IAssignLhs lhs0 = _source0.dtor_lhs;
+            if (lhs0.is_Ident) {
+              Dafny.ISequence<Dafny.Rune> _2_assign__name = lhs0.dtor_ident;
+              if (object.Equals(_2_assign__name, dafny__name)) {
+                _hresult = Defs.AssignmentStatus.create_SurelyAssigned();
+                return _hresult;
+              }
+              goto after_match0;
+            }
+          }
+        }
+        {
+          if (_source0.is_If) {
+            DAST._IExpression _3_cond = _source0.dtor_cond;
+            Dafny.ISequence<DAST._IStatement> _4_thn = _source0.dtor_thn;
+            Dafny.ISequence<DAST._IStatement> _5_els = _source0.dtor_els;
+            Defs._IAssignmentStatus _6_rec;
+            _6_rec = Defs.__default.DetectAssignmentStatus(_4_thn, dafny__name);
+            if (object.Equals(_6_rec, Defs.AssignmentStatus.create_Unknown())) {
+              _hresult = Defs.AssignmentStatus.create_Unknown();
+              return _hresult;
+            }
+            Defs._IAssignmentStatus _7_rec2;
+            _7_rec2 = Defs.__default.DetectAssignmentStatus(_5_els, dafny__name);
+            if (object.Equals(_7_rec2, Defs.AssignmentStatus.create_Unknown())) {
+              _hresult = Defs.AssignmentStatus.create_Unknown();
+              return _hresult;
+            }
+            if (!object.Equals(_6_rec, _7_rec2)) {
+              _hresult = Defs.AssignmentStatus.create_Unknown();
+              return _hresult;
+            }
+            if ((_6_rec).is_SurelyAssigned) {
+              _hresult = Defs.AssignmentStatus.create_SurelyAssigned();
+              return _hresult;
+            }
+            goto after_match0;
+          }
+        }
+        {
+          if (_source0.is_Call) {
+            DAST._IExpression _8_on = _source0.dtor_on;
+            DAST._ICallName _9_callName = _source0.dtor_callName;
+            Dafny.ISequence<DAST._IType> _10_typeArgs = _source0.dtor_typeArgs;
+            Dafny.ISequence<DAST._IExpression> _11_args = _source0.dtor_args;
+            Std.Wrappers._IOption<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _12_outs = _source0.dtor_outs;
+            if (((_12_outs).is_Some) && (((_12_outs).dtor_value).Contains(dafny__name))) {
+              _hresult = Defs.AssignmentStatus.create_SurelyAssigned();
+              return _hresult;
+            }
+            goto after_match0;
+          }
+        }
+        {
+          if (_source0.is_Labeled) {
+            Dafny.ISequence<DAST._IStatement> _13_stmts = _source0.dtor_body;
+            Defs._IAssignmentStatus _14_rec;
+            _14_rec = Defs.__default.DetectAssignmentStatus(_13_stmts, dafny__name);
+            if (!((_14_rec).is_NotAssigned)) {
+              _hresult = _14_rec;
+              return _hresult;
+            }
+            goto after_match0;
+          }
+        }
+        {
+          if (_source0.is_DeclareVar) {
+            Dafny.ISequence<Dafny.Rune> _15_name = _source0.dtor_name;
+            if (object.Equals(_15_name, dafny__name)) {
+              _hresult = Defs.AssignmentStatus.create_NotAssigned();
+              return _hresult;
+            }
+            goto after_match0;
+          }
+        }
+        {
+          bool disjunctiveMatch0 = false;
+          if (_source0.is_Return) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_EarlyReturn) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_JumpTailCallStart) {
+            disjunctiveMatch0 = true;
+          }
+          if (disjunctiveMatch0) {
+            _hresult = Defs.AssignmentStatus.create_NotAssigned();
+            return _hresult;
+            goto after_match0;
+          }
+        }
+        {
+          if (_source0.is_Print) {
+            goto after_match0;
+          }
+        }
+        {
+          _hresult = Defs.AssignmentStatus.create_Unknown();
+          return _hresult;
+        }
+      after_match0: ;
+      }
+      _hresult = Defs.AssignmentStatus.create_NotAssigned();
+      return _hresult;
+      return _hresult;
+    }
+    public static Dafny.ISet<Dafny.ISequence<Dafny.Rune>> reserved__rust { get {
+      return Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("as"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("async"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("await"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("break"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("const"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("continue"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("crate"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dyn"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("else"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("enum"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("extern"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("false"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fn"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("for"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("if"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("in"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("let"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("loop"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("match"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("mod"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("move"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("mut"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("ref"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("return"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("static"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("struct"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("super"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("trait"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("true"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("type"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("union"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unsafe"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("use"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("where"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("while"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Keywords"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("The"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("abstract"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("become"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("box"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("do"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("final"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("macro"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("override"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("priv"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("try"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("typeof"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unsized"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("virtual"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("yield"));
+    } }
+    public static Dafny.ISet<Dafny.ISequence<Dafny.Rune>> reserved__rust__need__prefix { get {
+      return Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u8"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u16"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u32"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u64"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u128"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i8"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i16"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i32"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i64"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i128"));
+    } }
+    public static Dafny.ISet<Dafny.ISequence<Dafny.Rune>> reserved__vars { get {
+      return Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("None"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("hash"));
+    } }
+    public static Dafny.ISequence<Dafny.Rune> ASSIGNED__PREFIX { get {
+      return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_set");
+    } }
+    public static Dafny.ISequence<Dafny.Rune> IND { get {
+      return RAST.__default.IND;
+    } }
+    public static Dafny.ISet<Dafny.ISequence<Dafny.Rune>> builtin__trait__preferred__methods { get {
+      return Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("le"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("eq"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("lt"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("ge"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("gt"));
+    } }
+    public static DAST._IAttribute AttributeOwned { get {
+      return DAST.Attribute.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("owned"), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements());
+    } }
+    public static Dafny.ISequence<Dafny.Rune> TailRecursionPrefix { get {
+      return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_r");
+    } }
+    public static Dafny.ISequence<Dafny.Rune> DAFNY__EXTERN__MODULE { get {
+      return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_dafny_externs");
+    } }
+    public static Dafny.IMap<DAST._IBinOp,Dafny.ISequence<Dafny.Rune>> OpTable { get {
+      return Dafny.Map<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>.FromElements(new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_Mod(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("%")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_And(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&&")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_Or(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("||")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_Div(false), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("/")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_Lt(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_LtChar(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_Plus(false), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("+")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_Minus(false), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("-")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_Times(false), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_BitwiseAnd(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_BitwiseOr(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("|")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_BitwiseXor(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("^")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_BitwiseShiftRight(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">>")), new Dafny.Pair<DAST._IBinOp, Dafny.ISequence<Dafny.Rune>>(DAST.BinOp.create_BitwiseShiftLeft(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<<")));
+    } }
+  }
+
+  public interface _IOwnership {
+    bool is_OwnershipOwned { get; }
+    bool is_OwnershipBorrowed { get; }
+    bool is_OwnershipBorrowedMut { get; }
+    bool is_OwnershipAutoBorrowed { get; }
+    _IOwnership DowncastClone();
+  }
+  public abstract class Ownership : _IOwnership {
+    public Ownership() {
+    }
+    private static readonly Defs._IOwnership theDefault = create_OwnershipOwned();
+    public static Defs._IOwnership Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Defs._IOwnership> _TYPE = new Dafny.TypeDescriptor<Defs._IOwnership>(Defs.Ownership.Default());
+    public static Dafny.TypeDescriptor<Defs._IOwnership> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IOwnership create_OwnershipOwned() {
+      return new Ownership_OwnershipOwned();
+    }
+    public static _IOwnership create_OwnershipBorrowed() {
+      return new Ownership_OwnershipBorrowed();
+    }
+    public static _IOwnership create_OwnershipBorrowedMut() {
+      return new Ownership_OwnershipBorrowedMut();
+    }
+    public static _IOwnership create_OwnershipAutoBorrowed() {
+      return new Ownership_OwnershipAutoBorrowed();
+    }
+    public bool is_OwnershipOwned { get { return this is Ownership_OwnershipOwned; } }
+    public bool is_OwnershipBorrowed { get { return this is Ownership_OwnershipBorrowed; } }
+    public bool is_OwnershipBorrowedMut { get { return this is Ownership_OwnershipBorrowedMut; } }
+    public bool is_OwnershipAutoBorrowed { get { return this is Ownership_OwnershipAutoBorrowed; } }
+    public static System.Collections.Generic.IEnumerable<_IOwnership> AllSingletonConstructors {
+      get {
+        yield return Ownership.create_OwnershipOwned();
+        yield return Ownership.create_OwnershipBorrowed();
+        yield return Ownership.create_OwnershipBorrowedMut();
+        yield return Ownership.create_OwnershipAutoBorrowed();
+      }
+    }
+    public abstract _IOwnership DowncastClone();
+  }
+  public class Ownership_OwnershipOwned : Ownership {
+    public Ownership_OwnershipOwned() : base() {
+    }
+    public override _IOwnership DowncastClone() {
+      if (this is _IOwnership dt) { return dt; }
+      return new Ownership_OwnershipOwned();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.Ownership_OwnershipOwned;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.Ownership.OwnershipOwned";
+      return s;
+    }
+  }
+  public class Ownership_OwnershipBorrowed : Ownership {
+    public Ownership_OwnershipBorrowed() : base() {
+    }
+    public override _IOwnership DowncastClone() {
+      if (this is _IOwnership dt) { return dt; }
+      return new Ownership_OwnershipBorrowed();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.Ownership_OwnershipBorrowed;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.Ownership.OwnershipBorrowed";
+      return s;
+    }
+  }
+  public class Ownership_OwnershipBorrowedMut : Ownership {
+    public Ownership_OwnershipBorrowedMut() : base() {
+    }
+    public override _IOwnership DowncastClone() {
+      if (this is _IOwnership dt) { return dt; }
+      return new Ownership_OwnershipBorrowedMut();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.Ownership_OwnershipBorrowedMut;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.Ownership.OwnershipBorrowedMut";
+      return s;
+    }
+  }
+  public class Ownership_OwnershipAutoBorrowed : Ownership {
+    public Ownership_OwnershipAutoBorrowed() : base() {
+    }
+    public override _IOwnership DowncastClone() {
+      if (this is _IOwnership dt) { return dt; }
+      return new Ownership_OwnershipAutoBorrowed();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.Ownership_OwnershipAutoBorrowed;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.Ownership.OwnershipAutoBorrowed";
+      return s;
+    }
+  }
+
+  public interface _IEnvironment {
+    bool is_Environment { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_names { get; }
+    Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> dtor_types { get; }
+    Dafny.ISet<Dafny.ISequence<Dafny.Rune>> dtor_assignmentStatusKnown { get; }
+    _IEnvironment DowncastClone();
+    Defs._IEnvironment ToOwned();
+    bool CanReadWithoutClone(Dafny.ISequence<Dafny.Rune> name);
+    bool HasCloneSemantics(Dafny.ISequence<Dafny.Rune> name);
+    Std.Wrappers._IOption<RAST._IType> GetType(Dafny.ISequence<Dafny.Rune> name);
+    bool IsBorrowed(Dafny.ISequence<Dafny.Rune> name);
+    bool IsBorrowedMut(Dafny.ISequence<Dafny.Rune> name);
+    bool IsBoxed(Dafny.ISequence<Dafny.Rune> name);
+    bool NeedsAsRefForBorrow(Dafny.ISequence<Dafny.Rune> name);
+    bool IsMaybePlacebo(Dafny.ISequence<Dafny.Rune> name);
+    Defs._IEnvironment AddAssigned(Dafny.ISequence<Dafny.Rune> name, RAST._IType tpe);
+    Defs._IEnvironment merge(Defs._IEnvironment other);
+    Defs._IEnvironment RemoveAssigned(Dafny.ISequence<Dafny.Rune> name);
+    Defs._IEnvironment AddAssignmentStatus(Dafny.ISequence<Dafny.Rune> name, Defs._IAssignmentStatus assignmentStatus);
+    bool IsAssignmentStatusKnown(Dafny.ISequence<Dafny.Rune> name);
+  }
+  public class Environment : _IEnvironment {
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _names;
+    public readonly Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> _types;
+    public readonly Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _assignmentStatusKnown;
+    public Environment(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> names, Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> types, Dafny.ISet<Dafny.ISequence<Dafny.Rune>> assignmentStatusKnown) {
+      this._names = names;
+      this._types = types;
+      this._assignmentStatusKnown = assignmentStatusKnown;
+    }
+    public _IEnvironment DowncastClone() {
+      if (this is _IEnvironment dt) { return dt; }
+      return new Environment(_names, _types, _assignmentStatusKnown);
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.Environment;
+      return oth != null && object.Equals(this._names, oth._names) && object.Equals(this._types, oth._types) && object.Equals(this._assignmentStatusKnown, oth._assignmentStatusKnown);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._names));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._types));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._assignmentStatusKnown));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.Environment.Environment";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._names);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._types);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._assignmentStatusKnown);
+      s += ")";
+      return s;
+    }
+    private static readonly Defs._IEnvironment theDefault = create(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Empty, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty);
+    public static Defs._IEnvironment Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Defs._IEnvironment> _TYPE = new Dafny.TypeDescriptor<Defs._IEnvironment>(Defs.Environment.Default());
+    public static Dafny.TypeDescriptor<Defs._IEnvironment> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IEnvironment create(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> names, Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> types, Dafny.ISet<Dafny.ISequence<Dafny.Rune>> assignmentStatusKnown) {
+      return new Environment(names, types, assignmentStatusKnown);
+    }
+    public static _IEnvironment create_Environment(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> names, Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> types, Dafny.ISet<Dafny.ISequence<Dafny.Rune>> assignmentStatusKnown) {
+      return create(names, types, assignmentStatusKnown);
+    }
+    public bool is_Environment { get { return true; } }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_names {
+      get {
+        return this._names;
+      }
+    }
+    public Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> dtor_types {
+      get {
+        return this._types;
+      }
+    }
+    public Dafny.ISet<Dafny.ISequence<Dafny.Rune>> dtor_assignmentStatusKnown {
+      get {
+        return this._assignmentStatusKnown;
+      }
+    }
+    public Defs._IEnvironment ToOwned() {
+      Defs._IEnvironment _0_dt__update__tmp_h0 = this;
+      Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType> _1_dt__update_htypes_h0 = ((System.Func<Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IType>>)(() => {
+        var _coll0 = new System.Collections.Generic.List<Dafny.Pair<Dafny.ISequence<Dafny.Rune>,RAST._IType>>();
+        foreach (Dafny.ISequence<Dafny.Rune> _compr_0 in ((this).dtor_types).Keys.Elements) {
+          Dafny.ISequence<Dafny.Rune> _2_k = (Dafny.ISequence<Dafny.Rune>)_compr_0;
+          if (((this).dtor_types).Contains(_2_k)) {
+            _coll0.Add(new Dafny.Pair<Dafny.ISequence<Dafny.Rune>,RAST._IType>(_2_k, (Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Select((this).dtor_types,_2_k)).ToOwned()));
+          }
+        }
+        return Dafny.Map<Dafny.ISequence<Dafny.Rune>,RAST._IType>.FromCollection(_coll0);
+      }))();
+      return Defs.Environment.create((_0_dt__update__tmp_h0).dtor_names, _1_dt__update_htypes_h0, (_0_dt__update__tmp_h0).dtor_assignmentStatusKnown);
+    }
+    public static Defs._IEnvironment Empty() {
+      return Defs.Environment.create(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.FromElements(), Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements());
+    }
+    public bool CanReadWithoutClone(Dafny.ISequence<Dafny.Rune> name) {
+      return (((this).dtor_types).Contains(name)) && ((Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Select((this).dtor_types,name)).CanReadWithoutClone());
+    }
+    public bool HasCloneSemantics(Dafny.ISequence<Dafny.Rune> name) {
+      return !((this).CanReadWithoutClone(name));
+    }
+    public Std.Wrappers._IOption<RAST._IType> GetType(Dafny.ISequence<Dafny.Rune> name) {
+      if (((this).dtor_types).Contains(name)) {
+        return Std.Wrappers.Option<RAST._IType>.create_Some(Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Select((this).dtor_types,name));
+      } else {
+        return Std.Wrappers.Option<RAST._IType>.create_None();
+      }
+    }
+    public bool IsBorrowed(Dafny.ISequence<Dafny.Rune> name) {
+      return (((this).dtor_types).Contains(name)) && ((Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Select((this).dtor_types,name)).is_Borrowed);
+    }
+    public bool IsBorrowedMut(Dafny.ISequence<Dafny.Rune> name) {
+      return (((this).dtor_types).Contains(name)) && ((Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Select((this).dtor_types,name)).is_BorrowedMut);
+    }
+    public bool IsBoxed(Dafny.ISequence<Dafny.Rune> name) {
+      return (((this).dtor_types).Contains(name)) && ((Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Select((this).dtor_types,name)).IsBox());
+    }
+    public bool NeedsAsRefForBorrow(Dafny.ISequence<Dafny.Rune> name) {
+      return (((this).dtor_types).Contains(name)) && ((Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Select((this).dtor_types,name)).NeedsAsRefForBorrow());
+    }
+    public bool IsMaybePlacebo(Dafny.ISequence<Dafny.Rune> name) {
+      return (((this).dtor_types).Contains(name)) && (((Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Select((this).dtor_types,name)).ExtractMaybePlacebo()).is_Some);
+    }
+    public Defs._IEnvironment AddAssigned(Dafny.ISequence<Dafny.Rune> name, RAST._IType tpe)
+    {
+      return Defs.Environment.create(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat((this).dtor_names, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(name)), Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Update((this).dtor_types, name, tpe), Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference((this).dtor_assignmentStatusKnown, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(name)));
+    }
+    public Defs._IEnvironment merge(Defs._IEnvironment other) {
+      return Defs.Environment.create(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat((this).dtor_names, (other).dtor_names), Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Merge((this).dtor_types, (other).dtor_types), Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union((this).dtor_assignmentStatusKnown, (other).dtor_assignmentStatusKnown));
+    }
+    public Defs._IEnvironment RemoveAssigned(Dafny.ISequence<Dafny.Rune> name) {
+      BigInteger _0_indexInEnv = Std.Collections.Seq.__default.IndexOf<Dafny.ISequence<Dafny.Rune>>((this).dtor_names, name);
+      return Defs.Environment.create(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(((this).dtor_names).Subsequence(BigInteger.Zero, _0_indexInEnv), ((this).dtor_names).Drop((_0_indexInEnv) + (BigInteger.One))), Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IType>.Subtract((this).dtor_types, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(name)), Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference((this).dtor_assignmentStatusKnown, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(name)));
+    }
+    public Defs._IEnvironment AddAssignmentStatus(Dafny.ISequence<Dafny.Rune> name, Defs._IAssignmentStatus assignmentStatus)
+    {
+      return Defs.Environment.create((this).dtor_names, (this).dtor_types, (((assignmentStatus).is_Unknown) ? (Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference((this).dtor_assignmentStatusKnown, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(name))) : (Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union((this).dtor_assignmentStatusKnown, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(name)))));
+    }
+    public bool IsAssignmentStatusKnown(Dafny.ISequence<Dafny.Rune> name) {
+      return ((this).dtor_assignmentStatusKnown).Contains(name);
+    }
+  }
+
+  public interface _IPointerType {
+    bool is_Raw { get; }
+    bool is_RcMut { get; }
+    _IPointerType DowncastClone();
+  }
+  public abstract class PointerType : _IPointerType {
+    public PointerType() {
+    }
+    private static readonly Defs._IPointerType theDefault = create_Raw();
+    public static Defs._IPointerType Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Defs._IPointerType> _TYPE = new Dafny.TypeDescriptor<Defs._IPointerType>(Defs.PointerType.Default());
+    public static Dafny.TypeDescriptor<Defs._IPointerType> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IPointerType create_Raw() {
+      return new PointerType_Raw();
+    }
+    public static _IPointerType create_RcMut() {
+      return new PointerType_RcMut();
+    }
+    public bool is_Raw { get { return this is PointerType_Raw; } }
+    public bool is_RcMut { get { return this is PointerType_RcMut; } }
+    public static System.Collections.Generic.IEnumerable<_IPointerType> AllSingletonConstructors {
+      get {
+        yield return PointerType.create_Raw();
+        yield return PointerType.create_RcMut();
+      }
+    }
+    public abstract _IPointerType DowncastClone();
+  }
+  public class PointerType_Raw : PointerType {
+    public PointerType_Raw() : base() {
+    }
+    public override _IPointerType DowncastClone() {
+      if (this is _IPointerType dt) { return dt; }
+      return new PointerType_Raw();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.PointerType_Raw;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.PointerType.Raw";
+      return s;
+    }
+  }
+  public class PointerType_RcMut : PointerType {
+    public PointerType_RcMut() : base() {
+    }
+    public override _IPointerType DowncastClone() {
+      if (this is _IPointerType dt) { return dt; }
+      return new PointerType_RcMut();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.PointerType_RcMut;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.PointerType.RcMut";
+      return s;
+    }
+  }
+
+  public interface _ICharType {
+    bool is_UTF16 { get; }
+    bool is_UTF32 { get; }
+    _ICharType DowncastClone();
+  }
+  public abstract class CharType : _ICharType {
+    public CharType() {
+    }
+    private static readonly Defs._ICharType theDefault = create_UTF16();
+    public static Defs._ICharType Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Defs._ICharType> _TYPE = new Dafny.TypeDescriptor<Defs._ICharType>(Defs.CharType.Default());
+    public static Dafny.TypeDescriptor<Defs._ICharType> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ICharType create_UTF16() {
+      return new CharType_UTF16();
+    }
+    public static _ICharType create_UTF32() {
+      return new CharType_UTF32();
+    }
+    public bool is_UTF16 { get { return this is CharType_UTF16; } }
+    public bool is_UTF32 { get { return this is CharType_UTF32; } }
+    public static System.Collections.Generic.IEnumerable<_ICharType> AllSingletonConstructors {
+      get {
+        yield return CharType.create_UTF16();
+        yield return CharType.create_UTF32();
+      }
+    }
+    public abstract _ICharType DowncastClone();
+  }
+  public class CharType_UTF16 : CharType {
+    public CharType_UTF16() : base() {
+    }
+    public override _ICharType DowncastClone() {
+      if (this is _ICharType dt) { return dt; }
+      return new CharType_UTF16();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.CharType_UTF16;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.CharType.UTF16";
+      return s;
+    }
+  }
+  public class CharType_UTF32 : CharType {
+    public CharType_UTF32() : base() {
+    }
+    public override _ICharType DowncastClone() {
+      if (this is _ICharType dt) { return dt; }
+      return new CharType_UTF32();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.CharType_UTF32;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.CharType.UTF32";
+      return s;
+    }
+  }
+
+  public interface _IRootType {
+    bool is_RootCrate { get; }
+    bool is_RootPath { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_moduleName { get; }
+    _IRootType DowncastClone();
+  }
+  public abstract class RootType : _IRootType {
+    public RootType() {
+    }
+    private static readonly Defs._IRootType theDefault = create_RootCrate();
+    public static Defs._IRootType Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Defs._IRootType> _TYPE = new Dafny.TypeDescriptor<Defs._IRootType>(Defs.RootType.Default());
+    public static Dafny.TypeDescriptor<Defs._IRootType> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IRootType create_RootCrate() {
+      return new RootType_RootCrate();
+    }
+    public static _IRootType create_RootPath(Dafny.ISequence<Dafny.Rune> moduleName) {
+      return new RootType_RootPath(moduleName);
+    }
+    public bool is_RootCrate { get { return this is RootType_RootCrate; } }
+    public bool is_RootPath { get { return this is RootType_RootPath; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_moduleName {
+      get {
+        var d = this;
+        return ((RootType_RootPath)d)._moduleName;
+      }
+    }
+    public abstract _IRootType DowncastClone();
+  }
+  public class RootType_RootCrate : RootType {
+    public RootType_RootCrate() : base() {
+    }
+    public override _IRootType DowncastClone() {
+      if (this is _IRootType dt) { return dt; }
+      return new RootType_RootCrate();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.RootType_RootCrate;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.RootType.RootCrate";
+      return s;
+    }
+  }
+  public class RootType_RootPath : RootType {
+    public readonly Dafny.ISequence<Dafny.Rune> _moduleName;
+    public RootType_RootPath(Dafny.ISequence<Dafny.Rune> moduleName) : base() {
+      this._moduleName = moduleName;
+    }
+    public override _IRootType DowncastClone() {
+      if (this is _IRootType dt) { return dt; }
+      return new RootType_RootPath(_moduleName);
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.RootType_RootPath;
+      return oth != null && object.Equals(this._moduleName, oth._moduleName);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._moduleName));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.RootType.RootPath";
+      s += "(";
+      s += this._moduleName.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IGenTypeContext {
+    bool is_GenTypeContext { get; }
+    bool dtor_forTraitParents { get; }
+  }
+  public class GenTypeContext : _IGenTypeContext {
+    public readonly bool _forTraitParents;
+    public GenTypeContext(bool forTraitParents) {
+      this._forTraitParents = forTraitParents;
+    }
+    public static bool DowncastClone(bool _this) {
+      return _this;
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.GenTypeContext;
+      return oth != null && this._forTraitParents == oth._forTraitParents;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._forTraitParents));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.GenTypeContext.GenTypeContext";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._forTraitParents);
+      s += ")";
+      return s;
+    }
+    private static readonly bool theDefault = false;
+    public static bool Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<bool> _TYPE = new Dafny.TypeDescriptor<bool>(false);
+    public static Dafny.TypeDescriptor<bool> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IGenTypeContext create(bool forTraitParents) {
+      return new GenTypeContext(forTraitParents);
+    }
+    public static _IGenTypeContext create_GenTypeContext(bool forTraitParents) {
+      return create(forTraitParents);
+    }
+    public bool is_GenTypeContext { get { return true; } }
+    public bool dtor_forTraitParents {
+      get {
+        return this._forTraitParents;
+      }
+    }
+    public static bool ForTraitParents() {
+      return true;
+    }
+    public static bool @default() {
+      return false;
+    }
+  }
+
+  public interface _ISelfInfo {
+    bool is_NoSelf { get; }
+    bool is_ThisTyped { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_rSelfName { get; }
+    DAST._IType dtor_dafnyType { get; }
+    _ISelfInfo DowncastClone();
+    bool IsSelf();
+  }
+  public abstract class SelfInfo : _ISelfInfo {
+    public SelfInfo() {
+    }
+    private static readonly Defs._ISelfInfo theDefault = create_NoSelf();
+    public static Defs._ISelfInfo Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Defs._ISelfInfo> _TYPE = new Dafny.TypeDescriptor<Defs._ISelfInfo>(Defs.SelfInfo.Default());
+    public static Dafny.TypeDescriptor<Defs._ISelfInfo> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ISelfInfo create_NoSelf() {
+      return new SelfInfo_NoSelf();
+    }
+    public static _ISelfInfo create_ThisTyped(Dafny.ISequence<Dafny.Rune> rSelfName, DAST._IType dafnyType) {
+      return new SelfInfo_ThisTyped(rSelfName, dafnyType);
+    }
+    public bool is_NoSelf { get { return this is SelfInfo_NoSelf; } }
+    public bool is_ThisTyped { get { return this is SelfInfo_ThisTyped; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_rSelfName {
+      get {
+        var d = this;
+        return ((SelfInfo_ThisTyped)d)._rSelfName;
+      }
+    }
+    public DAST._IType dtor_dafnyType {
+      get {
+        var d = this;
+        return ((SelfInfo_ThisTyped)d)._dafnyType;
+      }
+    }
+    public abstract _ISelfInfo DowncastClone();
+    public bool IsSelf() {
+      return ((this).is_ThisTyped) && (((this).dtor_rSelfName).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self")));
+    }
+  }
+  public class SelfInfo_NoSelf : SelfInfo {
+    public SelfInfo_NoSelf() : base() {
+    }
+    public override _ISelfInfo DowncastClone() {
+      if (this is _ISelfInfo dt) { return dt; }
+      return new SelfInfo_NoSelf();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.SelfInfo_NoSelf;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.SelfInfo.NoSelf";
+      return s;
+    }
+  }
+  public class SelfInfo_ThisTyped : SelfInfo {
+    public readonly Dafny.ISequence<Dafny.Rune> _rSelfName;
+    public readonly DAST._IType _dafnyType;
+    public SelfInfo_ThisTyped(Dafny.ISequence<Dafny.Rune> rSelfName, DAST._IType dafnyType) : base() {
+      this._rSelfName = rSelfName;
+      this._dafnyType = dafnyType;
+    }
+    public override _ISelfInfo DowncastClone() {
+      if (this is _ISelfInfo dt) { return dt; }
+      return new SelfInfo_ThisTyped(_rSelfName, _dafnyType);
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.SelfInfo_ThisTyped;
+      return oth != null && object.Equals(this._rSelfName, oth._rSelfName) && object.Equals(this._dafnyType, oth._dafnyType);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._rSelfName));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._dafnyType));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.SelfInfo.ThisTyped";
+      s += "(";
+      s += this._rSelfName.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._dafnyType);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IExternAttribute {
+    bool is_NoExtern { get; }
+    bool is_SimpleExtern { get; }
+    bool is_AdvancedExtern { get; }
+    bool is_UnsupportedExtern { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_overrideName { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_enclosingModule { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_reason { get; }
+    _IExternAttribute DowncastClone();
+  }
+  public abstract class ExternAttribute : _IExternAttribute {
+    public ExternAttribute() {
+    }
+    private static readonly Defs._IExternAttribute theDefault = create_NoExtern();
+    public static Defs._IExternAttribute Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Defs._IExternAttribute> _TYPE = new Dafny.TypeDescriptor<Defs._IExternAttribute>(Defs.ExternAttribute.Default());
+    public static Dafny.TypeDescriptor<Defs._IExternAttribute> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IExternAttribute create_NoExtern() {
+      return new ExternAttribute_NoExtern();
+    }
+    public static _IExternAttribute create_SimpleExtern(Dafny.ISequence<Dafny.Rune> overrideName) {
+      return new ExternAttribute_SimpleExtern(overrideName);
+    }
+    public static _IExternAttribute create_AdvancedExtern(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> enclosingModule, Dafny.ISequence<Dafny.Rune> overrideName) {
+      return new ExternAttribute_AdvancedExtern(enclosingModule, overrideName);
+    }
+    public static _IExternAttribute create_UnsupportedExtern(Dafny.ISequence<Dafny.Rune> reason) {
+      return new ExternAttribute_UnsupportedExtern(reason);
+    }
+    public bool is_NoExtern { get { return this is ExternAttribute_NoExtern; } }
+    public bool is_SimpleExtern { get { return this is ExternAttribute_SimpleExtern; } }
+    public bool is_AdvancedExtern { get { return this is ExternAttribute_AdvancedExtern; } }
+    public bool is_UnsupportedExtern { get { return this is ExternAttribute_UnsupportedExtern; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_overrideName {
+      get {
+        var d = this;
+        if (d is ExternAttribute_SimpleExtern) { return ((ExternAttribute_SimpleExtern)d)._overrideName; }
+        return ((ExternAttribute_AdvancedExtern)d)._overrideName;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_enclosingModule {
+      get {
+        var d = this;
+        return ((ExternAttribute_AdvancedExtern)d)._enclosingModule;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_reason {
+      get {
+        var d = this;
+        return ((ExternAttribute_UnsupportedExtern)d)._reason;
+      }
+    }
+    public abstract _IExternAttribute DowncastClone();
+  }
+  public class ExternAttribute_NoExtern : ExternAttribute {
+    public ExternAttribute_NoExtern() : base() {
+    }
+    public override _IExternAttribute DowncastClone() {
+      if (this is _IExternAttribute dt) { return dt; }
+      return new ExternAttribute_NoExtern();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.ExternAttribute_NoExtern;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.ExternAttribute.NoExtern";
+      return s;
+    }
+  }
+  public class ExternAttribute_SimpleExtern : ExternAttribute {
+    public readonly Dafny.ISequence<Dafny.Rune> _overrideName;
+    public ExternAttribute_SimpleExtern(Dafny.ISequence<Dafny.Rune> overrideName) : base() {
+      this._overrideName = overrideName;
+    }
+    public override _IExternAttribute DowncastClone() {
+      if (this is _IExternAttribute dt) { return dt; }
+      return new ExternAttribute_SimpleExtern(_overrideName);
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.ExternAttribute_SimpleExtern;
+      return oth != null && object.Equals(this._overrideName, oth._overrideName);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overrideName));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.ExternAttribute.SimpleExtern";
+      s += "(";
+      s += this._overrideName.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class ExternAttribute_AdvancedExtern : ExternAttribute {
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _enclosingModule;
+    public readonly Dafny.ISequence<Dafny.Rune> _overrideName;
+    public ExternAttribute_AdvancedExtern(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> enclosingModule, Dafny.ISequence<Dafny.Rune> overrideName) : base() {
+      this._enclosingModule = enclosingModule;
+      this._overrideName = overrideName;
+    }
+    public override _IExternAttribute DowncastClone() {
+      if (this is _IExternAttribute dt) { return dt; }
+      return new ExternAttribute_AdvancedExtern(_enclosingModule, _overrideName);
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.ExternAttribute_AdvancedExtern;
+      return oth != null && object.Equals(this._enclosingModule, oth._enclosingModule) && object.Equals(this._overrideName, oth._overrideName);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._enclosingModule));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overrideName));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.ExternAttribute.AdvancedExtern";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._enclosingModule);
+      s += ", ";
+      s += this._overrideName.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class ExternAttribute_UnsupportedExtern : ExternAttribute {
+    public readonly Dafny.ISequence<Dafny.Rune> _reason;
+    public ExternAttribute_UnsupportedExtern(Dafny.ISequence<Dafny.Rune> reason) : base() {
+      this._reason = reason;
+    }
+    public override _IExternAttribute DowncastClone() {
+      if (this is _IExternAttribute dt) { return dt; }
+      return new ExternAttribute_UnsupportedExtern(_reason);
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.ExternAttribute_UnsupportedExtern;
+      return oth != null && object.Equals(this._reason, oth._reason);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._reason));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.ExternAttribute.UnsupportedExtern";
+      s += "(";
+      s += this._reason.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IAssignmentStatus {
+    bool is_NotAssigned { get; }
+    bool is_SurelyAssigned { get; }
+    bool is_Unknown { get; }
+    _IAssignmentStatus DowncastClone();
+    Defs._IAssignmentStatus Join(Defs._IAssignmentStatus other);
+    Defs._IAssignmentStatus Then(Defs._IAssignmentStatus other);
+  }
+  public abstract class AssignmentStatus : _IAssignmentStatus {
+    public AssignmentStatus() {
+    }
+    private static readonly Defs._IAssignmentStatus theDefault = create_NotAssigned();
+    public static Defs._IAssignmentStatus Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Defs._IAssignmentStatus> _TYPE = new Dafny.TypeDescriptor<Defs._IAssignmentStatus>(Defs.AssignmentStatus.Default());
+    public static Dafny.TypeDescriptor<Defs._IAssignmentStatus> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IAssignmentStatus create_NotAssigned() {
+      return new AssignmentStatus_NotAssigned();
+    }
+    public static _IAssignmentStatus create_SurelyAssigned() {
+      return new AssignmentStatus_SurelyAssigned();
+    }
+    public static _IAssignmentStatus create_Unknown() {
+      return new AssignmentStatus_Unknown();
+    }
+    public bool is_NotAssigned { get { return this is AssignmentStatus_NotAssigned; } }
+    public bool is_SurelyAssigned { get { return this is AssignmentStatus_SurelyAssigned; } }
+    public bool is_Unknown { get { return this is AssignmentStatus_Unknown; } }
+    public static System.Collections.Generic.IEnumerable<_IAssignmentStatus> AllSingletonConstructors {
+      get {
+        yield return AssignmentStatus.create_NotAssigned();
+        yield return AssignmentStatus.create_SurelyAssigned();
+        yield return AssignmentStatus.create_Unknown();
+      }
+    }
+    public abstract _IAssignmentStatus DowncastClone();
+    public Defs._IAssignmentStatus Join(Defs._IAssignmentStatus other) {
+      if (((this).is_SurelyAssigned) && ((other).is_SurelyAssigned)) {
+        return Defs.AssignmentStatus.create_SurelyAssigned();
+      } else if (((this).is_NotAssigned) && ((other).is_NotAssigned)) {
+        return Defs.AssignmentStatus.create_NotAssigned();
+      } else {
+        return Defs.AssignmentStatus.create_Unknown();
+      }
+    }
+    public Defs._IAssignmentStatus Then(Defs._IAssignmentStatus other) {
+      if ((this).is_SurelyAssigned) {
+        return Defs.AssignmentStatus.create_SurelyAssigned();
+      } else if ((this).is_NotAssigned) {
+        return other;
+      } else {
+        return Defs.AssignmentStatus.create_Unknown();
+      }
+    }
+  }
+  public class AssignmentStatus_NotAssigned : AssignmentStatus {
+    public AssignmentStatus_NotAssigned() : base() {
+    }
+    public override _IAssignmentStatus DowncastClone() {
+      if (this is _IAssignmentStatus dt) { return dt; }
+      return new AssignmentStatus_NotAssigned();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.AssignmentStatus_NotAssigned;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.AssignmentStatus.NotAssigned";
+      return s;
+    }
+  }
+  public class AssignmentStatus_SurelyAssigned : AssignmentStatus {
+    public AssignmentStatus_SurelyAssigned() : base() {
+    }
+    public override _IAssignmentStatus DowncastClone() {
+      if (this is _IAssignmentStatus dt) { return dt; }
+      return new AssignmentStatus_SurelyAssigned();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.AssignmentStatus_SurelyAssigned;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.AssignmentStatus.SurelyAssigned";
+      return s;
+    }
+  }
+  public class AssignmentStatus_Unknown : AssignmentStatus {
+    public AssignmentStatus_Unknown() : base() {
+    }
+    public override _IAssignmentStatus DowncastClone() {
+      if (this is _IAssignmentStatus dt) { return dt; }
+      return new AssignmentStatus_Unknown();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Defs.AssignmentStatus_Unknown;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "DafnyToRustCompilerDefinitions.AssignmentStatus.Unknown";
+      return s;
+    }
+  }
+} // end of namespace Defs
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/ExpressionOptimization.cs b/Source/DafnyCore/GeneratedFromDafny/ExpressionOptimization.cs
new file mode 100644
index 00000000000..2ffd8bd8980
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/ExpressionOptimization.cs
@@ -0,0 +1,172 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace ExpressionOptimization {
+
+  public partial class __default {
+    public static RAST._IMod apply(RAST._IMod mod) {
+      return (ExpressionOptimization.__default.ExprSimplifier()).ReplaceMod(mod, (RAST.__default.crate).MSel((mod).dtor_name));
+    }
+    public static RAST._IRASTBottomUpReplacer ExprSimplifier() {
+      return RAST.RASTBottomUpReplacer.create(((System.Func<RAST._IMod, RAST._IPath, RAST._IMod>)((_0_m, _1_SelfPath) => {
+  return _0_m;
+})), ((System.Func<RAST._IType, RAST._IType>)((_2_t) => {
+  return _2_t;
+})), ((System.Func<RAST._IExpr, RAST._IExpr>)((_3_e) => {
+  return ((System.Func<RAST._IExpr>)(() => {
+    RAST._IExpr _source0 = _3_e;
+    {
+      if (_source0.is_UnaryOp) {
+        Dafny.ISequence<Dafny.Rune> op10 = _source0.dtor_op1;
+        if (object.Equals(op10, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!"))) {
+          RAST._IExpr underlying0 = _source0.dtor_underlying;
+          if (underlying0.is_BinaryOp) {
+            Dafny.ISequence<Dafny.Rune> _4_op = underlying0.dtor_op2;
+            RAST._IExpr _5_left = underlying0.dtor_left;
+            RAST._IExpr _6_right = underlying0.dtor_right;
+            DAST.Format._IBinaryOpFormat _7_format = underlying0.dtor_format2;
+            DAST.Format._IUnaryOpFormat format0 = _source0.dtor_format;
+            if (format0.is_CombineFormat) {
+              Dafny.ISequence<Dafny.Rune> _source1 = _4_op;
+              {
+                if (object.Equals(_source1, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("=="))) {
+                  return RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!="), _5_left, _6_right, DAST.Format.BinaryOpFormat.create_NoFormat());
+                }
+              }
+              {
+                if (object.Equals(_source1, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"))) {
+                  if ((_7_format).is_NoFormat) {
+                    return RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">="), _5_left, _6_right, DAST.Format.BinaryOpFormat.create_NoFormat());
+                  } else if ((_7_format).is_ReverseFormat) {
+                    return RAST.Expr.create_BinaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<="), _6_right, _5_left, DAST.Format.BinaryOpFormat.create_NoFormat());
+                  } else {
+                    return _3_e;
+                  }
+                }
+              }
+              {
+                return _3_e;
+              }
+            }
+          }
+        }
+      }
+    }
+    {
+      if (_source0.is_Call) {
+        RAST._IExpr obj0 = _source0.dtor_obj;
+        if (obj0.is_ExprFromPath) {
+          RAST._IPath path0 = obj0.dtor_path;
+          if (path0.is_PMemberSelect) {
+            RAST._IPath _8_r = path0.dtor_base;
+            Dafny.ISequence<Dafny.Rune> name0 = path0.dtor_name;
+            if (object.Equals(name0, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("truncate!"))) {
+              Dafny.ISequence<RAST._IExpr> _9_args = _source0.dtor_arguments;
+              if (((!object.Equals(_8_r, RAST.__default.dafny__runtime)) && (!object.Equals(_8_r, RAST.__default.@global))) || ((new BigInteger((_9_args).Count)) != (new BigInteger(2)))) {
+                return _3_e;
+              } else {
+                RAST._IExpr _10_expr = (_9_args).Select(BigInteger.Zero);
+                RAST._IExpr _11_tpeExpr = (_9_args).Select(BigInteger.One);
+                if (!((_11_tpeExpr).is_ExprFromType)) {
+                  return _3_e;
+                } else {
+                  RAST._IType _12_tpe = (_11_tpeExpr).dtor_tpe;
+                  if ((_12_tpe).IsAutoSize()) {
+                    RAST._IExpr _source2 = _10_expr;
+                    {
+                      if (_source2.is_Call) {
+                        RAST._IExpr obj1 = _source2.dtor_obj;
+                        if (obj1.is_ExprFromPath) {
+                          RAST._IPath path1 = obj1.dtor_path;
+                          if (path1.is_PMemberSelect) {
+                            RAST._IPath _13_base = path1.dtor_base;
+                            Dafny.ISequence<Dafny.Rune> name1 = path1.dtor_name;
+                            if (object.Equals(name1, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("int!"))) {
+                              Dafny.ISequence<RAST._IExpr> _14_args = _source2.dtor_arguments;
+                              if (((new BigInteger((_14_args).Count)) == (BigInteger.One)) && ((object.Equals(_13_base, RAST.__default.dafny__runtime)) || (object.Equals(_13_base, RAST.__default.@global)))) {
+                                RAST._IExpr _source3 = (_14_args).Select(BigInteger.Zero);
+                                {
+                                  if (_source3.is_LiteralInt) {
+                                    Dafny.ISequence<Dafny.Rune> _15_number = _source3.dtor_value;
+                                    return RAST.Expr.create_LiteralInt(_15_number);
+                                  }
+                                }
+                                {
+                                  if (_source3.is_LiteralString) {
+                                    Dafny.ISequence<Dafny.Rune> _16_number = _source3.dtor_value;
+                                    return RAST.Expr.create_LiteralInt(_16_number);
+                                  }
+                                }
+                                {
+                                  return _3_e;
+                                }
+                              } else {
+                                return _3_e;
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                    {
+                      return _3_e;
+                    }
+                  } else {
+                    return _3_e;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    {
+      if (_source0.is_StmtExpr) {
+        RAST._IExpr stmt0 = _source0.dtor_stmt;
+        if (stmt0.is_DeclareVar) {
+          RAST._IDeclareType _17_mod = stmt0.dtor_declareType;
+          Dafny.ISequence<Dafny.Rune> _18_name = stmt0.dtor_name;
+          Std.Wrappers._IOption<RAST._IType> optType0 = stmt0.dtor_optType;
+          if (optType0.is_Some) {
+            RAST._IType _19_tpe = optType0.dtor_value;
+            Std.Wrappers._IOption<RAST._IExpr> optRhs0 = stmt0.dtor_optRhs;
+            if (optRhs0.is_None) {
+              RAST._IExpr rhs0 = _source0.dtor_rhs;
+              if (rhs0.is_StmtExpr) {
+                RAST._IExpr stmt1 = rhs0.dtor_stmt;
+                if (stmt1.is_Assign) {
+                  Std.Wrappers._IOption<RAST._IAssignLhs> _20_name2 = stmt1.dtor_names;
+                  RAST._IExpr _21_rhs = stmt1.dtor_rhs;
+                  RAST._IExpr _22_last = rhs0.dtor_rhs;
+                  if (object.Equals(_20_name2, Std.Wrappers.Option<RAST._IAssignLhs>.create_Some(RAST.AssignLhs.create_LocalVar(_18_name)))) {
+                    return RAST.Expr.create_StmtExpr(RAST.Expr.create_DeclareVar(_17_mod, _18_name, Std.Wrappers.Option<RAST._IType>.create_Some(_19_tpe), Std.Wrappers.Option<RAST._IExpr>.create_Some(_21_rhs)), _22_last);
+                  } else {
+                    return _3_e;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    {
+      return _3_e;
+    }
+  }))();
+})));
+    }
+  }
+} // end of namespace ExpressionOptimization
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/FactorPathsOptimization.cs b/Source/DafnyCore/GeneratedFromDafny/FactorPathsOptimization.cs
new file mode 100644
index 00000000000..6d755a587c1
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/FactorPathsOptimization.cs
@@ -0,0 +1,341 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace FactorPathsOptimization {
+
+  public partial class __default {
+    public static Func<RAST._IMod, RAST._IMod> apply(RAST._IPath root) {
+      return Dafny.Helpers.Id<Func<RAST._IPath, Func<RAST._IMod, RAST._IMod>>>((_0_root) => ((System.Func<RAST._IMod, RAST._IMod>)((_1_mod) => {
+        return FactorPathsOptimization.__default.applyPrefix(_1_mod, (_0_root).MSel((_1_mod).dtor_name));
+      })))(root);
+    }
+    public static RAST._IMod applyPrefix(RAST._IMod mod, RAST._IPath SelfPath)
+    {
+      if ((mod).is_ExternMod) {
+        return mod;
+      } else {
+        FactorPathsOptimization._IMapping _0_mappings = (FactorPathsOptimization.__default.PathsVisitor()).VisitMod(FactorPathsOptimization.Mapping.create(Dafny.Map<Dafny.ISequence<Dafny.Rune>, Dafny.ISet<RAST._IPath>>.FromElements(), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements()), mod, SelfPath);
+        Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath> _1_pathsToRemove = (_0_mappings).ToFinalReplacement(SelfPath);
+        Dafny.ISequence<RAST._IModDecl> _2_imports = (_0_mappings).ToUseStatements(_1_pathsToRemove, SelfPath);
+        RAST._IMod _3_mod = (FactorPathsOptimization.__default.PathSimplifier(_1_pathsToRemove)).ReplaceMod(mod, SelfPath);
+        RAST._IMod _4_dt__update__tmp_h0 = _3_mod;
+        Dafny.ISequence<RAST._IModDecl> _5_dt__update_hbody_h0 = Dafny.Sequence<RAST._IModDecl>.Concat(_2_imports, (_3_mod).dtor_body);
+        return RAST.Mod.create_Mod((_4_dt__update__tmp_h0).dtor_docString, (_4_dt__update__tmp_h0).dtor_attributes, (_4_dt__update__tmp_h0).dtor_name, _5_dt__update_hbody_h0);
+      }
+    }
+    public static __T UniqueElementOf<__T>(Dafny.ISet<__T> s) {
+      return Dafny.Helpers.Let<int, __T>(0, _let_dummy_22 =>  {
+        __T _0_e = default(__T);
+        foreach (__T _assign_such_that_0 in (s).Elements) {
+          _0_e = (__T)_assign_such_that_0;
+          if ((s).Contains(_0_e)) {
+            goto after__ASSIGN_SUCH_THAT_0;
+          }
+        }
+        throw new System.Exception("assign-such-that search produced no value");
+      after__ASSIGN_SUCH_THAT_0: ;
+        return _0_e;
+      }
+      );
+    }
+    public static RAST._IRASTTopDownVisitor<FactorPathsOptimization._IMapping> PathsVisitor() {
+      return RAST.RASTTopDownVisitor<FactorPathsOptimization._IMapping>.create(((System.Func<FactorPathsOptimization._IMapping, RAST._IType, FactorPathsOptimization._IMapping>)((_0_current, _1_t) => {
+  return ((System.Func<FactorPathsOptimization._IMapping>)(() => {
+    RAST._IType _source0 = _1_t;
+    {
+      if (_source0.is_TypeFromPath) {
+        RAST._IPath path0 = _source0.dtor_path;
+        if (path0.is_PMemberSelect) {
+          RAST._IPath _2_base = path0.dtor_base;
+          Dafny.ISequence<Dafny.Rune> _3_name = path0.dtor_name;
+          if (object.Equals(_2_base, RAST.Path.create_Self())) {
+            return _0_current;
+          } else {
+            return (_0_current).Add(_3_name, _2_base);
+          }
+        }
+      }
+    }
+    {
+      return _0_current;
+    }
+  }))();
+})), ((System.Func<FactorPathsOptimization._IMapping, RAST._IExpr, FactorPathsOptimization._IMapping>)((_4_current, _5_e) => {
+  return ((System.Func<FactorPathsOptimization._IMapping>)(() => {
+    RAST._IExpr _source1 = _5_e;
+    {
+      if (_source1.is_ExprFromPath) {
+        RAST._IPath path1 = _source1.dtor_path;
+        if (path1.is_PMemberSelect) {
+          RAST._IPath _6_base = path1.dtor_base;
+          Dafny.ISequence<Dafny.Rune> _7_id = path1.dtor_name;
+          if (object.Equals(_6_base, RAST.Path.create_Self())) {
+            return _4_current;
+          } else if (((new BigInteger((_7_id).Count)).Sign == 1) && (((_7_id).Select((new BigInteger((_7_id).Count)) - (BigInteger.One))) == (new Dafny.Rune('!')))) {
+            return (_4_current).Add((_7_id).Take((new BigInteger((_7_id).Count)) - (BigInteger.One)), _6_base);
+          } else {
+            return (_4_current).Add(_7_id, _6_base);
+          }
+        }
+      }
+    }
+    {
+      return _4_current;
+    }
+  }))();
+})), ((System.Func<FactorPathsOptimization._IMapping, RAST._IModDecl, RAST._IPath, FactorPathsOptimization._IMapping>)((_8_current, _9_modDecl, _10_prefix) => {
+  return ((System.Func<FactorPathsOptimization._IMapping>)(() => {
+    RAST._IModDecl _source2 = _9_modDecl;
+    {
+      if (_source2.is_ModDecl) {
+        RAST._IMod _11_mod = _source2.dtor_mod;
+        return (_8_current).Add((_11_mod).dtor_name, _10_prefix);
+      }
+    }
+    {
+      if (_source2.is_StructDecl) {
+        RAST._IStruct _12_struct = _source2.dtor_struct;
+        return (_8_current).Add((_12_struct).dtor_name, _10_prefix);
+      }
+    }
+    {
+      if (_source2.is_TypeDecl) {
+        RAST._ITypeSynonym _13_tpe = _source2.dtor_tpe;
+        return (_8_current).Add((_13_tpe).dtor_name, _10_prefix);
+      }
+    }
+    {
+      if (_source2.is_ConstDecl) {
+        RAST._IConstant _14_c = _source2.dtor_c;
+        return (_8_current).Add((_14_c).dtor_name, _10_prefix);
+      }
+    }
+    {
+      if (_source2.is_EnumDecl) {
+        RAST._IEnum _15_enum = _source2.dtor_enum;
+        return (_8_current).Add((_15_enum).dtor_name, _10_prefix);
+      }
+    }
+    {
+      if (_source2.is_ImplDecl) {
+        RAST._IImpl _16_impl = _source2.dtor_impl;
+        return _8_current;
+      }
+    }
+    {
+      if (_source2.is_TraitDecl) {
+        RAST._ITrait _17_tr = _source2.dtor_tr;
+        RAST._IType _source3 = (_17_tr).dtor_tpe;
+        {
+          if (_source3.is_TypeApp) {
+            RAST._IType baseName0 = _source3.dtor_baseName;
+            if (baseName0.is_TIdentifier) {
+              Dafny.ISequence<Dafny.Rune> _18_name = baseName0.dtor_name;
+              return (_8_current).Add(_18_name, _10_prefix);
+            }
+          }
+        }
+        {
+          if (_source3.is_TIdentifier) {
+            Dafny.ISequence<Dafny.Rune> _19_name = _source3.dtor_name;
+            return (_8_current).Add(_19_name, _10_prefix);
+          }
+        }
+        {
+          return _8_current;
+        }
+      }
+    }
+    {
+      if (_source2.is_TopFnDecl) {
+        RAST._ITopFnDecl _20_fn = _source2.dtor_fn;
+        return (_8_current).Add(((_20_fn).dtor_fn).dtor_name, _10_prefix);
+      }
+    }
+    {
+      RAST._IUse _21_use = _source2.dtor_use;
+      return _8_current;
+    }
+  }))();
+})), false);
+    }
+    public static RAST._IRASTBottomUpReplacer PathSimplifier(Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath> replacement)
+    {
+      return RAST.RASTBottomUpReplacer.create(((System.Func<RAST._IMod, RAST._IPath, RAST._IMod>)((_0_m, _1_SelfPath) => {
+  return FactorPathsOptimization.__default.applyPrefix(_0_m, (_1_SelfPath).MSel((_0_m).dtor_name));
+})), Dafny.Helpers.Id<Func<Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath>, Func<RAST._IType, RAST._IType>>>((_2_replacement) => ((System.Func<RAST._IType, RAST._IType>)((_3_t) => {
+  return ((System.Func<RAST._IType>)(() => {
+    RAST._IType _source0 = _3_t;
+    {
+      if (_source0.is_TypeFromPath) {
+        RAST._IPath path0 = _source0.dtor_path;
+        if (path0.is_PMemberSelect) {
+          RAST._IPath _4_base = path0.dtor_base;
+          Dafny.ISequence<Dafny.Rune> _5_id = path0.dtor_name;
+          if (((_2_replacement).Contains(_5_id)) && (object.Equals(Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IPath>.Select(_2_replacement,_5_id), _4_base))) {
+            return RAST.Type.create_TSynonym(RAST.Type.create_TIdentifier(_5_id), _3_t);
+          } else {
+            return _3_t;
+          }
+        }
+      }
+    }
+    {
+      return _3_t;
+    }
+  }))();
+})))(replacement), Dafny.Helpers.Id<Func<Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath>, Func<RAST._IExpr, RAST._IExpr>>>((_6_replacement) => ((System.Func<RAST._IExpr, RAST._IExpr>)((_7_e) => {
+  return ((System.Func<RAST._IExpr>)(() => {
+    RAST._IExpr _source1 = _7_e;
+    {
+      if (_source1.is_ExprFromPath) {
+        RAST._IPath path1 = _source1.dtor_path;
+        if (path1.is_PMemberSelect) {
+          RAST._IPath _8_base = path1.dtor_base;
+          Dafny.ISequence<Dafny.Rune> _9_id = path1.dtor_name;
+          if (((_6_replacement).Contains(_9_id)) && (object.Equals(Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IPath>.Select(_6_replacement,_9_id), _8_base))) {
+            return RAST.Expr.create_Identifier(_9_id);
+          } else if (((new BigInteger((_9_id).Count)).Sign == 1) && (((_9_id).Select((new BigInteger((_9_id).Count)) - (BigInteger.One))) == (new Dafny.Rune('!')))) {
+            Dafny.ISequence<Dafny.Rune> _10_macro__id = (_9_id).Take((new BigInteger((_9_id).Count)) - (BigInteger.One));
+            if (((_6_replacement).Contains(_10_macro__id)) && (object.Equals(Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IPath>.Select(_6_replacement,_10_macro__id), _8_base))) {
+              return RAST.Expr.create_Identifier(_9_id);
+            } else {
+              return _7_e;
+            }
+          } else {
+            return _7_e;
+          }
+        }
+      }
+    }
+    {
+      return _7_e;
+    }
+  }))();
+})))(replacement));
+    }
+  }
+
+  public interface _IMapping {
+    bool is_Mapping { get; }
+    Dafny.IMap<Dafny.ISequence<Dafny.Rune>,Dafny.ISet<RAST._IPath>> dtor_provenance { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_keys { get; }
+    _IMapping DowncastClone();
+    FactorPathsOptimization._IMapping Add(Dafny.ISequence<Dafny.Rune> k, RAST._IPath path);
+    Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath> ToFinalReplacement(RAST._IPath SelfPath);
+    Dafny.ISequence<RAST._IModDecl> ToUseStatements(Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath> finalReplacement, RAST._IPath SelfPath);
+  }
+  public class Mapping : _IMapping {
+    public readonly Dafny.IMap<Dafny.ISequence<Dafny.Rune>,Dafny.ISet<RAST._IPath>> _provenance;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _keys;
+    public Mapping(Dafny.IMap<Dafny.ISequence<Dafny.Rune>,Dafny.ISet<RAST._IPath>> provenance, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> keys) {
+      this._provenance = provenance;
+      this._keys = keys;
+    }
+    public _IMapping DowncastClone() {
+      if (this is _IMapping dt) { return dt; }
+      return new Mapping(_provenance, _keys);
+    }
+    public override bool Equals(object other) {
+      var oth = other as FactorPathsOptimization.Mapping;
+      return oth != null && object.Equals(this._provenance, oth._provenance) && object.Equals(this._keys, oth._keys);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._provenance));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._keys));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "FactorPathsOptimization.Mapping.Mapping";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._provenance);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._keys);
+      s += ")";
+      return s;
+    }
+    private static readonly FactorPathsOptimization._IMapping theDefault = create(Dafny.Map<Dafny.ISequence<Dafny.Rune>, Dafny.ISet<RAST._IPath>>.Empty, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty);
+    public static FactorPathsOptimization._IMapping Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<FactorPathsOptimization._IMapping> _TYPE = new Dafny.TypeDescriptor<FactorPathsOptimization._IMapping>(FactorPathsOptimization.Mapping.Default());
+    public static Dafny.TypeDescriptor<FactorPathsOptimization._IMapping> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IMapping create(Dafny.IMap<Dafny.ISequence<Dafny.Rune>,Dafny.ISet<RAST._IPath>> provenance, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> keys) {
+      return new Mapping(provenance, keys);
+    }
+    public static _IMapping create_Mapping(Dafny.IMap<Dafny.ISequence<Dafny.Rune>,Dafny.ISet<RAST._IPath>> provenance, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> keys) {
+      return create(provenance, keys);
+    }
+    public bool is_Mapping { get { return true; } }
+    public Dafny.IMap<Dafny.ISequence<Dafny.Rune>,Dafny.ISet<RAST._IPath>> dtor_provenance {
+      get {
+        return this._provenance;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_keys {
+      get {
+        return this._keys;
+      }
+    }
+    public FactorPathsOptimization._IMapping Add(Dafny.ISequence<Dafny.Rune> k, RAST._IPath path)
+    {
+      if (((this).dtor_provenance).Contains(k)) {
+        FactorPathsOptimization._IMapping _0_dt__update__tmp_h0 = this;
+        Dafny.IMap<Dafny.ISequence<Dafny.Rune>,Dafny.ISet<RAST._IPath>> _1_dt__update_hprovenance_h0 = Dafny.Map<Dafny.ISequence<Dafny.Rune>, Dafny.ISet<RAST._IPath>>.Update((this).dtor_provenance, k, Dafny.Set<RAST._IPath>.Union(Dafny.Map<Dafny.ISequence<Dafny.Rune>, Dafny.ISet<RAST._IPath>>.Select((this).dtor_provenance,k), Dafny.Set<RAST._IPath>.FromElements(path)));
+        return FactorPathsOptimization.Mapping.create(_1_dt__update_hprovenance_h0, (_0_dt__update__tmp_h0).dtor_keys);
+      } else {
+        FactorPathsOptimization._IMapping _2_dt__update__tmp_h1 = this;
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _3_dt__update_hkeys_h0 = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat((this).dtor_keys, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(k));
+        Dafny.IMap<Dafny.ISequence<Dafny.Rune>,Dafny.ISet<RAST._IPath>> _4_dt__update_hprovenance_h1 = Dafny.Map<Dafny.ISequence<Dafny.Rune>, Dafny.ISet<RAST._IPath>>.Update((this).dtor_provenance, k, Dafny.Set<RAST._IPath>.FromElements(path));
+        return FactorPathsOptimization.Mapping.create(_4_dt__update_hprovenance_h1, _3_dt__update_hkeys_h0);
+      }
+    }
+    public Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath> ToFinalReplacement(RAST._IPath SelfPath) {
+      return Dafny.Helpers.Id<Func<RAST._IPath, Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath>>>((_0_SelfPath) => ((System.Func<Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath>>)(() => {
+        var _coll0 = new System.Collections.Generic.List<Dafny.Pair<Dafny.ISequence<Dafny.Rune>,RAST._IPath>>();
+        foreach (Dafny.ISequence<Dafny.Rune> _compr_0 in ((this).dtor_provenance).Keys.Elements) {
+          Dafny.ISequence<Dafny.Rune> _1_identifier = (Dafny.ISequence<Dafny.Rune>)_compr_0;
+          if (((this).dtor_provenance).Contains(_1_identifier)) {
+            foreach (Dafny.ISet<RAST._IPath> _compr_1 in Dafny.Helpers.SingleValue<Dafny.ISet<RAST._IPath>>(Dafny.Map<Dafny.ISequence<Dafny.Rune>, Dafny.ISet<RAST._IPath>>.Select((this).dtor_provenance,_1_identifier))) {
+              Dafny.ISet<RAST._IPath> _2_paths = (Dafny.ISet<RAST._IPath>)_compr_1;
+              if (((_2_paths).Equals(Dafny.Map<Dafny.ISequence<Dafny.Rune>, Dafny.ISet<RAST._IPath>>.Select((this).dtor_provenance,_1_identifier))) && ((((new BigInteger((_2_paths).Count)) == (BigInteger.One)) || ((_2_paths).Contains(_0_SelfPath))) || ((_2_paths).Contains(RAST.__default.dafny__runtime)))) {
+                _coll0.Add(new Dafny.Pair<Dafny.ISequence<Dafny.Rune>,RAST._IPath>(_1_identifier, (((new BigInteger((_2_paths).Count)) == (BigInteger.One)) ? (FactorPathsOptimization.__default.UniqueElementOf<RAST._IPath>(_2_paths)) : ((((_2_paths).Contains(_0_SelfPath)) ? (_0_SelfPath) : (RAST.__default.dafny__runtime))))));
+              }
+            }
+          }
+        }
+        return Dafny.Map<Dafny.ISequence<Dafny.Rune>,RAST._IPath>.FromCollection(_coll0);
+      }))())(SelfPath);
+    }
+    public Dafny.ISequence<RAST._IModDecl> ToUseStatements(Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath> finalReplacement, RAST._IPath SelfPath)
+    {
+      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _0_toUse = Std.Collections.Seq.__default.Filter<Dafny.ISequence<Dafny.Rune>>(Dafny.Helpers.Id<Func<Dafny.IMap<Dafny.ISequence<Dafny.Rune>,RAST._IPath>, RAST._IPath, Func<Dafny.ISequence<Dafny.Rune>, bool>>>((_1_finalReplacement, _2_SelfPath) => ((System.Func<Dafny.ISequence<Dafny.Rune>, bool>)((_3_key) => {
+        return ((_1_finalReplacement).Contains(_3_key)) && (!object.Equals(Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IPath>.Select(_1_finalReplacement,_3_key), _2_SelfPath));
+      })))(finalReplacement, SelfPath), (this).dtor_keys);
+      return ((System.Func<Dafny.ISequence<RAST._IModDecl>>) (() => {
+        BigInteger dim12 = new BigInteger((_0_toUse).Count);
+        var arr12 = new RAST._IModDecl[Dafny.Helpers.ToIntChecked(dim12, "array size exceeds memory limit")];
+        for (int i12 = 0; i12 < dim12; i12++) {
+          var _4_i = (BigInteger) i12;
+          arr12[(int)(_4_i)] = RAST.ModDecl.create_UseDecl(RAST.Use.create(RAST.Visibility.create_PUB(), (Dafny.Map<Dafny.ISequence<Dafny.Rune>, RAST._IPath>.Select(finalReplacement,(_0_toUse).Select(_4_i))).MSel((_0_toUse).Select(_4_i))));
+        }
+        return Dafny.Sequence<RAST._IModDecl>.FromArray(arr12);
+      }))();
+    }
+  }
+} // end of namespace FactorPathsOptimization
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Formatting.cs b/Source/DafnyCore/GeneratedFromDafny/Formatting.cs
new file mode 100644
index 00000000000..f8026126c1e
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Formatting.cs
@@ -0,0 +1,49 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Formatting {
+
+  public partial class __default {
+    public static System.String ReindentProgramFromFirstToken(Microsoft.Dafny.Token firstToken, Formatting.IIndentationFormatter reindent)
+    {
+      System.String s = default(System.String);
+      Microsoft.Dafny.Token _0_token;
+      _0_token = firstToken;
+      System.Text.StringBuilder _1_sb;
+      System.Text.StringBuilder _nw0 = new System.Text.StringBuilder();
+      _1_sb = _nw0;
+      while ((_0_token) != (object) ((Microsoft.Dafny.Token)null)) {
+        System.String _2_newLeadingTrivia;
+        _2_newLeadingTrivia = (reindent).GetNewLeadingTrivia(_0_token);
+        System.String _3_newTrailingTrivia;
+        _3_newTrailingTrivia = (reindent).GetNewTrailingTrivia(_0_token);
+        (_1_sb).Append(_2_newLeadingTrivia);
+        (_1_sb).Append(_0_token.val);
+        (_1_sb).Append(_3_newTrailingTrivia);
+        _0_token = _0_token.Next;
+      }
+      System.String _out0;
+      _out0 = (_1_sb).ToString().ToString();
+      s = _out0;
+      return s;
+    }
+  }
+
+  public interface IIndentationFormatter {
+    System.String GetNewLeadingTrivia(Microsoft.Dafny.Token token);
+    System.String GetNewTrailingTrivia(Microsoft.Dafny.Token token);
+  }
+  public class _Companion_IIndentationFormatter {
+  }
+} // end of namespace Formatting
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/FuncExtensions.cs b/Source/DafnyCore/GeneratedFromDafny/FuncExtensions.cs
new file mode 100644
index 00000000000..af326244b50
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/FuncExtensions.cs
@@ -0,0 +1,38 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+internal static class FuncExtensions {
+  public static Func<U, UResult> DowncastClone<T, TResult, U, UResult>(this Func<T, TResult> F, Func<U, T> ArgConv, Func<TResult, UResult> ResConv) {
+    return arg => ResConv(F(ArgConv(arg)));
+  }
+  public static Func<UResult> DowncastClone<TResult, UResult>(this Func<TResult> F, Func<TResult, UResult> ResConv) {
+    return () => ResConv(F());
+  }
+  public static Func<U1, U2, UResult> DowncastClone<T1, T2, TResult, U1, U2, UResult>(this Func<T1, T2, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2)));
+  }
+  public static Func<U1, U2, U3, UResult> DowncastClone<T1, T2, T3, TResult, U1, U2, U3, UResult>(this Func<T1, T2, T3, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3)));
+  }
+  public static Func<U1, U2, U3, U4, UResult> DowncastClone<T1, T2, T3, T4, TResult, U1, U2, U3, U4, UResult>(this Func<T1, T2, T3, T4, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, TResult, U1, U2, U3, U4, U5, U6, U7, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7)));
+  }
+  public static Func<U1, U2, U3, U4, U5, UResult> DowncastClone<T1, T2, T3, T4, T5, TResult, U1, U2, U3, U4, U5, UResult>(this Func<T1, T2, T3, T4, T5, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5)));
+  }
+}
+// end of class FuncExtensions
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/RAST.cs b/Source/DafnyCore/GeneratedFromDafny/RAST.cs
new file mode 100644
index 00000000000..468aef7d5d7
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/RAST.cs
@@ -0,0 +1,8912 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace RAST {
+
+  public partial class __default {
+    public static __A FoldLeft<__A, __T>(Func<__A, __T, __A> f, __A init, Dafny.ISequence<__T> xs)
+    {
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return init;
+      } else {
+        Func<__A, __T, __A> _in0 = f;
+        __A _in1 = Dafny.Helpers.Id<Func<__A, __T, __A>>(f)(init, (xs).Select(BigInteger.Zero));
+        Dafny.ISequence<__T> _in2 = (xs).Drop(BigInteger.One);
+        f = _in0;
+        init = _in1;
+        xs = _in2;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> ToDocstringPrefix(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.Rune> ind)
+    {
+      if ((docString).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("/// "), RAST.__default.AddIndent(docString, Dafny.Sequence<Dafny.Rune>.Concat(ind, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("/// ")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind);
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> SeqToString<__T>(Dafny.ISequence<__T> s, Func<__T, Dafny.ISequence<Dafny.Rune>> f, Dafny.ISequence<Dafny.Rune> separator)
+    {
+      if ((new BigInteger((s).Count)).Sign == 0) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Helpers.Id<Func<__T, Dafny.ISequence<Dafny.Rune>>>(f)((s).Select(BigInteger.Zero)), (((new BigInteger((s).Count)) > (BigInteger.One)) ? (Dafny.Sequence<Dafny.Rune>.Concat(separator, RAST.__default.SeqToString<__T>((s).Drop(BigInteger.One), f, separator))) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))));
+      }
+    }
+    public static RAST._IType ObjectType(RAST._IType underlying) {
+      return ((RAST.__default.ObjectPath).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(underlying));
+    }
+    public static RAST._IType PtrType(RAST._IType underlying) {
+      return ((RAST.__default.PtrPath).AsType()).Apply(Dafny.Sequence<RAST._IType>.FromElements(underlying));
+    }
+    public static RAST._IType Rc(RAST._IType underlying) {
+      return RAST.Type.create_TypeApp(RAST.__default.RcType, Dafny.Sequence<RAST._IType>.FromElements(underlying));
+    }
+    public static RAST._IType RefCell(RAST._IType underlying) {
+      return RAST.Type.create_TypeApp(RAST.__default.RefcellType, Dafny.Sequence<RAST._IType>.FromElements(underlying));
+    }
+    public static RAST._IType Vec(RAST._IType underlying) {
+      return RAST.Type.create_TypeApp((((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("vec"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Vec"))).AsType(), Dafny.Sequence<RAST._IType>.FromElements(underlying));
+    }
+    public static RAST._IExpr NewVec(Dafny.ISequence<RAST._IExpr> elements) {
+      return (RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("vec!"))).Apply(elements);
+    }
+    public static RAST._IExpr Borrow(RAST._IExpr underlying) {
+      return RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), underlying, DAST.Format.UnaryOpFormat.create_NoFormat());
+    }
+    public static RAST._IExpr BorrowMut(RAST._IExpr underlying) {
+      return RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&mut"), underlying, DAST.Format.UnaryOpFormat.create_NoFormat());
+    }
+    public static RAST._IType RawType(Dafny.ISequence<Dafny.Rune> content) {
+      return RAST.Type.create_TIdentifier(content);
+    }
+    public static RAST._IType Box(RAST._IType content) {
+      return RAST.Type.create_TypeApp((RAST.__default.BoxPath).AsType(), Dafny.Sequence<RAST._IType>.FromElements(content));
+    }
+    public static RAST._IExpr BoxNew(RAST._IExpr content) {
+      return (((RAST.__default.BoxPath).AsExpr()).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("new"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(content));
+    }
+    public static RAST._IType SystemTupleType(Dafny.ISequence<RAST._IType> elements) {
+      return ((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_System"))).MSel(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Tuple"), Std.Strings.__default.OfNat(new BigInteger((elements).Count))))).AsType()).Apply(elements);
+    }
+    public static RAST._IExpr SystemTuple(Dafny.ISequence<RAST._IExpr> elements) {
+      Dafny.ISequence<Dafny.Rune> _0_size = Std.Strings.__default.OfNat(new BigInteger((elements).Count));
+      return RAST.Expr.create_StructBuild(((((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_System"))).MSel(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Tuple"), _0_size))).MSel(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_T"), _0_size))).AsExpr(), ((System.Func<Dafny.ISequence<RAST._IAssignIdentifier>>) (() => {
+  BigInteger dim10 = new BigInteger((elements).Count);
+  var arr10 = new RAST._IAssignIdentifier[Dafny.Helpers.ToIntChecked(dim10, "array size exceeds memory limit")];
+  for (int i10 = 0; i10 < dim10; i10++) {
+    var _1_i = (BigInteger) i10;
+    arr10[(int)(_1_i)] = RAST.AssignIdentifier.create(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_"), Std.Strings.__default.OfNat(_1_i)), (elements).Select(_1_i));
+  }
+  return Dafny.Sequence<RAST._IAssignIdentifier>.FromArray(arr10);
+}))());
+    }
+    public static RAST._IType MaybeUninitType(RAST._IType underlying) {
+      return (RAST.__default.MaybeUninitPathType).Apply(Dafny.Sequence<RAST._IType>.FromElements(underlying));
+    }
+    public static bool IsMaybeUninitType(RAST._IType tpe) {
+      return (((tpe).is_TypeApp) && (object.Equals((tpe).dtor_baseName, RAST.__default.MaybeUninitPathType))) && ((new BigInteger(((tpe).dtor_arguments).Count)) == (BigInteger.One));
+    }
+    public static RAST._IType MaybeUninitTypeUnderlying(RAST._IType tpe) {
+      return ((tpe).dtor_arguments).Select(BigInteger.Zero);
+    }
+    public static RAST._IExpr MaybeUninitNew(RAST._IExpr underlying) {
+      return ((RAST.__default.MaybeUninitPath).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("new"))).Apply(Dafny.Sequence<RAST._IExpr>.FromElements(underlying));
+    }
+    public static RAST._IType MaybePlaceboType(RAST._IType underlying) {
+      return ((RAST.__default.MaybePlaceboPath).AsType()).Apply1(underlying);
+    }
+    public static Dafny.ISequence<Dafny.Rune> AddIndent(Dafny.ISequence<Dafny.Rune> raw, Dafny.ISequence<Dafny.Rune> ind)
+    {
+      Dafny.ISequence<Dafny.Rune> _0___accumulator = Dafny.Sequence<Dafny.Rune>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((raw).Count)).Sign == 0) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, raw);
+      } else if ((Dafny.Sequence<Dafny.Rune>.UnicodeFromString("[({")).Contains((raw).Select(BigInteger.Zero))) {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.FromElements((raw).Select(BigInteger.Zero)));
+        Dafny.ISequence<Dafny.Rune> _in0 = (raw).Drop(BigInteger.One);
+        Dafny.ISequence<Dafny.Rune> _in1 = Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND);
+        raw = _in0;
+        ind = _in1;
+        goto TAIL_CALL_START;
+      } else if (((Dafny.Sequence<Dafny.Rune>.UnicodeFromString("})]")).Contains((raw).Select(BigInteger.Zero))) && ((new BigInteger((ind).Count)) > (new BigInteger(2)))) {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.FromElements((raw).Select(BigInteger.Zero)));
+        Dafny.ISequence<Dafny.Rune> _in2 = (raw).Drop(BigInteger.One);
+        Dafny.ISequence<Dafny.Rune> _in3 = (ind).Take((new BigInteger((ind).Count)) - (new BigInteger(2)));
+        raw = _in2;
+        ind = _in3;
+        goto TAIL_CALL_START;
+      } else if (((raw).Select(BigInteger.Zero)) == (new Dafny.Rune('\n'))) {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.FromElements((raw).Select(BigInteger.Zero)), ind));
+        Dafny.ISequence<Dafny.Rune> _in4 = (raw).Drop(BigInteger.One);
+        Dafny.ISequence<Dafny.Rune> _in5 = ind;
+        raw = _in4;
+        ind = _in5;
+        goto TAIL_CALL_START;
+      } else {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.FromElements((raw).Select(BigInteger.Zero)));
+        Dafny.ISequence<Dafny.Rune> _in6 = (raw).Drop(BigInteger.One);
+        Dafny.ISequence<Dafny.Rune> _in7 = ind;
+        raw = _in6;
+        ind = _in7;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static BigInteger max(BigInteger i, BigInteger j)
+    {
+      if ((i) < (j)) {
+        return j;
+      } else {
+        return i;
+      }
+    }
+    public static RAST._IExpr AssignVar(Dafny.ISequence<Dafny.Rune> name, RAST._IExpr rhs)
+    {
+      return RAST.Expr.create_Assign(Std.Wrappers.Option<RAST._IAssignLhs>.create_Some(RAST.AssignLhs.create_LocalVar(name)), rhs);
+    }
+    public static RAST._IExpr AssignMember(RAST._IExpr @on, Dafny.ISequence<Dafny.Rune> field, RAST._IExpr rhs)
+    {
+      return RAST.Expr.create_Assign(Std.Wrappers.Option<RAST._IAssignLhs>.create_Some(RAST.AssignLhs.create_SelectMember(@on, field)), rhs);
+    }
+    public static RAST._IExpr Unsafe(RAST._IExpr underlying) {
+      return RAST.Expr.create_UnaryOp(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unsafe"), underlying, DAST.Format.UnaryOpFormat.create_NoFormat());
+    }
+    public static RAST._IExpr MaybePlacebo(RAST._IExpr underlying) {
+      return ((RAST.__default.MaybePlaceboPath).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from"))).Apply1(underlying);
+    }
+    public static RAST._IExpr RcNew(RAST._IExpr underlying) {
+      return RAST.Expr.create_Call(RAST.__default.std__rc__Rc__new, Dafny.Sequence<RAST._IExpr>.FromElements(underlying));
+    }
+    public static RAST._IExpr IntoUsize(RAST._IExpr underlying) {
+      return (((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyUsize"))).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("into_usize"))).Apply1(underlying);
+    }
+    public static Dafny.ISequence<Dafny.Rune> IND { get {
+      return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("    ");
+    } }
+    public static RAST._IType SelfOwned { get {
+      return (RAST.Path.create_Self()).AsType();
+    } }
+    public static RAST._IType SelfBorrowed { get {
+      return RAST.Type.create_Borrowed(RAST.__default.SelfOwned);
+    } }
+    public static RAST._IType SelfBorrowedMut { get {
+      return RAST.Type.create_BorrowedMut(RAST.__default.SelfOwned);
+    } }
+    public static RAST._IPath @global { get {
+      return RAST.Path.create_Global();
+    } }
+    public static RAST._IPath std { get {
+      return (RAST.__default.@global).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("std"));
+    } }
+    public static RAST._IPath RcPath { get {
+      return ((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("rc"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Rc"));
+    } }
+    public static RAST._IType RcType { get {
+      return (RAST.__default.RcPath).AsType();
+    } }
+    public static RAST._IPath dafny__runtime { get {
+      return (RAST.__default.@global).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dafny_runtime"));
+    } }
+    public static RAST._IPath ObjectPath { get {
+      return (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Object"));
+    } }
+    public static RAST._IExpr Object { get {
+      return (RAST.__default.ObjectPath).AsExpr();
+    } }
+    public static RAST._IPath PtrPath { get {
+      return (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Ptr"));
+    } }
+    public static RAST._IPath BoxPath { get {
+      return ((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("boxed"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Box"));
+    } }
+    public static RAST._IExpr Ptr { get {
+      return (RAST.__default.PtrPath).AsExpr();
+    } }
+    public static RAST._IPath cell { get {
+      return (RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("cell"));
+    } }
+    public static RAST._IType RefcellType { get {
+      return ((RAST.__default.cell).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("RefCell"))).AsType();
+    } }
+    public static RAST._IType CloneTrait { get {
+      return (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("clone"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Clone"))).AsType();
+    } }
+    public static RAST._IPath std__default__Default { get {
+      return ((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("default"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Default"));
+    } }
+    public static RAST._IType DefaultTrait { get {
+      return (RAST.__default.std__default__Default).AsType();
+    } }
+    public static RAST._IType AnyTrait { get {
+      return (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("any"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Any"))).AsType();
+    } }
+    public static RAST._IType StaticTrait { get {
+      return RAST.__default.RawType(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("'static"));
+    } }
+    public static RAST._IType DafnyType { get {
+      return ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyType"))).AsType();
+    } }
+    public static RAST._IType DafnyPrint { get {
+      return ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyPrint"))).AsType();
+    } }
+    public static RAST._IType DafnyTypeEq { get {
+      return ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyTypeEq"))).AsType();
+    } }
+    public static RAST._IType Eq { get {
+      return (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("cmp"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Eq"))).AsType();
+    } }
+    public static RAST._IType Hash { get {
+      return (((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("hash"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Hash"))).AsType();
+    } }
+    public static RAST._IType DafnyInt { get {
+      return ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("DafnyInt"))).AsType();
+    } }
+    public static RAST._IPath MaybeUninitPath { get {
+      return ((RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("mem"))).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("MaybeUninit"));
+    } }
+    public static RAST._IType MaybeUninitPathType { get {
+      return (RAST.__default.MaybeUninitPath).AsType();
+    } }
+    public static RAST._IExpr MaybeUninitExpr { get {
+      return (RAST.__default.MaybeUninitPath).AsExpr();
+    } }
+    public static RAST._IPath MaybePlaceboPath { get {
+      return (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("MaybePlacebo"));
+    } }
+    public static RAST._IExpr self { get {
+      return RAST.Expr.create_Identifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"));
+    } }
+    public static RAST._IPath crate { get {
+      return RAST.Path.create_Crate();
+    } }
+    public static RAST._IExpr dafny__runtime__Set { get {
+      return ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Set"))).AsExpr();
+    } }
+    public static RAST._IExpr dafny__runtime__Set__from__array { get {
+      return (RAST.__default.dafny__runtime__Set).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from_array"));
+    } }
+    public static RAST._IExpr dafny__runtime__Sequence { get {
+      return ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Sequence"))).AsExpr();
+    } }
+    public static RAST._IExpr Sequence__from__array__owned { get {
+      return (RAST.__default.dafny__runtime__Sequence).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from_array_owned"));
+    } }
+    public static RAST._IExpr Sequence__from__array { get {
+      return (RAST.__default.dafny__runtime__Sequence).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from_array"));
+    } }
+    public static RAST._IExpr dafny__runtime__Multiset { get {
+      return ((RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Multiset"))).AsExpr();
+    } }
+    public static RAST._IExpr dafny__runtime__Multiset__from__array { get {
+      return (RAST.__default.dafny__runtime__Multiset).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("from_array"));
+    } }
+    public static RAST._IPath std__rc { get {
+      return (RAST.__default.std).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("rc"));
+    } }
+    public static RAST._IPath std__rc__Rc { get {
+      return (RAST.__default.std__rc).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Rc"));
+    } }
+    public static RAST._IExpr std__rc__Rc__new { get {
+      return (RAST.__default.std__rc__Rc).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("new"));
+    } }
+    public static RAST._IExpr std__default__Default__default { get {
+      return ((RAST.__default.std__default__Default).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("default"))).Apply0();
+    } }
+    public static Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> NoAttr { get {
+      return Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements();
+    } }
+    public static BigInteger MAX__TUPLE__SIZE { get {
+      return new BigInteger(12);
+    } }
+    public static Dafny.ISequence<Dafny.Rune> NoDoc { get {
+      return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+    } }
+  }
+
+  public interface _IRASTTopDownVisitor<T> {
+    bool is_RASTTopDownVisitor { get; }
+    Func<T, RAST._IType, T> dtor_VisitTypeSingle { get; }
+    Func<T, RAST._IExpr, T> dtor_VisitExprSingle { get; }
+    Func<T, RAST._IModDecl, RAST._IPath, T> dtor_VisitModDeclSingle { get; }
+    bool dtor_recurseSubmodules { get; }
+    _IRASTTopDownVisitor<__T> DowncastClone<__T>(Func<T, __T> converter0);
+    T VisitMod(T acc, RAST._IMod mod, RAST._IPath SelfPath);
+    T VisitTypeParams(T acc, Dafny.ISequence<RAST._ITypeParamDecl> typeParams);
+    T VisitFields(T acc, RAST._IFields fields);
+    T VisitModMapping(T acc, RAST._IModDecl modDecl, RAST._IPath SelfPath);
+    T VisitStructMapping(T acc, RAST._IStruct @struct);
+    T VisitTraitDecl(T acc, RAST._ITrait tr);
+    T VisitTopFn(T acc, RAST._ITopFnDecl t);
+    T VisitUse(T acc, RAST._IUse u);
+    T VisitType(T acc, RAST._IType tpe);
+    T VisitImplMapping(T acc, RAST._IImpl impl);
+    T VisitBody(T acc, Dafny.ISequence<RAST._IImplMember> members);
+    T VisitMember(T acc, RAST._IImplMember member);
+    T VisitFn(T acc, RAST._IFn fn);
+  }
+  public class RASTTopDownVisitor<T> : _IRASTTopDownVisitor<T> {
+    public readonly Func<T, RAST._IType, T> _VisitTypeSingle;
+    public readonly Func<T, RAST._IExpr, T> _VisitExprSingle;
+    public readonly Func<T, RAST._IModDecl, RAST._IPath, T> _VisitModDeclSingle;
+    public readonly bool _recurseSubmodules;
+    public RASTTopDownVisitor(Func<T, RAST._IType, T> VisitTypeSingle, Func<T, RAST._IExpr, T> VisitExprSingle, Func<T, RAST._IModDecl, RAST._IPath, T> VisitModDeclSingle, bool recurseSubmodules) {
+      this._VisitTypeSingle = VisitTypeSingle;
+      this._VisitExprSingle = VisitExprSingle;
+      this._VisitModDeclSingle = VisitModDeclSingle;
+      this._recurseSubmodules = recurseSubmodules;
+    }
+    public _IRASTTopDownVisitor<__T> DowncastClone<__T>(Func<T, __T> converter0) {
+      if (this is _IRASTTopDownVisitor<__T> dt) { return dt; }
+      return new RASTTopDownVisitor<__T>((_VisitTypeSingle).DowncastClone<T, RAST._IType, T, __T, RAST._IType, __T>(Dafny.Helpers.CastConverter<__T, T>, Dafny.Helpers.Id<RAST._IType>, Dafny.Helpers.CastConverter<T, __T>), (_VisitExprSingle).DowncastClone<T, RAST._IExpr, T, __T, RAST._IExpr, __T>(Dafny.Helpers.CastConverter<__T, T>, Dafny.Helpers.Id<RAST._IExpr>, Dafny.Helpers.CastConverter<T, __T>), (_VisitModDeclSingle).DowncastClone<T, RAST._IModDecl, RAST._IPath, T, __T, RAST._IModDecl, RAST._IPath, __T>(Dafny.Helpers.CastConverter<__T, T>, Dafny.Helpers.Id<RAST._IModDecl>, Dafny.Helpers.Id<RAST._IPath>, Dafny.Helpers.CastConverter<T, __T>), _recurseSubmodules);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.RASTTopDownVisitor<T>;
+      return oth != null && object.Equals(this._VisitTypeSingle, oth._VisitTypeSingle) && object.Equals(this._VisitExprSingle, oth._VisitExprSingle) && object.Equals(this._VisitModDeclSingle, oth._VisitModDeclSingle) && this._recurseSubmodules == oth._recurseSubmodules;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._VisitTypeSingle));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._VisitExprSingle));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._VisitModDeclSingle));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._recurseSubmodules));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.RASTTopDownVisitor.RASTTopDownVisitor";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._VisitTypeSingle);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._VisitExprSingle);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._VisitModDeclSingle);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._recurseSubmodules);
+      s += ")";
+      return s;
+    }
+    public static RAST._IRASTTopDownVisitor<T> Default(T _default_T) {
+      return create(((T x2, RAST._IType x3) => _default_T), ((T x4, RAST._IExpr x5) => _default_T), ((T x6, RAST._IModDecl x7, RAST._IPath x8) => _default_T), false);
+    }
+    public static Dafny.TypeDescriptor<RAST._IRASTTopDownVisitor<T>> _TypeDescriptor(Dafny.TypeDescriptor<T> _td_T) {
+      return new Dafny.TypeDescriptor<RAST._IRASTTopDownVisitor<T>>(RAST.RASTTopDownVisitor<T>.Default(_td_T.Default()));
+    }
+    public static _IRASTTopDownVisitor<T> create(Func<T, RAST._IType, T> VisitTypeSingle, Func<T, RAST._IExpr, T> VisitExprSingle, Func<T, RAST._IModDecl, RAST._IPath, T> VisitModDeclSingle, bool recurseSubmodules) {
+      return new RASTTopDownVisitor<T>(VisitTypeSingle, VisitExprSingle, VisitModDeclSingle, recurseSubmodules);
+    }
+    public static _IRASTTopDownVisitor<T> create_RASTTopDownVisitor(Func<T, RAST._IType, T> VisitTypeSingle, Func<T, RAST._IExpr, T> VisitExprSingle, Func<T, RAST._IModDecl, RAST._IPath, T> VisitModDeclSingle, bool recurseSubmodules) {
+      return create(VisitTypeSingle, VisitExprSingle, VisitModDeclSingle, recurseSubmodules);
+    }
+    public bool is_RASTTopDownVisitor { get { return true; } }
+    public Func<T, RAST._IType, T> dtor_VisitTypeSingle {
+      get {
+        return this._VisitTypeSingle;
+      }
+    }
+    public Func<T, RAST._IExpr, T> dtor_VisitExprSingle {
+      get {
+        return this._VisitExprSingle;
+      }
+    }
+    public Func<T, RAST._IModDecl, RAST._IPath, T> dtor_VisitModDeclSingle {
+      get {
+        return this._VisitModDeclSingle;
+      }
+    }
+    public bool dtor_recurseSubmodules {
+      get {
+        return this._recurseSubmodules;
+      }
+    }
+    public T VisitMod(T acc, RAST._IMod mod, RAST._IPath SelfPath)
+    {
+      return (mod).Fold<T>(acc, Dafny.Helpers.Id<Func<RAST._IPath, RAST._IMod, Func<T, RAST._IModDecl, T>>>((_0_SelfPath, _1_mod) => ((System.Func<T, RAST._IModDecl, T>)((_2_acc, _3_modDecl) => {
+        return (this).VisitModMapping(_2_acc, _3_modDecl, _0_SelfPath);
+      })))(SelfPath, mod));
+    }
+    public T VisitTypeParams(T acc, Dafny.ISequence<RAST._ITypeParamDecl> typeParams)
+    {
+      return RAST.__default.FoldLeft<T, RAST._ITypeParamDecl>(((System.Func<T, RAST._ITypeParamDecl, T>)((_0_acc, _1_t) => {
+        return RAST.__default.FoldLeft<T, RAST._IType>(((System.Func<T, RAST._IType, T>)((_2_acc, _3_t) => {
+          return (this).VisitType(_2_acc, _3_t);
+        })), _0_acc, (_1_t).dtor_constraints);
+      })), acc, typeParams);
+    }
+    public T VisitFields(T acc, RAST._IFields fields)
+    {
+      RAST._IFields _source0 = fields;
+      {
+        if (_source0.is_NamedFields) {
+          Dafny.ISequence<RAST._IField> _0_sFields = _source0.dtor_fields;
+          return RAST.__default.FoldLeft<T, RAST._IField>(((System.Func<T, RAST._IField, T>)((_1_acc, _2_f) => {
+            return (this).VisitType(_1_acc, ((_2_f).dtor_formal).dtor_tpe);
+          })), acc, _0_sFields);
+        }
+      }
+      {
+        Dafny.ISequence<RAST._INamelessField> _3_sFields = _source0.dtor_types;
+        return RAST.__default.FoldLeft<T, RAST._INamelessField>(((System.Func<T, RAST._INamelessField, T>)((_4_acc, _5_f) => {
+          return (this).VisitType(_4_acc, (_5_f).dtor_tpe);
+        })), acc, _3_sFields);
+      }
+    }
+    public T VisitModMapping(T acc, RAST._IModDecl modDecl, RAST._IPath SelfPath)
+    {
+      T _0_acc = Dafny.Helpers.Id<Func<T, RAST._IModDecl, RAST._IPath, T>>((this).dtor_VisitModDeclSingle)(acc, modDecl, SelfPath);
+      RAST._IModDecl _source0 = modDecl;
+      {
+        if (_source0.is_ModDecl) {
+          RAST._IMod _1_mod = _source0.dtor_mod;
+          if ((this).dtor_recurseSubmodules) {
+            return (this).VisitMod(_0_acc, _1_mod, (SelfPath).MSel((_1_mod).dtor_name));
+          } else {
+            return _0_acc;
+          }
+        }
+      }
+      {
+        if (_source0.is_StructDecl) {
+          RAST._IStruct _2_struct = _source0.dtor_struct;
+          return (this).VisitStructMapping(_0_acc, _2_struct);
+        }
+      }
+      {
+        if (_source0.is_TypeDecl) {
+          RAST._ITypeSynonym tpe0 = _source0.dtor_tpe;
+          Dafny.ISequence<Dafny.Rune> _3_attributes = tpe0.dtor_docString;
+          Dafny.ISequence<Dafny.Rune> _4_name = tpe0.dtor_name;
+          Dafny.ISequence<RAST._ITypeParamDecl> _5_typeParams = tpe0.dtor_typeParams;
+          RAST._IType _6_tpe = tpe0.dtor_tpe;
+          T _7_acc = (this).VisitTypeParams(_0_acc, _5_typeParams);
+          T _8_acc = (this).VisitType(_7_acc, _6_tpe);
+          return _8_acc;
+        }
+      }
+      {
+        if (_source0.is_ConstDecl) {
+          RAST._IConstant c0 = _source0.dtor_c;
+          Dafny.ISequence<Dafny.Rune> _9_attributes = c0.dtor_docString;
+          Dafny.ISequence<Dafny.Rune> _10_name = c0.dtor_name;
+          RAST._IType _11_tpe = c0.dtor_tpe;
+          RAST._IExpr _12_value = c0.dtor_value;
+          T _13_acc = (this).VisitType(_0_acc, _11_tpe);
+          T _14_acc = (_12_value).Fold<T>(_13_acc, (this).dtor_VisitExprSingle, (this).dtor_VisitTypeSingle);
+          return _14_acc;
+        }
+      }
+      {
+        if (_source0.is_EnumDecl) {
+          RAST._IEnum enum0 = _source0.dtor_enum;
+          Dafny.ISequence<Dafny.Rune> _15_attributes = enum0.dtor_docString;
+          Dafny.ISequence<Dafny.Rune> _16_name = enum0.dtor_name;
+          Dafny.ISequence<RAST._ITypeParamDecl> _17_typeParams = enum0.dtor_typeParams;
+          Dafny.ISequence<RAST._IEnumCase> _18_variants = enum0.dtor_variants;
+          return RAST.__default.FoldLeft<T, RAST._IEnumCase>(Dafny.Helpers.Id<Func<Dafny.ISequence<RAST._IEnumCase>, Func<T, RAST._IEnumCase, T>>>((_19_variants) => ((System.Func<T, RAST._IEnumCase, T>)((_20_acc, _21_enumCase) => {
+            return (this).VisitFields(_20_acc, (_21_enumCase).dtor_fields);
+          })))(_18_variants), (this).VisitTypeParams(_0_acc, _17_typeParams), _18_variants);
+        }
+      }
+      {
+        if (_source0.is_ImplDecl) {
+          RAST._IImpl _22_impl = _source0.dtor_impl;
+          return (this).VisitImplMapping(_0_acc, _22_impl);
+        }
+      }
+      {
+        if (_source0.is_TraitDecl) {
+          RAST._ITrait _23_tr = _source0.dtor_tr;
+          return (this).VisitTraitDecl(_0_acc, _23_tr);
+        }
+      }
+      {
+        if (_source0.is_TopFnDecl) {
+          RAST._ITopFnDecl _24_fn = _source0.dtor_fn;
+          return (this).VisitTopFn(_0_acc, _24_fn);
+        }
+      }
+      {
+        RAST._IUse _25_use = _source0.dtor_use;
+        return (this).VisitUse(_0_acc, _25_use);
+      }
+    }
+    public T VisitStructMapping(T acc, RAST._IStruct @struct)
+    {
+      return (this).VisitTypeParams(acc, (@struct).dtor_typeParams);
+    }
+    public T VisitTraitDecl(T acc, RAST._ITrait tr)
+    {
+      RAST._ITrait _source0 = tr;
+      {
+        Dafny.ISequence<RAST._ITypeParamDecl> _0_typeParams = _source0.dtor_typeParams;
+        RAST._IType _1_tpe = _source0.dtor_tpe;
+        Dafny.ISequence<RAST._IType> _2_parents = _source0.dtor_parents;
+        Dafny.ISequence<RAST._IImplMember> _3_body = _source0.dtor_body;
+        T _4_acc = (this).VisitTypeParams(acc, _0_typeParams);
+        T _5_acc = (_1_tpe).Fold<T>(_4_acc, (this).dtor_VisitTypeSingle);
+        T _6_acc = RAST.__default.FoldLeft<T, RAST._IType>(((System.Func<T, RAST._IType, T>)((_7_acc, _8_parent) => {
+          return (_8_parent).Fold<T>(_7_acc, (this).dtor_VisitTypeSingle);
+        })), _5_acc, _2_parents);
+        return (this).VisitBody(_6_acc, _3_body);
+      }
+    }
+    public T VisitTopFn(T acc, RAST._ITopFnDecl t)
+    {
+      RAST._ITopFnDecl _source0 = t;
+      {
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _0_attributes = _source0.dtor_attributes;
+        RAST._IVisibility _1_visibility = _source0.dtor_visibility;
+        RAST._IFn _2_fn = _source0.dtor_fn;
+        return (this).VisitFn(acc, _2_fn);
+      }
+    }
+    public T VisitUse(T acc, RAST._IUse u)
+    {
+      return acc;
+    }
+    public T VisitType(T acc, RAST._IType tpe)
+    {
+      return (tpe).Fold<T>(acc, ((System.Func<T, RAST._IType, T>)((_0_acc, _1_t) => {
+        return Dafny.Helpers.Id<Func<T, RAST._IType, T>>((this).dtor_VisitTypeSingle)(_0_acc, _1_t);
+      })));
+    }
+    public T VisitImplMapping(T acc, RAST._IImpl impl)
+    {
+      RAST._IImpl _source0 = impl;
+      {
+        if (_source0.is_ImplFor) {
+          Dafny.ISequence<RAST._ITypeParamDecl> _0_typeParams = _source0.dtor_typeParams;
+          RAST._IType _1_tpe = _source0.dtor_tpe;
+          RAST._IType _2_forType = _source0.dtor_forType;
+          Dafny.ISequence<RAST._IImplMember> _3_body = _source0.dtor_body;
+          T _4_acc = (this).VisitTypeParams(acc, _0_typeParams);
+          T _5_acc = (this).VisitType(_4_acc, _1_tpe);
+          T _6_acc = (this).VisitType(_5_acc, _2_forType);
+          return (this).VisitBody(_6_acc, _3_body);
+        }
+      }
+      {
+        Dafny.ISequence<RAST._ITypeParamDecl> _7_typeParams = _source0.dtor_typeParams;
+        RAST._IType _8_tpe = _source0.dtor_tpe;
+        Dafny.ISequence<RAST._IImplMember> _9_body = _source0.dtor_body;
+        T _10_acc = (this).VisitType(acc, _8_tpe);
+        return (this).VisitBody(_10_acc, _9_body);
+      }
+    }
+    public T VisitBody(T acc, Dafny.ISequence<RAST._IImplMember> members)
+    {
+      return RAST.__default.FoldLeft<T, RAST._IImplMember>(Dafny.Helpers.Id<Func<Dafny.ISequence<RAST._IImplMember>, Func<T, RAST._IImplMember, T>>>((_0_members) => ((System.Func<T, RAST._IImplMember, T>)((_1_acc, _2_member) => {
+        return (this).VisitMember(_1_acc, _2_member);
+      })))(members), acc, members);
+    }
+    public T VisitMember(T acc, RAST._IImplMember member)
+    {
+      RAST._IImplMember _source0 = member;
+      {
+        if (_source0.is_RawImplMember) {
+          Dafny.ISequence<Dafny.Rune> _0_content = _source0.dtor_content;
+          return acc;
+        }
+      }
+      {
+        if (_source0.is_FnDecl) {
+          Dafny.ISequence<Dafny.Rune> _1_docString = _source0.dtor_docString;
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _2_attributes = _source0.dtor_attributes;
+          RAST._IVisibility _3_pub = _source0.dtor_pub;
+          RAST._IFn _4_fun = _source0.dtor_fun;
+          return (this).VisitFn(acc, _4_fun);
+        }
+      }
+      {
+        if (_source0.is_TypeDeclMember) {
+          Dafny.ISequence<Dafny.Rune> _5_name = _source0.dtor_name;
+          RAST._IType _6_tpe = _source0.dtor_rhs;
+          return (this).VisitType(acc, _6_tpe);
+        }
+      }
+      {
+        RAST._IExpr _7_expr = _source0.dtor_expr;
+        return (_7_expr).Fold<T>(acc, (this).dtor_VisitExprSingle, (this).dtor_VisitTypeSingle);
+      }
+    }
+    public T VisitFn(T acc, RAST._IFn fn)
+    {
+      RAST._IFn _source0 = fn;
+      {
+        Dafny.ISequence<Dafny.Rune> _0_name = _source0.dtor_name;
+        Dafny.ISequence<RAST._ITypeParamDecl> _1_typeParams = _source0.dtor_typeParams;
+        Dafny.ISequence<RAST._IFormal> _2_formals = _source0.dtor_formals;
+        Std.Wrappers._IOption<RAST._IType> _3_returnType = _source0.dtor_returnType;
+        Std.Wrappers._IOption<RAST._IExpr> _4_body = _source0.dtor_body;
+        T _5_acc = (this).VisitTypeParams(acc, _1_typeParams);
+        T _6_acc = RAST.__default.FoldLeft<T, RAST._IFormal>(Dafny.Helpers.Id<Func<Dafny.ISequence<RAST._IFormal>, Func<T, RAST._IFormal, T>>>((_7_formals) => ((System.Func<T, RAST._IFormal, T>)((_8_acc, _9_f) => {
+          return ((_9_f).dtor_tpe).Fold<T>(_8_acc, (this).dtor_VisitTypeSingle);
+        })))(_2_formals), _5_acc, _2_formals);
+        T _10_acc = (((_3_returnType).is_None) ? (_6_acc) : (((_3_returnType).dtor_value).Fold<T>(_6_acc, (this).dtor_VisitTypeSingle)));
+        T _11_acc = (((_4_body).is_None) ? (_10_acc) : (((_4_body).dtor_value).Fold<T>(_10_acc, (this).dtor_VisitExprSingle, (this).dtor_VisitTypeSingle)));
+        return _11_acc;
+      }
+    }
+  }
+
+  public interface _IRASTBottomUpReplacer {
+    bool is_RASTBottomUpReplacer { get; }
+    Func<RAST._IMod, RAST._IPath, RAST._IMod> dtor_ReplaceModSingle { get; }
+    Func<RAST._IType, RAST._IType> dtor_ReplaceTypeSingle { get; }
+    Func<RAST._IExpr, RAST._IExpr> dtor_ReplaceExprSingle { get; }
+    _IRASTBottomUpReplacer DowncastClone();
+    RAST._IMod ReplaceMod(RAST._IMod mod, RAST._IPath SelfPath);
+    RAST._IModDecl ReplaceModDecl(RAST._IModDecl modDecl, RAST._IPath SelfPath);
+    RAST._IStruct ReplaceStruct(RAST._IStruct @struct);
+    RAST._ITypeSynonym ReplaceTypeDecl(RAST._ITypeSynonym t);
+    RAST._IConstant ReplaceConst(RAST._IConstant t);
+    RAST._IEnum ReplaceEnum(RAST._IEnum @enum);
+    RAST._IEnumCase ReplaceEnumCase(RAST._IEnumCase enumCase);
+    RAST._IImpl ReplaceImplDecl(RAST._IImpl impl);
+    RAST._ITrait ReplaceTrait(RAST._ITrait tr);
+    RAST._ITopFnDecl ReplaceTopFn(RAST._ITopFnDecl t);
+    RAST._IFn ReplaceFn(RAST._IFn t);
+    RAST._IUse ReplaceUse(RAST._IUse use);
+    Dafny.ISequence<RAST._IImplMember> ReplaceBody(Dafny.ISequence<RAST._IImplMember> decls);
+    RAST._IImplMember ReplaceImplMember(RAST._IImplMember t);
+    RAST._IExpr ReplaceExpr(RAST._IExpr e);
+    Dafny.ISequence<RAST._ITypeParamDecl> ReplaceTypeParams(Dafny.ISequence<RAST._ITypeParamDecl> typeParams);
+    RAST._IType ReplaceType(RAST._IType t);
+    RAST._IFields ReplaceFields(RAST._IFields fields);
+  }
+  public class RASTBottomUpReplacer : _IRASTBottomUpReplacer {
+    public readonly Func<RAST._IMod, RAST._IPath, RAST._IMod> _ReplaceModSingle;
+    public readonly Func<RAST._IType, RAST._IType> _ReplaceTypeSingle;
+    public readonly Func<RAST._IExpr, RAST._IExpr> _ReplaceExprSingle;
+    public RASTBottomUpReplacer(Func<RAST._IMod, RAST._IPath, RAST._IMod> ReplaceModSingle, Func<RAST._IType, RAST._IType> ReplaceTypeSingle, Func<RAST._IExpr, RAST._IExpr> ReplaceExprSingle) {
+      this._ReplaceModSingle = ReplaceModSingle;
+      this._ReplaceTypeSingle = ReplaceTypeSingle;
+      this._ReplaceExprSingle = ReplaceExprSingle;
+    }
+    public _IRASTBottomUpReplacer DowncastClone() {
+      if (this is _IRASTBottomUpReplacer dt) { return dt; }
+      return new RASTBottomUpReplacer(_ReplaceModSingle, _ReplaceTypeSingle, _ReplaceExprSingle);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.RASTBottomUpReplacer;
+      return oth != null && object.Equals(this._ReplaceModSingle, oth._ReplaceModSingle) && object.Equals(this._ReplaceTypeSingle, oth._ReplaceTypeSingle) && object.Equals(this._ReplaceExprSingle, oth._ReplaceExprSingle);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._ReplaceModSingle));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._ReplaceTypeSingle));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._ReplaceExprSingle));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.RASTBottomUpReplacer.RASTBottomUpReplacer";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._ReplaceModSingle);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._ReplaceTypeSingle);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._ReplaceExprSingle);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IRASTBottomUpReplacer theDefault = create(((Func<RAST._IMod, RAST._IPath, RAST._IMod>)null), ((RAST._IType x9) => RAST.Type.Default()), ((RAST._IExpr x10) => RAST.Expr.Default()));
+    public static RAST._IRASTBottomUpReplacer Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IRASTBottomUpReplacer> _TYPE = new Dafny.TypeDescriptor<RAST._IRASTBottomUpReplacer>(RAST.RASTBottomUpReplacer.Default());
+    public static Dafny.TypeDescriptor<RAST._IRASTBottomUpReplacer> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IRASTBottomUpReplacer create(Func<RAST._IMod, RAST._IPath, RAST._IMod> ReplaceModSingle, Func<RAST._IType, RAST._IType> ReplaceTypeSingle, Func<RAST._IExpr, RAST._IExpr> ReplaceExprSingle) {
+      return new RASTBottomUpReplacer(ReplaceModSingle, ReplaceTypeSingle, ReplaceExprSingle);
+    }
+    public static _IRASTBottomUpReplacer create_RASTBottomUpReplacer(Func<RAST._IMod, RAST._IPath, RAST._IMod> ReplaceModSingle, Func<RAST._IType, RAST._IType> ReplaceTypeSingle, Func<RAST._IExpr, RAST._IExpr> ReplaceExprSingle) {
+      return create(ReplaceModSingle, ReplaceTypeSingle, ReplaceExprSingle);
+    }
+    public bool is_RASTBottomUpReplacer { get { return true; } }
+    public Func<RAST._IMod, RAST._IPath, RAST._IMod> dtor_ReplaceModSingle {
+      get {
+        return this._ReplaceModSingle;
+      }
+    }
+    public Func<RAST._IType, RAST._IType> dtor_ReplaceTypeSingle {
+      get {
+        return this._ReplaceTypeSingle;
+      }
+    }
+    public Func<RAST._IExpr, RAST._IExpr> dtor_ReplaceExprSingle {
+      get {
+        return this._ReplaceExprSingle;
+      }
+    }
+    public RAST._IMod ReplaceMod(RAST._IMod mod, RAST._IPath SelfPath)
+    {
+      if ((mod).is_ExternMod) {
+        return mod;
+      } else {
+        Dafny.ISequence<RAST._IModDecl> _0_newModDeclarations = (mod).Fold<Dafny.ISequence<RAST._IModDecl>>(Dafny.Sequence<RAST._IModDecl>.FromElements(), Dafny.Helpers.Id<Func<RAST._IPath, RAST._IMod, Func<Dafny.ISequence<RAST._IModDecl>, RAST._IModDecl, Dafny.ISequence<RAST._IModDecl>>>>((_1_SelfPath, _2_mod) => ((System.Func<Dafny.ISequence<RAST._IModDecl>, RAST._IModDecl, Dafny.ISequence<RAST._IModDecl>>)((_3_current, _4_modDecl) => {
+          return Dafny.Sequence<RAST._IModDecl>.Concat(_3_current, Dafny.Sequence<RAST._IModDecl>.FromElements((this).ReplaceModDecl(_4_modDecl, _1_SelfPath)));
+        })))(SelfPath, mod));
+        RAST._IMod _5_dt__update__tmp_h0 = mod;
+        Dafny.ISequence<RAST._IModDecl> _6_dt__update_hbody_h0 = _0_newModDeclarations;
+        return RAST.Mod.create_Mod((_5_dt__update__tmp_h0).dtor_docString, (_5_dt__update__tmp_h0).dtor_attributes, (_5_dt__update__tmp_h0).dtor_name, _6_dt__update_hbody_h0);
+      }
+    }
+    public RAST._IModDecl ReplaceModDecl(RAST._IModDecl modDecl, RAST._IPath SelfPath)
+    {
+      RAST._IModDecl _source0 = modDecl;
+      {
+        if (_source0.is_ModDecl) {
+          RAST._IMod _0_mod = _source0.dtor_mod;
+          return RAST.ModDecl.create_ModDecl(Dafny.Helpers.Id<Func<RAST._IMod, RAST._IPath, RAST._IMod>>((this).dtor_ReplaceModSingle)(_0_mod, (SelfPath).MSel((_0_mod).dtor_name)));
+        }
+      }
+      {
+        if (_source0.is_StructDecl) {
+          RAST._IStruct _1_struct = _source0.dtor_struct;
+          return RAST.ModDecl.create_StructDecl((this).ReplaceStruct(_1_struct));
+        }
+      }
+      {
+        if (_source0.is_TypeDecl) {
+          RAST._ITypeSynonym _2_tpe = _source0.dtor_tpe;
+          return RAST.ModDecl.create_TypeDecl((this).ReplaceTypeDecl(_2_tpe));
+        }
+      }
+      {
+        if (_source0.is_ConstDecl) {
+          RAST._IConstant _3_c = _source0.dtor_c;
+          return RAST.ModDecl.create_ConstDecl((this).ReplaceConst(_3_c));
+        }
+      }
+      {
+        if (_source0.is_EnumDecl) {
+          RAST._IEnum _4_enum = _source0.dtor_enum;
+          return RAST.ModDecl.create_EnumDecl((this).ReplaceEnum(_4_enum));
+        }
+      }
+      {
+        if (_source0.is_ImplDecl) {
+          RAST._IImpl _5_impl = _source0.dtor_impl;
+          return RAST.ModDecl.create_ImplDecl((this).ReplaceImplDecl(_5_impl));
+        }
+      }
+      {
+        if (_source0.is_TraitDecl) {
+          RAST._ITrait _6_tr = _source0.dtor_tr;
+          return RAST.ModDecl.create_TraitDecl((this).ReplaceTrait(_6_tr));
+        }
+      }
+      {
+        if (_source0.is_TopFnDecl) {
+          RAST._ITopFnDecl _7_fn = _source0.dtor_fn;
+          return RAST.ModDecl.create_TopFnDecl((this).ReplaceTopFn(_7_fn));
+        }
+      }
+      {
+        RAST._IUse _8_use = _source0.dtor_use;
+        return RAST.ModDecl.create_UseDecl((this).ReplaceUse(_8_use));
+      }
+    }
+    public RAST._IStruct ReplaceStruct(RAST._IStruct @struct) {
+      RAST._IStruct _source0 = @struct;
+      {
+        Dafny.ISequence<Dafny.Rune> _0_docString = _source0.dtor_docString;
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _1_attributes = _source0.dtor_attributes;
+        Dafny.ISequence<Dafny.Rune> _2_name = _source0.dtor_name;
+        Dafny.ISequence<RAST._ITypeParamDecl> _3_typeParams = _source0.dtor_typeParams;
+        RAST._IFields _4_fields = _source0.dtor_fields;
+        return RAST.Struct.create(_0_docString, _1_attributes, _2_name, (this).ReplaceTypeParams(_3_typeParams), (this).ReplaceFields(_4_fields));
+      }
+    }
+    public RAST._ITypeSynonym ReplaceTypeDecl(RAST._ITypeSynonym t) {
+      RAST._ITypeSynonym _source0 = t;
+      {
+        Dafny.ISequence<Dafny.Rune> _0_docString = _source0.dtor_docString;
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _1_attributes = _source0.dtor_attributes;
+        Dafny.ISequence<Dafny.Rune> _2_name = _source0.dtor_name;
+        Dafny.ISequence<RAST._ITypeParamDecl> _3_typeParams = _source0.dtor_typeParams;
+        RAST._IType _4_tpe = _source0.dtor_tpe;
+        return RAST.TypeSynonym.create(_0_docString, _1_attributes, _2_name, (this).ReplaceTypeParams(_3_typeParams), (this).ReplaceType(_4_tpe));
+      }
+    }
+    public RAST._IConstant ReplaceConst(RAST._IConstant t) {
+      RAST._IConstant _source0 = t;
+      {
+        Dafny.ISequence<Dafny.Rune> _0_docString = _source0.dtor_docString;
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _1_attributes = _source0.dtor_attributes;
+        Dafny.ISequence<Dafny.Rune> _2_name = _source0.dtor_name;
+        RAST._IType _3_tpe = _source0.dtor_tpe;
+        RAST._IExpr _4_value = _source0.dtor_value;
+        return RAST.Constant.create(_0_docString, _1_attributes, _2_name, (this).ReplaceType(_3_tpe), (this).ReplaceExpr(_4_value));
+      }
+    }
+    public RAST._IEnum ReplaceEnum(RAST._IEnum @enum) {
+      RAST._IEnum _source0 = @enum;
+      {
+        Dafny.ISequence<Dafny.Rune> _0_docString = _source0.dtor_docString;
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _1_attributes = _source0.dtor_attributes;
+        Dafny.ISequence<Dafny.Rune> _2_name = _source0.dtor_name;
+        Dafny.ISequence<RAST._ITypeParamDecl> _3_typeParams = _source0.dtor_typeParams;
+        Dafny.ISequence<RAST._IEnumCase> _4_variants = _source0.dtor_variants;
+        return RAST.Enum.create(_0_docString, _1_attributes, _2_name, (this).ReplaceTypeParams(_3_typeParams), Std.Collections.Seq.__default.Map<RAST._IEnumCase, RAST._IEnumCase>(((System.Func<RAST._IEnumCase, RAST._IEnumCase>)((_5_t) => {
+  return (this).ReplaceEnumCase(_5_t);
+})), _4_variants));
+      }
+    }
+    public RAST._IEnumCase ReplaceEnumCase(RAST._IEnumCase enumCase) {
+      RAST._IEnumCase _source0 = enumCase;
+      {
+        Dafny.ISequence<Dafny.Rune> _0_docString = _source0.dtor_docString;
+        Dafny.ISequence<Dafny.Rune> _1_name = _source0.dtor_name;
+        RAST._IFields _2_fields = _source0.dtor_fields;
+        return RAST.EnumCase.create(_0_docString, _1_name, (this).ReplaceFields(_2_fields));
+      }
+    }
+    public RAST._IImpl ReplaceImplDecl(RAST._IImpl impl) {
+      RAST._IImpl _source0 = impl;
+      {
+        if (_source0.is_ImplFor) {
+          Dafny.ISequence<RAST._ITypeParamDecl> _0_typeParams = _source0.dtor_typeParams;
+          RAST._IType _1_tpe = _source0.dtor_tpe;
+          RAST._IType _2_forType = _source0.dtor_forType;
+          Dafny.ISequence<RAST._IImplMember> _3_body = _source0.dtor_body;
+          return RAST.Impl.create_ImplFor((this).ReplaceTypeParams(_0_typeParams), (this).ReplaceType(_1_tpe), (this).ReplaceType(_2_forType), (this).ReplaceBody(_3_body));
+        }
+      }
+      {
+        Dafny.ISequence<RAST._ITypeParamDecl> _4_typeParams = _source0.dtor_typeParams;
+        RAST._IType _5_tpe = _source0.dtor_tpe;
+        Dafny.ISequence<RAST._IImplMember> _6_body = _source0.dtor_body;
+        return RAST.Impl.create_Impl((this).ReplaceTypeParams(_4_typeParams), (this).ReplaceType(_5_tpe), (this).ReplaceBody(_6_body));
+      }
+    }
+    public RAST._ITrait ReplaceTrait(RAST._ITrait tr) {
+      RAST._ITrait _source0 = tr;
+      {
+        Dafny.ISequence<Dafny.Rune> _0_docString = _source0.dtor_docString;
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _1_attributes = _source0.dtor_attributes;
+        Dafny.ISequence<RAST._ITypeParamDecl> _2_typeParams = _source0.dtor_typeParams;
+        RAST._IType _3_tpe = _source0.dtor_tpe;
+        Dafny.ISequence<RAST._IType> _4_parents = _source0.dtor_parents;
+        Dafny.ISequence<RAST._IImplMember> _5_body = _source0.dtor_body;
+        return RAST.Trait.create(_0_docString, _1_attributes, (this).ReplaceTypeParams(_2_typeParams), (this).ReplaceType(_3_tpe), Std.Collections.Seq.__default.Map<RAST._IType, RAST._IType>(((System.Func<RAST._IType, RAST._IType>)((_6_t) => {
+  return (this).ReplaceType(_6_t);
+})), _4_parents), (this).ReplaceBody(_5_body));
+      }
+    }
+    public RAST._ITopFnDecl ReplaceTopFn(RAST._ITopFnDecl t) {
+      RAST._ITopFnDecl _source0 = t;
+      {
+        Dafny.ISequence<Dafny.Rune> _0_docString = _source0.dtor_docString;
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _1_attributes = _source0.dtor_attributes;
+        RAST._IVisibility _2_visibility = _source0.dtor_visibility;
+        RAST._IFn _3_fn = _source0.dtor_fn;
+        return RAST.TopFnDecl.create(_0_docString, _1_attributes, _2_visibility, (this).ReplaceFn(_3_fn));
+      }
+    }
+    public RAST._IFn ReplaceFn(RAST._IFn t) {
+      RAST._IFn _source0 = t;
+      {
+        Dafny.ISequence<Dafny.Rune> _0_name = _source0.dtor_name;
+        Dafny.ISequence<RAST._ITypeParamDecl> _1_typeParams = _source0.dtor_typeParams;
+        Dafny.ISequence<RAST._IFormal> _2_formals = _source0.dtor_formals;
+        Std.Wrappers._IOption<RAST._IType> _3_returnType = _source0.dtor_returnType;
+        Std.Wrappers._IOption<RAST._IExpr> _4_body = _source0.dtor_body;
+        return RAST.Fn.create(_0_name, (this).ReplaceTypeParams(_1_typeParams), Std.Collections.Seq.__default.Map<RAST._IFormal, RAST._IFormal>(Dafny.Helpers.Id<Func<Dafny.ISequence<RAST._IFormal>, Func<RAST._IFormal, RAST._IFormal>>>((_5_formals) => ((System.Func<RAST._IFormal, RAST._IFormal>)((_6_f) => {
+  return (_6_f).Replace(this.ReplaceType);
+})))(_2_formals), _2_formals), (((_3_returnType).is_None) ? (Std.Wrappers.Option<RAST._IType>.create_None()) : (Std.Wrappers.Option<RAST._IType>.create_Some(((_3_returnType).dtor_value).Replace(this.ReplaceType)))), (((_4_body).is_None) ? (Std.Wrappers.Option<RAST._IExpr>.create_None()) : (Std.Wrappers.Option<RAST._IExpr>.create_Some(((_4_body).dtor_value).Replace(this.ReplaceExpr, this.ReplaceType)))));
+      }
+    }
+    public RAST._IUse ReplaceUse(RAST._IUse use) {
+      RAST._IUse _source0 = use;
+      {
+        RAST._IVisibility _0_visibility = _source0.dtor_visibility;
+        RAST._IPath _1_path = _source0.dtor_path;
+        return RAST.Use.create(_0_visibility, _1_path);
+      }
+    }
+    public Dafny.ISequence<RAST._IImplMember> ReplaceBody(Dafny.ISequence<RAST._IImplMember> decls) {
+      return Std.Collections.Seq.__default.Map<RAST._IImplMember, RAST._IImplMember>(((System.Func<RAST._IImplMember, RAST._IImplMember>)((_0_t) => {
+        return (this).ReplaceImplMember(_0_t);
+      })), decls);
+    }
+    public RAST._IImplMember ReplaceImplMember(RAST._IImplMember t) {
+      RAST._IImplMember _source0 = t;
+      {
+        if (_source0.is_RawImplMember) {
+          Dafny.ISequence<Dafny.Rune> _0_content = _source0.dtor_content;
+          return t;
+        }
+      }
+      {
+        if (_source0.is_FnDecl) {
+          Dafny.ISequence<Dafny.Rune> _1_docString = _source0.dtor_docString;
+          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _2_attributes = _source0.dtor_attributes;
+          RAST._IVisibility _3_pub = _source0.dtor_pub;
+          RAST._IFn _4_fun = _source0.dtor_fun;
+          return RAST.ImplMember.create_FnDecl(_1_docString, _2_attributes, _3_pub, (this).ReplaceFn(_4_fun));
+        }
+      }
+      {
+        if (_source0.is_TypeDeclMember) {
+          Dafny.ISequence<Dafny.Rune> _5_name = _source0.dtor_name;
+          RAST._IType _6_tpe = _source0.dtor_rhs;
+          return RAST.ImplMember.create_TypeDeclMember(_5_name, (this).ReplaceType(_6_tpe));
+        }
+      }
+      {
+        RAST._IExpr _7_expr = _source0.dtor_expr;
+        return RAST.ImplMember.create_ImplMemberMacro((this).ReplaceExpr(_7_expr));
+      }
+    }
+    public RAST._IExpr ReplaceExpr(RAST._IExpr e) {
+      return (e).Replace((this).dtor_ReplaceExprSingle, (this).dtor_ReplaceTypeSingle);
+    }
+    public Dafny.ISequence<RAST._ITypeParamDecl> ReplaceTypeParams(Dafny.ISequence<RAST._ITypeParamDecl> typeParams) {
+      return Std.Collections.Seq.__default.Map<RAST._ITypeParamDecl, RAST._ITypeParamDecl>(((System.Func<RAST._ITypeParamDecl, RAST._ITypeParamDecl>)((_0_t) => {
+        return Dafny.Helpers.Let<RAST._ITypeParamDecl, RAST._ITypeParamDecl>(_0_t, _pat_let5_0 => Dafny.Helpers.Let<RAST._ITypeParamDecl, RAST._ITypeParamDecl>(_pat_let5_0, _1_dt__update__tmp_h0 => Dafny.Helpers.Let<Dafny.ISequence<RAST._IType>, RAST._ITypeParamDecl>(Std.Collections.Seq.__default.Map<RAST._IType, RAST._IType>(((System.Func<RAST._IType, RAST._IType>)((_2_constraint) => {
+          return (this).ReplaceType(_2_constraint);
+        })), (_0_t).dtor_constraints), _pat_let6_0 => Dafny.Helpers.Let<Dafny.ISequence<RAST._IType>, RAST._ITypeParamDecl>(_pat_let6_0, _3_dt__update_hconstraints_h0 => RAST.TypeParamDecl.create((_1_dt__update__tmp_h0).dtor_name, _3_dt__update_hconstraints_h0)))));
+      })), typeParams);
+    }
+    public RAST._IType ReplaceType(RAST._IType t) {
+      return (t).Replace((this).dtor_ReplaceTypeSingle);
+    }
+    public RAST._IFields ReplaceFields(RAST._IFields fields) {
+      RAST._IFields _source0 = fields;
+      {
+        if (_source0.is_NamedFields) {
+          Dafny.ISequence<RAST._IField> _0_sFields = _source0.dtor_fields;
+          return RAST.Fields.create_NamedFields(Std.Collections.Seq.__default.Map<RAST._IField, RAST._IField>(((System.Func<RAST._IField, RAST._IField>)((_1_f) => {
+  return Dafny.Helpers.Let<RAST._IField, RAST._IField>(_1_f, _pat_let7_0 => Dafny.Helpers.Let<RAST._IField, RAST._IField>(_pat_let7_0, _2_dt__update__tmp_h0 => Dafny.Helpers.Let<RAST._IFormal, RAST._IField>(Dafny.Helpers.Let<RAST._IFormal, RAST._IFormal>((_1_f).dtor_formal, _pat_let9_0 => Dafny.Helpers.Let<RAST._IFormal, RAST._IFormal>(_pat_let9_0, _3_dt__update__tmp_h1 => Dafny.Helpers.Let<RAST._IType, RAST._IFormal>((this).ReplaceType(((_1_f).dtor_formal).dtor_tpe), _pat_let10_0 => Dafny.Helpers.Let<RAST._IType, RAST._IFormal>(_pat_let10_0, _4_dt__update_htpe_h0 => RAST.Formal.create((_3_dt__update__tmp_h1).dtor_name, _4_dt__update_htpe_h0))))), _pat_let8_0 => Dafny.Helpers.Let<RAST._IFormal, RAST._IField>(_pat_let8_0, _5_dt__update_hformal_h0 => RAST.Field.create((_2_dt__update__tmp_h0).dtor_visibility, _5_dt__update_hformal_h0)))));
+})), _0_sFields));
+        }
+      }
+      {
+        Dafny.ISequence<RAST._INamelessField> _6_sFields = _source0.dtor_types;
+        return RAST.Fields.create_NamelessFields(Std.Collections.Seq.__default.Map<RAST._INamelessField, RAST._INamelessField>(((System.Func<RAST._INamelessField, RAST._INamelessField>)((_7_f) => {
+  return Dafny.Helpers.Let<RAST._INamelessField, RAST._INamelessField>(_7_f, _pat_let11_0 => Dafny.Helpers.Let<RAST._INamelessField, RAST._INamelessField>(_pat_let11_0, _8_dt__update__tmp_h2 => Dafny.Helpers.Let<RAST._IType, RAST._INamelessField>((this).ReplaceType((_7_f).dtor_tpe), _pat_let12_0 => Dafny.Helpers.Let<RAST._IType, RAST._INamelessField>(_pat_let12_0, _9_dt__update_htpe_h1 => RAST.NamelessField.create((_8_dt__update__tmp_h2).dtor_visibility, _9_dt__update_htpe_h1)))));
+})), _6_sFields));
+      }
+    }
+  }
+
+  public interface _IMod {
+    bool is_Mod { get; }
+    bool is_ExternMod { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<RAST._IModDecl> dtor_body { get; }
+    _IMod DowncastClone();
+    __T Fold<__T>(__T acc, Func<__T, RAST._IModDecl, __T> accBuilder);
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public abstract class Mod : _IMod {
+    public Mod() {
+    }
+    private static readonly RAST._IMod theDefault = create_Mod(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<RAST._IModDecl>.Empty);
+    public static RAST._IMod Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IMod> _TYPE = new Dafny.TypeDescriptor<RAST._IMod>(RAST.Mod.Default());
+    public static Dafny.TypeDescriptor<RAST._IMod> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IMod create_Mod(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._IModDecl> body) {
+      return new Mod_Mod(docString, attributes, name, body);
+    }
+    public static _IMod create_ExternMod(Dafny.ISequence<Dafny.Rune> name) {
+      return new Mod_ExternMod(name);
+    }
+    public bool is_Mod { get { return this is Mod_Mod; } }
+    public bool is_ExternMod { get { return this is Mod_ExternMod; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        var d = this;
+        return ((Mod_Mod)d)._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes {
+      get {
+        var d = this;
+        return ((Mod_Mod)d)._attributes;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        var d = this;
+        if (d is Mod_Mod) { return ((Mod_Mod)d)._name; }
+        return ((Mod_ExternMod)d)._name;
+      }
+    }
+    public Dafny.ISequence<RAST._IModDecl> dtor_body {
+      get {
+        var d = this;
+        return ((Mod_Mod)d)._body;
+      }
+    }
+    public abstract _IMod DowncastClone();
+    public __T Fold<__T>(__T acc, Func<__T, RAST._IModDecl, __T> accBuilder)
+    {
+      if ((this).is_ExternMod) {
+        return acc;
+      } else {
+        return RAST.__default.FoldLeft<__T, RAST._IModDecl>(accBuilder, acc, (this).dtor_body);
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      var _pat_let_tv0 = ind;
+      var _pat_let_tv1 = ind;
+      var _pat_let_tv2 = ind;
+      var _pat_let_tv3 = ind;
+      var _pat_let_tv4 = ind;
+      var _pat_let_tv5 = ind;
+      RAST._IMod _source0 = this;
+      {
+        if (_source0.is_ExternMod) {
+          Dafny.ISequence<Dafny.Rune> _0_name = _source0.dtor_name;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub mod "), _0_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+        }
+      }
+      {
+        Dafny.ISequence<Dafny.Rune> _1_docString = _source0.dtor_docString;
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _2_attributes = _source0.dtor_attributes;
+        Dafny.ISequence<Dafny.Rune> _3_name = _source0.dtor_name;
+        Dafny.ISequence<RAST._IModDecl> _4_body = _source0.dtor_body;
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.ToDocstringPrefix(_1_docString, ind), RAST.Attribute.ToStringMultiple(_2_attributes, ind)), Dafny.Helpers.Let<bool, Dafny.ISequence<Dafny.Rune>>(((new BigInteger((_4_body).Count)).Sign == 1) && (((_4_body).Select(BigInteger.Zero)).is_UseDecl), _pat_let13_0 => Dafny.Helpers.Let<bool, Dafny.ISequence<Dafny.Rune>>(_pat_let13_0, _5_startWithUse => Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(((_5_startWithUse) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), _pat_let_tv0), RAST.__default.IND)) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), _pat_let14_0 => Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(_pat_let14_0, _6_prefixIfNotUseDecl => Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(((_5_startWithUse) ? (Dafny.Sequence<Dafny.Rune>.Concat(_pat_let_tv1, RAST.__default.IND)) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), _pat_let15_0 => Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(_pat_let15_0, _7_prefixIfUseDecl => Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(((_5_startWithUse) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n\n"), _pat_let_tv2), RAST.__default.IND))), _pat_let16_0 => Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(_pat_let16_0, _8_infixDecl => Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(((_5_startWithUse) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.Concat(_pat_let_tv3, RAST.__default.IND))), _pat_let17_0 => Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(_pat_let17_0, _9_initialIdent => Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub mod "), _3_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), _9_initialIdent), RAST.__default.SeqToString<RAST._IModDecl>(_4_body, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>, Func<RAST._IModDecl, Dafny.ISequence<Dafny.Rune>>>>((_10_prefixIfUseDecl, _11_prefixIfNotUseDecl, _12_ind) => ((System.Func<RAST._IModDecl, Dafny.ISequence<Dafny.Rune>>)((_13_modDecl) => {
+          return Dafny.Sequence<Dafny.Rune>.Concat((((_13_modDecl).is_UseDecl) ? (_10_prefixIfUseDecl) : (_11_prefixIfNotUseDecl)), (_13_modDecl)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_12_ind, RAST.__default.IND)));
+        })))(_7_prefixIfUseDecl, _6_prefixIfNotUseDecl, _pat_let_tv4), _8_infixDecl)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), _pat_let_tv5), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}")))))))))))));
+      }
+    }
+  }
+  public class Mod_Mod : Mod {
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _attributes;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<RAST._IModDecl> _body;
+    public Mod_Mod(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._IModDecl> body) : base() {
+      this._docString = docString;
+      this._attributes = attributes;
+      this._name = name;
+      this._body = body;
+    }
+    public override _IMod DowncastClone() {
+      if (this is _IMod dt) { return dt; }
+      return new Mod_Mod(_docString, _attributes, _name, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Mod_Mod;
+      return oth != null && object.Equals(this._docString, oth._docString) && object.Equals(this._attributes, oth._attributes) && object.Equals(this._name, oth._name) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Mod.Mod";
+      s += "(";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+  }
+  public class Mod_ExternMod : Mod {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public Mod_ExternMod(Dafny.ISequence<Dafny.Rune> name) : base() {
+      this._name = name;
+    }
+    public override _IMod DowncastClone() {
+      if (this is _IMod dt) { return dt; }
+      return new Mod_ExternMod(_name);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Mod_ExternMod;
+      return oth != null && object.Equals(this._name, oth._name);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Mod.ExternMod";
+      s += "(";
+      s += this._name.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IModDecl {
+    bool is_ModDecl { get; }
+    bool is_StructDecl { get; }
+    bool is_TypeDecl { get; }
+    bool is_ConstDecl { get; }
+    bool is_EnumDecl { get; }
+    bool is_ImplDecl { get; }
+    bool is_TraitDecl { get; }
+    bool is_TopFnDecl { get; }
+    bool is_UseDecl { get; }
+    RAST._IMod dtor_mod { get; }
+    RAST._IStruct dtor_struct { get; }
+    RAST._ITypeSynonym dtor_tpe { get; }
+    RAST._IConstant dtor_c { get; }
+    RAST._IEnum dtor_enum { get; }
+    RAST._IImpl dtor_impl { get; }
+    RAST._ITrait dtor_tr { get; }
+    RAST._ITopFnDecl dtor_fn { get; }
+    RAST._IUse dtor_use { get; }
+    _IModDecl DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public abstract class ModDecl : _IModDecl {
+    public ModDecl() {
+    }
+    private static readonly RAST._IModDecl theDefault = create_ModDecl(RAST.Mod.Default());
+    public static RAST._IModDecl Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IModDecl> _TYPE = new Dafny.TypeDescriptor<RAST._IModDecl>(RAST.ModDecl.Default());
+    public static Dafny.TypeDescriptor<RAST._IModDecl> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IModDecl create_ModDecl(RAST._IMod mod) {
+      return new ModDecl_ModDecl(mod);
+    }
+    public static _IModDecl create_StructDecl(RAST._IStruct @struct) {
+      return new ModDecl_StructDecl(@struct);
+    }
+    public static _IModDecl create_TypeDecl(RAST._ITypeSynonym tpe) {
+      return new ModDecl_TypeDecl(tpe);
+    }
+    public static _IModDecl create_ConstDecl(RAST._IConstant c) {
+      return new ModDecl_ConstDecl(c);
+    }
+    public static _IModDecl create_EnumDecl(RAST._IEnum @enum) {
+      return new ModDecl_EnumDecl(@enum);
+    }
+    public static _IModDecl create_ImplDecl(RAST._IImpl impl) {
+      return new ModDecl_ImplDecl(impl);
+    }
+    public static _IModDecl create_TraitDecl(RAST._ITrait tr) {
+      return new ModDecl_TraitDecl(tr);
+    }
+    public static _IModDecl create_TopFnDecl(RAST._ITopFnDecl fn) {
+      return new ModDecl_TopFnDecl(fn);
+    }
+    public static _IModDecl create_UseDecl(RAST._IUse use) {
+      return new ModDecl_UseDecl(use);
+    }
+    public bool is_ModDecl { get { return this is ModDecl_ModDecl; } }
+    public bool is_StructDecl { get { return this is ModDecl_StructDecl; } }
+    public bool is_TypeDecl { get { return this is ModDecl_TypeDecl; } }
+    public bool is_ConstDecl { get { return this is ModDecl_ConstDecl; } }
+    public bool is_EnumDecl { get { return this is ModDecl_EnumDecl; } }
+    public bool is_ImplDecl { get { return this is ModDecl_ImplDecl; } }
+    public bool is_TraitDecl { get { return this is ModDecl_TraitDecl; } }
+    public bool is_TopFnDecl { get { return this is ModDecl_TopFnDecl; } }
+    public bool is_UseDecl { get { return this is ModDecl_UseDecl; } }
+    public RAST._IMod dtor_mod {
+      get {
+        var d = this;
+        return ((ModDecl_ModDecl)d)._mod;
+      }
+    }
+    public RAST._IStruct dtor_struct {
+      get {
+        var d = this;
+        return ((ModDecl_StructDecl)d)._struct;
+      }
+    }
+    public RAST._ITypeSynonym dtor_tpe {
+      get {
+        var d = this;
+        return ((ModDecl_TypeDecl)d)._tpe;
+      }
+    }
+    public RAST._IConstant dtor_c {
+      get {
+        var d = this;
+        return ((ModDecl_ConstDecl)d)._c;
+      }
+    }
+    public RAST._IEnum dtor_enum {
+      get {
+        var d = this;
+        return ((ModDecl_EnumDecl)d)._enum;
+      }
+    }
+    public RAST._IImpl dtor_impl {
+      get {
+        var d = this;
+        return ((ModDecl_ImplDecl)d)._impl;
+      }
+    }
+    public RAST._ITrait dtor_tr {
+      get {
+        var d = this;
+        return ((ModDecl_TraitDecl)d)._tr;
+      }
+    }
+    public RAST._ITopFnDecl dtor_fn {
+      get {
+        var d = this;
+        return ((ModDecl_TopFnDecl)d)._fn;
+      }
+    }
+    public RAST._IUse dtor_use {
+      get {
+        var d = this;
+        return ((ModDecl_UseDecl)d)._use;
+      }
+    }
+    public abstract _IModDecl DowncastClone();
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      if ((this).is_ModDecl) {
+        return ((this).dtor_mod)._ToString(ind);
+      } else if ((this).is_StructDecl) {
+        return ((this).dtor_struct)._ToString(ind);
+      } else if ((this).is_ImplDecl) {
+        return ((this).dtor_impl)._ToString(ind);
+      } else if ((this).is_EnumDecl) {
+        return ((this).dtor_enum)._ToString(ind);
+      } else if ((this).is_TypeDecl) {
+        return ((this).dtor_tpe)._ToString(ind);
+      } else if ((this).is_ConstDecl) {
+        return ((this).dtor_c)._ToString(ind);
+      } else if ((this).is_TraitDecl) {
+        return ((this).dtor_tr)._ToString(ind);
+      } else if ((this).is_TopFnDecl) {
+        return ((this).dtor_fn)._ToString(ind);
+      } else {
+        return ((this).dtor_use)._ToString(ind);
+      }
+    }
+  }
+  public class ModDecl_ModDecl : ModDecl {
+    public readonly RAST._IMod _mod;
+    public ModDecl_ModDecl(RAST._IMod mod) : base() {
+      this._mod = mod;
+    }
+    public override _IModDecl DowncastClone() {
+      if (this is _IModDecl dt) { return dt; }
+      return new ModDecl_ModDecl(_mod);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ModDecl_ModDecl;
+      return oth != null && object.Equals(this._mod, oth._mod);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._mod));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ModDecl.ModDecl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._mod);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModDecl_StructDecl : ModDecl {
+    public readonly RAST._IStruct _struct;
+    public ModDecl_StructDecl(RAST._IStruct @struct) : base() {
+      this._struct = @struct;
+    }
+    public override _IModDecl DowncastClone() {
+      if (this is _IModDecl dt) { return dt; }
+      return new ModDecl_StructDecl(_struct);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ModDecl_StructDecl;
+      return oth != null && object.Equals(this._struct, oth._struct);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._struct));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ModDecl.StructDecl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._struct);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModDecl_TypeDecl : ModDecl {
+    public readonly RAST._ITypeSynonym _tpe;
+    public ModDecl_TypeDecl(RAST._ITypeSynonym tpe) : base() {
+      this._tpe = tpe;
+    }
+    public override _IModDecl DowncastClone() {
+      if (this is _IModDecl dt) { return dt; }
+      return new ModDecl_TypeDecl(_tpe);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ModDecl_TypeDecl;
+      return oth != null && object.Equals(this._tpe, oth._tpe);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ModDecl.TypeDecl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModDecl_ConstDecl : ModDecl {
+    public readonly RAST._IConstant _c;
+    public ModDecl_ConstDecl(RAST._IConstant c) : base() {
+      this._c = c;
+    }
+    public override _IModDecl DowncastClone() {
+      if (this is _IModDecl dt) { return dt; }
+      return new ModDecl_ConstDecl(_c);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ModDecl_ConstDecl;
+      return oth != null && object.Equals(this._c, oth._c);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._c));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ModDecl.ConstDecl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._c);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModDecl_EnumDecl : ModDecl {
+    public readonly RAST._IEnum _enum;
+    public ModDecl_EnumDecl(RAST._IEnum @enum) : base() {
+      this._enum = @enum;
+    }
+    public override _IModDecl DowncastClone() {
+      if (this is _IModDecl dt) { return dt; }
+      return new ModDecl_EnumDecl(_enum);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ModDecl_EnumDecl;
+      return oth != null && object.Equals(this._enum, oth._enum);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._enum));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ModDecl.EnumDecl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._enum);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModDecl_ImplDecl : ModDecl {
+    public readonly RAST._IImpl _impl;
+    public ModDecl_ImplDecl(RAST._IImpl impl) : base() {
+      this._impl = impl;
+    }
+    public override _IModDecl DowncastClone() {
+      if (this is _IModDecl dt) { return dt; }
+      return new ModDecl_ImplDecl(_impl);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ModDecl_ImplDecl;
+      return oth != null && object.Equals(this._impl, oth._impl);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._impl));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ModDecl.ImplDecl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._impl);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModDecl_TraitDecl : ModDecl {
+    public readonly RAST._ITrait _tr;
+    public ModDecl_TraitDecl(RAST._ITrait tr) : base() {
+      this._tr = tr;
+    }
+    public override _IModDecl DowncastClone() {
+      if (this is _IModDecl dt) { return dt; }
+      return new ModDecl_TraitDecl(_tr);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ModDecl_TraitDecl;
+      return oth != null && object.Equals(this._tr, oth._tr);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 6;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tr));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ModDecl.TraitDecl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._tr);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModDecl_TopFnDecl : ModDecl {
+    public readonly RAST._ITopFnDecl _fn;
+    public ModDecl_TopFnDecl(RAST._ITopFnDecl fn) : base() {
+      this._fn = fn;
+    }
+    public override _IModDecl DowncastClone() {
+      if (this is _IModDecl dt) { return dt; }
+      return new ModDecl_TopFnDecl(_fn);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ModDecl_TopFnDecl;
+      return oth != null && object.Equals(this._fn, oth._fn);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 7;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fn));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ModDecl.TopFnDecl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._fn);
+      s += ")";
+      return s;
+    }
+  }
+  public class ModDecl_UseDecl : ModDecl {
+    public readonly RAST._IUse _use;
+    public ModDecl_UseDecl(RAST._IUse use) : base() {
+      this._use = use;
+    }
+    public override _IModDecl DowncastClone() {
+      if (this is _IModDecl dt) { return dt; }
+      return new ModDecl_UseDecl(_use);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ModDecl_UseDecl;
+      return oth != null && object.Equals(this._use, oth._use);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 8;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._use));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ModDecl.UseDecl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._use);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IUse {
+    bool is_Use { get; }
+    RAST._IVisibility dtor_visibility { get; }
+    RAST._IPath dtor_path { get; }
+    _IUse DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class Use : _IUse {
+    public readonly RAST._IVisibility _visibility;
+    public readonly RAST._IPath _path;
+    public Use(RAST._IVisibility visibility, RAST._IPath path) {
+      this._visibility = visibility;
+      this._path = path;
+    }
+    public _IUse DowncastClone() {
+      if (this is _IUse dt) { return dt; }
+      return new Use(_visibility, _path);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Use;
+      return oth != null && object.Equals(this._visibility, oth._visibility) && object.Equals(this._path, oth._path);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._visibility));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._path));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Use.Use";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._visibility);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._path);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IUse theDefault = create(RAST.Visibility.Default(), RAST.Path.Default());
+    public static RAST._IUse Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IUse> _TYPE = new Dafny.TypeDescriptor<RAST._IUse>(RAST.Use.Default());
+    public static Dafny.TypeDescriptor<RAST._IUse> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IUse create(RAST._IVisibility visibility, RAST._IPath path) {
+      return new Use(visibility, path);
+    }
+    public static _IUse create_Use(RAST._IVisibility visibility, RAST._IPath path) {
+      return create(visibility, path);
+    }
+    public bool is_Use { get { return true; } }
+    public RAST._IVisibility dtor_visibility {
+      get {
+        return this._visibility;
+      }
+    }
+    public RAST._IPath dtor_path {
+      get {
+        return this._path;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(((this).dtor_visibility)._ToString(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("use ")), ((this).dtor_path)._ToString()), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+    }
+  }
+
+  public interface _ITopFnDecl {
+    bool is_TopFn { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes { get; }
+    RAST._IVisibility dtor_visibility { get; }
+    RAST._IFn dtor_fn { get; }
+    _ITopFnDecl DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class TopFnDecl : _ITopFnDecl {
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _attributes;
+    public readonly RAST._IVisibility _visibility;
+    public readonly RAST._IFn _fn;
+    public TopFnDecl(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, RAST._IVisibility visibility, RAST._IFn fn) {
+      this._docString = docString;
+      this._attributes = attributes;
+      this._visibility = visibility;
+      this._fn = fn;
+    }
+    public _ITopFnDecl DowncastClone() {
+      if (this is _ITopFnDecl dt) { return dt; }
+      return new TopFnDecl(_docString, _attributes, _visibility, _fn);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.TopFnDecl;
+      return oth != null && object.Equals(this._docString, oth._docString) && object.Equals(this._attributes, oth._attributes) && object.Equals(this._visibility, oth._visibility) && object.Equals(this._fn, oth._fn);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._visibility));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fn));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.TopFnDecl.TopFn";
+      s += "(";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._visibility);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._fn);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._ITopFnDecl theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, RAST.Visibility.Default(), RAST.Fn.Default());
+    public static RAST._ITopFnDecl Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._ITopFnDecl> _TYPE = new Dafny.TypeDescriptor<RAST._ITopFnDecl>(RAST.TopFnDecl.Default());
+    public static Dafny.TypeDescriptor<RAST._ITopFnDecl> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ITopFnDecl create(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, RAST._IVisibility visibility, RAST._IFn fn) {
+      return new TopFnDecl(docString, attributes, visibility, fn);
+    }
+    public static _ITopFnDecl create_TopFn(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, RAST._IVisibility visibility, RAST._IFn fn) {
+      return create(docString, attributes, visibility, fn);
+    }
+    public bool is_TopFn { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public RAST._IVisibility dtor_visibility {
+      get {
+        return this._visibility;
+      }
+    }
+    public RAST._IFn dtor_fn {
+      get {
+        return this._fn;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.ToDocstringPrefix((this).dtor_docString, ind), RAST.Attribute.ToStringMultiple((this).dtor_attributes, ind)), ((this).dtor_visibility)._ToString()), ((this).dtor_fn)._ToString(ind));
+    }
+  }
+
+  public interface _IAttribute {
+    bool is_RawAttribute { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_content { get; }
+  }
+  public class Attribute : _IAttribute {
+    public readonly Dafny.ISequence<Dafny.Rune> _content;
+    public Attribute(Dafny.ISequence<Dafny.Rune> content) {
+      this._content = content;
+    }
+    public static Dafny.ISequence<Dafny.Rune> DowncastClone(Dafny.ISequence<Dafny.Rune> _this) {
+      return _this;
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Attribute;
+      return oth != null && object.Equals(this._content, oth._content);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._content));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Attribute.RawAttribute";
+      s += "(";
+      s += this._content.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+    private static readonly Dafny.ISequence<Dafny.Rune> theDefault = Dafny.Sequence<Dafny.Rune>.Empty;
+    public static Dafny.ISequence<Dafny.Rune> Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TYPE = new Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>>(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IAttribute create(Dafny.ISequence<Dafny.Rune> content) {
+      return new Attribute(content);
+    }
+    public static _IAttribute create_RawAttribute(Dafny.ISequence<Dafny.Rune> content) {
+      return create(content);
+    }
+    public bool is_RawAttribute { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_content {
+      get {
+        return this._content;
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> ToStringMultiple(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> ind)
+    {
+      return RAST.__default.SeqToString<Dafny.ISequence<Dafny.Rune>>(attributes, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>>>((_0_ind) => ((System.Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>)((_1_attribute) => {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat((_1_attribute), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), _0_ind);
+      })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+    }
+  }
+
+  public interface _IStruct {
+    bool is_Struct { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams { get; }
+    RAST._IFields dtor_fields { get; }
+    _IStruct DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class Struct : _IStruct {
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _attributes;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<RAST._ITypeParamDecl> _typeParams;
+    public readonly RAST._IFields _fields;
+    public Struct(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IFields fields) {
+      this._docString = docString;
+      this._attributes = attributes;
+      this._name = name;
+      this._typeParams = typeParams;
+      this._fields = fields;
+    }
+    public _IStruct DowncastClone() {
+      if (this is _IStruct dt) { return dt; }
+      return new Struct(_docString, _attributes, _name, _typeParams, _fields);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Struct;
+      return oth != null && object.Equals(this._docString, oth._docString) && object.Equals(this._attributes, oth._attributes) && object.Equals(this._name, oth._name) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._fields, oth._fields);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fields));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Struct.Struct";
+      s += "(";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._fields);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IStruct theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<RAST._ITypeParamDecl>.Empty, RAST.Fields.Default());
+    public static RAST._IStruct Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IStruct> _TYPE = new Dafny.TypeDescriptor<RAST._IStruct>(RAST.Struct.Default());
+    public static Dafny.TypeDescriptor<RAST._IStruct> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IStruct create(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IFields fields) {
+      return new Struct(docString, attributes, name, typeParams, fields);
+    }
+    public static _IStruct create_Struct(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IFields fields) {
+      return create(docString, attributes, name, typeParams, fields);
+    }
+    public bool is_Struct { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public RAST._IFields dtor_fields {
+      get {
+        return this._fields;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.ToDocstringPrefix((this).dtor_docString, ind), RAST.Attribute.ToStringMultiple((this).dtor_attributes, ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub struct ")), (this).dtor_name), RAST.TypeParamDecl.ToStringMultiple((this).dtor_typeParams, ind)), ((this).dtor_fields)._ToString(ind, ((this).dtor_fields).is_NamedFields)), ((((this).dtor_fields).is_NamelessFields) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))));
+    }
+  }
+
+  public interface _ITypeSynonym {
+    bool is_TypeSynonym { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams { get; }
+    RAST._IType dtor_tpe { get; }
+    _ITypeSynonym DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class TypeSynonym : _ITypeSynonym {
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _attributes;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<RAST._ITypeParamDecl> _typeParams;
+    public readonly RAST._IType _tpe;
+    public TypeSynonym(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IType tpe) {
+      this._docString = docString;
+      this._attributes = attributes;
+      this._name = name;
+      this._typeParams = typeParams;
+      this._tpe = tpe;
+    }
+    public _ITypeSynonym DowncastClone() {
+      if (this is _ITypeSynonym dt) { return dt; }
+      return new TypeSynonym(_docString, _attributes, _name, _typeParams, _tpe);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.TypeSynonym;
+      return oth != null && object.Equals(this._docString, oth._docString) && object.Equals(this._attributes, oth._attributes) && object.Equals(this._name, oth._name) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._tpe, oth._tpe);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.TypeSynonym.TypeSynonym";
+      s += "(";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._ITypeSynonym theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<RAST._ITypeParamDecl>.Empty, RAST.Type.Default());
+    public static RAST._ITypeSynonym Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._ITypeSynonym> _TYPE = new Dafny.TypeDescriptor<RAST._ITypeSynonym>(RAST.TypeSynonym.Default());
+    public static Dafny.TypeDescriptor<RAST._ITypeSynonym> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ITypeSynonym create(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IType tpe) {
+      return new TypeSynonym(docString, attributes, name, typeParams, tpe);
+    }
+    public static _ITypeSynonym create_TypeSynonym(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IType tpe) {
+      return create(docString, attributes, name, typeParams, tpe);
+    }
+    public bool is_TypeSynonym { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public RAST._IType dtor_tpe {
+      get {
+        return this._tpe;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.ToDocstringPrefix((this).dtor_docString, ind), RAST.Attribute.ToStringMultiple((this).dtor_attributes, ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub type ")), (this).dtor_name), RAST.TypeParamDecl.ToStringMultiple((this).dtor_typeParams, ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = ")), ((this).dtor_tpe)._ToString(ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+    }
+  }
+
+  public interface _IConstant {
+    bool is_Constant { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    RAST._IType dtor_tpe { get; }
+    RAST._IExpr dtor_value { get; }
+    _IConstant DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class Constant : _IConstant {
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _attributes;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly RAST._IType _tpe;
+    public readonly RAST._IExpr _value;
+    public Constant(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, RAST._IType tpe, RAST._IExpr @value) {
+      this._docString = docString;
+      this._attributes = attributes;
+      this._name = name;
+      this._tpe = tpe;
+      this._value = @value;
+    }
+    public _IConstant DowncastClone() {
+      if (this is _IConstant dt) { return dt; }
+      return new Constant(_docString, _attributes, _name, _tpe, _value);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Constant;
+      return oth != null && object.Equals(this._docString, oth._docString) && object.Equals(this._attributes, oth._attributes) && object.Equals(this._name, oth._name) && object.Equals(this._tpe, oth._tpe) && object.Equals(this._value, oth._value);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Constant.Constant";
+      s += "(";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IConstant theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, RAST.Type.Default(), RAST.Expr.Default());
+    public static RAST._IConstant Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IConstant> _TYPE = new Dafny.TypeDescriptor<RAST._IConstant>(RAST.Constant.Default());
+    public static Dafny.TypeDescriptor<RAST._IConstant> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IConstant create(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, RAST._IType tpe, RAST._IExpr @value) {
+      return new Constant(docString, attributes, name, tpe, @value);
+    }
+    public static _IConstant create_Constant(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, RAST._IType tpe, RAST._IExpr @value) {
+      return create(docString, attributes, name, tpe, @value);
+    }
+    public bool is_Constant { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public RAST._IType dtor_tpe {
+      get {
+        return this._tpe;
+      }
+    }
+    public RAST._IExpr dtor_value {
+      get {
+        return this._value;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.ToDocstringPrefix((this).dtor_docString, ind), RAST.Attribute.ToStringMultiple((this).dtor_attributes, ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub const ")), (this).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ")), ((this).dtor_tpe)._ToString(ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = ")), ((this).dtor_value)._ToString(ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+    }
+  }
+
+  public interface _INamelessField {
+    bool is_NamelessField { get; }
+    RAST._IVisibility dtor_visibility { get; }
+    RAST._IType dtor_tpe { get; }
+    _INamelessField DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class NamelessField : _INamelessField {
+    public readonly RAST._IVisibility _visibility;
+    public readonly RAST._IType _tpe;
+    public NamelessField(RAST._IVisibility visibility, RAST._IType tpe) {
+      this._visibility = visibility;
+      this._tpe = tpe;
+    }
+    public _INamelessField DowncastClone() {
+      if (this is _INamelessField dt) { return dt; }
+      return new NamelessField(_visibility, _tpe);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.NamelessField;
+      return oth != null && object.Equals(this._visibility, oth._visibility) && object.Equals(this._tpe, oth._tpe);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._visibility));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.NamelessField.NamelessField";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._visibility);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._INamelessField theDefault = create(RAST.Visibility.Default(), RAST.Type.Default());
+    public static RAST._INamelessField Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._INamelessField> _TYPE = new Dafny.TypeDescriptor<RAST._INamelessField>(RAST.NamelessField.Default());
+    public static Dafny.TypeDescriptor<RAST._INamelessField> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _INamelessField create(RAST._IVisibility visibility, RAST._IType tpe) {
+      return new NamelessField(visibility, tpe);
+    }
+    public static _INamelessField create_NamelessField(RAST._IVisibility visibility, RAST._IType tpe) {
+      return create(visibility, tpe);
+    }
+    public bool is_NamelessField { get { return true; } }
+    public RAST._IVisibility dtor_visibility {
+      get {
+        return this._visibility;
+      }
+    }
+    public RAST._IType dtor_tpe {
+      get {
+        return this._tpe;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(((this).dtor_visibility)._ToString(), ((this).dtor_tpe)._ToString(ind));
+    }
+  }
+
+  public interface _IField {
+    bool is_Field { get; }
+    RAST._IVisibility dtor_visibility { get; }
+    RAST._IFormal dtor_formal { get; }
+    _IField DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+    RAST._INamelessField ToNamelessField();
+  }
+  public class Field : _IField {
+    public readonly RAST._IVisibility _visibility;
+    public readonly RAST._IFormal _formal;
+    public Field(RAST._IVisibility visibility, RAST._IFormal formal) {
+      this._visibility = visibility;
+      this._formal = formal;
+    }
+    public _IField DowncastClone() {
+      if (this is _IField dt) { return dt; }
+      return new Field(_visibility, _formal);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Field;
+      return oth != null && object.Equals(this._visibility, oth._visibility) && object.Equals(this._formal, oth._formal);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._visibility));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._formal));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Field.Field";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._visibility);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._formal);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IField theDefault = create(RAST.Visibility.Default(), RAST.Formal.Default());
+    public static RAST._IField Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IField> _TYPE = new Dafny.TypeDescriptor<RAST._IField>(RAST.Field.Default());
+    public static Dafny.TypeDescriptor<RAST._IField> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IField create(RAST._IVisibility visibility, RAST._IFormal formal) {
+      return new Field(visibility, formal);
+    }
+    public static _IField create_Field(RAST._IVisibility visibility, RAST._IFormal formal) {
+      return create(visibility, formal);
+    }
+    public bool is_Field { get { return true; } }
+    public RAST._IVisibility dtor_visibility {
+      get {
+        return this._visibility;
+      }
+    }
+    public RAST._IFormal dtor_formal {
+      get {
+        return this._formal;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(((this).dtor_visibility)._ToString(), ((this).dtor_formal)._ToString(ind));
+    }
+    public RAST._INamelessField ToNamelessField() {
+      return RAST.NamelessField.create((this).dtor_visibility, ((this).dtor_formal).dtor_tpe);
+    }
+  }
+
+  public interface _IFields {
+    bool is_NamedFields { get; }
+    bool is_NamelessFields { get; }
+    Dafny.ISequence<RAST._IField> dtor_fields { get; }
+    Dafny.ISequence<RAST._INamelessField> dtor_types { get; }
+    _IFields DowncastClone();
+    RAST._IFields ToNamelessFields();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind, bool newLine);
+  }
+  public abstract class Fields : _IFields {
+    public Fields() {
+    }
+    private static readonly RAST._IFields theDefault = create_NamedFields(Dafny.Sequence<RAST._IField>.Empty);
+    public static RAST._IFields Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IFields> _TYPE = new Dafny.TypeDescriptor<RAST._IFields>(RAST.Fields.Default());
+    public static Dafny.TypeDescriptor<RAST._IFields> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IFields create_NamedFields(Dafny.ISequence<RAST._IField> fields) {
+      return new Fields_NamedFields(fields);
+    }
+    public static _IFields create_NamelessFields(Dafny.ISequence<RAST._INamelessField> types) {
+      return new Fields_NamelessFields(types);
+    }
+    public bool is_NamedFields { get { return this is Fields_NamedFields; } }
+    public bool is_NamelessFields { get { return this is Fields_NamelessFields; } }
+    public Dafny.ISequence<RAST._IField> dtor_fields {
+      get {
+        var d = this;
+        return ((Fields_NamedFields)d)._fields;
+      }
+    }
+    public Dafny.ISequence<RAST._INamelessField> dtor_types {
+      get {
+        var d = this;
+        return ((Fields_NamelessFields)d)._types;
+      }
+    }
+    public abstract _IFields DowncastClone();
+    public RAST._IFields ToNamelessFields() {
+      return RAST.Fields.create_NamelessFields(((System.Func<Dafny.ISequence<RAST._INamelessField>>) (() => {
+  BigInteger dim11 = new BigInteger(((this).dtor_fields).Count);
+  var arr11 = new RAST._INamelessField[Dafny.Helpers.ToIntChecked(dim11, "array size exceeds memory limit")];
+  for (int i11 = 0; i11 < dim11; i11++) {
+    var _0_i = (BigInteger) i11;
+    arr11[(int)(_0_i)] = (((this).dtor_fields).Select(_0_i)).ToNamelessField();
+  }
+  return Dafny.Sequence<RAST._INamelessField>.FromArray(arr11);
+}))());
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind, bool newLine)
+    {
+      if ((this).is_NamedFields) {
+        Dafny.ISequence<Dafny.Rune> _0_separator = ((newLine) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(",\n"), ind), RAST.__default.IND)) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", ")));
+        _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs0 = (((newLine) && ((new BigInteger(((this).dtor_fields).Count)).Sign == 1)) ? (_System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), ind), RAST.__default.IND), Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), ind))) : ((((new BigInteger(((this).dtor_fields).Count)).Sign == 1) ? (_System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" "), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" "))) : (_System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))))));
+        Dafny.ISequence<Dafny.Rune> _1_beginSpace = _let_tmp_rhs0.dtor__0;
+        Dafny.ISequence<Dafny.Rune> _2_endSpace = _let_tmp_rhs0.dtor__1;
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {"), _1_beginSpace), RAST.__default.SeqToString<RAST._IField>((this).dtor_fields, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IField, Dafny.ISequence<Dafny.Rune>>>>((_3_ind) => ((System.Func<RAST._IField, Dafny.ISequence<Dafny.Rune>>)((_4_field) => {
+          return (_4_field)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_3_ind, RAST.__default.IND));
+        })))(ind), _0_separator)), _2_endSpace), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+      } else {
+        Dafny.ISequence<Dafny.Rune> _5_separator = ((newLine) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(",\n"), ind), RAST.__default.IND)) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", ")));
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), RAST.__default.SeqToString<RAST._INamelessField>((this).dtor_types, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._INamelessField, Dafny.ISequence<Dafny.Rune>>>>((_6_ind) => ((System.Func<RAST._INamelessField, Dafny.ISequence<Dafny.Rune>>)((_7_t) => {
+          return (_7_t)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_6_ind, RAST.__default.IND));
+        })))(ind), _5_separator)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
+      }
+    }
+  }
+  public class Fields_NamedFields : Fields {
+    public readonly Dafny.ISequence<RAST._IField> _fields;
+    public Fields_NamedFields(Dafny.ISequence<RAST._IField> fields) : base() {
+      this._fields = fields;
+    }
+    public override _IFields DowncastClone() {
+      if (this is _IFields dt) { return dt; }
+      return new Fields_NamedFields(_fields);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Fields_NamedFields;
+      return oth != null && object.Equals(this._fields, oth._fields);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fields));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Fields.NamedFields";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._fields);
+      s += ")";
+      return s;
+    }
+  }
+  public class Fields_NamelessFields : Fields {
+    public readonly Dafny.ISequence<RAST._INamelessField> _types;
+    public Fields_NamelessFields(Dafny.ISequence<RAST._INamelessField> types) : base() {
+      this._types = types;
+    }
+    public override _IFields DowncastClone() {
+      if (this is _IFields dt) { return dt; }
+      return new Fields_NamelessFields(_types);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Fields_NamelessFields;
+      return oth != null && object.Equals(this._types, oth._types);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._types));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Fields.NamelessFields";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._types);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IEnumCase {
+    bool is_EnumCase { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    RAST._IFields dtor_fields { get; }
+    _IEnumCase DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind, bool newLine);
+  }
+  public class EnumCase : _IEnumCase {
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly RAST._IFields _fields;
+    public EnumCase(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.Rune> name, RAST._IFields fields) {
+      this._docString = docString;
+      this._name = name;
+      this._fields = fields;
+    }
+    public _IEnumCase DowncastClone() {
+      if (this is _IEnumCase dt) { return dt; }
+      return new EnumCase(_docString, _name, _fields);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.EnumCase;
+      return oth != null && object.Equals(this._docString, oth._docString) && object.Equals(this._name, oth._name) && object.Equals(this._fields, oth._fields);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fields));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.EnumCase.EnumCase";
+      s += "(";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._fields);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IEnumCase theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, RAST.Fields.Default());
+    public static RAST._IEnumCase Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IEnumCase> _TYPE = new Dafny.TypeDescriptor<RAST._IEnumCase>(RAST.EnumCase.Default());
+    public static Dafny.TypeDescriptor<RAST._IEnumCase> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IEnumCase create(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.Rune> name, RAST._IFields fields) {
+      return new EnumCase(docString, name, fields);
+    }
+    public static _IEnumCase create_EnumCase(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.Rune> name, RAST._IFields fields) {
+      return create(docString, name, fields);
+    }
+    public bool is_EnumCase { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public RAST._IFields dtor_fields {
+      get {
+        return this._fields;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind, bool newLine)
+    {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.ToDocstringPrefix((this).dtor_docString, ind), (this).dtor_name), ((this).dtor_fields)._ToString(ind, newLine));
+    }
+  }
+
+  public interface _IEnum {
+    bool is_Enum { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams { get; }
+    Dafny.ISequence<RAST._IEnumCase> dtor_variants { get; }
+    _IEnum DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class Enum : _IEnum {
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _attributes;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<RAST._ITypeParamDecl> _typeParams;
+    public readonly Dafny.ISequence<RAST._IEnumCase> _variants;
+    public Enum(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, Dafny.ISequence<RAST._IEnumCase> variants) {
+      this._docString = docString;
+      this._attributes = attributes;
+      this._name = name;
+      this._typeParams = typeParams;
+      this._variants = variants;
+    }
+    public _IEnum DowncastClone() {
+      if (this is _IEnum dt) { return dt; }
+      return new Enum(_docString, _attributes, _name, _typeParams, _variants);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Enum;
+      return oth != null && object.Equals(this._docString, oth._docString) && object.Equals(this._attributes, oth._attributes) && object.Equals(this._name, oth._name) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._variants, oth._variants);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._variants));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Enum.Enum";
+      s += "(";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._variants);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IEnum theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<RAST._ITypeParamDecl>.Empty, Dafny.Sequence<RAST._IEnumCase>.Empty);
+    public static RAST._IEnum Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IEnum> _TYPE = new Dafny.TypeDescriptor<RAST._IEnum>(RAST.Enum.Default());
+    public static Dafny.TypeDescriptor<RAST._IEnum> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IEnum create(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, Dafny.ISequence<RAST._IEnumCase> variants) {
+      return new Enum(docString, attributes, name, typeParams, variants);
+    }
+    public static _IEnum create_Enum(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, Dafny.ISequence<RAST._IEnumCase> variants) {
+      return create(docString, attributes, name, typeParams, variants);
+    }
+    public bool is_Enum { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public Dafny.ISequence<RAST._IEnumCase> dtor_variants {
+      get {
+        return this._variants;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.ToDocstringPrefix((this).dtor_docString, ind), RAST.Attribute.ToStringMultiple((this).dtor_attributes, ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub enum ")), (this).dtor_name), RAST.TypeParamDecl.ToStringMultiple((this).dtor_typeParams, ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {")), RAST.__default.SeqToString<RAST._IEnumCase>((this).dtor_variants, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IEnumCase, Dafny.ISequence<Dafny.Rune>>>>((_0_ind) => ((System.Func<RAST._IEnumCase, Dafny.ISequence<Dafny.Rune>>)((_1_variant) => {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), _0_ind), RAST.__default.IND), (_1_variant)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_0_ind, RAST.__default.IND), true));
+      })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(","))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+    }
+  }
+
+  public interface _ITypeParamDecl {
+    bool is_TypeParamDecl { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<RAST._IType> dtor_constraints { get; }
+    _ITypeParamDecl DowncastClone();
+    RAST._ITypeParamDecl AddConstraints(Dafny.ISequence<RAST._IType> constraints);
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class TypeParamDecl : _ITypeParamDecl {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<RAST._IType> _constraints;
+    public TypeParamDecl(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._IType> constraints) {
+      this._name = name;
+      this._constraints = constraints;
+    }
+    public _ITypeParamDecl DowncastClone() {
+      if (this is _ITypeParamDecl dt) { return dt; }
+      return new TypeParamDecl(_name, _constraints);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.TypeParamDecl;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._constraints, oth._constraints);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._constraints));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.TypeParamDecl.TypeParamDecl";
+      s += "(";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._constraints);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._ITypeParamDecl theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<RAST._IType>.Empty);
+    public static RAST._ITypeParamDecl Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._ITypeParamDecl> _TYPE = new Dafny.TypeDescriptor<RAST._ITypeParamDecl>(RAST.TypeParamDecl.Default());
+    public static Dafny.TypeDescriptor<RAST._ITypeParamDecl> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ITypeParamDecl create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._IType> constraints) {
+      return new TypeParamDecl(name, constraints);
+    }
+    public static _ITypeParamDecl create_TypeParamDecl(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._IType> constraints) {
+      return create(name, constraints);
+    }
+    public bool is_TypeParamDecl { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<RAST._IType> dtor_constraints {
+      get {
+        return this._constraints;
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> ToStringMultiple(Dafny.ISequence<RAST._ITypeParamDecl> typeParams, Dafny.ISequence<Dafny.Rune> ind)
+    {
+      if ((new BigInteger((typeParams).Count)).Sign == 0) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), RAST.__default.SeqToString<RAST._ITypeParamDecl>(typeParams, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._ITypeParamDecl, Dafny.ISequence<Dafny.Rune>>>>((_0_ind) => ((System.Func<RAST._ITypeParamDecl, Dafny.ISequence<Dafny.Rune>>)((_1_t) => {
+          return (_1_t)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_0_ind, RAST.__default.IND));
+        })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
+      }
+    }
+    public static Dafny.ISequence<RAST._ITypeParamDecl> AddConstraintsMultiple(Dafny.ISequence<RAST._ITypeParamDecl> typeParams, Dafny.ISequence<RAST._IType> constraints)
+    {
+      Dafny.ISequence<RAST._ITypeParamDecl> _0___accumulator = Dafny.Sequence<RAST._ITypeParamDecl>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((typeParams).Count)).Sign == 0) {
+        return Dafny.Sequence<RAST._ITypeParamDecl>.Concat(_0___accumulator, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements());
+      } else {
+        _0___accumulator = Dafny.Sequence<RAST._ITypeParamDecl>.Concat(_0___accumulator, Dafny.Sequence<RAST._ITypeParamDecl>.FromElements(((typeParams).Select(BigInteger.Zero)).AddConstraints(constraints)));
+        Dafny.ISequence<RAST._ITypeParamDecl> _in0 = (typeParams).Drop(BigInteger.One);
+        Dafny.ISequence<RAST._IType> _in1 = constraints;
+        typeParams = _in0;
+        constraints = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public RAST._ITypeParamDecl AddConstraints(Dafny.ISequence<RAST._IType> constraints) {
+      RAST._ITypeParamDecl _0_dt__update__tmp_h0 = this;
+      Dafny.ISequence<RAST._IType> _1_dt__update_hconstraints_h0 = Dafny.Sequence<RAST._IType>.Concat((this).dtor_constraints, constraints);
+      return RAST.TypeParamDecl.create((_0_dt__update__tmp_h0).dtor_name, _1_dt__update_hconstraints_h0);
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat((this).dtor_name, (((new BigInteger(((this).dtor_constraints).Count)).Sign == 0) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": "), RAST.__default.SeqToString<RAST._IType>((this).dtor_constraints, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>>>((_0_ind) => ((System.Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>)((_1_t) => {
+        return (_1_t)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_0_ind, RAST.__default.IND));
+      })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" + "))))));
+    }
+  }
+
+  public interface _IPath {
+    bool is_Global { get; }
+    bool is_Crate { get; }
+    bool is_Self { get; }
+    bool is_PMemberSelect { get; }
+    RAST._IPath dtor_base { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    _IPath DowncastClone();
+    RAST._IPath MSel(Dafny.ISequence<Dafny.Rune> name);
+    RAST._IPath MSels(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> names);
+    RAST._IExpr FSel(Dafny.ISequence<Dafny.Rune> name);
+    RAST._IType AsType();
+    RAST._IExpr AsExpr();
+    Dafny.ISequence<Dafny.Rune> _ToString();
+    Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> RightMostIdentifier();
+  }
+  public abstract class Path : _IPath {
+    public Path() {
+    }
+    private static readonly RAST._IPath theDefault = create_Global();
+    public static RAST._IPath Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IPath> _TYPE = new Dafny.TypeDescriptor<RAST._IPath>(RAST.Path.Default());
+    public static Dafny.TypeDescriptor<RAST._IPath> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IPath create_Global() {
+      return new Path_Global();
+    }
+    public static _IPath create_Crate() {
+      return new Path_Crate();
+    }
+    public static _IPath create_Self() {
+      return new Path_Self();
+    }
+    public static _IPath create_PMemberSelect(RAST._IPath @base, Dafny.ISequence<Dafny.Rune> name) {
+      return new Path_PMemberSelect(@base, name);
+    }
+    public bool is_Global { get { return this is Path_Global; } }
+    public bool is_Crate { get { return this is Path_Crate; } }
+    public bool is_Self { get { return this is Path_Self; } }
+    public bool is_PMemberSelect { get { return this is Path_PMemberSelect; } }
+    public RAST._IPath dtor_base {
+      get {
+        var d = this;
+        return ((Path_PMemberSelect)d)._base;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        var d = this;
+        return ((Path_PMemberSelect)d)._name;
+      }
+    }
+    public abstract _IPath DowncastClone();
+    public RAST._IPath MSel(Dafny.ISequence<Dafny.Rune> name) {
+      return RAST.Path.create_PMemberSelect(this, name);
+    }
+    public RAST._IPath MSels(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> names) {
+      _IPath _this = this;
+    TAIL_CALL_START: ;
+      if ((new BigInteger((names).Count)).Sign == 0) {
+        return _this;
+      } else {
+        RAST._IPath _in0 = (_this).MSel((names).Select(BigInteger.Zero));
+        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _in1 = (names).Drop(BigInteger.One);
+        _this = _in0;
+        ;
+        names = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public RAST._IExpr FSel(Dafny.ISequence<Dafny.Rune> name) {
+      return ((this).AsExpr()).FSel(name);
+    }
+    public RAST._IType AsType() {
+      return RAST.Type.create_TypeFromPath(this);
+    }
+    public RAST._IExpr AsExpr() {
+      return RAST.Expr.create_ExprFromPath(this);
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString() {
+      RAST._IPath _source0 = this;
+      {
+        if (_source0.is_Global) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+        }
+      }
+      {
+        if (_source0.is_Crate) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("crate");
+        }
+      }
+      {
+        if (_source0.is_Self) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Self");
+        }
+      }
+      {
+        RAST._IPath _0_base = _source0.dtor_base;
+        Dafny.ISequence<Dafny.Rune> _1_name = _source0.dtor_name;
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat((_0_base)._ToString(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")), _1_name);
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> RightMostIdentifier() {
+      RAST._IPath _source0 = this;
+      {
+        if (_source0.is_Global) {
+          return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None();
+        }
+      }
+      {
+        if (_source0.is_Crate) {
+          return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("crate"));
+        }
+      }
+      {
+        if (_source0.is_Self) {
+          return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Self"));
+        }
+      }
+      {
+        RAST._IPath _0_base = _source0.dtor_base;
+        Dafny.ISequence<Dafny.Rune> _1_name = _source0.dtor_name;
+        return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(_1_name);
+      }
+    }
+  }
+  public class Path_Global : Path {
+    public Path_Global() : base() {
+    }
+    public override _IPath DowncastClone() {
+      if (this is _IPath dt) { return dt; }
+      return new Path_Global();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Path_Global;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Path.Global";
+      return s;
+    }
+  }
+  public class Path_Crate : Path {
+    public Path_Crate() : base() {
+    }
+    public override _IPath DowncastClone() {
+      if (this is _IPath dt) { return dt; }
+      return new Path_Crate();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Path_Crate;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Path.Crate";
+      return s;
+    }
+  }
+  public class Path_Self : Path {
+    public Path_Self() : base() {
+    }
+    public override _IPath DowncastClone() {
+      if (this is _IPath dt) { return dt; }
+      return new Path_Self();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Path_Self;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Path.Self";
+      return s;
+    }
+  }
+  public class Path_PMemberSelect : Path {
+    public readonly RAST._IPath _base;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public Path_PMemberSelect(RAST._IPath @base, Dafny.ISequence<Dafny.Rune> name) : base() {
+      this._base = @base;
+      this._name = name;
+    }
+    public override _IPath DowncastClone() {
+      if (this is _IPath dt) { return dt; }
+      return new Path_PMemberSelect(_base, _name);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Path_PMemberSelect;
+      return oth != null && object.Equals(this._base, oth._base) && object.Equals(this._name, oth._name);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._base));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Path.PMemberSelect";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._base);
+      s += ", ";
+      s += this._name.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IType {
+    bool is_U8 { get; }
+    bool is_U16 { get; }
+    bool is_U32 { get; }
+    bool is_U64 { get; }
+    bool is_U128 { get; }
+    bool is_I8 { get; }
+    bool is_I16 { get; }
+    bool is_I32 { get; }
+    bool is_I64 { get; }
+    bool is_I128 { get; }
+    bool is_USIZE { get; }
+    bool is_Bool { get; }
+    bool is_TIdentifier { get; }
+    bool is_TypeFromPath { get; }
+    bool is_TypeApp { get; }
+    bool is_Borrowed { get; }
+    bool is_BorrowedMut { get; }
+    bool is_ImplType { get; }
+    bool is_DynType { get; }
+    bool is_TupleType { get; }
+    bool is_FnType { get; }
+    bool is_IntersectionType { get; }
+    bool is_Array { get; }
+    bool is_TSynonym { get; }
+    bool is_TMetaData { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    RAST._IPath dtor_path { get; }
+    RAST._IType dtor_baseName { get; }
+    Dafny.ISequence<RAST._IType> dtor_arguments { get; }
+    RAST._IType dtor_underlying { get; }
+    RAST._IType dtor_returnType { get; }
+    RAST._IType dtor_left { get; }
+    RAST._IType dtor_right { get; }
+    Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> dtor_size { get; }
+    RAST._IType dtor_display { get; }
+    RAST._IType dtor_base { get; }
+    bool dtor_copySemantics { get; }
+    bool dtor_overflow { get; }
+    _IType DowncastClone();
+    RAST._IType Expand();
+    bool EndsWithNameThatCanAcceptGenerics();
+    RAST._IType ReplaceMap(Dafny.IMap<RAST._IType,RAST._IType> mapping);
+    RAST._IType Replace(Func<RAST._IType, RAST._IType> mapping);
+    __T Fold<__T>(__T acc, Func<__T, RAST._IType, __T> f);
+    bool IsAutoSize();
+    bool CanReadWithoutClone();
+    bool IsRcOrBorrowedRc();
+    Std.Wrappers._IOption<RAST._IType> ExtractMaybePlacebo();
+    Std.Wrappers._IOption<RAST._IType> ExtractMaybeUninitArrayElement();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+    RAST._IType Apply1(RAST._IType arg);
+    RAST._IType Apply(Dafny.ISequence<RAST._IType> args);
+    RAST._IType ToOwned();
+    RAST._IExpr ToNullExpr();
+    bool IsMultiArray();
+    Dafny.ISequence<Dafny.Rune> MultiArrayClass();
+    RAST._IType MultiArrayUnderlying();
+    RAST._IType TypeAtInitialization();
+    bool IsMaybeUninit();
+    bool IsUninitArray();
+    bool IsBox();
+    bool NeedsAsRefForBorrow();
+    RAST._IType BoxUnderlying();
+    bool IsObject();
+    bool IsPointer();
+    bool IsObjectOrPointer();
+    RAST._IType ObjectOrPointerUnderlying();
+    bool IsBuiltinCollection();
+    RAST._IType GetBuiltinCollectionElement();
+    bool IsRc();
+    RAST._IType RcUnderlying();
+  }
+  public abstract class Type : _IType {
+    public Type() {
+    }
+    private static readonly RAST._IType theDefault = create_U8();
+    public static RAST._IType Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IType> _TYPE = new Dafny.TypeDescriptor<RAST._IType>(RAST.Type.Default());
+    public static Dafny.TypeDescriptor<RAST._IType> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IType create_U8() {
+      return new Type_U8();
+    }
+    public static _IType create_U16() {
+      return new Type_U16();
+    }
+    public static _IType create_U32() {
+      return new Type_U32();
+    }
+    public static _IType create_U64() {
+      return new Type_U64();
+    }
+    public static _IType create_U128() {
+      return new Type_U128();
+    }
+    public static _IType create_I8() {
+      return new Type_I8();
+    }
+    public static _IType create_I16() {
+      return new Type_I16();
+    }
+    public static _IType create_I32() {
+      return new Type_I32();
+    }
+    public static _IType create_I64() {
+      return new Type_I64();
+    }
+    public static _IType create_I128() {
+      return new Type_I128();
+    }
+    public static _IType create_USIZE() {
+      return new Type_USIZE();
+    }
+    public static _IType create_Bool() {
+      return new Type_Bool();
+    }
+    public static _IType create_TIdentifier(Dafny.ISequence<Dafny.Rune> name) {
+      return new Type_TIdentifier(name);
+    }
+    public static _IType create_TypeFromPath(RAST._IPath path) {
+      return new Type_TypeFromPath(path);
+    }
+    public static _IType create_TypeApp(RAST._IType baseName, Dafny.ISequence<RAST._IType> arguments) {
+      return new Type_TypeApp(baseName, arguments);
+    }
+    public static _IType create_Borrowed(RAST._IType underlying) {
+      return new Type_Borrowed(underlying);
+    }
+    public static _IType create_BorrowedMut(RAST._IType underlying) {
+      return new Type_BorrowedMut(underlying);
+    }
+    public static _IType create_ImplType(RAST._IType underlying) {
+      return new Type_ImplType(underlying);
+    }
+    public static _IType create_DynType(RAST._IType underlying) {
+      return new Type_DynType(underlying);
+    }
+    public static _IType create_TupleType(Dafny.ISequence<RAST._IType> arguments) {
+      return new Type_TupleType(arguments);
+    }
+    public static _IType create_FnType(Dafny.ISequence<RAST._IType> arguments, RAST._IType returnType) {
+      return new Type_FnType(arguments, returnType);
+    }
+    public static _IType create_IntersectionType(RAST._IType left, RAST._IType right) {
+      return new Type_IntersectionType(left, right);
+    }
+    public static _IType create_Array(RAST._IType underlying, Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> size) {
+      return new Type_Array(underlying, size);
+    }
+    public static _IType create_TSynonym(RAST._IType display, RAST._IType @base) {
+      return new Type_TSynonym(display, @base);
+    }
+    public static _IType create_TMetaData(RAST._IType display, bool copySemantics, bool overflow) {
+      return new Type_TMetaData(display, copySemantics, overflow);
+    }
+    public bool is_U8 { get { return this is Type_U8; } }
+    public bool is_U16 { get { return this is Type_U16; } }
+    public bool is_U32 { get { return this is Type_U32; } }
+    public bool is_U64 { get { return this is Type_U64; } }
+    public bool is_U128 { get { return this is Type_U128; } }
+    public bool is_I8 { get { return this is Type_I8; } }
+    public bool is_I16 { get { return this is Type_I16; } }
+    public bool is_I32 { get { return this is Type_I32; } }
+    public bool is_I64 { get { return this is Type_I64; } }
+    public bool is_I128 { get { return this is Type_I128; } }
+    public bool is_USIZE { get { return this is Type_USIZE; } }
+    public bool is_Bool { get { return this is Type_Bool; } }
+    public bool is_TIdentifier { get { return this is Type_TIdentifier; } }
+    public bool is_TypeFromPath { get { return this is Type_TypeFromPath; } }
+    public bool is_TypeApp { get { return this is Type_TypeApp; } }
+    public bool is_Borrowed { get { return this is Type_Borrowed; } }
+    public bool is_BorrowedMut { get { return this is Type_BorrowedMut; } }
+    public bool is_ImplType { get { return this is Type_ImplType; } }
+    public bool is_DynType { get { return this is Type_DynType; } }
+    public bool is_TupleType { get { return this is Type_TupleType; } }
+    public bool is_FnType { get { return this is Type_FnType; } }
+    public bool is_IntersectionType { get { return this is Type_IntersectionType; } }
+    public bool is_Array { get { return this is Type_Array; } }
+    public bool is_TSynonym { get { return this is Type_TSynonym; } }
+    public bool is_TMetaData { get { return this is Type_TMetaData; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        var d = this;
+        return ((Type_TIdentifier)d)._name;
+      }
+    }
+    public RAST._IPath dtor_path {
+      get {
+        var d = this;
+        return ((Type_TypeFromPath)d)._path;
+      }
+    }
+    public RAST._IType dtor_baseName {
+      get {
+        var d = this;
+        return ((Type_TypeApp)d)._baseName;
+      }
+    }
+    public Dafny.ISequence<RAST._IType> dtor_arguments {
+      get {
+        var d = this;
+        if (d is Type_TypeApp) { return ((Type_TypeApp)d)._arguments; }
+        if (d is Type_TupleType) { return ((Type_TupleType)d)._arguments; }
+        return ((Type_FnType)d)._arguments;
+      }
+    }
+    public RAST._IType dtor_underlying {
+      get {
+        var d = this;
+        if (d is Type_Borrowed) { return ((Type_Borrowed)d)._underlying; }
+        if (d is Type_BorrowedMut) { return ((Type_BorrowedMut)d)._underlying; }
+        if (d is Type_ImplType) { return ((Type_ImplType)d)._underlying; }
+        if (d is Type_DynType) { return ((Type_DynType)d)._underlying; }
+        return ((Type_Array)d)._underlying;
+      }
+    }
+    public RAST._IType dtor_returnType {
+      get {
+        var d = this;
+        return ((Type_FnType)d)._returnType;
+      }
+    }
+    public RAST._IType dtor_left {
+      get {
+        var d = this;
+        return ((Type_IntersectionType)d)._left;
+      }
+    }
+    public RAST._IType dtor_right {
+      get {
+        var d = this;
+        return ((Type_IntersectionType)d)._right;
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> dtor_size {
+      get {
+        var d = this;
+        return ((Type_Array)d)._size;
+      }
+    }
+    public RAST._IType dtor_display {
+      get {
+        var d = this;
+        if (d is Type_TSynonym) { return ((Type_TSynonym)d)._display; }
+        return ((Type_TMetaData)d)._display;
+      }
+    }
+    public RAST._IType dtor_base {
+      get {
+        var d = this;
+        return ((Type_TSynonym)d)._base;
+      }
+    }
+    public bool dtor_copySemantics {
+      get {
+        var d = this;
+        return ((Type_TMetaData)d)._copySemantics;
+      }
+    }
+    public bool dtor_overflow {
+      get {
+        var d = this;
+        return ((Type_TMetaData)d)._overflow;
+      }
+    }
+    public abstract _IType DowncastClone();
+    public RAST._IType Expand() {
+      _IType _this = this;
+    TAIL_CALL_START: ;
+      if ((_this).is_TSynonym) {
+        RAST._IType _in0 = (_this).dtor_base;
+        _this = _in0;
+        ;
+        goto TAIL_CALL_START;
+      } else if ((_this).is_TMetaData) {
+        RAST._IType _in1 = (_this).dtor_display;
+        _this = _in1;
+        ;
+        goto TAIL_CALL_START;
+      } else {
+        return _this;
+      }
+    }
+    public bool EndsWithNameThatCanAcceptGenerics() {
+      return ((((((((((((((((((this).is_U8) || ((this).is_U16)) || ((this).is_U32)) || ((this).is_U64)) || ((this).is_U128)) || ((this).is_I8)) || ((this).is_I16)) || ((this).is_I32)) || ((this).is_I64)) || ((this).is_I128)) || ((this).is_TIdentifier)) || ((this).is_TypeFromPath)) || (((this).is_Borrowed) && (((this).dtor_underlying).EndsWithNameThatCanAcceptGenerics()))) || (((this).is_BorrowedMut) && (((this).dtor_underlying).EndsWithNameThatCanAcceptGenerics()))) || (((this).is_ImplType) && (((this).dtor_underlying).EndsWithNameThatCanAcceptGenerics()))) || (((this).is_DynType) && (((this).dtor_underlying).EndsWithNameThatCanAcceptGenerics()))) || (((this).is_IntersectionType) && (((this).dtor_right).EndsWithNameThatCanAcceptGenerics()))) || ((((this).is_TSynonym) || ((this).is_TMetaData)) && (((this).dtor_display).EndsWithNameThatCanAcceptGenerics()));
+    }
+    public RAST._IType ReplaceMap(Dafny.IMap<RAST._IType,RAST._IType> mapping) {
+      return (this).Replace(Dafny.Helpers.Id<Func<Dafny.IMap<RAST._IType,RAST._IType>, Func<RAST._IType, RAST._IType>>>((_0_mapping) => ((System.Func<RAST._IType, RAST._IType>)((_1_t) => {
+        return (((_0_mapping).Contains(_1_t)) ? (Dafny.Map<RAST._IType, RAST._IType>.Select(_0_mapping,_1_t)) : (_1_t));
+      })))(mapping));
+    }
+    public RAST._IType Replace(Func<RAST._IType, RAST._IType> mapping) {
+      RAST._IType _0_r = ((System.Func<RAST._IType>)(() => {
+        RAST._IType _source0 = this;
+        {
+          bool disjunctiveMatch0 = false;
+          if (_source0.is_U8) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_U16) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_U32) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_U64) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_U128) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_I8) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_I16) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_I32) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_I64) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_I128) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_USIZE) {
+            disjunctiveMatch0 = true;
+          }
+          if (_source0.is_Bool) {
+            disjunctiveMatch0 = true;
+          }
+          if (disjunctiveMatch0) {
+            return this;
+          }
+        }
+        {
+          if (_source0.is_TIdentifier) {
+            return this;
+          }
+        }
+        {
+          if (_source0.is_TypeFromPath) {
+            RAST._IPath _1_path = _source0.dtor_path;
+            return this;
+          }
+        }
+        {
+          if (_source0.is_TypeApp) {
+            RAST._IType _2_baseName = _source0.dtor_baseName;
+            Dafny.ISequence<RAST._IType> _3_arguments = _source0.dtor_arguments;
+            RAST._IType _4_dt__update__tmp_h0 = this;
+            Dafny.ISequence<RAST._IType> _5_dt__update_harguments_h0 = Std.Collections.Seq.__default.Map<RAST._IType, RAST._IType>(Dafny.Helpers.Id<Func<Func<RAST._IType, RAST._IType>, Dafny.ISequence<RAST._IType>, Func<RAST._IType, RAST._IType>>>((_6_mapping, _7_arguments) => ((System.Func<RAST._IType, RAST._IType>)((_8_t) => {
+              return (_8_t).Replace(_6_mapping);
+            })))(mapping, _3_arguments), _3_arguments);
+            RAST._IType _9_dt__update_hbaseName_h0 = (_2_baseName).Replace(mapping);
+            return RAST.Type.create_TypeApp(_9_dt__update_hbaseName_h0, _5_dt__update_harguments_h0);
+          }
+        }
+        {
+          if (_source0.is_Borrowed) {
+            RAST._IType _10_underlying = _source0.dtor_underlying;
+            RAST._IType _11_dt__update__tmp_h1 = this;
+            RAST._IType _12_dt__update_hunderlying_h0 = (_10_underlying).Replace(mapping);
+            if ((_11_dt__update__tmp_h1).is_Borrowed) {
+              return RAST.Type.create_Borrowed(_12_dt__update_hunderlying_h0);
+            } else if ((_11_dt__update__tmp_h1).is_BorrowedMut) {
+              return RAST.Type.create_BorrowedMut(_12_dt__update_hunderlying_h0);
+            } else if ((_11_dt__update__tmp_h1).is_ImplType) {
+              return RAST.Type.create_ImplType(_12_dt__update_hunderlying_h0);
+            } else if ((_11_dt__update__tmp_h1).is_DynType) {
+              return RAST.Type.create_DynType(_12_dt__update_hunderlying_h0);
+            } else {
+              return RAST.Type.create_Array(_12_dt__update_hunderlying_h0, (_11_dt__update__tmp_h1).dtor_size);
+            }
+          }
+        }
+        {
+          if (_source0.is_BorrowedMut) {
+            RAST._IType _13_underlying = _source0.dtor_underlying;
+            RAST._IType _14_dt__update__tmp_h2 = this;
+            RAST._IType _15_dt__update_hunderlying_h1 = (_13_underlying).Replace(mapping);
+            if ((_14_dt__update__tmp_h2).is_Borrowed) {
+              return RAST.Type.create_Borrowed(_15_dt__update_hunderlying_h1);
+            } else if ((_14_dt__update__tmp_h2).is_BorrowedMut) {
+              return RAST.Type.create_BorrowedMut(_15_dt__update_hunderlying_h1);
+            } else if ((_14_dt__update__tmp_h2).is_ImplType) {
+              return RAST.Type.create_ImplType(_15_dt__update_hunderlying_h1);
+            } else if ((_14_dt__update__tmp_h2).is_DynType) {
+              return RAST.Type.create_DynType(_15_dt__update_hunderlying_h1);
+            } else {
+              return RAST.Type.create_Array(_15_dt__update_hunderlying_h1, (_14_dt__update__tmp_h2).dtor_size);
+            }
+          }
+        }
+        {
+          if (_source0.is_ImplType) {
+            RAST._IType _16_underlying = _source0.dtor_underlying;
+            RAST._IType _17_dt__update__tmp_h3 = this;
+            RAST._IType _18_dt__update_hunderlying_h2 = (_16_underlying).Replace(mapping);
+            if ((_17_dt__update__tmp_h3).is_Borrowed) {
+              return RAST.Type.create_Borrowed(_18_dt__update_hunderlying_h2);
+            } else if ((_17_dt__update__tmp_h3).is_BorrowedMut) {
+              return RAST.Type.create_BorrowedMut(_18_dt__update_hunderlying_h2);
+            } else if ((_17_dt__update__tmp_h3).is_ImplType) {
+              return RAST.Type.create_ImplType(_18_dt__update_hunderlying_h2);
+            } else if ((_17_dt__update__tmp_h3).is_DynType) {
+              return RAST.Type.create_DynType(_18_dt__update_hunderlying_h2);
+            } else {
+              return RAST.Type.create_Array(_18_dt__update_hunderlying_h2, (_17_dt__update__tmp_h3).dtor_size);
+            }
+          }
+        }
+        {
+          if (_source0.is_DynType) {
+            RAST._IType _19_underlying = _source0.dtor_underlying;
+            RAST._IType _20_dt__update__tmp_h4 = this;
+            RAST._IType _21_dt__update_hunderlying_h3 = (_19_underlying).Replace(mapping);
+            if ((_20_dt__update__tmp_h4).is_Borrowed) {
+              return RAST.Type.create_Borrowed(_21_dt__update_hunderlying_h3);
+            } else if ((_20_dt__update__tmp_h4).is_BorrowedMut) {
+              return RAST.Type.create_BorrowedMut(_21_dt__update_hunderlying_h3);
+            } else if ((_20_dt__update__tmp_h4).is_ImplType) {
+              return RAST.Type.create_ImplType(_21_dt__update_hunderlying_h3);
+            } else if ((_20_dt__update__tmp_h4).is_DynType) {
+              return RAST.Type.create_DynType(_21_dt__update_hunderlying_h3);
+            } else {
+              return RAST.Type.create_Array(_21_dt__update_hunderlying_h3, (_20_dt__update__tmp_h4).dtor_size);
+            }
+          }
+        }
+        {
+          if (_source0.is_TupleType) {
+            Dafny.ISequence<RAST._IType> _22_arguments = _source0.dtor_arguments;
+            RAST._IType _23_dt__update__tmp_h5 = this;
+            Dafny.ISequence<RAST._IType> _24_dt__update_harguments_h1 = Std.Collections.Seq.__default.Map<RAST._IType, RAST._IType>(Dafny.Helpers.Id<Func<Func<RAST._IType, RAST._IType>, Dafny.ISequence<RAST._IType>, Func<RAST._IType, RAST._IType>>>((_25_mapping, _26_arguments) => ((System.Func<RAST._IType, RAST._IType>)((_27_t) => {
+              return (_27_t).Replace(_25_mapping);
+            })))(mapping, _22_arguments), _22_arguments);
+            if ((_23_dt__update__tmp_h5).is_TypeApp) {
+              return RAST.Type.create_TypeApp((_23_dt__update__tmp_h5).dtor_baseName, _24_dt__update_harguments_h1);
+            } else if ((_23_dt__update__tmp_h5).is_TupleType) {
+              return RAST.Type.create_TupleType(_24_dt__update_harguments_h1);
+            } else {
+              return RAST.Type.create_FnType(_24_dt__update_harguments_h1, (_23_dt__update__tmp_h5).dtor_returnType);
+            }
+          }
+        }
+        {
+          if (_source0.is_FnType) {
+            Dafny.ISequence<RAST._IType> _28_arguments = _source0.dtor_arguments;
+            RAST._IType _29_returnType = _source0.dtor_returnType;
+            RAST._IType _30_dt__update__tmp_h6 = this;
+            RAST._IType _31_dt__update_hreturnType_h0 = (_29_returnType).Replace(mapping);
+            Dafny.ISequence<RAST._IType> _32_dt__update_harguments_h2 = Std.Collections.Seq.__default.Map<RAST._IType, RAST._IType>(Dafny.Helpers.Id<Func<Func<RAST._IType, RAST._IType>, Dafny.ISequence<RAST._IType>, Func<RAST._IType, RAST._IType>>>((_33_mapping, _34_arguments) => ((System.Func<RAST._IType, RAST._IType>)((_35_t) => {
+              return (_35_t).Replace(_33_mapping);
+            })))(mapping, _28_arguments), _28_arguments);
+            return RAST.Type.create_FnType(_32_dt__update_harguments_h2, _31_dt__update_hreturnType_h0);
+          }
+        }
+        {
+          if (_source0.is_IntersectionType) {
+            RAST._IType _36_left = _source0.dtor_left;
+            RAST._IType _37_right = _source0.dtor_right;
+            RAST._IType _38_dt__update__tmp_h7 = this;
+            RAST._IType _39_dt__update_hright_h0 = (_37_right).Replace(mapping);
+            RAST._IType _40_dt__update_hleft_h0 = (_36_left).Replace(mapping);
+            return RAST.Type.create_IntersectionType(_40_dt__update_hleft_h0, _39_dt__update_hright_h0);
+          }
+        }
+        {
+          if (_source0.is_Array) {
+            RAST._IType _41_underlying = _source0.dtor_underlying;
+            Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _42_size = _source0.dtor_size;
+            RAST._IType _43_dt__update__tmp_h8 = this;
+            RAST._IType _44_dt__update_hunderlying_h4 = (_41_underlying).Replace(mapping);
+            if ((_43_dt__update__tmp_h8).is_Borrowed) {
+              return RAST.Type.create_Borrowed(_44_dt__update_hunderlying_h4);
+            } else if ((_43_dt__update__tmp_h8).is_BorrowedMut) {
+              return RAST.Type.create_BorrowedMut(_44_dt__update_hunderlying_h4);
+            } else if ((_43_dt__update__tmp_h8).is_ImplType) {
+              return RAST.Type.create_ImplType(_44_dt__update_hunderlying_h4);
+            } else if ((_43_dt__update__tmp_h8).is_DynType) {
+              return RAST.Type.create_DynType(_44_dt__update_hunderlying_h4);
+            } else {
+              return RAST.Type.create_Array(_44_dt__update_hunderlying_h4, (_43_dt__update__tmp_h8).dtor_size);
+            }
+          }
+        }
+        {
+          if (_source0.is_TSynonym) {
+            RAST._IType _45_display = _source0.dtor_display;
+            RAST._IType _46_base = _source0.dtor_base;
+            RAST._IType _47_dt__update__tmp_h9 = this;
+            RAST._IType _48_dt__update_hbase_h0 = (_46_base).Replace(mapping);
+            RAST._IType _49_dt__update_hdisplay_h0 = (_45_display).Replace(mapping);
+            return RAST.Type.create_TSynonym(_49_dt__update_hdisplay_h0, _48_dt__update_hbase_h0);
+          }
+        }
+        {
+          RAST._IType _50_display = _source0.dtor_display;
+          bool _51_copySemantics = _source0.dtor_copySemantics;
+          bool _52_overflow = _source0.dtor_overflow;
+          RAST._IType _53_dt__update__tmp_h10 = this;
+          RAST._IType _54_dt__update_hdisplay_h1 = (_50_display).Replace(mapping);
+          if ((_53_dt__update__tmp_h10).is_TSynonym) {
+            return RAST.Type.create_TSynonym(_54_dt__update_hdisplay_h1, (_53_dt__update__tmp_h10).dtor_base);
+          } else {
+            return RAST.Type.create_TMetaData(_54_dt__update_hdisplay_h1, (_53_dt__update__tmp_h10).dtor_copySemantics, (_53_dt__update__tmp_h10).dtor_overflow);
+          }
+        }
+      }))();
+      return Dafny.Helpers.Id<Func<RAST._IType, RAST._IType>>(mapping)(_0_r);
+    }
+    public __T Fold<__T>(__T acc, Func<__T, RAST._IType, __T> f)
+    {
+      __T _0_newAcc = Dafny.Helpers.Id<Func<__T, RAST._IType, __T>>(f)(acc, this);
+      RAST._IType _source0 = this;
+      {
+        bool disjunctiveMatch0 = false;
+        if (_source0.is_U8) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_U16) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_U32) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_U64) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_U128) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_I8) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_I16) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_I32) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_I64) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_I128) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_USIZE) {
+          disjunctiveMatch0 = true;
+        }
+        if (_source0.is_Bool) {
+          disjunctiveMatch0 = true;
+        }
+        if (disjunctiveMatch0) {
+          return _0_newAcc;
+        }
+      }
+      {
+        if (_source0.is_TIdentifier) {
+          return _0_newAcc;
+        }
+      }
+      {
+        if (_source0.is_TypeFromPath) {
+          RAST._IPath _1_path = _source0.dtor_path;
+          return _0_newAcc;
+        }
+      }
+      {
+        if (_source0.is_TypeApp) {
+          RAST._IType _2_baseName = _source0.dtor_baseName;
+          Dafny.ISequence<RAST._IType> _3_arguments = _source0.dtor_arguments;
+          __T _4_newAcc = (_2_baseName).Fold<__T>(_0_newAcc, f);
+          return RAST.__default.FoldLeft<__T, RAST._IType>(Dafny.Helpers.Id<Func<Func<__T, RAST._IType, __T>, Dafny.ISequence<RAST._IType>, Func<__T, RAST._IType, __T>>>((_5_f, _6_arguments) => ((System.Func<__T, RAST._IType, __T>)((_7_acc, _8_argType) => {
+            return (_8_argType).Fold<__T>(_7_acc, _5_f);
+          })))(f, _3_arguments), _4_newAcc, _3_arguments);
+        }
+      }
+      {
+        if (_source0.is_Borrowed) {
+          RAST._IType _9_underlying = _source0.dtor_underlying;
+          return (_9_underlying).Fold<__T>(_0_newAcc, f);
+        }
+      }
+      {
+        if (_source0.is_BorrowedMut) {
+          RAST._IType _10_underlying = _source0.dtor_underlying;
+          return (_10_underlying).Fold<__T>(_0_newAcc, f);
+        }
+      }
+      {
+        if (_source0.is_ImplType) {
+          RAST._IType _11_underlying = _source0.dtor_underlying;
+          return (_11_underlying).Fold<__T>(_0_newAcc, f);
+        }
+      }
+      {
+        if (_source0.is_DynType) {
+          RAST._IType _12_underlying = _source0.dtor_underlying;
+          return (_12_underlying).Fold<__T>(_0_newAcc, f);
+        }
+      }
+      {
+        if (_source0.is_TupleType) {
+          Dafny.ISequence<RAST._IType> _13_arguments = _source0.dtor_arguments;
+          return RAST.__default.FoldLeft<__T, RAST._IType>(Dafny.Helpers.Id<Func<Func<__T, RAST._IType, __T>, Dafny.ISequence<RAST._IType>, Func<__T, RAST._IType, __T>>>((_14_f, _15_arguments) => ((System.Func<__T, RAST._IType, __T>)((_16_acc, _17_argType) => {
+            return (_17_argType).Fold<__T>(_16_acc, _14_f);
+          })))(f, _13_arguments), _0_newAcc, _13_arguments);
+        }
+      }
+      {
+        if (_source0.is_FnType) {
+          Dafny.ISequence<RAST._IType> _18_arguments = _source0.dtor_arguments;
+          RAST._IType _19_returnType = _source0.dtor_returnType;
+          return (_19_returnType).Fold<__T>(RAST.__default.FoldLeft<__T, RAST._IType>(Dafny.Helpers.Id<Func<Func<__T, RAST._IType, __T>, Dafny.ISequence<RAST._IType>, Func<__T, RAST._IType, __T>>>((_20_f, _21_arguments) => ((System.Func<__T, RAST._IType, __T>)((_22_acc, _23_argType) => {
+            return (_23_argType).Fold<__T>(_22_acc, _20_f);
+          })))(f, _18_arguments), _0_newAcc, _18_arguments), f);
+        }
+      }
+      {
+        if (_source0.is_IntersectionType) {
+          RAST._IType _24_left = _source0.dtor_left;
+          RAST._IType _25_right = _source0.dtor_right;
+          return (_25_right).Fold<__T>((_24_left).Fold<__T>(_0_newAcc, f), f);
+        }
+      }
+      {
+        if (_source0.is_Array) {
+          RAST._IType _26_underlying = _source0.dtor_underlying;
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _27_size = _source0.dtor_size;
+          return (_26_underlying).Fold<__T>(_0_newAcc, f);
+        }
+      }
+      {
+        if (_source0.is_TSynonym) {
+          RAST._IType _28_display = _source0.dtor_display;
+          RAST._IType _29_base = _source0.dtor_base;
+          return (_28_display).Fold<__T>(_0_newAcc, f);
+        }
+      }
+      {
+        RAST._IType _30_display = _source0.dtor_display;
+        return (_30_display).Fold<__T>(_0_newAcc, f);
+      }
+    }
+    public bool IsAutoSize() {
+      return (((((((((((((this).is_U8) || ((this).is_U16)) || ((this).is_U32)) || ((this).is_U64)) || ((this).is_U128)) || ((this).is_I8)) || ((this).is_I16)) || ((this).is_I32)) || ((this).is_I64)) || ((this).is_I128)) || ((this).is_USIZE)) || (((this).is_TSynonym) && (((this).dtor_base).IsAutoSize()))) || (((this).is_TMetaData) && (((this).dtor_display).IsAutoSize()));
+    }
+    public bool CanReadWithoutClone() {
+      return (((((this).IsAutoSize()) || ((this).is_Bool)) || ((this).IsPointer())) || (((this).is_TSynonym) && (((this).dtor_base).CanReadWithoutClone()))) || (((this).is_TMetaData) && (((this).dtor_copySemantics) || (((this).dtor_display).CanReadWithoutClone())));
+    }
+    public bool IsRcOrBorrowedRc() {
+      return ((((this).is_TypeApp) && (object.Equals((this).dtor_baseName, RAST.__default.RcType))) || (((this).is_Borrowed) && (((this).dtor_underlying).IsRcOrBorrowedRc()))) || (((this).is_TSynonym) && (((this).dtor_base).IsRcOrBorrowedRc()));
+    }
+    public Std.Wrappers._IOption<RAST._IType> ExtractMaybePlacebo() {
+      RAST._IType _source0 = this;
+      {
+        if (_source0.is_TypeApp) {
+          RAST._IType _0_wrapper = _source0.dtor_baseName;
+          Dafny.ISequence<RAST._IType> _1_arguments = _source0.dtor_arguments;
+          if ((object.Equals(_0_wrapper, RAST.Type.create_TypeFromPath(RAST.__default.MaybePlaceboPath))) && ((new BigInteger((_1_arguments).Count)) == (BigInteger.One))) {
+            return Std.Wrappers.Option<RAST._IType>.create_Some((_1_arguments).Select(BigInteger.Zero));
+          } else {
+            return Std.Wrappers.Option<RAST._IType>.create_None();
+          }
+        }
+      }
+      {
+        return Std.Wrappers.Option<RAST._IType>.create_None();
+      }
+    }
+    public Std.Wrappers._IOption<RAST._IType> ExtractMaybeUninitArrayElement() {
+      if ((this).IsObjectOrPointer()) {
+        RAST._IType _0_s = (this).ObjectOrPointerUnderlying();
+        if (((_0_s).is_Array) && (RAST.__default.IsMaybeUninitType((_0_s).dtor_underlying))) {
+          return Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.MaybeUninitTypeUnderlying((_0_s).dtor_underlying));
+        } else if (((_0_s).IsMultiArray()) && (RAST.__default.IsMaybeUninitType((_0_s).MultiArrayUnderlying()))) {
+          return Std.Wrappers.Option<RAST._IType>.create_Some(RAST.__default.MaybeUninitTypeUnderlying((_0_s).MultiArrayUnderlying()));
+        } else {
+          return Std.Wrappers.Option<RAST._IType>.create_None();
+        }
+      } else {
+        return Std.Wrappers.Option<RAST._IType>.create_None();
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      RAST._IType _source0 = this;
+      {
+        if (_source0.is_Bool) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("bool");
+        }
+      }
+      {
+        if (_source0.is_TIdentifier) {
+          Dafny.ISequence<Dafny.Rune> _0_underlying = _source0.dtor_name;
+          return _0_underlying;
+        }
+      }
+      {
+        if (_source0.is_TypeFromPath) {
+          RAST._IPath _1_underlying = _source0.dtor_path;
+          return (_1_underlying)._ToString();
+        }
+      }
+      {
+        if (_source0.is_Borrowed) {
+          RAST._IType _2_underlying = _source0.dtor_underlying;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), (_2_underlying)._ToString(ind));
+        }
+      }
+      {
+        if (_source0.is_BorrowedMut) {
+          RAST._IType _3_underlying = _source0.dtor_underlying;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&mut "), (_3_underlying)._ToString(ind));
+        }
+      }
+      {
+        if (_source0.is_ImplType) {
+          RAST._IType _4_underlying = _source0.dtor_underlying;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl "), (_4_underlying)._ToString(ind));
+        }
+      }
+      {
+        if (_source0.is_DynType) {
+          RAST._IType _5_underlying = _source0.dtor_underlying;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dyn "), (_5_underlying)._ToString(ind));
+        }
+      }
+      {
+        if (_source0.is_FnType) {
+          Dafny.ISequence<RAST._IType> _6_arguments = _source0.dtor_arguments;
+          RAST._IType _7_returnType = _source0.dtor_returnType;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::ops::Fn("), RAST.__default.SeqToString<RAST._IType>(_6_arguments, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>>>((_8_ind) => ((System.Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>)((_9_arg) => {
+            return (_9_arg)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_8_ind, RAST.__default.IND));
+          })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") -> ")), (_7_returnType)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND)));
+        }
+      }
+      {
+        if (_source0.is_IntersectionType) {
+          RAST._IType _10_left = _source0.dtor_left;
+          RAST._IType _11_right = _source0.dtor_right;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat((_10_left)._ToString(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" + ")), (_11_right)._ToString(ind));
+        }
+      }
+      {
+        if (_source0.is_TupleType) {
+          Dafny.ISequence<RAST._IType> _12_args = _source0.dtor_arguments;
+          if ((_12_args).Equals(Dafny.Sequence<RAST._IType>.FromElements())) {
+            return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("()");
+          } else {
+            return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), RAST.__default.SeqToString<RAST._IType>(_12_args, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>>>((_13_ind) => ((System.Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>)((_14_arg) => {
+              return (_14_arg)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_13_ind, RAST.__default.IND));
+            })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
+          }
+        }
+      }
+      {
+        if (_source0.is_TypeApp) {
+          RAST._IType _15_base = _source0.dtor_baseName;
+          Dafny.ISequence<RAST._IType> _16_args = _source0.dtor_arguments;
+          return Dafny.Sequence<Dafny.Rune>.Concat((_15_base)._ToString(ind), (((_16_args).Equals(Dafny.Sequence<RAST._IType>.FromElements())) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), RAST.__default.SeqToString<RAST._IType>(_16_args, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>>>((_17_ind) => ((System.Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>)((_18_arg) => {
+            return (_18_arg)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_17_ind, RAST.__default.IND));
+          })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">")))));
+        }
+      }
+      {
+        if (_source0.is_U8) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u8");
+        }
+      }
+      {
+        if (_source0.is_U16) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u16");
+        }
+      }
+      {
+        if (_source0.is_U32) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u32");
+        }
+      }
+      {
+        if (_source0.is_U64) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u64");
+        }
+      }
+      {
+        if (_source0.is_U128) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("u128");
+        }
+      }
+      {
+        if (_source0.is_I8) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i8");
+        }
+      }
+      {
+        if (_source0.is_I16) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i16");
+        }
+      }
+      {
+        if (_source0.is_I32) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i32");
+        }
+      }
+      {
+        if (_source0.is_I64) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i64");
+        }
+      }
+      {
+        if (_source0.is_I128) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("i128");
+        }
+      }
+      {
+        if (_source0.is_USIZE) {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("usize");
+        }
+      }
+      {
+        if (_source0.is_Array) {
+          RAST._IType _19_underlying = _source0.dtor_underlying;
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _20_size = _source0.dtor_size;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("["), (_19_underlying)._ToString(ind)), (((_20_size).is_Some) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("; "), (_20_size).dtor_value)) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("]"));
+        }
+      }
+      {
+        if (_source0.is_TSynonym) {
+          RAST._IType _21_display = _source0.dtor_display;
+          RAST._IType _22_base = _source0.dtor_base;
+          return (_21_display)._ToString(ind);
+        }
+      }
+      {
+        RAST._IType _23_display = _source0.dtor_display;
+        return (_23_display)._ToString(ind);
+      }
+    }
+    public RAST._IType Apply1(RAST._IType arg) {
+      return RAST.Type.create_TypeApp(this, Dafny.Sequence<RAST._IType>.FromElements(arg));
+    }
+    public RAST._IType Apply(Dafny.ISequence<RAST._IType> args) {
+      return RAST.Type.create_TypeApp(this, args);
+    }
+    public RAST._IType ToOwned() {
+      RAST._IType _source0 = this;
+      {
+        if (_source0.is_Borrowed) {
+          RAST._IType _0_x = _source0.dtor_underlying;
+          return _0_x;
+        }
+      }
+      {
+        if (_source0.is_BorrowedMut) {
+          RAST._IType _1_x = _source0.dtor_underlying;
+          return _1_x;
+        }
+      }
+      {
+        RAST._IType _2_x = _source0;
+        return _2_x;
+      }
+    }
+    public RAST._IExpr ToNullExpr() {
+      if (((this).Expand()).IsObject()) {
+        return ((RAST.__default.Object).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("null"))).Apply0();
+      } else {
+        return ((RAST.__default.Ptr).FSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("null"))).Apply0();
+      }
+    }
+    public bool IsMultiArray() {
+      RAST._IType _0_t = (this).Expand();
+      return ((_0_t).is_TypeApp) && (Dafny.Helpers.Let<RAST._IType, bool>((_0_t).dtor_baseName, _pat_let18_0 => Dafny.Helpers.Let<RAST._IType, bool>(_pat_let18_0, _1_baseName => Dafny.Helpers.Let<Dafny.ISequence<RAST._IType>, bool>((_0_t).dtor_arguments, _pat_let19_0 => Dafny.Helpers.Let<Dafny.ISequence<RAST._IType>, bool>(_pat_let19_0, _2_args => ((((((new BigInteger((_2_args).Count)) == (BigInteger.One)) && ((_1_baseName).is_TypeFromPath)) && (((_1_baseName).dtor_path).is_PMemberSelect)) && (object.Equals(((_1_baseName).dtor_path).dtor_base, RAST.__default.dafny__runtime))) && ((new BigInteger((((_1_baseName).dtor_path).dtor_name).Count)) >= (new BigInteger(5)))) && (((((_1_baseName).dtor_path).dtor_name).Subsequence(BigInteger.Zero, new BigInteger(5))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Array"))))))));
+    }
+    public Dafny.ISequence<Dafny.Rune> MultiArrayClass() {
+      return ((((this).Expand()).dtor_baseName).dtor_path).dtor_name;
+    }
+    public RAST._IType MultiArrayUnderlying() {
+      return (((this).Expand()).dtor_arguments).Select(BigInteger.Zero);
+    }
+    public RAST._IType TypeAtInitialization() {
+      if ((this).IsObjectOrPointer()) {
+        RAST._IType _0_s = (this).ObjectOrPointerUnderlying();
+        if (((_0_s).is_Array) && (((_0_s).dtor_size).is_None)) {
+          RAST._IType _1_newUnderlying = RAST.Type.create_Array(RAST.__default.MaybeUninitType((_0_s).dtor_underlying), Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None());
+          if ((this).IsObject()) {
+            return RAST.__default.ObjectType(_1_newUnderlying);
+          } else {
+            return RAST.__default.PtrType(_1_newUnderlying);
+          }
+        } else if ((_0_s).IsMultiArray()) {
+          RAST._IType _2_newUnderlying = RAST.Type.create_TypeApp(((_0_s).Expand()).dtor_baseName, Dafny.Sequence<RAST._IType>.FromElements(RAST.__default.MaybeUninitType((((_0_s).Expand()).dtor_arguments).Select(BigInteger.Zero))));
+          if ((this).IsObject()) {
+            return RAST.__default.ObjectType(_2_newUnderlying);
+          } else {
+            return RAST.__default.PtrType(_2_newUnderlying);
+          }
+        } else {
+          return this;
+        }
+      } else {
+        return this;
+      }
+    }
+    public bool IsMaybeUninit() {
+      return ((((this).is_TypeApp) && (((this).dtor_baseName).is_TypeFromPath)) && (object.Equals(((this).dtor_baseName).dtor_path, RAST.__default.MaybeUninitPath))) && ((new BigInteger(((this).dtor_arguments).Count)) == (BigInteger.One));
+    }
+    public bool IsUninitArray() {
+      if ((this).IsObjectOrPointer()) {
+        RAST._IType _0_s = ((this).ObjectOrPointerUnderlying()).Expand();
+        if (((_0_s).is_Array) && (((_0_s).dtor_size).is_None)) {
+          return ((_0_s).dtor_underlying).IsMaybeUninit();
+        } else if ((_0_s).IsMultiArray()) {
+          return (((_0_s).dtor_arguments).Select(BigInteger.Zero)).IsMaybeUninit();
+        } else {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    public bool IsBox() {
+      RAST._IType _source0 = this;
+      {
+        if (_source0.is_TypeApp) {
+          RAST._IType baseName0 = _source0.dtor_baseName;
+          if (baseName0.is_TypeFromPath) {
+            RAST._IPath _0_o = baseName0.dtor_path;
+            Dafny.ISequence<RAST._IType> _1_elems1 = _source0.dtor_arguments;
+            return (object.Equals(_0_o, RAST.__default.BoxPath)) && ((new BigInteger((_1_elems1).Count)) == (BigInteger.One));
+          }
+        }
+      }
+      {
+        return false;
+      }
+    }
+    public bool NeedsAsRefForBorrow() {
+      if ((this).is_Borrowed) {
+        return (((this).dtor_underlying).IsBox()) || (((this).dtor_underlying).IsRc());
+      } else {
+        return ((this).IsBox()) || ((this).IsRc());
+      }
+    }
+    public RAST._IType BoxUnderlying() {
+      RAST._IType _source0 = this;
+      {
+        RAST._IType baseName0 = _source0.dtor_baseName;
+        RAST._IPath _0_o = baseName0.dtor_path;
+        Dafny.ISequence<RAST._IType> _1_elems1 = _source0.dtor_arguments;
+        return (_1_elems1).Select(BigInteger.Zero);
+      }
+    }
+    public bool IsObject() {
+      RAST._IType _source0 = this;
+      {
+        if (_source0.is_TypeApp) {
+          RAST._IType baseName0 = _source0.dtor_baseName;
+          if (baseName0.is_TypeFromPath) {
+            RAST._IPath _0_o = baseName0.dtor_path;
+            Dafny.ISequence<RAST._IType> _1_elems1 = _source0.dtor_arguments;
+            return (object.Equals(_0_o, RAST.__default.ObjectPath)) && ((new BigInteger((_1_elems1).Count)) == (BigInteger.One));
+          }
+        }
+      }
+      {
+        return false;
+      }
+    }
+    public bool IsPointer() {
+      RAST._IType _source0 = this;
+      {
+        if (_source0.is_TypeApp) {
+          RAST._IType baseName0 = _source0.dtor_baseName;
+          if (baseName0.is_TypeFromPath) {
+            RAST._IPath _0_o = baseName0.dtor_path;
+            Dafny.ISequence<RAST._IType> _1_elems1 = _source0.dtor_arguments;
+            return (object.Equals(_0_o, RAST.__default.PtrPath)) && ((new BigInteger((_1_elems1).Count)) == (BigInteger.One));
+          }
+        }
+      }
+      {
+        return false;
+      }
+    }
+    public bool IsObjectOrPointer()
+    {
+      bool _hresult = false;
+      RAST._IType _0_t;
+      _0_t = (this).Expand();
+      _hresult = ((_0_t).IsPointer()) || ((_0_t).IsObject());
+      return _hresult;
+      return _hresult;
+    }
+    public RAST._IType ObjectOrPointerUnderlying() {
+      RAST._IType _source0 = (this).Expand();
+      {
+        Dafny.ISequence<RAST._IType> _0_elems1 = _source0.dtor_arguments;
+        return (_0_elems1).Select(BigInteger.Zero);
+      }
+    }
+    public bool IsBuiltinCollection() {
+      RAST._IType _source0 = (this).Expand();
+      {
+        if (_source0.is_TypeApp) {
+          RAST._IType baseName0 = _source0.dtor_baseName;
+          if (baseName0.is_TypeFromPath) {
+            RAST._IPath path0 = baseName0.dtor_path;
+            if (path0.is_PMemberSelect) {
+              RAST._IPath base0 = path0.dtor_base;
+              if (base0.is_PMemberSelect) {
+                RAST._IPath base1 = base0.dtor_base;
+                if (base1.is_Global) {
+                  Dafny.ISequence<Dafny.Rune> name0 = base0.dtor_name;
+                  if (object.Equals(name0, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("dafny_runtime"))) {
+                    Dafny.ISequence<Dafny.Rune> _0_tpe = path0.dtor_name;
+                    Dafny.ISequence<RAST._IType> _1_elems1 = _source0.dtor_arguments;
+                    return (((((_0_tpe).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Set"))) || ((_0_tpe).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Sequence")))) || ((_0_tpe).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Multiset")))) && ((new BigInteger((_1_elems1).Count)) == (BigInteger.One))) || (((_0_tpe).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Map"))) && ((new BigInteger((_1_elems1).Count)) == (new BigInteger(2))));
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      {
+        return false;
+      }
+    }
+    public RAST._IType GetBuiltinCollectionElement() {
+      RAST._IType _source0 = (this).Expand();
+      {
+        RAST._IType baseName0 = _source0.dtor_baseName;
+        RAST._IPath path0 = baseName0.dtor_path;
+        RAST._IPath base0 = path0.dtor_base;
+        RAST._IPath base1 = base0.dtor_base;
+        Dafny.ISequence<Dafny.Rune> name0 = base0.dtor_name;
+        Dafny.ISequence<Dafny.Rune> _0_tpe = path0.dtor_name;
+        Dafny.ISequence<RAST._IType> _1_elems = _source0.dtor_arguments;
+        if ((_0_tpe).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Map"))) {
+          return (_1_elems).Select(BigInteger.One);
+        } else {
+          return (_1_elems).Select(BigInteger.Zero);
+        }
+      }
+    }
+    public bool IsRc() {
+      return (((this).is_TypeApp) && (object.Equals((this).dtor_baseName, RAST.__default.RcType))) && ((new BigInteger(((this).dtor_arguments).Count)) == (BigInteger.One));
+    }
+    public RAST._IType RcUnderlying() {
+      return ((this).dtor_arguments).Select(BigInteger.Zero);
+    }
+  }
+  public class Type_U8 : Type {
+    public Type_U8() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_U8();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_U8;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.U8";
+      return s;
+    }
+  }
+  public class Type_U16 : Type {
+    public Type_U16() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_U16();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_U16;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.U16";
+      return s;
+    }
+  }
+  public class Type_U32 : Type {
+    public Type_U32() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_U32();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_U32;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.U32";
+      return s;
+    }
+  }
+  public class Type_U64 : Type {
+    public Type_U64() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_U64();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_U64;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.U64";
+      return s;
+    }
+  }
+  public class Type_U128 : Type {
+    public Type_U128() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_U128();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_U128;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.U128";
+      return s;
+    }
+  }
+  public class Type_I8 : Type {
+    public Type_I8() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_I8();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_I8;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.I8";
+      return s;
+    }
+  }
+  public class Type_I16 : Type {
+    public Type_I16() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_I16();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_I16;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 6;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.I16";
+      return s;
+    }
+  }
+  public class Type_I32 : Type {
+    public Type_I32() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_I32();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_I32;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 7;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.I32";
+      return s;
+    }
+  }
+  public class Type_I64 : Type {
+    public Type_I64() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_I64();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_I64;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 8;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.I64";
+      return s;
+    }
+  }
+  public class Type_I128 : Type {
+    public Type_I128() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_I128();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_I128;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 9;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.I128";
+      return s;
+    }
+  }
+  public class Type_USIZE : Type {
+    public Type_USIZE() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_USIZE();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_USIZE;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 10;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.USIZE";
+      return s;
+    }
+  }
+  public class Type_Bool : Type {
+    public Type_Bool() : base() {
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Bool();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_Bool;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 11;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.Bool";
+      return s;
+    }
+  }
+  public class Type_TIdentifier : Type {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public Type_TIdentifier(Dafny.ISequence<Dafny.Rune> name) : base() {
+      this._name = name;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_TIdentifier(_name);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_TIdentifier;
+      return oth != null && object.Equals(this._name, oth._name);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 12;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.TIdentifier";
+      s += "(";
+      s += this._name.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_TypeFromPath : Type {
+    public readonly RAST._IPath _path;
+    public Type_TypeFromPath(RAST._IPath path) : base() {
+      this._path = path;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_TypeFromPath(_path);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_TypeFromPath;
+      return oth != null && object.Equals(this._path, oth._path);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 13;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._path));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.TypeFromPath";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._path);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_TypeApp : Type {
+    public readonly RAST._IType _baseName;
+    public readonly Dafny.ISequence<RAST._IType> _arguments;
+    public Type_TypeApp(RAST._IType baseName, Dafny.ISequence<RAST._IType> arguments) : base() {
+      this._baseName = baseName;
+      this._arguments = arguments;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_TypeApp(_baseName, _arguments);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_TypeApp;
+      return oth != null && object.Equals(this._baseName, oth._baseName) && object.Equals(this._arguments, oth._arguments);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 14;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._baseName));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._arguments));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.TypeApp";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._baseName);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._arguments);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Borrowed : Type {
+    public readonly RAST._IType _underlying;
+    public Type_Borrowed(RAST._IType underlying) : base() {
+      this._underlying = underlying;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Borrowed(_underlying);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_Borrowed;
+      return oth != null && object.Equals(this._underlying, oth._underlying);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 15;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._underlying));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.Borrowed";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._underlying);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_BorrowedMut : Type {
+    public readonly RAST._IType _underlying;
+    public Type_BorrowedMut(RAST._IType underlying) : base() {
+      this._underlying = underlying;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_BorrowedMut(_underlying);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_BorrowedMut;
+      return oth != null && object.Equals(this._underlying, oth._underlying);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 16;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._underlying));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.BorrowedMut";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._underlying);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_ImplType : Type {
+    public readonly RAST._IType _underlying;
+    public Type_ImplType(RAST._IType underlying) : base() {
+      this._underlying = underlying;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_ImplType(_underlying);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_ImplType;
+      return oth != null && object.Equals(this._underlying, oth._underlying);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 17;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._underlying));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.ImplType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._underlying);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_DynType : Type {
+    public readonly RAST._IType _underlying;
+    public Type_DynType(RAST._IType underlying) : base() {
+      this._underlying = underlying;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_DynType(_underlying);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_DynType;
+      return oth != null && object.Equals(this._underlying, oth._underlying);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 18;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._underlying));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.DynType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._underlying);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_TupleType : Type {
+    public readonly Dafny.ISequence<RAST._IType> _arguments;
+    public Type_TupleType(Dafny.ISequence<RAST._IType> arguments) : base() {
+      this._arguments = arguments;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_TupleType(_arguments);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_TupleType;
+      return oth != null && object.Equals(this._arguments, oth._arguments);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 19;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._arguments));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.TupleType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._arguments);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_FnType : Type {
+    public readonly Dafny.ISequence<RAST._IType> _arguments;
+    public readonly RAST._IType _returnType;
+    public Type_FnType(Dafny.ISequence<RAST._IType> arguments, RAST._IType returnType) : base() {
+      this._arguments = arguments;
+      this._returnType = returnType;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_FnType(_arguments, _returnType);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_FnType;
+      return oth != null && object.Equals(this._arguments, oth._arguments) && object.Equals(this._returnType, oth._returnType);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 20;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._arguments));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._returnType));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.FnType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._arguments);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._returnType);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_IntersectionType : Type {
+    public readonly RAST._IType _left;
+    public readonly RAST._IType _right;
+    public Type_IntersectionType(RAST._IType left, RAST._IType right) : base() {
+      this._left = left;
+      this._right = right;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_IntersectionType(_left, _right);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_IntersectionType;
+      return oth != null && object.Equals(this._left, oth._left) && object.Equals(this._right, oth._right);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 21;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._left));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._right));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.IntersectionType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._left);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._right);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_Array : Type {
+    public readonly RAST._IType _underlying;
+    public readonly Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _size;
+    public Type_Array(RAST._IType underlying, Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> size) : base() {
+      this._underlying = underlying;
+      this._size = size;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_Array(_underlying, _size);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_Array;
+      return oth != null && object.Equals(this._underlying, oth._underlying) && object.Equals(this._size, oth._size);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 22;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._underlying));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._size));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.Array";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._underlying);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._size);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_TSynonym : Type {
+    public readonly RAST._IType _display;
+    public readonly RAST._IType _base;
+    public Type_TSynonym(RAST._IType display, RAST._IType @base) : base() {
+      this._display = display;
+      this._base = @base;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_TSynonym(_display, _base);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_TSynonym;
+      return oth != null && object.Equals(this._display, oth._display) && object.Equals(this._base, oth._base);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 23;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._display));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._base));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.TSynonym";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._display);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._base);
+      s += ")";
+      return s;
+    }
+  }
+  public class Type_TMetaData : Type {
+    public readonly RAST._IType _display;
+    public readonly bool _copySemantics;
+    public readonly bool _overflow;
+    public Type_TMetaData(RAST._IType display, bool copySemantics, bool overflow) : base() {
+      this._display = display;
+      this._copySemantics = copySemantics;
+      this._overflow = overflow;
+    }
+    public override _IType DowncastClone() {
+      if (this is _IType dt) { return dt; }
+      return new Type_TMetaData(_display, _copySemantics, _overflow);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Type_TMetaData;
+      return oth != null && object.Equals(this._display, oth._display) && this._copySemantics == oth._copySemantics && this._overflow == oth._overflow;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 24;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._display));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._copySemantics));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overflow));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Type.TMetaData";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._display);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._copySemantics);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._overflow);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _ITrait {
+    bool is_Trait { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes { get; }
+    Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams { get; }
+    RAST._IType dtor_tpe { get; }
+    Dafny.ISequence<RAST._IType> dtor_parents { get; }
+    Dafny.ISequence<RAST._IImplMember> dtor_body { get; }
+    _ITrait DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class Trait : _ITrait {
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _attributes;
+    public readonly Dafny.ISequence<RAST._ITypeParamDecl> _typeParams;
+    public readonly RAST._IType _tpe;
+    public readonly Dafny.ISequence<RAST._IType> _parents;
+    public readonly Dafny.ISequence<RAST._IImplMember> _body;
+    public Trait(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IType tpe, Dafny.ISequence<RAST._IType> parents, Dafny.ISequence<RAST._IImplMember> body) {
+      this._docString = docString;
+      this._attributes = attributes;
+      this._typeParams = typeParams;
+      this._tpe = tpe;
+      this._parents = parents;
+      this._body = body;
+    }
+    public _ITrait DowncastClone() {
+      if (this is _ITrait dt) { return dt; }
+      return new Trait(_docString, _attributes, _typeParams, _tpe, _parents, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Trait;
+      return oth != null && object.Equals(this._docString, oth._docString) && object.Equals(this._attributes, oth._attributes) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._tpe, oth._tpe) && object.Equals(this._parents, oth._parents) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._parents));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Trait.Trait";
+      s += "(";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._parents);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._ITrait theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, Dafny.Sequence<RAST._ITypeParamDecl>.Empty, RAST.Type.Default(), Dafny.Sequence<RAST._IType>.Empty, Dafny.Sequence<RAST._IImplMember>.Empty);
+    public static RAST._ITrait Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._ITrait> _TYPE = new Dafny.TypeDescriptor<RAST._ITrait>(RAST.Trait.Default());
+    public static Dafny.TypeDescriptor<RAST._ITrait> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ITrait create(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IType tpe, Dafny.ISequence<RAST._IType> parents, Dafny.ISequence<RAST._IImplMember> body) {
+      return new Trait(docString, attributes, typeParams, tpe, parents, body);
+    }
+    public static _ITrait create_Trait(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IType tpe, Dafny.ISequence<RAST._IType> parents, Dafny.ISequence<RAST._IImplMember> body) {
+      return create(docString, attributes, typeParams, tpe, parents, body);
+    }
+    public bool is_Trait { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        return this._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes {
+      get {
+        return this._attributes;
+      }
+    }
+    public Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public RAST._IType dtor_tpe {
+      get {
+        return this._tpe;
+      }
+    }
+    public Dafny.ISequence<RAST._IType> dtor_parents {
+      get {
+        return this._parents;
+      }
+    }
+    public Dafny.ISequence<RAST._IImplMember> dtor_body {
+      get {
+        return this._body;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      Dafny.ISequence<RAST._ITypeParamDecl> _0_tpConstraints = Std.Collections.Seq.__default.Filter<RAST._ITypeParamDecl>(((System.Func<RAST._ITypeParamDecl, bool>)((_1_typeParamDecl) => {
+        return (new BigInteger(((_1_typeParamDecl).dtor_constraints).Count)).Sign == 1;
+      })), (this).dtor_typeParams);
+      Dafny.ISequence<Dafny.Rune> _2_additionalConstraints = RAST.__default.SeqToString<RAST._ITypeParamDecl>(_0_tpConstraints, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._ITypeParamDecl, Dafny.ISequence<Dafny.Rune>>>>((_3_ind) => ((System.Func<RAST._ITypeParamDecl, Dafny.ISequence<Dafny.Rune>>)((_4_t) => {
+        return (_4_t)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_3_ind, RAST.__default.IND));
+      })))(ind), Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(",\n"), ind), RAST.__default.IND));
+      Dafny.ISequence<Dafny.Rune> _5_parents = (((new BigInteger(((this).dtor_parents).Count)).Sign == 0) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": "), RAST.__default.SeqToString<RAST._IType>((this).dtor_parents, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>>>((_6_ind) => ((System.Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>)((_7_t) => {
+        return (_7_t)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_6_ind, RAST.__default.IND));
+      })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" + ")))));
+      Dafny.ISequence<Dafny.Rune> _8_where = (((_2_additionalConstraints).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), ind), RAST.__default.IND), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("where\n")), ind), RAST.__default.IND), _2_additionalConstraints)));
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.ToDocstringPrefix((this).dtor_docString, ind), RAST.Attribute.ToStringMultiple((this).dtor_attributes, ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub trait ")), ((this).dtor_tpe)._ToString(ind)), _5_parents), _8_where), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {")), RAST.__default.SeqToString<RAST._IImplMember>((this).dtor_body, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IImplMember, Dafny.ISequence<Dafny.Rune>>>>((_9_ind) => ((System.Func<RAST._IImplMember, Dafny.ISequence<Dafny.Rune>>)((_10_member) => {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), _9_ind), RAST.__default.IND), (_10_member)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_9_ind, RAST.__default.IND)));
+      })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), (((new BigInteger(((this).dtor_body).Count)).Sign == 0) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), ind)))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+    }
+  }
+
+  public interface _IImpl {
+    bool is_ImplFor { get; }
+    bool is_Impl { get; }
+    Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams { get; }
+    RAST._IType dtor_tpe { get; }
+    RAST._IType dtor_forType { get; }
+    Dafny.ISequence<RAST._IImplMember> dtor_body { get; }
+    _IImpl DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public abstract class Impl : _IImpl {
+    public Impl() {
+    }
+    private static readonly RAST._IImpl theDefault = create_ImplFor(Dafny.Sequence<RAST._ITypeParamDecl>.Empty, RAST.Type.Default(), RAST.Type.Default(), Dafny.Sequence<RAST._IImplMember>.Empty);
+    public static RAST._IImpl Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IImpl> _TYPE = new Dafny.TypeDescriptor<RAST._IImpl>(RAST.Impl.Default());
+    public static Dafny.TypeDescriptor<RAST._IImpl> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IImpl create_ImplFor(Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IType tpe, RAST._IType forType, Dafny.ISequence<RAST._IImplMember> body) {
+      return new Impl_ImplFor(typeParams, tpe, forType, body);
+    }
+    public static _IImpl create_Impl(Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IType tpe, Dafny.ISequence<RAST._IImplMember> body) {
+      return new Impl_Impl(typeParams, tpe, body);
+    }
+    public bool is_ImplFor { get { return this is Impl_ImplFor; } }
+    public bool is_Impl { get { return this is Impl_Impl; } }
+    public Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams {
+      get {
+        var d = this;
+        if (d is Impl_ImplFor) { return ((Impl_ImplFor)d)._typeParams; }
+        return ((Impl_Impl)d)._typeParams;
+      }
+    }
+    public RAST._IType dtor_tpe {
+      get {
+        var d = this;
+        if (d is Impl_ImplFor) { return ((Impl_ImplFor)d)._tpe; }
+        return ((Impl_Impl)d)._tpe;
+      }
+    }
+    public RAST._IType dtor_forType {
+      get {
+        var d = this;
+        return ((Impl_ImplFor)d)._forType;
+      }
+    }
+    public Dafny.ISequence<RAST._IImplMember> dtor_body {
+      get {
+        var d = this;
+        if (d is Impl_ImplFor) { return ((Impl_ImplFor)d)._body; }
+        return ((Impl_Impl)d)._body;
+      }
+    }
+    public abstract _IImpl DowncastClone();
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl"), RAST.TypeParamDecl.ToStringMultiple((this).dtor_typeParams, ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ")), ((this).dtor_tpe)._ToString(ind)), (((this).is_ImplFor) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), ind), RAST.__default.IND), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("for ")), ((this).dtor_forType)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND)))) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {")), RAST.__default.SeqToString<RAST._IImplMember>((this).dtor_body, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IImplMember, Dafny.ISequence<Dafny.Rune>>>>((_0_ind) => ((System.Func<RAST._IImplMember, Dafny.ISequence<Dafny.Rune>>)((_1_member) => {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), _0_ind), RAST.__default.IND), (_1_member)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_0_ind, RAST.__default.IND)));
+      })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), (((new BigInteger(((this).dtor_body).Count)).Sign == 0) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), ind)))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+    }
+  }
+  public class Impl_ImplFor : Impl {
+    public readonly Dafny.ISequence<RAST._ITypeParamDecl> _typeParams;
+    public readonly RAST._IType _tpe;
+    public readonly RAST._IType _forType;
+    public readonly Dafny.ISequence<RAST._IImplMember> _body;
+    public Impl_ImplFor(Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IType tpe, RAST._IType forType, Dafny.ISequence<RAST._IImplMember> body) : base() {
+      this._typeParams = typeParams;
+      this._tpe = tpe;
+      this._forType = forType;
+      this._body = body;
+    }
+    public override _IImpl DowncastClone() {
+      if (this is _IImpl dt) { return dt; }
+      return new Impl_ImplFor(_typeParams, _tpe, _forType, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Impl_ImplFor;
+      return oth != null && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._tpe, oth._tpe) && object.Equals(this._forType, oth._forType) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._forType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Impl.ImplFor";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._forType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+  }
+  public class Impl_Impl : Impl {
+    public readonly Dafny.ISequence<RAST._ITypeParamDecl> _typeParams;
+    public readonly RAST._IType _tpe;
+    public readonly Dafny.ISequence<RAST._IImplMember> _body;
+    public Impl_Impl(Dafny.ISequence<RAST._ITypeParamDecl> typeParams, RAST._IType tpe, Dafny.ISequence<RAST._IImplMember> body) : base() {
+      this._typeParams = typeParams;
+      this._tpe = tpe;
+      this._body = body;
+    }
+    public override _IImpl DowncastClone() {
+      if (this is _IImpl dt) { return dt; }
+      return new Impl_Impl(_typeParams, _tpe, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Impl_Impl;
+      return oth != null && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._tpe, oth._tpe) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Impl.Impl";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IImplMember {
+    bool is_RawImplMember { get; }
+    bool is_TypeDeclMember { get; }
+    bool is_FnDecl { get; }
+    bool is_ImplMemberMacro { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_content { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    RAST._IType dtor_rhs { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_docString { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes { get; }
+    RAST._IVisibility dtor_pub { get; }
+    RAST._IFn dtor_fun { get; }
+    RAST._IExpr dtor_expr { get; }
+    _IImplMember DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public abstract class ImplMember : _IImplMember {
+    public ImplMember() {
+    }
+    private static readonly RAST._IImplMember theDefault = create_RawImplMember(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static RAST._IImplMember Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IImplMember> _TYPE = new Dafny.TypeDescriptor<RAST._IImplMember>(RAST.ImplMember.Default());
+    public static Dafny.TypeDescriptor<RAST._IImplMember> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IImplMember create_RawImplMember(Dafny.ISequence<Dafny.Rune> content) {
+      return new ImplMember_RawImplMember(content);
+    }
+    public static _IImplMember create_TypeDeclMember(Dafny.ISequence<Dafny.Rune> name, RAST._IType rhs) {
+      return new ImplMember_TypeDeclMember(name, rhs);
+    }
+    public static _IImplMember create_FnDecl(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, RAST._IVisibility pub, RAST._IFn fun) {
+      return new ImplMember_FnDecl(docString, attributes, pub, fun);
+    }
+    public static _IImplMember create_ImplMemberMacro(RAST._IExpr expr) {
+      return new ImplMember_ImplMemberMacro(expr);
+    }
+    public bool is_RawImplMember { get { return this is ImplMember_RawImplMember; } }
+    public bool is_TypeDeclMember { get { return this is ImplMember_TypeDeclMember; } }
+    public bool is_FnDecl { get { return this is ImplMember_FnDecl; } }
+    public bool is_ImplMemberMacro { get { return this is ImplMember_ImplMemberMacro; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_content {
+      get {
+        var d = this;
+        return ((ImplMember_RawImplMember)d)._content;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        var d = this;
+        return ((ImplMember_TypeDeclMember)d)._name;
+      }
+    }
+    public RAST._IType dtor_rhs {
+      get {
+        var d = this;
+        return ((ImplMember_TypeDeclMember)d)._rhs;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_docString {
+      get {
+        var d = this;
+        return ((ImplMember_FnDecl)d)._docString;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_attributes {
+      get {
+        var d = this;
+        return ((ImplMember_FnDecl)d)._attributes;
+      }
+    }
+    public RAST._IVisibility dtor_pub {
+      get {
+        var d = this;
+        return ((ImplMember_FnDecl)d)._pub;
+      }
+    }
+    public RAST._IFn dtor_fun {
+      get {
+        var d = this;
+        return ((ImplMember_FnDecl)d)._fun;
+      }
+    }
+    public RAST._IExpr dtor_expr {
+      get {
+        var d = this;
+        return ((ImplMember_ImplMemberMacro)d)._expr;
+      }
+    }
+    public abstract _IImplMember DowncastClone();
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      if ((this).is_FnDecl) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(RAST.__default.ToDocstringPrefix((this).dtor_docString, ind), RAST.Attribute.ToStringMultiple((this).dtor_attributes, ind)), ((this).dtor_pub)._ToString()), ((this).dtor_fun)._ToString(ind));
+      } else if ((this).is_ImplMemberMacro) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(((this).dtor_expr)._ToString(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+      } else if ((this).is_TypeDeclMember) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("type "), (this).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = ")), ((this).dtor_rhs)._ToString(ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+      } else {
+        return (this).dtor_content;
+      }
+    }
+  }
+  public class ImplMember_RawImplMember : ImplMember {
+    public readonly Dafny.ISequence<Dafny.Rune> _content;
+    public ImplMember_RawImplMember(Dafny.ISequence<Dafny.Rune> content) : base() {
+      this._content = content;
+    }
+    public override _IImplMember DowncastClone() {
+      if (this is _IImplMember dt) { return dt; }
+      return new ImplMember_RawImplMember(_content);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ImplMember_RawImplMember;
+      return oth != null && object.Equals(this._content, oth._content);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._content));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ImplMember.RawImplMember";
+      s += "(";
+      s += this._content.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class ImplMember_TypeDeclMember : ImplMember {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly RAST._IType _rhs;
+    public ImplMember_TypeDeclMember(Dafny.ISequence<Dafny.Rune> name, RAST._IType rhs) : base() {
+      this._name = name;
+      this._rhs = rhs;
+    }
+    public override _IImplMember DowncastClone() {
+      if (this is _IImplMember dt) { return dt; }
+      return new ImplMember_TypeDeclMember(_name, _rhs);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ImplMember_TypeDeclMember;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._rhs, oth._rhs);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._rhs));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ImplMember.TypeDeclMember";
+      s += "(";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._rhs);
+      s += ")";
+      return s;
+    }
+  }
+  public class ImplMember_FnDecl : ImplMember {
+    public readonly Dafny.ISequence<Dafny.Rune> _docString;
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _attributes;
+    public readonly RAST._IVisibility _pub;
+    public readonly RAST._IFn _fun;
+    public ImplMember_FnDecl(Dafny.ISequence<Dafny.Rune> docString, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> attributes, RAST._IVisibility pub, RAST._IFn fun) : base() {
+      this._docString = docString;
+      this._attributes = attributes;
+      this._pub = pub;
+      this._fun = fun;
+    }
+    public override _IImplMember DowncastClone() {
+      if (this is _IImplMember dt) { return dt; }
+      return new ImplMember_FnDecl(_docString, _attributes, _pub, _fun);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ImplMember_FnDecl;
+      return oth != null && object.Equals(this._docString, oth._docString) && object.Equals(this._attributes, oth._attributes) && object.Equals(this._pub, oth._pub) && object.Equals(this._fun, oth._fun);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._docString));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._attributes));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._pub));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._fun));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ImplMember.FnDecl";
+      s += "(";
+      s += this._docString.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._attributes);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._pub);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._fun);
+      s += ")";
+      return s;
+    }
+  }
+  public class ImplMember_ImplMemberMacro : ImplMember {
+    public readonly RAST._IExpr _expr;
+    public ImplMember_ImplMemberMacro(RAST._IExpr expr) : base() {
+      this._expr = expr;
+    }
+    public override _IImplMember DowncastClone() {
+      if (this is _IImplMember dt) { return dt; }
+      return new ImplMember_ImplMemberMacro(_expr);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.ImplMember_ImplMemberMacro;
+      return oth != null && object.Equals(this._expr, oth._expr);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.ImplMember.ImplMemberMacro";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IVisibility {
+    bool is_PUB { get; }
+    bool is_PRIV { get; }
+    _IVisibility DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString();
+  }
+  public abstract class Visibility : _IVisibility {
+    public Visibility() {
+    }
+    private static readonly RAST._IVisibility theDefault = create_PUB();
+    public static RAST._IVisibility Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IVisibility> _TYPE = new Dafny.TypeDescriptor<RAST._IVisibility>(RAST.Visibility.Default());
+    public static Dafny.TypeDescriptor<RAST._IVisibility> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IVisibility create_PUB() {
+      return new Visibility_PUB();
+    }
+    public static _IVisibility create_PRIV() {
+      return new Visibility_PRIV();
+    }
+    public bool is_PUB { get { return this is Visibility_PUB; } }
+    public bool is_PRIV { get { return this is Visibility_PRIV; } }
+    public static System.Collections.Generic.IEnumerable<_IVisibility> AllSingletonConstructors {
+      get {
+        yield return Visibility.create_PUB();
+        yield return Visibility.create_PRIV();
+      }
+    }
+    public abstract _IVisibility DowncastClone();
+    public Dafny.ISequence<Dafny.Rune> _ToString() {
+      if ((this).is_PUB) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub ");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+      }
+    }
+  }
+  public class Visibility_PUB : Visibility {
+    public Visibility_PUB() : base() {
+    }
+    public override _IVisibility DowncastClone() {
+      if (this is _IVisibility dt) { return dt; }
+      return new Visibility_PUB();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Visibility_PUB;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Visibility.PUB";
+      return s;
+    }
+  }
+  public class Visibility_PRIV : Visibility {
+    public Visibility_PRIV() : base() {
+    }
+    public override _IVisibility DowncastClone() {
+      if (this is _IVisibility dt) { return dt; }
+      return new Visibility_PRIV();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Visibility_PRIV;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Visibility.PRIV";
+      return s;
+    }
+  }
+
+  public interface _IFormal {
+    bool is_Formal { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    RAST._IType dtor_tpe { get; }
+    _IFormal DowncastClone();
+    RAST._IFormal Replace(Func<RAST._IType, RAST._IType> ft);
+    __T Fold<__T>(__T acc, Func<__T, RAST._IType, __T> ft);
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class Formal : _IFormal {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly RAST._IType _tpe;
+    public Formal(Dafny.ISequence<Dafny.Rune> name, RAST._IType tpe) {
+      this._name = name;
+      this._tpe = tpe;
+    }
+    public _IFormal DowncastClone() {
+      if (this is _IFormal dt) { return dt; }
+      return new Formal(_name, _tpe);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Formal;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._tpe, oth._tpe);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Formal.Formal";
+      s += "(";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IFormal theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, RAST.Type.Default());
+    public static RAST._IFormal Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IFormal> _TYPE = new Dafny.TypeDescriptor<RAST._IFormal>(RAST.Formal.Default());
+    public static Dafny.TypeDescriptor<RAST._IFormal> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IFormal create(Dafny.ISequence<Dafny.Rune> name, RAST._IType tpe) {
+      return new Formal(name, tpe);
+    }
+    public static _IFormal create_Formal(Dafny.ISequence<Dafny.Rune> name, RAST._IType tpe) {
+      return create(name, tpe);
+    }
+    public bool is_Formal { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public RAST._IType dtor_tpe {
+      get {
+        return this._tpe;
+      }
+    }
+    public static RAST._IFormal ImplicitlyTyped(Dafny.ISequence<Dafny.Rune> name) {
+      return RAST.Formal.create(name, RAST.Type.create_TIdentifier(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_")));
+    }
+    public RAST._IFormal Replace(Func<RAST._IType, RAST._IType> ft) {
+      return RAST.Formal.create((this).dtor_name, ((this).dtor_tpe).Replace(ft));
+    }
+    public __T Fold<__T>(__T acc, Func<__T, RAST._IType, __T> ft)
+    {
+      return ((this).dtor_tpe).Fold<__T>(acc, ft);
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      if ((((this).dtor_name).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"))) && (object.Equals(((this).dtor_tpe).Expand(), RAST.__default.SelfOwned))) {
+        return (this).dtor_name;
+      } else if ((((this).dtor_name).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"))) && (object.Equals((this).dtor_tpe, RAST.__default.SelfBorrowed))) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), (this).dtor_name);
+      } else if ((((this).dtor_name).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"))) && (object.Equals((this).dtor_tpe, RAST.__default.SelfBorrowedMut))) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&mut "), (this).dtor_name);
+      } else if ((((this).dtor_tpe).is_TIdentifier) && ((((this).dtor_tpe).dtor_name).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_")))) {
+        return (this).dtor_name;
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat((this).dtor_name, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ")), ((this).dtor_tpe)._ToString(ind));
+      }
+    }
+    public static RAST._IFormal selfBorrowed { get {
+      return RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"), RAST.__default.SelfBorrowed);
+    } }
+    public static RAST._IFormal selfOwned { get {
+      return RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"), RAST.__default.SelfOwned);
+    } }
+    public static RAST._IFormal selfBorrowedMut { get {
+      return RAST.Formal.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"), RAST.__default.SelfBorrowedMut);
+    } }
+  }
+
+  public interface _IPattern {
+    bool is_RawPattern { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_content { get; }
+  }
+  public class Pattern : _IPattern {
+    public readonly Dafny.ISequence<Dafny.Rune> _content;
+    public Pattern(Dafny.ISequence<Dafny.Rune> content) {
+      this._content = content;
+    }
+    public static Dafny.ISequence<Dafny.Rune> DowncastClone(Dafny.ISequence<Dafny.Rune> _this) {
+      return _this;
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Pattern;
+      return oth != null && object.Equals(this._content, oth._content);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._content));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Pattern.RawPattern";
+      s += "(";
+      s += this._content.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+    private static readonly Dafny.ISequence<Dafny.Rune> theDefault = Dafny.Sequence<Dafny.Rune>.Empty;
+    public static Dafny.ISequence<Dafny.Rune> Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TYPE = new Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>>(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IPattern create(Dafny.ISequence<Dafny.Rune> content) {
+      return new Pattern(content);
+    }
+    public static _IPattern create_RawPattern(Dafny.ISequence<Dafny.Rune> content) {
+      return create(content);
+    }
+    public bool is_RawPattern { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_content {
+      get {
+        return this._content;
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> _this, Dafny.ISequence<Dafny.Rune> ind) {
+      return (_this);
+    }
+  }
+
+  public interface _IMatchCase {
+    bool is_MatchCase { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_pattern { get; }
+    RAST._IExpr dtor_rhs { get; }
+    _IMatchCase DowncastClone();
+    RAST._IMatchCase Replace(Func<RAST._IExpr, RAST._IExpr> mapping, Func<RAST._IType, RAST._IType> mappingType);
+    __T Fold<__T>(__T acc, Func<__T, RAST._IExpr, __T> f, Func<__T, RAST._IType, __T> ft);
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class MatchCase : _IMatchCase {
+    public readonly Dafny.ISequence<Dafny.Rune> _pattern;
+    public readonly RAST._IExpr _rhs;
+    public MatchCase(Dafny.ISequence<Dafny.Rune> pattern, RAST._IExpr rhs) {
+      this._pattern = pattern;
+      this._rhs = rhs;
+    }
+    public _IMatchCase DowncastClone() {
+      if (this is _IMatchCase dt) { return dt; }
+      return new MatchCase(_pattern, _rhs);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.MatchCase;
+      return oth != null && object.Equals(this._pattern, oth._pattern) && object.Equals(this._rhs, oth._rhs);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._pattern));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._rhs));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.MatchCase.MatchCase";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._pattern);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._rhs);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IMatchCase theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, RAST.Expr.Default());
+    public static RAST._IMatchCase Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IMatchCase> _TYPE = new Dafny.TypeDescriptor<RAST._IMatchCase>(RAST.MatchCase.Default());
+    public static Dafny.TypeDescriptor<RAST._IMatchCase> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IMatchCase create(Dafny.ISequence<Dafny.Rune> pattern, RAST._IExpr rhs) {
+      return new MatchCase(pattern, rhs);
+    }
+    public static _IMatchCase create_MatchCase(Dafny.ISequence<Dafny.Rune> pattern, RAST._IExpr rhs) {
+      return create(pattern, rhs);
+    }
+    public bool is_MatchCase { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_pattern {
+      get {
+        return this._pattern;
+      }
+    }
+    public RAST._IExpr dtor_rhs {
+      get {
+        return this._rhs;
+      }
+    }
+    public RAST._IMatchCase Replace(Func<RAST._IExpr, RAST._IExpr> mapping, Func<RAST._IType, RAST._IType> mappingType)
+    {
+      return RAST.MatchCase.create((this).dtor_pattern, ((this).dtor_rhs).Replace(mapping, mappingType));
+    }
+    public __T Fold<__T>(__T acc, Func<__T, RAST._IExpr, __T> f, Func<__T, RAST._IType, __T> ft)
+    {
+      return ((this).dtor_rhs).Fold<__T>(acc, f, ft);
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      Dafny.ISequence<Dafny.Rune> _0_newIndent = ((((this).dtor_rhs).is_Block) ? (ind) : (Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND)));
+      Dafny.ISequence<Dafny.Rune> _1_rhsString = ((this).dtor_rhs)._ToString(_0_newIndent);
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(RAST.Pattern._ToString((this).dtor_pattern, ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" =>")), ((((_1_rhsString).Contains(new Dafny.Rune('\n'))) && (((_1_rhsString).Select(BigInteger.Zero)) != (new Dafny.Rune('{')))) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), ind), RAST.__default.IND), _1_rhsString)) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" "), _1_rhsString))));
+    }
+  }
+
+  public interface _IAssignIdentifier {
+    bool is_AssignIdentifier { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_identifier { get; }
+    RAST._IExpr dtor_rhs { get; }
+    _IAssignIdentifier DowncastClone();
+    RAST._IAssignIdentifier Replace(Func<RAST._IExpr, RAST._IExpr> f, Func<RAST._IType, RAST._IType> ft);
+    __T Fold<__T>(__T acc, Func<__T, RAST._IExpr, __T> f, Func<__T, RAST._IType, __T> ft);
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class AssignIdentifier : _IAssignIdentifier {
+    public readonly Dafny.ISequence<Dafny.Rune> _identifier;
+    public readonly RAST._IExpr _rhs;
+    public AssignIdentifier(Dafny.ISequence<Dafny.Rune> identifier, RAST._IExpr rhs) {
+      this._identifier = identifier;
+      this._rhs = rhs;
+    }
+    public _IAssignIdentifier DowncastClone() {
+      if (this is _IAssignIdentifier dt) { return dt; }
+      return new AssignIdentifier(_identifier, _rhs);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.AssignIdentifier;
+      return oth != null && object.Equals(this._identifier, oth._identifier) && object.Equals(this._rhs, oth._rhs);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._identifier));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._rhs));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.AssignIdentifier.AssignIdentifier";
+      s += "(";
+      s += this._identifier.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._rhs);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IAssignIdentifier theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, RAST.Expr.Default());
+    public static RAST._IAssignIdentifier Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IAssignIdentifier> _TYPE = new Dafny.TypeDescriptor<RAST._IAssignIdentifier>(RAST.AssignIdentifier.Default());
+    public static Dafny.TypeDescriptor<RAST._IAssignIdentifier> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IAssignIdentifier create(Dafny.ISequence<Dafny.Rune> identifier, RAST._IExpr rhs) {
+      return new AssignIdentifier(identifier, rhs);
+    }
+    public static _IAssignIdentifier create_AssignIdentifier(Dafny.ISequence<Dafny.Rune> identifier, RAST._IExpr rhs) {
+      return create(identifier, rhs);
+    }
+    public bool is_AssignIdentifier { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_identifier {
+      get {
+        return this._identifier;
+      }
+    }
+    public RAST._IExpr dtor_rhs {
+      get {
+        return this._rhs;
+      }
+    }
+    public RAST._IAssignIdentifier Replace(Func<RAST._IExpr, RAST._IExpr> f, Func<RAST._IType, RAST._IType> ft)
+    {
+      return RAST.AssignIdentifier.create((this).dtor_identifier, ((this).dtor_rhs).Replace(f, ft));
+    }
+    public __T Fold<__T>(__T acc, Func<__T, RAST._IExpr, __T> f, Func<__T, RAST._IType, __T> ft)
+    {
+      return ((this).dtor_rhs).Fold<__T>(acc, f, ft);
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat((this).dtor_identifier, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ")), ((this).dtor_rhs)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND)));
+    }
+  }
+
+  public interface _IDeclareType {
+    bool is_MUT { get; }
+    bool is_CONST { get; }
+    _IDeclareType DowncastClone();
+  }
+  public abstract class DeclareType : _IDeclareType {
+    public DeclareType() {
+    }
+    private static readonly RAST._IDeclareType theDefault = create_MUT();
+    public static RAST._IDeclareType Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IDeclareType> _TYPE = new Dafny.TypeDescriptor<RAST._IDeclareType>(RAST.DeclareType.Default());
+    public static Dafny.TypeDescriptor<RAST._IDeclareType> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IDeclareType create_MUT() {
+      return new DeclareType_MUT();
+    }
+    public static _IDeclareType create_CONST() {
+      return new DeclareType_CONST();
+    }
+    public bool is_MUT { get { return this is DeclareType_MUT; } }
+    public bool is_CONST { get { return this is DeclareType_CONST; } }
+    public static System.Collections.Generic.IEnumerable<_IDeclareType> AllSingletonConstructors {
+      get {
+        yield return DeclareType.create_MUT();
+        yield return DeclareType.create_CONST();
+      }
+    }
+    public abstract _IDeclareType DowncastClone();
+  }
+  public class DeclareType_MUT : DeclareType {
+    public DeclareType_MUT() : base() {
+    }
+    public override _IDeclareType DowncastClone() {
+      if (this is _IDeclareType dt) { return dt; }
+      return new DeclareType_MUT();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.DeclareType_MUT;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.DeclareType.MUT";
+      return s;
+    }
+  }
+  public class DeclareType_CONST : DeclareType {
+    public DeclareType_CONST() : base() {
+    }
+    public override _IDeclareType DowncastClone() {
+      if (this is _IDeclareType dt) { return dt; }
+      return new DeclareType_CONST();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.DeclareType_CONST;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.DeclareType.CONST";
+      return s;
+    }
+  }
+
+  public interface _IAssociativity {
+    bool is_LeftToRight { get; }
+    bool is_RightToLeft { get; }
+    bool is_RequiresParentheses { get; }
+    _IAssociativity DowncastClone();
+  }
+  public abstract class Associativity : _IAssociativity {
+    public Associativity() {
+    }
+    private static readonly RAST._IAssociativity theDefault = create_LeftToRight();
+    public static RAST._IAssociativity Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IAssociativity> _TYPE = new Dafny.TypeDescriptor<RAST._IAssociativity>(RAST.Associativity.Default());
+    public static Dafny.TypeDescriptor<RAST._IAssociativity> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IAssociativity create_LeftToRight() {
+      return new Associativity_LeftToRight();
+    }
+    public static _IAssociativity create_RightToLeft() {
+      return new Associativity_RightToLeft();
+    }
+    public static _IAssociativity create_RequiresParentheses() {
+      return new Associativity_RequiresParentheses();
+    }
+    public bool is_LeftToRight { get { return this is Associativity_LeftToRight; } }
+    public bool is_RightToLeft { get { return this is Associativity_RightToLeft; } }
+    public bool is_RequiresParentheses { get { return this is Associativity_RequiresParentheses; } }
+    public static System.Collections.Generic.IEnumerable<_IAssociativity> AllSingletonConstructors {
+      get {
+        yield return Associativity.create_LeftToRight();
+        yield return Associativity.create_RightToLeft();
+        yield return Associativity.create_RequiresParentheses();
+      }
+    }
+    public abstract _IAssociativity DowncastClone();
+  }
+  public class Associativity_LeftToRight : Associativity {
+    public Associativity_LeftToRight() : base() {
+    }
+    public override _IAssociativity DowncastClone() {
+      if (this is _IAssociativity dt) { return dt; }
+      return new Associativity_LeftToRight();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Associativity_LeftToRight;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Associativity.LeftToRight";
+      return s;
+    }
+  }
+  public class Associativity_RightToLeft : Associativity {
+    public Associativity_RightToLeft() : base() {
+    }
+    public override _IAssociativity DowncastClone() {
+      if (this is _IAssociativity dt) { return dt; }
+      return new Associativity_RightToLeft();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Associativity_RightToLeft;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Associativity.RightToLeft";
+      return s;
+    }
+  }
+  public class Associativity_RequiresParentheses : Associativity {
+    public Associativity_RequiresParentheses() : base() {
+    }
+    public override _IAssociativity DowncastClone() {
+      if (this is _IAssociativity dt) { return dt; }
+      return new Associativity_RequiresParentheses();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Associativity_RequiresParentheses;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Associativity.RequiresParentheses";
+      return s;
+    }
+  }
+
+  public interface _IPrintingInfo {
+    bool is_UnknownPrecedence { get; }
+    bool is_Precedence { get; }
+    bool is_SuffixPrecedence { get; }
+    bool is_PrecedenceAssociativity { get; }
+    BigInteger dtor_precedence { get; }
+    RAST._IAssociativity dtor_associativity { get; }
+    _IPrintingInfo DowncastClone();
+    bool NeedParenthesesFor(RAST._IPrintingInfo underlying);
+    bool NeedParenthesesForLeft(RAST._IPrintingInfo underlying);
+    bool NeedParenthesesForRight(RAST._IPrintingInfo underlying);
+  }
+  public abstract class PrintingInfo : _IPrintingInfo {
+    public PrintingInfo() {
+    }
+    private static readonly RAST._IPrintingInfo theDefault = create_UnknownPrecedence();
+    public static RAST._IPrintingInfo Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IPrintingInfo> _TYPE = new Dafny.TypeDescriptor<RAST._IPrintingInfo>(RAST.PrintingInfo.Default());
+    public static Dafny.TypeDescriptor<RAST._IPrintingInfo> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IPrintingInfo create_UnknownPrecedence() {
+      return new PrintingInfo_UnknownPrecedence();
+    }
+    public static _IPrintingInfo create_Precedence(BigInteger precedence) {
+      return new PrintingInfo_Precedence(precedence);
+    }
+    public static _IPrintingInfo create_SuffixPrecedence(BigInteger precedence) {
+      return new PrintingInfo_SuffixPrecedence(precedence);
+    }
+    public static _IPrintingInfo create_PrecedenceAssociativity(BigInteger precedence, RAST._IAssociativity associativity) {
+      return new PrintingInfo_PrecedenceAssociativity(precedence, associativity);
+    }
+    public bool is_UnknownPrecedence { get { return this is PrintingInfo_UnknownPrecedence; } }
+    public bool is_Precedence { get { return this is PrintingInfo_Precedence; } }
+    public bool is_SuffixPrecedence { get { return this is PrintingInfo_SuffixPrecedence; } }
+    public bool is_PrecedenceAssociativity { get { return this is PrintingInfo_PrecedenceAssociativity; } }
+    public BigInteger dtor_precedence {
+      get {
+        var d = this;
+        if (d is PrintingInfo_Precedence) { return ((PrintingInfo_Precedence)d)._precedence; }
+        if (d is PrintingInfo_SuffixPrecedence) { return ((PrintingInfo_SuffixPrecedence)d)._precedence; }
+        return ((PrintingInfo_PrecedenceAssociativity)d)._precedence;
+      }
+    }
+    public RAST._IAssociativity dtor_associativity {
+      get {
+        var d = this;
+        return ((PrintingInfo_PrecedenceAssociativity)d)._associativity;
+      }
+    }
+    public abstract _IPrintingInfo DowncastClone();
+    public bool NeedParenthesesFor(RAST._IPrintingInfo underlying) {
+      if ((this).is_UnknownPrecedence) {
+        return true;
+      } else if ((underlying).is_UnknownPrecedence) {
+        return true;
+      } else if (((this).dtor_precedence) <= ((underlying).dtor_precedence)) {
+        return true;
+      } else {
+        return false;
+      }
+    }
+    public bool NeedParenthesesForLeft(RAST._IPrintingInfo underlying) {
+      if ((this).is_UnknownPrecedence) {
+        return true;
+      } else if ((underlying).is_UnknownPrecedence) {
+        return true;
+      } else if (((this).dtor_precedence) <= ((underlying).dtor_precedence)) {
+        return ((((this).dtor_precedence) < ((underlying).dtor_precedence)) || (!((this).is_PrecedenceAssociativity))) || (!(((this).dtor_associativity).is_LeftToRight));
+      } else {
+        return false;
+      }
+    }
+    public bool NeedParenthesesForRight(RAST._IPrintingInfo underlying) {
+      if ((this).is_UnknownPrecedence) {
+        return true;
+      } else if ((underlying).is_UnknownPrecedence) {
+        return true;
+      } else if (((this).dtor_precedence) <= ((underlying).dtor_precedence)) {
+        return ((((this).dtor_precedence) < ((underlying).dtor_precedence)) || (!((this).is_PrecedenceAssociativity))) || (!(((this).dtor_associativity).is_RightToLeft));
+      } else {
+        return false;
+      }
+    }
+  }
+  public class PrintingInfo_UnknownPrecedence : PrintingInfo {
+    public PrintingInfo_UnknownPrecedence() : base() {
+    }
+    public override _IPrintingInfo DowncastClone() {
+      if (this is _IPrintingInfo dt) { return dt; }
+      return new PrintingInfo_UnknownPrecedence();
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.PrintingInfo_UnknownPrecedence;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.PrintingInfo.UnknownPrecedence";
+      return s;
+    }
+  }
+  public class PrintingInfo_Precedence : PrintingInfo {
+    public readonly BigInteger _precedence;
+    public PrintingInfo_Precedence(BigInteger precedence) : base() {
+      this._precedence = precedence;
+    }
+    public override _IPrintingInfo DowncastClone() {
+      if (this is _IPrintingInfo dt) { return dt; }
+      return new PrintingInfo_Precedence(_precedence);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.PrintingInfo_Precedence;
+      return oth != null && this._precedence == oth._precedence;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._precedence));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.PrintingInfo.Precedence";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._precedence);
+      s += ")";
+      return s;
+    }
+  }
+  public class PrintingInfo_SuffixPrecedence : PrintingInfo {
+    public readonly BigInteger _precedence;
+    public PrintingInfo_SuffixPrecedence(BigInteger precedence) : base() {
+      this._precedence = precedence;
+    }
+    public override _IPrintingInfo DowncastClone() {
+      if (this is _IPrintingInfo dt) { return dt; }
+      return new PrintingInfo_SuffixPrecedence(_precedence);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.PrintingInfo_SuffixPrecedence;
+      return oth != null && this._precedence == oth._precedence;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._precedence));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.PrintingInfo.SuffixPrecedence";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._precedence);
+      s += ")";
+      return s;
+    }
+  }
+  public class PrintingInfo_PrecedenceAssociativity : PrintingInfo {
+    public readonly BigInteger _precedence;
+    public readonly RAST._IAssociativity _associativity;
+    public PrintingInfo_PrecedenceAssociativity(BigInteger precedence, RAST._IAssociativity associativity) : base() {
+      this._precedence = precedence;
+      this._associativity = associativity;
+    }
+    public override _IPrintingInfo DowncastClone() {
+      if (this is _IPrintingInfo dt) { return dt; }
+      return new PrintingInfo_PrecedenceAssociativity(_precedence, _associativity);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.PrintingInfo_PrecedenceAssociativity;
+      return oth != null && this._precedence == oth._precedence && object.Equals(this._associativity, oth._associativity);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._precedence));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._associativity));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.PrintingInfo.PrecedenceAssociativity";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._precedence);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._associativity);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IAssignLhs {
+    bool is_LocalVar { get; }
+    bool is_SelectMember { get; }
+    bool is_ExtractTuple { get; }
+    bool is_Index { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    RAST._IExpr dtor_on { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_field { get; }
+    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_names { get; }
+    RAST._IExpr dtor_expr { get; }
+    Dafny.ISequence<RAST._IExpr> dtor_indices { get; }
+    _IAssignLhs DowncastClone();
+  }
+  public abstract class AssignLhs : _IAssignLhs {
+    public AssignLhs() {
+    }
+    private static readonly RAST._IAssignLhs theDefault = create_LocalVar(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static RAST._IAssignLhs Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IAssignLhs> _TYPE = new Dafny.TypeDescriptor<RAST._IAssignLhs>(RAST.AssignLhs.Default());
+    public static Dafny.TypeDescriptor<RAST._IAssignLhs> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IAssignLhs create_LocalVar(Dafny.ISequence<Dafny.Rune> name) {
+      return new AssignLhs_LocalVar(name);
+    }
+    public static _IAssignLhs create_SelectMember(RAST._IExpr @on, Dafny.ISequence<Dafny.Rune> field) {
+      return new AssignLhs_SelectMember(@on, field);
+    }
+    public static _IAssignLhs create_ExtractTuple(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> names) {
+      return new AssignLhs_ExtractTuple(names);
+    }
+    public static _IAssignLhs create_Index(RAST._IExpr expr, Dafny.ISequence<RAST._IExpr> indices) {
+      return new AssignLhs_Index(expr, indices);
+    }
+    public bool is_LocalVar { get { return this is AssignLhs_LocalVar; } }
+    public bool is_SelectMember { get { return this is AssignLhs_SelectMember; } }
+    public bool is_ExtractTuple { get { return this is AssignLhs_ExtractTuple; } }
+    public bool is_Index { get { return this is AssignLhs_Index; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        var d = this;
+        return ((AssignLhs_LocalVar)d)._name;
+      }
+    }
+    public RAST._IExpr dtor_on {
+      get {
+        var d = this;
+        return ((AssignLhs_SelectMember)d)._on;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_field {
+      get {
+        var d = this;
+        return ((AssignLhs_SelectMember)d)._field;
+      }
+    }
+    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_names {
+      get {
+        var d = this;
+        return ((AssignLhs_ExtractTuple)d)._names;
+      }
+    }
+    public RAST._IExpr dtor_expr {
+      get {
+        var d = this;
+        return ((AssignLhs_Index)d)._expr;
+      }
+    }
+    public Dafny.ISequence<RAST._IExpr> dtor_indices {
+      get {
+        var d = this;
+        return ((AssignLhs_Index)d)._indices;
+      }
+    }
+    public abstract _IAssignLhs DowncastClone();
+  }
+  public class AssignLhs_LocalVar : AssignLhs {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public AssignLhs_LocalVar(Dafny.ISequence<Dafny.Rune> name) : base() {
+      this._name = name;
+    }
+    public override _IAssignLhs DowncastClone() {
+      if (this is _IAssignLhs dt) { return dt; }
+      return new AssignLhs_LocalVar(_name);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.AssignLhs_LocalVar;
+      return oth != null && object.Equals(this._name, oth._name);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.AssignLhs.LocalVar";
+      s += "(";
+      s += this._name.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class AssignLhs_SelectMember : AssignLhs {
+    public readonly RAST._IExpr _on;
+    public readonly Dafny.ISequence<Dafny.Rune> _field;
+    public AssignLhs_SelectMember(RAST._IExpr @on, Dafny.ISequence<Dafny.Rune> field) : base() {
+      this._on = @on;
+      this._field = field;
+    }
+    public override _IAssignLhs DowncastClone() {
+      if (this is _IAssignLhs dt) { return dt; }
+      return new AssignLhs_SelectMember(_on, _field);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.AssignLhs_SelectMember;
+      return oth != null && object.Equals(this._on, oth._on) && object.Equals(this._field, oth._field);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._on));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._field));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.AssignLhs.SelectMember";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._on);
+      s += ", ";
+      s += this._field.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class AssignLhs_ExtractTuple : AssignLhs {
+    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _names;
+    public AssignLhs_ExtractTuple(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> names) : base() {
+      this._names = names;
+    }
+    public override _IAssignLhs DowncastClone() {
+      if (this is _IAssignLhs dt) { return dt; }
+      return new AssignLhs_ExtractTuple(_names);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.AssignLhs_ExtractTuple;
+      return oth != null && object.Equals(this._names, oth._names);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._names));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.AssignLhs.ExtractTuple";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._names);
+      s += ")";
+      return s;
+    }
+  }
+  public class AssignLhs_Index : AssignLhs {
+    public readonly RAST._IExpr _expr;
+    public readonly Dafny.ISequence<RAST._IExpr> _indices;
+    public AssignLhs_Index(RAST._IExpr expr, Dafny.ISequence<RAST._IExpr> indices) : base() {
+      this._expr = expr;
+      this._indices = indices;
+    }
+    public override _IAssignLhs DowncastClone() {
+      if (this is _IAssignLhs dt) { return dt; }
+      return new AssignLhs_Index(_expr, _indices);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.AssignLhs_Index;
+      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._indices, oth._indices);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._indices));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.AssignLhs.Index";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._expr);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._indices);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IExpr {
+    bool is_RawExpr { get; }
+    bool is_ExprFromType { get; }
+    bool is_Identifier { get; }
+    bool is_Match { get; }
+    bool is_StmtExpr { get; }
+    bool is_Block { get; }
+    bool is_StructBuild { get; }
+    bool is_Tuple { get; }
+    bool is_UnaryOp { get; }
+    bool is_BinaryOp { get; }
+    bool is_TypeAscription { get; }
+    bool is_TraitCast { get; }
+    bool is_LiteralInt { get; }
+    bool is_LiteralBool { get; }
+    bool is_LiteralString { get; }
+    bool is_DeclareVar { get; }
+    bool is_Assign { get; }
+    bool is_IfExpr { get; }
+    bool is_Loop { get; }
+    bool is_For { get; }
+    bool is_Labelled { get; }
+    bool is_Break { get; }
+    bool is_Continue { get; }
+    bool is_Return { get; }
+    bool is_CallType { get; }
+    bool is_Call { get; }
+    bool is_Select { get; }
+    bool is_SelectIndex { get; }
+    bool is_ExprFromPath { get; }
+    bool is_FunctionSelect { get; }
+    bool is_Lambda { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_content { get; }
+    RAST._IType dtor_tpe { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    RAST._IExpr dtor_matchee { get; }
+    Dafny.ISequence<RAST._IMatchCase> dtor_cases { get; }
+    RAST._IExpr dtor_stmt { get; }
+    RAST._IExpr dtor_rhs { get; }
+    RAST._IExpr dtor_underlying { get; }
+    Dafny.ISequence<RAST._IAssignIdentifier> dtor_assignments { get; }
+    Dafny.ISequence<RAST._IExpr> dtor_arguments { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_op1 { get; }
+    DAST.Format._IUnaryOpFormat dtor_format { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_op2 { get; }
+    RAST._IExpr dtor_left { get; }
+    RAST._IExpr dtor_right { get; }
+    DAST.Format._IBinaryOpFormat dtor_format2 { get; }
+    RAST._IType dtor_leftTpe { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_value { get; }
+    bool dtor_bvalue { get; }
+    bool dtor_binary { get; }
+    bool dtor_verbatim { get; }
+    RAST._IDeclareType dtor_declareType { get; }
+    Std.Wrappers._IOption<RAST._IType> dtor_optType { get; }
+    Std.Wrappers._IOption<RAST._IExpr> dtor_optRhs { get; }
+    Std.Wrappers._IOption<RAST._IAssignLhs> dtor_names { get; }
+    RAST._IExpr dtor_cond { get; }
+    RAST._IExpr dtor_thn { get; }
+    RAST._IExpr dtor_els { get; }
+    Std.Wrappers._IOption<RAST._IExpr> dtor_optCond { get; }
+    RAST._IExpr dtor_range { get; }
+    RAST._IExpr dtor_body { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_lbl { get; }
+    Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> dtor_optLbl { get; }
+    Std.Wrappers._IOption<RAST._IExpr> dtor_optExpr { get; }
+    RAST._IExpr dtor_obj { get; }
+    Dafny.ISequence<RAST._IType> dtor_typeArguments { get; }
+    RAST._IPath dtor_path { get; }
+    Dafny.ISequence<RAST._IFormal> dtor_params { get; }
+    Std.Wrappers._IOption<RAST._IType> dtor_retType { get; }
+    _IExpr DowncastClone();
+    RAST._IExpr Replace(Func<RAST._IExpr, RAST._IExpr> f, Func<RAST._IType, RAST._IType> ft);
+    __T Fold<__T>(__T acc, Func<__T, RAST._IExpr, __T> f, Func<__T, RAST._IType, __T> ft);
+    bool NoExtraSemicolonAfter();
+    RAST._IPrintingInfo printingInfo { get; }
+    bool LeftRequiresParentheses(RAST._IExpr left);
+    _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> LeftParentheses(RAST._IExpr left);
+    bool RightRequiresParentheses(RAST._IExpr right);
+    _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> RightParentheses(RAST._IExpr right);
+    Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> RightMostIdentifier();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+    RAST._IExpr Then(RAST._IExpr rhs2);
+    RAST._IExpr Sel(Dafny.ISequence<Dafny.Rune> name);
+    RAST._IExpr FSel(Dafny.ISequence<Dafny.Rune> name);
+    RAST._IExpr ApplyType(Dafny.ISequence<RAST._IType> typeArguments);
+    RAST._IExpr ApplyType1(RAST._IType typeArgument);
+    RAST._IExpr Apply(Dafny.ISequence<RAST._IExpr> arguments);
+    RAST._IExpr Apply1(RAST._IExpr argument);
+    RAST._IExpr Apply0();
+    bool IsLhsIdentifier();
+    Dafny.ISequence<Dafny.Rune> LhsIdentifierName();
+    RAST._IExpr Clone();
+    bool IsBorrow();
+  }
+  public abstract class Expr : _IExpr {
+    public Expr() {
+    }
+    private static readonly RAST._IExpr theDefault = create_RawExpr(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static RAST._IExpr Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IExpr> _TYPE = new Dafny.TypeDescriptor<RAST._IExpr>(RAST.Expr.Default());
+    public static Dafny.TypeDescriptor<RAST._IExpr> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IExpr create_RawExpr(Dafny.ISequence<Dafny.Rune> content) {
+      return new Expr_RawExpr(content);
+    }
+    public static _IExpr create_ExprFromType(RAST._IType tpe) {
+      return new Expr_ExprFromType(tpe);
+    }
+    public static _IExpr create_Identifier(Dafny.ISequence<Dafny.Rune> name) {
+      return new Expr_Identifier(name);
+    }
+    public static _IExpr create_Match(RAST._IExpr matchee, Dafny.ISequence<RAST._IMatchCase> cases) {
+      return new Expr_Match(matchee, cases);
+    }
+    public static _IExpr create_StmtExpr(RAST._IExpr stmt, RAST._IExpr rhs) {
+      return new Expr_StmtExpr(stmt, rhs);
+    }
+    public static _IExpr create_Block(RAST._IExpr underlying) {
+      return new Expr_Block(underlying);
+    }
+    public static _IExpr create_StructBuild(RAST._IExpr underlying, Dafny.ISequence<RAST._IAssignIdentifier> assignments) {
+      return new Expr_StructBuild(underlying, assignments);
+    }
+    public static _IExpr create_Tuple(Dafny.ISequence<RAST._IExpr> arguments) {
+      return new Expr_Tuple(arguments);
+    }
+    public static _IExpr create_UnaryOp(Dafny.ISequence<Dafny.Rune> op1, RAST._IExpr underlying, DAST.Format._IUnaryOpFormat format) {
+      return new Expr_UnaryOp(op1, underlying, format);
+    }
+    public static _IExpr create_BinaryOp(Dafny.ISequence<Dafny.Rune> op2, RAST._IExpr left, RAST._IExpr right, DAST.Format._IBinaryOpFormat format2) {
+      return new Expr_BinaryOp(op2, left, right, format2);
+    }
+    public static _IExpr create_TypeAscription(RAST._IExpr left, RAST._IType tpe) {
+      return new Expr_TypeAscription(left, tpe);
+    }
+    public static _IExpr create_TraitCast(RAST._IType leftTpe, RAST._IType tpe) {
+      return new Expr_TraitCast(leftTpe, tpe);
+    }
+    public static _IExpr create_LiteralInt(Dafny.ISequence<Dafny.Rune> @value) {
+      return new Expr_LiteralInt(@value);
+    }
+    public static _IExpr create_LiteralBool(bool bvalue) {
+      return new Expr_LiteralBool(bvalue);
+    }
+    public static _IExpr create_LiteralString(Dafny.ISequence<Dafny.Rune> @value, bool binary, bool verbatim) {
+      return new Expr_LiteralString(@value, binary, verbatim);
+    }
+    public static _IExpr create_DeclareVar(RAST._IDeclareType declareType, Dafny.ISequence<Dafny.Rune> name, Std.Wrappers._IOption<RAST._IType> optType, Std.Wrappers._IOption<RAST._IExpr> optRhs) {
+      return new Expr_DeclareVar(declareType, name, optType, optRhs);
+    }
+    public static _IExpr create_Assign(Std.Wrappers._IOption<RAST._IAssignLhs> names, RAST._IExpr rhs) {
+      return new Expr_Assign(names, rhs);
+    }
+    public static _IExpr create_IfExpr(RAST._IExpr cond, RAST._IExpr thn, RAST._IExpr els) {
+      return new Expr_IfExpr(cond, thn, els);
+    }
+    public static _IExpr create_Loop(Std.Wrappers._IOption<RAST._IExpr> optCond, RAST._IExpr underlying) {
+      return new Expr_Loop(optCond, underlying);
+    }
+    public static _IExpr create_For(Dafny.ISequence<Dafny.Rune> name, RAST._IExpr range, RAST._IExpr body) {
+      return new Expr_For(name, range, body);
+    }
+    public static _IExpr create_Labelled(Dafny.ISequence<Dafny.Rune> lbl, RAST._IExpr underlying) {
+      return new Expr_Labelled(lbl, underlying);
+    }
+    public static _IExpr create_Break(Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> optLbl) {
+      return new Expr_Break(optLbl);
+    }
+    public static _IExpr create_Continue(Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> optLbl) {
+      return new Expr_Continue(optLbl);
+    }
+    public static _IExpr create_Return(Std.Wrappers._IOption<RAST._IExpr> optExpr) {
+      return new Expr_Return(optExpr);
+    }
+    public static _IExpr create_CallType(RAST._IExpr obj, Dafny.ISequence<RAST._IType> typeArguments) {
+      return new Expr_CallType(obj, typeArguments);
+    }
+    public static _IExpr create_Call(RAST._IExpr obj, Dafny.ISequence<RAST._IExpr> arguments) {
+      return new Expr_Call(obj, arguments);
+    }
+    public static _IExpr create_Select(RAST._IExpr obj, Dafny.ISequence<Dafny.Rune> name) {
+      return new Expr_Select(obj, name);
+    }
+    public static _IExpr create_SelectIndex(RAST._IExpr obj, RAST._IExpr range) {
+      return new Expr_SelectIndex(obj, range);
+    }
+    public static _IExpr create_ExprFromPath(RAST._IPath path) {
+      return new Expr_ExprFromPath(path);
+    }
+    public static _IExpr create_FunctionSelect(RAST._IExpr obj, Dafny.ISequence<Dafny.Rune> name) {
+      return new Expr_FunctionSelect(obj, name);
+    }
+    public static _IExpr create_Lambda(Dafny.ISequence<RAST._IFormal> @params, Std.Wrappers._IOption<RAST._IType> retType, RAST._IExpr body) {
+      return new Expr_Lambda(@params, retType, body);
+    }
+    public bool is_RawExpr { get { return this is Expr_RawExpr; } }
+    public bool is_ExprFromType { get { return this is Expr_ExprFromType; } }
+    public bool is_Identifier { get { return this is Expr_Identifier; } }
+    public bool is_Match { get { return this is Expr_Match; } }
+    public bool is_StmtExpr { get { return this is Expr_StmtExpr; } }
+    public bool is_Block { get { return this is Expr_Block; } }
+    public bool is_StructBuild { get { return this is Expr_StructBuild; } }
+    public bool is_Tuple { get { return this is Expr_Tuple; } }
+    public bool is_UnaryOp { get { return this is Expr_UnaryOp; } }
+    public bool is_BinaryOp { get { return this is Expr_BinaryOp; } }
+    public bool is_TypeAscription { get { return this is Expr_TypeAscription; } }
+    public bool is_TraitCast { get { return this is Expr_TraitCast; } }
+    public bool is_LiteralInt { get { return this is Expr_LiteralInt; } }
+    public bool is_LiteralBool { get { return this is Expr_LiteralBool; } }
+    public bool is_LiteralString { get { return this is Expr_LiteralString; } }
+    public bool is_DeclareVar { get { return this is Expr_DeclareVar; } }
+    public bool is_Assign { get { return this is Expr_Assign; } }
+    public bool is_IfExpr { get { return this is Expr_IfExpr; } }
+    public bool is_Loop { get { return this is Expr_Loop; } }
+    public bool is_For { get { return this is Expr_For; } }
+    public bool is_Labelled { get { return this is Expr_Labelled; } }
+    public bool is_Break { get { return this is Expr_Break; } }
+    public bool is_Continue { get { return this is Expr_Continue; } }
+    public bool is_Return { get { return this is Expr_Return; } }
+    public bool is_CallType { get { return this is Expr_CallType; } }
+    public bool is_Call { get { return this is Expr_Call; } }
+    public bool is_Select { get { return this is Expr_Select; } }
+    public bool is_SelectIndex { get { return this is Expr_SelectIndex; } }
+    public bool is_ExprFromPath { get { return this is Expr_ExprFromPath; } }
+    public bool is_FunctionSelect { get { return this is Expr_FunctionSelect; } }
+    public bool is_Lambda { get { return this is Expr_Lambda; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_content {
+      get {
+        var d = this;
+        return ((Expr_RawExpr)d)._content;
+      }
+    }
+    public RAST._IType dtor_tpe {
+      get {
+        var d = this;
+        if (d is Expr_ExprFromType) { return ((Expr_ExprFromType)d)._tpe; }
+        if (d is Expr_TypeAscription) { return ((Expr_TypeAscription)d)._tpe; }
+        return ((Expr_TraitCast)d)._tpe;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        var d = this;
+        if (d is Expr_Identifier) { return ((Expr_Identifier)d)._name; }
+        if (d is Expr_DeclareVar) { return ((Expr_DeclareVar)d)._name; }
+        if (d is Expr_For) { return ((Expr_For)d)._name; }
+        if (d is Expr_Select) { return ((Expr_Select)d)._name; }
+        return ((Expr_FunctionSelect)d)._name;
+      }
+    }
+    public RAST._IExpr dtor_matchee {
+      get {
+        var d = this;
+        return ((Expr_Match)d)._matchee;
+      }
+    }
+    public Dafny.ISequence<RAST._IMatchCase> dtor_cases {
+      get {
+        var d = this;
+        return ((Expr_Match)d)._cases;
+      }
+    }
+    public RAST._IExpr dtor_stmt {
+      get {
+        var d = this;
+        return ((Expr_StmtExpr)d)._stmt;
+      }
+    }
+    public RAST._IExpr dtor_rhs {
+      get {
+        var d = this;
+        if (d is Expr_StmtExpr) { return ((Expr_StmtExpr)d)._rhs; }
+        return ((Expr_Assign)d)._rhs;
+      }
+    }
+    public RAST._IExpr dtor_underlying {
+      get {
+        var d = this;
+        if (d is Expr_Block) { return ((Expr_Block)d)._underlying; }
+        if (d is Expr_StructBuild) { return ((Expr_StructBuild)d)._underlying; }
+        if (d is Expr_UnaryOp) { return ((Expr_UnaryOp)d)._underlying; }
+        if (d is Expr_Loop) { return ((Expr_Loop)d)._underlying; }
+        return ((Expr_Labelled)d)._underlying;
+      }
+    }
+    public Dafny.ISequence<RAST._IAssignIdentifier> dtor_assignments {
+      get {
+        var d = this;
+        return ((Expr_StructBuild)d)._assignments;
+      }
+    }
+    public Dafny.ISequence<RAST._IExpr> dtor_arguments {
+      get {
+        var d = this;
+        if (d is Expr_Tuple) { return ((Expr_Tuple)d)._arguments; }
+        return ((Expr_Call)d)._arguments;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_op1 {
+      get {
+        var d = this;
+        return ((Expr_UnaryOp)d)._op1;
+      }
+    }
+    public DAST.Format._IUnaryOpFormat dtor_format {
+      get {
+        var d = this;
+        return ((Expr_UnaryOp)d)._format;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_op2 {
+      get {
+        var d = this;
+        return ((Expr_BinaryOp)d)._op2;
+      }
+    }
+    public RAST._IExpr dtor_left {
+      get {
+        var d = this;
+        if (d is Expr_BinaryOp) { return ((Expr_BinaryOp)d)._left; }
+        return ((Expr_TypeAscription)d)._left;
+      }
+    }
+    public RAST._IExpr dtor_right {
+      get {
+        var d = this;
+        return ((Expr_BinaryOp)d)._right;
+      }
+    }
+    public DAST.Format._IBinaryOpFormat dtor_format2 {
+      get {
+        var d = this;
+        return ((Expr_BinaryOp)d)._format2;
+      }
+    }
+    public RAST._IType dtor_leftTpe {
+      get {
+        var d = this;
+        return ((Expr_TraitCast)d)._leftTpe;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_value {
+      get {
+        var d = this;
+        if (d is Expr_LiteralInt) { return ((Expr_LiteralInt)d)._value; }
+        return ((Expr_LiteralString)d)._value;
+      }
+    }
+    public bool dtor_bvalue {
+      get {
+        var d = this;
+        return ((Expr_LiteralBool)d)._bvalue;
+      }
+    }
+    public bool dtor_binary {
+      get {
+        var d = this;
+        return ((Expr_LiteralString)d)._binary;
+      }
+    }
+    public bool dtor_verbatim {
+      get {
+        var d = this;
+        return ((Expr_LiteralString)d)._verbatim;
+      }
+    }
+    public RAST._IDeclareType dtor_declareType {
+      get {
+        var d = this;
+        return ((Expr_DeclareVar)d)._declareType;
+      }
+    }
+    public Std.Wrappers._IOption<RAST._IType> dtor_optType {
+      get {
+        var d = this;
+        return ((Expr_DeclareVar)d)._optType;
+      }
+    }
+    public Std.Wrappers._IOption<RAST._IExpr> dtor_optRhs {
+      get {
+        var d = this;
+        return ((Expr_DeclareVar)d)._optRhs;
+      }
+    }
+    public Std.Wrappers._IOption<RAST._IAssignLhs> dtor_names {
+      get {
+        var d = this;
+        return ((Expr_Assign)d)._names;
+      }
+    }
+    public RAST._IExpr dtor_cond {
+      get {
+        var d = this;
+        return ((Expr_IfExpr)d)._cond;
+      }
+    }
+    public RAST._IExpr dtor_thn {
+      get {
+        var d = this;
+        return ((Expr_IfExpr)d)._thn;
+      }
+    }
+    public RAST._IExpr dtor_els {
+      get {
+        var d = this;
+        return ((Expr_IfExpr)d)._els;
+      }
+    }
+    public Std.Wrappers._IOption<RAST._IExpr> dtor_optCond {
+      get {
+        var d = this;
+        return ((Expr_Loop)d)._optCond;
+      }
+    }
+    public RAST._IExpr dtor_range {
+      get {
+        var d = this;
+        if (d is Expr_For) { return ((Expr_For)d)._range; }
+        return ((Expr_SelectIndex)d)._range;
+      }
+    }
+    public RAST._IExpr dtor_body {
+      get {
+        var d = this;
+        if (d is Expr_For) { return ((Expr_For)d)._body; }
+        return ((Expr_Lambda)d)._body;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> dtor_lbl {
+      get {
+        var d = this;
+        return ((Expr_Labelled)d)._lbl;
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> dtor_optLbl {
+      get {
+        var d = this;
+        if (d is Expr_Break) { return ((Expr_Break)d)._optLbl; }
+        return ((Expr_Continue)d)._optLbl;
+      }
+    }
+    public Std.Wrappers._IOption<RAST._IExpr> dtor_optExpr {
+      get {
+        var d = this;
+        return ((Expr_Return)d)._optExpr;
+      }
+    }
+    public RAST._IExpr dtor_obj {
+      get {
+        var d = this;
+        if (d is Expr_CallType) { return ((Expr_CallType)d)._obj; }
+        if (d is Expr_Call) { return ((Expr_Call)d)._obj; }
+        if (d is Expr_Select) { return ((Expr_Select)d)._obj; }
+        if (d is Expr_SelectIndex) { return ((Expr_SelectIndex)d)._obj; }
+        return ((Expr_FunctionSelect)d)._obj;
+      }
+    }
+    public Dafny.ISequence<RAST._IType> dtor_typeArguments {
+      get {
+        var d = this;
+        return ((Expr_CallType)d)._typeArguments;
+      }
+    }
+    public RAST._IPath dtor_path {
+      get {
+        var d = this;
+        return ((Expr_ExprFromPath)d)._path;
+      }
+    }
+    public Dafny.ISequence<RAST._IFormal> dtor_params {
+      get {
+        var d = this;
+        return ((Expr_Lambda)d)._params;
+      }
+    }
+    public Std.Wrappers._IOption<RAST._IType> dtor_retType {
+      get {
+        var d = this;
+        return ((Expr_Lambda)d)._retType;
+      }
+    }
+    public abstract _IExpr DowncastClone();
+    public RAST._IExpr Replace(Func<RAST._IExpr, RAST._IExpr> f, Func<RAST._IType, RAST._IType> ft)
+    {
+      RAST._IExpr _0_r = ((System.Func<RAST._IExpr>)(() => {
+        RAST._IExpr _source0 = this;
+        {
+          if (_source0.is_RawExpr) {
+            Dafny.ISequence<Dafny.Rune> _1_content = _source0.dtor_content;
+            return this;
+          }
+        }
+        {
+          if (_source0.is_ExprFromType) {
+            RAST._IType _2_tpe = _source0.dtor_tpe;
+            return RAST.Expr.create_ExprFromType((_2_tpe).Replace(ft));
+          }
+        }
+        {
+          if (_source0.is_Identifier) {
+            Dafny.ISequence<Dafny.Rune> _3_name = _source0.dtor_name;
+            return this;
+          }
+        }
+        {
+          if (_source0.is_Match) {
+            RAST._IExpr _4_matchee = _source0.dtor_matchee;
+            Dafny.ISequence<RAST._IMatchCase> _5_cases = _source0.dtor_cases;
+            return RAST.Expr.create_Match((_4_matchee).Replace(f, ft), Std.Collections.Seq.__default.Map<RAST._IMatchCase, RAST._IMatchCase>(Dafny.Helpers.Id<Func<Func<RAST._IExpr, RAST._IExpr>, Func<RAST._IType, RAST._IType>, Dafny.ISequence<RAST._IMatchCase>, Func<RAST._IMatchCase, RAST._IMatchCase>>>((_6_f, _7_ft, _8_cases) => ((System.Func<RAST._IMatchCase, RAST._IMatchCase>)((_9_c) => {
+  return (_9_c).Replace(_6_f, _7_ft);
+})))(f, ft, _5_cases), _5_cases));
+          }
+        }
+        {
+          if (_source0.is_StmtExpr) {
+            RAST._IExpr _10_stmt = _source0.dtor_stmt;
+            RAST._IExpr _11_rhs = _source0.dtor_rhs;
+            return RAST.Expr.create_StmtExpr((_10_stmt).Replace(f, ft), (_11_rhs).Replace(f, ft));
+          }
+        }
+        {
+          if (_source0.is_Block) {
+            RAST._IExpr _12_underlying = _source0.dtor_underlying;
+            return RAST.Expr.create_Block((_12_underlying).Replace(f, ft));
+          }
+        }
+        {
+          if (_source0.is_StructBuild) {
+            RAST._IExpr _13_underlying = _source0.dtor_underlying;
+            Dafny.ISequence<RAST._IAssignIdentifier> _14_assignments = _source0.dtor_assignments;
+            return RAST.Expr.create_StructBuild((_13_underlying).Replace(f, ft), Std.Collections.Seq.__default.Map<RAST._IAssignIdentifier, RAST._IAssignIdentifier>(Dafny.Helpers.Id<Func<Func<RAST._IExpr, RAST._IExpr>, Func<RAST._IType, RAST._IType>, Dafny.ISequence<RAST._IAssignIdentifier>, Func<RAST._IAssignIdentifier, RAST._IAssignIdentifier>>>((_15_f, _16_ft, _17_assignments) => ((System.Func<RAST._IAssignIdentifier, RAST._IAssignIdentifier>)((_18_a) => {
+  return (_18_a).Replace(_15_f, _16_ft);
+})))(f, ft, _14_assignments), _14_assignments));
+          }
+        }
+        {
+          if (_source0.is_Tuple) {
+            Dafny.ISequence<RAST._IExpr> _19_arguments = _source0.dtor_arguments;
+            return RAST.Expr.create_Tuple(Std.Collections.Seq.__default.Map<RAST._IExpr, RAST._IExpr>(Dafny.Helpers.Id<Func<Func<RAST._IExpr, RAST._IExpr>, Func<RAST._IType, RAST._IType>, Dafny.ISequence<RAST._IExpr>, Func<RAST._IExpr, RAST._IExpr>>>((_20_f, _21_ft, _22_arguments) => ((System.Func<RAST._IExpr, RAST._IExpr>)((_23_e) => {
+  return (_23_e).Replace(_20_f, _21_ft);
+})))(f, ft, _19_arguments), _19_arguments));
+          }
+        }
+        {
+          if (_source0.is_UnaryOp) {
+            Dafny.ISequence<Dafny.Rune> _24_op1 = _source0.dtor_op1;
+            RAST._IExpr _25_underlying = _source0.dtor_underlying;
+            DAST.Format._IUnaryOpFormat _26_format = _source0.dtor_format;
+            return RAST.Expr.create_UnaryOp(_24_op1, (_25_underlying).Replace(f, ft), _26_format);
+          }
+        }
+        {
+          if (_source0.is_BinaryOp) {
+            Dafny.ISequence<Dafny.Rune> _27_op2 = _source0.dtor_op2;
+            RAST._IExpr _28_left = _source0.dtor_left;
+            RAST._IExpr _29_right = _source0.dtor_right;
+            DAST.Format._IBinaryOpFormat _30_format2 = _source0.dtor_format2;
+            return RAST.Expr.create_BinaryOp(_27_op2, (_28_left).Replace(f, ft), (_29_right).Replace(f, ft), _30_format2);
+          }
+        }
+        {
+          if (_source0.is_TypeAscription) {
+            RAST._IExpr _31_left = _source0.dtor_left;
+            RAST._IType _32_tpe = _source0.dtor_tpe;
+            return RAST.Expr.create_TypeAscription((_31_left).Replace(f, ft), (_32_tpe).Replace(ft));
+          }
+        }
+        {
+          if (_source0.is_TraitCast) {
+            RAST._IType _33_leftTpe = _source0.dtor_leftTpe;
+            RAST._IType _34_tpe = _source0.dtor_tpe;
+            return RAST.Expr.create_TraitCast((_33_leftTpe).Replace(ft), (_34_tpe).Replace(ft));
+          }
+        }
+        {
+          if (_source0.is_LiteralInt) {
+            Dafny.ISequence<Dafny.Rune> _35_value = _source0.dtor_value;
+            return this;
+          }
+        }
+        {
+          if (_source0.is_LiteralBool) {
+            bool _36_bvalue = _source0.dtor_bvalue;
+            return this;
+          }
+        }
+        {
+          if (_source0.is_LiteralString) {
+            Dafny.ISequence<Dafny.Rune> _37_value = _source0.dtor_value;
+            bool _38_binary = _source0.dtor_binary;
+            bool _39_verbatim = _source0.dtor_verbatim;
+            return this;
+          }
+        }
+        {
+          if (_source0.is_DeclareVar) {
+            RAST._IDeclareType _40_declareType = _source0.dtor_declareType;
+            Dafny.ISequence<Dafny.Rune> _41_name = _source0.dtor_name;
+            Std.Wrappers._IOption<RAST._IType> _42_optType = _source0.dtor_optType;
+            Std.Wrappers._IOption<RAST._IExpr> _43_optRhs = _source0.dtor_optRhs;
+            return RAST.Expr.create_DeclareVar(_40_declareType, _41_name, (((_42_optType).is_None) ? (_42_optType) : (Std.Wrappers.Option<RAST._IType>.create_Some(((_42_optType).dtor_value).Replace(ft)))), (((_43_optRhs).is_None) ? (_43_optRhs) : (Std.Wrappers.Option<RAST._IExpr>.create_Some(((_43_optRhs).dtor_value).Replace(f, ft)))));
+          }
+        }
+        {
+          if (_source0.is_Assign) {
+            Std.Wrappers._IOption<RAST._IAssignLhs> _44_names = _source0.dtor_names;
+            RAST._IExpr _45_rhs = _source0.dtor_rhs;
+            return RAST.Expr.create_Assign(_44_names, (_45_rhs).Replace(f, ft));
+          }
+        }
+        {
+          if (_source0.is_IfExpr) {
+            RAST._IExpr _46_cond = _source0.dtor_cond;
+            RAST._IExpr _47_thn = _source0.dtor_thn;
+            RAST._IExpr _48_els = _source0.dtor_els;
+            return RAST.Expr.create_IfExpr((_46_cond).Replace(f, ft), (_47_thn).Replace(f, ft), (_48_els).Replace(f, ft));
+          }
+        }
+        {
+          if (_source0.is_Loop) {
+            Std.Wrappers._IOption<RAST._IExpr> _49_optCond = _source0.dtor_optCond;
+            RAST._IExpr _50_underlying = _source0.dtor_underlying;
+            return RAST.Expr.create_Loop((((_49_optCond).is_None) ? (Std.Wrappers.Option<RAST._IExpr>.create_None()) : (Std.Wrappers.Option<RAST._IExpr>.create_Some(((_49_optCond).dtor_value).Replace(f, ft)))), (_50_underlying).Replace(f, ft));
+          }
+        }
+        {
+          if (_source0.is_For) {
+            Dafny.ISequence<Dafny.Rune> _51_name = _source0.dtor_name;
+            RAST._IExpr _52_range = _source0.dtor_range;
+            RAST._IExpr _53_body = _source0.dtor_body;
+            return RAST.Expr.create_For(_51_name, (_52_range).Replace(f, ft), (_53_body).Replace(f, ft));
+          }
+        }
+        {
+          if (_source0.is_Labelled) {
+            Dafny.ISequence<Dafny.Rune> _54_lbl = _source0.dtor_lbl;
+            RAST._IExpr _55_underlying = _source0.dtor_underlying;
+            return RAST.Expr.create_Labelled(_54_lbl, (_55_underlying).Replace(f, ft));
+          }
+        }
+        {
+          if (_source0.is_Break) {
+            Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _56_optLbl = _source0.dtor_optLbl;
+            return this;
+          }
+        }
+        {
+          if (_source0.is_Continue) {
+            Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _57_optLbl = _source0.dtor_optLbl;
+            return this;
+          }
+        }
+        {
+          if (_source0.is_Return) {
+            Std.Wrappers._IOption<RAST._IExpr> _58_optExpr = _source0.dtor_optExpr;
+            return RAST.Expr.create_Return((((_58_optExpr).is_None) ? (Std.Wrappers.Option<RAST._IExpr>.create_None()) : (Std.Wrappers.Option<RAST._IExpr>.create_Some(((_58_optExpr).dtor_value).Replace(f, ft)))));
+          }
+        }
+        {
+          if (_source0.is_CallType) {
+            RAST._IExpr _59_obj = _source0.dtor_obj;
+            Dafny.ISequence<RAST._IType> _60_typeArguments = _source0.dtor_typeArguments;
+            return RAST.Expr.create_CallType((_59_obj).Replace(f, ft), Std.Collections.Seq.__default.Map<RAST._IType, RAST._IType>(Dafny.Helpers.Id<Func<Func<RAST._IType, RAST._IType>, Func<RAST._IType, RAST._IType>>>((_61_ft) => ((System.Func<RAST._IType, RAST._IType>)((_62_tp) => {
+  return (_62_tp).Replace(_61_ft);
+})))(ft), _60_typeArguments));
+          }
+        }
+        {
+          if (_source0.is_Call) {
+            RAST._IExpr _63_obj = _source0.dtor_obj;
+            Dafny.ISequence<RAST._IExpr> _64_arguments = _source0.dtor_arguments;
+            return RAST.Expr.create_Call((_63_obj).Replace(f, ft), Std.Collections.Seq.__default.Map<RAST._IExpr, RAST._IExpr>(Dafny.Helpers.Id<Func<Func<RAST._IExpr, RAST._IExpr>, Func<RAST._IType, RAST._IType>, Func<RAST._IExpr, RAST._IExpr>>>((_65_f, _66_ft) => ((System.Func<RAST._IExpr, RAST._IExpr>)((_67_a) => {
+  return (_67_a).Replace(_65_f, _66_ft);
+})))(f, ft), _64_arguments));
+          }
+        }
+        {
+          if (_source0.is_Select) {
+            RAST._IExpr _68_obj = _source0.dtor_obj;
+            Dafny.ISequence<Dafny.Rune> _69_name = _source0.dtor_name;
+            return RAST.Expr.create_Select((_68_obj).Replace(f, ft), _69_name);
+          }
+        }
+        {
+          if (_source0.is_SelectIndex) {
+            RAST._IExpr _70_obj = _source0.dtor_obj;
+            RAST._IExpr _71_range = _source0.dtor_range;
+            return RAST.Expr.create_SelectIndex((_70_obj).Replace(f, ft), (_71_range).Replace(f, ft));
+          }
+        }
+        {
+          if (_source0.is_ExprFromPath) {
+            RAST._IPath _72_path = _source0.dtor_path;
+            return RAST.Expr.create_ExprFromPath(_72_path);
+          }
+        }
+        {
+          if (_source0.is_FunctionSelect) {
+            RAST._IExpr _73_obj = _source0.dtor_obj;
+            Dafny.ISequence<Dafny.Rune> _74_name = _source0.dtor_name;
+            return RAST.Expr.create_FunctionSelect((_73_obj).Replace(f, ft), _74_name);
+          }
+        }
+        {
+          Dafny.ISequence<RAST._IFormal> _75_params = _source0.dtor_params;
+          Std.Wrappers._IOption<RAST._IType> _76_retType = _source0.dtor_retType;
+          RAST._IExpr _77_body = _source0.dtor_body;
+          return RAST.Expr.create_Lambda(Std.Collections.Seq.__default.Map<RAST._IFormal, RAST._IFormal>(Dafny.Helpers.Id<Func<Func<RAST._IType, RAST._IType>, Func<RAST._IFormal, RAST._IFormal>>>((_78_ft) => ((System.Func<RAST._IFormal, RAST._IFormal>)((_79_f) => {
+  return (_79_f).Replace(_78_ft);
+})))(ft), _75_params), (((_76_retType).is_None) ? (Std.Wrappers.Option<RAST._IType>.create_None()) : (Std.Wrappers.Option<RAST._IType>.create_Some(((_76_retType).dtor_value).Replace(ft)))), (_77_body).Replace(f, ft));
+        }
+      }))();
+      return Dafny.Helpers.Id<Func<RAST._IExpr, RAST._IExpr>>(f)(_0_r);
+    }
+    public __T Fold<__T>(__T acc, Func<__T, RAST._IExpr, __T> f, Func<__T, RAST._IType, __T> ft)
+    {
+      __T _0_acc = Dafny.Helpers.Id<Func<__T, RAST._IExpr, __T>>(f)(acc, this);
+      RAST._IExpr _source0 = this;
+      {
+        if (_source0.is_RawExpr) {
+          Dafny.ISequence<Dafny.Rune> _1_content = _source0.dtor_content;
+          return _0_acc;
+        }
+      }
+      {
+        if (_source0.is_ExprFromType) {
+          RAST._IType _2_tpe = _source0.dtor_tpe;
+          return (_2_tpe).Fold<__T>(_0_acc, ft);
+        }
+      }
+      {
+        if (_source0.is_Identifier) {
+          Dafny.ISequence<Dafny.Rune> _3_name = _source0.dtor_name;
+          return _0_acc;
+        }
+      }
+      {
+        if (_source0.is_Match) {
+          RAST._IExpr _4_matchee = _source0.dtor_matchee;
+          Dafny.ISequence<RAST._IMatchCase> _5_cases = _source0.dtor_cases;
+          __T _6_acc = (_4_matchee).Fold<__T>(_0_acc, f, ft);
+          return RAST.__default.FoldLeft<__T, RAST._IMatchCase>(Dafny.Helpers.Id<Func<Func<__T, RAST._IExpr, __T>, Func<__T, RAST._IType, __T>, Dafny.ISequence<RAST._IMatchCase>, Func<__T, RAST._IMatchCase, __T>>>((_7_f, _8_ft, _9_cases) => ((System.Func<__T, RAST._IMatchCase, __T>)((_10_acc, _11_c) => {
+            return (_11_c).Fold<__T>(_10_acc, _7_f, _8_ft);
+          })))(f, ft, _5_cases), _6_acc, _5_cases);
+        }
+      }
+      {
+        if (_source0.is_StmtExpr) {
+          RAST._IExpr _12_stmt = _source0.dtor_stmt;
+          RAST._IExpr _13_rhs = _source0.dtor_rhs;
+          return (_13_rhs).Fold<__T>((_12_stmt).Fold<__T>(_0_acc, f, ft), f, ft);
+        }
+      }
+      {
+        if (_source0.is_Block) {
+          RAST._IExpr _14_underlying = _source0.dtor_underlying;
+          return (_14_underlying).Fold<__T>(_0_acc, f, ft);
+        }
+      }
+      {
+        if (_source0.is_StructBuild) {
+          RAST._IExpr _15_underlying = _source0.dtor_underlying;
+          Dafny.ISequence<RAST._IAssignIdentifier> _16_assignments = _source0.dtor_assignments;
+          return RAST.__default.FoldLeft<__T, RAST._IAssignIdentifier>(Dafny.Helpers.Id<Func<Func<__T, RAST._IExpr, __T>, Func<__T, RAST._IType, __T>, Dafny.ISequence<RAST._IAssignIdentifier>, Func<__T, RAST._IAssignIdentifier, __T>>>((_17_f, _18_ft, _19_assignments) => ((System.Func<__T, RAST._IAssignIdentifier, __T>)((_20_acc, _21_c) => {
+            return (_21_c).Fold<__T>(_20_acc, _17_f, _18_ft);
+          })))(f, ft, _16_assignments), (_15_underlying).Fold<__T>(_0_acc, f, ft), _16_assignments);
+        }
+      }
+      {
+        if (_source0.is_Tuple) {
+          Dafny.ISequence<RAST._IExpr> _22_arguments = _source0.dtor_arguments;
+          return RAST.__default.FoldLeft<__T, RAST._IExpr>(Dafny.Helpers.Id<Func<Func<__T, RAST._IExpr, __T>, Func<__T, RAST._IType, __T>, Dafny.ISequence<RAST._IExpr>, Func<__T, RAST._IExpr, __T>>>((_23_f, _24_ft, _25_arguments) => ((System.Func<__T, RAST._IExpr, __T>)((_26_acc, _27_e) => {
+            return (_27_e).Fold<__T>(_26_acc, _23_f, _24_ft);
+          })))(f, ft, _22_arguments), _0_acc, _22_arguments);
+        }
+      }
+      {
+        if (_source0.is_UnaryOp) {
+          Dafny.ISequence<Dafny.Rune> _28_op1 = _source0.dtor_op1;
+          RAST._IExpr _29_underlying = _source0.dtor_underlying;
+          DAST.Format._IUnaryOpFormat _30_format = _source0.dtor_format;
+          return (_29_underlying).Fold<__T>(_0_acc, f, ft);
+        }
+      }
+      {
+        if (_source0.is_BinaryOp) {
+          Dafny.ISequence<Dafny.Rune> _31_op2 = _source0.dtor_op2;
+          RAST._IExpr _32_left = _source0.dtor_left;
+          RAST._IExpr _33_right = _source0.dtor_right;
+          DAST.Format._IBinaryOpFormat _34_format2 = _source0.dtor_format2;
+          return (_33_right).Fold<__T>((_32_left).Fold<__T>(_0_acc, f, ft), f, ft);
+        }
+      }
+      {
+        if (_source0.is_TypeAscription) {
+          RAST._IExpr _35_left = _source0.dtor_left;
+          RAST._IType _36_tpe = _source0.dtor_tpe;
+          return (_36_tpe).Fold<__T>((_35_left).Fold<__T>(_0_acc, f, ft), ft);
+        }
+      }
+      {
+        if (_source0.is_TraitCast) {
+          RAST._IType _37_leftTpe = _source0.dtor_leftTpe;
+          RAST._IType _38_tpe = _source0.dtor_tpe;
+          return (_38_tpe).Fold<__T>((_37_leftTpe).Fold<__T>(_0_acc, ft), ft);
+        }
+      }
+      {
+        if (_source0.is_LiteralInt) {
+          Dafny.ISequence<Dafny.Rune> _39_value = _source0.dtor_value;
+          return _0_acc;
+        }
+      }
+      {
+        if (_source0.is_LiteralBool) {
+          bool _40_bvalue = _source0.dtor_bvalue;
+          return _0_acc;
+        }
+      }
+      {
+        if (_source0.is_LiteralString) {
+          Dafny.ISequence<Dafny.Rune> _41_value = _source0.dtor_value;
+          bool _42_binary = _source0.dtor_binary;
+          bool _43_verbatim = _source0.dtor_verbatim;
+          return _0_acc;
+        }
+      }
+      {
+        if (_source0.is_DeclareVar) {
+          RAST._IDeclareType _44_declareType = _source0.dtor_declareType;
+          Dafny.ISequence<Dafny.Rune> _45_name = _source0.dtor_name;
+          Std.Wrappers._IOption<RAST._IType> _46_optType = _source0.dtor_optType;
+          Std.Wrappers._IOption<RAST._IExpr> _47_optRhs = _source0.dtor_optRhs;
+          __T _48_acc = (((_46_optType).is_None) ? (_0_acc) : (((_46_optType).dtor_value).Fold<__T>(_0_acc, ft)));
+          if ((_47_optRhs).is_None) {
+            return _48_acc;
+          } else {
+            return ((_47_optRhs).dtor_value).Fold<__T>(_48_acc, f, ft);
+          }
+        }
+      }
+      {
+        if (_source0.is_Assign) {
+          Std.Wrappers._IOption<RAST._IAssignLhs> _49_names = _source0.dtor_names;
+          RAST._IExpr _50_rhs = _source0.dtor_rhs;
+          return (_50_rhs).Fold<__T>(_0_acc, f, ft);
+        }
+      }
+      {
+        if (_source0.is_IfExpr) {
+          RAST._IExpr _51_cond = _source0.dtor_cond;
+          RAST._IExpr _52_thn = _source0.dtor_thn;
+          RAST._IExpr _53_els = _source0.dtor_els;
+          __T _54_acc = (_51_cond).Fold<__T>(_0_acc, f, ft);
+          __T _55_acc = (_52_thn).Fold<__T>(_54_acc, f, ft);
+          return (_53_els).Fold<__T>(_55_acc, f, ft);
+        }
+      }
+      {
+        if (_source0.is_Loop) {
+          Std.Wrappers._IOption<RAST._IExpr> _56_optCond = _source0.dtor_optCond;
+          RAST._IExpr _57_underlying = _source0.dtor_underlying;
+          __T _58_acc = (((_56_optCond).is_None) ? (_0_acc) : (((_56_optCond).dtor_value).Fold<__T>(_0_acc, f, ft)));
+          return (_57_underlying).Fold<__T>(_58_acc, f, ft);
+        }
+      }
+      {
+        if (_source0.is_For) {
+          Dafny.ISequence<Dafny.Rune> _59_name = _source0.dtor_name;
+          RAST._IExpr _60_range = _source0.dtor_range;
+          RAST._IExpr _61_body = _source0.dtor_body;
+          __T _62_acc = (_60_range).Fold<__T>(_0_acc, f, ft);
+          return (_61_body).Fold<__T>(_62_acc, f, ft);
+        }
+      }
+      {
+        if (_source0.is_Labelled) {
+          Dafny.ISequence<Dafny.Rune> _63_lbl = _source0.dtor_lbl;
+          RAST._IExpr _64_underlying = _source0.dtor_underlying;
+          return (_64_underlying).Fold<__T>(_0_acc, f, ft);
+        }
+      }
+      {
+        if (_source0.is_Break) {
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _65_optLbl = _source0.dtor_optLbl;
+          return _0_acc;
+        }
+      }
+      {
+        if (_source0.is_Continue) {
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _66_optLbl = _source0.dtor_optLbl;
+          return _0_acc;
+        }
+      }
+      {
+        if (_source0.is_Return) {
+          Std.Wrappers._IOption<RAST._IExpr> _67_optExpr = _source0.dtor_optExpr;
+          if ((_67_optExpr).is_None) {
+            return _0_acc;
+          } else {
+            return ((_67_optExpr).dtor_value).Fold<__T>(_0_acc, f, ft);
+          }
+        }
+      }
+      {
+        if (_source0.is_CallType) {
+          RAST._IExpr _68_obj = _source0.dtor_obj;
+          Dafny.ISequence<RAST._IType> _69_typeArguments = _source0.dtor_typeArguments;
+          __T _70_acc = (_68_obj).Fold<__T>(_0_acc, f, ft);
+          return RAST.__default.FoldLeft<__T, RAST._IType>(Dafny.Helpers.Id<Func<Func<__T, RAST._IType, __T>, Dafny.ISequence<RAST._IType>, Func<__T, RAST._IType, __T>>>((_71_ft, _72_typeArguments) => ((System.Func<__T, RAST._IType, __T>)((_73_acc, _74_t) => {
+            return (_74_t).Fold<__T>(_73_acc, _71_ft);
+          })))(ft, _69_typeArguments), _70_acc, _69_typeArguments);
+        }
+      }
+      {
+        if (_source0.is_Call) {
+          RAST._IExpr _75_obj = _source0.dtor_obj;
+          Dafny.ISequence<RAST._IExpr> _76_arguments = _source0.dtor_arguments;
+          __T _77_acc = (_75_obj).Fold<__T>(_0_acc, f, ft);
+          return RAST.__default.FoldLeft<__T, RAST._IExpr>(Dafny.Helpers.Id<Func<Func<__T, RAST._IExpr, __T>, Func<__T, RAST._IType, __T>, Dafny.ISequence<RAST._IExpr>, Func<__T, RAST._IExpr, __T>>>((_78_f, _79_ft, _80_arguments) => ((System.Func<__T, RAST._IExpr, __T>)((_81_acc, _82_e) => {
+            return (_82_e).Fold<__T>(_81_acc, _78_f, _79_ft);
+          })))(f, ft, _76_arguments), _77_acc, _76_arguments);
+        }
+      }
+      {
+        if (_source0.is_Select) {
+          RAST._IExpr _83_obj = _source0.dtor_obj;
+          Dafny.ISequence<Dafny.Rune> _84_name = _source0.dtor_name;
+          return (_83_obj).Fold<__T>(_0_acc, f, ft);
+        }
+      }
+      {
+        if (_source0.is_SelectIndex) {
+          RAST._IExpr _85_obj = _source0.dtor_obj;
+          RAST._IExpr _86_range = _source0.dtor_range;
+          return (_86_range).Fold<__T>((_85_obj).Fold<__T>(_0_acc, f, ft), f, ft);
+        }
+      }
+      {
+        if (_source0.is_ExprFromPath) {
+          RAST._IPath _87_path = _source0.dtor_path;
+          return _0_acc;
+        }
+      }
+      {
+        if (_source0.is_FunctionSelect) {
+          RAST._IExpr _88_obj = _source0.dtor_obj;
+          Dafny.ISequence<Dafny.Rune> _89_name = _source0.dtor_name;
+          return (_88_obj).Fold<__T>(_0_acc, f, ft);
+        }
+      }
+      {
+        Dafny.ISequence<RAST._IFormal> _90_params = _source0.dtor_params;
+        Std.Wrappers._IOption<RAST._IType> _91_retType = _source0.dtor_retType;
+        RAST._IExpr _92_body = _source0.dtor_body;
+        __T _93_acc = RAST.__default.FoldLeft<__T, RAST._IFormal>(Dafny.Helpers.Id<Func<Func<__T, RAST._IType, __T>, Dafny.ISequence<RAST._IFormal>, Func<__T, RAST._IFormal, __T>>>((_94_ft, _95_params) => ((System.Func<__T, RAST._IFormal, __T>)((_96_acc, _97_param) => {
+          return (_97_param).Fold<__T>(_96_acc, _94_ft);
+        })))(ft, _90_params), _0_acc, _90_params);
+        __T _98_acc = (((_91_retType).is_None) ? (_93_acc) : (((_91_retType).dtor_value).Fold<__T>(_93_acc, ft)));
+        return (_92_body).Fold<__T>(_98_acc, f, ft);
+      }
+    }
+    public bool NoExtraSemicolonAfter() {
+      return (((((((this).is_DeclareVar) || ((this).is_Assign)) || ((this).is_Break)) || ((this).is_Continue)) || ((this).is_Return)) || ((this).is_For)) || ((((this).is_RawExpr) && ((new BigInteger(((this).dtor_content).Count)).Sign == 1)) && ((((this).dtor_content).Select((new BigInteger(((this).dtor_content).Count)) - (BigInteger.One))) == (new Dafny.Rune(';'))));
+    }
+    public bool LeftRequiresParentheses(RAST._IExpr left) {
+      return ((this).printingInfo).NeedParenthesesForLeft((left).printingInfo);
+    }
+    public _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> LeftParentheses(RAST._IExpr left) {
+      if ((this).LeftRequiresParentheses(left)) {
+        return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
+      } else {
+        return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+      }
+    }
+    public bool RightRequiresParentheses(RAST._IExpr right) {
+      return ((this).printingInfo).NeedParenthesesForRight((right).printingInfo);
+    }
+    public _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> RightParentheses(RAST._IExpr right) {
+      if ((this).RightRequiresParentheses(right)) {
+        return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
+      } else {
+        return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
+      }
+    }
+    public Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> RightMostIdentifier() {
+      RAST._IExpr _source0 = this;
+      {
+        if (_source0.is_FunctionSelect) {
+          Dafny.ISequence<Dafny.Rune> _0_id = _source0.dtor_name;
+          return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(_0_id);
+        }
+      }
+      {
+        if (_source0.is_ExprFromPath) {
+          RAST._IPath _1_p = _source0.dtor_path;
+          return (_1_p).RightMostIdentifier();
+        }
+      }
+      {
+        if (_source0.is_Identifier) {
+          Dafny.ISequence<Dafny.Rune> _2_id = _source0.dtor_name;
+          return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(_2_id);
+        }
+      }
+      {
+        return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None();
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> MaxHashes(Dafny.ISequence<Dafny.Rune> s, Dafny.ISequence<Dafny.Rune> currentHashes, Dafny.ISequence<Dafny.Rune> mostHashes)
+    {
+    TAIL_CALL_START: ;
+      if ((new BigInteger((s).Count)).Sign == 0) {
+        if ((new BigInteger((currentHashes).Count)) < (new BigInteger((mostHashes).Count))) {
+          return mostHashes;
+        } else {
+          return currentHashes;
+        }
+      } else if (((s).Subsequence(BigInteger.Zero, BigInteger.One)).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#"))) {
+        Dafny.ISequence<Dafny.Rune> _in0 = (s).Drop(BigInteger.One);
+        Dafny.ISequence<Dafny.Rune> _in1 = Dafny.Sequence<Dafny.Rune>.Concat(currentHashes, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#"));
+        Dafny.ISequence<Dafny.Rune> _in2 = mostHashes;
+        s = _in0;
+        currentHashes = _in1;
+        mostHashes = _in2;
+        goto TAIL_CALL_START;
+      } else {
+        Dafny.ISequence<Dafny.Rune> _in3 = (s).Drop(BigInteger.One);
+        Dafny.ISequence<Dafny.Rune> _in4 = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+        Dafny.ISequence<Dafny.Rune> _in5 = (((new BigInteger((currentHashes).Count)) < (new BigInteger((mostHashes).Count))) ? (mostHashes) : (currentHashes));
+        s = _in3;
+        currentHashes = _in4;
+        mostHashes = _in5;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> RemoveDoubleQuotes(Dafny.ISequence<Dafny.Rune> s) {
+      Dafny.ISequence<Dafny.Rune> _0___accumulator = Dafny.Sequence<Dafny.Rune>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((s).Count)) <= (BigInteger.One)) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, s);
+      } else if (((s).Subsequence(BigInteger.Zero, new BigInteger(2))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(@""""""))) {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(@""""));
+        Dafny.ISequence<Dafny.Rune> _in0 = (s).Drop(new BigInteger(2));
+        s = _in0;
+        goto TAIL_CALL_START;
+      } else {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, (s).Subsequence(BigInteger.Zero, BigInteger.One));
+        Dafny.ISequence<Dafny.Rune> _in1 = (s).Drop(BigInteger.One);
+        s = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      RAST._IExpr _source0 = this;
+      {
+        if (_source0.is_Identifier) {
+          Dafny.ISequence<Dafny.Rune> _0_name = _source0.dtor_name;
+          return _0_name;
+        }
+      }
+      {
+        if (_source0.is_ExprFromType) {
+          RAST._IType _1_t = _source0.dtor_tpe;
+          return (_1_t)._ToString(ind);
+        }
+      }
+      {
+        if (_source0.is_LiteralInt) {
+          Dafny.ISequence<Dafny.Rune> _2_number = _source0.dtor_value;
+          return _2_number;
+        }
+      }
+      {
+        if (_source0.is_LiteralBool) {
+          bool _3_b = _source0.dtor_bvalue;
+          if (_3_b) {
+            return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("true");
+          } else {
+            return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("false");
+          }
+        }
+      }
+      {
+        if (_source0.is_LiteralString) {
+          Dafny.ISequence<Dafny.Rune> _4_characters = _source0.dtor_value;
+          bool _5_binary = _source0.dtor_binary;
+          bool _6_verbatim = _source0.dtor_verbatim;
+          Dafny.ISequence<Dafny.Rune> _7_hashes = ((_6_verbatim) ? (Dafny.Sequence<Dafny.Rune>.Concat(RAST.Expr.MaxHashes(_4_characters, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#"))) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")));
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(((_5_binary) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("b")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), ((_6_verbatim) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r"), _7_hashes)) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\"")), ((_6_verbatim) ? (RAST.Expr.RemoveDoubleQuotes(_4_characters)) : (_4_characters))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\"")), _7_hashes);
+        }
+      }
+      {
+        if (_source0.is_Match) {
+          RAST._IExpr _8_matchee = _source0.dtor_matchee;
+          Dafny.ISequence<RAST._IMatchCase> _9_cases = _source0.dtor_cases;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("match "), (_8_matchee)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {")), RAST.__default.SeqToString<RAST._IMatchCase>(_9_cases, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<RAST._IMatchCase>, Func<RAST._IMatchCase, Dafny.ISequence<Dafny.Rune>>>>((_10_ind, _11_cases) => ((System.Func<RAST._IMatchCase, Dafny.ISequence<Dafny.Rune>>)((_12_c) => {
+            return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), _10_ind), RAST.__default.IND), (_12_c)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_10_ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(","));
+          })))(ind, _9_cases), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+        }
+      }
+      {
+        if (_source0.is_StmtExpr) {
+          RAST._IExpr _13_stmt = _source0.dtor_stmt;
+          RAST._IExpr _14_rhs = _source0.dtor_rhs;
+          if (((_13_stmt).is_RawExpr) && (((_13_stmt).dtor_content).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))) {
+            return (_14_rhs)._ToString(ind);
+          } else {
+            return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat((_13_stmt)._ToString(ind), (((_13_stmt).NoExtraSemicolonAfter()) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind), (_14_rhs)._ToString(ind));
+          }
+        }
+      }
+      {
+        if (_source0.is_Block) {
+          RAST._IExpr _15_underlying = _source0.dtor_underlying;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{\n"), ind), RAST.__default.IND), (_15_underlying)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+        }
+      }
+      {
+        if (_source0.is_IfExpr) {
+          RAST._IExpr _16_cond = _source0.dtor_cond;
+          RAST._IExpr _17_thn = _source0.dtor_thn;
+          RAST._IExpr _18_els = _source0.dtor_els;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("if "), (_16_cond)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), ind), RAST.__default.IND), (_17_thn)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}")), ((object.Equals(_18_els, RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" else {\n"), ind), RAST.__default.IND), (_18_els)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}")))));
+        }
+      }
+      {
+        if (_source0.is_StructBuild) {
+          RAST._IExpr _19_name = _source0.dtor_underlying;
+          Dafny.ISequence<RAST._IAssignIdentifier> _20_assignments = _source0.dtor_assignments;
+          if (((new BigInteger((_20_assignments).Count)).Sign == 1) && ((((_20_assignments).Select(BigInteger.Zero)).dtor_identifier).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0")))) {
+            return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat((_19_name)._ToString(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" (")), RAST.__default.SeqToString<RAST._IAssignIdentifier>(_20_assignments, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<RAST._IAssignIdentifier>, Func<RAST._IAssignIdentifier, Dafny.ISequence<Dafny.Rune>>>>((_21_ind, _22_assignments) => ((System.Func<RAST._IAssignIdentifier, Dafny.ISequence<Dafny.Rune>>)((_23_assignment) => {
+              return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), _21_ind), RAST.__default.IND), ((_23_assignment).dtor_rhs)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_21_ind, RAST.__default.IND)));
+            })))(ind, _20_assignments), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(","))), (((new BigInteger((_20_assignments).Count)) > (BigInteger.One)) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), ind)) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
+          } else {
+            return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat((_19_name)._ToString(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {")), RAST.__default.SeqToString<RAST._IAssignIdentifier>(_20_assignments, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<RAST._IAssignIdentifier>, Func<RAST._IAssignIdentifier, Dafny.ISequence<Dafny.Rune>>>>((_24_ind, _25_assignments) => ((System.Func<RAST._IAssignIdentifier, Dafny.ISequence<Dafny.Rune>>)((_26_assignment) => {
+              return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), _24_ind), RAST.__default.IND), (_26_assignment)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_24_ind, RAST.__default.IND)));
+            })))(ind, _20_assignments), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(","))), (((new BigInteger((_20_assignments).Count)).Sign == 1) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), ind)) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+          }
+        }
+      }
+      {
+        if (_source0.is_Tuple) {
+          Dafny.ISequence<RAST._IExpr> _27_arguments = _source0.dtor_arguments;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), RAST.__default.SeqToString<RAST._IExpr>(_27_arguments, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<RAST._IExpr>, Func<RAST._IExpr, Dafny.ISequence<Dafny.Rune>>>>((_28_ind, _29_arguments) => ((System.Func<RAST._IExpr, Dafny.ISequence<Dafny.Rune>>)((_30_arg) => {
+            return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), _28_ind), RAST.__default.IND), (_30_arg)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_28_ind, RAST.__default.IND)));
+          })))(ind, _27_arguments), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(","))), (((new BigInteger((_27_arguments).Count)).Sign == 1) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"), ind)) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
+        }
+      }
+      {
+        if (_source0.is_UnaryOp) {
+          Dafny.ISequence<Dafny.Rune> _31_op = _source0.dtor_op1;
+          RAST._IExpr _32_underlying = _source0.dtor_underlying;
+          DAST.Format._IUnaryOpFormat _33_format = _source0.dtor_format;
+          bool _34_isPattern = ((new BigInteger((_31_op).Count)) >= (BigInteger.One)) && (((_31_op).Subsequence(BigInteger.Zero, BigInteger.One)).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{")));
+          bool _35_isUnsafe = (_31_op).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unsafe"));
+          _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs0 = ((((!(_34_isPattern)) && (!(_35_isUnsafe))) && (((this).printingInfo).NeedParenthesesFor((_32_underlying).printingInfo))) ? (_System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"))) : (_System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))));
+          Dafny.ISequence<Dafny.Rune> _36_leftP = _let_tmp_rhs0.dtor__0;
+          Dafny.ISequence<Dafny.Rune> _37_rightP = _let_tmp_rhs0.dtor__1;
+          bool _38_opToRight = (((_31_op).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("?"))) || (((new BigInteger((_31_op).Count)) >= (new BigInteger(2))) && (((_31_op).Subsequence(BigInteger.Zero, new BigInteger(2))).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("/*"))))) || (_34_isPattern);
+          Dafny.ISequence<Dafny.Rune> _39_leftOp = ((_38_opToRight) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (_31_op));
+          Dafny.ISequence<Dafny.Rune> _40_leftOp = (((((_31_op).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&mut"))) || (_35_isUnsafe)) && (!(_36_leftP).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")))) ? (Dafny.Sequence<Dafny.Rune>.Concat(_39_leftOp, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" "))) : (_39_leftOp));
+          Dafny.ISequence<Dafny.Rune> _41_rightOp = ((_38_opToRight) ? (_31_op) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")));
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_40_leftOp, _36_leftP), (_32_underlying)._ToString(ind)), _37_rightP), _41_rightOp);
+        }
+      }
+      {
+        if (_source0.is_TypeAscription) {
+          RAST._IExpr _42_left = _source0.dtor_left;
+          RAST._IType _43_tpe = _source0.dtor_tpe;
+          _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs1 = (this).LeftParentheses(_42_left);
+          Dafny.ISequence<Dafny.Rune> _44_leftLeftP = _let_tmp_rhs1.dtor__0;
+          Dafny.ISequence<Dafny.Rune> _45_leftRightP = _let_tmp_rhs1.dtor__1;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_44_leftLeftP, (_42_left)._ToString(RAST.__default.IND)), _45_leftRightP), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" as ")), (_43_tpe)._ToString(RAST.__default.IND));
+        }
+      }
+      {
+        if (_source0.is_TraitCast) {
+          RAST._IType _46_leftTpe = _source0.dtor_leftTpe;
+          RAST._IType _47_tpe = _source0.dtor_tpe;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), (_46_leftTpe)._ToString(RAST.__default.IND)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" as ")), (_47_tpe)._ToString(RAST.__default.IND)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
+        }
+      }
+      {
+        if (_source0.is_BinaryOp) {
+          Dafny.ISequence<Dafny.Rune> _48_op2 = _source0.dtor_op2;
+          RAST._IExpr _49_left = _source0.dtor_left;
+          RAST._IExpr _50_right = _source0.dtor_right;
+          DAST.Format._IBinaryOpFormat _51_format = _source0.dtor_format2;
+          _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs2 = (this).LeftParentheses(_49_left);
+          Dafny.ISequence<Dafny.Rune> _52_leftLeftP = _let_tmp_rhs2.dtor__0;
+          Dafny.ISequence<Dafny.Rune> _53_leftRighP = _let_tmp_rhs2.dtor__1;
+          _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs3 = (this).RightParentheses(_50_right);
+          Dafny.ISequence<Dafny.Rune> _54_rightLeftP = _let_tmp_rhs3.dtor__0;
+          Dafny.ISequence<Dafny.Rune> _55_rightRightP = _let_tmp_rhs3.dtor__1;
+          Dafny.ISequence<Dafny.Rune> _56_opRendered = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" "), _48_op2), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" "));
+          Dafny.ISequence<Dafny.Rune> _57_indLeft = (((_52_leftLeftP).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("))) ? (Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND)) : (ind));
+          Dafny.ISequence<Dafny.Rune> _58_indRight = (((_54_rightLeftP).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("))) ? (Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND)) : (ind));
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_52_leftLeftP, (_49_left)._ToString(_57_indLeft)), _53_leftRighP), _56_opRendered), _54_rightLeftP), (_50_right)._ToString(_58_indRight)), _55_rightRightP);
+        }
+      }
+      {
+        if (_source0.is_DeclareVar) {
+          RAST._IDeclareType _59_declareType = _source0.dtor_declareType;
+          Dafny.ISequence<Dafny.Rune> _60_name = _source0.dtor_name;
+          Std.Wrappers._IOption<RAST._IType> _61_optType = _source0.dtor_optType;
+          Std.Wrappers._IOption<RAST._IExpr> _62_optExpr = _source0.dtor_optRhs;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("let "), ((object.Equals(_59_declareType, RAST.DeclareType.create_MUT())) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("mut ")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), _60_name), (((_61_optType).is_Some) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": "), ((_61_optType).dtor_value)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND)))) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), (((_62_optExpr).is_Some) ? (Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(((_62_optExpr).dtor_value)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND)), _pat_let20_0 => Dafny.Helpers.Let<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>(_pat_let20_0, _63_optExprString => (((_63_optExprString).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("= /*issue with empty RHS*/"), ((((_62_optExpr).dtor_value).is_RawExpr) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Empty Raw expr")) : (((((_62_optExpr).dtor_value).is_LiteralString) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Empty string literal")) : (((((_62_optExpr).dtor_value).is_LiteralInt) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Empty int literal")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Another case"))))))))) : (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = "), _63_optExprString)))))) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+        }
+      }
+      {
+        if (_source0.is_Assign) {
+          Std.Wrappers._IOption<RAST._IAssignLhs> _64_names = _source0.dtor_names;
+          RAST._IExpr _65_expr = _source0.dtor_rhs;
+          Dafny.ISequence<Dafny.Rune> _66_lhs = ((System.Func<Dafny.ISequence<Dafny.Rune>>)(() => {
+            Std.Wrappers._IOption<RAST._IAssignLhs> _source1 = _64_names;
+            {
+              if (_source1.is_Some) {
+                RAST._IAssignLhs value0 = _source1.dtor_value;
+                if (value0.is_LocalVar) {
+                  Dafny.ISequence<Dafny.Rune> _67_name = value0.dtor_name;
+                  return Dafny.Sequence<Dafny.Rune>.Concat(_67_name, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = "));
+                }
+              }
+            }
+            {
+              if (_source1.is_Some) {
+                RAST._IAssignLhs value1 = _source1.dtor_value;
+                if (value1.is_SelectMember) {
+                  RAST._IExpr _68_member = value1.dtor_on;
+                  Dafny.ISequence<Dafny.Rune> _69_field = value1.dtor_field;
+                  _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs4 = (RAST.Expr.create_Select(_68_member, _69_field)).LeftParentheses(_68_member);
+                  Dafny.ISequence<Dafny.Rune> _70_leftP = _let_tmp_rhs4.dtor__0;
+                  Dafny.ISequence<Dafny.Rune> _71_rightP = _let_tmp_rhs4.dtor__1;
+                  return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_70_leftP, (_68_member)._ToString(ind)), _71_rightP), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".")), _69_field), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = "));
+                }
+              }
+            }
+            {
+              if (_source1.is_Some) {
+                RAST._IAssignLhs value2 = _source1.dtor_value;
+                if (value2.is_ExtractTuple) {
+                  Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _72_names = value2.dtor_names;
+                  return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), RAST.__default.SeqToString<Dafny.ISequence<Dafny.Rune>>(_72_names, ((System.Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>)((_73_name) => {
+                    return _73_name;
+                  })), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(","))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") = "));
+                }
+              }
+            }
+            {
+              if (_source1.is_Some) {
+                RAST._IAssignLhs value3 = _source1.dtor_value;
+                if (value3.is_Index) {
+                  RAST._IExpr _74_e = value3.dtor_expr;
+                  Dafny.ISequence<RAST._IExpr> _75_indices = value3.dtor_indices;
+                  _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs5 = (RAST.Expr.create_Call(_74_e, _75_indices)).LeftParentheses(_74_e);
+                  Dafny.ISequence<Dafny.Rune> _76_leftP = _let_tmp_rhs5.dtor__0;
+                  Dafny.ISequence<Dafny.Rune> _77_rightP = _let_tmp_rhs5.dtor__1;
+                  return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_76_leftP, (_74_e)._ToString(ind)), _77_rightP), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("[")), RAST.__default.SeqToString<RAST._IExpr>(_75_indices, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<RAST._IExpr>, Func<RAST._IExpr, Dafny.ISequence<Dafny.Rune>>>>((_78_ind, _79_indices) => ((System.Func<RAST._IExpr, Dafny.ISequence<Dafny.Rune>>)((_80_index) => {
+                    return (_80_index)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_78_ind, RAST.__default.IND));
+                  })))(ind, _75_indices), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("]["))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("] = "));
+                }
+              }
+            }
+            {
+              return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_ = ");
+            }
+          }))();
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_66_lhs, (_65_expr)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+        }
+      }
+      {
+        if (_source0.is_Labelled) {
+          Dafny.ISequence<Dafny.Rune> _81_name = _source0.dtor_lbl;
+          RAST._IExpr _82_underlying = _source0.dtor_underlying;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("'"), _81_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ")), (_82_underlying)._ToString(ind));
+        }
+      }
+      {
+        if (_source0.is_Break) {
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _83_optLbl = _source0.dtor_optLbl;
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _source2 = _83_optLbl;
+          {
+            if (_source2.is_Some) {
+              Dafny.ISequence<Dafny.Rune> _84_lbl = _source2.dtor_value;
+              return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("break '"), _84_lbl), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+            }
+          }
+          {
+            return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("break;");
+          }
+        }
+      }
+      {
+        if (_source0.is_Continue) {
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _85_optLbl = _source0.dtor_optLbl;
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _source3 = _85_optLbl;
+          {
+            if (_source3.is_Some) {
+              Dafny.ISequence<Dafny.Rune> _86_lbl = _source3.dtor_value;
+              return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("continue '"), _86_lbl), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+            }
+          }
+          {
+            return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("continue;");
+          }
+        }
+      }
+      {
+        if (_source0.is_Loop) {
+          Std.Wrappers._IOption<RAST._IExpr> _87_optCond = _source0.dtor_optCond;
+          RAST._IExpr _88_underlying = _source0.dtor_underlying;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(((System.Func<Dafny.ISequence<Dafny.Rune>>)(() => {
+            Std.Wrappers._IOption<RAST._IExpr> _source4 = _87_optCond;
+            {
+              if (_source4.is_None) {
+                return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("loop");
+              }
+            }
+            {
+              RAST._IExpr _89_c = _source4.dtor_value;
+              return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("while "), (_89_c)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND)));
+            }
+          }))(), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), ind), RAST.__default.IND), (_88_underlying)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+        }
+      }
+      {
+        if (_source0.is_For) {
+          Dafny.ISequence<Dafny.Rune> _90_name = _source0.dtor_name;
+          RAST._IExpr _91_range = _source0.dtor_range;
+          RAST._IExpr _92_body = _source0.dtor_body;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("for "), _90_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" in ")), (_91_range)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), ind), RAST.__default.IND), (_92_body)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+        }
+      }
+      {
+        if (_source0.is_Return) {
+          Std.Wrappers._IOption<RAST._IExpr> _93_optExpr = _source0.dtor_optExpr;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("return"), (((_93_optExpr).is_Some) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" "), ((_93_optExpr).dtor_value)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND)))) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
+        }
+      }
+      {
+        if (_source0.is_CallType) {
+          RAST._IExpr _94_expr = _source0.dtor_obj;
+          Dafny.ISequence<RAST._IType> _95_tpes = _source0.dtor_typeArguments;
+          _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs6 = (this).LeftParentheses(_94_expr);
+          Dafny.ISequence<Dafny.Rune> _96_leftP = _let_tmp_rhs6.dtor__0;
+          Dafny.ISequence<Dafny.Rune> _97_rightP = _let_tmp_rhs6.dtor__1;
+          if ((_95_tpes).Equals(Dafny.Sequence<RAST._IType>.FromElements())) {
+            return (_94_expr)._ToString(ind);
+          } else {
+            return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_96_leftP, (_94_expr)._ToString(ind)), _97_rightP), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::<")), RAST.__default.SeqToString<RAST._IType>(_95_tpes, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>>>((_98_ind) => ((System.Func<RAST._IType, Dafny.ISequence<Dafny.Rune>>)((_99_tpe) => {
+              return (_99_tpe)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_98_ind, RAST.__default.IND));
+            })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
+          }
+        }
+      }
+      {
+        if (_source0.is_Call) {
+          RAST._IExpr _100_expr = _source0.dtor_obj;
+          Dafny.ISequence<RAST._IExpr> _101_args = _source0.dtor_arguments;
+          _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs7 = (this).LeftParentheses(_100_expr);
+          Dafny.ISequence<Dafny.Rune> _102_leftP = _let_tmp_rhs7.dtor__0;
+          Dafny.ISequence<Dafny.Rune> _103_rightP = _let_tmp_rhs7.dtor__1;
+          _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs8 = ((System.Func<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>>)(() => {
+            Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _source5 = (_100_expr).RightMostIdentifier();
+            {
+              bool disjunctiveMatch0 = false;
+              if (_source5.is_Some) {
+                Dafny.ISequence<Dafny.Rune> value4 = _source5.dtor_value;
+                if (object.Equals(value4, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("seq!"))) {
+                  disjunctiveMatch0 = true;
+                }
+              }
+              if (_source5.is_Some) {
+                Dafny.ISequence<Dafny.Rune> value5 = _source5.dtor_value;
+                if (object.Equals(value5, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("map!"))) {
+                  disjunctiveMatch0 = true;
+                }
+              }
+              if (disjunctiveMatch0) {
+                return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("["), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("]"));
+              }
+            }
+            {
+              bool disjunctiveMatch1 = false;
+              if (_source5.is_Some) {
+                Dafny.ISequence<Dafny.Rune> value6 = _source5.dtor_value;
+                if (object.Equals(value6, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("set!"))) {
+                  disjunctiveMatch1 = true;
+                }
+              }
+              if (_source5.is_Some) {
+                Dafny.ISequence<Dafny.Rune> value7 = _source5.dtor_value;
+                if (object.Equals(value7, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("multiset!"))) {
+                  disjunctiveMatch1 = true;
+                }
+              }
+              if (disjunctiveMatch1) {
+                return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+              }
+            }
+            {
+              return _System.Tuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>>.create(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
+            }
+          }))();
+          Dafny.ISequence<Dafny.Rune> _104_leftCallP = _let_tmp_rhs8.dtor__0;
+          Dafny.ISequence<Dafny.Rune> _105_rightCallP = _let_tmp_rhs8.dtor__1;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_102_leftP, (_100_expr)._ToString(ind)), _103_rightP), _104_leftCallP), RAST.__default.SeqToString<RAST._IExpr>(_101_args, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<RAST._IExpr>, Func<RAST._IExpr, Dafny.ISequence<Dafny.Rune>>>>((_106_ind, _107_args) => ((System.Func<RAST._IExpr, Dafny.ISequence<Dafny.Rune>>)((_108_arg) => {
+            return (_108_arg)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(_106_ind, RAST.__default.IND));
+          })))(ind, _101_args), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "))), _105_rightCallP);
+        }
+      }
+      {
+        if (_source0.is_Select) {
+          RAST._IExpr _109_expression = _source0.dtor_obj;
+          Dafny.ISequence<Dafny.Rune> _110_name = _source0.dtor_name;
+          _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs9 = (this).LeftParentheses(_109_expression);
+          Dafny.ISequence<Dafny.Rune> _111_leftP = _let_tmp_rhs9.dtor__0;
+          Dafny.ISequence<Dafny.Rune> _112_rightP = _let_tmp_rhs9.dtor__1;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_111_leftP, (_109_expression)._ToString(ind)), _112_rightP), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".")), _110_name);
+        }
+      }
+      {
+        if (_source0.is_SelectIndex) {
+          RAST._IExpr _113_expression = _source0.dtor_obj;
+          RAST._IExpr _114_range = _source0.dtor_range;
+          _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs10 = (this).LeftParentheses(_113_expression);
+          Dafny.ISequence<Dafny.Rune> _115_leftP = _let_tmp_rhs10.dtor__0;
+          Dafny.ISequence<Dafny.Rune> _116_rightP = _let_tmp_rhs10.dtor__1;
+          Dafny.ISequence<Dafny.Rune> _117_rangeStr = (_114_range)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND));
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_115_leftP, (_113_expression)._ToString(ind)), _116_rightP), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("[")), _117_rangeStr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("]"));
+        }
+      }
+      {
+        if (_source0.is_ExprFromPath) {
+          RAST._IPath _118_path = _source0.dtor_path;
+          return (_118_path)._ToString();
+        }
+      }
+      {
+        if (_source0.is_FunctionSelect) {
+          RAST._IExpr _119_expression = _source0.dtor_obj;
+          Dafny.ISequence<Dafny.Rune> _120_name = _source0.dtor_name;
+          _System._ITuple2<Dafny.ISequence<Dafny.Rune>, Dafny.ISequence<Dafny.Rune>> _let_tmp_rhs11 = (this).LeftParentheses(_119_expression);
+          Dafny.ISequence<Dafny.Rune> _121_leftP = _let_tmp_rhs11.dtor__0;
+          Dafny.ISequence<Dafny.Rune> _122_rightP = _let_tmp_rhs11.dtor__1;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_121_leftP, (_119_expression)._ToString(ind)), _122_rightP), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")), _120_name);
+        }
+      }
+      {
+        if (_source0.is_Lambda) {
+          Dafny.ISequence<RAST._IFormal> _123_params = _source0.dtor_params;
+          Std.Wrappers._IOption<RAST._IType> _124_retType = _source0.dtor_retType;
+          RAST._IExpr _125_body = _source0.dtor_body;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("move |"), RAST.__default.SeqToString<RAST._IFormal>(_123_params, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IFormal, Dafny.ISequence<Dafny.Rune>>>>((_126_ind) => ((System.Func<RAST._IFormal, Dafny.ISequence<Dafny.Rune>>)((_127_arg) => {
+            return (_127_arg)._ToString(_126_ind);
+          })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(","))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("| ")), (((_124_retType).is_Some) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("-> "), ((_124_retType).dtor_value)._ToString(ind))) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), ((((_124_retType).is_Some) && (!((_125_body).is_Block))) ? (Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{\n"), ind), RAST.__default.IND), (_125_body)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"))) : ((_125_body)._ToString(ind))));
+        }
+      }
+      {
+        RAST._IExpr _128_r = _source0;
+        return RAST.__default.AddIndent((_128_r).dtor_content, ind);
+      }
+    }
+    public RAST._IExpr Then(RAST._IExpr rhs2) {
+      if ((this).is_StmtExpr) {
+        return RAST.Expr.create_StmtExpr((this).dtor_stmt, ((this).dtor_rhs).Then(rhs2));
+      } else if (object.Equals(this, RAST.Expr.create_RawExpr(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))) {
+        return rhs2;
+      } else {
+        return RAST.Expr.create_StmtExpr(this, rhs2);
+      }
+    }
+    public RAST._IExpr Sel(Dafny.ISequence<Dafny.Rune> name) {
+      return RAST.Expr.create_Select(this, name);
+    }
+    public RAST._IExpr FSel(Dafny.ISequence<Dafny.Rune> name) {
+      return RAST.Expr.create_FunctionSelect(this, name);
+    }
+    public RAST._IExpr ApplyType(Dafny.ISequence<RAST._IType> typeArguments) {
+      if ((new BigInteger((typeArguments).Count)).Sign == 0) {
+        return this;
+      } else {
+        return RAST.Expr.create_CallType(this, typeArguments);
+      }
+    }
+    public RAST._IExpr ApplyType1(RAST._IType typeArgument) {
+      return RAST.Expr.create_CallType(this, Dafny.Sequence<RAST._IType>.FromElements(typeArgument));
+    }
+    public RAST._IExpr Apply(Dafny.ISequence<RAST._IExpr> arguments) {
+      return RAST.Expr.create_Call(this, arguments);
+    }
+    public RAST._IExpr Apply1(RAST._IExpr argument) {
+      return RAST.Expr.create_Call(this, Dafny.Sequence<RAST._IExpr>.FromElements(argument));
+    }
+    public RAST._IExpr Apply0() {
+      return RAST.Expr.create_Call(this, Dafny.Sequence<RAST._IExpr>.FromElements());
+    }
+    public bool IsLhsIdentifier() {
+      return ((this).is_Identifier) || (((this).is_Call) && (((((((this).dtor_obj).is_ExprFromPath) && (object.Equals(((this).dtor_obj).dtor_path, (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("modify!"))))) && ((new BigInteger(((this).dtor_arguments).Count)) == (BigInteger.One))) && ((((this).dtor_arguments).Select(BigInteger.Zero)).is_Identifier)) || ((((((this).dtor_obj).is_ExprFromPath) && (object.Equals(((this).dtor_obj).dtor_path, (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("md!"))))) && ((new BigInteger(((this).dtor_arguments).Count)) == (BigInteger.One))) && (Dafny.Helpers.Let<RAST._IExpr, bool>(((this).dtor_arguments).Select(BigInteger.Zero), _pat_let21_0 => Dafny.Helpers.Let<RAST._IExpr, bool>(_pat_let21_0, _0_lhs => (((_0_lhs).is_Call) && (((_0_lhs).dtor_obj).is_Select)) && ((((_0_lhs).dtor_obj).dtor_obj).is_Identifier)))))));
+    }
+    public Dafny.ISequence<Dafny.Rune> LhsIdentifierName() {
+      if ((this).is_Identifier) {
+        return (this).dtor_name;
+      } else if ((((this).dtor_obj).is_ExprFromPath) && (object.Equals(((this).dtor_obj).dtor_path, (RAST.__default.dafny__runtime).MSel(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("modify!"))))) {
+        return (((this).dtor_arguments).Select(BigInteger.Zero)).dtor_name;
+      } else {
+        return (((((this).dtor_arguments).Select(BigInteger.Zero)).dtor_obj).dtor_obj).dtor_name;
+      }
+    }
+    public RAST._IExpr Clone() {
+      return (RAST.Expr.create_Select(this, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("clone"))).Apply0();
+    }
+    public bool IsBorrow() {
+      return ((this).is_UnaryOp) && (((this).dtor_op1).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&")));
+    }
+    public RAST._IPrintingInfo printingInfo { get {
+      RAST._IExpr _source0 = this;
+      {
+        if (_source0.is_RawExpr) {
+          return RAST.PrintingInfo.create_UnknownPrecedence();
+        }
+      }
+      {
+        if (_source0.is_ExprFromType) {
+          return RAST.PrintingInfo.create_Precedence(BigInteger.One);
+        }
+      }
+      {
+        if (_source0.is_Identifier) {
+          return RAST.PrintingInfo.create_Precedence(BigInteger.One);
+        }
+      }
+      {
+        if (_source0.is_LiteralInt) {
+          return RAST.PrintingInfo.create_Precedence(BigInteger.One);
+        }
+      }
+      {
+        if (_source0.is_LiteralBool) {
+          return RAST.PrintingInfo.create_Precedence(BigInteger.One);
+        }
+      }
+      {
+        if (_source0.is_LiteralString) {
+          return RAST.PrintingInfo.create_Precedence(BigInteger.One);
+        }
+      }
+      {
+        if (_source0.is_UnaryOp) {
+          Dafny.ISequence<Dafny.Rune> _0_op = _source0.dtor_op1;
+          RAST._IExpr _1_underlying = _source0.dtor_underlying;
+          DAST.Format._IUnaryOpFormat _2_format = _source0.dtor_format;
+          Dafny.ISequence<Dafny.Rune> _source1 = _0_op;
+          {
+            if (object.Equals(_source1, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("?"))) {
+              return RAST.PrintingInfo.create_SuffixPrecedence(new BigInteger(5));
+            }
+          }
+          {
+            bool disjunctiveMatch0 = false;
+            if (object.Equals(_source1, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("-"))) {
+              disjunctiveMatch0 = true;
+            }
+            if (object.Equals(_source1, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*"))) {
+              disjunctiveMatch0 = true;
+            }
+            if (object.Equals(_source1, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!"))) {
+              disjunctiveMatch0 = true;
+            }
+            if (object.Equals(_source1, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"))) {
+              disjunctiveMatch0 = true;
+            }
+            if (object.Equals(_source1, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&mut"))) {
+              disjunctiveMatch0 = true;
+            }
+            if (disjunctiveMatch0) {
+              return RAST.PrintingInfo.create_Precedence(new BigInteger(6));
+            }
+          }
+          {
+            return RAST.PrintingInfo.create_UnknownPrecedence();
+          }
+        }
+      }
+      {
+        if (_source0.is_Select) {
+          RAST._IExpr _3_underlying = _source0.dtor_obj;
+          Dafny.ISequence<Dafny.Rune> _4_name = _source0.dtor_name;
+          return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(2), RAST.Associativity.create_LeftToRight());
+        }
+      }
+      {
+        if (_source0.is_SelectIndex) {
+          RAST._IExpr _5_underlying = _source0.dtor_obj;
+          RAST._IExpr _6_range = _source0.dtor_range;
+          return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(2), RAST.Associativity.create_LeftToRight());
+        }
+      }
+      {
+        if (_source0.is_ExprFromPath) {
+          RAST._IPath _7_underlying = _source0.dtor_path;
+          return RAST.PrintingInfo.create_Precedence(new BigInteger(2));
+        }
+      }
+      {
+        if (_source0.is_FunctionSelect) {
+          RAST._IExpr _8_underlying = _source0.dtor_obj;
+          Dafny.ISequence<Dafny.Rune> _9_name = _source0.dtor_name;
+          return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(2), RAST.Associativity.create_LeftToRight());
+        }
+      }
+      {
+        if (_source0.is_CallType) {
+          return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(2), RAST.Associativity.create_LeftToRight());
+        }
+      }
+      {
+        if (_source0.is_Call) {
+          return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(2), RAST.Associativity.create_LeftToRight());
+        }
+      }
+      {
+        if (_source0.is_TypeAscription) {
+          RAST._IExpr _10_left = _source0.dtor_left;
+          RAST._IType _11_tpe = _source0.dtor_tpe;
+          return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(10), RAST.Associativity.create_LeftToRight());
+        }
+      }
+      {
+        if (_source0.is_TraitCast) {
+          RAST._IType _12_leftTpe = _source0.dtor_leftTpe;
+          RAST._IType _13_tpe = _source0.dtor_tpe;
+          return RAST.PrintingInfo.create_Precedence(BigInteger.One);
+        }
+      }
+      {
+        if (_source0.is_BinaryOp) {
+          Dafny.ISequence<Dafny.Rune> _14_op2 = _source0.dtor_op2;
+          RAST._IExpr _15_left = _source0.dtor_left;
+          RAST._IExpr _16_right = _source0.dtor_right;
+          DAST.Format._IBinaryOpFormat _17_format = _source0.dtor_format2;
+          Dafny.ISequence<Dafny.Rune> _source2 = _14_op2;
+          {
+            bool disjunctiveMatch1 = false;
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*"))) {
+              disjunctiveMatch1 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("/"))) {
+              disjunctiveMatch1 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("%"))) {
+              disjunctiveMatch1 = true;
+            }
+            if (disjunctiveMatch1) {
+              return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(20), RAST.Associativity.create_LeftToRight());
+            }
+          }
+          {
+            bool disjunctiveMatch2 = false;
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("+"))) {
+              disjunctiveMatch2 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("-"))) {
+              disjunctiveMatch2 = true;
+            }
+            if (disjunctiveMatch2) {
+              return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(30), RAST.Associativity.create_LeftToRight());
+            }
+          }
+          {
+            bool disjunctiveMatch3 = false;
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<<"))) {
+              disjunctiveMatch3 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">>"))) {
+              disjunctiveMatch3 = true;
+            }
+            if (disjunctiveMatch3) {
+              if ((((_14_op2).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<<"))) && ((_15_left).is_TypeAscription)) && (((_15_left).dtor_tpe).EndsWithNameThatCanAcceptGenerics())) {
+                return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(9), RAST.Associativity.create_LeftToRight());
+              } else {
+                return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(40), RAST.Associativity.create_LeftToRight());
+              }
+            }
+          }
+          {
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"))) {
+              return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(50), RAST.Associativity.create_LeftToRight());
+            }
+          }
+          {
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("^"))) {
+              return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(60), RAST.Associativity.create_LeftToRight());
+            }
+          }
+          {
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("|"))) {
+              return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(70), RAST.Associativity.create_LeftToRight());
+            }
+          }
+          {
+            bool disjunctiveMatch4 = false;
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("=="))) {
+              disjunctiveMatch4 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!="))) {
+              disjunctiveMatch4 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"))) {
+              disjunctiveMatch4 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"))) {
+              disjunctiveMatch4 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<="))) {
+              disjunctiveMatch4 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">="))) {
+              disjunctiveMatch4 = true;
+            }
+            if (disjunctiveMatch4) {
+              if (((((_14_op2).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"))) || ((_14_op2).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<=")))) && ((_15_left).is_TypeAscription)) && (((_15_left).dtor_tpe).EndsWithNameThatCanAcceptGenerics())) {
+                return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(9), RAST.Associativity.create_LeftToRight());
+              } else {
+                return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(80), RAST.Associativity.create_RequiresParentheses());
+              }
+            }
+          }
+          {
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&&"))) {
+              return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(90), RAST.Associativity.create_LeftToRight());
+            }
+          }
+          {
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("||"))) {
+              return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(100), RAST.Associativity.create_LeftToRight());
+            }
+          }
+          {
+            bool disjunctiveMatch5 = false;
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".."))) {
+              disjunctiveMatch5 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("..="))) {
+              disjunctiveMatch5 = true;
+            }
+            if (disjunctiveMatch5) {
+              return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RequiresParentheses());
+            }
+          }
+          {
+            bool disjunctiveMatch6 = false;
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("+="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("-="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("*="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("/="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("%="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("|="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("^="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<<="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (object.Equals(_source2, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">>="))) {
+              disjunctiveMatch6 = true;
+            }
+            if (disjunctiveMatch6) {
+              if ((((_14_op2).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<<="))) && ((_15_left).is_TypeAscription)) && (((_15_left).dtor_tpe).EndsWithNameThatCanAcceptGenerics())) {
+                return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(9), RAST.Associativity.create_LeftToRight());
+              } else {
+                return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(110), RAST.Associativity.create_RightToLeft());
+              }
+            }
+          }
+          {
+            return RAST.PrintingInfo.create_PrecedenceAssociativity(BigInteger.Zero, RAST.Associativity.create_RequiresParentheses());
+          }
+        }
+      }
+      {
+        if (_source0.is_Lambda) {
+          return RAST.PrintingInfo.create_PrecedenceAssociativity(new BigInteger(300), RAST.Associativity.create_LeftToRight());
+        }
+      }
+      {
+        return RAST.PrintingInfo.create_UnknownPrecedence();
+      }
+    } }
+  }
+  public class Expr_RawExpr : Expr {
+    public readonly Dafny.ISequence<Dafny.Rune> _content;
+    public Expr_RawExpr(Dafny.ISequence<Dafny.Rune> content) : base() {
+      this._content = content;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_RawExpr(_content);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_RawExpr;
+      return oth != null && object.Equals(this._content, oth._content);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._content));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.RawExpr";
+      s += "(";
+      s += this._content.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_ExprFromType : Expr {
+    public readonly RAST._IType _tpe;
+    public Expr_ExprFromType(RAST._IType tpe) : base() {
+      this._tpe = tpe;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_ExprFromType(_tpe);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_ExprFromType;
+      return oth != null && object.Equals(this._tpe, oth._tpe);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.ExprFromType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Identifier : Expr {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public Expr_Identifier(Dafny.ISequence<Dafny.Rune> name) : base() {
+      this._name = name;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Identifier(_name);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Identifier;
+      return oth != null && object.Equals(this._name, oth._name);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 2;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Identifier";
+      s += "(";
+      s += this._name.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Match : Expr {
+    public readonly RAST._IExpr _matchee;
+    public readonly Dafny.ISequence<RAST._IMatchCase> _cases;
+    public Expr_Match(RAST._IExpr matchee, Dafny.ISequence<RAST._IMatchCase> cases) : base() {
+      this._matchee = matchee;
+      this._cases = cases;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Match(_matchee, _cases);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Match;
+      return oth != null && object.Equals(this._matchee, oth._matchee) && object.Equals(this._cases, oth._cases);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 3;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._matchee));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._cases));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Match";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._matchee);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._cases);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_StmtExpr : Expr {
+    public readonly RAST._IExpr _stmt;
+    public readonly RAST._IExpr _rhs;
+    public Expr_StmtExpr(RAST._IExpr stmt, RAST._IExpr rhs) : base() {
+      this._stmt = stmt;
+      this._rhs = rhs;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_StmtExpr(_stmt, _rhs);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_StmtExpr;
+      return oth != null && object.Equals(this._stmt, oth._stmt) && object.Equals(this._rhs, oth._rhs);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 4;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._stmt));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._rhs));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.StmtExpr";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._stmt);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._rhs);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Block : Expr {
+    public readonly RAST._IExpr _underlying;
+    public Expr_Block(RAST._IExpr underlying) : base() {
+      this._underlying = underlying;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Block(_underlying);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Block;
+      return oth != null && object.Equals(this._underlying, oth._underlying);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 5;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._underlying));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Block";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._underlying);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_StructBuild : Expr {
+    public readonly RAST._IExpr _underlying;
+    public readonly Dafny.ISequence<RAST._IAssignIdentifier> _assignments;
+    public Expr_StructBuild(RAST._IExpr underlying, Dafny.ISequence<RAST._IAssignIdentifier> assignments) : base() {
+      this._underlying = underlying;
+      this._assignments = assignments;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_StructBuild(_underlying, _assignments);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_StructBuild;
+      return oth != null && object.Equals(this._underlying, oth._underlying) && object.Equals(this._assignments, oth._assignments);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 6;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._underlying));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._assignments));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.StructBuild";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._underlying);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._assignments);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Tuple : Expr {
+    public readonly Dafny.ISequence<RAST._IExpr> _arguments;
+    public Expr_Tuple(Dafny.ISequence<RAST._IExpr> arguments) : base() {
+      this._arguments = arguments;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Tuple(_arguments);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Tuple;
+      return oth != null && object.Equals(this._arguments, oth._arguments);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 7;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._arguments));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Tuple";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._arguments);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_UnaryOp : Expr {
+    public readonly Dafny.ISequence<Dafny.Rune> _op1;
+    public readonly RAST._IExpr _underlying;
+    public readonly DAST.Format._IUnaryOpFormat _format;
+    public Expr_UnaryOp(Dafny.ISequence<Dafny.Rune> op1, RAST._IExpr underlying, DAST.Format._IUnaryOpFormat format) : base() {
+      this._op1 = op1;
+      this._underlying = underlying;
+      this._format = format;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_UnaryOp(_op1, _underlying, _format);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_UnaryOp;
+      return oth != null && object.Equals(this._op1, oth._op1) && object.Equals(this._underlying, oth._underlying) && object.Equals(this._format, oth._format);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 8;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._op1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._underlying));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._format));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.UnaryOp";
+      s += "(";
+      s += this._op1.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._underlying);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._format);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_BinaryOp : Expr {
+    public readonly Dafny.ISequence<Dafny.Rune> _op2;
+    public readonly RAST._IExpr _left;
+    public readonly RAST._IExpr _right;
+    public readonly DAST.Format._IBinaryOpFormat _format2;
+    public Expr_BinaryOp(Dafny.ISequence<Dafny.Rune> op2, RAST._IExpr left, RAST._IExpr right, DAST.Format._IBinaryOpFormat format2) : base() {
+      this._op2 = op2;
+      this._left = left;
+      this._right = right;
+      this._format2 = format2;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_BinaryOp(_op2, _left, _right, _format2);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_BinaryOp;
+      return oth != null && object.Equals(this._op2, oth._op2) && object.Equals(this._left, oth._left) && object.Equals(this._right, oth._right) && object.Equals(this._format2, oth._format2);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 9;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._op2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._left));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._right));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._format2));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.BinaryOp";
+      s += "(";
+      s += this._op2.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._left);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._right);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._format2);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_TypeAscription : Expr {
+    public readonly RAST._IExpr _left;
+    public readonly RAST._IType _tpe;
+    public Expr_TypeAscription(RAST._IExpr left, RAST._IType tpe) : base() {
+      this._left = left;
+      this._tpe = tpe;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_TypeAscription(_left, _tpe);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_TypeAscription;
+      return oth != null && object.Equals(this._left, oth._left) && object.Equals(this._tpe, oth._tpe);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 10;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._left));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.TypeAscription";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._left);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_TraitCast : Expr {
+    public readonly RAST._IType _leftTpe;
+    public readonly RAST._IType _tpe;
+    public Expr_TraitCast(RAST._IType leftTpe, RAST._IType tpe) : base() {
+      this._leftTpe = leftTpe;
+      this._tpe = tpe;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_TraitCast(_leftTpe, _tpe);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_TraitCast;
+      return oth != null && object.Equals(this._leftTpe, oth._leftTpe) && object.Equals(this._tpe, oth._tpe);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 11;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._leftTpe));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._tpe));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.TraitCast";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._leftTpe);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._tpe);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_LiteralInt : Expr {
+    public readonly Dafny.ISequence<Dafny.Rune> _value;
+    public Expr_LiteralInt(Dafny.ISequence<Dafny.Rune> @value) : base() {
+      this._value = @value;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_LiteralInt(_value);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_LiteralInt;
+      return oth != null && object.Equals(this._value, oth._value);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 12;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.LiteralInt";
+      s += "(";
+      s += this._value.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_LiteralBool : Expr {
+    public readonly bool _bvalue;
+    public Expr_LiteralBool(bool bvalue) : base() {
+      this._bvalue = bvalue;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_LiteralBool(_bvalue);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_LiteralBool;
+      return oth != null && this._bvalue == oth._bvalue;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 13;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._bvalue));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.LiteralBool";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._bvalue);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_LiteralString : Expr {
+    public readonly Dafny.ISequence<Dafny.Rune> _value;
+    public readonly bool _binary;
+    public readonly bool _verbatim;
+    public Expr_LiteralString(Dafny.ISequence<Dafny.Rune> @value, bool binary, bool verbatim) : base() {
+      this._value = @value;
+      this._binary = binary;
+      this._verbatim = verbatim;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_LiteralString(_value, _binary, _verbatim);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_LiteralString;
+      return oth != null && object.Equals(this._value, oth._value) && this._binary == oth._binary && this._verbatim == oth._verbatim;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 14;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._binary));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._verbatim));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.LiteralString";
+      s += "(";
+      s += this._value.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._binary);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._verbatim);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_DeclareVar : Expr {
+    public readonly RAST._IDeclareType _declareType;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Std.Wrappers._IOption<RAST._IType> _optType;
+    public readonly Std.Wrappers._IOption<RAST._IExpr> _optRhs;
+    public Expr_DeclareVar(RAST._IDeclareType declareType, Dafny.ISequence<Dafny.Rune> name, Std.Wrappers._IOption<RAST._IType> optType, Std.Wrappers._IOption<RAST._IExpr> optRhs) : base() {
+      this._declareType = declareType;
+      this._name = name;
+      this._optType = optType;
+      this._optRhs = optRhs;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_DeclareVar(_declareType, _name, _optType, _optRhs);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_DeclareVar;
+      return oth != null && object.Equals(this._declareType, oth._declareType) && object.Equals(this._name, oth._name) && object.Equals(this._optType, oth._optType) && object.Equals(this._optRhs, oth._optRhs);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 15;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._declareType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._optType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._optRhs));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.DeclareVar";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._declareType);
+      s += ", ";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._optType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._optRhs);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Assign : Expr {
+    public readonly Std.Wrappers._IOption<RAST._IAssignLhs> _names;
+    public readonly RAST._IExpr _rhs;
+    public Expr_Assign(Std.Wrappers._IOption<RAST._IAssignLhs> names, RAST._IExpr rhs) : base() {
+      this._names = names;
+      this._rhs = rhs;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Assign(_names, _rhs);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Assign;
+      return oth != null && object.Equals(this._names, oth._names) && object.Equals(this._rhs, oth._rhs);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 16;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._names));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._rhs));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Assign";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._names);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._rhs);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_IfExpr : Expr {
+    public readonly RAST._IExpr _cond;
+    public readonly RAST._IExpr _thn;
+    public readonly RAST._IExpr _els;
+    public Expr_IfExpr(RAST._IExpr cond, RAST._IExpr thn, RAST._IExpr els) : base() {
+      this._cond = cond;
+      this._thn = thn;
+      this._els = els;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_IfExpr(_cond, _thn, _els);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_IfExpr;
+      return oth != null && object.Equals(this._cond, oth._cond) && object.Equals(this._thn, oth._thn) && object.Equals(this._els, oth._els);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 17;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._cond));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._thn));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._els));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.IfExpr";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._cond);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._thn);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._els);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Loop : Expr {
+    public readonly Std.Wrappers._IOption<RAST._IExpr> _optCond;
+    public readonly RAST._IExpr _underlying;
+    public Expr_Loop(Std.Wrappers._IOption<RAST._IExpr> optCond, RAST._IExpr underlying) : base() {
+      this._optCond = optCond;
+      this._underlying = underlying;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Loop(_optCond, _underlying);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Loop;
+      return oth != null && object.Equals(this._optCond, oth._optCond) && object.Equals(this._underlying, oth._underlying);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 18;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._optCond));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._underlying));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Loop";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._optCond);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._underlying);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_For : Expr {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly RAST._IExpr _range;
+    public readonly RAST._IExpr _body;
+    public Expr_For(Dafny.ISequence<Dafny.Rune> name, RAST._IExpr range, RAST._IExpr body) : base() {
+      this._name = name;
+      this._range = range;
+      this._body = body;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_For(_name, _range, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_For;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._range, oth._range) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 19;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._range));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.For";
+      s += "(";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._range);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Labelled : Expr {
+    public readonly Dafny.ISequence<Dafny.Rune> _lbl;
+    public readonly RAST._IExpr _underlying;
+    public Expr_Labelled(Dafny.ISequence<Dafny.Rune> lbl, RAST._IExpr underlying) : base() {
+      this._lbl = lbl;
+      this._underlying = underlying;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Labelled(_lbl, _underlying);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Labelled;
+      return oth != null && object.Equals(this._lbl, oth._lbl) && object.Equals(this._underlying, oth._underlying);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 20;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._lbl));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._underlying));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Labelled";
+      s += "(";
+      s += this._lbl.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._underlying);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Break : Expr {
+    public readonly Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _optLbl;
+    public Expr_Break(Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> optLbl) : base() {
+      this._optLbl = optLbl;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Break(_optLbl);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Break;
+      return oth != null && object.Equals(this._optLbl, oth._optLbl);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 21;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._optLbl));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Break";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._optLbl);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Continue : Expr {
+    public readonly Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _optLbl;
+    public Expr_Continue(Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> optLbl) : base() {
+      this._optLbl = optLbl;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Continue(_optLbl);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Continue;
+      return oth != null && object.Equals(this._optLbl, oth._optLbl);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 22;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._optLbl));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Continue";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._optLbl);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Return : Expr {
+    public readonly Std.Wrappers._IOption<RAST._IExpr> _optExpr;
+    public Expr_Return(Std.Wrappers._IOption<RAST._IExpr> optExpr) : base() {
+      this._optExpr = optExpr;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Return(_optExpr);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Return;
+      return oth != null && object.Equals(this._optExpr, oth._optExpr);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 23;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._optExpr));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Return";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._optExpr);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_CallType : Expr {
+    public readonly RAST._IExpr _obj;
+    public readonly Dafny.ISequence<RAST._IType> _typeArguments;
+    public Expr_CallType(RAST._IExpr obj, Dafny.ISequence<RAST._IType> typeArguments) : base() {
+      this._obj = obj;
+      this._typeArguments = typeArguments;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_CallType(_obj, _typeArguments);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_CallType;
+      return oth != null && object.Equals(this._obj, oth._obj) && object.Equals(this._typeArguments, oth._typeArguments);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 24;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._obj));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeArguments));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.CallType";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._obj);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeArguments);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Call : Expr {
+    public readonly RAST._IExpr _obj;
+    public readonly Dafny.ISequence<RAST._IExpr> _arguments;
+    public Expr_Call(RAST._IExpr obj, Dafny.ISequence<RAST._IExpr> arguments) : base() {
+      this._obj = obj;
+      this._arguments = arguments;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Call(_obj, _arguments);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Call;
+      return oth != null && object.Equals(this._obj, oth._obj) && object.Equals(this._arguments, oth._arguments);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 25;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._obj));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._arguments));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Call";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._obj);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._arguments);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Select : Expr {
+    public readonly RAST._IExpr _obj;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public Expr_Select(RAST._IExpr obj, Dafny.ISequence<Dafny.Rune> name) : base() {
+      this._obj = obj;
+      this._name = name;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Select(_obj, _name);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Select;
+      return oth != null && object.Equals(this._obj, oth._obj) && object.Equals(this._name, oth._name);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 26;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._obj));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Select";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._obj);
+      s += ", ";
+      s += this._name.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_SelectIndex : Expr {
+    public readonly RAST._IExpr _obj;
+    public readonly RAST._IExpr _range;
+    public Expr_SelectIndex(RAST._IExpr obj, RAST._IExpr range) : base() {
+      this._obj = obj;
+      this._range = range;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_SelectIndex(_obj, _range);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_SelectIndex;
+      return oth != null && object.Equals(this._obj, oth._obj) && object.Equals(this._range, oth._range);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 27;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._obj));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._range));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.SelectIndex";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._obj);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._range);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_ExprFromPath : Expr {
+    public readonly RAST._IPath _path;
+    public Expr_ExprFromPath(RAST._IPath path) : base() {
+      this._path = path;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_ExprFromPath(_path);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_ExprFromPath;
+      return oth != null && object.Equals(this._path, oth._path);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 28;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._path));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.ExprFromPath";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._path);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_FunctionSelect : Expr {
+    public readonly RAST._IExpr _obj;
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public Expr_FunctionSelect(RAST._IExpr obj, Dafny.ISequence<Dafny.Rune> name) : base() {
+      this._obj = obj;
+      this._name = name;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_FunctionSelect(_obj, _name);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_FunctionSelect;
+      return oth != null && object.Equals(this._obj, oth._obj) && object.Equals(this._name, oth._name);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 29;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._obj));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.FunctionSelect";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._obj);
+      s += ", ";
+      s += this._name.ToVerbatimString(true);
+      s += ")";
+      return s;
+    }
+  }
+  public class Expr_Lambda : Expr {
+    public readonly Dafny.ISequence<RAST._IFormal> _params;
+    public readonly Std.Wrappers._IOption<RAST._IType> _retType;
+    public readonly RAST._IExpr _body;
+    public Expr_Lambda(Dafny.ISequence<RAST._IFormal> @params, Std.Wrappers._IOption<RAST._IType> retType, RAST._IExpr body) : base() {
+      this._params = @params;
+      this._retType = retType;
+      this._body = body;
+    }
+    public override _IExpr DowncastClone() {
+      if (this is _IExpr dt) { return dt; }
+      return new Expr_Lambda(_params, _retType, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Expr_Lambda;
+      return oth != null && object.Equals(this._params, oth._params) && object.Equals(this._retType, oth._retType) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 30;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._params));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._retType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Expr.Lambda";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._params);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._retType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IFn {
+    bool is_Fn { get; }
+    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
+    Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams { get; }
+    Dafny.ISequence<RAST._IFormal> dtor_formals { get; }
+    Std.Wrappers._IOption<RAST._IType> dtor_returnType { get; }
+    Std.Wrappers._IOption<RAST._IExpr> dtor_body { get; }
+    _IFn DowncastClone();
+    Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind);
+  }
+  public class Fn : _IFn {
+    public readonly Dafny.ISequence<Dafny.Rune> _name;
+    public readonly Dafny.ISequence<RAST._ITypeParamDecl> _typeParams;
+    public readonly Dafny.ISequence<RAST._IFormal> _formals;
+    public readonly Std.Wrappers._IOption<RAST._IType> _returnType;
+    public readonly Std.Wrappers._IOption<RAST._IExpr> _body;
+    public Fn(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, Dafny.ISequence<RAST._IFormal> formals, Std.Wrappers._IOption<RAST._IType> returnType, Std.Wrappers._IOption<RAST._IExpr> body) {
+      this._name = name;
+      this._typeParams = typeParams;
+      this._formals = formals;
+      this._returnType = returnType;
+      this._body = body;
+    }
+    public _IFn DowncastClone() {
+      if (this is _IFn dt) { return dt; }
+      return new Fn(_name, _typeParams, _formals, _returnType, _body);
+    }
+    public override bool Equals(object other) {
+      var oth = other as RAST.Fn;
+      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._formals, oth._formals) && object.Equals(this._returnType, oth._returnType) && object.Equals(this._body, oth._body);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._formals));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._returnType));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "RAST.Fn.Fn";
+      s += "(";
+      s += this._name.ToVerbatimString(true);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._typeParams);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._formals);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._returnType);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this._body);
+      s += ")";
+      return s;
+    }
+    private static readonly RAST._IFn theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<RAST._ITypeParamDecl>.Empty, Dafny.Sequence<RAST._IFormal>.Empty, Std.Wrappers.Option<RAST._IType>.Default(), Std.Wrappers.Option<RAST._IExpr>.Default());
+    public static RAST._IFn Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<RAST._IFn> _TYPE = new Dafny.TypeDescriptor<RAST._IFn>(RAST.Fn.Default());
+    public static Dafny.TypeDescriptor<RAST._IFn> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _IFn create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, Dafny.ISequence<RAST._IFormal> formals, Std.Wrappers._IOption<RAST._IType> returnType, Std.Wrappers._IOption<RAST._IExpr> body) {
+      return new Fn(name, typeParams, formals, returnType, body);
+    }
+    public static _IFn create_Fn(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<RAST._ITypeParamDecl> typeParams, Dafny.ISequence<RAST._IFormal> formals, Std.Wrappers._IOption<RAST._IType> returnType, Std.Wrappers._IOption<RAST._IExpr> body) {
+      return create(name, typeParams, formals, returnType, body);
+    }
+    public bool is_Fn { get { return true; } }
+    public Dafny.ISequence<Dafny.Rune> dtor_name {
+      get {
+        return this._name;
+      }
+    }
+    public Dafny.ISequence<RAST._ITypeParamDecl> dtor_typeParams {
+      get {
+        return this._typeParams;
+      }
+    }
+    public Dafny.ISequence<RAST._IFormal> dtor_formals {
+      get {
+        return this._formals;
+      }
+    }
+    public Std.Wrappers._IOption<RAST._IType> dtor_returnType {
+      get {
+        return this._returnType;
+      }
+    }
+    public Std.Wrappers._IOption<RAST._IExpr> dtor_body {
+      get {
+        return this._body;
+      }
+    }
+    public Dafny.ISequence<Dafny.Rune> _ToString(Dafny.ISequence<Dafny.Rune> ind) {
+      return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fn "), (this).dtor_name), RAST.TypeParamDecl.ToStringMultiple((this).dtor_typeParams, ind)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), RAST.__default.SeqToString<RAST._IFormal>((this).dtor_formals, Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, Func<RAST._IFormal, Dafny.ISequence<Dafny.Rune>>>>((_0_ind) => ((System.Func<RAST._IFormal, Dafny.ISequence<Dafny.Rune>>)((_1_formal) => {
+        return (_1_formal)._ToString(_0_ind);
+      })))(ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")")), ((System.Func<Dafny.ISequence<Dafny.Rune>>)(() => {
+        Std.Wrappers._IOption<RAST._IType> _source0 = (this).dtor_returnType;
+        {
+          if (_source0.is_Some) {
+            RAST._IType _2_t = _source0.dtor_value;
+            return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" -> "), (_2_t)._ToString(ind));
+          }
+        }
+        {
+          return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+        }
+      }))()), ((System.Func<Dafny.ISequence<Dafny.Rune>>)(() => {
+        Std.Wrappers._IOption<RAST._IExpr> _source1 = (this).dtor_body;
+        {
+          if (_source1.is_None) {
+            return Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";");
+          }
+        }
+        {
+          RAST._IExpr _3_body = _source1.dtor_value;
+          return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n"), ind), RAST.__default.IND), (_3_body)._ToString(Dafny.Sequence<Dafny.Rune>.Concat(ind, RAST.__default.IND))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), ind), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
+        }
+      }))());
+    }
+  }
+} // end of namespace RAST
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/ResolvedDesugaredExecutableDafnyPlugin.cs b/Source/DafnyCore/GeneratedFromDafny/ResolvedDesugaredExecutableDafnyPlugin.cs
new file mode 100644
index 00000000000..b6eb208ee5b
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/ResolvedDesugaredExecutableDafnyPlugin.cs
@@ -0,0 +1,36 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace ResolvedDesugaredExecutableDafnyPlugin {
+
+
+  public partial class COMP {
+    public COMP() {
+    }
+    public static Dafny.ISequence<Dafny.Rune> Compile(Dafny.ISequence<DAST._IModule> p)
+    {
+      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
+      Dafny.ISequence<Dafny.Rune> _out0;
+      _out0 = D2DPrettyPrinter.__default.PrettyPrint(p);
+      s = _out0;
+      return s;
+    }
+    public static Dafny.ISequence<Dafny.Rune> EmitCallToMain(DAST._IExpression fullName)
+    {
+      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
+      s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
+      return s;
+    }
+  }
+} // end of namespace ResolvedDesugaredExecutableDafnyPlugin
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_DivInternals.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_DivInternals.cs
new file mode 100644
index 00000000000..cf1aa8ccbe0
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_DivInternals.cs
@@ -0,0 +1,49 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.DivInternals {
+
+  public partial class __default {
+    public static BigInteger DivPos(BigInteger x, BigInteger d)
+    {
+      BigInteger _0___accumulator = BigInteger.Zero;
+    TAIL_CALL_START: ;
+      if ((x).Sign == -1) {
+        _0___accumulator = (_0___accumulator) + (new BigInteger(-1));
+        BigInteger _in0 = (x) + (d);
+        BigInteger _in1 = d;
+        x = _in0;
+        d = _in1;
+        goto TAIL_CALL_START;
+      } else if ((x) < (d)) {
+        return (BigInteger.Zero) + (_0___accumulator);
+      } else {
+        _0___accumulator = (_0___accumulator) + (BigInteger.One);
+        BigInteger _in2 = (x) - (d);
+        BigInteger _in3 = d;
+        x = _in2;
+        d = _in3;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static BigInteger DivRecursive(BigInteger x, BigInteger d)
+    {
+      if ((d).Sign == 1) {
+        return Std.Arithmetic.DivInternals.__default.DivPos(x, d);
+      } else {
+        return (new BigInteger(-1)) * (Std.Arithmetic.DivInternals.__default.DivPos(x, (new BigInteger(-1)) * (d)));
+      }
+    }
+  }
+} // end of namespace Std.Arithmetic.DivInternals
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_DivInternalsNonlinear.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_DivInternalsNonlinear.cs
new file mode 100644
index 00000000000..317eb9149b8
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_DivInternalsNonlinear.cs
@@ -0,0 +1,17 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.DivInternalsNonlinear {
+
+} // end of namespace Std.Arithmetic.DivInternalsNonlinear
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_DivMod.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_DivMod.cs
new file mode 100644
index 00000000000..75a36f1e97b
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_DivMod.cs
@@ -0,0 +1,23 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.DivMod {
+
+  public partial class __default {
+    public static bool MultiplesVanish(BigInteger a, BigInteger b, BigInteger m)
+    {
+      return (Dafny.Helpers.EuclideanModulus(((m) * (a)) + (b), m)) == (Dafny.Helpers.EuclideanModulus(b, m));
+    }
+  }
+} // end of namespace Std.Arithmetic.DivMod
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_GeneralInternals.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_GeneralInternals.cs
new file mode 100644
index 00000000000..189d7f348bb
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_GeneralInternals.cs
@@ -0,0 +1,17 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.GeneralInternals {
+
+} // end of namespace Std.Arithmetic.GeneralInternals
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Logarithm.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Logarithm.cs
new file mode 100644
index 00000000000..081f1d7848c
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Logarithm.cs
@@ -0,0 +1,34 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.Logarithm {
+
+  public partial class __default {
+    public static BigInteger Log(BigInteger @base, BigInteger pow)
+    {
+      BigInteger _0___accumulator = BigInteger.Zero;
+    TAIL_CALL_START: ;
+      if ((pow) < (@base)) {
+        return (BigInteger.Zero) + (_0___accumulator);
+      } else {
+        _0___accumulator = (_0___accumulator) + (BigInteger.One);
+        BigInteger _in0 = @base;
+        BigInteger _in1 = Dafny.Helpers.EuclideanDivision(pow, @base);
+        @base = _in0;
+        pow = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+  }
+} // end of namespace Std.Arithmetic.Logarithm
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_ModInternals.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_ModInternals.cs
new file mode 100644
index 00000000000..5b8f8865153
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_ModInternals.cs
@@ -0,0 +1,38 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.ModInternals {
+
+  public partial class __default {
+    public static BigInteger ModRecursive(BigInteger x, BigInteger d)
+    {
+    TAIL_CALL_START: ;
+      if ((x).Sign == -1) {
+        BigInteger _in0 = (d) + (x);
+        BigInteger _in1 = d;
+        x = _in0;
+        d = _in1;
+        goto TAIL_CALL_START;
+      } else if ((x) < (d)) {
+        return x;
+      } else {
+        BigInteger _in2 = (x) - (d);
+        BigInteger _in3 = d;
+        x = _in2;
+        d = _in3;
+        goto TAIL_CALL_START;
+      }
+    }
+  }
+} // end of namespace Std.Arithmetic.ModInternals
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_ModInternalsNonlinear.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_ModInternalsNonlinear.cs
new file mode 100644
index 00000000000..7643658879a
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_ModInternalsNonlinear.cs
@@ -0,0 +1,17 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.ModInternalsNonlinear {
+
+} // end of namespace Std.Arithmetic.ModInternalsNonlinear
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Mul.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Mul.cs
new file mode 100644
index 00000000000..fe0b79e122a
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Mul.cs
@@ -0,0 +1,17 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.Mul {
+
+} // end of namespace Std.Arithmetic.Mul
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_MulInternals.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_MulInternals.cs
new file mode 100644
index 00000000000..9d4cccdf0cc
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_MulInternals.cs
@@ -0,0 +1,42 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.MulInternals {
+
+  public partial class __default {
+    public static BigInteger MulPos(BigInteger x, BigInteger y)
+    {
+      BigInteger _0___accumulator = BigInteger.Zero;
+    TAIL_CALL_START: ;
+      if ((x).Sign == 0) {
+        return (BigInteger.Zero) + (_0___accumulator);
+      } else {
+        _0___accumulator = (_0___accumulator) + (y);
+        BigInteger _in0 = (x) - (BigInteger.One);
+        BigInteger _in1 = y;
+        x = _in0;
+        y = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static BigInteger MulRecursive(BigInteger x, BigInteger y)
+    {
+      if ((x).Sign != -1) {
+        return Std.Arithmetic.MulInternals.__default.MulPos(x, y);
+      } else {
+        return (new BigInteger(-1)) * (Std.Arithmetic.MulInternals.__default.MulPos((new BigInteger(-1)) * (x), y));
+      }
+    }
+  }
+} // end of namespace Std.Arithmetic.MulInternals
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_MulInternalsNonlinear.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_MulInternalsNonlinear.cs
new file mode 100644
index 00000000000..58e0b3e074c
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_MulInternalsNonlinear.cs
@@ -0,0 +1,17 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.MulInternalsNonlinear {
+
+} // end of namespace Std.Arithmetic.MulInternalsNonlinear
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Power.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Power.cs
new file mode 100644
index 00000000000..f5cfdce6f45
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Power.cs
@@ -0,0 +1,34 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.Power {
+
+  public partial class __default {
+    public static BigInteger Pow(BigInteger b, BigInteger e)
+    {
+      BigInteger _0___accumulator = BigInteger.One;
+    TAIL_CALL_START: ;
+      if ((e).Sign == 0) {
+        return (BigInteger.One) * (_0___accumulator);
+      } else {
+        _0___accumulator = (_0___accumulator) * (b);
+        BigInteger _in0 = b;
+        BigInteger _in1 = (e) - (BigInteger.One);
+        b = _in0;
+        e = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+  }
+} // end of namespace Std.Arithmetic.Power
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Power2.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Power2.cs
new file mode 100644
index 00000000000..3022cf48023
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Arithmetic_Power2.cs
@@ -0,0 +1,22 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Arithmetic.Power2 {
+
+  public partial class __default {
+    public static BigInteger Pow2(BigInteger e) {
+      return Std.Arithmetic.Power.__default.Pow(new BigInteger(2), e);
+    }
+  }
+} // end of namespace Std.Arithmetic.Power2
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Collections_Seq.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Collections_Seq.cs
new file mode 100644
index 00000000000..32faed2a001
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Collections_Seq.cs
@@ -0,0 +1,429 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Collections.Seq {
+
+  public partial class __default {
+    public static __T First<__T>(Dafny.ISequence<__T> xs) {
+      return (xs).Select(BigInteger.Zero);
+    }
+    public static Dafny.ISequence<__T> DropFirst<__T>(Dafny.ISequence<__T> xs) {
+      return (xs).Drop(BigInteger.One);
+    }
+    public static __T Last<__T>(Dafny.ISequence<__T> xs) {
+      return (xs).Select((new BigInteger((xs).Count)) - (BigInteger.One));
+    }
+    public static Dafny.ISequence<__T> DropLast<__T>(Dafny.ISequence<__T> xs) {
+      return (xs).Take((new BigInteger((xs).Count)) - (BigInteger.One));
+    }
+    public static __T[] ToArray<__T>(Dafny.ISequence<__T> xs)
+    {
+      __T[] a = new __T[0];
+      Func<BigInteger, __T> _init0 = Dafny.Helpers.Id<Func<Dafny.ISequence<__T>, Func<BigInteger, __T>>>((_0_xs) => ((System.Func<BigInteger, __T>)((_1_i) => {
+        return (_0_xs).Select(_1_i);
+      })))(xs);
+      __T[] _nw0 = new __T[Dafny.Helpers.ToIntChecked(new BigInteger((xs).Count), "array size exceeds memory limit")];
+      for (var _i0_0 = 0; _i0_0 < new BigInteger(_nw0.Length); _i0_0++) {
+        _nw0[(int)(_i0_0)] = _init0(_i0_0);
+      }
+      a = _nw0;
+      return a;
+    }
+    public static Dafny.ISet<__T> ToSet<__T>(Dafny.ISequence<__T> xs) {
+      return Dafny.Helpers.Id<Func<Dafny.ISequence<__T>, Dafny.ISet<__T>>>((_0_xs) => ((System.Func<Dafny.ISet<__T>>)(() => {
+        var _coll0 = new System.Collections.Generic.List<__T>();
+        foreach (__T _compr_0 in (_0_xs).CloneAsArray()) {
+          __T _1_x = (__T)_compr_0;
+          if ((_0_xs).Contains(_1_x)) {
+            _coll0.Add(_1_x);
+          }
+        }
+        return Dafny.Set<__T>.FromCollection(_coll0);
+      }))())(xs);
+    }
+    public static BigInteger IndexOf<__T>(Dafny.ISequence<__T> xs, __T v)
+    {
+      BigInteger _0___accumulator = BigInteger.Zero;
+    TAIL_CALL_START: ;
+      if (object.Equals((xs).Select(BigInteger.Zero), v)) {
+        return (BigInteger.Zero) + (_0___accumulator);
+      } else {
+        _0___accumulator = (_0___accumulator) + (BigInteger.One);
+        Dafny.ISequence<__T> _in0 = (xs).Drop(BigInteger.One);
+        __T _in1 = v;
+        xs = _in0;
+        v = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Std.Wrappers._IOption<BigInteger> IndexOfOption<__T>(Dafny.ISequence<__T> xs, __T v)
+    {
+      return Std.Collections.Seq.__default.IndexByOption<__T>(xs, Dafny.Helpers.Id<Func<__T, Func<__T, bool>>>((_0_v) => ((System.Func<__T, bool>)((_1_x) => {
+        return object.Equals(_1_x, _0_v);
+      })))(v));
+    }
+    public static Std.Wrappers._IOption<BigInteger> IndexByOption<__T>(Dafny.ISequence<__T> xs, Func<__T, bool> p)
+    {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return Std.Wrappers.Option<BigInteger>.create_None();
+      } else if (Dafny.Helpers.Id<Func<__T, bool>>(p)((xs).Select(BigInteger.Zero))) {
+        return Std.Wrappers.Option<BigInteger>.create_Some(BigInteger.Zero);
+      } else {
+        Std.Wrappers._IOption<BigInteger> _0_o_k = Std.Collections.Seq.__default.IndexByOption<__T>((xs).Drop(BigInteger.One), p);
+        if ((_0_o_k).is_Some) {
+          return Std.Wrappers.Option<BigInteger>.create_Some(((_0_o_k).dtor_value) + (BigInteger.One));
+        } else {
+          return Std.Wrappers.Option<BigInteger>.create_None();
+        }
+      }
+    }
+    public static BigInteger LastIndexOf<__T>(Dafny.ISequence<__T> xs, __T v)
+    {
+    TAIL_CALL_START: ;
+      if (object.Equals((xs).Select((new BigInteger((xs).Count)) - (BigInteger.One)), v)) {
+        return (new BigInteger((xs).Count)) - (BigInteger.One);
+      } else {
+        Dafny.ISequence<__T> _in0 = (xs).Take((new BigInteger((xs).Count)) - (BigInteger.One));
+        __T _in1 = v;
+        xs = _in0;
+        v = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Std.Wrappers._IOption<BigInteger> LastIndexOfOption<__T>(Dafny.ISequence<__T> xs, __T v)
+    {
+      return Std.Collections.Seq.__default.LastIndexByOption<__T>(xs, Dafny.Helpers.Id<Func<__T, Func<__T, bool>>>((_0_v) => ((System.Func<__T, bool>)((_1_x) => {
+        return object.Equals(_1_x, _0_v);
+      })))(v));
+    }
+    public static Std.Wrappers._IOption<BigInteger> LastIndexByOption<__T>(Dafny.ISequence<__T> xs, Func<__T, bool> p)
+    {
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return Std.Wrappers.Option<BigInteger>.create_None();
+      } else if (Dafny.Helpers.Id<Func<__T, bool>>(p)((xs).Select((new BigInteger((xs).Count)) - (BigInteger.One)))) {
+        return Std.Wrappers.Option<BigInteger>.create_Some((new BigInteger((xs).Count)) - (BigInteger.One));
+      } else {
+        Dafny.ISequence<__T> _in0 = (xs).Take((new BigInteger((xs).Count)) - (BigInteger.One));
+        Func<__T, bool> _in1 = p;
+        xs = _in0;
+        p = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<__T> Remove<__T>(Dafny.ISequence<__T> xs, BigInteger pos)
+    {
+      return Dafny.Sequence<__T>.Concat((xs).Take(pos), (xs).Drop((pos) + (BigInteger.One)));
+    }
+    public static Dafny.ISequence<__T> RemoveValue<__T>(Dafny.ISequence<__T> xs, __T v)
+    {
+      if (!(xs).Contains(v)) {
+        return xs;
+      } else {
+        BigInteger _0_i = Std.Collections.Seq.__default.IndexOf<__T>(xs, v);
+        return Dafny.Sequence<__T>.Concat((xs).Take(_0_i), (xs).Drop((_0_i) + (BigInteger.One)));
+      }
+    }
+    public static Dafny.ISequence<__T> Insert<__T>(Dafny.ISequence<__T> xs, __T a, BigInteger pos)
+    {
+      return Dafny.Sequence<__T>.Concat(Dafny.Sequence<__T>.Concat((xs).Take(pos), Dafny.Sequence<__T>.FromElements(a)), (xs).Drop(pos));
+    }
+    public static Dafny.ISequence<__T> Reverse<__T>(Dafny.ISequence<__T> xs) {
+      Dafny.ISequence<__T> _0___accumulator = Dafny.Sequence<__T>.FromElements();
+    TAIL_CALL_START: ;
+      if ((xs).Equals(Dafny.Sequence<__T>.FromElements())) {
+        return Dafny.Sequence<__T>.Concat(_0___accumulator, Dafny.Sequence<__T>.FromElements());
+      } else {
+        _0___accumulator = Dafny.Sequence<__T>.Concat(_0___accumulator, Dafny.Sequence<__T>.FromElements((xs).Select((new BigInteger((xs).Count)) - (BigInteger.One))));
+        Dafny.ISequence<__T> _in0 = (xs).Subsequence(BigInteger.Zero, (new BigInteger((xs).Count)) - (BigInteger.One));
+        xs = _in0;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<__T> Repeat<__T>(__T v, BigInteger length)
+    {
+      Dafny.ISequence<__T> _0___accumulator = Dafny.Sequence<__T>.FromElements();
+    TAIL_CALL_START: ;
+      if ((length).Sign == 0) {
+        return Dafny.Sequence<__T>.Concat(_0___accumulator, Dafny.Sequence<__T>.FromElements());
+      } else {
+        _0___accumulator = Dafny.Sequence<__T>.Concat(_0___accumulator, Dafny.Sequence<__T>.FromElements(v));
+        __T _in0 = v;
+        BigInteger _in1 = (length) - (BigInteger.One);
+        v = _in0;
+        length = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static _System._ITuple2<Dafny.ISequence<__A>, Dafny.ISequence<__B>> Unzip<__A, __B>(Dafny.ISequence<_System._ITuple2<__A, __B>> xs) {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return _System.Tuple2<Dafny.ISequence<__A>, Dafny.ISequence<__B>>.create(Dafny.Sequence<__A>.FromElements(), Dafny.Sequence<__B>.FromElements());
+      } else {
+        _System._ITuple2<Dafny.ISequence<__A>, Dafny.ISequence<__B>> _let_tmp_rhs0 = Std.Collections.Seq.__default.Unzip<__A, __B>(Std.Collections.Seq.__default.DropLast<_System._ITuple2<__A, __B>>(xs));
+        Dafny.ISequence<__A> _0_a = _let_tmp_rhs0.dtor__0;
+        Dafny.ISequence<__B> _1_b = _let_tmp_rhs0.dtor__1;
+        return _System.Tuple2<Dafny.ISequence<__A>, Dafny.ISequence<__B>>.create(Dafny.Sequence<__A>.Concat(_0_a, Dafny.Sequence<__A>.FromElements((Std.Collections.Seq.__default.Last<_System._ITuple2<__A, __B>>(xs)).dtor__0)), Dafny.Sequence<__B>.Concat(_1_b, Dafny.Sequence<__B>.FromElements((Std.Collections.Seq.__default.Last<_System._ITuple2<__A, __B>>(xs)).dtor__1)));
+      }
+    }
+    public static Dafny.ISequence<_System._ITuple2<__A, __B>> Zip<__A, __B>(Dafny.ISequence<__A> xs, Dafny.ISequence<__B> ys)
+    {
+      Dafny.ISequence<_System._ITuple2<__A, __B>> _0___accumulator = Dafny.Sequence<_System._ITuple2<__A, __B>>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return Dafny.Sequence<_System._ITuple2<__A, __B>>.Concat(Dafny.Sequence<_System._ITuple2<__A, __B>>.FromElements(), _0___accumulator);
+      } else {
+        _0___accumulator = Dafny.Sequence<_System._ITuple2<__A, __B>>.Concat(Dafny.Sequence<_System._ITuple2<__A, __B>>.FromElements(_System.Tuple2<__A, __B>.create(Std.Collections.Seq.__default.Last<__A>(xs), Std.Collections.Seq.__default.Last<__B>(ys))), _0___accumulator);
+        Dafny.ISequence<__A> _in0 = Std.Collections.Seq.__default.DropLast<__A>(xs);
+        Dafny.ISequence<__B> _in1 = Std.Collections.Seq.__default.DropLast<__B>(ys);
+        xs = _in0;
+        ys = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static BigInteger Max(Dafny.ISequence<BigInteger> xs) {
+      if ((new BigInteger((xs).Count)) == (BigInteger.One)) {
+        return (xs).Select(BigInteger.Zero);
+      } else {
+        return Std.Math.__default.Max((xs).Select(BigInteger.Zero), Std.Collections.Seq.__default.Max((xs).Drop(BigInteger.One)));
+      }
+    }
+    public static BigInteger Min(Dafny.ISequence<BigInteger> xs) {
+      if ((new BigInteger((xs).Count)) == (BigInteger.One)) {
+        return (xs).Select(BigInteger.Zero);
+      } else {
+        return Std.Math.__default.Min((xs).Select(BigInteger.Zero), Std.Collections.Seq.__default.Min((xs).Drop(BigInteger.One)));
+      }
+    }
+    public static Dafny.ISequence<__T> Flatten<__T>(Dafny.ISequence<Dafny.ISequence<__T>> xs) {
+      Dafny.ISequence<__T> _0___accumulator = Dafny.Sequence<__T>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return Dafny.Sequence<__T>.Concat(_0___accumulator, Dafny.Sequence<__T>.FromElements());
+      } else {
+        _0___accumulator = Dafny.Sequence<__T>.Concat(_0___accumulator, (xs).Select(BigInteger.Zero));
+        Dafny.ISequence<Dafny.ISequence<__T>> _in0 = (xs).Drop(BigInteger.One);
+        xs = _in0;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<__T> FlattenReverse<__T>(Dafny.ISequence<Dafny.ISequence<__T>> xs) {
+      Dafny.ISequence<__T> _0___accumulator = Dafny.Sequence<__T>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return Dafny.Sequence<__T>.Concat(Dafny.Sequence<__T>.FromElements(), _0___accumulator);
+      } else {
+        _0___accumulator = Dafny.Sequence<__T>.Concat(Std.Collections.Seq.__default.Last<Dafny.ISequence<__T>>(xs), _0___accumulator);
+        Dafny.ISequence<Dafny.ISequence<__T>> _in0 = Std.Collections.Seq.__default.DropLast<Dafny.ISequence<__T>>(xs);
+        xs = _in0;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<__T> Join<__T>(Dafny.ISequence<Dafny.ISequence<__T>> seqs, Dafny.ISequence<__T> separator)
+    {
+      Dafny.ISequence<__T> _0___accumulator = Dafny.Sequence<__T>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((seqs).Count)).Sign == 0) {
+        return Dafny.Sequence<__T>.Concat(_0___accumulator, Dafny.Sequence<__T>.FromElements());
+      } else if ((new BigInteger((seqs).Count)) == (BigInteger.One)) {
+        return Dafny.Sequence<__T>.Concat(_0___accumulator, (seqs).Select(BigInteger.Zero));
+      } else {
+        _0___accumulator = Dafny.Sequence<__T>.Concat(_0___accumulator, Dafny.Sequence<__T>.Concat((seqs).Select(BigInteger.Zero), separator));
+        Dafny.ISequence<Dafny.ISequence<__T>> _in0 = (seqs).Drop(BigInteger.One);
+        Dafny.ISequence<__T> _in1 = separator;
+        seqs = _in0;
+        separator = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<Dafny.ISequence<__T>> Split<__T>(Dafny.ISequence<__T> s, __T delim)
+    {
+      Dafny.ISequence<Dafny.ISequence<__T>> _0___accumulator = Dafny.Sequence<Dafny.ISequence<__T>>.FromElements();
+    TAIL_CALL_START: ;
+      Std.Wrappers._IOption<BigInteger> _1_i = Std.Collections.Seq.__default.IndexOfOption<__T>(s, delim);
+      if ((_1_i).is_Some) {
+        _0___accumulator = Dafny.Sequence<Dafny.ISequence<__T>>.Concat(_0___accumulator, Dafny.Sequence<Dafny.ISequence<__T>>.FromElements((s).Take((_1_i).dtor_value)));
+        Dafny.ISequence<__T> _in0 = (s).Drop(((_1_i).dtor_value) + (BigInteger.One));
+        __T _in1 = delim;
+        s = _in0;
+        delim = _in1;
+        goto TAIL_CALL_START;
+      } else {
+        return Dafny.Sequence<Dafny.ISequence<__T>>.Concat(_0___accumulator, Dafny.Sequence<Dafny.ISequence<__T>>.FromElements(s));
+      }
+    }
+    public static _System._ITuple2<Dafny.ISequence<__T>, Dafny.ISequence<__T>> SplitOnce<__T>(Dafny.ISequence<__T> s, __T delim)
+    {
+      Std.Wrappers._IOption<BigInteger> _0_i = Std.Collections.Seq.__default.IndexOfOption<__T>(s, delim);
+      return _System.Tuple2<Dafny.ISequence<__T>, Dafny.ISequence<__T>>.create((s).Take((_0_i).dtor_value), (s).Drop(((_0_i).dtor_value) + (BigInteger.One)));
+    }
+    public static Std.Wrappers._IOption<_System._ITuple2<Dafny.ISequence<__T>, Dafny.ISequence<__T>>> SplitOnceOption<__T>(Dafny.ISequence<__T> s, __T delim)
+    {
+      Std.Wrappers._IOption<BigInteger> _0_valueOrError0 = Std.Collections.Seq.__default.IndexOfOption<__T>(s, delim);
+      if ((_0_valueOrError0).IsFailure()) {
+        return (_0_valueOrError0).PropagateFailure<_System._ITuple2<Dafny.ISequence<__T>, Dafny.ISequence<__T>>>();
+      } else {
+        BigInteger _1_i = (_0_valueOrError0).Extract();
+        return Std.Wrappers.Option<_System._ITuple2<Dafny.ISequence<__T>, Dafny.ISequence<__T>>>.create_Some(_System.Tuple2<Dafny.ISequence<__T>, Dafny.ISequence<__T>>.create((s).Take(_1_i), (s).Drop((_1_i) + (BigInteger.One))));
+      }
+    }
+    public static Dafny.ISequence<__R> Map<__T, __R>(Func<__T, __R> f, Dafny.ISequence<__T> xs)
+    {
+      Dafny.ISequence<__R> _0___accumulator = Dafny.Sequence<__R>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return Dafny.Sequence<__R>.Concat(_0___accumulator, Dafny.Sequence<__R>.FromElements());
+      } else {
+        _0___accumulator = Dafny.Sequence<__R>.Concat(_0___accumulator, Dafny.Sequence<__R>.FromElements(Dafny.Helpers.Id<Func<__T, __R>>(f)((xs).Select(BigInteger.Zero))));
+        Func<__T, __R> _in0 = f;
+        Dafny.ISequence<__T> _in1 = (xs).Drop(BigInteger.One);
+        f = _in0;
+        xs = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<__R> MapPartialFunction<__T, __R>(Func<__T, __R> f, Dafny.ISequence<__T> xs)
+    {
+      return Std.Collections.Seq.__default.Map<__T, __R>(f, xs);
+    }
+    public static Std.Wrappers._IResult<Dafny.ISequence<__R>, __E> MapWithResult<__T, __R, __E>(Func<__T, Std.Wrappers._IResult<__R, __E>> f, Dafny.ISequence<__T> xs)
+    {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return Std.Wrappers.Result<Dafny.ISequence<__R>, __E>.create_Success(Dafny.Sequence<__R>.FromElements());
+      } else {
+        Std.Wrappers._IResult<__R, __E> _0_valueOrError0 = Dafny.Helpers.Id<Func<__T, Std.Wrappers._IResult<__R, __E>>>(f)((xs).Select(BigInteger.Zero));
+        if ((_0_valueOrError0).IsFailure()) {
+          return (_0_valueOrError0).PropagateFailure<Dafny.ISequence<__R>>();
+        } else {
+          __R _1_head = (_0_valueOrError0).Extract();
+          Std.Wrappers._IResult<Dafny.ISequence<__R>, __E> _2_valueOrError1 = Std.Collections.Seq.__default.MapWithResult<__T, __R, __E>(f, (xs).Drop(BigInteger.One));
+          if ((_2_valueOrError1).IsFailure()) {
+            return (_2_valueOrError1).PropagateFailure<Dafny.ISequence<__R>>();
+          } else {
+            Dafny.ISequence<__R> _3_tail = (_2_valueOrError1).Extract();
+            return Std.Wrappers.Result<Dafny.ISequence<__R>, __E>.create_Success(Dafny.Sequence<__R>.Concat(Dafny.Sequence<__R>.FromElements(_1_head), _3_tail));
+          }
+        }
+      }
+    }
+    public static Dafny.ISequence<__T> Filter<__T>(Func<__T, bool> f, Dafny.ISequence<__T> xs)
+    {
+      Dafny.ISequence<__T> _0___accumulator = Dafny.Sequence<__T>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return Dafny.Sequence<__T>.Concat(_0___accumulator, Dafny.Sequence<__T>.FromElements());
+      } else {
+        _0___accumulator = Dafny.Sequence<__T>.Concat(_0___accumulator, ((Dafny.Helpers.Id<Func<__T, bool>>(f)((xs).Select(BigInteger.Zero))) ? (Dafny.Sequence<__T>.FromElements((xs).Select(BigInteger.Zero))) : (Dafny.Sequence<__T>.FromElements())));
+        Func<__T, bool> _in0 = f;
+        Dafny.ISequence<__T> _in1 = (xs).Drop(BigInteger.One);
+        f = _in0;
+        xs = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static __A FoldLeft<__A, __T>(Func<__A, __T, __A> f, __A init, Dafny.ISequence<__T> xs)
+    {
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return init;
+      } else {
+        Func<__A, __T, __A> _in0 = f;
+        __A _in1 = Dafny.Helpers.Id<Func<__A, __T, __A>>(f)(init, (xs).Select(BigInteger.Zero));
+        Dafny.ISequence<__T> _in2 = (xs).Drop(BigInteger.One);
+        f = _in0;
+        init = _in1;
+        xs = _in2;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static __A FoldRight<__A, __T>(Func<__T, __A, __A> f, Dafny.ISequence<__T> xs, __A init)
+    {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return init;
+      } else {
+        return Dafny.Helpers.Id<Func<__T, __A, __A>>(f)((xs).Select(BigInteger.Zero), Std.Collections.Seq.__default.FoldRight<__A, __T>(f, (xs).Drop(BigInteger.One), init));
+      }
+    }
+    public static Dafny.ISequence<__T> SetToSeq<__T>(Dafny.ISet<__T> s)
+    {
+      Dafny.ISequence<__T> xs = Dafny.Sequence<__T>.Empty;
+      xs = Dafny.Sequence<__T>.FromElements();
+      Dafny.ISet<__T> _0_left;
+      _0_left = s;
+      while (!(_0_left).Equals(Dafny.Set<__T>.FromElements())) {
+        __T _1_x;
+        foreach (__T _assign_such_that_0 in (_0_left).Elements) {
+          _1_x = (__T)_assign_such_that_0;
+          if ((_0_left).Contains(_1_x)) {
+            goto after__ASSIGN_SUCH_THAT_0;
+          }
+        }
+        throw new System.Exception("assign-such-that search produced no value");
+      after__ASSIGN_SUCH_THAT_0: ;
+        _0_left = Dafny.Set<__T>.Difference(_0_left, Dafny.Set<__T>.FromElements(_1_x));
+        xs = Dafny.Sequence<__T>.Concat(xs, Dafny.Sequence<__T>.FromElements(_1_x));
+      }
+      return xs;
+    }
+    public static Dafny.ISequence<__T> SetToSortedSeq<__T>(Dafny.ISet<__T> s, Func<__T, __T, bool> R)
+    {
+      Dafny.ISequence<__T> xs = Dafny.Sequence<__T>.Empty;
+      Dafny.ISequence<__T> _out0;
+      _out0 = Std.Collections.Seq.__default.SetToSeq<__T>(s);
+      xs = _out0;
+      xs = Std.Collections.Seq.__default.MergeSortBy<__T>(R, xs);
+      return xs;
+    }
+    public static Dafny.ISequence<__T> MergeSortBy<__T>(Func<__T, __T, bool> lessThanOrEq, Dafny.ISequence<__T> a)
+    {
+      if ((new BigInteger((a).Count)) <= (BigInteger.One)) {
+        return a;
+      } else {
+        BigInteger _0_splitIndex = Dafny.Helpers.EuclideanDivision(new BigInteger((a).Count), new BigInteger(2));
+        Dafny.ISequence<__T> _1_left = (a).Take(_0_splitIndex);
+        Dafny.ISequence<__T> _2_right = (a).Drop(_0_splitIndex);
+        Dafny.ISequence<__T> _3_leftSorted = Std.Collections.Seq.__default.MergeSortBy<__T>(lessThanOrEq, _1_left);
+        Dafny.ISequence<__T> _4_rightSorted = Std.Collections.Seq.__default.MergeSortBy<__T>(lessThanOrEq, _2_right);
+        return Std.Collections.Seq.__default.MergeSortedWith<__T>(_3_leftSorted, _4_rightSorted, lessThanOrEq);
+      }
+    }
+    public static Dafny.ISequence<__T> MergeSortedWith<__T>(Dafny.ISequence<__T> left, Dafny.ISequence<__T> right, Func<__T, __T, bool> lessThanOrEq)
+    {
+      Dafny.ISequence<__T> _0___accumulator = Dafny.Sequence<__T>.FromElements();
+    TAIL_CALL_START: ;
+      if ((new BigInteger((left).Count)).Sign == 0) {
+        return Dafny.Sequence<__T>.Concat(_0___accumulator, right);
+      } else if ((new BigInteger((right).Count)).Sign == 0) {
+        return Dafny.Sequence<__T>.Concat(_0___accumulator, left);
+      } else if (Dafny.Helpers.Id<Func<__T, __T, bool>>(lessThanOrEq)((left).Select(BigInteger.Zero), (right).Select(BigInteger.Zero))) {
+        _0___accumulator = Dafny.Sequence<__T>.Concat(_0___accumulator, Dafny.Sequence<__T>.FromElements((left).Select(BigInteger.Zero)));
+        Dafny.ISequence<__T> _in0 = (left).Drop(BigInteger.One);
+        Dafny.ISequence<__T> _in1 = right;
+        Func<__T, __T, bool> _in2 = lessThanOrEq;
+        left = _in0;
+        right = _in1;
+        lessThanOrEq = _in2;
+        goto TAIL_CALL_START;
+      } else {
+        _0___accumulator = Dafny.Sequence<__T>.Concat(_0___accumulator, Dafny.Sequence<__T>.FromElements((right).Select(BigInteger.Zero)));
+        Dafny.ISequence<__T> _in3 = left;
+        Dafny.ISequence<__T> _in4 = (right).Drop(BigInteger.One);
+        Func<__T, __T, bool> _in5 = lessThanOrEq;
+        left = _in3;
+        right = _in4;
+        lessThanOrEq = _in5;
+        goto TAIL_CALL_START;
+      }
+    }
+  }
+} // end of namespace Std.Collections.Seq
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Math.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Math.cs
new file mode 100644
index 00000000000..19b08102629
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Math.cs
@@ -0,0 +1,50 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Math {
+
+  public partial class __default {
+    public static BigInteger Min(BigInteger a, BigInteger b)
+    {
+      if ((a) < (b)) {
+        return a;
+      } else {
+        return b;
+      }
+    }
+    public static BigInteger Min3(BigInteger a, BigInteger b, BigInteger c)
+    {
+      return Std.Math.__default.Min(a, Std.Math.__default.Min(b, c));
+    }
+    public static BigInteger Max(BigInteger a, BigInteger b)
+    {
+      if ((a) < (b)) {
+        return b;
+      } else {
+        return a;
+      }
+    }
+    public static BigInteger Max3(BigInteger a, BigInteger b, BigInteger c)
+    {
+      return Std.Math.__default.Max(a, Std.Math.__default.Max(b, c));
+    }
+    public static BigInteger Abs(BigInteger a) {
+      if ((a).Sign == -1) {
+        return (BigInteger.Zero) - (a);
+      } else {
+        return a;
+      }
+    }
+  }
+} // end of namespace Std.Math
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Strings.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Strings.cs
new file mode 100644
index 00000000000..0b2540af5a8
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Strings.cs
@@ -0,0 +1,47 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Strings {
+
+  public partial class __default {
+    public static Dafny.ISequence<Dafny.Rune> OfNat(BigInteger n) {
+      return Std.Strings.DecimalConversion.__default.OfNat(n);
+    }
+    public static Dafny.ISequence<Dafny.Rune> OfInt(BigInteger n) {
+      return Std.Strings.DecimalConversion.__default.OfInt(n, new Dafny.Rune('-'));
+    }
+    public static BigInteger ToNat(Dafny.ISequence<Dafny.Rune> str) {
+      return Std.Strings.DecimalConversion.__default.ToNat(str);
+    }
+    public static BigInteger ToInt(Dafny.ISequence<Dafny.Rune> str) {
+      return Std.Strings.DecimalConversion.__default.ToInt(str, new Dafny.Rune('-'));
+    }
+    public static Dafny.ISequence<Dafny.Rune> EscapeQuotes(Dafny.ISequence<Dafny.Rune> str) {
+      return Std.Strings.CharStrEscaping.__default.Escape(str, Dafny.Set<Dafny.Rune>.FromElements(new Dafny.Rune('\"'), new Dafny.Rune('\'')), new Dafny.Rune('\\'));
+    }
+    public static Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> UnescapeQuotes(Dafny.ISequence<Dafny.Rune> str) {
+      return Std.Strings.CharStrEscaping.__default.Unescape(str, new Dafny.Rune('\\'));
+    }
+    public static Dafny.ISequence<Dafny.Rune> OfBool(bool b) {
+      if (b) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("true");
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("false");
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> OfChar(Dafny.Rune c) {
+      return Dafny.Sequence<Dafny.Rune>.FromElements(c);
+    }
+  }
+} // end of namespace Std.Strings
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Strings_CharStrEscaping.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Strings_CharStrEscaping.cs
new file mode 100644
index 00000000000..54dbb0c05df
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Strings_CharStrEscaping.cs
@@ -0,0 +1,71 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Strings.CharStrEscaping {
+
+  public partial class __default {
+    public static Dafny.ISequence<Dafny.Rune> Escape(Dafny.ISequence<Dafny.Rune> str, Dafny.ISet<Dafny.Rune> mustEscape, Dafny.Rune escape)
+    {
+      Dafny.ISequence<Dafny.Rune> _0___accumulator = Dafny.Sequence<Dafny.Rune>.FromElements();
+    TAIL_CALL_START: ;
+      if ((str).Equals(Dafny.Sequence<Dafny.Rune>.FromElements())) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, str);
+      } else if ((mustEscape).Contains((str).Select(BigInteger.Zero))) {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.FromElements(escape, (str).Select(BigInteger.Zero)));
+        Dafny.ISequence<Dafny.Rune> _in0 = (str).Drop(BigInteger.One);
+        Dafny.ISet<Dafny.Rune> _in1 = mustEscape;
+        Dafny.Rune _in2 = escape;
+        str = _in0;
+        mustEscape = _in1;
+        escape = _in2;
+        goto TAIL_CALL_START;
+      } else {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(_0___accumulator, Dafny.Sequence<Dafny.Rune>.FromElements((str).Select(BigInteger.Zero)));
+        Dafny.ISequence<Dafny.Rune> _in3 = (str).Drop(BigInteger.One);
+        Dafny.ISet<Dafny.Rune> _in4 = mustEscape;
+        Dafny.Rune _in5 = escape;
+        str = _in3;
+        mustEscape = _in4;
+        escape = _in5;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> Unescape(Dafny.ISequence<Dafny.Rune> str, Dafny.Rune escape)
+    {
+      if ((str).Equals(Dafny.Sequence<Dafny.Rune>.FromElements())) {
+        return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(str);
+      } else if (((str).Select(BigInteger.Zero)) == (escape)) {
+        if ((new BigInteger((str).Count)) > (BigInteger.One)) {
+          Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _0_valueOrError0 = Std.Strings.CharStrEscaping.__default.Unescape((str).Drop(new BigInteger(2)), escape);
+          if ((_0_valueOrError0).IsFailure()) {
+            return (_0_valueOrError0).PropagateFailure<Dafny.ISequence<Dafny.Rune>>();
+          } else {
+            Dafny.ISequence<Dafny.Rune> _1_tl = (_0_valueOrError0).Extract();
+            return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.FromElements((str).Select(BigInteger.One)), _1_tl));
+          }
+        } else {
+          return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_None();
+        }
+      } else {
+        Std.Wrappers._IOption<Dafny.ISequence<Dafny.Rune>> _2_valueOrError1 = Std.Strings.CharStrEscaping.__default.Unescape((str).Drop(BigInteger.One), escape);
+        if ((_2_valueOrError1).IsFailure()) {
+          return (_2_valueOrError1).PropagateFailure<Dafny.ISequence<Dafny.Rune>>();
+        } else {
+          Dafny.ISequence<Dafny.Rune> _3_tl = (_2_valueOrError1).Extract();
+          return Std.Wrappers.Option<Dafny.ISequence<Dafny.Rune>>.create_Some(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.FromElements((str).Select(BigInteger.Zero)), _3_tl));
+        }
+      }
+    }
+  }
+} // end of namespace Std.Strings.CharStrEscaping
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Strings_DecimalConversion.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Strings_DecimalConversion.cs
new file mode 100644
index 00000000000..3d3cb3c89d7
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Strings_DecimalConversion.cs
@@ -0,0 +1,198 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Strings.DecimalConversion {
+
+  public partial class __default {
+    public static BigInteger BASE() {
+      return Std.Strings.DecimalConversion.__default.@base;
+    }
+    public static bool IsDigitChar(Dafny.Rune c) {
+      return (Std.Strings.DecimalConversion.__default.charToDigit).Contains(c);
+    }
+    public static Dafny.ISequence<Dafny.Rune> OfDigits(Dafny.ISequence<BigInteger> digits) {
+      Dafny.ISequence<Dafny.Rune> _0___accumulator = Dafny.Sequence<Dafny.Rune>.FromElements();
+    TAIL_CALL_START: ;
+      if ((digits).Equals(Dafny.Sequence<BigInteger>.FromElements())) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.FromElements(), _0___accumulator);
+      } else {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.FromElements((Std.Strings.DecimalConversion.__default.chars).Select((digits).Select(BigInteger.Zero))), _0___accumulator);
+        Dafny.ISequence<BigInteger> _in0 = (digits).Drop(BigInteger.One);
+        digits = _in0;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> OfNat(BigInteger n) {
+      if ((n).Sign == 0) {
+        return Dafny.Sequence<Dafny.Rune>.FromElements((Std.Strings.DecimalConversion.__default.chars).Select(BigInteger.Zero));
+      } else {
+        return Std.Strings.DecimalConversion.__default.OfDigits(Std.Strings.DecimalConversion.__default.FromNat(n));
+      }
+    }
+    public static bool IsNumberStr(Dafny.ISequence<Dafny.Rune> str, Dafny.Rune minus)
+    {
+      return !(!(str).Equals(Dafny.Sequence<Dafny.Rune>.FromElements())) || (((((str).Select(BigInteger.Zero)) == (minus)) || ((Std.Strings.DecimalConversion.__default.charToDigit).Contains((str).Select(BigInteger.Zero)))) && (Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, bool>>((_0_str) => Dafny.Helpers.Quantifier<Dafny.Rune>(((_0_str).Drop(BigInteger.One)).UniqueElements, true, (((_forall_var_0) => {
+        Dafny.Rune _1_c = (Dafny.Rune)_forall_var_0;
+        return !(((_0_str).Drop(BigInteger.One)).Contains(_1_c)) || (Std.Strings.DecimalConversion.__default.IsDigitChar(_1_c));
+      }))))(str)));
+    }
+    public static Dafny.ISequence<Dafny.Rune> OfInt(BigInteger n, Dafny.Rune minus)
+    {
+      if ((n).Sign != -1) {
+        return Std.Strings.DecimalConversion.__default.OfNat(n);
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.FromElements(minus), Std.Strings.DecimalConversion.__default.OfNat((BigInteger.Zero) - (n)));
+      }
+    }
+    public static BigInteger ToNat(Dafny.ISequence<Dafny.Rune> str) {
+      if ((str).Equals(Dafny.Sequence<Dafny.Rune>.FromElements())) {
+        return BigInteger.Zero;
+      } else {
+        Dafny.Rune _0_c = (str).Select((new BigInteger((str).Count)) - (BigInteger.One));
+        return ((Std.Strings.DecimalConversion.__default.ToNat((str).Take((new BigInteger((str).Count)) - (BigInteger.One)))) * (Std.Strings.DecimalConversion.__default.@base)) + (Dafny.Map<Dafny.Rune, BigInteger>.Select(Std.Strings.DecimalConversion.__default.charToDigit,_0_c));
+      }
+    }
+    public static BigInteger ToInt(Dafny.ISequence<Dafny.Rune> str, Dafny.Rune minus)
+    {
+      if (Dafny.Sequence<Dafny.Rune>.IsPrefixOf(Dafny.Sequence<Dafny.Rune>.FromElements(minus), str)) {
+        return (BigInteger.Zero) - (Std.Strings.DecimalConversion.__default.ToNat((str).Drop(BigInteger.One)));
+      } else {
+        return Std.Strings.DecimalConversion.__default.ToNat(str);
+      }
+    }
+    public static BigInteger ToNatRight(Dafny.ISequence<BigInteger> xs) {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return BigInteger.Zero;
+      } else {
+        return ((Std.Strings.DecimalConversion.__default.ToNatRight(Std.Collections.Seq.__default.DropFirst<BigInteger>(xs))) * (Std.Strings.DecimalConversion.__default.BASE())) + (Std.Collections.Seq.__default.First<BigInteger>(xs));
+      }
+    }
+    public static BigInteger ToNatLeft(Dafny.ISequence<BigInteger> xs) {
+      BigInteger _0___accumulator = BigInteger.Zero;
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return (BigInteger.Zero) + (_0___accumulator);
+      } else {
+        _0___accumulator = ((Std.Collections.Seq.__default.Last<BigInteger>(xs)) * (Std.Arithmetic.Power.__default.Pow(Std.Strings.DecimalConversion.__default.BASE(), (new BigInteger((xs).Count)) - (BigInteger.One)))) + (_0___accumulator);
+        Dafny.ISequence<BigInteger> _in0 = Std.Collections.Seq.__default.DropLast<BigInteger>(xs);
+        xs = _in0;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<BigInteger> FromNat(BigInteger n) {
+      Dafny.ISequence<BigInteger> _0___accumulator = Dafny.Sequence<BigInteger>.FromElements();
+    TAIL_CALL_START: ;
+      if ((n).Sign == 0) {
+        return Dafny.Sequence<BigInteger>.Concat(_0___accumulator, Dafny.Sequence<BigInteger>.FromElements());
+      } else {
+        _0___accumulator = Dafny.Sequence<BigInteger>.Concat(_0___accumulator, Dafny.Sequence<BigInteger>.FromElements(Dafny.Helpers.EuclideanModulus(n, Std.Strings.DecimalConversion.__default.BASE())));
+        BigInteger _in0 = Dafny.Helpers.EuclideanDivision(n, Std.Strings.DecimalConversion.__default.BASE());
+        n = _in0;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<BigInteger> SeqExtend(Dafny.ISequence<BigInteger> xs, BigInteger n)
+    {
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)) >= (n)) {
+        return xs;
+      } else {
+        Dafny.ISequence<BigInteger> _in0 = Dafny.Sequence<BigInteger>.Concat(xs, Dafny.Sequence<BigInteger>.FromElements(BigInteger.Zero));
+        BigInteger _in1 = n;
+        xs = _in0;
+        n = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<BigInteger> SeqExtendMultiple(Dafny.ISequence<BigInteger> xs, BigInteger n)
+    {
+      BigInteger _0_newLen = ((new BigInteger((xs).Count)) + (n)) - (Dafny.Helpers.EuclideanModulus(new BigInteger((xs).Count), n));
+      return Std.Strings.DecimalConversion.__default.SeqExtend(xs, _0_newLen);
+    }
+    public static Dafny.ISequence<BigInteger> FromNatWithLen(BigInteger n, BigInteger len)
+    {
+      return Std.Strings.DecimalConversion.__default.SeqExtend(Std.Strings.DecimalConversion.__default.FromNat(n), len);
+    }
+    public static Dafny.ISequence<BigInteger> SeqZero(BigInteger len) {
+      Dafny.ISequence<BigInteger> _0_xs = Std.Strings.DecimalConversion.__default.FromNatWithLen(BigInteger.Zero, len);
+      return _0_xs;
+    }
+    public static _System._ITuple2<Dafny.ISequence<BigInteger>, BigInteger> SeqAdd(Dafny.ISequence<BigInteger> xs, Dafny.ISequence<BigInteger> ys)
+    {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return _System.Tuple2<Dafny.ISequence<BigInteger>, BigInteger>.create(Dafny.Sequence<BigInteger>.FromElements(), BigInteger.Zero);
+      } else {
+        _System._ITuple2<Dafny.ISequence<BigInteger>, BigInteger> _let_tmp_rhs0 = Std.Strings.DecimalConversion.__default.SeqAdd(Std.Collections.Seq.__default.DropLast<BigInteger>(xs), Std.Collections.Seq.__default.DropLast<BigInteger>(ys));
+        Dafny.ISequence<BigInteger> _0_zs_k = _let_tmp_rhs0.dtor__0;
+        BigInteger _1_cin = _let_tmp_rhs0.dtor__1;
+        BigInteger _2_sum = ((Std.Collections.Seq.__default.Last<BigInteger>(xs)) + (Std.Collections.Seq.__default.Last<BigInteger>(ys))) + (_1_cin);
+        _System._ITuple2<BigInteger, BigInteger> _let_tmp_rhs1 = (((_2_sum) < (Std.Strings.DecimalConversion.__default.BASE())) ? (_System.Tuple2<BigInteger, BigInteger>.create(_2_sum, BigInteger.Zero)) : (_System.Tuple2<BigInteger, BigInteger>.create((_2_sum) - (Std.Strings.DecimalConversion.__default.BASE()), BigInteger.One)));
+        BigInteger _3_sum__out = _let_tmp_rhs1.dtor__0;
+        BigInteger _4_cout = _let_tmp_rhs1.dtor__1;
+        return _System.Tuple2<Dafny.ISequence<BigInteger>, BigInteger>.create(Dafny.Sequence<BigInteger>.Concat(_0_zs_k, Dafny.Sequence<BigInteger>.FromElements(_3_sum__out)), _4_cout);
+      }
+    }
+    public static _System._ITuple2<Dafny.ISequence<BigInteger>, BigInteger> SeqSub(Dafny.ISequence<BigInteger> xs, Dafny.ISequence<BigInteger> ys)
+    {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return _System.Tuple2<Dafny.ISequence<BigInteger>, BigInteger>.create(Dafny.Sequence<BigInteger>.FromElements(), BigInteger.Zero);
+      } else {
+        _System._ITuple2<Dafny.ISequence<BigInteger>, BigInteger> _let_tmp_rhs0 = Std.Strings.DecimalConversion.__default.SeqSub(Std.Collections.Seq.__default.DropLast<BigInteger>(xs), Std.Collections.Seq.__default.DropLast<BigInteger>(ys));
+        Dafny.ISequence<BigInteger> _0_zs = _let_tmp_rhs0.dtor__0;
+        BigInteger _1_cin = _let_tmp_rhs0.dtor__1;
+        _System._ITuple2<BigInteger, BigInteger> _let_tmp_rhs1 = (((Std.Collections.Seq.__default.Last<BigInteger>(xs)) >= ((Std.Collections.Seq.__default.Last<BigInteger>(ys)) + (_1_cin))) ? (_System.Tuple2<BigInteger, BigInteger>.create(((Std.Collections.Seq.__default.Last<BigInteger>(xs)) - (Std.Collections.Seq.__default.Last<BigInteger>(ys))) - (_1_cin), BigInteger.Zero)) : (_System.Tuple2<BigInteger, BigInteger>.create((((Std.Strings.DecimalConversion.__default.BASE()) + (Std.Collections.Seq.__default.Last<BigInteger>(xs))) - (Std.Collections.Seq.__default.Last<BigInteger>(ys))) - (_1_cin), BigInteger.One)));
+        BigInteger _2_diff__out = _let_tmp_rhs1.dtor__0;
+        BigInteger _3_cout = _let_tmp_rhs1.dtor__1;
+        return _System.Tuple2<Dafny.ISequence<BigInteger>, BigInteger>.create(Dafny.Sequence<BigInteger>.Concat(_0_zs, Dafny.Sequence<BigInteger>.FromElements(_2_diff__out)), _3_cout);
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> DIGITS { get {
+      return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0123456789");
+    } }
+    public static Dafny.ISequence<Dafny.Rune> chars { get {
+      return Std.Strings.DecimalConversion.__default.DIGITS;
+    } }
+    public static BigInteger @base { get {
+      return new BigInteger((Std.Strings.DecimalConversion.__default.chars).Count);
+    } }
+    public static Dafny.IMap<Dafny.Rune,BigInteger> charToDigit { get {
+      return Dafny.Map<Dafny.Rune, BigInteger>.FromElements(new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('0'), BigInteger.Zero), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('1'), BigInteger.One), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('2'), new BigInteger(2)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('3'), new BigInteger(3)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('4'), new BigInteger(4)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('5'), new BigInteger(5)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('6'), new BigInteger(6)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('7'), new BigInteger(7)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('8'), new BigInteger(8)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('9'), new BigInteger(9)));
+    } }
+  }
+
+  public partial class CharSeq {
+    private static readonly Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TYPE = new Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>>(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static bool _Is(Dafny.ISequence<Dafny.Rune> __source) {
+      Dafny.ISequence<Dafny.Rune> _0_chars = __source;
+      return (new BigInteger((_0_chars).Count)) > (BigInteger.One);
+    }
+  }
+
+  public partial class digit {
+    private static readonly Dafny.TypeDescriptor<BigInteger> _TYPE = new Dafny.TypeDescriptor<BigInteger>(BigInteger.Zero);
+    public static Dafny.TypeDescriptor<BigInteger> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static bool _Is(BigInteger __source) {
+      BigInteger _1_i = __source;
+      if (_System.nat._Is(_1_i)) {
+        return ((_1_i).Sign != -1) && ((_1_i) < (Std.Strings.DecimalConversion.__default.BASE()));
+      }
+      return false;
+    }
+  }
+} // end of namespace Std.Strings.DecimalConversion
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Strings_HexConversion.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Strings_HexConversion.cs
new file mode 100644
index 00000000000..0217a2ac0c1
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Strings_HexConversion.cs
@@ -0,0 +1,198 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Strings.HexConversion {
+
+  public partial class __default {
+    public static BigInteger BASE() {
+      return Std.Strings.HexConversion.__default.@base;
+    }
+    public static bool IsDigitChar(Dafny.Rune c) {
+      return (Std.Strings.HexConversion.__default.charToDigit).Contains(c);
+    }
+    public static Dafny.ISequence<Dafny.Rune> OfDigits(Dafny.ISequence<BigInteger> digits) {
+      Dafny.ISequence<Dafny.Rune> _0___accumulator = Dafny.Sequence<Dafny.Rune>.FromElements();
+    TAIL_CALL_START: ;
+      if ((digits).Equals(Dafny.Sequence<BigInteger>.FromElements())) {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.FromElements(), _0___accumulator);
+      } else {
+        _0___accumulator = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.FromElements((Std.Strings.HexConversion.__default.chars).Select((digits).Select(BigInteger.Zero))), _0___accumulator);
+        Dafny.ISequence<BigInteger> _in0 = (digits).Drop(BigInteger.One);
+        digits = _in0;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> OfNat(BigInteger n) {
+      if ((n).Sign == 0) {
+        return Dafny.Sequence<Dafny.Rune>.FromElements((Std.Strings.HexConversion.__default.chars).Select(BigInteger.Zero));
+      } else {
+        return Std.Strings.HexConversion.__default.OfDigits(Std.Strings.HexConversion.__default.FromNat(n));
+      }
+    }
+    public static bool IsNumberStr(Dafny.ISequence<Dafny.Rune> str, Dafny.Rune minus)
+    {
+      return !(!(str).Equals(Dafny.Sequence<Dafny.Rune>.FromElements())) || (((((str).Select(BigInteger.Zero)) == (minus)) || ((Std.Strings.HexConversion.__default.charToDigit).Contains((str).Select(BigInteger.Zero)))) && (Dafny.Helpers.Id<Func<Dafny.ISequence<Dafny.Rune>, bool>>((_0_str) => Dafny.Helpers.Quantifier<Dafny.Rune>(((_0_str).Drop(BigInteger.One)).UniqueElements, true, (((_forall_var_0) => {
+        Dafny.Rune _1_c = (Dafny.Rune)_forall_var_0;
+        return !(((_0_str).Drop(BigInteger.One)).Contains(_1_c)) || (Std.Strings.HexConversion.__default.IsDigitChar(_1_c));
+      }))))(str)));
+    }
+    public static Dafny.ISequence<Dafny.Rune> OfInt(BigInteger n, Dafny.Rune minus)
+    {
+      if ((n).Sign != -1) {
+        return Std.Strings.HexConversion.__default.OfNat(n);
+      } else {
+        return Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.FromElements(minus), Std.Strings.HexConversion.__default.OfNat((BigInteger.Zero) - (n)));
+      }
+    }
+    public static BigInteger ToNat(Dafny.ISequence<Dafny.Rune> str) {
+      if ((str).Equals(Dafny.Sequence<Dafny.Rune>.FromElements())) {
+        return BigInteger.Zero;
+      } else {
+        Dafny.Rune _0_c = (str).Select((new BigInteger((str).Count)) - (BigInteger.One));
+        return ((Std.Strings.HexConversion.__default.ToNat((str).Take((new BigInteger((str).Count)) - (BigInteger.One)))) * (Std.Strings.HexConversion.__default.@base)) + (Dafny.Map<Dafny.Rune, BigInteger>.Select(Std.Strings.HexConversion.__default.charToDigit,_0_c));
+      }
+    }
+    public static BigInteger ToInt(Dafny.ISequence<Dafny.Rune> str, Dafny.Rune minus)
+    {
+      if (Dafny.Sequence<Dafny.Rune>.IsPrefixOf(Dafny.Sequence<Dafny.Rune>.FromElements(minus), str)) {
+        return (BigInteger.Zero) - (Std.Strings.HexConversion.__default.ToNat((str).Drop(BigInteger.One)));
+      } else {
+        return Std.Strings.HexConversion.__default.ToNat(str);
+      }
+    }
+    public static BigInteger ToNatRight(Dafny.ISequence<BigInteger> xs) {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return BigInteger.Zero;
+      } else {
+        return ((Std.Strings.HexConversion.__default.ToNatRight(Std.Collections.Seq.__default.DropFirst<BigInteger>(xs))) * (Std.Strings.HexConversion.__default.BASE())) + (Std.Collections.Seq.__default.First<BigInteger>(xs));
+      }
+    }
+    public static BigInteger ToNatLeft(Dafny.ISequence<BigInteger> xs) {
+      BigInteger _0___accumulator = BigInteger.Zero;
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return (BigInteger.Zero) + (_0___accumulator);
+      } else {
+        _0___accumulator = ((Std.Collections.Seq.__default.Last<BigInteger>(xs)) * (Std.Arithmetic.Power.__default.Pow(Std.Strings.HexConversion.__default.BASE(), (new BigInteger((xs).Count)) - (BigInteger.One)))) + (_0___accumulator);
+        Dafny.ISequence<BigInteger> _in0 = Std.Collections.Seq.__default.DropLast<BigInteger>(xs);
+        xs = _in0;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<BigInteger> FromNat(BigInteger n) {
+      Dafny.ISequence<BigInteger> _0___accumulator = Dafny.Sequence<BigInteger>.FromElements();
+    TAIL_CALL_START: ;
+      if ((n).Sign == 0) {
+        return Dafny.Sequence<BigInteger>.Concat(_0___accumulator, Dafny.Sequence<BigInteger>.FromElements());
+      } else {
+        _0___accumulator = Dafny.Sequence<BigInteger>.Concat(_0___accumulator, Dafny.Sequence<BigInteger>.FromElements(Dafny.Helpers.EuclideanModulus(n, Std.Strings.HexConversion.__default.BASE())));
+        BigInteger _in0 = Dafny.Helpers.EuclideanDivision(n, Std.Strings.HexConversion.__default.BASE());
+        n = _in0;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<BigInteger> SeqExtend(Dafny.ISequence<BigInteger> xs, BigInteger n)
+    {
+    TAIL_CALL_START: ;
+      if ((new BigInteger((xs).Count)) >= (n)) {
+        return xs;
+      } else {
+        Dafny.ISequence<BigInteger> _in0 = Dafny.Sequence<BigInteger>.Concat(xs, Dafny.Sequence<BigInteger>.FromElements(BigInteger.Zero));
+        BigInteger _in1 = n;
+        xs = _in0;
+        n = _in1;
+        goto TAIL_CALL_START;
+      }
+    }
+    public static Dafny.ISequence<BigInteger> SeqExtendMultiple(Dafny.ISequence<BigInteger> xs, BigInteger n)
+    {
+      BigInteger _0_newLen = ((new BigInteger((xs).Count)) + (n)) - (Dafny.Helpers.EuclideanModulus(new BigInteger((xs).Count), n));
+      return Std.Strings.HexConversion.__default.SeqExtend(xs, _0_newLen);
+    }
+    public static Dafny.ISequence<BigInteger> FromNatWithLen(BigInteger n, BigInteger len)
+    {
+      return Std.Strings.HexConversion.__default.SeqExtend(Std.Strings.HexConversion.__default.FromNat(n), len);
+    }
+    public static Dafny.ISequence<BigInteger> SeqZero(BigInteger len) {
+      Dafny.ISequence<BigInteger> _0_xs = Std.Strings.HexConversion.__default.FromNatWithLen(BigInteger.Zero, len);
+      return _0_xs;
+    }
+    public static _System._ITuple2<Dafny.ISequence<BigInteger>, BigInteger> SeqAdd(Dafny.ISequence<BigInteger> xs, Dafny.ISequence<BigInteger> ys)
+    {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return _System.Tuple2<Dafny.ISequence<BigInteger>, BigInteger>.create(Dafny.Sequence<BigInteger>.FromElements(), BigInteger.Zero);
+      } else {
+        _System._ITuple2<Dafny.ISequence<BigInteger>, BigInteger> _let_tmp_rhs0 = Std.Strings.HexConversion.__default.SeqAdd(Std.Collections.Seq.__default.DropLast<BigInteger>(xs), Std.Collections.Seq.__default.DropLast<BigInteger>(ys));
+        Dafny.ISequence<BigInteger> _0_zs_k = _let_tmp_rhs0.dtor__0;
+        BigInteger _1_cin = _let_tmp_rhs0.dtor__1;
+        BigInteger _2_sum = ((Std.Collections.Seq.__default.Last<BigInteger>(xs)) + (Std.Collections.Seq.__default.Last<BigInteger>(ys))) + (_1_cin);
+        _System._ITuple2<BigInteger, BigInteger> _let_tmp_rhs1 = (((_2_sum) < (Std.Strings.HexConversion.__default.BASE())) ? (_System.Tuple2<BigInteger, BigInteger>.create(_2_sum, BigInteger.Zero)) : (_System.Tuple2<BigInteger, BigInteger>.create((_2_sum) - (Std.Strings.HexConversion.__default.BASE()), BigInteger.One)));
+        BigInteger _3_sum__out = _let_tmp_rhs1.dtor__0;
+        BigInteger _4_cout = _let_tmp_rhs1.dtor__1;
+        return _System.Tuple2<Dafny.ISequence<BigInteger>, BigInteger>.create(Dafny.Sequence<BigInteger>.Concat(_0_zs_k, Dafny.Sequence<BigInteger>.FromElements(_3_sum__out)), _4_cout);
+      }
+    }
+    public static _System._ITuple2<Dafny.ISequence<BigInteger>, BigInteger> SeqSub(Dafny.ISequence<BigInteger> xs, Dafny.ISequence<BigInteger> ys)
+    {
+      if ((new BigInteger((xs).Count)).Sign == 0) {
+        return _System.Tuple2<Dafny.ISequence<BigInteger>, BigInteger>.create(Dafny.Sequence<BigInteger>.FromElements(), BigInteger.Zero);
+      } else {
+        _System._ITuple2<Dafny.ISequence<BigInteger>, BigInteger> _let_tmp_rhs0 = Std.Strings.HexConversion.__default.SeqSub(Std.Collections.Seq.__default.DropLast<BigInteger>(xs), Std.Collections.Seq.__default.DropLast<BigInteger>(ys));
+        Dafny.ISequence<BigInteger> _0_zs = _let_tmp_rhs0.dtor__0;
+        BigInteger _1_cin = _let_tmp_rhs0.dtor__1;
+        _System._ITuple2<BigInteger, BigInteger> _let_tmp_rhs1 = (((Std.Collections.Seq.__default.Last<BigInteger>(xs)) >= ((Std.Collections.Seq.__default.Last<BigInteger>(ys)) + (_1_cin))) ? (_System.Tuple2<BigInteger, BigInteger>.create(((Std.Collections.Seq.__default.Last<BigInteger>(xs)) - (Std.Collections.Seq.__default.Last<BigInteger>(ys))) - (_1_cin), BigInteger.Zero)) : (_System.Tuple2<BigInteger, BigInteger>.create((((Std.Strings.HexConversion.__default.BASE()) + (Std.Collections.Seq.__default.Last<BigInteger>(xs))) - (Std.Collections.Seq.__default.Last<BigInteger>(ys))) - (_1_cin), BigInteger.One)));
+        BigInteger _2_diff__out = _let_tmp_rhs1.dtor__0;
+        BigInteger _3_cout = _let_tmp_rhs1.dtor__1;
+        return _System.Tuple2<Dafny.ISequence<BigInteger>, BigInteger>.create(Dafny.Sequence<BigInteger>.Concat(_0_zs, Dafny.Sequence<BigInteger>.FromElements(_2_diff__out)), _3_cout);
+      }
+    }
+    public static Dafny.ISequence<Dafny.Rune> HEX__DIGITS { get {
+      return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0123456789ABCDEF");
+    } }
+    public static Dafny.ISequence<Dafny.Rune> chars { get {
+      return Std.Strings.HexConversion.__default.HEX__DIGITS;
+    } }
+    public static BigInteger @base { get {
+      return new BigInteger((Std.Strings.HexConversion.__default.chars).Count);
+    } }
+    public static Dafny.IMap<Dafny.Rune,BigInteger> charToDigit { get {
+      return Dafny.Map<Dafny.Rune, BigInteger>.FromElements(new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('0'), BigInteger.Zero), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('1'), BigInteger.One), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('2'), new BigInteger(2)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('3'), new BigInteger(3)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('4'), new BigInteger(4)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('5'), new BigInteger(5)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('6'), new BigInteger(6)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('7'), new BigInteger(7)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('8'), new BigInteger(8)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('9'), new BigInteger(9)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('a'), new BigInteger(10)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('b'), new BigInteger(11)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('c'), new BigInteger(12)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('d'), new BigInteger(13)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('e'), new BigInteger(14)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('f'), new BigInteger(15)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('A'), new BigInteger(10)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('B'), new BigInteger(11)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('C'), new BigInteger(12)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('D'), new BigInteger(13)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('E'), new BigInteger(14)), new Dafny.Pair<Dafny.Rune, BigInteger>(new Dafny.Rune('F'), new BigInteger(15)));
+    } }
+  }
+
+  public partial class CharSeq {
+    private static readonly Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TYPE = new Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>>(Dafny.Sequence<Dafny.Rune>.Empty);
+    public static Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static bool _Is(Dafny.ISequence<Dafny.Rune> __source) {
+      Dafny.ISequence<Dafny.Rune> _0_chars = __source;
+      return (new BigInteger((_0_chars).Count)) > (BigInteger.One);
+    }
+  }
+
+  public partial class digit {
+    private static readonly Dafny.TypeDescriptor<BigInteger> _TYPE = new Dafny.TypeDescriptor<BigInteger>(BigInteger.Zero);
+    public static Dafny.TypeDescriptor<BigInteger> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static bool _Is(BigInteger __source) {
+      BigInteger _1_i = __source;
+      if (_System.nat._Is(_1_i)) {
+        return ((_1_i).Sign != -1) && ((_1_i) < (Std.Strings.HexConversion.__default.BASE()));
+      }
+      return false;
+    }
+  }
+} // end of namespace Std.Strings.HexConversion
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafny/Std_Wrappers.cs b/Source/DafnyCore/GeneratedFromDafny/Std_Wrappers.cs
new file mode 100644
index 00000000000..6d224dc262e
--- /dev/null
+++ b/Source/DafnyCore/GeneratedFromDafny/Std_Wrappers.cs
@@ -0,0 +1,548 @@
+// Dafny program the_program compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+using System;
+using System.Numerics;
+using System.Collections;
+#pragma warning disable CS0164 // This label has not been referenced
+#pragma warning disable CS0162 // Unreachable code detected
+#pragma warning disable CS1717 // Assignment made to same variable
+
+namespace Std.Wrappers {
+
+  public partial class __default {
+    public static Std.Wrappers._IOutcomeResult<__E> Need<__E>(bool condition, __E error)
+    {
+      if (condition) {
+        return Std.Wrappers.OutcomeResult<__E>.create_Pass_k();
+      } else {
+        return Std.Wrappers.OutcomeResult<__E>.create_Fail_k(error);
+      }
+    }
+  }
+
+  public interface _IOption<out T> {
+    bool is_None { get; }
+    bool is_Some { get; }
+    T dtor_value { get; }
+    _IOption<__T> DowncastClone<__T>(Func<T, __T> converter0);
+    bool IsFailure();
+    Std.Wrappers._IOption<__U> PropagateFailure<__U>();
+    T Extract();
+    Std.Wrappers._IResult<T, __E> ToResult<__E>(__E error);
+    Std.Wrappers._IOutcome<__E> ToOutcome<__E>(__E error);
+  }
+  public abstract class Option<T> : _IOption<T> {
+    public Option() {
+    }
+    public static Std.Wrappers._IOption<T> Default() {
+      return create_None();
+    }
+    public static Dafny.TypeDescriptor<Std.Wrappers._IOption<T>> _TypeDescriptor() {
+      return new Dafny.TypeDescriptor<Std.Wrappers._IOption<T>>(Std.Wrappers.Option<T>.Default());
+    }
+    public static _IOption<T> create_None() {
+      return new Option_None<T>();
+    }
+    public static _IOption<T> create_Some(T @value) {
+      return new Option_Some<T>(@value);
+    }
+    public bool is_None { get { return this is Option_None<T>; } }
+    public bool is_Some { get { return this is Option_Some<T>; } }
+    public T dtor_value {
+      get {
+        var d = this;
+        return ((Option_Some<T>)d)._value;
+      }
+    }
+    public abstract _IOption<__T> DowncastClone<__T>(Func<T, __T> converter0);
+    public bool IsFailure() {
+      return (this).is_None;
+    }
+    public Std.Wrappers._IOption<__U> PropagateFailure<__U>() {
+      return Std.Wrappers.Option<__U>.create_None();
+    }
+    public T Extract() {
+      return (this).dtor_value;
+    }
+    public static T GetOr(Std.Wrappers._IOption<T> _this, T @default) {
+      Std.Wrappers._IOption<T> _source0 = _this;
+      {
+        if (_source0.is_Some) {
+          T _0_v = _source0.dtor_value;
+          return _0_v;
+        }
+      }
+      {
+        return @default;
+      }
+    }
+    public Std.Wrappers._IResult<T, __E> ToResult<__E>(__E error) {
+      Std.Wrappers._IOption<T> _source0 = this;
+      {
+        if (_source0.is_Some) {
+          T _0_v = _source0.dtor_value;
+          return Std.Wrappers.Result<T, __E>.create_Success(_0_v);
+        }
+      }
+      {
+        return Std.Wrappers.Result<T, __E>.create_Failure(error);
+      }
+    }
+    public Std.Wrappers._IOutcome<__E> ToOutcome<__E>(__E error) {
+      Std.Wrappers._IOption<T> _source0 = this;
+      {
+        if (_source0.is_Some) {
+          T _0_v = _source0.dtor_value;
+          return Std.Wrappers.Outcome<__E>.create_Pass();
+        }
+      }
+      {
+        return Std.Wrappers.Outcome<__E>.create_Fail(error);
+      }
+    }
+    public static __FC Map<__FC>(Std.Wrappers._IOption<T> _this, Func<Std.Wrappers._IOption<T>, __FC> rewrap) {
+      return Dafny.Helpers.Id<Func<Std.Wrappers._IOption<T>, __FC>>(rewrap)(_this);
+    }
+  }
+  public class Option_None<T> : Option<T> {
+    public Option_None() : base() {
+    }
+    public override _IOption<__T> DowncastClone<__T>(Func<T, __T> converter0) {
+      if (this is _IOption<__T> dt) { return dt; }
+      return new Option_None<__T>();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Std.Wrappers.Option_None<T>;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Wrappers.Option.None";
+      return s;
+    }
+  }
+  public class Option_Some<T> : Option<T> {
+    public readonly T _value;
+    public Option_Some(T @value) : base() {
+      this._value = @value;
+    }
+    public override _IOption<__T> DowncastClone<__T>(Func<T, __T> converter0) {
+      if (this is _IOption<__T> dt) { return dt; }
+      return new Option_Some<__T>(converter0(_value));
+    }
+    public override bool Equals(object other) {
+      var oth = other as Std.Wrappers.Option_Some<T>;
+      return oth != null && object.Equals(this._value, oth._value);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Wrappers.Option.Some";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IResult<out R, out E> {
+    bool is_Success { get; }
+    bool is_Failure { get; }
+    R dtor_value { get; }
+    E dtor_error { get; }
+    _IResult<__R, __E> DowncastClone<__R, __E>(Func<R, __R> converter0, Func<E, __E> converter1);
+    bool IsFailure();
+    Std.Wrappers._IResult<__U, E> PropagateFailure<__U>();
+    R Extract();
+    Std.Wrappers._IOption<R> ToOption();
+    Std.Wrappers._IOutcome<E> ToOutcome();
+  }
+  public abstract class Result<R, E> : _IResult<R, E> {
+    public Result() {
+    }
+    public static Std.Wrappers._IResult<R, E> Default(R _default_R) {
+      return create_Success(_default_R);
+    }
+    public static Dafny.TypeDescriptor<Std.Wrappers._IResult<R, E>> _TypeDescriptor(Dafny.TypeDescriptor<R> _td_R) {
+      return new Dafny.TypeDescriptor<Std.Wrappers._IResult<R, E>>(Std.Wrappers.Result<R, E>.Default(_td_R.Default()));
+    }
+    public static _IResult<R, E> create_Success(R @value) {
+      return new Result_Success<R, E>(@value);
+    }
+    public static _IResult<R, E> create_Failure(E error) {
+      return new Result_Failure<R, E>(error);
+    }
+    public bool is_Success { get { return this is Result_Success<R, E>; } }
+    public bool is_Failure { get { return this is Result_Failure<R, E>; } }
+    public R dtor_value {
+      get {
+        var d = this;
+        return ((Result_Success<R, E>)d)._value;
+      }
+    }
+    public E dtor_error {
+      get {
+        var d = this;
+        return ((Result_Failure<R, E>)d)._error;
+      }
+    }
+    public abstract _IResult<__R, __E> DowncastClone<__R, __E>(Func<R, __R> converter0, Func<E, __E> converter1);
+    public bool IsFailure() {
+      return (this).is_Failure;
+    }
+    public Std.Wrappers._IResult<__U, E> PropagateFailure<__U>() {
+      return Std.Wrappers.Result<__U, E>.create_Failure((this).dtor_error);
+    }
+    public R Extract() {
+      return (this).dtor_value;
+    }
+    public static R GetOr(Std.Wrappers._IResult<R, E> _this, R @default) {
+      Std.Wrappers._IResult<R, E> _source0 = _this;
+      {
+        if (_source0.is_Success) {
+          R _0_s = _source0.dtor_value;
+          return _0_s;
+        }
+      }
+      {
+        E _1_e = _source0.dtor_error;
+        return @default;
+      }
+    }
+    public Std.Wrappers._IOption<R> ToOption() {
+      Std.Wrappers._IResult<R, E> _source0 = this;
+      {
+        if (_source0.is_Success) {
+          R _0_s = _source0.dtor_value;
+          return Std.Wrappers.Option<R>.create_Some(_0_s);
+        }
+      }
+      {
+        E _1_e = _source0.dtor_error;
+        return Std.Wrappers.Option<R>.create_None();
+      }
+    }
+    public Std.Wrappers._IOutcome<E> ToOutcome() {
+      Std.Wrappers._IResult<R, E> _source0 = this;
+      {
+        if (_source0.is_Success) {
+          R _0_s = _source0.dtor_value;
+          return Std.Wrappers.Outcome<E>.create_Pass();
+        }
+      }
+      {
+        E _1_e = _source0.dtor_error;
+        return Std.Wrappers.Outcome<E>.create_Fail(_1_e);
+      }
+    }
+    public static __FC Map<__FC>(Std.Wrappers._IResult<R, E> _this, Func<Std.Wrappers._IResult<R, E>, __FC> rewrap) {
+      return Dafny.Helpers.Id<Func<Std.Wrappers._IResult<R, E>, __FC>>(rewrap)(_this);
+    }
+    public static Std.Wrappers._IResult<R, __NewE> MapFailure<__NewE>(Std.Wrappers._IResult<R, E> _this, Func<E, __NewE> reWrap) {
+      Std.Wrappers._IResult<R, E> _source0 = _this;
+      {
+        if (_source0.is_Success) {
+          R _0_s = _source0.dtor_value;
+          return Std.Wrappers.Result<R, __NewE>.create_Success(_0_s);
+        }
+      }
+      {
+        E _1_e = _source0.dtor_error;
+        return Std.Wrappers.Result<R, __NewE>.create_Failure(Dafny.Helpers.Id<Func<E, __NewE>>(reWrap)(_1_e));
+      }
+    }
+  }
+  public class Result_Success<R, E> : Result<R, E> {
+    public readonly R _value;
+    public Result_Success(R @value) : base() {
+      this._value = @value;
+    }
+    public override _IResult<__R, __E> DowncastClone<__R, __E>(Func<R, __R> converter0, Func<E, __E> converter1) {
+      if (this is _IResult<__R, __E> dt) { return dt; }
+      return new Result_Success<__R, __E>(converter0(_value));
+    }
+    public override bool Equals(object other) {
+      var oth = other as Std.Wrappers.Result_Success<R, E>;
+      return oth != null && object.Equals(this._value, oth._value);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Wrappers.Result.Success";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._value);
+      s += ")";
+      return s;
+    }
+  }
+  public class Result_Failure<R, E> : Result<R, E> {
+    public readonly E _error;
+    public Result_Failure(E error) : base() {
+      this._error = error;
+    }
+    public override _IResult<__R, __E> DowncastClone<__R, __E>(Func<R, __R> converter0, Func<E, __E> converter1) {
+      if (this is _IResult<__R, __E> dt) { return dt; }
+      return new Result_Failure<__R, __E>(converter1(_error));
+    }
+    public override bool Equals(object other) {
+      var oth = other as Std.Wrappers.Result_Failure<R, E>;
+      return oth != null && object.Equals(this._error, oth._error);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._error));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Wrappers.Result.Failure";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._error);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IOutcome<out E> {
+    bool is_Pass { get; }
+    bool is_Fail { get; }
+    E dtor_error { get; }
+    _IOutcome<__E> DowncastClone<__E>(Func<E, __E> converter0);
+    bool IsFailure();
+    Std.Wrappers._IOutcome<E> PropagateFailure();
+    Std.Wrappers._IOption<__R> ToOption<__R>(__R r);
+    Std.Wrappers._IResult<__R, E> ToResult<__R>(__R r);
+  }
+  public abstract class Outcome<E> : _IOutcome<E> {
+    public Outcome() {
+    }
+    public static Std.Wrappers._IOutcome<E> Default() {
+      return create_Pass();
+    }
+    public static Dafny.TypeDescriptor<Std.Wrappers._IOutcome<E>> _TypeDescriptor() {
+      return new Dafny.TypeDescriptor<Std.Wrappers._IOutcome<E>>(Std.Wrappers.Outcome<E>.Default());
+    }
+    public static _IOutcome<E> create_Pass() {
+      return new Outcome_Pass<E>();
+    }
+    public static _IOutcome<E> create_Fail(E error) {
+      return new Outcome_Fail<E>(error);
+    }
+    public bool is_Pass { get { return this is Outcome_Pass<E>; } }
+    public bool is_Fail { get { return this is Outcome_Fail<E>; } }
+    public E dtor_error {
+      get {
+        var d = this;
+        return ((Outcome_Fail<E>)d)._error;
+      }
+    }
+    public abstract _IOutcome<__E> DowncastClone<__E>(Func<E, __E> converter0);
+    public bool IsFailure() {
+      return (this).is_Fail;
+    }
+    public Std.Wrappers._IOutcome<E> PropagateFailure() {
+      return this;
+    }
+    public Std.Wrappers._IOption<__R> ToOption<__R>(__R r) {
+      Std.Wrappers._IOutcome<E> _source0 = this;
+      {
+        if (_source0.is_Pass) {
+          return Std.Wrappers.Option<__R>.create_Some(r);
+        }
+      }
+      {
+        E _0_e = _source0.dtor_error;
+        return Std.Wrappers.Option<__R>.create_None();
+      }
+    }
+    public Std.Wrappers._IResult<__R, E> ToResult<__R>(__R r) {
+      Std.Wrappers._IOutcome<E> _source0 = this;
+      {
+        if (_source0.is_Pass) {
+          return Std.Wrappers.Result<__R, E>.create_Success(r);
+        }
+      }
+      {
+        E _0_e = _source0.dtor_error;
+        return Std.Wrappers.Result<__R, E>.create_Failure(_0_e);
+      }
+    }
+    public static __FC Map<__FC>(Std.Wrappers._IOutcome<E> _this, Func<Std.Wrappers._IOutcome<E>, __FC> rewrap) {
+      return Dafny.Helpers.Id<Func<Std.Wrappers._IOutcome<E>, __FC>>(rewrap)(_this);
+    }
+    public static Std.Wrappers._IResult<__T, __NewE> MapFailure<__T, __NewE>(Std.Wrappers._IOutcome<E> _this, Func<E, __NewE> rewrap, __T @default)
+    {
+      Std.Wrappers._IOutcome<E> _source0 = _this;
+      {
+        if (_source0.is_Pass) {
+          return Std.Wrappers.Result<__T, __NewE>.create_Success(@default);
+        }
+      }
+      {
+        E _0_e = _source0.dtor_error;
+        return Std.Wrappers.Result<__T, __NewE>.create_Failure(Dafny.Helpers.Id<Func<E, __NewE>>(rewrap)(_0_e));
+      }
+    }
+    public static Std.Wrappers._IOutcome<E> Need(bool condition, E error)
+    {
+      if (condition) {
+        return Std.Wrappers.Outcome<E>.create_Pass();
+      } else {
+        return Std.Wrappers.Outcome<E>.create_Fail(error);
+      }
+    }
+  }
+  public class Outcome_Pass<E> : Outcome<E> {
+    public Outcome_Pass() : base() {
+    }
+    public override _IOutcome<__E> DowncastClone<__E>(Func<E, __E> converter0) {
+      if (this is _IOutcome<__E> dt) { return dt; }
+      return new Outcome_Pass<__E>();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Std.Wrappers.Outcome_Pass<E>;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Wrappers.Outcome.Pass";
+      return s;
+    }
+  }
+  public class Outcome_Fail<E> : Outcome<E> {
+    public readonly E _error;
+    public Outcome_Fail(E error) : base() {
+      this._error = error;
+    }
+    public override _IOutcome<__E> DowncastClone<__E>(Func<E, __E> converter0) {
+      if (this is _IOutcome<__E> dt) { return dt; }
+      return new Outcome_Fail<__E>(converter0(_error));
+    }
+    public override bool Equals(object other) {
+      var oth = other as Std.Wrappers.Outcome_Fail<E>;
+      return oth != null && object.Equals(this._error, oth._error);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._error));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Wrappers.Outcome.Fail";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._error);
+      s += ")";
+      return s;
+    }
+  }
+
+  public interface _IOutcomeResult<out E> {
+    bool is_Pass_k { get; }
+    bool is_Fail_k { get; }
+    E dtor_error { get; }
+    _IOutcomeResult<__E> DowncastClone<__E>(Func<E, __E> converter0);
+    bool IsFailure();
+    Std.Wrappers._IResult<__U, E> PropagateFailure<__U>();
+  }
+  public abstract class OutcomeResult<E> : _IOutcomeResult<E> {
+    public OutcomeResult() {
+    }
+    public static Std.Wrappers._IOutcomeResult<E> Default() {
+      return create_Pass_k();
+    }
+    public static Dafny.TypeDescriptor<Std.Wrappers._IOutcomeResult<E>> _TypeDescriptor() {
+      return new Dafny.TypeDescriptor<Std.Wrappers._IOutcomeResult<E>>(Std.Wrappers.OutcomeResult<E>.Default());
+    }
+    public static _IOutcomeResult<E> create_Pass_k() {
+      return new OutcomeResult_Pass_k<E>();
+    }
+    public static _IOutcomeResult<E> create_Fail_k(E error) {
+      return new OutcomeResult_Fail_k<E>(error);
+    }
+    public bool is_Pass_k { get { return this is OutcomeResult_Pass_k<E>; } }
+    public bool is_Fail_k { get { return this is OutcomeResult_Fail_k<E>; } }
+    public E dtor_error {
+      get {
+        var d = this;
+        return ((OutcomeResult_Fail_k<E>)d)._error;
+      }
+    }
+    public abstract _IOutcomeResult<__E> DowncastClone<__E>(Func<E, __E> converter0);
+    public bool IsFailure() {
+      return (this).is_Fail_k;
+    }
+    public Std.Wrappers._IResult<__U, E> PropagateFailure<__U>() {
+      return Std.Wrappers.Result<__U, E>.create_Failure((this).dtor_error);
+    }
+  }
+  public class OutcomeResult_Pass_k<E> : OutcomeResult<E> {
+    public OutcomeResult_Pass_k() : base() {
+    }
+    public override _IOutcomeResult<__E> DowncastClone<__E>(Func<E, __E> converter0) {
+      if (this is _IOutcomeResult<__E> dt) { return dt; }
+      return new OutcomeResult_Pass_k<__E>();
+    }
+    public override bool Equals(object other) {
+      var oth = other as Std.Wrappers.OutcomeResult_Pass_k<E>;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Wrappers.OutcomeResult.Pass'";
+      return s;
+    }
+  }
+  public class OutcomeResult_Fail_k<E> : OutcomeResult<E> {
+    public readonly E _error;
+    public OutcomeResult_Fail_k(E error) : base() {
+      this._error = error;
+    }
+    public override _IOutcomeResult<__E> DowncastClone<__E>(Func<E, __E> converter0) {
+      if (this is _IOutcomeResult<__E> dt) { return dt; }
+      return new OutcomeResult_Fail_k<__E>(converter0(_error));
+    }
+    public override bool Equals(object other) {
+      var oth = other as Std.Wrappers.OutcomeResult_Fail_k<E>;
+      return oth != null && object.Equals(this._error, oth._error);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 1;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._error));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "Wrappers.OutcomeResult.Fail'";
+      s += "(";
+      s += Dafny.Helpers.ToString(this._error);
+      s += ")";
+      return s;
+    }
+  }
+} // end of namespace Std.Wrappers
\ No newline at end of file
diff --git a/Source/DafnyCore/GeneratedFromDafnyRust.cs b/Source/DafnyCore/GeneratedFromDafnyRust.cs
deleted file mode 100644
index 801e8fa15e2..00000000000
--- a/Source/DafnyCore/GeneratedFromDafnyRust.cs
+++ /dev/null
@@ -1,6486 +0,0 @@
-// Dafny program Dafny-compiler-rust.dfy compiled into C#
-// To recompile, you will need the libraries
-//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
-// but the 'dotnet' tool in net6.0 should pick those up automatically.
-// Optionally, you may want to include compiler switches like
-//     /debug /nowarn:162,164,168,183,219,436,1717,1718
-
-using System;
-using System.Numerics;
-using System.Collections;
-namespace DAST {
-
-
-  public interface _IModule {
-    bool is_Module { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
-    Dafny.ISequence<DAST._IModuleItem> dtor_body { get; }
-    _IModule DowncastClone();
-  }
-  public class Module : _IModule {
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly Dafny.ISequence<DAST._IModuleItem> _body;
-    public Module(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IModuleItem> body) {
-      this._name = name;
-      this._body = body;
-    }
-    public _IModule DowncastClone() {
-      if (this is _IModule dt) { return dt; }
-      return new Module(_name, _body);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Module;
-      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._body, oth._body);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Module.Module";
-      s += "(";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._body);
-      s += ")";
-      return s;
-    }
-    private static readonly DAST._IModule theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._IModuleItem>.Empty);
-    public static DAST._IModule Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IModule> _TYPE = new Dafny.TypeDescriptor<DAST._IModule>(DAST.Module.Default());
-    public static Dafny.TypeDescriptor<DAST._IModule> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IModule create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IModuleItem> body) {
-      return new Module(name, body);
-    }
-    public static _IModule create_Module(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IModuleItem> body) {
-      return create(name, body);
-    }
-    public bool is_Module { get { return true; } }
-    public Dafny.ISequence<Dafny.Rune> dtor_name {
-      get {
-        return this._name;
-      }
-    }
-    public Dafny.ISequence<DAST._IModuleItem> dtor_body {
-      get {
-        return this._body;
-      }
-    }
-  }
-
-  public interface _IModuleItem {
-    bool is_Module { get; }
-    bool is_Class { get; }
-    bool is_Trait { get; }
-    bool is_Newtype { get; }
-    bool is_Datatype { get; }
-    DAST._IModule dtor_Module_a0 { get; }
-    DAST._IClass dtor_Class_a0 { get; }
-    DAST._ITrait dtor_Trait_a0 { get; }
-    DAST._INewtype dtor_Newtype_a0 { get; }
-    DAST._IDatatype dtor_Datatype_a0 { get; }
-    _IModuleItem DowncastClone();
-  }
-  public abstract class ModuleItem : _IModuleItem {
-    public ModuleItem() {
-    }
-    private static readonly DAST._IModuleItem theDefault = create_Module(DAST.Module.Default());
-    public static DAST._IModuleItem Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IModuleItem> _TYPE = new Dafny.TypeDescriptor<DAST._IModuleItem>(DAST.ModuleItem.Default());
-    public static Dafny.TypeDescriptor<DAST._IModuleItem> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IModuleItem create_Module(DAST._IModule _a0) {
-      return new ModuleItem_Module(_a0);
-    }
-    public static _IModuleItem create_Class(DAST._IClass _a0) {
-      return new ModuleItem_Class(_a0);
-    }
-    public static _IModuleItem create_Trait(DAST._ITrait _a0) {
-      return new ModuleItem_Trait(_a0);
-    }
-    public static _IModuleItem create_Newtype(DAST._INewtype _a0) {
-      return new ModuleItem_Newtype(_a0);
-    }
-    public static _IModuleItem create_Datatype(DAST._IDatatype _a0) {
-      return new ModuleItem_Datatype(_a0);
-    }
-    public bool is_Module { get { return this is ModuleItem_Module; } }
-    public bool is_Class { get { return this is ModuleItem_Class; } }
-    public bool is_Trait { get { return this is ModuleItem_Trait; } }
-    public bool is_Newtype { get { return this is ModuleItem_Newtype; } }
-    public bool is_Datatype { get { return this is ModuleItem_Datatype; } }
-    public DAST._IModule dtor_Module_a0 {
-      get {
-        var d = this;
-        return ((ModuleItem_Module)d)._a0;
-      }
-    }
-    public DAST._IClass dtor_Class_a0 {
-      get {
-        var d = this;
-        return ((ModuleItem_Class)d)._a0;
-      }
-    }
-    public DAST._ITrait dtor_Trait_a0 {
-      get {
-        var d = this;
-        return ((ModuleItem_Trait)d)._a0;
-      }
-    }
-    public DAST._INewtype dtor_Newtype_a0 {
-      get {
-        var d = this;
-        return ((ModuleItem_Newtype)d)._a0;
-      }
-    }
-    public DAST._IDatatype dtor_Datatype_a0 {
-      get {
-        var d = this;
-        return ((ModuleItem_Datatype)d)._a0;
-      }
-    }
-    public abstract _IModuleItem DowncastClone();
-  }
-  public class ModuleItem_Module : ModuleItem {
-    public readonly DAST._IModule _a0;
-    public ModuleItem_Module(DAST._IModule _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IModuleItem DowncastClone() {
-      if (this is _IModuleItem dt) { return dt; }
-      return new ModuleItem_Module(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.ModuleItem_Module;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.ModuleItem.Module";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class ModuleItem_Class : ModuleItem {
-    public readonly DAST._IClass _a0;
-    public ModuleItem_Class(DAST._IClass _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IModuleItem DowncastClone() {
-      if (this is _IModuleItem dt) { return dt; }
-      return new ModuleItem_Class(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.ModuleItem_Class;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 1;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.ModuleItem.Class";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class ModuleItem_Trait : ModuleItem {
-    public readonly DAST._ITrait _a0;
-    public ModuleItem_Trait(DAST._ITrait _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IModuleItem DowncastClone() {
-      if (this is _IModuleItem dt) { return dt; }
-      return new ModuleItem_Trait(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.ModuleItem_Trait;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 2;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.ModuleItem.Trait";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class ModuleItem_Newtype : ModuleItem {
-    public readonly DAST._INewtype _a0;
-    public ModuleItem_Newtype(DAST._INewtype _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IModuleItem DowncastClone() {
-      if (this is _IModuleItem dt) { return dt; }
-      return new ModuleItem_Newtype(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.ModuleItem_Newtype;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 3;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.ModuleItem.Newtype";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class ModuleItem_Datatype : ModuleItem {
-    public readonly DAST._IDatatype _a0;
-    public ModuleItem_Datatype(DAST._IDatatype _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IModuleItem DowncastClone() {
-      if (this is _IModuleItem dt) { return dt; }
-      return new ModuleItem_Datatype(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.ModuleItem_Datatype;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 4;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.ModuleItem.Datatype";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-
-  public interface _INewtype {
-    bool is_Newtype { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
-    Dafny.ISequence<DAST._IType> dtor_typeParams { get; }
-    DAST._IType dtor_base { get; }
-    Dafny.ISequence<DAST._IStatement> dtor_witnessStmts { get; }
-    DAST._IOptional<DAST._IExpression> dtor_witnessExpr { get; }
-    _INewtype DowncastClone();
-  }
-  public class Newtype : _INewtype {
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly Dafny.ISequence<DAST._IType> _typeParams;
-    public readonly DAST._IType _base;
-    public readonly Dafny.ISequence<DAST._IStatement> _witnessStmts;
-    public readonly DAST._IOptional<DAST._IExpression> _witnessExpr;
-    public Newtype(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeParams, DAST._IType @base, Dafny.ISequence<DAST._IStatement> witnessStmts, DAST._IOptional<DAST._IExpression> witnessExpr) {
-      this._name = name;
-      this._typeParams = typeParams;
-      this._base = @base;
-      this._witnessStmts = witnessStmts;
-      this._witnessExpr = witnessExpr;
-    }
-    public _INewtype DowncastClone() {
-      if (this is _INewtype dt) { return dt; }
-      return new Newtype(_name, _typeParams, _base, _witnessStmts, _witnessExpr);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Newtype;
-      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._base, oth._base) && object.Equals(this._witnessStmts, oth._witnessStmts) && object.Equals(this._witnessExpr, oth._witnessExpr);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._base));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._witnessStmts));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._witnessExpr));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Newtype.Newtype";
-      s += "(";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typeParams);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._base);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._witnessStmts);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._witnessExpr);
-      s += ")";
-      return s;
-    }
-    private static readonly DAST._INewtype theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._IType>.Empty, DAST.Type.Default(), Dafny.Sequence<DAST._IStatement>.Empty, DAST.Optional<DAST._IExpression>.Default());
-    public static DAST._INewtype Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._INewtype> _TYPE = new Dafny.TypeDescriptor<DAST._INewtype>(DAST.Newtype.Default());
-    public static Dafny.TypeDescriptor<DAST._INewtype> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _INewtype create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeParams, DAST._IType @base, Dafny.ISequence<DAST._IStatement> witnessStmts, DAST._IOptional<DAST._IExpression> witnessExpr) {
-      return new Newtype(name, typeParams, @base, witnessStmts, witnessExpr);
-    }
-    public static _INewtype create_Newtype(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeParams, DAST._IType @base, Dafny.ISequence<DAST._IStatement> witnessStmts, DAST._IOptional<DAST._IExpression> witnessExpr) {
-      return create(name, typeParams, @base, witnessStmts, witnessExpr);
-    }
-    public bool is_Newtype { get { return true; } }
-    public Dafny.ISequence<Dafny.Rune> dtor_name {
-      get {
-        return this._name;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_typeParams {
-      get {
-        return this._typeParams;
-      }
-    }
-    public DAST._IType dtor_base {
-      get {
-        return this._base;
-      }
-    }
-    public Dafny.ISequence<DAST._IStatement> dtor_witnessStmts {
-      get {
-        return this._witnessStmts;
-      }
-    }
-    public DAST._IOptional<DAST._IExpression> dtor_witnessExpr {
-      get {
-        return this._witnessExpr;
-      }
-    }
-  }
-
-  public interface _IType {
-    bool is_Path { get; }
-    bool is_Tuple { get; }
-    bool is_Array { get; }
-    bool is_Seq { get; }
-    bool is_Set { get; }
-    bool is_Multiset { get; }
-    bool is_Map { get; }
-    bool is_Arrow { get; }
-    bool is_Primitive { get; }
-    bool is_Passthrough { get; }
-    bool is_TypeArg { get; }
-    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_Path_a0 { get; }
-    Dafny.ISequence<DAST._IType> dtor_typeArgs { get; }
-    DAST._IResolvedType dtor_resolved { get; }
-    Dafny.ISequence<DAST._IType> dtor_Tuple_a0 { get; }
-    DAST._IType dtor_element { get; }
-    DAST._IType dtor_key { get; }
-    DAST._IType dtor_value { get; }
-    Dafny.ISequence<DAST._IType> dtor_args { get; }
-    DAST._IType dtor_result { get; }
-    DAST._IPrimitive dtor_Primitive_a0 { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_Passthrough_a0 { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_TypeArg_a0 { get; }
-    _IType DowncastClone();
-  }
-  public abstract class Type : _IType {
-    public Type() {
-    }
-    private static readonly DAST._IType theDefault = create_Path(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty, Dafny.Sequence<DAST._IType>.Empty, DAST.ResolvedType.Default());
-    public static DAST._IType Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IType> _TYPE = new Dafny.TypeDescriptor<DAST._IType>(DAST.Type.Default());
-    public static Dafny.TypeDescriptor<DAST._IType> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IType create_Path(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0, Dafny.ISequence<DAST._IType> typeArgs, DAST._IResolvedType resolved) {
-      return new Type_Path(_a0, typeArgs, resolved);
-    }
-    public static _IType create_Tuple(Dafny.ISequence<DAST._IType> _a0) {
-      return new Type_Tuple(_a0);
-    }
-    public static _IType create_Array(DAST._IType element) {
-      return new Type_Array(element);
-    }
-    public static _IType create_Seq(DAST._IType element) {
-      return new Type_Seq(element);
-    }
-    public static _IType create_Set(DAST._IType element) {
-      return new Type_Set(element);
-    }
-    public static _IType create_Multiset(DAST._IType element) {
-      return new Type_Multiset(element);
-    }
-    public static _IType create_Map(DAST._IType key, DAST._IType @value) {
-      return new Type_Map(key, @value);
-    }
-    public static _IType create_Arrow(Dafny.ISequence<DAST._IType> args, DAST._IType result) {
-      return new Type_Arrow(args, result);
-    }
-    public static _IType create_Primitive(DAST._IPrimitive _a0) {
-      return new Type_Primitive(_a0);
-    }
-    public static _IType create_Passthrough(Dafny.ISequence<Dafny.Rune> _a0) {
-      return new Type_Passthrough(_a0);
-    }
-    public static _IType create_TypeArg(Dafny.ISequence<Dafny.Rune> _a0) {
-      return new Type_TypeArg(_a0);
-    }
-    public bool is_Path { get { return this is Type_Path; } }
-    public bool is_Tuple { get { return this is Type_Tuple; } }
-    public bool is_Array { get { return this is Type_Array; } }
-    public bool is_Seq { get { return this is Type_Seq; } }
-    public bool is_Set { get { return this is Type_Set; } }
-    public bool is_Multiset { get { return this is Type_Multiset; } }
-    public bool is_Map { get { return this is Type_Map; } }
-    public bool is_Arrow { get { return this is Type_Arrow; } }
-    public bool is_Primitive { get { return this is Type_Primitive; } }
-    public bool is_Passthrough { get { return this is Type_Passthrough; } }
-    public bool is_TypeArg { get { return this is Type_TypeArg; } }
-    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_Path_a0 {
-      get {
-        var d = this;
-        return ((Type_Path)d)._a0;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_typeArgs {
-      get {
-        var d = this;
-        return ((Type_Path)d)._typeArgs;
-      }
-    }
-    public DAST._IResolvedType dtor_resolved {
-      get {
-        var d = this;
-        return ((Type_Path)d)._resolved;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_Tuple_a0 {
-      get {
-        var d = this;
-        return ((Type_Tuple)d)._a0;
-      }
-    }
-    public DAST._IType dtor_element {
-      get {
-        var d = this;
-        if (d is Type_Array) { return ((Type_Array)d)._element; }
-        if (d is Type_Seq) { return ((Type_Seq)d)._element; }
-        if (d is Type_Set) { return ((Type_Set)d)._element; }
-        return ((Type_Multiset)d)._element;
-      }
-    }
-    public DAST._IType dtor_key {
-      get {
-        var d = this;
-        return ((Type_Map)d)._key;
-      }
-    }
-    public DAST._IType dtor_value {
-      get {
-        var d = this;
-        return ((Type_Map)d)._value;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_args {
-      get {
-        var d = this;
-        return ((Type_Arrow)d)._args;
-      }
-    }
-    public DAST._IType dtor_result {
-      get {
-        var d = this;
-        return ((Type_Arrow)d)._result;
-      }
-    }
-    public DAST._IPrimitive dtor_Primitive_a0 {
-      get {
-        var d = this;
-        return ((Type_Primitive)d)._a0;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_Passthrough_a0 {
-      get {
-        var d = this;
-        return ((Type_Passthrough)d)._a0;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_TypeArg_a0 {
-      get {
-        var d = this;
-        return ((Type_TypeArg)d)._a0;
-      }
-    }
-    public abstract _IType DowncastClone();
-  }
-  public class Type_Path : Type {
-    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0;
-    public readonly Dafny.ISequence<DAST._IType> _typeArgs;
-    public readonly DAST._IResolvedType _resolved;
-    public Type_Path(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0, Dafny.ISequence<DAST._IType> typeArgs, DAST._IResolvedType resolved) : base() {
-      this._a0 = _a0;
-      this._typeArgs = typeArgs;
-      this._resolved = resolved;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_Path(_a0, _typeArgs, _resolved);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_Path;
-      return oth != null && object.Equals(this._a0, oth._a0) && object.Equals(this._typeArgs, oth._typeArgs) && object.Equals(this._resolved, oth._resolved);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeArgs));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._resolved));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.Path";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typeArgs);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._resolved);
-      s += ")";
-      return s;
-    }
-  }
-  public class Type_Tuple : Type {
-    public readonly Dafny.ISequence<DAST._IType> _a0;
-    public Type_Tuple(Dafny.ISequence<DAST._IType> _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_Tuple(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_Tuple;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 1;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.Tuple";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class Type_Array : Type {
-    public readonly DAST._IType _element;
-    public Type_Array(DAST._IType element) : base() {
-      this._element = element;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_Array(_element);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_Array;
-      return oth != null && object.Equals(this._element, oth._element);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 2;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._element));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.Array";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._element);
-      s += ")";
-      return s;
-    }
-  }
-  public class Type_Seq : Type {
-    public readonly DAST._IType _element;
-    public Type_Seq(DAST._IType element) : base() {
-      this._element = element;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_Seq(_element);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_Seq;
-      return oth != null && object.Equals(this._element, oth._element);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 3;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._element));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.Seq";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._element);
-      s += ")";
-      return s;
-    }
-  }
-  public class Type_Set : Type {
-    public readonly DAST._IType _element;
-    public Type_Set(DAST._IType element) : base() {
-      this._element = element;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_Set(_element);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_Set;
-      return oth != null && object.Equals(this._element, oth._element);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 4;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._element));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.Set";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._element);
-      s += ")";
-      return s;
-    }
-  }
-  public class Type_Multiset : Type {
-    public readonly DAST._IType _element;
-    public Type_Multiset(DAST._IType element) : base() {
-      this._element = element;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_Multiset(_element);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_Multiset;
-      return oth != null && object.Equals(this._element, oth._element);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 5;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._element));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.Multiset";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._element);
-      s += ")";
-      return s;
-    }
-  }
-  public class Type_Map : Type {
-    public readonly DAST._IType _key;
-    public readonly DAST._IType _value;
-    public Type_Map(DAST._IType key, DAST._IType @value) : base() {
-      this._key = key;
-      this._value = @value;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_Map(_key, _value);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_Map;
-      return oth != null && object.Equals(this._key, oth._key) && object.Equals(this._value, oth._value);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 6;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._key));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.Map";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._key);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._value);
-      s += ")";
-      return s;
-    }
-  }
-  public class Type_Arrow : Type {
-    public readonly Dafny.ISequence<DAST._IType> _args;
-    public readonly DAST._IType _result;
-    public Type_Arrow(Dafny.ISequence<DAST._IType> args, DAST._IType result) : base() {
-      this._args = args;
-      this._result = result;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_Arrow(_args, _result);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_Arrow;
-      return oth != null && object.Equals(this._args, oth._args) && object.Equals(this._result, oth._result);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 7;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._result));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.Arrow";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._args);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._result);
-      s += ")";
-      return s;
-    }
-  }
-  public class Type_Primitive : Type {
-    public readonly DAST._IPrimitive _a0;
-    public Type_Primitive(DAST._IPrimitive _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_Primitive(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_Primitive;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 8;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.Primitive";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class Type_Passthrough : Type {
-    public readonly Dafny.ISequence<Dafny.Rune> _a0;
-    public Type_Passthrough(Dafny.ISequence<Dafny.Rune> _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_Passthrough(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_Passthrough;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 9;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.Passthrough";
-      s += "(";
-      s += this._a0.ToVerbatimString(true);
-      s += ")";
-      return s;
-    }
-  }
-  public class Type_TypeArg : Type {
-    public readonly Dafny.ISequence<Dafny.Rune> _a0;
-    public Type_TypeArg(Dafny.ISequence<Dafny.Rune> _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IType DowncastClone() {
-      if (this is _IType dt) { return dt; }
-      return new Type_TypeArg(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Type_TypeArg;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 10;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Type.TypeArg";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-
-  public interface _IPrimitive {
-    bool is_String { get; }
-    bool is_Bool { get; }
-    bool is_Char { get; }
-    _IPrimitive DowncastClone();
-  }
-  public abstract class Primitive : _IPrimitive {
-    public Primitive() {
-    }
-    private static readonly DAST._IPrimitive theDefault = create_String();
-    public static DAST._IPrimitive Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IPrimitive> _TYPE = new Dafny.TypeDescriptor<DAST._IPrimitive>(DAST.Primitive.Default());
-    public static Dafny.TypeDescriptor<DAST._IPrimitive> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IPrimitive create_String() {
-      return new Primitive_String();
-    }
-    public static _IPrimitive create_Bool() {
-      return new Primitive_Bool();
-    }
-    public static _IPrimitive create_Char() {
-      return new Primitive_Char();
-    }
-    public bool is_String { get { return this is Primitive_String; } }
-    public bool is_Bool { get { return this is Primitive_Bool; } }
-    public bool is_Char { get { return this is Primitive_Char; } }
-    public static System.Collections.Generic.IEnumerable<_IPrimitive> AllSingletonConstructors {
-      get {
-        yield return Primitive.create_String();
-        yield return Primitive.create_Bool();
-        yield return Primitive.create_Char();
-      }
-    }
-    public abstract _IPrimitive DowncastClone();
-  }
-  public class Primitive_String : Primitive {
-    public Primitive_String() : base() {
-    }
-    public override _IPrimitive DowncastClone() {
-      if (this is _IPrimitive dt) { return dt; }
-      return new Primitive_String();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Primitive_String;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Primitive.String";
-      return s;
-    }
-  }
-  public class Primitive_Bool : Primitive {
-    public Primitive_Bool() : base() {
-    }
-    public override _IPrimitive DowncastClone() {
-      if (this is _IPrimitive dt) { return dt; }
-      return new Primitive_Bool();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Primitive_Bool;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 1;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Primitive.Bool";
-      return s;
-    }
-  }
-  public class Primitive_Char : Primitive {
-    public Primitive_Char() : base() {
-    }
-    public override _IPrimitive DowncastClone() {
-      if (this is _IPrimitive dt) { return dt; }
-      return new Primitive_Char();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Primitive_Char;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 2;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Primitive.Char";
-      return s;
-    }
-  }
-
-  public interface _IResolvedType {
-    bool is_Datatype { get; }
-    bool is_Trait { get; }
-    bool is_Newtype { get; }
-    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_path { get; }
-    _IResolvedType DowncastClone();
-  }
-  public abstract class ResolvedType : _IResolvedType {
-    public ResolvedType() {
-    }
-    private static readonly DAST._IResolvedType theDefault = create_Datatype(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Empty);
-    public static DAST._IResolvedType Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IResolvedType> _TYPE = new Dafny.TypeDescriptor<DAST._IResolvedType>(DAST.ResolvedType.Default());
-    public static Dafny.TypeDescriptor<DAST._IResolvedType> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IResolvedType create_Datatype(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path) {
-      return new ResolvedType_Datatype(path);
-    }
-    public static _IResolvedType create_Trait(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path) {
-      return new ResolvedType_Trait(path);
-    }
-    public static _IResolvedType create_Newtype() {
-      return new ResolvedType_Newtype();
-    }
-    public bool is_Datatype { get { return this is ResolvedType_Datatype; } }
-    public bool is_Trait { get { return this is ResolvedType_Trait; } }
-    public bool is_Newtype { get { return this is ResolvedType_Newtype; } }
-    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_path {
-      get {
-        var d = this;
-        if (d is ResolvedType_Datatype) { return ((ResolvedType_Datatype)d)._path; }
-        return ((ResolvedType_Trait)d)._path;
-      }
-    }
-    public abstract _IResolvedType DowncastClone();
-  }
-  public class ResolvedType_Datatype : ResolvedType {
-    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _path;
-    public ResolvedType_Datatype(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path) : base() {
-      this._path = path;
-    }
-    public override _IResolvedType DowncastClone() {
-      if (this is _IResolvedType dt) { return dt; }
-      return new ResolvedType_Datatype(_path);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.ResolvedType_Datatype;
-      return oth != null && object.Equals(this._path, oth._path);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._path));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.ResolvedType.Datatype";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._path);
-      s += ")";
-      return s;
-    }
-  }
-  public class ResolvedType_Trait : ResolvedType {
-    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _path;
-    public ResolvedType_Trait(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path) : base() {
-      this._path = path;
-    }
-    public override _IResolvedType DowncastClone() {
-      if (this is _IResolvedType dt) { return dt; }
-      return new ResolvedType_Trait(_path);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.ResolvedType_Trait;
-      return oth != null && object.Equals(this._path, oth._path);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 1;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._path));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.ResolvedType.Trait";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._path);
-      s += ")";
-      return s;
-    }
-  }
-  public class ResolvedType_Newtype : ResolvedType {
-    public ResolvedType_Newtype() : base() {
-    }
-    public override _IResolvedType DowncastClone() {
-      if (this is _IResolvedType dt) { return dt; }
-      return new ResolvedType_Newtype();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.ResolvedType_Newtype;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 2;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.ResolvedType.Newtype";
-      return s;
-    }
-  }
-
-  public interface _IIdent {
-    bool is_Ident { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_id { get; }
-  }
-  public class Ident : _IIdent {
-    public readonly Dafny.ISequence<Dafny.Rune> _id;
-    public Ident(Dafny.ISequence<Dafny.Rune> id) {
-      this._id = id;
-    }
-    public static Dafny.ISequence<Dafny.Rune> DowncastClone(Dafny.ISequence<Dafny.Rune> _this) {
-      return _this;
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Ident;
-      return oth != null && object.Equals(this._id, oth._id);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._id));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Ident.Ident";
-      s += "(";
-      s += this._id.ToVerbatimString(true);
-      s += ")";
-      return s;
-    }
-    private static readonly Dafny.ISequence<Dafny.Rune> theDefault = Dafny.Sequence<Dafny.Rune>.Empty;
-    public static Dafny.ISequence<Dafny.Rune> Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TYPE = new Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>>(Dafny.Sequence<Dafny.Rune>.Empty);
-    public static Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IIdent create(Dafny.ISequence<Dafny.Rune> id) {
-      return new Ident(id);
-    }
-    public static _IIdent create_Ident(Dafny.ISequence<Dafny.Rune> id) {
-      return create(id);
-    }
-    public bool is_Ident { get { return true; } }
-    public Dafny.ISequence<Dafny.Rune> dtor_id {
-      get {
-        return this._id;
-      }
-    }
-  }
-
-  public interface _IClass {
-    bool is_Class { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
-    Dafny.ISequence<DAST._IType> dtor_superClasses { get; }
-    Dafny.ISequence<DAST._IClassItem> dtor_body { get; }
-    _IClass DowncastClone();
-  }
-  public class Class : _IClass {
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly Dafny.ISequence<DAST._IType> _superClasses;
-    public readonly Dafny.ISequence<DAST._IClassItem> _body;
-    public Class(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> superClasses, Dafny.ISequence<DAST._IClassItem> body) {
-      this._name = name;
-      this._superClasses = superClasses;
-      this._body = body;
-    }
-    public _IClass DowncastClone() {
-      if (this is _IClass dt) { return dt; }
-      return new Class(_name, _superClasses, _body);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Class;
-      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._superClasses, oth._superClasses) && object.Equals(this._body, oth._body);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._superClasses));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Class.Class";
-      s += "(";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._superClasses);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._body);
-      s += ")";
-      return s;
-    }
-    private static readonly DAST._IClass theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._IType>.Empty, Dafny.Sequence<DAST._IClassItem>.Empty);
-    public static DAST._IClass Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IClass> _TYPE = new Dafny.TypeDescriptor<DAST._IClass>(DAST.Class.Default());
-    public static Dafny.TypeDescriptor<DAST._IClass> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IClass create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> superClasses, Dafny.ISequence<DAST._IClassItem> body) {
-      return new Class(name, superClasses, body);
-    }
-    public static _IClass create_Class(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> superClasses, Dafny.ISequence<DAST._IClassItem> body) {
-      return create(name, superClasses, body);
-    }
-    public bool is_Class { get { return true; } }
-    public Dafny.ISequence<Dafny.Rune> dtor_name {
-      get {
-        return this._name;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_superClasses {
-      get {
-        return this._superClasses;
-      }
-    }
-    public Dafny.ISequence<DAST._IClassItem> dtor_body {
-      get {
-        return this._body;
-      }
-    }
-  }
-
-  public interface _ITrait {
-    bool is_Trait { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
-    Dafny.ISequence<DAST._IType> dtor_typeParams { get; }
-    Dafny.ISequence<DAST._IClassItem> dtor_body { get; }
-    _ITrait DowncastClone();
-  }
-  public class Trait : _ITrait {
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly Dafny.ISequence<DAST._IType> _typeParams;
-    public readonly Dafny.ISequence<DAST._IClassItem> _body;
-    public Trait(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeParams, Dafny.ISequence<DAST._IClassItem> body) {
-      this._name = name;
-      this._typeParams = typeParams;
-      this._body = body;
-    }
-    public _ITrait DowncastClone() {
-      if (this is _ITrait dt) { return dt; }
-      return new Trait(_name, _typeParams, _body);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Trait;
-      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._body, oth._body);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Trait.Trait";
-      s += "(";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typeParams);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._body);
-      s += ")";
-      return s;
-    }
-    private static readonly DAST._ITrait theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._IType>.Empty, Dafny.Sequence<DAST._IClassItem>.Empty);
-    public static DAST._ITrait Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._ITrait> _TYPE = new Dafny.TypeDescriptor<DAST._ITrait>(DAST.Trait.Default());
-    public static Dafny.TypeDescriptor<DAST._ITrait> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _ITrait create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeParams, Dafny.ISequence<DAST._IClassItem> body) {
-      return new Trait(name, typeParams, body);
-    }
-    public static _ITrait create_Trait(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeParams, Dafny.ISequence<DAST._IClassItem> body) {
-      return create(name, typeParams, body);
-    }
-    public bool is_Trait { get { return true; } }
-    public Dafny.ISequence<Dafny.Rune> dtor_name {
-      get {
-        return this._name;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_typeParams {
-      get {
-        return this._typeParams;
-      }
-    }
-    public Dafny.ISequence<DAST._IClassItem> dtor_body {
-      get {
-        return this._body;
-      }
-    }
-  }
-
-  public interface _IDatatype {
-    bool is_Datatype { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_enclosingModule { get; }
-    Dafny.ISequence<DAST._IType> dtor_typeParams { get; }
-    Dafny.ISequence<DAST._IDatatypeCtor> dtor_ctors { get; }
-    Dafny.ISequence<DAST._IClassItem> dtor_body { get; }
-    bool dtor_isCo { get; }
-    _IDatatype DowncastClone();
-  }
-  public class Datatype : _IDatatype {
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly Dafny.ISequence<Dafny.Rune> _enclosingModule;
-    public readonly Dafny.ISequence<DAST._IType> _typeParams;
-    public readonly Dafny.ISequence<DAST._IDatatypeCtor> _ctors;
-    public readonly Dafny.ISequence<DAST._IClassItem> _body;
-    public readonly bool _isCo;
-    public Datatype(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> enclosingModule, Dafny.ISequence<DAST._IType> typeParams, Dafny.ISequence<DAST._IDatatypeCtor> ctors, Dafny.ISequence<DAST._IClassItem> body, bool isCo) {
-      this._name = name;
-      this._enclosingModule = enclosingModule;
-      this._typeParams = typeParams;
-      this._ctors = ctors;
-      this._body = body;
-      this._isCo = isCo;
-    }
-    public _IDatatype DowncastClone() {
-      if (this is _IDatatype dt) { return dt; }
-      return new Datatype(_name, _enclosingModule, _typeParams, _ctors, _body, _isCo);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Datatype;
-      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._enclosingModule, oth._enclosingModule) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._ctors, oth._ctors) && object.Equals(this._body, oth._body) && this._isCo == oth._isCo;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._enclosingModule));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._ctors));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isCo));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Datatype.Datatype";
-      s += "(";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._enclosingModule);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typeParams);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._ctors);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._body);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._isCo);
-      s += ")";
-      return s;
-    }
-    private static readonly DAST._IDatatype theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._IType>.Empty, Dafny.Sequence<DAST._IDatatypeCtor>.Empty, Dafny.Sequence<DAST._IClassItem>.Empty, false);
-    public static DAST._IDatatype Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IDatatype> _TYPE = new Dafny.TypeDescriptor<DAST._IDatatype>(DAST.Datatype.Default());
-    public static Dafny.TypeDescriptor<DAST._IDatatype> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IDatatype create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> enclosingModule, Dafny.ISequence<DAST._IType> typeParams, Dafny.ISequence<DAST._IDatatypeCtor> ctors, Dafny.ISequence<DAST._IClassItem> body, bool isCo) {
-      return new Datatype(name, enclosingModule, typeParams, ctors, body, isCo);
-    }
-    public static _IDatatype create_Datatype(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<Dafny.Rune> enclosingModule, Dafny.ISequence<DAST._IType> typeParams, Dafny.ISequence<DAST._IDatatypeCtor> ctors, Dafny.ISequence<DAST._IClassItem> body, bool isCo) {
-      return create(name, enclosingModule, typeParams, ctors, body, isCo);
-    }
-    public bool is_Datatype { get { return true; } }
-    public Dafny.ISequence<Dafny.Rune> dtor_name {
-      get {
-        return this._name;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_enclosingModule {
-      get {
-        return this._enclosingModule;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_typeParams {
-      get {
-        return this._typeParams;
-      }
-    }
-    public Dafny.ISequence<DAST._IDatatypeCtor> dtor_ctors {
-      get {
-        return this._ctors;
-      }
-    }
-    public Dafny.ISequence<DAST._IClassItem> dtor_body {
-      get {
-        return this._body;
-      }
-    }
-    public bool dtor_isCo {
-      get {
-        return this._isCo;
-      }
-    }
-  }
-
-  public interface _IDatatypeCtor {
-    bool is_DatatypeCtor { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
-    Dafny.ISequence<DAST._IFormal> dtor_args { get; }
-    bool dtor_hasAnyArgs { get; }
-    _IDatatypeCtor DowncastClone();
-  }
-  public class DatatypeCtor : _IDatatypeCtor {
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly Dafny.ISequence<DAST._IFormal> _args;
-    public readonly bool _hasAnyArgs;
-    public DatatypeCtor(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IFormal> args, bool hasAnyArgs) {
-      this._name = name;
-      this._args = args;
-      this._hasAnyArgs = hasAnyArgs;
-    }
-    public _IDatatypeCtor DowncastClone() {
-      if (this is _IDatatypeCtor dt) { return dt; }
-      return new DatatypeCtor(_name, _args, _hasAnyArgs);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.DatatypeCtor;
-      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._args, oth._args) && this._hasAnyArgs == oth._hasAnyArgs;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._hasAnyArgs));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.DatatypeCtor.DatatypeCtor";
-      s += "(";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._args);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._hasAnyArgs);
-      s += ")";
-      return s;
-    }
-    private static readonly DAST._IDatatypeCtor theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._IFormal>.Empty, false);
-    public static DAST._IDatatypeCtor Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IDatatypeCtor> _TYPE = new Dafny.TypeDescriptor<DAST._IDatatypeCtor>(DAST.DatatypeCtor.Default());
-    public static Dafny.TypeDescriptor<DAST._IDatatypeCtor> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IDatatypeCtor create(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IFormal> args, bool hasAnyArgs) {
-      return new DatatypeCtor(name, args, hasAnyArgs);
-    }
-    public static _IDatatypeCtor create_DatatypeCtor(Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IFormal> args, bool hasAnyArgs) {
-      return create(name, args, hasAnyArgs);
-    }
-    public bool is_DatatypeCtor { get { return true; } }
-    public Dafny.ISequence<Dafny.Rune> dtor_name {
-      get {
-        return this._name;
-      }
-    }
-    public Dafny.ISequence<DAST._IFormal> dtor_args {
-      get {
-        return this._args;
-      }
-    }
-    public bool dtor_hasAnyArgs {
-      get {
-        return this._hasAnyArgs;
-      }
-    }
-  }
-
-  public interface _IClassItem {
-    bool is_Method { get; }
-    bool is_Field { get; }
-    DAST._IMethod dtor_Method_a0 { get; }
-    DAST._IFormal dtor_Field_a0 { get; }
-    _IClassItem DowncastClone();
-  }
-  public abstract class ClassItem : _IClassItem {
-    public ClassItem() {
-    }
-    private static readonly DAST._IClassItem theDefault = create_Method(DAST.Method.Default());
-    public static DAST._IClassItem Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IClassItem> _TYPE = new Dafny.TypeDescriptor<DAST._IClassItem>(DAST.ClassItem.Default());
-    public static Dafny.TypeDescriptor<DAST._IClassItem> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IClassItem create_Method(DAST._IMethod _a0) {
-      return new ClassItem_Method(_a0);
-    }
-    public static _IClassItem create_Field(DAST._IFormal _a0) {
-      return new ClassItem_Field(_a0);
-    }
-    public bool is_Method { get { return this is ClassItem_Method; } }
-    public bool is_Field { get { return this is ClassItem_Field; } }
-    public DAST._IMethod dtor_Method_a0 {
-      get {
-        var d = this;
-        return ((ClassItem_Method)d)._a0;
-      }
-    }
-    public DAST._IFormal dtor_Field_a0 {
-      get {
-        var d = this;
-        return ((ClassItem_Field)d)._a0;
-      }
-    }
-    public abstract _IClassItem DowncastClone();
-  }
-  public class ClassItem_Method : ClassItem {
-    public readonly DAST._IMethod _a0;
-    public ClassItem_Method(DAST._IMethod _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IClassItem DowncastClone() {
-      if (this is _IClassItem dt) { return dt; }
-      return new ClassItem_Method(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.ClassItem_Method;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.ClassItem.Method";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class ClassItem_Field : ClassItem {
-    public readonly DAST._IFormal _a0;
-    public ClassItem_Field(DAST._IFormal _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IClassItem DowncastClone() {
-      if (this is _IClassItem dt) { return dt; }
-      return new ClassItem_Field(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.ClassItem_Field;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 1;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.ClassItem.Field";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-
-  public interface _IFormal {
-    bool is_Formal { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
-    DAST._IType dtor_typ { get; }
-    _IFormal DowncastClone();
-  }
-  public class Formal : _IFormal {
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly DAST._IType _typ;
-    public Formal(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ) {
-      this._name = name;
-      this._typ = typ;
-    }
-    public _IFormal DowncastClone() {
-      if (this is _IFormal dt) { return dt; }
-      return new Formal(_name, _typ);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Formal;
-      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._typ, oth._typ);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Formal.Formal";
-      s += "(";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typ);
-      s += ")";
-      return s;
-    }
-    private static readonly DAST._IFormal theDefault = create(Dafny.Sequence<Dafny.Rune>.Empty, DAST.Type.Default());
-    public static DAST._IFormal Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IFormal> _TYPE = new Dafny.TypeDescriptor<DAST._IFormal>(DAST.Formal.Default());
-    public static Dafny.TypeDescriptor<DAST._IFormal> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IFormal create(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ) {
-      return new Formal(name, typ);
-    }
-    public static _IFormal create_Formal(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ) {
-      return create(name, typ);
-    }
-    public bool is_Formal { get { return true; } }
-    public Dafny.ISequence<Dafny.Rune> dtor_name {
-      get {
-        return this._name;
-      }
-    }
-    public DAST._IType dtor_typ {
-      get {
-        return this._typ;
-      }
-    }
-  }
-
-  public interface _IMethod {
-    bool is_Method { get; }
-    bool dtor_isStatic { get; }
-    bool dtor_hasBody { get; }
-    DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_overridingPath { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
-    Dafny.ISequence<DAST._IType> dtor_typeParams { get; }
-    Dafny.ISequence<DAST._IFormal> dtor_params { get; }
-    Dafny.ISequence<DAST._IStatement> dtor_body { get; }
-    Dafny.ISequence<DAST._IType> dtor_outTypes { get; }
-    DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_outVars { get; }
-    _IMethod DowncastClone();
-  }
-  public class Method : _IMethod {
-    public readonly bool _isStatic;
-    public readonly bool _hasBody;
-    public readonly DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _overridingPath;
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly Dafny.ISequence<DAST._IType> _typeParams;
-    public readonly Dafny.ISequence<DAST._IFormal> _params;
-    public readonly Dafny.ISequence<DAST._IStatement> _body;
-    public readonly Dafny.ISequence<DAST._IType> _outTypes;
-    public readonly DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _outVars;
-    public Method(bool isStatic, bool hasBody, DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> overridingPath, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeParams, Dafny.ISequence<DAST._IFormal> @params, Dafny.ISequence<DAST._IStatement> body, Dafny.ISequence<DAST._IType> outTypes, DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> outVars) {
-      this._isStatic = isStatic;
-      this._hasBody = hasBody;
-      this._overridingPath = overridingPath;
-      this._name = name;
-      this._typeParams = typeParams;
-      this._params = @params;
-      this._body = body;
-      this._outTypes = outTypes;
-      this._outVars = outVars;
-    }
-    public _IMethod DowncastClone() {
-      if (this is _IMethod dt) { return dt; }
-      return new Method(_isStatic, _hasBody, _overridingPath, _name, _typeParams, _params, _body, _outTypes, _outVars);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Method;
-      return oth != null && this._isStatic == oth._isStatic && this._hasBody == oth._hasBody && object.Equals(this._overridingPath, oth._overridingPath) && object.Equals(this._name, oth._name) && object.Equals(this._typeParams, oth._typeParams) && object.Equals(this._params, oth._params) && object.Equals(this._body, oth._body) && object.Equals(this._outTypes, oth._outTypes) && object.Equals(this._outVars, oth._outVars);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isStatic));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._hasBody));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._overridingPath));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeParams));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._params));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._outTypes));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._outVars));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Method.Method";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._isStatic);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._hasBody);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._overridingPath);
-      s += ", ";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typeParams);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._params);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._body);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._outTypes);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._outVars);
-      s += ")";
-      return s;
-    }
-    private static readonly DAST._IMethod theDefault = create(false, false, DAST.Optional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.Default(), Dafny.Sequence<Dafny.Rune>.Empty, Dafny.Sequence<DAST._IType>.Empty, Dafny.Sequence<DAST._IFormal>.Empty, Dafny.Sequence<DAST._IStatement>.Empty, Dafny.Sequence<DAST._IType>.Empty, DAST.Optional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>>.Default());
-    public static DAST._IMethod Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IMethod> _TYPE = new Dafny.TypeDescriptor<DAST._IMethod>(DAST.Method.Default());
-    public static Dafny.TypeDescriptor<DAST._IMethod> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IMethod create(bool isStatic, bool hasBody, DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> overridingPath, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeParams, Dafny.ISequence<DAST._IFormal> @params, Dafny.ISequence<DAST._IStatement> body, Dafny.ISequence<DAST._IType> outTypes, DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> outVars) {
-      return new Method(isStatic, hasBody, overridingPath, name, typeParams, @params, body, outTypes, outVars);
-    }
-    public static _IMethod create_Method(bool isStatic, bool hasBody, DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> overridingPath, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeParams, Dafny.ISequence<DAST._IFormal> @params, Dafny.ISequence<DAST._IStatement> body, Dafny.ISequence<DAST._IType> outTypes, DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> outVars) {
-      return create(isStatic, hasBody, overridingPath, name, typeParams, @params, body, outTypes, outVars);
-    }
-    public bool is_Method { get { return true; } }
-    public bool dtor_isStatic {
-      get {
-        return this._isStatic;
-      }
-    }
-    public bool dtor_hasBody {
-      get {
-        return this._hasBody;
-      }
-    }
-    public DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_overridingPath {
-      get {
-        return this._overridingPath;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_name {
-      get {
-        return this._name;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_typeParams {
-      get {
-        return this._typeParams;
-      }
-    }
-    public Dafny.ISequence<DAST._IFormal> dtor_params {
-      get {
-        return this._params;
-      }
-    }
-    public Dafny.ISequence<DAST._IStatement> dtor_body {
-      get {
-        return this._body;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_outTypes {
-      get {
-        return this._outTypes;
-      }
-    }
-    public DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_outVars {
-      get {
-        return this._outVars;
-      }
-    }
-  }
-
-  public interface _IOptional<T> {
-    bool is_Some { get; }
-    bool is_None { get; }
-    T dtor_Some_a0 { get; }
-    _IOptional<__T> DowncastClone<__T>(Func<T, __T> converter0);
-  }
-  public abstract class Optional<T> : _IOptional<T> {
-    public Optional() {
-    }
-    public static DAST._IOptional<T> Default() {
-      return create_None();
-    }
-    public static Dafny.TypeDescriptor<DAST._IOptional<T>> _TypeDescriptor() {
-      return new Dafny.TypeDescriptor<DAST._IOptional<T>>(DAST.Optional<T>.Default());
-    }
-    public static _IOptional<T> create_Some(T _a0) {
-      return new Optional_Some<T>(_a0);
-    }
-    public static _IOptional<T> create_None() {
-      return new Optional_None<T>();
-    }
-    public bool is_Some { get { return this is Optional_Some<T>; } }
-    public bool is_None { get { return this is Optional_None<T>; } }
-    public T dtor_Some_a0 {
-      get {
-        var d = this;
-        return ((Optional_Some<T>)d)._a0;
-      }
-    }
-    public abstract _IOptional<__T> DowncastClone<__T>(Func<T, __T> converter0);
-  }
-  public class Optional_Some<T> : Optional<T> {
-    public readonly T _a0;
-    public Optional_Some(T _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IOptional<__T> DowncastClone<__T>(Func<T, __T> converter0) {
-      if (this is _IOptional<__T> dt) { return dt; }
-      return new Optional_Some<__T>(converter0(_a0));
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Optional_Some<T>;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Optional.Some";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class Optional_None<T> : Optional<T> {
-    public Optional_None() : base() {
-    }
-    public override _IOptional<__T> DowncastClone<__T>(Func<T, __T> converter0) {
-      if (this is _IOptional<__T> dt) { return dt; }
-      return new Optional_None<__T>();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Optional_None<T>;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 1;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Optional.None";
-      return s;
-    }
-  }
-
-  public interface _IStatement {
-    bool is_DeclareVar { get; }
-    bool is_Assign { get; }
-    bool is_If { get; }
-    bool is_While { get; }
-    bool is_Call { get; }
-    bool is_Return { get; }
-    bool is_EarlyReturn { get; }
-    bool is_Halt { get; }
-    bool is_Print { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
-    DAST._IType dtor_typ { get; }
-    DAST._IOptional<DAST._IExpression> dtor_maybeValue { get; }
-    DAST._IExpression dtor_value { get; }
-    DAST._IExpression dtor_cond { get; }
-    Dafny.ISequence<DAST._IStatement> dtor_thn { get; }
-    Dafny.ISequence<DAST._IStatement> dtor_els { get; }
-    Dafny.ISequence<DAST._IStatement> dtor_body { get; }
-    DAST._IExpression dtor_on { get; }
-    Dafny.ISequence<DAST._IType> dtor_typeArgs { get; }
-    Dafny.ISequence<DAST._IExpression> dtor_args { get; }
-    DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_outs { get; }
-    DAST._IExpression dtor_expr { get; }
-    DAST._IExpression dtor_Print_a0 { get; }
-    _IStatement DowncastClone();
-  }
-  public abstract class Statement : _IStatement {
-    public Statement() {
-    }
-    private static readonly DAST._IStatement theDefault = create_DeclareVar(Dafny.Sequence<Dafny.Rune>.Empty, DAST.Type.Default(), DAST.Optional<DAST._IExpression>.Default());
-    public static DAST._IStatement Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IStatement> _TYPE = new Dafny.TypeDescriptor<DAST._IStatement>(DAST.Statement.Default());
-    public static Dafny.TypeDescriptor<DAST._IStatement> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IStatement create_DeclareVar(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ, DAST._IOptional<DAST._IExpression> maybeValue) {
-      return new Statement_DeclareVar(name, typ, maybeValue);
-    }
-    public static _IStatement create_Assign(Dafny.ISequence<Dafny.Rune> name, DAST._IExpression @value) {
-      return new Statement_Assign(name, @value);
-    }
-    public static _IStatement create_If(DAST._IExpression cond, Dafny.ISequence<DAST._IStatement> thn, Dafny.ISequence<DAST._IStatement> els) {
-      return new Statement_If(cond, thn, els);
-    }
-    public static _IStatement create_While(DAST._IExpression cond, Dafny.ISequence<DAST._IStatement> body) {
-      return new Statement_While(cond, body);
-    }
-    public static _IStatement create_Call(DAST._IExpression @on, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args, DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> outs) {
-      return new Statement_Call(@on, name, typeArgs, args, outs);
-    }
-    public static _IStatement create_Return(DAST._IExpression expr) {
-      return new Statement_Return(expr);
-    }
-    public static _IStatement create_EarlyReturn() {
-      return new Statement_EarlyReturn();
-    }
-    public static _IStatement create_Halt() {
-      return new Statement_Halt();
-    }
-    public static _IStatement create_Print(DAST._IExpression _a0) {
-      return new Statement_Print(_a0);
-    }
-    public bool is_DeclareVar { get { return this is Statement_DeclareVar; } }
-    public bool is_Assign { get { return this is Statement_Assign; } }
-    public bool is_If { get { return this is Statement_If; } }
-    public bool is_While { get { return this is Statement_While; } }
-    public bool is_Call { get { return this is Statement_Call; } }
-    public bool is_Return { get { return this is Statement_Return; } }
-    public bool is_EarlyReturn { get { return this is Statement_EarlyReturn; } }
-    public bool is_Halt { get { return this is Statement_Halt; } }
-    public bool is_Print { get { return this is Statement_Print; } }
-    public Dafny.ISequence<Dafny.Rune> dtor_name {
-      get {
-        var d = this;
-        if (d is Statement_DeclareVar) { return ((Statement_DeclareVar)d)._name; }
-        if (d is Statement_Assign) { return ((Statement_Assign)d)._name; }
-        return ((Statement_Call)d)._name;
-      }
-    }
-    public DAST._IType dtor_typ {
-      get {
-        var d = this;
-        return ((Statement_DeclareVar)d)._typ;
-      }
-    }
-    public DAST._IOptional<DAST._IExpression> dtor_maybeValue {
-      get {
-        var d = this;
-        return ((Statement_DeclareVar)d)._maybeValue;
-      }
-    }
-    public DAST._IExpression dtor_value {
-      get {
-        var d = this;
-        return ((Statement_Assign)d)._value;
-      }
-    }
-    public DAST._IExpression dtor_cond {
-      get {
-        var d = this;
-        if (d is Statement_If) { return ((Statement_If)d)._cond; }
-        return ((Statement_While)d)._cond;
-      }
-    }
-    public Dafny.ISequence<DAST._IStatement> dtor_thn {
-      get {
-        var d = this;
-        return ((Statement_If)d)._thn;
-      }
-    }
-    public Dafny.ISequence<DAST._IStatement> dtor_els {
-      get {
-        var d = this;
-        return ((Statement_If)d)._els;
-      }
-    }
-    public Dafny.ISequence<DAST._IStatement> dtor_body {
-      get {
-        var d = this;
-        return ((Statement_While)d)._body;
-      }
-    }
-    public DAST._IExpression dtor_on {
-      get {
-        var d = this;
-        return ((Statement_Call)d)._on;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_typeArgs {
-      get {
-        var d = this;
-        return ((Statement_Call)d)._typeArgs;
-      }
-    }
-    public Dafny.ISequence<DAST._IExpression> dtor_args {
-      get {
-        var d = this;
-        return ((Statement_Call)d)._args;
-      }
-    }
-    public DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> dtor_outs {
-      get {
-        var d = this;
-        return ((Statement_Call)d)._outs;
-      }
-    }
-    public DAST._IExpression dtor_expr {
-      get {
-        var d = this;
-        return ((Statement_Return)d)._expr;
-      }
-    }
-    public DAST._IExpression dtor_Print_a0 {
-      get {
-        var d = this;
-        return ((Statement_Print)d)._a0;
-      }
-    }
-    public abstract _IStatement DowncastClone();
-  }
-  public class Statement_DeclareVar : Statement {
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly DAST._IType _typ;
-    public readonly DAST._IOptional<DAST._IExpression> _maybeValue;
-    public Statement_DeclareVar(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ, DAST._IOptional<DAST._IExpression> maybeValue) : base() {
-      this._name = name;
-      this._typ = typ;
-      this._maybeValue = maybeValue;
-    }
-    public override _IStatement DowncastClone() {
-      if (this is _IStatement dt) { return dt; }
-      return new Statement_DeclareVar(_name, _typ, _maybeValue);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Statement_DeclareVar;
-      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._typ, oth._typ) && object.Equals(this._maybeValue, oth._maybeValue);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._maybeValue));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Statement.DeclareVar";
-      s += "(";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typ);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._maybeValue);
-      s += ")";
-      return s;
-    }
-  }
-  public class Statement_Assign : Statement {
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly DAST._IExpression _value;
-    public Statement_Assign(Dafny.ISequence<Dafny.Rune> name, DAST._IExpression @value) : base() {
-      this._name = name;
-      this._value = @value;
-    }
-    public override _IStatement DowncastClone() {
-      if (this is _IStatement dt) { return dt; }
-      return new Statement_Assign(_name, _value);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Statement_Assign;
-      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._value, oth._value);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 1;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Statement.Assign";
-      s += "(";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._value);
-      s += ")";
-      return s;
-    }
-  }
-  public class Statement_If : Statement {
-    public readonly DAST._IExpression _cond;
-    public readonly Dafny.ISequence<DAST._IStatement> _thn;
-    public readonly Dafny.ISequence<DAST._IStatement> _els;
-    public Statement_If(DAST._IExpression cond, Dafny.ISequence<DAST._IStatement> thn, Dafny.ISequence<DAST._IStatement> els) : base() {
-      this._cond = cond;
-      this._thn = thn;
-      this._els = els;
-    }
-    public override _IStatement DowncastClone() {
-      if (this is _IStatement dt) { return dt; }
-      return new Statement_If(_cond, _thn, _els);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Statement_If;
-      return oth != null && object.Equals(this._cond, oth._cond) && object.Equals(this._thn, oth._thn) && object.Equals(this._els, oth._els);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 2;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._cond));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._thn));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._els));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Statement.If";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._cond);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._thn);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._els);
-      s += ")";
-      return s;
-    }
-  }
-  public class Statement_While : Statement {
-    public readonly DAST._IExpression _cond;
-    public readonly Dafny.ISequence<DAST._IStatement> _body;
-    public Statement_While(DAST._IExpression cond, Dafny.ISequence<DAST._IStatement> body) : base() {
-      this._cond = cond;
-      this._body = body;
-    }
-    public override _IStatement DowncastClone() {
-      if (this is _IStatement dt) { return dt; }
-      return new Statement_While(_cond, _body);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Statement_While;
-      return oth != null && object.Equals(this._cond, oth._cond) && object.Equals(this._body, oth._body);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 3;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._cond));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Statement.While";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._cond);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._body);
-      s += ")";
-      return s;
-    }
-  }
-  public class Statement_Call : Statement {
-    public readonly DAST._IExpression _on;
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly Dafny.ISequence<DAST._IType> _typeArgs;
-    public readonly Dafny.ISequence<DAST._IExpression> _args;
-    public readonly DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _outs;
-    public Statement_Call(DAST._IExpression @on, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args, DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> outs) : base() {
-      this._on = @on;
-      this._name = name;
-      this._typeArgs = typeArgs;
-      this._args = args;
-      this._outs = outs;
-    }
-    public override _IStatement DowncastClone() {
-      if (this is _IStatement dt) { return dt; }
-      return new Statement_Call(_on, _name, _typeArgs, _args, _outs);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Statement_Call;
-      return oth != null && object.Equals(this._on, oth._on) && object.Equals(this._name, oth._name) && object.Equals(this._typeArgs, oth._typeArgs) && object.Equals(this._args, oth._args) && object.Equals(this._outs, oth._outs);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 4;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._on));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeArgs));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._outs));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Statement.Call";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._on);
-      s += ", ";
-      s += this._name.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typeArgs);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._args);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._outs);
-      s += ")";
-      return s;
-    }
-  }
-  public class Statement_Return : Statement {
-    public readonly DAST._IExpression _expr;
-    public Statement_Return(DAST._IExpression expr) : base() {
-      this._expr = expr;
-    }
-    public override _IStatement DowncastClone() {
-      if (this is _IStatement dt) { return dt; }
-      return new Statement_Return(_expr);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Statement_Return;
-      return oth != null && object.Equals(this._expr, oth._expr);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 5;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Statement.Return";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._expr);
-      s += ")";
-      return s;
-    }
-  }
-  public class Statement_EarlyReturn : Statement {
-    public Statement_EarlyReturn() : base() {
-    }
-    public override _IStatement DowncastClone() {
-      if (this is _IStatement dt) { return dt; }
-      return new Statement_EarlyReturn();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Statement_EarlyReturn;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 6;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Statement.EarlyReturn";
-      return s;
-    }
-  }
-  public class Statement_Halt : Statement {
-    public Statement_Halt() : base() {
-    }
-    public override _IStatement DowncastClone() {
-      if (this is _IStatement dt) { return dt; }
-      return new Statement_Halt();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Statement_Halt;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 7;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Statement.Halt";
-      return s;
-    }
-  }
-  public class Statement_Print : Statement {
-    public readonly DAST._IExpression _a0;
-    public Statement_Print(DAST._IExpression _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IStatement DowncastClone() {
-      if (this is _IStatement dt) { return dt; }
-      return new Statement_Print(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Statement_Print;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 8;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Statement.Print";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-
-  public interface _IExpression {
-    bool is_Literal { get; }
-    bool is_Ident { get; }
-    bool is_Companion { get; }
-    bool is_Tuple { get; }
-    bool is_New { get; }
-    bool is_NewArray { get; }
-    bool is_DatatypeValue { get; }
-    bool is_SubsetUpgrade { get; }
-    bool is_SubsetDowngrade { get; }
-    bool is_SeqValue { get; }
-    bool is_SetValue { get; }
-    bool is_This { get; }
-    bool is_Ite { get; }
-    bool is_UnOp { get; }
-    bool is_BinOp { get; }
-    bool is_Select { get; }
-    bool is_SelectFn { get; }
-    bool is_TupleSelect { get; }
-    bool is_Call { get; }
-    bool is_Lambda { get; }
-    bool is_IIFE { get; }
-    bool is_Apply { get; }
-    bool is_TypeTest { get; }
-    bool is_InitializationValue { get; }
-    DAST._ILiteral dtor_Literal_a0 { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_Ident_a0 { get; }
-    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_Companion_a0 { get; }
-    Dafny.ISequence<DAST._IExpression> dtor_Tuple_a0 { get; }
-    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_path { get; }
-    Dafny.ISequence<DAST._IExpression> dtor_args { get; }
-    Dafny.ISequence<DAST._IExpression> dtor_dims { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_variant { get; }
-    bool dtor_isCo { get; }
-    Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> dtor_contents { get; }
-    DAST._IExpression dtor_value { get; }
-    DAST._IType dtor_typ { get; }
-    Dafny.ISequence<DAST._IExpression> dtor_elements { get; }
-    DAST._IExpression dtor_cond { get; }
-    DAST._IExpression dtor_thn { get; }
-    DAST._IExpression dtor_els { get; }
-    DAST._IUnaryOp dtor_unOp { get; }
-    DAST._IExpression dtor_expr { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_op { get; }
-    DAST._IExpression dtor_left { get; }
-    DAST._IExpression dtor_right { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_field { get; }
-    bool dtor_onDatatype { get; }
-    bool dtor_isStatic { get; }
-    BigInteger dtor_arity { get; }
-    BigInteger dtor_index { get; }
-    DAST._IExpression dtor_on { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_name { get; }
-    Dafny.ISequence<DAST._IType> dtor_typeArgs { get; }
-    Dafny.ISequence<DAST._IFormal> dtor_params { get; }
-    DAST._IType dtor_retType { get; }
-    Dafny.ISequence<DAST._IStatement> dtor_body { get; }
-    DAST._IExpression dtor_iifeBody { get; }
-    Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_dType { get; }
-    _IExpression DowncastClone();
-  }
-  public abstract class Expression : _IExpression {
-    public Expression() {
-    }
-    private static readonly DAST._IExpression theDefault = create_Literal(DAST.Literal.Default());
-    public static DAST._IExpression Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IExpression> _TYPE = new Dafny.TypeDescriptor<DAST._IExpression>(DAST.Expression.Default());
-    public static Dafny.TypeDescriptor<DAST._IExpression> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IExpression create_Literal(DAST._ILiteral _a0) {
-      return new Expression_Literal(_a0);
-    }
-    public static _IExpression create_Ident(Dafny.ISequence<Dafny.Rune> _a0) {
-      return new Expression_Ident(_a0);
-    }
-    public static _IExpression create_Companion(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0) {
-      return new Expression_Companion(_a0);
-    }
-    public static _IExpression create_Tuple(Dafny.ISequence<DAST._IExpression> _a0) {
-      return new Expression_Tuple(_a0);
-    }
-    public static _IExpression create_New(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path, Dafny.ISequence<DAST._IExpression> args) {
-      return new Expression_New(path, args);
-    }
-    public static _IExpression create_NewArray(Dafny.ISequence<DAST._IExpression> dims) {
-      return new Expression_NewArray(dims);
-    }
-    public static _IExpression create_DatatypeValue(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path, Dafny.ISequence<Dafny.Rune> variant, bool isCo, Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> contents) {
-      return new Expression_DatatypeValue(path, variant, isCo, contents);
-    }
-    public static _IExpression create_SubsetUpgrade(DAST._IExpression @value, DAST._IType typ) {
-      return new Expression_SubsetUpgrade(@value, typ);
-    }
-    public static _IExpression create_SubsetDowngrade(DAST._IExpression @value) {
-      return new Expression_SubsetDowngrade(@value);
-    }
-    public static _IExpression create_SeqValue(Dafny.ISequence<DAST._IExpression> elements) {
-      return new Expression_SeqValue(elements);
-    }
-    public static _IExpression create_SetValue(Dafny.ISequence<DAST._IExpression> elements) {
-      return new Expression_SetValue(elements);
-    }
-    public static _IExpression create_This() {
-      return new Expression_This();
-    }
-    public static _IExpression create_Ite(DAST._IExpression cond, DAST._IExpression thn, DAST._IExpression els) {
-      return new Expression_Ite(cond, thn, els);
-    }
-    public static _IExpression create_UnOp(DAST._IUnaryOp unOp, DAST._IExpression expr) {
-      return new Expression_UnOp(unOp, expr);
-    }
-    public static _IExpression create_BinOp(Dafny.ISequence<Dafny.Rune> op, DAST._IExpression left, DAST._IExpression right) {
-      return new Expression_BinOp(op, left, right);
-    }
-    public static _IExpression create_Select(DAST._IExpression expr, Dafny.ISequence<Dafny.Rune> field, bool onDatatype) {
-      return new Expression_Select(expr, field, onDatatype);
-    }
-    public static _IExpression create_SelectFn(DAST._IExpression expr, Dafny.ISequence<Dafny.Rune> field, bool onDatatype, bool isStatic, BigInteger arity) {
-      return new Expression_SelectFn(expr, field, onDatatype, isStatic, arity);
-    }
-    public static _IExpression create_TupleSelect(DAST._IExpression expr, BigInteger index) {
-      return new Expression_TupleSelect(expr, index);
-    }
-    public static _IExpression create_Call(DAST._IExpression @on, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args) {
-      return new Expression_Call(@on, name, typeArgs, args);
-    }
-    public static _IExpression create_Lambda(Dafny.ISequence<DAST._IFormal> @params, DAST._IType retType, Dafny.ISequence<DAST._IStatement> body) {
-      return new Expression_Lambda(@params, retType, body);
-    }
-    public static _IExpression create_IIFE(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ, DAST._IExpression @value, DAST._IExpression iifeBody) {
-      return new Expression_IIFE(name, typ, @value, iifeBody);
-    }
-    public static _IExpression create_Apply(DAST._IExpression expr, Dafny.ISequence<DAST._IExpression> args) {
-      return new Expression_Apply(expr, args);
-    }
-    public static _IExpression create_TypeTest(DAST._IExpression @on, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dType, Dafny.ISequence<Dafny.Rune> variant) {
-      return new Expression_TypeTest(@on, dType, variant);
-    }
-    public static _IExpression create_InitializationValue(DAST._IType typ) {
-      return new Expression_InitializationValue(typ);
-    }
-    public bool is_Literal { get { return this is Expression_Literal; } }
-    public bool is_Ident { get { return this is Expression_Ident; } }
-    public bool is_Companion { get { return this is Expression_Companion; } }
-    public bool is_Tuple { get { return this is Expression_Tuple; } }
-    public bool is_New { get { return this is Expression_New; } }
-    public bool is_NewArray { get { return this is Expression_NewArray; } }
-    public bool is_DatatypeValue { get { return this is Expression_DatatypeValue; } }
-    public bool is_SubsetUpgrade { get { return this is Expression_SubsetUpgrade; } }
-    public bool is_SubsetDowngrade { get { return this is Expression_SubsetDowngrade; } }
-    public bool is_SeqValue { get { return this is Expression_SeqValue; } }
-    public bool is_SetValue { get { return this is Expression_SetValue; } }
-    public bool is_This { get { return this is Expression_This; } }
-    public bool is_Ite { get { return this is Expression_Ite; } }
-    public bool is_UnOp { get { return this is Expression_UnOp; } }
-    public bool is_BinOp { get { return this is Expression_BinOp; } }
-    public bool is_Select { get { return this is Expression_Select; } }
-    public bool is_SelectFn { get { return this is Expression_SelectFn; } }
-    public bool is_TupleSelect { get { return this is Expression_TupleSelect; } }
-    public bool is_Call { get { return this is Expression_Call; } }
-    public bool is_Lambda { get { return this is Expression_Lambda; } }
-    public bool is_IIFE { get { return this is Expression_IIFE; } }
-    public bool is_Apply { get { return this is Expression_Apply; } }
-    public bool is_TypeTest { get { return this is Expression_TypeTest; } }
-    public bool is_InitializationValue { get { return this is Expression_InitializationValue; } }
-    public DAST._ILiteral dtor_Literal_a0 {
-      get {
-        var d = this;
-        return ((Expression_Literal)d)._a0;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_Ident_a0 {
-      get {
-        var d = this;
-        return ((Expression_Ident)d)._a0;
-      }
-    }
-    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_Companion_a0 {
-      get {
-        var d = this;
-        return ((Expression_Companion)d)._a0;
-      }
-    }
-    public Dafny.ISequence<DAST._IExpression> dtor_Tuple_a0 {
-      get {
-        var d = this;
-        return ((Expression_Tuple)d)._a0;
-      }
-    }
-    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_path {
-      get {
-        var d = this;
-        if (d is Expression_New) { return ((Expression_New)d)._path; }
-        return ((Expression_DatatypeValue)d)._path;
-      }
-    }
-    public Dafny.ISequence<DAST._IExpression> dtor_args {
-      get {
-        var d = this;
-        if (d is Expression_New) { return ((Expression_New)d)._args; }
-        if (d is Expression_Call) { return ((Expression_Call)d)._args; }
-        return ((Expression_Apply)d)._args;
-      }
-    }
-    public Dafny.ISequence<DAST._IExpression> dtor_dims {
-      get {
-        var d = this;
-        return ((Expression_NewArray)d)._dims;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_variant {
-      get {
-        var d = this;
-        if (d is Expression_DatatypeValue) { return ((Expression_DatatypeValue)d)._variant; }
-        return ((Expression_TypeTest)d)._variant;
-      }
-    }
-    public bool dtor_isCo {
-      get {
-        var d = this;
-        return ((Expression_DatatypeValue)d)._isCo;
-      }
-    }
-    public Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> dtor_contents {
-      get {
-        var d = this;
-        return ((Expression_DatatypeValue)d)._contents;
-      }
-    }
-    public DAST._IExpression dtor_value {
-      get {
-        var d = this;
-        if (d is Expression_SubsetUpgrade) { return ((Expression_SubsetUpgrade)d)._value; }
-        if (d is Expression_SubsetDowngrade) { return ((Expression_SubsetDowngrade)d)._value; }
-        return ((Expression_IIFE)d)._value;
-      }
-    }
-    public DAST._IType dtor_typ {
-      get {
-        var d = this;
-        if (d is Expression_SubsetUpgrade) { return ((Expression_SubsetUpgrade)d)._typ; }
-        if (d is Expression_IIFE) { return ((Expression_IIFE)d)._typ; }
-        return ((Expression_InitializationValue)d)._typ;
-      }
-    }
-    public Dafny.ISequence<DAST._IExpression> dtor_elements {
-      get {
-        var d = this;
-        if (d is Expression_SeqValue) { return ((Expression_SeqValue)d)._elements; }
-        return ((Expression_SetValue)d)._elements;
-      }
-    }
-    public DAST._IExpression dtor_cond {
-      get {
-        var d = this;
-        return ((Expression_Ite)d)._cond;
-      }
-    }
-    public DAST._IExpression dtor_thn {
-      get {
-        var d = this;
-        return ((Expression_Ite)d)._thn;
-      }
-    }
-    public DAST._IExpression dtor_els {
-      get {
-        var d = this;
-        return ((Expression_Ite)d)._els;
-      }
-    }
-    public DAST._IUnaryOp dtor_unOp {
-      get {
-        var d = this;
-        return ((Expression_UnOp)d)._unOp;
-      }
-    }
-    public DAST._IExpression dtor_expr {
-      get {
-        var d = this;
-        if (d is Expression_UnOp) { return ((Expression_UnOp)d)._expr; }
-        if (d is Expression_Select) { return ((Expression_Select)d)._expr; }
-        if (d is Expression_SelectFn) { return ((Expression_SelectFn)d)._expr; }
-        if (d is Expression_TupleSelect) { return ((Expression_TupleSelect)d)._expr; }
-        return ((Expression_Apply)d)._expr;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_op {
-      get {
-        var d = this;
-        return ((Expression_BinOp)d)._op;
-      }
-    }
-    public DAST._IExpression dtor_left {
-      get {
-        var d = this;
-        return ((Expression_BinOp)d)._left;
-      }
-    }
-    public DAST._IExpression dtor_right {
-      get {
-        var d = this;
-        return ((Expression_BinOp)d)._right;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_field {
-      get {
-        var d = this;
-        if (d is Expression_Select) { return ((Expression_Select)d)._field; }
-        return ((Expression_SelectFn)d)._field;
-      }
-    }
-    public bool dtor_onDatatype {
-      get {
-        var d = this;
-        if (d is Expression_Select) { return ((Expression_Select)d)._onDatatype; }
-        return ((Expression_SelectFn)d)._onDatatype;
-      }
-    }
-    public bool dtor_isStatic {
-      get {
-        var d = this;
-        return ((Expression_SelectFn)d)._isStatic;
-      }
-    }
-    public BigInteger dtor_arity {
-      get {
-        var d = this;
-        return ((Expression_SelectFn)d)._arity;
-      }
-    }
-    public BigInteger dtor_index {
-      get {
-        var d = this;
-        return ((Expression_TupleSelect)d)._index;
-      }
-    }
-    public DAST._IExpression dtor_on {
-      get {
-        var d = this;
-        if (d is Expression_Call) { return ((Expression_Call)d)._on; }
-        return ((Expression_TypeTest)d)._on;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_name {
-      get {
-        var d = this;
-        if (d is Expression_Call) { return ((Expression_Call)d)._name; }
-        return ((Expression_IIFE)d)._name;
-      }
-    }
-    public Dafny.ISequence<DAST._IType> dtor_typeArgs {
-      get {
-        var d = this;
-        return ((Expression_Call)d)._typeArgs;
-      }
-    }
-    public Dafny.ISequence<DAST._IFormal> dtor_params {
-      get {
-        var d = this;
-        return ((Expression_Lambda)d)._params;
-      }
-    }
-    public DAST._IType dtor_retType {
-      get {
-        var d = this;
-        return ((Expression_Lambda)d)._retType;
-      }
-    }
-    public Dafny.ISequence<DAST._IStatement> dtor_body {
-      get {
-        var d = this;
-        return ((Expression_Lambda)d)._body;
-      }
-    }
-    public DAST._IExpression dtor_iifeBody {
-      get {
-        var d = this;
-        return ((Expression_IIFE)d)._iifeBody;
-      }
-    }
-    public Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dtor_dType {
-      get {
-        var d = this;
-        return ((Expression_TypeTest)d)._dType;
-      }
-    }
-    public abstract _IExpression DowncastClone();
-  }
-  public class Expression_Literal : Expression {
-    public readonly DAST._ILiteral _a0;
-    public Expression_Literal(DAST._ILiteral _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_Literal(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_Literal;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.Literal";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_Ident : Expression {
-    public readonly Dafny.ISequence<Dafny.Rune> _a0;
-    public Expression_Ident(Dafny.ISequence<Dafny.Rune> _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_Ident(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_Ident;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 1;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.Ident";
-      s += "(";
-      s += this._a0.ToVerbatimString(true);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_Companion : Expression {
-    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0;
-    public Expression_Companion(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_Companion(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_Companion;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 2;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.Companion";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_Tuple : Expression {
-    public readonly Dafny.ISequence<DAST._IExpression> _a0;
-    public Expression_Tuple(Dafny.ISequence<DAST._IExpression> _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_Tuple(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_Tuple;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 3;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.Tuple";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_New : Expression {
-    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _path;
-    public readonly Dafny.ISequence<DAST._IExpression> _args;
-    public Expression_New(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path, Dafny.ISequence<DAST._IExpression> args) : base() {
-      this._path = path;
-      this._args = args;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_New(_path, _args);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_New;
-      return oth != null && object.Equals(this._path, oth._path) && object.Equals(this._args, oth._args);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 4;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._path));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.New";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._path);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._args);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_NewArray : Expression {
-    public readonly Dafny.ISequence<DAST._IExpression> _dims;
-    public Expression_NewArray(Dafny.ISequence<DAST._IExpression> dims) : base() {
-      this._dims = dims;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_NewArray(_dims);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_NewArray;
-      return oth != null && object.Equals(this._dims, oth._dims);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 5;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._dims));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.NewArray";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._dims);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_DatatypeValue : Expression {
-    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _path;
-    public readonly Dafny.ISequence<Dafny.Rune> _variant;
-    public readonly bool _isCo;
-    public readonly Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> _contents;
-    public Expression_DatatypeValue(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path, Dafny.ISequence<Dafny.Rune> variant, bool isCo, Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> contents) : base() {
-      this._path = path;
-      this._variant = variant;
-      this._isCo = isCo;
-      this._contents = contents;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_DatatypeValue(_path, _variant, _isCo, _contents);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_DatatypeValue;
-      return oth != null && object.Equals(this._path, oth._path) && object.Equals(this._variant, oth._variant) && this._isCo == oth._isCo && object.Equals(this._contents, oth._contents);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 6;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._path));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._variant));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isCo));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._contents));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.DatatypeValue";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._path);
-      s += ", ";
-      s += this._variant.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._isCo);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._contents);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_SubsetUpgrade : Expression {
-    public readonly DAST._IExpression _value;
-    public readonly DAST._IType _typ;
-    public Expression_SubsetUpgrade(DAST._IExpression @value, DAST._IType typ) : base() {
-      this._value = @value;
-      this._typ = typ;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_SubsetUpgrade(_value, _typ);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_SubsetUpgrade;
-      return oth != null && object.Equals(this._value, oth._value) && object.Equals(this._typ, oth._typ);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 7;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.SubsetUpgrade";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._value);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typ);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_SubsetDowngrade : Expression {
-    public readonly DAST._IExpression _value;
-    public Expression_SubsetDowngrade(DAST._IExpression @value) : base() {
-      this._value = @value;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_SubsetDowngrade(_value);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_SubsetDowngrade;
-      return oth != null && object.Equals(this._value, oth._value);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 8;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.SubsetDowngrade";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._value);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_SeqValue : Expression {
-    public readonly Dafny.ISequence<DAST._IExpression> _elements;
-    public Expression_SeqValue(Dafny.ISequence<DAST._IExpression> elements) : base() {
-      this._elements = elements;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_SeqValue(_elements);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_SeqValue;
-      return oth != null && object.Equals(this._elements, oth._elements);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 9;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._elements));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.SeqValue";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._elements);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_SetValue : Expression {
-    public readonly Dafny.ISequence<DAST._IExpression> _elements;
-    public Expression_SetValue(Dafny.ISequence<DAST._IExpression> elements) : base() {
-      this._elements = elements;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_SetValue(_elements);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_SetValue;
-      return oth != null && object.Equals(this._elements, oth._elements);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 10;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._elements));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.SetValue";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._elements);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_This : Expression {
-    public Expression_This() : base() {
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_This();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_This;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 11;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.This";
-      return s;
-    }
-  }
-  public class Expression_Ite : Expression {
-    public readonly DAST._IExpression _cond;
-    public readonly DAST._IExpression _thn;
-    public readonly DAST._IExpression _els;
-    public Expression_Ite(DAST._IExpression cond, DAST._IExpression thn, DAST._IExpression els) : base() {
-      this._cond = cond;
-      this._thn = thn;
-      this._els = els;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_Ite(_cond, _thn, _els);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_Ite;
-      return oth != null && object.Equals(this._cond, oth._cond) && object.Equals(this._thn, oth._thn) && object.Equals(this._els, oth._els);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 12;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._cond));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._thn));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._els));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.Ite";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._cond);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._thn);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._els);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_UnOp : Expression {
-    public readonly DAST._IUnaryOp _unOp;
-    public readonly DAST._IExpression _expr;
-    public Expression_UnOp(DAST._IUnaryOp unOp, DAST._IExpression expr) : base() {
-      this._unOp = unOp;
-      this._expr = expr;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_UnOp(_unOp, _expr);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_UnOp;
-      return oth != null && object.Equals(this._unOp, oth._unOp) && object.Equals(this._expr, oth._expr);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 13;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._unOp));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.UnOp";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._unOp);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._expr);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_BinOp : Expression {
-    public readonly Dafny.ISequence<Dafny.Rune> _op;
-    public readonly DAST._IExpression _left;
-    public readonly DAST._IExpression _right;
-    public Expression_BinOp(Dafny.ISequence<Dafny.Rune> op, DAST._IExpression left, DAST._IExpression right) : base() {
-      this._op = op;
-      this._left = left;
-      this._right = right;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_BinOp(_op, _left, _right);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_BinOp;
-      return oth != null && object.Equals(this._op, oth._op) && object.Equals(this._left, oth._left) && object.Equals(this._right, oth._right);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 14;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._op));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._left));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._right));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.BinOp";
-      s += "(";
-      s += this._op.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._left);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._right);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_Select : Expression {
-    public readonly DAST._IExpression _expr;
-    public readonly Dafny.ISequence<Dafny.Rune> _field;
-    public readonly bool _onDatatype;
-    public Expression_Select(DAST._IExpression expr, Dafny.ISequence<Dafny.Rune> field, bool onDatatype) : base() {
-      this._expr = expr;
-      this._field = field;
-      this._onDatatype = onDatatype;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_Select(_expr, _field, _onDatatype);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_Select;
-      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._field, oth._field) && this._onDatatype == oth._onDatatype;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 15;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._field));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._onDatatype));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.Select";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._expr);
-      s += ", ";
-      s += this._field.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._onDatatype);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_SelectFn : Expression {
-    public readonly DAST._IExpression _expr;
-    public readonly Dafny.ISequence<Dafny.Rune> _field;
-    public readonly bool _onDatatype;
-    public readonly bool _isStatic;
-    public readonly BigInteger _arity;
-    public Expression_SelectFn(DAST._IExpression expr, Dafny.ISequence<Dafny.Rune> field, bool onDatatype, bool isStatic, BigInteger arity) : base() {
-      this._expr = expr;
-      this._field = field;
-      this._onDatatype = onDatatype;
-      this._isStatic = isStatic;
-      this._arity = arity;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_SelectFn(_expr, _field, _onDatatype, _isStatic, _arity);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_SelectFn;
-      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._field, oth._field) && this._onDatatype == oth._onDatatype && this._isStatic == oth._isStatic && this._arity == oth._arity;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 16;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._field));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._onDatatype));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._isStatic));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._arity));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.SelectFn";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._expr);
-      s += ", ";
-      s += this._field.ToVerbatimString(true);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._onDatatype);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._isStatic);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._arity);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_TupleSelect : Expression {
-    public readonly DAST._IExpression _expr;
-    public readonly BigInteger _index;
-    public Expression_TupleSelect(DAST._IExpression expr, BigInteger index) : base() {
-      this._expr = expr;
-      this._index = index;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_TupleSelect(_expr, _index);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_TupleSelect;
-      return oth != null && object.Equals(this._expr, oth._expr) && this._index == oth._index;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 17;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._index));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.TupleSelect";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._expr);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._index);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_Call : Expression {
-    public readonly DAST._IExpression _on;
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly Dafny.ISequence<DAST._IType> _typeArgs;
-    public readonly Dafny.ISequence<DAST._IExpression> _args;
-    public Expression_Call(DAST._IExpression @on, Dafny.ISequence<Dafny.Rune> name, Dafny.ISequence<DAST._IType> typeArgs, Dafny.ISequence<DAST._IExpression> args) : base() {
-      this._on = @on;
-      this._name = name;
-      this._typeArgs = typeArgs;
-      this._args = args;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_Call(_on, _name, _typeArgs, _args);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_Call;
-      return oth != null && object.Equals(this._on, oth._on) && object.Equals(this._name, oth._name) && object.Equals(this._typeArgs, oth._typeArgs) && object.Equals(this._args, oth._args);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 18;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._on));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typeArgs));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.Call";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._on);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._name);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typeArgs);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._args);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_Lambda : Expression {
-    public readonly Dafny.ISequence<DAST._IFormal> _params;
-    public readonly DAST._IType _retType;
-    public readonly Dafny.ISequence<DAST._IStatement> _body;
-    public Expression_Lambda(Dafny.ISequence<DAST._IFormal> @params, DAST._IType retType, Dafny.ISequence<DAST._IStatement> body) : base() {
-      this._params = @params;
-      this._retType = retType;
-      this._body = body;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_Lambda(_params, _retType, _body);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_Lambda;
-      return oth != null && object.Equals(this._params, oth._params) && object.Equals(this._retType, oth._retType) && object.Equals(this._body, oth._body);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 19;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._params));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._retType));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._body));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.Lambda";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._params);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._retType);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._body);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_IIFE : Expression {
-    public readonly Dafny.ISequence<Dafny.Rune> _name;
-    public readonly DAST._IType _typ;
-    public readonly DAST._IExpression _value;
-    public readonly DAST._IExpression _iifeBody;
-    public Expression_IIFE(Dafny.ISequence<Dafny.Rune> name, DAST._IType typ, DAST._IExpression @value, DAST._IExpression iifeBody) : base() {
-      this._name = name;
-      this._typ = typ;
-      this._value = @value;
-      this._iifeBody = iifeBody;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_IIFE(_name, _typ, _value, _iifeBody);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_IIFE;
-      return oth != null && object.Equals(this._name, oth._name) && object.Equals(this._typ, oth._typ) && object.Equals(this._value, oth._value) && object.Equals(this._iifeBody, oth._iifeBody);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 20;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._name));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._value));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._iifeBody));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.IIFE";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._name);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._typ);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._value);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._iifeBody);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_Apply : Expression {
-    public readonly DAST._IExpression _expr;
-    public readonly Dafny.ISequence<DAST._IExpression> _args;
-    public Expression_Apply(DAST._IExpression expr, Dafny.ISequence<DAST._IExpression> args) : base() {
-      this._expr = expr;
-      this._args = args;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_Apply(_expr, _args);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_Apply;
-      return oth != null && object.Equals(this._expr, oth._expr) && object.Equals(this._args, oth._args);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 21;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._expr));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._args));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.Apply";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._expr);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._args);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_TypeTest : Expression {
-    public readonly DAST._IExpression _on;
-    public readonly Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _dType;
-    public readonly Dafny.ISequence<Dafny.Rune> _variant;
-    public Expression_TypeTest(DAST._IExpression @on, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> dType, Dafny.ISequence<Dafny.Rune> variant) : base() {
-      this._on = @on;
-      this._dType = dType;
-      this._variant = variant;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_TypeTest(_on, _dType, _variant);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_TypeTest;
-      return oth != null && object.Equals(this._on, oth._on) && object.Equals(this._dType, oth._dType) && object.Equals(this._variant, oth._variant);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 22;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._on));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._dType));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._variant));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.TypeTest";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._on);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._dType);
-      s += ", ";
-      s += this._variant.ToVerbatimString(true);
-      s += ")";
-      return s;
-    }
-  }
-  public class Expression_InitializationValue : Expression {
-    public readonly DAST._IType _typ;
-    public Expression_InitializationValue(DAST._IType typ) : base() {
-      this._typ = typ;
-    }
-    public override _IExpression DowncastClone() {
-      if (this is _IExpression dt) { return dt; }
-      return new Expression_InitializationValue(_typ);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Expression_InitializationValue;
-      return oth != null && object.Equals(this._typ, oth._typ);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 23;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._typ));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Expression.InitializationValue";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._typ);
-      s += ")";
-      return s;
-    }
-  }
-
-  public interface _IUnaryOp {
-    bool is_Not { get; }
-    bool is_BitwiseNot { get; }
-    bool is_Cardinality { get; }
-    _IUnaryOp DowncastClone();
-  }
-  public abstract class UnaryOp : _IUnaryOp {
-    public UnaryOp() {
-    }
-    private static readonly DAST._IUnaryOp theDefault = create_Not();
-    public static DAST._IUnaryOp Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._IUnaryOp> _TYPE = new Dafny.TypeDescriptor<DAST._IUnaryOp>(DAST.UnaryOp.Default());
-    public static Dafny.TypeDescriptor<DAST._IUnaryOp> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _IUnaryOp create_Not() {
-      return new UnaryOp_Not();
-    }
-    public static _IUnaryOp create_BitwiseNot() {
-      return new UnaryOp_BitwiseNot();
-    }
-    public static _IUnaryOp create_Cardinality() {
-      return new UnaryOp_Cardinality();
-    }
-    public bool is_Not { get { return this is UnaryOp_Not; } }
-    public bool is_BitwiseNot { get { return this is UnaryOp_BitwiseNot; } }
-    public bool is_Cardinality { get { return this is UnaryOp_Cardinality; } }
-    public static System.Collections.Generic.IEnumerable<_IUnaryOp> AllSingletonConstructors {
-      get {
-        yield return UnaryOp.create_Not();
-        yield return UnaryOp.create_BitwiseNot();
-        yield return UnaryOp.create_Cardinality();
-      }
-    }
-    public abstract _IUnaryOp DowncastClone();
-  }
-  public class UnaryOp_Not : UnaryOp {
-    public UnaryOp_Not() : base() {
-    }
-    public override _IUnaryOp DowncastClone() {
-      if (this is _IUnaryOp dt) { return dt; }
-      return new UnaryOp_Not();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.UnaryOp_Not;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.UnaryOp.Not";
-      return s;
-    }
-  }
-  public class UnaryOp_BitwiseNot : UnaryOp {
-    public UnaryOp_BitwiseNot() : base() {
-    }
-    public override _IUnaryOp DowncastClone() {
-      if (this is _IUnaryOp dt) { return dt; }
-      return new UnaryOp_BitwiseNot();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.UnaryOp_BitwiseNot;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 1;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.UnaryOp.BitwiseNot";
-      return s;
-    }
-  }
-  public class UnaryOp_Cardinality : UnaryOp {
-    public UnaryOp_Cardinality() : base() {
-    }
-    public override _IUnaryOp DowncastClone() {
-      if (this is _IUnaryOp dt) { return dt; }
-      return new UnaryOp_Cardinality();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.UnaryOp_Cardinality;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 2;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.UnaryOp.Cardinality";
-      return s;
-    }
-  }
-
-  public interface _ILiteral {
-    bool is_BoolLiteral { get; }
-    bool is_IntLiteral { get; }
-    bool is_DecLiteral { get; }
-    bool is_StringLiteral { get; }
-    bool is_CharLiteral { get; }
-    bool is_Null { get; }
-    bool dtor_BoolLiteral_a0 { get; }
-    BigInteger dtor_IntLiteral_a0 { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_DecLiteral_a0 { get; }
-    Dafny.ISequence<Dafny.Rune> dtor_StringLiteral_a0 { get; }
-    Dafny.Rune dtor_CharLiteral_a0 { get; }
-    _ILiteral DowncastClone();
-  }
-  public abstract class Literal : _ILiteral {
-    public Literal() {
-    }
-    private static readonly DAST._ILiteral theDefault = create_BoolLiteral(false);
-    public static DAST._ILiteral Default() {
-      return theDefault;
-    }
-    private static readonly Dafny.TypeDescriptor<DAST._ILiteral> _TYPE = new Dafny.TypeDescriptor<DAST._ILiteral>(DAST.Literal.Default());
-    public static Dafny.TypeDescriptor<DAST._ILiteral> _TypeDescriptor() {
-      return _TYPE;
-    }
-    public static _ILiteral create_BoolLiteral(bool _a0) {
-      return new Literal_BoolLiteral(_a0);
-    }
-    public static _ILiteral create_IntLiteral(BigInteger _a0) {
-      return new Literal_IntLiteral(_a0);
-    }
-    public static _ILiteral create_DecLiteral(Dafny.ISequence<Dafny.Rune> _a0) {
-      return new Literal_DecLiteral(_a0);
-    }
-    public static _ILiteral create_StringLiteral(Dafny.ISequence<Dafny.Rune> _a0) {
-      return new Literal_StringLiteral(_a0);
-    }
-    public static _ILiteral create_CharLiteral(Dafny.Rune _a0) {
-      return new Literal_CharLiteral(_a0);
-    }
-    public static _ILiteral create_Null() {
-      return new Literal_Null();
-    }
-    public bool is_BoolLiteral { get { return this is Literal_BoolLiteral; } }
-    public bool is_IntLiteral { get { return this is Literal_IntLiteral; } }
-    public bool is_DecLiteral { get { return this is Literal_DecLiteral; } }
-    public bool is_StringLiteral { get { return this is Literal_StringLiteral; } }
-    public bool is_CharLiteral { get { return this is Literal_CharLiteral; } }
-    public bool is_Null { get { return this is Literal_Null; } }
-    public bool dtor_BoolLiteral_a0 {
-      get {
-        var d = this;
-        return ((Literal_BoolLiteral)d)._a0;
-      }
-    }
-    public BigInteger dtor_IntLiteral_a0 {
-      get {
-        var d = this;
-        return ((Literal_IntLiteral)d)._a0;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_DecLiteral_a0 {
-      get {
-        var d = this;
-        return ((Literal_DecLiteral)d)._a0;
-      }
-    }
-    public Dafny.ISequence<Dafny.Rune> dtor_StringLiteral_a0 {
-      get {
-        var d = this;
-        return ((Literal_StringLiteral)d)._a0;
-      }
-    }
-    public Dafny.Rune dtor_CharLiteral_a0 {
-      get {
-        var d = this;
-        return ((Literal_CharLiteral)d)._a0;
-      }
-    }
-    public abstract _ILiteral DowncastClone();
-  }
-  public class Literal_BoolLiteral : Literal {
-    public readonly bool _a0;
-    public Literal_BoolLiteral(bool _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _ILiteral DowncastClone() {
-      if (this is _ILiteral dt) { return dt; }
-      return new Literal_BoolLiteral(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Literal_BoolLiteral;
-      return oth != null && this._a0 == oth._a0;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Literal.BoolLiteral";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class Literal_IntLiteral : Literal {
-    public readonly BigInteger _a0;
-    public Literal_IntLiteral(BigInteger _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _ILiteral DowncastClone() {
-      if (this is _ILiteral dt) { return dt; }
-      return new Literal_IntLiteral(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Literal_IntLiteral;
-      return oth != null && this._a0 == oth._a0;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 1;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Literal.IntLiteral";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class Literal_DecLiteral : Literal {
-    public readonly Dafny.ISequence<Dafny.Rune> _a0;
-    public Literal_DecLiteral(Dafny.ISequence<Dafny.Rune> _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _ILiteral DowncastClone() {
-      if (this is _ILiteral dt) { return dt; }
-      return new Literal_DecLiteral(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Literal_DecLiteral;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 2;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Literal.DecLiteral";
-      s += "(";
-      s += this._a0.ToVerbatimString(true);
-      s += ")";
-      return s;
-    }
-  }
-  public class Literal_StringLiteral : Literal {
-    public readonly Dafny.ISequence<Dafny.Rune> _a0;
-    public Literal_StringLiteral(Dafny.ISequence<Dafny.Rune> _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _ILiteral DowncastClone() {
-      if (this is _ILiteral dt) { return dt; }
-      return new Literal_StringLiteral(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Literal_StringLiteral;
-      return oth != null && object.Equals(this._a0, oth._a0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 3;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Literal.StringLiteral";
-      s += "(";
-      s += this._a0.ToVerbatimString(true);
-      s += ")";
-      return s;
-    }
-  }
-  public class Literal_CharLiteral : Literal {
-    public readonly Dafny.Rune _a0;
-    public Literal_CharLiteral(Dafny.Rune _a0) : base() {
-      this._a0 = _a0;
-    }
-    public override _ILiteral DowncastClone() {
-      if (this is _ILiteral dt) { return dt; }
-      return new Literal_CharLiteral(_a0);
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Literal_CharLiteral;
-      return oth != null && this._a0 == oth._a0;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 4;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._a0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Literal.CharLiteral";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._a0);
-      s += ")";
-      return s;
-    }
-  }
-  public class Literal_Null : Literal {
-    public Literal_Null() : base() {
-    }
-    public override _ILiteral DowncastClone() {
-      if (this is _ILiteral dt) { return dt; }
-      return new Literal_Null();
-    }
-    public override bool Equals(object other) {
-      var oth = other as DAST.Literal_Null;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 5;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "DAST.Literal.Null";
-      return s;
-    }
-  }
-} // end of namespace DAST
-namespace DCOMP {
-
-  public partial class __default {
-    public static Dafny.ISequence<Dafny.Rune> natToString(BigInteger n) {
-      if ((n).Sign == 0) {
-        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("0");
-      } else if ((n) == (BigInteger.One)) {
-        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("1");
-      } else if ((n) == (new BigInteger(2))) {
-        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("2");
-      } else if ((n) == (new BigInteger(3))) {
-        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("3");
-      } else if ((n) == (new BigInteger(4))) {
-        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("4");
-      } else if ((n) == (new BigInteger(5))) {
-        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("5");
-      } else if ((n) == (new BigInteger(6))) {
-        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("6");
-      } else if ((n) == (new BigInteger(7))) {
-        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("7");
-      } else if ((n) == (new BigInteger(8))) {
-        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("8");
-      } else if ((n) == (new BigInteger(9))) {
-        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString("9");
-      } else {
-        return Dafny.Sequence<Dafny.Rune>.Concat(DCOMP.__default.natToString(Dafny.Helpers.EuclideanDivision(n, new BigInteger(10))), DCOMP.__default.natToString(Dafny.Helpers.EuclideanModulus(n, new BigInteger(10))));
-      }
-    }
-  }
-
-  public partial class stringNat {
-    private static readonly Dafny.ISequence<Dafny.Rune> Witness = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("1");
-    public static Dafny.ISequence<Dafny.Rune> Default() {
-      return Witness;
-    }
-    private static readonly Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TYPE = new Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>>(DCOMP.stringNat.Default());
-    public static Dafny.TypeDescriptor<Dafny.ISequence<Dafny.Rune>> _TypeDescriptor() {
-      return _TYPE;
-    }
-  }
-
-  public partial class COMP {
-    public COMP() {
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenModule(DAST._IModule mod, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> containingPath) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      Dafny.ISequence<Dafny.Rune> body;
-      Dafny.ISequence<Dafny.Rune> _out0;
-      _out0 = DCOMP.COMP.GenModuleBody((mod).dtor_body, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(containingPath, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((mod).dtor_name)));
-      body = _out0;
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("mod r#"), (mod).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), body), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}"));
-      return s;
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenModuleBody(Dafny.ISequence<DAST._IModuleItem> body, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> containingPath) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      BigInteger i;
-      i = BigInteger.Zero;
-      while ((i) < (new BigInteger((body).Count))) {
-        Dafny.ISequence<Dafny.Rune> generated = Dafny.Sequence<Dafny.Rune>.Empty;
-        DAST._IModuleItem _source0 = (body).Select(i);
-        if (_source0.is_Module) {
-          DAST._IModule __mcc_h0 = _source0.dtor_Module_a0;
-          DAST._IModule m = __mcc_h0;
-          Dafny.ISequence<Dafny.Rune> _out1;
-          _out1 = DCOMP.COMP.GenModule(m, containingPath);
-          generated = _out1;
-        } else if (_source0.is_Class) {
-          DAST._IClass __mcc_h1 = _source0.dtor_Class_a0;
-          DAST._IClass c = __mcc_h1;
-          Dafny.ISequence<Dafny.Rune> _out2;
-          _out2 = DCOMP.COMP.GenClass(c, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(containingPath, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((c).dtor_name)));
-          generated = _out2;
-        } else if (_source0.is_Trait) {
-          DAST._ITrait __mcc_h2 = _source0.dtor_Trait_a0;
-          DAST._ITrait t = __mcc_h2;
-          Dafny.ISequence<Dafny.Rune> _out3;
-          _out3 = DCOMP.COMP.GenTrait(t, containingPath);
-          generated = _out3;
-        } else if (_source0.is_Newtype) {
-          DAST._INewtype __mcc_h3 = _source0.dtor_Newtype_a0;
-          DAST._INewtype _10_n = __mcc_h3;
-          Dafny.ISequence<Dafny.Rune> _out4;
-          _out4 = DCOMP.COMP.GenNewtype(_10_n);
-          generated = _out4;
-        } else {
-          DAST._IDatatype _11___mcc_h4 = _source0.dtor_Datatype_a0;
-          DAST._IDatatype _12_d = _11___mcc_h4;
-          Dafny.ISequence<Dafny.Rune> _out5;
-          _out5 = DCOMP.COMP.GenDatatype(_12_d);
-          generated = _out5;
-        }
-        if ((i).Sign == 1) {
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"));
-        }
-        s = Dafny.Sequence<Dafny.Rune>.Concat(s, generated);
-        i = (i) + (BigInteger.One);
-      }
-      return s;
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenClass(DAST._IClass c, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> path) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      Dafny.ISequence<Dafny.Rune> _13_implBody;
-      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>> _14_traitBodies;
-      Dafny.ISequence<Dafny.Rune> _out6;
-      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>> _out7;
-      DCOMP.COMP.GenClassImplBody((c).dtor_body, false, DAST.Type.create_Path(path, Dafny.Sequence<DAST._IType>.FromElements(), DAST.ResolvedType.create_Datatype(path)), Dafny.Set<DAST._IType>.FromElements(), out _out6, out _out7);
-      _13_implBody = _out6;
-      _14_traitBodies = _out7;
-      _13_implBody = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub fn new() -> Self {\n"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (c).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}\n}\n")), _13_implBody);
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub struct r#"), (c).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl r#")), (c).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), _13_implBody), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}"));
-      if ((new BigInteger(((c).dtor_superClasses).Count)).Sign == 1) {
-        BigInteger _15_i;
-        _15_i = BigInteger.Zero;
-        while ((_15_i) < (new BigInteger(((c).dtor_superClasses).Count))) {
-          DAST._IType _16_superClass;
-          _16_superClass = ((c).dtor_superClasses).Select(_15_i);
-          DAST._IType _source1 = _16_superClass;
-          if (_source1.is_Path) {
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _17___mcc_h0 = _source1.dtor_Path_a0;
-            Dafny.ISequence<DAST._IType> _18___mcc_h1 = _source1.dtor_typeArgs;
-            DAST._IResolvedType _19___mcc_h2 = _source1.dtor_resolved;
-            DAST._IResolvedType _source2 = _19___mcc_h2;
-            if (_source2.is_Datatype) {
-              Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _20___mcc_h6 = _source2.dtor_path;
-            } else if (_source2.is_Trait) {
-              Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _21___mcc_h8 = _source2.dtor_path;
-              Dafny.ISequence<DAST._IType> _22_typeArgs = _18___mcc_h1;
-              Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _23_traitPath = _17___mcc_h0;
-              {
-                Dafny.ISequence<Dafny.Rune> _24_pathStr;
-                Dafny.ISequence<Dafny.Rune> _out8;
-                _out8 = DCOMP.COMP.GenPath(_23_traitPath);
-                _24_pathStr = _out8;
-                Dafny.ISequence<Dafny.Rune> _25_typeArgs;
-                Dafny.ISequence<Dafny.Rune> _out9;
-                _out9 = DCOMP.COMP.GenTypeArgs(_22_typeArgs, false, false);
-                _25_typeArgs = _out9;
-                Dafny.ISequence<Dafny.Rune> _26_body;
-                _26_body = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-                if ((_14_traitBodies).Contains(_23_traitPath)) {
-                  _26_body = Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>>.Select(_14_traitBodies, _23_traitPath);
-                }
-                Dafny.ISequence<Dafny.Rune> _27_genSelfPath;
-                Dafny.ISequence<Dafny.Rune> _out10;
-                _out10 = DCOMP.COMP.GenPath(path);
-                _27_genSelfPath = _out10;
-                s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\nimpl ")), _24_pathStr), _25_typeArgs), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" for ::std::rc::Rc<")), _27_genSelfPath), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("> {\n")), _26_body), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}"));
-              }
-            } else {
-            }
-          } else if (_source1.is_Tuple) {
-            Dafny.ISequence<DAST._IType> _28___mcc_h10 = _source1.dtor_Tuple_a0;
-          } else if (_source1.is_Array) {
-            DAST._IType _29___mcc_h12 = _source1.dtor_element;
-          } else if (_source1.is_Seq) {
-            DAST._IType _30___mcc_h14 = _source1.dtor_element;
-          } else if (_source1.is_Set) {
-            DAST._IType _31___mcc_h16 = _source1.dtor_element;
-          } else if (_source1.is_Multiset) {
-            DAST._IType _32___mcc_h18 = _source1.dtor_element;
-          } else if (_source1.is_Map) {
-            DAST._IType _33___mcc_h20 = _source1.dtor_key;
-            DAST._IType _34___mcc_h21 = _source1.dtor_value;
-          } else if (_source1.is_Arrow) {
-            Dafny.ISequence<DAST._IType> _35___mcc_h24 = _source1.dtor_args;
-            DAST._IType _36___mcc_h25 = _source1.dtor_result;
-          } else if (_source1.is_Primitive) {
-            DAST._IPrimitive _37___mcc_h28 = _source1.dtor_Primitive_a0;
-          } else if (_source1.is_Passthrough) {
-            Dafny.ISequence<Dafny.Rune> _38___mcc_h30 = _source1.dtor_Passthrough_a0;
-          } else {
-            Dafny.ISequence<Dafny.Rune> _39___mcc_h32 = _source1.dtor_TypeArg_a0;
-          }
-          _15_i = (_15_i) + (BigInteger.One);
-        }
-      }
-      return s;
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenTrait(DAST._ITrait t, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> containingPath) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      Dafny.ISet<DAST._IType> _40_typeParamsSet;
-      _40_typeParamsSet = Dafny.Set<DAST._IType>.FromElements();
-      Dafny.ISequence<Dafny.Rune> _41_typeParams;
-      _41_typeParams = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      BigInteger _42_tpI;
-      _42_tpI = BigInteger.Zero;
-      if ((new BigInteger(((t).dtor_typeParams).Count)).Sign == 1) {
-        _41_typeParams = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<");
-        while ((_42_tpI) < (new BigInteger(((t).dtor_typeParams).Count))) {
-          DAST._IType _43_tp;
-          _43_tp = ((t).dtor_typeParams).Select(_42_tpI);
-          _40_typeParamsSet = Dafny.Set<DAST._IType>.Union(_40_typeParamsSet, Dafny.Set<DAST._IType>.FromElements(_43_tp));
-          Dafny.ISequence<Dafny.Rune> _44_genTp;
-          Dafny.ISequence<Dafny.Rune> _out11;
-          _out11 = DCOMP.COMP.GenType(_43_tp, false, false);
-          _44_genTp = _out11;
-          _41_typeParams = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_41_typeParams, _44_genTp), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-          _42_tpI = (_42_tpI) + (BigInteger.One);
-        }
-        _41_typeParams = Dafny.Sequence<Dafny.Rune>.Concat(_41_typeParams, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-      }
-      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _45_fullPath;
-      _45_fullPath = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(containingPath, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((t).dtor_name));
-      Dafny.ISequence<Dafny.Rune> _46_implBody;
-      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>> _47___v3;
-      Dafny.ISequence<Dafny.Rune> _out12;
-      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>> _out13;
-      DCOMP.COMP.GenClassImplBody((t).dtor_body, true, DAST.Type.create_Path(_45_fullPath, Dafny.Sequence<DAST._IType>.FromElements(), DAST.ResolvedType.create_Trait(_45_fullPath)), _40_typeParamsSet, out _out12, out _out13);
-      _46_implBody = _out12;
-      _47___v3 = _out13;
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub trait r#"), (t).dtor_name), _41_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), _46_implBody), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}"));
-      return s;
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenNewtype(DAST._INewtype c) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      Dafny.ISet<DAST._IType> _48_typeParamsSet;
-      _48_typeParamsSet = Dafny.Set<DAST._IType>.FromElements();
-      Dafny.ISequence<Dafny.Rune> _49_typeParams;
-      _49_typeParams = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      Dafny.ISequence<Dafny.Rune> _50_constrainedTypeParams;
-      _50_constrainedTypeParams = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      BigInteger _51_tpI;
-      _51_tpI = BigInteger.Zero;
-      if ((new BigInteger(((c).dtor_typeParams).Count)).Sign == 1) {
-        _49_typeParams = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<");
-        _50_constrainedTypeParams = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<");
-        while ((_51_tpI) < (new BigInteger(((c).dtor_typeParams).Count))) {
-          DAST._IType _52_tp;
-          _52_tp = ((c).dtor_typeParams).Select(_51_tpI);
-          _48_typeParamsSet = Dafny.Set<DAST._IType>.Union(_48_typeParamsSet, Dafny.Set<DAST._IType>.FromElements(_52_tp));
-          Dafny.ISequence<Dafny.Rune> _53_genTp;
-          Dafny.ISequence<Dafny.Rune> _out14;
-          _out14 = DCOMP.COMP.GenType(_52_tp, false, false);
-          _53_genTp = _out14;
-          _49_typeParams = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_49_typeParams, _53_genTp), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-          _50_constrainedTypeParams = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_50_constrainedTypeParams, _53_genTp), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ::dafny_runtime::DafnyErasable + ::dafny_runtime::DafnyUnerasable<")), _53_genTp), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("> + Clone + ::std::cmp::PartialEq + ::dafny_runtime::DafnyPrint + ::std::default::Default + 'static, "));
-          _51_tpI = (_51_tpI) + (BigInteger.One);
-        }
-        _49_typeParams = Dafny.Sequence<Dafny.Rune>.Concat(_49_typeParams, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-        _50_constrainedTypeParams = Dafny.Sequence<Dafny.Rune>.Concat(_50_constrainedTypeParams, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-      }
-      Dafny.ISequence<Dafny.Rune> _54_underlyingType;
-      Dafny.ISequence<Dafny.Rune> _out15;
-      _out15 = DCOMP.COMP.GenType((c).dtor_base, false, false);
-      _54_underlyingType = _out15;
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[derive(Clone, PartialEq)]\n#[repr(transparent)]\npub struct r#"), (c).dtor_name), _49_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(pub ")), _54_underlyingType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(");\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl ")), _50_constrainedTypeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ::dafny_runtime::DafnyErasable for r#")), (c).dtor_name), _49_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("type Erased = ")), _54_underlyingType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[inline]\nfn erase(&self) -> &Self::Erased {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&self.0\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[inline]\nfn erase_owned(self) -> Self::Erased {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self.0\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl ")), _50_constrainedTypeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ::dafny_runtime::DafnyUnerasable<")), _54_underlyingType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("> for r#")), (c).dtor_name), _49_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[inline]\nfn unerase(x: &")), _54_underlyingType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") -> &Self {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unsafe { &*(x as *const ")), _54_underlyingType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" as *const r#")), (c).dtor_name), _49_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") }\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[inline]\nfn unerase_owned(x: ")), _54_underlyingType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") -> Self {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (c).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(x)\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl ")), _50_constrainedTypeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ::dafny_runtime::DafnyUnerasable<r#")), (c).dtor_name), _49_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("> for r#")), (c).dtor_name), _49_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[inline]\nfn unerase(x: &r#")), (c).dtor_name), _49_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") -> &Self {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[inline]\nfn unerase_owned(x: r#")), (c).dtor_name), _49_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") -> Self {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("x\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl ")), _50_constrainedTypeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ::std::default::Default for r#")), (c).dtor_name), _49_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fn default() -> Self {\n"));
-      DAST._IOptional<DAST._IExpression> _source3 = (c).dtor_witnessExpr;
-      if (_source3.is_Some) {
-        DAST._IExpression _55___mcc_h0 = _source3.dtor_Some_a0;
-        DAST._IExpression _56_e = _55___mcc_h0;
-        {
-          Dafny.ISequence<Dafny.Rune> _57_eStr;
-          bool _58___v4;
-          bool _59___v5;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _60___v6;
-          Dafny.ISequence<Dafny.Rune> _out16;
-          bool _out17;
-          bool _out18;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out19;
-          DCOMP.COMP.GenExpr(_56_e, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), true, out _out16, out _out17, out _out18, out _out19);
-          _57_eStr = _out16;
-          _58___v4 = _out17;
-          _59___v5 = _out18;
-          _60___v6 = _out19;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (c).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _57_eStr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")\n"));
-        }
-      } else {
-        {
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (c).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(::std::default::Default::default())\n"));
-        }
-      }
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl ")), _50_constrainedTypeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ::dafny_runtime::DafnyPrint for r#")), (c).dtor_name), _49_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fn fmt_print(&self, __fmt_print_formatter: &mut ::std::fmt::Formatter, in_seq: bool) -> ::std::fmt::Result {\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyPrint::fmt_print(&self.0, __fmt_print_formatter, in_seq)\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-      return s;
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenDatatype(DAST._IDatatype c) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      Dafny.ISet<DAST._IType> _61_typeParamsSet;
-      _61_typeParamsSet = Dafny.Set<DAST._IType>.FromElements();
-      Dafny.ISequence<Dafny.Rune> _62_typeParams;
-      _62_typeParams = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      BigInteger _63_tpI;
-      _63_tpI = BigInteger.Zero;
-      if ((new BigInteger(((c).dtor_typeParams).Count)).Sign == 1) {
-        _62_typeParams = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<");
-        while ((_63_tpI) < (new BigInteger(((c).dtor_typeParams).Count))) {
-          DAST._IType _64_tp;
-          _64_tp = ((c).dtor_typeParams).Select(_63_tpI);
-          _61_typeParamsSet = Dafny.Set<DAST._IType>.Union(_61_typeParamsSet, Dafny.Set<DAST._IType>.FromElements(_64_tp));
-          Dafny.ISequence<Dafny.Rune> _65_genTp;
-          Dafny.ISequence<Dafny.Rune> _out20;
-          _out20 = DCOMP.COMP.GenType(_64_tp, false, false);
-          _65_genTp = _out20;
-          _62_typeParams = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_62_typeParams, _65_genTp), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-          _63_tpI = (_63_tpI) + (BigInteger.One);
-        }
-        _62_typeParams = Dafny.Sequence<Dafny.Rune>.Concat(_62_typeParams, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-      }
-      Dafny.ISequence<Dafny.Rune> _66_ctors;
-      _66_ctors = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      BigInteger _67_i;
-      _67_i = BigInteger.Zero;
-      while ((_67_i) < (new BigInteger(((c).dtor_ctors).Count))) {
-        DAST._IDatatypeCtor _68_ctor;
-        _68_ctor = ((c).dtor_ctors).Select(_67_i);
-        Dafny.ISequence<Dafny.Rune> _69_ctorBody;
-        _69_ctorBody = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#"), (_68_ctor).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" { "));
-        BigInteger _70_j;
-        _70_j = BigInteger.Zero;
-        while ((_70_j) < (new BigInteger(((_68_ctor).dtor_args).Count))) {
-          DAST._IFormal _71_formal;
-          _71_formal = ((_68_ctor).dtor_args).Select(_70_j);
-          Dafny.ISequence<Dafny.Rune> _72_formalType;
-          Dafny.ISequence<Dafny.Rune> _out21;
-          _out21 = DCOMP.COMP.GenType((_71_formal).dtor_typ, false, false);
-          _72_formalType = _out21;
-          if ((c).dtor_isCo) {
-            _69_ctorBody = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_69_ctorBody, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (_71_formal).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ::dafny_runtime::LazyFieldWrapper<")), _72_formalType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">, "));
-          } else {
-            _69_ctorBody = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_69_ctorBody, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (_71_formal).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ")), _72_formalType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-          }
-          _70_j = (_70_j) + (BigInteger.One);
-        }
-        _69_ctorBody = Dafny.Sequence<Dafny.Rune>.Concat(_69_ctorBody, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
-        _66_ctors = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_66_ctors, _69_ctorBody), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(",\n"));
-        _67_i = (_67_i) + (BigInteger.One);
-      }
-      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _73_selfPath;
-      _73_selfPath = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((c).dtor_name);
-      Dafny.ISequence<Dafny.Rune> _74_implBody;
-      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>> _75_traitBodies;
-      Dafny.ISequence<Dafny.Rune> _out22;
-      Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>> _out23;
-      DCOMP.COMP.GenClassImplBody((c).dtor_body, false, DAST.Type.create_Path(Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), Dafny.Sequence<DAST._IType>.FromElements(), DAST.ResolvedType.create_Datatype(_73_selfPath)), _61_typeParamsSet, out _out22, out _out23);
-      _74_implBody = _out22;
-      _75_traitBodies = _out23;
-      _67_i = BigInteger.Zero;
-      Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _76_emittedFields;
-      _76_emittedFields = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-      while ((_67_i) < (new BigInteger(((c).dtor_ctors).Count))) {
-        DAST._IDatatypeCtor _77_ctor;
-        _77_ctor = ((c).dtor_ctors).Select(_67_i);
-        BigInteger _78_j;
-        _78_j = BigInteger.Zero;
-        while ((_78_j) < (new BigInteger(((_77_ctor).dtor_args).Count))) {
-          DAST._IFormal _79_formal;
-          _79_formal = ((_77_ctor).dtor_args).Select(_78_j);
-          if (!((_76_emittedFields).Contains((_79_formal).dtor_name))) {
-            _76_emittedFields = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_76_emittedFields, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements((_79_formal).dtor_name));
-            Dafny.ISequence<Dafny.Rune> _80_formalType;
-            Dafny.ISequence<Dafny.Rune> _out24;
-            _out24 = DCOMP.COMP.GenType((_79_formal).dtor_typ, false, false);
-            _80_formalType = _out24;
-            Dafny.ISequence<Dafny.Rune> _81_methodBody;
-            _81_methodBody = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("match self {\n");
-            BigInteger _82_k;
-            _82_k = BigInteger.Zero;
-            while ((_82_k) < (new BigInteger(((c).dtor_ctors).Count))) {
-              DAST._IDatatypeCtor _83_ctor2;
-              _83_ctor2 = ((c).dtor_ctors).Select(_82_k);
-              Dafny.ISequence<Dafny.Rune> _84_ctorMatch;
-              _84_ctorMatch = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#"), (c).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (_83_ctor2).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" { "));
-              BigInteger _85_l;
-              _85_l = BigInteger.Zero;
-              bool _86_hasMatchingField;
-              _86_hasMatchingField = false;
-              while ((_85_l) < (new BigInteger(((_83_ctor2).dtor_args).Count))) {
-                DAST._IFormal _87_formal2;
-                _87_formal2 = ((_83_ctor2).dtor_args).Select(_85_l);
-                if (((_79_formal).dtor_name).Equals((_87_formal2).dtor_name)) {
-                  _86_hasMatchingField = true;
-                }
-                _84_ctorMatch = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_84_ctorMatch, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (_87_formal2).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-                _85_l = (_85_l) + (BigInteger.One);
-              }
-              if (_86_hasMatchingField) {
-                if ((c).dtor_isCo) {
-                  _84_ctorMatch = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_84_ctorMatch, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("} => ::std::ops::Deref::deref(&")), (_79_formal).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".0),\n"));
-                } else {
-                  _84_ctorMatch = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_84_ctorMatch, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("} => ")), (_79_formal).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(",\n"));
-                }
-              } else {
-                _84_ctorMatch = Dafny.Sequence<Dafny.Rune>.Concat(_84_ctorMatch, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("} => panic!(\"field does not exist on this variant\"),\n"));
-              }
-              _81_methodBody = Dafny.Sequence<Dafny.Rune>.Concat(_81_methodBody, _84_ctorMatch);
-              _82_k = (_82_k) + (BigInteger.One);
-            }
-            _81_methodBody = Dafny.Sequence<Dafny.Rune>.Concat(_81_methodBody, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-            _74_implBody = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_74_implBody, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub fn r#")), (_79_formal).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(&self) -> &")), _80_formalType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), _81_methodBody), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-          }
-          _78_j = (_78_j) + (BigInteger.One);
-        }
-        _67_i = (_67_i) + (BigInteger.One);
-      }
-      Dafny.ISequence<Dafny.Rune> _88_constrainedTypeParams;
-      _88_constrainedTypeParams = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      if ((new BigInteger(((c).dtor_typeParams).Count)).Sign == 1) {
-        _63_tpI = BigInteger.Zero;
-        _88_constrainedTypeParams = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<");
-        while ((_63_tpI) < (new BigInteger(((c).dtor_typeParams).Count))) {
-          if ((_63_tpI).Sign == 1) {
-            _88_constrainedTypeParams = Dafny.Sequence<Dafny.Rune>.Concat(_88_constrainedTypeParams, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-          }
-          DAST._IType _89_tp;
-          _89_tp = ((c).dtor_typeParams).Select(_63_tpI);
-          Dafny.ISequence<Dafny.Rune> _90_genTp;
-          Dafny.ISequence<Dafny.Rune> _out25;
-          _out25 = DCOMP.COMP.GenType(_89_tp, false, false);
-          _90_genTp = _out25;
-          _88_constrainedTypeParams = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_88_constrainedTypeParams, _90_genTp), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ::dafny_runtime::DafnyErasable + ::dafny_runtime::DafnyUnerasable<")), _90_genTp), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("> + Clone + ::std::cmp::PartialEq + ::dafny_runtime::DafnyPrint + ::std::default::Default + 'static"));
-          _63_tpI = (_63_tpI) + (BigInteger.One);
-        }
-        _88_constrainedTypeParams = Dafny.Sequence<Dafny.Rune>.Concat(_88_constrainedTypeParams, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-      }
-      Dafny.ISequence<Dafny.Rune> _91_enumBody;
-      _91_enumBody = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#[derive(PartialEq)]\npub enum r#"), (c).dtor_name), _62_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), _66_ctors), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl ")), _88_constrainedTypeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" r#")), (c).dtor_name), _62_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), _74_implBody), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}"));
-      Dafny.ISequence<Dafny.Rune> _92_identEraseImpls;
-      _92_identEraseImpls = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl "), _88_constrainedTypeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ::dafny_runtime::DafnyErasable for r#")), (c).dtor_name), _62_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("type Erased = Self;\nfn erase(&self) -> &Self::Erased { self }\nfn erase_owned(self) -> Self::Erased { self }}\n"));
-      _92_identEraseImpls = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_92_identEraseImpls, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl ")), _88_constrainedTypeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ::dafny_runtime::DafnyUnerasable<r#")), (c).dtor_name), _62_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("> for r#")), (c).dtor_name), _62_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fn unerase(x: &Self) -> &Self { x }\nfn unerase_owned(x: Self) -> Self { x }}\n"));
-      Dafny.ISequence<Dafny.Rune> _93_printImpl;
-      _93_printImpl = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl "), _88_constrainedTypeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ::dafny_runtime::DafnyPrint for r#")), (c).dtor_name), _62_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fn fmt_print(&self, __fmt_print_formatter: &mut ::std::fmt::Formatter, _in_seq: bool) -> std::fmt::Result {\n")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("match self {\n"));
-      _67_i = BigInteger.Zero;
-      while ((_67_i) < (new BigInteger(((c).dtor_ctors).Count))) {
-        DAST._IDatatypeCtor _94_ctor;
-        _94_ctor = ((c).dtor_ctors).Select(_67_i);
-        Dafny.ISequence<Dafny.Rune> _95_ctorMatch;
-        _95_ctorMatch = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#"), (_94_ctor).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" { "));
-        Dafny.ISequence<Dafny.Rune> _96_modulePrefix;
-        _96_modulePrefix = (((((c).dtor_enclosingModule)).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_module"))) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.Concat(((c).dtor_enclosingModule), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("."))));
-        Dafny.ISequence<Dafny.Rune> _97_printRhs;
-        _97_printRhs = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("write!(__fmt_print_formatter, \""), _96_modulePrefix), (c).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".")), (_94_ctor).dtor_name), (((_94_ctor).dtor_hasAnyArgs) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(\")?;")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\")?;"))));
-        BigInteger _98_j;
-        _98_j = BigInteger.Zero;
-        while ((_98_j) < (new BigInteger(((_94_ctor).dtor_args).Count))) {
-          DAST._IFormal _99_formal;
-          _99_formal = ((_94_ctor).dtor_args).Select(_98_j);
-          _95_ctorMatch = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_95_ctorMatch, (_99_formal).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-          if ((_98_j).Sign == 1) {
-            _97_printRhs = Dafny.Sequence<Dafny.Rune>.Concat(_97_printRhs, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\nwrite!(__fmt_print_formatter, \", \")?;"));
-          }
-          _97_printRhs = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_97_printRhs, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n::dafny_runtime::DafnyPrint::fmt_print(")), (_99_formal).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", __fmt_print_formatter, false)?;"));
-          _98_j = (_98_j) + (BigInteger.One);
-        }
-        _95_ctorMatch = Dafny.Sequence<Dafny.Rune>.Concat(_95_ctorMatch, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
-        if ((_94_ctor).dtor_hasAnyArgs) {
-          _97_printRhs = Dafny.Sequence<Dafny.Rune>.Concat(_97_printRhs, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\nwrite!(__fmt_print_formatter, \")\")?;"));
-        }
-        _97_printRhs = Dafny.Sequence<Dafny.Rune>.Concat(_97_printRhs, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\nOk(())"));
-        _93_printImpl = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_93_printImpl, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (c).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")), _95_ctorMatch), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" => {\n")), _97_printRhs), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}\n"));
-        _67_i = (_67_i) + (BigInteger.One);
-      }
-      _93_printImpl = Dafny.Sequence<Dafny.Rune>.Concat(_93_printImpl, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n}\n}\n"));
-      Dafny.ISequence<Dafny.Rune> _100_defaultImpl;
-      _100_defaultImpl = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      if ((new BigInteger(((c).dtor_ctors).Count)).Sign == 1) {
-        _100_defaultImpl = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl "), _88_constrainedTypeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ::std::default::Default for r#")), (c).dtor_name), _62_typeParams), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fn default() -> Self {\n")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (c).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::r#")), (((c).dtor_ctors).Select(BigInteger.Zero)).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n"));
-        _67_i = BigInteger.Zero;
-        while ((_67_i) < (new BigInteger(((((c).dtor_ctors).Select(BigInteger.Zero)).dtor_args).Count))) {
-          DAST._IFormal _101_formal;
-          _101_formal = ((((c).dtor_ctors).Select(BigInteger.Zero)).dtor_args).Select(_67_i);
-          _100_defaultImpl = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_100_defaultImpl, (_101_formal).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": std::default::Default::default(),\n"));
-          _67_i = (_67_i) + (BigInteger.One);
-        }
-        _100_defaultImpl = Dafny.Sequence<Dafny.Rune>.Concat(_100_defaultImpl, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n}\n}\n"));
-      }
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_91_enumBody, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), _92_identEraseImpls), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), _93_printImpl), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), _100_defaultImpl);
-      return s;
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenPath(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> p) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      if ((new BigInteger((p).Count)).Sign == 0) {
-        s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Self");
-        return s;
-      } else {
-        s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("super::");
-        BigInteger _102_i;
-        _102_i = BigInteger.Zero;
-        while ((_102_i) < (new BigInteger((p).Count))) {
-          if ((_102_i).Sign == 1) {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::"));
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), ((p).Select(_102_i)));
-          _102_i = (_102_i) + (BigInteger.One);
-        }
-      }
-      return s;
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenTypeArgs(Dafny.ISequence<DAST._IType> args, bool inBinding, bool inFn) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      if ((new BigInteger((args).Count)).Sign == 1) {
-        s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"));
-        BigInteger _103_i;
-        _103_i = BigInteger.Zero;
-        while ((_103_i) < (new BigInteger((args).Count))) {
-          if ((_103_i).Sign == 1) {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-          }
-          Dafny.ISequence<Dafny.Rune> _104_genTp;
-          Dafny.ISequence<Dafny.Rune> _out26;
-          _out26 = DCOMP.COMP.GenType((args).Select(_103_i), inBinding, inFn);
-          _104_genTp = _out26;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, _104_genTp);
-          _103_i = (_103_i) + (BigInteger.One);
-        }
-        s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-      }
-      return s;
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenType(DAST._IType c, bool inBinding, bool inFn) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      DAST._IType _source4 = c;
-      if (_source4.is_Path) {
-        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _105___mcc_h0 = _source4.dtor_Path_a0;
-        Dafny.ISequence<DAST._IType> _106___mcc_h1 = _source4.dtor_typeArgs;
-        DAST._IResolvedType _107___mcc_h2 = _source4.dtor_resolved;
-        DAST._IResolvedType _108_resolved = _107___mcc_h2;
-        Dafny.ISequence<DAST._IType> _109_args = _106___mcc_h1;
-        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _110_p = _105___mcc_h0;
-        {
-          Dafny.ISequence<Dafny.Rune> _out27;
-          _out27 = DCOMP.COMP.GenPath(_110_p);
-          s = _out27;
-          Dafny.ISequence<Dafny.Rune> _111_typeArgs;
-          Dafny.ISequence<Dafny.Rune> _out28;
-          _out28 = DCOMP.COMP.GenTypeArgs(_109_args, inBinding, inFn);
-          _111_typeArgs = _out28;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, _111_typeArgs);
-          DAST._IResolvedType _source5 = _108_resolved;
-          if (_source5.is_Datatype) {
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _112___mcc_h16 = _source5.dtor_path;
-            {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::rc::Rc<"), s), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-            }
-          } else if (_source5.is_Trait) {
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _113___mcc_h18 = _source5.dtor_path;
-            {
-              if (inBinding) {
-                s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("_");
-              } else {
-                s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("impl "), s), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""));
-              }
-            }
-          } else {
-            DAST._IResolvedType _114_Primitive = _108_resolved;
-          }
-        }
-      } else if (_source4.is_Tuple) {
-        Dafny.ISequence<DAST._IType> _115___mcc_h3 = _source4.dtor_Tuple_a0;
-        Dafny.ISequence<DAST._IType> _116_types = _115___mcc_h3;
-        {
-          s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(");
-          BigInteger _117_i;
-          _117_i = BigInteger.Zero;
-          while ((_117_i) < (new BigInteger((_116_types).Count))) {
-            if ((_117_i).Sign == 1) {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" "));
-            }
-            Dafny.ISequence<Dafny.Rune> _118_generated;
-            Dafny.ISequence<Dafny.Rune> _out29;
-            _out29 = DCOMP.COMP.GenType((_116_types).Select(_117_i), inBinding, inFn);
-            _118_generated = _out29;
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, _118_generated), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(","));
-            _117_i = (_117_i) + (BigInteger.One);
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-        }
-      } else if (_source4.is_Array) {
-        DAST._IType _119___mcc_h4 = _source4.dtor_element;
-        DAST._IType _120_element = _119___mcc_h4;
-        {
-          Dafny.ISequence<Dafny.Rune> _121_elemStr;
-          Dafny.ISequence<Dafny.Rune> _out30;
-          _out30 = DCOMP.COMP.GenType(_120_element, inBinding, inFn);
-          _121_elemStr = _out30;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::vec::Vec<"), _121_elemStr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-        }
-      } else if (_source4.is_Seq) {
-        DAST._IType _122___mcc_h5 = _source4.dtor_element;
-        DAST._IType _123_element = _122___mcc_h5;
-        {
-          Dafny.ISequence<Dafny.Rune> _124_elemStr;
-          Dafny.ISequence<Dafny.Rune> _out31;
-          _out31 = DCOMP.COMP.GenType(_123_element, inBinding, inFn);
-          _124_elemStr = _out31;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::vec::Vec<"), _124_elemStr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-        }
-      } else if (_source4.is_Set) {
-        DAST._IType _125___mcc_h6 = _source4.dtor_element;
-        DAST._IType _126_element = _125___mcc_h6;
-        {
-          Dafny.ISequence<Dafny.Rune> _127_elemStr;
-          Dafny.ISequence<Dafny.Rune> _out32;
-          _out32 = DCOMP.COMP.GenType(_126_element, inBinding, inFn);
-          _127_elemStr = _out32;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::collections::HashSet<"), _127_elemStr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-        }
-      } else if (_source4.is_Multiset) {
-        DAST._IType _128___mcc_h7 = _source4.dtor_element;
-        DAST._IType _129_element = _128___mcc_h7;
-        {
-          Dafny.ISequence<Dafny.Rune> _130_elemStr;
-          Dafny.ISequence<Dafny.Rune> _out33;
-          _out33 = DCOMP.COMP.GenType(_129_element, inBinding, inFn);
-          _130_elemStr = _out33;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::collections::HashMap<"), _130_elemStr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", u64>"));
-        }
-      } else if (_source4.is_Map) {
-        DAST._IType _131___mcc_h8 = _source4.dtor_key;
-        DAST._IType _132___mcc_h9 = _source4.dtor_value;
-        DAST._IType _133_value = _132___mcc_h9;
-        DAST._IType _134_key = _131___mcc_h8;
-        {
-          Dafny.ISequence<Dafny.Rune> _135_keyStr;
-          Dafny.ISequence<Dafny.Rune> _out34;
-          _out34 = DCOMP.COMP.GenType(_134_key, inBinding, inFn);
-          _135_keyStr = _out34;
-          Dafny.ISequence<Dafny.Rune> _136_valueStr;
-          Dafny.ISequence<Dafny.Rune> _out35;
-          _out35 = DCOMP.COMP.GenType(_133_value, inBinding, inFn);
-          _136_valueStr = _out35;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::collections::HashMap<"), _135_keyStr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", ")), _136_valueStr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-        }
-      } else if (_source4.is_Arrow) {
-        Dafny.ISequence<DAST._IType> _137___mcc_h10 = _source4.dtor_args;
-        DAST._IType _138___mcc_h11 = _source4.dtor_result;
-        DAST._IType _139_result = _138___mcc_h11;
-        Dafny.ISequence<DAST._IType> _140_args = _137___mcc_h10;
-        {
-          if (inBinding) {
-            s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::FunctionWrapper<_>");
-          } else {
-            if (inFn) {
-              s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::FunctionWrapper<::std::boxed::Box<dyn ::std::ops::Fn(");
-            } else {
-              s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::FunctionWrapper<impl ::std::ops::Fn(");
-            }
-            BigInteger _141_i;
-            _141_i = BigInteger.Zero;
-            while ((_141_i) < (new BigInteger((_140_args).Count))) {
-              if ((_141_i).Sign == 1) {
-                s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-              }
-              Dafny.ISequence<Dafny.Rune> _142_generated;
-              Dafny.ISequence<Dafny.Rune> _out36;
-              _out36 = DCOMP.COMP.GenType((_140_args).Select(_141_i), inBinding, true);
-              _142_generated = _out36;
-              s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&")), _142_generated);
-              _141_i = (_141_i) + (BigInteger.One);
-            }
-            Dafny.ISequence<Dafny.Rune> _143_resultType;
-            Dafny.ISequence<Dafny.Rune> _out37;
-            _out37 = DCOMP.COMP.GenType(_139_result, inBinding, inFn);
-            _143_resultType = _out37;
-            if (inFn) {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") -> ")), _143_resultType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" + 'static>>"));
-            } else {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") -> ")), _143_resultType), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" + Clone + 'static>"));
-            }
-          }
-        }
-      } else if (_source4.is_Primitive) {
-        DAST._IPrimitive _144___mcc_h12 = _source4.dtor_Primitive_a0;
-        DAST._IPrimitive _145_p = _144___mcc_h12;
-        {
-          DAST._IPrimitive _source6 = _145_p;
-          if (_source6.is_String) {
-            s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("Vec<char>");
-          } else if (_source6.is_Bool) {
-            s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("bool");
-          } else {
-            s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("char");
-          }
-        }
-      } else if (_source4.is_Passthrough) {
-        Dafny.ISequence<Dafny.Rune> _146___mcc_h13 = _source4.dtor_Passthrough_a0;
-        Dafny.ISequence<Dafny.Rune> _147_v = _146___mcc_h13;
-        s = _147_v;
-      } else {
-        Dafny.ISequence<Dafny.Rune> _148___mcc_h14 = _source4.dtor_TypeArg_a0;
-        Dafny.ISequence<Dafny.Rune> _source7 = _148___mcc_h14;
-        Dafny.ISequence<Dafny.Rune> _149___mcc_h15 = _source7;
-        Dafny.ISequence<Dafny.Rune> _150_name = _149___mcc_h15;
-        s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#"), _150_name);
-      }
-      return s;
-    }
-    public static void GenClassImplBody(Dafny.ISequence<DAST._IClassItem> body, bool forTrait, DAST._IType enclosingType, Dafny.ISet<DAST._IType> enclosingTypeParams, out Dafny.ISequence<Dafny.Rune> s, out Dafny.IMap<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>> traitBodies) {
-      s = Dafny.Sequence<Dafny.Rune>.Empty;
-      traitBodies = Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>>.Empty;
-      s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      traitBodies = Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>>.FromElements();
-      BigInteger _151_i;
-      _151_i = BigInteger.Zero;
-      while ((_151_i) < (new BigInteger((body).Count))) {
-        DAST._IClassItem _source8 = (body).Select(_151_i);
-        if (_source8.is_Method) {
-          DAST._IMethod _152___mcc_h0 = _source8.dtor_Method_a0;
-          DAST._IMethod _153_m = _152___mcc_h0;
-          {
-            DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _source9 = (_153_m).dtor_overridingPath;
-            if (_source9.is_Some) {
-              Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _154___mcc_h2 = _source9.dtor_Some_a0;
-              Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _155_p = _154___mcc_h2;
-              {
-                Dafny.ISequence<Dafny.Rune> _156_existing;
-                _156_existing = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-                if ((traitBodies).Contains(_155_p)) {
-                  _156_existing = Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>>.Select(traitBodies, _155_p);
-                }
-                if ((new BigInteger((_156_existing).Count)).Sign == 1) {
-                  _156_existing = Dafny.Sequence<Dafny.Rune>.Concat(_156_existing, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"));
-                }
-                Dafny.ISequence<Dafny.Rune> _157_genMethod;
-                Dafny.ISequence<Dafny.Rune> _out38;
-                _out38 = DCOMP.COMP.GenMethod(_153_m, true, enclosingType, enclosingTypeParams);
-                _157_genMethod = _out38;
-                _156_existing = Dafny.Sequence<Dafny.Rune>.Concat(_156_existing, _157_genMethod);
-                traitBodies = Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>>.Merge(traitBodies, Dafny.Map<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>>.FromElements(new Dafny.Pair<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>, Dafny.ISequence<Dafny.Rune>>(_155_p, _156_existing)));
-              }
-            } else {
-              {
-                Dafny.ISequence<Dafny.Rune> _158_generated;
-                Dafny.ISequence<Dafny.Rune> _out39;
-                _out39 = DCOMP.COMP.GenMethod(_153_m, forTrait, enclosingType, enclosingTypeParams);
-                _158_generated = _out39;
-                s = Dafny.Sequence<Dafny.Rune>.Concat(s, _158_generated);
-              }
-            }
-          }
-        } else {
-          DAST._IFormal _159___mcc_h1 = _source8.dtor_Field_a0;
-          DAST._IFormal _160_f = _159___mcc_h1;
-        }
-        if ((new BigInteger((s).Count)).Sign == 1) {
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"));
-        }
-        _151_i = (_151_i) + (BigInteger.One);
-      }
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenParams(Dafny.ISequence<DAST._IFormal> @params) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      BigInteger _161_i;
-      _161_i = BigInteger.Zero;
-      while ((_161_i) < (new BigInteger((@params).Count))) {
-        DAST._IFormal _162_param;
-        _162_param = (@params).Select(_161_i);
-        Dafny.ISequence<Dafny.Rune> _163_paramType;
-        Dafny.ISequence<Dafny.Rune> _out40;
-        _out40 = DCOMP.COMP.GenType((_162_param).dtor_typ, false, false);
-        _163_paramType = _out40;
-        s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (_162_param).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": &")), _163_paramType);
-        if ((_161_i) < ((new BigInteger((@params).Count)) - (BigInteger.One))) {
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-        }
-        _161_i = (_161_i) + (BigInteger.One);
-      }
-      return s;
-    }
-    public static Dafny.ISequence<Dafny.Rune> GenMethod(DAST._IMethod m, bool forTrait, DAST._IType enclosingType, Dafny.ISet<DAST._IType> enclosingTypeParams) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      Dafny.ISequence<Dafny.Rune> _164_params;
-      Dafny.ISequence<Dafny.Rune> _out41;
-      _out41 = DCOMP.COMP.GenParams((m).dtor_params);
-      _164_params = _out41;
-      Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _165_paramNames;
-      _165_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements();
-      BigInteger _166_paramI;
-      _166_paramI = BigInteger.Zero;
-      while ((_166_paramI) < (new BigInteger(((m).dtor_params).Count))) {
-        _165_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_165_paramNames, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((((m).dtor_params).Select(_166_paramI)).dtor_name));
-        _166_paramI = (_166_paramI) + (BigInteger.One);
-      }
-      if (!((m).dtor_isStatic)) {
-        if (forTrait) {
-          _164_params = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&self"), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", ")), _164_params);
-        } else {
-          Dafny.ISequence<Dafny.Rune> _167_enclosingTypeString;
-          Dafny.ISequence<Dafny.Rune> _out42;
-          _out42 = DCOMP.COMP.GenType(enclosingType, false, false);
-          _167_enclosingTypeString = _out42;
-          _164_params = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self: &"), _167_enclosingTypeString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", ")), _164_params);
-        }
-      }
-      Dafny.ISequence<Dafny.Rune> _168_retType;
-      _168_retType = (((new BigInteger(((m).dtor_outTypes).Count)) != (BigInteger.One)) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")));
-      BigInteger _169_typeI;
-      _169_typeI = BigInteger.Zero;
-      while ((_169_typeI) < (new BigInteger(((m).dtor_outTypes).Count))) {
-        if ((_169_typeI).Sign == 1) {
-          _168_retType = Dafny.Sequence<Dafny.Rune>.Concat(_168_retType, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-        }
-        Dafny.ISequence<Dafny.Rune> _170_typeString;
-        Dafny.ISequence<Dafny.Rune> _out43;
-        _out43 = DCOMP.COMP.GenType(((m).dtor_outTypes).Select(_169_typeI), false, false);
-        _170_typeString = _out43;
-        _168_retType = Dafny.Sequence<Dafny.Rune>.Concat(_168_retType, _170_typeString);
-        _169_typeI = (_169_typeI) + (BigInteger.One);
-      }
-      if ((new BigInteger(((m).dtor_outTypes).Count)) != (BigInteger.One)) {
-        _168_retType = Dafny.Sequence<Dafny.Rune>.Concat(_168_retType, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-      }
-      if (forTrait) {
-        s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("fn r#"), (m).dtor_name);
-      } else {
-        s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("pub fn r#"), (m).dtor_name);
-      }
-      Dafny.ISequence<DAST._IType> _171_typeParamsFiltered;
-      _171_typeParamsFiltered = Dafny.Sequence<DAST._IType>.FromElements();
-      BigInteger _172_typeParamI;
-      _172_typeParamI = BigInteger.Zero;
-      while ((_172_typeParamI) < (new BigInteger(((m).dtor_typeParams).Count))) {
-        DAST._IType _173_typeParam;
-        _173_typeParam = ((m).dtor_typeParams).Select(_172_typeParamI);
-        if (!((enclosingTypeParams).Contains(_173_typeParam))) {
-          _171_typeParamsFiltered = Dafny.Sequence<DAST._IType>.Concat(_171_typeParamsFiltered, Dafny.Sequence<DAST._IType>.FromElements(_173_typeParam));
-        }
-        _172_typeParamI = (_172_typeParamI) + (BigInteger.One);
-      }
-      if ((new BigInteger((_171_typeParamsFiltered).Count)).Sign == 1) {
-        s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"));
-        BigInteger _174_i;
-        _174_i = BigInteger.Zero;
-        while ((_174_i) < (new BigInteger((_171_typeParamsFiltered).Count))) {
-          if ((_174_i).Sign == 1) {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-          }
-          Dafny.ISequence<Dafny.Rune> _175_typeString;
-          Dafny.ISequence<Dafny.Rune> _out44;
-          _out44 = DCOMP.COMP.GenType((_171_typeParamsFiltered).Select(_174_i), false, false);
-          _175_typeString = _out44;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, _175_typeString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ::dafny_runtime::DafnyErasable + ::dafny_runtime::DafnyUnerasable<")), _175_typeString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("> + Clone + ::std::cmp::PartialEq + ::dafny_runtime::DafnyPrint + ::std::default::Default + 'static"));
-          _174_i = (_174_i) + (BigInteger.One);
-        }
-        s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-      }
-      s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _164_params), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") -> ")), _168_retType);
-      if ((m).dtor_hasBody) {
-        Dafny.ISequence<Dafny.Rune> _176_earlyReturn;
-        _176_earlyReturn = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("return;");
-        DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _source10 = (m).dtor_outVars;
-        if (_source10.is_Some) {
-          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _177___mcc_h0 = _source10.dtor_Some_a0;
-          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _178_outVars = _177___mcc_h0;
-          {
-            _176_earlyReturn = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("return (");
-            BigInteger _179_outI;
-            _179_outI = BigInteger.Zero;
-            while ((_179_outI) < (new BigInteger((_178_outVars).Count))) {
-              if ((_179_outI).Sign == 1) {
-                _176_earlyReturn = Dafny.Sequence<Dafny.Rune>.Concat(_176_earlyReturn, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-              }
-              Dafny.ISequence<Dafny.Rune> _180_outVar;
-              _180_outVar = (_178_outVars).Select(_179_outI);
-              _176_earlyReturn = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_176_earlyReturn, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (_180_outVar));
-              _179_outI = (_179_outI) + (BigInteger.One);
-            }
-            _176_earlyReturn = Dafny.Sequence<Dafny.Rune>.Concat(_176_earlyReturn, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(");"));
-          }
-        } else {
-        }
-        Dafny.ISequence<Dafny.Rune> _181_body;
-        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _182___v9;
-        Dafny.ISequence<Dafny.Rune> _out45;
-        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out46;
-        DCOMP.COMP.GenStmts((m).dtor_body, _165_paramNames, true, _176_earlyReturn, out _out45, out _out46);
-        _181_body = _out45;
-        _182___v9 = _out46;
-        DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _source11 = (m).dtor_outVars;
-        if (_source11.is_Some) {
-          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _183___mcc_h1 = _source11.dtor_Some_a0;
-          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _184_outVars = _183___mcc_h1;
-          {
-            _181_body = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_181_body, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n")), _176_earlyReturn);
-          }
-        } else {
-        }
-        s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), _181_body), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}\n"));
-      } else {
-        s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";\n"));
-      }
-      return s;
-    }
-    public static void GenStmts(Dafny.ISequence<DAST._IStatement> stmts, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> @params, bool isLast, Dafny.ISequence<Dafny.Rune> earlyReturn, out Dafny.ISequence<Dafny.Rune> generated, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents) {
-      generated = Dafny.Sequence<Dafny.Rune>.Empty;
-      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
-      generated = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-      BigInteger _185_i;
-      _185_i = BigInteger.Zero;
-      while ((_185_i) < (new BigInteger((stmts).Count))) {
-        DAST._IStatement _186_stmt;
-        _186_stmt = (stmts).Select(_185_i);
-        Dafny.ISequence<Dafny.Rune> _187_stmtString;
-        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _188_recIdents;
-        Dafny.ISequence<Dafny.Rune> _out47;
-        Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out48;
-        DCOMP.COMP.GenStmt(_186_stmt, @params, (isLast) && ((_185_i) == ((new BigInteger((stmts).Count)) - (BigInteger.One))), earlyReturn, out _out47, out _out48);
-        _187_stmtString = _out47;
-        _188_recIdents = _out48;
-        readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _188_recIdents);
-        if ((_185_i).Sign == 1) {
-          generated = Dafny.Sequence<Dafny.Rune>.Concat(generated, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"));
-        }
-        generated = Dafny.Sequence<Dafny.Rune>.Concat(generated, _187_stmtString);
-        _185_i = (_185_i) + (BigInteger.One);
-      }
-    }
-    public static void GenStmt(DAST._IStatement stmt, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> @params, bool isLast, Dafny.ISequence<Dafny.Rune> earlyReturn, out Dafny.ISequence<Dafny.Rune> generated, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents) {
-      generated = Dafny.Sequence<Dafny.Rune>.Empty;
-      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
-      DAST._IStatement _source12 = stmt;
-      if (_source12.is_DeclareVar) {
-        Dafny.ISequence<Dafny.Rune> _189___mcc_h0 = _source12.dtor_name;
-        DAST._IType _190___mcc_h1 = _source12.dtor_typ;
-        DAST._IOptional<DAST._IExpression> _191___mcc_h2 = _source12.dtor_maybeValue;
-        DAST._IOptional<DAST._IExpression> _source13 = _191___mcc_h2;
-        if (_source13.is_Some) {
-          DAST._IExpression _192___mcc_h3 = _source13.dtor_Some_a0;
-          DAST._IExpression _193_expression = _192___mcc_h3;
-          DAST._IType _194_typ = _190___mcc_h1;
-          Dafny.ISequence<Dafny.Rune> _195_name = _189___mcc_h0;
-          {
-            Dafny.ISequence<Dafny.Rune> _196_expr;
-            bool _197___v10;
-            bool _198_recErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _199_recIdents;
-            Dafny.ISequence<Dafny.Rune> _out49;
-            bool _out50;
-            bool _out51;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out52;
-            DCOMP.COMP.GenExpr(_193_expression, @params, true, out _out49, out _out50, out _out51, out _out52);
-            _196_expr = _out49;
-            _197___v10 = _out50;
-            _198_recErased = _out51;
-            _199_recIdents = _out52;
-            if (_198_recErased) {
-              _196_expr = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyUnerasable::<_>::unerase_owned("), _196_expr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-            Dafny.ISequence<Dafny.Rune> _200_typeString;
-            Dafny.ISequence<Dafny.Rune> _out53;
-            _out53 = DCOMP.COMP.GenType(_194_typ, true, false);
-            _200_typeString = _out53;
-            generated = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("let mut r#"), _195_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ")), _200_typeString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = ")), _196_expr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
-            readIdents = _199_recIdents;
-          }
-        } else {
-          DAST._IType _201_typ = _190___mcc_h1;
-          Dafny.ISequence<Dafny.Rune> _202_name = _189___mcc_h0;
-          {
-            Dafny.ISequence<Dafny.Rune> _203_typeString;
-            Dafny.ISequence<Dafny.Rune> _out54;
-            _out54 = DCOMP.COMP.GenType(_201_typ, true, false);
-            _203_typeString = _out54;
-            generated = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("let mut r#"), _202_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ")), _203_typeString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          }
-        }
-      } else if (_source12.is_Assign) {
-        Dafny.ISequence<Dafny.Rune> _204___mcc_h4 = _source12.dtor_name;
-        DAST._IExpression _205___mcc_h5 = _source12.dtor_value;
-        DAST._IExpression _206_expression = _205___mcc_h5;
-        Dafny.ISequence<Dafny.Rune> _207_name = _204___mcc_h4;
-        {
-          Dafny.ISequence<Dafny.Rune> _208_expr;
-          bool _209___v11;
-          bool _210_recErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _211_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out55;
-          bool _out56;
-          bool _out57;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out58;
-          DCOMP.COMP.GenExpr(_206_expression, @params, true, out _out55, out _out56, out _out57, out _out58);
-          _208_expr = _out55;
-          _209___v11 = _out56;
-          _210_recErased = _out57;
-          _211_recIdents = _out58;
-          if (_210_recErased) {
-            _208_expr = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyUnerasable::<_>::unerase_owned("), _208_expr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          }
-          generated = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#"), _207_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = ")), _208_expr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
-          readIdents = _211_recIdents;
-        }
-      } else if (_source12.is_If) {
-        DAST._IExpression _212___mcc_h6 = _source12.dtor_cond;
-        Dafny.ISequence<DAST._IStatement> _213___mcc_h7 = _source12.dtor_thn;
-        Dafny.ISequence<DAST._IStatement> _214___mcc_h8 = _source12.dtor_els;
-        Dafny.ISequence<DAST._IStatement> _215_els = _214___mcc_h8;
-        Dafny.ISequence<DAST._IStatement> _216_thn = _213___mcc_h7;
-        DAST._IExpression _217_cond = _212___mcc_h6;
-        {
-          Dafny.ISequence<Dafny.Rune> _218_condString;
-          bool _219___v12;
-          bool _220_condErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _221_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out59;
-          bool _out60;
-          bool _out61;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out62;
-          DCOMP.COMP.GenExpr(_217_cond, @params, true, out _out59, out _out60, out _out61, out _out62);
-          _218_condString = _out59;
-          _219___v12 = _out60;
-          _220_condErased = _out61;
-          _221_recIdents = _out62;
-          if (!(_220_condErased)) {
-            _218_condString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _218_condString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          }
-          readIdents = _221_recIdents;
-          Dafny.ISequence<Dafny.Rune> _222_thnString;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _223_thnIdents;
-          Dafny.ISequence<Dafny.Rune> _out63;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out64;
-          DCOMP.COMP.GenStmts(_216_thn, @params, isLast, earlyReturn, out _out63, out _out64);
-          _222_thnString = _out63;
-          _223_thnIdents = _out64;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _223_thnIdents);
-          Dafny.ISequence<Dafny.Rune> _224_elsString;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _225_elsIdents;
-          Dafny.ISequence<Dafny.Rune> _out65;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out66;
-          DCOMP.COMP.GenStmts(_215_els, @params, isLast, earlyReturn, out _out65, out _out66);
-          _224_elsString = _out65;
-          _225_elsIdents = _out66;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _225_elsIdents);
-          generated = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("if "), _218_condString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), _222_thnString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n} else {\n")), _224_elsString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}"));
-        }
-      } else if (_source12.is_While) {
-        DAST._IExpression _226___mcc_h9 = _source12.dtor_cond;
-        Dafny.ISequence<DAST._IStatement> _227___mcc_h10 = _source12.dtor_body;
-        Dafny.ISequence<DAST._IStatement> _228_body = _227___mcc_h10;
-        DAST._IExpression _229_cond = _226___mcc_h9;
-        {
-          Dafny.ISequence<Dafny.Rune> _230_condString;
-          bool _231___v13;
-          bool _232_condErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _233_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out67;
-          bool _out68;
-          bool _out69;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out70;
-          DCOMP.COMP.GenExpr(_229_cond, @params, true, out _out67, out _out68, out _out69, out _out70);
-          _230_condString = _out67;
-          _231___v13 = _out68;
-          _232_condErased = _out69;
-          _233_recIdents = _out70;
-          if (!(_232_condErased)) {
-            _230_condString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase("), _230_condString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          }
-          readIdents = _233_recIdents;
-          Dafny.ISequence<Dafny.Rune> _234_bodyString;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _235_bodyIdents;
-          Dafny.ISequence<Dafny.Rune> _out71;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out72;
-          DCOMP.COMP.GenStmts(_228_body, @params, false, earlyReturn, out _out71, out _out72);
-          _234_bodyString = _out71;
-          _235_bodyIdents = _out72;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _235_bodyIdents);
-          generated = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("while "), _230_condString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), _234_bodyString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}"));
-        }
-      } else if (_source12.is_Call) {
-        DAST._IExpression _236___mcc_h11 = _source12.dtor_on;
-        Dafny.ISequence<Dafny.Rune> _237___mcc_h12 = _source12.dtor_name;
-        Dafny.ISequence<DAST._IType> _238___mcc_h13 = _source12.dtor_typeArgs;
-        Dafny.ISequence<DAST._IExpression> _239___mcc_h14 = _source12.dtor_args;
-        DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _240___mcc_h15 = _source12.dtor_outs;
-        DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _241_maybeOutVars = _240___mcc_h15;
-        Dafny.ISequence<DAST._IExpression> _242_args = _239___mcc_h14;
-        Dafny.ISequence<DAST._IType> _243_typeArgs = _238___mcc_h13;
-        Dafny.ISequence<Dafny.Rune> _244_name = _237___mcc_h12;
-        DAST._IExpression _245_on = _236___mcc_h11;
-        {
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          Dafny.ISequence<Dafny.Rune> _246_typeArgString;
-          _246_typeArgString = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-          if ((new BigInteger((_243_typeArgs).Count)) >= (BigInteger.One)) {
-            BigInteger _247_typeI;
-            _247_typeI = BigInteger.Zero;
-            _246_typeArgString = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::<");
-            while ((_247_typeI) < (new BigInteger((_243_typeArgs).Count))) {
-              if ((_247_typeI).Sign == 1) {
-                _246_typeArgString = Dafny.Sequence<Dafny.Rune>.Concat(_246_typeArgString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-              }
-              Dafny.ISequence<Dafny.Rune> _248_typeString;
-              Dafny.ISequence<Dafny.Rune> _out73;
-              _out73 = DCOMP.COMP.GenType((_243_typeArgs).Select(_247_typeI), false, false);
-              _248_typeString = _out73;
-              _246_typeArgString = Dafny.Sequence<Dafny.Rune>.Concat(_246_typeArgString, _248_typeString);
-              _247_typeI = (_247_typeI) + (BigInteger.One);
-            }
-            _246_typeArgString = Dafny.Sequence<Dafny.Rune>.Concat(_246_typeArgString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-          }
-          Dafny.ISequence<Dafny.Rune> _249_argString;
-          _249_argString = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-          BigInteger _250_i;
-          _250_i = BigInteger.Zero;
-          while ((_250_i) < (new BigInteger((_242_args).Count))) {
-            if ((_250_i).Sign == 1) {
-              _249_argString = Dafny.Sequence<Dafny.Rune>.Concat(_249_argString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-            }
-            Dafny.ISequence<Dafny.Rune> _251_argExpr;
-            bool _252_isOwned;
-            bool _253_argErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _254_argIdents;
-            Dafny.ISequence<Dafny.Rune> _out74;
-            bool _out75;
-            bool _out76;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out77;
-            DCOMP.COMP.GenExpr((_242_args).Select(_250_i), @params, false, out _out74, out _out75, out _out76, out _out77);
-            _251_argExpr = _out74;
-            _252_isOwned = _out75;
-            _253_argErased = _out76;
-            _254_argIdents = _out77;
-            if (_252_isOwned) {
-              _251_argExpr = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), _251_argExpr);
-            }
-            _249_argString = Dafny.Sequence<Dafny.Rune>.Concat(_249_argString, _251_argExpr);
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _254_argIdents);
-            _250_i = (_250_i) + (BigInteger.One);
-          }
-          Dafny.ISequence<Dafny.Rune> _255_enclosingString;
-          bool _256___v14;
-          bool _257___v15;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _258_enclosingIdents;
-          Dafny.ISequence<Dafny.Rune> _out78;
-          bool _out79;
-          bool _out80;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out81;
-          DCOMP.COMP.GenExpr(_245_on, @params, true, out _out78, out _out79, out _out80, out _out81);
-          _255_enclosingString = _out78;
-          _256___v14 = _out79;
-          _257___v15 = _out80;
-          _258_enclosingIdents = _out81;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _258_enclosingIdents);
-          DAST._IExpression _source14 = _245_on;
-          if (_source14.is_Literal) {
-            DAST._ILiteral _259___mcc_h18 = _source14.dtor_Literal_a0;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_Ident) {
-            Dafny.ISequence<Dafny.Rune> _260___mcc_h20 = _source14.dtor_Ident_a0;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_Companion) {
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _261___mcc_h22 = _source14.dtor_Companion_a0;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(_255_enclosingString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::"));
-            }
-          } else if (_source14.is_Tuple) {
-            Dafny.ISequence<DAST._IExpression> _262___mcc_h24 = _source14.dtor_Tuple_a0;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_New) {
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _263___mcc_h26 = _source14.dtor_path;
-            Dafny.ISequence<DAST._IExpression> _264___mcc_h27 = _source14.dtor_args;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_NewArray) {
-            Dafny.ISequence<DAST._IExpression> _265___mcc_h30 = _source14.dtor_dims;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_DatatypeValue) {
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _266___mcc_h32 = _source14.dtor_path;
-            Dafny.ISequence<Dafny.Rune> _267___mcc_h33 = _source14.dtor_variant;
-            bool _268___mcc_h34 = _source14.dtor_isCo;
-            Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> _269___mcc_h35 = _source14.dtor_contents;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_SubsetUpgrade) {
-            DAST._IExpression _270___mcc_h40 = _source14.dtor_value;
-            DAST._IType _271___mcc_h41 = _source14.dtor_typ;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_SubsetDowngrade) {
-            DAST._IExpression _272___mcc_h44 = _source14.dtor_value;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_SeqValue) {
-            Dafny.ISequence<DAST._IExpression> _273___mcc_h46 = _source14.dtor_elements;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_SetValue) {
-            Dafny.ISequence<DAST._IExpression> _274___mcc_h48 = _source14.dtor_elements;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_This) {
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_Ite) {
-            DAST._IExpression _275___mcc_h50 = _source14.dtor_cond;
-            DAST._IExpression _276___mcc_h51 = _source14.dtor_thn;
-            DAST._IExpression _277___mcc_h52 = _source14.dtor_els;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_UnOp) {
-            DAST._IUnaryOp _278___mcc_h56 = _source14.dtor_unOp;
-            DAST._IExpression _279___mcc_h57 = _source14.dtor_expr;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_BinOp) {
-            Dafny.ISequence<Dafny.Rune> _280___mcc_h60 = _source14.dtor_op;
-            DAST._IExpression _281___mcc_h61 = _source14.dtor_left;
-            DAST._IExpression _282___mcc_h62 = _source14.dtor_right;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_Select) {
-            DAST._IExpression _283___mcc_h66 = _source14.dtor_expr;
-            Dafny.ISequence<Dafny.Rune> _284___mcc_h67 = _source14.dtor_field;
-            bool _285___mcc_h68 = _source14.dtor_onDatatype;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_SelectFn) {
-            DAST._IExpression _286___mcc_h72 = _source14.dtor_expr;
-            Dafny.ISequence<Dafny.Rune> _287___mcc_h73 = _source14.dtor_field;
-            bool _288___mcc_h74 = _source14.dtor_onDatatype;
-            bool _289___mcc_h75 = _source14.dtor_isStatic;
-            BigInteger _290___mcc_h76 = _source14.dtor_arity;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_TupleSelect) {
-            DAST._IExpression _291___mcc_h82 = _source14.dtor_expr;
-            BigInteger _292___mcc_h83 = _source14.dtor_index;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_Call) {
-            DAST._IExpression _293___mcc_h86 = _source14.dtor_on;
-            Dafny.ISequence<Dafny.Rune> _294___mcc_h87 = _source14.dtor_name;
-            Dafny.ISequence<DAST._IType> _295___mcc_h88 = _source14.dtor_typeArgs;
-            Dafny.ISequence<DAST._IExpression> _296___mcc_h89 = _source14.dtor_args;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_Lambda) {
-            Dafny.ISequence<DAST._IFormal> _297___mcc_h94 = _source14.dtor_params;
-            DAST._IType _298___mcc_h95 = _source14.dtor_retType;
-            Dafny.ISequence<DAST._IStatement> _299___mcc_h96 = _source14.dtor_body;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_IIFE) {
-            Dafny.ISequence<Dafny.Rune> _300___mcc_h100 = _source14.dtor_name;
-            DAST._IType _301___mcc_h101 = _source14.dtor_typ;
-            DAST._IExpression _302___mcc_h102 = _source14.dtor_value;
-            DAST._IExpression _303___mcc_h103 = _source14.dtor_iifeBody;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_Apply) {
-            DAST._IExpression _304___mcc_h108 = _source14.dtor_expr;
-            Dafny.ISequence<DAST._IExpression> _305___mcc_h109 = _source14.dtor_args;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source14.is_TypeTest) {
-            DAST._IExpression _306___mcc_h112 = _source14.dtor_on;
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _307___mcc_h113 = _source14.dtor_dType;
-            Dafny.ISequence<Dafny.Rune> _308___mcc_h114 = _source14.dtor_variant;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else {
-            DAST._IType _309___mcc_h118 = _source14.dtor_typ;
-            {
-              _255_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          }
-          Dafny.ISequence<Dafny.Rune> _310_receiver;
-          _310_receiver = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-          DAST._IOptional<Dafny.ISequence<Dafny.ISequence<Dafny.Rune>>> _source15 = _241_maybeOutVars;
-          if (_source15.is_Some) {
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _311___mcc_h120 = _source15.dtor_Some_a0;
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _312_outVars = _311___mcc_h120;
-            {
-              if ((new BigInteger((_312_outVars).Count)) > (BigInteger.One)) {
-                _310_receiver = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(");
-              }
-              BigInteger _313_outI;
-              _313_outI = BigInteger.Zero;
-              while ((_313_outI) < (new BigInteger((_312_outVars).Count))) {
-                if ((_313_outI).Sign == 1) {
-                  _310_receiver = Dafny.Sequence<Dafny.Rune>.Concat(_310_receiver, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-                }
-                Dafny.ISequence<Dafny.Rune> _314_outVar;
-                _314_outVar = (_312_outVars).Select(_313_outI);
-                _310_receiver = Dafny.Sequence<Dafny.Rune>.Concat(_310_receiver, (_314_outVar));
-                _313_outI = (_313_outI) + (BigInteger.One);
-              }
-              if ((new BigInteger((_312_outVars).Count)) > (BigInteger.One)) {
-                _310_receiver = Dafny.Sequence<Dafny.Rune>.Concat(_310_receiver, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-              }
-            }
-          } else {
-          }
-          generated = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(((!(_310_receiver).Equals(Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))) ? (Dafny.Sequence<Dafny.Rune>.Concat(_310_receiver, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = "))) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""))), _255_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), _244_name), _246_typeArgString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _249_argString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(");"));
-        }
-      } else if (_source12.is_Return) {
-        DAST._IExpression _315___mcc_h16 = _source12.dtor_expr;
-        DAST._IExpression _316_expr = _315___mcc_h16;
-        {
-          Dafny.ISequence<Dafny.Rune> _317_exprString;
-          bool _318___v18;
-          bool _319_recErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _320_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out82;
-          bool _out83;
-          bool _out84;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out85;
-          DCOMP.COMP.GenExpr(_316_expr, @params, true, out _out82, out _out83, out _out84, out _out85);
-          _317_exprString = _out82;
-          _318___v18 = _out83;
-          _319_recErased = _out84;
-          _320_recIdents = _out85;
-          _317_exprString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyUnerasable::<_>::unerase_owned("), _317_exprString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          readIdents = _320_recIdents;
-          if (isLast) {
-            generated = _317_exprString;
-          } else {
-            generated = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("return "), _317_exprString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";"));
-          }
-        }
-      } else if (_source12.is_EarlyReturn) {
-        {
-          generated = earlyReturn;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-        }
-      } else if (_source12.is_Halt) {
-        {
-          generated = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("panic!(\"Halt\");");
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-        }
-      } else {
-        DAST._IExpression _321___mcc_h17 = _source12.dtor_Print_a0;
-        DAST._IExpression _322_e = _321___mcc_h17;
-        {
-          Dafny.ISequence<Dafny.Rune> _323_printedExpr;
-          bool _324_isOwned;
-          bool _325___v19;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _326_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out86;
-          bool _out87;
-          bool _out88;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out89;
-          DCOMP.COMP.GenExpr(_322_e, @params, false, out _out86, out _out87, out _out88, out _out89);
-          _323_printedExpr = _out86;
-          _324_isOwned = _out87;
-          _325___v19 = _out88;
-          _326_recIdents = _out89;
-          generated = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("print!(\"{}\", ::dafny_runtime::DafnyPrintWrapper("), ((_324_isOwned) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")))), _323_printedExpr), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("));"));
-          readIdents = _326_recIdents;
-        }
-      }
-    }
-    public static void GenExpr(DAST._IExpression e, Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> @params, bool mustOwn, out Dafny.ISequence<Dafny.Rune> s, out bool isOwned, out bool isErased, out Dafny.ISet<Dafny.ISequence<Dafny.Rune>> readIdents) {
-      s = Dafny.Sequence<Dafny.Rune>.Empty;
-      isOwned = false;
-      isErased = false;
-      readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Empty;
-      DAST._IExpression _source16 = e;
-      if (_source16.is_Literal) {
-        DAST._ILiteral _327___mcc_h0 = _source16.dtor_Literal_a0;
-        DAST._ILiteral _source17 = _327___mcc_h0;
-        if (_source17.is_BoolLiteral) {
-          bool _328___mcc_h1 = _source17.dtor_BoolLiteral_a0;
-          if ((_328___mcc_h1) == (false)) {
-            {
-              s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("false");
-              isOwned = true;
-              isErased = true;
-              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-            }
-          } else {
-            {
-              s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("true");
-              isOwned = true;
-              isErased = true;
-              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-            }
-          }
-        } else if (_source17.is_IntLiteral) {
-          BigInteger _329___mcc_h2 = _source17.dtor_IntLiteral_a0;
-          BigInteger _330_i = _329___mcc_h2;
-          {
-            if ((_330_i).Sign == -1) {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("-"), DCOMP.__default.natToString((BigInteger.Zero) - (_330_i)));
-            } else {
-              s = DCOMP.__default.natToString(_330_i);
-            }
-            isOwned = true;
-            isErased = true;
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          }
-        } else if (_source17.is_DecLiteral) {
-          Dafny.ISequence<Dafny.Rune> _331___mcc_h3 = _source17.dtor_DecLiteral_a0;
-          Dafny.ISequence<Dafny.Rune> _332_l = _331___mcc_h3;
-          {
-            s = _332_l;
-            isOwned = true;
-            isErased = true;
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          }
-        } else if (_source17.is_StringLiteral) {
-          Dafny.ISequence<Dafny.Rune> _333___mcc_h4 = _source17.dtor_StringLiteral_a0;
-          Dafny.ISequence<Dafny.Rune> _334_l = _333___mcc_h4;
-          {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\""), _334_l), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\".chars().collect::<Vec<char>>()"));
-            isOwned = true;
-            isErased = true;
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          }
-        } else if (_source17.is_CharLiteral) {
-          Dafny.Rune _335___mcc_h5 = _source17.dtor_CharLiteral_a0;
-          Dafny.Rune _336_c = _335___mcc_h5;
-          {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::primitive::char::from_u32("), DCOMP.__default.natToString(new BigInteger((_336_c).Value))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(").unwrap()"));
-            isOwned = true;
-            isErased = true;
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          }
-        } else {
-          {
-            s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("None");
-            isOwned = true;
-            isErased = true;
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          }
-        }
-      } else if (_source16.is_Ident) {
-        Dafny.ISequence<Dafny.Rune> _337___mcc_h6 = _source16.dtor_Ident_a0;
-        Dafny.ISequence<Dafny.Rune> _338_name = _337___mcc_h6;
-        {
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#"), _338_name);
-          if (!((@params).Contains(_338_name))) {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(&"), s), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          }
-          if (mustOwn) {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".clone()"));
-            isOwned = true;
-          } else {
-            isOwned = false;
-          }
-          isErased = false;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_338_name);
-        }
-      } else if (_source16.is_Companion) {
-        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _339___mcc_h7 = _source16.dtor_Companion_a0;
-        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _340_path = _339___mcc_h7;
-        {
-          Dafny.ISequence<Dafny.Rune> _out90;
-          _out90 = DCOMP.COMP.GenPath(_340_path);
-          s = _out90;
-          isOwned = true;
-          isErased = true;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-        }
-      } else if (_source16.is_Tuple) {
-        Dafny.ISequence<DAST._IExpression> _341___mcc_h8 = _source16.dtor_Tuple_a0;
-        Dafny.ISequence<DAST._IExpression> _342_values = _341___mcc_h8;
-        {
-          s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(");
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          BigInteger _343_i;
-          _343_i = BigInteger.Zero;
-          bool _344_allErased;
-          _344_allErased = true;
-          while ((_343_i) < (new BigInteger((_342_values).Count))) {
-            Dafny.ISequence<Dafny.Rune> _345___v20;
-            bool _346___v21;
-            bool _347_isErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _348___v22;
-            Dafny.ISequence<Dafny.Rune> _out91;
-            bool _out92;
-            bool _out93;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out94;
-            DCOMP.COMP.GenExpr((_342_values).Select(_343_i), @params, true, out _out91, out _out92, out _out93, out _out94);
-            _345___v20 = _out91;
-            _346___v21 = _out92;
-            _347_isErased = _out93;
-            _348___v22 = _out94;
-            _344_allErased = (_344_allErased) && (_347_isErased);
-            _343_i = (_343_i) + (BigInteger.One);
-          }
-          _343_i = BigInteger.Zero;
-          while ((_343_i) < (new BigInteger((_342_values).Count))) {
-            if ((_343_i).Sign == 1) {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" "));
-            }
-            Dafny.ISequence<Dafny.Rune> _349_recursiveGen;
-            bool _350___v23;
-            bool _351_isErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _352_recIdents;
-            Dafny.ISequence<Dafny.Rune> _out95;
-            bool _out96;
-            bool _out97;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out98;
-            DCOMP.COMP.GenExpr((_342_values).Select(_343_i), @params, true, out _out95, out _out96, out _out97, out _out98);
-            _349_recursiveGen = _out95;
-            _350___v23 = _out96;
-            _351_isErased = _out97;
-            _352_recIdents = _out98;
-            if ((_351_isErased) && (!(_344_allErased))) {
-              _349_recursiveGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyUnerasable::<_>::unerase_owned("), _349_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, _349_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(","));
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _352_recIdents);
-            _343_i = (_343_i) + (BigInteger.One);
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          isOwned = true;
-          isErased = _344_allErased;
-        }
-      } else if (_source16.is_New) {
-        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _353___mcc_h9 = _source16.dtor_path;
-        Dafny.ISequence<DAST._IExpression> _354___mcc_h10 = _source16.dtor_args;
-        Dafny.ISequence<DAST._IExpression> _355_args = _354___mcc_h10;
-        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _356_path = _353___mcc_h9;
-        {
-          Dafny.ISequence<Dafny.Rune> _357_path;
-          Dafny.ISequence<Dafny.Rune> _out99;
-          _out99 = DCOMP.COMP.GenPath(_356_path);
-          _357_path = _out99;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::rc::Rc::new("), _357_path), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::new("));
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          BigInteger _358_i;
-          _358_i = BigInteger.Zero;
-          while ((_358_i) < (new BigInteger((_355_args).Count))) {
-            if ((_358_i).Sign == 1) {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-            }
-            Dafny.ISequence<Dafny.Rune> _359_recursiveGen;
-            bool _360___v24;
-            bool _361_isErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _362_recIdents;
-            Dafny.ISequence<Dafny.Rune> _out100;
-            bool _out101;
-            bool _out102;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out103;
-            DCOMP.COMP.GenExpr((_355_args).Select(_358_i), @params, true, out _out100, out _out101, out _out102, out _out103);
-            _359_recursiveGen = _out100;
-            _360___v24 = _out101;
-            _361_isErased = _out102;
-            _362_recIdents = _out103;
-            if (_361_isErased) {
-              _359_recursiveGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyUnerasable::<_>::unerase_owned("), _359_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-            s = Dafny.Sequence<Dafny.Rune>.Concat(s, _359_recursiveGen);
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _362_recIdents);
-            _358_i = (_358_i) + (BigInteger.One);
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("))"));
-          isOwned = true;
-          isErased = true;
-        }
-      } else if (_source16.is_NewArray) {
-        Dafny.ISequence<DAST._IExpression> _363___mcc_h11 = _source16.dtor_dims;
-        Dafny.ISequence<DAST._IExpression> _364_dims = _363___mcc_h11;
-        {
-          BigInteger _365_i;
-          _365_i = (new BigInteger((_364_dims).Count)) - (BigInteger.One);
-          s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::default::Default::default()");
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          while ((_365_i).Sign != -1) {
-            Dafny.ISequence<Dafny.Rune> _366_recursiveGen;
-            bool _367___v25;
-            bool _368_isErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _369_recIdents;
-            Dafny.ISequence<Dafny.Rune> _out104;
-            bool _out105;
-            bool _out106;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out107;
-            DCOMP.COMP.GenExpr((_364_dims).Select(_365_i), @params, true, out _out104, out _out105, out _out106, out _out107);
-            _366_recursiveGen = _out104;
-            _367___v25 = _out105;
-            _368_isErased = _out106;
-            _369_recIdents = _out107;
-            if (!(_368_isErased)) {
-              _366_recursiveGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _366_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("vec!["), s), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("; (")), _366_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(") as usize]"));
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _369_recIdents);
-            _365_i = (_365_i) - (BigInteger.One);
-          }
-          isOwned = true;
-          isErased = true;
-        }
-      } else if (_source16.is_DatatypeValue) {
-        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _370___mcc_h12 = _source16.dtor_path;
-        Dafny.ISequence<Dafny.Rune> _371___mcc_h13 = _source16.dtor_variant;
-        bool _372___mcc_h14 = _source16.dtor_isCo;
-        Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> _373___mcc_h15 = _source16.dtor_contents;
-        Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> _374_values = _373___mcc_h15;
-        bool _375_isCo = _372___mcc_h14;
-        Dafny.ISequence<Dafny.Rune> _376_variant = _371___mcc_h13;
-        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _377_path = _370___mcc_h12;
-        {
-          Dafny.ISequence<Dafny.Rune> _378_path;
-          Dafny.ISequence<Dafny.Rune> _out108;
-          _out108 = DCOMP.COMP.GenPath(_377_path);
-          _378_path = _out108;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::rc::Rc::new("), _378_path), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::r#")), _376_variant);
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          BigInteger _379_i;
-          _379_i = BigInteger.Zero;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {"));
-          while ((_379_i) < (new BigInteger((_374_values).Count))) {
-            _System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression> _let_tmp_rhs0 = (_374_values).Select(_379_i);
-            Dafny.ISequence<Dafny.Rune> _380_name = _let_tmp_rhs0.dtor__0;
-            DAST._IExpression _381_value = _let_tmp_rhs0.dtor__1;
-            if ((_379_i).Sign == 1) {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-            }
-            if (_375_isCo) {
-              Dafny.ISequence<Dafny.Rune> _382_recursiveGen;
-              bool _383___v26;
-              bool _384_isErased;
-              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _385_recIdents;
-              Dafny.ISequence<Dafny.Rune> _out109;
-              bool _out110;
-              bool _out111;
-              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out112;
-              DCOMP.COMP.GenExpr(_381_value, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(), true, out _out109, out _out110, out _out111, out _out112);
-              _382_recursiveGen = _out109;
-              _383___v26 = _out110;
-              _384_isErased = _out111;
-              _385_recIdents = _out112;
-              if (!(_384_isErased)) {
-                _382_recursiveGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _382_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-              }
-              _382_recursiveGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyUnerasable::<_>::unerase_owned("), _382_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _385_recIdents);
-              Dafny.ISequence<Dafny.Rune> _386_allReadCloned;
-              _386_allReadCloned = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-              while (!(_385_recIdents).Equals(Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements())) {
-                Dafny.ISequence<Dafny.Rune> _387_next;
-                foreach (Dafny.ISequence<Dafny.Rune> _assign_such_that_0 in (_385_recIdents).Elements) {
-                  _387_next = (Dafny.ISequence<Dafny.Rune>)_assign_such_that_0;
-                  if ((_385_recIdents).Contains(_387_next)) {
-                    goto after__ASSIGN_SUCH_THAT_0;
-                  }
-                }
-                throw new System.Exception("assign-such-that search produced no value (line 985)");
-              after__ASSIGN_SUCH_THAT_0:;
-                _386_allReadCloned = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_386_allReadCloned, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("let r#")), _387_next), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = r#")), _387_next), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".clone();\n"));
-                _385_recIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(_385_recIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_387_next));
-              }
-              s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), _380_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ::dafny_runtime::LazyFieldWrapper(::dafny_runtime::Lazy::new(::std::boxed::Box::new({\n")), _386_allReadCloned), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("move || (")), _382_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")})))"));
-            } else {
-              Dafny.ISequence<Dafny.Rune> _388_recursiveGen;
-              bool _389___v27;
-              bool _390_isErased;
-              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _391_recIdents;
-              Dafny.ISequence<Dafny.Rune> _out113;
-              bool _out114;
-              bool _out115;
-              Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out116;
-              DCOMP.COMP.GenExpr(_381_value, @params, true, out _out113, out _out114, out _out115, out _out116);
-              _388_recursiveGen = _out113;
-              _389___v27 = _out114;
-              _390_isErased = _out115;
-              _391_recIdents = _out116;
-              if (!(_390_isErased)) {
-                _388_recursiveGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _388_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-              }
-              _388_recursiveGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyUnerasable::<_>::unerase_owned("), _388_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-              s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), _380_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _388_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _391_recIdents);
-            }
-            _379_i = (_379_i) + (BigInteger.One);
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" })"));
-          isOwned = true;
-          isErased = true;
-        }
-      } else if (_source16.is_SubsetUpgrade) {
-        DAST._IExpression _392___mcc_h16 = _source16.dtor_value;
-        DAST._IType _393___mcc_h17 = _source16.dtor_typ;
-        DAST._IType _394_tpe = _393___mcc_h17;
-        DAST._IExpression _395_expr = _392___mcc_h16;
-        {
-          Dafny.ISequence<Dafny.Rune> _396_tpeGen;
-          Dafny.ISequence<Dafny.Rune> _out117;
-          _out117 = DCOMP.COMP.GenType(_394_tpe, true, false);
-          _396_tpeGen = _out117;
-          Dafny.ISequence<Dafny.Rune> _397_recursiveGen;
-          bool _398_recOwned;
-          bool _399_recErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _400_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out118;
-          bool _out119;
-          bool _out120;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out121;
-          DCOMP.COMP.GenExpr(_395_expr, @params, false, out _out118, out _out119, out _out120, out _out121);
-          _397_recursiveGen = _out118;
-          _398_recOwned = _out119;
-          _399_recErased = _out120;
-          _400_recIdents = _out121;
-          Dafny.ISequence<Dafny.Rune> _401_uneraseFn;
-          _401_uneraseFn = ((_398_recOwned) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unerase_owned")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unerase")));
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), _396_tpeGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" as ::dafny_runtime::DafnyUnerasable<_>>::")), _401_uneraseFn), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _397_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          isOwned = _398_recOwned;
-          isErased = false;
-          readIdents = _400_recIdents;
-        }
-      } else if (_source16.is_SubsetDowngrade) {
-        DAST._IExpression _402___mcc_h18 = _source16.dtor_value;
-        DAST._IExpression _403_expr = _402___mcc_h18;
-        {
-          Dafny.ISequence<Dafny.Rune> _404_recursiveGen;
-          bool _405_recOwned;
-          bool _406_recErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _407_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out122;
-          bool _out123;
-          bool _out124;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out125;
-          DCOMP.COMP.GenExpr(_403_expr, @params, false, out _out122, out _out123, out _out124, out _out125);
-          _404_recursiveGen = _out122;
-          _405_recOwned = _out123;
-          _406_recErased = _out124;
-          _407_recIdents = _out125;
-          Dafny.ISequence<Dafny.Rune> _408_eraseFn;
-          _408_eraseFn = ((_405_recOwned) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("erase_owned")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("erase")));
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::"), _408_eraseFn), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _404_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          isOwned = _405_recOwned;
-          isErased = true;
-          readIdents = _407_recIdents;
-        }
-      } else if (_source16.is_SeqValue) {
-        Dafny.ISequence<DAST._IExpression> _409___mcc_h19 = _source16.dtor_elements;
-        Dafny.ISequence<DAST._IExpression> _410_exprs = _409___mcc_h19;
-        {
-          Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, bool>> _411_generatedValues;
-          _411_generatedValues = Dafny.Sequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, bool>>.FromElements();
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          BigInteger _412_i;
-          _412_i = BigInteger.Zero;
-          bool _413_allErased;
-          _413_allErased = true;
-          while ((_412_i) < (new BigInteger((_410_exprs).Count))) {
-            Dafny.ISequence<Dafny.Rune> _414_recursiveGen;
-            bool _415___v28;
-            bool _416_isErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _417_recIdents;
-            Dafny.ISequence<Dafny.Rune> _out126;
-            bool _out127;
-            bool _out128;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out129;
-            DCOMP.COMP.GenExpr((_410_exprs).Select(_412_i), @params, true, out _out126, out _out127, out _out128, out _out129);
-            _414_recursiveGen = _out126;
-            _415___v28 = _out127;
-            _416_isErased = _out128;
-            _417_recIdents = _out129;
-            _413_allErased = (_413_allErased) && (_416_isErased);
-            _411_generatedValues = Dafny.Sequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, bool>>.Concat(_411_generatedValues, Dafny.Sequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, bool>>.FromElements(_System.Tuple2<Dafny.ISequence<Dafny.Rune>, bool>.create(_414_recursiveGen, _416_isErased)));
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _417_recIdents);
-            _412_i = (_412_i) + (BigInteger.One);
-          }
-          s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("vec![");
-          _412_i = BigInteger.Zero;
-          while ((_412_i) < (new BigInteger((_411_generatedValues).Count))) {
-            if ((_412_i).Sign == 1) {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-            }
-            Dafny.ISequence<Dafny.Rune> _418_gen;
-            _418_gen = ((_411_generatedValues).Select(_412_i)).dtor__0;
-            if ((((_411_generatedValues).Select(_412_i)).dtor__1) && (!(_413_allErased))) {
-              _418_gen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyUnerasable::<_>::unerase_owned("), _418_gen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-            s = Dafny.Sequence<Dafny.Rune>.Concat(s, _418_gen);
-            _412_i = (_412_i) + (BigInteger.One);
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("]"));
-          isOwned = true;
-          isErased = _413_allErased;
-        }
-      } else if (_source16.is_SetValue) {
-        Dafny.ISequence<DAST._IExpression> _419___mcc_h20 = _source16.dtor_elements;
-        Dafny.ISequence<DAST._IExpression> _420_exprs = _419___mcc_h20;
-        {
-          Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, bool>> _421_generatedValues;
-          _421_generatedValues = Dafny.Sequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, bool>>.FromElements();
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          BigInteger _422_i;
-          _422_i = BigInteger.Zero;
-          bool _423_allErased;
-          _423_allErased = true;
-          while ((_422_i) < (new BigInteger((_420_exprs).Count))) {
-            Dafny.ISequence<Dafny.Rune> _424_recursiveGen;
-            bool _425___v29;
-            bool _426_isErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _427_recIdents;
-            Dafny.ISequence<Dafny.Rune> _out130;
-            bool _out131;
-            bool _out132;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out133;
-            DCOMP.COMP.GenExpr((_420_exprs).Select(_422_i), @params, true, out _out130, out _out131, out _out132, out _out133);
-            _424_recursiveGen = _out130;
-            _425___v29 = _out131;
-            _426_isErased = _out132;
-            _427_recIdents = _out133;
-            _423_allErased = (_423_allErased) && (_426_isErased);
-            _421_generatedValues = Dafny.Sequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, bool>>.Concat(_421_generatedValues, Dafny.Sequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, bool>>.FromElements(_System.Tuple2<Dafny.ISequence<Dafny.Rune>, bool>.create(_424_recursiveGen, _426_isErased)));
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _427_recIdents);
-            _422_i = (_422_i) + (BigInteger.One);
-          }
-          s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("vec![");
-          _422_i = BigInteger.Zero;
-          while ((_422_i) < (new BigInteger((_421_generatedValues).Count))) {
-            if ((_422_i).Sign == 1) {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-            }
-            Dafny.ISequence<Dafny.Rune> _428_gen;
-            _428_gen = ((_421_generatedValues).Select(_422_i)).dtor__0;
-            if ((((_421_generatedValues).Select(_422_i)).dtor__1) && (!(_423_allErased))) {
-              _428_gen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyUnerasable::<_>::unerase_owned("), _428_gen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-            s = Dafny.Sequence<Dafny.Rune>.Concat(s, _428_gen);
-            _422_i = (_422_i) + (BigInteger.One);
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("].into_iter().collect::<std::collections::HashSet<_>>()"));
-          isOwned = true;
-          isErased = true;
-        }
-      } else if (_source16.is_This) {
-        {
-          if (mustOwn) {
-            s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self.clone()");
-            isOwned = true;
-          } else {
-            s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self");
-            isOwned = false;
-          }
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("self"));
-          isErased = false;
-        }
-      } else if (_source16.is_Ite) {
-        DAST._IExpression _429___mcc_h21 = _source16.dtor_cond;
-        DAST._IExpression _430___mcc_h22 = _source16.dtor_thn;
-        DAST._IExpression _431___mcc_h23 = _source16.dtor_els;
-        DAST._IExpression _432_f = _431___mcc_h23;
-        DAST._IExpression _433_t = _430___mcc_h22;
-        DAST._IExpression _434_cond = _429___mcc_h21;
-        {
-          Dafny.ISequence<Dafny.Rune> _435_condString;
-          bool _436___v30;
-          bool _437_condErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _438_recIdentsCond;
-          Dafny.ISequence<Dafny.Rune> _out134;
-          bool _out135;
-          bool _out136;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out137;
-          DCOMP.COMP.GenExpr(_434_cond, @params, true, out _out134, out _out135, out _out136, out _out137);
-          _435_condString = _out134;
-          _436___v30 = _out135;
-          _437_condErased = _out136;
-          _438_recIdentsCond = _out137;
-          if (!(_437_condErased)) {
-            _435_condString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _435_condString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          }
-          Dafny.ISequence<Dafny.Rune> _439___v31;
-          bool _440_tHasToBeOwned;
-          bool _441___v32;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _442___v33;
-          Dafny.ISequence<Dafny.Rune> _out138;
-          bool _out139;
-          bool _out140;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out141;
-          DCOMP.COMP.GenExpr(_433_t, @params, mustOwn, out _out138, out _out139, out _out140, out _out141);
-          _439___v31 = _out138;
-          _440_tHasToBeOwned = _out139;
-          _441___v32 = _out140;
-          _442___v33 = _out141;
-          Dafny.ISequence<Dafny.Rune> _443_fString;
-          bool _444_fOwned;
-          bool _445_fErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _446_recIdentsF;
-          Dafny.ISequence<Dafny.Rune> _out142;
-          bool _out143;
-          bool _out144;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out145;
-          DCOMP.COMP.GenExpr(_432_f, @params, _440_tHasToBeOwned, out _out142, out _out143, out _out144, out _out145);
-          _443_fString = _out142;
-          _444_fOwned = _out143;
-          _445_fErased = _out144;
-          _446_recIdentsF = _out145;
-          Dafny.ISequence<Dafny.Rune> _447_tString;
-          bool _448___v34;
-          bool _449_tErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _450_recIdentsT;
-          Dafny.ISequence<Dafny.Rune> _out146;
-          bool _out147;
-          bool _out148;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out149;
-          DCOMP.COMP.GenExpr(_433_t, @params, _444_fOwned, out _out146, out _out147, out _out148, out _out149);
-          _447_tString = _out146;
-          _448___v34 = _out147;
-          _449_tErased = _out148;
-          _450_recIdentsT = _out149;
-          if ((!(_445_fErased)) || (!(_449_tErased))) {
-            if (_445_fErased) {
-              _443_fString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _443_fString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-            if (_449_tErased) {
-              _447_tString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _447_tString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(if "), _435_condString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), _447_tString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n} else {\n")), _443_fString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n})"));
-          isOwned = _444_fOwned;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_438_recIdentsCond, _450_recIdentsT), _446_recIdentsF);
-          isErased = (_445_fErased) || (_449_tErased);
-        }
-      } else if (_source16.is_UnOp) {
-        DAST._IUnaryOp _451___mcc_h24 = _source16.dtor_unOp;
-        DAST._IExpression _452___mcc_h25 = _source16.dtor_expr;
-        DAST._IUnaryOp _source18 = _451___mcc_h24;
-        if (_source18.is_Not) {
-          DAST._IExpression _453_e = _452___mcc_h25;
-          {
-            Dafny.ISequence<Dafny.Rune> _454_recursiveGen;
-            bool _455___v35;
-            bool _456_recErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _457_recIdents;
-            Dafny.ISequence<Dafny.Rune> _out150;
-            bool _out151;
-            bool _out152;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out153;
-            DCOMP.COMP.GenExpr(_453_e, @params, true, out _out150, out _out151, out _out152, out _out153);
-            _454_recursiveGen = _out150;
-            _455___v35 = _out151;
-            _456_recErased = _out152;
-            _457_recIdents = _out153;
-            if (!(_456_recErased)) {
-              _454_recursiveGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _454_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("!("), _454_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            isOwned = true;
-            readIdents = _457_recIdents;
-            isErased = true;
-          }
-        } else if (_source18.is_BitwiseNot) {
-          DAST._IExpression _458_e = _452___mcc_h25;
-          {
-            Dafny.ISequence<Dafny.Rune> _459_recursiveGen;
-            bool _460___v36;
-            bool _461_recErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _462_recIdents;
-            Dafny.ISequence<Dafny.Rune> _out154;
-            bool _out155;
-            bool _out156;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out157;
-            DCOMP.COMP.GenExpr(_458_e, @params, true, out _out154, out _out155, out _out156, out _out157);
-            _459_recursiveGen = _out154;
-            _460___v36 = _out155;
-            _461_recErased = _out156;
-            _462_recIdents = _out157;
-            if (!(_461_recErased)) {
-              _459_recursiveGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _459_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("~("), _459_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            isOwned = true;
-            readIdents = _462_recIdents;
-            isErased = true;
-          }
-        } else {
-          DAST._IExpression _463_e = _452___mcc_h25;
-          {
-            Dafny.ISequence<Dafny.Rune> _464_recursiveGen;
-            bool _465___v37;
-            bool _466_recErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _467_recIdents;
-            Dafny.ISequence<Dafny.Rune> _out158;
-            bool _out159;
-            bool _out160;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out161;
-            DCOMP.COMP.GenExpr(_463_e, @params, false, out _out158, out _out159, out _out160, out _out161);
-            _464_recursiveGen = _out158;
-            _465___v37 = _out159;
-            _466_recErased = _out160;
-            _467_recIdents = _out161;
-            if (!(_466_recErased)) {
-              _464_recursiveGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _464_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-            }
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _464_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(").len()"));
-            isOwned = true;
-            readIdents = _467_recIdents;
-            isErased = true;
-          }
-        }
-      } else if (_source16.is_BinOp) {
-        Dafny.ISequence<Dafny.Rune> _468___mcc_h26 = _source16.dtor_op;
-        DAST._IExpression _469___mcc_h27 = _source16.dtor_left;
-        DAST._IExpression _470___mcc_h28 = _source16.dtor_right;
-        DAST._IExpression _471_r = _470___mcc_h28;
-        DAST._IExpression _472_l = _469___mcc_h27;
-        Dafny.ISequence<Dafny.Rune> _473_op = _468___mcc_h26;
-        {
-          Dafny.ISequence<Dafny.Rune> _474_left;
-          bool _475___v38;
-          bool _476_leftErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _477_recIdentsL;
-          Dafny.ISequence<Dafny.Rune> _out162;
-          bool _out163;
-          bool _out164;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out165;
-          DCOMP.COMP.GenExpr(_472_l, @params, true, out _out162, out _out163, out _out164, out _out165);
-          _474_left = _out162;
-          _475___v38 = _out163;
-          _476_leftErased = _out164;
-          _477_recIdentsL = _out165;
-          Dafny.ISequence<Dafny.Rune> _478_right;
-          bool _479___v39;
-          bool _480_rightErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _481_recIdentsR;
-          Dafny.ISequence<Dafny.Rune> _out166;
-          bool _out167;
-          bool _out168;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out169;
-          DCOMP.COMP.GenExpr(_471_r, @params, true, out _out166, out _out167, out _out168, out _out169);
-          _478_right = _out166;
-          _479___v39 = _out167;
-          _480_rightErased = _out168;
-          _481_recIdentsR = _out169;
-          if (!(_476_leftErased)) {
-            _474_left = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _474_left), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          }
-          if (!(_480_rightErased)) {
-            _478_right = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::erase_owned("), _478_right), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _474_left), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ")), _473_op), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" ")), _478_right), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          isOwned = true;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(_477_recIdentsL, _481_recIdentsR);
-          isErased = true;
-        }
-      } else if (_source16.is_Select) {
-        DAST._IExpression _482___mcc_h29 = _source16.dtor_expr;
-        Dafny.ISequence<Dafny.Rune> _483___mcc_h30 = _source16.dtor_field;
-        bool _484___mcc_h31 = _source16.dtor_onDatatype;
-        bool _485_isDatatype = _484___mcc_h31;
-        Dafny.ISequence<Dafny.Rune> _486_field = _483___mcc_h30;
-        DAST._IExpression _487_on = _482___mcc_h29;
-        {
-          Dafny.ISequence<Dafny.Rune> _488_onString;
-          bool _489_onOwned;
-          bool _490_onErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _491_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out170;
-          bool _out171;
-          bool _out172;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out173;
-          DCOMP.COMP.GenExpr(_487_on, @params, false, out _out170, out _out171, out _out172, out _out173);
-          _488_onString = _out170;
-          _489_onOwned = _out171;
-          _490_onErased = _out172;
-          _491_recIdents = _out173;
-          if (!(_490_onErased)) {
-            Dafny.ISequence<Dafny.Rune> _492_eraseFn;
-            _492_eraseFn = ((_489_onOwned) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("erase_owned")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("erase")));
-            _488_onString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyErasable::"), _492_eraseFn), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _488_onString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          }
-          if (_485_isDatatype) {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _488_onString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".r#")), _486_field), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("()"));
-            if (mustOwn) {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), s), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(").clone()"));
-              isOwned = true;
-            } else {
-              isOwned = false;
-            }
-          } else {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _488_onString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".r#")), _486_field);
-            if (mustOwn) {
-              s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), s), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(").clone()"));
-              isOwned = true;
-            } else {
-              isOwned = false;
-            }
-          }
-          isErased = false;
-          readIdents = _491_recIdents;
-        }
-      } else if (_source16.is_SelectFn) {
-        DAST._IExpression _493___mcc_h32 = _source16.dtor_expr;
-        Dafny.ISequence<Dafny.Rune> _494___mcc_h33 = _source16.dtor_field;
-        bool _495___mcc_h34 = _source16.dtor_onDatatype;
-        bool _496___mcc_h35 = _source16.dtor_isStatic;
-        BigInteger _497___mcc_h36 = _source16.dtor_arity;
-        BigInteger _498_arity = _497___mcc_h36;
-        bool _499_isStatic = _496___mcc_h35;
-        bool _500_isDatatype = _495___mcc_h34;
-        Dafny.ISequence<Dafny.Rune> _501_field = _494___mcc_h33;
-        DAST._IExpression _502_on = _493___mcc_h32;
-        {
-          Dafny.ISequence<Dafny.Rune> _503_onString;
-          bool _504_onOwned;
-          bool _505___v40;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _506_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out174;
-          bool _out175;
-          bool _out176;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out177;
-          DCOMP.COMP.GenExpr(_502_on, @params, false, out _out174, out _out175, out _out176, out _out177);
-          _503_onString = _out174;
-          _504_onOwned = _out175;
-          _505___v40 = _out176;
-          _506_recIdents = _out177;
-          if (_499_isStatic) {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_503_onString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::")), _501_field);
-          } else {
-            s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{\n");
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("let callTarget = (")), _503_onString), ((_504_onOwned) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString(").clone()")))), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";\n"));
-            Dafny.ISequence<Dafny.Rune> _507_args;
-            _507_args = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-            BigInteger _508_i;
-            _508_i = BigInteger.Zero;
-            while ((_508_i) < (_498_arity)) {
-              if ((_508_i).Sign == 1) {
-                _507_args = Dafny.Sequence<Dafny.Rune>.Concat(_507_args, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-              }
-              _507_args = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_507_args, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("arg")), DCOMP.__default.natToString(_508_i));
-              _508_i = (_508_i) + (BigInteger.One);
-            }
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("move |")), _507_args), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("| {\n"));
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("callTarget.")), _501_field), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _507_args), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")\n"));
-            s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}\n"));
-            s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("}"));
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::FunctionWrapper("), s), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          isOwned = true;
-          isErased = true;
-          readIdents = _506_recIdents;
-        }
-      } else if (_source16.is_TupleSelect) {
-        DAST._IExpression _509___mcc_h37 = _source16.dtor_expr;
-        BigInteger _510___mcc_h38 = _source16.dtor_index;
-        BigInteger _511_idx = _510___mcc_h38;
-        DAST._IExpression _512_on = _509___mcc_h37;
-        {
-          Dafny.ISequence<Dafny.Rune> _513_onString;
-          bool _514___v41;
-          bool _515_tupErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _516_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out178;
-          bool _out179;
-          bool _out180;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out181;
-          DCOMP.COMP.GenExpr(_512_on, @params, false, out _out178, out _out179, out _out180, out _out181);
-          _513_onString = _out178;
-          _514___v41 = _out179;
-          _515_tupErased = _out180;
-          _516_recIdents = _out181;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _513_onString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(").")), DCOMP.__default.natToString(_511_idx));
-          if (mustOwn) {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), s), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".clone()"));
-            isOwned = true;
-          } else {
-            s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), s);
-            isOwned = false;
-          }
-          isErased = _515_tupErased;
-          readIdents = _516_recIdents;
-        }
-      } else if (_source16.is_Call) {
-        DAST._IExpression _517___mcc_h39 = _source16.dtor_on;
-        Dafny.ISequence<Dafny.Rune> _518___mcc_h40 = _source16.dtor_name;
-        Dafny.ISequence<DAST._IType> _519___mcc_h41 = _source16.dtor_typeArgs;
-        Dafny.ISequence<DAST._IExpression> _520___mcc_h42 = _source16.dtor_args;
-        Dafny.ISequence<DAST._IExpression> _521_args = _520___mcc_h42;
-        Dafny.ISequence<DAST._IType> _522_typeArgs = _519___mcc_h41;
-        Dafny.ISequence<Dafny.Rune> _523_name = _518___mcc_h40;
-        DAST._IExpression _524_on = _517___mcc_h39;
-        {
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          Dafny.ISequence<Dafny.Rune> _525_typeArgString;
-          _525_typeArgString = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-          if ((new BigInteger((_522_typeArgs).Count)) >= (BigInteger.One)) {
-            BigInteger _526_typeI;
-            _526_typeI = BigInteger.Zero;
-            _525_typeArgString = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::<");
-            while ((_526_typeI) < (new BigInteger((_522_typeArgs).Count))) {
-              if ((_526_typeI).Sign == 1) {
-                _525_typeArgString = Dafny.Sequence<Dafny.Rune>.Concat(_525_typeArgString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-              }
-              Dafny.ISequence<Dafny.Rune> _527_typeString;
-              Dafny.ISequence<Dafny.Rune> _out182;
-              _out182 = DCOMP.COMP.GenType((_522_typeArgs).Select(_526_typeI), false, false);
-              _527_typeString = _out182;
-              _525_typeArgString = Dafny.Sequence<Dafny.Rune>.Concat(_525_typeArgString, _527_typeString);
-              _526_typeI = (_526_typeI) + (BigInteger.One);
-            }
-            _525_typeArgString = Dafny.Sequence<Dafny.Rune>.Concat(_525_typeArgString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(">"));
-          }
-          Dafny.ISequence<Dafny.Rune> _528_argString;
-          _528_argString = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-          BigInteger _529_i;
-          _529_i = BigInteger.Zero;
-          while ((_529_i) < (new BigInteger((_521_args).Count))) {
-            if ((_529_i).Sign == 1) {
-              _528_argString = Dafny.Sequence<Dafny.Rune>.Concat(_528_argString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-            }
-            Dafny.ISequence<Dafny.Rune> _530_argExpr;
-            bool _531_isOwned;
-            bool _532_argErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _533_argIdents;
-            Dafny.ISequence<Dafny.Rune> _out183;
-            bool _out184;
-            bool _out185;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out186;
-            DCOMP.COMP.GenExpr((_521_args).Select(_529_i), @params, false, out _out183, out _out184, out _out185, out _out186);
-            _530_argExpr = _out183;
-            _531_isOwned = _out184;
-            _532_argErased = _out185;
-            _533_argIdents = _out186;
-            if (_531_isOwned) {
-              _530_argExpr = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), _530_argExpr);
-            }
-            _528_argString = Dafny.Sequence<Dafny.Rune>.Concat(_528_argString, _530_argExpr);
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _533_argIdents);
-            _529_i = (_529_i) + (BigInteger.One);
-          }
-          Dafny.ISequence<Dafny.Rune> _534_enclosingString;
-          bool _535___v42;
-          bool _536___v43;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _537_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out187;
-          bool _out188;
-          bool _out189;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out190;
-          DCOMP.COMP.GenExpr(_524_on, @params, false, out _out187, out _out188, out _out189, out _out190);
-          _534_enclosingString = _out187;
-          _535___v42 = _out188;
-          _536___v43 = _out189;
-          _537_recIdents = _out190;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _537_recIdents);
-          DAST._IExpression _source19 = _524_on;
-          if (_source19.is_Literal) {
-            DAST._ILiteral _538___mcc_h56 = _source19.dtor_Literal_a0;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_Ident) {
-            Dafny.ISequence<Dafny.Rune> _539___mcc_h58 = _source19.dtor_Ident_a0;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_Companion) {
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _540___mcc_h60 = _source19.dtor_Companion_a0;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(_534_enclosingString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::"));
-            }
-          } else if (_source19.is_Tuple) {
-            Dafny.ISequence<DAST._IExpression> _541___mcc_h62 = _source19.dtor_Tuple_a0;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_New) {
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _542___mcc_h64 = _source19.dtor_path;
-            Dafny.ISequence<DAST._IExpression> _543___mcc_h65 = _source19.dtor_args;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_NewArray) {
-            Dafny.ISequence<DAST._IExpression> _544___mcc_h68 = _source19.dtor_dims;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_DatatypeValue) {
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _545___mcc_h70 = _source19.dtor_path;
-            Dafny.ISequence<Dafny.Rune> _546___mcc_h71 = _source19.dtor_variant;
-            bool _547___mcc_h72 = _source19.dtor_isCo;
-            Dafny.ISequence<_System._ITuple2<Dafny.ISequence<Dafny.Rune>, DAST._IExpression>> _548___mcc_h73 = _source19.dtor_contents;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_SubsetUpgrade) {
-            DAST._IExpression _549___mcc_h78 = _source19.dtor_value;
-            DAST._IType _550___mcc_h79 = _source19.dtor_typ;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_SubsetDowngrade) {
-            DAST._IExpression _551___mcc_h82 = _source19.dtor_value;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_SeqValue) {
-            Dafny.ISequence<DAST._IExpression> _552___mcc_h84 = _source19.dtor_elements;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_SetValue) {
-            Dafny.ISequence<DAST._IExpression> _553___mcc_h86 = _source19.dtor_elements;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_This) {
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_Ite) {
-            DAST._IExpression _554___mcc_h88 = _source19.dtor_cond;
-            DAST._IExpression _555___mcc_h89 = _source19.dtor_thn;
-            DAST._IExpression _556___mcc_h90 = _source19.dtor_els;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_UnOp) {
-            DAST._IUnaryOp _557___mcc_h94 = _source19.dtor_unOp;
-            DAST._IExpression _558___mcc_h95 = _source19.dtor_expr;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_BinOp) {
-            Dafny.ISequence<Dafny.Rune> _559___mcc_h98 = _source19.dtor_op;
-            DAST._IExpression _560___mcc_h99 = _source19.dtor_left;
-            DAST._IExpression _561___mcc_h100 = _source19.dtor_right;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_Select) {
-            DAST._IExpression _562___mcc_h104 = _source19.dtor_expr;
-            Dafny.ISequence<Dafny.Rune> _563___mcc_h105 = _source19.dtor_field;
-            bool _564___mcc_h106 = _source19.dtor_onDatatype;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_SelectFn) {
-            DAST._IExpression _565___mcc_h110 = _source19.dtor_expr;
-            Dafny.ISequence<Dafny.Rune> _566___mcc_h111 = _source19.dtor_field;
-            bool _567___mcc_h112 = _source19.dtor_onDatatype;
-            bool _568___mcc_h113 = _source19.dtor_isStatic;
-            BigInteger _569___mcc_h114 = _source19.dtor_arity;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_TupleSelect) {
-            DAST._IExpression _570___mcc_h120 = _source19.dtor_expr;
-            BigInteger _571___mcc_h121 = _source19.dtor_index;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_Call) {
-            DAST._IExpression _572___mcc_h124 = _source19.dtor_on;
-            Dafny.ISequence<Dafny.Rune> _573___mcc_h125 = _source19.dtor_name;
-            Dafny.ISequence<DAST._IType> _574___mcc_h126 = _source19.dtor_typeArgs;
-            Dafny.ISequence<DAST._IExpression> _575___mcc_h127 = _source19.dtor_args;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_Lambda) {
-            Dafny.ISequence<DAST._IFormal> _576___mcc_h132 = _source19.dtor_params;
-            DAST._IType _577___mcc_h133 = _source19.dtor_retType;
-            Dafny.ISequence<DAST._IStatement> _578___mcc_h134 = _source19.dtor_body;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_IIFE) {
-            Dafny.ISequence<Dafny.Rune> _579___mcc_h138 = _source19.dtor_name;
-            DAST._IType _580___mcc_h139 = _source19.dtor_typ;
-            DAST._IExpression _581___mcc_h140 = _source19.dtor_value;
-            DAST._IExpression _582___mcc_h141 = _source19.dtor_iifeBody;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_Apply) {
-            DAST._IExpression _583___mcc_h146 = _source19.dtor_expr;
-            Dafny.ISequence<DAST._IExpression> _584___mcc_h147 = _source19.dtor_args;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else if (_source19.is_TypeTest) {
-            DAST._IExpression _585___mcc_h150 = _source19.dtor_on;
-            Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _586___mcc_h151 = _source19.dtor_dType;
-            Dafny.ISequence<Dafny.Rune> _587___mcc_h152 = _source19.dtor_variant;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          } else {
-            DAST._IType _588___mcc_h156 = _source19.dtor_typ;
-            {
-              _534_enclosingString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("("), _534_enclosingString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")."));
-            }
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_534_enclosingString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("r#")), (_523_name)), _525_typeArgString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _528_argString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          isOwned = true;
-          isErased = false;
-        }
-      } else if (_source16.is_Lambda) {
-        Dafny.ISequence<DAST._IFormal> _589___mcc_h43 = _source16.dtor_params;
-        DAST._IType _590___mcc_h44 = _source16.dtor_retType;
-        Dafny.ISequence<DAST._IStatement> _591___mcc_h45 = _source16.dtor_body;
-        Dafny.ISequence<DAST._IStatement> _592_body = _591___mcc_h45;
-        DAST._IType _593_retType = _590___mcc_h44;
-        Dafny.ISequence<DAST._IFormal> _594_params = _589___mcc_h43;
-        {
-          Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _595_paramNames;
-          _595_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          BigInteger _596_i;
-          _596_i = BigInteger.Zero;
-          while ((_596_i) < (new BigInteger((_594_params).Count))) {
-            _595_paramNames = Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(_595_paramNames, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements(((_594_params).Select(_596_i)).dtor_name));
-            _596_i = (_596_i) + (BigInteger.One);
-          }
-          Dafny.ISequence<Dafny.Rune> _597_recursiveGen;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _598_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out191;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out192;
-          DCOMP.COMP.GenStmts(_592_body, _595_paramNames, true, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(""), out _out191, out _out192);
-          _597_recursiveGen = _out191;
-          _598_recIdents = _out192;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-          Dafny.ISequence<Dafny.Rune> _599_allReadCloned;
-          _599_allReadCloned = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-          while (!(_598_recIdents).Equals(Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements())) {
-            Dafny.ISequence<Dafny.Rune> _600_next;
-            foreach (Dafny.ISequence<Dafny.Rune> _assign_such_that_1 in (_598_recIdents).Elements) {
-              _600_next = (Dafny.ISequence<Dafny.Rune>)_assign_such_that_1;
-              if ((_598_recIdents).Contains(_600_next)) {
-                goto after__ASSIGN_SUCH_THAT_1;
-              }
-            }
-            throw new System.Exception("assign-such-that search produced no value (line 1313)");
-          after__ASSIGN_SUCH_THAT_1:;
-            if (!((_595_paramNames).Contains(_600_next))) {
-              _599_allReadCloned = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_599_allReadCloned, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("let r#")), _600_next), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = r#")), _600_next), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".clone();\n"));
-              readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_600_next));
-            }
-            _598_recIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Difference(_598_recIdents, Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements(_600_next));
-          }
-          Dafny.ISequence<Dafny.Rune> _601_paramsString;
-          _601_paramsString = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-          _596_i = BigInteger.Zero;
-          while ((_596_i) < (new BigInteger((_594_params).Count))) {
-            if ((_596_i).Sign == 1) {
-              _601_paramsString = Dafny.Sequence<Dafny.Rune>.Concat(_601_paramsString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-            }
-            Dafny.ISequence<Dafny.Rune> _602_typStr;
-            Dafny.ISequence<Dafny.Rune> _out193;
-            _out193 = DCOMP.COMP.GenType(((_594_params).Select(_596_i)).dtor_typ, false, true);
-            _602_typStr = _out193;
-            _601_paramsString = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(_601_paramsString, ((_594_params).Select(_596_i)).dtor_name), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": &")), _602_typStr);
-            _596_i = (_596_i) + (BigInteger.One);
-          }
-          Dafny.ISequence<Dafny.Rune> _603_retTypeGen;
-          Dafny.ISequence<Dafny.Rune> _out194;
-          _out194 = DCOMP.COMP.GenType(_593_retType, false, true);
-          _603_retTypeGen = _out194;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::FunctionWrapper({\n"), _599_allReadCloned), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::std::boxed::Box::new(move |")), _601_paramsString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("| -> ")), _603_retTypeGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" {\n")), _597_recursiveGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n})})"));
-          isOwned = true;
-          isErased = true;
-        }
-      } else if (_source16.is_IIFE) {
-        Dafny.ISequence<Dafny.Rune> _604___mcc_h46 = _source16.dtor_name;
-        DAST._IType _605___mcc_h47 = _source16.dtor_typ;
-        DAST._IExpression _606___mcc_h48 = _source16.dtor_value;
-        DAST._IExpression _607___mcc_h49 = _source16.dtor_iifeBody;
-        DAST._IExpression _608_iifeBody = _607___mcc_h49;
-        DAST._IExpression _609_value = _606___mcc_h48;
-        DAST._IType _610_tpe = _605___mcc_h47;
-        Dafny.ISequence<Dafny.Rune> _611_name = _604___mcc_h46;
-        {
-          Dafny.ISequence<Dafny.Rune> _612_valueGen;
-          bool _613_valueOwned;
-          bool _614_valueErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _615_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out195;
-          bool _out196;
-          bool _out197;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out198;
-          DCOMP.COMP.GenExpr(_609_value, @params, false, out _out195, out _out196, out _out197, out _out198);
-          _612_valueGen = _out195;
-          _613_valueOwned = _out196;
-          _614_valueErased = _out197;
-          _615_recIdents = _out198;
-          if (_614_valueErased) {
-            Dafny.ISequence<Dafny.Rune> _616_eraseFn;
-            _616_eraseFn = ((_613_valueOwned) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unerase_owned")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unerase")));
-            _612_valueGen = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::dafny_runtime::DafnyUnerasable::<_>::"), _616_eraseFn), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _612_valueGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(")"));
-          }
-          readIdents = _615_recIdents;
-          Dafny.ISequence<Dafny.Rune> _617_valueTypeGen;
-          Dafny.ISequence<Dafny.Rune> _out199;
-          _out199 = DCOMP.COMP.GenType(_610_tpe, false, true);
-          _617_valueTypeGen = _out199;
-          Dafny.ISequence<Dafny.Rune> _618_bodyGen;
-          bool _619_bodyOwned;
-          bool _620_bodyErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _621_bodyIdents;
-          Dafny.ISequence<Dafny.Rune> _out200;
-          bool _out201;
-          bool _out202;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out203;
-          DCOMP.COMP.GenExpr(_608_iifeBody, Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.Concat(@params, ((_613_valueOwned) ? (Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements()) : (Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements((_611_name))))), mustOwn, out _out200, out _out201, out _out202, out _out203);
-          _618_bodyGen = _out200;
-          _619_bodyOwned = _out201;
-          _620_bodyErased = _out202;
-          _621_bodyIdents = _out203;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _621_bodyIdents);
-          Dafny.ISequence<Dafny.Rune> _622_eraseFn;
-          _622_eraseFn = ((_613_valueOwned) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unerase_owned")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("unerase")));
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{\nlet r#"), (_611_name)), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(": ")), ((_613_valueOwned) ? (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("")) : (Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&")))), _617_valueTypeGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" = ")), _612_valueGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(";\n")), _618_bodyGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n}"));
-          isOwned = _619_bodyOwned;
-          isErased = _620_bodyErased;
-        }
-      } else if (_source16.is_Apply) {
-        DAST._IExpression _623___mcc_h50 = _source16.dtor_expr;
-        Dafny.ISequence<DAST._IExpression> _624___mcc_h51 = _source16.dtor_args;
-        Dafny.ISequence<DAST._IExpression> _625_args = _624___mcc_h51;
-        DAST._IExpression _626_func = _623___mcc_h50;
-        {
-          Dafny.ISequence<Dafny.Rune> _627_funcString;
-          bool _628___v46;
-          bool _629_funcErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _630_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out204;
-          bool _out205;
-          bool _out206;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out207;
-          DCOMP.COMP.GenExpr(_626_func, @params, false, out _out204, out _out205, out _out206, out _out207);
-          _627_funcString = _out204;
-          _628___v46 = _out205;
-          _629_funcErased = _out206;
-          _630_recIdents = _out207;
-          readIdents = _630_recIdents;
-          Dafny.ISequence<Dafny.Rune> _631_argString;
-          _631_argString = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("");
-          BigInteger _632_i;
-          _632_i = BigInteger.Zero;
-          while ((_632_i) < (new BigInteger((_625_args).Count))) {
-            if ((_632_i).Sign == 1) {
-              _631_argString = Dafny.Sequence<Dafny.Rune>.Concat(_631_argString, Dafny.Sequence<Dafny.Rune>.UnicodeFromString(", "));
-            }
-            Dafny.ISequence<Dafny.Rune> _633_argExpr;
-            bool _634_isOwned;
-            bool _635_argErased;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _636_argIdents;
-            Dafny.ISequence<Dafny.Rune> _out208;
-            bool _out209;
-            bool _out210;
-            Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out211;
-            DCOMP.COMP.GenExpr((_625_args).Select(_632_i), @params, false, out _out208, out _out209, out _out210, out _out211);
-            _633_argExpr = _out208;
-            _634_isOwned = _out209;
-            _635_argErased = _out210;
-            _636_argIdents = _out211;
-            if (_634_isOwned) {
-              _633_argExpr = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("&"), _633_argExpr);
-            }
-            _631_argString = Dafny.Sequence<Dafny.Rune>.Concat(_631_argString, _633_argExpr);
-            readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.Union(readIdents, _636_argIdents);
-            _632_i = (_632_i) + (BigInteger.One);
-          }
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(("), _627_funcString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(").0")), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("(")), _631_argString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("))"));
-          isOwned = true;
-          isErased = false;
-        }
-      } else if (_source16.is_TypeTest) {
-        DAST._IExpression _637___mcc_h52 = _source16.dtor_on;
-        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _638___mcc_h53 = _source16.dtor_dType;
-        Dafny.ISequence<Dafny.Rune> _639___mcc_h54 = _source16.dtor_variant;
-        Dafny.ISequence<Dafny.Rune> _640_variant = _639___mcc_h54;
-        Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> _641_dType = _638___mcc_h53;
-        DAST._IExpression _642_on = _637___mcc_h52;
-        {
-          Dafny.ISequence<Dafny.Rune> _643_exprGen;
-          bool _644___v47;
-          bool _645_exprErased;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _646_recIdents;
-          Dafny.ISequence<Dafny.Rune> _out212;
-          bool _out213;
-          bool _out214;
-          Dafny.ISet<Dafny.ISequence<Dafny.Rune>> _out215;
-          DCOMP.COMP.GenExpr(_642_on, @params, false, out _out212, out _out213, out _out214, out _out215);
-          _643_exprGen = _out212;
-          _644___v47 = _out213;
-          _645_exprErased = _out214;
-          _646_recIdents = _out215;
-          Dafny.ISequence<Dafny.Rune> _647_dTypePath;
-          Dafny.ISequence<Dafny.Rune> _out216;
-          _out216 = DCOMP.COMP.GenPath(_641_dType);
-          _647_dTypePath = _out216;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("matches!("), _643_exprGen), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(".as_ref(), ")), _647_dTypePath), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::r#")), _640_variant), Dafny.Sequence<Dafny.Rune>.UnicodeFromString("{ .. })"));
-          isOwned = true;
-          isErased = true;
-          readIdents = _646_recIdents;
-        }
-      } else {
-        DAST._IType _648___mcc_h55 = _source16.dtor_typ;
-        DAST._IType _649_typ = _648___mcc_h55;
-        {
-          Dafny.ISequence<Dafny.Rune> _650_typString;
-          Dafny.ISequence<Dafny.Rune> _out217;
-          _out217 = DCOMP.COMP.GenType(_649_typ, false, false);
-          _650_typString = _out217;
-          s = Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.Concat(Dafny.Sequence<Dafny.Rune>.UnicodeFromString("<"), _650_typString), Dafny.Sequence<Dafny.Rune>.UnicodeFromString(" as std::default::Default>::default()"));
-          isOwned = true;
-          isErased = false;
-          readIdents = Dafny.Set<Dafny.ISequence<Dafny.Rune>>.FromElements();
-        }
-      }
-    }
-    public static Dafny.ISequence<Dafny.Rune> Compile(Dafny.ISequence<DAST._IModule> p) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("#![allow(warnings, unconditional_panic)]\n");
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("extern crate dafny_runtime;\n"));
-      BigInteger _651_i;
-      _651_i = BigInteger.Zero;
-      while ((_651_i) < (new BigInteger((p).Count))) {
-        Dafny.ISequence<Dafny.Rune> _652_generated = Dafny.Sequence<Dafny.Rune>.Empty;
-        Dafny.ISequence<Dafny.Rune> _out218;
-        _out218 = DCOMP.COMP.GenModule((p).Select(_651_i), Dafny.Sequence<Dafny.ISequence<Dafny.Rune>>.FromElements());
-        _652_generated = _out218;
-        if ((_651_i).Sign == 1) {
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\n"));
-        }
-        s = Dafny.Sequence<Dafny.Rune>.Concat(s, _652_generated);
-        _651_i = (_651_i) + (BigInteger.One);
-      }
-      return s;
-    }
-    public static Dafny.ISequence<Dafny.Rune> EmitCallToMain(Dafny.ISequence<Dafny.ISequence<Dafny.Rune>> fullName) {
-      Dafny.ISequence<Dafny.Rune> s = Dafny.Sequence<Dafny.Rune>.Empty;
-      s = Dafny.Sequence<Dafny.Rune>.UnicodeFromString("\nfn main() {\n");
-      BigInteger _653_i;
-      _653_i = BigInteger.Zero;
-      while ((_653_i) < (new BigInteger((fullName).Count))) {
-        if ((_653_i).Sign == 1) {
-          s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("::"));
-        }
-        s = Dafny.Sequence<Dafny.Rune>.Concat(s, (fullName).Select(_653_i));
-        _653_i = (_653_i) + (BigInteger.One);
-      }
-      s = Dafny.Sequence<Dafny.Rune>.Concat(s, Dafny.Sequence<Dafny.Rune>.UnicodeFromString("();\n}"));
-      return s;
-    }
-  }
-} // end of namespace DCOMP
-
diff --git a/Source/DafnyCore/Generic/BatchErrorReporter.cs b/Source/DafnyCore/Generic/BatchErrorReporter.cs
index deaeb21772e..abf2771d956 100644
--- a/Source/DafnyCore/Generic/BatchErrorReporter.cs
+++ b/Source/DafnyCore/Generic/BatchErrorReporter.cs
@@ -7,6 +7,12 @@ public class BatchErrorReporter : ErrorReporter {
   public Dictionary<ErrorLevel, List<DafnyDiagnostic>> AllMessagesByLevel;
   public readonly List<DafnyDiagnostic> AllMessages = new();
 
+  public void CopyDiagnostics(ErrorReporter intoReporter) {
+    foreach (var diagnostic in AllMessages) {
+      intoReporter.Message(diagnostic.Source, diagnostic.Level, diagnostic.ErrorId, diagnostic.Token, diagnostic.Message);
+    }
+  }
+
   public BatchErrorReporter(DafnyOptions options) : base(options) {
     ErrorsOnly = false;
     AllMessagesByLevel = new Dictionary<ErrorLevel, List<DafnyDiagnostic>> {
@@ -16,13 +22,13 @@ public BatchErrorReporter(DafnyOptions options) : base(options) {
     };
   }
 
-  public override bool Message(MessageSource source, ErrorLevel level, string errorId, IToken tok, string msg) {
+  protected override bool MessageCore(MessageSource source, ErrorLevel level, string errorId, IOrigin tok, string msg) {
     if (ErrorsOnly && level != ErrorLevel.Error) {
       // discard the message
       return false;
     }
 
-    var dafnyDiagnostic = new DafnyDiagnostic(errorId, tok, msg, source, level, new List<DafnyRelatedInformation>());
+    var dafnyDiagnostic = new DafnyDiagnostic(source, errorId, tok, msg, level, new List<DafnyRelatedInformation>());
     AllMessages.Add(dafnyDiagnostic);
     AllMessagesByLevel[level].Add(dafnyDiagnostic);
     return true;
diff --git a/Source/DafnyLanguageServer/Workspace/CombinedDirectoryInfo.cs b/Source/DafnyCore/Generic/CombinedDirectoryInfo.cs
similarity index 96%
rename from Source/DafnyLanguageServer/Workspace/CombinedDirectoryInfo.cs
rename to Source/DafnyCore/Generic/CombinedDirectoryInfo.cs
index 21e17eb25f1..a5e89877746 100644
--- a/Source/DafnyLanguageServer/Workspace/CombinedDirectoryInfo.cs
+++ b/Source/DafnyCore/Generic/CombinedDirectoryInfo.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -11,7 +12,7 @@ namespace Microsoft.Dafny.LanguageServer.Workspace;
 /// The order in which the filesystems are given matters,
 /// when multiple filesystem contain the same file, the first containing filesystem returns it.
 /// </summary>
-class CombinedDirectoryInfo : DirectoryInfoBase {
+public class CombinedDirectoryInfo : DirectoryInfoBase {
   public DirectoryInfoBase[] Parts { get; }
 
   public CombinedDirectoryInfo(DirectoryInfoBase[] parts) {
diff --git a/Source/DafnyCore/Generic/ConsoleErrorReporter.cs b/Source/DafnyCore/Generic/ConsoleErrorReporter.cs
new file mode 100644
index 00000000000..5b84329569b
--- /dev/null
+++ b/Source/DafnyCore/Generic/ConsoleErrorReporter.cs
@@ -0,0 +1,87 @@
+using System;
+using System.IO;
+using DafnyCore;
+
+namespace Microsoft.Dafny;
+
+public class ConsoleErrorReporter : BatchErrorReporter {
+  private ConsoleColor ColorForLevel(ErrorLevel level) {
+    switch (level) {
+      case ErrorLevel.Error:
+        return ConsoleColor.Red;
+      case ErrorLevel.Warning:
+        return ConsoleColor.Yellow;
+      case ErrorLevel.Info:
+        return ConsoleColor.Green;
+      default:
+        throw new cce.UnreachableException();
+    }
+  }
+
+  protected override bool MessageCore(MessageSource source, ErrorLevel level, string errorId, IOrigin tok, string msg) {
+    var printMessage = base.MessageCore(source, level, errorId, tok, msg) && (Options is { PrintTooltips: true } || level != ErrorLevel.Info);
+    if (!printMessage) {
+      return false;
+    }
+
+    // Extra indent added to make it easier to distinguish multiline error messages for clients that rely on the CLI
+    msg = msg.Replace("\n", "\n ");
+
+    ConsoleColor previousColor = Console.ForegroundColor;
+    if (Options.OutputWriter == Console.Out) {
+      Console.ForegroundColor = ColorForLevel(level);
+    }
+    var errorLine = ErrorToString(level, tok, msg);
+
+    if (Options.Verbose && !String.IsNullOrEmpty(errorId) && errorId != "none") {
+      errorLine += " (ID: " + errorId + ")\n";
+      var info = ErrorRegistry.GetDetail(errorId);
+      if (info != null) {
+        errorLine += info; // already ends with eol character
+      }
+    } else {
+      errorLine += "\n";
+    }
+
+    if (Options.Get(Snippets.ShowSnippets) && tok.Uri != null) {
+      var tw = new StringWriter();
+      Snippets.WriteSourceCodeSnippet(Options, tok, tw);
+      errorLine += tw.ToString();
+    }
+
+    var innerToken = tok;
+    while (innerToken is NestedOrigin nestedToken) {
+      innerToken = nestedToken.Inner;
+      if (innerToken.Filepath == nestedToken.Filepath &&
+          innerToken.line == nestedToken.line &&
+          innerToken.col == nestedToken.col) {
+        continue;
+      }
+
+      var innerMessage = nestedToken.Message;
+      if (innerMessage == null) {
+        innerMessage = "Related location";
+      } else {
+        innerMessage = "Related location: " + innerMessage;
+      }
+
+      errorLine += $"{innerToken.TokenToString(Options)}: {innerMessage}\n";
+      if (Options.Get(Snippets.ShowSnippets) && tok.Uri != null) {
+        var tw = new StringWriter();
+        Snippets.WriteSourceCodeSnippet(Options, innerToken, tw);
+        errorLine += tw.ToString();
+      }
+    }
+
+    Options.OutputWriter.Write(errorLine);
+
+    if (Options.OutputWriter == Console.Out) {
+      Console.ForegroundColor = previousColor;
+    }
+
+    return true;
+  }
+
+  public ConsoleErrorReporter(DafnyOptions options) : base(options) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/DafnyDiagnostic.cs b/Source/DafnyCore/Generic/DafnyDiagnostic.cs
new file mode 100644
index 00000000000..71f016ede9b
--- /dev/null
+++ b/Source/DafnyCore/Generic/DafnyDiagnostic.cs
@@ -0,0 +1,59 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.Dafny;
+
+public record DafnyDiagnostic(MessageSource Source, string ErrorId, IOrigin Token, string Message, ErrorLevel Level,
+  IReadOnlyList<DafnyRelatedInformation> RelatedInformation) : IComparable<DafnyDiagnostic> {
+  public int CompareTo(DafnyDiagnostic? other) {
+    if (other == null) {
+      return 1;
+    }
+    var r0 = OriginCenterComparer.Instance.Compare(Token, other.Token);
+    if (r0 != 0) {
+      return r0;
+    }
+
+    for (var index = 0; index < RelatedInformation.Count; index++) {
+      if (other.RelatedInformation.Count > index) {
+        var r1 = RelatedInformation[index].Token.Center.CompareTo(other.RelatedInformation[index].Token.Center);
+        if (r1 != 0) {
+          return r1;
+        }
+      } else {
+        return 1;
+      }
+    }
+
+    if (other.RelatedInformation.Count > RelatedInformation.Count) {
+      return -1;
+    }
+
+    return 0;
+  }
+}
+
+class OriginCenterComparer : IComparer<IOrigin> {
+  public static readonly OriginCenterComparer Instance = new();
+
+  public int Compare(IOrigin? x, IOrigin? y) {
+    if (x == null) {
+      return -1;
+    }
+
+    if (y == null) {
+      return 1;
+    }
+
+    if (x is NestedOrigin nestedX && y is NestedOrigin nestedY) {
+      var outer = Compare(nestedX.Outer, nestedY.Outer);
+      if (outer != 0) {
+        return outer;
+      }
+
+      return Compare(nestedX.Inner, nestedY.Inner);
+    }
+    return x.Center.CompareTo(y.Center);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/EmptyNode.cs b/Source/DafnyCore/Generic/EmptyNode.cs
index 1950126f1b8..51e192b6636 100644
--- a/Source/DafnyCore/Generic/EmptyNode.cs
+++ b/Source/DafnyCore/Generic/EmptyNode.cs
@@ -4,8 +4,7 @@
 namespace Microsoft.Dafny;
 
 public class EmptyNode : Node {
-  public override RangeToken RangeToken { get; set; } = new(new Token(), new Token());
-  public override IToken Tok => new Token();
+  public override IOrigin Origin { get; } = new Token();
   public override IEnumerable<INode> Children => Enumerable.Empty<Node>();
   public override IEnumerable<INode> PreResolveChildren => Enumerable.Empty<Node>();
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/ErrorRegistry.cs b/Source/DafnyCore/Generic/ErrorRegistry.cs
index 74cf6bdb7da..4b5b2ffd471 100644
--- a/Source/DafnyCore/Generic/ErrorRegistry.cs
+++ b/Source/DafnyCore/Generic/ErrorRegistry.cs
@@ -29,14 +29,14 @@ public bool Contains(DafnyPosition position) {
 /// <param name="Range">The range to replace. The start is given by the token's start, and the length is given by the val's length.</param>
 /// <param name="Replacement"></param>
 public record DafnyCodeActionEdit(DafnyRange Range, string Replacement = "") {
-  public DafnyCodeActionEdit(RangeToken rangeToken, string replacement = "", bool includeTrailingWhitespace = false)
-    : this(rangeToken.ToDafnyRange(includeTrailingWhitespace), replacement) {
+  public DafnyCodeActionEdit(IOrigin rangeOrigin, string replacement = "", bool includeTrailingWhitespace = false)
+    : this(rangeOrigin.ToDafnyRange(includeTrailingWhitespace), replacement) {
   }
 }
 
 
-public delegate List<DafnyAction> ActionSignature(RangeToken range);
-public delegate bool TokenPredicate(IToken token);
+public delegate List<DafnyAction> ActionSignature(SourceOrigin range);
+public delegate bool TokenPredicate(IOrigin token);
 
 public record DafnyAction(string Title, IReadOnlyList<DafnyCodeActionEdit> Edits);
 
@@ -46,7 +46,7 @@ public static class ErrorRegistry {
   public static string NoneId => "none";
 #nullable enable
   public static List<ActionSignature>? GetAction(string? errorId) {
-    return errorId != null && codeActionMap.ContainsKey(errorId) ? new List<ActionSignature> { codeActionMap[errorId] } : null;
+    return errorId != null && codeActionMap.TryGetValue(errorId, out var value) ? new List<ActionSignature> { value } : null;
   }
 #nullable disable
 
@@ -66,27 +66,27 @@ public static ActionSignature Replace(string newContent, string overrideTitle =
   }
 
 
-  public static DafnyCodeActionEdit[] OneEdit(RangeToken range, string newcontent, bool includeTrailingWhitespace = false) {
-    return new[] { new DafnyCodeActionEdit(range, newcontent, includeTrailingWhitespace) };
+  public static DafnyCodeActionEdit[] OneEdit(SourceOrigin range, string newContent, bool includeTrailingWhitespace = false) {
+    return new[] { new DafnyCodeActionEdit(range, newContent, includeTrailingWhitespace) };
   }
 
-  public static DafnyAction OneAction(string title, RangeToken range, string newcontent, bool includeTrailingWhitespace = false) {
-    return new(title, new[] { new DafnyCodeActionEdit(range, newcontent, includeTrailingWhitespace) });
+  public static DafnyAction OneAction(string title, IOrigin range, string newContent, bool includeTrailingWhitespace = false) {
+    return new(title, new[] { new DafnyCodeActionEdit(range, newContent, includeTrailingWhitespace) });
   }
 
-  public static RangeToken IncludeComma(RangeToken range) {
+  public static SourceOrigin IncludeComma(SourceOrigin range) {
     if (range.EndToken.Next.val == ",") {
-      return new RangeToken(range.StartToken, range.EndToken.Next);
+      return new SourceOrigin(range.StartToken, range.EndToken.Next);
     }
     if (range.StartToken.Prev.val == ",") {
-      return new RangeToken(range.StartToken.Prev, range.EndToken);
+      return new SourceOrigin(range.StartToken.Prev, range.EndToken);
     }
     return range;
   }
 
-  public static RangeToken ExpandStart(RangeToken range, TokenPredicate pred, bool include) {
+  public static SourceOrigin ExpandStart(SourceOrigin range, TokenPredicate pred, bool include) {
     var t = range.StartToken;
-    IToken p = null;
+    Token p = null;
     while (!pred(t)) {
       p = t;
       t = t.Prev;
@@ -94,12 +94,12 @@ public static RangeToken ExpandStart(RangeToken range, TokenPredicate pred, bool
         return range;
       }
     }
-    return new RangeToken(include ? t : p, range.EndToken);
+    return new SourceOrigin(include ? t : p, range.EndToken);
   }
 
-  public static RangeToken ExpandEnd(RangeToken range, TokenPredicate pred, bool include) {
+  public static SourceOrigin ExpandEnd(SourceOrigin range, TokenPredicate pred, bool include) {
     var t = range.EndToken;
-    IToken p = null;
+    Token p = null;
     while (!pred(t)) {
       p = t;
       t = t.Prev;
@@ -107,7 +107,7 @@ public static RangeToken ExpandEnd(RangeToken range, TokenPredicate pred, bool i
         return range;
       }
     }
-    return new RangeToken(range.StartToken, include ? t : p);
+    return new SourceOrigin(range.StartToken, include ? t : p);
   }
 
   public static ActionSignature Replacements(IEnumerable<(string NewContent, string Title)> replacements) {
@@ -148,31 +148,31 @@ public static void Add(object errorId, string detail, ActionSignature codeAction
     }
   }
 
-  private static List<DafnyAction> ReplacementAction(string title, RangeToken range, string newText) {
+  private static List<DafnyAction> ReplacementAction(string title, SourceOrigin range, string newText) {
     var edit = new[] { new DafnyCodeActionEdit(range, newText) };
     var action = new DafnyAction(title, edit);
     return new List<DafnyAction> { action };
   }
 
-  private static List<DafnyAction> ReplacementAction(RangeToken range, string newText) {
+  private static List<DafnyAction> ReplacementAction(SourceOrigin range, string newText) {
     string toBeReplaced = range.PrintOriginal();
     string title = "replace '" + toBeReplaced + "' with '" + newText + "'";
     return ReplacementAction(title, range, newText);
   }
 
-  private static List<DafnyAction> InsertAction(string title, RangeToken range, string newText) {
+  private static List<DafnyAction> InsertAction(string title, SourceOrigin range, string newText) {
     var edits = new[] { new DafnyCodeActionEdit(range, range.PrintOriginal() + newText) };
     var action = new DafnyAction(title, edits);
     return new List<DafnyAction> { action };
   }
 
-  private static List<DafnyAction> RemoveAction(string title, RangeToken range, bool includeTrailingSpaces) {
+  private static List<DafnyAction> RemoveAction(string title, SourceOrigin range, bool includeTrailingSpaces) {
     var edit = new[] { new DafnyCodeActionEdit(range, "", includeTrailingSpaces) };
     var action = new DafnyAction(title, edit);
     return new List<DafnyAction> { action };
   }
 
-  private static List<DafnyAction> RemoveAction(RangeToken range, bool includeTrailingSpaces) {
+  private static List<DafnyAction> RemoveAction(SourceOrigin range, bool includeTrailingSpaces) {
     string toBeRemoved = range.PrintOriginal();
     string title = "remove '" + toBeRemoved + "'";
     return RemoveAction(title, range, includeTrailingSpaces);
@@ -180,13 +180,7 @@ private static List<DafnyAction> RemoveAction(RangeToken range, bool includeTrai
 
 #nullable enable
   public static string? GetDetail(string? errorId) {
-    if (errorId == null) {
-      return null;
-    }
-    if (errorDetailMap.TryGetValue(errorId, out var result)) {
-      return result;
-    }
-    return null;
+    return errorId == null ? null : errorDetailMap.GetValueOrDefault(errorId);
   }
 #nullable disable
 }
diff --git a/Source/DafnyCore/Generic/ErrorReporter.cs b/Source/DafnyCore/Generic/ErrorReporter.cs
new file mode 100644
index 00000000000..03d44d0150b
--- /dev/null
+++ b/Source/DafnyCore/Generic/ErrorReporter.cs
@@ -0,0 +1,202 @@
+using System;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public abstract class ErrorReporter {
+  public DafnyOptions Options { get; }
+
+  protected ErrorReporter(DafnyOptions options) {
+    this.Options = options;
+  }
+
+  public bool ErrorsOnly { get; set; }
+
+  public bool FailCompilation => FailCompilationMessage != null;
+
+  public string FailCompilationMessage {
+    get {
+      if (HasErrors) {
+        return "errors were found";
+      }
+
+      if (WarningCount > 0 && Options.FailOnWarnings) {
+        return "warnings were found and --allow-warnings was not specified";
+      }
+      return null;
+    }
+  }
+
+  public int ErrorCount => Count(ErrorLevel.Error);
+
+  public bool HasErrors => ErrorCount > 0;
+  public int WarningCount => Count(ErrorLevel.Warning);
+
+  public int ErrorCountUntilResolver => CountExceptVerifierAndCompiler(ErrorLevel.Error);
+
+  public bool Message(MessageSource source, ErrorLevel level, string errorId, IOrigin tok, string msg) {
+    return MessageCore(source, level, errorId, tok, msg);
+  }
+
+  protected abstract bool MessageCore(MessageSource source, ErrorLevel level, string errorId, IOrigin tok, string msg);
+
+  public void Error(MessageSource source, IOrigin tok, string msg) {
+    Error(source, ParseErrors.ErrorId.none, tok, msg);
+  }
+  public virtual void Error(MessageSource source, string errorId, IOrigin tok, string msg) {
+    Contract.Requires(tok != null);
+    Contract.Requires(msg != null);
+    Message(source, ErrorLevel.Error, errorId, tok, msg);
+  }
+
+  public abstract int Count(ErrorLevel level);
+  public abstract int CountExceptVerifierAndCompiler(ErrorLevel level);
+
+  // This method required by the Parser
+  internal void Error(MessageSource source, Enum errorId, Uri uri, int line, int col, string msg) {
+    var tok = new Token(line, col);
+    tok.Uri = uri;
+    Error(source, errorId, tok, msg);
+  }
+
+  public void Error(MessageSource source, IOrigin tok, string format, params object[] args) {
+    Contract.Requires(tok != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    Error(source, ParseErrors.ErrorId.none, tok, format, args);
+  }
+
+  public void Error(MessageSource source, Enum errorId, IOrigin tok, string format, params object[] args) {
+    Contract.Requires(tok != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    Error(source, errorId.ToString(), tok, string.Format(format, args));
+  }
+
+  public void Error(MessageSource source, Enum errorId, IOrigin tok, string msg) {
+    Contract.Requires(tok != null);
+    Contract.Requires(msg != null);
+    Error(source, errorId.ToString(), tok, msg);
+  }
+
+  public void Error(MessageSource source, Declaration d, string format, params object[] args) {
+    Contract.Requires(d != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    Error(source, ParseErrors.ErrorId.none, d.Origin, format, args);
+  }
+
+  public void Error(MessageSource source, Enum errorId, Declaration d, string msg, params object[] args) {
+    Contract.Requires(d != null);
+    Contract.Requires(msg != null);
+    Contract.Requires(args != null);
+    Error(source, errorId, d.Origin, msg, args);
+  }
+
+  public void Error(MessageSource source, Enum errorId, Statement s, string format, params object[] args) {
+    Contract.Requires(s != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    Error(source, errorId, s.Origin, format, args);
+  }
+
+  public void Error(MessageSource source, Statement s, string format, params object[] args) {
+    Contract.Requires(s != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    Error(source, ParseErrors.ErrorId.none, s.Origin, format, args);
+  }
+
+  public void Error(MessageSource source, INode v, string format, params object[] args) {
+    Contract.Requires(v != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    Error(source, ParseErrors.ErrorId.none, v.Origin, format, args);
+  }
+
+  public void Error(MessageSource source, Enum errorId, INode v, string format, params object[] args) {
+    Contract.Requires(v != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    Error(source, errorId, v.Origin, format, args);
+  }
+
+  public void Error(MessageSource source, Enum errorId, Expression e, string format, params object[] args) {
+    Contract.Requires(e != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    Error(source, errorId, e.Origin, format, args);
+  }
+
+  public void Error(MessageSource source, Expression e, string format, params object[] args) {
+    Contract.Requires(e != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    Error(source, ParseErrors.ErrorId.none, e.Origin, format, args);
+  }
+
+  public void Warning(MessageSource source, Enum errorId, IOrigin tok, string format, params object[] args) {
+    Contract.Requires(tok != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    Warning(source, errorId, tok, String.Format(format, args));
+  }
+
+  public void Warning(MessageSource source, Enum errorId, IOrigin tok, string msg) {
+    Contract.Requires(tok != null);
+    Contract.Requires(msg != null);
+    Message(source, ErrorLevel.Warning, errorId.ToString(), tok, msg);
+  }
+
+  public void Warning(MessageSource source, string errorId, IOrigin tok, string msg) {
+    Contract.Requires(tok != null);
+    Contract.Requires(msg != null);
+    Message(source, ErrorLevel.Warning, errorId, tok, msg);
+  }
+
+  public void Deprecated(MessageSource source, string errorId, IOrigin tok, string msg) {
+    Contract.Requires(tok != null);
+    Contract.Requires(msg != null);
+    if (Options.DeprecationNoise != 0) {
+      Warning(source, errorId, tok, msg);
+    } else {
+      Info(source, tok, msg, errorId);
+    }
+  }
+
+  public void Deprecated(MessageSource source, Enum errorId, IOrigin tok, string msg) {
+    Contract.Requires(tok != null);
+    Contract.Requires(msg != null);
+    if (Options.DeprecationNoise != 0) {
+      Warning(source, errorId, tok, msg);
+    } else {
+      Info(source, tok, msg, errorId);
+    }
+  }
+
+  public void Deprecated(MessageSource source, Enum errorId, IOrigin tok, string format, params object[] args) {
+    Contract.Requires(tok != null);
+    Contract.Requires(format != null);
+    Contract.Requires(args != null);
+    if (Options.DeprecationNoise != 0) {
+      Warning(source, errorId, tok, String.Format(format, args));
+    }
+  }
+
+  public void Info(MessageSource source, IOrigin tok, string msg, object errorId = null) {
+    Contract.Requires(tok != null);
+    Contract.Requires(msg != null);
+    Message(source, ErrorLevel.Info, errorId?.ToString(), tok, msg);
+  }
+
+  public void Info(MessageSource source, IOrigin tok, string msg, params object[] args) {
+    Contract.Requires(tok != null);
+    Contract.Requires(msg != null);
+    Contract.Requires(args != null);
+    Info(source, tok, String.Format(msg, args));
+  }
+
+  public string ErrorToString(ErrorLevel header, IOrigin tok, string msg) {
+    return $"{tok.TokenToString(Options)}: {header.ToString()}: {msg}";
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/GenericErrors.cs b/Source/DafnyCore/Generic/GenericErrors.cs
index 828ae84a52a..f434bd50f02 100644
--- a/Source/DafnyCore/Generic/GenericErrors.cs
+++ b/Source/DafnyCore/Generic/GenericErrors.cs
@@ -7,6 +7,7 @@ namespace Microsoft.Dafny;
 public class GenericErrors {
 
   public enum ErrorId {
+    none,
     g_deprecated_this_in_constructor_modifies_clause,
     g_no_old_unicode_char,
     g_unicode_escape_must_have_six_digits,
diff --git a/Source/DafnyCore/Generic/ICanFormat.cs b/Source/DafnyCore/Generic/ICanFormat.cs
new file mode 100644
index 00000000000..1346f010cdb
--- /dev/null
+++ b/Source/DafnyCore/Generic/ICanFormat.cs
@@ -0,0 +1,8 @@
+namespace Microsoft.Dafny;
+
+public interface ICanFormat : INode {
+  /// Sets the indentation of individual tokens owned by this node, given
+  /// the new indentation set by the tokens preceding this node
+  /// Returns if further traverse needs to occur (true) or if it already happened (false)
+  bool SetIndent(int indentBefore, TokenNewIndentCollector formatter);
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/INode.cs b/Source/DafnyCore/Generic/INode.cs
new file mode 100644
index 00000000000..39aa62006b1
--- /dev/null
+++ b/Source/DafnyCore/Generic/INode.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace Microsoft.Dafny;
+
+public interface INode {
+  bool SingleFileToken { get; }
+  public Token StartToken => Origin.StartToken;
+  public Token EndToken => Origin.EndToken;
+  public Token Center => Origin.Center;
+  IEnumerable<IOrigin> OwnedTokens { get; }
+  IOrigin Origin { get; }
+  IEnumerable<INode> Children { get; }
+  IEnumerable<INode> PreResolveChildren { get; }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/LazyConcurrentDictionary.cs b/Source/DafnyCore/Generic/LazyConcurrentDictionary.cs
new file mode 100644
index 00000000000..0bae551cba2
--- /dev/null
+++ b/Source/DafnyCore/Generic/LazyConcurrentDictionary.cs
@@ -0,0 +1,69 @@
+#nullable enable
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// System.Collections.Concurrent.ConcurrentDictionary does not allow you to lazily add a value if it is missing,
+/// in a way that guarantees only running the lazy computation once.
+/// </summary>
+public class LazyConcurrentDictionary<TKey, TValue> : IEnumerable<KeyValuePair<TKey, TValue>>
+  where TKey : notnull {
+  private readonly ConcurrentDictionary<TKey, Lazy<TValue>> underlyingDictionary = new();
+
+  public TValue GetOrAdd(TKey key, Func<TValue> computeValue) {
+    var lazyResult = underlyingDictionary.GetOrAdd(key, new Lazy<TValue>(computeValue));
+    return lazyResult.Value;
+  }
+
+  public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator() {
+    return new Enumerator(underlyingDictionary.GetEnumerator());
+  }
+
+  class Enumerator : IEnumerator<KeyValuePair<TKey, TValue>> {
+    private readonly IEnumerator<KeyValuePair<TKey, Lazy<TValue>>> underlying;
+
+    public Enumerator(IEnumerator<KeyValuePair<TKey, Lazy<TValue>>> underlying) {
+      this.underlying = underlying;
+    }
+
+    public bool MoveNext() {
+      return underlying.MoveNext();
+    }
+
+    public void Reset() {
+      underlying.Reset();
+    }
+
+    public KeyValuePair<TKey, TValue> Current => new(underlying.Current.Key, underlying.Current.Value.Value);
+
+    object IEnumerator.Current => Current;
+
+    public void Dispose() {
+      underlying.Dispose();
+    }
+  }
+
+  IEnumerator IEnumerable.GetEnumerator() {
+    return GetEnumerator();
+  }
+
+  public bool TryGetValue(TKey key, out TValue? value) {
+    if (underlyingDictionary.TryGetValue(key, out var lazyValue)) {
+      value = lazyValue.Value;
+      return true;
+    }
+
+    value = default;
+    return false;
+  }
+
+  public TValue this[TKey key] => underlyingDictionary[key].Value;
+
+  public bool Remove(TKey key) {
+    return underlyingDictionary.TryRemove(key, out _);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/Lists.cs b/Source/DafnyCore/Generic/Lists.cs
index d38e6ff523c..9d9e31a7f87 100644
--- a/Source/DafnyCore/Generic/Lists.cs
+++ b/Source/DafnyCore/Generic/Lists.cs
@@ -14,6 +14,7 @@ public class ConcatReadOnlyLists<T> : IReadOnlyList<T> {
   public ConcatReadOnlyLists(IReadOnlyList<T> left, IReadOnlyList<T> right) {
     Left = left;
     Right = right;
+    Count = left.Count + right.Count;
   }
 
   public IReadOnlyList<T> Left { get; }
@@ -26,7 +27,7 @@ IEnumerator IEnumerable.GetEnumerator() {
     return GetEnumerator();
   }
 
-  public int Count => Left.Count + Right.Count;
+  public int Count { get; private set; }
 
   public T this[int index] => index < Left.Count ? Left[index] : Right[index - Left.Count];
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/Name.cs b/Source/DafnyCore/Generic/Name.cs
index db7e4d61f7c..e3ee7bf4573 100644
--- a/Source/DafnyCore/Generic/Name.cs
+++ b/Source/DafnyCore/Generic/Name.cs
@@ -12,15 +12,15 @@ namespace Microsoft.Dafny;
 public class Name : RangeNode {
 
   public Name Prepend(string prefix) {
-    return new Name(RangeToken, prefix + Value);
+    return new Name(Origin.MakeAutoGenerated(), prefix + Value);
   }
 
   public Name Append(string suffix) {
-    return new Name(RangeToken, Value + suffix);
+    return new Name(Origin, Value + suffix);
   }
 
   public Name Update(Func<string, string> update) {
-    return new Name(RangeToken, update(Value));
+    return new Name(Origin, update(Value));
   }
   public string Value { get; set; }
 
@@ -28,14 +28,14 @@ public Name(Cloner cloner, Name original) : base(cloner, original) {
     Value = original.Value;
   }
 
-  public Name(RangeToken range, string value) : base(range) {
+  public Name(IOrigin range, string value) : base(range) {
     this.Value = value;
   }
 
-  public Name(IToken token) : this(new RangeToken(token, token), token.val) {
+  public Name(IOrigin token) : this(token, token.val) {
   }
 
-  public Name(string value) : base(RangeToken.NoToken) {
+  public Name(string value) : base(SourceOrigin.NoToken) {
     this.Value = value;
   }
 
@@ -43,7 +43,7 @@ public Name(string value) : base(RangeToken.NoToken) {
   public override IEnumerable<INode> PreResolveChildren => Children;
 
   public Name Clone(Cloner cloner) {
-    return new Name(cloner.Tok(RangeToken), Value);
+    return new Name(cloner.Origin(Origin), Value);
   }
 
   public override string ToString() => Value;
diff --git a/Source/DafnyCore/Generic/Node.cs b/Source/DafnyCore/Generic/Node.cs
index 6f7fe9b9489..a4403036256 100644
--- a/Source/DafnyCore/Generic/Node.cs
+++ b/Source/DafnyCore/Generic/Node.cs
@@ -1,42 +1,24 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Microsoft.Boogie;
 using Microsoft.Dafny.Auditor;
+using Action = System.Action;
 
 namespace Microsoft.Dafny;
 
-public interface INode {
-  public IToken StartToken => RangeToken.StartToken;
-  public IToken EndToken => RangeToken.EndToken;
-  IEnumerable<IToken> OwnedTokens { get; }
-  RangeToken RangeToken { get; }
-  IToken Tok { get; }
-  IEnumerable<INode> Children { get; }
-  IEnumerable<INode> PreResolveChildren { get; }
-}
-
-public interface ICanFormat : INode {
-  /// Sets the indentation of individual tokens owned by this node, given
-  /// the new indentation set by the tokens preceding this node
-  /// Returns if further traverse needs to occur (true) or if it already happened (false)
-  bool SetIndent(int indentBefore, TokenNewIndentCollector formatter);
-}
-
-
 public abstract class Node : INode {
   private static readonly Regex StartDocstringExtractor =
     new Regex($@"/\*\*(?<multilinecontent>{TriviaFormatterHelper.MultilineCommentContent})\*/");
 
-  protected IReadOnlyList<IToken> OwnedTokensCache;
+  protected IReadOnlyList<IOrigin> OwnedTokensCache;
 
-  public IToken StartToken => RangeToken?.StartToken;
+  public virtual bool SingleFileToken => true;
+  public Token StartToken => Origin?.StartToken;
 
-  public IToken EndToken => RangeToken?.EndToken;
-  public abstract IToken Tok { get; }
+  public Token EndToken => Origin?.EndToken;
+  public Token Center => Origin?.Center;
 
   /// <summary>
   /// These children should be such that they contain information produced by resolution such as inferred types
@@ -53,11 +35,24 @@ public abstract class Node : INode {
   /// </summary>
   public abstract IEnumerable<INode> PreResolveChildren { get; }
 
+  public IEnumerable<Token> CoveredTokens {
+    get {
+      var token = StartToken;
+      if (token == Token.NoToken) {
+        yield break;
+      }
+      while (token.Prev != EndToken) {
+        yield return token;
+        token = token.Next;
+      }
+    }
+  }
+
   /// <summary>
   /// A token is owned by a node if it was used to parse this node,
   /// but is not owned by any of this Node's children
   /// </summary>
-  public IEnumerable<IToken> OwnedTokens {
+  public IEnumerable<IOrigin> OwnedTokens {
     get {
       if (OwnedTokensCache != null) {
         return OwnedTokensCache;
@@ -65,27 +60,16 @@ public IEnumerable<IToken> OwnedTokens {
 
       var childrenFiltered = GetConcreteChildren(this).ToList();
 
-      Dictionary<int, IToken> startToEndTokenNotOwned;
-      try {
-        startToEndTokenNotOwned =
-          childrenFiltered
-            .ToDictionary(child => child.StartToken.pos, child => child.EndToken!);
-      } catch (ArgumentException) {
-        // If we parse a resolved document, some children sometimes have the same token because they are auto-generated
-        startToEndTokenNotOwned = new();
-        foreach (var child in childrenFiltered) {
-          if (startToEndTokenNotOwned.ContainsKey(child.StartToken.pos)) {
-            var previousEnd = startToEndTokenNotOwned[child.StartToken.pos];
-            if (child.EndToken.pos > previousEnd.pos) {
-              startToEndTokenNotOwned[child.StartToken.pos] = child.EndToken;
-            }
-          } else {
-            startToEndTokenNotOwned[child.StartToken.pos] = child.EndToken;
-          }
-        }
-      }
+      // If we parse a resolved document, some children sometimes have the same token because they are auto-generated
+      var startToEndTokenNotOwned = childrenFiltered.
+        // Because RangeToken.EndToken is inclusive, a token with an empty range has an EndToken that occurs before the StartToken
+        // We need to filter these out to prevent an infinite loop
+        Where(c => c.StartToken.pos <= c.EndToken.pos).
+        GroupBy(child => child.StartToken.pos).
+        ToDictionary(g => g.Key, g => g.MaxBy(child => child.EndToken.pos).EndToken
+      );
 
-      var result = new List<IToken>();
+      var result = new List<IOrigin>();
       if (StartToken == null) {
         Contract.Assume(EndToken == null);
       } else {
@@ -125,7 +109,7 @@ private static IEnumerable<INode> GetConcreteChildren(INode node) {
     }
   }
 
-  public abstract RangeToken RangeToken { get; set; }
+  public abstract IOrigin Origin { get; }
 
   // <summary>
   // Returns all assumptions contained in this node or its descendants.
@@ -137,141 +121,64 @@ public virtual IEnumerable<Assumption> Assumptions(Declaration decl) {
     return Enumerable.Empty<Assumption>();
   }
 
-  public ISet<INode> Visit(Func<INode, bool> beforeChildren = null, Action<INode> afterChildren = null) {
+  public ISet<INode> Visit(Func<INode, bool> beforeChildren = null, Action<INode> afterChildren = null, Action<Exception> reportError = null) {
+    reportError ??= _ => { };
     beforeChildren ??= node => true;
-    afterChildren ??= node => { };
 
     var visited = new HashSet<INode>();
-    var toVisit = new LinkedList<INode>();
+    var toVisit = new LinkedList<object>();
     toVisit.AddFirst(this);
     while (toVisit.Any()) {
       var current = toVisit.First();
       toVisit.RemoveFirst();
-      if (!visited.Add(current)) {
-        continue;
-      }
+      if (current is INode currentNode) {
+        if (!visited.Add(currentNode)) {
+          continue;
+        }
 
-      if (!beforeChildren(current)) {
-        continue;
-      }
+        if (!beforeChildren(currentNode)) {
+          continue;
+        }
 
-      var nodeAfterChildren = toVisit.First;
-      foreach (var child in current.Children) {
-        if (child == null) {
-          throw new InvalidOperationException($"Object of type {current.GetType()} has null child");
+        if (afterChildren != null) {
+          void AfterNodeChildren() => afterChildren(currentNode);
+          toVisit.AddFirst((Action)AfterNodeChildren);
         }
+        var nodeAfterChildren = toVisit.First;
+        foreach (var child in currentNode.Children) {
+          if (child == null) {
+            reportError(new InvalidOperationException($"Object of type {current.GetType()} has null child"));
+            continue;
+          }
 
-        if (nodeAfterChildren == null) {
-          toVisit.AddLast(child);
-        } else {
-          toVisit.AddBefore(nodeAfterChildren, child);
+          if (nodeAfterChildren == null) {
+            toVisit.AddLast(child);
+          } else {
+            // Depth-first, but with children in unreversed order
+            toVisit.AddBefore(nodeAfterChildren, child);
+          }
         }
+      } else {
+        var currentAction = (Action)current;
+        currentAction();
       }
-
-      afterChildren(current);
     }
 
     return visited;
   }
 
   // Docstring from start token is extracted only if using "/** ... */" syntax, and only the last one is considered
-  protected string GetTriviaContainingDocstringFromStartTokenOrNull() {
+  protected bool GetStartTriviaDocstring(out string trivia) {
     var matches = StartDocstringExtractor.Matches(StartToken.LeadingTrivia);
+    trivia = null;
     if (matches.Count > 0) {
-      return matches[^1].Value;
-    }
-
-    if (StartToken.Prev.val is "|" or "{") {
+      trivia = matches[^1].Value;
+    } else if (StartToken.Prev is { val: "|" or "{" }) {
       matches = StartDocstringExtractor.Matches(StartToken.Prev.TrailingTrivia);
       if (matches.Count > 0) {
-        return matches[^1].Value;
-      }
-    }
-    return null;
-  }
-}
-
-public abstract class TokenNode : Node {
-  // Contains tokens that did not make it in the AST but are part of the expression,
-  // Enables ranges to be correct.
-  // TODO: Re-add format tokens where needed until we put all the formatting to replace the tok of every expression
-  internal IToken[] FormatTokens = null;
-
-  protected RangeToken rangeToken = null;
-
-  public IToken tok = Token.NoToken;
-
-  [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-  public override IToken Tok {
-    get => tok;
-  }
-
-  public override RangeToken RangeToken {
-    get {
-      if (rangeToken == null) {
-
-        var startTok = tok;
-        var endTok = tok;
-
-        void UpdateStartEndToken(IToken token1) {
-          if (token1.Filepath != tok.Filepath) {
-            return;
-          }
-
-          if (token1.pos < startTok.pos) {
-            startTok = token1;
-          }
-
-          if (token1.pos + token1.val.Length > endTok.pos + endTok.val.Length) {
-            endTok = token1;
-          }
-        }
-
-        void UpdateStartEndTokRecursive(INode node) {
-          if (node is null) {
-            return;
-          }
-
-          if (node.RangeToken.Filepath != tok.Filepath || node is Expression { IsImplicit: true } ||
-              node is DefaultValueExpression) {
-            // Ignore any auto-generated expressions.
-          } else {
-            UpdateStartEndToken(node.StartToken);
-            UpdateStartEndToken(node.EndToken);
-          }
-        }
-
-        PreResolveChildren.ForEach(UpdateStartEndTokRecursive);
-
-        if (FormatTokens != null) {
-          foreach (var token in FormatTokens) {
-            UpdateStartEndToken(token);
-          }
-        }
-
-        rangeToken = new RangeToken(startTok, endTok);
+        trivia = matches[^1].Value;
       }
-
-      return rangeToken;
     }
-    set => rangeToken = value;
-  }
-}
-
-public abstract class RangeNode : Node { // TODO merge into Node when TokenNode is gone.
-
-  public override IToken Tok => StartToken; // TODO rename to ReportingToken in separate PR
-
-  public IToken tok => Tok; // TODO replace with Tok in separate PR
-
-  // TODO rename to Range in separate PR
-  public override RangeToken RangeToken { get; set; } // TODO remove setter when TokenNode is gone.
-
-  protected RangeNode(Cloner cloner, RangeNode original) {
-    RangeToken = cloner.Tok(original.RangeToken);
-  }
-
-  protected RangeNode(RangeToken rangeToken) {
-    RangeToken = rangeToken;
+    return trivia is not ("" or null);
   }
-}
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/NodeExtensions.cs b/Source/DafnyCore/Generic/NodeExtensions.cs
index 70a5cc0076a..fea5a69b741 100644
--- a/Source/DafnyCore/Generic/NodeExtensions.cs
+++ b/Source/DafnyCore/Generic/NodeExtensions.cs
@@ -110,33 +110,28 @@ public static IEnumerable<INode> FindNodesInUris(this INode node, Uri uri) {
   }
 
   public static IEnumerable<LList<INode>> FindNodeChainsInUri(this INode node, Uri uri, LList<INode> parent) {
-    if (node.Tok.Uri != null) {
-      if (node.Tok.Uri == uri) {
+    if (node.Origin.Uri != null) {
+      if (node.Origin.Uri == uri) {
         return new[] { new LList<INode>(node, parent) };
       }
 
-      return null;
+      return new LList<INode>[] { };
     }
 
     var newParent = new LList<INode>(node, parent);
-    foreach (var child in node.Children) {
-      var result = child.FindNodeChainsInUri(uri, newParent);
-      if (result != null) {
-        return result;
-      }
-    }
-
-    return null;
+    return node.Children.SelectMany(child => child.FindNodeChainsInUri(uri, newParent));
   }
 
   private static LList<INode> FindNodeChain(this INode node, Uri uri, DafnyPosition position, LList<INode> parent,
     Func<INode, bool> predicate) {
-    if (node.Tok.Uri != null) {
-      if (node.Tok.Uri == uri) {
+    if (node.Origin.Uri != null) {
+      if (node.Origin.Uri == uri) {
         return node.FindNodeChain(position, parent, predicate);
       }
 
-      return null;
+      if (node.SingleFileToken) {
+        return null;
+      }
     }
 
     var newParent = new LList<INode>(node, parent);
@@ -156,7 +151,13 @@ public static LList<INode> FindNodeChain(this INode node, DafnyPosition position
 
   private static LList<INode> FindNodeChain(this INode node, DafnyPosition position, LList<INode> parent,
     Func<INode, bool> predicate) {
-    if (node.Tok is AutoGeneratedToken || (node.Tok != Token.NoToken && !node.RangeToken.ToDafnyRange().Contains(position))) {
+    if (node.Origin is AutoGeneratedOrigin) {
+      return null;
+    }
+
+    // Example of a fillerNode is the default class, although we could give it the same origin as the module it is in.
+    var fillerNode = !ReferenceEquals(node.Origin, Token.NoToken);
+    if (fillerNode && !node.Origin.ToDafnyRange().Contains(position)) {
       return null;
     }
 
@@ -168,7 +169,7 @@ private static LList<INode> FindNodeChain(this INode node, DafnyPosition positio
       }
     }
 
-    if (node.Tok == Token.NoToken || !predicate(node)) {
+    if (ReferenceEquals(node.Origin, Token.NoToken) || !predicate(node)) {
       return null;
     }
 
diff --git a/Source/DafnyCore/Generic/NodeWithComputedRange.cs b/Source/DafnyCore/Generic/NodeWithComputedRange.cs
new file mode 100644
index 00000000000..bd2c6a23620
--- /dev/null
+++ b/Source/DafnyCore/Generic/NodeWithComputedRange.cs
@@ -0,0 +1,75 @@
+#nullable enable
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+public abstract class NodeWithComputedRange : Node {
+  // Contains tokens that did not make it in the AST but are part of the expression,
+  // Enables ranges to be correct.
+  // TODO: Re-add format tokens where needed until we put all the formatting to replace the tok of every expression
+  internal Token[]? FormatTokens = null;
+
+  private IOrigin origin;
+
+  protected NodeWithComputedRange(IOrigin? origin = null) {
+    this.origin = origin ?? Token.NoToken;
+  }
+
+  protected NodeWithComputedRange(Cloner cloner, NodeWithComputedRange original) {
+    origin = cloner.Origin(original.Origin);
+  }
+
+  public void SetOrigin(IOrigin newOrigin) {
+    origin = newOrigin;
+  }
+
+  public override IOrigin Origin {
+    get {
+      if (origin is Token tokenOrigin) {
+
+        var startTok = origin.StartToken;
+        var endTok = origin.EndToken;
+
+        void UpdateStartEndToken(Token token1) {
+          if (token1.Filepath != origin.Filepath) {
+            return;
+          }
+
+          if (token1.pos < startTok.pos) {
+            startTok = token1;
+          }
+
+          if (token1.pos + token1.val.Length > endTok.pos + endTok.val.Length) {
+            endTok = token1;
+          }
+        }
+
+        void UpdateStartEndTokRecursive(INode? node) {
+          if (node is null) {
+            return;
+          }
+
+          if (node.Origin.Filepath != origin.Filepath || node is Expression { IsImplicit: true } ||
+              node is DefaultValueExpression) {
+            // Ignore any auto-generated expressions.
+          } else {
+            UpdateStartEndToken(node.StartToken);
+            UpdateStartEndToken(node.EndToken);
+          }
+        }
+
+        PreResolveChildren.ForEach(UpdateStartEndTokRecursive);
+
+        if (FormatTokens != null) {
+          foreach (var token in FormatTokens) {
+            UpdateStartEndToken(token);
+          }
+        }
+
+        origin = new SourceOrigin(startTok, endTok, tokenOrigin);
+      }
+
+      return origin;
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/OrderedDictionary.cs b/Source/DafnyCore/Generic/OrderedDictionary.cs
new file mode 100644
index 00000000000..2f6d72621c5
--- /dev/null
+++ b/Source/DafnyCore/Generic/OrderedDictionary.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+public class OrderedDictionary<TKey, TValue> {
+  private readonly Dictionary<TKey, TValue> keyToValue = new();
+  private readonly List<TKey> keyOrder = new();
+  private readonly Func<TValue, TKey> getKey;
+
+  public OrderedDictionary(Func<TValue, TKey> getKey) {
+    this.getKey = getKey;
+  }
+  public IEnumerable<TValue> Values => keyOrder.Select(key => keyToValue[key]);
+
+  public void AddRange(IEnumerable<TValue> values) {
+    foreach (var value in values) {
+      Add(value);
+    }
+  }
+
+  public TValue GetOrAdd(TValue value) {
+    var key = getKey(value);
+    return GetOrCreate(key, () => value);
+  }
+
+  public TValue GetOrCreate(TKey key, Func<TValue> createValue) {
+    if (keyToValue.TryGetValue(key, out var result)) {
+      return result;
+    }
+
+    result = createValue();
+    keyToValue[key] = result;
+    keyOrder.Add(key);
+    return result;
+  }
+
+  public void Add(TValue value) {
+    var key = getKey(value);
+    keyOrder.Add(key);
+    keyToValue[key] = value;
+  }
+
+  public TValue GetValueOrDefault(TKey key) {
+    return keyToValue.GetValueOrDefault(key);
+  }
+
+  public int Count => keyOrder.Count;
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/PredicateEqualityComparer.cs b/Source/DafnyCore/Generic/PredicateEqualityComparer.cs
new file mode 100644
index 00000000000..b05572acd25
--- /dev/null
+++ b/Source/DafnyCore/Generic/PredicateEqualityComparer.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace DafnyCore.Generic;
+
+public class PredicateEqualityComparer<T> : IEqualityComparer<T> {
+  private readonly Func<T, T, bool> comparer;
+
+  public PredicateEqualityComparer(Func<T, T, bool> comparer) {
+    this.comparer = comparer;
+  }
+
+  public bool Equals(T a, T b) {
+    return comparer(a, b);
+  }
+
+  public int GetHashCode(T a) {
+    return a.GetHashCode();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/RangeNode.cs b/Source/DafnyCore/Generic/RangeNode.cs
new file mode 100644
index 00000000000..64562a9f8ac
--- /dev/null
+++ b/Source/DafnyCore/Generic/RangeNode.cs
@@ -0,0 +1,19 @@
+namespace Microsoft.Dafny;
+
+public abstract class RangeNode : Node {
+  private IOrigin origin; // TODO merge into Node when TokenNode is gone.
+
+  public override IOrigin Origin => origin;
+
+  protected RangeNode(Cloner cloner, RangeNode original) {
+    origin = cloner.Origin(original.Origin);
+  }
+
+  protected RangeNode(IOrigin origin) {
+    this.origin = origin;
+  }
+
+  public void SetOrigin(IOrigin newOrigin) {
+    origin = newOrigin;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/ReporterExtensions.cs b/Source/DafnyCore/Generic/ReporterExtensions.cs
new file mode 100644
index 00000000000..7de8fc82d3f
--- /dev/null
+++ b/Source/DafnyCore/Generic/ReporterExtensions.cs
@@ -0,0 +1,80 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using DafnyCore;
+using VCGeneration;
+
+namespace Microsoft.Dafny;
+
+public static class ErrorReporterExtensions {
+  public static void ReportBoogieError(this ErrorReporter reporter, ErrorInformation error, DafnyModel? counterexampleModel = null, bool useRange = true) {
+    var usingSnippets = reporter.Options.Get(Snippets.ShowSnippets);
+    var relatedInformation = new List<DafnyRelatedInformation>();
+    foreach (var auxiliaryInformation in error.Aux) {
+      if (auxiliaryInformation.Category == RelatedMessageCategory || auxiliaryInformation.Category == AssertedExprCategory) {
+        error.Msg += "\n" + auxiliaryInformation.FullMsg;
+      } else if (auxiliaryInformation.Category == RelatedLocationCategory) {
+        relatedInformation.AddRange(CreateDiagnosticRelatedInformationFor(BoogieGenerator.ToDafnyToken(true, auxiliaryInformation.Tok), auxiliaryInformation.Msg, usingSnippets));
+      } else {
+        // The execution trace is an additional auxiliary which identifies itself with
+        // line=0 and character=0. These positions cause errors when exposing them, Furthermore,
+        // the execution trace message appears to not have any interesting information.
+        if (auxiliaryInformation.Tok.line > 0) {
+          reporter.Info(MessageSource.Verifier, BoogieGenerator.ToDafnyToken(true, auxiliaryInformation.Tok), auxiliaryInformation.Msg);
+        }
+      }
+    }
+
+    if (counterexampleModel != null) {
+      error.Msg += "\n" + $"Related counterexample:\n{counterexampleModel}";
+    }
+
+    if (error.Tok is NestedOrigin { Inner: var innerToken, Message: var msg }) {
+      relatedInformation.AddRange(CreateDiagnosticRelatedInformationFor(innerToken, msg, usingSnippets));
+    }
+
+    var dafnyToken = BoogieGenerator.ToDafnyToken(useRange, error.Tok);
+
+    var tokens = new[] { dafnyToken }.Concat(relatedInformation.Select(i => i.Token)).ToList();
+    IOrigin previous = tokens.Last();
+    foreach (var (inner, outer) in relatedInformation.Zip(tokens).Reverse()) {
+      previous = new NestedOrigin(outer, previous, inner.Message);
+    }
+    reporter.Message(MessageSource.Verifier, ErrorLevel.Error, null, previous, error.Msg);
+  }
+
+  private const string RelatedLocationCategory = "Related location";
+  public const string RelatedLocationMessage = RelatedLocationCategory;
+  private const string RelatedMessageCategory = "Related message";
+  public const string AssertedExprCategory = "Asserted expression";
+  public static readonly string PostConditionFailingMessage = new EnsuresDescription(null, null, null).FailureDescription;
+  private static string FormatRelated(string related) {
+    return $"Could not prove: {related}";
+  }
+
+  public static IEnumerable<DafnyRelatedInformation> CreateDiagnosticRelatedInformationFor(IOrigin token, string? message, bool usingSnippets) {
+    var (tokenForMessage, inner, newMessage) = token is NestedOrigin nestedToken ? (nestedToken.Outer, nestedToken.Inner, nestedToken.Message) : (token, null, null);
+    var dafnyToken = BoogieGenerator.ToDafnyToken(true, tokenForMessage);
+
+    // Turning this on changes many regression tests, in a way that might be considered good,
+    // but it should be turned on in a separate PR
+    // There seem to be no LSP tests for this behavior, so turning it off did not affect those.
+    // if (!usingSnippets && dafnyToken.IncludesRange) {
+    //   if (message == PostConditionFailingMessage) {
+    //     var postcondition = dafnyToken.PrintOriginal();
+    //     message = $"this postcondition might not hold: {postcondition}";
+    //   } else if (message == null|| message == RelatedLocationMessage*/) {
+    //     message = FormatRelated(dafnyToken.PrintOriginal());
+    //   }
+    // }
+
+    message ??= "this proposition could not be proved";
+
+    yield return new DafnyRelatedInformation(token, message);
+    if (inner != null) {
+      foreach (var nestedInformation in CreateDiagnosticRelatedInformationFor(inner, newMessage, usingSnippets)) {
+        yield return nestedInformation;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/Reporting.cs b/Source/DafnyCore/Generic/Reporting.cs
index 345bf8c1e3a..de600c10c73 100644
--- a/Source/DafnyCore/Generic/Reporting.cs
+++ b/Source/DafnyCore/Generic/Reporting.cs
@@ -1,274 +1,29 @@
 // Copyright by the contributors to the Dafny Project
 // SPDX-License-Identifier: MIT
-
-using System;
-using System.Collections.Generic;
+#nullable enable
 using System.CommandLine;
-using System.Diagnostics.Contracts;
-using System.IO;
 using System.Linq;
 
 namespace Microsoft.Dafny {
+
   public enum ErrorLevel {
     Info, Warning, Error
   }
 
   public enum MessageSource {
-    Parser, Cloner, RefinementTransformer, Rewriter, Resolver, Translator, Verifier, Compiler, Documentation
+    Project, Parser, Cloner, RefinementTransformer, Rewriter, Resolver, Translator, Verifier, Compiler, Documentation, TestGeneration
   }
 
-  public record DafnyRelatedInformation(IToken Token, string Message);
-  public record DafnyDiagnostic(string ErrorId, IToken Token, string Message,
-    MessageSource Source, ErrorLevel Level,
-    IReadOnlyList<DafnyRelatedInformation> RelatedInformation);
-
-  public abstract class ErrorReporter {
-    public DafnyOptions Options { get; }
-
-    protected ErrorReporter(DafnyOptions options) {
-      this.Options = options;
-    }
-
-    public bool ErrorsOnly { get; set; }
-
-    public bool HasErrors => ErrorCount > 0;
-    public int ErrorCount => Count(ErrorLevel.Error);
-    public bool HasErrorsUntilResolver => ErrorCountUntilResolver > 0;
-    public int ErrorCountUntilResolver => CountExceptVerifierAndCompiler(ErrorLevel.Error);
-
-    public abstract bool Message(MessageSource source, ErrorLevel level, string errorId, IToken tok, string msg);
-
-    public void Error(MessageSource source, IToken tok, string msg) {
-      Error(source, ParseErrors.ErrorId.none, tok, msg);
-    }
-    public virtual void Error(MessageSource source, string errorId, IToken tok, string msg) {
-      Contract.Requires(tok != null);
-      Contract.Requires(msg != null);
-      Message(source, ErrorLevel.Error, errorId, tok, msg);
-    }
-
-    public abstract int Count(ErrorLevel level);
-    public abstract int CountExceptVerifierAndCompiler(ErrorLevel level);
-
-    // This method required by the Parser
-    internal void Error(MessageSource source, Enum errorId, Uri uri, int line, int col, string msg) {
-      var tok = new Token(line, col);
-      tok.Uri = uri;
-      Error(source, errorId, tok, msg);
-    }
-
-    public void Error(MessageSource source, IToken tok, string format, params object[] args) {
-      Contract.Requires(tok != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      Error(source, ParseErrors.ErrorId.none, tok, format, args);
-    }
-
-    public void Error(MessageSource source, Enum errorId, IToken tok, string format, params object[] args) {
-      Contract.Requires(tok != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      Error(source, errorId.ToString(), tok, String.Format(format, args));
-    }
-
-    public void Error(MessageSource source, Enum errorId, IToken tok, string msg) {
-      Contract.Requires(tok != null);
-      Contract.Requires(msg != null);
-      Error(source, errorId.ToString(), tok, msg);
-    }
-
-    public void Error(MessageSource source, Declaration d, string format, params object[] args) {
-      Contract.Requires(d != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      Error(source, ParseErrors.ErrorId.none, d.tok, format, args);
-    }
-
-    public void Error(MessageSource source, Enum errorId, Declaration d, string msg, params object[] args) {
-      Contract.Requires(d != null);
-      Contract.Requires(msg != null);
-      Contract.Requires(args != null);
-      Error(source, errorId, d.tok, msg, args);
-    }
-
-    public void Error(MessageSource source, Enum errorId, Statement s, string format, params object[] args) {
-      Contract.Requires(s != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      Error(source, errorId, s.Tok, format, args);
-    }
-
-    public void Error(MessageSource source, Statement s, string format, params object[] args) {
-      Contract.Requires(s != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      Error(source, ParseErrors.ErrorId.none, s.Tok, format, args);
-    }
-
-    public void Error(MessageSource source, INode v, string format, params object[] args) {
-      Contract.Requires(v != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      Error(source, ParseErrors.ErrorId.none, v.Tok, format, args);
-    }
-
-    public void Error(MessageSource source, Enum errorId, INode v, string format, params object[] args) {
-      Contract.Requires(v != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      Error(source, errorId, v.Tok, format, args);
-    }
-
-    public void Error(MessageSource source, Enum errorId, Expression e, string format, params object[] args) {
-      Contract.Requires(e != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      Error(source, errorId, e.tok, format, args);
-    }
-
-    public void Error(MessageSource source, Expression e, string format, params object[] args) {
-      Contract.Requires(e != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      Error(source, ParseErrors.ErrorId.none, e.tok, format, args);
-    }
-
-    public void Warning(MessageSource source, Enum errorId, IToken tok, string format, params object[] args) {
-      Contract.Requires(tok != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      Warning(source, errorId, tok, String.Format(format, args));
-    }
-
-    public void Warning(MessageSource source, Enum errorId, IToken tok, string msg) {
-      Contract.Requires(tok != null);
-      Contract.Requires(msg != null);
-      if (Options.WarningsAsErrors) {
-        Error(source, errorId.ToString(), tok, msg);
-      } else {
-        Message(source, ErrorLevel.Warning, errorId.ToString(), tok, msg);
-      }
-    }
-
-    public void Warning(MessageSource source, string errorId, IToken tok, string msg) {
-      Contract.Requires(tok != null);
-      Contract.Requires(msg != null);
-      if (Options.WarningsAsErrors) {
-        Error(source, errorId, tok, msg);
-      } else {
-        Message(source, ErrorLevel.Warning, errorId, tok, msg);
-      }
-    }
-
-    public void Deprecated(MessageSource source, Enum errorId, IToken tok, string msg) {
-      Contract.Requires(tok != null);
-      Contract.Requires(msg != null);
-      if (Options.DeprecationNoise != 0) {
-        Warning(source, errorId, tok, msg);
-      }
-    }
-
-    public void Deprecated(MessageSource source, Enum errorId, IToken tok, string format, params object[] args) {
-      Contract.Requires(tok != null);
-      Contract.Requires(format != null);
-      Contract.Requires(args != null);
-      if (Options.DeprecationNoise != 0) {
-        Warning(source, errorId, tok, String.Format(format, args));
-      }
-    }
-
-    public void Info(MessageSource source, IToken tok, string msg) {
-      Contract.Requires(tok != null);
-      Contract.Requires(msg != null);
-      Message(source, ErrorLevel.Info, null, tok, msg);
-    }
-
-    public void Info(MessageSource source, IToken tok, string msg, params object[] args) {
-      Contract.Requires(tok != null);
-      Contract.Requires(msg != null);
-      Contract.Requires(args != null);
-      Info(source, tok, String.Format(msg, args));
-    }
-
-    public string ErrorToString(ErrorLevel header, IToken tok, string msg) {
-      return $"{tok.TokenToString(Options)}: {header.ToString()}: {msg}";
-    }
-  }
-
-  public class ConsoleErrorReporter : BatchErrorReporter {
-    private ConsoleColor ColorForLevel(ErrorLevel level) {
-      switch (level) {
-        case ErrorLevel.Error:
-          return ConsoleColor.Red;
-        case ErrorLevel.Warning:
-          return ConsoleColor.Yellow;
-        case ErrorLevel.Info:
-          return ConsoleColor.Green;
-        default:
-          throw new cce.UnreachableException();
-      }
-    }
-
-    public override bool Message(MessageSource source, ErrorLevel level, string errorId, IToken tok, string msg) {
-      if (base.Message(source, level, errorId, tok, msg) && (Options is { PrintTooltips: true } || level != ErrorLevel.Info)) {
-        // Extra indent added to make it easier to distinguish multiline error messages for clients that rely on the CLI
-        msg = msg.Replace("\n", "\n ");
-
-        ConsoleColor previousColor = Console.ForegroundColor;
-        if (Options.OutputWriter == Console.Out) {
-          Console.ForegroundColor = ColorForLevel(level);
-        }
-        var errorLine = ErrorToString(level, tok, msg);
-        while (tok is NestedToken nestedToken) {
-          tok = nestedToken.Inner;
-          if (tok.Filepath == nestedToken.Filepath &&
-              tok.line == nestedToken.line &&
-              tok.col == nestedToken.col) {
-            continue;
-          }
-          msg = nestedToken.Message ?? "[Related location]";
-          errorLine += $" {msg} {tok.TokenToString(Options)}";
-        }
-
-        if (Options.Verbose && !String.IsNullOrEmpty(errorId) && errorId != "none") {
-          errorLine += " (ID: " + errorId + ")\n";
-          var info = ErrorRegistry.GetDetail(errorId);
-          if (info != null) {
-            errorLine += info; // already ends with eol character
-          }
-        } else {
-          errorLine += "\n";
-        }
-
-        if (Options.Get(DafnyConsolePrinter.ShowSnippets) && tok != Token.NoToken) {
-          TextWriter tw = new StringWriter();
-          new DafnyConsolePrinter(Options).WriteSourceCodeSnippet(tok.ToRange(), tw);
-          Options.OutputWriter.Write(tw.ToString());
-        }
-
-        Options.OutputWriter.Write(errorLine);
-
-        if (Options.OutputWriter == Console.Out) {
-          Console.ForegroundColor = previousColor;
-        }
-        return true;
-      }
-
-      return false;
-    }
-
-    public ConsoleErrorReporter(DafnyOptions options) : base(options) {
-    }
-  }
+  public record DafnyRelatedInformation(IOrigin Token, string Message);
 
   public class ErrorReporterSink : ErrorReporter {
     public ErrorReporterSink(DafnyOptions options) : base(options) { }
 
-    public override bool Message(MessageSource source, ErrorLevel level, string errorId, IToken tok, string msg) {
+    protected override bool MessageCore(MessageSource source, ErrorLevel level, string errorId, IOrigin tok, string msg) {
       return false;
     }
 
-    public override void Error(MessageSource source, string errorId, IToken tok, string msg) {
+    public override void Error(MessageSource source, string errorId, IOrigin tok, string msg) {
 
     }
 
@@ -291,8 +46,12 @@ public ErrorReporterWrapper(ErrorReporter reporter, string msgPrefix) : base(rep
       this.WrappedReporter = reporter;
     }
 
-    public override bool Message(MessageSource source, ErrorLevel level, string errorId, IToken tok, string msg) {
-      base.Message(source, level, errorId, tok, msg);
+    protected override bool MessageCore(MessageSource source, ErrorLevel level, string errorId, IOrigin tok, string msg) {
+      if (level == ErrorLevel.Warning) {
+        return false;
+      }
+
+      base.MessageCore(source, level, errorId, tok, msg);
       return WrappedReporter.Message(source, level, errorId, tok, msgPrefix + msg);
     }
   }
diff --git a/Source/DafnyCore/Generic/SinglyLinkedList.cs b/Source/DafnyCore/Generic/SinglyLinkedList.cs
index 2e43c3e33e2..0e77c90f74e 100644
--- a/Source/DafnyCore/Generic/SinglyLinkedList.cs
+++ b/Source/DafnyCore/Generic/SinglyLinkedList.cs
@@ -38,20 +38,32 @@ public abstract record SinglyLinkedList<T> : IEnumerable<T> {
   IEnumerator IEnumerable.GetEnumerator() {
     return GetEnumerator();
   }
+
+  public bool Any() {
+    return this is not Nil<T>;
+  }
 }
 
 public static class LinkedLists {
-  public static SinglyLinkedList<T> Concat<T>(IEnumerable<T> left, SinglyLinkedList<T> right) {
-    SinglyLinkedList<T> result = right;
-    foreach (var value in left.Reverse()) {
-      result = new Cons<T>(value, result);
-    }
+  public static SinglyLinkedList<T> Concat<T>(SinglyLinkedList<T> left, SinglyLinkedList<T> right) {
+    return left switch {
+      Nil<T> => right,
+      Cons<T> cons => new Cons<T>(cons.Head, Concat<T>(cons.Tail, right)),
+      _ => throw new ArgumentOutOfRangeException(nameof(left))
+    };
+  }
+
 
+  public static SinglyLinkedList<T> FromList<T>(IReadOnlyList<T> values, SinglyLinkedList<T> tail = null) {
+    SinglyLinkedList<T> result = tail ?? new Nil<T>();
+    for (int i = values.Count - 1; i >= 0; i--) {
+      result = new Cons<T>(values[i], result);
+    }
     return result;
   }
 
   public static SinglyLinkedList<T> Create<T>(params T[] values) {
-    return Concat(values, new Nil<T>());
+    return FromList(values);
   }
 }
 
diff --git a/Source/DafnyCore/Generic/Stringify.cs b/Source/DafnyCore/Generic/Stringify.cs
new file mode 100644
index 00000000000..47481a18ce8
--- /dev/null
+++ b/Source/DafnyCore/Generic/Stringify.cs
@@ -0,0 +1,123 @@
+#nullable enable
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+
+using Overrides = ImmutableDictionary<System.Type, Action<object, TextWriter>>;
+
+public static class StringifyUtil {
+
+  private static Dictionary<System.Type, Action<object, TextWriter>> globalOverrides = new();
+
+  public static void AddGlobalOverride<T>(Action<T, TextWriter> write) {
+    globalOverrides.Add(typeof(T), (o, w) => write((T)o, w));
+  }
+
+  public static Overrides EmptyOverrides() {
+    return ImmutableDictionary<System.Type, Action<object, TextWriter>>.Empty;
+  }
+
+  public static Overrides UseToString(this Overrides overrides, System.Type type) {
+    return overrides.Add(type, (value, writer) => writer.Write(value.ToString()));
+  }
+
+  public static void Stringify(this object? root, TextWriter writer, bool showNullChildren = false,
+    ImmutableDictionary<System.Type, Action<object, TextWriter>>? overrides = null) {
+
+    overrides ??= ImmutableDictionary<System.Type, Action<object, TextWriter>>.Empty;
+
+    void Helper(ImmutableHashSet<object> visited, object? value, int indentation) {
+      if (value == null) {
+        writer.Write("null");
+        return;
+      }
+
+      if (value is string) {
+        writer.Write($"\"{value}\"");
+        return;
+      }
+      var type = value.GetType();
+      var globalOverride = globalOverrides.GetValueOrDefault(type);
+      if (globalOverride != null) {
+        globalOverride(value, writer);
+        return;
+      }
+
+      var newIndentation = indentation + 2;
+      if (value is IEnumerable enumerable) {
+        var sep = "";
+        writer.Write("[");
+        foreach (var child in enumerable) {
+          writer.WriteLine(sep);
+          writer.Write(new String(' ', newIndentation));
+          Helper(visited, child, newIndentation);
+          sep = ", ";
+        }
+
+        if (sep != "") {
+          writer.WriteLine();
+          writer.Write(new String(' ', indentation));
+        }
+        writer.Write("]");
+
+        return;
+      }
+
+      var isKeyValuePair = type.Name == "KeyValuePair`2";
+      if (type.Namespace?.StartsWith("System") == true && !isKeyValuePair) {
+        writer.Write(value);
+        return;
+      }
+
+      if (value is Enum) {
+        writer.Write(value.ToString());
+        return;
+      }
+
+      if (visited.Contains(value)) {
+        writer.Write("<visited>");
+        return;
+      }
+
+      var overrideForType = overrides.GetValueOrDefault(type);
+      if (overrideForType != null) {
+        overrideForType(value, writer);
+        return;
+      }
+
+      var newVisited = visited.Add(value);
+
+      writer.Write((isKeyValuePair ? "" : (type.Name + " ")) + "{");
+      var objectSep = "";
+      var properties = type.GetProperties();
+      foreach (var property in properties) {
+        var child = property.GetValue(value);
+        if (!showNullChildren && child == null) {
+          continue;
+        }
+
+        writer.WriteLine(objectSep);
+        writer.Write(new String(' ', newIndentation));
+        writer.Write(property.Name + " = ");
+        Helper(newVisited, child, newIndentation);
+        objectSep = ",";
+      }
+
+      writer.WriteLine();
+      writer.Write(new String(' ', indentation) + "}");
+    }
+
+    Helper(ImmutableHashSet.Create<object>(), root, 0);
+    writer.Flush();
+  }
+
+  public static string Stringify(this object? root, bool showNullChildren = false) {
+    var stringWriter = new StringWriter();
+    Stringify(root, stringWriter, showNullChildren);
+    return stringWriter.ToString();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/TomlUtil.cs b/Source/DafnyCore/Generic/TomlUtil.cs
new file mode 100644
index 00000000000..9ff6d31a5b2
--- /dev/null
+++ b/Source/DafnyCore/Generic/TomlUtil.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Dafny;
+using Tomlyn.Model;
+using Type = System.Type;
+
+namespace DafnyCore.Generic;
+
+public static class TomlUtil {
+
+  public static bool TryGetValueFromToml(ErrorReporter reporter, IOrigin origin, string sourceDir, string tomlPath,
+    Type type, object tomlValue, out object value) {
+    if (tomlValue == null) {
+      value = null;
+      return false;
+    }
+
+    if (type.IsAssignableFrom(typeof(List<string>))) {
+      return TryGetListValueFromToml<string>(reporter, origin, sourceDir, tomlPath, (TomlArray)tomlValue, out value);
+    }
+    if (type.IsAssignableFrom(typeof(List<FileInfo>))) {
+      return TryGetListValueFromToml<FileInfo>(reporter, origin, sourceDir, tomlPath, (TomlArray)tomlValue, out value);
+    }
+
+    if (tomlValue is string tomlString) {
+      if (type == typeof(FileInfo)) {
+        // Need to make sure relative paths are interpreted relative to the source of the value,
+        // not the current directory.
+        var fullPath = sourceDir != null ? Path.GetFullPath(tomlString, sourceDir) : tomlString;
+        value = new FileInfo(fullPath);
+        return true;
+      }
+
+      if (typeof(Enum).IsAssignableFrom(type)) {
+        try {
+          value = Enum.Parse(type, tomlString);
+          return true;
+        } catch (ArgumentException) {
+          value = null;
+          return false;
+        }
+      }
+    }
+
+    if (!type.IsInstanceOfType(tomlValue)) {
+      if (type == typeof(string)) {
+        value = tomlValue.ToString();
+        return true;
+      }
+      reporter.Error(MessageSource.Project, origin, $"property '{tomlPath}' is of type '{tomlValue.GetType()}' but should be of type '{type}'");
+      value = null;
+      return false;
+    }
+
+    value = tomlValue;
+    return true;
+  }
+
+  private static bool TryGetListValueFromToml<T>(ErrorReporter reporter, IOrigin origin, string sourceDir, string tomlPath, TomlArray tomlValue, out object value) {
+    var success = true;
+    value = tomlValue.Select((e, i) => {
+      if (TryGetValueFromToml(reporter, origin, sourceDir, $"{tomlPath}[{i}]", typeof(T), e, out var elementValue)) {
+        return (T)elementValue;
+      }
+      success = false;
+      return default(T);
+    }).ToList();
+    return success;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Generic/Util.cs b/Source/DafnyCore/Generic/Util.cs
index 48efdac45c4..df1874cf264 100644
--- a/Source/DafnyCore/Generic/Util.cs
+++ b/Source/DafnyCore/Generic/Util.cs
@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: MIT
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Diagnostics.Contracts;
+using System.IO;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Text.RegularExpressions;
@@ -24,6 +26,20 @@ public static ISet<T> Empty<T>() {
 
   public static class Util {
 
+    public static Task WaitForComplete<T>(this IObservable<T> observable) {
+      var result = new TaskCompletionSource();
+      observable.Subscribe(_ => { }, e => result.SetException(e), () => result.SetResult());
+      return result.Task;
+    }
+
+    public static string CapitaliseFirstLetter(this string input) {
+      if (input.Length > 0) {
+        return char.ToUpper(input[0]) + input.Substring(1);
+      }
+
+      return input;
+    }
+
     public static bool LessThanOrEquals<T>(this T first, T second)
       where T : IComparable<T> {
       return first.CompareTo(second) != 1;
@@ -41,8 +57,8 @@ public static Task<U> Select<T, U>(this Task<T> task, Func<T, U> f) {
 #pragma warning restore VSTHRD105
     }
 
-    public static string Comma(this IEnumerable<string> l) {
-      return Comma(l, s => s);
+    public static string Comma<T>(this IEnumerable<T> l) {
+      return Comma(l, s => s.ToString());
     }
 
     public static string Comma<T>(this IEnumerable<T> l, Func<T, string> f) {
@@ -208,7 +224,7 @@ public static string RemoveParsedStringQuotes(string s, out bool isVerbatimStrin
       }
     }
 
-    public static void ValidateEscaping(DafnyOptions options, IToken t, string s, bool isVerbatimString, Errors errors) {
+    public static void ValidateEscaping(DafnyOptions options, IOrigin t, string s, bool isVerbatimString, Errors errors) {
       if (options.Get(CommonOptionBag.UnicodeCharacters)) {
         foreach (var token in TokensWithEscapes(s, isVerbatimString)) {
           if (token.StartsWith("\\u")) {
@@ -265,8 +281,12 @@ public static string RemoveEscaping(DafnyOptions options, string s, bool isVerba
     public static readonly Regex UnicodeEscape = new Regex(@"\\U\{([0-9a-fA-F_]+)\}");
     private static readonly Regex NullEscape = new Regex(@"\\0");
 
-    private static string ToUtf16Escape(char c) {
-      return $"\\u{(int)c:x4}";
+    private static string ToUtf16Escape(char c, bool addBraces = false) {
+      if (addBraces) {
+        return $"\\u{{{(int)c:x4}}}";
+      } else {
+        return $"\\u{(int)c:x4}";
+      }
     }
 
     public static string ReplaceTokensWithEscapes(string s, Regex pattern, MatchEvaluator evaluator) {
@@ -306,6 +326,10 @@ public static string ReplaceNullEscapesWithCharacterEscapes(string s) {
       return ReplaceTokensWithEscapes(s, NullEscape, match => "\\u0000");
     }
 
+    public static IEnumerable<int> UnescapedCharacters(DafnyOptions options, string p, bool isVerbatimString) {
+      return UnescapedCharacters(options.Get(CommonOptionBag.UnicodeCharacters), p, isVerbatimString);
+    }
+
     /// <summary>
     /// Returns the characters of the well-parsed string p, replacing any
     /// escaped characters by the actual characters.
@@ -314,8 +338,7 @@ public static string ReplaceNullEscapesWithCharacterEscapes(string s) {
     /// if --unicode-char is enabled - these are synthesized by the parser when
     /// reading the original UTF-8 source, but don't represent the true character values.
     /// </summary>
-    public static IEnumerable<int> UnescapedCharacters(DafnyOptions options, string p, bool isVerbatimString) {
-      var unicodeChars = options.Get(CommonOptionBag.UnicodeCharacters);
+    public static IEnumerable<int> UnescapedCharacters(bool unicodeChars, string p, bool isVerbatimString) {
       if (isVerbatimString) {
         foreach (var s in TokensWithEscapes(p, true)) {
           if (s == "\"\"") {
@@ -432,14 +455,14 @@ public static void AddFrameExpression(List<FrameExpression> mod, FrameExpression
       Contract.Requires(errors != null);
       if (performThisDeprecationCheck) {
         if (fe.E is ThisExpr) {
-          errors.Deprecated(ErrorId.g_deprecated_this_in_constructor_modifies_clause, fe.E.tok, "constructors no longer need 'this' to be listed in modifies clauses");
+          errors.Deprecated(ErrorId.g_deprecated_this_in_constructor_modifies_clause, fe.E.Origin, "constructors no longer need 'this' to be listed in modifies clauses");
           return;
         } else if (fe.E is SetDisplayExpr) {
           var s = (SetDisplayExpr)fe.E;
           var deprecated = s.Elements.FindAll(e => e is ThisExpr);
           if (deprecated.Count != 0) {
             foreach (var e in deprecated) {
-              errors.Deprecated(ErrorId.g_deprecated_this_in_constructor_modifies_clause, e.tok, "constructors no longer need 'this' to be listed in modifies clauses");
+              errors.Deprecated(ErrorId.g_deprecated_this_in_constructor_modifies_clause, e.Origin, "constructors no longer need 'this' to be listed in modifies clauses");
             }
             s.Elements.RemoveAll(e => e is ThisExpr);
             if (s.Elements.Count == 0) {
@@ -473,7 +496,7 @@ static Graph<Function> BuildFunctionCallGraph(Dafny.Program program) {
             foreach (var member in c.Members) {
               if (member is Function f) {
                 List<Function> calls = new List<Function>();
-                foreach (var e in f.Reads) { if (e != null && e.E != null) { callFinder.Visit(e.E, calls); } }
+                foreach (var e in f.Reads.Expressions) { if (e != null && e.E != null) { callFinder.Visit(e.E, calls); } }
                 foreach (var e in f.Req) { if (e != null) { callFinder.Visit(e, calls); } }
                 foreach (var e in f.Ens) { if (e != null) { callFinder.Visit(e, calls); } }
                 if (f.Body != null) {
@@ -630,6 +653,10 @@ public static void PrintStats(Dafny.Program program) {
         program.Options.OutputWriter.WriteLine("{0} {1,4}", keyString, keypair.Value);
       }
     }
+
+    public static IEnumerable<string> Lines(TextReader reader) {
+      return new LinesEnumerable(reader);
+    }
   }
 
   public class DependencyMap {
@@ -882,7 +909,7 @@ public bool Traverse(MemberDecl memberDeclaration, [CanBeNull] string field, [Ca
           return true;
         }
       } else if (memberDeclaration is Function f) {
-        if (f.Formals.Any(Traverse)) {
+        if (f.Ins.Any(Traverse)) {
           return true;
         }
         if (f.Result != null && f.Result.DefaultValue != null && Traverse(f.Result.DefaultValue, "Result.DefaultValue", f)) {
@@ -891,7 +918,7 @@ public bool Traverse(MemberDecl memberDeclaration, [CanBeNull] string field, [Ca
         if (f.Req.Any(e => Traverse(e.E, "Req.E", f))) {
           return true;
         }
-        if (f.Reads.Any(e => Traverse(e.E, "Reads.E", f))) {
+        if (f.Reads.Expressions.Any(e => Traverse(e.E, "Reads.E", f))) {
           return true;
         }
         if (f.Ens.Any(e => Traverse(e.E, "Ens.E", f))) {
@@ -922,6 +949,9 @@ public bool Traverse(MemberDecl memberDeclaration, [CanBeNull] string field, [Ca
         if (m.Req.Any(e => Traverse(e.E, "Req.E", m))) {
           return true;
         }
+        if (m.Reads.Expressions.Any(e => Traverse(e.E, "Reads.E", m))) {
+          return true;
+        }
         if (m.Mod.Expressions.Any(e => Traverse(e.E, "Mod.E", m) == true)) {
           return true;
         }
@@ -969,4 +999,45 @@ public virtual bool Traverse(Expression expr, [CanBeNull] string field, [CanBeNu
              OnExit(expr, field, parent);
     }
   }
+
+  class LinesEnumerable : IEnumerable<string> {
+    private readonly TextReader Reader;
+
+    public LinesEnumerable(TextReader reader) {
+      Reader = reader;
+    }
+
+    public IEnumerator<string> GetEnumerator() {
+      return new LinesEnumerator(Reader);
+    }
+
+    IEnumerator IEnumerable.GetEnumerator() {
+      return GetEnumerator();
+    }
+  }
+
+  class LinesEnumerator : IEnumerator<string> {
+
+    private readonly TextReader Reader;
+
+    public LinesEnumerator(TextReader reader) {
+      Reader = reader;
+    }
+
+    public bool MoveNext() {
+      Current = Reader.ReadLine();
+      return Current != null;
+    }
+
+    public void Reset() {
+      throw new NotImplementedException();
+    }
+
+    public string Current { get; internal set; }
+
+    object IEnumerator.Current => Current;
+
+    public void Dispose() {
+    }
+  }
 }
diff --git a/Source/DafnyCore/JsonDiagnostics.cs b/Source/DafnyCore/JsonDiagnostics.cs
index 7d82ab0c089..37c25d806e1 100644
--- a/Source/DafnyCore/JsonDiagnostics.cs
+++ b/Source/DafnyCore/JsonDiagnostics.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using Microsoft.Boogie;
 using VCGeneration;
 using static Microsoft.Dafny.ErrorRegistry;
 
@@ -25,8 +24,9 @@ private static JsonObject SerializeRange(Boogie.IToken tok) {
     var range = new JsonObject {
       ["start"] = SerializePosition(tok),
     };
-    if (tok is BoogieRangeToken rt) {
-      range["end"] = SerializePosition(rt.EndToken);
+    var origin = BoogieGenerator.ToDafnyToken(true, tok);
+    if (origin.IncludesRange) {
+      range["end"] = SerializePosition(origin.EndToken);
     }
     return range;
   }
@@ -34,7 +34,7 @@ private static JsonObject SerializeRange(Boogie.IToken tok) {
   private static JsonObject SerializeToken(Boogie.IToken tok) {
     return new JsonObject {
       ["filename"] = tok.filename,
-      ["uri"] = ((IToken)tok).Uri.AbsoluteUri,
+      ["uri"] = ((IOrigin)tok).Uri.AbsoluteUri,
       ["range"] = SerializeRange(tok)
     };
   }
@@ -60,9 +60,10 @@ private static JsonObject SerializeRelated(Boogie.IToken tok, string? category,
   }
 
   private static IEnumerable<JsonNode> SerializeInnerTokens(Boogie.IToken tok) {
-    while (tok is NestedToken ntok) {
-      tok = ntok.Inner;
-      yield return SerializeRelated(tok, null, "Related location");
+    while (tok is NestedOrigin nestedToken) {
+      tok = nestedToken.Inner;
+      var message = nestedToken.Message != null ? "Related location: " + nestedToken.Message : "Related location";
+      yield return SerializeRelated(tok, null, message);
     }
   }
 
@@ -109,9 +110,9 @@ public DafnyJsonConsolePrinter(DafnyOptions options) : base(options) {
 }
 
 public class JsonConsoleErrorReporter : BatchErrorReporter {
-  public override bool Message(MessageSource source, ErrorLevel level, string errorID, Dafny.IToken tok, string msg) {
-    if (base.Message(source, level, errorID, tok, msg) && (Options is { PrintTooltips: true } || level != ErrorLevel.Info)) {
-      new DiagnosticMessageData(source, level, tok, null, msg, null).WriteJsonTo(Options.OutputWriter);
+  protected override bool MessageCore(MessageSource source, ErrorLevel level, string errorID, Dafny.IOrigin tok, string msg) {
+    if (base.MessageCore(source, level, errorID, tok, msg) && (Options is { PrintTooltips: true } || level != ErrorLevel.Info)) {
+      new DiagnosticMessageData(source, level, tok, level == ErrorLevel.Error ? "Error" : null, msg, null).WriteJsonTo(Options.OutputWriter);
       return true;
     }
 
@@ -120,4 +121,4 @@ public override bool Message(MessageSource source, ErrorLevel level, string erro
 
   public JsonConsoleErrorReporter(DafnyOptions options) : base(options) {
   }
-}
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/LegacyUiForOption.cs b/Source/DafnyCore/LegacyUiForOption.cs
index 65a256f6682..12153fc1b61 100644
--- a/Source/DafnyCore/LegacyUiForOption.cs
+++ b/Source/DafnyCore/LegacyUiForOption.cs
@@ -14,7 +14,8 @@ public static string GenerateHelp(string template, IEnumerable<LegacyUiForOption
     var regex = new Regex(@"---- ([^-]+) -+\r?\n *\r?\n");
     var categories = regex.Matches(template).ToArray();
 
-    var optionsByCategory = options.GroupBy(option => option.Category).
+    var optionsByCategory = options.Where(o => !o.Option.IsHidden).
+      GroupBy(option => option.Category).
       ToDictionary(g => g.Key, g => g as IEnumerable<LegacyUiForOption>);
 
     var output = new StringBuilder();
diff --git a/Source/DafnyCore/Makefile b/Source/DafnyCore/Makefile
index f9ae6b2d1a6..609937f9b16 100644
--- a/Source/DafnyCore/Makefile
+++ b/Source/DafnyCore/Makefile
@@ -3,6 +3,7 @@
 # nmake that.  --KRML
 GENERATED_FROM_DAFNY=GeneratedFromDafny
 REGENERATED_FROM_DAFNY=GeneratedFromDafnyRegenerated
+DAFNY = dotnet run --project ../Dafny --no-build --roll-forward LatestMajor --
 
 all: Parser.cs
 
@@ -17,7 +18,19 @@ build-regenerated-from-dafny:
 	./DafnyGeneratedFromDafny.sh $(REGENERATED_FROM_DAFNY)
 
 test: build-regenerated-from-dafny
-	(diff $(GENERATED_FROM_DAFNY).cs $(REGENERATED_FROM_DAFNY).cs && diff $(GENERATED_FROM_DAFNY)Rust.cs $(REGENERATED_FROM_DAFNY)Rust.cs && rm $(REGENERATED_FROM_DAFNY).cs && rm $(REGENERATED_FROM_DAFNY)Rust.cs) || (rm $(REGENERATED_FROM_DAFNY).cs && rm $(REGENERATED_FROM_DAFNY)Rust.cs && (echo 'Consider running ./DafnyGeneratedFromDafny.sh GeneratedFromDafny') && (exit 1))
+	(diff $(GENERATED_FROM_DAFNY) $(REGENERATED_FROM_DAFNY) || (echo 'Consider running `make dfy-to-cs`'; exit 1; ))
+	(diff ../DafnyCore.Test/$(GENERATED_FROM_DAFNY) ../DafnyCore.Test/$(REGENERATED_FROM_DAFNY) || (echo 'Consider running `make dfy-to-cs`'; exit 1; ))
+	rm -rf $(REGENERATED_FROM_DAFNY)
+	rm -rf ../DafnyCore.Test/$(REGENERATED_FROM_DAFNY)
+
+format:
+	$(DAFNY) format .
 
 check-format:
-	../../Scripts/dafny format . --check
\ No newline at end of file
+	$(DAFNY) format . --check
+
+extract:
+	(cd Prelude; make update; cd ..)
+
+check-extract:
+	(cd Prelude; make check; cd ..)
diff --git a/Source/DafnyCore/NullPrinter.cs b/Source/DafnyCore/NullPrinter.cs
new file mode 100644
index 00000000000..6bc20d8e2c2
--- /dev/null
+++ b/Source/DafnyCore/NullPrinter.cs
@@ -0,0 +1,33 @@
+using System.IO;
+using Microsoft.Boogie;
+using VCGeneration;
+
+namespace Microsoft.Dafny;
+
+public class NullPrinter : OutputPrinter {
+  public void ErrorWriteLine(TextWriter tw, string s) {
+  }
+
+  public void ErrorWriteLine(TextWriter tw, string format, params object[] args) {
+  }
+
+  public void AdvisoryWriteLine(TextWriter output, string format, params object[] args) {
+  }
+
+  public void Inform(string s, TextWriter tw) {
+  }
+
+  public void WriteTrailer(TextWriter textWriter, Boogie.PipelineStatistics stats) {
+  }
+
+  public void WriteErrorInformation(ErrorInformation errorInfo, TextWriter tw, bool skipExecutionTrace = true) {
+  }
+
+  public void ReportBplError(Boogie.IToken tok, string message, bool error, TextWriter tw, string category = null) {
+  }
+
+  public void ReportEndVerifyImplementation(Boogie.Implementation implementation, Boogie.ImplementationRunResult result) {
+  }
+
+  public Boogie.ExecutionEngineOptions Options { get; set; }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Options/BoogieOptionBag.cs b/Source/DafnyCore/Options/BoogieOptionBag.cs
index 32332ca2b69..59ffe8bfcbe 100644
--- a/Source/DafnyCore/Options/BoogieOptionBag.cs
+++ b/Source/DafnyCore/Options/BoogieOptionBag.cs
@@ -5,17 +5,12 @@
 using System.Linq;
 using System.Transactions;
 using DafnyCore;
+using DafnyCore.Options;
 using Microsoft.Boogie;
 
 namespace Microsoft.Dafny;
 
 public static class BoogieOptionBag {
-  public static readonly Option<IEnumerable<string>> BoogieFilter = new("--boogie-filter", @"
-(experimental) Only check proofs whose Boogie name is matched by pattern <p>. This option may be specified multiple times to match multiple patterns. The pattern <p> may contain * wildcards which match any character zero or more times. If you are unsure of how Boogie names are generated, please pre- and postfix your pattern with a wildcard to enable matching on Dafny proof names."
-    .TrimStart()) {
-    ArgumentHelpName = "pattern",
-  };
-
   public static readonly Option<IEnumerable<string>> BoogieArguments = new("--boogie",
     "Specify arguments that are passed to Boogie, a tool used to verify Dafny programs.") {
     ArgumentHelpName = "arguments",
@@ -49,13 +44,15 @@ public static class BoogieOptionBag {
     ArgumentHelpName = "count",
   };
 
-  public static readonly Option<bool> NoVerify = new("--no-verify",
-    "Skip verification") {
-    ArgumentHelpName = "count"
+  public static readonly Option<bool> NoVerify = new("--no-verify", "Skip verification");
+
+  public static readonly Option<bool> HiddenNoVerify = new("--hidden-no-verify",
+    "Allows building unverified libraries without recording that they were not verified.") {
+    IsHidden = true
   };
 
-  public static readonly Option<uint> VerificationTimeLimit = new("--verification-time-limit",
-    "Limit the number of seconds spent trying to verify each procedure") {
+  public static readonly Option<uint> VerificationTimeLimit = new("--verification-time-limit", () => 30,
+    "Limit the number of seconds spent trying to verify each assertion batch. A value of 0 indicates no limit") {
     ArgumentHelpName = "seconds",
   };
 
@@ -63,7 +60,18 @@ public static class BoogieOptionBag {
     new("--error-limit", () => 5, "Set the maximum number of errors to report (0 for unlimited).");
 
   public static readonly Option<uint> SolverResourceLimit = new("--resource-limit",
-    @"Specify the maximum resource limit (rlimit) value to pass to Z3. A resource limit is a deterministic alternative to a time limit. The output produced by `--log-format csv` includes the resource use of each proof effort, which you can use to determine an appropriate limit for your program. Multiplied by 1000 before sending to Z3.");
+    result => {
+      var value = result.Tokens[^1].Value;
+
+      if (DafnyOptions.TryParseResourceCount(value, out var number)) {
+        return number;
+      }
+
+      result.ErrorMessage = $"Cannot parse resource limit: {value}";
+      return 0;
+    },
+    isDefault: false,
+    @"Specify the maximum resource limit (rlimit) value to pass to Z3. A resource limit is a deterministic alternative to a time limit. The output produced by `--log-format csv` includes the resource use of each proof effort, which you can use to determine an appropriate limit for your program.");
   public static readonly Option<string> SolverPlugin = new("--solver-plugin",
     @"Dafny uses Boogie as part of its verification process. This option allows customising that part using a Boogie plugin. More information about Boogie can be found at https://github.com/boogie-org/boogie. Information on how to construct Boogie plugins can be found by looking at the code in https://github.com/boogie-org/boogie/blob/v2.16.3/Source/Provers/SMTLib/ProverUtil.cs#L316");
 
@@ -91,20 +99,23 @@ public static class BoogieOptionBag {
   static BoogieOptionBag() {
     Cores.SetDefaultValue((uint)((Environment.ProcessorCount + 1) / 2));
 
-    DafnyOptions.RegisterLegacyBinding(BoogieFilter, (o, f) => o.ProcsToCheck.AddRange(f));
     DafnyOptions.RegisterLegacyBinding(BoogieArguments, (o, boogieOptions) => {
       var splitOptions = boogieOptions.SelectMany(SplitArguments).ToArray();
       if (splitOptions.Any()) {
-        o.Parse(splitOptions.ToArray());
+        o.BaseParse(splitOptions.ToArray(), false);
       }
     });
     DafnyOptions.RegisterLegacyBinding(Cores,
       (o, f) => o.VcsCores = f == 0 ? (1 + System.Environment.ProcessorCount) / 2 : (int)f);
-    DafnyOptions.RegisterLegacyBinding(NoVerify, (o, f) => o.Verify = !f);
+    DafnyOptions.RegisterLegacyBinding(NoVerify, (options, value) => {
+      var shouldVerify = !value && !options.Get(HiddenNoVerify);
+      options.Verify = shouldVerify;
+    });
     DafnyOptions.RegisterLegacyBinding(VerificationTimeLimit, (o, f) => o.TimeLimit = f);
 
     DafnyOptions.RegisterLegacyBinding(SolverPath, (options, value) => {
       if (value != null) {
+        options.ProverOptions.RemoveAll(s => s.StartsWith("PROVER_PATH="));
         options.ProverOptions.Add($"PROVER_PATH={value?.FullName}");
       }
     });
@@ -131,26 +142,19 @@ static BoogieOptionBag() {
     DafnyOptions.RegisterLegacyBinding(VerificationErrorLimit, (options, value) => { options.ErrorLimit = value; });
     DafnyOptions.RegisterLegacyBinding(IsolateAssertions, (o, v) => o.VcsSplitOnEveryAssert = v);
 
-
-    DooFile.RegisterLibraryChecks(
-      new Dictionary<Option, DooFile.OptionCheck> {
-        { BoogieArguments, DooFile.CheckOptionMatches },
-        { BoogieFilter, DooFile.CheckOptionMatches },
-        { NoVerify, DooFile.CheckOptionMatches },
-      }
-    );
-    DooFile.RegisterNoChecksNeeded(
-      Cores,
-      VerificationTimeLimit,
-      VerificationErrorLimit,
-      IsolateAssertions,
-      SolverLog,
-      SolverOption,
-      SolverOptionHelp,
-      SolverPath,
-      SolverPlugin,
-      SolverResourceLimit
-    );
+    OptionRegistry.RegisterGlobalOption(BoogieArguments, OptionCompatibility.CheckOptionMatches);
+    OptionRegistry.RegisterGlobalOption(NoVerify, OptionCompatibility.OptionLibraryImpliesLocalError);
+    OptionRegistry.RegisterOption(HiddenNoVerify, OptionScope.Cli);
+    OptionRegistry.RegisterOption(Cores, OptionScope.Cli);
+    OptionRegistry.RegisterOption(VerificationTimeLimit, OptionScope.Cli);
+    OptionRegistry.RegisterOption(VerificationErrorLimit, OptionScope.Cli);
+    OptionRegistry.RegisterOption(IsolateAssertions, OptionScope.Cli);
+    OptionRegistry.RegisterOption(SolverLog, OptionScope.Cli);
+    OptionRegistry.RegisterOption(SolverOption, OptionScope.Cli);
+    OptionRegistry.RegisterOption(SolverOptionHelp, OptionScope.Cli);
+    OptionRegistry.RegisterOption(SolverPath, OptionScope.Cli);
+    OptionRegistry.RegisterOption(SolverPlugin, OptionScope.Cli);
+    OptionRegistry.RegisterOption(SolverResourceLimit, OptionScope.Cli);
   }
 
   private static IReadOnlyList<string> SplitArguments(string commandLine) {
diff --git a/Source/DafnyCore/Options/CommonOptionBag.cs b/Source/DafnyCore/Options/CommonOptionBag.cs
index 228ed28284a..8ade67e6e07 100644
--- a/Source/DafnyCore/Options/CommonOptionBag.cs
+++ b/Source/DafnyCore/Options/CommonOptionBag.cs
@@ -1,14 +1,50 @@
+using System;
 using System.Collections.Generic;
 using System.CommandLine;
 using System.IO;
 using System.Linq;
 using DafnyCore;
-using Microsoft.Boogie;
+using DafnyCore.Options;
+using Serilog.Events;
+using Microsoft.Dafny.Compilers;
 
 namespace Microsoft.Dafny;
 
 public class CommonOptionBag {
 
+  public static void EnsureStaticConstructorHasRun() { }
+
+  public enum ProgressLevel { None, Symbol, VerificationJobs }
+  public static readonly Option<ProgressLevel> ProgressOption =
+    new("--progress", $"While verifying, output information that helps track progress. " +
+                      $"Use '{ProgressLevel.Symbol}' to show progress across symbols such as methods and functions. " +
+                      $"Verification of a symbol is usually split across several jobs. " +
+                      $"Use {ProgressLevel.VerificationJobs} to additionally show progress across jobs.");
+
+  public static readonly Option<string> LogLocation =
+    new("--log-location", "Sets the directory where to store log files") {
+      IsHidden = true
+    };
+
+  public static readonly Option<LogEventLevel> LogLevelOption =
+    new("--log-level", () => LogEventLevel.Error, "Sets the level at which events are logged") {
+      IsHidden = true
+    };
+
+  public static readonly Option<bool> ManualTriggerOption =
+    new("--manual-triggers", "Do not generate {:trigger} annotations for user-level quantifiers") {
+      IsHidden = true
+    };
+
+  public static readonly Option<bool> ShowHints =
+    new("--show-hints", () => false, "Show hints that might help you better understand your code, such as what triggers Dafny generators for quantifiers") {
+      IsHidden = true
+    };
+
+  public enum AssertionShowMode { None, Implicit, All }
+  public static readonly Option<AssertionShowMode> ShowAssertions = new("--show-assertions", () => AssertionShowMode.None,
+    "Show hints on locations where implicit assertions occur");
+
   public static readonly Option<bool> AddCompileSuffix =
     new("--compile-suffix", "Add the suffix _Compile to module names without :extern") {
       IsHidden = true
@@ -20,10 +56,6 @@ public class CommonOptionBag {
   public static readonly Option<bool> StdIn = new("--stdin", () => false,
     @"Read standard input and treat it as an input .dfy file.");
 
-  public static readonly Option<bool> Check = new("--check", () => false, @"
-Instead of formatting files, verify that all files are already
-formatted through and return a non-zero exit code if it is not the case".TrimStart());
-
   public static readonly Option<bool> OptimizeErasableDatatypeWrapper = new("--optimize-erasable-datatype-wrapper", () => true, @"
 false - Include all non-ghost datatype constructors in the compiled code
 true - In the compiled target code, transform any non-extern
@@ -33,11 +65,10 @@ datatype with a single non-ghost constructor that has a single
     is transformed into just 'int' in the target code.".TrimStart());
 
   public static readonly Option<bool> Verbose = new("--verbose",
-    "Print additional information such as which files are emitted where.") {
-  };
+      "Print additional information such as which files are emitted where.");
 
-  public static readonly Option<bool> WarnDeprecation = new("--warn-deprecation", () => true,
-    "Warn about the use of deprecated features (default true).") {
+  public static readonly Option<bool> AllowDeprecation = new("--allow-deprecation",
+    "Do not warn about the use of deprecated features.") {
   };
 
   public static readonly Option<bool> DisableNonLinearArithmetic = new("--disable-nonlinear-arithmetic",
@@ -45,8 +76,7 @@ datatype with a single non-ghost constructor that has a single
 (experimental, will be replaced in the future)
 Reduce Dafny's knowledge of non-linear arithmetic (*,/,%).
   
-Results in more manual work, but also produces more predictable behavior.".TrimStart()) {
-  };
+Results in more manual work, but also produces more predictable behavior.".TrimStart());
 
   public static readonly Option<bool> EnforceDeterminism = new("--enforce-determinism",
     "Check that only deterministic statements are used, so that values seen during execution will be the same in every run of the program.") {
@@ -56,7 +86,7 @@ datatype with a single non-ghost constructor that has a single
     "Allow variables to be read before they are assigned, but only if they have an auto-initializable type or if they are ghost and have a nonempty type.") {
   };
 
-  public static readonly Option<List<string>> VerificationLogFormat = new("--log-format", $@"
+  public static readonly Option<IList<string>> VerificationLogFormat = new("--log-format", $@"
 Logs verification results using the given test result format. The currently supported formats are `trx`, `csv`, and `text`. These are: the XML-based format commonly used for test results for .NET languages, a custom CSV schema, and a textual format meant for human consumption. You can provide configuration using the same string format as when using the --logger option for dotnet test, such as: --format ""trx;LogFileName=<...>"");
 
 The `trx` and `csv` formats automatically choose an output file name by default, and print the name of this file to the console. The `text` format prints its output to the console by default, but can send output to a file given the `LogFileName` option.
@@ -77,12 +107,35 @@ datatype with a single non-ghost constructor that has a single
 to prevent code from the bottom dependency from being generated more than once.
 The value may be a comma-separated list of files and folders.".TrimStart());
 
+  public static IEnumerable<string> SplitOptionValueIntoFiles(IEnumerable<string> inputs) {
+    var result = new HashSet<string>();
+    foreach (var input in inputs) {
+      var values = input.Split(',');
+      foreach (var slice in values) {
+        var name = slice.Trim();
+        if (Directory.Exists(name)) {
+          var files = Directory.GetFiles(name, "*.dfy", SearchOption.AllDirectories);
+          foreach (var file in files) { result.Add(file); }
+        } else {
+          result.Add(name);
+        }
+      }
+    }
+    return result;
+  }
+
+  public static readonly Option<FileInfo> BuildFile = new(new[] { "--build", "-b" },
+    "Specify the filepath that determines where to place and how to name build files.") {
+    ArgumentHelpName = "file",
+    IsHidden = true
+  };
+
   public static readonly Option<FileInfo> Output = new(new[] { "--output", "-o" },
     "Specify the filename and location for the generated target language files.") {
     ArgumentHelpName = "file",
   };
 
-  public static readonly Option<IList<string>> Plugin = new(new[] { "--plugin" },
+  public static readonly Option<IList<string>> PluginOption = new(new[] { "--plugin" },
     @"
 (experimental) One path to an assembly that contains at least one
 instantiatable class extending Microsoft.Dafny.Plugin.Rewriter. It
@@ -91,7 +144,8 @@ can also extend Microsoft.Dafny.Plugins.PluginConfiguration to
 to define them:
 
 https://github.com/dafny-lang/dafny/blob/master/Source/DafnyLanguageServer/README.md#about-plugins") {
-    ArgumentHelpName = "path-to-one-assembly[,argument]*"
+    ArgumentHelpName = "path-to-one-assembly[,argument]*",
+    IsHidden = true
   };
 
   public static readonly Option<FileInfo> Prelude = new("--prelude", "Choose the Dafny prelude file.") {
@@ -131,7 +185,7 @@ Note that quantifier variable domains (<- <Domain>) are available in both syntax
 js - Compile to JavaScript.
 java - Compile to Java.
 py - Compile to Python.
-cpp - Compile to C++.
+cpp - (experimental) Compile to C++.
 
 Note that the C++ backend has various limitations (see Docs/Compilation/Cpp.md). This includes lack of support for BigIntegers (aka int), most higher order functions, and advanced features like traits or co-inductive types.".TrimStart()
   ) {
@@ -142,19 +196,45 @@ Note that quantifier variable domains (<- <Domain>) are available in both syntax
     @"
 false - The char type represents any UTF-16 code unit.
 true - The char type represents any Unicode scalar value.".TrimStart()) {
+    IsHidden = true
+  };
+
+  public static readonly Option<bool> RawPointers = new("--raw-pointers", () => false,
+    @"(backend-specific: Rust)
+false - All class instances are reference-counted or garbage collected
+true - All class instances are raw pointers and need to be manually deallocated") {
+    IsHidden = true
+  };
+
+  public static readonly Option<bool> AllowAxioms = new("--allow-axioms", () => false,
+    "Prevents a warning from being generated for axioms, such as assume statements and functions or methods without a body, that don't have an {:axiom} attribute.") {
   };
 
   public static readonly Option<bool> TypeSystemRefresh = new("--type-system-refresh", () => false,
     @"
 false - The type-inference engine and supported types are those of Dafny 4.0.
-true - Use an updated type-inference engine. Warning: This mode is under construction and probably won't work at this time.".TrimStart()) {
+true - Use an updated type-inference engine.".TrimStart()) {
     IsHidden = true
   };
 
-  public static readonly Option<bool> GeneralTraits = new("--general-traits", () => false,
+  public enum GeneralTraitsOptions {
+    Legacy,
+    Datatype,
+    Full
+  }
+
+  public static readonly Option<GeneralTraitsOptions> GeneralTraits = new("--general-traits", () => GeneralTraitsOptions.Legacy,
     @"
-false - Every trait implicitly extends 'object', and thus is a reference type. Only traits and reference types can extend traits.
-true - A trait is a reference type only if it or one of its ancestor traits is 'object'. Any type with members can extend traits.".TrimStart()) {
+legacy - Every trait implicitly extends 'object', and thus is a reference type. Only traits and reference types can extend traits.
+datatype - A trait is a reference type only if it or one of its ancestor traits is 'object'. Any non-'newtype' type with members can extend traits.
+full - (don't use; not yet completely supported) A trait is a reference type only if it or one of its ancestor traits is 'object'. Any type with members can extend traits.".TrimStart()) {
+    IsHidden = true
+  };
+
+  public static readonly Option<bool> GeneralNewtypes = new("--general-newtypes", () => false,
+    @"
+false - A newtype can only be based on numeric types or another newtype.
+true - (requires --type-system-refresh) A newtype case be based on any non-reference, non-trait, non-arrow, non-ORDINAL type.".TrimStart()) {
     IsHidden = true
   };
 
@@ -177,22 +257,90 @@ Note that quantifier variable domains (<- <Domain>) are available in both syntax
   public static readonly Option<bool> UseBaseFileName = new("--use-basename-for-filename",
     "When parsing use basename of file for tokens instead of the path supplied on the command line") {
   };
+  public static readonly Option<bool> EmitUncompilableCode = new("--emit-uncompilable-code",
+    "Rather than throwing an exception, allow compilers to emit uncompilable information including what is " +
+    "not compilable instead of regular code. Useful when developing compilers or to document for each test what " +
+    "compiler feature is missing") {
+  };
   public static readonly Option<bool> SpillTranslation = new("--spill-translation",
     @"In case the Dafny source code is translated to another language, emit that translation.") {
   };
-  public static readonly Option<bool> WarningAsErrors = new("--warn-as-errors",
-    "Treat warnings as errors.");
+
+  public static readonly Option<bool> WarnAsErrors = new("--warn-as-errors", () => true, "(Deprecated). Please use --allow-warnings instead") {
+    IsHidden = true
+  };
+
+  public static readonly Option<bool> AllowWarnings = new("--allow-warnings",
+    "Allow compilation to continue and succeed when warnings occur. Errors will still halt and fail compilation.");
+
   public static readonly Option<bool> WarnMissingConstructorParenthesis = new("--warn-missing-constructor-parentheses",
     "Emits a warning when a constructor name in a case pattern is not followed by parentheses.");
   public static readonly Option<bool> WarnShadowing = new("--warn-shadowing",
     "Emits a warning if the name of a declared variable caused another variable to be shadowed.");
+  public static readonly Option<bool> WarnContradictoryAssumptions = new("--warn-contradictory-assumptions", @"
+(experimental) Emits a warning if any assertions are proved based on contradictory assumptions (vacuously).
+May slow down verification slightly, or make it more brittle.
+May produce spurious warnings.
+Use the `{:contradiction}` attribute to mark any `assert` statement intended to be part of a proof by contradiction.") {
+    IsHidden = true
+  };
+  public static readonly Option<bool> WarnRedundantAssumptions = new("--warn-redundant-assumptions", @"
+(experimental) Emits a warning if any `requires` clause or `assume` statement was not needed to complete verification.
+May slow down verification slightly, or make it more brittle.
+May produce spurious warnings.") {
+    IsHidden = true
+  };
+  public static readonly Option<bool> SuggestProofRefactoring = new("--suggest-proof-refactoring", @"
+(experimental) Emits suggestions for moving assertions into by-proofs and hiding unused function definitions.
+May produce spurious suggestions. Use with --show-hints on the CLI.") {
+    IsHidden = true
+  };
+  public static readonly Option<bool> AnalyzeProofs = new("--analyze-proofs", @"
+Uses data from the verifier to suggest ways to refine the proof:
+Warning if any assertions are proved based on contradictory assumptions (vacuously).
+Warning if any `requires` clause or `assume` statement was not needed to complete verification.
+Suggestions for moving assertions into by-proofs and hiding unused function definitions.
+May slow down verification slightly, or make it more brittle.
+May produce spurious warnings.
+Use the `{:contradiction}` attribute to mark any `assert` statement intended to be part of a proof by contradiction.
+");
+  public static readonly Option<string> VerificationCoverageReport = new("--verification-coverage-report",
+    "Emit verification coverage report to a given directory, in the same format as a test coverage report.") {
+    ArgumentHelpName = "directory"
+  };
+  public static readonly Option<bool> NoTimeStampForCoverageReport = new("--no-timestamp-for-coverage-report",
+    "Write coverage report directly to the specified folder instead of creating a timestamped subdirectory.") {
+    IsHidden = true
+  };
+  public static readonly Option<string> ExecutionCoverageReport = new("--coverage-report",
+    "Emit execution coverage report to a given directory.") {
+    ArgumentHelpName = "directory"
+  };
 
   public static readonly Option<bool> IncludeRuntimeOption = new("--include-runtime",
     "Include the Dafny runtime as source in the target language.");
 
-  public static readonly Option<bool> UseJavadocLikeDocstringRewriterOption = new("--javadoclike-docstring-plugin",
-    "Rewrite docstrings using a simple Javadoc-to-markdown converter"
-  );
+  /// <summary>
+  /// Copy of --include-runtime for execution commands like `dafny run`,
+  /// just so it can be internal only in that context:
+  /// it shouldn't matter to end users but is useful for testing.
+  /// </summary>
+  public static readonly Option<bool> InternalIncludeRuntimeOptionForExecution = new("--include-runtime", () => true,
+    "Include the Dafny runtime as source in the target language.") {
+    IsHidden = true
+  };
+
+  public enum SystemModuleMode {
+    Include,
+    Omit,
+    // Used to pre-compile the System module into the runtimes
+    OmitAllOtherModules
+  }
+
+  public static readonly Option<SystemModuleMode> SystemModule = new("--system-module", () => SystemModuleMode.Omit,
+    "How to handle the built-in _System module.") {
+    IsHidden = true
+  };
 
   public enum TestAssumptionsMode {
     None,
@@ -204,7 +352,157 @@ public enum TestAssumptionsMode {
 
 Functionality is still being expanded. Currently only checks contracts on every call to a function or method marked with the {:extern} attribute.".TrimStart());
 
+  public enum DefaultFunctionOpacityOptions {
+    Transparent,
+    AutoRevealDependencies,
+    Opaque
+  }
+
+  public static readonly Option<DefaultFunctionOpacityOptions> DefaultFunctionOpacity = new("--default-function-opacity", () => DefaultFunctionOpacityOptions.Transparent,
+    @"
+Change the default opacity of functions. 
+`transparent` (default) means functions are transparent, can be manually made opaque and then revealed. 
+`autoRevealDependencies` makes all functions not explicitly labelled as opaque to be opaque but reveals them automatically in scopes which do not have `{:autoRevealDependencies false}`. 
+`opaque` means functions are always opaque so the opaque keyword is not needed, and functions must be revealed everywhere needed for a proof.".TrimStart()) {
+  };
+
+  public static readonly Option<bool> TranslateStandardLibrary = new("--translate-standard-library", () => true,
+    @"When translating Dafny code to another language, Dafny will, for now, include the standard library as if these were source files. This causes conflicts when multiple such translated projects are combined. When combining such projects, please ensure that only one of them has --translate-standard-library set to true.
+");
+
+  public static readonly Option<bool> UseStandardLibraries = new("--standard-libraries", () => false,
+    @"
+Allow Dafny code to depend on the standard libraries included with the Dafny distribution.
+See https://github.com/dafny-lang/dafny/blob/master/Source/DafnyStandardLibraries/README.md for more information.
+Not compatible with the --unicode-char:false option.
+");
+
+  public static readonly Option<bool> ExtractCounterexample = new("--extract-counterexample", () => false,
+    @"
+If verification fails, report a detailed counterexample for the first failing assertion (experimental).".TrimStart()) {
+  };
+
+  public static readonly Option<bool> ShowProofObligationExpressions = new("--show-proof-obligation-expressions", () => false,
+    @"
+(Experimental) Show Dafny expressions corresponding to unverified proof obligations.".TrimStart()) {
+    IsHidden = true
+  };
+
   static CommonOptionBag() {
+    DafnyOptions.RegisterLegacyBinding(WarnAsErrors, (options, value) => {
+      if (!options.Get(AllowWarnings) && !options.Get(WarnAsErrors)) {
+        // If allow warnings is at the default value, and warn-as-errors is not, use the warn-as-errors value
+        options.Set(AllowWarnings, true);
+        options.FailOnWarnings = false;
+      }
+    });
+
+    DafnyOptions.RegisterLegacyUi(AllowAxioms, DafnyOptions.ParseBoolean, "Verification options", legacyName: "allowAxioms", defaultValue: true);
+    DafnyOptions.RegisterLegacyBinding(ShowHints, (options, value) => {
+      options.PrintTooltips = value;
+    });
+
+    DafnyOptions.RegisterLegacyBinding(ManualTriggerOption, (options, value) => {
+      options.AutoTriggers = !value;
+    });
+
+    DafnyOptions.RegisterLegacyUi(Target, DafnyOptions.ParseString, "Compilation options", "compileTarget", @"
+cs (default) - Compile to .NET via C#.
+go - Compile to Go.
+js - Compile to JavaScript.
+java - Compile to Java.
+py - Compile to Python.
+cpp - Compile to C++.
+dfy - Compile to Dafny.
+
+Note that the C++ backend has various limitations (see
+Docs/Compilation/Cpp.md). This includes lack of support for
+BigIntegers (aka int), most higher order functions, and advanced
+features like traits or co-inductive types.".TrimStart(), "cs");
+
+    DafnyOptions.RegisterLegacyUi(OptimizeErasableDatatypeWrapper, DafnyOptions.ParseBoolean, "Compilation options", "optimizeErasableDatatypeWrapper", @"
+0 - Include all non-ghost datatype constructors in the compiled code
+1 (default) - In the compiled target code, transform any non-extern
+    datatype with a single non-ghost constructor that has a single
+    non-ghost parameter into just that parameter. For example, the type
+        datatype Record = Record(x: int)
+    is transformed into just 'int' in the target code.".TrimStart(), defaultValue: true);
+
+    DafnyOptions.RegisterLegacyUi(VerificationLogFormat, DafnyOptions.ParseStringElement, "Verification options", "verificationLogger");
+    DafnyOptions.RegisterLegacyUi(Output, DafnyOptions.ParseFileInfo, "Compilation options", "out");
+    DafnyOptions.RegisterLegacyUi(UnicodeCharacters, DafnyOptions.ParseBoolean, "Language feature selection", "unicodeChar", @"
+0 - The char type represents any UTF-16 code unit.
+1 (default) - The char type represents any Unicode scalar value.".TrimStart(), defaultValue: true);
+    DafnyOptions.RegisterLegacyUi(TypeSystemRefresh, DafnyOptions.ParseBoolean, "Language feature selection", "typeSystemRefresh", @"
+0 (default) - The type-inference engine and supported types are those of Dafny 4.0.
+1 - Use an updated type-inference engine. Warning: This mode is under construction and probably won't work at this time.".TrimStart(), defaultValue: false);
+    DafnyOptions.RegisterLegacyUi(GeneralTraits, DafnyOptions.ParseGeneralTraitsOption, "Language feature selection", "generalTraits", @"
+legacy (default) - Every trait implicitly extends 'object', and thus is a reference type. Only traits and reference types can extend traits.
+datatype - A trait is a reference type only if it or one of its ancestor traits is 'object'. Any non-'newtype' type with members can extend traits.
+full - (don't use; not yet completely supported) A trait is a reference type only if it or one of its ancestor traits is 'object'. Any type with members can extend traits.".TrimStart());
+    DafnyOptions.RegisterLegacyUi(GeneralNewtypes, DafnyOptions.ParseBoolean, "Language feature selection", "generalNewtypes", @"
+0 (default) - A newtype can only be based on numeric types or another newtype.
+1 - (requires /typeSystemRefresh:1) A newtype case be based on any non-reference, non-trait, non-arrow, non-ORDINAL type.".TrimStart(), false);
+    DafnyOptions.RegisterLegacyUi(TypeInferenceDebug, DafnyOptions.ParseBoolean, "Language feature selection", "titrace", @"
+0 (default) - Don't print type-inference debug information.
+1 - Print type-inference debug information.".TrimStart(), defaultValue: false);
+    DafnyOptions.RegisterLegacyUi(NewTypeInferenceDebug, DafnyOptions.ParseBoolean, "Language feature selection", "ntitrace", @"
+0 (default) - Don't print debug information for the new type system.
+1 - Print debug information for the new type system.".TrimStart(), defaultValue: false);
+    DafnyOptions.RegisterLegacyUi(UseStandardLibraries, DafnyOptions.ParseBoolean, "Language feature selection", "standardLibraries", @"
+0 (default) - Do not allow Dafny code to depend on the standard libraries included with the Dafny distribution.
+1 - Allow Dafny code to depend on the standard libraries included with the Dafny distribution.
+See https://github.com/dafny-lang/dafny/blob/master/Source/DafnyStandardLibraries/README.md for more information.
+Not compatible with the /unicodeChar:0 option.".TrimStart(), defaultValue: false);
+    DafnyOptions.RegisterLegacyUi(PluginOption, DafnyOptions.ParseStringElement, "Plugins", defaultValue: new List<string>());
+    DafnyOptions.RegisterLegacyUi(Prelude, DafnyOptions.ParseFileInfo, "Input configuration", "dprelude");
+
+    DafnyOptions.RegisterLegacyUi(Libraries, DafnyOptions.ParseFileInfoElement, "Compilation options", defaultValue: new List<FileInfo>());
+    DafnyOptions.RegisterLegacyUi(DeveloperOptionBag.ResolvedPrint, DafnyOptions.ParseString, "Overall reporting and printing", "rprint");
+    DafnyOptions.RegisterLegacyUi(DeveloperOptionBag.PrintOption, DafnyOptions.ParseString, "Overall reporting and printing", "dprint");
+
+    DafnyOptions.RegisterLegacyUi(Snippets.ShowSnippets, DafnyOptions.ParseBoolean, "Overall reporting and printing", "showSnippets", @"
+0 (default) - Don't show source code snippets for Dafny messages.
+1 - Show a source code snippet for each Dafny message.".TrimStart());
+
+    DafnyOptions.RegisterLegacyUi(Printer.PrintMode, ParsePrintMode, "Overall reporting and printing", "printMode", legacyDescription: @"
+Everything (default) - Print everything listed below.
+DllEmbed - print the source that will be included in a compiled dll.
+NoIncludes - disable printing of {:verify false} methods
+    incorporated via the include mechanism, as well as datatypes and
+    fields included from other files.
+NoGhost - disable printing of functions, ghost methods, and proof
+    statements in implementation methods. It also disables anything
+    NoIncludes disables.".TrimStart(),
+      argumentName: "Everything|DllEmbed|NoIncludes|NoGhost",
+      defaultValue: PrintModes.Everything);
+
+    DafnyOptions.RegisterLegacyUi(DefaultFunctionOpacity, DafnyOptions.ParseDefaultFunctionOpacity, "Language feature selection", "defaultFunctionOpacity", null);
+
+    DafnyOptions.RegisterLegacyUi(WarnContradictoryAssumptions, DafnyOptions.ParseImplicitEnable, "Verification options", "warnContradictoryAssumptions");
+    DafnyOptions.RegisterLegacyUi(WarnRedundantAssumptions, DafnyOptions.ParseImplicitEnable, "Verification options", "warnRedundantAssumptions");
+    DafnyOptions.RegisterLegacyUi(SuggestProofRefactoring, DafnyOptions.ParseImplicitEnable, "Verification options", "suggestProofRefactoring");
+
+    void ParsePrintMode(Option<PrintModes> option, Boogie.CommandLineParseState ps, DafnyOptions options) {
+      if (ps.ConfirmArgumentCount(1)) {
+        if (ps.args[ps.i].Equals("Everything")) {
+          options.Set(option, PrintModes.Everything);
+        } else if (ps.args[ps.i].Equals("NoIncludes")) {
+          options.Set(option, PrintModes.NoIncludes);
+        } else if (ps.args[ps.i].Equals("NoGhost")) {
+          options.Set(option, PrintModes.NoGhostOrIncludes);
+        } else if (ps.args[ps.i].Equals("DllEmbed")) {
+          // This is called DllEmbed because it was previously only used inside Dafny-compiled .dll files for C#,
+          // but it is now used by the LibraryBackend when building .doo files as well. 
+          options.Set(option, PrintModes.Serialization);
+        } else {
+          DafnyOptions.InvalidArgumentError(option.Name, ps);
+        }
+      }
+    }
+
+    DafnyOptions.RegisterLegacyUi(AddCompileSuffix, DafnyOptions.ParseBoolean, "Compilation options", "compileSuffix");
+
     QuantifierSyntax = QuantifierSyntax.FromAmong("3", "4");
     DafnyOptions.RegisterLegacyBinding(JsonDiagnostics, (options, value) => {
       if (value) {
@@ -222,53 +520,61 @@ static CommonOptionBag() {
       }
     });
     DafnyOptions.RegisterLegacyBinding(IncludeRuntimeOption, (options, value) => { options.IncludeRuntime = value; });
+    DafnyOptions.RegisterLegacyBinding(InternalIncludeRuntimeOptionForExecution, (options, value) => { options.IncludeRuntime = value; });
+    DafnyOptions.RegisterLegacyBinding(SystemModule, (options, value) => { options.SystemModuleTranslationMode = value; });
     DafnyOptions.RegisterLegacyBinding(UseBaseFileName, (o, f) => o.UseBaseNameForFileName = f);
-    DafnyOptions.RegisterLegacyBinding(UseJavadocLikeDocstringRewriterOption,
-      (options, value) => { options.UseJavadocLikeDocstringRewriter = value; });
     DafnyOptions.RegisterLegacyBinding(WarnShadowing, (options, value) => { options.WarnShadowing = value; });
     DafnyOptions.RegisterLegacyBinding(WarnMissingConstructorParenthesis,
       (options, value) => { options.DisallowConstructorCaseWithoutParentheses = value; });
-    DafnyOptions.RegisterLegacyBinding(WarningAsErrors, (options, value) => { options.WarningsAsErrors = value; });
+    DafnyOptions.RegisterLegacyBinding(AllowWarnings, (options, value) => { options.FailOnWarnings = !value; });
     DafnyOptions.RegisterLegacyBinding(VerifyIncludedFiles,
       (options, value) => { options.VerifyAllModules = value; });
+    DafnyOptions.RegisterLegacyBinding(WarnContradictoryAssumptions, (options, value) => {
+      if (value) { options.TrackVerificationCoverage = true; }
+    });
+    DafnyOptions.RegisterLegacyBinding(WarnRedundantAssumptions, (options, value) => {
+      if (value) { options.TrackVerificationCoverage = true; }
+    });
+    DafnyOptions.RegisterLegacyBinding(SuggestProofRefactoring, (options, value) => {
+      if (value) { options.TrackVerificationCoverage = true; }
+    });
+    DafnyOptions.RegisterLegacyBinding(AnalyzeProofs, (options, value) => {
+      if (value) { options.TrackVerificationCoverage = true; }
+    });
 
     DafnyOptions.RegisterLegacyBinding(Target, (options, value) => { options.CompilerName = value; });
 
     DafnyOptions.RegisterLegacyBinding(QuantifierSyntax, (options, value) => { options.QuantifierSyntax = value; });
 
-    DafnyOptions.RegisterLegacyBinding(Plugin, (options, value) => { options.AdditionalPluginArguments = value; });
-
-    DafnyOptions.RegisterLegacyBinding(Check, (options, value) => {
-      options.FormatCheck = value;
-    });
+    DafnyOptions.RegisterLegacyBinding(PluginOption, (options, value) => { options.AdditionalPluginArguments = value; });
 
     DafnyOptions.RegisterLegacyBinding(StdIn, (options, value) => {
       options.UseStdin = value;
     });
 
-    DafnyOptions.RegisterLegacyBinding(FormatPrint, (options, value) => {
-      options.DafnyPrintFile = value ? "-" : null;
-    });
-
     DafnyOptions.RegisterLegacyBinding(Prelude, (options, value) => {
       options.DafnyPrelude = value?.FullName;
       options.ExpandFilename(options.DafnyPrelude, x => options.DafnyPrelude = x, options.LogPrefix,
         options.FileTimestamp);
     });
+
+    DafnyOptions.RegisterLegacyBinding(BuildFile, (options, value) => { options.DafnyPrintCompiledFile = value?.FullName; });
+
     DafnyOptions.RegisterLegacyBinding(Libraries,
-      (options, value) => { options.LibraryFiles = value.Select(fi => fi.FullName).ToHashSet(); });
+      (options, value) => { options.LibraryFiles = SplitOptionValueIntoFiles(value.Select(fi => fi.FullName)).ToHashSet(); });
     DafnyOptions.RegisterLegacyBinding(Output, (options, value) => { options.DafnyPrintCompiledFile = value?.FullName; });
 
     DafnyOptions.RegisterLegacyBinding(Verbose, (o, v) => o.Verbose = v);
     DafnyOptions.RegisterLegacyBinding(DisableNonLinearArithmetic, (o, v) => o.DisableNLarith = v);
-    DafnyOptions.RegisterLegacyBinding(WarnDeprecation, (o, v) => o.DeprecationNoise = v ? 1 : 0);
+    DafnyOptions.RegisterLegacyBinding(AllowDeprecation, (o, v) => o.DeprecationNoise = v ? 0 : 1);
 
-    DafnyOptions.RegisterLegacyBinding(VerificationLogFormat, (o, v) => o.VerificationLoggerConfigs = v);
     DafnyOptions.RegisterLegacyBinding(SpillTranslation, (o, f) => o.SpillTargetCode = f ? 1U : 0U);
 
     DafnyOptions.RegisterLegacyBinding(EnforceDeterminism, (options, value) => {
       options.ForbidNondeterminism = value;
-      options.DefiniteAssignmentLevel = 4;
+      if (!options.Get(RelaxDefiniteAssignment)) {
+        options.DefiniteAssignmentLevel = 4;
+      }
     });
     RelaxDefiniteAssignment.AddValidator(optionResult => {
       var enforceDeterminismResult = optionResult.FindResultFor(EnforceDeterminism);
@@ -284,56 +590,76 @@ static CommonOptionBag() {
         }
       });
 
-    DooFile.RegisterLibraryChecks(
-      new Dictionary<Option, DooFile.OptionCheck>() {
-        { UnicodeCharacters, DooFile.CheckOptionMatches },
-        { EnforceDeterminism, DooFile.CheckOptionMatches },
-        { RelaxDefiniteAssignment, DooFile.CheckOptionMatches },
-        // Ideally this feature shouldn't affect separate compilation,
-        // because it's automatically disabled on {:extern} signatures.
-        // Realistically though, we don't have enough strong mechanisms to stop
-        // target language code from referencing compiled internal code,
-        // so to be conservative we flag this as not compatible in general.
-        { OptimizeErasableDatatypeWrapper, DooFile.CheckOptionMatches },
-        // Similarly this shouldn't matter if external code ONLY refers to {:extern}s,
-        // but in practice it does.
-        { AddCompileSuffix, DooFile.CheckOptionMatches }
+    DafnyOptions.RegisterLegacyBinding(ExtractCounterexample, (options, value) => {
+      options.ExtractCounterexample = value;
+      options.EnhancedErrorMessages = 1;
+    });
+
+    DafnyOptions.RegisterLegacyBinding(ShowProofObligationExpressions, (options, value) => {
+      options.ShowProofObligationExpressions = value;
+    });
+
+    DafnyOptions.RegisterLegacyBinding(RawPointers, (options, value) => {
+      if (value && options.Get(CommonOptionBag.Target) != "rs") {
+        Console.Error.WriteLine("Error:  --raw-pointers can only be used with --target:rs or -t:rs");
+        System.Environment.Exit(1);
       }
-    );
-    DooFile.RegisterNoChecksNeeded(
-      Check,
-      Libraries,
-      Output,
-      Plugin,
-      Prelude,
-      Target,
-      Verbose,
-      WarnDeprecation,
-      FormatPrint,
-      JsonDiagnostics,
-      QuantifierSyntax,
-      SpillTranslation,
-      StdIn,
-      TestAssumptions,
-      WarnShadowing,
-      ManualLemmaInduction,
-      TypeInferenceDebug,
-      GeneralTraits,
-      TypeSystemRefresh,
-      VerificationLogFormat,
-      VerifyIncludedFiles,
-      WarningAsErrors,
-      DisableNonLinearArithmetic,
-      NewTypeInferenceDebug,
-      UseBaseFileName,
-      WarnMissingConstructorParenthesis,
-      UseJavadocLikeDocstringRewriterOption,
-      IncludeRuntimeOption
-    );
-  }
+    });
 
-  public static readonly Option<bool> FormatPrint = new("--print",
-    @"Print Dafny program to stdout after formatting it instead of altering the files.") {
-  };
+    OptionRegistry.RegisterGlobalOption(UnicodeCharacters, OptionCompatibility.CheckOptionMatches);
+    OptionRegistry.RegisterGlobalOption(EnforceDeterminism, OptionCompatibility.CheckOptionLocalImpliesLibrary);
+    OptionRegistry.RegisterGlobalOption(RelaxDefiniteAssignment, OptionCompatibility.OptionLibraryImpliesLocalError);
+    OptionRegistry.RegisterGlobalOption(AllowAxioms, OptionCompatibility.OptionLibraryImpliesLocalError);
+    OptionRegistry.RegisterGlobalOption(AllowWarnings, OptionCompatibility.OptionLibraryImpliesLocalWarning);
+    OptionRegistry.RegisterGlobalOption(AllowDeprecation, OptionCompatibility.OptionLibraryImpliesLocalWarning);
+    OptionRegistry.RegisterGlobalOption(WarnShadowing, OptionCompatibility.OptionLibraryImpliesLocalWarning);
+    OptionRegistry.RegisterGlobalOption(UseStandardLibraries, OptionCompatibility.OptionLibraryImpliesLocalError);
+    OptionRegistry.RegisterOption(TranslateStandardLibrary, OptionScope.Cli);
+    OptionRegistry.RegisterOption(WarnAsErrors, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ProgressOption, OptionScope.Cli);
+    OptionRegistry.RegisterOption(LogLocation, OptionScope.Cli);
+    OptionRegistry.RegisterOption(LogLevelOption, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ManualTriggerOption, OptionScope.Module);
+    OptionRegistry.RegisterOption(ShowHints, OptionScope.Cli);
+    OptionRegistry.RegisterOption(Libraries, OptionScope.Module);
+    OptionRegistry.RegisterOption(Output, OptionScope.Cli);
+    OptionRegistry.RegisterOption(PluginOption, OptionScope.Cli);
+    OptionRegistry.RegisterOption(Prelude, OptionScope.Cli);
+    OptionRegistry.RegisterOption(Target, OptionScope.Cli);
+    OptionRegistry.RegisterOption(Verbose, OptionScope.Cli);
+    OptionRegistry.RegisterOption(JsonDiagnostics, OptionScope.Cli);
+    OptionRegistry.RegisterOption(QuantifierSyntax, OptionScope.Module);
+    OptionRegistry.RegisterOption(SpillTranslation, OptionScope.Cli);
+    OptionRegistry.RegisterOption(StdIn, OptionScope.Cli);
+    OptionRegistry.RegisterOption(TestAssumptions, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ManualLemmaInduction, OptionScope.Module);
+    OptionRegistry.RegisterOption(TypeInferenceDebug, OptionScope.Cli);
+    OptionRegistry.RegisterOption(GeneralTraits, OptionScope.Cli);
+    OptionRegistry.RegisterOption(GeneralNewtypes, OptionScope.Cli);
+    OptionRegistry.RegisterOption(TypeSystemRefresh, OptionScope.Cli);
+    OptionRegistry.RegisterOption(VerificationLogFormat, OptionScope.Cli);
+    OptionRegistry.RegisterOption(VerifyIncludedFiles, OptionScope.Cli);
+    OptionRegistry.RegisterOption(DisableNonLinearArithmetic, OptionScope.Module);
+    OptionRegistry.RegisterOption(NewTypeInferenceDebug, OptionScope.Cli);
+    OptionRegistry.RegisterOption(UseBaseFileName, OptionScope.Cli);
+    OptionRegistry.RegisterOption(EmitUncompilableCode, OptionScope.Cli);
+    OptionRegistry.RegisterOption(RawPointers, OptionScope.Cli);
+    OptionRegistry.RegisterOption(WarnMissingConstructorParenthesis, OptionScope.Module);
+    OptionRegistry.RegisterOption(IncludeRuntimeOption, OptionScope.Cli);
+    OptionRegistry.RegisterOption(InternalIncludeRuntimeOptionForExecution, OptionScope.Cli);
+    OptionRegistry.RegisterOption(WarnContradictoryAssumptions, OptionScope.Module);
+    OptionRegistry.RegisterOption(WarnRedundantAssumptions, OptionScope.Module);
+    OptionRegistry.RegisterOption(SuggestProofRefactoring, OptionScope.Module);
+    OptionRegistry.RegisterOption(AnalyzeProofs, OptionScope.Module);
+    OptionRegistry.RegisterOption(VerificationCoverageReport, OptionScope.Cli);
+    OptionRegistry.RegisterOption(NoTimeStampForCoverageReport, OptionScope.Cli);
+    OptionRegistry.RegisterOption(DefaultFunctionOpacity, OptionScope.Module);
+    OptionRegistry.RegisterOption(OptimizeErasableDatatypeWrapper, OptionScope.Cli); // TODO needs translation record registration
+    OptionRegistry.RegisterOption(AddCompileSuffix, OptionScope.Cli);  // TODO needs translation record registration
+    OptionRegistry.RegisterOption(SystemModule, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ExecutionCoverageReport, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ExtractCounterexample, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ShowProofObligationExpressions, OptionScope.Cli);
+  }
 }
 
diff --git a/Source/DafnyCore/Options/DafnyCommands.cs b/Source/DafnyCore/Options/DafnyCommands.cs
new file mode 100644
index 00000000000..3f8c281c9ce
--- /dev/null
+++ b/Source/DafnyCore/Options/DafnyCommands.cs
@@ -0,0 +1,120 @@
+using System.Collections.Generic;
+using System.CommandLine;
+using System.IO;
+using System.Linq;
+using DafnyCore;
+using Microsoft.Dafny.Plugins;
+
+namespace Microsoft.Dafny;
+
+public static class DafnyCommands {
+
+  public static Argument<FileInfo> FileArgument { get; }
+  public static Argument<List<FileInfo>> FilesArgument { get; }
+
+  static DafnyCommands() {
+
+    FileArgument = new Argument<FileInfo>("file", "Dafny input file or Dafny project file");
+    FilesArgument = new("file", r => {
+      return r.Tokens.Where(t => !string.IsNullOrEmpty(t.Value)).Select(t => new FileInfo(t.Value)).ToList();
+    }, false, "Dafny input files and/or a Dafny project file");
+  }
+
+  public static readonly IReadOnlyList<Option> VerificationOptions = new Option[] {
+    CommonOptionBag.ProgressOption,
+    CommonOptionBag.RelaxDefiniteAssignment,
+    BoogieOptionBag.VerificationTimeLimit,
+    CommonOptionBag.VerifyIncludedFiles,
+    CommonOptionBag.ManualLemmaInduction,
+    BoogieOptionBag.SolverPath,
+    CommonOptionBag.DisableNonLinearArithmetic,
+    BoogieOptionBag.IsolateAssertions,
+    BoogieOptionBag.BoogieArguments,
+    CommonOptionBag.VerificationLogFormat,
+    BoogieOptionBag.SolverResourceLimit,
+    BoogieOptionBag.SolverOption,
+    BoogieOptionBag.SolverOptionHelp,
+    BoogieOptionBag.SolverPlugin,
+    BoogieOptionBag.SolverLog,
+    CommonOptionBag.JsonDiagnostics,
+    BoogieOptionBag.VerificationErrorLimit,
+    CommonOptionBag.DefaultFunctionOpacity,
+    CommonOptionBag.WarnContradictoryAssumptions,
+    CommonOptionBag.WarnRedundantAssumptions,
+    CommonOptionBag.SuggestProofRefactoring,
+    CommonOptionBag.AnalyzeProofs,
+    CommonOptionBag.NoTimeStampForCoverageReport,
+    CommonOptionBag.VerificationCoverageReport,
+    CommonOptionBag.ExtractCounterexample,
+    CommonOptionBag.ManualTriggerOption,
+    CommonOptionBag.ShowProofObligationExpressions
+  }.ToList();
+
+  public static readonly IReadOnlyList<Option> TranslationOptions = new Option[] {
+    BoogieOptionBag.NoVerify,
+    BoogieOptionBag.HiddenNoVerify,
+    CommonOptionBag.OptimizeErasableDatatypeWrapper,
+    CommonOptionBag.TestAssumptions,
+    DeveloperOptionBag.Bootstrapping,
+    CommonOptionBag.AddCompileSuffix,
+    CommonOptionBag.SystemModule,
+    IExecutableBackend.TranslationRecords,
+    ModuleDefinition.LegacyModuleNames,
+    CommonOptionBag.TranslateStandardLibrary,
+  }.Concat(VerificationOptions).ToList();
+
+  public static readonly IReadOnlyList<Option> ExecutionOptions = new Option[] {
+    CommonOptionBag.Target,
+    CommonOptionBag.SpillTranslation,
+    CommonOptionBag.InternalIncludeRuntimeOptionForExecution,
+    CommonOptionBag.ExecutionCoverageReport
+  }.Concat(TranslationOptions).ToList();
+
+  public static readonly IReadOnlyList<Option> ConsoleOutputOptions = new List<Option>(new Option[] {
+    Snippets.ShowSnippets,
+    DeveloperOptionBag.PrintOption,
+    DeveloperOptionBag.ResolvedPrint,
+    DeveloperOptionBag.SplitPrint,
+    DeveloperOptionBag.PassivePrint,
+    DeveloperOptionBag.BoogiePrint,
+    Printer.PrintMode,
+    CommonOptionBag.AllowWarnings,
+    CommonOptionBag.WarnAsErrors
+  });
+
+  public static readonly IReadOnlyList<Option> ParserOptions = new List<Option>(new Option[] {
+    CommonOptionBag.StdIn,
+    CommonOptionBag.Verbose,
+    BoogieOptionBag.Cores,
+    CommonOptionBag.Libraries,
+    CommonOptionBag.AllowDeprecation,
+    CommonOptionBag.PluginOption,
+    CommonOptionBag.Prelude,
+    Function.FunctionSyntaxOption,
+    CommonOptionBag.QuantifierSyntax,
+    CommonOptionBag.UnicodeCharacters,
+    CommonOptionBag.RawPointers,
+    CommonOptionBag.UseBaseFileName,
+    CommonOptionBag.EmitUncompilableCode,
+    CommonOptionBag.GeneralTraits,
+    CommonOptionBag.GeneralNewtypes,
+    CommonOptionBag.TypeSystemRefresh,
+    CommonOptionBag.TypeInferenceDebug,
+    CommonOptionBag.NewTypeInferenceDebug,
+    Method.ReadsClausesOnMethods,
+    CommonOptionBag.UseStandardLibraries,
+    CommonOptionBag.LogLevelOption,
+    CommonOptionBag.LogLocation
+  });
+
+  public static IReadOnlyList<Option> ResolverOptions = new List<Option>(new Option[] {
+    CommonOptionBag.ShowHints,
+    CommonOptionBag.WarnShadowing,
+    CommonOptionBag.WarnMissingConstructorParenthesis,
+    PrintStmt.TrackPrintEffectsOption,
+    CommonOptionBag.AllowAxioms,
+    CommonOptionBag.EnforceDeterminism,
+    MethodOrFunction.AllowExternalContracts,
+    DafnyProject.FindProjectOption
+  }).Concat(ParserOptions).ToList();
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Options/DafnyProject.cs b/Source/DafnyCore/Options/DafnyProject.cs
index f1ad8784bc3..59643078797 100644
--- a/Source/DafnyCore/Options/DafnyProject.cs
+++ b/Source/DafnyCore/Options/DafnyProject.cs
@@ -1,10 +1,11 @@
+#nullable enable
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.CommandLine;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using DafnyCore.Options;
@@ -12,85 +13,207 @@
 using Tomlyn;
 using Tomlyn.Model;
 
-namespace Microsoft.Dafny; 
+namespace Microsoft.Dafny;
 
 public class DafnyProject : IEquatable<DafnyProject> {
-  public const string FileName = "dfyconfig.toml";
+  public static Option<bool> FindProjectOption = new("--find-project",
+    "Uses the first specified input file as a starting path, from which to search for a project file by traversing up the file tree.");
+
+  static DafnyProject() {
+    OptionRegistry.RegisterOption(FindProjectOption, OptionScope.Cli);
+  }
+
+  public const string Extension = ".toml";
+  public const string FileName = "dfyconfig" + Extension;
 
   public string ProjectName => Uri.ToString();
 
-  [IgnoreDataMember]
+  public BatchErrorReporter Errors { get; init; } = new(DafnyOptions.Default);
+
+  public int? Version { get; }
   public Uri Uri { get; set; }
-  public string[] Includes { get; set; }
-  public string[] Excludes { get; set; }
-  public Dictionary<string, object> Options { get; set; }
-  public bool UsesProjectFile => Path.GetFileName(Uri.LocalPath) == FileName;
-
-  public static async Task<DafnyProject> Open(IFileSystem fileSystem, Uri uri, TextWriter outputWriter, TextWriter errorWriter) {
-    if (Path.GetFileName(uri.LocalPath) != FileName) {
-      await outputWriter.WriteLineAsync($"Warning: only Dafny project files named {FileName} are recognised by the Dafny IDE.");
-    }
+
+  public Uri? Base { get; set; }
+
+  public ISet<string> Includes { get; }
+  public ISet<string> Excludes { get; }
+  public IDictionary<string, object> Options { get; }
+
+  public bool UsesProjectFile => Path.GetFileName(Uri.LocalPath).EndsWith(FileName);
+  public bool ImplicitFromCli;
+
+  public IOrigin StartingToken => ImplicitFromCli ? Token.Cli : new Token {
+    Uri = Uri,
+    line = 1,
+    col = 1
+  };
+
+  public DafnyProject(int? version, Uri uri, Uri? @base, ISet<string> includes, ISet<string>? excludes = null, IDictionary<string, object>? options = null) {
+    Version = version;
+    Uri = uri;
+    Base = @base;
+    Includes = includes;
+    Excludes = excludes ?? new HashSet<string>();
+    Options = options ?? new Dictionary<string, object>();
+  }
+
+  public static async Task<DafnyProject> Open(IFileSystem fileSystem, Uri uri, IOrigin uriOrigin,
+    bool defaultIncludes = true, bool serverNameCheck = true) {
+    DafnyProject result;
     try {
-      using var textReader = fileSystem.ReadFile(uri);
+      var fileSnapshot = fileSystem.ReadFile(uri);
+      using var textReader = fileSnapshot.Reader;
       var text = await textReader.ReadToEndAsync();
-      var model = Toml.ToModel<DafnyProject>(text, null, new TomlModelOptions());
-      model.Uri = uri;
-      return model;
-
+      try {
+        var model = Toml.ToModel<DafnyProjectFile>(text, null, new TomlModelOptions());
+        var directory = Path.GetDirectoryName(uri.LocalPath)!;
+
+        result = new DafnyProject(fileSnapshot.Version, uri, model.Base == null ? null : new Uri(Path.GetFullPath(model.Base, directory!)),
+          model.Includes?.Select(p => Path.GetFullPath(p, directory)).ToHashSet() ?? new HashSet<string>(),
+          model.Excludes?.Select(p => Path.GetFullPath(p, directory)).ToHashSet() ?? new HashSet<string>(),
+          model.Options ?? new Dictionary<string, object>());
+
+        if (result.Base != null) {
+          var baseProject = await Open(fileSystem, result.Base, new Token {
+            Uri = uri,
+            line = 1,
+            col = 1
+          }, false, false);
+          baseProject.Errors.CopyDiagnostics(result.Errors);
+          foreach (var include in baseProject.Includes) {
+            if (!result.Excludes.Contains(include)) {
+              result.Includes.Add(include);
+            }
+          }
+
+          foreach (var include in baseProject.Excludes) {
+            if (!result.Includes.Contains(include)) {
+              result.Excludes.Add(include);
+            }
+          }
+
+          foreach (var option in baseProject.Options) {
+            if (!result.Options.ContainsKey(option.Key)) {
+              result.Options.Add(option.Key, option.Value);
+            }
+          }
+        }
+        if (defaultIncludes && model.Includes == null && !result.Includes.Any()) {
+          result.Includes.Add("**/*.dfy");
+        }
+      } catch (TomlException tomlException) {
+        var propertyNotFoundRegex = new Regex(
+          @$"\((\d+),(\d+)\) : error : The property `(\w+)` was not found on object type {typeof(DafnyProject).FullName}");
+        var propertyNotFoundMatch = propertyNotFoundRegex.Match(tomlException.Message);
+        if (propertyNotFoundMatch.Success) {
+          var line = int.Parse(propertyNotFoundMatch.Groups[1].Value);
+          var column = int.Parse(propertyNotFoundMatch.Groups[2].Value);
+          var property = propertyNotFoundMatch.Groups[3].Value;
+          result = new DafnyProject(fileSnapshot.Version, uri, null, new HashSet<string>(), new HashSet<string>(),
+            new Dictionary<string, object>());
+          var token = new Token(line, column) {
+            Uri = uri
+          };
+          result.Errors.Error(MessageSource.Project, token,
+            $"Dafny project files do not have the property {property}");
+        } else {
+          var genericRegex = new Regex(@$"\((\d+),(\d+)\) : error : (.*)");
+          var genericMatch = genericRegex.Match(tomlException.Message);
+          if (genericMatch.Success) {
+            var line = int.Parse(genericMatch.Groups[1].Value);
+            var column = int.Parse(genericMatch.Groups[2].Value);
+            var message = genericMatch.Groups[3].Value;
+            result = new DafnyProject(fileSnapshot.Version, uri, null, new HashSet<string>(), new HashSet<string>(),
+              new Dictionary<string, object>());
+            var token = new Token(line, column) {
+              Uri = uri
+            };
+            result.Errors.Error(MessageSource.Project, token, message);
+          } else {
+            throw new Exception("Could not parse Tomlyn error");
+          }
+        }
+      }
     } catch (IOException e) {
-      await errorWriter.WriteLineAsync(e.Message);
-      return null;
-    } catch (TomlException tomlException) {
-      await errorWriter.WriteLineAsync($"The Dafny project file {uri.LocalPath} contains the following errors:");
-      var regex = new Regex(
-        @$"\((\d+),(\d+)\) : error : The property `(\w+)` was not found on object type {typeof(DafnyProject).FullName}");
-      var newMessage = regex.Replace(tomlException.Message,
-        match =>
-          $"({match.Groups[1].Value},{match.Groups[2].Value}): the property {match.Groups[3].Value} does not exist.");
-      await errorWriter.WriteLineAsync(newMessage);
-      return null;
+      result = new DafnyProject(null, uri, null, new HashSet<string>(), new HashSet<string>(),
+        new Dictionary<string, object>());
+      result.Errors.Error(MessageSource.Project, uriOrigin, e.Message);
     }
+
+    if (serverNameCheck && Path.GetFileName(uri.LocalPath) != FileName) {
+      result.Errors.Warning(MessageSource.Project, "", result.StartingToken, $"only Dafny project files named {FileName} are recognised by the Dafny IDE.");
+    }
+
+    return result;
   }
 
   public IEnumerable<Uri> GetRootSourceUris(IFileSystem fileSystem) {
     if (!Uri.IsFile) {
       return new[] { Uri };
     }
+    var matcher = GetMatcher(out var searchRoot);
 
-    var matcher = GetMatcher();
-
-    var diskRoot = Path.GetPathRoot(Uri.LocalPath);
-    var result = matcher.Execute(fileSystem.GetDirectoryInfoBase(diskRoot));
-    var files = result.Files.Select(f => Path.Combine(diskRoot, f.Path));
-    return files.Select(file => new Uri(Path.GetFullPath(file)));
+    var result = matcher.Execute(fileSystem.GetDirectoryInfoBase(searchRoot));
+    var files = result.Files.Select(f => Path.Combine(searchRoot, f.Path));
+    return files.OrderBy(file => file).Select(file => new Uri(Path.GetFullPath(file))).
+      Where(uri => !(uri.Equals(Uri) && uri.LocalPath.EndsWith(Extension)));
   }
 
   public bool ContainsSourceFile(Uri uri) {
-    var fileSystemWithSourceFile = new InMemoryDirectoryInfoFromDotNet8(Path.GetPathRoot(uri.LocalPath)!, new[] { uri.LocalPath });
-    return GetMatcher().Execute(fileSystemWithSourceFile).HasMatches;
+    var matcher = GetMatcher(out var searchRoot);
+    var fileSystemWithSourceFile = new InMemoryDirectoryInfoFromDotNet8(searchRoot, new[] { uri.LocalPath });
+    return matcher.Execute(fileSystemWithSourceFile).HasMatches;
   }
 
-  private Matcher GetMatcher() {
+  private Matcher GetMatcher(out string commonRoot) {
     var projectRoot = Path.GetDirectoryName(Uri.LocalPath)!;
-    var root = Path.GetPathRoot(Uri.LocalPath)!;
+    var diskRoot = Path.GetPathRoot(Uri.LocalPath)!;
+
+    var includes = Includes;
+    var excludes = Excludes;
+    var fullPaths = includes.Concat(excludes).Select(p => Path.GetFullPath(p, projectRoot)).ToList();
+    commonRoot = GetCommonParentDirectory(fullPaths) ?? diskRoot;
     var matcher = new Matcher();
-    foreach (var includeGlob in Includes ?? new[] { "**/*.dfy" }) {
-      var fullPath = Path.GetFullPath(includeGlob, projectRoot);
-      matcher.AddInclude(Path.GetRelativePath(root, fullPath));
+    foreach (var includeGlob in includes) {
+      matcher.AddInclude(Path.GetRelativePath(commonRoot, Path.GetFullPath(includeGlob, projectRoot)));
     }
 
-    foreach (var includeGlob in Excludes ?? Enumerable.Empty<string>()) {
-      var fullPath = Path.GetFullPath(includeGlob, projectRoot);
-      matcher.AddExclude(Path.GetRelativePath(root, fullPath));
+    foreach (var excludeGlob in excludes) {
+      matcher.AddExclude(Path.GetRelativePath(commonRoot, Path.GetFullPath(excludeGlob, projectRoot)));
     }
 
     return matcher;
   }
 
-  public void Validate(TextWriter outputWriter, IEnumerable<Option> possibleOptions) {
-    if (Options == null) {
-      return;
+  string? GetCommonParentDirectory(IReadOnlyList<string> strings) {
+    if (!strings.Any()) {
+      return null;
     }
+    string commonPrefix = strings.FirstOrDefault() ?? "";
+
+    foreach (var newString in strings) {
+      var potentialMatchLength = Math.Min(newString.Length, commonPrefix.Length);
+
+      if (potentialMatchLength < commonPrefix.Length) {
+        commonPrefix = commonPrefix.Substring(0, potentialMatchLength);
+      }
+
+      for (var i = 0; i < potentialMatchLength; i++) {
+        if (newString[i] == '*' || newString[i] != commonPrefix[i]) {
+          commonPrefix = commonPrefix.Substring(0, i);
+          break;
+        }
+      }
+    }
+
+    if (!Path.EndsInDirectorySeparator(commonPrefix)) {
+      commonPrefix = Path.GetDirectoryName(commonPrefix)!;
+    }
+
+    return commonPrefix;
+  }
+
+  public void Validate(TextWriter outputWriter, IEnumerable<Option> possibleOptions) {
 
     var possibleNames = possibleOptions.Select(o => o.Name).ToHashSet();
     foreach (var optionThatDoesNotExist in Options.Where(option => !possibleNames.Contains(option.Key))) {
@@ -99,69 +222,53 @@ public void Validate(TextWriter outputWriter, IEnumerable<Option> possibleOption
     }
   }
 
-  public bool TryGetValue(Option option, TextWriter errorWriter, out object value) {
-    if (Options == null) {
-      value = null;
-      return false;
-    }
-
+  public bool TryGetValue(Option option, out object? value) {
     if (!Options.TryGetValue(option.Name, out var tomlValue)) {
       value = null;
       return false;
     }
 
-    return TryGetValueFromToml(errorWriter, Path.GetDirectoryName(Uri.LocalPath), option.Name, option.ValueType, tomlValue, out value);
-  }
-
-  public static bool TryGetValueFromToml(TextWriter errorWriter, string sourceDir, string tomlPath, System.Type type, object tomlValue, out object value) {
-    if (tomlValue == null) {
+    var printTomlValue = PrintTomlOptionToCliValue(Uri, tomlValue, option);
+    var parseResult = option.Parse(printTomlValue.ToArray());
+    if (parseResult.Errors.Any()) {
+      Errors.Error(MessageSource.Project, StartingToken, $"could not parse value '{tomlValue}' for option '{option.Name}' that has type '{option.ValueType.Name}'");
       value = null;
       return false;
     }
+    // By using the dynamic keyword, we can use the generic version of GetValueForOption which does type conversion,
+    // which is sadly not accessible without generics.
+    value = parseResult.GetValueForOption((dynamic)option);
+    return true;
+  }
 
-    if (type.IsAssignableFrom(typeof(List<string>))) {
-      return TryGetListValueFromToml<string>(errorWriter, sourceDir, tomlPath, (TomlArray)tomlValue, out value);
-    }
-    if (type.IsAssignableFrom(typeof(List<FileInfo>))) {
-      return TryGetListValueFromToml<FileInfo>(errorWriter, sourceDir, tomlPath, (TomlArray)tomlValue, out value);
-    }
+  public static IEnumerable<string> PrintTomlOptionToCliValue(Uri uri, object value, Option valueType) {
+    var projectDirectory = Path.GetDirectoryName(uri.LocalPath)!;
+
+    if (value is TomlArray array) {
+      List<string> elements;
+      if (valueType.ValueType.IsAssignableTo(typeof(IEnumerable<FileInfo>))) {
+        elements = array.Select(element => {
+          if (element is string elementString) {
+            return Path.GetFullPath(elementString, projectDirectory);
+          }
+
+          return element + "";
+        }).ToList();
+      } else {
+        elements = array.Select(o => o + "").ToList();
+      }
 
-    if (type == typeof(FileInfo) && tomlValue is string tomlString) {
-      // Need to make sure relative paths are interpreted relative to the source of the value,
-      // not the current directory.
-      var fullPath = sourceDir != null ? Path.GetFullPath(tomlString, sourceDir) : tomlString;
-      value = new FileInfo(fullPath);
-      return true;
+      return elements.SelectMany(e => new[] { valueType.Aliases.First(), e });
     }
 
-    if (!type.IsInstanceOfType(tomlValue)) {
-      if (type == typeof(string)) {
-        value = tomlValue.ToString();
-        return true;
-      }
-      errorWriter.WriteLine(
-        $"Error: property '{tomlPath}' is of type '{tomlValue.GetType()}' but should be of type '{type}'");
-      value = null;
-      return false;
+    if (value is string stringValue && valueType.ValueType == typeof(FileInfo)) {
+      value = Path.GetFullPath(stringValue, projectDirectory);
     }
 
-    value = tomlValue;
-    return true;
+    return new[] { valueType.Aliases.First(), value + "" };
   }
 
-  private static bool TryGetListValueFromToml<T>(TextWriter errorWriter, string sourceDir, string tomlPath, TomlArray tomlValue, out object value) {
-    var success = true;
-    value = tomlValue.Select((e, i) => {
-      if (TryGetValueFromToml(errorWriter, sourceDir, $"{tomlPath}[{i}]", typeof(T), e, out var elementValue)) {
-        return (T)elementValue;
-      }
-      success = false;
-      return default(T);
-    }).ToList();
-    return success;
-  }
-
-  public bool Equals(DafnyProject other) {
+  public bool Equals(DafnyProject? other) {
     if (ReferenceEquals(null, other)) {
       return false;
     }
@@ -170,18 +277,19 @@ public bool Equals(DafnyProject other) {
       return true;
     }
 
-    var orderedOptions = Options?.OrderBy(kv => kv.Key) ?? Enumerable.Empty<KeyValuePair<string, object>>();
-    var otherOrderedOptions = other.Options?.OrderBy(kv => kv.Key) ?? Enumerable.Empty<KeyValuePair<string, object>>();
+    var orderedOptions = Options.OrderBy(kv => kv.Key);
+    var otherOrderedOptions = other.Options.OrderBy(kv => kv.Key);
 
     return Equals(Uri, other.Uri) &&
-           NullableSetEqual(Includes?.ToHashSet(), other.Includes) &&
-           NullableSetEqual(Excludes?.ToHashSet(), other.Excludes) &&
+           NullableSetEqual(Includes, other.Includes) &&
+           NullableSetEqual(Excludes, other.Excludes) &&
            orderedOptions.SequenceEqual(otherOrderedOptions, new LambdaEqualityComparer<KeyValuePair<string, object>>(
              (kv1, kv2) => kv1.Key == kv2.Key && GenericEquals(kv1.Value, kv2.Value),
              kv => kv.GetHashCode()));
   }
 
-  public static bool GenericEquals(object first, object second) {
+  [SuppressMessage("ReSharper", "NotDisposedResource")]
+  public static bool GenericEquals(object? first, object? second) {
     if (first == null && second == null) {
       return true;
     }
@@ -214,7 +322,7 @@ public static bool GenericEquals(object first, object second) {
     return first.Equals(second);
   }
 
-  private static bool NullableSetEqual(ISet<string> first, IReadOnlyCollection<string> second) {
+  private static bool NullableSetEqual(ISet<string>? first, ICollection<string>? second) {
     if (first == null && second == null) {
       return true;
     }
@@ -225,20 +333,19 @@ private static bool NullableSetEqual(ISet<string> first, IReadOnlyCollection<str
     return first.Count == second.Count && second.All(first.Contains);
   }
 
-  private static bool NullableSequenceEqual(IEnumerable<string> first, IEnumerable<string> second) {
-    return first?.SequenceEqual(second) ?? (second == null);
+  public DafnyProject(DafnyProject original) {
+    Uri = original.Uri;
+    Includes = original.Includes.ToHashSet();
+    Excludes = original.Excludes.ToHashSet();
+    Options = original.Options.ToDictionary(kv => kv.Key, kv => kv.Value);
+    Errors = original.Errors;
   }
 
   public DafnyProject Clone() {
-    return new DafnyProject() {
-      Uri = Uri,
-      Includes = Includes?.ToArray(),
-      Excludes = Excludes?.ToArray(),
-      Options = Options?.ToDictionary(kv => kv.Key, kv => kv.Value)
-    };
+    return new DafnyProject(this);
   }
 
-  public override bool Equals(object obj) {
+  public override bool Equals(object? obj) {
     if (ReferenceEquals(null, obj)) {
       return false;
     }
@@ -254,7 +361,15 @@ public override bool Equals(object obj) {
     return Equals((DafnyProject)obj);
   }
 
+  [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
   public override int GetHashCode() {
     return HashCode.Combine(Uri, Includes, Excludes, Options);
   }
+}
+
+class DafnyProjectFile {
+  public string? Base { get; set; }
+  public string[]? Includes { get; set; }
+  public string[]? Excludes { get; set; }
+  public Dictionary<string, object>? Options { get; set; }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Options/DeveloperOptionBag.cs b/Source/DafnyCore/Options/DeveloperOptionBag.cs
index c437602e76a..bff35feaa0b 100644
--- a/Source/DafnyCore/Options/DeveloperOptionBag.cs
+++ b/Source/DafnyCore/Options/DeveloperOptionBag.cs
@@ -6,6 +6,22 @@ namespace Microsoft.Dafny;
 
 public class DeveloperOptionBag {
 
+  public static readonly Option<string> SplitPrint = new("--sprint",
+    @"
+Print Boogie splits translated from Dafny
+(use - as <file> to print to console)".TrimStart()) {
+    IsHidden = true,
+    ArgumentHelpName = "file",
+  };
+
+  public static readonly Option<string> PassivePrint = new("--pprint",
+    @"
+Print passified Boogie program translated from Dafny
+(use - as <file> to print to console)".TrimStart()) {
+    IsHidden = true,
+    ArgumentHelpName = "file",
+  };
+
   public static readonly Option<string> BoogiePrint = new("--bprint",
   @"
 Print Boogie program translated from Dafny
@@ -14,7 +30,7 @@ Print Boogie program translated from Dafny
     ArgumentHelpName = "file",
   };
 
-  public static readonly Option<string> Print = new("--print", @"
+  public static readonly Option<string> PrintOption = new("--print", @"
 Print Dafny program after parsing it.
 (Use - as <file> to print to console.)".TrimStart()) {
     IsHidden = true,
@@ -36,30 +52,41 @@ Print Dafny program after resolving it.
   };
 
   static DeveloperOptionBag() {
-
     DafnyOptions.RegisterLegacyBinding(ResolvedPrint, (options, value) => {
       options.DafnyPrintResolvedFile = value;
       options.ExpandFilename(options.DafnyPrintResolvedFile, x => options.DafnyPrintResolvedFile = x, options.LogPrefix,
         options.FileTimestamp);
     });
 
-    DafnyOptions.RegisterLegacyBinding(Print, (options, value) => {
+    DafnyOptions.RegisterLegacyBinding(PrintOption, (options, value) => {
       options.DafnyPrintFile = value;
       options.ExpandFilename(options.DafnyPrintFile, x => options.DafnyPrintFile = x, options.LogPrefix,
         options.FileTimestamp);
     });
 
+    DafnyOptions.RegisterLegacyBinding(PassivePrint, (options, f) => {
+      options.PrintPassiveFile = f;
+      options.ExpandFilename(options.PrintPassiveFile, x => options.PrintPassiveFile = x, options.LogPrefix,
+        options.FileTimestamp);
+    });
+
     DafnyOptions.RegisterLegacyBinding(BoogiePrint, (options, f) => {
       options.PrintFile = f;
       options.ExpandFilename(options.PrintFile, x => options.PrintFile = x, options.LogPrefix,
         options.FileTimestamp);
     });
 
-    DooFile.RegisterNoChecksNeeded(
-      BoogiePrint,
-      Print,
-      ResolvedPrint,
-      Bootstrapping
-    );
+    DafnyOptions.RegisterLegacyBinding(SplitPrint, (options, f) => {
+      options.PrintSplitFile = f;
+      options.ExpandFilename(options.PrintSplitFile, x => options.PrintSplitFile = x, options.LogPrefix,
+        options.FileTimestamp);
+    });
+
+    OptionRegistry.RegisterOption(PassivePrint, OptionScope.Cli);
+    OptionRegistry.RegisterOption(BoogiePrint, OptionScope.Cli);
+    OptionRegistry.RegisterOption(SplitPrint, OptionScope.Cli);
+    OptionRegistry.RegisterOption(PrintOption, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ResolvedPrint, OptionScope.Cli);
+    OptionRegistry.RegisterOption(Bootstrapping, OptionScope.Cli);
   }
 }
diff --git a/Source/DafnyCore/Options/ICommandSpec.cs b/Source/DafnyCore/Options/ICommandSpec.cs
deleted file mode 100644
index 097bb23bdbc..00000000000
--- a/Source/DafnyCore/Options/ICommandSpec.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
-using System.IO;
-using System.Linq;
-
-namespace Microsoft.Dafny;
-
-public interface ICommandSpec {
-
-  public static Argument<FileInfo> FileArgument { get; }
-
-  static ICommandSpec() {
-    FilesArgument = new("file", r => {
-      return r.Tokens.Where(t => !string.IsNullOrEmpty(t.Value)).Select(t => new FileInfo(t.Value)).ToList();
-    }, true, "Dafny input files and/or a Dafny project file");
-  }
-
-  public static Argument<List<FileInfo>> FilesArgument { get; }
-
-  public static IEnumerable<Option> FormatOptions => new Option[] {
-    CommonOptionBag.Check,
-    CommonOptionBag.FormatPrint,
-  }.Concat(ParserOptions);
-
-  public static IReadOnlyList<Option> VerificationOptions = new Option[] {
-    CommonOptionBag.RelaxDefiniteAssignment,
-    BoogieOptionBag.VerificationTimeLimit,
-    CommonOptionBag.VerifyIncludedFiles,
-    CommonOptionBag.ManualLemmaInduction,
-    BoogieOptionBag.SolverPath,
-    CommonOptionBag.DisableNonLinearArithmetic,
-    BoogieOptionBag.IsolateAssertions,
-    BoogieOptionBag.BoogieArguments,
-    CommonOptionBag.VerificationLogFormat,
-    BoogieOptionBag.SolverResourceLimit,
-    BoogieOptionBag.SolverOption,
-    BoogieOptionBag.SolverOptionHelp,
-    BoogieOptionBag.SolverPlugin,
-    BoogieOptionBag.SolverLog,
-    CommonOptionBag.JsonDiagnostics,
-    BoogieOptionBag.VerificationErrorLimit,
-  }.ToList();
-
-  public static IReadOnlyList<Option> TranslationOptions = new Option[] {
-    BoogieOptionBag.NoVerify,
-    CommonOptionBag.EnforceDeterminism,
-    CommonOptionBag.OptimizeErasableDatatypeWrapper,
-    CommonOptionBag.TestAssumptions,
-    DeveloperOptionBag.Bootstrapping,
-    CommonOptionBag.AddCompileSuffix,
-  }.Concat(VerificationOptions).ToList();
-
-  public static IReadOnlyList<Option> ExecutionOptions = new Option[] {
-    CommonOptionBag.Target,
-    CommonOptionBag.SpillTranslation
-  }.Concat(TranslationOptions).ToList();
-
-  public static IReadOnlyList<Option> ConsoleOutputOptions = new List<Option>(new Option[] {
-    DafnyConsolePrinter.ShowSnippets,
-    DeveloperOptionBag.Print,
-    DeveloperOptionBag.ResolvedPrint,
-    DeveloperOptionBag.BoogiePrint,
-    Printer.PrintMode,
-    CommonOptionBag.WarningAsErrors,
-  });
-
-  public static IReadOnlyList<Option> ParserOptions = new List<Option>(new Option[] {
-    CommonOptionBag.StdIn,
-    CommonOptionBag.Verbose,
-    BoogieOptionBag.Cores,
-    CommonOptionBag.Libraries,
-    CommonOptionBag.WarnDeprecation,
-    CommonOptionBag.Plugin,
-    CommonOptionBag.Prelude,
-    Function.FunctionSyntaxOption,
-    CommonOptionBag.QuantifierSyntax,
-    CommonOptionBag.UnicodeCharacters,
-    CommonOptionBag.UseBaseFileName,
-    CommonOptionBag.GeneralTraits,
-    CommonOptionBag.TypeSystemRefresh,
-    CommonOptionBag.TypeInferenceDebug,
-    CommonOptionBag.NewTypeInferenceDebug,
-  });
-
-  public static IReadOnlyList<Option> ResolverOptions = new List<Option>(new Option[] {
-    CommonOptionBag.WarnShadowing,
-    CommonOptionBag.WarnMissingConstructorParenthesis,
-    PrintStmt.TrackPrintEffectsOption,
-  }).Concat(ParserOptions).ToList();
-
-  IEnumerable<Option> Options { get; }
-
-  Command Create();
-
-  void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context);
-}
diff --git a/Source/DafnyCore/Options/OptionCompatibility.cs b/Source/DafnyCore/Options/OptionCompatibility.cs
new file mode 100644
index 00000000000..97874f178cb
--- /dev/null
+++ b/Source/DafnyCore/Options/OptionCompatibility.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.CommandLine;
+using Microsoft.Dafny;
+using System.Linq;
+
+namespace DafnyCore.Options;
+
+public class OptionCompatibility {
+
+  public static bool CheckOptionMatches(ErrorReporter reporter, IOrigin origin, string prefix, Option option, object localValue, object libraryValue) {
+    if (OptionValuesEqual(option, localValue, libraryValue)) {
+      return true;
+    }
+
+    reporter.Error(MessageSource.Project, origin,
+      $"{prefix}: --{option.Name} is set locally to {OptionValueToString(option, localValue)}, " +
+      $"but the library was built with {OptionValueToString(option, libraryValue)}");
+    return false;
+  }
+
+  private static string OptionValueToString(Option option, object value) {
+    if (option.ValueType == typeof(IEnumerable<string>)) {
+      var values = (IEnumerable<string>)value;
+      return $"[{string.Join(',', values)}]";
+    }
+
+    if (value == null) {
+      return "a version of Dafny that does not have this option";
+    }
+    return value.ToString();
+  }
+
+  private static bool OptionValuesEqual(Option option, object first, object second) {
+    if (first.Equals(second)) {
+      return true;
+    }
+
+    if (option.ValueType == typeof(IEnumerable<string>)) {
+      return ((IEnumerable<string>)first).SequenceEqual((IEnumerable<string>)second);
+    }
+
+    return false;
+  }
+
+  public static bool OptionValuesImplied(object first, object second) {
+    try {
+      return !(bool)first || (bool)second;
+    } catch (NullReferenceException) {
+      throw new Exception("Comparing options of Doo files created by different Dafny builds. You are probably using a locally built Dafny that has the same version as a different built.");
+    }
+  }
+
+  public static bool OptionLibraryImpliesLocalError(ErrorReporter reporter, IOrigin origin, string prefix, Option option, object localValue, object libraryValue) {
+    return CheckOptionLibraryImpliesLocal(reporter, origin, prefix, option, ErrorLevel.Error,
+      localValue, libraryValue);
+  }
+
+  public static bool OptionLibraryImpliesLocalWarning(ErrorReporter reporter, IOrigin origin, string prefix, Option option, object localValue, object libraryValue) {
+    return CheckOptionLibraryImpliesLocal(reporter, origin, prefix, option, ErrorLevel.Warning,
+      localValue, libraryValue);
+  }
+
+  /// Checks that the library option ==> the local option.
+  /// E.g. --no-verify: the only incompatibility is if it's on in the library but not locally.
+  /// Generally the right check for options that weaken guarantees.
+  private static bool CheckOptionLibraryImpliesLocal(ErrorReporter reporter, IOrigin origin, string prefix, Option option, ErrorLevel severity, object localValue, object libraryValue) {
+    if (OptionValuesImplied(libraryValue, localValue)) {
+      return true;
+    }
+
+    reporter.Message(MessageSource.Project, severity, "", origin,
+      $"{prefix}: --{option.Name} is set locally to {OptionValueToString(option, localValue)}, but the library was built with {OptionValueToString(option, libraryValue)}");
+    return false;
+  }
+
+  /// Checks that the local option ==> the library option.
+  /// E.g. --track-print-effects: the only incompatibility is if it's on locally but not in the library.
+  /// Generally the right check for options that strengthen guarantees.
+  public static bool CheckOptionLocalImpliesLibrary(ErrorReporter reporter, IOrigin origin, string prefix, Option option, object localValue, object libraryValue) {
+    if (OptionValuesImplied(localValue, libraryValue)) {
+      return true;
+    }
+    reporter.Error(MessageSource.Project, origin, LocalImpliesLibraryMessage(prefix, option, localValue, libraryValue));
+    return false;
+  }
+
+  public static string LocalImpliesLibraryMessage(string prefix, Option option, object localValue, object libraryValue) {
+    return $"{prefix}: --{option.Name} is set locally to {OptionValueToString(option, localValue)}, but the library was built with {OptionValueToString(option, libraryValue)}";
+  }
+
+
+  // Placeholder no-op check, used for options that need to be recorded but don't require any compatibility check.
+  public static bool NoOpOptionCheck(ErrorReporter reporter, IOrigin origin, string prefix, Option option, object localValue, object libraryValue) {
+    return true;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Options/OptionRegistry.cs b/Source/DafnyCore/Options/OptionRegistry.cs
new file mode 100644
index 00000000000..b2b9596a1fc
--- /dev/null
+++ b/Source/DafnyCore/Options/OptionRegistry.cs
@@ -0,0 +1,62 @@
+#nullable enable
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.Linq;
+using JetBrains.Annotations;
+using Microsoft.Dafny;
+
+namespace Microsoft.Dafny;
+
+public class OptionRegistry {
+
+  /// <summary>
+  /// Check that the .doo file format is aware of all options,
+  /// and therefore which have to be saved to safely support separate verification/compilation.
+  /// </summary>
+  public static void CheckOptionsAreKnown(IEnumerable<Option> allOptions) {
+    var unsupportedOptions = allOptions.ToHashSet()
+      .Where(o =>
+        !OptionScopes.ContainsKey(o))
+      .ToList();
+    if (unsupportedOptions.Any()) {
+      throw new Exception($"Internal error - unsupported options registered: {{\n{string.Join(",\n", unsupportedOptions)}\n}}");
+    }
+  }
+
+  // Partitioning of all options into subsets that must be recorded in a .doo file
+  // to guard against unsafe usage.
+  // Note that legacy CLI options are not as cleanly enumerated and therefore
+  // more difficult to completely categorize, which is the main reason the LibraryBackend
+  // is restricted to only the new CLI.
+  private static readonly ConcurrentDictionary<Option, GlobalOptionCheck> GlobalOptionChecks = new();
+  private static readonly ConcurrentDictionary<Option, OptionScope> OptionScopes = new();
+
+  public static IEnumerable<Option> GlobalOptions => GlobalOptionChecks.Keys.OrderBy(o => o.Name);
+  public static IEnumerable<Option> TranslationOptions =>
+    OptionScopes.Where(kv => kv.Value == OptionScope.Translation).Select(kv => kv.Key).OrderBy(o => o.Name);
+  public static IEnumerable<Option> ModuleOptions => OptionScopes.Where(kv => kv.Value == OptionScope.Module).
+    Select(kv => kv.Key).OrderBy(o => o.Name);
+
+  public static GlobalOptionCheck? GlobalCheck(Option option) {
+    return GlobalOptionChecks.GetValueOrDefault(option);
+  }
+
+  public static void RegisterOption(Option option, OptionScope scope) {
+    if (scope == OptionScope.Global) {
+      throw new ArgumentException("Please call RegisterGlobalOption instead");
+    }
+
+    OptionScopes[option] = scope;
+  }
+  public static void RegisterGlobalOption(Option option, GlobalOptionCheck check) {
+    OptionScopes[option] = OptionScope.Global;
+    GlobalOptionChecks[option] = check;
+  }
+}
+
+public enum OptionScope { Cli, Global, Module, Translation }
+
+public delegate bool GlobalOptionCheck(ErrorReporter reporter, IOrigin origin, string prefix, Option option, object localValue, object libraryValue);
\ No newline at end of file
diff --git a/Source/DafnyCore/Options/ProjectFileOpener.cs b/Source/DafnyCore/Options/ProjectFileOpener.cs
new file mode 100644
index 00000000000..1dd4998e4e1
--- /dev/null
+++ b/Source/DafnyCore/Options/ProjectFileOpener.cs
@@ -0,0 +1,48 @@
+#nullable enable
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.Dafny;
+
+public class ProjectFileOpener {
+  private readonly IFileSystem fileSystem;
+  private readonly IOrigin origin;
+
+  public ProjectFileOpener(IFileSystem fileSystem, IOrigin origin) {
+    this.fileSystem = fileSystem;
+    this.origin = origin;
+  }
+
+  public async Task<DafnyProject?> TryFindProject(Uri uri) {
+    return uri.LocalPath.EndsWith(DafnyProject.FileName)
+      ? await DafnyProject.Open(fileSystem, uri, origin)
+      : await FindProjectFile(uri);
+  }
+
+  private async Task<DafnyProject?> FindProjectFile(Uri sourceUri) {
+    DafnyProject? projectFile = null;
+
+    var folder = Path.GetDirectoryName(sourceUri.LocalPath);
+    while (!string.IsNullOrEmpty(folder) && projectFile == null) {
+      projectFile = await OpenProjectInFolder(folder);
+
+      if (projectFile != null && projectFile.Uri != sourceUri &&
+          !(projectFile.Errors.HasErrors || projectFile.ContainsSourceFile(sourceUri))) {
+        projectFile = null;
+      }
+
+      folder = Path.GetDirectoryName(folder);
+    }
+
+    return projectFile;
+  }
+
+  protected virtual Task<DafnyProject?> OpenProjectInFolder(string folderPath) {
+    var configFileUri = new Uri(Path.Combine(folderPath, DafnyProject.FileName));
+    if (!fileSystem.Exists(configFileUri)) {
+      return Task.FromResult<DafnyProject?>(null);
+    }
+
+    return DafnyProject.Open(fileSystem, configFileUri, origin)!;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Options/TranslationRecord.cs b/Source/DafnyCore/Options/TranslationRecord.cs
new file mode 100644
index 00000000000..fb8e734a57e
--- /dev/null
+++ b/Source/DafnyCore/Options/TranslationRecord.cs
@@ -0,0 +1,155 @@
+using System.Collections.Generic;
+using System.CommandLine;
+using System.IO;
+using System.Linq;
+using DafnyCore.Generic;
+using Microsoft.Dafny;
+using Tomlyn;
+
+namespace DafnyCore.Options;
+
+// Model class for the .dtr file format for Dafny Translation Records.
+// Contains the validation logic for safely consuming pre-translated libraries as well.
+// See https://dafny.org/dafny/DafnyRef/DafnyRef#sec-dtr-files.
+public class TranslationRecord {
+
+  public const string CurrentFileFormatVersion = "1.0";
+  public string FileFormatVersion { get; set; }
+
+  public string DafnyVersion { get; set; }
+
+  public Dictionary<string, Dictionary<string, object>> OptionsByModule { get; set; }
+
+  public TranslationRecord(Program program) {
+    FileFormatVersion = CurrentFileFormatVersion;
+    DafnyVersion = program.Options.VersionNumber;
+
+    OptionsByModule = new();
+
+    foreach (var module in program.CompileModules) {
+      if (module is DefaultModuleDefinition || !module.ShouldCompile(program.Compilation)) {
+        continue;
+      }
+
+      // This is primarily here to exclude prefix modules
+      // (e.g. something like A.B that only appears in a module A.B.C { ... } declaration)
+      // since those can appear in multiple separately-compiled projects. 
+      if (ModuleEmptyForCompilation(module)) {
+        continue;
+      }
+
+      Dictionary<string, object> recordedOptions = new();
+      OptionsByModule[module.FullDafnyName] = recordedOptions;
+
+      foreach (var option in OptionRegistry.TranslationOptions) {
+        var optionValue = program.Options.Get((dynamic)option);
+        recordedOptions.Add(option.Name, optionValue);
+      }
+    }
+  }
+
+  public static bool ModuleEmptyForCompilation(ModuleDefinition module) {
+    return !(module.DefaultClass?.Members.Any() ?? false)   // DefaultClass is null for _System
+           && module.TopLevelDecls.All(d => d is DefaultClassDecl or ModuleDecl);
+  }
+
+  public static TranslationRecord Empty(Program program) {
+    return new TranslationRecord() {
+      FileFormatVersion = CurrentFileFormatVersion,
+      DafnyVersion = program.Options.VersionNumber,
+      OptionsByModule = new()
+    };
+  }
+
+  public TranslationRecord() {
+    // Only for TOML deserialization!
+  }
+
+  public static void ReadValidateAndMerge(Program program, string filePath, IOrigin origin) {
+    var pathForErrors = program.Options.GetPrintPath(filePath);
+    try {
+      using TextReader reader = new StreamReader(filePath);
+      var record = Read(reader);
+      if (record.Validate(program, pathForErrors, origin)) {
+        program.Compilation.AlreadyTranslatedRecord.Merge(program.Reporter, record, pathForErrors, origin);
+      }
+    } catch (FileNotFoundException) {
+      program.Reporter.Error(MessageSource.Project, origin, $"file {pathForErrors} not found");
+    } catch (TomlException) {
+      program.Reporter.Error(MessageSource.Project, origin, $"malformed dtr file {pathForErrors}");
+    }
+  }
+
+  private static TranslationRecord Read(TextReader reader) {
+    return Toml.ToModel<TranslationRecord>(reader.ReadToEnd(), null, new TomlModelOptions());
+  }
+
+  public void Write(TextWriter writer) {
+    writer.Write(Toml.FromModel(this, new TomlModelOptions()).Replace("\r\n", "\n"));
+  }
+
+  public void Write(ConcreteSyntaxTree writer) {
+    using var textWriter = new StringWriter();
+    Write(textWriter);
+    writer.Write(textWriter.ToString());
+  }
+
+  private bool Validate(Program dafnyProgram, string filePath, IOrigin origin) {
+    var messagePrefix = $"cannot load {filePath}";
+    if (!dafnyProgram.Options.UsingNewCli) {
+      dafnyProgram.Reporter.Error(MessageSource.Project, origin,
+        $"{messagePrefix}: .dtr files cannot be used with the legacy CLI");
+      return false;
+    }
+
+    if (dafnyProgram.Options.VersionNumber != DafnyVersion) {
+      dafnyProgram.Reporter.Error(MessageSource.Project, origin,
+        $"{messagePrefix}: it was built with Dafny {DafnyVersion}, which cannot be used by Dafny {dafnyProgram.Options.VersionNumber}");
+      return false;
+    }
+
+    // Modules should be either previously compiled or to be compiled now, not both
+    foreach (var module in dafnyProgram.CompileModules) {
+      if (module.ShouldCompile(dafnyProgram.Compilation) && OptionsByModule.ContainsKey(module.FullDafnyName)) {
+        dafnyProgram.Reporter.Error(MessageSource.Project, origin,
+          $"{messagePrefix}: it contains translation metadata for the module {module.FullDafnyName}, which is in scope for translation in the current program");
+      }
+    }
+
+    return true;
+  }
+
+  public object Get(ErrorReporter reporter, string moduleName, Option option) {
+    if (OptionsByModule.TryGetValue(moduleName, out var moduleOptions)) {
+      if (moduleOptions.TryGetValue(option.Name, out var manifestValue)) {
+        if (TomlUtil.TryGetValueFromToml(reporter, Token.NoToken, null,
+              option.Name, option.ValueType, manifestValue, out var libraryValue)) {
+          return libraryValue;
+        }
+      }
+    }
+
+    return null;
+  }
+
+  private void Merge(ErrorReporter reporter, TranslationRecord other, string filePath, IOrigin origin) {
+    // Assume both this and other have been Validate()-d already.
+
+    var duplicateModules = OptionsByModule
+      .Union(other.OptionsByModule)
+      .GroupBy(p => p.Key)
+      .Where(g => g.Count() > 1)
+      .Select(g => g.Key)
+      .ToList();
+    if (duplicateModules.Any()) {
+      var messagePrefix = $"cannot load {filePath}";
+      foreach (var duplicateModule in duplicateModules) {
+        reporter.Error(MessageSource.Project, origin,
+          $"{messagePrefix}: module {duplicateModule} already appears in another translation record");
+      }
+      return;
+    }
+
+    OptionsByModule = OptionsByModule.Union(other.OptionsByModule).ToDictionary(p => p.Key, p => p.Value);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Language/BoogieExtensions.cs b/Source/DafnyCore/Pipeline/BoogieExtensions.cs
similarity index 78%
rename from Source/DafnyLanguageServer/Language/BoogieExtensions.cs
rename to Source/DafnyCore/Pipeline/BoogieExtensions.cs
index 40ec1c2aad6..1aab9ad2933 100644
--- a/Source/DafnyLanguageServer/Language/BoogieExtensions.cs
+++ b/Source/DafnyCore/Pipeline/BoogieExtensions.cs
@@ -3,7 +3,7 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
-namespace Microsoft.Dafny.LanguageServer.Language {
+namespace Microsoft.Dafny {
   /// <summary>
   /// Extension methods for the use with boogie data.
   /// </summary>
@@ -30,7 +30,7 @@ public static Range ToLspRange(this DafnyRange range) {
     /// <param name="startToken">The token to get the range of.</param>
     /// <param name="endToken">An optional other token to get the end of the range of.</param>
     /// <returns>The LSP range of the token.</returns>
-    public static Range ToLspRange(this RangeToken range) {
+    public static Range ToLspRange(this IOrigin range) {
       return range.ToDafnyRange().ToLspRange();
     }
 
@@ -40,7 +40,7 @@ public static Range ToLspRange(this RangeToken range) {
     /// <param name="startToken">The token to get the range of.</param>
     /// <param name="endToken">An optional other token to get the end of the range of.</param>
     /// <returns>The LSP range of the token.</returns>
-    public static Range GetLspRange(this IToken startToken, IToken endToken) {
+    public static Range GetLspRange(this IOrigin startToken, IOrigin endToken) {
       return GetLspRangeGeneric(startToken, endToken);
     }
 
@@ -54,38 +54,36 @@ private static Range GetLspRangeGeneric(this Boogie.IToken startToken, Boogie.IT
     /// <summary>
     /// Gets the LSP range of the specified token.
     /// </summary>
-    /// <param name="startToken">The token to get the range of.</param>
+    /// <param name="token">The token to get the range of.</param>
     /// <param name="endToken">An optional other token to get the end of the range of.</param>
     /// <returns>The LSP range of the token.</returns>
-    public static Range GetLspRange(this Boogie.IToken startToken, bool nameRange = false) {
-      if (startToken is BoogieRangeToken boogieRangeToken) {
-        return nameRange
-          ? (boogieRangeToken.NameToken ?? boogieRangeToken.StartToken).GetLspRange()
-          : GetLspRangeGeneric(boogieRangeToken.StartToken, boogieRangeToken.EndToken);
+    public static Range GetLspRange(this Boogie.IToken token, bool nameRange = false) {
+      if (token is NestedOrigin nestedToken) {
+        return GetLspRange(nestedToken.Outer, nameRange);
       }
-      var endToken = startToken;
-      return GetLspRangeGeneric(startToken, endToken);
+      var dafnyToken = BoogieGenerator.ToDafnyToken(!nameRange, token);
+      return GetLspRangeGeneric(dafnyToken.StartToken, dafnyToken.EndToken);
     }
 
     public static Position GetLspPosition(this DafnyPosition position) {
       return new Position(position.Line, position.Column);
     }
 
-    public static Location GetLocation(this IToken token) {
+    public static Location GetLocation(this IOrigin token) {
       return new Location {
         Uri = DocumentUri.From(token.Uri),
         Range = token.GetLspRange(true)
       };
     }
 
-    public static Location GetLocation(this RangeToken token) {
+    public static Location GetLocation(this SourceOrigin origin) {
       return new Location() {
-        Uri = DocumentUri.From(token.Uri),
-        Range = token.GetLspRange()
+        Uri = DocumentUri.From(origin.Uri),
+        Range = origin.GetLspRange()
       };
     }
 
-    public static FilePosition GetFilePosition(this IToken token, bool end = false) {
+    public static FilePosition GetFilePosition(this IOrigin token, bool end = false) {
       return new FilePosition(token.Uri, GetLspPosition(token, end));
     }
 
diff --git a/Source/DafnyCore/Pipeline/Compilation.cs b/Source/DafnyCore/Pipeline/Compilation.cs
new file mode 100644
index 00000000000..0ecaadeae78
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/Compilation.cs
@@ -0,0 +1,725 @@
+#nullable enable
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.CommandLine.Help;
+using System.IO;
+using System.Linq;
+using System.Reactive;
+using System.Reactive.Subjects;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Boogie;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using VC;
+using VCGeneration;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
+
+namespace Microsoft.Dafny;
+
+public delegate Compilation CreateCompilation(
+  ExecutionEngine boogieEngine,
+  CompilationInput compilation);
+
+public record FilePosition(Uri Uri, Position Position);
+/// <summary>
+/// The compilation of a single version of a program
+/// After calling Start, the document will be parsed and resolved.
+///
+/// To verify a symbol, VerifySymbol must be called.
+/// </summary>
+public class Compilation : IDisposable {
+
+  private readonly ILogger logger;
+  private readonly IFileSystem fileSystem;
+  private readonly ITextDocumentLoader documentLoader;
+  private readonly IProgramVerifier verifier;
+
+  private readonly TaskCompletionSource started = new();
+  private readonly CancellationTokenSource cancellationSource;
+
+  public bool Started => started.Task.IsCompleted;
+
+  /// <summary>
+  /// FilePosition is required because the default module lives in multiple files
+  /// </summary>
+  private readonly LazyConcurrentDictionary<ModuleDefinition,
+    Task<IReadOnlyDictionary<FilePosition, IReadOnlyList<IVerificationTask>>>> translatedModules = new();
+
+  private readonly ConcurrentDictionary<ICanVerify, Unit> verifyingOrVerifiedSymbols = new();
+  private readonly LazyConcurrentDictionary<ICanVerify, IReadOnlyList<IVerificationTask>> tasksPerVerifiable = new();
+
+  public DafnyOptions Options => Input.Options;
+  public CompilationInput Input { get; }
+  public DafnyProject Project => Input.Project;
+  private readonly ExecutionEngine boogieEngine;
+
+  private readonly Subject<ICompilationEvent> updates = new();
+  public IObservable<ICompilationEvent> Updates => updates;
+
+  private Program? programAfterParsing;
+  private Program? transformedProgram;
+  private readonly IDisposable staticDiagnosticsSubscription;
+
+  private bool disposed;
+  private readonly ObservableErrorReporter errorReporter;
+
+  public Task<Program?> ParsedProgram { get; }
+  public Task<ResolutionResult?> Resolution { get; }
+
+  public ErrorReporter Reporter => errorReporter;
+
+  public Task<IReadOnlyList<DafnyFile>> RootFiles { get; set; }
+  public bool HasErrors { get; private set; }
+  public bool ShouldProcessSolverOptions { get; set; } = true;
+
+  public Compilation(
+    ILogger<Compilation> logger,
+    IFileSystem fileSystem,
+    ITextDocumentLoader documentLoader,
+    IProgramVerifier verifier,
+    ExecutionEngine boogieEngine,
+    CompilationInput input
+    ) {
+    Input = input;
+    this.boogieEngine = boogieEngine;
+
+    this.documentLoader = documentLoader;
+    this.logger = logger;
+    this.fileSystem = fileSystem;
+    this.verifier = verifier;
+
+    errorReporter = new ObservableErrorReporter(Options, Project.Uri);
+    errorReporter.Updates.Subscribe(updates);
+    staticDiagnosticsSubscription = errorReporter.Updates.Subscribe(newDiagnostic => {
+      if (newDiagnostic.Diagnostic.Level == ErrorLevel.Error) {
+        HasErrors = true;
+      }
+    });
+
+    cancellationSource = new();
+    cancellationSource.Token.Register(() => started.TrySetCanceled(cancellationSource.Token));
+
+    verificationTickets.Enqueue(Unit.Default);
+
+    RootFiles = DetermineRootFiles();
+    ParsedProgram = ParseAsync();
+    Resolution = ResolveAsync();
+
+    _ = LogExceptions();
+  }
+
+  private async Task LogExceptions() {
+    try {
+      await RootFiles;
+      await ParsedProgram;
+      await Resolution;
+    } catch (OperationCanceledException) {
+    } catch (Exception e) {
+      HandleException(e);
+    }
+  }
+
+  private void HandleException(Exception e) {
+    logger.LogCritical(e, "internal exception");
+    updates.OnNext(new InternalCompilationException(MessageSource.Project, e));
+  }
+
+  public void Start() {
+    if (Started) {
+      throw new InvalidOperationException("Compilation was already started");
+    }
+
+    Project.Errors.CopyDiagnostics(errorReporter);
+
+    started.TrySetResult();
+  }
+
+  private async Task<IReadOnlyList<DafnyFile>> DetermineRootFiles() {
+    await started.Task;
+
+    var result = new List<DafnyFile>();
+
+    var handledInput = new HashSet<Uri>();
+    foreach (var uri in Options.CliRootSourceUris) {
+      if (!handledInput.Add(uri)) {
+        continue;
+      }
+      var shortPath = Path.GetRelativePath(Directory.GetCurrentDirectory(), uri.LocalPath);
+      await foreach (var file in DafnyFile.CreateAndValidate(fileSystem, errorReporter, Options, uri, Token.Cli,
+                       false,
+                       $"command-line argument '{shortPath}' is neither a recognized option nor a Dafny input file (.dfy, .doo, or .toml).")) {
+        result.Add(file);
+      }
+    }
+
+    var includedFiles = new List<DafnyFile>();
+    foreach (var uri in Input.Project.GetRootSourceUris(fileSystem)) {
+      if (!handledInput.Add(uri)) {
+        continue;
+      }
+      await foreach (var file in DafnyFile.CreateAndValidate(fileSystem, errorReporter, Options, uri,
+                       Project.StartingToken)) {
+        result.Add(file);
+        includedFiles.Add(file);
+      }
+    }
+
+    if (Options.UseStdin) {
+      result.Add(DafnyFile.HandleStandardInput(Options, Token.Cli));
+    }
+
+    if (!HasErrors && !result.Any()) {
+      errorReporter.Error(MessageSource.Project, GeneratorErrors.ErrorId.None, Project.StartingToken,
+        "no Dafny source files were specified as input");
+    }
+
+    if (Options.Get(CommonOptionBag.UseStandardLibraries)) {
+      if (Options.Backend is LibraryBackend) {
+        Options.Set(CommonOptionBag.TranslateStandardLibrary, false);
+      }
+
+      // For now the standard libraries are still translated from scratch.
+      // This creates issues with separate compilation and will be addressed in https://github.com/dafny-lang/dafny/pull/4877
+      var asLibrary = !Options.Get(CommonOptionBag.TranslateStandardLibrary);
+
+      if (Options.CompilerName is null or "cs" or "java" or "go" or "py" or "js") {
+        var targetName = Options.CompilerName ?? "notarget";
+        var stdlibDooUri = DafnyMain.StandardLibrariesDooUriTarget[targetName];
+        await foreach (var targetSpecificFile in DafnyFile.CreateAndValidate(OnDiskFileSystem.Instance, errorReporter,
+                         Options, stdlibDooUri, Project.StartingToken, asLibrary)) {
+          result.Add(targetSpecificFile);
+        }
+      }
+
+      await foreach (var file in DafnyFile.CreateAndValidate(fileSystem, errorReporter, Options,
+                       DafnyMain.StandardLibrariesDooUri, Project.StartingToken, asLibrary)) {
+        result.Add(file);
+      }
+    }
+
+    var libraryPaths = CommonOptionBag.SplitOptionValueIntoFiles(Options.Get(CommonOptionBag.Libraries).Select(f => f.FullName));
+    foreach (var library in libraryPaths) {
+      await foreach (var file in DafnyFile.CreateAndValidate(fileSystem, errorReporter, Options, new Uri(library), Project.StartingToken, true)) {
+        result.Add(file);
+      }
+    }
+
+    if (Project.UsesProjectFile) {
+      var projectDirectory = Path.GetDirectoryName(Project.Uri.LocalPath)!;
+      var includedRootsMessage = string.Join("\n", includedFiles.Select(dafnyFile => Path.GetRelativePath(projectDirectory, dafnyFile.Uri.LocalPath)));
+      if (includedRootsMessage == "") {
+        includedRootsMessage = "none";
+      }
+      errorReporter.Info(MessageSource.Project, Project.StartingToken, "Files included by project are:" + Environment.NewLine + includedRootsMessage);
+    }
+
+    // Allow specifying the same file twice on the CLI
+    var distinctResults = result.DistinctBy(d => d.Uri).ToList();
+
+    updates.OnNext(new DeterminedRootFiles(Project, distinctResults));
+    return distinctResults;
+  }
+
+  private async Task<Program?> ParseAsync() {
+    await RootFiles;
+    if (HasErrors) {
+      return null;
+    }
+
+    var parseResult = await documentLoader.ParseAsync(this, cancellationSource.Token);
+    transformedProgram = parseResult.Program;
+    transformedProgram.HasParseErrors = HasErrors;
+
+    var cloner = new Cloner(true);
+    programAfterParsing = new Program(cloner, transformedProgram);
+
+    updates.OnNext(new FinishedParsing(parseResult with { Program = programAfterParsing }));
+    logger.LogDebug(
+      $"Passed parsedCompilation to documentUpdates.OnNext, resolving ParsedCompilation task for version {Input.Version}.");
+    return programAfterParsing;
+  }
+
+  private async Task<ResolutionResult?> ResolveAsync() {
+    await ParsedProgram;
+    if (transformedProgram == null) {
+      return null;
+    }
+    var resolution = await documentLoader.ResolveAsync(this, transformedProgram!, cancellationSource.Token);
+    if (resolution == null) {
+      return null;
+    }
+
+    updates.OnNext(new FinishedResolution(resolution));
+    staticDiagnosticsSubscription.Dispose();
+    logger.LogDebug($"Passed resolvedCompilation to documentUpdates.OnNext, resolving ResolvedCompilation task for version {Input.Version}.");
+    return resolution;
+  }
+
+  public static string GetTaskName(IVerificationTask task) {
+    var prefix = task.ScopeId + task.Split.SplitIndex;
+
+    // Refining declarations get the token of what they're refining, so to distinguish them we need to
+    // add the refining module name to the prefix.
+    if (task.ScopeToken is RefinementOrigin refinementToken) {
+      prefix += "." + refinementToken.InheritingModule.Name;
+    }
+
+    return prefix;
+  }
+
+  // When verifying a symbol, a ticket must be acquired before the SMT part of verification may start.
+  private readonly AsyncQueue<Unit> verificationTickets = new();
+  public async Task<bool> VerifyLocation(FilePosition verifiableLocation, Func<IVerificationTask, bool>? taskFilter = null,
+    int? randomSeed = null,
+    bool onlyPrepareVerificationForGutterTests = false) {
+    cancellationSource.Token.ThrowIfCancellationRequested();
+
+    var resolution = await Resolution;
+    if (resolution == null || resolution.HasErrors) {
+      return false;
+    }
+
+    var canVerify = resolution.ResolvedProgram.FindNode(verifiableLocation.Uri, verifiableLocation.Position.ToDafnyPosition(),
+      node => {
+        if (node is not ICanVerify) {
+          return false;
+        }
+        // Sometimes traversing the AST can return different versions of a single source AST node,
+        // for example in the case of a LeastLemma, which is later also represented as a PrefixLemma.
+        // This check ensures that we consistently use the same version of an AST node. 
+        return resolution.CanVerifies!.Contains(node);
+      }) as ICanVerify;
+
+    if (canVerify == null) {
+      return false;
+    }
+
+    return await VerifyCanVerify(canVerify, taskFilter ?? (_ => true), randomSeed, onlyPrepareVerificationForGutterTests);
+  }
+
+  private async Task<bool> VerifyCanVerify(ICanVerify canVerify, Func<IVerificationTask, bool> taskFilter,
+    int? randomSeed = 0,
+    bool onlyPrepareVerificationForGutterTests = false) {
+
+    var resolution = await Resolution;
+    if (resolution == null) {
+      return false;
+    }
+
+    var containingModule = canVerify.ContainingModule;
+    if (!containingModule.ShouldVerify(resolution.ResolvedProgram.Compilation)) {
+      return false;
+    }
+
+    if (!onlyPrepareVerificationForGutterTests && (randomSeed == null && !verifyingOrVerifiedSymbols.TryAdd(canVerify, Unit.Default))) {
+      return false;
+    }
+
+    updates.OnNext(new ScheduledVerification(canVerify));
+
+    if (onlyPrepareVerificationForGutterTests) {
+      await VerifyUnverifiedSymbol(onlyPrepareVerificationForGutterTests, canVerify, resolution, taskFilter, randomSeed);
+      return true;
+    }
+
+    _ = VerifyUnverifiedSymbol(onlyPrepareVerificationForGutterTests, canVerify, resolution, taskFilter, randomSeed);
+    return true;
+  }
+
+  private async Task VerifyUnverifiedSymbol(bool onlyPrepareVerificationForGutterTests, ICanVerify canVerify,
+    ResolutionResult resolution, Func<IVerificationTask, bool> taskFilter, int? randomSeed) {
+    try {
+
+      var ticket = verificationTickets.Dequeue();
+      var containingModule = canVerify.ContainingModule;
+
+      IReadOnlyDictionary<FilePosition, IReadOnlyList<IVerificationTask>> tasksForModule;
+      try {
+        tasksForModule = await translatedModules.GetOrAdd(containingModule, async () => {
+          var result = await verifier.GetVerificationTasksAsync(boogieEngine, resolution, containingModule,
+            cancellationSource.Token);
+
+          return result.GroupBy(t => ((IOrigin)t.ScopeToken).GetFilePosition()).ToDictionary(
+            g => g.Key,
+            g => (IReadOnlyList<IVerificationTask>)g.ToList());
+        });
+      } catch (OperationCanceledException) {
+        throw;
+      } catch (Exception e) {
+        HandleException(e);
+        throw;
+      }
+
+      // For updated to be reliable, tasksPerVerifiable must be Lazy
+      var updated = false;
+      var tasks = tasksPerVerifiable.GetOrAdd(canVerify, () => {
+        var result =
+          tasksForModule.GetValueOrDefault(canVerify.NavigationToken.GetFilePosition()) ??
+          new List<IVerificationTask>(0);
+
+        updated = true;
+        return result;
+      });
+      if (updated || randomSeed != null) {
+        updates.OnNext(new CanVerifyPartsIdentified(canVerify, tasks));
+      }
+
+      // When multiple calls to VerifyUnverifiedSymbol are made, the order in which they pass this await matches the call order.
+      await ticket;
+
+      if (!onlyPrepareVerificationForGutterTests) {
+        var groups = GroupOverlappingRanges(tasks).
+          OrderBy(g => g.Group.StartToken);
+        foreach (var tokenTasks in groups) {
+          var functions = tokenTasks.Tasks.SelectMany(t => t.Split.HiddenFunctions.Select(f => f.tok).
+            OfType<FromDafnyNode>().Select(n => n.Node).
+            OfType<Function>()).Distinct().OrderBy(f => f.Origin.Center);
+          var hiddenFunctions = string.Join(", ", functions.Select(f => f.FullDafnyName));
+          if (!string.IsNullOrEmpty(hiddenFunctions)) {
+            Reporter.Info(MessageSource.Verifier, tokenTasks.Group, $"hidden functions: {hiddenFunctions}");
+          }
+        }
+
+        foreach (var task in tasks.Where(taskFilter)) {
+
+          var seededTask = randomSeed == null ? task : task.FromSeed(randomSeed.Value);
+          VerifyTask(canVerify, seededTask);
+        }
+      }
+
+    }
+    finally {
+      verificationTickets.Enqueue(Unit.Default);
+    }
+  }
+
+
+  public static IEnumerable<(IOrigin Group, List<IVerificationTask> Tasks)> GroupOverlappingRanges(IReadOnlyList<IVerificationTask> ranges) {
+    if (!ranges.Any()) {
+      return Enumerable.Empty<(IOrigin Group, List<IVerificationTask> Tasks)>();
+    }
+    var sortedTasks = ranges.OrderBy(r =>
+      BoogieGenerator.ToDafnyToken(true, r.Token).StartToken).ToList();
+    var groups = new List<(IOrigin Group, List<IVerificationTask> Tasks)>();
+    var currentGroup = new List<IVerificationTask> { sortedTasks[0] };
+    var currentGroupRange = BoogieGenerator.ToDafnyToken(true, currentGroup[0].Token);
+
+    for (int i = 1; i < sortedTasks.Count; i++) {
+      var currentTask = sortedTasks[i];
+      var currentTaskRange = BoogieGenerator.ToDafnyToken(true, currentTask.Token);
+      bool overlapsWithGroup = currentGroupRange.Intersects(currentTaskRange);
+
+      if (overlapsWithGroup) {
+        if (currentTaskRange.EndToken.pos > currentGroupRange.EndToken.pos) {
+          currentGroupRange = new SourceOrigin(currentGroupRange.StartToken, currentTaskRange.EndToken, currentGroupRange.Center);
+        }
+        currentGroup.Add(currentTask);
+      } else {
+        groups.Add((currentGroupRange, currentGroup));
+        currentGroup = new List<IVerificationTask> { currentTask };
+        currentGroupRange = currentTaskRange;
+      }
+    }
+
+    groups.Add((currentGroupRange, currentGroup)); // Add the last group
+    return groups;
+  }
+
+  private void VerifyTask(ICanVerify canVerify, IVerificationTask task) {
+    var statusUpdates = task.TryRun();
+    if (statusUpdates == null) {
+      if (task.CacheStatus is Completed completedCache) {
+        HandleStatusUpdate(canVerify, task, completedCache);
+      }
+
+      return;
+    }
+
+    statusUpdates.Subscribe(
+      update => {
+        try {
+          HandleStatusUpdate(canVerify, task, update);
+        } catch (Exception e) {
+          logger.LogError(e, "Caught exception in statusUpdates OnNext.");
+        }
+      },
+      e => {
+        updates.OnNext(new BoogieException(canVerify, task, e));
+        if (e is not OperationCanceledException) {
+          logger.LogError(e, $"Caught error in statusUpdates observable.");
+        }
+      }
+    );
+  }
+
+  public async Task Cancel(FilePosition filePosition) {
+    var resolution = await Resolution;
+    if (resolution == null) {
+      return;
+    }
+
+    var canVerify = resolution.ResolvedProgram.FindNode<ICanVerify>(filePosition.Uri, filePosition.Position.ToDafnyPosition());
+    if (canVerify != null) {
+      var implementations = tasksPerVerifiable.TryGetValue(canVerify, out var implementationsPerName)
+        ? implementationsPerName! : Enumerable.Empty<IVerificationTask>();
+      foreach (var view in implementations) {
+        view.Cancel();
+      }
+      verifyingOrVerifiedSymbols.TryRemove(canVerify, out _);
+    }
+  }
+
+  private void HandleStatusUpdate(ICanVerify canVerify, IVerificationTask verificationTask, IVerificationStatus boogieStatus) {
+    var tokenString = BoogieGenerator.ToDafnyToken(true, verificationTask.Split.Token).TokenToString(Options);
+    logger.LogDebug($"Received Boogie status {boogieStatus} for {tokenString}, version {Input.Version}");
+
+    updates.OnNext(new BoogieUpdate(transformedProgram!.ProofDependencyManager, canVerify,
+      verificationTask,
+      boogieStatus));
+  }
+
+  public void CancelPendingUpdates() {
+    cancellationSource.Cancel();
+    foreach (var (_, tasks) in tasksPerVerifiable) {
+      foreach (var task in tasks) {
+        task.Cancel();
+      }
+    }
+  }
+
+  public async Task<TextEditContainer?> GetTextEditToFormatCode(Uri uri) {
+    var program = await ParsedProgram;
+    if (program == null) {
+      return null;
+    }
+
+    if (program.HasParseErrors) {
+      return null;
+    }
+
+    var firstToken = program.GetFirstTokenForUri(uri);
+    if (firstToken == null) {
+      return null;
+    }
+
+    // Make sure that we capture the legacy include tokens
+    while (firstToken.Prev is { line: >= 1, Filepath: var filePath } && filePath == firstToken.Filepath) {
+      firstToken = firstToken.Prev;
+    }
+    var result = Formatting.__default.ReindentProgramFromFirstToken(firstToken,
+      IndentationFormatter.ForProgram(program, firstToken.Uri));
+
+    var lastToken = firstToken;
+    while (lastToken.Next != null) {
+      lastToken = lastToken.Next;
+    }
+    // TODO: end position doesn't take into account trailing trivia: https://github.com/dafny-lang/dafny/issues/3415
+    return new TextEditContainer(new TextEdit[] {
+      new() {NewText = result, Range = new Range(new Position(0,0), lastToken.GetLspPosition())}
+    });
+
+  }
+
+  public void Dispose() {
+    if (disposed) {
+      return;
+    }
+
+    disposed = true;
+    CancelPendingUpdates();
+  }
+
+  public static List<DafnyDiagnostic> GetDiagnosticsFromResult(DafnyOptions options, Uri uri, ICanVerify canVerify,
+    IVerificationTask task, VerificationRunResult result) {
+    var errorReporter = new ObservableErrorReporter(options, uri);
+    List<DafnyDiagnostic> diagnostics = new();
+    errorReporter.Updates.Subscribe(d => diagnostics.Add(d.Diagnostic));
+
+    ReportDiagnosticsInResult(options, canVerify.NavigationToken.val, BoogieGenerator.ToDafnyToken(true, task.Token),
+      task.Split.Implementation.GetTimeLimit(options), result, errorReporter);
+
+    return diagnostics.OrderBy(d => d.Token.GetLspPosition()).ToList();
+  }
+
+  public static void ReportDiagnosticsInResult(DafnyOptions options, string name, IOrigin token,
+    uint timeLimit,
+    VerificationRunResult result,
+    ErrorReporter errorReporter) {
+    var outcome = GetOutcome(result.Outcome);
+    result.CounterExamples.Sort(new CounterexampleComparer());
+    foreach (var counterExample in result.CounterExamples) {
+      var errorInformation = counterExample.CreateErrorInformation(outcome, options.ForceBplErrors);
+      if (options.ShowProofObligationExpressions) {
+        AddAssertedExprToCounterExampleErrorInfo(options, counterExample, errorInformation);
+      }
+      var dafnyCounterExampleModel = options.ExtractCounterexample ? new DafnyModel(counterExample.Model, options) : null;
+      errorReporter.ReportBoogieError(errorInformation, dafnyCounterExampleModel);
+    }
+
+    var outcomeError = ReportOutcome(options, outcome, name, token, timeLimit, result.CounterExamples);
+    if (outcomeError != null) {
+      errorReporter.ReportBoogieError(outcomeError, null, false);
+    }
+  }
+
+  private static ErrorInformation? ReportOutcome(DafnyOptions options,
+      VcOutcome vcOutcome, string name,
+      IToken token, uint timeLimit, List<Counterexample> errors) {
+    ErrorInformation? errorInfo = null;
+
+    switch (vcOutcome) {
+      case VcOutcome.Correct:
+        break;
+      case VcOutcome.Errors:
+      case VcOutcome.TimedOut: {
+          if (vcOutcome != VcOutcome.TimedOut &&
+              (!errors.Any(e => e.IsAuxiliaryCexForDiagnosingTimeouts))) {
+            break;
+          }
+
+          string msg = string.Format("Verification of '{1}' timed out after {0} seconds. (the limit can be increased using --verification-time-limit)", timeLimit, name);
+          errorInfo = ErrorInformation.Create(token, msg);
+
+          //  Report timed out assertions as auxiliary info.
+          var comparer = new CounterexampleComparer();
+          var timedOutAssertions = errors.Where(e => e.IsAuxiliaryCexForDiagnosingTimeouts).Distinct(comparer)
+            .OrderBy(x => x, comparer).ToList();
+          if (0 < timedOutAssertions.Count) {
+            errorInfo!.Msg += $" with {timedOutAssertions.Count} check(s) that timed out individually";
+          }
+
+          foreach (Counterexample error in timedOutAssertions) {
+            IToken tok;
+            string auxMsg = null!;
+            switch (error) {
+              case CallCounterexample callCounterexample:
+                tok = callCounterexample.FailingCall.tok;
+                auxMsg = callCounterexample.FailingCall.Description.FailureDescription;
+                break;
+              case ReturnCounterexample returnCounterexample:
+                tok = returnCounterexample.FailingReturn.tok;
+                auxMsg = returnCounterexample.FailingReturn.Description.FailureDescription;
+                break;
+              case AssertCounterexample assertError: {
+                  tok = assertError.FailingAssert.tok;
+                  if (!(assertError.FailingAssert.ErrorMessage == null ||
+                        ((ExecutionEngineOptions)options).ForceBplErrors)) {
+                    auxMsg = assertError.FailingAssert.ErrorMessage;
+                  }
+
+                  auxMsg ??= assertError.FailingAssert.Description.FailureDescription;
+                  break;
+                }
+              default: throw new Exception();
+            }
+
+            errorInfo.AddAuxInfo(tok, auxMsg, "Unverified check due to timeout");
+          }
+
+          break;
+        }
+      case VcOutcome.OutOfResource: {
+          string msg = "Verification out of resource (" + name + ")";
+          errorInfo = ErrorInformation.Create(token, msg);
+        }
+        break;
+      case VcOutcome.OutOfMemory: {
+          string msg = "Verification out of memory (" + name + ")";
+          errorInfo = ErrorInformation.Create(token, msg);
+        }
+        break;
+      case VcOutcome.SolverException: {
+          string msg = "Verification encountered solver exception (" + name + ")";
+          errorInfo = ErrorInformation.Create(token, msg);
+        }
+        break;
+
+      case VcOutcome.Inconclusive: {
+          string msg = "Verification inconclusive (" + name + ")";
+          errorInfo = ErrorInformation.Create(token, msg);
+        }
+        break;
+    }
+
+    return errorInfo;
+  }
+
+  private static void AddAssertedExprToCounterExampleErrorInfo(
+    DafnyOptions options, Counterexample counterExample, ErrorInformation errorInformation) {
+    Boogie.ProofObligationDescription? boogieProofObligationDesc = null;
+    switch (errorInformation.Kind) {
+      case ErrorKind.Assertion:
+        boogieProofObligationDesc = ((AssertCounterexample)counterExample).FailingAssert.Description;
+        break;
+      case ErrorKind.Precondition:
+        boogieProofObligationDesc = ((CallCounterexample)counterExample).FailingCall.Description;
+        break;
+      case ErrorKind.Postcondition:
+        boogieProofObligationDesc = ((ReturnCounterexample)counterExample).FailingReturn.Description;
+        break;
+      case ErrorKind.InvariantEntry:
+      case ErrorKind.InvariantMaintainance:
+        AssertCmd failingAssert = ((AssertCounterexample)counterExample).FailingAssert;
+        if (failingAssert is LoopInitAssertCmd loopInitAssertCmd) {
+          boogieProofObligationDesc = loopInitAssertCmd.originalAssert.Description;
+        } else if (failingAssert is LoopInvMaintainedAssertCmd maintainedAssertCmd) {
+          boogieProofObligationDesc = maintainedAssertCmd.originalAssert.Description;
+        }
+        break;
+      default:
+        throw new ArgumentOutOfRangeException($"Unexpected ErrorKind: {errorInformation.Kind}");
+    }
+
+    if (boogieProofObligationDesc is ProofObligationDescription dafnyProofObligationDesc) {
+      var expr = dafnyProofObligationDesc.GetAssertedExpr(options);
+      string? msg = null;
+      if (expr != null) {
+        msg = expr.ToString();
+      }
+
+      var extra = dafnyProofObligationDesc.GetExtraExplanation();
+      if (extra != null) {
+        msg = (msg ?? "") + extra;
+      }
+
+      if (msg != null) {
+        errorInformation.AddAuxInfo(errorInformation.Tok, msg,
+          ErrorReporterExtensions.AssertedExprCategory);
+      }
+    }
+  }
+
+  public static VcOutcome GetOutcome(SolverOutcome outcome) {
+    switch (outcome) {
+      case SolverOutcome.Valid:
+        return VcOutcome.Correct;
+      case SolverOutcome.Invalid:
+        return VcOutcome.Errors;
+      case SolverOutcome.TimeOut:
+        return VcOutcome.TimedOut;
+      case SolverOutcome.OutOfMemory:
+        return VcOutcome.OutOfMemory;
+      case SolverOutcome.OutOfResource:
+        return VcOutcome.OutOfResource;
+      case SolverOutcome.Undetermined:
+        return VcOutcome.Inconclusive;
+      case SolverOutcome.Bounded:
+        return VcOutcome.Correct;
+      default:
+        throw new ArgumentOutOfRangeException(nameof(outcome), outcome, null);
+    }
+  }
+
+  public void ClearModuleCache(ModuleDefinition moduleDefinition) {
+    translatedModules.Remove(moduleDefinition);
+  }
+
+  public void ClearCanVerifyCache(ICanVerify canVerify) {
+    tasksPerVerifiable.Remove(canVerify);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/CompilationInput.cs b/Source/DafnyCore/Pipeline/CompilationInput.cs
new file mode 100644
index 00000000000..dbe56b565b4
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/CompilationInput.cs
@@ -0,0 +1,19 @@
+using System;
+using OmniSharp.Extensions.LanguageServer.Protocol;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Dafny {
+  /// <summary>
+  /// Contains all the inputs of a Compilation
+  /// </summary>
+  public record CompilationInput(DafnyOptions Options, int Version, DafnyProject Project) {
+
+    public override string ToString() {
+      return $"URI: {Uri}, Version: {Version}";
+    }
+    public DocumentUri Uri => Project.Uri;
+  }
+
+  public record BufferLine(int LineNumber, int StartIndex, int EndIndex);
+}
diff --git a/Source/DafnyCore/Pipeline/DiagnosticUtil.cs b/Source/DafnyCore/Pipeline/DiagnosticUtil.cs
new file mode 100644
index 00000000000..55958908a02
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/DiagnosticUtil.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace Microsoft.Dafny;
+
+public static class DiagnosticUtil {
+  public static Diagnostic ToLspDiagnostic(this DafnyDiagnostic dafnyDiagnostic) {
+    return new Diagnostic {
+      Code = dafnyDiagnostic.ErrorId,
+      Severity = ToSeverity(dafnyDiagnostic.Level),
+      Message = dafnyDiagnostic.Message,
+      Range = dafnyDiagnostic.Token.GetLspRange(),
+      Source = dafnyDiagnostic.Source.ToString(),
+      RelatedInformation = dafnyDiagnostic.RelatedInformation.Select(r =>
+        new DiagnosticRelatedInformation {
+          Location = CreateLocation(r.Token),
+          Message = r.Message
+        }).ToList(),
+      CodeDescription = dafnyDiagnostic.ErrorId == null
+        ? null
+        : new CodeDescription { Href = new Uri("https://dafny.org/dafny/HowToFAQ/Errors#" + dafnyDiagnostic.ErrorId) },
+    };
+  }
+
+  public static Location CreateLocation(IOrigin token) {
+    var uri = DocumentUri.Parse(token.Uri.AbsoluteUri);
+    return new Location {
+      Range = token.GetLspRange(),
+      // During parsing, we store absolute paths to make reconstructing the Uri easier
+      // https://github.com/dafny-lang/dafny/blob/06b498ee73c74660c61042bb752207df13930376/Source/DafnyLanguageServer/Language/DafnyLangParser.cs#L59 
+      Uri = uri
+    };
+  }
+
+  private static DiagnosticSeverity ToSeverity(ErrorLevel level) {
+    return level switch {
+      ErrorLevel.Error => DiagnosticSeverity.Error,
+      ErrorLevel.Warning => DiagnosticSeverity.Warning,
+      ErrorLevel.Info => DiagnosticSeverity.Hint,
+      _ => throw new ArgumentException($"unknown error level {level}", nameof(level))
+    };
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/Events/BoogieException.cs b/Source/DafnyCore/Pipeline/Events/BoogieException.cs
new file mode 100644
index 00000000000..d84cc8f5423
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/Events/BoogieException.cs
@@ -0,0 +1,7 @@
+#nullable enable
+using System;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+public record BoogieException(ICanVerify CanVerify, IVerificationTask Task, Exception Exception) : ICompilationEvent;
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/Events/BoogieUpdate.cs b/Source/DafnyCore/Pipeline/Events/BoogieUpdate.cs
new file mode 100644
index 00000000000..03bc69f149f
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/Events/BoogieUpdate.cs
@@ -0,0 +1,9 @@
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+public record BoogieUpdate(ProofDependencyManager ProofDependencyManager,
+  ICanVerify CanVerify, IVerificationTask VerificationTask, IVerificationStatus BoogieStatus)
+  : ICompilationEvent {
+
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/Events/CanVerifyPartsIdentified.cs b/Source/DafnyCore/Pipeline/Events/CanVerifyPartsIdentified.cs
new file mode 100644
index 00000000000..fca31082e28
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/Events/CanVerifyPartsIdentified.cs
@@ -0,0 +1,7 @@
+using System.Collections.Generic;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+public record CanVerifyPartsIdentified(ICanVerify CanVerify, IReadOnlyList<IVerificationTask> Parts) : ICompilationEvent {
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/Events/DeterminedRootFiles.cs b/Source/DafnyCore/Pipeline/Events/DeterminedRootFiles.cs
new file mode 100644
index 00000000000..dac13cdc24c
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/Events/DeterminedRootFiles.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace Microsoft.Dafny;
+
+public record FileDiagnostic(Uri Uri, Diagnostic Diagnostic);
+
+public record DeterminedRootFiles(DafnyProject Project, IReadOnlyList<DafnyFile> Roots) : ICompilationEvent {
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/Events/FinishedParsing.cs b/Source/DafnyCore/Pipeline/Events/FinishedParsing.cs
new file mode 100644
index 00000000000..7837a11792d
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/Events/FinishedParsing.cs
@@ -0,0 +1,7 @@
+using System;
+using System.Collections.Immutable;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace Microsoft.Dafny;
+
+public record FinishedParsing(ProgramParseResult ParseResult) : ICompilationEvent;
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/Events/FinishedResolution.cs b/Source/DafnyCore/Pipeline/Events/FinishedResolution.cs
new file mode 100644
index 00000000000..69758e86dbf
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/Events/FinishedResolution.cs
@@ -0,0 +1,9 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace Microsoft.Dafny;
+
+public record FinishedResolution(ResolutionResult Result) : ICompilationEvent;
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/Events/InternalCompilationException.cs b/Source/DafnyCore/Pipeline/Events/InternalCompilationException.cs
new file mode 100644
index 00000000000..7edeb8b7078
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/Events/InternalCompilationException.cs
@@ -0,0 +1,7 @@
+
+using System;
+
+namespace Microsoft.Dafny;
+
+public record InternalCompilationException(MessageSource Source, Exception Exception) : ICompilationEvent {
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/Events/NewDiagnostic.cs b/Source/DafnyCore/Pipeline/Events/NewDiagnostic.cs
new file mode 100644
index 00000000000..485590672a8
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/Events/NewDiagnostic.cs
@@ -0,0 +1,6 @@
+using System;
+
+namespace Microsoft.Dafny;
+
+public record NewDiagnostic(Uri Uri, DafnyDiagnostic Diagnostic) : ICompilationEvent {
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/Events/ScheduledVerification.cs b/Source/DafnyCore/Pipeline/Events/ScheduledVerification.cs
new file mode 100644
index 00000000000..31ebd792804
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/Events/ScheduledVerification.cs
@@ -0,0 +1,4 @@
+namespace Microsoft.Dafny;
+
+public record ScheduledVerification(ICanVerify CanVerify) : ICompilationEvent {
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/ICompilationEvent.cs b/Source/DafnyCore/Pipeline/ICompilationEvent.cs
new file mode 100644
index 00000000000..86f1aca62b2
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/ICompilationEvent.cs
@@ -0,0 +1,6 @@
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Dafny;
+
+public interface ICompilationEvent {
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/IDafnyParser.cs b/Source/DafnyCore/Pipeline/IDafnyParser.cs
new file mode 100644
index 00000000000..3753391978c
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/IDafnyParser.cs
@@ -0,0 +1,14 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Dafny {
+  /// <summary>
+  /// Interface exposing parse methods to generate a syntax tree out of an arbitrary dafny source.
+  /// </summary>
+  /// <remarks>
+  /// Any implementation has to guarantee thread-safety of its public members.
+  /// </remarks>
+  public interface IDafnyParser {
+    Task<ProgramParseResult> Parse(Compilation compilation, CancellationToken cancellationToken);
+  }
+}
diff --git a/Source/DafnyCore/Pipeline/IProgramVerifier.cs b/Source/DafnyCore/Pipeline/IProgramVerifier.cs
new file mode 100644
index 00000000000..e90746175e1
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/IProgramVerifier.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Boogie;
+using Microsoft.Dafny.LanguageServer.Workspace;
+using VC;
+
+namespace Microsoft.Dafny {
+  public record AssertionBatchResult(Implementation Implementation, VerificationRunResult Result);
+
+  /// <summary>
+  /// Implementations of this interface are responsible to verify the correctness of a program.
+  /// </summary>
+  public interface IProgramVerifier {
+    Task<IReadOnlyList<IVerificationTask>> GetVerificationTasksAsync(ExecutionEngine engine,
+      ResolutionResult resolution,
+      ModuleDefinition moduleDefinition,
+      CancellationToken cancellationToken);
+  }
+}
diff --git a/Source/DafnyCore/Pipeline/ISymbolResolver.cs b/Source/DafnyCore/Pipeline/ISymbolResolver.cs
new file mode 100644
index 00000000000..37439a39a63
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/ISymbolResolver.cs
@@ -0,0 +1,10 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.Workspace;
+
+namespace Microsoft.Dafny {
+  public interface ISymbolResolver {
+    Task ResolveSymbols(Compilation compilation, Program program, CancellationToken cancellationToken);
+  }
+}
diff --git a/Source/DafnyCore/Pipeline/ITextDocumentLoader.cs b/Source/DafnyCore/Pipeline/ITextDocumentLoader.cs
new file mode 100644
index 00000000000..9e83a03c73f
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/ITextDocumentLoader.cs
@@ -0,0 +1,23 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Dafny {
+  public record ProgramParseResult(Program Program, Dictionary<Uri, int> VersionedFiles);
+
+  /// <summary>
+  /// Implementations are responsible to load a specified language server document and generate
+  /// a dafny document out of it.
+  /// </summary>
+  public interface ITextDocumentLoader {
+
+    Task<ProgramParseResult> ParseAsync(Compilation compilation, CancellationToken cancellationToken);
+
+    Task<ResolutionResult?> ResolveAsync(Compilation compilation,
+      Program program,
+      CancellationToken cancellationToken);
+  }
+}
diff --git a/Source/DafnyCore/Pipeline/NoExecutableBackend.cs b/Source/DafnyCore/Pipeline/NoExecutableBackend.cs
new file mode 100644
index 00000000000..569c4019268
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/NoExecutableBackend.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Microsoft.Dafny.Plugins;
+
+namespace Microsoft.Dafny;
+
+public class NoExecutableBackend : IExecutableBackend {
+  public override IReadOnlySet<string> SupportedExtensions => new HashSet<string>();
+  public override string TargetName => throw new NotSupportedException();
+  public override bool IsStable => throw new NotSupportedException();
+  public override string TargetExtension => "doesNotExist";
+  public override string PublicIdProtect(string name) {
+    throw new NotSupportedException();
+  }
+
+  public override bool TextualTargetIsExecutable => throw new NotSupportedException();
+
+  public override bool SupportsInMemoryCompilation => throw new NotSupportedException();
+  public override string ModuleSeparator => ".";
+
+  public override void Compile(Program dafnyProgram, string dafnyProgramName, ConcreteSyntaxTree output) {
+    throw new NotSupportedException();
+  }
+
+  public override Task<bool> OnPostGenerate(string dafnyProgramName, string targetFilename, TextWriter outputWriter) {
+    throw new NotSupportedException();
+  }
+
+  public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree callToMainTree) {
+    throw new NotSupportedException();
+  }
+
+  public override Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText, string callToMain,
+    string targetFilename,
+    ReadOnlyCollection<string> otherFileNames, bool runAfterCompile, TextWriter outputWriter) {
+    throw new NotSupportedException();
+  }
+
+  public override Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain,
+    string pathsFilename,
+    ReadOnlyCollection<string> otherFileNames, object compilationResult, TextWriter outputWriter,
+    TextWriter errorWriter) {
+    throw new NotSupportedException();
+  }
+
+  public override void InstrumentCompiler(CompilerInstrumenter instrumenter, Program dafnyProgram) {
+    throw new NotSupportedException();
+  }
+
+  public NoExecutableBackend([NotNull] DafnyOptions options) : base(options) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/ObservableErrorReporter.cs b/Source/DafnyCore/Pipeline/ObservableErrorReporter.cs
new file mode 100644
index 00000000000..bc4f9e3fc71
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/ObservableErrorReporter.cs
@@ -0,0 +1,90 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Reactive.Subjects;
+using System.Threading;
+using DafnyCore;
+using Microsoft.Dafny.LanguageServer.Workspace;
+
+namespace Microsoft.Dafny {
+  public class ObservableErrorReporter : ErrorReporter {
+    private readonly Subject<NewDiagnostic> updates = new();
+    public IObservable<NewDiagnostic> Updates => updates;
+
+    private readonly Uri entryUri;
+    private readonly Dictionary<ErrorLevel, int> counts = new();
+    private readonly Dictionary<ErrorLevel, int> countsNotVerificationOrCompiler = new();
+    private readonly ReaderWriterLockSlim rwLock = new();
+
+    /// <summary>
+    /// Creates a new instance with the given uri of the entry document.
+    /// </summary>
+    /// <param name="entryUri">The entry document's uri.</param>
+    /// <remarks>
+    /// The uri of the entry document is necessary to report general compiler errors as part of this document.
+    /// </remarks>
+    public ObservableErrorReporter(DafnyOptions options, Uri entryUri) : base(options) {
+      this.entryUri = entryUri;
+    }
+
+    protected override bool MessageCore(MessageSource source, ErrorLevel level, string? errorId, IOrigin rootTok, string msg) {
+      if (ErrorsOnly && level != ErrorLevel.Error) {
+        return false;
+      }
+      var relatedInformation = new List<DafnyRelatedInformation>();
+
+      var usingSnippets = Options.Get(Snippets.ShowSnippets);
+      if (rootTok is NestedOrigin nestedToken) {
+        relatedInformation.AddRange(
+          ErrorReporterExtensions.CreateDiagnosticRelatedInformationFor(
+            nestedToken.Inner, nestedToken.Message, usingSnippets)
+        );
+      }
+
+      var dafnyDiagnostic = new DafnyDiagnostic(source, errorId!, rootTok, msg, level, relatedInformation);
+      AddDiagnosticForFile(dafnyDiagnostic, GetUriOrDefault(rootTok));
+      return true;
+    }
+
+    public override int Count(ErrorLevel level) {
+      rwLock.EnterReadLock();
+      try {
+        return counts.GetValueOrDefault(level, 0);
+      }
+      finally {
+        rwLock.ExitReadLock();
+      }
+    }
+
+    public override int CountExceptVerifierAndCompiler(ErrorLevel level) {
+      rwLock.EnterReadLock();
+      try {
+        return countsNotVerificationOrCompiler.GetValueOrDefault(level, 0);
+      }
+      finally {
+        rwLock.ExitReadLock();
+      }
+    }
+
+    private void AddDiagnosticForFile(DafnyDiagnostic dafnyDiagnostic, Uri uri) {
+      rwLock.EnterWriteLock();
+      try {
+        counts[dafnyDiagnostic.Level] = counts.GetValueOrDefault(dafnyDiagnostic.Level, 0) + 1;
+        if (dafnyDiagnostic.Source != MessageSource.Verifier && dafnyDiagnostic.Source != MessageSource.Compiler) {
+          countsNotVerificationOrCompiler[dafnyDiagnostic.Level] =
+            countsNotVerificationOrCompiler.GetValueOrDefault(dafnyDiagnostic.Level, 0) + 1;
+        }
+        updates.OnNext(new NewDiagnostic(uri, dafnyDiagnostic));
+      }
+      finally {
+        rwLock.ExitWriteLock();
+      }
+    }
+
+    private Uri GetUriOrDefault(IOrigin token) {
+      return token.Filepath == null
+        ? entryUri
+        : token.Uri;
+    }
+  }
+}
diff --git a/Source/DafnyCore/Pipeline/PositionExtensions.cs b/Source/DafnyCore/Pipeline/PositionExtensions.cs
new file mode 100644
index 00000000000..081d7fea21d
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/PositionExtensions.cs
@@ -0,0 +1,12 @@
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace Microsoft.Dafny;
+
+public static class PositionExtensions {
+  public static DafnyPosition ToDafnyPosition(this IOrigin token) {
+    return new DafnyPosition(token.line + BoogieExtensions.LineOffset, token.col + BoogieExtensions.ColumnOffset);
+  }
+  public static DafnyPosition ToDafnyPosition(this Position position) {
+    return new DafnyPosition(position.Line, position.Character);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Pipeline/ResolutionResult.cs b/Source/DafnyCore/Pipeline/ResolutionResult.cs
new file mode 100644
index 00000000000..5875aad6906
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/ResolutionResult.cs
@@ -0,0 +1,9 @@
+#nullable enable
+using System.Collections.Generic;
+
+namespace Microsoft.Dafny;
+
+public record ResolutionResult(
+  bool HasErrors,
+  Program ResolvedProgram,
+  IReadOnlyList<ICanVerify>? CanVerifies);
diff --git a/Source/DafnyCore/Pipeline/TextDocumentLoader.cs b/Source/DafnyCore/Pipeline/TextDocumentLoader.cs
new file mode 100644
index 00000000000..3d200f380f5
--- /dev/null
+++ b/Source/DafnyCore/Pipeline/TextDocumentLoader.cs
@@ -0,0 +1,77 @@
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Dafny {
+  /// <summary>
+  /// Text document loader implementation that offloads the whole load procedure on one dedicated
+  /// thread with a stack size of 256MB. Since only one thread is used, document loading is implicitely synchronized.
+  /// The verification runs on the calling thread.
+  /// </summary>
+  /// <remarks>
+  /// The increased stack size is necessary to solve the issue https://github.com/dafny-lang/dafny/issues/1447.
+  /// </remarks>
+  public class TextDocumentLoader : ITextDocumentLoader {
+    private readonly ILogger<ITextDocumentLoader> logger;
+    private readonly IDafnyParser parser;
+    private readonly ISymbolResolver symbolResolver;
+
+    public TextDocumentLoader(
+      ILogger<ITextDocumentLoader> documentLoader,
+      IDafnyParser parser,
+      ISymbolResolver symbolResolver) {
+      this.logger = documentLoader;
+      this.parser = parser;
+      this.symbolResolver = symbolResolver;
+    }
+
+    public async Task<ProgramParseResult> ParseAsync(Compilation compilation, CancellationToken cancellationToken) {
+#pragma warning disable CS1998
+      return await await DafnyMain.LargeStackFactory.StartNew(
+        () => parser.Parse(compilation, cancellationToken), cancellationToken
+#pragma warning restore CS1998
+      );
+    }
+
+    public async Task<ResolutionResult?> ResolveAsync(Compilation compilation,
+      Program program,
+      CancellationToken cancellationToken) {
+#pragma warning disable CS1998
+      return await await DafnyMain.LargeStackFactory.StartNew(
+        () => ResolveInternal(compilation, program, cancellationToken), cancellationToken);
+#pragma warning restore CS1998
+    }
+
+    private async Task<ResolutionResult?> ResolveInternal(Compilation compilation, Program program, CancellationToken cancellationToken) {
+      if (program.HasParseErrors) {
+        return null;
+      }
+
+      await symbolResolver.ResolveSymbols(compilation, program, cancellationToken);
+
+      if (compilation.ShouldProcessSolverOptions) {
+        compilation.Options.ProcessSolverOptions(compilation.Reporter, compilation.Options.DafnyProject.StartingToken);
+      }
+
+      List<ICanVerify>? verifiables;
+      if (compilation.HasErrors) {
+        verifiables = null;
+      } else {
+        var symbols = SymbolExtensions.GetSymbolDescendants(program.DefaultModule);
+        verifiables = symbols.OfType<ICanVerify>().Where(v => !v.Origin.IsCopy &&
+                                                              v.ContainingModule.ShouldVerify(program.Compilation) &&
+                                                              v.ShouldVerify(program.Compilation) &&
+                                                              v.ShouldVerify).ToList();
+      }
+
+      return new ResolutionResult(
+        compilation.HasErrors,
+        program,
+        verifiables
+      );
+    }
+  }
+}
diff --git a/Source/DafnyCore/Plugins/CompilerInstrumenter.cs b/Source/DafnyCore/Plugins/CompilerInstrumenter.cs
index 4b8e5ca0b56..252b18ea8b6 100644
--- a/Source/DafnyCore/Plugins/CompilerInstrumenter.cs
+++ b/Source/DafnyCore/Plugins/CompilerInstrumenter.cs
@@ -1,6 +1,6 @@
 using Microsoft.Dafny.Compilers;
 
-namespace Microsoft.Dafny.Plugins; 
+namespace Microsoft.Dafny.Plugins;
 
 /// <summary>
 /// A hook for plugins to customize some of the code generation of other IExecutableBackends.
@@ -20,6 +20,6 @@ public CompilerInstrumenter(ErrorReporter reporter) : base(reporter) { }
   /// and downcast to interface with them,
   /// possibly reporting an error if they don't recognize the compiler.
   /// </summary>
-  public virtual void Instrument(IExecutableBackend backend, SinglePassCompiler compiler, Program program) {
+  public virtual void Instrument(IExecutableBackend backend, SinglePassCodeGenerator codeGenerator, Program program) {
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Plugins/ErrorReportingBase.cs b/Source/DafnyCore/Plugins/ErrorReportingBase.cs
index f9425b31492..ac390293ec4 100644
--- a/Source/DafnyCore/Plugins/ErrorReportingBase.cs
+++ b/Source/DafnyCore/Plugins/ErrorReportingBase.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.Contracts;
 
-namespace Microsoft.Dafny.Plugins; 
+namespace Microsoft.Dafny.Plugins;
 
 /// <summary>
 /// Abstract base class for plugin interfaces that may report errors.
@@ -22,7 +22,7 @@ public abstract class ErrorReportingBase {
   ///     reporter.Error(MessageSource.Compiler, token, "[Your plugin] Your error message here");
   ///
   /// The token is usually obtained on expressions and statements in the field `tok`
-  /// If you do not have access to them, use program.GetFirstTopLevelToken()
+  /// If you do not have access to them, use program.GetStartOfFirstFileToken()
   /// </summary>
   /// <param name="reporter">The error reporter. Usually outputs automatically to IDE or command-line</param>
   public ErrorReportingBase(ErrorReporter reporter) {
diff --git a/Source/DafnyCore/Plugins/IExecutableBackend.cs b/Source/DafnyCore/Plugins/IExecutableBackend.cs
index 8fdf80a2b10..b357a89458a 100644
--- a/Source/DafnyCore/Plugins/IExecutableBackend.cs
+++ b/Source/DafnyCore/Plugins/IExecutableBackend.cs
@@ -1,9 +1,16 @@
 // SPDX-License-Identifier: MIT
 #nullable enable
 
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.CommandLine;
 using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using DafnyCore;
+using DafnyCore.Options;
+using Microsoft.Dafny.Compilers;
 
 namespace Microsoft.Dafny.Plugins;
 
@@ -14,6 +21,8 @@ namespace Microsoft.Dafny.Plugins;
 /// of IExecutableBackend from the plugin.
 /// </summary>
 public abstract class IExecutableBackend {
+  protected DafnyOptions Options { get; }
+
   /// <summary>
   /// Supported file extensions for additional compilation units (e.g. <c>.cs</c> for C#).
   /// </summary>
@@ -58,6 +67,7 @@ public virtual string TargetBaseDir(string dafnyProgramName) =>
   /// Change <c>name</c> into a valid identifier in the target language.
   /// </summary>
   public abstract string PublicIdProtect(string name);
+
   /// <summary>
   /// Qualify the name <c>compileName</c> in module <c>moduleName</c>.
   /// </summary>
@@ -96,10 +106,19 @@ public virtual string GetCompileName(bool isDefaultModule, string moduleName, st
   /// </summary>
   public virtual bool IsInternal => false;
 
+  public abstract string ModuleSeparator { get; }
+
   // The following two fields are not initialized until OnPreCompile
   protected ErrorReporter? Reporter;
   protected ReadOnlyCollection<string>? OtherFileNames;
 
+  // The following lists are the Options supported by the backend.
+  public virtual IEnumerable<Option> SupportedOptions => new List<Option>();
+
+  protected IExecutableBackend(DafnyOptions options) {
+    Options = options;
+  }
+
   /// <summary>
   /// Initialize <c>Reporter</c> and <c>OtherFileNames</c>.
   ///
@@ -114,9 +133,9 @@ public virtual void OnPreCompile(ErrorReporter reporter, ReadOnlyCollection<stri
   }
 
   /// <summary>
-  /// Perform any required cleanups after generating code with <c>Compile</c> and <c>EmitCallToMain</c>.
+  /// Perform any required processing after generating code with <c>Compile</c> and <c>EmitCallToMain</c>.
   /// </summary>
-  public virtual void OnPostCompile() { }
+  public abstract Task<bool> OnPostGenerate(string dafnyProgramName, string targetDirectory, TextWriter outputWriter);
 
   /// <summary>
   /// Remove previously generated source files.  This is only applicable to compilers that put sources in a separate
@@ -125,7 +144,7 @@ public virtual void OnPostCompile() { }
   /// <param name="sourceDirectory">Name of the directory to delete.</param>
   public virtual void CleanSourceDirectory(string sourceDirectory) { }
 
-  public abstract void Compile(Program dafnyProgram, ConcreteSyntaxTree output);
+  public abstract void Compile(Program dafnyProgram, string dafnyProgramName, ConcreteSyntaxTree output);
 
   /// <summary>
   /// Emits a call to <c>mainMethod</c> as the program's entry point, if such an explicit call is
@@ -149,8 +168,10 @@ public virtual void CleanSourceDirectory(string sourceDirectory) { }
   /// Returns <c>true</c> on success. Then, <c>compilationResult</c> is a value that can be passed in to
   /// the instance's <c>RunTargetProgram</c> method.
   /// </summary>
-  public abstract bool CompileTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain, string pathsFilename,
-    ReadOnlyCollection<string> otherFileNames, bool runAfterCompile, TextWriter outputWriter, out object compilationResult);
+  public abstract Task<(bool Success, object CompilationResult)> CompileTargetProgram(string dafnyProgramName,
+    string targetProgramText, string callToMain,
+    string targetFilename,
+    ReadOnlyCollection<string> otherFileNames, bool runAfterCompile, TextWriter outputWriter);
 
   /// <summary>
   /// Runs a target program after it has been successfully compiled.
@@ -160,7 +181,7 @@ public abstract bool CompileTargetProgram(string dafnyProgramName, string target
   ///
   /// Returns <c>true</c> on success, <c>false</c> on error. Any errors are output to <c>outputWriter</c>.
   /// </summary>
-  public abstract bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain,
+  public abstract Task<bool> RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain,
     string pathsFilename,
     ReadOnlyCollection<string> otherFileNames, object compilationResult, TextWriter outputWriter,
     TextWriter errorWriter);
@@ -169,4 +190,36 @@ public abstract bool RunTargetProgram(string dafnyProgramName, string targetProg
   /// Instruments the underlying SinglePassCompiler, if it exists.
   /// </summary>
   public abstract void InstrumentCompiler(CompilerInstrumenter instrumenter, Program dafnyProgram);
+
+  public static readonly Option<string> OuterModule =
+    new("--outer-module", "Nest all code in this module. Can be used to customize generated code. Use dots as separators (foo.baz.zoo) for deeper nesting. The first specified module will be the outermost one.");
+
+  public static readonly Option<IList<FileInfo>> TranslationRecords = new("--translation-record",
+    @"
+A translation record file for previously translated Dafny code. Can be specified multiple times. See https://dafny.org/dafny/DafnyRef/DafnyRef#sec-dtr-files for details.".TrimStart()) {
+  };
+
+  public static readonly Option<FileInfo> TranslationRecordOutput = new("--translation-record-output",
+    @"
+Where to output the translation record file. Defaults to the output directory. See https://dafny.org/dafny/DafnyRef/DafnyRef#sec-dtr-files for details.".TrimStart()) {
+  };
+
+  static IExecutableBackend() {
+    OptionRegistry.RegisterOption(OuterModule, OptionScope.Cli);
+    OptionRegistry.RegisterOption(TranslationRecords, OptionScope.Cli);
+    OptionRegistry.RegisterOption(TranslationRecordOutput, OptionScope.Cli);
+    OptionRegistry.RegisterOption(OuterModule, OptionScope.Translation);
+  }
+
+  public virtual Command GetCommand() {
+    var cmd = new Command(TargetId, $"Translate Dafny sources to {TargetName} source and build files.");
+    foreach (var supportedOption in SupportedOptions) {
+      cmd.AddOption(supportedOption);
+    }
+    return cmd;
+  }
+
+  public virtual void PopulateCoverageReport(CoverageReport coverageReport) {
+    throw new NotImplementedException();
+  }
 }
diff --git a/Source/DafnyCore/Plugins/Rewriter.cs b/Source/DafnyCore/Plugins/Rewriter.cs
index 973e6c5401f..4a2416ad145 100644
--- a/Source/DafnyCore/Plugins/Rewriter.cs
+++ b/Source/DafnyCore/Plugins/Rewriter.cs
@@ -32,6 +32,14 @@ public virtual void PostResolve(Program program) {
       Contract.Requires(program != null);
     }
 
+    /// <summary>
+    /// Override this method to perform changes to the AST of a module before resolution.
+    /// You can also report warnings and errors using reporter.Error
+    /// </summary>
+    /// <param name="module">The module before resolution</param>
+    public virtual void PreResolve(ModuleDefinition module) {
+    }
+
     /// <summary>
     /// Override this method to obtain the resolved module before the translation pipeline occurs
     /// after the individual PostResolve on every module
diff --git a/Source/DafnyCore/Prelude/Boxes.dfy b/Source/DafnyCore/Prelude/Boxes.dfy
new file mode 100644
index 00000000000..9d3a14523f7
--- /dev/null
+++ b/Source/DafnyCore/Prelude/Boxes.dfy
@@ -0,0 +1,123 @@
+module Boxes {
+  export
+    provides Box, arbitrary
+    provides Below, Reflexive, Antisymmetric, Transitive, Total
+    reveals Less
+    provides LessIrreflexive, LessAsymmetric, LessBelowAsymmetric, LessTransitive, LessBelowTransitive, Connected
+    provides BelowIsNonStrictLess, NotLess
+
+  type Box(==,0,!new)
+
+  const arbitrary: Box
+
+  // The following predicate and 4 lemmas postulate a total order "Below" on Box'es.
+
+  predicate {:axiom} Below(a: Box, b: Box)
+
+  lemma {:axiom} Reflexive(a: Box)
+    ensures Below(a, a)
+
+  lemma {:axiom} Antisymmetric(a: Box, b: Box)
+    requires Below(a, b) && Below(b, a)
+    ensures a == b
+
+  lemma {:axiom} Transitive(a: Box, b: Box, c: Box)
+    requires Below(a, b) && Below(b, c)
+    ensures Below(a, c)
+
+  lemma {:axiom} Total(a: Box, b: Box)
+    ensures Below(a, b) || Below(b, a)
+
+  // strict order
+
+  predicate Less(a: Box, b: Box) {
+    Below(a, b) && a != b
+  }
+
+  lemma BelowIsNonStrictLess(a: Box, b: Box)
+    ensures Below(a, b) <==> Less(a, b) || a == b
+  {
+    calc {
+      Less(a, b) || a == b;
+      (Below(a, b) && a != b) || a == b;
+      Below(a, b) || a == b;
+      { Reflexive(a); }
+      Below(a, b);
+    }
+  }
+
+  lemma LessIrreflexive(a: Box)
+    ensures !Less(a, a)
+  {
+  }
+
+  lemma LessAsymmetric(a: Box, b: Box)
+    requires Less(a, b) && Less(b, a)
+    ensures false
+  {
+    Antisymmetric(a, b);
+  }
+
+  lemma LessBelowAsymmetric(a: Box, b: Box)
+    requires Less(a, b) && Below(b, a)
+    ensures false
+  {
+    Antisymmetric(a, b);
+  }
+
+  lemma NotLess(a: Box, b: Box)
+    ensures !Less(a, b) <==> Below(b, a)
+  {
+    if !Less(a, b) {
+      calc {
+        true;
+        { Connected(a, b); }
+        a == b || Less(a, b) || Less(b, a);
+        // assumption !Less(a, b)
+        a == b || Less(b, a);
+        { BelowIsNonStrictLess(b, a); }
+        Below(b, a);
+      }
+    }
+
+    if Less(a, b) {
+      assert !Below(b, a) by {
+        if Below(b, a) {
+          LessBelowAsymmetric(a, b);
+          assert false;
+        }
+      }
+    }
+  }
+
+  lemma LessTransitive(a: Box, b: Box, c: Box)
+    requires Less(a, b) && Less(b, c)
+    ensures Less(a, c)
+  {
+    LessBelowTransitive(a, b, c);
+  }
+
+  lemma LessBelowTransitive(a: Box, b: Box, c: Box)
+    requires
+      || (Less(a, b) && Below(b, c))
+      || (Below(a, b) && Less(b, c))
+    ensures Less(a, c)
+  {
+    assert Below(a, c) by {
+      Transitive(a, b, c);
+    }
+    assert a != c by {
+      if a == c {
+        Antisymmetric(a, b);
+        assert a == b;
+        assert false;
+      }
+    }
+  }
+
+  lemma Connected(a: Box, b: Box)
+    ensures a != b ==> Less(a, b) || Less(b, a)
+  {
+    Total(a, b);
+  }
+}
diff --git a/Source/DafnyCore/Prelude/Lists.dfy b/Source/DafnyCore/Prelude/Lists.dfy
new file mode 100644
index 00000000000..abe73904374
--- /dev/null
+++ b/Source/DafnyCore/Prelude/Lists.dfy
@@ -0,0 +1,176 @@
+module Lists {
+  export
+    reveals List, List.Length, List.At, List.Contains, List.Append, List.Take, List.Drop, List.Split
+    provides List.HeadTailAt, List.ContainsAt, List.AtContains, List.LengthAppend, List.AppendAt, List.AboutDrop
+    provides List.AppendTake, List.TakeFromAppend, List.AppendDrop, List.DropFromAppend
+    provides List.AppendTakeDrop, List.LengthTakeDrop
+
+  datatype List<X(==)> = Nil | Cons(head: X, tail: List<X>)
+  {
+    function Length(): nat {
+      if Nil? then 0 else 1 + tail.Length()
+    }
+
+    function Append(xs: List<X>): List<X> {
+      match this
+      case Nil => xs
+      case Cons(x, tail) => Cons(x, tail.Append(xs))
+    }
+
+    lemma LengthAppend(xs: List<X>)
+      ensures Append(xs).Length() == Length() + xs.Length()
+    {
+    }
+
+    function At(i: nat): X
+      requires i < Length()
+    {
+      if i == 0 then head else tail.At(i - 1)
+    }
+
+    lemma HeadTailAt()
+      requires Cons?
+      ensures head == At(0)
+      ensures forall i :: 0 <= i < tail.Length() ==> tail.At(i) == At(i + 1)
+    {
+    }
+
+    predicate Contains(x: X) {
+      match this
+      case Nil => false
+      case Cons(y, tail) => x == y || tail.Contains(x)
+    }
+
+    lemma ContainsAt(x: X) returns (i: nat)
+      requires Contains(x)
+      ensures i < Length() && At(i) == x
+    {
+      if head == x {
+        return 0;
+      } else {
+        i := tail.ContainsAt(x);
+        return i + 1;
+      }
+    }
+
+    lemma AtContains(i: nat, x: X)
+      requires i < Length() && At(i) == x
+      ensures Contains(x)
+    {
+    }
+
+    lemma ConsAt(x: X, i: nat)
+      requires i < Cons(x, this).Length()
+      ensures Cons(x, this).At(i) ==
+              if i == 0 then x else At(i - 1)
+    {
+    }
+
+    lemma AppendAt(xs: List<X>, i: nat)
+      requires i < Append(xs).Length()
+      ensures Append(xs).At(i) ==
+              if i < Length() then At(i) else (LengthAppend(xs); xs.At(i - Length()))
+    {
+    }
+
+    function Take(n: nat): List<X>
+      requires n <= Length()
+    {
+      if n == 0 then Nil else Cons(head, tail.Take(n - 1))
+    }
+
+    function Drop(n: nat): List<X>
+      requires n <= Length()
+    {
+      if n == 0 then this else tail.Drop(n - 1)
+    }
+
+    function Split(n: nat): (split: (List<X>, List<X>))
+      requires n <= Length()
+      ensures split.0.Append(split.1) == this
+    {
+      AppendTakeDrop(n);
+      (Take(n), Drop(n))
+    }
+
+    lemma AboutDrop(n: nat)
+      requires n < Length()
+      ensures Drop(n).Cons?
+    {
+    }
+
+    lemma AppendTake(xs: List<X>)
+      ensures (LengthAppend(xs); Append(xs).Take(Length()) == this)
+    {
+      match this
+      case Nil =>
+      case Cons(x, tail) =>
+        LengthAppend(xs);
+    }
+
+    lemma TakeFromAppend(xs: List<X>, n: nat)
+      requires n <= Length() + xs.Length()
+      ensures (LengthAppend(xs);
+               Append(xs).Take(n) ==
+               if n <= Length() then Take(n) else Append(xs.Take(n - Length())))
+    {
+      if n == 0 {
+      } else {
+        match this
+        case Nil =>
+        case Cons(x, tail) =>
+          LengthAppend(xs);
+          calc {
+            Append(xs).Take(n);
+            Cons(x, tail.Append(xs)).Take(n);
+            Cons(x, tail.Append(xs).Take(n - 1));
+            { tail.TakeFromAppend(xs, n - 1); }
+            if n <= Length() then Take(n) else Append(xs.Take(n - Length()));
+          }
+      }
+    }
+
+    lemma AppendDrop(xs: List<X>)
+      ensures (LengthAppend(xs); Append(xs).Drop(Length()) == xs)
+    {
+      match this
+      case Nil =>
+      case Cons(x, tail) =>
+        LengthAppend(xs);
+    }
+
+    lemma DropFromAppend(xs: List<X>, n: nat)
+      requires n <= Length() + xs.Length()
+      ensures (LengthAppend(xs);
+               Append(xs).Drop(n) ==
+               if n <= Length() then Drop(n).Append(xs) else xs.Drop(n - Length()))
+    {
+      if n == 0 {
+      } else {
+        match this
+        case Nil =>
+        case Cons(x, tail) =>
+          LengthAppend(xs);
+          calc {
+            Append(xs).Drop(n);
+            Cons(x, tail.Append(xs)).Drop(n);
+            tail.Append(xs).Drop(n - 1);
+            { tail.DropFromAppend(xs, n - 1); }
+            if n <= Length() then Drop(n).Append(xs) else xs.Drop(n - Length());
+          }
+      }
+    }
+
+    lemma AppendTakeDrop(i: nat)
+      requires i <= Length()
+      ensures Take(i).Append(Drop(i)) == this
+    {
+    }
+
+    lemma LengthTakeDrop(i: nat)
+      requires i <= Length()
+      ensures Take(i).Length() == i && Drop(i).Length() == Length() - i
+    {
+    }
+  }
+}
diff --git a/Source/DafnyCore/Prelude/Makefile b/Source/DafnyCore/Prelude/Makefile
new file mode 100644
index 00000000000..3ea4793772d
--- /dev/null
+++ b/Source/DafnyCore/Prelude/Makefile
@@ -0,0 +1,42 @@
+DAFNY=../../../Scripts/dafny
+OUTPUT=Output
+GENERATED_PRELUDE=$(OUTPUT)/DafnyPrelude.bpl
+TARGET_PRELUDE=../DafnyPrelude.bpl
+CORE=$(OUTPUT)/PreludeCore.bpl
+
+all: $(GENERATED_PRELUDE)
+
+clean:
+	rm -r $(OUTPUT)
+
+$(GENERATED_PRELUDE): $(CORE) $(OUTPUT)/Sequences.bpl $(OUTPUT)/Math.bpl $(OUTPUT)/Sets.bpl $(OUTPUT)/Multisets.bpl
+	# cpp is allergic to primes, so we have to do a song and dance around it
+	sed -e "s|'|PRIME|g" -i "" $(CORE) $(OUTPUT)/Sequences.bpl $(OUTPUT)/Math.bpl $(OUTPUT)/Sets.bpl $(OUTPUT)/Multisets.bpl
+	# cpp does more than we want, so do another song and dance to temporarily comment out all lines that do not begin with #include
+	sed -e "/^#include /! s|^|//TMP |" -i "" $(CORE)
+	# Extract Boogie from the model verified in Dafny
+	cpp -C -P $(CORE) $(GENERATED_PRELUDE)
+	# Undo the song and dance
+	sed -e "s|^//TMP ||" -i "" $(GENERATED_PRELUDE)
+	sed -e "s|PRIME|'|g" -i "" $(GENERATED_PRELUDE)
+
+$(OUTPUT)/Sequences.bpl $(OUTPUT)/Math.bpl $(OUTPUT)/Sets.bpl $(OUTPUT)/Multisets.bpl: $(OUTPUT) Lists.dfy Boxes.dfy Sequences.dfy Math.dfy Sets.dfy Multisets.dfy
+	# Verify model files and extract Boogie declarations from them
+	$(DAFNY) extract Sequences $(OUTPUT)/Sequences.bpl Boxes.dfy Lists.dfy Sequences.dfy
+	$(DAFNY) extract Sets $(OUTPUT)/Sets.bpl Boxes.dfy Lists.dfy Sets.dfy
+	$(DAFNY) extract Math $(OUTPUT)/Math.bpl Math.dfy
+	$(DAFNY) extract Multisets $(OUTPUT)/Multisets.bpl Boxes.dfy Lists.dfy Math.dfy Sequences.dfy Sets.dfy Multisets.dfy
+	# Remove trailing spaces that the Boogie pretty printer emits
+	sed -e "s| *$$||" -i "" $(OUTPUT)/Sequences.bpl $(OUTPUT)/Math.bpl $(OUTPUT)/Sets.bpl $(OUTPUT)/Multisets.bpl
+
+$(CORE): $(OUTPUT) PreludeCore.bpl
+	cp PreludeCore.bpl $(CORE)
+
+$(OUTPUT):
+	mkdir $(OUTPUT)
+
+update: $(GENERATED_PRELUDE)
+	cp $(GENERATED_PRELUDE) $(TARGET_PRELUDE)
+
+check: $(GENERATED_PRELUDE)
+	diff $(TARGET_PRELUDE) $(GENERATED_PRELUDE)
diff --git a/Source/DafnyCore/Prelude/Math.dfy b/Source/DafnyCore/Prelude/Math.dfy
new file mode 100644
index 00000000000..14e801bfed1
--- /dev/null
+++ b/Source/DafnyCore/Prelude/Math.dfy
@@ -0,0 +1,55 @@
+module {:extract_boogie} Math {
+  export
+    provides Min, Clip
+    provides Min0, Min1, MinEither
+    provides ClipId, ClipZero
+
+  // boogie:
+  // function Math#min(a: int, b: int): int;
+  function {:extract_boogie_name "Math#min"} Min(a: int, b: int): int {
+    if a <= b then a else b
+  }
+
+  // boogie:
+  // axiom (forall a: int, b: int :: { Math#min(a, b) } a <= b <==> Math#min(a, b) == a);
+  lemma {:extract_pattern Min(a, b)} Min0(a: int, b: int)
+    ensures a <= b <==> Min(a, b) == a
+  {
+  }
+
+  // boogie:
+  // axiom (forall a: int, b: int :: { Math#min(a, b) } b <= a <==> Math#min(a, b) == b);
+  lemma {:extract_pattern Min(a, b)} Min1(a: int, b: int)
+    ensures b <= a <==> Min(a, b) == b
+  {
+  }
+
+  // boogie:
+  // axiom (forall a: int, b: int :: { Math#min(a, b) } Math#min(a, b) == a || Math#min(a, b) == b);
+  lemma {:extract_pattern Min(a, b)} MinEither(a: int, b: int)
+    ensures Min(a, b) == a || Min(a, b) == b
+  {
+  }
+
+  // boogie:
+  // function Math#clip(a: int): int;
+  function {:extract_boogie_name "Math#clip"} Clip(a: int): int {
+    if 0 <= a then a else 0
+  }
+
+  // boogie:
+  // axiom (forall a: int :: { Math#clip(a) } 0 <= a ==> Math#clip(a) == a);
+  lemma {:extract_pattern Clip(a)} ClipId(a: int)
+    requires 0 <= a
+    ensures Clip(a) == a
+  {
+  }
+
+  // boogie:
+  // axiom (forall a: int :: { Math#clip(a) } a < 0  ==> Math#clip(a) == 0);
+  lemma {:extract_pattern Clip(a)} ClipZero(a: int)
+    requires a < 0
+    ensures Clip(a) == 0
+  {
+  }
+}
diff --git a/Source/DafnyCore/Prelude/Multisets.dfy b/Source/DafnyCore/Prelude/Multisets.dfy
new file mode 100644
index 00000000000..b365058397f
--- /dev/null
+++ b/Source/DafnyCore/Prelude/Multisets.dfy
@@ -0,0 +1,1524 @@
+module {:extract_boogie} Multisets {
+  import opened Boxes
+  import opened Lists
+  import Math
+  import Sets`Friends
+  import Sequences`Friends
+
+  // type MultiSet = [Box]int;
+  // The manually authored Boogie type "MultiSet" is defined as a Boogie map from Box to int.
+  // The reason for doing so was to obtain the Boogie map-update operation for free (in addition
+  // to the map-select operation, of course). However, there are probably stronger reasons
+  // to just define it as an uninterpreted type, which is what the effect of this
+  // :extract_boogie_name annotation will have. Instead of Boogie's map-select and map-udate operators,
+  // the model here uses functions Multiplicity and UpdateMultiplicity, respectively.
+  // See also Sets.dfy and the "IsMember" predicate in that file.
+  type {:extract_boogie_name "MultiSet"} Multiset = m: List<Box> | Increasing(m) witness Nil
+
+  predicate Increasing(m: List<Box>) {
+    forall i, j :: 0 <= i < j < m.Length() ==> Below(m.At(i), m.At(j))
+  }
+
+  lemma TailIncreasing(s: List<Box>)
+    requires Increasing(s) && s.Cons?
+    ensures Increasing(s.tail)
+  {
+    assert forall i :: 0 <= i < s.tail.Length() ==> s.tail.At(i) == s.At(i + 1);
+  }
+
+  function {:extract_boogie_name "MultiSet#Multiplicity"} Multiplicity(m: Multiset, o: Box): int {
+    match m
+    case Nil => 0
+    case Cons(x, tail) =>
+      TailIncreasing(m);
+      BoolInt(x == o) + Multiplicity(tail, o)
+  }
+
+  function BoolInt(b: bool): nat {
+    if b then 1 else 0
+  }
+
+  function {:extract_boogie_name "MultiSet#UpdateMultiplicity"} UpdateMultiplicity(m: Multiset, o: Box, n: int): Multiset
+  {
+    if n < 0 then m else
+    UpdatePreservesIncreasing(m, o, n);
+    Update(m, o, n)
+  }
+
+  function Update(m: List<Box>, o: Box, n: nat): List<Box>
+  {
+    if m.Cons? && Less(m.head, o) then
+      Cons(m.head, Update(m.tail, o, n))
+    else if n != 0 then
+      Cons(o, Update(m, o, n - 1))
+    else if m == Nil then
+      Nil
+    else if m.head == o then
+      Update(m.tail, o, 0)
+    else
+      m
+  }
+
+  lemma {:extract_pattern Multiplicity(UpdateMultiplicity(m, o, n), p)} SelectOfUpdate(m: Multiset, o: Box, n: int, p: Box)
+    requires 0 <= n
+    ensures o == p ==> Multiplicity(UpdateMultiplicity(m, o, n), p) == n
+    ensures o != p ==> Multiplicity(UpdateMultiplicity(m, o, n), p) == Multiplicity(m, p)
+  {
+    if o == p {
+      MultiplicityUpdateSame(m, o, n);
+    } else {
+      MultiplicityUpdateDifferent(m, o, n, p);
+    }
+  }
+
+  lemma MultiplicityUpdateSame(m: Multiset, o: Box, n: int)
+    requires 0 <= n
+    ensures (UpdatePreservesIncreasing(m, o, n);
+             Multiplicity(Update(m, o, n), o) == n)
+  {
+    var u := Update(m, o, n);
+    UpdatePreservesIncreasing(m, o, n);
+    if m.Cons? && Less(m.head, o) {
+      assert u == Cons(m.head, Update(m.tail, o, n));
+      TailIncreasing(m);
+    } else if n != 0 {
+      assert u == Cons(o, Update(m, o, n - 1));
+      UpdatePreservesIncreasing(m, o, n - 1);
+    } else if m == Nil {
+      assert u == Nil;
+    } else if m.head == o {
+      assert u == Update(m.tail, o, 0);
+      calc {
+        Multiplicity(u, o);
+        Multiplicity(Update(m.tail, o, 0), o);
+        { TailIncreasing(m); MultiplicityUpdateSame(m.tail, o, 0); }
+        0;
+      }
+    } else {
+      assert u == m;
+      assert m.Cons? && m.head != o;
+      assert !Less(m.head, o);
+      assert Less(o, m.head) by {
+        Connected(m.head, o);
+      }
+      ZeroMultiplicityForLargerElements(m, o);
+    }
+  }
+
+  lemma MultiplicityUpdateDifferent(m: Multiset, o: Box, n: int, p: Box)
+    requires 0 <= n && o != p
+    ensures (UpdatePreservesIncreasing(m, o, n);
+             Multiplicity(Update(m, o, n), p) == Multiplicity(m, p))
+  {
+    var u := Update(m, o, n);
+    UpdatePreservesIncreasing(m, o, n);
+    if m.Cons? && Less(m.head, o) {
+      assert u == Cons(m.head, Update(m.tail, o, n));
+      TailIncreasing(m);
+    } else if n != 0 {
+      assert u == Cons(o, Update(m, o, n - 1));
+      UpdatePreservesIncreasing(m, o, n - 1);
+    } else if m == Nil {
+      assert u == Nil;
+    } else if m.head == o {
+      assert u == Update(m.tail, o, 0);
+      calc {
+        Multiplicity(u, p);
+        Multiplicity(Update(m.tail, o, 0), p);
+        { TailIncreasing(m); MultiplicityUpdateDifferent(m.tail, o, 0, p); }
+        Multiplicity(m.tail, p);
+      }
+    } else {
+      assert u == m;
+    }
+  }
+
+  lemma ElementsOfUpdate(m: List<Box>, o: Box, n: nat, m': List<Box>)
+    requires m' == Update(m, o, n)
+    ensures forall i :: 0 <= i < m'.Length() ==> m'.At(i) == o || m.Contains(m'.At(i))
+  {
+    forall i | 0 <= i < m.Length() {
+      m.AtContains(i, m.At(i));
+    }
+  }
+
+  lemma HeadIsLeast(x: Box, m: List<Box>)
+    requires Increasing(m)
+    requires m == Nil || Below(x, m.head)
+    ensures forall i :: 0 <= i < m.Length() ==> Below(x, m.At(i))
+  {
+    forall i | 1 <= i < m.Length()
+      ensures Below(x, m.At(i))
+    {
+      Transitive(x, m.At(0), m.At(i));
+    }
+  }
+
+  lemma ConsUpdatePreservesIncreasing(x: Box, m: List<Box>, o: Box, n: nat)
+    requires Increasing(m)
+    requires Increasing(Update(m, o, n))
+    requires forall i :: 0 <= i < m.Length() ==> Below(x, m.At(i))
+    requires Below(x, o)
+    ensures Increasing(Cons(x, Update(m, o, n)))
+  {
+    var m1 := Update(m, o, n);
+    var m' := Cons(x, m1);
+
+    assert Increasing(m') by {
+      PrependPreservesIncreasingAll(x, m1) by {
+        forall i | 0 <= i < m1.Length()
+          ensures Below(x, m1.At(i))
+        {
+          ElementsOfUpdate(m, o, n, m1);
+          if m1.At(i) != o {
+            var j := m.ContainsAt(m1.At(i));
+            assert m1.At(i) == m.At(j);
+            if j == 0 {
+              assert m.At(j) == m.head;
+            } else {
+              assert Below(x, m.At(j)) by {
+                Transitive(x, m.At(0), m.At(j));
+              }
+            }
+          }
+        }
+    }
+    }
+  }
+
+  lemma UpdatePreservesIncreasing(m: List<Box>, o: Box, n: nat)
+    requires Increasing(m)
+    ensures Increasing(Update(m, o, n))
+  {
+    var m' := Update(m, o, n);
+    if m.Cons? && Less(m.head, o) {
+      assert m' == Cons(m.head, Update(m.tail, o, n));
+      TailIncreasing(m);
+      m.HeadTailAt();
+      ConsUpdatePreservesIncreasing(m.head, m.tail, o, n);
+
+    } else if n != 0 {
+      assert m' == Cons(o, Update(m, o, n - 1));
+      Reflexive(o);
+      assert m == Nil || Below(o, m.head) by {
+        if m != Nil {
+          NotLess(m.head, o);
+        }
+      }
+      HeadIsLeast(o, m);
+      ConsUpdatePreservesIncreasing(o, m, o, n - 1);
+
+    } else if m == Nil {
+      assert m' == Nil;
+
+    } else if m.head == o {
+      assert m' == Update(m.tail, o, n);
+      TailIncreasing(m);
+
+    } else {
+      assert m' == m;
+    }
+  }
+
+  lemma PrependPreservesIncreasingAll(o: Box, m: List<Box>)
+    requires Increasing(m)
+    requires forall i :: 0 <= i < m.Length() ==> Below(o, m.At(i))
+    ensures Increasing(Cons(o, m))
+  {
+  }
+
+  lemma PrependPreservesIncreasing(o: Box, m: List<Box>)
+    requires Increasing(m)
+    requires m == Nil || Below(o, m.head)
+    ensures Increasing(Cons(o, m))
+  {
+    if m != Nil {
+      PrependPreservesIncreasingAll(o, m) by {
+        forall i | 0 <= i < m.Length()
+          ensures Below(o, m.At(i))
+        {
+          assert Below(o, m.At(i)) by {
+            Reflexive(m.At(0));
+            Transitive(o, m.At(0), m.At(i));
+          }
+        }
+      }
+    }
+  }
+
+  // function $IsGoodMultiSet(ms: MultiSet): bool;
+  predicate {:extract_boogie_name "$IsGoodMultiSet"} IsGood(ms: Multiset) {
+    true
+  }
+
+  // // ints are non-negative, used after havocing, and for conversion from sequences to multisets.
+  // axiom (forall ms: MultiSet :: { $IsGoodMultiSet(ms) }
+  //   $IsGoodMultiSet(ms) <==>
+  //   (forall bx: Box :: { ms[bx] } 0 <= ms[bx] && ms[bx] <= MultiSet#Card(ms)));
+  lemma {:extract_pattern IsGood(ms)} GoodDefinition(ms: Multiset)
+    ensures IsGood(ms) <==> forall bx {:extract_pattern Multiplicity(ms, bx)} :: 0 <= Multiplicity(ms, bx) && Multiplicity(ms, bx) <= Card(ms)
+  {
+    forall bx {
+      MultiplicityCard(ms, bx);
+    }
+  }
+
+  lemma MultiplicityCard(m: Multiset, x: Box)
+    ensures 0 <= Multiplicity(m, x) <= Card(m)
+  {
+    match m
+    case Nil =>
+    case Cons(y, tail) =>
+      TailIncreasing(m);
+  }
+
+  // function MultiSet#Card(MultiSet): int;
+  function {:extract_boogie_name "MultiSet#Card"} Card(m: Multiset): int {
+    m.Length()
+  }
+
+  // axiom (forall s: MultiSet :: { MultiSet#Card(s) } 0 <= MultiSet#Card(s));
+  lemma {:extract_pattern Card(s)} AboutCard(s: Multiset)
+    ensures 0 <= Card(s)
+  {
+  }
+
+  // axiom (forall s: MultiSet, x: Box, n: int :: { MultiSet#Card(s[x := n]) }
+  //   0 <= n ==> MultiSet#Card(s[x := n]) == MultiSet#Card(s) - s[x] + n);
+  lemma {:extract_pattern Card(UpdateMultiplicity(s, x, n))} CardUpdate(s: Multiset, x: Box, n: int)
+    requires 0 <= n
+    ensures Card(UpdateMultiplicity(s, x, n)) == Card(s) - Multiplicity(s, x) + n
+  {
+    var u := UpdateMultiplicity(s, x, n);
+    if s.Cons? && Less(s.head, x) {
+      assert u == Cons(s.head, Update(s.tail, x, n));
+      calc {
+        Card(u);
+        Card(Cons(s.head, Update(s.tail, x, n)));
+        { TailIncreasing(s); }
+        Card(Cons(s.head, UpdateMultiplicity(s.tail, x, n)));
+        1 + Card(UpdateMultiplicity(s.tail, x, n));
+        { CardUpdate(s.tail, x, n); }
+        1 + Card(s.tail) - Multiplicity(s.tail, x) + n;
+        Card(s) - Multiplicity(s.tail, x) + n;
+      }
+
+    } else if n != 0 {
+      assert u == Cons(x, Update(s, x, n - 1));
+      calc {
+        Card(u);
+        Card(Cons(x, Update(s, x, n - 1)));
+        Card(Cons(x, UpdateMultiplicity(s, x, n - 1)));
+        1 + Card(UpdateMultiplicity(s, x, n - 1));
+        { CardUpdate(s, x, n - 1); }
+        1 + Card(s) - Multiplicity(s, x) + n - 1;
+      }
+
+    } else if s == Nil {
+      assert u == Nil;
+
+    } else if s.head == x {
+      assert u == Update(s.tail, x, 0);
+      calc {
+        Card(u);
+        Card(Update(s.tail, x, 0));
+        { TailIncreasing(s); }
+        Card(UpdateMultiplicity(s.tail, x, 0));
+        { CardUpdate(s.tail, x, 0); }
+        Card(s.tail) - Multiplicity(s.tail, x) + n;
+        { assert Card(s) == 1 + Card(s.tail); }
+        Card(s) - 1 - Multiplicity(s.tail, x) + n;
+      }
+
+    } else {
+      assert u == s;
+      assert s.Cons? && s.head != x;
+      assert !Less(s.head, x);
+      assert Less(x, s.head) by {
+        Connected(s.head, x);
+      }
+      ZeroMultiplicityForLargerElements(s, x);
+    }
+  }
+
+  lemma ZeroMultiplicityForLargerElements(s: Multiset, x: Box)
+    requires s == Nil || Less(x, s.head)
+    ensures Multiplicity(s, x) == 0
+  {
+    match s
+    case Nil =>
+    case Cons(y, tail) =>
+      TailIncreasing(s);
+      if tail != Nil {
+        assert Less(x, s.At(0)) && Below(s.At(0), s.At(1));
+        LessBelowTransitive(x, s.At(0), s.At(1));
+      }
+      ZeroMultiplicityForLargerElements(tail, x);
+  }
+
+  lemma ZeroMultiplicityForNonElements(s: Multiset, o: Box)
+    requires !s.Contains(o)
+    ensures Multiplicity(s, o) == 0
+  {
+    NonZeroMultiplicityForElements(s, o);
+  }
+
+  lemma NonZeroMultiplicityForElements(s: Multiset, o: Box)
+    ensures s.Contains(o) <==> Multiplicity(s, o) != 0
+  {
+    match s
+    case Nil =>
+    case Cons(x, tail) =>
+      TailIncreasing(s);
+      assert Multiplicity(s, o) == BoolInt(x == o) + Multiplicity(tail, o);
+      if x == o {
+        MultiplicityCard(tail, o);
+      } else {
+        NonZeroMultiplicityForElements(tail, o);
+      }
+  }
+
+  // function MultiSet#Empty(): MultiSet;
+  function {:extract_boogie_name "MultiSet#Empty"} Empty(): Multiset {
+    Nil
+  }
+
+  // axiom (forall o: Box :: { MultiSet#Empty()[o] } MultiSet#Empty()[o] == 0);
+  lemma {:extract_pattern Multiplicity(Empty(), o)} EmptyMultiplicities(o: Box)
+    ensures Multiplicity(Empty(), o) == 0
+  {
+  }
+
+  // axiom (forall s: MultiSet :: { MultiSet#Card(s) }
+  //   (MultiSet#Card(s) == 0 <==> s == MultiSet#Empty()) &&
+  //   (MultiSet#Card(s) != 0 ==> (exists x: Box :: 0 < s[x])));
+  lemma {:extract_pattern Card(s)} CardVsEmpty(s: Multiset)
+    ensures Card(s) == 0 <==> s == Empty()
+    ensures Card(s) != 0 ==> exists x {:extract_pattern Multiplicity(s, x)} :: 0 < Multiplicity(s, x)
+  {
+    if Card(s) != 0 {
+      assert s.Cons?;
+      calc {
+        Multiplicity(s, s.head);
+      ==  { TailIncreasing(s); }
+        1 + Multiplicity(s.tail, s.head);
+      >  { MultiplicityCard(s.tail, s.head); }
+        0;
+      }
+    }
+  }
+
+  // function MultiSet#Singleton(Box): MultiSet;
+  function {:extract_boogie_name "MultiSet#Singleton"} Singleton(o: Box): Multiset {
+    var singleton := Cons(o, Nil);
+    assert singleton.Length() == 1;
+    singleton
+  }
+
+  // axiom (forall r: Box, o: Box :: { MultiSet#Singleton(r)[o] } (MultiSet#Singleton(r)[o] == 1 <==> r == o) &&
+  //                                                             (MultiSet#Singleton(r)[o] == 0 <==> r != o));
+  lemma {:extract_pattern Multiplicity(Singleton(r), o)} AboutSingleton(r: Box, o: Box)
+    ensures Multiplicity(Singleton(r), o) == 1 <==> r == o
+    ensures Multiplicity(Singleton(r), o) == 0 <==> r != o
+  {
+  }
+
+  // axiom (forall r: Box :: { MultiSet#Singleton(r) } MultiSet#Singleton(r) == MultiSet#UnionOne(MultiSet#Empty(), r));
+  lemma {:extract_pattern Singleton(r)} SingletonUnionOne(r: Box)
+    ensures Singleton(r) == UnionOne(Empty(), r)
+  {
+  }
+
+  // function MultiSet#UnionOne(MultiSet, Box): MultiSet;
+  function {:extract_boogie_name "MultiSet#UnionOne"} UnionOne(m: Multiset, o: Box): Multiset
+    ensures UnionOne(m, o).Cons?
+    decreases m, 0
+  {
+    if m.Cons? && Less(m.head, o) then
+      TailIncreasing(m);
+      var m' := UnionOne(m.tail, o);
+      assert Below(m.head, m'.head) by {
+        if m'.head != o {
+          assert m.head == m.At(0);
+          assert m'.head == m.tail.head == m.At(1);
+        }
+      }
+      PrependPreservesIncreasing(m.head, m');
+      Cons(m.head, m')
+    else
+      assert m == Nil || Below(o, m.head) by {
+        if m != Nil {
+          NotLess(m.head, o);
+        }
+      }
+      PrependPreservesIncreasing(o, m);
+      Cons(o, m)
+  }
+
+  // // pure containment axiom (in the original multiset or is the added element)
+  // axiom (forall a: MultiSet, x: Box, o: Box :: { MultiSet#UnionOne(a,x)[o] }
+  //   0 < MultiSet#UnionOne(a,x)[o] <==> o == x || 0 < a[o]);
+  lemma {:extract_pattern Multiplicity(UnionOne(a, x), o)} PureContainment(a: Multiset, x: Box, o: Box)
+    ensures 0 < Multiplicity(UnionOne(a, x), o) <==> o == x || 0 < Multiplicity(a, o)
+  {
+    MultiplicityDelta(a, x, o);
+    MultiplicityCard(a, x);
+  }
+
+  lemma UnionOneContains(a: Multiset, x: Box, o: Box)
+    ensures UnionOne(a, x).Contains(o) <==> o == x || a.Contains(o)
+  {
+    calc {
+      UnionOne(a, x).Contains(o);
+      {  NonZeroMultiplicityForElements(UnionOne(a, x), o); }
+      Multiplicity(UnionOne(a, x), o) != 0;
+      { MultiplicityCard(UnionOne(a, x), o); }
+      0 < Multiplicity(UnionOne(a, x), o);
+      { PureContainment(a, x, o); }
+      o == x || 0 < Multiplicity(a, o);
+      { MultiplicityCard(a, o); }
+      o == x || Multiplicity(a, o) != 0;
+      { NonZeroMultiplicityForElements(a, o); }
+      o == x || a.Contains(o);
+    }
+  }
+
+  // // union-ing increases count by one
+  // axiom (forall a: MultiSet, x: Box :: { MultiSet#UnionOne(a, x) }
+  //   MultiSet#UnionOne(a, x)[x] == a[x] + 1);
+  lemma {:extract_pattern UnionOne(a, x)} MultiplicityUnionOne(a: Multiset, x: Box)
+    ensures Multiplicity(UnionOne(a, x), x) == Multiplicity(a, x) + 1
+  {
+    if a.Cons? {
+      TailIncreasing(a);
+    }
+  }
+
+  lemma MultiplicityDelta(a: Multiset, x: Box, y: Box)
+    ensures Multiplicity(UnionOne(a, x), y) == BoolInt(x == y) + Multiplicity(a, y)
+  {
+    if x == y {
+      MultiplicityUnionOne(a, y);
+    } else {
+      OtherElementsUnchanged(a, x, y);
+    }
+  }
+
+  // // non-decreasing
+  // axiom (forall a: MultiSet, x: Box, y: Box :: { MultiSet#UnionOne(a, x), a[y] }
+  //   0 < a[y] ==> 0 < MultiSet#UnionOne(a, x)[y]);
+  lemma {:extract_pattern UnionOne(a, x), Multiplicity(a, y)} NonDecreasing(a: Multiset, x: Box, y: Box)
+    requires 0 < Multiplicity(a, y)
+    ensures 0 < Multiplicity(UnionOne(a, x), y)
+  {
+    MultiplicityDelta(a, x, y);
+  }
+
+  // // other elements unchanged
+  // axiom (forall a: MultiSet, x: Box, y: Box :: { MultiSet#UnionOne(a, x), a[y] }
+  //   x != y ==> a[y] == MultiSet#UnionOne(a, x)[y]);
+  lemma {:extract_pattern UnionOne(a, x), Multiplicity(a, y)} OtherElementsUnchanged(a: Multiset, x: Box, y: Box)
+    requires x != y
+    ensures Multiplicity(a, y) == Multiplicity(UnionOne(a, x), y)
+  {
+    if a.Cons? {
+      TailIncreasing(a);
+    }
+  }
+
+  // axiom (forall a: MultiSet, x: Box :: { MultiSet#Card(MultiSet#UnionOne(a, x)) }
+  //   MultiSet#Card(MultiSet#UnionOne(a, x)) == MultiSet#Card(a) + 1);
+  lemma {:extract_pattern Card(UnionOne(a, x))} CardUnionOne(a: Multiset, x: Box)
+    ensures Card(UnionOne(a, x)) == Card(a) + 1
+  {
+    if a.Cons? {
+      TailIncreasing(a);
+    }
+  }
+
+  // function MultiSet#Union(MultiSet, MultiSet): MultiSet;
+  function {:extract_boogie_name "MultiSet#Union"} Union(a: Multiset, b: Multiset): Multiset {
+    match a
+    case Nil => b
+    case Cons(x, tail) =>
+      TailIncreasing(a);
+      Union(tail, UnionOne(b, x))
+  }
+
+  // // union-ing is the sum of the contents
+  // axiom (forall a: MultiSet, b: MultiSet, o: Box :: { MultiSet#Union(a,b)[o] }
+  //   MultiSet#Union(a,b)[o] == a[o] + b[o]);
+  lemma {:extract_pattern Multiplicity(Union(a, b), o)} MultiplicityUnion(a: Multiset, b: Multiset, o: Box)
+    ensures Multiplicity(Union(a, b), o) == Multiplicity(a, o) + Multiplicity(b, o)
+  {
+    match a
+    case Nil =>
+    case Cons(x, tail) =>
+      TailIncreasing(a);
+      calc {
+        Multiplicity(Union(a, b), o);
+        Multiplicity(Union(tail, UnionOne(b, x)), o);
+        { MultiplicityUnion(tail, UnionOne(b, x), o); }
+        Multiplicity(tail, o) + Multiplicity(UnionOne(b, x), o);
+        { MultiplicityDelta(b, x, o); }
+        Multiplicity(tail, o) + BoolInt(x == o) + Multiplicity(b, o);
+        Multiplicity(a, o) + Multiplicity(b, o);
+      }
+  }
+
+  // axiom (forall a: MultiSet, b: MultiSet :: { MultiSet#Card(MultiSet#Union(a,b)) }
+  //   MultiSet#Card(MultiSet#Union(a,b)) == MultiSet#Card(a) + MultiSet#Card(b));
+  lemma {:extract_pattern Card(Union(a, b))} CardUnion(a: Multiset, b: Multiset)
+    ensures Card(Union(a, b)) == Card(a) + Card(b)
+  {
+    match a
+    case Nil =>
+    case Cons(x, tail) =>
+      calc {
+        Card(Union(a, b));
+        { TailIncreasing(a); }
+        Card(Union(tail, UnionOne(b, x)));
+        { CardUnion(tail, UnionOne(b, x)); }
+        Card(tail) + Card(UnionOne(b, x));
+        { CardUnionOne(b, x); }
+        Card(tail) + 1 + Card(b);
+        Card(a) + Card(b);
+      }
+  }
+
+  // function MultiSet#Intersection(MultiSet, MultiSet): MultiSet;
+  function {:extract_boogie_name "MultiSet#Intersection"} Intersection(a: Multiset, b: Multiset): Multiset {
+    match a
+    case Nil => Nil
+    case Cons(x, tail) =>
+      TailIncreasing(a);
+      if b.Contains(x) then
+        UnionOne(Intersection(tail, RemoveOne(b, x)), x)
+      else
+        Intersection(tail, b)
+  }
+
+  function RemoveOne(a: Multiset, x: Box): Multiset
+    requires a.Contains(x)
+    decreases a, 0
+  {
+    TailIncreasing(a);
+    if a.head == x then
+      a.tail
+    else
+      TailIncreasing(a);
+      a.HeadTailAt();
+      RemoveOnePreservesBelow(a.tail, x, a.head);
+      PrependPreservesIncreasingAll(a.head, RemoveOne(a.tail, x));
+      Cons(a.head, RemoveOne(a.tail, x))
+  }
+
+  lemma RemoveOnePreservesBelow(a: Multiset, x: Box, o: Box)
+    requires a.Contains(x)
+    requires forall i :: 0 <= i < a.Length() ==> Below(o, a.At(i))
+    ensures forall i :: 0 <= i < RemoveOne(a, x).Length() ==> Below(o, RemoveOne(a, x).At(i))
+    decreases a
+  {
+    a.HeadTailAt();
+    var a' := RemoveOne(a, x);
+    if a.head == x {
+      assert a' == a.tail;
+    } else {
+      TailIncreasing(a);
+      assert a' == Cons(a.head, RemoveOne(a.tail, x));
+    }
+  }
+
+  lemma MultiplicityRemoveOne(a: Multiset, x: Box, o: Box)
+    requires a.Contains(x)
+    ensures Multiplicity(RemoveOne(a, x), o) == Multiplicity(a, o) - BoolInt(x == o)
+  {
+    var a' := RemoveOne(a, x);
+    if a.head == x {
+      assert a' == a.tail;
+    } else {
+      TailIncreasing(a);
+      assert a' == Cons(a.head, RemoveOne(a.tail, x));
+    }
+  }
+
+  // axiom (forall a: MultiSet, b: MultiSet, o: Box :: { MultiSet#Intersection(a,b)[o] }
+  //   MultiSet#Intersection(a,b)[o] == Math#min(a[o],  b[o]));
+  lemma {:extract_pattern Multiplicity(Intersection(a, b), o)} MultiplicityIntersection(a: Multiset, b: Multiset, o: Box)
+    ensures Multiplicity(Intersection(a, b), o) == Math.Min(Multiplicity(a, o), Multiplicity(b, o))
+  {
+    var intersection := Intersection(a, b);
+    match a
+    case Nil =>
+      assert intersection == Nil;
+      calc {
+        Multiplicity(intersection, o);
+        0;
+        { MultiplicityCard(b, o); Math.Min0(0, Multiplicity(b, o)); }
+        Math.Min(0, Multiplicity(b, o));
+        Math.Min(Multiplicity(a, o), Multiplicity(b, o));
+      }
+    case Cons(x, tail) =>
+      TailIncreasing(a);
+      if b.Contains(x) {
+        assert intersection == UnionOne(Intersection(tail, RemoveOne(b, x)), x);
+        var intersection' := Intersection(tail, RemoveOne(b, x));
+        calc {
+          Multiplicity(intersection, o);
+          Multiplicity(UnionOne(intersection', x), o);
+          { MultiplicityDelta(intersection', x, o); }
+          Multiplicity(intersection', o) + BoolInt(x == o);
+          { MultiplicityIntersection(tail, RemoveOne(b, x), o); }
+          Math.Min(Multiplicity(tail, o), Multiplicity(RemoveOne(b, x), o)) + BoolInt(x == o);
+          { MultiplicityRemoveOne(b, x, o); }
+          Math.Min(Multiplicity(tail, o), Multiplicity(b, o) - BoolInt(x == o)) + BoolInt(x == o);
+          { assert Multiplicity(a, o) == BoolInt(x == o) + Multiplicity(tail, o); }
+          Math.Min(Multiplicity(a, o) - BoolInt(x == o), Multiplicity(b, o) - BoolInt(x == o)) + BoolInt(x == o);
+          { MinDistribution(Multiplicity(a, o), Multiplicity(b, o), BoolInt(x == o)); }
+          Math.Min(Multiplicity(a, o), Multiplicity(b, o));
+        }
+      } else if x != o {
+        // proof automatic
+      } else {
+        assert intersection == Intersection(tail, b);
+        calc {
+          Multiplicity(intersection, o);
+          Multiplicity(Intersection(tail, b), o);
+          { MultiplicityIntersection(tail, b, o); }
+          Math.Min(Multiplicity(tail, o), Multiplicity(b, o));
+          { ZeroMultiplicityForNonElements(b, o); }
+          Math.Min(Multiplicity(tail, o), 0);
+          { ZeroMinMultiplicity(tail, o); }
+          0;
+          { ZeroMinMultiplicity(a, o); }
+          Math.Min(Multiplicity(a, o), 0);
+          { ZeroMultiplicityForNonElements(b, o); }
+          Math.Min(Multiplicity(a, o), Multiplicity(b, o));
+        }
+      }
+  }
+
+  lemma ZeroMinMultiplicity(a: Multiset, o: Box)
+    ensures Math.Min(0, Multiplicity(a, o)) == 0 == Math.Min(Multiplicity(a, o), 0)
+  {
+    var multiplicity := Multiplicity(a, o);
+    assert 0 <= multiplicity by {
+      MultiplicityCard(a, o);
+    }
+    assert Math.Min(0, multiplicity) == 0 by {
+      Math.Min0(0, multiplicity);
+    }
+    assert Math.Min(multiplicity, 0) == 0 by {
+      Math.Min1(multiplicity, 0);
+    }
+  }
+
+  // The axioms about Min in module Math have been crafted for extraction into the Dafny prelude.
+  // But they speak of a precise definition of Min, which we prove here.
+  lemma RevealMin()
+    ensures forall a, b :: Math.Min(a, b) == if a < b then a else b
+  {
+    forall a, b
+      ensures Math.Min(a, b) == if a < b then a else b
+    {
+      if a < b {
+        Math.Min0(a, b);
+      } else {
+        Math.Min1(a, b);
+      }
+    }
+  }
+
+  lemma MinDistribution(a: int, b: int, c: int)
+    ensures Math.Min(a - c, b - c) == Math.Min(a, b) - c
+  {
+    RevealMin();
+  }
+
+  // // left and right pseudo-idempotence
+  // axiom (forall a, b: MultiSet :: { MultiSet#Intersection(MultiSet#Intersection(a, b), b) }
+  //   MultiSet#Intersection(MultiSet#Intersection(a, b), b) == MultiSet#Intersection(a, b));
+  lemma {:extract_pattern Intersection(Intersection(a, b), b)} IntersectionPseudoIdempotenceB(a: Multiset, b: Multiset)
+    ensures Intersection(Intersection(a, b), b) == Intersection(a, b)
+  {
+    var ab := Intersection(a, b);
+    forall o {
+      calc {
+        Multiplicity(Intersection(ab, b), o);
+        { MultiplicityIntersection(ab, b, o); }
+        Math.Min(Multiplicity(ab, o), Multiplicity(b, o));
+        { MultiplicityIntersection(a, b, o); }
+        Math.Min(Math.Min(Multiplicity(a, o), Multiplicity(b, o)), Multiplicity(b, o));
+        { RevealMin(); }
+        Math.Min(Multiplicity(a, o), Multiplicity(b, o));
+        { MultiplicityIntersection(a, b, o); }
+        Multiplicity(Intersection(a, b), o);
+      }
+    }
+    Extensionality(Intersection(ab, b), ab);
+  }
+
+  // axiom (forall a, b: MultiSet :: { MultiSet#Intersection(a, MultiSet#Intersection(a, b)) }
+  //   MultiSet#Intersection(a, MultiSet#Intersection(a, b)) == MultiSet#Intersection(a, b));
+  lemma {:extract_pattern Intersection(a, Intersection(a, b))} IntersectionPseudoIdempotenceA(a: Multiset, b: Multiset)
+    ensures Intersection(a, Intersection(a, b)) == Intersection(a, b)
+  {
+    var ab := Intersection(a, b);
+    forall o {
+      calc {
+        Multiplicity(Intersection(a, ab), o);
+        { MultiplicityIntersection(a, ab, o); }
+        Math.Min(Multiplicity(a, o), Multiplicity(ab, o));
+        { MultiplicityIntersection(a, b, o); }
+        Math.Min(Multiplicity(a, o), Math.Min(Multiplicity(a, o), Multiplicity(b, o)));
+        { RevealMin(); }
+        Math.Min(Multiplicity(a, o), Multiplicity(b, o));
+        { MultiplicityIntersection(a, b, o); }
+        Multiplicity(Intersection(a, b), o);
+      }
+    }
+    Extensionality(Intersection(a, ab), ab);
+  }
+
+  // // multiset difference, a - b. clip() makes it positive.
+  // function MultiSet#Difference(MultiSet, MultiSet): MultiSet;
+  function {:extract_boogie_name "MultiSet#Difference"} Difference(a: Multiset, b: Multiset): Multiset {
+    match a
+    case Nil => Nil
+    case Cons(x, tail) =>
+      TailIncreasing(a);
+      if b.Contains(x) then
+        Difference(tail, RemoveOne(b, x))
+      else
+        UnionOne(Difference(tail, b), x)
+  }
+
+  lemma ClipNonPos(i: int)
+    requires i <= 0
+    ensures Math.Clip(i) == 0
+  {
+    if i == 0 {
+      Math.ClipId(i);
+    } else {
+      Math.ClipZero(i);
+    }
+  }
+
+  lemma ClipDistribution(a: nat, b: nat)
+    ensures Math.Clip(a) + b == Math.Clip(a + b)
+  {
+    calc {
+      Math.Clip(a) + b;
+      { Math.ClipId(a); }
+      a + b;
+      { Math.ClipId(a + b); }
+      Math.Clip(a + b);
+    }
+  }
+
+  // axiom (forall a: MultiSet, b: MultiSet, o: Box :: { MultiSet#Difference(a,b)[o] }
+  //   MultiSet#Difference(a,b)[o] == Math#clip(a[o] - b[o]));
+  lemma {:extract_pattern Multiplicity(Difference(a, b), o)} MultiplicityDifference(a: Multiset, b: Multiset, o: Box)
+    ensures Multiplicity(Difference(a, b), o) == Math.Clip(Multiplicity(a, o) - Multiplicity(b, o))
+  {
+    var d := Difference(a, b);
+    match a
+    case Nil =>
+      assert d == Nil;
+      assert Multiplicity(d, o) == 0 == Multiplicity(a, o);
+      MultiplicityCard(b, o);
+      ClipNonPos(0 - Multiplicity(b, o));
+    case Cons(x, tail) =>
+      TailIncreasing(a);
+      if b.Contains(x) {
+        assert d == Difference(tail, RemoveOne(b, x));
+        calc {
+          Multiplicity(d, o);
+          Multiplicity(Difference(tail, RemoveOne(b, x)), o);
+          { MultiplicityDifference(tail, RemoveOne(b, x), o); }
+          Math.Clip(Multiplicity(tail, o) - Multiplicity(RemoveOne(b, x), o));
+          { MultiplicityRemoveOne(b, x, o); }
+          Math.Clip(Multiplicity(tail, o) - Multiplicity(b, o) + BoolInt(x == o));
+          { assert Multiplicity(a, o) == BoolInt(x == o) + Multiplicity(tail, o); }
+          Math.Clip(Multiplicity(a, o) - Multiplicity(b, o));
+        }
+      } else {
+        assert d == UnionOne(Difference(tail, b), x);
+        calc {
+          Multiplicity(d, o);
+          Multiplicity(UnionOne(Difference(tail, b), x), o);
+          { MultiplicityDelta(Difference(tail, b), x, o); }
+          Multiplicity(Difference(tail, b), o) + BoolInt(x == o);
+          { MultiplicityDifference(tail, b, o); }
+          Math.Clip(Multiplicity(tail, o) - Multiplicity(b, o)) + BoolInt(x == o);
+        }
+        if x == o {
+          calc {
+            Math.Clip(Multiplicity(tail, o) - Multiplicity(b, o)) + BoolInt(x == o);
+            { ZeroMultiplicityForNonElements(b, o); }
+            Math.Clip(Multiplicity(tail, o)) + BoolInt(x == o);
+            { ClipMultiplicity(tail, o); }
+            Multiplicity(tail, o) + BoolInt(x == o);
+            Multiplicity(a, o);
+            { ClipMultiplicity(a, o); }
+            Math.Clip(Multiplicity(a, o));
+            { ZeroMultiplicityForNonElements(b, o); }
+            Math.Clip(Multiplicity(a, o) - Multiplicity(b, o));
+          }
+        } else {
+          calc {
+            Math.Clip(Multiplicity(tail, o) - Multiplicity(b, o)) + BoolInt(x == o);
+            Math.Clip(Multiplicity(a, o) - BoolInt(x == o) - Multiplicity(b, o)) + BoolInt(x == o);
+            Math.Clip(Multiplicity(a, o) - Multiplicity(b, o));
+          }
+        }
+      }
+  }
+
+  lemma ClipMultiplicity(a: Multiset, o: Box)
+    ensures Math.Clip(Multiplicity(a, o)) == Multiplicity(a, o)
+  {
+    var multiplicity := Multiplicity(a, o);
+    assert 0 <= multiplicity by {
+      MultiplicityCard(a, o);
+    }
+    Math.ClipId(multiplicity);
+  }
+
+  // axiom (forall a, b: MultiSet, y: Box :: { MultiSet#Difference(a, b), b[y], a[y] }
+  //   a[y] <= b[y] ==> MultiSet#Difference(a, b)[y] == 0 );
+  lemma {:extract_pattern Difference(a, b), Multiplicity(b, y), Multiplicity(a, y)} MultiplicityDifferenceOnDominant(a: Multiset, b: Multiset, y: Box)
+    requires Multiplicity(a, y) <= Multiplicity(b, y)
+    ensures Multiplicity(Difference(a, b), y) == 0
+  {
+    calc {
+      Multiplicity(Difference(a, b), y);
+      { MultiplicityDifference(a, b, y); }
+      Math.Clip(Multiplicity(a, y) - Multiplicity(b, y));
+      { ClipNonPos(Multiplicity(a, y) - Multiplicity(b, y)); }
+      0;
+    }
+  }
+
+  // axiom (forall a, b: MultiSet ::
+  //   { MultiSet#Card(MultiSet#Difference(a, b)) }
+  //   MultiSet#Card(MultiSet#Difference(a, b)) + MultiSet#Card(MultiSet#Difference(b, a))
+  //   + 2 * MultiSet#Card(MultiSet#Intersection(a, b))
+  //     == MultiSet#Card(MultiSet#Union(a, b)) &&
+  //   MultiSet#Card(MultiSet#Difference(a, b)) == MultiSet#Card(a) - MultiSet#Card(MultiSet#Intersection(a, b)));
+  lemma {:extract_pattern Card(Difference(a, b))} CardDifference(a: Multiset, b: Multiset)
+    ensures Card(Difference(a, b)) + Card(Difference(b, a)) + 2 * Card(Intersection(a, b)) == Card(Union(a, b))
+    ensures Card(Difference(a, b)) == Card(a) - Card(Intersection(a, b))
+  {
+    var dab := Difference(a, b);
+    var dba := Difference(b, a);
+    var iab := Intersection(a, b);
+    var uab := Union(a, b);
+
+    assert L0: Union(dab, Union(dba, Union(iab, iab))) == uab by {
+      forall o
+        ensures Multiplicity(Union(dab, Union(dba, Union(iab, iab))), o) == Multiplicity(uab, o)
+      {
+        var ma := Multiplicity(a, o);
+        var mb := Multiplicity(b, o);
+        calc {
+          Multiplicity(Union(dab, Union(dba, Union(iab, iab))), o);
+          { MultiplicityUnion(dab, Union(dba, Union(iab, iab)), o); }
+          Multiplicity(dab, o) + Multiplicity(Union(dba, Union(iab, iab)), o);
+          { MultiplicityUnion(dba, Union(iab, iab), o); }
+          Multiplicity(dab, o) + Multiplicity(dba, o) + Multiplicity(Union(iab, iab), o);
+          { MultiplicityUnion(iab, iab, o); }
+          Multiplicity(dab, o) + Multiplicity(dba, o) + 2 * Multiplicity(iab, o);
+          { MultiplicityDifference(a, b, o); }
+          Math.Clip(ma - mb) + Multiplicity(dba, o) + 2 * Multiplicity(iab, o);
+          { MultiplicityDifference(b, a, o); }
+          Math.Clip(ma - mb) + Math.Clip(mb - ma) + 2 * Multiplicity(iab, o);
+          { MultiplicityIntersection(a, b, o); }
+          Math.Clip(ma - mb) + Math.Clip(mb - ma) + 2 * Math.Min(ma, mb);
+          {
+            if ma <= mb {
+              ClipNonPos(ma - mb);
+              Math.ClipId(mb - ma);
+              Math.Min0(ma, mb);
+            } else {
+              Math.ClipId(ma - mb);
+              Math.ClipZero(mb - ma);
+              Math.Min1(ma, mb);
+            }
+          }
+          ma + mb;
+          { MultiplicityUnion(a, b, o); }
+          Multiplicity(uab, o);
+        }
+      }
+      Extensionality(Union(dab, Union(dba, Union(iab, iab))), uab);
+    }
+
+    assert L1: Union(dab, iab) == a by {
+      forall o {
+        calc {
+          Multiplicity(Union(dab, iab), o);
+          { MultiplicityUnion(dab, iab, o); }
+          Multiplicity(dab, o) + Multiplicity(iab, o);
+          { MultiplicityDifference(a, b, o); }
+          Math.Clip(Multiplicity(a, o) - Multiplicity(b, o)) + Multiplicity(iab, o);
+          { MultiplicityIntersection(a, b, o); }
+          Math.Clip(Multiplicity(a, o) - Multiplicity(b, o)) + Math.Min(Multiplicity(a, o), Multiplicity(b, o));
+          {
+            var ma := Multiplicity(a, o);
+            var mb := Multiplicity(b, o);
+            if mb <= ma {
+              Math.ClipId(ma - mb);
+              Math.Min1(ma, mb);
+            } else {
+              Math.ClipZero(ma - mb);
+              Math.Min0(ma, mb);
+            }
+          }
+          Multiplicity(a, o);
+        }
+      }
+      Extensionality(Union(dab,iab), a);
+    }
+
+    calc {
+      Card(uab);
+      { reveal L0; }
+      Card(Union(dab, Union(dba, Union(iab, iab))));
+      { CardUnion(dab, Union(dba, Union(iab, iab))); }
+      Card(dab) + Card(Union(dba, Union(iab, iab)));
+      { CardUnion(dba, Union(iab, iab)); }
+      Card(dab) + Card(dba) + Card(Union(iab, iab));
+      { CardUnion(iab, iab); }
+      Card(dab) + Card(dba) + 2 * Card(iab);
+    }
+
+    calc {
+      Card(a);
+      { reveal L1; }
+      Card(Union(dab, iab));
+      { CardUnion(dab, iab); }
+      Card(dab) + Card(iab);
+    }
+  }
+
+  // // multiset subset means a must have at most as many of each element as b
+  // function MultiSet#Subset(MultiSet, MultiSet): bool;
+  ghost predicate {:extract_boogie_name "MultiSet#Subset"} Subset(a: Multiset, b: Multiset) {
+    forall o :: Multiplicity(a, o) <= Multiplicity(b, o)
+  }
+
+  // axiom (forall a: MultiSet, b: MultiSet :: { MultiSet#Subset(a,b) }
+  //   MultiSet#Subset(a,b) <==> (forall o: Box :: {a[o]} {b[o]} a[o] <= b[o]));
+  lemma {:extract_pattern Subset(a, b)} SubsetDefinition(a: Multiset, b: Multiset)
+    ensures Subset(a, b) <==> forall o {:extract_pattern Multiplicity(a, o)} {:extract_pattern Multiplicity(b, o)} :: Multiplicity(a, o) <= Multiplicity(b, o)
+  {
+    if !Subset(a, b) {
+      var o := ExhibitSubsetDifference(a, b);
+    }
+  }
+
+  lemma ExhibitSubsetDifference(a: Multiset, b: Multiset) returns (o: Box)
+    requires !Subset(a, b)
+    ensures Multiplicity(a, o) > Multiplicity(b, o)
+  {
+    if a == Nil {
+      assert Subset(a, b) by {
+        forall o {
+          calc {
+            Multiplicity(a, o);
+            0;
+          <=  { MultiplicityCard(b, o); }
+            Multiplicity(b, o);
+          }
+        }
+      }
+      assert false;
+    } else if b == Nil {
+      o := a.head;
+      assert Multiplicity(b, o) == 0;
+      assert Multiplicity(a, o) > 0 by {
+        TailIncreasing(a);
+        MultiplicityCard(a.tail, o);
+      }
+    } else if a.head == b.head {
+      var x := a.head;
+      TailIncreasing(a);
+      TailIncreasing(b);
+      assert !Subset(a.tail, b.tail) by {
+        if Subset(a.tail, b.tail) {
+          assert Subset(a, b);
+          assert false;
+        }
+      }
+      o := ExhibitSubsetDifference(a.tail, b.tail);
+    } else if Less(a.head, b.head) {
+      o := a.head;
+      assert Multiplicity(a, o) > 0 by {
+        TailIncreasing(a);
+        MultiplicityCard(a.tail, o);
+      }
+      assert Multiplicity(b, o) == 0 by {
+        ZeroMultiplicityForLargerElements(b, o);
+      }
+    } else {
+      assert Less(b.head, a.head) by {
+        Connected(a.head, b.head);
+      }
+      TailIncreasing(a);
+      TailIncreasing(b);
+      o := ExhibitSubsetDifference(a, b.tail);
+      assert IH: Multiplicity(a, o) > Multiplicity(b.tail, o);
+      assert Multiplicity(b, o) == Multiplicity(b.tail, o) by {
+        assert Multiplicity(b, o) == BoolInt(b.head == o) + Multiplicity(b.tail, o);
+        assert b.head != o by {
+          if b.head == o {
+            // Because Less(b.head, a.head), the condition "b.head == o" would mean
+            // Multiplicity(a, o) == 0. But we have Multiplicity(a, o) > 0 from the IH.
+            assert Multiplicity(a, o) > 0 by {
+              reveal IH;
+              MultiplicityCard(b.tail, o);
+            }
+            assert Multiplicity(a, o) == 0 by {
+              ZeroMultiplicityForLargerElements(a, o);
+            }
+            assert false;
+          }
+        }
+      }
+    }
+  }
+
+  // function MultiSet#Equal(MultiSet, MultiSet): bool;
+  ghost predicate {:extract_boogie_name "MultiSet#Equal"} Equal(a: Multiset, b: Multiset) {
+    forall o :: Multiplicity(a, o) == Multiplicity(b, o)
+  }
+
+  // axiom (forall a: MultiSet, b: MultiSet :: { MultiSet#Equal(a,b) }
+  //   MultiSet#Equal(a,b) <==> (forall o: Box :: {a[o]} {b[o]} a[o] == b[o]));
+  lemma {:extract_pattern Equal(a, b)} EqualDefinition(a: Multiset, b: Multiset)
+    ensures Equal(a, b) <==>
+            forall o {:extract_pattern Multiplicity(a, o)} {:extract_pattern Multiplicity(b, o)} ::
+              Multiplicity(a, o) == Multiplicity(b, o)
+  {
+    if a != b {
+      var o := ExhibitDifference(a, b);
+    }
+  }
+
+  lemma ExhibitDifference(a: Multiset, b: Multiset) returns (o: Box)
+    requires a != b
+    ensures Multiplicity(a, o) != Multiplicity(b, o)
+    decreases a != Nil, a.Cons? && b.Cons? && !Less(a.head, b.head), a
+  {
+    if a == Nil {
+      o := b.head;
+      assert Multiplicity(a, o) == 0;
+      assert Multiplicity(b, o) > 0 by {
+        TailIncreasing(b);
+        MultiplicityCard(b.tail, o);
+      }
+    } else if b == Nil {
+      o := ExhibitDifference(b, a);
+    } else if a.head == b.head {
+      TailIncreasing(a);
+      TailIncreasing(b);
+      o := ExhibitDifference(a.tail, b.tail);
+    } else if Less(a.head, b.head) {
+      o := a.head;
+      assert Multiplicity(a, o) > 0 by {
+        TailIncreasing(a);
+        MultiplicityCard(a.tail, o);
+      }
+      assert Multiplicity(b, o) == 0 by {
+        ZeroMultiplicityForLargerElements(b, o);
+      }
+    } else {
+      assert Less(b.head, a.head) by {
+        Connected(a.head, b.head);
+      }
+      o := ExhibitDifference(b, a);
+    }
+  }
+
+  // // extensionality axiom for multisets
+  // axiom (forall a: MultiSet, b: MultiSet :: { MultiSet#Equal(a,b) }
+  //   MultiSet#Equal(a,b) ==> a == b);
+  lemma {:extract_pattern Equal(a, b)} Extensionality(a: Multiset, b: Multiset)
+    requires Equal(a, b)
+    ensures a == b
+  {
+    if a != b {
+      var o := ExhibitDifference(a, b);
+      assert false;
+    }
+  }
+
+  // function MultiSet#Disjoint(MultiSet, MultiSet): bool;
+  ghost predicate {:extract_boogie_name "MultiSet#Disjoint"} Disjoint(a: Multiset, b: Multiset) {
+    forall o :: Multiplicity(a, o) == 0 || Multiplicity(b, o) == 0
+  }
+
+  // Because of the fuel parameter getting in the way of quantifier matching patterns, DisjointDefinition is not
+  // straightforward for the verifier. As a workaround, we introduce another function, MultiplicityWrapper, that is
+  // used as a trigger for the quantifier in DisjointDefinition. (Once Dafny's encoding changes to move the fuel
+  // parameter to the CanCall, then this workaround will no longer be needed.)
+  function MultiplicityWrapper(a: Multiset, o: Box): int {
+    Multiplicity(a, o)
+  }
+
+  // axiom (forall a: MultiSet, b: MultiSet :: { MultiSet#Disjoint(a,b) }
+  //   MultiSet#Disjoint(a,b) <==> (forall o: Box :: {a[o]} {b[o]} a[o] == 0 || b[o] == 0));
+  lemma {:extract_pattern Disjoint(a, b)} DisjointDefinition(a: Multiset, b: Multiset)
+    ensures Disjoint(a, b) <==>
+            forall o {:extract_pattern Multiplicity(a, o)} {:extract_pattern Multiplicity(b, o)} {:trigger MultiplicityWrapper(a, o)} ::
+              Multiplicity(a, o) == 0 || Multiplicity(b, o) == 0
+  {
+    if !Disjoint(a, b) {
+      var o :| Multiplicity(a, o) != 0 && Multiplicity(b, o) != 0;
+      assert MultiplicityWrapper(a, o) == Multiplicity(a, o);
+    }
+  }
+
+  // // conversion to a multiset. each element in the original set has duplicity 1.
+  // function MultiSet#FromSet(Set): MultiSet;
+  function {:extract_boogie_name "MultiSet#FromSet"} FromSet(s: Sets.Set): Multiset {
+    s
+  }
+
+  lemma MultiplicityFromSetIsBinary(s: Sets.Set, o: Box)
+    ensures 0 <= Multiplicity(FromSet(s), o) <= 1
+  {
+    match s
+    case Nil =>
+    case Cons(x, tail) =>
+      Sets.TailStrictlyIncreasing(s);
+      assert Multiplicity(s, o) == BoolInt(x == o) + Multiplicity(tail, o);
+      if x == o {
+        assert !tail.Contains(o) by {
+          if tail.Contains(o) {
+            var i := tail.ContainsAt(o);
+            assert o == tail.At(i) == s.At(i + 1);
+            assert x == s.At(0);
+            assert Less(s.At(0), s.At(i + 1));
+            assert x != o;
+            assert false;
+          }
+        }
+        NonZeroMultiplicityForElements(tail, o);
+      } else {
+        MultiplicityFromSetIsBinary(tail, o);
+      }
+  }
+
+  // axiom (forall s: Set, a: Box :: { MultiSet#FromSet(s)[a] }
+  //   (MultiSet#FromSet(s)[a] == 0 <==> !s[a]) &&
+  //   (MultiSet#FromSet(s)[a] == 1 <==> s[a]));
+  lemma {:extract_pattern Multiplicity(FromSet(s), a)} MultiplicityFromSet(s: Sets.Set, a: Box)
+    ensures Multiplicity(FromSet(s), a) == 0 <==> !Sets.IsMember(s, a)
+    ensures Multiplicity(FromSet(s), a) == 1 <==> Sets.IsMember(s, a)
+  {
+    calc {
+      Multiplicity(FromSet(s), a) == 0;
+      Multiplicity(s, a) == 0;
+      { NonZeroMultiplicityForElements(s, a); }
+      !s.Contains(a);
+      !Sets.IsMember(s, a);
+    }
+
+    MultiplicityFromSetIsBinary(s, a);
+  }
+
+  // axiom (forall s: Set :: { MultiSet#Card(MultiSet#FromSet(s)) }
+  //   MultiSet#Card(MultiSet#FromSet(s)) == Set#Card(s));
+  lemma {:extract_pattern Card(FromSet(s))} CardFromSet(s: Sets.Set)
+    ensures Card(FromSet(s)) == Sets.Card(s)
+  {
+  }
+
+  // // conversion to a multiset, from a sequence.
+  // function MultiSet#FromSeq(Seq): MultiSet uses {
+  //   axiom MultiSet#FromSeq(Seq#Empty(): Seq) == MultiSet#Empty(): MultiSet;
+  // }
+  function {:extract_boogie_name "MultiSet#FromSeq"} FromSeq(s: Sequences.Seq): Multiset {
+    match s
+    case Nil => Nil
+    case Cons(x, tail) =>
+      UnionOne(FromSeq(tail), x)
+  }
+
+  lemma {:extract_used_by FromSeq} FromEmptySeq()
+    ensures FromSeq(Sequences.Empty()) == Empty()
+  {
+  }
+
+  // // conversion produces a good map.
+  // axiom (forall s: Seq :: { MultiSet#FromSeq(s) } $IsGoodMultiSet(MultiSet#FromSeq(s)) );
+  lemma {:extract_pattern FromSeq(s)} ConversionGivesGoodMultiset(s: Sequences.Seq)
+    ensures IsGood(FromSeq(s))
+  {
+  }
+
+  // // cardinality axiom
+  // axiom (forall s: Seq ::
+  //   { MultiSet#Card(MultiSet#FromSeq(s)) }
+  //     MultiSet#Card(MultiSet#FromSeq(s)) == Seq#Length(s));
+  lemma {:extract_pattern Card(FromSeq(s))} CardFromSeq(s: Sequences.Seq)
+    ensures Card(FromSeq(s)) == Sequences.Length(s)
+  {
+    match s
+    case Nil =>
+    case Cons(x, tail) =>
+      calc {
+        Card(FromSeq(s));
+        Card(UnionOne(FromSeq(tail), x));
+        { CardUnionOne(FromSeq(tail), x); }
+        1 + Card(FromSeq(tail));
+        { CardFromSeq(tail); }
+        1 + Sequences.Length(tail);
+        Sequences.Length(s);
+      }
+  }
+
+  // // building axiom
+  // axiom (forall s: Seq, v: Box ::
+  //   { MultiSet#FromSeq(Seq#Build(s, v)) }
+  //     MultiSet#FromSeq(Seq#Build(s, v)) == MultiSet#UnionOne(MultiSet#FromSeq(s), v)
+  //   );
+  lemma {:extract_pattern FromSeq(Sequences.Build(s, v))} BuildFromSeq(s: Sequences.Seq, v: Box)
+    ensures FromSeq(Sequences.Build(s, v)) == UnionOne(FromSeq(s), v)
+  {
+    var ss, vv := FromSeq(s), Cons(v, Nil);
+    calc {
+      FromSeq(Sequences.Build(s, v));
+      FromSeq(s.Append(Cons(v, Nil)));
+      FromSeq(Sequences.Append(s, Cons(v, Nil)));
+      { Concatenation(s, Cons(v, Nil)); }
+      Union(ss, FromSeq(Cons(v, Nil)));
+      Union(ss, UnionOne(FromSeq(Nil), v));
+      Union(ss, UnionOne(Nil, v));
+      Union(ss, vv);
+    }
+
+    forall o {
+      calc {
+        Multiplicity(FromSeq(Sequences.Build(s, v)), o);
+        Multiplicity(Union(ss, vv), o);
+        { MultiplicityUnion(ss, vv, o); }
+        Multiplicity(ss, o) + Multiplicity(vv, o);
+        Multiplicity(ss, o) + BoolInt(v == o);
+        { MultiplicityDelta(ss, v, o); }
+        Multiplicity(UnionOne(ss, v), o);
+      }
+    }
+    Extensionality(FromSeq(Sequences.Build(s, v)), UnionOne(ss, v));
+  }
+
+  // // concatenation axiom
+  // axiom (forall a: Seq, b: Seq ::
+  //   { MultiSet#FromSeq(Seq#Append(a, b)) }
+  //     MultiSet#FromSeq(Seq#Append(a, b)) == MultiSet#Union(MultiSet#FromSeq(a), MultiSet#FromSeq(b)) );
+  lemma {:extract_pattern FromSeq(Sequences.Append(a, b))} Concatenation(a: Sequences.Seq, b: Sequences.Seq)
+    ensures FromSeq(Sequences.Append(a, b)) == Union(FromSeq(a), FromSeq(b))
+  {
+    forall o {
+      calc {
+        Multiplicity(FromSeq(Sequences.Append(a, b)), o);
+        { MultiplicityFromSeqAppend(a, b, o); }
+        Multiplicity(FromSeq(a), o) + Multiplicity(FromSeq(b), o);
+        { MultiplicityUnion(FromSeq(a), FromSeq(b), o); }
+        Multiplicity(Union(FromSeq(a), FromSeq(b)), o);
+      }
+    }
+    Extensionality(FromSeq(Sequences.Append(a, b)), Union(FromSeq(a), FromSeq(b)));
+  }
+
+  lemma MultiplicityFromSeqAppend(a: Sequences.Seq, b: Sequences.Seq, o: Box)
+    ensures Multiplicity(FromSeq(Sequences.Append(a, b)), o) == Multiplicity(FromSeq(a), o) + Multiplicity(FromSeq(b), o)
+  {
+    match a
+    case Nil =>
+    case Cons(x, tail) =>
+      calc {
+        Multiplicity(FromSeq(Sequences.Append(a, b)), o);
+        Multiplicity(FromSeq(Cons(x, Sequences.Append(tail, b))), o);
+        Multiplicity(UnionOne(FromSeq(Sequences.Append(tail, b)), x), o);
+        { MultiplicityDelta(FromSeq(Sequences.Append(tail, b)), x, o); }
+        Multiplicity(FromSeq(Sequences.Append(tail, b)), o) + BoolInt(x == o);
+        { MultiplicityFromSeqAppend(tail, b, o); }
+        Multiplicity(FromSeq(tail), o) + Multiplicity(FromSeq(b), o) + BoolInt(x == o);
+        { MultiplicityDelta(FromSeq(tail), x, o); }
+        Multiplicity(UnionOne(FromSeq(tail), x), o) + Multiplicity(FromSeq(b), o);
+        Multiplicity(FromSeq(a), o) + Multiplicity(FromSeq(b), o);
+      }
+  }
+
+  // // update axiom
+  // axiom (forall s: Seq, i: int, v: Box, x: Box ::
+  //   { MultiSet#FromSeq(Seq#Update(s, i, v))[x] }
+  //     0 <= i && i < Seq#Length(s) ==>
+  //     MultiSet#FromSeq(Seq#Update(s, i, v))[x] ==
+  //       MultiSet#Union(MultiSet#Difference(MultiSet#FromSeq(s), MultiSet#Singleton(Seq#Index(s,i))), MultiSet#Singleton(v))[x] );
+  //   // i.e. MS(Update(s, i, v)) == MS(s) - {{s[i]}} + {{v}}
+  lemma {:extract_pattern Multiplicity(FromSeq(Sequences.Update(s, i, v)), x)} AboutUpdate(s: Sequences.Seq, i: int, v: Box, x: Box)
+    requires 0 <= i < Sequences.Length(s)
+    ensures
+      Multiplicity(FromSeq(Sequences.Update(s, i, v)), x) ==
+      Multiplicity(Union(Difference(FromSeq(s), Singleton(Sequences.Index(s, i))), Singleton(v)), x)
+  {
+    assert s.Cons?; // since Sequences.Length(s) != 0
+
+    var ss, vv := FromSeq(s), Cons(v, Nil);
+    var y, tail := s.head, s.tail;
+
+    if i == 0 {
+      assert Sequences.Index(s, i) == y;
+      var yy := Singleton(y);
+
+      calc {
+        Multiplicity(FromSeq(Sequences.Update(s, i, v)), x);
+        Multiplicity(FromSeq(Cons(v, tail)), x);
+        { assert Cons(v, tail) == Cons(v, Sequences.Append(Nil, tail)) == Sequences.Append(vv, tail); }
+        Multiplicity(FromSeq(Sequences.Append(vv, tail)), x);
+        { MultiplicityFromSeqAppend(vv, tail, x); }
+        Multiplicity(FromSeq(vv), x) + Multiplicity(FromSeq(tail), x);
+        { assert FromSeq(vv) == vv; }
+        Multiplicity(vv, x) + Multiplicity(FromSeq(tail), x);
+        { ClipMultiplicity(FromSeq(tail), x); }
+        Multiplicity(vv, x) + Math.Clip(Multiplicity(FromSeq(tail), x));
+        { MultiplicityFromSeqCons(s, x); }
+        Multiplicity(vv, x) + Math.Clip(Multiplicity(ss, x) - BoolInt(y == x));
+        { assert Multiplicity(yy, x) == BoolInt(y == x); }
+        Multiplicity(vv, x) + Math.Clip(Multiplicity(ss, x) - Multiplicity(yy, x));
+        { MultiplicityDifference(ss, yy, x); }
+        Multiplicity(vv, x) + Multiplicity(Difference(ss, yy), x);
+        { MultiplicityUnion(Difference(ss, yy), vv, x); }
+        Multiplicity(Union(Difference(ss, yy), vv), x);
+        { assert vv == Singleton(v) && y == Sequences.Index(s, i) && yy == Singleton(y); }
+        Multiplicity(Union(Difference(ss, Singleton(Sequences.Index(s, i))), Singleton(v)), x);
+      }
+
+    } else {
+      var uu := Sequences.Update(tail, i - 1, v);
+      var si := Sequences.Index(s, i);
+      var msix := Multiplicity(Singleton(si), x);
+      calc {
+        Multiplicity(FromSeq(Sequences.Update(s, i, v)), x);
+        Multiplicity(FromSeq(Cons(y, uu)), x);
+        Multiplicity(UnionOne(FromSeq(uu), y), x);
+        { MultiplicityDelta(FromSeq(uu), y, x); }
+        Multiplicity(FromSeq(uu), x) + BoolInt(y == x);
+        { AboutUpdate(tail, i - 1, v, x); }
+        Multiplicity(Union(Difference(FromSeq(tail), Singleton(Sequences.Index(tail, i - 1))), Singleton(v)), x) + BoolInt(y == x);
+        { assert Sequences.Index(tail, i - 1) == Sequences.Index(s, i) == si && vv == Singleton(v); }
+        Multiplicity(Union(Difference(FromSeq(tail), Singleton(si)), vv), x) + BoolInt(y == x);
+        { MultiplicityUnion(Difference(FromSeq(tail), Singleton(si)), vv, x); }
+        Multiplicity(Difference(FromSeq(tail), Singleton(si)), x) + Multiplicity(vv, x) + BoolInt(y == x);
+        { MultiplicityDifference(FromSeq(tail), Singleton(si), x); }
+        Math.Clip(Multiplicity(FromSeq(tail), x) - msix) + Multiplicity(vv, x) + BoolInt(y == x);
+        { assert msix <= Multiplicity(FromSeq(tail), x) by {
+            assert Sequences.Index(tail, i - 1) == si;
+            tail.AtContains(i - 1, si);
+            MultiplicityFromSeqContainment(tail, si, x);
+          }
+          ClipDistribution(Multiplicity(FromSeq(tail), x) - msix, BoolInt(y == x));
+        }
+        Math.Clip(Multiplicity(FromSeq(tail), x) + BoolInt(y == x) - msix) + Multiplicity(vv, x);
+        { MultiplicityFromSeqCons(s, x); }
+        Math.Clip(Multiplicity(FromSeq(s), x) - msix) + Multiplicity(vv, x);
+        { MultiplicityDifference(FromSeq(s), Singleton(si), x); }
+        Multiplicity(Difference(FromSeq(s), Singleton(si)), x) + Multiplicity(vv, x);
+        { MultiplicityUnion(Difference(FromSeq(s), Singleton(si)), vv, x); }
+        Multiplicity(Union(Difference(FromSeq(s), Singleton(si)), vv), x);
+        Multiplicity(Union(Difference(FromSeq(s), Singleton(Sequences.Index(s, i))), Singleton(v)), x);
+      }
+    }
+  }
+
+  lemma MultiplicityFromSeqContainment(s: Sequences.Seq, v: Box, x: Box)
+    requires s.Contains(v)
+    ensures Multiplicity(Singleton(v), x) <= Multiplicity(FromSeq(s), x)
+  {
+    calc {
+      Multiplicity(FromSeq(s), x);
+      Multiplicity(UnionOne(FromSeq(s.tail), s.head), x);
+      { MultiplicityDelta(FromSeq(s.tail), s.head, x); }
+      Multiplicity(FromSeq(s.tail), x) + BoolInt(s.head == x);
+    }
+
+    if v == s.head {
+      calc {
+        Multiplicity(FromSeq(s.tail), x) + BoolInt(v == x);
+      >=  { MultiplicityCard(FromSeq(s.tail), x); }
+        BoolInt(v == x);
+          { MultiplicityDelta(Nil, v, x); }
+        Multiplicity(UnionOne(Nil, v), x);
+      }
+    } else {
+      assert s.tail.Contains(v);
+      calc {
+        Multiplicity(FromSeq(s.tail), x) + BoolInt(s.head == x);
+      >=
+        Multiplicity(FromSeq(s.tail), x);
+      >=  { MultiplicityFromSeqContainment(s.tail, v, x); }
+        Multiplicity(Singleton(v), x);
+      }
+    }
+  }
+
+  lemma MultiplicityFromSeqCons(s: Sequences.Seq, x: Box)
+    requires s.Cons?
+    ensures Multiplicity(FromSeq(s), x) == Multiplicity(FromSeq(s.tail), x) + BoolInt(s.head == x)
+  {
+    calc {
+      Multiplicity(FromSeq(s), x);
+      Multiplicity(UnionOne(FromSeq(s.tail), s.head), x);
+      { MultiplicityDelta(FromSeq(s.tail), s.head, x); }
+      Multiplicity(FromSeq(s.tail), x) + BoolInt(s.head == x);
+    }
+  }
+
+  // axiom (forall s: Seq, x: Box :: { MultiSet#FromSeq(s)[x] }
+  //   (exists i : int :: { Seq#Index(s,i) } 0 <= i && i < Seq#Length(s) && x == Seq#Index(s,i)) <==> 0 < MultiSet#FromSeq(s)[x] );
+  lemma {:extract_pattern Multiplicity(FromSeq(s), x)} MultiplicityFromSeq(s: Sequences.Seq, x: Box)
+    ensures (exists i {:extract_pattern Sequences.Index(s, i)} :: 0 <= i < Sequences.Length(s) && x == Sequences.Index(s, i))
+       <==> 0 < Multiplicity(FromSeq(s), x)
+  {
+    calc {
+      exists i :: 0 <= i < Sequences.Length(s) && x == Sequences.Index(s, i);
+      { Sequences.SeqContainsItsElements(s, x); }
+      Sequences.Contains(s, x);
+      { SequenceAndMultisetContainment(s, x); }
+      FromSeq(s).Contains(x);
+      {  NonZeroMultiplicityForElements(FromSeq(s), x); }
+      Multiplicity(FromSeq(s), x) != 0;
+      { MultiplicityCard(FromSeq(s), x); }
+      0 < Multiplicity(FromSeq(s), x);
+    }
+  }
+
+  lemma SequenceAndMultisetContainment(s: Sequences.Seq, o: Box)
+    ensures Sequences.Contains(s, o) <==> FromSeq(s).Contains(o)
+  {
+    match s
+    case Nil =>
+      calc {
+        FromSeq(s).Contains(o);
+        Nil.Contains(o);
+        false;
+        { Sequences.SeqContainsItsElements(s, o); }
+        Sequences.Contains(s, o);
+      }
+    case Cons(x, tail) =>
+      calc {
+        FromSeq(s).Contains(o);
+        UnionOne(FromSeq(tail), x).Contains(o);
+        { UnionOneContains(FromSeq(tail), x, o); }
+        x == o || FromSeq(tail).Contains(o);
+        { SequenceAndMultisetContainment(tail, o); }
+        x == o || Sequences.Contains(tail, o);
+        { Sequences.TailContains(s, o); }
+        Sequences.Contains(s, o);
+      }
+  }
+}
diff --git a/Source/DafnyCore/Prelude/PreludeCore.bpl b/Source/DafnyCore/Prelude/PreludeCore.bpl
new file mode 100644
index 00000000000..7c28e2f0ee2
--- /dev/null
+++ b/Source/DafnyCore/Prelude/PreludeCore.bpl
@@ -0,0 +1,1126 @@
+// Dafny prelude
+// Created 9 February 2008 by Rustan Leino.
+// Converted to Boogie 2 on 28 June 2008.
+// Edited sequence axioms 20 October 2009 by Alex Summers.
+// Modified 2014 by Dan Rosen.
+// Copyright (c) 2008-2014, Microsoft.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+
+const $$Language$Dafny: bool uses {  // To be recognizable to the ModelViewer as
+  axiom $$Language$Dafny;            // coming from a Dafny program.
+}
+
+// ---------------------------------------------------------------
+// -- Types ------------------------------------------------------
+// ---------------------------------------------------------------
+
+type Ty;
+type Bv0 = int;
+
+const unique TBool : Ty uses {
+  axiom Tag(TBool) == TagBool;
+}
+const unique TChar : Ty uses {
+  axiom Tag(TChar) == TagChar;
+}
+const unique TInt  : Ty uses {
+  axiom Tag(TInt) == TagInt;
+}
+const unique TReal : Ty uses {
+  axiom Tag(TReal) == TagReal;
+}
+const unique TORDINAL  : Ty uses {
+  axiom Tag(TORDINAL) == TagORDINAL;
+}
+// See for which axioms we can make use of the trigger to determine the connection.
+function TBitvector(int) : Ty;
+axiom (forall w: int :: { TBitvector(w) } Inv0_TBitvector(TBitvector(w)) == w);
+
+function TSet(Ty) : Ty;
+axiom (forall t: Ty :: { TSet(t) } Inv0_TSet(TSet(t)) == t);
+axiom (forall t: Ty :: { TSet(t) }      Tag(TSet(t))      == TagSet);
+
+function TISet(Ty) : Ty;
+axiom (forall t: Ty :: { TISet(t) } Inv0_TISet(TISet(t)) == t);
+axiom (forall t: Ty :: { TISet(t) }     Tag(TISet(t))     == TagISet);
+
+function TMultiSet(Ty) : Ty;
+axiom (forall t: Ty :: { TMultiSet(t) } Inv0_TMultiSet(TMultiSet(t)) == t);
+axiom (forall t: Ty :: { TMultiSet(t) } Tag(TMultiSet(t)) == TagMultiSet);
+
+function TSeq(Ty) : Ty;
+axiom (forall t: Ty :: { TSeq(t) } Inv0_TSeq(TSeq(t)) == t);
+axiom (forall t: Ty :: { TSeq(t) } Tag(TSeq(t)) == TagSeq);
+
+function TMap(Ty, Ty) : Ty;
+axiom (forall t, u: Ty :: { TMap(t,u) } Inv0_TMap(TMap(t,u)) == t);
+axiom (forall t, u: Ty :: { TMap(t,u) } Inv1_TMap(TMap(t,u)) == u);
+axiom (forall t, u: Ty :: { TMap(t,u) } Tag(TMap(t,u)) == TagMap);
+
+function TIMap(Ty, Ty) : Ty;
+axiom (forall t, u: Ty :: { TIMap(t,u) } Inv0_TIMap(TIMap(t,u)) == t);
+axiom (forall t, u: Ty :: { TIMap(t,u) } Inv1_TIMap(TIMap(t,u)) == u);
+axiom (forall t, u: Ty :: { TIMap(t,u) } Tag(TIMap(t,u)) == TagIMap);
+
+
+function Inv0_TBitvector(Ty) : int;
+function Inv0_TSet(Ty) : Ty;
+function Inv0_TISet(Ty) : Ty;
+function Inv0_TSeq(Ty) : Ty;
+function Inv0_TMultiSet(Ty) : Ty;
+function Inv0_TMap(Ty) : Ty;
+function Inv1_TMap(Ty) : Ty;
+function Inv0_TIMap(Ty) : Ty;
+function Inv1_TIMap(Ty) : Ty;
+
+// -- Classes and Datatypes --
+
+// -- Type Tags --
+type TyTag;
+function Tag(Ty) : TyTag;
+
+const unique TagBool     : TyTag;
+const unique TagChar     : TyTag;
+const unique TagInt      : TyTag;
+const unique TagReal     : TyTag;
+const unique TagORDINAL  : TyTag;
+const unique TagSet      : TyTag;
+const unique TagISet     : TyTag;
+const unique TagMultiSet : TyTag;
+const unique TagSeq      : TyTag;
+const unique TagMap      : TyTag;
+const unique TagIMap     : TyTag;
+const unique TagClass    : TyTag;
+
+type TyTagFamily;
+function TagFamily(Ty): TyTagFamily;
+
+// ---------------------------------------------------------------
+// -- Literals ---------------------------------------------------
+// ---------------------------------------------------------------
+function {:identity} Lit<T>(x: T): T { x }
+axiom (forall<T> x: T :: { $Box(Lit(x)) } $Box(Lit(x)) == Lit($Box(x)) );
+
+// Specialize Lit to concrete types.
+// These aren't logically required, but on some examples improve
+// verification speed
+function {:identity} LitInt(x: int): int { x }
+axiom (forall x: int :: { $Box(LitInt(x)) } $Box(LitInt(x)) == Lit($Box(x)) );
+
+function {:identity} LitReal(x: real): real { x }
+axiom (forall x: real :: { $Box(LitReal(x)) } $Box(LitReal(x)) == Lit($Box(x)) );
+
+// ---------------------------------------------------------------
+// -- Characters -------------------------------------------------
+// ---------------------------------------------------------------
+
+#if UNICODE_CHAR
+function {:inline} char#IsChar(n: int): bool {
+  (0                  <= n && n < 55296   /* 0xD800 */) ||
+  (57344 /* 0xE000 */ <= n && n < 1114112 /* 0x11_0000 */ )
+}
+#else
+function {:inline} char#IsChar(n: int): bool {
+  0 <= n && n < 65536
+}
+#endif
+
+type char;
+function char#FromInt(int): char;
+axiom (forall n: int ::
+  { char#FromInt(n) }
+  char#IsChar(n) ==> char#ToInt(char#FromInt(n)) == n);
+
+function char#ToInt(char): int;
+axiom (forall ch: char ::
+  { char#ToInt(ch) }
+  char#FromInt(char#ToInt(ch)) == ch &&
+  char#IsChar(char#ToInt(ch)));
+
+function char#Plus(char, char): char;
+axiom (forall a: char, b: char ::
+  { char#Plus(a, b) }
+  char#Plus(a, b) == char#FromInt(char#ToInt(a) + char#ToInt(b)));
+
+function char#Minus(char, char): char;
+axiom (forall a: char, b: char ::
+  { char#Minus(a, b) }
+  char#Minus(a, b) == char#FromInt(char#ToInt(a) - char#ToInt(b)));
+
+// ---------------------------------------------------------------
+// -- References -------------------------------------------------
+// ---------------------------------------------------------------
+
+type ref;
+const null: ref;
+
+// ---------------------------------------------------------------
+// -- Boxing and unboxing ----------------------------------------
+// ---------------------------------------------------------------
+
+type Box;
+const $ArbitraryBoxValue: Box;
+
+function $Box<T>(T): Box;
+function $Unbox<T>(Box): T;
+axiom (forall<T> x : T   :: { $Box(x) } $Unbox($Box(x)) == x);
+axiom (forall<T> x : Box :: { $Unbox(x): T} $Box($Unbox(x): T) == x);
+
+
+// Corresponding entries for boxes...
+// This could probably be solved by having Box also inhabit Ty
+function $IsBox(Box,Ty): bool;
+function $IsAllocBox(Box,Ty,Heap): bool;
+
+axiom (forall bx : Box ::
+    { $IsBox(bx, TInt) }
+    ( $IsBox(bx, TInt) ==> $Box($Unbox(bx) : int) == bx && $Is($Unbox(bx) : int, TInt)));
+axiom (forall bx : Box ::
+    { $IsBox(bx, TReal) }
+    ( $IsBox(bx, TReal) ==> $Box($Unbox(bx) : real) == bx && $Is($Unbox(bx) : real, TReal)));
+axiom (forall bx : Box ::
+    { $IsBox(bx, TBool) }
+    ( $IsBox(bx, TBool) ==> $Box($Unbox(bx) : bool) == bx && $Is($Unbox(bx) : bool, TBool)));
+axiom (forall bx : Box ::
+    { $IsBox(bx, TChar) }
+    ( $IsBox(bx, TChar) ==> $Box($Unbox(bx) : char) == bx && $Is($Unbox(bx) : char, TChar)));
+
+// Since each bitvector type is a separate type in Boogie, the Box/Unbox axioms for bitvectors are
+// generated programmatically. Except, Bv0 is given here.
+axiom (forall bx : Box ::
+    { $IsBox(bx, TBitvector(0)) }
+    ( $IsBox(bx, TBitvector(0)) ==> $Box($Unbox(bx) : Bv0) == bx && $Is($Unbox(bx) : Bv0, TBitvector(0))));
+
+axiom (forall bx : Box, t : Ty ::
+    { $IsBox(bx, TSet(t)) }
+    ( $IsBox(bx, TSet(t)) ==> $Box($Unbox(bx) : Set) == bx && $Is($Unbox(bx) : Set, TSet(t))));
+axiom (forall bx : Box, t : Ty ::
+    { $IsBox(bx, TISet(t)) }
+    ( $IsBox(bx, TISet(t)) ==> $Box($Unbox(bx) : ISet) == bx && $Is($Unbox(bx) : ISet, TISet(t))));
+axiom (forall bx : Box, t : Ty ::
+    { $IsBox(bx, TMultiSet(t)) }
+    ( $IsBox(bx, TMultiSet(t)) ==> $Box($Unbox(bx) : MultiSet) == bx && $Is($Unbox(bx) : MultiSet, TMultiSet(t))));
+axiom (forall bx : Box, t : Ty ::
+    { $IsBox(bx, TSeq(t)) }
+    ( $IsBox(bx, TSeq(t)) ==> $Box($Unbox(bx) : Seq) == bx && $Is($Unbox(bx) : Seq, TSeq(t))));
+axiom (forall bx : Box, s : Ty, t : Ty ::
+    { $IsBox(bx, TMap(s, t)) }
+    ( $IsBox(bx, TMap(s, t)) ==> $Box($Unbox(bx) : Map) == bx && $Is($Unbox(bx) : Map, TMap(s, t))));
+axiom (forall bx : Box, s : Ty, t : Ty ::
+    { $IsBox(bx, TIMap(s, t)) }
+    ( $IsBox(bx, TIMap(s, t)) ==> $Box($Unbox(bx) : IMap) == bx && $Is($Unbox(bx) : IMap, TIMap(s, t))));
+
+axiom (forall<T> v : T, t : Ty ::
+    { $IsBox($Box(v), t) }
+    ( $IsBox($Box(v), t) <==> $Is(v,t) ));
+axiom (forall<T> v : T, t : Ty, h : Heap ::
+    { $IsAllocBox($Box(v), t, h) }
+    ( $IsAllocBox($Box(v), t, h) <==> $IsAlloc(v,t,h) ));
+
+// ---------------------------------------------------------------
+// -- Is and IsAlloc ---------------------------------------------
+// ---------------------------------------------------------------
+
+// Type-argument to $Is is the /representation type/,
+// the second value argument to $Is is the actual type.
+function $Is<T>(T,Ty): bool;           // no heap for now
+axiom(forall v : int  :: { $Is(v,TInt) }  $Is(v,TInt));
+axiom(forall v : real :: { $Is(v,TReal) } $Is(v,TReal));
+axiom(forall v : bool :: { $Is(v,TBool) } $Is(v,TBool));
+axiom(forall v : char :: { $Is(v,TChar) } $Is(v,TChar));
+axiom(forall v : ORDINAL :: { $Is(v,TORDINAL) } $Is(v,TORDINAL));
+
+// Since every bitvector type is a separate type in Boogie, the $Is/$IsAlloc axioms
+// for bitvectors are generated programatically. Except, TBitvector(0) is given here.
+axiom (forall v: Bv0 :: { $Is(v, TBitvector(0)) } $Is(v, TBitvector(0)));
+
+axiom (forall v: Set, t0: Ty :: { $Is(v, TSet(t0)) }
+  $Is(v, TSet(t0)) <==>
+  (forall bx: Box :: { Set#IsMember(v, bx) }
+    Set#IsMember(v, bx) ==> $IsBox(bx, t0)));
+axiom (forall v: ISet, t0: Ty :: { $Is(v, TISet(t0)) }
+  $Is(v, TISet(t0)) <==>
+  (forall bx: Box :: { v[bx] }
+    v[bx] ==> $IsBox(bx, t0)));
+axiom (forall v: MultiSet, t0: Ty :: { $Is(v, TMultiSet(t0)) }
+  $Is(v, TMultiSet(t0)) <==>
+  (forall bx: Box :: { MultiSet#Multiplicity(v, bx) }
+    0 < MultiSet#Multiplicity(v, bx) ==> $IsBox(bx, t0)));
+axiom (forall v: MultiSet, t0: Ty :: { $Is(v, TMultiSet(t0)) }
+  $Is(v, TMultiSet(t0)) ==> $IsGoodMultiSet(v));
+axiom (forall v: Seq, t0: Ty :: { $Is(v, TSeq(t0)) }
+  $Is(v, TSeq(t0)) <==>
+  (forall i : int :: { Seq#Index(v, i) }
+    0 <= i && i < Seq#Length(v) ==>
+    $IsBox(Seq#Index(v, i), t0)));
+
+axiom (forall v: Map, t0: Ty, t1: Ty ::
+  { $Is(v, TMap(t0, t1)) }
+  $Is(v, TMap(t0, t1))
+     <==> (forall bx: Box ::
+      { Map#Elements(v)[bx] } { Set#IsMember(Map#Domain(v), bx) }
+      Set#IsMember(Map#Domain(v), bx) ==>
+        $IsBox(Map#Elements(v)[bx], t1) &&
+        $IsBox(bx, t0)));
+
+axiom (forall v: Map, t0: Ty, t1: Ty ::
+  { $Is(v, TMap(t0, t1)) }
+  $Is(v, TMap(t0, t1)) ==>
+    $Is(Map#Domain(v), TSet(t0)) &&
+    $Is(Map#Values(v), TSet(t1)) &&
+    $Is(Map#Items(v), TSet(Tclass._System.Tuple2(t0, t1))));
+axiom (forall v: IMap, t0: Ty, t1: Ty ::
+  { $Is(v, TIMap(t0, t1)) }
+  $Is(v, TIMap(t0, t1))
+     <==> (forall bx: Box ::
+      { IMap#Elements(v)[bx] } { IMap#Domain(v)[bx] }
+      IMap#Domain(v)[bx] ==>
+        $IsBox(IMap#Elements(v)[bx], t1) &&
+        $IsBox(bx, t0)));
+axiom (forall v: IMap, t0: Ty, t1: Ty ::
+  { $Is(v, TIMap(t0, t1)) }
+  $Is(v, TIMap(t0, t1)) ==>
+    $Is(IMap#Domain(v), TISet(t0)) &&
+    $Is(IMap#Values(v), TISet(t1)) &&
+    $Is(IMap#Items(v), TISet(Tclass._System.Tuple2(t0, t1))));
+
+function $IsAlloc<T>(T,Ty,Heap): bool;
+axiom(forall h : Heap, v : int  :: { $IsAlloc(v,TInt,h) }  $IsAlloc(v,TInt,h));
+axiom(forall h : Heap, v : real :: { $IsAlloc(v,TReal,h) } $IsAlloc(v,TReal,h));
+axiom(forall h : Heap, v : bool :: { $IsAlloc(v,TBool,h) } $IsAlloc(v,TBool,h));
+axiom(forall h : Heap, v : char :: { $IsAlloc(v,TChar,h) } $IsAlloc(v,TChar,h));
+axiom(forall h : Heap, v : ORDINAL :: { $IsAlloc(v,TORDINAL,h) } $IsAlloc(v,TORDINAL,h));
+
+axiom (forall v: Bv0, h: Heap :: { $IsAlloc(v, TBitvector(0), h) } $IsAlloc(v, TBitvector(0), h));
+
+axiom (forall v: Set, t0: Ty, h: Heap :: { $IsAlloc(v, TSet(t0), h) }
+  $IsAlloc(v, TSet(t0), h) <==>
+  (forall bx: Box :: { Set#IsMember(v, bx) }
+    Set#IsMember(v, bx) ==> $IsAllocBox(bx, t0, h)));
+axiom (forall v: ISet, t0: Ty, h: Heap :: { $IsAlloc(v, TISet(t0), h) }
+  $IsAlloc(v, TISet(t0), h) <==>
+  (forall bx: Box :: { v[bx] }
+    v[bx] ==> $IsAllocBox(bx, t0, h)));
+axiom (forall v: MultiSet, t0: Ty, h: Heap :: { $IsAlloc(v, TMultiSet(t0), h) }
+  $IsAlloc(v, TMultiSet(t0), h) <==>
+  (forall bx: Box :: { MultiSet#Multiplicity(v, bx) }
+    0 < MultiSet#Multiplicity(v, bx) ==> $IsAllocBox(bx, t0, h)));
+axiom (forall v: Seq, t0: Ty, h: Heap :: { $IsAlloc(v, TSeq(t0), h) }
+  $IsAlloc(v, TSeq(t0), h) <==>
+  (forall i : int :: { Seq#Index(v, i) }
+    0 <= i && i < Seq#Length(v) ==>
+	$IsAllocBox(Seq#Index(v, i), t0, h)));
+	
+axiom (forall v: Map, t0: Ty, t1: Ty, h: Heap ::
+  { $IsAlloc(v, TMap(t0, t1), h) }
+  $IsAlloc(v, TMap(t0, t1), h)
+     <==> (forall bx: Box ::
+      { Map#Elements(v)[bx] } { Set#IsMember(Map#Domain(v), bx) }
+      Set#IsMember(Map#Domain(v), bx) ==>
+        $IsAllocBox(Map#Elements(v)[bx], t1, h) &&
+        $IsAllocBox(bx, t0, h)));
+
+axiom (forall v: IMap, t0: Ty, t1: Ty, h: Heap ::
+  { $IsAlloc(v, TIMap(t0, t1), h) }
+  $IsAlloc(v, TIMap(t0, t1), h)
+     <==> (forall bx: Box ::
+      { IMap#Elements(v)[bx] } { IMap#Domain(v)[bx] }
+      IMap#Domain(v)[bx] ==>
+        $IsAllocBox(IMap#Elements(v)[bx], t1, h) &&
+        $IsAllocBox(bx, t0, h)));
+
+
+function $AlwaysAllocated(Ty): bool;
+  axiom (forall ty: Ty :: { $AlwaysAllocated(ty) }
+    $AlwaysAllocated(ty) ==>
+    (forall h: Heap, v: Box  :: { $IsAllocBox(v, ty, h) }  $IsBox(v, ty) ==> $IsAllocBox(v, ty, h)));
+
+function $OlderTag(Heap): bool;
+
+// ---------------------------------------------------------------
+// -- Encoding of type names -------------------------------------
+// ---------------------------------------------------------------
+
+type ClassName;
+const unique class._System.int: ClassName;
+const unique class._System.bool: ClassName;
+const unique class._System.set: ClassName;
+const unique class._System.seq: ClassName;
+const unique class._System.multiset: ClassName;
+
+function Tclass._System.object?(): Ty;
+function Tclass._System.Tuple2(Ty, Ty): Ty;
+
+function /*{:never_pattern true}*/ dtype(ref): Ty; // changed from ClassName to Ty
+
+function TypeTuple(a: ClassName, b: ClassName): ClassName;
+function TypeTupleCar(ClassName): ClassName;
+function TypeTupleCdr(ClassName): ClassName;
+// TypeTuple is injective in both arguments:
+axiom (forall a: ClassName, b: ClassName :: { TypeTuple(a,b) }
+  TypeTupleCar(TypeTuple(a,b)) == a &&
+  TypeTupleCdr(TypeTuple(a,b)) == b);
+
+// -- Function handles -------------------------------------------
+
+type HandleType;
+
+function SetRef_to_SetBox(s: [ref]bool): Set;
+axiom (forall s: [ref]bool, bx: Box :: { Set#IsMember(SetRef_to_SetBox(s), bx) }
+  Set#IsMember(SetRef_to_SetBox(s), bx) == s[$Unbox(bx): ref]);
+axiom (forall s: [ref]bool :: { SetRef_to_SetBox(s) }
+  $Is(SetRef_to_SetBox(s), TSet(Tclass._System.object?())));
+
+// Functions ApplyN, RequiresN, and ReadsN are generated on demand by the translator,
+// but Apply1 is referred to in the prelude, so its definition is hardcoded here.
+function Apply1(Ty, Ty, Heap, HandleType, Box): Box;
+
+// ---------------------------------------------------------------
+// -- Datatypes --------------------------------------------------
+// ---------------------------------------------------------------
+
+type DatatypeType;
+
+type DtCtorId;
+function DatatypeCtorId(DatatypeType): DtCtorId;
+
+function DtRank(DatatypeType): int;
+function BoxRank(Box): int;
+
+axiom (forall d: DatatypeType :: {BoxRank($Box(d))} BoxRank($Box(d)) == DtRank(d));
+
+// ---------------------------------------------------------------
+// -- Big Ordinals -----------------------------------------------
+// ---------------------------------------------------------------
+
+type ORDINAL = Box;  // :| There are more big ordinals than boxes
+
+// The following two functions give an abstracton over all ordinals.
+// Function ORD#IsNat returns true when the ordinal is one of the natural
+// numbers.  Function ORD#Offset gives how many successors (that is,
+// +1 operations) an ordinal is above the nearest lower limit ordinal.
+// That is, if the ordinal is \lambda+n, then ORD#Offset returns n.
+function ORD#IsNat(ORDINAL): bool;
+function ORD#Offset(ORDINAL): int;
+axiom (forall o:ORDINAL :: { ORD#Offset(o) } 0 <= ORD#Offset(o));
+
+function {:inline} ORD#IsLimit(o: ORDINAL): bool { ORD#Offset(o) == 0 }
+function {:inline} ORD#IsSucc(o: ORDINAL): bool { 0 < ORD#Offset(o) }
+
+function ORD#FromNat(int): ORDINAL;
+axiom (forall n:int :: { ORD#FromNat(n) }
+  0 <= n ==> ORD#IsNat(ORD#FromNat(n)) && ORD#Offset(ORD#FromNat(n)) == n);
+axiom (forall o:ORDINAL :: { ORD#Offset(o) } { ORD#IsNat(o) }
+  ORD#IsNat(o) ==> o == ORD#FromNat(ORD#Offset(o)));
+
+function ORD#Less(ORDINAL, ORDINAL): bool;
+axiom (forall o,p: ORDINAL :: { ORD#Less(o,p) }
+  (ORD#Less(o,p) ==> o != p) &&  // irreflexivity
+  (ORD#IsNat(o) && !ORD#IsNat(p) ==> ORD#Less(o,p)) &&
+  (ORD#IsNat(o) && ORD#IsNat(p) ==> ORD#Less(o,p) == (ORD#Offset(o) < ORD#Offset(p))) &&
+  (ORD#Less(o,p) && ORD#IsNat(p) ==> ORD#IsNat(o)));
+// ORD#Less is trichotomous:
+axiom (forall o,p: ORDINAL :: { ORD#Less(o,p), ORD#Less(p,o) }
+  ORD#Less(o,p) || o == p || ORD#Less(p,o));
+// ORD#Less is transitive:
+axiom (forall o,p,r: ORDINAL ::
+  { ORD#Less(o,p), ORD#Less(p,r) }
+  { ORD#Less(o,p), ORD#Less(o,r) }
+  ORD#Less(o,p) && ORD#Less(p,r) ==> ORD#Less(o,r));
+
+// ORD#LessThanLimit is a synonym of ORD#Less, introduced for more selected triggering
+function ORD#LessThanLimit(ORDINAL, ORDINAL): bool;
+axiom (forall o,p: ORDINAL :: { ORD#LessThanLimit(o, p) }
+  ORD#LessThanLimit(o, p) == ORD#Less(o, p));
+
+function ORD#Plus(ORDINAL, ORDINAL): ORDINAL;
+axiom (forall o,p: ORDINAL :: { ORD#Plus(o,p) }
+  (ORD#IsNat(ORD#Plus(o,p)) ==> ORD#IsNat(o) && ORD#IsNat(p)) &&
+  (ORD#IsNat(p) ==>
+    ORD#IsNat(ORD#Plus(o,p)) == ORD#IsNat(o) &&
+    ORD#Offset(ORD#Plus(o,p)) == ORD#Offset(o) + ORD#Offset(p)));
+axiom (forall o,p: ORDINAL :: { ORD#Plus(o,p) }
+  (o == ORD#Plus(o, p) || ORD#Less(o, ORD#Plus(o, p))) &&
+  (p == ORD#Plus(o, p) || ORD#Less(p, ORD#Plus(o, p))));
+axiom (forall o,p: ORDINAL :: { ORD#Plus(o,p) }
+  (o == ORD#FromNat(0) ==> ORD#Plus(o, p) == p) &&
+  (p == ORD#FromNat(0) ==> ORD#Plus(o, p) == o));
+
+function ORD#Minus(ORDINAL, ORDINAL): ORDINAL;
+axiom (forall o,p: ORDINAL :: { ORD#Minus(o,p) }
+  ORD#IsNat(p) && ORD#Offset(p) <= ORD#Offset(o) ==>
+    ORD#IsNat(ORD#Minus(o,p)) == ORD#IsNat(o) &&
+    ORD#Offset(ORD#Minus(o,p)) == ORD#Offset(o) - ORD#Offset(p));
+axiom (forall o,p: ORDINAL :: { ORD#Minus(o,p) }
+  ORD#IsNat(p) && ORD#Offset(p) <= ORD#Offset(o) ==>
+    (p == ORD#FromNat(0) && ORD#Minus(o, p) == o) ||
+    (p != ORD#FromNat(0) && ORD#Less(ORD#Minus(o, p), o)));
+
+// o+m+n == o+(m+n)
+axiom (forall o: ORDINAL, m,n: int ::
+  { ORD#Plus(ORD#Plus(o, ORD#FromNat(m)), ORD#FromNat(n)) }
+  0 <= m && 0 <= n ==>
+  ORD#Plus(ORD#Plus(o, ORD#FromNat(m)), ORD#FromNat(n)) == ORD#Plus(o, ORD#FromNat(m+n)));
+// o-m-n == o+(m+n)
+axiom (forall o: ORDINAL, m,n: int ::
+  { ORD#Minus(ORD#Minus(o, ORD#FromNat(m)), ORD#FromNat(n)) }
+  0 <= m && 0 <= n && m+n <= ORD#Offset(o) ==>
+  ORD#Minus(ORD#Minus(o, ORD#FromNat(m)), ORD#FromNat(n)) == ORD#Minus(o, ORD#FromNat(m+n)));
+// o+m-n == EITHER o+(m-n) OR o-(n-m)
+axiom (forall o: ORDINAL, m,n: int ::
+  { ORD#Minus(ORD#Plus(o, ORD#FromNat(m)), ORD#FromNat(n)) }
+  0 <= m && 0 <= n && n <= ORD#Offset(o) + m ==>
+    (0 <= m - n ==> ORD#Minus(ORD#Plus(o, ORD#FromNat(m)), ORD#FromNat(n)) == ORD#Plus(o, ORD#FromNat(m-n))) &&
+    (m - n <= 0 ==> ORD#Minus(ORD#Plus(o, ORD#FromNat(m)), ORD#FromNat(n)) == ORD#Minus(o, ORD#FromNat(n-m))));
+// o-m+n == EITHER o-(m-n) OR o+(n-m)
+axiom (forall o: ORDINAL, m,n: int ::
+  { ORD#Plus(ORD#Minus(o, ORD#FromNat(m)), ORD#FromNat(n)) }
+  0 <= m && 0 <= n && n <= ORD#Offset(o) + m ==>
+    (0 <= m - n ==> ORD#Plus(ORD#Minus(o, ORD#FromNat(m)), ORD#FromNat(n)) == ORD#Minus(o, ORD#FromNat(m-n))) &&
+    (m - n <= 0 ==> ORD#Plus(ORD#Minus(o, ORD#FromNat(m)), ORD#FromNat(n)) == ORD#Plus(o, ORD#FromNat(n-m))));
+
+// ---------------------------------------------------------------
+// -- Layers of function encodings -------------------------------
+// ---------------------------------------------------------------
+
+type LayerType;
+const $LZ: LayerType;
+function $LS(LayerType): LayerType;
+function AsFuelBottom(LayerType) : LayerType;
+
+function AtLayer<A>([LayerType]A, LayerType): A;
+axiom (forall<A> f : [LayerType]A, ly : LayerType :: { AtLayer(f,ly) } AtLayer(f,ly) == f[ly]);
+axiom (forall<A> f : [LayerType]A, ly : LayerType :: { AtLayer(f,$LS(ly)) } AtLayer(f,$LS(ly)) == AtLayer(f,ly));
+
+// ---------------------------------------------------------------
+// -- Fields -----------------------------------------------------
+// ---------------------------------------------------------------
+
+type Field;
+
+function FDim(Field): int uses {
+  axiom FDim(alloc) == 0;
+}
+
+function IndexField(int): Field;
+axiom (forall i: int :: { IndexField(i) } FDim(IndexField(i)) == 1);
+function IndexField_Inverse(Field): int;
+axiom (forall i: int :: { IndexField(i) } IndexField_Inverse(IndexField(i)) == i);
+
+function MultiIndexField(Field, int): Field;
+axiom (forall f: Field, i: int :: { MultiIndexField(f,i) } FDim(MultiIndexField(f,i)) == FDim(f) + 1);
+function MultiIndexField_Inverse0(Field): Field;
+function MultiIndexField_Inverse1(Field): int;
+axiom (forall f: Field, i: int :: { MultiIndexField(f,i) }
+  MultiIndexField_Inverse0(MultiIndexField(f,i)) == f &&
+  MultiIndexField_Inverse1(MultiIndexField(f,i)) == i);
+
+function DeclType(Field): ClassName;
+
+type NameFamily;
+function DeclName(Field): NameFamily uses {
+  axiom DeclName(alloc) == allocName;
+}
+function FieldOfDecl(ClassName, NameFamily): Field;
+axiom (forall cl : ClassName, nm: NameFamily ::
+   {FieldOfDecl(cl, nm): Field}
+   DeclType(FieldOfDecl(cl, nm): Field) == cl && DeclName(FieldOfDecl(cl, nm): Field) == nm);
+
+function $IsGhostField(Field): bool uses {
+   axiom $IsGhostField(alloc); // treat as ghost field, since it is allowed to be changed by ghost code
+}
+axiom (forall h: Heap, k: Heap :: { $HeapSuccGhost(h,k) }
+  $HeapSuccGhost(h,k) ==>
+    $HeapSucc(h,k) &&
+    (forall o: ref, f: Field :: { read(k, o, f) }
+      !$IsGhostField(f) ==> read(h, o, f) == read(k, o, f)));
+
+// ---------------------------------------------------------------
+// -- Allocatedness and Heap Succession --------------------------
+// ---------------------------------------------------------------
+
+
+// $IsAlloc and $IsAllocBox are monotonic
+
+axiom (forall<T> h, k : Heap, v : T, t : Ty ::
+  { $HeapSucc(h, k), $IsAlloc(v, t, h) }
+  $HeapSucc(h, k) ==> $IsAlloc(v, t, h) ==> $IsAlloc(v, t, k));
+axiom (forall h, k : Heap, bx : Box, t : Ty ::
+  { $HeapSucc(h, k), $IsAllocBox(bx, t, h) }
+  $HeapSucc(h, k) ==> $IsAllocBox(bx, t, h) ==> $IsAllocBox(bx, t, k));
+
+// No axioms for $Is and $IsBox since they don't talk about the heap.
+
+const unique alloc: Field;
+const unique allocName: NameFamily;
+
+// ---------------------------------------------------------------
+// -- Arrays -----------------------------------------------------
+// ---------------------------------------------------------------
+
+function _System.array.Length(a: ref): int;
+axiom (forall o: ref :: {_System.array.Length(o)} 0 <= _System.array.Length(o));
+
+
+// ---------------------------------------------------------------
+// -- Reals ------------------------------------------------------
+// ---------------------------------------------------------------
+
+function Int(x: real): int { int(x) }
+function Real(x: int): real { real(x) }
+axiom (forall i: int :: { Int(Real(i)) } Int(Real(i)) == i);
+
+function {:inline} _System.real.Floor(x: real): int { Int(x) }
+
+// ---------------------------------------------------------------
+// -- The heap ---------------------------------------------------
+// ---------------------------------------------------------------
+type Heap = [ref][Field]Box;
+function {:inline} read(H: Heap, r: ref, f: Field) : Box { H[r][f] }
+function {:inline} update(H:Heap, r:ref, f: Field, v: Box) : Heap { H[r := H[r][f := v]] }
+
+function $IsGoodHeap(Heap): bool;
+function $IsHeapAnchor(Heap): bool;
+var $Heap: Heap where $IsGoodHeap($Heap) && $IsHeapAnchor($Heap);
+
+// The following is used as a reference heap in places where the translation needs a heap
+// but the expression generated is really one that is (at least in a correct program)
+// independent of the heap.
+const $OneHeap: Heap uses {
+  axiom $IsGoodHeap($OneHeap);
+}
+
+function $HeapSucc(Heap, Heap): bool;
+axiom (forall h: Heap, r: ref, f: Field, x: Box :: { update(h, r, f, x) }
+  $IsGoodHeap(update(h, r, f, x)) ==>
+  $HeapSucc(h, update(h, r, f, x)));
+axiom (forall a,b,c: Heap :: { $HeapSucc(a,b), $HeapSucc(b,c) }
+  a != c ==> $HeapSucc(a,b) && $HeapSucc(b,c) ==> $HeapSucc(a,c));
+axiom (forall h: Heap, k: Heap :: { $HeapSucc(h,k) }
+  $HeapSucc(h,k) ==> (forall o: ref :: { read(k, o, alloc) } $Unbox(read(h, o, alloc)) ==> $Unbox(read(k, o, alloc))));
+
+function $HeapSuccGhost(Heap, Heap): bool;
+
+// ---------------------------------------------------------------
+// -- Useful macros ----------------------------------------------
+// ---------------------------------------------------------------
+
+// havoc everything in $Heap, except {this}+rds+nw
+procedure $YieldHavoc(this: ref, rds: Set, nw: Set);
+  modifies $Heap;
+  ensures (forall $o: ref, $f: Field :: { read($Heap, $o, $f) }
+            $o != null && $Unbox(read(old($Heap), $o, alloc)) ==>
+            $o == this || Set#IsMember(rds, $Box($o)) || Set#IsMember(nw, $Box($o)) ==>
+              read($Heap, $o, $f) == read(old($Heap), $o, $f));
+  ensures $HeapSucc(old($Heap), $Heap);
+
+// havoc everything in $Heap, except rds-modi-{this}
+procedure $IterHavoc0(this: ref, rds: Set, modi: Set);
+  modifies $Heap;
+  ensures (forall $o: ref, $f: Field :: { read($Heap, $o, $f) }
+            $o != null && $Unbox(read(old($Heap), $o, alloc)) ==>
+            Set#IsMember(rds, $Box($o)) && !Set#IsMember(modi, $Box($o)) && $o != this ==>
+              read($Heap, $o, $f) == read(old($Heap), $o, $f));
+  ensures $HeapSucc(old($Heap), $Heap);
+
+// havoc $Heap at {this}+modi+nw
+procedure $IterHavoc1(this: ref, modi: Set, nw: Set);
+  modifies $Heap;
+  ensures (forall $o: ref, $f: Field :: { read($Heap, $o, $f) }
+            $o != null && $Unbox(read(old($Heap), $o, alloc)) ==>
+              read($Heap, $o, $f) == read(old($Heap), $o, $f) ||
+              $o == this || Set#IsMember(modi, $Box($o)) || Set#IsMember(nw, $Box($o)));
+  ensures $HeapSucc(old($Heap), $Heap);
+
+procedure $IterCollectNewObjects(prevHeap: Heap, newHeap: Heap, this: ref, NW: Field)
+                        returns (s: Set);
+  ensures (forall bx: Box :: { Set#IsMember(s, bx) } Set#IsMember(s, bx) <==>
+              Set#IsMember($Unbox(read(newHeap, this, NW)) : Set, bx) ||
+              ($Unbox(bx) != null && !$Unbox(read(prevHeap, $Unbox(bx):ref, alloc)) && $Unbox(read(newHeap, $Unbox(bx):ref, alloc))));
+
+// ---------------------------------------------------------------
+// -- Axiomatizations --------------------------------------------
+// ---------------------------------------------------------------
+
+// ---------------------------------------------------------------
+// -- Axiomatization of sets -------------------------------------
+// ---------------------------------------------------------------
+
+#include "Sets.bpl"
+
+// FIXME: Finite-set comprehensions are translated into Boogie lambda expressions for Boogie maps and then converted,
+// using function Set#FromBoogieMap, to a set. The use of Boogie lambda expressions is convenient, since Boogie
+// performs lambda lifting on them. However, this is NOT right, because it allows ANY lambda to be converted
+// into a finite set. This should be fixed by doing the lambda lifting directly in Dafny and not use Boogie lambda
+// expressions.
+function Set#FromBoogieMap([Box]bool): Set;
+axiom (forall m: [Box]bool, bx: Box ::
+  { Set#IsMember(Set#FromBoogieMap(m), bx) }
+  Set#IsMember(Set#FromBoogieMap(m), bx) == m[bx]);
+
+// ---------------------------------------------------------------
+// -- Axiomatization of isets -------------------------------------
+// ---------------------------------------------------------------
+
+type ISet = [Box]bool;
+
+function ISet#Empty(): ISet;
+axiom (forall o: Box :: { ISet#Empty()[o] } !ISet#Empty()[o]);
+
+function ISet#FromSet(Set): ISet;
+axiom (forall s: Set, bx: Box ::
+  { ISet#FromSet(s)[bx] }
+  ISet#FromSet(s)[bx] == Set#IsMember(s, bx));
+
+function ISet#UnionOne(ISet, Box): ISet;
+axiom (forall a: ISet, x: Box, o: Box :: { ISet#UnionOne(a,x)[o] }
+  ISet#UnionOne(a,x)[o] <==> o == x || a[o]);
+axiom (forall a: ISet, x: Box :: { ISet#UnionOne(a, x) }
+  ISet#UnionOne(a, x)[x]);
+axiom (forall a: ISet, x: Box, y: Box :: { ISet#UnionOne(a, x), a[y] }
+  a[y] ==> ISet#UnionOne(a, x)[y]);
+
+function ISet#Union(ISet, ISet): ISet;
+axiom (forall a: ISet, b: ISet, o: Box :: { ISet#Union(a,b)[o] }
+  ISet#Union(a,b)[o] <==> a[o] || b[o]);
+axiom (forall a, b: ISet, y: Box :: { ISet#Union(a, b), a[y] }
+  a[y] ==> ISet#Union(a, b)[y]);
+axiom (forall a, b: ISet, y: Box :: { ISet#Union(a, b), b[y] }
+  b[y] ==> ISet#Union(a, b)[y]);
+axiom (forall a, b: ISet :: { ISet#Union(a, b) }
+  ISet#Disjoint(a, b) ==>
+    ISet#Difference(ISet#Union(a, b), a) == b &&
+    ISet#Difference(ISet#Union(a, b), b) == a);
+
+function ISet#Intersection(ISet, ISet): ISet;
+axiom (forall a: ISet, b: ISet, o: Box :: { ISet#Intersection(a,b)[o] }
+  ISet#Intersection(a,b)[o] <==> a[o] && b[o]);
+
+axiom (forall a, b: ISet :: { ISet#Union(ISet#Union(a, b), b) }
+  ISet#Union(ISet#Union(a, b), b) == ISet#Union(a, b));
+axiom (forall a, b: ISet :: { ISet#Union(a, ISet#Union(a, b)) }
+  ISet#Union(a, ISet#Union(a, b)) == ISet#Union(a, b));
+axiom (forall a, b: ISet :: { ISet#Intersection(ISet#Intersection(a, b), b) }
+  ISet#Intersection(ISet#Intersection(a, b), b) == ISet#Intersection(a, b));
+axiom (forall a, b: ISet :: { ISet#Intersection(a, ISet#Intersection(a, b)) }
+  ISet#Intersection(a, ISet#Intersection(a, b)) == ISet#Intersection(a, b));
+
+
+function ISet#Difference(ISet, ISet): ISet;
+axiom (forall a: ISet, b: ISet, o: Box :: { ISet#Difference(a,b)[o] }
+  ISet#Difference(a,b)[o] <==> a[o] && !b[o]);
+axiom (forall a, b: ISet, y: Box :: { ISet#Difference(a, b), b[y] }
+  b[y] ==> !ISet#Difference(a, b)[y] );
+
+function ISet#Subset(ISet, ISet): bool;
+axiom (forall a: ISet, b: ISet :: { ISet#Subset(a,b) }
+  ISet#Subset(a,b) <==> (forall o: Box :: {a[o]} {b[o]} a[o] ==> b[o]));
+
+function ISet#Equal(ISet, ISet): bool;
+axiom (forall a: ISet, b: ISet :: { ISet#Equal(a,b) }
+  ISet#Equal(a,b) <==> (forall o: Box :: {a[o]} {b[o]} a[o] <==> b[o]));
+axiom (forall a: ISet, b: ISet :: { ISet#Equal(a,b) }  // extensionality axiom for sets
+  ISet#Equal(a,b) ==> a == b);
+
+function ISet#Disjoint(ISet, ISet): bool;
+axiom (forall a: ISet, b: ISet :: { ISet#Disjoint(a,b) }
+  ISet#Disjoint(a,b) <==> (forall o: Box :: {a[o]} {b[o]} !a[o] || !b[o]));
+
+// ---------------------------------------------------------------
+// -- Axiomatization of multisets --------------------------------
+// ---------------------------------------------------------------
+
+#include "Math.bpl"
+
+#include "Multisets.bpl"
+
+// ---------------------------------------------------------------
+// -- Axiomatization of sequences --------------------------------
+// ---------------------------------------------------------------
+
+#include "Sequences.bpl"
+
+// The empty sequence $Is any type
+//axiom (forall t: Ty :: {$Is(Seq#Empty(): Seq, TSeq(t))} $Is(Seq#Empty(): Seq, TSeq(t)));
+
+// Build preserves $Is
+axiom (forall s: Seq, bx: Box, t: Ty :: { $Is(Seq#Build(s, bx), TSeq(t)) }
+    $Is(s, TSeq(t)) && $IsBox(bx, t) ==> $Is(Seq#Build(s, bx), TSeq(t)));
+
+function Seq#Create(ty: Ty, heap: Heap, len: int, init: HandleType): Seq;
+axiom (forall ty: Ty, heap: Heap, len: int, init: HandleType ::
+  { Seq#Length(Seq#Create(ty, heap, len, init): Seq) }
+  $IsGoodHeap(heap) && 0 <= len ==>
+  Seq#Length(Seq#Create(ty, heap, len, init): Seq) == len);
+axiom (forall ty: Ty, heap: Heap, len: int, init: HandleType, i: int ::
+  { Seq#Index(Seq#Create(ty, heap, len, init), i) }
+  $IsGoodHeap(heap) && 0 <= i && i < len ==>
+  Seq#Index(Seq#Create(ty, heap, len, init), i) == Apply1(TInt, ty, heap, init, $Box(i)));
+
+function Seq#FromArray(h: Heap, a: ref): Seq;
+axiom (forall h: Heap, a: ref ::
+  { Seq#Length(Seq#FromArray(h,a)) }
+  Seq#Length(Seq#FromArray(h, a)) == _System.array.Length(a));
+axiom (forall h: Heap, a: ref ::
+  { Seq#FromArray(h, a) }
+  (forall i: int ::
+    // it's important to include both triggers, so that assertions about the
+    // the relation between the array and the sequence can be proved in either
+    // direction
+    { read(h, a, IndexField(i)) }
+    { Seq#Index(Seq#FromArray(h, a): Seq, i) }
+    0 <= i &&
+    i < Seq#Length(Seq#FromArray(h, a))  // this will trigger the previous axiom to get a connection with _System.array.Length(a)
+    ==>
+    Seq#Index(Seq#FromArray(h, a), i) == read(h, a, IndexField(i))));
+axiom (forall h0, h1: Heap, a: ref ::
+  { Seq#FromArray(h1, a), $HeapSucc(h0, h1) }
+  $IsGoodHeap(h0) && $IsGoodHeap(h1) && $HeapSucc(h0, h1) && h0[a] == h1[a]
+  ==>
+  Seq#FromArray(h0, a) == Seq#FromArray(h1, a));
+axiom (forall h: Heap, i: int, v: Box, a: ref ::
+  { Seq#FromArray(update(h, a, IndexField(i), v), a) }
+    0 <= i && i < _System.array.Length(a) ==> Seq#FromArray(update(h, a, IndexField(i), v), a) == Seq#Update(Seq#FromArray(h, a), i, v) );
+
+// Extension axiom, triggers only on Takes from arrays.
+axiom (forall h: Heap, a: ref, n0, n1: int ::
+        { Seq#Take(Seq#FromArray(h, a), n0), Seq#Take(Seq#FromArray(h, a), n1) }
+        n0 + 1 == n1 && 0 <= n0 && n1 <= _System.array.Length(a) ==> Seq#Take(Seq#FromArray(h, a), n1) == Seq#Build(Seq#Take(Seq#FromArray(h, a), n0), read(h, a, IndexField(n0): Field)) );
+
+function Seq#Rank(Seq): int;
+axiom (forall s: Seq, i: int ::
+        { DtRank($Unbox(Seq#Index(s, i)): DatatypeType) }
+        0 <= i && i < Seq#Length(s) ==> DtRank($Unbox(Seq#Index(s, i)): DatatypeType) < Seq#Rank(s) );
+axiom (forall s: Seq, i: int ::
+        { Seq#Rank(Seq#Drop(s, i)) }
+        0 < i && i <= Seq#Length(s) ==> Seq#Rank(Seq#Drop(s, i)) < Seq#Rank(s) );
+axiom (forall s: Seq, i: int ::
+        { Seq#Rank(Seq#Take(s, i)) }
+        0 <= i && i < Seq#Length(s) ==> Seq#Rank(Seq#Take(s, i)) < Seq#Rank(s) );
+axiom (forall s: Seq, i: int, j: int ::
+        { Seq#Rank(Seq#Append(Seq#Take(s, i), Seq#Drop(s, j))) }
+        0 <= i && i < j && j <= Seq#Length(s) ==> Seq#Rank(Seq#Append(Seq#Take(s, i), Seq#Drop(s, j))) < Seq#Rank(s) );
+
+// ---------------------------------------------------------------
+// -- Axiomatization of Maps -------------------------------------
+// ---------------------------------------------------------------
+
+type Map;
+
+// A Map is defined by three functions, Map#Domain, Map#Elements, and #Map#Card.
+
+function Map#Domain(Map) : Set;
+
+function Map#Elements(Map) : [Box]Box;
+
+function Map#Card(Map) : int;
+
+axiom (forall m: Map :: { Map#Card(m) } 0 <= Map#Card(m));
+
+axiom (forall m: Map ::
+  { Map#Card(m) }
+  Map#Card(m) == 0 <==> m == Map#Empty());
+
+axiom (forall m: Map ::
+  { Map#Domain(m) }
+  m == Map#Empty() || (exists k: Box :: Set#IsMember(Map#Domain(m), k)));
+axiom (forall m: Map ::
+  { Map#Values(m) }
+  m == Map#Empty() || (exists v: Box :: Set#IsMember(Map#Values(m), v)));
+axiom (forall m: Map ::
+  { Map#Items(m) }
+  m == Map#Empty() || (exists k, v: Box :: Set#IsMember(Map#Items(m), $Box(#_System._tuple#2._#Make2(k, v)))));
+
+axiom (forall m: Map ::
+  { Set#Card(Map#Domain(m)) } { Map#Card(m) }
+  Set#Card(Map#Domain(m)) == Map#Card(m));
+axiom (forall m: Map ::
+  { Set#Card(Map#Values(m)) } { Map#Card(m) }
+  Set#Card(Map#Values(m)) <= Map#Card(m));
+axiom (forall m: Map ::
+  { Set#Card(Map#Items(m)) } { Map#Card(m) }
+  Set#Card(Map#Items(m)) == Map#Card(m));
+
+// The set of Values of a Map can be obtained by the function Map#Values, which is
+// defined as follows.  Remember, a Set is defined by Set#IsMember and Map#Card, so
+// we need to define what these mean for the Set returned by Map#Values.
+
+function Map#Values(Map) : Set;
+
+axiom (forall m: Map, v: Box :: { Set#IsMember(Map#Values(m), v) }
+  Set#IsMember(Map#Values(m), v) ==
+	(exists u: Box :: { Set#IsMember(Map#Domain(m), u) } { Map#Elements(m)[u] }
+	  Set#IsMember(Map#Domain(m), u) &&
+    v == Map#Elements(m)[u]));
+
+// The set of Items--that is, (key,value) pairs--of a Map can be obtained by the
+// function Map#Items.  Again, we need to define Set#IsMember and Set#Card for this
+// set. Function Map#Items returns a set of pairs, and the axiomatization of pairs is Dafny specific.
+// Therefore, the definition of Map#Items here is to be considered Dafny specific.  Also, note
+// that it relies on the two destructors for 2-tuples.
+
+function Map#Items(Map) : Set;
+
+function #_System._tuple#2._#Make2(Box, Box) : DatatypeType;
+function _System.Tuple2._0(DatatypeType) : Box;
+function _System.Tuple2._1(DatatypeType) : Box;
+
+axiom (forall m: Map, item: Box :: { Set#IsMember(Map#Items(m), item) }
+  Set#IsMember(Map#Items(m), item) <==>
+    Set#IsMember(Map#Domain(m), _System.Tuple2._0($Unbox(item))) &&
+    Map#Elements(m)[_System.Tuple2._0($Unbox(item))] == _System.Tuple2._1($Unbox(item)));
+
+// Here are the operations that produce Map values.
+
+function Map#Empty(): Map;
+axiom (forall u: Box ::
+        { Set#IsMember(Map#Domain(Map#Empty(): Map), u) }
+        !Set#IsMember(Map#Domain(Map#Empty(): Map), u));
+
+function Map#Glue(Set, [Box]Box, Ty): Map;
+axiom (forall a: Set, b: [Box]Box, t: Ty ::
+  { Map#Domain(Map#Glue(a, b, t)) }
+  Map#Domain(Map#Glue(a, b, t)) == a);
+axiom (forall a: Set, b: [Box]Box, t: Ty ::
+  { Map#Elements(Map#Glue(a, b, t)) }
+  Map#Elements(Map#Glue(a, b, t)) == b);
+axiom (forall a: Set, b: [Box]Box, t0, t1: Ty ::
+  { Map#Glue(a, b, TMap(t0, t1)) }
+  // In the following line, no trigger needed, since the quantifier only gets used in negative contexts
+  (forall bx: Box :: Set#IsMember(a, bx) ==> $IsBox(bx, t0) && $IsBox(b[bx], t1))
+  ==>
+  $Is(Map#Glue(a, b, TMap(t0, t1)), TMap(t0, t1)));
+
+
+//Build is used in displays, and for map updates
+function Map#Build(Map, Box, Box): Map;
+/*axiom (forall m: Map, u: Box, v: Box ::
+  { Map#Domain(Map#Build(m, u, v))[u] } { Map#Elements(Map#Build(m, u, v))[u] }
+  Map#Domain(Map#Build(m, u, v))[u] && Map#Elements(Map#Build(m, u, v))[u] == v);*/
+
+axiom (forall m: Map, u: Box, u': Box, v: Box ::
+  { Set#IsMember(Map#Domain(Map#Build(m, u, v)), u') } { Map#Elements(Map#Build(m, u, v))[u'] }
+  (u' == u ==> Set#IsMember(Map#Domain(Map#Build(m, u, v)), u') &&
+               Map#Elements(Map#Build(m, u, v))[u'] == v) &&
+  (u' != u ==> Set#IsMember(Map#Domain(Map#Build(m, u, v)), u') == Set#IsMember(Map#Domain(m), u') &&
+               Map#Elements(Map#Build(m, u, v))[u'] == Map#Elements(m)[u']));
+axiom (forall m: Map, u: Box, v: Box :: { Map#Card(Map#Build(m, u, v)) }
+  Set#IsMember(Map#Domain(m), u) ==> Map#Card(Map#Build(m, u, v)) == Map#Card(m));
+axiom (forall m: Map, u: Box, v: Box :: { Map#Card(Map#Build(m, u, v)) }
+  !Set#IsMember(Map#Domain(m), u) ==> Map#Card(Map#Build(m, u, v)) == Map#Card(m) + 1);
+
+// Map operations
+function Map#Merge(Map, Map): Map;
+axiom (forall m: Map, n: Map ::
+  { Map#Domain(Map#Merge(m, n)) }
+  Map#Domain(Map#Merge(m, n)) == Set#Union(Map#Domain(m), Map#Domain(n)));
+axiom (forall m: Map, n: Map, u: Box ::
+  { Map#Elements(Map#Merge(m, n))[u] }
+  Set#IsMember(Map#Domain(Map#Merge(m, n)), u) ==>
+    (!Set#IsMember(Map#Domain(n), u) ==> Map#Elements(Map#Merge(m, n))[u] == Map#Elements(m)[u]) &&
+    (Set#IsMember(Map#Domain(n), u) ==> Map#Elements(Map#Merge(m, n))[u] == Map#Elements(n)[u]));
+
+function Map#Subtract(Map, Set): Map;
+axiom (forall m: Map, s: Set ::
+  { Map#Domain(Map#Subtract(m, s)) }
+  Map#Domain(Map#Subtract(m, s)) == Set#Difference(Map#Domain(m), s));
+axiom (forall m: Map, s: Set, u: Box ::
+  { Map#Elements(Map#Subtract(m, s))[u] }
+  Set#IsMember(Map#Domain(Map#Subtract(m, s)), u) ==>
+    Map#Elements(Map#Subtract(m, s))[u] == Map#Elements(m)[u]);
+
+//equality for maps
+function Map#Equal(Map, Map): bool;
+axiom (forall m: Map, m': Map::
+  { Map#Equal(m, m') }
+    Map#Equal(m, m') <==> (forall u : Box :: Set#IsMember(Map#Domain(m), u) == Set#IsMember(Map#Domain(m'), u)) &&
+                          (forall u : Box :: Set#IsMember(Map#Domain(m), u) ==> Map#Elements(m)[u] == Map#Elements(m')[u]));
+// extensionality
+axiom (forall m: Map, m': Map::
+  { Map#Equal(m, m') }
+    Map#Equal(m, m') ==> m == m');
+
+function Map#Disjoint(Map, Map): bool;
+axiom (forall m: Map, m': Map ::
+  { Map#Disjoint(m, m') }
+    Map#Disjoint(m, m') <==>
+    (forall o: Box :: {Set#IsMember(Map#Domain(m), o)} {Set#IsMember(Map#Domain(m'), o)} !Set#IsMember(Map#Domain(m), o) || !Set#IsMember(Map#Domain(m'), o)));
+
+// ---------------------------------------------------------------
+// -- Axiomatization of IMaps ------------------------------------
+// ---------------------------------------------------------------
+
+type IMap;
+
+// A IMap is defined by two functions, Map#Domain and Map#Elements.
+
+function IMap#Domain(IMap) : ISet;
+
+function IMap#Elements(IMap) : [Box]Box;
+
+axiom (forall m: IMap ::
+  { IMap#Domain(m) }
+  m == IMap#Empty() || (exists k: Box :: IMap#Domain(m)[k]));
+axiom (forall m: IMap ::
+  { IMap#Values(m) }
+  m == IMap#Empty() || (exists v: Box :: IMap#Values(m)[v]));
+axiom (forall m: IMap ::
+  { IMap#Items(m) }
+  m == IMap#Empty() || (exists k, v: Box :: IMap#Items(m)[$Box(#_System._tuple#2._#Make2(k, v))]));
+
+axiom (forall m: IMap ::
+  { IMap#Domain(m) }
+  m == IMap#Empty() <==> IMap#Domain(m) == ISet#Empty());
+axiom (forall m: IMap ::
+  { IMap#Values(m) }
+  m == IMap#Empty() <==> IMap#Values(m) == ISet#Empty());
+axiom (forall m: IMap ::
+  { IMap#Items(m) }
+  m == IMap#Empty() <==> IMap#Items(m) == ISet#Empty());
+
+// The set of Values of an IMap can be obtained by the function IMap#Values, which is
+// defined as follows.  Remember, an ISet is defined by membership (using Boogie's
+// square brackets) so we need to define what these mean for the ISet
+// returned by IMap#Values.
+
+function IMap#Values(IMap) : ISet;
+
+axiom (forall m: IMap, v: Box :: { IMap#Values(m)[v] }
+  IMap#Values(m)[v] ==
+	(exists u: Box :: { IMap#Domain(m)[u] } { IMap#Elements(m)[u] }
+	  IMap#Domain(m)[u] &&
+    v == IMap#Elements(m)[u]));
+
+// The set of Items--that is, (key,value) pairs--of a Map can be obtained by the
+// function IMap#Items. Function IMap#Items returns a set of
+// pairs, and the axiomatization of pairs is Dafny specific.  Therefore, the
+// definition of IMap#Items here is to be considered Dafny specific.  Also, note
+// that it relies on the two destructors for 2-tuples.
+
+function IMap#Items(IMap) : ISet;
+
+axiom (forall m: IMap, item: Box :: { IMap#Items(m)[item] }
+  IMap#Items(m)[item] <==>
+    IMap#Domain(m)[_System.Tuple2._0($Unbox(item))] &&
+    IMap#Elements(m)[_System.Tuple2._0($Unbox(item))] == _System.Tuple2._1($Unbox(item)));
+
+// Here are the operations that produce Map values.
+function IMap#Empty(): IMap;
+axiom (forall u: Box ::
+        { IMap#Domain(IMap#Empty(): IMap)[u] }
+        !IMap#Domain(IMap#Empty(): IMap)[u]);
+
+function IMap#Glue([Box] bool, [Box]Box, Ty): IMap;
+axiom (forall a: [Box]bool, b: [Box]Box, t: Ty ::
+  { IMap#Domain(IMap#Glue(a, b, t)) }
+  IMap#Domain(IMap#Glue(a, b, t)) == a);
+axiom (forall a: [Box]bool, b: [Box]Box, t: Ty ::
+  { IMap#Elements(IMap#Glue(a, b, t)) }
+  IMap#Elements(IMap#Glue(a, b, t)) == b);
+axiom (forall a: [Box]bool, b: [Box]Box, t0, t1: Ty ::
+  { IMap#Glue(a, b, TIMap(t0, t1)) }
+  // In the following line, no trigger needed, since the quantifier only gets used in negative contexts
+  (forall bx: Box :: a[bx] ==> $IsBox(bx, t0) && $IsBox(b[bx], t1))
+  ==>
+  $Is(IMap#Glue(a, b, TIMap(t0, t1)), TIMap(t0, t1)));
+
+//Build is used in displays
+function IMap#Build(IMap, Box, Box): IMap;
+/*axiom (forall m: IMap, u: Box, v: Box ::
+  { IMap#Domain(IMap#Build(m, u, v))[u] } { IMap#Elements(IMap#Build(m, u, v))[u] }
+  IMap#Domain(IMap#Build(m, u, v))[u] && IMap#Elements(IMap#Build(m, u, v))[u] == v);*/
+
+axiom (forall m: IMap, u: Box, u': Box, v: Box ::
+  { IMap#Domain(IMap#Build(m, u, v))[u'] } { IMap#Elements(IMap#Build(m, u, v))[u'] }
+  (u' == u ==> IMap#Domain(IMap#Build(m, u, v))[u'] &&
+               IMap#Elements(IMap#Build(m, u, v))[u'] == v) &&
+  (u' != u ==> IMap#Domain(IMap#Build(m, u, v))[u'] == IMap#Domain(m)[u'] &&
+               IMap#Elements(IMap#Build(m, u, v))[u'] == IMap#Elements(m)[u']));
+
+//equality for imaps
+function IMap#Equal(IMap, IMap): bool;
+axiom (forall m: IMap, m': IMap::
+  { IMap#Equal(m, m') }
+    IMap#Equal(m, m') <==> (forall u : Box :: IMap#Domain(m)[u] == IMap#Domain(m')[u]) &&
+                          (forall u : Box :: IMap#Domain(m)[u] ==> IMap#Elements(m)[u] == IMap#Elements(m')[u]));
+// extensionality
+axiom (forall m: IMap, m': IMap::
+  { IMap#Equal(m, m') }
+    IMap#Equal(m, m') ==> m == m');
+
+// IMap operations
+function IMap#Merge(IMap, IMap): IMap;
+axiom (forall m: IMap, n: IMap ::
+  { IMap#Domain(IMap#Merge(m, n)) }
+  IMap#Domain(IMap#Merge(m, n)) == ISet#Union(IMap#Domain(m), IMap#Domain(n)));
+axiom (forall m: IMap, n: IMap, u: Box ::
+  { IMap#Elements(IMap#Merge(m, n))[u] }
+  IMap#Domain(IMap#Merge(m, n))[u] ==>
+    (!IMap#Domain(n)[u] ==> IMap#Elements(IMap#Merge(m, n))[u] == IMap#Elements(m)[u]) &&
+    (IMap#Domain(n)[u] ==> IMap#Elements(IMap#Merge(m, n))[u] == IMap#Elements(n)[u]));
+
+function IMap#Subtract(IMap, Set): IMap;
+axiom (forall m: IMap, s: Set ::
+  { IMap#Domain(IMap#Subtract(m, s)) }
+  IMap#Domain(IMap#Subtract(m, s)) == ISet#Difference(IMap#Domain(m), ISet#FromSet(s)));
+axiom (forall m: IMap, s: Set, u: Box ::
+  { IMap#Elements(IMap#Subtract(m, s))[u] }
+  IMap#Domain(IMap#Subtract(m, s))[u] ==>
+    IMap#Elements(IMap#Subtract(m, s))[u] == IMap#Elements(m)[u]);
+
+// -------------------------------------------------------------------------
+// -- Provide arithmetic wrappers to improve triggering and non-linear math
+// -------------------------------------------------------------------------
+
+function INTERNAL_add_boogie(x:int, y:int) : int { x + y }
+function INTERNAL_sub_boogie(x:int, y:int) : int { x - y }
+function INTERNAL_mul_boogie(x:int, y:int) : int { x * y }
+function INTERNAL_div_boogie(x:int, y:int) : int { x div y }
+function INTERNAL_mod_boogie(x:int, y:int) : int { x mod y }
+function {:never_pattern true} INTERNAL_lt_boogie(x:int, y:int) : bool { x < y }
+function {:never_pattern true} INTERNAL_le_boogie(x:int, y:int) : bool { x <= y }
+function {:never_pattern true} INTERNAL_gt_boogie(x:int, y:int) : bool { x > y }
+function {:never_pattern true} INTERNAL_ge_boogie(x:int, y:int) : bool { x >= y }
+
+function Mul(x, y: int): int { x * y }
+function Div(x, y: int): int { x div y }
+function Mod(x, y: int): int { x mod y }
+function Add(x, y: int): int { x + y }
+function Sub(x, y: int): int { x - y }
+
+#if ARITH_DISTR
+axiom (forall x, y, z: int ::
+  { Mul(Add(x, y), z) }
+  Mul(Add(x, y), z) == Add(Mul(x, z), Mul(y, z)));
+axiom (forall x,y,z: int ::
+  { Mul(x, Add(y, z)) }
+  Mul(x, Add(y, z)) == Add(Mul(x, y), Mul(x, z)));
+//axiom (forall x, y, z: int ::
+//  { Mul(Sub(x, y), z) }
+//  Mul(Sub(x, y), z) == Sub(Mul(x, z), Mul(y, z)));
+#endif
+#if ARITH_MUL_DIV_MOD
+axiom (forall x, y: int ::
+  { Div(x, y), Mod(x, y) }
+  { Mul(Div(x, y), y) }
+  y != 0 ==>
+  Mul(Div(x, y), y) + Mod(x, y) == x);
+#endif
+#if ARITH_MUL_SIGN
+axiom (forall x, y: int ::
+  { Mul(x, y) }
+  ((0 <= x && 0 <= y) || (x <= 0 && y <= 0) ==> 0 <= Mul(x, y)));
+#endif
+#if ARITH_MUL_COMM
+axiom (forall x, y: int ::
+  { Mul(x, y) }
+  Mul(x, y) == Mul(y, x));
+#endif
+#if ARITH_MUL_ASSOC
+axiom (forall x, y, z: int ::
+  { Mul(x, Mul(y, z)) }
+  Mul(y, z) != z && Mul(y, z) != y ==> Mul(x, Mul(y, z)) == Mul(Mul(x, y), z));
+#endif
+
+// -------------------------------------------------------------------------
diff --git a/Source/DafnyCore/Prelude/Sequences.dfy b/Source/DafnyCore/Prelude/Sequences.dfy
new file mode 100644
index 00000000000..b166bb02f00
--- /dev/null
+++ b/Source/DafnyCore/Prelude/Sequences.dfy
@@ -0,0 +1,824 @@
+module {:extract_boogie} Sequences {
+  export
+    provides Boxes
+    provides Seq, Length, AboutLength
+    provides Empty, LengthEmpty0, LengthEmpty1
+    provides Index, Append, IndexAppend
+    provides Build, BuildInv0, BuildInv1, BuildInjective, LengthBuild
+    provides Update, IndexUpdate, LengthUpdate
+    provides Contains, SeqContainsItsElements, EmptyContainsNothing, AppendContains, BuildContains
+    provides Equal, AboutEqual, Extensionality
+    provides SameUntil, AboutSameUntil
+    provides Take, LengthTake, IndexTake
+    provides Drop, LengthDrop, IndexDrop0, IndexDrop1
+    provides TakeContains, DropContains, AppendTakeDrop
+    provides DropNothing, TakeNothing, DropDrop
+    provides TakeUpdate0, TakeUpdate1, DropUpdate0, DropUpdate1, DropBuild
+  // For friends, we also export the fact that a sequence is represented as a list.
+  export Friends extends Sequences
+    reveals Seq, Empty, Length, Index, Append, Build, Update
+    provides Lists, TailContains
+
+  import opened Lists
+  import opened Boxes
+
+  // boogie: type Seq;
+  type {:extract_boogie_name "Seq"} Seq = List<Box>
+
+  // boogie: function Seq#Length(Seq): int;
+  function {:extract_boogie_name "Seq#Length"} Length(s: Seq): int {
+    s.Length()
+  }
+
+  // boogie: axiom (forall s: Seq :: { Seq#Length(s) } 0 <= Seq#Length(s));
+  lemma {:extract_pattern Length(s)} AboutLength(s: Seq)
+    ensures 0 <= Length(s)
+  {
+  }
+
+  // boogie: function Seq#Empty(): Seq;
+  function {:extract_boogie_name "Seq#Empty"} Empty(): Seq {
+    Nil
+  }
+
+  // boogie: axiom Seq#Length(Seq#Empty()) == 0;
+  lemma {:extract_used_by Empty} LengthEmpty0()
+    ensures Length(Empty()) == 0
+  {
+  }
+
+  // boogie axiom (forall s: Seq :: { Seq#Length(s) } Seq#Length(s) == 0 ==> s == Seq#Empty());
+  lemma {:extract_pattern Length(s)} LengthEmpty1(s: Seq)
+    requires Length(s) == 0
+    ensures s == Empty()
+  {
+  }
+
+  // boogie:
+  // The following would be a nice fact to include, because it would enable verifying the
+  // GenericPick.SeqPick* methods in Test/dafny0/SmallTests.dfy.  However, it substantially
+  // slows down performance on some other tests, including running seemingly forever on
+  // some.
+  //  axiom (forall s: Seq :: { Seq#Length(s) }
+  //    Seq#Length(s) != 0 ==> (exists x: Box :: Seq#Contains(s, x)));
+
+  // boogie: function Seq#Build(s: Seq, val: Box): Seq;
+  function {:extract_boogie_name "Seq#Build"} Build(s: Seq, val: Box): Seq {
+    s.Append(Cons(val, Nil))
+  }
+
+  // boogie: function Seq#Build_inv0(s: Seq) : Seq;
+  function {:extract_boogie_name "Seq#Build_inv0"} BuildInv0(s: Seq): Seq {
+    if s.Nil? then Nil else s.Take(s.Length() - 1)
+  }
+  // boogie: function Seq#Build_inv1(s: Seq) : Box;
+  function {:extract_boogie_name "Seq#Build_inv1"} BuildInv1(s: Seq): Box {
+    if s.Nil? then
+      Boxes.arbitrary
+    else
+      s.AboutDrop(s.Length() - 1);
+      s.Drop(s.Length() - 1).head
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, val: Box ::
+  //   { Seq#Build(s, val) }
+  //   Seq#Build_inv0(Seq#Build(s, val)) == s &&
+  //   Seq#Build_inv1(Seq#Build(s, val)) == val);
+  lemma {:extract_pattern Build(s, val)} BuildInjective(s: Seq, val: Box)
+    ensures BuildInv0(Build(s, val)) == s
+    ensures BuildInv1(Build(s, val)) == val
+  {
+    var b := Build(s, val);
+    var valList := Cons(val, Nil);
+    assert b == s.Append(valList) != Nil;
+    assert L: b.Length() == s.Length() + 1 by {
+      s.LengthAppend(valList);
+    }
+
+    calc {
+      BuildInv0(b);
+      s.Append(valList).Take(b.Length() - 1);
+      { reveal L; }
+      s.Append(valList).Take(s.Length());
+      { s.AppendTake(valList); }
+      s;
+    }
+
+    calc {
+      BuildInv1(b);
+      { b.AboutDrop(b.Length() - 1); }
+      b.Drop(b.Length() - 1).head;
+      { reveal L; }
+      s.Append(valList).Drop(s.Length()).head;
+      { s.AppendDrop(valList); }
+      valList.head;
+      val;
+    }
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, v: Box ::
+  //   { Seq#Build(s,v) }
+  //   Seq#Length(Seq#Build(s,v)) == 1 + Seq#Length(s));
+  lemma {:extract_pattern Build(s, v)} LengthBuild(s: Seq, v: Box)
+    ensures Length(Build(s, v)) == 1 + Length(s)
+  {
+    var valList := Cons(v, Nil);
+    assert valList.Length() == 1;
+    s.LengthAppend(valList);
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, i: int, v: Box :: { Seq#Index(Seq#Build(s,v), i) }
+  //   (i == Seq#Length(s) ==> Seq#Index(Seq#Build(s,v), i) == v) &&
+  //   (i != Seq#Length(s) ==> Seq#Index(Seq#Build(s,v), i) == Seq#Index(s, i)));
+  lemma {:extract_pattern Index(Build(s, v), i)} IndexBuild(s: Seq, i: int, v: Box)
+    ensures i == Length(s) ==> Index(Build(s, v), i) == v
+    ensures i != Length(s) ==> Index(Build(s, v), i) == Index(s, i)
+  {
+    var b := Build(s, v);
+    var valList := Cons(v, Nil);
+    assert b == s.Append(valList) != Nil;
+    assert b.Length() == s.Length() + 1 by {
+      s.LengthAppend(valList);
+    }
+
+    if 0 <= i < b.Length() {
+      calc {
+        Index(Build(s, v), i);
+        Index(s.Append(valList), i);
+        s.Append(valList).At(i);
+        { s.AppendAt(valList, i); }
+        if i < Length(s) then s.At(i) else valList.At(0);
+      }
+    }
+  }
+
+  // boogie:
+  // axiom (forall s0: Seq, s1: Seq :: { Seq#Length(Seq#Append(s0,s1)) }
+  //   Seq#Length(Seq#Append(s0,s1)) == Seq#Length(s0) + Seq#Length(s1));
+  lemma {:extract_pattern Length(Append(s0, s1))} LengthAppend(s0: Seq, s1: Seq)
+    ensures Length(Append(s0, s1)) == Length(s0) + Length(s1)
+  {
+    s0.LengthAppend(s1);
+  }
+
+  // boogie: function Seq#Index(Seq, int): Box;
+  function {:extract_boogie_name "Seq#Index"} Index(s: Seq, i: int): Box {
+    if 0 <= i < Length(s) then
+      s.At(i)
+    else
+      Boxes.arbitrary
+  }
+
+  // boogie:
+  // axiom (forall s0: Seq, s1: Seq, n: int :: { Seq#Index(Seq#Append(s0,s1), n) }
+  //   (n < Seq#Length(s0) ==> Seq#Index(Seq#Append(s0,s1), n) == Seq#Index(s0, n)) &&
+  //   (Seq#Length(s0) <= n ==> Seq#Index(Seq#Append(s0,s1), n) == Seq#Index(s1, n - Seq#Length(s0))));
+  lemma {:extract_pattern Index(Append(s0, s1), n)} IndexAppend(s0: Seq, s1: Seq, n: int)
+    ensures n < Length(s0) ==> Index(Append(s0, s1), n) == Index(s0, n)
+    ensures Length(s0) <= n ==> Index(Append(s0, s1), n) == Index(s1, n - Length(s0))
+  {
+    if
+    case n < 0 =>
+
+    case 0 <= n < Length(s0) =>
+      if n == 0 {
+        calc {
+          Index(Append(s0, s1), 0);
+          Index(Cons(s0.head, Append(s0.tail, s1)), 0);
+          s0.head;
+          Index(Cons(s0.head, s0.tail), 0);
+          Index(s0, 0);
+        }
+      } else {
+        calc {
+          Index(Append(s0, s1), n);
+          // def. Append
+          Index(Cons(s0.head, Append(s0.tail, s1)), n);
+          // def. Index
+          Index(Append(s0.tail, s1), n - 1);
+          { IndexAppend(s0.tail, s1, n - 1); }
+          Index(s0.tail, n - 1);
+          // def. Index
+          Index(Cons(s0.head, s0.tail), n);
+          Index(s0, n);
+        }
+      }
+
+    case Length(s0) <= n =>
+      match s0
+      case Nil =>
+        calc {
+          Index(Append(s0, s1), n);
+          // def. Append
+          Index(s1, n);
+          // def. Length
+          Index(s1, n - Length(s0));
+        }
+      case Cons(x, tail) =>
+        calc {
+          Index(Append(s0, s1), n);
+          // def. Append
+          Index(Cons(s0.head, Append(s0.tail, s1)), n);
+          // def. Index
+          Index(Append(s0.tail, s1), n - 1);
+          { IndexAppend(s0.tail, s1, n - 1); }
+          Index(s1, n - 1 - Length(s0.tail));
+          // def. Length
+          Index(s1, n - Length(s0));
+        }
+  }
+
+  // boogie: function Seq#Update(Seq, int, Box): Seq;
+  function {:extract_boogie_name "Seq#Update"} Update(s: Seq, i: int, val: Box): Seq {
+    if !(0 <= i < s.Length()) then
+      s
+    else if i == 0 then
+      Cons(val, s.tail)
+    else
+      Cons(s.head, Update(s.tail, i - 1, val))
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, i: int, v: Box :: { Seq#Length(Seq#Update(s,i,v)) }
+  //   0 <= i && i < Seq#Length(s) ==> Seq#Length(Seq#Update(s,i,v)) == Seq#Length(s));
+  lemma {:extract_pattern Length(Update(s, i, v))} LengthUpdate(s: Seq, i: int, v: Box)
+    requires 0 <= i < Length(s)
+    ensures Length(Update(s, i, v)) == Length(s)
+  {
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, i: int, v: Box, n: int :: { Seq#Index(Seq#Update(s,i,v),n) }
+  //   0 <= n && n < Seq#Length(s) ==>
+  //     (i == n ==> Seq#Index(Seq#Update(s,i,v),n) == v) &&
+  //     (i != n ==> Seq#Index(Seq#Update(s,i,v),n) == Seq#Index(s,n)));
+  lemma {:extract_pattern Index(Update(s, i, v), n)} IndexUpdate(s: Seq, i: int, v: Box, n: int)
+    requires 0 <= n < Length(s)
+    ensures i == n ==> Index(Update(s, i, v), n) == v
+    ensures i != n ==> Index(Update(s, i, v), n) == Index(s, n)
+  {
+    if 0 == i < s.Length() {
+      calc {
+        Index(Update(s, i, v), n);
+        { LengthUpdate(s, i, v); }
+        Update(s, i, v).At(n);
+        Cons(v, s.tail).At(n);
+      }
+
+    } else if 0 < i < s.Length() {
+      LengthUpdate(s, i, v);
+      calc {
+        Index(Update(s, i, v), n);
+        Update(s, i, v).At(n);
+        Cons(s.head, Update(s.tail, i - 1, v)).At(n);
+      }
+      if n == 0 {
+        calc {
+          Cons(s.head, Update(s.tail, i - 1, v)).At(n);
+          s.head;
+          Cons(s.head, s.tail).At(n);
+          s.At(n);
+          Index(s, n);
+        }
+      } else {
+        calc {
+          Cons(s.head, Update(s.tail, i - 1, v)).At(n);
+          Update(s.tail, i - 1, v).At(n - 1);
+          { IndexUpdate(s.tail, i - 1, v, n - 1); }
+          if i == n then v else Index(s.tail, n - 1);
+          if i == n then v else Index(s, n);
+        }
+      }
+    }
+  }
+
+  // boogie: function Seq#Append(Seq, Seq): Seq;
+  function {:extract_boogie_name "Seq#Append"} Append(s0: Seq, s1: Seq): Seq {
+    s0.Append(s1)
+  }
+
+  // boogie: function Seq#Contains(Seq, Box): bool;
+  predicate {:extract_boogie_name "Seq#Contains"} Contains(s: Seq, val: Box) {
+    exists i :: 0 <= i < Length(s) && Index(s, i) == val
+  }
+
+  lemma TailContains(s: Seq, val: Box)
+    requires s.Cons?
+    ensures Contains(s, val) <==> s.head == val || Contains(s.tail, val)
+  {
+    if Contains(s, val) {
+      var i :| 0 <= i < Length(s) && Index(s, i) == val;
+      if i != 0 {
+        var j := i - 1;
+        assert Index(s, i) == Index(s.tail, j);
+        assert 0 <= j < Length(s.tail) && Index(s.tail, j) == val;
+      }
+    }
+
+    if !Contains(s, val) {
+      assert forall i :: 0 <= i < Length(s) ==> Index(s, i) != val;
+      assert s.head == Index(s, 0) != val;
+      forall j | 0 <= j < Length(s.tail)
+        ensures Index(s.tail, j) != val
+      {
+        assert Index(s.tail, j) == Index(s, j + 1);
+      }
+    }
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, x: Box :: { Seq#Contains(s,x) }
+  //   Seq#Contains(s,x) <==>
+  //     (exists i: int :: { Seq#Index(s,i) } 0 <= i && i < Seq#Length(s) && Seq#Index(s,i) == x));
+  lemma {:extract_pattern Contains(s, x)} SeqContainsItsElements(s: Seq, x: Box)
+    ensures Contains(s, x) <==>
+            exists i {:extract_pattern Index(s, i)} :: 0 <= i < Length(s) && Index(s, i) == x
+  {
+  }
+
+  // boogie:
+  // axiom (forall x: Box ::
+  //   { Seq#Contains(Seq#Empty(), x) }
+  //   !Seq#Contains(Seq#Empty(), x));
+  lemma {:extract_pattern Contains(Empty(), x)} EmptyContainsNothing(x: Box)
+    ensures !Contains(Empty(), x)
+  {
+  }
+
+  // boogie:
+  // axiom (forall s0: Seq, s1: Seq, x: Box ::
+  //   { Seq#Contains(Seq#Append(s0, s1), x) }
+  //   Seq#Contains(Seq#Append(s0, s1), x) <==>
+  //     Seq#Contains(s0, x) || Seq#Contains(s1, x));
+  lemma {:extract_pattern Contains(Append(s0, s1), x)} AppendContains(s0: Seq, s1: Seq, x: Box)
+    ensures Contains(Append(s0, s1), x) <==> Contains(s0, x) || Contains(s1, x)
+  {
+    var a := Append(s0, s1);
+    s0.LengthAppend(s1);
+
+    if Contains(a, x) {
+      var i :| 0 <= i < Length(a) && Index(a, i) == x;
+      assert a.At(i) == if i < s0.Length() then s0.At(i) else s1.At(i - s0.Length()) by {
+        s0.AppendAt(s1, i);
+      }
+
+      if i < s0.Length() {
+        assert Contains(s0, x) by {
+          assert 0 <= i < Length(s0) && Index(s0, i) == x;
+        }
+      } else {
+        var j := i - s0.Length();
+        assert Contains(s1, x) by {
+          assert x == Index(s1, j);
+        }
+      }
+    }
+
+    if Contains(s0, x) {
+      var i :| 0 <= i < Length(s0) && Index(s0, i) == x;
+      assert Contains(a, x) by {
+        assert Index(a, i) == x by {
+          s0.AppendAt(s1, i);
+        }
+      }
+    }
+
+    if Contains(s1, x) {
+      var j :| 0 <= j < Length(s1) && Index(s1, j) == x;
+      var i := s0.Length() + j;
+      assert Contains(a, x) by {
+        assert Index(a, i) == x by {
+          s0.AppendAt(s1, i);
+        }
+      }
+    }
+  }
+
+  // needed to prove things like '4 in [2,3,4]', see method TestSequences0 in SmallTests.dfy
+  // boogie:
+  // axiom (forall s: Seq, v: Box, x: Box ::
+  //   { Seq#Contains(Seq#Build(s, v), x) }
+  //   Seq#Contains(Seq#Build(s, v), x) <==> (v == x || Seq#Contains(s, x)));
+  lemma {:extract_pattern Contains(Build(s, v), x)} BuildContains(s: Seq, v: Box, x: Box)
+    ensures Contains(Build(s, v), x) <==> v == x || Contains(s, x)
+  {
+    var valList := Cons(v, Nil);
+    var b := s.Append(valList);
+    assert b == Build(s, v);
+
+    assert Ping: v == x ==> Contains(valList, x) by {
+      assert Index(valList, 0) == v;
+    }
+    assert Pong: Contains(valList, x) ==> v == x by {
+      if Contains(valList, x) {
+        var i :| 0 <= i < valList.Length() && Index(valList, i) == x;
+        assert valList.Length() == 1;
+      }
+    }
+
+    calc {
+      Contains(b, x);
+      { AppendContains(s, valList, x); }
+      Contains(s, x) || Contains(valList, x);
+      { reveal Ping, Pong; }
+      v == x || Contains(s, x);
+    }
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, n: int, x: Box ::
+  //   { Seq#Contains(Seq#Take(s, n), x) }
+  //   Seq#Contains(Seq#Take(s, n), x) <==>
+  //     (exists i: int :: { Seq#Index(s, i) }
+  //       0 <= i && i < n && i < Seq#Length(s) && Seq#Index(s, i) == x));
+  lemma {:extract_pattern Contains(Take(s, n), x)} TakeContains(s: Seq, n: int, x: Box)
+    ensures Contains(Take(s, n), x) <==>
+            exists i {:extract_pattern Index(s, i)} :: 0 <= i < n && i < Length(s) && Index(s, i) == x
+  {
+    if
+    case n < 0 =>
+      calc {
+        Contains(Take(s, n), x);
+        { assert Take(s, n) == Empty(); }
+        Contains(Empty(), x);
+        false;
+        exists i :: 0 <= i < n && i < Length(s) && Index(s, i) == x;
+      }
+
+    case 0 <= n <= s.Length() =>
+      var (prefix, suffix) := s.Split(n);
+      var t := s.Take(n);
+      assert t == prefix;
+      assert t.Length() == n by {
+        s.LengthTakeDrop(n);
+      }
+      assert L: forall i :: 0 <= i < Length(t) ==> Index(t, i) == Index(s, i) by {
+        forall i | 0 <= i < Length(t)
+          ensures Index(t, i) == Index(s, i)
+        {
+          prefix.AppendAt(suffix, i);
+        }
+      }
+
+      calc {
+        Contains(t, x);
+        exists i :: 0 <= i < Length(t) && Index(t, i) == x;
+        { reveal L; }
+        exists i :: 0 <= i < n && i < Length(s) && Index(s, i) == x;
+      }
+
+    case s.Length() < n =>
+      calc {
+        Contains(Take(s, n), x);
+        Contains(s, x);
+        exists i :: 0 <= i < Length(s) && Index(s, i) == x;
+        { assert Length(s) < n; }
+        exists i :: 0 <= i < n && i < Length(s) && Index(s, i) == x;
+      }
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, n: int, x: Box ::
+  //   { Seq#Contains(Seq#Drop(s, n), x) }
+  //   Seq#Contains(Seq#Drop(s, n), x) <==>
+  //     (exists i: int :: { Seq#Index(s, i) }
+  //       0 <= n && n <= i && i < Seq#Length(s) && Seq#Index(s, i) == x));
+  lemma {:extract_pattern Contains(Drop(s, n), x)} DropContains(s: Seq, n: int, x: Box)
+    ensures Contains(Drop(s, n), x) <==>
+            exists i {:extract_pattern Index(s, i)} :: 0 <= n <= i < Length(s) && Index(s, i) == x
+  {
+    if 0 <= n <= s.Length() {
+      var (prefix, suffix) := s.Split(n);
+      var t := s.Take(n);
+      assert t == prefix;
+      assert t.Length() == n by {
+        s.LengthTakeDrop(n);
+      }
+      assert L: forall i :: 0 <= i < Length(suffix) ==> Index(suffix, i) == Index(s, n + i) by {
+        forall i | 0 <= i < Length(suffix) {
+          calc {
+            Index(s, n + i);
+            { prefix.LengthAppend(suffix); }
+            s.At(n + i);
+            { prefix.AppendAt(suffix, n + i); }
+            suffix.At(i);
+            Index(suffix, i);
+          }
+        }
+      }
+
+      if Contains(Drop(s, n), x) {
+        var j :| 0 <= j < Length(suffix) && Index(suffix, j) == x;
+        var i := n + j;
+        assert 0 <= n <= i < Length(s) by {
+          prefix.LengthAppend(suffix);
+        }
+        assert Index(s, i) == x by {
+          reveal L;
+        }
+      }
+
+      if i :| 0 <= n <= i < Length(s) && Index(s, i) == x {
+        var j := i - n;
+        assert 0 <= j < Length(suffix) by {
+          prefix.LengthAppend(suffix);
+        }
+        assert Index(suffix, j) == x by {
+          reveal L;
+        }
+      }
+
+    } else {
+      calc {
+        Contains(Drop(s, n), x);
+        Contains(Empty(), x);
+        false;
+        exists i :: 0 <= n <= i < Length(s) && Index(s, i) == x;
+      }
+    }
+  }
+
+  // boogie: function Seq#Equal(Seq, Seq): bool;
+  predicate {:extract_boogie_name "Seq#Equal"} Equal(s0: Seq, s1: Seq) {
+    s0 == s1
+  }
+
+  // boogie:
+  // axiom (forall s0: Seq, s1: Seq :: { Seq#Equal(s0,s1) }
+  //   Seq#Equal(s0,s1) <==>
+  //     Seq#Length(s0) == Seq#Length(s1) &&
+  //     (forall j: int :: { Seq#Index(s0,j) } { Seq#Index(s1,j) }
+  //         0 <= j && j < Seq#Length(s0) ==> Seq#Index(s0,j) == Seq#Index(s1,j)));
+  lemma {:extract_pattern Equal(s0, s1)} AboutEqual(s0: Seq, s1: Seq)
+    ensures Equal(s0, s1) <==>
+            && Length(s0) == Length(s1)
+            && forall j {:extract_pattern Index(s0, j)} {:extract_pattern Index(s1, j)} ::
+                 0 <= j < Length(s0) ==> Index(s0, j) == Index(s1, j)
+  {
+    if Length(s0) == Length(s1) && forall j :: 0 <= j < Length(s0) ==> Index(s0, j) == Index(s1, j) {
+      assert forall s, i :: 0 <= i < Length(s) ==> Index(s, i) == s.At(i);
+      DatatypeEquality(s0, s1);
+    }
+  }
+
+  lemma DatatypeEquality(s0: Seq, s1: Seq)
+    requires s0.Length() == s1.Length()
+    requires forall j :: 0 <= j < s0.Length() ==> s0.At(j) == s1.At(j)
+    ensures s0 == s1
+  {
+    if s0.Length() != 0 {
+      assert s0.head == s1.head by {
+        assert s0.head == s0.At(0) && s1.head == s1.At(0);
+      }
+      var t0, t1 := s0.tail, s1.tail;
+      assert t0.Length() == t1.Length();
+      assert forall i :: 0 <= i < t0.Length() ==> t0.At(i) == s0.At(i + 1);
+      assert forall i :: 0 <= i < t0.Length() ==> t0.At(i) == t1.At(i);
+    }
+  }
+
+  // extensionality axiom for sequences
+  // boogie:
+  // axiom (forall a: Seq, b: Seq :: { Seq#Equal(a,b) }
+  //   Seq#Equal(a,b) ==> a == b);
+  lemma {:extract_pattern Equal(a, b)} Extensionality(a: Seq, b: Seq)
+    requires Equal(a, b)
+    ensures a == b
+  {
+  }
+
+  // boogie: function Seq#SameUntil(Seq, Seq, int): bool;
+  predicate {:extract_boogie_name "Seq#SameUntil"} SameUntil(s0: Seq, s1: Seq, n: int) {
+    forall j :: 0 <= j < n ==> Index(s0, j) == Index(s1, j)
+  }
+
+  // boogie:
+  // axiom (forall s0: Seq, s1: Seq, n: int :: { Seq#SameUntil(s0,s1,n) }
+  //   Seq#SameUntil(s0,s1,n) <==>
+  //     (forall j: int :: { Seq#Index(s0,j) } { Seq#Index(s1,j) }
+  //         0 <= j && j < n ==> Seq#Index(s0,j) == Seq#Index(s1,j)));
+  lemma {:extract_pattern SameUntil(s0, s1, n)} AboutSameUntil(s0: Seq, s1: Seq, n: int)
+    ensures SameUntil(s0, s1, n) <==>
+            forall j {:extract_pattern Index(s0, j)} {:extract_pattern Index(s1, j)} ::
+              0 <= j < n ==> Index(s0, j) == Index(s1, j)
+  {
+  }
+
+  // boogie: function Seq#Take(s: Seq, howMany: int): Seq;
+  function {:extract_boogie_name "Seq#Take"} Take(s: Seq, howMany: int): Seq {
+    if howMany < 0 then
+      Empty()
+    else if howMany <= s.Length() then
+      s.Take(howMany)
+    else
+      s
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, n: int :: { Seq#Length(Seq#Take(s,n)) }
+  //   0 <= n && n <= Seq#Length(s) ==> Seq#Length(Seq#Take(s,n)) == n);
+  lemma {:extract_pattern Length(Take(s, n))} LengthTake(s: Seq, n: int)
+    requires 0 <= n <= Length(s)
+    ensures Length(Take(s, n)) == n
+  {
+    s.LengthTakeDrop(n);
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, n: int, j: int ::
+  //   {:weight 25}
+  //   { Seq#Index(Seq#Take(s,n), j) }
+  //   { Seq#Index(s, j), Seq#Take(s,n) }
+  //   0 <= j && j < n && j < Seq#Length(s) ==>
+  //     Seq#Index(Seq#Take(s,n), j) == Seq#Index(s, j));
+  lemma {:extract_attribute "weight", 25} {:extract_pattern Index(Take(s, n), j)} {:extract_pattern Index(s, j), Take(s, n)}
+    IndexTake(s: Seq, n: int, j: int)
+    requires 0 <= j < n && j < Length(s)
+    ensures Index(Take(s, n), j) == Index(s, j)
+  {
+    if j != 0 && n <= s.Length() {
+      IndexTake(s.tail, n - 1, j - 1);
+    }
+  }
+
+  // boogie: function Seq#Drop(s: Seq, howMany: int): Seq;
+  function {:extract_boogie_name "Seq#Drop"} Drop(s: Seq, howMany: int): Seq {
+    if 0 <= howMany <= s.Length() then
+      s.Drop(howMany)
+    else
+      Empty()
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, n: int :: { Seq#Length(Seq#Drop(s,n)) }
+  //   0 <= n && n <= Seq#Length(s) ==> Seq#Length(Seq#Drop(s,n)) == Seq#Length(s) - n);
+  lemma {:extract_pattern Length(Drop(s, n))} LengthDrop(s: Seq, n: int)
+    requires 0 <= n <= Length(s)
+    ensures Length(Drop(s, n)) == Length(s) - n
+  {
+    s.LengthTakeDrop(n);
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, n: int, j: int ::
+  //   {:weight 25}
+  //   { Seq#Index(Seq#Drop(s,n), j) }
+  //   0 <= n && 0 <= j && j < Seq#Length(s)-n ==>
+  //     Seq#Index(Seq#Drop(s,n), j) == Seq#Index(s, j+n));
+  lemma {:extract_attribute "weight", 25} {:extract_pattern Index(Drop(s, n), j)} IndexDrop0(s: Seq, n: int, j: int)
+    requires 0 <= n && 0 <= j < Length(s) - n
+    ensures Index(Drop(s, n), j) == Index(s, j + n)
+  {
+    IndexDrop1(s, n, j + n);
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, n: int, k: int ::
+  //   {:weight 25}
+  //   { Seq#Index(s, k), Seq#Drop(s,n) }
+  //   0 <= n && n <= k && k < Seq#Length(s) ==>
+  //     Seq#Index(Seq#Drop(s,n), k-n) == Seq#Index(s, k));
+  lemma {:extract_attribute "weight", 25} {:extract_pattern Index(s, k), Drop(s, n)} IndexDrop1(s: Seq, n: int, k: int)
+    requires 0 <= n <= k < Length(s)
+    ensures Index(Drop(s, n), k - n) == Index(s, k)
+  {
+    if n != 0 {
+      IndexDrop1(s.tail, n - 1, k - 1);
+    }
+  }
+
+  // boogie:
+  // axiom (forall s, t: Seq, n: int ::
+  //   { Seq#Take(Seq#Append(s, t), n) }
+  //   { Seq#Drop(Seq#Append(s, t), n) }
+  //   n == Seq#Length(s)
+  //   ==>
+  //   Seq#Take(Seq#Append(s, t), n) == s &&
+  //   Seq#Drop(Seq#Append(s, t), n) == t);
+  lemma {:extract_pattern Take(Append(s, t), n)} {:extract_pattern Drop(Append(s, t), n)} AppendTakeDrop(s: Seq, t: Seq, n: int)
+    requires n == Length(s)
+    ensures Take(Append(s, t), n) == s
+    ensures Drop(Append(s, t), n) == t
+  {
+    var a := Append(s, t);
+    assert 0 <= n <= Length(a) by {
+      s.LengthAppend(t);
+    }
+    s.AppendTake(t);
+    s.AppendDrop(t);
+  }
+
+  // Commutativity of Take and Drop with Update.
+
+  // boogie:
+  // axiom (forall s: Seq, i: int, v: Box, n: int ::
+  //         { Seq#Take(Seq#Update(s, i, v), n) }
+  //         0 <= i && i < n && n <= Seq#Length(s) ==> Seq#Take(Seq#Update(s, i, v), n) == Seq#Update(Seq#Take(s, n), i, v) );
+  lemma {:extract_pattern Take(Update(s, i, v), n)} TakeUpdate0(s: Seq, i: int, v: Box, n: int)
+    requires 0 <= i < n <= Length(s)
+    ensures Take(Update(s, i, v), n) == Update(Take(s, n), i, v)
+    decreases i
+  {
+    if i != 0 {
+      TakeUpdate0(s.tail, i - 1,  v, n - 1);
+    }
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, i: int, v: Box, n: int ::
+  //         { Seq#Take(Seq#Update(s, i, v), n) }
+  //         n <= i && i < Seq#Length(s) ==> Seq#Take(Seq#Update(s, i, v), n) == Seq#Take(s, n));
+  lemma {:extract_pattern Take(Update(s, i, v), n)} TakeUpdate1(s: Seq, i: int, v: Box, n: int)
+    requires n <= i < Length(s)
+    ensures Take(Update(s, i, v), n) == Take(s, n)
+  {
+    if 0 <= n && i != 0 {
+      TakeUpdate1(s.tail, i - 1, v, n - 1);
+    }
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, i: int, v: Box, n: int ::
+  //         { Seq#Drop(Seq#Update(s, i, v), n) }
+  //         0 <= n && n <= i && i < Seq#Length(s) ==> Seq#Drop(Seq#Update(s, i, v), n) == Seq#Update(Seq#Drop(s, n), i-n, v) );
+  lemma {:extract_pattern Drop(Update(s, i, v), n)} DropUpdate0(s: Seq, i: int, v: Box, n: int)
+    requires 0 <= n <= i < Length(s)
+    ensures Drop(Update(s, i, v), n) == Update(Drop(s, n), i - n, v)
+  {
+    if n != 0 {
+      DropUpdate0(s.tail, i - 1, v, n - 1);
+    }
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, i: int, v: Box, n: int ::
+  //         { Seq#Drop(Seq#Update(s, i, v), n) }
+  //         0 <= i && i < n && n <= Seq#Length(s) ==> Seq#Drop(Seq#Update(s, i, v), n) == Seq#Drop(s, n));
+  lemma {:extract_pattern Drop(Update(s, i, v), n)} DropUpdate1(s: Seq, i: int, v: Box, n: int)
+    requires 0 <= i < n <= Length(s)
+    ensures Drop(Update(s, i, v), n) == Drop(s, n)
+  {
+    if i != 0 {
+      DropUpdate1(s.tail, i - 1, v, n - 1);
+    }
+  }
+
+  // Drop commutes with build
+
+  // boogie:
+  // axiom (forall s: Seq, v: Box, n: int ::
+  //         { Seq#Drop(Seq#Build(s, v), n) }
+  //         0 <= n && n <= Seq#Length(s) ==> Seq#Drop(Seq#Build(s, v), n) == Seq#Build(Seq#Drop(s, n), v) );
+  lemma {:extract_pattern Drop(Build(s, v), n)} DropBuild(s: Seq, v: Box, n: int)
+    requires 0 <= n <= Length(s)
+    ensures Drop(Build(s, v), n) == Build(Drop(s, n), v)
+  {
+    if n != 0 {
+      calc {
+        Drop(Build(s, v), n);
+        Drop(Cons(s.head, Build(s.tail, v)), n);
+        Drop(Build(s.tail, v), n - 1);
+        { DropBuild(s.tail, v, n - 1); }
+        Build(Drop(s.tail, n - 1), v);
+        Build(Drop(s, n), v);
+      }
+    }
+  }
+
+  // Additional axioms about common things
+
+  // boogie:
+  // axiom (forall s: Seq, n: int :: { Seq#Drop(s, n) }
+  //         n == 0 ==> Seq#Drop(s, n) == s);
+  lemma {:extract_pattern Drop(s, n)} DropNothing(s: Seq, n: int)
+    requires n == 0
+    ensures Drop(s, n) == s
+  {
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, n: int :: { Seq#Take(s, n) }
+  //         n == 0 ==> Seq#Take(s, n) == Seq#Empty());
+  lemma {: extract_pattern Take(s, n)} TakeNothing(s: Seq, n: int)
+    requires n == 0
+    ensures Take(s, n) == Empty()
+  {
+  }
+
+  // boogie:
+  // axiom (forall s: Seq, m, n: int :: { Seq#Drop(Seq#Drop(s, m), n) }
+  //         0 <= m && 0 <= n && m+n <= Seq#Length(s) ==>
+  //         Seq#Drop(Seq#Drop(s, m), n) == Seq#Drop(s, m+n));
+  lemma {:extract_pattern Drop(Drop(s, m), n)} DropDrop(s: Seq, m: int, n: int)
+    requires 0 <= m && 0 <= n && m + n <= Length(s)
+    ensures Drop(Drop(s, m), n) == Drop(s, m + n)
+  {
+    if m != 0 {
+      DropDrop(s.tail, m - 1, n);
+    }
+  }
+
+}
diff --git a/Source/DafnyCore/Prelude/Sets.dfy b/Source/DafnyCore/Prelude/Sets.dfy
new file mode 100644
index 00000000000..ac6b52409fa
--- /dev/null
+++ b/Source/DafnyCore/Prelude/Sets.dfy
@@ -0,0 +1,909 @@
+module {:extract_boogie} Sets {
+  import opened Boxes
+  import opened Lists
+
+  export
+    provides Set, IsMember
+    provides Card, AboutCard
+    provides Empty, EmptyHasNoMembers, CardVsEmpty
+    provides UnionOne, UnionOneAddsElement, UnionOneAddsSelf, UnionOneMaintainsMembership, UnionOneCardIdempotent, CardUnionOne
+    provides Union, UnionElements, UnionMonotonicA, UnionMonotonicB, UnionIdempotentA, UnionIdempotentB
+    provides Intersection, IntersectionElements, IntersectionIdempotentA, IntersectionIdempotentB
+    provides Difference, DifferenceElements, DifferenceSubtracts
+    provides CardUnionIntersection, CardDifference
+    provides Subset, SubsetDefinition
+    provides Equal, EqualDefinition, Extensionality
+    provides Disjoint, DisjointDefinition, DisjointDifference
+    provides Boxes
+  // For friends, we also export the fact that a set is represented as a sorted list.
+  export Friends extends Sets
+    reveals Set
+    provides Lists
+    reveals StrictlyIncreasing, Card, IsMember, In
+    provides TailStrictlyIncreasing
+
+  // type Set = [Box]bool;
+  // The manually authored Boogie type "Set" is defined as a Boogie map from Box to bool.
+  // There was no strong reason for doing so. In fact, there are probably stronger reasons
+  // to just define it as an uninterpreted type, which is what the effect of this
+  // :extract_boogie_name annotation will have. See also the "IsMember" predicate below.
+  type {:extract_boogie_name "Set"} Set = s: List<Box> | StrictlyIncreasing(s) witness Nil
+
+  predicate StrictlyIncreasing(s: List<Box>) {
+    forall i, j :: 0 <= i < j < s.Length() ==> Less(s.At(i), s.At(j))
+  }
+
+  lemma TailStrictlyIncreasing(s: List<Box>)
+    requires StrictlyIncreasing(s) && s.Cons?
+    ensures StrictlyIncreasing(s.tail)
+  {
+    assert forall i :: 0 <= i < s.tail.Length() ==> s.tail.At(i) == s.At(i + 1);
+  }
+
+  // function Set#Card(Set): int;
+  function {:extract_boogie_name "Set#Card"} Card(s: Set): int {
+    s.Length()
+  }
+
+  // axiom (forall s: Set :: { Set#Card(s) } 0 <= Set#Card(s));
+  lemma {:extract_pattern Card(s)} AboutCard(s: Set)
+    ensures 0 <= Card(s)
+  {
+  }
+
+  // function Set#Empty(): Set;
+  function {:extract_boogie_name "Set#Empty"} Empty(): Set {
+    Nil
+  }
+
+  // The manually written axioms use Boogie's built-in map selection operator, "_[_]",
+  // for the following "IsMember" predicate. There's no real advantage of using map selection
+  // rather than a user-defined function, like the "IsMember" here. In fact, by using the built-in
+  // operator, one needs to show that the sets here are a conservative extension of
+  // Boogie's maps, which is just extra work for no gain.
+  predicate {:extract_boogie_name "Set#IsMember"} IsMember(s: Set, o: Box) {
+    In(s, o)
+  }
+
+  predicate In(s: List<Box>, o: Box) {
+    s.Contains(o)
+  }
+
+  // axiom (forall o: Box :: { Set#Empty()[o] } !Set#Empty()[o]);
+  lemma {:extract_pattern IsMember(Empty(), o)} EmptyHasNoMembers(o: Box)
+    ensures !IsMember(Empty(), o)
+  {
+  }
+
+  // axiom (forall s: Set :: { Set#Card(s) }
+  //   (Set#Card(s) == 0 <==> s == Set#Empty()) &&
+  //   (Set#Card(s) != 0 ==> (exists x: Box :: s[x])));
+  lemma {:extract_pattern Card(s)} CardVsEmpty(s: Set)
+    ensures Card(s) == 0 <==> s == Empty()
+    ensures Card(s) != 0 ==> exists x {:extract_pattern IsMember(s, x)} :: IsMember(s, x)
+  {
+    if Card(s) == 0 {
+      assert s == Empty();
+    } else {
+      assert s != Empty();
+      assert IsMember(s, s.head);
+    }
+  }
+
+  // function Set#UnionOne(Set, Box): Set;
+  function {:extract_boogie_name "Set#UnionOne"} UnionOne(s: Set, o: Box): Set {
+    UnionOnePreservesStrictlyIncreasing(s, o);
+    UnionOneRaw(s, o)
+  }
+
+  function UnionOneRaw(s: List<Box>, o: Box): List<Box> {
+    match s
+    case Nil => Cons(o, s)
+    case Cons(x, tail) =>
+      if o == x then
+        s
+      else if Less(o, x) then
+        Cons(o, s)
+      else
+        Cons(x, UnionOneRaw(tail, o))
+  }
+
+  lemma UnionOneRawSame(s: List<Box>, o: Box)
+    requires StrictlyIncreasing(s) && s.Contains(o)
+    ensures s == UnionOneRaw(s, o)
+  {
+    if o == s.head {
+    } else if Less(o, s.head) {
+      assert false by {
+        var i := s.tail.ContainsAt(o);
+        assert o == s.tail.At(i) == s.At(i + 1);
+        assert s.head == s.At(0);
+        assert Less(s.head, s.At(i + 1));
+        LessAsymmetric(o, s.head);
+      }
+    } else {
+      UnionOneRawSame(s.tail, o) by {
+        TailStrictlyIncreasing(s);
+      }
+    }
+  }
+
+  lemma UnionOnePreservesStrictlyIncreasing(s: List<Box>, o: Box)
+    requires StrictlyIncreasing(s)
+    ensures StrictlyIncreasing(UnionOneRaw(s, o))
+  {
+    var r := UnionOneRaw(s, o);
+    match s
+    case Nil =>
+    case Cons(x, tail) =>
+      if x == o {
+      } else if Less(o, x) {
+        PrependIncreasing(o, s);
+      } else {
+        assert StrictlyIncreasing(tail) by {
+          forall i, j | 0 <= i < j < tail.Length()
+            ensures Less(tail.At(i), tail.At(j))
+          {
+            assert tail.At(i) == s.At(i + 1);
+            assert tail.At(j) == s.At(j + 1);
+          }
+        }
+        var r := UnionOneRaw(tail, o);
+        assert StrictlyIncreasing(r) by {
+          UnionOnePreservesStrictlyIncreasing(tail, o);
+        }
+        PrependIncreasing(x, r) by {
+          assert r.head == o || r.head == tail.head;
+          if r.head == o {
+            assert Less(x, o) by {
+              Connected(o, x);
+            }
+          } else {
+            assert x == s.At(0) && tail.head == s.At(1);
+          }
+        }
+      }
+  }
+
+  lemma PrependIncreasing(o: Box, s: List<Box>)
+    requires StrictlyIncreasing(s)
+    requires s != Nil && Less(o, s.head)
+    ensures StrictlyIncreasing(Cons(o, s))
+  {
+    var r := Cons(o, s);
+    forall i, j | 0 <= i < j < r.Length()
+      ensures Less(r.At(i), r.At(j))
+    {
+      if i == 0 {
+        var a, b, c := r.At(i), r.At(i + 1), r.At(j);
+        assert a == o && b == s.At(i) && c == s.At(j - 1);
+        if i + 1 == j {
+        } else {
+          assert Less(a, c) by {
+            LessTransitive(a, b, c);
+          }
+        }
+      }
+    }
+  }
+
+  // axiom (forall a: Set, x: Box, o: Box :: { Set#UnionOne(a,x)[o] }
+  //   Set#UnionOne(a,x)[o] <==> o == x || a[o]);
+  lemma {:extract_pattern IsMember(UnionOne(a, x), o)} UnionOneAddsElement(a: Set, x: Box, o: Box)
+    ensures IsMember(UnionOne(a, x), o) <==> o == x || IsMember(a, o)
+  {
+    var b := UnionOne(a, x);
+    match a
+    case Nil =>
+    case Cons(y, tail) =>
+      if x == y {
+        assert b == a;
+      } else if Less(x, y) {
+        assert b == Cons(x, a);
+      } else {
+        assert b == Cons(y, UnionOneRaw(tail, x));
+        assert In(b, o) <==> o == y || In(UnionOneRaw(tail, x), o);
+        if o == y {
+        } else {
+          calc {
+            In(b, o);
+            In(UnionOneRaw(tail, x), o);
+            { TailStrictlyIncreasing(a); UnionOneAddsElement(tail, x, o); }
+            o == x || In(tail, o);
+            { assert y != o; assert In(tail, o) <==> In(a, o); }
+            o == x || In(a, o);
+          }
+
+        }
+      }
+  }
+
+  // axiom (forall a: Set, x: Box :: { Set#UnionOne(a, x) }
+  //   Set#UnionOne(a, x)[x]);
+  lemma {:extract_pattern UnionOne(a, x)} UnionOneAddsSelf(a: Set, x: Box)
+    ensures IsMember(UnionOne(a, x), x)
+  {
+    UnionOneAddsElement(a, x, x);
+  }
+
+  // axiom (forall a: Set, x: Box, y: Box :: { Set#UnionOne(a, x), a[y] }
+  //   a[y] ==> Set#UnionOne(a, x)[y]);
+  lemma {:extract_pattern UnionOne(a, x), IsMember(a, y)} UnionOneMaintainsMembership(a: Set, x: Box, y: Box)
+    requires IsMember(a, y)
+    ensures IsMember(UnionOne(a, x), y)
+  {
+    UnionOneAddsElement(a, x, y);
+  }
+
+  // axiom (forall a: Set, x: Box :: { Set#Card(Set#UnionOne(a, x)) }
+  //   a[x] ==> Set#Card(Set#UnionOne(a, x)) == Set#Card(a));
+  lemma {:extract_pattern Card(UnionOne(a, x))} UnionOneCardIdempotent(a: Set, x: Box)
+    requires IsMember(a, x)
+    ensures Card(UnionOne(a, x)) == Card(a)
+  {
+    assert Equal(UnionOne(a, x), a) by {
+      forall o
+        ensures In(UnionOne(a, x), o) <==> In(a, o)
+      {
+        UnionOneAddsElement(a, x, o);
+      }
+    }
+    Extensionality(UnionOne(a, x), a);
+  }
+
+  // axiom (forall a: Set, x: Box :: { Set#Card(Set#UnionOne(a, x)) }
+  //   !a[x] ==> Set#Card(Set#UnionOne(a, x)) == Set#Card(a) + 1);
+  lemma {:extract_pattern Card(UnionOne(a, x))} CardUnionOne(a: Set, x: Box)
+    requires !IsMember(a, x)
+    ensures Card(UnionOne(a, x)) == Card(a) + 1
+  {
+    match a
+    case Nil =>
+    case Cons(y, tail) =>
+      if x == y {
+        assert false; // by the assumption !In(a, x)
+      } else if Less(x, y) {
+      } else {
+        TailStrictlyIncreasing(a);
+        assert UnionOne(a, x) == Cons(y, UnionOne(tail, x));
+        CardUnionOne(tail, x);
+      }
+  }
+
+  // function Set#Union(Set, Set): Set;
+  function {:extract_boogie_name "Set#Union"} Union(a: Set, b: Set): Set {
+    match a
+    case Nil => b
+    case Cons(x, tail) =>
+      TailStrictlyIncreasing(a);
+      UnionOne(Union(tail, b), x)
+  }
+
+  // axiom (forall a: Set, b: Set, o: Box :: { Set#Union(a,b)[o] }
+  //   Set#Union(a,b)[o] <==> a[o] || b[o]);
+  lemma {:extract_pattern IsMember(Union(a, b), o)} UnionElements(a: Set, b: Set, o: Box)
+    ensures IsMember(Union(a, b), o) <==> IsMember(a, o) || IsMember(b, o)
+  {
+    match a
+    case Nil =>
+    case Cons(x, tail) =>
+      TailStrictlyIncreasing(a);
+      calc {
+        In(Union(a, b), o);
+        In(UnionOne(Union(tail, b), x), o);
+        { UnionOneAddsElement(Union(tail, b), x, o); }
+        o == x || In(Union(tail, b), o);
+        { UnionElements(tail, b, o); }
+        o == x || In(tail, o) || In(b, o);
+        In(a, o) || In(b, o);
+      }
+  }
+
+  // axiom (forall a, b: Set, y: Box :: { Set#Union(a, b), a[y] }
+  //   a[y] ==> Set#Union(a, b)[y]);
+  lemma {:extract_pattern Union(a, b), IsMember(a, y)} UnionMonotonicA(a: Set, b: Set, y: Box)
+    requires IsMember(a, y)
+    ensures IsMember(Union(a, b), y)
+  {
+    UnionElements(a, b, y);
+  }
+
+  // axiom (forall a, b: Set, y: Box :: { Set#Union(a, b), b[y] }
+  //   b[y] ==> Set#Union(a, b)[y]);
+  lemma {:extract_pattern Union(a, b), IsMember(b, y)} UnionMonotonicB(a: Set, b: Set, y: Box)
+    requires IsMember(b, y)
+    ensures IsMember(Union(a, b), y)
+  {
+    UnionElements(a, b, y);
+  }
+
+  lemma UnionCommutative(a: Set, b: Set)
+    ensures Union(a, b) == Union(b, a)
+  {
+    forall o {
+      calc {
+        In(Union(a, b), o);
+        { UnionElements(a, b, o); }
+        In(a, o) || In(b, o);
+        { UnionElements(b, a, o); }
+        In(Union(b, a), o);
+      }
+    }
+    Extensionality(Union(a, b), Union(b, a));
+  }
+
+  // axiom (forall a, b: Set :: { Set#Union(a, b) }
+  //   Set#Disjoint(a, b) ==>
+  //     Set#Difference(Set#Union(a, b), a) == b &&
+  //     Set#Difference(Set#Union(a, b), b) == a);
+  lemma {:extract_pattern Union(a, b)} DisjointDifference(a: Set, b: Set)
+    requires Disjoint(a, b)
+    ensures Difference(Union(a, b), a) == b
+    ensures Difference(Union(a, b), b) == a
+  {
+    DisjointDifferenceAux(a, b);
+
+    calc {
+      Difference(Union(a, b), b);
+      { UnionCommutative(a, b); }
+      Difference(Union(b, a), b);
+      { DisjointDifferenceAux(b, a); }
+      a;
+    }
+  }
+
+  lemma DisjointDifferenceAux(a: Set, b: Set)
+    requires Disjoint(a, b)
+    ensures Difference(Union(a, b), a) == b
+  {
+    forall o {
+      calc {
+        In(Difference(Union(a, b), a), o);
+        { DifferenceElements(Union(a, b), a, o); }
+        In(Union(a, b), o) && !In(a, o);
+        { UnionElements(a, b, o); }
+        (In(a, o) || In(b, o)) && !In(a, o);
+        In(b, o);
+      }
+    }
+    Extensionality(Difference(Union(a, b), a), b);
+  }
+
+  // // Follows from the general union axiom, but might be still worth including, because disjoint union is a common case:
+  // // axiom (forall a, b: Set :: { Set#Card(Set#Union(a, b)) }
+  // //   Set#Disjoint(a, b) ==>
+  // //     Set#Card(Set#Union(a, b)) == Set#Card(a) + Set#Card(b));
+
+  // function Set#Intersection(Set, Set): Set;
+  function {:extract_boogie_name "Set#Intersection"} Intersection(a: Set, b: Set): Set {
+    IntersectionRawPreservesStrictlyIncreasing(a, b);
+    IntersectionRaw(a, b)
+  }
+
+  function IntersectionRaw(a: List<Box>, b: List<Box>): List<Box> {
+    match a
+    case Nil => Nil
+    case Cons(x, tail) =>
+      if In(b, x) then
+        Cons(x, IntersectionRaw(tail, b))
+      else
+        IntersectionRaw(tail, b)
+  }
+
+  lemma IntersectionRawElements(a: List<Box>, b: List<Box>, o: Box)
+    ensures In(IntersectionRaw(a, b), o) <==> In(a, o) && In(b, o)
+  {
+  }
+
+  lemma IntersectionRawPreservesStrictlyIncreasing(a: List<Box>, b: List<Box>)
+    requires StrictlyIncreasing(a) && StrictlyIncreasing(b)
+    ensures StrictlyIncreasing(IntersectionRaw(a, b))
+  {
+    match a
+    case Nil =>
+    case Cons(x, tail) =>
+      TailStrictlyIncreasing(a);
+      IntersectionRawPreservesStrictlyIncreasing(tail, b);
+      if In(b, x) {
+        var c := IntersectionRaw(tail, b);
+        assert IntersectionRaw(a, b) == Cons(x, c);
+        forall o | In(c, o)
+          ensures Less(x, o)
+        {
+          assert In(tail, o) by {
+            IntersectionRawElements(tail, b, o);
+          }
+          var j := tail.ContainsAt(o);
+          assert x == a.At(0) && o == a.At(j + 1);
+        }
+        forall j | 0 <= j < c.Length()
+          ensures Less(x, c.At(j))
+        {
+          c.AtContains(j, c.At(j));
+        }
+      }
+  }
+
+  // axiom (forall a: Set, b: Set, o: Box :: { Set#Intersection(a,b)[o] }
+  //   Set#Intersection(a,b)[o] <==> a[o] && b[o]);
+  lemma {:extract_pattern IsMember(Intersection(a, b), o)} IntersectionElements(a: Set, b: Set, o: Box)
+    ensures IsMember(Intersection(a, b), o) <==> IsMember(a, o) && IsMember(b, o)
+  {
+    IntersectionRawElements(a, b, o);
+  }
+
+  lemma IntersectionCommutative(a: Set, b: Set)
+    ensures Intersection(a, b) == Intersection(b, a)
+  {
+    forall o {
+      calc {
+        In(Intersection(a, b), o);
+        { IntersectionElements(a, b, o); }
+        In(a, o) && In(b, o);
+        { IntersectionElements(b, a, o); }
+        In(Intersection(b, a), o);
+      }
+    }
+    Extensionality(Intersection(a, b), Intersection(b, a));
+  }
+
+  // axiom (forall a, b: Set :: { Set#Union(Set#Union(a, b), b) }
+  //   Set#Union(Set#Union(a, b), b) == Set#Union(a, b));
+  lemma {:extract_pattern Union(Union(a, b), b)} UnionIdempotentB(a: Set, b: Set)
+    ensures Union(Union(a, b), b) == Union(a, b)
+  {
+    forall o {
+      calc {
+        In(Union(Union(a, b), b), o);
+        { UnionElements(Union(a, b), b, o); }
+        In(Union(a, b), o) || In(b, o);
+        { UnionElements(a, b, o); }
+        In(a, o) || In(b, o) || In(b, o);
+        In(a, o) || In(b, o);
+        { UnionElements(a, b, o); }
+        In(Union(a, b), o);
+      }
+    }
+    Extensionality(Union(Union(a, b), b), Union(a, b));
+  }
+
+  // axiom (forall a, b: Set :: { Set#Union(a, Set#Union(a, b)) }
+  //   Set#Union(a, Set#Union(a, b)) == Set#Union(a, b));
+  lemma {:extract_pattern Union(a, Union(a, b))} UnionIdempotentA(a: Set, b: Set)
+    ensures Union(a, Union(a, b)) == Union(a, b)
+  {
+    calc {
+      Union(a, Union(a, b));
+      { UnionCommutative(a, Union(a, b)); }
+      Union(Union(a, b), a);
+      { UnionCommutative(a, b); }
+      Union(Union(b, a), a);
+      { UnionIdempotentB(b, a); }
+      Union(b, a);
+      { UnionCommutative(a, b); }
+      Union(a, b);
+    }
+  }
+
+  // axiom (forall a, b: Set :: { Set#Intersection(Set#Intersection(a, b), b) }
+  //   Set#Intersection(Set#Intersection(a, b), b) == Set#Intersection(a, b));
+  lemma {:extract_pattern Intersection(Intersection(a, b), b)} IntersectionIdempotentB(a: Set, b: Set)
+    ensures Intersection(Intersection(a, b), b) == Intersection(a, b)
+  {
+    forall o {
+      calc {
+        In(Intersection(Intersection(a, b), b), o);
+        { IntersectionElements(Intersection(a, b), b, o); }
+        In(Intersection(a, b), o) && In(b, o);
+        { IntersectionElements(a, b, o); }
+        In(a, o) && In(b, o) && In(b, o);
+        In(a, o) && In(b, o);
+        { IntersectionElements(a, b, o); }
+        In(Intersection(a, b), o);
+      }
+    }
+    Extensionality(Intersection(Intersection(a, b), b), Intersection(a, b));
+  }
+
+  // axiom (forall a, b: Set :: { Set#Intersection(a, Set#Intersection(a, b)) }
+  //   Set#Intersection(a, Set#Intersection(a, b)) == Set#Intersection(a, b));
+  lemma {:extract_pattern Intersection(a, Intersection(a, b))} IntersectionIdempotentA(a: Set, b: Set)
+    ensures Intersection(a, Intersection(a, b)) == Intersection(a, b)
+  {
+    calc {
+      Intersection(a, Intersection(a, b));
+      { IntersectionCommutative(a, Intersection(a, b)); }
+      Intersection(Intersection(a, b), a);
+      { IntersectionCommutative(a, b); }
+      Intersection(Intersection(b, a), a);
+      { IntersectionIdempotentB(b, a); }
+      Intersection(b, a);
+      { IntersectionCommutative(a, b); }
+      Intersection(a, b);
+    }
+  }
+
+  lemma CardUnion(a: Set, b: Set)
+    requires a != Nil
+    ensures (TailStrictlyIncreasing(a);
+             var m, n := Card(Union(a, b)), Card(Union(a.tail, b));
+             m == if In(b, a.head) then n else n + 1)
+  {
+    TailStrictlyIncreasing(a);
+    var Cons(x, tail) := a;
+    var m, n := Card(Union(a, b)), Card(Union(tail, b));
+
+    assert m == Card(UnionOne(Union(tail, b), x));
+    assert !In(tail, x) by {
+      TailDoesNotContainHead(a);
+    }
+    assert In(Union(tail, b), x) <==> In(b, x) by {
+      assert In(Union(tail, b), x) <==> In(tail, x) || In(b, x) by {
+        UnionElements(tail, b, x);
+      }
+    }
+    if In(b, x) {
+      assert In(Union(tail, b), x);
+      assert m == n by {
+        UnionOneCardIdempotent(Union(tail, b), x);
+      }
+    } else {
+      assert m == n + 1 by {
+        CardUnionOne(Union(tail, b), x);
+      }
+    }
+  }
+
+  // axiom (forall a, b: Set :: { Set#Card(Set#Union(a, b)) }{ Set#Card(Set#Intersection(a, b)) }
+  //   Set#Card(Set#Union(a, b)) + Set#Card(Set#Intersection(a, b)) == Set#Card(a) + Set#Card(b));
+  lemma {:extract_pattern Card(Union(a, b))} {:extract_pattern Card(Intersection(a, b))} CardUnionIntersection(a: Set, b: Set)
+    ensures Card(Union(a, b)) + Card(Intersection(a, b)) == Card(a) + Card(b)
+  {
+    match a
+    case Nil =>
+    case Cons(x, tail) =>
+      TailStrictlyIncreasing(a);
+      var lhs0, lhs0' := Card(Union(a, b)), Card(Union(tail, b));
+      assert lhs0 == if In(b, x) then lhs0' else lhs0' + 1 by {
+        CardUnion(a, b);
+      }
+
+      var lhs1, lhs1' := Card(Intersection(a, b)), Card(Intersection(tail, b));
+      assert lhs1 == if In(b, x) then lhs1' + 1 else lhs1';
+  }
+
+  // function Set#Difference(Set, Set): Set;
+  function {:extract_boogie_name "Set#Difference"} Difference(a: Set, b: Set): Set {
+    DifferenceRawPreservesStrictlyIncreasing(a, b);
+    DifferenceRaw(a, b)
+  }
+
+  function DifferenceRaw(a: List<Box>, b: List<Box>): List<Box> {
+    match a
+    case Nil => Nil
+    case Cons(x, tail) =>
+      if In(b, x) then
+        DifferenceRaw(tail, b)
+      else
+        Cons(x, DifferenceRaw(tail, b))
+  }
+
+  lemma DifferenceRawElements(a: List<Box>, b: List<Box>, o: Box)
+    ensures In(DifferenceRaw(a, b), o) <==> In(a, o) && !In(b, o)
+  {
+  }
+
+  lemma DifferenceRawPreservesStrictlyIncreasing(a: List<Box>, b: List<Box>)
+    requires StrictlyIncreasing(a) && StrictlyIncreasing(b)
+    ensures StrictlyIncreasing(DifferenceRaw(a, b))
+  {
+    match a
+    case Nil =>
+    case Cons(x, tail) =>
+      TailStrictlyIncreasing(a);
+      DifferenceRawPreservesStrictlyIncreasing(tail, b);
+      if !In(b, x) {
+        var c := DifferenceRaw(tail, b);
+        assert DifferenceRaw(a, b) == Cons(x, c);
+        forall o | In(c, o)
+          ensures Less(x, o)
+        {
+          assert In(tail, o) by {
+            DifferenceRawElements(tail, b, o);
+          }
+          var j := tail.ContainsAt(o);
+          assert x == a.At(0) && o == a.At(j + 1);
+        }
+        forall j | 0 <= j < c.Length()
+          ensures Less(x, c.At(j))
+        {
+          c.AtContains(j, c.At(j));
+        }
+      }
+  }
+
+  // axiom (forall a: Set, b: Set, o: Box :: { Set#Difference(a,b)[o] }
+  //   Set#Difference(a,b)[o] <==> a[o] && !b[o]);
+  lemma {:extract_pattern IsMember(Difference(a, b), o)} DifferenceElements(a: Set, b: Set, o: Box)
+    ensures IsMember(Difference(a, b), o) <==> IsMember(a, o) && !IsMember(b, o)
+  {
+    DifferenceRawElements(a, b, o);
+  }
+
+  // axiom (forall a, b: Set, y: Box :: { Set#Difference(a, b), b[y] }
+  //   b[y] ==> !Set#Difference(a, b)[y] );
+  lemma {:extract_pattern Difference(a, b), IsMember(b, y)} DifferenceSubtracts(a: Set, b: Set, y: Box)
+    requires IsMember(b, y)
+    ensures !IsMember(Difference(a, b), y)
+  {
+    calc {
+      In(Difference(a, b), y);
+      { DifferenceElements(a, b, y); }
+      In(a, y) && !In(b, y);
+      false;
+    }
+  }
+
+  lemma CardOfDisjoint(a: Set, b: Set)
+    requires Disjoint(a, b)
+    ensures Card(Union(a, b)) == Card(a) + Card(b)
+  {
+    match a
+    case Nil =>
+    case Cons(x, tail) =>
+      TailStrictlyIncreasing(a);
+      var m, n := Card(Union(a, b)), Card(Union(a.tail, b));
+      assert m == n + 1 by {
+        CardUnion(a, b);
+        assert !In(b, a.head);
+      }
+      CardOfDisjoint(tail, b);
+  }
+
+  // axiom (forall a, b: Set ::
+  //   { Set#Card(Set#Difference(a, b)) }
+  //   Set#Card(Set#Difference(a, b)) + Set#Card(Set#Difference(b, a))
+  //   + Set#Card(Set#Intersection(a, b))
+  //     == Set#Card(Set#Union(a, b)) &&
+  //   Set#Card(Set#Difference(a, b)) == Set#Card(a) - Set#Card(Set#Intersection(a, b)));
+  lemma {:extract_pattern Card(Difference(a, b))} CardDifference(a: Set, b: Set)
+    ensures Card(Difference(a, b)) + Card(Difference(b, a)) + Card(Intersection(a, b)) == Card(Union(a, b))
+    ensures Card(Difference(a, b)) == Card(a) - Card(Intersection(a, b))
+  {
+    var v, w := Difference(a, b), Difference(b, a);
+    var i, u := Intersection(a, b), Union(a, b);
+
+    assert L0: Union(Union(v, w), i) == u by {
+      forall o {
+        calc {
+          In(Union(Union(v, w), i), o);
+          { UnionElements(Union(v, w), i, o); }
+          In(Union(v, w), o) || In(i, o);
+          { UnionElements(v, w, o); }
+          In(v, o) || In(w, o) || In(i, o);
+          { DifferenceElements(a, b, o); DifferenceElements(b, a, o); IntersectionElements(a, b, o); }
+          (In(a, o) && !In(b, o)) || (In(b, o) && !In(a, o)) || (In(a, o) && In(b, o));
+          In(a, o) || In(b, o);
+          { UnionElements(a, b, o); }
+          In(u, o);
+        }
+      }
+      Extensionality(Union(Union(v, w), i), u);
+    }
+
+    assert L1: Disjoint(Union(v, w), i) by {
+      forall o {
+        calc {
+          In(Union(v, w), o);
+          { UnionElements(v, w, o); }
+          In(v, o) || In(w, o);
+          { DifferenceElements(a, b, o); DifferenceElements(b, a, o); }
+          (In(a, o) && !In(b, o)) || (In(b, o) && !In(a, o));
+        ==>
+          !(In(a, o) && In(b, o));
+          { IntersectionElements(a, b, o); }
+          !In(Intersection(a, b), o);
+        }
+      }
+    }
+
+    assert L2: Disjoint(v, w) by {
+      forall o {
+        calc {
+          In(v, o);
+          { DifferenceElements(a, b, o); }
+          In(a, o) && !In(b, o);
+        ==>
+          !(In(b, o) && !In(a, o));
+          { DifferenceElements(b, a, o); }
+          !In(w, o);
+        }
+      }
+    }
+
+    assert M0: a == Union(v, i) by {
+      forall o {
+        calc {
+          In(Union(v, i), o);
+          { UnionElements(v, i, o); }
+          In(v, o) || In(i, o);
+          { DifferenceElements(a, b, o); IntersectionElements(a, b, o); }
+          (In(a, o) && !In(b, o)) || (In(a, o) && In(b, o));
+          In(a, o);
+        }
+      }
+      Extensionality(a, Union(v, i));
+    }
+
+    assert M1: Disjoint(v, i) by {
+      forall o {
+        calc {
+          In(v, o);
+          { DifferenceElements(a, b, o); }
+          In(a, o) && !In(b, o);
+        ==>
+          !(In(a, o) && In(b, o));
+          { IntersectionElements(a, b, o); }
+          !In(Intersection(a, b), o);
+        }
+      }
+    }
+
+    calc {
+      Card(u);
+      { reveal L0; }
+      Card(Union(Union(v, w), i));
+      { reveal L1; CardOfDisjoint(Union(v, w), i); }
+      Card(Union(v, w)) + Card(i);
+      { reveal L2; CardOfDisjoint(v, w); }
+      Card(v) + Card(w) + Card(i);
+    }
+
+    calc {
+      Card(a);
+      { reveal M0; }
+      Card(Union(v, i));
+      { reveal M1; CardOfDisjoint(v, i); }
+      Card(v) + Card(i);
+    }
+  }
+
+  // function Set#Subset(Set, Set): bool;
+  ghost predicate {:extract_boogie_name "Set#Subset"} Subset(a: Set, b: Set) {
+    forall o {:extract_pattern In(a, o)} {:extract_pattern In(b, o)} :: In(a, o) ==> In(b, o)
+  }
+
+  // axiom (forall a: Set, b: Set :: { Set#Subset(a,b) }
+  //   Set#Subset(a,b) <==> (forall o: Box :: {a[o]} {b[o]} a[o] ==> b[o]));
+  lemma {:extract_pattern Subset(a, b)} SubsetDefinition(a: Set, b: Set)
+    ensures Subset(a, b) <==> forall o {:extract_pattern IsMember(a, o)} {:extract_pattern IsMember(b, o)} :: IsMember(a, o) ==> IsMember(b, o)
+  {
+    assert forall o :: In(a, o) == IsMember(a, o);
+  }
+
+  // function Set#Equal(Set, Set): bool;
+  ghost predicate {:extract_boogie_name "Set#Equal"} Equal(a: Set, b: Set) {
+    forall x :: In(a, x) <==> In(b, x)
+  }
+
+  // axiom (forall a: Set, b: Set :: { Set#Equal(a,b) }
+  //   Set#Equal(a,b) <==> (forall o: Box :: {a[o]} {b[o]} a[o] <==> b[o]));
+  lemma {:extract_pattern Equal(a, b)} EqualDefinition(a: Set, b: Set)
+    ensures Equal(a, b) <==> forall o {:extract_pattern IsMember(a, o)} {:extract_pattern IsMember(b, o)} :: IsMember(a, o) <==> IsMember(b, o)
+  {
+    assert forall o :: In(a, o) == IsMember(a, o);
+  }
+
+  // axiom (forall a: Set, b: Set :: { Set#Equal(a,b) }  // extensionality axiom for sets
+  //   Set#Equal(a,b) ==> a == b);
+  lemma {:extract_pattern Equal(a, b)} Extensionality(a: Set, b: Set)
+    requires Equal(a, b)
+    ensures a == b
+  {
+    match a
+    case Nil =>
+      assert a == Empty();
+      forall o
+        ensures !In(b, o)
+      {
+        EmptyHasNoMembers(o);
+      }
+      CardVsEmpty(b);
+    case Cons(x, tail) =>
+      forall o | Less(o, x)
+        ensures !In(a, o)
+      {
+        NothingIsSmallerThanHead(a, o);
+      }
+      assert In(b, x);
+      assert b.head == x by {
+        assert Below(b.head, x) by {
+          HeadIsSmallest(b, x);
+        }
+        assert !Less(b.head, x);
+      }
+      assert b.tail == tail by {
+        forall o
+          ensures In(a.tail, o) <==> In(b.tail, o)
+        {
+          calc {
+            In(a.tail, o);
+            { TailDoesNotContainHead(a); }
+            In(a.tail, o) && a.head != o;
+            In(a, o) && a.head != o;
+            In(b, o) && b.head != o;
+            In(b.tail, o) && b.head != o;
+            { TailDoesNotContainHead(b); }
+            In(b.tail, o);
+          }
+        }
+        TailStrictlyIncreasing(a);
+        TailStrictlyIncreasing(b);
+        Extensionality(tail, b.tail);
+      }
+  }
+
+  lemma HeadIsSmallest(s: List<Box>, o: Box)
+    requires StrictlyIncreasing(s) && s.Contains(o)
+    ensures Below(s.head, o)
+  {
+    if o == s.head {
+      Reflexive(o);
+    } else {
+      var j := s.ContainsAt(o);
+      assert s.head == s.At(0) && o == s.At(j);
+      assert Less(s.head, o);
+    }
+  }
+
+  lemma NothingIsSmallerThanHead(s: List<Box>, o: Box)
+    requires StrictlyIncreasing(s) && s != Nil && Less(o, s.head)
+    ensures !s.Contains(o)
+  {
+    if s.Contains(o) {
+      HeadIsSmallest(s, o);
+      assert Below(s.head, o);
+      LessBelowAsymmetric(o, s.head);
+      assert false;
+    }
+  }
+
+  lemma TailDoesNotContainHead(s: List<Box>)
+    requires StrictlyIncreasing(s) && s != Nil
+    ensures !s.tail.Contains(s.head)
+  {
+    if s.tail.Contains(s.head) {
+      assert s.At(0) == s.head;
+      var j := s.tail.ContainsAt(s.head);
+      assert s.At(j + 1) == s.head;
+      assert Less(s.At(0), s.At(j + 1));
+      assert false;
+    }
+  }
+
+  // function Set#Disjoint(Set, Set): bool;
+  ghost predicate {:extract_boogie_name "Set#Disjoint"} Disjoint(a: Set, b: Set) {
+    forall o {:extract_pattern In(a, o)} {:extract_pattern In(b, o)} :: !In(a, o) || !In(b, o)
+  }
+
+  // axiom (forall a: Set, b: Set :: { Set#Disjoint(a,b) }
+  //   Set#Disjoint(a,b) <==> (forall o: Box :: {a[o]} {b[o]} !a[o] || !b[o]));
+  lemma {:extract_pattern Disjoint(a, b)} DisjointDefinition(a: Set, b: Set)
+    ensures Disjoint(a, b) <==> forall o {:extract_pattern IsMember(a, o)} {:extract_pattern IsMember(b, o)} :: !IsMember(a, o) || !IsMember(b, o)
+  {
+    assert forall o :: In(a, o) == IsMember(a, o);
+  }
+
+}
+  // // the empty set could be of anything
+  // //axiom (forall t: Ty :: { $Is(Set#Empty() : [Box]bool, TSet(t)) } $Is(Set#Empty() : [Box]bool, TSet(t)));
+
+  // NOT USED:
+  // function Set#Singleton(Box): Set;
+  // axiom (forall r: Box :: { Set#Singleton(r) } Set#Singleton(r)[r]);
+  // axiom (forall r: Box, o: Box :: { Set#Singleton(r)[o] } Set#Singleton(r)[o] <==> r == o);
+  // axiom (forall r: Box :: { Set#Card(Set#Singleton(r)) } Set#Card(Set#Singleton(r)) == 1);
+
+  // // axiom(forall a: Set, b: Set ::
+  // //   { Set#Subset(a,b), Set#Card(a), Set#Card(b) }  // very restrictive trigger
+  // //   Set#Subset(a,b) ==> Set#Card(a) <= Set#Card(b));
diff --git a/Source/DafnyCore/Prelude/dfyconfig.toml b/Source/DafnyCore/Prelude/dfyconfig.toml
new file mode 100644
index 00000000000..e3880b1fec5
--- /dev/null
+++ b/Source/DafnyCore/Prelude/dfyconfig.toml
@@ -0,0 +1,5 @@
+[options]
+allow-warnings=true
+type-system-refresh=true
+general-traits="datatype"
+general-newtypes=true
diff --git a/Source/DafnyCore/ProofDependencyWarnings.cs b/Source/DafnyCore/ProofDependencyWarnings.cs
new file mode 100644
index 00000000000..bdf2dcbce3f
--- /dev/null
+++ b/Source/DafnyCore/ProofDependencyWarnings.cs
@@ -0,0 +1,328 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
+using Microsoft.Dafny.Triggers;
+using VC;
+
+namespace Microsoft.Dafny;
+
+public record VerificationTaskResult(IVerificationTask Task, VerificationRunResult Result);
+
+public class ProofDependencyWarnings {
+  private static DafnyOptions options;
+  private static ErrorReporter reporter;
+  private static ProofDependencyManager manager;
+
+
+  public static void ReportSuspiciousDependencies(DafnyOptions dafnyOptions, IEnumerable<VerificationTaskResult> parts,
+    ErrorReporter reporter, ProofDependencyManager depManager) {
+    manager = depManager;
+    ProofDependencyWarnings.reporter = reporter;
+    options = dafnyOptions;
+    foreach (var resultsForScope in parts.GroupBy(p => p.Task.ScopeId)) {
+      WarnAboutSuspiciousDependenciesForImplementation(resultsForScope.Key,
+        resultsForScope.Select(p => p.Result).ToList());
+    }
+  }
+
+  public static void WarnAboutSuspiciousDependenciesUsingStoredPartialResults(DafnyOptions dafnyOptions, ErrorReporter reporter, ProofDependencyManager depManager) {
+    manager = depManager;
+    ProofDependencyWarnings.reporter = reporter;
+    options = dafnyOptions;
+    var verificationResults = (dafnyOptions.Printer as DafnyConsolePrinter).VerificationResults.ToList();
+    var orderedResults =
+      verificationResults.OrderBy(vr =>
+        (vr.Implementation.Tok.filename, vr.Implementation.Tok.line, vr.Implementation.Tok.col));
+
+    foreach (var (implementation, result) in orderedResults) {
+      if (result.Outcome != VcOutcome.Correct) {
+        continue;
+      }
+      var unusedFunctions = GetUnusedFunctions(implementation.Name, result.VCResults.SelectMany(r => r.CoveredElements), result.VCResults.SelectMany(r => r.AvailableAxioms));
+      WarnAboutSuspiciousDependencies(implementation.Name, result.VCResults, unusedFunctions);
+    }
+  }
+
+  public static void WarnAboutSuspiciousDependenciesForImplementation(string name,
+    IReadOnlyList<VerificationRunResult> results) {
+    if (results.Any(r => r.Outcome != SolverOutcome.Valid)) {
+      return;
+    }
+    var unusedFunctions = GetUnusedFunctions(name, results.SelectMany(r => r.CoveredElements), results.SelectMany(r => r.DeclarationsAfterPruning.OfType<Axiom>()));
+    WarnAboutSuspiciousDependencies(name, results.Select(DafnyConsolePrinter.DistillVCResult).ToList(), unusedFunctions);
+  }
+
+  private static IEnumerable<Function> GetUnusedFunctions(string implementationName, IEnumerable<TrackedNodeComponent> coveredElements,
+    IEnumerable<Axiom> axioms) {
+    if (!((options.Get(CommonOptionBag.SuggestProofRefactoring) || options.Get(CommonOptionBag.AnalyzeProofs)) && manager.idsByMemberName[implementationName].Decl is Method)) {
+      return new List<Function>();
+    }
+
+    if (manager.idsByMemberName[implementationName].Decl is not Method) {
+      return new List<Function>();
+    }
+
+    var usedFunctions = coveredElements.Select(manager.GetFullIdDependency).OfType<FunctionDefinitionDependency>()
+      .Select(dep => dep.function).Distinct();
+
+    return GetVisibleFunctions().Except(usedFunctions);
+
+    HashSet<Function> GetVisibleFunctions() {
+      return axioms.Select(GetFunctionFromAttributed).Where(f => f != null).ToHashSet();
+
+      Function GetFunctionFromAttributed(ICarriesAttributes construct) {
+        var values = construct.FindAllAttributes("id");
+        if (!values.Any()) {
+          return null;
+        }
+        var id = (string)values.Last().Params.First();
+        if (manager.ProofDependenciesById.TryGetValue(id, out var dep) && dep is FunctionDefinitionDependency fdd) {
+          return fdd.function;
+        }
+        return null;
+      }
+    }
+  }
+
+  private static void WarnAboutSuspiciousDependencies(string scopeName,
+    IReadOnlyList<VerificationRunResultPartialCopy> assertCoverage, IEnumerable<Function> unusedFunctions) {
+    var potentialDependencies = manager.GetPotentialDependenciesForDefinition(scopeName);
+    var coveredElements = assertCoverage.SelectMany(tp => tp.CoveredElements);
+    var usedDependencies =
+      coveredElements
+        .Select(manager.GetFullIdDependency)
+        .OrderBy(dep => dep.Range.Center)
+        .ThenBy(dep => dep.Description);
+    var unusedDependencies =
+      potentialDependencies
+        .Except(usedDependencies)
+        .OrderBy(dep => dep.Range.Center)
+        .ThenBy(dep => dep.Description).ToList();
+
+    foreach (var unusedDependency in unusedDependencies) {
+      if (options.Get(CommonOptionBag.WarnContradictoryAssumptions) || options.Get(CommonOptionBag.AnalyzeProofs)) {
+        if (unusedDependency is ProofObligationDependency obligation) {
+          if (ShouldWarnVacuous(scopeName, obligation)) {
+            var message = $"proved using contradictory assumptions: {obligation.Description}";
+            if (obligation.ProofObligation is AssertStatementDescription) {
+              message += ". (Use the `{:contradiction}` attribute on the `assert` statement to silence.)";
+            }
+            reporter.Warning(MessageSource.Verifier, "",
+              // OverrideCenter used to prevent changes in reporting
+              new OverrideCenter(obligation.Range, obligation.Range.StartToken), message);
+          }
+        }
+
+        if (unusedDependency is EnsuresDependency ensures) {
+          if (ShouldWarnVacuous(scopeName, ensures)) {
+            // OverrideCenter used to prevent changes in reporting
+            reporter.Warning(MessageSource.Verifier, "", new OverrideCenter(ensures.Range, ensures.Range.StartToken),
+              $"ensures clause proved using contradictory assumptions");
+          }
+        }
+      }
+
+      if (options.Get(CommonOptionBag.WarnRedundantAssumptions) || options.Get(CommonOptionBag.AnalyzeProofs)) {
+        if (unusedDependency is RequiresDependency requires) {
+          reporter.Warning(MessageSource.Verifier, "",
+            // OverrideCenter used to prevent changes in reporting
+            new OverrideCenter(requires.Range, requires.Range.StartToken),
+            $"unnecessary requires clause");
+        }
+
+        if (unusedDependency is AssumptionDependency assumption) {
+          if (ShouldWarnUnused(assumption)) {
+            reporter.Warning(MessageSource.Verifier, "",
+              // OverrideCenter used to prevent changes in reporting
+              new OverrideCenter(assumption.Range, assumption.Range.StartToken),
+              $"unnecessary (or partly unnecessary) {assumption.Description}");
+          }
+        }
+      }
+    }
+
+    if ((options.Get(CommonOptionBag.SuggestProofRefactoring) || options.Get(CommonOptionBag.AnalyzeProofs)) && manager.idsByMemberName[scopeName].Decl is Method method) {
+      SuggestFunctionHiding(unusedFunctions, method);
+      SuggestByProofRefactoring(scopeName, assertCoverage.ToList());
+    }
+  }
+
+  private static void SuggestFunctionHiding(IEnumerable<Function> unusedFunctions, Method method) {
+    if (unusedFunctions.Any()) {
+      reporter.Info(MessageSource.Verifier, method.Body.StartToken,
+        $"Consider hiding {(unusedFunctions.Count() > 1 ? "these functions, which are" : "this function, which is")} unused by the proof: {unusedFunctions.Comma()}");
+    }
+  }
+
+  private static void SuggestByProofRefactoring(string scopeName,
+    IReadOnlyList<VerificationRunResultPartialCopy> verificationRunResults) {
+    foreach (var (fact, asserts) in ComputeAssertionsProvenUsingFact(scopeName, verificationRunResults)) {
+      var factIsOnlyUsedByOneAssertion = asserts.Count == 1;
+      if (!factIsOnlyUsedByOneAssertion) {
+        continue;
+      }
+
+      AssertCmdPartialCopy partialAssert = asserts.Single();
+
+      manager.ProofDependenciesById.TryGetValue(partialAssert!.Id, out var assertDepProvenByFact);
+
+      var factAlreadyInByBlock = assertDepProvenByFact != null && (fact == assertDepProvenByFact || assertDepProvenByFact.Range.Intersects(fact.Range));
+      if (factAlreadyInByBlock) {
+        continue;
+      }
+
+      IOrigin range = null;
+      var factProvider = "";
+      var factConsumer = "";
+      var recommendation = "";
+      var completeInformation = true;
+
+      switch (fact) {
+        case AssumedProofObligationDependency:
+        case AssumptionDependency: {
+            range = fact.Range;
+            factProvider = "fact";
+            recommendation = "moving it into";
+            break;
+          }
+        case RequiresDependency: {
+            range = fact.Range;
+            factProvider = "requires clause";
+            recommendation = "labelling it and revealing it in";
+            break;
+          }
+        default: completeInformation = false; break;
+      }
+
+      switch (assertDepProvenByFact) {
+        case CallDependency call: {
+            factConsumer = $"precondition{(call.call.Method.Req.Count > 1 ? "s" : "")} of the method call {call.Range.Next.TokenToString(options)}";
+            break;
+          }
+        case ProofObligationDependency { ProofObligation: AssertStatementDescription }: {
+            factConsumer = $"assertion {assertDepProvenByFact.RangeString()}";
+            break;
+          }
+        default: completeInformation = false; break;
+      }
+
+      if (completeInformation) {
+        reporter.Info(MessageSource.Verifier, range,
+          $"This {factProvider} was only used to prove the {factConsumer}. Consider {recommendation} a by-proof.");
+      }
+    }
+  }
+
+  private static Dictionary<ProofDependency, HashSet<AssertCmdPartialCopy>>
+    ComputeAssertionsProvenUsingFact(string scopeName, IReadOnlyList<VerificationRunResultPartialCopy> verificationRunResults) {
+    var assertionsProvenUsingFact = manager.GetPotentialDependenciesForDefinition(scopeName)
+      // Filter out noise
+      .Where(dep => dep is not EnsuresDependency)
+      .ToDictionary(dep => dep, _ => new HashSet<AssertCmdPartialCopy> { });
+
+    foreach (var verificationRun in verificationRunResults) {
+      foreach (var factReference in verificationRun.CoveredElements) {
+        var factDependency = manager.GetFullIdDependency(factReference);
+        var excludedDependencies = factDependency is EnsuresDependency;
+        if (excludedDependencies) {
+          continue;
+        }
+
+        assertionsProvenUsingFact.TryAdd(factDependency, new HashSet<AssertCmdPartialCopy>());
+
+        bool IsNotSelfReferential(AssertCmdPartialCopy assert) =>
+           !manager.ProofDependenciesById.TryGetValue(assert.Id, out var assertDependency)
+                 || !(factDependency == assertDependency || factDependency is CallRequiresDependency req && req.call == assertDependency);
+
+        assertionsProvenUsingFact[factDependency].UnionWith(verificationRun.Asserts.Where(IsNotSelfReferential));
+      }
+    }
+
+    return assertionsProvenUsingFact;
+  }
+
+  /// <summary>
+  /// Some proof obligations that don't show up in the dependency list
+  /// are innocuous. Either they come about because of internal Dafny
+  /// design choices that the programmer has no control over, or they
+  /// just aren't meaningful in context. This method identifies cases
+  /// where it doesn't make sense to issue a warning. Many of these
+  /// cases should perhaps be eliminated by changing the translator
+  /// to not generate vacuous proof goals, but that may be a difficult
+  /// change to make.
+  /// </summary>
+  /// <param name="verboseName"></param>
+  /// <param name="dep">the dependency to examine</param>
+  /// <returns>false to skip warning about the absence of this
+  /// dependency, true otherwise</returns>
+  private static bool ShouldWarnVacuous(string verboseName, ProofDependency dep) {
+    if (dep is ProofObligationDependency poDep) {
+      // Dafny generates some assertions about definite assignment whose
+      // proofs are always vacuous. Since these aren't written by Dafny
+      // programmers, it's safe to just skip them all.
+      if (poDep.ProofObligation is DefiniteAssignment) {
+        return false;
+      }
+
+      // Some proof obligations occur in a context that the Dafny programmer
+      // doesn't have control of, so warning about vacuity isn't helpful.
+      if (poDep.ProofObligation.ProvedOutsideUserCode) {
+        return false;
+      }
+
+      // Don't warn about `assert false` being proved vacuously. If it's proved,
+      // it must be vacuous, but it's also probably an attempt to prove that a
+      // given branch is unreachable (often, but not always, in ghost code).
+      var assertedExpr = poDep.ProofObligation.GetAssertedExpr(options);
+      if (assertedExpr is not null &&
+          Expression.IsBoolLiteral(assertedExpr, out var lit) &&
+          lit == false) {
+        return false;
+      }
+
+      if (poDep.ProofObligation is AssertStatementDescription { IsIntentionalContradiction: true }) {
+        return false;
+      }
+    }
+
+    // Ensures clauses are often proven vacuously during well-formedness checks.
+    // There's unfortunately no way to identify these checks once Dafny has
+    // been translated to Boogie other than looking at the name. This is a significant
+    // limitation, because it means that function ensures clauses that are satisfied
+    // only vacuously won't be reported. It would great if we could change the Boogie
+    // encoding so that these unreachable-by-construction checks don't exist.
+    if (verboseName.Contains("well-formedness") && dep is EnsuresDependency) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /// <summary>
+  /// Some assumptions that don't show up in the dependency list
+  /// are innocuous. In particular, `assume true` is often used
+  /// as a place to attach attributes such as `{:split_here}`.
+  /// Don't warn about such assumptions. Also don't warn about
+  /// assumptions that aren't explicit (coming from `assume` or
+  /// `assert` statements), for now, because they are difficult
+  /// for the user to control.
+  /// </summary>
+  /// <param name="dep">the dependency to examine</param>
+  /// <returns>false to skip warning about the absence of this
+  /// dependency, true otherwise</returns>
+  private static bool ShouldWarnUnused(ProofDependency dep) {
+    if (dep is AssumptionDependency assumeDep) {
+      if (assumeDep.Expr is not null &&
+          Expression.IsBoolLiteral(assumeDep.Expr, out var lit) &&
+          lit) {
+        return false;
+      }
+
+      return assumeDep.WarnWhenUnused;
+    }
+
+    return true;
+  }
+}
diff --git a/Source/DafnyCore/Resolver/AmbiguousMemberDecl.cs b/Source/DafnyCore/Resolver/AmbiguousMemberDecl.cs
index ac5aed2ea8b..3da22bb860b 100644
--- a/Source/DafnyCore/Resolver/AmbiguousMemberDecl.cs
+++ b/Source/DafnyCore/Resolver/AmbiguousMemberDecl.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
@@ -23,20 +24,23 @@ public int GetHashCode(MemberDecl d) {
   }
 
   public override string WhatKind {
-    get { return Pool.First().WhatKind; }
+    get { return pool.First().WhatKind; }
   }
 
-  readonly ISet<MemberDecl> Pool = new HashSet<MemberDecl>();
-
-  ISet<MemberDecl> IAmbiguousThing<MemberDecl>.Pool {
-    get { return Pool; }
+  public override SymbolKind? Kind => null;
+  public override string GetDescription(DafnyOptions options) {
+    return null;
   }
 
+  readonly ISet<MemberDecl> pool;
+
+  ISet<MemberDecl> IAmbiguousThing<MemberDecl>.Pool => pool;
+
   private AmbiguousMemberDecl(ModuleDefinition m, string name, ISet<MemberDecl> pool)
-    : base(pool.First().RangeToken, new Name(pool.First().RangeToken, name), true, pool.First().IsGhost, null, false) {
+    : base(pool.First().Origin, new Name(pool.First().Origin, name), true, pool.First().IsGhost, null, false) {
     Contract.Requires(name != null);
     Contract.Requires(pool != null && 2 <= pool.Count);
-    Pool = pool;
+    this.pool = pool;
   }
 
   public string ModuleNames() {
diff --git a/Source/DafnyCore/Resolver/AmbiguousTopLevelDecl.cs b/Source/DafnyCore/Resolver/AmbiguousTopLevelDecl.cs
index b85fcc44a0c..f284452f6c0 100644
--- a/Source/DafnyCore/Resolver/AmbiguousTopLevelDecl.cs
+++ b/Source/DafnyCore/Resolver/AmbiguousTopLevelDecl.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny;
 
@@ -29,21 +30,22 @@ public int GetHashCode(TopLevelDecl d) {
     }
   }
 
-  public override string WhatKind {
-    get { return Pool.First().WhatKind; }
+  public override string WhatKind => pool.First().WhatKind;
+
+  public override SymbolKind? Kind => null;
+  public override string GetDescription(DafnyOptions options) {
+    return null;
   }
 
-  readonly ISet<TopLevelDecl> Pool = new HashSet<TopLevelDecl>();
+  readonly ISet<TopLevelDecl> pool;
 
-  ISet<TopLevelDecl> IAmbiguousThing<TopLevelDecl>.Pool {
-    get { return Pool; }
-  }
+  ISet<TopLevelDecl> IAmbiguousThing<TopLevelDecl>.Pool => pool;
 
   private AmbiguousTopLevelDecl(ModuleDefinition m, string name, ISet<TopLevelDecl> pool)
-    : base(pool.First().RangeToken, new Name(pool.First().RangeToken, name), m, new List<TypeParameter>(), null, false) {
+    : base(pool.First().Origin, new Name(pool.First().Origin, name), m, new List<TypeParameter>(), null, false) {
     Contract.Requires(name != null);
     Contract.Requires(pool != null && 2 <= pool.Count);
-    Pool = pool;
+    this.pool = pool;
   }
 
   public string ModuleNames() {
diff --git a/Source/DafnyCore/Resolver/AnalyzeTypeConstraints.cs b/Source/DafnyCore/Resolver/AnalyzeTypeConstraints.cs
new file mode 100644
index 00000000000..48e0844b31e
--- /dev/null
+++ b/Source/DafnyCore/Resolver/AnalyzeTypeConstraints.cs
@@ -0,0 +1,84 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System.Collections.Generic;
+using System.Linq;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// This class contains the logic to figure out if a subset types and newtypes have compilable constraints.
+/// This analysis leads to the setting of the .ConstraintIsCompilable field of the declarations of those types.
+/// </summary>
+class AnalyzeTypeConstraints {
+  public static void AssignConstraintIsCompilable(List<TopLevelDecl> declarations, DafnyOptions options) {
+    // It's important to do the declarations in topological order from how they depend on each other.
+    declarations = TopologicallySortedTopLevelDecls(declarations);
+
+    foreach (var d in declarations.Where(decl => decl is SubsetTypeDecl or NewtypeDecl)) {
+      var declWithConstraints = (RedirectingTypeDecl)d;
+
+      var constraintIsCompilable = true;
+
+      // Check base type
+      var baseType = (declWithConstraints.Var?.Type ?? ((NewtypeDecl)declWithConstraints).BaseType).NormalizeExpandKeepConstraints();
+      if (baseType.AsRedirectingType is (SubsetTypeDecl or NewtypeDecl) and var baseDecl) {
+        constraintIsCompilable &= baseDecl.ConstraintIsCompilable;
+      }
+
+      // Check the type's constraint
+      if (declWithConstraints.Constraint != null) {
+        constraintIsCompilable &= ExpressionTester.CheckIsCompilable(options, null, declWithConstraints.Constraint,
+          new CodeContextWrapper(declWithConstraints, true));
+      }
+
+      declWithConstraints.ConstraintIsCompilable = constraintIsCompilable;
+    }
+  }
+
+  /// <summary>
+  /// Return "declarations" in sorted order, so that each declaration is preceded by those on which it depends.
+  /// It is assumed that "declarations" are all from the same module and that the call graph of that module has been constructed.
+  /// If there's some given declaration that's not in the call graph, then that's fine; it just means that the call
+  /// graph does not constrain the output order of that declaration.
+  /// </summary>
+  private static List<TopLevelDecl> TopologicallySortedTopLevelDecls(List<TopLevelDecl> declarations) {
+    // Dependency information among the declarations is stored in the enclosing module's call graph. To get to that
+    // call graph, we need to have the module declaration, which we obtain from one of the given declarations:
+    if (declarations.Count == 0) {
+      return declarations;
+    }
+    var enclosingModule = declarations[0].EnclosingModuleDefinition;
+    Contract.Assert(declarations.TrueForAll(decl => decl.EnclosingModuleDefinition == enclosingModule));
+
+    // From the module declaration, we get the components sorted according to how they depend on each other.
+    var sortedComponents = enclosingModule.CallGraph.TopologicallySortedComponents();
+
+    // But... this is a list of ICallable's (which also includes MemberDecl's and may not contain all TopLevelDecl's).
+    // So, we filter the ICallable's to consider only the given TopLevelDecl's. We also remember which declarations we
+    // have added to the output, so we later can add all the remaining ones.
+    var remainingDecls = new HashSet<TopLevelDecl>(declarations);
+    var output = new List<TopLevelDecl>();
+    foreach (var callable in sortedComponents) {
+      if (callable is TopLevelDecl topLevelDecl && remainingDecls.Contains(topLevelDecl)) {
+        output.Add(topLevelDecl);
+        remainingDecls.Remove(topLevelDecl);
+      }
+    }
+
+    // Finally, add in those TopLevelDecl's that were not in the call graph.
+    foreach (var decl in declarations) {
+      if (remainingDecls.Contains(decl)) {
+        output.Add(decl);
+      }
+    }
+    Contract.Assert(declarations.Count == output.Count); // this assumes there were no duplicates in the given declarations
+
+    return output;
+  }
+
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/AllocFreeBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/AllocFreeBoundedPool.cs
new file mode 100644
index 00000000000..e4a60b24b69
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/AllocFreeBoundedPool.cs
@@ -0,0 +1,28 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny;
+
+public class AllocFreeBoundedPool : BoundedPool {
+  public Type Type;
+  public AllocFreeBoundedPool(Type t) {
+    Type = t;
+  }
+  public override PoolVirtues Virtues {
+    get {
+      if (Type.IsRefType) {
+        return PoolVirtues.Finite | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+      } else {
+        return PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+      }
+    }
+  }
+  public override int Preference() => 0;
+  public override BoundedPool Clone(Cloner cloner) {
+    return this;
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/BoolBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/BoolBoundedPool.cs
new file mode 100644
index 00000000000..c4a3c45bf51
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/BoolBoundedPool.cs
@@ -0,0 +1,17 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny;
+
+public class BoolBoundedPool : BoundedPool {
+  public override PoolVirtues Virtues =>
+    PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+  public override int Preference() => 14;
+  public override BoundedPool Clone(Cloner cloner) {
+    return this;
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/BoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/BoundedPool.cs
new file mode 100644
index 00000000000..274d6cb3cad
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/BoundedPool.cs
@@ -0,0 +1,150 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Numerics;
+using JetBrains.Annotations;
+
+namespace Microsoft.Dafny;
+
+public abstract class BoundedPool : ICloneable<BoundedPool> {
+  [Flags]
+  public enum PoolVirtues {
+    None = 0,
+    Finite = 1,
+    Enumerable = 2,
+    IndependentOfAlloc = 4,
+    IndependentOfAlloc_or_ExplicitAlloc = 8
+  }
+
+  public abstract PoolVirtues Virtues { get; }
+
+  /// <summary>
+  /// A higher preference is better.
+  /// A preference below 2 is a last-resort bounded pool. Bounds discovery will not consider
+  /// such a pool to be final until there are no other choices.
+  ///
+  /// For easy reference, here is the BoundedPool hierarchy and their preference levels:
+  ///
+  /// 0: AllocFreeBoundedPool
+  /// 0: ExplicitAllocatedBoundedPool
+  /// 0: SpecialAllocIndependenceAllocatedBoundedPool
+  /// 0: OlderBoundedPool
+  ///
+  /// 1: WiggleWaggleBound
+  ///
+  /// 2: SuperSetBoundedPool
+  /// 2: DatatypeInclusionBoundedPool
+  ///
+  /// 3: SubSetBoundedPool
+  ///
+  /// 4: IntBoundedPool with one bound
+  /// 5: IntBoundedPool with both bounds
+  /// 5: CharBoundedPool
+  ///
+  /// 8: DatatypeBoundedPool
+  ///
+  /// 10: CollectionBoundedPool
+  ///     - SetBoundedPool
+  ///     - MultiSetBoundedPool
+  ///     - MapBoundedPool
+  ///     - SeqBoundedPool
+  ///
+  /// 14: BoolBoundedPool
+  ///
+  /// 15: ExactBoundedPool
+  /// </summary>
+  public abstract int Preference(); // higher is better
+
+  public static BoundedPool GetBest(List<BoundedPool> bounds) {
+    Contract.Requires(bounds != null);
+    bounds = CombineIntegerBounds(bounds);
+    BoundedPool best = null;
+    foreach (var bound in bounds) {
+      if (best is IntBoundedPool ibp0 && bound is IntBoundedPool ibp1) {
+        best = new IntBoundedPool(
+          ChooseBestIntegerBound(ibp0.LowerBound, ibp1.LowerBound, true),
+          ChooseBestIntegerBound(ibp0.UpperBound, ibp1.UpperBound, false));
+      } else if (best == null || bound.Preference() > best.Preference()) {
+        best = bound;
+      }
+    }
+    return best;
+  }
+
+  [CanBeNull]
+  static Expression ChooseBestIntegerBound([CanBeNull] Expression a, [CanBeNull] Expression b, bool pickMax) {
+    if (a == null || b == null) {
+      return a ?? b;
+    }
+
+    if (Expression.IsIntLiteral(a, out var aa) && Expression.IsIntLiteral(b, out var bb)) {
+      var x = pickMax ? BigInteger.Max(aa, bb) : BigInteger.Min(aa, bb);
+      return new LiteralExpr(a.Origin, x) { Type = a.Type };
+    }
+    // we don't know how to determine which of "a" or "b" is better, so we'll just return "a"
+    // (better would be to return an expression that computes to the minimum of "a" and "b")
+    return a;
+  }
+
+  public static List<VT> MissingBounds<VT>(List<VT> vars, List<BoundedPool> bounds, PoolVirtues requiredVirtues) where VT : IVariable {
+    Contract.Requires(vars != null);
+    Contract.Requires(bounds == null || vars.Count == bounds.Count);
+    Contract.Ensures(Contract.Result<List<VT>>() != null);
+    var missing = new List<VT>();
+    for (var i = 0; i < vars.Count; i++) {
+      if (bounds == null || bounds[i] == null ||
+          (bounds[i].Virtues & requiredVirtues) != requiredVirtues ||
+          ((requiredVirtues & PoolVirtues.Enumerable) != 0 && !bounds[i].IsCompilable(vars[i].Type))) {
+        missing.Add(vars[i]);
+      }
+    }
+    return missing;
+  }
+
+  public static List<bool> HasBounds(List<BoundedPool> bounds, PoolVirtues requiredVirtues = PoolVirtues.None) {
+    Contract.Requires(bounds != null);
+    Contract.Ensures(Contract.Result<List<bool>>() != null);
+    Contract.Ensures(Contract.Result<List<bool>>().Count == bounds.Count);
+    return bounds.ConvertAll(bound => bound != null && (bound.Virtues & requiredVirtues) == requiredVirtues);
+  }
+
+  static List<BoundedPool> CombineIntegerBounds(List<BoundedPool> bounds) {
+    var lowerBounds = new List<IntBoundedPool>();
+    var upperBounds = new List<IntBoundedPool>();
+    var others = new List<BoundedPool>();
+    foreach (var b in bounds) {
+      var ib = b as IntBoundedPool;
+      if (ib != null && ib.UpperBound == null) {
+        lowerBounds.Add(ib);
+      } else if (ib != null && ib.LowerBound == null) {
+        upperBounds.Add(ib);
+      } else {
+        others.Add(b);
+      }
+    }
+    // pair up the bounds
+    var n = Math.Min(lowerBounds.Count, upperBounds.Count);
+    for (var i = 0; i < n; i++) {
+      others.Add(new IntBoundedPool(lowerBounds[i].LowerBound, upperBounds[i].UpperBound));
+    }
+    for (var i = n; i < lowerBounds.Count; i++) {
+      others.Add(lowerBounds[i]);
+    }
+    for (var i = n; i < upperBounds.Count; i++) {
+      others.Add(upperBounds[i]);
+    }
+    return others;
+  }
+
+  public virtual bool IsCompilable(Type boundVariableType) =>
+    ExpressionTester.IsTypeTestCompilable(boundVariableType.NormalizeToAncestorType(), boundVariableType);
+
+  public abstract BoundedPool Clone(Cloner cloner);
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/BoundsDiscovery.cs
similarity index 81%
rename from Source/DafnyCore/Resolver/BoundsDiscovery.cs
rename to Source/DafnyCore/Resolver/BoundsDiscovery/BoundsDiscovery.cs
index ffee04d0e13..81a6d12420f 100644
--- a/Source/DafnyCore/Resolver/BoundsDiscovery.cs
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/BoundsDiscovery.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Diagnostics.Contracts;
-using Microsoft.Boogie;
 
 namespace Microsoft.Dafny {
   public partial class ModuleResolver {
@@ -69,7 +68,7 @@ protected override bool VisitOneStatement(Statement stmt, BoundsDiscoveryContext
         if (stmt is ForallStmt forallStmt) {
           forallStmt.Bounds = DiscoverBestBounds_MultipleVars(forallStmt.BoundVars, forallStmt.Range, true);
           if (forallStmt.Body == null) {
-            Reporter.Warning(MessageSource.Resolver, ErrorRegistry.NoneId, forallStmt.Tok, "note, this forall statement has no body");
+            Reporter.Warning(MessageSource.Resolver, ErrorRegistry.NoneId, forallStmt.Origin, "this forall statement has no body");
           }
         } else if (stmt is AssignSuchThatStmt assignSuchThatStmt) {
           if (assignSuchThatStmt.AssumeToken == null) {
@@ -130,8 +129,8 @@ public static Expression FrameArrowToObjectSet(Expression e) {
         if (arrowType == null) {
           return e;
         }
-        var collectionType = arrowType.Result.AsCollectionType;
-        if (collectionType == null || collectionType.NormalizeExpand() is MapType) {
+        var collectionType = arrowType.Result.NormalizeToAncestorType().AsCollectionType;
+        if (collectionType == null || collectionType is MapType) {
           return e;
         }
         var elementType = collectionType.Arg; // "elementType" is called "Y" in the description of this method, above
@@ -143,34 +142,34 @@ public static Expression FrameArrowToObjectSet(Expression e) {
         var boundVarUses = new List<Expression>();
         var i = 0;
         foreach (var functionArgumentType in arrowType.Args) {
-          var bv = new BoundVar(e.tok, $"_x{i}", functionArgumentType);
+          var bv = new BoundVar(e.Origin, $"_x{i}", functionArgumentType);
           boundVarDecls.Add(bv);
-          boundVarUses.Add(new IdentifierExpr(e.tok, bv.Name) { Type = bv.Type, Var = bv });
+          boundVarUses.Add(new IdentifierExpr(e.Origin, bv.Name) { Type = bv.Type, Var = bv });
           i++;
         }
-        var objVar = new BoundVar(e.tok, "_obj", elementType.NormalizeExpand());
-        var objUse = new IdentifierExpr(e.tok, objVar.Name) { Type = objVar.Type, Var = objVar };
+        var objVar = new BoundVar(e.Origin, "_obj", elementType.NormalizeExpand());
+        var objUse = new IdentifierExpr(e.Origin, objVar.Name) { Type = objVar.Type, Var = objVar };
         boundVarDecls.Add(objVar);
 
-        var collection = new ApplyExpr(e.tok, e, boundVarUses, e.tok) {
+        var collection = new ApplyExpr(e.Origin, e, boundVarUses, Token.NoToken) {
           Type = collectionType
         };
         var resolvedOpcode = collectionType.ResolvedOpcodeForIn;
 
-        var inCollection = new BinaryExpr(e.tok, BinaryExpr.Opcode.In, objUse, collection) {
+        var inCollection = new BinaryExpr(e.Origin, BinaryExpr.Opcode.In, objUse, collection) {
           ResolvedOp = resolvedOpcode,
           Type = Type.Bool
         };
 
         var attributes = new Attributes("_reads", new List<Expression>(), null);
-        return new SetComprehension(e.tok, e.RangeToken, true, boundVarDecls, inCollection, objUse, attributes) {
+        return new SetComprehension(e.Origin, true, boundVarDecls, inCollection, objUse, attributes) {
           Type = new SetType(true, elementType)
         };
       }
 
       protected override void VisitExpression(Expression expr, BoundsDiscoveryContext context) {
         if (expr is LambdaExpr lambdaExpr) {
-          lambdaExpr.Reads.ForEach(DesugarFunctionsInFrameClause);
+          lambdaExpr.Reads.Expressions.ForEach(DesugarFunctionsInFrameClause);
 
           // Make the context more specific when visiting inside a lambda expression
           context = new BoundsDiscoveryContext(context, lambdaExpr);
@@ -197,8 +196,8 @@ protected override bool VisitOneExpression(Expression expr, BoundsDiscoveryConte
           if (whereToLookForBounds != null) {
             e.Bounds = DiscoverBestBounds_MultipleVars_AllowReordering(e.BoundVars, whereToLookForBounds, polarity);
             if (!context.AllowedToDependOnAllocationState) {
-              foreach (var bv in ComprehensionExpr.BoundedPool.MissingBounds(e.BoundVars, e.Bounds,
-                         ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc)) {
+              foreach (var bv in BoundedPool.MissingBounds(e.BoundVars, e.Bounds,
+                         BoundedPool.PoolVirtues.IndependentOfAlloc)) {
                 var how = Attributes.Contains(e.Attributes, "_reads") ? "(implicitly by using a function in a reads clause) " : "";
                 var message =
                   $"a {e.WhatKind} involved in a {context.Kind} {how}is not allowed to depend on the set of allocated references," +
@@ -219,7 +218,8 @@ protected override bool VisitOneExpression(Expression expr, BoundsDiscoveryConte
                 // resolution), the resolver will generate an error about that later.
               } else {
                 // we cannot be sure that the set/map really is finite
-                foreach (var bv in ComprehensionExpr.BoundedPool.MissingBounds(e.BoundVars, e.Bounds, ComprehensionExpr.BoundedPool.PoolVirtues.Finite)) {
+                foreach (var bv in BoundedPool.MissingBounds(e.BoundVars, e.Bounds,
+                           BoundedPool.PoolVirtues.Finite)) {
                   Reporter.Error(MessageSource.Resolver, e,
                     "the result of a {0} must be finite, but Dafny's heuristics can't figure out how to produce a bounded set of values for '{1}'",
                     e.WhatKind, bv.Name);
@@ -238,24 +238,24 @@ protected override bool VisitOneExpression(Expression expr, BoundsDiscoveryConte
     /// For a list of variables "bvars", returns a list of best bounds for each respective variable.
     /// If no bound is found for a variable "v", then the bound for "v" in the returned list is set to "null".
     /// </summary>
-    public static List<ComprehensionExpr.BoundedPool> DiscoverBestBounds_MultipleVars<VT>(List<VT> bvars, Expression expr,
+    public static List<BoundedPool> DiscoverBestBounds_MultipleVars<VT>(List<VT> bvars, Expression expr,
       bool polarity) where VT : IVariable {
       Contract.Requires(bvars != null);
       Contract.Requires(expr != null);
-      Contract.Ensures(Contract.Result<List<ComprehensionExpr.BoundedPool>>() != null);
+      Contract.Ensures(Contract.Result<List<BoundedPool>>() != null);
       foreach (var bv in bvars) {
         var c = GetImpliedTypeConstraint(bv, bv.Type);
-        expr = polarity ? Expression.CreateAnd(c, expr) : Expression.CreateImplies(c, expr);
+        expr = polarity ? Expression.CreateAnd(c, expr, false) : Expression.CreateImplies(c, expr, false);
       }
       var bests = DiscoverAllBounds_Aux_MultipleVars(bvars, expr, polarity);
       return bests;
     }
 
-    public static List<ComprehensionExpr.BoundedPool> DiscoverBestBounds_MultipleVars_AllowReordering<VT>(List<VT> bvars, Expression expr,
+    public static List<BoundedPool> DiscoverBestBounds_MultipleVars_AllowReordering<VT>(List<VT> bvars, Expression expr,
       bool polarity) where VT : IVariable {
       Contract.Requires(bvars != null);
       Contract.Requires(expr != null);
-      Contract.Ensures(Contract.Result<List<ComprehensionExpr.BoundedPool>>() != null);
+      Contract.Ensures(Contract.Result<List<BoundedPool>>() != null);
       var bounds = DiscoverBestBounds_MultipleVars(bvars, expr, polarity);
       if (bvars.Count > 1) {
         // It may be helpful to try all permutations (or, better yet, to use an algorithm that keeps track of the dependencies
@@ -276,10 +276,10 @@ protected override bool VisitOneExpression(Expression expr, BoundsDiscoveryConte
           } else if (orig != null && me == null) {
             meBetter = -1; break; // end game
           } else if (orig != null && me != null) {
-            if ((orig.Virtues & ComprehensionExpr.BoundedPool.PoolVirtues.Finite) != 0) { meBetter--; }
-            if ((orig.Virtues & ComprehensionExpr.BoundedPool.PoolVirtues.Enumerable) != 0) { meBetter--; }
-            if ((me.Virtues & ComprehensionExpr.BoundedPool.PoolVirtues.Finite) != 0) { meBetter++; }
-            if ((me.Virtues & ComprehensionExpr.BoundedPool.PoolVirtues.Enumerable) != 0) { meBetter++; }
+            if ((orig.Virtues & BoundedPool.PoolVirtues.Finite) != 0) { meBetter--; }
+            if ((orig.Virtues & BoundedPool.PoolVirtues.Enumerable) != 0) { meBetter--; }
+            if ((me.Virtues & BoundedPool.PoolVirtues.Finite) != 0) { meBetter++; }
+            if ((me.Virtues & BoundedPool.PoolVirtues.Enumerable) != 0) { meBetter++; }
           }
         }
         if (meBetter > 0) {
@@ -291,29 +291,29 @@ protected override bool VisitOneExpression(Expression expr, BoundsDiscoveryConte
       return bounds;
     }
 
-    private static List<ComprehensionExpr.BoundedPool> DiscoverAllBounds_Aux_MultipleVars<VT>(List<VT> bvars, Expression expr,
+    private static List<BoundedPool> DiscoverAllBounds_Aux_MultipleVars<VT>(List<VT> bvars, Expression expr,
       bool polarity) where VT : IVariable {
       Contract.Requires(bvars != null);
       Contract.Requires(expr != null);
-      Contract.Ensures(Contract.Result<List<ComprehensionExpr.BoundedPool>>() != null);
-      Contract.Ensures(Contract.Result<List<ComprehensionExpr.BoundedPool>>().Count == bvars.Count);
-      var knownBounds = new List<ComprehensionExpr.BoundedPool>();
+      Contract.Ensures(Contract.Result<List<BoundedPool>>() != null);
+      Contract.Ensures(Contract.Result<List<BoundedPool>>().Count == bvars.Count);
+      var knownBounds = new List<BoundedPool>();
       for (var j = 0; j < bvars.Count; j++) {
         knownBounds.Add(null);
       }
       // Note, in the following loop, it's important to go backwards, because DiscoverAllBounds_Aux_SingleVar assumes "knownBounds" has been
       // filled in for higher-indexed variables.
       for (var j = bvars.Count; 0 <= --j;) {
-        var bounds = DiscoverAllBounds_Aux_SingleVar(bvars, j, expr, polarity, knownBounds);
-        knownBounds[j] = ComprehensionExpr.BoundedPool.GetBest(bounds);
+        var bounds = DiscoverAllBounds_Aux_SingleVar(bvars, j, expr, polarity, knownBounds, out _);
+        knownBounds[j] = BoundedPool.GetBest(bounds);
 #if DEBUG_PRINT
-        if (knownBounds[j] is ComprehensionExpr.IntBoundedPool) {
-          var ib = (ComprehensionExpr.IntBoundedPool)knownBounds[j];
+        if (knownBounds[j] is IntBoundedPool) {
+          var ib = (IntBoundedPool)knownBounds[j];
           var lo = ib.LowerBound == null ? "" : Printer.ExprToString(ib.LowerBound);
           var hi = ib.UpperBound == null ? "" : Printer.ExprToString(ib.UpperBound);
           Console.WriteLine("DEBUG: Bound for var {3}, {0}:  {1} .. {2}", bvars[j].Name, lo, hi, j);
-        } else if (knownBounds[j] is ComprehensionExpr.SetBoundedPool) {
-          Console.WriteLine("DEBUG: Bound for var {2}, {0}:  in {1}", bvars[j].Name, Printer.ExprToString(((ComprehensionExpr.SetBoundedPool)knownBounds[j]).Set), j);
+        } else if (knownBounds[j] is SetBoundedPool) {
+          Console.WriteLine("DEBUG: Bound for var {2}, {0}:  in {1}", bvars[j].Name, Printer.ExprToString(((SetBoundedPool)knownBounds[j]).Set), j);
         } else {
           Console.WriteLine("DEBUG: Bound for var {2}, {0}:  {1}", bvars[j].Name, knownBounds[j], j);
         }
@@ -322,45 +322,56 @@ protected override bool VisitOneExpression(Expression expr, BoundsDiscoveryConte
       return knownBounds;
     }
 
-    public static List<ComprehensionExpr.BoundedPool> DiscoverAllBounds_SingleVar<VT>(VT v, Expression expr) where VT : IVariable {
+    public static List<BoundedPool> DiscoverAllBounds_SingleVar<VT>(VT v, Expression expr,
+      out bool constraintConsistsSolelyOfRangeConstraints) where VT : IVariable {
       expr = Expression.CreateAnd(GetImpliedTypeConstraint(v, v.Type), expr);
-      return DiscoverAllBounds_Aux_SingleVar(new List<VT> { v }, 0, expr, true, new List<ComprehensionExpr.BoundedPool>() { null });
+      return DiscoverAllBounds_Aux_SingleVar(new List<VT> { v }, 0, expr, true,
+        new List<BoundedPool>() { null }, out constraintConsistsSolelyOfRangeConstraints);
     }
 
     /// <summary>
     /// Returns a list of (possibly partial) bounds for "bvars[j]", each of which can be written without mentioning any variable in "bvars[j..]"
     /// that is not bounded.
     /// </summary>
-    private static List<ComprehensionExpr.BoundedPool> DiscoverAllBounds_Aux_SingleVar<VT>(List<VT> bvars, int j, Expression expr,
-      bool polarity, List<ComprehensionExpr.BoundedPool> knownBounds) where VT : IVariable {
+    private static List<BoundedPool> DiscoverAllBounds_Aux_SingleVar<VT>(List<VT> bvars, int j, Expression expr,
+      bool polarity, List<BoundedPool> knownBounds, out bool constraintConsistsSolelyOfRangeConstraints) where VT : IVariable {
       Contract.Requires(bvars != null);
       Contract.Requires(0 <= j && j < bvars.Count);
       Contract.Requires(expr != null);
       Contract.Requires(knownBounds != null);
       Contract.Requires(knownBounds.Count == bvars.Count);
       var bv = bvars[j];
-      var bounds = new List<ComprehensionExpr.BoundedPool>();
+      var bvType = bv.Type.NormalizeToAncestorType();
+      var bounds = new List<BoundedPool>();
 
       // Maybe the type itself gives a bound
-      if (bv.Type.IsBoolType) {
-        bounds.Add(new ComprehensionExpr.BoolBoundedPool());
-      } else if (bv.Type.IsCharType) {
-        bounds.Add(new ComprehensionExpr.CharBoundedPool());
-      } else if (bv.Type.IsDatatype && bv.Type.AsDatatype.HasFinitePossibleValues) {
-        bounds.Add(new ComprehensionExpr.DatatypeBoundedPool(bv.Type.AsDatatype));
-      } else if (bv.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
+      if (bvType.IsBoolType) {
+        bounds.Add(new BoolBoundedPool());
+      } else if (bvType.IsCharType) {
+        bounds.Add(new CharBoundedPool());
+      } else if (bvType.IsDatatype && bvType.AsDatatype.HasFinitePossibleValues) {
+        bounds.Add(new DatatypeBoundedPool(bvType.AsDatatype));
+      } else if (bvType.IsNumericBased(Type.NumericPersuasion.Int)) {
         bounds.Add(new AssignSuchThatStmt.WiggleWaggleBound());
-      } else if (!bv.Type.MayInvolveReferences) {
-        bounds.Add(new ComprehensionExpr.AllocFreeBoundedPool(bv.Type));
+      } else if (!bvType.MayInvolveReferences) {
+        // in the next line, use bv.Type, even though we compared with bvType
+        bounds.Add(new AllocFreeBoundedPool(bv.Type));
       }
 
       // Go through the conjuncts of the range expression to look for bounds.
+      // Only very specific conjuncts qualify for "constraintConsistsSolelyOfRangeConstraints". To make the bookkeeping
+      // of these simple, we count the total number of conjuncts and the number of qualifying conjuncts. Then, after the
+      // loop, we can compare these.
+      var totalNumberOfConjuncts = 0;
+      var conjunctsQualifyingAsRangeConstraints = 0;
       foreach (var conjunct in NormalizedConjuncts(expr, polarity)) {
+        totalNumberOfConjuncts++;
+
         if (conjunct is IdentifierExpr) {
           var ide = (IdentifierExpr)conjunct;
           if (ide.Var == (IVariable)bv) {
-            Contract.Assert(bv.Type.IsBoolType);
-            bounds.Add(new ComprehensionExpr.ExactBoundedPool(Expression.CreateBoolLiteral(Token.NoToken, true)));
+            Contract.Assert(bvType.IsBoolType);
+            bounds.Add(new ExactBoundedPool(Expression.CreateBoolLiteral(Token.NoToken, true)));
           }
           continue;
         }
@@ -371,9 +382,9 @@ protected override bool VisitOneExpression(Expression expr, BoundsDiscoveryConte
             var ide = unary.E.Resolved as IdentifierExpr;
             if (ide != null && ide.Var == (IVariable)bv) {
               if (unary.ResolvedOp == UnaryOpExpr.ResolvedOpcode.BoolNot) {
-                bounds.Add(new ComprehensionExpr.ExactBoundedPool(Expression.CreateBoolLiteral(Token.NoToken, false)));
+                bounds.Add(new ExactBoundedPool(Expression.CreateBoolLiteral(Token.NoToken, false)));
               } else if (unary.ResolvedOp == UnaryOpExpr.ResolvedOpcode.Allocated) {
-                bounds.Add(new ComprehensionExpr.ExplicitAllocatedBoundedPool());
+                bounds.Add(new ExplicitAllocatedBoundedPool());
               }
             }
           }
@@ -397,29 +408,32 @@ protected override bool VisitOneExpression(Expression expr, BoundsDiscoveryConte
         switch (c.ResolvedOp) {
           case BinaryExpr.ResolvedOpcode.InSet:
             if (whereIsBv == 0) {
-              bounds.Add(new ComprehensionExpr.SetBoundedPool(e1, e0.Type, e1.Type.AsSetType.Arg, e1.Type.AsSetType.Finite));
+              var setType = e1.Type.NormalizeToAncestorType().AsSetType;
+              bounds.Add(new SetBoundedPool(e1, e0.Type, setType.Arg, setType.Finite));
             }
             break;
           case BinaryExpr.ResolvedOpcode.Subset:
             if (whereIsBv == 0) {
-              bounds.Add(new ComprehensionExpr.SubSetBoundedPool(e1, e1.Type.AsSetType.Finite));
+              var setType = e1.Type.NormalizeToAncestorType().AsSetType;
+              bounds.Add(new SubSetBoundedPool(e1, setType.Finite));
             } else {
-              bounds.Add(new ComprehensionExpr.SuperSetBoundedPool(e0));
+              bounds.Add(new SuperSetBoundedPool(e0));
             }
             break;
           case BinaryExpr.ResolvedOpcode.InMultiSet:
             if (whereIsBv == 0) {
-              bounds.Add(new ComprehensionExpr.MultiSetBoundedPool(e1, e0.Type, e1.Type.AsMultiSetType.Arg));
+              bounds.Add(new MultiSetBoundedPool(e1, e0.Type, e1.Type.NormalizeToAncestorType().AsMultiSetType.Arg));
             }
             break;
           case BinaryExpr.ResolvedOpcode.InSeq:
-            if (whereIsBv == 0 && e1.Type.AsSeqType is { } seqType) {
-              bounds.Add(new ComprehensionExpr.SeqBoundedPool(e1, e0.Type, seqType.Arg));
+            if (whereIsBv == 0 && e1.Type.NormalizeToAncestorType().AsSeqType is { } seqType) {
+              bounds.Add(new SeqBoundedPool(e1, e0.Type, seqType.Arg));
             }
             break;
           case BinaryExpr.ResolvedOpcode.InMap:
             if (whereIsBv == 0) {
-              bounds.Add(new ComprehensionExpr.MapBoundedPool(e1, e0.Type, e1.Type.AsMapType.Arg, e1.Type.AsMapType.Finite));
+              var mapType = e1.Type.NormalizeToAncestorType().AsMapType;
+              bounds.Add(new MapBoundedPool(e1, e0.Type, mapType.Arg, mapType.Finite));
             }
             break;
           case BinaryExpr.ResolvedOpcode.EqCommon:
@@ -427,8 +441,9 @@ protected override bool VisitOneExpression(Expression expr, BoundsDiscoveryConte
           case BinaryExpr.ResolvedOpcode.SeqEq:
           case BinaryExpr.ResolvedOpcode.MultiSetEq:
           case BinaryExpr.ResolvedOpcode.MapEq:
+            conjunctsQualifyingAsRangeConstraints++;
             var otherOperand = whereIsBv == 0 ? e1 : e0;
-            bounds.Add(new ComprehensionExpr.ExactBoundedPool(otherOperand));
+            bounds.Add(new ExactBoundedPool(otherOperand));
             break;
           case BinaryExpr.ResolvedOpcode.Gt:
           case BinaryExpr.ResolvedOpcode.Ge:
@@ -436,53 +451,56 @@ protected override bool VisitOneExpression(Expression expr, BoundsDiscoveryConte
             throw new cce.UnreachableException(); // promised by postconditions of NormalizedConjunct
           case BinaryExpr.ResolvedOpcode.Lt:
             if (e0.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
+              conjunctsQualifyingAsRangeConstraints++;
               if (whereIsBv == 0) {
                 // bv < E
-                bounds.Add(new ComprehensionExpr.IntBoundedPool(null, e1));
+                bounds.Add(new IntBoundedPool(null, e1));
               } else {
                 // E < bv
-                bounds.Add(new ComprehensionExpr.IntBoundedPool(Expression.CreateIncrement(e0, 1), null));
+                bounds.Add(new IntBoundedPool(Expression.CreateIncrement(e0, 1), null));
               }
             }
             break;
           case BinaryExpr.ResolvedOpcode.Le:
+            conjunctsQualifyingAsRangeConstraints++;
             if (e0.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
               if (whereIsBv == 0) {
                 // bv <= E
-                bounds.Add(new ComprehensionExpr.IntBoundedPool(null, Expression.CreateIncrement(e1, 1)));
+                bounds.Add(new IntBoundedPool(null, Expression.CreateIncrement(e1, 1)));
               } else {
                 // E <= bv
-                bounds.Add(new ComprehensionExpr.IntBoundedPool(e0, null));
+                bounds.Add(new IntBoundedPool(e0, null));
               }
             }
             break;
           case BinaryExpr.ResolvedOpcode.RankLt:
             if (whereIsBv == 0) {
-              bounds.Add(new ComprehensionExpr.DatatypeInclusionBoundedPool(e0.Type.IsIndDatatype));
+              bounds.Add(new DatatypeInclusionBoundedPool(e0.Type.IsIndDatatype));
             }
             break;
           case BinaryExpr.ResolvedOpcode.RankGt:
             if (whereIsBv == 1) {
-              bounds.Add(new ComprehensionExpr.DatatypeInclusionBoundedPool(e1.Type.IsIndDatatype));
+              bounds.Add(new DatatypeInclusionBoundedPool(e1.Type.IsIndDatatype));
             }
             break;
           default:
             break;
         }
       }
+      constraintConsistsSolelyOfRangeConstraints = conjunctsQualifyingAsRangeConstraints == totalNumberOfConjuncts;
       return bounds;
     }
 
-    private static void DiscoverBoundsFunctionCallExpr<VT>(FunctionCallExpr fce, VT boundVariable, List<ComprehensionExpr.BoundedPool> bounds)
+    private static void DiscoverBoundsFunctionCallExpr<VT>(FunctionCallExpr fce, VT boundVariable, List<BoundedPool> bounds)
       where VT : IVariable {
       Contract.Requires(fce != null);
       Contract.Requires(boundVariable != null);
       Contract.Requires(bounds != null);
 
-      var formals = fce.Function.Formals;
+      var formals = fce.Function.Ins;
       Contract.Assert(formals.Count == fce.Args.Count);
       if (Enumerable.Zip(formals, fce.Args).Any(t => t.Item1.IsOlder && t.Item2.Resolved is IdentifierExpr ide && ide.Var == (IVariable)boundVariable)) {
-        bounds.Add(new ComprehensionExpr.OlderBoundedPool());
+        bounds.Add(new OlderBoundedPool());
         return;
       }
     }
@@ -611,7 +629,7 @@ static IEnumerable<Expression> NormalizedConjuncts(Expression expr, bool polarit
             goto JUST_RETURN_IT;
         }
         if (newROp != b.ResolvedOp || swapOperands) {
-          b = new BinaryExpr(b.tok, newOp, swapOperands ? b.E1 : b.E0, swapOperands ? b.E0 : b.E1);
+          b = new BinaryExpr(b.Origin, newOp, swapOperands ? b.E1 : b.E0, swapOperands ? b.E0 : b.E1);
           b.ResolvedOp = newROp;
           b.Type = Type.Bool;
           yield return b;
@@ -622,7 +640,7 @@ static IEnumerable<Expression> NormalizedConjuncts(Expression expr, bool polarit
       if (polarity) {
         yield return expr;
       } else {
-        expr = new UnaryOpExpr(expr.tok, UnaryOpExpr.Opcode.Not, expr);
+        expr = new UnaryOpExpr(expr.Origin, UnaryOpExpr.Opcode.Not, expr);
         expr.Type = Type.Bool;
         yield return expr;
       }
@@ -637,7 +655,7 @@ static IEnumerable<Expression> NormalizedConjuncts(Expression expr, bool polarit
     /// Ensures that the resulting "e0" and "e1" are not ConcreteSyntaxExpression's.
     /// </summary>
     static int SanitizeForBoundDiscovery<VT>(List<VT> boundVars, int bvi, BinaryExpr.ResolvedOpcode op,
-      List<ComprehensionExpr.BoundedPool> knownBounds,
+      List<BoundedPool> knownBounds,
       ref Expression e0, ref Expression e1) where VT : IVariable {
       Contract.Requires(boundVars != null);
       Contract.Requires(0 <= bvi && bvi < boundVars.Count);
@@ -686,16 +704,21 @@ static int SanitizeForBoundDiscovery<VT>(List<VT> boundVars, int bvi, BinaryExpr
           while (true) {
             var bin = thisSide as BinaryExpr;
             if (bin == null) {
-              break; // done simplifying
+              if (thisSide is ConversionExpr conversionExpr &&
+                  thisSide.Type.NormalizeExpand().Equals(conversionExpr.E.Type.NormalizeExpand())) {
+                thisSide = conversionExpr.E.Resolved;
+              } else {
+                break; // done simplifying
+              }
 
             } else if (bin.ResolvedOp == BinaryExpr.ResolvedOpcode.Add) {
               // Change "A+B op C" into either "A op C-B" or "B op C-A", depending on where we find bv among A and B.
               if (!FreeVariables(bin.E1).Contains(bv)) {
                 thisSide = bin.E0.Resolved;
-                thatSide = new BinaryExpr(bin.tok, BinaryExpr.Opcode.Sub, thatSide, bin.E1);
+                thatSide = new BinaryExpr(bin.Origin, BinaryExpr.Opcode.Sub, thatSide, bin.E1);
               } else if (!FreeVariables(bin.E0).Contains(bv)) {
                 thisSide = bin.E1.Resolved;
-                thatSide = new BinaryExpr(bin.tok, BinaryExpr.Opcode.Sub, thatSide, bin.E0);
+                thatSide = new BinaryExpr(bin.Origin, BinaryExpr.Opcode.Sub, thatSide, bin.E0);
               } else {
                 break; // done simplifying
               }
@@ -707,14 +730,14 @@ static int SanitizeForBoundDiscovery<VT>(List<VT> boundVars, int bvi, BinaryExpr
               if (!FreeVariables(bin.E1).Contains(bv)) {
                 // change to "A op C+B"
                 thisSide = bin.E0.Resolved;
-                thatSide = new BinaryExpr(bin.tok, BinaryExpr.Opcode.Add, thatSide, bin.E1);
+                thatSide = new BinaryExpr(bin.Origin, BinaryExpr.Opcode.Add, thatSide, bin.E1);
                 ((BinaryExpr)thatSide).ResolvedOp = BinaryExpr.ResolvedOpcode.Add;
               } else if (!FreeVariables(bin.E0).Contains(bv)) {
                 // In principle, change to "-B op C-A" and then to "B dualOp A-C".  But since we don't want
                 // to change "op", we instead end with "A-C op B" and switch the mapping of thisSide/thatSide
                 // to e0/e1 (by inverting "whereIsBv").
                 thisSide = bin.E1.Resolved;
-                thatSide = new BinaryExpr(bin.tok, BinaryExpr.Opcode.Sub, bin.E0, thatSide);
+                thatSide = new BinaryExpr(bin.Origin, BinaryExpr.Opcode.Sub, bin.E0, thatSide);
                 ((BinaryExpr)thatSide).ResolvedOp = BinaryExpr.ResolvedOpcode.Sub;
                 whereIsBv = 1 - whereIsBv;
               } else {
@@ -735,7 +758,7 @@ static int SanitizeForBoundDiscovery<VT>(List<VT> boundVars, int bvi, BinaryExpr
       Contract.Assert(!FreeVariables(thatSide).Contains(bv));
 
       // Now, see if the interesting side is simply bv itself
-      if (thisSide is IdentifierExpr && ((IdentifierExpr)thisSide).Var == bv) {
+      if (Expression.StripParensAndCasts(thisSide) is IdentifierExpr { Var: var thisSideVar } && thisSideVar == bv) {
         // we're cool
       } else {
         // no, the situation is more complicated than we care to understand
@@ -763,16 +786,15 @@ static int SanitizeForBoundDiscovery<VT>(List<VT> boundVars, int bvi, BinaryExpr
       var fvThatSide = FreeVariables(thatSide);
       for (int j = boundVars.Count; bvi + 1 <= --j;) {
         if (fvThatSide.Contains(boundVars[j])) {
-          if (knownBounds[j] is ComprehensionExpr.IntBoundedPool) {
-            var jBounds = (ComprehensionExpr.IntBoundedPool)knownBounds[j];
+          if (knownBounds[j] is IntBoundedPool jBounds) {
             Expression u = null;
-            if (op == BinaryExpr.ResolvedOpcode.Lt || op == BinaryExpr.ResolvedOpcode.Le) {
+            if (op is BinaryExpr.ResolvedOpcode.Lt or BinaryExpr.ResolvedOpcode.Le) {
               u = whereIsBv == 0 ? jBounds.UpperBound : jBounds.LowerBound;
             } else if (op == BinaryExpr.ResolvedOpcode.Gt || op == BinaryExpr.ResolvedOpcode.Ge) {
               u = whereIsBv == 0 ? jBounds.LowerBound : jBounds.UpperBound;
             }
             if (u != null && !FreeVariables(u).Contains(bv) && IsMonotonic(u, boundVars[j], true)) {
-              thatSide = Translator.Substitute(thatSide, boundVars[j], u);
+              thatSide = BoogieGenerator.Substitute(thatSide, boundVars[j], u);
               fvThatSide = FreeVariables(thatSide);
               continue;
             }
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/CharBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/CharBoundedPool.cs
new file mode 100644
index 00000000000..0ef9e6e6a86
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/CharBoundedPool.cs
@@ -0,0 +1,17 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny;
+
+public class CharBoundedPool : BoundedPool {
+  public override PoolVirtues Virtues =>
+    PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+  public override int Preference() => 5;
+  public override BoundedPool Clone(Cloner cloner) {
+    return this;
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/CollectionBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/CollectionBoundedPool.cs
new file mode 100644
index 00000000000..4561791169f
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/CollectionBoundedPool.cs
@@ -0,0 +1,41 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public abstract class CollectionBoundedPool : BoundedPool {
+  public readonly Type BoundVariableType;
+  public readonly Type CollectionElementType;
+  public readonly bool IsFiniteCollection;
+
+  public CollectionBoundedPool(Type bvType, Type collectionElementType, bool isFiniteCollection) {
+    Contract.Requires(bvType != null);
+    Contract.Requires(collectionElementType != null);
+
+    BoundVariableType = bvType;
+    CollectionElementType = collectionElementType;
+    IsFiniteCollection = isFiniteCollection;
+  }
+
+  public override PoolVirtues Virtues {
+    get {
+      var v = PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc | PoolVirtues.Enumerable;
+      if (IsFiniteCollection) {
+        v |= PoolVirtues.Finite;
+      }
+      return v;
+    }
+  }
+  public override int Preference() => 10;
+  public override bool IsCompilable(Type boundVariableType) {
+    Contract.Assert(boundVariableType.Equals(BoundVariableType));
+    return ExpressionTester.IsTypeTestCompilable(CollectionElementType, BoundVariableType);
+  }
+
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/DatatypeBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/DatatypeBoundedPool.cs
new file mode 100644
index 00000000000..88102d98796
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/DatatypeBoundedPool.cs
@@ -0,0 +1,25 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public class DatatypeBoundedPool : BoundedPool {
+  public readonly DatatypeDecl Decl;
+
+  public DatatypeBoundedPool(DatatypeDecl d) {
+    Contract.Requires(d != null);
+    Decl = d;
+  }
+  public override PoolVirtues Virtues =>
+    PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+  public override int Preference() => 8;
+  public override BoundedPool Clone(Cloner cloner) {
+    return this;
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/DatatypeInlusionBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/DatatypeInlusionBoundedPool.cs
new file mode 100644
index 00000000000..1109e7e8334
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/DatatypeInlusionBoundedPool.cs
@@ -0,0 +1,23 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny;
+
+public class DatatypeInclusionBoundedPool : BoundedPool {
+  public readonly bool IsIndDatatype;
+
+  public DatatypeInclusionBoundedPool(bool isIndDatatype) : base() {
+    IsIndDatatype = isIndDatatype;
+  }
+
+  public override PoolVirtues Virtues =>
+    (IsIndDatatype ? PoolVirtues.Finite : PoolVirtues.None) | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+  public override int Preference() => 2;
+  public override BoundedPool Clone(Cloner cloner) {
+    return this;
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/ExactBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/ExactBoundedPool.cs
new file mode 100644
index 00000000000..50d4074fd93
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/ExactBoundedPool.cs
@@ -0,0 +1,25 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public class ExactBoundedPool : BoundedPool {
+  public readonly Expression E;
+  public ExactBoundedPool(Expression e) {
+    Contract.Requires(e != null);
+    E = e;
+  }
+  public override PoolVirtues Virtues =>
+    PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+  public override int Preference() => 15;  // the best of all bounds
+
+  public override BoundedPool Clone(Cloner cloner) {
+    return new ExactBoundedPool(cloner.CloneExpr(E));
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/ExplicitAllocatedBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/ExplicitAllocatedBoundedPool.cs
new file mode 100644
index 00000000000..322d00126e3
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/ExplicitAllocatedBoundedPool.cs
@@ -0,0 +1,18 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny;
+
+public class ExplicitAllocatedBoundedPool : BoundedPool {
+  public ExplicitAllocatedBoundedPool() {
+  }
+  public override PoolVirtues Virtues => PoolVirtues.Finite | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+  public override int Preference() => 0;
+  public override BoundedPool Clone(Cloner cloner) {
+    return this;
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/IntBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/IntBoundedPool.cs
new file mode 100644
index 00000000000..68b83d8a6f3
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/IntBoundedPool.cs
@@ -0,0 +1,34 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public class IntBoundedPool : BoundedPool {
+  public readonly Expression LowerBound;
+  public readonly Expression UpperBound;
+  public IntBoundedPool(Expression lowerBound, Expression upperBound) {
+    Contract.Requires(lowerBound != null || upperBound != null);
+    LowerBound = lowerBound;
+    UpperBound = upperBound;
+  }
+  public override PoolVirtues Virtues {
+    get {
+      if (LowerBound != null && UpperBound != null) {
+        return PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+      } else {
+        return PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+      }
+    }
+  }
+  public override int Preference() => LowerBound != null && UpperBound != null ? 5 : 4;
+
+  public override BoundedPool Clone(Cloner cloner) {
+    return new IntBoundedPool(cloner.CloneExpr(LowerBound), cloner.CloneExpr(UpperBound));
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/MapBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/MapBoundedPool.cs
new file mode 100644
index 00000000000..407a2468ceb
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/MapBoundedPool.cs
@@ -0,0 +1,25 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public class MapBoundedPool : CollectionBoundedPool {
+  public readonly Expression Map;
+
+  public MapBoundedPool(Expression map, Type bvType, Type collectionElementType, bool isFiniteCollection)
+    : base(bvType, collectionElementType, isFiniteCollection) {
+    Contract.Requires(map != null);
+    Contract.Requires(bvType != null);
+    Contract.Requires(collectionElementType != null);
+    Map = map;
+  }
+  public override BoundedPool Clone(Cloner cloner) {
+    return new MapBoundedPool(cloner.CloneExpr(Map), BoundVariableType, CollectionElementType, IsFiniteCollection);
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/MultiSetBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/MultiSetBoundedPool.cs
new file mode 100644
index 00000000000..a07edeb9cc6
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/MultiSetBoundedPool.cs
@@ -0,0 +1,26 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public class MultiSetBoundedPool : CollectionBoundedPool {
+  public readonly Expression MultiSet;
+
+  public MultiSetBoundedPool(Expression multiset, Type bvType, Type collectionElementType)
+    : base(bvType, collectionElementType, true) {
+    Contract.Requires(multiset != null);
+    Contract.Requires(bvType != null);
+    Contract.Requires(collectionElementType != null);
+    MultiSet = multiset;
+  }
+
+  public override BoundedPool Clone(Cloner cloner) {
+    return new MultiSetBoundedPool(cloner.CloneExpr(MultiSet), BoundVariableType, CollectionElementType);
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/OlderBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/OlderBoundedPool.cs
new file mode 100644
index 00000000000..4f7b79565f9
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/OlderBoundedPool.cs
@@ -0,0 +1,18 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny;
+
+public class OlderBoundedPool : BoundedPool {
+  public OlderBoundedPool() {
+  }
+  public override PoolVirtues Virtues => PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+  public override int Preference() => 0;
+  public override BoundedPool Clone(Cloner cloner) {
+    return this;
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/SeqBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/SeqBoundedPool.cs
new file mode 100644
index 00000000000..385d69bf99d
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/SeqBoundedPool.cs
@@ -0,0 +1,26 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public class SeqBoundedPool : CollectionBoundedPool {
+  public readonly Expression Seq;
+
+  public SeqBoundedPool(Expression seq, Type bvType, Type collectionElementType)
+    : base(bvType, collectionElementType, true) {
+    Contract.Requires(seq != null);
+    Contract.Requires(bvType != null);
+    Contract.Requires(collectionElementType != null);
+    Seq = seq;
+  }
+
+  public override BoundedPool Clone(Cloner cloner) {
+    return new SeqBoundedPool(cloner.CloneExpr(Seq), BoundVariableType, CollectionElementType);
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/SetBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/SetBoundedPool.cs
new file mode 100644
index 00000000000..f18ed223595
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/SetBoundedPool.cs
@@ -0,0 +1,26 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public class SetBoundedPool : CollectionBoundedPool {
+  public readonly Expression Set;
+
+  public SetBoundedPool(Expression set, Type bvType, Type collectionElementType, bool isFiniteCollection)
+    : base(bvType, collectionElementType, isFiniteCollection) {
+    Contract.Requires(set != null);
+    Contract.Requires(bvType != null);
+    Contract.Requires(collectionElementType != null);
+    Set = set;
+  }
+
+  public override BoundedPool Clone(Cloner cloner) {
+    return new SetBoundedPool(cloner.CloneExpr(Set), BoundVariableType, CollectionElementType, IsFiniteCollection);
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/SpecialAllocIndependenceAllocatedBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/SpecialAllocIndependenceAllocatedBoundedPool.cs
new file mode 100644
index 00000000000..27cd67b87f7
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/SpecialAllocIndependenceAllocatedBoundedPool.cs
@@ -0,0 +1,18 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny;
+
+public class SpecialAllocIndependenceAllocatedBoundedPool : BoundedPool {
+  public SpecialAllocIndependenceAllocatedBoundedPool() {
+  }
+  public override PoolVirtues Virtues => PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+  public override int Preference() => 0;
+  public override BoundedPool Clone(Cloner cloner) {
+    return this;
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/SubSetBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/SubSetBoundedPool.cs
new file mode 100644
index 00000000000..675156d7a79
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/SubSetBoundedPool.cs
@@ -0,0 +1,31 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny;
+
+public class SubSetBoundedPool : BoundedPool {
+  public readonly Expression UpperBound;
+  public readonly bool IsFiniteCollection;
+  public SubSetBoundedPool(Expression set, bool isFiniteCollection) {
+    UpperBound = set;
+    IsFiniteCollection = isFiniteCollection;
+  }
+  public override PoolVirtues Virtues {
+    get {
+      if (IsFiniteCollection) {
+        return PoolVirtues.Finite | PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+      } else {
+        // it's still enumerable, because at run time, all sets are finite after all
+        return PoolVirtues.Enumerable | PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+      }
+    }
+  }
+  public override int Preference() => 3;
+  public override BoundedPool Clone(Cloner cloner) {
+    return new SubSetBoundedPool(cloner.CloneExpr(UpperBound), IsFiniteCollection);
+  }
+}
diff --git a/Source/DafnyCore/Resolver/BoundsDiscovery/SuperSetBoundedPool.cs b/Source/DafnyCore/Resolver/BoundsDiscovery/SuperSetBoundedPool.cs
new file mode 100644
index 00000000000..24ca2853105
--- /dev/null
+++ b/Source/DafnyCore/Resolver/BoundsDiscovery/SuperSetBoundedPool.cs
@@ -0,0 +1,27 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny;
+
+public class SuperSetBoundedPool : BoundedPool {
+  public readonly Expression LowerBound;
+  public SuperSetBoundedPool(Expression set) { LowerBound = set; }
+  public override int Preference() => 2;
+  public override BoundedPool Clone(Cloner cloner) {
+    return new SuperSetBoundedPool(cloner.CloneExpr(LowerBound));
+  }
+
+  public override PoolVirtues Virtues {
+    get {
+      if (LowerBound.Type.MayInvolveReferences) {
+        return PoolVirtues.None;
+      } else {
+        return PoolVirtues.IndependentOfAlloc | PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc;
+      }
+    }
+  }
+}
diff --git a/Source/DafnyCore/Resolver/CallGraphBuilder.cs b/Source/DafnyCore/Resolver/CallGraphBuilder.cs
index d6377bfb229..17e88a9d71f 100644
--- a/Source/DafnyCore/Resolver/CallGraphBuilder.cs
+++ b/Source/DafnyCore/Resolver/CallGraphBuilder.cs
@@ -204,16 +204,16 @@ protected override bool VisitOneExpression(Expression expr, CallGraphBuilderCont
       /// </summary>
       private bool IsFunctionReturnValue(Function fn, Expression receiver, List<Expression> args, CallGraphBuilderContext context) {
         if (context.CodeContext == fn && context.InFunctionPostcondition) {
-          Contract.Assert(fn.Formals.Count == args.Count);
+          Contract.Assert(fn.Ins.Count == args.Count);
           return
             (fn.IsStatic || receiver.Resolved is ThisExpr) &&
-            Enumerable.Range(0, args.Count).All(i => (args[i].Resolved as IdentifierExpr)?.Var == fn.Formals[i]);
+            Enumerable.Range(0, args.Count).All(i => (args[i].Resolved as IdentifierExpr)?.Var == fn.Ins[i]);
         }
         return false;
       }
 
       protected override bool VisitOneStatement(Statement stmt, CallGraphBuilderContext context) {
-        if (stmt is AssignStmt assignStmt) {
+        if (stmt is SingleAssignStmt assignStmt) {
           // check on assumption variables
           if (context.CodeContext is Method currentMethod &&
               (assignStmt.Lhs.Resolved as IdentifierExpr)?.Var is LocalVariable localVar &&
@@ -249,7 +249,7 @@ private void AddCallGraphEdgeForField(IASTVisitorContext callingContext, Field f
         if (field is ConstantField cf) {
           if (cf == callingContext) {
             // detect self-loops here, since they don't show up in the graph's SSC methods
-            reporter.Error(MessageSource.Resolver, cf.tok, "recursive dependency involving constant initialization: {0} -> {0}", cf.Name);
+            reporter.Error(MessageSource.Resolver, cf.Origin, "recursive dependency involving constant initialization: {0} -> {0}", cf.Name);
           } else {
             AddCallGraphEdge(callingContext, cf, e, false);
           }
@@ -266,7 +266,16 @@ private void AddCallGraphEdge(CallStmt s, CallGraphBuilderContext context) {
         ModuleDefinition callerModule = context.CodeContext.EnclosingModule;
         ModuleDefinition calleeModule = ((IASTVisitorContext)callee).EnclosingModule;
         if (callerModule != calleeModule) {
-          // inter-module call; don't record in call graph
+          // inter-module call; add edge in module's inter-module call graph
+          if (context.CodeContext is ICallable caller0) {
+            if (caller0 is IteratorDecl iteratorDecl) {
+              // use the MoveNext() method as the caller
+              callerModule.InterModuleCallGraph.AddEdge(iteratorDecl.Member_MoveNext, callee);
+            } else {
+              callerModule.InterModuleCallGraph.AddEdge(caller0, callee);
+            }
+          }
+
           return;
         }
 
@@ -294,10 +303,19 @@ public static void AddCallGraphEdge(IASTVisitorContext callingContext, ICallable
         ModuleDefinition callerModule = callingContext.EnclosingModule;
         ModuleDefinition calleeModule = callable is SpecialFunction ? null : callable.EnclosingModule;
         if (callerModule != calleeModule) {
-          // inter-module call; don't record in call graph
+          // inter-module call; add edge in module's inter-module call graph
           if (callingContext is ICallable context && callable is Function { EnclosingClass: TraitDecl }) {
             callerModule.CallGraph.AddEdge(context, callable);
           }
+          if (callingContext is ICallable caller0) {
+            callerModule.InterModuleCallGraph.AddEdge(caller0, callable);
+            if (caller0 is Function f) {
+              if (e is FunctionCallExpr ee) {
+                // f.AllCalls.Add(ee);
+              }
+            }
+          }
+
           return;
         }
 
diff --git a/Source/DafnyCore/Resolver/CheckDividedConstructorInitVisitor.cs b/Source/DafnyCore/Resolver/CheckDividedConstructorInitVisitor.cs
new file mode 100644
index 00000000000..0a1ece212b3
--- /dev/null
+++ b/Source/DafnyCore/Resolver/CheckDividedConstructorInitVisitor.cs
@@ -0,0 +1,130 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+class CheckDividedConstructorInitVisitor : ResolverTopDownVisitor<int> {
+  public CheckDividedConstructorInitVisitor(ErrorReporter reporter)
+    : base(reporter) {
+    Contract.Requires(reporter != null);
+  }
+  public void CheckInit(List<Statement> initStmts) {
+    Contract.Requires(initStmts != null);
+    initStmts.ForEach(CheckInit);
+  }
+  /// <summary>
+  /// This method almost does what Visit(Statement) does, except that it handles assignments to
+  /// fields differently.
+  /// </summary>
+  void CheckInit(Statement stmt) {
+    Contract.Requires(stmt != null);
+    // Visit(stmt) would do:
+    //     stmt.SubExpressions.Iter(Visit);    (*)
+    //     stmt.SubStatements.Iter(Visit);     (**)
+    //     VisitOneStmt(stmt);                 (***)
+    // We may do less for (*), we always use CheckInit instead of Visit in (**), and we do (***) the same.
+    if (stmt is SingleAssignStmt) {
+      var s = stmt as SingleAssignStmt;
+      // The usual visitation of s.SubExpressions.Iter(Visit) would do the following:
+      //   Attributes.SubExpressions(s.Attributes).Iter(Visit);  (+)
+      //   Visit(s.Lhs);                                         (++)
+      //   s.Rhs.SubExpressions.Iter(Visit);                     (+++)
+      // Here, we may do less; in particular, we may omit (++).
+      Attributes.SubExpressions(s.Attributes).ForEach(VisitExpr);  // (+)
+      var mse = s.Lhs as MemberSelectExpr;
+      if (mse != null && Expression.AsThis(mse.Obj) != null) {
+        if (s.Rhs is ExprRhs) {
+          // This is a special case we allow.  Omit s.Lhs in the recursive visits.  That is, we omit (++).
+          // Furthermore, because the assignment goes to a field of "this" and won't be available until after
+          // the "new;", we can allow certain specific (and useful) uses of "this" in the RHS.
+          s.Rhs.SubExpressions.ForEach(LiberalRHSVisit);  // (+++)
+        } else {
+          s.Rhs.SubExpressions.ForEach(VisitExpr);  // (+++)
+        }
+      } else {
+        VisitExpr(s.Lhs);  // (++)
+        s.Rhs.SubExpressions.ForEach(VisitExpr);  // (+++)
+      }
+    } else {
+      stmt.SubExpressions.ForEach(VisitExpr);  // (*)
+    }
+    stmt.SubStatements.ForEach(CheckInit);  // (**)
+    int dummy = 0;
+    VisitOneStmt(stmt, ref dummy);  // (***)
+  }
+  void VisitExpr(Expression expr) {
+    Contract.Requires(expr != null);
+    Visit(expr, 0);
+  }
+  protected override bool VisitOneExpr(Expression expr, ref int unused) {
+    if (expr is MemberSelectExpr) {
+      var e = (MemberSelectExpr)expr;
+      if (e.Member.IsInstanceIndependentConstant && Expression.AsThis(e.Obj) != null) {
+        return false;  // don't continue the recursion
+      }
+    } else if (expr is UnaryOpExpr { Op: UnaryOpExpr.Opcode.Assigned }) {
+      return false;  // don't continue the recursion
+    } else if (expr is ThisExpr && !(expr is ImplicitThisExprConstructorCall)) {
+      reporter.Error(MessageSource.Resolver, expr.Origin, "in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields");
+    }
+    return base.VisitOneExpr(expr, ref unused);
+  }
+  void LiberalRHSVisit(Expression expr) {
+    Contract.Requires(expr != null);
+    // It is important not to allow "this" to flow into something that can be used (for compilation or
+    // verification purposes) before the "new;", because, to the verifier, "this" has not yet been allocated.
+    // The verifier is told that everything reachable from the heap is expected to be allocated and satisfy all
+    // the usual properties, so "this" had better not become reachable from the heap until after the "new;"
+    // that does the actual allocation of "this".
+    // Within these restrictions, we can allow the (not yet fully available) value "this" to flow into values
+    // stored in fields of "this".  Such values are naked occurrences of "this" and "this" occurring
+    // as part of constructing a value type.  Since by this rule, "this" may be part of the value stored in
+    // a field of "this", we must apply the same rules to uses of the values of fields of "this".
+    if (expr is ConcreteSyntaxExpression) {
+    } else if (expr is ThisExpr) {
+    } else if (expr is MemberSelectExpr && IsThisDotField((MemberSelectExpr)expr)) {
+    } else if (expr is SetDisplayExpr) {
+    } else if (expr is MultiSetDisplayExpr) {
+    } else if (expr is SeqDisplayExpr) {
+    } else if (expr is MapDisplayExpr) {
+    } else if (expr is BinaryExpr && IsCollectionOperator(((BinaryExpr)expr).ResolvedOp)) {
+    } else if (expr is DatatypeValue) {
+    } else if (expr is ITEExpr) {
+      var e = (ITEExpr)expr;
+      VisitExpr(e.Test);
+      LiberalRHSVisit(e.Thn);
+      LiberalRHSVisit(e.Els);
+      return;
+    } else {
+      // defer to the usual Visit
+      VisitExpr(expr);
+      return;
+    }
+    expr.SubExpressions.ForEach(LiberalRHSVisit);
+  }
+  static bool IsThisDotField(MemberSelectExpr expr) {
+    Contract.Requires(expr != null);
+    return Expression.AsThis(expr.Obj) != null && expr.Member is Field;
+  }
+  static bool IsCollectionOperator(BinaryExpr.ResolvedOpcode op) {
+    switch (op) {
+      // sets:  +, *, -
+      case BinaryExpr.ResolvedOpcode.Union:
+      case BinaryExpr.ResolvedOpcode.Intersection:
+      case BinaryExpr.ResolvedOpcode.SetDifference:
+      // multisets: +, *, -
+      case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+      case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+      case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+      // sequences: +
+      case BinaryExpr.ResolvedOpcode.Concat:
+      // maps: +, -
+      case BinaryExpr.ResolvedOpcode.MapMerge:
+      case BinaryExpr.ResolvedOpcode.MapSubtraction:
+        return true;
+      default:
+        return false;
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/CheckDividedConstructorInit_Visitor.cs b/Source/DafnyCore/Resolver/CheckDividedConstructorInit_Visitor.cs
deleted file mode 100644
index 3c88cafc9bb..00000000000
--- a/Source/DafnyCore/Resolver/CheckDividedConstructorInit_Visitor.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using Microsoft.Boogie;
-
-namespace Microsoft.Dafny;
-
-class CheckDividedConstructorInit_Visitor : ResolverTopDownVisitor<int> {
-  public CheckDividedConstructorInit_Visitor(ErrorReporter reporter)
-    : base(reporter) {
-    Contract.Requires(reporter != null);
-  }
-  public void CheckInit(List<Statement> initStmts) {
-    Contract.Requires(initStmts != null);
-    initStmts.ForEach(CheckInit);
-  }
-  /// <summary>
-  /// This method almost does what Visit(Statement) does, except that it handles assignments to
-  /// fields differently.
-  /// </summary>
-  void CheckInit(Statement stmt) {
-    Contract.Requires(stmt != null);
-    // Visit(stmt) would do:
-    //     stmt.SubExpressions.Iter(Visit);    (*)
-    //     stmt.SubStatements.Iter(Visit);     (**)
-    //     VisitOneStmt(stmt);                 (***)
-    // We may do less for (*), we always use CheckInit instead of Visit in (**), and we do (***) the same.
-    if (stmt is AssignStmt) {
-      var s = stmt as AssignStmt;
-      // The usual visitation of s.SubExpressions.Iter(Visit) would do the following:
-      //   Attributes.SubExpressions(s.Attributes).Iter(Visit);  (+)
-      //   Visit(s.Lhs);                                         (++)
-      //   s.Rhs.SubExpressions.Iter(Visit);                     (+++)
-      // Here, we may do less; in particular, we may omit (++).
-      Attributes.SubExpressions(s.Attributes).ForEach(VisitExpr);  // (+)
-      var mse = s.Lhs as MemberSelectExpr;
-      if (mse != null && Expression.AsThis(mse.Obj) != null) {
-        if (s.Rhs is ExprRhs) {
-          // This is a special case we allow.  Omit s.Lhs in the recursive visits.  That is, we omit (++).
-          // Furthermore, because the assignment goes to a field of "this" and won't be available until after
-          // the "new;", we can allow certain specific (and useful) uses of "this" in the RHS.
-          s.Rhs.SubExpressions.ForEach(LiberalRHSVisit);  // (+++)
-        } else {
-          s.Rhs.SubExpressions.ForEach(VisitExpr);  // (+++)
-        }
-      } else {
-        VisitExpr(s.Lhs);  // (++)
-        s.Rhs.SubExpressions.ForEach(VisitExpr);  // (+++)
-      }
-    } else {
-      stmt.SubExpressions.ForEach(VisitExpr);  // (*)
-    }
-    stmt.SubStatements.ForEach(CheckInit);  // (**)
-    int dummy = 0;
-    VisitOneStmt(stmt, ref dummy);  // (***)
-  }
-  void VisitExpr(Expression expr) {
-    Contract.Requires(expr != null);
-    Visit(expr, 0);
-  }
-  protected override bool VisitOneExpr(Expression expr, ref int unused) {
-    if (expr is MemberSelectExpr) {
-      var e = (MemberSelectExpr)expr;
-      if (e.Member.IsInstanceIndependentConstant && Expression.AsThis(e.Obj) != null) {
-        return false;  // don't continue the recursion
-      }
-    } else if (expr is ThisExpr && !(expr is ImplicitThisExpr_ConstructorCall)) {
-      reporter.Error(MessageSource.Resolver, expr.tok, "in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields");
-    }
-    return base.VisitOneExpr(expr, ref unused);
-  }
-  void LiberalRHSVisit(Expression expr) {
-    Contract.Requires(expr != null);
-    // It is important not to allow "this" to flow into something that can be used (for compilation or
-    // verification purposes) before the "new;", because, to the verifier, "this" has not yet been allocated.
-    // The verifier is told that everything reachable from the heap is expected to be allocated and satisfy all
-    // the usual properties, so "this" had better not become reachable from the heap until after the "new;"
-    // that does the actual allocation of "this".
-    // Within these restrictions, we can allow the (not yet fully available) value "this" to flow into values
-    // stored in fields of "this".  Such values are naked occurrences of "this" and "this" occurring
-    // as part of constructing a value type.  Since by this rule, "this" may be part of the value stored in
-    // a field of "this", we must apply the same rules to uses of the values of fields of "this".
-    if (expr is ConcreteSyntaxExpression) {
-    } else if (expr is ThisExpr) {
-    } else if (expr is MemberSelectExpr && IsThisDotField((MemberSelectExpr)expr)) {
-    } else if (expr is SetDisplayExpr) {
-    } else if (expr is MultiSetDisplayExpr) {
-    } else if (expr is SeqDisplayExpr) {
-    } else if (expr is MapDisplayExpr) {
-    } else if (expr is BinaryExpr && IsCollectionOperator(((BinaryExpr)expr).ResolvedOp)) {
-    } else if (expr is DatatypeValue) {
-    } else if (expr is ITEExpr) {
-      var e = (ITEExpr)expr;
-      VisitExpr(e.Test);
-      LiberalRHSVisit(e.Thn);
-      LiberalRHSVisit(e.Els);
-      return;
-    } else {
-      // defer to the usual Visit
-      VisitExpr(expr);
-      return;
-    }
-    expr.SubExpressions.ForEach(LiberalRHSVisit);
-  }
-  static bool IsThisDotField(MemberSelectExpr expr) {
-    Contract.Requires(expr != null);
-    return Expression.AsThis(expr.Obj) != null && expr.Member is Field;
-  }
-  static bool IsCollectionOperator(BinaryExpr.ResolvedOpcode op) {
-    switch (op) {
-      // sets:  +, *, -
-      case BinaryExpr.ResolvedOpcode.Union:
-      case BinaryExpr.ResolvedOpcode.Intersection:
-      case BinaryExpr.ResolvedOpcode.SetDifference:
-      // multisets: +, *, -
-      case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-      case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-      case BinaryExpr.ResolvedOpcode.MultiSetDifference:
-      // sequences: +
-      case BinaryExpr.ResolvedOpcode.Concat:
-      // maps: +, -
-      case BinaryExpr.ResolvedOpcode.MapMerge:
-      case BinaryExpr.ResolvedOpcode.MapSubtraction:
-        return true;
-      default:
-        return false;
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/CheckLocalityVisitor.cs b/Source/DafnyCore/Resolver/CheckLocalityVisitor.cs
new file mode 100644
index 00000000000..e4c26870e88
--- /dev/null
+++ b/Source/DafnyCore/Resolver/CheckLocalityVisitor.cs
@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+class CheckLocalityVisitor : ResolverBottomUpVisitor {
+  readonly ICodeContext codeContext;
+  public CheckLocalityVisitor(ModuleResolver resolver, ICodeContext codeContext)
+    : base(resolver) {
+    Contract.Requires(resolver != null);
+    Contract.Requires(codeContext != null);
+    this.codeContext = codeContext;
+  }
+  protected override void VisitOneExpr(Expression expr) {
+    if (expr is StmtExpr) {
+      var e = (StmtExpr)expr;
+      resolver.ComputeGhostInterest(e.S, true, "a statement expression", codeContext);
+    } else if (expr is LetExpr) {
+      var e = (LetExpr)expr;
+      if (codeContext.IsGhost) {
+        foreach (var bv in e.BoundVars) {
+          bv.MakeGhost();
+        }
+      }
+    }
+  }
+
+  protected override void VisitOneStmt(Statement stmt) {
+    switch (stmt) {
+      case CalcStmt calc: {
+          foreach (var h in calc.Hints) {
+            resolver.CheckLocalityUpdates(h, new HashSet<LocalVariable>(), "a hint");
+          }
+
+          break;
+        }
+      case BlockByProofStmt blockByProofStmt:
+        resolver.CheckLocalityUpdates(blockByProofStmt.Proof, new HashSet<LocalVariable>(), "a by block");
+        break;
+      case ForallStmt { Body: not null } forall:
+        resolver.CheckLocalityUpdates(forall.Body, new HashSet<LocalVariable>(), "a forall statement");
+        break;
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/CheckMapRangeSupportsEquality.cs b/Source/DafnyCore/Resolver/CheckMapRangeSupportsEquality.cs
new file mode 100644
index 00000000000..63450000ae9
--- /dev/null
+++ b/Source/DafnyCore/Resolver/CheckMapRangeSupportsEquality.cs
@@ -0,0 +1,49 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// This checker ensures that if the set of values or the set of items
+/// of a map is used, then its range type supports equality.
+/// </summary>
+class CheckMapRangeSupportsEquality : ASTVisitor<IASTVisitorContext> {
+  private readonly ErrorReporter reporter;
+
+  public CheckMapRangeSupportsEquality(ErrorReporter reporter) {
+    this.reporter = reporter;
+  }
+
+  public override IASTVisitorContext GetContext(IASTVisitorContext astVisitorContext, bool inFunctionPostcondition) {
+    return astVisitorContext;
+  }
+
+  protected override bool VisitOneExpression(Expression expr, IASTVisitorContext context) {
+
+    if (context is MemberDecl) {
+      var member = (MemberDecl)context;
+      if (member.IsGhost) {
+        return base.VisitOneExpression(expr, context);
+      }
+    }
+
+    if (expr is ExprDotName) {
+      var e = (ExprDotName)expr;
+      // Condition 1: the left-hand side is not a module and has a type
+      // Condition 2: the left-hand side is a map
+      // Condition 3: the expression produces a set that contains values from the range
+      if (e.Lhs.Type != null && e.Lhs.Type.IsMapType && (e.SuffixName == "Values" || e.SuffixName == "Items")) {
+        // The type of the range must support equality
+        if (!e.Lhs.Type.AsMapType.Range.SupportsEquality) {
+          reporter.Error(MessageSource.Resolver, expr,
+            $"Cannot compute the set of {e.SuffixName} because the type of the range of the map ({e.Lhs.Type.AsMapType.Range}) does not support equality.");
+        }
+      }
+    }
+    return base.VisitOneExpression(expr, context);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/CheckTypeCharacteristicsVisitor.cs b/Source/DafnyCore/Resolver/CheckTypeCharacteristicsVisitor.cs
new file mode 100644
index 00000000000..e963fbc48d9
--- /dev/null
+++ b/Source/DafnyCore/Resolver/CheckTypeCharacteristicsVisitor.cs
@@ -0,0 +1,438 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// This visitor checks that type characteristics are respected in all (implicitly or explicitly)
+/// declared types. Note that equality-support is checked only in compiled contexts.
+/// In addition, this visitor checks that operations that require equality are applied to
+/// types that really do support equality; this, too, is checked only in compiled contexts.
+/// </summary>
+class CheckTypeCharacteristicsVisitor : ResolverTopDownVisitor<bool> {
+  public CheckTypeCharacteristicsVisitor(ErrorReporter reporter)
+    : base(reporter) {
+    Contract.Requires(reporter != null);
+  }
+
+
+  public static bool CanCompareWith(Expression expr) {
+    Contract.Requires(expr != null);
+    if (expr.Type.SupportsEquality) {
+      return true;
+    }
+    expr = expr.Resolved;
+    if (expr is DatatypeValue datatypeValue && !datatypeValue.Ctor.EnclosingDatatype.HasGhostVariant) {
+      for (var i = 0; i < datatypeValue.Ctor.Formals.Count; i++) {
+        if (datatypeValue.Ctor.Formals[i].IsGhost) {
+          return false;
+        } else if (!CanCompareWith(datatypeValue.Arguments[i])) {
+          return false;
+        }
+      }
+      return true;
+    } else if (expr is DisplayExpression) {
+      var e = (DisplayExpression)expr;
+      return e.Elements.Count == 0;
+    } else if (expr is MapDisplayExpr) {
+      var e = (MapDisplayExpr)expr;
+      return e.Elements.Count == 0;
+    }
+    return false;
+  }
+
+  protected override bool VisitOneStmt(Statement stmt, ref bool inGhostContext) {
+    if (stmt.IsGhost) {
+      inGhostContext = true;
+    }
+    // In the sequel, do two things:
+    //  * Call VisitType on any type that occurs in the statement
+    //  * If the statement introduces ghost components, handle those components here
+    //    rather than letting the default visitor handle them
+    if (stmt is VarDeclStmt) {
+      var s = (VarDeclStmt)stmt;
+      foreach (var v in s.Locals) {
+        VisitType(v.Origin, v.Type, inGhostContext || v.IsGhost);
+      }
+    } else if (stmt is VarDeclPattern) {
+      var s = (VarDeclPattern)stmt;
+      foreach (var v in s.LocalVars) {
+        VisitType(v.Origin, v.Type, inGhostContext || v.IsGhost);
+      }
+    } else if (stmt is SingleAssignStmt) {
+      var s = (SingleAssignStmt)stmt;
+      if (s.Rhs is TypeRhs tRhs) {
+        VisitType(tRhs.Origin, tRhs.Type, inGhostContext);
+      }
+    } else if (stmt is AssignSuchThatStmt) {
+      var s = (AssignSuchThatStmt)stmt;
+      Visit(Attributes.SubExpressions(s.Attributes), true);
+      Visit(s.Expr, inGhostContext);
+      foreach (var lhs in s.Lhss) {
+        Visit(lhs, inGhostContext);
+      }
+      return false;
+    } else if (stmt is WhileStmt) {
+      var s = (WhileStmt)stmt;
+      // all subexpressions are ghost, except the guard
+      Visit(s.LoopSpecificationExpressions, true);
+      if (s.Guard != null) {
+        Visit(s.Guard, inGhostContext);
+      }
+      Visit(s.SubStatements, inGhostContext);
+      return false;
+    } else if (stmt is AlternativeLoopStmt) {
+      var s = (AlternativeLoopStmt)stmt;
+      // all subexpressions are ghost, except the guards
+      Visit(s.LoopSpecificationExpressions, true);
+      foreach (var alt in s.Alternatives) {
+        Visit(alt.Guard, inGhostContext);
+      }
+      Visit(s.SubStatements, inGhostContext);
+      return false;
+    } else if (stmt is ForLoopStmt) {
+      var s = (ForLoopStmt)stmt;
+      // all subexpressions are ghost, except the bounds
+      Visit(s.LoopSpecificationExpressions, true);
+      Visit(s.Start, inGhostContext);
+      if (s.End != null) {
+        Visit(s.End, inGhostContext);
+      }
+      Visit(s.SubStatements, inGhostContext);
+      return false;
+    } else if (stmt is CallStmt) {
+      var s = (CallStmt)stmt;
+      CheckTypeInstantiation(s.Origin, s.Method.WhatKind, s.Method.Name, s.Method.TypeArgs, s.MethodSelect.TypeApplicationJustMember, inGhostContext);
+      // recursively visit all subexpressions, noting that some of them may correspond to ghost formal parameters
+      Contract.Assert(s.Lhs.Count == s.Method.Outs.Count);
+      for (var i = 0; i < s.Method.Outs.Count; i++) {
+        Visit(s.Lhs[i], inGhostContext || s.Method.Outs[i].IsGhost);
+      }
+      Visit(s.Receiver, inGhostContext);
+      Contract.Assert(s.Args.Count == s.Method.Ins.Count);
+      for (var i = 0; i < s.Method.Ins.Count; i++) {
+        Visit(s.Args[i], inGhostContext || s.Method.Ins[i].IsGhost);
+      }
+      return false;
+    } else if (stmt is ForallStmt) {
+      var s = (ForallStmt)stmt;
+      foreach (var v in s.BoundVars) {
+        VisitType(v.Origin, v.Type, inGhostContext);
+      }
+      // do substatements and subexpressions, noting that ensures clauses are ghost
+      Visit(Attributes.SubExpressions(s.Attributes), true);
+      if (s.Range != null) {
+        Visit(s.Range, inGhostContext);
+      }
+      foreach (var ee in s.Ens) {
+        Visit(Attributes.SubExpressions(ee.Attributes), true);
+        Visit(ee.E, true);
+      }
+      Visit(s.SubStatements, inGhostContext);
+      return false;
+    } else if (stmt is ExpectStmt) {
+      var s = (ExpectStmt)stmt;
+      Visit(Attributes.SubExpressions(s.Attributes), true);
+      Visit(s.Expr, inGhostContext);
+      if (s.Message != null) {
+        Visit(s.Message, inGhostContext);
+      }
+      return false;
+    }
+    return true;
+  }
+
+  protected override bool VisitOneExpr(Expression expr, ref bool inGhostContext) {
+    // Do two things:
+    //  * Call VisitType on any type that occurs in the statement
+    //  * If the expression introduces ghost components, handle those components here
+    //    rather than letting the default visitor handle them
+    if (expr is BinaryExpr && !inGhostContext) {
+      var e = (BinaryExpr)expr;
+      var t0 = e.E0.Type.NormalizeExpand();
+      var t1 = e.E1.Type.NormalizeExpand();
+      switch (e.Op) {
+        case BinaryExpr.Opcode.Eq:
+        case BinaryExpr.Opcode.Neq:
+          if (t0.IsTraitType || t1.IsTraitType) {
+            // Non-reference-type traits do not support equality, but reference-trait types do.
+            if (!t0.SupportsEquality) {
+              reporter.Error(MessageSource.Resolver, e.E0, "{0} can only be applied to expressions of types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t0, TypeEqualityErrorMessageHint(t0));
+            } else if (!t1.SupportsEquality) {
+              reporter.Error(MessageSource.Resolver, e.E1, "{0} can only be applied to expressions of types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t1, TypeEqualityErrorMessageHint(t1));
+            }
+          } else if (CanCompareWith(e.E0) || CanCompareWith(e.E1)) {
+            // These are special cases with values that can always be compared against--for example, a datatype value (like Nil) that takes no parameters
+          } else if (!t0.PartiallySupportsEquality) {
+            reporter.Error(MessageSource.Resolver, e.E0, "{0} can only be applied to expressions of types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t0, TypeEqualityErrorMessageHint(t0));
+          } else if (!t1.PartiallySupportsEquality) {
+            reporter.Error(MessageSource.Resolver, e.E1, "{0} can only be applied to expressions of types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t1, TypeEqualityErrorMessageHint(t1));
+          }
+          break;
+        default:
+          switch (e.ResolvedOp) {
+            // Note, all operations on sets, multisets, and maps are guaranteed to work because of restrictions placed on how
+            // these types are instantiated.  (Except: This guarantee does not apply to equality on maps, because the Range type
+            // of maps is not restricted, only the Domain type.  However, the equality operator is checked above.)
+            case BinaryExpr.ResolvedOpcode.InSeq:
+            case BinaryExpr.ResolvedOpcode.NotInSeq:
+            case BinaryExpr.ResolvedOpcode.Prefix:
+            case BinaryExpr.ResolvedOpcode.ProperPrefix:
+              if (!t1.SupportsEquality) {
+                reporter.Error(MessageSource.Resolver, e.E1, "{0} can only be applied to expressions of sequence types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t1, TypeEqualityErrorMessageHint(t1));
+              } else if (!t0.SupportsEquality) {
+                if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.InSet || e.ResolvedOp == BinaryExpr.ResolvedOpcode.NotInSeq) {
+                  reporter.Error(MessageSource.Resolver, e.E0, "{0} can only be applied to expressions of types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t0, TypeEqualityErrorMessageHint(t0));
+                } else {
+                  reporter.Error(MessageSource.Resolver, e.E0, "{0} can only be applied to expressions of sequence types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t0, TypeEqualityErrorMessageHint(t0));
+                }
+              }
+              break;
+            default:
+              break;
+          }
+          break;
+      }
+    } else if (expr is ComprehensionExpr) {
+      var e = (ComprehensionExpr)expr;
+      foreach (var bv in e.BoundVars) {
+        VisitType(bv.Origin, bv.Type, inGhostContext);
+      }
+    } else if (expr is LetExpr) {
+      var e = (LetExpr)expr;
+      Visit(Attributes.SubExpressions(e.Attributes), true);
+      if (e.Exact) {
+        Contract.Assert(e.LHSs.Count == e.RHSs.Count);
+        for (var i = 0; i < e.LHSs.Count; i++) {
+          // The VisitPattern function visits all BoundVar's in a pattern and returns
+          // "true" if all variables are ghost.
+          bool VisitPattern(CasePattern<BoundVar> pat, bool patternGhostContext) {
+            if (pat.Var != null) {
+              VisitType(pat.Origin, pat.Var.Type, patternGhostContext || pat.Var.IsGhost);
+              return pat.Var.IsGhost;
+            } else {
+              var allGhost = true;
+              Contract.Assert(pat.Ctor != null);
+              Contract.Assert(pat.Ctor.Formals.Count == pat.Arguments.Count);
+              for (var i = 0; i < pat.Ctor.Formals.Count; i++) {
+                var formal = pat.Ctor.Formals[i];
+                var arg = pat.Arguments[i];
+                // don't use short-circuit booleans in the following line, because we want to visit all nested patterns
+                allGhost &= VisitPattern(arg, patternGhostContext || formal.IsGhost);
+              }
+              return allGhost;
+            }
+          }
+
+          var allGhosts = VisitPattern(e.LHSs[i], inGhostContext);
+          Visit(e.RHSs[i], inGhostContext || allGhosts);
+        }
+      } else {
+        Contract.Assert(e.RHSs.Count == 1);
+        var allGhost = true;
+        foreach (var bv in e.BoundVars) {
+          if (!bv.IsGhost) {
+            allGhost = false;
+          }
+          VisitType(bv.Origin, bv.Type, inGhostContext || bv.IsGhost);
+        }
+        Visit(e.RHSs[0], inGhostContext || allGhost);
+      }
+      Visit(e.Body, inGhostContext);
+      return false;
+    } else if (expr is MemberSelectExpr) {
+      var e = (MemberSelectExpr)expr;
+      if (e.Member is Function || e.Member is Method) {
+        CheckTypeInstantiation(e.Origin, e.Member.WhatKind, e.Member.Name, ((ICallable)e.Member).TypeArgs, e.TypeApplicationJustMember, inGhostContext);
+      }
+    } else if (expr is FunctionCallExpr) {
+      var e = (FunctionCallExpr)expr;
+      CheckTypeInstantiation(e.Origin, e.Function.WhatKind, e.Function.Name, e.Function.TypeArgs, e.TypeApplication_JustFunction, inGhostContext);
+      // recursively visit all subexpressions (all actual parameters), noting which ones correspond to ghost formal parameters
+      Visit(e.Receiver, inGhostContext);
+      Contract.Assert(e.Args.Count == e.Function.Ins.Count);
+      for (var i = 0; i < e.Args.Count; i++) {
+        Visit(e.Args[i], inGhostContext || e.Function.Ins[i].IsGhost);
+      }
+      return false;  // we've done what there is to be done
+    } else if (expr is DatatypeValue) {
+      var e = (DatatypeValue)expr;
+      VisitType(expr.Origin, expr.Type, inGhostContext);
+      // recursively visit all subexpressions (all actual parameters), noting which ones correspond to ghost formal parameters
+      Contract.Assert(e.Arguments.Count == e.Ctor.Formals.Count);
+      for (var i = 0; i < e.Arguments.Count; i++) {
+        Visit(e.Arguments[i], inGhostContext || e.Ctor.Formals[i].IsGhost);
+      }
+      return false;  // we've done what there is to be done
+    } else if (expr is SetDisplayExpr || expr is MultiSetDisplayExpr || expr is MapDisplayExpr || expr is SeqConstructionExpr ||
+               expr is MultiSetFormingExpr || expr is StaticReceiverExpr) {
+      // This catches other expressions whose type may potentially be illegal
+      VisitType(expr.Origin, expr.Type, inGhostContext);
+    } else if (expr is StmtExpr) {
+      var e = (StmtExpr)expr;
+      Visit(e.S, true);
+      Visit(e.E, inGhostContext);
+      return false;
+    }
+    return true;
+  }
+
+  public void VisitType(IOrigin tok, Type type, bool inGhostContext) {
+    Contract.Requires(tok != null);
+    Contract.Requires(type != null);
+    type = type.Normalize();  // we only do a .Normalize() here, because we want to stop at any type synonym or subset type
+    if (type is BasicType) {
+      // fine
+    } else if (type is SetType) {
+      var st = (SetType)type;
+      var argType = st.Arg;
+      if (!inGhostContext && !argType.SupportsEquality) {
+        reporter.Error(MessageSource.Resolver, tok, "{2}set argument type must support equality (got {0}){1}", argType, TypeEqualityErrorMessageHint(argType), st.Finite ? "" : "i");
+      }
+      VisitType(tok, argType, inGhostContext);
+
+    } else if (type is MultiSetType) {
+      var argType = ((MultiSetType)type).Arg;
+      if (!inGhostContext && !argType.SupportsEquality) {
+        reporter.Error(MessageSource.Resolver, tok, "multiset argument type must support equality (got {0}){1}", argType, TypeEqualityErrorMessageHint(argType));
+
+      }
+      VisitType(tok, argType, inGhostContext);
+    } else if (type is MapType) {
+      var mt = (MapType)type;
+      if (!inGhostContext && !mt.Domain.SupportsEquality) {
+        reporter.Error(MessageSource.Resolver, tok, "{2}map domain type must support equality (got {0}){1}", mt.Domain, TypeEqualityErrorMessageHint(mt.Domain), mt.Finite ? "" : "i");
+      }
+      VisitType(tok, mt.Domain, inGhostContext);
+      VisitType(tok, mt.Range, inGhostContext);
+
+    } else if (type is SeqType) {
+      Type argType = ((SeqType)type).Arg;
+      VisitType(tok, argType, inGhostContext);
+
+    } else if (type is UserDefinedType) {
+      var udt = (UserDefinedType)type;
+      Contract.Assert(udt.ResolvedClass != null);
+      var formalTypeArgs = udt.ResolvedClass.TypeArgs;
+      Contract.Assert(formalTypeArgs != null);
+      CheckTypeInstantiation(udt.Origin, "type", udt.ResolvedClass.Name, formalTypeArgs, udt.TypeArgs, inGhostContext);
+
+    } else if (type is TypeProxy) {
+      // the type was underconstrained; this is checked elsewhere, but it is not in violation of the equality-type test
+    } else {
+      Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+    }
+  }
+
+  void CheckTypeInstantiation(IOrigin tok, string what, string className, List<TypeParameter> formalTypeArgs, List<Type> actualTypeArgs, bool inGhostContext) {
+    Contract.Requires(tok != null);
+    Contract.Requires(what != null);
+    Contract.Requires(className != null);
+    Contract.Requires(formalTypeArgs != null);
+    Contract.Requires(actualTypeArgs != null);
+    Contract.Requires(formalTypeArgs.Count == actualTypeArgs.Count);
+
+    var typeMap = TypeParameter.SubstitutionMap(formalTypeArgs, actualTypeArgs);
+    for (var i = 0; i < formalTypeArgs.Count; i++) {
+      var formal = formalTypeArgs[i];
+      var actual = actualTypeArgs[i];
+      if (!CheckCharacteristics(formal.Characteristics, actual, inGhostContext, out var whatIsNeeded, out var hint, out _)) {
+        var index = actualTypeArgs.Count == 1 ? "" : " " + i;
+        reporter.Error(MessageSource.Resolver, tok,
+          $"type parameter{index} ({formal.Name}) passed to {what} {className} must {whatIsNeeded} (got {actual}){hint}");
+      }
+      VisitType(tok, actual, inGhostContext);
+      foreach (var typeBound in formal.TypeBounds) {
+        var bound = typeBound.Subst(typeMap);
+        if (!Type.IsSupertype(bound, actual) || (actual.IsRefType && !actual.IsNonNullRefType && !bound.IsRefType)) {
+          var index = actualTypeArgs.Count == 1 ? "" : " " + i;
+          reporter.Error(MessageSource.Resolver, tok,
+            $"type parameter{index} ('{formal.Name}') passed to {what} '{className}' must meet type bound '{bound}' (got '{actual}')");
+        }
+      }
+    }
+  }
+
+  /// <summary>
+  /// Grammatically, "whatIsNeeded" is an imperative that says what to do to be in compliance. Concretely, it is one of the following
+  /// strings (not including the words in square brackets):
+  ///     * [type X must] contain no references
+  ///     * [type X must] support equality
+  ///     * [type X must] support auto-initialization
+  ///     * [type X must] be nonempty
+  /// </summary>
+  public static bool CheckCharacteristics(TypeParameter.TypeParameterCharacteristics formal, Type actual, bool inGhostContext,
+    out string whatIsNeeded, out string hint, out RefinementErrors.ErrorId errorId) {
+    Contract.Ensures(Contract.Result<bool>() || (Contract.ValueAtReturn(out whatIsNeeded) != null && Contract.ValueAtReturn(out hint) != null));
+    if (!inGhostContext && formal.EqualitySupport != TypeParameter.EqualitySupportValue.Unspecified && !actual.SupportsEquality) {
+      whatIsNeeded = "support equality";
+      hint = TypeEqualityErrorMessageHint(actual);
+      errorId = RefinementErrors.ErrorId.ref_mismatched_type_characteristics_equality;
+      return false;
+    }
+    var cl = (actual.Normalize() as UserDefinedType)?.ResolvedClass;
+    var tp = (TopLevelDecl)(cl as TypeParameter) ?? cl as AbstractTypeDecl;
+    if (formal.HasCompiledValue && (inGhostContext ? !actual.IsNonempty : !actual.HasCompilableValue)) {
+      whatIsNeeded = "support auto-initialization";
+      hint = tp == null ? "" :
+        string.Format(" (perhaps try declaring {2} '{0}' on line {1} as '{0}(0)', which says it can only be instantiated with a type that supports auto-initialization)", tp.Name, tp.Origin.line, tp.WhatKind);
+      errorId = RefinementErrors.ErrorId.ref_mismatched_type_characteristics_autoinit;
+      return false;
+    }
+    if (formal.IsNonempty && !actual.IsNonempty) {
+      whatIsNeeded = "be nonempty";
+      hint = tp == null ? "" :
+        string.Format(" (perhaps try declaring {2} '{0}' on line {1} as '{0}(00)', which says it can only be instantiated with a nonempty type)", tp.Name, tp.Origin.line, tp.WhatKind);
+      errorId = RefinementErrors.ErrorId.ref_mismatched_type_characteristics_nonempty;
+      return false;
+    }
+    if (formal.ContainsNoReferenceTypes && actual.MayInvolveReferences) {
+      whatIsNeeded = "contain no references";
+      hint = tp == null ? "" :
+        string.Format(" (perhaps try declaring {2} '{0}' on line {1} as '{0}(!new)', which says it can only be instantiated with a type that contains no references)", tp.Name, tp.Origin.line, tp.WhatKind);
+      errorId = RefinementErrors.ErrorId.ref_mismatched_type_characteristics_noreferences;
+      return false;
+    }
+    whatIsNeeded = null;
+    hint = null;
+    errorId = 0; // to please the compiler; this value will not be used by the caller
+    return true;
+  }
+
+  public static string TypeEqualityErrorMessageHint(Type argType) {
+    Contract.Requires(argType != null);
+    argType = argType.Normalize();
+    var cl = (argType as UserDefinedType)?.ResolvedClass;
+    var tp = (TopLevelDecl)(cl as TypeParameter) ?? cl as AbstractTypeDecl;
+    if (tp != null) {
+      return string.Format(" (perhaps try declaring {2} '{0}' on line {1} as '{0}(==)', which says it can only be instantiated with a type that supports equality)", tp.Name, tp.Origin.line, tp.WhatKind);
+    }
+
+    var typeArgs = argType.TypeArgs;
+
+    if (argType.AsSeqType != null && typeArgs.Count >= 1) {
+      if (TypeEqualityErrorMessageHint(typeArgs[0]) is var messageSeq and not "") {
+        return messageSeq;
+      }
+    }
+    if (argType.AsMapType != null &&
+        typeArgs.Count >= 2 &&
+        TypeEqualityErrorMessageHint(typeArgs[1]) is var messageMap and not "") {
+      return messageMap;
+    }
+    if (argType.AsIndDatatype is { EqualitySupport: IndDatatypeDecl.ES.ConsultTypeArguments } decl) {
+      var i = 0;
+      foreach (var tParam in decl.TypeArgs) {
+        if (tParam.NecessaryForEqualitySupportOfSurroundingInductiveDatatype && i < typeArgs.Count && !typeArgs[i].SupportsEquality && TypeEqualityErrorMessageHint(typeArgs[i]) is var message and not "") {
+          return message;
+        }
+        i++;
+      }
+    }
+
+    if (argType.AsNewtype is { } newTypeDecl) {
+      return TypeEqualityErrorMessageHint(newTypeDecl.RhsWithArgument(argType.TypeArgs));
+    }
+    return "";
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/CheckTypeCharacteristics_Visitor.cs b/Source/DafnyCore/Resolver/CheckTypeCharacteristics_Visitor.cs
deleted file mode 100644
index 5c622736201..00000000000
--- a/Source/DafnyCore/Resolver/CheckTypeCharacteristics_Visitor.cs
+++ /dev/null
@@ -1,386 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-
-namespace Microsoft.Dafny;
-
-/// <summary>
-/// This visitor checks that type characteristics are respected in all (implicitly or explicitly)
-/// declared types. Note that equality-support is checked only in compiled contexts.
-/// In addition, this visitor checks that operations that require equality are applied to
-/// types that really do support equality; this, too, is checked only in compiled contexts.
-/// </summary>
-class CheckTypeCharacteristics_Visitor : ResolverTopDownVisitor<bool> {
-  public CheckTypeCharacteristics_Visitor(ErrorReporter reporter)
-    : base(reporter) {
-    Contract.Requires(reporter != null);
-  }
-
-
-  public static bool CanCompareWith(Expression expr) {
-    Contract.Requires(expr != null);
-    if (expr.Type.SupportsEquality) {
-      return true;
-    }
-    expr = expr.Resolved;
-    if (expr is DatatypeValue datatypeValue && !datatypeValue.Ctor.EnclosingDatatype.HasGhostVariant) {
-      for (var i = 0; i < datatypeValue.Ctor.Formals.Count; i++) {
-        if (datatypeValue.Ctor.Formals[i].IsGhost) {
-          return false;
-        } else if (!CanCompareWith(datatypeValue.Arguments[i])) {
-          return false;
-        }
-      }
-      return true;
-    } else if (expr is DisplayExpression) {
-      var e = (DisplayExpression)expr;
-      return e.Elements.Count == 0;
-    } else if (expr is MapDisplayExpr) {
-      var e = (MapDisplayExpr)expr;
-      return e.Elements.Count == 0;
-    }
-    return false;
-  }
-
-  protected override bool VisitOneStmt(Statement stmt, ref bool inGhostContext) {
-    if (stmt.IsGhost) {
-      inGhostContext = true;
-    }
-    // In the sequel, do two things:
-    //  * Call VisitType on any type that occurs in the statement
-    //  * If the statement introduces ghost components, handle those components here
-    //    rather than letting the default visitor handle them
-    if (stmt is VarDeclStmt) {
-      var s = (VarDeclStmt)stmt;
-      foreach (var v in s.Locals) {
-        VisitType(v.Tok, v.Type, inGhostContext || v.IsGhost);
-      }
-    } else if (stmt is VarDeclPattern) {
-      var s = (VarDeclPattern)stmt;
-      foreach (var v in s.LocalVars) {
-        VisitType(v.Tok, v.Type, inGhostContext || v.IsGhost);
-      }
-    } else if (stmt is AssignStmt) {
-      var s = (AssignStmt)stmt;
-      if (s.Rhs is TypeRhs tRhs) {
-        VisitType(tRhs.Tok, tRhs.Type, inGhostContext);
-      }
-    } else if (stmt is AssignSuchThatStmt) {
-      var s = (AssignSuchThatStmt)stmt;
-      Visit(Attributes.SubExpressions(s.Attributes), true);
-      Visit(s.Expr, inGhostContext);
-      foreach (var lhs in s.Lhss) {
-        Visit(lhs, inGhostContext);
-      }
-      return false;
-    } else if (stmt is WhileStmt) {
-      var s = (WhileStmt)stmt;
-      // all subexpressions are ghost, except the guard
-      Visit(s.LoopSpecificationExpressions, true);
-      if (s.Guard != null) {
-        Visit(s.Guard, inGhostContext);
-      }
-      Visit(s.SubStatements, inGhostContext);
-      return false;
-    } else if (stmt is AlternativeLoopStmt) {
-      var s = (AlternativeLoopStmt)stmt;
-      // all subexpressions are ghost, except the guards
-      Visit(s.LoopSpecificationExpressions, true);
-      foreach (var alt in s.Alternatives) {
-        Visit(alt.Guard, inGhostContext);
-      }
-      Visit(s.SubStatements, inGhostContext);
-      return false;
-    } else if (stmt is ForLoopStmt) {
-      var s = (ForLoopStmt)stmt;
-      // all subexpressions are ghost, except the bounds
-      Visit(s.LoopSpecificationExpressions, true);
-      Visit(s.Start, inGhostContext);
-      if (s.End != null) {
-        Visit(s.End, inGhostContext);
-      }
-      Visit(s.SubStatements, inGhostContext);
-      return false;
-    } else if (stmt is CallStmt) {
-      var s = (CallStmt)stmt;
-      CheckTypeInstantiation(s.Tok, s.Method.WhatKind, s.Method.Name, s.Method.TypeArgs, s.MethodSelect.TypeApplication_JustMember, inGhostContext);
-      // recursively visit all subexpressions, noting that some of them may correspond to ghost formal parameters
-      Contract.Assert(s.Lhs.Count == s.Method.Outs.Count);
-      for (var i = 0; i < s.Method.Outs.Count; i++) {
-        Visit(s.Lhs[i], inGhostContext || s.Method.Outs[i].IsGhost);
-      }
-      Visit(s.Receiver, inGhostContext);
-      Contract.Assert(s.Args.Count == s.Method.Ins.Count);
-      for (var i = 0; i < s.Method.Ins.Count; i++) {
-        Visit(s.Args[i], inGhostContext || s.Method.Ins[i].IsGhost);
-      }
-      return false;
-    } else if (stmt is ForallStmt) {
-      var s = (ForallStmt)stmt;
-      foreach (var v in s.BoundVars) {
-        VisitType(v.Tok, v.Type, inGhostContext);
-      }
-      // do substatements and subexpressions, noting that ensures clauses are ghost
-      Visit(Attributes.SubExpressions(s.Attributes), true);
-      if (s.Range != null) {
-        Visit(s.Range, inGhostContext);
-      }
-      foreach (var ee in s.Ens) {
-        Visit(Attributes.SubExpressions(ee.Attributes), true);
-        Visit(ee.E, true);
-      }
-      Visit(s.SubStatements, inGhostContext);
-      return false;
-    } else if (stmt is ExpectStmt) {
-      var s = (ExpectStmt)stmt;
-      Visit(Attributes.SubExpressions(s.Attributes), true);
-      Visit(s.Expr, inGhostContext);
-      if (s.Message != null) {
-        Visit(s.Message, inGhostContext);
-      }
-      return false;
-    }
-    return true;
-  }
-
-  protected override bool VisitOneExpr(Expression expr, ref bool inGhostContext) {
-    // Do two things:
-    //  * Call VisitType on any type that occurs in the statement
-    //  * If the expression introduces ghost components, handle those components here
-    //    rather than letting the default visitor handle them
-    if (expr is BinaryExpr && !inGhostContext) {
-      var e = (BinaryExpr)expr;
-      var t0 = e.E0.Type.NormalizeExpand();
-      var t1 = e.E1.Type.NormalizeExpand();
-      switch (e.Op) {
-        case BinaryExpr.Opcode.Eq:
-        case BinaryExpr.Opcode.Neq:
-          if (t0.IsTraitType || t1.IsTraitType) {
-            // Non-reference-type traits do not support equality, but reference-trait types do.
-            if (!t0.SupportsEquality) {
-              reporter.Error(MessageSource.Resolver, e.E0, "{0} can only be applied to expressions of types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t0, TypeEqualityErrorMessageHint(t0));
-            } else if (!t1.SupportsEquality) {
-              reporter.Error(MessageSource.Resolver, e.E1, "{0} can only be applied to expressions of types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t1, TypeEqualityErrorMessageHint(t1));
-            }
-          } else if (CanCompareWith(e.E0) || CanCompareWith(e.E1)) {
-            // These are special cases with values that can always be compared against--for example, a datatype value (like Nil) that takes no parameters
-          } else if (!t0.PartiallySupportsEquality) {
-            reporter.Error(MessageSource.Resolver, e.E0, "{0} can only be applied to expressions of types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t0, TypeEqualityErrorMessageHint(t0));
-          } else if (!t1.PartiallySupportsEquality) {
-            reporter.Error(MessageSource.Resolver, e.E1, "{0} can only be applied to expressions of types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t1, TypeEqualityErrorMessageHint(t1));
-          }
-          break;
-        default:
-          switch (e.ResolvedOp) {
-            // Note, all operations on sets, multisets, and maps are guaranteed to work because of restrictions placed on how
-            // these types are instantiated.  (Except: This guarantee does not apply to equality on maps, because the Range type
-            // of maps is not restricted, only the Domain type.  However, the equality operator is checked above.)
-            case BinaryExpr.ResolvedOpcode.InSeq:
-            case BinaryExpr.ResolvedOpcode.NotInSeq:
-            case BinaryExpr.ResolvedOpcode.Prefix:
-            case BinaryExpr.ResolvedOpcode.ProperPrefix:
-              if (!t1.SupportsEquality) {
-                reporter.Error(MessageSource.Resolver, e.E1, "{0} can only be applied to expressions of sequence types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t1, TypeEqualityErrorMessageHint(t1));
-              } else if (!t0.SupportsEquality) {
-                if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.InSet || e.ResolvedOp == BinaryExpr.ResolvedOpcode.NotInSeq) {
-                  reporter.Error(MessageSource.Resolver, e.E0, "{0} can only be applied to expressions of types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t0, TypeEqualityErrorMessageHint(t0));
-                } else {
-                  reporter.Error(MessageSource.Resolver, e.E0, "{0} can only be applied to expressions of sequence types that support equality (got {1}){2}", BinaryExpr.OpcodeString(e.Op), t0, TypeEqualityErrorMessageHint(t0));
-                }
-              }
-              break;
-            default:
-              break;
-          }
-          break;
-      }
-    } else if (expr is ComprehensionExpr) {
-      var e = (ComprehensionExpr)expr;
-      foreach (var bv in e.BoundVars) {
-        VisitType(bv.tok, bv.Type, inGhostContext);
-      }
-    } else if (expr is LetExpr) {
-      var e = (LetExpr)expr;
-      Visit(Attributes.SubExpressions(e.Attributes), true);
-      if (e.Exact) {
-        Contract.Assert(e.LHSs.Count == e.RHSs.Count);
-        for (var i = 0; i < e.LHSs.Count; i++) {
-          // The VisitPattern function visits all BoundVar's in a pattern and returns
-          // "true" if all variables are ghost.
-          bool VisitPattern(CasePattern<BoundVar> pat, bool patternGhostContext) {
-            if (pat.Var != null) {
-              VisitType(pat.tok, pat.Var.Type, patternGhostContext || pat.Var.IsGhost);
-              return pat.Var.IsGhost;
-            } else {
-              var allGhost = true;
-              Contract.Assert(pat.Ctor != null);
-              Contract.Assert(pat.Ctor.Formals.Count == pat.Arguments.Count);
-              for (var i = 0; i < pat.Ctor.Formals.Count; i++) {
-                var formal = pat.Ctor.Formals[i];
-                var arg = pat.Arguments[i];
-                // don't use short-circuit booleans in the following line, because we want to visit all nested patterns
-                allGhost &= VisitPattern(arg, patternGhostContext || formal.IsGhost);
-              }
-              return allGhost;
-            }
-          }
-
-          var allGhosts = VisitPattern(e.LHSs[i], inGhostContext);
-          Visit(e.RHSs[i], inGhostContext || allGhosts);
-        }
-      } else {
-        Contract.Assert(e.RHSs.Count == 1);
-        var allGhost = true;
-        foreach (var bv in e.BoundVars) {
-          if (!bv.IsGhost) {
-            allGhost = false;
-          }
-          VisitType(bv.tok, bv.Type, inGhostContext || bv.IsGhost);
-        }
-        Visit(e.RHSs[0], inGhostContext || allGhost);
-      }
-      Visit(e.Body, inGhostContext);
-      return false;
-    } else if (expr is MemberSelectExpr) {
-      var e = (MemberSelectExpr)expr;
-      if (e.Member is Function || e.Member is Method) {
-        CheckTypeInstantiation(e.tok, e.Member.WhatKind, e.Member.Name, ((ICallable)e.Member).TypeArgs, e.TypeApplication_JustMember, inGhostContext);
-      }
-    } else if (expr is FunctionCallExpr) {
-      var e = (FunctionCallExpr)expr;
-      CheckTypeInstantiation(e.tok, e.Function.WhatKind, e.Function.Name, e.Function.TypeArgs, e.TypeApplication_JustFunction, inGhostContext);
-      // recursively visit all subexpressions (all actual parameters), noting which ones correspond to ghost formal parameters
-      Visit(e.Receiver, inGhostContext);
-      Contract.Assert(e.Args.Count == e.Function.Formals.Count);
-      for (var i = 0; i < e.Args.Count; i++) {
-        Visit(e.Args[i], inGhostContext || e.Function.Formals[i].IsGhost);
-      }
-      return false;  // we've done what there is to be done
-    } else if (expr is DatatypeValue) {
-      var e = (DatatypeValue)expr;
-      // recursively visit all subexpressions (all actual parameters), noting which ones correspond to ghost formal parameters
-      Contract.Assert(e.Arguments.Count == e.Ctor.Formals.Count);
-      for (var i = 0; i < e.Arguments.Count; i++) {
-        Visit(e.Arguments[i], inGhostContext || e.Ctor.Formals[i].IsGhost);
-      }
-      return false;  // we've done what there is to be done
-    } else if (expr is SetDisplayExpr || expr is MultiSetDisplayExpr || expr is MapDisplayExpr || expr is SeqConstructionExpr ||
-               expr is MultiSetFormingExpr || expr is StaticReceiverExpr) {
-      // This catches other expressions whose type may potentially be illegal
-      VisitType(expr.tok, expr.Type, inGhostContext);
-    } else if (expr is StmtExpr) {
-      var e = (StmtExpr)expr;
-      Visit(e.S, true);
-      Visit(e.E, inGhostContext);
-      return false;
-    }
-    return true;
-  }
-
-  public void VisitType(IToken tok, Type type, bool inGhostContext) {
-    Contract.Requires(tok != null);
-    Contract.Requires(type != null);
-    type = type.Normalize();  // we only do a .Normalize() here, because we want to keep stop at any type synonym or subset type
-    if (type is BasicType) {
-      // fine
-    } else if (type is SetType) {
-      var st = (SetType)type;
-      var argType = st.Arg;
-      if (!inGhostContext && !argType.SupportsEquality) {
-        reporter.Error(MessageSource.Resolver, tok, "{2}set argument type must support equality (got {0}){1}", argType, TypeEqualityErrorMessageHint(argType), st.Finite ? "" : "i");
-      }
-      VisitType(tok, argType, inGhostContext);
-
-    } else if (type is MultiSetType) {
-      var argType = ((MultiSetType)type).Arg;
-      if (!inGhostContext && !argType.SupportsEquality) {
-        reporter.Error(MessageSource.Resolver, tok, "multiset argument type must support equality (got {0}){1}", argType, TypeEqualityErrorMessageHint(argType));
-
-      }
-      VisitType(tok, argType, inGhostContext);
-    } else if (type is MapType) {
-      var mt = (MapType)type;
-      if (!inGhostContext && !mt.Domain.SupportsEquality) {
-        reporter.Error(MessageSource.Resolver, tok, "{2}map domain type must support equality (got {0}){1}", mt.Domain, TypeEqualityErrorMessageHint(mt.Domain), mt.Finite ? "" : "i");
-      }
-      VisitType(tok, mt.Domain, inGhostContext);
-      VisitType(tok, mt.Range, inGhostContext);
-
-    } else if (type is SeqType) {
-      Type argType = ((SeqType)type).Arg;
-      VisitType(tok, argType, inGhostContext);
-
-    } else if (type is UserDefinedType) {
-      var udt = (UserDefinedType)type;
-      Contract.Assert(udt.ResolvedClass != null);
-      var formalTypeArgs = udt.ResolvedClass.TypeArgs;
-      Contract.Assert(formalTypeArgs != null);
-      CheckTypeInstantiation(udt.tok, "type", udt.ResolvedClass.Name, formalTypeArgs, udt.TypeArgs, inGhostContext);
-
-    } else if (type is TypeProxy) {
-      // the type was underconstrained; this is checked elsewhere, but it is not in violation of the equality-type test
-    } else {
-      Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-    }
-  }
-
-  void CheckTypeInstantiation(IToken tok, string what, string className, List<TypeParameter> formalTypeArgs, List<Type> actualTypeArgs, bool inGhostContext) {
-    Contract.Requires(tok != null);
-    Contract.Requires(what != null);
-    Contract.Requires(className != null);
-    Contract.Requires(formalTypeArgs != null);
-    Contract.Requires(actualTypeArgs != null);
-    Contract.Requires(formalTypeArgs.Count == actualTypeArgs.Count);
-
-    for (var i = 0; i < formalTypeArgs.Count; i++) {
-      var formal = formalTypeArgs[i];
-      var actual = actualTypeArgs[i];
-      if (!CheckCharacteristics(formal.Characteristics, actual, inGhostContext, out var whatIsWrong, out var hint)) {
-        reporter.Error(MessageSource.Resolver, tok, "type parameter{0} ({1}) passed to {2} {3} must support {4} (got {5}){6}",
-          actualTypeArgs.Count == 1 ? "" : " " + i, formal.Name, what, className, whatIsWrong, actual, hint);
-      }
-      VisitType(tok, actual, inGhostContext);
-    }
-  }
-
-  bool CheckCharacteristics(TypeParameter.TypeParameterCharacteristics formal, Type actual, bool inGhostContext, out string whatIsWrong, out string hint) {
-    Contract.Ensures(Contract.Result<bool>() || (Contract.ValueAtReturn(out whatIsWrong) != null && Contract.ValueAtReturn(out hint) != null));
-    if (!inGhostContext && formal.EqualitySupport != TypeParameter.EqualitySupportValue.Unspecified && !actual.SupportsEquality) {
-      whatIsWrong = "equality";
-      hint = TypeEqualityErrorMessageHint(actual);
-      return false;
-    }
-    var cl = (actual.Normalize() as UserDefinedType)?.ResolvedClass;
-    var tp = (TopLevelDecl)(cl as TypeParameter) ?? cl as AbstractTypeDecl;
-    if (formal.HasCompiledValue && (inGhostContext ? !actual.IsNonempty : !actual.HasCompilableValue)) {
-      whatIsWrong = "auto-initialization";
-      hint = tp == null ? "" :
-        string.Format(" (perhaps try declaring {2} '{0}' on line {1} as '{0}(0)', which says it can only be instantiated with a type that supports auto-initialization)", tp.Name, tp.tok.line, tp.WhatKind);
-      return false;
-    }
-    if (formal.IsNonempty && !actual.IsNonempty) {
-      whatIsWrong = "nonempty";
-      hint = tp == null ? "" :
-        string.Format(" (perhaps try declaring {2} '{0}' on line {1} as '{0}(00)', which says it can only be instantiated with a nonempty type)", tp.Name, tp.tok.line, tp.WhatKind);
-      return false;
-    }
-    if (formal.ContainsNoReferenceTypes && actual.MayInvolveReferences) {
-      whatIsWrong = "no references";
-      hint = tp == null ? "" :
-        string.Format(" (perhaps try declaring {2} '{0}' on line {1} as '{0}(!new)', which says it can only be instantiated with a type that contains no references)", tp.Name, tp.tok.line, tp.WhatKind);
-      return false;
-    }
-    whatIsWrong = null;
-    hint = null;
-    return true;
-  }
-
-  string TypeEqualityErrorMessageHint(Type argType) {
-    Contract.Requires(argType != null);
-    var cl = (argType.Normalize() as UserDefinedType)?.ResolvedClass;
-    var tp = (TopLevelDecl)(cl as TypeParameter) ?? cl as AbstractTypeDecl;
-    if (tp != null) {
-      return string.Format(" (perhaps try declaring {2} '{0}' on line {1} as '{0}(==)', which says it can only be instantiated with a type that supports equality)", tp.Name, tp.tok.line, tp.WhatKind);
-    }
-    return "";
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/CoCallResolution.cs b/Source/DafnyCore/Resolver/CoCallResolution.cs
index 63ad448fa77..003ed4f4aa8 100644
--- a/Source/DafnyCore/Resolver/CoCallResolution.cs
+++ b/Source/DafnyCore/Resolver/CoCallResolution.cs
@@ -120,10 +120,10 @@ void CheckCoCalls(Expression expr, int destructionLevel, DatatypeValue coContext
       if (!Attributes.ContainsBool(e.Function.Attributes, "abstemious", ref abstemious)) {
         abstemious = false;
       }
-      Contract.Assert(e.Args.Count == e.Function.Formals.Count);
+      Contract.Assert(e.Args.Count == e.Function.Ins.Count);
       for (var i = 0; i < e.Args.Count; i++) {
         var arg = e.Args[i];
-        if (!e.Function.Formals[i].Type.IsCoDatatype) {
+        if (!e.Function.Ins[i].Type.IsCoDatatype) {
           CheckCoCalls(arg, int.MaxValue, null, coCandidates);
         } else if (abstemious) {
           CheckCoCalls(arg, 0, coContext, coCandidates);
@@ -153,7 +153,7 @@ void CheckCoCalls(Expression expr, int destructionLevel, DatatypeValue coContext
           } else {
             e.CoCall = FunctionCallExpr.CoCallResolution.NoBecauseIsNotGuarded;
           }
-        } else if (e.Function.Reads.Count != 0) {
+        } else if (e.Function.Reads.Expressions.Count != 0) {
           // this call is disqualified from being a co-call, because of side effects
           if (!dealsWithCodatatypes) {
             e.CoCall = FunctionCallExpr.CoCallResolution.No;
@@ -182,7 +182,7 @@ void CheckCoCalls(Expression expr, int destructionLevel, DatatypeValue coContext
       if (e.Range != null) {
         CheckCoCalls(e.Range, int.MaxValue, null, coCandidates);
       }
-      foreach (var read in e.Reads) {
+      foreach (var read in e.Reads.Expressions) {
         CheckCoCalls(read.E, int.MaxValue, null, coCandidates);
       }
       return;
diff --git a/Source/DafnyCore/Resolver/CollectFriendlyCallsInSpecVisitor.cs b/Source/DafnyCore/Resolver/CollectFriendlyCallsInSpecVisitor.cs
new file mode 100644
index 00000000000..e632340d547
--- /dev/null
+++ b/Source/DafnyCore/Resolver/CollectFriendlyCallsInSpecVisitor.cs
@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+class CollectFriendlyCallsInSpecVisitor : FindFriendlyCallsVisitor {
+  readonly ISet<Expression> friendlyCalls;
+  readonly ExtremeLemma Context;
+  public CollectFriendlyCallsInSpecVisitor(ErrorReporter reporter, ISet<Expression> friendlyCalls, bool co, ExtremeLemma context)
+    : base(reporter, co, context.KNat) {
+    Contract.Requires(reporter != null);
+    Contract.Requires(friendlyCalls != null);
+    Contract.Requires(context != null);
+    this.friendlyCalls = friendlyCalls;
+    this.Context = context;
+  }
+  protected override bool VisitOneExpr(Expression expr, ref CallingPosition cp) {
+    if (cp == CallingPosition.Neither) {
+      // no friendly calls in "expr"
+      return false;  // don't recurse into subexpressions
+    }
+    if (expr is FunctionCallExpr fexp) {
+      if (cp == CallingPosition.Positive) {
+        if (IsCoContext ? fexp.Function is GreatestPredicate : fexp.Function is LeastPredicate) {
+          if (Context.KNat != ((ExtremePredicate)fexp.Function).KNat) {
+            KNatMismatchError(expr.Origin, Context.Name, Context.TypeOfK, ((ExtremePredicate)fexp.Function).TypeOfK);
+          } else {
+            friendlyCalls.Add(fexp);
+          }
+        }
+      }
+      return false;  // don't explore subexpressions any further
+    } else if (expr is BinaryExpr bin && IsCoContext) {
+      if (cp == CallingPosition.Positive && bin.ResolvedOp == BinaryExpr.ResolvedOpcode.EqCommon && bin.E0.Type.IsCoDatatype) {
+        friendlyCalls.Add(bin);
+        return false;  // don't explore subexpressions any further
+      } else if (cp == CallingPosition.Negative && bin.ResolvedOp == BinaryExpr.ResolvedOpcode.NeqCommon && bin.E0.Type.IsCoDatatype) {
+        friendlyCalls.Add(bin);
+        return false;  // don't explore subexpressions any further
+      }
+    }
+    return base.VisitOneExpr(expr, ref cp);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/CollectFriendlyCallsInSpec_Visitor.cs b/Source/DafnyCore/Resolver/CollectFriendlyCallsInSpec_Visitor.cs
deleted file mode 100644
index 76bccae2139..00000000000
--- a/Source/DafnyCore/Resolver/CollectFriendlyCallsInSpec_Visitor.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-
-namespace Microsoft.Dafny;
-
-class CollectFriendlyCallsInSpec_Visitor : FindFriendlyCalls_Visitor {
-  readonly ISet<Expression> friendlyCalls;
-  readonly ExtremeLemma Context;
-  public CollectFriendlyCallsInSpec_Visitor(ErrorReporter reporter, ISet<Expression> friendlyCalls, bool co, ExtremeLemma context)
-    : base(reporter, co, context.KNat) {
-    Contract.Requires(reporter != null);
-    Contract.Requires(friendlyCalls != null);
-    Contract.Requires(context != null);
-    this.friendlyCalls = friendlyCalls;
-    this.Context = context;
-  }
-  protected override bool VisitOneExpr(Expression expr, ref CallingPosition cp) {
-    if (cp == CallingPosition.Neither) {
-      // no friendly calls in "expr"
-      return false;  // don't recurse into subexpressions
-    }
-    if (expr is FunctionCallExpr) {
-      if (cp == CallingPosition.Positive) {
-        var fexp = (FunctionCallExpr)expr;
-        if (IsCoContext ? fexp.Function is GreatestPredicate : fexp.Function is LeastPredicate) {
-          if (Context.KNat != ((ExtremePredicate)fexp.Function).KNat) {
-            KNatMismatchError(expr.tok, Context.Name, Context.TypeOfK, ((ExtremePredicate)fexp.Function).TypeOfK);
-          } else {
-            friendlyCalls.Add(fexp);
-          }
-        }
-      }
-      return false;  // don't explore subexpressions any further
-    } else if (expr is BinaryExpr && IsCoContext) {
-      var bin = (BinaryExpr)expr;
-      if (cp == CallingPosition.Positive && bin.ResolvedOp == BinaryExpr.ResolvedOpcode.EqCommon && bin.E0.Type.IsCoDatatype) {
-        friendlyCalls.Add(bin);
-        return false;  // don't explore subexpressions any further
-      } else if (cp == CallingPosition.Negative && bin.ResolvedOp == BinaryExpr.ResolvedOpcode.NeqCommon && bin.E0.Type.IsCoDatatype) {
-        friendlyCalls.Add(bin);
-        return false;  // don't explore subexpressions any further
-      }
-    }
-    return base.VisitOneExpr(expr, ref cp);
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/ConstantFolder.cs b/Source/DafnyCore/Resolver/ConstantFolder.cs
new file mode 100644
index 00000000000..8ff8fa2a500
--- /dev/null
+++ b/Source/DafnyCore/Resolver/ConstantFolder.cs
@@ -0,0 +1,487 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using JetBrains.Annotations;
+using static Microsoft.Dafny.ResolutionErrors;
+
+namespace Microsoft.Dafny {
+  class ConstantFolder {
+    /// <summary>
+    /// Returns the largest value that can be stored in bitvector type "t".
+    /// </summary>
+    public static BigInteger MaxBv(Type t) {
+      Contract.Requires(t != null);
+      Contract.Requires(t.IsBitVectorType);
+      return MaxBv(t.AsBitVectorType.Width);
+    }
+
+    /// <summary>
+    /// Returns the largest value that can be stored in bitvector type of "bits" width.
+    /// </summary>
+    public static BigInteger MaxBv(int bits) {
+      Contract.Requires(0 <= bits);
+      return BigInteger.Pow(new BigInteger(2), bits) - BigInteger.One;
+    }
+
+    /// <summary>
+    /// Folds "e" into an integer literal, if possible.
+    /// Returns "null" if not possible (or not easy).
+    /// </summary>
+    public static BigInteger? TryFoldInteger(Expression e) {
+      var ee = GetAnyConst(e.Resolved ?? e, new Stack<ConstantField>());
+      return ee as BigInteger?;
+    }
+
+    public static bool IsUnconstrainedType(Type t) {
+      return AsUnconstrainedType(t) != null;
+    }
+
+    /// <summary>
+    /// Returns null if the argument is a constrained newtype (recursively)
+    /// Returns the transitive base type if the argument is recursively unconstrained
+    /// </summary>
+    public static Type AsUnconstrainedType(Type t) {
+      while (true) {
+        if (t.AsNewtype == null) {
+          return t;
+        }
+
+        if (t.AsNewtype.Constraint != null) {
+          return null;
+        }
+
+        t = t.AsNewtype.BaseType;
+      }
+    }
+
+    /// <summary>
+    /// Try to fold "e" into constants.
+    /// Return null if folding is not possible.
+    /// If an operation is undefined (divide by zero, conversion out of range, etc.), then null is returned.
+    ///
+    /// Caution: This method defines the semantics of some expressions. It is important that these be the same
+    /// as what the verifier and compilers use. For example, it is essential that no undefined expressions
+    /// are folded. Yet, this method is likely to receive much less testing than the verifier and compiler,
+    /// since it's not common for all of these expressions to appear in expressions where folding is applied.
+    /// </summary>
+    [CanBeNull]
+    static object GetAnyConst(Expression e, Stack<ConstantField> constants) {
+      e = e.Resolved;
+
+      if (e is LiteralExpr l) {
+        return l.Value;
+
+      } else if (e is UnaryOpExpr un) {
+        if (un.ResolvedOp == UnaryOpExpr.ResolvedOpcode.BoolNot && GetAnyConst(un.E, constants) is bool b) {
+          return !b;
+        }
+        if (un.ResolvedOp == UnaryOpExpr.ResolvedOpcode.BVNot && GetAnyConst(un.E, constants) is BigInteger i) {
+          return ((BigInteger.One << un.Type.AsBitVectorType.Width) - 1) ^ i;
+        }
+        // TODO: This only handles strings; generalize to other collections?
+        if (un.ResolvedOp == UnaryOpExpr.ResolvedOpcode.SeqLength && GetAnyConst(un.E, constants) is string ss) {
+          return (BigInteger)(ss.Length);
+        }
+
+      } else if (e is MemberSelectExpr m) {
+        if (m.Member is ConstantField { IsStatic: true, Rhs: { } } c) {
+          // This aspect of type resolution happens before the check for cyclic references
+          // so we have to do a check here as well. If cyclic, null is silently returned,
+          // counting on the later error message to alert the user.
+          if (constants.Contains(c)) {
+            return null;
+          }
+          constants.Push(c);
+          var o = GetAnyConst(c.Rhs, constants);
+          constants.Pop();
+          return o;
+        } else if (m.Member is SpecialField { Name: "Floor" }) {
+          var ee = GetAnyConst(m.Obj, constants);
+          if (ee != null && m.Obj.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
+            ((BaseTypes.BigDec)ee).FloorCeiling(out var f, out _);
+            return f;
+          }
+        }
+
+      } else if (e is BinaryExpr bin) {
+        var e0 = GetAnyConst(bin.E0, constants);
+        if (e0 == null) {
+          return null;
+        }
+        var e1 = GetAnyConst(bin.E1, constants);
+
+        if (bin.E0.Type == Type.Bool && bin.E1.Type == Type.Bool) {
+          return FoldBoolean(bin, (bool)e0, (bool?)e1);
+        }
+
+        if (e1 == null) {
+          return null;
+        }
+
+        if (bin.E0.Type.IsNumericBased(Type.NumericPersuasion.Int) && bin.E1.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
+          return FoldInteger(bin, (BigInteger)e0, (BigInteger)e1);
+        } else if (bin.E0.Type.IsBitVectorType && (bin.E1.Type.IsBitVectorType || bin.E1.Type.IsNumericBased(Type.NumericPersuasion.Int))) {
+          return FoldBitvector(bin, (BigInteger)e0, (BigInteger)e1);
+        } else if (bin.E0.Type.IsNumericBased(Type.NumericPersuasion.Real) && bin.E1.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
+          return FoldReal(bin, (BaseTypes.BigDec)e0, (BaseTypes.BigDec)e1);
+        } else if (e0 is string s0 && e1 is string s1) {
+          return FoldCharOrString(bin, s0, s1);
+        }
+
+      } else if (e is ConversionExpr ce) {
+        var o = GetAnyConst(ce.E, constants);
+        if (o != null) {
+          return FoldConversion(o, ce.E.Type, ce.ToType);
+        }
+
+      } else if (e is SeqSelectExpr sse) {
+        if (GetAnyConst(sse.Seq, constants) is string b && GetAnyConst(sse.E0, constants) is BigInteger index) {
+          if (0 <= index && index < b.Length && index <= int.MaxValue) {
+            return b[(int)index].ToString();
+          }
+        }
+
+      } else if (e is ITEExpr ite) {
+        if (GetAnyConst(ite.Test, constants) is bool b) {
+          return b ? GetAnyConst(ite.Thn, constants) : GetAnyConst(ite.Els, constants);
+        }
+      }
+
+      return null;
+    }
+
+    private static bool? FoldBoolean(BinaryExpr bin, bool e0, bool? e1) {
+      switch (bin.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.And:
+          if (e0) {
+            return e1;
+          } else {
+            return false;
+          }
+        case BinaryExpr.ResolvedOpcode.Or:
+          if (e0) {
+            return true;
+          } else {
+            return e1;
+          }
+        case BinaryExpr.ResolvedOpcode.Imp:
+          if (e0) {
+            return e1;
+          } else {
+            return true;
+          }
+        case BinaryExpr.ResolvedOpcode.Iff:
+        case BinaryExpr.ResolvedOpcode.EqCommon:
+          if (e1 != null) {
+            return e0 == (bool)e1;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.NeqCommon:
+          if (e1 != null) {
+            return e0 != (bool)e1;
+          }
+          break;
+      }
+      return null;
+    }
+
+    private static object FoldInteger(BinaryExpr bin, BigInteger e0, BigInteger e1) {
+      var isUnconstrained = IsUnconstrainedType(bin.Type);
+
+      switch (bin.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.Add:
+          if (isUnconstrained) {
+            return e0 + e1;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Sub:
+          if (isUnconstrained) {
+            return e0 - e1;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mul:
+          if (isUnconstrained) {
+            return e0 * e1;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Div:
+          if (isUnconstrained && e1 != 0) {
+            // use Euclidean division
+            var d = e0 / e1;
+            if (0 <= e0 || e0 == d * e1) {
+              return d;
+            } else if (0 < e1) {
+              return d - 1;
+            } else {
+              return d + 1;
+            }
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mod:
+          if (isUnconstrained && e1 != 0) {
+            // use Euclidean modulo
+            var a = BigInteger.Abs(e1);
+            var d = e0 % a;
+            return 0 <= e0 ? d : d + a;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Gt:
+          return e0 > e1;
+        case BinaryExpr.ResolvedOpcode.Ge:
+          return e0 >= e1;
+        case BinaryExpr.ResolvedOpcode.Lt:
+          return e0 < e1;
+        case BinaryExpr.ResolvedOpcode.Le:
+          return e0 <= e1;
+        case BinaryExpr.ResolvedOpcode.EqCommon:
+          return e0 == e1;
+        case BinaryExpr.ResolvedOpcode.NeqCommon:
+          return e0 != e1;
+      }
+      return null;
+    }
+
+    private static object FoldBitvector(BinaryExpr bin, BigInteger e0, BigInteger e1) {
+      Contract.Assert(0 <= e0);
+
+      switch (bin.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.Add:
+          // modular arithmetic
+          return (e0 + e1) & MaxBv(bin.Type);
+        case BinaryExpr.ResolvedOpcode.Sub:
+          // modular arithmetic
+          return (e0 - e1) & MaxBv(bin.Type);
+        case BinaryExpr.ResolvedOpcode.Mul:
+          // modular arithmetic
+          return (e0 * e1) & MaxBv(bin.Type);
+        case BinaryExpr.ResolvedOpcode.Div:
+          if (e1 != 0) {
+            return e0 / e1;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mod:
+          if (e1 != 0) {
+            return e0 % e1;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
+          return e0 & e1;
+        case BinaryExpr.ResolvedOpcode.BitwiseOr:
+          return e0 | e1;
+        case BinaryExpr.ResolvedOpcode.BitwiseXor:
+          return e0 ^ e1;
+        case BinaryExpr.ResolvedOpcode.LeftShift:
+          if (0 <= e1 && e1 <= bin.Type.AsBitVectorType.Width) {
+            return (e0 << (int)e1) & MaxBv(bin.E0.Type);
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.RightShift:
+          if (0 <= e1 && e1 <= bin.Type.AsBitVectorType.Width) {
+            return e0 >> (int)e1;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Gt:
+          return e0 > e1;
+        case BinaryExpr.ResolvedOpcode.Ge:
+          return e0 >= e1;
+        case BinaryExpr.ResolvedOpcode.Lt:
+          return e0 < e1;
+        case BinaryExpr.ResolvedOpcode.Le:
+          return e0 <= e1;
+        case BinaryExpr.ResolvedOpcode.EqCommon:
+          return e0 == e1;
+        case BinaryExpr.ResolvedOpcode.NeqCommon:
+          return e0 != e1;
+      }
+      return null;
+    }
+
+    private static object FoldReal(BinaryExpr bin, BaseTypes.BigDec e0, BaseTypes.BigDec e1) {
+      var isUnconstrained = IsUnconstrainedType(bin.Type);
+
+      switch (bin.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.Add:
+          if (isUnconstrained) {
+            return e0 + e1;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Sub:
+          if (isUnconstrained) {
+            return e0 - e1;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Mul:
+          if (isUnconstrained) {
+            return e0 * e1;
+          }
+          break;
+        case BinaryExpr.ResolvedOpcode.Gt:
+          return e0 > e1;
+        case BinaryExpr.ResolvedOpcode.Ge:
+          return e0 >= e1;
+        case BinaryExpr.ResolvedOpcode.Lt:
+          return e0 < e1;
+        case BinaryExpr.ResolvedOpcode.Le:
+          return e0 <= e1;
+        case BinaryExpr.ResolvedOpcode.EqCommon:
+          return e0 == e1;
+        case BinaryExpr.ResolvedOpcode.NeqCommon:
+          return e0 != e1;
+      }
+      return null;
+    }
+
+    private static object FoldCharOrString(BinaryExpr bin, string e0, string e1) {
+      if (bin.E0.Type.IsCharType) {
+        Contract.Assert(bin.E1.Type.IsCharType);
+        Contract.Assert(e0.Length == 1);
+        Contract.Assert(e1.Length == 1);
+      }
+
+      switch (bin.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.Concat:
+          return e0 + e1;
+        case BinaryExpr.ResolvedOpcode.GtChar:
+          Contract.Assert(bin.E0.Type.IsCharType);
+          return e0[0] > e1[0];
+        case BinaryExpr.ResolvedOpcode.GeChar:
+          Contract.Assert(bin.E0.Type.IsCharType);
+          return e0[0] >= e1[0];
+        case BinaryExpr.ResolvedOpcode.LtChar:
+          Contract.Assert(bin.E0.Type.IsCharType);
+          return e0[0] < e1[0];
+        case BinaryExpr.ResolvedOpcode.LeChar:
+          Contract.Assert(bin.E0.Type.IsCharType);
+          return e0[0] <= e1[0];
+        case BinaryExpr.ResolvedOpcode.ProperPrefix:
+          return e1.StartsWith(e0) && e0 != e1; ;
+        case BinaryExpr.ResolvedOpcode.Prefix:
+          return e1.StartsWith(e0);
+        case BinaryExpr.ResolvedOpcode.EqCommon:
+          Contract.Assert(bin.E0.Type.IsCharType); // the string case is handled in SeqEq
+          return e0[0] == e1[0];
+        case BinaryExpr.ResolvedOpcode.NeqCommon:
+          Contract.Assert(bin.E0.Type.IsCharType); // the string case is handled in SeqEq
+          return e0[0] != e1[0];
+        case BinaryExpr.ResolvedOpcode.SeqEq:
+          return e0 == e1;
+        case BinaryExpr.ResolvedOpcode.SeqNeq:
+          return e0 != e1;
+      }
+      return null;
+    }
+
+    private static object FoldConversion(object value, Type fromType, Type toType) {
+      if (fromType == toType) {
+        return value;
+      }
+      if (!IsUnconstrainedType(toType)) {
+        return null;
+      }
+
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Real) && toType.IsBitVectorType) {
+        ((BaseTypes.BigDec)value).FloorCeiling(out var ff, out _);
+        if (ff < 0 || ff > MaxBv(toType)) {
+          return null; // Out of range
+        }
+        if (((BaseTypes.BigDec)value) != BaseTypes.BigDec.FromBigInt(ff)) {
+          return null; // Out of range
+        }
+        return ff;
+      }
+
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Real) && toType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        ((BaseTypes.BigDec)value).FloorCeiling(out var ff, out _);
+        if (((BaseTypes.BigDec)value) != BaseTypes.BigDec.FromBigInt(ff)) {
+          return null; // Argument not an integer
+        }
+        return ff;
+      }
+
+      if (fromType.IsBitVectorType && toType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        return value;
+      }
+
+      if (fromType.IsBitVectorType && toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        return BaseTypes.BigDec.FromBigInt((BigInteger)value);
+      }
+
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Int) && toType.IsBitVectorType) {
+        var b = (BigInteger)value;
+        if (b < 0 || b > MaxBv(toType)) {
+          return null; // Argument out of range
+        }
+        return value;
+      }
+
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Int) && toType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        // This case includes int-based newtypes to int-based new types
+        return value;
+      }
+
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Real) && toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        // This case includes real-based newtypes to real-based new types
+        return value;
+      }
+
+      if (fromType.IsBitVectorType && toType.IsBitVectorType) {
+        var b = (BigInteger)value;
+        if (b < 0 || b > MaxBv(toType)) {
+          return null; // Argument out of range
+        }
+        return value;
+      }
+
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Int) && toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        return BaseTypes.BigDec.FromBigInt((BigInteger)value);
+      }
+
+      if (fromType.IsCharType && toType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        var c = ((String)value)[0];
+        return new BigInteger(((string)value)[0]);
+      }
+
+      if (fromType.IsCharType && toType.IsBitVectorType) {
+        var c = ((String)value)[0];
+        if ((int)c > MaxBv(toType)) {
+          return null; // Argument out of range
+        }
+        return new BigInteger(((string)value)[0]);
+      }
+
+      if ((fromType.IsNumericBased(Type.NumericPersuasion.Int) || fromType.IsBitVectorType) && toType.IsCharType) {
+        var b = (BigInteger)value;
+        if (b < BigInteger.Zero || b > new BigInteger(65535)) {
+          return null; // Argument out of range
+        }
+        return ((char)(int)b).ToString();
+      }
+
+      if (fromType.IsCharType && toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        return BaseTypes.BigDec.FromInt(((string)value)[0]);
+      }
+
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Real) && toType.IsCharType) {
+        ((BaseTypes.BigDec)value).FloorCeiling(out var ff, out _);
+        if (((BaseTypes.BigDec)value) != BaseTypes.BigDec.FromBigInt(ff)) {
+          return null; // Argument not an integer
+        }
+        if (ff < BigInteger.Zero || ff > new BigInteger(65535)) {
+          return null; // Argument out of range
+        }
+        return ((char)(int)ff).ToString();
+      }
+
+      return null;
+    }
+  }
+}
diff --git a/Source/DafnyCore/Resolver/DetectUnsoundFunctionReferencesVisitor.cs b/Source/DafnyCore/Resolver/DetectUnsoundFunctionReferencesVisitor.cs
new file mode 100644
index 00000000000..d3696de66bd
--- /dev/null
+++ b/Source/DafnyCore/Resolver/DetectUnsoundFunctionReferencesVisitor.cs
@@ -0,0 +1,41 @@
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+class DetectUnsoundFunctionReferencesVisitor : ResolverBottomUpVisitor {
+  private readonly ICallable context;
+  private bool doDecreasesChecks;
+  private DetectUnsoundFunctionReferencesVisitor(ModuleResolver resolver, ICallable context)
+    : base(resolver) {
+    Contract.Requires(resolver != null);
+    Contract.Requires(context != null);
+    this.context = context;
+  }
+
+  public static void Check(Function function, ModuleResolver resolver) {
+    var visitor = new DetectUnsoundFunctionReferencesVisitor(resolver, function);
+    visitor.doDecreasesChecks = false;
+    visitor.Visit(function);
+    visitor.doDecreasesChecks = true;
+    visitor.Visit(function.Decreases.Expressions);
+  }
+
+  protected override void VisitOneExpr(Expression expr) {
+    if (!doDecreasesChecks && expr is MemberSelectExpr { Member: Function fn } && ModuleDefinition.InSameSCC(context, fn)) {
+      resolver.reporter.Error(MessageSource.Resolver, expr.Origin,
+        "cannot use naked function in recursive setting. Possible solution: eta expansion.");
+    }
+
+    if (doDecreasesChecks && expr is FunctionCallExpr callExpr && ModuleDefinition.InSameSCC(context, callExpr.Function)) {
+      string msg;
+      if (context == callExpr.Function) {
+        msg = "a decreases clause is not allowed to call the enclosing function";
+      } else {
+        msg = $"the decreases clause of {context.WhatKind} '{context.NameRelativeToModule}' is not allowed to call '{callExpr.Function}', " +
+              "because they are mutually recursive";
+      }
+
+      resolver.reporter.Error(MessageSource.Resolver, callExpr.Origin, msg);
+    }
+  }
+}
diff --git a/Source/DafnyCore/Resolver/ExpressionTester.cs b/Source/DafnyCore/Resolver/ExpressionTester.cs
index 603d5bd9fea..c58df1bb336 100644
--- a/Source/DafnyCore/Resolver/ExpressionTester.cs
+++ b/Source/DafnyCore/Resolver/ExpressionTester.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Dafny;
 
 public class ExpressionTester {
-  private DafnyOptions options;
+  private readonly DafnyOptions options;
   private bool ReportErrors => reporter != null;
   [CanBeNull] private readonly ErrorReporter reporter; // if null, no errors will be reported
 
@@ -26,25 +26,35 @@ private ExpressionTester([CanBeNull] ModuleResolver resolver, [CanBeNull] ErrorR
     this.options = options;
   }
 
-  // Static call to CheckIsCompilable
+  /// <summary>
+  /// Determines whether or not "expr" is compilable, and returns the answer.
+  /// If "resolver" is non-null and "expr" is not compilable, then an error is reported.
+  /// Also, updates various bookkeeping information (see instance method CheckIsCompilable for more details).
+  /// </summary>
   public static bool CheckIsCompilable(DafnyOptions options, [CanBeNull] ModuleResolver resolver, Expression expr, ICodeContext codeContext) {
     return new ExpressionTester(resolver, resolver?.Reporter, options).CheckIsCompilable(expr, codeContext, true);
   }
 
-  public static bool CheckIsCompilable(ModuleResolver resolver, ErrorReporter reporter, Expression expr, ICodeContext codeContext) {
-    return new ExpressionTester(resolver, reporter, reporter.Options).CheckIsCompilable(expr, codeContext, true);
+  /// <summary>
+  /// Checks that "expr" is compilable and report an error if it is not.
+  /// Also, updates various bookkeeping information (see instance method CheckIsCompilable for more details).
+  /// </summary>
+  public static void CheckIsCompilable(ModuleResolver resolver, ErrorReporter reporter, Expression expr, ICodeContext codeContext) {
+    new ExpressionTester(resolver, reporter, reporter.Options).CheckIsCompilable(expr, codeContext, true);
   }
 
-  public void ReportError(ErrorId errorId, Expression e, string msg, params object[] args) {
+  private void ReportError(ErrorId errorId, Expression e, string msg, params object[] args) {
     reporter?.Error(MessageSource.Resolver, errorId, e, msg, args);
   }
 
-  public void ReportError(ErrorId errorId, IToken t, string msg, params object[] args) {
+  private void ReportError(ErrorId errorId, IOrigin t, string msg, params object[] args) {
     reporter?.Error(MessageSource.Resolver, errorId, t, msg, args);
   }
 
   /// <summary>
-  /// Checks that "expr" is compilable and reports an error if it is not.
+  /// Determines and returns whether or not "expr" is compilable.
+  /// If it is not, it calls ReportError. (Note, whether or not ReportError reports an error depends on if "reporter" is non-null.)
+  ///
   /// Also, updates bookkeeping information for the verifier to record the fact that "expr" is to be compiled.
   /// For example, this bookkeeping information keeps track of if the constraint of a let-such-that expression
   /// must determine the value uniquely.
@@ -70,7 +80,7 @@ private bool CheckIsCompilable(Expression expr, ICodeContext codeContext, bool i
     Expression subexpressionsAreInsideBranchesOnlyExcept = null;
 
     if (expr is IdentifierExpr expression) {
-      if (expression.Var != null && expression.Var.IsGhost) {
+      if (expression.Var is { IsGhost: true }) {
         ReportError(ErrorId.r_ghost_var_only_in_specifications, expression,
           $"ghost variables such as {expression.Name} are allowed only in specification contexts. {expression.Name} was inferred to be ghost based on its declaration or initialization.");
         return false;
@@ -84,7 +94,7 @@ private bool CheckIsCompilable(Expression expr, ICodeContext codeContext, bool i
         var what = selectExpr.Member.WhatKindMentionGhost;
         ReportError(ErrorId.r_only_in_specification, selectExpr, $"a {what} is allowed only in specification contexts");
         return false;
-      } else if (selectExpr.Member is Function function && function.Formals.Any(formal => formal.IsGhost)) {
+      } else if (selectExpr.Member is Function function && function.Ins.Any(formal => formal.IsGhost)) {
         var what = selectExpr.Member.WhatKindMentionGhost;
         ReportError(ErrorId.r_ghost_parameters_only_in_specification, selectExpr, $"a {what} with ghost parameters can be used as a value only in specification contexts");
         return false;
@@ -154,8 +164,8 @@ private bool CheckIsCompilable(Expression expr, ICodeContext codeContext, bool i
         }
         // function is okay, so check all NON-ghost arguments
         isCompilable = CheckIsCompilable(callExpr.Receiver, codeContext);
-        for (var i = 0; i < callExpr.Function.Formals.Count; i++) {
-          if (!callExpr.Function.Formals[i].IsGhost && i < callExpr.Args.Count) {
+        for (var i = 0; i < callExpr.Function.Ins.Count; i++) {
+          if (!callExpr.Function.Ins[i].IsGhost && i < callExpr.Args.Count) {
             isCompilable = CheckIsCompilable(callExpr.Args[i], codeContext) && isCompilable;
           }
         }
@@ -219,23 +229,21 @@ private bool CheckIsCompilable(Expression expr, ICodeContext codeContext, bool i
     } else if (expr is LetExpr letExpr) {
       if (letExpr.Exact) {
         Contract.Assert(letExpr.LHSs.Count == letExpr.RHSs.Count);
-        var i = 0;
-        foreach (var ee in letExpr.RHSs) {
+        for (var i = 0; i < letExpr.RHSs.Count; i++) {
+          var rhs = letExpr.RHSs[i];
           var lhs = letExpr.LHSs[i];
           // Make LHS vars ghost if the RHS is a ghost
-          if (UsesSpecFeatures(ee)) {
+          if (UsesSpecFeatures(rhs)) {
             foreach (var bv in lhs.Vars) {
               if (!bv.IsGhost) {
                 bv.MakeGhost();
-                isCompilable = false;
               }
             }
           }
 
           if (!lhs.Vars.All(bv => bv.IsGhost)) {
-            isCompilable = CheckIsCompilable(ee, codeContext) && isCompilable;
+            isCompilable = CheckIsCompilable(rhs, codeContext) && isCompilable;
           }
-          i++;
         }
         isCompilable = CheckIsCompilable(letExpr.Body, codeContext, insideBranchesOnly) && isCompilable;
       } else {
@@ -247,13 +255,19 @@ private bool CheckIsCompilable(Expression expr, ICodeContext codeContext, bool i
         isCompilable = CheckIsCompilable(letExpr.Body, codeContext, insideBranchesOnly) && isCompilable;
 
         // fill in bounds for this to-be-compiled let-such-that expression
-        Contract.Assert(letExpr.RHSs.Count == 1);  // if we got this far, the resolver will have checked this condition successfully
+        Contract.Assert(letExpr.RHSs.Count == 1); // if we got this far, the resolver will have checked this condition successfully
         var constraint = letExpr.RHSs[0];
         if (resolver != null) {
           letExpr.Constraint_Bounds = ModuleResolver.DiscoverBestBounds_MultipleVars(letExpr.BoundVars.ToList<IVariable>(), constraint, true);
         }
       }
       return isCompilable;
+
+    } else if (expr is NestedMatchExpr nestedMatchExpr) {
+      foreach (var kase in nestedMatchExpr.Cases) {
+        MakeGhostAsNeeded(kase.Pat, false);
+      }
+
     } else if (expr is LambdaExpr lambdaExpr) {
       return CheckIsCompilable(lambdaExpr.Body, codeContext);
     } else if (expr is ComprehensionExpr comprehensionExpr) {
@@ -279,6 +293,9 @@ private bool CheckIsCompilable(Expression expr, ICodeContext codeContext, bool i
       if (comprehensionExpr.Range != null) {
         isCompilable = CheckIsCompilable(comprehensionExpr.Range, codeContext) && isCompilable;
       }
+      if (comprehensionExpr is MapComprehension { TermLeft: { } termLeft }) {
+        isCompilable = CheckIsCompilable(termLeft, codeContext) && isCompilable;
+      }
       isCompilable = CheckIsCompilable(comprehensionExpr.Term, codeContext) && isCompilable;
       return isCompilable;
 
@@ -301,9 +318,9 @@ bool onlyGhostParametersChange(Expression ee) {
             if (!function.IsStatic && functionCallExpr.Receiver.Resolved is not ThisExpr) {
               return false;
             }
-            Contract.Assert(function.Formals.Count == functionCallExpr.Args.Count);
-            for (var i = 0; i < function.Formals.Count; i++) {
-              var formal = function.Formals[i];
+            Contract.Assert(function.Ins.Count == functionCallExpr.Args.Count);
+            for (var i = 0; i < function.Ins.Count; i++) {
+              var formal = function.Ins[i];
               if (!formal.IsGhost && !IdentifierExpr.Is(functionCallExpr.Args[i], formal)) {
                 return false;
               }
@@ -328,12 +345,17 @@ bool onlyGhostParametersChange(Expression ee) {
     } else if (expr is MatchExpr matchExpr) {
       var mc = FirstCaseThatDependsOnGhostCtor(matchExpr.Cases);
       if (mc != null) {
-        ReportError(ErrorId.r_match_not_compilable, mc.tok, "match expression is not compilable, because it depends on a ghost constructor");
+        ReportError(ErrorId.r_match_not_compilable, mc.Origin, "match expression is not compilable, because it depends on a ghost constructor");
         isCompilable = false;
       }
       // other conditions are checked below
       subexpressionsAreInsideBranchesOnlyExcept = matchExpr.Source;
 
+    } else if (expr is DecreasesToExpr _) {
+      ReportError(ErrorId.r_decreases_to_only_in_specification,
+                  expr, "a `decreases to` expression is allowed only in specification and ghost contexts");
+      return false;
+
     } else if (expr is ConcreteSyntaxExpression concreteSyntaxExpression) {
       return CheckIsCompilable(concreteSyntaxExpression.ResolvedExpression, codeContext, insideBranchesOnly);
     }
@@ -347,47 +369,94 @@ bool onlyGhostParametersChange(Expression ee) {
   }
 
   public static bool IsTypeTestCompilable(TypeTestExpr tte) {
-    Contract.Requires(tte != null);
-    var fromType = tte.E.Type;
-    if (fromType.IsSubtypeOf(tte.ToType, false, true)) {
-      // this is a no-op, so it can trivially be compiled
+    return IsTypeTestCompilable(tte.E.Type, tte.ToType);
+  }
+
+  /// <summary>
+  /// This method determines if it's possible, at run time, to test if something whose static type is "fromType"
+  /// is of type "toType". This information is need for "is" expressions and comprehension expressions. By the
+  /// time that this method is called, it has already been determined that the use is legal by the type system;
+  /// this method performs the additional check of compilability, which is needed in non-ghost contexts.
+  ///
+  /// What this method does falls into three parts:
+  ///
+  /// 0. If "toType" is a supertype of "fromType", then a type test would always return "true". A similar situation
+  /// is when "toType" is a non-null type and the nullable version of "toType" is a supertype of "from"; then,
+  /// the run-time type tests consists simply of a non-null check. Else, if "toType" is a type parameter, then we
+  /// never allow the check in compiled code.
+  ///
+  /// If those simple cases don't apply, there the compilability of the type test comes down to two remaining parts:
+  ///
+  /// 1. If "toType" is a subset type or newtype that involves constraints, then those constraints have to be compilable.
+  /// (Actually, this could be improved in a future version of Dafny, because we're given that any constraints of
+  /// "fromType" already hold. Thus, we really just need to check that the constraints _between_ "fromType" and "toType"
+  /// are compilable.)
+  ///
+  /// 2. The third part is to check that "toType" is injective in its type parameters. That is, we want to check that the
+  /// type arguments of "toType" are uniquely determined from the type arguments of "fromType".
+  /// To illustrate the need for this injectivity check, suppose the "is"-operation is testing whether or not the given expression
+  /// of type A<X> has type B<Y>, where X and Y are some type expressions. If the type parameterization Y is uniquely determined
+  /// from X, then all we need to check at run time is whether or not the A thing is a B thing. (This happens to be supported in all
+  /// our target languages, even those target languages that do not themselves have full support for type parameters.)
+  /// On the other hand, if there are several ways to parameterize B to make it be comparable to A<X> (say, B<Y> and B<Z>), then
+  /// a type test like this would at run time recover some information about the type arguments. This goes against the principle of
+  /// "parametric polymorphism", which in essence says that once types are passed in as type parameters, there's no way at run time
+  /// to figure out what they are.
+  /// Now, even if you think that insisting on parametric polymorphism is taking the high road to language design and that parametric
+  /// polymorphism has no tangible benefits, the injectivity rule still makes sense for Dafny. This is because type parameters in the
+  /// Dafny target code are more coarse-grained than the Dafny type parameters. For example, we don't distinguish "int" and "nat" in
+  /// the target code. In fact, some of our target languages either don't support type parameters at all (like in Go) or don't give us
+  /// a way to check them at run time (like in Java). So, even without the lofty goal of parametric polymorphism, we'd be out of luck
+  /// trying to distinguish B<Y> from B<Z> at run time.
+  /// </summary>
+  public static bool IsTypeTestCompilable(Type fromType, Type toType) {
+    // part 0
+    if (fromType.IsSubtypeOf(toType, false, true)) {
+      // this requires no run-time work or a simple null comparison, so it can trivially be compiled
       return true;
     }
+    if (toType.IsTypeParameter) {
+      // this is never allowed in compiled code
+      return false;
+    }
 
-    // TODO: It would be nice to allow some subset types in test tests in compiled code. But for now, such cases
-    // are allowed only in ghost contexts.
-    var udtTo = (UserDefinedType)tte.ToType.NormalizeExpandKeepConstraints();
-    if (udtTo.ResolvedClass is SubsetTypeDecl && !(udtTo.ResolvedClass is NonNullTypeDecl)) {
+    // part 1
+    if (toType.NormalizeExpandKeepConstraints() is UserDefinedType { ResolvedClass: RedirectingTypeDecl { ConstraintIsCompilable: false } }) {
+      // the constraint can't be evaluated at run time, so the type test cannot be compiled
       return false;
     }
 
-    // The operation can be performed at run time if the mapping of .ToType's type parameters are injective in fromType's type parameters.
-    // For illustration, suppose the "is"-operation is testing whether or not the given expression of type A<X> has type B<Y>, where
-    // X and Y are some type expressions. At run time, we can check if the expression has type B<...>, but we can't on all target platforms
-    // be certain about the "...". So, if both B<Y> and B<Y'> are possible subtypes of A<X>, we can't perform the type test at run time.
-    // In other words, we CAN perform the type test at run time if the type parameters of A uniquely determine the type parameters of B.
-    // Let T be a list of type parameters (in particular, we will use the formal TypeParameter's declared in type B). Then, represent
-    // B<T> in parent type A, and let's say the result is A<U> for some type expression U. If U contains all type parameters from T,
-    // then the mapping from B<T> to A<U> is unique, which means the mapping frmo B<Y> to A<X> is unique, which means we can check if an
-    // A<X> value is a B<Y> value by checking if the value is of type B<...>.
-    var B = ((UserDefinedType)tte.ToType.NormalizeExpandKeepConstraints()).ResolvedClass; // important to keep constraints here, so no type parameters are lost
-    var B_T = UserDefinedType.FromTopLevelDecl(tte.tok, B);
-    var tps = new HashSet<TypeParameter>(); // There are going to be the type parameters of fromType (that is, T in the discussion above)
-    if (fromType.TypeArgs.Count != 0) {
-      // we need this "if" statement, because if "fromType" is "object" or "object?", then it isn't a UserDefinedType
-      var A = (UserDefinedType)fromType.NormalizeExpand(); // important to NOT keep constraints here, since they won't be evident at run time
-      var A_U = B_T.AsParentType(A.ResolvedClass);
+    // part 2
+    if (toType.NormalizeExpandKeepConstraints() is UserDefinedType udtTo) {
+      // check that "udtTo" is injective in its type parameters
+
+      // Suppose "fromType" is A<...> and that "udtTo" is B<...>. Let T be a list of type parameters (in particular, we will use the formal
+      // TypeParameter's declared in type B). To perform the injectivity check, we first represent B<T> in parent type A (typically by
+      // calling "AsParentType"). Let's say the result is A<U> for some type expression U. If U contains all type parameters from T, then the
+      // mapping from B<T> to A<U> is unique, which means the mapping from B<Y> to A<X> is unique.
+      var B = udtTo.ResolvedClass;
+      var B_T = UserDefinedType.FromTopLevelDecl(B.Origin, B);
+
+      var A = fromType.NormalizeExpand(); // important to NOT keep constraints here, since they won't be evident at run time
+      Type A_U;
+      if (A is UserDefinedType udtA) {
+        A_U = B_T.AsParentType(udtA.ResolvedClass);
+      } else {
+        // Evidently, A is not a newtype, subset type, (co)datatype, abstract type, reference type, or trait type (except possibly "object?"). Hence:
+        Contract.Assert(A.NormalizeToAncestorType().Equals(A));
+        // We can therefore move B_T up to its parent A by normalizing, expanding, and trimming it all the way.
+        A_U = B_T.NormalizeToAncestorType();
+      }
+
       // the type test can be performed at run time if all the type parameters of "B_T" are free type parameters of "A_U".
+      var tps = new HashSet<TypeParameter>();
       A_U.AddFreeTypeParameters(tps);
-    }
-    foreach (var tp in B.TypeArgs) {
-      if (!tps.Contains(tp)) {
+      if (B.TypeArgs.Any(tp => !tps.Contains(tp))) {
         // type test cannot be performed at run time, so this is a ghost operation
-        // TODO: If "tp" is a type parameter for which there is a run-time type descriptor, then we would still be able to perform
-        // the type test at run time.
         return false;
       }
     }
+
     // type test can be performed at run time
     return true;
   }
@@ -442,7 +511,7 @@ public static bool UsesSpecFeatures(Expression expr) {
         return true;
       } else if (e.Member != null && e.Member.IsGhost) {
         return true;
-      } else if (e.Member is Function function && function.Formals.Any(formal => formal.IsGhost)) {
+      } else if (e.Member is Function function && function.Ins.Any(formal => formal.IsGhost)) {
         return true;
       } else if (e.Member is DatatypeDestructor dtor) {
         return dtor.EnclosingCtors.All(ctor => ctor.IsGhost);
@@ -485,8 +554,8 @@ public static bool UsesSpecFeatures(Expression expr) {
       if (UsesSpecFeatures(e.Receiver)) {
         return true;
       }
-      for (int i = 0; i < e.Function.Formals.Count; i++) {
-        if (!e.Function.Formals[i].IsGhost && UsesSpecFeatures(e.Args[i])) {
+      for (int i = 0; i < e.Function.Ins.Count; i++) {
+        if (!e.Function.Ins[i].IsGhost && UsesSpecFeatures(e.Args[i])) {
           return true;
         }
       }
@@ -498,7 +567,7 @@ public static bool UsesSpecFeatures(Expression expr) {
       return true;
     } else if (expr is UnaryExpr) {
       var e = (UnaryExpr)expr;
-      if (e is UnaryOpExpr { Op: UnaryOpExpr.Opcode.Fresh or UnaryOpExpr.Opcode.Allocated }) {
+      if (e is UnaryOpExpr { Op: UnaryOpExpr.Opcode.Fresh or UnaryOpExpr.Opcode.Allocated or UnaryOpExpr.Opcode.Assigned }) {
         return true;
       }
       if (expr is TypeTestExpr tte && !IsTypeTestCompilable(tte)) {
@@ -546,10 +615,10 @@ public static bool UsesSpecFeatures(Expression expr) {
       return e.UncompilableBoundVars().Count != 0 || UsesSpecFeatures(e.LogicalBody());
     } else if (expr is SetComprehension) {
       var e = (SetComprehension)expr;
-      return !e.Finite || e.UncompilableBoundVars().Count != 0 || (e.Range != null && UsesSpecFeatures(e.Range)) || (e.Term != null && UsesSpecFeatures(e.Term));
+      return e.UncompilableBoundVars().Count != 0 || (e.Range != null && UsesSpecFeatures(e.Range)) || (e.Term != null && UsesSpecFeatures(e.Term));
     } else if (expr is MapComprehension) {
       var e = (MapComprehension)expr;
-      return !e.Finite || e.UncompilableBoundVars().Count != 0 || UsesSpecFeatures(e.Range) || (e.TermLeft != null && UsesSpecFeatures(e.TermLeft)) || UsesSpecFeatures(e.Term);
+      return e.UncompilableBoundVars().Count != 0 || UsesSpecFeatures(e.Range) || (e.TermLeft != null && UsesSpecFeatures(e.TermLeft)) || UsesSpecFeatures(e.Term);
     } else if (expr is LambdaExpr) {
       var e = (LambdaExpr)expr;
       return UsesSpecFeatures(e.Term);
@@ -608,6 +677,30 @@ static void MakeGhostAsNeeded(CasePattern<BoundVar> arg, DatatypeDestructor d) {
     }
   }
 
+  public static void MakeGhostAsNeeded(ExtendedPattern extendedPattern, bool inGhostContext) {
+    if (extendedPattern is DisjunctivePattern disjunctivePattern) {
+      foreach (var alternative in disjunctivePattern.Alternatives) {
+        MakeGhostAsNeeded(alternative, inGhostContext);
+      }
+    } else if (extendedPattern is LitPattern) {
+      // nothing to do
+    } else if (extendedPattern is IdPattern idPattern) {
+      if (idPattern.BoundVar != null) {
+        if (inGhostContext && !idPattern.BoundVar.IsGhost) {
+          idPattern.BoundVar.MakeGhost();
+        }
+      } else if (idPattern.Ctor != null) {
+        var argumentCount = idPattern.Ctor.Formals.Count;
+        Contract.Assert(argumentCount == (idPattern.Arguments?.Count ?? 0));
+        for (var i = 0; i < argumentCount; i++) {
+          MakeGhostAsNeeded(idPattern.Arguments[i], inGhostContext || idPattern.Ctor.Formals[i].IsGhost);
+        }
+      }
+    } else {
+      Contract.Assert(false); // unexpected ExtendedPattern
+    }
+  }
+
   /// <summary>
   /// Return the first ghost constructor listed in a case, or null, if there is none.
   /// </summary>
diff --git a/Source/DafnyCore/Resolver/ExtremeLemmaChecksVisitor.cs b/Source/DafnyCore/Resolver/ExtremeLemmaChecksVisitor.cs
new file mode 100644
index 00000000000..a67f8b38013
--- /dev/null
+++ b/Source/DafnyCore/Resolver/ExtremeLemmaChecksVisitor.cs
@@ -0,0 +1,35 @@
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+class ExtremeLemmaChecksVisitor : ResolverBottomUpVisitor {
+  ExtremeLemma context;
+  public ExtremeLemmaChecksVisitor(ModuleResolver resolver, ExtremeLemma context)
+    : base(resolver) {
+    Contract.Requires(resolver != null);
+    Contract.Requires(context != null);
+    this.context = context;
+  }
+  protected override void VisitOneStmt(Statement stmt) {
+    if (stmt is CallStmt callStmt) {
+      if (callStmt.Method is ExtremeLemma or PrefixLemma) {
+        // all is cool
+      } else {
+        // the call goes from an extreme lemma context to a non-extreme-lemma callee
+        if (ModuleDefinition.InSameSCC(context, callStmt.Method)) {
+          // we're looking at a recursive call (to a non-extreme-lemma)
+          resolver.reporter.Error(MessageSource.Resolver, callStmt.Origin, "a recursive call from a {0} can go only to other {0}s and prefix lemmas", context.WhatKind);
+        }
+      }
+    }
+  }
+  protected override void VisitOneExpr(Expression expr) {
+    if (expr is FunctionCallExpr callExpr) {
+      // the call goes from a greatest lemma context to a non-greatest-lemma callee
+      if (ModuleDefinition.InSameSCC(context, callExpr.Function)) {
+        // we're looking at a recursive call (to a non-greatest-lemma)
+        resolver.reporter.Error(MessageSource.Resolver, callExpr.Origin, "a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas");
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/ExtremeLemmaChecks_Visitor.cs b/Source/DafnyCore/Resolver/ExtremeLemmaChecks_Visitor.cs
deleted file mode 100644
index 46ab2a8be1c..00000000000
--- a/Source/DafnyCore/Resolver/ExtremeLemmaChecks_Visitor.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Diagnostics.Contracts;
-
-namespace Microsoft.Dafny;
-
-class ExtremeLemmaChecks_Visitor : ResolverBottomUpVisitor {
-  ExtremeLemma context;
-  public ExtremeLemmaChecks_Visitor(ModuleResolver resolver, ExtremeLemma context)
-    : base(resolver) {
-    Contract.Requires(resolver != null);
-    Contract.Requires(context != null);
-    this.context = context;
-  }
-  protected override void VisitOneStmt(Statement stmt) {
-    if (stmt is CallStmt) {
-      var s = (CallStmt)stmt;
-      if (s.Method is ExtremeLemma || s.Method is PrefixLemma) {
-        // all is cool
-      } else {
-        // the call goes from an extreme lemma context to a non-extreme-lemma callee
-        if (ModuleDefinition.InSameSCC(context, s.Method)) {
-          // we're looking at a recursive call (to a non-extreme-lemma)
-          resolver.reporter.Error(MessageSource.Resolver, s.Tok, "a recursive call from a {0} can go only to other {0}s and prefix lemmas", context.WhatKind);
-        }
-      }
-    }
-  }
-  protected override void VisitOneExpr(Expression expr) {
-    if (expr is FunctionCallExpr) {
-      var e = (FunctionCallExpr)expr;
-      // the call goes from a greatest lemma context to a non-greatest-lemma callee
-      if (ModuleDefinition.InSameSCC(context, e.Function)) {
-        // we're looking at a recursive call (to a non-greatest-lemma)
-        resolver.reporter.Error(MessageSource.Resolver, e.tok, "a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas");
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/ExtremePredicateChecksVisitor.cs b/Source/DafnyCore/Resolver/ExtremePredicateChecksVisitor.cs
new file mode 100644
index 00000000000..c7155662feb
--- /dev/null
+++ b/Source/DafnyCore/Resolver/ExtremePredicateChecksVisitor.cs
@@ -0,0 +1,57 @@
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+class ExtremePredicateChecksVisitor : FindFriendlyCallsVisitor {
+  readonly ExtremePredicate context;
+  public ExtremePredicateChecksVisitor(ErrorReporter reporter, ExtremePredicate context)
+    : base(reporter, context is GreatestPredicate, context.KNat) {
+    Contract.Requires(reporter != null);
+    Contract.Requires(context != null);
+    this.context = context;
+  }
+  protected override bool VisitOneExpr(Expression expr, ref CallingPosition cp) {
+    if (expr is FunctionCallExpr) {
+      var e = (FunctionCallExpr)expr;
+      if (ModuleDefinition.InSameSCC(context, e.Function)) {
+        // we're looking at a recursive call
+        if (!(context is LeastPredicate ? e.Function is LeastPredicate : e.Function is GreatestPredicate)) {
+          reporter.Error(MessageSource.Resolver, e, "a recursive call from a {0} can go only to other {0}s", context.WhatKind);
+        } else if (context.KNat != ((ExtremePredicate)e.Function).KNat) {
+          KNatMismatchError(e.Origin, context.Name, context.TypeOfK, ((ExtremePredicate)e.Function).TypeOfK);
+        } else if (cp != CallingPosition.Positive) {
+          var msg = $"a {context.WhatKind} can be called recursively only in positive positions";
+          if (ContinuityIsImportant && cp == CallingPosition.Neither) {
+            // this may be inside an non-friendly quantifier
+            msg +=
+              $" and cannot sit inside an unbounded {(context is LeastPredicate ? "universal" : "existential")} quantifier";
+          } else {
+            // we don't care about the continuity restriction or
+            // the extreme-call is not inside an quantifier, so don't bother mentioning the part of existentials/universals in the error message
+          }
+          reporter.Error(MessageSource.Resolver, e, msg);
+        } else {
+          e.CoCall = FunctionCallExpr.CoCallResolution.Yes;
+          reporter.Info(MessageSource.Resolver, e.Origin, e.Function.Name + "#[_k - 1]");
+        }
+      }
+      // do the sub-parts with cp := Neither
+      cp = CallingPosition.Neither;
+      return true;
+    }
+    return base.VisitOneExpr(expr, ref cp);
+  }
+  protected override bool VisitOneStmt(Statement stmt, ref CallingPosition st) {
+    if (stmt is CallStmt) {
+      var s = (CallStmt)stmt;
+      if (ModuleDefinition.InSameSCC(context, s.Method)) {
+        // we're looking at a recursive call
+        reporter.Error(MessageSource.Resolver, stmt.Origin, "a recursive call from a {0} can go only to other {0}s", context.WhatKind);
+      }
+      // do the sub-parts with the same "cp"
+      return true;
+    } else {
+      return base.VisitOneStmt(stmt, ref st);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/ExtremePredicateChecks_Visitor.cs b/Source/DafnyCore/Resolver/ExtremePredicateChecks_Visitor.cs
deleted file mode 100644
index f4b436407dd..00000000000
--- a/Source/DafnyCore/Resolver/ExtremePredicateChecks_Visitor.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System.Diagnostics.Contracts;
-
-namespace Microsoft.Dafny;
-
-class ExtremePredicateChecks_Visitor : FindFriendlyCalls_Visitor {
-  readonly ExtremePredicate context;
-  public ExtremePredicateChecks_Visitor(ErrorReporter reporter, ExtremePredicate context)
-    : base(reporter, context is GreatestPredicate, context.KNat) {
-    Contract.Requires(reporter != null);
-    Contract.Requires(context != null);
-    this.context = context;
-  }
-  protected override bool VisitOneExpr(Expression expr, ref CallingPosition cp) {
-    if (expr is FunctionCallExpr) {
-      var e = (FunctionCallExpr)expr;
-      if (ModuleDefinition.InSameSCC(context, e.Function)) {
-        // we're looking at a recursive call
-        if (!(context is LeastPredicate ? e.Function is LeastPredicate : e.Function is GreatestPredicate)) {
-          reporter.Error(MessageSource.Resolver, e, "a recursive call from a {0} can go only to other {0}s", context.WhatKind);
-        } else if (context.KNat != ((ExtremePredicate)e.Function).KNat) {
-          KNatMismatchError(e.tok, context.Name, context.TypeOfK, ((ExtremePredicate)e.Function).TypeOfK);
-        } else if (cp != CallingPosition.Positive) {
-          var msg = $"a {context.WhatKind} can be called recursively only in positive positions";
-          if (ContinuityIsImportant && cp == CallingPosition.Neither) {
-            // this may be inside an non-friendly quantifier
-            msg +=
-              $" and cannot sit inside an unbounded {(context is LeastPredicate ? "universal" : "existential")} quantifier";
-          } else {
-            // we don't care about the continuity restriction or
-            // the extreme-call is not inside an quantifier, so don't bother mentioning the part of existentials/universals in the error message
-          }
-          reporter.Error(MessageSource.Resolver, e, msg);
-        } else {
-          e.CoCall = FunctionCallExpr.CoCallResolution.Yes;
-          reporter.Info(MessageSource.Resolver, e.tok, e.Function.Name + "#[_k - 1]");
-        }
-      }
-      // do the sub-parts with cp := Neither
-      cp = CallingPosition.Neither;
-      return true;
-    }
-    return base.VisitOneExpr(expr, ref cp);
-  }
-  protected override bool VisitOneStmt(Statement stmt, ref CallingPosition st) {
-    if (stmt is CallStmt) {
-      var s = (CallStmt)stmt;
-      if (ModuleDefinition.InSameSCC(context, s.Method)) {
-        // we're looking at a recursive call
-        reporter.Error(MessageSource.Resolver, stmt.Tok, "a recursive call from a {0} can go only to other {0}s", context.WhatKind);
-      }
-      // do the sub-parts with the same "cp"
-      return true;
-    } else {
-      return base.VisitOneStmt(stmt, ref st);
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/FillInDefaultLoopDecreasesVisitor.cs b/Source/DafnyCore/Resolver/FillInDefaultLoopDecreasesVisitor.cs
new file mode 100644
index 00000000000..8d65bd814a2
--- /dev/null
+++ b/Source/DafnyCore/Resolver/FillInDefaultLoopDecreasesVisitor.cs
@@ -0,0 +1,187 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+class FillInDefaultLoopDecreasesVisitor : ResolverBottomUpVisitor {
+  readonly ICallable EnclosingMethod;
+  public FillInDefaultLoopDecreasesVisitor(ModuleResolver resolver, ICallable enclosingMethod)
+    : base(resolver) {
+    Contract.Requires(resolver != null);
+    Contract.Requires(enclosingMethod != null);
+    EnclosingMethod = enclosingMethod;
+  }
+  protected override void VisitOneStmt(Statement stmt) {
+    if (stmt is WhileStmt) {
+      var s = (WhileStmt)stmt;
+      FillInDefaultLoopDecreases(resolver, s, s.Guard, s.Decreases.Expressions, EnclosingMethod);
+    } else if (stmt is AlternativeLoopStmt) {
+      var s = (AlternativeLoopStmt)stmt;
+      FillInDefaultLoopDecreases(resolver, s, null, s.Decreases.Expressions, EnclosingMethod);
+    }
+  }
+
+  private static void FillInDefaultLoopDecreases(ModuleResolver resolver, LoopStmt loopStmt, Expression guard, List<Expression> theDecreases, ICallable enclosingMethod) {
+    Contract.Requires(loopStmt != null);
+    Contract.Requires(theDecreases != null);
+
+    if (theDecreases.Count == 0 && guard != null) {
+      loopStmt.InferredDecreases = true;
+      Expression prefix = null;
+      foreach (Expression guardConjunct in Expression.Conjuncts(guard)) {
+        Expression guess = null;
+        var neutralValue = Expression.CreateIntLiteral(guardConjunct.Origin, -1);
+        if (guardConjunct is BinaryExpr bin) {
+          switch (bin.ResolvedOp) {
+            case BinaryExpr.ResolvedOpcode.Lt:
+            case BinaryExpr.ResolvedOpcode.Le:
+            case BinaryExpr.ResolvedOpcode.LtChar:
+            case BinaryExpr.ResolvedOpcode.LeChar:
+              if (bin.E0.Type.IsBigOrdinalType) {
+                // we can't rely on subtracting ORDINALs, so let's just pick the upper bound and hope that works
+                guess = bin.E1;
+              } else {
+                // for A < B and A <= B, use the decreases B - A
+                guess = Expression.CreateSubtract_TypeConvert(bin.E1, bin.E0);
+              }
+              break;
+            case BinaryExpr.ResolvedOpcode.Ge:
+            case BinaryExpr.ResolvedOpcode.Gt:
+            case BinaryExpr.ResolvedOpcode.GeChar:
+            case BinaryExpr.ResolvedOpcode.GtChar:
+              if (bin.E0.Type.IsBigOrdinalType) {
+                // we can't rely on subtracting ORDINALs, so let's just pick the upper bound and hope that works
+                guess = bin.E0;
+              } else {
+                // for A >= B and A > B, use the decreases A - B
+                guess = Expression.CreateSubtract_TypeConvert(bin.E0, bin.E1);
+              }
+              break;
+            case BinaryExpr.ResolvedOpcode.ProperSubset:
+            case BinaryExpr.ResolvedOpcode.Subset:
+              if (bin.E0.Type.AsSetType.Finite) {
+                // for A < B and A <= B, use the decreases |B - A|
+                guess = Expression.CreateCardinality(Expression.CreateSetDifference(bin.E1, bin.E0), resolver.SystemModuleManager);
+              }
+              break;
+            case BinaryExpr.ResolvedOpcode.Superset:
+            case BinaryExpr.ResolvedOpcode.ProperSuperset:
+              if (bin.E0.Type.AsSetType.Finite) {
+                // for A >= B and A > B, use the decreases |A - B|
+                guess = Expression.CreateCardinality(Expression.CreateSetDifference(bin.E0, bin.E1), resolver.SystemModuleManager);
+              }
+              break;
+            case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
+            case BinaryExpr.ResolvedOpcode.MultiSubset:
+              // for A < B and A <= B, use the decreases |B - A|
+              guess = Expression.CreateCardinality(Expression.CreateMultisetDifference(bin.E1, bin.E0), resolver.SystemModuleManager);
+              break;
+            case BinaryExpr.ResolvedOpcode.MultiSuperset:
+            case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
+              // for A >= B and A > B, use the decreases |A - B|
+              guess = Expression.CreateCardinality(Expression.CreateMultisetDifference(bin.E0, bin.E1), resolver.SystemModuleManager);
+              break;
+            case BinaryExpr.ResolvedOpcode.Prefix:
+            case BinaryExpr.ResolvedOpcode.ProperPrefix:
+              // for "[] < B" and "[] <= B", use B
+              if (LiteralExpr.IsEmptySequence(bin.E0)) {
+                guess = bin.E1;
+              }
+              break;
+            case BinaryExpr.ResolvedOpcode.NeqCommon:
+              if (bin.E0.Type.IsNumericBased() || bin.E0.Type.IsBitVectorType || bin.E0.Type.IsCharType) {
+                // for A != B where A and B are numeric, use the absolute difference between A and B (that is: if A <= B then B-A else A-B)
+                var AminusB = Expression.CreateSubtract_TypeConvert(bin.E0, bin.E1);
+                var BminusA = Expression.CreateSubtract_TypeConvert(bin.E1, bin.E0);
+                var test = Expression.CreateAtMost(bin.E0, bin.E1);
+                guess = Expression.CreateITE(test, BminusA, AminusB);
+              } else if (bin.E0.Type.IsBigOrdinalType) {
+                // if either of the operands is a literal, pick the other; otherwise, don't make any guess
+                if (Expression.StripParens(bin.E0) is LiteralExpr) {
+                  guess = bin.E1;
+                } else if (Expression.StripParens(bin.E1) is LiteralExpr) {
+                  guess = bin.E0;
+                }
+              }
+              break;
+            case BinaryExpr.ResolvedOpcode.SetNeq:
+              if (bin.E0.Type.AsSetType.Finite) {
+                // use |A - B| + |B - A|, but specialize it for the case where A or B is the empty set
+                if (LiteralExpr.IsEmptySet(bin.E0)) {
+                  guess = bin.E1;
+                } else if (LiteralExpr.IsEmptySet(bin.E1)) {
+                  guess = bin.E0;
+                } else {
+                  var x = Expression.CreateCardinality(Expression.CreateSetDifference(bin.E0, bin.E1), resolver.SystemModuleManager);
+                  var y = Expression.CreateCardinality(Expression.CreateSetDifference(bin.E1, bin.E0), resolver.SystemModuleManager);
+                  guess = Expression.CreateAdd(x, y);
+                }
+              }
+              break;
+            case BinaryExpr.ResolvedOpcode.MultiSetNeq:
+              // use |A - B| + |B - A|, but specialize it for the case where A or B is the empty multiset
+              if (LiteralExpr.IsEmptyMultiset(bin.E0)) {
+                guess = bin.E1;
+              } else if (LiteralExpr.IsEmptyMultiset(bin.E1)) {
+                guess = bin.E0;
+              } else {
+                var x = Expression.CreateCardinality(Expression.CreateMultisetDifference(bin.E0, bin.E1), resolver.SystemModuleManager);
+                var y = Expression.CreateCardinality(Expression.CreateMultisetDifference(bin.E1, bin.E0), resolver.SystemModuleManager);
+                guess = Expression.CreateAdd(x, y);
+              }
+              break;
+            case BinaryExpr.ResolvedOpcode.SeqNeq:
+              // if either operand is [], then use the other
+              if (LiteralExpr.IsEmptySequence(bin.E0)) {
+                guess = bin.E1;
+              } else if (LiteralExpr.IsEmptySequence(bin.E1)) {
+                guess = bin.E0;
+              }
+              break;
+            default:
+              break;
+          }
+          if (bin.E0.Type.AsSetType != null) {
+            neutralValue = new SetDisplayExpr(bin.Origin, bin.E0.Type.AsSetType.Finite, new List<Expression>()) {
+              Type = bin.E0.Type.NormalizeExpand()
+            };
+          } else if (bin.E0.Type.AsMultiSetType != null) {
+            neutralValue = new MultiSetDisplayExpr(bin.Origin, new List<Expression>()) {
+              Type = bin.E0.Type.NormalizeExpand()
+            };
+          } else if (bin.E0.Type.AsSeqType != null) {
+            neutralValue = new SeqDisplayExpr(bin.Origin, new List<Expression>()) {
+              Type = bin.E0.Type.NormalizeExpand()
+            };
+          } else if (bin.E0.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
+            neutralValue = Expression.CreateRealLiteral(bin.Origin, BaseTypes.BigDec.FromInt(-1));
+          }
+        }
+        if (guess != null) {
+          if (prefix != null) {
+            // Make the following guess:  if prefix then guess else neutralValue
+            guess = Expression.CreateITE(prefix, guess, neutralValue);
+          }
+          theDecreases.Add(AutoGeneratedExpression.Create(guess));
+        }
+        if (prefix == null) {
+          prefix = guardConjunct;
+        } else {
+          prefix = Expression.CreateAnd(prefix, guardConjunct);
+        }
+      }
+    }
+    if (enclosingMethod is IteratorDecl) {
+      var iter = (IteratorDecl)enclosingMethod;
+      var ie = new IdentifierExpr(loopStmt.Origin, iter.YieldCountVariable.Name);
+      ie.Var = iter.YieldCountVariable;  // resolve here
+      ie.Type = iter.YieldCountVariable.Type;  // resolve here
+      theDecreases.Insert(0, AutoGeneratedExpression.Create(ie));
+      loopStmt.InferredDecreases = true;
+    }
+    if (loopStmt.InferredDecreases && theDecreases.Count != 0) {
+      string s = "decreases " + Util.Comma(theDecreases, expr => Printer.ExprToString(resolver.Options, expr));
+      resolver.reporter.Info(MessageSource.Resolver, loopStmt.Origin, s);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/FillInDefaultLoopDecreases_Visitor.cs b/Source/DafnyCore/Resolver/FillInDefaultLoopDecreases_Visitor.cs
deleted file mode 100644
index 4451a93a1d2..00000000000
--- a/Source/DafnyCore/Resolver/FillInDefaultLoopDecreases_Visitor.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-
-namespace Microsoft.Dafny;
-
-class FillInDefaultLoopDecreases_Visitor : ResolverBottomUpVisitor {
-  readonly ICallable EnclosingMethod;
-  public FillInDefaultLoopDecreases_Visitor(ModuleResolver resolver, ICallable enclosingMethod)
-    : base(resolver) {
-    Contract.Requires(resolver != null);
-    Contract.Requires(enclosingMethod != null);
-    EnclosingMethod = enclosingMethod;
-  }
-  protected override void VisitOneStmt(Statement stmt) {
-    if (stmt is WhileStmt) {
-      var s = (WhileStmt)stmt;
-      FillInDefaultLoopDecreases(resolver, s, s.Guard, s.Decreases.Expressions, EnclosingMethod);
-    } else if (stmt is AlternativeLoopStmt) {
-      var s = (AlternativeLoopStmt)stmt;
-      FillInDefaultLoopDecreases(resolver, s, null, s.Decreases.Expressions, EnclosingMethod);
-    }
-  }
-
-  private static void FillInDefaultLoopDecreases(ModuleResolver resolver, LoopStmt loopStmt, Expression guard, List<Expression> theDecreases, ICallable enclosingMethod) {
-    Contract.Requires(loopStmt != null);
-    Contract.Requires(theDecreases != null);
-
-    if (theDecreases.Count == 0 && guard != null) {
-      loopStmt.InferredDecreases = true;
-      Expression prefix = null;
-      foreach (Expression guardConjunct in Expression.Conjuncts(guard)) {
-        Expression guess = null;
-        var neutralValue = Expression.CreateIntLiteral(guardConjunct.tok, -1);
-        if (guardConjunct is BinaryExpr bin) {
-          switch (bin.ResolvedOp) {
-            case BinaryExpr.ResolvedOpcode.Lt:
-            case BinaryExpr.ResolvedOpcode.Le:
-            case BinaryExpr.ResolvedOpcode.LtChar:
-            case BinaryExpr.ResolvedOpcode.LeChar:
-              if (bin.E0.Type.IsBigOrdinalType) {
-                // we can't rely on subtracting ORDINALs, so let's just pick the upper bound and hope that works
-                guess = bin.E1;
-              } else {
-                // for A < B and A <= B, use the decreases B - A
-                guess = Expression.CreateSubtract_TypeConvert(bin.E1, bin.E0);
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.Ge:
-            case BinaryExpr.ResolvedOpcode.Gt:
-            case BinaryExpr.ResolvedOpcode.GeChar:
-            case BinaryExpr.ResolvedOpcode.GtChar:
-              if (bin.E0.Type.IsBigOrdinalType) {
-                // we can't rely on subtracting ORDINALs, so let's just pick the upper bound and hope that works
-                guess = bin.E0;
-              } else {
-                // for A >= B and A > B, use the decreases A - B
-                guess = Expression.CreateSubtract_TypeConvert(bin.E0, bin.E1);
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.ProperSubset:
-            case BinaryExpr.ResolvedOpcode.Subset:
-              if (bin.E0.Type.AsSetType.Finite) {
-                // for A < B and A <= B, use the decreases |B - A|
-                guess = Expression.CreateCardinality(Expression.CreateSetDifference(bin.E1, bin.E0), resolver.SystemModuleManager);
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.Superset:
-            case BinaryExpr.ResolvedOpcode.ProperSuperset:
-              if (bin.E0.Type.AsSetType.Finite) {
-                // for A >= B and A > B, use the decreases |A - B|
-                guess = Expression.CreateCardinality(Expression.CreateSetDifference(bin.E0, bin.E1), resolver.SystemModuleManager);
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
-            case BinaryExpr.ResolvedOpcode.MultiSubset:
-              // for A < B and A <= B, use the decreases |B - A|
-              guess = Expression.CreateCardinality(Expression.CreateMultisetDifference(bin.E1, bin.E0), resolver.SystemModuleManager);
-              break;
-            case BinaryExpr.ResolvedOpcode.MultiSuperset:
-            case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
-              // for A >= B and A > B, use the decreases |A - B|
-              guess = Expression.CreateCardinality(Expression.CreateMultisetDifference(bin.E0, bin.E1), resolver.SystemModuleManager);
-              break;
-            case BinaryExpr.ResolvedOpcode.Prefix:
-            case BinaryExpr.ResolvedOpcode.ProperPrefix:
-              // for "[] < B" and "[] <= B", use B
-              if (LiteralExpr.IsEmptySequence(bin.E0)) {
-                guess = bin.E1;
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.NeqCommon:
-              if (bin.E0.Type.IsNumericBased() || bin.E0.Type.IsBitVectorType || bin.E0.Type.IsCharType) {
-                // for A != B where A and B are numeric, use the absolute difference between A and B (that is: if A <= B then B-A else A-B)
-                var AminusB = Expression.CreateSubtract_TypeConvert(bin.E0, bin.E1);
-                var BminusA = Expression.CreateSubtract_TypeConvert(bin.E1, bin.E0);
-                var test = Expression.CreateAtMost(bin.E0, bin.E1);
-                guess = Expression.CreateITE(test, BminusA, AminusB);
-              } else if (bin.E0.Type.IsBigOrdinalType) {
-                // if either of the operands is a literal, pick the other; otherwise, don't make any guess
-                if (Expression.StripParens(bin.E0) is LiteralExpr) {
-                  guess = bin.E1;
-                } else if (Expression.StripParens(bin.E1) is LiteralExpr) {
-                  guess = bin.E0;
-                }
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.SetNeq:
-              if (bin.E0.Type.AsSetType.Finite) {
-                // use |A - B| + |B - A|, but specialize it for the case where A or B is the empty set
-                if (LiteralExpr.IsEmptySet(bin.E0)) {
-                  guess = bin.E1;
-                } else if (LiteralExpr.IsEmptySet(bin.E1)) {
-                  guess = bin.E0;
-                } else {
-                  var x = Expression.CreateCardinality(Expression.CreateSetDifference(bin.E0, bin.E1), resolver.SystemModuleManager);
-                  var y = Expression.CreateCardinality(Expression.CreateSetDifference(bin.E1, bin.E0), resolver.SystemModuleManager);
-                  guess = Expression.CreateAdd(x, y);
-                }
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.MultiSetNeq:
-              // use |A - B| + |B - A|, but specialize it for the case where A or B is the empty multiset
-              if (LiteralExpr.IsEmptyMultiset(bin.E0)) {
-                guess = bin.E1;
-              } else if (LiteralExpr.IsEmptyMultiset(bin.E1)) {
-                guess = bin.E0;
-              } else {
-                var x = Expression.CreateCardinality(Expression.CreateMultisetDifference(bin.E0, bin.E1), resolver.SystemModuleManager);
-                var y = Expression.CreateCardinality(Expression.CreateMultisetDifference(bin.E1, bin.E0), resolver.SystemModuleManager);
-                guess = Expression.CreateAdd(x, y);
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.SeqNeq:
-              // if either operand is [], then use the other
-              if (LiteralExpr.IsEmptySequence(bin.E0)) {
-                guess = bin.E1;
-              } else if (LiteralExpr.IsEmptySequence(bin.E1)) {
-                guess = bin.E0;
-              }
-              break;
-            default:
-              break;
-          }
-          if (bin.E0.Type.AsSetType != null) {
-            neutralValue = new SetDisplayExpr(bin.tok, bin.E0.Type.AsSetType.Finite, new List<Expression>()) {
-              Type = bin.E0.Type.NormalizeExpand()
-            };
-          } else if (bin.E0.Type.AsMultiSetType != null) {
-            neutralValue = new MultiSetDisplayExpr(bin.tok, new List<Expression>()) {
-              Type = bin.E0.Type.NormalizeExpand()
-            };
-          } else if (bin.E0.Type.AsSeqType != null) {
-            neutralValue = new SeqDisplayExpr(bin.tok, new List<Expression>()) {
-              Type = bin.E0.Type.NormalizeExpand()
-            };
-          } else if (bin.E0.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-            neutralValue = Expression.CreateRealLiteral(bin.tok, BaseTypes.BigDec.FromInt(-1));
-          }
-        }
-        if (guess != null) {
-          if (prefix != null) {
-            // Make the following guess:  if prefix then guess else neutralValue
-            guess = Expression.CreateITE(prefix, guess, neutralValue);
-          }
-          theDecreases.Add(AutoGeneratedExpression.Create(guess));
-        }
-        if (prefix == null) {
-          prefix = guardConjunct;
-        } else {
-          prefix = Expression.CreateAnd(prefix, guardConjunct);
-        }
-      }
-    }
-    if (enclosingMethod is IteratorDecl) {
-      var iter = (IteratorDecl)enclosingMethod;
-      var ie = new IdentifierExpr(loopStmt.Tok, iter.YieldCountVariable.Name);
-      ie.Var = iter.YieldCountVariable;  // resolve here
-      ie.Type = iter.YieldCountVariable.Type;  // resolve here
-      theDecreases.Insert(0, AutoGeneratedExpression.Create(ie));
-      loopStmt.InferredDecreases = true;
-    }
-    if (loopStmt.InferredDecreases && theDecreases.Count != 0) {
-      string s = "decreases " + Util.Comma(theDecreases, expr => Printer.ExprToString(resolver.Options, expr));
-      resolver.reporter.Info(MessageSource.Resolver, loopStmt.Tok, s);
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/FindFriendlyCallsVisitor.cs b/Source/DafnyCore/Resolver/FindFriendlyCallsVisitor.cs
new file mode 100644
index 00000000000..ef34b1e9208
--- /dev/null
+++ b/Source/DafnyCore/Resolver/FindFriendlyCallsVisitor.cs
@@ -0,0 +1,117 @@
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public enum CallingPosition { Positive, Negative, Neither }
+
+class FindFriendlyCallsVisitor : ResolverTopDownVisitor<CallingPosition> {
+  public readonly bool IsCoContext;
+  public readonly bool ContinuityIsImportant;
+  public FindFriendlyCallsVisitor(ErrorReporter reporter, bool co, bool continuityIsImportant)
+    : base(reporter) {
+    Contract.Requires(reporter != null);
+    this.IsCoContext = co;
+    this.ContinuityIsImportant = continuityIsImportant;
+  }
+
+  public void KNatMismatchError(IOrigin tok, string contextName, ExtremePredicate.KType contextK, ExtremePredicate.KType calleeK) {
+    var hint = contextK == ExtremePredicate.KType.Unspecified ? string.Format(" (perhaps try declaring '{0}' as '{0}[nat]')", contextName) : "";
+    reporter.Error(MessageSource.Resolver, tok,
+      "this call does not type check, because the context uses a _k parameter of type {0} whereas the callee uses a _k parameter of type {1}{2}",
+      contextK == ExtremePredicate.KType.Nat ? "nat" : "ORDINAL",
+      calleeK == ExtremePredicate.KType.Nat ? "nat" : "ORDINAL",
+      hint);
+  }
+
+  static CallingPosition Invert(CallingPosition cp) {
+    switch (cp) {
+      case CallingPosition.Positive: return CallingPosition.Negative;
+      case CallingPosition.Negative: return CallingPosition.Positive;
+      default: return CallingPosition.Neither;
+    }
+  }
+
+  protected override bool VisitOneExpr(Expression expr, ref CallingPosition cp) {
+    if (expr is UnaryOpExpr) {
+      var e = (UnaryOpExpr)expr;
+      if (e.Op == UnaryOpExpr.Opcode.Not) {
+        // for the sub-parts, use Invert(cp)
+        cp = Invert(cp);
+        return true;
+      }
+    } else if (expr is BinaryExpr) {
+      var e = (BinaryExpr)expr;
+      switch (e.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.And:
+        case BinaryExpr.ResolvedOpcode.Or:
+          return true;  // do the sub-parts with the same "cp"
+        case BinaryExpr.ResolvedOpcode.Imp:
+          Visit(e.E0, Invert(cp));
+          Visit(e.E1, cp);
+          return false;  // don't recurse (again) on the sub-parts
+        default:
+          break;
+      }
+    } else if (expr is NestedMatchExpr) {
+      var e = (NestedMatchExpr)expr;
+      Visit(e.Source, CallingPosition.Neither);
+      var theCp = cp;
+      e.Cases.ForEach(kase => Visit((Expression)kase.Body, theCp));
+      return false;
+    } else if (expr is MatchExpr) {
+      var e = (MatchExpr)expr;
+      Visit(e.Source, CallingPosition.Neither);
+      var theCp = cp;
+      e.Cases.ForEach(kase => Visit(kase.Body, theCp));
+      return false;
+    } else if (expr is ITEExpr) {
+      var e = (ITEExpr)expr;
+      Visit(e.Test, CallingPosition.Neither);
+      Visit(e.Thn, cp);
+      Visit(e.Els, cp);
+      return false;
+    } else if (expr is LetExpr) {
+      var e = (LetExpr)expr;
+      foreach (var rhs in e.RHSs) {
+        Visit(rhs, CallingPosition.Neither);
+      }
+      var cpBody = cp;
+      if (!e.Exact) {
+        // a let-such-that expression introduces an existential that may depend on the _k in a least/greatest predicate, so we disallow recursive calls in the body of the let-such-that
+        if (IsCoContext && cp == CallingPosition.Positive) {
+          cpBody = CallingPosition.Neither;
+        } else if (!IsCoContext && cp == CallingPosition.Negative) {
+          cpBody = CallingPosition.Neither;
+        }
+      }
+      Visit(e.Body, cpBody);
+      return false;
+    } else if (expr is QuantifierExpr) {
+      var e = (QuantifierExpr)expr;
+      Contract.Assert(e.SplitQuantifier == null); // No split quantifiers during resolution
+      var cpos = IsCoContext ? cp : Invert(cp);
+      if (ContinuityIsImportant) {
+        if ((cpos == CallingPosition.Positive && e is ExistsExpr) || (cpos == CallingPosition.Negative && e is ForallExpr)) {
+          if (e.Bounds.Exists(bnd => bnd == null || (bnd.Virtues & BoundedPool.PoolVirtues.Finite) == 0)) {
+            // To ensure continuity of extreme predicates, don't allow calls under an existential (resp. universal) quantifier
+            // for greatest (resp. least) predicates).
+            cp = CallingPosition.Neither;
+          }
+        }
+      }
+      Visit(e.LogicalBody(), cp);
+      return false;
+    } else if (expr is StmtExpr) {
+      var e = (StmtExpr)expr;
+      Visit(e.E, cp);
+      Visit(e.S, CallingPosition.Neither);
+      return false;
+    } else if (expr is ConcreteSyntaxExpression) {
+      // do the sub-parts with the same "cp"
+      return true;
+    }
+    // do the sub-parts with cp := Neither
+    cp = CallingPosition.Neither;
+    return true;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/FindFriendlyCalls_Visitor.cs b/Source/DafnyCore/Resolver/FindFriendlyCalls_Visitor.cs
deleted file mode 100644
index 27c58cc44f0..00000000000
--- a/Source/DafnyCore/Resolver/FindFriendlyCalls_Visitor.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System.Diagnostics.Contracts;
-using Microsoft.Boogie;
-
-namespace Microsoft.Dafny;
-
-public enum CallingPosition { Positive, Negative, Neither }
-
-class FindFriendlyCalls_Visitor : ResolverTopDownVisitor<CallingPosition> {
-  public readonly bool IsCoContext;
-  public readonly bool ContinuityIsImportant;
-  public FindFriendlyCalls_Visitor(ErrorReporter reporter, bool co, bool continuityIsImportant)
-    : base(reporter) {
-    Contract.Requires(reporter != null);
-    this.IsCoContext = co;
-    this.ContinuityIsImportant = continuityIsImportant;
-  }
-
-  public void KNatMismatchError(IToken tok, string contextName, ExtremePredicate.KType contextK, ExtremePredicate.KType calleeK) {
-    var hint = contextK == ExtremePredicate.KType.Unspecified ? string.Format(" (perhaps try declaring '{0}' as '{0}[nat]')", contextName) : "";
-    reporter.Error(MessageSource.Resolver, tok,
-      "this call does not type check, because the context uses a _k parameter of type {0} whereas the callee uses a _k parameter of type {1}{2}",
-      contextK == ExtremePredicate.KType.Nat ? "nat" : "ORDINAL",
-      calleeK == ExtremePredicate.KType.Nat ? "nat" : "ORDINAL",
-      hint);
-  }
-
-  static CallingPosition Invert(CallingPosition cp) {
-    switch (cp) {
-      case CallingPosition.Positive: return CallingPosition.Negative;
-      case CallingPosition.Negative: return CallingPosition.Positive;
-      default: return CallingPosition.Neither;
-    }
-  }
-
-  protected override bool VisitOneExpr(Expression expr, ref CallingPosition cp) {
-    if (expr is UnaryOpExpr) {
-      var e = (UnaryOpExpr)expr;
-      if (e.Op == UnaryOpExpr.Opcode.Not) {
-        // for the sub-parts, use Invert(cp)
-        cp = Invert(cp);
-        return true;
-      }
-    } else if (expr is BinaryExpr) {
-      var e = (BinaryExpr)expr;
-      switch (e.ResolvedOp) {
-        case BinaryExpr.ResolvedOpcode.And:
-        case BinaryExpr.ResolvedOpcode.Or:
-          return true;  // do the sub-parts with the same "cp"
-        case BinaryExpr.ResolvedOpcode.Imp:
-          Visit(e.E0, Invert(cp));
-          Visit(e.E1, cp);
-          return false;  // don't recurse (again) on the sub-parts
-        default:
-          break;
-      }
-    } else if (expr is NestedMatchExpr) {
-      var e = (NestedMatchExpr)expr;
-      Visit(e.Source, CallingPosition.Neither);
-      var theCp = cp;
-      e.Cases.ForEach(kase => Visit((Expression)kase.Body, theCp));
-      return false;
-    } else if (expr is MatchExpr) {
-      var e = (MatchExpr)expr;
-      Visit(e.Source, CallingPosition.Neither);
-      var theCp = cp;
-      e.Cases.ForEach(kase => Visit(kase.Body, theCp));
-      return false;
-    } else if (expr is ITEExpr) {
-      var e = (ITEExpr)expr;
-      Visit(e.Test, CallingPosition.Neither);
-      Visit(e.Thn, cp);
-      Visit(e.Els, cp);
-      return false;
-    } else if (expr is LetExpr) {
-      var e = (LetExpr)expr;
-      foreach (var rhs in e.RHSs) {
-        Visit(rhs, CallingPosition.Neither);
-      }
-      var cpBody = cp;
-      if (!e.Exact) {
-        // a let-such-that expression introduces an existential that may depend on the _k in a least/greatest predicate, so we disallow recursive calls in the body of the let-such-that
-        if (IsCoContext && cp == CallingPosition.Positive) {
-          cpBody = CallingPosition.Neither;
-        } else if (!IsCoContext && cp == CallingPosition.Negative) {
-          cpBody = CallingPosition.Neither;
-        }
-      }
-      Visit(e.Body, cpBody);
-      return false;
-    } else if (expr is QuantifierExpr) {
-      var e = (QuantifierExpr)expr;
-      Contract.Assert(e.SplitQuantifier == null); // No split quantifiers during resolution
-      var cpos = IsCoContext ? cp : Invert(cp);
-      if (ContinuityIsImportant) {
-        if ((cpos == CallingPosition.Positive && e is ExistsExpr) || (cpos == CallingPosition.Negative && e is ForallExpr)) {
-          if (e.Bounds.Exists(bnd => bnd == null || (bnd.Virtues & ComprehensionExpr.BoundedPool.PoolVirtues.Finite) == 0)) {
-            // To ensure continuity of extreme predicates, don't allow calls under an existential (resp. universal) quantifier
-            // for greatest (resp. least) predicates).
-            cp = CallingPosition.Neither;
-          }
-        }
-      }
-      Visit(e.LogicalBody(), cp);
-      return false;
-    } else if (expr is StmtExpr) {
-      var e = (StmtExpr)expr;
-      Visit(e.E, cp);
-      Visit(e.S, CallingPosition.Neither);
-      return false;
-    } else if (expr is ConcreteSyntaxExpression) {
-      // do the sub-parts with the same "cp"
-      return true;
-    }
-    // do the sub-parts with cp := Neither
-    cp = CallingPosition.Neither;
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/FuelAdjustment.cs b/Source/DafnyCore/Resolver/FuelAdjustment.cs
index 0d26a0ad15f..b2749f62797 100644
--- a/Source/DafnyCore/Resolver/FuelAdjustment.cs
+++ b/Source/DafnyCore/Resolver/FuelAdjustment.cs
@@ -2,37 +2,37 @@
 using System.Diagnostics.Contracts;
 using System.Numerics;
 
-namespace Microsoft.Dafny; 
+namespace Microsoft.Dafny;
 
 public static class FuelAdjustment {
 
   public static void CheckForFuelAdjustments(ErrorReporter reporter, ModuleDefinition module) {
-    CheckForFuelAdjustments(reporter, module.tok, module.Attributes, module);
+    CheckForFuelAdjustments(reporter, module.Origin, module.Attributes, module);
     foreach (var clbl in ModuleDefinition.AllItersAndCallables(module.TopLevelDecls)) {
       Statement body = null;
       if (clbl is Method method) {
         body = method.Body;
-        CheckForFuelAdjustments(reporter, clbl.Tok, method.Attributes, module);
+        CheckForFuelAdjustments(reporter, clbl.Origin, method.Attributes, module);
       } else if (clbl is IteratorDecl iteratorDecl) {
         body = iteratorDecl.Body;
-        CheckForFuelAdjustments(reporter, clbl.Tok, iteratorDecl.Attributes, module);
+        CheckForFuelAdjustments(reporter, clbl.Origin, iteratorDecl.Attributes, module);
       } else if (clbl is Function function) {
-        CheckForFuelAdjustments(reporter, clbl.Tok, function.Attributes, module);
-        var c = new FuelAdjustment_Visitor(reporter);
+        CheckForFuelAdjustments(reporter, clbl.Origin, function.Attributes, module);
+        var c = new FuelAdjustmentVisitor(reporter);
         var bodyExpr = function.Body;
         if (bodyExpr != null) {
-          c.Visit(bodyExpr, new FuelAdjustment_Context(module));
+          c.Visit(bodyExpr, new FuelAdjustmentContext(module));
         }
       }
 
       if (body != null) {
-        var c = new FuelAdjustment_Visitor(reporter);
-        c.Visit(body, new FuelAdjustment_Context(module));
+        var c = new FuelAdjustmentVisitor(reporter);
+        c.Visit(body, new FuelAdjustmentContext(module));
       }
     }
   }
 
-  public static void CheckForFuelAdjustments(ErrorReporter reporter, IToken tok, Attributes attrs, ModuleDefinition currentModule) {
+  public static void CheckForFuelAdjustments(ErrorReporter reporter, IOrigin tok, Attributes attrs, ModuleDefinition currentModule) {
     List<List<Expression>> results = Attributes.FindAllExpressions(attrs, "fuel");
 
     if (results == null) {
@@ -68,22 +68,22 @@ public static void CheckForFuelAdjustments(ErrorReporter reporter, IToken tok, A
   }
 }
 
-class FuelAdjustment_Visitor : ResolverTopDownVisitor<FuelAdjustment_Context> {
+class FuelAdjustmentVisitor : ResolverTopDownVisitor<FuelAdjustmentContext> {
 
-  public FuelAdjustment_Visitor(ErrorReporter reporter)
+  public FuelAdjustmentVisitor(ErrorReporter reporter)
     : base(reporter) {
   }
 
-  protected override bool VisitOneStmt(Statement stmt, ref FuelAdjustment_Context st) {
-    FuelAdjustment.CheckForFuelAdjustments(reporter, stmt.Tok, stmt.Attributes, st.currentModule);
+  protected override bool VisitOneStmt(Statement stmt, ref FuelAdjustmentContext st) {
+    FuelAdjustment.CheckForFuelAdjustments(reporter, stmt.Origin, stmt.Attributes, st.currentModule);
     return true;
   }
 }
 
 
-public class FuelAdjustment_Context {
+public class FuelAdjustmentContext {
   public ModuleDefinition currentModule;
-  public FuelAdjustment_Context(ModuleDefinition currentModule) {
+  public FuelAdjustmentContext(ModuleDefinition currentModule) {
     this.currentModule = currentModule;
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/GhostInterestVisitor.cs b/Source/DafnyCore/Resolver/GhostInterestVisitor.cs
index b21503d47b0..aff26748a57 100644
--- a/Source/DafnyCore/Resolver/GhostInterestVisitor.cs
+++ b/Source/DafnyCore/Resolver/GhostInterestVisitor.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using JetBrains.Annotations;
-using Microsoft.Boogie;
 using static Microsoft.Dafny.ResolutionErrors;
 
 namespace Microsoft.Dafny;
@@ -33,7 +32,7 @@ protected void Error(ErrorId errorId, Expression expr, string msg, params object
     Contract.Requires(msgArgs != null);
     reporter.Error(MessageSource.Resolver, errorId, expr, msg, msgArgs);
   }
-  protected void Error(ErrorId errorId, IToken tok, string msg, params object[] msgArgs) {
+  protected void Error(ErrorId errorId, IOrigin tok, string msg, params object[] msgArgs) {
     Contract.Requires(tok != null);
     Contract.Requires(msg != null);
     Contract.Requires(msgArgs != null);
@@ -75,418 +74,467 @@ public void Visit(Statement stmt, bool mustBeErasable, [CanBeNull] string proofC
     Contract.Assume(!codeContext.IsGhost || mustBeErasable); // (this is really a precondition) CodeContext.IsGhost ==> mustBeErasable
     Contract.Assume(mustBeErasable || proofContext == null); // (this is really a precondition) !mustBeErasable ==> proofContext == null 
 
-    if (stmt is AssertStmt || stmt is AssumeStmt) {
-      stmt.IsGhost = true;
-      var assertStmt = stmt as AssertStmt;
-      if (assertStmt != null && assertStmt.Proof != null) {
-        Visit(assertStmt.Proof, true, "an assert-by body");
-      }
-
-    } else if (stmt is ExpectStmt) {
-      stmt.IsGhost = false;
-      var s = (ExpectStmt)stmt;
-      if (mustBeErasable) {
-        Error(ErrorId.r_expect_statement_is_not_ghost, stmt, "expect statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)");
-      } else {
-        ExpressionTester.CheckIsCompilable(resolver, reporter, s.Expr, codeContext);
-        // If not provided, the message is populated with a default value in resolution
-        Contract.Assert(s.Message != null);
-        ExpressionTester.CheckIsCompilable(resolver, reporter, s.Message, codeContext);
-      }
-
-    } else if (stmt is PrintStmt) {
-      var s = (PrintStmt)stmt;
-      if (mustBeErasable) {
-        Error(ErrorId.r_print_statement_is_not_ghost, stmt, "print statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)");
-      } else {
-        s.Args.ForEach(ee => ExpressionTester.CheckIsCompilable(resolver, reporter, ee, codeContext));
-      }
-
-    } else if (stmt is RevealStmt) {
-      var s = (RevealStmt)stmt;
-      s.ResolvedStatements.ForEach(ss => Visit(ss, true, "a reveal statement"));
-      s.IsGhost = s.ResolvedStatements.All(ss => ss.IsGhost);
-
-    } else if (stmt is BreakStmt) {
-      var s = (BreakStmt)stmt;
-      s.IsGhost = mustBeErasable;
-      if (s.IsGhost && !s.TargetStmt.IsGhost) {
-        var targetKind = s.TargetStmt is LoopStmt ? "loop" : "structure";
-        Error(ErrorId.r_ghost_break, stmt, $"ghost-context {s.Kind} statement is not allowed to {s.Kind} out of non-ghost {targetKind}");
-      }
-
-    } else if (stmt is ProduceStmt) {
-      var s = (ProduceStmt)stmt;
-      var kind = stmt is YieldStmt ? "yield" : "return";
-      if (mustBeErasable && !codeContext.IsGhost) {
-        Error(ErrorId.r_produce_statement_not_allowed_in_ghost, stmt, "{0} statement is not allowed in this context (because it is guarded by a specification-only expression)", kind);
-      }
-      if (s.HiddenUpdate != null) {
-        Visit(s.HiddenUpdate, mustBeErasable, proofContext);
-      }
+    switch (stmt) {
+      case AssertStmt or AssumeStmt:
+        stmt.IsGhost = true;
+        break;
+      case ExpectStmt expectStmt: {
+          expectStmt.IsGhost = false;
+          if (mustBeErasable) {
+            Error(ErrorId.r_expect_statement_is_not_ghost, expectStmt, "expect statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)");
+          } else {
+            ExpressionTester.CheckIsCompilable(resolver, reporter, expectStmt.Expr, codeContext);
+            // If not provided, the message is populated with a default value in resolution
+            Contract.Assert(expectStmt.Message != null);
+            ExpressionTester.CheckIsCompilable(resolver, reporter, expectStmt.Message, codeContext);
+          }
 
-    } else if (stmt is AssignSuchThatStmt) {
-      var s = (AssignSuchThatStmt)stmt;
-      s.IsGhost = mustBeErasable || s.AssumeToken != null || s.Lhss.Any(AssignStmt.LhsIsToGhost);
-      if (mustBeErasable && !codeContext.IsGhost) {
-        foreach (var lhs in s.Lhss) {
-          var gk = AssignStmt.LhsIsToGhost_Which(lhs);
-          if (gk != AssignStmt.NonGhostKind.IsGhost) {
-            Error(ErrorId.r_no_assign_to_var_in_ghost, lhs, "cannot assign to {0} in a ghost context", AssignStmt.NonGhostKind_To_String(gk));
+          break;
+        }
+      case PrintStmt printStmt: {
+          var s = printStmt;
+          if (mustBeErasable) {
+            Error(ErrorId.r_print_statement_is_not_ghost, printStmt, "print statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)");
+          } else {
+            s.Args.ForEach(ee => ExpressionTester.CheckIsCompilable(resolver, reporter, ee, codeContext));
           }
+
+          break;
         }
-      } else if (!mustBeErasable && s.AssumeToken == null && ExpressionTester.UsesSpecFeatures(s.Expr)) {
-        foreach (var lhs in s.Lhss) {
-          var gk = AssignStmt.LhsIsToGhost_Which(lhs);
-          if (gk != AssignStmt.NonGhostKind.IsGhost) {
-            Error(ErrorId.r_no_assign_ghost_to_var, lhs, "{0} cannot be assigned a value that depends on a ghost", AssignStmt.NonGhostKind_To_String(gk));
+      case HideRevealStmt hideRevealStmt:
+        hideRevealStmt.ResolvedStatements.ForEach(ss => Visit(ss, true, $"a {hideRevealStmt.Kind} statement"));
+        hideRevealStmt.IsGhost = hideRevealStmt.ResolvedStatements.All(ss => ss.IsGhost);
+        break;
+      case BreakOrContinueStmt breakStmt: {
+          var s = breakStmt;
+          s.IsGhost = mustBeErasable;
+          if (s.IsGhost && !s.TargetStmt.IsGhost) {
+            var targetKind = s.TargetStmt is LoopStmt ? "loop" : "structure";
+            Error(ErrorId.r_ghost_break, breakStmt, $"ghost-context {s.Kind} statement is not allowed to {s.Kind} out of non-ghost {targetKind}");
           }
+
+          break;
         }
-      }
+      case ProduceStmt produceStmt: {
+          var s = produceStmt;
+          var kind = produceStmt is YieldStmt ? "yield" : "return";
+          if (mustBeErasable && !codeContext.IsGhost) {
+            Error(ErrorId.r_produce_statement_not_allowed_in_ghost, produceStmt, "{0} statement is not allowed in this context (because it is guarded by a specification-only expression)", kind);
+          }
+          if (s.HiddenUpdate != null) {
+            Visit(s.HiddenUpdate, mustBeErasable, proofContext);
+          }
 
-    } else if (stmt is UpdateStmt) {
-      var s = (UpdateStmt)stmt;
-      s.ResolvedStatements.ForEach(ss => Visit(ss, mustBeErasable, proofContext));
-      s.IsGhost = s.ResolvedStatements.All(ss => ss.IsGhost);
-
-    } else if (stmt is AssignOrReturnStmt) {
-      var s = (AssignOrReturnStmt)stmt;
-      s.ResolvedStatements.ForEach(ss => Visit(ss, mustBeErasable, proofContext));
-      s.IsGhost = s.ResolvedStatements.All(ss => ss.IsGhost);
-
-    } else if (stmt is VarDeclStmt) {
-      var s = (VarDeclStmt)stmt;
-      if (mustBeErasable) {
-        foreach (var local in s.Locals) {
-          // a local variable in a specification-only context might as well be ghost
-          local.MakeGhost();
+          break;
         }
-      }
-      if (s.Update != null) {
-        Visit(s.Update, mustBeErasable, proofContext);
-      }
-      s.IsGhost = (s.Update == null || s.Update.IsGhost) && s.Locals.All(v => v.IsGhost);
-
-      // Check on "assumption" variables
-      foreach (var local in s.Locals) {
-        if (Attributes.Contains(local.Attributes, "assumption")) {
-          if (allowAssumptionVariables) {
-            if (!local.Type.IsBoolType) {
-              Error(ErrorId.r_assumption_var_must_be_bool, local.Tok, "assumption variable must be of type 'bool'");
+      case AssignSuchThatStmt thatStmt: {
+          var s = thatStmt;
+          s.IsGhost = mustBeErasable || s.AssumeToken != null || s.Lhss.Any(SingleAssignStmt.LhsIsToGhost);
+          if (mustBeErasable && !codeContext.IsGhost) {
+            foreach (var lhs in s.Lhss) {
+              var gk = SingleAssignStmt.LhsIsToGhost_Which(lhs);
+              if (gk != SingleAssignStmt.NonGhostKind.IsGhost) {
+                Error(ErrorId.r_no_assign_to_var_in_ghost, lhs, "cannot assign to {0} in a ghost context", SingleAssignStmt.NonGhostKind_To_String(gk));
+              }
             }
-            if (!local.IsGhost) {
-              Error(ErrorId.r_assumption_var_must_be_ghost, local.Tok, "assumption variable must be ghost");
+          } else if (!mustBeErasable && s.AssumeToken == null && ExpressionTester.UsesSpecFeatures(s.Expr)) {
+            foreach (var lhs in s.Lhss) {
+              var gk = SingleAssignStmt.LhsIsToGhost_Which(lhs);
+              if (gk != SingleAssignStmt.NonGhostKind.IsGhost) {
+                Error(ErrorId.r_no_assign_ghost_to_var, lhs, "{0} cannot be assigned a value that depends on a ghost", SingleAssignStmt.NonGhostKind_To_String(gk));
+              }
             }
-          } else {
-            Error(ErrorId.r_assumption_var_must_be_in_method, local.Tok, "assumption variable can only be declared in a method");
           }
-        }
-      }
 
-    } else if (stmt is VarDeclPattern) {
-      var s = (VarDeclPattern)stmt;
-
-      if (mustBeErasable) {
-        foreach (var local in s.LocalVars) {
-          local.MakeGhost();
+          break;
         }
-      }
-      if (s.HasGhostModifier || mustBeErasable) {
-        s.IsGhost = s.LocalVars.All(v => v.IsGhost);
-      } else {
-        var spec = ExpressionTester.UsesSpecFeatures(s.RHS);
-        if (spec) {
-          foreach (var local in s.LocalVars) {
-            local.MakeGhost();
-          }
-        } else {
-          ExpressionTester.CheckIsCompilable(resolver, reporter, s.RHS, codeContext);
+      case AssignStatement statement: {
+          var s = statement;
+          s.ResolvedStatements.ForEach(ss => Visit(ss, mustBeErasable, proofContext));
+          s.IsGhost = s.ResolvedStatements.All(ss => ss.IsGhost);
+          break;
         }
-        s.IsGhost = spec;
-      }
+      case AssignOrReturnStmt returnStmt: {
+          var s = returnStmt;
+          s.ResolvedStatements.ForEach(ss => Visit(ss, mustBeErasable, proofContext));
+          s.IsGhost = s.ResolvedStatements.All(ss => ss.IsGhost);
+          break;
+        }
+      case VarDeclStmt declStmt: {
+          var s = declStmt;
+          if (mustBeErasable) {
+            foreach (var local in s.Locals) {
+              // a local variable in a specification-only context might as well be ghost
+              local.MakeGhost();
+            }
+          }
+          if (s.Assign != null) {
+            Visit(s.Assign, mustBeErasable, proofContext);
+          }
+          s.IsGhost = (s.Assign == null || s.Assign.IsGhost) && s.Locals.All(v => v.IsGhost);
+
+          // Check on "assumption" variables
+          foreach (var local in s.Locals) {
+            if (Attributes.Contains(local.Attributes, "assumption")) {
+              if (allowAssumptionVariables) {
+                if (!local.Type.IsBoolType) {
+                  Error(ErrorId.r_assumption_var_must_be_bool, local.Origin, "assumption variable must be of type 'bool'");
+                }
+                if (!local.IsGhost) {
+                  Error(ErrorId.r_assumption_var_must_be_ghost, local.Origin, "assumption variable must be ghost");
+                }
+              } else {
+                Error(ErrorId.r_assumption_var_must_be_in_method, local.Origin, "assumption variable can only be declared in a method");
+              }
+            }
+          }
 
-    } else if (stmt is AssignStmt) {
-      var s = (AssignStmt)stmt;
-      CheckAssignStmt(s, mustBeErasable, proofContext);
-
-    } else if (stmt is CallStmt) {
-      var s = (CallStmt)stmt;
-      var callee = s.Method;
-      Contract.Assert(callee != null);  // follows from the invariant of CallStmt
-      s.IsGhost = callee.IsGhost;
-      if (proofContext != null && !callee.IsLemmaLike) {
-        Error(ErrorId.r_no_calls_in_proof, s, $"in {proofContext}, calls are allowed only to lemmas");
-      } else if (mustBeErasable) {
-        if (!s.IsGhost) {
-          Error(ErrorId.r_only_ghost_calls, s, "only ghost methods can be called from this context");
+          break;
         }
-      } else {
-        int j;
-        if (!callee.IsGhost) {
-          // check in-parameters
-          ExpressionTester.CheckIsCompilable(resolver, reporter, s.Receiver, codeContext);
-          j = 0;
-          foreach (var e in s.Args) {
-            Contract.Assume(j < callee.Ins.Count);  // this should have already been checked by the resolver
-            if (!callee.Ins[j].IsGhost) {
-              ExpressionTester.CheckIsCompilable(resolver, reporter, e, codeContext);
+      case VarDeclPattern pattern: {
+          var s = pattern;
+
+          if (mustBeErasable) {
+            foreach (var local in s.LocalVars) {
+              local.MakeGhost();
+            }
+          }
+          if (s.HasGhostModifier || mustBeErasable) {
+            s.IsGhost = s.LocalVars.All(v => v.IsGhost);
+          } else {
+            var spec = ExpressionTester.UsesSpecFeatures(s.RHS);
+            if (spec) {
+              foreach (var local in s.LocalVars) {
+                local.MakeGhost();
+              }
+            } else {
+              ExpressionTester.CheckIsCompilable(resolver, reporter, s.RHS, codeContext);
             }
-            j++;
+            s.IsGhost = spec;
           }
+
+          break;
+        }
+      case SingleAssignStmt assignStmt: {
+          var s = assignStmt;
+          CheckAssignStmt(s, mustBeErasable, proofContext);
+          break;
         }
-        j = 0;
-        foreach (var e in s.Lhs) {
-          var resolvedLhs = e.Resolved;
-          if (callee.IsGhost || callee.Outs[j].IsGhost) {
-            // LHS must denote a ghost
-            if (resolvedLhs is IdentifierExpr) {
-              var ll = (IdentifierExpr)resolvedLhs;
-              if (!ll.Var.IsGhost) {
-                if (ll is AutoGhostIdentifierExpr && ll.Var is LocalVariable) {
-                  // the variable was actually declared in this statement, so auto-declare it as ghost
-                  ((LocalVariable)ll.Var).MakeGhost();
+      case CallStmt callStmt: {
+          var s = callStmt;
+          var callee = s.Method;
+          Contract.Assert(callee != null);  // follows from the invariant of CallStmt
+          s.IsGhost = callee.IsGhost;
+          if (proofContext != null && !callee.IsLemmaLike) {
+            Error(ErrorId.r_no_calls_in_proof, s, $"in {proofContext}, calls are allowed only to lemmas");
+          } else if (mustBeErasable) {
+            if (!s.IsGhost) {
+              Error(ErrorId.r_only_ghost_calls, s, "only ghost methods can be called from this context");
+            }
+          } else {
+            int j;
+            if (!callee.IsGhost) {
+              // check in-parameters
+              ExpressionTester.CheckIsCompilable(resolver, reporter, s.Receiver, codeContext);
+              j = 0;
+              foreach (var e in s.Args) {
+                Contract.Assume(j < callee.Ins.Count);  // this should have already been checked by the resolver
+                if (!callee.Ins[j].IsGhost) {
+                  ExpressionTester.CheckIsCompilable(resolver, reporter, e, codeContext);
+                }
+                j++;
+              }
+            }
+            j = 0;
+            foreach (var e in s.Lhs) {
+              var resolvedLhs = e.Resolved;
+              if (callee.IsGhost || callee.Outs[j].IsGhost) {
+                // LHS must denote a ghost
+                if (resolvedLhs is IdentifierExpr) {
+                  var ll = (IdentifierExpr)resolvedLhs;
+                  if (!ll.Var.IsGhost) {
+                    if (ll is AutoGhostIdentifierExpr && ll.Var is LocalVariable) {
+                      // the variable was actually declared in this statement, so auto-declare it as ghost
+                      ((LocalVariable)ll.Var).MakeGhost();
+                    } else {
+                      Error(ErrorId.r_out_parameter_must_be_ghost, s, "actual out-parameter{0} is required to be a ghost variable", s.Lhs.Count == 1 ? "" : " " + j);
+                    }
+                  }
+                } else if (resolvedLhs is MemberSelectExpr) {
+                  var ll = (MemberSelectExpr)resolvedLhs;
+                  if (!ll.Member.IsGhost) {
+                    Error(ErrorId.r_out_parameter_must_be_ghost_field, s, "actual out-parameter{0} is required to be a ghost field", s.Lhs.Count == 1 ? "" : " " + j);
+                  }
                 } else {
+                  // this is an array update, and arrays are always non-ghost
                   Error(ErrorId.r_out_parameter_must_be_ghost, s, "actual out-parameter{0} is required to be a ghost variable", s.Lhs.Count == 1 ? "" : " " + j);
                 }
               }
-            } else if (resolvedLhs is MemberSelectExpr) {
-              var ll = (MemberSelectExpr)resolvedLhs;
-              if (!ll.Member.IsGhost) {
-                Error(ErrorId.r_out_parameter_must_be_ghost_field, s, "actual out-parameter{0} is required to be a ghost field", s.Lhs.Count == 1 ? "" : " " + j);
-              }
-            } else {
-              // this is an array update, and arrays are always non-ghost
-              Error(ErrorId.r_out_parameter_must_be_ghost, s, "actual out-parameter{0} is required to be a ghost variable", s.Lhs.Count == 1 ? "" : " " + j);
+              j++;
             }
           }
-          j++;
-        }
-      }
 
-    } else if (stmt is BlockStmt) {
-      var s = (BlockStmt)stmt;
-      s.IsGhost = mustBeErasable;  // set .IsGhost before descending into substatements (since substatements may do a 'break' out of this block)
-      if (s is DividedBlockStmt ds) {
-        var giv = new GhostInterestVisitor(this.codeContext, this.resolver, this.reporter, true, allowAssumptionVariables);
-        ds.BodyInit.ForEach(ss => giv.Visit(ss, mustBeErasable, proofContext));
-        ds.BodyProper.ForEach(ss => Visit(ss, mustBeErasable, proofContext));
-      } else {
-        s.Body.ForEach(ss => Visit(ss, mustBeErasable, proofContext));
-      }
-      s.IsGhost = s.IsGhost || s.Body.All(ss => ss.IsGhost);  // mark the block statement as ghost if all its substatements are ghost
+          break;
+        }
+      case BlockStmt blockStmt: {
+          var s = blockStmt;
+          s.IsGhost = mustBeErasable;  // set .IsGhost before descending into substatements (since substatements may do a 'break' out of this block)
+          if (s is DividedBlockStmt ds) {
+            var giv = new GhostInterestVisitor(this.codeContext, this.resolver, this.reporter, true, allowAssumptionVariables);
+            ds.BodyInit.ForEach(ss => giv.Visit(ss, mustBeErasable, proofContext));
+            ds.BodyProper.ForEach(ss => Visit(ss, mustBeErasable, proofContext));
+          } else {
+            s.Body.ForEach(ss => Visit(ss, mustBeErasable, proofContext));
+          }
+          s.IsGhost = s.IsGhost || s.Body.All(ss => ss.IsGhost);  // mark the block statement as ghost if all its substatements are ghost
+          break;
+        }
+      case IfStmt ifStmt: {
+          var s = ifStmt;
+          s.IsGhost = mustBeErasable || (s.Guard != null && ExpressionTester.UsesSpecFeatures(s.Guard));
+          if (!mustBeErasable && s.IsGhost) {
+            reporter.Info(MessageSource.Resolver, s.Origin, "ghost if");
+          }
+          Visit(s.Thn, s.IsGhost, proofContext);
+          if (s.Els != null) {
+            Visit(s.Els, s.IsGhost, proofContext);
+          }
+          // if both branches were all ghost, then we can mark the enclosing statement as ghost as well
+          s.IsGhost = s.IsGhost || (s.Thn.IsGhost && (s.Els == null || s.Els.IsGhost));
+          if (!s.IsGhost && s.Guard != null) {
+            // If there were features in the guard that are treated differently in ghost and non-ghost
+            // contexts, make sure they get treated for non-ghost use.
+            ExpressionTester.CheckIsCompilable(resolver, reporter, s.Guard, codeContext);
+          }
 
-    } else if (stmt is IfStmt) {
-      var s = (IfStmt)stmt;
-      s.IsGhost = mustBeErasable || (s.Guard != null && ExpressionTester.UsesSpecFeatures(s.Guard));
-      if (!mustBeErasable && s.IsGhost) {
-        reporter.Info(MessageSource.Resolver, s.Tok, "ghost if");
-      }
-      Visit(s.Thn, s.IsGhost, proofContext);
-      if (s.Els != null) {
-        Visit(s.Els, s.IsGhost, proofContext);
-      }
-      // if both branches were all ghost, then we can mark the enclosing statement as ghost as well
-      s.IsGhost = s.IsGhost || (s.Thn.IsGhost && (s.Els == null || s.Els.IsGhost));
-      if (!s.IsGhost && s.Guard != null) {
-        // If there were features in the guard that are treated differently in ghost and non-ghost
-        // contexts, make sure they get treated for non-ghost use.
-        ExpressionTester.CheckIsCompilable(resolver, reporter, s.Guard, codeContext);
-      }
+          break;
+        }
+      case AlternativeStmt alternativeStmt: {
+          var s = alternativeStmt;
+          s.IsGhost = mustBeErasable || s.Alternatives.Exists(alt => ExpressionTester.UsesSpecFeatures(alt.Guard));
+          if (!mustBeErasable && s.IsGhost) {
+            reporter.Info(MessageSource.Resolver, s.Origin, "ghost if");
+          }
+          s.Alternatives.ForEach(alt => alt.Body.ForEach(ss => Visit(ss, s.IsGhost, proofContext)));
+          s.IsGhost = s.IsGhost || s.Alternatives.All(alt => alt.Body.All(ss => ss.IsGhost));
+          if (!s.IsGhost) {
+            // If there were features in the guards that are treated differently in ghost and non-ghost
+            // contexts, make sure they get treated for non-ghost use.
+            foreach (var alt in s.Alternatives) {
+              ExpressionTester.CheckIsCompilable(resolver, reporter, alt.Guard, codeContext);
+            }
+          }
 
-    } else if (stmt is AlternativeStmt) {
-      var s = (AlternativeStmt)stmt;
-      s.IsGhost = mustBeErasable || s.Alternatives.Exists(alt => ExpressionTester.UsesSpecFeatures(alt.Guard));
-      if (!mustBeErasable && s.IsGhost) {
-        reporter.Info(MessageSource.Resolver, s.Tok, "ghost if");
-      }
-      s.Alternatives.ForEach(alt => alt.Body.ForEach(ss => Visit(ss, s.IsGhost, proofContext)));
-      s.IsGhost = s.IsGhost || s.Alternatives.All(alt => alt.Body.All(ss => ss.IsGhost));
-      if (!s.IsGhost) {
-        // If there were features in the guards that are treated differently in ghost and non-ghost
-        // contexts, make sure they get treated for non-ghost use.
-        foreach (var alt in s.Alternatives) {
-          ExpressionTester.CheckIsCompilable(resolver, reporter, alt.Guard, codeContext);
+          break;
         }
-      }
+      case WhileStmt whileStmt: {
+          var s = whileStmt;
+          if (proofContext != null && s.Mod.Expressions != null && s.Mod.Expressions.Count != 0) {
+            Error(ErrorId.r_loop_may_not_use_modifies, s.Mod.Expressions[0].Origin, $"a loop in {proofContext} is not allowed to use 'modifies' clauses");
+          }
 
-    } else if (stmt is WhileStmt) {
-      var s = (WhileStmt)stmt;
-      if (proofContext != null && s.Mod.Expressions != null && s.Mod.Expressions.Count != 0) {
-        Error(ErrorId.r_loop_may_not_use_modifies, s.Mod.Expressions[0].tok, $"a loop in {proofContext} is not allowed to use 'modifies' clauses");
-      }
+          s.IsGhost = mustBeErasable || (s.Guard != null && ExpressionTester.UsesSpecFeatures(s.Guard));
+          if (!mustBeErasable && s.IsGhost) {
+            reporter.Info(MessageSource.Resolver, s.Origin, "ghost while");
+          }
+          if (s.IsGhost && s.Decreases.Expressions.Exists(e => e is WildcardExpr)) {
+            Error(ErrorId.r_decreases_forbidden_on_ghost_loops, s, "'decreases *' is not allowed on ghost loops");
+          }
+          if (s.IsGhost && s.Mod.Expressions != null) {
+            s.Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
+          }
+          if (s.Body != null) {
+            Visit(s.Body, s.IsGhost, proofContext);
+            if (s.Body.IsGhost && !s.Decreases.Expressions.Exists(e => e is WildcardExpr)) {
+              s.IsGhost = true;
+            }
+          }
+          if (!s.IsGhost && s.Guard != null) {
+            // If there were features in the guard that are treated differently in ghost and non-ghost
+            // contexts, make sure they get treated for non-ghost use.
+            ExpressionTester.CheckIsCompilable(resolver, reporter, s.Guard, codeContext);
+          }
 
-      s.IsGhost = mustBeErasable || (s.Guard != null && ExpressionTester.UsesSpecFeatures(s.Guard));
-      if (!mustBeErasable && s.IsGhost) {
-        reporter.Info(MessageSource.Resolver, s.Tok, "ghost while");
-      }
-      if (s.IsGhost && s.Decreases.Expressions.Exists(e => e is WildcardExpr)) {
-        Error(ErrorId.r_decreases_forbidden_on_ghost_loops, s, "'decreases *' is not allowed on ghost loops");
-      }
-      if (s.IsGhost && s.Mod.Expressions != null) {
-        s.Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
-      }
-      if (s.Body != null) {
-        Visit(s.Body, s.IsGhost, proofContext);
-        if (s.Body.IsGhost && !s.Decreases.Expressions.Exists(e => e is WildcardExpr)) {
-          s.IsGhost = true;
+          break;
         }
-      }
-      if (!s.IsGhost && s.Guard != null) {
-        // If there were features in the guard that are treated differently in ghost and non-ghost
-        // contexts, make sure they get treated for non-ghost use.
-        ExpressionTester.CheckIsCompilable(resolver, reporter, s.Guard, codeContext);
-      }
+      case AlternativeLoopStmt loopStmt: {
+          var s = loopStmt;
+          if (proofContext != null && s.Mod.Expressions != null && s.Mod.Expressions.Count != 0) {
+            Error(ErrorId.r_loop_in_proof_may_not_use_modifies, s.Mod.Expressions[0].Origin, $"a loop in {proofContext} is not allowed to use 'modifies' clauses");
+          }
 
-    } else if (stmt is AlternativeLoopStmt) {
-      var s = (AlternativeLoopStmt)stmt;
-      if (proofContext != null && s.Mod.Expressions != null && s.Mod.Expressions.Count != 0) {
-        Error(ErrorId.r_loop_in_proof_may_not_use_modifies, s.Mod.Expressions[0].tok, $"a loop in {proofContext} is not allowed to use 'modifies' clauses");
-      }
+          s.IsGhost = mustBeErasable || s.Alternatives.Exists(alt => ExpressionTester.UsesSpecFeatures(alt.Guard));
+          if (!mustBeErasable && s.IsGhost) {
+            reporter.Info(MessageSource.Resolver, s.Origin, "ghost while");
+          }
+          if (s.IsGhost && s.Decreases.Expressions.Exists(e => e is WildcardExpr)) {
+            Error(ErrorId.r_decreases_forbidden_on_ghost_loops, s, "'decreases *' is not allowed on ghost loops");
+          }
+          if (s.IsGhost && s.Mod.Expressions != null) {
+            s.Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
+          }
+          s.Alternatives.ForEach(alt => alt.Body.ForEach(ss => Visit(ss, s.IsGhost, proofContext)));
+          s.IsGhost = s.IsGhost || (!s.Decreases.Expressions.Exists(e => e is WildcardExpr) && s.Alternatives.All(alt => alt.Body.All(ss => ss.IsGhost)));
+          if (!s.IsGhost) {
+            // If there were features in the guards that are treated differently in ghost and non-ghost
+            // contexts, make sure they get treated for non-ghost use.
+            foreach (var alt in s.Alternatives) {
+              ExpressionTester.CheckIsCompilable(resolver, reporter, alt.Guard, codeContext);
+            }
+          }
 
-      s.IsGhost = mustBeErasable || s.Alternatives.Exists(alt => ExpressionTester.UsesSpecFeatures(alt.Guard));
-      if (!mustBeErasable && s.IsGhost) {
-        reporter.Info(MessageSource.Resolver, s.Tok, "ghost while");
-      }
-      if (s.IsGhost && s.Decreases.Expressions.Exists(e => e is WildcardExpr)) {
-        Error(ErrorId.r_decreases_forbidden_on_ghost_loops, s, "'decreases *' is not allowed on ghost loops");
-      }
-      if (s.IsGhost && s.Mod.Expressions != null) {
-        s.Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
-      }
-      s.Alternatives.ForEach(alt => alt.Body.ForEach(ss => Visit(ss, s.IsGhost, proofContext)));
-      s.IsGhost = s.IsGhost || (!s.Decreases.Expressions.Exists(e => e is WildcardExpr) && s.Alternatives.All(alt => alt.Body.All(ss => ss.IsGhost)));
-      if (!s.IsGhost) {
-        // If there were features in the guards that are treated differently in ghost and non-ghost
-        // contexts, make sure they get treated for non-ghost use.
-        foreach (var alt in s.Alternatives) {
-          ExpressionTester.CheckIsCompilable(resolver, reporter, alt.Guard, codeContext);
+          break;
         }
-      }
+      case ForLoopStmt loopStmt: {
+          var s = loopStmt;
+          if (proofContext != null && s.Mod.Expressions != null && s.Mod.Expressions.Count != 0) {
+            Error(ErrorId.r_loop_in_proof_may_not_use_modifies, s.Mod.Expressions[0].Origin, $"a loop in {proofContext} is not allowed to use 'modifies' clauses");
+          }
 
-    } else if (stmt is ForLoopStmt) {
-      var s = (ForLoopStmt)stmt;
-      if (proofContext != null && s.Mod.Expressions != null && s.Mod.Expressions.Count != 0) {
-        Error(ErrorId.r_loop_in_proof_may_not_use_modifies, s.Mod.Expressions[0].tok, $"a loop in {proofContext} is not allowed to use 'modifies' clauses");
-      }
+          s.IsGhost = mustBeErasable || ExpressionTester.UsesSpecFeatures(s.Start) || (s.End != null && ExpressionTester.UsesSpecFeatures(s.End));
+          if (!mustBeErasable && s.IsGhost) {
+            reporter.Info(MessageSource.Resolver, s.Origin, "ghost for-loop");
+          }
+          if (s.IsGhost) {
+            if (s.Decreases.Expressions.Exists(e => e is WildcardExpr)) {
+              Error(ErrorId.r_decreases_forbidden_on_ghost_loops, s, "'decreases *' is not allowed on ghost loops");
+            } else if (s.End == null && s.Decreases.Expressions.Count == 0) {
+              Error(ErrorId.r_ghost_loop_must_terminate, s, "a ghost loop must be terminating; make the end-expression specific or add a 'decreases' clause");
+            }
+          }
+          if (s.IsGhost && s.Mod.Expressions != null) {
+            s.Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
+          }
+          if (s.Body != null) {
+            Visit(s.Body, s.IsGhost, proofContext);
+            if (s.Body.IsGhost) {
+              s.IsGhost = true;
+            }
+          }
+          if (!s.IsGhost) {
+            // If there were features in the bounds that are treated differently in ghost and non-ghost
+            // contexts, make sure they get treated for non-ghost use.
+            ExpressionTester.CheckIsCompilable(resolver, reporter, s.Start, codeContext);
+            if (s.End != null) {
+              ExpressionTester.CheckIsCompilable(resolver, reporter, s.End, codeContext);
+            }
+          }
 
-      s.IsGhost = mustBeErasable || ExpressionTester.UsesSpecFeatures(s.Start) || (s.End != null && ExpressionTester.UsesSpecFeatures(s.End));
-      if (!mustBeErasable && s.IsGhost) {
-        reporter.Info(MessageSource.Resolver, s.Tok, "ghost for-loop");
-      }
-      if (s.IsGhost) {
-        if (s.Decreases.Expressions.Exists(e => e is WildcardExpr)) {
-          Error(ErrorId.r_decreases_forbidden_on_ghost_loops, s, "'decreases *' is not allowed on ghost loops");
-        } else if (s.End == null && s.Decreases.Expressions.Count == 0) {
-          Error(ErrorId.r_ghost_loop_must_terminate, s, "a ghost loop must be terminating; make the end-expression specific or add a 'decreases' clause");
-        }
-      }
-      if (s.IsGhost && s.Mod.Expressions != null) {
-        s.Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
-      }
-      if (s.Body != null) {
-        Visit(s.Body, s.IsGhost, proofContext);
-        if (s.Body.IsGhost) {
-          s.IsGhost = true;
-        }
-      }
-      if (!s.IsGhost) {
-        // If there were features in the bounds that are treated differently in ghost and non-ghost
-        // contexts, make sure they get treated for non-ghost use.
-        ExpressionTester.CheckIsCompilable(resolver, reporter, s.Start, codeContext);
-        if (s.End != null) {
-          ExpressionTester.CheckIsCompilable(resolver, reporter, s.End, codeContext);
+          break;
         }
-      }
-
-    } else if (stmt is ForallStmt) {
-      var s = (ForallStmt)stmt;
-      s.IsGhost = mustBeErasable || s.Kind != ForallStmt.BodyKind.Assign || ExpressionTester.UsesSpecFeatures(s.Range);
-      if (proofContext != null && s.Kind == ForallStmt.BodyKind.Assign) {
-        Error(ErrorId.r_no_aggregate_heap_update_in_proof, s, $"{proofContext} is not allowed to perform an aggregate heap update");
-      } else if (s.Body != null) {
-        Visit(s.Body, s.IsGhost, s.Kind == ForallStmt.BodyKind.Assign ? proofContext : "a forall statement");
-      }
-      s.IsGhost = s.IsGhost || s.Body == null || s.Body.IsGhost;
+      case ForallStmt forallStmt: {
+          var s = forallStmt;
+          s.IsGhost = mustBeErasable || s.Kind != ForallStmt.BodyKind.Assign || ExpressionTester.UsesSpecFeatures(s.Range);
+          if (proofContext != null && s.Kind == ForallStmt.BodyKind.Assign) {
+            Error(ErrorId.r_no_aggregate_heap_update_in_proof, s, $"{proofContext} is not allowed to perform an aggregate heap update");
+          } else if (s.Body != null) {
+            Visit(s.Body, s.IsGhost, s.Kind == ForallStmt.BodyKind.Assign ? proofContext : "a forall statement");
+          }
+          s.IsGhost = s.IsGhost || s.Body == null || s.Body.IsGhost;
+
+          if (!s.IsGhost) {
+            // Since we've determined this is a non-ghost forall statement, we now check that the bound variables have compilable bounds.
+            var uncompilableBoundVars = s.UncompilableBoundVars();
+            if (uncompilableBoundVars.Count != 0) {
+              foreach (var bv in uncompilableBoundVars) {
+                Error(ErrorId.r_unknown_bounds_for_forall, s, "forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for '{0}'", bv.Name);
+              }
+            }
 
-      if (!s.IsGhost) {
-        // Since we've determined this is a non-ghost forall statement, we now check that the bound variables have compilable bounds.
-        var uncompilableBoundVars = s.UncompilableBoundVars();
-        if (uncompilableBoundVars.Count != 0) {
-          foreach (var bv in uncompilableBoundVars) {
-            Error(ErrorId.r_unknown_bounds_for_forall, s, "forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for '{0}'", bv.Name);
+            // If there were features in the range that are treated differently in ghost and non-ghost
+            // contexts, make sure they get treated for non-ghost use.
+            ExpressionTester.CheckIsCompilable(resolver, reporter, s.Range, codeContext);
           }
-        }
 
-        // If there were features in the range that are treated differently in ghost and non-ghost
-        // contexts, make sure they get treated for non-ghost use.
-        ExpressionTester.CheckIsCompilable(resolver, reporter, s.Range, codeContext);
-      }
+          break;
+        }
+      case ModifyStmt modifyStmt: {
+          var s = modifyStmt;
+          if (proofContext != null) {
+            Error(ErrorId.r_modify_forbidden_in_proof, modifyStmt, $"a modify statement is not allowed in {proofContext}");
+          }
 
-    } else if (stmt is ModifyStmt) {
-      var s = (ModifyStmt)stmt;
-      if (proofContext != null) {
-        Error(ErrorId.r_modify_forbidden_in_proof, stmt, $"a modify statement is not allowed in {proofContext}");
-      }
+          s.IsGhost = mustBeErasable;
+          if (s.IsGhost) {
+            s.Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
+          }
+          if (s.Body != null) {
+            Visit(s.Body, mustBeErasable, proofContext);
+          }
 
-      s.IsGhost = mustBeErasable;
-      if (s.IsGhost) {
-        s.Mod.Expressions.ForEach(resolver.DisallowNonGhostFieldSpecifiers);
-      }
-      if (s.Body != null) {
-        Visit(s.Body, mustBeErasable, proofContext);
-      }
+          break;
+        }
+      case CalcStmt calcStmt: {
+          var s = calcStmt;
+          s.IsGhost = true;
+          foreach (var h in s.Hints) {
+            Visit(h, true, "a hint");
+          }
 
-    } else if (stmt is CalcStmt) {
-      var s = (CalcStmt)stmt;
-      s.IsGhost = true;
-      foreach (var h in s.Hints) {
-        Visit(h, true, "a hint");
-      }
+          break;
+        }
+      case NestedMatchStmt nestedMatchStmt: {
+          var hasGhostPattern = nestedMatchStmt.Cases.
+            SelectMany(caze => caze.Pat.DescendantsAndSelf)
+            .OfType<IdPattern>().Any(idPattern => idPattern.Ctor != null && idPattern.Ctor.IsGhost);
+          nestedMatchStmt.IsGhost = mustBeErasable || ExpressionTester.UsesSpecFeatures(nestedMatchStmt.Source) || hasGhostPattern;
+
+          foreach (var kase in nestedMatchStmt.Cases) {
+            ExpressionTester.MakeGhostAsNeeded(kase.Pat, nestedMatchStmt.IsGhost);
+          }
 
-    } else if (stmt is NestedMatchStmt nestedMatchStmt) {
-      var hasGhostPattern = nestedMatchStmt.Cases.
-        SelectMany(caze => caze.Pat.DescendantsAndSelf)
-        .OfType<IdPattern>().Any(idPattern => idPattern.Ctor != null && idPattern.Ctor.IsGhost);
-      nestedMatchStmt.IsGhost = mustBeErasable || ExpressionTester.UsesSpecFeatures(nestedMatchStmt.Source) || hasGhostPattern;
+          if (!mustBeErasable && nestedMatchStmt.IsGhost) {
+            reporter.Info(MessageSource.Resolver, nestedMatchStmt.Origin, "ghost match");
+          }
+          nestedMatchStmt.Cases.ForEach(kase => kase.Body.ForEach(ss => Visit(ss, nestedMatchStmt.IsGhost, proofContext)));
+          nestedMatchStmt.IsGhost = nestedMatchStmt.IsGhost || nestedMatchStmt.Cases.All(kase => kase.Body.All(ss => ss.IsGhost));
+          if (!nestedMatchStmt.IsGhost) {
+            // If there were features in the source expression that are treated differently in ghost and non-ghost
+            // contexts, make sure they get treated for non-ghost use.
+            ExpressionTester.CheckIsCompilable(resolver, reporter, nestedMatchStmt.Source, codeContext);
+          }
 
-      if (!mustBeErasable && nestedMatchStmt.IsGhost) {
-        reporter.Info(MessageSource.Resolver, nestedMatchStmt.Tok, "ghost match");
-      }
-      nestedMatchStmt.Cases.ForEach(kase => kase.Body.ForEach(ss => Visit(ss, nestedMatchStmt.IsGhost, proofContext)));
-      nestedMatchStmt.IsGhost = nestedMatchStmt.IsGhost || nestedMatchStmt.Cases.All(kase => kase.Body.All(ss => ss.IsGhost));
-      if (!nestedMatchStmt.IsGhost) {
-        // If there were features in the source expression that are treated differently in ghost and non-ghost
-        // contexts, make sure they get treated for non-ghost use.
-        ExpressionTester.CheckIsCompilable(resolver, reporter, nestedMatchStmt.Source, codeContext);
-      }
-    } else if (stmt is MatchStmt) {
-      var s = (MatchStmt)stmt;
-      s.IsGhost = mustBeErasable || ExpressionTester.UsesSpecFeatures(s.Source) || ExpressionTester.FirstCaseThatDependsOnGhostCtor(s.Cases) != null;
-      if (!mustBeErasable && s.IsGhost) {
-        reporter.Info(MessageSource.Resolver, s.Tok, "ghost match");
-      }
-      s.Cases.ForEach(kase => kase.Body.ForEach(ss => Visit(ss, s.IsGhost, proofContext)));
-      s.IsGhost = s.IsGhost || s.Cases.All(kase => kase.Body.All(ss => ss.IsGhost));
-      if (!s.IsGhost) {
-        // If there were features in the source expression that are treated differently in ghost and non-ghost
-        // contexts, make sure they get treated for non-ghost use.
-        ExpressionTester.CheckIsCompilable(resolver, reporter, s.Source, codeContext);
-      }
+          break;
+        }
+      case MatchStmt matchStmt: {
+          var s = matchStmt;
+          s.IsGhost = mustBeErasable || ExpressionTester.UsesSpecFeatures(s.Source) || ExpressionTester.FirstCaseThatDependsOnGhostCtor(s.Cases) != null;
+          if (!mustBeErasable && s.IsGhost) {
+            reporter.Info(MessageSource.Resolver, s.Origin, "ghost match");
+          }
+          s.Cases.ForEach(kase => kase.Body.ForEach(ss => Visit(ss, s.IsGhost, proofContext)));
+          s.IsGhost = s.IsGhost || s.Cases.All(kase => kase.Body.All(ss => ss.IsGhost));
+          if (!s.IsGhost) {
+            // If there were features in the source expression that are treated differently in ghost and non-ghost
+            // contexts, make sure they get treated for non-ghost use.
+            ExpressionTester.CheckIsCompilable(resolver, reporter, s.Source, codeContext);
+          }
 
-    } else if (stmt is SkeletonStatement) {
-      var s = (SkeletonStatement)stmt;
-      s.IsGhost = mustBeErasable;
-      if (s.S != null) {
-        Visit(s.S, mustBeErasable, proofContext);
-        s.IsGhost = s.IsGhost || s.S.IsGhost;
-      }
+          break;
+        }
+      case SkeletonStatement statement: {
+          var s = statement;
+          s.IsGhost = mustBeErasable;
+          if (s.S != null) {
+            Visit(s.S, mustBeErasable, proofContext);
+            s.IsGhost = s.IsGhost || s.S.IsGhost;
+          }
 
-    } else {
-      Contract.Assert(false); throw new cce.UnreachableException();
+          break;
+        }
+      case BlockByProofStmt blockByProofStmt:
+        blockByProofStmt.IsGhost = mustBeErasable;  // set .IsGhost before descending into substatements (since substatements may do a 'break' out of this block)
+        Visit(blockByProofStmt.Body, mustBeErasable, proofContext);
+        blockByProofStmt.IsGhost = blockByProofStmt.IsGhost || blockByProofStmt.Body.IsGhost;
+
+        Visit(blockByProofStmt.Proof, true, "a by block");
+        break;
+      default:
+        Contract.Assert(false); throw new cce.UnreachableException();
     }
   }
 
-  private void CheckAssignStmt(AssignStmt s, bool mustBeErasable, [CanBeNull] string proofContext) {
+  private void CheckAssignStmt(SingleAssignStmt s, bool mustBeErasable, [CanBeNull] string proofContext) {
     Contract.Requires(s != null);
     Contract.Requires(mustBeErasable || proofContext == null);
 
@@ -510,19 +558,19 @@ private void CheckAssignStmt(AssignStmt s, bool mustBeErasable, [CanBeNull] stri
     }
 
     if (proofContext != null && s.Rhs is TypeRhs) {
-      Error(ErrorId.r_new_forbidden_in_proof, s.Rhs.Tok, $"{proofContext} is not allowed to use 'new'");
+      Error(ErrorId.r_new_forbidden_in_proof, s.Rhs.Origin, $"{proofContext} is not allowed to use 'new'");
     }
 
-    var gk = AssignStmt.LhsIsToGhost_Which(lhs);
-    if (gk == AssignStmt.NonGhostKind.IsGhost) {
+    var gk = SingleAssignStmt.LhsIsToGhost_Which(lhs);
+    if (gk == SingleAssignStmt.NonGhostKind.IsGhost) {
       s.IsGhost = true;
       if (proofContext != null && !(lhs is IdentifierExpr)) {
-        Error(ErrorId.r_no_heap_update_in_proof, lhs.tok, $"{proofContext} is not allowed to make heap updates");
+        Error(ErrorId.r_no_heap_update_in_proof, lhs.Origin, $"{proofContext} is not allowed to make heap updates");
       }
       if (s.Rhs is TypeRhs tRhs && tRhs.InitCall != null) {
         Visit(tRhs.InitCall, true, proofContext);
       }
-    } else if (gk == AssignStmt.NonGhostKind.Variable && codeContext.IsGhost) {
+    } else if (gk == SingleAssignStmt.NonGhostKind.Variable && codeContext.IsGhost) {
       // cool
     } else if (mustBeErasable) {
       if (inConstructorInitializationPhase && codeContext is Constructor && codeContext.IsGhost && lhs is MemberSelectExpr mse &&
@@ -535,19 +583,19 @@ private void CheckAssignStmt(AssignStmt s, bool mustBeErasable, [CanBeNull] stri
         } else {
           reason = "the statement is in a ghost context; e.g., it may be guarded by a specification-only expression";
         }
-        Error(ErrorId.r_assignment_forbidden_in_context, s, $"assignment to {AssignStmt.NonGhostKind_To_String(gk)} is not allowed in this context, because {reason}");
+        Error(ErrorId.r_assignment_forbidden_in_context, s, $"assignment to {SingleAssignStmt.NonGhostKind_To_String(gk)} is not allowed in this context, because {reason}");
       }
     } else {
-      if (gk == AssignStmt.NonGhostKind.Field) {
+      if (gk == SingleAssignStmt.NonGhostKind.Field) {
         var mse = (MemberSelectExpr)lhs;
         ExpressionTester.CheckIsCompilable(resolver, reporter, mse.Obj, codeContext);
-      } else if (gk == AssignStmt.NonGhostKind.ArrayElement) {
+      } else if (gk == SingleAssignStmt.NonGhostKind.ArrayElement) {
         ExpressionTester.CheckIsCompilable(resolver, reporter, lhs, codeContext);
       }
 
       if (s.Rhs is ExprRhs) {
         var rhs = (ExprRhs)s.Rhs;
-        if (!AssignStmt.LhsIsToGhost(lhs)) {
+        if (!SingleAssignStmt.LhsIsToGhost(lhs)) {
           ExpressionTester.CheckIsCompilable(resolver, reporter, rhs.Expr, codeContext);
         }
       } else if (s.Rhs is HavocRhs) {
diff --git a/Source/DafnyCore/Resolver/HigherOrderHeapAllocationChecker.cs b/Source/DafnyCore/Resolver/HigherOrderHeapAllocationChecker.cs
index 137aeafb291..f3ba5dfa937 100644
--- a/Source/DafnyCore/Resolver/HigherOrderHeapAllocationChecker.cs
+++ b/Source/DafnyCore/Resolver/HigherOrderHeapAllocationChecker.cs
@@ -59,7 +59,7 @@ protected override bool VisitOneStatement(Statement stmt, IASTVisitorContext con
 
     // Since all updates and variable declarations are eventually broken down into
     // assignments, we need only consider an AssignStmt.
-    if (stmt is AssignStmt { Lhs: { } lhs, Rhs: { } rhs }) {
+    if (stmt is SingleAssignStmt { Lhs: { } lhs, Rhs: { } rhs }) {
 
       // Memory can be updated either by writing to a sequence-like collection
       // or by writing to an object's field.
diff --git a/Source/DafnyCore/Resolver/HigherOrderHeapAllocationCheckerConstructor.cs b/Source/DafnyCore/Resolver/HigherOrderHeapAllocationCheckerConstructor.cs
index 1d67484bd3e..99c898293bb 100644
--- a/Source/DafnyCore/Resolver/HigherOrderHeapAllocationCheckerConstructor.cs
+++ b/Source/DafnyCore/Resolver/HigherOrderHeapAllocationCheckerConstructor.cs
@@ -43,7 +43,7 @@ public override IASTVisitorContext GetContext(IASTVisitorContext astVisitorConte
   /// cardinality test.
   /// </summary>
   private bool Occurs(Type obj, Type rhs, bool left) {
-    Type type = rhs.NormalizeExpandKeepConstraints();
+    Type type = rhs.NormalizeExpand();
     if (type is BasicType) {
       return false;
     } else if (type is MapType) {
@@ -60,6 +60,9 @@ private bool Occurs(Type obj, Type rhs, bool left) {
       if (left && Type.Equal_Improved(obj, t)) {
         return true;
       }
+      if (left && t.IsTraitType) {
+        return true;
+      }
       var b = false;
       if (t.IsArrowType) {
         var arrow = type.AsArrowType;
@@ -72,7 +75,7 @@ private bool Occurs(Type obj, Type rhs, bool left) {
   protected override bool VisitOneStatement(Statement stmt, IASTVisitorContext context) {
 
     // Assigments to constant fields in constructors boil down to an assignment.
-    if (stmt is AssignStmt assign) {
+    if (stmt is SingleAssignStmt assign) {
 
       var lhs = assign.Lhs;
       Type lhsType;
@@ -84,7 +87,7 @@ protected override bool VisitOneStatement(Statement stmt, IASTVisitorContext con
       // of type . -> . during the object's construction.
       if (lhs is MemberSelectExpr mseLhs) {
 
-        lhsType = mseLhs.Obj.Type.NormalizeExpandKeepConstraints();
+        lhsType = mseLhs.Obj.Type.NormalizeExpand();
 
         var rhs = assign.Rhs;
         if (rhs is ExprRhs eRhs) {
diff --git a/Source/DafnyCore/Resolver/InferDecreasesClause.cs b/Source/DafnyCore/Resolver/InferDecreasesClause.cs
index 1b3e2cae77d..4f1337a3da6 100644
--- a/Source/DafnyCore/Resolver/InferDecreasesClause.cs
+++ b/Source/DafnyCore/Resolver/InferDecreasesClause.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 
 namespace Microsoft.Dafny;
 
@@ -44,7 +45,7 @@ public void FillInDefaultDecreasesClauses(ModuleDefinition module) {
           s += "decreases " + Util.Comma(m.Decreases.Expressions, expr => Printer.ExprToString(resolver.Options, expr));
           // Note, in the following line, we use the location information for "clbl", not "m".  These
           // are the same, except in the case where "clbl" is a GreatestLemma and "m" is a prefix lemma.
-          resolver.reporter.Info(MessageSource.Resolver, clbl.Tok, s);
+          resolver.reporter.Info(MessageSource.Resolver, clbl.Origin, s);
         }
       }
     }
@@ -69,9 +70,9 @@ public bool FillInDefaultDecreases(ICallable clbl, bool addPrefixInCoClusters) {
       // The default for a function starts with the function's reads clause, if any
       if (clbl is Function) {
         var fn = (Function)clbl;
-        if (fn.Reads.Count != 0) {
+        if (fn.Reads.Expressions.Count != 0) {
           // start the default lexicographic tuple with the reads clause
-          var r = FrameToObjectSet(fn.Reads);
+          var r = FrameToObjectSet(fn.Reads.Expressions);
           decr.Add(AutoGeneratedExpression.Create(r));
           anyChangeToDecreases = true;
         }
@@ -92,9 +93,9 @@ public bool FillInDefaultDecreases(ICallable clbl, bool addPrefixInCoClusters) {
         }
 
         if (enclosingType != null && originalMember == clbl) {
-          var receiverType = ModuleResolver.GetThisType(clbl.Tok, enclosingType);
+          var receiverType = ModuleResolver.GetThisType(clbl.Origin, enclosingType);
           if (receiverType.IsOrdered && !receiverType.IsRefType) {
-            var th = new ThisExpr(new AutoGeneratedToken(clbl.Tok)) { Type = receiverType }; // resolve here
+            var th = new ThisExpr(new AutoGeneratedOrigin(clbl.Origin)) { Type = receiverType }; // resolve here
             decr.Add(AutoGeneratedExpression.Create(th));
             anyChangeToDecreases = true;
           }
@@ -105,7 +106,7 @@ public bool FillInDefaultDecreases(ICallable clbl, bool addPrefixInCoClusters) {
       // doesn't appear useful to orderings.
       foreach (var p in clbl.Ins) {
         if (!(p is ImplicitFormal) && p.Type.IsOrdered) {
-          var ie = new IdentifierExpr(new AutoGeneratedToken(p.tok), p.Name);
+          var ie = new IdentifierExpr(new AutoGeneratedOrigin(p.Origin), p.Name);
           ie.Var = p;
           ie.Type = p.Type; // resolve it here
           decr.Add(AutoGeneratedExpression.Create(ie));
@@ -123,12 +124,12 @@ public bool FillInDefaultDecreases(ICallable clbl, bool addPrefixInCoClusters) {
           break;
         case Function.CoCallClusterInvolvement.IsMutuallyRecursiveTarget:
           // prefix: decreases 0,
-          clbl.Decreases.Expressions.Insert(0, Expression.CreateIntLiteral(fn.tok, 0));
+          clbl.Decreases.Expressions.Insert(0, Expression.CreateIntLiteral(fn.Origin, 0));
           anyChangeToDecreases = true;
           break;
         case Function.CoCallClusterInvolvement.CoRecursiveTargetAllTheWay:
           // prefix: decreases 1,
-          clbl.Decreases.Expressions.Insert(0, Expression.CreateIntLiteral(fn.tok, 1));
+          clbl.Decreases.Expressions.Insert(0, Expression.CreateIntLiteral(fn.Origin, 1));
           anyChangeToDecreases = true;
           break;
         default:
@@ -146,69 +147,69 @@ public Expression FrameToObjectSet(List<FrameExpression> fexprs) {
 
     List<Expression> sets = new List<Expression>();
     List<Expression> singletons = null;
-    var idGen = new FreshIdGenerator();
-    foreach (FrameExpression fe in fexprs) {
+    var idGen = new VerificationIdGenerator();
+    // drop wildcards altogether in the following iterations
+    foreach (FrameExpression fe in fexprs.Where(fe => fe.E is not WildcardExpr)) {
       Contract.Assert(fe != null);
-      if (fe.E is WildcardExpr) {
-        // drop wildcards altogether
-      } else {
-        Expression e = fe.E; // keep only fe.E, drop any fe.Field designation
-        Contract.Assert(e.Type != null); // should have been resolved already
-        var eType = e.Type.NormalizeExpand();
-        if (eType.IsRefType) {
-          // e represents a singleton set
-          if (singletons == null) {
-            singletons = new List<Expression>();
-          }
-
-          singletons.Add(e);
-        } else if (eType is SeqType || eType is MultiSetType || LiteralExpr.IsEmptySet(e)) {
-          // e represents a sequence or multiset
-          var collectionType = (CollectionType)eType;
-          var resolvedOpcode = collectionType.ResolvedOpcodeForIn;
-          var boundedPool = collectionType.GetBoundedPool(e);
-
-          // Add:  set x :: x in e
-          var bv = new BoundVar(e.tok, idGen.FreshId("_s2s_"),
-            collectionType.Arg.NormalizeExpand());
-          var bvIE = new IdentifierExpr(e.tok, bv.Name) {
-            Var = bv,
-            Type = bv.Type
-          };
-          var sInE = new BinaryExpr(e.tok, BinaryExpr.Opcode.In, bvIE, e) {
-            ResolvedOp = resolvedOpcode,
-            Type = Type.Bool
-          };
-          var s = new SetComprehension(e.tok, e.RangeToken, true, new List<BoundVar>() { bv }, sInE, bvIE,
-            new Attributes("trigger", new List<Expression> { sInE }, null)) {
-            Type = new SetType(true, resolver.SystemModuleManager.ObjectQ()),
-            Bounds = new List<ComprehensionExpr.BoundedPool>() { boundedPool }
-          };
-          sets.Add(s);
-        } else {
-          // e is already a set
-          Contract.Assert(eType is SetType);
-          sets.Add(e);
+      Expression e = new Cloner(false, true).CloneExpr(fe.E); // keep only fe.E, drop any fe.Field designation
+      Contract.Assert(e.Type != null); // fe.E should have been resolved already, and the clone should still have that type
+      var eType = e.Type.NormalizeToAncestorType();
+      if (eType.IsRefType) {
+        // e represents a singleton set
+        if (singletons == null) {
+          singletons = new List<Expression>();
         }
+        singletons.Add(e);
+
+      } else if (eType is SeqType or MultiSetType || LiteralExpr.IsEmptySet(e)) {
+        // e represents a sequence or multiset
+        var collectionType = (CollectionType)eType;
+        var resolvedOpcode = collectionType.ResolvedOpcodeForIn;
+        var boundedPool = collectionType.GetBoundedPool(e);
+
+        // Add:  set x :: x in e
+        var bvDecl = new BoundVar(e.Origin, idGen.FreshId("_s2s_"), collectionType.Arg.NormalizeExpand());
+        var bv = new IdentifierExpr(e.Origin, bvDecl.Name) {
+          Var = bvDecl,
+          Type = bvDecl.Type
+        };
+        var bvInE = new BinaryExpr(e.Origin, BinaryExpr.Opcode.In, bv, e) {
+          ResolvedOp = resolvedOpcode,
+          Type = Type.Bool
+        };
+        var s = new SetComprehension(e.Origin, true, new List<BoundVar>() { bvDecl }, bvInE, bv,
+          new Attributes("trigger", new List<Expression> { bvInE }, null)) {
+          Type = resolver.SystemModuleManager.ObjectSetType(),
+          Bounds = new List<BoundedPool>() { boundedPool }
+        };
+        sets.Add(s);
+
+      } else {
+        // e is already a set
+        Contract.Assert(eType is SetType);
+        sets.Add(e);
       }
     }
 
     if (singletons != null) {
-      Expression display = new SetDisplayExpr(singletons[0].tok, true, singletons);
-      display.Type = new SetType(true, resolver.SystemModuleManager.ObjectQ()); // resolve here
+      Expression display = new SetDisplayExpr(singletons[0].Origin, true, singletons) {
+        Type = resolver.SystemModuleManager.ObjectSetType()
+      };
       sets.Add(display);
     }
 
     if (sets.Count == 0) {
-      Expression emptyset = new SetDisplayExpr(Token.NoToken, true, new List<Expression>());
-      emptyset.Type = new SetType(true, resolver.SystemModuleManager.ObjectQ()); // resolve here
-      return emptyset;
+      var emptySet = new SetDisplayExpr(Token.NoToken, true, new List<Expression>()) {
+        Type = resolver.SystemModuleManager.ObjectSetType()
+      };
+      return emptySet;
     } else {
       Expression s = sets[0];
-      for (int i = 1; i < sets.Count; i++) {
-        BinaryExpr union = new BinaryExpr(s.tok, BinaryExpr.Opcode.Add, s, sets[i]);
-        union.ResolvedOp = BinaryExpr.ResolvedOpcode.Union; // resolve here
-        union.Type = new SetType(true, resolver.SystemModuleManager.ObjectQ()); // resolve here
+      for (var i = 1; i < sets.Count; i++) {
+        var union = new BinaryExpr(s.Origin, BinaryExpr.Opcode.Add, s, sets[i]) {
+          ResolvedOp = BinaryExpr.ResolvedOpcode.Union,
+          Type = resolver.SystemModuleManager.ObjectSetType()
+        };
         s = union;
       }
 
diff --git a/Source/DafnyCore/Resolver/ModuleResolver.cs b/Source/DafnyCore/Resolver/ModuleResolver.cs
index 5d43faae17d..0aa3a165156 100644
--- a/Source/DafnyCore/Resolver/ModuleResolver.cs
+++ b/Source/DafnyCore/Resolver/ModuleResolver.cs
@@ -22,21 +22,27 @@ public record ModuleResolutionResult(
     Dictionary<TopLevelDeclWithMembers, Dictionary<string, MemberDecl>> ClassMembers
     );
 
+  public interface ICanResolveNewAndOld {
+    void GenResolve(INewOrOldResolver resolver, ResolutionContext context);
+  }
+
   interface ICanResolve {
     void Resolve(ModuleResolver resolver, ResolutionContext context);
   }
 
   public enum FrameExpressionUse { Reads, Modifies, Unchanged }
 
-  public partial class ModuleResolver {
+  public partial class ModuleResolver : INewOrOldResolver {
     public ProgramResolver ProgramResolver { get; }
     public DafnyOptions Options { get; }
-    public SystemModuleManager SystemModuleManager;
+    public readonly SystemModuleManager SystemModuleManager;
 
     public ErrorReporter reporter;
     public ModuleSignature moduleInfo = null;
 
     public ErrorReporter Reporter => reporter;
+    public Scope<IVariable> Scope => scope;
+
     public List<TypeConstraint.ErrorMsg> TypeConstraintErrorsToBeReported { get; } = new();
 
     private bool RevealedInScope(Declaration d) {
@@ -55,10 +61,8 @@ internal bool VisibleInScope(Declaration d) {
       return d.IsVisibleInScope(moduleInfo.VisibilityScope);
     }
 
-    public FreshIdGenerator defaultTempVarIdGenerator => ProgramResolver.Program.Compilation.IdGenerator;
-
     public string FreshTempVarName(string prefix, ICodeContext context) {
-      var gen = context is Declaration decl ? decl.IdGenerator : defaultTempVarIdGenerator;
+      var gen = context.CodeGenIdGenerator;
       var freshTempVarName = gen.FreshId(prefix);
       return freshTempVarName;
     }
@@ -81,17 +85,13 @@ public Dictionary<string, MemberDecl> GetClassMembers(TopLevelDeclWithMembers ke
 
     private Dictionary<TypeParameter, Type> SelfTypeSubstitution;
 
-    public ModuleResolver(DafnyOptions options) {
-      Options = options;
-    }
-
-    public ModuleResolver(ProgramResolver programResolver) {
+    public ModuleResolver(ProgramResolver programResolver, DafnyOptions options) {
       this.ProgramResolver = programResolver;
-      Options = programResolver.Options;
+      Options = options;
 
       allTypeParameters = new Scope<TypeParameter>(Options);
       scope = new Scope<IVariable>(Options);
-      enclosingStatementLabels = new Scope<Statement>(Options);
+      EnclosingStatementLabels = new Scope<Statement>(Options);
       DominatingStatementLabels = new Scope<Label>(Options);
 
       SystemModuleManager = programResolver.SystemModuleManager;
@@ -115,7 +115,7 @@ public void FillInAdditionalInformation(ModuleDefinition module) {
         }
 
         if (body != null) {
-          var c = new ReportOtherAdditionalInformation_Visitor(this);
+          var c = new ReportOtherAdditionalInformationVisitor(this);
           c.Visit(body);
         }
       }
@@ -134,13 +134,13 @@ public void FillInDecreasesClauses(ModuleDefinition module) {
         }
 
         if (body != null) {
-          var c = new FillInDefaultLoopDecreases_Visitor(this, clbl);
+          var c = new FillInDefaultLoopDecreasesVisitor(this, clbl);
           c.Visit(body);
         }
       }
     }
 
-    public void ComputeIsRecursiveBit(CompilationData compilation, ModuleDefinition module) {
+    public void ComputeIsRecursiveBit(CompilationData compilation, ModuleDefinition module, IEnumerable<IRewriter> rewriters) {
       // compute IsRecursive bit for mutually recursive functions and methods
       foreach (var clbl in ModuleDefinition.AllCallables(module.TopLevelDecls)) {
         if (clbl is Function) {
@@ -173,7 +173,7 @@ public void ComputeIsRecursiveBit(CompilationData compilation, ModuleDefinition
         }
       }
 
-      foreach (var rewriter in compilation.Rewriters) {
+      foreach (var rewriter in rewriters) {
         rewriter.PostCyclicityResolve(module);
       }
     }
@@ -185,9 +185,7 @@ public ModuleResolutionResult ResolveModuleDeclaration(CompilationData compilati
         signatures[literalModuleDecl.ModuleDef] = signature;
       } else if (decl is AliasModuleDecl alias) {
         if (ResolveExport(alias, alias.EnclosingModuleDefinition, alias.TargetQId, alias.Exports, out var p, reporter)) {
-          if (alias.Signature == null) {
-            alias.Signature = p;
-          }
+          alias.Signature ??= p;
         } else {
           alias.Signature = new ModuleSignature(); // there was an error, give it a valid but empty signature
         }
@@ -198,11 +196,7 @@ public ModuleResolutionResult ResolveModuleDeclaration(CompilationData compilati
         } else {
           abs.Signature = new ModuleSignature(); // there was an error, give it a valid but empty signature
         }
-      } else if (decl is ModuleExportDecl exportDecl) {
-        exportDecl.SetupDefaultSignature();
-
-        Contract.Assert(exportDecl.Signature != null);
-        Contract.Assert(exportDecl.Signature.VisibilityScope != null);
+      } else if (decl is ModuleExportDecl) {
       } else {
         Contract.Assert(false); // Unknown kind of ModuleDecl
       }
@@ -218,7 +212,7 @@ public void ResolveModuleExport(LiteralModuleDecl literalDecl, ModuleSignature s
       foreach (TopLevelDecl toplevel in m.TopLevelDecls) {
         if (toplevel is ModuleExportDecl exportDecl) {
           exportDependencies.AddVertex(exportDecl);
-          foreach (IToken s in exportDecl.Extends) {
+          foreach (IOrigin s in exportDecl.Extends) {
             if (sig.ExportSets.TryGetValue(s.val, out var extend)) {
               exportDecl.ExtendDecls.Add(extend);
               exportDependencies.AddEdge(exportDecl, extend);
@@ -232,7 +226,7 @@ public void ResolveModuleExport(LiteralModuleDecl literalDecl, ModuleSignature s
       // detect cycles in the extend
       var cycleError = false;
       foreach (var cycle in exportDependencies.AllCycles()) {
-        ReportCycleError(reporter, cycle, m => m.tok, m => m.Name, "module export contains a cycle");
+        ReportCycleError(reporter, cycle, m => m.Origin, m => m.Name, "module export contains a cycle");
         cycleError = true;
       }
 
@@ -267,8 +261,8 @@ public void ResolveModuleExport(LiteralModuleDecl literalDecl, ModuleSignature s
           // export-set name there.  If the export-set name happens to coincide with some other top-level declaration,
           // then an error will already have been produced ("duplicate name of top-level declaration").
           if (GetClassMembers((DefaultClassDecl)defaultClass)?.TryGetValue(exportDecl.Name, out var member) == true) {
-            reporter.Warning(MessageSource.Resolver, ErrorRegistry.NoneId, exportDecl.tok,
-              "note, this export set is empty (did you perhaps forget the 'provides' or 'reveals' keyword?)");
+            reporter.Warning(MessageSource.Resolver, ErrorRegistry.NoneId, exportDecl.Origin,
+              "this export set is empty (did you perhaps forget the 'provides' or 'reveals' keyword?)");
           }
         }
 
@@ -308,7 +302,7 @@ public void ResolveModuleExport(LiteralModuleDecl literalDecl, ModuleSignature s
 
             var lmem = mt.Members.FirstOrDefault(l => l.Name == export.Id);
             if (lmem == null) {
-              reporter.Error(MessageSource.Resolver, export.Tok, "No member '{0}' found in type '{1}'", export.Id,
+              reporter.Error(MessageSource.Resolver, export.Origin, "No member '{0}' found in type '{1}'", export.Id,
                 export.ClassId);
               continue;
             }
@@ -317,7 +311,7 @@ public void ResolveModuleExport(LiteralModuleDecl literalDecl, ModuleSignature s
           } else if (sig.TopLevels.TryGetValue(name, out var tdecl)) {
             if (tdecl is ClassLikeDecl { NonNullTypeDecl: { } nn }) {
               // cldecl is a possibly-null type (syntactically given with a question mark at the end)
-              reporter.Error(MessageSource.Resolver, export.Tok,
+              reporter.Error(MessageSource.Resolver, export.Origin,
                 export.Opaque
                   ? "Type '{1}' can only be revealed, not provided"
                   : "Types '{0}' and '{1}' are exported together, which is accomplished by revealing the name '{0}'",
@@ -330,23 +324,23 @@ public void ResolveModuleExport(LiteralModuleDecl literalDecl, ModuleSignature s
           } else if (sig.StaticMembers.TryGetValue(name, out var member)) {
             decl = member;
           } else if (sig.ExportSets.ContainsKey(name)) {
-            reporter.Error(MessageSource.Resolver, export.Tok,
+            reporter.Error(MessageSource.Resolver, export.Origin,
               "'{0}' is an export set and cannot be provided/revealed by another export set (did you intend to list it in an \"extends\"?)",
               name);
             continue;
           } else {
-            reporter.Error(MessageSource.Resolver, export.Tok, "'{0}' must be a member of '{1}' to be exported", name,
+            reporter.Error(MessageSource.Resolver, export.Origin, "'{0}' must be a member of '{1}' to be exported", name,
               m.Name);
             continue;
           }
 
           if (!decl.CanBeExported()) {
-            reporter.Error(MessageSource.Resolver, export.Tok, "'{0}' is not a valid export of '{1}'", name, m.Name);
+            reporter.Error(MessageSource.Resolver, export.Origin, "'{0}' is not a valid export of '{1}'", name, m.Name);
             continue;
           }
 
           if (!export.Opaque && !decl.CanBeRevealed()) {
-            reporter.Error(MessageSource.Resolver, export.Tok,
+            reporter.Error(MessageSource.Resolver, export.Origin,
               "'{0}' cannot be revealed in an export. Use \"provides\" instead.", name);
             continue;
           }
@@ -373,7 +367,7 @@ public void ResolveModuleExport(LiteralModuleDecl literalDecl, ModuleSignature s
           if (defaultExport == null) {
             defaultExport = exportDecl;
           } else {
-            reporter.Error(MessageSource.Resolver, m.tok, "more than one default export set declared in module {0}",
+            reporter.Error(MessageSource.Resolver, m.Origin, "more than one default export set declared in module {0}",
               m.Name);
           }
         }
@@ -418,8 +412,7 @@ public void ResolveModuleExport(LiteralModuleDecl literalDecl, ModuleSignature s
 
       foreach (var s in sigs) {
         foreach (var decl in s.TopLevels) {
-          if (decl.Value is ModuleDecl && !(decl.Value is ModuleExportDecl)) {
-            var modDecl = (ModuleDecl)decl.Value;
+          if (decl.Value is ModuleDecl modDecl and not ModuleExportDecl) {
             s.VisibilityScope.Augment(modDecl.AccessibleSignature().VisibilityScope);
           }
         }
@@ -438,14 +431,14 @@ public void ResolveModuleExport(LiteralModuleDecl literalDecl, ModuleSignature s
           }
         }
 
-        if (e.Opaque && (decl is DatatypeDecl || decl is TypeSynonymDecl)) {
+        if (e.Opaque && (decl is DatatypeDecl or TypeSynonymDecl or NewtypeDecl)) {
           // Datatypes and type synonyms are marked as _provided when they appear in any provided export.  If a
           // declaration is never provided, then either it isn't visible outside the module at all or its whole
           // definition is.  Datatype and type-synonym declarations undergo some inference from their definitions.
           // Such inference should not be done for provided declarations, since different views of the module
           // would then get different inferred properties.
           decl.Attributes = new Attributes("_provided", new List<Expression>(), decl.Attributes);
-          reporter.Info(MessageSource.Resolver, decl.tok, "{:_provided}");
+          reporter.Info(MessageSource.Resolver, decl.Origin, "{:_provided}");
         }
       }
 
@@ -529,17 +522,17 @@ public void CheckModuleExportConsistency(CompilationData compilation, ModuleDefi
               ? cl.NonNullTypeDecl
               : member.EnclosingClass;
             if (!enclosingType.IsVisibleInScope(exportDecl.Signature.VisibilityScope)) {
-              reporter.Error(MessageSource.Resolver, export.Tok,
+              reporter.Error(MessageSource.Resolver, export.Origin,
                 "Cannot export type member '{0}' without providing its enclosing {1} '{2}'", member.Name,
                 member.EnclosingClass.WhatKind, member.EnclosingClass.Name);
             } else if (member is Constructor &&
                        !member.EnclosingClass.IsRevealedInScope(exportDecl.Signature.VisibilityScope)) {
-              reporter.Error(MessageSource.Resolver, export.Tok,
+              reporter.Error(MessageSource.Resolver, export.Origin,
                 "Cannot export constructor '{0}' without revealing its enclosing {1} '{2}'", member.Name,
                 member.EnclosingClass.WhatKind, member.EnclosingClass.Name);
             } else if (member is Field && !(member is ConstantField) &&
                        !member.EnclosingClass.IsRevealedInScope(exportDecl.Signature.VisibilityScope)) {
-              reporter.Error(MessageSource.Resolver, export.Tok,
+              reporter.Error(MessageSource.Resolver, export.Origin,
                 "Cannot export mutable field '{0}' without revealing its enclosing {1} '{2}'", member.Name,
                 member.EnclosingClass.WhatKind, member.EnclosingClass.Name);
             }
@@ -553,7 +546,7 @@ public void CheckModuleExportConsistency(CompilationData compilation, ModuleDefi
           var wr = Options.OutputWriter;
           wr.WriteLine("/* ===== export set {0}", exportDecl.FullName);
           var pr = new Printer(wr, Options);
-          pr.PrintTopLevelDecls(compilation, exportView.TopLevelDecls, 0, null, null);
+          pr.PrintTopLevelDecls(compilation, exportView.TopLevelDecls, 0, null);
           wr.WriteLine("*/");
         }
 
@@ -564,12 +557,12 @@ public void CheckModuleExportConsistency(CompilationData compilation, ModuleDefi
         reporter = new ErrorReporterWrapper(reporter,
           $"Raised while checking export set {exportDecl.Name}: ");
         var testSig = exportView.RegisterTopLevelDecls(this, true);
-        exportView.Resolve(testSig, this, true);
+        exportView.Resolve(testSig, this, exportDecl.Name);
         var wasError = reporter.Count(ErrorLevel.Error) > 0;
         reporter = (BatchErrorReporter)((ErrorReporterWrapper)reporter).WrappedReporter;
 
         if (wasError) {
-          reporter.Error(MessageSource.Resolver, exportDecl.tok, "This export set is not consistent: {0}", exportDecl.Name);
+          reporter.Error(MessageSource.Resolver, exportDecl.Origin, "This export set is not consistent: {0}", exportDecl.Name);
         } else {
           exportDecl.EffectiveModule = exportView;
         }
@@ -735,8 +728,8 @@ private static void ResolveOpenedImportsWorker(ErrorReporter reporter, ModuleSig
             // if both are type synonyms for "int".
             var scope = Type.GetScope();
             if (sameNameSymbolInImporter.IsVisibleInScope(scope) && kv.Value.IsVisibleInScope(scope)) {
-              var dType = UserDefinedType.FromTopLevelDecl(sameNameSymbolInImporter.tok, sameNameSymbolInImporter);
-              var vType = UserDefinedType.FromTopLevelDecl(kv.Value.tok, kv.Value);
+              var dType = UserDefinedType.FromTopLevelDecl(sameNameSymbolInImporter.Origin, sameNameSymbolInImporter);
+              var vType = UserDefinedType.FromTopLevelDecl(kv.Value.Origin, kv.Value);
               unambiguous = dType.Equals(vType, true);
             }
           }
@@ -776,7 +769,7 @@ private static void ResolveOpenedImportsWorker(ErrorReporter reporter, ModuleSig
       }
     }
 
-    public static void RegisterByMethod(Function f, TopLevelDeclWithMembers cl) {
+    public void RegisterByMethod(Function f, TopLevelDeclWithMembers cl) {
       Contract.Requires(f != null && f.ByMethodBody != null);
 
       var tok = f.ByMethodTok;
@@ -788,13 +781,29 @@ public static void RegisterByMethod(Function f, TopLevelDeclWithMembers cl) {
       var isStatic = f.HasStaticKeyword || cl is DefaultClassDecl;
       var receiver = isStatic ? (Expression)new StaticReceiverExpr(tok, cl, true) : new ImplicitThisExpr(tok);
       var fn = new ApplySuffix(tok, null,
-        new ExprDotName(tok, receiver, f.Name, null),
-        new ActualBindings(f.Formals.ConvertAll(Expression.CreateIdentExpr)).ArgumentBindings,
-        tok);
+        new ExprDotName(tok, receiver, f.NameNode, f.TypeArgs.ConvertAll(typeParameter => (Type)new UserDefinedType(f.Origin, typeParameter))),
+        new ActualBindings(f.Ins.ConvertAll(Expression.CreateIdentExpr)).ArgumentBindings,
+        Token.NoToken);
       var post = new AttributedExpression(new BinaryExpr(tok, BinaryExpr.Opcode.Eq, r, fn));
-      var method = new Method(f.RangeToken.MakeAutoGenerated(), new Name(new AutoGeneratedToken(f.NameNode.Tok)), f.HasStaticKeyword, false, f.TypeArgs,
-        f.Formals, new List<Formal>() { resultVar },
-        f.Req, new Specification<FrameExpression>(new List<FrameExpression>(), null), new List<AttributedExpression>() { post }, f.Decreases,
+      Specification<FrameExpression> reads;
+      if (Options.Get(Method.ReadsClausesOnMethods)) {
+        // If f.Reads is empty, replace it with an explicit `reads {}` so that we don't replace that
+        // with the default `reads *` for methods later.
+        // Alternatively, we could have a flag similar to InferredDecreases to distinguish between
+        // "not given" and "explicitly empty".
+        reads = f.Reads;
+        if (!reads.Expressions.Any()) {
+          reads = new Specification<FrameExpression>();
+          var emptySet = new SetDisplayExpr(tok, true, new List<Expression>());
+          reads.Expressions.Add(new FrameExpression(tok, emptySet, null));
+        }
+      } else {
+        reads = new Specification<FrameExpression>();
+      }
+
+      var method = new Method(f.Origin.MakeAutoGenerated(), new Name(new AutoGeneratedOrigin(f.NameNode.Origin)), f.HasStaticKeyword, false, f.TypeArgs,
+        f.Ins, new List<Formal>() { resultVar },
+        f.Req, reads, new Specification<FrameExpression>(new List<FrameExpression>(), null), new List<AttributedExpression>() { post }, f.Decreases,
         f.ByMethodBody, f.Attributes, null, true);
       Contract.Assert(f.ByMethodDecl == null);
       method.InheritVisibility(f);
@@ -802,39 +811,55 @@ public static void RegisterByMethod(Function f, TopLevelDeclWithMembers cl) {
       f.ByMethodDecl = method;
     }
 
-    private ModuleSignature MakeAbstractSignature(ModuleSignature p, string name, int height,
-      Dictionary<ModuleDefinition, ModuleSignature> mods) {
-      Contract.Requires(p != null);
+    private ModuleSignature MakeAbstractSignature(ModuleSignature origin, string name, int height,
+      Dictionary<ModuleDefinition, ModuleSignature> moduleSignatures) {
+      Contract.Requires(origin != null);
       Contract.Requires(name != null);
-      Contract.Requires(mods != null);
+      Contract.Requires(moduleSignatures != null);
       var errCount = reporter.Count(ErrorLevel.Error);
 
-      var mod = new ModuleDefinition(RangeToken.NoToken, new Name(name + ".Abs"), new List<IToken>(), true, true, null, null, null,
-        false);
-      mod.Height = height;
-      foreach (var kv in p.TopLevels) {
+      var module = new ModuleDefinition(SourceOrigin.NoToken, new Name(name + ".Abs"), new List<IOrigin>(), ModuleKindEnum.Abstract, true, null, null, null);
+      module.Height = height;
+      foreach (var kv in origin.TopLevels) {
         if (!(kv.Value is NonNullTypeDecl or DefaultClassDecl)) {
-          var clone = CloneDeclaration(p.VisibilityScope, kv.Value, mod, mods, name);
-          mod.SourceDecls.Add(clone);
+          var clone = CloneDeclarationForAbstractSignature(origin.VisibilityScope, kv.Value, module, moduleSignatures, name);
+          module.SourceDecls.Add(clone);
         }
       }
 
-      var defaultClassDecl = new DefaultClassDecl(mod, p.StaticMembers.Values.ToList());
-      mod.DefaultClass = (DefaultClassDecl)CloneDeclaration(p.VisibilityScope, defaultClassDecl, mod, mods, name);
+      var defaultClassDecl = new DefaultClassDecl(module, origin.StaticMembers.Values.ToList());
+      module.DefaultClass = (DefaultClassDecl)CloneDeclarationForAbstractSignature(origin.VisibilityScope, defaultClassDecl, module, moduleSignatures, name);
+
+      var sig = module.RegisterTopLevelDecls(this, true);
+      sig.Refines = origin.Refines;
+      sig.IsAbstract = origin.IsAbstract;
+      moduleSignatures.Add(module, sig);
 
-      var sig = mod.RegisterTopLevelDecls(this, true);
-      sig.Refines = p.Refines;
-      sig.IsAbstract = p.IsAbstract;
-      mods.Add(mod, sig);
-      var good = mod.Resolve(sig, this);
+      var good = module.Resolve(sig, this);
       if (good && reporter.Count(ErrorLevel.Error) == errCount) {
-        mod.SuccessfullyResolved = true;
+        module.SuccessfullyResolved = true;
       }
 
+      /* A bug we ran into was that cloning done for abstract modules,
+        did not clone the resolved field,
+        so the .Flattened field of NestedMatchExpr was not set.
+        Also, rewriters.PostResolve was not run, so .Flattened was not set after cloning
+        which led to a crash during Boogie generation.
+       
+        Cloning with resolved fields is not an option, 
+        because then internal references of the cloned code can point to the old code.
+       
+        I(keyboardDrummer) think it would be better altogether if no cloning was done for abstract modules,
+        But until that happens here is code that explicitly calls MatchFlattener which sets .Flattened
+        Alternatively, we could call all the rewriter.PostResolve methods
+      */
+
+      new MatchFlattener(reporter).PostResolve(module);
+
       return sig;
     }
 
-    TopLevelDecl CloneDeclaration(VisibilityScope scope, TopLevelDecl d, ModuleDefinition newParent,
+    TopLevelDecl CloneDeclarationForAbstractSignature(VisibilityScope scope, TopLevelDecl d, ModuleDefinition newParent,
       Dictionary<ModuleDefinition, ModuleSignature> mods, string name) {
       Contract.Requires(d != null);
       Contract.Requires(newParent != null);
@@ -843,7 +868,7 @@ TopLevelDecl CloneDeclaration(VisibilityScope scope, TopLevelDecl d, ModuleDefin
 
       if (d is AbstractModuleDecl abstractDecl) {
         var sig = MakeAbstractSignature(abstractDecl.OriginalSignature, name + "." + abstractDecl.Name, abstractDecl.Height, mods);
-        var result = new AbstractModuleDecl(abstractDecl.RangeToken, abstractDecl.QId, abstractDecl.NameNode,
+        var result = new AbstractModuleDecl(abstractDecl.Options, abstractDecl.Origin, abstractDecl.QId, abstractDecl.NameNode,
           newParent, abstractDecl.Opened, abstractDecl.Exports, Guid.NewGuid()) {
           Signature = sig,
           OriginalSignature = abstractDecl.OriginalSignature
@@ -856,7 +881,7 @@ TopLevelDecl CloneDeclaration(VisibilityScope scope, TopLevelDecl d, ModuleDefin
 
 
     public bool ResolveExport(ModuleDecl alias, ModuleDefinition parent, ModuleQualifiedId qid,
-      List<IToken> exports, out ModuleSignature p, ErrorReporter reporter) {
+      List<IOrigin> exports, out ModuleSignature p, ErrorReporter reporter) {
       Contract.Requires(qid != null);
       Contract.Requires(qid.Path.Count > 0);
       Contract.Requires(exports != null);
@@ -893,7 +918,7 @@ public bool ResolveExport(ModuleDecl alias, ModuleDefinition parent, ModuleQuali
           return false;
         }
 
-        foreach (IToken export in exports.Skip(1)) {
+        foreach (IOrigin export in exports.Skip(1)) {
           if (decl.Signature.ExportSets.TryGetValue(export.val, out pp)) {
             Contract.Assert(Object.ReferenceEquals(p.ModuleDef, pp.Signature.ModuleDef));
             ModuleSignature merged = MergeSignature(p, pp.Signature);
@@ -927,7 +952,8 @@ public void RevealAllInScope(IEnumerable<TopLevelDecl> declarations, VisibilityS
       }
     }
 
-    public void ResolveTopLevelDecls_Signatures(ModuleDefinition def, ModuleSignature sig, List<TopLevelDecl/*!*/>/*!*/ declarations, Graph<IndDatatypeDecl/*!*/>/*!*/ datatypeDependencies, Graph<CoDatatypeDecl/*!*/>/*!*/ codatatypeDependencies) {
+    public void ResolveTopLevelDecls_Signatures(ModuleDefinition def, ModuleSignature sig, List<TopLevelDecl> declarations,
+      Graph<IndDatatypeDecl> datatypeDependencies, Graph<CoDatatypeDecl> codatatypeDependencies) {
       Contract.Requires(declarations != null);
       Contract.Requires(datatypeDependencies != null);
       Contract.Requires(codatatypeDependencies != null);
@@ -953,7 +979,7 @@ public void ResolveTopLevelDecls_Signatures(ModuleDefinition def, ModuleSignatur
         ResolveTypeParameters(d.TypeArgs, true, d);
         if (d is TypeSynonymDecl) {
           var dd = (TypeSynonymDecl)d;
-          ResolveType(dd.tok, dd.Rhs, dd, ResolveTypeOptionEnum.AllowPrefix, dd.TypeArgs);
+          ResolveType(dd.Origin, dd.Rhs, dd, ResolveTypeOptionEnum.AllowPrefix, dd.TypeArgs);
           dd.Rhs.ForeachTypeComponent(ty => {
             var s = ty.AsRedirectingType;
             if (s != null && s != dd) {
@@ -962,7 +988,7 @@ public void ResolveTopLevelDecls_Signatures(ModuleDefinition def, ModuleSignatur
           });
         } else if (d is NewtypeDecl) {
           var dd = (NewtypeDecl)d;
-          ResolveType(dd.tok, dd.BaseType, dd, ResolveTypeOptionEnum.DontInfer, null);
+          ResolveType(dd.Origin, dd.BaseType, dd, ResolveTypeOptionEnum.DontInfer, null);
           dd.BaseType.ForeachTypeComponent(ty => {
             var s = ty.AsRedirectingType;
             if (s != null && s != dd) {
@@ -974,7 +1000,7 @@ public void ResolveTopLevelDecls_Signatures(ModuleDefinition def, ModuleSignatur
           ResolveIteratorSignature((IteratorDecl)d);
         } else if (d is ModuleDecl) {
           var decl = (ModuleDecl)d;
-          if (!def.IsAbstract && decl is AliasModuleDecl am && decl.Signature.IsAbstract) {
+          if (def.ModuleKind == ModuleKindEnum.Concrete && decl is AliasModuleDecl am && decl.Signature.IsAbstract) {
             reporter.Error(MessageSource.Resolver, am.TargetQId.RootToken(),
               "a compiled module ({0}) is not allowed to import an abstract module ({1})", def.Name, am.TargetQId.ToString());
           }
@@ -998,39 +1024,79 @@ public void ResolveTopLevelDecls_Signatures(ModuleDefinition def, ModuleSignatur
       }
       // Check for cycles among parent traits
       foreach (var cycle in parentRelation.AllCycles()) {
-        ReportCycleError(reporter, cycle, m => m.tok, m => m.Name, "trait definitions contain a cycle");
+        ReportCycleError(reporter, cycle, m => m.Origin, m => m.Name, "trait definitions contain a cycle");
       }
       if (prevErrorCount == reporter.Count(ErrorLevel.Error)) {
         // check that only reference types (classes and some traits) inherit from 'object'
         foreach (TopLevelDecl d in declarations.Where(d => d is TopLevelDeclWithMembers and not ClassLikeDecl)) {
           var nonReferenceTypeDecl = (TopLevelDeclWithMembers)d;
           foreach (var parentType in nonReferenceTypeDecl.ParentTraits.Where(t => t.IsRefType)) {
-            reporter.Error(MessageSource.Resolver, parentType is UserDefinedType parentUdt ? parentUdt.tok : nonReferenceTypeDecl.tok,
+            reporter.Error(MessageSource.Resolver, parentType is UserDefinedType parentUdt ? parentUdt.Origin : nonReferenceTypeDecl.Origin,
               $"{nonReferenceTypeDecl.WhatKind} is not allowed to extend '{parentType}', because it is a reference type");
             break; // one error message per "decl" is enough
           }
         }
       }
-      if (prevErrorCount == reporter.Count(ErrorLevel.Error)) {
-        // Register the trait members in the classes that inherit them
-        foreach (TopLevelDecl d in declarations) {
-          if (d is TopLevelDeclWithMembers cl) {
-            RegisterInheritedMembers(cl);
-          }
-        }
+
+      // Now that non-null types and their base types are in place, resolve the bounds of type parameters
+      ResolveAllTypeParameterBounds(declarations);
+
+      // perform acyclicity test on type synonyms
+      foreach (var cycle in typeRedirectionDependencies.AllCycles()) {
+        ReportCycleError(reporter, cycle, rtd => rtd.Tok, rtd => rtd.Name, "cycle among redirecting types (newtypes, subset types, type synonyms)");
       }
-      if (prevErrorCount == reporter.Count(ErrorLevel.Error)) {
-        // Now that all traits have been resolved, let classes inherit the trait members
-        foreach (var d in declarations) {
-          if (d is TopLevelDeclWithMembers cl) {
-            InheritedTraitMembers(cl);
+    }
+
+    private void ResolveAllTypeParameterBounds(List<TopLevelDecl> declarations) {
+      foreach (var decl in declarations) {
+        allTypeParameters.PushMarker();
+        ResolveTypeParameterBounds(decl.Origin, decl.TypeArgs, decl as ICodeContext ?? new NoContext(decl.EnclosingModuleDefinition));
+        if (decl is TopLevelDeclWithMembers topLevelDeclWithMembers) {
+          foreach (var member in topLevelDeclWithMembers.Members) {
+            if (member is Function function) {
+              var ec = reporter.Count(ErrorLevel.Error);
+              allTypeParameters.PushMarker();
+              ResolveTypeParameterBounds(function.Origin, function.TypeArgs, function);
+              allTypeParameters.PopMarker();
+              if (reporter.Count(ErrorLevel.Error) == ec && function is ExtremePredicate { PrefixPredicate: { } prefixPredicate }) {
+                allTypeParameters.PushMarker();
+                ResolveTypeParameterBounds(prefixPredicate.Origin, prefixPredicate.TypeArgs, prefixPredicate);
+                allTypeParameters.PopMarker();
+              }
+            } else if (member is Method m) {
+              var ec = reporter.Count(ErrorLevel.Error);
+              allTypeParameters.PushMarker();
+              ResolveTypeParameterBounds(m.Origin, m.TypeArgs, m);
+              allTypeParameters.PopMarker();
+              if (reporter.Count(ErrorLevel.Error) == ec && m is ExtremeLemma { PrefixLemma: { } prefixLemma }) {
+                allTypeParameters.PushMarker();
+                ResolveTypeParameterBounds(prefixLemma.Origin, prefixLemma.TypeArgs, prefixLemma);
+                allTypeParameters.PopMarker();
+              }
+            }
           }
         }
+        allTypeParameters.PopMarker();
       }
+    }
 
-      // perform acyclicity test on type synonyms
-      foreach (var cycle in typeRedirectionDependencies.AllCycles()) {
-        ReportCycleError(reporter, cycle, rtd => rtd.tok, rtd => rtd.Name, "cycle among redirecting types (newtypes, subset types, type synonyms)");
+    /// <summary>
+    /// This method pushes the typeParameters to "allTypeParameters" (reporting no errors for any duplicates) and then
+    /// type checks the type-bound types of each type parameter.
+    /// As a side effect, this method leaves "allTypeParameters" in the state after the pushes.
+    /// </summary>
+    void ResolveTypeParameterBounds(IOrigin tok, List<TypeParameter> typeParameters, ICodeContext context) {
+      foreach (var typeParameter in typeParameters) {
+        allTypeParameters.Push(typeParameter.Name, typeParameter);
+      }
+      foreach (var typeParameter in typeParameters) {
+        foreach (var typeBound in typeParameter.TypeBounds) {
+          var prevErrorCount = reporter.ErrorCount;
+          ResolveType(tok, typeBound, context, ResolveTypeOptionEnum.DontInfer, null);
+          if (reporter.ErrorCount == prevErrorCount && !typeBound.IsTraitType) {
+            reporter.Error(MessageSource.Resolver, tok, $"type bound must be a trait or a subset type based on a trait (got {typeBound})");
+          }
+        }
       }
     }
 
@@ -1044,11 +1110,13 @@ public void ResolveTopLevelDecls_Signatures(ModuleDefinition def, ModuleSignatur
       new NativeType("number", -0x1f_ffff_ffff_ffff, 0x20_0000_0000_0000, 0, NativeType.Selection.Number),  // JavaScript integers
       new NativeType("ulong", 0, new BigInteger(0x1_0000_0000) * new BigInteger(0x1_0000_0000), 64, NativeType.Selection.ULong),
       new NativeType("long", Int64.MinValue, 0x8000_0000_0000_0000, 0, NativeType.Selection.Long),
+      new NativeType("udoublelong", 0, new BigInteger(0x1_0000_0000) * new BigInteger(0x1_0000_0000) * new BigInteger(0x1_0000_0000) * new BigInteger(0x1_0000_0000), 128, NativeType.Selection.UDoubleLong),
+      new NativeType("doublelong", new BigInteger(-0x8000_0000_0000_0000)* new BigInteger(0x1_0000_0000) * new BigInteger(0x1_0000_0000), new BigInteger(0x8000_0000_0000_0000)* new BigInteger(0x1_0000_0000) * new BigInteger(0x1_0000_0000), 0, NativeType.Selection.DoubleLong),
     };
 
     public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
       Graph<IndDatatypeDecl> datatypeDependencies, Graph<CoDatatypeDecl> codatatypeDependencies,
-      string moduleName, bool isAnExport = false) {
+      string moduleDescription, bool isAnExport) {
 
       Contract.Requires(declarations != null);
       Contract.Requires(cce.NonNullElements(datatypeDependencies.GetVertices()));
@@ -1072,17 +1140,26 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
         PreTypeResolver.ResolveDeclarations(declarations, this);
 
         if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
+          // Look for any under-specified pre-types, and fill in all .ResolvedOp fields.
           var u = new UnderspecificationDetector(this);
           u.Check(declarations);
         }
 
         if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
-          var preType2TypeVisitor = new PreTypeToTypeVisitor();
+          var preType2TypeVisitor = new PreTypeToTypeVisitor(SystemModuleManager);
           preType2TypeVisitor.VisitConstantsAndRedirectingTypes(declarations);
           preType2TypeVisitor.VisitDeclarations(declarations);
         }
 
+        if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
+          var typeAdjustor = new TypeRefinementVisitor(moduleDescription, SystemModuleManager);
+          typeAdjustor.VisitDeclarations(declarations);
+          typeAdjustor.Solve(reporter, Options.Get(CommonOptionBag.NewTypeInferenceDebug));
+        }
+
       } else {
+        InheritMembers(declarations);
+
         // Resolve all names and infer types. These two are done together, because name resolution depends on having type information
         // and type inference depends on having resolved names.
         // The task is first performed for (the constraints of) newtype declarations, (the constraints of) subset type declarations, and
@@ -1095,23 +1172,31 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
       }
 
       // Check that all types have been determined. During this process, also fill in all .ResolvedOp fields.
+      // Note, in the type system refresh, it can happen that the under-specification detector above finds all pre-types to
+      // be specified, whereas some (necessarily unused) type arguments are still underspecified. Such will be caught by the
+      // CheckTypeInferenceVisitor. (But CheckTypeInferenceVisitor could, for the type system refresh, be modified to
+      // not bother setting .ResolvedOp fields, since the under-specification detector above has already set those.)
       if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
         var checkTypeInferenceVisitor = new CheckTypeInferenceVisitor(this);
         checkTypeInferenceVisitor.VisitDeclarations(declarations);
       }
 
       // Substitute for DefaultValueExpression's
-      FillInDefaultValueExpressions();
+      if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
+        FillInDefaultValueExpressions();
+      }
 
       // ---------------------------------- Pass 1 ----------------------------------
       // This pass does the following:
       // * desugar functions used in reads clauses
+      // * fills in "reads *" clauses on methods, when --reads-clauses-on-methods is used
       // * compute .BodySurrogate for body-less loops
       // * discovers bounds
       // * builds the module's call graph.
       // * compute and checks ghosts (this makes use of bounds discovery, as done above)
       // * for newtypes, figure out native types
       // * for datatypes, check that shared destructors are in agreement in ghost matters
+      // * for methods, check that any reads clause is used correctly
       // * for functions and methods, determine tail recursion
       // ----------------------------------------------------------------------------
 
@@ -1126,80 +1211,37 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
         boundsDiscoveryVisitor.VisitDeclarations(declarations);
       }
 
-      if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
-        CallGraphBuilder.Build(declarations, reporter);
+      if (reporter.Count(ErrorLevel.Error) == prevErrorCount && Options.Get(Method.ReadsClausesOnMethods)) {
+        // Set the default of `reads *` if reads clauses on methods is enabled and this isn't a lemma.
+        // Note that `reads *` is the right default for backwards-compatibility,
+        // but we may want to infer a sensible default like decreases clauses instead in the future.
+        foreach (var declaration in ModuleDefinition.AllCallables(declarations)) {
+          if (declaration is Method { IsLemmaLike: false, Reads: { Expressions: var readsExpressions } } method &&
+              !readsExpressions.Any()) {
+            var star = new FrameExpression(method.Origin, new WildcardExpr(method.Origin) { Type = SystemModuleManager.ObjectSetType() }, null);
+            readsExpressions.Add(star);
+          }
+        }
       }
 
-      // Compute ghost interests, figure out native types, check agreement among datatype destructors, and determine tail calls.
       if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
-        foreach (TopLevelDecl d in declarations) {
-          if (d is IteratorDecl) {
-            var iter = (IteratorDecl)d;
-            iter.SubExpressions.ForEach(e => CheckExpression(e, this, iter));
-            if (iter.Body != null) {
-              ComputeGhostInterest(iter.Body, false, null, iter);
-              CheckExpression(iter.Body, this, iter);
-            }
-
-          } else if (d is SubsetTypeDecl subsetTypeDecl) {
-            Contract.Assert(subsetTypeDecl.Constraint != null);
-            CheckExpression(subsetTypeDecl.Constraint, this, new CodeContextWrapper(subsetTypeDecl, true));
-            subsetTypeDecl.ConstraintIsCompilable =
-              ExpressionTester.CheckIsCompilable(Options, null, subsetTypeDecl.Constraint, new CodeContextWrapper(subsetTypeDecl, true));
-            subsetTypeDecl.CheckedIfConstraintIsCompilable = true;
-
-            if (subsetTypeDecl.Witness != null) {
-              CheckExpression(subsetTypeDecl.Witness, this, new CodeContextWrapper(subsetTypeDecl, subsetTypeDecl.WitnessKind == SubsetTypeDecl.WKind.Ghost));
-              if (subsetTypeDecl.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-                var codeContext = new CodeContextWrapper(subsetTypeDecl, subsetTypeDecl.WitnessKind == SubsetTypeDecl.WKind.Ghost);
-                ExpressionTester.CheckIsCompilable(Options, this, subsetTypeDecl.Witness, codeContext);
-              }
-            }
-
-          } else if (d is NewtypeDecl newtypeDecl) {
-            if (newtypeDecl.Var != null) {
-              Contract.Assert(newtypeDecl.Constraint != null);
-              CheckExpression(newtypeDecl.Constraint, this, new CodeContextWrapper(newtypeDecl, true));
-              if (newtypeDecl.Witness != null) {
-                CheckExpression(newtypeDecl.Witness, this, new CodeContextWrapper(newtypeDecl, newtypeDecl.WitnessKind == SubsetTypeDecl.WKind.Ghost));
-              }
-            }
-            if (newtypeDecl.Witness != null && newtypeDecl.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
-              var codeContext = new CodeContextWrapper(newtypeDecl, newtypeDecl.WitnessKind == SubsetTypeDecl.WKind.Ghost);
-              ExpressionTester.CheckIsCompilable(Options, this, newtypeDecl.Witness, codeContext);
-            }
-
-            FigureOutNativeType(newtypeDecl);
-
-          } else if (d is DatatypeDecl) {
-            var dd = (DatatypeDecl)d;
-            foreach (var member in GetClassMembers(dd)!.Values) {
-              var dtor = member as DatatypeDestructor;
-              if (dtor != null) {
-                var rolemodel = dtor.CorrespondingFormals[0];
-                for (int i = 1; i < dtor.CorrespondingFormals.Count; i++) {
-                  var other = dtor.CorrespondingFormals[i];
-                  if (rolemodel.IsGhost != other.IsGhost) {
-                    reporter.Error(MessageSource.Resolver, other,
-                      "shared destructors must agree on whether or not they are ghost, but '{0}' is {1} in constructor '{2}' and {3} in constructor '{4}'",
-                      rolemodel.Name,
-                      rolemodel.IsGhost ? "ghost" : "non-ghost", dtor.EnclosingCtors[0].Name,
-                      other.IsGhost ? "ghost" : "non-ghost", dtor.EnclosingCtors[i].Name);
-                  }
-                }
-              }
-            }
-            foreach (var ctor in dd.Ctors) {
-              CheckParameterDefaultValuesAreCompilable(ctor.Formals, dd);
-            }
-          }
+        CallGraphBuilder.Build(declarations, reporter);
+      }
 
-          if (d is TopLevelDeclWithMembers cl) {
-            ResolveClassMembers_Pass1(cl);
-          }
+      // The call graph hasn't been completely constructed, because it's missing the edges having to do with
+      // extreme predicates/lemmas. However, figuring out whether or not constraints are compilable depends on
+      // there being no cycles in the call graph. Therefore, we do an initial check for cycles at this time.
+      var cycleErrorHasBeenReported = new HashSet<ICallable>();
+      foreach (var decl in declarations) {
+        if (decl is RedirectingTypeDecl dd) {
+          CheckForCyclesAmongRedirectingTypes(dd, cycleErrorHasBeenReported);
         }
       }
 
+      if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
+        ComputeGhostInterestAndMisc(declarations);
+      }
+
       // ---------------------------------- Pass 2 ----------------------------------
       // This pass fills in various additional information.
       // * Subset type in comprehensions have a compilable constraint 
@@ -1220,19 +1262,49 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
         FillInPostConditionsAndBodiesOfPrefixLemmas(declarations);
       }
 
+      // A function is not allowed to be used naked (that is, without being applied to arguments) in its own SCC.
+      // Also, a function is not allowed to be used in any way inside a "decreases" clause its its own SCC.
+      foreach (var function in ModuleDefinition.AllFunctions(declarations)) {
+        DetectUnsoundFunctionReferencesVisitor.Check(function, this);
+      }
+
+      // An inductive datatype is allowed to be defined as an empty type. For example, in
+      //     predicate P(x: int) { false }
+      //     type Subset = x: int | P(x) witness *
+      //     datatype Record = Record(Subset)
+      // Record is an empty type, because Subset is, since P(x) is always false. But if P(x)
+      // was instead defined to be true for some x's, then Record would be nonempty. Determining whether or
+      // not Record is empty goes well beyond the syntactic checks of the type system.
+      //
+      // However, if a datatype is empty because of some "obvious" cycle among datatype definitions, then
+      // that is both detectable by syntactic checks and likely unintended by the programmer. Therefore,
+      // we search for such type declarations and give error messages if something is found.
+      if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
+        foreach (var dtd in declarations.ConvertAll(decl => decl as IndDatatypeDecl).Where(dtd => dtd != null && dtd.Ctors.Count != 0)) {
+          if (AreThereAnyObviousSignsOfEmptiness(UserDefinedType.FromTopLevelDecl(dtd.Origin, dtd), new HashSet<IndDatatypeDecl>())) {
+            reporter.Warning(MessageSource.Resolver, ResolutionErrors.ErrorId.r_empty_cyclic_datatype, dtd.Origin,
+              $"because of cyclic dependencies among constructor argument types, no instances of datatype '{dtd.Name}' can be constructed");
+          }
+        }
+      }
+
       // Perform the stratosphere check on inductive datatypes, and compute to what extent the inductive datatypes require equality support
-      foreach (var dtd in datatypeDependencies.TopologicallySortedComponents()) {
-        if (datatypeDependencies.GetSCCRepresentative(dtd) == dtd) {
-          // do the following check once per SCC, so call it on each SCC representative
-          SccStratosphereCheck(dtd, datatypeDependencies);
-          DetermineEqualitySupport(dtd, datatypeDependencies);
+      if (reporter.Count(ErrorLevel.Error) == prevErrorCount) { // because SccStratosphereCheck depends on subset-type/newtype base types being successfully resolved
+        foreach (var dtd in datatypeDependencies.TopologicallySortedComponents()) {
+          if (datatypeDependencies.GetSCCRepresentative(dtd) == dtd) {
+            // do the following check once per SCC, so call it on each SCC representative
+            SccStratosphereCheck(dtd, datatypeDependencies);
+            DetermineEqualitySupport(dtd, datatypeDependencies);
+          }
         }
       }
 
       // Set the SccRepr field of codatatypes
-      foreach (var repr in codatatypeDependencies.TopologicallySortedComponents()) {
-        foreach (var codt in codatatypeDependencies.GetSCC(repr)) {
-          codt.SscRepr = repr;
+      if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
+        foreach (var repr in codatatypeDependencies.TopologicallySortedComponents()) {
+          foreach (var codt in codatatypeDependencies.GetSCC(repr)) {
+            codt.SscRepr = repr;
+          }
         }
       }
 
@@ -1271,7 +1343,7 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
               foreach (var c in coCandidates) {
                 c.CandidateCall.CoCall = FunctionCallExpr.CoCallResolution.Yes;
                 c.EnclosingCoConstructor.IsCoCall = true;
-                reporter.Info(MessageSource.Resolver, c.CandidateCall.tok, "co-recursive call");
+                reporter.Info(MessageSource.Resolver, c.CandidateCall.Origin, "co-recursive call");
               }
               // Finally, fill in the CoClusterTarget field
               // Start by setting all the CoClusterTarget fields to CoRecursiveTargetAllTheWay.
@@ -1292,114 +1364,22 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
           }
         }
 
-        InferEqualitySupport(declarations);
+        // Check that type arguments satisfy their required
+        //   - type characteristics, and
+        //   - type bounds
+        TypeCharacteristicChecker.InferAndCheck(declarations, isAnExport, reporter);
 
         // Check that functions claiming to be abstemious really are, and check that 'older' parameters are used only when allowed
         foreach (var fn in ModuleDefinition.AllFunctions(declarations)) {
           new Abstemious(reporter).Check(fn);
           CheckOlderParameters(fn);
         }
-        // Check that all == and != operators in non-ghost contexts are applied to equality-supporting types.
-        // Note that this check can only be done after determining which expressions are ghosts.
-        foreach (var d in declarations) {
-          for (var attr = d.Attributes; attr != null; attr = attr.Prev) {
-            attr.Args.ForEach(e => CheckTypeCharacteristics_Expr(e, true));
-          }
-
-          if (d is IteratorDecl) {
-            var iter = (IteratorDecl)d;
-            foreach (var p in iter.Ins) {
-              CheckTypeCharacteristics_Type(p.tok, p.Type, p.IsGhost);
-            }
-            foreach (var p in iter.Outs) {
-              CheckTypeCharacteristics_Type(p.tok, p.Type, p.IsGhost);
-            }
-            if (iter.Body != null) {
-              CheckTypeCharacteristics_Stmt(iter.Body, false);
-            }
-          } else if (d is ClassLikeDecl) {
-            var cl = (TopLevelDeclWithMembers)d;
-            foreach (var parentTrait in cl.ParentTraits) {
-              CheckTypeCharacteristics_Type(cl.tok, parentTrait, false);
-            }
-          } else if (d is DatatypeDecl) {
-            var dt = (DatatypeDecl)d;
-            foreach (var ctor in dt.Ctors) {
-              foreach (var p in ctor.Formals) {
-                CheckTypeCharacteristics_Type(p.tok, p.Type, p.IsGhost);
-              }
-            }
-          } else if (d is TypeSynonymDecl) {
-            var syn = (TypeSynonymDecl)d;
-            CheckTypeCharacteristics_Type(syn.tok, syn.Rhs, false);
-            if (!isAnExport) {
-              if (syn.SupportsEquality && !syn.Rhs.SupportsEquality) {
-                reporter.Error(MessageSource.Resolver, syn.tok, "type '{0}' declared as supporting equality, but the RHS type ({1}) might not",
-                  syn.Name, syn.Rhs);
-              }
-              if (syn.Characteristics.IsNonempty && !syn.Rhs.IsNonempty) {
-                reporter.Error(MessageSource.Resolver, syn.tok, "type '{0}' declared as being nonempty, but the RHS type ({1}) may be empty",
-                  syn.Name, syn.Rhs);
-              } else if (syn.Characteristics.HasCompiledValue && !syn.Rhs.HasCompilableValue) {
-                reporter.Error(MessageSource.Resolver, syn.tok,
-                  "type '{0}' declared as auto-initialization type, but the RHS type ({1}) does not support auto-initialization", syn.Name, syn.Rhs);
-              }
-              if (syn.Characteristics.ContainsNoReferenceTypes && syn.Rhs.MayInvolveReferences) {
-                reporter.Error(MessageSource.Resolver, syn.tok,
-                  "type '{0}' declared as containing no reference types, but the RHS type ({1}) may contain reference types", syn.Name, syn.Rhs);
-              }
-            }
-          }
-
-          if (d is RedirectingTypeDecl) {
-            var rtd = (RedirectingTypeDecl)d;
-            if (rtd.Constraint != null) {
-              CheckTypeCharacteristics_Expr(rtd.Constraint, true);
-            }
-            if (rtd.Witness != null) {
-              CheckTypeCharacteristics_Expr(rtd.Witness, rtd.WitnessKind == SubsetTypeDecl.WKind.Ghost);
-            }
-          }
 
-          if (d is TopLevelDeclWithMembers) {
-            var cl = (TopLevelDeclWithMembers)d;
-            foreach (var member in cl.Members) {
-              if (member is Field) {
-                var f = (Field)member;
-                CheckTypeCharacteristics_Type(f.tok, f.Type, f.IsGhost);
-                if (f is ConstantField cf && cf.Rhs != null) {
-                  CheckTypeCharacteristics_Expr(cf.Rhs, cf.IsGhost);
-                }
-              } else if (member is Function) {
-                var f = (Function)member;
-                foreach (var p in f.Formals) {
-                  CheckTypeCharacteristics_Type(p.tok, p.Type, f.IsGhost || p.IsGhost);
-                }
-                CheckTypeCharacteristics_Type(f.Result?.tok ?? f.tok, f.ResultType, f.IsGhost);
-                if (f.Body != null) {
-                  CheckTypeCharacteristics_Expr(f.Body, f.IsGhost);
-                }
-              } else if (member is Method) {
-                var m = (Method)member;
-                foreach (var p in m.Ins) {
-                  CheckTypeCharacteristics_Type(p.tok, p.Type, m.IsGhost || p.IsGhost);
-                }
-                foreach (var p in m.Outs) {
-                  CheckTypeCharacteristics_Type(p.tok, p.Type, m.IsGhost || p.IsGhost);
-                }
-                if (m.Body != null) {
-                  CheckTypeCharacteristics_Stmt(m.Body, m.IsGhost);
-                }
-              }
-            }
-          }
-        }
         // Check that extreme predicates are not recursive with non-extreme-predicate functions (and only
         // with extreme predicates of the same polarity), and
         // check that greatest lemmas are not recursive with non-greatest-lemma methods.
         // Also, check that the constraints of newtypes/subset-types do not depend on the type itself.
         // And check that const initializers are not cyclic.
-        var cycleErrorHasBeenReported = new HashSet<ICallable>();
         foreach (var d in declarations) {
           if (d is TopLevelDeclWithMembers { Members: var members }) {
             foreach (var member in members) {
@@ -1409,9 +1389,9 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
                 // of their soundness)
                 fn.Req.ForEach(e => ExtremePredicateChecks(e.E, fn, CallingPosition.Positive));
                 fn.Decreases.Expressions.ForEach(e => ExtremePredicateChecks(e, fn, CallingPosition.Positive));
-                fn.Reads.ForEach(e => ExtremePredicateChecks(e.E, fn, CallingPosition.Positive));
+                fn.Reads.Expressions.ForEach(e => ExtremePredicateChecks(e.E, fn, CallingPosition.Positive));
                 if (fn.Ens.Count != 0) {
-                  reporter.Error(MessageSource.Resolver, fn.Ens[0].E.tok, "a {0} is not allowed to declare any ensures clause", member.WhatKind);
+                  reporter.Error(MessageSource.Resolver, fn.Ens[0].E.Origin, "a {0} is not allowed to declare any ensures clause", member.WhatKind);
                 }
                 if (fn.Body != null) {
                   ExtremePredicateChecks(fn.Body, fn, CallingPosition.Positive);
@@ -1442,16 +1422,7 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
           }
 
           if (d is RedirectingTypeDecl dd) {
-            if (d.EnclosingModuleDefinition.CallGraph.GetSCCSize(dd) != 1) {
-              var r = d.EnclosingModuleDefinition.CallGraph.GetSCCRepresentative(dd);
-              if (cycleErrorHasBeenReported.Contains(r)) {
-                // An error has already been reported for this cycle, so don't report another.
-                // Note, the representative, "r", may itself not be a const.
-              } else if (dd is NewtypeDecl || dd is SubsetTypeDecl) {
-                ReportCallGraphCycleError(dd, $"recursive constraint dependency involving a {dd.WhatKind}");
-                cycleErrorHasBeenReported.Add(r);
-              }
-            }
+            CheckForCyclesAmongRedirectingTypes(dd, cycleErrorHasBeenReported);
           }
         }
       }
@@ -1460,13 +1431,29 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
       // Further checks
       // ----------------------------------------------------------------------------
 
+      foreach (TopLevelDecl d in declarations) {
+        if (d is ClassDecl classDecl) {
+          var classIsExtern = !Options.DisallowExterns && Attributes.Contains(classDecl.Attributes, "extern");
+          if (Options.ForbidNondeterminism &&
+              !classIsExtern &&
+              !classDecl.Members.Exists(member => member is Constructor) &&
+              classDecl.Members.Exists(member => member is Field && !(member is ConstantField { Rhs: not null }))) {
+            // This check should be moved to the resolver once we have a language construct to indicate the type is imported
+            // Instead of the extern attribute
+            Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_constructorless_class_forbidden,
+              classDecl.Origin,
+              "since fields are initialized arbitrarily, constructor-less classes are forbidden by the --enforce-determinism option");
+          }
+        }
+      }
+
       if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
         // Check that type-parameter variance is respected in type definitions
         foreach (TopLevelDecl d in declarations) {
           if (d is ClassLikeDecl) {
             foreach (var tp in d.TypeArgs) {
               if (tp.Variance != TypeParameter.TPVariance.Non) {
-                reporter.Error(MessageSource.Resolver, tp.tok, "{0} declarations only support non-variant type parameters", d.WhatKind);
+                reporter.Error(MessageSource.Resolver, tp.Origin, "{0} declarations only support non-variant type parameters", d.WhatKind);
               }
             }
           } else if (d is TypeSynonymDecl) {
@@ -1503,11 +1490,15 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
         new HigherOrderHeapAllocationCheckerConstructor(reporter).VisitDeclarations(declarations);
       }
 
+      if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
+        new CheckMapRangeSupportsEquality(reporter).VisitDeclarations(declarations);
+      }
+
       if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
         // Check that usage of "this" is restricted before "new;" in constructor bodies,
         // and that a class without any constructor only has fields with known initializers.
         // Also check that static fields (which are necessarily const) have initializers.
-        var cdci = new CheckDividedConstructorInit_Visitor(reporter);
+        var cdci = new CheckDividedConstructorInitVisitor(reporter);
         foreach (var cl in ModuleDefinition.AllTypesWithMembers(declarations)) {
           // only reference types (classes and reference-type traits) are allowed to declare mutable fields
           if (cl is not ClassLikeDecl { IsReferenceTypeDecl: true }) {
@@ -1519,7 +1510,7 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
           }
 
           if (cl is not ClassLikeDecl) {
-            if (!isAnExport && !cl.EnclosingModuleDefinition.IsAbstract) {
+            if (!isAnExport && cl.EnclosingModuleDefinition.ModuleKind == ModuleKindEnum.Concrete) {
               // non-reference, non-trait types (datatype, newtype, opaque) don't have constructors that can initialize fields
               foreach (var member in cl.Members) {
                 if (member is ConstantField f && f.Rhs == null && !f.IsExtern(Options, out _, out _)) {
@@ -1530,7 +1521,7 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
             continue;
           }
           if (cl is TraitDecl traitDecl) {
-            if (!isAnExport && !cl.EnclosingModuleDefinition.IsAbstract) {
+            if (!isAnExport && cl.EnclosingModuleDefinition.ModuleKind == ModuleKindEnum.Concrete) {
               // check for static consts, and check for instance fields in non-reference traits
               foreach (var member in cl.Members) {
                 if (member is ConstantField f && f.Rhs == null && !f.IsExtern(Options, out _, out _)) {
@@ -1556,7 +1547,7 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
               }
             } else if (member is ConstantField && member.IsStatic) {
               var f = (ConstantField)member;
-              if (!isAnExport && !cl.EnclosingModuleDefinition.IsAbstract && f.Rhs == null && !f.IsExtern(Options, out _, out _)) {
+              if (!isAnExport && cl.EnclosingModuleDefinition.ModuleKind == ModuleKindEnum.Concrete && f.Rhs == null && !f.IsExtern(Options, out _, out _)) {
                 CheckIsOkayWithoutRHS(f, false);
               }
             } else if (member is Field && fieldWithoutKnownInitializer == null) {
@@ -1585,145 +1576,108 @@ public void ResolveTopLevelDecls_Core(List<TopLevelDecl> declarations,
             }
             // go through inherited members...
             if (fieldWithoutKnownInitializer != null) {
-              reporter.Error(MessageSource.Resolver, cl.tok, "class '{0}' with fields without known initializers, like '{1}' of type '{2}', must declare a constructor",
+              reporter.Error(MessageSource.Resolver, cl.Origin, "class '{0}' with fields without known initializers, like '{1}' of type '{2}', must declare a constructor",
                 cl.Name, fieldWithoutKnownInitializer.Name, fieldWithoutKnownInitializer.Type.Subst(cl.ParentFormalTypeParametersToActuals));
             }
           }
         }
       }
-      // Verifies that, in all compiled places, subset types in comprehensions have a compilable constraint
-      new SubsetConstraintGhostChecker(this.Reporter).Traverse(declarations);
+
+      if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
+        // Verifies that, in all compiled places, subset types in comprehensions have a compilable constraint
+        new SubsetConstraintGhostChecker(this.Reporter).Traverse(declarations);
+      }
     }
 
     /// <summary>
-    /// Inferred required equality support for datatypes and type synonyms, and for Function and Method signatures.
+    /// Compute ghost interests, figure out native types, check agreement among datatype destructors, and determine tail calls.
     /// </summary>
-    /// <param name="declarations"></param>
-    private void InferEqualitySupport(List<TopLevelDecl> declarations) {
-      /// First, do datatypes and type synonyms until a fixpoint is reached.
-      bool inferredSomething;
-      do {
-        inferredSomething = false;
-        foreach (var d in declarations) {
-          if (Attributes.Contains(d.Attributes, "_provided")) {
-            // Don't infer required-equality-support for the type parameters, since there are
-            // scopes that see the name of the declaration but not its body.
-          } else if (d is DatatypeDecl) {
-            var dt = (DatatypeDecl)d;
-            foreach (var tp in dt.TypeArgs) {
-              if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
-                // here's our chance to infer the need for equality support
-                foreach (var ctor in dt.Ctors) {
-                  foreach (var arg in ctor.Formals) {
-                    if (InferRequiredEqualitySupport(tp, arg.Type)) {
-                      tp.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
-                      inferredSomething = true;
-                      goto DONE_DT; // break out of the doubly-nested loop
-                    }
-                  }
-                }
-              DONE_DT:;
-              }
-            }
-          } else if (d is TypeSynonymDecl) {
-            var syn = (TypeSynonymDecl)d;
-            foreach (var tp in syn.TypeArgs) {
-              if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
-                // here's our chance to infer the need for equality support
-                if (InferRequiredEqualitySupport(tp, syn.Rhs)) {
-                  tp.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
-                  inferredSomething = true;
-                }
-              }
+    private void ComputeGhostInterestAndMisc(List<TopLevelDecl> declarations) {
+      foreach (TopLevelDecl d in declarations) {
+        if (d is IteratorDecl) {
+          var iter = (IteratorDecl)d;
+          iter.SubExpressions.ForEach(e => CheckExpression(e, this, iter));
+          if (iter.Body != null) {
+            CheckExpression(iter.Body, this, iter);
+          }
+
+        } else if (d is SubsetTypeDecl subsetTypeDecl) {
+          Contract.Assert(subsetTypeDecl.Constraint != null);
+          CheckExpression(subsetTypeDecl.Constraint, this, new CodeContextWrapper(subsetTypeDecl, true));
+
+          if (subsetTypeDecl.Witness != null) {
+            CheckExpression(subsetTypeDecl.Witness, this,
+              new CodeContextWrapper(subsetTypeDecl, subsetTypeDecl.WitnessKind == SubsetTypeDecl.WKind.Ghost));
+            if (subsetTypeDecl.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+              var codeContext = new CodeContextWrapper(subsetTypeDecl, subsetTypeDecl.WitnessKind == SubsetTypeDecl.WKind.Ghost);
+              ExpressionTester.CheckIsCompilable(Options, this, subsetTypeDecl.Witness, codeContext);
             }
           }
-        }
-      } while (inferredSomething);
 
-      // Now do it for Function and Method signatures.
-      foreach (var d in declarations) {
-        if (d is IteratorDecl) {
-          var iter = (IteratorDecl)d;
-          var done = false;
-          var nonnullIter = iter.NonNullTypeDecl;
-          Contract.Assert(nonnullIter.TypeArgs.Count == iter.TypeArgs.Count);
-          for (var i = 0; i < iter.TypeArgs.Count; i++) {
-            var tp = iter.TypeArgs[i];
-            var correspondingNonnullIterTypeParameter = nonnullIter.TypeArgs[i];
-            if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
-              // here's our chance to infer the need for equality support
-              foreach (var p in iter.Ins) {
-                if (InferRequiredEqualitySupport(tp, p.Type)) {
-                  tp.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
-                  correspondingNonnullIterTypeParameter.Characteristics.EqualitySupport =
-                    TypeParameter.EqualitySupportValue.InferredRequired;
-                  done = true;
-                  break;
-                }
-              }
-              foreach (var p in iter.Outs) {
-                if (done) {
-                  break;
-                }
+        } else if (d is NewtypeDecl newtypeDecl) {
+          if (newtypeDecl.Var != null) {
+            Contract.Assert(newtypeDecl.Constraint != null);
+            CheckExpression(newtypeDecl.Constraint, this, new CodeContextWrapper(newtypeDecl, true));
+          }
 
-                if (InferRequiredEqualitySupport(tp, p.Type)) {
-                  tp.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
-                  correspondingNonnullIterTypeParameter.Characteristics.EqualitySupport =
-                    TypeParameter.EqualitySupportValue.InferredRequired;
-                  break;
-                }
-              }
+          if (newtypeDecl.Witness != null) {
+            CheckExpression(newtypeDecl.Witness, this, new CodeContextWrapper(newtypeDecl, newtypeDecl.WitnessKind == SubsetTypeDecl.WKind.Ghost));
+            if (newtypeDecl.WitnessKind == SubsetTypeDecl.WKind.Compiled) {
+              var codeContext = new CodeContextWrapper(newtypeDecl, newtypeDecl.WitnessKind == SubsetTypeDecl.WKind.Ghost);
+              ExpressionTester.CheckIsCompilable(Options, this, newtypeDecl.Witness, codeContext);
             }
           }
-        } else if (d is ClassLikeDecl or DefaultClassDecl) {
-          var cl = (TopLevelDeclWithMembers)d;
-          foreach (var member in cl.Members) {
-            if (!member.IsGhost) {
-              if (member is Function) {
-                var f = (Function)member;
-                foreach (var tp in f.TypeArgs) {
-                  if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
-                    // here's our chance to infer the need for equality support
-                    if (InferRequiredEqualitySupport(tp, f.ResultType)) {
-                      tp.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
-                    } else {
-                      foreach (var p in f.Formals) {
-                        if (InferRequiredEqualitySupport(tp, p.Type)) {
-                          tp.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
-                          break;
-                        }
-                      }
-                    }
-                  }
-                }
-              } else if (member is Method) {
-                var m = (Method)member;
-                bool done = false;
-                foreach (var tp in m.TypeArgs) {
-                  if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
-                    // here's our chance to infer the need for equality support
-                    foreach (var p in m.Ins) {
-                      if (InferRequiredEqualitySupport(tp, p.Type)) {
-                        tp.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
-                        done = true;
-                        break;
-                      }
-                    }
-                    foreach (var p in m.Outs) {
-                      if (done) {
-                        break;
-                      }
-
-                      if (InferRequiredEqualitySupport(tp, p.Type)) {
-                        tp.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
-                        break;
-                      }
-                    }
-                  }
+
+          new NativeTypeAnalysis(reporter).FigureOutNativeType(newtypeDecl, Options);
+
+        } else if (d is DatatypeDecl) {
+          var dd = (DatatypeDecl)d;
+          foreach (var member in GetClassMembers(dd)!.Values) {
+            var dtor = member as DatatypeDestructor;
+            if (dtor != null) {
+              var rolemodel = dtor.CorrespondingFormals[0];
+              for (int i = 1; i < dtor.CorrespondingFormals.Count; i++) {
+                var other = dtor.CorrespondingFormals[i];
+                if (rolemodel.IsGhost != other.IsGhost) {
+                  reporter.Error(MessageSource.Resolver, other,
+                    "shared destructors must agree on whether or not they are ghost, but '{0}' is {1} in constructor '{2}' and {3} in constructor '{4}'",
+                    rolemodel.Name,
+                    rolemodel.IsGhost ? "ghost" : "non-ghost", dtor.EnclosingCtors[0].Name,
+                    other.IsGhost ? "ghost" : "non-ghost", dtor.EnclosingCtors[i].Name);
                 }
               }
             }
           }
+          foreach (var ctor in dd.Ctors) {
+            CheckParameterDefaultValuesAreCompilable(ctor.Formals, dd);
+          }
+        }
+      }
+
+      AnalyzeTypeConstraints.AssignConstraintIsCompilable(declarations, Options);
+
+      // Now that we have filled in the .ConstraintIsCompilable field of all subset types and newtypes, we're ready to
+      // visit iterator bodies and members (which will make calls to CheckIsCompilable).
+      foreach (TopLevelDecl d in declarations) {
+        if (d is IteratorDecl { Body: { } iterBody } iter) {
+          ComputeGhostInterest(iter.Body, false, null, iter);
+        }
+        if (d is TopLevelDeclWithMembers cl) {
+          ResolveClassMembers_Pass1(cl);
+        }
+      }
+    }
+
+    private void CheckForCyclesAmongRedirectingTypes(RedirectingTypeDecl dd, HashSet<ICallable> cycleErrorHasBeenReported) {
+      var enclosingModule = dd.EnclosingModule;
+      if (enclosingModule.CallGraph.GetSCCSize(dd) != 1) {
+        var r = enclosingModule.CallGraph.GetSCCRepresentative(dd);
+        if (cycleErrorHasBeenReported.Contains(r)) {
+          // An error has already been reported for this cycle, so don't report another.
+          // Note, the representative, "r", may itself not be a const.
+        } else if (dd is NewtypeDecl or SubsetTypeDecl) {
+          ReportCallGraphCycleError(dd, $"recursive constraint dependency involving a {dd.WhatKind}");
+          cycleErrorHasBeenReported.Add(r);
         }
       }
     }
@@ -1737,30 +1691,31 @@ private void FillInPostConditionsAndBodiesOfPrefixLemmas(List<TopLevelDecl> decl
 
         var k = prefixLemma.Ins[0];
         var focalPredicates = new HashSet<ExtremePredicate>();
+        var focalCodatatypeEquality = new HashSet<CoDatatypeDecl>();
         if (com is GreatestLemma) {
           // compute the postconditions of the prefix lemma
           Contract.Assume(prefixLemma.Ens.Count == 0); // these are not supposed to have been filled in before
           foreach (var p in com.Ens) {
             var coConclusions = new HashSet<Expression>();
             CollectFriendlyCallsInExtremeLemmaSpecification(p.E, true, coConclusions, true, com);
-            var subst = new ExtremeLemmaSpecificationSubstituter(coConclusions, new IdentifierExpr(k.tok, k.Name),
+            var subst = new ExtremeLemmaSpecificationSubstituter(coConclusions, new IdentifierExpr(k.Origin, k.Name),
               this.reporter, true);
             var post = subst.CloneExpr(p.E);
             prefixLemma.Ens.Add(new AttributedExpression(post));
             foreach (var e in coConclusions) {
-              var fce = e as FunctionCallExpr;
-              if (fce != null) {
-                // the other possibility is that "e" is a BinaryExpr
+              if (e is FunctionCallExpr fce) {
                 GreatestPredicate predicate = (GreatestPredicate)fce.Function;
                 focalPredicates.Add(predicate);
                 // For every focal predicate P in S, add to S all greatest predicates in the same strongly connected
                 // component (in the call graph) as P
-                foreach (var node in predicate.EnclosingClass.EnclosingModuleDefinition.CallGraph.GetSCC(
-                           predicate)) {
-                  if (node is GreatestPredicate) {
-                    focalPredicates.Add((GreatestPredicate)node);
+                foreach (var node in predicate.EnclosingClass.EnclosingModuleDefinition.CallGraph.GetSCC(predicate)) {
+                  if (node is GreatestPredicate greatestPredicate) {
+                    focalPredicates.Add(greatestPredicate);
                   }
                 }
+              } else {
+                var binExpr = (BinaryExpr)e; // each "coConclusion" is either a FunctionCallExpr or a BinaryExpr
+                focalCodatatypeEquality.Add(binExpr.E0.Type.AsCoDatatype ?? binExpr.E1.Type.AsCoDatatype);
               }
             }
           }
@@ -1770,7 +1725,7 @@ private void FillInPostConditionsAndBodiesOfPrefixLemmas(List<TopLevelDecl> decl
           foreach (var p in com.Req) {
             var antecedents = new HashSet<Expression>();
             CollectFriendlyCallsInExtremeLemmaSpecification(p.E, true, antecedents, false, com);
-            var subst = new ExtremeLemmaSpecificationSubstituter(antecedents, new IdentifierExpr(k.tok, k.Name),
+            var subst = new ExtremeLemmaSpecificationSubstituter(antecedents, new IdentifierExpr(k.Origin, k.Name),
               this.reporter, false);
             var pre = subst.CloneExpr(p.E);
             prefixLemma.Req.Add(new AttributedExpression(pre, p.Label, null));
@@ -1781,29 +1736,34 @@ private void FillInPostConditionsAndBodiesOfPrefixLemmas(List<TopLevelDecl> decl
               // For every focal predicate P in S, add to S all least predicates in the same strongly connected
               // component (in the call graph) as P
               foreach (var node in predicate.EnclosingClass.EnclosingModuleDefinition.CallGraph.GetSCC(predicate)) {
-                if (node is LeastPredicate) {
-                  focalPredicates.Add((LeastPredicate)node);
+                if (node is LeastPredicate leastPredicate) {
+                  focalPredicates.Add(leastPredicate);
                 }
               }
             }
           }
         }
 
-        reporter.Info(MessageSource.Resolver, com.tok,
-          focalPredicates.Count == 0
-            ? $"{com.PrefixLemma.Name} has no focal predicates"
-            : $"{com.PrefixLemma.Name} with focal predicate{Util.Plural(focalPredicates.Count)} {Util.Comma(focalPredicates, p => p.Name)}");
+        var focalCount = focalPredicates.Count + focalCodatatypeEquality.Count;
+        if (focalCount == 0) {
+          reporter.Info(MessageSource.Resolver, com.Origin, $"{com.PrefixLemma.Name} has no focal predicates");
+        } else {
+          var predicates = Util.Comma(focalPredicates, p => p.Name);
+          var equalities = Util.Comma(focalCodatatypeEquality, decl => $"{decl.Name}.==");
+          var focals = predicates + (predicates.Length != 0 && equalities.Length != 0 ? ", " : "") + equalities;
+          reporter.Info(MessageSource.Resolver, com.Origin, $"{com.PrefixLemma.Name} with focal predicate{Util.Plural(focalCount)} {focals}");
+        }
         // Compute the statement body of the prefix lemma
         Contract.Assume(prefixLemma.Body == null); // this is not supposed to have been filled in before
         if (com.Body != null) {
-          var kMinusOne = new BinaryExpr(com.tok, BinaryExpr.Opcode.Sub, new IdentifierExpr(k.tok, k.Name),
-            new LiteralExpr(com.tok, 1));
-          var subst = new ExtremeLemmaBodyCloner(com, kMinusOne, focalPredicates, this.reporter);
+          var kMinusOne = new BinaryExpr(com.Origin, BinaryExpr.Opcode.Sub, new IdentifierExpr(k.Origin, k.Name),
+            new LiteralExpr(com.Origin, 1));
+          var subst = new ExtremeLemmaBodyCloner(com, kMinusOne, focalPredicates, focalCodatatypeEquality, this.reporter);
           var mainBody = subst.CloneBlockStmt(com.Body);
           Expression kk;
           Statement els;
           if (k.Type.IsBigOrdinalType) {
-            kk = new MemberSelectExpr(k.tok, new IdentifierExpr(k.tok, k.Name), "Offset");
+            kk = new MemberSelectExpr(k.Origin, new IdentifierExpr(k.Origin, k.Name), new Name("Offset"));
             // As an "else" branch, we add recursive calls for the limit case.  When automatic induction is on,
             // this get handled automatically, but we still want it in the case when automatic induction has been
             // turned off.
@@ -1811,9 +1771,9 @@ private void FillInPostConditionsAndBodiesOfPrefixLemmas(List<TopLevelDecl> decl
             //       pp(k', params);
             //     }
             Contract.Assume(SystemModuleManager.ORDINAL_Offset != null); // should have been filled in earlier
-            var kId = new IdentifierExpr(com.tok, k);
-            var kprimeVar = new BoundVar(com.tok, "_k'", Type.BigOrdinal);
-            var kprime = new IdentifierExpr(com.tok, kprimeVar);
+            var kId = new IdentifierExpr(com.Origin, k);
+            var kprimeVar = new BoundVar(com.Origin, "_k'", Type.BigOrdinal);
+            var kprime = new IdentifierExpr(com.Origin, kprimeVar);
             var smaller = Expression.CreateLess(kprime, kId);
 
             var bvs = new List<BoundVar>(); // the following loop populates bvs with k', params
@@ -1823,22 +1783,22 @@ private void FillInPostConditionsAndBodiesOfPrefixLemmas(List<TopLevelDecl> decl
                 bvs.Add(kprimeVar);
                 substMap.Add(k, kprime);
               } else {
-                var bv = new BoundVar(inFormal.tok, inFormal.Name, inFormal.Type);
+                var bv = new BoundVar(inFormal.Origin, inFormal.Name, inFormal.Type);
                 bvs.Add(bv);
-                substMap.Add(inFormal, new IdentifierExpr(com.tok, bv));
+                substMap.Add(inFormal, new IdentifierExpr(com.Origin, bv));
               }
             }
 
-            Translator.RecursiveCallParameters(com.tok, prefixLemma, prefixLemma.TypeArgs, prefixLemma.Ins, null,
+            prefixLemma.RecursiveCallParameters(com.Origin, prefixLemma.TypeArgs, prefixLemma.Ins, null,
               substMap, out var recursiveCallReceiver, out var recursiveCallArgs);
-            var methodSel = new MemberSelectExpr(com.tok, recursiveCallReceiver, prefixLemma.Name);
+            var methodSel = new MemberSelectExpr(com.Origin, recursiveCallReceiver, prefixLemma.NameNode);
             methodSel.Member = prefixLemma; // resolve here
-            methodSel.TypeApplication_AtEnclosingClass =
-              prefixLemma.EnclosingClass.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp.tok, tp));
-            methodSel.TypeApplication_JustMember =
-              prefixLemma.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp.tok, tp));
+            methodSel.TypeApplicationAtEnclosingClass =
+              prefixLemma.EnclosingClass.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp.Origin, tp));
+            methodSel.TypeApplicationJustMember =
+              prefixLemma.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp.Origin, tp));
             methodSel.Type = new InferredTypeProxy();
-            var recursiveCall = new CallStmt(com.RangeToken, new List<Expression>(), methodSel,
+            var recursiveCall = new CallStmt(com.Origin, new List<Expression>(), methodSel,
               recursiveCallArgs.ConvertAll(e => new ActualBinding(null, e)));
             recursiveCall.IsGhost = prefixLemma.IsGhost; // resolve here
 
@@ -1851,18 +1811,18 @@ private void FillInPostConditionsAndBodiesOfPrefixLemmas(List<TopLevelDecl> decl
             attrs = new Attributes("_trustWellformed", new List<Expression>(), attrs);
 #endif
             attrs = new Attributes("auto_generated", new List<Expression>(), attrs);
-            var forallBody = new BlockStmt(mainBody.RangeToken, new List<Statement>() { recursiveCall });
-            var forallStmt = new ForallStmt(mainBody.RangeToken, bvs, attrs, range,
+            var forallBody = new BlockStmt(mainBody.Origin, new List<Statement>() { recursiveCall });
+            var forallStmt = new ForallStmt(mainBody.Origin, bvs, attrs, range,
               new List<AttributedExpression>(), forallBody);
-            els = new BlockStmt(mainBody.RangeToken, new List<Statement>() { forallStmt });
+            els = new BlockStmt(mainBody.Origin, new List<Statement>() { forallStmt });
           } else {
-            kk = new IdentifierExpr(k.tok, k.Name);
+            kk = new IdentifierExpr(k.Origin, k.Name);
             els = null;
           }
 
-          var kPositive = new BinaryExpr(com.tok, BinaryExpr.Opcode.Lt, new LiteralExpr(com.tok, 0), kk);
-          var condBody = new IfStmt(mainBody.RangeToken, false, kPositive, mainBody, els);
-          prefixLemma.Body = new BlockStmt(mainBody.RangeToken, new List<Statement>() { condBody });
+          var kPositive = new BinaryExpr(com.Origin, BinaryExpr.Opcode.Lt, new LiteralExpr(com.Origin, 0), kk);
+          var condBody = new IfStmt(mainBody.Origin, false, kPositive, mainBody, els);
+          prefixLemma.Body = new BlockStmt(mainBody.Origin, new List<Statement>() { condBody });
         }
 
         // The prefix lemma now has all its components, so it's finally time we resolve it
@@ -1886,10 +1846,10 @@ private void CheckIsOkayWithoutRHS(ConstantField f, bool giveNonReferenceTypeTra
       var statik = f.IsStatic ? "static " : "";
 
       if (f.IsGhost && !f.Type.IsNonempty) {
-        reporter.Error(MessageSource.Resolver, f.tok,
+        reporter.Error(MessageSource.Resolver, f.Origin,
           $"{statik}ghost const field '{f.Name}' of type '{f.Type}' (which may be empty) must give a defining value{hint}");
       } else if (!f.IsGhost && !f.Type.HasCompilableValue) {
-        reporter.Error(MessageSource.Resolver, f.tok,
+        reporter.Error(MessageSource.Resolver, f.Origin,
           $"{statik}non-ghost const field '{f.Name}' of type '{f.Type}' (which does not have a default compiled value) must give a defining value{hint}");
       }
     }
@@ -1907,9 +1867,32 @@ private void ResolveClassMembers_Pass1(TopLevelDeclWithMembers cl) {
               new TailRecursion(reporter).DetermineTailRecursion(method);
             }
 
+            // check that any reads clause is used correctly
+            var readsClausesOnMethodsEnabled = Options.Get(Method.ReadsClausesOnMethods);
+            foreach (FrameExpression fe in method.Reads.Expressions) {
+              if (method.IsLemmaLike) {
+                reporter.Error(MessageSource.Resolver, fe.Origin,
+                  "{0}s are not allowed to have reads clauses (they are allowed to read all memory locations)", method.WhatKind);
+              } else if (!readsClausesOnMethodsEnabled) {
+                reporter.Error(MessageSource.Resolver, fe.Origin,
+                  "reads clauses on methods are forbidden without the command-line flag `--reads-clauses-on-methods`");
+              } else if (method.IsGhost) {
+                DisallowNonGhostFieldSpecifiers(fe);
+              }
+            }
+
+            // check that any modifies clause is used correctly
+            foreach (FrameExpression fe in method.Mod.Expressions) {
+              if (method.IsLemmaLike) {
+                reporter.Error(MessageSource.Resolver, fe.Origin, "{0}s are not allowed to have modifies clauses", method.WhatKind);
+              } else if (method.IsGhost) {
+                DisallowNonGhostFieldSpecifiers(fe);
+              }
+            }
+
           } else if (member is Function function) {
             CheckForUnnecessaryEqualitySupportDeclarations(function, function.TypeArgs);
-            CheckParameterDefaultValuesAreCompilable(function.Formals, function);
+            CheckParameterDefaultValuesAreCompilable(function.Ins, function);
             if (function.ByMethodBody == null) {
               if (!function.IsGhost && function.Body != null) {
                 ExpressionTester.CheckIsCompilable(Options, this, function.Body, function);
@@ -1927,7 +1910,7 @@ private void ResolveClassMembers_Pass1(TopLevelDeclWithMembers cl) {
               } else {
                 // m should not be null, unless an error has been reported
                 // (e.g. function-by-method and method with the same name) 
-                Contract.Assert(reporter.ErrorCount > 0);
+                Contract.Assert(reporter.HasErrors);
               }
             }
 
@@ -1945,7 +1928,7 @@ private void ResolveClassMembers_Pass1(TopLevelDeclWithMembers cl) {
     void CheckForUnnecessaryEqualitySupportDeclarations(MemberDecl member, List<TypeParameter> typeParameters) {
       if (member.IsGhost) {
         foreach (var p in typeParameters.Where(p => p.SupportsEquality)) {
-          reporter.Warning(MessageSource.Resolver, ErrorRegistry.NoneId, p.tok,
+          reporter.Warning(MessageSource.Resolver, ErrorRegistry.NoneId, p.Origin,
             $"type parameter {p.Name} of ghost {member.WhatKind} {member.Name} is declared (==), which is unnecessary because the {member.WhatKind} doesn't contain any compiled code");
         }
       }
@@ -1973,10 +1956,10 @@ void ReportCallGraphCycleError(ICallable start, string msg) {
       var startIndex = scc.IndexOf(start);
       Contract.Assert(0 <= startIndex);
       scc = Util.Concat(scc.GetRange(startIndex, scc.Count - startIndex), scc.GetRange(0, startIndex));
-      ReportCycleError(reporter, scc, c => c.Tok, c => c.NameRelativeToModule, msg);
+      ReportCycleError(reporter, scc, c => c.Origin, c => c.NameRelativeToModule, msg);
     }
 
-    public static void ReportCycleError<X>(ErrorReporter reporter, List<X> cycle, Func<X, IToken> toTok, Func<X, string> toString, string msg) {
+    public static void ReportCycleError<X>(ErrorReporter reporter, List<X> cycle, Func<X, IOrigin> toTok, Func<X, string> toString, string msg) {
       Contract.Requires(cycle != null);
       Contract.Requires(cycle.Count != 0);
       Contract.Requires(toTok != null);
@@ -1989,809 +1972,84 @@ public static void ReportCycleError<X>(ErrorReporter reporter, List<X> cycle, Fu
     }
 
     /// <summary>
-    /// Returns the largest value that can be stored in bitvector type "t".
+    /// Check that the 'older' modifier on parameters is used correctly and report any errors of the contrary.
     /// </summary>
-    public static BigInteger MaxBV(Type t) {
-      Contract.Requires(t != null);
-      Contract.Requires(t.IsBitVectorType);
-      return MaxBV(t.AsBitVectorType.Width);
+    void CheckOlderParameters(Function f) {
+      Contract.Requires(f != null);
+
+      if (!f.ResultType.IsBoolType || f is PrefixPredicate || f is ExtremePredicate) {
+        // parameters are not allowed to be marked 'older'
+        foreach (var formal in f.Ins) {
+          if (formal.IsOlder) {
+            reporter.Error(MessageSource.Resolver, formal.Origin, "only predicates and two-state predicates are allowed 'older' parameters");
+          }
+        }
+      }
     }
 
+    // ------------------------------------------------------------------------------------------------------
+    // ----- CheckExpression --------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------------------------------
+    #region CheckExpression
+    /// <summary>
+    /// This method computes ghost interests in the statement portion of StmtExpr's and
+    /// checks for hint restrictions in any CalcStmt.
+    /// </summary>
+    void CheckExpression(Expression expr, ModuleResolver resolver, ICodeContext codeContext) {
+      Contract.Requires(expr != null);
+      Contract.Requires(resolver != null);
+      Contract.Requires(codeContext != null);
+      var v = new CheckLocalityVisitor(resolver, codeContext);
+      v.Visit(expr);
+    }
     /// <summary>
-    /// Returns the largest value that can be stored in bitvector type of "bits" width.
+    /// This method computes ghost interests in the statement portion of StmtExpr's and
+    /// checks for hint restrictions in any CalcStmt. In any ghost context, it also
+    /// changes the bound variables of all let- and let-such-that expressions to ghost.
+    /// It also performs substitutions in DefaultValueExpression's.
     /// </summary>
-    public static BigInteger MaxBV(int bits) {
-      Contract.Requires(0 <= bits);
-      return BigInteger.Pow(new BigInteger(2), bits) - BigInteger.One;
+    void CheckExpression(Statement stmt, ModuleResolver resolver, ICodeContext codeContext) {
+      Contract.Requires(stmt != null);
+      Contract.Requires(resolver != null);
+      Contract.Requires(codeContext != null);
+      var v = new CheckLocalityVisitor(resolver, codeContext);
+      v.Visit(stmt);
     }
 
-    private void FigureOutNativeType(NewtypeDecl dd) {
-      Contract.Requires(dd != null);
+    #endregion
+
+    void ExtremePredicateChecks(Expression expr, ExtremePredicate context, CallingPosition cp) {
+      Contract.Requires(expr != null);
+      Contract.Requires(context != null);
+      var v = new ExtremePredicateChecksVisitor(reporter, context);
+      v.Visit(expr, cp);
+    }
 
-      // Look at the :nativeType attribute, if any
-      bool mustUseNativeType;
-      List<NativeType> nativeTypeChoices = null;  // null means "no preference"
-      var args = Attributes.FindExpressions(dd.Attributes, "nativeType");
-      if (args != null && !dd.BaseType.IsNumericBased(Type.NumericPersuasion.Int)) {
-        reporter.Error(MessageSource.Resolver, dd, ":nativeType can only be used on integral types");
+    void ExtremeLemmaChecks(Statement stmt, ExtremeLemma context) {
+      Contract.Requires(stmt != null);
+      Contract.Requires(context != null);
+      var v = new ExtremeLemmaChecksVisitor(this, context);
+      v.Visit(stmt);
+    }
+    void ExtremeLemmaChecks(Expression expr, ExtremeLemma context) {
+      Contract.Requires(context != null);
+      if (expr == null) {
         return;
-      } else if (args == null) {
-        // There was no :nativeType attribute
-        mustUseNativeType = false;
-      } else if (args.Count == 0) {
-        mustUseNativeType = true;
-      } else {
-        var arg0Lit = args[0] as LiteralExpr;
-        if (arg0Lit != null && arg0Lit.Value is bool) {
-          if (!(bool)arg0Lit.Value) {
-            // {:nativeType false} says "don't use native type", so our work here is done
-            return;
-          }
-          mustUseNativeType = true;
-        } else {
-          mustUseNativeType = true;
-          nativeTypeChoices = new List<NativeType>();
-          foreach (var arg in args) {
-            if (arg is LiteralExpr lit && lit.Value is string s) {
-              // Get the NativeType for "s"
-              foreach (var nativeT in NativeTypes) {
-                if (nativeT.Name == s) {
-                  nativeTypeChoices.Add(nativeT);
-                  goto FoundNativeType;
-                }
-              }
-              reporter.Error(MessageSource.Resolver, dd, ":nativeType '{0}' not known", s);
-              return;
-            FoundNativeType:;
-            } else {
-              reporter.Error(MessageSource.Resolver, arg, "unexpected :nativeType argument");
-              return;
-            }
-          }
-        }
       }
 
-      // Figure out the variable and constraint.  Usually, these would be just .Var and .Constraint, but
-      // in the case .Var is null, these can be computed from the .BaseType recursively.
-      var ddVar = dd.Var;
-      var ddConstraint = dd.Constraint;
-      for (var ddWhereConstraintsAre = dd; ddVar == null;) {
-        ddWhereConstraintsAre = ddWhereConstraintsAre.BaseType.AsNewtype;
-        if (ddWhereConstraintsAre == null) {
-          break;
-        }
-        ddVar = ddWhereConstraintsAre.Var;
-        ddConstraint = ddWhereConstraintsAre.Constraint;
-      }
-      List<ComprehensionExpr.BoundedPool> bounds;
-      if (ddVar == null) {
-        // There are no bounds at all
-        bounds = new List<ComprehensionExpr.BoundedPool>();
-      } else {
-        bounds = DiscoverAllBounds_SingleVar(ddVar, ddConstraint);
-      }
-
-      // Returns null if the argument is a constrained newtype (recursively)
-      // Returns the transitive base type if the argument is recusively unconstrained
-      Type AsUnconstrainedType(Type t) {
-        while (true) {
-          if (t.AsNewtype == null) {
-            return t;
-          }
-
-          if (t.AsNewtype.Constraint != null) {
-            return null;
-          }
-
-          t = t.AsNewtype.BaseType;
-        }
-      }
-
-      // Find which among the allowable native types can hold "dd". Give an
-      // error for any user-specified native type that's not big enough.
-      var bigEnoughNativeTypes = new List<NativeType>();
-      // But first, define a local, recursive function GetConst/GetAnyConst:
-      // These fold any constant computations, including symbolic constants,
-      // returning null if folding is not possible. If an operation is undefined
-      // (divide by zero, conversion out of range, etc.), then null is returned.
-      Func<Expression, BigInteger?> GetConst = null;
-      Func<Expression, Stack<ConstantField>, Object> GetAnyConst = null;
-      GetAnyConst = (Expression e, Stack<ConstantField> consts) => {
-        if (e is LiteralExpr l) {
-          return l.Value;
-        } else if (e is UnaryOpExpr un) {
-          if (un.ResolvedOp == UnaryOpExpr.ResolvedOpcode.BoolNot && GetAnyConst(un.E, consts) is bool b) {
-            return !b;
-          }
-          if (un.ResolvedOp == UnaryOpExpr.ResolvedOpcode.BVNot && GetAnyConst(un.E, consts) is BigInteger i) {
-            return ((BigInteger.One << un.Type.AsBitVectorType.Width) - 1) ^ i;
-          }
-          // TODO: This only handles strings; generalize to other collections?
-          if (un.ResolvedOp == UnaryOpExpr.ResolvedOpcode.SeqLength && GetAnyConst(un.E, consts) is string ss) {
-            return (BigInteger)(ss.Length);
-          }
-        } else if (e is MemberSelectExpr m) {
-          if (m.Member is ConstantField c && c.IsStatic && c.Rhs != null) {
-            // This aspect of type resolution happens before the check for cyclic references
-            // so we have to do a check here as well. If cyclic, null is silently returned,
-            // counting on the later error message to alert the user.
-            if (consts.Contains(c)) { return null; }
-            consts.Push(c);
-            Object o = GetAnyConst(c.Rhs, consts);
-            consts.Pop();
-            return o;
-          } else if (m.Member is SpecialField sf) {
-            string nm = sf.Name;
-            if (nm == "Floor") {
-              Object ee = GetAnyConst(m.Obj, consts);
-              if (ee != null && m.Obj.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-                ((BaseTypes.BigDec)ee).FloorCeiling(out var f, out _);
-                return f;
-              }
-            }
-          }
-        } else if (e is BinaryExpr bin) {
-          Object e0 = GetAnyConst(bin.E0, consts);
-          Object e1 = GetAnyConst(bin.E1, consts);
-          bool isBool = bin.E0.Type == Type.Bool && bin.E1.Type == Type.Bool;
-          bool shortCircuit = isBool && (bin.ResolvedOp == BinaryExpr.ResolvedOpcode.And
-                                         || bin.ResolvedOp == BinaryExpr.ResolvedOpcode.Or
-                                         || bin.ResolvedOp == BinaryExpr.ResolvedOpcode.Imp);
-
-          if (e0 == null || (!shortCircuit && e1 == null)) { return null; }
-          bool isAnyReal = bin.E0.Type.IsNumericBased(Type.NumericPersuasion.Real)
-                        && bin.E1.Type.IsNumericBased(Type.NumericPersuasion.Real);
-          bool isAnyInt = bin.E0.Type.IsNumericBased(Type.NumericPersuasion.Int)
-                       && bin.E1.Type.IsNumericBased(Type.NumericPersuasion.Int);
-          bool isReal = bin.Type.IsRealType;
-          bool isInt = bin.Type.IsIntegerType;
-          bool isBV = bin.E0.Type.IsBitVectorType;
-          int width = isBV ? bin.E0.Type.AsBitVectorType.Width : 0;
-          bool isString = e0 is string && e1 is string;
-          switch (bin.ResolvedOp) {
-            case BinaryExpr.ResolvedOpcode.Add:
-              if (isInt) {
-                return (BigInteger)e0 + (BigInteger)e1;
-              }
-
-              if (isBV) {
-                return ((BigInteger)e0 + (BigInteger)e1) & MaxBV(bin.Type);
-              }
-
-              if (isReal) {
-                return (BaseTypes.BigDec)e0 + (BaseTypes.BigDec)e1;
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.Concat:
-              if (isString) {
-                return (string)e0 + (string)e1;
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.Sub:
-              if (isInt) {
-                return (BigInteger)e0 - (BigInteger)e1;
-              }
-
-              if (isBV) {
-                return ((BigInteger)e0 - (BigInteger)e1) & MaxBV(bin.Type);
-              }
-
-              if (isReal) {
-                return (BaseTypes.BigDec)e0 - (BaseTypes.BigDec)e1;
-              }
-              // Allow a special case: If the result type is a newtype that is integer-based (i.e., isInt && !isInteger)
-              // then we generally do not fold the operations, because we do not determine whether the
-              // result of the operation satisfies the new type constraint. However, on the occasion that
-              // a newtype aliases int without a constraint, it occurs that a value of the newtype is initialized
-              // with a negative value, which is represented as "0 - N", that is, it comes to this case. It
-              // is a nuisance not to constant-fold the result, as not doing so can alter the determination
-              // of the representation type.
-              if (isAnyInt && AsUnconstrainedType(bin.Type) != null) {
-                return ((BigInteger)e0) - ((BigInteger)e1);
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.Mul:
-              if (isInt) {
-                return (BigInteger)e0 * (BigInteger)e1;
-              }
-
-              if (isBV) {
-                return ((BigInteger)e0 * (BigInteger)e1) & MaxBV(bin.Type);
-              }
-
-              if (isReal) {
-                return (BaseTypes.BigDec)e0 * (BaseTypes.BigDec)e1;
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.BitwiseAnd:
-              Contract.Assert(isBV);
-              return (BigInteger)e0 & (BigInteger)e1;
-            case BinaryExpr.ResolvedOpcode.BitwiseOr:
-              Contract.Assert(isBV);
-              return (BigInteger)e0 | (BigInteger)e1;
-            case BinaryExpr.ResolvedOpcode.BitwiseXor:
-              Contract.Assert(isBV);
-              return (BigInteger)e0 ^ (BigInteger)e1;
-            case BinaryExpr.ResolvedOpcode.Div:
-              if (isInt) {
-                if ((BigInteger)e1 == 0) {
-                  return null; // Divide by zero
-                } else {
-                  BigInteger a0 = (BigInteger)e0;
-                  BigInteger a1 = (BigInteger)e1;
-                  BigInteger d = a0 / a1;
-                  return a0 >= 0 || a0 == d * a1 ? d : a1 > 0 ? d - 1 : d + 1;
-                }
-              }
-              if (isBV) {
-                if ((BigInteger)e1 == 0) {
-                  return null; // Divide by zero
-                } else {
-                  return ((BigInteger)e0) / ((BigInteger)e1);
-                }
-              }
-              if (isReal) {
-                if ((BaseTypes.BigDec)e1 == BaseTypes.BigDec.ZERO) {
-                  return null; // Divide by zero
-                } else {
-                  // BigDec does not have divide and is not a representation of rationals, so we don't do constant folding
-                  return null;
-                }
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.Mod:
-              if (isInt) {
-                if ((BigInteger)e1 == 0) {
-                  return null; // Mod by zero
-                } else {
-                  BigInteger a = BigInteger.Abs((BigInteger)e1);
-                  BigInteger d = (BigInteger)e0 % a;
-                  return (BigInteger)e0 >= 0 ? d : d + a;
-                }
-              }
-              if (isBV) {
-                if ((BigInteger)e1 == 0) {
-                  return null; // Mod by zero
-                } else {
-                  return (BigInteger)e0 % (BigInteger)e1;
-                }
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.LeftShift: {
-                if ((BigInteger)e1 < 0) {
-                  return null; // Negative shift
-                }
-                if ((BigInteger)e1 > bin.Type.AsBitVectorType.Width) {
-                  return null; // Shift is too large
-                }
-                return ((BigInteger)e0 << (int)(BigInteger)e1) & MaxBV(bin.E0.Type);
-              }
-            case BinaryExpr.ResolvedOpcode.RightShift: {
-                if ((BigInteger)e1 < 0) {
-                  return null; // Negative shift
-                }
-                if ((BigInteger)e1 > bin.Type.AsBitVectorType.Width) {
-                  return null; // Shift too large
-                }
-                return (BigInteger)e0 >> (int)(BigInteger)e1;
-              }
-            case BinaryExpr.ResolvedOpcode.And: {
-                if ((bool)e0 && e1 == null) {
-                  return null;
-                }
-
-                return (bool)e0 && (bool)e1;
-              }
-            case BinaryExpr.ResolvedOpcode.Or: {
-                if (!(bool)e0 && e1 == null) {
-                  return null;
-                }
-
-                return (bool)e0 || (bool)e1;
-              }
-            case BinaryExpr.ResolvedOpcode.Imp: { // ==> and <==
-                if ((bool)e0 && e1 == null) {
-                  return null;
-                }
-
-                return !(bool)e0 || (bool)e1;
-              }
-            case BinaryExpr.ResolvedOpcode.Iff: return (bool)e0 == (bool)e1; // <==>
-            case BinaryExpr.ResolvedOpcode.Gt:
-              if (isAnyInt) {
-                return (BigInteger)e0 > (BigInteger)e1;
-              }
-
-              if (isBV) {
-                return (BigInteger)e0 > (BigInteger)e1;
-              }
-
-              if (isAnyReal) {
-                return (BaseTypes.BigDec)e0 > (BaseTypes.BigDec)e1;
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.GtChar:
-              if (bin.E0.Type.IsCharType) {
-                return ((string)e0)[0] > ((string)e1)[0];
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.Ge:
-              if (isAnyInt) {
-                return (BigInteger)e0 >= (BigInteger)e1;
-              }
-
-              if (isBV) {
-                return (BigInteger)e0 >= (BigInteger)e1;
-              }
-
-              if (isAnyReal) {
-                return (BaseTypes.BigDec)e0 >= (BaseTypes.BigDec)e1;
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.GeChar:
-              if (bin.E0.Type.IsCharType) {
-                return ((string)e0)[0] >= ((string)e1)[0];
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.Lt:
-              if (isAnyInt) {
-                return (BigInteger)e0 < (BigInteger)e1;
-              }
-
-              if (isBV) {
-                return (BigInteger)e0 < (BigInteger)e1;
-              }
-
-              if (isAnyReal) {
-                return (BaseTypes.BigDec)e0 < (BaseTypes.BigDec)e1;
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.LtChar:
-              if (bin.E0.Type.IsCharType) {
-                return ((string)e0)[0] < ((string)e1)[0];
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.ProperPrefix:
-              if (isString) {
-                return ((string)e1).StartsWith((string)e0) && !((string)e1).Equals((string)e0);
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.Le:
-              if (isAnyInt) {
-                return (BigInteger)e0 <= (BigInteger)e1;
-              }
-
-              if (isBV) {
-                return (BigInteger)e0 <= (BigInteger)e1;
-              }
-
-              if (isAnyReal) {
-                return (BaseTypes.BigDec)e0 <= (BaseTypes.BigDec)e1;
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.LeChar:
-              if (bin.E0.Type.IsCharType) {
-                return ((string)e0)[0] <= ((string)e1)[0];
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.Prefix:
-              if (isString) {
-                return ((string)e1).StartsWith((string)e0);
-              }
-
-              break;
-            case BinaryExpr.ResolvedOpcode.EqCommon: {
-                if (isBool) {
-                  return (bool)e0 == (bool)e1;
-                } else if (isAnyInt || isBV) {
-                  return (BigInteger)e0 == (BigInteger)e1;
-                } else if (isAnyReal) {
-                  return (BaseTypes.BigDec)e0 == (BaseTypes.BigDec)e1;
-                } else if (bin.E0.Type.IsCharType) {
-                  return ((string)e0)[0] == ((string)e1)[0];
-                }
-                break;
-              }
-            case BinaryExpr.ResolvedOpcode.SeqEq:
-              if (isString) {
-                return (string)e0 == (string)e1;
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.SeqNeq:
-              if (isString) {
-                return (string)e0 != (string)e1;
-              }
-              break;
-            case BinaryExpr.ResolvedOpcode.NeqCommon: {
-                if (isBool) {
-                  return (bool)e0 != (bool)e1;
-                } else if (isAnyInt || isBV) {
-                  return (BigInteger)e0 != (BigInteger)e1;
-                } else if (isAnyReal) {
-                  return (BaseTypes.BigDec)e0 != (BaseTypes.BigDec)e1;
-                } else if (bin.E0.Type.IsCharType) {
-                  return ((string)e0)[0] != ((string)e1)[0];
-                } else if (isString) {
-                  return (string)e0 != (string)e1;
-                }
-                break;
-              }
-          }
-        } else if (e is ConversionExpr ce) {
-          object o = GetAnyConst(ce.E, consts);
-          if (o == null || ce.E.Type == ce.Type) {
-            return o;
-          }
-
-          if (ce.E.Type.IsNumericBased(Type.NumericPersuasion.Real) &&
-                ce.Type.IsBitVectorType) {
-            ((BaseTypes.BigDec)o).FloorCeiling(out var ff, out _);
-            if (ff < 0 || ff > MaxBV(ce.Type)) {
-              return null; // Out of range
-            }
-            if (((BaseTypes.BigDec)o) != BaseTypes.BigDec.FromBigInt(ff)) {
-              return null; // Out of range
-            }
-            return ff;
-          }
-
-          if (ce.E.Type.IsNumericBased(Type.NumericPersuasion.Real) &&
-                ce.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
-            ((BaseTypes.BigDec)o).FloorCeiling(out var ff, out _);
-            if (AsUnconstrainedType(ce.Type) == null) {
-              return null;
-            }
-
-            if (((BaseTypes.BigDec)o) != BaseTypes.BigDec.FromBigInt(ff)) {
-              return null; // Argument not an integer
-            }
-            return ff;
-          }
-
-          if (ce.E.Type.IsBitVectorType &&
-                ce.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
-            if (AsUnconstrainedType(ce.Type) == null) {
-              return null;
-            }
-
-            return o;
-          }
-
-          if (ce.E.Type.IsBitVectorType &&
-                ce.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-            if (AsUnconstrainedType(ce.Type) == null) {
-              return null;
-            }
-
-            return BaseTypes.BigDec.FromBigInt((BigInteger)o);
-          }
-
-          if (ce.E.Type.IsNumericBased(Type.NumericPersuasion.Int) &&
-                ce.Type.IsBitVectorType) {
-            BigInteger b = (BigInteger)o;
-            if (b < 0 || b > MaxBV(ce.Type)) {
-              return null; // Argument out of range
-            }
-            return o;
-          }
-
-          if (ce.E.Type.IsNumericBased(Type.NumericPersuasion.Int) &&
-                ce.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
-            // This case includes int-based newtypes to int-based new types
-            if (AsUnconstrainedType(ce.Type) == null) {
-              return null;
-            }
-
-            return o;
-          }
-
-          if (ce.E.Type.IsNumericBased(Type.NumericPersuasion.Real) &&
-                ce.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-            // This case includes real-based newtypes to real-based new types
-            if (AsUnconstrainedType(ce.Type) == null) {
-              return null;
-            }
-
-            return o;
-          }
-
-          if (ce.E.Type.IsBitVectorType && ce.Type.IsBitVectorType) {
-            BigInteger b = (BigInteger)o;
-            if (b < 0 || b > MaxBV(ce.Type)) {
-              return null; // Argument out of range
-            }
-            return o;
-          }
-
-          if (ce.E.Type.IsNumericBased(Type.NumericPersuasion.Int) &&
-                ce.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-            if (AsUnconstrainedType(ce.Type) == null) {
-              return null;
-            }
-
-            return BaseTypes.BigDec.FromBigInt((BigInteger)o);
-          }
-
-          if (ce.E.Type.IsCharType && ce.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
-            char c = ((String)o)[0];
-            if (AsUnconstrainedType(ce.Type) == null) {
-              return null;
-            }
-
-            return new BigInteger(((string)o)[0]);
-          }
-
-          if (ce.E.Type.IsCharType && ce.Type.IsBitVectorType) {
-            char c = ((String)o)[0];
-            if ((int)c > MaxBV(ce.Type)) {
-              return null; // Argument out of range
-            }
-            return new BigInteger(((string)o)[0]);
-          }
-
-          if ((ce.E.Type.IsNumericBased(Type.NumericPersuasion.Int) || ce.E.Type.IsBitVectorType) &&
-                ce.Type.IsCharType) {
-            BigInteger b = (BigInteger)o;
-            if (b < BigInteger.Zero || b > new BigInteger(65535)) {
-              return null; // Argument out of range
-            }
-            return ((char)(int)b).ToString();
-          }
-
-          if (ce.E.Type.IsCharType &&
-              ce.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-            if (AsUnconstrainedType(ce.Type) == null) {
-              return null;
-            }
-
-            return BaseTypes.BigDec.FromInt(((string)o)[0]);
-          }
-
-          if (ce.E.Type.IsNumericBased(Type.NumericPersuasion.Real) &&
-                ce.Type.IsCharType) {
-            ((BaseTypes.BigDec)o).FloorCeiling(out var ff, out _);
-            if (((BaseTypes.BigDec)o) != BaseTypes.BigDec.FromBigInt(ff)) {
-              return null; // Argument not an integer
-            }
-            if (ff < BigInteger.Zero || ff > new BigInteger(65535)) {
-              return null; // Argument out of range
-            }
-            return ((char)(int)ff).ToString();
-          }
-
-        } else if (e is SeqSelectExpr sse) {
-          var b = GetAnyConst(sse.Seq, consts) as string;
-          BigInteger index = (BigInteger)GetAnyConst(sse.E0, consts);
-          if (b == null) {
-            return null;
-          }
-
-          if (index < 0 || index >= b.Length || index > Int32.MaxValue) {
-            return null; // Index out of range
-          }
-          return b[(int)index].ToString();
-        } else if (e is ITEExpr ite) {
-          Object b = GetAnyConst(ite.Test, consts);
-          if (b == null) {
-            return null;
-          }
-
-          return ((bool)b) ? GetAnyConst(ite.Thn, consts) : GetAnyConst(ite.Els, consts);
-        } else if (e is ConcreteSyntaxExpression n) {
-          return GetAnyConst(n.ResolvedExpression, consts);
-        } else {
-          return null;
-        }
-        return null;
-      };
-      GetConst = (Expression e) => {
-        Object ee = GetAnyConst(e.Resolved ?? e, new Stack<ConstantField>());
-        return ee as BigInteger?;
-      };
-      // Now, then, let's go through them types.
-      // FIXME - should first go through the bounds to find the most constraining values
-      // then check those values against the possible types. Note that also presumes the types are in order.
-      BigInteger? lowest = null;
-      BigInteger? highest = null;
-      foreach (var bound in bounds) {
-        if (bound is ComprehensionExpr.IntBoundedPool) {
-          var bnd = (ComprehensionExpr.IntBoundedPool)bound;
-          if (bnd.LowerBound != null) {
-            BigInteger? lower = GetConst(bnd.LowerBound);
-            if (lower != null && (lowest == null || lower < lowest)) {
-              lowest = lower;
-            }
-          }
-          if (bnd.UpperBound != null) {
-            BigInteger? upper = GetConst(bnd.UpperBound);
-            if (upper != null && (highest == null || upper > highest)) {
-              highest = upper;
-            }
-          }
-        }
-      }
-      foreach (var nativeT in nativeTypeChoices ?? NativeTypes) {
-        bool lowerOk = (lowest != null && nativeT.LowerBound <= lowest);
-        bool upperOk = (highest != null && nativeT.UpperBound >= highest);
-        if (lowerOk && upperOk) {
-          bigEnoughNativeTypes.Add(nativeT);
-        } else if (nativeTypeChoices != null) {
-          reporter.Error(MessageSource.Resolver, dd,
-            "Dafny's heuristics failed to confirm '{0}' to be a compatible native type.  " +
-            "Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'",
-            nativeT.Name);
-          return;
-        }
-      }
-
-      // Finally, of the big-enough native types, pick the first one that is
-      // supported by the selected target compiler.
-      foreach (var nativeT in bigEnoughNativeTypes) {
-        if (Options.Backend.SupportedNativeTypes.Contains(nativeT.Name)) {
-          dd.NativeType = nativeT;
-          break;
-        }
-      }
-      if (dd.NativeType != null) {
-        // Give an info message saying which type was selected--unless the user requested
-        // one particular native type, in which case that must have been the one picked.
-        if (nativeTypeChoices != null && nativeTypeChoices.Count == 1) {
-          Contract.Assert(dd.NativeType == nativeTypeChoices[0]);
-        } else {
-          reporter.Info(MessageSource.Resolver, dd.tok, "newtype " + dd.Name + " resolves as {:nativeType \"" + dd.NativeType.Name + "\"} (Detected Range: " + lowest + " .. " + highest + ")");
-        }
-      } else if (nativeTypeChoices != null) {
-        reporter.Error(MessageSource.Resolver, dd,
-          "None of the types given in :nativeType arguments is supported by the current compilation target. Try supplying others.");
-      } else if (mustUseNativeType) {
-        reporter.Error(MessageSource.Resolver, dd,
-          "Dafny's heuristics cannot find a compatible native type.  " +
-          "Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'");
-      }
-    }
-
-    /// <summary>
-    /// Check that the 'older' modifier on parameters is used correctly and report any errors of the contrary.
-    /// </summary>
-    void CheckOlderParameters(Function f) {
-      Contract.Requires(f != null);
-
-      if (!f.ResultType.IsBoolType || f is PrefixPredicate || f is ExtremePredicate) {
-        // parameters are not allowed to be marked 'older'
-        foreach (var formal in f.Formals) {
-          if (formal.IsOlder) {
-            reporter.Error(MessageSource.Resolver, formal.tok, "only predicates and two-state predicates are allowed 'older' parameters");
-          }
-        }
-      }
-    }
-
-    // ------------------------------------------------------------------------------------------------------
-    // ----- CheckExpression --------------------------------------------------------------------------------
-    // ------------------------------------------------------------------------------------------------------
-    #region CheckExpression
-    /// <summary>
-    /// This method computes ghost interests in the statement portion of StmtExpr's and
-    /// checks for hint restrictions in any CalcStmt.
-    /// </summary>
-    void CheckExpression(Expression expr, ModuleResolver resolver, ICodeContext codeContext) {
-      Contract.Requires(expr != null);
-      Contract.Requires(resolver != null);
-      Contract.Requires(codeContext != null);
-      var v = new CheckExpression_Visitor(resolver, codeContext);
-      v.Visit(expr);
-    }
-    /// <summary>
-    /// This method computes ghost interests in the statement portion of StmtExpr's and
-    /// checks for hint restrictions in any CalcStmt. In any ghost context, it also
-    /// changes the bound variables of all let- and let-such-that expressions to ghost.
-    /// It also performs substitutions in DefaultValueExpression's.
-    /// </summary>
-    void CheckExpression(Statement stmt, ModuleResolver resolver, ICodeContext codeContext) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(resolver != null);
-      Contract.Requires(codeContext != null);
-      var v = new CheckExpression_Visitor(resolver, codeContext);
-      v.Visit(stmt);
-    }
-    class CheckExpression_Visitor : ResolverBottomUpVisitor {
-      readonly ICodeContext CodeContext;
-      public CheckExpression_Visitor(ModuleResolver resolver, ICodeContext codeContext)
-        : base(resolver) {
-        Contract.Requires(resolver != null);
-        Contract.Requires(codeContext != null);
-        CodeContext = codeContext;
-      }
-      protected override void VisitOneExpr(Expression expr) {
-        if (expr is StmtExpr) {
-          var e = (StmtExpr)expr;
-          resolver.ComputeGhostInterest(e.S, true, "a statement expression", CodeContext);
-        } else if (expr is LetExpr) {
-          var e = (LetExpr)expr;
-          if (CodeContext.IsGhost) {
-            foreach (var bv in e.BoundVars) {
-              bv.MakeGhost();
-            }
-          }
-        }
-      }
-
-      protected override void VisitOneStmt(Statement stmt) {
-        if (stmt is CalcStmt calc) {
-          foreach (var h in calc.Hints) {
-            resolver.CheckLocalityUpdates(h, new HashSet<LocalVariable>(), "a hint");
-          }
-        } else if (stmt is AssertStmt astmt && astmt.Proof != null) {
-          resolver.CheckLocalityUpdates(astmt.Proof, new HashSet<LocalVariable>(), "an assert-by body");
-        } else if (stmt is ForallStmt forall && forall.Body != null) {
-          resolver.CheckLocalityUpdates(forall.Body, new HashSet<LocalVariable>(), "a forall statement");
-        }
-      }
-    }
-    #endregion
-
-    void ExtremePredicateChecks(Expression expr, ExtremePredicate context, CallingPosition cp) {
-      Contract.Requires(expr != null);
-      Contract.Requires(context != null);
-      var v = new ExtremePredicateChecks_Visitor(reporter, context);
-      v.Visit(expr, cp);
-    }
-
-    void ExtremeLemmaChecks(Statement stmt, ExtremeLemma context) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(context != null);
-      var v = new ExtremeLemmaChecks_Visitor(this, context);
-      v.Visit(stmt);
-    }
-    void ExtremeLemmaChecks(Expression expr, ExtremeLemma context) {
-      Contract.Requires(context != null);
-      if (expr == null) {
-        return;
-      }
-
-      var v = new ExtremeLemmaChecks_Visitor(this, context);
+      var v = new ExtremeLemmaChecksVisitor(this, context);
       v.Visit(expr);
     }
 
-    void CheckTypeCharacteristics_Stmt(Statement stmt, bool isGhost) {
-      Contract.Requires(stmt != null);
-      var v = new CheckTypeCharacteristics_Visitor(reporter);
-      v.Visit(stmt, isGhost);
-    }
-    void CheckTypeCharacteristics_Expr(Expression expr, bool isGhost) {
-      Contract.Requires(expr != null);
-      var v = new CheckTypeCharacteristics_Visitor(reporter);
-      v.Visit(expr, isGhost);
-    }
-    public void CheckTypeCharacteristics_Type(IToken tok, Type type, bool isGhost) {
-      Contract.Requires(tok != null);
-      Contract.Requires(type != null);
-      var v = new CheckTypeCharacteristics_Visitor(reporter);
-      v.VisitType(tok, type, isGhost);
-    }
-
     public void ComputeGhostInterest(Statement stmt, bool mustBeErasable, [CanBeNull] string proofContext, ICodeContext codeContext) {
       Contract.Requires(stmt != null);
       Contract.Requires(codeContext != null);
-      var visitor = new GhostInterestVisitor(codeContext, this, reporter, false, codeContext is Method);
-      visitor.Visit(stmt, mustBeErasable, proofContext);
+      stmt.ResolveGhostness(this, Reporter, mustBeErasable, codeContext, proofContext,
+        codeContext is Method, false);
     }
 
-    class ReportOtherAdditionalInformation_Visitor : ResolverBottomUpVisitor {
-      public ReportOtherAdditionalInformation_Visitor(ModuleResolver resolver)
+    class ReportOtherAdditionalInformationVisitor : ResolverBottomUpVisitor {
+      public ReportOtherAdditionalInformationVisitor(ModuleResolver resolver)
         : base(resolver) {
         Contract.Requires(resolver != null);
       }
@@ -2811,7 +2069,7 @@ protected override void VisitOneStmt(Statement stmt) {
             if (!Attributes.Contains(s.Attributes, "auto_generated")) {
               foreach (var ens in cs.Method.Ens) {
                 var p = substituter.Substitute(ens.E);  // substitute the call's actuals for the method's formals
-                resolver.reporter.Info(MessageSource.Resolver, s.Tok, "ensures " + Printer.ExprToString(resolver.Options, p));
+                resolver.reporter.Info(MessageSource.Resolver, s.Origin, "ensures " + Printer.ExprToString(resolver.Options, p));
               }
             }
           }
@@ -2823,49 +2081,6 @@ protected override void VisitOneStmt(Statement stmt) {
     // ------------------------------------------------------------------------------------------------------
     // ------------------------------------------------------------------------------------------------------
 
-    bool InferRequiredEqualitySupport(TypeParameter tp, Type type) {
-      Contract.Requires(tp != null);
-      Contract.Requires(type != null);
-
-      type = type.Normalize();  // we only do a .Normalize() here, because we want to keep stop at any type synonym or subset type
-      if (type is BasicType) {
-      } else if (type is SetType) {
-        var st = (SetType)type;
-        return st.Arg.AsTypeParameter == tp || InferRequiredEqualitySupport(tp, st.Arg);
-      } else if (type is MultiSetType) {
-        var ms = (MultiSetType)type;
-        return ms.Arg.AsTypeParameter == tp || InferRequiredEqualitySupport(tp, ms.Arg);
-      } else if (type is MapType) {
-        var mt = (MapType)type;
-        return mt.Domain.AsTypeParameter == tp || InferRequiredEqualitySupport(tp, mt.Domain) || InferRequiredEqualitySupport(tp, mt.Range);
-      } else if (type is SeqType) {
-        var sq = (SeqType)type;
-        return InferRequiredEqualitySupport(tp, sq.Arg);
-      } else if (type is UserDefinedType) {
-        var udt = (UserDefinedType)type;
-        List<TypeParameter> formalTypeArgs = udt.ResolvedClass.TypeArgs;
-        Contract.Assert(formalTypeArgs != null);
-        Contract.Assert(formalTypeArgs.Count == udt.TypeArgs.Count);
-        var i = 0;
-        foreach (var argType in udt.TypeArgs) {
-          var formalTypeArg = formalTypeArgs[i];
-          if ((formalTypeArg.SupportsEquality && argType.AsTypeParameter == tp) || InferRequiredEqualitySupport(tp, argType)) {
-            return true;
-          }
-          i++;
-        }
-        if (udt.ResolvedClass is TypeSynonymDecl) {
-          var syn = (TypeSynonymDecl)udt.ResolvedClass;
-          if (syn.IsRevealedInScope(Type.GetScope())) {
-            return InferRequiredEqualitySupport(tp, syn.RhsWithArgument(udt.TypeArgs));
-          }
-        }
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-      return false;
-    }
-
     private TopLevelDeclWithMembers currentClass;
     public Scope<TypeParameter>/*!*/ allTypeParameters;
     public readonly Scope<IVariable>/*!*/ scope;
@@ -2883,15 +2098,18 @@ void ResolveParentTraitTypes(TopLevelDeclWithMembers cl, Graph<TopLevelDeclWithM
       ResolveTypeParameters(cl.TypeArgs, false, cl);
       foreach (var parentTrait in cl.ParentTraits) {
         var prevErrorCount = reporter.Count(ErrorLevel.Error);
-        ResolveType(cl.tok, parentTrait, new NoContext(cl.EnclosingModuleDefinition), ResolveTypeOptionEnum.DontInfer, null);
+        ResolveType(cl.Origin, parentTrait, new NoContext(cl.EnclosingModuleDefinition), ResolveTypeOptionEnum.DontInfer, null);
         if (prevErrorCount == reporter.Count(ErrorLevel.Error)) {
-          var parentTypeToken = parentTrait is UserDefinedType parentTraitUdt ? parentTraitUdt.tok : cl.tok;
+          var parentTypeToken = parentTrait is UserDefinedType parentTraitUdt ? parentTraitUdt.Origin : cl.Origin;
 
           var trait = parentTrait.UseInternalSynonym().IsInternalTypeSynonym ? null : (parentTrait as UserDefinedType)?.AsParentTraitDecl();
           if (trait != null) {
             // disallowing inheritance in multi module case
             bool termination = true;
-            if (cl.EnclosingModuleDefinition == trait.EnclosingModuleDefinition || trait.IsObjectTrait || (Attributes.ContainsBool(trait.Attributes, "termination", ref termination) && !termination)) {
+            if (cl.EnclosingModuleDefinition == trait.EnclosingModuleDefinition ||
+                trait.IsObjectTrait ||
+                (Attributes.ContainsBool(trait.Attributes, "termination", ref termination) && !termination) ||
+                Attributes.Contains(cl.Attributes, "AssumeCrossModuleTermination")) {
               // all is good (or the user takes responsibility for the lack of termination checking)
               if (!cl.ParentTraitHeads.Contains(trait)) {
                 cl.ParentTraitHeads.Add(trait);
@@ -2900,7 +2118,7 @@ void ResolveParentTraitTypes(TopLevelDeclWithMembers cl, Graph<TopLevelDeclWithM
             } else {
               reporter.Error(MessageSource.Resolver, parentTypeToken,
                 $"{cl.WhatKind} '{cl.Name}' is in a different module than trait '{trait.FullName}'. A {cl.WhatKind} may only extend a trait " +
-                "in the same module, unless the parent trait is annotated with {:termination false}.");
+                $"in the same module, unless the parent trait is annotated with {{:termination false}} or the {cl.WhatKind} with @AssumeCrossModuleTermination.");
             }
           } else {
             reporter.Error(MessageSource.Resolver, parentTypeToken, $"a {cl.WhatKind} can only extend traits (found '{parentTrait}')");
@@ -2911,13 +2129,23 @@ void ResolveParentTraitTypes(TopLevelDeclWithMembers cl, Graph<TopLevelDeclWithM
       currentClass = null;
     }
 
+    void InheritMembers(List<TopLevelDecl> declarations) {
+      // Register the trait members in the classes that inherit them
+      foreach (var topLevelDeclWithMembers in declarations.OfType<TopLevelDeclWithMembers>()) {
+        RegisterInheritedMembers(topLevelDeclWithMembers);
+      }
+    }
+
     /// <summary>
     /// This method idempotently fills in .InheritanceInformation, .ParentFormalTypeParametersToActuals, and the
     /// name->MemberDecl table for "cl" and the transitive parent traits of "cl". It also checks that every (transitive)
     /// parent trait is instantiated with the same type parameters
     /// The method assumes that all types along .ParentTraits have been successfully resolved and .ParentTraitHeads been filled in.
+    ///
+    /// The "basePreType" parameter is used only with the new resolver. It can be passed in a "null" to indicate that "cl" does not
+    /// have a base type or that the given/inferred base type was not legal.
     /// </summary>
-    void RegisterInheritedMembers(TopLevelDeclWithMembers cl) {
+    public void RegisterInheritedMembers(TopLevelDeclWithMembers cl, [CanBeNull] DPreType basePreType = null) {
       Contract.Requires(cl != null);
 
       if (cl.ParentTypeInformation != null) {
@@ -2925,6 +2153,32 @@ void RegisterInheritedMembers(TopLevelDeclWithMembers cl) {
       }
       cl.ParentTypeInformation = new TopLevelDeclWithMembers.InheritanceInformationClass();
 
+      // populate .ParentFormalTypeParametersToActuals with the type arguments given to the base type (this applies only to newtype's)
+      TopLevelDeclWithMembers baseTypeDecl = null;
+      List<Type> baseTypeArguments = null;
+      if (cl is NewtypeDecl newtypeDecl) {
+        if (Options.Get(CommonOptionBag.TypeSystemRefresh)) {
+          baseTypeDecl = basePreType?.Decl as TopLevelDeclWithMembers;
+          baseTypeArguments = basePreType?.Arguments.ConvertAll(preType => PreType2TypeUtil.PreType2Type(preType, false, TypeParameter.TPVariance.Co));
+        } else {
+          // ignore any subset types, since they have no members and thus we don't need their type-parameter mappings
+          var baseType = newtypeDecl.BaseType.NormalizeExpand();
+          baseTypeArguments = baseType.TypeArgs;
+          if (baseType is UserDefinedType { ResolvedClass: TopLevelDeclWithMembers topLevelDeclWithMembers }) {
+            baseTypeDecl = topLevelDeclWithMembers;
+          } else if (Options.Get(CommonOptionBag.GeneralNewtypes) || baseType.IsIntegerType || baseType.IsRealType) {
+            baseTypeDecl = GetSystemValuetypeDecl(baseType);
+          }
+        }
+        if (baseTypeDecl != null) {
+          Contract.Assert(baseTypeArguments.Count == baseTypeDecl.TypeArgs.Count);
+          for (var i = 0; i < baseTypeArguments.Count; i++) {
+            cl.ParentFormalTypeParametersToActuals.Add(baseTypeDecl.TypeArgs[i], baseTypeArguments[i]);
+          }
+          RegisterInheritedMembers(baseTypeDecl);
+        }
+      }
+
       // populate .ParentTypeInformation and .ParentFormalTypeParametersToActuals for the immediate parent traits
       foreach (var tt in cl.ParentTraits) {
         var udt = (UserDefinedType)tt;
@@ -2932,7 +2186,7 @@ void RegisterInheritedMembers(TopLevelDeclWithMembers cl) {
         cl.ParentTypeInformation.Record(trait, udt);
         Contract.Assert(trait.TypeArgs.Count == udt.TypeArgs.Count);
         for (var i = 0; i < trait.TypeArgs.Count; i++) {
-          // there may be duplciate parent traits, which haven't been checked for yet, so add mapping only for the first occurrence of each type parameter
+          // there may be duplicate parent traits, which haven't been checked for yet, so add mapping only for the first occurrence of each type parameter
           if (!cl.ParentFormalTypeParametersToActuals.ContainsKey(trait.TypeArgs[i])) {
             cl.ParentFormalTypeParametersToActuals.Add(trait.TypeArgs[i], udt.TypeArgs[i]);
           }
@@ -2960,7 +2214,7 @@ void RegisterInheritedMembers(TopLevelDeclWithMembers cl) {
           if (!group.GetRange(0, i).Exists(pair => pair.Item1.Equals(group[i].Item1))) {
             var via0 = group[0].Item2.Count == 0 ? "" : " (via " + Util.Comma(group[0].Item2, traitDecl => traitDecl.Name) + ")";
             var via1 = group[i].Item2.Count == 0 ? "" : " (via " + Util.Comma(group[i].Item2, traitDecl => traitDecl.Name) + ")";
-            reporter.Error(MessageSource.Resolver, cl.tok,
+            reporter.Error(MessageSource.Resolver, cl.Origin,
               "duplicate trait parents with the same head type must also have the same type arguments; got {0}{1} and {2}{3}",
               ty, via0, group[i].Item1, via1);
           }
@@ -2970,28 +2224,12 @@ void RegisterInheritedMembers(TopLevelDeclWithMembers cl) {
       // Update the name->MemberDecl table for the class. Report an error if the same name refers to more than one member,
       // except when such duplication is purely that one member, say X, is inherited and the other is an override of X.
       var inheritedMembers = new Dictionary<string, MemberDecl>();
+      var membersWithErrors = new List<string>();
+      if (baseTypeDecl != null) {
+        AddToInheritedMembers(cl, baseTypeDecl, inheritedMembers, membersWithErrors);
+      }
       foreach (var trait in cl.ParentTraitHeads) {
-        foreach (var traitMember in GetClassMembers(trait)!.Values) {  // TODO: rather than using .Values, it would be nice to use something that gave a deterministic order
-          if (!inheritedMembers.TryGetValue(traitMember.Name, out var prevMember)) {
-            // record "traitMember" as an inherited member
-            inheritedMembers.Add(traitMember.Name, traitMember);
-          } else if (traitMember == prevMember) {
-            // same member, inherited two different ways
-          } else if (traitMember.Overrides(prevMember)) {
-            // we're inheriting "prevMember" and "traitMember" from different parent traits, where "traitMember" is an override of "prevMember"
-            Contract.Assert(traitMember.EnclosingClass != cl && prevMember.EnclosingClass != cl && traitMember.EnclosingClass != prevMember.EnclosingClass); // sanity checks
-            // re-map "traitMember.Name" to point to the overriding member
-            inheritedMembers[traitMember.Name] = traitMember;
-          } else if (prevMember.Overrides(traitMember)) {
-            // we're inheriting "prevMember" and "traitMember" from different parent traits, where "prevMember" is an override of "traitMember"
-            Contract.Assert(traitMember.EnclosingClass != cl && prevMember.EnclosingClass != cl && traitMember.EnclosingClass != prevMember.EnclosingClass); // sanity checks
-            // keep the mapping to "prevMember"
-          } else {
-            // "prevMember" and "traitMember" refer to different members (with the same name)
-            reporter.Error(MessageSource.Resolver, cl.tok, "{0} '{1}' inherits a member named '{2}' from both traits '{3}' and '{4}'",
-              cl.WhatKind, cl.Name, traitMember.Name, prevMember.EnclosingClass.Name, traitMember.EnclosingClass.Name);
-          }
-        }
+        AddToInheritedMembers(cl, trait, inheritedMembers, membersWithErrors);
       }
       // Incorporate the inherited members into the name->MemberDecl mapping of "cl"
       var members = GetClassMembers(cl);
@@ -3006,6 +2244,84 @@ void RegisterInheritedMembers(TopLevelDeclWithMembers cl) {
           clMember.OverriddenMember = traitMember;
         }
       }
+      ProcessInheritedTraitMembers(cl, membersWithErrors);
+    }
+
+    private void AddToInheritedMembers(TopLevelDeclWithMembers cl, TopLevelDeclWithMembers baseOrParentTypeDecl,
+      Dictionary<string, MemberDecl> inheritedMembers, List<string> membersWithErrors) {
+      var members = GetClassMembers(baseOrParentTypeDecl)!;
+      var sortedKeys = members.Keys.ToList();
+      sortedKeys.Sort();
+      foreach (var inheritedMemberName in sortedKeys) {
+        var inheritedMember = members[inheritedMemberName];
+        if (!inheritedMembers.TryGetValue(inheritedMember.Name, out var prevMember)) {
+          // all good; record "inheritedMember" as an inherited member
+          inheritedMembers.Add(inheritedMember.Name, inheritedMember);
+        } else if (inheritedMember == prevMember) {
+          // same member, inherited two different ways
+        } else if (inheritedMember.Overrides(prevMember)) {
+          // we're inheriting "prevMember" and "traitMember" from different parent traits, where "inheritedMember" is an override of "prevMember"
+          Contract.Assert(inheritedMember.EnclosingClass != cl && prevMember.EnclosingClass != cl &&
+                          inheritedMember.EnclosingClass != prevMember.EnclosingClass); // sanity checks
+          // re-map "traitMember.Name" to point to the overriding member
+          inheritedMembers[inheritedMember.Name] = inheritedMember;
+        } else if (prevMember.Overrides(inheritedMember)) {
+          // we're inheriting "prevMember" and "inheritedMember" from different parent traits, where "prevMember" is an override of "inheritedMember"
+          Contract.Assert(inheritedMember.EnclosingClass != cl && prevMember.EnclosingClass != cl &&
+                          inheritedMember.EnclosingClass != prevMember.EnclosingClass); // sanity checks
+          // keep the mapping to "prevMember"
+        } else {
+          // "prevMember" and "inheritedMember" refer to different members (with the same name)
+          membersWithErrors.Add(inheritedMember.Name);
+          reporter.Error(MessageSource.Resolver, cl.Origin,
+            $"{cl.WhatKindAndName} inherits a member named '{inheritedMember.Name}' from both " +
+            $"{prevMember.EnclosingClass.WhatKindAndName} and {inheritedMember.EnclosingClass.WhatKindAndName}");
+        }
+      }
+    }
+
+    [CanBeNull]
+    ValuetypeDecl GetSystemValuetypeDecl(Type type) {
+      foreach (var systemTopLevelDecl in ProgramResolver.SystemModuleManager.SystemModule.SourceDecls.OfType<ValuetypeDecl>()) {
+        if (systemTopLevelDecl.IsThisType(type)) {
+          return systemTopLevelDecl;
+        }
+      }
+
+      if (type.AsBitVectorType is { } bitvectorType) {
+        // The declaration for this built-in bitvector type has not yet been added to SourceDecls. We create it here and add it.
+        return AddBitvectorTypeDecl(bitvectorType.Name, bitvectorType.Width);
+      }
+
+      return null; // not present
+    }
+
+    public ValuetypeDecl AddBitvectorTypeDecl(string name, int width) {
+      var bvDecl = new ValuetypeDecl(name, ProgramResolver.SystemModuleManager.SystemModule,
+        t => t.AsBitVectorType is { Width: var w } && w == width,
+        typeArgs => new BitvectorType(Options, width));
+      AddRotateMember(bvDecl, "RotateLeft", width);
+      AddRotateMember(bvDecl, "RotateRight", width);
+      ProgramResolver.SystemModuleManager.SystemModule.SourceDecls.Add(bvDecl);
+      var memberDictionary = bvDecl.Members.ToDictionary(member => member.Name, member => member);
+      ProgramResolver.AddSystemClass(bvDecl, memberDictionary);
+      return bvDecl;
+    }
+
+    private void AddRotateMember(ValuetypeDecl bitvectorTypeDecl, string name, int width) {
+      var argumentType = ProgramResolver.SystemModuleManager.Nat();
+      var formals = new List<Formal> {
+        new Formal(Token.NoToken, "w", argumentType, true, false, null)
+      };
+      var resultType = new BitvectorType(Options, width);
+      var rotateMember = new SpecialFunction(SourceOrigin.NoToken, name, ProgramResolver.SystemModuleManager.SystemModule, false, false,
+        new List<TypeParameter>(), formals, resultType,
+        new List<AttributedExpression>(), new Specification<FrameExpression>(), new List<AttributedExpression>(),
+        new Specification<Expression>(new List<Expression>(), null), null, null, null) {
+        EnclosingClass = bitvectorTypeDecl
+      };
+      rotateMember.AddVisibilityScope(ProgramResolver.SystemModuleManager.SystemModule.VisibilityScope, false);
+      bitvectorTypeDecl.Members.Add(rotateMember);
     }
 
     /// <summary>
@@ -3022,12 +2338,12 @@ void ResolveClassMemberTypes(TopLevelDeclWithMembers cl) {
         if (member is Field) {
           if (member is ConstantField) {
             var m = (ConstantField)member;
-            ResolveType(member.tok, ((Field)member).Type, m, ResolveTypeOptionEnum.DontInfer, null);
+            ResolveType(member.Origin, ((Field)member).Type, m, ResolveTypeOptionEnum.DontInfer, null);
           } else {
             // In the following, we pass in a NoContext, because any cycle formed by a redirecting-type constraints would have to
             // dereference the heap, and such constraints are not allowed to dereference the heap so an error will be produced
             // even if we don't detect this cycle.
-            ResolveType(member.tok, ((Field)member).Type, new NoContext(cl.EnclosingModuleDefinition), ResolveTypeOptionEnum.DontInfer, null);
+            ResolveType(member.Origin, ((Field)member).Type, new NoContext(cl.EnclosingModuleDefinition), ResolveTypeOptionEnum.DontInfer, null);
           }
         } else if (member is Function) {
           var f = (Function)member;
@@ -3079,16 +2395,19 @@ void ResolveClassMemberTypes(TopLevelDeclWithMembers cl) {
     /// This method checks the rules for inherited and overridden members. It also populates .InheritedMembers with the
     /// non-static members that are inherited from parent traits.
     /// </summary>
-    void InheritedTraitMembers(TopLevelDeclWithMembers cl) {
+    void ProcessInheritedTraitMembers(TopLevelDeclWithMembers cl, List<string> suppressNoImplErrorsForTheseMembers) {
       Contract.Requires(cl != null);
       Contract.Requires(cl.ParentTypeInformation != null);
 
       foreach (var member in GetClassMembers(cl).Values) {
-        if (member is PrefixPredicate || member is PrefixLemma) {
+        if (member is PrefixPredicate or PrefixLemma) {
           // these are handled with the corresponding extreme predicate/lemma
           continue;
         }
         if (member.EnclosingClass != cl) {
+          if (member.EnclosingClass is not TraitDecl) {
+            continue;
+          }
           // The member is the one inherited from a trait (and the class does not itself define a member with this name).  This
           // is fine for fields and for functions and methods with bodies. However, if "cl" is not itself a trait, then for a body-less function
           // or method, "cl" is required to at least redeclare the member with its signature.  (It should also provide a stronger specification,
@@ -3106,8 +2425,8 @@ void InheritedTraitMembers(TopLevelDeclWithMembers cl) {
               // TODO: When `:extern` is separated from `:compile false`, this should become `:compile false`.
             } else if (member is Lemma && Attributes.Contains(member.Attributes, "opaque_reveal")) {
               // reveal lemmas do not need to be reimplemented
-            } else {
-              reporter.Error(MessageSource.Resolver, cl.tok, "{0} '{1}' does not implement trait {2} '{3}.{4}'", cl.WhatKind, cl.Name, member.WhatKind, member.EnclosingClass.Name, member.Name);
+            } else if (!suppressNoImplErrorsForTheseMembers.Contains(member.Name)) {
+              reporter.Error(MessageSource.Resolver, cl.Origin, "{0} '{1}' does not implement trait {2} '{3}.{4}'", cl.WhatKind, cl.Name, member.WhatKind, member.EnclosingClass.Name, member.Name);
             }
           }
           continue;
@@ -3119,18 +2438,23 @@ void InheritedTraitMembers(TopLevelDeclWithMembers cl) {
 
         var traitMember = member.OverriddenMember;
         var trait = traitMember.EnclosingClass;
-        if (traitMember.IsStatic) {
-          reporter.Error(MessageSource.Resolver, member.tok, "static {0} '{1}' is inherited from trait '{2}' and is not allowed to be re-declared",
-            traitMember.WhatKind, traitMember.Name, trait.Name);
+        if (trait is not TraitDecl) {
+          reporter.Error(MessageSource.Resolver, member.Origin,
+            $"{traitMember.WhatKindAndName} is inherited from {trait.WhatKindAndName} and is not allowed to be re-declared in {cl.WhatKindAndName}");
+        } else if (traitMember.IsStatic) {
+          reporter.Error(MessageSource.Resolver, member.Origin,
+            $"static {traitMember.WhatKindAndName} is inherited from trait '{trait.Name}' and is not allowed to be re-declared");
         } else if (member.IsStatic) {
-          reporter.Error(MessageSource.Resolver, member.tok, "static member '{0}' overrides non-static member in trait '{1}'", member.Name, trait.Name);
+          reporter.Error(MessageSource.Resolver, member.Origin,
+            $"static member '{member.Name}' overrides non-static member in trait '{trait.Name}'");
         } else if (traitMember is Field) {
           // The class is not allowed to do anything with the field other than silently inherit it.
-          reporter.Error(MessageSource.Resolver, member.tok, "{0} '{1}' is inherited from trait '{2}' and is not allowed to be re-declared", traitMember.WhatKind, traitMember.Name, trait.Name);
+          reporter.Error(MessageSource.Resolver, member.Origin,
+            $"{traitMember.WhatKindAndName} is inherited from trait '{trait.Name}' and is not allowed to be re-declared");
         } else if ((traitMember as Function)?.Body != null || (traitMember as Method)?.Body != null) {
           // the overridden member is a fully defined function or method, so the class is not allowed to do anything with it other than silently inherit it
-          reporter.Error(MessageSource.Resolver, member.tok, "fully defined {0} '{1}' is inherited from trait '{2}' and is not allowed to be re-declared",
-            traitMember.WhatKind, traitMember.Name, trait.Name);
+          reporter.Error(MessageSource.Resolver, member.Origin,
+            $"fully defined {traitMember.WhatKindAndName} is inherited from trait '{trait.Name}' and is not allowed to be re-declared");
         } else if (member is Method != traitMember is Method ||
                    member is Lemma != traitMember is Lemma ||
                    member is TwoStateLemma != traitMember is TwoStateLemma ||
@@ -3140,10 +2464,14 @@ void InheritedTraitMembers(TopLevelDeclWithMembers cl) {
                    member is TwoStateFunction != traitMember is TwoStateFunction ||
                    member is LeastPredicate != traitMember is LeastPredicate ||
                    member is GreatestPredicate != traitMember is GreatestPredicate) {
-          reporter.Error(MessageSource.Resolver, member.tok, "{0} '{1}' in '{2}' can only be overridden by a {0} (got {3})", traitMember.WhatKind, traitMember.Name, trait.Name, member.WhatKind);
+          reporter.Error(MessageSource.Resolver, member.Origin,
+            $"{traitMember.WhatKindAndName} in '{trait.Name}' can only be overridden by a {traitMember.WhatKind} (got {member.WhatKind})");
         } else if (member.IsGhost != traitMember.IsGhost) {
-          reporter.Error(MessageSource.Resolver, member.tok, "overridden {0} '{1}' in '{2}' has different ghost/compiled status than in trait '{3}'",
-            traitMember.WhatKind, traitMember.Name, cl.Name, trait.Name);
+          reporter.Error(MessageSource.Resolver, member.Origin,
+            $"overridden {traitMember.WhatKindAndName} in '{cl.Name}' has different ghost/compiled status than in trait '{trait.Name}'");
+        } else if (!member.IsOpaque && traitMember.IsOpaque) {
+          reporter.Error(MessageSource.Resolver, member.Origin,
+            $"overridden {traitMember.WhatKindAndName} in '{cl.Name}' must be 'opaque' since the member is 'opaque' in trait '{trait.Name}'");
         } else {
           // Copy trait member's extern attribute onto class member if class does not provide one
           if (!Attributes.Contains(member.Attributes, "extern") && Attributes.Contains(traitMember.Attributes, "extern")) {
@@ -3161,7 +2489,8 @@ void InheritedTraitMembers(TopLevelDeclWithMembers cl) {
             var traitMethodAllowsNonTermination = Contract.Exists(traitMethod.Decreases.Expressions, e => e is WildcardExpr);
             var classMethodAllowsNonTermination = Contract.Exists(classMethod.Decreases.Expressions, e => e is WildcardExpr);
             if (classMethodAllowsNonTermination && !traitMethodAllowsNonTermination) {
-              reporter.Error(MessageSource.Resolver, classMethod.tok, "not allowed to override a terminating method with a possibly non-terminating method ('{0}')", classMethod.Name);
+              reporter.Error(MessageSource.Resolver, classMethod.Origin,
+                $"not allowed to override a terminating method with a possibly non-terminating method ('{classMethod.Name}')");
             }
 
           } else if (traitMember is Function) {
@@ -3183,13 +2512,13 @@ public void CheckOverride_FunctionParameters(Function nw, Function old, Dictiona
       Contract.Requires(old != null);
       Contract.Requires(classTypeMap != null);
 
-      var typeMap = CheckOverride_TypeParameters(nw.tok, old.TypeArgs, nw.TypeArgs, nw.Name, "function", classTypeMap);
+      var typeMap = CheckOverride_TypeParameters(nw.Origin, old.TypeArgs, nw.TypeArgs, nw.Name, "function", classTypeMap);
       if (nw is ExtremePredicate nwFix && old is ExtremePredicate oldFix && nwFix.KNat != oldFix.KNat) {
         reporter.Error(MessageSource.Resolver, nw,
           "the type of special parameter '_k' of {0} '{1}' ({2}) must be the same as in the overridden {0} ({3})",
           nw.WhatKind, nw.Name, nwFix.KNat ? "nat" : "ORDINAL", oldFix.KNat ? "nat" : "ORDINAL");
       }
-      CheckOverride_ResolvedParameters(nw.tok, old.Formals, nw.Formals, nw.Name, "function", "parameter", typeMap);
+      CheckOverride_ResolvedParameters(nw.Origin, old.Ins, nw.Ins, nw.Name, "function", "parameter", typeMap);
       var oldResultType = old.ResultType.Subst(typeMap);
       if (!nw.ResultType.Equals(oldResultType, true)) {
         reporter.Error(MessageSource.Resolver, nw, "the result type of function '{0}' ({1}) differs from that in the overridden function ({2})",
@@ -3201,17 +2530,18 @@ public void CheckOverride_MethodParameters(Method nw, Method old, Dictionary<Typ
       Contract.Requires(nw != null);
       Contract.Requires(old != null);
       Contract.Requires(classTypeMap != null);
-      var typeMap = CheckOverride_TypeParameters(nw.tok, old.TypeArgs, nw.TypeArgs, nw.Name, "method", classTypeMap);
+      var typeMap = CheckOverride_TypeParameters(nw.Origin, old.TypeArgs, nw.TypeArgs, nw.Name, "method", classTypeMap);
       if (nw is ExtremeLemma nwFix && old is ExtremeLemma oldFix && nwFix.KNat != oldFix.KNat) {
         reporter.Error(MessageSource.Resolver, nw,
           "the type of special parameter '_k' of {0} '{1}' ({2}) must be the same as in the overridden {0} ({3})",
           nw.WhatKind, nw.Name, nwFix.KNat ? "nat" : "ORDINAL", oldFix.KNat ? "nat" : "ORDINAL");
       }
-      CheckOverride_ResolvedParameters(nw.tok, old.Ins, nw.Ins, nw.Name, "method", "in-parameter", typeMap);
-      CheckOverride_ResolvedParameters(nw.tok, old.Outs, nw.Outs, nw.Name, "method", "out-parameter", typeMap);
+      CheckOverride_ResolvedParameters(nw.Origin, old.Ins, nw.Ins, nw.Name, "method", "in-parameter", typeMap);
+      CheckOverride_ResolvedParameters(nw.Origin, old.Outs, nw.Outs, nw.Name, "method", "out-parameter", typeMap);
     }
 
-    private Dictionary<TypeParameter, Type> CheckOverride_TypeParameters(IToken tok, List<TypeParameter> old, List<TypeParameter> nw, string name, string thing, Dictionary<TypeParameter, Type> classTypeMap) {
+    private Dictionary<TypeParameter, Type> CheckOverride_TypeParameters(IOrigin tok, List<TypeParameter> old, List<TypeParameter> nw,
+      string name, string thing, Dictionary<TypeParameter, Type> classTypeMap) {
       Contract.Requires(tok != null);
       Contract.Requires(old != null);
       Contract.Requires(nw != null);
@@ -3222,29 +2552,64 @@ private Dictionary<TypeParameter, Type> CheckOverride_TypeParameters(IToken tok,
         reporter.Error(MessageSource.Resolver, tok,
           "{0} '{1}' is declared with a different number of type parameters ({2} instead of {3}) than in the overridden {0}", thing, name, nw.Count, old.Count);
       } else {
-        for (int i = 0; i < old.Count; i++) {
+        var checkNames = old.Concat(nw).Any(typeParameter => typeParameter.TypeBounds.Count != 0);
+        for (var i = 0; i < old.Count; i++) {
           var o = old[i];
           var n = nw[i];
           typeMap.Add(o, new UserDefinedType(tok, n));
-          // Check type characteristics
-          if (o.Characteristics.EqualitySupport != TypeParameter.EqualitySupportValue.InferredRequired && o.Characteristics.EqualitySupport != n.Characteristics.EqualitySupport) {
-            reporter.Error(MessageSource.Resolver, n.tok, "type parameter '{0}' is not allowed to change the requirement of supporting equality", n.Name);
-          }
-          if (o.Characteristics.HasCompiledValue != n.Characteristics.HasCompiledValue) {
-            reporter.Error(MessageSource.Resolver, n.tok, "type parameter '{0}' is not allowed to change the requirement of supporting auto-initialization", n.Name);
-          } else if (o.Characteristics.IsNonempty != n.Characteristics.IsNonempty) {
-            reporter.Error(MessageSource.Resolver, n.tok, "type parameter '{0}' is not allowed to change the requirement of being nonempty", n.Name);
-          }
-          if (o.Characteristics.ContainsNoReferenceTypes != n.Characteristics.ContainsNoReferenceTypes) {
-            reporter.Error(MessageSource.Resolver, n.tok, "type parameter '{0}' is not allowed to change the no-reference-type requirement", n.Name);
+          if (checkNames && o.Name != n.Name) { // if checkNames is false, then just treat the parameters positionally.
+            reporter.Error(MessageSource.Resolver, n.Origin,
+              $"type parameters in this {thing} override are not allowed to be renamed from the names given in the the {thing} it overrides" +
+              $" (expected '{o.Name}', got '{n.Name}')");
+          } else {
+            // Check type characteristics
+            if (o.Characteristics.EqualitySupport != TypeParameter.EqualitySupportValue.InferredRequired &&
+                o.Characteristics.EqualitySupport != n.Characteristics.EqualitySupport) {
+              reporter.Error(MessageSource.Resolver, n.Origin, "type parameter '{0}' is not allowed to change the requirement of supporting equality",
+                n.Name);
+            }
+            if (o.Characteristics.HasCompiledValue != n.Characteristics.HasCompiledValue) {
+              reporter.Error(MessageSource.Resolver, n.Origin,
+                "type parameter '{0}' is not allowed to change the requirement of supporting auto-initialization", n.Name);
+            } else if (o.Characteristics.IsNonempty != n.Characteristics.IsNonempty) {
+              reporter.Error(MessageSource.Resolver, n.Origin, "type parameter '{0}' is not allowed to change the requirement of being nonempty",
+                n.Name);
+            }
+            if (o.Characteristics.ContainsNoReferenceTypes != n.Characteristics.ContainsNoReferenceTypes) {
+              reporter.Error(MessageSource.Resolver, n.Origin, "type parameter '{0}' is not allowed to change the no-reference-type requirement",
+                n.Name);
+            }
           }
-
+        }
+        for (var i = 0; i < old.Count; i++) {
+          var o = old[i];
+          var n = nw[i];
+          CheckOverride_TypeBounds(n.Origin, o, n, name, thing, typeMap);
         }
       }
       return typeMap;
     }
 
-    private void CheckOverride_ResolvedParameters(IToken tok, List<Formal> old, List<Formal> nw, string name, string thing, string parameterKind, Dictionary<TypeParameter, Type> typeMap) {
+    void CheckOverride_TypeBounds(IOrigin tok, TypeParameter old, TypeParameter nw, string name, string thing, Dictionary<TypeParameter, Type> typeMap) {
+      if (old.TypeBounds.Count != nw.TypeBounds.Count) {
+        reporter.Error(MessageSource.Resolver, tok,
+          $"type parameter '{nw.Name}' of {thing} '{name}' is declared with a different number of type bounds than in the " +
+          $"{thing} it overrides (expected {old.TypeBounds.Count}, found {nw.TypeBounds.Count})");
+        return;
+      }
+
+      for (var i = 0; i < old.TypeBounds.Count; i++) {
+        var oldBound = old.TypeBounds[i].NormalizeExpandKeepConstraints();
+        var newBound = nw.TypeBounds[i].NormalizeExpandKeepConstraints();
+        if (!oldBound.Subst(typeMap).Equals(newBound, true)) {
+          reporter.Error(MessageSource.Resolver, tok,
+            $"type bound for type parameter '{nw.Name}' of {thing} '{name}' is different from the corresponding type bound of the " +
+            $"corresponding type parameter of the {thing} it overrides (expected '{oldBound}', found '{newBound}')");
+        }
+      }
+    }
+
+    private void CheckOverride_ResolvedParameters(IOrigin tok, List<Formal> old, List<Formal> nw, string name, string thing, string parameterKind, Dictionary<TypeParameter, Type> typeMap) {
       Contract.Requires(tok != null);
       Contract.Requires(old != null);
       Contract.Requires(nw != null);
@@ -3260,27 +2625,27 @@ private void CheckOverride_ResolvedParameters(IToken tok, List<Formal> old, List
           var o = old[i];
           var n = nw[i];
           if (!o.IsGhost && n.IsGhost) {
-            reporter.Error(MessageSource.Resolver, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from non-ghost to ghost",
+            reporter.Error(MessageSource.Resolver, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from non-ghost to ghost",
               parameterKind, n.Name, thing, name);
           } else if (o.IsGhost && !n.IsGhost) {
-            reporter.Error(MessageSource.Resolver, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from ghost to non-ghost",
+            reporter.Error(MessageSource.Resolver, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from ghost to non-ghost",
               parameterKind, n.Name, thing, name);
           } else if (!o.IsOld && n.IsOld) {
-            reporter.Error(MessageSource.Resolver, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from new to non-new",
+            reporter.Error(MessageSource.Resolver, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from new to non-new",
               parameterKind, n.Name, thing, name);
           } else if (o.IsOld && !n.IsOld) {
-            reporter.Error(MessageSource.Resolver, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from non-new to new",
+            reporter.Error(MessageSource.Resolver, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from non-new to new",
               parameterKind, n.Name, thing, name);
           } else if (!o.IsOlder && n.IsOlder) {
-            reporter.Error(MessageSource.Resolver, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from non-older to older",
+            reporter.Error(MessageSource.Resolver, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from non-older to older",
               parameterKind, n.Name, thing, name);
           } else if (o.IsOlder && !n.IsOlder) {
-            reporter.Error(MessageSource.Resolver, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from older to non-older",
+            reporter.Error(MessageSource.Resolver, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to in the overridden {2}, from older to non-older",
               parameterKind, n.Name, thing, name);
           } else {
             var oo = o.Type.Subst(typeMap);
             if (!n.Type.Equals(oo, true)) {
-              reporter.Error(MessageSource.Resolver, n.tok,
+              reporter.Error(MessageSource.Resolver, n.Origin,
                 "the type of {0} '{1}' is different from the type of the corresponding {0} in trait {2} ('{3}' instead of '{4}')",
                 parameterKind, n.Name, thing, n.Type, oo);
             }
@@ -3289,6 +2654,33 @@ private void CheckOverride_ResolvedParameters(IToken tok, List<Formal> old, List
       }
     }
 
+    private bool AreThereAnyObviousSignsOfEmptiness(Type type, ISet<IndDatatypeDecl> beingVisited) {
+      type = type.NormalizeExpandKeepConstraints(); // cut through type proxies, type synonyms, but being mindful of what's in scope
+      if (type is UserDefinedType { ResolvedClass: var cl } udt) {
+        Contract.Assert(cl != null);
+        if (cl is SubsetTypeDecl subsetTypeDecl) {
+          return AreThereAnyObviousSignsOfEmptiness(subsetTypeDecl.RhsWithArgument(udt.TypeArgs), beingVisited);
+        } else if (cl is NewtypeDecl newtypeDecl) {
+          return AreThereAnyObviousSignsOfEmptiness(newtypeDecl.RhsWithArgument(udt.TypeArgs), beingVisited);
+        }
+        if (cl is IndDatatypeDecl datatypeDecl) {
+          if (beingVisited.Contains(datatypeDecl)) {
+            // This datatype may be empty, but it's definitely empty if we consider only the constructors that have been visited
+            // since AreThereAnyObviousSignsOfEmptiness was called from IsObviouslyEmpty.
+            return true;
+          }
+          beingVisited.Add(datatypeDecl);
+          var typeMap = TypeParameter.SubstitutionMap(datatypeDecl.TypeArgs, udt.TypeArgs);
+          var isEmpty = datatypeDecl.Ctors.TrueForAll(ctor =>
+            ctor.Formals.Exists(formal => AreThereAnyObviousSignsOfEmptiness(formal.Type.Subst(typeMap), beingVisited)));
+          beingVisited.Remove(datatypeDecl);
+          return isEmpty;
+        }
+      }
+
+      return false;
+    }
+
     /// <summary>
     /// Check that the SCC of 'startingPoint' can be carved up into stratospheres in such a way that each
     /// datatype has some value that can be constructed from datatypes in lower stratospheres only.
@@ -3318,7 +2710,7 @@ void SccStratosphereCheck(IndDatatypeDecl startingPoint, Graph<IndDatatypeDecl/*
           if (dt.GroundingCtor != null) {
             // previously cleared
           } else if (ComputeGroundingCtor(dt)) {
-            Contract.Assert(dt.GroundingCtor != null);  // should have been set by the successful call to StratosphereCheck)
+            Contract.Assert(dt.GroundingCtor != null);  // should have been set by the successful call to ComputeGroundingCtor)
             clearedThisRound++;
             totalCleared++;
           }
@@ -3329,19 +2721,13 @@ void SccStratosphereCheck(IndDatatypeDecl startingPoint, Graph<IndDatatypeDecl/*
         } else if (clearedThisRound != 0) {
           // some progress was made, so let's keep going
         } else {
-          // whatever is in scc-cleared now failed to pass the test
-          foreach (var dt in scc) {
-            if (dt.GroundingCtor == null) {
-              reporter.Error(MessageSource.Resolver, dt, "because of cyclic dependencies among constructor argument types, no instances of datatype '{0}' can be constructed", dt.Name);
-            }
-          }
           return;
         }
       }
     }
 
     /// <summary>
-    /// Check that the datatype has some constructor all whose argument types can be constructed.
+    /// Check if the datatype has some constructor all whose argument types can be constructed.
     /// Returns 'true' and sets dt.GroundingCtor if that is the case.
     /// </summary>
     bool ComputeGroundingCtor(IndDatatypeDecl dt) {
@@ -3349,7 +2735,7 @@ bool ComputeGroundingCtor(IndDatatypeDecl dt) {
       Contract.Requires(dt.GroundingCtor == null);  // the intention is that this method be called only when GroundingCtor hasn't already been set
       Contract.Ensures(!Contract.Result<bool>() || dt.GroundingCtor != null);
 
-      // Stated differently, check that there is some constuctor where no argument type goes to the same stratum.
+      // Stated differently, check that there is some constructor where no argument type goes to the same stratum.
       DatatypeCtor groundingCtor = null;
       ISet<TypeParameter> lastTypeParametersUsed = null;
       foreach (DatatypeCtor ctor in dt.Ctors) {
@@ -3484,11 +2870,7 @@ void MarkSCCAsNotSupportingEquality() {
             return;  // we are done
           }
           foreach (var arg in ctor.Formals) {
-            var anotherIndDt = arg.Type.AsIndDatatype;
-            if (arg.IsGhost ||
-                (anotherIndDt != null && anotherIndDt.EqualitySupport == IndDatatypeDecl.ES.Never) ||
-                arg.Type.IsCoDatatype ||
-                arg.Type.IsArrowType) {
+            if (arg.IsGhost || SurelyNeverSupportEquality(arg.Type)) {
               // arg.Type is known never to support equality
               MarkSCCAsNotSupportingEquality();
               return;  // we are done
@@ -3507,26 +2889,7 @@ void MarkSCCAsNotSupportingEquality() {
         }
         foreach (var ctor in dt.Ctors) {
           foreach (var arg in ctor.Formals) {
-            var typeArg = arg.Type.AsTypeParameter;
-            if (typeArg != null) {
-              typeArg.NecessaryForEqualitySupportOfSurroundingInductiveDatatype = true;
-              thingsChanged = true;
-            } else {
-              var otherDt = arg.Type.AsIndDatatype;
-              if (otherDt != null && otherDt.EqualitySupport == IndDatatypeDecl.ES.ConsultTypeArguments) {  // datatype is in a different SCC
-                var otherUdt = (UserDefinedType)arg.Type.NormalizeExpand();
-                var i = 0;
-                foreach (var otherTp in otherDt.TypeArgs) {
-                  if (otherTp.NecessaryForEqualitySupportOfSurroundingInductiveDatatype) {
-                    var tp = otherUdt.TypeArgs[i].AsTypeParameter;
-                    if (tp != null) {
-                      tp.NecessaryForEqualitySupportOfSurroundingInductiveDatatype = true;
-                      thingsChanged = true;
-                    }
-                  }
-                }
-              }
-            }
+            DetermineEqualitySupportType(arg.Type, ref thingsChanged);
           }
         }
       }
@@ -3566,6 +2929,78 @@ void MarkSCCAsNotSupportingEquality() {
       }
     }
 
+    public static bool SurelyNeverSupportEqualityTypeParameters(IndDatatypeDecl.ES equalitySupport, List<TypeParameter> typeParams, List<Type> typeArgs) {
+      return
+        equalitySupport == IndDatatypeDecl.ES.Never ||
+        (equalitySupport == IndDatatypeDecl.ES.ConsultTypeArguments &&
+         typeArgs.Zip(typeParams).Any(tt =>
+           tt.Item2.NecessaryForEqualitySupportOfSurroundingInductiveDatatype && SurelyNeverSupportEquality(tt.Item1)));
+    }
+
+    // If returns true, the given type never supports equality
+    // If return false, then the type must support equality if type parameters support equality
+    // It is unsound for a type to make this function return false when there is no type parameter
+    // assignment that makes this type support equality
+    public static bool SurelyNeverSupportEquality(Type type) {
+      type = type.NormalizeExpand();
+      return
+        type.AsNewtype is { EqualitySupport: var equalitySupport, TypeArgs: var typeParams }
+        && SurelyNeverSupportEqualityTypeParameters(equalitySupport, typeParams, type.TypeArgs)
+        ||
+        type.AsIndDatatype is { EqualitySupport: var equalitySupport2, TypeArgs: var typeParams2 }
+        && SurelyNeverSupportEqualityTypeParameters(equalitySupport2, typeParams2, type.TypeArgs)
+        ||
+        type.IsCoDatatype || type.IsArrowType ||
+        type.AsSeqType is { Arg: var argType } && SurelyNeverSupportEquality(argType) ||
+        type.AsMapType is { Range: var rangeType } && SurelyNeverSupportEquality(rangeType);
+    }
+
+    public static void DetermineEqualitySupportType(Type type, ref bool thingsChanged) {
+      if (type.AsTypeParameter is { } typeArg) {
+        typeArg.NecessaryForEqualitySupportOfSurroundingInductiveDatatype = true;
+        thingsChanged = true;
+      } else if (type.Normalize() is UserDefinedType userDefinedType) {
+        if (userDefinedType.ResolvedClass is TypeSynonymDeclBase typeSynonymDecl) {
+          if (typeSynonymDecl.IsRevealedInScope(Type.GetScope())) {
+            if (typeSynonymDecl.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Required) {
+              return; // It's guaranteed that this type synonym requires equality
+            }
+            DetermineEqualitySupportType(typeSynonymDecl.RhsWithArgument(userDefinedType.TypeArgs), ref thingsChanged);
+          }
+        } else if (userDefinedType.ResolvedClass is NewtypeDecl newtypeDecl) {
+          if (newtypeDecl.IsRevealedInScope(Type.GetScope())) {
+            DetermineEqualitySupportType(newtypeDecl.RhsWithArgument(userDefinedType.TypeArgs), ref thingsChanged);
+          }
+        } else if (userDefinedType.ResolvedClass is IndDatatypeDecl otherDt) {
+          if (otherDt.EqualitySupport == IndDatatypeDecl.ES.ConsultTypeArguments) {
+            // datatype is in a different SCC
+            var otherUdt = (UserDefinedType)type.NormalizeExpand();
+            var i = 0;
+            foreach (var otherTp in otherDt.TypeArgs) {
+              if (otherTp.NecessaryForEqualitySupportOfSurroundingInductiveDatatype) {
+                var tp = otherUdt.TypeArgs[i].AsTypeParameter;
+                if (tp != null) {
+                  tp.NecessaryForEqualitySupportOfSurroundingInductiveDatatype = true;
+                  thingsChanged = true;
+                }
+              }
+
+              i++;
+            }
+          }
+        }
+      } else if (type.AsMapType is { } typeMap) {
+        // A map type's Domain type is required to support equality (just like the argument type for sets and multisets), but
+        // it is optional for the map type's Range type to support equality. Thus, we need to determine the equality support
+        // for just the Range type.
+        DetermineEqualitySupportType(typeMap.Range, ref thingsChanged);
+      } else if (type.AsSeqType is { } typeSeq) {
+        // Like the Range type of a map, it is optional for a sequence type's argument type to support equality. So, we make a call
+        // to determine it.  
+        DetermineEqualitySupportType(typeSeq.Arg, ref thingsChanged);
+      }
+    }
+
     /// <summary>
     /// Check to see if the attribute is one that is supported by Dafny.  What check performed here is,
     /// unfortunately, just an approximation, since the usage rules of a particular attribute is checked
@@ -3601,10 +3036,10 @@ public void ScopePushAndReport(Scope<IVariable> scope, IVariable v, string kind)
       Contract.Requires(scope != null);
       Contract.Requires(v != null);
       Contract.Requires(kind != null);
-      ScopePushAndReport(scope, v.Name, v, v.Tok, kind);
+      ScopePushAndReport(scope, v.Name, v, v.Origin, kind);
     }
 
-    void ScopePushAndReport<Thing>(Scope<Thing> scope, string name, Thing thing, IToken tok, string kind) where Thing : class {
+    public Scope<Thing>.PushResult ScopePushAndReport<Thing>(Scope<Thing> scope, string name, Thing thing, IOrigin tok, string kind) where Thing : class {
       Contract.Requires(scope != null);
       Contract.Requires(name != null);
       Contract.Requires(thing != null);
@@ -3621,6 +3056,8 @@ void ScopePushAndReport<Thing>(Scope<Thing> scope, string name, Thing thing, ITo
           reporter.Warning(MessageSource.Resolver, ResolutionErrors.ErrorId.none, tok, "Shadowed {0} name: {1}", kind, name);
           break;
       }
+
+      return r;
     }
 
     /// <summary>
@@ -3633,15 +3070,15 @@ public void ResolveFunctionSignature(Function f) {
         reporter.Error(MessageSource.Resolver, f, "function signature can be omitted only in refining functions");
       }
       var option = f.TypeArgs.Count == 0 ? new ResolveTypeOption(f) : new ResolveTypeOption(ResolveTypeOptionEnum.AllowPrefix);
-      foreach (Formal p in f.Formals) {
+      foreach (Formal p in f.Ins) {
         ScopePushAndReport(scope, p, "parameter");
-        ResolveType(p.tok, p.Type, f, option, f.TypeArgs);
+        ResolveType(p.Origin, p.Type, f, option, f.TypeArgs);
       }
       if (f.Result != null) {
         ScopePushAndReport(scope, f.Result, "parameter/return");
-        ResolveType(f.Result.tok, f.Result.Type, f, option, f.TypeArgs);
+        ResolveType(f.Result.Origin, f.Result.Type, f, option, f.TypeArgs);
       } else {
-        ResolveType(f.tok, f.ResultType, f, option, f.TypeArgs);
+        ResolveType(f.Origin, f.ResultType, f, option, f.TypeArgs);
       }
       scope.PopMarker();
     }
@@ -3671,12 +3108,12 @@ public void ResolveMethodSignature(Method m) {
       // resolve in-parameters
       foreach (Formal p in m.Ins) {
         ScopePushAndReport(scope, p, "parameter");
-        ResolveType(p.tok, p.Type, m, option, m.TypeArgs);
+        ResolveType(p.Origin, p.Type, m, option, m.TypeArgs);
       }
       // resolve out-parameters
       foreach (Formal p in m.Outs) {
         ScopePushAndReport(scope, p, "parameter");
-        ResolveType(p.tok, p.Type, m, option, m.TypeArgs);
+        ResolveType(p.Origin, p.Type, m, option, m.TypeArgs);
       }
       scope.PopMarker();
     }
@@ -3695,18 +3132,18 @@ void ResolveIteratorSignature(IteratorDecl iter) {
       // resolve the types of the parameters
       var prevErrorCount = reporter.Count(ErrorLevel.Error);
       foreach (var p in iter.Ins) {
-        ResolveType(p.tok, p.Type, iter, option, iter.TypeArgs);
+        ResolveType(p.Origin, p.Type, iter, option, iter.TypeArgs);
       }
       foreach (var p in iter.Outs) {
-        ResolveType(p.tok, p.Type, iter, option, iter.TypeArgs);
+        ResolveType(p.Origin, p.Type, iter, option, iter.TypeArgs);
         if (!p.Type.KnownToHaveToAValue(p.IsGhost)) {
-          reporter.Error(MessageSource.Resolver, p.tok, "type of yield-parameter must support auto-initialization (got '{0}')", p.Type);
+          reporter.Error(MessageSource.Resolver, p.Origin, "type of yield-parameter must support auto-initialization (got '{0}')", p.Type);
         }
       }
       // resolve the types of the added fields (in case some of these types would cause the addition of default type arguments)
       if (prevErrorCount == reporter.Count(ErrorLevel.Error)) {
         foreach (var p in iter.OutsHistoryFields) {
-          ResolveType(p.tok, p.Type, iter, option, iter.TypeArgs);
+          ResolveType(p.Origin, p.Type, iter, option, iter.TypeArgs);
         }
       }
       if (iter.TypeArgs.Count != iter.NonNullTypeDecl.TypeArgs.Count) {
@@ -3715,7 +3152,7 @@ void ResolveIteratorSignature(IteratorDecl iter) {
         Contract.Assert(initiallyNoTypeArguments);
         Contract.Assert(iter.NonNullTypeDecl.TypeArgs.Count == 0);
         var nnt = iter.NonNullTypeDecl;
-        nnt.TypeArgs.AddRange(iter.TypeArgs.ConvertAll(tp => new TypeParameter(tp.RangeToken, tp.NameNode, tp.VarianceSyntax, tp.Characteristics)));
+        nnt.TypeArgs.AddRange(TypeParameter.CloneTypeParameters(iter.TypeArgs));
         var varUdt = (UserDefinedType)nnt.Var.Type;
         Contract.Assert(varUdt.TypeArgs.Count == 0);
         varUdt.TypeArgs = nnt.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
@@ -3751,7 +3188,7 @@ public ResolveTypeOption(TypeParameter.ParentType parent) {
     /// Callers are expected to provide "arg" as an already resolved type.  (Note, a proxy type is resolved--
     /// only types that contain identifiers stand the possibility of not being resolved.)
     /// </summary>
-    internal Type ResolvedArrayType(IToken tok, int dims, Type arg, ResolutionContext resolutionContext, bool useClassNameType) {
+    internal Type ResolvedArrayType(IOrigin tok, int dims, Type arg, ResolutionContext resolutionContext, bool useClassNameType) {
       Contract.Requires(tok != null);
       Contract.Requires(1 <= dims);
       Contract.Requires(arg != null);
@@ -3761,23 +3198,23 @@ internal Type ResolvedArrayType(IToken tok, int dims, Type arg, ResolutionContex
       return at;
     }
 
-    public Expression VarDotMethod(IToken tok, string varname, string methodname) {
-      return new ApplySuffix(tok, null, new ExprDotName(tok, new IdentifierExpr(tok, varname), methodname, null), new List<ActualBinding>(), tok);
+    public Expression VarDotMethod(IOrigin tok, string varName, string methodName) {
+      return new ApplySuffix(tok, null, new ExprDotName(tok, new IdentifierExpr(tok, varName), new Name(methodName), null), new List<ActualBinding>(), Token.NoToken);
     }
 
     public Expression makeTemp(String prefix, AssignOrReturnStmt s, ResolutionContext resolutionContext, Expression ex) {
       var temp = FreshTempVarName(prefix, resolutionContext.CodeContext);
-      var locvar = new LocalVariable(s.RangeToken, temp, ex.Type, false);
-      var id = new IdentifierExpr(s.Tok, temp);
+      var locvar = new LocalVariable(s.Origin, temp, ex.Type, false);
+      var id = new IdentifierExpr(s.Origin, temp);
       var idlist = new List<Expression>() { id };
       var lhss = new List<LocalVariable>() { locvar };
       var rhss = new List<AssignmentRhs>() { new ExprRhs(ex) };
-      var up = new UpdateStmt(s.RangeToken, idlist, rhss);
-      s.ResolvedStatements.Add(new VarDeclStmt(s.RangeToken, lhss, up));
+      var up = new AssignStatement(s.Origin, idlist, rhss);
+      s.ResolvedStatements.Add(new VarDeclStmt(s.Origin, lhss, up));
       return id;
     }
 
-    public void EnsureSupportsErrorHandling(IToken tok, Type tp, bool expectExtract, bool hasKeywordToken) {
+    public void EnsureSupportsErrorHandling(IOrigin tok, Type tp, bool expectExtract, [CanBeNull] string keyword) {
       // The "method not found" errors which will be generated here were already reported while
       // resolving the statement, so we don't want them to reappear and redirect them into a sink.
       var origReporter = reporter;
@@ -3787,23 +3224,22 @@ public void EnsureSupportsErrorHandling(IToken tok, Type tp, bool expectExtract,
       var propagateFailure = ResolveMember(tok, tp, "PropagateFailure", out _);
       var extract = ResolveMember(tok, tp, "Extract", out _);
 
-      if (hasKeywordToken) {
+      if (keyword != null) {
         if (isFailure == null || (extract != null) != expectExtract) {
           // more details regarding which methods are missing have already been reported by regular resolution
+          var requiredMembers = expectExtract
+            ? "functions 'IsFailure()' and 'Extract()'"
+            : "function 'IsFailure()', but not 'Extract()'";
           origReporter.Error(MessageSource.Resolver, tok,
-            "The right-hand side of ':-', which is of type '{0}', with a keyword token must have function{1}", tp,
-            expectExtract
-              ? "s 'IsFailure()' and 'Extract()'"
-              : " 'IsFailure()', but not 'Extract()'");
+            $"The right-hand side of ':- {keyword}', which is of type '{tp}', with a keyword token must have {requiredMembers}");
         }
       } else {
         if (isFailure == null || propagateFailure == null || (extract != null) != expectExtract) {
           // more details regarding which methods are missing have already been reported by regular resolution
-          origReporter.Error(MessageSource.Resolver, tok,
-            "The right-hand side of ':-', which is of type '{0}', must have function{1}", tp,
-            expectExtract
-              ? "s 'IsFailure()', 'PropagateFailure()', and 'Extract()'"
-              : "s 'IsFailure()' and 'PropagateFailure()', but not 'Extract()'");
+          var requiredMembers = expectExtract
+            ? "functions 'IsFailure()', 'PropagateFailure()', and 'Extract()'"
+            : "functions 'IsFailure()' and 'PropagateFailure()', but not 'Extract()'";
+          origReporter.Error(MessageSource.Resolver, tok, $"The right-hand side of ':-', which is of type '{tp}', must have {requiredMembers}");
         }
       }
 
@@ -3823,7 +3259,7 @@ void CheckIsFunction([CanBeNull] MemberDecl memberDecl, bool allowMethod) {
       }
 
       CheckIsFunction(isFailure, false);
-      if (!hasKeywordToken) {
+      if (keyword == null) {
         CheckIsFunction(propagateFailure, true);
       }
       if (expectExtract) {
@@ -3834,18 +3270,17 @@ void CheckIsFunction([CanBeNull] MemberDecl memberDecl, bool allowMethod) {
     }
 
     /// <summary>
-    /// Check that "stmt" is a valid statment for the body of an assert-by, forall,
+    /// Check that "stmt" is a valid statement for the body of an assert-by, forall,
     /// or calc-hint statement. In particular, check that the local variables assigned in
     /// the bodies of these statements are declared in the statements, not in some enclosing
     /// context. 
     /// </summary>
     public void CheckLocalityUpdates(Statement stmt, ISet<LocalVariable> localsAllowedInUpdates, string where) {
-      // TODO it looks like this method has no side-effects and doesn't return anything.
       Contract.Requires(stmt != null);
       Contract.Requires(localsAllowedInUpdates != null);
       Contract.Requires(where != null);
 
-      if (stmt is AssertStmt || stmt is ForallStmt || stmt is CalcStmt || stmt is ModifyStmt) {
+      if (stmt is AssertStmt or ForallStmt or CalcStmt or ModifyStmt) {
         // don't recurse, since CheckHintRestrictions will be called on that assert-by separately
         return;
       } else if (stmt is AssignSuchThatStmt) {
@@ -3853,8 +3288,8 @@ public void CheckLocalityUpdates(Statement stmt, ISet<LocalVariable> localsAllow
         foreach (var lhs in s.Lhss) {
           CheckLocalityUpdatesLhs(lhs, localsAllowedInUpdates, @where);
         }
-      } else if (stmt is AssignStmt) {
-        var s = (AssignStmt)stmt;
+      } else if (stmt is SingleAssignStmt) {
+        var s = (SingleAssignStmt)stmt;
         CheckLocalityUpdatesLhs(s.Lhs, localsAllowedInUpdates, @where);
       } else if (stmt is CallStmt) {
         var s = (CallStmt)stmt;
@@ -3869,6 +3304,12 @@ public void CheckLocalityUpdates(Statement stmt, ISet<LocalVariable> localsAllow
       } else if (stmt is BlockStmt) {
         localsAllowedInUpdates = new HashSet<LocalVariable>(localsAllowedInUpdates);
         // use this new set for the recursive calls
+      } else if (stmt is BlockByProofStmt blockByProofStmt) {
+        localsAllowedInUpdates = new HashSet<LocalVariable>(localsAllowedInUpdates);
+        // use this new set for the recursive calls
+
+        CheckLocalityUpdates(blockByProofStmt.Body, localsAllowedInUpdates, where);
+        return;
       }
 
       foreach (var ss in stmt.SubStatements) {
@@ -3883,15 +3324,15 @@ void CheckLocalityUpdatesLhs(Expression lhs, ISet<LocalVariable> localsAllowedIn
 
       lhs = lhs.Resolved;
       if (lhs is IdentifierExpr idExpr && !localsAllowedInUpdates.Contains(idExpr.Var)) {
-        reporter.Error(MessageSource.Resolver, lhs.tok, "{0} is not allowed to update a variable it doesn't declare", where);
+        reporter.Error(MessageSource.Resolver, lhs.Origin, "{0} is not allowed to update a variable it doesn't declare", where);
       }
     }
 
-    class LazyString_OnTypeEquals {
+    class LazyStringOnTypeEquals {
       Type t0;
       Type t1;
       string s;
-      public LazyString_OnTypeEquals(Type t0, Type t1, string s) {
+      public LazyStringOnTypeEquals(Type t0, Type t1, string s) {
         Contract.Requires(t0 != null);
         Contract.Requires(t1 != null);
         Contract.Requires(s != null);
@@ -3915,7 +3356,7 @@ void FindAllMembers(ClassLikeDecl cl, string memberName, ISet<MemberDecl> foundS
     }
 
     // TODO move
-    public static UserDefinedType GetThisType(IToken tok, TopLevelDeclWithMembers cl) {
+    public static UserDefinedType GetThisType(IOrigin tok, TopLevelDeclWithMembers cl) {
       Contract.Requires(tok != null);
       Contract.Requires(cl != null);
       Contract.Ensures(Contract.Result<UserDefinedType>() != null);
@@ -3928,7 +3369,7 @@ public static UserDefinedType GetThisType(IToken tok, TopLevelDeclWithMembers cl
     }
 
     // TODO move
-    public static UserDefinedType GetReceiverType(IToken tok, MemberDecl member) {
+    public static UserDefinedType GetReceiverType(IOrigin tok, MemberDecl member) {
       Contract.Requires(tok != null);
       Contract.Requires(member != null);
       Contract.Ensures(Contract.Result<UserDefinedType>() != null);
@@ -3936,16 +3377,16 @@ public static UserDefinedType GetReceiverType(IToken tok, MemberDecl member) {
       return GetThisType(tok, (TopLevelDeclWithMembers)member.EnclosingClass);
     }
 
-    internal Expression VarDotFunction(IToken tok, string varname, string functionname) {
-      return new ApplySuffix(tok, null, new ExprDotName(tok, new IdentifierExpr(tok, varname), functionname, null), new List<ActualBinding>(), tok);
+    internal Expression VarDotFunction(IOrigin tok, string varName, string functionName) {
+      return new ApplySuffix(tok, null, new ExprDotName(tok, new IdentifierExpr(tok, varName), new Name(functionName), null), new List<ActualBinding>(), Token.NoToken);
     }
 
     // TODO search for occurrences of "new LetExpr" which could benefit from this helper
-    internal LetExpr LetPatIn(IToken tok, CasePattern<BoundVar> lhs, Expression rhs, Expression body) {
+    internal LetExpr LetPatIn(IOrigin tok, CasePattern<BoundVar> lhs, Expression rhs, Expression body) {
       return new LetExpr(tok, new List<CasePattern<BoundVar>>() { lhs }, new List<Expression>() { rhs }, body, true);
     }
 
-    internal LetExpr LetVarIn(IToken tok, string name, Type tp, Expression rhs, Expression body) {
+    internal LetExpr LetVarIn(IOrigin tok, string name, Type tp, Expression rhs, Expression body) {
       var lhs = new CasePattern<BoundVar>(tok, new BoundVar(tok, name, tp));
       return LetPatIn(tok, lhs, rhs, body);
     }
@@ -3958,33 +3399,33 @@ public void ResolveLetOrFailExpr(LetOrFailExpr expr, ResolutionContext resolutio
       var temp = FreshTempVarName("valueOrError", resolutionContext.CodeContext);
       var tempType = new InferredTypeProxy();
       // "var temp := E;"
-      expr.ResolvedExpression = LetVarIn(expr.tok, temp, tempType, expr.Rhs,
+      expr.ResolvedExpression = LetVarIn(expr.Origin, temp, tempType, expr.Rhs,
         // "if temp.IsFailure()"
-        new ITEExpr(expr.tok, false, VarDotFunction(expr.tok, temp, "IsFailure"),
+        new ITEExpr(expr.Origin, false, VarDotFunction(expr.Origin, temp, "IsFailure"),
           // "then temp.PropagateFailure()"
-          VarDotFunction(expr.tok, temp, "PropagateFailure"),
+          VarDotFunction(expr.Origin, temp, "PropagateFailure"),
           // "else"
           expr.Lhs == null
             // "F"
             ? expr.Body
             // "var x: T := temp.Extract(); F"
-            : LetPatIn(expr.tok, expr.Lhs, VarDotFunction(expr.tok, temp, "Extract"), expr.Body)));
+            : LetPatIn(expr.Origin, expr.Lhs, VarDotFunction(expr.Origin, temp, "Extract"), expr.Body)));
 
       ResolveExpression(expr.ResolvedExpression, resolutionContext);
       expr.Type = expr.ResolvedExpression.Type;
       bool expectExtract = (expr.Lhs != null);
-      EnsureSupportsErrorHandling(expr.tok, PartiallyResolveTypeForMemberSelection(expr.tok, tempType), expectExtract, false);
+      EnsureSupportsErrorHandling(expr.Origin, PartiallyResolveTypeForMemberSelection(expr.Origin, tempType), expectExtract, null);
     }
 
     public static Type SelectAppropriateArrowTypeForFunction(Function function, Dictionary<TypeParameter, Type> subst, SystemModuleManager systemModuleManager) {
-      return SelectAppropriateArrowType(function.tok,
-        function.Formals.ConvertAll(formal => formal.Type.Subst(subst)),
+      return SelectAppropriateArrowType(function.Origin,
+        function.Ins.ConvertAll(formal => formal.Type.Subst(subst)),
         function.ResultType.Subst(subst),
-        function.Reads.Count != 0, function.Req.Count != 0,
+        function.Reads.Expressions.Count != 0, function.Req.Count != 0,
         systemModuleManager);
     }
 
-    public static Type SelectAppropriateArrowType(IToken tok, List<Type> typeArgs, Type resultType, bool hasReads, bool hasReq, SystemModuleManager systemModuleManager) {
+    public static Type SelectAppropriateArrowType(IOrigin tok, List<Type> typeArgs, Type resultType, bool hasReads, bool hasReq, SystemModuleManager systemModuleManager) {
       Contract.Requires(tok != null);
       Contract.Requires(typeArgs != null);
       Contract.Requires(resultType != null);
@@ -4009,8 +3450,8 @@ public static Type SelectAppropriateArrowType(IToken tok, List<Type> typeArgs, T
     public void ConstrainToIntegerType(Expression expr, bool allowBitVector, string errFormat) {
       Contract.Requires(expr != null);
       Contract.Requires(errFormat != null);
-      var err = new TypeConstraint.ErrorMsgWithToken(expr.tok, errFormat, expr.Type);
-      ConstrainToIntegerType(expr.tok, expr.Type, allowBitVector, err);
+      var err = new TypeConstraint.ErrorMsgWithToken(expr.Origin, errFormat, expr.Type);
+      ConstrainToIntegerType(expr.Origin, expr.Type, allowBitVector, err);
     }
 
     /// <summary>
@@ -4067,13 +3508,13 @@ void ResolveCasePattern<VT>(CasePattern<VT> pat, Type sourceType, ResolutionCont
         if (resolutionContext.IsGhost) {
           v.MakeGhost();
         }
-        ResolveType(v.Tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+        ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         // Note, the following type constraint checks that the RHS type can be assigned to the new variable on the left. In particular, it
         // does not check that the entire RHS can be assigned to something of the type of the pattern on the left.  For example, consider
         // a type declared as "datatype Atom<T> = MakeAtom(T)", where T is a non-variant type argument.  Suppose the RHS has type Atom<nat>
         // and that the LHS is the pattern MakeAtom(x: int).  This is okay, despite the fact that Atom<nat> is not assignable to Atom<int>.
         // The reason is that the purpose of the pattern on the left is really just to provide a skeleton to introduce bound variables in.
-        EagerAddAssignableConstraint(v.Tok, v.Type, sourceType, "type of corresponding source/RHS ({1}) does not match type of bound variable ({0})");
+        EagerAddAssignableConstraint(v.Origin, v.Type, sourceType, "type of corresponding source/RHS ({1}) does not match type of bound variable ({0})");
         pat.AssembleExpr(null);
         return;
       }
@@ -4088,14 +3529,14 @@ void ResolveCasePattern<VT>(CasePattern<VT> pat, Type sourceType, ResolutionCont
           foreach (var xt in dtd.TypeArgs) {
             typeArgs.Add(new InferredTypeProxy());
           }
-          udt = new UserDefinedType(pat.tok, dtd.Name, dtd, typeArgs);
-          ConstrainSubtypeRelation(udt, sourceType, pat.tok, "type of RHS ({0}) does not match type of bound variable '{1}'", sourceType, pat.Id);
+          udt = new UserDefinedType(pat.Origin, dtd.Name, dtd, typeArgs);
+          ConstrainSubtypeRelation(udt, sourceType, pat.Origin, "type of RHS ({0}) does not match type of bound variable '{1}'", sourceType, pat.Id);
         }
       }
       if (dtd == null && ctor == null) {
-        reporter.Error(MessageSource.Resolver, pat.tok, "to use a pattern, the type of the source/RHS expression must be a datatype (instead found {0})", sourceType);
+        reporter.Error(MessageSource.Resolver, pat.Origin, "to use a pattern, the type of the source/RHS expression must be a datatype (instead found {0})", sourceType);
       } else if (ctor == null) {
-        reporter.Error(MessageSource.Resolver, pat.tok, "constructor {0} does not exist in datatype {1}", pat.Id, dtd.Name);
+        reporter.Error(MessageSource.Resolver, pat.Origin, "constructor {0} does not exist in datatype {1}", pat.Id, dtd.Name);
       } else {
         if (pat.Arguments == null) {
           if (ctor.Formals.Count == 0) {
@@ -4105,13 +3546,14 @@ void ResolveCasePattern<VT>(CasePattern<VT> pat, Type sourceType, ResolutionCont
           }
         } else {
           if (ctor.Formals.Count != pat.Arguments.Count) {
-            reporter.Error(MessageSource.Resolver, pat.tok, "pattern for constructor {0} has wrong number of formals (found {1}, expected {2})", pat.Id, pat.Arguments.Count, ctor.Formals.Count);
+            reporter.Error(MessageSource.Resolver, pat.Origin, "pattern for constructor {0} has wrong number of formals (found {1}, expected {2})", pat.Id, pat.Arguments.Count, ctor.Formals.Count);
           }
         }
         // build the type-parameter substitution map for this use of the datatype
         Contract.Assert(dtd.TypeArgs.Count == udt.TypeArgs.Count);  // follows from the type previously having been successfully resolved
         var subst = TypeParameter.SubstitutionMap(dtd.TypeArgs, udt.TypeArgs);
         // recursively call ResolveCasePattern on each of the arguments
+        var prevErrorCount = reporter.Count(ErrorLevel.Error);
         var j = 0;
         if (pat.Arguments != null) {
           foreach (var arg in pat.Arguments) {
@@ -4123,72 +3565,25 @@ void ResolveCasePattern<VT>(CasePattern<VT> pat, Type sourceType, ResolutionCont
             j++;
           }
         }
-        if (j == ctor.Formals.Count) {
+        if (reporter.Count(ErrorLevel.Error) == prevErrorCount && j == ctor.Formals.Count) {
           pat.AssembleExpr(udt.TypeArgs);
         }
       }
     }
 
-    private List<DefaultValueExpression> allDefaultValueExpressions = new();
+    internal readonly List<DefaultValueExpression> allDefaultValueExpressions = new();
 
     /// <summary>
     /// This method is called at the tail end of Pass1 of the Resolver.
     /// </summary>
-    void FillInDefaultValueExpressions() {
-      var visited = new Dictionary<DefaultValueExpression, WorkProgress>();
+    internal void FillInDefaultValueExpressions() {
+      var visited = new Dictionary<DefaultValueExpression, DefaultValueExpression.WorkProgress>();
       foreach (var e in allDefaultValueExpressions) {
-        FillInDefaultValueExpression(e, visited);
+        e.FillIn(this, visited);
       }
       allDefaultValueExpressions.Clear();
     }
 
-    enum WorkProgress { BeingVisited, Done }
-
-    void FillInDefaultValueExpression(DefaultValueExpression expr, Dictionary<DefaultValueExpression, WorkProgress> visited) {
-      Contract.Requires(expr != null);
-      Contract.Requires(visited != null);
-      Contract.Ensures(expr.ResolvedExpression != null);
-
-      if (visited.TryGetValue(expr, out var p)) {
-        if (p == WorkProgress.Done) {
-          Contract.Assert(expr.ResolvedExpression != null);
-        } else {
-          // there is a cycle
-          reporter.Error(MessageSource.Resolver, expr, "default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion");
-          // nevertheless, to avoid any issues in the resolver, fill in the .ResolvedExpression field with something
-          expr.ResolvedExpression = Expression.CreateBoolLiteral(expr.tok, false);
-        }
-        return;
-      }
-      Contract.Assert(expr.ResolvedExpression == null);
-
-      visited.Add(expr, WorkProgress.BeingVisited);
-      var s = new DefaultValueSubstituter(this, visited, expr.Receiver, expr.SubstMap, expr.TypeMap);
-      expr.ResolvedExpression = s.Substitute(expr.Formal.DefaultValue);
-      visited[expr] = WorkProgress.Done;
-    }
-
-    class DefaultValueSubstituter : Substituter {
-      private readonly ModuleResolver resolver;
-      private readonly Dictionary<DefaultValueExpression, WorkProgress> visited;
-      public DefaultValueSubstituter(ModuleResolver resolver, Dictionary<DefaultValueExpression, WorkProgress> visited,
-        Expression /*?*/ receiverReplacement, Dictionary<IVariable, Expression> substMap, Dictionary<TypeParameter, Type> typeMap)
-        : base(receiverReplacement, substMap, typeMap) {
-        Contract.Requires(resolver != null);
-        Contract.Requires(visited != null);
-        this.resolver = resolver;
-        this.visited = visited;
-      }
-
-      public override Expression Substitute(Expression expr) {
-        if (expr is DefaultValueExpression dve) {
-          resolver.FillInDefaultValueExpression(dve, visited);
-          Contract.Assert(dve.ResolvedExpression != null); // postcondition of FillInDefaultValueExpression
-        }
-        return base.Substitute(expr);
-      }
-    }
-
     public Dictionary<TypeParameter, Type> BuildTypeArgumentSubstitute(Dictionary<TypeParameter, Type> typeArgumentSubstitutions,
       Type/*?*/ receiverTypeBound = null) {
       Contract.Requires(typeArgumentSubstitutions != null);
@@ -4221,10 +3616,7 @@ public static Dictionary<TypeParameter, Type> AddParentTypeParameterSubstitution
         cl = udt?.ResolvedClass as TopLevelDeclWithMembers;
       }
       if (cl != null) {
-        foreach (var entry in cl.ParentFormalTypeParametersToActuals) {
-          var v = entry.Value.Subst(subst);
-          subst.Add(entry.Key, v);
-        }
+        cl.AddParentTypeParameterSubstitutions(subst);
       }
 
       return subst;
@@ -4244,37 +3636,43 @@ public ModuleSignature GetSignature(ModuleSignature sig) {
       return GetSignatureExt(sig);
     }
 
-    public static Expression GetImpliedTypeConstraint(IVariable bv, Type ty) {
-      return GetImpliedTypeConstraint(Expression.CreateIdentExpr(bv), ty);
+    public static Expression GetImpliedTypeConstraint(IVariable bv, Type type) {
+      return GetImpliedTypeConstraint(Expression.CreateIdentExpr(bv), type);
     }
 
-    public static Expression GetImpliedTypeConstraint(Expression e, Type ty) {
+    /// <summary>
+    /// Collects the constraints of all subset types and newtypes in "type" and applies these to "e".
+    /// For example, given
+    ///     type Even = x: int | x % 2 == 0
+    ///     newtype Div6 = y: Even | y % 3 == 0
+    /// GetImpliedTypeConstraint(e, Div6) returns
+    ///     true && ((e as Even) % 2 == 0) && e % 3 == 0
+    /// </summary>
+    public static Expression GetImpliedTypeConstraint(Expression e, Type type) {
       Contract.Requires(e != null);
-      Contract.Requires(ty != null);
-      ty = ty.NormalizeExpandKeepConstraints();
-      var udt = ty as UserDefinedType;
-      if (udt != null) {
-        if (udt.ResolvedClass is NewtypeDecl) {
-          var dd = (NewtypeDecl)udt.ResolvedClass;
-          var c = GetImpliedTypeConstraint(e, dd.BaseType);
-          if (dd.Var != null) {
-            Dictionary<IVariable, Expression/*!*/> substMap = new Dictionary<IVariable, Expression>();
-            substMap.Add(dd.Var, e);
-            Substituter sub = new Substituter(null, substMap, new Dictionary<TypeParameter, Type>());
-            c = Expression.CreateAnd(c, sub.Substitute(dd.Constraint));
+      Contract.Requires(type != null);
+      type = type.NormalizeExpandKeepConstraints();
+      if (type is UserDefinedType udt) {
+        Expression CombineConstraints(Type baseType, BoundVar boundVar, Expression constraint) {
+          var c = GetImpliedTypeConstraint(e, baseType);
+          if (boundVar != null) {
+            var ee = new ConversionExpr(e.Origin, e, boundVar.Type) { Type = boundVar.Type };
+            var substMap = new Dictionary<IVariable, Expression> { { boundVar, ee } };
+            var typeMap = TypeParameter.SubstitutionMap(udt.ResolvedClass.TypeArgs, udt.TypeArgs);
+            var substituter = new Substituter(null, substMap, typeMap);
+            c = Expression.CreateAnd(c, substituter.Substitute(constraint));
           }
           return c;
-        } else if (udt.ResolvedClass is SubsetTypeDecl) {
-          var dd = (SubsetTypeDecl)udt.ResolvedClass;
-          var c = GetImpliedTypeConstraint(e, dd.RhsWithArgument(udt.TypeArgs));
-          Dictionary<IVariable, Expression/*!*/> substMap = new Dictionary<IVariable, Expression>();
-          substMap.Add(dd.Var, e);
-          Substituter sub = new Substituter(null, substMap, new Dictionary<TypeParameter, Type>());
-          c = Expression.CreateAnd(c, sub.Substitute(dd.Constraint));
-          return c;
+        }
+
+        if (udt.ResolvedClass is NewtypeDecl newtypeDecl) {
+          return CombineConstraints(newtypeDecl.RhsWithArgument(udt.TypeArgs), newtypeDecl.Var, newtypeDecl.Constraint);
+        }
+        if (udt.ResolvedClass is SubsetTypeDecl subsetTypeDecl) {
+          return CombineConstraints(subsetTypeDecl.RhsWithArgument(udt.TypeArgs), subsetTypeDecl.Var, subsetTypeDecl.Constraint);
         }
       }
-      return Expression.CreateBoolLiteral(e.tok, true);
+      return Expression.CreateBoolLiteral(e.Origin, true);
     }
 
     /// <summary>
@@ -4330,7 +3728,7 @@ public static ISet<IVariable> FreeVariables(Expression expr) {
         if (e.Range != null) {
           s.UnionWith(FreeVariables(e.Range));
         }
-        foreach (var fe in e.Reads) {
+        foreach (var fe in e.Reads.Expressions) {
           s.UnionWith(FreeVariables(fe.E));
         }
         foreach (var bv in e.BoundVars) {
@@ -4384,7 +3782,7 @@ public override string Msg {
         }
       }
 
-      public SeqSelectOneErrorMsg(IToken tok, Type exprSeqType, Type expectedSeqType)
+      public SeqSelectOneErrorMsg(IOrigin tok, Type exprSeqType, Type expectedSeqType)
         : base(tok, BASE_MESSAGE_FORMAT, exprSeqType, expectedSeqType) {
         Contract.Requires(exprSeqType != null);
         Contract.Requires(expectedSeqType != null);
@@ -4402,8 +3800,8 @@ public SeqSelectOneErrorMsg(IToken tok, Type exprSeqType, Type expectedSeqType)
     public static BinaryExpr.ResolvedOpcode ResolveOp(BinaryExpr.Opcode op, Type leftOperandType, Type operandType) {
       Contract.Requires(leftOperandType != null);
       Contract.Requires(operandType != null);
-      leftOperandType = leftOperandType.NormalizeExpand();
-      operandType = operandType.NormalizeExpand();
+      leftOperandType = leftOperandType.NormalizeToAncestorType();
+      operandType = operandType.NormalizeToAncestorType();
       switch (op) {
         case BinaryExpr.Opcode.Iff: return BinaryExpr.ResolvedOpcode.Iff;
         case BinaryExpr.Opcode.Imp: return BinaryExpr.ResolvedOpcode.Imp;
@@ -4571,7 +3969,7 @@ public static BinaryExpr.ResolvedOpcode ResolveOp(BinaryExpr.Opcode op, Type lef
     void CollectFriendlyCallsInExtremeLemmaSpecification(Expression expr, bool position, ISet<Expression> friendlyCalls, bool co, ExtremeLemma context) {
       Contract.Requires(expr != null);
       Contract.Requires(friendlyCalls != null);
-      var visitor = new CollectFriendlyCallsInSpec_Visitor(reporter, friendlyCalls, co, context);
+      var visitor = new CollectFriendlyCallsInSpecVisitor(reporter, friendlyCalls, co, context);
       visitor.Visit(expr, position ? CallingPosition.Positive : CallingPosition.Negative);
     }
   }
diff --git a/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/CheckTypeInferenceVisitor.cs b/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/CheckTypeInferenceVisitor.cs
index 25083acdf6e..b6e22ac4084 100644
--- a/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/CheckTypeInferenceVisitor.cs
+++ b/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/CheckTypeInferenceVisitor.cs
@@ -28,15 +28,15 @@ protected override void VisitOneDeclaration(TopLevelDecl decl) {
     if (decl is NewtypeDecl newtypeDecl) {
       if (newtypeDecl.Var != null) {
         if (!IsDetermined(newtypeDecl.BaseType.NormalizeExpand())) {
-          resolver.ReportError(ResolutionErrors.ErrorId.r_newtype_base_undetermined, newtypeDecl.tok, "newtype's base type is not fully determined; add an explicit type for '{0}'",
-            newtypeDecl.Var.Name);
+          resolver.ReportError(ResolutionErrors.ErrorId.r_newtype_base_undetermined, newtypeDecl.Origin,
+            $"base type of {newtypeDecl.WhatKindAndName} is not fully determined; add an explicit type for bound variable '{newtypeDecl.Var.Name}'");
         }
       }
 
     } else if (decl is SubsetTypeDecl subsetTypeDecl) {
       if (!IsDetermined(subsetTypeDecl.Rhs.NormalizeExpand())) {
-        resolver.ReportError(ResolutionErrors.ErrorId.r_subset_type_base_undetermined, subsetTypeDecl.tok,
-          "subset type's base type is not fully determined; add an explicit type for '{0}'", subsetTypeDecl.Var.Name);
+        resolver.ReportError(ResolutionErrors.ErrorId.r_subset_type_base_undetermined, subsetTypeDecl.Origin,
+          $"base type of {subsetTypeDecl.WhatKindAndName} is not fully determined; add an explicit type for bound variable '{subsetTypeDecl.Var.Name}'");
       }
 
     } else if (decl is DatatypeDecl datatypeDecl) {
@@ -61,7 +61,7 @@ protected override void VisitOneDeclaration(TopLevelDecl decl) {
   public override void VisitField(Field field) {
     if (field is ConstantField constantField) {
       resolver.PartiallySolveTypeConstraints(true);
-      CheckTypeIsDetermined(field.tok, field.Type, "const");
+      CheckTypeIsDetermined(field.Origin, field.Type, "const");
     }
 
     base.VisitField(field);
@@ -86,23 +86,23 @@ protected override void PostVisitOneStatement(Statement stmt, TypeInferenceCheck
     if (stmt is VarDeclStmt) {
       var s = (VarDeclStmt)stmt;
       foreach (var local in s.Locals) {
-        CheckTypeIsDetermined(local.Tok, local.Type, "local variable");
-        CheckTypeArgsContainNoOrdinal(local.Tok, local.type, context);
+        CheckTypeIsDetermined(local.Origin, local.Type, "local variable");
+        CheckTypeArgsContainNoOrdinal(local.Origin, local.type, context);
       }
     } else if (stmt is VarDeclPattern) {
       var s = (VarDeclPattern)stmt;
-      s.LocalVars.ForEach(local => CheckTypeIsDetermined(local.Tok, local.Type, "local variable"));
-      s.LocalVars.ForEach(local => CheckTypeArgsContainNoOrdinal(local.Tok, local.Type, context));
+      s.LocalVars.ForEach(local => CheckTypeIsDetermined(local.Origin, local.Type, "local variable"));
+      s.LocalVars.ForEach(local => CheckTypeArgsContainNoOrdinal(local.Origin, local.Type, context));
 
     } else if (stmt is ForallStmt) {
       var s = (ForallStmt)stmt;
-      s.BoundVars.ForEach(bv => CheckTypeIsDetermined(bv.tok, bv.Type, "bound variable"));
-      s.BoundVars.ForEach(bv => CheckTypeArgsContainNoOrdinal(bv.tok, bv.Type, context));
+      s.BoundVars.ForEach(bv => CheckTypeIsDetermined(bv.Origin, bv.Type, "bound variable"));
+      s.BoundVars.ForEach(bv => CheckTypeArgsContainNoOrdinal(bv.Origin, bv.Type, context));
 
     } else if (stmt is AssignSuchThatStmt) {
       var s = (AssignSuchThatStmt)stmt;
       foreach (var lhs in s.Lhss) {
-        CheckTypeArgsContainNoOrdinal(lhs.tok, lhs.Type, context);
+        CheckTypeArgsContainNoOrdinal(lhs.Origin, lhs.Type, context);
       }
     }
 
@@ -116,21 +116,21 @@ protected override void PostVisitOneExpression(Expression expr, TypeInferenceChe
         var n = (BigInteger)e.Value;
         var absN = n < 0 ? -n : n;
         // For bitvectors, check that the magnitude fits the width
-        if (e.Type.IsBitVectorType && ModuleResolver.MaxBV(e.Type.AsBitVectorType.Width) < absN) {
-          resolver.ReportError(ResolutionErrors.ErrorId.r_literal_too_large_for_bitvector, e.tok, "literal ({0}) is too large for the bitvector type {1}", absN, e.Type);
+        if (e.Type.IsBitVectorType && ConstantFolder.MaxBv(e.Type.AsBitVectorType.Width) < absN) {
+          resolver.ReportError(ResolutionErrors.ErrorId.r_literal_too_large_for_bitvector, e.Origin, "literal ({0}) is too large for the bitvector type {1}", absN, e.Type);
         }
         // For bitvectors and ORDINALs, check for a unary minus that, earlier, was mistaken for a negative literal
         // This can happen only in `match` patterns (see comment by LitPattern.OptimisticallyDesugaredLit).
-        if (n < 0 || e.tok.val == "-0") {
-          Contract.Assert(e.tok.val == "-0");  // this and the "if" above tests that "n < 0" happens only when the token is "-0"
-          resolver.ReportError(ResolutionErrors.ErrorId.r_no_unary_minus_in_case_patterns, e.tok, "unary minus (-{0}, type {1}) not allowed in case pattern", absN, e.Type);
+        if (n < 0 || e.Origin.val == "-0") {
+          Contract.Assert(e.Origin.val == "-0");  // this and the "if" above tests that "n < 0" happens only when the token is "-0"
+          resolver.ReportError(ResolutionErrors.ErrorId.r_no_unary_minus_in_case_patterns, e.Origin, "unary minus (-{0}, type {1}) not allowed in case pattern", absN, e.Type);
         }
       }
 
       if (expr is StaticReceiverExpr stexpr) {
         foreach (Type t in stexpr.Type.TypeArgs) {
           if (t is InferredTypeProxy && ((InferredTypeProxy)t).T == null) {
-            resolver.ReportError(ResolutionErrors.ErrorId.r_type_parameter_undetermined, stexpr.tok, "type of type parameter could not be determined; please specify the type explicitly");
+            resolver.ReportError(ResolutionErrors.ErrorId.r_type_parameter_undetermined, stexpr.Origin, "type of type parameter could not be determined; please specify the type explicitly");
           }
         }
       }
@@ -139,10 +139,10 @@ protected override void PostVisitOneExpression(Expression expr, TypeInferenceChe
       var e = (ComprehensionExpr)expr;
       foreach (var bv in e.BoundVars) {
         if (!IsDetermined(bv.Type.Normalize())) {
-          resolver.ReportError(ResolutionErrors.ErrorId.r_bound_variable_undetermined, bv.tok,
+          resolver.ReportError(ResolutionErrors.ErrorId.r_bound_variable_undetermined, bv.Origin,
             $"type of bound variable '{bv.Name}' could not be determined; please specify the type explicitly");
         } else if (context.IsExtremePredicate) {
-          CheckContainsNoOrdinal(ResolutionErrors.ErrorId.r_bound_variable_may_not_be_ORDINAL, bv.tok, bv.Type, $"type of bound variable '{bv.Name}' ('{bv.Type}') is not allowed to use type ORDINAL");
+          CheckContainsNoOrdinal(ResolutionErrors.ErrorId.r_bound_variable_may_not_be_ORDINAL, bv.Origin, bv.Type, $"type of bound variable '{bv.Name}' ('{bv.Type}') is not allowed to use type ORDINAL");
         }
       }
 
@@ -150,7 +150,7 @@ protected override void PostVisitOneExpression(Expression expr, TypeInferenceChe
         var binBody = ((ExistsExpr)e).Term as BinaryExpr;
         if (binBody != null && binBody.Op == BinaryExpr.Opcode.Imp) {  // check Op, not ResolvedOp, in order to distinguish ==> and <==
           // apply the wisdom of Claude Marche: issue a warning here
-          resolver.ReportWarning(ResolutionErrors.ErrorId.r_exists_quantifier_warning, e.tok,
+          resolver.ReportWarning(ResolutionErrors.ErrorId.r_exists_quantifier_warning, e.Origin,
             "the quantifier has the form 'exists x :: A ==> B', which most often is a typo for 'exists x :: A && B'; " +
             "if you think otherwise, rewrite as 'exists x :: (A ==> B)' or 'exists x :: !A || B' to suppress this warning");
         }
@@ -160,15 +160,22 @@ protected override void PostVisitOneExpression(Expression expr, TypeInferenceChe
       var e = (MemberSelectExpr)expr;
       if (e.Member is Function || e.Member is Method) {
         var i = 0;
-        foreach (var p in Util.Concat(e.TypeApplication_AtEnclosingClass, e.TypeApplication_JustMember)) {
-          var tp = i < e.TypeApplication_AtEnclosingClass.Count
-            ? e.Member.EnclosingClass.TypeArgs[i]
-            : ((ICallable)e.Member).TypeArgs[i - e.TypeApplication_AtEnclosingClass.Count];
+        foreach (var p in Util.Concat(e.TypeApplicationAtEnclosingClass, e.TypeApplicationJustMember)) {
+          var tp = i < e.TypeApplicationAtEnclosingClass.Count ?
+              (e.Member.EnclosingClass is DefaultClassDecl ?
+                // In a "revealedFunction" attribute, the EnclosingClass is DefaultClassDecl
+                // and does not have type arguments
+                null :
+                e.Member.EnclosingClass.TypeArgs[i])
+            : ((ICallable)e.Member).TypeArgs[i - e.TypeApplicationAtEnclosingClass.Count];
+          if (tp == null) {
+            continue;
+          }
           if (!IsDetermined(p.Normalize())) {
-            resolver.ReportError(ResolutionErrors.ErrorId.r_type_parameter_not_determined, e.tok,
+            resolver.ReportError(ResolutionErrors.ErrorId.r_type_parameter_not_determined, e.Origin,
               $"type parameter '{tp.Name}' (inferred to be '{p}') to the {e.Member.WhatKind} '{e.Member.Name}' could not be determined");
           } else if (!context.IsPrefixPredicate) { // this check is done in extreme predicates, so no need to repeat it here for prefix predicates
-            CheckContainsNoOrdinal(ResolutionErrors.ErrorId.r_type_parameter_may_not_be_ORDINAL, e.tok, p,
+            CheckContainsNoOrdinal(ResolutionErrors.ErrorId.r_type_parameter_may_not_be_ORDINAL, e.Origin, p,
               $"type parameter '{tp.Name}' (passed in as '{p}') to the {e.Member.WhatKind} '{e.Member.Name}' is not allowed to use ORDINAL");
           }
           i++;
@@ -182,13 +189,13 @@ protected override void PostVisitOneExpression(Expression expr, TypeInferenceChe
           ? e.Function.EnclosingClass.TypeArgs[i]
           : e.Function.TypeArgs[i - e.TypeApplication_AtEnclosingClass.Count];
         if (!IsDetermined(p.Normalize())) {
-          var hint = e.Name.StartsWith("reveal_")
+          var hint = e.Name.StartsWith(HideRevealStmt.RevealLemmaPrefix)
             ? ". If you are making an opaque function, make sure that the function can be called."
             : "";
-          resolver.ReportError(ResolutionErrors.ErrorId.r_function_type_parameter_undetermined, e.tok,
+          resolver.ReportError(ResolutionErrors.ErrorId.r_function_type_parameter_undetermined, e.Origin,
             $"type parameter '{tp.Name}' (inferred to be '{p}') in the function call to '{e.Name}' could not be determined{hint}");
         } else if (!context.IsPrefixPredicate) { // this check is done in extreme predicates, so no need to repeat it here for prefix predicates
-          CheckContainsNoOrdinal(ResolutionErrors.ErrorId.r_function_type_parameter_may_not_be_ORDINAL, e.tok, p,
+          CheckContainsNoOrdinal(ResolutionErrors.ErrorId.r_function_type_parameter_may_not_be_ORDINAL, e.Origin, p,
             $"type parameter '{tp.Name}' (passed in as '{p}') to function call '{e.Name}' is not allowed to use ORDINAL");
         }
         i++;
@@ -198,47 +205,59 @@ protected override void PostVisitOneExpression(Expression expr, TypeInferenceChe
       foreach (var p in e.LHSs) {
         foreach (var x in p.Vars) {
           if (!IsDetermined(x.Type.Normalize())) {
-            resolver.ReportError(ResolutionErrors.ErrorId.r_bound_variable_type_undetermined, x.tok, $"the type of the bound variable '{x.Name}' could not be determined");
+            resolver.ReportError(ResolutionErrors.ErrorId.r_bound_variable_type_undetermined, x.Origin, $"the type of the bound variable '{x.Name}' could not be determined");
           } else {
-            CheckTypeArgsContainNoOrdinal(x.tok, x.Type, context);
+            CheckTypeArgsContainNoOrdinal(x.Origin, x.Type, context);
           }
         }
       }
     } else if (expr is IdentifierExpr) {
       // by specializing for IdentifierExpr, error messages will be clearer
-      CheckTypeIsDetermined(expr.tok, expr.Type, "variable");
+      CheckTypeIsDetermined(expr.Origin, expr.Type, "variable");
     } else if (expr is ConversionExpr) {
       var e = (ConversionExpr)expr;
-      if (e.ToType.IsRefType) {
-        var fromType = e.E.Type;
-        Contract.Assert(resolver.Options.Get(CommonOptionBag.GeneralTraits) || fromType.IsRefType);
-        if (fromType.IsSubtypeOf(e.ToType, false, true) || e.ToType.IsSubtypeOf(fromType, false, true)) {
-          // looks good
-        } else {
-          resolver.ReportError(ResolutionErrors.ErrorId.r_never_succeeding_type_cast, e.tok,
-            "a type cast to a reference type ({0}) must be from a compatible type (got {1}); this cast could never succeed",
-            e.ToType, fromType);
+      CheckTypeIsDetermined(e.Origin, e.ToType, "as-expression");
+
+      // In the resolver refresh, the restrictions on "as" are checked as a post-inference confirmation. But in the
+      // legacy resolver, the restrictions on "as" are checked here.
+      if (!resolver.Options.Get(CommonOptionBag.TypeSystemRefresh)) {
+        if (e.ToType.IsRefType) {
+          var fromType = e.E.Type;
+          Contract.Assert(resolver.Options.Get(CommonOptionBag.GeneralTraits) != CommonOptionBag.GeneralTraitsOptions.Legacy || fromType.IsRefType);
+          if (fromType.IsSubtypeOf(e.ToType, false, true) || e.ToType.IsSubtypeOf(fromType, false, true)) {
+            // looks good
+          } else {
+            resolver.ReportError(ResolutionErrors.ErrorId.r_never_succeeding_type_cast, e.Origin,
+              "a type cast to a reference type ({0}) must be from a compatible type (got {1}); this cast could never succeed",
+              e.ToType, fromType);
+          }
         }
       }
     } else if (expr is TypeTestExpr) {
       var e = (TypeTestExpr)expr;
-      var fromType = e.E.Type;
-      if (fromType.IsSubtypeOf(e.ToType, false, true)) {
-        // This test is allowed and it always returns true
-      } else if (!e.ToType.IsSubtypeOf(fromType, false, true)) {
-        resolver.ReportError(ResolutionErrors.ErrorId.r_never_succeeding_type_test, e.tok,
-          "a type test to '{0}' must be from a compatible type (got '{1}')", e.ToType, fromType);
-      } else if (resolver.Options.Get(CommonOptionBag.GeneralTraits) && (fromType.IsTraitType || fromType.Equals(e.ToType))) {
-        // it's fine
-      } else if (!e.ToType.IsRefType) {
-        resolver.ReportError(ResolutionErrors.ErrorId.r_unsupported_type_test, e.tok,
-          "a non-trivial type test is allowed only for reference types (tried to test if '{1}' is a '{0}')", e.ToType, fromType);
+      CheckTypeIsDetermined(e.Origin, e.ToType, "is-expression");
+
+      // In the resolver refresh, the restrictions on "is" are checked as a post-inference confirmation. But in the
+      // legacy resolver, the restrictions on "is" are checked here.
+      if (!resolver.Options.Get(CommonOptionBag.TypeSystemRefresh)) {
+        var fromType = e.E.Type;
+        if (fromType.IsSubtypeOf(e.ToType, false, true)) {
+          // This test is allowed and it always returns true
+        } else if (!e.ToType.IsSubtypeOf(fromType, false, true)) {
+          resolver.ReportError(ResolutionErrors.ErrorId.r_never_succeeding_type_test, e.Origin,
+            "a type test to '{0}' must be from a compatible type (got '{1}')", e.ToType, fromType);
+        } else if (resolver.Options.Get(CommonOptionBag.GeneralTraits) != CommonOptionBag.GeneralTraitsOptions.Legacy && (fromType.IsTraitType || fromType.Equals(e.ToType))) {
+          // it's fine
+        } else if (!e.ToType.IsRefType && !e.ToType.IsTraitType) {
+          resolver.ReportError(ResolutionErrors.ErrorId.r_unsupported_type_test, e.Origin,
+            "a non-trivial type test is allowed only for reference types (tried to test if '{1}' is a '{0}')", e.ToType, fromType);
+        }
       }
-    } else if (CheckTypeIsDetermined(expr.tok, expr.Type, "expression")) {
+    } else if (CheckTypeIsDetermined(expr.Origin, expr.Type, "expression")) {
       if (expr is UnaryOpExpr uop) {
         // The CheckTypeInference_Visitor has already visited uop.E, but uop.E's may be undetermined. If that happened,
         // then an error has already been reported.
-        if (CheckTypeIsDetermined(uop.E.tok, uop.E.Type, "expression")) {
+        if (CheckTypeIsDetermined(uop.E.Origin, uop.E.Type, "expression")) {
           uop.ResolveOp(); // Force resolution eagerly at this point to catch potential bugs
         }
       } else if (expr is BinaryExpr) {
@@ -281,12 +300,12 @@ protected override void PostVisitOneExpression(Expression expr, TypeInferenceChe
                     var possiblyNullTypeDecl = (ClassLikeDecl)possiblyNullUdf.ResolvedClass;
                     Contract.Assert(nonNullTypeDecl.TypeArgs.Count == possiblyNullTypeDecl.TypeArgs.Count);
                     Contract.Assert(nonNullTypeDecl.TypeArgs.Count == nntUdf.TypeArgs.Count);
-                    var ty = new UserDefinedType(nntUdf.tok, possiblyNullUdf.Name, possiblyNullTypeDecl, nntUdf.TypeArgs);
+                    var ty = new UserDefinedType(nntUdf.Origin, possiblyNullUdf.Name, possiblyNullTypeDecl, nntUdf.TypeArgs);
 
                     hint = $" (to make it possible for {name} to have the value 'null', declare its type to be '{ty}')";
                   }
                   var b = sense ? "false" : "true";
-                  resolver.ReportWarning(ResolutionErrors.ErrorId.r_trivial_null_test, e.tok,
+                  resolver.ReportWarning(ResolutionErrors.ErrorId.r_trivial_null_test, e.Origin,
                     $"the type of the other operand is a non-null type, so this comparison with 'null' will always return '{b}'{hint}");
                 }
                 break;
@@ -304,7 +323,7 @@ protected override void PostVisitOneExpression(Expression expr, TypeInferenceChe
                 if (((CollectionType)ty).Arg.IsNonNullRefType) {
                   var non = sense ? "" : "non-";
                   var b = sense ? "false" : "true";
-                  resolver.ReportWarning(ResolutionErrors.ErrorId.r_trivial_null_inclusion_test, e.tok,
+                  resolver.ReportWarning(ResolutionErrors.ErrorId.r_trivial_null_inclusion_test, e.Origin,
                     $"the type of the other operand is a {what} of non-null elements, so the {non}inclusion test of 'null' will always return '{b}'");
                 }
                 break;
@@ -315,7 +334,7 @@ protected override void PostVisitOneExpression(Expression expr, TypeInferenceChe
                 var ty = other.Type.NormalizeExpand();
                 if (((MapType)ty).Domain.IsNonNullRefType) {
                   var b = sense ? "false" : "true";
-                  resolver.ReportWarning(ResolutionErrors.ErrorId.r_trivial_map_null_inclusion_test, e.tok,
+                  resolver.ReportWarning(ResolutionErrors.ErrorId.r_trivial_map_null_inclusion_test, e.Origin,
                     $"the type of the other operand is a map to a non-null type, so the inclusion test of 'null' will always return '{b}'");
                 }
                 break;
@@ -333,24 +352,24 @@ protected override void PostVisitOneExpression(Expression expr, TypeInferenceChe
           if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
             var d = (BaseTypes.BigDec)lit.Value;
             Contract.Assert(!d.IsNegative);
-            resolved = new LiteralExpr(e.tok, -d);
+            resolved = new LiteralExpr(e.Origin, -d);
           } else if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
             var n = (BigInteger)lit.Value;
             Contract.Assert(0 <= n);
-            resolved = new LiteralExpr(e.tok, -n);
+            resolved = new LiteralExpr(e.Origin, -n);
           }
         }
         if (resolved == null) {
           // Treat all other expressions "-e" as "0 - e"
           Expression zero;
           if (e.E.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-            zero = new LiteralExpr(e.tok, BaseTypes.BigDec.ZERO);
+            zero = new LiteralExpr(e.Origin, BaseTypes.BigDec.ZERO);
           } else {
-            Contract.Assert(e.E.Type.IsNumericBased(Type.NumericPersuasion.Int) || e.E.Type.IsBitVectorType);
-            zero = new LiteralExpr(e.tok, 0);
+            Contract.Assert(e.E.Type.IsNumericBased(Type.NumericPersuasion.Int) || e.E.Type.NormalizeToAncestorType().IsBitVectorType);
+            zero = new LiteralExpr(e.Origin, 0);
           }
           zero.Type = expr.Type;
-          resolved = new BinaryExpr(e.tok, BinaryExpr.Opcode.Sub, zero, e.E) { ResolvedOp = BinaryExpr.ResolvedOpcode.Sub };
+          resolved = new BinaryExpr(e.Origin, BinaryExpr.Opcode.Sub, zero, e.E) { ResolvedOp = BinaryExpr.ResolvedOpcode.Sub };
         }
         resolved.Type = expr.Type;
         e.ResolvedExpression = resolved;
@@ -364,7 +383,7 @@ protected override void VisitExtendedPattern(ExtendedPattern pattern, TypeInfere
     base.VisitExtendedPattern(pattern, context);
 
     if (pattern is IdPattern { BoundVar: { } bv }) {
-      CheckTypeIsDetermined(bv.Tok, bv.Type, "bound variable");
+      CheckTypeIsDetermined(bv.Origin, bv.Type, "bound variable");
     }
   }
 
@@ -377,7 +396,7 @@ public static bool IsDetermined(Type t) {
 
   readonly ISet<TypeProxy> UnderspecifiedTypeProxies = new HashSet<TypeProxy>();
 
-  public bool CheckTypeIsDetermined(IToken tok, Type t, string what) {
+  public bool CheckTypeIsDetermined(IOrigin tok, Type t, string what) {
     Contract.Requires(tok != null);
     Contract.Requires(t != null);
     Contract.Requires(what != null);
@@ -396,7 +415,7 @@ public bool CheckTypeIsDetermined(IToken tok, Type t, string what) {
     return t.TypeArgs.All(rg => CheckTypeIsDetermined(tok, rg, what));
   }
 
-  public void CheckTypeArgsContainNoOrdinal(IToken tok, Type t, TypeInferenceCheckingContext context) {
+  public void CheckTypeArgsContainNoOrdinal(IOrigin tok, Type t, TypeInferenceCheckingContext context) {
     Contract.Requires(tok != null);
     Contract.Requires(t != null);
     if (context.IsPrefixDeclaration) {
@@ -408,7 +427,7 @@ public void CheckTypeArgsContainNoOrdinal(IToken tok, Type t, TypeInferenceCheck
     }
   }
 
-  public void CheckContainsNoOrdinal(ResolutionErrors.ErrorId errorId, IToken tok, Type t, string errMsg) {
+  public void CheckContainsNoOrdinal(ResolutionErrors.ErrorId errorId, IOrigin tok, Type t, string errMsg) {
     Contract.Requires(tok != null);
     Contract.Requires(t != null);
     Contract.Requires(errMsg != null);
diff --git a/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/NameResolutionAndTypeInference.cs b/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/NameResolutionAndTypeInference.cs
index 58488bc30ab..ac71d0f166d 100644
--- a/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/NameResolutionAndTypeInference.cs
+++ b/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/NameResolutionAndTypeInference.cs
@@ -13,20 +13,30 @@
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Reflection;
+using DafnyCore;
 using JetBrains.Annotations;
 using Microsoft.BaseTypes;
-using Microsoft.Boogie;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.Dafny.Plugins;
 
 namespace Microsoft.Dafny {
   public partial class ModuleResolver {
-    List<Statement> loopStack = new List<Statement>();  // the enclosing loops (from which it is possible to break out)
-    public readonly Scope<Label>/*!*/ DominatingStatementLabels;
-    Scope<Statement>/*!*/ enclosingStatementLabels;
+    public List<Statement> loopStack = new List<Statement>();  // the enclosing loops (from which it is possible to break out)
+    public Scope<Label>/*!*/ DominatingStatementLabels { get; private set; }
+
+    public Scope<Statement> EnclosingStatementLabels {
+      get => enclosingStatementLabels;
+      set => enclosingStatementLabels = value;
+    }
+
+    public List<Statement> LoopStack {
+      get => loopStack;
+      set => loopStack = value;
+    }
+
+    public Scope<Statement>/*!*/ enclosingStatementLabels;
     public Method currentMethod;
 
-    Label/*?*/ ResolveDominatingLabelInExpr(IToken tok, string/*?*/ labelName, string expressionDescription, ResolutionContext resolutionContext) {
+    Label/*?*/ ResolveDominatingLabelInExpr(IOrigin tok, string/*?*/ labelName, string expressionDescription, ResolutionContext resolutionContext) {
       Contract.Requires(tok != null);
       Contract.Requires(expressionDescription != null);
       Contract.Requires(resolutionContext != null);
@@ -75,10 +85,10 @@ void ResolveNamesAndInferTypes(List<TopLevelDecl> declarations, bool initialRoun
     void ResolveNamesAndInferTypesForOneDeclarationInitial(TopLevelDecl topd) {
       if (topd is NewtypeDecl newtypeDecl) {
         // this check can be done only after it has been determined that the redirected types do not involve cycles
-        AddXConstraint(newtypeDecl.tok, "NumericType", newtypeDecl.BaseType, "newtypes must be based on some numeric type (got {0})");
+        AddXConstraint(newtypeDecl.Origin, "NumericType", newtypeDecl.BaseType, "newtypes must be based on some numeric type (got {0})");
         // type check the constraint, if any
         if (newtypeDecl.Var != null) {
-          Contract.Assert(object.ReferenceEquals(newtypeDecl.Var.Type, newtypeDecl.BaseType.NormalizeExpand(true)));  // follows from NewtypeDecl invariant
+          Contract.Assert(object.ReferenceEquals(newtypeDecl.Var.Type.NormalizeExpand(true), newtypeDecl.BaseType.NormalizeExpand(true)));  // follows from NewtypeDecl invariant
           Contract.Assert(newtypeDecl.Constraint != null);  // follows from NewtypeDecl invariant
 
           scope.PushMarker();
@@ -120,7 +130,7 @@ void ResolveNamesAndInferTypesForOneDeclaration(TopLevelDecl topd) {
           scope.AllowInstance = false;
           ResolveExpression(newtypeDecl.Witness, new ResolutionContext(codeContext, false));
           scope.PopMarker();
-          ConstrainSubtypeRelation(newtypeDecl.Var.Type, newtypeDecl.Witness.Type, newtypeDecl.Witness, "witness expression must have type '{0}' (got '{1}')", newtypeDecl.Var.Type, newtypeDecl.Witness.Type);
+          ConstrainSubtypeRelation(newtypeDecl.BaseType, newtypeDecl.Witness.Type, newtypeDecl.Witness, "witness expression must have type '{0}' (got '{1}')", newtypeDecl.BaseType, newtypeDecl.Witness.Type);
         }
         SolveAllTypeConstraints();
 
@@ -166,7 +176,7 @@ void ResolveNamesAndInferTypesForOneDeclaration(TopLevelDecl topd) {
       scope.PopMarker();
     }
 
-    void EagerAddAssignableConstraint(IToken tok, Type lhs, Type rhs, string errMsgFormat) {
+    void EagerAddAssignableConstraint(IOrigin tok, Type lhs, Type rhs, string errMsgFormat) {
       Contract.Requires(tok != null);
       Contract.Requires(lhs != null);
       Contract.Requires(rhs != null);
@@ -180,14 +190,14 @@ void EagerAddAssignableConstraint(IToken tok, Type lhs, Type rhs, string errMsgF
         AddAssignableConstraint(tok, lhs, rhs, errMsgFormat);
       }
     }
-    public void AddAssignableConstraint(IToken tok, Type lhs, Type rhs, string errMsgFormat) {
+    public void AddAssignableConstraint(IOrigin tok, Type lhs, Type rhs, string errMsgFormat) {
       Contract.Requires(tok != null);
       Contract.Requires(lhs != null);
       Contract.Requires(rhs != null);
       Contract.Requires(errMsgFormat != null);
       AddXConstraint(tok, "Assignable", lhs, rhs, errMsgFormat);
     }
-    private void AddXConstraint(IToken tok, string constraintName, Type type, string errMsgFormat) {
+    private void AddXConstraint(IOrigin tok, string constraintName, Type type, string errMsgFormat) {
       Contract.Requires(tok != null);
       Contract.Requires(constraintName != null);
       Contract.Requires(type != null);
@@ -195,7 +205,7 @@ private void AddXConstraint(IToken tok, string constraintName, Type type, string
       var types = new Type[] { type };
       AllXConstraints.Add(new XConstraint(tok, constraintName, types, new TypeConstraint.ErrorMsgWithToken(tok, errMsgFormat, types)));
     }
-    void AddAssignableConstraint(IToken tok, Type lhs, Type rhs, TypeConstraint.ErrorMsg errMsg) {
+    void AddAssignableConstraint(IOrigin tok, Type lhs, Type rhs, TypeConstraint.ErrorMsg errMsg) {
       Contract.Requires(tok != null);
       Contract.Requires(lhs != null);
       Contract.Requires(rhs != null);
@@ -203,7 +213,7 @@ void AddAssignableConstraint(IToken tok, Type lhs, Type rhs, TypeConstraint.Erro
       AddXConstraint(tok, "Assignable", lhs, rhs, errMsg);
     }
 
-    public void AddXConstraint(IToken tok, string constraintName, Type type, TypeConstraint.ErrorMsg errMsg) {
+    public void AddXConstraint(IOrigin tok, string constraintName, Type type, TypeConstraint.ErrorMsg errMsg) {
       Contract.Requires(tok != null);
       Contract.Requires(constraintName != null);
       Contract.Requires(type != null);
@@ -212,7 +222,7 @@ public void AddXConstraint(IToken tok, string constraintName, Type type, TypeCon
       AllXConstraints.Add(new XConstraint(tok, constraintName, types, errMsg));
     }
 
-    public void AddXConstraint(IToken tok, string constraintName, Type type0, Type type1, string errMsgFormat) {
+    public void AddXConstraint(IOrigin tok, string constraintName, Type type0, Type type1, string errMsgFormat) {
       Contract.Requires(tok != null);
       Contract.Requires(constraintName != null);
       Contract.Requires(type0 != null);
@@ -222,7 +232,7 @@ public void AddXConstraint(IToken tok, string constraintName, Type type0, Type t
       AllXConstraints.Add(new XConstraint(tok, constraintName, types, new TypeConstraint.ErrorMsgWithToken(tok, errMsgFormat, types)));
     }
 
-    public void AddXConstraint(IToken tok, string constraintName, Type type0, Type type1, TypeConstraint.ErrorMsg errMsg) {
+    public void AddXConstraint(IOrigin tok, string constraintName, Type type0, Type type1, TypeConstraint.ErrorMsg errMsg) {
       Contract.Requires(tok != null);
       Contract.Requires(constraintName != null);
       Contract.Requires(type0 != null);
@@ -231,7 +241,7 @@ public void AddXConstraint(IToken tok, string constraintName, Type type0, Type t
       var types = new Type[] { type0, type1 };
       AllXConstraints.Add(new XConstraint(tok, constraintName, types, errMsg));
     }
-    private void AddXConstraint(IToken tok, string constraintName, Type type, Expression expr0, Expression expr1, string errMsgFormat) {
+    private void AddXConstraint(IOrigin tok, string constraintName, Type type, Expression expr0, Expression expr1, string errMsgFormat) {
       Contract.Requires(tok != null);
       Contract.Requires(constraintName != null);
       Contract.Requires(type != null);
@@ -309,15 +319,21 @@ public void ResolveAttributes(IAttributeBearingDeclaration attributeHost, Resolu
 
       // order does not matter much for resolution, so resolve them in reverse order
       foreach (var attr in attributeHost.Attributes.AsEnumerable()) {
-        if (attr is UserSuppliedAttributes) {
-          var usa = (UserSuppliedAttributes)attr;
+        if (attr is UserSuppliedAtAttribute { Builtin: true } usaa) { // Already resolved
+          Contract.Assert(usaa.Arg.Type != null); // Already resolved
+          continue;
+        } else if (attr is UserSuppliedAttributes usa) {
           usa.Recognized = IsRecognizedAttribute(usa, attributeHost);
         }
         if (attr.Args != null) {
           foreach (var arg in attr.Args) {
             Contract.Assert(arg != null);
-            if (!(Attributes.Contains(attributeHost.Attributes, "opaque_reveal") && attr.Name == "fuel" && arg is NameSegment)) {
+            if (!(Attributes.Contains(attributeHost.Attributes, "opaque_reveal") && attr.Name is "revealedFunction" && arg is NameSegment)) {
+              var prevCount = reporter.ErrorCount;
               ResolveExpression(arg, resolutionContext);
+              if (prevCount == reporter.ErrorCount && attr is UserSuppliedAtAttribute { Builtin: false }) {
+                reporter.Error(MessageSource.Resolver, attr.Origin, "User-supplied @-Attributes not supported yet");
+              }
             } else {
               ResolveRevealLemmaAttribute(arg);
             }
@@ -345,10 +361,10 @@ public void ResolveRevealLemmaAttribute(Expression arg) {
       var f = (Function)member;
       Expression receiver;
       if (f.IsStatic) {
-        receiver = new StaticReceiverExpr(f.tok, (TopLevelDeclWithMembers)f.EnclosingClass, true);
+        receiver = new StaticReceiverExpr(f.Origin, (TopLevelDeclWithMembers)f.EnclosingClass, true);
       } else {
-        receiver = new ImplicitThisExpr(f.tok);
-        receiver.Type = GetThisType(f.tok, (TopLevelDeclWithMembers)member.EnclosingClass);
+        receiver = new ImplicitThisExpr(f.Origin);
+        receiver.Type = GetThisType(f.Origin, (TopLevelDeclWithMembers)member.EnclosingClass);
       }
 
       var typeApplication = new List<Type>();
@@ -360,15 +376,15 @@ public void ResolveRevealLemmaAttribute(Expression arg) {
         typeApplication_JustForMember.Add(new IntType());
       }
 
-      var rr = new MemberSelectExpr(f.tok, receiver, f.Name);
+      var rr = new MemberSelectExpr(f.Origin, receiver, f.NameNode);
       rr.Member = f;
-      rr.TypeApplication_AtEnclosingClass = typeApplication;
-      rr.TypeApplication_JustMember = typeApplication_JustForMember;
+      rr.TypeApplicationAtEnclosingClass = typeApplication;
+      rr.TypeApplicationJustMember = typeApplication_JustForMember;
       List<Type> args = new List<Type>();
-      for (int i = 0; i < f.Formals.Count; i++) {
+      for (int i = 0; i < f.Ins.Count; i++) {
         args.Add(new IntType());
       }
-      rr.Type = new ArrowType(f.tok, args, new IntType());
+      rr.Type = new ArrowType(f.Origin, args, new IntType());
       ((NameSegment)arg).ResolvedExpression = rr;
       arg.Type = rr.Type;
     }
@@ -383,9 +399,9 @@ public void ResolveExpression(Expression expr, ResolutionContext resolutionConte
       // For testing purposes, change the type of "expr" to a type synonym (mwo-ha-ha-ha!)
       var t = expr.Type;
       Contract.Assert(t != null);
-      var sd = new TypeSynonymDecl(expr.tok, "type#synonym#transparency#test", new TypeParameter.TypeParameterCharacteristics(false),
+      var sd = new TypeSynonymDecl(expr.Tok, "type#synonym#transparency#test", new TypeParameter.TypeParameterCharacteristics(false),
         new List<TypeParameter>(), resolutionContext.CodeContext.EnclosingModule, t, null);
-      var ts = new UserDefinedType(expr.tok, "type#synonym#transparency#test", sd, new List<Type>(), null);
+      var ts = new UserDefinedType(expr.Tok, "type#synonym#transparency#test", sd, new List<Type>(), null);
       expr.DebugTest_ChangeType(ts);
     }
     public void ResolveExpressionX(Expression expr, ResolutionContext resolutionContext) {
@@ -407,9 +423,9 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
       if (expr is ParensExpression) {
         var e = (ParensExpression)expr;
         ResolveExpression(e.E, resolutionContext);
-        var innerRange = e.E.RangeToken;
+        var innerRange = e.E.Origin;
         e.ResolvedExpression = e.E; // Overwrites the range, which is not suitable for ParensExpressions
-        e.E.RangeToken = innerRange;
+        e.E.SetOrigin(innerRange);
         e.Type = e.E.Type;
 
       } else if (expr is ChainingExpression) {
@@ -422,7 +438,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         var e = (NegationExpression)expr;
         ResolveExpression(e.E, resolutionContext);
         e.Type = e.E.Type;
-        AddXConstraint(e.E.tok, "NumericOrBitvector", e.E.Type, "the argument of a unary minus must have numeric or bitvector type (instead got {0})");
+        AddXConstraint(e.E.Origin, "NumericOrBitvector", e.E.Type, "the argument of a unary minus must have numeric or bitvector type (instead got {0})");
         // Note, e.ResolvedExpression will be filled in during CheckTypeInference, at which time e.Type has been determined
 
       } else if (expr is LiteralExpr) {
@@ -430,27 +446,27 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
 
         if (e is StaticReceiverExpr) {
           StaticReceiverExpr eStatic = (StaticReceiverExpr)e;
-          ResolveType(eStatic.tok, eStatic.UnresolvedType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          ResolveType(eStatic.Origin, eStatic.UnresolvedType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
           eStatic.Type = eStatic.UnresolvedType;
         } else {
           if (e.Value == null) {
             e.Type = new InferredTypeProxy();
-            AddXConstraint(e.tok, "IsNullableRefType", e.Type, "type of 'null' is a reference type, but it is used as {0}");
+            AddXConstraint(e.Origin, "IsNullableRefType", e.Type, "type of 'null' is a reference type, but it is used as {0}");
           } else if (e.Value is BigInteger) {
             var proxy = new InferredTypeProxy();
             e.Type = proxy;
-            ConstrainSubtypeRelation(new IntVarietiesSupertype(), e.Type, e.tok, "integer literal used as if it had type {0}", e.Type);
+            ConstrainSubtypeRelation(new IntVarietiesSupertype(), e.Type, e.Origin, "integer literal used as if it had type {0}", e.Type);
           } else if (e.Value is BaseTypes.BigDec) {
             var proxy = new InferredTypeProxy();
             e.Type = proxy;
-            ConstrainSubtypeRelation(new RealVarietiesSupertype(), e.Type, e.tok, "real literal is used as if it had type {0}", e.Type);
+            ConstrainSubtypeRelation(new RealVarietiesSupertype(), e.Type, e.Origin, "real literal is used as if it had type {0}", e.Type);
           } else if (e.Value is bool) {
             e.Type = Type.Bool;
           } else if (e is CharLiteralExpr) {
             e.Type = Type.Char;
           } else if (e is StringLiteralExpr) {
             e.Type = Type.String();
-            ResolveType(e.tok, e.Type, resolutionContext, ResolveTypeOptionEnum.DontInfer, null);
+            ResolveType(e.Origin, e.Type, resolutionContext, ResolveTypeOptionEnum.DontInfer, null);
           } else {
             Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal type
           }
@@ -465,7 +481,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
           if (currentClass == null) {
             Contract.Assert(reporter.HasErrors);
           } else {
-            expr.Type = GetThisType(expr.tok, currentClass);  // do this regardless of scope.AllowInstance, for better error reporting
+            expr.Type = GetThisType(expr.Origin, currentClass);  // do this regardless of scope.AllowInstance, for better error reporting
           }
         }
 
@@ -481,12 +497,12 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
       } else if (expr is DatatypeValue) {
         DatatypeValue dtv = (DatatypeValue)expr;
         if (!moduleInfo.TopLevels.TryGetValue(dtv.DatatypeName, out var d)) {
-          reporter.Error(MessageSource.Resolver, expr.tok, "Undeclared datatype: {0}", dtv.DatatypeName);
+          reporter.Error(MessageSource.Resolver, expr.Origin, "Undeclared datatype: {0}", dtv.DatatypeName);
         } else if (d is AmbiguousTopLevelDecl) {
           var ad = (AmbiguousTopLevelDecl)d;
-          reporter.Error(MessageSource.Resolver, expr.tok, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", dtv.DatatypeName, ad.ModuleNames());
+          reporter.Error(MessageSource.Resolver, expr.Origin, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", dtv.DatatypeName, ad.ModuleNames());
         } else if (!(d is DatatypeDecl)) {
-          reporter.Error(MessageSource.Resolver, expr.tok, "Expected datatype: {0}", dtv.DatatypeName);
+          reporter.Error(MessageSource.Resolver, expr.Origin, "Expected datatype: {0}", dtv.DatatypeName);
         } else {
           ResolveDatatypeValue(resolutionContext, dtv, (DatatypeDecl)d, null);
         }
@@ -497,7 +513,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         foreach (Expression ee in e.Elements) {
           ResolveExpression(ee, resolutionContext);
           Contract.Assert(ee.Type != null);  // follows from postcondition of ResolveExpression
-          ConstrainSubtypeRelation(elementType, ee.Type, ee.tok, "All elements of display must have some common supertype (got {0}, but needed type or type of previous elements is {1})", ee.Type, elementType);
+          ConstrainSubtypeRelation(elementType, ee.Type, ee.Origin, "All elements of display must have some common supertype (got {0}, but needed type or type of previous elements is {1})", ee.Type, elementType);
         }
         if (expr is SetDisplayExpr) {
           var se = (SetDisplayExpr)expr;
@@ -514,32 +530,32 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         foreach (ExpressionPair p in e.Elements) {
           ResolveExpression(p.A, resolutionContext);
           Contract.Assert(p.A.Type != null);  // follows from postcondition of ResolveExpression
-          ConstrainSubtypeRelation(domainType, p.A.Type, p.A.tok, "All domain elements of map display must have some common supertype (got {0}, but needed type or type of previous elements is {1})", p.A.Type, domainType);
+          ConstrainSubtypeRelation(domainType, p.A.Type, p.A.Origin, "All domain elements of map display must have some common supertype (got {0}, but needed type or type of previous elements is {1})", p.A.Type, domainType);
           ResolveExpression(p.B, resolutionContext);
           Contract.Assert(p.B.Type != null);  // follows from postcondition of ResolveExpression
-          ConstrainSubtypeRelation(rangeType, p.B.Type, p.B.tok, "All range elements of map display must have some common supertype (got {0}, but needed type or type of previous elements is {1})", p.B.Type, rangeType);
+          ConstrainSubtypeRelation(rangeType, p.B.Type, p.B.Origin, "All range elements of map display must have some common supertype (got {0}, but needed type or type of previous elements is {1})", p.B.Type, rangeType);
         }
         expr.Type = new MapType(e.Finite, domainType, rangeType);
       } else if (expr is NameSegment) {
         var e = (NameSegment)expr;
         ResolveNameSegment(e, true, null, resolutionContext, false);
 
-        if (e.Type is Resolver_IdentifierExpr.ResolverType_Module) {
-          reporter.Error(MessageSource.Resolver, e.tok, "name of module ({0}) is used as a variable", e.Name);
+        if (e.Type is ResolverIdentifierExpr.ResolverTypeModule) {
+          reporter.Error(MessageSource.Resolver, e.Origin, "name of module ({0}) is used as a variable", e.Name);
           e.ResetTypeAssignment();  // the rest of type checking assumes actual types
-        } else if (e.Type is Resolver_IdentifierExpr.ResolverType_Type) {
-          reporter.Error(MessageSource.Resolver, e.tok, "name of type ({0}) is used as a variable", e.Name);
+        } else if (e.Type is ResolverIdentifierExpr.ResolverTypeType) {
+          reporter.Error(MessageSource.Resolver, e.Origin, "name of type ({0}) is used as a variable", e.Name);
           e.ResetTypeAssignment();  // the rest of type checking assumes actual types
         }
 
       } else if (expr is ExprDotName) {
         var e = (ExprDotName)expr;
-        ResolveDotSuffix(e, true, null, resolutionContext, false);
-        if (e.Type is Resolver_IdentifierExpr.ResolverType_Module) {
-          reporter.Error(MessageSource.Resolver, e.tok, "name of module ({0}) is used as a variable", e.SuffixName);
+        ResolveDotSuffix(e, false, true, null, resolutionContext, false);
+        if (e.Type is ResolverIdentifierExpr.ResolverTypeModule) {
+          reporter.Error(MessageSource.Resolver, e.Origin, "name of module ({0}) is used as a variable", e.SuffixName);
           e.ResetTypeAssignment();  // the rest of type checking assumes actual types
-        } else if (e.Type is Resolver_IdentifierExpr.ResolverType_Type) {
-          reporter.Error(MessageSource.Resolver, e.tok, "name of type ({0}) is used as a variable", e.SuffixName);
+        } else if (e.Type is ResolverIdentifierExpr.ResolverTypeType) {
+          reporter.Error(MessageSource.Resolver, e.Origin, "name of type ({0}) is used as a variable", e.SuffixName);
           e.ResetTypeAssignment();  // the rest of type checking assumes actual types
         }
 
@@ -551,18 +567,18 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         var e = (MemberSelectExpr)expr;
         ResolveExpression(e.Obj, resolutionContext);
         Contract.Assert(e.Obj.Type != null);  // follows from postcondition of ResolveExpression
-        var member = ResolveMember(expr.tok, e.Obj.Type, e.MemberName, out var tentativeReceiverType);
+        var member = ResolveMember(expr.Origin, e.Obj.Type, e.MemberName, out var tentativeReceiverType);
         if (member == null) {
           // error has already been reported by ResolveMember
         } else if (member is Function) {
           var fn = member as Function;
           e.Member = fn;
           if (fn is TwoStateFunction && !resolutionContext.IsTwoState) {
-            reporter.Error(MessageSource.Resolver, e.tok, "a two-state function can be used only in a two-state context");
+            reporter.Error(MessageSource.Resolver, e.Origin, "a two-state function can be used only in a two-state context");
           }
           // build the type substitution map
-          e.TypeApplication_AtEnclosingClass = tentativeReceiverType.TypeArgs;
-          e.TypeApplication_JustMember = new List<Type>();
+          e.TypeApplicationAtEnclosingClass = tentativeReceiverType.TypeArgs;
+          e.TypeApplicationJustMember = new List<Type>();
           Dictionary<TypeParameter, Type> subst;
           var ctype = tentativeReceiverType as UserDefinedType;
           if (ctype == null) {
@@ -573,15 +589,15 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
           foreach (var tp in fn.TypeArgs) {
             Type prox = new InferredTypeProxy();
             subst[tp] = prox;
-            e.TypeApplication_JustMember.Add(prox);
+            e.TypeApplicationJustMember.Add(prox);
           }
           subst = BuildTypeArgumentSubstitute(subst);
           e.Type = SelectAppropriateArrowTypeForFunction(fn, subst, SystemModuleManager);
         } else if (member is Field) {
           var field = (Field)member;
           e.Member = field;
-          e.TypeApplication_AtEnclosingClass = tentativeReceiverType.TypeArgs;
-          e.TypeApplication_JustMember = new List<Type>();
+          e.TypeApplicationAtEnclosingClass = tentativeReceiverType.TypeArgs;
+          e.TypeApplicationJustMember = new List<Type>();
           if (e.Obj is StaticReceiverExpr && !field.IsStatic) {
             reporter.Error(MessageSource.Resolver, expr, "a field must be selected via an object, not just a class name");
           }
@@ -611,7 +627,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         Type elementType = e.Array.Type.TypeArgs.Count > 0 ?
           e.Array.Type.TypeArgs[0] :
           new InferredTypeProxy();
-        ConstrainSubtypeRelation(ResolvedArrayType(e.Array.tok, e.Indices.Count, elementType, resolutionContext, true), e.Array.Type, e.Array,
+        ConstrainSubtypeRelation(ResolvedArrayType(e.Array.Origin, e.Indices.Count, elementType, resolutionContext, true), e.Array.Type, e.Array,
           "array selection requires an array{0} (got {1})", e.Indices.Count, e.Array.Type);
         int i = 0;
         foreach (Expression idx in e.Indices) {
@@ -629,7 +645,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         Contract.Assert(e.Seq.Type != null);  // follows from postcondition of ResolveExpression
         ResolveExpression(e.Index, resolutionContext);
         ResolveExpression(e.Value, resolutionContext);
-        AddXConstraint(expr.tok, "SeqUpdatable", e.Seq.Type, e.Index, e.Value, "update requires a sequence, map, or multiset (got {0})");
+        AddXConstraint(expr.Origin, "SeqUpdatable", e.Seq.Type, e.Index, e.Value, "update requires a sequence, map, or multiset (got {0})");
         expr.Type = new InferredTypeProxy(); // drop type constraints
         ConstrainSubtypeRelation(
           super: expr.Type, sub: e.Seq.Type, // expr.Type generalizes e.Seq.Type by dropping constraints
@@ -638,11 +654,11 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
       } else if (expr is DatatypeUpdateExpr) {
         var e = (DatatypeUpdateExpr)expr;
         ResolveExpression(e.Root, resolutionContext);
-        var ty = PartiallyResolveTypeForMemberSelection(expr.tok, e.Root.Type);
+        var ty = PartiallyResolveTypeForMemberSelection(expr.Origin, e.Root.Type);
         if (!ty.IsDatatype) {
           reporter.Error(MessageSource.Resolver, expr, "datatype update expression requires a root expression of a datatype (got {0})", ty);
         } else {
-          var (ghostLet, compiledLet) = ResolveDatatypeUpdate(expr.tok, e.Root, ty.AsDatatype, e.Updates, resolutionContext,
+          var (ghostLet, compiledLet) = ResolveDatatypeUpdate(expr.Origin, e.Root, ty.AsDatatype, e.Updates, resolutionContext,
             out var members, out var legalSourceConstructors);
           Contract.Assert((ghostLet == null) == (compiledLet == null));
           if (ghostLet != null) {
@@ -668,15 +684,15 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         // TODO: the following should be replaced by a type-class constraint that constrains the types of e.Function, e.Args[*], and e.Type
         var fnType = e.Function.Type.AsArrowType;
         if (fnType == null) {
-          reporter.Error(MessageSource.Resolver, e.tok,
+          reporter.Error(MessageSource.Resolver, e.Origin,
             "non-function expression (of type {0}) is called with parameters", e.Function.Type);
         } else if (fnType.Arity != e.Args.Count) {
-          reporter.Error(MessageSource.Resolver, e.tok,
+          reporter.Error(MessageSource.Resolver, e.Origin,
             "wrong number of arguments for function application (function type '{0}' expects {1}, got {2})", fnType,
             fnType.Arity, e.Args.Count);
         } else {
           for (var i = 0; i < fnType.Arity; i++) {
-            AddAssignableConstraint(e.Args[i].tok, fnType.Args[i], e.Args[i].Type,
+            AddAssignableConstraint(e.Args[i].Origin, fnType.Args[i], e.Args[i].Type,
               "type mismatch for argument" + (fnType.Arity == 1 ? "" : " " + i) + " (function expects {0}, got {1})");
           }
         }
@@ -686,32 +702,32 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
       } else if (expr is SeqConstructionExpr) {
         var e = (SeqConstructionExpr)expr;
         var elementType = e.ExplicitElementType ?? new InferredTypeProxy();
-        ResolveType(e.tok, elementType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+        ResolveType(e.Origin, elementType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         ResolveExpression(e.N, resolutionContext);
         ConstrainToIntegerType(e.N, false, "sequence construction must use an integer-based expression for the sequence size (got {0})");
         ResolveExpression(e.Initializer, resolutionContext);
-        var arrowType = new ArrowType(e.tok, SystemModuleManager.ArrowTypeDecls[1], new List<Type>() { SystemModuleManager.Nat() }, elementType);
+        var arrowType = new ArrowType(e.Origin, SystemModuleManager.ArrowTypeDecls[1], new List<Type>() { SystemModuleManager.Nat() }, elementType);
         var hintString = " (perhaps write '_ =>' in front of the expression you gave in order to make it an arrow type)";
         ConstrainSubtypeRelation(arrowType, e.Initializer.Type, e.Initializer, "sequence-construction initializer expression expected to have type '{0}' (instead got '{1}'){2}",
-          arrowType, e.Initializer.Type, new LazyString_OnTypeEquals(elementType, e.Initializer.Type, hintString));
+          arrowType, e.Initializer.Type, new LazyStringOnTypeEquals(elementType, e.Initializer.Type, hintString));
         expr.Type = new SeqType(elementType);
 
       } else if (expr is MultiSetFormingExpr) {
         MultiSetFormingExpr e = (MultiSetFormingExpr)expr;
         ResolveExpression(e.E, resolutionContext);
         var elementType = new InferredTypeProxy();
-        AddXConstraint(e.E.tok, "MultiSetConvertible", e.E.Type, elementType, "can only form a multiset from a seq or set (got {0})");
+        AddXConstraint(e.E.Origin, "MultiSetConvertible", e.E.Type, elementType, "can only form a multiset from a seq or set (got {0})");
         expr.Type = new MultiSetType(elementType);
 
       } else if (expr is OldExpr) {
         var e = (OldExpr)expr;
-        e.AtLabel = ResolveDominatingLabelInExpr(expr.tok, e.At, "old", resolutionContext);
+        e.AtLabel = ResolveDominatingLabelInExpr(expr.Origin, e.At, "old", resolutionContext);
         ResolveExpression(e.E, new ResolutionContext(resolutionContext.CodeContext, false) with { InOld = true });
         expr.Type = e.E.Type;
 
       } else if (expr is UnchangedExpr) {
         var e = (UnchangedExpr)expr;
-        e.AtLabel = ResolveDominatingLabelInExpr(expr.tok, e.At, "unchanged", resolutionContext);
+        e.AtLabel = ResolveDominatingLabelInExpr(expr.Origin, e.At, "unchanged", resolutionContext);
         foreach (var fe in e.Frame) {
           ResolveFrameExpression(fe, FrameExpressionUse.Unchanged, resolutionContext);
         }
@@ -720,9 +736,9 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
       } else if (expr is FreshExpr) {
         var e = (FreshExpr)expr;
         ResolveExpression(e.E, resolutionContext);
-        e.AtLabel = ResolveDominatingLabelInExpr(expr.tok, e.At, "fresh", resolutionContext);
+        e.AtLabel = ResolveDominatingLabelInExpr(expr.Origin, e.At, "fresh", resolutionContext);
         // the type of e.E must be either an object or a set/seq of objects
-        AddXConstraint(expr.tok, "Freshable", e.E.Type, "the argument of a fresh expression must denote an object or a set or sequence of objects (instead got {0})");
+        AddXConstraint(expr.Origin, "Freshable", e.E.Type, "the argument of a fresh expression must denote an object or a set or sequence of objects (instead got {0})");
         expr.Type = Type.Bool;
 
       } else if (expr is UnaryOpExpr) {
@@ -731,11 +747,11 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         Contract.Assert(e.E.Type != null);  // follows from postcondition of ResolveExpression
         switch (e.Op) {
           case UnaryOpExpr.Opcode.Not:
-            AddXConstraint(e.E.tok, "BooleanBits", e.E.Type, "logical/bitwise negation expects a boolean or bitvector argument (instead got {0})");
+            AddXConstraint(e.E.Origin, "BooleanBits", e.E.Type, "logical/bitwise negation expects a boolean or bitvector argument (instead got {0})");
             expr.Type = e.E.Type;
             break;
           case UnaryOpExpr.Opcode.Cardinality:
-            AddXConstraint(expr.tok, "Sizeable", e.E.Type, "size operator expects a collection argument (instead got {0})");
+            AddXConstraint(expr.Origin, "Sizeable", e.E.Type, "size operator expects a collection argument (instead got {0})");
             expr.Type = Type.Int;
             break;
           case UnaryOpExpr.Opcode.Allocated:
@@ -747,6 +763,10 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
               reporter.Error(MessageSource.Resolver, expr, "a {0} definition is not allowed to depend on the set of allocated references", declKind);
             }
             break;
+          case UnaryOpExpr.Opcode.Assigned:
+            // the argument is allowed to have any type
+            expr.Type = Type.Bool;
+            break;
           default:
             Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary operator
         }
@@ -758,22 +778,22 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         var e = (ConversionExpr)expr;
         ResolveExpression(e.E, resolutionContext);
         var prevErrorCount = reporter.Count(ErrorLevel.Error);
-        ResolveType(e.tok, e.ToType, resolutionContext, new ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null);
+        ResolveType(e.Origin, e.ToType, resolutionContext, new ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null);
         if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
           if (e.ToType.IsNumericBased(Type.NumericPersuasion.Int)) {
-            AddXConstraint(expr.tok, "NumericOrBitvectorOrCharOrORDINAL", e.E.Type, "type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
+            AddXConstraint(expr.Origin, "NumericOrBitvectorOrCharOrORDINAL", e.E.Type, "type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
           } else if (e.ToType.IsNumericBased(Type.NumericPersuasion.Real)) {
-            AddXConstraint(expr.tok, "NumericOrBitvectorOrCharOrORDINAL", e.E.Type, "type conversion to a real-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
+            AddXConstraint(expr.Origin, "NumericOrBitvectorOrCharOrORDINAL", e.E.Type, "type conversion to a real-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
           } else if (e.ToType.IsBitVectorType) {
-            AddXConstraint(expr.tok, "NumericOrBitvectorOrCharOrORDINAL", e.E.Type, "type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
+            AddXConstraint(expr.Origin, "NumericOrBitvectorOrCharOrORDINAL", e.E.Type, "type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
           } else if (e.ToType.IsCharType) {
-            AddXConstraint(expr.tok, "NumericOrBitvectorOrCharOrORDINAL", e.E.Type, "type conversion to a char type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
+            AddXConstraint(expr.Origin, "NumericOrBitvectorOrCharOrORDINAL", e.E.Type, "type conversion to a char type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
           } else if (e.ToType.IsBigOrdinalType) {
-            AddXConstraint(expr.tok, "NumericOrBitvectorOrCharOrORDINAL", e.E.Type, "type conversion to an ORDINAL type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
+            AddXConstraint(expr.Origin, "NumericOrBitvectorOrCharOrORDINAL", e.E.Type, "type conversion to an ORDINAL type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
           } else if (e.ToType.IsRefType) {
-            AddAssignableConstraint(expr.tok, e.ToType, e.E.Type, "type cast to reference type '{0}' must be from an expression assignable to it (got '{1}')");
+            AddAssignableConstraint(expr.Origin, e.ToType, e.E.Type, "type cast to reference type '{0}' must be from an expression assignable to it (got '{1}')");
           } else if (e.ToType.IsTraitType) {
-            AddAssignableConstraint(expr.tok, e.ToType, e.E.Type, "type cast to trait type '{0}' must be from an expression assignable to it (got '{1}')");
+            AddAssignableConstraint(expr.Origin, e.ToType, e.E.Type, "type cast to trait type '{0}' must be from an expression assignable to it (got '{1}')");
           } else {
             reporter.Error(MessageSource.Resolver, expr, "type conversions are not supported to this type (got {0})", e.ToType);
           }
@@ -786,8 +806,8 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         var e = (TypeTestExpr)expr;
         ResolveExpression(e.E, resolutionContext);
         var prevErrorCount = reporter.Count(ErrorLevel.Error);
-        ResolveType(e.tok, e.ToType, resolutionContext, new ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null);
-        AddAssignableConstraint(expr.tok, e.ToType, e.E.Type, "type test for type '{0}' must be from an expression assignable to it (got '{1}')");
+        ResolveType(e.Origin, e.ToType, resolutionContext, new ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null);
+        AddAssignableConstraint(expr.Origin, e.ToType, e.E.Type, "type test for type '{0}' must be from an expression assignable to it (got '{1}')");
         e.Type = Type.Bool;
 
       } else if (expr is BinaryExpr) {
@@ -805,7 +825,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
           case BinaryExpr.Opcode.And:
           case BinaryExpr.Opcode.Or: {
               ConstrainSubtypeRelation(Type.Bool, e.E0.Type, expr, "first argument to {0} must be of type bool (instead got {1})", BinaryExpr.OpcodeString(e.Op), e.E0.Type);
-              var secondArgumentDescription = e.E1.tok is QuantifiedVariableRangeToken
+              var secondArgumentDescription = e.E1.Origin is QuantifiedVariableRangeOrigin
                 ? "range of quantified variable" : "second argument to {0}";
               ConstrainSubtypeRelation(Type.Bool, e.E1.Type, expr, secondArgumentDescription + " must be of type bool (instead got {1})", BinaryExpr.OpcodeString(e.Op), e.E1.Type);
               expr.Type = Type.Bool;
@@ -814,7 +834,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
 
           case BinaryExpr.Opcode.Eq:
           case BinaryExpr.Opcode.Neq:
-            AddXConstraint(expr.tok, "Equatable", e.E0.Type, e.E1.Type, "arguments must have comparable types (got {0} and {1})");
+            AddXConstraint(expr.Origin, "Equatable", e.E0.Type, e.E1.Type, "arguments must have comparable types (got {0} and {1})");
             expr.Type = Type.Bool;
             break;
 
@@ -822,21 +842,21 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
             Type disjointArgumentsType = new InferredTypeProxy();
             ConstrainSubtypeRelation(disjointArgumentsType, e.E0.Type, expr, "arguments to {2} must have a common supertype (got {0} and {1})", e.E0.Type, e.E1.Type, BinaryExpr.OpcodeString(e.Op));
             ConstrainSubtypeRelation(disjointArgumentsType, e.E1.Type, expr, "arguments to {2} must have a common supertype (got {0} and {1})", e.E0.Type, e.E1.Type, BinaryExpr.OpcodeString(e.Op));
-            AddXConstraint(expr.tok, "Disjointable", disjointArgumentsType, "arguments must be of a set or multiset type (got {0})");
+            AddXConstraint(expr.Origin, "Disjointable", disjointArgumentsType, "arguments must be of a set or multiset type (got {0})");
             expr.Type = Type.Bool;
             break;
 
           case BinaryExpr.Opcode.Lt:
           case BinaryExpr.Opcode.Le: {
-              if (e.Op == BinaryExpr.Opcode.Lt && (PartiallyResolveTypeForMemberSelection(e.E0.tok, e.E0.Type).IsIndDatatype || e.E0.Type.IsTypeParameter || PartiallyResolveTypeForMemberSelection(e.E1.tok, e.E1.Type).IsIndDatatype)) {
-                AddXConstraint(expr.tok, "RankOrderable", e.E0.Type, e.E1.Type, "arguments to rank comparison must be datatypes (got {0} and {1})");
+              if (e.Op == BinaryExpr.Opcode.Lt && (PartiallyResolveTypeForMemberSelection(e.E0.Origin, e.E0.Type).IsIndDatatype || e.E0.Type.IsTypeParameter || PartiallyResolveTypeForMemberSelection(e.E1.Origin, e.E1.Type).IsIndDatatype)) {
+                AddXConstraint(expr.Origin, "RankOrderable", e.E0.Type, e.E1.Type, "arguments to rank comparison must be datatypes (got {0} and {1})");
                 e.ResolvedOp = BinaryExpr.ResolvedOpcode.RankLt;
               } else {
                 var cmpType = new InferredTypeProxy();
-                var err = new TypeConstraint.ErrorMsgWithToken(expr.tok, "arguments to {2} must have a common supertype (got {0} and {1})", e.E0.Type, e.E1.Type, BinaryExpr.OpcodeString(e.Op));
+                var err = new TypeConstraint.ErrorMsgWithToken(expr.Origin, "arguments to {2} must have a common supertype (got {0} and {1})", e.E0.Type, e.E1.Type, BinaryExpr.OpcodeString(e.Op));
                 ConstrainSubtypeRelation(cmpType, e.E0.Type, err);
                 ConstrainSubtypeRelation(cmpType, e.E1.Type, err);
-                AddXConstraint(expr.tok, "Orderable_Lt", e.E0.Type, e.E1.Type,
+                AddXConstraint(expr.Origin, "Orderable_Lt", e.E0.Type, e.E1.Type,
                   "arguments to " + BinaryExpr.OpcodeString(e.Op) + " must be of a numeric type, bitvector type, ORDINAL, char, a sequence type, or a set-like type (instead got {0} and {1})");
               }
               expr.Type = Type.Bool;
@@ -845,15 +865,15 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
 
           case BinaryExpr.Opcode.Gt:
           case BinaryExpr.Opcode.Ge: {
-              if (e.Op == BinaryExpr.Opcode.Gt && (PartiallyResolveTypeForMemberSelection(e.E0.tok, e.E0.Type).IsIndDatatype || PartiallyResolveTypeForMemberSelection(e.E1.tok, e.E1.Type).IsIndDatatype || e.E1.Type.IsTypeParameter)) {
-                AddXConstraint(expr.tok, "RankOrderable", e.E1.Type, e.E0.Type, "arguments to rank comparison must be datatypes (got {1} and {0})");
+              if (e.Op == BinaryExpr.Opcode.Gt && (PartiallyResolveTypeForMemberSelection(e.E0.Origin, e.E0.Type).IsIndDatatype || PartiallyResolveTypeForMemberSelection(e.E1.Origin, e.E1.Type).IsIndDatatype || e.E1.Type.IsTypeParameter)) {
+                AddXConstraint(expr.Origin, "RankOrderable", e.E1.Type, e.E0.Type, "arguments to rank comparison must be datatypes (got {1} and {0})");
                 e.ResolvedOp = BinaryExpr.ResolvedOpcode.RankGt;
               } else {
                 var cmpType = new InferredTypeProxy();
-                var err = new TypeConstraint.ErrorMsgWithToken(expr.tok, "arguments to {2} must have a common supertype (got {0} and {1})", e.E0.Type, e.E1.Type, BinaryExpr.OpcodeString(e.Op));
+                var err = new TypeConstraint.ErrorMsgWithToken(expr.Origin, "arguments to {2} must have a common supertype (got {0} and {1})", e.E0.Type, e.E1.Type, BinaryExpr.OpcodeString(e.Op));
                 ConstrainSubtypeRelation(cmpType, e.E0.Type, err);
                 ConstrainSubtypeRelation(cmpType, e.E1.Type, err);
-                AddXConstraint(expr.tok, "Orderable_Gt", e.E0.Type, e.E1.Type,
+                AddXConstraint(expr.Origin, "Orderable_Gt", e.E0.Type, e.E1.Type,
                   "arguments to " + BinaryExpr.OpcodeString(e.Op) + " must be of a numeric type, bitvector type, ORDINAL, char, or a set-like type (instead got {0} and {1})");
               }
               expr.Type = Type.Bool;
@@ -863,24 +883,24 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
           case BinaryExpr.Opcode.LeftShift:
           case BinaryExpr.Opcode.RightShift: {
               expr.Type = new InferredTypeProxy();
-              AddXConstraint(e.tok, "IsBitvector", expr.Type, "type of " + BinaryExpr.OpcodeString(e.Op) + " must be a bitvector type (instead got {0})");
-              ConstrainSubtypeRelation(expr.Type, e.E0.Type, expr.tok, "type of left argument to " + BinaryExpr.OpcodeString(e.Op) + " ({0}) must agree with the result type ({1})", e.E0.Type, expr.Type);
-              AddXConstraint(expr.tok, "IntLikeOrBitvector", e.E1.Type, "type of right argument to " + BinaryExpr.OpcodeString(e.Op) + " ({0}) must be an integer-numeric or bitvector type");
+              AddXConstraint(e.Origin, "IsBitvector", expr.Type, "type of " + BinaryExpr.OpcodeString(e.Op) + " must be a bitvector type (instead got {0})");
+              ConstrainSubtypeRelation(expr.Type, e.E0.Type, expr.Origin, "type of left argument to " + BinaryExpr.OpcodeString(e.Op) + " ({0}) must agree with the result type ({1})", e.E0.Type, expr.Type);
+              AddXConstraint(expr.Origin, "IntLikeOrBitvector", e.E1.Type, "type of right argument to " + BinaryExpr.OpcodeString(e.Op) + " ({0}) must be an integer-numeric or bitvector type");
             }
             break;
 
           case BinaryExpr.Opcode.Add: {
               expr.Type = new InferredTypeProxy();
-              AddXConstraint(e.tok, "Plussable", expr.Type, "type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got {0})");
-              ConstrainSubtypeRelation(expr.Type, e.E0.Type, expr.tok, "type of left argument to + ({0}) must agree with the result type ({1})", e.E0.Type, expr.Type);
-              ConstrainSubtypeRelation(expr.Type, e.E1.Type, expr.tok, "type of right argument to + ({0}) must agree with the result type ({1})", e.E1.Type, expr.Type);
+              AddXConstraint(e.Origin, "Plussable", expr.Type, "type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got {0})");
+              ConstrainSubtypeRelation(expr.Type, e.E0.Type, expr.Origin, "type of left argument to + ({0}) must agree with the result type ({1})", e.E0.Type, expr.Type);
+              ConstrainSubtypeRelation(expr.Type, e.E1.Type, expr.Origin, "type of right argument to + ({0}) must agree with the result type ({1})", e.E1.Type, expr.Type);
             }
             break;
 
           case BinaryExpr.Opcode.Sub: {
               expr.Type = new InferredTypeProxy();
-              AddXConstraint(e.tok, "Minusable", expr.Type, "type of - must be of a numeric type, bitvector type, ORDINAL, char, or a set-like or map-like type (instead got {0})");
-              ConstrainSubtypeRelation(expr.Type, e.E0.Type, expr.tok, "type of left argument to - ({0}) must agree with the result type ({1})", e.E0.Type, expr.Type);
+              AddXConstraint(e.Origin, "Minusable", expr.Type, "type of - must be of a numeric type, bitvector type, ORDINAL, char, or a set-like or map-like type (instead got {0})");
+              ConstrainSubtypeRelation(expr.Type, e.E0.Type, expr.Origin, "type of left argument to - ({0}) must agree with the result type ({1})", e.E0.Type, expr.Type);
               // The following handles map subtraction, but does not in an unfortunately restrictive way.
               // First, it would be nice to delay the decision of it this is a map subtraction or not. This settles
               // for the simple way to decide based on what is currently known about the result type, which is also
@@ -888,36 +908,36 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
               // Second, for map subtraction, it would be nice to allow the right-hand operand to be either a set or
               // an iset. That would also lead to further complexity in the code, so this code restricts the right-hand
               // operand to be a set.
-              var eType = PartiallyResolveTypeForMemberSelection(expr.tok, expr.Type).AsMapType;
+              var eType = PartiallyResolveTypeForMemberSelection(expr.Origin, expr.Type).AsMapType;
               if (eType != null) {
                 // allow "map - set == map"
                 var expected = new SetType(true, eType.Domain);
-                ConstrainSubtypeRelation(expected, e.E1.Type, expr.tok, "map subtraction expects right-hand operand to have type {0} (instead got {1})", expected, e.E1.Type);
+                ConstrainSubtypeRelation(expected, e.E1.Type, expr.Origin, "map subtraction expects right-hand operand to have type {0} (instead got {1})", expected, e.E1.Type);
               } else {
-                ConstrainSubtypeRelation(expr.Type, e.E1.Type, expr.tok, "type of right argument to - ({0}) must agree with the result type ({1})", e.E1.Type, expr.Type);
+                ConstrainSubtypeRelation(expr.Type, e.E1.Type, expr.Origin, "type of right argument to - ({0}) must agree with the result type ({1})", e.E1.Type, expr.Type);
               }
             }
             break;
 
           case BinaryExpr.Opcode.Mul: {
               expr.Type = new InferredTypeProxy();
-              AddXConstraint(e.tok, "Mullable", expr.Type, "type of * must be of a numeric type, bitvector type, or a set-like type (instead got {0})");
-              ConstrainSubtypeRelation(expr.Type, e.E0.Type, expr.tok, "type of left argument to * ({0}) must agree with the result type ({1})", e.E0.Type, expr.Type);
-              ConstrainSubtypeRelation(expr.Type, e.E1.Type, expr.tok, "type of right argument to * ({0}) must agree with the result type ({1})", e.E1.Type, expr.Type);
+              AddXConstraint(e.Origin, "Mullable", expr.Type, "type of * must be of a numeric type, bitvector type, or a set-like type (instead got {0})");
+              ConstrainSubtypeRelation(expr.Type, e.E0.Type, expr.Origin, "type of left argument to * ({0}) must agree with the result type ({1})", e.E0.Type, expr.Type);
+              ConstrainSubtypeRelation(expr.Type, e.E1.Type, expr.Origin, "type of right argument to * ({0}) must agree with the result type ({1})", e.E1.Type, expr.Type);
             }
             break;
 
           case BinaryExpr.Opcode.In:
           case BinaryExpr.Opcode.NotIn:
-            var subjectDescription = e.E1.tok is QuantifiedVariableDomainToken
+            var subjectDescription = e.E1.Origin is QuantifiedVariableDomainOrigin
               ? "domain of quantified variable" : "second argument to \"" + BinaryExpr.OpcodeString(e.Op) + "\"";
-            AddXConstraint(expr.tok, "Innable", e.E1.Type, e.E0.Type, subjectDescription + " must be a set, multiset, or sequence with elements of type {1}, or a map with domain {1} (instead got {0})");
+            AddXConstraint(expr.Origin, "Innable", e.E1.Type, e.E0.Type, subjectDescription + " must be a set, multiset, or sequence with elements of type {1}, or a map with domain {1} (instead got {0})");
             expr.Type = Type.Bool;
             break;
 
           case BinaryExpr.Opcode.Div:
             expr.Type = new InferredTypeProxy();
-            AddXConstraint(expr.tok, "NumericOrBitvector", expr.Type, "arguments to " + BinaryExpr.OpcodeString(e.Op) + " must be numeric or bitvector types (got {0})");
+            AddXConstraint(expr.Origin, "NumericOrBitvector", expr.Type, "arguments to " + BinaryExpr.OpcodeString(e.Op) + " must be numeric or bitvector types (got {0})");
             ConstrainSubtypeRelation(expr.Type, e.E0.Type,
               expr, "type of left argument to " + BinaryExpr.OpcodeString(e.Op) + " ({0}) must agree with the result type ({1})",
               e.E0.Type, expr.Type);
@@ -928,7 +948,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
 
           case BinaryExpr.Opcode.Mod:
             expr.Type = new InferredTypeProxy();
-            AddXConstraint(expr.tok, "IntLikeOrBitvector", expr.Type, "arguments to " + BinaryExpr.OpcodeString(e.Op) + " must be integer-numeric or bitvector types (got {0})");
+            AddXConstraint(expr.Origin, "IntLikeOrBitvector", expr.Type, "arguments to " + BinaryExpr.OpcodeString(e.Op) + " must be integer-numeric or bitvector types (got {0})");
             ConstrainSubtypeRelation(expr.Type, e.E0.Type,
               expr, "type of left argument to " + BinaryExpr.OpcodeString(e.Op) + " ({0}) must agree with the result type ({1})",
               e.E0.Type, expr.Type);
@@ -940,13 +960,13 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
           case BinaryExpr.Opcode.BitwiseAnd:
           case BinaryExpr.Opcode.BitwiseOr:
           case BinaryExpr.Opcode.BitwiseXor:
-            expr.Type = NewIntegerBasedProxy(expr.tok);
+            expr.Type = NewIntegerBasedProxy(expr.Origin);
             var errFormat = "first argument to " + BinaryExpr.OpcodeString(e.Op) + " must be of a bitvector type (instead got {0})";
             ConstrainSubtypeRelation(expr.Type, e.E0.Type, expr, errFormat, e.E0.Type);
-            AddXConstraint(expr.tok, "IsBitvector", e.E0.Type, errFormat);
+            AddXConstraint(expr.Origin, "IsBitvector", e.E0.Type, errFormat);
             errFormat = "second argument to " + BinaryExpr.OpcodeString(e.Op) + " must be of a bitvector type (instead got {0})";
             ConstrainSubtypeRelation(expr.Type, e.E1.Type, expr, errFormat, e.E1.Type);
-            AddXConstraint(expr.tok, "IsBitvector", e.E1.Type, errFormat);
+            AddXConstraint(expr.Origin, "IsBitvector", e.E1.Type, errFormat);
             break;
 
           default:
@@ -963,9 +983,9 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         switch (e.Op) {
           case TernaryExpr.Opcode.PrefixEqOp:
           case TernaryExpr.Opcode.PrefixNeqOp:
-            AddXConstraint(expr.tok, "IntOrORDINAL", e.E0.Type, "prefix-equality limit argument must be an ORDINAL or integer expression (got {0})");
-            AddXConstraint(expr.tok, "Equatable", e.E1.Type, e.E2.Type, "arguments must have the same type (got {0} and {1})");
-            AddXConstraint(expr.tok, "IsCoDatatype", e.E1.Type, "arguments to prefix equality must be codatatypes (instead of {0})");
+            AddXConstraint(expr.Origin, "IntOrORDINAL", e.E0.Type, "prefix-equality limit argument must be an ORDINAL or integer expression (got {0})");
+            AddXConstraint(expr.Origin, "Equatable", e.E1.Type, e.E2.Type, "arguments must have the same type (got {0} and {1})");
+            AddXConstraint(expr.Origin, "IsCoDatatype", e.E1.Type, "arguments to prefix equality must be codatatypes (instead of {0})");
             expr.Type = Type.Bool;
             break;
           default:
@@ -995,7 +1015,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
             }
             if (c == 0) {
               // Every identifier-looking thing in the pattern resolved to a constructor; that is, this LHS is a constant literal
-              reporter.Error(MessageSource.Resolver, lhs.tok, "LHS is a constant literal; to be legal, it must introduce at least one bound variable");
+              reporter.Error(MessageSource.Resolver, lhs.Origin, "LHS is a constant literal; to be legal, it must introduce at least one bound variable");
             }
             i++;
           }
@@ -1010,7 +1030,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
             Contract.Assert(lhs.Var != null);  // the parser already checked that every LHS is a BoundVar, not a general pattern
             var v = lhs.Var;
             ScopePushAndReport(scope, v, "let-variable");
-            ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+            ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
           }
           foreach (var rhs in e.RHSs) {
             ResolveExpression(rhs, resolutionContext);
@@ -1032,7 +1052,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         foreach (BoundVar v in e.BoundVars) {
           ScopePushAndReport(scope, v, "bound-variable");
           var option = new ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies);
-          ResolveType(v.tok, v.Type, resolutionContext, option, null);
+          ResolveType(v.Origin, v.Type, resolutionContext, option, null);
         }
         if (e.Range != null) {
           ResolveExpression(e.Range, resolutionContext);
@@ -1054,7 +1074,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         scope.PushMarker();
         foreach (BoundVar v in e.BoundVars) {
           ScopePushAndReport(scope, v, "bound-variable");
-          ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
           var inferredProxy = v.Type as InferredTypeProxy;
           if (inferredProxy != null) {
             Contract.Assert(!inferredProxy.KeepConstraints);  // in general, this proxy is inferred to be a base type
@@ -1077,7 +1097,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         Contract.Assert(e.BoundVars.Count == 1 || (1 < e.BoundVars.Count && e.TermLeft != null));
         foreach (BoundVar v in e.BoundVars) {
           ScopePushAndReport(scope, v, "bound-variable");
-          ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
           var inferredProxy = v.Type as InferredTypeProxy;
           if (inferredProxy != null) {
             Contract.Assert(!inferredProxy.KeepConstraints);  // in general, this proxy is inferred to be a base type
@@ -1103,7 +1123,7 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
         scope.PushMarker();
         foreach (BoundVar v in e.BoundVars) {
           ScopePushAndReport(scope, v, "bound-variable");
-          ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         }
 
         if (e.Range != null) {
@@ -1111,22 +1131,22 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
           Contract.Assert(e.Range.Type != null);  // follows from postcondition of ResolveExpression
           ConstrainTypeExprBool(e.Range, "Precondition must be boolean (got {0})");
         }
-        foreach (var read in e.Reads) {
+        foreach (var read in e.Reads.Expressions) {
           ResolveFrameExpression(read, FrameExpressionUse.Reads, resolutionContext);
         }
         ResolveExpression(e.Term, resolutionContext);
         Contract.Assert(e.Term.Type != null);
         scope.PopMarker();
-        expr.Type = SelectAppropriateArrowType(e.tok, e.BoundVars.ConvertAll(v => v.Type), e.Body.Type, e.Reads.Count != 0, e.Range != null, SystemModuleManager);
+        expr.Type = SelectAppropriateArrowType(e.Origin, e.BoundVars.ConvertAll(v => v.Type), e.Body.Type, e.Reads.Expressions.Count != 0, e.Range != null, SystemModuleManager);
       } else if (expr is WildcardExpr) {
-        expr.Type = new SetType(true, SystemModuleManager.ObjectQ());
+        expr.Type = SystemModuleManager.ObjectSetType();
       } else if (expr is StmtExpr) {
         var e = (StmtExpr)expr;
         int prevErrorCount = reporter.Count(ErrorLevel.Error);
 
         ResolveStatement(e.S, resolutionContext);
         if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
-          var r = e.S as UpdateStmt;
+          var r = e.S as AssignStatement;
           if (r != null && r.ResolvedStatements.Count == 1) {
             var call = r.ResolvedStatements[0] as CallStmt;
             if (call.Method is TwoStateLemma && !resolutionContext.IsTwoState) {
@@ -1154,6 +1174,12 @@ public void ResolveExpressionX(Expression expr, ResolutionContext resolutionCont
 
       } else if (expr is NestedMatchExpr nestedMatchExpr) {
         ResolveNestedMatchExpr(nestedMatchExpr, resolutionContext);
+      } else if (expr is DecreasesToExpr decreasesToExpr) {
+        foreach (var subexpr in decreasesToExpr.SubExpressions) {
+          ResolveExpression(subexpr, resolutionContext);
+        }
+
+        decreasesToExpr.Type = Type.Bool;
       } else {
         Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
       }
@@ -1182,7 +1208,7 @@ public void ResolveTypeParameters(List<TypeParameter/*!*/>/*!*/ tparams, bool em
           if (r == Scope<TypeParameter>.PushResult.Duplicate) {
             reporter.Error(MessageSource.Resolver, ParseErrors.ErrorId.none, tp, "Duplicate type-parameter name: {0}", tp.Name);
           } else if (r == Scope<TypeParameter>.PushResult.Shadow) {
-            reporter.Warning(MessageSource.Resolver, ParseErrors.ErrorId.none, tp.tok, "Shadowed type-parameter name: {0}", tp.Name);
+            reporter.Warning(MessageSource.Resolver, ParseErrors.ErrorId.none, tp.Origin, "Shadowed type-parameter name: {0}", tp.Name);
           }
         }
       }
@@ -1194,16 +1220,16 @@ public bool ConstrainSubtypeRelation(Type super, Type sub, Expression exprForTok
       Contract.Requires(exprForToken != null);
       Contract.Requires(msg != null);
       Contract.Requires(msgArgs != null);
-      return ConstrainSubtypeRelation(super, sub, exprForToken.tok, msg, msgArgs);
+      return ConstrainSubtypeRelation(super, sub, exprForToken.Origin, msg, msgArgs);
     }
 
-    public void ConstrainTypeExprBool(Expression e, string msg) {
+    public void ConstrainTypeExprBool(Expression e, string message) {
       Contract.Requires(e != null);
-      Contract.Requires(msg != null);  // expected to have a {0} part
-      ConstrainSubtypeRelation(Type.Bool, e.Type, e, msg, e.Type);
+      Contract.Requires(message != null);  // expected to have a {0} part
+      ConstrainSubtypeRelation(Type.Bool, e.Type, e, message, e.Type);
     }
 
-    public bool ConstrainSubtypeRelation(Type super, Type sub, IToken tok, string msg, params object[] msgArgs) {
+    public bool ConstrainSubtypeRelation(Type super, Type sub, IOrigin tok, string msg, params object[] msgArgs) {
       Contract.Requires(sub != null);
       Contract.Requires(super != null);
       Contract.Requires(tok != null);
@@ -1656,7 +1682,7 @@ private static List<int> ConstrainTypeHead_Recursive(Type super, ref Type sub) {
         return polarities;
       }
 
-      foreach (var subParentType in sub.ParentTypes()) {
+      foreach (var subParentType in sub.ParentTypes(true)) {
         sub = subParentType;
         polarities = ConstrainTypeHead_Recursive(super, ref sub);
         if (polarities != null) {
@@ -2176,7 +2202,7 @@ public void PartiallySolveTypeConstraints(bool allowDecisions) {
       }
     }
 
-    TypeProxy NewIntegerBasedProxy(IToken tok) {
+    TypeProxy NewIntegerBasedProxy(IOrigin tok) {
       Contract.Requires(tok != null);
       var proxy = new InferredTypeProxy();
       ConstrainSubtypeRelation(new IntVarietiesSupertype(), proxy, tok, "integer literal used as if it had type {0}", proxy);
@@ -2730,7 +2756,7 @@ void ResolveClassMemberBodiesInitial(TopLevelDeclWithMembers cl) {
           }
           ResolveExpression(constantField.Rhs, resolutionContext);
           scope.PopMarker();
-          AddAssignableConstraint(constantField.tok, constantField.Type, constantField.Rhs.Type,
+          AddAssignableConstraint(constantField.Origin, constantField.Type, constantField.Rhs.Type,
             "type for constant '" + constantField.Name + "' is '{0}', but its initialization value type is '{1}'");
           SolveAllTypeConstraints();
         }
@@ -2752,10 +2778,10 @@ void ResolveClassMemberBodies(TopLevelDeclWithMembers cl) {
       foreach (MemberDecl member in cl.Members) {
         Contract.Assert(VisibleInScope(member));
         if (member.HasUserAttribute("only", out var attribute)) {
-          reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.r_member_only_assumes_other.ToString(), attribute.RangeToken.ToToken(),
+          reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.r_member_only_assumes_other.ToString(), attribute.Origin,
             "Members with {:only} temporarily disable the verification of other members in the entire file");
           if (attribute.Args.Count >= 1) {
-            reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.r_member_only_has_no_before_after.ToString(), attribute.Args[0].RangeToken.ToToken(),
+            reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.r_member_only_has_no_before_after.ToString(), attribute.Args[0].Origin,
               "{:only} on members does not support arguments");
           }
         }
@@ -2844,7 +2870,7 @@ void ResolveCtorSignature(DatatypeCtor ctor, List<TypeParameter> dtTypeArguments
       Contract.Requires(ctor.EnclosingDatatype != null);
       Contract.Requires(dtTypeArguments != null);
       foreach (Formal p in ctor.Formals) {
-        ResolveType(p.tok, p.Type, ctor.EnclosingDatatype, ResolveTypeOptionEnum.AllowPrefix, dtTypeArguments);
+        ResolveType(p.Origin, p.Type, ctor.EnclosingDatatype, ResolveTypeOptionEnum.AllowPrefix, dtTypeArguments);
       }
     }
 
@@ -2867,7 +2893,7 @@ public void ResolveFrameExpressionTopLevel(FrameExpression fe, FrameExpressionUs
       ResolveFrameExpression(fe, use, new ResolutionContext(codeContext, false));
     }
 
-    void ResolveFrameExpression(FrameExpression fe, FrameExpressionUse use, ResolutionContext resolutionContext) {
+    public void ResolveFrameExpression(FrameExpression fe, FrameExpressionUse use, ResolutionContext resolutionContext) {
       Contract.Requires(fe != null);
       Contract.Requires(resolutionContext != null);
 
@@ -2876,16 +2902,16 @@ void ResolveFrameExpression(FrameExpression fe, FrameExpressionUse use, Resoluti
       Contract.Assert(t != null);  // follows from postcondition of ResolveExpression
       var eventualRefType = new InferredTypeProxy();
       if (use == FrameExpressionUse.Reads) {
-        AddXConstraint(fe.E.tok, "ReadsFrame", t, eventualRefType,
+        AddXConstraint(fe.E.Origin, "ReadsFrame", t, eventualRefType,
           "a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got {0})");
       } else {
-        AddXConstraint(fe.E.tok, "ModifiesFrame", t, eventualRefType,
+        AddXConstraint(fe.E.Origin, "ModifiesFrame", t, eventualRefType,
           use == FrameExpressionUse.Modifies ?
           "a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got {0})" :
           "an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got {0})");
       }
       if (fe.FieldName != null) {
-        var member = ResolveMember(fe.E.tok, eventualRefType, fe.FieldName, out var tentativeReceiverType);
+        var member = ResolveMember(fe.E.Origin, eventualRefType, fe.FieldName, out var tentativeReceiverType);
         var ctype = (UserDefinedType)tentativeReceiverType;  // correctness of cast follows from the DenotesClass test above
         if (member == null) {
           // error has already been reported by ResolveMember
@@ -2905,6 +2931,11 @@ void ResolveIterator(IteratorDecl iter) {
       Contract.Requires(currentClass == null);
       Contract.Ensures(currentClass == null);
 
+      if (Options.ForbidNondeterminism && iter.Outs.Count > 0) {
+        Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_iterators_are_not_deterministic, iter.Origin,
+          "since yield parameters are initialized arbitrarily, iterators are forbidden by the --enforce-determinism option");
+      }
+
       var initialErrorCount = reporter.Count(ErrorLevel.Error);
 
       // Add in-parameters to the scope, but don't care about any duplication errors, since they have already been reported
@@ -3026,10 +3057,10 @@ public void CheckIsLvalue(Expression lhs, ResolutionContext resolutionContext) {
         }
       } else if (lhs is SeqSelectExpr) {
         var ll = (SeqSelectExpr)lhs;
-        ConstrainSubtypeRelation(ResolvedArrayType(ll.Seq.tok, 1, new InferredTypeProxy(), resolutionContext, true), ll.Seq.Type, ll.Seq,
+        ConstrainSubtypeRelation(ResolvedArrayType(ll.Seq.Origin, 1, new InferredTypeProxy(), resolutionContext, true), ll.Seq.Type, ll.Seq,
           "LHS of array assignment must denote an array element (found {0})", ll.Seq.Type);
         if (!ll.SelectOne) {
-          reporter.Error(MessageSource.Resolver, ll.Seq, "cannot assign to a range of array elements (try the 'forall' statement)");
+          reporter.Error(MessageSource.Resolver, ll, "cannot assign to a range of array elements (try the 'forall' statement)");
         }
       } else if (lhs is MultiSelectExpr) {
         // nothing to check; this can only denote an array element
@@ -3063,18 +3094,18 @@ public void ResolveStatementWithLabels(Statement stmt, ResolutionContext resolut
       Contract.Requires(stmt != null);
       Contract.Requires(resolutionContext != null);
 
-      enclosingStatementLabels.PushMarker();
+      EnclosingStatementLabels.PushMarker();
       // push labels
       for (var l = stmt.Labels; l != null; l = l.Next) {
         var lnode = l.Data;
         Contract.Assert(lnode.Name != null);  // LabelNode's with .Label==null are added only during resolution of the break statements with 'stmt' as their target, which hasn't happened yet
-        var prev = enclosingStatementLabels.Find(lnode.Name);
+        var prev = EnclosingStatementLabels.Find(lnode.Name);
         if (prev == stmt) {
           reporter.Error(MessageSource.Resolver, lnode.Tok, "duplicate label");
         } else if (prev != null) {
           reporter.Error(MessageSource.Resolver, lnode.Tok, "label shadows an enclosing label");
         } else {
-          var r = enclosingStatementLabels.Push(lnode.Name, stmt);
+          var r = EnclosingStatementLabels.Push(lnode.Name, stmt);
           Contract.Assert(r == Scope<Statement>.PushResult.Success);  // since we just checked for duplicates, we expect the Push to succeed
           if (DominatingStatementLabels.Find(lnode.Name) != null) {
             reporter.Error(MessageSource.Resolver, lnode.Tok, "label shadows a dominating label");
@@ -3085,44 +3116,7 @@ public void ResolveStatementWithLabels(Statement stmt, ResolutionContext resolut
         }
       }
       ResolveStatement(stmt, resolutionContext);
-      enclosingStatementLabels.PopMarker();
-    }
-
-    void ResolveAlternatives(List<GuardedAlternative> alternatives, AlternativeLoopStmt loopToCatchBreaks, ResolutionContext resolutionContext) {
-      Contract.Requires(alternatives != null);
-      Contract.Requires(resolutionContext != null);
-
-      // first, resolve the guards
-      foreach (var alternative in alternatives) {
-        int prevErrorCount = reporter.Count(ErrorLevel.Error);
-        ResolveExpression(alternative.Guard, resolutionContext);
-        Contract.Assert(alternative.Guard.Type != null);  // follows from postcondition of ResolveExpression
-        bool successfullyResolved = reporter.Count(ErrorLevel.Error) == prevErrorCount;
-        ConstrainTypeExprBool(alternative.Guard, "condition is expected to be of type bool, but is {0}");
-      }
-
-      if (loopToCatchBreaks != null) {
-        loopStack.Add(loopToCatchBreaks);  // push
-      }
-      foreach (var alternative in alternatives) {
-        scope.PushMarker();
-        DominatingStatementLabels.PushMarker();
-        if (alternative.IsBindingGuard) {
-          var exists = (ExistsExpr)alternative.Guard;
-          foreach (var v in exists.BoundVars) {
-            ScopePushAndReport(scope, v, "bound-variable");
-          }
-        }
-        ResolveAttributes(alternative, resolutionContext);
-        foreach (Statement ss in alternative.Body) {
-          ResolveStatementWithLabels(ss, resolutionContext);
-        }
-        DominatingStatementLabels.PopMarker();
-        scope.PopMarker();
-      }
-      if (loopToCatchBreaks != null) {
-        loopStack.RemoveAt(loopStack.Count - 1);  // pop
-      }
+      EnclosingStatementLabels.PopMarker();
     }
 
     /// <summary>
@@ -3158,7 +3152,7 @@ void ResolveCallStmt(CallStmt s, ResolutionContext resolutionContext, Type recei
       } else {
         if (isInitCall) {
           if (callee.IsStatic) {
-            reporter.Error(MessageSource.Resolver, s.Tok, "a method called as an initialization method must not be 'static'");
+            reporter.Error(MessageSource.Resolver, s.Origin, "a method called as an initialization method must not be 'static'");
           } else {
             tryToResolve = true;
           }
@@ -3181,7 +3175,7 @@ void ResolveCallStmt(CallStmt s, ResolutionContext resolutionContext, Type recei
       if (tryToResolve) {
         var typeMap = s.MethodSelect.TypeArgumentSubstitutionsAtMemberDeclaration();
         // resolve arguments
-        ResolveActualParameters(s.Bindings, callee.Ins, s.Tok, callee, resolutionContext, typeMap,
+        ResolveActualParameters(s.Bindings, callee.Ins, s.Origin, callee, resolutionContext, typeMap,
           callee.IsStatic ? null : s.Receiver);
         // type check the out-parameter arguments (in-parameters were type checked as part of ResolveActualParameters)
         for (int i = 0; i < callee.Outs.Count && i < s.Lhs.Count; i++) {
@@ -3192,7 +3186,7 @@ void ResolveCallStmt(CallStmt s, ResolutionContext resolutionContext, Type recei
           var what = GetLocationInformation(outFormal, callee.Outs.Count(), i, "method out-parameter");
 
           AddAssignableConstraint(
-            s.Tok, lhs.Type, st,
+            s.Origin, lhs.Type, st,
             $"incorrect return type {what} (expected {{1}}, got {{0}})");
         }
         for (int i = 0; i < s.Lhs.Count; i++) {
@@ -3202,7 +3196,7 @@ void ResolveCallStmt(CallStmt s, ResolutionContext resolutionContext, Type recei
         }
       }
       if (Contract.Exists(callee.Decreases.Expressions, e => e is WildcardExpr) && !resolutionContext.CodeContext.AllowsNontermination) {
-        reporter.Error(MessageSource.Resolver, s.Tok, "a call to a possibly non-terminating method is allowed only if the calling method is also declared (with 'decreases *') to be possibly non-terminating");
+        reporter.Error(MessageSource.Resolver, s.Origin, "a call to a possibly non-terminating method is allowed only if the calling method is also declared (with 'decreases *') to be possibly non-terminating");
       }
     }
 
@@ -3212,12 +3206,12 @@ void ResolveCallStmt(CallStmt s, ResolutionContext resolutionContext, Type recei
     /// "typeMap" is applied to the type of each formal.
     /// This method should be called only once. That is, bindings.arguments is required to be null on entry to this method.
     /// </summary>
-    void ResolveActualParameters(ActualBindings bindings, List<Formal> formals, IToken callTok, object context, ResolutionContext resolutionContext,
+    internal void ResolveActualParameters(ActualBindings bindings, List<Formal> formals, IOrigin callTok, object context, ResolutionContext resolutionContext,
       Dictionary<TypeParameter, Type> typeMap, Expression/*?*/ receiver) {
       Contract.Requires(bindings != null);
       Contract.Requires(formals != null);
       Contract.Requires(callTok != null);
-      Contract.Requires(context is Method || context is Function || context is DatatypeCtor || context is ArrowType);
+      Contract.Requires(context is Method || context is Function || context is DatatypeCtor || context is ArrowType || context is UserSuppliedAtAttribute);
       Contract.Requires(typeMap != null);
       Contract.Requires(!bindings.WasResolved);
 
@@ -3232,6 +3226,9 @@ void ResolveActualParameters(ActualBindings bindings, List<Formal> formals, ITok
       } else if (context is DatatypeCtor cCtor) {
         whatKind = "datatype constructor";
         name = $"{whatKind} '{cCtor.Name}'";
+      } else if (context is UserSuppliedAtAttribute usaa) {
+        whatKind = "attribute";
+        name = $"{whatKind} '{usaa.UserSuppliedName}'";
       } else {
         var cArrowType = (ArrowType)context;
         whatKind = "function application";
@@ -3288,13 +3285,13 @@ void ResolveActualParameters(ActualBindings bindings, List<Formal> formals, ITok
             reporter.Error(MessageSource.Resolver, binding.FormalParameterName, $"duplicate binding for parameter name '{pname}'");
           }
         } else if (!stillAcceptingPositionalArguments) {
-          reporter.Error(MessageSource.Resolver, arg.tok, "a positional argument is not allowed to follow named arguments");
+          reporter.Error(MessageSource.Resolver, arg.Origin, "a positional argument is not allowed to follow named arguments");
         } else if (bindingIndex < formals.Count) {
           // use the name of formal corresponding to this positional argument, unless the parameter is named-only
           var formal = formals[bindingIndex];
           var pname = formal.Name;
           if (formal.IsNameOnly) {
-            reporter.Error(MessageSource.Resolver, arg.tok,
+            reporter.Error(MessageSource.Resolver, arg.Origin,
               $"nameonly parameter '{pname}' must be passed using a name binding; it cannot be passed positionally");
           }
           Contract.Assert(namesToActuals[pname] == null); // we expect this, since we've only filled parameters positionally so far
@@ -3330,28 +3327,26 @@ void ResolveActualParameters(ActualBindings bindings, List<Formal> formals, ITok
             whatKind + (context is Method ? " in-parameter" : " parameter"));
 
           AddAssignableConstraint(
-            callTok, formal.Type.Subst(typeMap), b.Actual.Type,
+            b.Actual.Origin, formal.Type.Subst(typeMap), b.Actual.Type,
             $"incorrect argument type {what} (expected {{0}}, found {{1}})");
         } else if (formal.DefaultValue != null) {
           // Note, in the following line, "substMap" is passed in, but it hasn't been fully filled in until the
           // end of this foreach loop. Still, that's soon enough, because DefaultValueExpression won't use it
-          // until FillInDefaultValueExpressions at the end of Pass 1 of the Resolver.
-          var n = new DefaultValueExpression(callTok, formal, receiver, substMap, typeMap);
+          // until FillInDefaultValueExpressions at the end of Pass 0 of the Resolver.
+          var n = new DefaultValueExpressionType(callTok, formal, receiver, substMap, typeMap) { Type = formal.Type.Subst(typeMap) };
           allDefaultValueExpressions.Add(n);
           actuals.Add(n);
           substMap.Add(formal, n);
         } else {
           // parameter has no value
-          if (onlyPositionalArguments) {
-            // a simple error message has already been reported
-            Contract.Assert(simpleErrorReported);
-          } else {
+          if (!simpleErrorReported) {
             var formalDescription = whatKind + (context is Method ? " in-parameter" : " parameter");
             var nameWithIndex = formal.HasName && formal is not ImplicitFormal ? "'" + formal.Name + "'" : "";
             if (formals.Count > 1 || nameWithIndex == "") {
               nameWithIndex += nameWithIndex == "" ? "" : " ";
               nameWithIndex += $"at index {formalIndex}";
             }
+
             var message = $"{formalDescription} {nameWithIndex} requires an argument of type {formal.Type}";
             reporter.Error(MessageSource.Resolver, callTok, message);
           }
@@ -3408,15 +3403,15 @@ ResolveTypeReturn ResolveDotSuffix_Type(ExprDotName expr, ResolutionContext reso
 
       if (expr.OptTypeArguments != null) {
         foreach (var ty in expr.OptTypeArguments) {
-          ResolveType(expr.tok, ty, resolutionContext, option, defaultTypeArguments);
+          ResolveType(expr.Origin, ty, resolutionContext, option, defaultTypeArguments);
         }
       }
 
       Expression r = null;  // the resolved expression, if successful
 
       var lhs = expr.Lhs.Resolved;
-      if (lhs != null && lhs.Type is Resolver_IdentifierExpr.ResolverType_Module) {
-        var ri = (Resolver_IdentifierExpr)lhs;
+      if (lhs != null && lhs.Type is ResolverIdentifierExpr.ResolverTypeModule) {
+        var ri = (ResolverIdentifierExpr)lhs;
         var sig = ((ModuleDecl)ri.Decl).AccessibleSignature(false);
         sig = GetSignature(sig);
         // For 0:
@@ -3425,36 +3420,36 @@ ResolveTypeReturn ResolveDotSuffix_Type(ExprDotName expr, ResolutionContext reso
           // ----- 0. Member of the specified module
           if (decl is AmbiguousTopLevelDecl) {
             var ad = (AmbiguousTopLevelDecl)decl;
-            reporter.Error(MessageSource.Resolver, expr.tok, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", expr.SuffixName, ad.ModuleNames());
+            reporter.Error(MessageSource.Resolver, expr.Origin, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", expr.SuffixName, ad.ModuleNames());
           } else {
             // We have found a module name or a type name.  We create a temporary expression that will never be seen by the compiler
             // or verifier, just to have a placeholder where we can recorded what we have found.
-            r = CreateResolver_IdentifierExpr(expr.tok, expr.SuffixName, expr.OptTypeArguments, decl);
+            r = CreateResolver_IdentifierExpr(expr.Origin, expr.SuffixName, expr.OptTypeArguments, decl);
           }
 #if ASYNC_TASK_TYPES
         } else if (sig.StaticMembers.TryGetValue(expr.SuffixName, out member)) {
           // ----- 1. static member of the specified module
           Contract.Assert(member.IsStatic); // moduleInfo.StaticMembers is supposed to contain only static members of the module's implicit class _default
           if (ReallyAmbiguousThing(ref member)) {
-            reporter.Error(MessageSource.Resolver, expr.tok, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.SuffixName, ((AmbiguousMemberDecl)member).ModuleNames());
+            reporter.Error(MessageSource.Resolver, expr.Tok, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.SuffixName, ((AmbiguousMemberDecl)member).ModuleNames());
           } else {
-            var receiver = new StaticReceiverExpr(expr.tok, (ClassLikeDecl)member.EnclosingClass);
-            r = ResolveExprDotCall(expr.tok, receiver, member, expr.OptTypeArguments, opts.resolutionContext, allowMethodCall);
+            var receiver = new StaticReceiverExpr(expr.Tok, (ClassLikeDecl)member.EnclosingClass);
+            r = ResolveExprDotCall(expr.Tok, receiver, member, expr.OptTypeArguments, opts.resolutionContext, allowMethodCall);
           }
 #endif
         } else {
-          reporter.Error(MessageSource.Resolver, expr.tok, "module '{0}' does not declare a type '{1}'", ri.Decl.Name, expr.SuffixName);
+          reporter.Error(MessageSource.Resolver, expr.Origin, "module '{0}' does not declare a type '{1}'", ri.Decl.Name, expr.SuffixName);
         }
 
-      } else if (lhs != null && lhs.Type is Resolver_IdentifierExpr.ResolverType_Type) {
-        var ri = (Resolver_IdentifierExpr)lhs;
+      } else if (lhs != null && lhs.Type is ResolverIdentifierExpr.ResolverTypeType) {
+        var ri = (ResolverIdentifierExpr)lhs;
         // ----- 2. Look up name in type
-        var ty = new UserDefinedType(ri.tok, ri.Decl.Name, ri.Decl, ri.TypeArgs);
+        var ty = new UserDefinedType(ri.Origin, ri.Decl.Name, ri.Decl, ri.TypeArgs);
         if (allowDanglingDotName && ty.IsRefType) {
           return new ResolveTypeReturn(ty, expr);
         }
         if (r == null) {
-          reporter.Error(MessageSource.Resolver, expr.tok, "member '{0}' does not exist in type '{1}' or cannot be part of type name", expr.SuffixName, ri.Decl.Name);
+          reporter.Error(MessageSource.Resolver, expr.Origin, "member '{0}' does not exist in type '{1}' or cannot be part of type name", expr.SuffixName, ri.Decl.Name);
         }
       }
 
@@ -3468,11 +3463,11 @@ ResolveTypeReturn ResolveDotSuffix_Type(ExprDotName expr, ResolutionContext reso
       return null;
     }
 
-    internal Resolver_IdentifierExpr CreateResolver_IdentifierExpr(IToken tok, string name, List<Type> optTypeArguments, TopLevelDecl decl) {
+    internal ResolverIdentifierExpr CreateResolver_IdentifierExpr(IOrigin tok, string name, List<Type> optTypeArguments, TopLevelDecl decl) {
       Contract.Requires(tok != null);
       Contract.Requires(name != null);
       Contract.Requires(decl != null);
-      Contract.Ensures(Contract.Result<Resolver_IdentifierExpr>() != null);
+      Contract.Ensures(Contract.Result<ResolverIdentifierExpr>() != null);
 
       if (!moduleInfo.IsAbstract) {
         if (decl is ModuleDecl md && md.Signature.IsAbstract) {
@@ -3490,117 +3485,35 @@ internal Resolver_IdentifierExpr CreateResolver_IdentifierExpr(IToken tok, strin
       for (int i = 0; i < decl.TypeArgs.Count; i++) {
         tpArgs.Add(i < n ? optTypeArguments[i] : new InferredTypeProxy());
       }
-      return new Resolver_IdentifierExpr(tok, decl, tpArgs);
+      return new ResolverIdentifierExpr(tok, decl, tpArgs);
     }
 
     public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext) {
       Contract.Requires(stmt != null);
       Contract.Requires(resolutionContext != null);
+      if (stmt is ICanResolveNewAndOld genericCanResolve) {
+        genericCanResolve.GenResolve(this, resolutionContext);
+        return;
+      }
+
       if (stmt is ICanResolve canResolve) {
         canResolve.Resolve(this, resolutionContext);
         return;
       }
+
       if (!(stmt is ForallStmt || stmt is ForLoopStmt)) {  // "forall" and "for" statements do their own attribute resolution below
         ResolveAttributes(stmt, resolutionContext);
       }
-      if (stmt is PredicateStmt) {
-        PredicateStmt s = (PredicateStmt)stmt;
-        var assertStmt = stmt as AssertStmt;
-        if (assertStmt != null && assertStmt.Label != null) {
-          if (DominatingStatementLabels.Find(assertStmt.Label.Name) != null) {
-            reporter.Error(MessageSource.Resolver, assertStmt.Label.Tok, "assert label shadows a dominating label");
-          } else {
-            var rr = DominatingStatementLabels.Push(assertStmt.Label.Name, assertStmt.Label);
-            Contract.Assert(rr == Scope<Label>.PushResult.Success);  // since we just checked for duplicates, we expect the Push to succeed
-          }
-        }
-
-        if (assertStmt != null && assertStmt.HasUserAttribute("only", out var attribute)) {
-          reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.r_assert_only_assumes_others.ToString(), attribute.RangeToken.ToToken(),
-            "Assertion with {:only} temporarily transforms other assertions into assumptions");
-          if (attribute.Args.Count >= 1
-              && attribute.Args[0] is LiteralExpr { Value: string value }
-              && value != "before" && value != "after") {
-            reporter.Warning(MessageSource.Verifier, ResolutionErrors.ErrorId.r_assert_only_before_after.ToString(), attribute.Args[0].RangeToken.ToToken(),
-              "{:only} only accepts \"before\" or \"after\" as an optional argument");
-          }
-        }
-        ResolveExpression(s.Expr, resolutionContext);
-        Contract.Assert(s.Expr.Type != null);  // follows from postcondition of ResolveExpression
-        ConstrainTypeExprBool(s.Expr, "condition is expected to be of type bool, but is {0}");
-        if (assertStmt != null && assertStmt.Proof != null) {
-          // clear the labels for the duration of checking the proof body, because break statements are not allowed to leave a the proof body
-          var prevLblStmts = enclosingStatementLabels;
-          var prevLoopStack = loopStack;
-          enclosingStatementLabels = new Scope<Statement>(Options);
-          loopStack = new List<Statement>();
-          ResolveStatement(assertStmt.Proof, resolutionContext);
-          enclosingStatementLabels = prevLblStmts;
-          loopStack = prevLoopStack;
-        }
-        var expectStmt = stmt as ExpectStmt;
-        if (expectStmt != null) {
-          if (expectStmt.Message == null) {
-            expectStmt.Message = new StringLiteralExpr(s.Tok, "expectation violation", false);
-          }
-          ResolveExpression(expectStmt.Message, resolutionContext);
-          Contract.Assert(expectStmt.Message.Type != null);  // follows from postcondition of ResolveExpression
-        }
-
-      } else if (stmt is PrintStmt) {
+      if (stmt is PrintStmt) {
         var s = (PrintStmt)stmt;
         s.Args.ForEach(e => ResolveExpression(e, resolutionContext));
 
-      } else if (stmt is RevealStmt) {
-        var s = (RevealStmt)stmt;
-        foreach (var expr in s.Exprs) {
-          var name = RevealStmt.SingleName(expr);
-          var labeledAssert = name == null ? null : DominatingStatementLabels.Find(name) as AssertLabel;
-          if (labeledAssert != null) {
-            s.LabeledAsserts.Add(labeledAssert);
-          } else {
-            var revealResolutionContext = resolutionContext with { InReveal = true };
-            if (expr is ApplySuffix) {
-              var e = (ApplySuffix)expr;
-              var methodCallInfo = ResolveApplySuffix(e, revealResolutionContext, true);
-              if (methodCallInfo == null) {
-                reporter.Error(MessageSource.Resolver, expr.tok, "expression has no reveal lemma");
-              } else if (methodCallInfo.Callee.Member is TwoStateLemma && !revealResolutionContext.IsTwoState) {
-                reporter.Error(MessageSource.Resolver, methodCallInfo.Tok, "a two-state function can only be revealed in a two-state context");
-              } else if (methodCallInfo.Callee.AtLabel != null) {
-                Contract.Assert(methodCallInfo.Callee.Member is TwoStateLemma);
-                reporter.Error(MessageSource.Resolver, methodCallInfo.Tok, "to reveal a two-state function, do not list any parameters or @-labels");
-              } else {
-                var call = new CallStmt(s.RangeToken, new List<Expression>(), methodCallInfo.Callee, methodCallInfo.ActualParameters, methodCallInfo.Tok);
-                s.ResolvedStatements.Add(call);
-              }
-            } else if (expr is NameSegment or ExprDotName) {
-              if (expr is NameSegment) {
-                ResolveNameSegment((NameSegment)expr, true, null, revealResolutionContext, true);
-              } else {
-                ResolveDotSuffix((ExprDotName)expr, true, null, revealResolutionContext, true);
-              }
-              MemberSelectExpr callee = (MemberSelectExpr)((ConcreteSyntaxExpression)expr).ResolvedExpression;
-              if (callee == null) {
-              } else if (callee.Member is Lemma or TwoStateLemma && Attributes.Contains(callee.Member.Attributes, "axiom")) {
-                //The revealed member is a function
-                reporter.Error(MessageSource.Resolver, callee.tok, "to reveal a function ({0}), append parentheses", callee.Member.ToString().Substring(7));
-              } else {
-                var call = new CallStmt(s.RangeToken, new List<Expression>(), callee, new List<ActualBinding>(), expr.tok);
-                s.ResolvedStatements.Add(call);
-              }
-            } else {
-              ResolveExpression(expr, revealResolutionContext);
-            }
-          }
-        }
-        foreach (var a in s.ResolvedStatements) {
-          ResolveStatement(a, resolutionContext);
-        }
-      } else if (stmt is BreakStmt) {
-        var s = (BreakStmt)stmt;
+      } else if (stmt is HideRevealStmt hideRevealStmt) {
+        stmt.GenResolve(this, resolutionContext);
+      } else if (stmt is BreakOrContinueStmt) {
+        var s = (BreakOrContinueStmt)stmt;
         if (s.TargetLabel != null) {
-          Statement target = enclosingStatementLabels.Find(s.TargetLabel.val);
+          Statement target = EnclosingStatementLabels.Find(s.TargetLabel.val);
           if (target == null) {
             reporter.Error(MessageSource.Resolver, s.TargetLabel, $"{s.Kind} label is undefined or not in scope: {s.TargetLabel.val}");
           } else if (s.IsContinue && !(target is LoopStmt)) {
@@ -3613,16 +3526,16 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
           var jumpStmt = s.BreakAndContinueCount == 1 ?
             $"a non-labeled '{s.Kind}' statement" :
             $"a '{Util.Repeat(s.BreakAndContinueCount - 1, "break ")}{s.Kind}' statement";
-          if (loopStack.Count == 0) {
+          if (LoopStack.Count == 0) {
             reporter.Error(MessageSource.Resolver, s, $"{jumpStmt} is allowed only in loops");
-          } else if (loopStack.Count < s.BreakAndContinueCount) {
+          } else if (LoopStack.Count < s.BreakAndContinueCount) {
             reporter.Error(MessageSource.Resolver, s,
-              $"{jumpStmt} is allowed only in contexts with {s.BreakAndContinueCount} enclosing loops, but the current context only has {loopStack.Count}");
+              $"{jumpStmt} is allowed only in contexts with {s.BreakAndContinueCount} enclosing loops, but the current context only has {LoopStack.Count}");
           } else {
-            Statement target = loopStack[loopStack.Count - s.BreakAndContinueCount];
+            Statement target = LoopStack[LoopStack.Count - s.BreakAndContinueCount];
             if (target.Labels == null) {
               // make sure there is a label, because the compiler and translator will want to see a unique ID
-              target.Labels = new LList<Label>(new Label(target.Tok, null), null);
+              target.Labels = new LList<Label>(new Label(target.Origin, null), null);
             }
             s.TargetStmt = target;
           }
@@ -3651,20 +3564,20 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
             foreach (Formal f in cmc.Outs) {
               Expression produceLhs;
               if (stmt is ReturnStmt) {
-                var ident = new ImplicitIdentifierExpr(f.tok, f.Name);
+                var ident = new ImplicitIdentifierExpr(f.NameNode.Origin, f.Name);
                 // resolve it here to avoid capture into more closely declared local variables
                 ident.Var = f;
                 ident.Type = ident.Var.Type;
                 Contract.Assert(f.Type != null);
                 produceLhs = ident;
               } else {
-                var yieldIdent = new MemberSelectExpr(f.tok, new ImplicitThisExpr(f.tok), f.Name);
+                var yieldIdent = new MemberSelectExpr(f.Origin, new ImplicitThisExpr(f.NameNode.Origin), f.NameNode);
                 ResolveExpression(yieldIdent, resolutionContext);
                 produceLhs = yieldIdent;
               }
               formals.Add(produceLhs);
             }
-            s.HiddenUpdate = new UpdateStmt(s.RangeToken, formals, s.Rhss, true);
+            s.HiddenUpdate = new AssignStatement(s.Origin, formals, s.Rhss, true);
             // resolving the update statement will check for return/yield statement specifics.
             ResolveStatement(s.HiddenUpdate, resolutionContext);
           }
@@ -3674,7 +3587,7 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
       } else if (stmt is VarDeclStmt) {
         var s = (VarDeclStmt)stmt;
         // We have four cases.
-        Contract.Assert(s.Update == null || s.Update is AssignSuchThatStmt || s.Update is UpdateStmt || s.Update is AssignOrReturnStmt);
+        Contract.Assert(s.Assign == null || s.Assign is AssignSuchThatStmt || s.Assign is AssignStatement || s.Assign is AssignOrReturnStmt);
         // 0.  There is no .Update.  This is easy, we will just resolve the locals.
         // 1.  The .Update is an AssignSuchThatStmt.  This is also straightforward:  first
         //     resolve the locals, which adds them to the scope, and then resolve the .Update.
@@ -3693,44 +3606,26 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
         // Resolve the types of the locals
         foreach (var local in s.Locals) {
           int prevErrorCount = reporter.Count(ErrorLevel.Error);
-          ResolveType(local.Tok, local.OptionalType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          ResolveType(local.Origin, local.SyntacticType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
           if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
-            local.type = local.OptionalType;
+            local.type = local.SyntacticType;
           } else {
             local.type = new InferredTypeProxy();
           }
         }
         // Resolve the UpdateStmt, if any
-        if (s.Update is UpdateStmt) {
-          var upd = (UpdateStmt)s.Update;
+        if (s.Assign is AssignStatement or AssignOrReturnStmt) {
           // resolve the LHS
-          Contract.Assert(upd.Lhss.Count == s.Locals.Count);
-          for (int i = 0; i < upd.Lhss.Count; i++) {
+          Contract.Assert(s.Assign.Lhss.Count == s.Locals.Count);
+          for (int i = 0; i < s.Assign.Lhss.Count; i++) {
             var local = s.Locals[i];
-            var lhs = (IdentifierExpr)upd.Lhss[i];  // the LHS in this case will be an IdentifierExpr, because that's how the parser creates the VarDeclStmt
+            var lhs = (IdentifierExpr)s.Assign.Lhss[i];  // the LHS in this case will be an IdentifierExpr, because that's how the parser creates the VarDeclStmt
             Contract.Assert(lhs.Type == null);  // not yet resolved
             lhs.Var = local;
             lhs.Type = local.Type;
           }
           // resolve the whole thing
-          s.Update.Resolve(this, resolutionContext);
-        }
-
-        if (s.Update is AssignOrReturnStmt) {
-          var assignOrRet = (AssignOrReturnStmt)s.Update;
-          // resolve the LHS
-          Contract.Assert(assignOrRet.Lhss.Count == s.Locals.Count);
-          for (int i = 0; i < s.Locals.Count; i++) {
-            var local = s.Locals[i];
-            var lhs = (IdentifierExpr)assignOrRet
-              .Lhss[i]; // the LHS in this case will be an IdentifierExpr, because that's how the parser creates the VarDeclStmt
-            Contract.Assert(lhs.Type == null); // not yet resolved
-            lhs.Var = local;
-            lhs.Type = local.Type;
-          }
-
-          // resolve the whole thing
-          assignOrRet.Resolve(this, resolutionContext);
+          s.Assign.Resolve(this, resolutionContext);
         }
         // Add the locals to the scope
         foreach (var local in s.Locals) {
@@ -3741,16 +3636,16 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
           ResolveAttributes(local, resolutionContext);
         }
         // Resolve the AssignSuchThatStmt, if any
-        if (s.Update is AssignSuchThatStmt assignSuchThatStmt) {
+        if (s.Assign is AssignSuchThatStmt assignSuchThatStmt) {
           assignSuchThatStmt.Resolve(this, resolutionContext);
         }
       } else if (stmt is VarDeclPattern) {
         VarDeclPattern s = (VarDeclPattern)stmt;
         foreach (var local in s.LocalVars) {
           int prevErrorCount = reporter.Count(ErrorLevel.Error);
-          ResolveType(local.Tok, local.OptionalType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          ResolveType(local.Origin, local.SyntacticType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
           if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
-            local.type = local.OptionalType;
+            local.type = local.SyntacticType;
           } else {
             local.type = new InferredTypeProxy();
           }
@@ -3765,10 +3660,10 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
         }
         if (c == 0) {
           // Every identifier-looking thing in the pattern resolved to a constructor; that is, this LHS is a constant literal
-          reporter.Error(MessageSource.Resolver, s.LHS.tok, "LHS is a constant literal; to be legal, it must introduce at least one bound variable");
+          reporter.Error(MessageSource.Resolver, s.LHS.Origin, "LHS is a constant literal; to be legal, it must introduce at least one bound variable");
         }
-      } else if (stmt is AssignStmt) {
-        AssignStmt s = (AssignStmt)stmt;
+      } else if (stmt is SingleAssignStmt) {
+        SingleAssignStmt s = (SingleAssignStmt)stmt;
         int prevErrorCount = reporter.Count(ErrorLevel.Error);
         ResolveExpression(s.Lhs, resolutionContext);  // allow ghosts for now, tighted up below
         bool lhsResolvedSuccessfully = reporter.Count(ErrorLevel.Error) == prevErrorCount;
@@ -3806,16 +3701,16 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
           Contract.Assert(rr.Expr.Type != null);  // follows from postcondition of ResolveExpression
 
           if (s.Lhs is ImplicitIdentifierExpr { Var: Formal { InParam: false } }) {
-            AddAssignableConstraint(stmt.Tok, lhsType, rr.Expr.Type, "Method return value mismatch (expected {0}, got {1})");
+            AddAssignableConstraint(stmt.Origin, lhsType, rr.Expr.Type, "Method return value mismatch (expected {0}, got {1})");
           } else {
-            AddAssignableConstraint(stmt.Tok, lhsType, rr.Expr.Type, "RHS (of type {1}) not assignable to LHS (of type {0})");
+            AddAssignableConstraint(stmt.Origin, lhsType, rr.Expr.Type, "RHS (of type {1}) not assignable to LHS (of type {0})");
           }
         } else if (s.Rhs is TypeRhs) {
           TypeRhs rr = (TypeRhs)s.Rhs;
-          Type t = ResolveTypeRhs(rr, stmt, resolutionContext);
-          AddAssignableConstraint(stmt.Tok, lhsType, t, "type {1} is not assignable to LHS (of type {0})");
-        } else if (s.Rhs is HavocRhs) {
-          // nothing else to do
+          ResolveTypeRhs(rr, stmt, resolutionContext);
+          AddAssignableConstraint(stmt.Origin, lhsType, rr.Type, "type {1} is not assignable to LHS (of type {0})");
+        } else if (s.Rhs is HavocRhs havocRhs) {
+          havocRhs.Resolve(this, resolutionContext);
         } else {
           Contract.Assert(false); throw new cce.UnreachableException();  // unexpected RHS
         }
@@ -3832,59 +3727,43 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
 
       } else if (stmt is IfStmt) {
         IfStmt s = (IfStmt)stmt;
-        if (s.Guard != null) {
-          ResolveExpression(s.Guard, resolutionContext);
-          Contract.Assert(s.Guard.Type != null);  // follows from postcondition of ResolveExpression
-          ConstrainTypeExprBool(s.Guard, "condition is expected to be of type bool, but is {0}");
-        }
-
-        scope.PushMarker();
-        if (s.IsBindingGuard) {
-          var exists = (ExistsExpr)s.Guard;
-          foreach (var v in exists.BoundVars) {
-            ScopePushAndReport(scope, v, "bound-variable");
-          }
-        }
-        DominatingStatementLabels.PushMarker();
-        ResolveBlockStatement(s.Thn, resolutionContext);
-        DominatingStatementLabels.PopMarker();
-        scope.PopMarker();
-
-        if (s.Els != null) {
-          DominatingStatementLabels.PushMarker();
-          ResolveStatement(s.Els, resolutionContext);
-          DominatingStatementLabels.PopMarker();
-        }
-
+        s.Resolve(this, resolutionContext);
       } else if (stmt is AlternativeStmt) {
         var s = (AlternativeStmt)stmt;
-        ResolveAlternatives(s.Alternatives, null, resolutionContext);
-
+        s.Resolve(this, resolutionContext);
       } else if (stmt is OneBodyLoopStmt) {
         var s = (OneBodyLoopStmt)stmt;
-        if (s is WhileStmt whileS && whileS.Guard != null) {
-          ResolveExpression(whileS.Guard, resolutionContext);
-          Contract.Assert(whileS.Guard.Type != null);  // follows from postcondition of ResolveExpression
-          ConstrainTypeExprBool(whileS.Guard, "condition is expected to be of type bool, but is {0}");
-        } else if (s is ForLoopStmt forS) {
+        if (s is WhileStmt whileS) {
+          if (whileS.Guard != null) {
+            ResolveExpression(whileS.Guard, resolutionContext);
+            Contract.Assert(whileS.Guard.Type != null);  // follows from postcondition of ResolveExpression
+            ConstrainTypeExprBool(whileS.Guard, "condition is expected to be of type bool, but is {0}");
+          } else {
+            if (!resolutionContext.IsGhost && Options.ForbidNondeterminism) {
+              Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_non_deterministic_loop_forbidden, s.Origin,
+                "nondeterministic loop forbidden by the --enforce-determinism option");
+            }
+          }
+        }
+        if (s is ForLoopStmt forS) {
           var loopIndex = forS.LoopIndex;
           int prevErrorCount = reporter.Count(ErrorLevel.Error);
-          ResolveType(loopIndex.Tok, loopIndex.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-          var err = new TypeConstraint.ErrorMsgWithToken(loopIndex.Tok, "index variable is expected to be of an integer type (got {0})", loopIndex.Type);
-          ConstrainToIntegerType(loopIndex.Tok, loopIndex.Type, false, err);
+          ResolveType(loopIndex.Origin, loopIndex.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          var err = new TypeConstraint.ErrorMsgWithToken(loopIndex.Origin, "index variable is expected to be of an integer type (got {0})", loopIndex.Type);
+          ConstrainToIntegerType(loopIndex.Origin, loopIndex.Type, false, err);
 
           ResolveExpression(forS.Start, resolutionContext);
-          AddAssignableConstraint(forS.Start.tok, forS.LoopIndex.Type, forS.Start.Type, "lower bound (of type {1}) not assignable to index variable (of type {0})");
+          AddAssignableConstraint(forS.Start.Origin, forS.LoopIndex.Type, forS.Start.Type, "lower bound (of type {1}) not assignable to index variable (of type {0})");
           if (forS.End != null) {
             ResolveExpression(forS.End, resolutionContext);
-            AddAssignableConstraint(forS.End.tok, forS.LoopIndex.Type, forS.End.Type, "upper bound (of type {1}) not assignable to index variable (of type {0})");
+            AddAssignableConstraint(forS.End.Origin, forS.LoopIndex.Type, forS.End.Type, "upper bound (of type {1}) not assignable to index variable (of type {0})");
             if (forS.Decreases.Expressions.Count != 0) {
-              reporter.Error(MessageSource.Resolver, forS.Decreases.Expressions[0].tok,
+              reporter.Error(MessageSource.Resolver, forS.Decreases.Expressions[0].Origin,
                 "a 'for' loop is allowed an explicit 'decreases' clause only if the end-expression is '*'");
             }
           } else if (forS.Decreases.Expressions.Count == 0 && !resolutionContext.CodeContext.AllowsNontermination) {
             // note, the following error message is also emitted elsewhere (if the loop bears a "decreases *")
-            reporter.Error(MessageSource.Resolver, forS.Tok,
+            reporter.Error(MessageSource.Resolver, forS.Origin,
               "a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating" +
               " (or you can add a 'decreases' clause to this 'for' loop if you want to prove that it does indeed terminate)");
           }
@@ -3898,11 +3777,11 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
         ResolveLoopSpecificationComponents(s.Invariants, s.Decreases, s.Mod, resolutionContext);
 
         if (s.Body != null) {
-          loopStack.Add(s);  // push
+          LoopStack.Add(s);  // push
           DominatingStatementLabels.PushMarker();
           ResolveStatement(s.Body, resolutionContext);
           DominatingStatementLabels.PopMarker();
-          loopStack.RemoveAt(loopStack.Count - 1);  // pop
+          LoopStack.RemoveAt(LoopStack.Count - 1);  // pop
         }
 
         if (s is ForLoopStmt) {
@@ -3911,9 +3790,12 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
 
       } else if (stmt is AlternativeLoopStmt) {
         var s = (AlternativeLoopStmt)stmt;
-        ResolveAlternatives(s.Alternatives, s, resolutionContext);
+        if (!resolutionContext.IsGhost && Options.ForbidNondeterminism) {
+          Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_case_based_loop_forbidden, s.Origin,
+            "case-based loop forbidden by the --enforce-determinism option");
+        }
+        AlternativeStmt.ResolveAlternatives(this, s.Alternatives, s, resolutionContext);
         ResolveLoopSpecificationComponents(s.Invariants, s.Decreases, s.Mod, resolutionContext);
-
       } else if (stmt is ForallStmt) {
         var s = (ForallStmt)stmt;
 
@@ -3921,7 +3803,7 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
         scope.PushMarker();
         foreach (BoundVar v in s.BoundVars) {
           ScopePushAndReport(scope, v, "local-variable");
-          ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         }
         ResolveExpression(s.Range, resolutionContext);
         Contract.Assert(s.Range.Type != null);  // follows from postcondition of ResolveExpression
@@ -3937,13 +3819,13 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
 
         if (s.Body != null) {
           // clear the labels for the duration of checking the body, because break statements are not allowed to leave a forall statement
-          var prevLblStmts = enclosingStatementLabels;
-          var prevLoopStack = loopStack;
-          enclosingStatementLabels = new Scope<Statement>(Options);
-          loopStack = new List<Statement>();
+          var prevLblStmts = EnclosingStatementLabels;
+          var prevLoopStack = LoopStack;
+          EnclosingStatementLabels = new Scope<Statement>(Options);
+          LoopStack = new List<Statement>();
           ResolveStatement(s.Body, resolutionContext);
-          enclosingStatementLabels = prevLblStmts;
-          loopStack = prevLoopStack;
+          EnclosingStatementLabels = prevLblStmts;
+          LoopStack = prevLoopStack;
         }
         scope.PopMarker();
 
@@ -3960,12 +3842,12 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
             // The effect of Assign and the postcondition of Call will be seen outside the forall
             // statement.
             Statement s0 = s.S0;
-            if (s0 is AssignStmt) {
+            if (s0 is SingleAssignStmt) {
               s.Kind = ForallStmt.BodyKind.Assign;
 
-              var rhs = ((AssignStmt)s0).Rhs;
+              var rhs = ((SingleAssignStmt)s0).Rhs;
               if (rhs is TypeRhs) {
-                reporter.Error(MessageSource.Resolver, rhs.Tok, "new allocation not supported in aggregate assignments");
+                reporter.Error(MessageSource.Resolver, rhs.Origin, "new allocation not supported in aggregate assignments");
               }
 
             } else if (s0 is CallStmt) {
@@ -3985,32 +3867,38 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
               // add the conclusion of the calc as a free postcondition
               var result = ((CalcStmt)s0).Result;
               s.Ens.Add(new AttributedExpression(result));
-              reporter.Info(MessageSource.Resolver, s.Tok, "ensures " + Printer.ExprToString(Options, result));
+              reporter.Info(MessageSource.Resolver, s.Origin, "ensures " + Printer.ExprToString(Options, result));
             } else {
               s.Kind = ForallStmt.BodyKind.Proof;
               if (s.Body is BlockStmt && ((BlockStmt)s.Body).Body.Count == 0) {
                 // an empty statement, so don't produce any warning
               } else {
-                reporter.Warning(MessageSource.Resolver, ParseErrors.ErrorId.none, s.Tok, "the conclusion of the body of this forall statement will not be known outside the forall statement; consider using an 'ensures' clause");
+                reporter.Warning(MessageSource.Resolver, ParseErrors.ErrorId.none, s.Origin, "the conclusion of the body of this forall statement will not be known outside the forall statement; consider using an 'ensures' clause");
               }
             }
           }
 
-          if (s.ForallExpressions != null) {
-            foreach (Expression expr in s.ForallExpressions) {
+          if (s.EffectiveEnsuresClauses != null) {
+            foreach (Expression expr in s.EffectiveEnsuresClauses) {
               ResolveExpression(expr, resolutionContext);
             }
           }
         }
 
       } else if (stmt is ModifyStmt) {
-        var s = (ModifyStmt)stmt;
-        ResolveAttributes(s.Mod, resolutionContext);
-        foreach (FrameExpression fe in s.Mod.Expressions) {
+        var modifyStmt = (ModifyStmt)stmt;
+        if (modifyStmt.Body == null) {
+          if (!resolutionContext.IsGhost && Options.ForbidNondeterminism) {
+            Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_bodyless_modify_statement_forbidden,
+              modifyStmt.Origin, "modify statement without a body forbidden by the --enforce-determinism option");
+          }
+        }
+        ResolveAttributes(modifyStmt.Mod, resolutionContext);
+        foreach (FrameExpression fe in modifyStmt.Mod.Expressions) {
           ResolveFrameExpression(fe, FrameExpressionUse.Modifies, resolutionContext);
         }
-        if (s.Body != null) {
-          ResolveBlockStatement(s.Body, resolutionContext);
+        if (modifyStmt.Body != null) {
+          ResolveBlockStatement(modifyStmt.Body, resolutionContext);
         }
 
       } else if (stmt is CalcStmt) {
@@ -4022,7 +3910,7 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
           s.Op = s.UserSuppliedOp;
         } else {
           s.Op = s.GetInferredDefaultOp() ?? CalcStmt.DefaultOp;
-          reporter.Info(MessageSource.Resolver, s.Tok, s.Op.ToString());
+          reporter.Info(MessageSource.Resolver, s.Origin, s.Op.ToString());
         }
 
         if (s.Lines.Count > 0) {
@@ -4030,7 +3918,7 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
           var e0 = s.Lines.First();
           ResolveExpression(e0, resolutionContext);
           Contract.Assert(e0.Type != null);  // follows from postcondition of ResolveExpression
-          var err = new TypeConstraint.ErrorMsgWithToken(e0.tok, "all lines in a calculation must have the same type (got {0} after {1})", e0.Type, lineType);
+          var err = new TypeConstraint.ErrorMsgWithToken(e0.Origin, "all lines in a calculation must have the same type (got {0} after {1})", e0.Type, lineType);
           ConstrainSubtypeRelation(lineType, e0.Type, err);
           for (int i = 1; i < s.Lines.Count; i++) {
             var e1 = s.Lines[i];
@@ -4038,7 +3926,7 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
             Contract.Assert(e1.Type != null);  // follows from postcondition of ResolveExpression
             // reuse the error object if we're on the dummy line; this prevents a duplicate error message
             if (i < s.Lines.Count - 1) {
-              err = new TypeConstraint.ErrorMsgWithToken(e1.tok, "all lines in a calculation must have the same type (got {0} after {1})", e1.Type, lineType);
+              err = new TypeConstraint.ErrorMsgWithToken(e1.Origin, "all lines in a calculation must have the same type (got {0} after {1})", e1.Type, lineType);
             }
             ConstrainSubtypeRelation(lineType, e1.Type, err);
             var step = (s.StepOps[i - 1] ?? s.Op).StepExpr(e0, e1); // Use custom line operator
@@ -4048,10 +3936,10 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
           }
 
           // clear the labels for the duration of checking the hints, because break statements are not allowed to leave a forall statement
-          var prevLblStmts = enclosingStatementLabels;
-          var prevLoopStack = loopStack;
-          enclosingStatementLabels = new Scope<Statement>(Options);
-          loopStack = new List<Statement>();
+          var prevLblStmts = EnclosingStatementLabels;
+          var prevLoopStack = LoopStack;
+          EnclosingStatementLabels = new Scope<Statement>(Options);
+          LoopStack = new List<Statement>();
           foreach (var h in s.Hints) {
             foreach (var oneHint in h.Body) {
               DominatingStatementLabels.PushMarker();
@@ -4059,8 +3947,8 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
               DominatingStatementLabels.PopMarker();
             }
           }
-          enclosingStatementLabels = prevLblStmts;
-          loopStack = prevLoopStack;
+          EnclosingStatementLabels = prevLblStmts;
+          LoopStack = prevLoopStack;
 
         }
         if (prevErrorCount == reporter.Count(ErrorLevel.Error) && s.Lines.Count > 0) {
@@ -4068,7 +3956,7 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
           var resultOp = s.StepOps.Aggregate(s.Op, (op0, op1) => op1 == null ? op0 : op0.ResultOp(op1));
           s.Result = resultOp.StepExpr(s.Lines.First(), s.Lines.Last());
         } else {
-          s.Result = CalcStmt.DefaultOp.StepExpr(Expression.CreateIntLiteral(s.Tok, 0), Expression.CreateIntLiteral(s.Tok, 0));
+          s.Result = CalcStmt.DefaultOp.StepExpr(Expression.CreateIntLiteral(s.Origin, 0), Expression.CreateIntLiteral(s.Origin, 0));
         }
         ResolveExpression(s.Result, resolutionContext);
         Contract.Assert(s.Result != null);
@@ -4076,7 +3964,7 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
 
       } else if (stmt is SkeletonStatement) {
         var s = (SkeletonStatement)stmt;
-        reporter.Error(MessageSource.Resolver, s.Tok, "skeleton statements are allowed only in refining methods");
+        reporter.Error(MessageSource.Resolver, s.Origin, "skeleton statements are allowed only in refining methods");
         // nevertheless, resolve the underlying statement; hey, why not
         if (s.S != null) {
           ResolveStatement(s.S, resolutionContext);
@@ -4156,23 +4044,23 @@ public void ResolveParameterDefaultValues(List<Formal> formals, ResolutionContex
       foreach (var formal in formals) {
         if (!formal.HasName) {
           foreach (var previousFormal in previousParametersWithDefaultValue) {
-            reporter.Error(MessageSource.Resolver, previousFormal.DefaultValue.tok,
-              $"because of a later nameless parameter, this default value is never used; remove it or name all subsequent parameters");
+            reporter.Error(MessageSource.Resolver, previousFormal.DefaultValue.Origin,
+              "because of a later nameless parameter, which is a required parameter, this default value is never used; remove it or name all subsequent parameters");
           }
           previousParametersWithDefaultValue.Clear();
         }
         var d = formal.DefaultValue;
         if (d != null) {
           ResolveExpression(d, resolutionContext);
-          AddAssignableConstraint(d.tok, formal.Type, d.Type, "default-value expression (of type '{1}') is not assignable to formal (of type '{0}')");
+          AddAssignableConstraint(d.Origin, formal.Type, d.Type, "default-value expression (of type '{1}') is not assignable to formal (of type '{0}')");
           foreach (var v in FreeVariables(d)) {
             dependencies.AddEdge(formal, v);
           }
           previousParametersWithDefaultValue.Add(formal);
         } else if (nameOfMostRecentNameonlyParameter != null && !formal.IsNameOnly) {
           // "formal" is preceded by a nameonly parameter, but itself is neither nameonly nor has a default value
-          reporter.Error(MessageSource.Resolver, formal.tok,
-            $"this parameter is effectively nameonly (because of the earlier nameonly parameter '{nameOfMostRecentNameonlyParameter}'); " +
+          reporter.Error(MessageSource.Resolver, formal.Origin,
+            $"this parameter has to be nameonly, because of the earlier nameonly parameter '{nameOfMostRecentNameonlyParameter}'; " +
             "declare it as nameonly or give it a default-value expression");
         }
         if (formal.IsNameOnly) {
@@ -4190,7 +4078,7 @@ public void ResolveParameterDefaultValues(List<Formal> formals, ResolutionContex
     /// <summary>
     /// See ResolveTypeOption for a description of the option/defaultTypeArguments parameters.
     /// </summary>
-    public void ResolveType(IToken tok, Type type, ResolutionContext resolutionContext, ResolveTypeOptionEnum eopt, List<TypeParameter> defaultTypeArguments) {
+    public void ResolveType(IOrigin tok, Type type, ResolutionContext resolutionContext, ResolveTypeOptionEnum eopt, List<TypeParameter> defaultTypeArguments) {
       Contract.Requires(tok != null);
       Contract.Requires(type != null);
       Contract.Requires(resolutionContext != null);
@@ -4198,15 +4086,15 @@ public void ResolveType(IToken tok, Type type, ResolutionContext resolutionConte
       ResolveType(tok, type, resolutionContext, new ResolveTypeOption(eopt), defaultTypeArguments);
     }
 
-    public void ResolveType(IToken tok, Type type, ICodeContext topLevelContext, ResolveTypeOptionEnum eopt, List<TypeParameter> defaultTypeArguments) {
+    public void ResolveType(IOrigin tok, Type type, ICodeContext topLevelContext, ResolveTypeOptionEnum eopt, List<TypeParameter> defaultTypeArguments) {
       ResolveType(tok, type, ResolutionContext.FromCodeContext(topLevelContext), eopt, defaultTypeArguments);
     }
 
-    public void ResolveType(IToken tok, Type type, ICodeContext topLevelContext, ResolveTypeOption option, List<TypeParameter> defaultTypeArguments) {
+    public void ResolveType(IOrigin tok, Type type, ICodeContext topLevelContext, ResolveTypeOption option, List<TypeParameter> defaultTypeArguments) {
       ResolveType(tok, type, ResolutionContext.FromCodeContext(topLevelContext), option, defaultTypeArguments);
     }
 
-    public void ResolveType(IToken tok, Type type, ResolutionContext resolutionContext, ResolveTypeOption option, List<TypeParameter> defaultTypeArguments) {
+    public void ResolveType(IOrigin tok, Type type, ResolutionContext resolutionContext, ResolveTypeOption option, List<TypeParameter> defaultTypeArguments) {
       Contract.Requires(tok != null);
       Contract.Requires(type != null);
       Contract.Requires(resolutionContext != null);
@@ -4225,7 +4113,7 @@ public record ResolveTypeReturn(Type ReplacementType, ExprDotName LastComponent)
     ///   shorter, then return an unresolved replacement type where the identifier sequence is one
     ///   shorter.  (In all other cases, the method returns null.)
     /// </summary>
-    public ResolveTypeReturn ResolveTypeLenient(IToken tok, Type type, ResolutionContext resolutionContext, ResolveTypeOption option, List<TypeParameter> defaultTypeArguments, bool allowDanglingDotName) {
+    public ResolveTypeReturn ResolveTypeLenient(IOrigin tok, Type type, ResolutionContext resolutionContext, ResolveTypeOption option, List<TypeParameter> defaultTypeArguments, bool allowDanglingDotName) {
       Contract.Requires(tok != null);
       Contract.Requires(type != null);
       Contract.Requires(resolutionContext != null);
@@ -4303,10 +4191,10 @@ public ResolveTypeReturn ResolveTypeLenient(IToken tok, Type type, ResolutionCon
           ResolveNameSegment_Type(s, resolutionContext, option, defaultTypeArguments);
         }
         if (reporter.Count(ErrorLevel.Error) == prevErrorCount) {
-          var r = t.NamePath.Resolved as Resolver_IdentifierExpr;
-          if (r == null || !(r.Type is Resolver_IdentifierExpr.ResolverType_Type)) {
-            reporter.Error(MessageSource.Resolver, t.tok, "expected type");
-          } else if (r.Type is Resolver_IdentifierExpr.ResolverType_Type) {
+          var r = t.NamePath.Resolved as ResolverIdentifierExpr;
+          if (r == null || !(r.Type is ResolverIdentifierExpr.ResolverTypeType)) {
+            reporter.Error(MessageSource.Resolver, t.Origin, "expected type");
+          } else if (r.Type is ResolverIdentifierExpr.ResolverTypeType) {
             var d = r.Decl;
             if (d is AbstractTypeDecl) {
               // resolve like a type parameter, and it may have type parameters if it's an abstract type
@@ -4318,10 +4206,10 @@ public ResolveTypeReturn ResolveTypeLenient(IToken tok, Type type, ResolutionCon
                 if (caller != d) {
                 } else if (d is TypeSynonymDecl && !(d is SubsetTypeDecl)) {
                   // detect self-loops here, since they don't show up in the graph's SCC methods
-                  reporter.Error(MessageSource.Resolver, d.tok, "type-synonym cycle: {0} -> {0}", d.Name);
+                  reporter.Error(MessageSource.Resolver, d.Origin, "type-synonym cycle: {0} -> {0}", d.Name);
                 } else {
                   // detect self-loops here, since they don't show up in the graph's SCC methods
-                  reporter.Error(MessageSource.Resolver, d.tok, "recursive constraint dependency involving a {0}: {1} -> {1}", d.WhatKind, d.Name);
+                  reporter.Error(MessageSource.Resolver, d.Origin, "recursive constraint dependency involving a {0}: {1} -> {1}", d.WhatKind, d.Name);
                 }
               }
               t.ResolvedClass = d;
@@ -4334,11 +4222,11 @@ public ResolveTypeReturn ResolveTypeLenient(IToken tok, Type type, ResolutionCon
             if (option.Opt == ResolveTypeOptionEnum.DontInfer) {
               // don't add anything
             } else if (d.TypeArgs.Count != t.TypeArgs.Count && t.TypeArgs.Count == 0) {
-              FillInTypeArguments(t.tok, d.TypeArgs.Count, t.TypeArgs, defaultTypeArguments, option);
+              FillInTypeArguments(t.Origin, d.TypeArgs.Count, t.TypeArgs, defaultTypeArguments, option);
             }
             // defaults and auto have been applied; check if we now have the right number of arguments
             if (d.TypeArgs.Count != t.TypeArgs.Count) {
-              reporter.Error(MessageSource.Resolver, t.tok, "Wrong number of type arguments ({0} instead of {1}) passed to {2}: {3}", t.TypeArgs.Count, d.TypeArgs.Count, d.WhatKind, t.Name);
+              reporter.Error(MessageSource.Resolver, t.Origin, "Wrong number of type arguments ({0} instead of {1}) passed to {2}: {3}", t.TypeArgs.Count, d.TypeArgs.Count, d.WhatKind, t.Name);
             }
 
           }
@@ -4346,7 +4234,7 @@ public ResolveTypeReturn ResolveTypeLenient(IToken tok, Type type, ResolutionCon
         if (t.ResolvedClass == null) {
           // There was some error. Still, we will set .ResolvedClass to some value to prevent some crashes in the downstream resolution.  The
           // 0-tuple is convenient, because it is always in scope.
-          t.ResolvedClass = SystemModuleManager.TupleType(t.tok, 0, false);
+          t.ResolvedClass = SystemModuleManager.TupleType(t.Origin, 0, false);
           // clear out the TypeArgs since 0-tuple doesn't take TypeArg
           t.TypeArgs = new List<Type>();
         }
@@ -4367,7 +4255,7 @@ public ResolveTypeReturn ResolveTypeLenient(IToken tok, Type type, ResolutionCon
     /// <summary>
     /// Adds to "typeArgs" a list of "n" type arguments, possibly extending "defaultTypeArguments".
     /// </summary>
-    static void FillInTypeArguments(IToken tok, int n, List<Type> typeArgs, List<TypeParameter> defaultTypeArguments, ResolveTypeOption option) {
+    static void FillInTypeArguments(IOrigin tok, int n, List<Type> typeArgs, List<TypeParameter> defaultTypeArguments, ResolveTypeOption option) {
       Contract.Requires(tok != null);
       Contract.Requires(0 <= n);
       Contract.Requires(typeArgs != null && typeArgs.Count == 0);
@@ -4383,7 +4271,8 @@ static void FillInTypeArguments(IToken tok, int n, List<Type> typeArgs, List<Typ
         if (option.Opt == ResolveTypeOptionEnum.AllowPrefixExtend) {
           // extend defaultTypeArguments, if needed
           for (int i = defaultTypeArguments.Count; i < n; i++) {
-            var tp = new TypeParameter(tok.ToRange(), new Name(tok.ToRange(), "_T" + i), i, option.Parent);
+            var parentToken = option.Parent.Origin;
+            var tp = new TypeParameter(parentToken, new Name(parentToken, "_T" + i), i, option.Parent);
             if (option.Parent is IteratorDecl) {
               tp.Characteristics.AutoInit = Type.AutoInitInfo.CompilableValue;
             }
@@ -4436,7 +4325,7 @@ static bool TypeConstraintsIncludeProxy_Aux(Type t, TypeProxy proxy, ISet<TypePr
       return false;
     }
 
-    public Type ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolutionContext) {
+    public void ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolutionContext) {
       Contract.Requires(rr != null);
       Contract.Requires(stmt != null);
       Contract.Requires(resolutionContext != null);
@@ -4446,7 +4335,7 @@ public Type ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolut
         if (rr.ArrayDimensions != null) {
           // ---------- new T[EE]    OR    new T[EE] (elementInit)
           Contract.Assert(rr.Bindings == null && rr.Path == null && rr.InitCall == null);
-          ResolveType(stmt.Tok, rr.EType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          ResolveType(stmt.Origin, rr.EType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
           int i = 0;
           foreach (Expression dim in rr.ArrayDimensions) {
             Contract.Assert(dim != null);
@@ -4454,7 +4343,7 @@ public Type ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolut
             ConstrainToIntegerType(dim, false, string.Format("new must use an integer-based expression for the array size (got {{0}}{0})", rr.ArrayDimensions.Count == 1 ? "" : " for index " + i));
             i++;
           }
-          rr.Type = ResolvedArrayType(stmt.Tok, rr.ArrayDimensions.Count, rr.EType, resolutionContext, false);
+          rr.Type = ResolvedArrayType(stmt.Origin, rr.ArrayDimensions.Count, rr.EType, resolutionContext, false);
           if (rr.ElementInit != null) {
             ResolveExpression(rr.ElementInit, resolutionContext);
             // Check
@@ -4464,7 +4353,7 @@ public Type ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolut
             for (int ii = 0; ii < rr.ArrayDimensions.Count; ii++) {
               args.Add(SystemModuleManager.Nat());
             }
-            var arrowType = new ArrowType(rr.ElementInit.tok, SystemModuleManager.ArrowTypeDecls[rr.ArrayDimensions.Count], args, rr.EType);
+            var arrowType = new ArrowType(rr.ElementInit.Origin, SystemModuleManager.ArrowTypeDecls[rr.ArrayDimensions.Count], args, rr.EType);
             var lambdaType = rr.ElementInit.Type.AsArrowType;
             if (lambdaType != null && lambdaType.TypeArgs[0] is InferredTypeProxy) {
               (lambdaType.TypeArgs[0] as InferredTypeProxy).KeepConstraints = true;
@@ -4477,45 +4366,45 @@ public Type ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolut
             }
             var hintString = string.Format(" (perhaps write '{0} =>' in front of the expression you gave in order to make it an arrow type)", underscores);
             ConstrainSubtypeRelation(arrowType, rr.ElementInit.Type, rr.ElementInit, "array-allocation initialization expression expected to have type '{0}' (instead got '{1}'){2}",
-              arrowType, rr.ElementInit.Type, new LazyString_OnTypeEquals(rr.EType, rr.ElementInit.Type, hintString));
+              arrowType, rr.ElementInit.Type, new LazyStringOnTypeEquals(rr.EType, rr.ElementInit.Type, hintString));
           } else if (rr.InitDisplay != null) {
             foreach (var v in rr.InitDisplay) {
               ResolveExpression(v, resolutionContext);
-              AddAssignableConstraint(v.tok, rr.EType, v.Type, "initial value must be assignable to array's elements (expected '{0}', got '{1}')");
+              AddAssignableConstraint(v.Origin, rr.EType, v.Type, "initial value must be assignable to array's elements (expected '{0}', got '{1}')");
             }
           }
         } else {
           if (rr.Bindings == null) {
-            ResolveType(stmt.Tok, rr.EType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+            ResolveType(stmt.Origin, rr.EType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
             var cl = (rr.EType as UserDefinedType)?.ResolvedClass as NonNullTypeDecl;
             if (cl != null && !(rr.EType.IsTraitType && !rr.EType.NormalizeExpand().IsObjectQ)) {
               // life is good
             } else {
-              reporter.Error(MessageSource.Resolver, rr.tok, "new can be applied only to class types (got {0})", rr.EType);
+              reporter.Error(MessageSource.Resolver, rr.Origin, "new can be applied only to class types (got {0})", rr.EType);
             }
           } else {
             string initCallName = null;
-            IToken initCallTok = null;
+            IOrigin initCallTok = null;
             // Resolve rr.Path and do one of three things:
             // * If rr.Path denotes a type, then set EType,initCallName to rr.Path,"_ctor", which sets up a call to the anonymous constructor.
             // * If the all-but-last components of rr.Path denote a type, then do EType,initCallName := allButLast(EType),last(EType)
             // * Otherwise, report an error
-            var ret = ResolveTypeLenient(rr.Tok, rr.Path, resolutionContext, new ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null, true);
+            var ret = ResolveTypeLenient(rr.Origin, rr.Path, resolutionContext, new ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null, true);
             if (ret != null) {
               // The all-but-last components of rr.Path denote a type (namely, ret.ReplacementType).
               rr.EType = ret.ReplacementType;
               initCallName = ret.LastComponent.SuffixName;
-              initCallTok = ret.LastComponent.tok;
+              initCallTok = ret.LastComponent.Origin;
             } else {
               // Either rr.Path resolved correctly as a type or there was no way to drop a last component to make it into something that looked
               // like a type.  In either case, set EType,initCallName to Path,"_ctor" and continue.
               rr.EType = rr.Path;
               initCallName = "_ctor";
-              initCallTok = rr.Tok;
+              initCallTok = rr.Origin;
             }
             var cl = (rr.EType as UserDefinedType)?.ResolvedClass as NonNullTypeDecl;
             if (cl == null || rr.EType.IsTraitType) {
-              reporter.Error(MessageSource.Resolver, rr.tok, "new can be applied only to class types (got {0})", rr.EType);
+              reporter.Error(MessageSource.Resolver, rr.Origin, "new can be applied only to class types (got {0})", rr.EType);
             } else {
               // ---------- new C.Init(EE)
               Contract.Assert(initCallName != null);
@@ -4523,14 +4412,14 @@ public Type ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolut
 
               // We want to create a MemberSelectExpr for the initializing method.  To do that, we create a throw-away receiver of the appropriate
               // type, create a dot-suffix expression around this receiver, and then resolve it in the usual way for dot-suffix expressions.
-              var lhs = new ImplicitThisExpr_ConstructorCall(initCallTok) { Type = rr.EType };
-              var callLhs = new ExprDotName(((UserDefinedType)rr.EType).tok, lhs, initCallName, ret == null ? null : ret.LastComponent.OptTypeArguments);
-              ResolveDotSuffix(callLhs, true, rr.Bindings.ArgumentBindings, resolutionContext, true);
+              var lhs = new ImplicitThisExprConstructorCall(initCallTok) { Type = rr.EType };
+              var callLhs = new ExprDotName(((UserDefinedType)rr.EType).Origin, lhs, new Name(initCallName), ret == null ? null : ret.LastComponent.OptTypeArguments);
+              ResolveDotSuffix(callLhs, false, true, rr.Bindings.ArgumentBindings, resolutionContext, true);
               if (prevErrorCount == reporter.Count(ErrorLevel.Error)) {
                 Contract.Assert(callLhs.ResolvedExpression is MemberSelectExpr);  // since ResolveApplySuffix succeeded and call.Lhs denotes an expression (not a module or a type)
                 var methodSel = (MemberSelectExpr)callLhs.ResolvedExpression;
                 if (methodSel.Member is Method) {
-                  rr.InitCall = new CallStmt(stmt.RangeToken, new List<Expression>(), methodSel, rr.Bindings.ArgumentBindings, initCallTok);
+                  rr.InitCall = new CallStmt(stmt.Origin, new List<Expression>(), methodSel, rr.Bindings.ArgumentBindings, initCallTok.Center);
                   ResolveCallStmt(rr.InitCall, resolutionContext, rr.EType);
                 } else {
                   reporter.Error(MessageSource.Resolver, initCallTok, "object initialization must denote an initializing method or constructor ({0})", initCallName);
@@ -4541,7 +4430,6 @@ public Type ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolut
           rr.Type = rr.EType;
         }
       }
-      return rr.Type;
     }
 
     /// <summary>
@@ -4554,7 +4442,7 @@ public Type ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolut
     /// "receiverType" is an unresolved proxy type and that, after solving more type constraints, "receiverType"
     /// eventually gets set to a type more specific than "tentativeReceiverType".
     /// </summary>
-    public MemberDecl ResolveMember(IToken tok, Type receiverType, string memberName, out NonProxyType tentativeReceiverType) {
+    public MemberDecl ResolveMember(IOrigin tok, Type receiverType, string memberName, out NonProxyType tentativeReceiverType) {
       Contract.Requires(tok != null);
       Contract.Requires(receiverType != null);
       Contract.Requires(memberName != null);
@@ -4598,7 +4486,7 @@ public MemberDecl ResolveMember(IToken tok, Type receiverType, string memberName
           if (memberName == "_ctor") {
             reporter.Error(MessageSource.Resolver, tok, "{0} {1} does not have an anonymous constructor", cd.WhatKind, cd.Name);
           } else {
-            reporter.Error(MessageSource.Resolver, tok, "member '{0}' does not exist in {2} '{1}'", memberName, cd.Name, cd.WhatKind);
+            ReportMemberNotFoundError(tok, memberName, cd);
           }
         } else if (!VisibleInScope(member)) {
           reporter.Error(MessageSource.Resolver, tok, "member '{0}' has not been imported in this scope and cannot be accessed here", memberName);
@@ -4615,6 +4503,31 @@ public MemberDecl ResolveMember(IToken tok, Type receiverType, string memberName
       return null;
     }
 
+    private void ReportMemberNotFoundError(IOrigin tok, string memberName, TopLevelDecl receiverDecl) {
+      if (memberName.StartsWith(HideRevealStmt.RevealLemmaPrefix)) {
+        var nameToBeRevealed = memberName[HideRevealStmt.RevealLemmaPrefix.Length..];
+        var members = receiverDecl is TopLevelDeclWithMembers topLevelDeclWithMembers ? GetClassMembers(topLevelDeclWithMembers) : null;
+        if (members == null) {
+          reporter.Error(MessageSource.Resolver, tok, $"member '{nameToBeRevealed}' does not exist in {receiverDecl.WhatKind} '{receiverDecl.Name}'");
+        } else if (!members.TryGetValue(nameToBeRevealed, out var member)) {
+          reporter.Error(MessageSource.Resolver, tok, $"member '{nameToBeRevealed}' does not exist in {receiverDecl.WhatKind} '{receiverDecl.Name}'");
+        } else if (member is not (ConstantField or Function)) {
+          Contract.Assert(!member.IsOpaque);
+          reporter.Error(MessageSource.Resolver, tok,
+            $"a {member.WhatKind} ('{nameToBeRevealed}') cannot be revealed; only opaque constants and functions can be revealed");
+        } else if (!member.IsOpaque) {
+          reporter.Error(MessageSource.Resolver, tok, $"{member.WhatKind} '{nameToBeRevealed}' cannot be revealed, because it is not opaque");
+        } else if (member is Function { Body: null }) {
+          reporter.Error(MessageSource.Resolver, tok,
+            $"{member.WhatKind} '{nameToBeRevealed}' cannot be revealed, because it has no body in {receiverDecl.WhatKind} '{receiverDecl.Name}'");
+        } else {
+          reporter.Error(MessageSource.Resolver, tok, $"cannot reveal '{nameToBeRevealed}'");
+        }
+      } else {
+        reporter.Error(MessageSource.Resolver, tok, $"member '{memberName}' does not exist in {receiverDecl.WhatKind} '{receiverDecl.Name}'");
+      }
+    }
+
     /// <summary>
     /// Roughly speaking, tries to figure out the head of the type of "t", making as few inference decisions as possible.
     /// More precisely, returns a type that contains all the members of "t"; or if "memberName" is non-null, a type
@@ -4622,7 +4535,7 @@ public MemberDecl ResolveMember(IToken tok, Type receiverType, string memberName
     /// but it may also be a type in a super- or subtype relation to "t".
     /// In some cases, it is necessary to make some inference decisions in order to figure out the type to return.
     /// </summary>
-    public Type PartiallyResolveTypeForMemberSelection(IToken tok, Type t, string memberName = null, int strength = 0) {
+    public Type PartiallyResolveTypeForMemberSelection(IOrigin tok, Type t, string memberName = null, int strength = 0) {
       Contract.Requires(tok != null);
       Contract.Requires(t != null);
       Contract.Ensures(Contract.Result<Type>() != null);
@@ -5052,7 +4965,7 @@ public void CheckVariance(Type type, TopLevelDecl enclosingTypeDefinition, TypeP
       Contract.Requires(enclosingTypeDefinition != null);
       Contract.Requires(!lax || enclosingTypeDefinition is ICallable);
 
-      type = type.Normalize();  // we keep constraints, since subset types have their own type-parameter variance specifications; we also keep synonys, since that gives rise to better error messages
+      type = type.Normalize();  // we keep constraints, since subset types have their own type-parameter variance specifications; we also keep synonyms, since that gives rise to better error messages
       if (type is BasicType) {
         // fine
       } else if (type is MapType) {
@@ -5071,7 +4984,7 @@ public void CheckVariance(Type type, TopLevelDecl enclosingTypeDefinition, TypeP
         var t = (UserDefinedType)type;
         if (t.ResolvedClass is TypeParameter tp) {
           if (tp.Variance != TypeParameter.TPVariance.Non && tp.Variance != context) {
-            reporter.Error(MessageSource.Resolver, t.tok, "formal type parameter '{0}' is not used according to its variance specification", tp.Name);
+            reporter.Error(MessageSource.Resolver, t.Origin, "formal type parameter '{0}' is not used according to its variance specification", tp.Name);
           } else if (tp.StrictVariance && lax) {
             string hint;
             if (tp.VarianceSyntax == TypeParameter.TPVarianceSyntax.NonVariant_Strict) {
@@ -5080,7 +4993,7 @@ public void CheckVariance(Type type, TopLevelDecl enclosingTypeDefinition, TypeP
               Contract.Assert(tp.VarianceSyntax == TypeParameter.TPVarianceSyntax.Covariant_Strict);
               hint = string.Format(" (perhaps try changing the declaration from '+{0}' to '*{0}')", tp.Name);
             }
-            reporter.Error(MessageSource.Resolver, t.tok, "formal type parameter '{0}' is not used according to its variance specification (it is used left of an arrow){1}", tp.Name, hint);
+            reporter.Error(MessageSource.Resolver, t.Origin, "formal type parameter '{0}' is not used according to its variance specification (it is used left of an arrow){1}", tp.Name, hint);
           }
         } else {
           var resolvedClass = t.ResolvedClass;
@@ -5089,9 +5002,8 @@ public void CheckVariance(Type type, TopLevelDecl enclosingTypeDefinition, TypeP
           if (lax) {
             // we have to be careful about uses of the type being defined
             var cg = enclosingTypeDefinition.EnclosingModuleDefinition.CallGraph;
-            var t0 = resolvedClass as ICallable;
-            if (t0 != null && cg.GetSCCRepresentative(t0) == cg.GetSCCRepresentative((ICallable)enclosingTypeDefinition)) {
-              reporter.Error(MessageSource.Resolver, t.tok, "using the type being defined ('{0}') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)", resolvedClass.Name);
+            if (resolvedClass is ICallable t0 && enclosingTypeDefinition is ICallable t1 && cg.GetSCCRepresentative(t0) == cg.GetSCCRepresentative(t1)) {
+              reporter.Error(MessageSource.Resolver, t.Origin, "using the type being defined ('{0}') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)", resolvedClass.Name);
             }
           }
           for (int i = 0; i < t.TypeArgs.Count; i++) {
@@ -5112,7 +5024,7 @@ public void CheckVariance(Type type, TopLevelDecl enclosingTypeDefinition, TypeP
     /// <summary>
     /// See ConstrainToIntegerType description for the overload above.
     /// </summary>
-    public void ConstrainToIntegerType(IToken tok, Type type, bool allowBitVector, TypeConstraint.ErrorMsg errorMsg) {
+    public void ConstrainToIntegerType(IOrigin tok, Type type, bool allowBitVector, TypeConstraint.ErrorMsg errorMsg) {
       Contract.Requires(tok != null);
       Contract.Requires(type != null);
       Contract.Requires(errorMsg != null);
@@ -5138,7 +5050,7 @@ public void ConstrainToIntegerType(IToken tok, Type type, bool allowBitVector, T
     /// desugaring during resolution, because then the desugaring can be constructed as a non-resolved expression on which ResolveExpression
     /// is called--this is easier than constructing an already-resolved expression.
     /// </summary>
-    (Expression, Expression) ResolveDatatypeUpdate(IToken tok, Expression root, DatatypeDecl dt, List<Tuple<IToken, string, Expression>> memberUpdates,
+    (Expression, Expression) ResolveDatatypeUpdate(IOrigin tok, Expression root, DatatypeDecl dt, List<Tuple<IOrigin, string, Expression>> memberUpdates,
       ResolutionContext resolutionContext, out List<MemberDecl> members, out List<DatatypeCtor> legalSourceConstructors) {
       Contract.Requires(tok != null);
       Contract.Requires(root != null);
@@ -5180,8 +5092,8 @@ public void ConstrainToIntegerType(IToken tok, Type type, bool allowBitVector, T
                 rhsBindings.Add(destructor_str, new Tuple<BoundVar, IdentifierExpr, Expression>(null, null, entry.Item3));
               } else {
                 var xName = FreshTempVarName(string.Format("dt_update#{0}#", destructor_str), resolutionContext.CodeContext);
-                var xVar = new BoundVar(new AutoGeneratedToken(tok), xName, destructor.Type.Subst(subst));
-                var x = new IdentifierExpr(new AutoGeneratedToken(tok), xVar);
+                var xVar = new BoundVar(new AutoGeneratedOrigin(tok), xName, destructor.Type.Subst(subst));
+                var x = new IdentifierExpr(new AutoGeneratedOrigin(tok), xVar);
                 rhsBindings.Add(destructor_str, new Tuple<BoundVar, IdentifierExpr, Expression>(xVar, x, entry.Item3));
               }
             }
@@ -5233,7 +5145,7 @@ public void ConstrainToIntegerType(IToken tok, Type type, bool allowBitVector, T
     ///     else
     ///       CandidateResultConstructorN(x, y, ..., d.k0, d.k1, ...)
     /// </summary>
-    private Expression DesugarDatatypeUpdate(IToken tok, Expression root, DatatypeDecl dt, List<DatatypeCtor> candidateResultCtors,
+    private Expression DesugarDatatypeUpdate(IOrigin tok, Expression root, DatatypeDecl dt, List<DatatypeCtor> candidateResultCtors,
       Dictionary<string, Tuple<BoundVar, IdentifierExpr, Expression>> rhsBindings, ResolutionContext resolutionContext) {
 
       if (candidateResultCtors.Count == 0) {
@@ -5242,8 +5154,8 @@ private Expression DesugarDatatypeUpdate(IToken tok, Expression root, DatatypeDe
       Expression rewrite = null;
       // Create a unique name for d', the variable we introduce in the let expression
       var dName = FreshTempVarName("dt_update_tmp#", resolutionContext.CodeContext);
-      var dVar = new BoundVar(new AutoGeneratedToken(tok), dName, root.Type);
-      var d = new IdentifierExpr(new AutoGeneratedToken(tok), dVar);
+      var dVar = new BoundVar(new AutoGeneratedOrigin(tok), dName, root.Type);
+      var d = new IdentifierExpr(new AutoGeneratedOrigin(tok), dVar);
       Expression body = null;
       candidateResultCtors.Reverse();
       foreach (var crc in candidateResultCtors) {
@@ -5255,7 +5167,7 @@ private Expression DesugarDatatypeUpdate(IToken tok, Expression root, DatatypeDe
           if (rhsBindings.TryGetValue(f.Name, out var info)) {
             ctorArg = info.Item2 ?? info.Item3;
           } else {
-            ctorArg = new ExprDotName(tok, d, f.Name, null);
+            ctorArg = new ExprDotName(tok, d, f.NameNode, null);
           }
           ctorArguments.Add(ctorArg);
           var bindingName = new Token(tok.line, tok.col) {
@@ -5272,7 +5184,7 @@ private Expression DesugarDatatypeUpdate(IToken tok, Expression root, DatatypeDe
           body = ctor_call;
         } else {
           // body = if d.crc? then ctor_call else body
-          var guard = new ExprDotName(tok, d, crc.QueryField.Name, null);
+          var guard = new ExprDotName(tok, d, crc.QueryField.NameNode, null);
           body = new ITEExpr(tok, false, guard, ctor_call, body);
         }
       }
@@ -5334,7 +5246,7 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
 
       if (expr.OptTypeArguments != null) {
         foreach (var ty in expr.OptTypeArguments) {
-          ResolveType(expr.tok, ty, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          ResolveType(expr.Origin, ty, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         }
       }
 
@@ -5349,26 +5261,26 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
       // For 2 and 5:
       // For 3:
 
-      var name = resolutionContext.InReveal ? "reveal_" + expr.Name : expr.Name;
+      var name = resolutionContext.InReveal ? HideRevealStmt.RevealLemmaPrefix + expr.Name : expr.Name;
       v = scope.Find(name);
       if (v != null) {
         // ----- 0. local variable, parameter, or bound variable
         if (expr.OptTypeArguments != null) {
           if (complain) {
-            reporter.Error(MessageSource.Resolver, expr.tok, "variable '{0}' does not take any type parameters", name);
+            reporter.Error(MessageSource.Resolver, expr.Origin, "variable '{0}' does not take any type parameters", name);
           } else {
             expr.ResolvedExpression = null;
             return null;
           }
         }
-        r = new IdentifierExpr(expr.tok, v);
+        r = new IdentifierExpr(expr.Origin, v);
       } else if (currentClass is TopLevelDeclWithMembers cl && GetClassMembers(cl)?.TryGetValue(name, out member) == true) {
         // ----- 1. member of the enclosing class
 
         if (!member.IsStatic) {
           if (!scope.AllowInstance) {
             if (complain) {
-              reporter.Error(MessageSource.Resolver, expr.tok,
+              reporter.Error(MessageSource.Resolver, expr.Origin,
                 "'this' is not allowed in a 'static' context"); //TODO: Rephrase this
             } else {
               expr.ResolvedExpression = null;
@@ -5378,9 +5290,9 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
           }
         }
 
-        var token = expr.tok;
+        var token = expr.Origin;
         var receiver = GetReceiver(currentClass, member, token);
-        r = ResolveExprDotCall(token, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+        r = ResolveExprDotCall(token, new Name(expr.Origin, expr.Name), receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
       } else if (isLastNameSegment && moduleInfo.Ctors.TryGetValue(name, out var pair)) {
         // ----- 2. datatype constructor
         if (ResolveDatatypeConstructor(expr, args, resolutionContext, complain, pair, name, ref r, ref rWithArgs)) {
@@ -5395,7 +5307,7 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
         if (decl is AmbiguousTopLevelDecl) {
           var ad = (AmbiguousTopLevelDecl)decl;
           if (complain) {
-            reporter.Error(MessageSource.Resolver, expr.tok, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", expr.Name, ad.ModuleNames());
+            reporter.Error(MessageSource.Resolver, expr.Origin, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", expr.Name, ad.ModuleNames());
           } else {
             expr.ResolvedExpression = null;
             return null;
@@ -5410,14 +5322,14 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
               // A possibly-null type C? was mentioned. But it does not have any further members. The program should have used
               // the name of the class, C. Report an error and continue.
               if (complain) {
-                reporter.Error(MessageSource.Resolver, expr.tok, "To access members of {0} '{1}', write '{1}', not '{2}'", decl.WhatKind, decl.Name, name);
+                reporter.Error(MessageSource.Resolver, expr.Origin, "To access members of {0} '{1}', write '{1}', not '{2}'", decl.WhatKind, decl.Name, name);
               } else {
                 expr.ResolvedExpression = null;
                 return null;
               }
             }
           }
-          r = CreateResolver_IdentifierExpr(expr.tok, name, expr.OptTypeArguments, decl);
+          r = CreateResolver_IdentifierExpr(expr.Origin, name, expr.OptTypeArguments, decl);
         }
 
       } else if (moduleInfo.StaticMembers.TryGetValue(name, out member)) {
@@ -5426,14 +5338,14 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
         if (member is AmbiguousMemberDecl) {
           var ambiguousMember = (AmbiguousMemberDecl)member;
           if (complain) {
-            reporter.Error(MessageSource.Resolver, expr.tok, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.Name, ambiguousMember.ModuleNames());
+            reporter.Error(MessageSource.Resolver, expr.Origin, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.Name, ambiguousMember.ModuleNames());
           } else {
             expr.ResolvedExpression = null;
             return null;
           }
         } else {
-          var receiver = new StaticReceiverExpr(expr.tok, (TopLevelDeclWithMembers)member.EnclosingClass, true);
-          r = ResolveExprDotCall(expr.tok, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+          var receiver = new StaticReceiverExpr(expr.Origin, (TopLevelDeclWithMembers)member.EnclosingClass, true);
+          r = ResolveExprDotCall(expr.Origin, new Name(expr.Origin, expr.Name), receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
         }
 
       } else if (!isLastNameSegment && moduleInfo.Ctors.TryGetValue(name, out pair)) {
@@ -5445,11 +5357,7 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
       } else {
         // ----- None of the above
         if (complain) {
-          if (resolutionContext.InReveal) {
-            reporter.Error(MessageSource.Resolver, expr.tok, "cannot reveal '{0}' because no constant, assert label, or requires label in the current scope is named '{0}'", expr.Name);
-          } else {
-            reporter.Error(MessageSource.Resolver, expr.tok, "unresolved identifier: {0}", name);
-          }
+          ReportUnresolvedIdentifierError(expr.Origin, expr.Name, resolutionContext);
         } else {
           expr.ResolvedExpression = null;
           return null;
@@ -5468,9 +5376,20 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
       return rWithArgs;
     }
 
-    public static Expression GetReceiver(TopLevelDeclWithMembers container, MemberDecl member, IToken token) {
+    private void ReportUnresolvedIdentifierError(IOrigin tok, string name, ResolutionContext resolutionContext) {
+      if (resolutionContext.InReveal) {
+        var nameToReport = name.StartsWith(HideRevealStmt.RevealLemmaPrefix) ? name[HideRevealStmt.RevealLemmaPrefix.Length..] : name;
+        reporter.Error(MessageSource.Resolver, tok,
+          "cannot reveal '{0}' because no revealable constant, function, assert label, or requires label in the current scope is named '{0}'",
+          nameToReport);
+      } else {
+        reporter.Error(MessageSource.Resolver, tok, "unresolved identifier: {0}", name);
+      }
+    }
+
+    public static Expression GetReceiver(TopLevelDeclWithMembers container, MemberDecl member, IOrigin token) {
       Expression receiver;
-      token = new AutoGeneratedToken(token);
+      token = new AutoGeneratedOrigin(token);
       if (member.IsStatic) {
         receiver = new StaticReceiverExpr(token,
           UserDefinedType.FromTopLevelDecl(token, container, container.TypeArgs),
@@ -5490,7 +5409,7 @@ private bool ResolveDatatypeConstructor(NameSegment expr, List<ActualBinding>/*?
       if (pair.Item2) {
         // there is more than one constructor with this name
         if (complain) {
-          reporter.Error(MessageSource.Resolver, expr.tok, "the name '{0}' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, '{1}.{0}')", expr.Name,
+          reporter.Error(MessageSource.Resolver, expr.Origin, "the name '{0}' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, '{1}.{0}')", expr.Name,
             pair.Item1.EnclosingDatatype.Name);
         } else {
           expr.ResolvedExpression = null;
@@ -5499,13 +5418,13 @@ private bool ResolveDatatypeConstructor(NameSegment expr, List<ActualBinding>/*?
       } else {
         if (expr.OptTypeArguments != null) {
           if (complain) {
-            reporter.Error(MessageSource.Resolver, expr.tok, "datatype constructor does not take any type parameters ('{0}')", name);
+            reporter.Error(MessageSource.Resolver, expr.Origin, "datatype constructor does not take any type parameters ('{0}')", name);
           } else {
             expr.ResolvedExpression = null;
             return true;
           }
         }
-        var rr = new DatatypeValue(expr.tok, pair.Item1.EnclosingDatatype.Name, name, args ?? new List<ActualBinding>());
+        var rr = new DatatypeValue(expr.Origin, pair.Item1.EnclosingDatatype.Name, name, args ?? new List<ActualBinding>());
         bool ok = ResolveDatatypeValue(resolutionContext, rr, pair.Item1.EnclosingDatatype, null, complain);
         if (!ok) {
           expr.ResolvedExpression = null;
@@ -5538,7 +5457,7 @@ void ResolveNameSegment_Type(NameSegment expr, ResolutionContext resolutionConte
 
       if (expr.OptTypeArguments != null) {
         foreach (var ty in expr.OptTypeArguments) {
-          ResolveType(expr.tok, ty, resolutionContext, option, defaultTypeArguments);
+          ResolveType(expr.Origin, ty, resolutionContext, option, defaultTypeArguments);
         }
       }
 
@@ -5558,37 +5477,37 @@ void ResolveNameSegment_Type(NameSegment expr, ResolutionContext resolutionConte
       if (tp != null) {
         // ----- 0. type parameter
         if (expr.OptTypeArguments == null) {
-          r = new Resolver_IdentifierExpr(expr.tok, tp);
+          r = new ResolverIdentifierExpr(expr.Origin, tp);
         } else {
-          reporter.Error(MessageSource.Resolver, expr.tok, "Type parameter expects no type arguments: {0}", expr.Name);
+          reporter.Error(MessageSource.Resolver, expr.Origin, "Type parameter expects no type arguments: {0}", expr.Name);
         }
 #if ASYNC_TASK_TYPES  // At the moment, there is no way for a class member to part of a type name, but this changes with async task types
       } else if (currentClass != null && classMembers.TryGetValue(currentClass, out members) && members.TryGetValue(expr.Name, out member)) {
         // ----- 1. member of the enclosing class
         Expression receiver;
         if (member.IsStatic) {
-          receiver = new StaticReceiverExpr(expr.tok, (ClassLikeDecl)member.EnclosingClass);
+          receiver = new StaticReceiverExpr(expr.Tok, (ClassLikeDecl)member.EnclosingClass);
         } else {
           if (!scope.AllowInstance) {
-            reporter.Error(MessageSource.Resolver, expr.tok, "'this' is not allowed in a 'static' context");
+            reporter.Error(MessageSource.Resolver, expr.Tok, "'this' is not allowed in a 'static' context");
             // nevertheless, set "receiver" to a value so we can continue resolution
           }
-          receiver = new ImplicitThisExpr(expr.tok);
-          receiver.Type = GetThisType(expr.tok, (ClassLikeDecl)member.EnclosingClass);  // resolve here
+          receiver = new ImplicitThisExpr(expr.Tok);
+          receiver.Type = GetThisType(expr.Tok, (ClassLikeDecl)member.EnclosingClass);  // resolve here
         }
-        r = ResolveExprDotCall(expr.tok, receiver, member, expr.OptTypeArguments, opts.resolutionContext, allowMethodCall);
+        r = ResolveExprDotCall(expr.Tok, receiver, member, expr.OptTypeArguments, opts.resolutionContext, allowMethodCall);
 #endif
       } else if (moduleInfo.TopLevels.TryGetValue(expr.Name, out var decl)) {
         // ----- 2. Member of the enclosing module
         if (decl is AmbiguousTopLevelDecl) {
           var ad = (AmbiguousTopLevelDecl)decl;
-          reporter.Error(MessageSource.Resolver, expr.tok, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", expr.Name, ad.ModuleNames());
+          reporter.Error(MessageSource.Resolver, expr.Origin, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", expr.Name, ad.ModuleNames());
         } else {
           // We have found a module name or a type name, neither of which is a type expression. However, the NameSegment we're
           // looking at may be followed by a further suffix that makes this into a type expresion. We postpone the rest of the
           // resolution to any such suffix. For now, we create a temporary expression that will never be seen by the compiler
-          // or verifier, just to have a placeholder where we can recorded what we have found.
-          r = CreateResolver_IdentifierExpr(expr.tok, expr.Name, expr.OptTypeArguments, decl);
+          // or verifier, just to have a placeholder where we can record what we have found.
+          r = CreateResolver_IdentifierExpr(expr.Origin, expr.Name, expr.OptTypeArguments, decl);
         }
 
 #if ASYNC_TASK_TYPES  // At the moment, there is no way for a class member to part of a type name, but this changes with async task types
@@ -5596,10 +5515,10 @@ void ResolveNameSegment_Type(NameSegment expr, ResolutionContext resolutionConte
         // ----- 3. static member of the enclosing module
         Contract.Assert(member.IsStatic); // moduleInfo.StaticMembers is supposed to contain only static members of the module's implicit class _default
         if (ReallyAmbiguousThing(ref member)) {
-          reporter.Error(MessageSource.Resolver, expr.tok, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.Name, ((AmbiguousMemberDecl)member).ModuleNames());
+          reporter.Error(MessageSource.Resolver, expr.Tok, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.Name, ((AmbiguousMemberDecl)member).ModuleNames());
         } else {
-          var receiver = new StaticReceiverExpr(expr.tok, (ClassLikeDecl)member.EnclosingClass);
-          r = ResolveExprDotCall(expr.tok, receiver, member, expr.OptTypeArguments, opts.resolutionContext, allowMethodCall);
+          var receiver = new StaticReceiverExpr(expr.Tok, (ClassLikeDecl)member.EnclosingClass);
+          r = ResolveExprDotCall(expr.Tok, receiver, member, expr.OptTypeArguments, opts.resolutionContext, allowMethodCall);
         }
 #endif
       } else {
@@ -5607,7 +5526,7 @@ void ResolveNameSegment_Type(NameSegment expr, ResolutionContext resolutionConte
         var hint0 = "(did you forget to qualify a name or declare a module import 'opened'?)";
         var hint1 = " (note that names in outer modules are not visible in contained modules)";
         var hint2 = "";
-        if (Options.Get(CommonOptionBag.GeneralTraits) && expr.Name.EndsWith("?")) {
+        if (Options.Get(CommonOptionBag.GeneralTraits) != CommonOptionBag.GeneralTraitsOptions.Legacy && expr.Name.EndsWith("?")) {
           var nameWithoutQuestionMark = expr.Name[..^1];
           if (nameWithoutQuestionMark.Length != 0 &&
               moduleInfo.TopLevels.TryGetValue(nameWithoutQuestionMark, out decl) && decl is TraitDecl) {
@@ -5616,7 +5535,7 @@ void ResolveNameSegment_Type(NameSegment expr, ResolutionContext resolutionConte
               "then you must declare that trait with 'extends object' to make it a reference type)";
           }
         }
-        reporter.Error(MessageSource.Resolver, expr.tok, $"Type or type parameter is not declared in this scope: {expr.Name} {hint0}{hint1}{hint2}");
+        reporter.Error(MessageSource.Resolver, expr.Origin, $"Type or type parameter is not declared in this scope: {expr.Name} {hint0}{hint1}{hint2}");
       }
 
       if (r == null) {
@@ -5651,7 +5570,7 @@ void ResolveNameSegment_Type(NameSegment expr, ResolutionContext resolutionConte
     /// <param name="resolutionContext"></param>
     /// <param name="allowMethodCall">If false, generates an error if the name denotes a method. If true and the name denotes a method, returns
     /// a Resolver_MethodCall.</param>
-    Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<ActualBinding> args, ResolutionContext resolutionContext, bool allowMethodCall) {
+    public Expression ResolveDotSuffix(ExprDotName expr, bool allowStaticReferenceToInstance, bool isLastNameSegment, List<ActualBinding> args, ResolutionContext resolutionContext, bool allowMethodCall) {
       Contract.Requires(expr != null);
       Contract.Requires(!expr.WasResolved());
       Contract.Requires(resolutionContext != null);
@@ -5664,14 +5583,14 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
       if (expr.Lhs is NameSegment) {
         ResolveNameSegment((NameSegment)expr.Lhs, false, null, nonRevealOpts, false, true, out shadowedImport);
       } else if (expr.Lhs is ExprDotName) {
-        ResolveDotSuffix((ExprDotName)expr.Lhs, false, null, nonRevealOpts, false);
+        ResolveDotSuffix((ExprDotName)expr.Lhs, false, false, null, nonRevealOpts, false);
       } else {
         ResolveExpression(expr.Lhs, nonRevealOpts);
       }
 
       if (expr.OptTypeArguments != null) {
         foreach (var ty in expr.OptTypeArguments) {
-          ResolveType(expr.tok, ty, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          ResolveType(expr.Origin, ty, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         }
       }
 
@@ -5679,13 +5598,13 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
       Expression rWithArgs = null;  // the resolved expression after incorporating "args"
       MemberDecl member = null;
 
-      var name = resolutionContext.InReveal ? "reveal_" + expr.SuffixName : expr.SuffixName;
+      var name = resolutionContext.InReveal ? HideRevealStmt.RevealLemmaPrefix + expr.SuffixName : expr.SuffixName;
       if (!expr.Lhs.WasResolved()) {
         return null;
       }
       var lhs = expr.Lhs.Resolved;
-      if (lhs != null && lhs.Type is Resolver_IdentifierExpr.ResolverType_Module) {
-        var ri = (Resolver_IdentifierExpr)lhs;
+      if (lhs != null && lhs.Type is ResolverIdentifierExpr.ResolverTypeModule) {
+        var ri = (ResolverIdentifierExpr)lhs;
         var sig = ((ModuleDecl)ri.Decl).AccessibleSignature(false);
         sig = GetSignature(sig);
         // For 0:
@@ -5695,12 +5614,12 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
           // ----- 0. datatype constructor
           if (pair.Item2) {
             // there is more than one constructor with this name
-            reporter.Error(MessageSource.Resolver, expr.tok, "the name '{0}' denotes a datatype constructor in module {2}, but does not do so uniquely; add an explicit qualification (for example, '{1}.{0}')", name, pair.Item1.EnclosingDatatype.Name, ((ModuleDecl)ri.Decl).Name);
+            reporter.Error(MessageSource.Resolver, expr.Origin, "the name '{0}' denotes a datatype constructor in module {2}, but does not do so uniquely; add an explicit qualification (for example, '{1}.{0}')", name, pair.Item1.EnclosingDatatype.Name, ((ModuleDecl)ri.Decl).Name);
           } else {
             if (expr.OptTypeArguments != null) {
-              reporter.Error(MessageSource.Resolver, expr.tok, "datatype constructor does not take any type parameters ('{0}')", name);
+              reporter.Error(MessageSource.Resolver, expr.Origin, "datatype constructor does not take any type parameters ('{0}')", name);
             }
-            var rr = new DatatypeValue(expr.tok, pair.Item1.EnclosingDatatype.Name, name, args ?? new List<ActualBinding>());
+            var rr = new DatatypeValue(expr.Origin, pair.Item1.EnclosingDatatype.Name, name, args ?? new List<ActualBinding>());
             ResolveDatatypeValue(resolutionContext, rr, pair.Item1.EnclosingDatatype, null);
 
             if (args == null) {
@@ -5714,7 +5633,7 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
           // ----- 1. Member of the specified module
           if (decl is AmbiguousTopLevelDecl) {
             var ad = (AmbiguousTopLevelDecl)decl;
-            reporter.Error(MessageSource.Resolver, expr.tok, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", expr.SuffixName, ad.ModuleNames());
+            reporter.Error(MessageSource.Resolver, expr.Origin, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", expr.SuffixName, ad.ModuleNames());
           } else {
             // We have found a module name or a type name, neither of which is an expression. However, the ExprDotName we're
             // looking at may be followed by a further suffix that makes this into an expresion. We postpone the rest of the
@@ -5724,39 +5643,39 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
               if (decl is ClassLikeDecl cd && cd.NonNullTypeDecl != null && name != cd.NonNullTypeDecl.Name) {
                 // A possibly-null type C? was mentioned. But it does not have any further members. The program should have used
                 // the name of the class, C. Report an error and continue.
-                reporter.Error(MessageSource.Resolver, expr.tok, "To access members of {0} '{1}', write '{1}', not '{2}'", decl.WhatKind, decl.Name, name);
+                reporter.Error(MessageSource.Resolver, expr.Origin, "To access members of {0} '{1}', write '{1}', not '{2}'", decl.WhatKind, decl.Name, name);
               }
             }
-            r = CreateResolver_IdentifierExpr(expr.tok, name, expr.OptTypeArguments, decl);
+            r = CreateResolver_IdentifierExpr(expr.Origin, name, expr.OptTypeArguments, decl);
           }
         } else if (sig.StaticMembers.TryGetValue(name, out member)) {
           // ----- 2. static member of the specified module
           Contract.Assert(member.IsStatic); // moduleInfo.StaticMembers is supposed to contain only static members of the module's implicit class _default
           if (member is AmbiguousMemberDecl) {
             var ambiguousMember = (AmbiguousMemberDecl)member;
-            reporter.Error(MessageSource.Resolver, expr.tok, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.SuffixName, ambiguousMember.ModuleNames());
+            reporter.Error(MessageSource.Resolver, expr.Origin, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.SuffixName, ambiguousMember.ModuleNames());
           } else {
-            var receiver = new StaticReceiverExpr(expr.Lhs.tok, (TopLevelDeclWithMembers)member.EnclosingClass, false);
+            var receiver = new StaticReceiverExpr(expr.Lhs.Origin, (TopLevelDeclWithMembers)member.EnclosingClass, false);
             receiver.ContainerExpression = expr.Lhs;
-            r = ResolveExprDotCall(expr.tok, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+            r = ResolveExprDotCall(expr.Origin, expr.SuffixNameNode, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
           }
         } else {
-          reporter.Error(MessageSource.Resolver, expr.tok, "unresolved identifier: {0}", name);
+          ReportUnresolvedIdentifierError(expr.Origin, name, resolutionContext);
         }
 
-      } else if (lhs != null && lhs.Type is Resolver_IdentifierExpr.ResolverType_Type) {
-        var ri = (Resolver_IdentifierExpr)lhs;
+      } else if (lhs != null && lhs.Type is ResolverIdentifierExpr.ResolverTypeType) {
+        var ri = (ResolverIdentifierExpr)lhs;
         // ----- 3. Look up name in type
         // expand any synonyms
-        var ty = new UserDefinedType(expr.tok, ri.Decl.Name, ri.Decl, ri.TypeArgs).NormalizeExpand();
+        var ty = new UserDefinedType(expr.Origin, ri.Decl.Name, ri.Decl, ri.TypeArgs).NormalizeExpand();
         if (ty.IsDatatype) {
           // ----- LHS is a datatype
           var dt = ty.AsDatatype;
           if (dt.ConstructorsByName != null && dt.ConstructorsByName.TryGetValue(name, out var ctor)) {
             if (expr.OptTypeArguments != null) {
-              reporter.Error(MessageSource.Resolver, expr.tok, "datatype constructor does not take any type parameters ('{0}')", name);
+              reporter.Error(MessageSource.Resolver, expr.Origin, "datatype constructor does not take any type parameters ('{0}')", name);
             }
-            var rr = new DatatypeValue(expr.tok, ctor.EnclosingDatatype.Name, name, args ?? new List<ActualBinding>());
+            var rr = new DatatypeValue(expr.Origin, ctor.EnclosingDatatype.Name, name, args ?? new List<ActualBinding>());
             ResolveDatatypeValue(resolutionContext, rr, ctor.EnclosingDatatype, ty);
             if (args == null) {
               r = rr;
@@ -5771,32 +5690,32 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
           // ----- LHS is a type with members
           if (GetClassMembers(cd)?.TryGetValue(name, out member) == true) {
             if (!VisibleInScope(member)) {
-              reporter.Error(MessageSource.Resolver, expr.tok, "member '{0}' has not been imported in this scope and cannot be accessed here", name);
+              reporter.Error(MessageSource.Resolver, expr.Origin, "member '{0}' has not been imported in this scope and cannot be accessed here", name);
             }
-            if (!member.IsStatic) {
-              reporter.Error(MessageSource.Resolver, expr.tok, "accessing member '{0}' requires an instance expression", name); //TODO Unify with similar error messages
+            if (!member.IsStatic && !allowStaticReferenceToInstance) {
+              reporter.Error(MessageSource.Resolver, expr.Origin, "accessing member '{0}' requires an instance expression", name); //TODO Unify with similar error messages
               // nevertheless, continue creating an expression that approximates a correct one
             }
-            var receiver = new StaticReceiverExpr(expr.Lhs.tok, (UserDefinedType)ty.NormalizeExpand(), (TopLevelDeclWithMembers)member.EnclosingClass, false);
+            var receiver = new StaticReceiverExpr(expr.Lhs.Origin, (UserDefinedType)ty.NormalizeExpand(), (TopLevelDeclWithMembers)member.EnclosingClass, false);
             receiver.ContainerExpression = expr.Lhs;
-            r = ResolveExprDotCall(expr.tok, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+            r = ResolveExprDotCall(expr.Origin, expr.SuffixNameNode, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
           }
         }
         if (r == null) {
-          reporter.Error(MessageSource.Resolver, expr.tok, "member '{0}' does not exist in {2} '{1}'", name, ri.Decl.Name, ri.Decl.WhatKind);
+          ReportMemberNotFoundError(expr.Origin, name, ri.Decl);
         }
       } else if (lhs != null) {
         // ----- 4. Look up name in the type of the Lhs
-        member = ResolveMember(expr.tok, expr.Lhs.Type, name, out var tentativeReceiverType);
+        member = ResolveMember(expr.Origin, expr.Lhs.Type, name, out var tentativeReceiverType);
         if (member != null) {
           Expression receiver;
           if (!member.IsStatic) {
             receiver = expr.Lhs;
-            AddAssignableConstraint(expr.tok, tentativeReceiverType, receiver.Type, "receiver type ({1}) does not have a member named " + name);
-            r = ResolveExprDotCall(expr.tok, receiver, tentativeReceiverType, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+            AddAssignableConstraint(expr.Origin, tentativeReceiverType, receiver.Type, "receiver type ({1}) does not have a member named " + name);
+            r = ResolveExprDotCall(expr.Origin, expr.SuffixNameNode, receiver, tentativeReceiverType, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
           } else {
-            receiver = new StaticReceiverExpr(expr.tok, (UserDefinedType)tentativeReceiverType, (TopLevelDeclWithMembers)member.EnclosingClass, false, lhs);
-            r = ResolveExprDotCall(expr.tok, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+            receiver = new StaticReceiverExpr(expr.Origin, (UserDefinedType)tentativeReceiverType, (TopLevelDeclWithMembers)member.EnclosingClass, false, lhs);
+            r = ResolveExprDotCall(expr.Origin, expr.SuffixNameNode, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
           }
         }
       }
@@ -5805,7 +5724,7 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
         // an error has been reported above; we won't fill in .ResolvedExpression, but we still must fill in .Type
         expr.Type = new InferredTypeProxy();
       } else {
-        CheckForAmbiguityInShadowedImportedModule(shadowedImport, name, expr.tok, false, isLastNameSegment);
+        CheckForAmbiguityInShadowedImportedModule(shadowedImport, name, expr.Origin, false, isLastNameSegment);
         expr.ResolvedExpression = r;
         expr.Type = r.Type;
       }
@@ -5822,7 +5741,7 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
     /// exposed through both `M` and `M.M`, without ambiguity.
     /// </summary>
     private void CheckForAmbiguityInShadowedImportedModule(ModuleDecl moduleDecl, string name,
-      IToken tok, bool useCompileSignatures, bool isLastNameSegment) {
+      IOrigin tok, bool useCompileSignatures, bool isLastNameSegment) {
       if (moduleDecl != null && NameConflictsWithModuleContents(moduleDecl, name, useCompileSignatures, isLastNameSegment)) {
         reporter.Error(MessageSource.Resolver, tok,
           "Reference to member '{0}' is ambiguous: name '{1}' shadows an import-opened module of the same name, and "
@@ -5843,7 +5762,7 @@ private bool NameConflictsWithModuleContents(ModuleDecl moduleDecl, string name,
       );
     }
 
-    Expression ResolveExprDotCall(IToken tok, Expression receiver, Type receiverTypeBound/*?*/,
+    Expression ResolveExprDotCall(IOrigin tok, Name name, Expression receiver, Type receiverTypeBound/*?*/,
       MemberDecl member, List<ActualBinding> args, List<Type> optTypeArguments, ResolutionContext resolutionContext, bool allowMethodCall) {
       Contract.Requires(tok != null);
       Contract.Requires(receiver != null);
@@ -5851,14 +5770,14 @@ Expression ResolveExprDotCall(IToken tok, Expression receiver, Type receiverType
       Contract.Requires(member != null);
       Contract.Requires(resolutionContext != null && resolutionContext.CodeContext != null);
 
-      var rr = new MemberSelectExpr(tok, receiver, member.Name);
+      var rr = new MemberSelectExpr(tok, receiver, name);
       rr.Member = member;
 
       // Now, fill in rr.Type.  This requires taking into consideration the type parameters passed to the receiver's type as well as any type
       // parameters used in this NameSegment/ExprDotName.
       // Add to "subst" the type parameters given to the member's class/datatype
-      rr.TypeApplication_AtEnclosingClass = new List<Type>();
-      rr.TypeApplication_JustMember = new List<Type>();
+      rr.TypeApplicationAtEnclosingClass = new List<Type>();
+      rr.TypeApplicationJustMember = new List<Type>();
       Dictionary<TypeParameter, Type> subst;
       var rType = (receiverTypeBound ?? receiver.Type).NormalizeExpand();
       if (rType is UserDefinedType udt && udt.ResolvedClass != null) {
@@ -5866,14 +5785,14 @@ Expression ResolveExprDotCall(IToken tok, Expression receiver, Type receiverType
         if (member.EnclosingClass == null) {
           // this can happen for some special members, like real.Floor
         } else {
-          rr.TypeApplication_AtEnclosingClass.AddRange(rType.AsParentType(member.EnclosingClass).TypeArgs);
+          rr.TypeApplicationAtEnclosingClass.AddRange(rType.AsParentType(member.EnclosingClass).TypeArgs);
         }
       } else {
         var vtd = ProgramResolver.SystemModuleManager.AsValuetypeDecl(rType);
         if (vtd != null) {
           Contract.Assert(vtd.TypeArgs.Count == rType.TypeArgs.Count);
           subst = TypeParameter.SubstitutionMap(vtd.TypeArgs, rType.TypeArgs);
-          rr.TypeApplication_AtEnclosingClass.AddRange(rType.TypeArgs);
+          rr.TypeApplicationAtEnclosingClass.AddRange(rType.TypeArgs);
         } else {
           Contract.Assert(rType.TypeArgs.Count == 0);
           subst = new Dictionary<TypeParameter, Type>();
@@ -5899,7 +5818,7 @@ Expression ResolveExprDotCall(IToken tok, Expression receiver, Type receiverType
         }
         for (int i = 0; i < fn.TypeArgs.Count; i++) {
           var ta = i < suppliedTypeArguments ? optTypeArguments[i] : new InferredTypeProxy();
-          rr.TypeApplication_JustMember.Add(ta);
+          rr.TypeApplicationJustMember.Add(ta);
           subst.Add(fn.TypeArgs[i], ta);
         }
         subst = BuildTypeArgumentSubstitute(subst, receiverTypeBound ?? receiver.Type);
@@ -5918,18 +5837,15 @@ Expression ResolveExprDotCall(IToken tok, Expression receiver, Type receiverType
         }
         for (int i = 0; i < m.TypeArgs.Count; i++) {
           var ta = i < suppliedTypeArguments ? optTypeArguments[i] : new InferredTypeProxy();
-          rr.TypeApplication_JustMember.Add(ta);
+          rr.TypeApplicationJustMember.Add(ta);
           subst.Add(m.TypeArgs[i], ta);
         }
         subst = BuildTypeArgumentSubstitute(subst, receiverTypeBound ?? receiver.Type);
-        rr.ResolvedOutparameterTypes = m.Outs.ConvertAll(f => f.Type.Subst(subst));
         rr.Type = new InferredTypeProxy();  // fill in this field, in order to make "rr" resolved
       }
       return rr;
     }
 
-    public record MethodCallInformation(IToken Tok, MemberSelectExpr Callee, List<ActualBinding> ActualParameters);
-
     public MethodCallInformation ResolveApplySuffix(ApplySuffix e, ResolutionContext resolutionContext, bool allowMethodCall) {
       Contract.Requires(e != null);
       Contract.Requires(resolutionContext != null);
@@ -5940,7 +5856,7 @@ public MethodCallInformation ResolveApplySuffix(ApplySuffix e, ResolutionContext
         r = ResolveNameSegment((NameSegment)e.Lhs, true, e.Bindings.ArgumentBindings, resolutionContext, allowMethodCall);
         // note, if r is non-null, then e.Args have been resolved and r is a resolved expression that incorporates e.Args
       } else if (e.Lhs is ExprDotName) {
-        r = ResolveDotSuffix((ExprDotName)e.Lhs, true, e.Bindings.ArgumentBindings, resolutionContext, allowMethodCall);
+        r = ResolveDotSuffix((ExprDotName)e.Lhs, false, true, e.Bindings.ArgumentBindings, resolutionContext, allowMethodCall);
         // note, if r is non-null, then e.Args have been resolved and r is a resolved expression that incorporates e.Args
       } else {
         ResolveExpression(e.Lhs, resolutionContext);
@@ -5957,15 +5873,15 @@ public MethodCallInformation ResolveApplySuffix(ApplySuffix e, ResolutionContext
         }
       }
       if (r == null) {
-        var improvedType = PartiallyResolveTypeForMemberSelection(e.Lhs.tok, e.Lhs.Type, "_#apply");
+        var improvedType = PartiallyResolveTypeForMemberSelection(e.Lhs.Origin, e.Lhs.Type, "_#apply");
         var fnType = improvedType.AsArrowType;
         if (fnType == null) {
           var lhs = e.Lhs.Resolved;
-          if (lhs != null && lhs.Type is Resolver_IdentifierExpr.ResolverType_Module) {
-            reporter.Error(MessageSource.Resolver, e.tok, "name of module ({0}) is used as a function", ((Resolver_IdentifierExpr)lhs).Decl.Name);
-          } else if (lhs != null && lhs.Type is Resolver_IdentifierExpr.ResolverType_Type) {
-            var ri = (Resolver_IdentifierExpr)lhs;
-            reporter.Error(MessageSource.Resolver, e.tok, "name of {0} ({1}) is used as a function", ri.Decl.WhatKind, ri.Decl.Name);
+          if (lhs != null && lhs.Type is ResolverIdentifierExpr.ResolverTypeModule) {
+            reporter.Error(MessageSource.Resolver, e.Origin, "name of module ({0}) is used as a function", ((ResolverIdentifierExpr)lhs).Decl.Name);
+          } else if (lhs != null && lhs.Type is ResolverIdentifierExpr.ResolverTypeType) {
+            var ri = (ResolverIdentifierExpr)lhs;
+            reporter.Error(MessageSource.Resolver, e.Origin, "name of {0} ({1}) is used as a function", ri.Decl.WhatKind, ri.Decl.Name);
           } else {
             if (lhs is MemberSelectExpr mse && mse.Member is Method) {
               if (atLabel != null) {
@@ -5978,14 +5894,13 @@ public MethodCallInformation ResolveApplySuffix(ApplySuffix e, ResolutionContext
               }
               if (allowMethodCall) {
                 Contract.Assert(!e.Bindings.WasResolved); // we expect that .Bindings has not yet been processed, so we use just .ArgumentBindings in the next line
-                var tok = Options.Get(DafnyConsolePrinter.ShowSnippets) ? e.RangeToken.ToToken() : e.tok;
-                var cRhs = new MethodCallInformation(tok, mse, e.Bindings.ArgumentBindings);
+                var cRhs = new MethodCallInformation(e.Origin, mse, e.Bindings.ArgumentBindings);
                 return cRhs;
               } else {
-                reporter.Error(MessageSource.Resolver, e.tok, "{0} call is not allowed to be used in an expression context ({1})", mse.Member.WhatKind, mse.Member.Name);
+                reporter.Error(MessageSource.Resolver, e.Origin, "{0} call is not allowed to be used in an expression context ({1})", mse.Member.WhatKind, mse.Member.Name);
               }
             } else if (lhs != null) {  // if e.Lhs.Resolved is null, then e.Lhs was not successfully resolved and an error has already been reported
-              reporter.Error(MessageSource.Resolver, e.tok, "non-function expression (of type {0}) is called with parameters", e.Lhs.Type);
+              reporter.Error(MessageSource.Resolver, e.Origin, "non-function expression (of type {0}) is called with parameters", e.Lhs.Type);
             }
           }
           // resolve the arguments, even in the presence of the errors above
@@ -6001,33 +5916,33 @@ public MethodCallInformation ResolveApplySuffix(ApplySuffix e, ResolutionContext
           }
           if (callee != null) {
             // produce a FunctionCallExpr instead of an ApplyExpr(MemberSelectExpr)
-            var rr = new FunctionCallExpr(e.Lhs.tok, callee.Name, mse.Obj, e.tok, e.CloseParen, e.Bindings, atLabel) {
+            var rr = new FunctionCallExpr(e.Origin, mse.MemberNameNode, mse.Obj, e.Origin, e.CloseParen, e.Bindings, atLabel) {
               Function = callee,
-              TypeApplication_AtEnclosingClass = mse.TypeApplication_AtEnclosingClass,
-              TypeApplication_JustFunction = mse.TypeApplication_JustMember
+              TypeApplication_AtEnclosingClass = mse.TypeApplicationAtEnclosingClass,
+              TypeApplication_JustFunction = mse.TypeApplicationJustMember
             };
             var typeMap = BuildTypeArgumentSubstitute(mse.TypeArgumentSubstitutionsAtMemberDeclaration());
-            ResolveActualParameters(rr.Bindings, callee.Formals, e.tok, callee, resolutionContext, typeMap, callee.IsStatic ? null : mse.Obj);
+            ResolveActualParameters(rr.Bindings, callee.Ins, e.Origin, callee, resolutionContext, typeMap, callee.IsStatic ? null : mse.Obj);
             rr.Type = callee.ResultType.Subst(typeMap);
             if (errorCount == reporter.Count(ErrorLevel.Error)) {
               Contract.Assert(!(mse.Obj is StaticReceiverExpr) || callee.IsStatic);  // this should have been checked already
-              Contract.Assert(callee.Formals.Count == rr.Args.Count);  // this should have been checked already
+              Contract.Assert(callee.Ins.Count == rr.Args.Count);  // this should have been checked already
             }
             r = rr;
           } else {
             List<Formal> formals;
             if (callee != null) {
-              formals = callee.Formals;
+              formals = callee.Ins;
             } else {
               formals = new List<Formal>();
               for (var i = 0; i < fnType.Args.Count; i++) {
                 var argType = fnType.Args[i];
-                var formal = new ImplicitFormal(e.tok, "_#p" + i, argType, true, false);
+                var formal = new ImplicitFormal(e.Origin, "_#p" + i, argType, true, false);
                 formals.Add(formal);
               }
             }
-            ResolveActualParameters(e.Bindings, formals, e.tok, fnType, resolutionContext, new Dictionary<TypeParameter, Type>(), null);
-            r = new ApplyExpr(e.Lhs.tok, e.Lhs, e.Args, e.CloseParen);
+            ResolveActualParameters(e.Bindings, formals, e.Origin, fnType, resolutionContext, new Dictionary<TypeParameter, Type>(), null);
+            r = new ApplyExpr(e.Lhs.Origin, e.Lhs, e.Args, e.CloseParen);
             r.Type = fnType.Result;
           }
         }
@@ -6062,19 +5977,19 @@ private bool ResolveDatatypeValue(ResolutionContext resolutionContext, DatatypeV
         subst.Add(dt.TypeArgs[i], t);
       }
       // Construct a resolved type directly, as we know the declaration is dt.
-      dtv.Type = new UserDefinedType(dtv.tok, dt.Name, dt, gt);
+      dtv.Type = new UserDefinedType(dtv.Origin, dt.Name, dt, gt);
 
       if (!dt.ConstructorsByName.TryGetValue(dtv.MemberName, out var ctor)) {
         ok = false;
         if (complain) {
-          reporter.Error(MessageSource.Resolver, dtv.tok, "undeclared constructor {0} in datatype {1}", dtv.MemberName, dtv.DatatypeName);
+          reporter.Error(MessageSource.Resolver, dtv.Origin, "undeclared constructor {0} in datatype {1}", dtv.MemberName, dtv.DatatypeName);
         }
       } else {
         Contract.Assert(ctor != null);  // follows from postcondition of TryGetValue
         dtv.Ctor = ctor;
       }
       if (complain && ctor != null) {
-        ResolveActualParameters(dtv.Bindings, ctor.Formals, dtv.tok, ctor, resolutionContext, subst, null);
+        ResolveActualParameters(dtv.Bindings, ctor.Formals, dtv.Origin, ctor, resolutionContext, subst, null);
       } else {
         // still resolve the expressions
         foreach (var binding in dtv.Bindings.ArgumentBindings) {
@@ -6093,7 +6008,7 @@ public void ResolveFunctionCallExpr(FunctionCallExpr e, ResolutionContext resolu
       ResolveReceiver(e.Receiver, resolutionContext);
       Contract.Assert(e.Receiver.Type != null);  // follows from postcondition of ResolveExpression
 
-      var member = ResolveMember(e.tok, e.Receiver.Type, e.Name, out var tentativeReceiverType);
+      var member = ResolveMember(e.Origin, e.Receiver.Type, e.Name, out var tentativeReceiverType);
 #if !NO_WORK_TO_BE_DONE
       var ctype = (UserDefinedType)tentativeReceiverType;
 #endif
@@ -6107,7 +6022,7 @@ public void ResolveFunctionCallExpr(FunctionCallExpr e, ResolutionContext resolu
         Function function = (Function)member;
         e.Function = function;
         if (function is TwoStateFunction && !resolutionContext.IsTwoState) {
-          reporter.Error(MessageSource.Resolver, e.tok, "a two-state function can be used only in a two-state context");
+          reporter.Error(MessageSource.Resolver, e.Origin, "a two-state function can be used only in a two-state context");
         }
         if (e.Receiver is StaticReceiverExpr && !function.IsStatic) {
           reporter.Error(MessageSource.Resolver, e, "an instance function must be selected via an object, not just a class name");
@@ -6146,7 +6061,7 @@ public void ResolveFunctionCallExpr(FunctionCallExpr e, ResolutionContext resolu
         Dictionary<TypeParameter, Type> subst = BuildTypeArgumentSubstitute(typeMap);
 
         // type check the arguments
-        ResolveActualParameters(e.Bindings, function.Formals, e.tok, function, resolutionContext, subst, function.IsStatic ? null : e.Receiver);
+        ResolveActualParameters(e.Bindings, function.Ins, e.Origin, function, resolutionContext, subst, function.IsStatic ? null : e.Receiver);
 
         e.Type = function.ResultType.Subst(subst).NormalizeExpand();
       }
@@ -6160,7 +6075,7 @@ void ResolveReceiver(Expression expr, ResolutionContext resolutionContext) {
         // Allow 'this' here, regardless of scope.AllowInstance.  The caller is responsible for
         // making sure 'this' does not really get used when it's not available.
         Contract.Assume(currentClass != null);  // this is really a precondition, in this case
-        expr.Type = GetThisType(expr.tok, currentClass);
+        expr.Type = GetThisType(expr.Origin, currentClass);
       } else {
         ResolveExpression(expr, resolutionContext);
       }
@@ -6177,31 +6092,33 @@ void ResolveSeqSelectExpr(SeqSelectExpr e, ResolutionContext resolutionContext)
       Contract.Assert(e.Seq.Type != null);  // follows from postcondition of ResolveExpression
 
       if (e.SelectOne) {
-        AddXConstraint(e.tok, "Indexable", e.Seq.Type, "element selection requires a sequence, array, multiset, or map (got {0})");
+        AddXConstraint(e.Origin, "Indexable", e.Seq.Type, "element selection requires a sequence, array, multiset, or map (got {0})");
         ResolveExpression(e.E0, resolutionContext);
-        AddXConstraint(e.E0.tok, "ContainerIndex", e.Seq.Type, e.E0.Type, "incorrect type for selection into {0} (got {1})");
+        AddXConstraint(e.E0.Origin, "ContainerIndex", e.Seq.Type, e.E0.Type, "incorrect type for selection into {0} (got {1})");
         Contract.Assert(e.E1 == null);
         e.Type = new InferredTypeProxy() { KeepConstraints = true };
-        AddXConstraint(e.tok, "ContainerResult",
+        AddXConstraint(e.Origin, "ContainerResult",
           e.Seq.Type, e.Type,
-          new SeqSelectOneErrorMsg(e.tok, e.Seq.Type, e.Type));
+          new SeqSelectOneErrorMsg(e.Origin, e.Seq.Type, e.Type));
       } else {
-        AddXConstraint(e.tok, "MultiIndexable", e.Seq.Type, "multi-selection of elements requires a sequence or array (got {0})");
+        AddXConstraint(e.Origin, "MultiIndexable", e.Seq.Type, "multi-selection of elements requires a sequence or array (got {0})");
         if (e.E0 != null) {
           ResolveExpression(e.E0, resolutionContext);
-          AddXConstraint(e.E0.tok, "ContainerIndex", e.Seq.Type, e.E0.Type, "incorrect type for selection into {0} (got {1})");
-          ConstrainSubtypeRelation(NewIntegerBasedProxy(e.tok), e.E0.Type, e.E0, "wrong number of indices for multi-selection");
+          AddXConstraint(e.E0.Origin, "ContainerIndex", e.Seq.Type, e.E0.Type, "incorrect type for selection into {0} (got {1})");
+          ConstrainSubtypeRelation(NewIntegerBasedProxy(e.Origin), e.E0.Type, e.E0, "wrong number of indices for multi-selection");
         }
         if (e.E1 != null) {
           ResolveExpression(e.E1, resolutionContext);
-          AddXConstraint(e.E1.tok, "ContainerIndex", e.Seq.Type, e.E1.Type, "incorrect type for selection into {0} (got {1})");
-          ConstrainSubtypeRelation(NewIntegerBasedProxy(e.tok), e.E1.Type, e.E1, "wrong number of indices for multi-selection");
+          AddXConstraint(e.E1.Origin, "ContainerIndex", e.Seq.Type, e.E1.Type, "incorrect type for selection into {0} (got {1})");
+          ConstrainSubtypeRelation(NewIntegerBasedProxy(e.Origin), e.E1.Type, e.E1, "wrong number of indices for multi-selection");
         }
         var resultType = new InferredTypeProxy() { KeepConstraints = true };
         e.Type = new SeqType(resultType);
-        AddXConstraint(e.tok, "ContainerResult", e.Seq.Type, resultType, "multi-selection has type {0} which is incompatible with expected type {1}");
+        AddXConstraint(e.Origin, "ContainerResult", e.Seq.Type, resultType, "multi-selection has type {0} which is incompatible with expected type {1}");
       }
     }
 
   }
+
+  public record MethodCallInformation(IOrigin Tok, MemberSelectExpr Callee, List<ActualBinding> ActualParameters);
 }
diff --git a/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/TypeInferenceChecker.cs b/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/TypeInferenceChecker.cs
index 0bb40c009aa..55a801409da 100644
--- a/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/TypeInferenceChecker.cs
+++ b/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/TypeInferenceChecker.cs
@@ -3,11 +3,11 @@
 namespace Microsoft.Dafny;
 
 partial class ModuleResolver {
-  public void ReportWarning(ErrorId errorId, IToken t, string msg, params object[] args) {
+  public void ReportWarning(ErrorId errorId, IOrigin t, string msg, params object[] args) {
     reporter.Warning(MessageSource.Resolver, errorId, t, msg, args);
   }
 
-  public void ReportError(ErrorId errorId, IToken t, string msg, params object[] args) {
+  public void ReportError(ErrorId errorId, IOrigin t, string msg, params object[] args) {
     reporter.Error(MessageSource.Resolver, errorId, t, msg, args);
   }
 
diff --git a/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/XConstraint.cs b/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/XConstraint.cs
index 9a6a6c77a3c..a59d27959e8 100644
--- a/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/XConstraint.cs
+++ b/Source/DafnyCore/Resolver/NameResolutionAndTypeInference/XConstraint.cs
@@ -5,11 +5,11 @@
 namespace Microsoft.Dafny;
 
 public class XConstraint {
-  public readonly IToken tok;
+  public readonly IOrigin tok;
   public readonly string ConstraintName;
   public readonly Type[] Types;
   public readonly TypeConstraint.ErrorMsg errorMsg;
-  public XConstraint(IToken tok, string constraintName, Type[] types, TypeConstraint.ErrorMsg errMsg) {
+  public XConstraint(IOrigin tok, string constraintName, Type[] types, TypeConstraint.ErrorMsg errMsg) {
     Contract.Requires(tok != null);
     Contract.Requires(constraintName != null);
     Contract.Requires(types != null);
@@ -141,19 +141,11 @@ public bool Confirm(ModuleResolver resolver, bool fullstrength, out bool convert
         break;
       case "IntOrORDINAL":
         if (!(t is TypeProxy)) {
-          if (TernaryExpr.PrefixEqUsesNat) {
-            satisfied = t.IsNumericBased(Type.NumericPersuasion.Int);
-          } else {
-            satisfied = t.IsNumericBased(Type.NumericPersuasion.Int) || t.IsBigOrdinalType;
-          }
+          satisfied = t.IsNumericBased(Type.NumericPersuasion.Int) || t.IsBigOrdinalType;
         } else if (fullstrength) {
           var proxy = (TypeProxy)t;
-          if (TernaryExpr.PrefixEqUsesNat) {
-            resolver.AssignProxyAndHandleItsConstraints(proxy, Type.Int);
-          } else {
-            // let's choose ORDINAL over int
-            resolver.AssignProxyAndHandleItsConstraints(proxy, Type.BigOrdinal);
-          }
+          // let's choose ORDINAL over int
+          resolver.AssignProxyAndHandleItsConstraints(proxy, Type.BigOrdinal);
           convertedIntoOtherTypeConstraints = true;
           satisfied = true;
         } else {
@@ -357,7 +349,7 @@ public bool Confirm(ModuleResolver resolver, bool fullstrength, out bool convert
             Contract.Assert(a.TypeArgs.Count == b.TypeArgs.Count);
             var cl = a is UserDefinedType ? ((UserDefinedType)a).ResolvedClass : null;
             for (int i = 0; i < a.TypeArgs.Count; i++) {
-              resolver.AllXConstraints.Add(new XConstraint_EquatableArg(tok,
+              resolver.AllXConstraints.Add(new XConstraintEquatableArg(tok,
                 a.TypeArgs[i], b.TypeArgs[i],
                 a is CollectionType || (cl != null && cl.TypeArgs[i].Variance != TypeParameter.TPVariance.Non),
                 a.IsRefType,
@@ -370,7 +362,7 @@ public bool Confirm(ModuleResolver resolver, bool fullstrength, out bool convert
       case "EquatableArg": {
           t = Types[0].NormalizeExpandKeepConstraints();
           var u = Types[1].NormalizeExpandKeepConstraints();
-          var moreExactThis = (XConstraint_EquatableArg)this;
+          var moreExactThis = (XConstraintEquatableArg)this;
           if (t is TypeProxy && u is TypeProxy) {
             return false;  // not enough information to do anything sensible
           } else if (t is TypeProxy || u is TypeProxy) {
@@ -417,7 +409,7 @@ public bool Confirm(ModuleResolver resolver, bool fullstrength, out bool convert
             Contract.Assert(a.TypeArgs.Count == b.TypeArgs.Count);
             var cl = a is UserDefinedType ? ((UserDefinedType)a).ResolvedClass : null;
             for (int i = 0; i < a.TypeArgs.Count; i++) {
-              resolver.AllXConstraints.Add(new XConstraint_EquatableArg(tok,
+              resolver.AllXConstraints.Add(new XConstraintEquatableArg(tok,
                 a.TypeArgs[i], b.TypeArgs[i],
                 a is CollectionType || (cl != null && cl.TypeArgs[i].Variance != TypeParameter.TPVariance.Non),
                 false,
@@ -562,7 +554,7 @@ Type FindCollectionType(DafnyOptions options, Type t, bool towardsSub, ISet<Type
 
 public class XConstraintWithExprs : XConstraint {
   public readonly Expression[] Exprs;
-  public XConstraintWithExprs(IToken tok, string constraintName, Type[] types, Expression[] exprs, TypeConstraint.ErrorMsg errMsg)
+  public XConstraintWithExprs(IOrigin tok, string constraintName, Type[] types, Expression[] exprs, TypeConstraint.ErrorMsg errMsg)
     : base(tok, constraintName, types, errMsg) {
     Contract.Requires(tok != null);
     Contract.Requires(constraintName != null);
@@ -573,10 +565,10 @@ public XConstraintWithExprs(IToken tok, string constraintName, Type[] types, Exp
   }
 }
 
-public class XConstraint_EquatableArg : XConstraint {
+public class XConstraintEquatableArg : XConstraint {
   public bool AllowSuperSub;
   public bool TreatTypeParamAsWild;
-  public XConstraint_EquatableArg(IToken tok, Type a, Type b, bool allowSuperSub, bool treatTypeParamAsWild, TypeConstraint.ErrorMsg errMsg)
+  public XConstraintEquatableArg(IOrigin tok, Type a, Type b, bool allowSuperSub, bool treatTypeParamAsWild, TypeConstraint.ErrorMsg errMsg)
     : base(tok, "EquatableArg", new Type[] { a, b }, errMsg) {
     Contract.Requires(tok != null);
     Contract.Requires(a != null);
diff --git a/Source/DafnyCore/Resolver/NativeTypeAnalysis.cs b/Source/DafnyCore/Resolver/NativeTypeAnalysis.cs
new file mode 100644
index 00000000000..cd340d211f0
--- /dev/null
+++ b/Source/DafnyCore/Resolver/NativeTypeAnalysis.cs
@@ -0,0 +1,254 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System.Collections.Generic;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using JetBrains.Annotations;
+
+namespace Microsoft.Dafny;
+
+class NativeTypeAnalysis {
+  private readonly ErrorReporter reporter;
+
+  public NativeTypeAnalysis(ErrorReporter reporter) {
+    this.reporter = reporter;
+  }
+
+  public void FigureOutNativeType(NewtypeDecl dd, DafnyOptions options) {
+
+    // Look at the :nativeType attribute, if any
+    var hasNativeTypePreference = ReadAttributesForNativePreferences(dd.Attributes, out var nativeTypeChoices);
+    if (hasNativeTypePreference == false) {
+      // don't use native type
+      return;
+    }
+    if (hasNativeTypePreference == true && dd.BaseType.NormalizeToAncestorType() is not (IntType or BitvectorType)) {
+      reporter.Error(MessageSource.Resolver, dd, ":nativeType can only be used on a newtype based on integers or bitvectors");
+      return;
+    }
+
+    var detectedRange = "";
+    List<(NativeType, bool coversEntireIntegerRange)> possibleNativeTypes = GetPossibleNativeTypes(dd, nativeTypeChoices, ref detectedRange);
+    if (possibleNativeTypes == null) {
+      // An error occurred while computing "possibleNativeTypes"
+      return;
+    }
+
+    // Finally, of the big-enough native types, pick the first one that is supported by the selected target compiler.
+    foreach (var (nativeT, coversEntireIntegerRange) in possibleNativeTypes) {
+      if (options.Backend.SupportedNativeTypes.Contains(nativeT.Name)) {
+        // Pick this one!
+        dd.NativeType = nativeT;
+        if (coversEntireIntegerRange && nativeT.Sel != NativeType.Selection.Number) {
+          dd.TargetTypeCoversAllBitPatterns = true;
+        }
+
+        // Give an info message saying which type was selected--unless the user requested
+        // one particular native type, in which case that must have been the one picked.
+        if (nativeTypeChoices is { Count: 1 }) {
+          Contract.Assert(dd.NativeType == nativeTypeChoices[0]);
+          if (dd.TargetTypeCoversAllBitPatterns) {
+            reporter.Info(MessageSource.Resolver, dd.Origin,
+              $"newtype {dd.Name} is target-complete for {{:nativeType \"{dd.NativeType.Name}\"}}");
+          }
+        } else {
+          var targetComplete = dd.TargetTypeCoversAllBitPatterns ? "target-complete " : "";
+          reporter.Info(MessageSource.Resolver, dd.Origin,
+            $"newtype {dd.Name} resolves as {targetComplete}{{:nativeType \"{dd.NativeType.Name}\"}} (detected range: {detectedRange})");
+        }
+
+        return;
+      }
+    }
+    // Among the choices available to us, we did not find a native type that is big enough and supported by the compiler.
+    if (nativeTypeChoices != null) {
+      reporter.Error(MessageSource.Resolver, dd,
+        "None of the types given in :nativeType arguments is supported by the current compilation target. Try supplying others.");
+    } else if (hasNativeTypePreference == true) {
+      reporter.Error(MessageSource.Resolver, dd,
+        "Dafny's heuristics cannot find a compatible native type. " +
+        "Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.");
+    }
+  }
+
+  /// <summary>
+  /// Return the native types that are big enough to hold values of for "newtypeDecl". If "nativeTypeChoices" is given, then the
+  /// search is restricted to those native types.
+  ///
+  /// For each native type returned, also indicate if that native type covers the entire integer range of "newtypeDecl".
+  /// </summary>
+  private List<(NativeType, bool coversEntireIntegerRange)> GetPossibleNativeTypes(NewtypeDecl newtypeDecl,
+    [CanBeNull] List<NativeType> nativeTypeChoices, ref string detectedRange) {
+
+    // Figure out the variable and constraint.  Usually, these would be just .Var and .Constraint, but
+    // in the case .Var/.Constraint are null, these can be computed from the .BaseType recursively.
+    var ddVar = newtypeDecl.Var;
+    var ddConstraint = newtypeDecl.Constraint;
+    for (var ddWhereConstraintsAre = newtypeDecl; ddVar == null;) {
+      ddWhereConstraintsAre = ddWhereConstraintsAre.BaseType.AsNewtype;
+      if (ddWhereConstraintsAre == null) {
+        break;
+      }
+      ddVar = ddWhereConstraintsAre.Var;
+      ddConstraint = ddWhereConstraintsAre.Constraint;
+    }
+
+    var ancestorType = newtypeDecl.BaseType.NormalizeToAncestorType();
+    if (ancestorType is BitvectorType bitvectorAncestorType) {
+      return FigureOutNativeTypeForBitvectorNewtype(newtypeDecl, bitvectorAncestorType, ddVar == null,
+        nativeTypeChoices ?? ModuleResolver.NativeTypes, nativeTypeChoices != null);
+    } else if (ancestorType is IntType) {
+      return FigureOutNativeTypeForIntegerNewtype(newtypeDecl, ddVar, ddConstraint,
+        nativeTypeChoices ?? ModuleResolver.NativeTypes, nativeTypeChoices != null, out detectedRange);
+    } else {
+      // No native type available
+      return new List<(NativeType, bool coversEntireIntegerRange)>();
+    }
+  }
+
+  /// <summary>
+  /// Look at the :nativeType attribute, if any, to determine preferences.
+  /// A return of false means: don't use native type. (nativeTypes returns as null)
+  /// A return of null means: no preference. (nativeTypes returns as null)
+  /// A return of true means: make sure a native type is used. Furthermore,
+  ///   * if nativeTypes is null, then no particular preference about which native type is picked
+  ///   * if nativeTypes is non-null, then the choices of native types are restricted to those.
+  /// </summary>
+  bool? ReadAttributesForNativePreferences(Attributes attributes, [CanBeNull] out List<NativeType> nativeTypes) {
+    nativeTypes = null;
+    var args = Attributes.FindExpressions(attributes, "nativeType");
+    if (args == null) {
+      // There was no :nativeType attribute
+      return null;
+    }
+    if (args.Count == 0) {
+      // {:nativeType}
+      return true;
+    }
+    if (args[0] is LiteralExpr { Value: bool and var boolValue }) {
+      return boolValue;
+    }
+
+    var choices = new List<NativeType>();
+    foreach (var arg in args) {
+      if (arg is LiteralExpr { Value: string s }) {
+        // Get the NativeType for "s"
+        var nativeType = ModuleResolver.NativeTypes.Find(nativeType => nativeType.Name == s);
+        if (nativeType == null) {
+          reporter.Error(MessageSource.Resolver, arg.Origin, ":nativeType '{0}' not known", s);
+          return false;
+        }
+        choices.Add(nativeType);
+      } else {
+        reporter.Error(MessageSource.Resolver, arg, "unexpected :nativeType argument");
+        return false;
+      }
+    }
+    nativeTypes = choices;
+    return true;
+  }
+
+  /// <summary>
+  /// Returns a list of (n, b) pairs, where "n" is a big enough native type to hold "dd" and "b" says whether or not
+  /// all bit patterns of "n" are possible values for "dd".
+  /// Returns null if a failure is detected and reported.
+  /// </summary>
+  [CanBeNull]
+  private List<(NativeType, bool coversEntireIntegerRange)> FigureOutNativeTypeForBitvectorNewtype(NewtypeDecl dd,
+    BitvectorType bitvectorAncestorType, bool noFurtherConstraints,
+    List<NativeType> nativeTypesUnderConsideration, bool reportErrorIfTUCDoesNotFit) {
+
+    var bigEnoughNativeTypes = new List<(NativeType, bool coversEntireIntegerRange)>();
+    foreach (var nativeType in nativeTypesUnderConsideration) {
+      if (nativeType.Bitwidth != 0 && bitvectorAncestorType.Width <= nativeType.Bitwidth) {
+        bigEnoughNativeTypes.Add((nativeType, noFurtherConstraints && bitvectorAncestorType.Width == nativeType.Bitwidth));
+      } else if (reportErrorIfTUCDoesNotFit && nativeType.Bitwidth == 0) {
+        var hint = "";
+        if (nativeType.UnsignedCounterpart() is not null and var unsignedCounterpart) {
+          var counterpart = ModuleResolver.NativeTypes.Find(nativeT => nativeT.Sel == unsignedCounterpart);
+          Contract.Assert(counterpart != null);
+          hint = $" Hint: Try using the unsigned native type '{counterpart.Name}'.";
+        }
+        reporter.Error(MessageSource.Resolver, dd,
+          $"A newtype based on a bitvector type ({bitvectorAncestorType.Name}) cannot use a native type that admits negative values ('{nativeType.Name}').{hint}");
+        return null;
+      } else if (reportErrorIfTUCDoesNotFit) {
+        var hint = noFurtherConstraints ? "" : " Note: constraints of bitvector-based newtypes are not considered when determining native types.";
+        reporter.Error(MessageSource.Resolver, dd,
+          $"The width of bitvector type {bitvectorAncestorType.Name} cannot fit into native type '{nativeType.Name}'.{hint}");
+        return null;
+      }
+    }
+
+    return bigEnoughNativeTypes;
+  }
+
+  /// <summary>
+  /// Returns a list of (n, b) pairs, where "n" is a big enough native type to hold "dd" and "b" says whether or not
+  /// all bit patterns of "n" are possible values for "dd".
+  /// Returns null if a failure is detected and reported.
+  /// </summary>
+  [CanBeNull]
+  private List<(NativeType, bool coversEntireIntegerRange)> FigureOutNativeTypeForIntegerNewtype(NewtypeDecl dd,
+    [CanBeNull] BoundVar ddVar, [CanBeNull] Expression ddConstraint,
+    List<NativeType> nativeTypesUnderConsideration, bool reportErrorIfTUCDoesNotFit,
+    out string detectedRange) {
+    Contract.Requires((ddVar == null) == (ddConstraint == null));
+
+    bool constraintConsistsSolelyOfRangeConstraints;
+    BigInteger? lowBound = null;
+    BigInteger? highBound = null;
+    if (ddVar == null) {
+      constraintConsistsSolelyOfRangeConstraints = true;
+    } else {
+      var bounds = ModuleResolver.DiscoverAllBounds_SingleVar(ddVar, ddConstraint, out constraintConsistsSolelyOfRangeConstraints);
+
+      foreach (var bound in bounds) {
+        void UpdateBounds(BigInteger? lo, BigInteger? hi) {
+          if (lo != null && (lowBound == null || lowBound < lo)) {
+            lowBound = lo; // we found a more restrictive lower bound
+          }
+          if (hi != null && (highBound == null || hi < highBound)) {
+            highBound = hi; // we found a more restrictive lower bound
+          }
+        }
+
+        if (bound is IntBoundedPool range) {
+          if (range.LowerBound != null && ConstantFolder.TryFoldInteger(range.LowerBound) is not null and var lo) {
+            UpdateBounds(lo, null);
+          }
+          if (range.UpperBound != null && ConstantFolder.TryFoldInteger(range.UpperBound) is not null and var hi) {
+            UpdateBounds(null, hi);
+          }
+        } else if (bound is ExactBoundedPool exact && ConstantFolder.TryFoldInteger(exact.E) is not null and var value) {
+          UpdateBounds(value, value + 1);
+        }
+      }
+    }
+
+    var emptyRange = lowBound != null && highBound != null && highBound <= lowBound;
+    detectedRange = lowBound == null || highBound == null ? "" : emptyRange ? "empty" : $"{lowBound} .. {highBound}";
+
+    var bigEnoughNativeTypes = new List<(NativeType, bool coversEntireIntegerRange)>();
+    foreach (var nativeT in nativeTypesUnderConsideration) {
+      bool lowerOk = emptyRange || (lowBound != null && nativeT.LowerBound <= lowBound);
+      bool upperOk = emptyRange || (highBound != null && nativeT.UpperBound >= highBound);
+      if (lowerOk && upperOk) {
+        var coversAllBitPatterns = constraintConsistsSolelyOfRangeConstraints && lowBound == nativeT.LowerBound && highBound == nativeT.UpperBound;
+        bigEnoughNativeTypes.Add((nativeT, coversAllBitPatterns));
+      } else if (reportErrorIfTUCDoesNotFit) {
+        var hint =
+          " Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.";
+        reporter.Error(MessageSource.Resolver, dd,
+          $"Dafny's heuristics failed to confirm '{nativeT.Name}' to be a compatible native type.{hint}");
+        return null;
+      }
+    }
+    return bigEnoughNativeTypes;
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/ObjectConstructorChecker.cs b/Source/DafnyCore/Resolver/ObjectConstructorChecker.cs
index 88076014d36..620d1900ed7 100644
--- a/Source/DafnyCore/Resolver/ObjectConstructorChecker.cs
+++ b/Source/DafnyCore/Resolver/ObjectConstructorChecker.cs
@@ -19,7 +19,7 @@ public override IASTVisitorContext GetContext(IASTVisitorContext astVisitorConte
   }
 
   protected override bool VisitOneStatement(Statement stmt, IASTVisitorContext context) {
-    if (stmt is AssignStmt { Rhs: TypeRhs rr } && rr.ArrayDimensions == null && (rr.Bindings == null || rr.InitCall.Method is not Constructor)) {
+    if (stmt is SingleAssignStmt { Rhs: TypeRhs rr } && rr.ArrayDimensions == null && (rr.Bindings == null || rr.InitCall.Method is not Constructor)) {
       // this is an AssignStmt that allocates one object and does not call a constructor
       var udt = (UserDefinedType)rr.EType.NormalizeExpand();
       var cl = (ClassLikeDecl)udt.ResolvedClass;
diff --git a/Source/DafnyCore/Resolver/PreType/Flows.cs b/Source/DafnyCore/Resolver/PreType/Flows.cs
new file mode 100644
index 00000000000..73748fc5074
--- /dev/null
+++ b/Source/DafnyCore/Resolver/PreType/Flows.cs
@@ -0,0 +1,485 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.IO;
+using JetBrains.Annotations;
+
+namespace Microsoft.Dafny;
+
+record FlowContext(SystemModuleManager SystemModuleManager, ErrorReporter Reporter, bool DebugPrint) {
+  public TextWriter OutputWriter => SystemModuleManager.Options.OutputWriter;
+}
+
+/// <summary>
+/// A "Flow" is a puzzle piece in recomputing types. The "type refinement" phase defines a set of flows and then
+/// recomputes types until it reaches a fix point.
+///
+/// For example, the type refinement phase will use a FlowIntoVariable to define a flow from the RHS of an assignment to
+/// the LHS. It will use a FlowBetweenExpressions to define a flow from the "then" branch of an "if-then-else" expression
+/// to the "if-then-else" expression itself, and will use another FlowBetweenExpressions to define the analogous flow from
+/// the "else" branch.
+///
+/// For more information about type refinements, flow, and the whole type inference process, see docs/dev/TypeSystemRefresh.md.
+/// </summary>
+abstract class Flow {
+  private readonly IOrigin tok;
+  private readonly string description;
+  public bool HasError;
+
+  protected string TokDescription() {
+    return $"({tok.line},{tok.col}) {description}";
+  }
+
+  /// <summary>
+  /// Start flow from source to sink and return whether or not anything changed.
+  /// </summary>
+  public abstract bool Update(FlowContext context);
+
+  protected Flow(IOrigin tok, string description) {
+    this.tok = tok;
+    this.description = description;
+  }
+
+  public abstract void DebugPrint(TextWriter output);
+
+  protected bool UpdateTypeHeldByRefinementWrapper(Type sink, Type sourceType, FlowContext context) {
+    string previousLhs = null;
+    string joinArguments = null;
+    if (context.DebugPrint) {
+      previousLhs = $"{TypeRefinementWrapper.ToStringShowingWrapper(sink)}";
+      joinArguments = $"{TypeRefinementWrapper.ToStringAsBottom(sink)} \\/ {TypeRefinementWrapper.ToStringAsBottom(sourceType)}";
+    }
+
+    var previousSink = (TypeRefinementWrapper.NormalizeSansRefinementWrappers(sink) as TypeRefinementWrapper)?.T ?? sink;
+    var join = JoinAndUpdate(sink, sourceType, context);
+    if (join == null) {
+      HasError = true;
+      return false;
+    }
+    if (EqualTypes(previousSink, sink)) {
+      return false;
+    }
+    if (context.DebugPrint) {
+      context.OutputWriter.WriteLine($"DEBUG: refining {previousLhs} to {TypeRefinementWrapper.ToStringAsBottom(sink)} ({joinArguments})");
+    }
+    return true;
+  }
+
+  protected static bool EqualTypes(Type a, Type b) {
+    if (TypeRefinementWrapper.NormalizesToBottom(a) != TypeRefinementWrapper.NormalizesToBottom(b)) {
+      return false;
+    }
+    return a.Equals(b, true);
+  }
+
+  [CanBeNull]
+  public static Type JoinAndUpdate(Type a, Type b, FlowContext context) {
+    var wrapperA = TypeRefinementWrapper.NormalizeSansRefinementWrappers(a) as TypeRefinementWrapper;
+    var wrapperB = TypeRefinementWrapper.NormalizeSansRefinementWrappers(b) as TypeRefinementWrapper;
+    var join = Join(wrapperA?.T ?? a, wrapperB?.T ?? b, context);
+    if (join == null) {
+      return null;
+    }
+    if (wrapperA == null) {
+      return join;
+    }
+
+    if (TypeRefinementWrapper.NormalizeSansRefinementWrappers(join) is TypeRefinementWrapper wrapperJoin) {
+      join = wrapperJoin.T;
+    }
+    wrapperA.T = join;
+    return wrapperA;
+  }
+
+  [CanBeNull]
+  public static Type CopyAndUpdate(Type a, Type b, FlowContext context) {
+    var wrapperA = TypeRefinementWrapper.NormalizeSansRefinementWrappers(a) as TypeRefinementWrapper;
+    // compute the "copy" of aa and b:
+    Type copy;
+    if (TypeRefinementWrapper.NormalizesToBottom(a)) {
+      copy = b;
+    } else if (TypeRefinementWrapper.NormalizesToBottom(b)) {
+      copy = a;
+    } else if (a.Equals(b, true)) {
+      copy = a;
+    } else {
+      return null;
+    }
+
+    if (wrapperA == null) {
+      return copy;
+    }
+
+    copy = TypeRefinementWrapper.NormalizeSansRefinementWrappers(copy);
+    if (copy is TypeRefinementWrapper wrapperCopy) {
+      copy = wrapperCopy.T;
+    }
+    wrapperA.T = copy;
+    return wrapperA;
+  }
+
+  /// <summary>
+  /// Does a best-effort to compute the join of "a" and "b", where the base types of "a" and "b" (or
+  /// some parent type thereof) are the same.
+  /// If there is no join (for example, if type parameters in a non-variant position are
+  /// incompatible), then return null;
+  /// </summary>
+  [CanBeNull]
+  public static Type Join(Type a, Type b, FlowContext context) {
+    Contract.Requires(a != null);
+    Contract.Requires(b != null);
+
+    [CanBeNull]
+    Type JoinChildren(UserDefinedType udtA, UserDefinedType udtB) {
+      if (udtA.ResolvedClass == udtB.ResolvedClass) {
+        // We have two subset types with equal heads
+        Contract.Assert(a.TypeArgs.Count == b.TypeArgs.Count);
+        var typeArgs = Joins(TypeParameter.Variances(udtA.ResolvedClass.TypeArgs), a.TypeArgs, b.TypeArgs, context);
+        if (typeArgs != null) {
+          return UserDefinedType.FromTopLevelDecl(udtA.Origin, udtA.ResolvedClass, typeArgs);
+        }
+      }
+      return null;
+    }
+
+    if (a is BottomTypePlaceholder) {
+      return b;
+    } else if (b is BottomTypePlaceholder) {
+      return a;
+    }
+
+    // Before we do anything else, make a note of whether or not both "a" and "b" are non-null types.
+    var abNonNullTypes = a.IsNonNullRefType && b.IsNonNullRefType;
+
+    var towerA = Type.GetTowerOfSubsetTypes(a, true);
+    var towerB = Type.GetTowerOfSubsetTypes(b, true);
+    // We almost expect the base types of these towers to be the same, since the module has successfully gone through pre-resolution and the
+    // pre-resolution underspecification checks. However, there are considerations.
+    //   - One is that the two given types may contain unused type parameters in type synonyms or subset types, and pre-resolution does not
+    //     fill those in or detect their absence.
+    //   - The other is traits.
+    for (var n = System.Math.Min(towerA.Count, towerB.Count); 1 <= --n;) {
+      a = towerA[n];
+      b = towerB[n];
+      var join = JoinChildren((UserDefinedType)a, (UserDefinedType)b);
+      if (join != null) {
+        return join;
+      }
+    }
+    // We exhausted all possibilities of subset types being equal, so use the base-most types.
+    a = towerA[0];
+    b = towerB[0];
+
+    if (a is BasicType) {
+      Contract.Assert(b is BasicType);
+      Contract.Assert(a.Equals(b, true));
+      return a;
+
+    } else if (a is CollectionType) {
+      var directions = a.TypeArgs.ConvertAll(_ => TypeParameter.TPVariance.Co);
+      var typeArgs = Joins(directions, a.TypeArgs, b.TypeArgs, context);
+      if (typeArgs == null) {
+        return null;
+      }
+      Contract.Assert(typeArgs.Count == (a is MapType ? 2 : 1));
+      if (a is SetType aSetType) {
+        var bSetType = (SetType)b;
+        Contract.Assert(aSetType.Finite == bSetType.Finite);
+        return new SetType(aSetType.Finite, typeArgs[0]);
+      } else if (a is MultiSetType) {
+        Contract.Assert(b is MultiSetType);
+        return new MultiSetType(typeArgs[0]);
+      } else if (a is SeqType) {
+        Contract.Assert(b is SeqType);
+        return new SeqType(typeArgs[0]);
+      } else {
+        var aMapType = (MapType)a;
+        var bMapType = (MapType)b;
+        Contract.Assert(aMapType.Finite == bMapType.Finite);
+        return new MapType(aMapType.Finite, typeArgs[0], typeArgs[1]);
+      }
+
+    } else if (a.AsArrowType != null) {
+      ArrowType aa = a.AsArrowType;
+      var bb = b.AsArrowType;
+      Contract.Assert(aa != null && bb != null && aa.Arity == bb.Arity);
+      int arity = aa.Arity;
+      Contract.Assert(a.TypeArgs.Count == arity + 1);
+      Contract.Assert(b.TypeArgs.Count == arity + 1);
+      Contract.Assert(aa.ResolvedClass == bb.ResolvedClass);
+      var typeArgs = Joins(aa.Variances(), a.TypeArgs, b.TypeArgs, context);
+      if (typeArgs == null) {
+        return null;
+      }
+      return new ArrowType(aa.Origin, (ArrowTypeDecl)aa.ResolvedClass, typeArgs);
+    }
+
+    // Convert a and b to their common supertype
+    var aDecl = ((UserDefinedType)a).ResolvedClass;
+    var bDecl = ((UserDefinedType)b).ResolvedClass;
+    var commonSupertypeDecl = PreTypeConstraints.JoinHeads(aDecl, bDecl, context.SystemModuleManager);
+    Contract.Assert(commonSupertypeDecl != null);
+    var aTypeSubstMap = TypeParameter.SubstitutionMap(aDecl.TypeArgs, a.TypeArgs);
+    (aDecl as TopLevelDeclWithMembers)?.AddParentTypeParameterSubstitutions(aTypeSubstMap);
+    var bTypeSubstMap = TypeParameter.SubstitutionMap(bDecl.TypeArgs, b.TypeArgs);
+    (bDecl as TopLevelDeclWithMembers)?.AddParentTypeParameterSubstitutions(bTypeSubstMap);
+
+    var aSubst = UserDefinedType.FromTopLevelDecl(commonSupertypeDecl.Origin, commonSupertypeDecl).Subst(aTypeSubstMap);
+    var bSubst = UserDefinedType.FromTopLevelDecl(commonSupertypeDecl.Origin, commonSupertypeDecl).Subst(bTypeSubstMap);
+
+    var joinedTypeArgs = Joins(TypeParameter.Variances(commonSupertypeDecl.TypeArgs), aSubst.TypeArgs, bSubst.TypeArgs, context);
+    if (joinedTypeArgs == null) {
+      return null;
+    }
+    var result = UserDefinedType.FromTopLevelDecl(a.Origin, commonSupertypeDecl, joinedTypeArgs);
+    return abNonNullTypes && result.IsRefType ? UserDefinedType.CreateNonNullType(result) : result;
+  }
+
+  /// <summary>
+  /// Does a best-effort to compute the meet of "a" and "b", where the base types of "a" and "b" (or
+  /// some parent type thereof) are the same.
+  /// If there is no meet (for example, if type parameters in a non-variant position are
+  /// incompatible), then use a bottom type for the common base types of "a" and "b".
+  /// </summary>
+  public static Type Meet(Type a, Type b, FlowContext context) {
+    Contract.Requires(a != null);
+    Contract.Requires(b != null);
+
+    // a crude implementation for now
+    if (Type.IsSupertype(a, b)) {
+      return b;
+    } else if (Type.IsSupertype(b, a)) {
+      return a;
+    } else {
+      // TODO: the following may not be correct in the face of traits
+      return new BottomTypePlaceholder(a.NormalizeExpand());
+    }
+  }
+
+  /// <summary>
+  /// For each i, compute some combination of a[i] and b[i], according to direction[i].
+  /// For a Co direction, use Join(a[i], b[i]).
+  /// For a Contra direction (Co), use Meet(a[i], b[i]).
+  /// For a Non direction, use a[i], provided a[i] and b[i] are equal, or otherwise use the base type of a[i].
+  /// </summary>
+  [CanBeNull]
+  public static List<Type> Joins(List<TypeParameter.TPVariance> directions, List<Type> a, List<Type> b, FlowContext context) {
+    Contract.Requires(directions != null);
+    Contract.Requires(a != null);
+    Contract.Requires(b != null);
+    Contract.Requires(directions.Count == a.Count);
+    Contract.Requires(directions.Count == b.Count);
+
+    var count = directions.Count;
+    var extrema = new List<Type>(count);
+    for (var i = 0; i < count; i++) {
+      Type output;
+      if (directions[i] == TypeParameter.TPVariance.Co) {
+        output = JoinAndUpdate(a[i], b[i], context);
+      } else if (directions[i] == TypeParameter.TPVariance.Contra) {
+        output = Meet(a[i], b[i], context);
+      } else {
+        Contract.Assert(directions[i] == TypeParameter.TPVariance.Non);
+        output = CopyAndUpdate(a[i], b[i], context);
+      }
+      if (output == null) {
+        return null;
+      }
+      extrema.Add(output);
+    }
+    return extrema;
+  }
+}
+
+
+class FlowIntoVariable : Flow {
+  protected readonly Type sink;
+  protected readonly Expression source;
+
+  public FlowIntoVariable(IVariable variable, Expression source, IOrigin tok, string description = ":=")
+    : base(tok, description) {
+    this.sink = TypeRefinementWrapper.NormalizeSansRefinementWrappers(variable.UnnormalizedType);
+    this.source = source;
+  }
+
+  public override bool Update(FlowContext context) {
+    return UpdateTypeHeldByRefinementWrapper(sink, TypeRefinementWrapper.NormalizeSansBottom(source), context);
+  }
+
+  public override void DebugPrint(TextWriter output) {
+    var lhs = TypeRefinementWrapper.ToStringShowingWrapper(sink);
+    var rhs = TypeRefinementWrapper.ToStringShowingWrapper(source.UnnormalizedType);
+    var bound = PreTypeConstraints.Pad($"{lhs} :> {rhs}", 27);
+    var value = PreTypeConstraints.Pad(TypeRefinementWrapper.ToStringAsBottom(sink), 20);
+    output.WriteLine($"    {bound}  {value}    {TokDescription()}");
+  }
+}
+
+class FlowIntoVariableFromComputedType : Flow {
+  protected readonly Type sink;
+  private readonly System.Func<Type> getType;
+
+  public FlowIntoVariableFromComputedType(IVariable variable, System.Func<Type> getType, IOrigin tok, string description = ":=")
+    : base(tok, description) {
+    this.sink = TypeRefinementWrapper.NormalizeSansRefinementWrappers(variable.UnnormalizedType);
+    this.getType = getType;
+  }
+
+  public override bool Update(FlowContext context) {
+    return UpdateTypeHeldByRefinementWrapper(sink, getType(), context);
+  }
+
+  public override void DebugPrint(TextWriter output) {
+    var sourceType = getType();
+    var bound = PreTypeConstraints.Pad($"{TypeRefinementWrapper.ToStringShowingWrapper(sink)} :> {TypeRefinementWrapper.ToStringShowingWrapper(sourceType)}", 27);
+    var value = PreTypeConstraints.Pad(TypeRefinementWrapper.ToStringAsBottom(sink), 20);
+    output.WriteLine($"    {bound}  {value}    {TokDescription()}");
+  }
+}
+
+class FlowBetweenComputedTypes : Flow {
+  private readonly System.Func<(Type, Type)> getTypes;
+
+  public FlowBetweenComputedTypes(System.Func<(Type, Type)> getTypes, IOrigin tok, string description)
+    : base(tok, description) {
+    this.getTypes = getTypes;
+  }
+
+  public override bool Update(FlowContext context) {
+    var (sink, source) = getTypes();
+    return UpdateTypeHeldByRefinementWrapper(sink, source, context);
+  }
+
+  public override void DebugPrint(TextWriter output) {
+    var (sink, source) = getTypes();
+    var bound = PreTypeConstraints.Pad($"{TypeRefinementWrapper.ToStringShowingWrapper(sink)} :> {TypeRefinementWrapper.ToStringShowingWrapper(source)}", 27);
+    var value = PreTypeConstraints.Pad(TypeRefinementWrapper.ToStringAsBottom(sink), 20);
+    output.WriteLine($"    {bound}  {value}    {TokDescription()}");
+  }
+}
+
+abstract class FlowIntoExpr : Flow {
+  private readonly Type sink;
+
+  protected FlowIntoExpr(Type sink, IOrigin tok, string description = "")
+    : base(tok, description) {
+    this.sink = TypeRefinementWrapper.NormalizeSansRefinementWrappers(sink);
+  }
+
+  protected FlowIntoExpr(Expression sink, IOrigin tok, string description = "")
+    : base(sink.Origin, description) {
+    this.sink = sink.UnnormalizedType;
+  }
+
+  protected abstract Type GetSourceType();
+
+  public override bool Update(FlowContext context) {
+    return UpdateTypeHeldByRefinementWrapper(sink, GetSourceType(), context);
+  }
+
+  public override void DebugPrint(TextWriter output) {
+    var sourceType = GetSourceType();
+    var bound = PreTypeConstraints.Pad($"{TypeRefinementWrapper.ToStringShowingWrapper(sink)} :> {TypeRefinementWrapper.ToStringShowingWrapper(sourceType)}", 27);
+    var value = PreTypeConstraints.Pad(TypeRefinementWrapper.ToStringAsBottom(sink), 20);
+    output.WriteLine($"    {bound}  {value}    {TokDescription()}");
+  }
+}
+
+class FlowFromType : FlowIntoExpr {
+  private readonly Type source;
+
+  public FlowFromType(Type sink, Type source, IOrigin tok, string description = "")
+    : base(sink, tok, description) {
+    this.source = source;
+  }
+
+  public FlowFromType(Expression sink, Type source, string description = "")
+    : base(sink, sink.Origin, description) {
+    this.source = source;
+  }
+
+  protected override Type GetSourceType() {
+    return source;
+  }
+}
+
+class FlowFromTypeArgument : FlowIntoExpr {
+  private readonly Type source;
+  private readonly int argumentIndex;
+
+  public FlowFromTypeArgument(Expression sink, Type source, int argumentIndex)
+    : base(sink, sink.Origin) {
+    Contract.Requires(0 <= argumentIndex);
+    this.source = source;
+    this.argumentIndex = argumentIndex;
+  }
+
+  protected override Type GetSourceType() {
+    var sourceType = source.NormalizeToAncestorType();
+    Contract.Assert(argumentIndex < sourceType.TypeArgs.Count);
+    return sourceType.TypeArgs[argumentIndex];
+  }
+}
+
+class FlowFromTypeArgumentOfComputedSource : FlowIntoExpr {
+  private readonly System.Func<Type> getType;
+  private readonly int argumentIndex;
+
+  public FlowFromTypeArgumentOfComputedSource(Expression sink, System.Func<Type> getType, int argumentIndex)
+    : base(sink, sink.Origin) {
+    Contract.Requires(0 <= argumentIndex);
+    this.getType = getType;
+    this.argumentIndex = argumentIndex;
+  }
+
+  protected override Type GetSourceType() {
+    var sourceType = getType().NormalizeExpand();
+    Contract.Assert(argumentIndex < sourceType.TypeArgs.Count);
+    return sourceType.TypeArgs[argumentIndex];
+  }
+}
+
+class FlowFromComputedType : FlowIntoExpr {
+  private readonly System.Func<Type> getType;
+
+  public FlowFromComputedType(Expression sink, System.Func<Type> getType, string description = "")
+    : base(sink, sink.Origin, description) {
+    this.getType = getType;
+  }
+
+  protected override Type GetSourceType() {
+    return getType();
+  }
+}
+
+class FlowFromComputedTypeIgnoreHeadTypes : FlowIntoExpr {
+  private readonly System.Func<Type> getType;
+
+  public FlowFromComputedTypeIgnoreHeadTypes(Expression sink, System.Func<Type> getType, string description = "")
+    : base(sink.Type.NormalizeToAncestorType(), sink.Origin, description) {
+    this.getType = getType;
+  }
+
+  protected override Type GetSourceType() {
+    return getType();
+  }
+}
+
+class FlowBetweenExpressions : FlowIntoExpr {
+  private readonly Expression source;
+
+  public FlowBetweenExpressions(Expression sink, Expression source, string description = "")
+    : base(sink, sink.Origin, description) {
+    this.source = source;
+  }
+
+  protected override Type GetSourceType() {
+    return TypeRefinementWrapper.NormalizeSansBottom(source);
+  }
+}
diff --git a/Source/DafnyCore/Resolver/PreType/INewOrOldResolver.cs b/Source/DafnyCore/Resolver/PreType/INewOrOldResolver.cs
new file mode 100644
index 00000000000..fbdf05bd715
--- /dev/null
+++ b/Source/DafnyCore/Resolver/PreType/INewOrOldResolver.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+
+namespace Microsoft.Dafny;
+
+public interface INewOrOldResolver {
+
+  DafnyOptions Options { get; }
+  ErrorReporter Reporter { get; }
+  Scope<IVariable> Scope { get; }
+  Scope<Label> DominatingStatementLabels { get; }
+  Scope<Statement> EnclosingStatementLabels { get; set; }
+  List<Statement> LoopStack { get; set; }
+  void ResolveAttributes(IAttributeBearingDeclaration attributedToken, ResolutionContext resolutionContext, bool solveConstraints = false);
+  MethodCallInformation ResolveApplySuffix(ApplySuffix applySuffix, ResolutionContext resolutionContext, bool allowMethodCall);
+  void ResolveExpression(Expression expression, ResolutionContext resolutionContext);
+  void CheckIsLvalue(Expression expression, ResolutionContext resolutionContext);
+  void ConstrainTypeExprBool(Expression expression, string message);
+  void ResolveStatement(Statement statement, ResolutionContext resolutionContext);
+  void ResolveTypeRhs(TypeRhs typeRhs, Statement statement, ResolutionContext resolutionContext);
+  void ResolveBlockStatement(BlockStmt blockS, ResolutionContext resolutionContext);
+
+  Scope<Thing>.PushResult ScopePushAndReport<Thing>(Scope<Thing> scope, string name, Thing thing, IOrigin tok,
+    string kind) where Thing : class;
+
+  public void ScopePushAndReport(Scope<IVariable> scope, IVariable v, string kind) {
+    ScopePushAndReport(scope, v.Name, v, v.Origin, kind);
+  }
+
+  void ResolveStatementWithLabels(Statement statement, ResolutionContext resolutionContext);
+  void ResolveFrameExpression(
+    FrameExpression frameExpression,
+    FrameExpressionUse frameExpressionUse,
+    ResolutionContext context);
+
+  public Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<ActualBinding> args,
+    ResolutionContext resolutionContext, bool allowMethodCall, bool complain = true);
+
+  public Expression ResolveDotSuffix(ExprDotName expr, bool allowStaticReferenceToInstance, bool isLastNameSegment, List<ActualBinding> args,
+    ResolutionContext resolutionContext, bool allowMethodCall);
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/PreType/PreType.cs b/Source/DafnyCore/Resolver/PreType/PreType.cs
index dfab44ce876..2bea60dc923 100644
--- a/Source/DafnyCore/Resolver/PreType/PreType.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreType.cs
@@ -26,18 +26,49 @@ namespace Microsoft.Dafny {
   /// See also the description of https://github.com/dafny-lang/dafny/pull/3795.
   /// </summary>
   public abstract class PreType {
+    public const string TypeNameBool = "bool";
+    public const string TypeNameChar = "char";
+    public const string TypeNameInt = "int";
+    public const string TypeNameReal = "real";
+    public const string TypeNameORDINAL = "ORDINAL";
+    public const string TypeNameBvPrefix = "bv";
+    public const string TypeNameSet = "set";
+    public const string TypeNameIset = "iset";
+    public const string TypeNameSeq = "seq";
+    public const string TypeNameMultiset = "multiset";
+    public const string TypeNameMap = "map";
+    public const string TypeNameImap = "imap";
+    public const string TypeNameObjectQ = "object?";
+    public const string TypeNameArray = "array";
+
+    public static string SetTypeName(bool finite) => finite ? TypeNameSet : TypeNameIset;
+    public static string MapTypeName(bool finite) => finite ? TypeNameMap : TypeNameImap;
 
     /// <summary>
     /// Normalize() follows the pre-type to which a pre-type proxy has been resolved, if any.
-    ///
-    /// This method is analogous to Type.Normalize(). Since pre-types don't keep track of
-    /// type synonyms or subset types, there is no need for PreType methods that are analogous
-    /// to Type.NormalizeExpandKeepConstraints() and Type.NormalizeExpand().
     /// </summary>
     public PreType Normalize() {
       var t = this;
-      while (t is PreTypeProxy proxy && proxy.PT != null) {
-        t = proxy.PT;
+      while (t is PreTypeProxy { PT: { } proxyFor }) {
+        t = proxyFor;
+      }
+      return t;
+    }
+
+    /// <summary>
+    /// NormalizeWrtScope() does a little more than Normalize(). Namely, if the normalized
+    /// pre-type refers to a declaration that is not in scope, then what is returned is a
+    /// pre-type around the InternalSynonymDecl that stands for the out-of-scope type.
+    /// </summary>
+    public PreType NormalizeWrtScope() {
+      var t = Normalize();
+      if (t is DPreType dPreType) {
+        if (dPreType.PrintablePreType != null) {
+          dPreType = dPreType.PrintablePreType;
+        }
+        if (dPreType.Decl is RevealableTypeDecl rtd && !rtd.IsRevealedInScope(Type.GetScope())) {
+          return new DPreType(rtd.SynonymInfo.SelfSynonymDecl, dPreType.Arguments, dPreType.PrintablePreType);
+        }
       }
       return t;
     }
@@ -67,7 +98,7 @@ public PreType UrAncestor(PreTypeResolver ptResolver) {
       var pt = this;
       while (true) {
         pt = pt.Normalize();
-        if (pt is DPreType preType && preType.Decl is NewtypeDecl newtypeDecl) {
+        if (pt is DPreType { Decl: NewtypeDecl newtypeDecl } preType) {
           // expand the newtype into its base type
           var subst = PreTypeSubstMap(newtypeDecl.TypeArgs, preType.Arguments);
           var basePreType = ptResolver.Type2PreType(newtypeDecl.BaseType);
@@ -82,12 +113,12 @@ public PreType UrAncestor(PreTypeResolver ptResolver) {
     public DPreType AsCollectionPreType() {
       if (Normalize() is DPreType dp) {
         switch (dp.Decl.Name) {
-          case "set":
-          case "iset":
-          case "seq":
-          case "multiset":
-          case "map":
-          case "imap":
+          case TypeNameSet:
+          case TypeNameIset:
+          case TypeNameSeq:
+          case TypeNameMultiset:
+          case TypeNameMap:
+          case TypeNameImap:
             return dp;
           default:
             break;
@@ -96,6 +127,8 @@ public DPreType AsCollectionPreType() {
       return null;
     }
 
+    public bool IsRefType => Normalize() is DPreType { Decl: ClassLikeDecl { IsReferenceTypeDecl: true } };
+
     /// <summary>
     /// Returns "true" if "proxy" is among the free variables of "this".
     /// "proxy" is expected to be normalized.
@@ -121,7 +154,7 @@ public static Dictionary<TypeParameter, PreType> PreTypeSubstMap(List<TypeParame
 
     public bool IsLeafType() {
       var t = Normalize();
-      if (!(t is DPreType pt)) {
+      if (t is not DPreType pt) {
         return false;
       } else if (pt.Decl is TraitDecl) {
         return false;
@@ -150,7 +183,7 @@ public bool IsLeafType() {
 
     public bool IsRootType() {
       var t = Normalize();
-      if (!(t is DPreType pt)) {
+      if (t is not DPreType pt) {
         return false;
       } else if (PreTypeResolver.HasTraitSupertypes(pt)) {
         return false;
@@ -180,7 +213,8 @@ public bool IsRootType() {
 
   public class PreTypeProxy : PreType {
     public readonly int UniqueId;
-    public PreType PT; // filled in by resolution
+
+    [FilledInDuringResolution] public PreType PT { get; private set; }
 
     /// <summary>
     /// There should be just one call to this constructor, namely from PreTypeResolver.CreatePreTypeProxy.
@@ -233,12 +267,21 @@ public class DPreType : PreType {
     public readonly DPreType PrintablePreType;
 
     public DPreType(TopLevelDecl decl, List<PreType> arguments, DPreType printablePreType = null) {
+      Contract.Requires(decl.TypeArgs.Count == arguments.Count);
       Contract.Assume(decl != null);
       Decl = decl;
       Arguments = arguments;
       PrintablePreType = printablePreType;
     }
 
+    public DPreType SansPrintablePreType() {
+      if (PrintablePreType == null) {
+        return this;
+      } else {
+        return new DPreType(Decl, Arguments);
+      }
+    }
+
     public override string ToString() {
       if (PrintablePreType != null) {
         return PrintablePreType.ToString();
@@ -247,16 +290,18 @@ public override string ToString() {
       var name = Decl.Name;
       string s;
       if (IsArrowType(Decl)) {
-        var a0 = Arguments[0].Normalize() as DPreType;
-        if (Arguments.Count == 2 && (a0 == null || (!IsTupleType(a0.Decl) && !IsArrowType(a0.Decl)))) {
-          s = Arguments[0].ToString();
-        } else {
-          s = $"({Util.Comma(Arguments.GetRange(0, Arguments.Count - 1), arg => arg.ToString())})";
-        }
-        s += $" ~> {Arguments.Last()}";
+        s = AnyArrowTypeToString("~>");
+      } else if (ArrowType.IsPartialArrowTypeName(Decl.Name)) {
+        s = AnyArrowTypeToString("-->");
+      } else if (ArrowType.IsTotalArrowTypeName(Decl.Name)) {
+        s = AnyArrowTypeToString("->");
       } else if (IsTupleType(Decl)) {
-        // TODO: for tuple types, sometimes use prefix "ghost"
-        s = $"({Util.Comma(Arguments, arg => arg.ToString())})";
+        var tupleTypeDecl = (TupleTypeDecl)Decl;
+        Contract.Assert(Arguments.Count == tupleTypeDecl.ArgumentGhostness.Count);
+        s = Arguments.Zip(tupleTypeDecl.ArgumentGhostness).Comma(argAndGhost =>
+          (argAndGhost.Second ? "ghost " : "") + argAndGhost.First.ToString()
+        );
+        s = "(" + s + ")";
       } else {
         if (IsReferenceTypeDecl(Decl)) {
           name = name + "?";
@@ -271,6 +316,18 @@ public override string ToString() {
       return s;
     }
 
+    private string AnyArrowTypeToString(string arrow) {
+      string s;
+      var a0 = Arguments[0].Normalize() as DPreType;
+      if (Arguments.Count == 2 && (a0 == null || (!IsTupleType(a0.Decl) && !IsArrowType(a0.Decl)))) {
+        s = Arguments[0].ToString();
+      } else {
+        s = $"({Util.Comma(Arguments.GetRange(0, Arguments.Count - 1), arg => arg.ToString())})";
+      }
+      s += $" {arrow} {Arguments.Last()}";
+      return s;
+    }
+
     public static bool IsReferenceTypeDecl(TopLevelDecl decl) {
       Contract.Requires(decl != null);
       return decl is ClassLikeDecl { IsReferenceTypeDecl: true };
@@ -304,9 +361,21 @@ public override bool Contains(PreTypeProxy proxy, int direction, HashSet<PreType
     }
 
     public override PreType Substitute(Dictionary<TypeParameter, PreType> subst) {
+      DPreType printablePreType = (DPreType)PrintablePreType?.Substitute(subst);
+
       if (Decl is TypeParameter typeParameter) {
         Contract.Assert(Arguments.Count == 0);
-        return subst.GetValueOrDefault(typeParameter, this);
+        var afterSubstitution = subst.GetValueOrDefault(typeParameter, this);
+        if (printablePreType == null) {
+          return afterSubstitution;
+        } else if (printablePreType == PrintablePreType && afterSubstitution == this) {
+          return this;
+        } else if (afterSubstitution is DPreType dPreType) {
+          return new DPreType(dPreType.Decl, dPreType.Arguments, printablePreType);
+        } else {
+          // TODO: it would be nice to have a place to include "printablePreType" as part of what's returned, but currently only DPreType allows that
+          return afterSubstitution;
+        }
       }
 
       // apply substitutions to arguments
@@ -327,7 +396,10 @@ public override PreType Substitute(Dictionary<TypeParameter, PreType> subst) {
         }
       }
 
-      return newArguments == null ? this : new DPreType(Decl, newArguments);
+      if (newArguments == null && printablePreType == PrintablePreType) {
+        return this;
+      }
+      return new DPreType(Decl, newArguments ?? Arguments, printablePreType);
     }
 
     /// <summary>
@@ -344,13 +416,20 @@ public DPreType AsParentType(TopLevelDecl parent, PreTypeResolver preTypeResolve
         // we expect the .RHS of an InternalTypeSynonymDecl to be a UserDefinedType whose type arguments
         // are exactly the type parameters
         Contract.Assert(rhsType != null);
-        var cl = rhsType.ResolvedClass;
+        TopLevelDeclWithMembers cl;
+        if (rhsType.ResolvedClass is NonNullTypeDecl nntd) {
+          cl = (TopLevelDeclWithMembers)nntd.ViewAsClass;
+        } else {
+          cl = (TopLevelDeclWithMembers)rhsType.ResolvedClass;
+        }
+
         Contract.Assert(isyn.TypeArgs.Count == cl.TypeArgs.Count);
         for (var i = 0; i < isyn.TypeArgs.Count; i++) {
           var typeParameter = isyn.TypeArgs[i];
           Contract.Assert(typeParameter == cl.TypeArgs[i]);
           Contract.Assert(rhsType.TypeArgs[i] is UserDefinedType { ResolvedClass: var tpDecl } && tpDecl == typeParameter);
         }
+
         decl = cl;
       }
       if (decl == parent) {
@@ -384,10 +463,13 @@ public class PreTypePlaceholderModule : PreTypePlaceholder {
   public class PreTypePlaceholderType : PreTypePlaceholder {
   }
 
-  public class UnusedPreType : PreTypePlaceholder {
+  /// Used for assigning a pre-type to MemberSelect expressions, such as "obj.method",
+  /// which is not considered an expression. This indicates that resolution has occurred,
+  /// even though the pre-type itself is not useful.
+  public class MethodPreType : PreTypePlaceholder {
     public readonly string Why;
 
-    public UnusedPreType(string why) {
+    public MethodPreType(string why) {
       Why = why;
     }
 
diff --git a/Source/DafnyCore/Resolver/PreType/PreType2TypeUtil.cs b/Source/DafnyCore/Resolver/PreType/PreType2TypeUtil.cs
new file mode 100644
index 00000000000..a18ebf80951
--- /dev/null
+++ b/Source/DafnyCore/Resolver/PreType/PreType2TypeUtil.cs
@@ -0,0 +1,152 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Diagnostics.Contracts;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Microsoft.Dafny;
+
+public static class PreType2TypeUtil {
+  public static Type PreType2Type(PreType preType, bool allowFutureRefinements, TypeParameter.TPVariance futureRefinements) {
+    if (allowFutureRefinements) {
+      return PreType2RefinableType(preType, futureRefinements);
+    } else {
+      return PreType2FixedType(preType);
+    }
+  }
+
+  public static Type PreType2FixedType(PreType preType) {
+    return PreType2TypeCore(preType, false, TypeParameter.TPVariance.Co);
+  }
+
+  public static Type PreType2RefinableType(PreType preType, TypeParameter.TPVariance futureRefinements) {
+    var ty = PreType2TypeCore(preType, true, futureRefinements);
+    switch (futureRefinements) {
+      case TypeParameter.TPVariance.Co:
+        ty = new BottomTypePlaceholder(ty);
+        break;
+      default:
+        break;
+    }
+
+    return new TypeRefinementWrapper(ty);
+  }
+
+  /// <summary>
+  /// The "futureRefinements" parameter is relevant only if "allowFutureRefinements" is "true".
+  /// </summary>
+  private static Type PreType2TypeCore(PreType preType, bool allowFutureRefinements, TypeParameter.TPVariance futureRefinements) {
+    var pt = (DPreType)preType.Normalize(); // all pre-types should have been filled in and resolved to a non-proxy
+    if (pt.PrintablePreType != null) {
+      pt = pt.PrintablePreType;
+    }
+
+    Type ArgumentAsCo(int i) {
+      return PreType2Type(pt.Arguments[i], true, futureRefinements);
+    }
+
+    switch (pt.Decl.Name) {
+      case PreType.TypeNameBool:
+        return Type.Bool;
+      case PreType.TypeNameChar:
+        return Type.Char;
+      case PreType.TypeNameInt:
+        return Type.Int;
+      case PreType.TypeNameReal:
+        return Type.Real;
+      case PreType.TypeNameORDINAL:
+        return Type.BigOrdinal;
+      case PreType.TypeNameSet:
+        return new SetType(true, ArgumentAsCo(0));
+      case PreType.TypeNameIset:
+        return new SetType(false, ArgumentAsCo(0));
+      case PreType.TypeNameMultiset:
+        return new MultiSetType(ArgumentAsCo(0));
+      case PreType.TypeNameSeq:
+        return new SeqType(ArgumentAsCo(0));
+      case PreType.TypeNameMap:
+        return new MapType(true, ArgumentAsCo(0), ArgumentAsCo(1));
+      case PreType.TypeNameImap:
+        return new MapType(false, ArgumentAsCo(0), ArgumentAsCo(1));
+      default:
+        break;
+    }
+
+    var arguments = pt.Arguments.ConvertAll(preType => PreType2RefinableType(preType, futureRefinements));
+    if (pt.Decl is ArrowTypeDecl arrowTypeDecl) {
+      return new ArrowType(pt.Decl.Origin, arrowTypeDecl, arguments);
+    } else if (pt.Decl is ValuetypeDecl valuetypeDecl) {
+      return valuetypeDecl.CreateType(arguments);
+    } else if (pt.Decl is ClassLikeDecl { IsReferenceTypeDecl: true }) {
+      return new UserDefinedType(pt.Decl.Origin, pt.Decl.Name + "?", pt.Decl, arguments);
+    } else {
+      return new UserDefinedType(pt.Decl.Origin, pt.Decl.Name, pt.Decl, arguments);
+    }
+  }
+
+  public static void Combine(Type userSuppliedType, PreType preType, bool allowFutureRefinements) {
+    var preTypeConverted = PreType2Type(preType, allowFutureRefinements, TypeParameter.TPVariance.Co);
+    Combine(userSuppliedType, preTypeConverted);
+  }
+
+  /// <summary>
+  /// This method combines the respective user-supplied types with the inferred pre-types. It expects that either
+  ///     - "types" is null, which represents the case where the types are inferred. In this case, the method returns a new
+  ///       list that contains the converted pre-types.
+  ///     - "types" is non-null, which represents the case where the user supplied types. In this case, "types" and
+  ///       "preTypes" are expected to have the same length. The respective types and pre-types are combined in "types",
+  ///       and then "types" is returned.
+  /// </summary>
+  public static List<Type> Combine([CanBeNull] List<Type> types, List<PreType> preTypes, bool allowFutureRefinements) {
+    Contract.Requires(types == null || types.Count == preTypes.Count);
+    if (types == null) {
+      if (allowFutureRefinements) {
+        return preTypes.ConvertAll(preType => PreType2RefinableType(preType, TypeParameter.TPVariance.Co));
+      } else {
+        return preTypes.ConvertAll(PreType2FixedType);
+      }
+    }
+
+    Contract.Assert(types.Count == preTypes.Count);
+    for (var i = 0; i < types.Count; i++) {
+      Combine(types[i], preTypes[i], allowFutureRefinements);
+    }
+    return types;
+  }
+
+  private static void Combine(Type type, Type preTypeConverted) {
+    Contract.Requires(type != null);
+    Contract.Requires(preTypeConverted != null);
+
+    type = type.NormalizeAndAdjustForScope();
+    if (type is TypeProxy { T: null } typeProxy) {
+      typeProxy.T = preTypeConverted;
+    } else {
+      // Even if the head type of preTypeConverted is a refinement wrapper, we're going to stick with the user-defined type, so we Normalize() here.
+      preTypeConverted = preTypeConverted.Normalize();
+
+      if ((type as UserDefinedType)?.ResolvedClass == (preTypeConverted as UserDefinedType)?.ResolvedClass) {
+        Contract.Assert(type.TypeArgs.Count == preTypeConverted.TypeArgs.Count);
+        for (var i = 0; i < type.TypeArgs.Count; i++) {
+          Combine(type.TypeArgs[i], preTypeConverted.TypeArgs[i]);
+        }
+      } else {
+        // The only way this can happen is if the user-supplied "type" is a type synonym, subset type, or newtype that expands to one of its
+        // type parameters. If so, expand "type" and recurse.
+        var udt = (UserDefinedType)type;
+        if (udt.ResolvedClass is TypeSynonymDecl typeSynonymDecl) {
+          type = typeSynonymDecl.RhsWithArgumentIgnoringScope(udt.TypeArgs);
+        } else {
+          type = ((NewtypeDecl)udt.ResolvedClass).RhsWithArgument(udt.TypeArgs);
+        }
+        Combine(type, preTypeConverted);
+      }
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeAdvice.cs b/Source/DafnyCore/Resolver/PreType/PreTypeAdvice.cs
index e08506d20ba..71bea6d1de7 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeAdvice.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeAdvice.cs
@@ -5,14 +5,87 @@
 //
 //-----------------------------------------------------------------------------
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Diagnostics.Contracts;
-using Microsoft.Boogie;
 
 namespace Microsoft.Dafny {
-  public class Advice {
+  /// <summary>
+  /// A piece of "Advice" is information about a default type.
+  ///
+  /// A "newtype" of a base type "B" defines a new type that is distinct from "B", with the constructors, operators, and members of "B"
+  /// cloned for the new type. For example,
+  ///     newtype MyInt = int
+  /// defines the type "MyInt". It has the same constructors of "int" (for example, the constructors "7" and "19") and the same operators
+  /// as "int" (for example, "+"). As another example,
+  ///     newtype MyIntSet = set<int>
+  /// defines the type "MyIntSet", and thus set displays (like "{2, 3}"), set comprehensions (like "set x | 0 <= x < 10 :: 2 * x"),
+  /// and set operators (like "+") are cloned for the new type.
+  ///
+  /// Consequently, built-in constructors (like "7" and "{2, 3}") are overloaded. Type inference can therefore not immediately
+  /// the type of these constructors. Using the examples above, the type of "7" could be either "int" or "MyInt". (For numeric constructors
+  /// like "7", the type could also be the bitvector type of any width as well as the type "ORDINAL".) During type inference,
+  /// if any of these constructors is used with specific types, then the overloading can be resolved. But if there are other such types,
+  /// as for example in this program:
+  ///     method Main() {
+  ///       var x := 7 + 19;
+  ///       print x, "\n";
+  ///     }
+  /// then the "Advice" kicks in.
+  ///
+  /// So, a piece of "Advice" is saying that a given "PreType" should have a specific type *if* the program does not have any other
+  /// specific type for it.
+  /// </summary>
+  public abstract class Advice {
+    public readonly PreType PreType;
+
+    public Advice(PreType pretype) {
+      PreType = pretype;
+    }
+
+    public abstract string WhatString { get; }
+
+    public bool Apply(PreTypeResolver preTypeResolver) {
+      if (PreType.Normalize() is PreTypeProxy proxy) {
+        ActOnAdvice(proxy, preTypeResolver);
+        return true;
+      }
+      return false;
+    }
+
+    public bool ApplyFor(PreTypeProxy proxy, PreTypeResolver preTypeResolver) {
+      if (PreType.Normalize() == proxy) {
+        ActOnAdvice(proxy, preTypeResolver);
+        return true;
+      }
+      return false;
+    }
+
+    private void ActOnAdvice(PreTypeProxy proxy, PreTypeResolver preTypeResolver) {
+      // Note, the following debug print may come out _before_ the "Type inference state ..." header, if ActOnAdvice is called
+      // during what is only a partial constraint solving round.
+      preTypeResolver.Constraints.DebugPrint($"    DEBUG: acting on advice, setting {proxy} := {WhatString}");
+
+      var adviceType = GetAdviceType(preTypeResolver);
+      proxy.Set(adviceType);
+    }
+
+    protected abstract PreType GetAdviceType(PreTypeResolver preTypeResolver);
+  }
+
+  public class TypeAdvice : Advice {
+    private readonly PreType adviceType;
+    public TypeAdvice(PreType preType, PreType adviceType)
+      : base(preType) {
+      this.adviceType = adviceType;
+    }
+
+    public override string WhatString => adviceType.ToString();
+
+    protected override PreType GetAdviceType(PreTypeResolver preTypeResolver) {
+      return adviceType;
+    }
+  }
+
+  public class CommonAdvice : Advice {
     public enum Target {
       Bool,
       Char,
@@ -22,38 +95,31 @@ public enum Target {
       Object
     }
 
-    public readonly PreType PreType;
-    public readonly Target What;
+    private readonly Target what;
 
-    public string WhatString => What == Target.Object ? "object?" : What.ToString().ToLower();
+    public override string WhatString => what == Target.Object ? PreType.TypeNameObjectQ : what.ToString().ToLower();
 
-    public Advice(PreType preType, Target advice) {
-      PreType = preType;
-      What = advice;
+    public CommonAdvice(PreType preType, Target advice)
+      : base(preType) {
+      what = advice;
     }
 
-    public bool Apply(PreTypeResolver preTypeResolver) {
-      if (PreType.Normalize() is PreTypeProxy proxy) {
-        preTypeResolver.Constraints.DebugPrint($"    DEBUG: acting on advice, setting {proxy} := {WhatString}");
-
-        Type StringDecl() {
-          var s = preTypeResolver.resolver.moduleInfo.TopLevels["string"];
-          return new UserDefinedType(s.tok, s.Name, s, new List<Type>());
-        }
-
-        var target = What switch {
-          Target.Bool => preTypeResolver.Type2PreType(Type.Bool),
-          Target.Char => preTypeResolver.Type2PreType(Type.Char),
-          Target.Int => preTypeResolver.Type2PreType(Type.Int),
-          Target.Real => preTypeResolver.Type2PreType(Type.Real),
-          Target.String => preTypeResolver.Type2PreType(StringDecl()),
-          Target.Object => preTypeResolver.Type2PreType(preTypeResolver.resolver.SystemModuleManager.ObjectQ()),
-          _ => throw new cce.UnreachableException() // unexpected case
-        };
-        proxy.Set(target);
-        return true;
+    protected override PreType GetAdviceType(PreTypeResolver preTypeResolver) {
+      Type StringDecl() {
+        var s = preTypeResolver.resolver.moduleInfo.TopLevels["string"];
+        return new UserDefinedType(s.Origin, s.Name, s, new List<Type>());
       }
-      return false;
+
+      var target = what switch {
+        Target.Bool => preTypeResolver.Type2PreType(Type.Bool),
+        Target.Char => preTypeResolver.Type2PreType(Type.Char),
+        Target.Int => preTypeResolver.Type2PreType(Type.Int),
+        Target.Real => preTypeResolver.Type2PreType(Type.Real),
+        Target.String => preTypeResolver.Type2PreType(StringDecl()),
+        Target.Object => preTypeResolver.Type2PreType(preTypeResolver.resolver.SystemModuleManager.ObjectQ()),
+        _ => throw new cce.UnreachableException() // unexpected case
+      };
+      return target;
     }
   }
 }
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeConstraint.cs b/Source/DafnyCore/Resolver/PreType/PreTypeConstraint.cs
index d9ed09729bf..b6f75485327 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeConstraint.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeConstraint.cs
@@ -9,8 +9,8 @@
 using System.Diagnostics.Contracts;
 
 namespace Microsoft.Dafny {
-  abstract class PreTypeConstraint {
-    public readonly IToken tok;
+  public abstract class PreTypeConstraint {
+    public readonly IOrigin tok;
 
     // exactly one of "errorFormatString" and "errorFormatStringProducer" is non-null
     private readonly string errorFormatString;
@@ -20,18 +20,35 @@ abstract class PreTypeConstraint {
 
     public abstract string ErrorMessage();
 
-    public PreTypeConstraint(IToken tok, string errorFormatString) {
+    public PreTypeConstraint(IOrigin tok, string errorFormatString, PreTypeConstraint baseError = null) {
       Contract.Requires(tok != null);
       Contract.Requires(errorFormatString != null);
       this.tok = tok;
-      this.errorFormatString = errorFormatString;
+      if (baseError == null) {
+        this.errorFormatString = errorFormatString;
+      } else {
+        this.errorFormatStringProducer = () => baseError.ErrorMessage() + " (" + errorFormatString + ")";
+      }
     }
 
-    public PreTypeConstraint(IToken tok, Func<string> errorFormatStringProducer) {
+    public PreTypeConstraint(IOrigin tok, Func<string> errorFormatStringProducer) {
       Contract.Requires(tok != null);
       Contract.Requires(errorFormatStringProducer != null);
       this.tok = tok;
       this.errorFormatStringProducer = errorFormatStringProducer;
     }
   }
+
+  public abstract class OptionalErrorPreTypeConstraint : PreTypeConstraint {
+    public readonly bool ReportErrors;
+    public OptionalErrorPreTypeConstraint(IOrigin tok, string errorFormatString, PreTypeConstraint baseError, bool reportErrors)
+      : base(tok, errorFormatString, baseError) {
+      ReportErrors = reportErrors;
+    }
+
+    public OptionalErrorPreTypeConstraint(IOrigin tok, Func<string> errorFormatStringProducer, bool reportErrors)
+      : base(tok, errorFormatStringProducer) {
+      ReportErrors = reportErrors;
+    }
+  }
 }
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeConstraints.cs b/Source/DafnyCore/Resolver/PreType/PreTypeConstraints.cs
index 1cba12556c5..f0e718d3ce1 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeConstraints.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeConstraints.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Diagnostics.Contracts;
+using JetBrains.Annotations;
 
 namespace Microsoft.Dafny {
   /// <summary>
@@ -21,16 +22,116 @@ public class PreTypeConstraints {
     private readonly DafnyOptions options;
 
     private List<SubtypeConstraint> unnormalizedSubtypeConstraints = new();
-    private List<EqualityConstraint> equalityConstraints = new();
+    private Queue<EqualityConstraint> equalityConstraints = new();
     private List<Func<bool>> guardedConstraints = new();
     private readonly List<Advice> defaultAdvice = new();
-    private List<System.Action> confirmations = new();
+    private readonly List<(PreTypeProxy, PreType)> compatibleBounds = new();
+    private List<Confirmation> confirmations = new();
 
     public PreTypeConstraints(PreTypeResolver preTypeResolver) {
       this.PreTypeResolver = preTypeResolver;
       this.options = preTypeResolver.resolver.Options;
     }
 
+    /// <summary>
+    /// Try to find the receiver pre-type that corresponds to "preType".
+    /// If there are subtype constraints of "preType" that point out a non-proxy subtype of "preType", then one such is returned.
+    /// Otherwise, if there are supertype constraints of "preType" that point out a non-proxy supertype of "preType" AND that supertype
+    /// has a member named "memberName", then such a supertype is returned.
+    /// Otherwise, null is returned.
+    ///
+    /// The "memberName" is allowed to be passed in as "null", in which case the supertype search does not consider any trait.
+    /// </summary>
+    [CanBeNull]
+    public DPreType ApproximateReceiverType(PreType preType, [CanBeNull] string memberName) {
+      PartiallySolveTypeConstraints();
+
+      preType = preType.Normalize();
+      if (preType is DPreType dPreType) {
+        return dPreType;
+      }
+      if (preType is not PreTypeProxy proxy) {
+        // preType could be a PreTypePlaceholder, resulting from an error somewhere
+        return null;
+      }
+
+      var approximateReceiverType = ApproximateReceiverTypeViaBounds(proxy, memberName, out var subProxies);
+      if (approximateReceiverType != null) {
+        return approximateReceiverType;
+      }
+
+      // The bounds didn't give any results, but perhaps one of the proxies visited (in the sub direction) has
+      // associated default advice.
+      foreach (var subProxy in subProxies) {
+        TryApplyDefaultAdviceFor(subProxy);
+        if (proxy.Normalize() is DPreType defaultType) {
+          return defaultType;
+        }
+      }
+
+      // Try once more, in case the application of default advice changed the situation
+      return ApproximateReceiverTypeViaBounds(proxy, memberName, out _);
+    }
+
+    [CanBeNull]
+    private DPreType ApproximateReceiverTypeViaBounds(PreTypeProxy proxy, [CanBeNull] string memberName, out HashSet<PreTypeProxy> subProxies) {
+      // If there is a subtype constraint "proxy :> sub<X>", then (if the program is legal at all, then) "sub" must have the member "memberName".
+      subProxies = new HashSet<PreTypeProxy>();
+      foreach (var sub in AllSubBounds(proxy, subProxies)) {
+        return sub;
+      }
+
+      // If there is a subtype constraint "super<X> :> proxy" where "super" has a member "memberName", then that is the correct member.
+      foreach (var super in AllSuperBounds(proxy, new HashSet<PreTypeProxy>())) {
+        if (super.Decl is TopLevelDeclWithMembers md) {
+          if (memberName != null && PreTypeResolver.resolver.GetClassMembers(md).ContainsKey(memberName)) {
+            return super;
+          } else if (memberName == null && md is not TraitDecl) {
+            return super;
+          }
+        }
+      }
+
+      // As a final possibility, if there is a compatible-types constraint "ty ~~ proxy", then pick "ty" as the bound
+      foreach (var (compatibleBoundsProxy, compatibleBoundsType) in compatibleBounds) {
+        if (compatibleBoundsProxy.Normalize() == proxy && compatibleBoundsType.Normalize() is DPreType { Decl: TopLevelDeclWithMembers md } dPreType) {
+          if (memberName == null || PreTypeResolver.resolver.GetClassMembers(md).ContainsKey(memberName)) {
+            return dPreType;
+          }
+        }
+      }
+
+      return null;
+    }
+
+    /// <summary>
+    /// Expecting that "preType" is a type that does not involve traits, return that type, if possible.
+    /// </summary>
+    [CanBeNull]
+    public DPreType FindDefinedPreType(PreType preType, bool applyAdvice) {
+      Contract.Requires(preType != null);
+
+      PartiallySolveTypeConstraints();
+
+      preType = preType.Normalize();
+      if (preType is PreTypeProxy proxy) {
+        // We're looking up a type with concerns for traits, so if the proxy has any sub- or super-type, then (if the
+        // program is legal at all, then) that sub- or super-type must be the type we're looking for.
+        foreach (var sub in AllSubBounds(proxy, new HashSet<PreTypeProxy>())) {
+          return sub;
+        }
+        foreach (var super in AllSuperBounds(proxy, new HashSet<PreTypeProxy>())) {
+          return super;
+        }
+
+        if (applyAdvice) {
+          TryApplyDefaultAdviceFor(proxy);
+        }
+      }
+
+      return preType.Normalize() as DPreType;
+    }
+
     /// <summary>
     /// Solves or simplifies as many type constraints as possible.
     /// If "allowDecisions" is "false", then no decisions, only determined inferences, are made; this mode is
@@ -42,6 +143,10 @@ public void PartiallySolveTypeConstraints(string printableContext = null, bool m
       if (printableContext != null) {
         PrintTypeInferenceState("(partial) " + printableContext);
       }
+
+      // Note, the various constraints that have been recorded may contain pre-types that refer to symbols that
+      // are not in scope. Therefore, it is important that, at the onset processing any of these constraints,
+      // each pre-type is normalized with respect to scope.
       bool anythingChanged;
       do {
         anythingChanged = makeDecisions && TryMakeDecisions();
@@ -52,12 +157,18 @@ public void PartiallySolveTypeConstraints(string printableContext = null, bool m
     }
 
     private bool TryMakeDecisions() {
-      if (TryResolveTypeProxiesUsingKnownBounds(true)) {
+      if (TryResolveTypeProxiesUsingKnownBounds(true, false)) {
+        return true;
+      } else if (TryResolveTypeProxiesUsingKnownBounds(false, false)) {
         return true;
-      } else if (TryResolveTypeProxiesUsingKnownBounds(false)) {
+      } else if (TryResolveTypeProxiesUsingKnownBounds(true, true)) {
+        return true;
+      } else if (TryResolveTypeProxiesUsingKnownBounds(false, true)) {
         return true;
       } else if (TryApplyDefaultAdvice()) {
         return true;
+      } else if (TryUseCompatibleTypesAsBounds()) {
+        return true;
       }
       return false;
     }
@@ -78,10 +189,20 @@ void ClearState() {
       equalityConstraints.Clear();
       guardedConstraints.Clear();
       defaultAdvice.Clear();
+      compatibleBounds.Clear();
       confirmations.Clear();
       PreTypeResolver.allPreTypeProxies.Clear();
     }
 
+    public void AssertThatStateIsClear() {
+      Contract.Assert(unnormalizedSubtypeConstraints.Count == 0);
+      Contract.Assert(equalityConstraints.Count == 0);
+      Contract.Assert(guardedConstraints.Count == 0);
+      Contract.Assert(defaultAdvice.Count == 0);
+      Contract.Assert(confirmations.Count == 0);
+      // Note, PreTypeResolver.allPreTypeProxies may still be nonempty, since it's not part of the PreTypeConstraint state proper
+    }
+
     public void PrintTypeInferenceState(string/*?*/ header = null) {
       if (!options.Get(CommonOptionBag.NewTypeInferenceDebug)) {
         return;
@@ -93,19 +214,13 @@ public void PrintTypeInferenceState(string/*?*/ header = null) {
       PrintList("Equality constraints", equalityConstraints, eqc => {
         return $"{eqc.A} == {eqc.B}";
       });
-#if IS_THERE_A_GOOD_WAY_TO_PRINT_GUARDED_CONSTRAINTS
-      PrintList("Guarded constraints", guardedConstraints, gc => {
-        return gc.Kind + Util.Comma("", gc.Arguments, arg => $" {arg}");
-      });
-#endif
+      options.OutputWriter.WriteLine($"    Guarded constraints: {guardedConstraints.Count}");
       PrintList("Default-type advice", defaultAdvice, advice => {
         return $"{advice.PreType} ~-~-> {advice.WhatString}";
       });
-#if IS_THERE_A_GOOD_WAY_TO_PRINT_CONFIRMATIONS
-      PrintList("Post-inference confirmations", confirmations, c => {
-        return $"{TokToShortLocation(c.tok)}: {c.Check} {c.PreType}: {c.ErrorMessage()}";
+      PrintList("Post-inference confirmations", confirmations, confirmationInfo => {
+        return confirmationInfo.DebugInformation();
       });
-#endif
     }
 
     void PrintLegend() {
@@ -115,7 +230,7 @@ void PrintLegend() {
       });
     }
 
-    void PrintList<T>(string rubric, List<T> list, Func<T, string> formatter) {
+    void PrintList<T>(string rubric, IEnumerable<T> list, Func<T, string> formatter) {
       if (!options.Get(CommonOptionBag.NewTypeInferenceDebug)) {
         return;
       }
@@ -129,27 +244,29 @@ void PrintList<T>(string rubric, List<T> list, Func<T, string> formatter) {
       }
     }
 
-    public void AddEqualityConstraint(PreType a, PreType b, IToken tok, string msgFormat) {
-      equalityConstraints.Add(new EqualityConstraint(a, b, tok, msgFormat));
+    public void AddEqualityConstraint(PreType a, PreType b, IOrigin tok, string msgFormat, PreTypeConstraint baseError = null, bool reportErrors = true) {
+      equalityConstraints.Enqueue(new EqualityConstraint(a, b, tok, msgFormat, baseError, reportErrors));
     }
 
     private bool ApplyEqualityConstraints() {
       if (equalityConstraints.Count == 0) {
         return false;
       }
-      var constraints = equalityConstraints;
-      equalityConstraints = new();
-      foreach (var constraint in constraints) {
-        equalityConstraints.AddRange(constraint.Apply(this));
+      // process equality constraints until there are no more
+      while (equalityConstraints.Count != 0) {
+        var constraint = equalityConstraints.Dequeue();
+        foreach (var newConstraint in constraint.Apply(this)) {
+          equalityConstraints.Enqueue(newConstraint);
+        }
       }
       return true;
     }
 
-    public void AddSubtypeConstraint(PreType super, PreType sub, IToken tok, string errorFormatString) {
-      unnormalizedSubtypeConstraints.Add(new SubtypeConstraint(super, sub, tok, errorFormatString));
+    public void AddSubtypeConstraint(PreType super, PreType sub, IOrigin tok, string errorFormatString, PreTypeConstraint baseError = null, bool reportErrors = true) {
+      unnormalizedSubtypeConstraints.Add(new SubtypeConstraint(super, sub, tok, errorFormatString, baseError, reportErrors));
     }
 
-    public void AddSubtypeConstraint(PreType super, PreType sub, IToken tok, Func<string> errorFormatStringProducer) {
+    public void AddSubtypeConstraint(PreType super, PreType sub, IOrigin tok, Func<string> errorFormatStringProducer) {
       unnormalizedSubtypeConstraints.Add(new SubtypeConstraint(super, sub, tok, errorFormatStringProducer));
     }
 
@@ -175,24 +292,40 @@ bool ApplySubtypeConstraints() {
     /// Try to resolve each proxy using its sub-bound constraints (if "fromSubBounds" is "true") or
     /// its super-bound constraints (if "fromSubBounds" is "false"). Add an equality constraint for
     /// any proxy whose head can be determined.
+    ///
+    /// If "ignoreUnknowns" is true, then ignore any constraint where the bound is a proxy or for which the running join/meet computation
+    /// is ill-defined.
+    /// If "ignoreUnknowns" is false, then don't resolve a proxy if it has unknowns.
+    ///
     /// Return "true" if any such equality constraint was added.
     /// </summary>
-    bool TryResolveTypeProxiesUsingKnownBounds(bool fromSubBounds) {
+    bool TryResolveTypeProxiesUsingKnownBounds(bool fromSubBounds, bool ignoreUnknowns) {
       // First, compute the join/meet of the sub/super-bound heads of each proxy
-      Dictionary<PreTypeProxy, TopLevelDecl> candidateHeads = new();
+      Dictionary<PreTypeProxy, TopLevelDecl> candidateHeads = new(); // if !ignoreUnknowns, map to null to indicate the proxy has unknowns
       Dictionary<PreTypeProxy, SubtypeConstraint> constraintOrigins = new();
       foreach (var constraint in unnormalizedSubtypeConstraints) {
         var proxy = (fromSubBounds ? constraint.Super : constraint.Sub).Normalize() as PreTypeProxy;
         var bound = (fromSubBounds ? constraint.Sub : constraint.Super).Normalize() as DPreType;
-        if (proxy != null && bound != null) {
+        if (proxy != null) {
           if (!candidateHeads.TryGetValue(proxy, out var previousBest)) {
-            candidateHeads.Add(proxy, bound.Decl);
-            constraintOrigins.Add(proxy, constraint);
+            // we haven't seen this proxy before
+            if (bound != null) {
+              candidateHeads.Add(proxy, bound.Decl);
+              constraintOrigins.Add(proxy, constraint);
+            } else if (!ignoreUnknowns) {
+              candidateHeads.Add(proxy, null);
+              constraintOrigins.Add(proxy, constraint);
+            }
+          } else if (previousBest == null) {
+            Contract.Assert(!ignoreUnknowns);
+            // proxy is already known to have unknowns
           } else {
-            var combined = fromSubBounds ? JoinHeads(previousBest, bound.Decl) : MeetHeads(previousBest, bound.Decl);
-            if (combined == null) {
-              // the two joins/meets were in conflict with each other; ignore the new one
-            } else {
+            var combined = bound == null
+              ? null
+              : fromSubBounds
+                ? JoinHeads(previousBest, bound.Decl, PreTypeResolver.resolver.SystemModuleManager)
+                : MeetHeads(previousBest, bound.Decl, PreTypeResolver.resolver.SystemModuleManager);
+            if (combined != null || !ignoreUnknowns) {
               candidateHeads[proxy] = combined;
             }
           }
@@ -202,20 +335,24 @@ bool TryResolveTypeProxiesUsingKnownBounds(bool fromSubBounds) {
       // Record equality constraints for each proxy that was determined
       var anythingChanged = false;
       foreach (var (proxy, best) in candidateHeads) {
+        if (best == null) {
+          Contract.Assert(!ignoreUnknowns);
+          continue;
+        }
         var pt = new DPreType(best, best.TypeArgs.ConvertAll(_ => PreTypeResolver.CreatePreTypeProxy()));
         var constraint = constraintOrigins[proxy];
         DebugPrint($"    DEBUG: head decision {proxy} := {pt}");
-        AddEqualityConstraint(proxy, pt, constraint.tok, constraint.ErrorFormatString); // TODO: the message could be made more specific now (perhaps)
+        AddEqualityConstraint(proxy, pt, constraint.tok, constraint.ErrorFormatString, null, constraint.ReportErrors); // TODO: the message could be made more specific now (perhaps)
         anythingChanged = true;
       }
       return anythingChanged;
     }
 
-    TopLevelDecl/*?*/ JoinHeads(TopLevelDecl a, TopLevelDecl b) {
+    public static TopLevelDecl/*?*/ JoinHeads(TopLevelDecl a, TopLevelDecl b, SystemModuleManager systemModuleManager) {
       var aAncestors = new HashSet<TopLevelDecl>();
       var bAncestors = new HashSet<TopLevelDecl>();
-      PreTypeResolver.ComputeAncestors(a, aAncestors);
-      PreTypeResolver.ComputeAncestors(b, bAncestors);
+      PreTypeResolver.ComputeAncestors(a, aAncestors, systemModuleManager);
+      PreTypeResolver.ComputeAncestors(b, bAncestors, systemModuleManager);
       var ancestors = aAncestors.Intersect(bAncestors).ToList();
       // Unless ancestors.Count == 1, there is no unique answer, and not necessary any way to determine the best
       // answer. As a heuristic, pick the element with the highest unique Height number. If there is no such
@@ -231,13 +368,15 @@ bool TryResolveTypeProxiesUsingKnownBounds(bool fromSubBounds) {
       return null;
     }
 
-    TopLevelDecl/*?*/ MeetHeads(TopLevelDecl a, TopLevelDecl b) {
+    TopLevelDecl/*?*/ MeetHeads(TopLevelDecl a, TopLevelDecl b, SystemModuleManager systemModuleManager) {
       var aAncestors = new HashSet<TopLevelDecl>();
+      PreTypeResolver.ComputeAncestors(a, aAncestors, systemModuleManager);
       if (aAncestors.Contains(b)) {
         // that's good enough; let's pick a
         return a;
       }
       var bAncestors = new HashSet<TopLevelDecl>();
+      PreTypeResolver.ComputeAncestors(b, bAncestors, systemModuleManager);
       if (bAncestors.Contains(a)) {
         // that's good enough; let's pick b
         return b;
@@ -246,21 +385,49 @@ bool TryResolveTypeProxiesUsingKnownBounds(bool fromSubBounds) {
       return null;
     }
 
-    int Height(TopLevelDecl d) {
-      if (d is TopLevelDeclWithMembers md && md.ParentTraitHeads.Count != 0) {
-        return md.ParentTraitHeads.Max(Height) + 1;
-      } else if (d is TraitDecl { IsObjectTrait: true }) {
+    /// <summary>
+    /// Return the trait height of "decl". The height is the smallest natural number that satisfies:
+    ///   - The built-in trait "object" is strictly lower than anything else
+    ///   - A declaration is strictly taller than any of its (explicit or implicit) parents
+    ///
+    /// The purpose of the "height" is to sort parent traits during type inference. For this purpose,
+    /// it seems less surprising to have (the possibly implicit) "object" have a lower height than
+    /// anything else. Here's an example:
+    ///     trait Trait { } // note, this trait is not a reference type
+    ///     class A extends Trait { }
+    ///     class B extends Trait { }
+    ///     method M(a: A, b: B) {
+    ///       var z;
+    ///       z := a;
+    ///       z := b;
+    ///     }
+    /// What type do you expect z to have? Looking at the program text suggests z's type to be Trait,
+    /// since Trait is a common parent of both A and B. But "object" is also a common parent of A and
+    /// B, since A and B are classes. It seems more surprising to report "z has no best type" than
+    /// to make "object" a "last resort" during type inference.
+    /// </summary>
+    public static int Height(TopLevelDecl decl) {
+      if (decl is TraitDecl { IsObjectTrait: true }) {
         // object is at height 0
         return 0;
-      } else if (DPreType.IsReferenceTypeDecl(d)) {
-        // any other reference type implicitly has "object" as a parent, so the height is 1
-        return 1;
+      }
+
+      if (decl is TopLevelDeclWithMembers { ParentTraitHeads: { Count: > 0 } } topLevelDeclWithMembers) {
+        // Note, if "decl" is a reference type, then its parents include "object", whether or not "object" is explicitly
+        // included in "ParentTraitHeads". Since the "Max" in the following line will return a number 0 or
+        // higher, the "Max" would be the same whether or not "object" is in the "ParentTraitHeads" list.
+        return topLevelDeclWithMembers.ParentTraitHeads.Max(Height) + 1;
+      } else if (decl is TypeParameter { TypeBounds: { Count: > 0 } } typeParameter) {
+        return typeParameter.TypeBoundHeads.Max(Height) + 1;
       } else {
-        return 0;
+        // Other other declarations have height 1.
+        // Note, an ostensibly parent-less reference type still has the implicit "object" as a parent trait, but
+        // that still makes its height 1.
+        return 1;
       }
     }
 
-    public IEnumerable<DPreType> AllSubBounds(PreTypeProxy proxy, ISet<PreTypeProxy> visited) {
+    private IEnumerable<DPreType> AllSubBounds(PreTypeProxy proxy, ISet<PreTypeProxy> visited) {
       Contract.Requires(proxy.PT == null);
       if (visited.Contains(proxy)) {
         yield break;
@@ -280,7 +447,7 @@ public IEnumerable<DPreType> AllSubBounds(PreTypeProxy proxy, ISet<PreTypeProxy>
       }
     }
 
-    public IEnumerable<DPreType> AllSuperBounds(PreTypeProxy proxy, ISet<PreTypeProxy> visited) {
+    private IEnumerable<DPreType> AllSuperBounds(PreTypeProxy proxy, ISet<PreTypeProxy> visited) {
       Contract.Requires(proxy.PT == null);
       if (visited.Contains(proxy)) {
         yield break;
@@ -333,8 +500,12 @@ bool ApplyGuardedConstraints() {
       return anythingChanged;
     }
 
-    public void AddDefaultAdvice(PreType preType, Advice.Target advice) {
-      defaultAdvice.Add(new Advice(preType, advice));
+    public void AddDefaultAdvice(PreType preType, CommonAdvice.Target advice) {
+      defaultAdvice.Add(new CommonAdvice(preType, advice));
+    }
+
+    public void AddDefaultAdvice(PreType preType, PreType adviceType) {
+      defaultAdvice.Add(new TypeAdvice(preType, adviceType));
     }
 
     bool TryApplyDefaultAdvice() {
@@ -345,31 +516,69 @@ bool TryApplyDefaultAdvice() {
       return anythingChanged;
     }
 
-    public void AddConfirmation(CommonConfirmationBag check, PreType preType, IToken tok, string errorFormatString) {
-      confirmations.Add(() => {
-        if (!ConfirmConstraint(check, preType, null)) {
-          PreTypeResolver.ReportError(tok, errorFormatString, preType);
+    bool TryApplyDefaultAdviceFor(PreTypeProxy proxy) {
+      foreach (var advice in defaultAdvice) {
+        if (advice.ApplyFor(proxy, PreTypeResolver)) {
+          return true;
         }
-      });
+      }
+      return false;
     }
 
-    public void AddConfirmation(CommonConfirmationBag check, PreType preType, Type toType, IToken tok, string errorFormatString) {
-      Contract.Requires(toType is NonProxyType);
-      var toPreType = (DPreType)PreTypeResolver.Type2PreType(toType);
-      confirmations.Add(() => {
-        if (!ConfirmConstraint(check, preType, toPreType)) {
-          PreTypeResolver.ReportError(tok, errorFormatString, preType);
+    bool TryUseCompatibleTypesAsBounds() {
+      // if there is a compatible-types constraint "ty ~~ proxy", then decide on the bound "ty :> proxy"
+      bool anythingChanged = false;
+      foreach (var (compatibleBoundsProxy, compatibleBoundsType) in compatibleBounds) {
+        if (compatibleBoundsProxy.Normalize() is PreTypeProxy proxy && compatibleBoundsType.Normalize() is DPreType dPreType) {
+          // make a decision to set this proxy
+          proxy.Set(dPreType);
+          anythingChanged = true;
         }
-      });
+      }
+      return anythingChanged;
+    }
+
+    public void AddConfirmation(CommonConfirmationBag check, PreType preType, IOrigin tok, string errorFormatString, Action onProxyAction) {
+      confirmations.Add(new Confirmation(
+        () => ConfirmConstraint(check, preType, null),
+        () => string.Format(errorFormatString, preType),
+        (ResolverPass reporter) => {
+          if (preType.Normalize() is PreTypeProxy && onProxyAction != null) {
+            onProxyAction();
+          } else {
+            reporter.ReportError(tok, errorFormatString, preType);
+          }
+        }));
     }
 
-    public void AddConfirmation(System.Action confirm) {
-      confirmations.Add(confirm);
+    public void AddConfirmation(IOrigin tok, Func<bool> check, Func<string> errorMessage) {
+      confirmations.Add(new Confirmation(check, errorMessage,
+        (ResolverPass reporter) => { reporter.ReportError(tok, errorMessage()); }));
+    }
+
+    /// <summary>
+    /// Make a note that a possible super bound for "proxy" is "possibleSuperBound". It can later be consulted and
+    /// acted on if "proxy" is not constrained in any other way.
+    /// </summary>
+    public void AddCompatibleBounds(PreTypeProxy proxy, PreType possibleSuperBound) {
+      compatibleBounds.Add((proxy, possibleSuperBound));
     }
 
     void ConfirmTypeConstraints() {
       foreach (var confirmation in confirmations) {
-        confirmation();
+        confirmation.Confirm(PreTypeResolver);
+      }
+    }
+
+    record Confirmation(Func<bool> Check, Func<string> ErrorMessage, Action<ResolverPass> OnError) {
+      public void Confirm(ResolverPass reporter) {
+        if (!Check()) {
+          OnError(reporter);
+        }
+      }
+
+      public string DebugInformation() {
+        return ErrorMessage();
       }
     }
 
@@ -378,7 +587,12 @@ public enum CommonConfirmationBag {
       InRealFamily,
       InBoolFamily,
       InCharFamily,
+      InSetFamily,
+      InIsetFamily,
+      InMultisetFamily,
       InSeqFamily,
+      InMapFamily,
+      InImapFamily,
       IsNullableRefType,
       IsBitvector,
       IntLikeOrBitvector,
@@ -388,6 +602,7 @@ public enum CommonConfirmationBag {
       IntOrORDINAL,
       IntOrBitvectorOrORDINAL,
       Plussable,
+      Minusable,
       Mullable,
       Disjointable,
       OrderableLess,
@@ -397,6 +612,8 @@ public enum CommonConfirmationBag {
       Sizeable,
       Freshable,
       IsCoDatatype,
+      IsNewtypeBaseTypeLegacy,
+      IsNewtypeBaseTypeGeneral,
     };
 
     private bool ConfirmConstraint(CommonConfirmationBag check, PreType preType, DPreType auxPreType) {
@@ -411,75 +628,101 @@ private bool ConfirmConstraint(CommonConfirmationBag check, PreType preType, DPr
       var familyDeclName = ancestorDecl.Name;
       switch (check) {
         case CommonConfirmationBag.InIntFamily:
-          return familyDeclName == "int";
+          return familyDeclName == PreType.TypeNameInt;
         case CommonConfirmationBag.InRealFamily:
-          return familyDeclName == "real";
+          return familyDeclName == PreType.TypeNameReal;
         case CommonConfirmationBag.InBoolFamily:
-          return familyDeclName == "bool";
+          return familyDeclName == PreType.TypeNameBool;
         case CommonConfirmationBag.InCharFamily:
-          return familyDeclName == "char";
+          return familyDeclName == PreType.TypeNameChar;
+        case CommonConfirmationBag.InSetFamily:
+          return familyDeclName == PreType.TypeNameSet;
+        case CommonConfirmationBag.InIsetFamily:
+          return familyDeclName == PreType.TypeNameIset;
+        case CommonConfirmationBag.InMultisetFamily:
+          return familyDeclName == PreType.TypeNameMultiset;
         case CommonConfirmationBag.InSeqFamily:
-          return familyDeclName == "seq";
+          return familyDeclName == PreType.TypeNameSeq;
+        case CommonConfirmationBag.InMapFamily:
+          return familyDeclName == PreType.TypeNameMap;
+        case CommonConfirmationBag.InImapFamily:
+          return familyDeclName == PreType.TypeNameImap;
         case CommonConfirmationBag.IsNullableRefType:
           return DPreType.IsReferenceTypeDecl(pt.Decl);
         case CommonConfirmationBag.IsBitvector:
           return PreTypeResolver.IsBitvectorName(familyDeclName);
         case CommonConfirmationBag.IntLikeOrBitvector:
-          return familyDeclName == "int" || PreTypeResolver.IsBitvectorName(familyDeclName);
+          return familyDeclName == PreType.TypeNameInt || PreTypeResolver.IsBitvectorName(familyDeclName);
         case CommonConfirmationBag.NumericOrBitvector:
-          return familyDeclName is "int" or "real" || PreTypeResolver.IsBitvectorName(familyDeclName);
+          return familyDeclName is PreType.TypeNameInt or PreType.TypeNameReal || PreTypeResolver.IsBitvectorName(familyDeclName);
         case CommonConfirmationBag.NumericOrBitvectorOrCharOrORDINALOrSuchTrait:
-          if (familyDeclName is "int" or "real" or "char" or "ORDINAL" || PreTypeResolver.IsBitvectorName(familyDeclName)) {
+          if (familyDeclName is PreType.TypeNameInt or PreType.TypeNameReal or PreType.TypeNameChar or PreType.TypeNameORDINAL ||
+              PreTypeResolver.IsBitvectorName(familyDeclName)) {
             return true;
           }
           return PreTypeResolver.IsSuperPreTypeOf(pt, auxPreType);
         case CommonConfirmationBag.BooleanBits:
-          return familyDeclName == "bool" || PreTypeResolver.IsBitvectorName(familyDeclName);
+          return familyDeclName == PreType.TypeNameBool || PreTypeResolver.IsBitvectorName(familyDeclName);
         case CommonConfirmationBag.IntOrORDINAL:
-          return familyDeclName == "int" || familyDeclName == "ORDINAL";
+          return familyDeclName is PreType.TypeNameInt or PreType.TypeNameORDINAL;
         case CommonConfirmationBag.IntOrBitvectorOrORDINAL:
-          return familyDeclName == "int" || PreTypeResolver.IsBitvectorName(familyDeclName) || familyDeclName == "ORDINAL";
+          return familyDeclName == PreType.TypeNameInt || PreTypeResolver.IsBitvectorName(familyDeclName) || familyDeclName == PreType.TypeNameORDINAL;
         case CommonConfirmationBag.Plussable:
           switch (familyDeclName) {
-            case "int":
-            case "real":
-            case "ORDINAL":
-            case "char":
-            case "seq":
-            case "set":
-            case "iset":
-            case "multiset":
-            case "map":
-            case "imap":
+            case PreType.TypeNameInt:
+            case PreType.TypeNameReal:
+            case PreType.TypeNameORDINAL:
+            case PreType.TypeNameChar:
+            case PreType.TypeNameSeq:
+            case PreType.TypeNameSet:
+            case PreType.TypeNameIset:
+            case PreType.TypeNameMultiset:
+            case PreType.TypeNameMap:
+            case PreType.TypeNameImap:
+              return true;
+            default:
+              return PreTypeResolver.IsBitvectorName(familyDeclName);
+          }
+        case CommonConfirmationBag.Minusable:
+          switch (familyDeclName) {
+            case PreType.TypeNameInt:
+            case PreType.TypeNameReal:
+            case PreType.TypeNameORDINAL:
+            case PreType.TypeNameChar:
+            case PreType.TypeNameSet:
+            case PreType.TypeNameIset:
+            case PreType.TypeNameMultiset:
+            case PreType.TypeNameMap:
+            case PreType.TypeNameImap:
               return true;
             default:
               return PreTypeResolver.IsBitvectorName(familyDeclName);
           }
         case CommonConfirmationBag.Mullable:
           switch (familyDeclName) {
-            case "int":
-            case "real":
-            case "set":
-            case "iset":
-            case "multiset":
+            case PreType.TypeNameInt:
+            case PreType.TypeNameReal:
+            case PreType.TypeNameSet:
+            case PreType.TypeNameIset:
+            case PreType.TypeNameMultiset:
               return true;
             default:
               return PreTypeResolver.IsBitvectorName(familyDeclName);
           }
         case CommonConfirmationBag.Disjointable:
-          return familyDeclName == "set" || familyDeclName == "iset" || familyDeclName == "multiset";
+          return familyDeclName is PreType.TypeNameSet or PreType.TypeNameIset or PreType.TypeNameMultiset;
         case CommonConfirmationBag.OrderableLess:
         case CommonConfirmationBag.OrderableGreater:
           switch (familyDeclName) {
-            case "int":
-            case "real":
-            case "ORDINAL":
-            case "char":
-            case "set":
-            case "iset":
-            case "multiset":
+            case PreType.TypeNameInt:
+            case PreType.TypeNameReal:
+            case PreType.TypeNameORDINAL:
+            case PreType.TypeNameChar:
+            case PreType.TypeNameSet:
+            case PreType.TypeNameIset:
+            case PreType.TypeNameMultiset:
               return true;
-            case "seq":
+            case PreType.TypeNameSeq:
               return check == CommonConfirmationBag.OrderableLess;
             default:
               return PreTypeResolver.IsBitvectorName(familyDeclName);
@@ -490,23 +733,39 @@ private bool ConfirmConstraint(CommonConfirmationBag check, PreType preType, DPr
           return ancestorDecl is IndDatatypeDecl || ancestorDecl is TypeParameter;
         case CommonConfirmationBag.Sizeable:
           switch (familyDeclName) {
-            case "set": // but not "iset"
-            case "multiset":
-            case "seq":
-            case "map": // but not "imap"
+            case PreType.TypeNameSet: // but not "iset"
+            case PreType.TypeNameMultiset:
+            case PreType.TypeNameSeq:
+            case PreType.TypeNameMap: // but not "imap"
               return true;
             default:
               return false;
           }
         case CommonConfirmationBag.Freshable: {
-            var t = familyDeclName == "set" || familyDeclName == "iset" || familyDeclName == "seq"
+            var t = familyDeclName is PreType.TypeNameSet or PreType.TypeNameIset or PreType.TypeNameSeq
               ? ancestorPt.Arguments[0].Normalize() as DPreType
               : ancestorPt;
             return t != null && DPreType.IsReferenceTypeDecl(t.Decl);
           }
         case CommonConfirmationBag.IsCoDatatype:
           return ancestorDecl is CoDatatypeDecl;
-
+        case CommonConfirmationBag.IsNewtypeBaseTypeLegacy:
+          return pt.Decl is NewtypeDecl || pt.Decl.Name is PreType.TypeNameInt or PreType.TypeNameReal;
+        case CommonConfirmationBag.IsNewtypeBaseTypeGeneral:
+          if (pt.Decl is DatatypeDecl) {
+            // These base types are not yet supported, but they will be soon.
+            return false;
+          }
+          if (pt.Decl is NewtypeDecl) {
+            return true;
+          }
+          if (DPreType.IsReferenceTypeDecl(pt.Decl) || pt.Decl is TraitDecl) {
+            return false;
+          }
+          if (ArrowType.IsArrowTypeName(familyDeclName) || pt.Decl.Name == PreType.TypeNameORDINAL) {
+            return false;
+          }
+          return true;
         default:
           Contract.Assert(false); // unexpected case
           throw new cce.UnreachableException();
@@ -514,28 +773,55 @@ private bool ConfirmConstraint(CommonConfirmationBag check, PreType preType, DPr
     }
 
     /// <summary>
-    /// If "super" is an ancestor of "sub", then return a list "L" of arguments for "super" such that
-    /// "super<L>" is a supertype of "sub<subArguments>".
+    /// If "super" is an ancestor of "sub.Decl", then return a list "L" of arguments for "super" such that
+    /// "super<L>" is a supertype of "sub".
     /// Otherwise, return "null".
+    /// If "allowBaseTypeCast" is "true", then allow "sub" to be replaced by an ancestor type of "sub" if "sub" is a newtype.
     /// </summary>
-    public List<PreType> /*?*/ GetTypeArgumentsForSuperType(TopLevelDecl super, TopLevelDecl sub, List<PreType> subArguments) {
-      Contract.Requires(sub.TypeArgs.Count == subArguments.Count);
+    [CanBeNull]
+    public List<PreType> GetTypeArgumentsForSuperType(TopLevelDecl super, DPreType sub, bool allowBaseTypeCast) {
+      if (super == sub.Decl) {
+        return sub.Arguments;
+      }
 
-      if (super == sub) {
-        return subArguments;
-      } else if (sub is TopLevelDeclWithMembers md) {
-        var subst = PreType.PreTypeSubstMap(md.TypeArgs, subArguments);
-        foreach (var parentType in AllParentTraits(md)) {
-          var parentPreType = (DPreType)PreTypeResolver.Type2PreType(parentType).Substitute(subst);
-          var arguments = GetTypeArgumentsForSuperType(super, parentPreType.Decl, parentPreType.Arguments);
+      foreach (var parentPreType in ParentPreTypes(sub)) {
+        var arguments = GetTypeArgumentsForSuperType(super, parentPreType, false);
+        if (arguments != null) {
+          return arguments;
+        }
+      }
+
+      if (sub.Decl is TypeParameter typeParameter) {
+        foreach (var preTypeBound in PreTypeResolver.TypeParameterBounds2PreTypes(typeParameter)) {
+          var arguments = GetTypeArgumentsForSuperType(super, preTypeBound, allowBaseTypeCast);
+          if (arguments != null) {
+            return arguments;
+          }
+        }
+      }
+
+      if (allowBaseTypeCast && sub.Decl is NewtypeDecl newtypeDecl) {
+        var subst = PreType.PreTypeSubstMap(newtypeDecl.TypeArgs, sub.Arguments);
+        if (newtypeDecl.BasePreType.Substitute(subst) is DPreType basePreType) {
+          var arguments = GetTypeArgumentsForSuperType(super, basePreType, true);
           if (arguments != null) {
             return arguments;
           }
         }
       }
+
       return null;
     }
 
+    public IEnumerable<DPreType> ParentPreTypes(DPreType dPreType) {
+      if (dPreType.Decl is TopLevelDeclWithMembers md) {
+        var subst = PreType.PreTypeSubstMap(md.TypeArgs, dPreType.Arguments);
+        foreach (var parentType in AllParentTraits(md)) {
+          yield return (DPreType)PreTypeResolver.Type2PreType(parentType).Substitute(subst);
+        }
+      }
+    }
+
     /// <summary>
     /// AllParentTraits(decl) is like decl.ParentTraits, but also returns "object" if "decl" is a reference type.
     /// </summary>
@@ -544,7 +830,7 @@ public IEnumerable<Type> AllParentTraits(TopLevelDeclWithMembers decl) {
         yield return parentType;
       }
       if (DPreType.IsReferenceTypeDecl(decl)) {
-        if (decl is TraitDecl trait && trait.IsObjectTrait) {
+        if (decl is TraitDecl { IsObjectTrait: true }) {
           // don't return object itself
         } else {
           yield return PreTypeResolver.resolver.SystemModuleManager.ObjectQ();
@@ -552,11 +838,11 @@ public IEnumerable<Type> AllParentTraits(TopLevelDeclWithMembers decl) {
       }
     }
 
-    public static string TokToShortLocation(IToken tok) {
+    public static string TokToShortLocation(IOrigin tok) {
       return $"{System.IO.Path.GetFileName(tok.filename)}({tok.line},{tok.col - 1})";
     }
 
-    string Pad(string s, int minWidth) {
+    public static string Pad(string s, int minWidth) {
       return s + new string(' ', Math.Max(minWidth - s.Length, 0));
     }
 
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeEqualityConstraint.cs b/Source/DafnyCore/Resolver/PreType/PreTypeEqualityConstraint.cs
index 052f30ccf3c..1f5d914b88b 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeEqualityConstraint.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeEqualityConstraint.cs
@@ -11,12 +11,12 @@
 
 namespace Microsoft.Dafny {
 
-  class EqualityConstraint : PreTypeConstraint {
+  class EqualityConstraint : OptionalErrorPreTypeConstraint {
     public PreType A;
     public PreType B;
 
-    public EqualityConstraint(PreType a, PreType b, IToken tok, string msgFormat)
-      : base(tok, msgFormat) {
+    public EqualityConstraint(PreType a, PreType b, IOrigin tok, string msgFormat, PreTypeConstraint baseError = null, bool reportErrors = true)
+      : base(tok, msgFormat, baseError, reportErrors) {
       A = a;
       B = b;
     }
@@ -32,8 +32,8 @@ public override string ErrorMessage() {
     /// in particular, that this method cannot be called in middle of constraints.ApplySubtypeConstraints.
     /// </summary>
     public IEnumerable<EqualityConstraint> Apply(PreTypeConstraints constraints) {
-      var a = A.Normalize();
-      var b = B.Normalize();
+      var a = A.NormalizeWrtScope();
+      var b = B.NormalizeWrtScope();
       if (a == b) {
         // we're already there
       } else if (a is PreTypeProxy pa && !b.Contains(pa, 1, new HashSet<PreTypeProxy>(), constraints, 0)) {
@@ -44,9 +44,9 @@ public IEnumerable<EqualityConstraint> Apply(PreTypeConstraints constraints) {
         Contract.Assert(da.Arguments.Count == db.Arguments.Count);
         for (var i = 0; i < da.Arguments.Count; i++) {
           // TODO: should the error message in the following line be more specific?
-          yield return new EqualityConstraint(da.Arguments[i], db.Arguments[i], tok, ErrorFormatString);
+          yield return new EqualityConstraint(da.Arguments[i], db.Arguments[i], tok, ErrorFormatString, null, ReportErrors);
         }
-      } else {
+      } else if (ReportErrors) {
         constraints.PreTypeResolver.ReportError(tok, ErrorFormatString, a, b);
       }
     }
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeResolve.ActualParameters.cs b/Source/DafnyCore/Resolver/PreType/PreTypeResolve.ActualParameters.cs
index bc44e127e64..c1798e15a7b 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeResolve.ActualParameters.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeResolve.ActualParameters.cs
@@ -8,7 +8,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Diagnostics.Contracts;
-using Microsoft.Boogie;
 using ResolutionContext = Microsoft.Dafny.ResolutionContext;
 
 namespace Microsoft.Dafny {
@@ -19,7 +18,7 @@ public partial class PreTypeResolver {
     /// "typeMap" is applied to the type of each formal.
     /// This method should be called only once. That is, bindings.arguments is required to be null on entry to this method.
     /// </summary>
-    void ResolveActualParameters(ActualBindings bindings, List<Formal> formals, IToken callTok, object context, ResolutionContext opts,
+    internal void ResolveActualParameters(ActualBindings bindings, List<Formal> formals, IOrigin callTok, object context, ResolutionContext opts,
       Dictionary<TypeParameter, PreType> typeMap, Expression/*?*/ receiver) {
       Contract.Requires(bindings != null);
       Contract.Requires(formals != null);
@@ -88,13 +87,13 @@ void ResolveActualParameters(ActualBindings bindings, List<Formal> formals, ITok
             ReportError(binding.FormalParameterName, $"duplicate binding for parameter name '{pname}'");
           }
         } else if (!stillAcceptingPositionalArguments) {
-          ReportError(arg.tok, "a positional argument is not allowed to follow named arguments");
+          ReportError(arg.Origin, "a positional argument is not allowed to follow named arguments");
         } else if (bindingIndex < formals.Count) {
           // use the name of formal corresponding to this positional argument, unless the parameter is name-only
           var formal = formals[bindingIndex];
           var pname = formal.Name;
           if (formal.IsNameOnly) {
-            ReportError(arg.tok, $"nameonly parameter '{pname}' must be passed using a name binding; it cannot be passed positionally");
+            ReportError(arg.Origin, $"nameonly parameter '{pname}' must be passed using a name binding; it cannot be passed positionally");
           }
           Contract.Assert(namesToActuals[pname] == null); // we expect this, since we've only filled parameters positionally so far
           namesToActuals[pname] = binding;
@@ -119,7 +118,6 @@ void ResolveActualParameters(ActualBindings bindings, List<Formal> formals, ITok
       var formalIndex = 0;
       var substMap = new Dictionary<IVariable, Expression>();
       foreach (var formal in formals) {
-        formal.PreType = Type2PreType(formal.Type);
         var b = namesToActuals[formal.Name];
         if (b != null) {
           actuals.Add(b.Actual);
@@ -129,30 +127,26 @@ void ResolveActualParameters(ActualBindings bindings, List<Formal> formals, ITok
             whatKind + (context is Method ? " in-parameter" : " parameter"));
 
           Constraints.AddSubtypeConstraint(
-            formal.PreType.Substitute(typeMap), b.Actual.PreType, callTok,
+            formal.PreType.Substitute(typeMap), b.Actual.PreType, b.Actual.Origin,
             $"incorrect argument type {what} (expected {{0}}, found {{1}})");
         } else if (formal.DefaultValue != null) {
           // Note, in the following line, "substMap" is passed in, but it hasn't been fully filled in until the
           // end of this foreach loop. Still, that's soon enough, because DefaultValueExpression won't use it
-          // until FillInDefaultValueExpressions at the end of Pass 1 of the Resolver.
-          var n = new DefaultValueExpressionPreType(callTok, formal, receiver, substMap, typeMap);
-#if SOON
+          // until FillInDefaultValueExpressions at the end of Pass 0 of the Resolver.
+          var n = new DefaultValueExpressionPreType(callTok, formal, receiver, substMap, typeMap) { PreType = formal.PreType.Substitute(typeMap) };
           resolver.allDefaultValueExpressions.Add(n);
-#endif
           actuals.Add(n);
           substMap.Add(formal, n);
         } else {
           // parameter has no value
-          if (onlyPositionalArguments) {
-            // a simple error message has already been reported
-            Contract.Assert(simpleErrorReported);
-          } else {
+          if (!simpleErrorReported) {
             var formalDescription = whatKind + (context is Method ? " in-parameter" : " parameter");
             var nameWithIndex = formal.HasName && formal is not ImplicitFormal ? "'" + formal.Name + "'" : "";
             if (formals.Count > 1 || nameWithIndex == "") {
               nameWithIndex += nameWithIndex == "" ? "" : " ";
               nameWithIndex += $"at index {formalIndex}";
             }
+
             var message = $"{formalDescription} {nameWithIndex} requires an argument of type {formal.Type}";
             ReportError(callTok, message);
           }
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeResolve.Expressions.cs b/Source/DafnyCore/Resolver/PreType/PreTypeResolve.Expressions.cs
index 13509a417bb..9f247883582 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeResolve.Expressions.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeResolve.Expressions.cs
@@ -10,14 +10,15 @@
 using System.Linq;
 using System.Numerics;
 using System.Diagnostics.Contracts;
-using Microsoft.Boogie;
+using DafnyCore;
+using JetBrains.Annotations;
 using ResolutionContext = Microsoft.Dafny.ResolutionContext;
 
 namespace Microsoft.Dafny {
   public partial class PreTypeResolver {
     // ---------------------------------------- Expressions ----------------------------------------
 
-    void ResolveExpression(Expression expr, ResolutionContext resolutionContext) {
+    public void ResolveExpression(Expression expr, ResolutionContext resolutionContext) {
       Contract.Requires(expr != null);
       Contract.Requires(resolutionContext != null);
 
@@ -26,714 +27,726 @@ void ResolveExpression(Expression expr, ResolutionContext resolutionContext) {
         return;
       }
 
-      if (expr is ParensExpression) {
-        var e = (ParensExpression)expr;
-        ResolveExpression(e.E, resolutionContext);
-        e.ResolvedExpression = e.E;
-        e.PreType = e.E.PreType;
-
-      } else if (expr is ChainingExpression) {
-        var e = (ChainingExpression)expr;
-        ResolveExpression(e.E, resolutionContext);
-        e.ResolvedExpression = e.E;
-        e.PreType = e.E.PreType;
-
-      } else if (expr is NegationExpression) {
-        var e = (NegationExpression)expr;
-        ResolveExpression(e.E, resolutionContext);
-        e.PreType = e.E.PreType;
-        AddConfirmation(PreTypeConstraints.CommonConfirmationBag.NumericOrBitvector, e.E.PreType, e.E.tok, "type of unary - must be of a numeric or bitvector type (instead got {0})");
-        // Note, e.ResolvedExpression will be filled in during CheckTypeInference, at which time e.PreType has been determined
-
-      } else if (expr is LiteralExpr) {
-        var e = (LiteralExpr)expr;
-
-        if (e is StaticReceiverExpr eStatic) {
-          resolver.ResolveType(eStatic.tok, eStatic.UnresolvedType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-          eStatic.PreType = Type2PreType(eStatic.UnresolvedType, "static receiver type");
-        } else {
-          if (e.Value == null) {
-            e.PreType = CreatePreTypeProxy("literal 'null'");
-            Constraints.AddDefaultAdvice(e.PreType, Advice.Target.Object);
-            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IsNullableRefType, e.PreType, e.tok, "type of 'null' is a reference type, but it is used as {0}");
-          } else if (e.Value is BigInteger) {
-            e.PreType = CreatePreTypeProxy($"integer literal '{e.Value}'");
-            Constraints.AddDefaultAdvice(e.PreType, Advice.Target.Int);
-            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IntOrBitvectorOrORDINAL, e.PreType, e.tok, "integer literal used as if it had type {0}");
-          } else if (e.Value is BaseTypes.BigDec) {
-            e.PreType = CreatePreTypeProxy($"real literal '{e.Value}'");
-            Constraints.AddDefaultAdvice(e.PreType, Advice.Target.Real);
-            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InRealFamily, e.PreType, e.tok, "type of real literal is used as {0}"); // TODO: make this error message have the same form as the one for integers above
-          } else if (e.Value is bool) {
-            e.PreType = CreatePreTypeProxy($"boolean literal '{e.Value.ToString().ToLower()}'");
-            Constraints.AddDefaultAdvice(e.PreType, Advice.Target.Bool);
-            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InBoolFamily, e.PreType, e.tok, "boolean literal used as if it had type {0}");
-          } else if (e is CharLiteralExpr) {
-            e.PreType = CreatePreTypeProxy($"character literal '{e.Value}'");
-            Constraints.AddDefaultAdvice(e.PreType, Advice.Target.Char);
-            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InCharFamily, e.PreType, e.tok, "character literal used as if it had type {0}");
-          } else if (e is StringLiteralExpr) {
-            e.PreType = CreatePreTypeProxy($"string literal \"{e.Value}\"");
-            Constraints.AddDefaultAdvice(e.PreType, Advice.Target.String);
-            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InSeqFamily, e.PreType, e.tok, "string literal used as if it had type {0}");
-          } else {
-            Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal type
+      switch (expr) {
+        case ParensExpression expression: {
+            var e = expression;
+            ResolveExpression(e.E, resolutionContext);
+            e.ResolvedExpression = e.E;
+            e.PreType = e.E.PreType;
+            break;
           }
-        }
+        case ChainingExpression expression: {
+            var e = expression;
+            ResolveExpression(e.E, resolutionContext);
+            e.ResolvedExpression = e.E;
+            e.PreType = e.E.PreType;
+            break;
+          }
+        case NegationExpression expression: {
+            var e = expression;
+            ResolveExpression(e.E, resolutionContext);
+            e.PreType = CreatePreTypeProxy("result of unary -");
+            AddSubtypeConstraint(e.PreType, e.E.PreType, e.E.Origin,
+              $"type of argument to unary - ({{1}}) must agree with the result type ({{0}})");
+            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.NumericOrBitvector, e.E.PreType, e.E.Origin, "type of unary - must be of a numeric or bitvector type (instead got {0})");
+            // Note, e.ResolvedExpression will be filled in during CheckTypeInference, at which time e.PreType has been determined
+            break;
+          }
+        case LiteralExpr literalExpr: {
+            var e = literalExpr;
 
-      } else if (expr is ThisExpr) {
-        if (!scope.AllowInstance) {
-          ReportError(expr, "'this' is not allowed in a 'static' context");
-        }
-        if (currentClass is DefaultClassDecl) {
-          // there's no type
-        } else if (currentClass == null) {
-          Contract.Assert(resolver.reporter.HasErrors);
-        } else {
-          var ty = ModuleResolver.GetThisType(expr.tok, currentClass);  // do this regardless of scope.AllowInstance, for better error reporting
-          expr.PreType = Type2PreType(ty, "type of 'this'");
-        }
+            if (e is StaticReceiverExpr eStatic) {
+              resolver.ResolveType(eStatic.Origin, eStatic.UnresolvedType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+              eStatic.PreType = Type2PreType(eStatic.UnresolvedType, "static receiver type");
+            } else {
+              if (e.Value == null) {
+                e.PreType = CreatePreTypeProxy("literal 'null'");
+                Constraints.AddDefaultAdvice(e.PreType, CommonAdvice.Target.Object);
+                AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IsNullableRefType, e.PreType, e.Origin, "type of 'null' is a reference type, but it is used as {0}");
+              } else if (e.Value is BigInteger) {
+                e.PreType = CreatePreTypeProxy($"integer literal '{e.Value}'");
+                Constraints.AddDefaultAdvice(e.PreType, CommonAdvice.Target.Int);
+                AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IntOrBitvectorOrORDINAL, e.PreType, e.Origin, "integer literal used as if it had type {0}");
+              } else if (e.Value is BaseTypes.BigDec) {
+                e.PreType = CreatePreTypeProxy($"real literal '{e.Value}'");
+                Constraints.AddDefaultAdvice(e.PreType, CommonAdvice.Target.Real);
+                AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InRealFamily, e.PreType, e.Origin, "type of real literal is used as {0}"); // TODO: make this error message have the same form as the one for integers above
+              } else if (e.Value is bool) {
+                e.PreType = CreatePreTypeProxy($"boolean literal '{e.Value.ToString().ToLower()}'");
+                Constraints.AddDefaultAdvice(e.PreType, CommonAdvice.Target.Bool);
+                AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InBoolFamily, e.PreType, e.Origin, "boolean literal used as if it had type {0}");
+              } else if (e is CharLiteralExpr) {
+                e.PreType = CreatePreTypeProxy($"character literal '{e.Value}'");
+                Constraints.AddDefaultAdvice(e.PreType, CommonAdvice.Target.Char);
+                AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InCharFamily, e.PreType, e.Origin, "character literal used as if it had type {0}");
+              } else if (e is StringLiteralExpr) {
+                e.PreType = CreatePreTypeProxy($"string literal \"{e.Value}\"");
+                Constraints.AddDefaultAdvice(e.PreType, CommonAdvice.Target.String);
+                AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InSeqFamily, e.PreType, e.Origin, "string literal used as if it had type {0}");
+              } else {
+                Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal type
+              }
+            }
 
-      } else if (expr is IdentifierExpr) {
-        var e = (IdentifierExpr)expr;
-        e.Var = scope.Find(e.Name);
-        if (e.Var != null) {
-          expr.PreType = e.Var.PreType;
-        } else {
-          ReportError(expr, "Identifier does not denote a local variable, parameter, or bound variable: {0}", e.Name);
-        }
+            break;
+          }
+        case ThisExpr: {
+            if (!scope.AllowInstance) {
+              ReportError(expr, "'this' is not allowed in a 'static' context");
+            }
+            if (currentClass is DefaultClassDecl) {
+              // there's no type
+            } else if (currentClass == null) {
+              Contract.Assert(resolver.reporter.HasErrors);
+            } else {
+              var ty = ModuleResolver.GetThisType(expr.Origin, currentClass);  // do this regardless of scope.AllowInstance, for better error reporting
+              expr.PreType = Type2PreType(ty, "type of 'this'");
+            }
 
-      } else if (expr is DatatypeValue) {
-        var dtv = (DatatypeValue)expr;
-        if (!resolver.moduleInfo.TopLevels.TryGetValue(dtv.DatatypeName, out var decl)) {
-          ReportError(expr.tok, "Undeclared datatype: {0}", dtv.DatatypeName);
-        } else if (decl is AmbiguousTopLevelDecl) {
-          var ad = (AmbiguousTopLevelDecl)decl;
-          ReportError(expr.tok,
-            "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)",
-            dtv.DatatypeName, ad.ModuleNames());
-        } else if (decl is DatatypeDecl dtd) {
-          ResolveDatatypeValue(resolutionContext, dtv, dtd, null);
-        } else {
-          ReportError(expr.tok, "Expected datatype: {0}", dtv.DatatypeName);
-        }
+            break;
+          }
+        case IdentifierExpr identifierExpr: {
+            var e = identifierExpr;
+            e.Var = scope.Find(e.Name);
+            if (e.Var != null) {
+              identifierExpr.PreType = e.Var.PreType;
+            } else {
+              ReportError(identifierExpr, "Identifier does not denote a local variable, parameter, or bound variable: {0}", e.Name);
+            }
 
-      } else if (expr is DisplayExpression) {
-        var e = (DisplayExpression)expr;
-        var elementPreType = CreatePreTypeProxy("display expression element type");
-        foreach (var ee in e.Elements) {
-          ResolveExpression(ee, resolutionContext);
-          AddSubtypeConstraint(elementPreType, ee.PreType, ee.tok,
-            "All elements of display must have some common supertype (got {1}, but needed type or type of previous elements is {0})");
-        }
-        var argTypes = new List<PreType>() { elementPreType };
-        if (expr is SetDisplayExpr setDisplayExpr) {
-          expr.PreType = new DPreType(BuiltInTypeDecl(setDisplayExpr.Finite ? "set" : "iset"), argTypes);
-        } else if (expr is MultiSetDisplayExpr) {
-          expr.PreType = new DPreType(BuiltInTypeDecl("multiset"), argTypes);
-        } else {
-          expr.PreType = new DPreType(BuiltInTypeDecl("seq"), argTypes);
-        }
+            break;
+          }
+        case DatatypeValue value: {
+            var dtv = value;
+            TopLevelDecl decl = value.Ctor?.EnclosingDatatype;
+            if (decl == null && !resolver.moduleInfo.TopLevels.TryGetValue(dtv.DatatypeName, out decl)) {
+              ReportError(value.Origin, "Undeclared datatype: {0}", dtv.DatatypeName);
+            } else if (decl is AmbiguousTopLevelDecl ad) {
+              ReportError(value.Origin,
+                "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)",
+                dtv.DatatypeName, ad.ModuleNames());
+            } else if (decl is DatatypeDecl dtd) {
+              ResolveDatatypeValue(resolutionContext, dtv, dtd, null);
+            } else {
+              ReportError(value.Origin, "Expected datatype: {0}", dtv.DatatypeName);
+            }
 
-      } else if (expr is MapDisplayExpr) {
-        var e = (MapDisplayExpr)expr;
-        var domainPreType = CreatePreTypeProxy("map display expression domain type");
-        var rangePreType = CreatePreTypeProxy("map display expression range type");
-        foreach (ExpressionPair p in e.Elements) {
-          ResolveExpression(p.A, resolutionContext);
-          AddSubtypeConstraint(domainPreType, p.A.PreType, p.A.tok,
-            "All elements of display must have some common supertype (got {1}, but needed type or type of previous elements is {0})");
-          ResolveExpression(p.B, resolutionContext);
-          AddSubtypeConstraint(rangePreType, p.B.PreType, p.B.tok,
-            "All elements of display must have some common supertype (got {1}, but needed type or type of previous elements is {0})");
-        }
-        var argTypes = new List<PreType>() { domainPreType, rangePreType };
-        expr.PreType = new DPreType(BuiltInTypeDecl(e.Finite ? "map" : "imap"), argTypes);
-
-      } else if (expr is NameSegment) {
-        var e = (NameSegment)expr;
-        ResolveNameSegment(e, true, null, resolutionContext, false);
-
-        if (e.PreType is PreTypePlaceholderModule) {
-          ReportError(e.tok, "name of module ({0}) is used as a variable", e.Name);
-          e.ResetTypeAssignment(); // the rest of type checking assumes actual types
-        } else if (e.PreType is PreTypePlaceholderType) {
-          ReportError(e.tok, "name of type ({0}) is used as a variable", e.Name);
-          e.ResetTypeAssignment(); // the rest of type checking assumes actual types
-        }
+            break;
+          }
+        case DisplayExpression expression: {
+            var e = expression;
+            var elementPreType = CreatePreTypeProxy("display expression element type");
+            foreach (var ee in e.Elements) {
+              ResolveExpression(ee, resolutionContext);
+              AddSubtypeConstraint(elementPreType, ee.PreType, ee.Origin,
+                "All elements of display must have some common supertype (got {1}, but needed type or type of previous elements is {0})");
+            }
+            if (expression is SetDisplayExpr setDisplayExpr) {
+              var confirmationFamily = setDisplayExpr.Finite
+                ? PreTypeConstraints.CommonConfirmationBag.InSetFamily
+                : PreTypeConstraints.CommonConfirmationBag.InIsetFamily;
+              ResolveCollectionProducingExpr(PreType.SetTypeName(setDisplayExpr.Finite), "display", setDisplayExpr, elementPreType, confirmationFamily);
+            } else if (expression is MultiSetDisplayExpr multiSetDisplayExpr) {
+              ResolveCollectionProducingExpr(PreType.TypeNameMultiset, "display", e, elementPreType,
+                PreTypeConstraints.CommonConfirmationBag.InMultisetFamily);
+            } else {
+              ResolveCollectionProducingExpr(PreType.TypeNameSeq, "display", e, elementPreType, PreTypeConstraints.CommonConfirmationBag.InSeqFamily);
+            }
 
-      } else if (expr is ExprDotName) {
-        var e = (ExprDotName)expr;
-        ResolveDotSuffix(e, true, null, resolutionContext, false);
-        if (e.PreType is PreTypePlaceholderModule) {
-          ReportError(e.tok, "name of module ({0}) is used as a variable", e.SuffixName);
-          e.ResetTypeAssignment();  // the rest of type checking assumes actual types
-        } else if (e.PreType is PreTypePlaceholderType) {
-          ReportError(e.tok, "name of type ({0}) is used as a variable", e.SuffixName);
-          e.ResetTypeAssignment();  // the rest of type checking assumes actual types
-        }
+            break;
+          }
+        case MapDisplayExpr displayExpr: {
+            var e = displayExpr;
+            var domainPreType = CreatePreTypeProxy("map display expression domain type");
+            var rangePreType = CreatePreTypeProxy("map display expression range type");
+            foreach (ExpressionPair p in e.Elements) {
+              ResolveExpression(p.A, resolutionContext);
+              AddSubtypeConstraint(domainPreType, p.A.PreType, p.A.Origin,
+                "All elements of display must have some common supertype (got {1}, but needed type or type of previous elements is {0})");
+              ResolveExpression(p.B, resolutionContext);
+              AddSubtypeConstraint(rangePreType, p.B.PreType, p.B.Origin,
+                "All elements of display must have some common supertype (got {1}, but needed type or type of previous elements is {0})");
+            }
 
-      } else if (expr is ApplySuffix applySuffix) {
-        ResolveApplySuffix(applySuffix, resolutionContext, false);
-
-      } else if (expr is MemberSelectExpr) {
-        var e = (MemberSelectExpr)expr;
-        Contract.Assert(false); // this case is always handled by ResolveExprDotCall
-#if PROBABLY_NEVER
-        ResolveExpression(e.Obj, resolutionContext);
-        var (member, tentativeReceiverType) = FindMember(expr.tok, e.Obj.PreType, e.MemberName);
-        if (member == null) {
-          // error has already been reported by FindMember
-        } else if (member is Function fn) {
-          e.Member = fn;
-          if (fn is TwoStateFunction && !resolutionContext.twoState) {
-            ReportError(e.tok, "a two-state function can be used only in a two-state resolutionContext");
-          }
-          // build the type substitution map
-          e.TypeApplication_AtEnclosingClass = tentativeReceiverType.TypeArgs;
-          e.TypeApplication_JustMember = new List<Type>();
-          Dictionary<TypeParameter, Type> subst;
-          var ctype = tentativeReceiverType as UserDefinedType;
-          if (ctype == null) {
-            subst = new Dictionary<TypeParameter, Type>();
-          } else {
-            subst = TypeSubstitutionMap(ctype.ResolvedClass.TypeArgs, ctype.TypeArgs);
-          }
-          foreach (var tp in fn.TypeArgs) {
-            Type prox = new InferredTypeProxy();
-            subst[tp] = prox;
-            e.TypeApplication_JustMember.Add(prox);
-          }
-          subst = BuildTypeArgumentSubstitute(subst);
-          e.Type = SelectAppropriateArrowType(fn.tok, fn.Formals.ConvertAll(f => SubstType(f.Type, subst)), SubstType(fn.ResultType, subst),
-            fn.Reads.Count != 0, fn.Req.Count != 0);
-          AddCallGraphEdge(resolutionContext, fn, e, false);
-        } else if (member is Field field) {
-          e.Member = field;
-          e.TypeApplication_AtEnclosingClass = tentativeReceiverType.TypeArgs;
-          e.TypeApplication_JustMember = new List<Type>();
-          if (e.Obj is StaticReceiverExpr && !field.IsStatic) {
-            ReportError(expr, "a field must be selected via an object, not just a class name");
-          }
-          var ctype = tentativeReceiverType as UserDefinedType;
-          if (ctype == null) {
-            e.Type = field.Type;
-          } else {
-            Contract.Assert(ctype.ResolvedClass != null); // follows from postcondition of ResolveMember
-            // build the type substitution map
-            var subst = TypeSubstitutionMap(ctype.ResolvedClass.TypeArgs, ctype.TypeArgs);
-            e.Type = SubstType(field.Type, subst);
+            ResolveMapProducingExpr(e.Finite, "display", displayExpr, domainPreType, rangePreType);
+            break;
           }
-          AddCallGraphEdgeForField(resolutionContext, field, e);
-        } else {
-          ReportError(expr, "member {0} in type {1} does not refer to a field or a function", e.MemberName, tentativeReceiverType);
-        }
-#endif
+        case NameSegment segment: {
+            var e = segment;
+            ResolveNameSegment(e, true, null, resolutionContext, false);
+
+            if (e.PreType is PreTypePlaceholderModule) {
+              ReportError(e.Origin, "name of module ({0}) is used as a variable", e.Name);
+              ResetTypeAssignment(e); // the rest of type checking assumes actual types
+            } else if (e.PreType is PreTypePlaceholderType) {
+              ReportError(e.Origin, "name of type ({0}) is used as a variable", e.Name);
+              ResetTypeAssignment(e); // the rest of type checking assumes actual types
+            }
 
-      } else if (expr is SeqSelectExpr) {
-        var e = (SeqSelectExpr)expr;
+            break;
+          }
+        case ExprDotName name: {
+            var e = name;
+            ResolveDotSuffix(e, false, true, null, resolutionContext, false);
+            if (e.PreType is PreTypePlaceholderModule) {
+              ReportError(e.Origin, "name of module ({0}) is used as a variable", e.SuffixName);
+              ResetTypeAssignment(e);  // the rest of type checking assumes actual types
+            } else if (e.PreType is PreTypePlaceholderType) {
+              ReportError(e.Origin, "name of type ({0}) is used as a variable", e.SuffixName);
+              ResetTypeAssignment(e);  // the rest of type checking assumes actual types
+            }
 
-        ResolveExpression(e.Seq, resolutionContext);
-        if (e.E0 != null) {
-          ResolveExpression(e.E0, resolutionContext);
-        }
-        if (e.E1 != null) {
-          ResolveExpression(e.E1, resolutionContext);
-        }
+            break;
+          }
+        case ApplySuffix applySuffix:
+          ResolveApplySuffix(applySuffix, resolutionContext, false);
+          break;
+        case MemberSelectExpr selectExpr: {
+            var e = selectExpr;
+            Contract.Assert(false); // this case is always handled by ResolveExprDotCall
+            break;
+          }
+        case SeqSelectExpr selectExpr: {
+            var e = selectExpr;
 
-        if (e.SelectOne) {
-          Contract.Assert(e.E0 != null);
-          Contract.Assert(e.E1 == null);
-          e.PreType = ResolveSingleSelectionExpr(e.tok, e.Seq.PreType, e.E0);
-        } else {
-          e.PreType = ResolveRangeSelectionExpr(e.tok, e.Seq.PreType, e.E0, e.E1);
-        }
+            ResolveExpression(e.Seq, resolutionContext);
+            if (e.E0 != null) {
+              ResolveExpression(e.E0, resolutionContext);
+            }
+            if (e.E1 != null) {
+              ResolveExpression(e.E1, resolutionContext);
+            }
 
-      } else if (expr is MultiSelectExpr) {
-        var e = (MultiSelectExpr)expr;
-
-        ResolveExpression(e.Array, resolutionContext);
-        var elementPreType = CreatePreTypeProxy("multi-dim array select");
-        var arrayPreType = BuiltInArrayType(e.Indices.Count, elementPreType);
-        AddSubtypeConstraint(arrayPreType, e.Array.PreType, e.Array.tok, "array selection requires an {0} (got {1})");
-        int i = 0;
-        foreach (var indexExpression in e.Indices) {
-          ResolveExpression(indexExpression, resolutionContext);
-          ConstrainToIntFamily(indexExpression.PreType, indexExpression.tok,
-            "array selection requires integer- or bitvector-based numeric indices (got {0} for index " + i + ")");
-          i++;
-        }
-        e.PreType = elementPreType;
-
-      } else if (expr is SeqUpdateExpr) {
-        var e = (SeqUpdateExpr)expr;
-        ResolveExpression(e.Seq, resolutionContext);
-        ResolveExpression(e.Index, resolutionContext);
-        ResolveExpression(e.Value, resolutionContext);
-        Constraints.AddGuardedConstraint(() => {
-          var sourcePreType = e.Seq.PreType.Normalize() as DPreType;
-          var ancestorDecl = AncestorDecl(sourcePreType.Decl);
-          var familyDeclName = AncestorName(sourcePreType);
-          if (familyDeclName == "seq") {
-            var elementPreType = sourcePreType.Arguments[0];
-            ConstrainToIntFamily(e.Index.PreType, e.Index.tok, "sequence update requires integer- or bitvector-based index (got {0})");
-            AddSubtypeConstraint(elementPreType, e.Value.PreType, e.Value.tok,
-              "sequence update requires the value to have the element type of the sequence (got {0})");
-            return true;
-          } else if (familyDeclName == "map" || familyDeclName == "imap") {
-            var domainPreType = sourcePreType.Arguments[0];
-            var rangePreType = sourcePreType.Arguments[1];
-            AddSubtypeConstraint(domainPreType, e.Index.PreType, e.Index.tok,
-              familyDeclName + " update requires domain element to be of type {0} (got {1})");
-            AddSubtypeConstraint(rangePreType, e.Value.PreType, e.Value.tok,
-              familyDeclName + " update requires the value to have the range type {0} (got {1})");
-            return true;
-          } else if (familyDeclName == "multiset") {
-            var elementPreType = sourcePreType.Arguments[0];
-            AddSubtypeConstraint(elementPreType, e.Index.PreType, e.Index.tok,
-              "multiset update requires domain element to be of type {0} (got {1})");
-            ConstrainToIntFamily(e.Value.PreType, e.Value.tok, "multiset update requires integer-based numeric value (got {0})");
-            return true;
-          } else if (familyDeclName != null) {
-            ReportError(expr.tok, "update requires a sequence, map, or multiset (got {0})", e.Seq.PreType);
-            return true;
+            if (e.SelectOne) {
+              Contract.Assert(e.E0 != null);
+              Contract.Assert(e.E1 == null);
+              e.PreType = ResolveSingleSelectionExpr(e.Origin, e.Seq.PreType, e.E0);
+            } else {
+              ResolveRangeSelectionExpr(e.Origin, e.Seq.PreType, e, e.E0, e.E1);
+            }
+
+            break;
           }
-          return false;
-        });
-        expr.PreType = e.Seq.PreType;
-
-      } else if (expr is DatatypeUpdateExpr) {
-        var e = (DatatypeUpdateExpr)expr;
-        ResolveExpression(e.Root, resolutionContext);
-        expr.PreType = CreatePreTypeProxy("datatype update");
-        Constraints.AddGuardedConstraint(() => {
-          var (_, memberName, _) = e.Updates[0];
-          var (_, tentativeRootPreType) = FindMember(expr.tok, e.Root.PreType, memberName);
-          if (tentativeRootPreType != null) {
-            if (tentativeRootPreType.Decl is DatatypeDecl datatypeDecl) {
-              var (ghostLet, compiledLet) = ResolveDatatypeUpdate(expr.tok, tentativeRootPreType, e.Root, datatypeDecl, e.Updates,
-                resolutionContext, out var members, out var legalSourceConstructors);
-              // if 'let' returns as 'null', an error has already been reported
-              if (ghostLet != null) {
-                e.ResolvedExpression = ghostLet;
-                e.ResolvedCompiledExpression = compiledLet;
-                e.Members = members;
-                e.LegalSourceConstructors = legalSourceConstructors;
-                Constraints.AddEqualityConstraint(expr.PreType, ghostLet.PreType, expr.tok,
-                  "result of datatype update expression of type '{1}' is used as if it were of type '{0}'");
+        case MultiSelectExpr selectExpr: {
+            var e = selectExpr;
+
+            ResolveExpression(e.Array, resolutionContext);
+            var elementPreType = CreatePreTypeProxy("multi-dim array select");
+            var arrayPreType = BuiltInArrayType(e.Indices.Count, elementPreType);
+            AddSubtypeConstraint(arrayPreType, e.Array.PreType, e.Array.Origin, "array selection requires an {0} (got {1})");
+            int i = 0;
+            foreach (var indexExpression in e.Indices) {
+              ResolveExpression(indexExpression, resolutionContext);
+              ConstrainToIntFamilyOrBitvector(indexExpression.PreType, indexExpression.Origin,
+                "array selection requires integer- or bitvector-based numeric indices (got {0} for index " + i + ")");
+              i++;
+            }
+            e.PreType = elementPreType;
+            break;
+          }
+        case SeqUpdateExpr updateExpr: {
+            var e = updateExpr;
+            ResolveExpression(e.Seq, resolutionContext);
+            ResolveExpression(e.Index, resolutionContext);
+            ResolveExpression(e.Value, resolutionContext);
+            Constraints.AddGuardedConstraint(() => {
+              var ancestorPreType = e.Seq.PreType.NormalizeWrtScope() is not DPreType sourcePreType ? null : AncestorPreType(sourcePreType);
+              var familyDeclName = ancestorPreType?.Decl.Name;
+              if (familyDeclName == PreType.TypeNameSeq) {
+                var elementPreType = ancestorPreType.Arguments[0];
+                ConstrainToIntFamilyOrBitvector(e.Index.PreType, e.Index.Origin, "sequence update requires integer- or bitvector-based index (got {1})");
+                AddSubtypeConstraint(elementPreType, e.Value.PreType, e.Value.Origin,
+                  "sequence update requires the value to have the element type of the sequence (got {1})");
+                return true;
+              } else if (familyDeclName is PreType.TypeNameMap or PreType.TypeNameImap) {
+                var domainPreType = ancestorPreType.Arguments[0];
+                var rangePreType = ancestorPreType.Arguments[1];
+                AddSubtypeConstraint(domainPreType, e.Index.PreType, e.Index.Origin,
+                  familyDeclName + " update requires domain element to be of type {0} (got {1})");
+                AddSubtypeConstraint(rangePreType, e.Value.PreType, e.Value.Origin,
+                  familyDeclName + " update requires the value to have the range type {0} (got {1})");
+                return true;
+              } else if (familyDeclName == PreType.TypeNameMultiset) {
+                var elementPreType = ancestorPreType.Arguments[0];
+                AddSubtypeConstraint(elementPreType, e.Index.PreType, e.Index.Origin,
+                  "multiset update requires domain element to be of type {0} (got {1})");
+                ConstrainToIntFamily(e.Value.PreType, e.Value.Origin, "multiset update requires integer-based numeric value (got {0})");
+                return true;
+              } else if (familyDeclName != null) {
+                ReportError(expr.Origin, "update requires a sequence, map, or multiset (got {0})", e.Seq.PreType);
+                return true;
               }
-            } else {
-              ReportError(expr, "datatype update expression requires a root expression of a datatype (got {0})", tentativeRootPreType);
+              return false;
+            });
+
+            updateExpr.PreType = CreatePreTypeProxy("result of _[_:=_]");
+            AddSubtypeConstraint(updateExpr.PreType, e.Seq.PreType, e.Origin,
+              $"result of update expression must agree with the source type ({{0}})");
+            break;
+          }
+        case DatatypeUpdateExpr datatypeUpdateExpr: {
+            var e = datatypeUpdateExpr;
+            // Resolve the root and all the updated-value expressions, since these may require lookups in the current local-variable scope
+            ResolveExpression(e.Root, resolutionContext);
+            datatypeUpdateExpr.PreType = CreatePreTypeProxy("datatype update");
+            foreach (var (_, _, updateExpr) in e.Updates) {
+              ResolveExpression(updateExpr, resolutionContext);
             }
-            return true;
+            //e.ResolvedExpression = e;
+            // Next, at a leisurely pace (that is, waiting until enough of the pre-type of .Root is known), resolve the update expression
+            // and desugar it into some kind of nested let expression.
+            Constraints.AddGuardedConstraint(() => {
+              if (e.Root.PreType.NormalizeWrtScope() is DPreType tentativeRootPreType) {
+                if (tentativeRootPreType.Decl is DatatypeDecl datatypeDecl) {
+                  var (ghostLet, compiledLet) = ResolveDatatypeUpdate(expr.Origin, tentativeRootPreType, e.Root, datatypeDecl, e.Updates,
+                    resolutionContext, out var members, out var legalSourceConstructors);
+                  // if 'let' returns as 'null', an error has already been reported
+                  if (ghostLet != null) {
+                    e.ResolvedExpression = ghostLet;
+                    e.ResolvedCompiledExpression = compiledLet;
+                    e.Members = members;
+                    e.LegalSourceConstructors = legalSourceConstructors;
+                    Constraints.AddEqualityConstraint(expr.PreType, ghostLet.PreType, expr.Origin,
+                      "result of datatype update expression of type '{1}' is used as if it were of type '{0}'");
+                    if (ghostLet != compiledLet) {
+                      Constraints.AddEqualityConstraint(expr.PreType, compiledLet.PreType, expr.Origin,
+                        "result of datatype update expression of type '{1}' is used as if it were of type '{0}'");
+                    }
+                  }
+                } else {
+                  ReportError(expr, "datatype update expression requires a root expression of a datatype (got {0})", tentativeRootPreType);
+                }
+                return true;
+              }
+              return false;
+            });
+            break;
           }
-          return false;
-        });
-
-      } else if (expr is FunctionCallExpr) {
-        var e = (FunctionCallExpr)expr;
-        Contract.Assert(false); // this case is always handled by ResolveExprDotCall
-#if PROBABLY_NEVER
-        ResolveFunctionCallExpr(e, resolutionContext);
-#endif
-
-      } else if (expr is ApplyExpr) {
-        var e = (ApplyExpr)expr;
-        ResolveExpression(e.Function, resolutionContext);
-        foreach (var arg in e.Args) {
-          ResolveExpression(arg, resolutionContext);
-        }
-        expr.PreType = CreatePreTypeProxy("apply expression result");
+        case FunctionCallExpr:
+          Contract.Assert(false); // this case is always handled by ResolveExprDotCall
+          break;
+        case ApplyExpr applyExpr: {
+            var e = applyExpr;
+            ResolveExpression(e.Function, resolutionContext);
+            foreach (var arg in e.Args) {
+              ResolveExpression(arg, resolutionContext);
+            }
+            applyExpr.PreType = CreatePreTypeProxy("apply expression result");
 
-        Constraints.AddGuardedConstraint(() => {
-          if (e.Function.PreType.Normalize() is DPreType dp) {
-            if (!DPreType.IsArrowType(dp.Decl)) {
-              ReportError(e.tok, "non-function expression (of type {0}) is called with parameters", e.Function.PreType);
-            } else {
-              var arity = dp.Decl.TypeArgs.Count - 1;
-              if (arity != e.Args.Count) {
-                ReportError(e.tok,
-                  "wrong number of arguments to function application (function type '{0}' expects {1}, got {2})", e.Function.PreType,
-                  arity, e.Args.Count);
-              } else {
-                for (var i = 0; i < arity; i++) {
-                  AddSubtypeConstraint(dp.Arguments[i], e.Args[i].PreType, e.Args[i].tok,
-                    "type mismatch for argument" + (arity == 1 ? "" : " " + i) + " (function expects {0}, got {1})");
+            Constraints.AddGuardedConstraint(() => {
+              if (e.Function.PreType.NormalizeWrtScope() is DPreType dp) {
+                if (!DPreType.IsArrowType(dp.Decl)) {
+                  ReportError(e.Origin, "non-function expression (of type {0}) is called with parameters", e.Function.PreType);
+                } else {
+                  var arity = dp.Decl.TypeArgs.Count - 1;
+                  if (arity != e.Args.Count) {
+                    ReportError(e.Origin,
+                      "wrong number of arguments to function application (function type '{0}' expects {1}, got {2})", e.Function.PreType,
+                      arity, e.Args.Count);
+                  } else {
+                    for (var i = 0; i < arity; i++) {
+                      AddSubtypeConstraint(dp.Arguments[i], e.Args[i].PreType, e.Args[i].Origin,
+                        "type mismatch for argument" + (arity == 1 ? "" : " " + i) + " (function expects {0}, got {1})");
+                    }
+                    AddSubtypeConstraint(expr.PreType, dp.Arguments[arity], expr.Origin, "function result '{1}' used as if it had type '{0}'");
+                  }
+                }
+                return true;
+              }
+              return false;
+            });
+            break;
+          }
+        case SeqConstructionExpr constructionExpr: {
+            var e = constructionExpr;
+            var elementType = e.ExplicitElementType ?? new InferredTypeProxy();
+            resolver.ResolveType(e.Origin, elementType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+            var elementPreType = Type2PreType(elementType);
+            ResolveExpression(e.N, resolutionContext);
+            ConstrainToIntFamily(e.N.PreType, e.N.Origin, "sequence construction must use an integer-based expression for the sequence size (got {0})");
+            ResolveExpression(e.Initializer, resolutionContext);
+            var intPreType = Type2PreType(resolver.SystemModuleManager.Nat());
+            var arrowPreType = new DPreType(BuiltInArrowTypeDecl(1), new List<PreType>() { intPreType, elementPreType });
+            Constraints.AddSubtypeConstraint(arrowPreType, e.Initializer.PreType, e.Initializer.Origin,
+              () => {
+                var strFormat = "sequence-construction initializer expression expected to have type '{0}' (instead got '{1}')";
+                if (PreType.Same(elementPreType, e.Initializer.PreType)) {
+                  var hintString = " (perhaps write '_ =>' in front of the expression you gave in order to make it an arrow type)";
+                  strFormat += hintString;
+                }
+                return strFormat;
+              });
+            ResolveCollectionProducingExpr(PreType.TypeNameSeq, "constructor", constructionExpr, elementPreType, PreTypeConstraints.CommonConfirmationBag.InSeqFamily);
+            break;
+          }
+        case MultiSetFormingExpr formingExpr: {
+            var e = formingExpr;
+            ResolveExpression(e.E, resolutionContext);
+            var targetElementPreType = CreatePreTypeProxy("multiset conversion element type");
+            Constraints.AddGuardedConstraint(() => {
+              if (e.E.PreType.NormalizeWrtScope() is DPreType dp) {
+                var familyDeclName = AncestorName(dp);
+                if (familyDeclName is PreType.TypeNameSet or PreType.TypeNameSeq && AncestorPreType(dp) is { } ancestorPreType) {
+                  Contract.Assert(ancestorPreType.Arguments.Count == 1);
+                  var sourceElementPreType = ancestorPreType.Arguments[0];
+                  AddSubtypeConstraint(targetElementPreType, sourceElementPreType, e.E.Origin, "expecting element type {0} (got {1})");
+                } else {
+                  ReportError(e.E.Origin, "can only form a multiset from a seq or set (got {0})", e.E.PreType);
                 }
-                AddSubtypeConstraint(expr.PreType, dp.Arguments[arity], expr.tok, "function result '{1}' used as if it had type '{0}'");
+                return true;
               }
+              return false;
+            });
+            ResolveCollectionProducingExpr(PreType.TypeNameMultiset, "conversion", formingExpr, targetElementPreType,
+              PreTypeConstraints.CommonConfirmationBag.InMultisetFamily);
+            break;
+          }
+        case OldExpr oldExpr: {
+            var e = oldExpr;
+            e.AtLabel = ResolveDominatingLabelInExpr(oldExpr.Origin, e.At, "old", resolutionContext);
+            ResolveExpression(e.E, new ResolutionContext(resolutionContext.CodeContext, false) with { InOld = true });
+            oldExpr.PreType = e.E.PreType;
+            break;
+          }
+        case UnchangedExpr unchangedExpr: {
+            var e = unchangedExpr;
+            e.AtLabel = ResolveDominatingLabelInExpr(unchangedExpr.Origin, e.At, "unchanged", resolutionContext);
+            foreach (var fe in e.Frame) {
+              ResolveFrameExpression(fe, FrameExpressionUse.Unchanged, resolutionContext.CodeContext);
             }
-            return true;
+            ConstrainTypeExprBool(e, "result of 'unchanged' is boolean, but is used as if it had type {0}");
+            break;
           }
-          return false;
-        });
-
-      } else if (expr is SeqConstructionExpr) {
-        var e = (SeqConstructionExpr)expr;
-        var elementType = e.ExplicitElementType ?? new InferredTypeProxy();
-        resolver.ResolveType(e.tok, elementType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-        var elementPreType = Type2PreType(elementType);
-        ResolveExpression(e.N, resolutionContext);
-        ConstrainToIntFamily(e.N.PreType, e.N.tok, "sequence construction must use an integer-based expression for the sequence size (got {0})");
-        ResolveExpression(e.Initializer, resolutionContext);
-        var intPreType = Type2PreType(resolver.SystemModuleManager.Nat());
-        var arrowPreType = new DPreType(BuiltInArrowTypeDecl(1), new List<PreType>() { intPreType, elementPreType });
-        var resultPreType = new DPreType(BuiltInTypeDecl("seq"), new List<PreType>() { elementPreType });
-        Constraints.AddSubtypeConstraint(arrowPreType, e.Initializer.PreType, e.Initializer.tok,
-          () => {
-            var strFormat = "sequence-construction initializer expression expected to have type '{0}' (instead got '{1}')";
-            if (PreType.Same(elementPreType, e.Initializer.PreType)) {
-              var hintString = " (perhaps write '_ =>' in front of the expression you gave in order to make it an arrow type)";
-              strFormat += hintString;
+        case FreshExpr freshExpr: {
+            var e = freshExpr;
+            ResolveExpression(e.E, resolutionContext);
+            e.AtLabel = ResolveDominatingLabelInExpr(freshExpr.Origin, e.At, "fresh", resolutionContext);
+            // the type of e.E must be either an object or a set/seq of objects
+            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.Freshable, e.E.PreType, e.E.Origin, "the argument of a fresh expression must denote an object or a set or sequence of objects (instead got {0})");
+            ConstrainTypeExprBool(e, "result of 'fresh' is boolean, but is used as if it had type {0}");
+            break;
+          }
+        case UnaryOpExpr opExpr: {
+            var e = opExpr;
+            ResolveExpression(e.E, resolutionContext);
+            switch (e.Op) {
+              case UnaryOpExpr.Opcode.Not:
+                AddConfirmation(PreTypeConstraints.CommonConfirmationBag.BooleanBits, e.E.PreType, opExpr.Origin, "logical/bitwise negation expects a boolean or bitvector argument (instead got {0})");
+                opExpr.PreType = e.E.PreType;
+                Constraints.AddDefaultAdvice(e.PreType, CommonAdvice.Target.Bool);
+                break;
+              case UnaryOpExpr.Opcode.Cardinality:
+                AddConfirmation(PreTypeConstraints.CommonConfirmationBag.Sizeable, e.E.PreType, opExpr.Origin, "size operator expects a collection argument (instead got {0})");
+                opExpr.PreType = CreatePreTypeProxy("cardinality");
+                ConstrainToIntFamily(opExpr.PreType, opExpr.Origin, "integer literal used as if it had type {0}");
+                break;
+              case UnaryOpExpr.Opcode.Allocated:
+                // the argument is allowed to have any type at all
+                opExpr.PreType = ConstrainResultToBoolFamily(opExpr.Origin, "allocated", "boolean literal used as if it had type {0}");
+                if ((resolutionContext.CodeContext is Function && !resolutionContext.InOld) ||
+                    resolutionContext.CodeContext is ConstantField ||
+                    CodeContextWrapper.Unwrap(resolutionContext.CodeContext) is RedirectingTypeDecl) {
+                  var declKind = CodeContextWrapper.Unwrap(resolutionContext.CodeContext) is RedirectingTypeDecl redir
+                    ? redir.WhatKind
+                    : ((MemberDecl)resolutionContext.CodeContext).WhatKind;
+                  ReportError(opExpr, "a {0} definition is not allowed to depend on the set of allocated references", declKind);
+                }
+                break;
+              case UnaryOpExpr.Opcode.Assigned:
+                // the argument is allowed to have any type at all
+                expr.PreType = ConstrainResultToBoolFamily(expr.Origin, "assigned", "boolean literal used as if it had type {0}");
+                break;
+              default:
+                Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary operator
             }
-            return strFormat;
-          });
-        expr.PreType = resultPreType;
-
-      } else if (expr is MultiSetFormingExpr) {
-        var e = (MultiSetFormingExpr)expr;
-        ResolveExpression(e.E, resolutionContext);
-        var targetElementPreType = CreatePreTypeProxy("multiset conversion element type");
-        Constraints.AddGuardedConstraint(() => {
-          if (e.E.PreType.Normalize() is DPreType dp) {
-            if (dp.Decl.Name == "set" || dp.Decl.Name == "seq") {
-              Contract.Assert(dp.Arguments.Count == 1);
-              var sourceElementPreType = dp.Arguments[0];
-              AddSubtypeConstraint(targetElementPreType, sourceElementPreType, e.E.tok, "expecting element type {0} (got {1})");
+
+            break;
+          }
+        case ConversionExpr conversionExpr: {
+            var e = conversionExpr;
+            ResolveExpression(e.E, resolutionContext);
+            var prevErrorCount = ErrorCount;
+            resolver.ResolveType(e.Origin, e.ToType, resolutionContext, new ModuleResolver.ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null);
+            if (ErrorCount == prevErrorCount) {
+              var toPreType = Type2PreType(e.ToType);
+              var errorMessage = () => {
+                string errorMessageFormat;
+                if (toPreType.Normalize() is DPreType dtoPreType && AncestorPreType(dtoPreType)?.Decl is { } ancestorDecl) {
+                  var familyDeclName = ancestorDecl.Name;
+                  if (familyDeclName == PreType.TypeNameInt) {
+                    errorMessageFormat = "type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {1})";
+                  } else if (familyDeclName == PreType.TypeNameReal) {
+                    errorMessageFormat = "type conversion to a real-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {1})";
+                  } else if (IsBitvectorName(familyDeclName)) {
+                    errorMessageFormat = "type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {1})";
+                  } else if (familyDeclName == PreType.TypeNameChar) {
+                    errorMessageFormat = "type conversion to a char type is allowed only from numeric and bitvector types, char, and ORDINAL (got {1})";
+                  } else if (familyDeclName == PreType.TypeNameORDINAL) {
+                    errorMessageFormat = "type conversion to an ORDINAL type is allowed only from numeric and bitvector types, char, and ORDINAL (got {1})";
+                  } else if (DPreType.IsReferenceTypeDecl(ancestorDecl)) {
+                    errorMessageFormat = "type cast to reference type '{0}' must be from an expression of a compatible type (got '{1}')";
+                  } else if (ancestorDecl is TraitDecl) {
+                    errorMessageFormat = "type cast to trait type '{0}' must be from an expression of a compatible type (got '{1}')";
+                  } else {
+                    errorMessageFormat = "type cast to type '{0}' must be from an expression of a compatible type (got '{1}')";
+                  }
+                } else {
+                  errorMessageFormat = "type conversion target type not determined (got '{0}')";
+                }
+                return string.Format(errorMessageFormat, toPreType, e.E.PreType);
+              };
+              AddComparableConstraint(toPreType, e.E.PreType, expr.Origin, true, errorMessage);
+              e.PreType = toPreType;
             } else {
-              ReportError(e.E.tok, "can only form a multiset from a seq or set (got {0})", e.E.PreType);
+              e.PreType = CreatePreTypeProxy("'as' target type");
             }
-            return true;
+
+            break;
           }
-          return false;
-        });
-        expr.PreType = new DPreType(BuiltInTypeDecl("multiset"), new List<PreType>() { targetElementPreType });
-
-      } else if (expr is OldExpr) {
-        var e = (OldExpr)expr;
-        e.AtLabel = ResolveDominatingLabelInExpr(expr.tok, e.At, "old", resolutionContext);
-        ResolveExpression(e.E, new ResolutionContext(resolutionContext.CodeContext, false) with { InOld = true });
-        expr.PreType = e.E.PreType;
-
-      } else if (expr is UnchangedExpr) {
-        var e = (UnchangedExpr)expr;
-        e.AtLabel = ResolveDominatingLabelInExpr(expr.tok, e.At, "unchanged", resolutionContext);
-        foreach (var fe in e.Frame) {
-          ResolveFrameExpression(fe, FrameExpressionUse.Unchanged, resolutionContext.CodeContext);
-        }
-        ConstrainTypeExprBool(e, "result of 'unchanged' is boolean, but is used as if it had type {0}");
-
-      } else if (expr is FreshExpr) {
-        var e = (FreshExpr)expr;
-        ResolveExpression(e.E, resolutionContext);
-        e.AtLabel = ResolveDominatingLabelInExpr(expr.tok, e.At, "fresh", resolutionContext);
-        // the type of e.E must be either an object or a set/seq of objects
-        AddConfirmation(PreTypeConstraints.CommonConfirmationBag.Freshable, e.E.PreType, e.E.tok, "the argument of a fresh expression must denote an object or a set or sequence of objects (instead got {0})");
-        ConstrainTypeExprBool(e, "result of 'fresh' is boolean, but is used as if it had type {0}");
-
-      } else if (expr is UnaryOpExpr) {
-        var e = (UnaryOpExpr)expr;
-        ResolveExpression(e.E, resolutionContext);
-        switch (e.Op) {
-          case UnaryOpExpr.Opcode.Not:
-            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.BooleanBits, e.E.PreType, expr.tok, "logical/bitwise negation expects a boolean or bitvector argument (instead got {0})");
-            expr.PreType = e.E.PreType;
+        case TypeTestExpr testExpr: {
+            var e = testExpr;
+            ResolveExpression(e.E, resolutionContext);
+            testExpr.PreType = ConstrainResultToBoolFamilyOperator(testExpr.Origin, "is");
+            resolver.ResolveType(e.Origin, e.ToType, resolutionContext, new ModuleResolver.ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null);
+            var toPreType = Type2PreType(e.ToType);
+            AddComparableConstraint(toPreType, e.E.PreType, testExpr.Origin, true,
+              "type test for type '{0}' must be from an expression assignable to it (got '{1}')");
             break;
-          case UnaryOpExpr.Opcode.Cardinality:
-            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.Sizeable, e.E.PreType, expr.tok, "size operator expects a collection argument (instead got {0})");
-            expr.PreType = CreatePreTypeProxy("cardinality");
-            ConstrainToIntFamily(expr.PreType, expr.tok, "integer literal used as if it had type {0}");
+          }
+        case BinaryExpr binaryExpr: {
+            var e = binaryExpr;
+            ResolveExpression(e.E0, resolutionContext);
+            ResolveExpression(e.E1, resolutionContext);
+            binaryExpr.PreType = ResolveBinaryExpr(e.Origin, e.Op, e.E0, e.E1, resolutionContext);
             break;
-          case UnaryOpExpr.Opcode.Allocated:
-            // the argument is allowed to have any type at all
-            expr.PreType = ConstrainResultToBoolFamily(expr.tok, "allocated", "boolean literal used as if it had type {0}");
-            if ((resolutionContext.CodeContext is Function && !resolutionContext.InOld) ||
-                resolutionContext.CodeContext is ConstantField ||
-                CodeContextWrapper.Unwrap(resolutionContext.CodeContext) is RedirectingTypeDecl) {
-              var declKind = CodeContextWrapper.Unwrap(resolutionContext.CodeContext) is RedirectingTypeDecl redir
-                ? redir.WhatKind
-                : ((MemberDecl)resolutionContext.CodeContext).WhatKind;
-              ReportError(expr, "a {0} definition is not allowed to depend on the set of allocated references", declKind);
+          }
+        case TernaryExpr ternaryExpr: {
+            var e = ternaryExpr;
+            ResolveExpression(e.E0, resolutionContext);
+            ResolveExpression(e.E1, resolutionContext);
+            ResolveExpression(e.E2, resolutionContext);
+            switch (e.Op) {
+              case TernaryExpr.Opcode.PrefixEqOp:
+              case TernaryExpr.Opcode.PrefixNeqOp:
+                ternaryExpr.PreType = ConstrainResultToBoolFamily(ternaryExpr.Origin, "ternary op", "boolean literal used as if it had type {0}");
+                AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IntOrORDINAL, e.E0.PreType, ternaryExpr.Origin, "prefix-equality limit argument must be an ORDINAL or integer expression (got {0})");
+                AddComparableConstraint(e.E1.PreType, e.E2.PreType, ternaryExpr.Origin, false,
+                  "arguments must have the same type (got {0} and {1})");
+                AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IsCoDatatype, e.E1.PreType, ternaryExpr.Origin, "arguments to prefix equality must be codatatypes (instead of {0})");
+                break;
+              default:
+                Contract.Assert(false);  // unexpected ternary operator
+                break;
             }
-            break;
-          default:
-            Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary operator
-        }
 
-      } else if (expr is ConversionExpr) {
-        var e = (ConversionExpr)expr;
-        ResolveExpression(e.E, resolutionContext);
-        var prevErrorCount = ErrorCount;
-        resolver.ResolveType(e.tok, e.ToType, resolutionContext, new ModuleResolver.ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null);
-        if (ErrorCount == prevErrorCount) {
-          var toPreType = (DPreType)Type2PreType(e.ToType);
-          var ancestorDecl = AncestorDecl(toPreType.Decl);
-          var familyDeclName = ancestorDecl.Name;
-          if (familyDeclName == "int") {
-            Constraints.AddConfirmation(PreTypeConstraints.CommonConfirmationBag.NumericOrBitvectorOrCharOrORDINALOrSuchTrait, e.E.PreType, e.ToType, expr.tok,
-              "type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
-          } else if (familyDeclName == "real") {
-            Constraints.AddConfirmation(PreTypeConstraints.CommonConfirmationBag.NumericOrBitvectorOrCharOrORDINALOrSuchTrait, e.E.PreType, e.ToType, expr.tok,
-              "type conversion to a real-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
-          } else if (IsBitvectorName(familyDeclName)) {
-            Constraints.AddConfirmation(PreTypeConstraints.CommonConfirmationBag.NumericOrBitvectorOrCharOrORDINALOrSuchTrait, e.E.PreType, e.ToType, expr.tok,
-              "type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
-          } else if (familyDeclName == "char") {
-            Constraints.AddConfirmation(PreTypeConstraints.CommonConfirmationBag.NumericOrBitvectorOrCharOrORDINALOrSuchTrait, e.E.PreType, e.ToType, expr.tok,
-              "type conversion to a char type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
-          } else if (familyDeclName == "ORDINAL") {
-            Constraints.AddConfirmation(PreTypeConstraints.CommonConfirmationBag.NumericOrBitvectorOrCharOrORDINALOrSuchTrait, e.E.PreType, e.ToType, expr.tok,
-              "type conversion to an ORDINAL type is allowed only from numeric and bitvector types, char, and ORDINAL (got {0})");
-          } else if (DPreType.IsReferenceTypeDecl(ancestorDecl)) {
-            AddComparableConstraint(toPreType, e.E.PreType, expr.tok,
-              "type cast to reference type '{0}' must be from an expression assignable to it (got '{1}')");
-          } else if (ancestorDecl is TraitDecl) {
-            AddComparableConstraint(toPreType, e.E.PreType, expr.tok,
-              "type cast to trait type '{0}' must be from an expression assignable to it (got '{1}')");
-          } else {
-            AddComparableConstraint(toPreType, e.E.PreType, expr.tok,
-              "type cast to type '{0}' must be from an expression assignable to it (got '{1}')");
+            break;
           }
-          e.PreType = toPreType;
-        } else {
-          e.PreType = CreatePreTypeProxy("'as' target type");
-        }
+        case LetExpr letExpr: {
+            var e = letExpr;
+            if (e.Exact) {
+              foreach (var bv in e.BoundVars) {
+                int prevErrorCount = ErrorCount;
+                resolver.ResolveType(bv.Origin, bv.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+                bv.PreType = Type2PreType(bv.Type);
+              }
+              foreach (var rhs in e.RHSs) {
+                ResolveExpression(rhs, resolutionContext);
+              }
+              scope.PushMarker();
+              if (e.LHSs.Count != e.RHSs.Count) {
+                ReportError(letExpr, "let expression must have same number of LHSs (found {0}) as RHSs (found {1})", e.LHSs.Count, e.RHSs.Count);
+              }
+              var i = 0;
+              foreach (var lhs in e.LHSs) {
+                var rhsPreType = i < e.RHSs.Count ? e.RHSs[i].PreType : CreatePreTypeProxy("let RHS");
+                ResolveCasePattern(lhs, rhsPreType, resolutionContext);
+                // Check for duplicate names now, because not until after resolving the case pattern do we know if identifiers inside it refer to bound variables or nullary constructors
+                var c = 0;
+                foreach (var v in lhs.Vars) {
+                  ScopePushAndReport(v, "let-variable", false); // .PreType's already assigned by ResolveCasePattern
+                  c++;
+                }
+                if (c == 0) {
+                  // Every identifier-looking thing in the pattern resolved to a constructor; that is, this LHS is a constant literal
+                  ReportError(lhs.Origin, "LHS is a constant literal; to be legal, it must introduce at least one bound variable");
+                }
+                i++;
+              }
+            } else {
+              // let-such-that expression
+              if (e.RHSs.Count != 1) {
+                ReportError(letExpr, "let-such-that expression must have just one RHS (found {0})", e.RHSs.Count);
+              }
+              // the bound variables are in scope in the RHS of a let-such-that expression
+              scope.PushMarker();
+              foreach (var lhs in e.LHSs) {
+                Contract.Assert(lhs.Var != null);  // the parser already checked that every LHS is a BoundVar, not a general pattern
+                var v = lhs.Var;
+                resolver.ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+                v.PreType = Type2PreType(v.Type);
+                ScopePushAndReport(v, "let-variable", false);
+                lhs.AssembleExprPreType(null);
+              }
+              foreach (var rhs in e.RHSs) {
+                ResolveExpression(rhs, resolutionContext);
+                ConstrainExpressionToBoolFamily(rhs, "type of RHS of let-such-that expression must be boolean (got {0})");
+              }
+            }
+            ResolveExpression(e.Body, resolutionContext);
+            ResolveAttributes(e, resolutionContext, false);
+            scope.PopMarker();
+            letExpr.PreType = e.Body.PreType;
+            break;
+          }
+        case LetOrFailExpr failExpr: {
+            var e = failExpr;
+            e.ResolvedExpression = DesugarElephantExpr(e, resolutionContext);
+            ResolveExpression(e.ResolvedExpression, resolutionContext);
+            e.PreType = e.ResolvedExpression.PreType;
+            Constraints.AddGuardedConstraint(() => {
+              if (e.Rhs.PreType.NormalizeWrtScope() is DPreType receiverPreType) {
+                bool expectExtract = e.Lhs != null;
+                EnsureSupportsErrorHandling(e.Origin, receiverPreType, expectExtract, resolutionContext, null);
+                return true;
+              }
+              return false;
+            });
+            break;
+          }
+        case QuantifierExpr quantifierExpr: {
+            var e = quantifierExpr;
+            if (resolutionContext.CodeContext is Function enclosingFunction) {
+              enclosingFunction.ContainsQuantifier = true;
+            }
+            Contract.Assert(e.SplitQuantifier == null); // No split quantifiers during resolution
+            scope.PushMarker();
+            foreach (var v in e.BoundVars) {
+              resolver.ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+              ScopePushAndReport(v, "bound-variable", true);
+            }
+            if (e.Range != null) {
+              ResolveExpression(e.Range, resolutionContext);
+              ConstrainTypeExprBool(e.Range, "range of quantifier must be of type bool (instead got {0})");
+            }
+            ResolveExpression(e.Term, resolutionContext);
+            ConstrainTypeExprBool(e.Term, "body of quantifier must be of type bool (instead got {0})");
+            // Since the body is more likely to infer the types of the bound variables, resolve it
+            // first (above) and only then resolve the attributes (below).
+            ResolveAttributes(e, resolutionContext, false);
+            scope.PopMarker();
+            quantifierExpr.PreType = ConstrainResultToBoolFamilyOperator(quantifierExpr.Origin, e.WhatKind);
+            break;
+          }
+        case SetComprehension comprehension: {
+            var e = comprehension;
+            scope.PushMarker();
+            foreach (var v in e.BoundVars) {
+              resolver.ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+              ScopePushAndReport(v, "bound-variable", true);
+            }
+            ResolveExpression(e.Range, resolutionContext);
+            ConstrainTypeExprBool(e.Range, "range of comprehension must be of type bool (instead got {0})");
+            ResolveExpression(e.Term, resolutionContext);
+
+            ResolveAttributes(e, resolutionContext, false);
+            scope.PopMarker();
 
-      } else if (expr is TypeTestExpr) {
-        var e = (TypeTestExpr)expr;
-        ResolveExpression(e.E, resolutionContext);
-        expr.PreType = ConstrainResultToBoolFamilyOperator(expr.tok, "is");
-        resolver.ResolveType(e.tok, e.ToType, resolutionContext, new ModuleResolver.ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null);
-        var toPreType = Type2PreType(e.ToType);
-        AddComparableConstraint(toPreType, e.E.PreType, expr.tok, "type test for type '{0}' must be from an expression assignable to it (got '{1}')");
-        Constraints.AddConfirmation(() => {
-          // TODO: all of these tests should be revisited (they don't seem right in the presence of newtype's)
-          var fromPT = e.E.PreType.Normalize() as DPreType;
-          var toPT = toPreType.Normalize() as DPreType;
-          if (fromPT != null && toPT != null && IsSuperPreTypeOf(toPT, fromPT)) {
-            // This test is allowed and it always returns true
-          } else if (fromPT == null || toPT == null || !IsSuperPreTypeOf(fromPT, toPT)) {
-            // TODO: I think this line can never be reached, since we get here only if we get past the guarded Comparable constraint
-            ReportError(e.tok, "a type test to '{0}' must be from a compatible type (got '{1}')", toPreType, e.E.PreType);
-          }
-        });
-
-      } else if (expr is BinaryExpr) {
-        var e = (BinaryExpr)expr;
-        ResolveExpression(e.E0, resolutionContext);
-        ResolveExpression(e.E1, resolutionContext);
-        expr.PreType = ResolveBinaryExpr(e.tok, e.Op, e.E0, e.E1, resolutionContext);
-
-      } else if (expr is TernaryExpr) {
-        var e = (TernaryExpr)expr;
-        ResolveExpression(e.E0, resolutionContext);
-        ResolveExpression(e.E1, resolutionContext);
-        ResolveExpression(e.E2, resolutionContext);
-        switch (e.Op) {
-          case TernaryExpr.Opcode.PrefixEqOp:
-          case TernaryExpr.Opcode.PrefixNeqOp:
-            expr.PreType = ConstrainResultToBoolFamily(expr.tok, "ternary op", "boolean literal used as if it had type {0}");
-            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IntOrORDINAL, e.E0.PreType, expr.tok, "prefix-equality limit argument must be an ORDINAL or integer expression (got {0})");
-            AddComparableConstraint(e.E1.PreType, e.E2.PreType, expr.tok, "arguments must have the same type (got {0} and {1})");
-            AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IsCoDatatype, e.E1.PreType, expr.tok, "arguments to prefix equality must be codatatypes (instead of {0})");
+            ResolveCollectionProducingExpr(PreType.SetTypeName(e.Finite), "comprehension", comprehension, e.Term.PreType,
+              e.Finite ? PreTypeConstraints.CommonConfirmationBag.InSetFamily : PreTypeConstraints.CommonConfirmationBag.InIsetFamily);
             break;
-          default:
-            Contract.Assert(false);  // unexpected ternary operator
+          }
+        case MapComprehension comprehension: {
+            var e = comprehension;
+            scope.PushMarker();
+            Contract.Assert(e.BoundVars.Count == 1 || (1 < e.BoundVars.Count && e.TermLeft != null));
+            foreach (BoundVar v in e.BoundVars) {
+              resolver.ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+              ScopePushAndReport(v, "bound-variable", true);
+            }
+            ResolveExpression(e.Range, resolutionContext);
+            ConstrainTypeExprBool(e.Range, "range of comprehension must be of type bool (instead got {0})");
+            if (e.TermLeft != null) {
+              ResolveExpression(e.TermLeft, resolutionContext);
+            }
+            ResolveExpression(e.Term, resolutionContext);
+
+            ResolveAttributes(e, resolutionContext, false);
+            scope.PopMarker();
+
+            ResolveMapProducingExpr(e.Finite, "comprehension", comprehension, e.TermLeft?.PreType ?? e.BoundVars[0].PreType, e.Term.PreType);
             break;
-        }
+          }
+        case LambdaExpr lambdaExpr: {
+            var e = lambdaExpr;
+            scope.PushMarker();
+            foreach (var v in e.BoundVars) {
+              resolver.ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+              ScopePushAndReport(v, "bound-variable", true);
+            }
 
-      } else if (expr is LetExpr) {
-        var e = (LetExpr)expr;
-        if (e.Exact) {
-          foreach (var bv in e.BoundVars) {
-            int prevErrorCount = ErrorCount;
-            resolver.ResolveType(bv.Tok, bv.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-            bv.PreType = Type2PreType(bv.Type);
-          }
-          foreach (var rhs in e.RHSs) {
-            ResolveExpression(rhs, resolutionContext);
-          }
-          scope.PushMarker();
-          if (e.LHSs.Count != e.RHSs.Count) {
-            ReportError(expr, "let expression must have same number of LHSs (found {0}) as RHSs (found {1})", e.LHSs.Count, e.RHSs.Count);
-          }
-          var i = 0;
-          foreach (var lhs in e.LHSs) {
-            var rhsPreType = i < e.RHSs.Count ? e.RHSs[i].PreType : CreatePreTypeProxy("let RHS");
-            ResolveCasePattern(lhs, rhsPreType, resolutionContext);
-            // Check for duplicate names now, because not until after resolving the case pattern do we know if identifiers inside it refer to bound variables or nullary constructors
-            var c = 0;
-            foreach (var v in lhs.Vars) {
-              ScopePushAndReport(v, "let-variable", false); // .PreType's already assigned by ResolveCasePattern
-              c++;
+            if (e.Range != null) {
+              ResolveExpression(e.Range, resolutionContext);
+              ConstrainTypeExprBool(e.Range, "precondition must be boolean (got {0})");
             }
-            if (c == 0) {
-              // Every identifier-looking thing in the pattern resolved to a constructor; that is, this LHS is a constant literal
-              ReportError(lhs.tok, "LHS is a constant literal; to be legal, it must introduce at least one bound variable");
+            foreach (var read in e.Reads.Expressions) {
+              ResolveFrameExpression(read, FrameExpressionUse.Reads, resolutionContext.CodeContext);
             }
-            i++;
+            ResolveExpression(e.Term, resolutionContext);
+            scope.PopMarker();
+            lambdaExpr.PreType = BuiltInArrowType(e.BoundVars.ConvertAll(v => v.PreType), e.Body.PreType);
+            break;
           }
-        } else {
-          // let-such-that expression
-          if (e.RHSs.Count != 1) {
-            ReportError(expr, "let-such-that expression must have just one RHS (found {0})", e.RHSs.Count);
-          }
-          // the bound variables are in scope in the RHS of a let-such-that expression
-          scope.PushMarker();
-          foreach (var lhs in e.LHSs) {
-            Contract.Assert(lhs.Var != null);  // the parser already checked that every LHS is a BoundVar, not a general pattern
-            var v = lhs.Var;
-            resolver.ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-            v.PreType = Type2PreType(v.Type);
-            ScopePushAndReport(v, "let-variable", false);
-            lhs.AssembleExprPreType(null);
-#if SOON
-            resolver.AddTypeDependencyEdges(resolutionContext, v.Type);
-#endif
-          }
-          foreach (var rhs in e.RHSs) {
-            ResolveExpression(rhs, resolutionContext);
-            rhs.PreType = ConstrainResultToBoolFamily(rhs.tok, "such-that constraint", "type of RHS of let-such-that expression must be boolean (got {0})");
+        case WildcardExpr: {
+            var obj = new DPreType(BuiltInTypeDecl(PreType.TypeNameObjectQ), new List<PreType>() { });
+            expr.PreType = new DPreType(BuiltInTypeDecl(PreType.TypeNameSet), new List<PreType>() { obj });
+            break;
           }
-        }
-        ResolveExpression(e.Body, resolutionContext);
-        ResolveAttributes(e, resolutionContext, false);
-        scope.PopMarker();
-        expr.PreType = e.Body.PreType;
-
-      } else if (expr is LetOrFailExpr) {
-        var e = (LetOrFailExpr)expr;
-        e.ResolvedExpression = DesugarElephantExpr(e, resolutionContext);
-        e.PreType = e.ResolvedExpression.PreType;
-        Constraints.AddGuardedConstraint(() => {
-          if (e.Rhs.PreType.Normalize() is DPreType receiverPreType) {
-            bool expectExtract = e.Lhs != null;
-            EnsureSupportsErrorHandling(e.tok, receiverPreType, expectExtract);
-            return true;
+        case StmtExpr stmtExpr: {
+            var e = stmtExpr;
+            int prevErrorCount = ErrorCount;
+            ResolveStatement(e.S, resolutionContext);
+            if (ErrorCount == prevErrorCount) {
+              if (e.S is AssignStatement updateStmt && updateStmt.ResolvedStatements.Count == 1) {
+                var call = (CallStmt)updateStmt.ResolvedStatements[0];
+                if (call.Method is TwoStateLemma && !resolutionContext.IsTwoState) {
+                  ReportError(call, "two-state lemmas can only be used in two-state contexts");
+                }
+              }
+            }
+            ResolveExpression(e.E, resolutionContext);
+            stmtExpr.PreType = e.E.PreType;
+            break;
           }
-          return false;
-        });
-
-      } else if (expr is QuantifierExpr) {
-        var e = (QuantifierExpr)expr;
-        if (resolutionContext.CodeContext is Function enclosingFunction) {
-          enclosingFunction.ContainsQuantifier = true;
-        }
-        Contract.Assert(e.SplitQuantifier == null); // No split quantifiers during resolution
-        scope.PushMarker();
-        foreach (var v in e.BoundVars) {
-          resolver.ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-          ScopePushAndReport(v, "bound-variable", true);
-        }
-        if (e.Range != null) {
-          ResolveExpression(e.Range, resolutionContext);
-          ConstrainTypeExprBool(e.Range, "range of quantifier must be of type bool (instead got {0})");
-        }
-        ResolveExpression(e.Term, resolutionContext);
-        ConstrainTypeExprBool(e.Term, "body of quantifier must be of type bool (instead got {0})");
-        // Since the body is more likely to infer the types of the bound variables, resolve it
-        // first (above) and only then resolve the attributes (below).
-        ResolveAttributes(e, resolutionContext, false);
-        scope.PopMarker();
-        expr.PreType = ConstrainResultToBoolFamilyOperator(expr.tok, e.WhatKind);
-
-      } else if (expr is SetComprehension) {
-        var e = (SetComprehension)expr;
-        scope.PushMarker();
-        foreach (var v in e.BoundVars) {
-          resolver.ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-          ScopePushAndReport(v, "bound-variable", true);
-        }
-        ResolveExpression(e.Range, resolutionContext);
-        ConstrainTypeExprBool(e.Range, "range of comprehension must be of type bool (instead got {0})");
-        ResolveExpression(e.Term, resolutionContext);
-
-        ResolveAttributes(e, resolutionContext, false);
-        scope.PopMarker();
-        expr.PreType = new DPreType(BuiltInTypeDecl(e.Finite ? "set" : "iset"), new List<PreType>() { e.Term.PreType });
-
-      } else if (expr is MapComprehension) {
-        var e = (MapComprehension)expr;
-        scope.PushMarker();
-        Contract.Assert(e.BoundVars.Count == 1 || (1 < e.BoundVars.Count && e.TermLeft != null));
-        foreach (BoundVar v in e.BoundVars) {
-          resolver.ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-          ScopePushAndReport(v, "bound-variable", true);
-          if (v.Type is InferredTypeProxy inferredProxy) {
-            Contract.Assert(!inferredProxy.KeepConstraints);  // in general, this proxy is inferred to be a base type
+        case ITEExpr iteExpr: {
+            var e = iteExpr;
+            ResolveExpression(e.Test, resolutionContext);
+            ResolveExpression(e.Thn, resolutionContext);
+            ResolveExpression(e.Els, resolutionContext);
+            ConstrainExpressionToBoolFamily(e.Test, "guard condition in if-then-else expression must be a boolean (instead got {0})");
+            iteExpr.PreType = CreatePreTypeProxy("if-then-else branches");
+            AddSubtypeConstraint(iteExpr.PreType, e.Thn.PreType, iteExpr.Origin, "the two branches of an if-then-else expression must have the same type (got {0} and {1})");
+            AddSubtypeConstraint(iteExpr.PreType, e.Els.PreType, iteExpr.Origin, "the two branches of an if-then-else expression must have the same type (got {0} and {1})");
+            break;
           }
-        }
-        ResolveExpression(e.Range, resolutionContext);
-        ConstrainTypeExprBool(e.Range, "range of comprehension must be of type bool (instead got {0})");
-        if (e.TermLeft != null) {
-          ResolveExpression(e.TermLeft, resolutionContext);
-        }
-        ResolveExpression(e.Term, resolutionContext);
-
-        ResolveAttributes(e, resolutionContext, false);
-        scope.PopMarker();
-        expr.PreType = new DPreType(BuiltInTypeDecl(e.Finite ? "map" : "imap"),
-          new List<PreType>() { e.TermLeft != null ? e.TermLeft.PreType : e.BoundVars[0].PreType, e.Term.PreType });
-
-      } else if (expr is LambdaExpr) {
-        var e = (LambdaExpr)expr;
-        scope.PushMarker();
-        foreach (var v in e.BoundVars) {
-          resolver.ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-          ScopePushAndReport(v, "bound-variable", true);
-        }
-
-        if (e.Range != null) {
-          ResolveExpression(e.Range, resolutionContext);
-          ConstrainTypeExprBool(e.Range, "precondition must be boolean (got {0})");
-        }
-        foreach (var read in e.Reads) {
-          ResolveFrameExpression(read, FrameExpressionUse.Reads, resolutionContext.CodeContext);
-        }
-        ResolveExpression(e.Term, resolutionContext);
-        scope.PopMarker();
-        expr.PreType = BuiltInArrowType(e.BoundVars.ConvertAll(v => v.PreType), e.Body.PreType);
-
-      } else if (expr is WildcardExpr) {
-        var obj = new DPreType(BuiltInTypeDecl("object?"), new List<PreType>() { });
-        expr.PreType = new DPreType(BuiltInTypeDecl("set"), new List<PreType>() { obj });
-
-      } else if (expr is StmtExpr) {
-        var e = (StmtExpr)expr;
-        int prevErrorCount = ErrorCount;
-        ResolveStatement(e.S, resolutionContext);
-        if (ErrorCount == prevErrorCount) {
-          if (e.S is UpdateStmt updateStmt && updateStmt.ResolvedStatements.Count == 1) {
-            var call = (CallStmt)updateStmt.ResolvedStatements[0];
-            if (call.Method is TwoStateLemma && !resolutionContext.IsTwoState) {
-              ReportError(call, "two-state lemmas can only be used in two-state contexts");
+        case DecreasesToExpr decreasesToExpr: {
+            foreach (var e in decreasesToExpr.SubExpressions) {
+              ResolveExpression(e, resolutionContext);
             }
+
+            decreasesToExpr.PreType = ConstrainResultToBoolFamilyOperator(decreasesToExpr.Origin, "decreasesto");
+            break;
           }
-        }
-        ResolveExpression(e.E, resolutionContext);
-        expr.PreType = e.E.PreType;
-
-      } else if (expr is ITEExpr) {
-        var e = (ITEExpr)expr;
-        ResolveExpression(e.Test, resolutionContext);
-        ResolveExpression(e.Thn, resolutionContext);
-        ResolveExpression(e.Els, resolutionContext);
-        e.Test.PreType = ConstrainResultToBoolFamily(e.Test.tok, "if-then-else test", "guard condition in if-then-else expression must be a boolean (instead got {0})");
-        expr.PreType = CreatePreTypeProxy("if-then-else branches");
-        AddSubtypeConstraint(expr.PreType, e.Thn.PreType, expr.tok, "the two branches of an if-then-else expression must have the same type (got {0} and {1})");
-        AddSubtypeConstraint(expr.PreType, e.Els.PreType, expr.tok, "the two branches of an if-then-else expression must have the same type (got {0} and {1})");
-
-#if SOON
-      } else if (expr is MatchExpr) {
-        ResolveMatchExpr((MatchExpr)expr, resolutionContext);
-#endif
-
-      } else if (expr is NestedMatchExpr) {
-        var e = (NestedMatchExpr)expr;
-        ResolveNestedMatchExpr(e, resolutionContext);
 
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
+        case NestedMatchExpr matchExpr: {
+            var e = matchExpr;
+            ResolveNestedMatchExpr(e, resolutionContext);
+            break;
+          }
+        case MatchExpr:
+          Contract.Assert(false); // this case is always handled via NestedMatchExpr
+          break;
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
       }
 
       if (expr.PreType == null) {
@@ -742,7 +755,50 @@ resolutionContext.CodeContext is ConstantField ||
       }
     }
 
-    private PreType ResolveBinaryExpr(IToken tok, BinaryExpr.Opcode opcode, Expression e0, Expression e1, ResolutionContext resolutionContext) {
+    private void ResolveCollectionProducingExpr(string typeName, string exprKindSuffix, Expression expr, PreType elementPreType,
+      PreTypeConstraints.CommonConfirmationBag confirmationFamily) {
+      var exprKind = $"{typeName} {exprKindSuffix}";
+      SetupCollectionProducingExpr(typeName, exprKind, expr, elementPreType);
+      AddConfirmation(confirmationFamily, expr.PreType, expr.Origin, $"{exprKind} used as if it had type {{0}}");
+    }
+
+    private void ResolveMapProducingExpr(bool finite, string exprKindSuffix, Expression expr, PreType keyPreType, PreType valuePreType) {
+      var typeName = PreType.MapTypeName(finite);
+      PreTypeConstraints.CommonConfirmationBag confirmationFamily =
+        finite ? PreTypeConstraints.CommonConfirmationBag.InMapFamily : PreTypeConstraints.CommonConfirmationBag.InImapFamily;
+      var exprKind = $"{typeName} {exprKindSuffix}";
+
+      SetupCollectionProducingExpr(typeName, exprKind, expr, keyPreType, valuePreType);
+      AddConfirmation(confirmationFamily, expr.PreType, expr.Origin, $"{exprKind} used as if it had type {{0}}");
+    }
+
+    private void SetupCollectionProducingExpr(string typeName, string exprKind, Expression expr, PreType elementPreType, PreType valuePreType = null) {
+      expr.PreType = CreatePreTypeProxy(exprKind);
+
+      var arguments = valuePreType == null ? new List<PreType>() { elementPreType } : new List<PreType>() { elementPreType, valuePreType };
+      var defaultType = new DPreType(BuiltInTypeDecl(typeName), arguments);
+      Constraints.AddDefaultAdvice(expr.PreType, defaultType);
+
+      Constraints.AddGuardedConstraint(() => {
+        if (expr.PreType.UrAncestor(this) is DPreType dPreType) {
+          if (dPreType.Decl.Name != typeName) {
+            ReportError(expr, $"{exprKind} used as if it had type {{0}}", expr.PreType);
+          } else if (valuePreType == null) {
+            AddSubtypeConstraint(dPreType.Arguments[0], elementPreType, expr.Origin,
+              $"element type of {exprKind} expected to be {{0}} (got {{1}})");
+          } else {
+            AddSubtypeConstraint(dPreType.Arguments[0], elementPreType, expr.Origin,
+              $"key type of {exprKind} expected to be {{0}} (got {{1}})");
+            AddSubtypeConstraint(dPreType.Arguments[1], valuePreType, expr.Origin,
+              $"value type of {exprKind} expected to be {{0}} (got {{1}})");
+          }
+          return true;
+        }
+        return false;
+      });
+    }
+
+    private PreType ResolveBinaryExpr(IOrigin tok, BinaryExpr.Opcode opcode, Expression e0, Expression e1, ResolutionContext resolutionContext) {
       var opString = BinaryExpr.OpcodeString(opcode);
       PreType resultPreType;
       switch (opcode) {
@@ -759,7 +815,7 @@ private PreType ResolveBinaryExpr(IToken tok, BinaryExpr.Opcode opcode, Expressi
         case BinaryExpr.Opcode.Eq:
         case BinaryExpr.Opcode.Neq:
           resultPreType = ConstrainResultToBoolFamilyOperator(tok, opString);
-          AddComparableConstraint(e0.PreType, e1.PreType, tok, "arguments must have comparable types (got {0} and {1})");
+          AddComparableConstraint(e0.PreType, e1.PreType, tok, false, "arguments must have comparable types (got {0} and {1})");
           break;
 
         case BinaryExpr.Opcode.Disjoint:
@@ -771,13 +827,13 @@ private PreType ResolveBinaryExpr(IToken tok, BinaryExpr.Opcode opcode, Expressi
         case BinaryExpr.Opcode.Lt:
           resultPreType = ConstrainResultToBoolFamilyOperator(tok, opString);
           Constraints.AddGuardedConstraint(() => {
-            var left = e0.PreType.Normalize() as DPreType;
-            var right = e1.PreType.Normalize() as DPreType;
-            if (left != null && (left.Decl is IndDatatypeDecl || left.Decl is TypeParameter)) {
+            var left = e0.PreType.NormalizeWrtScope() as DPreType;
+            var right = e1.PreType.NormalizeWrtScope() as DPreType;
+            if (left is { Decl: IndDatatypeDecl or TypeParameter }) {
               AddConfirmation(PreTypeConstraints.CommonConfirmationBag.RankOrderable, e1.PreType, tok,
                 $"arguments to rank comparison must be datatypes (got {e0.PreType} and {{0}})");
               return true;
-            } else if (right != null && right.Decl is IndDatatypeDecl) {
+            } else if (right is { Decl: IndDatatypeDecl }) {
               AddConfirmation(PreTypeConstraints.CommonConfirmationBag.RankOrderableOrTypeParameter, e0.PreType, tok,
                 $"arguments to rank comparison must be datatypes (got {{0}} and {e1.PreType})");
               return true;
@@ -804,8 +860,8 @@ private PreType ResolveBinaryExpr(IToken tok, BinaryExpr.Opcode opcode, Expressi
         case BinaryExpr.Opcode.Gt:
           resultPreType = ConstrainResultToBoolFamilyOperator(tok, opString);
           Constraints.AddGuardedConstraint(() => {
-            var left = e0.PreType.Normalize() as DPreType;
-            var right = e1.PreType.Normalize() as DPreType;
+            var left = e0.PreType.NormalizeWrtScope() as DPreType;
+            var right = e1.PreType.NormalizeWrtScope() as DPreType;
             if (left != null && left.Decl is IndDatatypeDecl) {
               AddConfirmation(PreTypeConstraints.CommonConfirmationBag.RankOrderableOrTypeParameter, e1.PreType, tok,
                 $"arguments to rank comparison must be datatypes (got {e0.PreType} and {{0}})");
@@ -829,7 +885,7 @@ private PreType ResolveBinaryExpr(IToken tok, BinaryExpr.Opcode opcode, Expressi
           resultPreType = ConstrainResultToBoolFamilyOperator(tok, opString);
           ConstrainToCommonSupertype(tok, opString, e0.PreType, e1.PreType, null);
           AddConfirmation(PreTypeConstraints.CommonConfirmationBag.OrderableGreater, e0.PreType, tok,
-            "arguments to " + opString + " must be of a numeric type, bitvector type, ORDINAL, char, or a set-like type (instead got {0} and {1})");
+            "arguments to " + opString + " must be of a numeric type, bitvector type, ORDINAL, char, or a set-like type (instead got {0})");
           break;
 
         case BinaryExpr.Opcode.Add:
@@ -861,26 +917,40 @@ private PreType ResolveBinaryExpr(IToken tok, BinaryExpr.Opcode opcode, Expressi
             // that only the expected types are allowed.
             var a0 = e0.PreType;
             var a1 = e1.PreType;
-            var left = a0.Normalize() as DPreType;
-            var right = a1.Normalize() as DPreType;
             var familyDeclNameLeft = AncestorName(a0);
             var familyDeclNameRight = AncestorName(a1);
-            if (familyDeclNameLeft == "map" || familyDeclNameLeft == "imap") {
+            if (familyDeclNameLeft is PreType.TypeNameMap or PreType.TypeNameImap) {
+              var left = (DPreType)a0.UrAncestor(this);
               Contract.Assert(left.Arguments.Count == 2);
-              var st = new DPreType(BuiltInTypeDecl("set"), new List<PreType>() { left.Arguments[0] });
+              var st = new DPreType(BuiltInTypeDecl(PreType.TypeNameSet), new List<PreType>() { left.Arguments[0] });
               Constraints.DebugPrint($"    DEBUG: guard applies: Minusable {a0} {a1}, converting to {st} :> {a1}");
-              AddSubtypeConstraint(st, a1, tok,
-                "map subtraction expects right-hand operand to have type {0} (instead got {1})");
+              Constraints.AddDefaultAdvice(a1, st);
+
+              var messageFormat = $"map subtraction expects right-hand operand to have type {st} (instead got {{0}})";
+              Constraints.AddGuardedConstraint(() => {
+                if (a1.UrAncestor(this) is DPreType dPreType) {
+                  if (dPreType.Decl.Name != PreType.TypeNameSet) {
+                    ReportError(e1, messageFormat, a1);
+                  } else {
+                    AddSubtypeConstraint(dPreType.Arguments[0], left.Arguments[0], e1.Origin,
+                      $"element type of {PreType.TypeNameSet} expected to be {{0}} (got {{1}})");
+                  }
+                  return true;
+                }
+                return false;
+              });
+              AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InSetFamily, a1, e1.Origin, messageFormat);
               return true;
-            } else if (familyDeclNameLeft != null || (familyDeclNameRight != null && familyDeclNameRight != "set")) {
+            } else if (familyDeclNameLeft != null || (familyDeclNameRight != null && familyDeclNameRight != PreType.TypeNameSet)) {
               Constraints.DebugPrint($"    DEBUG: guard applies: Minusable {a0} {a1}, converting to {a0} :> {a1}");
-              AddSubtypeConstraint(a0, a1, tok,
-                "type of right argument to - ({0}) must agree with the result type ({1})");
+              AddSubtypeConstraint(a0, a1, tok, "type of right argument to - ({0}) must agree with the result type ({1})");
               return true;
             }
             return false;
           });
           ConstrainOperandTypes(tok, opString, e0, null, resultPreType);
+          AddConfirmation(PreTypeConstraints.CommonConfirmationBag.Minusable, resultPreType, tok,
+            "type of - must be of a numeric type, a bitvector type, ORDINAL, char, or a set-like or map-like type (instead got {0})");
           break;
 
         case BinaryExpr.Opcode.Mul:
@@ -895,13 +965,13 @@ private PreType ResolveBinaryExpr(IToken tok, BinaryExpr.Opcode opcode, Expressi
           resultPreType = ConstrainResultToBoolFamilyOperator(tok, "'" + opString + "'");
           Constraints.AddGuardedConstraint(() => {
             // For "Innable x s", if s is known, then:
-            // if s == c<a> or s == c<a, b> where c is a collection type, then a :> x, else error.
-            var a0 = e0.PreType.Normalize();
-            var a1 = e1.PreType.Normalize();
+            // if s == c<a> or s == c<a, b> where c is a collection type, then a ~~ x, else error.
+            var a0 = e0.PreType.NormalizeWrtScope();
+            var a1 = e1.PreType.NormalizeWrtScope();
             var coll = a1.UrAncestor(this).AsCollectionPreType();
             if (coll != null) {
               Constraints.DebugPrint($"    DEBUG: guard applies: Innable {a0} {a1}");
-              AddSubtypeConstraint(coll.Arguments[0], a0, tok, "expecting element type to be assignable to {0} (got {1})");
+              AddComparableConstraint(coll.Arguments[0], a0, tok, false, "expecting element type to be assignable to {0} (got {1})");
               return true;
             } else if (a1 is DPreType) {
               // type head is determined and it isn't a collection type
@@ -916,15 +986,14 @@ private PreType ResolveBinaryExpr(IToken tok, BinaryExpr.Opcode opcode, Expressi
 
         case BinaryExpr.Opcode.Div:
           resultPreType = CreatePreTypeProxy("result of / operation");
-          Constraints.AddDefaultAdvice(resultPreType, Advice.Target.Int);
+          Constraints.AddDefaultAdvice(resultPreType, CommonAdvice.Target.Int);
           AddConfirmation(PreTypeConstraints.CommonConfirmationBag.NumericOrBitvector, resultPreType, tok, "arguments to " + opString + " must be numeric or bitvector types (got {0})");
           ConstrainOperandTypes(tok, opString, e0, e1, resultPreType);
           break;
 
         case BinaryExpr.Opcode.Mod:
           resultPreType = CreatePreTypeProxy("result of % operation");
-          Constraints.AddDefaultAdvice(resultPreType, Advice.Target.Int);
-          AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IntLikeOrBitvector, resultPreType, tok, "type of " + opString + " must be integer-numeric or bitvector types (got {0})");
+          ConstrainToIntFamilyOrBitvector(resultPreType, tok, "type of " + opString + " must be integer-numeric or bitvector types (got {0})");
           ConstrainOperandTypes(tok, opString, e0, e1, resultPreType);
           break;
 
@@ -955,37 +1024,45 @@ private PreType ResolveBinaryExpr(IToken tok, BinaryExpr.Opcode opcode, Expressi
       return resultPreType;
     }
 
-    private void ConstrainTypeExprBool(Expression e, string msgFormat) {
+    public void ConstrainTypeExprBool(Expression e, string msgFormat) {
       Contract.Requires(e != null);
       Contract.Requires(msgFormat != null);  // may have a {0} part
-      e.PreType = ConstrainResultToBoolFamily(e.tok, "<unspecified use>", msgFormat);
-    }
-
-    private void ConstrainTypeExprBool(Expression e, string proxyDescription, string msgFormat) {
-      Contract.Requires(e != null);
-      Contract.Requires(proxyDescription != null);
-      Contract.Requires(msgFormat != null);  // may have a {0} part
-      e.PreType = ConstrainResultToBoolFamily(e.tok, proxyDescription, msgFormat);
+      if (e.PreType != null) {
+        ConstrainExpressionToBoolFamily(e, msgFormat);
+      } else {
+        e.PreType = ConstrainResultToBoolFamily(e.Origin, "<unspecified use>", msgFormat);
+      }
     }
 
-    private PreType ConstrainResultToBoolFamilyOperator(IToken tok, string opString) {
+    private PreType ConstrainResultToBoolFamilyOperator(IOrigin tok, string opString) {
       var proxyDescription = $"result of {opString} operation";
       return ConstrainResultToBoolFamily(tok, proxyDescription, "type of " + opString + " must be a boolean (got {0})");
     }
 
-    private PreType ConstrainResultToBoolFamily(IToken tok, string proxyDescription, string errorFormat) {
+    private PreType ConstrainResultToBoolFamily(IOrigin tok, string proxyDescription, string errorFormat) {
       var pt = CreatePreTypeProxy(proxyDescription);
-      Constraints.AddDefaultAdvice(pt, Advice.Target.Bool);
+      Constraints.AddDefaultAdvice(pt, CommonAdvice.Target.Bool);
       AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InBoolFamily, pt, tok, errorFormat);
       return pt;
     }
 
-    private void ConstrainToIntFamily(PreType preType, IToken tok, string errorFormat) {
-      Constraints.AddDefaultAdvice(preType, Advice.Target.Int);
+    private void ConstrainExpressionToBoolFamily(Expression expr, string errorFormat) {
+      Contract.Assert(expr.PreType != null);
+      Constraints.AddDefaultAdvice(expr.PreType, CommonAdvice.Target.Bool);
+      AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InBoolFamily, expr.PreType, expr.Origin, errorFormat);
+    }
+
+    private void ConstrainToIntFamily(PreType preType, IOrigin tok, string errorFormat) {
+      Constraints.AddDefaultAdvice(preType, CommonAdvice.Target.Int);
       AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InIntFamily, preType, tok, errorFormat);
     }
 
-    private void ConstrainToCommonSupertype(IToken tok, string opString, PreType a, PreType b, PreType commonSupertype) {
+    private void ConstrainToIntFamilyOrBitvector(PreType preType, IOrigin tok, string errorFormat) {
+      Constraints.AddDefaultAdvice(preType, CommonAdvice.Target.Int);
+      AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IntLikeOrBitvector, preType, tok, errorFormat);
+    }
+
+    private void ConstrainToCommonSupertype(IOrigin tok, string opString, PreType a, PreType b, PreType commonSupertype) {
       if (commonSupertype == null) {
         commonSupertype = CreatePreTypeProxy($"element type of common {opString} supertype");
       }
@@ -994,7 +1071,7 @@ private void ConstrainToCommonSupertype(IToken tok, string opString, PreType a,
       AddSubtypeConstraint(commonSupertype, b, tok, errorFormat);
     }
 
-    private void ConstrainOperandTypes(IToken tok, string opString, Expression e0, Expression e1, PreType resultPreType) {
+    private void ConstrainOperandTypes(IOrigin tok, string opString, Expression e0, Expression e1, PreType resultPreType) {
       if (e0 != null) {
         AddSubtypeConstraint(resultPreType, e0.PreType, tok,
           $"type of left argument to {opString} ({{1}}) must agree with the result type ({{0}})");
@@ -1015,47 +1092,33 @@ private void ConstrainOperandTypes(IToken tok, string opString, Expression e0, E
     /// "receiverPreType" is an unresolved proxy type and that, after solving more type constraints, "receiverPreType"
     /// eventually gets set to a type more specific than "tentativeReceiverType".
     /// </summary>
-    (MemberDecl/*?*/, DPreType/*?*/) FindMember(IToken tok, PreType receiverPreType, string memberName) {
+    (MemberDecl /*?*/, DPreType /*?*/) FindMember(IOrigin tok, PreType receiverPreType, string memberName, ResolutionContext resolutionContext,
+      bool reportErrorOnMissingMember = true) {
       Contract.Requires(tok != null);
       Contract.Requires(receiverPreType != null);
       Contract.Requires(memberName != null);
 
-      Constraints.PartiallySolveTypeConstraints();
-      receiverPreType = receiverPreType.Normalize();
-      DPreType dReceiver = null;
-      if (receiverPreType is PreTypeProxy proxy) {
-        // If there is a subtype constraint "proxy :> sub<X>", then (if the program is legal at all, then) "sub" must have the member "memberName".
-        foreach (var sub in Constraints.AllSubBounds(proxy, new HashSet<PreTypeProxy>())) {
-          dReceiver = sub;
-          break;
-        }
-        if (dReceiver == null) {
-          // If there is a subtype constraint "super<X> :> proxy" where "super" has a member "memberName", then that is the correct member.
-          foreach (var super in Constraints.AllSuperBounds(proxy, new HashSet<PreTypeProxy>())) {
-            if (super.Decl is TopLevelDeclWithMembers md && resolver.GetClassMembers(md).ContainsKey(memberName)) {
-              dReceiver = super;
-              break;
-            }
-          }
-        }
-        if (dReceiver == null) {
+      var dReceiver = Constraints.ApproximateReceiverType(receiverPreType, memberName);
+      if (dReceiver == null) {
+        if (reportErrorOnMissingMember) {
           ReportError(tok, "type of the receiver is not fully determined at this program point");
-          return (null, null);
         }
-      } else {
-        dReceiver = (DPreType)receiverPreType;
+
+        return (null, null);
       }
-      Contract.Assert(dReceiver != null);
 
       var receiverDecl = dReceiver.Decl;
       if (receiverDecl is TopLevelDeclWithMembers receiverDeclWithMembers) {
         // TODO: does this case need to do something like this?  var cd = ctype?.AsTopLevelTypeWithMembersBypassInternalSynonym;
 
-        if (!resolver.GetClassMembers(receiverDeclWithMembers).TryGetValue(memberName, out var member)) {
-          if (memberName == "_ctor") {
+        var members = resolver.GetClassMembers(receiverDeclWithMembers);
+        if (members == null || !members.TryGetValue(memberName, out var member)) {
+          if (!reportErrorOnMissingMember) {
+            // don't report any error
+          } else if (memberName == "_ctor") {
             ReportError(tok, $"{receiverDecl.WhatKind} '{receiverDecl.Name}' does not have an anonymous constructor");
           } else {
-            ReportError(tok, $"member '{memberName}' does not exist in {receiverDecl.WhatKind} '{receiverDecl.Name}'");
+            ReportMemberNotFoundError(tok, memberName, members, receiverDecl, resolutionContext);
           }
           return (null, null);
         } else if (resolver.VisibleInScope(member)) {
@@ -1064,31 +1127,46 @@ private void ConstrainOperandTypes(IToken tok, string opString, Expression e0, E
           return (member, dReceiver);
         }
       }
-      ReportError(tok, $"member '{memberName}' does not exist in {receiverDecl.WhatKind} '{receiverDecl.Name}'");
+      if (reportErrorOnMissingMember) {
+        ReportMemberNotFoundError(tok, memberName, null, receiverDecl, resolutionContext);
+      }
       return (null, null);
     }
 
-    /// <summary>
-    /// Expecting that "preType" is a type that does not involve traits, return that type, if possible.
-    /// </summary>
-    DPreType/*?*/ FindDefinedPreType(PreType preType) {
-      Contract.Requires(preType != null);
-
-      Constraints.PartiallySolveTypeConstraints();
-      preType = preType.Normalize();
-      if (preType is PreTypeProxy proxy) {
-        // We're looking a type with concerns for traits, so if the proxy has any sub- or super-type, then (if the
-        // program is legal at all, then) that sub- or super-type must be the type we're looking for.
-        foreach (var sub in Constraints.AllSubBounds(proxy, new HashSet<PreTypeProxy>())) {
-          return sub;
+    private void ReportMemberNotFoundError(IOrigin tok, string memberName, [CanBeNull] Dictionary<string, MemberDecl> members,
+      TopLevelDecl receiverDecl, ResolutionContext resolutionContext) {
+      if (memberName.StartsWith(HideRevealStmt.RevealLemmaPrefix)) {
+        var nameToBeRevealed = memberName[HideRevealStmt.RevealLemmaPrefix.Length..];
+        if (members == null) {
+          if (receiverDecl is TopLevelDeclWithMembers receiverDeclWithMembers) {
+            // try this instead:
+            members = resolver.GetClassMembers(receiverDeclWithMembers);
+          }
         }
-        foreach (var super in Constraints.AllSuperBounds(proxy, new HashSet<PreTypeProxy>())) {
-          return super;
+        if (members == null) {
+          ReportError(tok, $"member '{nameToBeRevealed}' does not exist in {receiverDecl.WhatKindAndName}");
+        } else if (!members.TryGetValue(nameToBeRevealed, out var member)) {
+          ReportError(tok, $"member '{nameToBeRevealed}' does not exist in {receiverDecl.WhatKindAndName}");
+        } else if (member is not (ConstantField or Function)) {
+          Contract.Assert(!member.IsOpaque);
+          ReportError(tok,
+            $"a {member.WhatKind} ('{nameToBeRevealed}') cannot be revealed; only opaque constants and functions can be revealed");
+        } else if (!member.IsOpaque) {
+          ReportError(tok, $"{member.WhatKind} '{nameToBeRevealed}' cannot be revealed, because it is not opaque");
+        } else if (member is Function { Body: null }) {
+          ReportError(tok,
+            $"{member.WhatKind} '{nameToBeRevealed}' cannot be revealed, because it has no body in {receiverDecl.WhatKindAndName}");
+        } else {
+          ReportError(tok, $"cannot reveal '{nameToBeRevealed}'");
         }
-        return null;
+      } else {
+        ReportError(tok, $"member '{memberName}' does not exist in {receiverDecl.WhatKindAndName}");
       }
+    }
 
-      return preType as DPreType;
+    public Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<ActualBinding> args,
+      ResolutionContext resolutionContext, bool allowMethodCall, bool complain = true) {
+      return ResolveNameSegment(expr, isLastNameSegment, args, resolutionContext, allowMethodCall, complain, false);
     }
 
     /// <summary>
@@ -1115,8 +1193,11 @@ private void ConstrainOperandTypes(IToken tok, string opString, Expression e0, E
     /// <param name="allowMethodCall">If false, generates an error if the name denotes a method. If true and the name denotes a method, returns
     /// a MemberSelectExpr whose .Member is a Method.</param>
     /// <param name="complain"></param>
-    Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<ActualBinding> args,
-      ResolutionContext resolutionContext, bool allowMethodCall, bool complain = true) {
+    /// <param name="specialOpaqueHackAllowance">If "true", treats an expression "f" where "f" is an instance function, as "this.f", even though
+    /// there is no "this" in scope. This seems like a terrible hack, because it breaks scope invariants about the AST. But, for now, it's here
+    /// to mimic what the legacy resolver does.</param>
+    public Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<ActualBinding> args,
+      ResolutionContext resolutionContext, bool allowMethodCall, bool complain, bool specialOpaqueHackAllowance) {
       Contract.Requires(expr != null);
       Contract.Requires(!expr.WasResolved());
       Contract.Requires(resolutionContext != null);
@@ -1124,7 +1205,7 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
 
       if (expr.OptTypeArguments != null) {
         foreach (var ty in expr.OptTypeArguments) {
-          resolver.ResolveType(expr.tok, ty, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          resolver.ResolveType(expr.Origin, ty, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         }
       }
 
@@ -1136,24 +1217,19 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
       // For 2 and 5:
       Tuple<DatatypeCtor, bool> pair;
 
-      var name = resolutionContext.InReveal ? "reveal_" + expr.Name : expr.Name;
+      var name = resolutionContext.InReveal ? HideRevealStmt.RevealLemmaPrefix + expr.Name : expr.Name;
       var v = scope.Find(name);
       if (v != null) {
         // ----- 0. local variable, parameter, or bound variable
         if (expr.OptTypeArguments != null) {
           if (complain) {
-            ReportError(expr.tok, "variable '{0}' does not take any type parameters", name);
+            ReportError(expr.Origin, "variable '{0}' does not take any type parameters", name);
           } else {
             expr.ResolvedExpression = null;
             return null;
           }
         }
-#if NO_LONGER_NEEDED
-        if (v.PreType == null) {
-          v.PreType = Type2PreType(v.Type, $"type of identifier '{name}'");
-        }
-#endif
-        r = new IdentifierExpr(expr.tok, v) {
+        r = new IdentifierExpr(expr.Origin, v) {
           PreType = v.PreType
         };
       } else if (currentClass != null && resolver.GetClassMembers(currentClass) is { } members &&
@@ -1161,24 +1237,24 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
         // ----- 1. member of the enclosing class
         Expression receiver;
         if (member.IsStatic) {
-          receiver = new StaticReceiverExpr(expr.tok, UserDefinedType.FromTopLevelDecl(expr.tok, currentClass, currentClass.TypeArgs),
+          receiver = new StaticReceiverExpr(expr.Origin, UserDefinedType.FromTopLevelDecl(expr.Origin, currentClass, currentClass.TypeArgs),
             (TopLevelDeclWithMembers)member.EnclosingClass, true);
           receiver.PreType = Type2PreType(receiver.Type);
         } else {
-          if (!scope.AllowInstance) {
+          if (!scope.AllowInstance && !specialOpaqueHackAllowance) {
             if (complain) {
-              ReportError(expr.tok, "'this' is not allowed in a 'static' resolutionContext"); //TODO: Rephrase this
+              ReportError(expr.Origin, "'this' is not allowed in a 'static' context"); //TODO: Rephrase this
             } else {
               expr.ResolvedExpression = null;
               return null;
             }
             // nevertheless, set "receiver" to a value so we can continue resolution
           }
-          receiver = new ImplicitThisExpr(expr.tok);
-          receiver.Type = ModuleResolver.GetThisType(expr.tok, currentClass);
+          receiver = new ImplicitThisExpr(expr.Origin);
+          receiver.Type = ModuleResolver.GetThisType(expr.Origin, currentClass);
           receiver.PreType = Type2PreType(receiver.Type);
         }
-        r = ResolveExprDotCall(expr.tok, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+        r = ResolveExprDotCall(expr.Origin, new Name(expr.Origin, expr.Name), receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
 
       } else if (isLastNameSegment && resolver.moduleInfo.Ctors.TryGetValue(name, out pair)) {
         // ----- 2. datatype constructor
@@ -1190,7 +1266,7 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
         // ----- 3. Member of the enclosing module
         if (decl is AmbiguousTopLevelDecl ambiguousTopLevelDecl) {
           if (complain) {
-            ReportError(expr.tok,
+            ReportError(expr.Origin,
               "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)",
               expr.Name, ambiguousTopLevelDecl.ModuleNames());
           } else {
@@ -1207,14 +1283,14 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
               // A possibly-null type C? was mentioned. But it does not have any further members. The program should have used
               // the name of the class, C. Report an error and continue.
               if (complain) {
-                ReportError(expr.tok, "To access members of {0} '{1}', write '{1}', not '{2}'", decl.WhatKind, decl.Name, name);
+                ReportError(expr.Origin, "To access members of {0} '{1}', write '{1}', not '{2}'", decl.WhatKind, decl.Name, name);
               } else {
                 expr.ResolvedExpression = null;
                 return null;
               }
             }
           }
-          r = CreateResolver_IdentifierExpr(expr.tok, name, expr.OptTypeArguments, decl);
+          r = CreateResolver_IdentifierExpr(expr.Origin, name, expr.OptTypeArguments, decl);
         }
 
       } else if (resolver.moduleInfo.StaticMembers.TryGetValue(name, out member)) {
@@ -1222,15 +1298,15 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
         Contract.Assert(member.IsStatic); // moduleInfo.StaticMembers is supposed to contain only static members of the module's implicit class _default
         if (member is AmbiguousMemberDecl ambiguousMember) {
           if (complain) {
-            ReportError(expr.tok, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.Name, ambiguousMember.ModuleNames());
+            ReportError(expr.Origin, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.Name, ambiguousMember.ModuleNames());
           } else {
             expr.ResolvedExpression = null;
             return null;
           }
         } else {
-          var receiver = new StaticReceiverExpr(expr.tok, (TopLevelDeclWithMembers)member.EnclosingClass, true);
+          var receiver = new StaticReceiverExpr(expr.Origin, (TopLevelDeclWithMembers)member.EnclosingClass, true);
           receiver.PreType = Type2PreType(receiver.Type);
-          r = ResolveExprDotCall(expr.tok, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+          r = ResolveExprDotCall(expr.Origin, new Name(expr.Origin, expr.Name), receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
         }
 
       } else if (!isLastNameSegment && resolver.moduleInfo.Ctors.TryGetValue(name, out pair)) {
@@ -1242,7 +1318,7 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
       } else {
         // ----- None of the above
         if (complain) {
-          ReportError(expr.tok, "unresolved identifier: {0}", name);
+          ReportUnresolvedIdentifierError(expr.Origin, name, resolutionContext);
         } else {
           expr.ResolvedExpression = null;
           return null;
@@ -1263,11 +1339,22 @@ Expression ResolveNameSegment(NameSegment expr, bool isLastNameSegment, List<Act
       return rWithArgs;
     }
 
-    private Resolver_IdentifierExpr CreateResolver_IdentifierExpr(IToken tok, string name, List<Type> optTypeArguments, TopLevelDecl decl) {
+    private void ReportUnresolvedIdentifierError(IOrigin tok, string name, ResolutionContext resolutionContext) {
+      if (resolutionContext.InReveal) {
+        var nameToReport = name.StartsWith(HideRevealStmt.RevealLemmaPrefix) ? name[HideRevealStmt.RevealLemmaPrefix.Length..] : name;
+        ReportError(tok,
+          "cannot reveal '{0}' because no revealable constant, function, assert label, or requires label in the current scope is named '{0}'",
+          nameToReport);
+      } else {
+        ReportError(tok, "unresolved identifier: {0}", name);
+      }
+    }
+
+    private ResolverIdentifierExpr CreateResolver_IdentifierExpr(IOrigin tok, string name, List<Type> optTypeArguments, TopLevelDecl decl) {
       Contract.Requires(tok != null);
       Contract.Requires(name != null);
       Contract.Requires(decl != null);
-      Contract.Ensures(Contract.Result<Resolver_IdentifierExpr>() != null);
+      Contract.Ensures(Contract.Result<ResolverIdentifierExpr>() != null);
 
       if (!resolver.moduleInfo.IsAbstract) {
         if (decl is ModuleDecl md && md.Signature.IsAbstract) {
@@ -1285,7 +1372,7 @@ private Resolver_IdentifierExpr CreateResolver_IdentifierExpr(IToken tok, string
       for (var i = 0; i < decl.TypeArgs.Count; i++) {
         typeArguments.Add(i < n ? optTypeArguments[i] : new InferredTypeProxy());
       }
-      return new Resolver_IdentifierExpr(tok, decl, typeArguments);
+      return new ResolverIdentifierExpr(tok, decl, typeArguments);
     }
 
     private bool ResolveDatatypeConstructor(NameSegment expr, List<ActualBinding>/*?*/ args, ResolutionContext resolutionContext, bool complain,
@@ -1297,7 +1384,7 @@ private bool ResolveDatatypeConstructor(NameSegment expr, List<ActualBinding>/*?
       if (pair.Item2) {
         // there is more than one constructor with this name
         if (complain) {
-          ReportError(expr.tok,
+          ReportError(expr.Origin,
             "the name '{0}' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, '{1}.{0}')",
             expr.Name, datatypeDecl.Name);
           return false;
@@ -1316,7 +1403,7 @@ private bool ResolveDatatypeConstructor(NameSegment expr, List<ActualBinding>/*?
             var givenTypeArguments = Util.Comma(expr.OptTypeArguments, targ => targ.ToString());
             errorMsg = $"{errorMsg}; did you perhaps mean to write '{datatypeDecl.Name}<{givenTypeArguments}>.{name}'?";
           }
-          ReportError(expr.tok, errorMsg);
+          ReportError(expr.Origin, errorMsg);
           return false;
         } else {
           expr.ResolvedExpression = null;
@@ -1324,7 +1411,9 @@ private bool ResolveDatatypeConstructor(NameSegment expr, List<ActualBinding>/*?
         }
       }
 
-      var rr = new DatatypeValue(expr.tok, datatypeDecl.Name, name, args ?? new List<ActualBinding>());
+      ResolveDeclarationSignature(datatypeDecl);
+
+      var rr = new DatatypeValue(expr.Origin, datatypeDecl.Name, name, args ?? new List<ActualBinding>());
       var ok = ResolveDatatypeValue(resolutionContext, rr, datatypeDecl, null, complain);
       if (!ok) {
         expr.ResolvedExpression = null;
@@ -1362,7 +1451,7 @@ private bool ResolveDatatypeConstructor(NameSegment expr, List<ActualBinding>/*?
     /// <param name="resolutionContext"></param>
     /// <param name="allowMethodCall">If false, generates an error if the name denotes a method. If true and the name denotes a method, returns
     /// a Resolver_MethodCall.</param>
-    Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<ActualBinding> args, ResolutionContext resolutionContext, bool allowMethodCall) {
+    public Expression ResolveDotSuffix(ExprDotName expr, bool allowStaticReferenceToInstance, bool isLastNameSegment, List<ActualBinding> args, ResolutionContext resolutionContext, bool allowMethodCall) {
       Contract.Requires(expr != null);
       Contract.Requires(!expr.WasResolved());
       Contract.Requires(resolutionContext != null);
@@ -1374,24 +1463,24 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
       if (expr.Lhs is NameSegment) {
         ResolveNameSegment((NameSegment)expr.Lhs, false, null, nonRevealOpts, false);
       } else if (expr.Lhs is ExprDotName) {
-        ResolveDotSuffix((ExprDotName)expr.Lhs, false, null, nonRevealOpts, false);
+        ResolveDotSuffix((ExprDotName)expr.Lhs, false, false, null, nonRevealOpts, false);
       } else {
         ResolveExpression(expr.Lhs, nonRevealOpts);
       }
 
       if (expr.OptTypeArguments != null) {
         foreach (var ty in expr.OptTypeArguments) {
-          resolver.ResolveType(expr.tok, ty, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          resolver.ResolveType(expr.Origin, ty, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         }
       }
 
       Expression r = null;  // the resolved expression, if successful
       Expression rWithArgs = null;  // the resolved expression after incorporating "args"
 
-      var name = resolutionContext.InReveal ? "reveal_" + expr.SuffixName : expr.SuffixName;
-      var lhs = expr.Lhs.Resolved;
-      if (lhs != null && lhs.PreType is PreTypePlaceholderModule) {
-        var ri = (Resolver_IdentifierExpr)lhs;
+      var name = resolutionContext.InReveal ? HideRevealStmt.RevealLemmaPrefix + expr.SuffixName : expr.SuffixName;
+      var lhs = expr.Lhs.Resolved ?? expr.Lhs; // Sometimes resolution comes later, but pre-types have already been set
+      if (lhs is { PreType: PreTypePlaceholderModule }) {
+        var ri = (ResolverIdentifierExpr)lhs;
         var sig = ((ModuleDecl)ri.Decl).AccessibleSignature(false);
         sig = ModuleResolver.GetSignatureExt(sig);
 
@@ -1399,12 +1488,12 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
           // ----- 0. datatype constructor
           if (pair.Item2) {
             // there is more than one constructor with this name
-            ReportError(expr.tok, "the name '{0}' denotes a datatype constructor in module {2}, but does not do so uniquely; add an explicit qualification (for example, '{1}.{0}')", name, pair.Item1.EnclosingDatatype.Name, ((ModuleDecl)ri.Decl).Name);
+            ReportError(expr.Origin, "the name '{0}' denotes a datatype constructor in module {2}, but does not do so uniquely; add an explicit qualification (for example, '{1}.{0}')", name, pair.Item1.EnclosingDatatype.Name, ((ModuleDecl)ri.Decl).Name);
           } else {
             if (expr.OptTypeArguments != null) {
-              ReportError(expr.tok, "datatype constructor does not take any type parameters ('{0}')", name);
+              ReportError(expr.Origin, "datatype constructor does not take any type parameters ('{0}')", name);
             }
-            var rr = new DatatypeValue(expr.tok, pair.Item1.EnclosingDatatype.Name, name, args ?? new List<ActualBinding>());
+            var rr = new DatatypeValue(expr.Origin, pair.Item1.EnclosingDatatype.Name, name, args ?? new List<ActualBinding>());
             ResolveDatatypeValue(resolutionContext, rr, pair.Item1.EnclosingDatatype, null);
 
             if (args == null) {
@@ -1418,7 +1507,7 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
           // ----- 1. Member of the specified module
           if (decl is AmbiguousTopLevelDecl) {
             var ad = (AmbiguousTopLevelDecl)decl;
-            ReportError(expr.tok, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", expr.SuffixName, ad.ModuleNames());
+            ReportError(expr.Origin, "The name {0} ambiguously refers to a type in one of the modules {1} (try qualifying the type name with the module name)", expr.SuffixName, ad.ModuleNames());
           } else {
             // We have found a module name or a type name, neither of which is an expression. However, the ExprDotName we're
             // looking at may be followed by a further suffix that makes this into an expression. We postpone the rest of the
@@ -1428,39 +1517,39 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
               if (decl is ClassLikeDecl cd && cd.NonNullTypeDecl != null && name != cd.NonNullTypeDecl.Name) {
                 // A possibly-null type C? was mentioned. But it does not have any further members. The program should have used
                 // the name of the class, C. Report an error and continue.
-                ReportError(expr.tok, "To access members of {0} '{1}', write '{1}', not '{2}'", decl.WhatKind, decl.Name, name);
+                ReportError(expr.Origin, "To access members of {0} '{1}', write '{1}', not '{2}'", decl.WhatKind, decl.Name, name);
               }
             }
-            r = resolver.CreateResolver_IdentifierExpr(expr.tok, name, expr.OptTypeArguments, decl);
+            r = resolver.CreateResolver_IdentifierExpr(expr.Origin, name, expr.OptTypeArguments, decl);
           }
         } else if (sig.StaticMembers.TryGetValue(name, out var member)) {
           // ----- 2. static member of the specified module
           Contract.Assert(member.IsStatic); // moduleInfo.StaticMembers is supposed to contain only static members of the module's implicit class _default
           if (member is AmbiguousMemberDecl) {
             var ambiguousMember = (AmbiguousMemberDecl)member;
-            ReportError(expr.tok, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.SuffixName, ambiguousMember.ModuleNames());
+            ReportError(expr.Origin, "The name {0} ambiguously refers to a static member in one of the modules {1} (try qualifying the member name with the module name)", expr.SuffixName, ambiguousMember.ModuleNames());
           } else {
-            var receiver = new StaticReceiverExpr(expr.tok, (TopLevelDeclWithMembers)member.EnclosingClass, true);
+            var receiver = new StaticReceiverExpr(expr.Origin, (TopLevelDeclWithMembers)member.EnclosingClass, true);
             receiver.PreType = Type2PreType(receiver.Type);
-            r = ResolveExprDotCall(expr.tok, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+            r = ResolveExprDotCall(expr.Origin, expr.SuffixNameNode, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
           }
         } else {
-          ReportError(expr.tok, "unresolved identifier: {0}", name);
+          ReportUnresolvedIdentifierError(expr.Origin, name, resolutionContext);
         }
 
-      } else if (lhs != null && lhs.PreType is PreTypePlaceholderType) {
-        var ri = (Resolver_IdentifierExpr)lhs;
+      } else if (lhs is { PreType: PreTypePlaceholderType }) {
+        var ri = (ResolverIdentifierExpr)lhs;
         // ----- 3. Look up name in type
         // expand any synonyms
-        var ty = new UserDefinedType(expr.tok, ri.Decl.Name, ri.Decl, ri.TypeArgs).NormalizeExpand();
+        var ty = new UserDefinedType(expr.Origin, ri.Decl.Name, ri.Decl, ri.TypeArgs).NormalizeExpand();
         if (ty.IsDatatype) {
           // ----- LHS is a datatype
           var dt = ty.AsDatatype;
           if (dt.ConstructorsByName != null && dt.ConstructorsByName.TryGetValue(name, out var ctor)) {
             if (expr.OptTypeArguments != null) {
-              ReportError(expr.tok, $"datatype constructor does not take any type parameters ('{name}')");
+              ReportError(expr.Origin, $"datatype constructor does not take any type parameters ('{name}')");
             }
-            var rr = new DatatypeValue(expr.tok, ctor.EnclosingDatatype.Name, name, args ?? new List<ActualBinding>());
+            var rr = new DatatypeValue(expr.Origin, ctor.EnclosingDatatype.Name, name, args ?? new List<ActualBinding>());
             ResolveDatatypeValue(resolutionContext, rr, ctor.EnclosingDatatype, (DPreType)Type2PreType(ty));
             if (args == null) {
               r = rr;
@@ -1475,33 +1564,39 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
           // ----- LHS is a type with members
           if (resolver.GetClassMembers(cd) is { } members && members.TryGetValue(name, out var member)) {
             if (!resolver.VisibleInScope(member)) {
-              ReportError(expr.tok, $"member '{name}' has not been imported in this scope and cannot be accessed here");
+              ReportError(expr.Origin, $"member '{name}' has not been imported in this scope and cannot be accessed here");
             }
-            if (!member.IsStatic) {
-              ReportError(expr.tok, $"accessing member '{name}' requires an instance expression"); //TODO Unify with similar error messages
+            if (!member.IsStatic && !allowStaticReferenceToInstance) {
+              ReportError(expr.Origin, $"accessing member '{name}' requires an instance expression"); //TODO Unify with similar error messages
               // nevertheless, continue creating an expression that approximates a correct one
             }
-            var receiver = new StaticReceiverExpr(expr.Lhs.tok, (UserDefinedType)ty.NormalizeExpand(), (TopLevelDeclWithMembers)member.EnclosingClass, false);
+            var receiver = new StaticReceiverExpr(expr.Lhs.Origin, (UserDefinedType)ty.NormalizeExpand(), (TopLevelDeclWithMembers)member.EnclosingClass, false);
             receiver.PreType = Type2PreType(receiver.Type);
-            r = ResolveExprDotCall(expr.tok, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+            r = ResolveExprDotCall(expr.Origin, expr.SuffixNameNode, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
           }
         }
         if (r == null) {
-          ReportError(expr.tok, $"member '{name}' does not exist in {ri.Decl.WhatKind} '{ri.Decl.Name}'");
+          ReportMemberNotFoundError(expr.Origin, name, null, ri.Decl, resolutionContext);
         }
 
       } else if (lhs != null) {
         // ----- 4. Look up name in the type of the Lhs
-        var (member, tentativeReceiverType) = FindMember(expr.tok, expr.Lhs.PreType, name);
+        var (member, tentativeReceiverPreType) = FindMember(expr.Origin, expr.Lhs.PreType, name, resolutionContext,
+          expr.Lhs.Resolved != null);
         if (member != null) {
           if (!member.IsStatic) {
             var receiver = expr.Lhs;
-            AddSubtypeConstraint(tentativeReceiverType, receiver.PreType, expr.tok, $"receiver type ({{1}}) does not have a member named '{name}'");
-            r = ResolveExprDotCall(expr.tok, receiver, tentativeReceiverType, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+            AddSubtypeConstraint(tentativeReceiverPreType, receiver.PreType, expr.Origin,
+              $"receiver type ({{1}}) does not have a member named '{name}'");
+            r = ResolveExprDotCall(expr.Origin, expr.SuffixNameNode, receiver, tentativeReceiverPreType, member, args, expr.OptTypeArguments,
+              resolutionContext, allowMethodCall);
           } else {
-            var receiver = new StaticReceiverExpr(expr.tok, (TopLevelDeclWithMembers)tentativeReceiverType.Decl, true, lhs);
-            receiver.PreType = Type2PreType(receiver.Type);
-            r = ResolveExprDotCall(expr.tok, receiver, null, member, args, expr.OptTypeArguments, resolutionContext, allowMethodCall);
+            var receiver = new StaticReceiverExpr(expr.Origin, new InferredTypeProxy(), true) {
+              PreType = tentativeReceiverPreType.SansPrintablePreType(),
+              ObjectToDiscard = lhs
+            };
+            r = ResolveExprDotCall(expr.Origin, expr.SuffixNameNode, receiver, null, member, args, expr.OptTypeArguments, resolutionContext,
+              allowMethodCall);
           }
         }
       }
@@ -1517,7 +1612,7 @@ Expression ResolveDotSuffix(ExprDotName expr, bool isLastNameSegment, List<Actua
       return rWithArgs;
     }
 
-    Expression ResolveExprDotCall(IToken tok, Expression receiver, DPreType receiverPreTypeBound/*?*/,
+    Expression ResolveExprDotCall(IOrigin tok, Name name, Expression receiver, DPreType receiverPreTypeBound/*?*/,
       MemberDecl member, List<ActualBinding> args, List<Type> optTypeArguments, ResolutionContext resolutionContext, bool allowMethodCall) {
       Contract.Requires(tok != null);
       Contract.Requires(receiver != null);
@@ -1529,21 +1624,18 @@ Expression ResolveExprDotCall(IToken tok, Expression receiver, DPreType receiver
 
       receiverPreTypeBound ??= (DPreType)receiver.PreType.Normalize();
 
-      var rr = new MemberSelectExpr(tok, receiver, member.Name);
+      var rr = new MemberSelectExpr(tok, receiver, name);
       rr.Member = member;
 
       // Now, fill in rr.PreType.  This requires taking into consideration the type parameters passed to the receiver's type as well as any type
       // parameters used in this NameSegment/ExprDotName.
       // Add to "subst" the type parameters given to the member's class/datatype
-      rr.PreTypeApplication_AtEnclosingClass = new List<PreType>();
-      rr.PreTypeApplication_JustMember = new List<PreType>();
+      rr.PreTypeApplicationAtEnclosingClass = new List<PreType>();
+      rr.PreTypeApplicationJustMember = new List<PreType>();
       var rType = receiverPreTypeBound;
       var subst = PreType.PreTypeSubstMap(rType.Decl.TypeArgs, rType.Arguments);
-      if (member.EnclosingClass == null) {
-        // this can happen for some special members, like real.Floor
-      } else {
-        rr.PreTypeApplication_AtEnclosingClass.AddRange(rType.AsParentType(member.EnclosingClass, this).Arguments);
-      }
+      Contract.Assert(member.EnclosingClass != null);
+      rr.PreTypeApplicationAtEnclosingClass.AddRange(rType.AsParentType(member.EnclosingClass, this).Arguments);
 
       if (member is Field field) {
         if (optTypeArguments != null) {
@@ -1551,62 +1643,81 @@ Expression ResolveExprDotCall(IToken tok, Expression receiver, DPreType receiver
         }
         subst = BuildPreTypeArgumentSubstitute(subst, receiverPreTypeBound);
         rr.PreType = field.PreType.Substitute(subst);
-#if SOON
-        resolver.AddCallGraphEdgeForField(resolutionContext, field, rr);
-#endif
       } else if (member is Function function) {
         if (function is TwoStateFunction && !resolutionContext.IsTwoState) {
-          ReportError(tok, "two-state function ('{0}') can only be called in a two-state resolutionContext", member.Name);
+          ReportError(tok, "two-state function ('{0}') can only be called in a two-state context", member.Name);
         }
         int suppliedTypeArguments = optTypeArguments == null ? 0 : optTypeArguments.Count;
-        if (optTypeArguments != null && suppliedTypeArguments != function.TypeArgs.Count) {
-          ReportError(tok, "function '{0}' expects {1} type argument{2} (got {3})",
-            member.Name, function.TypeArgs.Count, Util.Plural(function.TypeArgs.Count), suppliedTypeArguments);
+        if (optTypeArguments != null) {
+          if (suppliedTypeArguments == function.TypeArgs.Count) {
+            // preserve the given types in the resolved MemberSelectExpr
+            rr.TypeApplicationJustMember = optTypeArguments;
+          } else {
+            ReportError(tok, "function '{0}' expects {1} type argument{2} (got {3})",
+              member.Name, function.TypeArgs.Count, Util.Plural(function.TypeArgs.Count), suppliedTypeArguments);
+          }
         }
         for (int i = 0; i < function.TypeArgs.Count; i++) {
           var ta = i < suppliedTypeArguments ? Type2PreType(optTypeArguments[i]) :
             CreatePreTypeProxy($"function call to {function.Name}, type argument {i}");
-          rr.PreTypeApplication_JustMember.Add(ta);
+          rr.PreTypeApplicationJustMember.Add(ta);
           subst.Add(function.TypeArgs[i], ta);
         }
         subst = BuildPreTypeArgumentSubstitute(subst, receiverPreTypeBound);
-        var inParamTypes = function.Formals.ConvertAll(f => f.PreType.Substitute(subst));
+        AddTypeBoundConstraints(tok, function.TypeArgs, subst);
+        var inParamTypes = function.Ins.ConvertAll(f => f.PreType.Substitute(subst));
         var resultType = Type2PreType(function.ResultType).Substitute(subst);
         rr.PreType = BuiltInArrowType(inParamTypes, resultType);
-#if SOON
-        AddCallGraphEdge(resolutionContext, function, rr, IsFunctionReturnValue(function, args, resolutionContext));
-#endif
       } else {
         // the member is a method
         var method = (Method)member;
         if (!allowMethodCall) {
           // it's a method and method calls are not allowed in the given resolutionContext
           ReportError(tok, "expression is not allowed to invoke a {0} ({1})", member.WhatKind, member.Name);
+          return null;
         }
         int suppliedTypeArguments = optTypeArguments == null ? 0 : optTypeArguments.Count;
-        if (optTypeArguments != null && suppliedTypeArguments != method.TypeArgs.Count) {
-          ReportError(tok, "method '{0}' expects {1} type argument{2} (got {3})",
-            member.Name, method.TypeArgs.Count, Util.Plural(method.TypeArgs.Count), suppliedTypeArguments);
+        if (optTypeArguments != null) {
+          if (suppliedTypeArguments == method.TypeArgs.Count) {
+            // preserve the given types in the resolved MemberSelectExpr
+            rr.TypeApplicationJustMember = optTypeArguments;
+          } else {
+            ReportError(tok, "method '{0}' expects {1} type argument{2} (got {3})",
+              member.Name, method.TypeArgs.Count, Util.Plural(method.TypeArgs.Count), suppliedTypeArguments);
+          }
         }
         for (int i = 0; i < method.TypeArgs.Count; i++) {
           var ta = i < suppliedTypeArguments ? Type2PreType(optTypeArguments[i]) :
             CreatePreTypeProxy($"method call to {method.Name}, type argument {i}");
-          rr.PreTypeApplication_JustMember.Add(ta);
+          rr.PreTypeApplicationJustMember.Add(ta);
           subst.Add(method.TypeArgs[i], ta);
         }
         subst = BuildPreTypeArgumentSubstitute(subst, receiverPreTypeBound);
-#if SOON
-        rr.ResolvedOutparameterTypes = method.Outs.ConvertAll(f => f.PreType.Substitute(subst));
-#endif
-        rr.PreType = new UnusedPreType($"call to {method.WhatKind} {method.Name}");  // fill in this field, in order to make "rr" resolved
+        AddTypeBoundConstraints(tok, method.TypeArgs, subst);
+        rr.PreType = new MethodPreType($"call to {method.WhatKind} {method.Name}");  // fill in this field, in order to make "rr" resolved
       }
       return rr;
     }
 
-    ModuleResolver.MethodCallInformation ResolveApplySuffix(ApplySuffix e, ResolutionContext resolutionContext, bool allowMethodCall) {
+    void AddTypeBoundConstraints(IOrigin tok, List<TypeParameter> typeParameters, Dictionary<TypeParameter, PreType> subst) {
+      foreach (var typeParameter in typeParameters) {
+        foreach (var preTypeBound in TypeParameterBounds2PreTypes(typeParameter)) {
+          var preTypeBoundWithSubst = preTypeBound.Substitute(subst);
+          var actualPreType = subst[typeParameter];
+          AddSubtypeConstraint(preTypeBoundWithSubst, actualPreType, tok,
+            $"actual type argument '{{1}}' for formal type parameter '{typeParameter.Name}' must satisfy the type bound '{{0}}'");
+        }
+      }
+    }
+
+    public MethodCallInformation ResolveApplySuffix(ApplySuffix e, ResolutionContext resolutionContext, bool allowMethodCall) {
       Contract.Requires(e != null);
       Contract.Requires(resolutionContext != null);
-      Contract.Ensures(Contract.Result<ModuleResolver.MethodCallInformation>() == null || allowMethodCall);
+      Contract.Ensures(Contract.Result<MethodCallInformation>() == null || allowMethodCall);
+
+      if (e.MethodCallInfo != null) {
+        return e.MethodCallInfo;
+      }
 
       Expression r = null;  // upon success, the expression to which the ApplySuffix resolves
       var errorCount = ErrorCount;
@@ -1614,7 +1725,7 @@ ModuleResolver.MethodCallInformation ResolveApplySuffix(ApplySuffix e, Resolutio
         r = ResolveNameSegment((NameSegment)e.Lhs, true, e.Bindings.ArgumentBindings, resolutionContext, allowMethodCall);
         // note, if r is non-null, then e.Args have been resolved and r is a resolved expression that incorporates e.Args
       } else if (e.Lhs is ExprDotName) {
-        r = ResolveDotSuffix((ExprDotName)e.Lhs, true, e.Bindings.ArgumentBindings, resolutionContext, allowMethodCall);
+        r = ResolveDotSuffix((ExprDotName)e.Lhs, false, true, e.Bindings.ArgumentBindings, resolutionContext, allowMethodCall);
         // note, if r is non-null, then e.Args have been resolved and r is a resolved expression that incorporates e.Args
       } else {
         ResolveExpression(e.Lhs, resolutionContext);
@@ -1625,14 +1736,14 @@ ModuleResolver.MethodCallInformation ResolveApplySuffix(ApplySuffix e, Resolutio
       }
       Label atLabel = null;
       if (e.AtTok != null) {
-        atLabel = dominatingStatementLabels.Find(e.AtTok.val);
+        atLabel = DominatingStatementLabels.Find(e.AtTok.val);
         if (atLabel == null) {
           ReportError(e.AtTok, "no label '{0}' in scope at this time", e.AtTok.val);
         }
       }
       if (r == null) {
         // e.Lhs denotes a function value, or at least it's used as if it were
-        var dp = FindDefinedPreType(e.Lhs.PreType);
+        var dp = Constraints.FindDefinedPreType(e.Lhs.PreType, false);
         if (dp != null && DPreType.IsArrowType(dp.Decl)) {
           // e.Lhs does denote a function value
           // In the general case, we'll resolve this as an ApplyExpr, but in the more common case of the Lhs
@@ -1645,19 +1756,19 @@ ModuleResolver.MethodCallInformation ResolveApplySuffix(ApplySuffix e, Resolutio
           }
           if (callee != null) {
             // resolve as a FunctionCallExpr instead of as an ApplyExpr(MemberSelectExpr)
-            var rr = new FunctionCallExpr(e.Lhs.tok, callee.Name, mse.Obj, e.tok, e.CloseParen, e.Bindings, atLabel) {
+            var rr = new FunctionCallExpr(e.Origin, mse.MemberNameNode, mse.Obj, e.Origin, e.CloseParen, e.Bindings, atLabel) {
               Function = callee,
-              PreTypeApplication_AtEnclosingClass = mse.PreTypeApplication_AtEnclosingClass,
-              PreTypeApplication_JustFunction = mse.PreTypeApplication_JustMember
+              PreTypeApplication_AtEnclosingClass = mse.PreTypeApplicationAtEnclosingClass,
+              PreTypeApplication_JustFunction = mse.PreTypeApplicationJustMember
             };
             var typeMap = mse.PreTypeArgumentSubstitutionsAtMemberDeclaration();
             var preTypeMap = BuildPreTypeArgumentSubstitute(
                 typeMap.Keys.ToDictionary(tp => tp, tp => typeMap[tp]));
-            ResolveActualParameters(rr.Bindings, callee.Formals, e.tok, callee, resolutionContext, preTypeMap, callee.IsStatic ? null : mse.Obj);
+            ResolveActualParameters(rr.Bindings, callee.Ins, e.Origin, callee, resolutionContext, preTypeMap, callee.IsStatic ? null : mse.Obj);
             rr.PreType = Type2PreType(callee.ResultType).Substitute(preTypeMap);
             if (errorCount == ErrorCount) {
               Contract.Assert(!(mse.Obj is StaticReceiverExpr) || callee.IsStatic);  // this should have been checked already
-              Contract.Assert(callee.Formals.Count == rr.Args.Count);  // this should have been checked already
+              Contract.Assert(callee.Ins.Count == rr.Args.Count);  // this should have been checked already
             }
             // further bookkeeping
             if (callee is ExtremePredicate) {
@@ -1670,12 +1781,12 @@ ModuleResolver.MethodCallInformation ResolveApplySuffix(ApplySuffix e, Resolutio
             var formals = new List<Formal>();
             for (var i = 0; i < dp.Arguments.Count - 1; i++) {
               var argType = dp.Arguments[i];
-              var formal = new ImplicitFormal(e.tok, "_#p" + i, new InferredTypeProxy(), true, false);
+              var formal = new ImplicitFormal(e.Origin, "_#p" + i, new InferredTypeProxy(), true, false);
               formal.PreType = argType;
               formals.Add(formal);
             }
-            ResolveActualParameters(e.Bindings, formals, e.tok, dp, resolutionContext, new Dictionary<TypeParameter, PreType>(), null);
-            r = new ApplyExpr(e.Lhs.tok, e.Lhs, e.Args, e.CloseParen);
+            ResolveActualParameters(e.Bindings, formals, e.Origin, dp, resolutionContext, new Dictionary<TypeParameter, PreType>(), null);
+            r = new ApplyExpr(e.Lhs.Origin, e.Lhs, e.Args, e.CloseParen);
             ResolveExpression(r, resolutionContext);
             r.PreType = dp.Arguments.Last();
           }
@@ -1683,10 +1794,10 @@ ModuleResolver.MethodCallInformation ResolveApplySuffix(ApplySuffix e, Resolutio
           // e.Lhs is used as if it were a function value, but it isn't
           var lhs = e.Lhs.Resolved;
           if (lhs != null && lhs.PreType is PreTypePlaceholderModule) {
-            ReportError(e.tok, "name of module ({0}) is used as a function", ((Resolver_IdentifierExpr)lhs).Decl.Name);
+            ReportError(e.Origin, "name of module ({0}) is used as a function", ((ResolverIdentifierExpr)lhs).Decl.Name);
           } else if (lhs != null && lhs.PreType is PreTypePlaceholderType) {
-            var ri = (Resolver_IdentifierExpr)lhs;
-            ReportError(e.tok, "name of {0} ({1}) is used as a function", ri.Decl.WhatKind, ri.Decl.Name);
+            var ri = (ResolverIdentifierExpr)lhs;
+            ReportError(e.Origin, "name of {0} ({1}) is used as a function", ri.Decl.WhatKind, ri.Decl.Name);
           } else {
             if (lhs is MemberSelectExpr mse && mse.Member is Method) {
               if (atLabel != null) {
@@ -1698,12 +1809,14 @@ ModuleResolver.MethodCallInformation ResolveApplySuffix(ApplySuffix e, Resolutio
                 }
               }
               if (allowMethodCall) {
-                return new ModuleResolver.MethodCallInformation(e.RangeToken, mse, e.Bindings.ArgumentBindings);
+                Contract.Assert(!e.Bindings.WasResolved); // we expect that .Bindings has not yet been processed, so we use just .ArgumentBindings in the next line
+                e.MethodCallInfo = new MethodCallInformation(e.Origin, mse, e.Bindings.ArgumentBindings);
+                return e.MethodCallInfo;
               } else {
-                ReportError(e.tok, "{0} call is not allowed to be used in an expression resolutionContext ({1})", mse.Member.WhatKind, mse.Member.Name);
+                ReportError(e.Origin, "{0} call is not allowed to be used in an expression resolutionContext ({1})", mse.Member.WhatKind, mse.Member.Name);
               }
             } else if (lhs != null) {  // if e.Lhs.Resolved is null, then e.Lhs was not successfully resolved and an error has already been reported
-              ReportError(e.tok, "non-function expression (of type {0}) is called with parameters", e.Lhs.PreType);
+              ReportError(e.Origin, "non-function expression (of type {0}) is called with parameters", e.Lhs.PreType);
             }
           }
           // resolve the arguments, even in the presence of the errors above
@@ -1737,8 +1850,8 @@ ModuleResolver.MethodCallInformation ResolveApplySuffix(ApplySuffix e, Resolutio
     /// desugaring during resolution, because then the desugaring can be constructed as a non-resolved expression on which ResolveExpression
     /// is called--this is easier than constructing an already-resolved expression.
     /// </summary>
-    (Expression, Expression) ResolveDatatypeUpdate(IToken tok, DPreType rootPreType, Expression root, DatatypeDecl dt,
-      List<Tuple<IToken, string, Expression>> memberUpdates,
+    (Expression, Expression) ResolveDatatypeUpdate(IOrigin tok, DPreType rootPreType, Expression root, DatatypeDecl dt,
+      List<Tuple<IOrigin, string, Expression>> memberUpdates,
       ResolutionContext resolutionContext, out List<MemberDecl> members, out List<DatatypeCtor> legalSourceConstructors) {
       Contract.Requires(tok != null);
       Contract.Requires(root != null);
@@ -1781,8 +1894,8 @@ ModuleResolver.MethodCallInformation ResolveApplySuffix(ApplySuffix e, Resolutio
                 rhsBindings.Add(updateName, new Tuple<BoundVar, IdentifierExpr, Expression>(null, null, updateValue));
               } else {
                 var xName = resolver.FreshTempVarName($"dt_update#{updateName}#", resolutionContext.CodeContext);
-                var xVar = new BoundVar(new AutoGeneratedToken(tok), xName, new InferredTypeProxy());
-                var x = new IdentifierExpr(new AutoGeneratedToken(tok), xVar);
+                var xVar = new BoundVar(new AutoGeneratedOrigin(tok), xName, new InferredTypeProxy());
+                var x = new IdentifierExpr(new AutoGeneratedOrigin(tok), xVar);
                 rhsBindings.Add(updateName, new Tuple<BoundVar, IdentifierExpr, Expression>(xVar, x, updateValue));
               }
             }
@@ -1834,16 +1947,16 @@ ModuleResolver.MethodCallInformation ResolveApplySuffix(ApplySuffix e, Resolutio
     ///       CandidateResultConstructorN(x, y, ..., d.k0, d.k1, ...)
     ///
     /// </summary>
-    private Expression DesugarDatatypeUpdate(IToken tok, Expression root, DPreType rootPreType,
+    private Expression DesugarDatatypeUpdate(IOrigin tok, Expression root, DPreType rootPreType,
       List<DatatypeCtor> candidateResultCtors, Dictionary<string, Tuple<BoundVar, IdentifierExpr, Expression>> rhsBindings,
       ResolutionContext resolutionContext) {
       Contract.Requires(1 <= candidateResultCtors.Count);
 
       // Create a unique name for d', the variable we introduce in the let expression
       var dName = resolver.FreshTempVarName("dt_update_tmp#", resolutionContext.CodeContext);
-      var dVar = new BoundVar(new AutoGeneratedToken(tok), dName, new InferredTypeProxy());
+      var dVar = new BoundVar(new AutoGeneratedOrigin(tok), dName, new InferredTypeProxy());
       dVar.PreType = rootPreType;
-      var d = new IdentifierExpr(new AutoGeneratedToken(tok), dVar);
+      var d = new IdentifierExpr(new AutoGeneratedOrigin(tok), dVar);
       Expression body = null;
       candidateResultCtors.Reverse();
       foreach (var crc in candidateResultCtors) {
@@ -1854,7 +1967,7 @@ private Expression DesugarDatatypeUpdate(IToken tok, Expression root, DPreType r
           if (rhsBindings.TryGetValue(f.Name, out var info)) {
             ctorArg = info.Item2 ?? info.Item3;
           } else {
-            ctorArg = new ExprDotName(tok, d, f.Name, null);
+            ctorArg = new ExprDotName(tok, d, new Name(f.Name), null);
           }
           var bindingName = new Token(tok.line, tok.col) {
             Uri = tok.Uri,
@@ -1862,12 +1975,14 @@ private Expression DesugarDatatypeUpdate(IToken tok, Expression root, DPreType r
           };
           actualBindings.Add(new ActualBinding(bindingName, ctorArg));
         }
-        var ctorCall = new DatatypeValue(tok, crc.EnclosingDatatype.Name, crc.Name, actualBindings);
+        var ctorCall = new DatatypeValue(tok, crc.EnclosingDatatype.Name, crc.Name, actualBindings) {
+          Ctor = crc
+        };
         if (body == null) {
           body = ctorCall;
         } else {
           // body := if d.crc? then ctor_call else body
-          var guard = new ExprDotName(tok, d, crc.QueryField.Name, null);
+          var guard = new ExprDotName(tok, d, new Name(crc.QueryField.Name), null);
           body = new ITEExpr(tok, false, guard, ctorCall, body);
         }
       }
@@ -1930,20 +2045,13 @@ void ResolveCasePattern<VT>(CasePattern<VT> pat, PreType sourcePreType, Resoluti
           v.MakeGhost();
         }
         Contract.Assert(v.PreType != null);
-#if SOON
-        AddTypeDependencyEdges(resolutionContext, v.Type);
-#endif
         // Note, the following type constraint checks that the RHS type can be assigned to the new variable on the left. In particular, it
         // does not check that the entire RHS can be assigned to something of the type of the pattern on the left.  For example, consider
         // a type declared as "datatype Atom<T> = MakeAtom(T)", where T is a non-variant type argument.  Suppose the RHS has type Atom<nat>
         // and that the LHS is the pattern MakeAtom(x: int).  This is okay, despite the fact that Atom<nat> is not assignable to Atom<int>.
         // The reason is that the purpose of the pattern on the left is really just to provide a skeleton to introduce bound variables in.
-#if SOON
-        EagerAddAssignableConstraint(v.Tok, v.Type, sourcePreType, "type of corresponding source/RHS ({1}) does not match type of bound variable ({0})");
-#else
-        AddSubtypeConstraint(v.PreType, sourcePreType, v.Tok,
+        AddSubtypeConstraint(v.PreType, sourcePreType, v.Origin,
           "type of corresponding source/RHS ({1}) does not match type of bound variable ({0})");
-#endif
         pat.AssembleExprPreType(null);
         return;
       }
@@ -1956,14 +2064,14 @@ void ResolveCasePattern<VT>(CasePattern<VT> pat, PreType sourcePreType, Resoluti
           dtd = ctor.EnclosingDatatype;
           sourceTypeArguments = dtd.TypeArgs.ConvertAll(tp => (PreType)CreatePreTypeProxy($"type parameter '{tp.Name}'"));
           var lhsPreType = new DPreType(dtd, sourceTypeArguments);
-          AddSubtypeConstraint(lhsPreType, sourcePreType, pat.tok, $"type of RHS ({{0}}) does not match type of bound variable '{pat.Id}' ({{1}})");
+          AddSubtypeConstraint(lhsPreType, sourcePreType, pat.Origin, $"type of RHS ({{0}}) does not match type of bound variable '{pat.Id}' ({{1}})");
         }
       }
       if (dtd == null) {
         Contract.Assert(ctor == null);
-        ReportError(pat.tok, "to use a pattern, the type of the source/RHS expression must be a datatype (instead found {0})", sourcePreType);
+        ReportError(pat.Origin, "to use a pattern, the type of the source/RHS expression must be a datatype (instead found {0})", sourcePreType);
       } else if (ctor == null) {
-        ReportError(pat.tok, "constructor {0} does not exist in datatype {1}", pat.Id, dtd.Name);
+        ReportError(pat.Origin, "constructor {0} does not exist in datatype {1}", pat.Id, dtd.Name);
       } else {
         if (pat.Arguments == null) {
           if (ctor.Formals.Count == 0) {
@@ -1973,13 +2081,14 @@ void ResolveCasePattern<VT>(CasePattern<VT> pat, PreType sourcePreType, Resoluti
           }
         } else {
           if (ctor.Formals.Count != pat.Arguments.Count) {
-            ReportError(pat.tok, "pattern for constructor {0} has wrong number of formals (found {1}, expected {2})", pat.Id, pat.Arguments.Count, ctor.Formals.Count);
+            ReportError(pat.Origin, "pattern for constructor {0} has wrong number of formals (found {1}, expected {2})", pat.Id, pat.Arguments.Count, ctor.Formals.Count);
           }
         }
         // build the type-parameter substitution map for this use of the datatype
         Contract.Assert(dtd.TypeArgs.Count == sourceTypeArguments.Count);  // follows from the type previously having been successfully resolved
         var subst = PreType.PreTypeSubstMap(dtd.TypeArgs, sourceTypeArguments);
         // recursively call ResolveCasePattern on each of the arguments
+        var prevErrorCount = ErrorCount;
         var j = 0;
         if (pat.Arguments != null) {
           foreach (var arg in pat.Arguments) {
@@ -1991,7 +2100,7 @@ void ResolveCasePattern<VT>(CasePattern<VT> pat, PreType sourcePreType, Resoluti
             j++;
           }
         }
-        if (j == ctor.Formals.Count) {
+        if (ErrorCount == prevErrorCount && j == ctor.Formals.Count) {
           pat.AssembleExprPreType(sourceTypeArguments);
         }
       }
@@ -2021,7 +2130,7 @@ private bool ResolveDatatypeValue(ResolutionContext resolutionContext, DatatypeV
       if (!datatypeDecl.ConstructorsByName.TryGetValue(dtv.MemberName, out var ctor)) {
         ok = false;
         if (complain) {
-          ReportError(dtv.tok, "undeclared constructor {0} in datatype {1}", dtv.MemberName, dtv.DatatypeName);
+          ReportError(dtv.Origin, "undeclared constructor {0} in datatype {1}", dtv.MemberName, dtv.DatatypeName);
         }
       } else {
         Contract.Assert(ctor != null); // follows from postcondition of TryGetValue
@@ -2029,7 +2138,7 @@ private bool ResolveDatatypeValue(ResolutionContext resolutionContext, DatatypeV
       }
       if (complain && ctor != null) {
         var subst = PreType.PreTypeSubstMap(datatypeDecl.TypeArgs, gt);
-        ResolveActualParameters(dtv.Bindings, ctor.Formals, dtv.tok, ctor, resolutionContext, subst, null);
+        ResolveActualParameters(dtv.Bindings, ctor.Formals, dtv.Origin, ctor, resolutionContext, subst, null);
       } else {
         // still resolve the expressions
         foreach (var binding in dtv.Bindings.ArgumentBindings) {
@@ -2038,32 +2147,29 @@ private bool ResolveDatatypeValue(ResolutionContext resolutionContext, DatatypeV
         dtv.Bindings.AcceptArgumentExpressionsAsExactParameterList();
       }
 
-      if (CodeContextWrapper.Unwrap(resolutionContext.CodeContext) is ICallable caller && caller.EnclosingModule == datatypeDecl.EnclosingModuleDefinition) {
-        caller.EnclosingModule.CallGraph.AddEdge(caller, datatypeDecl);
-      }
       return ok && ctor.Formals.Count == dtv.Arguments.Count;
     }
 
-    PreType ResolveSingleSelectionExpr(IToken tok, PreType collectionPreType, Expression index) {
-      var resultPreType = CreatePreTypeProxy("seq selection");
+    PreType ResolveSingleSelectionExpr(IOrigin tok, PreType collectionPreType, Expression index) {
+      var resultPreType = CreatePreTypeProxy("selection []");
       Constraints.AddGuardedConstraint(() => {
-        var sourcePreType = collectionPreType.Normalize() as DPreType;
-        if (sourcePreType != null) {
-          var familyDeclName = AncestorName(sourcePreType);
+        var sourcePreType = Constraints.ApproximateReceiverType(collectionPreType, null);
+        if (sourcePreType != null && AncestorPreType(sourcePreType) is { } ancestorPreType) {
+          var familyDeclName = ancestorPreType.Decl.Name;
           switch (familyDeclName) {
-            case "array":
-            case "seq":
-              AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IntLikeOrBitvector, index.PreType, index.tok, "index expression must have an integer type (got {0})");
-              AddSubtypeConstraint(resultPreType, sourcePreType.Arguments[0], tok, "type does not agree with element type {1} (got {0})");
+            case PreType.TypeNameArray:
+            case PreType.TypeNameSeq:
+              ConstrainToIntFamilyOrBitvector(index.PreType, index.Origin, "index expression must have an integer or bitvector type (got {0})");
+              AddSubtypeConstraint(resultPreType, ancestorPreType.Arguments[0], tok, "type does not agree with element type {1} (got {0})");
               break;
-            case "multiset":
-              AddSubtypeConstraint(sourcePreType.Arguments[0], index.PreType, index.tok, "type does not agree with element type {0} (got {1})");
+            case PreType.TypeNameMultiset:
+              AddSubtypeConstraint(ancestorPreType.Arguments[0], index.PreType, index.Origin, "type does not agree with element type {0} (got {1})");
               ConstrainToIntFamily(resultPreType, tok, "multiset multiplicity must have an integer type (got {0})");
               break;
-            case "map":
-            case "imap":
-              AddSubtypeConstraint(sourcePreType.Arguments[0], index.PreType, index.tok, "type does not agree with domain type {0} (got {1})");
-              AddSubtypeConstraint(resultPreType, sourcePreType.Arguments[1], tok, "type does not agree with value type of {1} (got {0})");
+            case PreType.TypeNameMap:
+            case PreType.TypeNameImap:
+              AddSubtypeConstraint(ancestorPreType.Arguments[0], index.PreType, index.Origin, "type does not agree with domain type {0} (got {1})");
+              AddSubtypeConstraint(resultPreType, ancestorPreType.Arguments[1], tok, "type does not agree with value type of {1} (got {0})");
               break;
             default:
               ReportError(tok, "element selection requires a sequence, array, multiset, or map (got {0})", sourcePreType);
@@ -2076,35 +2182,42 @@ PreType ResolveSingleSelectionExpr(IToken tok, PreType collectionPreType, Expres
       return resultPreType;
     }
 
-    PreType ResolveRangeSelectionExpr(IToken tok, PreType collectionPreType, Expression e0, Expression e1) {
-      var resultElementPreType = CreatePreTypeProxy("multi-index selection");
-      var resultPreType = new DPreType(BuiltInTypeDecl("seq"), new List<PreType>() { resultElementPreType });
+    void ResolveRangeSelectionExpr(IOrigin tok, PreType sourceCollectionPreType, Expression expr, Expression e0, Expression e1) {
+      var resultElementPreType = CreatePreTypeProxy("index-range selection elements");
+      SetupCollectionProducingExpr(PreType.TypeNameSeq, "index-range selection", expr, resultElementPreType);
+
       if (e0 != null) {
-        AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IntLikeOrBitvector, e0.PreType, e0.tok,
-          "multi-element selection position expression must have an integer type (got {0})");
+        ConstrainToIntFamilyOrBitvector(e0.PreType, e0.Origin,
+          "multi-element selection position expression must have an integer or bitvector type (got {0})");
       }
       if (e1 != null) {
-        AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IntLikeOrBitvector, e1.PreType, e1.tok,
-          "multi-element selection position expression must have an integer type (got {0})");
+        ConstrainToIntFamilyOrBitvector(e1.PreType, e1.Origin,
+          "multi-element selection position expression must have an integer or bitvector type (got {0})");
       }
+
+      // In the expression s[e0..e1], correlate the type of s with the result type.
+      //   - If s is a sequence type, then the result must be of the same seq or newtype-seq type, with a co-variant element pre-type
+      //   - If s is an array type, then the result is allowed to be any seq or newtype-seq with a co-variant element pre-type
       Constraints.AddGuardedConstraint(() => {
-        var sourcePreType = collectionPreType.Normalize() as DPreType;
-        if (sourcePreType != null) {
+        if (sourceCollectionPreType.NormalizeWrtScope() is DPreType sourcePreType) {
           var familyDeclName = AncestorName(sourcePreType);
           switch (familyDeclName) {
-            case "seq":
-            case "array":
-              AddSubtypeConstraint(resultElementPreType, sourcePreType.Arguments[0], tok, "type does not agree with element type {1} (got {0})");
+            case PreType.TypeNameSeq:
+              AddSubtypeConstraint(expr.PreType, sourceCollectionPreType, tok,
+                "resulting sequence ({0}) type does not agree with source sequence type ({1})");
+              break;
+            case PreType.TypeNameArray:
+              AddSubtypeConstraint(resultElementPreType, AncestorPreType(sourcePreType)!.Arguments[0], tok,
+                "type does not agree with element type {1} (got {0})");
               break;
             default:
-              ReportError(tok, "multi-selection of elements requires a sequence or array (got {0})", collectionPreType);
+              ReportError(tok, "multi-selection of elements requires a sequence or array (got {0})", sourceCollectionPreType);
               break;
           }
           return true;
         }
         return false;
       });
-      return resultPreType;
     }
 
     /// <summary>
@@ -2131,31 +2244,33 @@ public Expression DesugarElephantExpr(LetOrFailExpr expr, ResolutionContext reso
       var burrito = resolver.FreshTempVarName("valueOrError", resolutionContext.CodeContext);
       var burritoType = new InferredTypeProxy();
       // "var burrito := E;"
-      return resolver.LetVarIn(expr.tok, burrito, burritoType, expr.Rhs,
+      return resolver.LetVarIn(expr.Origin, burrito, burritoType, expr.Rhs,
         // "if burrito.IsFailure()"
-        new ITEExpr(expr.tok, false, resolver.VarDotFunction(expr.tok, burrito, "IsFailure"),
+        new ITEExpr(expr.Origin, false, resolver.VarDotFunction(expr.Origin, burrito, "IsFailure"),
           // "then burrito.PropagateFailure()"
-          resolver.VarDotFunction(expr.tok, burrito, "PropagateFailure"),
+          resolver.VarDotFunction(expr.Origin, burrito, "PropagateFailure"),
           // "else"
           expr.Lhs == null
             // "Body"
             ? expr.Body
             // "var x: T := burrito.Extract(); Body"
-            : resolver.LetPatIn(expr.tok, expr.Lhs, resolver.VarDotFunction(expr.tok, burrito, "Extract"), expr.Body)));
+            : resolver.LetPatIn(expr.Origin, expr.Lhs, resolver.VarDotFunction(expr.Origin, burrito, "Extract"), expr.Body)));
     }
 
-    private void EnsureSupportsErrorHandling(IToken tok, DPreType burritoPreType, bool expectExtract, string keyword = null) {
+    private void EnsureSupportsErrorHandling(IOrigin tok, DPreType burritoPreType, bool expectExtract, ResolutionContext resolutionContext, [CanBeNull] string keyword) {
       Contract.Requires(tok != null);
       Contract.Requires(burritoPreType != null);
 
-      var (memberIsFailure, _) = FindMember(tok, burritoPreType, "IsFailure");
-      var (memberPropagate, _) = FindMember(tok, burritoPreType, "PropagateFailure");
-      var (memberExtract, _) = FindMember(tok, burritoPreType, "Extract");
+      var (memberIsFailure, _) = FindMember(tok, burritoPreType, "IsFailure", resolutionContext);
+      var (memberPropagate, _) = FindMember(tok, burritoPreType, "PropagateFailure", resolutionContext);
+      var (memberExtract, _) = FindMember(tok, burritoPreType, "Extract", resolutionContext, reportErrorOnMissingMember: expectExtract);
 
       if (keyword != null) {
         if (memberIsFailure == null || (memberExtract != null) != expectExtract) {
           // more details regarding which methods are missing have already been reported by regular resolution
-          var requiredMembers = expectExtract ? "members IsFailure() and Extract()" : "member IsFailure(), but not Extract()";
+          var requiredMembers = expectExtract
+            ? "members IsFailure() and Extract()"
+            : "member IsFailure(), but not Extract()";
           ReportError(tok, $"right-hand side of ':- {keyword}', which is of type '{burritoPreType}', must have {requiredMembers}");
         }
       } else {
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeResolve.Statements.cs b/Source/DafnyCore/Resolver/PreType/PreTypeResolve.Statements.cs
index 4755f9e3ec8..4970aa86d9f 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeResolve.Statements.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeResolve.Statements.cs
@@ -7,24 +7,25 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Numerics;
 using System.Diagnostics.Contracts;
-using System.Runtime.Intrinsics.X86;
 using JetBrains.Annotations;
-using Microsoft.Boogie;
-using Bpl = Microsoft.Boogie;
-using ResolutionContext = Microsoft.Dafny.ResolutionContext;
 
 namespace Microsoft.Dafny {
-  public partial class PreTypeResolver {
-    private Scope<Statement> enclosingStatementLabels;
-    private readonly Scope<Label> dominatingStatementLabels;
+  public partial class PreTypeResolver : INewOrOldResolver {
+    public Scope<Label> DominatingStatementLabels { get; }
+
+    public Scope<Statement> EnclosingStatementLabels { get; set; }
+
+    public List<Statement> LoopStack {
+      get => loopStack;
+      set => loopStack = value;
+    }
+
     private List<Statement> loopStack = new();  // the enclosing loops (from which it is possible to break out)
     bool inBodyInitContext;  // "true" only if "currentMethod is Constructor"
 
-    void ResolveBlockStatement(BlockStmt blockStmt, ResolutionContext resolutionContext) {
+    public void ResolveBlockStatement(BlockStmt blockStmt, ResolutionContext resolutionContext) {
       Contract.Requires(blockStmt != null);
       Contract.Requires(resolutionContext != null);
 
@@ -47,36 +48,36 @@ void ResolveBlockStatement(BlockStmt blockStmt, ResolutionContext resolutionCont
       }
     }
 
-    void ResolveStatementWithLabels(Statement stmt, ResolutionContext resolutionContext) {
+    public void ResolveStatementWithLabels(Statement stmt, ResolutionContext resolutionContext) {
       Contract.Requires(stmt != null);
       Contract.Requires(resolutionContext != null);
 
-      enclosingStatementLabels.PushMarker();
+      EnclosingStatementLabels.PushMarker();
       // push labels
       for (var l = stmt.Labels; l != null; l = l.Next) {
         var lnode = l.Data;
         Contract.Assert(lnode.Name != null);  // LabelNode's with .Label==null are added only during resolution of the break statements with 'stmt' as their target, which hasn't happened yet
-        var prev = enclosingStatementLabels.Find(lnode.Name);
+        var prev = EnclosingStatementLabels.Find(lnode.Name);
         if (prev == stmt) {
           ReportError(lnode.Tok, "duplicate label");
         } else if (prev != null) {
           ReportError(lnode.Tok, "label shadows an enclosing label");
         } else {
-          var r = enclosingStatementLabels.Push(lnode.Name, stmt);
+          var r = EnclosingStatementLabels.Push(lnode.Name, stmt);
           Contract.Assert(r == Scope<Statement>.PushResult.Success);  // since we just checked for duplicates, we expect the Push to succeed
-          if (dominatingStatementLabels.Find(lnode.Name) != null) {
+          if (DominatingStatementLabels.Find(lnode.Name) != null) {
             ReportError(lnode.Tok, "label shadows a dominating label");
           } else {
-            var rr = dominatingStatementLabels.Push(lnode.Name, lnode);
+            var rr = DominatingStatementLabels.Push(lnode.Name, lnode);
             Contract.Assert(rr == Scope<Label>.PushResult.Success);  // since we just checked for duplicates, we expect the Push to succeed
           }
         }
       }
       ResolveStatement(stmt, resolutionContext);
-      enclosingStatementLabels.PopMarker();
+      EnclosingStatementLabels.PopMarker();
     }
 
-    Label/*?*/ ResolveDominatingLabelInExpr(IToken tok, string/*?*/ labelName, string expressionDescription, ResolutionContext resolutionContext) {
+    Label/*?*/ ResolveDominatingLabelInExpr(IOrigin tok, string/*?*/ labelName, string expressionDescription, ResolutionContext resolutionContext) {
       Contract.Requires(tok != null);
       Contract.Requires(expressionDescription != null);
       Contract.Requires(resolutionContext != null);
@@ -85,7 +86,7 @@ void ResolveStatementWithLabels(Statement stmt, ResolutionContext resolutionCont
       if (!resolutionContext.IsTwoState) {
         ReportError(tok, $"{expressionDescription} expressions are not allowed in this context");
       } else if (labelName != null) {
-        label = dominatingStatementLabels.Find(labelName);
+        label = DominatingStatementLabels.Find(labelName);
         if (label == null) {
           ReportError(tok, $"no label '{labelName}' in scope at this time");
         }
@@ -97,80 +98,24 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
       Contract.Requires(stmt != null);
       Contract.Requires(resolutionContext != null);
 
+      if (stmt is ICanResolveNewAndOld canResolve) {
+        canResolve.GenResolve(this, resolutionContext);
+        return;
+      }
+
       if (!(stmt is ForallStmt || stmt is ForLoopStmt)) {  // "forall" and "for" statements do their own attribute resolution below
         ResolveAttributes(stmt, resolutionContext, false);
       }
-      if (stmt is PredicateStmt) {
-        var s = (PredicateStmt)stmt;
-        var assertStmt = stmt as AssertStmt;
-        if (assertStmt != null && assertStmt.Label != null) {
-          if (dominatingStatementLabels.Find(assertStmt.Label.Name) != null) {
-            ReportError(assertStmt.Label.Tok, "assert label shadows a dominating label");
-          } else {
-            var rr = dominatingStatementLabels.Push(assertStmt.Label.Name, assertStmt.Label);
-            Contract.Assert(rr == Scope<Label>.PushResult.Success);  // since we just checked for duplicates, we expect the Push to succeed
-          }
-        }
-        ResolveExpression(s.Expr, resolutionContext);
-        ConstrainTypeExprBool(s.Expr, "condition is expected to be of type bool, but is {0}");
-        if (assertStmt != null && assertStmt.Proof != null) {
-          // clear the labels for the duration of checking the proof body, because break statements are not allowed to leave a the proof body
-          var prevLblStmts = enclosingStatementLabels;
-          var prevLoopStack = loopStack;
-          enclosingStatementLabels = new Scope<Statement>(resolver.Options);
-          loopStack = new List<Statement>();
-          ResolveStatement(assertStmt.Proof, resolutionContext);
-          enclosingStatementLabels = prevLblStmts;
-          loopStack = prevLoopStack;
-        }
-        if (stmt is ExpectStmt expectStmt) {
-          if (expectStmt.Message == null) {
-            expectStmt.Message = new StringLiteralExpr(s.Tok, "expectation violation", false);
-          }
-          ResolveExpression(expectStmt.Message, resolutionContext);
-        }
-
-      } else if (stmt is PrintStmt) {
+      if (stmt is PrintStmt) {
         var s = (PrintStmt)stmt;
         foreach (var e in s.Args) {
           ResolveExpression(e, resolutionContext);
         }
 
-      } else if (stmt is RevealStmt) {
-        var s = (RevealStmt)stmt;
-        foreach (var expr in s.Exprs) {
-          var name = RevealStmt.SingleName(expr);
-          var labeledAssert = name == null ? null : dominatingStatementLabels.Find(name) as AssertLabel;
-          if (labeledAssert != null) {
-            s.LabeledAsserts.Add(labeledAssert);
-          } else {
-            var revealResolutionContext = resolutionContext with { InReveal = true };
-            if (expr is ApplySuffix applySuffix) {
-              var methodCallInfo = ResolveApplySuffix(applySuffix, revealResolutionContext, true);
-              if (methodCallInfo == null) {
-                ReportError(expr.tok, "expression has no reveal lemma");
-              } else if (methodCallInfo.Callee.Member is TwoStateLemma && !revealResolutionContext.IsTwoState) {
-                ReportError(methodCallInfo.Tok, "a two-state function can only be revealed in a two-state context");
-              } else if (methodCallInfo.Callee.AtLabel != null) {
-                Contract.Assert(methodCallInfo.Callee.Member is TwoStateLemma);
-                ReportError(methodCallInfo.Tok, "to reveal a two-state function, do not list any parameters or @-labels");
-              } else {
-                var call = new CallStmt(s.RangeToken, new List<Expression>(), methodCallInfo.Callee, methodCallInfo.ActualParameters);
-                s.ResolvedStatements.Add(call);
-              }
-            } else {
-              ResolveExpression(expr, revealResolutionContext);
-            }
-          }
-        }
-        foreach (var a in s.ResolvedStatements) {
-          ResolveStatement(a, resolutionContext);
-        }
-
-      } else if (stmt is BreakStmt) {
-        var s = (BreakStmt)stmt;
+      } else if (stmt is BreakOrContinueStmt) {
+        var s = (BreakOrContinueStmt)stmt;
         if (s.TargetLabel != null) {
-          Statement target = enclosingStatementLabels.Find(s.TargetLabel.val);
+          Statement target = EnclosingStatementLabels.Find(s.TargetLabel.val);
           if (target == null) {
             ReportError(s.TargetLabel, $"{s.Kind} label is undefined or not in scope: {s.TargetLabel.val}");
           } else if (s.IsContinue && !(target is LoopStmt)) {
@@ -192,7 +137,7 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
             Statement target = loopStack[loopStack.Count - s.BreakAndContinueCount];
             if (target.Labels == null) {
               // make sure there is a label, because the compiler and translator will want to see a unique ID
-              target.Labels = new LList<Label>(new Label(target.Tok, null), null);
+              target.Labels = new LList<Label>(new Label(target.Origin, null), null);
             }
             s.TargetStmt = target;
           }
@@ -224,37 +169,37 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
             foreach (Formal f in cmc.Outs) {
               Expression produceLhs;
               if (stmt is ReturnStmt) {
-                var ident = new IdentifierExpr(f.tok, f.Name);
+                var ident = new IdentifierExpr(f.Origin, f.Name);
                 // resolve it here to avoid capture into more closely declared local variables
                 Contract.Assert(f.Type != null);
                 ident.Var = f;
                 ident.PreType = Type2PreType(ident.Var.Type);
                 produceLhs = ident;
               } else {
-                var yieldIdent = new MemberSelectExpr(f.tok, new ImplicitThisExpr(f.tok), f.Name);
+                var yieldIdent = new ExprDotName(f.Origin, new ImplicitThisExpr(f.Origin), new Name(f.Name), null);
                 ResolveExpression(yieldIdent, resolutionContext);
                 produceLhs = yieldIdent;
               }
               formals.Add(produceLhs);
             }
-            s.HiddenUpdate = new UpdateStmt(s.RangeToken, formals, s.Rhss, true);
+            s.HiddenUpdate = new AssignStatement(s.Origin, formals, s.Rhss, true);
             // resolving the update statement will check for return/yield statement specifics.
             ResolveStatement(s.HiddenUpdate, resolutionContext);
           }
         }
 
-      } else if (stmt is ConcreteUpdateStatement concreteUpdateStatement) {
+      } else if (stmt is ConcreteAssignStatement concreteUpdateStatement) {
         ResolveConcreteUpdateStmt(concreteUpdateStatement, null, resolutionContext);
 
       } else if (stmt is VarDeclStmt varDeclStmt) {
-        ResolveConcreteUpdateStmt(varDeclStmt.Update, varDeclStmt.Locals, resolutionContext);
+        ResolveConcreteUpdateStmt(varDeclStmt.Assign, varDeclStmt.Locals, resolutionContext);
 
       } else if (stmt is VarDeclPattern) {
         var s = (VarDeclPattern)stmt;
         foreach (var local in s.LocalVars) {
           int prevErrorCount = ErrorCount;
-          resolver.ResolveType(local.Tok, local.OptionalType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-          local.type = ErrorCount == prevErrorCount ? local.type = local.OptionalType : new InferredTypeProxy();
+          resolver.ResolveType(local.Origin, local.SyntacticType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          local.type = ErrorCount == prevErrorCount ? local.type = local.SyntacticType : new InferredTypeProxy();
           local.PreType = Type2PreType(local.type);
         }
         ResolveExpression(s.RHS, resolutionContext);
@@ -262,16 +207,16 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
         // Check for duplicate names now, because not until after resolving the case pattern do we know if identifiers inside it refer to bound variables or nullary constructors
         var c = 0;
         foreach (var bv in s.LHS.Vars) {
-          ScopePushAndReport(scope, bv.Name, bv, bv.Tok, "local variable");
+          ScopePushAndReport(scope, bv.Name, bv, bv.Origin, "local variable");
           c++;
         }
         if (c == 0) {
           // Every identifier-looking thing in the pattern resolved to a constructor; that is, this LHS is a constant literal
-          ReportError(s.LHS.tok, "LHS is a constant literal; to be legal, it must introduce at least one bound variable");
+          ReportError(s.LHS.Origin, "LHS is a constant literal; to be legal, it must introduce at least one bound variable");
         }
 
-      } else if (stmt is AssignStmt) {
-        var s = (AssignStmt)stmt;
+      } else if (stmt is SingleAssignStmt) {
+        var s = (SingleAssignStmt)stmt;
         int prevErrorCount = ErrorCount;
         ResolveExpression(s.Lhs, resolutionContext);  // allow ghosts for now, tightened up below
         bool lhsResolvedSuccessfully = ErrorCount == prevErrorCount;
@@ -300,13 +245,13 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
         if (s.Rhs is ExprRhs) {
           var rr = (ExprRhs)s.Rhs;
           ResolveExpression(rr.Expr, resolutionContext);
-          AddSubtypeConstraint(lhsPreType, rr.Expr.PreType, stmt.Tok, "RHS (of type {1}) not assignable to LHS (of type {0})");
+          AddSubtypeConstraint(lhsPreType, rr.Expr.PreType, stmt.Origin, "RHS (of type {1}) not assignable to LHS (of type {0})");
         } else if (s.Rhs is TypeRhs) {
           var rr = (TypeRhs)s.Rhs;
           ResolveTypeRhs(rr, stmt, resolutionContext);
-          AddSubtypeConstraint(lhsPreType, rr.PreType, stmt.Tok, "type {1} is not assignable to LHS (of type {0})");
-        } else if (s.Rhs is HavocRhs) {
-          // nothing else to do
+          AddSubtypeConstraint(lhsPreType, rr.PreType, stmt.Origin, "type {1} is not assignable to LHS (of type {0})");
+        } else if (s.Rhs is HavocRhs havocRhs) {
+          havocRhs.Resolve(this, resolutionContext);
         } else {
           Contract.Assert(false); throw new cce.UnreachableException();  // unexpected RHS
         }
@@ -319,41 +264,22 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
         ResolveBlockStatement(blockStmt, resolutionContext);
         scope.PopMarker();
 
-      } else if (stmt is IfStmt) {
-        var s = (IfStmt)stmt;
-        if (s.Guard != null) {
-          ResolveExpression(s.Guard, resolutionContext);
-          ConstrainTypeExprBool(s.Guard, "if statement", "condition is expected to be of type bool, but is {0}");
-        }
-
-        scope.PushMarker();
-        if (s.IsBindingGuard) {
-          var exists = (ExistsExpr)s.Guard;
-          foreach (var v in exists.BoundVars) {
-            ScopePushAndReport(v, "bound-variable", false);
-          }
-        }
-        dominatingStatementLabels.PushMarker();
-        ResolveBlockStatement(s.Thn, resolutionContext);
-        dominatingStatementLabels.PopMarker();
-        scope.PopMarker();
-
-        if (s.Els != null) {
-          dominatingStatementLabels.PushMarker();
-          ResolveStatement(s.Els, resolutionContext);
-          dominatingStatementLabels.PopMarker();
-        }
-
+      } else if (stmt is IfStmt ifStmt) {
+        ifStmt.Resolve(this, resolutionContext);
       } else if (stmt is AlternativeStmt) {
         var s = (AlternativeStmt)stmt;
-        ResolveAlternatives(s.Alternatives, null, resolutionContext);
+        s.Resolve(this, resolutionContext);
 
       } else if (stmt is OneBodyLoopStmt oneBodyLoopStmt) {
         ResolveOneBodyLoopStmt(oneBodyLoopStmt, resolutionContext);
 
       } else if (stmt is AlternativeLoopStmt) {
         var s = (AlternativeLoopStmt)stmt;
-        ResolveAlternatives(s.Alternatives, s, resolutionContext);
+        if (!resolutionContext.IsGhost && Options.ForbidNondeterminism) {
+          Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_case_based_loop_forbidden, s.Origin,
+            "case-based loop forbidden by the --enforce-determinism option");
+        }
+        AlternativeStmt.ResolveAlternatives(this, s.Alternatives, s, resolutionContext);
         ResolveLoopSpecificationComponents(s.Invariants, s.Decreases, s.Mod, resolutionContext);
 
       } else if (stmt is ForallStmt) {
@@ -362,7 +288,7 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
         int prevErrorCount = ErrorCount;
         scope.PushMarker();
         foreach (BoundVar v in s.BoundVars) {
-          resolver.ResolveType(v.tok, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          resolver.ResolveType(v.Origin, v.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
           ScopePushAndReport(v, "local-variable");
         }
         ResolveExpression(s.Range, resolutionContext);
@@ -377,15 +303,13 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
 
         if (s.Body != null) {
           // clear the labels for the duration of checking the body, because break statements are not allowed to leave a forall statement
-          var prevLblStmts = enclosingStatementLabels;
+          var prevLblStmts = EnclosingStatementLabels;
           var prevLoopStack = loopStack;
-          enclosingStatementLabels = new Scope<Statement>(resolver.Options);
+          EnclosingStatementLabels = new Scope<Statement>(resolver.Options);
           loopStack = new List<Statement>();
           ResolveStatement(s.Body, resolutionContext);
-          enclosingStatementLabels = prevLblStmts;
+          EnclosingStatementLabels = prevLblStmts;
           loopStack = prevLoopStack;
-        } else {
-          ReportWarning(s.Tok, "note, this forall statement has no body");
         }
         scope.PopMarker();
 
@@ -402,12 +326,12 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
             // The effect of Assign and the postcondition of Call will be seen outside the forall
             // statement.
             Statement s0 = s.S0;
-            if (s0 is AssignStmt) {
+            if (s0 is SingleAssignStmt) {
               s.Kind = ForallStmt.BodyKind.Assign;
 
-              var rhs = ((AssignStmt)s0).Rhs;
+              var rhs = ((SingleAssignStmt)s0).Rhs;
               if (rhs is TypeRhs) {
-                ReportError(rhs.Tok, "new allocation not supported in aggregate assignments");
+                ReportError(rhs.Origin, "new allocation not supported in aggregate assignments");
               }
 
             } else if (s0 is CallStmt) {
@@ -427,25 +351,31 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
               // add the conclusion of the calc as a free postcondition
               var result = ((CalcStmt)s0).Result;
               s.Ens.Add(new AttributedExpression(result));
-              ReportInfo(s.Tok, "ensures " + Printer.ExprToString(resolver.Options, result));
+              ReportInfo(s.Origin, "ensures " + Printer.ExprToString(resolver.Options, result));
             } else {
               s.Kind = ForallStmt.BodyKind.Proof;
               if (s.Body is BlockStmt && ((BlockStmt)s.Body).Body.Count == 0) {
                 // an empty statement, so don't produce any warning
               } else {
-                ReportWarning(s.Tok, "the conclusion of the body of this forall statement will not be known outside the forall statement; consider using an 'ensures' clause");
+                ReportWarning(s.Origin, "the conclusion of the body of this forall statement will not be known outside the forall statement; consider using an 'ensures' clause");
               }
             }
           }
 
-          if (s.ForallExpressions != null) {
-            foreach (Expression expr in s.ForallExpressions) {
+          if (s.EffectiveEnsuresClauses != null) {
+            foreach (Expression expr in s.EffectiveEnsuresClauses) {
               ResolveExpression(expr, resolutionContext);
             }
           }
         }
 
       } else if (stmt is ModifyStmt modifyStmt) {
+        if (modifyStmt.Body == null) {
+          if (!resolutionContext.IsGhost && Options.ForbidNondeterminism) {
+            Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_bodyless_modify_statement_forbidden,
+              modifyStmt.Origin, "modify statement without a body forbidden by the --enforce-determinism option");
+          }
+        }
         ResolveAttributes(modifyStmt.Mod, resolutionContext, false);
         foreach (FrameExpression fe in modifyStmt.Mod.Expressions) {
           ResolveFrameExpression(fe, FrameExpressionUse.Modifies, resolutionContext.CodeContext);
@@ -464,7 +394,7 @@ public void ResolveStatement(Statement stmt, ResolutionContext resolutionContext
         ResolveNestedMatchStmt(nestedMatchStmt, resolutionContext);
 
       } else if (stmt is SkeletonStatement skeletonStatement) {
-        ReportError(stmt.Tok, "skeleton statements are allowed only in refining methods");
+        ReportError(stmt.Origin, "skeleton statements are allowed only in refining methods");
         // nevertheless, resolve the underlying statement; hey, why not
         if (skeletonStatement.S != null) {
           ResolveStatement(skeletonStatement.S, resolutionContext);
@@ -479,30 +409,37 @@ private void ResolveOneBodyLoopStmt(OneBodyLoopStmt s, ResolutionContext resolut
       Contract.Requires(s != null);
       Contract.Requires(resolutionContext != null);
 
-      if (s is WhileStmt whileS && whileS.Guard != null) {
-        ResolveExpression(whileS.Guard, resolutionContext);
-        ConstrainTypeExprBool(whileS.Guard, "condition is expected to be of type bool, but is {0}");
-
-      } else if (s is ForLoopStmt forS) {
+      if (s is WhileStmt whileS) {
+        if (whileS.Guard != null) {
+          ResolveExpression(whileS.Guard, resolutionContext);
+          ConstrainTypeExprBool(whileS.Guard, "condition is expected to be of type bool, but is {0}");
+        } else {
+          if (!resolutionContext.IsGhost && Options.ForbidNondeterminism) {
+            Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_non_deterministic_loop_forbidden, s.Origin,
+              "nondeterministic loop forbidden by the --enforce-determinism option");
+          }
+        }
+      }
+      if (s is ForLoopStmt forS) {
         var loopIndex = forS.LoopIndex;
-        resolver.ResolveType(loopIndex.tok, loopIndex.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+        resolver.ResolveType(loopIndex.Origin, loopIndex.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         loopIndex.PreType = Type2PreType(loopIndex.Type);
-        AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InIntFamily, loopIndex.PreType, loopIndex.tok, "index variable is expected to be of an integer type (got {0})");
+        AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InIntFamily, loopIndex.PreType, loopIndex.Origin, "index variable is expected to be of an integer type (got {0})");
 
         ResolveExpression(forS.Start, resolutionContext);
-        AddSubtypeConstraint(loopIndex.PreType, forS.Start.PreType, forS.Start.tok,
+        AddSubtypeConstraint(loopIndex.PreType, forS.Start.PreType, forS.Start.Origin,
           "lower bound (of type {1}) not assignable to index variable (of type {0})");
         if (forS.End != null) {
           ResolveExpression(forS.End, resolutionContext);
-          AddSubtypeConstraint(loopIndex.PreType, forS.End.PreType, forS.End.tok,
+          AddSubtypeConstraint(loopIndex.PreType, forS.End.PreType, forS.End.Origin,
             "upper bound (of type {1}) not assignable to index variable (of type {0})");
           if (forS.Decreases.Expressions.Count != 0) {
-            ReportError(forS.Decreases.Expressions[0].tok,
+            ReportError(forS.Decreases.Expressions[0].Origin,
               "a 'for' loop is allowed an explicit 'decreases' clause only if the end-expression is '*'");
           }
         } else if (forS.Decreases.Expressions.Count == 0 && !resolutionContext.CodeContext.AllowsNontermination) {
           // note, the following error message is also emitted elsewhere (if the loop bears a "decreases *")
-          ReportError(forS.Tok,
+          ReportError(forS.Origin,
             "a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating" +
             " (or you can add a 'decreases' clause to this 'for' loop if you want to prove that it does indeed terminate)");
         }
@@ -517,9 +454,9 @@ private void ResolveOneBodyLoopStmt(OneBodyLoopStmt s, ResolutionContext resolut
 
       if (s.Body != null) {
         loopStack.Add(s); // push
-        dominatingStatementLabels.PushMarker();
+        DominatingStatementLabels.PushMarker();
         ResolveStatement(s.Body, resolutionContext);
-        dominatingStatementLabels.PopMarker();
+        DominatingStatementLabels.PopMarker();
         loopStack.RemoveAt(loopStack.Count - 1); // pop
       }
 
@@ -536,21 +473,23 @@ private void ResolveCalc(CalcStmt s, ResolutionContext resolutionContext) {
         s.Op = s.UserSuppliedOp;
       } else {
         s.Op = s.GetInferredDefaultOp() ?? CalcStmt.DefaultOp;
-        ReportInfo(s.Tok, s.Op.ToString());
+        ReportInfo(s.Origin, s.Op.ToString());
       }
 
       if (s.Lines.Count > 0) {
         PreType linePreType = CreatePreTypeProxy("calc line");
         var e0 = s.Lines.First();
         ResolveExpression(e0, resolutionContext);
-        AddSubtypeConstraint(linePreType, e0.PreType, e0.tok, "all lines in a calculation must have the same type (got {1} after {0})");
+        AddSubtypeConstraint(linePreType, e0.PreType, e0.Origin, "all lines in a calculation must have the same type (got {1} after {0})");
         for (var i = 1; i < s.Lines.Count; i++) {
           var e1 = s.Lines[i];
           ResolveExpression(e1, resolutionContext);
 #if SOON
           // reuse the error object if we're on the dummy line; this prevents a duplicate error message
 #endif
-          AddSubtypeConstraint(linePreType, e1.PreType, e1.tok, "all lines in a calculation must have the same type (got {1} after {0})");
+          if (i < s.Lines.Count - 1) {
+            AddSubtypeConstraint(linePreType, e1.PreType, e1.Origin, "all lines in a calculation must have the same type (got {1} after {0})");
+          }
           var step = (s.StepOps[i - 1] ?? s.Op).StepExpr(e0, e1); // Use custom line operator
           ResolveExpression(step, resolutionContext);
           s.Steps.Add(step);
@@ -558,18 +497,18 @@ private void ResolveCalc(CalcStmt s, ResolutionContext resolutionContext) {
         }
 
         // clear the labels for the duration of checking the hints, because break statements are not allowed to leave a forall statement
-        var prevLblStmts = enclosingStatementLabels;
+        var prevLblStmts = EnclosingStatementLabels;
         var prevLoopStack = loopStack;
-        enclosingStatementLabels = new Scope<Statement>(resolver.Options);
+        EnclosingStatementLabels = new Scope<Statement>(resolver.Options);
         loopStack = new List<Statement>();
         foreach (var h in s.Hints) {
           foreach (var oneHint in h.Body) {
-            dominatingStatementLabels.PushMarker();
+            DominatingStatementLabels.PushMarker();
             ResolveStatement(oneHint, resolutionContext);
-            dominatingStatementLabels.PopMarker();
+            DominatingStatementLabels.PopMarker();
           }
         }
-        enclosingStatementLabels = prevLblStmts;
+        EnclosingStatementLabels = prevLblStmts;
         loopStack = prevLoopStack;
       }
       if (prevErrorCount == ErrorCount && s.Lines.Count > 0) {
@@ -577,17 +516,17 @@ private void ResolveCalc(CalcStmt s, ResolutionContext resolutionContext) {
         var resultOp = s.StepOps.Aggregate(s.Op, (op0, op1) => op1 == null ? op0 : op0.ResultOp(op1));
         s.Result = resultOp.StepExpr(s.Lines.First(), s.Lines.Last());
       } else {
-        s.Result = CalcStmt.DefaultOp.StepExpr(Expression.CreateIntLiteral(s.Tok, 0), Expression.CreateIntLiteral(s.Tok, 0));
+        s.Result = CalcStmt.DefaultOp.StepExpr(Expression.CreateIntLiteral(s.Origin, 0), Expression.CreateIntLiteral(s.Origin, 0));
       }
       ResolveExpression(s.Result, resolutionContext);
       Contract.Assert(s.Result != null);
       Contract.Assert(prevErrorCount != ErrorCount || s.Steps.Count == s.Hints.Count);
     }
 
-    private void ResolveConcreteUpdateStmt(ConcreteUpdateStatement update, List<LocalVariable> locals, ResolutionContext resolutionContext) {
-      Contract.Requires(update != null || locals != null);
+    private void ResolveConcreteUpdateStmt(ConcreteAssignStatement assign, List<LocalVariable> locals, ResolutionContext resolutionContext) {
+      Contract.Requires(assign != null || locals != null);
       // We have four cases.
-      Contract.Assert(update == null || update is AssignSuchThatStmt || update is UpdateStmt || update is AssignOrReturnStmt);
+      Contract.Assert(assign == null || assign is AssignSuchThatStmt || assign is AssignStatement || assign is AssignOrReturnStmt);
       // 0.  There is no update.  This is easy, we will just resolve the locals.
       // 1.  The update is an AssignSuchThatStmt.  This is also straightforward:  first
       //     resolve the locals, which adds them to the scope, and then resolve the update.
@@ -601,11 +540,13 @@ private void ResolveConcreteUpdateStmt(ConcreteUpdateStatement update, List<Loca
       var errorCountBeforeCheckingStmt = ErrorCount;
 
       // For UpdateStmt and AssignOrReturnStmt, resolve the RHSs before adding the LHSs to the scope
-      if (update is UpdateStmt updateStatement) {
+      if (assign is AssignStatement updateStatement) {
         foreach (var rhs in updateStatement.Rhss) {
           ResolveAssignmentRhs(rhs, updateStatement, resolutionContext);
         }
-      } else if (update is AssignOrReturnStmt elephantStmt) {
+      } else if (assign is AssignOrReturnStmt elephantStmt) {
+        elephantStmt.ResolveKeywordToken(this, resolutionContext);
+
         ResolveAssignmentRhs(elephantStmt.Rhs, elephantStmt, resolutionContext);
         if (elephantStmt.Rhss != null) {
           foreach (var rhs in elephantStmt.Rhss) {
@@ -618,8 +559,8 @@ private void ResolveConcreteUpdateStmt(ConcreteUpdateStatement update, List<Loca
         // Add the locals to the scope
         foreach (var local in locals) {
           int prevErrorCount = ErrorCount;
-          resolver.ResolveType(local.Tok, local.OptionalType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
-          local.type = ErrorCount == prevErrorCount ? local.OptionalType : new InferredTypeProxy();
+          resolver.ResolveType(local.Origin, local.SyntacticType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          local.type = ErrorCount == prevErrorCount ? local.SyntacticType : new InferredTypeProxy();
           ScopePushAndReport(local, "local-variable", true);
         }
         // With the new locals in scope, it's now time to resolve the attributes on all the locals
@@ -628,21 +569,23 @@ private void ResolveConcreteUpdateStmt(ConcreteUpdateStatement update, List<Loca
         }
       }
 
-      // Resolve the LHSs
-      if (update != null) {
-        foreach (var lhs in update.Lhss) {
-          ResolveExpression(lhs, resolutionContext);
+      if (assign is AssignSuchThatStmt assignSuchThatStmt) {
+        assignSuchThatStmt.GenResolve(this, resolutionContext);
+      } else {
+        // Resolve the LHSs
+        if (assign != null) {
+          foreach (var lhs in assign.Lhss) {
+            ResolveExpression(lhs, resolutionContext);
+          }
         }
-      }
 
-      if (update is AssignSuchThatStmt assignSuchThatStmt) {
-        ResolveAssignSuchThatStmt(assignSuchThatStmt, resolutionContext);
-      } else if (update is UpdateStmt updateStmt) {
-        ResolveUpdateStmt(updateStmt, resolutionContext, errorCountBeforeCheckingStmt);
-      } else if (update is AssignOrReturnStmt assignOrReturnStmt) {
-        ResolveAssignOrReturnStmt(assignOrReturnStmt, resolutionContext);
-      } else {
-        Contract.Assert(update == null);
+        if (assign is AssignStatement updateStmt) {
+          ResolveUpdateStmt(updateStmt, resolutionContext, errorCountBeforeCheckingStmt);
+        } else if (assign is AssignOrReturnStmt assignOrReturnStmt) {
+          ResolveAssignOrReturnStmt(assignOrReturnStmt, resolutionContext);
+        } else {
+          Contract.Assert(assign == null);
+        }
       }
     }
 
@@ -670,11 +613,12 @@ void ResolveAssignmentRhs(AssignmentRhs rhs, Statement enclosingStmt, Resolution
     /// errorCountBeforeCheckingStmt is passed in so that this method can determine if any resolution errors were found during
     /// LHS or RHS checking, because only if no errors were found is update.ResolvedStmt changed.
     /// </summary>
-    private void ResolveUpdateStmt(UpdateStmt update, ResolutionContext resolutionContext, int errorCountBeforeCheckingStmt) {
+    private void ResolveUpdateStmt(AssignStatement update, ResolutionContext resolutionContext,
+      int errorCountBeforeCheckingStmt) {
       Contract.Requires(update != null);
       Contract.Requires(resolutionContext != null);
-      IToken firstEffectfulRhs = null;
-      ModuleResolver.MethodCallInformation methodCallInfo = null;
+      IOrigin firstEffectfulRhs = null;
+      MethodCallInformation methodCallInfo = null;
       update.ResolvedStatements = new();
       foreach (var rhs in update.Rhss) {
         bool isEffectful;
@@ -685,15 +629,16 @@ private void ResolveUpdateStmt(UpdateStmt update, ResolutionContext resolutionCo
         } else {
           var er = (ExprRhs)rhs;
           if (er.Expr is ApplySuffix applySuffix) {
-            var cRhs = ResolveApplySuffix(applySuffix, resolutionContext, true); // TODO: don't re-resolve the RHS, only obtain the cRhs return value
+            var cRhs = applySuffix.MethodCallInfo;
             isEffectful = cRhs != null;
             methodCallInfo = methodCallInfo ?? cRhs;
           } else {
             isEffectful = false;
           }
         }
+
         if (isEffectful && firstEffectfulRhs == null) {
-          firstEffectfulRhs = rhs.Tok;
+          firstEffectfulRhs = rhs.Origin;
         }
 
         ResolveAttributes(rhs, resolutionContext, false);
@@ -702,15 +647,16 @@ private void ResolveUpdateStmt(UpdateStmt update, ResolutionContext resolutionCo
       // figure out what kind of UpdateStmt this is
       if (firstEffectfulRhs == null) {
         if (update.Lhss.Count == 0) {
-          Contract.Assert(update.Rhss.Count == 1);  // guaranteed by the parser
+          Contract.Assert(update.Rhss.Count == 1); // guaranteed by the parser
           ReportError(update, "expected method call, found expression");
         } else if (update.Lhss.Count != update.Rhss.Count) {
-          ReportError(update, "the number of left-hand sides ({0}) and right-hand sides ({1}) must match for a multi-assignment",
+          ReportError(update,
+            "the number of left-hand sides ({0}) and right-hand sides ({1}) must match for a multi-assignment",
             update.Lhss.Count, update.Rhss.Count);
         } else if (ErrorCount == errorCountBeforeCheckingStmt) {
           // add the statements here in a sequence, but don't use that sequence later for translation (instead, should translate properly as multi-assignment)
           for (var i = 0; i < update.Lhss.Count; i++) {
-            var a = new AssignStmt(update.RangeToken, update.Lhss[i].Resolved, update.Rhss[i]);
+            var a = new SingleAssignStmt(update.Origin, update.Lhss[i].Resolved, update.Rhss[i]);
             update.ResolvedStatements.Add(a);
           }
         }
@@ -718,7 +664,8 @@ private void ResolveUpdateStmt(UpdateStmt update, ResolutionContext resolutionCo
       } else if (update.CanMutateKnownState) {
         if (1 < update.Rhss.Count) {
           ReportError(firstEffectfulRhs, "cannot have effectful parameter in multi-return statement.");
-        } else { // it might be ok, if it is a TypeRhs
+        } else {
+          // it might be ok, if it is a TypeRhs
           Contract.Assert(update.Rhss.Count == 1);
           if (methodCallInfo != null) {
             ReportError(methodCallInfo.Tok, "cannot have method call in return statement.");
@@ -727,9 +674,9 @@ private void ResolveUpdateStmt(UpdateStmt update, ResolutionContext resolutionCo
             var tr = (TypeRhs)update.Rhss[0];
             Contract.Assert(tr.InitCall != null); // there were effects, so this must have been a call.
             if (tr.CanAffectPreviouslyKnownExpressions) {
-              ReportError(tr.Tok, "can only have initialization methods which modify at most 'this'.");
+              ReportError(tr.Origin, "can only have initialization methods which modify at most 'this'.");
             } else if (ErrorCount == errorCountBeforeCheckingStmt) {
-              var a = new AssignStmt(update.RangeToken, update.Lhss[0].Resolved, tr);
+              var a = new SingleAssignStmt(update.Origin, update.Lhss[0].Resolved, tr);
               update.ResolvedStatements.Add(a);
             }
           }
@@ -738,21 +685,25 @@ private void ResolveUpdateStmt(UpdateStmt update, ResolutionContext resolutionCo
       } else {
         // if there was an effectful RHS, that must be the only RHS
         if (update.Rhss.Count != 1) {
-          ReportError(firstEffectfulRhs, "an update statement is allowed an effectful RHS only if there is just one RHS");
+          ReportError(firstEffectfulRhs,
+            "an update statement is allowed an effectful RHS only if there is just one RHS");
         } else if (methodCallInfo == null) {
           // must be a single TypeRhs
           if (update.Lhss.Count != 1) {
-            Contract.Assert(2 <= update.Lhss.Count);  // the parser allows 0 Lhss only if the whole statement looks like an expression (not a TypeRhs)
-            ReportError(update.Lhss[1].tok, "the number of left-hand sides ({0}) and right-hand sides ({1}) must match for a multi-assignment",
+            Contract.Assert(2 <=
+                            update.Lhss
+                              .Count); // the parser allows 0 Lhss only if the whole statement looks like an expression (not a TypeRhs)
+            ReportError(update.Lhss[1].Origin,
+              "the number of left-hand sides ({0}) and right-hand sides ({1}) must match for a multi-assignment",
               update.Lhss.Count, update.Rhss.Count);
           } else if (ErrorCount == errorCountBeforeCheckingStmt) {
-            var a = new AssignStmt(update.RangeToken, update.Lhss[0].Resolved, update.Rhss[0]);
+            var a = new SingleAssignStmt(update.Origin, update.Lhss[0].Resolved, update.Rhss[0]);
             update.ResolvedStatements.Add(a);
           }
         } else if (ErrorCount == errorCountBeforeCheckingStmt) {
           // a call statement
           var resolvedLhss = update.Lhss.ConvertAll(ll => ll.Resolved);
-          var a = new CallStmt(update.RangeToken, resolvedLhss, methodCallInfo.Callee, methodCallInfo.ActualParameters);
+          var a = new CallStmt(update.Origin, resolvedLhss, methodCallInfo.Callee, methodCallInfo.ActualParameters, methodCallInfo.Tok.Center);
           a.OriginalInitialLhs = update.OriginalInitialLhs;
           update.ResolvedStatements.Add(a);
         }
@@ -763,35 +714,6 @@ private void ResolveUpdateStmt(UpdateStmt update, ResolutionContext resolutionCo
       }
     }
 
-    /// <summary>
-    /// Resolve an assign-such-that statement. It is assumed that the LHSs have already been resolved,
-    /// but not the RHSs.
-    /// </summary>
-    private void ResolveAssignSuchThatStmt(AssignSuchThatStmt s, ResolutionContext resolutionContext) {
-      Contract.Requires(s != null);
-      Contract.Requires(resolutionContext != null);
-
-      var lhsSimpleVariables = new HashSet<IVariable>();
-      foreach (var lhs in s.Lhss) {
-        CheckIsLvalue(lhs.Resolved, resolutionContext);
-        if (lhs.Resolved is IdentifierExpr ide) {
-          if (lhsSimpleVariables.Contains(ide.Var)) {
-            // syntactically forbid duplicate simple-variables on the LHS
-            ReportError(lhs, $"variable '{ide.Var.Name}' occurs more than once as left-hand side of :|");
-          } else {
-            lhsSimpleVariables.Add(ide.Var);
-          }
-        }
-        // to ease in the verification of the existence check, only allow local variables as LHSs
-        if (s.AssumeToken == null && !(lhs.Resolved is IdentifierExpr)) {
-          ReportError(lhs, "an assign-such-that statement (without an 'assume' clause) currently supports only local-variable LHSs");
-        }
-      }
-
-      ResolveExpression(s.Expr, resolutionContext);
-      ConstrainTypeExprBool(s.Expr, "type of RHS of assign-such-that statement must be boolean (got {0})");
-    }
-
     private void ResolveLoopSpecificationComponents(List<AttributedExpression> invariants,
       Specification<Expression> decreases, Specification<FrameExpression> modifies,
       ResolutionContext resolutionContext) {
@@ -854,7 +776,7 @@ void ResolveCallStmt(CallStmt s, ResolutionContext resolutionContext, Type recei
       } else {
         if (isInitCall) {
           if (callee.IsStatic) {
-            ReportError(s.Tok, "a method called as an initialization method must not be 'static'");
+            ReportError(s.Origin, "a method called as an initialization method must not be 'static'");
           } else {
             tryToResolve = true;
           }
@@ -876,8 +798,10 @@ void ResolveCallStmt(CallStmt s, ResolutionContext resolutionContext, Type recei
 
       if (tryToResolve) {
         var typeMap = s.MethodSelect.PreTypeArgumentSubstitutionsAtMemberDeclaration();
+        AddTypeBoundConstraints(s.Origin, callee.EnclosingClass.TypeArgs, typeMap);
+        AddTypeBoundConstraints(s.Origin, callee.TypeArgs, typeMap);
         // resolve arguments
-        ResolveActualParameters(s.Bindings, callee.Ins, s.Tok, callee, resolutionContext, typeMap,
+        ResolveActualParameters(s.Bindings, callee.Ins, s.Origin, callee, resolutionContext, typeMap,
           callee.IsStatic ? null : s.Receiver);
         // type check the out-parameter arguments (in-parameters were type checked as part of ResolveActualParameters)
         for (var i = 0; i < callee.Outs.Count && i < s.Lhs.Count; i++) {
@@ -886,7 +810,7 @@ void ResolveCallStmt(CallStmt s, ResolutionContext resolutionContext, Type recei
           var lhs = s.Lhs[i];
           var what = GetLocationInformation(outFormal, callee.Outs.Count, i, "method out-parameter");
 
-          AddSubtypeConstraint(lhs.PreType, st, s.Tok, $"incorrect return type {what} (expected {{1}}, got {{0}})");
+          AddSubtypeConstraint(lhs.PreType, st, s.Origin, $"incorrect return type {what} (expected {{1}}, got {{0}})");
         }
         for (int i = 0; i < s.Lhs.Count; i++) {
           var lhs = s.Lhs[i];
@@ -894,28 +818,9 @@ void ResolveCallStmt(CallStmt s, ResolutionContext resolutionContext, Type recei
           CheckIsLvalue(lhs.Resolved, resolutionContext);
         }
 
-#if SOON
-        // Resolution termination check
-        ModuleDefinition callerModule = resolutionContext.EnclosingModule;
-        ModuleDefinition calleeModule = ((ICodeContext)callee).EnclosingModule;
-        if (callerModule == calleeModule) {
-          // intra-module call; add edge in module's call graph
-          var caller = CodeContextWrapper.Unwrap(resolutionContext) as ICallable;
-          if (caller == null) {
-            // don't add anything to the call graph after all
-          } else if (caller is IteratorDecl) {
-            callerModule.CallGraph.AddEdge(((IteratorDecl)caller).Member_MoveNext, callee);
-          } else {
-            callerModule.CallGraph.AddEdge(caller, callee);
-            if (caller == callee) {
-              callee.IsRecursive = true;  // self recursion (mutual recursion is determined elsewhere)
-            }
-          }
-        }
-#endif
       }
       if (Contract.Exists(callee.Decreases.Expressions, e => e is WildcardExpr) && !resolutionContext.CodeContext.AllowsNontermination) {
-        ReportError(s.Tok, "a call to a possibly non-terminating method is allowed only if the calling method is also declared (with 'decreases *') to be possibly non-terminating");
+        ReportError(s.Origin, "a call to a possibly non-terminating method is allowed only if the calling method is also declared (with 'decreases *') to be possibly non-terminating");
       }
     }
 
@@ -966,10 +871,10 @@ private void ResolveAssignOrReturnStmt(AssignOrReturnStmt s, ResolutionContext r
         if (callee != null) {
           // We're looking at a method call
           if (callee.Outs.Count != 0) {
-            var typeMap = PreType.PreTypeSubstMap(callee.TypeArgs, methodCallInfo.Callee.PreTypeApplication_JustMember);
+            var typeMap = PreType.PreTypeSubstMap(callee.TypeArgs, methodCallInfo.Callee.PreTypeApplicationJustMember);
             firstPreType = callee.Outs[0].PreType.Substitute(typeMap);
           } else {
-            ReportError(s.Rhs.tok, $"Expected '{callee.Name}' to have a success/failure output value, but the method returns nothing.");
+            ReportError(s.Rhs.Origin, $"Expected '{callee.Name}' to have a success/failure output value, but the method returns nothing.");
           }
         } else {
           // We're looking at a call to a function. Treat it like any other expression.
@@ -982,52 +887,52 @@ private void ResolveAssignOrReturnStmt(AssignOrReturnStmt s, ResolutionContext r
 
       var enclosingMethod = (Method)resolutionContext.CodeContext;
       if (enclosingMethod.Outs.Count == 0 && s.KeywordToken == null) {
-        ReportError(s.Tok, $"A method containing a :- statement must have an out-parameter ({enclosingMethod.Name})");
+        ReportError(s.Origin, $"A method containing a :- statement must have an out-parameter ({enclosingMethod.Name})");
         return;
       }
       TopLevelDeclWithMembers failureSupportingType = null;
       if (firstPreType != null) {
-        Constraints.PartiallySolveTypeConstraints();
+        Constraints.FindDefinedPreType(firstPreType, true);
         failureSupportingType = (firstPreType.Normalize() as DPreType)?.Decl as TopLevelDeclWithMembers;
         if (failureSupportingType != null) {
           if (failureSupportingType.Members.Find(x => x.Name == "IsFailure") == null) {
-            ReportError(s.Tok, $"member IsFailure does not exist in {firstPreType}, in :- statement");
+            ReportError(s.Origin, $"member IsFailure does not exist in {firstPreType}, in :- statement");
             return;
           }
           expectExtract = failureSupportingType.Members.Find(x => x.Name == "Extract") != null;
           if (expectExtract && callee == null && s.Lhss.Count != 1 + s.Rhss.Count) {
-            ReportError(s.Tok,
+            ReportError(s.Origin,
               "number of lhs ({0}) must match number of rhs ({1}) for a rhs type ({2}) with member Extract",
               s.Lhss.Count, 1 + s.Rhss.Count, firstPreType);
             return;
           } else if (expectExtract && callee != null && s.Lhss.Count != callee.Outs.Count) {
-            ReportError(s.Tok,
+            ReportError(s.Origin,
               "wrong number of method result arguments (got {0}, expected {1}) for a rhs type ({2}) with member Extract",
               s.Lhss.Count, callee.Outs.Count, firstPreType);
             return;
           } else if (!expectExtract && callee == null && s.Lhss.Count != s.Rhss.Count) {
-            ReportError(s.Tok, "number of lhs ({0}) must be one less than number of rhs ({1}) for a rhs type ({2}) without member Extract",
+            ReportError(s.Origin, "number of lhs ({0}) must be one less than number of rhs ({1}) for a rhs type ({2}) without member Extract",
               s.Lhss.Count, 1 + s.Rhss.Count, firstPreType);
             return;
           } else if (!expectExtract && callee != null && s.Lhss.Count != callee.Outs.Count - 1) {
-            ReportError(s.Tok, "wrong number of method result arguments (got {0}, expected {1}) for a rhs type ({2}) without member Extract",
+            ReportError(s.Origin, "wrong number of method result arguments (got {0}, expected {1}) for a rhs type ({2}) without member Extract",
               s.Lhss.Count, callee.Outs.Count - 1, firstPreType);
             return;
           }
         } else {
-          ReportError(s.Tok,
+          ReportError(s.Origin,
             $"The type of the first expression to the right of ':-' could not be determined to be a failure type (got '{firstPreType}')");
           return;
         }
       } else {
-        ReportError(s.Tok, "Internal Error: Unknown failure type in :- statement");
+        ReportError(s.Origin, "Internal Error: Unknown failure type in :- statement");
         return;
       }
 
       Expression lhsExtract = null;
       if (expectExtract) {
         if (enclosingMethod.Outs.Count == 0 && s.KeywordToken == null) {
-          ReportError(s.Rhs.tok, $"Expected {enclosingMethod.Name} to have a Success/Failure output value");
+          ReportError(s.Rhs.Origin, $"Expected {enclosingMethod.Name} to have a Success/Failure output value");
           return;
         }
 
@@ -1037,15 +942,15 @@ private void ResolveAssignOrReturnStmt(AssignOrReturnStmt s, ResolutionContext r
         if (lhsResolved is MemberSelectExpr lexr) {
           Expression id = Expression.AsThis(lexr.Obj) != null ? lexr.Obj : resolver.makeTemp("recv", s, resolutionContext, lexr.Obj);
           var lex = lhsExtract as ExprDotName; // might be just a NameSegment
-          lhsExtract = new ExprDotName(lexr.tok, id, lexr.MemberName, lex?.OptTypeArguments);
+          lhsExtract = new ExprDotName(lexr.Origin, id, lexr.MemberNameNode, lex?.OptTypeArguments);
         } else if (lhsResolved is SeqSelectExpr lseq) {
           if (!lseq.SelectOne || lseq.E0 == null) {
-            ReportError(s.Tok, "Element ranges not allowed as l-values");
+            ReportError(s.Origin, "Element ranges not allowed as l-values");
             return;
           }
           Expression id = resolver.makeTemp("recv", s, resolutionContext, lseq.Seq);
           Expression id0 = id0 = resolver.makeTemp("idx", s, resolutionContext, lseq.E0);
-          lhsExtract = new SeqSelectExpr(lseq.tok, lseq.SelectOne, id, id0, null, lseq.CloseParen);
+          lhsExtract = new SeqSelectExpr(lseq.Origin, lseq.SelectOne, id, id0, null, lseq.CloseParen);
           lhsExtract.Type = lseq.Type;
         } else if (lhsResolved is MultiSelectExpr lmulti) {
           Expression id = resolver.makeTemp("recv", s, resolutionContext, lmulti.Array);
@@ -1054,7 +959,7 @@ private void ResolveAssignOrReturnStmt(AssignOrReturnStmt s, ResolutionContext r
             Expression idx = resolver.makeTemp("idx", s, resolutionContext, i);
             idxs.Add(idx);
           }
-          lhsExtract = new MultiSelectExpr(lmulti.tok, id, idxs);
+          lhsExtract = new MultiSelectExpr(lmulti.Origin, id, idxs);
           lhsExtract.Type = lmulti.Type;
         } else if (lhsResolved is IdentifierExpr) {
           // do nothing
@@ -1066,10 +971,10 @@ private void ResolveAssignOrReturnStmt(AssignOrReturnStmt s, ResolutionContext r
         }
       }
       var temp = resolver.FreshTempVarName("valueOrError", resolutionContext.CodeContext);
-      var lhss = new List<LocalVariable>() { new LocalVariable(s.RangeToken, temp, new InferredTypeProxy(), false) };
+      var lhss = new List<LocalVariable>() { new LocalVariable(s.Origin, temp, new InferredTypeProxy(), false) };
       // "var temp ;"
-      s.ResolvedStatements.Add(new VarDeclStmt(s.RangeToken, lhss, null));
-      var lhss2 = new List<Expression>() { new IdentifierExpr(s.Tok, temp) };
+      s.ResolvedStatements.Add(new VarDeclStmt(s.Origin, lhss, null));
+      var lhss2 = new List<Expression>() { new IdentifierExpr(s.Origin, temp) };
       for (int k = (expectExtract ? 1 : 0); k < s.Lhss.Count; ++k) {
         lhss2.Add(s.Lhss[k]);
       }
@@ -1077,7 +982,7 @@ private void ResolveAssignOrReturnStmt(AssignOrReturnStmt s, ResolutionContext r
       rhss2.AddRange(s.Rhss);
       if (s.Rhss.Count > 0) {
         if (lhss2.Count != rhss2.Count) {
-          ReportError(s.Tok, "Mismatch in expected number of LHSs and RHSs");
+          ReportError(s.Origin, "Mismatch in expected number of LHSs and RHSs");
           if (lhss2.Count < rhss2.Count) {
             rhss2.RemoveRange(lhss2.Count, rhss2.Count - lhss2.Count);
           } else {
@@ -1086,29 +991,30 @@ private void ResolveAssignOrReturnStmt(AssignOrReturnStmt s, ResolutionContext r
         }
       }
       // " temp, ... := MethodOrExpression, ...;"
-      UpdateStmt up = new UpdateStmt(s.RangeToken, lhss2, rhss2);
+      var up = new AssignStatement(s.Origin, lhss2, rhss2);
       if (expectExtract) {
         up.OriginalInitialLhs = s.Lhss.Count == 0 ? null : s.Lhss[0];
       }
       s.ResolvedStatements.Add(up);
 
       if (s.KeywordToken != null) {
-        var notFailureExpr = new UnaryOpExpr(s.Tok, UnaryOpExpr.Opcode.Not, resolver.VarDotMethod(s.Tok, temp, "IsFailure"));
+        var keyword = s.KeywordToken.Token;
+        var notFailureExpr = new UnaryOpExpr(keyword, UnaryOpExpr.Opcode.Not, resolver.VarDotMethod(s.Origin, temp, "IsFailure"));
         Statement ss = null;
-        if (s.KeywordToken.Token.val == "expect") {
+        if (keyword.val == "expect") {
           // "expect !temp.IsFailure(), temp"
-          ss = new ExpectStmt(new RangeToken(s.Tok, s.EndToken), notFailureExpr, new IdentifierExpr(s.Tok, temp), s.KeywordToken.Attrs);
+          ss = new ExpectStmt(new SourceOrigin(keyword.StartToken, s.EndToken), notFailureExpr, new IdentifierExpr(s.Origin, temp), s.KeywordToken.Attrs);
         } else if (s.KeywordToken.Token.val == "assume") {
-          ss = new AssumeStmt(new RangeToken(s.Tok, s.EndToken), notFailureExpr, s.KeywordToken.Attrs);
+          ss = new AssumeStmt(new SourceOrigin(keyword.StartToken, s.EndToken), notFailureExpr, SystemModuleManager.AxiomAttribute(s.KeywordToken.Attrs));
         } else if (s.KeywordToken.Token.val == "assert") {
-          ss = new AssertStmt(new RangeToken(s.Tok, s.EndToken), notFailureExpr, null, null, s.KeywordToken.Attrs);
+          ss = new AssertStmt(new SourceOrigin(keyword.StartToken, s.EndToken), notFailureExpr, null, s.KeywordToken.Attrs);
         } else {
-          Contract.Assert(false, $"Invalid token in :- statement: {s.KeywordToken.Token.val}");
+          Contract.Assert(false, $"Invalid token in :- statement: {keyword.val}");
         }
         s.ResolvedStatements.Add(ss);
       } else {
         var enclosingOutParameter = ((Method)resolutionContext.CodeContext).Outs[0];
-        var ident = new IdentifierExpr(s.Tok, enclosingOutParameter.Name) {
+        var ident = new IdentifierExpr(s.Origin, enclosingOutParameter.Name) {
           // resolve it here to avoid capture into more closely declared local variables
           Var = enclosingOutParameter,
           Type = enclosingOutParameter.Type,
@@ -1117,14 +1023,14 @@ private void ResolveAssignOrReturnStmt(AssignOrReturnStmt s, ResolutionContext r
 
         s.ResolvedStatements.Add(
           // "if temp.IsFailure()"
-          new IfStmt(s.RangeToken, false, resolver.VarDotMethod(s.Tok, temp, "IsFailure"),
+          new IfStmt(s.Origin, false, resolver.VarDotMethod(s.Origin, temp, "IsFailure"),
             // THEN: { out := temp.PropagateFailure(); return; }
-            new BlockStmt(s.RangeToken, new List<Statement>() {
-              new UpdateStmt(s.RangeToken,
+            new BlockStmt(s.Origin, new List<Statement>() {
+              new AssignStatement(s.Origin,
                 new List<Expression>() { ident },
-                new List<AssignmentRhs>() {new ExprRhs(resolver.VarDotMethod(s.Tok, temp, "PropagateFailure"))}
+                new List<AssignmentRhs>() {new ExprRhs(resolver.VarDotMethod(s.Origin, temp, "PropagateFailure"))}
               ),
-              new ReturnStmt(s.RangeToken, null),
+              new ReturnStmt(s.Origin, null),
             }),
             // ELSE: no else block
             null
@@ -1135,42 +1041,42 @@ private void ResolveAssignOrReturnStmt(AssignOrReturnStmt s, ResolutionContext r
         // "y := temp.Extract();"
         var lhs = s.Lhss[0];
         s.ResolvedStatements.Add(
-          new UpdateStmt(s.RangeToken,
+          new AssignStatement(s.Origin,
             new List<Expression>() { lhsExtract },
-            new List<AssignmentRhs>() { new ExprRhs(resolver.VarDotMethod(s.Tok, temp, "Extract")) }
+            new List<AssignmentRhs>() { new ExprRhs(resolver.VarDotMethod(s.Origin, temp, "Extract")) }
           ));
       }
 
       s.ResolvedStatements.ForEach(a => ResolveStatement(a, resolutionContext));
-      EnsureSupportsErrorHandling(s.Tok, failureSupportingType, expectExtract, s.KeywordToken != null);
+      EnsureSupportsErrorHandling(s.Origin, failureSupportingType, expectExtract, s.KeywordToken?.Token.val);
     }
 
-    private void EnsureSupportsErrorHandling(IToken tok, TopLevelDeclWithMembers failureSupportingType, bool expectExtract, bool hasKeywordToken) {
+    private void EnsureSupportsErrorHandling(IOrigin tok, TopLevelDeclWithMembers failureSupportingType, bool expectExtract, [CanBeNull] string keyword) {
 
       var isFailure = failureSupportingType.Members.Find(x => x.Name == "IsFailure");
       var propagateFailure = failureSupportingType.Members.Find(x => x.Name == "PropagateFailure");
       var extract = failureSupportingType.Members.Find(x => x.Name == "Extract");
 
-      if (hasKeywordToken) {
+      if (keyword != null) {
         if (isFailure == null || (extract != null) != expectExtract) {
           // more details regarding which methods are missing have already been reported by regular resolution
-          ReportError(tok,
-            "The right-hand side of ':-', which is of type '{0}', with a keyword token must have function{1}", failureSupportingType,
-            expectExtract ? "s 'IsFailure()' and 'Extract()'" : " 'IsFailure()', but not 'Extract()'");
+          var requiredMembers = expectExtract
+            ? "functions 'IsFailure()' and 'Extract()'"
+            : "function 'IsFailure()', but not 'Extract()'";
+          ReportError(tok, $"The right-hand side of ':- {keyword}', which is of type '{failureSupportingType}', must have {requiredMembers}");
         }
       } else {
         if (isFailure == null || propagateFailure == null || (extract != null) != expectExtract) {
           // more details regarding which methods are missing have already been reported by regular resolution
-          ReportError(tok,
-            "The right-hand side of ':-', which is of type '{0}', must have function{1}", failureSupportingType,
-            expectExtract
-              ? "s 'IsFailure()', 'PropagateFailure()', and 'Extract()'"
-              : "s 'IsFailure()' and 'PropagateFailure()', but not 'Extract()'");
+          var requiredMembers = expectExtract
+            ? "functions 'IsFailure()', 'PropagateFailure()', and 'Extract()'"
+            : "functions 'IsFailure()' and 'PropagateFailure()', but not 'Extract()'";
+          ReportError(tok, $"The right-hand side of ':-', which is of type '{failureSupportingType}', must have {requiredMembers}");
         }
       }
 
-      void checkIsFunction([CanBeNull] MemberDecl memberDecl, bool allowMethod) {
-        if (memberDecl == null || memberDecl is Function) {
+      void CheckIsFunction([CanBeNull] MemberDecl memberDecl, bool allowMethod) {
+        if (memberDecl is null or Function) {
           // fine
         } else if (allowMethod && memberDecl is Method) {
           // give a deprecation warning, so we will remove this language feature around the Dafny 4 time frame
@@ -1184,16 +1090,16 @@ void checkIsFunction([CanBeNull] MemberDecl memberDecl, bool allowMethod) {
         }
       }
 
-      checkIsFunction(isFailure, false);
-      if (!hasKeywordToken) {
-        checkIsFunction(propagateFailure, true);
+      CheckIsFunction(isFailure, false);
+      if (keyword == null) {
+        CheckIsFunction(propagateFailure, true);
       }
       if (expectExtract) {
-        checkIsFunction(extract, true);
+        CheckIsFunction(extract, true);
       }
     }
 
-    void ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolutionContext) {
+    public void ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolutionContext) {
       Contract.Requires(rr != null);
       Contract.Requires(stmt != null);
       Contract.Requires(resolutionContext != null);
@@ -1205,27 +1111,29 @@ void ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolutionCont
       }
 
       if (rr.ArrayDimensions != null) {
-        // ---------- new T[EE]    OR    new T[EE] (elementInit)
+        // ---------- new T[EE]    OR    new T[EE] (elementInit)    OR    new T[EE] [elements...]
         var dims = rr.ArrayDimensions.Count;
         Contract.Assert(rr.Bindings == null && rr.Path == null && rr.InitCall == null);
-        resolver.ResolveType(stmt.Tok, rr.EType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+        resolver.ResolveType(stmt.Origin, rr.EType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         int i = 0;
         foreach (var dim in rr.ArrayDimensions) {
           ResolveExpression(dim, resolutionContext);
           var indexHint = dims == 1 ? "" : " for index " + i;
-          AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InIntFamily, dim.PreType, dim.tok,
+          AddConfirmation(PreTypeConstraints.CommonConfirmationBag.InIntFamily, dim.PreType, dim.Origin,
             $"new must use an integer-based expression for the array size (got {{0}}{indexHint})");
           i++;
         }
-        rr.PreType = BuiltInArrayType(dims, Type2PreType(rr.EType));
+
+        var elementPreType = Type2PreType(rr.EType);
+        rr.PreType = BuiltInArrayType(dims, elementPreType);
         if (rr.ElementInit != null) {
           ResolveExpression(rr.ElementInit, resolutionContext);
           // Check (the pre-type version of)
           //     nat^N -> rr.EType  :>  rr.ElementInit.Type
           resolver.SystemModuleManager.CreateArrowTypeDecl(dims);  // TODO: should this be done already in the parser?
           var indexPreTypes = Enumerable.Repeat(Type2PreType(resolver.SystemModuleManager.Nat()), dims).ToList();
-          var arrowPreType = BuiltInArrowType(indexPreTypes, Type2PreType(rr.EType));
-          Constraints.AddSubtypeConstraint(arrowPreType, rr.ElementInit.PreType, rr.ElementInit.tok, () => {
+          var arrowPreType = BuiltInArrowType(indexPreTypes, elementPreType);
+          Constraints.AddSubtypeConstraint(arrowPreType, rr.ElementInit.PreType, rr.ElementInit.Origin, () => {
             var hintString = !PreType.Same(arrowPreType, rr.ElementInit.PreType) ? "" :
               string.Format(" (perhaps write '{0} =>' in front of the expression you gave in order to make it an arrow type)",
               dims == 1 ? "_" : "(" + Util.Comma(dims, x => "_") + ")");
@@ -1234,42 +1142,42 @@ void ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolutionCont
         } else if (rr.InitDisplay != null) {
           foreach (var v in rr.InitDisplay) {
             ResolveExpression(v, resolutionContext);
-            AddSubtypeConstraint(Type2PreType(rr.EType), v.PreType, v.tok, "initial value must be assignable to array's elements (expected '{0}', got '{1}')");
+            AddSubtypeConstraint(elementPreType, v.PreType, v.Origin, "initial value must be assignable to array's elements (expected '{0}', got '{1}')");
           }
         }
       } else {
         if (rr.Bindings == null) {
-          resolver.ResolveType(stmt.Tok, rr.EType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+          resolver.ResolveType(stmt.Origin, rr.EType, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
           var cl = (rr.EType as UserDefinedType)?.ResolvedClass as NonNullTypeDecl;
           if (cl != null && !(rr.EType.IsTraitType && !rr.EType.NormalizeExpand().IsObjectQ)) {
             // life is good
           } else {
-            ReportError(stmt, "new can be applied only to class types (got {0})", rr.EType);
+            ReportError(rr.Origin, "new can be applied only to class types (got {0})", rr.EType);
           }
         } else {
           string initCallName = null;
-          IToken initCallTok = null;
+          IOrigin initCallTok = null;
           // Resolve rr.Path and do one of three things:
           // * If rr.Path denotes a type, then set EType,initCallName to rr.Path,"_ctor", which sets up a call to the anonymous constructor.
           // * If the all-but-last components of rr.Path denote a type, then do EType,initCallName := allButLast(EType),last(EType)
           // * Otherwise, report an error
-          var ret = resolver.ResolveTypeLenient(rr.Tok, rr.Path, resolutionContext,
+          var ret = resolver.ResolveTypeLenient(rr.Origin, rr.Path, resolutionContext,
             new ModuleResolver.ResolveTypeOption(ResolveTypeOptionEnum.InferTypeProxies), null, true);
           if (ret != null) {
             // The all-but-last components of rr.Path denote a type (namely, ret.ReplacementType).
             rr.EType = ret.ReplacementType;
             initCallName = ret.LastComponent.SuffixName;
-            initCallTok = ret.LastComponent.tok;
+            initCallTok = ret.LastComponent.Origin;
           } else {
             // Either rr.Path resolved correctly as a type or there was no way to drop a last component to make it into something that looked
             // like a type.  In either case, set EType,initCallName to Path,"_ctor" and continue.
             rr.EType = rr.Path;
             initCallName = "_ctor";
-            initCallTok = rr.Tok;
+            initCallTok = rr.Origin;
           }
           var cl = (rr.EType as UserDefinedType)?.ResolvedClass as NonNullTypeDecl;
           if (cl == null || rr.EType.IsTraitType) {
-            ReportError(rr.tok, "new can be applied only to class types (got {0})", rr.EType);
+            ReportError(rr.Origin, "new can be applied only to class types (got {0})", rr.EType);
           } else {
             // ---------- new C.Init(EE)
             Contract.Assert(initCallName != null);
@@ -1281,17 +1189,17 @@ void ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolutionCont
             // down to resolve this "lhs"; that's a no-op if the .PreType is already filled in, whereas it could cause a "'this' not allowed in
             // static context" error if the code tried to resolve this "this" against the enclosing environment.
             rr.PreType = Type2PreType(rr.EType);
-            var lhs = new ImplicitThisExpr_ConstructorCall(initCallTok) {
+            var lhs = new ImplicitThisExprConstructorCall(initCallTok) {
               Type = rr.EType,
               PreType = rr.PreType
             };
-            var callLhs = new ExprDotName(((UserDefinedType)rr.EType).tok, lhs, initCallName, ret?.LastComponent.OptTypeArguments);
-            ResolveDotSuffix(callLhs, true, rr.Bindings.ArgumentBindings, resolutionContext, true);
+            var callLhs = new ExprDotName(((UserDefinedType)rr.EType).Origin, lhs, new Name(initCallName), ret?.LastComponent.OptTypeArguments);
+            ResolveDotSuffix(callLhs, false, true, rr.Bindings.ArgumentBindings, resolutionContext, true);
             if (prevErrorCount == ErrorCount) {
               Contract.Assert(callLhs.ResolvedExpression is MemberSelectExpr);  // since ResolveApplySuffix succeeded and call.Lhs denotes an expression (not a module or a type)
               var methodSel = (MemberSelectExpr)callLhs.ResolvedExpression;
               if (methodSel.Member is Method) {
-                rr.InitCall = new CallStmt(stmt.RangeToken, new List<Expression>(), methodSel, rr.Bindings.ArgumentBindings, initCallTok);
+                rr.InitCall = new CallStmt(stmt.Origin, new List<Expression>(), methodSel, rr.Bindings.ArgumentBindings, initCallTok.Center);
                 ResolveCallStmt(rr.InitCall, resolutionContext, rr.EType);
               } else {
                 ReportError(initCallTok, "object initialization must denote an initializing method or constructor ({0})", initCallName);
@@ -1311,7 +1219,7 @@ void ResolveTypeRhs(TypeRhs rr, Statement stmt, ResolutionContext resolutionCont
     /// that can be assigned to.  In particular, this means that lhs denotes a mutable variable, field,
     /// or array element.  If a violation is detected, an error is reported.
     /// </summary>
-    void CheckIsLvalue(Expression lhs, ResolutionContext resolutionContext) {
+    public void CheckIsLvalue(Expression lhs, ResolutionContext resolutionContext) {
       Contract.Requires(lhs != null);
       Contract.Requires(resolutionContext != null);
       if (lhs is IdentifierExpr) {
@@ -1336,10 +1244,10 @@ void CheckIsLvalue(Expression lhs, ResolutionContext resolutionContext) {
         }
       } else if (lhs is SeqSelectExpr) {
         var ll = (SeqSelectExpr)lhs;
-        var arrayType = resolver.ResolvedArrayType(ll.Seq.tok, 1, new InferredTypeProxy(), resolutionContext, true);
-        AddSubtypeConstraint(Type2PreType(arrayType), ll.Seq.PreType, ll.Seq.tok, "LHS of array assignment must denote an array element (found {1})");
+        var arrayType = resolver.ResolvedArrayType(ll.Seq.Origin, 1, new InferredTypeProxy(), resolutionContext, true);
+        AddSubtypeConstraint(Type2PreType(arrayType), ll.Seq.PreType, ll.Seq.Origin, "LHS of array assignment must denote an array element (found {1})");
         if (!ll.SelectOne) {
-          ReportError(ll.Seq, "cannot assign to a range of array elements (try the 'forall' statement)");
+          ReportError(ll, "cannot assign to a range of array elements (try the 'forall' statement)");
         }
       } else if (lhs is MultiSelectExpr) {
         // nothing to check; this can only denote an array element
@@ -1347,39 +1255,5 @@ void CheckIsLvalue(Expression lhs, ResolutionContext resolutionContext) {
         ReportError(lhs, "LHS of assignment must denote a mutable variable or field");
       }
     }
-
-    void ResolveAlternatives(List<GuardedAlternative> alternatives, AlternativeLoopStmt loopToCatchBreaks, ResolutionContext resolutionContext) {
-      Contract.Requires(alternatives != null);
-      Contract.Requires(resolutionContext != null);
-
-      // first, resolve the guards
-      foreach (var alternative in alternatives) {
-        ResolveExpression(alternative.Guard, resolutionContext);
-        alternative.Guard.PreType = ConstrainResultToBoolFamily(alternative.Guard.tok, "if/while case", "condition is expected to be of type bool, but is {0}");
-      }
-
-      if (loopToCatchBreaks != null) {
-        loopStack.Add(loopToCatchBreaks);  // push
-      }
-      foreach (var alternative in alternatives) {
-        scope.PushMarker();
-        dominatingStatementLabels.PushMarker();
-        if (alternative.IsBindingGuard) {
-          var exists = (ExistsExpr)alternative.Guard;
-          foreach (var v in exists.BoundVars) {
-            ScopePushAndReport(v, "bound-variable", false);
-          }
-        }
-        ResolveAttributes(alternative, resolutionContext, false);
-        foreach (Statement ss in alternative.Body) {
-          ResolveStatementWithLabels(ss, resolutionContext);
-        }
-        dominatingStatementLabels.PopMarker();
-        scope.PopMarker();
-      }
-      if (loopToCatchBreaks != null) {
-        loopStack.RemoveAt(loopStack.Count - 1);  // pop
-      }
-    }
   }
 }
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeResolve.cs b/Source/DafnyCore/Resolver/PreType/PreTypeResolve.cs
index a8126e1309f..58a3758cfb5 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeResolve.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeResolve.cs
@@ -26,38 +26,38 @@ protected void ReportError(Declaration d, string msg, params object[] args) {
       Contract.Requires(d != null);
       Contract.Requires(msg != null);
       Contract.Requires(args != null);
-      ReportError(d.tok, msg, args);
+      ReportError(d.Origin, msg, args);
     }
 
     protected void ReportError(Statement stmt, string msg, params object[] args) {
       Contract.Requires(stmt != null);
       Contract.Requires(msg != null);
       Contract.Requires(args != null);
-      ReportError(stmt.Tok, msg, args);
+      ReportError(stmt.Origin, msg, args);
     }
 
     protected void ReportError(Expression expr, string msg, params object[] args) {
       Contract.Requires(expr != null);
       Contract.Requires(msg != null);
       Contract.Requires(args != null);
-      ReportError(expr.tok, msg, args);
+      ReportError(expr.Origin, msg, args);
     }
 
-    public void ReportError(IToken tok, string msg, params object[] args) {
+    public void ReportError(IOrigin tok, string msg, params object[] args) {
       Contract.Requires(tok != null);
       Contract.Requires(msg != null);
       Contract.Requires(args != null);
-      resolver.Reporter.Error(MessageSource.Resolver, tok, "PRE-TYPE: " + msg, args);
+      resolver.Reporter.Error(MessageSource.Resolver, tok, msg, args);
     }
 
-    public void ReportWarning(IToken tok, string msg, params object[] args) {
+    public void ReportWarning(IOrigin tok, string msg, params object[] args) {
       Contract.Requires(tok != null);
       Contract.Requires(msg != null);
       Contract.Requires(args != null);
       resolver.Reporter.Warning(MessageSource.Resolver, ParseErrors.ErrorId.none, tok, msg, args);
     }
 
-    protected void ReportInfo(IToken tok, string msg, params object[] args) {
+    protected void ReportInfo(IOrigin tok, string msg, params object[] args) {
       Contract.Requires(tok != null);
       Contract.Requires(msg != null);
       Contract.Requires(args != null);
@@ -67,6 +67,9 @@ protected void ReportInfo(IToken tok, string msg, params object[] args) {
 
   public partial class PreTypeResolver : ResolverPass {
     private readonly Scope<IVariable> scope;
+    public ErrorReporter Reporter => resolver.Reporter;
+    public DafnyOptions Options => resolver.Options;
+    public Scope<IVariable> Scope => scope;
 
     TopLevelDeclWithMembers currentClass;
     Method currentMethod;
@@ -85,14 +88,15 @@ TopLevelDecl BuiltInTypeDecl(string name) {
           new List<Type> { new InferredTypeProxy() }, true).ModifyBuiltins(resolver.SystemModuleManager);
         decl = resolver.SystemModuleManager.arrayTypeDecls[dims];
       } else if (IsBitvectorName(name, out var width)) {
-        var bvDecl = new ValuetypeDecl(name, resolver.SystemModuleManager.SystemModule, t => t.IsBitVectorType,
-          typeArgs => new BitvectorType(resolver.Options, width));
+        var bvDecl = (ValuetypeDecl)resolver.SystemModuleManager.SystemModule.SourceDecls.Find(topLevelDecl => topLevelDecl.Name == name);
+        if (bvDecl == null) {
+          bvDecl = resolver.AddBitvectorTypeDecl(name, width);
+        }
         preTypeInferenceModuleState.PreTypeBuiltins.Add(name, bvDecl);
-        AddRotateMember(bvDecl, "RotateLeft", width);
-        AddRotateMember(bvDecl, "RotateRight", width);
-        resolver.SystemModuleManager.SystemModule.SourceDecls.Add(bvDecl);
-        var memberDictionary = bvDecl.Members.ToDictionary(member => member.Name, member => member);
-        resolver.ProgramResolver.AddSystemClass(bvDecl, memberDictionary);
+        FillInPreTypesInSignature(bvDecl);
+        foreach (var bitvectorMember in bvDecl.Members) {
+          FillInPreTypesInSignature(bitvectorMember);
+        }
         return bvDecl;
       } else {
         decl = null;
@@ -104,13 +108,13 @@ TopLevelDecl BuiltInTypeDecl(string name) {
           }
         }
         if (decl == null) {
-          if (name == "set" || name == "seq" || name == "multiset") {
+          if (name is PreType.TypeNameSet or PreType.TypeNameSeq or PreType.TypeNameMultiset) {
             var variances = new List<TypeParameter.TPVarianceSyntax>() { TypeParameter.TPVarianceSyntax.Covariant_Strict };
             decl = new ValuetypeDecl(name, resolver.SystemModuleManager.SystemModule, variances, _ => false, null);
-          } else if (name == "iset") {
+          } else if (name == PreType.TypeNameIset) {
             var variances = new List<TypeParameter.TPVarianceSyntax>() { TypeParameter.TPVarianceSyntax.Covariant_Permissive };
             decl = new ValuetypeDecl(name, resolver.SystemModuleManager.SystemModule, variances, _ => false, null);
-          } else if (name == "object?") {
+          } else if (name == PreType.TypeNameObjectQ) {
             decl = resolver.SystemModuleManager.ObjectDecl;
           } else {
             decl = new ValuetypeDecl(name, resolver.SystemModuleManager.SystemModule, _ => false, null);
@@ -121,25 +125,6 @@ TopLevelDecl BuiltInTypeDecl(string name) {
       return decl;
     }
 
-    public void AddRotateMember(ValuetypeDecl bitvectorTypeDecl, string name, int width) {
-      var argumentType = resolver.SystemModuleManager.Nat();
-      var formals = new List<Formal> {
-        new Formal(Token.NoToken, "w", argumentType, true, false, null, false) {
-          PreType = Type2PreType(argumentType)
-        }
-      };
-      var resultType = new BitvectorType(resolver.Options, width);
-      var rotateMember = new SpecialFunction(RangeToken.NoToken, name, resolver.SystemModuleManager.SystemModule, false, false,
-        new List<TypeParameter>(), formals, resultType,
-        new List<AttributedExpression>(), new List<FrameExpression>(), new List<AttributedExpression>(),
-        new Specification<Expression>(new List<Expression>(), null), null, null, null) {
-        EnclosingClass = bitvectorTypeDecl,
-        ResultPreType = Type2PreType(resultType)
-      };
-      rotateMember.AddVisibilityScope(resolver.SystemModuleManager.SystemModule.VisibilityScope, false);
-      bitvectorTypeDecl.Members.Add(rotateMember);
-    }
-
     TopLevelDecl BuiltInArrowTypeDecl(int arity) {
       Contract.Requires(0 <= arity);
       var name = ArrowType.ArrowTypeName(arity);
@@ -157,7 +142,7 @@ DPreType BuiltInArrowType(List<PreType> inPreTypes, PreType resultPreType) {
 
     DPreType BuiltInArrayType(int dims, PreType elementPreType) {
       Contract.Requires(1 <= dims);
-      var arrayName = dims == 1 ? "array" : $"array{dims}";
+      var arrayName = dims == 1 ? PreType.TypeNameArray : $"{PreType.TypeNameArray}{dims}";
       return new DPreType(BuiltInTypeDecl(arrayName), new List<PreType>() { elementPreType });
     }
 
@@ -171,16 +156,26 @@ public PreType CreatePreTypeProxy(string description = null) {
       return proxy;
     }
 
+    /// <summary>
+    /// This method can be used when .PreType has been found to be erroneous and its current value
+    /// would be unexpected by the rest of the resolver. This method then sets .Type and .PreType to neutral values.
+    /// </summary>
+    void ResetTypeAssignment(Expression expr) {
+      expr.PreType = CreatePreTypeProxy();
+      expr.ResetTypeAssignment();
+    }
+
     public enum Type2PreTypeOption { GoodForInference, GoodForPrinting, GoodForBoth }
 
     public PreType Type2PreType(Type type, string description = null, Type2PreTypeOption option = Type2PreTypeOption.GoodForBoth) {
       Contract.Requires(type != null);
 
       type = type.Normalize(); // keep type synonyms
-      if (type.AsTypeSynonym is { } typeSynonymDecl and not SubsetTypeDecl && option != Type2PreTypeOption.GoodForInference) {
+      if (type.AsTypeSynonym is { } typeSynonymDecl && option != Type2PreTypeOption.GoodForInference &&
+          typeSynonymDecl.IsRevealedInScope(Type.GetScope())) {
         // Compute a pre-type for the non-instantiated ("raw") RHS type (that is, for the RHS of the type-synonym declaration with the
         // formal type parameters of the type-synonym declaration).
-        var rawRhsType = UserDefinedType.FromTopLevelDecl(typeSynonymDecl.tok, typeSynonymDecl);
+        var rawRhsType = UserDefinedType.FromTopLevelDecl(typeSynonymDecl.Origin, typeSynonymDecl);
         var preTypeArguments = type.TypeArgs.ConvertAll(ty => Type2PreType(ty, null, Type2PreTypeOption.GoodForBoth));
 
         // The printable pre-type is the original type synonym, but with preTypeArguments as arguments
@@ -211,7 +206,7 @@ public PreType Type2PreType(Type type, string description = null, Type2PreTypeOp
         // Make sure the newtype declaration itself has been pre-type resolved
         ResolvePreTypeSignature(newtypeDecl);
         Contract.Assert(newtypeDecl.Var == null || newtypeDecl.Var.PreType != null);
-        Contract.Assert(newtypeDecl.BaseType != null);
+        Contract.Assert(newtypeDecl.BasePreType != null);
       }
 
       if (type is TypeProxy) {
@@ -223,28 +218,28 @@ public PreType Type2PreType(Type type, string description = null, Type2PreTypeOp
       return new DPreType(decl, arguments);
     }
 
-    TopLevelDecl Type2Decl(Type type) {
+    public TopLevelDecl Type2Decl(Type type) {
       Contract.Requires(type != null);
       Contract.Requires(type is NonProxyType and not SelfType);
       TopLevelDecl decl;
       if (type is BoolType) {
-        decl = BuiltInTypeDecl("bool");
+        decl = BuiltInTypeDecl(PreType.TypeNameBool);
       } else if (type is CharType) {
-        decl = BuiltInTypeDecl("char");
+        decl = BuiltInTypeDecl(PreType.TypeNameChar);
       } else if (type is IntType) {
-        decl = BuiltInTypeDecl("int");
+        decl = BuiltInTypeDecl(PreType.TypeNameInt);
       } else if (type is RealType) {
-        decl = BuiltInTypeDecl("real");
+        decl = BuiltInTypeDecl(PreType.TypeNameReal);
       } else if (type is BigOrdinalType) {
-        decl = BuiltInTypeDecl("ORDINAL");
+        decl = BuiltInTypeDecl(PreType.TypeNameORDINAL);
       } else if (type is BitvectorType bitvectorType) {
-        decl = BuiltInTypeDecl("bv" + bitvectorType.Width);
+        decl = BuiltInTypeDecl(PreType.TypeNameBvPrefix + bitvectorType.Width);
       } else if (type is CollectionType) {
         var name =
-          type is SetType st ? (st.Finite ? "set" : "iset") :
-          type is MultiSetType ? "multiset" :
-          type is MapType mt ? (mt.Finite ? "map" : "imap") :
-          "seq";
+          type is SetType st ? PreType.SetTypeName(st.Finite) :
+          type is MultiSetType ? PreType.TypeNameMultiset :
+          type is MapType mt ? PreType.MapTypeName(mt.Finite) :
+          PreType.TypeNameSeq;
         decl = BuiltInTypeDecl(name);
       } else if (type is ArrowType at) {
         decl = BuiltInArrowTypeDecl(at.Arity);
@@ -256,23 +251,35 @@ TopLevelDecl Type2Decl(Type type) {
       return decl;
     }
 
+    public IEnumerable<DPreType> TypeParameterBounds2PreTypes(TypeParameter typeParameter) {
+      foreach (var typeBound in typeParameter.TypeBounds) {
+        var preTypeBound = Type2PreType(typeBound, $"type bound for type parameter '{typeParameter.Name}'");
+        yield return (DPreType)preTypeBound;
+      }
+    }
+
     /// <summary>
-    /// Returns the non-newtype ancestor of "decl".
-    /// This method assumes that the ancestors of "decl" do not form any cycles. That is, any such cycle detection must already
+    /// Returns the non-newtype ancestor pre-type of "preType".
+    /// This method assumes that the ancestors of "preType.Decl" do not form any cycles. That is, any such cycle detection must already
     /// have been done.
+    /// If the base type is a type parameter (of the newtype's) and that type parameter is not determined, then this method returns null.
     /// </summary>
-    public static TopLevelDecl AncestorDecl(TopLevelDecl decl) {
-      while (decl is NewtypeDecl newtypeDecl) {
-        var parent = newtypeDecl.BasePreType.Normalize();
-        decl = ((DPreType)parent).Decl;
+    [CanBeNull]
+    public static DPreType AncestorPreType(DPreType preType) {
+      while (preType.Decl is NewtypeDecl newtypeDecl) {
+        var subst = PreType.PreTypeSubstMap(newtypeDecl.TypeArgs, preType.Arguments);
+        if (newtypeDecl.BasePreType.Substitute(subst).Normalize() is DPreType baseWithSubstitution) {
+          preType = baseWithSubstitution;
+        } else {
+          return null;
+        }
       }
-      return decl;
+      return preType;
     }
 
     [CanBeNull]
-    public static string/*?*/ AncestorName(PreType preType) {
-      var dp = preType.Normalize() as DPreType;
-      return dp == null ? null : AncestorDecl(dp.Decl).Name;
+    public static string AncestorName(PreType preType) {
+      return preType.Normalize() is not DPreType dp ? null : AncestorPreType(dp)?.Decl.Name;
     }
 
     /// <summary>
@@ -280,7 +287,7 @@ public static TopLevelDecl AncestorDecl(TopLevelDecl decl) {
     /// If the ancestor chain has a cycle or if some part of the chain hasn't yet been resolved, this method ends the traversal
     /// early (and returns the last ancestor traversed). This method does not return any error; that's assumed to be done elsewhere.
     /// </summary>
-    public DPreType NewTypeAncestor(DPreType preType) {
+    public static DPreType NewTypeAncestor(DPreType preType) {
       Contract.Requires(preType != null);
       ISet<NewtypeDecl> visited = null;
       while (preType.Decl is NewtypeDecl newtypeDecl) {
@@ -290,13 +297,19 @@ public DPreType NewTypeAncestor(DPreType preType) {
           break;
         }
         visited.Add(newtypeDecl);
-        var parent = newtypeDecl.BasePreType.Normalize() as DPreType;
-        if (parent == null) {
+        if (newtypeDecl.BasePreType.Normalize() is not DPreType parent) {
           // The parent type of this newtype apparently hasn't been inferred yet, so stop traversal here
           break;
         }
         var subst = PreType.PreTypeSubstMap(newtypeDecl.TypeArgs, preType.Arguments);
-        preType = (DPreType)parent.Substitute(subst);
+        if (parent.Substitute(subst) is not DPreType parentWithSubstitutions) {
+          // The head type of result of the substitution into the parent is not yet inferred. This must have been because
+          // the parent is a type parameter of the newtype and the actual type argument hasn't been inferred yet. So, we
+          // stop here and return the type-parameter parent.
+          Contract.Assert(parent.Decl is TypeParameter);
+          break;
+        }
+        preType = parentWithSubstitutions;
       }
       return preType;
     }
@@ -321,20 +334,25 @@ public static bool HasTraitSupertypes(DPreType dp) {
     }
 
     /// <summary>
-    /// Add to "ancestors" every TopLevelDecl that is a reflexive, transitive parent of "d",
+    /// Add to "ancestors" every TopLevelDecl that is a reflexive, transitive parent of "decl",
     /// but not exploring past any TopLevelDecl that is already in "ancestors".
     /// </summary>
-    public void ComputeAncestors(TopLevelDecl decl, ISet<TopLevelDecl> ancestors) {
+    public static void ComputeAncestors(TopLevelDecl decl, ISet<TopLevelDecl> ancestors, SystemModuleManager systemModuleManager) {
       if (!ancestors.Contains(decl)) {
         ancestors.Add(decl);
         if (decl is TopLevelDeclWithMembers topLevelDeclWithMembers) {
-          topLevelDeclWithMembers.ParentTraitHeads.ForEach(parent => ComputeAncestors(parent, ancestors));
+          topLevelDeclWithMembers.ParentTraitHeads.ForEach(parent => ComputeAncestors(parent, ancestors, systemModuleManager));
+        } else if (decl is TypeParameter typeParameter) {
+          typeParameter.TypeBoundHeads.ToList().ForEach(parent => ComputeAncestors(parent, ancestors, systemModuleManager));
+        } else if (decl is TypeSynonymDecl { Rhs: UserDefinedType { ResolvedClass: TopLevelDecl rhs } }) {
+          ComputeAncestors(rhs, ancestors, systemModuleManager);
         }
+
         if (decl is TraitDecl { IsObjectTrait: true }) {
           // we're done
         } else if (DPreType.IsReferenceTypeDecl(decl)) {
           // object is also a parent type
-          ComputeAncestors(resolver.SystemModuleManager.ObjectDecl, ancestors);
+          ComputeAncestors(systemModuleManager.ObjectDecl, ancestors, systemModuleManager);
         }
       }
     }
@@ -345,8 +363,20 @@ public void ComputeAncestors(TopLevelDecl decl, ISet<TopLevelDecl> ancestors) {
     /// Note, if either "super" or "sub" contains a type proxy, then "false" is returned.
     /// </summary>
     public bool IsSuperPreTypeOf(DPreType super, DPreType sub) {
+      if (sub.Decl is TypeParameter typeParameter) {
+        if (PreType.Same(super, sub)) {
+          return true;
+        }
+        foreach (var preTypeBound in TypeParameterBounds2PreTypes(typeParameter)) {
+          if (IsSuperPreTypeOf(super, preTypeBound)) {
+            return true;
+          }
+        }
+        return false;
+      }
+
       var subAncestors = new HashSet<TopLevelDecl>();
-      ComputeAncestors(sub.Decl, subAncestors);
+      ComputeAncestors(sub.Decl, subAncestors, resolver.SystemModuleManager);
       if (!subAncestors.Contains(super.Decl)) {
         return false;
       }
@@ -372,7 +402,7 @@ public bool IsSuperPreTypeOf(DPreType super, DPreType sub) {
 
     public static bool IsBitvectorName(string name, out int width) {
       Contract.Requires(name != null);
-      if (name.StartsWith("bv")) {
+      if (name.StartsWith(PreType.TypeNameBvPrefix)) {
         var bits = name.Substring(2);
         width = 0; // set to 0, in case the first disjunct of the next line evaluates to true
         return bits == "0" || (bits.Length != 0 && bits[0] != '0' && int.TryParse(bits, out width));
@@ -387,8 +417,8 @@ public static bool IsBitvectorName(string name) {
 
     public static bool IsArrayName(string name, out int dimensions) {
       Contract.Requires(name != null);
-      if (name.StartsWith("array")) {
-        var dims = name.Substring(5);
+      if (name.StartsWith(PreType.TypeNameArray)) {
+        var dims = name[PreType.TypeNameArray.Length..];
         if (dims.Length == 0) {
           dimensions = 1;
           return true;
@@ -403,10 +433,11 @@ public static bool IsArrayName(string name, out int dimensions) {
     private class PreTypeInferenceModuleState {
       public readonly ISet<Declaration> StillNeedsPreTypeSignature;
       public readonly Stack<Declaration> InFirstPhase = new Stack<Declaration>();
-      public readonly Dictionary<string, TopLevelDecl> PreTypeBuiltins = new();
+      public readonly Dictionary<string, TopLevelDecl> PreTypeBuiltins;
 
-      public PreTypeInferenceModuleState(List<Declaration> declarations) {
+      public PreTypeInferenceModuleState(List<Declaration> declarations, Dictionary<string, TopLevelDecl> preTypeBuiltins) {
         StillNeedsPreTypeSignature = new HashSet<Declaration>(declarations);
+        PreTypeBuiltins = preTypeBuiltins;
       }
     }
 
@@ -417,8 +448,8 @@ private PreTypeResolver(ModuleResolver resolver, PreTypeInferenceModuleState pre
       this.preTypeInferenceModuleState = preTypeInferenceModuleState;
 
       scope = new Scope<IVariable>(resolver.Options);
-      enclosingStatementLabels = new Scope<Statement>(resolver.Options);
-      dominatingStatementLabels = new Scope<Label>(resolver.Options);
+      EnclosingStatementLabels = new Scope<Statement>(resolver.Options);
+      DominatingStatementLabels = new Scope<Label>(resolver.Options);
       Constraints = new PreTypeConstraints(this);
     }
 
@@ -429,11 +460,11 @@ void ScopePushAndReport(IVariable v, string kind, bool assignPreType = true) {
       if (assignPreType) {
         Contract.Assert(v.PreType == null);
         v.PreType = Type2PreType(v.Type, $"type of identifier '{v.Name}'");
-        Contract.Assert(v.PreType is not DPreType dp || dp.Decl != null); // sanity check that the .Decl field was set
+        Contract.Assert(v.PreType is not DPreType { Decl: null }); // sanity check that the .Decl field was set
       } else {
         Contract.Assert(v.PreType != null);
       }
-      ScopePushAndReport(scope, v.Name, v, v.Tok, kind);
+      ScopePushAndReport(scope, v.Name, v, v.Origin, kind);
     }
 
     void ScopePushExpectSuccess(IVariable v, string kind, bool assignPreType = true) {
@@ -446,11 +477,11 @@ void ScopePushExpectSuccess(IVariable v, string kind, bool assignPreType = true)
       } else {
         Contract.Assert(v.PreType != null);
       }
-      var r = ScopePushAndReport(scope, v.Name, v, v.Tok, kind);
+      var r = ScopePushAndReport(scope, v.Name, v, v.Origin, kind);
       Contract.Assert(r == Scope<IVariable>.PushResult.Success);
     }
 
-    private Scope<Thing>.PushResult ScopePushAndReport<Thing>(Scope<Thing> scope, string name, Thing thing, IToken tok, string kind) where Thing : class {
+    public Scope<Thing>.PushResult ScopePushAndReport<Thing>(Scope<Thing> scope, string name, Thing thing, IOrigin tok, string kind) where Thing : class {
       Contract.Requires(scope != null);
       Contract.Requires(name != null);
       Contract.Requires(thing != null);
@@ -470,79 +501,187 @@ private Scope<Thing>.PushResult ScopePushAndReport<Thing>(Scope<Thing> scope, st
       return r;
     }
 
-#if THIS_COMES_LATER
-    public void PostResolveChecks(List<TopLevelDecl> declarations) {
-      Contract.Requires(declarations != null);
-      foreach (TopLevelDecl topd in declarations) {
-        TopLevelDecl d = topd is ClassLikeDecl ? ((ClassLikeDecl)topd).NonNullTypeDecl : topd;
-
-        if (ErrorCount == prevErrorCount) {
-          // Check type inference, which also discovers bounds, in newtype/subset-type constraints and const declarations
-          foreach (TopLevelDecl topd in declarations) {
-            TopLevelDecl d = topd is ClassLikeDecl ? ((ClassLikeDecl)topd).NonNullTypeDecl : topd;
-            if (topd is TopLevelDeclWithMembers cl) {
-              foreach (var member in cl.Members) {
-                if (member is ConstantField field && field.Rhs != null) {
-                  // make sure initialization only refers to constant field or literal expression
-                  if (CheckIsConstantExpr(field, field.Rhs)) {
-                    AddAssignableConstraint(field.tok, field.Type, field.Rhs.Type,
-                      "type for constant '" + field.Name + "' is '{0}', but its initialization value type is '{1}'");
-                  }
-                  
-                }
-              }
-            }
-          }
-        }
+    void AddSubtypeConstraint(PreType super, PreType sub, IOrigin tok, string errorFormatString) {
+      Constraints.AddSubtypeConstraint(super, sub, tok, errorFormatString);
+    }
 
-      }
+    void AddConfirmation(PreTypeConstraints.CommonConfirmationBag check, PreType preType, IOrigin tok, string errorFormatString, Action onProxyAction = null) {
+      Constraints.AddConfirmation(check, preType, tok, errorFormatString, onProxyAction);
     }
-#endif
 
-    void AddSubtypeConstraint(PreType super, PreType sub, IToken tok, string errorFormatString) {
-      Constraints.AddSubtypeConstraint(super, sub, tok, errorFormatString);
+    void AddComparableConstraint(PreType a, PreType b, IOrigin tok, bool allowBaseTypeCast, string errorFormatString) {
+      AddComparableConstraint(a, b, tok, allowBaseTypeCast, () => string.Format(errorFormatString, a, b));
     }
 
-    void AddConfirmation(PreTypeConstraints.CommonConfirmationBag check, PreType preType, IToken tok, string errorFormatString) {
-      Constraints.AddConfirmation(check, preType, tok, errorFormatString);
+    void AddComparableConstraint(PreType a, PreType b, IOrigin tok, bool allowBaseTypeCast, Func<string> errorMessage) {
+      // A "comparable types" constraint involves a disjunction. This can get gnarly for inference, so the full disjunction
+      // is checked post inference. The constraint can, however, be of use during inference, so we also add an approximate
+      // constraint (which is set up NOT to generate any error messages by itself, since otherwise errors would be duplicated).
+      Constraints.AddGuardedConstraint(() => ApproximateComparableConstraints(a, b, tok, allowBaseTypeCast,
+        "(Duplicate error message) " + errorMessage(), false));
+      if (!allowBaseTypeCast) {
+        // The "comparable types" constraint may be useful as a bound if nothing else is known about a proxy. 
+        if (a.Normalize() is PreTypeProxy aPreTypeProxy) {
+          Constraints.AddCompatibleBounds(aPreTypeProxy, b);
+        }
+        if (b.Normalize() is PreTypeProxy bPreTypeProxy) {
+          Constraints.AddCompatibleBounds(bPreTypeProxy, a);
+        }
+      }
+      Constraints.AddConfirmation(tok, () => CheckComparableTypes(a, b, allowBaseTypeCast), errorMessage);
     }
 
-    void AddComparableConstraint(PreType a, PreType b, IToken tok, string errorFormatString) {
-      Contract.Requires(a != null);
-      Contract.Requires(b != null);
-      Contract.Requires(tok != null);
-      Contract.Requires(errorFormatString != null);
-      Constraints.AddGuardedConstraint(() => ApplyComparableConstraints(a, b, tok, errorFormatString));
+    /// <summary>
+    /// This method returns whether or not A and B are comparable types (notated with the constraint A ~~ B).
+    ///
+    /// The meaning of a comparable constraint
+    ///     A ~~ B
+    /// is the disjunction
+    ///     A ::> B    or    B ::> A
+    ///
+    /// If "!allowConversion", then "X ::> Y" means
+    ///     X :> Y
+    ///
+    /// If "allowConversion", then "X ::> Y" means
+    ///     X' :> Y', or
+    ///     X' and Y' are various bv types, or
+    ///     X' is int and Y' is in {int, char, bv, ORDINAL, real}.
+    /// where X' and Y' are the newtype ancestors of X and Y, respectively.
+    /// Additionally, under the legacy option /generalNewtypes:0 (which will be phased out over time), the latter also allows
+    /// several additional cases, see IsConversionCompatible.
+    /// </summary>
+    bool CheckComparableTypes(PreType a, PreType b, bool allowConversion) {
+      if (PreType.Same(a, b)) {
+        // this allows the case where "a" and "b" are proxies that are equal
+        return true;
+      }
+      if (a.Normalize() is not DPreType aa || b.Normalize() is not DPreType bb) {
+        return false;
+      }
+      if (IsSuperPreTypeOf(aa, bb) || IsSuperPreTypeOf(bb, aa)) {
+        return true;
+      }
+      if (!allowConversion) {
+        return false;
+      }
+      if (IsConversionCompatible(aa, bb) || IsConversionCompatible(bb, aa)) {
+        return true;
+      }
+      return false;
     }
 
-    bool ApplyComparableConstraints(PreType a, PreType b, IToken tok, string errorFormatString) {
-      // The meaning of a comparable constraint
-      //     A ~~ B
-      // is the disjunction
-      //     A :> B    or    B :> A
+    bool IsConversionCompatible(DPreType fromType, DPreType toType) {
+      var fromAncestor = AncestorPreType(fromType);
+      var toAncestor = AncestorPreType(toType);
+      if (fromAncestor == null || toAncestor == null) {
+        return false;
+      }
+
+      if (PreType.Same(fromAncestor, toAncestor)) {
+        return true;
+      }
+      var fromFamily = fromAncestor.Decl.Name;
+      var toFamily = toAncestor.Decl.Name;
+      var toName = toType.Decl.Name;
+
+      if (IsBitvectorName(fromFamily) && (toFamily == PreType.TypeNameInt || IsBitvectorName(toFamily))) {
+        return true;
+      }
+      if (fromFamily == PreType.TypeNameInt && toName is PreType.TypeNameChar or PreType.TypeNameReal or PreType.TypeNameORDINAL) {
+        return true;
+      }
+
+      var legacy = !resolver.Options.Get(CommonOptionBag.GeneralNewtypes);
+      if (legacy) {
+        if (fromFamily == PreType.TypeNameReal &&
+            (toFamily is PreType.TypeNameInt or PreType.TypeNameChar or PreType.TypeNameORDINAL || IsBitvectorName(toFamily))) {
+          return true;
+        }
+        if (fromFamily == PreType.TypeNameChar && (toFamily is PreType.TypeNameInt or PreType.TypeNameORDINAL || IsBitvectorName(toFamily))) {
+          return true;
+        }
+        if (IsBitvectorName(fromFamily) &&
+            (toFamily is PreType.TypeNameInt or PreType.TypeNameReal or PreType.TypeNameChar or PreType.TypeNameORDINAL)) {
+          return true;
+        }
+      }
+
+      return false;
+    }
+
+    bool ApproximateComparableConstraints(PreType a, PreType b, IOrigin tok, bool allowBaseTypeCast, string errorFormatString, bool reportErrors = true) {
+      // See CheckComparableTypes for the meaning of "comparable type".
       // To decide between these two possibilities, enough information must be available about A and/or B.
-      var ptA = a.Normalize() as DPreType;
-      var ptB = b.Normalize() as DPreType;
-      if (ptA != null && ptB != null &&
-          Constraints.GetTypeArgumentsForSuperType(ptB.Decl, ptA.Decl, ptA.Arguments) == null &&
-          Constraints.GetTypeArgumentsForSuperType(ptA.Decl, ptB.Decl, ptB.Arguments) == null) {
+      var normalizedA = a.Normalize() as DPreType;
+      var normalizedB = b.Normalize() as DPreType;
+      if (normalizedA != null && normalizedB != null && normalizedA.Decl != normalizedB.Decl) {
+        var subArguments = Constraints.GetTypeArgumentsForSuperType(normalizedB.Decl, normalizedA, allowBaseTypeCast);
+        if (subArguments != null) {
+          // use B :> A
+          var aa = new DPreType(normalizedB.Decl, subArguments, normalizedA.PrintablePreType);
+          Constraints.DebugPrint($"    DEBUG: turning ~~ into {b} :> {aa}");
+          Constraints.AddSubtypeConstraint(b, aa, tok, errorFormatString, null, reportErrors);
+          return true;
+        }
+        subArguments = Constraints.GetTypeArgumentsForSuperType(normalizedA.Decl, normalizedB, allowBaseTypeCast);
+        if (subArguments != null) {
+          // use A :> B
+          var bb = new DPreType(normalizedA.Decl, subArguments, normalizedB.PrintablePreType);
+          Constraints.DebugPrint($"    DEBUG: turning ~~ into {a} :> {bb}");
+          Constraints.AddSubtypeConstraint(a, bb, tok, errorFormatString, null, reportErrors);
+          return true;
+        }
+
+        if (allowBaseTypeCast && (IsConversionCompatible(normalizedA, normalizedB) || IsConversionCompatible(normalizedB, normalizedA))) {
+          return true;
+        }
+
         // neither A :> B nor B :> A is possible
-        ReportError(tok, errorFormatString, a, b);
-        return true;
-      } else if ((ptA != null && ptA.IsLeafType()) || (ptB != null && ptB.IsRootType())) {
-        // use B :> A
-        Constraints.DebugPrint($"    DEBUG: turning ~~ into {b} :> {a}");
-        Constraints.AddSubtypeConstraint(b, a, tok, errorFormatString);
+        if (reportErrors) {
+          ReportError(tok, errorFormatString, a, b);
+        }
         return true;
-      } else if ((ptA != null && ptA.IsRootType()) || (ptB != null && ptB.IsLeafType())) {
-        // use A :> B
-        Constraints.DebugPrint($"    DEBUG: turning ~~ into {a} :> {b}");
-        Constraints.AddSubtypeConstraint(a, b, tok, errorFormatString);
+      }
+
+      if (!allowBaseTypeCast) {
+        if ((normalizedA != null && normalizedA.IsLeafType()) || (normalizedB != null && normalizedB.IsRootType())) {
+          // use B :> A
+          Constraints.DebugPrint($"    DEBUG: turning ~~ into {b} :> {a}");
+          Constraints.AddSubtypeConstraint(b, a, tok, errorFormatString, null, reportErrors);
+          return true;
+        } else if ((normalizedA != null && normalizedA.IsRootType()) || (normalizedB != null && normalizedB.IsLeafType())) {
+          // use A :> B
+          Constraints.DebugPrint($"    DEBUG: turning ~~ into {a} :> {b}");
+          Constraints.AddSubtypeConstraint(a, b, tok, errorFormatString, null, reportErrors);
+          return true;
+        }
+      }
+
+      if (normalizedA != null && normalizedB != null && normalizedA.Decl == normalizedB.Decl) {
+        // Here is where we approximate the answer. We'll only constrain that variant type parameters are *comparable*, not that
+        // they are consistently comparable. For example, if ptA is C<A0, A1> and ptB is C<B0, A1> and C is declared as C<+T, +U>,
+        // then "comparable types" says
+        //     (A0 ::> B0 and A1 ::> B1)  or  (B0 ::> A0 and B1 ::> A1)
+        // but we will use only
+        //     (A0 ::> B0 or B0 ::> A0)  and  (A1 ::> B1 or B1 ::> A1)
+        Contract.Assert(normalizedA.Decl.TypeArgs.Count == normalizedA.Arguments.Count);
+        Contract.Assert(normalizedA.Arguments.Count == normalizedB.Arguments.Count);
+        for (var i = 0; i < normalizedA.Decl.TypeArgs.Count; i++) {
+          var aa = normalizedA.Arguments[i];
+          var bb = normalizedB.Arguments[i];
+          var msgFormat = $"{errorFormatString} (type argument {i})"; // TODO: this should be improved to use ptA/ptB
+          if (normalizedA.Decl.TypeArgs[i].Variance == TypeParameter.TPVariance.Non) {
+            Constraints.AddEqualityConstraint(aa, bb, tok, msgFormat, null, reportErrors);
+          } else {
+            Constraints.AddGuardedConstraint(() => ApproximateComparableConstraints(aa, bb, tok, false, msgFormat, reportErrors));
+          }
+        }
+
         return true;
-      } else {
-        // not enough information to determine
-        return false;
       }
+
+      // not enough information to determine
+      return false;
     }
 
     /// <summary>
@@ -551,7 +690,8 @@ bool ApplyComparableConstraints(PreType a, PreType b, IToken tok, string errorFo
     public static void ResolveDeclarations(List<TopLevelDecl> declarations, ModuleResolver resolver, bool firstPhaseOnly = false) {
       // Each (top-level or member) declaration is done in two phases.
       //
-      // The goal of the first phase is to fill in the pre-types in the declaration's signature. For many declarations,
+      // The goal of the first phase is to fill in the pre-types in the declaration's signature (and, if the declaration is a
+      // type with a base type or with parent traits, inherit the members from the base and parent types). For many declarations,
       // this is as easy as calling PreType2Type on each type that appears in the declaration's signature.
       // Since the base type of a newtype or subset type and the type of a const may be omitted in the program text,
       // obtaining the pre-type for these 3 declarations requires doing resolution. It is not clear a-priori which
@@ -569,7 +709,7 @@ public static void ResolveDeclarations(List<TopLevelDecl> declarations, ModuleRe
       // for each declaration, in the order given.
 
       var allDeclarations = AllTopLevelOrMemberDeclarations(declarations).ToList();
-      var preTypeInferenceModuleState = new PreTypeInferenceModuleState(allDeclarations);
+      var preTypeInferenceModuleState = new PreTypeInferenceModuleState(allDeclarations, resolver.SystemModuleManager.PreTypeBuiltins);
       foreach (var d in allDeclarations) {
         Contract.Assert(resolver.VisibleInScope(d));
         ResolvePreTypeSignature(d, preTypeInferenceModuleState, resolver);
@@ -580,6 +720,7 @@ public static void ResolveDeclarations(List<TopLevelDecl> declarations, ModuleRe
         foreach (var d in allDeclarations) {
           basicPreTypeResolver.ResolveDeclarationBody(d);
         }
+        basicPreTypeResolver.Constraints.AssertThatStateIsClear();
       }
     }
 
@@ -587,8 +728,14 @@ void ResolvePreTypeSignature(Declaration d) {
       ResolvePreTypeSignature(d, preTypeInferenceModuleState, resolver);
     }
 
+    /// <summary>
+    /// This method resolves the pre-types the signature of declaration "d".
+    /// If the declaration is a newtype (and thus has a base type) or extends some traits, then the members from the base type
+    /// and parent types are inherited.
+    /// </summary>
     private static void ResolvePreTypeSignature(Declaration d, PreTypeInferenceModuleState preTypeInferenceModuleState, ModuleResolver resolver) {
       var preTypeResolver = new PreTypeResolver(resolver, preTypeInferenceModuleState);
+      var previousErrorCount = preTypeResolver.ErrorCount;
 
       // The "allTypeParameters" scope is stored in "resolver", and there's only one such "resolver". Since
       // "ResolvePreTypeSignature" is recursive, a simple "PushMarker()" would still leave previous type parameters
@@ -611,9 +758,18 @@ private static void ResolvePreTypeSignature(Declaration d, PreTypeInferenceModul
       }
 
       preTypeResolver.ResolveDeclarationSignature(d);
+      preTypeResolver.Constraints.AssertThatStateIsClear();
 
       resolver.allTypeParameters.PopMarker();
       resolver.allTypeParameters = oldAllTypeParameters;
+
+      if (d is TopLevelDeclWithMembers topLevelDeclWithMembers) {
+        DPreType basePreType = null;
+        if (preTypeResolver.ErrorCount == previousErrorCount && topLevelDeclWithMembers is NewtypeDecl newtypeDecl) {
+          basePreType = newtypeDecl.BasePreType.Normalize() as DPreType;
+        }
+        resolver.RegisterInheritedMembers(topLevelDeclWithMembers, basePreType);
+      }
     }
 
     static IEnumerable<Declaration> AllTopLevelOrMemberDeclarations(List<TopLevelDecl> declarations) {
@@ -635,7 +791,6 @@ static IEnumerable<Declaration> AllTopLevelOrMemberDeclarations(List<TopLevelDec
     /// <summary>
     /// Assumes that the type parameters in scope for "d" have been pushed.
     /// </summary>
-    /// <param name="d"></param>
     public void ResolveDeclarationSignature(Declaration d) {
       Contract.Requires(d is TopLevelDecl or MemberDecl);
 
@@ -660,14 +815,13 @@ public void ResolveDeclarationSignature(Declaration d) {
     /// Assumes the type parameters in scope for "declaration" have been pushed.
     /// </summary>
     public void FillInPreTypesInSignature(Declaration declaration) {
-      void ComputePreType(Formal formal) {
-        Contract.Assume(formal.PreType == null); // precondition
-        formal.PreType = Type2PreType(formal.Type);
+      PreType CreateTemporaryPreTypeProxy() {
+        return CreatePreTypeProxy("temporary proxy until after cyclicity tests have completed");
       }
 
       void ComputePreTypeField(Field field) {
         Contract.Assume(field.PreType == null); // precondition
-        field.PreType = CreatePreTypeProxy("temporary proxy until after cyclicity tests have completed");
+        field.PreType = CreateTemporaryPreTypeProxy();
         field.PreType = Type2PreType(field.Type);
         if (field is ConstantField cfield) {
           var parent = (TopLevelDeclWithMembers)cfield.EnclosingClass;
@@ -681,42 +835,67 @@ void ComputePreTypeField(Field field) {
         }
       }
 
+      void ComputePreTypeFormal(Formal formal) {
+        Contract.Assume(formal.PreType == null); // precondition
+        formal.PreType = CreateTemporaryPreTypeProxy();
+        formal.PreType = Type2PreType(formal.Type);
+      }
+
       void ComputePreTypeFunction(Function function) {
-        function.Formals.ForEach(ComputePreType);
+        function.Ins.ForEach(ComputePreTypeFormal);
         if (function.Result != null) {
-          function.Result.PreType = Type2PreType(function.Result.Type);
+          ComputePreTypeFormal(function.Result);
         } else if (function.ByMethodDecl != null) {
           // The by-method out-parameter is not the same as the one given in the function declaration, since the
           // function declaration didn't give one.
-          function.ByMethodDecl.Outs.ForEach(ComputePreType);
+          function.ByMethodDecl.Outs.ForEach(ComputePreTypeFormal);
         }
+        function.ResultPreType = CreateTemporaryPreTypeProxy();
         function.ResultPreType = Type2PreType(function.ResultType);
       }
 
       void ComputePreTypeMethod(Method method) {
-        method.Ins.ForEach(ComputePreType);
-        method.Outs.ForEach(ComputePreType);
+        method.Ins.ForEach(ComputePreTypeFormal);
+        method.Outs.ForEach(ComputePreTypeFormal);
       }
 
       if (declaration is SubsetTypeDecl std) {
+        std.Var.PreType = CreateTemporaryPreTypeProxy();
         std.Var.PreType = Type2PreType(std.Var.Type);
         ResolveConstraintAndWitness(std, true);
       } else if (declaration is NewtypeDecl nd) {
+        nd.BasePreType = CreateTemporaryPreTypeProxy();
+        if (nd.Var != null) {
+          nd.Var.PreType = nd.BasePreType;
+        }
         nd.BasePreType = Type2PreType(nd.BaseType);
         if (nd.Var != null) {
           Contract.Assert(object.ReferenceEquals(nd.BaseType, nd.Var.Type));
           nd.Var.PreType = nd.BasePreType;
         }
+        var onProxyAction = () => {
+          resolver.ReportError(ResolutionErrors.ErrorId.r_newtype_base_undetermined, nd.Origin,
+            $"base type of {nd.WhatKindAndName} is not fully determined; add an explicit type for bound variable '{nd.Var.Name}'");
+        };
+        if (resolver.Options.Get(CommonOptionBag.GeneralNewtypes)) {
+          AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IsNewtypeBaseTypeGeneral, nd.BasePreType, nd.Origin,
+            $"a newtype ('{nd.Name}') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got {{0}})",
+            onProxyAction);
+        } else {
+          AddConfirmation(PreTypeConstraints.CommonConfirmationBag.IsNewtypeBaseTypeLegacy, nd.BasePreType, nd.Origin,
+            $"a newtype ('{nd.Name}') must be based on some numeric type (got {{0}})", onProxyAction);
+        }
         ResolveConstraintAndWitness(nd, true);
+
       } else if (declaration is IteratorDecl iter) {
         // Note, iter.Ins are reused with the parameters of the iterator's automatically generated _ctor, and
         // the iter.OutsFields are shared with the automatically generated fields of the iterator class. To avoid
         // computing their pre-types twice, we omit their pre-type computations here and instead do them in
         // the _ctor Method and for each Field of the iterator class.
-        iter.Outs.ForEach(ComputePreType);
+        iter.Outs.ForEach(ComputePreTypeFormal);
       } else if (declaration is DatatypeDecl dtd) {
         foreach (var ctor in dtd.Ctors) {
-          ctor.Formals.ForEach(ComputePreType);
+          ctor.Formals.ForEach(ComputePreTypeFormal);
           ComputePreTypeField(ctor.QueryField);
           foreach (var dtor in ctor.Destructors) {
             // The following "if" condition makes sure ComputePreTypeField is called just once (since a destructor
@@ -736,14 +915,14 @@ void ComputePreTypeMethod(Method method) {
           // bitvector types. That's now handled in a different way, which does not use SelfType.
         } else {
           ComputePreTypeFunction(function);
-          if (function is ExtremePredicate extremePredicate) {
-            ComputePreTypeFunction(extremePredicate.PrefixPredicate);
+          if (function is ExtremePredicate { PrefixPredicate: { } prefixPredicate }) {
+            ComputePreTypeFunction(prefixPredicate);
           }
         }
       } else if (declaration is Method method) {
         ComputePreTypeMethod(method);
-        if (method is ExtremeLemma extremeLemma) {
-          ComputePreTypeMethod(extremeLemma.PrefixLemma);
+        if (method is ExtremeLemma { PrefixLemma: { } prefixLemma }) {
+          ComputePreTypeMethod(prefixLemma);
         }
       } else {
         Contract.Assert(false); // unexpected declaration
@@ -780,7 +959,11 @@ public void ResolveDeclarationBody(Declaration d) {
     private void ResolveTopLevelDeclaration(TopLevelDecl d) {
       if (d is not IteratorDecl) {
         // Note, attributes of iterators are resolved by ResolveIterator, after registering any names in the iterator signature
+        scope.PushMarker();
+        Contract.Assert(currentClass == null);
+        scope.AllowInstance = false;
         ResolveAttributes(d, new ResolutionContext(new NoContext(d.EnclosingModuleDefinition), false), true);
+        scope.PopMarker();
       }
 
       if (d is NewtypeDecl newtypeDecl) {
@@ -820,25 +1003,35 @@ void ResolveTypeParameters(List<TypeParameter> tparams, bool emitErrors, TypePar
           if (r == Scope<TypeParameter>.PushResult.Duplicate) {
             ReportError(tp, "Duplicate type-parameter name: {0}", tp.Name);
           } else if (r == Scope<TypeParameter>.PushResult.Shadow) {
-            ReportWarning(tp.tok, "Shadowed type-parameter name: {0}", tp.Name);
+            ReportWarning(tp.Origin, "Shadowed type-parameter name: {0}", tp.Name);
           }
         }
       }
     }
 
-    void ResolveAttributes(IAttributeBearingDeclaration attributeHost, ResolutionContext opts, bool solveConstraints) {
+    public void ResolveAttributes(IAttributeBearingDeclaration attributeHost, ResolutionContext opts, bool solveConstraints) {
       Contract.Requires(attributeHost != null);
       Contract.Requires(opts != null);
 
       // order does not matter much for resolution, so resolve them in reverse order
       foreach (var attr in attributeHost.Attributes.AsEnumerable()) {
+        if (attr is UserSuppliedAtAttribute { Builtin: true } usaa) {
+          Contract.Assert(usaa.Arg.Type != null); // Already resolved
+          continue;
+        }
         if (attributeHost != null && attr is UserSuppliedAttributes usa) {
 #if TODO          
           usa.Recognized = resolver.IsRecognizedAttribute(usa, attributeHost); // TODO: this could be done in a later resolution pass
 #endif
         }
         if (attr.Args != null) {
-          attr.Args.ForEach(arg => ResolveExpression(arg, opts));
+          foreach (var arg in attr.Args) {
+            if (Attributes.Contains(attributeHost.Attributes, "opaque_reveal") && attr.Name is "revealedFunction" && arg is NameSegment nameSegment) {
+              ResolveNameSegment(nameSegment, true, null, opts, false, complain: true, specialOpaqueHackAllowance: true);
+            } else {
+              ResolveExpression(arg, opts);
+            }
+          }
           if (solveConstraints) {
             Constraints.SolveAllTypeConstraints($"attribute of {attributeHost.ToString()}");
           }
@@ -850,21 +1043,31 @@ void ResolveConstraintAndWitness(RedirectingTypeDecl dd, bool initialResolutionP
       Contract.Requires(dd != null);
       Contract.Requires(dd.Constraint != null);
 
-      if (dd.Var != null) {
+      if (dd.Var == null) {
+        if (initialResolutionPass) {
+          Constraints.SolveAllTypeConstraints($"{dd.WhatKind} '{dd.Name}' constraint");
+        }
+      } else {
         if (initialResolutionPass == dd.Var.Type is TypeProxy) {
           scope.PushMarker();
+          scope.AllowInstance = false;
           ScopePushExpectSuccess(dd.Var, dd.WhatKind + " variable", false);
           ResolveExpression(dd.Constraint, new ResolutionContext(new CodeContextWrapper(dd, true), false));
           ConstrainTypeExprBool(dd.Constraint, dd.WhatKind + " constraint must be of type bool (instead got {0})");
           scope.PopMarker();
           Constraints.SolveAllTypeConstraints($"{dd.WhatKind} '{dd.Name}' constraint");
+        } else {
+          Constraints.SolveAllTypeConstraints($"{dd.WhatKind} '{dd.Name}' constraint");
         }
       }
 
       if (!initialResolutionPass && dd.Witness != null) {
         var codeContext = new CodeContextWrapper(dd, dd.WitnessKind == SubsetTypeDecl.WKind.Ghost);
+        scope.PushMarker();
+        scope.AllowInstance = false;
         ResolveExpression(dd.Witness, new ResolutionContext(codeContext, false));
-        AddSubtypeConstraint(dd.Var.PreType, dd.Witness.PreType, dd.Witness.tok, "witness expression must have type '{0}' (got '{1}')");
+        scope.PopMarker();
+        AddSubtypeConstraint(dd.BasePreType, dd.Witness.PreType, dd.Witness.Origin, "witness expression must have type '{0}' (got '{1}')");
         Constraints.SolveAllTypeConstraints($"{dd.WhatKind} '{dd.Name}' witness");
       }
     }
@@ -876,8 +1079,13 @@ void ResolveConstraintAndWitness(RedirectingTypeDecl dd, bool initialResolutionP
     void ResolveConstRHS(ConstantField cfield, bool initialResolutionPass) {
       if (cfield.Rhs != null && initialResolutionPass == cfield.Type is TypeProxy) {
         var opts = new ResolutionContext(cfield, false);
+        scope.PushMarker();
+        if (cfield.IsStatic) {
+          scope.AllowInstance = false;
+        }
         ResolveExpression(cfield.Rhs, opts);
-        AddSubtypeConstraint(cfield.PreType, cfield.Rhs.PreType, cfield.Tok, "RHS (of type {1}) not assignable to LHS (of type {0})");
+        scope.PopMarker();
+        AddSubtypeConstraint(cfield.PreType, cfield.Rhs.PreType, cfield.Origin, "RHS (of type {1}) not assignable to LHS (of type {0})");
         Constraints.SolveAllTypeConstraints($"{cfield.WhatKind} '{cfield.Name}' constraint");
       }
     }
@@ -886,33 +1094,61 @@ void ResolveParameterDefaultValues(List<Formal> formals, ICodeContext codeContex
       Contract.Requires(formals != null);
       Contract.Requires(codeContext != null);
 
+      // Formal parameters have three ways to indicate how they are to be passed in:
+      //   * nameonly: the only way to give a specific argument value is to name the parameter
+      //   * positional only: these are nameless parameters (which are allowed only for datatype constructor parameters)
+      //   * either positional or by name: this is the most common parameter
+      // A parameter is either required or optional:
+      //   * required: a caller has to supply an argument
+      //   * optional: the parameter has a default value that is used if a caller omits passing a specific argument
+      //
+      // The syntax for giving a positional-only (i.e., nameless) parameter does not allow a default-value expression, so
+      // a positional-only parameter is always required.
+      //
+      // At a call site, positional arguments are not allowed to follow named arguments. Therefore, if "x" is
+      // a nameonly parameter, then there is no way to supply the parameters after "x" by position. Thus, any
+      // parameter that follows "x" must either be passed by name or have a default value. That is, if a later
+      // parameter does not have a default value, it is _effectively_ nameonly. We impose the rule that
+      //   * an effectively nameonly parameter must be declared as nameonly
+      //
+      // For a positional-only parameter "x", every parameter preceding "x" is _effectively_ required. We impose
+      // the rule that
+      //   * an effectively required parameter must not have a default-value expression
       var dependencies = new Graph<IVariable>();
-      var allowMoreRequiredParameters = true;
-      var allowNamelessParameters = true;
+      string nameOfMostRecentNameonlyParameter = null;
+      var previousParametersWithDefaultValue = new HashSet<Formal>();
       foreach (var formal in formals) {
+        if (!formal.HasName) {
+          foreach (var previousFormal in previousParametersWithDefaultValue) {
+            ReportError(previousFormal.DefaultValue.Origin,
+              "because of a later nameless parameter, which is a required parameter, this default value is never used; remove it or name all subsequent parameters");
+          }
+          previousParametersWithDefaultValue.Clear();
+        }
+
         var d = formal.DefaultValue;
         if (d != null) {
-          allowMoreRequiredParameters = false;
-          ResolveExpression(d, new ResolutionContext(codeContext, codeContext is TwoStateFunction || codeContext is TwoStateLemma));
-          AddSubtypeConstraint(Type2PreType(formal.Type), d.PreType, d.tok, "default-value expression (of type '{1}') is not assignable to formal (of type '{0}')");
+          ResolveExpression(d, new ResolutionContext(codeContext, codeContext is TwoStateFunction or TwoStateLemma));
+          AddSubtypeConstraint(Type2PreType(formal.Type), d.PreType, d.Origin, "default-value expression (of type '{1}') is not assignable to formal (of type '{0}')");
           foreach (var v in ModuleResolver.FreeVariables(d)) {
             dependencies.AddEdge(formal, v);
           }
-        } else if (!allowMoreRequiredParameters) {
-          ReportError(formal.tok, "a required parameter must precede all optional parameters");
-        }
-        if (!allowNamelessParameters && !formal.HasName) {
-          ReportError(formal.tok, "a nameless parameter must precede all nameonly parameters");
+          previousParametersWithDefaultValue.Add(formal);
+        } else if (nameOfMostRecentNameonlyParameter != null && !formal.IsNameOnly) {
+          // "formal" is preceded by a nameonly parameter, but itself is neither nameonly nor has a default value
+          ReportError(formal.Origin,
+            $"this parameter has to be nameonly, because of the earlier nameonly parameter '{nameOfMostRecentNameonlyParameter}'; " +
+            "declare it as nameonly or give it a default-value expression");
         }
         if (formal.IsNameOnly) {
-          allowNamelessParameters = false;
+          nameOfMostRecentNameonlyParameter = formal.Name;
         }
       }
       Constraints.SolveAllTypeConstraints($"parameter default values of {codeContext.FullSanitizedName}");
 
       foreach (var cycle in dependencies.AllCycles()) {
         var cy = Util.Comma(" -> ", cycle, v => v.Name) + " -> " + cycle[0].Name;
-        ReportError(cycle[0].Tok, $"default-value expressions for parameters contain a cycle: {cy}");
+        ReportError(cycle[0].Origin, $"default-value expressions for parameters contain a cycle: {cy}");
       }
     }
 
@@ -928,13 +1164,17 @@ void ResolveMember(MemberDecl member) {
       Contract.Requires(member != null);
       Contract.Requires(currentClass != null);
 
-      ResolveAttributes(member, new ResolutionContext(new NoContext(currentClass.EnclosingModuleDefinition), false), true);
-
       if (member is ConstantField cfield) {
+        scope.PushMarker();
+        if (cfield.IsStatic) {
+          scope.AllowInstance = false;
+        }
+        ResolveAttributes(member, new ResolutionContext(new NoContext(currentClass.EnclosingModuleDefinition), false), true);
+        scope.PopMarker();
         ResolveConstRHS(cfield, false);
 
       } else if (member is Field) {
-        // nothing else to do
+        ResolveAttributes(member, new ResolutionContext(new NoContext(currentClass.EnclosingModuleDefinition), false), true);
 
       } else if (member is Function f) {
         var ec = ErrorCount;
@@ -979,6 +1219,11 @@ void ResolveIterator(IteratorDecl iter) {
       Contract.Requires(currentClass != null);
       Contract.Ensures(currentClass == null);
 
+      if (Options.ForbidNondeterminism && iter.Outs.Count > 0) {
+        Reporter.Error(MessageSource.Resolver, GeneratorErrors.ErrorId.c_iterators_are_not_deterministic, iter.Origin,
+          "since yield parameters are initialized arbitrarily, iterators are forbidden by the --enforce-determinism option");
+      }
+
       var initialErrorCount = ErrorCount;
 
       // Add in-parameters to the scope, but don't care about any duplication errors, since they have already been reported
@@ -987,6 +1232,9 @@ void ResolveIterator(IteratorDecl iter) {
       iter.Ins.ForEach(p => ScopePushAndReport(p, "in-parameter", false));
       ResolveParameterDefaultValues(iter.Ins, iter);
 
+      // In-parameters (but not "this" and yield parameters) are in scope for the iterator's attributes.
+      ResolveAttributes(iter, new ResolutionContext(iter, false), true);
+
       // Start resolving specification...
       // we start with the decreases clause, because the _decreases<n> fields were only given type proxies before; we'll know
       // the types only after resolving the decreases clause (and it may be that some of resolution has already seen uses of
@@ -999,7 +1247,7 @@ void ResolveIterator(IteratorDecl iter) {
         // any type is fine, but associate this type with the corresponding _decreases<n> field
         var d = iter.DecreasesFields[i];
         // If the following type constraint does not hold, then: Bummer, there was a use--and a bad use--of the field before, so this won't be the best of error messages
-        AddSubtypeConstraint(d.PreType, e.PreType, e.tok, "type of field '" + d.Name + "' is {1}, but has been constrained elsewhere to be of type {0}");
+        AddSubtypeConstraint(d.PreType, e.PreType, e.Origin, "type of field '" + d.Name + "' is {1}, but has been constrained elsewhere to be of type {0}");
       }
       foreach (FrameExpression fe in iter.Reads.Expressions) {
         ResolveFrameExpression(fe, FrameExpressionUse.Reads, iter);
@@ -1039,25 +1287,23 @@ void ResolveIterator(IteratorDecl iter) {
       }
       Constraints.SolveAllTypeConstraints($"specification of iterator '{iter.Name}'");
 
-      ResolveAttributes(iter, new ResolutionContext(iter, false), true);
-
       var postSpecErrorCount = ErrorCount;
 
       // Resolve body
       if (iter.Body != null) {
-        dominatingStatementLabels.PushMarker();
+        DominatingStatementLabels.PushMarker();
         foreach (var req in iter.Requires) {
           if (req.Label != null) {
-            if (dominatingStatementLabels.Find(req.Label.Name) != null) {
+            if (DominatingStatementLabels.Find(req.Label.Name) != null) {
               ReportError(req.Label.Tok, "assert label shadows a dominating label");
             } else {
-              var rr = dominatingStatementLabels.Push(req.Label.Name, req.Label);
+              var rr = DominatingStatementLabels.Push(req.Label.Name, req.Label);
               Contract.Assert(rr == Scope<Label>.PushResult.Success);  // since we just checked for duplicates, we expect the Push to succeed
             }
           }
         }
         ResolveBlockStatement(iter.Body, ResolutionContext.FromCodeContext(iter));
-        dominatingStatementLabels.PopMarker();
+        DominatingStatementLabels.PopMarker();
         Constraints.SolveAllTypeConstraints($"body of iterator '{iter.Name}'");
       }
 
@@ -1076,60 +1322,58 @@ void ResolveIterator(IteratorDecl iter) {
     void ResolveFunction(Function f) {
       Contract.Requires(f != null);
 
+      f.ResolveNewOrOldPart(this);
+
+      // make note of the warnShadowing attribute
       bool warnShadowingOption = resolver.Options.WarnShadowing;  // save the original warnShadowing value
-      bool warnShadowing = false;
+      bool warnShadowing = true;
+      // take care of the warnShadowing attribute
+      if (Attributes.ContainsBool(f.Attributes, "warnShadowing", ref warnShadowing)) {
+        resolver.Options.WarnShadowing = warnShadowing;  // set the value according to the attribute
+      }
 
       scope.PushMarker();
       if (f.IsStatic) {
         scope.AllowInstance = false;
       }
 
-      if (f.IsGhost) {
-        // TODO: the following could be done in a different resolver pass
-        foreach (TypeParameter p in f.TypeArgs) {
-          if (p.SupportsEquality) {
-            ReportWarning(p.tok,
-              $"type parameter {p.Name} of ghost {f.WhatKind} {f.Name} is declared (==), which is unnecessary because the {f.WhatKind} doesn't contain any compiled code");
-          }
-        }
-      }
-
-      foreach (Formal p in f.Formals) {
+      foreach (Formal p in f.Ins) {
         ScopePushAndReport(p, "parameter", false);
       }
-      ResolveAttributes(f, new ResolutionContext(f, false), true);
-      // take care of the warnShadowing attribute
-      if (Attributes.ContainsBool(f.Attributes, "warnShadowing", ref warnShadowing)) {
-        resolver.Options.WarnShadowing = warnShadowing;  // set the value according to the attribute
-      }
-      ResolveParameterDefaultValues(f.Formals, f);
-      foreach (AttributedExpression e in f.Req) {
-        ResolveAttributes(e, new ResolutionContext(f, f is TwoStateFunction), false);
-        Expression r = e.E;
+      ResolveParameterDefaultValues(f.Ins, f);
+
+      foreach (var req in f.Req) {
+        ResolveAttributes(req, new ResolutionContext(f, f is TwoStateFunction), false);
+        Expression r = req.E;
         ResolveExpression(r, new ResolutionContext(f, f is TwoStateFunction));
         ConstrainTypeExprBool(r, "Precondition must be a boolean (got {0})");
       }
-      foreach (FrameExpression fr in f.Reads) {
+
+      ResolveAttributes(f.Reads, new ResolutionContext(f, f is TwoStateFunction), false);
+      foreach (FrameExpression fr in f.Reads.Expressions) {
         ResolveFrameExpression(fr, FrameExpressionUse.Reads, f);
       }
-      foreach (AttributedExpression e in f.Ens) {
-        ResolveAttributes(e, new ResolutionContext(f, f is TwoStateFunction), false);
-        Expression r = e.E;
-        if (f.Result != null) {
-          scope.PushMarker();
-          ScopePushAndReport(f.Result, "function result", false); // function return only visible in post-conditions
-        }
+
+      scope.PushMarker();
+      if (f.Result != null) {
+        ScopePushAndReport(f.Result, "function result", false); // function return only visible in post-conditions
+      }
+      foreach (var ens in f.Ens) {
+        ResolveAttributes(ens, new ResolutionContext(f, f is TwoStateFunction), false);
+        Expression r = ens.E;
         ResolveExpression(r, new ResolutionContext(f, f is TwoStateFunction) with { InFunctionPostcondition = true });
         ConstrainTypeExprBool(r, "Postcondition must be a boolean (got {0})");
-        if (f.Result != null) {
-          scope.PopMarker();
-        }
       }
+      // resolve attributes on the function itself, now that in-parameters and any result name are part of the scope
+      ResolveAttributes(f, new ResolutionContext(f, f is TwoStateFunction), true);
+      scope.PopMarker(); // function result name
+
       ResolveAttributes(f.Decreases, new ResolutionContext(f, f is TwoStateFunction), false);
       foreach (Expression r in f.Decreases.Expressions) {
         ResolveExpression(r, new ResolutionContext(f, f is TwoStateFunction));
         // any type is fine
       }
+
       Constraints.SolveAllTypeConstraints($"specification of {f.WhatKind} '{f.Name}'");
 
       if (f.ByMethodBody != null) {
@@ -1140,7 +1384,7 @@ void ResolveFunction(Function f) {
       if (f.Body != null) {
         var prevErrorCount = ErrorCount;
         ResolveExpression(f.Body, new ResolutionContext(f, f is TwoStateFunction));
-        AddSubtypeConstraint(Type2PreType(f.ResultType), f.Body.PreType, f.tok, "Function body type mismatch (expected {0}, got {1})");
+        AddSubtypeConstraint(Type2PreType(f.ResultType), f.Body.PreType, f.Origin, "Function body type mismatch (expected {0}, got {1})");
         Constraints.SolveAllTypeConstraints($"body of {f.WhatKind} '{f.Name}'");
       }
 
@@ -1162,25 +1406,18 @@ void ResolveFunction(Function f) {
     void ResolveMethod(Method m) {
       Contract.Requires(m != null);
 
+      m.ResolveNewOrOldPart(this);
+
       try {
         currentMethod = m;
 
         bool warnShadowingOption = resolver.Options.WarnShadowing;  // save the original warnShadowing value
-        bool warnShadowing = false;
+        bool warnShadowing = true;
         // take care of the warnShadowing attribute
         if (Attributes.ContainsBool(m.Attributes, "warnShadowing", ref warnShadowing)) {
           resolver.Options.WarnShadowing = warnShadowing;  // set the value according to the attribute
         }
 
-        if (m.IsGhost) {
-          foreach (TypeParameter p in m.TypeArgs) {
-            if (p.SupportsEquality) {
-              ReportWarning(p.tok,
-                $"type parameter {p.Name} of ghost {m.WhatKind} {m.Name} is declared (==), which is unnecessary because the {m.WhatKind} doesn't contain any compiled code");
-            }
-          }
-        }
-
         // Add in-parameters to the scope, but don't care about any duplication errors, since they have already been reported
         scope.PushMarker();
         if (m.IsStatic || m is Constructor) {
@@ -1198,17 +1435,16 @@ void ResolveMethod(Method m) {
           ConstrainTypeExprBool(e.E, "Precondition must be a boolean (got {0})");
         }
 
+        ResolveAttributes(m.Reads, new ResolutionContext(m, false), false);
+        foreach (FrameExpression fe in m.Reads.Expressions) {
+          ResolveFrameExpression(fe, FrameExpressionUse.Reads, m);
+        }
+
         ResolveAttributes(m.Mod, new ResolutionContext(m, false), false);
         foreach (FrameExpression fe in m.Mod.Expressions) {
           ResolveFrameExpression(fe, FrameExpressionUse.Modifies, m);
-          if (m.IsLemmaLike) {
-            ReportError(fe.tok, "{0}s are not allowed to have modifies clauses", m.WhatKind);
-          } else if (m.IsGhost) {
-#if TODO
-            DisallowNonGhostFieldSpecifiers(fe);
-#endif
-          }
         }
+
         ResolveAttributes(m.Decreases, new ResolutionContext(m, false), false);
         foreach (Expression e in m.Decreases.Expressions) {
           ResolveExpression(e, new ResolutionContext(m, m is TwoStateLemma));
@@ -1228,7 +1464,7 @@ void ResolveMethod(Method m) {
         // Don't care about any duplication errors among the out-parameters, since they have already been reported
         scope.PushMarker();
         if (m is ExtremeLemma && m.Outs.Count != 0) {
-          ReportError(m.Outs[0].tok, "{0}s are not allowed to have out-parameters", m.WhatKind);
+          ReportError(m.Outs[0].Origin, "{0}s are not allowed to have out-parameters", m.WhatKind);
         } else {
           foreach (Formal p in m.Outs) {
             ScopePushAndReport(p, "out-parameter", false);
@@ -1245,27 +1481,26 @@ void ResolveMethod(Method m) {
 
         // Resolve body
         if (m.Body != null) {
-          var com = m as ExtremeLemma;
-          if (com != null && com.PrefixLemma != null) {
+          if (m is ExtremeLemma { PrefixLemma: { } } com) {
             // The body may mentioned the implicitly declared parameter _k.  Throw it into the
             // scope before resolving the body.
             var k = com.PrefixLemma.Ins[0];
             ScopePushExpectSuccess(k, "_k parameter", false);
           }
 
-          dominatingStatementLabels.PushMarker();
+          DominatingStatementLabels.PushMarker();
           foreach (var req in m.Req) {
             if (req.Label != null) {
-              if (dominatingStatementLabels.Find(req.Label.Name) != null) {
+              if (DominatingStatementLabels.Find(req.Label.Name) != null) {
                 ReportError(req.Label.Tok, "assert label shadows a dominating label");
               } else {
-                var rr = dominatingStatementLabels.Push(req.Label.Name, req.Label);
+                var rr = DominatingStatementLabels.Push(req.Label.Name, req.Label);
                 Contract.Assert(rr == Scope<Label>.PushResult.Success);  // since we just checked for duplicates, we expect the Push to succeed
               }
             }
           }
           ResolveBlockStatement(m.Body, ResolutionContext.FromCodeContext(m));
-          dominatingStatementLabels.PopMarker();
+          DominatingStatementLabels.PopMarker();
           Constraints.SolveAllTypeConstraints($"body of {m.WhatKind} '{m.Name}'");
         }
 
@@ -1281,12 +1516,18 @@ void ResolveMethod(Method m) {
       }
     }
 
+    public void ResolveFrameExpression(FrameExpression frameExpression, FrameExpressionUse frameExpressionUse,
+      ResolutionContext context) {
+      ResolveFrameExpression(frameExpression, frameExpressionUse, context.CodeContext);
+    }
+
     void ResolveFrameExpression(FrameExpression fe, FrameExpressionUse use, ICodeContext codeContext) {
       Contract.Requires(fe != null);
       Contract.Requires(codeContext != null);
-      ResolveExpression(fe.E, new ResolutionContext(codeContext, codeContext is TwoStateLemma || use == FrameExpressionUse.Unchanged));
+      var resolutionContext = new ResolutionContext(codeContext, codeContext is TwoStateLemma || use == FrameExpressionUse.Unchanged);
+      ResolveExpression(fe.E, resolutionContext);
       Constraints.AddGuardedConstraint(() => {
-        DPreType dp = fe.E.PreType.Normalize() as DPreType;
+        DPreType dp = fe.E.PreType.NormalizeWrtScope() as DPreType;
         if (dp == null) {
           // no information yet
           return false;
@@ -1309,13 +1550,16 @@ void ResolveFrameExpression(FrameExpression fe, FrameExpressionUse use, ICodeCon
             return false;
           }
         }
-        if (dp.Decl.Name == "set" || dp.Decl.Name == "iset" || dp.Decl.Name == "seq" || dp.Decl.Name == "multiset") {
+
+        if (dp.UrAncestor(this) is DPreType {
+          Decl.Name: PreType.TypeNameSet or PreType.TypeNameIset or PreType.TypeNameSeq or PreType.TypeNameMultiset
+        } dpAncestor) {
           hasCollectionType = true;
-          var elementType = dp.Arguments[0].Normalize();
+          var elementType = dpAncestor.Arguments[0].Normalize();
           dp = elementType as DPreType;
           if (dp == null) {
             // element type not yet known
-            Constraints.AddDefaultAdvice(elementType, Advice.Target.Object);
+            Constraints.AddDefaultAdvice(elementType, CommonAdvice.Target.Object);
             return false;
           }
         }
@@ -1333,11 +1577,11 @@ void ResolveFrameExpression(FrameExpression fe, FrameExpressionUse use, ICodeCon
               $"an unchanged {expressionMustDenoteObject} or {collection} {instead}",
             _ => throw new ArgumentOutOfRangeException(nameof(use), use, null)
           };
-          ReportError(fe.E.tok, errorMsgFormat, fe.E.PreType);
+          ReportError(fe.E.Origin, errorMsgFormat, fe.E.PreType);
         }
 
         if (fe.FieldName != null) {
-          var (member, tentativeReceiverType) = FindMember(fe.E.tok, dp, fe.FieldName);
+          var (member, tentativeReceiverType) = FindMember(fe.E.Origin, dp, fe.FieldName, resolutionContext);
           Contract.Assert((member == null) == (tentativeReceiverType == null)); // follows from contract of FindMember
           if (member == null) {
             // error has already been reported by FindMember
@@ -1364,14 +1608,6 @@ public Dictionary<TypeParameter, PreType> BuildPreTypeArgumentSubstitute(Diction
         subst.Add(entry.Key, entry.Value);
       }
 
-#if SOON
-      if (SelfTypeSubstitution != null) {
-        foreach (var entry in SelfTypeSubstitution) {
-          subst.Add(entry.Key, entry.Value);
-        }
-      }
-#endif
-
       if (receiverTypeBound?.Decl is TopLevelDeclWithMembers cl) {
         foreach (var entry in cl.ParentFormalTypeParametersToActuals) {
           var v = Type2PreType(entry.Value).Substitute(subst);
@@ -1429,15 +1665,15 @@ public PreTypeSanityChecker(PreTypeResolver preTypeResolver) {
       protected override void VisitOneExpr(Expression expr) {
         // compare expr.PreType and expr.Type
         if (expr.PreType == null) {
-          preTypeResolver.ReportWarning(expr.tok, $"sanity check WARNING: no pre-type was computed");
+          preTypeResolver.ReportWarning(expr.Origin, $"sanity check WARNING: no pre-type was computed");
         } else if (expr.Type == null) {
-          preTypeResolver.ReportError(expr.tok, $"SANITY CHECK FAILED: .PreType is '{expr.PreType}' but .Type is null");
+          preTypeResolver.ReportError(expr.Origin, $"SANITY CHECK FAILED: .PreType is '{expr.PreType}' but .Type is null");
         } else if (PreType.Same(expr.PreType, preTypeResolver.Type2PreType(expr.Type))) {
           // all is cool
-        } else if (expr.PreType is UnusedPreType && expr.Type is TypeProxy) {
+        } else if (expr.PreType is MethodPreType && expr.Type is TypeProxy) {
           // this is expected
         } else {
-          preTypeResolver.ReportError(expr.tok, $"SANITY CHECK FAILED: pre-type '{expr.PreType}' does not correspond to type '{expr.Type}'");
+          preTypeResolver.ReportError(expr.Origin, $"SANITY CHECK FAILED: pre-type '{expr.PreType}' does not correspond to type '{expr.Type}'");
         }
       }
     }
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeResolver.Match.cs b/Source/DafnyCore/Resolver/PreType/PreTypeResolver.Match.cs
index f38fb69ae17..f91f0cf0416 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeResolver.Match.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeResolver.Match.cs
@@ -21,11 +21,11 @@ void ResolveNestedMatchStmt(NestedMatchStmt stmt, ResolutionContext resolutionCo
         ResolveAttributes(mc, resolutionContext, false);
 
         scope.PushMarker();
-        ResolveExtendedPattern(stmt.Source.tok, mc.Pat, stmt.Source.PreType, false, resolutionContext);
+        ResolveExtendedPattern(stmt.Source.Origin, mc.Pat, stmt.Source.PreType, false, resolutionContext);
 
-        dominatingStatementLabels.PushMarker();
+        DominatingStatementLabels.PushMarker();
         mc.Body.ForEach(ss => ResolveStatementWithLabels(ss, resolutionContext));
-        dominatingStatementLabels.PopMarker();
+        DominatingStatementLabels.PopMarker();
 
         scope.PopMarker();
       }
@@ -39,10 +39,10 @@ void ResolveNestedMatchExpr(NestedMatchExpr expr, ResolutionContext resolutionCo
         ResolveAttributes(mc, resolutionContext, false);
 
         scope.PushMarker();
-        ResolveExtendedPattern(expr.Source.tok, mc.Pat, expr.Source.PreType, false, resolutionContext);
+        ResolveExtendedPattern(expr.Source.Origin, mc.Pat, expr.Source.PreType, false, resolutionContext);
 
         ResolveExpression(mc.Body, resolutionContext);
-        AddSubtypeConstraint(expr.PreType, mc.Body.PreType, mc.Body.tok,
+        AddSubtypeConstraint(expr.PreType, mc.Body.PreType, mc.Body.Origin,
           "type of case bodies do not agree (found {1}, previous types {0})");
 
         scope.PopMarker();
@@ -54,7 +54,7 @@ void ResolveNestedMatchExpr(NestedMatchExpr expr, ResolutionContext resolutionCo
     /// of resolving it. If that still doesn't resolve it, then report and error and return "false".
     /// Otherwise (that is, upon success), return "true".
     /// </summary>
-    bool InsistOnKnowingPreType(IToken tok, PreType preType) {
+    bool InsistOnKnowingPreType(IOrigin tok, PreType preType) {
       if (preType.Normalize() is PreTypeProxy) {
         Constraints.PartiallySolveTypeConstraints(null, true);
 
@@ -69,7 +69,7 @@ bool InsistOnKnowingPreType(IToken tok, PreType preType) {
     /// <summary>
     /// Resolve "pattern" and push onto "scope" all its bound variables.
     /// </summary>
-    public void ResolveExtendedPattern(IToken sourceExprToken, ExtendedPattern pattern, PreType preType, bool inDisjunctivePattern, ResolutionContext resolutionContext) {
+    public void ResolveExtendedPattern(IOrigin sourceExprToken, ExtendedPattern pattern, PreType preType, bool inDisjunctivePattern, ResolutionContext resolutionContext) {
       if (pattern is DisjunctivePattern dp) {
         foreach (var alt in dp.Alternatives) {
           ResolveExtendedPattern(sourceExprToken, alt, preType, true, resolutionContext);
@@ -80,7 +80,7 @@ public void ResolveExtendedPattern(IToken sourceExprToken, ExtendedPattern patte
       if (pattern is LitPattern litPattern) {
         var lit = litPattern.OptimisticallyDesugaredLit;
         ResolveExpression(lit, resolutionContext);
-        AddSubtypeConstraint(preType, lit.PreType, litPattern.tok,
+        AddSubtypeConstraint(preType, lit.PreType, litPattern.Origin,
           "literal pattern (of type {1}) cannot be used with source type {0}");
         return;
       }
@@ -88,7 +88,7 @@ public void ResolveExtendedPattern(IToken sourceExprToken, ExtendedPattern patte
       var idPattern = (IdPattern)pattern;
       if (idPattern.Type is not TypeProxy) {
         Contract.Assert(idPattern.Arguments == null); // the parser ensures this condition (the ID cannot be followed by both "(...)" and ": ...")
-        resolver.ResolveType(idPattern.Tok, idPattern.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
+        resolver.ResolveType(idPattern.Origin, idPattern.Type, resolutionContext, ResolveTypeOptionEnum.InferTypeProxies, null);
         // When a type is supplied, the ID is understood to be a bound variable.
         ResolveParameterlessIdPattern(idPattern, preType, inDisjunctivePattern, resolutionContext);
         return;
@@ -123,11 +123,11 @@ public void ResolveExtendedPattern(IToken sourceExprToken, ExtendedPattern patte
       } else {
         // this is an error; if tuples are involved, specialize the error message
         if (idPattern.Id == SystemModuleManager.TupleTypeCtorName(1)) {
-          ReportError(idPattern.Tok, "parentheses are not allowed around a pattern");
+          ReportError(idPattern.Origin, "parentheses are not allowed around a pattern");
         } else if (idPattern.Id.StartsWith(SystemModuleManager.TupleTypeCtorNamePrefix)) {
-          ReportError(pattern.Tok, $"tuple type does not match type '{preType}'");
+          ReportError(pattern.Origin, $"tuple type does not match type '{preType}'");
         } else {
-          ReportError(idPattern.Tok, $"type '{preType}' does not contain a datatype constructor '{idPattern.Id}'");
+          ReportError(idPattern.Origin, $"type '{preType}' does not contain a datatype constructor '{idPattern.Id}'");
         }
         return;
       }
@@ -137,12 +137,12 @@ public void ResolveExtendedPattern(IToken sourceExprToken, ExtendedPattern patte
           // nullary constructor without () -- so convert it to a constructor
           idPattern.MakeAConstructor();
         } else {
-          ReportError(idPattern.Tok, $"constructor '{ctor.Name}' of arity {ctor.Formals.Count} is applied without any arguments");
+          ReportError(idPattern.Origin, $"constructor '{ctor.Name}' of arity {ctor.Formals.Count} is applied without any arguments");
           return;
         }
       }
       if (idPattern.Arguments.Count != ctor.Formals.Count) {
-        ReportError(idPattern.Tok, $"constructor '{ctor.Name}' of arity {ctor.Formals.Count} is applied to {idPattern.Arguments.Count} argument(s)");
+        ReportError(idPattern.Origin, $"constructor '{ctor.Name}' of arity {ctor.Formals.Count} is applied to {idPattern.Arguments.Count} argument(s)");
         return;
       }
 
@@ -165,15 +165,15 @@ public void ResolveExtendedPattern(IToken sourceExprToken, ExtendedPattern patte
     ///   * report an error, if "reportErrors".
     /// </summary>
     private bool TryResolvingAsConst(IdPattern idPattern, PreType preType, bool reportErrors, ResolutionContext resolutionContext) {
-      var e = new NameSegment(idPattern.Tok, idPattern.Id, null);
+      var e = new NameSegment(idPattern.Origin, idPattern.Id, null);
       ResolveNameSegment(e, true, null, resolutionContext, false, false);
       if (e.ResolvedExpression is MemberSelectExpr { Member: ConstantField { IsStatic: true, Rhs: { } rhs } }) {
         if (rhs is LiteralExpr lit) {
           // the ID refers to a const whose RHS is a literal
           idPattern.ResolvedLit = lit;
-          AddSubtypeConstraint(preType, lit.PreType, idPattern.Tok, "literal pattern (of type {1}) cannot be used with source type {0}");
+          AddSubtypeConstraint(preType, lit.PreType, idPattern.Origin, "literal pattern (of type {1}) cannot be used with source type {0}");
         } else if (reportErrors) {
-          ReportError(idPattern.Tok, $"{idPattern.Id} is not initialized as a constant literal");
+          ReportError(idPattern.Origin, $"{idPattern.Id} is not initialized as a constant literal");
         }
         return true;
       }
@@ -191,14 +191,14 @@ private void ResolveParameterlessIdPattern(IdPattern idPattern, PreType preType,
 
       // no other options remain; the ID denotes a new bound variable
 
-      if (inDisjunctivePattern) {
-        ReportError(idPattern.Tok, "Disjunctive patterns may not bind variables");
+      if (inDisjunctivePattern && !idPattern.IsWildcardPattern) {
+        ReportError(idPattern.Origin, "Disjunctive patterns may not bind variables");
       }
 
-      idPattern.BoundVar = new BoundVar(idPattern.Tok, idPattern.Id, idPattern.Type) {
+      idPattern.BoundVar = new BoundVar(idPattern.Origin, idPattern.Id, idPattern.Type) {
         PreType = Type2PreType(idPattern.Type, "case pattern ID")
       };
-      AddSubtypeConstraint(preType, idPattern.BoundVar.PreType, idPattern.Tok,
+      AddSubtypeConstraint(preType, idPattern.BoundVar.PreType, idPattern.Origin,
         "pattern (of type {1}) cannot be used with source type {0}");
       if (!idPattern.IsWildcardPattern) {
         resolver.ScopePushAndReport(scope, idPattern.BoundVar, "parameter");
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeSubtypeConstraint.cs b/Source/DafnyCore/Resolver/PreType/PreTypeSubtypeConstraint.cs
index 2de272a9104..371367b2016 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeSubtypeConstraint.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeSubtypeConstraint.cs
@@ -11,7 +11,7 @@
 using System.Diagnostics.Contracts;
 
 namespace Microsoft.Dafny {
-  class SubtypeConstraint : PreTypeConstraint {
+  class SubtypeConstraint : OptionalErrorPreTypeConstraint {
     public readonly PreType Super;
     public readonly PreType Sub;
 
@@ -19,16 +19,16 @@ public override string ErrorMessage() {
       return string.Format(ErrorFormatString, Super, Sub);
     }
 
-    public SubtypeConstraint(PreType super, PreType sub, IToken tok, string errorFormatString)
-      : base(tok, errorFormatString) {
+    public SubtypeConstraint(PreType super, PreType sub, IOrigin tok, string errorFormatString, PreTypeConstraint baseError = null, bool reportErrors = true)
+      : base(tok, errorFormatString, baseError, reportErrors) {
       Contract.Assert(super != null);
       Contract.Assert(sub != null);
       Super = super.Normalize();
       Sub = sub.Normalize();
     }
 
-    public SubtypeConstraint(PreType super, PreType sub, IToken tok, Func<string> errorFormatStringProducer)
-      : base(tok, errorFormatStringProducer) {
+    public SubtypeConstraint(PreType super, PreType sub, IOrigin tok, Func<string> errorFormatStringProducer, bool reportErrors = true)
+      : base(tok, errorFormatStringProducer, reportErrors) {
       Contract.Assert(super != null);
       Contract.Assert(sub != null);
       Super = super.Normalize();
@@ -41,13 +41,13 @@ public SubtypeConstraint Normalize() {
       if (object.ReferenceEquals(super, Super) && object.ReferenceEquals(sub, Sub)) {
         return this;
       } else {
-        return new SubtypeConstraint(super, sub, Token.NoToken, ErrorFormatString);
+        return new SubtypeConstraint(super, sub, tok, ErrorFormatString, null, ReportErrors);
       }
     }
 
     public bool Apply(PreTypeConstraints constraints) {
-      var super = Super.Normalize();
-      var sub = Sub.Normalize();
+      var super = Super.NormalizeWrtScope();
+      var sub = Sub.NormalizeWrtScope();
       var ptSuper = super as DPreType;
       var ptSub = sub as DPreType;
       // In the following explanations, D is assumed to be a type with three
@@ -59,12 +59,12 @@ public bool Apply(PreTypeConstraints constraints) {
         //     Constrain g(x,y) :> b
         //     Constrain c == h(x,y)
         // else report an error
-        var arguments = constraints.GetTypeArgumentsForSuperType(ptSuper.Decl, ptSub.Decl, ptSub.Arguments);
+        var arguments = constraints.GetTypeArgumentsForSuperType(ptSuper.Decl, ptSub, false);
         if (arguments != null) {
           Contract.Assert(arguments.Count == ptSuper.Decl.TypeArgs.Count);
-          ConstrainTypeArguments(ptSuper.Decl.TypeArgs, ptSuper.Arguments, arguments, tok, constraints);
+          ConstrainTypeArguments(ptSuper.Decl.TypeArgs, ptSuper.Arguments, arguments, tok, this, constraints);
           return true;
-        } else {
+        } else if (ReportErrors) {
           constraints.PreTypeResolver.ReportError(tok, ErrorMessage());
           return true;
         }
@@ -76,10 +76,10 @@ public bool Apply(PreTypeConstraints constraints) {
         //     Constrain a :> alpha
         //     Constrain beta :> b
         // else do nothing for now
-        if (!(ptSuper.Decl is TraitDecl)) {
-          var arguments = CreateProxiesForTypesAccordingToVariance(tok, ptSuper.Decl.TypeArgs, ptSuper.Arguments, false, constraints);
+        if (ptSuper.Decl is not TraitDecl) {
+          var arguments = CreateProxiesForTypesAccordingToVariance(tok, ptSuper.Decl.TypeArgs, ptSuper.Arguments, false, ReportErrors, constraints);
           var pt = new DPreType(ptSuper.Decl, arguments);
-          constraints.AddEqualityConstraint(sub, pt, tok, ErrorFormatString);
+          constraints.AddEqualityConstraint(pt, sub, tok, ErrorFormatString, null, ReportErrors);
           return true;
         }
       } else if (ptSub != null) {
@@ -93,9 +93,9 @@ public bool Apply(PreTypeConstraints constraints) {
         if (PreTypeResolver.HasTraitSupertypes(ptSub)) {
           // there are parent traits
         } else {
-          var arguments = CreateProxiesForTypesAccordingToVariance(tok, ptSub.Decl.TypeArgs, ptSub.Arguments, true, constraints);
+          var arguments = CreateProxiesForTypesAccordingToVariance(tok, ptSub.Decl.TypeArgs, ptSub.Arguments, true, ReportErrors, constraints);
           var pt = new DPreType(ptSub.Decl, arguments);
-          constraints.AddEqualityConstraint(super, pt, tok, ErrorFormatString);
+          constraints.AddEqualityConstraint(super, pt, tok, ErrorFormatString, null, ReportErrors);
           return true;
         }
       } else {
@@ -109,8 +109,8 @@ public bool Apply(PreTypeConstraints constraints) {
     /// For every co-variant parameters[i], constrain superArguments[i] :> subArguments[i].
     /// For every contra-variant parameters[i], constrain subArguments[i] :> superArguments[i].
     /// </summary>
-    static void ConstrainTypeArguments(List<TypeParameter> parameters, List<PreType> superArguments, List<PreType> subArguments, IToken tok,
-      PreTypeConstraints constraints) {
+    static void ConstrainTypeArguments(List<TypeParameter> parameters, List<PreType> superArguments, List<PreType> subArguments, IOrigin tok,
+      OptionalErrorPreTypeConstraint baseError, PreTypeConstraints constraints) {
       Contract.Requires(parameters.Count == superArguments.Count && superArguments.Count == subArguments.Count);
 
       for (var i = 0; i < parameters.Count; i++) {
@@ -118,11 +118,14 @@ static void ConstrainTypeArguments(List<TypeParameter> parameters, List<PreType>
         var arg0 = superArguments[i];
         var arg1 = subArguments[i];
         if (tp.Variance == TypeParameter.TPVariance.Non) {
-          constraints.AddEqualityConstraint(arg0, arg1, tok, "non-variance would require {0} == {1}");
+          constraints.AddEqualityConstraint(arg0, arg1, tok,
+            $"non-variant type parameter '{tp.Name}' would require {{0}} = {{1}}", baseError, baseError.ReportErrors);
         } else if (tp.Variance == TypeParameter.TPVariance.Co) {
-          constraints.AddSubtypeConstraint(arg0, arg1, tok, "covariance would require {0} :> {1}");
+          constraints.AddSubtypeConstraint(arg0, arg1, tok,
+            $"covariant type parameter '{tp.Name}' would require {{0}} :> {{1}}", baseError, baseError.ReportErrors);
         } else {
-          constraints.AddSubtypeConstraint(arg1, arg0, tok, "contravariance would require {0} :> {1}");
+          constraints.AddSubtypeConstraint(arg1, arg0, tok,
+            $"contravariant type parameter '{tp.Name}' would require {{0}} :> {{1}}", baseError, baseError.ReportErrors);
         }
       }
     }
@@ -136,8 +139,8 @@ static void ConstrainTypeArguments(List<TypeParameter> parameters, List<PreType>
     ///   - else if (pi is Co) == proxiesAreSupertypes, then a new proxy constrained by:  proxy :> ai
     ///   - else a new proxy constrained by:  ai :> proxy
     /// </summary>
-    static List<PreType> CreateProxiesForTypesAccordingToVariance(IToken tok, List<TypeParameter> parameters, List<PreType> arguments,
-      bool proxiesAreSupertypes, PreTypeConstraints state) {
+    static List<PreType> CreateProxiesForTypesAccordingToVariance(IOrigin tok, List<TypeParameter> parameters, List<PreType> arguments,
+      bool proxiesAreSupertypes, bool reportErrors, PreTypeConstraints state) {
       Contract.Requires(parameters.Count == arguments.Count);
 
       if (parameters.All(tp => tp.Variance == TypeParameter.TPVariance.Non)) {
@@ -154,9 +157,9 @@ static List<PreType> CreateProxiesForTypesAccordingToVariance(IToken tok, List<T
           var proxy = state.PreTypeResolver.CreatePreTypeProxy($"type used in {co}variance constraint");
           newArgs.Add(proxy);
           if ((tp.Variance == TypeParameter.TPVariance.Co) == proxiesAreSupertypes) {
-            state.AddSubtypeConstraint(proxy, arguments[i], tok, "bad"); // TODO: improve error message
+            state.AddSubtypeConstraint(proxy, arguments[i], tok, "bad", null, reportErrors); // TODO: improve error message
           } else {
-            state.AddSubtypeConstraint(arguments[i], proxy, tok, "bad"); // TODO: improve error message
+            state.AddSubtypeConstraint(arguments[i], proxy, tok, "bad", null, reportErrors); // TODO: improve error message
           }
         }
       }
diff --git a/Source/DafnyCore/Resolver/PreType/PreTypeToType.cs b/Source/DafnyCore/Resolver/PreType/PreTypeToType.cs
index 0f651fdafcb..0f54f2e37c5 100644
--- a/Source/DafnyCore/Resolver/PreType/PreTypeToType.cs
+++ b/Source/DafnyCore/Resolver/PreType/PreTypeToType.cs
@@ -11,184 +11,258 @@
 
 namespace Microsoft.Dafny;
 
-
 /// <summary>
-/// The purpose of the PreTypeToTypeVisitor is to convert the final pre-types of the name-resolution/pre-type-inference
-/// into types. The core method for doing the conversion is "PreType2Type". The rest of the class is concerned with
-/// where name-resolution/pre-type-inference has come up with pre-types and where these are supposed to be written back
-/// into the AST as types.
+/// The purpose of the PreTypeToTypeVisitor is to fill in a type to each expression and other AST nodes where types make
+/// sense. This computation of this type draws from two sources:
+///    - the pre-type inferred earlier
+///    - any user-supplied type
+/// For most AST nodes, this will not consider subset types; instead, subset types are considered later during
+/// the type refinement phase.
+///
+/// Of the types filled in here, two special TypeProxy's are used.
+///    - TypeRefinementWrapper
+///    - BottomTypePlaceholder
 /// </summary>
 class PreTypeToTypeVisitor : ASTVisitor<IASTVisitorContext> {
   public override IASTVisitorContext GetContext(IASTVisitorContext astVisitorContext, bool inFunctionPostcondition) {
     return astVisitorContext;
   }
 
-  public PreTypeToTypeVisitor() {
-  }
-
-  public static Type PreType2Type(PreType preType) {
-    return PreType2Type(preType, true);
-  }
+  private readonly SystemModuleManager systemModuleManager;
 
-  public static Type PreType2Type(PreType preType, bool usePrintablePreType) {
-    var pt = (DPreType)preType.Normalize(); // all pre-types should have been filled in and resolved to a non-proxy
-    if (usePrintablePreType && pt.PrintablePreType != null) {
-      pt = pt.PrintablePreType;
-    }
-    switch (pt.Decl.Name) {
-      case "bool":
-        return Type.Bool;
-      case "char":
-        return Type.Char;
-      case "int":
-        return Type.Int;
-      case "real":
-        return Type.Real;
-      case "ORDINAL":
-        return Type.BigOrdinal;
-      case "set":
-        return new SetType(true, PreType2Type(pt.Arguments[0]));
-      case "iset":
-        return new SetType(false, PreType2Type(pt.Arguments[0]));
-      case "multiset":
-        return new MultiSetType(PreType2Type(pt.Arguments[0]));
-      case "seq":
-        return new SeqType(PreType2Type(pt.Arguments[0]));
-      case "map":
-        return new MapType(true, PreType2Type(pt.Arguments[0]), PreType2Type(pt.Arguments[1]));
-      case "imap":
-        return new MapType(false, PreType2Type(pt.Arguments[0]), PreType2Type(pt.Arguments[1]));
-      default:
-        break;
-    }
-    var arguments = pt.Arguments.ConvertAll(PreType2Type);
-    if (pt.Decl is ArrowTypeDecl arrowTypeDecl) {
-      return new ArrowType(pt.Decl.tok, arrowTypeDecl, arguments);
-    } else if (pt.Decl is ValuetypeDecl valuetypeDecl) {
-      return valuetypeDecl.CreateType(arguments);
-    } else if (pt.Decl is ClassLikeDecl { IsReferenceTypeDecl: true }) {
-      return new UserDefinedType(pt.Decl.tok, pt.Decl.Name + "?", pt.Decl, arguments);
-    } else {
-      return new UserDefinedType(pt.Decl.tok, pt.Decl.Name, pt.Decl, arguments);
-    }
+  public PreTypeToTypeVisitor(SystemModuleManager systemModuleManager) {
+    this.systemModuleManager = systemModuleManager;
   }
 
+  /// <summary>
+  /// This method combines the inferred pre-type with any user-supplied type for newtype, subset type,
+  /// and const declarations. Those are the declarations whose signature contains inferred elements.
+  /// When the other declarations are visited, it is expected that the signatures of all top-level and
+  /// member declarations have types. For example, to call NormalizeExpand() on a subset type requires
+  /// knowing its Rhs type, and visiting a MemberSelectExpr for a constant field requires knowing the
+  /// type of the field.
+  /// </summary>
   public void VisitConstantsAndRedirectingTypes(List<TopLevelDecl> declarations) {
     foreach (var decl in declarations) {
       if (decl is NewtypeDecl newtypeDecl) {
-        UpdateIfOmitted(newtypeDecl.BaseType, newtypeDecl.BasePreType);
+        PreType2TypeUtil.Combine(newtypeDecl.BaseType, newtypeDecl.BasePreType, false);
       } else if (decl is SubsetTypeDecl subsetTypeDecl) {
-        UpdateIfOmitted(subsetTypeDecl.Var.Type, subsetTypeDecl.Var.PreType);
+        PreType2TypeUtil.Combine(subsetTypeDecl.Var.Type, subsetTypeDecl.Var.PreType, false);
       }
       if (decl is TopLevelDeclWithMembers topLevelDeclWithMembers) {
         foreach (var member in topLevelDeclWithMembers.Members.Where(member => member is ConstantField)) {
           var constField = (ConstantField)member;
-          // The type of the const might have been omitted in the program text and then inferred
-          UpdateIfOmitted(constField.Type, constField.PreType);
+          PreType2TypeUtil.Combine(constField.Type, constField.PreType, true);
         }
       }
     }
   }
 
-  private void UpdateIfOmitted(Type type, PreType preType) {
-    var preTypeConverted = PreType2Type(preType, false);
-    UpdateIfOmitted(type, preTypeConverted);
+  /// <summary>
+  /// This method should be called only after VisitConstantsAndRedirectingTypes has been called.
+  /// </summary>
+  protected override void VisitOneDeclaration(TopLevelDecl decl) {
+    if (decl is NewtypeDecl newtypeDecl) {
+      PreType2TypeUtil.Combine(newtypeDecl.BaseType, newtypeDecl.BasePreType, false);
+    } else if (decl is SubsetTypeDecl subsetTypeDecl) {
+      PreType2TypeUtil.Combine(subsetTypeDecl.Var.Type, subsetTypeDecl.Var.PreType, false);
+    }
+
+    base.VisitOneDeclaration(decl);
   }
 
-  private void UpdateIfOmitted(Type type, Type preTypeConverted) {
-    if (type is TypeProxy { T: null } typeProxy) {
-      typeProxy.T = preTypeConverted;
-    } else {
-      type = type.NormalizeExpand();
-      // TODO: "type" should also be moved up to the parent type that corresponds to "preType.Decl"
-      var preTypeConvertedExpanded = preTypeConverted.NormalizeExpand();
-      Contract.Assert((type as UserDefinedType)?.ResolvedClass == (preTypeConvertedExpanded as UserDefinedType)?.ResolvedClass);
-      Contract.Assert(type.TypeArgs.Count == preTypeConvertedExpanded.TypeArgs.Count);
-      for (var i = 0; i < type.TypeArgs.Count; i++) {
-        UpdateIfOmitted(type.TypeArgs[i], preTypeConverted.TypeArgs[i]);
-      }
+  public override void VisitField(Field field) {
+    if (field is ConstantField ||
+        (field.EnclosingClass is IteratorDecl iteratorDecl && iteratorDecl.DecreasesFields.Contains(field))) {
+      // The type of the const might have been omitted in the program text and then inferred.
+      // Also, the automatically generated _decreases fields of an iterator have inferred types.
+      PreType2TypeUtil.Combine(field.Type, field.PreType, true);
     }
+
+    base.VisitField(field);
   }
 
-  private void UpdateTypeOfVariables(IEnumerable<IVariable> variables) {
+  private static void VisitVariableList(IEnumerable<IVariable> variables, bool allowFutureRefinements) {
     foreach (var v in variables) {
-      UpdateIfOmitted(v.Type, v.PreType);
+      PreType2TypeUtil.Combine(v.Type, v.PreType, allowFutureRefinements);
+    }
+  }
+
+  protected override bool VisitOneExpression(Expression expr, IASTVisitorContext context) {
+    if (expr is DatatypeUpdateExpr datatypeUpdateExpr) {
+      // How a DatatypeUpdateExpr desugars depends on whether or not the expression is ghost, which hasn't been determined
+      // yet. So, if there is a difference between the two, then pre-type resolution prepares two different resolved expressions.
+      // The choice between these two is done in a later phase during resolution. For now, if there are two, we visit them both.
+      // ASTVisitor arranges to visit ResolvedExpression, but we consider ResolvedCompiledExpression here.
+      if (datatypeUpdateExpr.ResolvedCompiledExpression != datatypeUpdateExpr.ResolvedExpression) {
+        VisitExpression(datatypeUpdateExpr.ResolvedCompiledExpression, context);
+      }
     }
+    return base.VisitOneExpression(expr, context);
   }
 
   protected override void PostVisitOneExpression(Expression expr, IASTVisitorContext context) {
-    if (expr is FunctionCallExpr functionCallExpr) {
-      functionCallExpr.TypeApplication_AtEnclosingClass = functionCallExpr.PreTypeApplication_AtEnclosingClass.ConvertAll(PreType2Type);
-      functionCallExpr.TypeApplication_JustFunction = functionCallExpr.PreTypeApplication_JustFunction.ConvertAll(PreType2Type);
+    if (expr is LiteralExpr or ThisExpr) {
+      // Note, for the LiteralExpr "null", we expect to get a possibly-null type, whereas for a reference-type ThisExpr, we expect
+      // to get the non-null type. The .PreType of these two distinguish between those cases, because the latter has a .PrintablePreType
+      // field that gives the non-null type.
+      expr.Type = PreType2TypeUtil.PreType2FixedType(expr.PreType);
+      return;
+    } else if (expr is FunctionCallExpr functionCallExpr) {
+      functionCallExpr.TypeApplication_AtEnclosingClass = functionCallExpr.PreTypeApplication_AtEnclosingClass.ConvertAll(PreType2TypeUtil.PreType2FixedType);
+      functionCallExpr.TypeApplication_JustFunction = PreType2TypeUtil.Combine(functionCallExpr.TypeApplication_JustFunction,
+        functionCallExpr.PreTypeApplication_JustFunction, true);
     } else if (expr is MemberSelectExpr memberSelectExpr) {
-      memberSelectExpr.TypeApplication_AtEnclosingClass = memberSelectExpr.PreTypeApplication_AtEnclosingClass.ConvertAll(PreType2Type);
-      memberSelectExpr.TypeApplication_JustMember = memberSelectExpr.PreTypeApplication_JustMember.ConvertAll(PreType2Type);
+      memberSelectExpr.TypeApplicationAtEnclosingClass = memberSelectExpr.PreTypeApplicationAtEnclosingClass.ConvertAll(PreType2TypeUtil.PreType2FixedType);
+      memberSelectExpr.TypeApplicationJustMember =
+        PreType2TypeUtil.Combine(memberSelectExpr.TypeApplicationJustMember, memberSelectExpr.PreTypeApplicationJustMember, true);
     } else if (expr is ComprehensionExpr comprehensionExpr) {
-      UpdateTypeOfVariables(comprehensionExpr.BoundVars);
+      VisitVariableList(comprehensionExpr.BoundVars, false);
     } else if (expr is LetExpr letExpr) {
-      UpdateTypeOfVariables(letExpr.BoundVars);
+      VisitVariableList(letExpr.BoundVars, letExpr.Exact);
       foreach (var lhs in letExpr.LHSs) {
         VisitPattern(lhs, context);
       }
     } else if (expr is DatatypeValue datatypeValue) {
       Contract.Assert(datatypeValue.InferredTypeArgs.Count == 0 || datatypeValue.InferredTypeArgs.Count == datatypeValue.InferredPreTypeArgs.Count);
-      if (datatypeValue.InferredTypeArgs.Count == 0) {
-        foreach (var preTypeArgument in datatypeValue.InferredPreTypeArgs) {
-          datatypeValue.InferredTypeArgs.Add(PreType2Type(preTypeArgument));
+      if (datatypeValue.InferredTypeArgs.Any(typeArg => typeArg is InferredTypeProxy)) {
+        Contract.Assert(datatypeValue.InferredTypeArgs.All(typeArg => typeArg is InferredTypeProxy));
+      }
+      var datatypeDecl = datatypeValue.Ctor.EnclosingDatatype;
+      Contract.Assert(datatypeValue.InferredPreTypeArgs.Count == datatypeDecl.TypeArgs.Count);
+
+      for (var i = 0; i < datatypeDecl.TypeArgs.Count; i++) {
+        var formal = datatypeDecl.TypeArgs[i];
+        var actualPreType = datatypeValue.InferredPreTypeArgs[i];
+        if (i < datatypeValue.InferredTypeArgs.Count) {
+          var givenTypeOrProxy = datatypeValue.InferredTypeArgs[i];
+          PreType2TypeUtil.Combine(givenTypeOrProxy, actualPreType, givenTypeOrProxy is TypeProxy);
+        } else {
+          datatypeValue.InferredTypeArgs.Add(PreType2TypeUtil.PreType2RefinableType(actualPreType, formal.Variance));
         }
       }
     } else if (expr is ConversionExpr conversionExpr) {
-      UpdateIfOmitted(conversionExpr.ToType, conversionExpr.PreType);
+      PreType2TypeUtil.Combine(conversionExpr.ToType, conversionExpr.PreType, false);
+      expr.Type = conversionExpr.ToType;
+      return;
     }
 
-    if (expr.PreType is UnusedPreType) {
+    if (expr.PreType is MethodPreType) {
       expr.Type = new InferredTypeProxy();
-    } else {
-      expr.Type = PreType2Type(expr.PreType);
+      return;
     }
-    base.PostVisitOneExpression(expr, context);
 
+    // In what remains, we set the type of the expression in one of four ways:
+    //   - The expression gets set to a fixed version of expr.PreType. For example, integer plus, which is
+    //     always int, regardless of any subset type of the operands.
+    //   - The expression gets set to a fixed subset type. For example, multiset selection returns a nat.
+    //   - The expression type is fused directly with the type of some subexpression. This means that any
+    //     later refinements of the type of the subexpression is immediately reflected in the type of the expression,
+    //     without needing to set up any "flow". For example, the type of a ConcreteSyntaxExpression is fused
+    //     with the type of its .ResolvedExpression.
+    //   - The expression type gets set to a refinement-wrapper version of expr.PreType, specifically
+    //     _bottom<expr.PreType> (that is, expr.PreType as a type with the strongest possible constraint).
+    //     For example, IdentifierExpr, which gets a refinement-wrapper type (into which the type from the identifier's
+    //     declaration will later flow).
+
+    // Case: fuse the type
     if (expr is ConcreteSyntaxExpression { ResolvedExpression: { } resolvedExpression }) {
-      VisitExpression(resolvedExpression, context);
+      expr.UnnormalizedType = resolvedExpression.UnnormalizedType;
+      return;
+    } else if (expr is StmtExpr stmtExpr) {
+      expr.UnnormalizedType = stmtExpr.E.UnnormalizedType;
+      return;
     }
+
+    // Case: fixed subset type
+    if (expr is SeqSelectExpr { Seq: { Type: { AsMultiSetType: { } } } }) {
+      expr.UnnormalizedType = systemModuleManager.Nat();
+      return;
+    }
+
+    // Case: fixed pre-type type
+    if (expr is LiteralExpr or ThisExpr or UnaryExpr or BinaryExpr or NegationExpression or DisplayExpression or MapDisplayExpr or SeqUpdateExpr) {
+      // Note, for the LiteralExpr "null", we expect to get a possibly-null type, whereas for a reference-type ThisExpr, we expect
+      // to get the non-null type. The .PreType of these two distinguish between those cases, because the latter has a .PrintablePreType
+      // field that gives the non-null type.
+      expr.Type = PreType2TypeUtil.PreType2FixedType(expr.PreType);
+      return;
+    }
+
+    // Case: refinement-wrapper pre-type type
+    expr.UnnormalizedType = PreType2TypeUtil.PreType2RefinableType(expr.PreType, TypeParameter.TPVariance.Co);
   }
 
   private void VisitPattern<VT>(CasePattern<VT> casePattern, IASTVisitorContext context) where VT : class, IVariable {
     if (casePattern.Var != null) {
-      UpdateIfOmitted(casePattern.Var.Type, casePattern.Var.PreType);
+      PreType2TypeUtil.Combine(casePattern.Var.Type, casePattern.Var.PreType, false);
     }
     VisitExpression(casePattern.Expr, context);
 
-    if (casePattern.Arguments != null) {
-      casePattern.Arguments.ForEach(v => VisitPattern(v, context));
-    }
+    casePattern.Arguments?.ForEach(v => VisitPattern(v, context));
   }
 
-  protected override void PostVisitOneStatement(Statement stmt, IASTVisitorContext context) {
+  protected override bool VisitOneStatement(Statement stmt, IASTVisitorContext context) {
     if (stmt is VarDeclStmt varDeclStmt) {
-      UpdateTypeOfVariables(varDeclStmt.Locals);
+      VisitVariableList(varDeclStmt.Locals, true);
     } else if (stmt is VarDeclPattern varDeclPattern) {
-      UpdateTypeOfVariables(varDeclPattern.LocalVars);
+      VisitVariableList(varDeclPattern.LocalVars, true);
+    } else if (stmt is ForLoopStmt forLoopStmt) {
+      PreType2TypeUtil.Combine(forLoopStmt.LoopIndex.Type, forLoopStmt.LoopIndex.PreType, false);
+    } else if (stmt is ForallStmt forallStmt) {
+      VisitVariableList(forallStmt.BoundVars, false);
+    }
+
+    return base.VisitOneStatement(stmt, context);
+  }
+
+  protected override void PostVisitOneStatement(Statement stmt, IASTVisitorContext context) {
+    if (stmt is VarDeclPattern varDeclPattern) {
       VisitPattern(varDeclPattern.LHS, context);
-    } else if (stmt is AssignStmt { Rhs: TypeRhs tRhs }) {
-      tRhs.Type = PreType2Type(tRhs.PreType);
+    } else if (stmt is SingleAssignStmt { Rhs: TypeRhs tRhs }) {
+      Type rhsType;
+      // convert the type of the RHS, which we expect to be a reference type, and then create the non-null version of it
+      var udtConvertedFromPretype = (UserDefinedType)PreType2TypeUtil.PreType2FixedType(tRhs.PreType);
+      Contract.Assert(udtConvertedFromPretype.IsRefType);
       if (tRhs.ArrayDimensions != null) {
-        // In this case, we expect tRhs.PreType to be an array type
+        // In this case, we expect tRhs.PreType (and udtConvertedFromPretype) to be an array type
         var arrayPreType = (DPreType)tRhs.PreType.Normalize();
         Contract.Assert(arrayPreType.Decl is ArrayClassDecl);
         Contract.Assert(arrayPreType.Arguments.Count == 1);
-        UpdateIfOmitted(tRhs.EType, arrayPreType.Arguments[0]);
+        Contract.Assert(udtConvertedFromPretype.ResolvedClass is ArrayClassDecl);
+        Contract.Assert(udtConvertedFromPretype.TypeArgs.Count == 1);
+
+        // The user-supplied tRhs.EType may have some components that are more exact than what's in udtConvertedFromPretype, since
+        // tRhs.EType may contain user-supplied subset types. But tRhs.EType may also be missing some type arguments altogether, because
+        // they may have been omitted in the source text. The following has the effect of filling in any such missing components with
+        // whatever was inferred during pre-type inference.
+        PreType2TypeUtil.Combine(tRhs.EType, arrayPreType.Arguments[0], false);
+        var arrayTypeDecl = systemModuleManager.arrayTypeDecls[tRhs.ArrayDimensions.Count];
+        var rhsMaybeNullType = new UserDefinedType(stmt.Origin, arrayTypeDecl.Name, arrayTypeDecl, new List<Type>() { tRhs.EType });
+        rhsType = UserDefinedType.CreateNonNullType(rhsMaybeNullType);
       } else {
-        UpdateIfOmitted(tRhs.EType, tRhs.PreType);
+        // Fill in any missing type arguments in the user-supplied tRhs.EType.
+        PreType2TypeUtil.Combine(tRhs.EType, tRhs.PreType, false);
+        rhsType = (UserDefinedType)tRhs.EType;
+        if (tRhs.InitCall != null) {
+          // We want the type of tRhs.InitCall.MethodSelect.Obj to be the same as what the "new" gives, but the previous
+          // visitation of this MemberSelectExpr would have set it to the type obtained from the pre-type. Since the MemberSelectExpr
+          // won't be visited again during type refinement, we set it here once and for all.
+          tRhs.InitCall.MethodSelect.Obj.UnnormalizedType = rhsType;
+        }
       }
+      tRhs.Type = rhsType;
+
     } else if (stmt is AssignSuchThatStmt assignSuchThatStmt) {
       foreach (var lhs in assignSuchThatStmt.Lhss) {
         VisitExpression(lhs, context);
       }
+
     } else if (stmt is ProduceStmt produceStmt) {
       if (produceStmt.HiddenUpdate != null) {
         VisitStatement(produceStmt.HiddenUpdate, context);
       }
+
     } else if (stmt is CalcStmt calcStmt) {
       // The expression in each line has been visited, but pairs of those lines are then put together to
       // form steps. These steps (are always boolean, and) need to be visited, too. Their subexpressions
@@ -198,19 +272,9 @@ protected override void PostVisitOneStatement(Statement stmt, IASTVisitorContext
         PostVisitOneExpression(step, context);
       }
       PostVisitOneExpression(calcStmt.Result, context);
-    } else if (stmt is ForLoopStmt forLoopStmt) {
-      UpdateIfOmitted(forLoopStmt.LoopIndex.Type, forLoopStmt.LoopIndex.PreType);
-    } else if (stmt is ForallStmt forallStmt) {
-      UpdateTypeOfVariables(forallStmt.BoundVars);
     }
 
     base.PostVisitOneStatement(stmt, context);
-
-    if (stmt is UpdateStmt updateStmt) {
-      foreach (var ss in updateStmt.ResolvedStatements) {
-        VisitStatement(ss, context);
-      }
-    }
   }
 
   protected override void VisitExtendedPattern(ExtendedPattern pattern, IASTVisitorContext context) {
@@ -222,7 +286,7 @@ protected override void VisitExtendedPattern(ExtendedPattern pattern, IASTVisito
         break;
       case IdPattern idPattern:
         if (idPattern.BoundVar != null) {
-          UpdateIfOmitted(idPattern.BoundVar.Type, idPattern.BoundVar.PreType);
+          PreType2TypeUtil.Combine(idPattern.BoundVar.Type, idPattern.BoundVar.PreType, false);
         }
         if (idPattern.ResolvedLit != null) {
           PostVisitOneExpression(idPattern.ResolvedLit, context);
@@ -234,4 +298,5 @@ protected override void VisitExtendedPattern(ExtendedPattern pattern, IASTVisito
     }
     base.VisitExtendedPattern(pattern, context);
   }
+
 }
diff --git a/Source/DafnyCore/Resolver/PreType/TypeRefinementVisitor.cs b/Source/DafnyCore/Resolver/PreType/TypeRefinementVisitor.cs
new file mode 100644
index 00000000000..b4e0efd7cb1
--- /dev/null
+++ b/Source/DafnyCore/Resolver/PreType/TypeRefinementVisitor.cs
@@ -0,0 +1,423 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// The purpose of the TypeRefinementVisitor is to incorporate subset types into the types that were inferred during
+/// pre-type inference. The visitor collects constraints, which are solved by the Solve() method.
+/// </summary>
+public class TypeRefinementVisitor : ASTVisitor<IASTVisitorContext> {
+  private string moduleDescription;
+  public override IASTVisitorContext GetContext(IASTVisitorContext astVisitorContext, bool inFunctionPostcondition) {
+    return astVisitorContext;
+  }
+
+  private readonly SystemModuleManager systemModuleManager;
+
+  public TypeRefinementVisitor(string moduleDescription, SystemModuleManager systemModuleManager) {
+    this.moduleDescription = moduleDescription;
+    this.systemModuleManager = systemModuleManager;
+  }
+
+  private readonly List<Flow> flows = new();
+
+  public void DebugPrint() {
+    systemModuleManager.Options.OutputWriter.WriteLine($"--------------------------- type-refinement flows, {moduleDescription}:");
+    foreach (var flow in flows) {
+      flow.DebugPrint(systemModuleManager.Options.OutputWriter);
+    }
+    systemModuleManager.Options.OutputWriter.WriteLine($"------------------- (end of type-refinement flows, {moduleDescription})");
+  }
+
+  protected override bool VisitOneExpression(Expression expr, IASTVisitorContext context) {
+    if (expr is DatatypeUpdateExpr datatypeUpdateExpr) {
+      // How a DatatypeUpdateExpr desugars depends on whether or not the expression is ghost, which hasn't been determined
+      // yet. So, if there is a difference between the two, then pre-type resolution prepares two different resolved expressions.
+      // The choice between these two is done in a later phase during resolution. For now, if there are two, we visit them both.
+      // ASTVisitor arranges to visit ResolvedExpression, but we consider ResolvedCompiledExpression here.
+      if (datatypeUpdateExpr.ResolvedCompiledExpression != datatypeUpdateExpr.ResolvedExpression) {
+        VisitExpression(datatypeUpdateExpr.ResolvedCompiledExpression, context);
+      }
+    }
+    return base.VisitOneExpression(expr, context);
+  }
+
+  protected override void PostVisitOneExpression(Expression expr, IASTVisitorContext context) {
+    if (expr is IdentifierExpr identifierExpr) {
+      flows.Add(new FlowFromType(expr, identifierExpr.Var.UnnormalizedType, identifierExpr.Name));
+
+    } else if (expr is SeqSelectExpr selectExpr) {
+      var unnormalizedSeqType = selectExpr.Seq.UnnormalizedType;
+      var seqType = selectExpr.Seq.Type.NormalizeToAncestorType();
+      if (!selectExpr.SelectOne) {
+        var sinkType = selectExpr.Type.NormalizeToAncestorType().AsSeqType;
+        flows.Add(new FlowFromType(sinkType.Arg, seqType.TypeArgs[0], expr.Origin));
+      } else if (seqType.AsSeqType != null || seqType.IsArrayType) {
+        flows.Add(new FlowFromTypeArgument(expr, unnormalizedSeqType, 0));
+      } else if (seqType.IsMapType || seqType.IsIMapType) {
+        flows.Add(new FlowFromTypeArgument(expr, unnormalizedSeqType, 1));
+      } else {
+        Contract.Assert(seqType.AsMultiSetType != null);
+        // type is fixed, so no flow to set up
+      }
+
+    } else if (expr is MultiSelectExpr multiSelectExpr) {
+      flows.Add(new FlowFromTypeArgument(expr, multiSelectExpr.Array.UnnormalizedType, 0));
+
+    } else if (expr is ITEExpr iteExpr) {
+      flows.Add(new FlowBetweenExpressions(expr, iteExpr.Thn, "if-then"));
+      flows.Add(new FlowBetweenExpressions(expr, iteExpr.Els, "if-else"));
+
+    } else if (expr is NestedMatchExpr matchExpr) {
+      foreach (var kase in matchExpr.Cases) {
+        flows.Add(new FlowBetweenExpressions(expr, kase.Body, "case"));
+      }
+
+    } else if (expr is MemberSelectExpr memberSelectExpr) {
+      if (memberSelectExpr.Member is Field field) {
+        var dPreType = (DPreType)memberSelectExpr.Obj.PreType.Normalize();
+        if (dPreType.Decl is ValuetypeDecl valuetypeDecl) {
+          flows.Add(new FlowFromComputedType(expr, () => {
+            // TypeArgumentSubstitutionsWithParents doesn't work with ValuetypeDecl, so we roll our own type map
+            var receiverType = memberSelectExpr.Obj.Type.NormalizeExpand();
+            Contract.Assert(receiverType.TypeArgs.Count == valuetypeDecl.TypeArgs.Count);
+            var typeMap = TypeParameter.SubstitutionMap(valuetypeDecl.TypeArgs, receiverType.TypeArgs);
+            return field.Type.Subst(typeMap);
+          }, $".{memberSelectExpr.MemberName}"));
+        } else {
+          flows.Add(new FlowFromComputedType(expr, () => {
+            var typeMap = memberSelectExpr.TypeArgumentSubstitutionsWithParents();
+            return field.Type.Subst(typeMap);
+          }, $".{memberSelectExpr.MemberName}"));
+        }
+      } else if (memberSelectExpr.Member is Function function) {
+        flows.Add(new FlowFromComputedType(expr, () => {
+          var typeMap = memberSelectExpr.TypeArgumentSubstitutionsWithParents();
+          return ModuleResolver.SelectAppropriateArrowTypeForFunction(function, typeMap, systemModuleManager);
+        }, $".{memberSelectExpr.MemberName}"));
+      }
+
+    } else if (expr is FunctionCallExpr functionCallExpr) {
+      Contract.Assert(functionCallExpr.Args.Count == functionCallExpr.Function.Ins.Count);
+      for (var i = 0; i < functionCallExpr.Args.Count; i++) {
+        var formal = functionCallExpr.Function.Ins[i];
+        var actual = functionCallExpr.Args[i];
+        flows.Add(new FlowBetweenComputedTypes(() => {
+          var typeMap = functionCallExpr.TypeArgumentSubstitutionsWithParents();
+          return (TypeRefinementWrapper.NormalizeSansBottom(formal).Subst(typeMap), TypeRefinementWrapper.NormalizeSansBottom(actual));
+        }, functionCallExpr.Origin, $"{functionCallExpr.Function.Name}({formal.Name} := ...)"));
+      }
+
+      flows.Add(new FlowFromComputedType(expr, () => {
+        var typeMap = functionCallExpr.TypeArgumentSubstitutionsWithParents();
+        return functionCallExpr.Function.ResultType.Subst(typeMap);
+      }, $"{functionCallExpr.Name}(...)"));
+
+    } else if (expr is DatatypeValue datatypeValue) {
+      var ctor = datatypeValue.Ctor;
+      var datatypeDecl = ctor.EnclosingDatatype;
+      for (var i = 0; i < datatypeValue.Arguments.Count; i++) {
+        var formal = ctor.Formals[i];
+        var actual = datatypeValue.Arguments[i];
+        flows.Add(new FlowBetweenComputedTypes(() => {
+          var typeMap = TypeParameter.SubstitutionMap(datatypeDecl.TypeArgs, datatypeValue.InferredTypeArgs);
+          return (TypeRefinementWrapper.NormalizeSansBottom(formal).Subst(typeMap), TypeRefinementWrapper.NormalizeSansBottom(actual));
+        }, datatypeValue.Origin, $"{ctor.Name}({formal.Name} := ...)"));
+      }
+      flows.Add(new FlowFromComputedType(expr,
+        () => new UserDefinedType(expr.Origin, datatypeDecl.Name, datatypeDecl, datatypeValue.InferredTypeArgs),
+        ctor.Name));
+
+    } else if (expr is ApplyExpr applyExpr) {
+      flows.Add(new FlowFromTypeArgument(expr, applyExpr.Function.UnnormalizedType, applyExpr.Args.Count));
+
+    } else if (expr is SetDisplayExpr setDisplayExpr) {
+      foreach (var element in setDisplayExpr.Elements) {
+        flows.Add(new FlowFromComputedTypeIgnoreHeadTypes(expr, () => new SetType(setDisplayExpr.Finite, TypeRefinementWrapper.NormalizeSansBottom(element)), "set display"));
+      }
+
+    } else if (expr is MultiSetDisplayExpr multiSetDisplayExpr) {
+      foreach (var element in multiSetDisplayExpr.Elements) {
+        flows.Add(new FlowFromComputedTypeIgnoreHeadTypes(expr, () => new MultiSetType(TypeRefinementWrapper.NormalizeSansBottom(element)), "multiset display"));
+      }
+
+    } else if (expr is SeqDisplayExpr seqDisplayExpr) {
+      foreach (var element in seqDisplayExpr.Elements) {
+        flows.Add(new FlowFromComputedTypeIgnoreHeadTypes(expr, () => new SeqType(TypeRefinementWrapper.NormalizeSansBottom(element)), "sequence display"));
+      }
+
+    } else if (expr is MapDisplayExpr mapDisplayExpr) {
+      foreach (var element in mapDisplayExpr.Elements) {
+        flows.Add(new FlowFromComputedTypeIgnoreHeadTypes(expr, () => new MapType(mapDisplayExpr.Finite,
+            TypeRefinementWrapper.NormalizeSansBottom(element.A), TypeRefinementWrapper.NormalizeSansBottom(element.B)),
+          "map display"));
+      }
+
+    } else if (expr is SetComprehension setComprehension) {
+      flows.Add(new FlowFromComputedTypeIgnoreHeadTypes(expr,
+        () => new SetType(setComprehension.Finite, TypeRefinementWrapper.NormalizeSansBottom(setComprehension.Term)),
+        "set comprehension"));
+
+    } else if (expr is MapComprehension mapComprehension) {
+      flows.Add(new FlowFromComputedTypeIgnoreHeadTypes(expr, () => {
+        Type keyType;
+        if (mapComprehension.TermLeft != null) {
+          keyType = TypeRefinementWrapper.NormalizeSansBottom(mapComprehension.TermLeft);
+        } else {
+          Contract.Assert(mapComprehension.BoundVars.Count == 1);
+          keyType = TypeRefinementWrapper.NormalizeSansBottom(mapComprehension.BoundVars[0]);
+        }
+        return new MapType(mapComprehension.Finite, keyType, TypeRefinementWrapper.NormalizeSansBottom(mapComprehension.Term));
+      }, "map comprehension"));
+
+    } else if (expr is SeqConstructionExpr seqConstructionExpr) {
+      flows.Add(new FlowFromComputedTypeIgnoreHeadTypes(expr,
+        () => {
+          var arrowType = (ArrowType)seqConstructionExpr.Initializer.Type.NormalizeToAncestorType();
+          Contract.Assert(arrowType.TypeArgs.Count == 2);
+          return new SeqType(TypeRefinementWrapper.NormalizeSansBottom(arrowType.TypeArgs[1]));
+        },
+        "seq constructor"));
+
+    } else if (expr is BinaryExpr binaryExpr) {
+      switch (binaryExpr.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.Iff:
+        case BinaryExpr.ResolvedOpcode.Imp:
+        case BinaryExpr.ResolvedOpcode.And:
+        case BinaryExpr.ResolvedOpcode.Or:
+        case BinaryExpr.ResolvedOpcode.Add:
+        case BinaryExpr.ResolvedOpcode.Sub:
+        case BinaryExpr.ResolvedOpcode.Mul:
+        case BinaryExpr.ResolvedOpcode.Div:
+        case BinaryExpr.ResolvedOpcode.Mod:
+        case BinaryExpr.ResolvedOpcode.BitwiseAnd:
+        case BinaryExpr.ResolvedOpcode.BitwiseOr:
+        case BinaryExpr.ResolvedOpcode.BitwiseXor:
+        case BinaryExpr.ResolvedOpcode.Union:
+        case BinaryExpr.ResolvedOpcode.Intersection:
+        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+        case BinaryExpr.ResolvedOpcode.Concat:
+        case BinaryExpr.ResolvedOpcode.MapMerge:
+          // For these operators, the result type is the same as that of E0 and E1.
+          //
+          // Note about intersection: In general, let set<C> be the result of combining the operands set<A> and set<B>
+          // of intersection. To be precise, we would need C to be a type that conjoins the constraints of A and B.
+          // We don't have such a time, so we instead (approximate the other direction and) let C be the join of A and B.
+          flows.Add(new FlowBetweenExpressions(expr, binaryExpr.E0, BinaryExpr.OpcodeString(binaryExpr.Op)));
+          flows.Add(new FlowBetweenExpressions(expr, binaryExpr.E1, BinaryExpr.OpcodeString(binaryExpr.Op)));
+          break;
+        case BinaryExpr.ResolvedOpcode.LeftShift:
+        case BinaryExpr.ResolvedOpcode.RightShift:
+        case BinaryExpr.ResolvedOpcode.SetDifference:
+        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+        case BinaryExpr.ResolvedOpcode.MapSubtraction:
+          // For these operators, the result type is determined by E0.
+          flows.Add(new FlowBetweenExpressions(expr, binaryExpr.E0, BinaryExpr.OpcodeString(binaryExpr.Op)));
+          break;
+        case BinaryExpr.ResolvedOpcode.EqCommon:
+        case BinaryExpr.ResolvedOpcode.NeqCommon:
+        case BinaryExpr.ResolvedOpcode.Lt:
+        case BinaryExpr.ResolvedOpcode.Le:
+        case BinaryExpr.ResolvedOpcode.Ge:
+        case BinaryExpr.ResolvedOpcode.Gt:
+        case BinaryExpr.ResolvedOpcode.LtChar:
+        case BinaryExpr.ResolvedOpcode.LeChar:
+        case BinaryExpr.ResolvedOpcode.GeChar:
+        case BinaryExpr.ResolvedOpcode.GtChar:
+        case BinaryExpr.ResolvedOpcode.SetEq:
+        case BinaryExpr.ResolvedOpcode.SetNeq:
+        case BinaryExpr.ResolvedOpcode.ProperSubset:
+        case BinaryExpr.ResolvedOpcode.Subset:
+        case BinaryExpr.ResolvedOpcode.Superset:
+        case BinaryExpr.ResolvedOpcode.ProperSuperset:
+        case BinaryExpr.ResolvedOpcode.Disjoint:
+        case BinaryExpr.ResolvedOpcode.InSet:
+        case BinaryExpr.ResolvedOpcode.NotInSet:
+        case BinaryExpr.ResolvedOpcode.MultiSetEq:
+        case BinaryExpr.ResolvedOpcode.MultiSetNeq:
+        case BinaryExpr.ResolvedOpcode.MultiSubset:
+        case BinaryExpr.ResolvedOpcode.MultiSuperset:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
+        case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
+        case BinaryExpr.ResolvedOpcode.InMultiSet:
+        case BinaryExpr.ResolvedOpcode.NotInMultiSet:
+        case BinaryExpr.ResolvedOpcode.SeqEq:
+        case BinaryExpr.ResolvedOpcode.SeqNeq:
+        case BinaryExpr.ResolvedOpcode.ProperPrefix:
+        case BinaryExpr.ResolvedOpcode.Prefix:
+        case BinaryExpr.ResolvedOpcode.InSeq:
+        case BinaryExpr.ResolvedOpcode.NotInSeq:
+        case BinaryExpr.ResolvedOpcode.MapEq:
+        case BinaryExpr.ResolvedOpcode.MapNeq:
+        case BinaryExpr.ResolvedOpcode.InMap:
+        case BinaryExpr.ResolvedOpcode.NotInMap:
+        case BinaryExpr.ResolvedOpcode.RankLt:
+        case BinaryExpr.ResolvedOpcode.RankGt:
+          // For these operators, the result type is fixed (to be bool), so there is no flow.
+          break;
+        case BinaryExpr.ResolvedOpcode.YetUndetermined:
+        case BinaryExpr.ResolvedOpcode.LessThanLimit:
+        default:
+          Contract.Assert(false); // unexpected operator
+          break;
+      }
+
+    } else if (expr is LetExpr letExpr) {
+      if (letExpr.Exact) {
+        Contract.Assert(letExpr.LHSs.Count == letExpr.RHSs.Count);
+        for (var i = 0; i < letExpr.LHSs.Count; i++) {
+          var rhs = letExpr.RHSs[i];
+          VisitPattern(letExpr.LHSs[i], () => TypeRefinementWrapper.NormalizeSansBottom(rhs), context);
+        }
+      }
+      flows.Add(new FlowBetweenExpressions(expr, letExpr.Body, "let"));
+
+    } else if (expr is LambdaExpr lambdaExpr) {
+      flows.Add(new FlowFromComputedType(expr, () => {
+        return ModuleResolver.SelectAppropriateArrowType(lambdaExpr.Origin,
+          lambdaExpr.BoundVars.ConvertAll(v => TypeRefinementWrapper.NormalizeSansBottom(v)),
+          TypeRefinementWrapper.NormalizeSansBottom(lambdaExpr.Body),
+          lambdaExpr.Reads.Expressions.Count != 0, lambdaExpr.Range != null, systemModuleManager);
+      }, lambdaExpr.WhatKind));
+
+    }
+
+    base.PostVisitOneExpression(expr, context);
+  }
+
+  private void VisitPattern<VT>(CasePattern<VT> casePattern, Func<Type> getPatternRhsType, IASTVisitorContext context) where VT : class, IVariable {
+    VisitExpression(casePattern.Expr, context);
+
+    if (casePattern.Var != null) {
+      flows.Add(new FlowIntoVariableFromComputedType(casePattern.Var, getPatternRhsType, casePattern.Origin, ":="));
+      Contract.Assert(casePattern.Arguments == null);
+    } else if (casePattern.Arguments != null) {
+      var ctor = casePattern.Ctor;
+      Contract.Assert(ctor != null);
+
+      Func<Type> GetPatternArgumentType(int argumentIndex) {
+        return () => {
+          var sourceType = getPatternRhsType().NormalizeExpand();
+          Contract.Assert(sourceType.IsDatatype);
+          Contract.Assert(sourceType.TypeArgs.Count == ctor.EnclosingDatatype.TypeArgs.Count);
+          var typeMap = TypeParameter.SubstitutionMap(ctor.EnclosingDatatype.TypeArgs, sourceType.TypeArgs);
+          Contract.Assert(argumentIndex < ctor.Formals.Count);
+          return ctor.Formals[argumentIndex].Type.Subst(typeMap);
+        };
+      }
+
+      for (var i = 0; i < casePattern.Arguments.Count; i++) {
+        VisitPattern<VT>(casePattern.Arguments[i], GetPatternArgumentType(i), context);
+      }
+    }
+
+  }
+
+  protected override void PostVisitOneStatement(Statement stmt, IASTVisitorContext context) {
+    if (stmt is VarDeclPattern varDeclPattern) {
+      VisitPattern(varDeclPattern.LHS, () => TypeRefinementWrapper.NormalizeSansBottom(varDeclPattern.RHS), context);
+    } else if (stmt is SingleAssignStmt { Lhs: IdentifierExpr lhsIdentifierExpr } assignStmt) {
+      if (assignStmt is { Rhs: ExprRhs exprRhs }) {
+        flows.Add(new FlowIntoVariable(lhsIdentifierExpr.Var, exprRhs.Expr, assignStmt.Origin, ":="));
+      } else if (assignStmt is { Rhs: TypeRhs tRhs }) {
+        flows.Add(new FlowFromType(lhsIdentifierExpr.Var.UnnormalizedType, tRhs.Type, assignStmt.Origin, ":= new"));
+      }
+
+    } else if (stmt is AssignSuchThatStmt assignSuchThatStmt) {
+      foreach (var lhs in assignSuchThatStmt.Lhss) {
+        VisitExpression(lhs, context);
+      }
+
+    } else if (stmt is CallStmt callStmt) {
+      Contract.Assert(callStmt.Args.Count == callStmt.Method.Ins.Count);
+      for (var i = 0; i < callStmt.Args.Count; i++) {
+        var formal = callStmt.Method.Ins[i];
+        var actual = callStmt.Args[i];
+        flows.Add(new FlowBetweenComputedTypes(() => {
+          var typeMap = callStmt.MethodSelect.TypeArgumentSubstitutionsWithParents();
+          return (TypeRefinementWrapper.NormalizeSansBottom(formal).Subst(typeMap), TypeRefinementWrapper.NormalizeSansBottom(actual));
+        }, callStmt.Origin, $"{callStmt.Method.Name}({formal.Name} := ...)"));
+      }
+
+      Contract.Assert(callStmt.Lhs.Count == callStmt.Method.Outs.Count);
+      for (var i = 0; i < callStmt.Lhs.Count; i++) {
+        if (callStmt.Lhs[i] is IdentifierExpr actualIdentifierExpr) {
+          var formal = callStmt.Method.Outs[i];
+          flows.Add(new FlowIntoVariableFromComputedType(actualIdentifierExpr.Var, () => {
+            var typeMap = callStmt.MethodSelect.TypeArgumentSubstitutionsWithParents();
+            return TypeRefinementWrapper.NormalizeSansBottom(formal).Subst(typeMap);
+          }, callStmt.Origin, $"{actualIdentifierExpr.Var.Name} := {callStmt.Method.Name}(...)"));
+        }
+      }
+
+    } else if (stmt is ProduceStmt produceStmt) {
+      if (produceStmt.HiddenUpdate != null) {
+        VisitStatement(produceStmt.HiddenUpdate, context);
+      }
+
+    } else if (stmt is CalcStmt calcStmt) {
+      // The expression in each line has been visited, but pairs of those lines are then put together to
+      // form steps. These steps (are always boolean, and) need to be visited, too. Their subexpressions
+      // have already been visited, so it suffices to call PostVisitOneExpression (instead of VisitExpression)
+      // here.
+      foreach (var step in calcStmt.Steps) {
+        PostVisitOneExpression(step, context);
+      }
+      PostVisitOneExpression(calcStmt.Result, context);
+    }
+
+    base.PostVisitOneStatement(stmt, context);
+  }
+
+  protected override void VisitExtendedPattern(ExtendedPattern pattern, IASTVisitorContext context) {
+    switch (pattern) {
+      case DisjunctivePattern disjunctivePattern:
+        break;
+      case LitPattern litPattern:
+        PostVisitOneExpression(litPattern.OptimisticallyDesugaredLit, context);
+        break;
+      case IdPattern idPattern:
+        if (idPattern.BoundVar != null) {
+#if SOON
+          UpdateIfOmitted(idPattern.BoundVar.Type, idPattern.BoundVar.PreType);
+#endif
+        }
+        if (idPattern.ResolvedLit != null) {
+          PostVisitOneExpression(idPattern.ResolvedLit, context);
+        }
+        break;
+      default:
+        Contract.Assert(false); // unexpected case
+        break;
+    }
+    base.VisitExtendedPattern(pattern, context);
+  }
+
+  public void Solve(ErrorReporter reporter, bool debugPrint) {
+    var context = new FlowContext(systemModuleManager, reporter, debugPrint);
+    bool anythingChanged;
+    do {
+      anythingChanged = false;
+      foreach (var flow in flows.Where(flow => !flow.HasError)) {
+        anythingChanged |= flow.Update(context);
+      }
+    } while (anythingChanged);
+
+    if (debugPrint) {
+      DebugPrint();
+    }
+  }
+
+}
diff --git a/Source/DafnyCore/Resolver/PreType/TypeRefinementWrapper.cs b/Source/DafnyCore/Resolver/PreType/TypeRefinementWrapper.cs
new file mode 100644
index 00000000000..fda3cc4d815
--- /dev/null
+++ b/Source/DafnyCore/Resolver/PreType/TypeRefinementWrapper.cs
@@ -0,0 +1,137 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+public class TypeRefinementWrapper : TypeProxy {
+  private static int count = 0;
+  public readonly int UniqueId = count++;
+  public TypeRefinementWrapper(Type type) : base() {
+    T = type;
+  }
+
+  public bool IsBottomType => T is BottomTypePlaceholder;
+
+  public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
+    var baseName = base.TypeName(options, context, parseAble);
+    if (options.Get(CommonOptionBag.NewTypeInferenceDebug)) {
+      return $"/*%{UniqueId}*/{baseName}";
+    } else {
+      return baseName;
+    }
+  }
+
+  /// <summary>
+  /// Normalize, but don't skip over any TypeRefinementWrapper
+  /// </summary>
+  public static Type NormalizeSansRefinementWrappers(Type ty) {
+    while (ty is not TypeRefinementWrapper) {
+      if (ty is TypeProxy { T: { } proxyFor }) {
+        ty = proxyFor;
+      } else {
+        break;
+      }
+    }
+    return ty;
+  }
+
+  public static Type NormalizeSansBottom(Expression expr) {
+    return NormalizeSansBottom(expr.UnnormalizedType);
+  }
+
+  public static Type NormalizeSansBottom(IVariable variable) {
+    return NormalizeSansBottom(variable.UnnormalizedType);
+  }
+
+  public static Type NormalizeSansBottom(Type unnormalizedType) {
+    var normalizedType = TypeRefinementWrapper.NormalizeSansRefinementWrappers(unnormalizedType);
+    return (normalizedType as TypeRefinementWrapper)?.T ?? normalizedType;
+  }
+
+  public static string ToStringShowingWrapper(Type type) {
+    type = NormalizeSansRefinementWrappers(type);
+    if (type is TypeRefinementWrapper utp) {
+      return $"%{utp.UniqueId}";
+    }
+    if (type is BasicType) {
+      return type.ToString();
+    }
+    if (type.AsArrowType is { } arrowType) {
+      string arrow = type is ArrowType
+        ? "~>"
+        : type is UserDefinedType userDefinedType
+          ? ArrowType.IsPartialArrowTypeName(userDefinedType.Name)
+            ? "-->"
+            : ArrowType.IsTotalArrowTypeName(userDefinedType.Name)
+              ? "->"
+              : null
+          : null;
+      if (arrow != null) {
+        return $"({arrowType.Args.Comma(ToStringShowingWrapper)}) {arrow} {ToStringShowingWrapper(arrowType.Result)}";
+      }
+    }
+    string headName;
+    if (type is CollectionType collectionType) {
+      headName = collectionType.CollectionTypeName;
+    } else if (type is UserDefinedType udt) {
+      headName = udt.Name;
+    } else {
+      Contract.Assert(type.TypeArgs.Count == 0);
+      headName = type.ToString();
+    }
+    if (type.TypeArgs.Count == 0) {
+      return headName;
+    }
+    return $"{headName}<{type.TypeArgs.Comma(ToStringShowingWrapper)}>";
+  }
+
+  public static string ToStringAsBottom(Type type) {
+    if (type is BottomTypePlaceholder) {
+      return "\\bot";
+    }
+    type = NormalizeSansRefinementWrappers(type);
+    if (type is TypeRefinementWrapper { IsBottomType: true }) {
+      return "\\bot";
+    } else {
+      return type.ToString();
+    }
+  }
+
+  public static bool NormalizesToBottom(Type type) {
+    if (type is BottomTypePlaceholder) {
+      return true;
+    }
+    while (true) {
+      type = NormalizeSansRefinementWrappers(type);
+      if (type is TypeRefinementWrapper updatableTypeProxy) {
+        if (updatableTypeProxy.IsBottomType) {
+          return true;
+        }
+        type = updatableTypeProxy.T;
+      } else {
+        return false;
+      }
+    }
+  }
+}
+
+public class BottomTypePlaceholder : TypeProxy {
+  public BottomTypePlaceholder(Type baseType) {
+    T = baseType;
+  }
+
+  public override string TypeName(DafnyOptions options, ModuleDefinition context, bool parseAble) {
+    var baseName = base.TypeName(options, context, parseAble);
+    if (options.Get(CommonOptionBag.NewTypeInferenceDebug)) {
+      return $"/*\\bot*/{baseName}";
+    } else {
+      return baseName;
+    }
+  }
+}
diff --git a/Source/DafnyCore/Resolver/PreType/UnderspecificationDetector.cs b/Source/DafnyCore/Resolver/PreType/UnderspecificationDetector.cs
index feae6a236a9..6bd41c987fa 100644
--- a/Source/DafnyCore/Resolver/PreType/UnderspecificationDetector.cs
+++ b/Source/DafnyCore/Resolver/PreType/UnderspecificationDetector.cs
@@ -35,37 +35,43 @@ public void Check(List<TopLevelDecl> declarations) {
       Contract.Requires(declarations != null);
 
       foreach (TopLevelDecl d in declarations) {
+        var context = new UnderspecificationDetectorContext(d);
+        CheckAttributes(d.Attributes, context);
+
         if (d is IteratorDecl) {
           var iter = (IteratorDecl)d;
           var prevErrCnt = ErrorCount;
           iter.Members.ForEach(CheckMember);
           if (prevErrCnt == ErrorCount) {
-            iter.SubExpressions.ForEach(e => CheckExpression(e, iter));
+            iter.SubExpressions.ForEach(e => CheckExpression(e, context));
           }
-          CheckParameterDefaultValues(iter.Ins, iter);
+          CheckParameterDefaultValues(iter.Ins, context);
           if (iter.Body != null) {
-            CheckStatement(iter.Body, iter);
+            CheckStatement(iter.Body, context);
             if (prevErrCnt == ErrorCount) {
-              CheckStatement(iter.Body, iter);
+              CheckStatement(iter.Body, context);
             }
           }
 
         } else if (d is SubsetTypeDecl) {
           var dd = (SubsetTypeDecl)d;
-          CheckExpression(dd.Constraint, new CodeContextWrapper(dd, true));
+          if (!DetectUnderspecificationVisitor.IsDetermined(dd.Var.PreType)) {
+            ReportError(dd, $"base type of {dd.WhatKindAndName} is not fully determined; add an explicit type for bound variable '{dd.Var.Name}'");
+          }
+          CheckExpression(dd.Constraint, context);
           if (dd.Witness != null) {
-            CheckExpression(dd.Witness, new CodeContextWrapper(dd, dd.WitnessKind == SubsetTypeDecl.WKind.Ghost));
+            CheckExpression(dd.Witness, context);
           }
 
         } else if (d is NewtypeDecl) {
           var dd = (NewtypeDecl)d;
           if (dd.Var != null) {
             if (!DetectUnderspecificationVisitor.IsDetermined(dd.BasePreType)) {
-              ReportError(dd, "newtype's base type is not fully determined; add an explicit type for '{0}'", dd.Var.Name);
+              ReportError(dd, $"base type of {dd.WhatKindAndName} is not fully determined; add an explicit type for bound variable '{dd.Var.Name}'");
             }
-            CheckExpression(dd.Constraint, new CodeContextWrapper(dd, true));
+            CheckExpression(dd.Constraint, context);
             if (dd.Witness != null) {
-              CheckExpression(dd.Witness, new CodeContextWrapper(dd, dd.WitnessKind == SubsetTypeDecl.WKind.Ghost));
+              CheckExpression(dd.Witness, context);
             }
           }
           CheckMembers(dd);
@@ -73,17 +79,16 @@ public void Check(List<TopLevelDecl> declarations) {
         } else if (d is DatatypeDecl) {
           var dd = (DatatypeDecl)d;
           foreach (var member in resolver.GetClassMembers(dd)!.Values) {
-            var dtor = member as DatatypeDestructor;
-            if (dtor != null) {
+            if (member is DatatypeDestructor dtor) {
               var rolemodel = dtor.CorrespondingFormals[0];
               for (int i = 1; i < dtor.CorrespondingFormals.Count; i++) {
                 var other = dtor.CorrespondingFormals[i];
                 if (!Type.Equal_Improved(rolemodel.Type, other.Type)) {
-                  ReportError(other.tok,
+                  ReportError(other.Origin,
                     "shared destructors must have the same type, but '{0}' has type '{1}' in constructor '{2}' and type '{3}' in constructor '{4}'",
                     rolemodel.Name, rolemodel.Type, dtor.EnclosingCtors[0].Name, other.Type, dtor.EnclosingCtors[i].Name);
                 } else if (rolemodel.IsGhost != other.IsGhost) {
-                  ReportError(other.tok,
+                  ReportError(other.Origin,
                     "shared destructors must agree on whether or not they are ghost, but '{0}' is {1} in constructor '{2}' and {3} in constructor '{4}'",
                     rolemodel.Name,
                     rolemodel.IsGhost ? "ghost" : "non-ghost", dtor.EnclosingCtors[0].Name,
@@ -93,7 +98,8 @@ public void Check(List<TopLevelDecl> declarations) {
             }
           }
           foreach (var ctor in dd.Ctors) {
-            CheckParameterDefaultValues(ctor.Formals, dd);
+            CheckAttributes(ctor.Attributes, new UnderspecificationDetectorContext(ctor));
+            CheckParameterDefaultValues(ctor.Formals, new UnderspecificationDetectorContext(ctor));
           }
           CheckMembers(dd);
 
@@ -106,132 +112,142 @@ public void Check(List<TopLevelDecl> declarations) {
     private void CheckMembers(TopLevelDeclWithMembers cl) {
       Contract.Requires(cl != null);
       foreach (var member in cl.Members) {
-        var prevErrCnt = ErrorCount;
         CheckMember(member);
-        if (prevErrCnt == ErrorCount) {
-          if (member is Method method) {
-            if (method.Body != null) {
-              CheckStatement(method.Body, method);
-            }
-          } else if (member is Function function) {
-            if (function.ByMethodBody != null) {
-              var m = function.ByMethodDecl;
-              CheckStatement(m.Body, m);
-            }
-          }
-          if (prevErrCnt == ErrorCount && member is ICodeContext) {
-            member.SubExpressions.ForEach(e => CheckExpression(e, (ICodeContext)member));
-          }
-        }
       }
     }
 
+    /// <summary>
+    /// Check that all pre-types of "member" have been filled in, and fill in all .ResolvedOp field.
+    /// In addition, if "member" is an extreme predicate or extreme lemma, also do the checking for the corresponding
+    /// prefix predicate or lemma. And, if "member" is a function by method, then also check the associated method.
+    /// </summary>
     private void CheckMember(MemberDecl member) {
+      var context = new UnderspecificationDetectorContext(member);
+      CheckAttributes(member.Attributes, context);
+
+      var errorCount = ErrorCount;
       if (member is ConstantField field) {
         if (field.Rhs != null) {
-          CheckExpression(field.Rhs, new NoContext(member.EnclosingClass.EnclosingModuleDefinition));
+          CheckExpression(field.Rhs, context);
         }
-        CheckPreType(field.PreType, new NoContext(member.EnclosingClass.EnclosingModuleDefinition), field.tok, "const");
+        CheckPreType(field.PreType, context, field.Origin, "const");
 
       } else if (member is Method method) {
-        CheckParameterDefaultValues(method.Ins, method);
-        method.Req.ForEach(mfe => CheckAttributedExpression(mfe, method));
-        CheckSpecFrameExpression(method.Mod, method);
-        method.Ens.ForEach(mfe => CheckAttributedExpression(mfe, method));
-        CheckSpecExpression(method.Decreases, method);
+        CheckParameterDefaultValues(method.Ins, context);
+        method.Req.ForEach(mfe => CheckAttributedExpression(mfe, context));
+        CheckSpecFrameExpression(method.Reads, context);
+        CheckSpecFrameExpression(method.Mod, context);
+        method.Ens.ForEach(mfe => CheckAttributedExpression(mfe, context));
+        CheckSpecExpression(method.Decreases, context);
         if (method.Body != null) {
-          CheckStatement(method.Body, method);
+          CheckStatement(method.Body, context);
+        }
+        if (errorCount == ErrorCount) {
+          if (method is ExtremeLemma { PrefixLemma: { } prefixLemma }) {
+            CheckMember(prefixLemma);
+          }
         }
 
-      } else if (member is Function) {
-        var f = (Function)member;
-        CheckParameterDefaultValues(f.Formals, f);
-        var errorCount = ErrorCount;
-        f.Req.ForEach(e => CheckExpression(e.E, f));
-        f.Ens.ForEach(e => CheckExpression(e.E, f));
-        f.Reads.ForEach(fe => CheckExpression(fe.E, f));
-        CheckSpecExpression(f.Decreases, f);
-        if (f.Body != null) {
-          CheckExpression(f.Body, f);
+      } else if (member is Function function) {
+        CheckParameterDefaultValues(function.Ins, context);
+        function.Req.ForEach(e => CheckExpression(e.E, context));
+        function.Ens.ForEach(e => CheckExpression(e.E, context));
+        CheckSpecFrameExpression(function.Reads, context);
+        CheckSpecExpression(function.Decreases, context);
+        if (function.Body != null) {
+          CheckExpression(function.Body, context);
         }
         if (errorCount == ErrorCount) {
-          if (f is ExtremePredicate cop) {
-            CheckMember(cop.PrefixPredicate);
-          } else if (f.ByMethodDecl != null) {
-            CheckMember(f.ByMethodDecl);
+          if (function is ExtremePredicate { PrefixPredicate: { } prefixPredicate }) {
+            CheckMember(prefixPredicate);
+          } else if (function.ByMethodDecl != null) {
+            CheckMember(function.ByMethodDecl);
           }
         }
       }
     }
 
-    private void CheckPreType(PreType preType, ICodeContext codeContext, IToken tok, string whatIsBeingChecked) {
-      var visitor = new DetectUnderspecificationVisitor(this, codeContext);
+    private void CheckPreType(PreType preType, UnderspecificationDetectorContext context, IOrigin tok, string whatIsBeingChecked) {
+      var visitor = new DetectUnderspecificationVisitor(this, context);
       visitor.CheckPreTypeIsDetermined(tok, preType, whatIsBeingChecked);
     }
 
-    private void CheckStatement(Statement stmt, ICodeContext codeContext) {
+    private void CheckStatement(Statement stmt, UnderspecificationDetectorContext context) {
       Contract.Requires(stmt != null);
-      var visitor = new DetectUnderspecificationVisitor(this, codeContext);
+      var visitor = new DetectUnderspecificationVisitor(this, context);
       visitor.Visit(stmt);
     }
 
-    private void CheckExpression(Expression expr, ICodeContext codeContext) {
+    private void CheckExpression(Expression expr, UnderspecificationDetectorContext context) {
       Contract.Requires(expr != null);
-      var visitor = new DetectUnderspecificationVisitor(this, codeContext);
+      var visitor = new DetectUnderspecificationVisitor(this, context);
       visitor.Visit(expr);
     }
 
-    private void CheckSpecExpression(Specification<Expression> spec, ICodeContext codeContext) {
-      Attributes.SubExpressions(spec.Attributes).ForEach(e => CheckExpression(e, codeContext));
-      spec.Expressions.ForEach(e => CheckExpression(e, codeContext));
+    private void CheckSpecExpression(Specification<Expression> spec, UnderspecificationDetectorContext context) {
+      CheckAttributes(spec.Attributes, context);
+      spec.Expressions.ForEach(e => CheckExpression(e, context));
+    }
+
+    private void CheckSpecFrameExpression(Specification<FrameExpression> spec, UnderspecificationDetectorContext context) {
+      CheckAttributes(spec.Attributes, context);
+      spec.Expressions.ForEach(fe => CheckExpression(fe.E, context));
     }
 
-    private void CheckSpecFrameExpression(Specification<FrameExpression> spec, ICodeContext codeContext) {
-      Attributes.SubExpressions(spec.Attributes).ForEach(e => CheckExpression(e, codeContext));
-      spec.Expressions.ForEach(fe => CheckExpression(fe.E, codeContext));
+    private void CheckAttributedExpression(AttributedExpression ae, UnderspecificationDetectorContext context) {
+      CheckAttributes(ae.Attributes, context);
+      CheckExpression(ae.E, context);
     }
 
-    private void CheckAttributedExpression(AttributedExpression ae, ICodeContext codeContext) {
-      Attributes.SubExpressions(ae.Attributes).ForEach(e => CheckExpression(e, codeContext));
-      CheckExpression(ae.E, codeContext);
+    private void CheckAttributes(Attributes attributes, UnderspecificationDetectorContext context) {
+      Attributes.SubExpressions(attributes).ForEach(e => CheckExpression(e, context));
     }
 
-    private void CheckParameterDefaultValues(List<Formal> formals, ICodeContext codeContext) {
+    private void CheckParameterDefaultValues(List<Formal> formals, UnderspecificationDetectorContext context) {
       foreach (var formal in formals) {
         if (formal.DefaultValue != null) {
-          CheckExpression(formal.DefaultValue, codeContext);
+          CheckExpression(formal.DefaultValue, context);
         }
       }
     }
   }
 
+  public class UnderspecificationDetectorContext {
+    private Declaration declaration;
+    public bool IsExtremePredicate => declaration is ExtremePredicate;
+    public bool IsExtremeLemma => declaration is ExtremeLemma;
+    public UnderspecificationDetectorContext(Declaration declaration) {
+      this.declaration = declaration;
+    }
+  }
+
   public class DetectUnderspecificationVisitor : BottomUpVisitor {
     private readonly UnderspecificationDetector cus;
-    private readonly ICodeContext codeContext;
+    private readonly UnderspecificationDetectorContext context;
 
-    public DetectUnderspecificationVisitor(UnderspecificationDetector cus, ICodeContext codeContext) {
+    public DetectUnderspecificationVisitor(UnderspecificationDetector cus, UnderspecificationDetectorContext context) {
       Contract.Requires(cus != null);
-      Contract.Requires(codeContext != null);
+      Contract.Requires(context != null);
       this.cus = cus;
-      this.codeContext = codeContext;
+      this.context = context;
     }
 
     protected override void VisitOneStmt(Statement stmt) {
       if (stmt is VarDeclStmt) {
         var s = (VarDeclStmt)stmt;
         foreach (var local in s.Locals) {
-          CheckPreTypeIsDetermined(local.Tok, local.PreType, "local variable");
-          CheckTypeArgsContainNoOrdinal(local.Tok, local.PreType);
+          CheckPreTypeIsDetermined(local.Origin, local.PreType, "local variable");
+          CheckTypeArgsContainNoOrdinal(local.Origin, local.PreType);
         }
       } else if (stmt is VarDeclPattern) {
         var s = (VarDeclPattern)stmt;
-        s.LocalVars.ForEach(local => CheckPreTypeIsDetermined(local.Tok, local.PreType, "local variable"));
-        s.LocalVars.ForEach(local => CheckTypeArgsContainNoOrdinal(local.Tok, local.PreType));
+        s.LocalVars.ForEach(local => CheckPreTypeIsDetermined(local.Origin, local.PreType, "local variable"));
+        s.LocalVars.ForEach(local => CheckTypeArgsContainNoOrdinal(local.Origin, local.PreType));
 
       } else if (stmt is ForallStmt) {
         var s = (ForallStmt)stmt;
-        s.BoundVars.ForEach(bv => CheckPreTypeIsDetermined(bv.tok, bv.PreType, "bound variable"));
-        s.BoundVars.ForEach(bv => CheckTypeArgsContainNoOrdinal(bv.tok, bv.PreType));
+        s.BoundVars.ForEach(bv => CheckPreTypeIsDetermined(bv.Origin, bv.PreType, "bound variable"));
+        s.BoundVars.ForEach(bv => CheckTypeArgsContainNoOrdinal(bv.Origin, bv.PreType));
 
       } else if (stmt is AssignSuchThatStmt) {
         var s = (AssignSuchThatStmt)stmt;
@@ -243,7 +259,7 @@ protected override void VisitOneStmt(Statement stmt) {
           }
         }
         foreach (var lhs in s.Lhss) {
-          CheckTypeArgsContainNoOrdinal(lhs.tok, lhs.PreType);
+          CheckTypeArgsContainNoOrdinal(lhs.Origin, lhs.PreType);
         }
 
       } else if (stmt is CalcStmt) {
@@ -259,35 +275,40 @@ protected override void VisitOneStmt(Statement stmt) {
     }
 
     protected override void VisitOneExpr(Expression expr) {
+      if (expr is DefaultValueExpression) {
+        // skip this during underspecification detection, since it has yet to be filled in
+        return;
+      }
+
       var familyDeclName = PreTypeResolver.AncestorName(expr.PreType);
 
       if (expr is LiteralExpr) {
         var e = (LiteralExpr)expr;
-        if (PreTypeResolver.IsBitvectorName(familyDeclName) || familyDeclName == "ORDINAL") {
+        if (PreTypeResolver.IsBitvectorName(familyDeclName) || familyDeclName == PreType.TypeNameORDINAL) {
           var n = (BigInteger)e.Value;
           var absN = n < 0 ? -n : n;
           // For bitvectors, check that the magnitude fits the width
-          if (PreTypeResolver.IsBitvectorName(familyDeclName, out var width) && ModuleResolver.MaxBV(width) < absN) {
-            cus.ReportError(e.tok, "literal ({0}) is too large for the bitvector type {1}", absN, e.PreType);
+          if (PreTypeResolver.IsBitvectorName(familyDeclName, out var width) && ConstantFolder.MaxBv(width) < absN) {
+            cus.ReportError(e.Origin, "literal ({0}) is too large for the bitvector type {1}", absN, e.PreType);
           }
           // For bitvectors and ORDINALs, check for a unary minus that, earlier, was mistaken for a negative literal
           // This can happen only in `match` patterns (see comment by LitPattern.OptimisticallyDesugaredLit).
-          if (n < 0 || e.tok.val == "-0") {
-            Contract.Assert(e.tok.val == "-0");  // this and the "if" above tests that "n < 0" happens only when the token is "-0"
-            cus.ReportError(e.tok, "unary minus (-{0}, type {1}) not allowed in case pattern", absN, e.PreType);
+          if (n < 0 || e.Origin.val == "-0") {
+            Contract.Assert(e.Origin.val == "-0");  // this and the "if" above tests that "n < 0" happens only when the token is "-0"
+            cus.ReportError(e.Origin, "unary minus (-{0}, type {1}) not allowed in case pattern", absN, e.PreType);
           }
         }
 
         if (expr is StaticReceiverExpr stexpr) {
-          CheckPreTypeIsDetermined(stexpr.tok, stexpr.PreType, "static receiver");
+          CheckPreTypeIsDetermined(stexpr.Origin, stexpr.PreType, "static receiver");
         }
 
       } else if (expr is ComprehensionExpr) {
         var e = (ComprehensionExpr)expr;
         foreach (var bv in e.BoundVars) {
           CheckVariable(bv, "bound variable");
-          if (codeContext is ExtremePredicate || codeContext is ExtremeLemma) {
-            CheckContainsNoOrdinal(bv.tok, bv.PreType, string.Format("type of bound variable '{0}' ('{1}') is not allowed to use type ORDINAL", bv.Name, bv.PreType));
+          if (context.IsExtremePredicate || context.IsExtremeLemma) {
+            CheckContainsNoOrdinal(bv.Origin, bv.PreType, $"type of bound variable '{bv.Name}' ('{bv.PreType}') is not allowed to use type ORDINAL");
           }
         }
 
@@ -295,15 +316,15 @@ protected override void VisitOneExpr(Expression expr) {
         var e = (MemberSelectExpr)expr;
         if (e.Member is Function || e.Member is Method) {
           var i = 0;
-          foreach (var p in Util.Concat(e.PreTypeApplication_AtEnclosingClass, e.PreTypeApplication_JustMember)) {
+          foreach (var p in Util.Concat(e.PreTypeApplicationAtEnclosingClass, e.PreTypeApplicationJustMember)) {
             var tp =
-              i < e.PreTypeApplication_AtEnclosingClass.Count
+              i < e.PreTypeApplicationAtEnclosingClass.Count
                 ? e.Member.EnclosingClass.TypeArgs[i]
-                : ((ICallable)e.Member).TypeArgs[i - e.PreTypeApplication_AtEnclosingClass.Count];
+                : ((ICallable)e.Member).TypeArgs[i - e.PreTypeApplicationAtEnclosingClass.Count];
             if (!IsDetermined(p)) {
-              cus.ReportError(e.tok, $"type parameter '{tp.Name}' (inferred to be '{p}') to the {e.Member.WhatKind} '{e.Member.Name}' could not be determined");
+              cus.ReportError(e.Origin, $"type parameter '{tp.Name}' (inferred to be '{p}') to the {e.Member.WhatKind} '{e.Member.Name}' could not be determined");
             } else {
-              CheckContainsNoOrdinal(e.tok, p, $"type parameter '{tp.Name}' (passed in as '{p}') to the {e.Member.WhatKind} '{e.Member.Name}' is not allowed to use ORDINAL");
+              CheckContainsNoOrdinal(e.Origin, p, $"type parameter '{tp.Name}' (passed in as '{p}') to the {e.Member.WhatKind} '{e.Member.Name}' is not allowed to use ORDINAL");
             }
             i++;
           }
@@ -318,10 +339,10 @@ protected override void VisitOneExpr(Expression expr) {
               ? e.Function.EnclosingClass.TypeArgs[i]
               : e.Function.TypeArgs[i - e.PreTypeApplication_AtEnclosingClass.Count];
           if (!IsDetermined(p)) {
-            var hint = e.Name.StartsWith("reveal_") ? ". If you are making an opaque function, make sure that the function can be called." : "";
-            cus.ReportError(e.tok, $"type parameter '{tp.Name}' (inferred to be '{p}') in the function call to '{e.Name}' could not be determined{hint}");
+            var hint = e.Name.StartsWith(HideRevealStmt.RevealLemmaPrefix) ? ". If you are making an opaque function, make sure that the function can be called." : "";
+            cus.ReportError(e.Origin, $"type parameter '{tp.Name}' (inferred to be '{p}') in the function call to '{e.Name}' could not be determined{hint}");
           } else {
-            CheckContainsNoOrdinal(e.tok, p, $"type parameter '{tp.Name}' (passed in as '{p}') to function call '{e.Name}' is not allowed to use ORDINAL");
+            CheckContainsNoOrdinal(e.Origin, p, $"type parameter '{tp.Name}' (passed in as '{p}') to function call '{e.Name}' is not allowed to use ORDINAL");
           }
           i++;
         }
@@ -331,30 +352,22 @@ protected override void VisitOneExpr(Expression expr) {
         foreach (var lhsPattern in e.LHSs) {
           foreach (var bv in lhsPattern.Vars) {
             CheckVariable(bv, "bound variable");
-            CheckTypeArgsContainNoOrdinal(bv.tok, bv.PreType);
+            CheckTypeArgsContainNoOrdinal(bv.Origin, bv.PreType);
           }
         }
 
       } else if (expr is IdentifierExpr) {
         // by specializing for IdentifierExpr, error messages will be clearer
-        CheckPreTypeIsDetermined(expr.tok, expr.PreType, "variable");
-
-      } else if (expr is ConversionExpr) {
-        var e = (ConversionExpr)expr;
-        CheckPreTypeIsDetermined(e.tok, e.PreType, "cast target");
-
-      } else if (expr is TypeTestExpr) {
-        var e = (TypeTestExpr)expr;
-        CheckPreTypeIsDetermined(e.tok, e.PreType, "type test target");
+        CheckPreTypeIsDetermined(expr.Origin, expr.PreType, "variable");
 
-      } else if (CheckPreTypeIsDetermined(expr.tok, expr.PreType, "expression")) {
+      } else if (CheckPreTypeIsDetermined(expr.Origin, expr.PreType, "expression")) {
         if (expr is UnaryOpExpr uop) {
           var resolvedOp = (uop.Op, PreTypeResolver.AncestorName(uop.E.PreType)) switch {
-            (UnaryOpExpr.Opcode.Not, "bool") => UnaryOpExpr.ResolvedOpcode.BoolNot,
-            (UnaryOpExpr.Opcode.Cardinality, "set") => UnaryOpExpr.ResolvedOpcode.SetCard,
-            (UnaryOpExpr.Opcode.Cardinality, "seq") => UnaryOpExpr.ResolvedOpcode.SeqLength,
-            (UnaryOpExpr.Opcode.Cardinality, "multiset") => UnaryOpExpr.ResolvedOpcode.MultiSetCard,
-            (UnaryOpExpr.Opcode.Cardinality, "map") => UnaryOpExpr.ResolvedOpcode.MapCard,
+            (UnaryOpExpr.Opcode.Not, PreType.TypeNameBool) => UnaryOpExpr.ResolvedOpcode.BoolNot,
+            (UnaryOpExpr.Opcode.Cardinality, PreType.TypeNameSet) => UnaryOpExpr.ResolvedOpcode.SetCard,
+            (UnaryOpExpr.Opcode.Cardinality, PreType.TypeNameSeq) => UnaryOpExpr.ResolvedOpcode.SeqLength,
+            (UnaryOpExpr.Opcode.Cardinality, PreType.TypeNameMultiset) => UnaryOpExpr.ResolvedOpcode.MultiSetCard,
+            (UnaryOpExpr.Opcode.Cardinality, PreType.TypeNameMap) => UnaryOpExpr.ResolvedOpcode.MapCard,
             (UnaryOpExpr.Opcode.Fresh, _) => UnaryOpExpr.ResolvedOpcode.Fresh,
             (UnaryOpExpr.Opcode.Allocated, _) => UnaryOpExpr.ResolvedOpcode.Allocated,
             (UnaryOpExpr.Opcode.Lit, _) => UnaryOpExpr.ResolvedOpcode.Lit,
@@ -396,40 +409,40 @@ static BinaryExpr.ResolvedOpcode ResolveOp(BinaryExpr.Opcode op, PreType leftOpe
           return BinaryExpr.ResolvedOpcode.Or;
         case BinaryExpr.Opcode.Eq:
           return operandFamilyName switch {
-            "set" or "iset" => BinaryExpr.ResolvedOpcode.SetEq,
-            "multiset" => BinaryExpr.ResolvedOpcode.MultiSetEq,
-            "seq" => BinaryExpr.ResolvedOpcode.SeqEq,
-            "map" or "imap" => BinaryExpr.ResolvedOpcode.MapEq,
+            PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.SetEq,
+            PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.MultiSetEq,
+            PreType.TypeNameSeq => BinaryExpr.ResolvedOpcode.SeqEq,
+            PreType.TypeNameMap or PreType.TypeNameImap => BinaryExpr.ResolvedOpcode.MapEq,
             _ => BinaryExpr.ResolvedOpcode.EqCommon
           };
         case BinaryExpr.Opcode.Neq:
           return operandFamilyName switch {
-            "set" or "iset" => BinaryExpr.ResolvedOpcode.SetNeq,
-            "multiset" => BinaryExpr.ResolvedOpcode.MultiSetNeq,
-            "seq" => BinaryExpr.ResolvedOpcode.SeqNeq,
-            "map" or "imap" => BinaryExpr.ResolvedOpcode.MapNeq,
+            PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.SetNeq,
+            PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.MultiSetNeq,
+            PreType.TypeNameSeq => BinaryExpr.ResolvedOpcode.SeqNeq,
+            PreType.TypeNameMap or PreType.TypeNameImap => BinaryExpr.ResolvedOpcode.MapNeq,
             _ => BinaryExpr.ResolvedOpcode.NeqCommon
           };
         case BinaryExpr.Opcode.Disjoint:
-          return operandFamilyName == "multiset" ? BinaryExpr.ResolvedOpcode.MultiSetDisjoint : BinaryExpr.ResolvedOpcode.Disjoint;
+          return operandFamilyName == PreType.TypeNameMultiset ? BinaryExpr.ResolvedOpcode.MultiSetDisjoint : BinaryExpr.ResolvedOpcode.Disjoint;
         case BinaryExpr.Opcode.Lt: {
-            if (operandPreType is DPreType dp && PreTypeResolver.AncestorDecl(dp.Decl) is IndDatatypeDecl) {
+            if (operandPreType is DPreType dp && PreTypeResolver.AncestorPreType(dp)?.Decl is IndDatatypeDecl) {
               return BinaryExpr.ResolvedOpcode.RankLt;
             }
             return operandFamilyName switch {
-              "set" or "iset" => BinaryExpr.ResolvedOpcode.ProperSubset,
-              "multiset" => BinaryExpr.ResolvedOpcode.ProperMultiSubset,
-              "seq" => BinaryExpr.ResolvedOpcode.ProperPrefix,
-              "char" => BinaryExpr.ResolvedOpcode.LtChar,
+              PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.ProperSubset,
+              PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.ProperMultiSubset,
+              PreType.TypeNameSeq => BinaryExpr.ResolvedOpcode.ProperPrefix,
+              PreType.TypeNameChar => BinaryExpr.ResolvedOpcode.LtChar,
               _ => BinaryExpr.ResolvedOpcode.Lt
             };
           }
         case BinaryExpr.Opcode.Le:
           return operandFamilyName switch {
-            "set" or "iset" => BinaryExpr.ResolvedOpcode.Subset,
-            "multiset" => BinaryExpr.ResolvedOpcode.MultiSubset,
-            "seq" => BinaryExpr.ResolvedOpcode.Prefix,
-            "char" => BinaryExpr.ResolvedOpcode.LeChar,
+            PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.Subset,
+            PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.MultiSubset,
+            PreType.TypeNameSeq => BinaryExpr.ResolvedOpcode.Prefix,
+            PreType.TypeNameChar => BinaryExpr.ResolvedOpcode.LeChar,
             _ => BinaryExpr.ResolvedOpcode.Le
           };
         case BinaryExpr.Opcode.LeftShift:
@@ -438,59 +451,59 @@ static BinaryExpr.ResolvedOpcode ResolveOp(BinaryExpr.Opcode op, PreType leftOpe
           return BinaryExpr.ResolvedOpcode.RightShift;
         case BinaryExpr.Opcode.Add:
           return operandFamilyName switch {
-            "set" or "iset" => BinaryExpr.ResolvedOpcode.Union,
-            "multiset" => BinaryExpr.ResolvedOpcode.MultiSetUnion,
-            "seq" => BinaryExpr.ResolvedOpcode.Concat,
-            "map" or "imap" => BinaryExpr.ResolvedOpcode.MapMerge,
+            PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.Union,
+            PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.MultiSetUnion,
+            PreType.TypeNameSeq => BinaryExpr.ResolvedOpcode.Concat,
+            PreType.TypeNameMap or PreType.TypeNameImap => BinaryExpr.ResolvedOpcode.MapMerge,
             _ => BinaryExpr.ResolvedOpcode.Add
           };
         case BinaryExpr.Opcode.Sub: {
             var leftFamilyName = PreTypeResolver.AncestorName(leftOperandPreType);
-            if (leftFamilyName == "map" || leftFamilyName == "imap") {
+            if (leftFamilyName is PreType.TypeNameMap or PreType.TypeNameImap) {
               return BinaryExpr.ResolvedOpcode.MapSubtraction;
             }
             return operandFamilyName switch {
-              "set" or "iset" => BinaryExpr.ResolvedOpcode.SetDifference,
-              "multiset" => BinaryExpr.ResolvedOpcode.MultiSetDifference,
+              PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.SetDifference,
+              PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.MultiSetDifference,
               _ => BinaryExpr.ResolvedOpcode.Sub
             };
           }
         case BinaryExpr.Opcode.Mul:
           return operandFamilyName switch {
-            "set" or "iset" => BinaryExpr.ResolvedOpcode.Intersection,
-            "multiset" => BinaryExpr.ResolvedOpcode.MultiSetIntersection,
+            PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.Intersection,
+            PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.MultiSetIntersection,
             _ => BinaryExpr.ResolvedOpcode.Mul
           };
         case BinaryExpr.Opcode.Gt: {
-            if (operandPreType is DPreType dp && PreTypeResolver.AncestorDecl(dp.Decl) is IndDatatypeDecl) {
+            if (operandPreType is DPreType dp && PreTypeResolver.AncestorPreType(dp)?.Decl is IndDatatypeDecl) {
               return BinaryExpr.ResolvedOpcode.RankGt;
             }
             return operandFamilyName switch {
-              "set" or "iset" => BinaryExpr.ResolvedOpcode.ProperSuperset,
-              "multiset" => BinaryExpr.ResolvedOpcode.ProperMultiSuperset,
-              "char" => BinaryExpr.ResolvedOpcode.GtChar,
+              PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.ProperSuperset,
+              PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.ProperMultiSuperset,
+              PreType.TypeNameChar => BinaryExpr.ResolvedOpcode.GtChar,
               _ => BinaryExpr.ResolvedOpcode.Gt
             };
           }
         case BinaryExpr.Opcode.Ge:
           return operandFamilyName switch {
-            "set" or "iset" => BinaryExpr.ResolvedOpcode.Superset,
-            "multiset" => BinaryExpr.ResolvedOpcode.MultiSuperset,
-            "char" => BinaryExpr.ResolvedOpcode.GeChar,
+            PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.Superset,
+            PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.MultiSuperset,
+            PreType.TypeNameChar => BinaryExpr.ResolvedOpcode.GeChar,
             _ => BinaryExpr.ResolvedOpcode.Ge
           };
         case BinaryExpr.Opcode.In:
           return operandFamilyName switch {
-            "set" or "iset" => BinaryExpr.ResolvedOpcode.InSet,
-            "multiset" => BinaryExpr.ResolvedOpcode.InMultiSet,
-            "map" or "imap" => BinaryExpr.ResolvedOpcode.InMap,
+            PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.InSet,
+            PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.InMultiSet,
+            PreType.TypeNameMap or PreType.TypeNameImap => BinaryExpr.ResolvedOpcode.InMap,
             _ => BinaryExpr.ResolvedOpcode.InSeq
           };
         case BinaryExpr.Opcode.NotIn:
           return operandFamilyName switch {
-            "set" or "iset" => BinaryExpr.ResolvedOpcode.NotInSet,
-            "multiset" => BinaryExpr.ResolvedOpcode.NotInMultiSet,
-            "map" or "imap" => BinaryExpr.ResolvedOpcode.NotInMap,
+            PreType.TypeNameSet or PreType.TypeNameIset => BinaryExpr.ResolvedOpcode.NotInSet,
+            PreType.TypeNameMultiset => BinaryExpr.ResolvedOpcode.NotInMultiSet,
+            PreType.TypeNameMap or PreType.TypeNameImap => BinaryExpr.ResolvedOpcode.NotInMap,
             _ => BinaryExpr.ResolvedOpcode.NotInSeq
           };
         case BinaryExpr.Opcode.Div:
@@ -511,7 +524,7 @@ static BinaryExpr.ResolvedOpcode ResolveOp(BinaryExpr.Opcode op, PreType leftOpe
 
     void CheckVariable(IVariable v, string whatIsBeingChecked) {
       if (!IsDetermined(v.PreType)) {
-        cus.ReportError(v.Tok, $"type of {whatIsBeingChecked} '{v.Name}' could not be determined{UndeterminedPreTypeToString(v.PreType)}; please specify the type explicitly");
+        cus.ReportError(v.Origin, $"type of {whatIsBeingChecked} '{v.Name}' could not be determined{UndeterminedPreTypeToString(v.PreType)}; please specify the type explicitly");
       }
     }
 
@@ -542,7 +555,7 @@ public static bool IsDetermined(PreType pt) {
     /// Check if "pt" is fully determined. If it is, return "true". If it is not, then
     /// report an error and return "false".
     /// </summary>
-    public bool CheckPreTypeIsDetermined(IToken tok, PreType pt, string whatIsBeingChecked, PreType origPreType = null) {
+    public bool CheckPreTypeIsDetermined(IOrigin tok, PreType pt, string whatIsBeingChecked, PreType origPreType = null) {
       Contract.Requires(tok != null);
       Contract.Requires(pt != null);
       Contract.Requires(whatIsBeingChecked != null);
@@ -566,7 +579,7 @@ public bool CheckPreTypeIsDetermined(IToken tok, PreType pt, string whatIsBeingC
       return dp.Arguments.TrueForAll(tt => CheckPreTypeIsDetermined(tok, tt, whatIsBeingChecked, origPreType));
     }
 
-    public void CheckTypeArgsContainNoOrdinal(IToken tok, PreType preType) {
+    public void CheckTypeArgsContainNoOrdinal(IOrigin tok, PreType preType) {
       Contract.Requires(tok != null);
       Contract.Requires(preType != null);
       if (preType.Normalize() is DPreType dp) {
@@ -574,12 +587,12 @@ public void CheckTypeArgsContainNoOrdinal(IToken tok, PreType preType) {
       }
     }
 
-    public void CheckContainsNoOrdinal(IToken tok, PreType preType, string errMsg) {
+    public void CheckContainsNoOrdinal(IOrigin tok, PreType preType, string errMsg) {
       Contract.Requires(tok != null);
       Contract.Requires(preType != null);
       Contract.Requires(errMsg != null);
       if (preType.Normalize() is DPreType dp) {
-        if (PreTypeResolver.AncestorName(dp) == "ORDINAL") {
+        if (PreTypeResolver.AncestorName(dp) == PreType.TypeNameORDINAL) {
           cus.ReportError(tok, errMsg);
         }
         dp.Arguments.ForEach(tt => CheckContainsNoOrdinal(tok, tt, errMsg));
diff --git a/Source/DafnyCore/Resolver/ProgramResolver.cs b/Source/DafnyCore/Resolver/ProgramResolver.cs
index eebc6949b4b..5132d29b5db 100644
--- a/Source/DafnyCore/Resolver/ProgramResolver.cs
+++ b/Source/DafnyCore/Resolver/ProgramResolver.cs
@@ -3,8 +3,10 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Dafny.Compilers;
 
-namespace Microsoft.Dafny; 
+namespace Microsoft.Dafny;
 
 public class ProgramResolver {
   public Program Program { get; }
@@ -27,7 +29,7 @@ public Dictionary<string, MemberDecl> GetClassMembers(TopLevelDeclWithMembers ke
     return null;
   }
 
-  public virtual void Resolve(CancellationToken cancellationToken) {
+  public virtual Task Resolve(CancellationToken cancellationToken) {
     Type.ResetScopes();
 
     Type.EnableScopes();
@@ -42,7 +44,7 @@ public virtual void Resolve(CancellationToken cancellationToken) {
     ComputeModuleDependencyGraph(Program, out var moduleDeclarationPointers);
 
     if (Reporter.ErrorCount != startingErrorCount) {
-      return;
+      return Task.CompletedTask;
     }
 
     var sortedDecls = dependencies.TopologicallySortedComponents();
@@ -55,8 +57,10 @@ public virtual void Resolve(CancellationToken cancellationToken) {
       classMembers[moduleClassMembers.Key] = moduleClassMembers.Value;
     }
 
+    var rewriters = RewriterCollection.GetRewriters(Reporter, Program);
+
     var compilation = Program.Compilation;
-    foreach (var rewriter in compilation.Rewriters) {
+    foreach (var rewriter in rewriters) {
       cancellationToken.ThrowIfCancellationRequested();
       rewriter.PreResolve(Program);
     }
@@ -68,17 +72,19 @@ public virtual void Resolve(CancellationToken cancellationToken) {
     }
 
     if (Reporter.ErrorCount != startingErrorCount) {
-      return;
+      return Task.CompletedTask;
     }
 
     Type.DisableScopes();
 
+    InstantiateReplaceableModules(Program);
     CheckDuplicateModuleNames(Program);
 
-    foreach (var rewriter in compilation.Rewriters) {
+    foreach (var rewriter in rewriters) {
       cancellationToken.ThrowIfCancellationRequested();
       rewriter.PostResolve(Program);
     }
+    return Task.CompletedTask;
   }
 
   public void AddSystemClass(TopLevelDeclWithMembers topLevelDeclWithMembers, Dictionary<string, MemberDecl> memberDictionary) {
@@ -126,14 +132,14 @@ private void ComputeModuleDependencyGraph(Program program, out Dictionary<Module
 
     // check for cycles in the import graph
     foreach (var cycle in dependencies.AllCycles()) {
-      ModuleResolver.ReportCycleError(Reporter, cycle, m => m.tok,
+      ModuleResolver.ReportCycleError(Reporter, cycle, m => m.Origin,
         m => (m is AliasModuleDecl ? "import " : "module ") + m.Name,
         "module definition contains a cycle (note: parent modules implicitly depend on submodules)");
     }
   }
 
   protected virtual Dictionary<TopLevelDeclWithMembers, Dictionary<string, MemberDecl>> ResolveSystemModule(Program program) {
-    var systemModuleResolver = new ModuleResolver(this);
+    var systemModuleResolver = new ModuleResolver(this, Options);
 
     SystemModuleManager.systemNameInfo = SystemModuleManager.SystemModule.RegisterTopLevelDecls(systemModuleResolver, false);
     systemModuleResolver.moduleInfo = SystemModuleManager.systemNameInfo;
@@ -155,19 +161,19 @@ protected virtual Dictionary<TopLevelDeclWithMembers, Dictionary<string, MemberD
       var d = ((ClassLikeDecl)cl).NonNullTypeDecl;
       systemModuleResolver.allTypeParameters.PushMarker();
       systemModuleResolver.ResolveTypeParameters(d.TypeArgs, true, d);
-      systemModuleResolver.ResolveType(d.tok, d.Rhs, d, ResolveTypeOptionEnum.AllowPrefix, d.TypeArgs);
+      systemModuleResolver.ResolveType(d.Origin, d.Rhs, d, ResolveTypeOptionEnum.AllowPrefix, d.TypeArgs);
       systemModuleResolver.allTypeParameters.PopMarker();
     }
 
     systemModuleResolver.ResolveTopLevelDecls_Core(
       ModuleDefinition.AllDeclarationsAndNonNullTypeDecls(systemModuleClassesWithNonNullTypes).ToList(),
-      new Graph<IndDatatypeDecl>(), new Graph<CoDatatypeDecl>(), SystemModuleManager.SystemModule.Name);
+      new Graph<IndDatatypeDecl>(), new Graph<CoDatatypeDecl>(), SystemModuleManager.SystemModule.Name, false);
 
     return systemModuleResolver.moduleClassMembers;
   }
 
   protected virtual ModuleResolutionResult ResolveModuleDeclaration(CompilationData compilation, ModuleDecl decl) {
-    var moduleResolver = new ModuleResolver(this);
+    var moduleResolver = new ModuleResolver(this, decl.Options);
     return moduleResolver.ResolveModuleDeclaration(compilation, decl);
   }
 
@@ -183,7 +189,7 @@ private static void SetHeights(IEnumerable<ModuleDecl> sortedDecls) {
   }
 
   /// <summary>
-  /// Check that now two modules that are being compiled have the same CompileName.
+  /// Check that no two modules that are being compiled have the same CompileName.
   ///
   /// This could happen if they are given the same name using the 'extern' declaration modifier.
   /// </summary>
@@ -192,24 +198,44 @@ private void CheckDuplicateModuleNames(Program program) {
     // Check that none of the modules have the same CompileName.
     Dictionary<string, ModuleDefinition> compileNameMap = new Dictionary<string, ModuleDefinition>();
     foreach (ModuleDefinition m in program.CompileModules) {
-      var compileIt = true;
-      Attributes.ContainsBool(m.Attributes, "compile", ref compileIt);
-      if (m.IsAbstract || !compileIt) {
+      if (!m.CanCompile() || !ShouldCompile(m)) {
         // the purpose of an abstract module is to skip compilation
         continue;
       }
 
       string compileName = m.GetCompileName(Options);
       if (compileNameMap.TryGetValue(compileName, out var priorModDef)) {
-        Reporter.Error(MessageSource.Resolver, m.tok,
+        Reporter.Error(MessageSource.Resolver, m.Origin,
           "modules '{0}' and '{1}' both have CompileName '{2}'",
-          priorModDef.tok.val, m.tok.val, compileName);
+          priorModDef.Origin.val, m.Origin.val, compileName);
       } else {
         compileNameMap.Add(compileName, m);
       }
     }
   }
 
+  public static bool ShouldCompile(IAttributeBearingDeclaration m) {
+    var compileIt = true;
+    Attributes.ContainsBool(m.Attributes, "compile", ref compileIt);
+    return compileIt;
+  }
+
+  protected void InstantiateReplaceableModules(Program dafnyProgram) {
+    foreach (var compiledModule in dafnyProgram.Modules().OrderByDescending(m => m.Height)) {
+      if (compiledModule.Implements is { Kind: ImplementationKind.Replacement }) {
+        var target = compiledModule.Implements.Target.Def;
+        var replacement = Program.Replacements.GetValueOrDefault(target);
+        if (replacement != null) {
+          Reporter!.Error(MessageSource.Resolver, new NestedOrigin(compiledModule.Origin, replacement.Origin,
+              $"other replacing module"),
+            "a replaceable module may only be replaced once");
+        } else {
+          Program.Replacements[target] = Program.Replacements.GetValueOrDefault(compiledModule, compiledModule);
+        }
+      }
+    }
+  }
+
   public static string ModuleNotFoundErrorMessage(int i, List<Name> path, string tail = "") {
     Contract.Requires(path != null);
     Contract.Requires(0 <= i && i < path.Count);
@@ -221,17 +247,18 @@ public static string ModuleNotFoundErrorMessage(int i, List<Name> path, string t
   private void ProcessDependenciesDefinition(LiteralModuleDecl literalDecl, ModuleBindings bindings,
     IDictionary<ModuleDecl, Action<ModuleDecl>> declarationPointers) {
     var module = literalDecl.ModuleDef;
-    if (module.RefinementQId != null) {
-      bool res = bindings.ResolveQualifiedModuleIdRootRefines(literalDecl.ModuleDef, module.RefinementQId, out var other);
-      module.RefinementQId.Root = other;
+    if (module.Implements != null) {
+      var refinementTarget = module.Implements.Target;
+      bool res = bindings.ResolveQualifiedModuleIdRootRefines(literalDecl.ModuleDef, refinementTarget, out var other);
+      refinementTarget.Root = other;
       if (!res) {
-        Reporter.Error(MessageSource.Resolver, module.RefinementQId.RootToken(),
-          $"module {module.RefinementQId} named as refinement base does not exist");
+        Reporter.Error(MessageSource.Resolver, refinementTarget.RootToken(),
+          $"module {module.Implements.Target} named as {module.Implements.Kind.ToString().ToLower()} base does not exist");
       } else {
-        declarationPointers.AddOrUpdate(other, v => module.RefinementQId.Root = v, Util.Concat);
+        declarationPointers.AddOrUpdate(other, v => refinementTarget.Root = v, Util.Concat);
         if (other is LiteralModuleDecl otherLiteral && otherLiteral.ModuleDef == module) {
-          Reporter.Error(MessageSource.Resolver, module.RefinementQId.RootToken(), "module cannot refine itself: {0}",
-            module.RefinementQId.ToString());
+          Reporter.Error(MessageSource.Resolver, refinementTarget.RootToken(), "module cannot refine itself: {0}",
+            module.Implements.Target.ToString());
         } else {
           Contract.Assert(other != null); // follows from postcondition of TryGetValue
           dependencies.AddEdge(literalDecl, other);
@@ -256,12 +283,17 @@ private void ProcessDependenciesDefinition(LiteralModuleDecl literalDecl, Module
         continue;
       }
 
-      dependencies.AddEdge(literalDecl, moduleDecl);
+      if (toplevel is ModuleExportDecl) {
+        dependencies.AddEdge(moduleDecl, literalDecl);
+      } else {
+        dependencies.AddEdge(literalDecl, moduleDecl);
+      }
+
       var subBindings = bindings.SubBindings(moduleDecl.Name);
       ProcessDependencies(moduleDecl, subBindings ?? bindings, declarationPointers);
-      if (!module.IsAbstract && moduleDecl is AbstractModuleDecl && ((AbstractModuleDecl)moduleDecl).QId.Root != null) {
-        Reporter.Error(MessageSource.Resolver, moduleDecl.tok,
-          "The abstract import named {0} (using :) may only be used in an abstract module declaration",
+      if (module.ModuleKind == ModuleKindEnum.Concrete && (moduleDecl as AbstractModuleDecl)?.QId.Root != null) {
+        Reporter.Error(MessageSource.Resolver, moduleDecl.Origin,
+          "The abstract import named {0} (using :) may only be used in an abstract or replaceable module declaration",
           moduleDecl.Name);
       }
     }
@@ -277,7 +309,7 @@ private void ProcessDependencies(ModuleDecl moduleDecl, ModuleBindings bindings,
       // each enclosing module.
       if (!bindings.ResolveQualifiedModuleIdRootImport(aliasDecl, aliasDecl.TargetQId, out var root)) {
         //        if (!bindings.TryLookupFilter(alias.TargetQId.rootToken(), out root, m => alias != m)
-        Reporter.Error(MessageSource.Resolver, aliasDecl.tok, ModuleNotFoundErrorMessage(0, aliasDecl.TargetQId.Path));
+        Reporter.Error(MessageSource.Resolver, aliasDecl.TargetQId.Origin, ModuleNotFoundErrorMessage(0, aliasDecl.TargetQId.Path));
       } else {
         aliasDecl.TargetQId.Root = root;
         declarationPointers.AddOrUpdate(root, v => aliasDecl.TargetQId.Root = v, Util.Concat);
@@ -287,7 +319,7 @@ private void ProcessDependencies(ModuleDecl moduleDecl, ModuleBindings bindings,
       if (!bindings.ResolveQualifiedModuleIdRootAbstract(abstractDecl, abstractDecl.QId, out var root)) {
         //if (!bindings.TryLookupFilter(abs.QId.rootToken(), out root,
         //  m => abs != m && (((abs.EnclosingModuleDefinition == m.EnclosingModuleDefinition) && (abs.Exports.Count == 0)) || m is LiteralModuleDecl)))
-        Reporter.Error(MessageSource.Resolver, abstractDecl.tok, ModuleNotFoundErrorMessage(0, abstractDecl.QId.Path));
+        Reporter.Error(MessageSource.Resolver, abstractDecl.Origin, ModuleNotFoundErrorMessage(0, abstractDecl.QId.Path));
       } else {
         abstractDecl.QId.Root = root;
         declarationPointers.AddOrUpdate(root, v => abstractDecl.QId.Root = v, Util.Concat);
diff --git a/Source/DafnyCore/Resolver/ResolutionContext.cs b/Source/DafnyCore/Resolver/ResolutionContext.cs
index 9a55e99999e..b9671cc3fc4 100644
--- a/Source/DafnyCore/Resolver/ResolutionContext.cs
+++ b/Source/DafnyCore/Resolver/ResolutionContext.cs
@@ -18,9 +18,9 @@ public ResolutionContext(ICodeContext codeContext, bool isTwoState)
   /// </summary>
   public static ResolutionContext FromCodeContext(ICodeContext codeContext) {
     bool isTwoState;
-    if (codeContext is NoContext || codeContext is DatatypeDecl || codeContext is ConstantField) {
+    if (codeContext is NoContext or DatatypeDecl or ConstantField) {
       isTwoState = false;
-    } else if (codeContext is Function && !(codeContext is TwoStateFunction)) {
+    } else if (codeContext is Function and not TwoStateFunction) {
       isTwoState = false;
     } else {
       isTwoState = true;
@@ -36,6 +36,6 @@ public ResolutionContext WithGhost(bool isGhost) {
     if (CodeContext.IsGhost == isGhost) {
       return this;
     }
-    return new ResolutionContext(new CodeContextWrapper(CodeContext, isGhost), IsTwoState, InOld, InReveal, InFunctionPostcondition, InFirstPhaseConstructor);
+    return this with { CodeContext = new CodeContextWrapper(CodeContext, isGhost) };
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Resolver/ResolutionErrors.cs b/Source/DafnyCore/Resolver/ResolutionErrors.cs
index 5c0eac59c62..084a2136259 100644
--- a/Source/DafnyCore/Resolver/ResolutionErrors.cs
+++ b/Source/DafnyCore/Resolver/ResolutionErrors.cs
@@ -10,6 +10,7 @@ public class ResolutionErrors {
   public enum ErrorId {
     // ReSharper disable once InconsistentNaming
     none,
+    r_assume_statement_without_axiom,
     r_ghost_var_only_in_specifications,
     r_only_in_specification,
     r_ghost_parameters_only_in_specification,
@@ -82,27 +83,39 @@ public enum ErrorId {
     r_assert_only_before_after,
     r_failure_methods_deprecated,
     r_member_only_assumes_other,
-    r_member_only_has_no_before_after
+    r_member_only_has_no_before_after,
+    r_empty_cyclic_datatype,
+    r_decreases_to_only_in_specification
   }
 
   static ResolutionErrors() {
+    Add(ErrorId.r_assume_statement_without_axiom,
+      @"
+".TrimStart(), InsertBefore("{:axiom}"));
     Add(ErrorId.r_assert_only_assumes_others,
     @"
 When annotating an assertion with the `{:only}` attribute, all other implicit and explicit assertions
 are transformed into assumptions. This is a way to focus on an assertion and its proof, but this annotation has to be removed once finished.
-This warning is a reminder about it.", Remove(true, "Finish focusing and remove {:only}"));
+This warning is a reminder about it.
+", Remove(true, "Finish focusing and remove {:only}"));
     Add(ErrorId.r_assert_only_before_after,
       @"
 The `{:only}` attribute accepts an optional argument ""after"" or ""before"" to indicate that the assertions afterwards
-(respectively before) should be transformed into assumptions.", Replace(@"""before""", "Replace with \"before\""));
+(respectively before) should be transformed into assumptions.
+", Replace("before", "Replace with \"before\""));
     Add(ErrorId.r_member_only_assumes_other,
       @"
 When annotating a member with the `{:only}` attribute, all other members of any declaration in the same file are not verified.
 This is a good way to focus on a method, a function or a lemma and its proof, but this annotation has to be removed once finished.
-This warning is a reminder about it.", Remove(true, "Finish focusing and remove {:only}"));
+This warning is a reminder about it.
+", Remove(true, "Finish focusing and remove {:only}"));
     Add(ErrorId.r_member_only_has_no_before_after,
         @"
-The `{:only}` attribute on members does not accept optional argument like ""after"" or ""before"" like the `{:only}` attribute on assertions can.",
+The `{:only}` attribute on members does not accept optional argument like ""after"" or ""before"" like the `{:only}` attribute on assertions can.
+",
         Remove(true, "Remove this unused argument"));
   }
+
+  public static void RunStaticConstructor() {
+  }
 }
diff --git a/Source/DafnyCore/Resolver/SubsetConstraintGhostChecker.cs b/Source/DafnyCore/Resolver/SubsetConstraintGhostChecker.cs
index 48d3d57cd2e..0af7075dfd2 100644
--- a/Source/DafnyCore/Resolver/SubsetConstraintGhostChecker.cs
+++ b/Source/DafnyCore/Resolver/SubsetConstraintGhostChecker.cs
@@ -7,15 +7,16 @@ namespace Microsoft.Dafny;
 /// check that the subset constraint is compilable. If it is not compilable, raises an error.
 /// </summary>
 public class SubsetConstraintGhostChecker : ProgramTraverser {
-  public class FirstErrorCollector : ErrorReporter {
+  private class FirstErrorCollector : ErrorReporter {
     public string FirstCollectedMessage = "";
-    public IToken FirstCollectedToken = Token.NoToken;
+    public IOrigin FirstCollectedToken = Token.NoToken;
     public bool Collected = false;
 
-    public bool Message(MessageSource source, ErrorLevel level, IToken tok, string msg) {
+    public bool Message(MessageSource source, ErrorLevel level, IOrigin tok, string msg) {
       return Message(source, level, ErrorRegistry.NoneId, tok, msg);
     }
-    public override bool Message(MessageSource source, ErrorLevel level, string errorId, IToken tok, string msg) {
+
+    protected override bool MessageCore(MessageSource source, ErrorLevel level, string errorId, IOrigin tok, string msg) {
       if (!Collected && level == ErrorLevel.Error) {
         FirstCollectedMessage = msg;
         FirstCollectedToken = tok;
@@ -64,7 +65,7 @@ private bool IsFieldSpecification(string field, object parent) {
     return field != null && parent != null && (
       (parent is Statement && field == "SpecificationSubExpressions") ||
       (parent is Function && (field is "Req.E" or "Reads.E" or "Ens.E" or "Decreases.Expressions")) ||
-      (parent is Method && (field is "Req.E" or "Mod.E" or "Ens.E" or "Decreases.Expressions"))
+      (parent is Method && (field is "Req.E" or "Reads.E" or "Mod.E" or "Ens.E" or "Decreases.Expressions"))
     );
   }
 
@@ -80,37 +81,25 @@ public override bool Traverse(Expression expr, [CanBeNull] string field, [CanBeN
       return base.Traverse(expr, field, parent);
     }
 
-    string what = e.WhatKind;
-
-    if (e is ForallExpr || e is ExistsExpr || e is SetComprehension || e is MapComprehension) {
+    if (e is QuantifierExpr or SetComprehension or MapComprehension) {
       foreach (var boundVar in e.BoundVars) {
-        if (boundVar.Type.AsSubsetType is
-        {
-          Constraint: var constraint,
-          ConstraintIsCompilable: false and var constraintIsCompilable
-        } and var subsetTypeDecl
-           ) {
-          if (!subsetTypeDecl.CheckedIfConstraintIsCompilable) {
-            // Builtin types were never resolved.
-            constraintIsCompilable =
-              ExpressionTester.CheckIsCompilable(reporter.Options, null, constraint, new CodeContextWrapper(subsetTypeDecl, true));
-            subsetTypeDecl.CheckedIfConstraintIsCompilable = true;
-            subsetTypeDecl.ConstraintIsCompilable = constraintIsCompilable;
-          }
+        if (boundVar.Type.NormalizeExpandKeepConstraints().AsRedirectingType is (SubsetTypeDecl or NewtypeDecl) and var declWithConstraints) {
+          if (!declWithConstraints.ConstraintIsCompilable) {
 
-          if (!constraintIsCompilable) {
-            IToken finalToken = boundVar.tok;
-            if (constraint.tok.line != 0) {
+            IOrigin finalToken = boundVar.Origin;
+            if (declWithConstraints.Constraint != null && declWithConstraints.Constraint.Origin.line != 0) {
               var errorCollector = new FirstErrorCollector(reporter.Options);
-              ExpressionTester.CheckIsCompilable(null, errorCollector, constraint, new CodeContextWrapper(subsetTypeDecl, true));
+              ExpressionTester.CheckIsCompilable(null, errorCollector, declWithConstraints.Constraint,
+                new CodeContextWrapper(declWithConstraints, true));
               if (errorCollector.Collected) {
-                finalToken = new NestedToken(finalToken, errorCollector.FirstCollectedToken,
+                finalToken = new NestedOrigin(finalToken, errorCollector.FirstCollectedToken,
                   "The constraint is not compilable because " + errorCollector.FirstCollectedMessage
                 );
               }
             }
             this.reporter.Error(MessageSource.Resolver, finalToken,
-              $"{boundVar.Type} is a subset type and its constraint is not compilable, hence it cannot yet be used as the type of a bound variable in {what}.");
+              $"{boundVar.Type} is a {declWithConstraints.WhatKind} and its constraint is not compilable, " +
+              $"hence it cannot yet be used as the type of a bound variable in {e.WhatKind}.");
           }
         }
       }
diff --git a/Source/DafnyCore/Resolver/TailRecursion.cs b/Source/DafnyCore/Resolver/TailRecursion.cs
index 8bcda781d25..d802bf794da 100644
--- a/Source/DafnyCore/Resolver/TailRecursion.cs
+++ b/Source/DafnyCore/Resolver/TailRecursion.cs
@@ -25,19 +25,19 @@ public void DetermineTailRecursion(Method m) {
     if (hasTailRecursionPreference && !tail) {
       // the user specifically requested no tail recursion, so do nothing else
     } else if (hasTailRecursionPreference && tail && m.IsGhost) {
-      reporter.Error(MessageSource.Resolver, m.tok, "tail recursion can be specified only for methods that will be compiled, not for ghost methods");
+      reporter.Error(MessageSource.Resolver, m.Origin, "tail recursion can be specified only for methods that will be compiled, not for ghost methods");
     } else {
       var module = m.EnclosingClass.EnclosingModuleDefinition;
       var sccSize = module.CallGraph.GetSCCSize(m);
       if (hasTailRecursionPreference && 2 <= sccSize) {
-        reporter.Error(MessageSource.Resolver, m.tok, "sorry, tail-call optimizations are not supported for mutually recursive methods");
+        reporter.Error(MessageSource.Resolver, m.Origin, "sorry, tail-call optimizations are not supported for mutually recursive methods");
       } else if (hasTailRecursionPreference || sccSize == 1) {
         Statement tailCall = null;
         var status = CheckTailRecursive(m.Body.Body, m, ref tailCall, hasTailRecursionPreference);
         if (status != TailRecursionStatus.NotTailRecursive && tailCall != null) {
           // this means there was at least one recursive call
           m.IsTailRecursive = true;
-          reporter.Info(MessageSource.Resolver, m.tok, "tail recursive");
+          reporter.Info(MessageSource.Resolver, m.Origin, "tail recursive");
         }
       }
     }
@@ -74,7 +74,7 @@ TailRecursionStatus CheckTailRecursive(List<Statement> stmts, Method enclosingMe
         if (status == TailRecursionStatus.TailCallSpent) {
           // a tail call cannot be followed by non-ghost code
           if (reportErrors) {
-            reporter.Error(MessageSource.Resolver, tailCall.Tok, "this recursive call is not recognized as being tail recursive, because it is followed by non-ghost code");
+            reporter.Error(MessageSource.Resolver, tailCall.Origin, "this recursive call is not recognized as being tail recursive, because it is followed by non-ghost code");
           }
           return TailRecursionStatus.NotTailRecursive;
         }
@@ -97,27 +97,27 @@ TailRecursionStatus CheckTailRecursive(Statement stmt, Method enclosingMethod, r
       return TailRecursionStatus.CanBeFollowedByAnything;
     }
     if (stmt is PrintStmt) {
-    } else if (stmt is RevealStmt) {
-    } else if (stmt is BreakStmt) {
+    } else if (stmt is HideRevealStmt) {
+    } else if (stmt is BreakOrContinueStmt) {
     } else if (stmt is ReturnStmt) {
       var s = (ReturnStmt)stmt;
       if (s.HiddenUpdate != null) {
         return CheckTailRecursive(s.HiddenUpdate, enclosingMethod, ref tailCall, reportErrors);
       }
-    } else if (stmt is AssignStmt) {
-      var s = (AssignStmt)stmt;
+    } else if (stmt is SingleAssignStmt) {
+      var s = (SingleAssignStmt)stmt;
       if (s.Rhs is TypeRhs tRhs && tRhs.InitCall != null && tRhs.InitCall.Method == enclosingMethod) {
         // It's a recursive call.  However, it is not a tail call, because after the "new" allocation
         // and init call have taken place, the newly allocated object has yet to be assigned to
         // the LHS of the assignment statement.
         if (reportErrors) {
-          reporter.Error(MessageSource.Resolver, tRhs.InitCall.Tok,
+          reporter.Error(MessageSource.Resolver, tRhs.InitCall.Origin,
             "the recursive call to '{0}' is not tail recursive, because the assignment of the LHS happens after the call",
             tRhs.InitCall.Method.Name);
         }
         return TailRecursionStatus.NotTailRecursive;
       } else if (s.Rhs is ExprRhs eRhs && eRhs.Expr.Resolved is FunctionCallExpr fce && fce.Function.ByMethodDecl == enclosingMethod) {
-        var status = ConfirmTailCall(s.Tok, enclosingMethod, fce.TypeApplication_JustFunction, new List<Expression>() { s.Lhs }, reportErrors);
+        var status = ConfirmTailCall(s.Origin, enclosingMethod, fce.TypeApplication_JustFunction, new List<Expression>() { s.Lhs }, reportErrors);
         if (status == TailRecursionStatus.TailCallSpent) {
           tailCall = s;
           fce.Args.ForEach(ee => DisallowRecursiveCallsInExpressions(ee, enclosingMethod));
@@ -136,7 +136,7 @@ TailRecursionStatus CheckTailRecursive(Statement stmt, Method enclosingMethod, r
       var s = (CallStmt)stmt;
       if (s.Method == enclosingMethod) {
         DisallowRecursiveCallsInExpressions(s, enclosingMethod, reportErrors);
-        var status = ConfirmTailCall(s.Tok, s.Method, s.MethodSelect.TypeApplication_JustMember, s.Lhs, reportErrors);
+        var status = ConfirmTailCall(s.Origin, s.Method, s.MethodSelect.TypeApplicationJustMember, s.Lhs, reportErrors);
         if (status == TailRecursionStatus.TailCallSpent) {
           tailCall = s;
         }
@@ -187,7 +187,7 @@ TailRecursionStatus CheckTailRecursive(Statement stmt, Method enclosingMethod, r
         if (status == TailRecursionStatus.NotTailRecursive) {
           // an error has already been reported
         } else if (reportErrors) {
-          reporter.Error(MessageSource.Resolver, tailCall.Tok, "a recursive call inside a loop is not recognized as being a tail call");
+          reporter.Error(MessageSource.Resolver, tailCall.Origin, "a recursive call inside a loop is not recognized as being a tail call");
         }
         return TailRecursionStatus.NotTailRecursive;
       }
@@ -200,7 +200,7 @@ TailRecursionStatus CheckTailRecursive(Statement stmt, Method enclosingMethod, r
           if (status == TailRecursionStatus.NotTailRecursive) {
             // an error has already been reported
           } else if (reportErrors) {
-            reporter.Error(MessageSource.Resolver, tailCall.Tok, "a recursive call inside a loop is not recognized as being a tail call");
+            reporter.Error(MessageSource.Resolver, tailCall.Origin, "a recursive call inside a loop is not recognized as being a tail call");
           }
           return TailRecursionStatus.NotTailRecursive;
         }
@@ -216,7 +216,7 @@ TailRecursionStatus CheckTailRecursive(Statement stmt, Method enclosingMethod, r
         if (status == TailRecursionStatus.NotTailRecursive) {
           // an error has already been reported
         } else if (reportErrors) {
-          reporter.Error(MessageSource.Resolver, tailCall.Tok, "a recursive call inside a forall statement is not a tail call");
+          reporter.Error(MessageSource.Resolver, tailCall.Origin, "a recursive call inside a forall statement is not a tail call");
         }
         return TailRecursionStatus.NotTailRecursive;
       }
@@ -250,8 +250,8 @@ TailRecursionStatus CheckTailRecursive(Statement stmt, Method enclosingMethod, r
       // TODO this should be the conservative choice, but probably we can consider this to be tail-recursive
       // under some conditions? However, how does this interact with compiling to exceptions?
       return TailRecursionStatus.NotTailRecursive;
-    } else if (stmt is UpdateStmt) {
-      var s = (UpdateStmt)stmt;
+    } else if (stmt is AssignStatement) {
+      var s = (AssignStatement)stmt;
       var ss = s.ResolvedStatements;
       if (ss.Count == 1) {
         return CheckTailRecursive(ss, enclosingMethod, ref tailCall, reportErrors);
@@ -262,11 +262,13 @@ TailRecursionStatus CheckTailRecursive(Statement stmt, Method enclosingMethod, r
       }
     } else if (stmt is VarDeclStmt) {
       var s = (VarDeclStmt)stmt;
-      if (s.Update != null) {
-        return CheckTailRecursive(s.Update, enclosingMethod, ref tailCall, reportErrors);
+      if (s.Assign != null) {
+        return CheckTailRecursive(s.Assign, enclosingMethod, ref tailCall, reportErrors);
       }
     } else if (stmt is VarDeclPattern) {
     } else if (stmt is ExpectStmt) {
+    } else if (stmt is BlockByProofStmt blockByProofStmt) {
+      return CheckTailRecursive(blockByProofStmt.Body, enclosingMethod, ref tailCall, reportErrors);
     } else {
       Contract.Assert(false);  // unexpected statement type
     }
@@ -301,12 +303,12 @@ void DisallowRecursiveCallsInExpressions(Expression expr, Method enclosingMethod
     Contract.Requires(enclosingMethod != null);
 
     if (expr is FunctionCallExpr fce && fce.Function.ByMethodDecl == enclosingMethod) {
-      reporter.Error(MessageSource.Resolver, expr.tok, "a recursive call in this context is not recognized as a tail call");
+      reporter.Error(MessageSource.Resolver, expr.Origin, "a recursive call in this context is not recognized as a tail call");
     }
     expr.SubExpressions.ForEach(ee => DisallowRecursiveCallsInExpressions(ee, enclosingMethod));
   }
 
-  TailRecursionStatus ConfirmTailCall(IToken tok, Method method, List<Type> typeApplication_JustMember, List<Expression> lhss, bool reportErrors) {
+  TailRecursionStatus ConfirmTailCall(IOrigin tok, Method method, List<Type> typeApplication_JustMember, List<Expression> lhss, bool reportErrors) {
     Contract.Requires(tok != null);
     Contract.Requires(method != null);
     Contract.Requires(typeApplication_JustMember != null);
@@ -340,7 +342,7 @@ TailRecursionStatus ConfirmTailCall(IToken tok, Method method, List<Type> typeAp
       if (formal != actual) {
         if (reportErrors) {
           reporter.Error(MessageSource.Resolver, tok,
-            "the recursive call to '{0}' is not tail recursive because the actual type parameter{1} is not the formal type parameter '{2}'",
+            "the recursive call to '{0}' is not tail recursive because the actual type argument{1} is not the formal type parameter '{2}'",
             method.Name, method.TypeArgs.Count == 1 ? "" : " " + i, formal.Name);
         }
         return TailRecursionStatus.NotTailRecursive;
@@ -362,21 +364,21 @@ public void DetermineTailRecursion(Function f) {
     if (hasTailRecursionPreference && !tail) {
       // the user specifically requested no tail recursion, so do nothing else
     } else if (hasTailRecursionPreference && tail && f.IsGhost) {
-      reporter.Error(MessageSource.Resolver, f.tok, "tail recursion can be specified only for functions that will be compiled, not for ghost functions");
+      reporter.Error(MessageSource.Resolver, f.Origin, "tail recursion can be specified only for functions that will be compiled, not for ghost functions");
     } else {
       var module = f.EnclosingClass.EnclosingModuleDefinition;
       var sccSize = module.CallGraph.GetSCCSize(f);
       if (hasTailRecursionPreference && 2 <= sccSize) {
-        reporter.Error(MessageSource.Resolver, f.tok, "sorry, tail-call optimizations are not supported for mutually recursive functions");
+        reporter.Error(MessageSource.Resolver, f.Origin, "sorry, tail-call optimizations are not supported for mutually recursive functions");
       } else if (hasTailRecursionPreference || sccSize == 1) {
         var status = CheckTailRecursiveExpr(f.Body, f, true, hasTailRecursionPreference);
         if (status != Function.TailStatus.TriviallyTailRecursive && status != Function.TailStatus.NotTailRecursive) {
           // this means there was at least one recursive call
           f.TailRecursion = status;
           if (status == Function.TailStatus.TailRecursive) {
-            reporter.Info(MessageSource.Resolver, f.tok, "tail recursive");
+            reporter.Info(MessageSource.Resolver, f.Origin, "tail recursive");
           } else {
-            reporter.Info(MessageSource.Resolver, f.tok, "auto-accumulator tail recursive");
+            reporter.Info(MessageSource.Resolver, f.Origin, "auto-accumulator tail recursive");
           }
         }
       }
@@ -424,8 +426,8 @@ Function.TailStatus CheckTailRecursiveExpr(Expression expr, Function enclosingFu
     if (expr is FunctionCallExpr) {
       var e = (FunctionCallExpr)expr;
       var status = e.Function == enclosingFunction ? Function.TailStatus.TailRecursive : Function.TailStatus.TriviallyTailRecursive;
-      for (var i = 0; i < e.Function.Formals.Count; i++) {
-        if (!e.Function.Formals[i].IsGhost) {
+      for (var i = 0; i < e.Function.Ins.Count; i++) {
+        if (!e.Function.Ins[i].IsGhost) {
           var s = CheckHasNoRecursiveCall(e.Args[i], enclosingFunction, reportErrors);
           status = TRES_Or(status, s);
         }
@@ -614,8 +616,8 @@ Function.TailStatus CheckHasNoRecursiveCall(Expression expr, Function enclosingF
         status = Function.TailStatus.NotTailRecursive;
       }
       // skip ghost subexpressions
-      for (var i = 0; i < e.Function.Formals.Count; i++) {
-        if (!e.Function.Formals[i].IsGhost) {
+      for (var i = 0; i < e.Function.Ins.Count; i++) {
+        if (!e.Function.Ins[i].IsGhost) {
           var s = CheckHasNoRecursiveCall(e.Args[i], enclosingFunction, reportErrors);
           status = TRES_Or(status, s);
         }
diff --git a/Source/DafnyCore/Resolver/TypeCharacteristicChecker.cs b/Source/DafnyCore/Resolver/TypeCharacteristicChecker.cs
new file mode 100644
index 00000000000..cf5b4bd0a9a
--- /dev/null
+++ b/Source/DafnyCore/Resolver/TypeCharacteristicChecker.cs
@@ -0,0 +1,344 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using JetBrains.Annotations;
+
+
+namespace Microsoft.Dafny {
+  public class TypeCharacteristicChecker {
+
+    /// <summary>
+    /// Infer required equality support from looking at signatures of declarations.
+    /// Then, check that all type characteristics are used and passed in properly.
+    ///
+    /// Note that this method can only be called after determining which expressions are ghosts.
+    /// </summary>
+    public static void InferAndCheck(List<TopLevelDecl> declarations, bool isAnExport, ErrorReporter reporter) {
+      InferEqualitySupport(declarations, reporter);
+      Check(declarations, isAnExport, reporter);
+    }
+
+    /// <summary>
+    /// Inferred required equality support for datatypes and type synonyms, and for Function and Method signatures.
+    /// </summary>
+    private static void InferEqualitySupport(List<TopLevelDecl> declarations, ErrorReporter reporter) {
+      // First, do datatypes and type synonyms until a fixpoint is reached.
+      bool inferredSomething;
+      do {
+        inferredSomething = false;
+        foreach (var d in declarations) {
+          if (Attributes.Contains(d.Attributes, "_provided")) {
+            // Don't infer required-equality-support for the type parameters, since there are
+            // scopes that see the name of the declaration but not its body.
+          } else if (d is DatatypeDecl dt) {
+            foreach (var tp in dt.TypeArgs) {
+              if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
+                // here's our chance to infer the need for equality support
+                foreach (var ctor in dt.Ctors) {
+                  foreach (var arg in ctor.Formals) {
+                    if (InferAndSetEqualitySupport(tp, arg.Type, reporter)) {
+                      inferredSomething = true;
+                      goto DONE_DT; // break out of the doubly-nested loop
+                    }
+                  }
+                }
+              DONE_DT:;
+              }
+            }
+          } else if (d is TypeSynonymDecl syn) {
+            foreach (var tp in syn.TypeArgs) {
+              if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
+                // here's our chance to infer the need for equality support
+                if (InferAndSetEqualitySupport(tp, syn.Rhs, reporter)) {
+                  inferredSomething = true;
+                }
+              }
+            }
+          } else if (d is NewtypeDecl newtypeDecl) {
+            foreach (var tp in newtypeDecl.TypeArgs) {
+              if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
+                // here's our chance to infer the need for equality support
+                if (InferAndSetEqualitySupport(tp, newtypeDecl.BaseType, reporter)) {
+                  inferredSomething = true;
+                }
+              }
+            }
+          }
+        }
+      } while (inferredSomething);
+
+      // Now do it for Function and Method signatures.
+      foreach (var d in declarations) {
+        if (d is IteratorDecl iter) {
+          var done = false;
+          var nonnullIter = iter.NonNullTypeDecl;
+          Contract.Assert(nonnullIter.TypeArgs.Count == iter.TypeArgs.Count);
+          for (var i = 0; i < iter.TypeArgs.Count; i++) {
+            var tp = iter.TypeArgs[i];
+            var correspondingNonnullIterTypeParameter = nonnullIter.TypeArgs[i];
+            if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
+              // here's our chance to infer the need for equality support
+              foreach (var p in iter.Ins) {
+                if (InferAndSetEqualitySupport(tp, p.Type, reporter)) {
+                  correspondingNonnullIterTypeParameter.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
+                  done = true;
+                  break;
+                }
+              }
+
+              foreach (var p in iter.Outs) {
+                if (done) {
+                  break;
+                }
+                if (InferAndSetEqualitySupport(tp, p.Type, reporter)) {
+                  correspondingNonnullIterTypeParameter.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
+                  break;
+                }
+              }
+            }
+          }
+        } else if (d is ClassLikeDecl or DefaultClassDecl) {
+          var cl = (TopLevelDeclWithMembers)d;
+          foreach (var member in cl.Members.Where(member => !member.IsGhost)) {
+            List<TypeParameter> memberTypeArguments = null;
+            if (member is Function function) {
+              memberTypeArguments = function.TypeArgs;
+              foreach (var tp in function.TypeArgs) {
+                if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
+                  // here's our chance to infer the need for equality support
+                  if (InferAndSetEqualitySupport(tp, function.ResultType, reporter)) {
+                    // the call to InferAndSetEqualitySupport made the necessary updates
+                  } else {
+                    foreach (var p in function.Ins) {
+                      if (InferAndSetEqualitySupport(tp, p.Type, reporter)) {
+                        break;
+                      }
+                    }
+                  }
+                }
+              }
+            } else if (member is Method method) {
+              memberTypeArguments = method.TypeArgs;
+              bool done = false;
+              foreach (var tp in method.TypeArgs) {
+                if (tp.Characteristics.EqualitySupport == TypeParameter.EqualitySupportValue.Unspecified) {
+                  // here's our chance to infer the need for equality support
+                  foreach (var p in method.Ins) {
+                    if (InferAndSetEqualitySupport(tp, p.Type, reporter)) {
+                      done = true;
+                      break;
+                    }
+                  }
+
+                  foreach (var p in method.Outs) {
+                    if (done) {
+                      break;
+                    }
+                    if (InferAndSetEqualitySupport(tp, p.Type, reporter)) {
+                      break;
+                    }
+                  }
+                }
+              }
+            }
+
+            // Now that type characteristics have been inferred for any method/function type parameters, generate a tool tip
+            // if the type parameters were added as part of type-parameter completion.
+            if (memberTypeArguments != null && memberTypeArguments.Count != 0 && memberTypeArguments[0].IsAutoCompleted) {
+              var toolTip = $"<{memberTypeArguments.Comma(Printer.TypeParameterToString)}>";
+              reporter.Info(MessageSource.Resolver, member.Origin, toolTip);
+            }
+
+          }
+        }
+      }
+    }
+
+    private static bool InferAndSetEqualitySupport(TypeParameter tp, Type type, ErrorReporter reporter) {
+      var requiresEqualitySupport = InferRequiredEqualitySupport(tp, type);
+      if (requiresEqualitySupport) {
+        tp.Characteristics.EqualitySupport = TypeParameter.EqualitySupportValue.InferredRequired;
+        // Note, auto-completed type parameters already get a tool tip for the enclosing method/function
+        if (reporter is not ErrorReporterWrapper && !tp.IsAutoCompleted) {
+          reporter.Info(MessageSource.Resolver, tp.Origin, "(==)");
+        }
+      }
+      return requiresEqualitySupport;
+    }
+
+    private static bool InferRequiredEqualitySupport(TypeParameter tp, Type type) {
+      Contract.Requires(tp != null);
+      Contract.Requires(type != null);
+
+      type = type.Normalize();  // we only do a .Normalize() here, because we want to keep stop at any type synonym or subset type
+      if (type is BasicType) {
+      } else if (type is SetType setType) {
+        return setType.Arg.AsTypeParameter == tp || InferRequiredEqualitySupport(tp, setType.Arg);
+      } else if (type is MultiSetType multiSetType) {
+        return multiSetType.Arg.AsTypeParameter == tp || InferRequiredEqualitySupport(tp, multiSetType.Arg);
+      } else if (type is MapType mapType) {
+        return mapType.Domain.AsTypeParameter == tp || InferRequiredEqualitySupport(tp, mapType.Domain) || InferRequiredEqualitySupport(tp, mapType.Range);
+      } else if (type is SeqType seqType) {
+        return InferRequiredEqualitySupport(tp, seqType.Arg);
+      } else if (type is UserDefinedType udt) {
+        var formalTypeArgs = udt.ResolvedClass.TypeArgs;
+        Contract.Assert(formalTypeArgs != null);
+        Contract.Assert(formalTypeArgs.Count == udt.TypeArgs.Count);
+        var i = 0;
+        foreach (var argType in udt.TypeArgs) {
+          var formalTypeArg = formalTypeArgs[i];
+          if ((formalTypeArg.SupportsEquality && argType.AsTypeParameter == tp) || InferRequiredEqualitySupport(tp, argType)) {
+            return true;
+          }
+          i++;
+        }
+        if (udt.ResolvedClass is TypeSynonymDecl syn) {
+          if (syn.IsRevealedInScope(Type.GetScope())) {
+            return InferRequiredEqualitySupport(tp, syn.RhsWithArgument(udt.TypeArgs));
+          }
+        }
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+      return false;
+    }
+
+    private static void Check(List<TopLevelDecl> declarations, bool isAnExport, ErrorReporter reporter) {
+      var visitor = new CheckTypeCharacteristicsVisitor(reporter);
+
+      foreach (var d in declarations) {
+        CheckAttributes(d.Attributes, visitor);
+
+        if (d is IteratorDecl iter) {
+          CheckFormals(iter.Ins, false, visitor);
+          CheckFormals(iter.Outs, false, visitor);
+          CheckSpecification(iter.Requires, iter.Modifies, iter.Ensures, iter.Decreases, visitor);
+          CheckSpecification(iter.YieldRequires, iter.Reads, iter.YieldEnsures, null, visitor);
+          if (iter.Body != null) {
+            visitor.Visit(iter.Body, false);
+          }
+        } else if (d is ClassLikeDecl cl) {
+          foreach (var parentTrait in cl.ParentTraits) {
+            visitor.VisitType(cl.Origin, parentTrait, false);
+          }
+        } else if (d is DatatypeDecl dt) {
+          foreach (var ctor in dt.Ctors) {
+            CheckAttributes(ctor.Attributes, visitor);
+            CheckFormals(ctor.Formals, ctor.IsGhost, visitor);
+          }
+        } else if (d is TypeSynonymDecl syn) {
+          visitor.VisitType(syn.Origin, syn.Rhs, false);
+          if (!isAnExport) {
+            if (syn.SupportsEquality && !syn.Rhs.SupportsEquality) {
+              reporter.Error(MessageSource.Resolver, syn.Origin, "type '{0}' declared as supporting equality, but the RHS type ({1}) might not{2}",
+                syn.Name, syn.Rhs, CheckTypeCharacteristicsVisitor.TypeEqualityErrorMessageHint(syn.Rhs));
+            }
+            if (syn.Characteristics.IsNonempty && !syn.Rhs.IsNonempty) {
+              reporter.Error(MessageSource.Resolver, syn.Origin, "type '{0}' declared as being nonempty, but the RHS type ({1}) may be empty",
+                syn.Name, syn.Rhs);
+            } else if (syn.Characteristics.HasCompiledValue && !syn.Rhs.HasCompilableValue) {
+              reporter.Error(MessageSource.Resolver, syn.Origin,
+                "type '{0}' declared as auto-initialization type, but the RHS type ({1}) does not support auto-initialization", syn.Name,
+                syn.Rhs);
+            }
+            if (syn.Characteristics.ContainsNoReferenceTypes && syn.Rhs.MayInvolveReferences) {
+              reporter.Error(MessageSource.Resolver, syn.Origin,
+                "type '{0}' declared as containing no reference types, but the RHS type ({1}) may contain reference types", syn.Name,
+                syn.Rhs);
+            }
+          }
+        } else if (d is NewtypeDecl { BaseType: { } baseType }) {
+          visitor.VisitType(d.Origin, baseType, false);
+        }
+
+        if (d is RedirectingTypeDecl rtd) {
+          if (rtd.Constraint != null) {
+            // TODO: In some places, constraints are checked at run time. Those places need to be checked with isGhostContext:=false. Ugh! Better
+            // would be if the language design was such that the declaration said directly whether or not the constraint is intended to be ghost
+            // or compiled.
+            visitor.Visit(rtd.Constraint, true);
+          }
+          if (rtd.Witness != null) {
+            visitor.Visit(rtd.Witness, rtd.WitnessKind == SubsetTypeDecl.WKind.Ghost);
+          }
+        }
+
+        if (d is TopLevelDeclWithMembers topLevelDeclWithMembers) {
+          foreach (var member in topLevelDeclWithMembers.Members) {
+            CheckAttributes(member.Attributes, visitor);
+            if (member is Field field) {
+              visitor.VisitType(field.Origin, field.Type, field.IsGhost);
+              if (field is ConstantField { Rhs: { } } cf) {
+                visitor.Visit(cf.Rhs, cf.IsGhost);
+              }
+            } else if (member is Function function) {
+              CheckFormals(function.Ins, function.IsGhost, visitor);
+              visitor.VisitType(function.Result?.Origin ?? function.Origin, function.ResultType, function.IsGhost);
+              CheckSpecification(function.Req, function.Reads, function.Ens, function.Decreases, visitor);
+              if (function.Body != null) {
+                visitor.Visit(function.Body, function.IsGhost);
+              }
+            } else if (member is Method method) {
+              CheckFormals(method.Ins, method.IsGhost, visitor);
+              CheckFormals(method.Outs, method.IsGhost, visitor);
+              CheckSpecification(method.Req, method.Mod, method.Ens, method.Decreases, visitor);
+              if (method.Body != null) {
+                visitor.Visit(method.Body, method.IsGhost);
+              }
+            }
+          }
+        }
+      }
+    }
+
+    private static void CheckAttributes(Attributes attributes, CheckTypeCharacteristicsVisitor visitor) {
+      for (var attr = attributes; attr != null; attr = attr.Prev) {
+        attr.Args.ForEach(e => visitor.Visit(e, true));
+      }
+    }
+
+    private static void CheckFormals(List<Formal> formals, bool isGhostContext, CheckTypeCharacteristicsVisitor visitor) {
+      foreach (var p in formals) {
+        visitor.VisitType(p.Origin, p.Type, isGhostContext || p.IsGhost);
+        if (p.DefaultValue != null) {
+          visitor.Visit(p.DefaultValue, isGhostContext || p.IsGhost);
+        }
+      }
+    }
+
+    private static void CheckSpecification(List<AttributedExpression> requires, Specification<FrameExpression> frame,
+      List<AttributedExpression> ensures, [CanBeNull] Specification<Expression> decreases,
+      CheckTypeCharacteristicsVisitor visitor) {
+
+      foreach (var aexpr in requires) {
+        CheckAttributes(aexpr.Attributes, visitor);
+        visitor.Visit(aexpr.E, true);
+      }
+
+      CheckAttributes(frame.Attributes, visitor);
+      foreach (var expr in frame.Expressions) {
+        visitor.Visit(expr, true);
+      }
+
+      foreach (var aexpr in ensures) {
+        CheckAttributes(aexpr.Attributes, visitor);
+        visitor.Visit(aexpr.E, true);
+      }
+
+      if (decreases != null) {
+        CheckAttributes(decreases.Attributes, visitor);
+        foreach (var expr in decreases.Expressions) {
+          visitor.Visit(expr, true);
+        }
+      }
+    }
+
+  }
+}
diff --git a/Source/DafnyCore/Resolver/TypeConstraint.cs b/Source/DafnyCore/Resolver/TypeConstraint.cs
index 8b077b8c131..7110b24c401 100644
--- a/Source/DafnyCore/Resolver/TypeConstraint.cs
+++ b/Source/DafnyCore/Resolver/TypeConstraint.cs
@@ -5,15 +5,10 @@
 // SPDX-License-Identifier: MIT
 //
 //-----------------------------------------------------------------------------
-using System;
+
 using System.Collections.Generic;
 using System.Linq;
-using System.Numerics;
 using System.Diagnostics.Contracts;
-using JetBrains.Annotations;
-using Microsoft.BaseTypes;
-using Microsoft.Boogie;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.Dafny {
   public record TypeConstraint(Type Super, Type Sub, TypeConstraint.ErrorMsg ErrMsg, bool KeepConstraints) {
@@ -25,7 +20,7 @@ public static void ReportErrors(ModuleResolver resolver, ErrorReporter reporter)
       resolver.TypeConstraintErrorsToBeReported.Clear();
     }
     public abstract class ErrorMsg {
-      public abstract IToken Tok { get; }
+      public abstract IOrigin Tok { get; }
       bool reported;
       public void FlagAsError(ModuleResolver resolver) {
         if (resolver.Options.Get(CommonOptionBag.TypeInferenceDebug)) {
@@ -49,7 +44,9 @@ private void Reporting(ErrorReporter reporter, string suffix) {
           reporter.Error(MessageSource.Resolver, err.Tok, err.Msg + suffix, RemoveAmbiguity(err.MsgArgs));
         } else {
           var err = (ErrorMsgWithBase)this;
-          err.BaseMsg.Reporting(reporter, " (" + string.Format(err.Msg, RemoveAmbiguity(err.MsgArgs)) + ")" + suffix);
+          if (!err.BaseMsg.reported) {
+            err.BaseMsg.Reporting(reporter, " (" + string.Format(err.Msg, RemoveAmbiguity(err.MsgArgs)) + ")" + suffix);
+          }
         }
         reported = true;
       }
@@ -75,12 +72,12 @@ protected object[] RemoveAmbiguity(object[] msgArgs) {
       protected abstract string ApproximateErrorMessage();
     }
     public class ErrorMsgWithToken : ErrorMsg {
-      readonly IToken tok;
-      public override IToken Tok => tok;
+      readonly IOrigin tok;
+      public override IOrigin Tok => tok;
       readonly string msg;
       public virtual string Msg => msg;
       public readonly object[] MsgArgs;
-      public ErrorMsgWithToken(IToken tok, string msg, params object[] msgArgs) {
+      public ErrorMsgWithToken(IOrigin tok, string msg, params object[] msgArgs) {
         Contract.Requires(tok != null);
         Contract.Requires(msg != null);
         Contract.Requires(msgArgs != null);
@@ -92,7 +89,7 @@ public ErrorMsgWithToken(IToken tok, string msg, params object[] msgArgs) {
       protected override string ApproximateErrorMessage() => string.Format(Msg, MsgArgs);
     }
     public class ErrorMsgWithBase : ErrorMsg {
-      public override IToken Tok {
+      public override IOrigin Tok {
         get { return BaseMsg.Tok; }
       }
       public readonly ErrorMsg BaseMsg;
diff --git a/Source/DafnyCore/Rewriters/AutoContractsRewriter.cs b/Source/DafnyCore/Rewriters/AutoContractsRewriter.cs
index 37ba52df9f5..679e852b663 100644
--- a/Source/DafnyCore/Rewriters/AutoContractsRewriter.cs
+++ b/Source/DafnyCore/Rewriters/AutoContractsRewriter.cs
@@ -57,14 +57,11 @@ namespace Microsoft.Dafny;
 ///    reads Repr
 /// </summary>
 public class AutoContractsRewriter : IRewriter {
-  private SystemModuleManager systemModuleManager;
-  public AutoContractsRewriter(ErrorReporter reporter)
+  private readonly SystemModuleManager systemModuleManager;
+  public AutoContractsRewriter(Program program, ErrorReporter reporter)
     : base(reporter) {
     Contract.Requires(reporter != null);
     Contract.Requires(systemModuleManager != null);
-  }
-
-  internal override void PreResolve(Program program) {
     systemModuleManager = program.SystemModuleManager;
   }
 
@@ -78,20 +75,20 @@ internal override void PreResolve(ModuleDefinition m) {
   }
 
   void ProcessClassPreResolve(TopLevelDeclWithMembers cl) {
-    var range = cl.NameNode.RangeToken.MakeAutoGenerated();
+    var range = cl.NameNode.Origin.MakeAutoGenerated();
     // Add:  ghost var Repr: set<object>
     // ...unless a field with that name is already present
     if (!cl.Members.Exists(member => member is Field && member.Name == "Repr")) {
-      Type ty = new SetType(true, systemModuleManager.ObjectQ());
+      Type ty = systemModuleManager.ObjectSetType();
       var repr = new Field(range, new Name(range, "Repr"), true, ty, null);
       cl.Members.Add(repr);
-      AddHoverText(cl.tok, "{0}", Printer.FieldToString(Reporter.Options, repr));
+      AddHoverText(cl.Origin, "{0}", Printer.FieldToString(Reporter.Options, repr));
     }
     // Add:  predicate Valid()
     // ...unless an instance function with that name is already present
     if (!cl.Members.Exists(member => member is Function && member.Name == "Valid" && !member.IsStatic)) {
-      var valid = new Predicate(range, new Name(cl.NameNode.RangeToken, "Valid"), false, true, false, new List<TypeParameter>(), new List<Formal>(), null,
-        new List<AttributedExpression>(), new List<FrameExpression>(), new List<AttributedExpression>(), new Specification<Expression>(new List<Expression>(), null),
+      var valid = new Predicate(range, new Name(cl.NameNode.Origin, "Valid"), false, true, false, new List<TypeParameter>(), new List<Formal>(), null,
+        new List<AttributedExpression>(), new Specification<FrameExpression>(), new List<AttributedExpression>(), new Specification<Expression>(new List<Expression>(), null),
         null, Predicate.BodyOriginKind.OriginalOrInherited, null, null, null, null);
       cl.Members.Add(valid);
       // It will be added to hover text later
@@ -107,14 +104,14 @@ void ProcessClassPreResolve(TopLevelDeclWithMembers cl) {
         // member is inherited from a module where it was already processed
         continue;
       }
-      IToken tok = new AutoGeneratedToken(member.tok);
+      IOrigin tok = new AutoGeneratedOrigin(member.Origin);
       if (member is Function && member.Name == "Valid" && !member.IsStatic) {
         var valid = (Function)member;
         // reads this, Repr
         var r0 = new ThisExpr(tok);
         var r1 = CreateUnresolvedThisRepr(tok);
-        valid.Reads.Add(new FrameExpression(tok, r0, null));
-        valid.Reads.Add(new FrameExpression(tok, r1, null));
+        valid.Reads.Expressions.Add(new FrameExpression(tok, r0, null));
+        valid.Reads.Expressions.Add(new FrameExpression(tok, r1, null));
         // ensures Valid() ==> this in Repr
         var post = new BinaryExpr(tok, BinaryExpr.Opcode.Imp,
           CreateUnresolvedValidCall(tok),
@@ -122,11 +119,11 @@ void ProcessClassPreResolve(TopLevelDeclWithMembers cl) {
             new ThisExpr(tok),
             CreateUnresolvedThisRepr(tok)));
         valid.Ens.Insert(0, new AttributedExpression(post));
-        if (member.tok == cl.tok) {
+        if (member.Origin == cl.Origin) {
           // We added this function above, so produce a hover text for the entire function signature
-          AddHoverText(cl.tok, "{0}", Printer.FunctionSignatureToString(Reporter.Options, valid));
+          AddHoverText(cl.Origin, "{0}", Printer.FunctionSignatureToString(Reporter.Options, valid));
         } else {
-          AddHoverText(member.tok, "reads {0}, {1}\nensures {2}", r0, r1, post);
+          AddHoverText(member.Origin, "reads {0}, {1}\nensures {2}", r0, r1, post);
         }
       } else if (member is Function && !member.IsStatic) {
         var f = (Function)member;
@@ -135,12 +132,12 @@ void ProcessClassPreResolve(TopLevelDeclWithMembers cl) {
         f.Req.Insert(0, new AttributedExpression(valid));
         var format = "requires {0}";
         var repr = CreateUnresolvedThisRepr(tok);
-        if (f.Reads.Count == 0) {
+        if (f.Reads.Expressions.Count == 0) {
           // reads Repr
-          f.Reads.Add(new FrameExpression(tok, repr, null));
+          f.Reads.Expressions.Add(new FrameExpression(tok, repr, null));
           format += "\nreads {1}";
         }
-        AddHoverText(member.tok, format, valid, repr);
+        AddHoverText(member.Origin, format, valid, repr);
       } else if (member is Constructor) {
         var ctor = (Constructor)member;
         // ensures Valid();
@@ -150,7 +147,7 @@ void ProcessClassPreResolve(TopLevelDeclWithMembers cl) {
         var freshness = new FreshExpr(tok, CreateUnresolvedThisRepr(tok));
         ctor.Ens.Insert(1, new AttributedExpression(freshness));
         var m0 = new ThisExpr(tok);
-        AddHoverText(member.tok, "modifies {0}\nensures {1} && {2}", m0, valid, freshness);
+        AddHoverText(member.Origin, "modifies {0}\nensures {1} && {2}", m0, valid, freshness);
       }
     }
   }
@@ -189,7 +186,7 @@ void ProcessClassPostResolve(ClassLikeDecl cl) {
                 rRepr = f;
               }
             } else if (memb is Function { IsStatic: false, Name: "Valid" } fn) {
-              if (fn.Formals.Count == 0 && fn.ResultType.IsBoolType) {
+              if (fn.Ins.Count == 0 && fn.ResultType.IsBoolType) {
                 rValid = fn;
               }
             }
@@ -200,14 +197,14 @@ void ProcessClassPostResolve(ClassLikeDecl cl) {
           subobjects.Add(new Tuple<Field, Field, Function>(field, rRepr, rValid));
         }
       } else if (member is Function { IsStatic: false, Name: "Valid" } validFunction) {
-        if (validFunction.Formals.Count == 0 && validFunction.ResultType.IsBoolType) {
+        if (validFunction.Ins.Count == 0 && validFunction.ResultType.IsBoolType) {
           Valid = validFunction;
         }
       }
     }
     Contract.Assert(ReprField != null);  // we expect there to be a "Repr" field, since we added one in PreResolve
 
-    IToken clTok = new AutoGeneratedToken(cl.tok);
+    IOrigin clTok = new AutoGeneratedOrigin(cl.Origin);
     Type ty = ModuleResolver.GetThisType(clTok, cl);
     var self = new ThisExpr(clTok) {
       Type = ty
@@ -222,7 +219,7 @@ void ProcessClassPostResolve(ClassLikeDecl cl) {
       if (Attributes.ContainsBool(member.Attributes, "autocontracts", ref sayYes) && !sayYes) {
         continue;
       }
-      IToken tok = new AutoGeneratedToken(member.tok);
+      IOrigin tok = new AutoGeneratedOrigin(member.Origin);
       if (member is Function && member.Name == "Valid" && !member.IsStatic) {
         var valid = (Function)member;
         var validConjuncts = new List<Expression>();
@@ -275,7 +272,7 @@ void ProcessClassPostResolve(ClassLikeDecl cl) {
             hoverText = Printer.ExprToString(Reporter.Options, c) + sep + hoverText;
             sep = "\n";
           }
-          AddHoverText(valid.tok, "{0}", hoverText);
+          AddHoverText(valid.Origin, "{0}", hoverText);
         }
 
       } else if (member is Constructor) {
@@ -286,12 +283,12 @@ void ProcessClassPostResolve(ClassLikeDecl cl) {
           if (ctor.RefinementBase == null) {
             // Repr := {this};
             var e = new SetDisplayExpr(tok, true, new List<Expression>() { self });
-            e.Type = new SetType(true, systemModuleManager.ObjectQ());
-            Statement s = new AssignStmt(member.RangeToken, Repr, new ExprRhs(e));
+            e.Type = systemModuleManager.ObjectSetType();
+            Statement s = new SingleAssignStmt(member.Origin, Repr, new ExprRhs(e));
             s.IsGhost = true;
             sbs.AppendStmt(s);
           }
-          AddSubobjectReprs(tok, ctor.RangeToken.EndToken, subobjects, sbs, n, implicitSelf, Repr);
+          AddSubobjectReprs(tok, ctor.Origin.EndToken, subobjects, sbs, n, implicitSelf, Repr);
         }
 
       } else if (member is Method && !member.IsStatic && Valid != null) {
@@ -307,7 +304,7 @@ void ProcessClassPostResolve(ClassLikeDecl cl) {
               valid.Type = Type.Bool;
             }
             m.Req.Insert(0, new AttributedExpression(valid));
-            AddHoverText(member.tok, "requires {0}", valid);
+            AddHoverText(member.Origin, "requires {0}", valid);
           }
         } else if (m.RefinementBase == null) {
           // requires Valid()
@@ -316,7 +313,7 @@ void ProcessClassPostResolve(ClassLikeDecl cl) {
           var format = "requires {0}";
           if (m.Mod.Expressions.Count == 0) {
             // modifies Repr
-            m.Mod.Expressions.Add(new FrameExpression(Repr.tok, Repr, null));
+            m.Mod.Expressions.Add(new FrameExpression(Repr.Origin, Repr, null));
             format += "\nmodifies {1}";
             addStatementsToUpdateRepr = true;
           }
@@ -331,20 +328,20 @@ void ProcessClassPostResolve(ClassLikeDecl cl) {
           var freshness = new FreshExpr(tok, e1);
           freshness.Type = Type.Bool;
           m.Ens.Insert(1, new AttributedExpression(freshness));
-          AddHoverText(m.tok, format + "\nensures {0} && {2}", valid, Repr, freshness);
+          AddHoverText(m.Origin, format + "\nensures {0} && {2}", valid, Repr, freshness);
         } else {
           addStatementsToUpdateRepr = true;
         }
 
         if (addStatementsToUpdateRepr && m.Body != null) {
           var methodBody = (BlockStmt)m.Body;
-          AddSubobjectReprs(tok, methodBody.RangeToken.EndToken, subobjects, methodBody, methodBody.Body.Count, implicitSelf, Repr);
+          AddSubobjectReprs(tok, methodBody.Origin.EndToken, subobjects, methodBody, methodBody.Body.Count, implicitSelf, Repr);
         }
       }
     }
   }
 
-  void AddSubobjectReprs(IToken tok, IToken endCurlyTok, List<Tuple<Field, Field, Function>> subobjects, BlockStmt block, int hoverTextFromHere,
+  void AddSubobjectReprs(IOrigin tok, IOrigin endCurlyTok, List<Tuple<Field, Field, Function>> subobjects, BlockStmt block, int hoverTextFromHere,
     Expression implicitSelf, Expression Repr) {
     Contract.Requires(tok != null);
     Contract.Requires(endCurlyTok != null);
@@ -358,7 +355,7 @@ void AddSubobjectReprs(IToken tok, IToken endCurlyTok, List<Tuple<Field, Field,
     foreach (var ff in subobjects) {
       var F = CreateResolvedFieldSelect(tok, implicitSelf, ff.Item1);  // create a resolved MemberSelectExpr
       Expression e = new SetDisplayExpr(tok, true, new List<Expression>() { F }) {
-        Type = new SetType(true, systemModuleManager.ObjectQ())  // resolve here
+        Type = systemModuleManager.ObjectSetType()
       };
       var rhs = new BinaryExpr(tok, BinaryExpr.Opcode.Add, Repr, e) {
         ResolvedOp = BinaryExpr.ResolvedOpcode.Union,
@@ -378,13 +375,13 @@ void AddSubobjectReprs(IToken tok, IToken endCurlyTok, List<Tuple<Field, Field,
         nguard = Expression.CreateAnd(nguard, ng);
       }
       // Repr := Repr + ...;
-      Statement s = new AssignStmt(tok.ToRange(), Repr, new ExprRhs(rhs));
+      Statement s = new SingleAssignStmt(tok, Repr, new ExprRhs(rhs));
       s.IsGhost = true;
       // wrap if statement around s
       e = Expression.CreateAnd(IsNotNull(tok, F), Expression.CreateNot(tok, nguard));
-      var thn = new BlockStmt(tok.ToRange(), new List<Statement>() { s });
+      var thn = new BlockStmt(tok, new List<Statement>() { s });
       thn.IsGhost = true;
-      s = new IfStmt(tok.ToRange(), false, e, thn, null);
+      s = new IfStmt(tok, false, e, thn, null);
       s.IsGhost = true;
       // finally, add s to the block
       block.AppendStmt(s);
@@ -405,7 +402,7 @@ void AddSubobjectReprs(IToken tok, IToken endCurlyTok, List<Tuple<Field, Field,
   /// of "expr" already implies "expr" is non-null, then an expression
   /// denoting "true" is returned.
   /// </summary>
-  Expression IsNotNull(IToken tok, Expression expr) {
+  Expression IsNotNull(IOrigin tok, Expression expr) {
     Contract.Requires(tok != null);
     Contract.Requires(expr != null);
     if (expr.Type.IsNonNullRefType) {
@@ -426,11 +423,11 @@ bool IsSimpleQueryMethod(Method m) {
 
   bool LocalAssignsOnly(Statement s) {
     Contract.Requires(s != null);
-    if (s is AssignStmt) {
-      var ss = (AssignStmt)s;
+    if (s is SingleAssignStmt) {
+      var ss = (SingleAssignStmt)s;
       return ss.Lhs.Resolved is IdentifierExpr;
-    } else if (s is ConcreteUpdateStatement) {
-      var ss = (ConcreteUpdateStatement)s;
+    } else if (s is ConcreteAssignStatement) {
+      var ss = (ConcreteAssignStatement)s;
       return ss.Lhss.TrueForAll(e => e.Resolved is IdentifierExpr);
     } else if (s is CallStmt) {
       return false;
@@ -460,20 +457,20 @@ static bool MentionsOldState(Expression expr) {
     return false;
   }
 
-  private static Expression CreateUnresolvedThisRepr(IToken tok) {
-    return new ExprDotName(tok, new ImplicitThisExpr(tok), "Repr", null);
+  private static Expression CreateUnresolvedThisRepr(IOrigin tok) {
+    return new ExprDotName(tok, new ImplicitThisExpr(tok), new Name("Repr"), null);
   }
 
-  public static Expression CreateUnresolvedValidCall(IToken tok) {
+  public static Expression CreateUnresolvedValidCall(IOrigin tok) {
     return new ApplySuffix(tok, null,
-      new ExprDotName(tok, new ImplicitThisExpr(tok), "Valid", null),
-      new List<ActualBinding>(), tok);
+      new ExprDotName(tok, new ImplicitThisExpr(tok), new Name("Valid"), null),
+      new List<ActualBinding>(), Token.NoToken);
   }
 
   /// <summary>
   /// Returns a resolved expression of the form "receiver.Valid()"
   /// </summary>
-  public Expression CreateResolvedValidCall(IToken tok, Expression receiver, Function Valid, ICallable callingContext) {
+  public Expression CreateResolvedValidCall(IOrigin tok, Expression receiver, Function Valid, ICallable callingContext) {
     Contract.Requires(tok != null);
     Contract.Requires(receiver != null);
     Contract.Requires(Valid != null);
@@ -485,22 +482,22 @@ public Expression CreateResolvedValidCall(IToken tok, Expression receiver, Funct
     return Expression.CreateResolvedCall(tok, receiver, Valid, new List<Expression>(), new List<Type>(), systemModuleManager);
   }
 
-  public static Expression CreateResolvedFieldSelect(IToken tok, Expression receiver, Field field) {
+  public static Expression CreateResolvedFieldSelect(IOrigin tok, Expression receiver, Field field) {
     var memberSelectExpr = new MemberSelectExpr(tok, receiver, field);
-    return new ExprDotName(tok, receiver, field.Name, null) {
+    return new ExprDotName(tok, receiver, new Name(field.Name), null) {
       ResolvedExpression = memberSelectExpr,
       Type = memberSelectExpr.Type
     };
   }
 
-  public static BinaryExpr BinBoolExpr(IToken tok, BinaryExpr.ResolvedOpcode rop, Expression e0, Expression e1) {
+  public static BinaryExpr BinBoolExpr(IOrigin tok, BinaryExpr.ResolvedOpcode rop, Expression e0, Expression e1) {
     var p = new BinaryExpr(tok, BinaryExpr.ResolvedOp2SyntacticOp(rop), e0, e1);
     p.ResolvedOp = rop;  // resolve here
     p.Type = Type.Bool;  // resolve here
     return p;
   }
 
-  void AddHoverText(IToken tok, string format, params object[] args) {
+  void AddHoverText(IOrigin tok, string format, params object[] args) {
     Contract.Requires(tok != null);
     Contract.Requires(format != null);
     Contract.Requires(args != null);
diff --git a/Source/DafnyCore/Rewriters/AutoGeneratedToken.cs b/Source/DafnyCore/Rewriters/AutoGeneratedToken.cs
index f942f602ecd..d01f6b36368 100644
--- a/Source/DafnyCore/Rewriters/AutoGeneratedToken.cs
+++ b/Source/DafnyCore/Rewriters/AutoGeneratedToken.cs
@@ -2,15 +2,23 @@
 
 namespace Microsoft.Dafny;
 
-public class AutoGeneratedToken : TokenWrapper {
-  public AutoGeneratedToken(IToken wrappedToken)
+public class AutoGeneratedOrigin : OriginWrapper {
+  public AutoGeneratedOrigin(IOrigin wrappedToken)
     : base(wrappedToken) {
     Contract.Requires(wrappedToken != null);
   }
 
-  public static bool Is(IToken tok) {
-    while (tok is TokenWrapper w) {
-      if (w is AutoGeneratedToken) {
+  public static IOrigin Unwrap(IOrigin token) {
+    if (token is AutoGeneratedOrigin autoGeneratedToken) {
+      return Unwrap(autoGeneratedToken.WrappedToken);
+    }
+
+    return token;
+  }
+
+  public static bool Is(IOrigin tok) {
+    while (tok is OriginWrapper w) {
+      if (w is AutoGeneratedOrigin) {
         return true;
       }
       tok = w.WrappedToken;
@@ -19,10 +27,12 @@ public static bool Is(IToken tok) {
   }
 
   public static Expression WrapExpression(Expression expr) {
-    return Expression.CreateParensExpression(new AutoGeneratedToken(expr.tok), expr);
+    return Expression.CreateParensExpression(new AutoGeneratedOrigin(expr.Origin), expr);
   }
 
-  public override IToken WithVal(string newVal) {
-    return new AutoGeneratedToken(WrappedToken.WithVal(newVal));
+  public override IOrigin WithVal(string newVal) {
+    return new AutoGeneratedOrigin(WrappedToken.WithVal(newVal));
   }
+
+  public override bool IsCopy => true;
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Rewriters/AutoReqFunctionRewriter.cs b/Source/DafnyCore/Rewriters/AutoReqFunctionRewriter.cs
index 125dead5bc8..dadf4ec438e 100644
--- a/Source/DafnyCore/Rewriters/AutoReqFunctionRewriter.cs
+++ b/Source/DafnyCore/Rewriters/AutoReqFunctionRewriter.cs
@@ -11,15 +11,12 @@ namespace Microsoft.Dafny;
 public class AutoReqFunctionRewriter : IRewriter {
   Function parentFunction;
   bool containsMatch; // TODO: Track this per-requirement, rather than per-function
-  private SystemModuleManager systemModuleManager;
+  private readonly SystemModuleManager systemModuleManager;
 
-  public AutoReqFunctionRewriter(ErrorReporter reporter)
+  public AutoReqFunctionRewriter(Program program, ErrorReporter reporter)
     : base(reporter) {
-    Contract.Requires(reporter != null);
-  }
-
-  internal override void PreResolve(Program program) {
     systemModuleManager = program.SystemModuleManager;
+    Contract.Requires(reporter != null);
   }
 
   internal override void PostResolveIntermediate(ModuleDefinition m) {
@@ -88,7 +85,7 @@ public void addAutoReqToolTipInfoToFunction(string label, Function f, List<Attri
     }
 
     if (!tip.Equals("")) {
-      Reporter.Info(MessageSource.Rewriter, f.tok, tip);
+      Reporter.Info(MessageSource.Rewriter, f.Origin, tip);
       if (Reporter.Options.AutoReqPrintFile != null) {
         using (System.IO.TextWriter writer = new System.IO.StreamWriter(Reporter.Options.AutoReqPrintFile, true)) {
           writer.WriteLine(f.Name);
@@ -112,7 +109,7 @@ public void addAutoReqToolTipInfoToMethod(string label, Method method, List<Attr
     }
 
     if (!tip.Equals("")) {
-      Reporter.Info(MessageSource.Rewriter, method.tok, tip);
+      Reporter.Info(MessageSource.Rewriter, method.Origin, tip);
       if (Reporter.Options.AutoReqPrintFile != null) {
         using System.IO.TextWriter writer = new System.IO.StreamWriter(Reporter.Options.AutoReqPrintFile, true);
         writer.WriteLine(method.Name);
@@ -122,8 +119,8 @@ public void addAutoReqToolTipInfoToMethod(string label, Method method, List<Attr
   }
 
   // Stitch a list of expressions together with logical ands
-  Expression Andify(IToken tok, List<Expression> exprs) {
-    Expression ret = Expression.CreateBoolLiteral(new AutoGeneratedToken(tok), true);
+  Expression Andify(IOrigin tok, List<Expression> exprs) {
+    Expression ret = Expression.CreateBoolLiteral(new AutoGeneratedOrigin(tok), true);
 
     foreach (var expr in exprs) {
       ret = Expression.CreateAnd(ret, expr);
@@ -133,7 +130,7 @@ Expression Andify(IToken tok, List<Expression> exprs) {
   }
 
   static AttributedExpression CreateAutoAttributedExpression(Expression e, Attributes attrs = null) {
-    return new AttributedExpression(AutoGeneratedToken.WrapExpression(e), attrs);
+    return new AttributedExpression(AutoGeneratedOrigin.WrapExpression(e), attrs);
   }
 
   List<Expression> gatherReqs(Function f, List<Expression> args, List<Type> typeArguments, Expression f_this) {
@@ -143,8 +140,8 @@ List<Expression> gatherReqs(Function f, List<Expression> args, List<Type> typeAr
       Dictionary<IVariable, Expression/*!*/> substMap = new Dictionary<IVariable, Expression>();
       Dictionary<TypeParameter, Type> typeMap = TypeParameter.SubstitutionMap(f.TypeArgs, typeArguments);
 
-      for (int i = 0; i < f.Formals.Count; i++) {
-        substMap.Add(f.Formals[i], args[i]);
+      for (int i = 0; i < f.Ins.Count; i++) {
+        substMap.Add(f.Ins[i], args[i]);
       }
 
       foreach (var req in f.Req) {
@@ -255,13 +252,13 @@ List<Expression> GenerateAutoReqs(Expression expr) {
 
       List<MatchCaseExpr> newMatches = new List<MatchCaseExpr>();
       foreach (MatchCaseExpr caseExpr in e.Cases) {
-        //MatchCaseExpr c = new MatchCaseExpr(caseExpr.tok, caseExpr.Id, caseExpr.Arguments, andify(caseExpr.tok, generateAutoReqs(caseExpr.Body)));
+        //MatchCaseExpr c = new MatchCaseExpr(caseExpr.Tok, caseExpr.Id, caseExpr.Arguments, andify(caseExpr.Tok, generateAutoReqs(caseExpr.Body)));
         //c.Ctor = caseExpr.Ctor; // resolve here
-        MatchCaseExpr c = Expression.CreateMatchCase(caseExpr, Andify(caseExpr.tok, GenerateAutoReqs(caseExpr.Body)));
+        MatchCaseExpr c = Expression.CreateMatchCase(caseExpr, Andify(caseExpr.Origin, GenerateAutoReqs(caseExpr.Body)));
         newMatches.Add(c);
       }
 
-      reqs.Add(Expression.CreateMatch(e.tok, e.Source, newMatches, e.Type));
+      reqs.Add(Expression.CreateMatch(e.Origin, e.Source, newMatches, e.Type));
     } else if (expr is SeqConstructionExpr) {
       var e = (SeqConstructionExpr)expr;
       reqs.AddRange(GenerateAutoReqs(e.N));
@@ -294,7 +291,7 @@ List<Expression> GenerateAutoReqs(Expression expr) {
             // We only care about this req if E0 is false, since Or short-circuits
             var cloner = new Cloner(false, true);
             var e0 = cloner.CloneExpr(e.E0);
-            reqs.Add(Expression.CreateImplies(Expression.CreateNot(e.E1.tok, e0), req));
+            reqs.Add(Expression.CreateImplies(Expression.CreateNot(e.E1.Origin, e0), req));
           }
           break;
 
@@ -318,7 +315,7 @@ List<Expression> GenerateAutoReqs(Expression expr) {
         }
         var new_reqs = GenerateAutoReqs(e.Body);
         if (new_reqs.Count > 0) {
-          reqs.Add(Expression.CreateLet(e.tok, e.LHSs, e.RHSs, Andify(e.tok, new_reqs), e.Exact));
+          reqs.Add(Expression.CreateLet(e.Origin, e.LHSs, e.RHSs, Andify(e.Origin, new_reqs), e.Exact));
         }
       } else {
         // TODO: Still need to figure out what the right choice is here:
@@ -334,10 +331,10 @@ List<Expression> GenerateAutoReqs(Expression expr) {
 
       var auto_reqs = GenerateAutoReqs(e.Term);
       if (auto_reqs.Count > 0) {
-        Expression allReqsSatisfied = Andify(e.Term.tok, auto_reqs);
+        Expression allReqsSatisfied = Andify(e.Term.Origin, auto_reqs);
         Expression allReqsSatisfiedAndTerm = Expression.CreateAnd(allReqsSatisfied, e.Term);
         e.Term = allReqsSatisfiedAndTerm;
-        Reporter.Info(MessageSource.Rewriter, e.tok, "autoreq added (" + Printer.ExtendedExprToString(Reporter.Options, allReqsSatisfied) + ") &&");
+        Reporter.Info(MessageSource.Rewriter, e.Origin, "autoreq added (" + Printer.ExtendedExprToString(Reporter.Options, allReqsSatisfied) + ") &&");
       }
     } else if (expr is SetComprehension) {
       var e = (SetComprehension)expr;
@@ -347,7 +344,7 @@ List<Expression> GenerateAutoReqs(Expression expr) {
       //reqs.AddRange(generateAutoReqs(e.Range));
       var auto_reqs = GenerateAutoReqs(e.Term);
       if (auto_reqs.Count > 0) {
-        reqs.Add(Expression.CreateQuantifier(new ForallExpr(e.tok, e.RangeToken, e.BoundVars, e.Range, Andify(e.Term.tok, auto_reqs), e.Attributes), true));
+        reqs.Add(Expression.CreateQuantifier(new ForallExpr(e.Origin, e.BoundVars, e.Range, Andify(e.Term.Origin, auto_reqs), e.Attributes), true));
       }
     } else if (expr is MapComprehension) {
       var e = (MapComprehension)expr;
@@ -360,7 +357,7 @@ List<Expression> GenerateAutoReqs(Expression expr) {
       }
       auto_reqs.AddRange(GenerateAutoReqs(e.Term));
       if (auto_reqs.Count > 0) {
-        reqs.Add(Expression.CreateQuantifier(new ForallExpr(e.tok, e.RangeToken, e.BoundVars, e.Range, Andify(e.Term.tok, auto_reqs), e.Attributes), true));
+        reqs.Add(Expression.CreateQuantifier(new ForallExpr(e.Origin, e.BoundVars, e.Range, Andify(e.Term.Origin, auto_reqs), e.Attributes), true));
       }
     } else if (expr is StmtExpr) {
       var e = (StmtExpr)expr;
@@ -368,7 +365,7 @@ List<Expression> GenerateAutoReqs(Expression expr) {
     } else if (expr is ITEExpr) {
       ITEExpr e = (ITEExpr)expr;
       reqs.AddRange(GenerateAutoReqs(e.Test));
-      reqs.Add(Expression.CreateITE(e.Test, Andify(e.Thn.tok, GenerateAutoReqs(e.Thn)), Andify(e.Els.tok, GenerateAutoReqs(e.Els))));
+      reqs.Add(Expression.CreateITE(e.Test, Andify(e.Thn.Origin, GenerateAutoReqs(e.Thn)), Andify(e.Els.Origin, GenerateAutoReqs(e.Els))));
     } else if (expr is NestedMatchExpr) {
       containsMatch = true;
 
@@ -376,8 +373,8 @@ List<Expression> GenerateAutoReqs(Expression expr) {
       reqs.AddRange(GenerateAutoReqs(e.Source));
 
       var newCases = e.Cases.Select(cas =>
-        new NestedMatchCaseExpr(cas.Tok, cas.Pat, Andify(cas.Body.tok, GenerateAutoReqs(cas.Body)), cas.Attributes)).ToList();
-      var nestedMatchExpr = new NestedMatchExpr(e.tok, e.Source, newCases, e.UsesOptionalBraces);
+        new NestedMatchCaseExpr(cas.Origin, cas.Pat, Andify(cas.Body.Origin, GenerateAutoReqs(cas.Body)), cas.Attributes)).ToList();
+      var nestedMatchExpr = new NestedMatchExpr(e.Origin, e.Source, newCases, e.UsesOptionalBraces);
       nestedMatchExpr.Type = Type.Bool;
       reqs.Add(nestedMatchExpr);
     } else if (expr is ConcreteSyntaxExpression) {
diff --git a/Source/DafnyCore/Rewriters/AutoRevealFunctionDependencies.cs b/Source/DafnyCore/Rewriters/AutoRevealFunctionDependencies.cs
new file mode 100644
index 00000000000..d8f5cbedab1
--- /dev/null
+++ b/Source/DafnyCore/Rewriters/AutoRevealFunctionDependencies.cs
@@ -0,0 +1,378 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using System.Numerics;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// When Dafny is called with `--default-function-opacity autoRevealDependencies`, this rewriter computes
+/// all transitive functional dependencies for each callable, and inserts (in-memory, on the AST) reveal stmts for each such dependency
+/// at the top of the callable body, and also in a precondition.
+///
+/// For example:
+///   function f()
+///     ensures true
+///   { g(h()) }
+///
+/// would get transformed to:
+///   function f()
+///     requires reveal g(); reveal h(); true
+///     ensures true
+///   {
+///     reveal g(); reveal h();
+///     g(h())
+///   }
+///
+/// assuming that g() and h() don't have the `{:transparent}` attribute.
+/// </summary>
+public class AutoRevealFunctionDependencies : IRewriter {
+  public AutoRevealFunctionDependencies(ErrorReporter reporter) : base(reporter) {
+  }
+
+  internal override void PostResolveIntermediate(ModuleDefinition moduleDefinition) {
+    Contract.Requires(moduleDefinition != null);
+
+    foreach (var decl in moduleDefinition.TopLevelDecls) {
+      if (decl is ICanAutoRevealDependencies m) {
+        m.AutoRevealDependencies(this, Options, Reporter);
+      }
+
+      if (decl is TopLevelDeclWithMembers cl) {
+        foreach (var member in cl.Members) {
+          if (member is ICanAutoRevealDependencies mem) {
+            mem.AutoRevealDependencies(this, Options, Reporter);
+          }
+        }
+      }
+    }
+  }
+
+  /// <summary>
+  /// Wrapper class created for traversing call graphs of modules. It stores the actual call graph vertex and
+  /// a boolean flag `local` indicating whether the callable is in the same module as its predecessor in the traversal.
+  /// </summary>
+  private class GraphTraversalVertex {
+    public readonly Graph<ICallable>.Vertex Vertex;
+    public readonly bool Local;
+    public readonly int Depth;
+
+    public GraphTraversalVertex(Graph<ICallable>.Vertex vertex, bool local, int depth) {
+      Vertex = vertex;
+      Local = local;
+      Depth = depth;
+    }
+
+    public override bool Equals(object obj) {
+      var other = obj as GraphTraversalVertex;
+      return other?.Vertex.N.FullSanitizedName == Vertex.N.FullSanitizedName;
+    }
+
+    public override int GetHashCode() {
+      return HashCode.Combine(Vertex.N.FullSanitizedName);
+    }
+  }
+
+  private static string RenderRevealStmts(List<RevealStmtWithDepth> addedRevealStmtList, int depth = 1) {
+    Contract.Requires(addedRevealStmtList.Any());
+
+    var currentDepth = depth - 1;
+
+    string result = "";
+
+    foreach (var revealStmt in addedRevealStmtList.Where(stmt => stmt.Depth >= depth)) {
+      if (revealStmt.Depth > currentDepth) {
+        currentDepth = revealStmt.Depth;
+        var stmtCount = addedRevealStmtList.Count(stmt => stmt.Depth == currentDepth);
+        result += $"\n\n// depth {currentDepth}: {stmtCount} {(stmtCount == 1 ? "stmt" : "stmts")}\n";
+      }
+
+      result += $"{revealStmt.RevealStmt} ";
+
+
+    }
+    // Removing the initial `\n\n`
+    return result[2..];
+  }
+
+  public static string GenerateMessage(List<RevealStmtWithDepth> addedReveals, int autoRevealDepth = Int32.MaxValue) {
+    var numInsertedReveals = addedReveals.Count(stmt => stmt.Depth <= autoRevealDepth);
+    var message = "";
+
+    message +=
+      $"Found {addedReveals.Count} function {(addedReveals.Count == 1 ? "dependency" : "dependencies")}.";
+
+    message +=
+      $" {numInsertedReveals} reveal {(numInsertedReveals == 1 ? "statement" : "statements")} inserted implicitly.";
+
+    // if (numInsertedReveals < addedReveals.Count) {
+    //   message += $" Remaining:\n{RenderRevealStmts(addedReveals, 1 + autoRevealDepth)}";
+    // } else {
+    message += $" Reveal statements:\n{RenderRevealStmts(addedReveals)}";
+    // }
+
+    return message;
+  }
+
+  public class RevealStmtWithDepth {
+    public RevealStmtWithDepth(HideRevealStmt RevealStmt, int Depth) {
+      this.RevealStmt = RevealStmt;
+      this.Depth = Depth;
+    }
+
+    public override bool Equals(object obj) {
+      var item = obj as RevealStmtWithDepth;
+      return item != null && this.RevealStmt.ToString().Equals(item.RevealStmt.ToString());
+    }
+
+    public override int GetHashCode() {
+      return HashCode.Combine(RevealStmt.ToString());
+    }
+
+    public HideRevealStmt RevealStmt { get; }
+    public int Depth { get; }
+  };
+
+  public record FunctionWithDepth(Function Function, int Depth);
+
+  public IEnumerable<FunctionWithDepth> GetEnumerator(ICallable m, TopLevelDecl currentClass, IEnumerable<Expression> subexpressions, ModuleDefinition rootModule = null) {
+    var origVertex = currentClass.EnclosingModuleDefinition.CallGraph.FindVertex(m);
+    var interModuleVertex = currentClass.EnclosingModuleDefinition.InterModuleCallGraph.FindVertex(m);
+
+    if (origVertex is null) {
+      yield break;
+    }  //vertex can be null if m is a Test method.
+
+    var visited = new HashSet<GraphTraversalVertex>();
+    var queue = new Queue<GraphTraversalVertex>();
+
+    var defaultRootModule = rootModule is null ? currentClass.EnclosingModuleDefinition : rootModule;
+
+    // The rootModule parameter is used in the case when GetEnumerator is called, not on a function from a class, but on subset type expressions.
+    // Here this function may be called with a callable that is in a different module than the original one.
+
+    foreach (var callable in origVertex.Successors) {
+      queue.Enqueue(new GraphTraversalVertex(callable, true, 1));
+    }
+
+    var typeList = ExprListToTypeList(subexpressions.ToList()).ToList();
+
+    if (m is Function f) {
+      typeList.Add(f.ResultType);
+    }
+
+    typeList.ForEach(newType => {
+      if (newType is Type { AsSubsetType: not null }) {
+        foreach (var subexpression in newType.AsSubsetType.Constraint.SubExpressions) {
+          if (subexpression is FunctionCallExpr funcExpr) {
+            var func = funcExpr.Function;
+
+            if (IsRevealable(defaultRootModule.AccessibleMembers, func)) {
+              var newVertex = func.EnclosingClass.EnclosingModuleDefinition.CallGraph.FindVertex(func);
+
+              if (newVertex is not null) {
+                queue.Enqueue(new GraphTraversalVertex(newVertex, false, 1));
+              }
+            }
+          }
+        }
+      }
+    });
+
+    if (interModuleVertex is not null) {
+      foreach (var callable in interModuleVertex.Successors) {
+
+        if (IsRevealable(defaultRootModule.AccessibleMembers, (Declaration)callable.N)) {
+
+          queue.Enqueue(new GraphTraversalVertex(callable, false, 1));
+        }
+      }
+    }
+
+    while (queue.Any()) {
+      var vertex = queue.Dequeue();
+      if (!visited.Contains(vertex)) {
+        visited.Add(vertex);
+
+        Graph<ICallable>.Vertex graphVertex;
+        Graph<ICallable>.Vertex interModuleGraphVertex;
+
+        if (vertex.Local) {
+          graphVertex = vertex.Vertex;
+
+        } else {
+          graphVertex = vertex.Vertex.N.EnclosingModule.CallGraph.FindVertex(vertex.Vertex.N);
+
+          if (graphVertex is null) {
+            continue;
+          }
+        }
+
+        interModuleGraphVertex = graphVertex.N.EnclosingModule.InterModuleCallGraph.FindVertex(graphVertex.N);
+
+        foreach (var vertex0 in graphVertex.Successors) {
+          if (IsRevealable(defaultRootModule.AccessibleMembers, (Declaration)vertex0.N)) {
+            var newGraphTraversalVertex =
+              new GraphTraversalVertex(vertex0, true, 1 + vertex.Depth);
+
+            if (!visited.Contains(newGraphTraversalVertex)) {
+              queue.Enqueue(newGraphTraversalVertex);
+            }
+          }
+        }
+
+        if (interModuleGraphVertex is not null) {
+          foreach (var vertex0 in interModuleGraphVertex.Successors) {
+            if (IsRevealable(defaultRootModule.AccessibleMembers, (Declaration)vertex0.N)) {
+              queue.Enqueue(new GraphTraversalVertex(vertex0, false, 1 + vertex.Depth));
+            }
+          }
+        }
+
+        var callable = graphVertex.N;
+
+        if (callable is Function func && func.IsMadeImplicitlyOpaque(Options)) {
+          yield return new FunctionWithDepth(func, vertex.Depth);
+        }
+      }
+    }
+  }
+
+  private static IEnumerable<Type> ExprListToTypeList(IEnumerable<Expression> exprList) {
+    if (exprList is null || !exprList.Any()) {
+      return new List<Type>();
+    }
+
+    var subExprList = exprList.SelectMany(expr => Triggers.ExprExtensions.AllSubExpressions(expr, false, false));
+
+    var typeList = subExprList.Select(expr => expr.Type);
+
+    return typeList;
+  }
+
+  public IEnumerable<RevealStmtWithDepth> ExprToFunctionalDependencies(Expression expr, ModuleDefinition enclosingModule) {
+    var expressionList = Triggers.ExprExtensions.AllSubExpressions(expr, false, false);
+    var revealStmtList = new List<RevealStmtWithDepth>();
+
+    foreach (var expression in expressionList) {
+      if (expression is FunctionCallExpr funcExpr) {
+        var func = funcExpr.Function;
+
+        if (IsRevealable(enclosingModule.AccessibleMembers, func)) {
+          if (func.IsMadeImplicitlyOpaque(Options)) {
+
+            var revealStmt0 = BuildRevealStmt(func,
+              expr.Origin, enclosingModule);
+
+            if (revealStmt0 is not null) {
+              revealStmtList.Add(new RevealStmtWithDepth(revealStmt0, 1));
+            }
+          }
+
+          foreach (var newFunc in GetEnumerator(func, func.EnclosingClass, new List<Expression> { expr },
+                     enclosingModule)) {
+
+            var revealStmt1 = BuildRevealStmt(newFunc.Function, expr.Origin, enclosingModule);
+
+            if (revealStmt1 is not null) {
+              revealStmtList.Add(new RevealStmtWithDepth(revealStmt1, newFunc.Depth));
+            }
+          }
+        }
+      }
+    }
+
+    revealStmtList = revealStmtList.Distinct().ToList();
+    return revealStmtList;
+  }
+
+  public Expression AddRevealStmtsToExpression(Expression expr, IEnumerable<RevealStmtWithDepth> revealStmtList) {
+    var finalExpr = expr;
+
+    foreach (var revealStmt in revealStmtList) {
+      var oldExpr = finalExpr;
+
+      finalExpr = new StmtExpr(expr.Origin, revealStmt.RevealStmt, oldExpr) {
+        Type = oldExpr.Type
+      };
+    }
+
+    return finalExpr;
+  }
+
+  public static HideRevealStmt BuildRevealStmt(Function func, IOrigin tok, ModuleDefinition rootModule) {
+    List<Type> args = new List<Type>();
+    foreach (var _ in func.EnclosingClass.TypeArgs) {
+      args.Add(new IntType());
+    }
+
+    AccessibleMember accessibleMember = rootModule.AccessibleMembers[func];
+
+    var resolveExpr = ConstructExpressionFromPath(func, accessibleMember);
+
+    var callableClass = ((TopLevelDeclWithMembers)func.EnclosingClass);
+
+    var callableName = HideRevealStmt.RevealLemmaPrefix + func.Name;
+    var member = callableClass.Members.Find(decl => decl.Name == callableName);
+
+    Type.PushScope(callableClass.EnclosingModuleDefinition.VisibilityScope);
+    var receiver = new StaticReceiverExpr(tok, new UserDefinedType(tok, callableName, callableClass, callableClass.TypeArgs.ConvertAll(obj => (Type)Type.Int)), callableClass, true);
+    Type.PopScope(callableClass.EnclosingModuleDefinition.VisibilityScope);
+
+    if (member is null) {
+      return null;
+    }
+
+    callableName = ((ICallable)member).NameRelativeToModule;
+    var rr = new MemberSelectExpr(func.Origin, receiver, new Name(callableName));
+    rr.Type = new InferredTypeProxy();
+    rr.Member = member;
+    rr.TypeApplicationJustMember = new List<Type>();
+    rr.TypeApplicationAtEnclosingClass = args;
+
+    var call = new CallStmt(func.Origin, new List<Expression>(), rr, new List<ActualBinding>(),
+      func.Center);
+    call.IsGhost = true;
+    call.Bindings.AcceptArgumentExpressionsAsExactParameterList(new List<Expression>());
+
+    resolveExpr.Type = new InferredTypeProxy();
+    ((ConcreteSyntaxExpression)resolveExpr).ResolvedExpression = rr;
+
+    List<Expression> expressionList = new List<Expression> {
+      new ApplySuffix(tok, null,
+        resolveExpr,
+        new List<ActualBinding>(), Token.NoToken)
+    };
+
+    var revealStmt = new HideRevealStmt(func.Origin, expressionList, HideRevealCmd.Modes.Reveal);
+    revealStmt.ResolvedStatements.Add(call);
+    revealStmt.IsGhost = true;
+
+    return revealStmt;
+  }
+
+  private static Expression ConstructExpressionFromPath(Function func, AccessibleMember accessibleMember) {
+
+    var topLevelDeclsList = accessibleMember.AccessPath;
+    var nameList = topLevelDeclsList.Where(decl => decl.Name != "_default").ToList();
+
+    nameList.Add(new NameSegment(func.Origin, func.Name, new List<Type>()));
+
+    Expression nameSeed = nameList[0];
+    var resolveExpr = nameList.Skip(1)
+    .Aggregate(nameSeed, (acc, name) => new ExprDotName(func.Origin, acc, name.NameNode, name.OptTypeArguments));
+
+    return resolveExpr;
+  }
+
+  public static bool IsRevealable(Dictionary<Declaration, AccessibleMember> accessibleMembers,
+    Declaration decl) {
+    if (accessibleMembers.TryGetValue(decl, out var member)) {
+      return member.IsRevealed;
+    }
+
+    return false;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Rewriters/BitvectorOptimization.cs b/Source/DafnyCore/Rewriters/BitvectorOptimization.cs
index f73112bfa89..d3e3e8b52d7 100644
--- a/Source/DafnyCore/Rewriters/BitvectorOptimization.cs
+++ b/Source/DafnyCore/Rewriters/BitvectorOptimization.cs
@@ -4,16 +4,12 @@
 using System;
 using System.Linq.Expressions;
 using System.Numerics;
-using Microsoft.Boogie;
 
 namespace Microsoft.Dafny;
 
 public class BitvectorOptimization : IRewriter {
-  private SystemModuleManager systemModuleManager;
-  public BitvectorOptimization(ErrorReporter reporter) : base(reporter) {
-  }
-
-  internal override void PreResolve(Program program) {
+  private readonly SystemModuleManager systemModuleManager;
+  public BitvectorOptimization(Program program, ErrorReporter reporter) : base(reporter) {
     systemModuleManager = program.SystemModuleManager;
   }
 
@@ -42,7 +38,7 @@ private Expression ShrinkBitVectorShiftAmount(Expression expr, BitvectorType ori
     var width = new BigInteger(originalType.Width);
     var intermediateType = new BitvectorType(options, (int)width.GetBitLength());
     systemModuleManager.Bitwidths.Add(intermediateType.Width);
-    var newExpr = new ConversionExpr(expr.tok, expr, intermediateType, "when converting shift amount to a bit vector, the ");
+    var newExpr = new ConversionExpr(expr.Origin, expr, intermediateType, "when converting shift amount to a bit vector, the ");
     newExpr.Type = intermediateType;
     return newExpr;
   }
diff --git a/Source/DafnyCore/Rewriters/ConstructorWarning.cs b/Source/DafnyCore/Rewriters/ConstructorWarning.cs
index aae14d68393..37597109482 100644
--- a/Source/DafnyCore/Rewriters/ConstructorWarning.cs
+++ b/Source/DafnyCore/Rewriters/ConstructorWarning.cs
@@ -61,7 +61,7 @@ private void CheckPattern(ExtendedPattern pattern) {
         CheckPattern(nestedPattern);
       }
       if (!idPattern.HasParenthesis) {
-        reporter.Warning(MessageSource.Rewriter, ErrorId.rw_warn_constructor_parentheses, idPattern.tok,
+        reporter.Warning(MessageSource.Rewriter, ErrorId.rw_warn_constructor_parentheses, idPattern.Origin,
           $"Constructor name '{idPattern}' should be followed by parentheses");
       }
     }
diff --git a/Source/DafnyCore/Rewriters/ExpandAtAttributes.cs b/Source/DafnyCore/Rewriters/ExpandAtAttributes.cs
new file mode 100644
index 00000000000..a00539e55ec
--- /dev/null
+++ b/Source/DafnyCore/Rewriters/ExpandAtAttributes.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// Expands @Attribute to their previous version {:attribute} when recognized
+/// Marks recognized user-supplied @-attributes as .Builtin = true
+/// That way, only those not .Builtin are resolved.
+/// </summary>
+public class ExpandAtAttributes : IRewriter {
+  private readonly SystemModuleManager systemModuleManager;
+  public ExpandAtAttributes(Program program, ErrorReporter reporter)
+    : base(reporter) {
+    Contract.Requires(reporter != null);
+    Contract.Requires(systemModuleManager != null);
+    systemModuleManager = program.SystemModuleManager;
+  }
+
+  internal override void PreResolve(Program program) {
+    program.Visit((INode node) => {
+      if (node is not IAttributeBearingDeclaration attributeHost) {
+        return true;
+      }
+
+      Attributes extraAttrs = null;
+      foreach (var attr in attributeHost.Attributes.AsEnumerable()) {
+        if (attr is not UserSuppliedAtAttribute userSuppliedAtAttribute) {
+          continue;
+        }
+
+        var newAttributes = Attributes.ExpandAtAttribute(program, userSuppliedAtAttribute, attributeHost);
+        Attributes.MergeInto(ref newAttributes, ref extraAttrs);
+      }
+
+      var newAttrs = attributeHost.Attributes;
+      Attributes.MergeInto(ref extraAttrs, ref newAttrs);
+      attributeHost.Attributes = newAttrs;
+
+      return true;
+    });
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Rewriters/ExpectContracts.cs b/Source/DafnyCore/Rewriters/ExpectContracts.cs
index f1d97f2019b..7966bce7121 100644
--- a/Source/DafnyCore/Rewriters/ExpectContracts.cs
+++ b/Source/DafnyCore/Rewriters/ExpectContracts.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
-using Microsoft.Extensions.Logging.Abstractions;
 using static Microsoft.Dafny.RewriterErrors;
 
 namespace Microsoft.Dafny;
@@ -19,10 +18,10 @@ namespace Microsoft.Dafny;
 public class ExpectContracts : IRewriter {
   private readonly ClonerButDropMethodBodies cloner = new(true);
   private readonly Dictionary<MemberDecl, MemberDecl> wrappedDeclarations = new();
-  private readonly CallRedirector callRedirector;
+  private readonly SystemModuleManager systemModuleManager;
 
-  public ExpectContracts(ErrorReporter reporter) : base(reporter) {
-    callRedirector = new(reporter);
+  public ExpectContracts(ErrorReporter reporter, SystemModuleManager systemModuleManager) : base(reporter) {
+    this.systemModuleManager = systemModuleManager;
   }
 
   /// <summary>
@@ -38,18 +37,17 @@ public ExpectContracts(ErrorReporter reporter) : base(reporter) {
   /// failure message.</param>
   /// <returns>The newly-created expect statement.</returns>
   private Statement CreateContractExpectStatement(AttributedExpression expr, string exprType) {
-    var tok = expr.E.tok;
+    var tok = expr.E.Origin;
     var msg = $"Runtime failure of {exprType} clause from {tok.TokenToString(Reporter.Options)}";
     var exprToCheck = expr.E;
     if (ExpressionTester.UsesSpecFeatures(exprToCheck)) {
       ReportWarning(ErrorId.rw_clause_cannot_be_compiled, tok,
         $"The {exprType} clause at this location cannot be compiled to be tested at runtime because it references ghost state.");
-      exprToCheck = new LiteralExpr(tok, true);
-      exprToCheck.Type = Type.Bool;
+      exprToCheck = Expression.CreateBoolLiteral(tok, true);
       msg += " (not compiled because it references ghost state)";
     }
     var msgExpr = Expression.CreateStringLiteral(tok, msg);
-    return new ExpectStmt(expr.E.RangeToken, exprToCheck, msgExpr, null);
+    return new ExpectStmt(expr.E.Origin, exprToCheck, msgExpr, null);
   }
 
   /// <summary>
@@ -69,13 +67,11 @@ private BlockStmt MakeContractCheckingBody(IEnumerable<AttributedExpression> req
       CreateContractExpectStatement(ens, "ensures"));
     var callStmtList = new List<Statement>() { callStmt };
     var bodyStatements = expectRequiresStmts.Concat(callStmtList).Concat(expectEnsuresStmts);
-    return new BlockStmt(callStmt.RangeToken, bodyStatements.ToList());
+    return new BlockStmt(callStmt.Origin, bodyStatements.ToList());
   }
 
   private bool ShouldGenerateWrapper(MemberDecl decl) {
-    return !decl.IsGhost &&
-           decl is not Constructor &&
-           CallRedirector.HasExternAttribute(decl);
+    return !decl.IsGhost && CallRedirector.HasExternAttribute(decl);
   }
 
   /// <summary>
@@ -86,8 +82,8 @@ decl is not Constructor &&
   /// </summary>
   /// <param name="parent">The declaration containing the on to be wrapped.</param>
   /// <param name="decl">The declaration to be wrapped.</param>
-  private void GenerateWrapper(TopLevelDeclWithMembers parent, MemberDecl decl) {
-    var tok = decl.tok;
+  private void GenerateWrapper(ModuleDefinition module, TopLevelDeclWithMembers parent, MemberDecl decl) {
+    var tok = decl.Origin;
 
     var newName = decl.Name + "__dafny_checked";
     MemberDecl newDecl = null;
@@ -105,108 +101,88 @@ private void GenerateWrapper(TopLevelDeclWithMembers parent, MemberDecl decl) {
       newDecl.EnclosingClass = parent;
       wrappedDeclarations.Add(decl, newDecl);
       parent.Members.Add(newDecl);
-      callRedirector.AddFullName(newDecl, decl.FullName + "__dafny_checked");
+      module.CallRedirector.AddFullName(newDecl, decl.FullName + "__dafny_checked");
     }
   }
 
   private MemberDecl GenerateFunctionWrapper(TopLevelDeclWithMembers parent, MemberDecl decl, Function origFunc,
-    string newName, IToken tok) {
+    string newName, IOrigin tok) {
     var newFunc = cloner.CloneFunction(origFunc);
     newFunc.NameNode.Value = newName;
 
-    var args = newFunc.Formals.Select(Expression.CreateIdentExpr).ToList();
-    var receiver = ModuleResolver.GetReceiver(parent, origFunc, decl.tok);
-    var callExpr = new FunctionCallExpr(tok, origFunc.Name, receiver, null, null, args) {
-      Function = origFunc,
-      TypeApplication_JustFunction = newFunc.TypeArgs.Select(tp => (Type)new UserDefinedType(tp)).ToList(),
-      TypeApplication_AtEnclosingClass = parent.TypeArgs.Select(tp => (Type)new UserDefinedType(tp)).ToList(),
-      Type = newFunc.ResultType,
-    };
+    var args = newFunc.Ins.Select(Expression.CreateIdentExpr).ToList();
+    var receiver = ModuleResolver.GetReceiver(parent, origFunc, decl.Origin);
+    var callExpr = Expression.CreateResolvedCall(tok, receiver, origFunc, args,
+      newFunc.TypeArgs.Select(tp => (Type)new UserDefinedType(tp)).ToList(), systemModuleManager);
 
     newFunc.Body = callExpr;
 
-    var localName = origFunc.Result?.Name ?? "__result";
-    var localExpr = new IdentifierExpr(tok, localName) {
-      Type = newFunc.ResultType
-    };
+    var resultVar = origFunc.Result ?? new Formal(tok, "#result", newFunc.ResultType, false, false, null);
+    var localExpr = Expression.CreateIdentExpr(resultVar);
 
     var callRhs = new ExprRhs(callExpr);
-
-    var lhss = new List<Expression> { localExpr };
-    var rhss = new List<AssignmentRhs> { callRhs };
-
-    var assignStmt = new AssignStmt(decl.RangeToken, localExpr, callRhs);
-    Statement callStmt;
-    if (origFunc.Result?.Name is null) {
-      var local = new LocalVariable(decl.RangeToken, localName, newFunc.ResultType, false);
-      local.type = newFunc.ResultType;
-      var locs = new List<LocalVariable> { local };
-      var varDeclStmt = new VarDeclStmt(decl.RangeToken, locs, new UpdateStmt(decl.RangeToken, lhss, rhss) {
-        ResolvedStatements = new List<Statement>() { assignStmt }
-      });
-      localExpr.Var = local;
-      callStmt = varDeclStmt;
-    } else {
-      localExpr.Var = origFunc.Result;
-      callStmt = assignStmt;
-    }
+    var callStmt = new SingleAssignStmt(decl.Origin, localExpr, callRhs);
 
     var body = MakeContractCheckingBody(origFunc.Req, origFunc.Ens, callStmt);
 
-    if (origFunc.Result?.Name is null) {
-      body.AppendStmt(new ReturnStmt(decl.RangeToken, new List<AssignmentRhs> { new ExprRhs(localExpr) }));
-    }
-
+    newFunc.ByMethodTok = Token.NoToken;
     newFunc.ByMethodBody = body;
     // We especially want to remove {:extern} from the wrapper, but also any other attributes.
     newFunc.Attributes = null;
-    RegisterResolvedByMethod(newFunc, parent);
+    RegisterResolvedByMethod(resultVar, newFunc, parent);
 
     return newFunc;
   }
 
   private MemberDecl GenerateMethodWrapper(TopLevelDeclWithMembers parent, MemberDecl decl, Method origMethod,
     string newName) {
-    MemberDecl newDecl;
     var newMethod = cloner.CloneMethod(origMethod);
     newMethod.NameNode.Value = newName;
 
     var args = newMethod.Ins.Select(Expression.CreateIdentExpr).ToList();
     var outs = newMethod.Outs.Select(Expression.CreateIdentExpr).ToList();
-    var receiver = ModuleResolver.GetReceiver(parent, origMethod, decl.tok);
-    var memberSelectExpr = new MemberSelectExpr(decl.tok, receiver, origMethod.Name);
+    var receiver = ModuleResolver.GetReceiver(parent, origMethod, decl.Origin);
+    var memberSelectExpr = new MemberSelectExpr(decl.Origin, receiver, origMethod.NameNode);
     memberSelectExpr.Member = origMethod;
-    memberSelectExpr.TypeApplication_JustMember =
+    memberSelectExpr.TypeApplicationJustMember =
       newMethod.TypeArgs.Select(tp => (Type)new UserDefinedType(tp)).ToList();
-    memberSelectExpr.TypeApplication_AtEnclosingClass =
+    memberSelectExpr.TypeApplicationAtEnclosingClass =
       parent.TypeArgs.Select(tp => (Type)new UserDefinedType(tp)).ToList();
-    var callStmt = new CallStmt(decl.RangeToken, outs, memberSelectExpr, args);
+    var callStmt = new CallStmt(decl.Origin, outs, memberSelectExpr, args);
 
     var body = MakeContractCheckingBody(origMethod.Req, origMethod.Ens, callStmt);
     newMethod.Body = body;
-    newDecl = newMethod;
-    return newDecl;
+    return newMethod;
   }
 
 
-  private static void RegisterResolvedByMethod(Function f, TopLevelDeclWithMembers cl) {
+  private void RegisterResolvedByMethod(Formal resultVar, Function f, TopLevelDeclWithMembers cl) {
 
     var tok = f.ByMethodTok;
-    var resultVar = f.Result ?? new Formal(tok, "#result", f.ResultType, false, false, null);
     var r = Expression.CreateIdentExpr(resultVar);
     // To construct the receiver, we want to know if the function is static or instance. That information is ordinarily computed
     // by f.IsStatic, which looks at f.HasStaticKeyword and f.EnclosingClass. However, at this time, f.EnclosingClass hasn't yet
     // been set. Instead, we compute here directly from f.HasStaticKeyword and "cl".
     var isStatic = f.HasStaticKeyword || cl is DefaultClassDecl;
-    var receiver = isStatic ? (Expression)new StaticReceiverExpr(tok, cl, true) : new ImplicitThisExpr(tok);
-    var fn = new FunctionCallExpr(tok, f.Name, receiver, null, null,
-      f.Formals.ConvertAll(Expression.CreateIdentExpr));
+    var receiver = isStatic ? (Expression)new StaticReceiverExpr(tok, cl, true) : new ImplicitThisExpr(tok) {
+      Type = UserDefinedType.FromTopLevelDecl(Token.NoToken, cl)
+    };
+    var fn = Expression.CreateResolvedCall(tok, receiver, f, f.Ins.ConvertAll(Expression.CreateIdentExpr),
+      f.TypeArgs.ConvertAll(typeParameter => (Type)new UserDefinedType(f.Origin, typeParameter)), systemModuleManager);
     var post = new AttributedExpression(new BinaryExpr(tok, BinaryExpr.Opcode.Eq, r, fn) {
       Type = Type.Bool
     });
-    var method = new Method(f.RangeToken, f.NameNode, f.HasStaticKeyword, false, f.TypeArgs,
-      f.Formals, new List<Formal>() { resultVar },
-      f.Req, new Specification<FrameExpression>(new List<FrameExpression>(), null), new List<AttributedExpression>() { post }, f.Decreases,
+    // If f.Reads is empty, replace it with an explicit `reads {}` so that we don't replace that
+    // with the default `reads *` for methods later.
+    var reads = f.Reads;
+    if (!reads.Expressions.Any()) {
+      reads = new Specification<FrameExpression>();
+      var emptySet = new SetDisplayExpr(tok, true, new List<Expression>());
+      reads.Expressions.Add(new FrameExpression(tok, emptySet, null));
+    }
+    var method = new Method(f.Origin, f.NameNode, f.HasStaticKeyword, false, f.TypeArgs,
+      f.Ins, new List<Formal>() { resultVar },
+      f.Req, reads, new Specification<FrameExpression>(new List<FrameExpression>(), null), new List<AttributedExpression>() { post }, f.Decreases,
       f.ByMethodBody, f.Attributes, null, true);
     Contract.Assert(f.ByMethodDecl == null);
     method.InheritVisibility(f);
@@ -216,126 +192,146 @@ private static void RegisterResolvedByMethod(Function f, TopLevelDeclWithMembers
   }
 
   /// <summary>
-  /// Add wrappers for certain top-level declarations in the given module.
-  /// This runs after the first pass of resolution so that it has access to
-  /// ghostness information, attributes and call targets.
+  /// Adds wrappers for certain top-level declarations in the given
+  /// program and redirects callers to call those wrappers instead of
+  /// the original members.
+  ///
+  /// This runs after resolution so that it has access to ghostness
+  /// information, attributes and call targets and after verification
+  /// because that makes the interaction with the refinement transformer
+  /// more straightforward.
   /// </summary>
-  /// <param name="moduleDefinition">The module to generate wrappers for and in.</param>
-  internal override void PostResolveIntermediate(ModuleDefinition moduleDefinition) {
-    // Keep a list of members to wrap so that we don't modify the collection we're iterating over.
-    List<(TopLevelDeclWithMembers, MemberDecl)> membersToWrap = new();
-
-    // Find module members to wrap.
-    foreach (var topLevelDecl in moduleDefinition.TopLevelDecls.OfType<TopLevelDeclWithMembers>()) {
-      foreach (var decl in topLevelDecl.Members) {
-        if (ShouldGenerateWrapper(decl)) {
-          membersToWrap.Add((topLevelDecl, decl));
-        }
-      }
-    }
+  /// <param name="program">The program to generate wrappers for and in.</param>
+  public override void PostVerification(Program program) {
+    // Create wrappers
+    foreach (var moduleDefinition in program.Modules()) {
 
-    // Generate a wrapper for each of the members identified above.
-    foreach (var (topLevelDecl, decl) in membersToWrap) {
-      GenerateWrapper(topLevelDecl, decl);
-    }
-    callRedirector.NewRedirections = wrappedDeclarations;
-  }
+      // Keep a list of members to wrap so that we don't modify the collection we're iterating over.
+      List<(TopLevelDeclWithMembers, MemberDecl)> membersToWrap = new();
 
-  /// <summary>
-  /// This class implements a top-down AST traversal to replace certain
-  /// function and method calls with calls to wrappers that dynamically
-  /// check contracts using expect statements.
-  /// </summary>
-  private class CallRedirector : TopDownVisitor<MemberDecl> {
-    public Dictionary<MemberDecl, MemberDecl> NewRedirections { get; set; } = new();
-    private readonly Dictionary<MemberDecl, string> newFullNames = new();
-    private readonly ErrorReporter reporter;
-    public HashSet<MemberDecl> CalledWrappers { get; } = new();
-
-    public CallRedirector(ErrorReporter reporter) {
-      this.reporter = reporter;
-    }
+      moduleDefinition.CallRedirector = new(Reporter);
 
-    internal void AddFullName(MemberDecl decl, string fullName) {
-      newFullNames.Add(decl, fullName);
-    }
+      // Find module members to wrap.
+      foreach (var topLevelDecl in moduleDefinition.TopLevelDecls.OfType<TopLevelDeclWithMembers>()) {
+        foreach (var decl in topLevelDecl.Members) {
+          if (ShouldGenerateWrapper(decl)) {
+            membersToWrap.Add((topLevelDecl, decl));
+          }
+        }
+      }
 
-    internal static bool HasTestAttribute(MemberDecl decl) {
-      return decl.Attributes is not null && Attributes.Contains(decl.Attributes, "test");
+      // Generate a wrapper for each of the members identified above. This
+      // need to happen after all declarations to wrap have been identified
+      // because it adds new declarations and would invalidate the iterator
+      // used during identification.
+      foreach (var (topLevelDecl, decl) in membersToWrap) {
+        GenerateWrapper(moduleDefinition, topLevelDecl, decl);
+      }
+      moduleDefinition.CallRedirector.NewRedirections = wrappedDeclarations;
+
+      // Put redirections in place. Any wrappers to call will be in either
+      // this module or to a previously-processed module, so they'll already
+      // exist.
+      foreach (var topLevelDecl in moduleDefinition.TopLevelDecls.OfType<TopLevelDeclWithMembers>()) {
+        foreach (var decl in topLevelDecl.Members) {
+          if (decl is ICallable callable) {
+            moduleDefinition.CallRedirector?.Visit(callable, decl);
+          }
+        }
+      }
     }
 
-    internal static bool HasExternAttribute(MemberDecl decl) {
-      return decl.Attributes is not null && Attributes.Contains(decl.Attributes, "extern");
+    if (Reporter.Options.TestContracts != DafnyOptions.ContractTestingMode.TestedExterns) {
+      return;
     }
 
-    private bool ShouldCallWrapper(MemberDecl caller, MemberDecl callee) {
-      if (!HasExternAttribute(callee)) {
-        return false;
+    foreach (var module in program.Modules()) {
+      if (module.CallRedirector == null) {
+        continue;
       }
-      // If there's no wrapper for the callee, don't try to call it, but warn.
-      if (!NewRedirections.ContainsKey(callee)) {
-        reporter.Warning(MessageSource.Rewriter, ErrorId.rw_no_wrapper, caller.tok, $"Internal: no wrapper for {callee.FullDafnyName}");
-        return false;
+      // If running in TestedExterns, warn if any extern has no corresponding test.
+      var uncalledRedirections =
+        module.CallRedirector.NewRedirections.ExceptBy(module.CallRedirector.CalledWrappers, x => x.Value);
+      foreach (var uncalledRedirection in uncalledRedirections) {
+        var uncalledOriginal = uncalledRedirection.Key;
+        ReportWarning(ErrorId.rw_unreachable_by_test, uncalledOriginal.Origin, $"No :test code calls {uncalledOriginal.FullDafnyName}");
       }
-
-      var opt = reporter.Options.TestContracts;
-      return ((HasTestAttribute(caller) && opt == DafnyOptions.ContractTestingMode.TestedExterns) ||
-              (opt == DafnyOptions.ContractTestingMode.Externs)) &&
-             // Skip if the caller is a wrapper, otherwise it'd just call itself recursively.
-             !NewRedirections.ContainsValue(caller);
     }
 
-    protected override bool VisitOneExpr(Expression expr, ref MemberDecl decl) {
-      if (expr is FunctionCallExpr fce) {
-        var f = fce.Function;
-        if (ShouldCallWrapper(decl, f)) {
-          var newTarget = NewRedirections[f];
-          var resolved = (FunctionCallExpr)fce.Resolved;
-          resolved.Function = (Function)newTarget;
-          resolved.Name = newTarget.Name;
-          CalledWrappers.Add(newTarget);
-        }
-      }
+  }
+}
 
-      return true;
-    }
+/// <summary>
+/// This class implements a top-down AST traversal to replace certain
+/// function and method calls with calls to wrappers that dynamically
+/// check contracts using expect statements.
+/// </summary>
+public class CallRedirector : TopDownVisitor<MemberDecl> {
+  public Dictionary<MemberDecl, MemberDecl> NewRedirections { get; set; } = new();
+  private readonly Dictionary<MemberDecl, string> newFullNames = new();
+  private readonly ErrorReporter reporter;
+  public HashSet<MemberDecl> CalledWrappers { get; } = new();
+
+  public CallRedirector(ErrorReporter reporter) {
+    this.reporter = reporter;
+  }
 
-    protected override bool VisitOneStmt(Statement stmt, ref MemberDecl decl) {
-      if (stmt is CallStmt cs) {
-        var m = cs.Method;
-        if (ShouldCallWrapper(decl, m)) {
-          var newTarget = NewRedirections[m];
-          var resolved = (MemberSelectExpr)cs.MethodSelect.Resolved;
-          resolved.Member = newTarget;
-          resolved.MemberName = newTarget.Name;
-          CalledWrappers.Add(newTarget);
-        }
-      }
+  internal void AddFullName(MemberDecl decl, string fullName) {
+    newFullNames.Add(decl, fullName);
+  }
+
+  internal static bool HasTestAttribute(MemberDecl decl) {
+    return decl.Attributes is not null && Attributes.Contains(decl.Attributes, "test");
+  }
+
+  internal static bool HasExternAttribute(MemberDecl decl) {
+    return decl.Attributes is not null && Attributes.Contains(decl.Attributes, "extern");
+  }
 
-      return true;
+  private bool ShouldCallWrapper(MemberDecl caller, MemberDecl callee) {
+    if (!HasExternAttribute(callee)) {
+      return false;
+    }
+    // If there's no wrapper for the callee, don't try to call it, but warn.
+    if (!NewRedirections.ContainsKey(callee)) {
+      reporter.Warning(MessageSource.Rewriter, ErrorId.rw_no_wrapper, caller.Origin, $"Internal: no wrapper for {callee.FullDafnyName}");
+      return false;
     }
+
+    var opt = reporter.Options.TestContracts;
+    return ((HasTestAttribute(caller) && opt == DafnyOptions.ContractTestingMode.TestedExterns) ||
+            (opt == DafnyOptions.ContractTestingMode.Externs)) &&
+           // Skip if the caller is a wrapper, otherwise it'd just call itself recursively.
+           !NewRedirections.ContainsValue(caller);
   }
 
-  public override void PostVerification(Program program) {
-    foreach (var topLevelDecl in
-             program.CompileModules.SelectMany(m => m.TopLevelDecls.OfType<TopLevelDeclWithMembers>())) {
-      foreach (var decl in topLevelDecl.Members) {
-        if (decl is ICallable callable) {
-          callRedirector.Visit(callable, decl);
-        }
+  protected override bool VisitOneExpr(Expression expr, ref MemberDecl decl) {
+    if (expr is FunctionCallExpr fce) {
+      var f = fce.Function;
+      if (ShouldCallWrapper(decl, f)) {
+        var newTarget = NewRedirections[f];
+        var resolved = (FunctionCallExpr)fce.Resolved;
+        resolved.Function = (Function)newTarget;
+        resolved.NameNode = newTarget.NameNode;
+        CalledWrappers.Add(newTarget);
       }
     }
 
-    if (Reporter.Options.TestContracts != DafnyOptions.ContractTestingMode.TestedExterns) {
-      return;
-    }
+    return true;
+  }
 
-    // If running in TestedExterns, warn if any extern has no corresponding test.
-    var uncalledRedirections =
-      callRedirector.NewRedirections.ExceptBy(callRedirector.CalledWrappers, x => x.Value);
-    foreach (var uncalledRedirection in uncalledRedirections) {
-      var uncalledOriginal = uncalledRedirection.Key;
-      ReportWarning(ErrorId.rw_unreachable_by_test, uncalledOriginal.tok, $"No :test code calls {uncalledOriginal.FullDafnyName}");
+  protected override bool VisitOneStmt(Statement stmt, ref MemberDecl decl) {
+    if (stmt is CallStmt cs) {
+      var m = cs.Method;
+      if (ShouldCallWrapper(decl, m)) {
+        var newTarget = NewRedirections[m];
+        var resolved = (MemberSelectExpr)cs.MethodSelect.Resolved;
+        resolved.Member = newTarget;
+        resolved.MemberNameNode = newTarget.NameNode;
+        CalledWrappers.Add(newTarget);
+      }
     }
+
+    return true;
   }
 }
diff --git a/Source/DafnyCore/Rewriters/ForallStmtRewriter.cs b/Source/DafnyCore/Rewriters/ForallStmtRewriter.cs
index 7d08bddf500..31c3caf2f73 100644
--- a/Source/DafnyCore/Rewriters/ForallStmtRewriter.cs
+++ b/Source/DafnyCore/Rewriters/ForallStmtRewriter.cs
@@ -4,7 +4,9 @@
 
 namespace Microsoft.Dafny;
 
-/// write out the quantifier for ForallStmt
+/// <summary>
+/// Fills the field ForallStmt.EffectiveEnsuresClauses
+/// </summary>
 public class ForallStmtRewriter : IRewriter {
   public ForallStmtRewriter(ErrorReporter reporter) : base(reporter) {
     Contract.Requires(reporter != null);
@@ -24,65 +26,121 @@ public ForAllStmtVisitor(ErrorReporter reporter) {
       this.reporter = reporter;
     }
     protected override bool VisitOneStmt(Statement stmt, ref bool st) {
-      if (stmt is ForallStmt && ((ForallStmt)stmt).CanConvert) {
-        ForallStmt s = (ForallStmt)stmt;
-        if (s.Kind == ForallStmt.BodyKind.Proof) {
-          Expression term = s.Ens.Count != 0 ? s.Ens[0].E : Expression.CreateBoolLiteral(s.Tok, true);
-          for (int i = 1; i < s.Ens.Count; i++) {
-            term = new BinaryExpr(s.Tok, BinaryExpr.ResolvedOpcode.And, term, s.Ens[i].E);
-          }
-          List<Expression> exprList = new List<Expression>();
-          ForallExpr expr = new ForallExpr(s.Tok, s.RangeToken, s.BoundVars, s.Range, term, s.Attributes);
-          expr.Type = Type.Bool; // resolve here
-          expr.Bounds = s.Bounds;
-          exprList.Add(expr);
-          s.ForallExpressions = exprList;
-        } else if (s.Kind == ForallStmt.BodyKind.Assign) {
-          if (s.BoundVars.Count != 0) {
-            var s0 = (AssignStmt)s.S0;
-            if (s0.Rhs is ExprRhs) {
-              List<Expression> exprList = new List<Expression>();
-              Expression Fi = null;
-              Func<Expression, Expression> lhsBuilder = null;
-              var lhs = s0.Lhs.Resolved;
-              var i = s.BoundVars[0];
-              if (s.BoundVars.Count == 1) {
-                //var lhsContext = null;
-                // Detect the following cases:
-                //   0: forall i | R(i) { F(i).f := E(i); }
-                //   1: forall i | R(i) { A[F(i)] := E(i); }
-                //   2: forall i | R(i) { F(i)[N] := E(i); }
-                if (lhs is MemberSelectExpr) {
-                  var ll = (MemberSelectExpr)lhs;
-                  Fi = ll.Obj;
-                  lhsBuilder = e => {
-                    var l = new MemberSelectExpr(ll.tok, e, ll.MemberName);
-                    l.Member = ll.Member;
-                    l.TypeApplication_AtEnclosingClass = ll.TypeApplication_AtEnclosingClass;
-                    l.TypeApplication_JustMember = ll.TypeApplication_JustMember;
-                    l.Type = ll.Type;
-                    return l;
-                  };
-                } else if (lhs is SeqSelectExpr) {
-                  var ll = (SeqSelectExpr)lhs;
-                  Contract.Assert(ll.SelectOne);
-                  if (!FreeVariablesUtil.ContainsFreeVariable(ll.Seq, false, i)) {
-                    Fi = ll.E0;
-                    lhsBuilder = e => { var l = new SeqSelectExpr(ll.tok, true, ll.Seq, e, null, ll.CloseParen); l.Type = ll.Type; return l; };
-                  } else if (!FreeVariablesUtil.ContainsFreeVariable(ll.E0, false, i)) {
-                    Fi = ll.Seq;
-                    lhsBuilder = e => { var l = new SeqSelectExpr(ll.tok, true, e, ll.E0, null, ll.CloseParen); l.Type = ll.Type; return l; };
-                  }
-                }
+      if (stmt is not ForallStmt { CanConvert: true } forallStmt) {
+        return true; //visit the sub-parts with the same "st"
+      }
+
+      switch (forallStmt.Kind) {
+        case ForallStmt.BodyKind.Proof:
+          VisitProof(forallStmt);
+          break;
+        case ForallStmt.BodyKind.Assign:
+          VisitAssign(forallStmt);
+          break;
+        case ForallStmt.BodyKind.Call:
+          VisitCall(forallStmt);
+          break;
+        default:
+          Contract.Assert(false);  // unexpected kind
+          break;
+      }
+      return true;  //visit the sub-parts with the same "st"
+    }
+
+    private static void VisitCall(ForallStmt s) {
+      var s0 = (CallStmt)s.S0;
+      var argsSubstMap = new Dictionary<IVariable, Expression>(); // maps formal arguments to actuals
+      Contract.Assert(s0.Method.Ins.Count == s0.Args.Count);
+      for (int i = 0; i < s0.Method.Ins.Count; i++) {
+        argsSubstMap.Add(s0.Method.Ins[i], s0.Args[i]);
+      }
+
+      var substituter = new AlphaConvertingSubstituter(s0.Receiver, argsSubstMap,
+        s0.MethodSelect.TypeArgumentSubstitutionsWithParents());
+      // Strengthen the range of the "forall" statement with the precondition of the call, suitably substituted with the actual parameters.
+      if (Attributes.Contains(s.Attributes, "_autorequires")) {
+        var range = s.Range;
+        foreach (var req in s0.Method.Req) {
+          var p = substituter.Substitute(req.E); // substitute the call's actuals for the method's formals
+          range = Expression.CreateAnd(range, p);
+        }
+
+        s.Range = range;
+      }
+
+      // substitute the call's actuals for the method's formals
+      var term = s0.Method.Ens.Count != 0
+        ? substituter.Substitute(s0.Method.Ens[0].E)
+        : Expression.CreateBoolLiteral(new AutoGeneratedOrigin(s.Origin), true);
+      for (int i = 1; i < s0.Method.Ens.Count; i++) {
+        term = new BinaryExpr(s0.Method.Ens[i].Origin, BinaryExpr.ResolvedOpcode.And, term,
+          substituter.Substitute(s0.Method.Ens[i].E));
+      }
+
+      var expr = new ForallExpr(new AutoGeneratedOrigin(s.Origin), s.BoundVars, s.Range, term, s.Attributes) {
+        Type = Type.Bool, // resolve here
+        Bounds = s.Bounds
+      };
+      s.EffectiveEnsuresClauses = new List<Expression> { expr };
+    }
+
+    private void VisitAssign(ForallStmt stmt) {
+      if (stmt.BoundVars.Count == 0) {
+        return;
+      }
+
+      var s0 = (SingleAssignStmt)stmt.S0;
+      if (s0.Rhs is not ExprRhs exprRhs) {
+        return;
+      }
+
+      List<Expression> exprList = new List<Expression>();
+      Expression Fi = null;
+      Func<Expression, Expression> lhsBuilder = null;
+      var lhs = s0.Lhs.Resolved;
+      var i = stmt.BoundVars[0];
+      if (stmt.BoundVars.Count == 1) {
+        // Detect the following cases:
+        //   0: forall i | R(i) { F(i).f := E(i); }
+        //   1: forall i | R(i) { A[F(i)] := E(i); }
+        //   2: forall i | R(i) { F(i)[N] := E(i); }
+        switch (lhs) {
+          case MemberSelectExpr memberSelect:
+            Fi = memberSelect.Obj;
+            lhsBuilder = e => new MemberSelectExpr(memberSelect.Origin, e, memberSelect.MemberNameNode) {
+              Member = memberSelect.Member,
+              TypeApplicationAtEnclosingClass = memberSelect.TypeApplicationAtEnclosingClass,
+              TypeApplicationJustMember = memberSelect.TypeApplicationJustMember,
+              Type = memberSelect.Type
+            };
+            break;
+          case SeqSelectExpr ll: {
+              Contract.Assert(ll.SelectOne);
+              if (!FreeVariablesUtil.ContainsFreeVariable(ll.Seq, false, i)) {
+                Fi = ll.E0;
+                lhsBuilder = e => new SeqSelectExpr(ll.Origin, true, ll.Seq, e, null, ll.CloseParen) {
+                  Type = ll.Type
+                };
+              } else if (!FreeVariablesUtil.ContainsFreeVariable(ll.E0, false, i)) {
+                Fi = ll.Seq;
+                lhsBuilder = e => new SeqSelectExpr(ll.Origin, true, e, ll.E0, null, ll.CloseParen) {
+                  Type = ll.Type
+                };
               }
-              var rhs = ((ExprRhs)s0.Rhs).Expr;
-              bool usedInversion = false;
-              if (Fi != null) {
-                var j = new BoundVar(i.tok, i.Name + "#inv", Fi.Type);
-                var jj = Expression.CreateIdentExpr(j);
-                var jList = new List<BoundVar>() { j };
-                var range = Expression.CreateAnd(ModuleResolver.GetImpliedTypeConstraint(i, i.Type), s.Range);
-                var vals = InvertExpression(i, j, range, Fi);
+
+              break;
+            }
+        }
+      }
+
+      var rhs = exprRhs.Expr;
+      bool usedInversion = false;
+      if (Fi != null) {
+        var j = new BoundVar(i.Origin, i.Name + "#inv", Fi.Type);
+        var jj = Expression.CreateIdentExpr(j);
+        var jList = new List<BoundVar>() { j };
+        var range = Expression.CreateAnd(ModuleResolver.GetImpliedTypeConstraint(i, i.Type), stmt.Range);
+        var vals = InvertExpression(i, j, range, Fi);
 #if DEBUG_PRINT
           resolve.Options.Writer.WriteLine("DEBUG: Trying to invert:");
           resolve.Options.Writer.WriteLine("DEBUG:   " + Printer.ExprToString(s.Range) + " && " + j.Name + " == " + Printer.ExprToString(Fi));
@@ -95,78 +153,60 @@ protected override bool VisitOneStmt(Statement stmt, ref bool st) {
             }
           }
 #endif
-                if (vals != null) {
-                  foreach (var val in vals) {
-                    lhs = lhsBuilder(jj);
-                    Attributes attributes = new Attributes("trigger", new List<Expression>() { lhs }, s.Attributes);
-                    var newRhs = Substitute(rhs, i, val.FInverse);
-                    var newBounds = SubstituteBoundedPoolList(s.Bounds, i, val.FInverse);
+        if (vals != null) {
+          foreach (var val in vals) {
+            lhs = lhsBuilder(jj);
+            Attributes attributes = new Attributes("trigger", new List<Expression>() { lhs }, stmt.Attributes);
+            var newRhs = Substitute(rhs, i, val.FInverse);
+            var newBounds = SubstituteBoundedPoolList(stmt.Bounds, i, val.FInverse);
 
-                    var msg = string.Format("rewrite: forall {0}: {1} {2}| {3} {{ {4} := {5}; }}",
-                      j.Name,
-                      j.Type.ToString(),
-                      Printer.AttributesToString(reporter.Options, attributes),
-                      Printer.ExprToString(reporter.Options, val.Range),
-                      Printer.ExprToString(reporter.Options, lhs),
-                      Printer.ExprToString(reporter.Options, newRhs));
-                    reporter.Info(MessageSource.Resolver, stmt.Tok, msg);
+            var msg = string.Format("rewrite: forall {0}: {1} {2}| {3} {{ {4} := {5}; }}",
+              j.Name,
+              j.Type.ToString(),
+              Printer.AttributesToString(reporter.Options, attributes),
+              Printer.ExprToString(reporter.Options, val.Range),
+              Printer.ExprToString(reporter.Options, lhs),
+              Printer.ExprToString(reporter.Options, newRhs));
+            reporter.Info(MessageSource.Resolver, stmt.Origin, msg);
 
-                    var expr = new ForallExpr(s.Tok, s.RangeToken, jList, val.Range,
-                      new BinaryExpr(s.Tok, BinaryExpr.ResolvedOpcode.EqCommon, lhs, newRhs),
-                      attributes) {
-                      Type = Type.Bool,
-                      Bounds = newBounds,
-                    };
-                    exprList.Add(expr);
-                  }
-                  usedInversion = true;
-                }
-              }
-              if (!usedInversion) {
-                var expr = new ForallExpr(s.Tok, s.RangeToken, s.BoundVars, s.Range,
-                  new BinaryExpr(s.Tok, BinaryExpr.ResolvedOpcode.EqCommon, lhs, rhs),
-                  s.Attributes) {
-                  Type = Type.Bool,
-                  Bounds = s.Bounds
-                };
-                exprList.Add(expr);
-              }
-              s.ForallExpressions = exprList;
-            }
-          }
-        } else if (s.Kind == ForallStmt.BodyKind.Call) {
-          var s0 = (CallStmt)s.S0;
-          var argsSubstMap = new Dictionary<IVariable, Expression>();  // maps formal arguments to actuals
-          Contract.Assert(s0.Method.Ins.Count == s0.Args.Count);
-          for (int i = 0; i < s0.Method.Ins.Count; i++) {
-            argsSubstMap.Add(s0.Method.Ins[i], s0.Args[i]);
-          }
-          var substituter = new AlphaConvertingSubstituter(s0.Receiver, argsSubstMap, s0.MethodSelect.TypeArgumentSubstitutionsWithParents());
-          // Strengthen the range of the "forall" statement with the precondition of the call, suitably substituted with the actual parameters.
-          if (Attributes.Contains(s.Attributes, "_autorequires")) {
-            var range = s.Range;
-            foreach (var req in s0.Method.Req) {
-              var p = substituter.Substitute(req.E);  // substitute the call's actuals for the method's formals
-              range = Expression.CreateAnd(range, p);
-            }
-            s.Range = range;
+            var expr = new ForallExpr(stmt.Origin, jList, val.Range,
+              new BinaryExpr(s0.Origin, BinaryExpr.ResolvedOpcode.EqCommon, lhs, newRhs),
+              attributes) {
+              Type = Type.Bool,
+              Bounds = newBounds,
+            };
+            exprList.Add(expr);
           }
-          // substitute the call's actuals for the method's formals
-          Expression term = s0.Method.Ens.Count != 0 ? substituter.Substitute(s0.Method.Ens[0].E) : Expression.CreateBoolLiteral(s.Tok, true);
-          for (int i = 1; i < s0.Method.Ens.Count; i++) {
-            term = new BinaryExpr(s.Tok, BinaryExpr.ResolvedOpcode.And, term, substituter.Substitute(s0.Method.Ens[i].E));
-          }
-          List<Expression> exprList = new List<Expression>();
-          ForallExpr expr = new ForallExpr(s.Tok, s.RangeToken, s.BoundVars, s.Range, term, s.Attributes);
-          expr.Type = Type.Bool; // resolve here
-          expr.Bounds = s.Bounds;
-          exprList.Add(expr);
-          s.ForallExpressions = exprList;
-        } else {
-          Contract.Assert(false);  // unexpected kind
+
+          usedInversion = true;
         }
       }
-      return true;  //visit the sub-parts with the same "st"
+
+      if (!usedInversion) {
+        var expr = new ForallExpr(stmt.Origin, stmt.BoundVars, stmt.Range,
+          new BinaryExpr(s0.Origin, BinaryExpr.ResolvedOpcode.EqCommon, lhs, rhs),
+          stmt.Attributes) {
+          Type = Type.Bool,
+          Bounds = stmt.Bounds
+        };
+        exprList.Add(expr);
+      }
+
+      stmt.EffectiveEnsuresClauses = exprList;
+    }
+
+    private static void VisitProof(ForallStmt s) {
+      var term = s.Ens.Count != 0 ? s.Ens[0].E : Expression.CreateBoolLiteral(new AutoGeneratedOrigin(s.Origin), true);
+      for (int i = 1; i < s.Ens.Count; i++) {
+        term = new BinaryExpr(s.Ens[i].Origin, BinaryExpr.ResolvedOpcode.And, term, s.Ens[i].E);
+      }
+
+      s.EffectiveEnsuresClauses = new List<Expression> {
+        new ForallExpr(s.Origin, s.BoundVars, s.Range, term, s.Attributes) {
+          Type = Type.Bool, // resolve here
+          Bounds = s.Bounds
+        }
+      };
     }
 
     internal class ForallStmtTranslationValues {
@@ -227,7 +267,7 @@ private IEnumerable<ForallStmtTranslationValues> InvertExpressionIter(BoundVar i
       if (!FreeVariablesUtil.ContainsFreeVariable(F, false, i)) {
         // We're looking at R(i) && j == K.
         // We cannot invert j == K, but if we're lucky, R(i) contains a conjunct i==G.
-        Expression r = Expression.CreateBoolLiteral(R.tok, true);
+        Expression r = Expression.CreateBoolLiteral(new AutoGeneratedOrigin(R.Origin), true);
         Expression G = null;
         foreach (var c in Expression.Conjuncts(R)) {
           if (G == null && c is BinaryExpr) {
@@ -305,7 +345,7 @@ private IEnumerable<ForallStmtTranslationValues> InvertExpressionIter(BoundVar i
         var r = Expression.CreateAnd(R, ife.Test);
         var valsThen = InvertExpression(i, j, r, ife.Thn);
         if (valsThen != null) {
-          r = Expression.CreateAnd(R, Expression.CreateNot(ife.tok, ife.Test));
+          r = Expression.CreateAnd(R, Expression.CreateNot(ife.Origin, ife.Test));
           var valsElse = InvertExpression(i, j, r, ife.Els);
           if (valsElse != null) {
             foreach (var val in valsThen) { yield return val; }
@@ -323,7 +363,7 @@ Expression Substitute(Expression expr, IVariable v, Expression e) {
       return sub.Substitute(expr);
     }
 
-    List<ComprehensionExpr.BoundedPool>/*?*/ SubstituteBoundedPoolList(List<ComprehensionExpr.BoundedPool>/*?*/ list, IVariable v, Expression e) {
+    List<BoundedPool>/*?*/ SubstituteBoundedPoolList(List<BoundedPool>/*?*/ list, IVariable v, Expression e) {
       Dictionary<IVariable, Expression/*!*/> substMap = new Dictionary<IVariable, Expression>();
       Dictionary<TypeParameter, Type> typeMap = new Dictionary<TypeParameter, Type>();
       substMap.Add(v, e);
diff --git a/Source/DafnyCore/Rewriters/IRewriter.cs b/Source/DafnyCore/Rewriters/IRewriter.cs
index 2e995403fb5..22a0f711b12 100644
--- a/Source/DafnyCore/Rewriters/IRewriter.cs
+++ b/Source/DafnyCore/Rewriters/IRewriter.cs
@@ -27,7 +27,7 @@ public abstract class IRewriter {
     ///     reporter.Error(MessageSource.Compiler, token, "[Your plugin] Your error message here");
     ///
     /// The token is usually obtained on expressions and statements in the field `tok`
-    /// If you do not have access to them, use moduleDefinition.GetFirstTopLevelToken()
+    /// If you do not have access to them, use moduleDefinition.GetStartOfFirstFileToken()
     /// </summary>
     /// <param name="reporter">The error reporter. Usually outputs automatically to IDE or command-line</param>
     protected internal IRewriter(ErrorReporter reporter) {
@@ -74,7 +74,8 @@ internal virtual void PostResolveIntermediate(ModuleDefinition moduleDefinition)
     /// You can then report errors using reporter.Error (see above)
     /// </summary>
     /// <param name="moduleDefinition">A module definition after it
-    /// is resolved, type-checked and SCC/Cyclicity/Recursivity have been performed</param>
+    ///   is resolved, type-checked and SCC/Cyclicity/Recursivity have been performed</param>
+    /// <param name="errorReporter"></param>
     internal virtual void PostCyclicityResolve(ModuleDefinition moduleDefinition) {
       Contract.Requires(moduleDefinition != null);
     }
@@ -120,11 +121,11 @@ public virtual void PostVerification(Program program) {
       Contract.Requires(program != null);
     }
 
-    public virtual void ReportWarning(ErrorId errorId, IToken t, string msg, params object[] args) {
+    public virtual void ReportWarning(ErrorId errorId, IOrigin t, string msg, params object[] args) {
       Reporter.Warning(MessageSource.Rewriter, errorId, t, msg, args);
     }
 
-    public virtual void ReportError(ErrorId errorId, IToken t, string msg, params object[] args) {
+    public virtual void ReportError(ErrorId errorId, IOrigin t, string msg, params object[] args) {
       Reporter.Error(MessageSource.Rewriter, errorId, t, msg, args);
     }
   }
diff --git a/Source/DafnyCore/Rewriters/InductionHeuristic.cs b/Source/DafnyCore/Rewriters/InductionHeuristic.cs
index 2d2c2cf2b37..6ce2202be3b 100644
--- a/Source/DafnyCore/Rewriters/InductionHeuristic.cs
+++ b/Source/DafnyCore/Rewriters/InductionHeuristic.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System.Diagnostics.Contracts;
 
 namespace Microsoft.Dafny;
@@ -6,6 +7,8 @@ public static class InductionHeuristic {
 
   /// <summary>
   /// Returns 'true' iff by looking at 'expr' the Induction Heuristic determines that induction should be applied to 'n'.
+  /// Variable 'n' can be passed in as 'null', in which case it stands for 'this'.
+  /// 
   /// More precisely:
   ///   DafnyInductionHeuristic      Return 'true'
   ///   -----------------------      -------------
@@ -17,10 +20,10 @@ public static class InductionHeuristic {
   ///        5    if 'n' occurs as   a prominent subexpression of                                                               any                       argument to a recursive function
   ///        6    if 'n' occurs as   a prominent subexpression of                                                               any decreases-influencing argument to a recursive function
   /// </summary>
-  public static bool VarOccursInArgumentToRecursiveFunction(DafnyOptions options, Expression expr, IVariable n) {
+  public static bool VarOccursInArgumentToRecursiveFunction(DafnyOptions options, Expression expr, IVariable? n) {
     switch (options.InductionHeuristic) {
       case 0: return true;
-      case 1: return FreeVariablesUtil.ContainsFreeVariable(expr, false, n);
+      case 1: return FreeVariablesUtil.ContainsFreeVariable(expr, n == null, n);
       default: return VarOccursInArgumentToRecursiveFunction(options, expr, n, false);
     }
   }
@@ -29,17 +32,20 @@ public static bool VarOccursInArgumentToRecursiveFunction(DafnyOptions options,
   /// Worker routine for VarOccursInArgumentToRecursiveFunction(expr,n), where the additional parameter 'exprIsProminent' says whether or
   /// not 'expr' has prominent status in its context.
   /// DafnyInductionHeuristic cases 0 and 1 are assumed to be handled elsewhere (i.e., a precondition of this method is DafnyInductionHeuristic is at least 2).
+  /// Variable 'n' can be passed in as 'null', in which case it stands for 'this'.
   /// </summary>
-  static bool VarOccursInArgumentToRecursiveFunction(DafnyOptions options, Expression expr, IVariable n, bool exprIsProminent) {
+  static bool VarOccursInArgumentToRecursiveFunction(DafnyOptions options, Expression expr, IVariable? n, bool exprIsProminent) {
     Contract.Requires(expr != null);
     Contract.Requires(n != null);
 
     // The following variable is what gets passed down to recursive calls if the subexpression does not itself acquire prominent status.
     var subExprIsProminent = options.InductionHeuristic == 2 || options.InductionHeuristic == 4 ? /*once prominent, always prominent*/exprIsProminent : /*reset the prominent status*/false;
 
-    if (expr is IdentifierExpr) {
+    if (n != null && expr is IdentifierExpr) {
       var e = (IdentifierExpr)expr;
       return exprIsProminent && e.Var == n;
+    } else if (n == null && expr is ThisExpr) {
+      return exprIsProminent;
     } else if (expr is SeqSelectExpr) {
       var e = (SeqSelectExpr)expr;
       var q = options.InductionHeuristic < 4 || subExprIsProminent;
@@ -69,9 +75,9 @@ static bool VarOccursInArgumentToRecursiveFunction(DafnyOptions options, Express
       if (VarOccursInArgumentToRecursiveFunction(options, e.Receiver, n, variantArgument || subExprIsProminent)) {
         return true;
       }
-      Contract.Assert(e.Function.Formals.Count == e.Args.Count);
-      for (int i = 0; i < e.Function.Formals.Count; i++) {
-        var f = e.Function.Formals[i];
+      Contract.Assert(e.Function.Ins.Count == e.Args.Count);
+      for (int i = 0; i < e.Function.Ins.Count; i++) {
+        var f = e.Function.Ins[i];
         var exp = e.Args[i];
         if (options.InductionHeuristic < 6) {
           variantArgument = rec;
@@ -108,7 +114,7 @@ static bool VarOccursInArgumentToRecursiveFunction(DafnyOptions options, Express
       }
     } else if (expr is DatatypeValue) {
       var e = (DatatypeValue)expr;
-      var q = n.Type.IsDatatype ? exprIsProminent : subExprIsProminent;  // prominent status continues, if we're looking for a variable whose type is a datatype
+      var q = n != null && n.Type.IsDatatype ? exprIsProminent : subExprIsProminent;  // prominent status continues, if we're looking for a variable whose type is a datatype
       return e.Arguments.Exists(exp => VarOccursInArgumentToRecursiveFunction(options, exp, n, q));
     } else if (expr is UnaryExpr) {
       var e = (UnaryExpr)expr;
@@ -145,7 +151,7 @@ static bool VarOccursInArgumentToRecursiveFunction(DafnyOptions options, Express
     } else if (expr is StmtExpr) {
       var e = (StmtExpr)expr;
       // ignore the statement
-      return VarOccursInArgumentToRecursiveFunction(options, e.E, n);
+      return VarOccursInArgumentToRecursiveFunction(options, e.E, n, exprIsProminent);
 
     } else if (expr is ITEExpr) {
       var e = (ITEExpr)expr;
@@ -164,7 +170,7 @@ expr is BoxingCastExpr ||
       return false;
     } else {
       // in all other cases, reset the prominence status and recurse on the subexpressions
-      foreach (var exp in expr.SubExpressions) {
+      foreach (var exp in expr!.SubExpressions) {
         if (VarOccursInArgumentToRecursiveFunction(options, exp, n, subExprIsProminent)) {
           return true;
         }
@@ -172,4 +178,4 @@ expr is BoxingCastExpr ||
       return false;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Source/DafnyCore/Rewriters/InductionRewriter.cs b/Source/DafnyCore/Rewriters/InductionRewriter.cs
index 03b8e06f0ba..b8363950b86 100644
--- a/Source/DafnyCore/Rewriters/InductionRewriter.cs
+++ b/Source/DafnyCore/Rewriters/InductionRewriter.cs
@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
+using JetBrains.Annotations;
 using static Microsoft.Dafny.RewriterErrors;
 
 namespace Microsoft.Dafny;
@@ -40,12 +42,9 @@ internal override void PostDecreasesResolve(ModuleDefinition m) {
           }
         }
 
-        if (decl is NewtypeDecl) {
-          var nt = (NewtypeDecl)decl;
-          if (nt.Constraint != null) {
-            var visitor = new Induction_Visitor(this);
-            visitor.Visit(nt.Constraint);
-          }
+        if (decl is NewtypeDecl { Constraint: { } constraint }) {
+          var visitor = new InductionVisitor(this);
+          visitor.Visit(constraint);
         }
       }
     }
@@ -53,7 +52,7 @@ internal override void PostDecreasesResolve(ModuleDefinition m) {
 
   void ProcessMethodExpressions(Method method) {
     Contract.Requires(method != null);
-    var visitor = new Induction_Visitor(this);
+    var visitor = new InductionVisitor(this);
     method.Req.ForEach(mfe => visitor.Visit(mfe.E));
     method.Ens.ForEach(mfe => visitor.Visit(mfe.E));
     if (method.Body != null) {
@@ -63,7 +62,7 @@ void ProcessMethodExpressions(Method method) {
 
   void ProcessFunctionExpressions(Function function) {
     Contract.Requires(function != null);
-    var visitor = new Induction_Visitor(this);
+    var visitor = new InductionVisitor(this);
     function.Req.ForEach(visitor.Visit);
     function.Ens.ForEach(visitor.Visit);
     if (function.Body != null) {
@@ -73,20 +72,31 @@ void ProcessFunctionExpressions(Function function) {
 
   void ComputeLemmaInduction(Method method) {
     Contract.Requires(method != null);
-    if (method.Body != null && method.IsGhost && method.Mod.Expressions.Count == 0 && method.Outs.Count == 0 &&
-        !(method is ExtremeLemma)) {
-      var specs = new List<Expression>();
-      method.Req.ForEach(mfe => specs.Add(mfe.E));
-      method.Ens.ForEach(mfe => specs.Add(mfe.E));
-      ComputeInductionVariables(method.tok, method.Ins, specs, method, ref method.Attributes);
+    if (method is { IsGhost: true, AllowsAllocation: false, Outs: { Count: 0 }, Body: not null } and not ExtremeLemma) {
+      Expression pre = Expression.CreateBoolLiteral(method.Origin, true);
+      foreach (var req in method.Req) {
+        pre = Expression.CreateAnd(pre, req.E);
+      }
+
+      Expression post = Expression.CreateBoolLiteral(method.Origin, true);
+      foreach (var ens in method.Ens) {
+        post = Expression.CreateAnd(post, ens.E);
+      }
+
+      ComputeInductionVariables(method.Origin, method.Ins, Expression.CreateImplies(pre, post), method, ref method.Attributes);
     }
   }
 
-  void ComputeInductionVariables<VarType>(IToken tok, List<VarType> boundVars, List<Expression> searchExprs,
-    Method lemma, ref Attributes attributes) where VarType : class, IVariable {
+  /// <summary>
+  /// Look at the command-line options and any {:induction} attribute to determine a good list of induction
+  /// variables. If there are any, then record them in an attribute {:_induction ...} added to "attributes".
+  /// "body" is the condition that the induction would support.
+  /// </summary>
+  void ComputeInductionVariables<TVarType>(IOrigin tok, List<TVarType> boundVars, Expression body,
+    [CanBeNull] Method lemma, ref Attributes attributes) where TVarType : class, IVariable {
     Contract.Requires(tok != null);
     Contract.Requires(boundVars != null);
-    Contract.Requires(searchExprs != null);
+    Contract.Requires(body != null);
     Contract.Requires(Reporter.Options.Induction != 0);
 
     var args = Attributes.FindExpressions(attributes,
@@ -106,9 +116,9 @@ void ComputeInductionVariables<VarType>(IToken tok, List<VarType> boundVars, Lis
     } else if (args.Count == 0) {
       // {:induction} is treated the same as {:induction true}, which says to automatically infer induction variables
       // GO INFER below (all boundVars)
-    } else if (args.Count == 1 && args[0] is LiteralExpr && ((LiteralExpr)args[0]).Value is bool) {
+    } else if (args.Count == 1 && args[0] is LiteralExpr { Value: bool and var boolValue }) {
       // {:induction false} or {:induction true}
-      if (!(bool)((LiteralExpr)args[0]).Value) {
+      if (!boolValue) {
         // we're told not to infer anything
         return;
       }
@@ -117,12 +127,11 @@ void ComputeInductionVariables<VarType>(IToken tok, List<VarType> boundVars, Lis
       // Here, we're expecting the arguments to {:induction args} to be a sublist of "this;boundVars", where "this" is allowed only
       // if "lemma" denotes an instance lemma.
       var goodArguments = new List<Expression>();
-      var i = lemma != null && !lemma.IsStatic
+      var i = lemma is { IsStatic: false }
         ? -1
         : 0; // -1 says it's okay to see "this" or any other parameter; 0 <= i says it's okay to see parameter i or higher
       foreach (var arg in args) {
-        var ie = arg.Resolved as IdentifierExpr;
-        if (ie != null) {
+        if (arg.Resolved is IdentifierExpr ie) {
           var j = boundVars.FindIndex(v => v == ie.Var);
           if (0 <= j && i <= j) {
             goodArguments.Add(ie);
@@ -131,7 +140,7 @@ void ComputeInductionVariables<VarType>(IToken tok, List<VarType> boundVars, Lis
           }
 
           if (0 <= j) {
-            ReportWarning(ErrorId.rw_induction_arguments_quantifier_mismatch, arg.tok,
+            ReportWarning(ErrorId.rw_induction_arguments_quantifier_mismatch, arg.Origin,
               "{0}s given as :induction arguments must be given in the same order as in the {1}; ignoring attribute",
               lemma != null ? "lemma parameter" : "bound variable", lemma != null ? "lemma" : "quantifier");
             return;
@@ -144,39 +153,60 @@ void ComputeInductionVariables<VarType>(IToken tok, List<VarType> boundVars, Lis
             continue;
           }
 
-          ReportWarning(ErrorId.rw_induction_arguments_lemma_mismatch, arg.tok,
+          ReportWarning(ErrorId.rw_induction_arguments_lemma_mismatch, arg.Origin,
             "lemma parameters given as :induction arguments must be given in the same order as in the lemma; ignoring attribute");
           return;
         }
 
-        ReportWarning(ErrorId.rw_invalid_induction_attribute, arg.tok,
+        ReportWarning(ErrorId.rw_invalid_induction_attribute, arg.Origin,
           "invalid :induction attribute argument; expected {0}{1}; ignoring attribute",
           i == 0 ? "'false' or 'true' or " : "",
           lemma != null ? "lemma parameter" : "bound variable");
         return;
       }
 
-      // The argument list was legal, so let's use it for the _induction attribute
+      // The argument list was legal, so let's use it for the _induction attribute.
+      // Next, look for matching patterns for the induction hypothesis.
+      if (lemma != null) {
+        var triggers = ComputeInductionTriggers(goodArguments, body, lemma.EnclosingClass.EnclosingModuleDefinition, tok, ref attributes);
+        ReportInductionTriggers(lemma.Origin, lemma, attributes);
+      }
+
       attributes = new Attributes("_induction", goodArguments, attributes);
+
       return;
     }
 
     // Okay, here we go, coming up with good induction setting for the given situation
     var inductionVariables = new List<Expression>();
-    if (lemma != null && !lemma.IsStatic) {
-      if (args != null || searchExprs.Exists(expr => FreeVariablesUtil.ContainsFreeVariable(expr, true, null))) {
+    if (lemma is { IsStatic: false }) {
+      if (args != null || InductionHeuristic.VarOccursInArgumentToRecursiveFunction(Reporter.Options, body, null)) {
         inductionVariables.Add(new ThisExpr(lemma));
       }
     }
 
     foreach (IVariable n in boundVars) {
-      if (!(n.Type.IsTypeParameter || n.Type.IsAbstractType || n.Type.IsInternalTypeSynonym) && (args != null ||
-            searchExprs.Exists(expr => InductionHeuristic.VarOccursInArgumentToRecursiveFunction(Reporter.Options, expr, n)))) {
-        inductionVariables.Add(new IdentifierExpr(n.Tok, n));
+      if (!(n.Type.IsTypeParameter || n.Type.IsAbstractType || n.Type.IsInternalTypeSynonym || n.Type.IsArrowType) &&
+          (args != null || InductionHeuristic.VarOccursInArgumentToRecursiveFunction(Reporter.Options, body, n))) {
+        inductionVariables.Add(new IdentifierExpr(n.Origin, n));
       }
     }
 
     if (inductionVariables.Count != 0) {
+      if (lemma != null) {
+        // Compute the induction triggers, but don't report their patterns into attributes yet. Instead,
+        // call ReportInductionTriggers only after the "_induction" attribute has been added. This will cause the
+        // tooltips to appear in a logical order (showing the induction variables first, followed by the matching patterns).
+        var triggers = ComputeInductionTriggers(inductionVariables, body, lemma.EnclosingClass.EnclosingModuleDefinition,
+          args != null ? tok : null, ref attributes);
+        if (triggers == null && args == null) {
+          // The user didn't ask for induction. But since there were candidate induction variables, report an informational message.
+          var candidates = $"candidate{Util.Plural(inductionVariables.Count)} {Printer.ExprListToString(Reporter.Options, inductionVariables)}";
+          Reporter.Info(MessageSource.Rewriter, tok, $"omitting automatic induction (for induction-variable {candidates}) because of lack of triggers");
+          return;
+        }
+      }
+
       // We found something usable, so let's record that in an attribute
       attributes = new Attributes("_induction", inductionVariables, attributes);
       // And since we're inferring something, let's also report that in a hover text.
@@ -184,25 +214,112 @@ void ComputeInductionVariables<VarType>(IToken tok, List<VarType> boundVars, Lis
       if (lemma is PrefixLemma) {
         s = lemma.Name + " " + s;
       }
-
       Reporter.Info(MessageSource.Rewriter, tok, s);
+
+      ReportInductionTriggers(tok, lemma, attributes);
+    }
+  }
+
+  /// <summary>
+  /// Report as tooltips the matching patterns selected for the induction hypothesis.
+  /// </summary>
+  private void ReportInductionTriggers(IOrigin tok, [CanBeNull] Method lemma, Attributes attributes) {
+    foreach (var trigger in attributes.AsEnumerable().Where(attr => attr.Name == "_inductionTrigger")) {
+      var ss = Printer.OneAttributeToString(Reporter.Options, trigger, "inductionTrigger");
+      if (lemma is PrefixLemma) {
+        ss = lemma.Name + " " + ss;
+      }
+      Reporter.Info(MessageSource.Rewriter, tok, ss);
+    }
+  }
+
+  /// <summary>
+  /// Obtain and return matching patterns for
+  ///     (forall inductionVariables :: body)
+  /// If there aren't any, then return null.
+  /// This trigger may come from analyzing "body" or from any user-supplied {:inductionTrigger ...} attributes.
+  /// Passing {:inductionTrigger} with no arguments causes an empty list to be returned (and disables trigger generation).
+  ///
+  /// If "errorToken" is non-null and there are no matching patterns, then a warning/info message is emitted.
+  /// The selection between warning vs info is done by looking for a {:nowarn} attribute among "attributes".
+  /// </summary>
+  List<List<Expression>> ComputeInductionTriggers(List<Expression> inductionVariables, Expression body, ModuleDefinition moduleDefinition,
+    [CanBeNull] IOrigin errorToken, ref Attributes attributes) {
+    Contract.Requires(inductionVariables.Count != 0);
+
+    if (Attributes.Contains(attributes, "inductionTrigger")) {
+      // Empty triggers are not valid at the Boogie level, but they indicate that we don't want automatic selection
+      Triggers.SplitPartTriggerWriter.DisableEmptyTriggers(attributes, "inductionTrigger");
+      return Attributes.FindAllExpressions(attributes, "inductionTrigger") ?? new List<List<Expression>>(); // Never null
+    }
+
+    // Construct a quantifier, because that's what the trigger-generating machinery expects.
+    // We start by creating a new BoundVar for each ThisExpr-or-IdentifierExpr in "inductionVariables".
+    var boundVars = new List<BoundVar>();
+    var substMap = new Dictionary<IVariable, Expression>();
+    var reverseSubstMap = new Dictionary<IVariable, Expression>();
+    Expression receiverReplacement = null;
+    foreach (var inductionVariableExpr in inductionVariables) {
+      var tok = inductionVariableExpr.Origin;
+      BoundVar boundVar;
+      if (inductionVariableExpr is IdentifierExpr identifierExpr) {
+        boundVar = new BoundVar(tok, identifierExpr.Var.Name, identifierExpr.Var.Type);
+        substMap.Add(identifierExpr.Var, new IdentifierExpr(tok, boundVar));
+      } else {
+        Contract.Assert(inductionVariableExpr is ThisExpr);
+        boundVar = new BoundVar(tok, "this", inductionVariableExpr.Type);
+        receiverReplacement = new IdentifierExpr(tok, boundVar);
+      }
+      boundVars.Add(boundVar);
+      reverseSubstMap.Add(boundVar, inductionVariableExpr);
+    }
+
+    var substituter = new Substituter(receiverReplacement, substMap, new Dictionary<TypeParameter, Type>());
+    var quantifier = new ForallExpr(body.Origin, boundVars, null, substituter.Substitute(body), null) {
+      Type = Type.Bool
+    };
+
+    var finder = new Triggers.QuantifierCollector(Reporter);
+    var triggersCollector = new Triggers.TriggersCollector(finder.exprsInOldContext, Reporter.Options, moduleDefinition);
+    var quantifierCollection = new Triggers.ComprehensionTriggerGenerator(quantifier, Enumerable.Repeat(quantifier, 1), Reporter);
+    quantifierCollection.ComputeTriggers(triggersCollector);
+    // Get the computed triggers, but only ask for those that do not require additional bound variables. (An alternative to this
+    // design would be to add {:matchinglooprewrite false} to "quantifier" above. However, that would cause certain matching loops
+    // to be ignored, so it is safer to not include triggers that require additional bound variables.)
+    var triggers = quantifierCollection.GetTriggers(false);
+    var reverseSubstituter = new Substituter(null, reverseSubstMap, new Dictionary<TypeParameter, Type>());
+    var result = triggers.ConvertAll(trigger => trigger.ConvertAll(reverseSubstituter.Substitute));
+
+    if (result.Count == 0 && errorToken != null) {
+      // The user explicitly asked for induction (with {:induction}, {:induction true}, or {:induction <variables>}).
+      // Respect this choice, but generate a warning that no triggers were found.
+      var suppressWarnings = Attributes.Contains(attributes, "nowarn");
+      var warningLevel = suppressWarnings ? ErrorLevel.Info : ErrorLevel.Warning;
+
+      Reporter.Message(MessageSource.Rewriter, warningLevel, null, errorToken,
+        "Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. " +
+        "Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. " +
+        "For more information, see the section quantifier instantiation rules in the reference manual.");
+    }
+
+    foreach (var trigger in result) {
+      attributes = new Attributes("_inductionTrigger", trigger, attributes);
     }
+    return result.Count == 0 ? null : result; // Return null to indicate no results
   }
 
-  class Induction_Visitor : BottomUpVisitor {
+  class InductionVisitor : BottomUpVisitor {
     readonly InductionRewriter IndRewriter;
 
-    public Induction_Visitor(InductionRewriter inductionRewriter) {
+    public InductionVisitor(InductionRewriter inductionRewriter) {
       Contract.Requires(inductionRewriter != null);
       IndRewriter = inductionRewriter;
     }
 
     protected override void VisitOneExpr(Expression expr) {
-      var q = expr as QuantifierExpr;
-      if (q != null && q.SplitQuantifier == null) {
-        IndRewriter.ComputeInductionVariables(q.tok, q.BoundVars, new List<Expression>() { q.LogicalBody() }, null,
-          ref q.Attributes);
+      if (expr is QuantifierExpr { SplitQuantifier: null } q) {
+        IndRewriter.ComputeInductionVariables(q.Origin, q.BoundVars, q.LogicalBody(), null, ref q.Attributes);
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Source/DafnyCore/Rewriters/InternalDocstringRewritersPluginConfiguration.cs b/Source/DafnyCore/Rewriters/InternalDocstringRewritersPluginConfiguration.cs
index 93638c3e64c..2078d94f581 100644
--- a/Source/DafnyCore/Rewriters/InternalDocstringRewritersPluginConfiguration.cs
+++ b/Source/DafnyCore/Rewriters/InternalDocstringRewritersPluginConfiguration.cs
@@ -1,4 +1,6 @@
-using Microsoft.Dafny.Compilers;
+using System.CommandLine;
+using DafnyCore;
+using Microsoft.Dafny.Compilers;
 using Microsoft.Dafny.Plugins;
 
 namespace Microsoft.Dafny;
@@ -7,6 +9,16 @@ public class InternalDocstringRewritersPluginConfiguration : Plugins.PluginConfi
   public static readonly InternalDocstringRewritersPluginConfiguration Singleton = new();
   public static readonly Plugin Plugin = new ConfiguredPlugin(Singleton);
 
+  static InternalDocstringRewritersPluginConfiguration() {
+    DafnyOptions.RegisterLegacyBinding(UseJavadocLikeDocstringRewriterOption,
+      (options, value) => { options.UseJavadocLikeDocstringRewriter = value; });
+    OptionRegistry.RegisterOption(UseJavadocLikeDocstringRewriterOption, OptionScope.Cli);
+  }
+
+  public static readonly Option<bool> UseJavadocLikeDocstringRewriterOption = new("--javadoclike-docstring-plugin",
+    "Rewrite docstrings using a simple Javadoc-to-markdown converter"
+  );
+
   public override DocstringRewriter[] GetDocstringRewriters(DafnyOptions options) {
     if (options.UseJavadocLikeDocstringRewriter) {
       return new DocstringRewriter[] {
diff --git a/Source/DafnyCore/Rewriters/LocalLinter.cs b/Source/DafnyCore/Rewriters/LocalLinter.cs
index 12e79c6d977..9e54ef57595 100644
--- a/Source/DafnyCore/Rewriters/LocalLinter.cs
+++ b/Source/DafnyCore/Rewriters/LocalLinter.cs
@@ -30,18 +30,18 @@ public LocalLinter(ErrorReporter reporter) : base(reporter) {
   class UselessOldLinterVisitor : TopDownVisitor<Unit> {
     private readonly ErrorReporter reporter;
 
-    public UselessOldLinterVisitor(ErrorReporter reporter) {
+    public UselessOldLinterVisitor(ErrorReporter reporter) : base(false) {
       this.reporter = reporter;
     }
 
     protected override bool VisitOneExpr(Expression expr, ref Unit st) {
-      if (expr is OldExpr oldExpr && !AutoGeneratedToken.Is(oldExpr.tok)) {
+      if (expr is OldExpr oldExpr && !AutoGeneratedOrigin.Is(oldExpr.Origin)) {
         var fvs = new HashSet<IVariable>();
         var usesHeap = false;
         FreeVariablesUtil.ComputeFreeVariables(reporter.Options, oldExpr.E, fvs, ref usesHeap, true);
         if (!usesHeap) {
           oldExpr.Useless = true;
-          reporter.Warning(MessageSource.Rewriter, ErrorId.rw_old_argument_not_on_heap, oldExpr.tok,
+          reporter.Warning(MessageSource.Rewriter, ErrorId.rw_old_argument_not_on_heap, oldExpr.Origin,
             $"Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect");
         }
       }
@@ -52,8 +52,8 @@ protected override bool VisitOneStmt(Statement stmt, ref Unit st) {
       // Check if the statement has the three tokens "assert", "!", and "(" next to each other. If so, that may
       // be a mistake, especially if the programmer is coming from Rust.
       if (stmt is AssertStmt { Expr: UnaryOpExpr { Op: UnaryOpExpr.Opcode.Not, E: ParensExpression } negationExpression }) {
-        if (stmt.tok.pos + 6/*="assert".Length*/ == negationExpression.tok.pos) {
-          reporter.Warning(MessageSource.Rewriter, ErrorId.rw_warn_negated_assertion, stmt.tok,
+        if (stmt.Origin.pos + 6/*="assert".Length*/ == negationExpression.Origin.pos) {
+          reporter.Warning(MessageSource.Rewriter, ErrorId.rw_warn_negated_assertion, stmt.Origin,
             "You have written an assert statement with a negated condition, but the lack of whitespace between 'assert' and '!' " +
             "suggests you may be used to Rust and have accidentally negated the asserted condition. If you did not intend the negation, " +
             "remove the '!' and the parentheses; if you do want the negation, please add a space between the 'assert' and '!'.");
diff --git a/Source/DafnyCore/Rewriters/OpaqueMemberRewriter.cs b/Source/DafnyCore/Rewriters/OpaqueMemberRewriter.cs
index d1e65b20f36..8dfa818a614 100644
--- a/Source/DafnyCore/Rewriters/OpaqueMemberRewriter.cs
+++ b/Source/DafnyCore/Rewriters/OpaqueMemberRewriter.cs
@@ -44,10 +44,10 @@ protected void AnnotateRevealFunction(Method lemma, Function f) {
     Contract.Requires(lemma is Lemma || lemma is TwoStateLemma);
     Expression receiver;
     if (f.IsStatic) {
-      receiver = new StaticReceiverExpr(f.tok, (TopLevelDeclWithMembers)f.EnclosingClass, true);
+      receiver = new StaticReceiverExpr(f.Origin, (TopLevelDeclWithMembers)f.EnclosingClass, true);
     } else {
-      receiver = new ImplicitThisExpr(f.tok);
-      //receiver.Type = GetThisType(expr.tok, (TopLevelDeclWithMembers)member.EnclosingClass);  // resolve here
+      receiver = new ImplicitThisExpr(f.Origin);
+      //receiver.Type = GetThisType(expr.Tok, (TopLevelDeclWithMembers)member.EnclosingClass);  // resolve here
     }
     var typeApplication = new List<Type>();
     var typeApplication_JustForMember = new List<Type>();
@@ -57,21 +57,19 @@ protected void AnnotateRevealFunction(Method lemma, Function f) {
       typeApplication.Add(new IntType());
       typeApplication_JustForMember.Add(new IntType());
     }
-    var nameSegment = new NameSegment(f.tok, f.Name, f.TypeArgs.Count == 0 ? null : typeApplication);
-    var rr = new MemberSelectExpr(f.tok, receiver, f.Name);
+    var nameSegment = new NameSegment(f.Origin, f.Name, f.TypeArgs.Count == 0 ? null : typeApplication);
+    var rr = new MemberSelectExpr(f.Origin, receiver, f.NameNode);
     rr.Member = f;
-    rr.TypeApplication_AtEnclosingClass = typeApplication;
-    rr.TypeApplication_JustMember = typeApplication_JustForMember;
+    rr.TypeApplicationAtEnclosingClass = typeApplication;
+    rr.TypeApplicationJustMember = typeApplication_JustForMember;
     List<Type> args = new List<Type>();
-    for (int i = 0; i < f.Formals.Count; i++) {
+    for (int i = 0; i < f.Ins.Count; i++) {
       args.Add(new IntType());
     }
-    rr.Type = new ArrowType(f.tok, args, new IntType());
+    rr.Type = new ArrowType(f.Origin, args, new IntType());
     nameSegment.ResolvedExpression = rr;
     nameSegment.Type = rr.Type;
-    LiteralExpr low = new LiteralExpr(f.tok, 1);
-    LiteralExpr hi = new LiteralExpr(f.tok, 2);
-    lemma.Attributes = new Attributes("fuel", new List<Expression>() { nameSegment, low, hi }, lemma.Attributes);
+    lemma.Attributes = new Attributes("revealedFunction", new List<Expression>() { nameSegment }, lemma.Attributes);
   }
 
 
@@ -80,23 +78,27 @@ protected void ProcessOpaqueClassMembers(TopLevelDeclWithMembers c) {
     Contract.Requires(c != null);
     var newDecls = new List<MemberDecl>();
     foreach (var member in c.Members.Where(member => member is Function or ConstantField)) {
-      if (!Attributes.Contains(member.Attributes, "opaque") && !member.IsOpaque) {
+      if (!ShouldBeRevealed(member)) {
         // Nothing to do
       } else if (member is Function { Body: null }) {
         // Nothing to do
-      } else if (!RefinementToken.IsInherited(member.tok, c.EnclosingModuleDefinition)) {
+      } else if (!member.Origin.IsInherited(c.EnclosingModuleDefinition)) {
         GenerateRevealLemma(member, newDecls);
       }
     }
     c.Members.AddRange(newDecls);
   }
 
+  private bool ShouldBeRevealed(MemberDecl member) {
+    return
+      Attributes.Contains(member.Attributes, "opaque")
+        || member.IsOpaque
+        || (member is Function func && func.IsMadeImplicitlyOpaque(Options));
+  }
   private void GenerateRevealLemma(MemberDecl m, List<MemberDecl> newDecls) {
     if (m is Function f) {
-      // mark the opaque function with {:fuel 0, 0}
-      var amount = new LiteralExpr(m.tok, 0);
-      m.Attributes = new Attributes("fuel", new List<Expression>() { amount, amount }, m.Attributes);
 
+      // TODO: The following comment will need to be updated.
       // That is, given:
       //   function {:opaque} foo(x:int, y:int) : int
       //     requires 0 <= x < 5;
@@ -135,22 +137,24 @@ private void GenerateRevealLemma(MemberDecl m, List<MemberDecl> newDecls) {
     }
     lemma_attrs = new Attributes("auto_generated", new List<Expression>(), lemma_attrs);
     lemma_attrs = new Attributes("opaque_reveal", new List<Expression>(), lemma_attrs);
-    lemma_attrs = new Attributes("verify", new List<Expression>() { new LiteralExpr(m.tok, false) }, lemma_attrs);
+    lemma_attrs = new Attributes("verify", new List<Expression>() { new LiteralExpr(m.Origin, false) }, lemma_attrs);
     var ens = new List<AttributedExpression>();
 
     var isStatic = true;
     if (m is ConstantField { Rhs: not null } c) {
-      ens.Add(new AttributedExpression(new BinaryExpr(c.tok, BinaryExpr.Opcode.Eq, new NameSegment(c.Tok, c.Name, null), c.Rhs)));
+      ens.Add(new AttributedExpression(new BinaryExpr(c.Origin, BinaryExpr.Opcode.Eq, new NameSegment(c.Origin, c.Name, null), c.Rhs)));
       isStatic = m.HasStaticKeyword;
     }
     Method reveal;
     if (m is TwoStateFunction) {
-      reveal = new TwoStateLemma(m.RangeToken.MakeAutoGenerated(), m.NameNode.Prepend("reveal_"), isStatic, new List<TypeParameter>(), new List<Formal>(), new List<Formal>(), new List<AttributedExpression>(),
-        new Specification<FrameExpression>(new List<FrameExpression>(), null), ens,
+      reveal = new TwoStateLemma(m.Origin.MakeAutoGenerated(), m.NameNode.Prepend(HideRevealStmt.RevealLemmaPrefix), isStatic,
+        new List<TypeParameter>(), new List<Formal>(), new List<Formal>(), new List<AttributedExpression>(),
+        new Specification<FrameExpression>(), new Specification<FrameExpression>(), ens,
         new Specification<Expression>(new List<Expression>(), null), null, lemma_attrs, null);
     } else {
-      reveal = new Lemma(m.RangeToken.MakeAutoGenerated(), m.NameNode.Prepend("reveal_"), isStatic, new List<TypeParameter>(), new List<Formal>(), new List<Formal>(), new List<AttributedExpression>(),
-        new Specification<FrameExpression>(new List<FrameExpression>(), null), ens,
+      reveal = new Lemma(m.Origin.MakeAutoGenerated(), m.NameNode.Prepend(HideRevealStmt.RevealLemmaPrefix), isStatic, new List<TypeParameter>(),
+        new List<Formal>(), new List<Formal>(), new List<AttributedExpression>(),
+        new Specification<FrameExpression>(), new Specification<FrameExpression>(), ens,
         new Specification<Expression>(new List<Expression>(), null), null, lemma_attrs, null);
     }
     newDecls.Add(reveal);
diff --git a/Source/DafnyCore/Rewriters/PluginRewriter.cs b/Source/DafnyCore/Rewriters/PluginRewriter.cs
index 729a7a9bc01..07b4b6b1c90 100644
--- a/Source/DafnyCore/Rewriters/PluginRewriter.cs
+++ b/Source/DafnyCore/Rewriters/PluginRewriter.cs
@@ -15,6 +15,10 @@ internal override void PostResolve(Program program) {
     internalRewriter.PostResolve(program);
   }
 
+  internal override void PreResolve(ModuleDefinition module) {
+    internalRewriter.PreResolve(module);
+  }
+
   internal override void PreVerify(ModuleDefinition module) {
     internalRewriter.PreVerify(module);
   }
diff --git a/Source/DafnyCore/Rewriters/PrecedenceLinter.cs b/Source/DafnyCore/Rewriters/PrecedenceLinter.cs
index 8c13cc656fa..0dc8c24d815 100644
--- a/Source/DafnyCore/Rewriters/PrecedenceLinter.cs
+++ b/Source/DafnyCore/Rewriters/PrecedenceLinter.cs
@@ -5,19 +5,20 @@
 // SPDX-License-Identifier: MIT
 //
 //-----------------------------------------------------------------------------
-using System.Collections.Generic;
+
 using System.Linq;
-using System;
-using System.Diagnostics.Contracts;
-using JetBrains.Annotations;
 using Microsoft.Boogie;
 using static Microsoft.Dafny.RewriterErrors;
 
 namespace Microsoft.Dafny {
 
   public class PrecedenceLinter : IRewriter {
-    private CompilationData compilation;
-    internal override void PostResolve(ModuleDefinition moduleDefinition) {
+    private readonly CompilationData compilation;
+    // Don't perform linting on doo files in general, since the source has already been processed.
+    internal override void PreResolve(ModuleDefinition moduleDefinition) {
+      if (moduleDefinition.Origin.Uri != null && !moduleDefinition.ShouldVerify(compilation)) {
+        return;
+      }
       foreach (var topLevelDecl in moduleDefinition.TopLevelDecls.OfType<TopLevelDeclWithMembers>()) {
         foreach (var callable in topLevelDecl.Members.OfType<ICallable>()) {
           var visitor = new PrecedenceLinterVisitor(compilation, Reporter);
@@ -71,7 +72,7 @@ class PrecedenceLinterVisitor : TopDownVisitor<LeftMargin> {
     private readonly CompilationData compilation;
     private readonly ErrorReporter reporter;
 
-    public PrecedenceLinterVisitor(CompilationData compilation, ErrorReporter reporter) {
+    public PrecedenceLinterVisitor(CompilationData compilation, ErrorReporter reporter) : base(false) {
       this.compilation = compilation;
       this.reporter = reporter;
     }
@@ -80,7 +81,7 @@ public PrecedenceLinterVisitor(CompilationData compilation, ErrorReporter report
     /// Regarding the "st" parameter, see the comment above the class.
     /// </summary>
     protected override bool VisitOneExpr(Expression expr, ref LeftMargin st) {
-      if (AutoGeneratedToken.Is(expr.tok) || expr is DefaultValueExpression || expr.RangeToken == null) {
+      if (AutoGeneratedOrigin.Is(expr.Origin) || expr is DefaultValueExpression || expr.Origin == null) {
         return false; // don't traverse further
       }
 
@@ -88,13 +89,13 @@ protected override bool VisitOneExpr(Expression expr, ref LeftMargin st) {
         int column;
         if (expr is DatatypeUpdateExpr or SeqSelectExpr or SeqUpdateExpr or MultiSelectExpr or TernaryExpr) {
           // These expressions are handled below as being all-independent components, which means the
-          // formatting of their internal structure is not relevant to the enclosing context. Yet, the .tok of
-          // these expressions sits someone inside that internal structure (for example, the .tok of
+          // formatting of their internal structure is not relevant to the enclosing context. Yet, the .Tok of
+          // these expressions sits someone inside that internal structure (for example, the .Tok of
           // a SeqSelectExpr is the open-bracket). To avoid looking at that internal structure, we instead
           // use the .StartToken for these expressions.
           column = expr.StartToken.col;
         } else {
-          column = expr.tok.col;
+          column = expr.Origin.col;
         }
         if (column < st.Column) {
           st.Column = column;
@@ -106,37 +107,46 @@ protected override bool VisitOneExpr(Expression expr, ref LeftMargin st) {
       // operator (e.g., ==>). As a guide, we look at how the user formatted the code,
       // that is, we inspect line and column information.
 
+      if (expr is ApplySuffix applySuffix) {
+        Visit(applySuffix.Lhs, st);
+        foreach (var argument in applySuffix.Bindings.ArgumentBindings.Select(b => b.Actual)) {
+          VisitIndependentComponent(argument);
+        }
+
+        return false;
+      }
+
       if (expr is BinaryExpr bin && (bin.Op == BinaryExpr.Opcode.Imp || bin.Op == BinaryExpr.Opcode.Exp || bin.Op == BinaryExpr.Opcode.Iff)) {
-        VisitLhsComponent(expr.tok, bin.E0,
-          // For
-          //   a)  LHS ==> RHS
-          //   b)  LHS ==>
-          //         RHS-somewhere-on-this-line
-          // use LHS.StartToken as the left margin.
-          bin.E0.StartToken.line == expr.tok.line ? bin.E0.StartToken.col :
-          // For
-          //   c)  LHS0 &&
-          //       LHS1 ==> RHS
-          // use expr.tok (that is, the location of ==>) as the left margin. This is bound to generate a warning.
-          bin.E1.StartToken.line == expr.tok.line ? expr.tok.col :
-          // For
-          //   d)  LHS0 &&
-          //       LHS1 ==>
-          //         RHS-somewhere-on-this-line
-          //   e)  LHS0 &&
-          //       LHS1
-          //       ==>
-          //         RHS-somewhere-on-this-line
-          // use LHS.StartToken as the left margin.
+        // For
+        //   a)  LHS ==> RHS
+        //   b)  LHS ==>
+        //         RHS-somewhere-on-this-line
+        // use LHS.StartToken as the left margin.
+        // For
+        //   c)  LHS0 &&
+        //       LHS1 ==> RHS
+        // use expr.Tok (that is, the location of ==>) as the left margin. This is bound to generate a warning.
+        // For
+        //   d)  LHS0 &&
+        //       LHS1 ==>
+        //         RHS-somewhere-on-this-line
+        //   e)  LHS0 &&
+        //       LHS1
+        //       ==>
+        //         RHS-somewhere-on-this-line
+        // use LHS.StartToken as the left margin.
+        VisitLhsComponent(expr.Origin, bin.E0,
+          bin.E0.StartToken.line == expr.Origin.line ? bin.E0.StartToken.col :
+          bin.E1.StartToken.line == expr.Origin.line ? expr.Origin.col :
           bin.E0.StartToken.col,
           "left-hand operand of " + BinaryExpr.OpcodeString(bin.Op));
-        VisitRhsComponent(expr.tok, bin.E1, "right-hand operand of " + BinaryExpr.OpcodeString(bin.Op));
+        VisitRhsComponent(expr.Origin, bin.E1, "right-hand operand of " + BinaryExpr.OpcodeString(bin.Op));
         return false; // indicate that we've already processed expr's subexpressions
 
       } else if (expr is ITEExpr ifThenElse) {
         VisitIndependentComponent(ifThenElse.Test);
         VisitIndependentComponent(ifThenElse.Thn);
-        VisitRhsComponent(expr.tok, ifThenElse.Els, "else branch of if-then-else");
+        VisitRhsComponent(expr.Origin, ifThenElse.Els, "else branch of if-then-else");
         return false; // indicate that we've already processed expr's subexpressions
 
       } else if (expr is QuantifierExpr quantifierExpr) {
@@ -144,26 +154,22 @@ protected override bool VisitOneExpr(Expression expr, ref LeftMargin st) {
         if (quantifierExpr.Range != null) {
           VisitIndependentComponent(quantifierExpr.Range);
         }
-        VisitRhsComponent(expr.tok, quantifierExpr.Term,
-          expr.tok.line == quantifierExpr.Term.StartToken.line ? expr.tok.col + 1 : quantifierExpr.Term.StartToken.col,
+        VisitRhsComponent(expr.Origin, quantifierExpr.Term,
+          expr.Origin.line == quantifierExpr.Term.StartToken.line ? expr.Origin.col + 1 : quantifierExpr.Term.StartToken.col,
           "body of " + (expr is ForallExpr ? "forall" : "exists"));
         return false; // indicate that we've already processed expr's subexpressions
 
       } else if (expr is LetExpr letExpr) {
         Attributes.SubExpressions(letExpr.Attributes).ForEach(VisitIndependentComponent);
         letExpr.RHSs.ForEach(VisitIndependentComponent);
-        VisitRhsComponent(expr.tok, letExpr.Body, "body of let-expression");
+        VisitRhsComponent(expr.Origin, letExpr.Body, "body of let-expression");
         return false; // indicate that we've already processed expr's subexpressions
 
-      } else if (expr is OldExpr or FreshExpr or UnchangedExpr or DatatypeValue or DisplayExpression or MapDisplayExpr) {
+      } else if (expr is OldExpr or FreshExpr or UnchangedExpr or DisplayExpression or MapDisplayExpr) {
         // In these expressions, all subexpressions are contained in parentheses, so there's no risk of precedence confusion
         expr.SubExpressions.ForEach(VisitIndependentComponent);
         return false; // indicate that we've already processed expr's subexpressions
 
-      } else if (expr is FunctionCallExpr functionCallExpr) {
-        return VisitComponentsAsIndependentExceptOne(expr, functionCallExpr.Receiver, st);
-      } else if (expr is ApplyExpr applyExpr) {
-        return VisitComponentsAsIndependentExceptOne(expr, applyExpr.Function, st);
       } else if (expr is DatatypeUpdateExpr datatypeUpdateExpr) {
         return VisitComponentsAsIndependentExceptOne(expr, datatypeUpdateExpr.Root, st);
       } else if (expr is SeqSelectExpr selectExpr) {
@@ -219,7 +225,7 @@ void VisitIndependentComponent(Expression expr) {
       Visit(expr, null);
     }
 
-    void VisitLhsComponent(IToken errorToken, Expression expr, int leftMargin, string what) {
+    void VisitLhsComponent(IOrigin errorToken, Expression expr, int leftMargin, string what) {
       if (expr is ParensExpression || expr.StartToken.line == errorToken.line) {
         VisitIndependentComponent(expr);
       } else {
@@ -232,16 +238,11 @@ void VisitLhsComponent(IToken errorToken, Expression expr, int leftMargin, strin
       }
     }
 
-    void VisitRhsComponent(IToken errorToken, Expression expr, string what) {
-      if (expr.StartToken == null) {
-        // Might be a resolved expression.
-        VisitIndependentComponent(expr);
-      } else {
-        VisitRhsComponent(errorToken, expr, expr.StartToken.col, what);
-      }
+    void VisitRhsComponent(IOrigin errorToken, Expression expr, string what) {
+      VisitRhsComponent(errorToken, expr, expr.StartToken.col, what);
     }
 
-    void VisitRhsComponent(IToken errorToken, Expression expr, int rightMargin, string what) {
+    void VisitRhsComponent(IOrigin errorToken, Expression expr, int rightMargin, string what) {
       if (expr is ParensExpression || errorToken.FromIncludeDirective(compilation)) {
         VisitIndependentComponent(expr);
       } else {
@@ -249,12 +250,12 @@ void VisitRhsComponent(IToken errorToken, Expression expr, int rightMargin, stri
         Visit(expr, st);
         if (st.Column < rightMargin) {
           reporter.Warning(MessageSource.Rewriter, ErrorId.rw_unusual_indentation_end, errorToken,
-            $"unusual indentation in {what} (which ends at {LineCol(expr.RangeToken.EndToken)}); do you perhaps need parentheses?");
+            $"unusual indentation in {what} (which ends at {LineCol(expr.Origin.EndToken)}); do you perhaps need parentheses?");
         }
       }
     }
 
-    static string LineCol(IToken tok) {
+    static string LineCol(IOrigin tok) {
       return $"line {tok.line}, column {tok.col}";
     }
   }
diff --git a/Source/DafnyCore/Rewriters/PrintEffectEnforcement.cs b/Source/DafnyCore/Rewriters/PrintEffectEnforcement.cs
index d3b3c214952..f8ec96da9ad 100644
--- a/Source/DafnyCore/Rewriters/PrintEffectEnforcement.cs
+++ b/Source/DafnyCore/Rewriters/PrintEffectEnforcement.cs
@@ -28,7 +28,7 @@ internal override void PostDecreasesResolve(ModuleDefinition m) {
             var hasPrintAttribute = HasPrintAttribute(member.Attributes);
             if (member is Function f) {
               if (hasPrintAttribute) {
-                ReportError(ErrorId.rw_print_attribute_forbidden_on_functions, member.tok, ":print attribute is not allowed on functions");
+                ReportError(ErrorId.rw_print_attribute_forbidden_on_functions, member.Origin, ":print attribute is not allowed on functions");
               }
               if (f.ByMethodDecl != null && Reporter.Options.EnforcePrintEffects) {
                 f.ByMethodDecl.Body.Body.ForEach(stmt => CheckNoPrintEffects(stmt, f.ByMethodDecl));
@@ -36,9 +36,9 @@ internal override void PostDecreasesResolve(ModuleDefinition m) {
             } else if (member is Method method) {
               if (hasPrintAttribute) {
                 if (member.IsGhost) {
-                  ReportError(ErrorId.rw_print_attribute_forbidden_on_ghost_methods, member.tok, ":print attribute is not allowed on ghost methods");
+                  ReportError(ErrorId.rw_print_attribute_forbidden_on_ghost_methods, member.Origin, ":print attribute is not allowed on ghost methods");
                 } else if (method.OverriddenMethod != null && !HasPrintAttribute(method.OverriddenMethod.Attributes, false)) {
-                  ReportError(ErrorId.rw_override_must_preserve_printing, member.tok,
+                  ReportError(ErrorId.rw_override_must_preserve_printing, member.Origin,
                     "not allowed to override a non-printing method with a possibly printing method ('{0}')", method.Name);
                 }
               } else if (!member.IsGhost && method.Body != null) {
@@ -55,7 +55,7 @@ internal override void PostDecreasesResolve(ModuleDefinition m) {
     bool HasPrintAttribute(Attributes attrs, bool checkParameters = true) {
       var printAttribute = Attributes.Find(attrs, "print");
       if (checkParameters && printAttribute != null && printAttribute.Args.Count != 0) {
-        ReportError(ErrorId.rw_print_attribute_takes_no_arguments, printAttribute.Args[0].tok, ":print attribute does not take any arguments");
+        ReportError(ErrorId.rw_print_attribute_takes_no_arguments, printAttribute.Args[0].Origin, ":print attribute does not take any arguments");
       }
       return printAttribute != null;
     }
@@ -64,18 +64,18 @@ private void CheckNoPrintEffects(Statement stmt, IMethodCodeContext codeContext)
       if (stmt is PrintStmt) {
         var method = codeContext as Method;
         if (method != null && method.IsByMethod) {
-          ReportError(ErrorId.rw_no_print_in_function_by_method, stmt.Tok, "a function-by-method is not allowed to use print statements");
+          ReportError(ErrorId.rw_no_print_in_function_by_method, stmt.Origin, "a function-by-method is not allowed to use print statements");
         } else {
-          ReportError(ErrorId.rw_print_attribute_required_to_print, stmt.Tok,
+          ReportError(ErrorId.rw_print_attribute_required_to_print, stmt.Origin,
             "to use a print statement, the enclosing {0} must be marked with {{:print}}", method?.WhatKind ?? ((IteratorDecl)codeContext).WhatKind);
         }
       } else if (stmt is CallStmt call) {
         if (HasPrintAttribute(call.Method.Attributes, false)) {
           var method = codeContext as Method;
           if (method != null && method.IsByMethod) {
-            ReportError(ErrorId.rw_function_by_method_may_not_call_printing_method, stmt.Tok, "a function-by-method is not allowed to call a method with print effects");
+            ReportError(ErrorId.rw_function_by_method_may_not_call_printing_method, stmt.Origin, "a function-by-method is not allowed to call a method with print effects");
           } else {
-            ReportError(ErrorId.rw_must_be_print_to_call_printing_method, stmt.Tok,
+            ReportError(ErrorId.rw_must_be_print_to_call_printing_method, stmt.Origin,
               "to call a method with print effects, the enclosing {0} must be marked with {{:print}}",
               method?.WhatKind ?? ((IteratorDecl)codeContext).WhatKind);
           }
diff --git a/Source/DafnyCore/Rewriters/ProvideRevealAllRewriter.cs b/Source/DafnyCore/Rewriters/ProvideRevealAllRewriter.cs
index 73c82b10787..e084a915050 100644
--- a/Source/DafnyCore/Rewriters/ProvideRevealAllRewriter.cs
+++ b/Source/DafnyCore/Rewriters/ProvideRevealAllRewriter.cs
@@ -33,7 +33,7 @@ internal override void PreResolve(ModuleDefinition m) {
             }
 
             if (newt is not DefaultClassDecl) {
-              me.Exports.Add(new ExportSignature(newt.tok, newt.Name, !revealAll || !newt.CanBeRevealed()));
+              me.Exports.Add(new ExportSignature(newt.Origin, newt.Name, !revealAll || !newt.CanBeRevealed()));
             }
 
             if (newt is TopLevelDeclWithMembers cl) {
@@ -43,13 +43,13 @@ internal override void PreResolve(ModuleDefinition m) {
                 var opaque = !revealAll || !mem.CanBeRevealed();
                 if (newt is DefaultClassDecl) {
                   // add everything from the default class
-                  me.Exports.Add(new ExportSignature(mem.tok, mem.Name, opaque));
+                  me.Exports.Add(new ExportSignature(mem.Origin, mem.Name, opaque));
                 } else if (mem is Constructor && !newtIsRevealed) {
                   // "provides *" does not pick up class constructors, unless the class is to be revealed
                 } else if (opaque && mem is Field field && !(mem is ConstantField) && !newtIsRevealed) {
                   // "provides *" does not pick up mutable fields, unless the class is to be revealed
                 } else {
-                  me.Exports.Add(new ExportSignature(cl.tok, cl.Name, mem.tok, mem.Name, opaque));
+                  me.Exports.Add(new ExportSignature(cl.Origin, cl.Name, mem.Origin, mem.Name, opaque));
                 }
               }
             }
diff --git a/Source/DafnyCore/Rewriters/RefinementErrors.cs b/Source/DafnyCore/Rewriters/RefinementErrors.cs
index bb1fef9729d..7491042b904 100644
--- a/Source/DafnyCore/Rewriters/RefinementErrors.cs
+++ b/Source/DafnyCore/Rewriters/RefinementErrors.cs
@@ -17,14 +17,10 @@ public enum ErrorId {
     ref_export_must_refine_export,
     ref_base_module_must_be_facade,
     ref_module_must_refine_module_2,
-    ref_mismatched_equality,
-    ref_mismatched_auto_init,
-    ref_mismatched_nonempty,
-    ref_trait_mismatched_equality,
-    ref_equality_support_precludes_codatatype,
-    ref_mismatched_type_equality_support,
-    ref_mismatched_type_auto_init,
-    ref_mismatched_type_nonempty,
+    ref_mismatched_type_characteristics_equality,
+    ref_mismatched_type_characteristics_autoinit,
+    ref_mismatched_type_characteristics_nonempty,
+    ref_mismatched_type_characteristics_noreferences,
     ref_mismatched_type_with_members,
     ref_mismatched_abstractness,
     ref_declaration_must_refine,
@@ -57,6 +53,7 @@ public enum ErrorId {
     ref_mismatched_refinement_body,
     ref_method_refines_method,
     ref_no_new_method_precondition,
+    ref_no_new_method_reads,
     ref_no_new_method_modifies,
     ref_no_new_method_decreases,
     ref_mismatched_method_static,
@@ -69,6 +66,8 @@ public enum ErrorId {
     ref_mismatched_type_parameter_nonempty,
     ref_mismatched_type_parameter_not_reference,
     ref_mismatched_type_parameter_variance,
+    ref_mismatched_type_bounds_count,
+    ref_mismatched_type_parameter_bound,
     ref_mismatched_kind_count,
     ref_mismatched_kind_name,
     ref_mismatched_kind_ghost,
diff --git a/Source/DafnyCore/Rewriters/RefinementTransformer.cs b/Source/DafnyCore/Rewriters/RefinementTransformer.cs
index ebb49745255..311e7462bd9 100644
--- a/Source/DafnyCore/Rewriters/RefinementTransformer.cs
+++ b/Source/DafnyCore/Rewriters/RefinementTransformer.cs
@@ -23,42 +23,29 @@
 using static Microsoft.Dafny.RefinementErrors;
 
 namespace Microsoft.Dafny {
-  public class RefinementToken : TokenWrapper {
+  public class RefinementOrigin : OriginWrapper {
     public readonly ModuleDefinition InheritingModule;
 
-    public RefinementToken(IToken tok, ModuleDefinition m)
+
+    public RefinementOrigin(IOrigin tok, ModuleDefinition m)
       : base(tok) {
       Contract.Requires(tok != null);
       Contract.Requires(m != null);
       this.InheritingModule = m;
     }
 
-
-    public override IToken WithVal(string newVal) {
-      return new RefinementToken(WrappedToken.WithVal(newVal), InheritingModule);
+    public override string ToString() {
+      return $"refinement of {WrappedToken} by {InheritingModule.Name}";
     }
 
-    public static bool IsInherited(IToken tok, ModuleDefinition m) {
-      if (tok is AutoGeneratedToken agt) {
-        tok = agt.WrappedToken;
-      }
-      while (tok is NestedToken) {
-        var n = (NestedToken)tok;
-        // check Outer
-        var r = n.Outer as RefinementToken;
-        if (r == null || r.InheritingModule != m) {
-          return false;
-        }
+    public override IOrigin WithVal(string newVal) {
+      return new RefinementOrigin(WrappedToken.WithVal(newVal), InheritingModule);
+    }
 
-        // continue to check Inner
-        tok = n.Inner;
-        if (tok is AutoGeneratedToken nestedAtg) {
-          tok = nestedAtg.WrappedToken;
-        }
-      }
+    public override bool IsCopy => true;
 
-      var rtok = tok as RefinementToken;
-      return rtok != null && rtok.InheritingModule == m;
+    public override bool IsInherited(ModuleDefinition m) {
+      return InheritingModule == m;
     }
 
     public override string Filepath => WrappedToken.Filepath + "[" + InheritingModule.Name + "]";
@@ -164,16 +151,16 @@ public RefinementTransformer(Program p)
       : this(p.Reporter) {
     }
 
-    private void Error(ErrorId errorId, IToken tok, string msg, params object[] args) {
+    private void Error(ErrorId errorId, IOrigin tok, string msg, params object[] args) {
       Reporter.Error(MessageSource.RefinementTransformer, errorId, tok, msg, args);
     }
 
     private void Error(ErrorId errorId, Declaration d, string msg, params object[] args) {
-      Reporter.Error(MessageSource.RefinementTransformer, errorId, d.Tok, msg, args);
+      Reporter.Error(MessageSource.RefinementTransformer, errorId, d.Origin, msg, args);
     }
 
     private void Error(ErrorId errorId, INode n, string msg, params object[] args) {
-      Reporter.Error(MessageSource.RefinementTransformer, errorId, n.Tok, msg, args);
+      Reporter.Error(MessageSource.RefinementTransformer, errorId, n.Origin, msg, args);
     }
 
     private ModuleDefinition moduleUnderConstruction;  // non-null for the duration of Construct calls
@@ -184,42 +171,47 @@ private void Error(ErrorId errorId, INode n, string msg, params object[] args) {
     private ModuleSignature refinedSigOpened;
 
     internal override void PreResolve(ModuleDefinition m) {
-      if (m.RefinementQId?.Decl != null) { // There is a refinement parent and it resolved OK
-        RefinedSig = m.RefinementQId.Sig;
 
+      if (m.Implements?.Target.Decl == null) {
+        // do this also for non-refining modules
+        CheckSuperfluousRefiningMarks(m.TopLevelDecls, new List<string>());
+        AddDefaultBaseTypeToUnresolvedNewtypes(m.TopLevelDecls);
+      } else {
+        // There is a refinement parent and it resolved OK
+        var refinementTarget = m.Implements.Target;
+        if (m.Implements.Kind == ImplementationKind.Refinement && refinementTarget.Def.ModuleKind == ModuleKindEnum.Replaceable) {
+          Reporter.Error(MessageSource.RefinementTransformer, "refineReplaceable", refinementTarget.Origin,
+            "replaceable module cannot be refined");
+
+          return;
+        }
+        RefinedSig = refinementTarget.Sig;
         Contract.Assert(RefinedSig.ModuleDef != null);
-        Contract.Assert(m.RefinementQId.Def == RefinedSig.ModuleDef);
+        Contract.Assert(refinementTarget.Def == RefinedSig.ModuleDef);
+
         // check that the openness in the imports between refinement and its base matches
+        Dictionary<string, TopLevelDecl> refinedModuleTopLevelDecls = new();
+        foreach (var baseDecl in refinementTarget.Def.TopLevelDecls) {
+          refinedModuleTopLevelDecls.Add(baseDecl.Name, baseDecl);
+        }
         var declarations = m.TopLevelDecls;
-        var baseDeclarations = m.RefinementQId.Def.TopLevelDecls.ToList();
-        foreach (var im in declarations) {
-          // TODO: this is a terribly slow algorithm; use the symbol table instead
-          foreach (var bim in baseDeclarations) {
-            if (bim.Name.Equals(im.Name)) {
-              if (im is ModuleDecl mdecl) {
-                if (bim is ModuleDecl mbim) {
-                  if (mdecl.Opened != mbim.Opened) {
-                    if (mdecl.Opened) {
-                      Error(ErrorId.ref_refinement_import_must_match_opened_base, m.tok,
-                        "{0} in {1} cannot be imported with \"opened\" because it does not match the corresponding import in the refinement base {2}.",
-                        im.Name, m.Name, m.RefinementQId.ToString());
-                    } else {
-                      Error(ErrorId.ref_refinement_import_must_match_non_opened_base, m.tok,
-                        "{0} in {1} must be imported with \"opened\"  to match the corresponding import in its refinement base {2}.",
-                        im.Name, m.Name, m.RefinementQId.ToString());
-                    }
-                  }
-                }
+        foreach (var mdecl in declarations.OfType<ModuleDecl>()) {
+          if (refinedModuleTopLevelDecls.TryGetValue(mdecl.Name, out var baseDecl)) {
+            if (baseDecl is ModuleDecl baseModuleDecl) {
+              if (mdecl.Opened && !baseModuleDecl.Opened) {
+                Error(ErrorId.ref_refinement_import_must_match_opened_base, m.Origin,
+                  "{0} in {1} cannot be imported with \"opened\" because it does not match the corresponding import in the refinement base {2}.",
+                  mdecl.Name, m.Name, m.Implements.Target.ToString());
+              } else if (!mdecl.Opened && baseModuleDecl.Opened) {
+                Error(ErrorId.ref_refinement_import_must_match_non_opened_base, m.Origin,
+                  "{0} in {1} must be imported with \"opened\"  to match the corresponding import in its refinement base {2}.",
+                  mdecl.Name, m.Name, m.Implements.Target.ToString());
               }
-              break;
             }
           }
         }
+
         PreResolveWorker(m);
-      } else {
-        // do this also for non-refining modules
-        CheckSuperfluousRefiningMarks(m.TopLevelDecls, new List<string>());
-        AddDefaultBaseTypeToUnresolvedNewtypes(m.TopLevelDecls);
       }
     }
 
@@ -231,11 +223,12 @@ void PreResolveWorker(ModuleDefinition module) {
       }
       moduleUnderConstruction = module;
       refinementCloner = new RefinementCloner(moduleUnderConstruction);
-      var prev = module.RefinementQId.Def;
+      var refinementTarget = module.Implements.Target;
+      var prev = refinementTarget.Def;
 
       //copy the signature, including its opened imports
       refinedSigOpened = ModuleResolver.MergeSignature(new ModuleSignature(), RefinedSig);
-      ModuleResolver.ResolveOpenedImports(refinedSigOpened, module.RefinementQId.Def, Reporter, null);
+      ModuleResolver.ResolveOpenedImports(refinedSigOpened, prev, Reporter, null);
 
       // Create a simple name-to-decl dictionary.  Ignore any duplicates at this time.
       var declaredNames = new Dictionary<string, IPointer<TopLevelDecl>>();
@@ -257,10 +250,10 @@ void PreResolveWorker(ModuleDefinition module) {
           if (originalDeclaration.Name == "_default" || newDeclaration.IsRefining || originalDeclaration is AbstractTypeDecl) {
             MergeTopLevelDecls(module, newPointer, originalDeclaration);
           } else if (newDeclaration is TypeSynonymDecl) {
-            var msg = $"a type synonym ({newDeclaration.Name}) is not allowed to replace a {originalDeclaration.WhatKind} from the refined module ({module.RefinementQId}), even if it denotes the same type";
-            Error(ErrorId.ref_refinement_type_must_match_base, newDeclaration.tok, msg);
+            var msg = $"a type synonym ({newDeclaration.Name}) is not allowed to replace a {originalDeclaration.WhatKind} from the refined module ({module.Implements.Target}), even if it denotes the same type";
+            Error(ErrorId.ref_refinement_type_must_match_base, newDeclaration.Origin, msg);
           } else if (!(originalDeclaration is AbstractModuleDecl)) {
-            Error(ErrorId.ref_refining_notation_needed, newDeclaration.tok, $"to redeclare and refine declaration '{originalDeclaration.Name}' from module '{module.RefinementQId}', you must use the refining (`...`) notation");
+            Error(ErrorId.ref_refining_notation_needed, newDeclaration.Origin, $"to redeclare and refine declaration '{originalDeclaration.Name}' from module '{module.Implements.Target}', you must use the refining (`...`) notation");
           }
         }
       }
@@ -275,7 +268,7 @@ void PreResolveWorker(ModuleDefinition module) {
           MergeTopLevelDecls(module, pointer, d);
         }
       }
-      module.RefinementQId.Sig = RefinedSig;
+      refinementTarget.Sig = RefinedSig;
 
       Contract.Assert(moduleUnderConstruction == module);  // this should be as it was set earlier in this method
     }
@@ -285,7 +278,7 @@ private void CheckSuperfluousRefiningMarks(IEnumerable<TopLevelDecl> topLevelDec
       Contract.Requires(excludeList != null);
       foreach (var d in topLevelDecls) {
         if (d.IsRefining && !excludeList.Contains(d.Name)) {
-          Error(ErrorId.ref_refining_notation_does_not_refine, d.tok, $"declaration '{d.Name}' indicates refining (notation `...`), but does not refine anything");
+          Error(ErrorId.ref_refining_notation_does_not_refine, d.Origin, $"declaration '{d.Name}' indicates refining (notation `...`), but does not refine anything");
         }
       }
     }
@@ -297,7 +290,7 @@ private void CheckSuperfluousRefiningMarks(IEnumerable<TopLevelDecl> topLevelDec
     private void AddDefaultBaseTypeToUnresolvedNewtypes(IEnumerable<TopLevelDecl> topLevelDecls) {
       foreach (var d in topLevelDecls) {
         if (d is NewtypeDecl { IsRefining: true, BaseType: null } decl) {
-          Reporter.Info(MessageSource.RefinementTransformer, decl.tok, $"defaulting to 'int' for unspecified base type of '{decl.Name}'");
+          Reporter.Info(MessageSource.RefinementTransformer, decl.Origin, $"defaulting to 'int' for unspecified base type of '{decl.Name}'");
           decl.BaseType = new IntType(); // Set `BaseType` to some reasonable default to allow resolution to proceed
         }
       }
@@ -331,7 +324,7 @@ private void MergeTopLevelDecls(ModuleDefinition m, IPointer<TopLevelDecl> nwPoi
         } else {
           // check that the new module refines the previous declaration
           if (!CheckIsRefinement((ModuleDecl)nw, (AbstractModuleDecl)d)) {
-            Error(ErrorId.ref_module_must_refine_module_2, nw.tok, "a module ({0}) can only be replaced by a refinement of the original module", d.Name);
+            Error(ErrorId.ref_module_must_refine_module_2, nw.Origin, "a module ({0}) can only be replaced by a refinement of the original module", d.Name);
           }
         }
       } else if (d is AbstractTypeDecl) {
@@ -339,57 +332,18 @@ private void MergeTopLevelDecls(ModuleDefinition m, IPointer<TopLevelDecl> nwPoi
           Error(ErrorId.ref_module_must_refine_module_2, nw, "a module ({0}) must refine another module", nw.Name);
         } else {
           var od = (AbstractTypeDecl)d;
-          if (nw is AbstractTypeDecl) {
-            if (od.SupportsEquality != ((AbstractTypeDecl)nw).SupportsEquality) {
-              Error(ErrorId.ref_mismatched_equality, nw, "type declaration '{0}' is not allowed to change the requirement of supporting equality", nw.Name);
-            }
-            if (od.Characteristics.HasCompiledValue != ((AbstractTypeDecl)nw).Characteristics.HasCompiledValue) {
-              Error(ErrorId.ref_mismatched_auto_init, nw.tok, "type declaration '{0}' is not allowed to change the requirement of supporting auto-initialization", nw.Name);
-            } else if (od.Characteristics.IsNonempty != ((AbstractTypeDecl)nw).Characteristics.IsNonempty) {
-              Error(ErrorId.ref_mismatched_nonempty, nw.tok, "type declaration '{0}' is not allowed to change the requirement of being nonempty", nw.Name);
-            }
-          } else {
-            if (od.SupportsEquality) {
-              if (nw is TraitDecl traitDecl) {
-                if (!traitDecl.IsReferenceTypeDecl) {
-                  Error(ErrorId.ref_trait_mismatched_equality, nw, "a type declaration that requires equality support cannot be replaced by this trait");
-                }
-              } else if (nw is ClassDecl || nw is NewtypeDecl) {
-                // fine
-              } else if (nw is CoDatatypeDecl) {
-                Error(ErrorId.ref_equality_support_precludes_codatatype, nw, "a type declaration that requires equality support cannot be replaced by a codatatype");
-              } else {
-                Contract.Assert(nw is IndDatatypeDecl || nw is TypeSynonymDecl);
-                // Here, we need to figure out if the new type supports equality.  But we won't know about that until resolution has
-                // taken place, so we defer it until the PostResolveIntermediate phase.
-                var udt = UserDefinedType.FromTopLevelDecl(nw.tok, nw);
-                postTasks.Enqueue(() => {
-                  if (!udt.SupportsEquality) {
-                    Error(ErrorId.ref_mismatched_type_equality_support, udt.tok, "type '{0}', which does not support equality, is used to refine an abstract type with equality support", udt.Name);
-                  }
-                });
-              }
-            }
-            if (od.Characteristics.HasCompiledValue) {
-              // We need to figure out if the new type supports auto-initialization.  But we won't know about that until resolution has
-              // taken place, so we defer it until the PostResolveIntermediate phase.
-              var udt = UserDefinedType.FromTopLevelDecl(nw.tok, nw);
-              postTasks.Enqueue(() => {
-                if (!udt.HasCompilableValue) {
-                  Error(ErrorId.ref_mismatched_type_auto_init, udt.tok, "type '{0}', which does not support auto-initialization, is used to refine an abstract type that expects auto-initialization", udt.Name);
-                }
-              });
-            } else if (od.Characteristics.IsNonempty) {
-              // We need to figure out if the new type is nonempty.  But we won't know about that until resolution has
-              // taken place, so we defer it until the PostResolveIntermediate phase.
-              var udt = UserDefinedType.FromTopLevelDecl(nw.tok, nw);
-              postTasks.Enqueue(() => {
-                if (!udt.IsNonempty) {
-                  Error(ErrorId.ref_mismatched_type_nonempty, udt.tok, "type '{0}', which may be empty, is used to refine an abstract type expected to be nonempty", udt.Name);
-                }
-              });
+          postTasks.Enqueue(() => {
+            // check that od's type characteristics are respected by nw's
+            var newType = UserDefinedType.FromTopLevelDecl(nw.Origin,
+              nw is ClassLikeDecl { NonNullTypeDecl: { } nonNullTypeDecl } ? nonNullTypeDecl : nw);
+            if (!CheckTypeCharacteristicsVisitor.CheckCharacteristics(od.Characteristics, newType, false, out var whatIsNeeded, out var hint, out var errorId)) {
+              var typeCharacteristicsSyntax = od.Characteristics.ToString();
+              Error(errorId, nw.Origin,
+                $"to be a refinement of {od.WhatKind} '{od.EnclosingModuleDefinition.Name}.{od.Name}' declared with {typeCharacteristicsSyntax}, " +
+                $"{nw.WhatKind} '{m.Name}.{nw.Name}' must {whatIsNeeded}{hint}");
             }
-          }
+          });
+
           if (nw is TopLevelDeclWithMembers) {
             nwPointer.Set(MergeClass((TopLevelDeclWithMembers)nw, od));
           } else if (od.Members.Count != 0) {
@@ -397,7 +351,7 @@ private void MergeTopLevelDecls(ModuleDefinition m, IPointer<TopLevelDecl> nwPoi
               "a {0} ({1}) cannot declare members, so it cannot refine an abstract type with members",
               nw.WhatKind, nw.Name);
           } else {
-            CheckAgreement_TypeParameters(nw.tok, d.TypeArgs, nw.TypeArgs, nw.Name, "type", false);
+            CheckAgreement_TypeParameters(nw.Origin, d.TypeArgs, nw.TypeArgs, nw.Name, "type");
           }
         }
       } else if (nw is AbstractTypeDecl) {
@@ -474,76 +428,11 @@ public bool CheckIsRefinement(ModuleDecl derived, AbstractModuleDecl original) {
           var oexports = new HashSet<string>(original.Exports.ConvertAll(t => t.val));
           return oexports.IsSubsetOf(exports);
         }
-        derivedPointer = derivedPointer.RefinementQId.Def;
+        derivedPointer = derivedPointer.Implements.Target.Def;
       }
       return false;
     }
 
-    // Check that two resolved types are the same in a similar context (the same type parameters, method, class, etc.)
-    // Assumes that prev is in a previous refinement, and next is in some refinement. Note this is not commutative.
-    public bool ResolvedTypesAreTheSame(Type prev, Type next) {
-      Contract.Requires(prev != null);
-      Contract.Requires(next != null);
-
-      prev = prev.NormalizeExpandKeepConstraints();
-      next = next.NormalizeExpandKeepConstraints();
-
-      if (prev is TypeProxy || next is TypeProxy) {
-        return false;
-      }
-
-      if (prev is BoolType) {
-        return next is BoolType;
-      } else if (prev is CharType) {
-        return next is CharType;
-      } else if (prev is IntType) {
-        return next is IntType;
-      } else if (prev is RealType) {
-        return next is RealType;
-      } else if (prev is SetType) {
-        return next is SetType && ((SetType)prev).Finite == ((SetType)next).Finite &&
-          ResolvedTypesAreTheSame(((SetType)prev).Arg, ((SetType)next).Arg);
-      } else if (prev is MultiSetType) {
-        return next is MultiSetType && ResolvedTypesAreTheSame(((MultiSetType)prev).Arg, ((MultiSetType)next).Arg);
-      } else if (prev is MapType) {
-        return next is MapType && ((MapType)prev).Finite == ((MapType)next).Finite &&
-               ResolvedTypesAreTheSame(((MapType)prev).Domain, ((MapType)next).Domain) && ResolvedTypesAreTheSame(((MapType)prev).Range, ((MapType)next).Range);
-      } else if (prev is SeqType) {
-        return next is SeqType && ResolvedTypesAreTheSame(((SeqType)prev).Arg, ((SeqType)next).Arg);
-      } else if (prev is UserDefinedType) {
-        if (!(next is UserDefinedType)) {
-          return false;
-        }
-        UserDefinedType aa = (UserDefinedType)prev;
-        UserDefinedType bb = (UserDefinedType)next;
-        if (aa.ResolvedClass is TypeParameter && bb.ResolvedClass is TypeParameter) {
-          // these are both resolved type parameters
-          var tpa = (TypeParameter)aa.ResolvedClass;
-          var tpb = (TypeParameter)bb.ResolvedClass;
-          Contract.Assert(aa.TypeArgs.Count == 0 && bb.TypeArgs.Count == 0);
-          // Note that this is only correct if the two types occur in the same context, ie. both from the same method
-          // or class field.
-          return tpa.PositionalIndex == tpb.PositionalIndex && tpa.IsToplevelScope == tpb.IsToplevelScope;
-        } else if (aa.ResolvedClass == bb.ResolvedClass) {
-          // these are both resolved class/datatype types
-          Contract.Assert(aa.TypeArgs.Count == bb.TypeArgs.Count);
-          for (int i = 0; i < aa.TypeArgs.Count; i++) {
-            if (!ResolvedTypesAreTheSame(aa.TypeArgs[i], bb.TypeArgs[i])) {
-              return false;
-            }
-          }
-
-          return true;
-        } else {
-          // something is wrong; either aa or bb wasn't properly resolved, or they aren't the same
-          return false;
-        }
-
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
     internal override void PostResolveIntermediate(ModuleDefinition m) {
       if (m == moduleUnderConstruction) {
         while (this.postTasks.Count != 0) {
@@ -561,9 +450,9 @@ Function CloneFunction(Function newFunction, Function previousFunction, Expressi
       Contract.Requires(moreBody == null || replacementBody == null);
 
       var tps = previousFunction.TypeArgs.ConvertAll(refinementCloner.CloneTypeParam);
-      var formals = previousFunction.Formals.ConvertAll(p => refinementCloner.CloneFormal(p, false));
+      var formals = previousFunction.Ins.ConvertAll(p => refinementCloner.CloneFormal(p, false));
       var req = previousFunction.Req.ConvertAll(refinementCloner.CloneAttributedExpr);
-      var reads = previousFunction.Reads.ConvertAll(refinementCloner.CloneFrameExpr);
+      var reads = refinementCloner.CloneSpecFrameExpr(previousFunction.Reads);
       var decreases = refinementCloner.CloneSpecExpr(previousFunction.Decreases);
       var result = previousFunction.Result ?? newFunction.Result;
       if (result != null) {
@@ -588,7 +477,7 @@ Function CloneFunction(Function newFunction, Function previousFunction, Expressi
           body = moreBody;
           bodyOrigin = Predicate.BodyOriginKind.DelayedDefinition;
         } else {
-          body = new BinaryExpr(previousFunction.tok, BinaryExpr.Opcode.And, refinementCloner.CloneExpr(previousFunction.Body), moreBody);
+          body = new BinaryExpr(previousFunction.Origin, BinaryExpr.Opcode.And, refinementCloner.CloneExpr(previousFunction.Body), moreBody);
           bodyOrigin = Predicate.BodyOriginKind.Extension;
         }
       } else {
@@ -597,30 +486,30 @@ Function CloneFunction(Function newFunction, Function previousFunction, Expressi
       }
       var byMethodBody = refinementCloner.CloneBlockStmt(previousFunction.ByMethodBody);
 
-      var range = newFunction.RangeToken;
+      var origin = newFunction.Origin;
       var nameNode = newFunction.NameNode;
 
       if (previousFunction is Predicate) {
-        return new Predicate(range, nameNode, previousFunction.HasStaticKeyword, newFunction.IsGhost, previousFunction.IsOpaque, tps, formals, result,
+        return new Predicate(origin, nameNode, previousFunction.HasStaticKeyword, newFunction.IsGhost, previousFunction.IsOpaque, tps, formals, result,
           req, reads, ens, decreases, body, bodyOrigin,
-          previousFunction.ByMethodTok == null ? null : refinementCloner.Tok(previousFunction.ByMethodTok), byMethodBody,
+          previousFunction.ByMethodTok == null ? null : refinementCloner.Origin(previousFunction.ByMethodTok), byMethodBody,
           refinementCloner.MergeAttributes(previousFunction.Attributes, moreAttributes), null);
       } else if (previousFunction is LeastPredicate) {
-        return new LeastPredicate(range, nameNode, previousFunction.HasStaticKeyword, previousFunction.IsOpaque, ((LeastPredicate)previousFunction).TypeOfK, tps, formals, result,
+        return new LeastPredicate(origin, nameNode, previousFunction.HasStaticKeyword, previousFunction.IsOpaque, ((LeastPredicate)previousFunction).TypeOfK, tps, formals, result,
           req, reads, ens, body, refinementCloner.MergeAttributes(previousFunction.Attributes, moreAttributes), null);
       } else if (previousFunction is GreatestPredicate) {
-        return new GreatestPredicate(range, nameNode, previousFunction.HasStaticKeyword, previousFunction.IsOpaque, ((GreatestPredicate)previousFunction).TypeOfK, tps, formals, result,
+        return new GreatestPredicate(origin, nameNode, previousFunction.HasStaticKeyword, previousFunction.IsOpaque, ((GreatestPredicate)previousFunction).TypeOfK, tps, formals, result,
           req, reads, ens, body, refinementCloner.MergeAttributes(previousFunction.Attributes, moreAttributes), null);
       } else if (previousFunction is TwoStatePredicate) {
-        return new TwoStatePredicate(range, nameNode, previousFunction.HasStaticKeyword, previousFunction.IsOpaque, tps, formals, result,
+        return new TwoStatePredicate(origin, nameNode, previousFunction.HasStaticKeyword, previousFunction.IsOpaque, tps, formals, result,
           req, reads, ens, decreases, body, refinementCloner.MergeAttributes(previousFunction.Attributes, moreAttributes), null);
       } else if (previousFunction is TwoStateFunction) {
-        return new TwoStateFunction(range, nameNode, previousFunction.HasStaticKeyword, previousFunction.IsOpaque, tps, formals, result, refinementCloner.CloneType(previousFunction.ResultType),
+        return new TwoStateFunction(origin, nameNode, previousFunction.HasStaticKeyword, previousFunction.IsOpaque, tps, formals, result, refinementCloner.CloneType(previousFunction.ResultType),
           req, reads, ens, decreases, body, refinementCloner.MergeAttributes(previousFunction.Attributes, moreAttributes), null);
       } else {
-        return new Function(range, nameNode, previousFunction.HasStaticKeyword, newFunction.IsGhost, previousFunction.IsOpaque, tps, formals, result, refinementCloner.CloneType(previousFunction.ResultType),
+        return new Function(origin, nameNode, previousFunction.HasStaticKeyword, newFunction.IsGhost, previousFunction.IsOpaque, tps, formals, result, refinementCloner.CloneType(previousFunction.ResultType),
           req, reads, ens, decreases, body,
-          previousFunction.ByMethodTok == null ? null : refinementCloner.Tok(previousFunction.ByMethodTok), byMethodBody,
+          previousFunction.ByMethodTok == null ? null : refinementCloner.Origin(previousFunction.ByMethodTok), byMethodBody,
           refinementCloner.MergeAttributes(previousFunction.Attributes, moreAttributes), null);
       }
     }
@@ -633,6 +522,7 @@ Method CloneMethod(Method previousMethod, List<AttributedExpression> moreEnsures
       var tps = previousMethod.TypeArgs.ConvertAll(refinementCloner.CloneTypeParam);
       var ins = previousMethod.Ins.ConvertAll(p => refinementCloner.CloneFormal(p, false));
       var req = previousMethod.Req.ConvertAll(refinementCloner.CloneAttributedExpr);
+      var reads = refinementCloner.CloneSpecFrameExpr(previousMethod.Reads);
       var mod = refinementCloner.CloneSpecFrameExpr(previousMethod.Mod);
 
       var ens = refinementCloner.WithRefinementTokenWrapping(
@@ -642,33 +532,35 @@ Method CloneMethod(Method previousMethod, List<AttributedExpression> moreEnsures
         ens.AddRange(moreEnsures);
       }
 
+      var origin = currentMethod.Origin;
+      var newName = currentMethod.NameNode;
       if (previousMethod is Constructor) {
         var dividedBody = (DividedBlockStmt)newBody ?? refinementCloner.CloneDividedBlockStmt((DividedBlockStmt)previousMethod.Body);
-        return new Constructor(previousMethod.RangeToken.MakeRefined(moduleUnderConstruction), previousMethod.NameNode.Clone(refinementCloner), previousMethod.IsGhost, tps, ins,
-          req, mod, ens, decreases, dividedBody, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null);
+        return new Constructor(origin, newName, previousMethod.IsGhost, tps, ins,
+          req, reads, mod, ens, decreases, dividedBody, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null);
       }
       var body = newBody ?? refinementCloner.CloneBlockStmt(previousMethod.Body);
       if (previousMethod is LeastLemma) {
-        return new LeastLemma(previousMethod.RangeToken.MakeRefined(moduleUnderConstruction), previousMethod.NameNode.Clone(refinementCloner), previousMethod.HasStaticKeyword, ((LeastLemma)previousMethod).TypeOfK, tps, ins,
+        return new LeastLemma(origin, newName, previousMethod.HasStaticKeyword, ((LeastLemma)previousMethod).TypeOfK, tps, ins,
           previousMethod.Outs.ConvertAll(o => refinementCloner.CloneFormal(o, false)),
-          req, mod, ens, decreases, body, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null);
+          req, reads, mod, ens, decreases, body, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null);
       } else if (previousMethod is GreatestLemma) {
-        return new GreatestLemma(previousMethod.RangeToken.MakeRefined(moduleUnderConstruction), previousMethod.NameNode.Clone(refinementCloner), previousMethod.HasStaticKeyword, ((GreatestLemma)previousMethod).TypeOfK, tps, ins,
+        return new GreatestLemma(origin, newName, previousMethod.HasStaticKeyword, ((GreatestLemma)previousMethod).TypeOfK, tps, ins,
           previousMethod.Outs.ConvertAll(o => refinementCloner.CloneFormal(o, false)),
-          req, mod, ens, decreases, body, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null);
+          req, reads, mod, ens, decreases, body, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null);
       } else if (previousMethod is Lemma) {
-        return new Lemma(previousMethod.RangeToken.MakeRefined(moduleUnderConstruction), previousMethod.NameNode.Clone(refinementCloner), previousMethod.HasStaticKeyword, tps, ins,
+        return new Lemma(origin, newName, previousMethod.HasStaticKeyword, tps, ins,
           previousMethod.Outs.ConvertAll(o => refinementCloner.CloneFormal(o, false)),
-          req, mod, ens, decreases, body, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null);
+          req, reads, mod, ens, decreases, body, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null);
       } else if (previousMethod is TwoStateLemma) {
         var two = (TwoStateLemma)previousMethod;
-        return new TwoStateLemma(previousMethod.RangeToken.MakeRefined(moduleUnderConstruction), previousMethod.NameNode.Clone(refinementCloner), previousMethod.HasStaticKeyword, tps, ins,
+        return new TwoStateLemma(origin, newName, previousMethod.HasStaticKeyword, tps, ins,
           previousMethod.Outs.ConvertAll(o => refinementCloner.CloneFormal(o, false)),
-          req, mod, ens, decreases, body, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null);
+          req, reads, mod, ens, decreases, body, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null);
       } else {
-        return new Method(previousMethod.RangeToken.MakeRefined(moduleUnderConstruction), previousMethod.NameNode.Clone(refinementCloner), previousMethod.HasStaticKeyword, previousMethod.IsGhost, tps, ins,
+        return new Method(origin, newName, previousMethod.HasStaticKeyword, previousMethod.IsGhost, tps, ins,
           previousMethod.Outs.ConvertAll(o => refinementCloner.CloneFormal(o, false)),
-          req, mod, ens, decreases, body, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null, previousMethod.IsByMethod);
+          req, reads, mod, ens, decreases, body, refinementCloner.MergeAttributes(previousMethod.Attributes, moreAttributes), null, previousMethod.IsByMethod);
       }
     }
 
@@ -679,19 +571,19 @@ IteratorDecl MergeIterator(IteratorDecl nw, IteratorDecl prev) {
       Contract.Requires(prev != null);
 
       if (nw.Requires.Count != 0) {
-        Error(ErrorId.ref_no_new_iterator_preconditions, nw.Requires[0].E.tok, "a refining iterator is not allowed to add preconditions");
+        Error(ErrorId.ref_no_new_iterator_preconditions, nw.Requires[0].E.Origin, "a refining iterator is not allowed to add preconditions");
       }
       if (nw.YieldRequires.Count != 0) {
-        Error(ErrorId.ref_no_new_iterator_yield_preconditions, nw.YieldRequires[0].E.tok, "a refining iterator is not allowed to add yield preconditions");
+        Error(ErrorId.ref_no_new_iterator_yield_preconditions, nw.YieldRequires[0].E.Origin, "a refining iterator is not allowed to add yield preconditions");
       }
       if (nw.Reads.Expressions.Count != 0) {
-        Error(ErrorId.ref_no_new_iterator_reads, nw.Reads.Expressions[0].E.tok, "a refining iterator is not allowed to extend the reads clause");
+        Error(ErrorId.ref_no_new_iterator_reads, nw.Reads.Expressions[0].E.Origin, "a refining iterator is not allowed to extend the reads clause");
       }
       if (nw.Modifies.Expressions.Count != 0) {
-        Error(ErrorId.ref_no_new_iterator_modifies, nw.Modifies.Expressions[0].E.tok, "a refining iterator is not allowed to extend the modifies clause");
+        Error(ErrorId.ref_no_new_iterator_modifies, nw.Modifies.Expressions[0].E.Origin, "a refining iterator is not allowed to extend the modifies clause");
       }
       if (nw.Decreases.Expressions.Count != 0) {
-        Error(ErrorId.ref_no_new_iterator_decreases, nw.Decreases.Expressions[0].tok, "a refining iterator is not allowed to extend the decreases clause");
+        Error(ErrorId.ref_no_new_iterator_decreases, nw.Decreases.Expressions[0].Origin, "a refining iterator is not allowed to extend the decreases clause");
       }
 
       if (nw.SignatureIsOmitted) {
@@ -699,9 +591,9 @@ IteratorDecl MergeIterator(IteratorDecl nw, IteratorDecl prev) {
         Contract.Assert(nw.Outs.Count == 0);
         Reporter.Info(MessageSource.RefinementTransformer, nw.SignatureEllipsis, Printer.IteratorSignatureToString(Reporter.Options, prev));
       } else {
-        CheckAgreement_TypeParameters(nw.tok, prev.TypeArgs, nw.TypeArgs, nw.Name, "iterator");
-        CheckAgreement_Parameters(nw.tok, prev.Ins, nw.Ins, nw.Name, "iterator", "in-parameter");
-        CheckAgreement_Parameters(nw.tok, prev.Outs, nw.Outs, nw.Name, "iterator", "yield-parameter");
+        CheckAgreement_TypeParameters(nw.Origin, prev.TypeArgs, nw.TypeArgs, nw.Name, "iterator");
+        CheckAgreement_Parameters(nw.Origin, prev.Ins, nw.Ins, nw.Name, "iterator", "in-parameter");
+        CheckAgreement_Parameters(nw.Origin, prev.Outs, nw.Outs, nw.Name, "iterator", "yield-parameter");
       }
 
       BlockStmt newBody;
@@ -720,7 +612,7 @@ IteratorDecl MergeIterator(IteratorDecl nw, IteratorDecl prev) {
         prev.YieldEnsures.ConvertAll(refinementCloner.CloneAttributedExpr));
       yens.AddRange(nw.YieldEnsures);
 
-      return new IteratorDecl(nw.RangeToken.MakeRefined(moduleUnderConstruction),
+      return new IteratorDecl(nw.Origin.MakeRefined(moduleUnderConstruction),
         nw.NameNode, moduleUnderConstruction,
         nw.SignatureIsOmitted ? prev.TypeArgs.ConvertAll(refinementCloner.CloneTypeParam) : nw.TypeArgs,
         nw.SignatureIsOmitted ? prev.Ins.ConvertAll(p => refinementCloner.CloneFormal(p, false)) : nw.Ins,
@@ -738,7 +630,7 @@ IteratorDecl MergeIterator(IteratorDecl nw, IteratorDecl prev) {
     }
 
     TopLevelDeclWithMembers MergeClass(TopLevelDeclWithMembers nw, TopLevelDeclWithMembers prev) {
-      CheckAgreement_TypeParameters(nw.tok, prev.TypeArgs, nw.TypeArgs, nw.Name, nw.WhatKind);
+      CheckAgreement_TypeParameters(nw.Origin, prev.TypeArgs, nw.TypeArgs, nw.Name, nw.WhatKind);
 
       prev.ParentTraits.ForEach(item => nw.ParentTraits.Add(refinementCloner.CloneType(item)));
       nw.Attributes = refinementCloner.MergeAttributes(prev.Attributes, nw.Attributes);
@@ -780,7 +672,7 @@ TopLevelDeclWithMembers MergeClass(TopLevelDeclWithMembers nw, TopLevelDeclWithM
               if ((!(origConst.Type is InferredTypeProxy) && newConst.Type is InferredTypeProxy) || (origConst.Rhs != null && newConst.Rhs == null)) {
                 var typ = newConst.Type is InferredTypeProxy ? refinementCloner.CloneType(origConst.Type) : newConst.Type;
                 var rhs = newConst.Rhs ?? origConst.Rhs;
-                nw.Members[index] = new ConstantField(newConst.RangeToken, newConst.NameNode, rhs, newConst.HasStaticKeyword, newConst.IsGhost, newConst.IsOpaque, typ, newConst.Attributes);
+                nw.Members[index] = new ConstantField(newConst.Origin, newConst.NameNode, rhs, newConst.HasStaticKeyword, newConst.IsGhost, newConst.IsOpaque, typ, newConst.Attributes);
               }
             }
 
@@ -809,13 +701,13 @@ TopLevelDeclWithMembers MergeClass(TopLevelDeclWithMembers nw, TopLevelDeclWithM
             } else {
               var prevFunction = (Function)member;
               if (f.Req.Count != 0) {
-                Error(ErrorId.ref_refinement_no_new_preconditions, f.Req[0].E.tok, "a refining {0} is not allowed to add preconditions", f.WhatKind);
+                Error(ErrorId.ref_refinement_no_new_preconditions, f.Req[0].E.Origin, "a refining {0} is not allowed to add preconditions", f.WhatKind);
               }
-              if (f.Reads.Count != 0) {
-                Error(ErrorId.ref_refinement_no_new_reads, f.Reads[0].E.tok, "a refining {0} is not allowed to extend the reads clause", f.WhatKind);
+              if (f.Reads.Expressions.Count != 0) {
+                Error(ErrorId.ref_refinement_no_new_reads, f.Reads.Expressions[0].E.Origin, "a refining {0} is not allowed to extend the reads clause", f.WhatKind);
               }
               if (f.Decreases.Expressions.Count != 0) {
-                Error(ErrorId.ref_no_new_decreases, f.Decreases.Expressions[0].tok, "decreases clause on refining {0} not supported", f.WhatKind);
+                Error(ErrorId.ref_no_new_decreases, f.Decreases.Expressions[0].Origin, "decreases clause on refining {0} not supported", f.WhatKind);
               }
 
               if (prevFunction.HasStaticKeyword != f.HasStaticKeyword) {
@@ -828,11 +720,11 @@ TopLevelDeclWithMembers MergeClass(TopLevelDeclWithMembers nw, TopLevelDeclWithM
               }
               if (f.SignatureIsOmitted) {
                 Contract.Assert(f.TypeArgs.Count == 0);
-                Contract.Assert(f.Formals.Count == 0);
+                Contract.Assert(f.Ins.Count == 0);
                 Reporter.Info(MessageSource.RefinementTransformer, f.SignatureEllipsis, Printer.FunctionSignatureToString(Reporter.Options, prevFunction));
               } else {
-                CheckAgreement_TypeParameters(f.tok, prevFunction.TypeArgs, f.TypeArgs, f.Name, "function");
-                CheckAgreement_Parameters(f.tok, prevFunction.Formals, f.Formals, f.Name, "function", "parameter");
+                CheckAgreement_TypeParameters(f.Origin, prevFunction.TypeArgs, f.TypeArgs, f.Name, "function");
+                CheckAgreement_Parameters(f.Origin, prevFunction.Ins, f.Ins, f.Name, "function", "parameter");
                 if (prevFunction.Result != null && f.Result != null && prevFunction.Result.Name != f.Result.Name) {
                   Error(ErrorId.ref_mismatched_function_return_name, f, "the name of function return value '{0}'({1}) differs from the name of corresponding function return value in the module it refines ({2})", f.Name, f.Result.Name, prevFunction.Result.Name);
                 }
@@ -860,10 +752,13 @@ TopLevelDeclWithMembers MergeClass(TopLevelDeclWithMembers nw, TopLevelDeclWithM
             } else {
               var prevMethod = (Method)member;
               if (m.Req.Count != 0) {
-                Error(ErrorId.ref_no_new_method_precondition, m.Req[0].E.tok, "a refining method is not allowed to add preconditions");
+                Error(ErrorId.ref_no_new_method_precondition, m.Req[0].E.Origin, "a refining method is not allowed to add preconditions");
+              }
+              if (m.Reads.Expressions.Count != 0) {
+                Error(ErrorId.ref_no_new_method_reads, m.Reads.Expressions[0].E.Origin, "a refining method is not allowed to extend the reads clause");
               }
               if (m.Mod.Expressions.Count != 0) {
-                Error(ErrorId.ref_no_new_method_modifies, m.Mod.Expressions[0].E.tok, "a refining method is not allowed to extend the modifies clause");
+                Error(ErrorId.ref_no_new_method_modifies, m.Mod.Expressions[0].E.Origin, "a refining method is not allowed to extend the modifies clause");
               }
               // If the previous method was not specified with "decreases *", then the new method is not allowed to provide any "decreases" clause.
               // Any "decreases *" clause is not inherited, so if the previous method was specified with "decreases *", then the new method needs
@@ -876,7 +771,7 @@ TopLevelDeclWithMembers MergeClass(TopLevelDeclWithMembers nw, TopLevelDeclWithM
               } else {
                 if (!Contract.Exists(prevMethod.Decreases.Expressions, e => e is WildcardExpr)) {
                   // If the previous loop was not specified with "decreases *", then the new loop is not allowed to provide any "decreases" clause.
-                  Error(ErrorId.ref_no_new_method_decreases, m.Decreases.Expressions[0].tok, "decreases clause on refining method not supported, unless the refined method was specified with 'decreases *'");
+                  Error(ErrorId.ref_no_new_method_decreases, m.Decreases.Expressions[0].Origin, "decreases clause on refining method not supported, unless the refined method was specified with 'decreases *'");
                 }
                 decreases = m.Decreases;
               }
@@ -894,9 +789,9 @@ TopLevelDeclWithMembers MergeClass(TopLevelDeclWithMembers nw, TopLevelDeclWithM
                 Contract.Assert(m.Outs.Count == 0);
                 Reporter.Info(MessageSource.RefinementTransformer, m.SignatureEllipsis, Printer.MethodSignatureToString(Reporter.Options, prevMethod));
               } else {
-                CheckAgreement_TypeParameters(m.tok, prevMethod.TypeArgs, m.TypeArgs, m.Name, "method");
-                CheckAgreement_Parameters(m.tok, prevMethod.Ins, m.Ins, m.Name, "method", "in-parameter");
-                CheckAgreement_Parameters(m.tok, prevMethod.Outs, m.Outs, m.Name, "method", "out-parameter");
+                CheckAgreement_TypeParameters(m.Origin, prevMethod.TypeArgs, m.TypeArgs, m.Name, "method");
+                CheckAgreement_Parameters(m.Origin, prevMethod.Ins, m.Ins, m.Name, "method", "in-parameter");
+                CheckAgreement_Parameters(m.Origin, prevMethod.Outs, m.Outs, m.Name, "method", "out-parameter");
               }
               currentMethod = m;
               var replacementBody = m.Body;
@@ -917,7 +812,7 @@ TopLevelDeclWithMembers MergeClass(TopLevelDeclWithMembers nw, TopLevelDeclWithM
 
       return nw;
     }
-    void CheckAgreement_TypeParameters(IToken tok, List<TypeParameter> old, List<TypeParameter> nw, string name, string thing, bool checkNames = true) {
+    void CheckAgreement_TypeParameters(IOrigin tok, List<TypeParameter> old, List<TypeParameter> nw, string name, string thing) {
       Contract.Requires(tok != null);
       Contract.Requires(old != null);
       Contract.Requires(nw != null);
@@ -929,8 +824,8 @@ void CheckAgreement_TypeParameters(IToken tok, List<TypeParameter> old, List<Typ
         for (int i = 0; i < old.Count; i++) {
           var o = old[i];
           var n = nw[i];
-          if (o.Name != n.Name && checkNames) { // if checkNames is false, then just treat the parameters positionally.
-            Error(ErrorId.ref_mismatched_type_parameter_name, n.tok, "type parameters are not allowed to be renamed from the names given in the {0} in the module being refined (expected '{1}', found '{2}')", thing, o.Name, n.Name);
+          if (o.Name != n.Name) {
+            Error(ErrorId.ref_mismatched_type_parameter_name, n.Origin, "type parameters are not allowed to be renamed from the names given in the {0} in the module being refined (expected '{1}', found '{2}')", thing, o.Name, n.Name);
           } else {
             // This explains what we want to do and why:
             // switch (o.EqualitySupport) {
@@ -950,27 +845,47 @@ void CheckAgreement_TypeParameters(IToken tok, List<TypeParameter> old, List<Typ
             // }
             // Here's how we actually compute it:
             if (o.Characteristics.EqualitySupport != TypeParameter.EqualitySupportValue.InferredRequired && o.Characteristics.EqualitySupport != n.Characteristics.EqualitySupport) {
-              Error(ErrorId.ref_mismatched_type_parameter_equality, n.tok, "type parameter '{0}' is not allowed to change the requirement of supporting equality", n.Name);
+              Error(ErrorId.ref_mismatched_type_parameter_equality, n.Origin, "type parameter '{0}' is not allowed to change the requirement of supporting equality", n.Name);
             }
             if (o.Characteristics.HasCompiledValue != n.Characteristics.HasCompiledValue) {
-              Error(ErrorId.ref_mismatched_type_parameter_auto_init, n.tok, "type parameter '{0}' is not allowed to change the requirement of supporting auto-initialization", n.Name);
+              Error(ErrorId.ref_mismatched_type_parameter_auto_init, n.Origin, "type parameter '{0}' is not allowed to change the requirement of supporting auto-initialization", n.Name);
             } else if (o.Characteristics.IsNonempty != n.Characteristics.IsNonempty) {
-              Error(ErrorId.ref_mismatched_type_parameter_nonempty, n.tok, "type parameter '{0}' is not allowed to change the requirement of being nonempty", n.Name);
+              Error(ErrorId.ref_mismatched_type_parameter_nonempty, n.Origin, "type parameter '{0}' is not allowed to change the requirement of being nonempty", n.Name);
             }
             if (o.Characteristics.ContainsNoReferenceTypes != n.Characteristics.ContainsNoReferenceTypes) {
-              Error(ErrorId.ref_mismatched_type_parameter_not_reference, n.tok, "type parameter '{0}' is not allowed to change the no-reference-type requirement", n.Name);
+              Error(ErrorId.ref_mismatched_type_parameter_not_reference, n.Origin, "type parameter '{0}' is not allowed to change the no-reference-type requirement", n.Name);
             }
             if (o.Variance != n.Variance) {  // syntax is allowed to be different as long as the meaning is the same (i.e., compare Variance, not VarianceSyntax)
               var ov = o.Variance == TypeParameter.TPVariance.Co ? "+" : o.Variance == TypeParameter.TPVariance.Contra ? "-" : "=";
               var nv = n.Variance == TypeParameter.TPVariance.Co ? "+" : n.Variance == TypeParameter.TPVariance.Contra ? "-" : "=";
-              Error(ErrorId.ref_mismatched_type_parameter_variance, n.tok, "type parameter '{0}' is not allowed to change variance (here, from '{1}' to '{2}')", n.Name, ov, nv);
+              Error(ErrorId.ref_mismatched_type_parameter_variance, n.Origin, "type parameter '{0}' is not allowed to change variance (here, from '{1}' to '{2}')", n.Name, ov, nv);
             }
+
+            CheckAgreement_TypeBounds(n.Origin, o, n, name, thing);
           }
         }
       }
     }
 
-    void CheckAgreement_Parameters(IToken tok, List<Formal> old, List<Formal> nw, string name, string thing, string parameterKind) {
+    void CheckAgreement_TypeBounds(IOrigin tok, TypeParameter old, TypeParameter nw, string name, string thing) {
+      if (old.TypeBounds.Count != nw.TypeBounds.Count) {
+        Error(ErrorId.ref_mismatched_type_bounds_count, tok,
+          $"type parameter '{nw.Name}' of {thing} '{name}' is declared with a different number of type bounds than in the corresponding {thing}" +
+          $" in the module it refines (expected {old.TypeBounds.Count}, found {nw.TypeBounds.Count})");
+        return;
+      }
+      for (var i = 0; i < old.TypeBounds.Count; i++) {
+        var oldBound = old.TypeBounds[i];
+        var newBound = nw.TypeBounds[i];
+        if (!TypesAreSyntacticallyEqual(oldBound, newBound)) {
+          Error(ErrorId.ref_mismatched_type_parameter_bound, tok,
+            $"type bound for type parameter '{nw.Name}' of {thing} '{name}' is different from the corresponding type bound of the " +
+            $"corresponding type parameter of the corresponding {thing} in the module it refines (expected '{oldBound}', found '{newBound}')");
+        }
+      }
+    }
+
+    void CheckAgreement_Parameters(IOrigin tok, List<Formal> old, List<Formal> nw, string name, string thing, string parameterKind) {
       Contract.Requires(tok != null);
       Contract.Requires(old != null);
       Contract.Requires(nw != null);
@@ -984,23 +899,23 @@ void CheckAgreement_Parameters(IToken tok, List<Formal> old, List<Formal> nw, st
           var o = old[i];
           var n = nw[i];
           if (o.Name != n.Name) {
-            Error(ErrorId.ref_mismatched_kind_name, n.tok, "there is a difference in name of {0} {1} ('{2}' versus '{3}') of {4} {5} compared to corresponding {4} in the module it refines", parameterKind, i, n.Name, o.Name, thing, name);
+            Error(ErrorId.ref_mismatched_kind_name, n.Origin, "there is a difference in name of {0} {1} ('{2}' versus '{3}') of {4} {5} compared to corresponding {4} in the module it refines", parameterKind, i, n.Name, o.Name, thing, name);
           } else if (!o.IsGhost && n.IsGhost) {
-            Error(ErrorId.ref_mismatched_kind_ghost, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from non-ghost to ghost", parameterKind, n.Name, thing, name);
+            Error(ErrorId.ref_mismatched_kind_ghost, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from non-ghost to ghost", parameterKind, n.Name, thing, name);
           } else if (o.IsGhost && !n.IsGhost) {
-            Error(ErrorId.ref_mismatched_kind_non_ghost, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from ghost to non-ghost", parameterKind, n.Name, thing, name);
+            Error(ErrorId.ref_mismatched_kind_non_ghost, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from ghost to non-ghost", parameterKind, n.Name, thing, name);
           } else if (!o.IsOld && n.IsOld) {
-            Error(ErrorId.ref_mismatched_kind_non_new, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from new to non-new", parameterKind, n.Name, thing, name);
+            Error(ErrorId.ref_mismatched_kind_non_new, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from new to non-new", parameterKind, n.Name, thing, name);
           } else if (o.IsOld && !n.IsOld) {
-            Error(ErrorId.ref_mismatched_kind_new, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from non-new to new", parameterKind, n.Name, thing, name);
+            Error(ErrorId.ref_mismatched_kind_new, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from non-new to new", parameterKind, n.Name, thing, name);
           } else if (!o.IsOlder && n.IsOlder) {
-            Error(ErrorId.ref_mismatched_kind_older, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from non-older to older", parameterKind, n.Name, thing, name);
+            Error(ErrorId.ref_mismatched_kind_older, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from non-older to older", parameterKind, n.Name, thing, name);
           } else if (o.IsOlder && !n.IsOlder) {
-            Error(ErrorId.ref_mismatched_kind_non_older, n.tok, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from older to non-older", parameterKind, n.Name, thing, name);
+            Error(ErrorId.ref_mismatched_kind_non_older, n.Origin, "{0} '{1}' of {2} {3} cannot be changed, compared to the corresponding {2} in the module it refines, from older to non-older", parameterKind, n.Name, thing, name);
           } else if (!TypesAreSyntacticallyEqual(o.Type, n.Type)) {
-            Error(ErrorId.ref_mismatched_parameter_type, n.tok, "the type of {0} '{1}' is different from the type of the same {0} in the corresponding {2} in the module it refines ('{3}' instead of '{4}')", parameterKind, n.Name, thing, n.Type, o.Type);
+            Error(ErrorId.ref_mismatched_parameter_type, n.Origin, "the type of {0} '{1}' is different from the type of the same {0} in the corresponding {2} in the module it refines ('{3}' instead of '{4}')", parameterKind, n.Name, thing, n.Type, o.Type);
           } else if (n.DefaultValue != null) {
-            Error(ErrorId.ref_refined_formal_may_not_have_default, n.tok, "a refining formal parameter ('{0}') in a refinement module is not allowed to give a default-value expression", n.Name);
+            Error(ErrorId.ref_refined_formal_may_not_have_default, n.Origin, "a refining formal parameter ('{0}') in a refinement module is not allowed to give a default-value expression", n.Name);
           }
         }
       }
@@ -1025,19 +940,19 @@ BlockStmt MergeBlockStmt(BlockStmt skeleton, BlockStmt oldStmt) {
         var sbsOldStmt = (DividedBlockStmt)oldStmt;
         var bodyInit = MergeStmtList(sbsSkeleton.BodyInit, sbsOldStmt.BodyInit, out var hoverText);
         if (hoverText.Length != 0) {
-          Reporter.Info(MessageSource.RefinementTransformer, sbsSkeleton.SeparatorTok ?? sbsSkeleton.Tok, hoverText);
+          Reporter.Info(MessageSource.RefinementTransformer, sbsSkeleton.SeparatorTok ?? sbsSkeleton.Origin, hoverText);
         }
         var bodyProper = MergeStmtList(sbsSkeleton.BodyProper, sbsOldStmt.BodyProper, out hoverText);
         if (hoverText.Length != 0) {
-          Reporter.Info(MessageSource.RefinementTransformer, sbsSkeleton.RangeToken.ToToken(), hoverText);
+          Reporter.Info(MessageSource.RefinementTransformer, sbsSkeleton.Origin, hoverText);
         }
-        return new DividedBlockStmt(sbsSkeleton.RangeToken, bodyInit, sbsSkeleton.SeparatorTok, bodyProper);
+        return new DividedBlockStmt(sbsSkeleton.Origin, bodyInit, sbsSkeleton.SeparatorTok, bodyProper);
       } else {
         var body = MergeStmtList(skeleton.Body, oldStmt.Body, out var hoverText);
         if (hoverText.Length != 0) {
-          Reporter.Info(MessageSource.RefinementTransformer, skeleton.RangeToken.ToToken(), hoverText);
+          Reporter.Info(MessageSource.RefinementTransformer, skeleton.Origin, hoverText);
         }
-        return new BlockStmt(skeleton.RangeToken, body);
+        return new BlockStmt(skeleton.Origin, body);
       }
     }
 
@@ -1058,7 +973,7 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
           } else if (((SkeletonStatement)cur).S == null) {
             // the "..." matches the empty statement sequence
           } else {
-            Error(ErrorId.ref_mismatched_skeleton, cur.Tok, "skeleton statement does not match old statement");
+            Error(ErrorId.ref_mismatched_skeleton, cur.Origin, "skeleton statement does not match old statement");
           }
           i++;
         } else {
@@ -1111,7 +1026,7 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
                 var sepA = "";
                 while (nxt == null || !PotentialMatch(nxt, oldS)) {
                   // loop invariant:  oldS == oldStmt.Body[j]
-                  var s = refinementCloner.CloneStmt(oldS);
+                  var s = refinementCloner.CloneStmt(oldS, false);
                   body.Add(s);
                   hoverTextA += sepA + Printer.StatementToString(Reporter.Options, s);
                   sepA = "\n";
@@ -1120,7 +1035,7 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
                   oldS = oldStmt[j];
                 }
                 if (hoverTextA.Length != 0) {
-                  Reporter.Info(MessageSource.RefinementTransformer, c.Tok, hoverTextA);
+                  Reporter.Info(MessageSource.RefinementTransformer, c.Origin, hoverTextA);
                 }
               }
               i++;
@@ -1130,7 +1045,7 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
               Contract.Assert(c.ConditionOmitted);
               var oldAssume = oldS as PredicateStmt;
               if (oldAssume == null) {
-                Error(ErrorId.ref_mismatched_assert, cur.Tok, "assert template does not match inherited statement");
+                Error(ErrorId.ref_mismatched_assert, cur.Origin, "assert template does not match inherited statement");
                 i++;
               } else {
                 // Clone the expression, but among the new assert's attributes, indicate
@@ -1139,8 +1054,7 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
                 // that the condition is inherited.
                 var e = refinementCloner.CloneExpr(oldAssume.Expr);
                 var attrs = refinementCloner.MergeAttributes(oldAssume.Attributes, skel.Attributes);
-                body.Add(new AssertStmt(new RangeToken(new Translator.ForceCheckToken(skel.RangeToken.StartToken), skel.RangeToken.EndToken),
-                  e, skel.Proof, skel.Label, new Attributes("_prependAssertToken", new List<Expression>(), attrs)));
+                body.Add(new AssertStmt(new NestedOrigin(skel.Origin, e.Origin), e, skel.Label, attrs));
                 Reporter.Info(MessageSource.RefinementTransformer, c.ConditionEllipsis, "assume->assert: " + Printer.ExprToString(Reporter.Options, e));
                 i++; j++;
               }
@@ -1150,13 +1064,13 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
               Contract.Assert(c.ConditionOmitted);
               var oldExpect = oldS as ExpectStmt;
               if (oldExpect == null) {
-                Error(ErrorId.ref_mismatched_expect, cur.Tok, "expect template does not match inherited statement");
+                Error(ErrorId.ref_mismatched_expect, cur.Origin, "expect template does not match inherited statement");
                 i++;
               } else {
                 var e = refinementCloner.CloneExpr(oldExpect.Expr);
                 var message = refinementCloner.CloneExpr(oldExpect.Message);
                 var attrs = refinementCloner.MergeAttributes(oldExpect.Attributes, skel.Attributes);
-                body.Add(new ExpectStmt(skel.RangeToken, e, message, attrs));
+                body.Add(new ExpectStmt(skel.Origin, e, message, attrs));
                 Reporter.Info(MessageSource.RefinementTransformer, c.ConditionEllipsis, Printer.ExprToString(Reporter.Options, e));
                 i++; j++;
               }
@@ -1166,12 +1080,12 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
               Contract.Assert(c.ConditionOmitted);
               var oldAssume = oldS as AssumeStmt;
               if (oldAssume == null) {
-                Error(ErrorId.ref_mismatched_assume, cur.Tok, "assume template does not match inherited statement");
+                Error(ErrorId.ref_mismatched_assume, cur.Origin, "assume template does not match inherited statement");
                 i++;
               } else {
                 var e = refinementCloner.CloneExpr(oldAssume.Expr);
                 var attrs = refinementCloner.MergeAttributes(oldAssume.Attributes, skel.Attributes);
-                body.Add(new AssumeStmt(skel.RangeToken, e, attrs));
+                body.Add(new AssumeStmt(skel.Origin, e, attrs));
                 Reporter.Info(MessageSource.RefinementTransformer, c.ConditionEllipsis, Printer.ExprToString(Reporter.Options, e));
                 i++; j++;
               }
@@ -1181,13 +1095,13 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
               Contract.Assert(c.ConditionOmitted);
               var oldIf = oldS as IfStmt;
               if (oldIf == null) {
-                Error(ErrorId.ref_mismatched_if_statement, cur.Tok, "if-statement template does not match inherited statement");
+                Error(ErrorId.ref_mismatched_if_statement, cur.Origin, "if-statement template does not match inherited statement");
                 i++;
               } else {
                 var resultingThen = MergeBlockStmt(skel.Thn, oldIf.Thn);
                 var resultingElse = MergeElse(skel.Els, oldIf.Els);
                 var e = refinementCloner.CloneExpr(oldIf.Guard);
-                var r = new IfStmt(skel.RangeToken, oldIf.IsBindingGuard, e, resultingThen, resultingElse);
+                var r = new IfStmt(skel.Origin, oldIf.IsBindingGuard, e, resultingThen, resultingElse);
                 body.Add(r);
                 Reporter.Info(MessageSource.RefinementTransformer, c.ConditionEllipsis, Printer.GuardToString(Reporter.Options, oldIf.IsBindingGuard, e));
                 i++; j++;
@@ -1197,7 +1111,7 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
               var skel = (WhileStmt)S;
               var oldWhile = oldS as WhileStmt;
               if (oldWhile == null) {
-                Error(ErrorId.ref_mismatched_while_statement, cur.Tok, "while-statement template does not match inherited statement");
+                Error(ErrorId.ref_mismatched_while_statement, cur.Origin, "while-statement template does not match inherited statement");
                 i++;
               } else {
                 Expression guard;
@@ -1206,7 +1120,7 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
                   Reporter.Info(MessageSource.RefinementTransformer, c.ConditionEllipsis, Printer.GuardToString(Reporter.Options, false, oldWhile.Guard));
                 } else {
                   if (oldWhile.Guard != null) {
-                    Error(ErrorId.ref_mismatched_while_statement_guard, skel.Guard.tok, "a skeleton while statement with a guard can only replace a while statement with a non-deterministic guard");
+                    Error(ErrorId.ref_mismatched_while_statement_guard, skel.Guard.Origin, "a skeleton while statement with a guard can only replace a while statement with a non-deterministic guard");
                   }
                   guard = skel.Guard;
                 }
@@ -1222,7 +1136,7 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
               Contract.Assert(c.ConditionOmitted);
               var oldModifyStmt = oldS as ModifyStmt;
               if (oldModifyStmt == null) {
-                Error(ErrorId.ref_mismatched_modify_statement, cur.Tok, "modify template does not match inherited statement");
+                Error(ErrorId.ref_mismatched_modify_statement, cur.Origin, "modify template does not match inherited statement");
                 i++;
               } else {
                 var mod = refinementCloner.CloneSpecFrameExpr(oldModifyStmt.Mod);
@@ -1233,14 +1147,14 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
                   // Note, it is important to call MergeBlockStmt here (rather than just setting "mbody" to "skel.Body"), even
                   // though we're passing in an empty block as its second argument. The reason for this is that MergeBlockStmt
                   // also sets ".ReverifyPost" to "true" for any "return" statements.
-                  mbody = MergeBlockStmt(skel.Body, new BlockStmt(oldModifyStmt.RangeToken, new List<Statement>()));
+                  mbody = MergeBlockStmt(skel.Body, new BlockStmt(oldModifyStmt.Origin, new List<Statement>()));
                 } else if (skel.Body == null) {
-                  Error(ErrorId.ref_mismatched_statement_body, cur.Tok, "modify template must have a body if the inherited modify statement does");
+                  Error(ErrorId.ref_mismatched_statement_body, cur.Origin, "modify template must have a body if the inherited modify statement does");
                   mbody = null;
                 } else {
                   mbody = MergeBlockStmt(skel.Body, oldModifyStmt.Body);
                 }
-                body.Add(new ModifyStmt(skel.RangeToken, mod.Expressions, mod.Attributes, mbody));
+                body.Add(new ModifyStmt(skel.Origin, mod.Expressions, mod.Attributes, mbody));
                 Reporter.Info(MessageSource.RefinementTransformer, c.ConditionEllipsis, Printer.FrameExprListToString(Reporter.Options, mod.Expressions));
                 i++; j++;
               }
@@ -1260,16 +1174,16 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
             if (oldS is VarDeclStmt) {
               var cOld = (VarDeclStmt)oldS;
               if (LocalVarsAgree(cOld.Locals, cNew.Locals)) {
-                var update = cNew.Update as UpdateStmt;
+                var update = cNew.Assign as AssignStatement;
                 if (update != null && update.Rhss.TrueForAll(rhs => !rhs.CanAffectPreviouslyKnownExpressions)) {
                   // Note, we allow switching between ghost and non-ghost, since that seems unproblematic.
-                  if (cOld.Update == null) {
+                  if (cOld.Assign == null) {
                     doMerge = true;
-                  } else if (cOld.Update is AssignSuchThatStmt) {
+                  } else if (cOld.Assign is AssignSuchThatStmt) {
                     doMerge = true;
-                    addedAssert = refinementCloner.CloneExpr(((AssignSuchThatStmt)cOld.Update).Expr);
+                    addedAssert = refinementCloner.CloneExpr(((AssignSuchThatStmt)cOld.Assign).Expr);
                   } else {
-                    var updateOld = (UpdateStmt)cOld.Update;  // if cast fails, there are more ConcreteUpdateStatement subclasses than expected
+                    var updateOld = (AssignStatement)cOld.Assign;  // if cast fails, there are more ConcreteUpdateStatement subclasses than expected
                     doMerge = true;
                     foreach (var rhs in updateOld.Rhss) {
                       if (!(rhs is HavocRhs)) {
@@ -1285,21 +1199,21 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
               body.Add(cNew);
               i++; j++;
               if (addedAssert != null) {
-                var tok = new Translator.ForceCheckToken(addedAssert.RangeToken.StartToken);
-                body.Add(new AssertStmt(new RangeToken(tok, addedAssert.RangeToken.EndToken), addedAssert, null, null, null));
+                var tok = new BoogieGenerator.ForceCheckOrigin(addedAssert.Origin);
+                body.Add(new AssertStmt(tok, addedAssert, null, null));
               }
             } else {
               MergeAddStatement(cur, body);
               i++;
             }
 
-          } else if (cur is AssignStmt) {
-            var cNew = (AssignStmt)cur;
-            var cOld = oldS as AssignStmt;
-            if (cOld == null && oldS is UpdateStmt) {
-              var us = (UpdateStmt)oldS;
+          } else if (cur is SingleAssignStmt) {
+            var cNew = (SingleAssignStmt)cur;
+            var cOld = oldS as SingleAssignStmt;
+            if (cOld == null && oldS is AssignStatement) {
+              var us = (AssignStatement)oldS;
               if (us.ResolvedStatements.Count == 1) {
-                cOld = us.ResolvedStatements[0] as AssignStmt;
+                cOld = us.ResolvedStatements[0] as SingleAssignStmt;
               }
             }
             bool doMerge = false;
@@ -1321,12 +1235,12 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
               i++;
             }
 
-          } else if (cur is UpdateStmt) {
-            var nw = (UpdateStmt)cur;
+          } else if (cur is AssignStatement) {
+            var nw = (AssignStatement)cur;
             List<Statement> stmtGenerated = new List<Statement>();
             bool doMerge = false;
-            if (oldS is UpdateStmt) {
-              var s = (UpdateStmt)oldS;
+            if (oldS is AssignStatement) {
+              var s = (AssignStatement)oldS;
               if (LeftHandSidesAgree(s.Lhss, nw.Lhss)) {
                 doMerge = true;
                 stmtGenerated.Add(nw);
@@ -1342,8 +1256,8 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
                 doMerge = true;
                 stmtGenerated.Add(nw);
                 var addedAssert = refinementCloner.CloneExpr(s.Expr);
-                var tok = new RangeToken(addedAssert.RangeToken.StartToken, addedAssert.RangeToken.EndToken);
-                stmtGenerated.Add(new AssertStmt(tok, addedAssert, null, null, null));
+                var tok = new SourceOrigin(addedAssert.Origin.StartToken, addedAssert.Origin.EndToken);
+                stmtGenerated.Add(new AssertStmt(tok, addedAssert, null, null));
               }
             }
             if (doMerge) {
@@ -1359,7 +1273,7 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
             var cNew = (IfStmt)cur;
             var cOld = oldS as IfStmt;
             if (cOld != null && cOld.Guard == null) {
-              var r = new IfStmt(cNew.RangeToken, cNew.IsBindingGuard, cNew.Guard, MergeBlockStmt(cNew.Thn, cOld.Thn), MergeElse(cNew.Els, cOld.Els));
+              var r = new IfStmt(cNew.Origin, cNew.IsBindingGuard, cNew.Guard, MergeBlockStmt(cNew.Thn, cOld.Thn), MergeElse(cNew.Els, cOld.Els));
               body.Add(r);
               i++; j++;
             } else {
@@ -1400,7 +1314,7 @@ List<Statement> MergeStmtList(List<Statement> skeleton, List<Statement> oldStmt,
       var sep = "";
       for (; j < oldStmt.Count; j++) {
         var b = oldStmt[j];
-        body.Add(refinementCloner.CloneStmt(b));
+        body.Add(refinementCloner.CloneStmt(b, false));
         hoverText += sep + Printer.StatementToString(Reporter.Options, b);
         sep = "\n";
       }
@@ -1488,8 +1402,8 @@ bool PotentialMatch(Statement nxt, Statement other) {
         } else if (other is BlockStmt && ((BlockStmt)other).Labels == null) {
           return true; // both are unlabeled
         }
-      } else if (nxt is UpdateStmt) {
-        var up = (UpdateStmt)nxt;
+      } else if (nxt is AssignStatement) {
+        var up = (AssignStatement)nxt;
         if (other is AssignSuchThatStmt) {
           var oth = other as AssignSuchThatStmt;
           return oth != null && LeftHandSidesAgree(oth.Lhss, up.Lhss);
@@ -1515,7 +1429,7 @@ WhileStmt MergeWhileStmt(WhileStmt cNew, WhileStmt cOld, Expression guard) {
       } else {
         if (!Contract.Exists(cOld.Decreases.Expressions, e => e is WildcardExpr)) {
           // If the previous loop was not specified with "decreases *", then the new loop is not allowed to provide any "decreases" clause.
-          Error(ErrorId.ref_mismatched_loop_decreases, cNew.Decreases.Expressions[0].tok, "a refining loop can provide a decreases clause only if the loop being refined was declared with 'decreases *'");
+          Error(ErrorId.ref_mismatched_loop_decreases, cNew.Decreases.Expressions[0].Origin, "a refining loop can provide a decreases clause only if the loop being refined was declared with 'decreases *'");
         }
         decr = cNew.Decreases;
       }
@@ -1526,14 +1440,14 @@ WhileStmt MergeWhileStmt(WhileStmt cNew, WhileStmt cOld, Expression guard) {
       if (cOld.Body == null && cNew.Body == null) {
         newBody = null;
       } else if (cOld.Body == null) {
-        newBody = MergeBlockStmt(cNew.Body, new BlockStmt(cOld.RangeToken, new List<Statement>()));
+        newBody = MergeBlockStmt(cNew.Body, new BlockStmt(cOld.Origin, new List<Statement>()));
       } else if (cNew.Body == null) {
-        Error(ErrorId.ref_mismatched_while_body, cNew.Tok, "while template must have a body if the inherited while statement does");
+        Error(ErrorId.ref_mismatched_while_body, cNew.Origin, "while template must have a body if the inherited while statement does");
         newBody = null;
       } else {
         newBody = MergeBlockStmt(cNew.Body, cOld.Body);
       }
-      return new RefinedWhileStmt(cNew.RangeToken, guard, invs, decr, refinementCloner.CloneSpecFrameExpr(cOld.Mod), newBody);
+      return new RefinedWhileStmt(cNew.Origin, guard, invs, decr, refinementCloner.CloneSpecFrameExpr(cOld.Mod), newBody);
     }
 
     Statement MergeElse(Statement skeleton, Statement oldStmt) {
@@ -1541,18 +1455,18 @@ Statement MergeElse(Statement skeleton, Statement oldStmt) {
       Contract.Requires(oldStmt == null || oldStmt is BlockStmt || oldStmt is IfStmt || oldStmt is SkeletonStatement);
 
       if (skeleton == null) {
-        return refinementCloner.CloneStmt(oldStmt);
+        return refinementCloner.CloneStmt(oldStmt, false);
       } else if (skeleton is IfStmt || skeleton is SkeletonStatement) {
         // wrap a block statement around the if statement
-        skeleton = new BlockStmt(skeleton.RangeToken, new List<Statement>() { skeleton });
+        skeleton = new BlockStmt(skeleton.Origin, new List<Statement>() { skeleton });
       }
 
       if (oldStmt == null) {
         // make it into an empty block statement
-        oldStmt = new BlockStmt(skeleton.RangeToken, new List<Statement>());
+        oldStmt = new BlockStmt(skeleton.Origin, new List<Statement>());
       } else if (oldStmt is IfStmt || oldStmt is SkeletonStatement) {
         // wrap a block statement around the if statement
-        oldStmt = new BlockStmt(skeleton.RangeToken, new List<Statement>() { oldStmt });
+        oldStmt = new BlockStmt(skeleton.Origin, new List<Statement>() { oldStmt });
       }
 
       Contract.Assert(skeleton is BlockStmt && oldStmt is BlockStmt);
@@ -1592,23 +1506,23 @@ void CheckIsOkayNewStatement(Statement s, Stack<string> labels, int loopLevels)
         ((ReturnStmt)s).ReverifyPost = true;
       } else if (s is YieldStmt) {
         Error(ErrorId.ref_misplaced_yield, s, "yield statements are not allowed in skeletons");
-      } else if (s is BreakStmt) {
-        var b = (BreakStmt)s;
+      } else if (s is BreakOrContinueStmt) {
+        var b = (BreakOrContinueStmt)s;
         if (b.TargetLabel != null ? !labels.Contains(b.TargetLabel.val) : loopLevels < b.BreakAndContinueCount) {
           Error(ErrorId.ref_invalid_break_in_skeleton, s, $"{b.Kind} statement in skeleton is not allowed to break outside the skeleton fragment");
         }
-      } else if (s is AssignStmt) {
+      } else if (s is SingleAssignStmt) {
         // TODO: To be a refinement automatically (that is, without any further verification), only variables and fields defined
         // in this module are allowed.  This needs to be checked.  If the LHS refers to an l-value that was not declared within
         // this module, then either an error should be reported or the Translator needs to know to translate new proof obligations.
-        var a = (AssignStmt)s;
-        Error(ErrorId.ref_misplaced_assignment, a.Tok, "cannot have assignment statement");
-      } else if (s is ConcreteUpdateStatement) {
+        var a = (SingleAssignStmt)s;
+        Error(ErrorId.ref_misplaced_assignment, a.Origin, "cannot have assignment statement");
+      } else if (s is ConcreteAssignStatement) {
         postTasks.Enqueue(() => {
-          CheckIsOkayUpdateStmt((ConcreteUpdateStatement)s, moduleUnderConstruction);
+          CheckIsOkayUpdateStmt((ConcreteAssignStatement)s, moduleUnderConstruction);
         });
       } else if (s is CallStmt) {
-        Error(ErrorId.ref_misplaced_call, s.Tok, "cannot have call statement");
+        Error(ErrorId.ref_misplaced_call, s.Origin, "cannot have call statement");
       } else {
         if (s is WhileStmt || s is AlternativeLoopStmt) {
           loopLevels++;
@@ -1624,31 +1538,31 @@ void CheckIsOkayNewStatement(Statement s, Stack<string> labels, int loopLevels)
     }
 
     // Checks that statement stmt, defined in the constructed module m, is a refinement of skip in the parent module
-    void CheckIsOkayUpdateStmt(ConcreteUpdateStatement stmt, ModuleDefinition m) {
+    void CheckIsOkayUpdateStmt(ConcreteAssignStatement stmt, ModuleDefinition m) {
       foreach (var lhs in stmt.Lhss) {
         var l = lhs.Resolved;
         if (l is IdentifierExpr) {
           var ident = (IdentifierExpr)l;
           Contract.Assert(ident.Var is LocalVariable || ident.Var is Formal); // LHS identifier expressions must be locals or out parameters (ie. formals)
-          if ((ident.Var is LocalVariable && RefinementToken.IsInherited(((LocalVariable)ident.Var).Tok, m)) || ident.Var is Formal) {
+          if ((ident.Var is LocalVariable && ((LocalVariable)ident.Var).Origin.IsInherited(m)) || ident.Var is Formal) {
             // for some reason, formals are not considered to be inherited.
-            Error(ErrorId.ref_invalid_variable_assignment, l.tok, "refinement method cannot assign to variable defined in parent module ('{0}')", ident.Var.Name);
+            Error(ErrorId.ref_invalid_variable_assignment, l.Origin, "refinement method cannot assign to variable defined in parent module ('{0}')", ident.Var.Name);
           }
         } else if (l is MemberSelectExpr) {
           var member = ((MemberSelectExpr)l).Member;
-          if (RefinementToken.IsInherited(member.tok, m)) {
-            Error(ErrorId.ref_invalid_field_assignment, l.tok, "refinement method cannot assign to a field defined in parent module ('{0}')", member.Name);
+          if (member.Origin.IsInherited(m)) {
+            Error(ErrorId.ref_invalid_field_assignment, l.Origin, "refinement method cannot assign to a field defined in parent module ('{0}')", member.Name);
           }
         } else {
           // must be an array element
-          Error(ErrorId.ref_invalid_new_assignments, l.tok, "new assignments in a refinement method can only assign to state that the module defines (which never includes array elements)");
+          Error(ErrorId.ref_invalid_new_assignments, l.Origin, "new assignments in a refinement method can only assign to state that the module defines (which never includes array elements)");
         }
       }
-      if (stmt is UpdateStmt) {
-        var s = (UpdateStmt)stmt;
+      if (stmt is AssignStatement) {
+        var s = (AssignStatement)stmt;
         foreach (var rhs in s.Rhss) {
           if (rhs.CanAffectPreviouslyKnownExpressions) {
-            Error(ErrorId.ref_invalid_assignment_rhs, rhs.Tok, "assignment RHS in refinement method is not allowed to affect previously defined state");
+            Error(ErrorId.ref_invalid_assignment_rhs, rhs.Origin, "assignment RHS in refinement method is not allowed to affect previously defined state");
           }
         }
       }
@@ -1703,9 +1617,13 @@ public T WithRefinementTokenWrapping<T>(Func<T> action, bool wrap = false) {
       return result;
     }
 
-    public override IToken Tok(IToken tok) {
+    public override IOrigin Origin(IOrigin tok) {
+      if (tok == null) {
+        return null;
+      }
+
       if (wrapWithRefinementToken) {
-        return new RefinementToken(tok, moduleUnderConstruction);
+        return new RefinementOrigin(tok, moduleUnderConstruction);
       }
 
       return tok;
@@ -1717,7 +1635,7 @@ public override TopLevelDecl CloneDeclaration(TopLevelDecl d, ModuleDefinition n
         // refining module, retain its name but not be default, unless the refining module has the same name
         ModuleExportDecl dex = d as ModuleExportDecl;
         if (dex.IsDefault && d.Name != newParent.Name) {
-          ddex = new ModuleExportDecl(dex.RangeToken, d.NameNode, newParent, dex.Exports, dex.Extends,
+          ddex = new ModuleExportDecl(ddex.Options, dex.Origin, d.NameNode, newParent, dex.Exports, dex.Extends,
             dex.ProvideAll, dex.RevealAll, false, true, Guid.NewGuid());
         }
         ddex.SetupDefaultSignature();
@@ -1735,7 +1653,16 @@ public virtual Attributes MergeAttributes(Attributes prevAttrs, Attributes moreA
         return CloneAttributes(prevAttrs);
       } else if (moreAttrs is UserSuppliedAttributes) {
         var usa = (UserSuppliedAttributes)moreAttrs;
-        return new UserSuppliedAttributes(Tok(usa.tok), Tok(usa.OpenBrace), Tok(usa.CloseBrace), moreAttrs.Args.ConvertAll(CloneExpr), MergeAttributes(prevAttrs, moreAttrs.Prev));
+        return new UserSuppliedAttributes(Origin(usa.Origin), Origin(usa.OpenBrace), Origin(usa.CloseBrace), moreAttrs.Args.ConvertAll(CloneExpr), MergeAttributes(prevAttrs, moreAttrs.Prev));
+      } else if (moreAttrs is UserSuppliedAtAttribute usaa) {
+        var arg = CloneExpr(usaa.Arg);
+        if (usaa.Arg.Type != null) { // The attribute has already been expanded
+          arg.Type = usaa.Arg.Type;
+          arg.PreType = usaa.Arg.PreType;
+        }
+        return new UserSuppliedAtAttribute(Origin(usaa.Origin), arg, MergeAttributes(prevAttrs, moreAttrs.Prev)) {
+          Builtin = usaa.Builtin
+        };
       } else {
         return new Attributes(moreAttrs.Name, moreAttrs.Args.ConvertAll(CloneExpr), MergeAttributes(prevAttrs, moreAttrs.Prev));
       }
diff --git a/Source/DafnyCore/Rewriters/RewriterCollection.cs b/Source/DafnyCore/Rewriters/RewriterCollection.cs
new file mode 100644
index 00000000000..220944c1d88
--- /dev/null
+++ b/Source/DafnyCore/Rewriters/RewriterCollection.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using Microsoft.Dafny.Compilers;
+
+namespace Microsoft.Dafny;
+
+public static class RewriterCollection {
+
+  public static IList<IRewriter> GetRewriters(ErrorReporter reporter, Program program) {
+    var result = new List<IRewriter>();
+
+    result.Add(new RefinementTransformer(reporter));
+    if (reporter.Options.AuditProgram) {
+      result.Add(new Auditor.Auditor(reporter));
+    }
+    result.Add(new ExpandAtAttributes(program, reporter));
+    result.Add(new AutoContractsRewriter(program, reporter));
+    result.Add(new OpaqueMemberRewriter(reporter));
+    result.Add(new AutoReqFunctionRewriter(program, reporter));
+    result.Add(new TimeLimitRewriter(reporter));
+    result.Add(new ForallStmtRewriter(reporter));
+    result.Add(new ProvideRevealAllRewriter(reporter));
+    result.Add(new MatchFlattener(reporter));
+
+    if (reporter.Options.AutoTriggers) {
+      result.Add(new QuantifierSplittingRewriter(reporter));
+      result.Add(new TriggerGeneratingRewriter(reporter, program.SystemModuleManager));
+    }
+
+    if (reporter.Options.TestContracts != DafnyOptions.ContractTestingMode.None) {
+      result.Add(new ExpectContracts(reporter, program.SystemModuleManager));
+    }
+
+    if (reporter.Options.Get(RunAllTestsMainMethod.IncludeTestRunner)) {
+      result.Add(new RunAllTestsMainMethod(reporter));
+    }
+
+    result.Add(new InductionRewriter(reporter));
+    result.Add(new PrintEffectEnforcement(reporter));
+    result.Add(new BitvectorOptimization(program, reporter));
+
+    if (reporter.Options.DisallowConstructorCaseWithoutParentheses) {
+      result.Add(new ConstructorWarning(reporter));
+    }
+
+    result.Add(new LocalLinter(reporter));
+    result.Add(new PrecedenceLinter(reporter, program.Compilation));
+
+    if (reporter.Options.Get(CommonOptionBag.DefaultFunctionOpacity) == CommonOptionBag.DefaultFunctionOpacityOptions.AutoRevealDependencies) {
+      result.Add(new AutoRevealFunctionDependencies(reporter));
+    }
+
+    foreach (var plugin in reporter.Options.Plugins) {
+      result.AddRange(plugin.GetRewriters(reporter));
+    }
+
+    return result;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Rewriters/RewriterErrors.cs b/Source/DafnyCore/Rewriters/RewriterErrors.cs
index 276d4a0aee5..f8430120c20 100644
--- a/Source/DafnyCore/Rewriters/RewriterErrors.cs
+++ b/Source/DafnyCore/Rewriters/RewriterErrors.cs
@@ -17,6 +17,7 @@ public enum ErrorId {
     rw_unusual_indentation_start,
     rw_unusual_indentation_end,
     rw_test_methods_may_not_have_inputs,
+    rw_test_methods_may_not_have_type_parameters,
     rw_test_method_has_too_many_returns,
     rw_clause_cannot_be_compiled,
     rw_no_wrapper,
diff --git a/Source/DafnyCore/Rewriters/RunAllTestsMainMethod.cs b/Source/DafnyCore/Rewriters/RunAllTestsMainMethod.cs
index f2495551a01..1e7d16747e3 100644
--- a/Source/DafnyCore/Rewriters/RunAllTestsMainMethod.cs
+++ b/Source/DafnyCore/Rewriters/RunAllTestsMainMethod.cs
@@ -1,14 +1,22 @@
 using System.Collections.Generic;
+using System.CommandLine;
 using System.Diagnostics.Contracts;
 using System.Linq;
-using Microsoft.Boogie;
 using System.Text.RegularExpressions;
+using DafnyCore;
 using static Microsoft.Dafny.RewriterErrors;
 
 namespace Microsoft.Dafny;
 
 public class RunAllTestsMainMethod : IRewriter {
 
+  static RunAllTestsMainMethod() {
+    OptionRegistry.RegisterOption(IncludeTestRunner, OptionScope.Cli);
+  }
+
+  public static Option<bool> IncludeTestRunner = new("--include-test-runner",
+    "Include a program entry point that will run all methods marked with {:test}");
+
   /** The name used for Main when executing tests. Should be a name that cannot be a Dafny name,
       that Dafny will not use as a mangled Dafny name for any backend, and that is not likely
       to be chosen by the user as an extern name. **/
@@ -31,9 +39,10 @@ internal override void PreResolve(Program program) {
     // and would be low-value anyway.
     var noVerifyAttribute = new Attributes("verify", new List<Expression> { new LiteralExpr(Token.NoToken, false) }, null);
 
-    var mainMethod = new Method(RangeToken.NoToken, new Name(SyntheticTestMainName), false, false,
+    var mainMethod = new Method(SourceOrigin.NoToken.MakeAutoGenerated(), new Name(SyntheticTestMainName), false, false,
       new List<TypeParameter>(), new List<Formal>(), new List<Formal>(),
       new List<AttributedExpression>(),
+      new Specification<FrameExpression>(),
       new Specification<FrameExpression>(new List<FrameExpression>(), null),
       new List<AttributedExpression>(), new Specification<Expression>(new List<Expression>(), null),
       null, noVerifyAttribute, null);
@@ -84,9 +93,9 @@ internal override void PreResolve(Program program) {
   /// }
   /// </summary>
   internal override void PostResolve(Program program) {
-    var tok = program.GetFirstTopLevelToken();
+    var tok = program.GetStartOfFirstFileToken() ?? Token.NoToken;
     List<Statement> mainMethodStatements = new();
-    var idGenerator = new FreshIdGenerator();
+    var idGenerator = new CodeGenIdGenerator();
 
     // var success := true;
     var successVarStmt = Statement.CreateLocalVariable(tok, "success", Expression.CreateBoolLiteral(tok, true));
@@ -129,18 +138,24 @@ internal override void PostResolve(Program program) {
           var tryBodyStatements = new List<Statement>();
 
           var receiverExpr = new StaticReceiverExpr(tok, (TopLevelDeclWithMembers)method.EnclosingClass, true);
-          var methodSelectExpr = new MemberSelectExpr(tok, receiverExpr, method.Name) {
+          var methodSelectExpr = new MemberSelectExpr(tok, receiverExpr, method.NameNode) {
             Member = method,
-            TypeApplication_JustMember = new List<Type>(),
-            TypeApplication_AtEnclosingClass = new List<Type>()
+            TypeApplicationJustMember = new List<Type>(),
+            TypeApplicationAtEnclosingClass = new List<Type>()
           };
 
           if (method.Ins.Count != 0) {
-            ReportError(ErrorId.rw_test_methods_may_not_have_inputs, method.tok,
+            ReportError(ErrorId.rw_test_methods_may_not_have_inputs, method.Origin,
                 "Methods with the :test attribute may not have input arguments");
             continue;
           }
 
+          if (method.TypeArgs.Count != 0) {
+            ReportError(ErrorId.rw_test_methods_may_not_have_type_parameters, method.Origin,
+              "Methods with the :test attribute may not have type parameters");
+            continue;
+          }
+
           Expression resultVarExpr = null;
           var lhss = new List<Expression>();
 
@@ -149,7 +164,7 @@ internal override void PostResolve(Program program) {
           switch (method.Outs.Count) {
             case > 1:
               ReportError(ErrorId.rw_test_method_has_too_many_returns,
-               method.tok,
+               method.Origin,
                 "Methods with the :test attribute can have at most one return value");
               continue;
             case 1: {
@@ -163,15 +178,15 @@ internal override void PostResolve(Program program) {
               }
           }
 
-          var callStmt = new CallStmt(tok.ToRange(), lhss, methodSelectExpr, new List<Expression>());
+          var callStmt = new CallStmt(tok, lhss, methodSelectExpr, new List<Expression>());
           tryBodyStatements.Add(callStmt);
 
           Statement passedStmt = Statement.CreatePrintStmt(tok, Expression.CreateStringLiteral(tok, "PASSED\n"));
-          var passedBlock = new BlockStmt(tok.ToRange(), Util.Singleton(passedStmt));
+          var passedBlock = new BlockStmt(tok, Util.Singleton(passedStmt));
 
           if (resultVarExpr?.Type is UserDefinedType udt && udt.ResolvedClass is TopLevelDeclWithMembers resultClass) {
             var failureGuardExpr =
-              new FunctionCallExpr(tok, "IsFailure", resultVarExpr, tok, tok, new List<Expression>());
+              new FunctionCallExpr(tok, new Name("IsFailure"), resultVarExpr, tok, Token.NoToken, new List<Expression>());
             var isFailureMember = resultClass.Members.First(m => m.Name == "IsFailure");
             failureGuardExpr.Function = (Function)isFailureMember;
             failureGuardExpr.Type = Type.Bool;
@@ -179,12 +194,12 @@ internal override void PostResolve(Program program) {
             failureGuardExpr.TypeApplication_AtEnclosingClass = new List<Type>();
 
             var failedBlock = PrintTestFailureStatement(tok, successVarExpr, resultVarExpr);
-            tryBodyStatements.Add(new IfStmt(tok.ToRange(), false, failureGuardExpr, failedBlock, passedBlock));
+            tryBodyStatements.Add(new IfStmt(tok, false, failureGuardExpr, failedBlock, passedBlock));
           } else { // Result is not a failure type
             tryBodyStatements.Add(passedBlock);
           }
 
-          var tryBody = new BlockStmt(tok.ToRange(), tryBodyStatements);
+          var tryBody = new BlockStmt(tok, tryBodyStatements);
 
           // Wrap the code above with:
           //
@@ -195,7 +210,7 @@ internal override void PostResolve(Program program) {
           //   success := false;
           // }
           //
-          var haltMessageVar = new LocalVariable(tok.ToRange(), "haltMessage", seqCharType, false) {
+          var haltMessageVar = new LocalVariable(tok, "haltMessage", seqCharType, false) {
             type = seqCharType
           };
           var haltMessageVarExpr = new IdentifierExpr(tok, haltMessageVar);
@@ -214,24 +229,24 @@ internal override void PostResolve(Program program) {
     //
     // expect success, "Test failures occurred: see above.\n";
     // 
-    Statement expectSuccess = new ExpectStmt(tok.ToRange(), successVarExpr,
+    Statement expectSuccess = new ExpectStmt(tok, successVarExpr,
       Expression.CreateStringLiteral(tok, "Test failures occurred: see above.\n"), null);
     mainMethodStatements.Add(expectSuccess);
 
     // Find the resolved main method to attach the body to (which will be a different instance
     // than the Method we added in PreResolve).
-    var hasMain = Compilers.SinglePassCompiler.HasMain(program, out var mainMethod);
+    var hasMain = Compilers.SinglePassCodeGenerator.HasMain(program, out var mainMethod);
     Contract.Assert(hasMain);
-    mainMethod.Body = new BlockStmt(tok.ToRange(), mainMethodStatements);
+    mainMethod.Body = new BlockStmt(tok, mainMethodStatements);
   }
 
-  private BlockStmt PrintTestFailureStatement(IToken tok, Expression successVarExpr, Expression failureValueExpr) {
+  private BlockStmt PrintTestFailureStatement(IOrigin tok, Expression successVarExpr, Expression failureValueExpr) {
     var failedPrintStmt = Statement.CreatePrintStmt(tok,
       Expression.CreateStringLiteral(tok, "FAILED\n\t"),
       failureValueExpr,
       Expression.CreateStringLiteral(tok, "\n"));
     var failSuiteStmt =
-      new AssignStmt(tok.ToRange(), successVarExpr, new ExprRhs(Expression.CreateBoolLiteral(tok, false)));
-    return new BlockStmt(tok.ToRange(), Util.List<Statement>(failedPrintStmt, failSuiteStmt));
+      new SingleAssignStmt(tok, successVarExpr, new ExprRhs(Expression.CreateBoolLiteral(tok, false)));
+    return new BlockStmt(tok, Util.List<Statement>(failedPrintStmt, failSuiteStmt));
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Rewriters/TimeLimitRewriter.cs b/Source/DafnyCore/Rewriters/TimeLimitRewriter.cs
index 64256bdea8c..9bb3a34e145 100644
--- a/Source/DafnyCore/Rewriters/TimeLimitRewriter.cs
+++ b/Source/DafnyCore/Rewriters/TimeLimitRewriter.cs
@@ -39,10 +39,10 @@ internal override void PreResolve(ModuleDefinition m) {
                         current_limit = Reporter.Options.TimeLimit > 0 ? Reporter.Options.TimeLimit : 10;  // Default to 10 seconds
                         name = "timeLimit";
                       }
-                      Expression newArg = new LiteralExpr(attr.Args[0].tok, value * current_limit);
+                      Expression newArg = new LiteralExpr(attr.Args[0].Origin, value * current_limit);
                       member.Attributes = new Attributes("_" + name, new List<Expression>() { newArg }, attrs);
                       if (Attributes.Contains(attrs, name)) {
-                        ReportWarning(ErrorId.rw_timelimit_multiplier, member.tok, "timeLimitMultiplier annotation overrides " + name + " annotation");
+                        ReportWarning(ErrorId.rw_timelimit_multiplier, member.Origin, "timeLimitMultiplier annotation overrides " + name + " annotation");
                       }
                     }
                   }
diff --git a/Source/DafnyCore/Rewriters/TriggerGeneratingRewriter.cs b/Source/DafnyCore/Rewriters/TriggerGeneratingRewriter.cs
index ea56405c61a..e676be5dfcb 100644
--- a/Source/DafnyCore/Rewriters/TriggerGeneratingRewriter.cs
+++ b/Source/DafnyCore/Rewriters/TriggerGeneratingRewriter.cs
@@ -3,21 +3,23 @@
 namespace Microsoft.Dafny;
 
 public class TriggerGeneratingRewriter : IRewriter {
-  internal TriggerGeneratingRewriter(ErrorReporter reporter) : base(reporter) {
+  private readonly SystemModuleManager systemModuleManager;
+  internal TriggerGeneratingRewriter(ErrorReporter reporter, SystemModuleManager systemModuleManager) : base(reporter) {
     Contract.Requires(reporter != null);
+    this.systemModuleManager = systemModuleManager;
   }
 
-  internal override void PostCyclicityResolve(ModuleDefinition m) {
+  internal override void PostCyclicityResolve(ModuleDefinition definition) {
     var finder = new Triggers.QuantifierCollector(Reporter);
 
-    foreach (var decl in ModuleDefinition.AllCallablesIncludingPrefixDeclarations(m.TopLevelDecls)) {
+    foreach (var decl in ModuleDefinition.AllCallablesIncludingPrefixDeclarations(definition.TopLevelDecls)) {
       finder.Visit(decl, null);
     }
 
-    var triggersCollector = new Triggers.TriggersCollector(finder.exprsInOldContext, Reporter.Options);
+    var triggersCollector = new Triggers.TriggersCollector(finder.exprsInOldContext, Reporter.Options, definition);
     foreach (var quantifierCollection in finder.quantifierCollections) {
       quantifierCollection.ComputeTriggers(triggersCollector);
-      quantifierCollection.CommitTriggers(Reporter.Options);
+      quantifierCollection.CommitTriggers(systemModuleManager);
     }
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Snippets.cs b/Source/DafnyCore/Snippets.cs
new file mode 100644
index 00000000000..78acaaebd49
--- /dev/null
+++ b/Source/DafnyCore/Snippets.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using DafnyCore.Options;
+using Microsoft.Dafny;
+
+namespace DafnyCore;
+
+public class Snippets {
+  public static readonly Option<bool> ShowSnippets = new("--show-snippets", () => true,
+    "Show a source code snippet for each Dafny message.");
+
+  static Snippets() {
+    OptionRegistry.RegisterOption(ShowSnippets, OptionScope.Cli);
+  }
+
+  public static void WriteSourceCodeSnippet(DafnyOptions options, IOrigin tok, TextWriter tw) {
+    var start = tok.StartToken;
+    var end = tok.EndToken;
+    string line = GetFileLine(options, tok.Uri, start.line - 1);
+    if (line == null) {
+      return;
+    }
+
+    string lineNumber = start.line.ToString();
+    string lineNumberSpaces = new string(' ', lineNumber.Length);
+    string columnSpaces = new string(' ', start.col - 1);
+    var lineStartPos = start.pos - start.col + 1;
+    var lineEndPos = lineStartPos + line.Length;
+
+    var tokEndPos = end.pos + end.val.Length;
+
+    var underlineLength = Math.Max(1, Math.Min(tokEndPos - start.pos, lineEndPos - start.pos));
+    string underline = new string('^', underlineLength);
+    tw.WriteLine($"{lineNumberSpaces} |");
+    tw.WriteLine($"{lineNumber} | {line}");
+    tw.WriteLine($"{lineNumberSpaces} | {columnSpaces}{underline}");
+    tw.WriteLine("");
+  }
+
+  private static string GetFileLine(DafnyOptions options, Uri uri, int lineIndex) {
+    var fsCache = FsCaches.GetOrCreateValue(options)!;
+    List<string> lines = fsCache.GetOrAdd(uri, key => {
+      try {
+        // Note: This is not guaranteed to be the same file that Dafny parsed. To ensure that, Dafny should keep
+        // an in-memory version of each file it parses.
+        var file = DafnyFile.HandleDafnyFile(OnDiskFileSystem.Instance, new ErrorReporterSink(options), options, uri, Token.NoToken);
+        using var reader = file.GetContent().Reader;
+        lines = Util.Lines(reader).ToList();
+      } catch (Exception) {
+        lines = new List<string>();
+      }
+      return lines;
+    });
+    if (0 <= lineIndex && lineIndex < lines.Count) {
+      return lines[lineIndex];
+    }
+    return null;
+  }
+
+  private static readonly ConditionalWeakTable<DafnyOptions, ConcurrentDictionary<Uri, List<string>>> FsCaches = new();
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/StringOnlyCustomAttributeTypeProvider.cs b/Source/DafnyCore/StringOnlyCustomAttributeTypeProvider.cs
new file mode 100644
index 00000000000..7af78fdb2a6
--- /dev/null
+++ b/Source/DafnyCore/StringOnlyCustomAttributeTypeProvider.cs
@@ -0,0 +1,46 @@
+#nullable enable
+using System;
+using System.Reflection.Metadata;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// Dummy implementation of ICustomAttributeTypeProvider, providing just enough
+/// functionality to successfully decode a DafnySourceAttribute value.
+/// </summary>
+internal class StringOnlyCustomAttributeTypeProvider : ICustomAttributeTypeProvider<System.Type> {
+  public System.Type GetPrimitiveType(PrimitiveTypeCode typeCode) {
+    if (typeCode == PrimitiveTypeCode.String) {
+      return typeof(string);
+    }
+    throw new NotImplementedException();
+  }
+
+  public System.Type GetTypeFromDefinition(MetadataReader reader, TypeDefinitionHandle handle, byte rawTypeKind) {
+    throw new NotImplementedException();
+  }
+
+  public System.Type GetTypeFromReference(MetadataReader reader, TypeReferenceHandle handle, byte rawTypeKind) {
+    throw new NotImplementedException();
+  }
+
+  public System.Type GetSZArrayType(System.Type elementType) {
+    throw new NotImplementedException();
+  }
+
+  public System.Type GetSystemType() {
+    throw new NotImplementedException();
+  }
+
+  public System.Type GetTypeFromSerializedName(string name) {
+    throw new NotImplementedException();
+  }
+
+  public PrimitiveTypeCode GetUnderlyingEnumType(System.Type type) {
+    throw new NotImplementedException();
+  }
+
+  public bool IsSystemType(System.Type type) {
+    throw new NotImplementedException();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/TestGenerationOptions.cs b/Source/DafnyCore/TestGenerationOptions.cs
index 925d2491a6b..1a39e06714d 100644
--- a/Source/DafnyCore/TestGenerationOptions.cs
+++ b/Source/DafnyCore/TestGenerationOptions.cs
@@ -8,12 +8,14 @@ public class TestGenerationOptions {
     public const string TestInlineAttribute = "testInline";
     public const string TestEntryAttribute = "testEntry";
     public bool WarnDeadCode = false;
-    public enum Modes { None, Block, CallGraph, Path };
+
+    public bool IgnoreWarnings = false;
+    public enum Modes { None, Block, InlinedBlock, Path };
     public Modes Mode = Modes.None;
     public uint SeqLengthLimit = 0;
     [CanBeNull] public string PrintBpl = null;
     public bool ForcePrune = false;
-    public const uint DefaultTimeLimit = 10;
     public string CoverageReport = null;
+    public const uint DefaultTimeLimit = 20;
   }
 }
diff --git a/Source/DafnyCore/Triggers/ComprehensionTriggerGenerator.cs b/Source/DafnyCore/Triggers/ComprehensionTriggerGenerator.cs
new file mode 100644
index 00000000000..8d31fbbc8c7
--- /dev/null
+++ b/Source/DafnyCore/Triggers/ComprehensionTriggerGenerator.cs
@@ -0,0 +1,247 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Diagnostics.Contracts;
+using DafnyCore.Generic;
+
+namespace Microsoft.Dafny.Triggers {
+
+  record QuantifierGroup(SplitPartTriggerWriter Quantifier, List<ComprehensionExpr> Expressions);
+
+  /// <summary>
+  /// For a comprehension that has been split into parts, determine triggers for each part.
+  ///
+  /// See section 2.3 of "Trigger Selection Strategies to Stabilize Program Verifiers" to learn
+  /// why we introduce these splits, and what interaction there is between the generation of their triggers.
+  /// </summary>
+  class ComprehensionTriggerGenerator {
+    private readonly ErrorReporter reporter;
+    private readonly ComprehensionExpr comprehension;  //  the expression where the splits are originated from
+    private List<SplitPartTriggerWriter> partWriters;
+
+    internal ComprehensionTriggerGenerator(ComprehensionExpr comprehension, IEnumerable<ComprehensionExpr> quantifiers, ErrorReporter reporter) {
+      Contract.Requires(quantifiers.All(q => !(q is QuantifierExpr) || ((QuantifierExpr)q).SplitQuantifier == null));
+      this.reporter = reporter;
+      this.comprehension = comprehension;
+      partWriters = quantifiers.Select(q => new SplitPartTriggerWriter(q)).ToList();
+    }
+
+    internal void ComputeTriggers(TriggersCollector triggersCollector) {
+      CollectAndShareTriggers(triggersCollector);
+      TrimInvalidTriggers();
+      BuildDependenciesGraph();
+      if (DetectAndFilterLoopingCandidates() && RewriteMatchingLoop(triggersCollector.ForModule)) {
+        CollectWithoutShareTriggers(triggersCollector);
+        TrimInvalidTriggers();
+        DetectAndFilterLoopingCandidates();
+      }
+      FilterWeakerTriggers();
+      CombineSplitQuantifier();
+    }
+
+    private bool SubsetGenerationPredicate(TriggerTermSet terms, TriggerTerm additionalTerm) {
+      return true; // FIXME Remove this
+      //return additionalTerm.Variables.Where(v => v is BoundVar && !terms.Any(t => t.Variables.Contains(v))).Any();
+    }
+
+    /// <summary>
+    /// Collect triggers from the body of each quantifier, and share them
+    /// between all quantifiers. This method assumes that all quantifiers
+    /// actually come from the same context, and were the result of a split that
+    /// gave them all the same variables.
+    /// 
+    /// See section 2.1 of "Trigger Selection Strategies to Stabilize Program Verifiers" to learn
+    /// how we collect triggers
+    /// </summary>
+    void CollectAndShareTriggers(TriggersCollector triggersCollector) {
+      var pool = new List<TriggerTerm>();
+      foreach (var triggerWriter in partWriters) {
+        var candidates = triggersCollector.CollectTriggers(triggerWriter.Comprehension).Deduplicate(TriggerTerm.Eq);
+        var greatTerms = candidates.Where(term => !triggersCollector.TranslateToFunctionCall(term.Expr)).ToList();
+        if (greatTerms.Any()) {
+          // If we have great terms, only use those
+          candidates = greatTerms;
+        }
+        pool.AddRange(candidates);
+      }
+      var distinctPool = pool.Deduplicate(TriggerTerm.Eq);
+
+      foreach (var triggerWriter in partWriters) {
+        triggerWriter.CandidateTerms = distinctPool; // The list of candidate terms is immutable
+        triggerWriter.Candidates = TriggerTermSet.ComputeNonEmptyTriggerCandidatesTerms(LinkedLists.FromList(distinctPool), triggerWriter.Comprehension.BoundVars)
+          .Select(set => set.ToTriggerCandidate()).ToList();
+      }
+    }
+
+    void CollectWithoutShareTriggers(TriggersCollector triggersCollector) {
+      foreach (var triggerWriter in partWriters) {
+        var candidates = triggersCollector.CollectTriggers(triggerWriter.Comprehension).Deduplicate(TriggerTerm.Eq);
+        triggerWriter.CandidateTerms = candidates; // The list of candidate terms is immutable
+        triggerWriter.Candidates = TriggerTermSet.ComputeNonEmptyTriggerCandidatesTerms(
+          LinkedLists.FromList(candidates), triggerWriter.Comprehension.BoundVars).
+          Select(set => set.ToTriggerCandidate()).ToList();
+      }
+    }
+
+    private void TrimInvalidTriggers() {
+      foreach (var triggerWriter in partWriters) {
+        triggerWriter.TrimInvalidTriggers();
+      }
+    }
+
+    void BuildDependenciesGraph() {
+      // The problem of finding matching loops between multiple-triggers is hard; it
+      // seems to require one to track exponentially-sized dependencies between parts
+      // of triggers and quantifiers. For now, we only do single-quantifier loop
+      // detection
+    }
+
+    bool DetectAndFilterLoopingCandidates() {
+      // NOTE: This only looks for self-loops; that is, loops involving a single
+      // quantifier.
+
+      // For a given quantifier q, we introduce a triggering relation between trigger
+      // candidates by writing t1 → t2 if instantiating q from t1 introduces a ground
+      // term that matches t2. Then, we notice that this relation is transitive, since
+      // all triggers yield the same set of terms. This means that any matching loop
+      // t1 → ... → t1 can be reduced to a self-loop t1 → t1. Detecting such
+      // self-loops is then only a matter of finding terms in the body of the
+      // quantifier that match a given trigger.
+
+      // Of course, each trigger that actually appears in the body of the quantifier
+      // yields a trivial self-loop (e.g. P(i) in [∀ i {P(i)} ⋅ P(i)]), so we
+      // ignore this type of loops. In fact, we ignore any term in the body of the
+      // quantifier that matches one of the terms of the trigger (this ensures that
+      // [∀ x {f(x), f(f(x))} ⋅ f(x) = f(f(x))] is not a loop). And we even
+      // ignore terms that almost match a trigger term, modulo a single variable
+      // (this ensures that [∀ x y {a(x, y)} ⋅ a(x, y) == a(y, x)] is not a loop).
+
+      // In addition, we ignore cases where the only differences between a trigger
+      // and a trigger match are places where a variable is replaced with an
+      // expression whose free variables do not intersect that of the quantifier
+      // in which that expression is found. For examples of this behavior, see
+      // triggers/literals-do-not-cause-loops.
+      // This ignoring logic is implemented by the CouldCauseLoops method.
+      bool foundLoop = false;
+      foreach (var quantifier in partWriters) {
+        foundLoop |= quantifier.DetectAndFilterLoopingCandidates(reporter);
+      }
+      return foundLoop;
+    }
+
+    private bool RewriteMatchingLoop(ModuleDefinition module) {
+      if (comprehension is QuantifierExpr unSplitQuantifier) {
+        bool rewritten = false;
+        foreach (var triggerWriter in partWriters) {
+          rewritten |= triggerWriter.RewriteMatchingLoop(reporter, module);
+        }
+        if (rewritten) {
+          unSplitQuantifier.SplitQuantifier = partWriters.Select(q => (Expression)q.Comprehension).ToList();
+          return true;
+        }
+      }
+      return false;
+    }
+
+    void FilterWeakerTriggers() {
+      foreach (var triggerWriter in partWriters) {
+        triggerWriter.FilterStrongCandidates();
+      }
+    }
+
+    // group split quantifier by what triggers they got, and merged them back into one quantifier.
+    private void CombineSplitQuantifier() {
+      if (partWriters.Count > 1) {
+        var groups = new List<QuantifierGroup>();
+        groups.Add(new QuantifierGroup(partWriters[0], new List<ComprehensionExpr> { partWriters[0].Comprehension }));
+        for (int i = 1; i < partWriters.Count; i++) {
+          bool found = false;
+          for (int j = 0; j < groups.Count; j++) {
+            if (HasSameTriggers(partWriters[i], groups[j].Quantifier)) {
+              // belong to the same group
+              groups[j].Expressions.Add(partWriters[i].Comprehension);
+              found = true;
+              break;
+            }
+          }
+          if (!found) {
+            // start a new group
+            groups.Add(new QuantifierGroup(partWriters[i], new List<ComprehensionExpr> { partWriters[i].Comprehension }));
+          }
+        }
+        if (groups.Count == partWriters.Count) {
+          // have the same number of splits, so no splits are combined.
+          return;
+        }
+        // merge expressions in each group back to one quantifier.
+        List<SplitPartTriggerWriter> list = new List<SplitPartTriggerWriter>();
+        List<Expression> splits = new List<Expression>();
+        foreach (var group in groups) {
+          SplitPartTriggerWriter q = group.Quantifier;
+          if (q.Comprehension is ForallExpr forallExpr) {
+            IOrigin tok = forallExpr.Origin is NestedOrigin nestedToken ? nestedToken.Outer : forallExpr.Origin;
+            Expression expr = QuantifiersToExpression(tok, BinaryExpr.ResolvedOpcode.And, group.Expressions);
+            q.Comprehension = new ForallExpr(tok, forallExpr.BoundVars, forallExpr.Range, expr, TriggerUtils.CopyAttributes(forallExpr.Attributes)) { Type = forallExpr.Type, Bounds = forallExpr.Bounds };
+          } else if (q.Comprehension is ExistsExpr existsExpr) {
+            IOrigin tok = existsExpr.Origin is NestedOrigin nestedToken ? nestedToken.Outer : existsExpr.Origin;
+            Expression expr = QuantifiersToExpression(tok, BinaryExpr.ResolvedOpcode.Or, group.Expressions);
+            q.Comprehension = new ExistsExpr(tok, existsExpr.BoundVars, existsExpr.Range, expr, TriggerUtils.CopyAttributes(existsExpr.Attributes)) { Type = existsExpr.Type, Bounds = existsExpr.Bounds };
+          }
+          list.Add(q);
+          splits.Add(q.Comprehension);
+        }
+
+        partWriters = list;
+        Contract.Assert(this.comprehension is QuantifierExpr); // only QuantifierExpr has SplitQuantifier
+        ((QuantifierExpr)this.comprehension).SplitQuantifier = splits;
+      }
+    }
+
+    private bool HasSameTriggers(SplitPartTriggerWriter one, SplitPartTriggerWriter other) {
+      return one.Candidates.SequenceEqual(other.Candidates, new PredicateEqualityComparer<TriggerCandidate>(SameTriggerCandidate));
+    }
+
+    private static bool SameTriggerCandidate(TriggerCandidate arg1, TriggerCandidate arg2) {
+      Func<TriggerTerm, TriggerTerm, bool> comparer = TriggerTerm.Eq;
+      return arg1.Terms.SequenceEqual(arg2.Terms, new PredicateEqualityComparer<TriggerTerm>(comparer));
+    }
+
+    private Expression QuantifiersToExpression(IOrigin tok, BinaryExpr.ResolvedOpcode op, List<ComprehensionExpr> expressions) {
+      var expr = expressions[0].Term;
+      for (int i = 1; i < expressions.Count; i++) {
+        expr = new BinaryExpr(tok, op, expr, expressions[i].Term);
+      }
+      return expr;
+    }
+
+    internal void CommitTriggers(SystemModuleManager systemModuleManager) {
+      if (partWriters.Count > 1) {
+        reporter.Message(MessageSource.Rewriter, ErrorLevel.Info, null,
+          comprehension.Origin, $"Quantifier was split into {partWriters.Count} parts. " +
+                                "Better verification performance and error reporting may be obtained by splitting the quantifier in source. " +
+                                "For more information, see the section quantifier instantiation rules in the reference manual.");
+      }
+
+      for (var index = 0; index < partWriters.Count; index++) {
+        var triggerWriter = partWriters[index];
+        triggerWriter.CommitTrigger(reporter, partWriters.Count > 1 ? index : null, systemModuleManager);
+      }
+    }
+
+    public List<List<Expression>> GetTriggers(bool includeTriggersThatRequireNamedExpressions) {
+      var triggers = new List<List<Expression>>();
+      foreach (var triggerWriter in partWriters) {
+        if (includeTriggersThatRequireNamedExpressions || triggerWriter.NamedExpressions.Count == 0) {
+          foreach (var triggerCandidate in triggerWriter.Candidates) {
+            var trigger = triggerCandidate.Terms.ConvertAll(t => t.Expr);
+            triggers.Add(trigger);
+          }
+        }
+      }
+      return triggers;
+    }
+  }
+}
diff --git a/Source/DafnyCore/Triggers/ExprSubstituter.cs b/Source/DafnyCore/Triggers/ExprSubstituter.cs
index d3e8fce3dd6..6a38a7c1ffa 100644
--- a/Source/DafnyCore/Triggers/ExprSubstituter.cs
+++ b/Source/DafnyCore/Triggers/ExprSubstituter.cs
@@ -46,26 +46,26 @@ public override Expression Substitute(Expression expr) {
 
         var newBoundVars = new List<BoundVar>(e.BoundVars);
         if (newBounds == null) {
-          newBounds = new List<ComprehensionExpr.BoundedPool>();
+          newBounds = new List<BoundedPool>();
         } else if (newBounds == e.Bounds) {
           // create a new list with the same elements, since the .Add operations below would otherwise add elements to the original e.Bounds
-          newBounds = new List<ComprehensionExpr.BoundedPool>(newBounds);
+          newBounds = new List<BoundedPool>(newBounds);
         }
 
         // conjoin all the new equalities to the range of the quantifier
         foreach (var entry in usedSubstMap) {
-          var eq = new BinaryExpr(e.tok, BinaryExpr.ResolvedOpcode.EqCommon, entry.Item2, entry.Item1);
-          newRange = newRange == null ? eq : new BinaryExpr(e.tok, BinaryExpr.ResolvedOpcode.And, eq, newRange);
+          var eq = new BinaryExpr(e.Origin, BinaryExpr.ResolvedOpcode.EqCommon, entry.Item2, entry.Item1);
+          newRange = newRange == null ? eq : new BinaryExpr(e.Origin, BinaryExpr.ResolvedOpcode.And, eq, newRange);
           newBoundVars.Add((BoundVar)entry.Item2.Var);
-          newBounds.Add(new ComprehensionExpr.ExactBoundedPool(entry.Item1));
+          newBounds.Add(new ExactBoundedPool(entry.Item1));
         }
 
         QuantifierExpr newExpr;
         if (expr is ForallExpr) {
-          newExpr = new ForallExpr(e.tok, e.RangeToken, newBoundVars, newRange, newTerm, newAttrs) { Bounds = newBounds };
+          newExpr = new ForallExpr(e.Origin, newBoundVars, newRange, newTerm, newAttrs) { Bounds = newBounds };
         } else {
           Contract.Assert(expr is ExistsExpr);
-          newExpr = new ExistsExpr(e.tok, e.RangeToken, newBoundVars, newRange, newTerm, newAttrs) { Bounds = newBounds };
+          newExpr = new ExistsExpr(e.Origin, newBoundVars, newRange, newTerm, newAttrs) { Bounds = newBounds };
         }
         usedSubstMap.Clear();
 
diff --git a/Source/DafnyCore/Triggers/QuantifierSplitter.cs b/Source/DafnyCore/Triggers/QuantifierSplitter.cs
index 4af13432bfd..81c11f3f254 100644
--- a/Source/DafnyCore/Triggers/QuantifierSplitter.cs
+++ b/Source/DafnyCore/Triggers/QuantifierSplitter.cs
@@ -1,21 +1,24 @@
 // Copyright by the contributors to the Dafny Project
 // SPDX-License-Identifier: MIT
 
-using Microsoft.Boogie;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
-using System.Text;
 
 namespace Microsoft.Dafny.Triggers {
+
+  /// <summary>
+  /// See section 2.3 of "Trigger Selection Strategies to Stabilize Program Verifiers" to learn
+  /// why we split quantifiers
+  /// </summary>
   class QuantifierSplitter : BottomUpVisitor {
     /// This cache was introduced because some statements (notably calc) return the same SubExpression multiple times.
     /// This ended up causing an inconsistent situation when the calc statement's subexpressions contained the same quantifier
     /// twice: on the first pass that quantifier got its SplitQuantifiers generated, and on the the second pass these
     /// split quantifiers got re-split, creating a situation where the direct children of a split quantifier were
     /// also split quantifiers.
-    private Dictionary<QuantifierExpr, List<Expression>> splits = new Dictionary<QuantifierExpr, List<Expression>>();
+    private readonly Dictionary<QuantifierExpr, List<Expression>> splits = new();
 
     private static BinaryExpr.Opcode FlipOpcode(BinaryExpr.Opcode opCode) {
       if (opCode == BinaryExpr.Opcode.And) {
@@ -35,15 +38,14 @@ private static BinaryExpr.Opcode FlipOpcode(BinaryExpr.Opcode opCode) {
     //   forall x :: P(x) ==> (Q(x) && R(x))
 
     private static UnaryOpExpr Not(Expression expr) {
-      return new UnaryOpExpr(expr.tok, UnaryOpExpr.Opcode.Not, expr) { Type = expr.Type };
+      return new UnaryOpExpr(expr.Origin, UnaryOpExpr.Opcode.Not, expr) { Type = expr.Type };
     }
 
-    internal static IEnumerable<Expression> SplitExpr(Expression expr, BinaryExpr.Opcode separator) {
+    private static IEnumerable<Expression> SplitExpr(Expression expr, BinaryExpr.Opcode separator) {
       expr = expr.Resolved;
-      var unary = expr as UnaryOpExpr;
       var binary = expr as BinaryExpr;
 
-      if (unary != null && unary.Op == UnaryOpExpr.Opcode.Not) {
+      if (expr is UnaryOpExpr unary && unary.Op == UnaryOpExpr.Opcode.Not) {
         foreach (var e in SplitExpr(unary.E, FlipOpcode(separator))) { yield return Not(e); }
       } else if (binary != null && binary.Op == separator) {
         if (Expression.IsBoolLiteral(binary.E0, out var b) && (binary.Op == BinaryExpr.Opcode.And ? b : !b)) {
@@ -63,12 +65,12 @@ internal static IEnumerable<Expression> SplitExpr(Expression expr, BinaryExpr.Op
     internal static IEnumerable<Expression> SplitAndStitch(BinaryExpr pair, BinaryExpr.Opcode separator) {
       foreach (var e1 in SplitExpr(pair.E1, separator)) {
         // Notice the token. This makes triggers/splitting-picks-the-right-tokens.dfy possible
-        var nestedToken = new NestedToken(pair.tok, e1.tok);
+        var nestedToken = new NestedOrigin(pair.Origin, e1.Origin);
         yield return new BinaryExpr(nestedToken, pair.Op, pair.E0, e1) { ResolvedOp = pair.ResolvedOp, Type = pair.Type };
       }
     }
 
-    internal static IEnumerable<Expression> SplitQuantifier(ComprehensionExpr quantifier) {
+    private static IEnumerable<Expression> SplitQuantifier(ComprehensionExpr quantifier) {
       var body = quantifier.Term;
       var binary = body as BinaryExpr;
 
@@ -80,8 +82,8 @@ internal static IEnumerable<Expression> SplitQuantifier(ComprehensionExpr quanti
           stream = SplitExpr(body, BinaryExpr.Opcode.And);
         }
         foreach (var e in stream) {
-          var tok = new NestedToken(quantifier.tok, e.tok, "in subexpression at");
-          yield return new ForallExpr(tok, quantifier.RangeToken, quantifier.BoundVars, quantifier.Range, e, TriggerUtils.CopyAttributes(quantifier.Attributes)) { Type = quantifier.Type, Bounds = quantifier.Bounds };
+          var tok = new NestedOrigin(quantifier.Origin, e.Origin, "in subexpression at");
+          yield return new ForallExpr(tok, quantifier.BoundVars, quantifier.Range, e, TriggerUtils.CopyAttributes(quantifier.Attributes)) { Type = quantifier.Type, Bounds = quantifier.Bounds };
         }
       } else if (quantifier is ExistsExpr) {
         IEnumerable<Expression> stream;
@@ -91,8 +93,8 @@ internal static IEnumerable<Expression> SplitQuantifier(ComprehensionExpr quanti
           stream = SplitExpr(body, BinaryExpr.Opcode.Or);
         }
         foreach (var e in stream) {
-          var tok = body?.tok == e.tok ? quantifier.tok : new NestedToken(quantifier.tok, e.tok, "in subexpression at");
-          yield return new ExistsExpr(tok, quantifier.RangeToken, quantifier.BoundVars, quantifier.Range, e, TriggerUtils.CopyAttributes(quantifier.Attributes)) { Type = quantifier.Type, Bounds = quantifier.Bounds };
+          var tok = body?.Origin == e.Origin ? quantifier.Origin : new NestedOrigin(quantifier.Origin, e.Origin, "in subexpression at");
+          yield return new ExistsExpr(tok, quantifier.BoundVars, quantifier.Range, e, TriggerUtils.CopyAttributes(quantifier.Attributes)) { Type = quantifier.Type, Bounds = quantifier.Bounds };
         }
       } else {
         yield return quantifier;
@@ -106,15 +108,17 @@ private static bool AllowsSplitting(ComprehensionExpr quantifier) {
     }
 
     protected override void VisitOneExpr(Expression expr) {
-      var quantifier = expr as QuantifierExpr;
-      if (quantifier != null) {
+      if (expr is QuantifierExpr quantifier) {
         Contract.Assert(quantifier.SplitQuantifier == null);
         if (!splits.ContainsKey(quantifier) && AllowsSplitting(quantifier)) {
-          splits[quantifier] = SplitQuantifier(quantifier).ToList();
+          splits[quantifier] = SplitQuantifier(quantifier).Select(e => {
+            e.SetOrigin(new AutoGeneratedOrigin(e.Origin));
+            return e;
+          }).ToList();
         }
       }
 
-      if (expr is ITEExpr iteExpr && iteExpr.IsBindingGuard) {
+      if (expr is ITEExpr { IsBindingGuard: true } iteExpr) {
         splits.Remove((ExistsExpr)iteExpr.Test);
       }
     }
@@ -122,8 +126,8 @@ protected override void VisitOneExpr(Expression expr) {
     protected override void VisitOneStmt(Statement stmt) {
       if (stmt is ForallStmt) {
         ForallStmt s = (ForallStmt)stmt;
-        if (s.ForallExpressions != null) {
-          foreach (Expression expr in s.ForallExpressions) {
+        if (s.EffectiveEnsuresClauses != null) {
+          foreach (Expression expr in s.EffectiveEnsuresClauses) {
             VisitOneExpr(expr);
           }
         }
@@ -143,53 +147,4 @@ internal void Commit() {
       }
     }
   }
-
-  class MatchingLoopRewriter {
-    public MatchingLoopRewriter(DafnyOptions options) {
-      triggersCollector = new TriggersCollector(new Dictionary<Expression, HashSet<OldExpr>>(), options);
-    }
-
-    TriggersCollector triggersCollector;
-    List<Tuple<Expression, IdentifierExpr>> substMap;
-
-    public QuantifierExpr RewriteMatchingLoops(QuantifierWithTriggers q) {
-      // rewrite quantifier to avoid matching loops
-      // before:
-      //    assert forall i :: 0 <= i < a.Length-1 ==> a[i] <= a[i+1];
-      // after:
-      //    assert forall i,j :: j == i+1 ==> 0 <= i < a.Length-1 ==> a[i] <= a[j];
-      substMap = new List<Tuple<Expression, IdentifierExpr>>();
-      foreach (var m in q.LoopingMatches) {
-        var e = m.OriginalExpr;
-        if (triggersCollector.IsPotentialTriggerCandidate(e) && triggersCollector.IsTriggerKiller(e)) {
-          foreach (var sub in e.SubExpressions) {
-            if (triggersCollector.IsTriggerKiller(sub) && (!triggersCollector.IsPotentialTriggerCandidate(sub))) {
-              var entry = substMap.Find(x => ExprExtensions.ExpressionEq(sub, x.Item1));
-              if (entry == null) {
-                var newBv = new BoundVar(sub.tok, "_t#" + substMap.Count, sub.Type);
-                var ie = new IdentifierExpr(sub.tok, newBv.Name);
-                ie.Var = newBv;
-                ie.Type = newBv.Type;
-                substMap.Add(new Tuple<Expression, IdentifierExpr>(sub, ie));
-              }
-            }
-          }
-        }
-      }
-
-      var expr = (QuantifierExpr)q.quantifier;
-      if (substMap.Count > 0) {
-        var s = new ExprSubstituter(substMap);
-        expr = s.Substitute(q.quantifier) as QuantifierExpr;
-      } else {
-        // make a copy of the expr
-        if (expr is ForallExpr) {
-          expr = new ForallExpr(expr.tok, expr.RangeToken, expr.BoundVars, expr.Range, expr.Term, TriggerUtils.CopyAttributes(expr.Attributes)) { Type = expr.Type, Bounds = expr.Bounds };
-        } else {
-          expr = new ExistsExpr(expr.tok, expr.RangeToken, expr.BoundVars, expr.Range, expr.Term, TriggerUtils.CopyAttributes(expr.Attributes)) { Type = expr.Type, Bounds = expr.Bounds };
-        }
-      }
-      return expr;
-    }
-  }
 }
diff --git a/Source/DafnyCore/Triggers/QuantifiersCollection.cs b/Source/DafnyCore/Triggers/QuantifiersCollection.cs
deleted file mode 100644
index 72fcfb1515e..00000000000
--- a/Source/DafnyCore/Triggers/QuantifiersCollection.cs
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
-#define QUANTIFIER_WARNINGS
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Boogie;
-using System.Diagnostics.Contracts;
-using static Microsoft.Dafny.ErrorRegistry;
-
-namespace Microsoft.Dafny.Triggers {
-  class QuantifierWithTriggers {
-    internal ComprehensionExpr quantifier;
-    internal List<TriggerTerm> CandidateTerms;
-    internal List<TriggerCandidate> Candidates;
-    internal List<TriggerCandidate> RejectedCandidates;
-    internal List<TriggerMatch> LoopingMatches;
-
-    internal bool AllowsLoops { get { return TriggerUtils.AllowsMatchingLoops(quantifier); } }
-    internal bool CouldSuppressLoops { get; set; }
-
-    internal QuantifierWithTriggers(ComprehensionExpr quantifier) {
-      this.quantifier = quantifier;
-      this.RejectedCandidates = new List<TriggerCandidate>();
-    }
-
-    internal void TrimInvalidTriggers() {
-      Contract.Requires(CandidateTerms != null);
-      Contract.Requires(Candidates != null);
-      Candidates = TriggerUtils.Filter(Candidates, tr => tr, (tr, _) => tr.MentionsAll(quantifier.BoundVars), (tr, _) => { }).ToList();
-    }
-  }
-
-  class QuantifiersCollection {
-    readonly ErrorReporter reporter;
-    readonly ComprehensionExpr expr;  //  the expression where the splits are originated from
-    List<QuantifierWithTriggers> quantifiers;
-
-    internal QuantifiersCollection(ComprehensionExpr expr, IEnumerable<ComprehensionExpr> quantifiers, ErrorReporter reporter) {
-      Contract.Requires(quantifiers.All(q => !(q is QuantifierExpr) || ((QuantifierExpr)q).SplitQuantifier == null));
-      this.reporter = reporter;
-      this.expr = expr;
-      this.quantifiers = quantifiers.Select(q => new QuantifierWithTriggers(q)).ToList();
-    }
-
-    internal void ComputeTriggers(TriggersCollector triggersCollector) {
-      CollectAndShareTriggers(triggersCollector);
-      TrimInvalidTriggers();
-      BuildDependenciesGraph();
-      if (SuppressMatchingLoops() && RewriteMatchingLoop()) {
-        CollectWithoutShareTriggers(triggersCollector);
-        TrimInvalidTriggers();
-        SuppressMatchingLoops();
-      }
-      SelectTriggers();
-      CombineSplitQuantifier();
-    }
-
-    private bool SubsetGenerationPredicate(TriggerUtils.SetOfTerms terms, TriggerTerm additionalTerm) {
-      return true; // FIXME Remove this
-      //return additionalTerm.Variables.Where(v => v is BoundVar && !terms.Any(t => t.Variables.Contains(v))).Any();
-    }
-
-    /// <summary>
-    /// Collect triggers from the body of each quantifier, and share them
-    /// between all quantifiers. This method assumes that all quantifiers
-    /// actually come from the same context, and were the result of a split that
-    /// gave them all the same variables.
-    /// </summary>
-    /// <param name="triggersCollector"></param>
-    void CollectAndShareTriggers(TriggersCollector triggersCollector) {
-      List<TriggerTerm> pool = new List<TriggerTerm>();
-      foreach (var q in quantifiers) {
-        var candidates = triggersCollector.CollectTriggers(q.quantifier).Deduplicate(TriggerTerm.Eq);
-        // filter out the candidates that was "second-class"
-        var filtered = TriggerUtils.Filter(candidates, tr => tr,
-          (tr, _) => !triggersCollector.TranslateToFunctionCall(tr.Expr), (tr, _) => { }).ToList();
-        // if there are only "second-class" candidates, add them back.
-        if (filtered.Count == 0) {
-          filtered = candidates;
-        }
-        pool.AddRange(filtered);
-      }
-      var distinctPool = pool.Deduplicate(TriggerTerm.Eq);
-
-      foreach (var q in quantifiers) {
-        q.CandidateTerms = distinctPool; // The list of candidate terms is immutable
-        q.Candidates = TriggerUtils.AllNonEmptySubsets(distinctPool, SubsetGenerationPredicate, q.quantifier.BoundVars)
-          .Select(set => set.ToTriggerCandidate()).ToList();
-      }
-    }
-
-    void CollectWithoutShareTriggers(TriggersCollector triggersCollector) {
-      foreach (var q in quantifiers) {
-        var candidates = triggersCollector.CollectTriggers(q.quantifier).Deduplicate(TriggerTerm.Eq);
-        q.CandidateTerms = candidates; // The list of candidate terms is immutable
-        q.Candidates = TriggerUtils.AllNonEmptySubsets(candidates, SubsetGenerationPredicate, q.quantifier.BoundVars).Select(set => set.ToTriggerCandidate()).ToList();
-      }
-    }
-
-    private void TrimInvalidTriggers() {
-      foreach (var q in quantifiers) {
-        q.TrimInvalidTriggers();
-      }
-    }
-
-    void BuildDependenciesGraph() {
-      // The problem of finding matching loops between multiple-triggers is hard; it
-      // seems to require one to track exponentially-sized dependencies between parts
-      // of triggers and quantifiers. For now, we only do single-quantifier loop
-      // detection
-    }
-
-    bool SuppressMatchingLoops() {
-      // NOTE: This only looks for self-loops; that is, loops involving a single
-      // quantifier.
-
-      // For a given quantifier q, we introduce a triggering relation between trigger
-      // candidates by writing t1 → t2 if instantiating q from t1 introduces a ground
-      // term that matches t2. Then, we notice that this relation is transitive, since
-      // all triggers yield the same set of terms. This means that any matching loop
-      // t1 → ... → t1 can be reduced to a self-loop t1 → t1. Detecting such
-      // self-loops is then only a matter of finding terms in the body of the
-      // quantifier that match a given trigger.
-
-      // Of course, each trigger that actually appears in the body of the quantifier
-      // yields a trivial self-loop (e.g. P(i) in [∀ i {P(i)} ⋅ P(i)]), so we
-      // ignore this type of loops. In fact, we ignore any term in the body of the
-      // quantifier that matches one of the terms of the trigger (this ensures that
-      // [∀ x {f(x), f(f(x))} ⋅ f(x) = f(f(x))] is not a loop). And we even
-      // ignore terms that almost match a trigger term, modulo a single variable
-      // (this ensures that [∀ x y {a(x, y)} ⋅ a(x, y) == a(y, x)] is not a loop).
-      // In addition, we ignore cases where the only differences between a trigger
-      // and a trigger match are places where a variable is replaced with an
-      // expression whose free variables do not intersect that of the quantifier
-      // in which that expression is found. For examples of this behavious, see
-      // triggers/literals-do-not-cause-loops.
-      // This ignoring logic is implemented by the CouldCauseLoops method.
-      bool foundloop = false;
-      foreach (var q in quantifiers) {
-        var looping = new List<TriggerCandidate>();
-        var loopingMatches = new List<TriggerMatch>();
-
-        var safe = TriggerUtils.Filter(
-          q.Candidates,
-          candidate => candidate.LoopingSubterms(q.quantifier, reporter.Options).ToList(),
-          (candidate, loopingSubterms) => !loopingSubterms.Any(),
-          (candidate, loopingSubterms) => {
-            looping.Add(candidate);
-            loopingMatches = loopingSubterms.ToList();
-            candidate.Annotation = "may loop with " +
-                                   String.Join(", ",
-                                     loopingSubterms.Select(t => "\"" + Printer.ExprToString(reporter.Options, t.OriginalExpr) + "\""));
-          }).ToList();
-
-        q.CouldSuppressLoops = safe.Count > 0;
-        q.LoopingMatches = loopingMatches;
-        if (!q.AllowsLoops && q.CouldSuppressLoops) {
-          q.Candidates = safe;
-          q.RejectedCandidates.AddRange(looping);
-        }
-
-        if (looping.Count > 0) {
-          foundloop = true;
-        }
-      }
-      return foundloop;
-    }
-
-    bool RewriteMatchingLoop() {
-      if (expr is QuantifierExpr) {
-        QuantifierExpr quantifier = (QuantifierExpr)expr;
-        var l = new List<QuantifierWithTriggers>();
-        List<Expression> splits = new List<Expression>();
-        bool rewritten = false;
-        foreach (var q in quantifiers) {
-          if (TriggerUtils.NeedsAutoTriggers(q.quantifier) && TriggerUtils.WantsMatchingLoopRewrite(q.quantifier)) {
-            var matchingLoopRewriter = new MatchingLoopRewriter(reporter.Options);
-            var qq = matchingLoopRewriter.RewriteMatchingLoops(q);
-            splits.Add(qq);
-            l.Add(new QuantifierWithTriggers(qq));
-            rewritten = true;
-          } else {
-            // don't rewrite the quantifier if we are not auto generate triggers.
-            // This is because rewriting introduces new boundvars and will cause
-            // user provided triggers not mention all boundvars
-            splits.Add(q.quantifier);
-            l.Add(q);
-          }
-        }
-        if (rewritten) {
-          quantifier.SplitQuantifier = splits;
-          quantifiers = l;
-          return true;
-        }
-      }
-      return false;
-    }
-
-    void SelectTriggers() {
-      foreach (var q in quantifiers) { //FIXME Check whether this makes verification faster
-        q.Candidates = TriggerUtils.Filter(q.Candidates,
-          candidate => q.Candidates.Where(candidate.IsStrongerThan).ToList(),
-          (candidate, weakerCandidates) => !weakerCandidates.Any(),
-          (candidate, weakerCandidates) => {
-            q.RejectedCandidates.Add(candidate);
-            candidate.Annotation = "more specific than " + String.Join(", ", weakerCandidates);
-          }).ToList();
-      }
-    }
-
-    internal class QuantifierGroup {
-      internal QuantifierWithTriggers quantifier;
-      internal List<ComprehensionExpr> expressions;
-
-      public QuantifierGroup(QuantifierWithTriggers q, List<ComprehensionExpr> expressions) {
-        this.quantifier = q;
-        this.expressions = expressions;
-      }
-    }
-
-    // group split quantifier by what triggers they got, and merged them back into one quantifier.
-    private void CombineSplitQuantifier() {
-      if (quantifiers.Count > 1) {
-        List<QuantifierGroup> groups = new List<QuantifierGroup>();
-        groups.Add(new QuantifierGroup(quantifiers[0], new List<ComprehensionExpr> { quantifiers[0].quantifier }));
-        for (int i = 1; i < quantifiers.Count; i++) {
-          bool found = false;
-          for (int j = 0; j < groups.Count; j++) {
-            if (HasSameTriggers(quantifiers[i], groups[j].quantifier)) {
-              // belong to the same group
-              groups[j].expressions.Add(quantifiers[i].quantifier);
-              found = true;
-              break;
-            }
-          }
-          if (!found) {
-            // start a new group
-            groups.Add(new QuantifierGroup(quantifiers[i], new List<ComprehensionExpr> { quantifiers[i].quantifier }));
-          }
-        }
-        if (groups.Count == quantifiers.Count) {
-          // have the same number of splits, so no splits are combined.
-          return;
-        }
-        // merge expressions in each group back to one quantifier.
-        List<QuantifierWithTriggers> list = new List<QuantifierWithTriggers>();
-        List<Expression> splits = new List<Expression>();
-        foreach (var group in groups) {
-          QuantifierWithTriggers q = group.quantifier;
-          if (q.quantifier is ForallExpr) {
-            ForallExpr quantifier = (ForallExpr)q.quantifier;
-            IToken tok = quantifier.tok is NestedToken nestedToken ? nestedToken.Outer : quantifier.tok;
-            Expression expr = QuantifiersToExpression(tok, BinaryExpr.ResolvedOpcode.And, group.expressions);
-            q.quantifier = new ForallExpr(tok, quantifier.RangeToken, quantifier.BoundVars, quantifier.Range, expr, TriggerUtils.CopyAttributes(quantifier.Attributes)) { Type = quantifier.Type, Bounds = quantifier.Bounds };
-          } else if (q.quantifier is ExistsExpr) {
-            ExistsExpr quantifier = (ExistsExpr)q.quantifier;
-            IToken tok = quantifier.tok is NestedToken nestedToken ? nestedToken.Outer : quantifier.tok;
-            Expression expr = QuantifiersToExpression(tok, BinaryExpr.ResolvedOpcode.Or, group.expressions);
-            q.quantifier = new ExistsExpr(tok, quantifier.RangeToken, quantifier.BoundVars, quantifier.Range, expr, TriggerUtils.CopyAttributes(quantifier.Attributes)) { Type = quantifier.Type, Bounds = quantifier.Bounds };
-          }
-          list.Add(q);
-          splits.Add(q.quantifier);
-        }
-        this.quantifiers = list;
-        Contract.Assert(this.expr is QuantifierExpr); // only QuantifierExpr has SplitQuantifier
-        ((QuantifierExpr)this.expr).SplitQuantifier = splits;
-      }
-    }
-
-    private bool HasSameTriggers(QuantifierWithTriggers one, QuantifierWithTriggers other) {
-      return TriggerUtils.SameLists(one.Candidates, other.Candidates, SameTriggerCandidate);
-    }
-
-    private static bool SameTriggerCandidate(TriggerCandidate arg1, TriggerCandidate arg2) {
-      return TriggerUtils.SameLists(arg1.Terms, arg2.Terms, TriggerTerm.Eq);
-    }
-
-    private Expression QuantifiersToExpression(IToken tok, BinaryExpr.ResolvedOpcode op, List<ComprehensionExpr> expressions) {
-      var expr = expressions[0].Term;
-      for (int i = 1; i < expressions.Count; i++) {
-        expr = new BinaryExpr(tok, op, expr, expressions[i].Term);
-      }
-      return expr;
-    }
-
-    private void CommitOne(DafnyOptions options, QuantifierWithTriggers q, bool addHeader) {
-      var errorLevel = ErrorLevel.Info;
-      var msg = new StringBuilder();
-      var indent = addHeader ? "  " : "";
-      bool suppressWarnings = Attributes.Contains(q.quantifier.Attributes, "nowarn");
-      var reportingToken = q.quantifier.tok;
-      // If there is only one subexpression, we discard the nested token information.
-      if (reportingToken is NestedToken nestedToken && !addHeader) {
-        reportingToken = nestedToken.Outer;
-      }
-
-      void FirstLetterCapitalOnNestedToken() {
-        if (reportingToken is NestedToken nestToken && nestToken.Message != null && nestToken.Message.Length > 1) {
-          reportingToken = new NestedToken(nestToken.Outer, nestToken.Inner,
-            char.ToUpper(nestToken.Message[0]) + nestToken.Message.Substring(1));
-        }
-      }
-
-      if (!TriggerUtils.NeedsAutoTriggers(q.quantifier)) { // NOTE: split and autotriggers attributes are passed down to Boogie
-        var extraMsg = TriggerUtils.WantsAutoTriggers(q.quantifier) ? "" : " Note that {:autotriggers false} can cause instabilities. Consider using {:nowarn}, {:matchingloop} (not great either), or a manual trigger instead.";
-        msg.AppendFormat("Not generating triggers for \"{0}\".{1}", Printer.ExprToString(options, q.quantifier.Term), extraMsg).AppendLine();
-      } else {
-        if (addHeader) {
-          msg.AppendFormat("For expression \"{0}\":", Printer.ExprToString(options, q.quantifier.Term)).AppendLine();
-        }
-
-        foreach (var candidate in q.Candidates) {
-          q.quantifier.Attributes = new Attributes("trigger", candidate.Terms.Select(t => t.Expr).ToList(), q.quantifier.Attributes);
-        }
-
-        AddTriggersToMessage("Selected triggers:", q.Candidates, msg, indent);
-        AddTriggersToMessage("Rejected triggers:", q.RejectedCandidates, msg, indent, true);
-
-#if QUANTIFIER_WARNINGS
-        var WARN_TAG = options.UnicodeOutput ? "⚠ " : @"/!\ ";
-        var WARN_TAG_OVERRIDE = suppressWarnings ? "(Suppressed warning) " : WARN_TAG;
-        var WARN_LEVEL = suppressWarnings ? ErrorLevel.Info : ErrorLevel.Warning;
-        var WARN = indent + WARN_TAG_OVERRIDE;
-        if (!q.CandidateTerms.Any()) {
-          errorLevel = WARN_LEVEL;
-          msg.Append(WARN).AppendLine("No terms found to trigger on.");
-          FirstLetterCapitalOnNestedToken();
-        } else if (!q.Candidates.Any()) {
-          errorLevel = WARN_LEVEL;
-          msg.Append(WARN).AppendLine("No trigger covering all quantified variables found.");
-          FirstLetterCapitalOnNestedToken();
-        } else if (!q.CouldSuppressLoops && !q.AllowsLoops) {
-          errorLevel = WARN_LEVEL;
-          msg.Append(WARN).AppendLine("Suppressing loops would leave this expression without triggers.");
-          FirstLetterCapitalOnNestedToken();
-        } else if (suppressWarnings) {
-          errorLevel = ErrorLevel.Warning;
-          msg.Append(indent).Append(WARN_TAG).AppendLine("There is no warning here to suppress.");
-          FirstLetterCapitalOnNestedToken();
-        }
-#endif
-      }
-
-      if (msg.Length > 0 && !Attributes.Contains(q.quantifier.Attributes, "auto_generated")) {
-        var msgStr = msg.ToString().TrimEnd("\r\n ".ToCharArray());
-        reporter.Message(MessageSource.Rewriter, errorLevel, null, reportingToken, msgStr);
-      }
-    }
-
-    private static void AddTriggersToMessage<T>(string header, List<T> triggers, StringBuilder msg, string indent, bool newlines = false) {
-      if (triggers.Any()) {
-        msg.Append(indent).Append(header);
-        if (triggers.Count == 1) {
-          msg.Append(" ");
-        } else if (triggers.Count > 1) {
-          msg.AppendLine().Append(indent).Append("  ");
-        }
-        var separator = newlines && triggers.Count > 1 ? Environment.NewLine + indent + "  " : ", ";
-        msg.AppendLine(String.Join(separator, triggers));
-      }
-    }
-
-    internal void CommitTriggers(DafnyOptions options) {
-      foreach (var q in quantifiers) {
-        CommitOne(options, q, quantifiers.Count > 1);
-      }
-    }
-  }
-}
diff --git a/Source/DafnyCore/Triggers/QuantifiersCollector.cs b/Source/DafnyCore/Triggers/QuantifiersCollector.cs
index 08975598cac..869640da766 100644
--- a/Source/DafnyCore/Triggers/QuantifiersCollector.cs
+++ b/Source/DafnyCore/Triggers/QuantifiersCollector.cs
@@ -5,45 +5,45 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.Boogie;
 using System.Collections.ObjectModel;
 using System.Diagnostics.Contracts;
+using JetBrains.Annotations;
 
 namespace Microsoft.Dafny.Triggers {
   internal class QuantifierCollector : TopDownVisitor<OldExpr/*?*/> {
     readonly ErrorReporter reporter;
     private readonly HashSet<Expression> quantifiers = new HashSet<Expression>();
     internal readonly Dictionary<Expression, HashSet<OldExpr>> exprsInOldContext = new Dictionary<Expression, HashSet<OldExpr>>();
-    internal readonly List<QuantifiersCollection> quantifierCollections = new List<QuantifiersCollection>();
+    internal readonly List<ComprehensionTriggerGenerator> quantifierCollections = new List<ComprehensionTriggerGenerator>();
 
     public QuantifierCollector(ErrorReporter reporter) {
       Contract.Requires(reporter != null);
       this.reporter = reporter;
     }
 
-    protected override bool VisitOneExpr(Expression expr, ref OldExpr/*?*/ enclosingOldContext) {
-      var e = expr as ComprehensionExpr;
+    public void AddComprehension(ComprehensionExpr comprehensionExpr, [CanBeNull] List<Expression> splitQuantifier) {
+      quantifiers.Add(comprehensionExpr);
+      if (splitQuantifier != null) {
+        var collection = splitQuantifier.OfType<ComprehensionExpr>();
+        quantifierCollections.Add(new ComprehensionTriggerGenerator(comprehensionExpr, collection, reporter));
+        quantifiers.UnionWith(splitQuantifier);
+      } else {
+        quantifierCollections.Add(new ComprehensionTriggerGenerator(comprehensionExpr, Enumerable.Repeat(comprehensionExpr, 1), reporter));
+      }
+    }
 
+    protected override bool VisitOneExpr(Expression expr, ref OldExpr/*?*/ enclosingOldContext) {
       // only consider quantifiers that are not empty (Bound.Vars.Count > 0)
-      if (e != null && e.BoundVars.Count > 0 && !quantifiers.Contains(e)) {
-        if (e is SetComprehension || e is MapComprehension) {
-          quantifiers.Add(e);
-          quantifierCollections.Add(new QuantifiersCollection(e, Enumerable.Repeat(e, 1), reporter));
-        } else if (e is ForallExpr || e is ExistsExpr) {
-          var quantifier = e as QuantifierExpr;
-          quantifiers.Add(quantifier);
-          if (quantifier.SplitQuantifier != null) {
-            var collection = quantifier.SplitQuantifier.Select(q => q as ComprehensionExpr).Where(q => q != null);
-            quantifierCollections.Add(new QuantifiersCollection(e, collection, reporter));
-            quantifiers.UnionWith(quantifier.SplitQuantifier);
-          } else {
-            quantifierCollections.Add(new QuantifiersCollection(e, Enumerable.Repeat(quantifier, 1), reporter));
-          }
+      if (expr is ComprehensionExpr e && e.BoundVars.Count > 0 && !quantifiers.Contains(e)) {
+        if (e is SetComprehension or MapComprehension) {
+          AddComprehension(e, null);
+        } else if (e is QuantifierExpr quantifier) {
+          AddComprehension(quantifier, quantifier.SplitQuantifier);
         }
       }
 
-      if (expr is OldExpr) {
-        enclosingOldContext = (OldExpr)expr;
+      if (expr is OldExpr oldExpr) {
+        enclosingOldContext = oldExpr;
       } else if (enclosingOldContext != null) { // FIXME be more restrctive on the type of stuff that we annotate
         // Add the association (expr, oldContext) to exprsInOldContext. However, due to chaining expressions,
         // expr may already be a key in exprsInOldContext.
@@ -61,8 +61,8 @@ protected override bool VisitOneExpr(Expression expr, ref OldExpr/*?*/ enclosing
     protected override bool VisitOneStmt(Statement stmt, ref OldExpr/*?*/ st) {
       if (stmt is ForallStmt) {
         ForallStmt s = (ForallStmt)stmt;
-        if (s.ForallExpressions != null) {
-          foreach (Expression expr in s.ForallExpressions) {
+        if (s.EffectiveEnsuresClauses != null) {
+          foreach (Expression expr in s.EffectiveEnsuresClauses) {
             VisitOneExpr(expr, ref st);
           }
         }
diff --git a/Source/DafnyCore/Triggers/SplitPartTriggerWriter.cs b/Source/DafnyCore/Triggers/SplitPartTriggerWriter.cs
new file mode 100644
index 00000000000..267375eae09
--- /dev/null
+++ b/Source/DafnyCore/Triggers/SplitPartTriggerWriter.cs
@@ -0,0 +1,229 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.Dafny.Triggers;
+
+/// <summary>
+/// Determines the triggers for a comprehension that resulted from splitting another one
+/// </summary>
+class SplitPartTriggerWriter {
+  public ComprehensionExpr Comprehension { get; set; }
+  public List<TriggerTerm> CandidateTerms { get; set; }
+  public List<TriggerCandidate> Candidates { get; set; }
+  private List<TriggerCandidate> RejectedCandidates { get; }
+  public List<Tuple<Expression, IdentifierExpr>> NamedExpressions { get; }
+  private List<TriggerMatch> loopingMatches;
+
+  private bool AllowsLoops {
+    get {
+      Contract.Requires(!(Comprehension is QuantifierExpr) || ((QuantifierExpr)Comprehension).SplitQuantifier == null); // Don't call this on a quantifier with a Split clause: it's not a real quantifier
+      // This is different from nowarn: it won't remove loops at all, even if another trigger is available.
+      return Attributes.Contains(Comprehension.Attributes, "matchingloop");
+    }
+  }
+
+  private bool CouldSuppressLoops { get; set; }
+
+  internal SplitPartTriggerWriter(ComprehensionExpr comprehension) {
+    this.Comprehension = comprehension;
+    this.RejectedCandidates = new List<TriggerCandidate>();
+    this.NamedExpressions = new();
+  }
+
+  internal void TrimInvalidTriggers() {
+    Contract.Requires(CandidateTerms != null);
+    Contract.Requires(Candidates != null);
+    Candidates = Candidates.Where(tr => tr.MentionsAll(Comprehension.BoundVars)).ToList();
+  }
+
+  public bool DetectAndFilterLoopingCandidates(ErrorReporter reporter) {
+    var looping = new List<TriggerCandidate>();
+    var loopingMatches = new List<TriggerMatch>();
+
+    var nonLoopingCandidates = new List<TriggerCandidate>();
+    foreach (var candidate in Candidates) {
+      var loopingSubterms = candidate.LoopingSubterms(Comprehension, reporter.Options).ToList();
+      if (loopingSubterms.Any()) {
+        looping.Add(candidate);
+        loopingMatches = loopingSubterms.ToList();
+        candidate.Annotation = "may loop with " + string.Join(", ",
+          loopingSubterms.Select(t => "\"" + Printer.ExprToString(reporter.Options, t.OriginalExpr) + "\""));
+      } else {
+        nonLoopingCandidates.Add(candidate);
+      }
+    }
+
+    CouldSuppressLoops = nonLoopingCandidates.Count > 0;
+    this.loopingMatches = loopingMatches;
+    if (!AllowsLoops && CouldSuppressLoops) {
+      Candidates = nonLoopingCandidates;
+      RejectedCandidates.AddRange(looping);
+    }
+
+    return looping.Count > 0;
+  }
+
+  public bool RewriteMatchingLoop(ErrorReporter reporter, ModuleDefinition module) {
+    if (!NeedsAutoTriggers() || !WantsMatchingLoopRewrite()) {
+      return false;
+    }
+
+    var triggersCollector = new TriggersCollector(new(),
+      reporter.Options, module);
+    // rewrite quantifier to avoid matching loops
+    // before:
+    //    assert forall i :: 0 <= i < a.Length-1 ==> a[i] <= a[i+1];
+    // after:
+    //    assert forall i,j :: j == i+1 ==> 0 <= i < a.Length-1 ==> a[i] <= a[j];
+    var substMap = new List<Tuple<Expression, IdentifierExpr>>();
+    foreach (var triggerMatch in loopingMatches) {
+      var e = triggerMatch.OriginalExpr;
+      if (triggersCollector.IsPotentialTriggerCandidate(e) && triggersCollector.IsTriggerKiller(e)) {
+        foreach (var sub in e.SubExpressions) {
+          if (triggersCollector.IsTriggerKiller(sub) && (!triggersCollector.IsPotentialTriggerCandidate(sub))) {
+            var entry = substMap.Find(x => ExprExtensions.ExpressionEq(sub, x.Item1));
+            if (entry == null) {
+              var newBv = new BoundVar(sub.Origin, "_t#" + substMap.Count, sub.Type);
+              var ie = new IdentifierExpr(sub.Origin, newBv.Name) { Var = newBv, Type = newBv.Type };
+              substMap.Add(new Tuple<Expression, IdentifierExpr>(sub, ie));
+            }
+          }
+        }
+      }
+    }
+
+    var expr = (QuantifierExpr)Comprehension;
+    if (substMap.Count > 0) {
+      var s = new ExprSubstituter(substMap);
+      expr = s.Substitute(Comprehension) as QuantifierExpr;
+      NamedExpressions.AddRange(substMap);
+    } else {
+      // make a copy of the expr
+      if (expr is ForallExpr) {
+        expr = new ForallExpr(expr.Origin, expr.BoundVars, expr.Range, expr.Term,
+          TriggerUtils.CopyAttributes(expr.Attributes)) { Type = expr.Type, Bounds = expr.Bounds };
+      } else {
+        expr = new ExistsExpr(expr.Origin, expr.BoundVars, expr.Range, expr.Term,
+          TriggerUtils.CopyAttributes(expr.Attributes)) { Type = expr.Type, Bounds = expr.Bounds };
+      }
+    }
+    var qq = expr;
+
+    Comprehension = qq;
+    Candidates.Clear();
+    CandidateTerms.Clear();
+    loopingMatches.Clear();
+    RejectedCandidates.Clear();
+    return true;
+
+    // don't rewrite the quantifier if we are not auto generate triggers.
+    // This is because rewriting introduces new boundvars and will cause
+    // user provided triggers not mention all boundvars
+  }
+
+  // TODO Check whether this makes verification faster
+  public void FilterStrongCandidates() {
+    var newCandidates = new List<TriggerCandidate>();
+    foreach (var candidate in Candidates) {
+      var weakerCandidates = Candidates.Where(candidate.IsStrongerThan).ToList();
+      if (weakerCandidates.Any()) {
+        RejectedCandidates.Add(candidate);
+        candidate.Annotation = "more specific than " + string.Join(", ", weakerCandidates);
+      } else {
+        newCandidates.Add(candidate);
+      }
+    }
+    Candidates = newCandidates;
+  }
+
+  public void CommitTrigger(ErrorReporter errorReporter, int? splitPartIndex, SystemModuleManager systemModuleManager) {
+    bool suppressWarnings = Attributes.Contains(Comprehension.Attributes, "nowarn");
+    var reportingToken = Comprehension.Origin;
+    var warningLevel = suppressWarnings ? ErrorLevel.Info : ErrorLevel.Warning;
+
+    if (!WantsAutoTriggers()) {
+      // NOTE: split and autotriggers attributes are passed down to Boogie
+      errorReporter.Message(MessageSource.Rewriter, ErrorLevel.Info, null, reportingToken,
+        "The attribute {:autotriggers false} may cause brittle verification. " +
+        "It's better to remove this attribute, or as a second option, manually define a trigger using {:trigger}. " +
+        "For more information, see the section quantifier instantiation rules in the reference manual.");
+    }
+
+    if (!NeedsAutoTriggers()) {
+      DisableEmptyTriggers(Comprehension.Attributes, "trigger");
+      return;
+    }
+
+    AddTriggerAttribute(systemModuleManager);
+
+    if (Attributes.Contains(Comprehension.Attributes, "auto_generated")) {
+      return;
+    }
+
+    string InfoFirstLineEnd(int count) {
+      return count < 2 ? " " : "\n  ";
+    }
+
+    var messages = new List<string>();
+    if (splitPartIndex != null) {
+      messages.Add($"Part #{splitPartIndex} is '{Comprehension.Term}'");
+    }
+    if (Candidates.Any()) {
+      var subst = Util.Comma("", NamedExpressions, pair => $" where {pair.Item2} := {pair.Item1}");
+      messages.Add($"Selected triggers:{InfoFirstLineEnd(Candidates.Count)}{string.Join(", ", Candidates)}{subst}");
+    }
+    if (RejectedCandidates.Any()) {
+      messages.Add($"Rejected triggers:{InfoFirstLineEnd(RejectedCandidates.Count)}{string.Join("\n  ", RejectedCandidates)}");
+    }
+
+    if (messages.Any()) {
+      errorReporter.Message(MessageSource.Rewriter, ErrorLevel.Info, null, reportingToken, string.Join("\n", messages));
+    }
+
+    if (!CandidateTerms.Any() || !Candidates.Any()) {
+      errorReporter.Message(MessageSource.Rewriter, warningLevel, null, reportingToken,
+        "Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. " +
+        $"To silence this warning, add an explicit trigger using the {{:trigger}} attribute. " +
+        "For more information, see the section quantifier instantiation rules in the reference manual.");
+    } else if (!CouldSuppressLoops && !AllowsLoops) {
+      errorReporter.Message(MessageSource.Rewriter, warningLevel, null, reportingToken,
+        "Triggers were added to this quantifier that may introduce matching loops, which may cause brittle verification. " +
+        $"To silence this warning, add an explicit trigger using the {{:trigger}} attribute. " +
+        "For more information, see the section quantifier instantiation rules in the reference manual.");
+    }
+  }
+
+  public static void DisableEmptyTriggers(Attributes attribs, String attrName) {
+    foreach (var attr in attribs.AsEnumerable()) {
+      if (attr.Name == attrName && attr.Args.Count == 0) {
+        // Remove an empty trigger attribute, so it does not crash Boogie,
+        // and effectively becomes a way to silence a Dafny warning
+        attr.Name = $"deleted-{attrName}";
+      }
+    }
+  }
+
+  private void AddTriggerAttribute(SystemModuleManager systemModuleManager) {
+    foreach (var candidate in Candidates) {
+      Comprehension.Attributes = new Attributes("trigger",
+        candidate.Terms.ConvertAll(t => Expression.WrapAsParsedStructureIfNecessary(t.Expr, systemModuleManager)),
+        Comprehension.Attributes);
+    }
+  }
+
+  private bool WantsAutoTriggers() {
+    bool wantsAutoTriggers = true;
+    return !Attributes.ContainsBool(Comprehension.Attributes, "autotriggers", ref wantsAutoTriggers) || wantsAutoTriggers;
+  }
+
+  private bool NeedsAutoTriggers() {
+    return !Attributes.Contains(Comprehension.Attributes, "trigger") && WantsAutoTriggers();
+  }
+
+  bool WantsMatchingLoopRewrite() {
+    bool wantsMatchingLoopRewrite = true;
+    return (!Attributes.ContainsBool(Comprehension.Attributes, "matchinglooprewrite", ref wantsMatchingLoopRewrite) || wantsMatchingLoopRewrite) && WantsAutoTriggers();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Triggers/TriggerAnnotation.cs b/Source/DafnyCore/Triggers/TriggerAnnotation.cs
new file mode 100644
index 00000000000..81e6d73ff13
--- /dev/null
+++ b/Source/DafnyCore/Triggers/TriggerAnnotation.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Microsoft.Dafny.Triggers;
+
+internal class TriggerAnnotation {
+  public readonly bool IsTriggerKiller;
+  internal readonly ISet<IVariable> Variables;
+  internal readonly List<TriggerTerm> PrivateTerms;
+  internal readonly List<TriggerTerm> ExportedTerms;
+
+  internal TriggerAnnotation(bool isTriggerKiller,
+    IEnumerable<IVariable> variables,
+    IEnumerable<TriggerTerm> allTerms,
+    IEnumerable<TriggerTerm> privateTerms = null) {
+    this.IsTriggerKiller = isTriggerKiller;
+    this.Variables = new HashSet<IVariable>(variables);
+    this.PrivateTerms = new List<TriggerTerm>(privateTerms ?? Enumerable.Empty<TriggerTerm>());
+    this.ExportedTerms = new List<TriggerTerm>(allTerms == null ? Enumerable.Empty<TriggerTerm>() : allTerms.Except(this.PrivateTerms));
+  }
+
+  public override string ToString() {
+    StringBuilder sb = new StringBuilder();
+    string indent = "  {0}", nindent = "\n  - {0}", subindent = "\n    * {0}";
+
+    sb.AppendFormat(indent, IsTriggerKiller);
+
+    sb.AppendFormat(nindent, "Variables:");
+    foreach (var bv in Variables) {
+      sb.AppendFormat(subindent, bv.Name);
+    }
+
+    sb.AppendFormat(nindent, "Exported terms:");
+    foreach (var term in ExportedTerms) {
+      sb.AppendFormat(subindent, term);
+    }
+
+    if (PrivateTerms.Any()) {
+      sb.AppendFormat(nindent, "Private terms:");
+      foreach (var term in PrivateTerms) {
+        sb.AppendFormat(subindent, term);
+      }
+    }
+
+    return sb.ToString();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Triggers/TriggerAnnotationsCache.cs b/Source/DafnyCore/Triggers/TriggerAnnotationsCache.cs
new file mode 100644
index 00000000000..2632735d5bc
--- /dev/null
+++ b/Source/DafnyCore/Triggers/TriggerAnnotationsCache.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+
+namespace Microsoft.Dafny.Triggers;
+
+internal class TriggerAnnotationsCache {
+  public readonly Dictionary<Expression, HashSet<OldExpr>> ExpressionsInOldContext;
+  public readonly Dictionary<Expression, TriggerAnnotation> Annotations;
+
+  /// <summary>
+  /// For certain operations, the TriggersCollector class needs to know whether
+  /// a particular expression is under an old(...) wrapper. This is in particular
+  /// true for generating trigger terms (but it is not for checking whether something
+  /// is a trigger killer, so passing an empty set here for that case would be fine.
+  /// </summary>
+  public TriggerAnnotationsCache(Dictionary<Expression, HashSet<OldExpr>> expressionsInOldContext) {
+    this.ExpressionsInOldContext = expressionsInOldContext;
+    Annotations = new Dictionary<Expression, TriggerAnnotation>();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Triggers/TriggerCandidate.cs b/Source/DafnyCore/Triggers/TriggerCandidate.cs
new file mode 100644
index 00000000000..9a7a7aebf41
--- /dev/null
+++ b/Source/DafnyCore/Triggers/TriggerCandidate.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.Dafny.Triggers;
+
+/// <summary>
+/// A trigger consist of a number of terms
+/// </summary>
+class TriggerCandidate {
+  internal List<TriggerTerm> Terms { get; set; }
+  internal string Annotation { get; set; }
+
+  internal TriggerCandidate(List<TriggerTerm> terms) {
+    this.Terms = terms;
+  }
+
+  public TriggerCandidate(TriggerCandidate candidate) {
+    this.Terms = candidate.Terms;
+  }
+
+  internal bool MentionsAll(List<BoundVar> vars) {
+    return vars.All(x => Terms.Any(term => term.Variables.Contains(x)));
+  }
+
+  private string Repr => String.Join(", ", Terms);
+
+  public override string ToString() {
+    return "{" + Repr + "}" + (String.IsNullOrWhiteSpace(Annotation) ? "" : " (" + Annotation + ")");
+  }
+
+  /// <summary>
+  /// See section 2.2 of "Trigger Selection Strategies to Stabilize Program Verifiers" to learn
+  /// how we find potentially looping subterms.
+  /// 
+  /// Roughly, this heuristic flags a trigger as potentially looping if
+  /// instantiating the quantifier may lead to a ground term that again matches the trigger
+  /// </summary>
+  internal IEnumerable<TriggerMatch> LoopingSubterms(ComprehensionExpr quantifier, DafnyOptions options) {
+    Contract.Requires(!(quantifier is QuantifierExpr) || ((QuantifierExpr)quantifier).SplitQuantifier == null); // Don't call this on a quantifier with a Split clause: it's not a real quantifier
+    var matchingSubterms = MatchingSubterms(quantifier);
+    var boundVars = new HashSet<BoundVar>(quantifier.BoundVars);
+    return matchingSubterms.Where(tm => tm.CouldCauseLoops(Terms, boundVars, options));
+  }
+
+  private List<TriggerMatch> MatchingSubterms(ComprehensionExpr quantifier) {
+    Contract.Requires(!(quantifier is QuantifierExpr) || ((QuantifierExpr)quantifier).SplitQuantifier == null); // Don't call this on a quantifier with a Split clause: it's not a real quantifier
+    return Terms.SelectMany(term => quantifier.SubexpressionsMatchingTrigger(term.Expr)).Deduplicate(TriggerMatch.Eq);
+  }
+
+  internal bool IsStrongerThan(TriggerCandidate that) {
+    if (this == that) {
+      return false;
+    }
+
+    var hasStrictlyStrongerTerm = false;
+    foreach (var t in Terms) {
+      var comparison = that.Terms.Select(t.CompareTo).Max();
+
+      // All terms of `this` must be at least as strong as a term of `that`
+      if (comparison == TriggerTerm.TermComparison.NotStronger) { return false; }
+
+      // Did we find a strictly stronger term?
+      hasStrictlyStrongerTerm = hasStrictlyStrongerTerm || comparison == TriggerTerm.TermComparison.Stronger;
+    }
+
+    return hasStrictlyStrongerTerm;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Triggers/TriggerExtensions.cs b/Source/DafnyCore/Triggers/TriggerExtensions.cs
index 6da249d4650..6a79257962e 100644
--- a/Source/DafnyCore/Triggers/TriggerExtensions.cs
+++ b/Source/DafnyCore/Triggers/TriggerExtensions.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Text;
+using DafnyCore.Generic;
 
 namespace Microsoft.Dafny.Triggers {
   internal static class DeduplicateExtension {
@@ -25,29 +26,8 @@ public static List<T> Deduplicate<T>(this IEnumerable<T> seq, Func<T, T, bool> e
     }
   }
 
-  internal struct TriggerMatch {
-    internal Expression Expr;
-    internal Expression OriginalExpr;
-    internal Dictionary<IVariable, Expression> Bindings;
-
-    internal static bool Eq(TriggerMatch t1, TriggerMatch t2) {
-      return ExprExtensions.ExpressionEq(t1.Expr, t2.Expr);
-    }
-
-    /// <summary>
-    ///  This method checks whether this match could actually cause a loop, given a set of terms participating in a trigger;
-    ///  to compute an answer, we match the Expr of this match against the Exprs of each of these term, allowing for harmless
-    ///  variations. If any of these tests does match, this term likely won't cause a loop.
-    ///  The boundVars list is useful to determine that forall x :: P(x) == P(y+z) does not loop.
-    /// </summary>
-    internal bool CouldCauseLoops(List<TriggerTerm> terms, ISet<BoundVar> boundVars, DafnyOptions options) {
-      var expr = Expr;
-      return !terms.Any(term => term.Expr.ExpressionEqModuloExpressionsNotInvolvingBoundVariables(expr, boundVars, options));
-    }
-  }
-
   internal static class ExprExtensions {
-    internal static bool IsInlineable(this LetExpr expr) {
+    private static bool IsInlineable(this LetExpr expr) {
       return expr.LHSs.All(p => p.Var != null) && expr.Exact;
     }
 
@@ -56,7 +36,7 @@ internal static IEnumerable<Expression> AllSubExpressions(this Expression expr,
 
       if (inlineLets && expr is LetExpr && ((LetExpr)expr).IsInlineable()) {
         var le = (LetExpr)expr;
-        foreach (var subexpr in AllSubExpressions(Translator.InlineLet(le), wrapOld, strict, inlineLets)) {
+        foreach (var subexpr in AllSubExpressions(BoogieGenerator.InlineLet(le), wrapOld, strict, inlineLets)) {
           yield return subexpr;
         }
         // If strict is false, then the recursive call will already yield a copy of (the inlined version) of expr,
@@ -103,7 +83,8 @@ internal static bool ExpressionEq(this Expression expr1, Expression expr2) {
       expr1 = expr1.Resolved;
       expr2 = expr2.Resolved;
 
-      return ShallowEq_Top(expr1, expr2) && TriggerUtils.SameLists(expr1.SubExpressions, expr2.SubExpressions, (e1, e2) => ExpressionEq(e1, e2));
+      return ShallowEq_Top(expr1, expr2) &&
+             expr1.SubExpressions.SequenceEqual(expr2.SubExpressions, new PredicateEqualityComparer<Expression>(ExpressionEq));
     }
 
     internal static bool ExpressionEqModuloExpressionsNotInvolvingBoundVariables(this Expression expr1, Expression expr2, ISet<BoundVar> boundVars, DafnyOptions options) {
@@ -120,8 +101,8 @@ internal static bool ExpressionEqModuloExpressionsNotInvolvingBoundVariables(thi
         }
       }
 
-      return ShallowEq_Top(expr1, expr2) && TriggerUtils.SameLists(expr1.SubExpressions,
-        expr2.SubExpressions, (e1, e2) => ExpressionEqModuloExpressionsNotInvolvingBoundVariables(e1, e2, boundVars, options));
+      Func<Expression, Expression, bool> comparer = (e1, e2) => ExpressionEqModuloExpressionsNotInvolvingBoundVariables(e1, e2, boundVars, options);
+      return ShallowEq_Top(expr1, expr2) && expr1.SubExpressions.SequenceEqual(expr2.SubExpressions, new PredicateEqualityComparer<Expression>(comparer));
     }
 
     internal static bool MatchesTrigger(this Expression expr, Expression trigger, ISet<BoundVar> holes, Dictionary<IVariable, Expression> bindings) {
@@ -142,7 +123,8 @@ internal static bool MatchesTrigger(this Expression expr, Expression trigger, IS
         }
       }
 
-      return ShallowEq_Top(expr, trigger) && TriggerUtils.SameLists(expr.SubExpressions, trigger.SubExpressions, (e1, e2) => MatchesTrigger(e1, e2, holes, bindings));
+      Func<Expression, Expression, bool> comparer = (e1, e2) => MatchesTrigger(e1, e2, holes, bindings);
+      return ShallowEq_Top(expr, trigger) && expr.SubExpressions.SequenceEqual(trigger.SubExpressions, new PredicateEqualityComparer<Expression>(comparer));
     }
 
     private static TriggerMatch? MatchAgainst(this Expression expr, Expression trigger, IEnumerable<BoundVar> holes, Expression originalExpr) {
@@ -156,12 +138,13 @@ internal static bool MatchesTrigger(this Expression expr, Expression trigger, IS
 
     internal static IEnumerable<TriggerMatch> SubexpressionsMatchingTrigger(this ComprehensionExpr quantifier, Expression trigger) {
       return quantifier.AllSubExpressions(true, true, true)
-        .Select(e => TriggerUtils.PrepareExprForInclusionInTrigger(e).MatchAgainst(trigger, quantifier.BoundVars, e))
+        .Select(e => TriggersCollector.PrepareExprForInclusionInTrigger(e).MatchAgainst(trigger, quantifier.BoundVars, e))
         .Where(e => e.HasValue).Select(e => e.Value);
     }
 
     private static bool ShallowSameAttributes(Attributes attributes1, Attributes attributes2) {
-      return TriggerUtils.SameLists(attributes1.AsEnumerable(), attributes2.AsEnumerable(), ShallowSameSingleAttribute);
+      Func<Attributes, Attributes, bool> comparer = ShallowSameSingleAttribute;
+      return attributes1.AsEnumerable().SequenceEqual(attributes2.AsEnumerable(), new PredicateEqualityComparer<Attributes>(comparer));
     }
 
     private static bool ShallowSameSingleAttribute(Attributes arg1, Attributes arg2) {
@@ -171,7 +154,6 @@ private static bool ShallowSameSingleAttribute(Attributes arg1, Attributes arg2)
     private static bool SameBoundVar(IVariable arg1, IVariable arg2) {
       return arg1 == arg2 ||
              (arg1.Name == arg2.Name &&
-              arg1.CompileName == arg2.CompileName &&
               arg1.DisplayName == arg2.DisplayName &&
               arg1.UniqueName == arg2.UniqueName &&
               arg1.IsGhost == arg2.IsGhost &&
@@ -286,12 +268,7 @@ private static bool ShallowEq(WildcardExpr expr1, WildcardExpr expr2) {
     }
 
     private static bool ShallowEq(LambdaExpr expr1, LambdaExpr expr2) {
-#if THROW_UNSUPPORTED_COMPARISONS
-      Contract.Assume(false); // This kind of expression never appears in a trigger
-      throw new NotImplementedException();
-#else
-      return false;
-#endif
+      return true;
     }
 
     private static bool ShallowEq(MapComprehension expr1, MapComprehension expr2) {
@@ -334,7 +311,8 @@ private static bool ShallowEq(QuantifierExpr expr1, QuantifierExpr expr2) {
     }
 
     private static bool ShallowEq(ComprehensionExpr expr1, ComprehensionExpr expr2) {
-      if (!TriggerUtils.SameLists(expr1.BoundVars, expr2.BoundVars, SameBoundVar) ||
+      Func<BoundVar, BoundVar, bool> comparer = SameBoundVar;
+      if (!expr1.BoundVars.SequenceEqual(expr2.BoundVars, new PredicateEqualityComparer<BoundVar>(comparer)) ||
           !ShallowSameAttributes(expr1.Attributes, expr2.Attributes) ||
           // Filled in during resolution: !SameLists(expr1.Bounds, expr2.Bounds, ReferenceCompare) ||
           //                              !SameLists(expr1.MissingBounds, expr2.MissingBounds, SameBoundVar) ||
@@ -430,10 +408,12 @@ private static bool ShallowEq(SeqSelectExpr expr1, SeqSelectExpr expr2) {
     }
 
     private static bool ShallowEq(MemberSelectExpr expr1, MemberSelectExpr expr2) {
+      Func<Type, Type, bool> comparer = TypeEq;
+      Func<Type, Type, bool> comparer1 = TypeEq;
       return expr1.MemberName == expr2.MemberName &&
              expr1.Member == expr2.Member &&
-             TriggerUtils.SameLists(expr1.TypeApplication_AtEnclosingClass, expr2.TypeApplication_AtEnclosingClass, TypeEq) &&
-             TriggerUtils.SameLists(expr1.TypeApplication_JustMember, expr2.TypeApplication_JustMember, TypeEq);
+             expr1.TypeApplicationAtEnclosingClass.SequenceEqual(expr2.TypeApplicationAtEnclosingClass, new PredicateEqualityComparer<Type>(comparer)) &&
+             expr1.TypeApplicationJustMember.SequenceEqual(expr2.TypeApplicationJustMember, new PredicateEqualityComparer<Type>(comparer1));
     }
 
     internal static bool TypeEq(Type type1, Type type2) {
@@ -498,11 +478,12 @@ private static bool ShallowEq(ThisExpr expr1, ThisExpr expr2) {
     }
 
     private static bool ShallowEq(DatatypeValue expr1, DatatypeValue expr2) {
+      Func<Type, Type, bool> comparer = TypeEq;
       return // Implied by Ctor equality: expr1.DatatypeName == expr2.DatatypeName &&
              // Implied by Ctor equality: expr1.MemberName == expr2.MemberName &&
              expr1.Ctor == expr2.Ctor &&
              // Contextual information: expr1.IsCoCall == expr2.IsCoCall &&
-             TriggerUtils.SameLists(expr1.InferredTypeArgs, expr2.InferredTypeArgs, TypeEq);
+             expr1.InferredTypeArgs.SequenceEqual(expr2.InferredTypeArgs, new PredicateEqualityComparer<Type>(comparer));
     }
 
     private static bool ShallowEq(StringLiteralExpr expr1, StringLiteralExpr expr2) {
diff --git a/Source/DafnyCore/Triggers/TriggerMatch.cs b/Source/DafnyCore/Triggers/TriggerMatch.cs
new file mode 100644
index 00000000000..005b5b6072b
--- /dev/null
+++ b/Source/DafnyCore/Triggers/TriggerMatch.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Dafny.Triggers;
+
+internal struct TriggerMatch {
+  internal Expression Expr;
+  internal Expression OriginalExpr;
+  internal Dictionary<IVariable, Expression> Bindings;
+
+  internal static bool Eq(TriggerMatch t1, TriggerMatch t2) {
+    return ExprExtensions.ExpressionEq(t1.Expr, t2.Expr);
+  }
+
+  /// <summary>
+  ///  This method checks whether this match could actually cause a loop, given a set of terms participating in a trigger;
+  ///  to compute an answer, we match the Expr of this match against the Exprs of each of these term, allowing for harmless
+  ///  variations. If any of these tests does match, this term likely won't cause a loop.
+  ///  The boundVars list is useful to determine that forall x :: P(x) == P(y+z) does not loop.
+  /// </summary>
+  internal bool CouldCauseLoops(List<TriggerTerm> terms, ISet<BoundVar> boundVars, DafnyOptions options) {
+    var expr = Expr;
+    return !terms.Any(term => term.Expr.ExpressionEqModuloExpressionsNotInvolvingBoundVariables(expr, boundVars, options));
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Triggers/TriggerTerm.cs b/Source/DafnyCore/Triggers/TriggerTerm.cs
new file mode 100644
index 00000000000..3324af277b4
--- /dev/null
+++ b/Source/DafnyCore/Triggers/TriggerTerm.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Dafny.Triggers;
+
+/// <summary>
+/// A trigger may consist of several terms. A term must match with a ground term for the trigger to be active.
+/// </summary>
+internal class TriggerTerm {
+  internal Expression Expr { get; init; }
+  internal Expression OriginalExpr { get; set; }
+  internal ISet<IVariable> Variables { get; init; }
+  internal IEnumerable<BoundVar> BoundVars => Variables.Select(v => v as BoundVar).Where(v => v != null);
+
+  public override string ToString() {
+    return Printer.ExprToString(DafnyOptions.DefaultImmutableOptions, Expr);
+    // NOTE: Using OriginalExpr here could cause some confusion:
+    // for example, {a !in b} is a binary expression, yielding
+    // trigger {a in b}. Saying the trigger is a !in b would be
+    // rather misleading.
+  }
+
+  internal enum TermComparison {
+    SameStrength = 0, Stronger = 1, NotStronger = -1
+  }
+
+  internal TermComparison CompareTo(TriggerTerm other) {
+    if (this == other) {
+      return TermComparison.SameStrength;
+    } else if (Expr.AllSubExpressions(true, true).Any(other.Expr.ExpressionEq)) {
+      return TermComparison.Stronger;
+    } else {
+      return TermComparison.NotStronger;
+    }
+  }
+
+  internal static bool Eq(TriggerTerm t1, TriggerTerm t2) {
+    return t1.Expr.ExpressionEq(t2.Expr);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Triggers/TriggerTermSet.cs b/Source/DafnyCore/Triggers/TriggerTermSet.cs
new file mode 100644
index 00000000000..8553eabf3e4
--- /dev/null
+++ b/Source/DafnyCore/Triggers/TriggerTermSet.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Dafny.Triggers;
+
+/// <summary>
+/// To generate triggers, we collect sets of terms. Each set may become a trigger candidate.
+/// </summary>
+internal class TriggerTermSet {
+  public bool IsRedundant { get; private set; }
+  private List<TriggerTerm> Terms { get; set; }
+
+  private ISet<BoundVar> variables;
+  private Dictionary<BoundVar, TriggerTerm> termOwningAUniqueVar;
+  private Dictionary<TriggerTerm, ISet<BoundVar>> uniqueVarsOwnedByATerm;
+
+  private int Count => Terms.Count;
+
+  private TriggerTermSet() { }
+
+  internal TriggerCandidate ToTriggerCandidate() {
+    return new TriggerCandidate(Terms);
+  }
+
+  private static IEnumerable<TriggerTermSet> ComputeTriggerCandidatesTerms(SinglyLinkedList<TriggerTerm> source,
+    ISet<BoundVar> relevantVariables) {
+    return source switch {
+      Cons<TriggerTerm> triggerTerms => ComputeTriggerCandidatesTerms(triggerTerms.Tail, relevantVariables).SelectMany(
+        child => {
+          var newSet = child.CopyWithAdd(triggerTerms.Head, relevantVariables);
+          return !newSet.IsRedundant ? new[] { newSet, child } : new[] { child };
+        }),
+      Nil<TriggerTerm> => new[] { Empty() },
+      _ => throw new ArgumentOutOfRangeException(nameof(source))
+    };
+  }
+
+  internal static IEnumerable<TriggerTermSet> ComputeNonEmptyTriggerCandidatesTerms(SinglyLinkedList<TriggerTerm> source, IEnumerable<BoundVar> relevantVariables) {
+    return ComputeTriggerCandidatesTerms(source, new HashSet<BoundVar>(relevantVariables)).Where(subset => subset.Count > 0);
+  }
+
+  private static TriggerTermSet Empty() {
+    var newSet = new TriggerTermSet {
+      IsRedundant = false,
+      Terms = new List<TriggerTerm>(),
+      variables = new HashSet<BoundVar>(),
+      termOwningAUniqueVar = new Dictionary<BoundVar, TriggerTerm>(),
+      uniqueVarsOwnedByATerm = new Dictionary<TriggerTerm, ISet<BoundVar>>()
+    };
+    return newSet;
+  }
+
+  /// <summary>
+  /// Simple formulas like [P0(i) && P1(i) && P2(i) && P3(i) && P4(i)] yield very
+  /// large numbers of multi-triggers, most of which are useless. As it copies its
+  /// argument, this method updates various datastructures that allow it to
+  /// efficiently track ownership relations between formulae and bound variables,
+  /// and sets the IsRedundant flag of the returned set, allowing the caller to
+  /// discard that set of terms, and the ones that would have been built on top of
+  /// it, thus ensuring that the only sets of terms produced in the end are sets
+  /// of terms in which each element contributes (owns) at least one variable.
+  ///
+  /// Note that this is trickier than just checking every term for new variables;
+  /// indeed, a new term that does bring new variables in can make an existing
+  /// term redundant (see redundancy-detection-does-its-job-properly.dfy).
+  /// </summary>
+  private TriggerTermSet CopyWithAdd(TriggerTerm term, IEnumerable<BoundVar> relevantVariables) {
+    var copy = new TriggerTermSet();
+    copy.Terms = new List<TriggerTerm>(Terms);
+    copy.variables = new HashSet<BoundVar>(variables);
+    copy.termOwningAUniqueVar = new Dictionary<BoundVar, TriggerTerm>(termOwningAUniqueVar);
+    copy.uniqueVarsOwnedByATerm = new Dictionary<TriggerTerm, ISet<BoundVar>>(uniqueVarsOwnedByATerm);
+
+    copy.Terms.Add(term);
+
+    var varsInNewTerm = new HashSet<BoundVar>(term.BoundVars);
+    varsInNewTerm.IntersectWith(relevantVariables);
+
+    var ownedByNewTerm = new HashSet<BoundVar>();
+
+    // Check #0: does this term bring anything new?
+    copy.IsRedundant = IsRedundant || varsInNewTerm.All(bv => copy.variables.Contains(bv));
+    copy.variables.UnionWith(varsInNewTerm);
+
+    // Check #1: does this term claiming ownership of all its variables cause another term to become useless?
+    foreach (var v in varsInNewTerm) {
+      if (copy.termOwningAUniqueVar.TryGetValue(v, out var originalOwner)) {
+        var alsoOwnedByOriginalOwner = copy.uniqueVarsOwnedByATerm[originalOwner];
+        alsoOwnedByOriginalOwner.Remove(v);
+        if (!alsoOwnedByOriginalOwner.Any()) {
+          copy.IsRedundant = true;
+        }
+      } else {
+        ownedByNewTerm.Add(v);
+        copy.termOwningAUniqueVar[v] = term;
+      }
+    }
+
+    // Actually claim ownership
+    copy.uniqueVarsOwnedByATerm[term] = ownedByNewTerm;
+
+    return copy;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Triggers/TriggerUtils.cs b/Source/DafnyCore/Triggers/TriggerUtils.cs
index 9034be9f275..78f16e867be 100644
--- a/Source/DafnyCore/Triggers/TriggerUtils.cs
+++ b/Source/DafnyCore/Triggers/TriggerUtils.cs
@@ -5,127 +5,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Linq;
-using System.Text;
 
 namespace Microsoft.Dafny.Triggers {
-  class TriggerUtils {
-    internal static List<T> CopyAndAdd<T>(List<T> seq, T elem) {
-      var copy = new List<T>(seq);
-      copy.Add(elem);
-      return copy;
-    }
-
+  internal static class TriggerUtils {
     public static Attributes CopyAttributes(Attributes source) {
-      if (source == null) {
-        return null;
-      } else {
-        return new Attributes(source.Name, source.Args, CopyAttributes(source.Prev));
-      }
-    }
-
-    internal class SetOfTerms {
-      internal bool IsRedundant { get; private set; }
-      internal List<TriggerTerm> Terms { get; set; }
-
-      private ISet<BoundVar> variables;
-      private Dictionary<BoundVar, TriggerTerm> termOwningAUniqueVar;
-      private Dictionary<TriggerTerm, ISet<BoundVar>> uniqueVarsOwnedByATerm;
-
-      public int Count { get { return Terms.Count; } }
-
-      private SetOfTerms() { }
-
-      internal TriggerCandidate ToTriggerCandidate() {
-        return new TriggerCandidate(Terms);
-      }
-
-      internal static SetOfTerms Empty() {
-        var newSet = new SetOfTerms();
-        newSet.IsRedundant = false;
-        newSet.Terms = new List<TriggerTerm>();
-        newSet.variables = new HashSet<BoundVar>();
-        newSet.termOwningAUniqueVar = new Dictionary<BoundVar, TriggerTerm>();
-        newSet.uniqueVarsOwnedByATerm = new Dictionary<TriggerTerm, ISet<BoundVar>>();
-        return newSet;
-      }
-
-      /// <summary>
-      /// Simple formulas like [P0(i) && P1(i) && P2(i) && P3(i) && P4(i)] yield very
-      /// large numbers of multi-triggers, most of which are useless. As it copies its
-      /// argument, this method updates various datastructures that allow it to
-      /// efficiently track ownership relations between formulae and bound variables,
-      /// and sets the IsRedundant flag of the returned set, allowing the caller to
-      /// discard that set of terms, and the ones that would have been built on top of
-      /// it, thus ensuring that the only sets of terms produced in the end are sets
-      /// of terms in which each element contributes (owns) at least one variable.
-      ///
-      /// Note that this is trickier than just checking every term for new variables;
-      /// indeed, a new term that does bring new variables in can make an existing
-      /// term redundant (see redundancy-detection-does-its-job-properly.dfy).
-      /// </summary>
-      internal SetOfTerms CopyWithAdd(TriggerTerm term, ISet<BoundVar> relevantVariables) {
-        var copy = new SetOfTerms();
-        copy.Terms = new List<TriggerTerm>(Terms);
-        copy.variables = new HashSet<BoundVar>(variables);
-        copy.termOwningAUniqueVar = new Dictionary<BoundVar, TriggerTerm>(termOwningAUniqueVar);
-        copy.uniqueVarsOwnedByATerm = new Dictionary<TriggerTerm, ISet<BoundVar>>(uniqueVarsOwnedByATerm);
-
-        copy.Terms.Add(term);
-
-        var varsInNewTerm = new HashSet<BoundVar>(term.BoundVars);
-        varsInNewTerm.IntersectWith(relevantVariables);
-
-        var ownedByNewTerm = new HashSet<BoundVar>();
-
-        // Check #0: does this term bring anything new?
-        copy.IsRedundant = IsRedundant || varsInNewTerm.All(bv => copy.variables.Contains(bv));
-        copy.variables.UnionWith(varsInNewTerm);
-
-        // Check #1: does this term claiming ownership of all its variables cause another term to become useless?
-        foreach (var v in varsInNewTerm) {
-          if (copy.termOwningAUniqueVar.TryGetValue(v, out var originalOwner)) {
-            var alsoOwnedByOriginalOwner = copy.uniqueVarsOwnedByATerm[originalOwner];
-            alsoOwnedByOriginalOwner.Remove(v);
-            if (!alsoOwnedByOriginalOwner.Any()) {
-              copy.IsRedundant = true;
-            }
-          } else {
-            ownedByNewTerm.Add(v);
-            copy.termOwningAUniqueVar[v] = term;
-          }
-        }
-
-        // Actually claim ownership
-        copy.uniqueVarsOwnedByATerm[term] = ownedByNewTerm;
-
-        return copy;
-      }
-    }
-
-    internal static IEnumerable<SetOfTerms> AllSubsets(IList<TriggerTerm> source, Func<SetOfTerms, TriggerTerm, bool> predicate, int offset, ISet<BoundVar> relevantVariables) {
-      if (offset >= source.Count) {
-        yield return SetOfTerms.Empty();
-        yield break;
-      }
-
-      foreach (var subset in AllSubsets(source, predicate, offset + 1, relevantVariables)) {
-        var newSet = subset.CopyWithAdd(source[offset], relevantVariables);
-        if (!newSet.IsRedundant && predicate(subset, source[offset])) { // Fixme remove the predicate?
-          yield return newSet;
-        }
-        yield return subset;
-      }
-    }
-
-    internal static IEnumerable<SetOfTerms> AllNonEmptySubsets(IList<TriggerTerm> source, Func<SetOfTerms, TriggerTerm, bool> predicate, IEnumerable<BoundVar> relevantVariables) {
-      foreach (var subset in AllSubsets(source, predicate, 0, new HashSet<BoundVar>(relevantVariables))) {
-        if (subset.Count > 0) {
-          yield return subset;
-        }
-      }
+      return source == null ? null : new Attributes(source.Name, source.Args, CopyAttributes(source.Prev));
     }
 
     internal static List<T> MergeAlterFirst<T>(List<T> a, List<T> b) {
@@ -142,149 +28,16 @@ internal static ISet<T> MergeAlterFirst<T>(ISet<T> a, ISet<T> b) {
       return a;
     }
 
-    internal static bool SameLists<T>(IEnumerable<T> list1, IEnumerable<T> list2, Func<T, T, bool> comparer) {
-      if (ReferenceEquals(list1, list2)) {
-        return true;
-      } else if ((list1 == null) != (list2 == null)) {
-        return false;
-      }
-
-      var it1 = list1.GetEnumerator();
-      var it2 = list2.GetEnumerator();
-      bool it1_has, it2_has;
-      bool acc = true;
-
-      do {
-        it1_has = it1.MoveNext();
-        it2_has = it2.MoveNext();
-
-        if (it1_has == true && it2_has == true) {
-          acc = acc && comparer(it1.Current, it2.Current);
-        }
-      } while (it1_has && it2_has);
-
-      return it1_has == it2_has && acc;
-    }
-
-    internal static IEnumerable<T> Filter<T, U>(IEnumerable<T> elements, Func<T, U> Converter, Func<T, U, bool> predicate, Action<T, U> reject) {
-      var positive = new List<T>();
-      foreach (var elem in elements) {
-        var conv = Converter(elem);
-        if (predicate(elem, conv)) {
-          yield return elem;
-        } else {
-          reject(elem, conv);
-        }
-      }
-    }
-
     internal static bool SameNullity<T>(T x1, T x2) where T : class {
       return (x1 == null) == (x2 == null);
     }
 
-    internal string JoinStringsWithHeader(string header, IEnumerable<string> lines) {
-      return header + String.Join(Environment.NewLine + new String(' ', header.Length), lines);
-    }
-
-    [Conditional("DEBUG_AUTO_TRIGGERS")]
-    internal static void DebugTriggers(DafnyOptions options, string format, params object[] more) {
-      options.ErrorWriter.WriteLine(format, more);
-    }
-
-    internal static bool AllowsMatchingLoops(ComprehensionExpr quantifier) {
-      Contract.Requires(!(quantifier is QuantifierExpr) || ((QuantifierExpr)quantifier).SplitQuantifier == null); // Don't call this on a quantifier with a Split clause: it's not a real quantifier
-      // This is different from nowarn: it won't remove loops at all, even if another trigger is available.
-      return Attributes.Contains(quantifier.Attributes, "matchingloop");
-    }
-
-    internal static bool WantsAutoTriggers(ComprehensionExpr quantifier) {
-      Contract.Requires(!(quantifier is QuantifierExpr) || ((QuantifierExpr)quantifier).SplitQuantifier == null); // Don't call this on a quantifier with a Split clause: it's not a real quantifier
-      bool wantsAutoTriggers = true;
-      return !Attributes.ContainsBool(quantifier.Attributes, "autotriggers", ref wantsAutoTriggers) || wantsAutoTriggers;
-    }
-
-    internal static bool NeedsAutoTriggers(ComprehensionExpr quantifier) {
-      Contract.Requires(!(quantifier is QuantifierExpr) || ((QuantifierExpr)quantifier).SplitQuantifier == null); // Don't call this on a quantifier with a Split clause: it's not a real quantifier
-      return !Attributes.Contains(quantifier.Attributes, "trigger") && WantsAutoTriggers(quantifier);
-    }
-
-    internal static bool WantsMatchingLoopRewrite(ComprehensionExpr quantifier) {
-      Contract.Requires(!(quantifier is QuantifierExpr) || ((QuantifierExpr)quantifier).SplitQuantifier == null);
-      bool wantsMatchingLoopRewrite = true;
-      return (!Attributes.ContainsBool(quantifier.Attributes, "matchinglooprewrite", ref wantsMatchingLoopRewrite) || wantsMatchingLoopRewrite) && WantsAutoTriggers(quantifier);
-    }
-
-    private static BinaryExpr.ResolvedOpcode RemoveNotInBinaryExprIn(BinaryExpr.ResolvedOpcode opcode) {
-      switch (opcode) {
-        case BinaryExpr.ResolvedOpcode.NotInMap:
-          return BinaryExpr.ResolvedOpcode.InMap;
-        case BinaryExpr.ResolvedOpcode.NotInSet:
-          return BinaryExpr.ResolvedOpcode.InSet;
-        case BinaryExpr.ResolvedOpcode.NotInSeq:
-          return BinaryExpr.ResolvedOpcode.InSeq;
-        case BinaryExpr.ResolvedOpcode.NotInMultiSet:
-          return BinaryExpr.ResolvedOpcode.InMultiSet;
-      }
-
-      Contract.Assert(false);
-      throw new ArgumentException();
-    }
-
-    private static BinaryExpr.ResolvedOpcode ChangeProperToInclusiveContainment(BinaryExpr.ResolvedOpcode opcode) {
-      return opcode switch {
-        BinaryExpr.ResolvedOpcode.ProperSubset => BinaryExpr.ResolvedOpcode.Subset,
-        BinaryExpr.ResolvedOpcode.ProperMultiSubset => BinaryExpr.ResolvedOpcode.MultiSubset,
-        BinaryExpr.ResolvedOpcode.ProperSuperset => BinaryExpr.ResolvedOpcode.Superset,
-        BinaryExpr.ResolvedOpcode.ProperMultiSuperset => BinaryExpr.ResolvedOpcode.MultiSuperset,
-        _ => opcode
-      };
-    }
-
-    internal static Expression PrepareExprForInclusionInTrigger(Expression expr, out bool isKiller) {
-      isKiller = false;
-
-      Expression ret;
-      do {
-        ret = expr;
-        if (expr is BinaryExpr bin) {
-          if (bin.Op == BinaryExpr.Opcode.NotIn) {
-            expr = new BinaryExpr(bin.tok, BinaryExpr.Opcode.In, bin.E0, bin.E1) {
-              ResolvedOp = RemoveNotInBinaryExprIn(bin.ResolvedOp),
-              Type = bin.Type
-            };
-          } else if (bin.ResolvedOp == BinaryExpr.ResolvedOpcode.InMultiSet) {
-            expr = new SeqSelectExpr(bin.tok, true, bin.E1, bin.E0, null, null) {
-              Type = bin.Type
-            };
-            isKiller = true; // [a in s] becomes [s[a] > 0], which is a trigger killer
-          } else {
-            var newOpcode = ChangeProperToInclusiveContainment(bin.ResolvedOp);
-            if (newOpcode != bin.ResolvedOp) {
-              // For sets, isets, and multisets, change < to <= in triggers (and analogously
-              // > to >=), since "a < b" translates as "a <= b && !(b <= a)" or
-              // "a <= b && !(a == b)".
-              expr = new BinaryExpr(bin.tok, BinaryExpr.ResolvedOp2SyntacticOp(newOpcode), bin.E0, bin.E1) {
-                ResolvedOp = newOpcode,
-                Type = bin.Type
-              };
-            }
-          }
-        }
-      } while (ret != expr);
-
-      return ret;
-    }
-
-    internal static Expression PrepareExprForInclusionInTrigger(Expression expr) {
-      return PrepareExprForInclusionInTrigger(expr, out var @_);
-    }
-
     internal static IEnumerable<Expression> MaybeWrapInOld(Expression expr, HashSet<OldExpr>/*?*/ wrap) {
       Contract.Requires(expr != null);
       Contract.Requires(wrap == null || wrap.Count != 0);
       if (wrap != null && !(expr is NameSegment) && !(expr is IdentifierExpr)) {
         foreach (var w in wrap) {
-          var newExpr = new OldExpr(new AutoGeneratedToken(expr.tok), expr, w.At) { AtLabel = w.AtLabel };
+          var newExpr = new OldExpr(new AutoGeneratedOrigin(expr.Origin), expr, w.At) { AtLabel = w.AtLabel };
           newExpr.Type = expr.Type;
           yield return newExpr;
         }
diff --git a/Source/DafnyCore/Triggers/TriggersCollector.cs b/Source/DafnyCore/Triggers/TriggersCollector.cs
index adb3e7298ff..a2651d3047f 100644
--- a/Source/DafnyCore/Triggers/TriggersCollector.cs
+++ b/Source/DafnyCore/Triggers/TriggersCollector.cs
@@ -4,465 +4,371 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Microsoft.Boogie;
 using System.Diagnostics.Contracts;
-using System.Diagnostics;
-
-namespace Microsoft.Dafny.Triggers {
-  class TriggerTerm {
-    internal Expression Expr { get; set; }
-    internal Expression OriginalExpr { get; set; }
-    internal ISet<IVariable> Variables { get; set; }
-    internal IEnumerable<BoundVar> BoundVars {
-      get {
-        return Variables.Select(v => v as BoundVar).Where(v => v != null);
-      }
-    }
 
-    public override string ToString() {
-      return Printer.ExprToString(DafnyOptions.DefaultImmutableOptions, Expr);
-      // NOTE: Using OriginalExpr here could cause some confusion:
-      // for example, {a !in b} is a binary expression, yielding
-      // trigger {a in b}. Saying the trigger is a !in b would be
-      // rather misleading.
-    }
+namespace Microsoft.Dafny.Triggers;
 
-    internal enum TermComparison {
-      SameStrength = 0, Stronger = 1, NotStronger = -1
-    }
+internal class TriggersCollector {
+  public ModuleDefinition ForModule { get; }
+  private readonly DafnyOptions options;
+  private readonly TriggerAnnotationsCache cache;
 
-    internal TermComparison CompareTo(TriggerTerm other) {
-      if (this == other) {
-        return TermComparison.SameStrength;
-      } else if (Expr.AllSubExpressions(true, true).Any(other.Expr.ExpressionEq)) {
-        return TermComparison.Stronger;
-      } else {
-        return TermComparison.NotStronger;
-      }
-    }
-
-    internal static bool Eq(TriggerTerm t1, TriggerTerm t2) {
-      return ExprExtensions.ExpressionEq(t1.Expr, t2.Expr);
-    }
+  internal TriggersCollector(Dictionary<Expression, HashSet<OldExpr>> exprsInOldContext, DafnyOptions options, ModuleDefinition forModule) {
+    this.options = options;
+    this.ForModule = forModule;
+    this.cache = new TriggerAnnotationsCache(exprsInOldContext);
   }
 
-  class TriggerCandidate {
-    internal List<TriggerTerm> Terms { get; set; }
-    internal string Annotation { get; set; }
+  private T ReduceAnnotatedSubExpressions<T>(Expression expr, T seed, Func<TriggerAnnotation, T> map, Func<T, T, T> reduce) {
+    return expr.SubExpressions.Select(e => map(Annotate(e)))
+      .Aggregate(seed, reduce);
+  }
 
-    internal TriggerCandidate(List<TriggerTerm> terms) {
-      this.Terms = terms;
-    }
+  private List<TriggerTerm> CollectExportedCandidates(Expression expr) {
+    return ReduceAnnotatedSubExpressions(expr, new List<TriggerTerm>(), a => a.ExportedTerms, TriggerUtils.MergeAlterFirst);
+  }
 
-    public TriggerCandidate(TriggerCandidate candidate) {
-      this.Terms = candidate.Terms;
-    }
+  private ISet<IVariable> CollectVariables(Expression expr) {
+    return ReduceAnnotatedSubExpressions<ISet<IVariable>>(expr, new HashSet<IVariable>(), a => a.Variables, TriggerUtils.MergeAlterFirst);
+  }
 
-    internal bool MentionsAll(List<BoundVar> vars) {
-      return vars.All(x => Terms.Any(term => term.Variables.Contains(x)));
-    }
+  private bool CollectIsKiller(Expression expr) {
+    return ReduceAnnotatedSubExpressions(expr, false, a => a.IsTriggerKiller, (a, b) => a || b);
+  }
 
-    internal string Repr { get { return String.Join(", ", Terms); } }
+  private IEnumerable<TriggerTerm> OnlyPrivateCandidates(List<TriggerTerm> terms, IEnumerable<IVariable> privateVars) {
+    return terms.Where(c => privateVars.Intersect(c.Variables).Any()); //TODO Check perf
+  }
 
-    public override string ToString() {
-      return "{" + Repr + "}" + (String.IsNullOrWhiteSpace(Annotation) ? "" : " (" + Annotation + ")");
+  private TriggerAnnotation Annotate(Expression expr) {
+    if (cache.Annotations.TryGetValue(expr, out var cached)) {
+      return cached;
     }
 
-    internal IEnumerable<TriggerMatch> LoopingSubterms(ComprehensionExpr quantifier, DafnyOptions options) {
-      Contract.Requires(!(quantifier is QuantifierExpr) || ((QuantifierExpr)quantifier).SplitQuantifier == null); // Don't call this on a quantifier with a Split clause: it's not a real quantifier
-      var matchingSubterms = this.MatchingSubterms(quantifier);
-      var boundVars = new HashSet<BoundVar>(quantifier.BoundVars);
-      return matchingSubterms.Where(tm => tm.CouldCauseLoops(Terms, boundVars, options));
-    }
+    TriggerAnnotation annotation = null; // TODO: Using ApplySuffix fixes the unresolved members problem in GenericSort
 
-    internal List<TriggerMatch> MatchingSubterms(ComprehensionExpr quantifier) {
-      Contract.Requires(!(quantifier is QuantifierExpr) || ((QuantifierExpr)quantifier).SplitQuantifier == null); // Don't call this on a quantifier with a Split clause: it's not a real quantifier
-      return Terms.SelectMany(term => quantifier.SubexpressionsMatchingTrigger(term.Expr)).Deduplicate(TriggerMatch.Eq);
+    if (expr is LetExpr) {
+      var le = (LetExpr)expr;
+      if (le.LHSs.All(p => p.Var != null) && le.Exact) {
+        // Inline the let expression before doing trigger selection.
+        annotation = Annotate(BoogieGenerator.InlineLet(le));
+      }
     }
 
-    internal bool IsStrongerThan(TriggerCandidate that) {
-      if (this == that) {
-        return false;
+    if (annotation == null) {
+      expr.SubExpressions.ForEach(e => Annotate(e));
+
+      if (IsPotentialTriggerCandidate(expr)) {
+        annotation = AnnotatePotentialCandidate(expr);
+      } else if (expr is QuantifierExpr) {
+        annotation = AnnotateQuantifier((QuantifierExpr)expr);
+      } else if (expr is LetExpr) {
+        annotation = AnnotateLetExpr((LetExpr)expr);
+      } else if (expr is IdentifierExpr) {
+        annotation = AnnotateIdentifier((IdentifierExpr)expr);
+      } else if (expr is ApplySuffix) {
+        annotation = AnnotateApplySuffix((ApplySuffix)expr);
+      } else if (expr is MatchExpr) {
+        annotation = AnnotateMatchExpr((MatchExpr)expr);
+      } else if (expr is NestedMatchExpr nestedMatchExpr) {
+        annotation = AnnotateNestedMatchExpr(nestedMatchExpr);
+      } else if (expr is ComprehensionExpr) {
+        annotation = AnnotateComprehensionExpr((ComprehensionExpr)expr);
+      } else if (expr is ConcreteSyntaxExpression ||
+                 expr is LiteralExpr ||
+                 expr is ThisExpr ||
+                 expr is BoxingCastExpr ||
+                 expr is MultiSetFormingExpr ||
+                 expr is SeqConstructionExpr) {
+        annotation = AnnotateOther(expr, false);
+      } else {
+        annotation = AnnotateOther(expr, true);
       }
+    }
 
-      var hasStrictlyStrongerTerm = false;
-      foreach (var t in Terms) {
-        var comparison = that.Terms.Select(t.CompareTo).Max();
-
-        // All terms of `this` must be at least as strong as a term of `that`
-        if (comparison == TriggerTerm.TermComparison.NotStronger) { return false; }
+    cache.Annotations[expr] = annotation;
+    return annotation;
+  }
 
-        // Did we find a strictly stronger term?
-        hasStrictlyStrongerTerm = hasStrictlyStrongerTerm || comparison == TriggerTerm.TermComparison.Stronger;
+  public bool IsPotentialTriggerCandidate(Expression expr) {
+    if (expr is FunctionCallExpr ||
+        expr is SeqSelectExpr ||
+        expr is MultiSelectExpr ||
+        expr is MemberSelectExpr ||
+        (expr is OldExpr { Useless: false }) ||
+        expr is ApplyExpr ||
+        expr is DisplayExpression ||
+        expr is MapDisplayExpr ||
+        expr is DatatypeValue ||
+        expr is TernaryExpr ||
+        TranslateToFunctionCall(expr)) {
+      return true;
+    } else if (expr is BinaryExpr) {
+      var e = (BinaryExpr)expr;
+      if ((e.Op == BinaryExpr.Opcode.NotIn || e.Op == BinaryExpr.Opcode.In) && !BoogieGenerator.ExpressionTranslator.RewriteInExpr(e.E1, false)) {
+        return true;
+      } else if (CandidateCollectionOperation(e)) {
+        return true;
+      } else if (e.E0.Type.IsBigOrdinalType &&
+                 (e.ResolvedOp == BinaryExpr.ResolvedOpcode.Lt || e.ResolvedOp == BinaryExpr.ResolvedOpcode.LessThanLimit || e.ResolvedOp == BinaryExpr.ResolvedOpcode.Gt)) {
+        return true;
+      } else {
+        return false;
       }
-
-      return hasStrictlyStrongerTerm;
+    } else if (expr is UnaryOpExpr) {
+      var e = (UnaryOpExpr)expr;
+      return e.Op == UnaryOpExpr.Opcode.Cardinality;  // FIXME || e.Op == UnaryOpExpr.Opcode.Fresh doesn't work, as fresh is a pretty tricky predicate when it's not about datatypes. See translator.cs:10944
+    } else if (expr is ConversionExpr) {
+      var e = (ConversionExpr)expr;
+      return e.ToType.IsBigOrdinalType;
+    } else {
+      return false;
     }
   }
 
-  internal class TriggerAnnotation {
-    internal bool IsTriggerKiller;
-    internal ISet<IVariable> Variables;
-    internal readonly List<TriggerTerm> PrivateTerms;
-    internal readonly List<TriggerTerm> ExportedTerms;
-
-    internal TriggerAnnotation(bool IsTriggerKiller, IEnumerable<IVariable> Variables, IEnumerable<TriggerTerm> AllTerms, IEnumerable<TriggerTerm> PrivateTerms = null) {
-      this.IsTriggerKiller = IsTriggerKiller;
-      this.Variables = new HashSet<IVariable>(Variables);
-      this.PrivateTerms = new List<TriggerTerm>(PrivateTerms == null ? Enumerable.Empty<TriggerTerm>() : PrivateTerms);
-      this.ExportedTerms = new List<TriggerTerm>(AllTerms == null ? Enumerable.Empty<TriggerTerm>() : AllTerms.Except(this.PrivateTerms));
+  // math operations can be turned into a Boogie-level function as in the
+  // case with /noNLarith.
+  public bool TranslateToFunctionCall(Expression expr) {
+    if (!(expr is BinaryExpr)) {
+      return false;
     }
-
-    public override string ToString() {
-      StringBuilder sb = new StringBuilder();
-      string indent = "  {0}", nindent = "\n  - {0}", subindent = "\n    * {0}";
-
-      sb.AppendFormat(indent, IsTriggerKiller);
-
-      sb.AppendFormat(nindent, "Variables:");
-      foreach (var bv in Variables) {
-        sb.AppendFormat(subindent, bv.Name);
-      }
-
-      sb.AppendFormat(nindent, "Exported terms:");
-      foreach (var term in ExportedTerms) {
-        sb.AppendFormat(subindent, term);
-      }
-
-      if (PrivateTerms.Any()) {
-        sb.AppendFormat(nindent, "Private terms:");
-        foreach (var term in PrivateTerms) {
-          sb.AppendFormat(subindent, term);
+    BinaryExpr e = (BinaryExpr)expr;
+    bool isReal = e.E0.Type.IsNumericBased(Type.NumericPersuasion.Real);
+    var disableNonLinearArithmetic = BoogieGenerator.DetermineDisableNonLinearArithmetic(ForModule, options);
+    switch (e.ResolvedOp) {
+      case BinaryExpr.ResolvedOpcode.Lt:
+      case BinaryExpr.ResolvedOpcode.Le:
+      case BinaryExpr.ResolvedOpcode.Ge:
+      case BinaryExpr.ResolvedOpcode.Gt:
+      case BinaryExpr.ResolvedOpcode.Add:
+      case BinaryExpr.ResolvedOpcode.Sub:
+        if (!isReal && !e.E0.Type.IsBitVectorType && !e.E0.Type.IsBigOrdinalType && disableNonLinearArithmetic) {
+          return true;
         }
-      }
-
-      return sb.ToString();
-    }
-  }
-
-  internal class TriggerAnnotationsCache {
-    public readonly Dictionary<Expression, HashSet<OldExpr>> exprsInOldContext;
-    public readonly Dictionary<Expression, TriggerAnnotation> annotations;
-
-    /// <summary>
-    /// For certain operations, the TriggersCollector class needs to know whether
-    /// a particular expression is under an old(...) wrapper. This is in particular
-    /// true for generating trigger terms (but it is not for checking whether something
-    /// is a trigger killer, so passing an empty set here for that case would be fine.
-    /// </summary>
-    public TriggerAnnotationsCache(Dictionary<Expression, HashSet<OldExpr>> exprsInOldContext) {
-      this.exprsInOldContext = exprsInOldContext;
-      annotations = new Dictionary<Expression, TriggerAnnotation>();
+        break;
+      case BinaryExpr.ResolvedOpcode.Mul:
+      case BinaryExpr.ResolvedOpcode.Div:
+      case BinaryExpr.ResolvedOpcode.Mod:
+        if (!isReal && !e.E0.Type.IsBitVectorType && !e.E0.Type.IsBigOrdinalType) {
+          if (disableNonLinearArithmetic || (options.ArithMode != 0 && options.ArithMode != 3)) {
+            return true;
+          }
+        }
+        break;
     }
+    return false;
   }
 
-  internal class TriggersCollector {
-    private DafnyOptions options;
-    TriggerAnnotationsCache cache;
-
-    internal TriggersCollector(Dictionary<Expression, HashSet<OldExpr>> exprsInOldContext, DafnyOptions options) {
-      this.options = options;
-      this.cache = new TriggerAnnotationsCache(exprsInOldContext);
-    }
-
-    private T ReduceAnnotatedSubExpressions<T>(Expression expr, T seed, Func<TriggerAnnotation, T> map, Func<T, T, T> reduce) {
-      return expr.SubExpressions.Select(e => map(Annotate(e)))
-                                .Aggregate(seed, (acc, e) => reduce(acc, e));
-    }
-
-    private List<TriggerTerm> CollectExportedCandidates(Expression expr) {
-      return ReduceAnnotatedSubExpressions<List<TriggerTerm>>(expr, new List<TriggerTerm>(), a => a.ExportedTerms, TriggerUtils.MergeAlterFirst);
-    }
-
-    private ISet<IVariable> CollectVariables(Expression expr) {
-      return ReduceAnnotatedSubExpressions<ISet<IVariable>>(expr, new HashSet<IVariable>(), a => a.Variables, TriggerUtils.MergeAlterFirst);
-    }
-
-    private bool CollectIsKiller(Expression expr) {
-      return ReduceAnnotatedSubExpressions(expr, false, a => a.IsTriggerKiller, (a, b) => a || b);
-    }
-
-    private IEnumerable<TriggerTerm> OnlyPrivateCandidates(List<TriggerTerm> terms, IEnumerable<IVariable> privateVars) {
-      return terms.Where(c => privateVars.Intersect(c.Variables).Any()); //TODO Check perf
+  static bool CandidateCollectionOperation(BinaryExpr binExpr) {
+    Contract.Requires(binExpr != null);
+    var type = binExpr.E0.Type.AsCollectionType;
+    if (type == null) {
+      return false;
     }
-
-    private TriggerAnnotation Annotate(Expression expr) {
-      if (cache.annotations.TryGetValue(expr, out var cached)) {
-        return cached;
-      }
-
-      TriggerAnnotation annotation = null; // TODO: Using ApplySuffix fixes the unresolved members problem in GenericSort
-
-      if (expr is LetExpr) {
-        var le = (LetExpr)expr;
-        if (le.LHSs.All(p => p.Var != null) && le.Exact) {
-          // Inline the let expression before doing trigger selection.
-          annotation = Annotate(Translator.InlineLet(le));
-        }
-      }
-
-      if (annotation == null) {
-        expr.SubExpressions.ForEach(e => Annotate(e));
-
-        if (IsPotentialTriggerCandidate(expr)) {
-          annotation = AnnotatePotentialCandidate(expr);
-        } else if (expr is QuantifierExpr) {
-          annotation = AnnotateQuantifier((QuantifierExpr)expr);
-        } else if (expr is LetExpr) {
-          annotation = AnnotateLetExpr((LetExpr)expr);
-        } else if (expr is IdentifierExpr) {
-          annotation = AnnotateIdentifier((IdentifierExpr)expr);
-        } else if (expr is ApplySuffix) {
-          annotation = AnnotateApplySuffix((ApplySuffix)expr);
-        } else if (expr is MatchExpr) {
-          annotation = AnnotateMatchExpr((MatchExpr)expr);
-        } else if (expr is NestedMatchExpr nestedMatchExpr) {
-          annotation = AnnotateNestedMatchExpr(nestedMatchExpr);
-        } else if (expr is ComprehensionExpr) {
-          annotation = AnnotateComprehensionExpr((ComprehensionExpr)expr);
-        } else if (expr is ConcreteSyntaxExpression ||
-                   expr is LiteralExpr ||
-                   expr is ThisExpr ||
-                   expr is BoxingCastExpr ||
-                   expr is MultiSetFormingExpr ||
-                   expr is SeqConstructionExpr) {
-          annotation = AnnotateOther(expr, false);
-        } else {
-          annotation = AnnotateOther(expr, true);
-        }
+    if (type is SetType) {
+      switch (binExpr.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.Union:
+        case BinaryExpr.ResolvedOpcode.Intersection:
+        case BinaryExpr.ResolvedOpcode.SetDifference:
+        case BinaryExpr.ResolvedOpcode.ProperSubset:
+        case BinaryExpr.ResolvedOpcode.Subset:
+        case BinaryExpr.ResolvedOpcode.Superset:
+        case BinaryExpr.ResolvedOpcode.ProperSuperset:
+          return true;
       }
-
-      TriggerUtils.DebugTriggers(options, "{0} ({1})\n{2}", Printer.ExprToString(options, expr), expr.GetType(), annotation);
-      cache.annotations[expr] = annotation;
-      return annotation;
-    }
-
-    public bool IsPotentialTriggerCandidate(Expression expr) {
-      if (expr is FunctionCallExpr ||
-          expr is SeqSelectExpr ||
-          expr is MultiSelectExpr ||
-          expr is MemberSelectExpr ||
-          (expr is OldExpr { Useless: false }) ||
-          expr is ApplyExpr ||
-          expr is DisplayExpression ||
-          expr is MapDisplayExpr ||
-          expr is DatatypeValue ||
-          TranslateToFunctionCall(expr)) {
-        return true;
-      } else if (expr is BinaryExpr) {
-        var e = (BinaryExpr)expr;
-        if ((e.Op == BinaryExpr.Opcode.NotIn || e.Op == BinaryExpr.Opcode.In) && !Translator.ExpressionTranslator.RewriteInExpr(e.E1, false)) {
+    } else if (type is MultiSetType) {
+      switch (binExpr.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+        case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+        case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
+        case BinaryExpr.ResolvedOpcode.MultiSubset:
+        case BinaryExpr.ResolvedOpcode.MultiSuperset:
+        case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
           return true;
-        } else if (CandidateCollectionOperation(e)) {
+      }
+    } else if (type is SeqType) {
+      switch (binExpr.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.Concat:
           return true;
-        } else if (e.E0.Type.IsBigOrdinalType &&
-                   (e.ResolvedOp == BinaryExpr.ResolvedOpcode.Lt || e.ResolvedOp == BinaryExpr.ResolvedOpcode.LessThanLimit || e.ResolvedOp == BinaryExpr.ResolvedOpcode.Gt)) {
+      }
+    } else if (type is MapType) {
+      switch (binExpr.ResolvedOp) {
+        case BinaryExpr.ResolvedOpcode.MapMerge:
+        case BinaryExpr.ResolvedOpcode.MapSubtraction:
           return true;
-        } else {
-          return false;
-        }
-      } else if (expr is UnaryOpExpr) {
-        var e = (UnaryOpExpr)expr;
-        return e.Op == UnaryOpExpr.Opcode.Cardinality;  // FIXME || e.Op == UnaryOpExpr.Opcode.Fresh doesn't work, as fresh is a pretty tricky predicate when it's not about datatypes. See translator.cs:10944
-      } else if (expr is ConversionExpr) {
-        var e = (ConversionExpr)expr;
-        return e.ToType.IsBigOrdinalType;
-      } else {
-        return false;
       }
     }
+    return false;
+  }
 
-    // math operations can be turned into a Boogie-level function as in the
-    // case with /noNLarith.
-    public bool TranslateToFunctionCall(Expression expr) {
-      if (!(expr is BinaryExpr)) {
-        return false;
-      }
-      BinaryExpr e = (BinaryExpr)expr;
-      bool isReal = e.E0.Type.IsNumericBased(Type.NumericPersuasion.Real);
-      switch (e.ResolvedOp) {
-        case BinaryExpr.ResolvedOpcode.Lt:
-        case BinaryExpr.ResolvedOpcode.Le:
-        case BinaryExpr.ResolvedOpcode.Ge:
-        case BinaryExpr.ResolvedOpcode.Gt:
-        case BinaryExpr.ResolvedOpcode.Add:
-        case BinaryExpr.ResolvedOpcode.Sub:
-          if (!isReal && !e.E0.Type.IsBitVectorType && !e.E0.Type.IsBigOrdinalType && options.DisableNLarith) {
-            return true;
-          }
-          break;
-        case BinaryExpr.ResolvedOpcode.Mul:
-        case BinaryExpr.ResolvedOpcode.Div:
-        case BinaryExpr.ResolvedOpcode.Mod:
-          if (!isReal && !e.E0.Type.IsBitVectorType && !e.E0.Type.IsBigOrdinalType) {
-            if (options.DisableNLarith || (options.ArithMode != 0 && options.ArithMode != 3)) {
-              return true;
-            }
-          }
-          break;
+  private TriggerAnnotation AnnotatePotentialCandidate(Expression expr) {
+    var oldExprSet = cache.ExpressionsInOldContext.GetValueOrDefault(expr);
+    // oldExpr has been set to the value found
+    var newExpressions = TriggerUtils.MaybeWrapInOld(PrepareExprForInclusionInTrigger(expr, out var exprIsKiller), oldExprSet);
+    // We expect there to be at least one "newExpressions".
+    // We also expect that the computation of new_term.Variables, collected_terms, and children_contain_killers will be the
+    // same for each of the "new_exprs".
+    // Therefore, we use the values of these variables from the last iteration in the expression that is ultimately returned.
+    TriggerTerm newTerm = null;
+    List<TriggerTerm> collectedTerms = null;
+    var childrenContainKillers = false;
+    foreach (var newExpression in newExpressions) {
+      newTerm = new TriggerTerm { Expr = newExpression, OriginalExpr = expr, Variables = CollectVariables(expr) };
+
+      collectedTerms = CollectExportedCandidates(expr);
+      childrenContainKillers = CollectIsKiller(expr);
+
+      if (!childrenContainKillers) {
+        // Add only if the children are not killers; the head has been cleaned up into non-killer form
+        collectedTerms.Add(newTerm);
       }
-      return false;
     }
+    Contract.Assert(newTerm != null);  // this checks our assumption that "new_exprs" contains at least one value.
 
-    static bool CandidateCollectionOperation(BinaryExpr binExpr) {
-      Contract.Requires(binExpr != null);
-      var type = binExpr.E0.Type.AsCollectionType;
-      if (type == null) {
-        return false;
-      }
-      if (type is SetType) {
-        switch (binExpr.ResolvedOp) {
-          case BinaryExpr.ResolvedOpcode.Union:
-          case BinaryExpr.ResolvedOpcode.Intersection:
-          case BinaryExpr.ResolvedOpcode.SetDifference:
-          case BinaryExpr.ResolvedOpcode.ProperSubset:
-          case BinaryExpr.ResolvedOpcode.Subset:
-          case BinaryExpr.ResolvedOpcode.Superset:
-          case BinaryExpr.ResolvedOpcode.ProperSuperset:
-            return true;
-          default:
-            break;
-        }
-      } else if (type is MultiSetType) {
-        switch (binExpr.ResolvedOp) {
-          case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-          case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-          case BinaryExpr.ResolvedOpcode.MultiSetDifference:
-          case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
-          case BinaryExpr.ResolvedOpcode.MultiSubset:
-          case BinaryExpr.ResolvedOpcode.MultiSuperset:
-          case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
-            return true;
-          default:
-            break;
-        }
-      } else if (type is SeqType) {
-        switch (binExpr.ResolvedOp) {
-          case BinaryExpr.ResolvedOpcode.Concat:
-            return true;
-          default:
-            break;
-        }
-      } else if (type is MapType) {
-        switch (binExpr.ResolvedOp) {
-          case BinaryExpr.ResolvedOpcode.MapMerge:
-          case BinaryExpr.ResolvedOpcode.MapSubtraction:
-            return true;
-          default:
-            break;
-        }
-      }
-      return false;
-    }
+    // This new node is a killer if its children were killers, or if it's non-cleaned-up head is a killer
+    return new TriggerAnnotation(childrenContainKillers || exprIsKiller, newTerm.Variables, collectedTerms);
+  }
 
-    private TriggerAnnotation AnnotatePotentialCandidate(Expression expr) {
-      bool expr_is_killer = false;
-      if (cache.exprsInOldContext.TryGetValue(expr, out var oldExprSet)) {
-        // oldExpr has been set to the value found
-      } else {
-        oldExprSet = null;
-      }
-      var new_exprs = TriggerUtils.MaybeWrapInOld(TriggerUtils.PrepareExprForInclusionInTrigger(expr, out expr_is_killer), oldExprSet);
-      // We expect there to be at least one "new_exprs".
-      // We also expect that the computation of new_term.Variables, collected_terms, and children_contain_killers will be the
-      // same for each of the "new_exprs".
-      // Therefore, we use the values of these variables from the last iteration in the expression that is ultimately returned.
-      TriggerTerm new_term = null;
-      List<TriggerTerm> collected_terms = null;
-      var children_contain_killers = false;
-      foreach (var new_expr in new_exprs) {
-        new_term = new TriggerTerm { Expr = new_expr, OriginalExpr = expr, Variables = CollectVariables(expr) };
-
-        collected_terms = CollectExportedCandidates(expr);
-        children_contain_killers = CollectIsKiller(expr);
-
-        if (!children_contain_killers) {
-          // Add only if the children are not killers; the head has been cleaned up into non-killer form
-          collected_terms.Add(new_term);
-        }
-      }
-      Contract.Assert(new_term != null);  // this checks our assumption that "new_exprs" contains at least one value.
+  private TriggerAnnotation AnnotateApplySuffix(ApplySuffix expr) {
+    // This is a bit tricky. A funcall node is generally meaningful as a trigger candidate,
+    // but when it's part of an ApplySuffix the function call itself may not resolve properly
+    // when the second round of resolving is done after modules are duplicated.
+    // Thus first we annotate expr and create a trigger candidate, and then we remove the
+    // candidate matching its direct subexpression if needed. Note that function calls are not the
+    // only possible child here; there can be DatatypeValue nodes, for example (see vstte2012/Combinators.dfy).
+    var annotation = AnnotatePotentialCandidate(expr);
+    // Comparing by reference is fine here. Using sets could yield a small speedup
+    annotation.ExportedTerms.RemoveAll(term => expr.SubExpressions.Contains(term.Expr));
+    return annotation;
+  }
 
-      // This new node is a killer if its children were killers, or if it's non-cleaned-up head is a killer
-      return new TriggerAnnotation(children_contain_killers || expr_is_killer, new_term.Variables, collected_terms);
-    }
+  private TriggerAnnotation AnnotateQuantifierOrLetExpr(Expression expr, IEnumerable<BoundVar> boundVars) {
+    var terms = CollectExportedCandidates(expr);
+    return new TriggerAnnotation(true, CollectVariables(expr), terms, OnlyPrivateCandidates(terms, boundVars));
+  }
 
-    private TriggerAnnotation AnnotateApplySuffix(ApplySuffix expr) {
-      // This is a bit tricky. A funcall node is generally meaningful as a trigger candidate,
-      // but when it's part of an ApplySuffix the function call itself may not resolve properly
-      // when the second round of resolving is done after modules are duplicated.
-      // Thus first we annotate expr and create a trigger candidate, and then we remove the
-      // candidate matching its direct subexpression if needed. Note that function calls are not the
-      // only possible child here; there can be DatatypeValue nodes, for example (see vstte2012/Combinators.dfy).
-      var annotation = AnnotatePotentialCandidate(expr);
-      // Comparing by reference is fine here. Using sets could yield a small speedup
-      annotation.ExportedTerms.RemoveAll(term => expr.SubExpressions.Contains(term.Expr));
-      return annotation;
-    }
+  private TriggerAnnotation AnnotateQuantifier(QuantifierExpr expr) {
+    return AnnotateQuantifierOrLetExpr(expr, expr.BoundVars);
+  }
 
-    private TriggerAnnotation AnnotateQuantifierOrLetExpr(Expression expr, IEnumerable<BoundVar> boundVars) {
-      var terms = CollectExportedCandidates(expr);
-      return new TriggerAnnotation(true, CollectVariables(expr), terms, OnlyPrivateCandidates(terms, boundVars));
-    }
+  private TriggerAnnotation AnnotateLetExpr(LetExpr expr) {
+    return AnnotateQuantifierOrLetExpr(expr, expr.BoundVars);
+  }
 
-    private TriggerAnnotation AnnotateQuantifier(QuantifierExpr expr) {
-      return AnnotateQuantifierOrLetExpr(expr, expr.BoundVars);
-    }
+  private TriggerAnnotation AnnotateIdentifier(IdentifierExpr expr) {
+    return new TriggerAnnotation(false, Enumerable.Repeat(expr.Var, 1), null);
+  }
 
-    private TriggerAnnotation AnnotateLetExpr(LetExpr expr) {
-      return AnnotateQuantifierOrLetExpr(expr, expr.BoundVars);
-    }
+  private TriggerAnnotation AnnotateComprehensionExpr(ComprehensionExpr expr) {
+    var terms = CollectExportedCandidates(expr);
+    return new TriggerAnnotation(true, CollectVariables(expr), terms, OnlyPrivateCandidates(terms, expr.BoundVars));
+  }
 
-    private TriggerAnnotation AnnotateIdentifier(IdentifierExpr expr) {
-      return new TriggerAnnotation(false, Enumerable.Repeat(expr.Var, 1), null);
-    }
+  private TriggerAnnotation AnnotateNestedMatchExpr(NestedMatchExpr expr) {
+    var candidateTerms = CollectExportedCandidates(expr);
+    // collects that argument boundvar of matchcaseexpr
+    var variables = expr.Cases.SelectMany(e => e.Pat.DescendantsAndSelf).
+      OfType<IdPattern>().Select(id => id.BoundVar).Where(b => b != null).ToList();
+    // remove terms that mentions argument boundvar of matchcaseexpr
+    var terms = candidateTerms.Where(term => variables.Any(x => !term.Variables.Contains(x))).ToList();
+    return new TriggerAnnotation(true, CollectVariables(expr), terms);
+  }
 
-    private TriggerAnnotation AnnotateComprehensionExpr(ComprehensionExpr expr) {
-      var terms = CollectExportedCandidates(expr);
-      return new TriggerAnnotation(true, CollectVariables(expr), terms, OnlyPrivateCandidates(terms, expr.BoundVars));
+  private TriggerAnnotation AnnotateMatchExpr(MatchExpr expr) {
+    var pts = CollectExportedCandidates(expr);
+    // collects that argument boundvar of matchcaseexpr
+    var variables = expr.Cases.Select(e => e.Arguments).
+      Aggregate(new List<BoundVar>(), (acc, e) => TriggerUtils.MergeAlterFirst(acc, e));
+    // remove terms that mentions argument boundvar of matchcaseexpr
+    var terms = new List<TriggerTerm>();
+    foreach (var term in pts) {
+      if (!(variables.All(x => term.Variables.Contains(x)))) {
+        terms.Add(term);
+      }
     }
+    return new TriggerAnnotation(true, CollectVariables(expr), terms);
+  }
 
-    private TriggerAnnotation AnnotateNestedMatchExpr(NestedMatchExpr expr) {
-      var candidateTerms = CollectExportedCandidates(expr);
-      // collects that argument boundvar of matchcaseexpr
-      var variables = expr.Cases.SelectMany(e => e.Pat.DescendantsAndSelf).
-        OfType<IdPattern>().Select(id => id.BoundVar).Where(b => b != null).ToList();
-      // remove terms that mentions argument boundvar of matchcaseexpr
-      var terms = candidateTerms.Where(term => variables.Any(x => !term.Variables.Contains(x))).ToList();
-      return new TriggerAnnotation(true, CollectVariables(expr), terms);
-    }
+  private TriggerAnnotation AnnotateOther(Expression expr, bool isTriggerKiller) {
+    return new TriggerAnnotation(isTriggerKiller || CollectIsKiller(expr), CollectVariables(expr), CollectExportedCandidates(expr));
+  }
 
-    private TriggerAnnotation AnnotateMatchExpr(MatchExpr expr) {
-      var pts = CollectExportedCandidates(expr);
-      // collects that argument boundvar of matchcaseexpr
-      var variables = expr.Cases.Select(e => e.Arguments).
-        Aggregate(new List<BoundVar>(), (acc, e) => TriggerUtils.MergeAlterFirst(acc, e));
-      // remove terms that mentions argument boundvar of matchcaseexpr
-      var terms = new List<TriggerTerm>();
-      foreach (var term in pts) {
-        if (!(variables.All(x => term.Variables.Contains(x)))) {
-          terms.Add(term);
+  /// <summary>
+  /// Collect terms in the body of the subexpressions of the argument that look like quantifiers. The results of this function can contain duplicate terms.
+  /// </summary>
+  internal List<TriggerTerm> CollectTriggers(ComprehensionExpr quantifier) {
+    Contract.Requires(!(quantifier is QuantifierExpr) || ((QuantifierExpr)quantifier).SplitQuantifier == null); // Don't call this on a quantifier with a Split clause: it's not a real quantifier
+    // NOTE: We could check for existing trigger attributes and return that instead
+    return Annotate(quantifier).PrivateTerms;
+  }
+
+  internal bool IsTriggerKiller(Expression expr) {
+    return Annotate(expr).IsTriggerKiller;
+  }
+
+  internal static Expression PrepareExprForInclusionInTrigger(Expression expr) {
+    return PrepareExprForInclusionInTrigger(expr, out var @_);
+  }
+
+  private static Expression PrepareExprForInclusionInTrigger(Expression expr, out bool isKiller) {
+    isKiller = false;
+
+    Expression ret;
+    do {
+      ret = expr;
+      if (expr is BinaryExpr bin) {
+        if (bin.Op == BinaryExpr.Opcode.NotIn) {
+          expr = new BinaryExpr(bin.Origin, BinaryExpr.Opcode.In, bin.E0, bin.E1) {
+            ResolvedOp = RemoveNotInBinaryExprIn(bin.ResolvedOp),
+            Type = bin.Type
+          };
+        } else if (bin.ResolvedOp == BinaryExpr.ResolvedOpcode.InMultiSet) {
+          expr = new SeqSelectExpr(bin.Origin, true, bin.E1, bin.E0, null, null) {
+            Type = bin.Type
+          };
+          isKiller = true; // [a in s] becomes [s[a] > 0], which is a trigger killer
+        } else {
+          var newOpcode = ChangeProperToInclusiveContainment(bin.ResolvedOp);
+          if (newOpcode != bin.ResolvedOp) {
+            // For sets, isets, and multisets, change < to <= in triggers (and analogously
+            // > to >=), since "a < b" translates as "a <= b && !(b <= a)" or
+            // "a <= b && !(a == b)".
+            expr = new BinaryExpr(bin.Origin, BinaryExpr.ResolvedOp2SyntacticOp(newOpcode), bin.E0, bin.E1) {
+              ResolvedOp = newOpcode,
+              Type = bin.Type
+            };
+          }
         }
       }
-      return new TriggerAnnotation(true, CollectVariables(expr), terms);
-    }
-
-    private TriggerAnnotation AnnotateOther(Expression expr, bool isTriggerKiller) {
-      return new TriggerAnnotation(isTriggerKiller || CollectIsKiller(expr), CollectVariables(expr), CollectExportedCandidates(expr));
-    }
+    } while (ret != expr);
 
-    /// <summary>
-    /// Collect terms in the body of the subexpressions of the argument that look like quantifiers. The results of this function can contain duplicate terms.
-    /// </summary>
-    internal List<TriggerTerm> CollectTriggers(ComprehensionExpr quantifier) {
-      Contract.Requires(!(quantifier is QuantifierExpr) || ((QuantifierExpr)quantifier).SplitQuantifier == null); // Don't call this on a quantifier with a Split clause: it's not a real quantifier
-      // NOTE: We could check for existing trigger attributes and return that instead
-      return Annotate(quantifier).PrivateTerms;
-    }
+    return ret;
+  }
+  private static BinaryExpr.ResolvedOpcode RemoveNotInBinaryExprIn(BinaryExpr.ResolvedOpcode opcode) {
+    switch (opcode) {
+      case BinaryExpr.ResolvedOpcode.NotInMap:
+        return BinaryExpr.ResolvedOpcode.InMap;
+      case BinaryExpr.ResolvedOpcode.NotInSet:
+        return BinaryExpr.ResolvedOpcode.InSet;
+      case BinaryExpr.ResolvedOpcode.NotInSeq:
+        return BinaryExpr.ResolvedOpcode.InSeq;
+      case BinaryExpr.ResolvedOpcode.NotInMultiSet:
+        return BinaryExpr.ResolvedOpcode.InMultiSet;
+    }
+
+    Contract.Assert(false);
+    throw new ArgumentException();
+  }
 
-    internal bool IsTriggerKiller(Expression expr) {
-      return Annotate(expr).IsTriggerKiller;
-    }
+  private static BinaryExpr.ResolvedOpcode ChangeProperToInclusiveContainment(BinaryExpr.ResolvedOpcode opcode) {
+    return opcode switch {
+      BinaryExpr.ResolvedOpcode.ProperSubset => BinaryExpr.ResolvedOpcode.Subset,
+      BinaryExpr.ResolvedOpcode.ProperMultiSubset => BinaryExpr.ResolvedOpcode.MultiSubset,
+      BinaryExpr.ResolvedOpcode.ProperSuperset => BinaryExpr.ResolvedOpcode.Superset,
+      BinaryExpr.ResolvedOpcode.ProperMultiSuperset => BinaryExpr.ResolvedOpcode.MultiSuperset,
+      _ => opcode
+    };
   }
-}
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.BoogieFactory.cs b/Source/DafnyCore/Verifier/BoogieGenerator.BoogieFactory.cs
new file mode 100644
index 00000000000..cc419e304b7
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.BoogieFactory.cs
@@ -0,0 +1,926 @@
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.IO;
+using DafnyCore.Verifier;
+using Bpl = Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+
+namespace Microsoft.Dafny {
+  partial class BoogieGenerator {
+    public Bpl.Type BplBvType(int width) {
+      Contract.Requires(0 <= width);
+      if (width == 0) {
+        // Boogie claims to support bv0, but it translates it straight down to the SMT solver's 0-width bitvector type.
+        // However, the SMT-LIB 2 standard does not define such a bitvector width, so this is a bug in Boogie.  The
+        // best would be to fix this in Boogie, but for now, we simply work around it here.
+        return Predef.Bv0Type;
+      } else {
+        return Bpl.Type.GetBvType(width);
+      }
+    }
+
+    internal Bpl.Expr BplBvLiteralExpr(Bpl.IToken tok, BaseTypes.BigNum n, BitvectorType bitvectorType) {
+      Contract.Requires(tok != null);
+      Contract.Requires(bitvectorType != null);
+      return BplBvLiteralExpr(tok, n, bitvectorType.Width);
+    }
+    internal Bpl.Expr BplBvLiteralExpr(Bpl.IToken tok, BaseTypes.BigNum n, int width) {
+      Contract.Requires(tok != null);
+      Contract.Requires(0 <= width);
+      if (width == 0) {
+        // see comment in BplBvType
+        Contract.Assert(n.IsZero);
+        return Bpl.Expr.Literal(0);
+      } else if (n.IsNegative) {
+        // This can only happen if some error is reported elsewhere. Nevertheless, we do need to
+        // generate a Boogie expression and Boogie would crash if we pass a negative number to
+        // Bpl.LiteralExpr for a bitvector.
+        var zero = new Bpl.LiteralExpr(tok, BaseTypes.BigNum.ZERO, width);
+        var absN = new Bpl.LiteralExpr(tok, -n, width);
+        var etran = new ExpressionTranslator(this, Predef, tok, null);
+        return etran.TrToFunctionCall(tok, "sub_bv" + width, BplBvType(width), zero, absN, false);
+      } else {
+        return new Bpl.LiteralExpr(tok, n, width);
+      }
+    }
+
+    enum BuiltinFunction {
+      Lit,
+      LitInt,
+      LitReal,
+      LayerSucc,
+      AsFuelBottom,
+      CharFromInt,
+      CharToInt,
+      IsChar,
+
+      Is, IsBox,
+      IsAlloc, IsAllocBox,
+
+      IsTraitParent,
+
+      SetIsMember,
+      SetCard,
+      SetEmpty,
+      SetUnionOne,
+      SetUnion,
+      SetIntersection,
+      SetDifference,
+      SetEqual,
+      SetSubset,
+      SetDisjoint,
+
+      ISetEmpty,
+      ISetUnionOne,
+      ISetUnion,
+      ISetIntersection,
+      ISetDifference,
+      ISetEqual,
+      ISetSubset,
+      ISetDisjoint,
+
+      MultiSetMultiplicity,
+      MultiSetUpdateMultiplicity,
+      MultiSetCard,
+      MultiSetEmpty,
+      MultiSetUnionOne,
+      MultiSetUnion,
+      MultiSetIntersection,
+      MultiSetDifference,
+      MultiSetEqual,
+      MultiSetSubset,
+      MultiSetDisjoint,
+      MultiSetFromSet,
+      MultiSetFromSeq,
+      IsGoodMultiSet,
+
+      SeqLength,
+      SeqEmpty,
+      SeqBuild,
+      SeqAppend,
+      SeqIndex,
+      SeqUpdate,
+      SeqContains,
+      SeqDrop,
+      SeqTake,
+      SeqEqual,
+      SeqSameUntil,
+      SeqFromArray,
+      SeqRank,
+
+      MapEmpty,
+      MapCard,
+      MapDomain,
+      MapElements,
+      MapEqual,
+      MapDisjoint,
+      MapUnion,
+      MapGlue,
+
+      IMapEmpty,
+      IMapDomain,
+      IMapElements,
+      IMapEqual,
+      IMapGlue,
+
+      IndexField,
+      MultiIndexField,
+
+      Box,
+      Unbox,
+
+      RealToInt,
+      IntToReal,
+
+      IsGoodHeap,
+      IsHeapAnchor,
+      HeapSucc,
+      HeapSuccGhost,
+
+      DynamicType,  // allocated type (of object reference)
+      TypeTuple,
+      DeclType,
+      FieldOfDecl,
+      FDim,  // field dimension (0 - named, 1 or more - indexed)
+      IsGhostField,
+
+      DatatypeCtorId,
+      DtRank,
+      BoxRank,
+
+      GenericAlloc,
+
+      AtLayer
+    }
+
+    public const string BoxFunctionName = "$Box";
+    public const string UnboxFunctionName = "$Unbox";
+
+    Bpl.Expr Lit(Bpl.Expr expr, Bpl.Type typ) {
+      Contract.Requires(expr != null);
+      Contract.Requires(typ != null);
+      // To avoid Boogie's int_2_U and U_2_int conversions, which seem to cause problems with
+      // arithmetic reasoning, we use several Lit functions.  In particular, we use one for
+      // integers, one for reals, and one for everything else.
+      if (typ.IsInt) {
+        return FunctionCall(expr.tok, BuiltinFunction.LitInt, null, expr);
+      } else if (typ.IsReal) {
+        return FunctionCall(expr.tok, BuiltinFunction.LitReal, null, expr);
+      } else {
+        return FunctionCall(expr.tok, BuiltinFunction.Lit, typ, expr);
+      }
+    }
+
+    Bpl.Expr Lit(Bpl.Expr expr) {
+      return Lit(expr, expr.Type);
+    }
+
+    private static Bpl.Expr GetLit(Bpl.Expr expr) {
+      if (expr is Bpl.NAryExpr) {
+        Bpl.NAryExpr app = (Bpl.NAryExpr)expr;
+        switch (app.Fun.FunctionName) {
+          case "LitInt":
+          case "LitReal":
+          case "Lit":
+            return app.Args[0];
+          default:
+            break;
+        }
+      }
+      return null;
+    }
+
+    public static Bpl.AssumeCmd TrAssumeCmd(Bpl.IToken tok, Bpl.Expr expr, Bpl.QKeyValue attributes = null) {
+      var litArgument = GetLit(expr);
+      if (litArgument is Bpl.LiteralExpr literalExpr && literalExpr.asBool) {
+        // In most cases, we leave any Lit brackets that "expr" may have. In the past, these brackets
+        // had always been removed here. Alas, some brittle test cases stopped verifying if we
+        // keep "assume Lit(true)" instead of simplifying it to "assume true". Therefore, as a
+        // special case, we remove the Lit brackets from the literal "true".
+        expr = litArgument;
+      }
+      return attributes == null ? new Bpl.AssumeCmd(tok, expr) : new Bpl.AssumeCmd(tok, expr, attributes);
+    }
+
+    private Bpl.AssumeCmd TrAssumeCmdWithDependencies(ExpressionTranslator etran, Bpl.IToken tok, Expression dafnyExpr, string comment = null,
+      bool warnWhenUnused = false, Bpl.QKeyValue attributes = null) {
+      return TrAssumeCmdWithDependenciesAndExtend(etran, tok, dafnyExpr, e => e, comment, warnWhenUnused, attributes);
+    }
+
+    // This method translates a Dafny expression to a Boogie expression,
+    // applies an arbitrary provided function to that Boogie expression
+    // to extend it (by combining it with other, already-translated
+    // expressions, for instance), creates an assume statement in Boogie,
+    // and then adds information to track that assumption as a potential
+    // proof dependency.
+    public Bpl.AssumeCmd TrAssumeCmdWithDependenciesAndExtend(ExpressionTranslator etran, Bpl.IToken tok, Expression dafnyExpr, Func<Bpl.Expr, Bpl.Expr> extendExpr,
+      string comment = null, bool warnWhenUnused = false, Bpl.QKeyValue attributes = null) {
+      var expr = etran.TrExpr(dafnyExpr);
+      var cmd = TrAssumeCmd(tok, extendExpr(expr), attributes);
+      proofDependencies?.AddProofDependencyId(cmd, dafnyExpr.Origin, new AssumptionDependency(warnWhenUnused, comment, dafnyExpr));
+      return cmd;
+    }
+
+    static Bpl.Expr RemoveLit(Bpl.Expr expr) {
+      return GetLit(expr) ?? expr;
+    }
+
+    readonly ISet<string> letBoundVariablesWithLitRHS = new HashSet<string>();
+
+    bool IsLit(Bpl.Expr expr) {
+      if (expr is Bpl.IdentifierExpr ie) {
+        return letBoundVariablesWithLitRHS.Contains(ie.Name);
+      }
+      return GetLit(expr) != null;
+    }
+
+    // The "typeInstantiation" argument is passed in to help construct the result type of the function.
+    Bpl.NAryExpr FunctionCall(Bpl.IToken tok, BuiltinFunction f, Bpl.Type typeInstantiation, params Bpl.Expr[] args) {
+      Contract.Requires(tok != null);
+      Contract.Requires(args != null);
+      Contract.Requires(Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.NAryExpr>() != null);
+
+      switch (f) {
+        case BuiltinFunction.LitInt:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "LitInt", Bpl.Type.Int, args);
+        case BuiltinFunction.LitReal:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "LitReal", Bpl.Type.Real, args);
+        case BuiltinFunction.Lit:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation != null);
+          return FunctionCall(tok, "Lit", typeInstantiation, args);
+        case BuiltinFunction.LayerSucc:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "$LS", Predef.LayerType, args);
+        case BuiltinFunction.AsFuelBottom:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "AsFuelBottom", Predef.LayerType, args);
+        case BuiltinFunction.CharFromInt:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "char#FromInt", Predef.CharType, args);
+        case BuiltinFunction.CharToInt:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "char#ToInt", Predef.CharType, args);
+        case BuiltinFunction.IsChar:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "char#IsChar", Bpl.Type.Bool, args);
+
+        case BuiltinFunction.Is:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "$Is", Bpl.Type.Bool, args);
+        case BuiltinFunction.IsBox:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "$IsBox", Bpl.Type.Bool, args);
+        case BuiltinFunction.IsAlloc:
+          Contract.Assert(args.Length == 3);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "$IsAlloc", Bpl.Type.Bool, args);
+        case BuiltinFunction.IsAllocBox:
+          Contract.Assert(args.Length == 3);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "$IsAllocBox", Bpl.Type.Bool, args);
+
+        case BuiltinFunction.IsTraitParent:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "IsTraitParent", Bpl.Type.Bool, args);
+
+        case BuiltinFunction.SetIsMember:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Set#IsMember", Bpl.Type.Bool, args);
+        case BuiltinFunction.SetCard:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "Set#Card", Bpl.Type.Int, args);
+        case BuiltinFunction.SetEmpty: {
+            Contract.Assert(args.Length == 0);
+            Bpl.Type resultType = Predef.SetType;
+            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "Set#Empty", resultType, args), resultType);
+          }
+        case BuiltinFunction.SetUnionOne:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Set#UnionOne", Predef.SetType, args);
+        case BuiltinFunction.SetUnion:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Set#Union", Predef.SetType, args);
+        case BuiltinFunction.SetIntersection:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Set#Intersection", Predef.SetType, args);
+        case BuiltinFunction.SetDifference:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Set#Difference", Predef.SetType, args);
+        case BuiltinFunction.SetEqual:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "Set#Equal", Bpl.Type.Bool, args);
+        case BuiltinFunction.SetSubset:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "Set#Subset", Bpl.Type.Bool, args);
+        case BuiltinFunction.SetDisjoint:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "Set#Disjoint", Bpl.Type.Bool, args);
+        case BuiltinFunction.ISetEmpty: {
+            Contract.Assert(args.Length == 0);
+            Bpl.Type resultType = Predef.ISetType;
+            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "ISet#Empty", resultType, args), resultType);
+          }
+        case BuiltinFunction.ISetUnionOne:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "ISet#UnionOne", Predef.ISetType, args);
+        case BuiltinFunction.ISetUnion:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "ISet#Union", Predef.ISetType, args);
+        case BuiltinFunction.ISetIntersection:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "ISet#Intersection", Predef.ISetType, args);
+        case BuiltinFunction.ISetDifference:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "ISet#Difference", Predef.ISetType, args);
+        case BuiltinFunction.ISetEqual:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "ISet#Equal", Bpl.Type.Bool, args);
+        case BuiltinFunction.ISetSubset:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "ISet#Subset", Bpl.Type.Bool, args);
+        case BuiltinFunction.ISetDisjoint:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "ISet#Disjoint", Bpl.Type.Bool, args);
+        case BuiltinFunction.MultiSetMultiplicity:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "MultiSet#Multiplicity", Bpl.Type.Int, args);
+        case BuiltinFunction.MultiSetUpdateMultiplicity:
+          Contract.Assert(args.Length == 3);
+          return FunctionCall(tok, "MultiSet#UpdateMultiplicity", Predef.MultiSetType, args);
+        case BuiltinFunction.MultiSetCard:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "MultiSet#Card", Bpl.Type.Int, args);
+        case BuiltinFunction.MultiSetEmpty: {
+            Contract.Assert(args.Length == 0);
+            Bpl.Type resultType = Predef.MultiSetType;
+            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "MultiSet#Empty", resultType, args), resultType);
+          }
+        case BuiltinFunction.MultiSetUnionOne:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "MultiSet#UnionOne", Predef.MultiSetType, args);
+        case BuiltinFunction.MultiSetUnion:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "MultiSet#Union", Predef.MultiSetType, args);
+        case BuiltinFunction.MultiSetIntersection:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "MultiSet#Intersection", Predef.MultiSetType, args);
+        case BuiltinFunction.MultiSetDifference:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "MultiSet#Difference", Predef.MultiSetType, args);
+        case BuiltinFunction.MultiSetEqual:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "MultiSet#Equal", Bpl.Type.Bool, args);
+        case BuiltinFunction.MultiSetSubset:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "MultiSet#Subset", Bpl.Type.Bool, args);
+        case BuiltinFunction.MultiSetDisjoint:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "MultiSet#Disjoint", Bpl.Type.Bool, args);
+        case BuiltinFunction.MultiSetFromSet:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "MultiSet#FromSet", Predef.MultiSetType, args);
+        case BuiltinFunction.MultiSetFromSeq:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "MultiSet#FromSeq", Predef.MultiSetType, args);
+        case BuiltinFunction.IsGoodMultiSet:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "$IsGoodMultiSet", Bpl.Type.Bool, args);
+
+        case BuiltinFunction.SeqLength:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "Seq#Length", Bpl.Type.Int, args);
+        case BuiltinFunction.SeqEmpty: {
+            Contract.Assert(args.Length == 0);
+            Bpl.Type resultType = Predef.SeqType;
+            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "Seq#Empty", resultType, args), resultType);
+          }
+        case BuiltinFunction.SeqBuild:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Seq#Build", Predef.SeqType, args);
+        case BuiltinFunction.SeqAppend:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Seq#Append", Predef.SeqType, args);
+        case BuiltinFunction.SeqIndex:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Seq#Index", Predef.BoxType, args);
+        case BuiltinFunction.SeqUpdate:
+          Contract.Assert(args.Length == 3);
+          return FunctionCall(tok, "Seq#Update", Predef.SeqType, args);
+        case BuiltinFunction.SeqContains:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Seq#Contains", Bpl.Type.Bool, args);
+        case BuiltinFunction.SeqDrop:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Seq#Drop", Predef.SeqType, args);
+        case BuiltinFunction.SeqTake:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Seq#Take", Predef.SeqType, args);
+        case BuiltinFunction.SeqEqual:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Seq#Equal", Bpl.Type.Bool, args);
+        case BuiltinFunction.SeqSameUntil:
+          Contract.Assert(args.Length == 3);
+          return FunctionCall(tok, "Seq#SameUntil", Bpl.Type.Bool, args);
+        case BuiltinFunction.SeqFromArray:
+          Contract.Assert(args.Length == 2);
+          return FunctionCall(tok, "Seq#FromArray", typeInstantiation, args);
+        case BuiltinFunction.SeqRank:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "Seq#Rank", Bpl.Type.Int, args);
+
+        case BuiltinFunction.MapEmpty: {
+            Contract.Assert(args.Length == 0);
+            Bpl.Type resultType = Predef.MapType;
+            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "Map#Empty", resultType, args), resultType);
+          }
+        case BuiltinFunction.MapCard:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "Map#Card", Bpl.Type.Int, args);
+        case BuiltinFunction.MapDomain:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "Map#Domain", typeInstantiation, args);
+        case BuiltinFunction.MapElements:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "Map#Elements", typeInstantiation, args);
+        case BuiltinFunction.MapGlue:
+          Contract.Assert(args.Length == 3);
+          return FunctionCall(tok, "Map#Glue", Predef.MapType, args);
+        case BuiltinFunction.MapEqual:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "Map#Equal", Bpl.Type.Bool, args);
+        case BuiltinFunction.MapDisjoint:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "Map#Disjoint", Bpl.Type.Bool, args);
+        case BuiltinFunction.MapUnion:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "Map#Disjoint", typeInstantiation, args);
+
+        case BuiltinFunction.IMapEmpty: {
+            Contract.Assert(args.Length == 0);
+            Bpl.Type resultType = Predef.IMapType;
+            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "IMap#Empty", resultType, args), resultType);
+          }
+        case BuiltinFunction.IMapDomain:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "IMap#Domain", typeInstantiation, args);
+        case BuiltinFunction.IMapElements:
+          Contract.Assert(args.Length == 1);
+          return FunctionCall(tok, "IMap#Elements", typeInstantiation, args);
+        case BuiltinFunction.IMapGlue:
+          Contract.Assert(args.Length == 3);
+          return FunctionCall(tok, "IMap#Glue", Predef.IMapType, args);
+        case BuiltinFunction.IMapEqual:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "IMap#Equal", Bpl.Type.Bool, args);
+
+        case BuiltinFunction.IndexField:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "IndexField", Predef.FieldName(tok), args);
+        case BuiltinFunction.MultiIndexField:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "MultiIndexField", Predef.FieldName(tok), args);
+
+        case BuiltinFunction.Box:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, BoxFunctionName, Predef.BoxType, args);
+        case BuiltinFunction.Unbox:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation != null);
+          return Bpl.Expr.CoerceType(tok, FunctionCall(tok, UnboxFunctionName, typeInstantiation, args), typeInstantiation);
+
+        case BuiltinFunction.RealToInt:
+          Contract.Assume(args.Length == 1);
+          Contract.Assume(typeInstantiation == null);
+          return FunctionCall(tok, "Int", Bpl.Type.Int, args);
+        case BuiltinFunction.IntToReal:
+          Contract.Assume(args.Length == 1);
+          Contract.Assume(typeInstantiation == null);
+          return FunctionCall(tok, "Real", Bpl.Type.Real, args);
+
+        case BuiltinFunction.IsGoodHeap:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "$IsGoodHeap", Bpl.Type.Bool, args);
+        case BuiltinFunction.IsHeapAnchor:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "$IsHeapAnchor", Bpl.Type.Bool, args);
+        case BuiltinFunction.HeapSucc:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "$HeapSucc", Bpl.Type.Bool, args);
+        case BuiltinFunction.HeapSuccGhost:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "$HeapSuccGhost", Bpl.Type.Bool, args);
+
+        case BuiltinFunction.DynamicType:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "dtype", Predef.ClassNameType, args);
+        case BuiltinFunction.TypeTuple:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "TypeTuple", Predef.ClassNameType, args);
+        case BuiltinFunction.DeclType:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation != null);
+          return FunctionCall(tok, "DeclType", Predef.ClassNameType, args);
+        case BuiltinFunction.FieldOfDecl:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation != null);
+          return FunctionCall(tok, "FieldOfDecl", Predef.FieldName(tok), args);
+        case BuiltinFunction.FDim:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation != null);
+          return FunctionCall(tok, "FDim", Bpl.Type.Int, args);
+        case BuiltinFunction.IsGhostField:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation != null);
+          return FunctionCall(tok, "$IsGhostField", Bpl.Type.Bool, args);
+
+        case BuiltinFunction.DatatypeCtorId:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "DatatypeCtorId", Predef.DtCtorId, args);
+        case BuiltinFunction.DtRank:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "DtRank", Bpl.Type.Int, args);
+        case BuiltinFunction.BoxRank:
+          Contract.Assert(args.Length == 1);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "BoxRank", Bpl.Type.Int, args);
+
+        case BuiltinFunction.GenericAlloc:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation == null);
+          return FunctionCall(tok, "GenericAlloc", Bpl.Type.Bool, args);
+
+        case BuiltinFunction.AtLayer:
+          Contract.Assert(args.Length == 2);
+          Contract.Assert(typeInstantiation != null);
+          return FunctionCall(tok, "AtLayer", typeInstantiation, args);
+
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected built-in function
+      }
+    }
+
+    static Bpl.NAryExpr FunctionCall(Bpl.IToken tok, string function, Bpl.Type returnType, params Bpl.Expr[] args) {
+      Contract.Requires(tok != null);
+      Contract.Requires(function != null);
+      Contract.Requires(returnType != null);
+      Contract.Requires(args != null);
+      Contract.Ensures(Contract.Result<Bpl.NAryExpr>() != null);
+
+      return new Bpl.NAryExpr(tok, new Bpl.FunctionCall(new Bpl.IdentifierExpr(tok, function, returnType)), new List<Bpl.Expr>(args));
+    }
+
+    static Bpl.NAryExpr FunctionCall(Bpl.IToken tok, string function, Bpl.Type returnType, List<Bpl.Expr> args) {
+      Contract.Requires(tok != null);
+      Contract.Requires(function != null);
+      Contract.Requires(returnType != null);
+      Contract.Requires(cce.NonNullElements(args));
+      Contract.Ensures(Contract.Result<Bpl.NAryExpr>() != null);
+
+      List<Bpl.Expr> aa = new List<Bpl.Expr>();
+      foreach (Bpl.Expr arg in args) {
+        aa.Add(arg);
+      }
+      return new Bpl.NAryExpr(tok, new Bpl.FunctionCall(new Bpl.IdentifierExpr(tok, function, returnType)), aa);
+    }
+
+    public Bpl.Expr ProperSubset(Bpl.IToken tok, Bpl.Expr e0, Bpl.Expr e1, bool isFinite) {
+      Contract.Requires(tok != null);
+      Contract.Requires(e0 != null);
+      Contract.Requires(e1 != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      var subsetOperator = isFinite ? BuiltinFunction.SetSubset : BuiltinFunction.ISetSubset;
+      return Bpl.Expr.Binary(tok, Bpl.BinaryOperator.Opcode.And,
+        FunctionCall(tok, subsetOperator, null, e0, e1),
+        Bpl.Expr.Not(FunctionCall(tok, subsetOperator, null, e1, e0)));
+    }
+    public Bpl.Expr ProperMultiset(Bpl.IToken tok, Bpl.Expr e0, Bpl.Expr e1) {
+      Contract.Requires(tok != null);
+      Contract.Requires(e0 != null);
+      Contract.Requires(e1 != null);
+      return Bpl.Expr.Binary(tok, Bpl.BinaryOperator.Opcode.And,
+        FunctionCall(tok, BuiltinFunction.MultiSetSubset, null, e0, e1),
+        Bpl.Expr.Not(FunctionCall(tok, BuiltinFunction.MultiSetEqual, null, e0, e1)));
+    }
+    public Bpl.Expr ProperPrefix(Bpl.IToken tok, Bpl.Expr e0, Bpl.Expr e1) {
+      Contract.Requires(tok != null);
+      Contract.Requires(e0 != null);
+      Contract.Requires(e1 != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+      Bpl.Expr len0 = FunctionCall(tok, BuiltinFunction.SeqLength, null, e0);
+      Bpl.Expr len1 = FunctionCall(tok, BuiltinFunction.SeqLength, null, e1);
+      var result = BplAnd(
+        Bpl.Expr.Lt(len0, len1),
+        FunctionCall(tok, BuiltinFunction.SeqSameUntil, null, e0, e1, len0));
+      result.tok = tok;
+      return result;
+    }
+
+    Bpl.Expr ArrayLength(Bpl.IToken tok, Bpl.Expr arr, int totalDims, int dim) {
+      Contract.Requires(tok != null);
+      Contract.Requires(arr != null);
+      Contract.Requires(1 <= totalDims);
+      Contract.Requires(0 <= dim && dim < totalDims);
+
+      string name = "_System." + SystemModuleManager.ArrayClassName(totalDims) + ".Length";
+      if (totalDims != 1) {
+        name += dim;
+      }
+      return new Bpl.NAryExpr(tok, new Bpl.FunctionCall(new Bpl.IdentifierExpr(tok, name, Bpl.Type.Int)), new List<Bpl.Expr> { arr });
+    }
+
+    static Bpl.Expr BplForall(IEnumerable<Bpl.Variable> args_in, Bpl.Expr body) {
+      Contract.Requires(args_in != null);
+      Contract.Requires(body != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+      var args = new List<Bpl.Variable>(args_in);
+      if (args.Count == 0) {
+        return body;
+      } else {
+        return new Bpl.ForallExpr(body.tok, args, body); // NO_TRIGGER
+      }
+    }
+
+    // Note: if the trigger is null, makes a forall without any triggers
+    static Bpl.Expr BplForall(IEnumerable<Bpl.Variable> args_in, Bpl.Trigger trg, Bpl.Expr body) {
+      if (trg == null) {
+        return BplForall(args_in, body); // NO_TRIGGER
+      } else {
+        var args = new List<Bpl.Variable>(args_in);
+        if (args.Count == 0) {
+          return body;
+        } else {
+          return new Bpl.ForallExpr(body.tok, args, trg, body);
+        }
+      }
+    }
+
+    static Bpl.Expr BplForall(Bpl.Variable arg, Bpl.Trigger trg, Bpl.Expr body) {
+      return BplForall(Singleton(arg), trg, body);
+    }
+
+    static Bpl.Expr BplForall(Bpl.IToken tok, List<Bpl.TypeVariable> typeParams,
+      List<Bpl.Variable> formals, Bpl.QKeyValue kv, Bpl.Trigger triggers, Bpl.Expr body, bool immutable = false) {
+      return (typeParams.Count == 0 && formals.Count == 0) ? body
+        : new Bpl.ForallExpr(tok, typeParams, formals, kv, triggers, body, immutable);
+    }
+
+    public static Bpl.Expr BplAnd(IEnumerable<Bpl.Expr> conjuncts) {
+      Contract.Requires(conjuncts != null);
+      Bpl.Expr eq = Bpl.Expr.True;
+      foreach (var c in conjuncts) {
+        eq = BplAnd(eq, c);
+      }
+      return eq;
+    }
+
+    public static Bpl.Expr BplAnd(Bpl.Expr a, Bpl.Expr b) {
+      Contract.Requires(a != null);
+      Contract.Requires(b != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      var aNoLit = RemoveLit(a);
+      var bNoLit = RemoveLit(b);
+
+      if (aNoLit == Bpl.Expr.True) {
+        return b;
+      } else if (bNoLit == Bpl.Expr.True) {
+        return a;
+      } else if (aNoLit == Bpl.Expr.False || bNoLit == Bpl.Expr.False) {
+        return Bpl.Expr.False;
+      } else {
+        return Bpl.Expr.Binary(a.tok, Bpl.BinaryOperator.Opcode.And, a, b);
+      }
+    }
+
+    public static Bpl.Expr BplOr(IEnumerable<Bpl.Expr> disjuncts) {
+      Contract.Requires(disjuncts != null);
+      Bpl.Expr eq = Bpl.Expr.False;
+      foreach (var d in disjuncts) {
+        eq = BplOr(eq, d);
+      }
+      return eq;
+    }
+
+    public static Bpl.Expr BplOr(Bpl.Expr a, Bpl.Expr b) {
+      Contract.Requires(a != null);
+      Contract.Requires(b != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      var aNoLit = RemoveLit(a);
+      var bNoLit = RemoveLit(b);
+
+      if (aNoLit == Bpl.Expr.False) {
+        return b;
+      } else if (bNoLit == Bpl.Expr.False) {
+        return a;
+      } else if (aNoLit == Bpl.Expr.True) {
+        return a;
+      } else if (bNoLit == Bpl.Expr.True) {
+        return b;
+      } else {
+        return Bpl.Expr.Binary(a.tok, Bpl.BinaryOperator.Opcode.Or, a, b);
+      }
+    }
+
+    public static Bpl.Expr BplIff(Bpl.Expr a, Bpl.Expr b) {
+      Contract.Requires(a != null);
+      Contract.Requires(b != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      var aNoLit = RemoveLit(a);
+      var bNoLit = RemoveLit(b);
+
+      if (aNoLit == Bpl.Expr.True) {
+        return b;
+      } else if (bNoLit == Bpl.Expr.True) {
+        return a;
+      } else if (aNoLit == Bpl.Expr.False) {
+        return Bpl.Expr.Not(b);
+      } else if (bNoLit == Bpl.Expr.False) {
+        return Bpl.Expr.Not(a);
+      } else if (aNoLit == bNoLit) {
+        return Bpl.Expr.True;
+      } else if (aNoLit == Bpl.Expr.Not(b) || bNoLit == Bpl.Expr.Not(a)) {
+        return Bpl.Expr.False;
+      } else {
+        return Bpl.Expr.Iff(a, b);
+      }
+    }
+
+    public static Bpl.Expr BplImp(Bpl.Expr a, Bpl.Expr b) {
+      Contract.Requires(a != null);
+      Contract.Requires(b != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      var aNoLit = RemoveLit(a);
+      var bNoLit = RemoveLit(b);
+
+      if (aNoLit == Bpl.Expr.True || bNoLit == Bpl.Expr.True) {
+        return b;
+      } else if (aNoLit == Bpl.Expr.False) {
+        return Bpl.Expr.True;
+      } else {
+        return Bpl.Expr.Imp(a, b);
+      }
+    }
+
+    private void BplIfIf(Bpl.IToken tk, bool yes, Bpl.Expr guard, BoogieStmtListBuilder builder, Action<BoogieStmtListBuilder> k) {
+      if (yes) {
+        var newBuilder = new BoogieStmtListBuilder(builder.tran, options, builder.Context);
+        k(newBuilder);
+        builder.Add(new Bpl.IfCmd(tk, guard, newBuilder.Collect(tk), null, null));
+      } else {
+        k(builder);
+      }
+    }
+
+    /// <summary>
+    /// lhs should be a Bpl.IdentifierExpr.
+    /// Creates lhs := rhs;
+    /// </summary>
+    static Bpl.Cmd BplSimplestAssign(Bpl.Expr lhs, Bpl.Expr rhs) {
+      Contract.Requires(lhs is Bpl.IdentifierExpr);
+      return new Bpl.AssignCmd(rhs.tok,
+        Singleton((Bpl.AssignLhs)new Bpl.SimpleAssignLhs(rhs.tok, (Bpl.IdentifierExpr)lhs)),
+        Singleton(rhs));
+    }
+
+    /// Makes a simple trigger
+    static Bpl.Trigger BplTrigger(Bpl.Expr e) {
+      return new Bpl.Trigger(e.tok, true, new List<Bpl.Expr> { e });
+    }
+
+    static Bpl.Trigger BplTriggerHeap(BoogieGenerator boogieGenerator, Bpl.IToken tok, Bpl.Expr e, Bpl.Expr/*?*/ optionalHeap, Bpl.Expr/*?*/ ePrime = null) {
+      Contract.Requires(boogieGenerator != null);
+      Contract.Requires(tok != null);
+      Contract.Requires(e != null);
+
+      var exprs = new List<Bpl.Expr> { e };
+      if (ePrime != null) {
+        exprs.Add(ePrime);
+      }
+      if (optionalHeap != null) {
+        exprs.Add(boogieGenerator.FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, optionalHeap));
+      }
+      return new Bpl.Trigger(tok, true, exprs);
+    }
+
+    static Bpl.Axiom BplAxiom(Bpl.Expr e) {
+      return new Bpl.Axiom(e.tok, e);
+    }
+
+    public static Bpl.Expr BplLocalVar(string name, Bpl.Type ty, Variables lvars) {
+      lvars.GetOrAdd(BplLocalVar(name, ty, out var v));
+      return v;
+    }
+
+    public static Bpl.LocalVariable BplLocalVar(string name, Bpl.Type ty, out Bpl.Expr e) {
+      Contract.Requires(ty != null);
+      var v = new Bpl.LocalVariable(ty.tok, new Bpl.TypedIdent(ty.tok, name, ty));
+      e = new Bpl.IdentifierExpr(ty.tok, name, ty);
+      return v;
+    }
+
+    /* This function allows you to replace, for example:
+
+           Bpl.BoundVariable iVar = new Bpl.BoundVariable(e.Tok, new Bpl.TypedIdent(e.Tok, "$i", Bpl.Type.Int));
+           Bpl.IdentifierExpr i = new Bpl.IdentifierExpr(e.Tok, iVar);
+
+       with:
+
+           Bpl.Expr i; var iVar = BplBoundVar("$i", Bpl.Type.Int, out i);
+    */
+    static Bpl.BoundVariable BplBoundVar(string name, Bpl.Type ty, out Bpl.Expr e) {
+      Contract.Requires(ty != null);
+      var v = new Bpl.BoundVariable(ty.tok, new Bpl.TypedIdent(ty.tok, name, ty));
+      e = new Bpl.IdentifierExpr(ty.tok, name, ty);
+      return v;
+    }
+
+    static Bpl.Expr BplBoundVar(string name, Bpl.Type ty, List<Bpl.Variable> bvars) {
+      bvars.Add(BplBoundVar(name, ty, out var e));
+      return e;
+    }
+
+    // Makes a formal variable
+    static Bpl.Formal BplFormalVar(string/*?*/ name, Bpl.Type ty, bool incoming) {
+      return BplFormalVar(name, ty, incoming, out _);
+    }
+
+    static Bpl.Formal BplFormalVar(string/*?*/ name, Bpl.Type ty, bool incoming, out Bpl.Expr e, Bpl.Expr whereClause = null) {
+      if (name == null) {
+        name = Bpl.TypedIdent.NoName;
+      }
+      var res = new Bpl.Formal(ty.tok, new Bpl.TypedIdent(ty.tok, name, ty, whereClause), incoming);
+      e = new Bpl.IdentifierExpr(ty.tok, res);
+      return res;
+    }
+
+    static Bpl.Expr BplFormalVar(string name, Bpl.Type ty, bool incoming, List<Bpl.Variable> fvars) {
+      fvars.Add(BplFormalVar(name, ty, incoming, out var e));
+      return e;
+    }
+
+    public static IOrigin ToDafnyToken(bool reportRanges, Bpl.IToken boogieToken) {
+      if (boogieToken == null) {
+        return null;
+      } else if (boogieToken is IOrigin dafnyToken) {
+        return dafnyToken;
+      } else if (boogieToken is VCGeneration.TokenWrapper tokenWrapper) {
+        return ToDafnyToken(reportRanges, tokenWrapper.Inner);
+      } else if (ReferenceEquals(boogieToken, Boogie.Token.NoToken)) {
+        return Token.NoToken;
+      } else {
+        // These boogie Tokens can be created by TokenTextWriter
+        // This is defensive programming but we aren't expecting to hit this case
+        return new Token {
+          col = boogieToken.col - 1,
+          Uri = new Uri("untitled:" + boogieToken.filename),
+          kind = boogieToken.kind,
+          LeadingTrivia = "",
+          line = boogieToken.line,
+          Next = null,
+          pos = boogieToken.pos,
+          TrailingTrivia = "",
+          val = boogieToken.val
+        };
+      }
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.Decreases.cs b/Source/DafnyCore/Verifier/BoogieGenerator.Decreases.cs
new file mode 100644
index 00000000000..3fd3258f182
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.Decreases.cs
@@ -0,0 +1,383 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Reflection;
+using System.Security.Cryptography;
+using Bpl = Microsoft.Boogie;
+using BplParser = Microsoft.Boogie.Parser;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using Core;
+using DafnyCore.Verifier;
+using Microsoft.BaseTypes;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Dafny.Triggers;
+using Action = System.Action;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+using static Microsoft.Dafny.GenericErrors;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+
+
+  /// <summary>
+  /// Emit to "builder" a check that calleeDecreases is less than contextDecreases.  More precisely,
+  /// the check is:
+  ///     allowance || (calleeDecreases LESS contextDecreases).
+  /// </summary>
+  void CheckCallTermination(IOrigin tok, List<Expression> contextDecreases, List<Expression> calleeDecreases,
+                            Expression allowance,
+                            Expression receiverReplacement, Dictionary<IVariable, Expression> substMap,
+                            Dictionary<IVariable, Expression> directSubstMap,
+                            Dictionary<TypeParameter, Type> typeMap,
+                            ExpressionTranslator etranCurrent, bool oldCaller, BoogieStmtListBuilder builder, bool inferredDecreases, string hint) {
+    Contract.Requires(tok != null);
+    Contract.Requires(cce.NonNullElements(contextDecreases));
+    Contract.Requires(cce.NonNullElements(calleeDecreases));
+    Contract.Requires(cce.NonNullDictionaryAndValues(substMap));
+    Contract.Requires(etranCurrent != null);
+    Contract.Requires(builder != null);
+
+    // The interpretation of the given decreases-clause expression tuples is as a lexicographic tuple, extended into
+    // an infinite tuple by appending TOP elements.  The TOP element is strictly larger than any other value given
+    // by a Dafny expression.  Each Dafny types has its own ordering, and these orderings are combined into a partial
+    // order where elements from different Dafny types are incomparable.  Thus, as an optimization below, if two
+    // components from different types are compared, the answer is taken to be false.
+
+    if (Contract.Exists(calleeDecreases, e => e is WildcardExpr)) {
+      // no check needed
+      return;
+    }
+
+    int N = Math.Min(contextDecreases.Count, calleeDecreases.Count);
+    var toks = new List<IOrigin>();
+    var callee = new List<Expr>();
+    var caller = new List<Expr>();
+    var oldExpressions = new List<Expression>();
+    var newExpressions = new List<Expression>();
+    Bpl.Expr canCalls = Bpl.Expr.True;
+    if (tok.IsInherited(currentModule) && contextDecreases.All(e => !e.Origin.IsInherited(currentModule))) {
+      // the call site is inherited but all the context decreases expressions are new
+      tok = new ForceCheckOrigin(tok);
+    }
+    for (int i = 0; i < N; i++) {
+      Expression e0 = Substitute(calleeDecreases[i], receiverReplacement, substMap, typeMap);
+      Expression e0direct = Substitute(calleeDecreases[i], receiverReplacement, directSubstMap, typeMap);
+      Expression e1 = contextDecreases[i];
+      if (oldCaller) {
+        e1 = new OldExpr(e1.Origin, e1) {
+          Type = e1.Type // To ensure that e1 stays resolved
+        };
+      }
+      if (!CompatibleDecreasesTypes(e0.Type, e1.Type)) {
+        N = i;
+        break;
+      }
+      oldExpressions.Add(e1);
+      newExpressions.Add(e0direct);
+      toks.Add(new NestedOrigin(tok, e1.Origin));
+      canCalls = BplAnd(canCalls, etranCurrent.CanCallAssumption(e1));
+      canCalls = BplAnd(canCalls, etranCurrent.CanCallAssumption(e0direct));
+      callee.Add(etranCurrent.TrExpr(e0));
+      caller.Add(etranCurrent.TrExpr(e1));
+    }
+    bool endsWithWinningTopComparison = N == contextDecreases.Count && N < calleeDecreases.Count;
+    builder.Add(TrAssumeCmd(tok, canCalls));
+    Bpl.Expr decrExpr = DecreasesCheck(toks, null, newExpressions, oldExpressions, callee, caller, builder, "", endsWithWinningTopComparison, false);
+    if (allowance != null) {
+      decrExpr = BplOr(etranCurrent.TrExpr(allowance), decrExpr);
+    }
+    builder.Add(Assert(tok, decrExpr, new
+      Terminates(inferredDecreases, null, allowance,
+                        oldExpressions, newExpressions, endsWithWinningTopComparison, hint), builder.Context));
+  }
+
+  /// <summary>
+  /// Returns the expression that says whether or not the decreases function has gone down (if !allowNoChange)
+  /// or has gone down or stayed the same (if allowNoChange).
+  /// ee0 represents the new values and ee1 represents old values.
+  /// If builder is non-null, then the check '0 ATMOST decr' is generated to builder.
+  /// Requires all types in types0 and types1 to be non-proxy non-synonym types (that is, callers should invoke NormalizeExpand)
+  /// </summary>
+  Bpl.Expr DecreasesCheck(List<IOrigin> toks, List<VarDeclStmt> prevGhostLocals,
+                          List<Expression> dafny0, List<Expression> dafny1, List<Bpl.Expr> ee0, List<Bpl.Expr> ee1,
+                          BoogieStmtListBuilder builder, string suffixMsg, bool allowNoChange, bool includeLowerBound) {
+    Contract.Requires(cce.NonNullElements(toks));
+    Contract.Requires(cce.NonNullElements(dafny0));
+    Contract.Requires(cce.NonNullElements(dafny1));
+    Contract.Requires(cce.NonNullElements(ee0));
+    Contract.Requires(cce.NonNullElements(ee1));
+    Contract.Requires(Predef != null);
+    Contract.Requires(dafny0.Count == dafny1.Count && dafny0.Count == ee0.Count && ee0.Count == ee1.Count);
+    Contract.Requires(builder == null || suffixMsg != null);
+    Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+    int N = dafny0.Count;
+
+    // compute eq and less for each component of the lexicographic tuple
+    List<Bpl.Expr> Eq = new List<Bpl.Expr>(N);
+    List<Bpl.Expr> Less = new List<Bpl.Expr>(N);
+    List<Expression> EqDafny = new List<Expression>(N);
+    List<Expression> LessDafny = new List<Expression>(N);
+    for (int i = 0; i < N; i++) {
+      Bpl.Expr less, atmost, eq;
+      var ty0 = dafny0[i].Type.NormalizeExpandKeepConstraints();
+      var ty1 = dafny1[i].Type.NormalizeExpandKeepConstraints();
+      ComputeLessEq(toks[i], ty0, ty1, ee0[i], ee1[i], out less, out atmost, out eq, includeLowerBound);
+      Eq.Add(eq);
+      EqDafny.Add(Expression.CreateEq(dafny0[i], dafny1[i], dafny0[i].Type.NormalizeExpand()));
+      Less.Add(allowNoChange ? atmost : less);
+      LessDafny.Add(
+        allowNoChange
+          ? Expression.CreateAtMost(dafny0[i], dafny1[i])
+          : Expression.CreateLess(dafny0[i], dafny1[i]));
+    }
+    if (builder != null) {
+      // check: 0 <= ee1
+      // more precisely, for component k of the lexicographic decreases function, check:
+      //   ee0[0] < ee1[0] || ee0[1] < ee1[1] || ... || ee0[k-1] < ee1[k-1] || ee0[k] == ee1[k] || 0 <= ee1[k]
+      for (int k = 0; k < N; k++) {
+        // we only need to check lower bound for integers--sets, sequences, booleans, references, and datatypes all have natural lower bounds
+        Bpl.Expr prefixIsLess = Bpl.Expr.False;
+        for (int i = 0; i < k; i++) {
+          prefixIsLess = BplOr(prefixIsLess, Less[i]);
+        };
+
+        Bpl.Expr zero = null;
+        Expression dafnyZero = null;
+        string zeroStr = null;
+        if (dafny0[k].Type.NormalizeExpandKeepConstraints().IsNumericBased(Type.NumericPersuasion.Int)) {
+          zero = Bpl.Expr.Literal(0);
+          dafnyZero = Expression.CreateIntLiteral(dafny0[k].Origin, 0);
+          zeroStr = "0";
+        } else if (dafny0[k].Type.NormalizeExpandKeepConstraints().IsNumericBased(Type.NumericPersuasion.Real)) {
+          zero = Bpl.Expr.Literal(BaseTypes.BigDec.ZERO);
+          dafnyZero = Expression.CreateRealLiteral(dafny0[k].Origin, BigDec.ZERO);
+          zeroStr = "0.0";
+        }
+        if (zero != null) {
+          Bpl.Expr bounded = Bpl.Expr.Le(zero, ee1[k]);
+          Expression boundedDafny = Expression.CreateAtMost(dafnyZero, dafny1[k]);
+          for (int i = 0; i < k; i++) {
+            bounded = BplOr(bounded, Less[i]);
+            boundedDafny = Expression.CreateOr(boundedDafny, LessDafny[i]);
+          }
+
+          Expression dafnyBound = Expression.CreateOr(boundedDafny, EqDafny[k]);
+          Bpl.Cmd cmd = Assert(toks[k], BplOr(bounded, Eq[k]),
+            new DecreasesBoundedBelow(N, k, zeroStr, prevGhostLocals, dafnyBound, suffixMsg), builder.Context);
+          builder.Add(cmd);
+        }
+      }
+    }
+    // check: ee0 < ee1 (or ee0 <= ee1, if allowNoChange)
+    Bpl.Expr decrCheck = allowNoChange ? Bpl.Expr.True : Bpl.Expr.False;
+    for (int i = N; 0 <= --i;) {
+      Bpl.Expr less = Less[i];
+      Bpl.Expr eq = Eq[i];
+      if (allowNoChange) {
+        // decrCheck = atmost && (eq ==> decrCheck)
+        decrCheck = BplAnd(less, BplImp(eq, decrCheck));
+      } else {
+        // decrCheck = less || (eq && decrCheck)
+        decrCheck = BplOr(less, BplAnd(eq, decrCheck));
+      }
+    }
+    return decrCheck;
+  }
+
+  static bool CompatibleDecreasesTypes(Type t, Type u) {
+    Contract.Requires(t != null);
+    Contract.Requires(u != null);
+    t = t.NormalizeToAncestorType();
+    u = u.NormalizeToAncestorType();
+    if (t is BoolType) {
+      return u is BoolType;
+    } else if (t is CharType) {
+      return u is CharType;
+    } else if (t is IntType) {
+      // we can allow different kinds of int-based types
+      return u is IntType;
+    } else if (t is RealType) {
+      // we can allow different kinds of real-based types
+      return u is RealType;
+    } else if (t is SetType) {
+      return u is SetType;
+    } else if (t is SeqType) {
+      return u is SeqType || u.IsIndDatatype;
+    } else if (t.IsDatatype) {
+      return u.IsDatatype || (t.IsIndDatatype && u is SeqType);
+    } else if (t.IsRefType) {
+      return u.IsRefType;
+    } else if (t is MultiSetType) {
+      return u is MultiSetType;
+    } else if (t is MapType) {
+      return u is MapType && ((MapType)t).Finite == ((MapType)u).Finite;
+    } else if (t is ArrowType) {
+      return u is ArrowType;
+    } else if (t is BitvectorType) {
+      return u is BitvectorType;
+    } else if (t is BigOrdinalType) {
+      return u is BigOrdinalType;
+    } else if (t.IsTypeParameter || t.IsAbstractType || t.IsInternalTypeSynonym) {
+      return false;  // don't consider any type parameters to be the same (since we have no comparison function for them anyway)
+    } else {
+      return t.Equals(u);
+    }
+  }
+
+  Nullable<BuiltinFunction> RankFunction(Type/*!*/ ty) {
+    Contract.Requires(ty != null);
+    if (ty is SeqType) {
+      return BuiltinFunction.SeqRank;
+    } else if (ty.IsIndDatatype) {
+      return BuiltinFunction.DtRank;
+    } else {
+      return null;
+    }
+  }
+
+  void ComputeLessEq(IOrigin tok, Type ty0, Type ty1, Bpl.Expr e0, Bpl.Expr e1, out Bpl.Expr less, out Bpl.Expr atmost, out Bpl.Expr eq, bool includeLowerBound) {
+    Contract.Requires(tok != null);
+    Contract.Requires(ty0 != null);
+    Contract.Requires(ty1 != null);
+    Contract.Requires(e0 != null);
+    Contract.Requires(e1 != null);
+    Contract.Requires(Predef != null);
+    Contract.Ensures(Contract.ValueAtReturn(out less) != null);
+    Contract.Ensures(Contract.ValueAtReturn(out atmost) != null);
+    Contract.Ensures(Contract.ValueAtReturn(out eq) != null);
+
+    ty0 = ty0.NormalizeToAncestorType();
+    ty1 = ty1.NormalizeToAncestorType();
+    var rk0 = RankFunction(ty0);
+    var rk1 = RankFunction(ty1);
+    if (rk0 != null && rk1 != null && rk0 != rk1) {
+      eq = Bpl.Expr.False;
+      Bpl.Expr b0 = FunctionCall(tok, rk0.Value, null, e0);
+      Bpl.Expr b1 = FunctionCall(tok, rk1.Value, null, e1);
+      less = Bpl.Expr.Lt(b0, b1);
+      atmost = Bpl.Expr.Le(b0, b1);
+    } else if (ty0 is BoolType) {
+      eq = BplIff(e0, e1);
+      less = BplAnd(Bpl.Expr.Not(e0), e1);
+      atmost = BplImp(e0, e1);
+    } else if (ty0 is CharType) {
+      eq = Bpl.Expr.Eq(e0, e1);
+      var operand0 = FunctionCall(e0.tok, BuiltinFunction.CharToInt, null, e0);
+      var operand1 = FunctionCall(e0.tok, BuiltinFunction.CharToInt, null, e1);
+      less = Bpl.Expr.Binary(tok, BinaryOperator.Opcode.Lt, operand0, operand1);
+      atmost = Bpl.Expr.Binary(tok, BinaryOperator.Opcode.Le, operand0, operand1);
+    } else if (ty0.IsNumericBased(Type.NumericPersuasion.Int) || ty0 is SeqType || ty0.IsDatatype) {
+      Bpl.Expr b0, b1;
+      if (ty0.IsNumericBased(Type.NumericPersuasion.Int)) {
+        b0 = e0;
+        b1 = e1;
+      } else if (ty0 is SeqType) {
+        b0 = FunctionCall(tok, BuiltinFunction.SeqRank, null, e0);
+        b1 = FunctionCall(tok, BuiltinFunction.SeqRank, null, e1);
+      } else if (ty0.IsDatatype) {
+        b0 = FunctionCall(tok, BuiltinFunction.DtRank, null, e0);
+        b1 = FunctionCall(tok, BuiltinFunction.DtRank, null, e1);
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();
+      }
+      eq = Bpl.Expr.Eq(b0, b1);
+      less = Bpl.Expr.Lt(b0, b1);
+      atmost = Bpl.Expr.Le(b0, b1);
+      if (ty0.IsNumericBased(Type.NumericPersuasion.Int) && includeLowerBound) {
+        less = BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(0), b0), less);
+        atmost = BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(0), b0), atmost);
+      }
+
+    } else if (ty0.IsNumericBased(Type.NumericPersuasion.Real)) {
+      eq = Bpl.Expr.Eq(e0, e1);
+      less = Bpl.Expr.Le(e0, Bpl.Expr.Sub(e1, Bpl.Expr.Literal(BaseTypes.BigDec.FromInt(1))));
+      atmost = Bpl.Expr.Le(e0, e1);
+      if (includeLowerBound) {
+        less = BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(BaseTypes.BigDec.ZERO), e0), less);
+        atmost = BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(BaseTypes.BigDec.ZERO), e0), atmost);
+      }
+
+    } else if (ty0 is IteratorDecl.EverIncreasingType) {
+      eq = Bpl.Expr.Eq(e0, e1);
+      less = Bpl.Expr.Gt(e0, e1);
+      atmost = Bpl.Expr.Ge(e0, e1);
+
+    } else if (ty0 is SetType { Finite: true } || ty0 is MapType { Finite: true }) {
+      Bpl.Expr b0, b1;
+      if (ty0 is SetType) {
+        b0 = e0;
+        b1 = e1;
+      } else {
+        // for maps, compare their domains as sets
+        b0 = FunctionCall(tok, BuiltinFunction.MapDomain, Predef.MapType, e0);
+        b1 = FunctionCall(tok, BuiltinFunction.MapDomain, Predef.MapType, e1);
+      }
+      eq = FunctionCall(tok, BuiltinFunction.SetEqual, null, b0, b1);
+      less = ProperSubset(tok, b0, b1, true);
+      atmost = FunctionCall(tok, BuiltinFunction.SetSubset, null, b0, b1);
+
+    } else if (ty0 is SetType || ty0 is MapType) {
+      Bpl.Expr b0, b1;
+      if (ty0 is SetType) {
+        Contract.Assert(!((SetType)ty0).Finite);
+        b0 = e0;
+        b1 = e1;
+      } else {
+        Contract.Assert(!((MapType)ty0).Finite);
+        // for maps, compare their domains as sets
+        b0 = FunctionCall(tok, BuiltinFunction.IMapDomain, Predef.MapType, e0);
+        b1 = FunctionCall(tok, BuiltinFunction.IMapDomain, Predef.MapType, e1);
+      }
+      eq = FunctionCall(tok, BuiltinFunction.ISetEqual, null, b0, b1);
+      less = Bpl.Expr.False;
+      atmost = BplOr(less, eq);
+
+    } else if (ty0 is MultiSetType) {
+      eq = FunctionCall(tok, BuiltinFunction.MultiSetEqual, null, e0, e1);
+      less = ProperMultiset(tok, e0, e1);
+      atmost = FunctionCall(tok, BuiltinFunction.MultiSetSubset, null, e0, e1);
+
+    } else if (ty0 is ArrowType) {
+      eq = Bpl.Expr.Eq(e0, e1);
+      less = Bpl.Expr.False;  // TODO: try to do better than this
+      atmost = BplOr(less, eq);
+
+    } else if (ty0 is BitvectorType) {
+      BitvectorType bv = (BitvectorType)ty0;
+      eq = Bpl.Expr.Eq(e0, e1);
+      less = FunctionCall(tok, "lt_bv" + bv.Width, Bpl.Type.Bool, e0, e1);
+      atmost = FunctionCall(tok, "le_bv" + bv.Width, Bpl.Type.Bool, e0, e1);
+
+    } else if (ty0 is BigOrdinalType) {
+      eq = Bpl.Expr.Eq(e0, e1);
+      less = FunctionCall(tok, "ORD#Less", Bpl.Type.Bool, e0, e1);
+      atmost = BplOr(eq, less);
+
+    } else if (ty0.IsTypeParameter || ty0.IsAbstractType) {
+      eq = Bpl.Expr.Eq(e0, e1);
+      less = Bpl.Expr.False;
+      atmost = BplOr(less, eq);
+
+    } else {
+      // reference type
+      Contract.Assert(ty0.IsRefType);  // otherwise, unexpected type
+      var b0 = Bpl.Expr.Neq(e0, Predef.Null);
+      var b1 = Bpl.Expr.Neq(e1, Predef.Null);
+      eq = BplIff(b0, b1);
+      less = BplAnd(Bpl.Expr.Not(b0), b1);
+      atmost = BplImp(b0, b1);
+    }
+
+    less.tok = tok;
+    atmost.tok = tok;
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.DefiniteAssignment.cs b/Source/DafnyCore/Verifier/BoogieGenerator.DefiniteAssignment.cs
new file mode 100644
index 00000000000..ac55f79634b
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.DefiniteAssignment.cs
@@ -0,0 +1,194 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Diagnostics.Contracts;
+using Bpl = Microsoft.Boogie;
+using BplParser = Microsoft.Boogie.Parser;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny {
+  public partial class BoogieGenerator {
+    public const string DefassPrefix = "defass#";
+
+    #region Definite-assignment tracking
+
+    bool NeedsDefiniteAssignmentTracker(bool isGhost, Type type, bool isField) {
+      Contract.Requires(type != null);
+
+      if (options.DefiniteAssignmentLevel == 0) {
+        return false;
+      } else if (options.DefiniteAssignmentLevel == 1 ||
+                 (options.DefiniteAssignmentLevel == 4 && isField && !options.ForbidNondeterminism)) {
+        if (isGhost && type.IsNonempty) {
+          return false;
+        } else if (!isGhost && type.HasCompilableValue) {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    Bpl.Expr /*?*/ AddDefiniteAssignmentTracker(IVariable p, Variables localVariables, bool isOutParam = false,
+      bool forceGhostVar = false) {
+      Contract.Requires(p != null);
+      Contract.Requires(localVariables != null);
+
+      if (!NeedsDefiniteAssignmentTracker(p.IsGhost || forceGhostVar, p.Type, false)) {
+        return null;
+      }
+
+      Bpl.Variable tracker;
+      if (isOutParam) {
+        tracker = new Bpl.Formal(p.Origin, new Bpl.TypedIdent(p.Origin, DefassPrefix + p.UniqueName, Bpl.Type.Bool), false);
+      } else {
+        tracker = new Bpl.LocalVariable(p.Origin, new Bpl.TypedIdent(p.Origin, DefassPrefix + p.UniqueName, Bpl.Type.Bool));
+      }
+
+      tracker = localVariables.GetOrAdd(tracker);
+      var ie = new Bpl.IdentifierExpr(p.Origin, tracker);
+      DefiniteAssignmentTrackers = DefiniteAssignmentTrackers.Add(p.UniqueName, ie);
+      return ie;
+    }
+
+    void AddExistingDefiniteAssignmentTracker(IVariable p, bool forceGhostVar) {
+      Contract.Requires(p != null);
+
+      if (DefiniteAssignmentTrackers.ContainsKey(p.UniqueName)) {
+        return;
+      }
+
+      if (!NeedsDefiniteAssignmentTracker(p.IsGhost || forceGhostVar, p.Type, false)) {
+        return;
+      }
+
+      var ie = new Bpl.IdentifierExpr(p.Origin, DefassPrefix + p.UniqueName, Bpl.Type.Bool);
+      DefiniteAssignmentTrackers = DefiniteAssignmentTrackers.Add(p.UniqueName, ie);
+    }
+
+    void AddDefiniteAssignmentTrackerSurrogate(Field field, TopLevelDeclWithMembers enclosingClass,
+      Variables localVariables, bool forceGhostVar) {
+      Contract.Requires(field != null);
+      Contract.Requires(localVariables != null);
+
+      var type = field.Type.Subst(enclosingClass.ParentFormalTypeParametersToActuals);
+      if (!NeedsDefiniteAssignmentTracker(field.IsGhost || forceGhostVar, type, true)) {
+        return;
+      }
+
+      var nm = SurrogateName(field);
+      var tracker = localVariables.GetOrAdd(new Bpl.LocalVariable(field.Origin, new Bpl.TypedIdent(field.Origin, DefassPrefix + nm, Bpl.Type.Bool)));
+      var ie = new Bpl.IdentifierExpr(field.Origin, tracker);
+      DefiniteAssignmentTrackers = DefiniteAssignmentTrackers.Add(nm, ie);
+    }
+
+    void MarkDefiniteAssignmentTracker(IdentifierExpr expr, BoogieStmtListBuilder builder) {
+      Contract.Requires(expr != null);
+      Contract.Requires(builder != null);
+      MarkDefiniteAssignmentTracker(expr.Origin, expr.Var.UniqueName, builder);
+    }
+
+    void MarkDefiniteAssignmentTracker(IOrigin tok, string name, BoogieStmtListBuilder builder) {
+      Contract.Requires(tok != null);
+      Contract.Requires(builder != null);
+
+      Bpl.IdentifierExpr ie;
+      if (DefiniteAssignmentTrackers.TryGetValue(name, out ie)) {
+        builder.Add(Bpl.Cmd.SimpleAssign(tok, ie, Bpl.Expr.True));
+      }
+    }
+
+    internal IOrigin GetToken(INode node) {
+      return node is IHasNavigationToken hasNavigationToken ? hasNavigationToken.NavigationToken : node.Origin;
+    }
+
+    void CheckDefiniteAssignment(IdentifierExpr expr, BoogieStmtListBuilder builder) {
+      Contract.Requires(expr != null);
+      Contract.Requires(builder != null);
+
+      Bpl.IdentifierExpr ie;
+      if (DefiniteAssignmentTrackers.TryGetValue(expr.Var.UniqueName, out ie)) {
+        builder.Add(Assert(GetToken(expr), ie,
+          new DefiniteAssignment("variable", expr.Var.Name, "here"), builder.Context));
+      }
+    }
+
+    /// <summary>
+    /// Returns an expression denoting the definite-assignment tracker for "var", or "null" if there is none.
+    /// </summary>
+    Bpl.IdentifierExpr /*?*/ GetDefiniteAssignmentTracker(IVariable var) {
+      Bpl.IdentifierExpr ie;
+      if (DefiniteAssignmentTrackers.TryGetValue(var.UniqueName, out ie)) {
+        return ie;
+      }
+
+      return null;
+    }
+
+    void CheckDefiniteAssignmentSurrogate(IOrigin tok, Field field, bool atNew, BoogieStmtListBuilder builder) {
+      Contract.Requires(tok != null);
+      Contract.Requires(field != null);
+      Contract.Requires(builder != null);
+
+      var nm = SurrogateName(field);
+      if (DefiniteAssignmentTrackers.TryGetValue(nm, out var ie)) {
+        var desc = new DefiniteAssignment(
+          "field", field.Name, atNew ? "at this point in the constructor body" : "here");
+        builder.Add(Assert(tok, ie, desc, builder.Context));
+      }
+    }
+
+    void AssumeCanCallForByMethodDecl(Method method, BoogieStmtListBuilder builder) {
+      if (method?.FunctionFromWhichThisIsByMethodDecl?.ByMethodTok != null && // Otherwise nothing is checked anyway
+          method.Ens.Count == 1 &&
+          method.Ens[0].E is BinaryExpr { E1: var e1 } &&
+          e1.Resolved is FunctionCallExpr { Args: var arguments } fnCall) {
+        // fnCall == (m.Ens[0].E as BinaryExpr).E1;
+        // fn == new FunctionCallExpr(tok, f.Name, receiver, tok, tok, f.Formals.ConvertAll(Expression.CreateIdentExpr));
+        Bpl.IdentifierExpr canCallFuncID =
+          new Bpl.IdentifierExpr(method.Origin, method.FullSanitizedName + "#canCall", Bpl.Type.Bool);
+        var etran = new ExpressionTranslator(this, Predef, method.Origin, method);
+        List<Bpl.Expr> args = arguments.Select(arg => etran.TrExpr(arg)).ToList();
+        var formals = MkTyParamBinders(GetTypeParams(method), out var tyargs);
+        if (method.FunctionFromWhichThisIsByMethodDecl.ReadsHeap) {
+          Contract.Assert(etran.HeapExpr != null);
+          tyargs.Add(etran.HeapExpr);
+        }
+
+        if (!method.IsStatic) {
+          var thVar = BplBoundVar("this", TrReceiverType(method.FunctionFromWhichThisIsByMethodDecl), out var th);
+          tyargs.Add(th);
+        }
+
+        Bpl.Expr boogieAssumeCanCall =
+          new Bpl.NAryExpr(method.Origin, new FunctionCall(canCallFuncID), Concat(tyargs, args));
+        builder.Add(new AssumeCmd(method.Origin, boogieAssumeCanCall));
+      } else {
+        Contract.Assert(false, "Error in shape of by-method");
+      }
+    }
+
+    void CheckDefiniteAssignmentReturn(IOrigin tok, Formal p, BoogieStmtListBuilder builder) {
+      Contract.Requires(tok != null);
+      Contract.Requires(p != null && !p.InParam);
+      Contract.Requires(builder != null);
+
+      Bpl.IdentifierExpr ie;
+      if (DefiniteAssignmentTrackers.TryGetValue(p.UniqueName, out ie)) {
+        var desc = new DefiniteAssignment("out-parameter", p.Name, "at this return point");
+        builder.Add(Assert(tok, ie, desc, builder.Context));
+      }
+    }
+
+    #endregion // definite-assignment tracking
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.ExpressionTranslator.cs b/Source/DafnyCore/Verifier/BoogieGenerator.ExpressionTranslator.cs
new file mode 100644
index 00000000000..4cdfa352f3f
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.ExpressionTranslator.cs
@@ -0,0 +1,2506 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using System.Numerics;
+using Dafny;
+using Microsoft.BaseTypes;
+using Microsoft.Boogie;
+using Bpl = Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+
+namespace Microsoft.Dafny {
+  public partial class BoogieGenerator {
+    public partial class ExpressionTranslator {
+      private DafnyOptions options;
+
+      // HeapExpr == null ==> translation of pure (no-heap) expression
+      readonly Boogie.Expr _the_heap_expr;
+      public Boogie.Expr HeapExpr {
+        // The increment of Statistics_HeapUses in the following line is a hack and not entirely a good idea.
+        // Not only does one need to be careful not to mention HeapExpr in contracts (in particular, in ObjectInvariant()
+        // below), but also, the debugger may invoke HeapExpr and that will cause an increment as well.
+        get { Statistics_HeapUses++; return _the_heap_expr; }
+      }
+
+      public Boogie.Expr HeapExprForArrow(Type arrowType) {
+        if (arrowType.IsArrowTypeWithoutReadEffects) {
+          return BoogieGenerator.NewOneHeapExpr(arrowType.Origin);
+        } else {
+          return HeapExpr;
+        }
+      }
+
+      /// <summary>
+      /// Return HeapExpr as an IdentifierExpr.
+      /// CAUTION: This getter should be used only if the caller "knows" that HeapExpr really is an IdentifierExpr.
+      /// </summary>
+      public Boogie.IdentifierExpr HeapCastToIdentifierExpr {
+        get {
+          Contract.Assume(HeapExpr is Boogie.IdentifierExpr);
+          return (Boogie.IdentifierExpr)HeapExpr;
+        }
+      }
+
+      public readonly PredefinedDecls Predef;
+      public readonly BoogieGenerator BoogieGenerator;
+      public readonly string This;
+      public readonly string readsFrame; // the name of the context's frame variable for reading state.
+                                         // May be null to indicate the context's reads frame is * and doesn't require any reads checks.
+      public readonly IFrameScope scope; // lambda, function or predicate
+      public readonly string modifiesFrame; // the name of the context's frame variable for writing state.
+      readonly Function applyLimited_CurrentFunction;
+      internal readonly FuelSetting layerInterCluster;
+      internal readonly FuelSetting layerIntraCluster = null;  // a value of null says to do the same as for inter-cluster calls
+      public int Statistics_CustomLayerFunctionCount = 0;
+      public int Statistics_HeapAsQuantifierCount = 0;
+      public int Statistics_HeapUses = 0;
+      public readonly bool stripLits = false;
+      [ContractInvariantMethod]
+      void ObjectInvariant() {
+        // In the following line, it is important to use _the_heap_expr directly, rather than HeapExpr, because
+        // the HeapExpr getter has a side effect on Statistics_HeapUses.
+        Contract.Invariant(_the_heap_expr == null || _the_heap_expr is Boogie.OldExpr || _the_heap_expr is Boogie.IdentifierExpr);
+        Contract.Invariant(Predef != null);
+        Contract.Invariant(BoogieGenerator != null);
+        Contract.Invariant(This != null);
+        Contract.Invariant(modifiesFrame != null);
+        Contract.Invariant(layerInterCluster != null);
+        Contract.Invariant(0 <= Statistics_CustomLayerFunctionCount);
+      }
+
+      /// <summary>
+      /// This is the most general constructor.  It is private and takes all the parameters.  Whenever
+      /// one ExpressionTranslator is constructed from another, unchanged parameters are just copied in.
+      /// </summary>
+      ExpressionTranslator(BoogieGenerator boogieGenerator, PredefinedDecls predef, Boogie.Expr heap, string thisVar,
+        Function applyLimitedCurrentFunction, FuelSetting layerInterCluster, FuelSetting layerIntraCluster, IFrameScope scope,
+        string readsFrame, string modifiesFrame, bool stripLits) {
+
+        Contract.Requires(boogieGenerator != null);
+        Contract.Requires(predef != null);
+        Contract.Requires(thisVar != null);
+        Contract.Requires(readsFrame != null);
+        Contract.Requires(modifiesFrame != null);
+
+        this.BoogieGenerator = boogieGenerator;
+        this.Predef = predef;
+        this._the_heap_expr = heap;
+        this.This = thisVar;
+        this.applyLimited_CurrentFunction = applyLimitedCurrentFunction;
+        this.layerInterCluster = layerInterCluster;
+        if (layerIntraCluster == null) {
+          this.layerIntraCluster = layerInterCluster;
+        } else {
+          this.layerIntraCluster = layerIntraCluster;
+        }
+
+        this.scope = scope;
+        this.readsFrame = readsFrame;
+        this.modifiesFrame = modifiesFrame;
+        this.stripLits = stripLits;
+        this.options = boogieGenerator.options;
+      }
+
+      public static Boogie.IdentifierExpr HeapIdentifierExpr(PredefinedDecls predef, Boogie.IToken heapToken) {
+        return new Boogie.IdentifierExpr(heapToken, predef.HeapVarName, predef.HeapType);
+      }
+
+      public ExpressionTranslator(BoogieGenerator boogieGenerator, PredefinedDecls predef, Boogie.IToken heapToken, IFrameScope scope)
+        : this(boogieGenerator, predef, HeapIdentifierExpr(predef, heapToken), scope) {
+        Contract.Requires(boogieGenerator != null);
+        Contract.Requires(predef != null);
+        Contract.Requires(heapToken != null);
+      }
+
+      public ExpressionTranslator(BoogieGenerator boogieGenerator, PredefinedDecls predef, Boogie.Expr heap, IFrameScope scope)
+        : this(boogieGenerator, predef, heap, scope, "this") {
+        Contract.Requires(boogieGenerator != null);
+        Contract.Requires(predef != null);
+      }
+
+      public ExpressionTranslator(BoogieGenerator boogieGenerator, PredefinedDecls predef, Boogie.Expr heap, Boogie.Expr oldHeap, IFrameScope scope)
+        : this(boogieGenerator, predef, heap, scope, "this") {
+        Contract.Requires(boogieGenerator != null);
+        Contract.Requires(predef != null);
+        Contract.Requires(oldHeap != null);
+
+        var old = new ExpressionTranslator(boogieGenerator, predef, oldHeap, scope);
+        old.oldEtran = old;
+        this.oldEtran = old;
+      }
+
+      public ExpressionTranslator(BoogieGenerator boogieGenerator, PredefinedDecls predef, Boogie.Expr heap, IFrameScope scope, string thisVar)
+        : this(boogieGenerator, predef, heap, thisVar, null, new FuelSetting(boogieGenerator, 1), null, scope, "$_ReadsFrame", "$_ModifiesFrame", false) {
+        Contract.Requires(boogieGenerator != null);
+        Contract.Requires(predef != null);
+        Contract.Requires(thisVar != null);
+      }
+
+      public ExpressionTranslator(ExpressionTranslator etran, Boogie.Expr heap)
+        : this(etran.BoogieGenerator, etran.Predef, heap, etran.This, etran.applyLimited_CurrentFunction, etran.layerInterCluster, etran.layerIntraCluster, etran.scope, etran.readsFrame, etran.modifiesFrame, etran.stripLits) {
+        Contract.Requires(etran != null);
+      }
+
+      public ExpressionTranslator WithReadsFrame(string newReadsFrame, IFrameScope frameScope) {
+        return new ExpressionTranslator(BoogieGenerator, Predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, frameScope, newReadsFrame, modifiesFrame, stripLits);
+      }
+      public ExpressionTranslator WithReadsFrame(string newReadsFrame) {
+        return new ExpressionTranslator(BoogieGenerator, Predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, scope, newReadsFrame, modifiesFrame, stripLits);
+      }
+
+      public ExpressionTranslator WithModifiesFrame(string newModifiesFrame) {
+        return new ExpressionTranslator(BoogieGenerator, Predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, scope, readsFrame, newModifiesFrame, stripLits);
+      }
+
+      internal IOrigin GetToken(Expression expression) {
+        return BoogieGenerator.GetToken(expression);
+      }
+
+      ExpressionTranslator oldEtran;
+      public ExpressionTranslator Old {
+        get {
+          Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
+
+          if (oldEtran == null) {
+            oldEtran = new ExpressionTranslator(BoogieGenerator, Predef, new Boogie.OldExpr(HeapExpr.tok, HeapExpr), This, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, scope, readsFrame, modifiesFrame, stripLits);
+            oldEtran.oldEtran = oldEtran;
+          }
+          return oldEtran;
+        }
+      }
+
+      public ExpressionTranslator OldAt(Label/*?*/ label) {
+        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
+        if (label == null) {
+          return Old;
+        }
+        var heapAt = new Boogie.IdentifierExpr(Token.NoToken, "$Heap_at_" + label.AssignUniqueId(BoogieGenerator.CurrentIdGenerator), Predef.HeapType);
+        return new ExpressionTranslator(BoogieGenerator, Predef, heapAt, This, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, scope, readsFrame, modifiesFrame, stripLits);
+      }
+
+      public bool UsesOldHeap {
+        get {
+          return HeapExpr is Boogie.OldExpr || (HeapExpr is Boogie.IdentifierExpr ide && ide.Name.StartsWith("$Heap_at_"));
+        }
+      }
+
+      public ExpressionTranslator WithLayer(Boogie.Expr layerArgument) {
+        // different layer and 0 fuel amount.
+        Contract.Requires(layerArgument != null);
+        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
+
+        return CloneExpressionTranslator(this, BoogieGenerator, Predef, HeapExpr, This, null, new FuelSetting(BoogieGenerator, 0, layerArgument), new FuelSetting(BoogieGenerator, 0, layerArgument), readsFrame, modifiesFrame, stripLits);
+      }
+
+      internal ExpressionTranslator WithCustomFuelSetting(CustomFuelSettings customSettings) {
+        // Use the existing layers but with some per-function customizations
+        Contract.Requires(customSettings != null);
+        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
+
+        return CloneExpressionTranslator(this, BoogieGenerator, Predef, HeapExpr, This, null, layerInterCluster.WithContext(customSettings), layerIntraCluster.WithContext(customSettings), readsFrame, modifiesFrame, stripLits);
+      }
+
+      public ExpressionTranslator ReplaceLayer(Boogie.Expr layerArgument) {
+        // different layer with same fuel amount.
+        Contract.Requires(layerArgument != null);
+        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
+
+        return CloneExpressionTranslator(this, BoogieGenerator, Predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster.WithLayer(layerArgument), layerIntraCluster.WithLayer(layerArgument), readsFrame, modifiesFrame, stripLits);
+      }
+
+      public ExpressionTranslator WithNoLits() {
+        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
+        return CloneExpressionTranslator(this, BoogieGenerator, Predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, readsFrame, modifiesFrame, true);
+      }
+
+      public ExpressionTranslator LimitedFunctions(Function applyLimited_CurrentFunction, Boogie.Expr layerArgument) {
+        Contract.Requires(applyLimited_CurrentFunction != null);
+        Contract.Requires(layerArgument != null);
+        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
+
+        return CloneExpressionTranslator(this, BoogieGenerator, Predef, HeapExpr, This, applyLimited_CurrentFunction, /* layerArgument */ layerInterCluster, new FuelSetting(BoogieGenerator, 0, layerArgument), readsFrame, modifiesFrame, stripLits);
+      }
+
+      public ExpressionTranslator LayerOffset(int offset) {
+        Contract.Requires(0 <= offset);
+        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
+
+        return CloneExpressionTranslator(this, BoogieGenerator, Predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster.Offset(offset), layerIntraCluster, readsFrame, modifiesFrame, stripLits);
+      }
+
+      public ExpressionTranslator DecreaseFuel(int offset) {
+        Contract.Requires(0 <= offset);
+        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
+
+        return CloneExpressionTranslator(this, BoogieGenerator, Predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster.Decrease(offset), layerIntraCluster, readsFrame, modifiesFrame, stripLits);
+      }
+
+      private static ExpressionTranslator CloneExpressionTranslator(ExpressionTranslator orig,
+        BoogieGenerator boogieGenerator, PredefinedDecls predef, Boogie.Expr heap, string thisVar,
+        Function applyLimited_CurrentFunction, FuelSetting layerInterCluster, FuelSetting layerIntraCluster, string readsFrame, string modifiesFrame, bool stripLits) {
+        var et = new ExpressionTranslator(boogieGenerator, predef, heap, thisVar, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, orig.scope, readsFrame, modifiesFrame, stripLits);
+        if (orig.oldEtran != null) {
+          var etOld = new ExpressionTranslator(boogieGenerator, predef, orig.Old.HeapExpr, thisVar, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, orig.scope, readsFrame, modifiesFrame, stripLits);
+          etOld.oldEtran = etOld;
+          et.oldEtran = etOld;
+        }
+        return et;
+      }
+
+      public Boogie.IdentifierExpr ReadsFrame(IOrigin tok) {
+        Contract.Requires(tok != null);
+        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>() != null);
+        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>().Type != null);
+
+        if (readsFrame == null) {
+          throw new ArgumentException();
+        }
+        return Frame(tok, readsFrame);
+      }
+
+      public Boogie.IdentifierExpr ModifiesFrame(IOrigin tok) {
+        Contract.Requires(tok != null);
+        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>() != null);
+        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>().Type != null);
+
+        return Frame(tok, modifiesFrame);
+      }
+
+      private Boogie.IdentifierExpr Frame(IOrigin tok, string frameName) {
+        Contract.Requires(tok != null);
+        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>() != null);
+        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>().Type != null);
+
+        Boogie.Type ty = new Boogie.MapType(tok, new List<TypeVariable> { }, new List<Boogie.Type> { Predef.RefType, Predef.FieldName(tok) }, Boogie.Type.Bool);
+        return new Boogie.IdentifierExpr(tok, frameName, ty);
+      }
+
+      public Boogie.IdentifierExpr ArbitraryBoxValue() {
+        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>() != null);
+        return new Boogie.IdentifierExpr(Token.NoToken, "$ArbitraryBoxValue", Predef.BoxType);
+      }
+      public Boogie.Expr ArbitraryValue(Type type) {
+        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
+        var bx = ArbitraryBoxValue();
+        if (!ModeledAsBoxType(type)) {
+          return BoogieGenerator.FunctionCall(Token.NoToken, BuiltinFunction.Unbox, BoogieGenerator.TrType(type), bx);
+        } else {
+          return bx;
+        }
+      }
+
+      public Expression GetSubstitutedBody(LetExpr e) {
+        Contract.Requires(e != null);
+        Contract.Requires(e.Exact);
+        Contract.Assert(e.LHSs.Count == e.RHSs.Count);  // checked by resolution
+        var substMap = new Dictionary<IVariable, Expression>();
+        for (int i = 0; i < e.LHSs.Count; i++) {
+          BoogieGenerator.AddCasePatternVarSubstitutions(e.LHSs[i], TrExpr(e.RHSs[i]), substMap);
+        }
+        return BoogieGenerator.Substitute(e.Body, null, substMap);
+      }
+
+      public Expr MaybeLit(Expr expr, Boogie.Type type) {
+        return stripLits ? expr : BoogieGenerator.Lit(expr, type);
+      }
+
+      public Expr MaybeLit(Expr expr) {
+        return stripLits ? expr : BoogieGenerator.Lit(expr);
+      }
+
+      /// <summary>
+      /// Translates Dafny expression "expr" into a Boogie expression.  If the type of "expr" can be a boolean, then the
+      /// token (source location) of the resulting expression is filled in (it wouldn't hurt if the token were always
+      /// filled in, but it is really necessary for anything that may show up in a Boogie assert, since that location may
+      /// then show up in an error message).
+      /// </summary>
+      public Boogie.Expr TrExpr(Expression expr) {
+        Contract.Requires(expr != null);
+        Contract.Requires(Predef != null);
+
+        switch (expr) {
+          case LiteralExpr literalExpr: {
+              LiteralExpr e = literalExpr;
+              if (e.Value == null) {
+                return Predef.Null;
+              } else if (e.Value is bool) {
+                return MaybeLit(new Boogie.LiteralExpr(GetToken(e), (bool)e.Value));
+              } else if (e is CharLiteralExpr) {
+                // we expect e.Value to be a string representing exactly one char
+                Boogie.Expr rawElement = null;  // assignment to please compiler's definite assignment rule
+                foreach (var ch in Util.UnescapedCharacters(options, (string)e.Value, false)) {
+                  Contract.Assert(rawElement == null);  // we should get here only once
+                  rawElement = BoogieGenerator.FunctionCall(GetToken(literalExpr), BuiltinFunction.CharFromInt, null, Boogie.Expr.Literal(ch));
+                }
+                Contract.Assert(rawElement != null);  // there should have been an iteration of the loop above
+                return MaybeLit(rawElement, Predef.CharType);
+              } else if (e is StringLiteralExpr) {
+                var str = (StringLiteralExpr)e;
+                Boogie.Expr seq = BoogieGenerator.FunctionCall(GetToken(literalExpr), BuiltinFunction.SeqEmpty, Predef.BoxType);
+                foreach (var ch in Util.UnescapedCharacters(options, (string)e.Value, str.IsVerbatim)) {
+                  var rawElement = BoogieGenerator.FunctionCall(GetToken(literalExpr), BuiltinFunction.CharFromInt, null, Boogie.Expr.Literal(ch));
+                  Boogie.Expr elt = BoxIfNecessary(GetToken(literalExpr), rawElement, Type.Char);
+                  seq = BoogieGenerator.FunctionCall(GetToken(literalExpr), BuiltinFunction.SeqBuild, Predef.BoxType, seq, elt);
+                }
+                return MaybeLit(seq, BoogieGenerator.TrType(new SeqType(Type.Char)));
+              } else if (e.Value is BigInteger) {
+                var n = Microsoft.BaseTypes.BigNum.FromBigInt((BigInteger)e.Value);
+                if (e.Type.NormalizeToAncestorType() is BitvectorType bitvectorType) {
+                  return MaybeLit(BoogieGenerator.BplBvLiteralExpr(GetToken(e), n, bitvectorType));
+                } else if (e.Type.IsBigOrdinalType) {
+                  var fromNat = FunctionCall(GetToken(literalExpr), "ORD#FromNat", Predef.BigOrdinalType, Boogie.Expr.Literal(n));
+                  return MaybeLit(fromNat, Predef.BigOrdinalType);
+                } else {
+                  return MaybeLit(Boogie.Expr.Literal(n));
+                }
+              } else if (e.Value is BaseTypes.BigDec) {
+                return MaybeLit(Boogie.Expr.Literal((BaseTypes.BigDec)e.Value));
+              } else {
+                Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
+              }
+            }
+          case ThisExpr:
+            return new Boogie.IdentifierExpr(GetToken(expr), This, BoogieGenerator.TrType(expr.Type));
+          case IdentifierExpr identifierExpr: {
+              IdentifierExpr e = identifierExpr;
+              Contract.Assert(e.Var != null);
+              return BoogieGenerator.TrVar(GetToken(identifierExpr), e.Var);
+            }
+          case BoogieWrapper wrapper: {
+              var e = wrapper;
+              return e.Expr;
+            }
+          case BoogieFunctionCall call: {
+              var e = call;
+              var id = new Boogie.IdentifierExpr(GetToken(e), e.FunctionName, BoogieGenerator.TrType(e.Type));
+              var args = new List<Boogie.Expr>();
+              foreach (var arg in e.TyArgs) {
+                args.Add(BoogieGenerator.TypeToTy(arg));
+              }
+              if (e.UsesHeap) {
+                args.Add(HeapExpr);
+              }
+              if (e.UsesOldHeap) {
+                args.Add(Old.HeapExpr);
+              }
+              foreach (var heapAtLabel in e.HeapAtLabels) {
+                var bv = BplBoundVar("$Heap_at_" + heapAtLabel.AssignUniqueId(BoogieGenerator.CurrentIdGenerator), BoogieGenerator.Predef.HeapType, out var ve);
+                args.Add(ve);
+              }
+              foreach (var arg in e.Args) {
+                args.Add(TrExpr(arg));
+              }
+              return new Boogie.NAryExpr(GetToken(e), new Boogie.FunctionCall(id), args);
+            }
+          case SetDisplayExpr displayExpr: {
+              SetDisplayExpr e = displayExpr;
+              Boogie.Expr s = BoogieGenerator.FunctionCall(GetToken(displayExpr), e.Finite ? BuiltinFunction.SetEmpty : BuiltinFunction.ISetEmpty, Predef.BoxType);
+              var isLit = true;
+              foreach (Expression ee in e.Elements) {
+                var rawElement = TrExpr(ee);
+                isLit = isLit && BoogieGenerator.IsLit(rawElement);
+                Boogie.Expr ss = BoxIfNecessary(GetToken(displayExpr), rawElement, cce.NonNull(ee.Type));
+                s = BoogieGenerator.FunctionCall(GetToken(displayExpr), e.Finite ? BuiltinFunction.SetUnionOne : BuiltinFunction.ISetUnionOne, Predef.BoxType, s, ss);
+              }
+              if (isLit) {
+                // Lit-lifting: All elements are lit, so the set is Lit too
+                s = MaybeLit(s, Predef.BoxType);
+              }
+              return s;
+            }
+          case MultiSetDisplayExpr displayExpr: {
+              MultiSetDisplayExpr e = displayExpr;
+              Boogie.Expr s = BoogieGenerator.FunctionCall(GetToken(displayExpr), BuiltinFunction.MultiSetEmpty, Predef.BoxType);
+              var isLit = true;
+              foreach (Expression ee in e.Elements) {
+                var rawElement = TrExpr(ee);
+                isLit = isLit && BoogieGenerator.IsLit(rawElement);
+                Boogie.Expr ss = BoxIfNecessary(GetToken(displayExpr), rawElement, cce.NonNull(ee.Type));
+                s = BoogieGenerator.FunctionCall(GetToken(displayExpr), BuiltinFunction.MultiSetUnionOne, Predef.BoxType, s, ss);
+              }
+              if (isLit) {
+                // Lit-lifting: All elements are lit, so the multiset is Lit too
+                s = MaybeLit(s, Predef.BoxType);
+              }
+              return s;
+            }
+          case SeqDisplayExpr displayExpr: {
+              SeqDisplayExpr e = displayExpr;
+              // Note: a LiteralExpr(string) is really another kind of SeqDisplayExpr
+              Boogie.Expr s = BoogieGenerator.FunctionCall(GetToken(displayExpr), BuiltinFunction.SeqEmpty, Predef.BoxType);
+              var isLit = true;
+              foreach (Expression ee in e.Elements) {
+                var rawElement = TrExpr(ee);
+                isLit = isLit && BoogieGenerator.IsLit(rawElement);
+                Boogie.Expr elt = BoxIfNecessary(GetToken(displayExpr), rawElement, ee.Type);
+                s = BoogieGenerator.FunctionCall(GetToken(displayExpr), BuiltinFunction.SeqBuild, Predef.BoxType, s, elt);
+              }
+              if (isLit) {
+                // Lit-lifting: All elements are lit, so the sequence is Lit too
+                s = MaybeLit(s, Predef.BoxType);
+              }
+              return s;
+            }
+          case MapDisplayExpr displayExpr: {
+              MapDisplayExpr e = displayExpr;
+              Boogie.Type maptype = e.Finite ? Predef.MapType : Predef.IMapType;
+              Boogie.Expr s = BoogieGenerator.FunctionCall(GetToken(displayExpr), e.Finite ? BuiltinFunction.MapEmpty : BuiltinFunction.IMapEmpty, Predef.BoxType);
+              var isLit = true;
+              foreach (ExpressionPair p in e.Elements) {
+                var rawA = TrExpr(p.A);
+                var rawB = TrExpr(p.B);
+                isLit = isLit && BoogieGenerator.IsLit(rawA) && BoogieGenerator.IsLit(rawB);
+                Boogie.Expr elt = BoxIfNecessary(GetToken(displayExpr), rawA, cce.NonNull(p.A.Type));
+                Boogie.Expr elt2 = BoxIfNecessary(GetToken(displayExpr), rawB, cce.NonNull(p.B.Type));
+                s = FunctionCall(GetToken(displayExpr), e.Finite ? "Map#Build" : "IMap#Build", maptype, s, elt, elt2);
+              }
+              if (isLit) {
+                // Lit-lifting: All keys and values are lit, so the map is Lit too
+                s = MaybeLit(s, Predef.BoxType);
+              }
+              return s;
+            }
+          case MemberSelectExpr selectExpr: {
+              var e = selectExpr;
+              return e.MemberSelectCase(
+                field => {
+                  var useSurrogateLocal = BoogieGenerator.inBodyInitContext && Expression.AsThis(e.Obj) != null && !field.IsInstanceIndependentConstant;
+                  var fType = BoogieGenerator.TrType(field.Type);
+                  if (useSurrogateLocal) {
+                    return new Boogie.IdentifierExpr(GetToken(expr), BoogieGenerator.SurrogateName(field), fType);
+                  } else if (field is ConstantField) {
+                    var typeMap = e.TypeArgumentSubstitutionsWithParents();
+                    var args = GetTypeParams(field.EnclosingClass).ConvertAll(tp => BoogieGenerator.TypeToTy(typeMap[tp]));
+                    Boogie.Expr result;
+                    if (field.IsStatic) {
+                      result = new Boogie.NAryExpr(GetToken(expr), new Boogie.FunctionCall(BoogieGenerator.GetReadonlyField(field)), args);
+                    } else {
+                      Boogie.Expr obj = BoogieGenerator.BoxifyForTraitParent(e.Origin, TrExpr(e.Obj), e.Member, e.Obj.Type);
+                      args.Add(obj);
+                      result = new Boogie.NAryExpr(GetToken(expr), new Boogie.FunctionCall(BoogieGenerator.GetReadonlyField(field)), args);
+                    }
+                    result = BoogieGenerator.CondApplyUnbox(GetToken(expr), result, field.Type, expr.Type);
+                    return result;
+                  } else {
+                    Boogie.Expr obj = TrExpr(e.Obj);
+                    Boogie.Expr result;
+                    if (field.IsMutable) {
+                      var tok = GetToken(expr);
+                      result = BoogieGenerator.ReadHeap(tok, HeapExpr, obj, new Boogie.IdentifierExpr(GetToken(expr), BoogieGenerator.GetField(field)));
+                      result = fType == Predef.BoxType ? result : BoogieGenerator.ApplyUnbox(tok, result, fType);
+                      return BoogieGenerator.CondApplyUnbox(tok, result, field.Type, expr.Type);
+                    } else {
+                      result = new Boogie.NAryExpr(GetToken(expr), new Boogie.FunctionCall(BoogieGenerator.GetReadonlyField(field)),
+                        new List<Boogie.Expr> { obj });
+                      result = BoogieGenerator.CondApplyUnbox(GetToken(expr), result, field.Type, expr.Type);
+                      if (BoogieGenerator.IsLit(obj)) {
+                        result = MaybeLit(result, BoogieGenerator.TrType(expr.Type));
+                      }
+                      return result;
+                    }
+                  }
+                },
+                fn => {
+                  var typeMap = e.TypeArgumentSubstitutionsWithParents();
+                  var args = GetTypeParams(fn).ConvertAll(tp => BoogieGenerator.TypeToTy(typeMap[tp]));
+                  if (fn.IsFuelAware()) {
+                    args.Add(this.layerInterCluster.GetFunctionFuel(fn));
+                  }
+                  if (fn.IsOpaque || fn.IsMadeImplicitlyOpaque(options)) {
+                    args.Add(BoogieGenerator.GetRevealConstant(fn));
+                  }
+                  if (fn is TwoStateFunction) {
+                    args.Add(Old.HeapExpr);
+                  }
+                  if (!fn.IsStatic) {
+                    args.Add(/* translator.BoxIfUnboxed */(TrExpr(e.Obj)/*, e.Type */));
+                  }
+                  return FunctionCall(GetToken(e), BoogieGenerator.FunctionHandle(fn), Predef.HandleType, args);
+                });
+            }
+          case SeqSelectExpr selectExpr: {
+              SeqSelectExpr e = selectExpr;
+              Boogie.Expr seq = TrExpr(e.Seq);
+              var seqType = e.Seq.Type.NormalizeToAncestorType();
+              Type elmtType = null;
+              Type domainType = null;
+              Contract.Assert(seqType != null);  // the expression has been successfully resolved
+              if (seqType.IsArrayType) {
+                domainType = Type.Int;
+                elmtType = UserDefinedType.ArrayElementType(seqType);
+              } else if (seqType is SeqType) {
+                domainType = Type.Int;
+                elmtType = ((SeqType)seqType).Arg;
+              } else if (seqType is MapType) {
+                domainType = ((MapType)seqType).Domain;
+                elmtType = ((MapType)seqType).Range;
+              } else if (seqType is MultiSetType) {
+                domainType = ((MultiSetType)seqType).Arg;
+                elmtType = Type.Int;
+              } else { Contract.Assert(false); }
+              Boogie.Type elType = BoogieGenerator.TrType(elmtType);
+              Boogie.Type dType = BoogieGenerator.TrType(domainType);
+              Boogie.Expr e0 = e.E0 == null ? null : TrExpr(e.E0);
+              if (e0 != null && e.E0.Type.IsBitVectorType) {
+                e0 = BoogieGenerator.ConvertExpression(GetToken(e.E0), e0, e.E0.Type, Type.Int);
+              }
+              Boogie.Expr e1 = e.E1 == null ? null : TrExpr(e.E1);
+              if (e1 != null && e.E1.Type.IsBitVectorType) {
+                e1 = BoogieGenerator.ConvertExpression(GetToken(e.E1), e1, e.E1.Type, Type.Int);
+              }
+              if (e.SelectOne) {
+                Contract.Assert(e1 == null);
+                Boogie.Expr x;
+                if (seqType.IsArrayType) {
+                  Boogie.Expr fieldName = BoogieGenerator.FunctionCall(GetToken(selectExpr), BuiltinFunction.IndexField, null, e0);
+                  x = BoogieGenerator.ReadHeap(GetToken(selectExpr), HeapExpr, TrExpr(e.Seq), fieldName);
+                } else if (seqType is SeqType) {
+                  x = BoogieGenerator.FunctionCall(GetToken(selectExpr), BuiltinFunction.SeqIndex, Predef.BoxType, seq, e0);
+                } else if (seqType is MapType) {
+                  bool finite = ((MapType)seqType).Finite;
+                  var f = finite ? BuiltinFunction.MapElements : BuiltinFunction.IMapElements;
+                  x = BoogieGenerator.FunctionCall(GetToken(selectExpr), f, finite ? Predef.MapType : Predef.IMapType, seq);
+                  x = Boogie.Expr.Select(x, BoxIfNecessary(GetToken(e), e0, domainType));
+                } else if (seqType is MultiSetType) {
+                  x = BoogieGenerator.MultisetMultiplicity(GetToken(selectExpr), TrExpr(e.Seq), BoxIfNecessary(GetToken(selectExpr), e0, domainType));
+                } else { Contract.Assert(false); x = null; }
+                if (!ModeledAsBoxType(elmtType) && !(seqType is MultiSetType)) {
+                  x = BoogieGenerator.FunctionCall(GetToken(selectExpr), BuiltinFunction.Unbox, elType, x);
+                }
+                return x;
+              } else {
+                if (seqType.IsArrayType) {
+                  seq = BoogieGenerator.FunctionCall(GetToken(selectExpr), BuiltinFunction.SeqFromArray, elType, HeapExpr, seq);
+                }
+                var isLit = BoogieGenerator.IsLit(seq);
+                if (e1 != null) {
+                  isLit = isLit && BoogieGenerator.IsLit(e1);
+                  seq = BoogieGenerator.FunctionCall(GetToken(selectExpr), BuiltinFunction.SeqTake, elType, seq, e1);
+                }
+                if (e0 != null) {
+                  isLit = isLit && BoogieGenerator.IsLit(e0);
+                  seq = BoogieGenerator.FunctionCall(GetToken(selectExpr), BuiltinFunction.SeqDrop, elType, seq, e0);
+                }
+                // if e0 == null && e1 == null, then we have the identity operation seq[..] == seq;
+                if (isLit && (e0 != null || e1 != null)) {
+                  // Lit-lift the expression
+                  seq = MaybeLit(seq, BoogieGenerator.TrType(selectExpr.Type));
+                }
+                return seq;
+              }
+            }
+          case SeqUpdateExpr updateExpr: {
+              SeqUpdateExpr e = updateExpr;
+              Boogie.Expr seq = TrExpr(e.Seq);
+              var seqType = e.Seq.Type.NormalizeToAncestorType();
+              if (seqType is SeqType) {
+                Boogie.Expr index = TrExpr(e.Index);
+                index = BoogieGenerator.ConvertExpression(GetToken(e.Index), index, e.Index.Type, Type.Int);
+                Boogie.Expr val = BoxIfNecessary(GetToken(updateExpr), TrExpr(e.Value), e.Value.Type);
+                return BoogieGenerator.FunctionCall(GetToken(updateExpr), BuiltinFunction.SeqUpdate, Predef.BoxType, seq, index, val);
+              } else if (seqType is MapType) {
+                MapType mt = (MapType)seqType;
+                Boogie.Type maptype = mt.Finite ? Predef.MapType : Predef.IMapType;
+                Boogie.Expr index = BoxIfNecessary(GetToken(updateExpr), TrExpr(e.Index), mt.Domain);
+                Boogie.Expr val = BoxIfNecessary(GetToken(updateExpr), TrExpr(e.Value), mt.Range);
+                return FunctionCall(GetToken(updateExpr), mt.Finite ? "Map#Build" : "IMap#Build", maptype, seq, index, val);
+              } else if (seqType is MultiSetType) {
+                Type elmtType = cce.NonNull((MultiSetType)seqType).Arg;
+                Boogie.Expr index = BoxIfNecessary(GetToken(updateExpr), TrExpr(e.Index), elmtType);
+                Boogie.Expr val = TrExpr(e.Value);
+                return BoogieGenerator.UpdateMultisetMultiplicity(GetToken(updateExpr), seq, index, val);
+              } else {
+                Contract.Assert(false);
+                throw new cce.UnreachableException();
+              }
+            }
+          case MultiSelectExpr selectExpr: {
+              MultiSelectExpr e = selectExpr;
+              Type elmtType = UserDefinedType.ArrayElementType(e.Array.Type); ;
+              Boogie.Type elType = BoogieGenerator.TrType(elmtType);
+
+              Boogie.Expr fieldName = GetArrayIndexFieldName(GetToken(selectExpr), e.Indices);
+              Boogie.Expr x = BoogieGenerator.ReadHeap(GetToken(selectExpr), HeapExpr, TrExpr(e.Array), fieldName);
+              if (!ModeledAsBoxType(elmtType)) {
+                x = BoogieGenerator.FunctionCall(GetToken(selectExpr), BuiltinFunction.Unbox, elType, x);
+              }
+              return x;
+            }
+          case ApplyExpr applyExpr: {
+              ApplyExpr e = applyExpr;
+              int arity = e.Args.Count;
+              var tt = e.Function.Type.AsArrowType;
+              Contract.Assert(tt != null);
+              Contract.Assert(tt.Arity == arity);
+
+              {
+                // optimisation: if this could have just as well been a FunctionCallExpr, call it as such!
+                var con = e.Function as ConcreteSyntaxExpression;
+                var recv = con == null ? e.Function : con.Resolved;
+                var mem = recv as MemberSelectExpr;
+                var fn = mem == null ? null : mem.Member as Function;
+                if (fn != null) {
+                  return TrExpr(new FunctionCallExpr(e.Origin, fn.NameNode, mem.Obj, e.Origin, e.CloseParen, e.Args) {
+                    Function = fn,
+                    Type = e.Type,
+                    TypeApplication_AtEnclosingClass = mem.TypeApplicationAtEnclosingClass,
+                    TypeApplication_JustFunction = mem.TypeApplicationJustMember
+                  });
+                }
+              }
+
+              Func<Expression, Boogie.Expr> TrArg = arg => BoogieGenerator.BoxIfNotNormallyBoxed(arg.Origin, TrExpr(arg), arg.Type);
+
+              var applied = FunctionCall(GetToken(applyExpr), BoogieGenerator.Apply(arity), Predef.BoxType,
+                Concat(Map(tt.TypeArgs, BoogieGenerator.TypeToTy),
+                  Cons(HeapExprForArrow(e.Function.Type), Cons(TrExpr(e.Function), e.Args.ConvertAll(arg => TrArg(arg))))));
+
+              return BoogieGenerator.UnboxUnlessInherentlyBoxed(applied, tt.Result);
+            }
+          case FunctionCallExpr callExpr: {
+              FunctionCallExpr e = callExpr;
+              if (e.Function is SpecialFunction) {
+                return TrExprSpecialFunctionCall(e);
+              } else {
+                Boogie.Expr layerArgument;
+                Boogie.Expr revealArgument;
+                var etran = this;
+                if (e.Function.ContainsQuantifier && BoogieGenerator.stmtContext == StmtType.ASSUME && BoogieGenerator.adjustFuelForExists) {
+                  // we need to increase fuel functions that contain quantifier expr in the assume context.
+                  etran = etran.LayerOffset(1);
+                  BoogieGenerator.adjustFuelForExists = false;
+                }
+                if (e.Function.IsFuelAware()) {
+                  Statistics_CustomLayerFunctionCount++;
+                  ModuleDefinition module = e.Function.EnclosingClass.EnclosingModuleDefinition;
+                  if (etran.applyLimited_CurrentFunction != null &&
+                      etran.layerIntraCluster != null &&
+                      ModuleDefinition.InSameSCC(e.Function, applyLimited_CurrentFunction)) {
+                    layerArgument = etran.layerIntraCluster.GetFunctionFuel(e.Function);
+                  } else {
+                    layerArgument = etran.layerInterCluster.GetFunctionFuel(e.Function);
+                  }
+                } else {
+                  layerArgument = null;
+                }
+
+                if (e.Function.IsOpaque || e.Function.IsMadeImplicitlyOpaque(options)) {
+                  revealArgument = BoogieGenerator.GetRevealConstant(e.Function);
+                } else {
+                  revealArgument = null;
+                }
+
+                var ty = BoogieGenerator.TrType(e.Type);
+                var id = new Boogie.IdentifierExpr(GetToken(e), e.Function.FullSanitizedName, ty);
+
+                var args = FunctionInvocationArguments(e, layerArgument, revealArgument, false, out var argsAreLit);
+                Expr result = new Boogie.NAryExpr(GetToken(e), new Boogie.FunctionCall(id), args);
+                result = BoogieGenerator.CondApplyUnbox(GetToken(e), result, e.Function.ResultType, e.Type);
+
+                bool callIsLit = argsAreLit
+                                 && BoogieGenerator.FunctionBodyIsAvailable(e.Function, BoogieGenerator.currentModule, BoogieGenerator.currentScope)
+                                 && !e.Function.Reads.Expressions.Any(); // Function could depend on external values
+                if (callIsLit) {
+                  result = MaybeLit(result, ty);
+                }
+
+                return result;
+              }
+            }
+          case DatatypeValue value: {
+              DatatypeValue dtv = value;
+              Contract.Assert(dtv.Ctor != null);  // since dtv has been successfully resolved
+              List<Boogie.Expr> args = new List<Boogie.Expr>();
+
+              bool argsAreLit = true;
+              for (int i = 0; i < dtv.Arguments.Count; i++) {
+                Expression arg = dtv.Arguments[i];
+                Type t = dtv.Ctor.Formals[i].Type;
+                var bArg = TrExpr(arg);
+                argsAreLit = argsAreLit && BoogieGenerator.IsLit(bArg);
+                args.Add(BoogieGenerator.AdaptBoxing(GetToken(value), bArg, cce.NonNull(arg.Type), t));
+              }
+              Boogie.IdentifierExpr id = new Boogie.IdentifierExpr(GetToken(dtv), dtv.Ctor.FullName, Predef.DatatypeType);
+              Boogie.Expr ret = new Boogie.NAryExpr(GetToken(dtv), new Boogie.FunctionCall(id), args);
+              if (argsAreLit) {
+                // If all arguments are Lit, so is the whole expression
+                ret = MaybeLit(ret, Predef.DatatypeType);
+              }
+              return ret;
+            }
+          case SeqConstructionExpr constructionExpr: {
+              var e = constructionExpr;
+              var eType = e.Type.NormalizeToAncestorType().AsSeqType.Arg.NormalizeExpand();
+              var initalizerHeap = e.Initializer.Type.IsArrowType ? HeapExprForArrow(e.Initializer.Type) : HeapExpr;
+              return FunctionCall(GetToken(constructionExpr), "Seq#Create", Predef.SeqType,
+                BoogieGenerator.TypeToTy(eType),
+                initalizerHeap,
+                TrExpr(e.N),
+                TrExpr(e.Initializer));
+            }
+          case MultiSetFormingExpr formingExpr: {
+              MultiSetFormingExpr e = formingExpr;
+              var eType = e.E.Type.NormalizeToAncestorType();
+              if (eType is SetType setType) {
+                return BoogieGenerator.FunctionCall(GetToken(formingExpr), BuiltinFunction.MultiSetFromSet, BoogieGenerator.TrType(setType.Arg), TrExpr(e.E));
+              } else if (eType is SeqType seqType) {
+                return BoogieGenerator.FunctionCall(GetToken(formingExpr), BuiltinFunction.MultiSetFromSeq, BoogieGenerator.TrType(seqType.Arg), TrExpr(e.E));
+              } else {
+                Contract.Assert(false); throw new cce.UnreachableException();
+              }
+            }
+          case OldExpr oldExpr: {
+              var e = oldExpr;
+              return OldAt(e.AtLabel).TrExpr(e.E);
+            }
+          case UnchangedExpr unchangedExpr: {
+              var e = unchangedExpr;
+              return BoogieGenerator.FrameCondition(GetToken(e), e.Frame, false, FrameExpressionUse.Unchanged, OldAt(e.AtLabel), this, this, true);
+            }
+          case UnaryOpExpr opExpr: {
+              var e = opExpr;
+              Boogie.Expr arg = TrExpr(e.E);
+              switch (e.ResolvedOp) {
+                case UnaryOpExpr.ResolvedOpcode.Lit:
+                  return MaybeLit(arg);
+                case UnaryOpExpr.ResolvedOpcode.BVNot:
+                  var bvWidth = opExpr.Type.NormalizeToAncestorType().AsBitVectorType.Width;
+                  var bvType = BoogieGenerator.BplBvType(bvWidth);
+                  Boogie.Expr r = FunctionCall(GetToken(opExpr), "not_bv" + bvWidth, bvType, arg);
+                  if (BoogieGenerator.IsLit(arg)) {
+                    r = MaybeLit(r, bvType);
+                  }
+                  return r;
+                case UnaryOpExpr.ResolvedOpcode.BoolNot:
+                  return Boogie.Expr.Unary(GetToken(opExpr), UnaryOperator.Opcode.Not, arg);
+                case UnaryOpExpr.ResolvedOpcode.SeqLength:
+                  Contract.Assert(e.E.Type.NormalizeToAncestorType() is SeqType);
+                  return BoogieGenerator.FunctionCall(GetToken(opExpr), BuiltinFunction.SeqLength, null, arg);
+                case UnaryOpExpr.ResolvedOpcode.SetCard:
+                  Contract.Assert(e.E.Type.NormalizeToAncestorType() is SetType { Finite: true });
+                  return BoogieGenerator.FunctionCall(GetToken(opExpr), BuiltinFunction.SetCard, null, arg);
+                case UnaryOpExpr.ResolvedOpcode.MultiSetCard:
+                  Contract.Assert(e.E.Type.NormalizeToAncestorType() is MultiSetType);
+                  return BoogieGenerator.FunctionCall(GetToken(opExpr), BuiltinFunction.MultiSetCard, null, arg);
+                case UnaryOpExpr.ResolvedOpcode.MapCard:
+                  Contract.Assert(e.E.Type.NormalizeToAncestorType() is MapType { Finite: true });
+                  return BoogieGenerator.FunctionCall(GetToken(opExpr), BuiltinFunction.MapCard, null, arg);
+                case UnaryOpExpr.ResolvedOpcode.Fresh:
+                  var freshLabel = ((FreshExpr)e).AtLabel;
+                  var eeType = e.E.Type.NormalizeToAncestorType();
+                  if (eeType is SetType setType) {
+                    // generate:  (forall $o: ref :: { $o != null } X[Box($o)] ==> $o != null) &&
+                    //            (forall $o: ref :: { X[Box($o)] } X[Box($o)] ==> !old($Heap)[$o,alloc])
+                    // OR, if X[Box($o)] is rewritten into smaller parts, use the less good trigger old($Heap)[$o,alloc]
+                    Boogie.Variable oVar = new Boogie.BoundVariable(GetToken(opExpr), new Boogie.TypedIdent(GetToken(opExpr), "$o", Predef.RefType));
+                    Boogie.Expr o = new Boogie.IdentifierExpr(GetToken(opExpr), oVar);
+                    Boogie.Expr oNotNull = Boogie.Expr.Neq(o, Predef.Null);
+                    Boogie.Expr oInSet = TrInSet(GetToken(opExpr), o, e.E, setType.Arg, setType.Finite, true, out var performedInSetRewrite);
+                    Boogie.Expr oNotFresh = OldAt(freshLabel).IsAlloced(GetToken(opExpr), o);
+                    Boogie.Expr oIsFresh = Boogie.Expr.Not(oNotFresh);
+                    Boogie.Expr notNullBody = BplImp(oInSet, oNotNull);
+                    Boogie.Expr freshBody = BplImp(oInSet, oIsFresh);
+                    var notNullTrigger = BplTrigger(oNotNull);
+                    var notNullPred = new Boogie.ForallExpr(GetToken(opExpr), new List<Variable> { oVar }, notNullTrigger, notNullBody);
+                    var freshTrigger = BplTrigger(performedInSetRewrite ? oNotFresh : oInSet);
+                    var freshPred = new Boogie.ForallExpr(GetToken(opExpr), new List<Variable> { oVar }, freshTrigger, freshBody);
+                    return BplAnd(notNullPred, freshPred);
+                  } else if (eeType is SeqType) {
+                    // generate:  (forall $i: int :: 0 <= $i && $i < Seq#Length(X) ==> Unbox(Seq#Index(X,$i)) != null && !old($Heap)[Unbox(Seq#Index(X,$i)),alloc])
+                    Boogie.Variable iVar = new Boogie.BoundVariable(GetToken(opExpr), new Boogie.TypedIdent(GetToken(opExpr), "$i", Boogie.Type.Int));
+                    Boogie.Expr i = new Boogie.IdentifierExpr(GetToken(opExpr), iVar);
+                    Boogie.Expr iBounds = BoogieGenerator.InSeqRange(GetToken(opExpr), i, Type.Int, TrExpr(e.E), true, null, false);
+                    Boogie.Expr XsubI = BoogieGenerator.FunctionCall(GetToken(opExpr), BuiltinFunction.SeqIndex, Predef.RefType, TrExpr(e.E), i);
+                    XsubI = BoogieGenerator.FunctionCall(GetToken(opExpr), BuiltinFunction.Unbox, Predef.RefType, XsubI);
+                    Boogie.Expr oNotFresh = OldAt(freshLabel).IsAlloced(GetToken(opExpr), XsubI);
+                    Boogie.Expr oIsFresh = Boogie.Expr.Not(oNotFresh);
+                    Boogie.Expr xsubiNotNull = Boogie.Expr.Neq(XsubI, Predef.Null);
+                    Boogie.Expr body = BplImp(iBounds, BplAnd(xsubiNotNull, oIsFresh));
+                    //TRIGGERS: Does this make sense? dafny0\SmallTests
+                    // BROKEN // NEW_TRIGGER
+                    //TRIG (forall $i: int :: 0 <= $i && $i < Seq#Length(Q#0) && $Unbox(Seq#Index(Q#0, $i)): ref != null ==> !read(old($Heap), $Unbox(Seq#Index(Q#0, $i)): ref, alloc))
+                    return new Boogie.ForallExpr(GetToken(opExpr), new List<Variable> { iVar }, body);
+                  } else {
+                    // generate:  x != null && !old($Heap)[x]
+                    Boogie.Expr oNull = Boogie.Expr.Neq(TrExpr(e.E), Predef.Null);
+                    Boogie.Expr oIsFresh = Boogie.Expr.Not(OldAt(freshLabel).IsAlloced(GetToken(opExpr), TrExpr(e.E)));
+                    return Boogie.Expr.Binary(GetToken(opExpr), BinaryOperator.Opcode.And, oNull, oIsFresh);
+                  }
+                case UnaryOpExpr.ResolvedOpcode.Allocated:
+                  // Translate with $IsAllocBox, even if it requires boxing the argument. This has the effect of giving
+                  // both the $IsAllocBox and $IsAlloc forms, because the axioms that connects these two is triggered
+                  // by $IsAllocBox.
+                  return BoogieGenerator.MkIsAllocBox(BoxIfNecessary(e.E.Origin, TrExpr(e.E), e.E.Type), e.E.Type, HeapExpr);
+                case UnaryOpExpr.ResolvedOpcode.Assigned:
+                  string name = null;
+                  switch (e.E.Resolved) {
+                    case IdentifierExpr ie:
+                      name = ie.Var.UniqueName;
+                      break;
+                    case MemberSelectExpr mse:
+                      if (BoogieGenerator.inBodyInitContext && Expression.AsThis(mse.Obj) != null) {
+                        name = BoogieGenerator.SurrogateName(mse.Member as Field);
+                      }
+                      break;
+                  }
+
+                  if (name == null) {
+                    return Expr.True;
+                  }
+                  BoogieGenerator.DefiniteAssignmentTrackers.TryGetValue(name, out var defass);
+                  return defass;
+                default:
+                  Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
+              }
+            }
+          case ConversionExpr conversionExpr: {
+              var e = conversionExpr;
+              return BoogieGenerator.ConvertExpression(GetToken(e), TrExpr(e.E), e.E.Type, e.ToType);
+            }
+          case TypeTestExpr testExpr: {
+              var e = testExpr;
+              return BoogieGenerator.GetSubrangeCheck(e.Origin, TrExpr(e.E), e.E.Type, e.ToType, e.E, null, out var _) ?? Boogie.Expr.True;
+            }
+          case BinaryExpr binaryExpr: {
+              BinaryExpr e = binaryExpr;
+              var e0Type = e.E0.Type.NormalizeToAncestorType(); // used when making decisions about what Boogie operator/functions to use
+              bool isReal = e0Type.IsNumericBased(Type.NumericPersuasion.Real);
+              int bvWidth = e0Type.IsBitVectorType ? e0Type.AsBitVectorType.Width : -1;  // -1 indicates "not a bitvector type"
+              Boogie.Expr e0 = TrExpr(e.E0);
+              if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.InSet) {
+                return TrInSet(GetToken(binaryExpr), e0, e.E1, e.E0.Type, e.E1.Type.NormalizeToAncestorType().AsSetType.Finite, false, out var pr);  // let TrInSet translate e.E1
+              } else if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.NotInSet) {
+                Boogie.Expr arg = TrInSet(GetToken(binaryExpr), e0, e.E1, e.E0.Type, e.E1.Type.NormalizeToAncestorType().AsSetType.Finite, false, out var pr);  // let TrInSet translate e.E1
+                return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, arg);
+              } else if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.InMultiSet) {
+                return TrInMultiSet(GetToken(binaryExpr), e0, e.E1, e.E0.Type, false); // let TrInMultiSet translate e.E1
+              } else if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.NotInMultiSet) {
+                Boogie.Expr arg = TrInMultiSet(GetToken(binaryExpr), e0, e.E1, e.E0.Type, false);  // let TrInMultiSet translate e.E1
+                return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, arg);
+              }
+              Boogie.Expr e1 = TrExpr(e.E1);
+              BinaryOperator.Opcode bOpcode;
+              Boogie.Type typ;
+              var oe0 = e0;
+              var oe1 = e1;
+              var lit0 = BoogieGenerator.GetLit(e0);
+              var lit1 = BoogieGenerator.GetLit(e1);
+              bool liftLit = BoogieGenerator.IsLit(e0) && BoogieGenerator.IsLit(e1);
+              // NOTE(namin): We usually avoid keeping literals, because their presence might mess up triggers that do not expect them.
+              //              Still for equality-related operations, it's useful to keep them instead of lifting them, so that they can be propagated.
+              bool keepLits = false;
+              if (lit0 != null) {
+                e0 = lit0;
+              }
+              if (lit1 != null) {
+                e1 = lit1;
+              }
+              switch (e.ResolvedOp) {
+                case BinaryExpr.ResolvedOpcode.Iff:
+                  typ = Boogie.Type.Bool;
+                  bOpcode = BinaryOperator.Opcode.Iff; break;
+                case BinaryExpr.ResolvedOpcode.Imp:
+                  typ = Boogie.Type.Bool;
+                  bOpcode = BinaryOperator.Opcode.Imp; break;
+                case BinaryExpr.ResolvedOpcode.And:
+                  typ = Boogie.Type.Bool;
+                  bOpcode = BinaryOperator.Opcode.And; break;
+                case BinaryExpr.ResolvedOpcode.Or:
+                  typ = Boogie.Type.Bool;
+                  bOpcode = BinaryOperator.Opcode.Or; break;
+
+                case BinaryExpr.ResolvedOpcode.EqCommon:
+                  keepLits = true;
+                  if (ModeledAsBoxType(e.E0.Type)) {
+                    e1 = BoxIfNecessary(expr.Origin, e1, e.E1.Type);
+                    oe1 = BoxIfNecessary(expr.Origin, oe1, e.E1.Type);
+                  } else if (ModeledAsBoxType(e.E1.Type)) {
+                    e0 = BoxIfNecessary(expr.Origin, e0, e.E0.Type);
+                    oe0 = BoxIfNecessary(expr.Origin, oe0, e.E0.Type);
+                  }
+                  if (e.E0.Type.IsCoDatatype && e.E1.Type.IsCoDatatype) {
+                    var e0args = e.E0.Type.NormalizeExpand().TypeArgs;
+                    var e1args = e.E1.Type.NormalizeExpand().TypeArgs;
+                    return BoogieGenerator.CoEqualCall(e.E0.Type.AsCoDatatype, e0args, e1args, null,
+                      this.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH), e0, e1, GetToken(binaryExpr));
+                  }
+                  if (e.E0.Type.IsIndDatatype && e.E1.Type.IsIndDatatype) {
+                    return BoogieGenerator.TypeSpecificEqual(GetToken(binaryExpr), e.E0.Type, e0, e1);
+                  }
+                  typ = Boogie.Type.Bool;
+                  bOpcode = BinaryOperator.Opcode.Eq;
+                  break;
+                case BinaryExpr.ResolvedOpcode.NeqCommon:
+                  if (ModeledAsBoxType(e.E0.Type)) {
+                    e1 = BoxIfNecessary(expr.Origin, e1, e.E1.Type);
+                    oe1 = BoxIfNecessary(expr.Origin, oe1, e.E1.Type);
+                  } else if (ModeledAsBoxType(e.E1.Type)) {
+                    e0 = BoxIfNecessary(expr.Origin, e0, e.E0.Type);
+                    oe0 = BoxIfNecessary(expr.Origin, oe0, e.E0.Type);
+                  }
+                  if (e.E0.Type.IsCoDatatype && e.E1.Type.IsCoDatatype) {
+                    var e0args = e.E0.Type.NormalizeExpand().TypeArgs;
+                    var e1args = e.E1.Type.NormalizeExpand().TypeArgs;
+                    var eq = BoogieGenerator.CoEqualCall(e.E0.Type.AsCoDatatype, e0args, e1args, null,
+                      this.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH), e0, e1, GetToken(binaryExpr));
+                    return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, eq);
+                  }
+                  if (e.E0.Type.IsIndDatatype && e.E1.Type.IsIndDatatype) {
+                    var eq = BoogieGenerator.TypeSpecificEqual(GetToken(binaryExpr), e.E0.Type, e0, e1);
+                    return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, eq);
+                  }
+                  typ = Boogie.Type.Bool;
+                  bOpcode = BinaryOperator.Opcode.Neq;
+                  break;
+                case BinaryExpr.ResolvedOpcode.Lt:
+                  if (0 <= bvWidth) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "lt_bv" + bvWidth, Boogie.Type.Bool, e0, e1, liftLit);
+                  } else if (e0Type.IsBigOrdinalType) {
+                    return FunctionCall(GetToken(binaryExpr), "ORD#Less", Boogie.Type.Bool, e0, e1);
+                  } else if (isReal || !BoogieGenerator.DisableNonLinearArithmetic) {
+                    typ = Boogie.Type.Bool;
+                    bOpcode = BinaryOperator.Opcode.Lt;
+                    break;
+                  } else {
+                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_lt_boogie", Boogie.Type.Bool, e0, e1, liftLit);
+                  }
+                case BinaryExpr.ResolvedOpcode.LessThanLimit:
+                  return FunctionCall(GetToken(binaryExpr), "ORD#LessThanLimit", Boogie.Type.Bool, e0, e1);
+                case BinaryExpr.ResolvedOpcode.Le:
+                  keepLits = true;
+                  if (0 <= bvWidth) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "le_bv" + bvWidth, Boogie.Type.Bool, e0, e1, false);
+                  } else if (e0Type.IsBigOrdinalType) {
+                    var less = FunctionCall(GetToken(binaryExpr), "ORD#Less", Boogie.Type.Bool, e0, e1);
+                    var eq = Boogie.Expr.Eq(e0, e1);
+                    return BplOr(eq, less);
+                  } else if (isReal || !BoogieGenerator.DisableNonLinearArithmetic) {
+                    typ = Boogie.Type.Bool;
+                    bOpcode = BinaryOperator.Opcode.Le;
+                    break;
+                  } else {
+                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_le_boogie", Boogie.Type.Bool, e0, e1, false);
+                  }
+                case BinaryExpr.ResolvedOpcode.Ge:
+                  keepLits = true;
+                  if (0 <= bvWidth) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "ge_bv" + bvWidth, Boogie.Type.Bool, e0, e1, false);
+                  } else if (e0Type.IsBigOrdinalType) {
+                    var less = FunctionCall(GetToken(binaryExpr), "ORD#Less", Boogie.Type.Bool, e1, e0);
+                    var eq = Boogie.Expr.Eq(e1, e0);
+                    return BplOr(eq, less);
+                  } else if (isReal || !BoogieGenerator.DisableNonLinearArithmetic) {
+                    typ = Boogie.Type.Bool;
+                    bOpcode = BinaryOperator.Opcode.Ge;
+                    break;
+                  } else {
+                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_ge_boogie", Boogie.Type.Bool, e0, e1, false);
+                  }
+                case BinaryExpr.ResolvedOpcode.Gt:
+                  if (0 <= bvWidth) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "gt_bv" + bvWidth, Boogie.Type.Bool, e0, e1, liftLit);
+                  } else if (e0Type.IsBigOrdinalType) {
+                    return FunctionCall(GetToken(binaryExpr), "ORD#Less", Boogie.Type.Bool, e1, e0);
+                  } else if (isReal || !BoogieGenerator.DisableNonLinearArithmetic) {
+                    typ = Boogie.Type.Bool;
+                    bOpcode = BinaryOperator.Opcode.Gt;
+                    break;
+                  } else {
+                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_gt_boogie", Boogie.Type.Bool, e0, e1, liftLit);
+                  }
+
+                case BinaryExpr.ResolvedOpcode.Add:
+                  if (0 <= bvWidth) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "add_bv" + bvWidth, BoogieGenerator.BplBvType(bvWidth), e0, e1, liftLit);
+                  } else if (e0Type.IsBigOrdinalType) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "ORD#Plus", Predef.BigOrdinalType, e0, e1, liftLit);
+                  } else if (e0Type.IsCharType) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "char#Plus", Predef.CharType, e0, e1, liftLit);
+                  } else if (!isReal && BoogieGenerator.DisableNonLinearArithmetic) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_add_boogie", Boogie.Type.Int, e0, e1, liftLit);
+                  } else if (!isReal && (options.ArithMode == 2 || 5 <= options.ArithMode)) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "Add", Boogie.Type.Int, oe0, oe1, liftLit);
+                  } else {
+                    typ = isReal ? Boogie.Type.Real : Boogie.Type.Int;
+                    bOpcode = BinaryOperator.Opcode.Add;
+                    break;
+                  }
+                case BinaryExpr.ResolvedOpcode.Sub:
+                  if (0 <= bvWidth) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "sub_bv" + bvWidth, BoogieGenerator.BplBvType(bvWidth), e0, e1, liftLit);
+                  } else if (e0Type.IsBigOrdinalType) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "ORD#Minus", Predef.BigOrdinalType, e0, e1, liftLit);
+                  } else if (e0Type.IsCharType) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "char#Minus", Predef.CharType, e0, e1, liftLit);
+                  } else if (!isReal && BoogieGenerator.DisableNonLinearArithmetic) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_sub_boogie", Boogie.Type.Int, e0, e1, liftLit);
+                  } else if (!isReal && (options.ArithMode == 2 || 5 <= options.ArithMode)) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "Sub", Boogie.Type.Int, oe0, oe1, liftLit);
+                  } else {
+                    typ = isReal ? Boogie.Type.Real : Boogie.Type.Int;
+                    bOpcode = BinaryOperator.Opcode.Sub;
+                    break;
+                  }
+                case BinaryExpr.ResolvedOpcode.Mul:
+                  if (0 <= bvWidth) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "mul_bv" + bvWidth, BoogieGenerator.BplBvType(bvWidth), e0, e1, liftLit);
+                  } else if (!isReal && BoogieGenerator.DisableNonLinearArithmetic) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_mul_boogie", Boogie.Type.Int, e0, e1, liftLit);
+                  } else if (!isReal && options.ArithMode != 0 && options.ArithMode != 3) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "Mul", Boogie.Type.Int, oe0, oe1, liftLit);
+                  } else {
+                    typ = isReal ? Boogie.Type.Real : Boogie.Type.Int;
+                    bOpcode = BinaryOperator.Opcode.Mul;
+                    break;
+                  }
+                case BinaryExpr.ResolvedOpcode.Div:
+                  if (0 <= bvWidth) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "div_bv" + bvWidth, BoogieGenerator.BplBvType(bvWidth), e0, e1, liftLit);
+                  } else if (!isReal && BoogieGenerator.DisableNonLinearArithmetic && !isReal) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_div_boogie", Boogie.Type.Int, e0, e1, liftLit);
+                  } else if (!isReal && options.ArithMode != 0 && options.ArithMode != 3) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "Div", Boogie.Type.Int, e0, oe1, liftLit);
+                  } else if (isReal) {
+                    typ = Boogie.Type.Real;
+                    bOpcode = BinaryOperator.Opcode.RealDiv;
+                    break;
+                  } else {
+                    typ = Boogie.Type.Int;
+                    bOpcode = BinaryOperator.Opcode.Div;
+                    break;
+                  }
+                case BinaryExpr.ResolvedOpcode.Mod:
+                  if (0 <= bvWidth) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "mod_bv" + bvWidth, BoogieGenerator.BplBvType(bvWidth), e0, e1, liftLit);
+                  } else if (BoogieGenerator.DisableNonLinearArithmetic && !isReal) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_mod_boogie", Boogie.Type.Int, e0, e1, liftLit);
+                  } else if (!isReal && options.ArithMode != 0 && options.ArithMode != 3) {
+                    return TrToFunctionCall(GetToken(binaryExpr), "Mod", Boogie.Type.Int, e0, oe1, liftLit);
+                  } else {
+                    typ = isReal ? Boogie.Type.Real : Boogie.Type.Int;
+                    bOpcode = BinaryOperator.Opcode.Mod;
+                    break;
+                  }
+
+                case BinaryExpr.ResolvedOpcode.LeftShift: {
+                    Contract.Assert(0 <= bvWidth);
+                    return TrToFunctionCall(GetToken(binaryExpr), "LeftShift_bv" + bvWidth, BoogieGenerator.BplBvType(bvWidth), e0, BoogieGenerator.ConvertExpression(GetToken(binaryExpr), e1, e.E1.Type, e.Type), liftLit);
+                  }
+                case BinaryExpr.ResolvedOpcode.RightShift: {
+                    Contract.Assert(0 <= bvWidth);
+                    return TrToFunctionCall(GetToken(binaryExpr), "RightShift_bv" + bvWidth, BoogieGenerator.BplBvType(bvWidth), e0, BoogieGenerator.ConvertExpression(GetToken(binaryExpr), e1, e.E1.Type, e.Type), liftLit);
+                  }
+                case BinaryExpr.ResolvedOpcode.BitwiseAnd: {
+                    Contract.Assert(0 <= bvWidth);
+                    return TrToFunctionCall(GetToken(binaryExpr), "and_bv" + bvWidth, BoogieGenerator.BplBvType(bvWidth), e0, e1, liftLit);
+                  }
+                case BinaryExpr.ResolvedOpcode.BitwiseOr: {
+                    Contract.Assert(0 <= bvWidth);
+                    return TrToFunctionCall(GetToken(binaryExpr), "or_bv" + bvWidth, BoogieGenerator.BplBvType(bvWidth), e0, e1, liftLit);
+                  }
+                case BinaryExpr.ResolvedOpcode.BitwiseXor: {
+                    Contract.Assert(0 <= bvWidth);
+                    return TrToFunctionCall(GetToken(binaryExpr), "xor_bv" + bvWidth, BoogieGenerator.BplBvType(bvWidth), e0, e1, liftLit);
+                  }
+
+                case BinaryExpr.ResolvedOpcode.LtChar:
+                case BinaryExpr.ResolvedOpcode.LeChar:
+                case BinaryExpr.ResolvedOpcode.GeChar:
+                case BinaryExpr.ResolvedOpcode.GtChar: {
+                    // work off the original operands (that is, allow them to be lit-wrapped)
+                    var operand0 = BoogieGenerator.FunctionCall(e0.tok, BuiltinFunction.CharToInt, null, oe0);
+                    var operand1 = BoogieGenerator.FunctionCall(e0.tok, BuiltinFunction.CharToInt, null, oe1);
+                    BinaryOperator.Opcode bOp;
+                    switch (e.ResolvedOp) {
+                      case BinaryExpr.ResolvedOpcode.LtChar: bOp = BinaryOperator.Opcode.Lt; break;
+                      case BinaryExpr.ResolvedOpcode.LeChar: bOp = BinaryOperator.Opcode.Le; break;
+                      case BinaryExpr.ResolvedOpcode.GeChar: bOp = BinaryOperator.Opcode.Ge; break;
+                      case BinaryExpr.ResolvedOpcode.GtChar: bOp = BinaryOperator.Opcode.Gt; break;
+                      default:
+                        Contract.Assert(false);  // unexpected case
+                        throw new cce.UnreachableException();  // to please compiler
+                    }
+                    return Boogie.Expr.Binary(GetToken(binaryExpr), bOp, operand0, operand1);
+                  }
+
+                case BinaryExpr.ResolvedOpcode.SetEq:
+                case BinaryExpr.ResolvedOpcode.MultiSetEq:
+                case BinaryExpr.ResolvedOpcode.SeqEq:
+                case BinaryExpr.ResolvedOpcode.MapEq:
+                  return BoogieGenerator.TypeSpecificEqual(GetToken(binaryExpr), e.E0.Type, e0, e1);
+                case BinaryExpr.ResolvedOpcode.SetNeq:
+                case BinaryExpr.ResolvedOpcode.MultiSetNeq:
+                case BinaryExpr.ResolvedOpcode.SeqNeq:
+                case BinaryExpr.ResolvedOpcode.MapNeq:
+                  return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, BoogieGenerator.TypeSpecificEqual(GetToken(binaryExpr), e.E0.Type, e0, e1));
+
+                case BinaryExpr.ResolvedOpcode.ProperSubset: {
+                    return BoogieGenerator.ProperSubset(GetToken(binaryExpr), e0, e1, e.E0.Type.NormalizeToAncestorType().AsSetType.Finite);
+                  }
+                case BinaryExpr.ResolvedOpcode.Subset: {
+                    bool finite = e.E1.Type.NormalizeToAncestorType().AsSetType.Finite;
+                    var f = finite ? BuiltinFunction.SetSubset : BuiltinFunction.ISetSubset;
+                    return BoogieGenerator.FunctionCall(GetToken(binaryExpr), f, null, e0, e1);
+                  }
+                case BinaryExpr.ResolvedOpcode.Superset: {
+                    bool finite = e.E1.Type.NormalizeToAncestorType().AsSetType.Finite;
+                    var f = finite ? BuiltinFunction.SetSubset : BuiltinFunction.ISetSubset;
+                    return BoogieGenerator.FunctionCall(GetToken(binaryExpr), f, null, e1, e0);
+                  }
+                case BinaryExpr.ResolvedOpcode.ProperSuperset:
+                  return BoogieGenerator.ProperSubset(GetToken(binaryExpr), e1, e0, e.E0.Type.NormalizeToAncestorType().AsSetType.Finite);
+                case BinaryExpr.ResolvedOpcode.Disjoint: {
+                    bool finite = e.E1.Type.NormalizeToAncestorType().AsSetType.Finite;
+                    var f = finite ? BuiltinFunction.SetDisjoint : BuiltinFunction.ISetDisjoint;
+                    return BoogieGenerator.FunctionCall(GetToken(binaryExpr), f, null, e0, e1);
+                  }
+                case BinaryExpr.ResolvedOpcode.InSet:
+                  Contract.Assert(false); throw new cce.UnreachableException();  // this case handled above
+                case BinaryExpr.ResolvedOpcode.NotInSet:
+                  Contract.Assert(false); throw new cce.UnreachableException();  // this case handled above
+                case BinaryExpr.ResolvedOpcode.Union: {
+                    var setType = binaryExpr.Type.NormalizeToAncestorType().AsSetType;
+                    bool finite = setType.Finite;
+                    var f = finite ? BuiltinFunction.SetUnion : BuiltinFunction.ISetUnion;
+                    return BoogieGenerator.FunctionCall(GetToken(binaryExpr), f, BoogieGenerator.TrType(setType.Arg), e0, e1);
+                  }
+                case BinaryExpr.ResolvedOpcode.Intersection: {
+                    var setType = binaryExpr.Type.NormalizeToAncestorType().AsSetType;
+                    bool finite = setType.Finite;
+                    var f = finite ? BuiltinFunction.SetIntersection : BuiltinFunction.ISetIntersection;
+                    return BoogieGenerator.FunctionCall(GetToken(binaryExpr), f, BoogieGenerator.TrType(setType.Arg), e0, e1);
+                  }
+                case BinaryExpr.ResolvedOpcode.SetDifference: {
+                    var setType = binaryExpr.Type.NormalizeToAncestorType().AsSetType;
+                    bool finite = setType.Finite;
+                    var f = finite ? BuiltinFunction.SetDifference : BuiltinFunction.ISetDifference;
+                    return BoogieGenerator.FunctionCall(GetToken(binaryExpr), f, BoogieGenerator.TrType(setType.Arg), e0, e1);
+                  }
+                case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
+                  return BoogieGenerator.ProperMultiset(GetToken(binaryExpr), e0, e1);
+                case BinaryExpr.ResolvedOpcode.MultiSubset:
+                  return BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetSubset, null, e0, e1);
+                case BinaryExpr.ResolvedOpcode.MultiSuperset:
+                  return BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetSubset, null, e1, e0);
+                case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
+                  return BoogieGenerator.ProperMultiset(GetToken(binaryExpr), e1, e0);
+                case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
+                  return BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetDisjoint, null, e0, e1);
+                case BinaryExpr.ResolvedOpcode.InMultiSet:
+                  Contract.Assert(false); throw new cce.UnreachableException();  // this case handled above
+                case BinaryExpr.ResolvedOpcode.NotInMultiSet:
+                  Contract.Assert(false); throw new cce.UnreachableException();  // this case handled above
+                case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+                  return BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetUnion,
+                    BoogieGenerator.TrType(binaryExpr.Type.NormalizeToAncestorType().AsMultiSetType.Arg), e0, e1);
+                case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+                  return BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetIntersection,
+                    BoogieGenerator.TrType(binaryExpr.Type.NormalizeToAncestorType().AsMultiSetType.Arg), e0, e1);
+                case BinaryExpr.ResolvedOpcode.MultiSetDifference:
+                  return BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetDifference,
+                    BoogieGenerator.TrType(binaryExpr.Type.NormalizeToAncestorType().AsMultiSetType.Arg), e0, e1);
+
+                case BinaryExpr.ResolvedOpcode.ProperPrefix:
+                  return BoogieGenerator.ProperPrefix(GetToken(binaryExpr), e0, e1);
+                case BinaryExpr.ResolvedOpcode.Prefix: {
+                    Boogie.Expr len0 = BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqLength, null, e0);
+                    Boogie.Expr len1 = BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqLength, null, e1);
+                    return Boogie.Expr.Binary(GetToken(binaryExpr), BinaryOperator.Opcode.And,
+                      Boogie.Expr.Le(len0, len1),
+                      BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqSameUntil, null, e0, e1, len0));
+                  }
+                case BinaryExpr.ResolvedOpcode.Concat:
+                  return BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqAppend,
+                    BoogieGenerator.TrType(binaryExpr.Type.NormalizeToAncestorType().AsSeqType.Arg), e0, e1);
+                case BinaryExpr.ResolvedOpcode.InSeq:
+                  return BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqContains, null, e1,
+                    BoxIfNecessary(GetToken(binaryExpr), e0, e.E0.Type));
+                case BinaryExpr.ResolvedOpcode.NotInSeq:
+                  Boogie.Expr arg = BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqContains, null, e1,
+                    BoxIfNecessary(GetToken(binaryExpr), e0, e.E0.Type));
+                  return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, arg);
+                case BinaryExpr.ResolvedOpcode.InMap: {
+                    bool finite = e.E1.Type.NormalizeToAncestorType().AsMapType.Finite;
+                    var f = finite ? BuiltinFunction.MapDomain : BuiltinFunction.IMapDomain;
+                    return BoogieGenerator.IsSetMember(GetToken(binaryExpr),
+                      BoogieGenerator.FunctionCall(GetToken(binaryExpr), f, finite ? Predef.MapType : Predef.IMapType, e1),
+                      BoxIfNecessary(GetToken(binaryExpr), e0, e.E0.Type),
+                      finite);
+                  }
+                case BinaryExpr.ResolvedOpcode.NotInMap: {
+                    bool finite = e.E1.Type.NormalizeToAncestorType().AsMapType.Finite;
+                    var f = finite ? BuiltinFunction.MapDomain : BuiltinFunction.IMapDomain;
+                    Boogie.Expr inMap = BoogieGenerator.IsSetMember(GetToken(binaryExpr),
+                      BoogieGenerator.FunctionCall(GetToken(binaryExpr), f, finite ? Predef.MapType : Predef.IMapType, e1),
+                      BoxIfNecessary(GetToken(binaryExpr), e0, e.E0.Type),
+                      finite);
+                    return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, inMap);
+                  }
+                case BinaryExpr.ResolvedOpcode.MapMerge: {
+                    bool finite = e0Type.NormalizeToAncestorType().AsMapType.Finite;
+                    var f = finite ? "Map#Merge" : "IMap#Merge";
+                    return FunctionCall(GetToken(binaryExpr), f, BoogieGenerator.TrType(binaryExpr.Type), e0, e1);
+                  }
+                case BinaryExpr.ResolvedOpcode.MapSubtraction: {
+                    bool finite = e0Type.NormalizeToAncestorType().AsMapType.Finite;
+                    var f = finite ? "Map#Subtract" : "IMap#Subtract";
+                    return FunctionCall(GetToken(binaryExpr), f, BoogieGenerator.TrType(binaryExpr.Type), e0, e1);
+                  }
+
+                case BinaryExpr.ResolvedOpcode.RankLt:
+                  return Boogie.Expr.Binary(GetToken(binaryExpr), BinaryOperator.Opcode.Lt,
+                    BoogieGenerator.FunctionCall(GetToken(binaryExpr), e0Type.IsDatatype ? BuiltinFunction.DtRank : BuiltinFunction.BoxRank, null, e0),
+                    BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.DtRank, null, e1));
+                case BinaryExpr.ResolvedOpcode.RankGt:
+                  return Boogie.Expr.Binary(GetToken(binaryExpr), BinaryOperator.Opcode.Gt,
+                    BoogieGenerator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.DtRank, null, e0),
+                    BoogieGenerator.FunctionCall(GetToken(binaryExpr), e.E1.Type.IsDatatype ? BuiltinFunction.DtRank : BuiltinFunction.BoxRank, null, e1));
+
+                default:
+                  Contract.Assert(false); throw new cce.UnreachableException();  // unexpected binary expression
+              }
+              liftLit = liftLit && !keepLits;
+              var ae0 = keepLits ? oe0 : e0;
+              var ae1 = keepLits ? oe1 : e1;
+              Boogie.Expr re = Boogie.Expr.Binary(GetToken(binaryExpr), bOpcode, ae0, ae1);
+              if (liftLit) {
+                re = MaybeLit(re, typ);
+              }
+              return re;
+            }
+          case TernaryExpr ternaryExpr: {
+              var e = ternaryExpr;
+              var e0 = TrExpr(e.E0);
+              if (!e.E0.Type.IsBigOrdinalType) {
+                e0 = FunctionCall(e0.tok, "ORD#FromNat", Predef.BigOrdinalType, e0);
+              }
+              var e1 = TrExpr(e.E1);
+              var e2 = TrExpr(e.E2);
+              switch (e.Op) {
+                case TernaryExpr.Opcode.PrefixEqOp:
+                case TernaryExpr.Opcode.PrefixNeqOp:
+                  var e1type = e.E1.Type.NormalizeExpand();
+                  var e2type = e.E2.Type.NormalizeExpand();
+                  var cot = e1type.AsCoDatatype;
+                  Contract.Assert(cot != null);  // the argument types of prefix equality (and prefix disequality) are codatatypes
+                  var r = BoogieGenerator.CoEqualCall(cot, e1type.TypeArgs, e2type.TypeArgs, e0, this.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH), e1, e2);
+                  if (e.Op == TernaryExpr.Opcode.PrefixEqOp) {
+                    return r;
+                  } else {
+                    return Boogie.Expr.Unary(GetToken(ternaryExpr), UnaryOperator.Opcode.Not, r);
+                  }
+                default:
+                  Contract.Assert(false); throw new cce.UnreachableException();  // unexpected ternary expression
+              }
+            }
+          case LetExpr letExpr:
+            return TrLetExpr(letExpr);
+          case QuantifierExpr quantifierExpr: {
+              QuantifierExpr e = quantifierExpr;
+
+              if (e.SplitQuantifier != null) {
+                return TrExpr(e.SplitQuantifierExpression);
+              } else {
+                List<Variable> bvars = new List<Variable>();
+                var bodyEtran = this;
+                if (e is ExistsExpr && BoogieGenerator.stmtContext == StmtType.ASSERT && BoogieGenerator.adjustFuelForExists) {
+                  // assert exists need decrease fuel by 1
+                  bodyEtran = bodyEtran.DecreaseFuel(1);
+                  // set adjustFuelForExists to false so that we don't keep decrease the fuel in cases like the expr below.
+                  // assert exists p:int :: exists t:T :: ToInt(t) > 0;
+                  BoogieGenerator.adjustFuelForExists = false;
+                } else if (e is ExistsExpr && BoogieGenerator.stmtContext == StmtType.ASSUME && BoogieGenerator.adjustFuelForExists) {
+                  // assume exists need increase fuel by 1
+                  bodyEtran = bodyEtran.LayerOffset(1);
+                  BoogieGenerator.adjustFuelForExists = false;
+                }
+
+                Boogie.Expr antecedent = Boogie.Expr.True;
+
+                List<bool> freeOfAlloc = BoundedPool.HasBounds(e.Bounds, BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
+                antecedent = BplAnd(antecedent, bodyEtran.TrBoundVariables(e.BoundVars, bvars, false, freeOfAlloc)); // initHeapForAllStmt
+
+                Boogie.QKeyValue kv = TrAttributes(e.Attributes, "trigger");
+                Boogie.Trigger tr = BoogieGenerator.TrTrigger(bodyEtran, e.Attributes, GetToken(e), bvars, null, null);
+
+                if (e.Range != null) {
+                  antecedent = BplAnd(antecedent, bodyEtran.TrExpr(e.Range));
+                }
+                Boogie.Expr body = bodyEtran.TrExpr(e.Term);
+
+                if (e is ForallExpr) {
+                  return new Boogie.ForallExpr(GetToken(quantifierExpr), new List<TypeVariable>(), bvars, kv, tr, BplImp(antecedent, body));
+                } else {
+                  Contract.Assert(e is ExistsExpr);
+                  return new Boogie.ExistsExpr(GetToken(quantifierExpr), new List<TypeVariable>(), bvars, kv, tr, BplAnd(antecedent, body));
+                }
+              }
+            }
+          case SetComprehension comprehension: {
+              var e = comprehension;
+              List<bool> freeOfAlloc = BoundedPool.HasBounds(e.Bounds, BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
+
+              // Translate "set xs | R :: T" into:
+              //     Set#FromBoogieMap(lambda y: BoxType :: (exists xs :: CorrectType(xs) && R && y==Box(T)))
+              // or if "T" is "xs", then:
+              //     Set#FromBoogieMap(lambda y: BoxType :: CorrectType(y) && R[xs := Unbox(y)])
+              // where Set#FromBoogieMap is omitted for iset.
+              // FIXME: This is not a good translation, see comment in PreludeCore.bpl. It should be changed to not use a Boogie lambda expression
+              // but to instead do the lambda lifting here.
+              var yVar = new Boogie.BoundVariable(GetToken(comprehension), new Boogie.TypedIdent(GetToken(comprehension), BoogieGenerator.CurrentIdGenerator.FreshId("$y#"), Predef.BoxType));
+              Boogie.Expr y = new Boogie.IdentifierExpr(GetToken(comprehension), yVar);
+              Boogie.Expr lbody;
+              if (e.TermIsSimple) {
+                var bv = e.BoundVars[0];
+                // lambda y: BoxType :: CorrectType(y) && R[xs := yUnboxed]
+                Boogie.Expr typeAntecedent = BoogieGenerator.MkIsBox(new Boogie.IdentifierExpr(GetToken(comprehension), yVar), bv.Type);
+                if (freeOfAlloc != null && !freeOfAlloc[0]) {
+                  var isAlloc = BoogieGenerator.MkIsAllocBox(new Boogie.IdentifierExpr(GetToken(comprehension), yVar), bv.Type, HeapExpr);
+                  typeAntecedent = BplAnd(typeAntecedent, isAlloc);
+                }
+                var yUnboxed = BoogieGenerator.UnboxUnlessInherentlyBoxed(new Boogie.IdentifierExpr(GetToken(comprehension), yVar), bv.Type);
+                var range = BoogieGenerator.Substitute(e.Range, bv, new BoogieWrapper(yUnboxed, bv.Type));
+                lbody = BplAnd(typeAntecedent, TrExpr(range));
+              } else {
+                // lambda y: BoxType :: (exists xs :: CorrectType(xs) && R && y==Box(T))
+                List<Variable> bvars = new List<Variable>();
+                Boogie.Expr typeAntecedent = TrBoundVariables(e.BoundVars, bvars, false, freeOfAlloc);
+
+                var eq = Boogie.Expr.Eq(y, BoxIfNecessary(GetToken(comprehension), TrExpr(e.Term), e.Term.Type));
+                var ebody = BplAnd(BplAnd(typeAntecedent, TrExpr(e.Range)), eq);
+                var triggers = BoogieGenerator.TrTrigger(this, e.Attributes, GetToken(e));
+                lbody = new Boogie.ExistsExpr(GetToken(comprehension), bvars, triggers, ebody);
+              }
+              Boogie.QKeyValue kv = TrAttributes(e.Attributes, "trigger");
+              var lambda = new Boogie.LambdaExpr(GetToken(comprehension), new List<TypeVariable>(), new List<Variable> { yVar }, kv, lbody);
+              return comprehension.Type.NormalizeToAncestorType().AsSetType.Finite
+                ? FunctionCall(GetToken(comprehension), "Set#FromBoogieMap", Predef.SetType, lambda)
+                : lambda;
+            }
+          case MapComprehension comprehension: {
+              var e = comprehension;
+              // Translate "map x,y | R(x,y) :: F(x,y) := G(x,y)" into
+              // Map#Glue(lambda w: BoxType :: exists x,y :: R(x,y) && unbox(w) == F(x,y),
+              //          lambda w: BoxType :: G(project_x(unbox(w)), project_y(unbox(w))),
+              //          type)".
+              // where project_x and project_y are functions defined (elsewhere, in CanCallAssumption) by the following axiom:
+              //     forall x,y :: R(x,y) ==> var x',y' := project_x(unbox(F(x,y))),project_y(unbox(F(x,y))); R(x',y') && F(x',y') == F(x,y)
+              // that is (without the let expression):
+              //     forall x,y :: R(x,y) ==> R(project_x(unbox(F(x,y))), project_y(unbox(F(x,y)))) && F(project_x(unbox(F(x,y))), project_y(unbox(F(x,y)))) == F(x,y)
+              //
+              // In the common case where F(x,y) is omitted (in which case the list of bound variables is restricted to length 1):
+              // Translate "map x | R(x) :: G(x)" into
+              // Map#Glue(lambda w: BoxType :: R(unbox(w)),
+              //          lambda w: BoxType :: G(unbox(w)),
+              //          type)".
+              List<Variable> bvars = new List<Variable>();
+              List<bool> freeOfAlloc = BoundedPool.HasBounds(e.Bounds, BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
+
+              Boogie.QKeyValue kv = TrAttributes(e.Attributes, "trigger");
+
+              var wVar = new Boogie.BoundVariable(GetToken(comprehension), new Boogie.TypedIdent(GetToken(comprehension), BoogieGenerator.CurrentIdGenerator.FreshId("$w#"), Predef.BoxType));
+
+              Boogie.Expr keys, values;
+              if (!e.IsGeneralMapComprehension) {
+                var bv = e.BoundVars[0];
+                var w = new Boogie.IdentifierExpr(GetToken(comprehension), wVar);
+                Boogie.Expr unboxw = BoogieGenerator.UnboxUnlessInherentlyBoxed(w, bv.Type);
+                Boogie.Expr typeAntecedent = BoogieGenerator.MkIsBox(w, bv.Type);
+                if (freeOfAlloc != null && !freeOfAlloc[0]) {
+                  var isAlloc = BoogieGenerator.MkIsAllocBox(w, bv.Type, HeapExpr);
+                  typeAntecedent = BplAnd(typeAntecedent, isAlloc);
+                }
+                var subst = new Dictionary<IVariable, Expression>();
+                subst.Add(bv, new BoogieWrapper(unboxw, bv.Type));
+
+                var ebody = BplAnd(typeAntecedent, TrExpr(BoogieGenerator.Substitute(e.Range, null, subst)));
+                keys = new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), new List<Variable> { wVar }, kv, ebody);
+                ebody = TrExpr(BoogieGenerator.Substitute(e.Term, null, subst));
+                values = new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), new List<Variable> { wVar }, kv, BoxIfNecessary(GetToken(comprehension), ebody, e.Term.Type));
+              } else {
+                var t = e.TermLeft;
+                var w = new Boogie.IdentifierExpr(GetToken(comprehension), wVar);
+                Boogie.Expr unboxw = BoogieGenerator.UnboxUnlessInherentlyBoxed(w, t.Type);
+                Boogie.Expr typeAntecedent = BoogieGenerator.MkIsBox(w, t.Type);
+                if (freeOfAlloc != null && !freeOfAlloc[0]) {
+                  var isAlloc = BoogieGenerator.MkIsAllocBox(w, t.Type, HeapExpr);
+                  typeAntecedent = BplAnd(typeAntecedent, isAlloc);
+                }
+
+                BoogieGenerator.CreateBoundVariables(e.BoundVars, out var bvs, out var args);
+                Contract.Assert(e.BoundVars.Count == bvs.Count);
+                var subst = new Dictionary<IVariable, Expression>();
+                for (var i = 0; i < e.BoundVars.Count; i++) {
+                  subst.Add(e.BoundVars[i], new BoogieWrapper(args[i], e.BoundVars[i].Type));
+                }
+                var rr = TrExpr(BoogieGenerator.Substitute(e.Range, null, subst));
+                var ff = TrExpr(BoogieGenerator.Substitute(t, null, subst));
+                var exst_body = BplAnd(rr, Boogie.Expr.Eq(unboxw, ff));
+                var ebody = BplAnd(typeAntecedent, new Boogie.ExistsExpr(GetToken(e), bvs, exst_body));
+                keys = new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), new List<Variable> { wVar }, kv, ebody);
+
+                BoogieGenerator.CreateMapComprehensionProjectionFunctions(e);
+                Contract.Assert(e.ProjectionFunctions != null && e.ProjectionFunctions.Count == e.BoundVars.Count);
+                subst = new Dictionary<IVariable, Expression>();
+                for (var i = 0; i < e.BoundVars.Count; i++) {
+                  var p = new Boogie.NAryExpr(GetToken(e), new Boogie.FunctionCall(e.ProjectionFunctions[i]), new List<Boogie.Expr> { unboxw });
+                  var prj = new BoogieWrapper(p, e.BoundVars[i].Type);
+                  subst.Add(e.BoundVars[i], prj);
+                }
+                ebody = TrExpr(BoogieGenerator.Substitute(e.Term, null, subst));
+                values = new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), new List<Variable> { wVar }, kv, BoxIfNecessary(GetToken(comprehension), ebody, e.Term.Type));
+              }
+
+              return BoogieGenerator.FunctionCall(GetToken(e),
+                e.Finite ? BuiltinFunction.MapGlue : BuiltinFunction.IMapGlue,
+                null,
+                e.Finite ? FunctionCall(GetToken(comprehension), "Set#FromBoogieMap", Predef.SetType, keys) : keys,
+                values, BoogieGenerator.TypeToTy(comprehension.Type));
+            }
+          case LambdaExpr lambdaExpr: {
+              var e = lambdaExpr;
+              return TrLambdaExpr(e);
+            }
+          case StmtExpr stmtExpr: {
+              var e = stmtExpr;
+              return TrExpr(e.E);
+            }
+          case ITEExpr iteExpr: {
+              ITEExpr e = iteExpr;
+              var g = BoogieGenerator.RemoveLit(TrExpr(e.Test));
+              var thn = BoogieGenerator.AdaptBoxing(e.Thn.Origin, BoogieGenerator.RemoveLit(TrExpr(e.Thn)), e.Thn.Type, e.Type);
+              var els = BoogieGenerator.AdaptBoxing(e.Els.Origin, BoogieGenerator.RemoveLit(TrExpr(e.Els)), e.Els.Type, e.Type);
+              return new NAryExpr(GetToken(iteExpr), new IfThenElse(GetToken(iteExpr)), new List<Boogie.Expr> { g, thn, els });
+            }
+          case MatchExpr matchExpr: {
+              var e = matchExpr;
+              var ite = DesugarMatchExpr(e);
+              return TrExpr(ite);
+            }
+          case ConcreteSyntaxExpression expression: {
+              var e = expression;
+              return TrExpr(e.ResolvedExpression);
+            }
+          case NestedMatchExpr nestedMatchExpr:
+            return TrExpr(nestedMatchExpr.Flattened);
+          case BoxingCastExpr castExpr: {
+              BoxingCastExpr e = castExpr;
+              return BoogieGenerator.CondApplyBox(GetToken(e), TrExpr(e.E), e.FromType, e.ToType);
+            }
+          case UnboxingCastExpr castExpr: {
+              UnboxingCastExpr e = castExpr;
+              return BoogieGenerator.CondApplyUnbox(GetToken(e), TrExpr(e.E), e.FromType, e.ToType);
+            }
+          case DecreasesToExpr decreasesToExpr:
+            var oldArray = decreasesToExpr.OldExpressions.ToArray();
+            var newArray = decreasesToExpr.NewExpressions.ToArray();
+            List<Expr> newExprs = new();
+            List<Expr> oldExprs = new();
+            List<Expression> newExprsDafny = new();
+            List<Expression> oldExprsDafny = new();
+            int N = Math.Min(oldArray.Length, newArray.Length);
+            for (int i = 0; i < N; i++) {
+              if (!CompatibleDecreasesTypes(oldArray[i].Type, newArray[i].Type)) {
+                N = i;
+                break;
+              }
+              oldExprsDafny.Add(oldArray[i]);
+              oldExprs.Add(TrExpr(oldArray[i]));
+              newExprsDafny.Add(newArray[i]);
+              newExprs.Add(TrExpr(newArray[i]));
+            }
+
+            bool endsWithWinningTopComparison = N == oldArray.Length && N < newArray.Length;
+            var allowNoChange = decreasesToExpr.AllowNoChange || endsWithWinningTopComparison;
+            List<IOrigin> toks = oldExprs.Zip(newExprs, (_, _) => (IOrigin)decreasesToExpr.Origin).ToList();
+            var decreasesExpr = BoogieGenerator.DecreasesCheck(toks, null,
+              newExprsDafny, oldExprsDafny, newExprs, oldExprs, null,
+              null, allowNoChange, false);
+            return decreasesExpr;
+          default:
+            Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
+        }
+      }
+
+      public Expr TrExprSpecialFunctionCall(FunctionCallExpr expr) {
+        Contract.Requires(expr.Function is SpecialFunction);
+        string name = expr.Function.Name;
+        if (name == "RotateLeft") {
+          var w = expr.Type.AsBitVectorType.Width;
+          Expression arg = expr.Args[0];
+          return TrToFunctionCall(GetToken(expr), "LeftRotate_bv" + w, BoogieGenerator.BplBvType(w), TrExpr(expr.Receiver), BoogieGenerator.ConvertExpression(GetToken(expr), TrExpr(arg), arg.Type, expr.Type), false);
+        } else if (name == "RotateRight") {
+          var w = expr.Type.AsBitVectorType.Width;
+          Expression arg = expr.Args[0];
+          return TrToFunctionCall(GetToken(expr), "RightRotate_bv" + w, BoogieGenerator.BplBvType(w), TrExpr(expr.Receiver), BoogieGenerator.ConvertExpression(GetToken(expr), TrExpr(arg), arg.Type, expr.Type), false);
+        } else {
+          bool argsAreLitDummy;
+          var args = FunctionInvocationArguments(expr, null, null, true, out argsAreLitDummy);
+          var id = new Boogie.IdentifierExpr(GetToken(expr), expr.Function.FullSanitizedName, BoogieGenerator.TrType(expr.Type));
+          return new Boogie.NAryExpr(GetToken(expr), new Boogie.FunctionCall(id), args);
+        }
+      }
+      public Expr TrToFunctionCall(Boogie.IToken tok, string function, Boogie.Type returnType, Boogie.Expr e0, Boogie.Expr e1, bool liftLit) {
+        Boogie.Expr re = FunctionCall(tok, function, returnType, e0, e1);
+        if (liftLit) {
+          re = MaybeLit(re, returnType);
+        }
+        return re;
+      }
+
+      private Expr TrLambdaExpr(LambdaExpr e) {
+        Contract.Requires(e != null);
+
+        var bvars = new List<Boogie.Variable>();
+
+        var varNameGen = BoogieGenerator.CurrentIdGenerator.NestedFreshIdGenerator("$l#");
+
+        var heap = BplBoundVar(varNameGen.FreshId("#heap#"), Predef.HeapType, bvars);
+
+        var ves = (from bv in e.BoundVars
+                   select
+BplBoundVar(varNameGen.FreshId(string.Format("#{0}#", bv.Name)), Predef.BoxType, bvars)).ToList();
+        var subst = e.BoundVars.Zip(ves, (bv, ve) => {
+          var unboxy = BoogieGenerator.UnboxUnlessInherentlyBoxed(ve, bv.Type);
+          return new KeyValuePair<IVariable, Expression>(bv, new BoogieWrapper(unboxy, bv.Type));
+        }).ToDictionary(x => x.Key, x => x.Value);
+        var su = new Substituter(null, subst, new Dictionary<TypeParameter, Type>());
+        var et = this.HeapExpr != null
+          ? new ExpressionTranslator(this.BoogieGenerator, this.Predef, heap, this.Old.HeapExpr, this.scope)
+          : new ExpressionTranslator(this, heap);
+        var lvars = new List<Boogie.Variable>();
+        var ly = BplBoundVar(varNameGen.FreshId("#ly#"), Predef.LayerType, lvars);
+        et = et.WithLayer(ly);
+
+        var ebody = et.TrExpr(BoogieGenerator.Substitute(e.Body, null, subst));
+        ebody = BoogieGenerator.BoxIfNotNormallyBoxed(ebody.tok, ebody, e.Body.Type);
+
+        var isBoxes = BplAnd(ves.Zip(e.BoundVars, (ve, bv) => BoogieGenerator.MkIsBox(ve, bv.Type)));
+        Bpl.Expr reqbody;
+        if (e.Range == null) {
+          reqbody = isBoxes;
+        } else {
+          var range = BoogieGenerator.Substitute(e.Range, null, subst);
+          reqbody = BplAnd(isBoxes, BplImp(et.CanCallAssumption(range), et.TrExpr(range)));
+        }
+
+        var rdvars = new List<Boogie.Variable>();
+        var o = BplBoundVar(varNameGen.FreshId("#o#"), Predef.RefType, rdvars);
+        Boogie.Expr rdbody = new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), rdvars, null,
+          BoogieGenerator.InRWClause(GetToken(e), o, null, e.Reads.Expressions.ConvertAll(su.SubstFrameExpr), et, null, null));
+        rdbody = FunctionCall(GetToken(e), "SetRef_to_SetBox", Predef.SetType, rdbody);
+
+        return MaybeLit(
+          BoogieGenerator.FunctionCall(GetToken(e), BuiltinFunction.AtLayer, Predef.HandleType,
+            new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), lvars, null,
+              FunctionCall(GetToken(e), BoogieGenerator.Handle(e.BoundVars.Count), Predef.BoxType,
+                new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), bvars, null, ebody),
+                new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), bvars, null, reqbody),
+                new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), bvars, null, rdbody))),
+            layerIntraCluster != null ? layerIntraCluster.ToExpr() : layerInterCluster.ToExpr()),
+          Predef.HandleType);
+      }
+
+      public Expression DesugarMatchExpr(MatchExpr e) {
+        Contract.Requires(e != null);
+        // Translate:
+        //   match S
+        //   case C(i, j) => X
+        //   case D(k, l) => Y
+        //   case E(m, n) => Z
+        // into:
+        //   if S.C? then
+        //     X[i,j := S.dC0, S.dC1]
+        //   else if S.D? then
+        //     Y[k,l := S.dD0, S.dD1]
+        //   else
+        //     Z[m,n := S.dE0, S.dE1]
+        // As a special case, when there are no cases at all (which, in a correct program, means the
+        // match expression is unreachable), the translation is:
+        //   t
+        // where is "t" is some value (in particular, the default value) of the expected type.
+        Expression r = null;
+        for (int i = e.Cases.Count; 0 <= --i;) {
+          var mc = e.Cases[i];
+          var substMap = new Dictionary<IVariable, Expression>();
+          var argIndex = 0;
+          foreach (var bv in mc.Arguments) {
+            if (!LocalVariable.HasWildcardName(bv)) {
+              var dtor = mc.Ctor.Destructors[argIndex];
+              var dv = new MemberSelectExpr(bv.Origin, e.Source, dtor);
+              substMap.Add(bv, dv);
+            }
+            argIndex++;
+          }
+          var c = BoogieGenerator.Substitute(mc.Body, null, substMap);
+          if (r == null) {
+            r = c;
+          } else {
+            var test = new MemberSelectExpr(mc.Origin, e.Source, mc.Ctor.QueryField);
+            var ite = new ITEExpr(mc.Origin, false, test, c, r);
+            ite.Type = e.Type;
+            r = ite;
+          }
+        }
+        return r ?? new BoogieWrapper(ArbitraryValue(e.Type), e.Type);
+      }
+
+      public Boogie.Expr TrBoundVariables(List<BoundVar/*!*/> boundVars, List<Variable> bvars) {
+        return TrBoundVariables(boundVars, bvars, false);
+      }
+
+      public Boogie.Expr TrBoundVariables(List<BoundVar/*!*/> boundVars, List<Variable> bvars, bool translateAsLocals, List<bool>/*?*/ freeOfAlloc = null) {
+        Contract.Requires(boundVars != null);
+        Contract.Requires(bvars != null);
+        Contract.Requires(freeOfAlloc == null || freeOfAlloc.Count == boundVars.Count);
+        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
+
+        Boogie.Expr typeAntecedent = Boogie.Expr.True;
+        var i = 0;
+        foreach (BoundVar bv in boundVars) {
+          var tid = new Boogie.TypedIdent(bv.Origin, bv.AssignUniqueName(BoogieGenerator.CurrentDeclaration.IdGenerator), BoogieGenerator.TrType(bv.Type));
+          Boogie.Variable bvar;
+          if (translateAsLocals) {
+            bvar = new Boogie.LocalVariable(bv.Origin, tid);
+          } else {
+            bvar = new Boogie.BoundVariable(bv.Origin, tid);
+          }
+          bvars.Add(bvar);
+          var useAlloc = freeOfAlloc == null || freeOfAlloc[i] ? NOALLOC : ISALLOC;
+          Boogie.Expr wh = BoogieGenerator.GetWhereClause(bv.Origin, new Boogie.IdentifierExpr(bv.Origin, bvar), bv.Type, this, useAlloc);
+          if (wh != null) {
+            typeAntecedent = BplAnd(typeAntecedent, wh);
+          }
+          i++;
+        }
+        return typeAntecedent;
+      }
+
+      public List<Tuple<Boogie.Variable, Boogie.Expr>> TrBoundVariables_SeparateWhereClauses(List<BoundVar/*!*/> boundVars) {
+        Contract.Requires(boundVars != null);
+        Contract.Ensures(Contract.Result<List<Tuple<Boogie.Variable, Boogie.Expr>>>() != null);
+
+        var varsAndAntecedents = new List<Tuple<Boogie.Variable, Boogie.Expr>>();
+        foreach (BoundVar bv in boundVars) {
+          var tid = new Boogie.TypedIdent(bv.Origin, bv.AssignUniqueName(BoogieGenerator.CurrentDeclaration.IdGenerator), BoogieGenerator.TrType(bv.Type));
+          var bvar = new Boogie.BoundVariable(bv.Origin, tid);
+          var wh = BoogieGenerator.GetWhereClause(bv.Origin, new Boogie.IdentifierExpr(bv.Origin, bvar), bv.Type, this, NOALLOC);
+          varsAndAntecedents.Add(Tuple.Create<Boogie.Variable, Boogie.Expr>(bvar, wh));
+        }
+        return varsAndAntecedents;
+      }
+
+      public Boogie.Expr TrBoundVariablesRename(List<BoundVar> boundVars, List<Variable> bvars, out Dictionary<IVariable, Expression> substMap) {
+        Contract.Requires(boundVars != null);
+        Contract.Requires(bvars != null);
+
+        substMap = new Dictionary<IVariable, Expression>();
+        Boogie.Expr typeAntecedent = Boogie.Expr.True;
+        foreach (BoundVar bv in boundVars) {
+          var newBoundVar = new BoundVar(bv.Origin, bv.Name, bv.Type);
+          IdentifierExpr ie = new IdentifierExpr(newBoundVar.Origin, newBoundVar.AssignUniqueName(BoogieGenerator.CurrentDeclaration.IdGenerator)) {
+            Var = newBoundVar,
+            Type = newBoundVar.Type
+          };
+          substMap.Add(bv, ie);
+          Boogie.Variable bvar = new Boogie.BoundVariable(newBoundVar.Origin, new Boogie.TypedIdent(newBoundVar.Origin, newBoundVar.AssignUniqueName(BoogieGenerator.CurrentDeclaration.IdGenerator), BoogieGenerator.TrType(newBoundVar.Type)));
+          bvars.Add(bvar);
+          var bIe = new Boogie.IdentifierExpr(bvar.tok, bvar);
+          Boogie.Expr wh = BoogieGenerator.GetWhereClause(bv.Origin, bIe, newBoundVar.Type, this, NOALLOC);
+          if (wh != null) {
+            typeAntecedent = BplAnd(typeAntecedent, wh);
+          }
+        }
+        return typeAntecedent;
+      }
+
+      public List<Boogie.Expr> FunctionInvocationArguments(FunctionCallExpr e, Boogie.Expr layerArgument, Boogie.Expr revealArgument) {
+        bool dummy;
+        return FunctionInvocationArguments(e, layerArgument, revealArgument, false, out dummy);
+      }
+
+      public List<Boogie.Expr> FunctionInvocationArguments(FunctionCallExpr e, Boogie.Expr layerArgument, Boogie.Expr revealArgument, bool omitHeapArgument, out bool argsAreLit) {
+        Contract.Requires(e != null);
+        Contract.Ensures(Contract.Result<List<Boogie.Expr>>() != null);
+
+        var args = new List<Boogie.Expr>();
+
+        // first add type arguments
+        var tyParams = GetTypeParams(e.Function);
+        var tySubst = e.TypeArgumentSubstitutionsWithParents();
+        args.AddRange(BoogieGenerator.TrTypeArgs(tySubst, tyParams));
+
+        if (layerArgument != null) {
+          args.Add(layerArgument);
+        }
+        if (revealArgument != null) {
+          args.Add(revealArgument);
+        }
+        if (e.Function is TwoStateFunction) {
+          args.Add(OldAt(e.AtLabel).HeapExpr);
+        }
+        if (!omitHeapArgument && e.Function.ReadsHeap) {
+          Contract.Assert(HeapExpr != null);
+          args.Add(HeapExpr);
+          // If the function doesn't use the heap, but global settings say to use it,
+          // then we want to quantify over the heap so that heap in the trigger can match over
+          // heap modifying operations. (see Test/dafny4/Bug144.dfy)
+          bool usesHeap = e.Function.ReadsHeap || e.Function.Ins.Any(f => f.Type.IsRefType);
+          if (!usesHeap) {
+            Statistics_HeapAsQuantifierCount++;
+          }
+        }
+        argsAreLit = true;
+        if (!e.Function.IsStatic) {
+          var tr_ee = BoogieGenerator.BoxifyForTraitParent(e.Origin, TrExpr(e.Receiver), e.Function, e.Receiver.Type);
+          argsAreLit = argsAreLit && BoogieGenerator.IsLit(tr_ee);
+          args.Add(tr_ee);
+        }
+        for (int i = 0; i < e.Args.Count; i++) {
+          Expression ee = e.Args[i];
+          Type t = e.Function.Ins[i].Type;
+          Expr tr_ee = TrExpr(ee);
+          argsAreLit = argsAreLit && BoogieGenerator.IsLit(tr_ee);
+          args.Add(BoogieGenerator.AdaptBoxing(GetToken(e), tr_ee, cce.NonNull(ee.Type), t));
+        }
+        return args;
+      }
+
+      public Boogie.Expr GetArrayIndexFieldName(IOrigin tok, List<Expression> indices) {
+        return BoogieGenerator.GetArrayIndexFieldName(tok, indices.ConvertAll(idx => {
+          var e = TrExpr(idx);
+          return BoogieGenerator.ConvertExpression(GetToken(idx), e, idx.Type, Type.Int);
+        }));
+      }
+
+      public Boogie.Expr BoxIfNecessary(IOrigin tok, Boogie.Expr e, Type fromType) {
+        Contract.Requires(tok != null);
+        Contract.Requires(e != null);
+        Contract.Requires(fromType != null);
+        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
+        return BoogieGenerator.BoxIfNecessary(tok, e, fromType);
+      }
+
+      /// <summary>
+      /// Translate like s[Box(elmt)], but try to avoid as many set functions as possible in the
+      /// translation, because such functions can mess up triggering.
+      /// </summary>
+      public Boogie.Expr TrInSet(IOrigin tok, Boogie.Expr elmt, Expression s, Type elmtType, bool isFiniteSet, bool aggressive, out bool performedRewrite) {
+        Contract.Requires(tok != null);
+        Contract.Requires(elmt != null);
+        Contract.Requires(s != null);
+        Contract.Requires(elmtType != null);
+        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
+
+        var elmtBox = BoxIfNecessary(tok, elmt, elmtType);
+        var r = TrInSet_Aux(tok, elmt, elmtBox, s, isFiniteSet, aggressive, out performedRewrite);
+        Contract.Assert(performedRewrite == RewriteInExpr(s, aggressive)); // sanity check
+        return r;
+      }
+      /// <summary>
+      /// The worker routine for TrInSet.  This method takes both "elmt" and "elmtBox" as parameters,
+      /// using the former when the unboxed form is needed and the latter when the boxed form is needed.
+      /// This gives the caller the flexibility to pass in either "o, Box(o)" or "Unbox(bx), bx".
+      /// Note: This method must be kept in synch with RewriteInExpr.
+      /// </summary>
+      public Boogie.Expr TrInSet_Aux(IOrigin tok, Boogie.Expr elmt, Boogie.Expr elmtBox, Expression s, bool isFiniteSet, bool aggressive, out bool performedRewrite) {
+        Contract.Requires(tok != null);
+        Contract.Requires(elmt != null);
+        Contract.Requires(elmtBox != null);
+        Contract.Requires(s != null);
+        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
+
+        performedRewrite = true;  // assume a rewrite will happen
+        s = s.Resolved;
+        bool pr;
+        if (s is BinaryExpr && aggressive) {
+          BinaryExpr bin = (BinaryExpr)s;
+          switch (bin.ResolvedOp) {
+            case BinaryExpr.ResolvedOpcode.Union:
+              return BplOr(
+                TrInSet_Aux(tok, elmt, elmtBox, bin.E0, isFiniteSet, aggressive, out pr),
+                TrInSet_Aux(tok, elmt, elmtBox, bin.E1, isFiniteSet, aggressive, out pr));
+            case BinaryExpr.ResolvedOpcode.Intersection:
+              return BplAnd(
+                TrInSet_Aux(tok, elmt, elmtBox, bin.E0, isFiniteSet, aggressive, out pr),
+                TrInSet_Aux(tok, elmt, elmtBox, bin.E1, isFiniteSet, aggressive, out pr));
+            case BinaryExpr.ResolvedOpcode.SetDifference:
+              return BplAnd(
+                TrInSet_Aux(tok, elmt, elmtBox, bin.E0, isFiniteSet, aggressive, out pr),
+                Boogie.Expr.Not(TrInSet_Aux(tok, elmt, elmtBox, bin.E1, isFiniteSet, aggressive, out pr)));
+            default:
+              break;
+          }
+        } else if (s is SetDisplayExpr) {
+          SetDisplayExpr disp = (SetDisplayExpr)s;
+          Boogie.Expr disjunction = null;
+          foreach (Expression a in disp.Elements) {
+            Boogie.Expr disjunct = Boogie.Expr.Eq(elmt, TrExpr(a));
+            if (disjunction == null) {
+              disjunction = disjunct;
+            } else {
+              disjunction = BplOr(disjunction, disjunct);
+            }
+          }
+          if (disjunction == null) {
+            return Boogie.Expr.False;
+          } else {
+            return disjunction;
+          }
+        } else if (s is SetComprehension) {
+          var compr = (SetComprehension)s;
+          // Translate "elmt in set xs | R :: T" into:
+          //     exists xs :: CorrectType(xs) && R && elmt==T
+          // or if "T" is "xs", then:
+          //     CorrectType(elmt) && R[xs := elmt]
+          if (compr.TermIsSimple) {
+            // CorrectType(elmt) && R[xs := elmt]
+            // Note, we can always use NOALLOC here.
+            Boogie.Expr typeAntecedent = BoogieGenerator.GetWhereClause(GetToken(compr), elmt, compr.BoundVars[0].Type, this, NOALLOC) ?? Boogie.Expr.True;
+            var range = BoogieGenerator.Substitute(compr.Range, compr.BoundVars[0], new BoogieWrapper(elmt, compr.BoundVars[0].Type));
+            return BplAnd(typeAntecedent, TrExpr(range));
+          } else {
+            // exists xs :: CorrectType(xs) && R && elmt==T
+            List<bool> freeOfAlloc = BoundedPool.HasBounds(compr.Bounds, BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
+            var bvars = new List<Variable>();
+            Boogie.Expr typeAntecedent = TrBoundVariables(compr.BoundVars, bvars, false, freeOfAlloc) ?? Boogie.Expr.True;
+            var eq = Boogie.Expr.Eq(elmtBox, BoxIfNecessary(GetToken(compr), TrExpr(compr.Term), compr.Term.Type));
+            var ebody = BplAnd(BplAnd(typeAntecedent, TrExpr(compr.Range)), eq);
+            var triggers = BoogieGenerator.TrTrigger(this, compr.Attributes, GetToken(compr));
+            return new Boogie.ExistsExpr(GetToken(compr), bvars, triggers, ebody);
+          }
+        }
+        performedRewrite = false;
+        return BoogieGenerator.IsSetMember(tok, TrExpr(s), elmtBox, isFiniteSet);
+      }
+
+      /// <summary>
+      /// Translate like 0 < s[Box(elmt)], but try to avoid as many set functions as possible in the
+      /// translation, because such functions can mess up triggering.
+      /// Note: This method must be kept in synch with RewriteInExpr.
+      /// </summary>
+      public Boogie.Expr TrInMultiSet(IOrigin tok, Boogie.Expr elmt, Expression s, Type elmtType, bool aggressive) {
+        Contract.Requires(tok != null);
+        Contract.Requires(elmt != null);
+        Contract.Requires(s != null);
+        Contract.Requires(elmtType != null);
+
+        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
+        var elmtBox = BoxIfNecessary(tok, elmt, elmtType);
+        return TrInMultiSet_Aux(tok, elmt, elmtBox, s, aggressive);
+      }
+      public Boogie.Expr TrInMultiSet_Aux(IOrigin tok, Boogie.Expr elmt, Boogie.Expr elmtBox, Expression s, bool aggressive) {
+        Contract.Requires(tok != null);
+        Contract.Requires(elmt != null);
+        Contract.Requires(s != null);
+        Contract.Requires(elmtBox != null);
+
+        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
+
+        s = s.Resolved;
+        if (s is BinaryExpr && aggressive) {
+          BinaryExpr bin = (BinaryExpr)s;
+          switch (bin.ResolvedOp) {
+            case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+              return Boogie.Expr.Binary(tok, BinaryOperator.Opcode.Or, TrInMultiSet_Aux(tok, elmt, elmtBox, bin.E0, aggressive), TrInMultiSet_Aux(tok, elmt, elmtBox, bin.E1, aggressive));
+            case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+              return Boogie.Expr.Binary(tok, BinaryOperator.Opcode.And, TrInMultiSet_Aux(tok, elmt, elmtBox, bin.E0, aggressive), TrInMultiSet_Aux(tok, elmt, elmtBox, bin.E1, aggressive));
+            default:
+              break;
+          }
+        } else if (s is MultiSetDisplayExpr) {
+          MultiSetDisplayExpr disp = (MultiSetDisplayExpr)s;
+          Boogie.Expr disjunction = null;
+          foreach (Expression a in disp.Elements) {
+            Boogie.Expr disjunct = Boogie.Expr.Eq(elmt, TrExpr(a));
+            if (disjunction == null) {
+              disjunction = disjunct;
+            } else {
+              disjunction = BplOr(disjunction, disjunct);
+            }
+          }
+          if (disjunction == null) {
+            return Boogie.Expr.False;
+          } else {
+            return disjunction;
+          }
+        }
+        var result = Boogie.Expr.Gt(BoogieGenerator.MultisetMultiplicity(tok, TrExpr(s), elmtBox), Boogie.Expr.Literal(0));
+        result.tok = tok;
+        return result;
+      }
+
+      /// <summary>
+      /// This method returns "true" iff TrInSet_Aux/TrInMultiSet_Aux will rewrite an expression "x in s".
+      /// Note: This method must be kept in synch with TrInSet_Aux/TrInMultiSet_Aux.
+      /// </summary>
+      public static bool RewriteInExpr(Expression s, bool aggressive) {
+        Contract.Requires(s != null);
+
+        s = s.Resolved;
+        if (s is BinaryExpr && aggressive) {
+          BinaryExpr bin = (BinaryExpr)s;
+          switch (bin.ResolvedOp) {
+            case BinaryExpr.ResolvedOpcode.Union:
+            case BinaryExpr.ResolvedOpcode.Intersection:
+            case BinaryExpr.ResolvedOpcode.SetDifference:
+            case BinaryExpr.ResolvedOpcode.MultiSetUnion:
+            case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
+              return true;
+            default:
+              break;
+          }
+        } else if (s is SetDisplayExpr || s is MultiSetDisplayExpr) {
+          return true;
+        } else if (s is SetComprehension) {
+          return true;
+        }
+        return false;
+      }
+
+      private static readonly Dictionary<string, string> NullaryAttributesToTranslate;
+
+      private static readonly HashSet<string> NullaryAttributesToCopy = new(new[] {
+        "focus",
+        "isolate",
+        "ignore",
+        "selective_checking",
+        "split",
+        "split_here",
+        "start_checking_here",
+        "testEntry",
+        "testInline",
+        "vcs_split_on_every_assert",
+      });
+
+      private static readonly HashSet<string> BooleanAttributesToCopy = new(new[] {
+        "verify"
+      });
+
+      private static readonly HashSet<string> IntegerAttributesToCopy = new(new[] {
+        "subsumption",
+        "testInline",
+        "timeLimit",
+        "vcs_max_cost",
+        "vcs_max_keep_going_splits",
+        "vcs_max_splits",
+        "weight"
+      });
+
+      private static readonly HashSet<string> StringAttributesToCopy = new(new[] {
+        "captureState",
+        "isolate",
+        "error"
+      });
+
+      static ExpressionTranslator() {
+        NullaryAttributesToTranslate = new() {
+          {
+            "isolate_assertions",
+            "vcs_split_on_every_assert"
+          }
+        };
+      }
+
+      private QKeyValue TrBooleanAttribute(string name, Expression arg, QKeyValue rest) {
+        var boolArg = RemoveLit(TrExpr(arg));
+        return boolArg is Boogie.LiteralExpr { IsTrue: true } or Boogie.LiteralExpr { IsFalse: true }
+          ? new QKeyValue(arg.Origin, name, new List<object> { boolArg }, rest)
+          : rest;
+      }
+
+      private QKeyValue TrIntegerAttribute(string name, Expression arg, QKeyValue rest) {
+        var intArg = RemoveLit(TrExpr(arg));
+        return intArg is Boogie.LiteralExpr { isBigNum: true }
+          ? new QKeyValue(arg.Origin, name, new List<object> { intArg }, rest)
+          : rest;
+      }
+
+      private QKeyValue TrStringAttribute(string name, Expression arg, QKeyValue rest) {
+        // pass string literals down to Boogie as string literals, not as their expression translation
+        var strArg = arg.AsStringLiteral();
+        return strArg is not null
+          ? new QKeyValue(arg.Origin, name, new List<object> { strArg }, rest)
+          : rest;
+      }
+
+      public QKeyValue TrAttributes(Attributes attrs, string skipThisAttribute = null) {
+        QKeyValue kv = null;
+        var hasNewTimeLimit = Attributes.Contains(attrs, "_timeLimit");
+        var hasNewRLimit = Attributes.Contains(attrs, "_rlimit");
+        foreach (var attr in attrs.AsEnumerable()) {
+          var name = attr.Name;
+          if ((name == skipThisAttribute) ||
+              // omit the extern attribute when /noExterns option is specified.
+              (name is "extern" && options.DisallowExterns) ||
+              (name is "timeLimit" && hasNewTimeLimit) ||
+              (name is "rlimit" && hasNewRLimit) ||
+              (attr is UserSuppliedAtAttribute)
+          ) {
+            continue;
+          }
+
+          if (NullaryAttributesToTranslate.ContainsKey(name) && attr.Args.Count == 0) {
+            kv = new QKeyValue(attr.Origin, NullaryAttributesToTranslate[name], new List<object>(), kv);
+          } else if (NullaryAttributesToCopy.Contains(name) && attr.Args.Count == 0) {
+            kv = new QKeyValue(attr.Origin, name, new List<object>(), kv);
+          } else if (BooleanAttributesToCopy.Contains(name) && attr.Args.Count == 1) {
+            kv = TrBooleanAttribute(name, attr.Args[0], kv);
+          } else if (IntegerAttributesToCopy.Contains(name) && attr.Args.Count == 1) {
+            kv = TrIntegerAttribute(name, attr.Args[0], kv);
+          } else if (StringAttributesToCopy.Contains(name) && attr.Args.Count == 1) {
+            kv = TrStringAttribute(name, attr.Args[0], kv);
+          } else if (name is "_timeLimit") {
+            kv = TrIntegerAttribute("timeLimit", attr.Args[0], kv);
+          } else if (name is "_rlimit") {
+            kv = TrIntegerAttribute("rlimit", attr.Args[0], kv);
+          } else if (name is "synthesize" or "extern") {
+            kv = new QKeyValue(attr.Origin, "extern", new List<object>(), kv);
+          } else if (name is "rlimit" && attr.Args.Count == 1) {
+            // Values for _rlimit are already in terms of Boogie units (1000 x user-provided value) because they're
+            // derived from command-line rlimit settings. Values for rlimit still need to be multiplied.
+            if (RemoveLit(TrExpr(attr.Args[0])) is not Boogie.LiteralExpr { isBigNum: true } litExpr) {
+              continue;
+            }
+
+            var limit = new Boogie.LiteralExpr(
+              litExpr.tok,
+              BigNum.FromUInt(Boogie.Util.BoundedMultiply((uint)litExpr.asBigNum.ToIntSafe, 1000)),
+              litExpr.Immutable);
+            kv = new QKeyValue(attr.Origin, name, new List<object> { limit }, kv);
+          } else if (name is "resource_limit" && attr.Args.Count == 1) {
+            // Do this after the above multiplication because :resource_limit should not be multiplied.
+            Expr limit;
+            var arg = attr.Args[0];
+            var strArg = arg.AsStringLiteral();
+            if (strArg != null) {
+              if (DafnyOptions.TryParseResourceCount(strArg, out var resourceLimit)) {
+                limit = new Boogie.LiteralExpr(attr.Origin, BigNum.FromUInt(resourceLimit), true);
+              } else {
+                BoogieGenerator.reporter.Error(MessageSource.Verifier, attr.Origin,
+                  $"failed to parse resource count: {strArg}");
+                continue;
+              }
+            } else {
+              limit = RemoveLit(TrExpr(arg));
+            }
+            kv = new QKeyValue(attr.Origin, "rlimit", new List<object> { limit }, kv);
+          }
+        }
+        return kv;
+      }
+
+      // --------------- help routines ---------------
+
+      public Boogie.Expr IsAlloced(IOrigin tok, Boogie.Expr e) {
+        Contract.Requires(HeapExpr != null);
+        return BoogieGenerator.IsAlloced(tok, HeapExpr, e);
+      }
+
+      public Boogie.Expr GoodRef(IOrigin tok, Boogie.Expr e, Type type) {
+        Contract.Requires(tok != null);
+        Contract.Requires(e != null);
+        Contract.Requires(type != null);
+        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
+
+        // Add $Is and $IsAlloc
+        return BoogieGenerator.GetWhereClause(tok, e, type, this, ISALLOC);
+      }
+
+      public Expression MakeAllowance(FunctionCallExpr e, CanCallOptions cco = null) {
+        Expression allowance = Expression.CreateBoolLiteral(e.Origin, true);
+        if (!e.Function.IsStatic) {
+          allowance = Expression.CreateAnd(allowance, Expression.CreateEq(e.Receiver, new ThisExpr(e.Function), e.Receiver.Type));
+        }
+        var formals = cco == null ? e.Function.Ins : cco.EnclosingFunction.Ins;
+        for (int i = 0; i < e.Args.Count; i++) {
+          Expression ee = e.Args[i];
+          Formal ff = formals[i];
+          allowance = Expression.CreateAnd(allowance, Expression.CreateEq(ee, Expression.CreateIdentExpr(ff), ff.Type));
+        }
+        return allowance;
+      }
+
+      public Expr CanCallAssumption(Expression expr, CanCallOptions cco = null) {
+        Contract.Requires(expr != null);
+        Contract.Requires(this != null);
+        Contract.Requires(BoogieGenerator.Predef != null);
+        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
+
+        if (expr is LiteralExpr || expr is ThisExpr || expr is IdentifierExpr || expr is WildcardExpr || expr is BoogieWrapper) {
+          return Boogie.Expr.True;
+        } else if (expr is DisplayExpression) {
+          DisplayExpression e = (DisplayExpression)expr;
+          return CanCallAssumption(e.Elements, cco);
+        } else if (expr is MapDisplayExpr) {
+          MapDisplayExpr e = (MapDisplayExpr)expr;
+          List<Expression> l = new List<Expression>();
+          foreach (ExpressionPair p in e.Elements) {
+            l.Add(p.A); l.Add(p.B);
+          }
+          return CanCallAssumption(l, cco);
+        } else if (expr is MemberSelectExpr) {
+          MemberSelectExpr e = (MemberSelectExpr)expr;
+          var r = CanCallAssumption(e.Obj, cco);
+          if (e.Member is DatatypeDestructor) {
+            var dtor = (DatatypeDestructor)e.Member;
+            if (dtor.EnclosingCtors.Count == dtor.EnclosingCtors[0].EnclosingDatatype.Ctors.Count) {
+              // Every constructor has this destructor; might as well assume that here.
+              var correctConstructor = BplOr(dtor.EnclosingCtors.ConvertAll(
+                ctor => FunctionCall(e.Origin, ctor.QueryField.FullSanitizedName, Boogie.Type.Bool, TrExpr(e.Obj))));
+              r = BplAnd(r, correctConstructor);
+            }
+          } else if (e.Member is ConstantField { Rhs: { } rhs } && BoogieGenerator.RevealedInScope(e.Member)) {
+            r = CanCallAssumption(Substitute(rhs, e.Obj, new Dictionary<IVariable, Expression>(), null));
+          }
+          return r;
+        } else if (expr is SeqSelectExpr) {
+          SeqSelectExpr e = (SeqSelectExpr)expr;
+          Boogie.Expr total = CanCallAssumption(e.Seq, cco);
+          if (e.E0 != null) {
+            total = BplAnd(total, CanCallAssumption(e.E0, cco));
+          }
+          if (e.E1 != null) {
+            total = BplAnd(total, CanCallAssumption(e.E1, cco));
+          }
+          return total;
+        } else if (expr is MultiSelectExpr) {
+          MultiSelectExpr e = (MultiSelectExpr)expr;
+          Boogie.Expr total = CanCallAssumption(e.Array, cco);
+          foreach (Expression idx in e.Indices) {
+            total = BplAnd(total, CanCallAssumption(idx, cco));
+          }
+          return total;
+        } else if (expr is SeqUpdateExpr) {
+          SeqUpdateExpr e = (SeqUpdateExpr)expr;
+          Boogie.Expr total = CanCallAssumption(e.Seq, cco);
+          total = BplAnd(total, CanCallAssumption(e.Index, cco));
+          total = BplAnd(total, CanCallAssumption(e.Value, cco));
+          return total;
+
+        } else if (expr is ApplyExpr) {
+          ApplyExpr e = (ApplyExpr)expr;
+
+          Func<Expression, Boogie.Expr> TrArg = arg => {
+            Boogie.Expr inner = TrExpr(arg);
+            if (ModeledAsBoxType(arg.Type)) {
+              return inner;
+            } else {
+              return BoogieGenerator.FunctionCall(arg.Origin, BuiltinFunction.Box, null, inner);
+            }
+          };
+
+          var args = Concat(
+            Map(e.Function.Type.AsArrowType.TypeArgs, BoogieGenerator.TypeToTy),
+            Cons(HeapExpr,
+              Cons(TrExpr(e.Function),
+                e.Args.ConvertAll(arg => TrArg(arg)))));
+
+          var requiresk = FunctionCall(e.Origin, Requires(e.Args.Count), Boogie.Type.Bool, args);
+          return BplAnd(
+            BplAnd(
+              Cons(CanCallAssumption(e.Function, cco),
+                e.Args.ConvertAll(ee => CanCallAssumption(ee, cco)))),
+            requiresk);
+
+        } else if (expr is FunctionCallExpr) {
+          FunctionCallExpr e = (FunctionCallExpr)expr;
+          Boogie.Expr r = CanCallAssumption(e.Receiver, cco);
+          r = BplAnd(r, CanCallAssumption(e.Args, cco));
+          if (!(e.Function is SpecialFunction)) {
+            Boogie.IdentifierExpr canCallFuncID = new Boogie.IdentifierExpr(expr.Origin, e.Function.FullSanitizedName + "#canCall", Boogie.Type.Bool);
+            List<Boogie.Expr> args = FunctionInvocationArguments(e, null, null);
+            Boogie.Expr canCallFuncAppl = new Boogie.NAryExpr(BoogieGenerator.GetToken(expr), new Boogie.FunctionCall(canCallFuncID), args);
+            var add = cco != null && cco.MakeAllowance(e.Function) ? Boogie.Expr.Or(TrExpr(MakeAllowance(e, cco)), canCallFuncAppl) : canCallFuncAppl;
+            r = BplAnd(r, add);
+          }
+          return r;
+        } else if (expr is DatatypeValue) {
+          DatatypeValue dtv = (DatatypeValue)expr;
+          return CanCallAssumption(dtv.Arguments, cco);
+        } else if (expr is SeqConstructionExpr) {
+          var e = (SeqConstructionExpr)expr;
+          // CanCallAssumption[[ seq(n, init) ]] =
+          //     CanCallAssumption[[ n ]] &&
+          //     CanCallAssumption[[ init ]] &&
+          //     var initF := init; // necessary, in order to use init(i) in trigger, since it may contain quantifiers
+          //     (forall i: int
+          //         { initF(i) }
+          //         0 <= i < n ==>
+          //             CanCallAssumption[[ init(i) ]])
+
+          var varNameGen = BoogieGenerator.CurrentIdGenerator.NestedFreshIdGenerator("seqinit$");
+          var indexVar = new Bpl.BoundVariable(e.Origin, new Bpl.TypedIdent(e.Origin, varNameGen.FreshId("#i"), Bpl.Type.Int));
+          var index = new Bpl.IdentifierExpr(e.Origin, indexVar);
+          var indexRange = BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(0), index), Bpl.Expr.Lt(index, TrExpr(e.N)));
+          var initFVar = new Bpl.BoundVariable(e.Origin, new Bpl.TypedIdent(e.Origin, varNameGen.FreshId("#f"), Predef.HandleType));
+
+          var initF = new Bpl.IdentifierExpr(e.Origin, initFVar);
+
+          var dafnyInitApplication = new ApplyExpr(e.Origin, e.Initializer,
+            new List<Expression>() { new BoogieWrapper(index, Type.Int) },
+            Token.NoToken) {
+            Type = e.Initializer.Type.AsArrowType.Result
+          };
+          var canCall = CanCallAssumption(dafnyInitApplication);
+
+          dafnyInitApplication = new ApplyExpr(e.Origin, new BoogieWrapper(initF, e.Initializer.Type),
+            new List<Expression>() { new BoogieWrapper(index, Type.Int) },
+            Token.NoToken) {
+            Type = e.Initializer.Type.AsArrowType.Result
+          };
+          var apply = TrExpr(dafnyInitApplication);
+
+          var tr = new Bpl.Trigger(e.Origin, true, new List<Bpl.Expr> { apply });
+          var ccaInit = new Bpl.ForallExpr(e.Origin, new List<Bpl.Variable>() { indexVar }, tr, BplImp(indexRange, canCall));
+          var rhsAppliedToIndex = new Bpl.LetExpr(e.Origin, new List<Variable>() { initFVar },
+            new List<Expr>() { TrExpr(e.Initializer) }, null, ccaInit);
+
+          return BplAnd(BplAnd(CanCallAssumption(e.N, cco), CanCallAssumption(e.Initializer, cco)), rhsAppliedToIndex);
+
+        } else if (expr is MultiSetFormingExpr) {
+          MultiSetFormingExpr e = (MultiSetFormingExpr)expr;
+          return CanCallAssumption(e.E, cco);
+        } else if (expr is OldExpr) {
+          var e = (OldExpr)expr;
+          return OldAt(e.AtLabel).CanCallAssumption(e.E, cco);
+        } else if (expr is UnchangedExpr) {
+          var e = (UnchangedExpr)expr;
+          Boogie.Expr be = Boogie.Expr.True;
+          foreach (var fe in e.Frame) {
+            be = BplAnd(be, CanCallAssumption(fe.E, cco));
+          }
+          return be;
+        } else if (expr is UnaryExpr) {
+          var e = (UnaryExpr)expr;
+          return CanCallAssumption(e.E, cco);
+        } else if (expr is BinaryExpr) {
+          // The short-circuiting boolean operators &&, ||, and ==> end up duplicating their
+          // left argument. Therefore, we first try to re-associate the expression to make
+          // left arguments smaller.
+          if (BoogieGenerator.ReAssociateToTheRight(ref expr)) {
+            return CanCallAssumption(expr, cco);
+          }
+          var e = (BinaryExpr)expr;
+
+          Boogie.Expr t0 = CanCallAssumption(e.E0, cco);
+          Boogie.Expr t1 = CanCallAssumption(e.E1, cco);
+          switch (e.ResolvedOp) {
+            case BinaryExpr.ResolvedOpcode.And:
+            case BinaryExpr.ResolvedOpcode.Imp:
+              t1 = BplImp(TrExpr(e.E0), t1);
+              break;
+            case BinaryExpr.ResolvedOpcode.Or:
+              t1 = BplImp(Boogie.Expr.Not(TrExpr(e.E0)), t1);
+              break;
+            case BinaryExpr.ResolvedOpcode.EqCommon:
+            case BinaryExpr.ResolvedOpcode.NeqCommon: {
+                Boogie.Expr r = Boogie.Expr.True;
+                if (cco is not { SkipIsA: true }) {
+                  if (e.E0 is { Type: { AsDatatype: { } dt0 }, Resolved: not DatatypeValue }) {
+                    var funcID = new Boogie.FunctionCall(new Boogie.IdentifierExpr(expr.Origin, "$IsA#" + dt0.FullSanitizedName, Boogie.Type.Bool));
+                    r = BplAnd(r, new Boogie.NAryExpr(expr.Origin, funcID, new List<Boogie.Expr> { TrExpr(e.E0) }));
+                  }
+                  if (e.E1 is { Type: { AsDatatype: { } dt1 }, Resolved: not DatatypeValue }) {
+                    var funcID = new Boogie.FunctionCall(new Boogie.IdentifierExpr(expr.Origin, "$IsA#" + dt1.FullSanitizedName, Boogie.Type.Bool));
+                    r = BplAnd(r, new Boogie.NAryExpr(expr.Origin, funcID, new List<Boogie.Expr> { TrExpr(e.E1) }));
+                  }
+                }
+                return BplAnd(r, BplAnd(t0, t1));
+              }
+            case BinaryExpr.ResolvedOpcode.Mul:
+              if (7 <= BoogieGenerator.options.ArithMode) {
+                if (e.E0.Type.IsNumericBased(Type.NumericPersuasion.Int) && !BoogieGenerator.DisableNonLinearArithmetic) {
+                  // Produce a useful fact about the associativity of multiplication. It is a bit dicey to do as an axiom.
+                  // Change (k*A)*B or (A*k)*B into (A*B)*k, where k is a numeric literal
+                  var left = e.E0.Resolved as BinaryExpr;
+                  if (left != null && left.ResolvedOp == BinaryExpr.ResolvedOpcode.Mul) {
+                    Boogie.Expr r = Boogie.Expr.True;
+                    if (left.E0.Resolved is LiteralExpr) {
+                      // (K*A)*B == (A*B)*k
+                      var y = Expression.CreateMul(Expression.CreateMul(left.E1, e.E1), left.E0);
+                      var eq = Expression.CreateEq(e, y, e.E0.Type);
+                      r = BplAnd(r, TrExpr(eq));
+                    }
+                    if (left.E1.Resolved is LiteralExpr) {
+                      // (A*k)*B == (A*B)*k
+                      var y = Expression.CreateMul(Expression.CreateMul(left.E0, e.E1), left.E1);
+                      var eq = Expression.CreateEq(e, y, e.E0.Type);
+                      r = BplAnd(r, TrExpr(eq));
+                    }
+                    if (r != Boogie.Expr.True) {
+                      return BplAnd(BplAnd(t0, t1), r);
+                    }
+                  }
+                }
+              }
+              break;
+            default:
+              break;
+          }
+          return BplAnd(t0, t1);
+        } else if (expr is TernaryExpr) {
+          var e = (TernaryExpr)expr;
+          return BplAnd(CanCallAssumption(e.E0, cco), BplAnd(CanCallAssumption(e.E1, cco), CanCallAssumption(e.E2, cco)));
+
+        } else if (expr is LetExpr letExpr) {
+          return LetCanCallAssumption(letExpr, cco);
+
+        } else if (expr is LambdaExpr) {
+          var e = (LambdaExpr)expr;
+
+          var bvarsAndAntecedents = new List<Tuple<Boogie.Variable, Boogie.Expr>>();
+          var varNameGen = BoogieGenerator.CurrentIdGenerator.NestedFreshIdGenerator("$l#");
+
+          Boogie.Expr heap; var hVar = BplBoundVar(varNameGen.FreshId("#heap#"), BoogieGenerator.Predef.HeapType, out heap);
+          var et = this.HeapExpr != null
+            ? new ExpressionTranslator(this.BoogieGenerator, this.Predef, heap, this.Old.HeapExpr, this.scope)
+            : new ExpressionTranslator(this, heap);
+
+          Dictionary<IVariable, Expression> subst = new Dictionary<IVariable, Expression>();
+          foreach (var bv in e.BoundVars) {
+            Boogie.Expr ve; var yVar = BplBoundVar(varNameGen.FreshId(string.Format("#{0}#", bv.Name)), BoogieGenerator.TrType(bv.Type), out ve);
+            var wh = BoogieGenerator.GetWhereClause(bv.Origin, new Boogie.IdentifierExpr(bv.Origin, yVar), bv.Type, et, NOALLOC);
+            bvarsAndAntecedents.Add(Tuple.Create<Boogie.Variable, Boogie.Expr>(yVar, wh));
+            subst[bv] = new BoogieWrapper(ve, bv.Type);
+          }
+
+          var canCall = et.CanCallAssumption(Substitute(e.Body, null, subst), cco);
+          if (e.Range != null) {
+            var range = Substitute(e.Range, null, subst);
+            canCall = BplAnd(CanCallAssumption(range, cco), BplImp(TrExpr(range), canCall));
+          }
+
+          // It's important to add the heap last to "bvarsAndAntecedents", because the heap may occur in the antecedents of
+          // the other variables and BplForallTrim processes the given tuples in order.
+          var goodHeap = BoogieGenerator.FunctionCall(e.Origin, BuiltinFunction.IsGoodHeap, null, heap);
+          bvarsAndAntecedents.Add(Tuple.Create<Boogie.Variable, Boogie.Expr>(hVar, goodHeap));
+
+          //TRIG (forall $l#0#heap#0: Heap, $l#0#x#0: int :: true)
+          //TRIG (forall $l#0#heap#0: Heap, $l#0#t#0: DatatypeType :: _module.__default.TMap#canCall(_module._default.TMap$A, _module._default.TMap$B, $l#0#heap#0, $l#0#t#0, f#0))
+          //TRIG (forall $l#4#heap#0: Heap, $l#4#x#0: Box :: _0_Monad.__default.Bind#canCall(Monad._default.Associativity$B, Monad._default.Associativity$C, $l#4#heap#0, Apply1(Monad._default.Associativity$A, #$M$B, f#0, $l#4#heap#0, $l#4#x#0), g#0))
+          return BplForallTrim(bvarsAndAntecedents, null, canCall); // L_TRIGGER
+
+        } else if (expr is ComprehensionExpr) {
+          var e = (ComprehensionExpr)expr;
+          if (e is QuantifierExpr q && q.SplitQuantifier != null) {
+            return CanCallAssumption(q.SplitQuantifierExpression, cco);
+          }
+
+          // Determine the CanCall's for the range and term
+          var canCall = CanCallAssumption(e.Term, cco);
+          if (e.Range != null) {
+            canCall = BplAnd(CanCallAssumption(e.Range, cco), BplImp(TrExpr(e.Range), canCall));
+          }
+          if (expr is MapComprehension mc && mc.IsGeneralMapComprehension) {
+            canCall = BplAnd(canCall, CanCallAssumption(mc.TermLeft, cco));
+
+            // The translation of "map x,y | R(x,y) :: F(x,y) := G(x,y)" makes use of projection
+            // functions project_x,project_y.  These are functions defined here by the following axiom:
+            //     forall x,y :: R(x,y) ==> var x',y' := project_x(F(x,y)),project_y(F(x,y)); R(x',y') && F(x',y') == F(x,y)
+            // that is (without the let expression):
+            //     forall x,y :: R(x,y) ==> R(project_x(F(x,y)), project_y(F(x,y))) && F(project_x(F(x,y)), project_y(F(x,y))) == F(x,y)
+            // The triggers for the quantification are those detected for the given map comprehension, if any.
+            List<Boogie.Variable> bvs;
+            List<Boogie.Expr> args;
+            BoogieGenerator.CreateBoundVariables(mc.BoundVars, out bvs, out args);
+            Contract.Assert(mc.BoundVars.Count == bvs.Count);
+            BoogieGenerator.CreateMapComprehensionProjectionFunctions(mc);
+            Contract.Assert(mc.ProjectionFunctions != null);
+            Contract.Assert(mc.ProjectionFunctions.Count == mc.BoundVars.Count);
+            var substMap = new Dictionary<IVariable, Expression>();
+            for (var i = 0; i < mc.BoundVars.Count; i++) {
+              substMap.Add(mc.BoundVars[i], new BoogieWrapper(args[i], mc.BoundVars[i].Type));
+            }
+            var R = TrExpr(Substitute(mc.Range, null, substMap));
+            var F = TrExpr(Substitute(mc.TermLeft, null, substMap));
+            var trig = BoogieGenerator.TrTrigger(this, e.Attributes, expr.Origin, substMap);
+            substMap = new Dictionary<IVariable, Expression>();
+            for (var i = 0; i < mc.BoundVars.Count; i++) {
+              var p = new Boogie.NAryExpr(BoogieGenerator.GetToken(mc), new Boogie.FunctionCall(mc.ProjectionFunctions[i]), new List<Boogie.Expr> { F });
+              substMap.Add(e.BoundVars[i], new BoogieWrapper(p, e.BoundVars[i].Type));
+            }
+            var Rprime = TrExpr(Substitute(mc.Range, null, substMap));
+            var Fprime = TrExpr(Substitute(mc.TermLeft, null, substMap));
+            var defn = BplForall(bvs, trig, BplImp(R, BplAnd(Rprime, Boogie.Expr.Eq(F, Fprime))));
+            canCall = BplAnd(canCall, defn);
+          }
+          // Create a list of all possible bound variables
+          var bvarsAndAntecedents = TrBoundVariables_SeparateWhereClauses(e.BoundVars);
+          // Produce the quantified CanCall expression, with a suitably reduced set of bound variables
+          var tr = BoogieGenerator.TrTrigger(this, e.Attributes, expr.Origin);
+          return BplForallTrim(bvarsAndAntecedents, tr, canCall);
+
+        } else if (expr is StmtExpr) {
+          var e = (StmtExpr)expr;
+          return CanCallAssumption(e.E, cco);
+        } else if (expr is ITEExpr) {
+          ITEExpr e = (ITEExpr)expr;
+          Boogie.Expr total = CanCallAssumption(e.Test, cco);
+          Boogie.Expr test = TrExpr(e.Test);
+          total = BplAnd(total, BplImp(test, CanCallAssumption(e.Thn, cco)));
+          total = BplAnd(total, BplImp(Boogie.Expr.Not(test), CanCallAssumption(e.Els, cco)));
+          return total;
+        } else if (expr is ConcreteSyntaxExpression) {
+          var e = (ConcreteSyntaxExpression)expr;
+          return CanCallAssumption(e.ResolvedExpression, cco);
+        } else if (expr is NestedMatchExpr nestedMatchExpr) {
+          return CanCallAssumption(nestedMatchExpr.Flattened, cco);
+        } else if (expr is BoogieFunctionCall) {
+          var e = (BoogieFunctionCall)expr;
+          return CanCallAssumption(e.Args, cco);
+        } else if (expr is MatchExpr) {
+          var e = (MatchExpr)expr;
+          var ite = DesugarMatchExpr(e);
+          return CanCallAssumption(ite, cco);
+        } else if (expr is BoxingCastExpr) {
+          var e = (BoxingCastExpr)expr;
+          return CanCallAssumption(e.E, cco);
+        } else if (expr is UnboxingCastExpr) {
+          var e = (UnboxingCastExpr)expr;
+          return CanCallAssumption(e.E, cco);
+        } else if (expr is DecreasesToExpr decreasesToExpr) {
+          var oldCanCall = CanCallAssumption(decreasesToExpr.OldExpressions.ToList(), cco);
+          var newCanCall = CanCallAssumption(decreasesToExpr.NewExpressions.ToList(), cco);
+          return BplAnd(oldCanCall, newCanCall);
+        } else {
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
+        }
+      }
+
+      public Expr CanCallAssumption(List<Expression> exprs, CanCallOptions cco) {
+        Contract.Requires(this != null);
+        Contract.Requires(exprs != null);
+        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
+
+        Boogie.Expr total = Boogie.Expr.True;
+        foreach (Expression e in exprs) {
+          Contract.Assert(e != null);
+          total = BplAnd(total, CanCallAssumption(e, cco));
+        }
+        return total;
+      }
+    }
+
+    public class CanCallOptions {
+      public bool SkipIsA;
+
+      public readonly Function EnclosingFunction; // self-call allowance is applied to the enclosing function
+      public readonly bool SelfCallAllowanceAlsoForOverride;
+
+      public bool MakeAllowance(Function f) {
+        return f == EnclosingFunction || (SelfCallAllowanceAlsoForOverride && f == EnclosingFunction.OverriddenFunction);
+      }
+
+      public CanCallOptions(bool skipIsA, Function enclosingFunction, bool selfCallAllowanceAlsoForOverride = false) {
+        Contract.Assert(!selfCallAllowanceAlsoForOverride ||
+                        (enclosingFunction.OverriddenFunction != null &&
+                         enclosingFunction.Ins.Count == enclosingFunction.OverriddenFunction.Ins.Count));
+        this.SkipIsA = skipIsA;
+        this.EnclosingFunction = enclosingFunction;
+        this.SelfCallAllowanceAlsoForOverride = selfCallAllowanceAlsoForOverride;
+      }
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.ExpressionWellformed.cs b/Source/DafnyCore/Verifier/BoogieGenerator.ExpressionWellformed.cs
new file mode 100644
index 00000000000..e41e5935038
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.ExpressionWellformed.cs
@@ -0,0 +1,1735 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using DafnyCore.Verifier;
+using DafnyCore.Verifier.Statements;
+using Bpl = Microsoft.Boogie;
+using Microsoft.Boogie;
+using Std.Wrappers;
+using static Microsoft.Dafny.Util;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny {
+
+  /// <summary>
+  /// Instances of WFOptions are used as an argument to CheckWellformed, supplying options for the
+  /// checks to be performed.
+  /// If "SelfCallsAllowance" is non-null, termination checks will be omitted for calls that look
+  /// like it.  This is useful in function postconditions, where the result of the function is
+  /// syntactically given as what looks like a recursive call with the same arguments.
+  /// "DoReadsChecks" indicates whether or not to perform reads checks.  If so, the generated code
+  /// will make references to $_ReadsFrame.  If "saveReadsChecks" is true, then the reads checks will
+  /// be recorded but postponed.  In particular, CheckWellformed will append to .Locals a list of
+  /// fresh local variables and will append to .Assert assertions with appropriate error messages
+  /// that can be used later.  As a convenience, the ProcessSavedReadsChecks will make use of .Locals
+  /// and .Asserts (and AssignLocals) and update a given StmtListBuilder.
+  /// "LValueContext" indicates that the expression checked for well-formedness is an L-value of
+  /// some assignment.
+  /// </summary>
+  public class WFOptions {
+    public readonly Function SelfCallsAllowance;
+    public readonly bool DoReadsChecks;
+    public readonly bool DoOnlyCoarseGrainedTerminationChecks; // termination checks don't look at decreases clause, but reports errors for any intra-SCC call (this is used in default-value expressions)
+    public readonly Variables Locals;
+    public readonly List<Func<Bpl.Cmd>> CreateAsserts;
+    public readonly bool LValueContext;
+    public readonly Bpl.QKeyValue AssertKv;
+
+    public WFOptions() {
+    }
+
+    public WFOptions(Function selfCallsAllowance, bool doReadsChecks,
+      bool saveReadsChecks = false, bool doOnlyCoarseGrainedTerminationChecks = false) {
+      Contract.Requires(!saveReadsChecks || doReadsChecks);  // i.e., saveReadsChecks ==> doReadsChecks
+      SelfCallsAllowance = selfCallsAllowance;
+      DoReadsChecks = doReadsChecks;
+      DoOnlyCoarseGrainedTerminationChecks = doOnlyCoarseGrainedTerminationChecks;
+      if (saveReadsChecks) {
+        Locals = new Variables();
+        CreateAsserts = new();
+      }
+    }
+
+    private WFOptions(Function selfCallsAllowance, bool doReadsChecks, bool doOnlyCoarseGrainedTerminationChecks,
+      Variables locals, List<Func<Bpl.Cmd>> createAsserts, bool lValueContext, Bpl.QKeyValue assertKv) {
+      SelfCallsAllowance = selfCallsAllowance;
+      DoReadsChecks = doReadsChecks;
+      DoOnlyCoarseGrainedTerminationChecks = doOnlyCoarseGrainedTerminationChecks;
+      Locals = locals;
+      CreateAsserts = createAsserts;
+      LValueContext = lValueContext;
+      AssertKv = assertKv;
+    }
+
+    public WFOptions(Bpl.QKeyValue kv) {
+      AssertKv = kv;
+    }
+
+    /// <summary>
+    /// Clones the given "options", but turns reads checks on or off.
+    /// </summary>
+    public WFOptions WithReadsChecks(bool doReadsChecks) {
+      return new WFOptions(SelfCallsAllowance, doReadsChecks, DoOnlyCoarseGrainedTerminationChecks,
+        Locals, CreateAsserts, LValueContext, AssertKv);
+    }
+
+    /// <summary>
+    /// Clones the given "options", but sets "LValueContext" to "lValueContext".
+    /// </summary>
+    public WFOptions WithLValueContext(bool lValueContext) {
+      return new WFOptions(SelfCallsAllowance, DoReadsChecks, DoOnlyCoarseGrainedTerminationChecks,
+        Locals, CreateAsserts, lValueContext, AssertKv);
+    }
+
+    public Action<IOrigin, Bpl.Expr, ProofObligationDescription, Bpl.QKeyValue> AssertSink(BoogieGenerator tran, BoogieStmtListBuilder builder) {
+      return (t, e, d, qk) => {
+        if (Locals != null) {
+          var b = BoogieGenerator.BplLocalVar(tran.CurrentIdGenerator.FreshId("b$reqreads#"), Bpl.Type.Bool, Locals);
+          CreateAsserts.Add(() => tran.Assert(t, b, d, builder.Context, qk));
+          builder.Add(Bpl.Cmd.SimpleAssign(e.tok, (Bpl.IdentifierExpr)b, e));
+        } else {
+          builder.Add(tran.Assert(t, e, d, builder.Context, qk));
+        }
+      };
+    }
+
+    public List<Bpl.AssignCmd> AssignLocals {
+      get {
+        return Map(Locals.Values, l =>
+          Bpl.Cmd.SimpleAssign(l.tok,
+            new Bpl.IdentifierExpr(Token.NoToken, l),
+            Bpl.Expr.True)
+          );
+      }
+    }
+
+    public void ProcessSavedReadsChecks(Variables locals, BoogieStmtListBuilder builderInitializationArea, BoogieStmtListBuilder builder) {
+      Contract.Requires(locals != null);
+      Contract.Requires(builderInitializationArea != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(Locals != null && CreateAsserts != null);  // ProcessSavedReadsChecks should be called only if the constructor was called with saveReadsChecks
+
+      // var b$reads_guards#0 : bool  ...
+      locals.AddRange(Locals.Values);
+      // b$reads_guards#0 := true   ...
+      foreach (var cmd in AssignLocals) {
+        builderInitializationArea.Add(cmd);
+      }
+      // assert b$reads_guards#0;  ...
+      foreach (var a in CreateAsserts) {
+        builder.Add(a());
+      }
+    }
+  }
+
+  public partial class BoogieGenerator {
+
+    public void CheckWellformedAndAssume(Expression expr, WFOptions wfOptions, Variables locals, BoogieStmtListBuilder builder, ExpressionTranslator etran, string comment) {
+      Contract.Requires(expr != null);
+      Contract.Requires(expr.Type != null && expr.Type.IsBoolType);
+      Contract.Requires(wfOptions != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(Predef != null);
+      if (expr is BinaryExpr) {
+        var e = (BinaryExpr)expr;
+        switch (e.ResolvedOp) {
+          case BinaryExpr.ResolvedOpcode.And:
+            // WF[e0]; assume e0; WF[e1]; assume e1;
+            CheckWellformedAndAssume(e.E0, wfOptions, locals, builder, etran, comment);
+            CheckWellformedAndAssume(e.E1, wfOptions, locals, builder, etran, comment);
+            return;
+          case BinaryExpr.ResolvedOpcode.Imp: {
+              // if (*) {
+              //   WF[e0]; assume e0; WF[e1]; assume e1;
+              // } else {
+              //   assume e0 ==> e1;
+              // }
+              var bAnd = new BoogieStmtListBuilder(this, options, builder.Context);
+              CheckWellformedAndAssume(e.E0, wfOptions, locals, bAnd, etran, comment);
+              CheckWellformedAndAssume(e.E1, wfOptions, locals, bAnd, etran, comment);
+              var bImp = new BoogieStmtListBuilder(this, options, builder.Context);
+              bImp.Add(TrAssumeCmd(expr.Origin, etran.CanCallAssumption(expr)));
+              bImp.Add(TrAssumeCmdWithDependencies(etran, expr.Origin, expr, comment));
+              builder.Add(new Bpl.IfCmd(expr.Origin, null, bAnd.Collect(expr.Origin), null, bImp.Collect(expr.Origin)));
+            }
+            return;
+          case BinaryExpr.ResolvedOpcode.Or: {
+              // if (*) {
+              //   WF[e0]; assume e0;
+              // } else {
+              //   assume !e0;
+              //   WF[e1]; assume e1;
+              // }
+              var b0 = new BoogieStmtListBuilder(this, options, builder.Context);
+              CheckWellformedAndAssume(e.E0, wfOptions, locals, b0, etran, comment);
+              var b1 = new BoogieStmtListBuilder(this, options, builder.Context);
+              b1.Add(TrAssumeCmd(expr.Origin, etran.CanCallAssumption(e.E0)));
+              b1.Add(TrAssumeCmdWithDependenciesAndExtend(etran, expr.Origin, e.E0, Expr.Not, comment));
+              CheckWellformedAndAssume(e.E1, wfOptions, locals, b1, etran, comment);
+              builder.Add(new Bpl.IfCmd(expr.Origin, null, b0.Collect(expr.Origin), null, b1.Collect(expr.Origin)));
+            }
+            return;
+          default:
+            break;
+        }
+      } else if (expr is ITEExpr) {
+        var e = (ITEExpr)expr;
+        // if (*) {
+        //   WF[test]; assume test;
+        //   WF[thn]; assume thn;
+        // } else {
+        //   assume !test;
+        //   WF[els]; assume els;
+        // }
+        var bThen = new BoogieStmtListBuilder(this, options, builder.Context);
+        CheckWellformedAndAssume(e.Test, wfOptions, locals, bThen, etran, comment);
+        CheckWellformedAndAssume(e.Thn, wfOptions, locals, bThen, etran, comment);
+        var bElse = new BoogieStmtListBuilder(this, options, builder.Context);
+        bElse.Add(TrAssumeCmd(expr.Origin, etran.CanCallAssumption(e.Test)));
+        bElse.Add(TrAssumeCmdWithDependenciesAndExtend(etran, expr.Origin, e.Test, Expr.Not, comment));
+        CheckWellformedAndAssume(e.Els, wfOptions, locals, bElse, etran, comment);
+        builder.Add(new Bpl.IfCmd(expr.Origin, null, bThen.Collect(expr.Origin), null, bElse.Collect(expr.Origin)));
+        return;
+      } else if (expr is QuantifierExpr) {
+        var e = (QuantifierExpr)expr;
+        // For (Q x :: body(x)), introduce fresh local variable x'.  Then:
+        //   havoc x'
+        //   WF[body(x')]; assume body(x');
+        // If the quantifier is universal, then continue as:
+        //   assume (\forall x :: body(x));
+
+        // Create local variables corresponding to the bound variables:
+        var substMap = SetupBoundVarsAsLocals(e.BoundVars, builder, locals, etran);
+        // Get the body of the quantifier and suitably substitute for the type variables and bound variables
+        var body = Substitute(e.LogicalBody(true), null, substMap);
+        CheckWellformedAndAssume(body, wfOptions, locals, builder, etran, comment);
+
+        if (e is ForallExpr) {
+          // Although we do the WF check on the original quantifier, we assume the split one.
+          // This ensures that cases like forall x :: x != null && f(x.a) do not fail to verify.
+          builder.Add(TrAssumeCmdWithDependencies(etran, expr.Origin, e.SplitQuantifierExpression ?? e, comment));
+        }
+        return;
+      }
+
+      // resort to the behavior of simply checking well-formedness followed by assuming the translated expression
+      CheckWellformed(expr, wfOptions, locals, builder, etran);
+
+      // NOTE: If the CheckWellformed call above found a split quantifier, it ignored
+      //       the splitting and proceeded to decompose the full quantifier as
+      //       normal. This call to TrExpr, on the other hand, will indeed use the
+      //       split quantifier.
+      builder.Add(TrAssumeCmdWithDependencies(etran, expr.Origin, expr, comment));
+    }
+
+    // Helper object for ensuring delayed reads checks are always processed.
+    // Also encapsulates the handling for the optimization to not declare a $_ReadsFrame field if the reads clause is *:
+    // if etran.readsFrame is null, the block is called with a WFOption with DoReadsChecks set to false instead.
+    private record ReadsCheckDelayer(ExpressionTranslator etran, Function selfCallsAllowance,
+      Variables localVariables, BoogieStmtListBuilder builderInitializationArea, BoogieStmtListBuilder builder) {
+
+      public void DoWithDelayedReadsChecks(bool doOnlyCoarseGrainedTerminationChecks, Action<WFOptions> action) {
+        var doReadsChecks = etran.readsFrame != null;
+        var options = new WFOptions(selfCallsAllowance, doReadsChecks, doReadsChecks, doOnlyCoarseGrainedTerminationChecks);
+        action(options);
+        if (doReadsChecks) {
+          options.ProcessSavedReadsChecks(localVariables, builderInitializationArea, builder);
+        }
+      }
+    }
+
+    /// <summary>
+    /// Check the well-formedness of "expr" (but don't leave hanging around any assumptions that affect control flow)
+    /// </summary>
+    public void CheckWellformed(Expression expr, WFOptions wfOptions, Variables locals, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+      Contract.Requires(expr != null);
+      Contract.Requires(wfOptions != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(Predef != null);
+      CheckWellformedWithResult(expr, wfOptions, locals, builder, etran, null);
+    }
+
+    /// <summary>
+    /// Adds to "builder" code that checks the well-formedness of "expr".  Any local variables introduced
+    /// in this code are added to "locals".
+    /// See class WFOptions for descriptions of the specified options.
+    /// </summary>
+    public void CheckWellformedWithResult(Expression expr, WFOptions wfOptions,
+      Variables locals, BoogieStmtListBuilder builder, ExpressionTranslator etran,
+      AddResultCommands addResultCommands) {
+
+      var origOptions = wfOptions;
+      if (wfOptions.LValueContext) {
+        // Turn off LValueContext for any recursive call
+        wfOptions = wfOptions.WithLValueContext(false);
+      }
+
+      var readFrames = GetContextReadsFrames();
+
+      switch (expr) {
+        case StaticReceiverExpr stexpr: {
+            if (stexpr.ObjectToDiscard != null) {
+              CheckWellformedWithResult(stexpr.ObjectToDiscard, wfOptions, locals, builder, etran, null);
+            }
+
+            break;
+          }
+        case LiteralExpr:
+          CheckResultToBeInType(expr.Origin, expr, expr.Type, locals, builder, etran);
+          break;
+        case ThisExpr:
+        case WildcardExpr:
+        case BoogieWrapper:
+          // always allowed
+          break;
+        case IdentifierExpr identifierExpr: {
+            var e = identifierExpr;
+            if (!origOptions.LValueContext) {
+              CheckDefiniteAssignment(e, builder);
+            }
+
+            break;
+          }
+        case DisplayExpression expression: {
+            DisplayExpression e = expression;
+            var type = e.Type.NormalizeToAncestorType();
+            Contract.Assert(type is CollectionType);
+            var elementType = ((CollectionType)type).Arg;
+            foreach (Expression el in e.Elements) {
+              CheckWellformed(el, wfOptions, locals, builder, etran);
+              CheckSubrange(el.Origin, etran.TrExpr(el), el.Type, elementType, el, builder);
+            }
+            CheckResultToBeInType(e.Origin, e, e.Type, locals, builder, etran);
+            break;
+          }
+        case MapDisplayExpr displayExpr: {
+            MapDisplayExpr e = displayExpr;
+            var type = e.Type.NormalizeToAncestorType();
+            Contract.Assert(type is MapType);
+            var keyType = ((MapType)type).Domain;
+            var valType = ((MapType)type).Range;
+            foreach (ExpressionPair p in e.Elements) {
+              CheckWellformed(p.A, wfOptions, locals, builder, etran);
+              CheckSubrange(p.A.Origin, etran.TrExpr(p.A), p.A.Type, keyType, p.A, builder);
+              CheckWellformed(p.B, wfOptions, locals, builder, etran);
+              CheckSubrange(p.B.Origin, etran.TrExpr(p.B), p.B.Type, valType, p.B, builder);
+            }
+            CheckResultToBeInType(e.Origin, e, e.Type, locals, builder, etran);
+            break;
+          }
+        case MemberSelectExpr selectExpr: {
+            MemberSelectExpr e = selectExpr;
+            CheckWellformed(e.Obj, wfOptions, locals, builder, etran);
+            if (e.Obj.Type.IsRefType) {
+              if (inBodyInitContext && Expression.AsThis(e.Obj) != null && !e.Member.IsInstanceIndependentConstant) {
+                // this uses the surrogate local
+                if (!origOptions.LValueContext) {
+                  CheckDefiniteAssignmentSurrogate(selectExpr.Origin, (Field)e.Member, false, builder);
+                }
+              } else {
+                CheckNonNull(selectExpr.Origin, e.Obj, builder, etran, wfOptions.AssertKv);
+                // Check that the receiver is available in the state in which the dereference occurs
+              }
+            } else if (e.Member is DatatypeDestructor dtor) {
+              var correctConstructor = BplOr(dtor.EnclosingCtors.ConvertAll(
+                ctor => FunctionCall(e.Origin, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, etran.TrExpr(e.Obj))));
+              if (dtor.EnclosingCtors.Count == dtor.EnclosingCtors[0].EnclosingDatatype.Ctors.Count) {
+                // Every constructor has this destructor; might as well assume that here.
+                builder.Add(TrAssumeCmd(selectExpr.Origin, correctConstructor));
+              } else {
+                builder.Add(Assert(GetToken(expr), correctConstructor,
+                  new DestructorValid(dtor, e.Obj, dtor.EnclosingCtors), builder.Context));
+              }
+              CheckNotGhostVariant(e, "destructor", dtor.EnclosingCtors, builder, etran);
+            } else if (e.Member is DatatypeDiscriminator discriminator) {
+              CheckNotGhostVariant(e, "discriminator", ((DatatypeDecl)discriminator.EnclosingClass).Ctors, builder, etran);
+            }
+            if (!e.Member.IsStatic) {
+              if (e.Member is TwoStateFunction) {
+                Bpl.Expr wh = GetWhereClause(selectExpr.Origin, etran.TrExpr(e.Obj), e.Obj.Type, etran.OldAt(e.AtLabel), ISALLOC, true);
+                if (wh != null) {
+                  var desc = new IsAllocated("receiver argument", "in the two-state function's previous state", e.Obj, e.AtLabel);
+                  builder.Add(Assert(GetToken(expr), wh, desc, builder.Context));
+                }
+              } else if (etran.UsesOldHeap) {
+                Bpl.Expr wh = GetWhereClause(selectExpr.Origin, etran.TrExpr(e.Obj), e.Obj.Type, etran, ISALLOC, true);
+                if (wh != null) {
+                  var desc = new IsAllocated("receiver",
+                    $"in the state in which its {(e.Member is Field ? "fields" : "members")} are accessed", e.Obj, e.AtLabel);
+                  builder.Add(Assert(GetToken(expr), wh, desc, builder.Context));
+                }
+              }
+            }
+            if (!origOptions.LValueContext && wfOptions.DoReadsChecks && e.Member is Field { IsMutable: true } f) {
+              var requiredFrame = new FrameExpression(Token.NoToken, e.Obj, f.Name);
+              var desc = new ReadFrameSubset("read field", requiredFrame, readFrames, selectExpr, etran.scope);
+              wfOptions.AssertSink(this, builder)(selectExpr.Origin, Bpl.Expr.SelectTok(selectExpr.Origin, etran.ReadsFrame(selectExpr.Origin), etran.TrExpr(e.Obj), GetField(e)),
+                desc, wfOptions.AssertKv);
+            }
+
+            builder.Add(TrAssumeCmd(e.Origin, etran.CanCallAssumption(e)));
+            break;
+          }
+        case SeqSelectExpr selectExpr: {
+            SeqSelectExpr e = selectExpr;
+            var eSeqType = e.Seq.Type.NormalizeToAncestorType();
+            bool isSequence = eSeqType is SeqType;
+            CheckWellformed(e.Seq, wfOptions, locals, builder, etran);
+            Bpl.Expr seq = etran.TrExpr(e.Seq);
+            if (eSeqType.IsArrayType) {
+              builder.Add(Assert(GetToken(e.Seq), Bpl.Expr.Neq(seq, Predef.Null),
+                new NonNull("array", e.Seq), builder.Context));
+              if (etran.UsesOldHeap) {
+                builder.Add(Assert(GetToken(e.Seq), MkIsAlloc(seq, eSeqType, etran.HeapExpr),
+                  new IsAllocated("array", null, e.Seq), builder.Context));
+              }
+            }
+            Bpl.Expr e0 = null;
+            if (eSeqType is MapType) {
+              bool finite = ((MapType)eSeqType).Finite;
+              e0 = etran.TrExpr(e.E0);
+              CheckWellformed(e.E0, wfOptions, locals, builder, etran);
+              var f = finite ? BuiltinFunction.MapDomain : BuiltinFunction.IMapDomain;
+              Bpl.Expr inDomain = FunctionCall(selectExpr.Origin, f, finite ? Predef.MapType : Predef.IMapType, seq);
+              inDomain = IsSetMember(GetToken(expr), inDomain, BoxIfNecessary(e.Origin, e0, e.E0.Type), finite);
+              builder.Add(Assert(GetToken(expr), inDomain,
+                new ElementInDomain(e.Seq, e.E0), builder.Context, wfOptions.AssertKv));
+            } else if (eSeqType is MultiSetType) {
+              // cool
+
+            } else {
+              if (e.E0 != null) {
+                e0 = etran.TrExpr(e.E0);
+                CheckWellformed(e.E0, wfOptions, locals, builder, etran);
+                var desc = new InRange(e.Seq, e.E0, e.SelectOne, e.SelectOne ? "index" : "lower bound");
+                builder.Add(Assert(GetToken(expr),
+                  InSeqRange(selectExpr.Origin, e0, e.E0.Type, seq, isSequence, null, !e.SelectOne),
+                  desc, builder.Context, wfOptions.AssertKv));
+              }
+              if (e.E1 != null) {
+                CheckWellformed(e.E1, wfOptions, locals, builder, etran);
+                Bpl.Expr lowerBound;
+                if (e0 != null && e.E0.Type.IsBitVectorType) {
+                  lowerBound = ConvertExpression(e.E0.Origin, e0, e.E0.Type, Type.Int);
+                } else {
+                  lowerBound = e0;
+                }
+                builder.Add(Assert(GetToken(expr),
+                  InSeqRange(selectExpr.Origin, etran.TrExpr(e.E1), e.E1.Type, seq, isSequence, lowerBound, true),
+                  new SequenceSelectRangeValid(e.Seq, e.E0, e.E1, isSequence ? "sequence" : "array"),
+                  builder.Context, wfOptions.AssertKv));
+              }
+            }
+            if (!origOptions.LValueContext && wfOptions.DoReadsChecks && eSeqType.IsArrayType) {
+              if (e.SelectOne) {
+                Contract.Assert(e.E0 != null);
+                var i = etran.TrExpr(e.E0);
+                i = ConvertExpression(selectExpr.Origin, i, e.E0.Type, Type.Int);
+                Bpl.Expr fieldName = FunctionCall(selectExpr.Origin, BuiltinFunction.IndexField, null, i);
+                var requiredFrame = new FrameExpression(Token.NoToken, e.Seq, null);
+                var desc = new ReadFrameSubset("read array element", requiredFrame, readFrames, e, etran.scope);
+                wfOptions.AssertSink(this, builder)(selectExpr.Origin, Bpl.Expr.SelectTok(selectExpr.Origin, etran.ReadsFrame(selectExpr.Origin), seq, fieldName),
+                  desc, wfOptions.AssertKv);
+              } else {
+                Bpl.Expr lowerBound = e.E0 == null ? Bpl.Expr.Literal(0) : etran.TrExpr(e.E0);
+                Contract.Assert(eSeqType.AsArrayType.Dims == 1);
+                Bpl.Expr upperBound = e.E1 == null ? ArrayLength(e.Origin, seq, 1, 0) : etran.TrExpr(e.E1);
+                // check that, for all i in lowerBound..upperBound, a[i] is in the frame
+                Bpl.BoundVariable iVar = new Bpl.BoundVariable(e.Origin, new Bpl.TypedIdent(e.Origin, "$i", Bpl.Type.Int));
+                Bpl.IdentifierExpr i = new Bpl.IdentifierExpr(e.Origin, iVar);
+                var range = BplAnd(Bpl.Expr.Le(lowerBound, i), Bpl.Expr.Lt(i, upperBound));
+                var fieldName = FunctionCall(e.Origin, BuiltinFunction.IndexField, null, i);
+                var allowedToRead = Bpl.Expr.SelectTok(e.Origin, etran.ReadsFrame(e.Origin), seq, fieldName);
+                var trigger = BplTrigger(allowedToRead); // Note, the assertion we're about to produce only seems useful in the check-only mode (that is, with subsumption 0), but if it were to be assumed, we'll use this entire RHS as the trigger
+                var qq = new Bpl.ForallExpr(e.Origin, new List<Variable> { iVar }, trigger, BplImp(range, allowedToRead));
+                var requiredFrame = new FrameExpression(Token.NoToken, e.Seq, null);
+                var desc = new ReadFrameSubset("read the indicated range of array elements", requiredFrame, readFrames, e, etran.scope);
+                wfOptions.AssertSink(this, builder)(selectExpr.Origin, qq, desc, wfOptions.AssertKv);
+              }
+            }
+
+            if (!e.SelectOne) {
+              CheckResultToBeInType(e.Origin, e, e.Type, locals, builder, etran);
+            }
+            break;
+          }
+        case MultiSelectExpr selectExpr: {
+            MultiSelectExpr e = selectExpr;
+            CheckWellformed(e.Array, wfOptions, locals, builder, etran);
+            Bpl.Expr array = etran.TrExpr(e.Array);
+            builder.Add(Assert(GetToken(e.Array), Bpl.Expr.Neq(array, Predef.Null),
+              new NonNull("array", e.Array), builder.Context));
+            if (etran.UsesOldHeap) {
+              builder.Add(Assert(GetToken(e.Array), MkIsAlloc(array, e.Array.Type, etran.HeapExpr),
+                new IsAllocated("array", null, e.Array), builder.Context));
+            }
+            for (int idxId = 0; idxId < e.Indices.Count; idxId++) {
+              var idx = e.Indices[idxId];
+              CheckWellformed(idx, wfOptions, locals, builder, etran);
+
+              var index = etran.TrExpr(idx);
+              index = ConvertExpression(idx.Origin, index, idx.Type, Type.Int);
+              var lower = Bpl.Expr.Le(Bpl.Expr.Literal(0), index);
+              var length = ArrayLength(idx.Origin, array, e.Indices.Count, idxId);
+              var upper = Bpl.Expr.Lt(index, length);
+              var tok = idx is IdentifierExpr ? e.Origin : idx.Origin; // TODO: Reusing the token of an identifier expression would underline its definition. but this is still not perfect.
+
+              var desc = new InRange(e.Array, e.Indices[idxId], true, $"index {idxId}", idxId);
+              builder.Add(Assert(tok, BplAnd(lower, upper), desc, builder.Context, wfOptions.AssertKv));
+            }
+            if (wfOptions.DoReadsChecks) {
+              Bpl.Expr fieldName = etran.GetArrayIndexFieldName(e.Origin, e.Indices);
+              var requiredFrame = new FrameExpression(Token.NoToken, e.Array, null);
+              var desc = new ReadFrameSubset("read array element", requiredFrame, readFrames, selectExpr, etran.scope);
+              wfOptions.AssertSink(this, builder)(selectExpr.Origin, Bpl.Expr.SelectTok(selectExpr.Origin, etran.ReadsFrame(selectExpr.Origin), array, fieldName),
+                desc, wfOptions.AssertKv);
+            }
+
+            break;
+          }
+        case SeqUpdateExpr updateExpr: {
+            var e = updateExpr;
+            CheckWellformed(e.Seq, wfOptions, locals, builder, etran);
+            Bpl.Expr seq = etran.TrExpr(e.Seq);
+            Bpl.Expr index = etran.TrExpr(e.Index);
+            Bpl.Expr value = etran.TrExpr(e.Value);
+            var collectionType = (CollectionType)e.Seq.Type.NormalizeToAncestorType();
+            // validate index
+            CheckWellformed(e.Index, wfOptions, locals, builder, etran);
+            if (collectionType is SeqType) {
+              var desc = new InRange(e.Seq, e.Index, true, "index");
+              builder.Add(Assert(GetToken(e.Index),
+                InSeqRange(updateExpr.Origin, index, e.Index.Type, seq, true, null, false),
+                desc, builder.Context, wfOptions.AssertKv));
+            } else {
+              CheckSubrange(e.Index.Origin, index, e.Index.Type, collectionType.Arg, e.Index, builder);
+            }
+            // validate value
+            CheckWellformed(e.Value, wfOptions, locals, builder, etran);
+            if (collectionType is SeqType) {
+              CheckSubrange(e.Value.Origin, value, e.Value.Type, collectionType.Arg, e.Value, builder);
+            } else if (collectionType is MapType mapType) {
+              CheckSubrange(e.Value.Origin, value, e.Value.Type, mapType.Range, e.Value, builder);
+            } else if (collectionType is MultiSetType) {
+              var desc = new NonNegative("new number of occurrences", e.Value);
+              builder.Add(Assert(GetToken(e.Value), Bpl.Expr.Le(Bpl.Expr.Literal(0), value),
+                desc, builder.Context, wfOptions.AssertKv));
+            } else {
+              Contract.Assert(false);
+            }
+
+            break;
+          }
+        case ApplyExpr applyExpr: {
+            var e = applyExpr;
+            int arity = e.Args.Count;
+            var tt = e.Function.Type.AsArrowType;
+            Contract.Assert(tt != null);
+            Contract.Assert(tt.Arity == arity);
+
+            // check WF of receiver and arguments
+            CheckWellformed(e.Function, wfOptions, locals, builder, etran);
+            foreach (Expression arg in e.Args) {
+              CheckWellformed(arg, wfOptions, locals, builder, etran);
+            }
+
+            // check subranges of arguments
+            for (int i = 0; i < arity; ++i) {
+              CheckSubrange(e.Args[i].Origin, etran.TrExpr(e.Args[i]), e.Args[i].Type, tt.Args[i], e.Args[i], builder);
+            }
+
+            // check parameter availability
+            if (etran.UsesOldHeap) {
+              Bpl.Expr wh = GetWhereClause(e.Function.Origin, etran.TrExpr(e.Function), e.Function.Type, etran, ISALLOC, true);
+              if (wh != null) {
+                var desc = new IsAllocated("function", "in the state in which the function is invoked", e.Function);
+                builder.Add(Assert(GetToken(e.Function), wh, desc, builder.Context));
+              }
+              for (int i = 0; i < e.Args.Count; i++) {
+                Expression ee = e.Args[i];
+                wh = GetWhereClause(ee.Origin, etran.TrExpr(ee), ee.Type, etran, ISALLOC, true);
+                if (wh != null) {
+                  var desc = new IsAllocated("argument", "in the state in which the function is invoked", ee);
+                  builder.Add(Assert(GetToken(ee), wh, desc, builder.Context));
+                }
+              }
+            }
+
+            // translate arguments to requires and reads
+            Func<Expression, Bpl.Expr> TrArg = arg => {
+              Bpl.Expr inner = etran.TrExpr(arg);
+              if (ModeledAsBoxType(arg.Type)) {
+                return inner;
+              } else {
+                return FunctionCall(arg.Origin, BuiltinFunction.Box, null, inner);
+              }
+            };
+
+            var args = Concat(
+              Map(tt.TypeArgs, TypeToTy),
+              Cons(etran.HeapExpr,
+                Cons(etran.TrExpr(e.Function),
+                  e.Args.ConvertAll(arg => TrArg(arg)))));
+
+            // Because type inference often gravitates towards inferring non-constrained types, we'll
+            // do some digging on our own to see if we can discover a more precise type.
+            var fnCore = e.Function;
+            while (true) {
+              var prevCore = fnCore;
+              fnCore = Expression.StripParens(fnCore.Resolved);
+              if (object.ReferenceEquals(fnCore, prevCore)) {
+                break;  // we've done what we can do
+              }
+            }
+            Type fnCoreType;
+            if (fnCore is IdentifierExpr) {
+              var v = (IdentifierExpr)fnCore;
+              fnCoreType = v.Var.Type;
+            } else if (fnCore is MemberSelectExpr) {
+              var m = (MemberSelectExpr)fnCore;
+              fnCoreType = m.Member is Field ? ((Field)m.Member).Type : ((Function)m.Member).GetMemberType((ArrowTypeDecl)tt.ResolvedClass);
+            } else {
+              fnCoreType = fnCore.Type;
+            }
+
+            // unwrap renamed local lambdas
+            var unwrappedFunc = e.Function;
+            while (unwrappedFunc is ConcreteSyntaxExpression { ResolvedExpression: not null } cse) {
+              unwrappedFunc = cse.ResolvedExpression;
+            }
+            if (unwrappedFunc is IdentifierExpr { Origin: var origin, DafnyName: var dafnyName }) {
+              unwrappedFunc = new IdentifierExpr(origin, dafnyName);
+            }
+
+            if (!fnCoreType.IsArrowTypeWithoutPreconditions) {
+              var dPrecond = new ApplyExpr(
+                Token.NoToken,
+                new ExprDotName(Token.NoToken, unwrappedFunc, new Name("requires"), null),
+                e.Args,
+                Token.NoToken);
+
+              // check precond
+              var bPrecond = FunctionCall(e.Origin, Requires(arity), Bpl.Type.Bool, args);
+              builder.Add(Assert(GetToken(expr), bPrecond,
+                new PreconditionSatisfied(dPrecond, null, null), builder.Context));
+            }
+
+            if (wfOptions.DoReadsChecks && !fnCoreType.IsArrowTypeWithoutReadEffects) {
+              // check read effects
+              Type objset = program.SystemModuleManager.ObjectSetType();
+              Expression wrap = new BoogieWrapper(
+                FunctionCall(e.Origin, Reads(arity), TrType(objset), args),
+                objset);
+              var wrappedReads = new FrameExpression(e.Origin, wrap, null);
+
+              var readsCall = new ApplyExpr(
+                Token.NoToken,
+                new ExprDotName(Token.NoToken, unwrappedFunc, new Name("reads"), null),
+                e.Args,
+                Token.NoToken
+              );
+              readsCall.Type = objset;
+              var requiredFrame = new FrameExpression(Token.NoToken, readsCall, null);
+              var desc = new ReadFrameSubset("invoke function", requiredFrame, readFrames);
+
+              CheckFrameSubset(applyExpr.Origin, new List<FrameExpression> { wrappedReads }, null, null,
+                etran, etran.ReadsFrame(applyExpr.Origin), wfOptions.AssertSink(this, builder), (ta, qa) => builder.Add(new Bpl.AssumeCmd(ta, qa)), desc, wfOptions.AssertKv);
+            }
+
+            break;
+          }
+        case DatatypeValue value: {
+            DatatypeValue dtv = value;
+            for (int i = 0; i < dtv.Ctor.Formals.Count; i++) {
+              var formal = dtv.Ctor.Formals[i];
+              var arg = dtv.Arguments[i];
+              if (arg is not DefaultValueExpression) {
+                CheckWellformed(arg, wfOptions, locals, builder, etran);
+              }
+              // Cannot use the datatype's formals, so we substitute the inferred type args:
+              var su = new Dictionary<TypeParameter, Type>();
+              foreach (var p in Enumerable.Zip(dtv.Ctor.EnclosingDatatype.TypeArgs, dtv.InferredTypeArgs)) {
+                su[p.Item1] = p.Item2;
+              }
+              Type ty = formal.Type.Subst(su);
+              CheckSubrange(arg.Origin, etran.TrExpr(arg), arg.Type, ty, arg, builder);
+            }
+
+            break;
+          }
+        case FunctionCallExpr callExpr: {
+            FunctionCallExpr e = callExpr;
+            Contract.Assert(e.Function != null);  // follows from the fact that expr has been successfully resolved
+            if (e.Function is SpecialFunction) {
+              CheckWellformedSpecialFunction(e, wfOptions, null, null, locals, builder, etran);
+            } else {
+              // check well-formedness of receiver
+              CheckWellformed(e.Receiver, wfOptions, locals, builder, etran);
+              if (!e.Function.IsStatic && !(e.Receiver is ThisExpr) && !e.Receiver.Type.IsArrowType) {
+                CheckNonNull(callExpr.Origin, e.Receiver, builder, etran, wfOptions.AssertKv);
+              }
+              if (!e.Function.IsStatic && !etran.UsesOldHeap) {
+                // the argument can't be assumed to be allocated for the old heap
+                Type et = UserDefinedType.FromTopLevelDecl(e.Origin, e.Function.EnclosingClass).Subst(e.GetTypeArgumentSubstitutions());
+                builder.Add(new Bpl.CommentCmd("assume allocatedness for receiver argument to function"));
+                builder.Add(TrAssumeCmd(e.Receiver.Origin, MkIsAllocBox(BoxIfNecessary(e.Receiver.Origin, etran.TrExpr(e.Receiver), e.Receiver.Type), et, etran.HeapExpr)));
+              }
+              // create a local variable for each formal parameter, and assign each actual parameter to the corresponding local
+              Dictionary<IVariable, Expression> substMap = new Dictionary<IVariable, Expression>();
+              Dictionary<IVariable, Expression> directSubstMap = new Dictionary<IVariable, Expression>();
+              for (int i = 0; i < e.Function.Ins.Count; i++) {
+                Formal p = e.Function.Ins[i];
+                // Note, in the following, the "##" makes the variable invisible in BVD.  An alternative would be to communicate
+                // to BVD what this variable stands for and display it as such to the user.
+                Type et = p.Type.Subst(e.GetTypeArgumentSubstitutions());
+                LocalVariable local = new LocalVariable(p.Origin, "##" + p.Name, et, p.IsGhost);
+                local.type = local.SyntacticType;  // resolve local here
+                var ie = new IdentifierExpr(local.Origin, local.AssignUniqueName(CurrentDeclaration.IdGenerator)) {
+                  Var = local
+                };
+                ie.Type = ie.Var.Type;  // resolve ie here
+                substMap.Add(p, ie);
+                locals.GetOrAdd(new Bpl.LocalVariable(local.Origin, new Bpl.TypedIdent(local.Origin, local.AssignUniqueName(CurrentDeclaration.IdGenerator), TrType(local.Type))));
+                Bpl.IdentifierExpr lhs = (Bpl.IdentifierExpr)etran.TrExpr(ie);  // TODO: is this cast always justified?
+                Expression ee = e.Args[i];
+                directSubstMap.Add(p, ee);
+
+                if (!(ee is DefaultValueExpression)) {
+                  CheckWellformedWithResult(ee, wfOptions, locals, builder, etran, (returnBuilder, result) => {
+                    CheckSubrange(result.Origin, etran.TrExpr(result), ee.Type, et, ee, returnBuilder);
+                  });
+                }
+                Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(p.Origin, lhs, AdaptBoxing(p.Origin, etran.TrExpr(ee), cce.NonNull(ee.Type), et));
+                builder.Add(cmd);
+                if (!etran.UsesOldHeap) {
+                  // the argument can't be assumed to be allocated for the old heap
+                  builder.Add(new Bpl.CommentCmd("assume allocatedness for argument to function"));
+                  builder.Add(TrAssumeCmd(e.Args[i].Origin, MkIsAlloc(lhs, et, etran.HeapExpr)));
+                }
+              }
+
+              // Check that every parameter is available in the state in which the function is invoked; this means checking that it has
+              // the right type and is allocated.  These checks usually hold trivially, on account of that the Dafny language only gives
+              // access to expressions of the appropriate type and that are allocated in the current state.  However, if the function is
+              // invoked in the 'old' state or if the function invoked is a two-state function with a non-new parameter, then we need to
+              // check that its arguments were all available at that time as well.
+              if (etran.UsesOldHeap) {
+                if (!e.Function.IsStatic) {
+                  Bpl.Expr wh = GetWhereClause(e.Receiver.Origin, etran.TrExpr(e.Receiver), e.Receiver.Type, etran, ISALLOC, true);
+                  if (wh != null) {
+                    var desc = new IsAllocated("receiver argument", "in the state in which the function is invoked", e.Receiver, e.AtLabel);
+                    builder.Add(Assert(GetToken(e.Receiver), wh, desc, builder.Context));
+                  }
+                }
+                for (int i = 0; i < e.Args.Count; i++) {
+                  Expression ee = e.Args[i];
+                  Bpl.Expr wh = GetWhereClause(ee.Origin, etran.TrExpr(ee), ee.Type, etran, ISALLOC, true);
+                  if (wh != null) {
+                    var desc = new IsAllocated("argument", "in the state in which the function is invoked", ee, e.AtLabel);
+                    builder.Add(Assert(GetToken(ee), wh, desc, builder.Context));
+                  }
+                }
+              } else if (e.Function is TwoStateFunction) {
+                if (!e.Function.IsStatic) {
+                  Bpl.Expr wh = GetWhereClause(e.Receiver.Origin, etran.TrExpr(e.Receiver), e.Receiver.Type, etran.OldAt(e.AtLabel), ISALLOC, true);
+                  if (wh != null) {
+                    var desc = new IsAllocated("receiver argument", "in the two-state function's previous state", e.Receiver, e.AtLabel);
+                    builder.Add(Assert(GetToken(e.Receiver), wh, desc, builder.Context));
+                  }
+                }
+                Contract.Assert(e.Function.Ins.Count == e.Args.Count);
+                for (int i = 0; i < e.Args.Count; i++) {
+                  var formal = e.Function.Ins[i];
+                  if (formal.IsOld) {
+                    Expression ee = e.Args[i];
+                    Bpl.Expr wh = GetWhereClause(ee.Origin, etran.TrExpr(ee), ee.Type, etran.OldAt(e.AtLabel), ISALLOC, true);
+                    if (wh != null) {
+                      var pIdx = e.Args.Count == 1 ? "" : " at index " + i;
+                      var desc = new IsAllocated(
+                        $"argument{pIdx} for parameter '{formal.Name}'",
+                        "in the two-state function's previous state" + IsAllocated.HelperFormal(formal),
+                        ee,
+                        e.AtLabel
+                      );
+                      builder.Add(Assert(GetToken(ee), wh, desc, builder.Context));
+                    }
+                  }
+                }
+              }
+              // check that the preconditions for the call hold
+              // the check for .reads function must be translated explicitly: their declaration lacks
+              // an explicit precondition, which is added as an axiom in Translator.cs
+              if (e.Function.Name == "reads" && !e.Receiver.Type.IsArrowTypeWithoutReadEffects) {
+                var arguments = etran.FunctionInvocationArguments(e, null, null);
+                var precondition = FunctionCall(e.Origin, Requires(e.Args.Count), Bpl.Type.Bool, arguments);
+                builder.Add(Assert(GetToken(expr), precondition, new PreconditionSatisfied(null, null, null), builder.Context));
+
+                if (wfOptions.DoReadsChecks) {
+                  // check that the callee reads only what the caller is already allowed to read
+                  Type objset = program.SystemModuleManager.ObjectSetType();
+                  Expression wrap = new BoogieWrapper(
+                    FunctionCall(expr.Origin, Reads(e.Args.Count()), TrType(objset), arguments),
+                    objset);
+                  var reads = new FrameExpression(expr.Origin, wrap, null);
+                  List<FrameExpression> requiredFrames;
+                  switch (e.Receiver.Resolved) {
+                    case MemberSelectExpr { Member: MethodOrFunction readsReceiver }: {
+                        var receiverReplacement = readsReceiver.IsStatic
+                          ? null
+                          : new ThisExpr(readsReceiver);
+                        var receiverSubstMap = readsReceiver.Ins.Zip(e.Args)
+                          .ToDictionary(fa => fa.First as IVariable, fa => fa.Second);
+                        var subst = new Substituter(receiverReplacement, receiverSubstMap, e.GetTypeArgumentSubstitutions());
+                        requiredFrames = readsReceiver.Reads.Expressions.ConvertAll(subst.SubstFrameExpr);
+                        break;
+                      }
+                    default:
+                      var readsCall = new ApplyExpr(
+                        Token.NoToken,
+                        new ExprDotName(Token.NoToken, e.Receiver.Resolved, new Name("reads"), null),
+                        e.Args,
+                        Token.NoToken
+                      );
+                      readsCall.Type = objset;
+                      requiredFrames = new() { new FrameExpression(Token.NoToken, readsCall, null) };
+                      break;
+                  }
+                  var desc = new ReadFrameSubset("invoke function", requiredFrames, readFrames);
+                  CheckFrameSubset(expr.Origin, new List<FrameExpression> { reads }, null, null,
+                    etran, etran.ReadsFrame(expr.Origin), wfOptions.AssertSink(this, builder), (ta, qa) => builder.Add(new Bpl.AssumeCmd(ta, qa)), desc, wfOptions.AssertKv);
+                }
+
+              } else {
+                // Directly substitutes arguments for formals, to be displayed to the user
+                var argSubstMap = e.Function.Ins.Zip(e.Args).ToDictionary(fa => fa.First as IVariable, fa => fa.Second);
+                var directSub = new Substituter(e.Receiver, argSubstMap, e.GetTypeArgumentSubstitutions());
+
+                foreach (AttributedExpression p in ConjunctsOf(e.Function.Req)) {
+                  var directPrecond = directSub.Substitute(p.E);
+
+                  Expression precond = Substitute(p.E, e.Receiver, substMap, e.GetTypeArgumentSubstitutions());
+                  builder.Add(TrAssumeCmd(precond.Origin, etran.CanCallAssumption(precond)));
+                  var (errorMessage, successMessage) = CustomErrorMessage(p.Attributes);
+                  foreach (var ss in TrSplitExpr(builder.Context, precond, etran, true, out _)) {
+                    if (ss.IsChecked) {
+                      var tok = new NestedOrigin(GetToken(expr), ss.Tok);
+                      var desc = new PreconditionSatisfied(directPrecond, errorMessage, successMessage);
+                      if (wfOptions.AssertKv != null) {
+                        // use the given assert attribute only
+                        builder.Add(Assert(tok, ss.E, desc, builder.Context, wfOptions.AssertKv));
+                      } else {
+                        builder.Add(AssertAndForget(builder.Context, tok, ss.E, desc));
+                      }
+                    }
+                  }
+                  if (wfOptions.AssertKv == null) {
+                    // assume only if no given assert attribute is given
+                    builder.Add(TrAssumeCmd(callExpr.Origin, etran.TrExpr(precond)));
+                  }
+                }
+                if (wfOptions.DoReadsChecks) {
+                  // check that the callee reads only what the caller is already allowed to read
+
+                  // substitute actual args for parameters in description expression frames...
+                  var requiredFrames = e.Function.Reads.Expressions.ConvertAll(directSub.SubstFrameExpr);
+                  var desc = new ReadFrameSubset("invoke function", requiredFrames, readFrames);
+
+                  // ... but that substitution isn't needed for frames passed to CheckFrameSubset
+                  var readsSubst = new Substituter(null, new Dictionary<IVariable, Expression>(), e.GetTypeArgumentSubstitutions());
+                  CheckFrameSubset(callExpr.Origin,
+                    e.Function.Reads.Expressions.ConvertAll(readsSubst.SubstFrameExpr),
+                    e.Receiver, substMap, etran, etran.ReadsFrame(callExpr.Origin), wfOptions.AssertSink(this, builder), (ta, qa) => builder.Add(new Bpl.AssumeCmd(ta, qa)), desc, wfOptions.AssertKv);
+                }
+              }
+              Expression allowance = null;
+              if (codeContext != null && e.CoCall != FunctionCallExpr.CoCallResolution.Yes && !(e.Function is ExtremePredicate)) {
+                // check that the decreases measure goes down
+                var calleeSCCLookup = e.IsByMethodCall ? (ICallable)e.Function.ByMethodDecl : e.Function;
+                Contract.Assert(calleeSCCLookup != null);
+                if (ModuleDefinition.InSameSCC(calleeSCCLookup, codeContext)) {
+                  if (wfOptions.DoOnlyCoarseGrainedTerminationChecks) {
+                    builder.Add(Assert(GetToken(expr), Bpl.Expr.False, new IsNonRecursive(), builder.Context));
+                  } else {
+                    if (e.Function == wfOptions.SelfCallsAllowance) {
+                      allowance = Expression.CreateBoolLiteral(e.Origin, true);
+                      if (!e.Function.IsStatic) {
+                        allowance = Expression.CreateAnd(allowance, Expression.CreateEq(e.Receiver, new ThisExpr(e.Function), e.Receiver.Type));
+                      }
+                      for (int i = 0; i < e.Args.Count; i++) {
+                        Expression ee = e.Args[i];
+                        Formal ff = e.Function.Ins[i];
+                        allowance = Expression.CreateAnd(allowance, Expression.CreateEq(ee, Expression.CreateIdentExpr(ff), ff.Type));
+                      }
+                    }
+                    string hint;
+                    switch (e.CoCall) {
+                      case FunctionCallExpr.CoCallResolution.NoBecauseFunctionHasSideEffects:
+                        hint = "note that only functions without side effects can be called co-recursively";
+                        break;
+                      case FunctionCallExpr.CoCallResolution.NoBecauseFunctionHasPostcondition:
+                        hint = "note that only functions without any ensures clause can be called co-recursively";
+                        break;
+                      case FunctionCallExpr.CoCallResolution.NoBecauseIsNotGuarded:
+                        hint = "note that the call is not sufficiently guarded to be used co-recursively";
+                        break;
+                      case FunctionCallExpr.CoCallResolution.NoBecauseRecursiveCallsAreNotAllowedInThisContext:
+                        hint = "note that calls cannot be co-recursive in this context";
+                        break;
+                      case FunctionCallExpr.CoCallResolution.NoBecauseRecursiveCallsInDestructiveContext:
+                        hint = "note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts";
+                        break;
+                      case FunctionCallExpr.CoCallResolution.No:
+                        hint = null;
+                        break;
+                      default:
+                        Contract.Assert(false); // unexpected CoCallResolution
+                        goto case FunctionCallExpr.CoCallResolution.No; // please the compiler
+                    }
+
+                    if (e.Function == wfOptions.SelfCallsAllowance) {
+                      allowance = etran.MakeAllowance(e);
+                    }
+                    if (e.CoCallHint != null) {
+                      hint = hint == null ? e.CoCallHint : string.Format("{0}; {1}", hint, e.CoCallHint);
+                    }
+                    List<Expression> contextDecreases = codeContext.Decreases.Expressions;
+                    List<Expression> calleeDecreases = e.Function.Decreases.Expressions;
+                    CheckCallTermination(callExpr.Origin, contextDecreases, calleeDecreases, allowance, e.Receiver, substMap, directSubstMap, e.GetTypeArgumentSubstitutions(),
+                      etran, false, builder, codeContext.InferredDecreases, hint);
+                  }
+                }
+              }
+              // all is okay, so allow this function application access to the function's axiom, except if it was okay because of the self-call allowance.
+              Bpl.IdentifierExpr canCallFuncID = new Bpl.IdentifierExpr(callExpr.Origin, e.Function.FullSanitizedName + "#canCall", Bpl.Type.Bool);
+              List<Bpl.Expr> args = etran.FunctionInvocationArguments(e, null, null);
+              Bpl.Expr canCallFuncAppl = new Bpl.NAryExpr(GetToken(expr), new Bpl.FunctionCall(canCallFuncID), args);
+              builder.Add(TrAssumeCmd(callExpr.Origin, allowance == null ? canCallFuncAppl : BplOr(etran.TrExpr(allowance), canCallFuncAppl)));
+
+              var returnType = e.Type.AsDatatype;
+              if (returnType != null && returnType.Ctors.Count == 1) {
+                var correctConstructor = FunctionCall(e.Origin, returnType.Ctors[0].QueryField.FullSanitizedName, Bpl.Type.Bool, etran.TrExpr(e));
+                // There is only one constructor, so the value must be been constructed by it; might as well assume that here.
+                builder.Add(TrAssumeCmd(callExpr.Origin, correctConstructor));
+              }
+            }
+
+            break;
+          }
+        case SeqConstructionExpr constructionExpr: {
+            var e = constructionExpr;
+            CheckWellformed(e.N, wfOptions, locals, builder, etran);
+            var desc = new NonNegative("sequence size", e.N);
+            builder.Add(Assert(GetToken(e.N), Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(e.N)), desc, builder.Context));
+
+            CheckWellformed(e.Initializer, wfOptions, locals, builder, etran);
+            var eType = e.Type.NormalizeToAncestorType().AsSeqType.Arg;
+            CheckElementInit(e.Origin, false, new List<Expression>() { e.N }, eType, e.Initializer, null, builder, etran, wfOptions);
+            break;
+          }
+        case MultiSetFormingExpr formingExpr: {
+            MultiSetFormingExpr e = formingExpr;
+            CheckWellformed(e.E, wfOptions, locals, builder, etran);
+            CheckResultToBeInType(e.Origin, e, e.Type, locals, builder, etran);
+            break;
+          }
+        case OldExpr oldExpr: {
+            var e = oldExpr;
+            // Anything read inside the 'old' expressions depends only on the old heap, which isn't included in the
+            // frame axiom.  In other words, 'old' expressions have no dependencies on the current heap.  Therefore,
+            // we turn off any reads checks for "e.E".
+            CheckWellformed(e.E, wfOptions.WithReadsChecks(false), locals, builder, etran.OldAt(e.AtLabel));
+            break;
+          }
+        case UnchangedExpr unchangedExpr: {
+            var e = unchangedExpr;
+            var contextReadsFrames = GetContextReadsFrames();
+            foreach (var fe in e.Frame) {
+              CheckWellformed(fe.E, wfOptions, locals, builder, etran);
+
+              EachReferenceInFrameExpression(fe.E, locals, builder, etran, out var description, out var ty, out var r, out var ante);
+              Bpl.Expr nonNull;
+              if (ty.IsNonNullRefType) {
+                nonNull = Bpl.Expr.True;
+              } else {
+                Contract.Assert(ty.IsRefType);
+                nonNull = Bpl.Expr.Neq(r, Predef.Null);
+                builder.Add(Assert(GetToken(fe.E), BplImp(ante, nonNull),
+                  new NonNull(description, fe.E, description != "object"), builder.Context));
+              }
+              // check that "r" was allocated in the "e.AtLabel" state
+              Bpl.Expr wh = GetWhereClause(fe.E.Origin, r, ty, etran.OldAt(e.AtLabel), ISALLOC, true);
+              if (wh != null) {
+                var desc = new IsAllocated(description, "in the old-state of the 'unchanged' predicate",
+                  fe.E, e.AtLabel, description != "object");
+                builder.Add(Assert(GetToken(fe.E), BplImp(BplAnd(ante, nonNull), wh), desc, builder.Context));
+              }
+              // check that the 'unchanged' argument reads only what the context is allowed to read
+              if (wfOptions.DoReadsChecks) {
+                var desc = new ReadFrameSubset($"read state of 'unchanged' {description}", fe, contextReadsFrames);
+                CheckFrameSubset(fe.E.Origin,
+                  new List<FrameExpression>() { fe },
+                  null, new Dictionary<IVariable, Expression>(), etran, etran.ReadsFrame(fe.E.Origin), wfOptions.AssertSink(this, builder),
+                  (ta, qa) => builder.Add(new Bpl.AssumeCmd(ta, qa)),
+                  desc, wfOptions.AssertKv);
+              }
+            }
+
+            break;
+          }
+        case UnaryExpr unaryExpr: {
+            UnaryExpr e = unaryExpr;
+            if (e is UnaryOpExpr { Op: UnaryOpExpr.Opcode.Assigned }) {
+              CheckWellformed(e.E.Resolved, wfOptions.WithLValueContext(true), locals, builder, etran);
+            } else {
+              CheckWellformed(e.E, wfOptions, locals, builder, etran);
+            }
+
+            if (e is ConversionExpr ee) {
+              CheckResultToBeInType(unaryExpr.Origin, ee.E, ee.ToType, locals, builder, etran, ee.messagePrefix);
+            }
+
+            CheckResultToBeInType(expr.Origin, expr, expr.Type, locals, builder, etran);
+            break;
+          }
+        case BinaryExpr binaryExpr: {
+            BinaryExpr e = binaryExpr;
+            CheckWellformed(e.E0, wfOptions, locals, builder, etran);
+            switch (e.ResolvedOp) {
+              case BinaryExpr.ResolvedOpcode.And:
+              case BinaryExpr.ResolvedOpcode.Imp: {
+                  BoogieStmtListBuilder b = new BoogieStmtListBuilder(this, options, builder.Context);
+                  CheckWellformed(e.E1, wfOptions, locals, b, etran);
+                  builder.Add(new Bpl.IfCmd(binaryExpr.Origin, etran.TrExpr(e.E0), b.Collect(binaryExpr.Origin), null, null));
+                }
+                break;
+              case BinaryExpr.ResolvedOpcode.Or: {
+                  BoogieStmtListBuilder b = new BoogieStmtListBuilder(this, options, builder.Context);
+                  CheckWellformed(e.E1, wfOptions, locals, b, etran);
+                  builder.Add(new Bpl.IfCmd(binaryExpr.Origin, Bpl.Expr.Not(etran.TrExpr(e.E0)), b.Collect(binaryExpr.Origin), null, null));
+                }
+                break;
+              case BinaryExpr.ResolvedOpcode.Add:
+              case BinaryExpr.ResolvedOpcode.Sub:
+              case BinaryExpr.ResolvedOpcode.Mul:
+                CheckWellformed(e.E1, wfOptions, locals, builder, etran);
+                if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.Sub && e.E0.Type.IsBigOrdinalType) {
+                  var rhsIsNat = FunctionCall(binaryExpr.Origin, "ORD#IsNat", Bpl.Type.Bool, etran.TrExpr(e.E1));
+                  builder.Add(Assert(GetToken(expr), rhsIsNat,
+                    new OrdinalSubtractionIsNatural(e.E1), builder.Context));
+                  var offset0 = FunctionCall(binaryExpr.Origin, "ORD#Offset", Bpl.Type.Int, etran.TrExpr(e.E0));
+                  var offset1 = FunctionCall(binaryExpr.Origin, "ORD#Offset", Bpl.Type.Int, etran.TrExpr(e.E1));
+                  builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(offset1, offset0),
+                    new OrdinalSubtractionUnderflow(e.E0, e.E1), builder.Context));
+                } else if (e.Type.NormalizeToAncestorType().IsCharType) {
+                  var e0 = FunctionCall(binaryExpr.Origin, "char#ToInt", Bpl.Type.Int, etran.TrExpr(e.E0));
+                  var e1 = FunctionCall(binaryExpr.Origin, "char#ToInt", Bpl.Type.Int, etran.TrExpr(e.E1));
+                  if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.Add) {
+                    builder.Add(Assert(GetToken(expr),
+                      FunctionCall(Token.NoToken, BuiltinFunction.IsChar, null,
+                        Bpl.Expr.Binary(BinaryOperator.Opcode.Add, e0, e1)),
+                      new CharOverflow(e.E0, e.E1), builder.Context));
+                  } else {
+                    Contract.Assert(e.ResolvedOp == BinaryExpr.ResolvedOpcode.Sub);  // .Mul is not supported for char
+                    builder.Add(Assert(GetToken(expr),
+                      FunctionCall(Token.NoToken, BuiltinFunction.IsChar, null,
+                        Bpl.Expr.Binary(BinaryOperator.Opcode.Sub, e0, e1)),
+                      new CharUnderflow(e.E0, e.E1), builder.Context));
+                  }
+                }
+                break;
+              case BinaryExpr.ResolvedOpcode.Div:
+              case BinaryExpr.ResolvedOpcode.Mod: {
+                  Bpl.Expr zero;
+                  if (e.E1.Type.NormalizeToAncestorType() is BitvectorType bitvectorType) {
+                    zero = BplBvLiteralExpr(e.Origin, BaseTypes.BigNum.ZERO, bitvectorType);
+                  } else if (e.E1.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
+                    zero = Bpl.Expr.Literal(BaseTypes.BigDec.ZERO);
+                  } else {
+                    zero = Bpl.Expr.Literal(0);
+                  }
+                  CheckWellformed(e.E1, wfOptions, locals, builder, etran);
+                  builder.Add(Assert(GetToken(expr), Bpl.Expr.Neq(etran.TrExpr(e.E1), zero),
+                    new DivisorNonZero(e.E1), builder.Context, wfOptions.AssertKv));
+                }
+                break;
+              case BinaryExpr.ResolvedOpcode.LeftShift:
+              case BinaryExpr.ResolvedOpcode.RightShift: {
+                  CheckWellformed(e.E1, wfOptions, locals, builder, etran);
+                  var w = e.Type.NormalizeToAncestorType().AsBitVectorType.Width;
+                  var upperDesc = new ShiftUpperBound(w, true, e.E1);
+                  if (e.E1.Type.NormalizeToAncestorType().AsBitVectorType is { } bitvectorType) {
+                    // Known to be non-negative, so we don't need to check lower bound.
+                    // Check upper bound, that is, check "E1 <= w"
+                    var e1Width = bitvectorType.Width;
+                    if (w < (BigInteger.One << e1Width)) {
+                      // w is a number that can be represented in the e.E1.Type, so do the comparison in that bitvector type.
+                      var bound = BplBvLiteralExpr(e.Origin, BaseTypes.BigNum.FromInt(w), e1Width);
+                      var cmp = etran.TrToFunctionCall(binaryExpr.Origin, "le_bv" + e1Width, Bpl.Type.Bool, etran.TrExpr(e.E1), bound, false);
+                      builder.Add(Assert(GetToken(expr), cmp, upperDesc, builder.Context, wfOptions.AssertKv));
+                    } else {
+                      // In the previous branch, we had:
+                      //     w < 2^e1Width               (*)
+                      // From the type of E1, we have:
+                      //     E1 < 2^e1Width
+                      // In this branch, (*) does not hold, so we therefore have the following:
+                      //     E1 < 2^e1Width <= w
+                      // In other words, the condition
+                      //     E1 <= w
+                      // already holds, so there is no reason to check it.
+                    }
+                  } else {
+                    var positiveDesc = new ShiftLowerBound(true, e.E1);
+                    builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(e.E1)),
+                      positiveDesc, builder.Context, wfOptions.AssertKv));
+                    builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(etran.TrExpr(e.E1), Bpl.Expr.Literal(w)),
+                      upperDesc, builder.Context, wfOptions.AssertKv));
+                  }
+                }
+                break;
+              case BinaryExpr.ResolvedOpcode.EqCommon:
+              case BinaryExpr.ResolvedOpcode.NeqCommon:
+                CheckWellformed(e.E1, wfOptions, locals, builder, etran);
+                if (e.InCompiledContext) {
+                  if (CheckTypeCharacteristicsVisitor.CanCompareWith(e.E0) || CheckTypeCharacteristicsVisitor.CanCompareWith(e.E1)) {
+                    // everything's fine
+                  } else {
+                    Contract.Assert(!e.E0.Type.SupportsEquality); // otherwise, CanCompareWith would have returned "true" above
+                    Contract.Assert(!e.E1.Type.SupportsEquality); // otherwise, CanCompareWith would have returned "true" above
+                    Contract.Assert(e.E0.Type.PartiallySupportsEquality); // otherwise, the code wouldn't have got passed the resolver
+                    Contract.Assert(e.E1.Type.PartiallySupportsEquality); // otherwise, the code wouldn't have got passed the resolver
+                    var dt = e.E0.Type.AsIndDatatype;
+                    Contract.Assert(dt != null); // only inductive datatypes support equality partially
+
+                    // to compare the datatype values for equality, there must not be any possibility that either of the datatype
+                    // variants is a ghost constructor
+                    var ghostConstructors = dt.Ctors.Where(ctor => ctor.IsGhost).ToList();
+                    Contract.Assert(ghostConstructors.Count != 0);
+
+                    void CheckOperand(Expression operand) {
+                      var value = etran.TrExpr(operand);
+                      var notGhostCtor = BplAnd(ghostConstructors.ConvertAll(
+                        ctor => Bpl.Expr.Not(FunctionCall(expr.Origin, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, value))));
+                      builder.Add(Assert(GetToken(expr), notGhostCtor,
+                        new NotGhostVariant("equality", operand, ghostConstructors), builder.Context));
+                    }
+
+                    CheckOperand(e.E0);
+                    CheckOperand(e.E1);
+                  }
+                }
+                break;
+              default:
+                CheckWellformed(e.E1, wfOptions, locals, builder, etran);
+                break;
+            }
+
+            CheckResultToBeInType(expr.Origin, expr, expr.Type, locals, builder, etran);
+            break;
+          }
+        case TernaryExpr ternaryExpr: {
+            var e = ternaryExpr;
+            foreach (var ee in e.SubExpressions) {
+              CheckWellformed(ee, wfOptions, locals, builder, etran);
+            }
+            switch (e.Op) {
+              case TernaryExpr.Opcode.PrefixEqOp:
+              case TernaryExpr.Opcode.PrefixNeqOp:
+                if (e.E0.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
+                  builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(e.E0)),
+                    new PrefixEqualityLimit(e.E0), builder.Context, wfOptions.AssertKv));
+                }
+                break;
+              default:
+                Contract.Assert(false);  // unexpected ternary expression
+                break;
+            }
+
+            CheckResultToBeInType(expr.Origin, expr, expr.Type, locals, builder, etran);
+            break;
+          }
+        case LetExpr letExpr:
+          CheckWellformedLetExprWithResult(letExpr, wfOptions, locals, builder, etran, true, addResultCommands);
+          addResultCommands = null;
+          break;
+        case ComprehensionExpr comprehensionExpr: {
+            var e = comprehensionExpr;
+            var lam = e as LambdaExpr;
+            var mc = e as MapComprehension;
+            if (mc is { IsGeneralMapComprehension: false }) {
+              mc = null;  // mc will be non-null when "e" is a general map comprehension
+            }
+
+            // This is a WF check, so we look at the original quantifier, not the split one.
+            // This ensures that cases like forall x :: x != null && f(x.a) do not fail to verify.
+
+            builder.Add(new Bpl.CommentCmd("Begin Comprehension WF check"));
+            BplIfIf(e.Origin, lam != null, null, builder, nextBuilder => {
+              var comprehensionEtran = etran;
+              if (lam != null) {
+                // Havoc heap
+                locals.GetOrAdd(BplLocalVar(CurrentIdGenerator.FreshId((etran.UsesOldHeap ? "$Heap_at_" : "") + "$lambdaHeap#"), Predef.HeapType, out var lambdaHeap));
+                comprehensionEtran = new ExpressionTranslator(comprehensionEtran, lambdaHeap);
+                nextBuilder.Add(new HavocCmd(e.Origin, Singleton((Bpl.IdentifierExpr)comprehensionEtran.HeapExpr)));
+                nextBuilder.Add(new AssumeCmd(e.Origin, FunctionCall(e.Origin, BuiltinFunction.IsGoodHeap, null, comprehensionEtran.HeapExpr)));
+                nextBuilder.Add(new AssumeCmd(e.Origin, HeapSameOrSucc(etran.HeapExpr, comprehensionEtran.HeapExpr)));
+              }
+
+              var substMap = SetupBoundVarsAsLocals(e.BoundVars, out var typeAntecedents, nextBuilder, locals, comprehensionEtran);
+              BplIfIf(e.Origin, true, typeAntecedents, nextBuilder, newBuilder => {
+                var s = new Substituter(null, substMap, new Dictionary<TypeParameter, Type>());
+                var body = Substitute(e.Term, null, substMap);
+                var bodyLeft = mc != null ? Substitute(mc.TermLeft, null, substMap) : null;
+                var substMapPrime = mc != null ? SetupBoundVarsAsLocals(e.BoundVars, newBuilder, locals, comprehensionEtran, "#prime") : null;
+                var bodyLeftPrime = mc != null ? Substitute(mc.TermLeft, null, substMapPrime) : null;
+                var bodyPrime = mc != null ? Substitute(e.Term, null, substMapPrime) : null;
+                List<FrameExpression> reads = null;
+
+                var newOptions = wfOptions;
+                if (lam != null) {
+                  // Set up a new frame
+                  var frameName = CurrentIdGenerator.FreshId("$_Frame#l");
+                  reads = lam.Reads.Expressions.ConvertAll(s.SubstFrameExpr);
+                  comprehensionEtran = comprehensionEtran.WithReadsFrame(frameName, lam);
+                  DefineFrame(e.Origin, comprehensionEtran.ReadsFrame(e.Origin), reads, newBuilder, locals, frameName, comprehensionEtran);
+
+                  // Check frame WF and that it read covers itself
+                  var delayer = new ReadsCheckDelayer(comprehensionEtran, wfOptions.SelfCallsAllowance, locals, builder, newBuilder);
+                  delayer.DoWithDelayedReadsChecks(false, wfo => {
+                    CheckFrameWellFormed(wfo, reads, locals, newBuilder, comprehensionEtran);
+                  });
+
+                  // continue doing reads checks, but don't delay them
+                  newOptions = new WFOptions(wfOptions.SelfCallsAllowance, true, false);
+                }
+
+                // check requires/range
+                Bpl.Expr guard = null;
+                if (e.Range != null) {
+                  var range = Substitute(e.Range, null, substMap);
+                  CheckWellformed(range, newOptions, locals, newBuilder, comprehensionEtran);
+                  guard = comprehensionEtran.TrExpr(range);
+                }
+
+                if (mc != null) {
+                  Contract.Assert(bodyLeft != null);
+                  BplIfIf(e.Origin, guard != null, guard, newBuilder, b => { CheckWellformed(bodyLeft, newOptions, locals, b, comprehensionEtran); });
+                }
+                BplIfIf(e.Origin, guard != null, guard, newBuilder, b => {
+                  Bpl.Expr resultIe = null;
+                  Type rangeType = null;
+                  if (lam != null) {
+                    var resultName = CurrentIdGenerator.FreshId("lambdaResult#");
+                    var resultVar = new Bpl.LocalVariable(body.Origin, new Bpl.TypedIdent(body.Origin, resultName, TrType(body.Type)));
+                    locals.GetOrAdd(resultVar);
+                    resultIe = new Bpl.IdentifierExpr(body.Origin, resultVar);
+                    rangeType = lam.Type.AsArrowType.Result;
+                  }
+
+                  void AddResultCommands(BoogieStmtListBuilder returnBuilder, Expression result) {
+                    if (rangeType != null) {
+                      CheckSubsetType(etran, result, resultIe, rangeType, returnBuilder, "lambda expression");
+                    }
+                  }
+
+                  CheckWellformedWithResult(body, newOptions, locals, b, comprehensionEtran, AddResultCommands);
+                });
+
+                if (mc != null) {
+                  Contract.Assert(substMapPrime != null);
+                  Contract.Assert(bodyLeftPrime != null);
+                  Contract.Assert(bodyPrime != null);
+                  Bpl.Expr guardPrimeCanCall = null;
+                  Bpl.Expr guardPrime = null;
+                  if (guard != null) {
+                    Contract.Assert(e.Range != null);
+                    var rangePrime = Substitute(e.Range, null, substMapPrime);
+                    guardPrimeCanCall = comprehensionEtran.CanCallAssumption(rangePrime);
+                    guardPrime = comprehensionEtran.TrExpr(rangePrime);
+                  }
+                  BplIfIf(e.Origin, guard != null, BplAnd(guard, guardPrime), newBuilder, b => {
+                    var canCalls = guardPrimeCanCall ?? Bpl.Expr.True;
+                    canCalls = BplAnd(canCalls, comprehensionEtran.CanCallAssumption(bodyLeft));
+                    canCalls = BplAnd(canCalls, comprehensionEtran.CanCallAssumption(bodyLeftPrime));
+                    canCalls = BplAnd(canCalls, comprehensionEtran.CanCallAssumption(body));
+                    canCalls = BplAnd(canCalls, comprehensionEtran.CanCallAssumption(bodyPrime));
+                    var different = BplOr(
+                      Bpl.Expr.Neq(comprehensionEtran.TrExpr(bodyLeft), comprehensionEtran.TrExpr(bodyLeftPrime)),
+                      Bpl.Expr.Eq(comprehensionEtran.TrExpr(body), comprehensionEtran.TrExpr(bodyPrime)));
+                    b.Add(new AssumeCmd(mc.TermLeft.Origin, canCalls));
+                    b.Add(Assert(GetToken(mc.TermLeft), different,
+                      new ComprehensionNoAlias(mc.BoundVars, mc.Range, mc.TermLeft, mc.Term), builder.Context));
+                  });
+                }
+              });
+
+              if (lam != null) {
+                // assume false (heap was havoced inside an if)
+                Contract.Assert(nextBuilder != builder);
+                nextBuilder.Add(new AssumeCmd(e.Origin, Bpl.Expr.False));
+              }
+            });
+
+            bool needTypeConstraintCheck;
+            if (lam == null) {
+              needTypeConstraintCheck = true;
+            } else {
+              // omit constraint check if the type is according to the syntax of the expression
+              var arrowType = (UserDefinedType)e.Type.NormalizeExpandKeepConstraints();
+              if (ArrowType.IsPartialArrowTypeName(arrowType.Name)) {
+                needTypeConstraintCheck = lam.Reads.Expressions.Count != 0;
+              } else if (ArrowType.IsTotalArrowTypeName(arrowType.Name)) {
+                needTypeConstraintCheck = lam.Reads.Expressions.Count != 0 || lam.Range != null;
+              } else {
+                needTypeConstraintCheck = true;
+              }
+            }
+            if (needTypeConstraintCheck) {
+              CheckResultToBeInType(e.Origin, e, e.Type, locals, builder, etran);
+            }
+
+            builder.Add(new Bpl.CommentCmd("End Comprehension WF check"));
+            builder.Add(TrAssumeCmd(expr.Origin, etran.CanCallAssumption(expr)));
+            break;
+          }
+        case StmtExpr stmtExpr:
+          CheckWellformedStmtExpr(stmtExpr, wfOptions, locals, builder, etran, addResultCommands);
+          addResultCommands = null;
+          break;
+        case ITEExpr iteExpr: {
+            ITEExpr e = iteExpr;
+            CheckWellformed(e.Test, wfOptions, locals, builder, etran);
+            var bThen = new BoogieStmtListBuilder(this, options, builder.Context);
+            var bElse = new BoogieStmtListBuilder(this, options, builder.Context);
+            if (e.IsBindingGuard) {
+              // if it is BindingGuard, e.Thn is a let-such-that created from the BindingGuard.
+              // We don't need to do well-formedness check on the Rhs of the LetExpr since it
+              // has already been checked in e.Test
+              var letExpr = (LetExpr)e.Thn;
+              Contract.Assert(letExpr != null);
+              CheckWellformedLetExprWithResult(letExpr, wfOptions, locals, bThen, etran, false, addResultCommands);
+            } else {
+              CheckWellformedWithResult(e.Thn, wfOptions, locals, bThen, etran, addResultCommands);
+            }
+            CheckWellformedWithResult(e.Els, wfOptions, locals, bElse, etran, addResultCommands);
+            builder.Add(new Bpl.IfCmd(iteExpr.Origin, etran.TrExpr(e.Test), bThen.Collect(iteExpr.Origin), null, bElse.Collect(iteExpr.Origin)));
+            addResultCommands = null;
+            break;
+          }
+        case MatchExpr matchExpr:
+          MatchStmtVerifier.TrMatchExpr(this, matchExpr, wfOptions, locals, builder, etran, addResultCommands);
+          addResultCommands = null;
+          break;
+        case DatatypeUpdateExpr updateExpr: {
+            var e = updateExpr;
+            // check that source expression is created from one of the legal source constructors, then proceed according to the .ResolvedExpression
+            var correctConstructor = BplOr(e.LegalSourceConstructors.ConvertAll(
+              ctor => FunctionCall(e.Origin, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, etran.TrExpr(e.Root))));
+            if (e.LegalSourceConstructors.Count == e.Type.AsDatatype.Ctors.Count) {
+              // Every constructor has this destructor; no need to check anything
+            } else {
+              builder.Add(Assert(GetToken(expr), correctConstructor,
+                new ValidConstructorNames(updateExpr.Root, e.LegalSourceConstructors), builder.Context));
+            }
+
+            CheckNotGhostVariant(e.InCompiledContext, updateExpr, e.Root, "update of", e.Members,
+              e.LegalSourceConstructors, builder, etran);
+
+            CheckWellformedWithResult(e.ResolvedExpression, wfOptions, locals, builder, etran, addResultCommands);
+            addResultCommands = null;
+            break;
+          }
+        case ConcreteSyntaxExpression expression: {
+            var e = expression;
+            CheckWellformedWithResult(e.ResolvedExpression, wfOptions, locals, builder, etran, addResultCommands);
+            addResultCommands = null;
+            break;
+          }
+        case NestedMatchExpr nestedMatchExpr:
+          CheckWellformedWithResult(nestedMatchExpr.Flattened, wfOptions, locals, builder, etran, addResultCommands);
+          addResultCommands = null;
+          break;
+        case BoogieFunctionCall call: {
+            var e = call;
+            foreach (var arg in e.Args) {
+              CheckWellformed(arg, wfOptions, locals, builder, etran);
+            }
+
+            break;
+          }
+        case DecreasesToExpr decreasesToExpr: {
+            foreach (var subexpr in decreasesToExpr.SubExpressions) {
+              CheckWellformed(subexpr, wfOptions, locals, builder, etran);
+            }
+            break;
+          }
+        default:
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
+      }
+
+      addResultCommands?.Invoke(builder, expr);
+    }
+
+    public void CheckSubsetType(ExpressionTranslator etran, Expression expr, Bpl.Expr selfCall, Type resultType,
+      BoogieStmtListBuilder builder, string comment) {
+
+      Contract.Assert(resultType != null);
+      builder.Add(TrAssumeCmd(expr.Origin, etran.CanCallAssumption(expr)));
+      var bResult = etran.TrExpr(expr);
+      CheckSubrange(expr.Origin, bResult, expr.Type, resultType, expr, builder);
+      builder.Add(TrAssumeCmdWithDependenciesAndExtend(etran, expr.Origin, expr,
+        e => Bpl.Expr.Eq(selfCall, AdaptBoxing(expr.Origin, e, expr.Type, resultType)), comment));
+      builder.Add(new CommentCmd("CheckWellformedWithResult: any expression"));
+      builder.Add(TrAssumeCmd(expr.Origin, MkIs(selfCall, resultType)));
+    }
+
+    private void CheckWellformedStmtExpr(StmtExpr stmtExpr, WFOptions wfOptions, Variables locals,
+      BoogieStmtListBuilder builder, ExpressionTranslator etran, AddResultCommands addResultCommands) {
+
+      var statements = new List<Statement>() { stmtExpr.S };
+      Expression expression = stmtExpr.E;
+      while (expression is StmtExpr nestedStmtExpr) {
+        statements.Add(nestedStmtExpr.S);
+        expression = nestedStmtExpr.E;
+      }
+
+      // If we're inside an "old" expression, then "etran" will know how to translate
+      // expressions. However, here, we're also having to translate e.S, which is a
+      // Statement. Since statement translation (in particular, translation of CallStmt's)
+      // work directly on the global variable $Heap, we temporarily change its value here.
+      if (etran.UsesOldHeap) {
+        BuildWithHeapAs(stmtExpr.S.Origin, etran.HeapExpr, "StmtExpr#", locals, builder,
+          () => {
+            foreach (var statement in statements) {
+              TrStmt(statement, builder, locals, etran);
+            }
+          });
+      } else {
+        foreach (var statement in statements) {
+          TrStmt(statement, builder, locals, etran);
+        }
+      }
+
+      CheckWellformedWithResult(expression, wfOptions, locals, builder, etran, addResultCommands);
+    }
+
+    /// <summary>
+    /// Temporarily set the heap to the value etran.HeapExpr and call build().
+    ///
+    /// The Boogie code generated by build() should have just one exit point, namely at the
+    /// end of the code generated. (Any other exit would cause control flow to miss
+    /// BuildWithHeapAs's assignment that restores the value of $Heap.)
+    /// </summary>
+    void BuildWithHeapAs(IOrigin token, Bpl.Expr temporaryHeap, string heapVarSuffix, Variables locals,
+      BoogieStmtListBuilder builder, System.Action build) {
+      var suffix = CurrentIdGenerator.FreshId(heapVarSuffix);
+      var tmpHeapVar = locals.GetOrAdd(new Bpl.LocalVariable(token, new Bpl.TypedIdent(token, "Heap$" + suffix, Predef.HeapType)));
+      var tmpHeap = new Bpl.IdentifierExpr(token, tmpHeapVar);
+      var generalEtran = new ExpressionTranslator(this, Predef, token, null);
+      var theHeap = generalEtran.HeapCastToIdentifierExpr;
+
+      // tmpHeap := $Heap;
+      builder.Add(Bpl.Cmd.SimpleAssign(token, tmpHeap, theHeap));
+      // $Heap := etran.HeapExpr;
+      builder.Add(Bpl.Cmd.SimpleAssign(token, theHeap, temporaryHeap));
+
+      build();
+
+      // $Heap := tmpHeap;
+      builder.Add(Bpl.Cmd.SimpleAssign(token, theHeap, tmpHeap));
+    }
+
+    private void CheckNotGhostVariant(MemberSelectExpr expr, string whatKind, List<DatatypeCtor> candidateCtors,
+      BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+      CheckNotGhostVariant(expr.InCompiledContext, expr, expr.Obj, whatKind, new List<MemberDecl>() { expr.Member },
+        candidateCtors, builder, etran);
+    }
+
+    private void CheckNotGhostVariant(bool inCompiledContext, Expression exprUsedForToken, Expression datatypeValue,
+      string whatKind, List<MemberDecl> members, List<DatatypeCtor> candidateCtors, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+      if (inCompiledContext) {
+        // check that there is no possibility that the datatype variant is a ghost constructor
+        var enclosingGhostConstructors = candidateCtors.Where(ctor => ctor.IsGhost).ToList();
+        if (enclosingGhostConstructors.Count != 0) {
+          var obj = etran.TrExpr(datatypeValue);
+          var notGhostCtor = BplAnd(enclosingGhostConstructors.ConvertAll(
+            ctor => Bpl.Expr.Not(FunctionCall(exprUsedForToken.Origin, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, obj))));
+          builder.Add(Assert(GetToken(exprUsedForToken), notGhostCtor,
+            new NotGhostVariant(whatKind,
+              Util.PrintableNameList(members.ConvertAll(member => member.Name), "and"),
+              datatypeValue,
+              enclosingGhostConstructors), builder.Context));
+        }
+      }
+    }
+
+    void CheckWellformedSpecialFunction(FunctionCallExpr expr, WFOptions options, Bpl.Expr result, Type resultType,
+      Variables locals, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+      Contract.Requires(expr.Function is SpecialFunction);
+
+      CheckWellformed(expr.Receiver, options, locals, builder, etran);
+      foreach (var arg in expr.Args.Where(arg => arg is not DefaultValueExpression)) {
+        CheckWellformed(arg, options, locals, builder, etran);
+      }
+      if (expr.Function.Name is "RotateLeft" or "RotateRight") {
+        var w = expr.Type.AsBitVectorType.Width;
+        var arg = expr.Args[0];
+        builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(arg)),
+          new ShiftLowerBound(false, arg), builder.Context, options.AssertKv));
+        builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(etran.TrExpr(arg), Bpl.Expr.Literal(w)),
+          new ShiftUpperBound(w, false, arg), builder.Context, options.AssertKv));
+      }
+    }
+
+    public delegate void AddResultCommands(BoogieStmtListBuilder builder, Expression result);
+
+    void CheckWellformedLetExprWithResult(LetExpr e, WFOptions wfOptions, Variables locals,
+      BoogieStmtListBuilder builder, ExpressionTranslator etran, bool checkRhs, AddResultCommands addResultCommands) {
+      if (e.Exact) {
+        // Note, in the following line, we do NOT add an assumption about the type antecedent, because we don't yet know that a value even
+        // exists; rather, we ignore the type antecedent.
+        var substMap = SetupBoundVarsAsLocals(e.BoundVars.ToList<BoundVar>(), out _, builder, locals, etran, "#Z");
+        Contract.Assert(e.LHSs.Count == e.RHSs.Count);  // checked by resolution
+        var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator("let#");
+        for (int i = 0; i < e.LHSs.Count; i++) {
+          var pat = e.LHSs[i];
+          var rhs = e.RHSs[i];
+          var nm = varNameGen.FreshId($"#{i}#");
+          var r = locals.GetOrAdd(new Bpl.LocalVariable(pat.Origin, new Bpl.TypedIdent(pat.Origin, nm, TrType(pat.Expr.Type))));
+          var rIe = new Bpl.IdentifierExpr(rhs.Origin, r);
+
+          void CheckPostconditionForRhs(BoogieStmtListBuilder innerBuilder, Expression body) {
+            CheckSubsetType(etran, body, rIe, pat.Expr.Type, innerBuilder, "let expression binding RHS well-formed");
+          }
+
+          CheckWellformedWithResult(e.RHSs[i], wfOptions, locals, builder, etran, CheckPostconditionForRhs);
+          CheckCasePatternShape(pat, rhs, rIe, rhs.Origin, pat.Expr.Type, builder);
+          var substExpr = Substitute(pat.Expr, null, substMap);
+          builder.Add(TrAssumeCmdWithDependenciesAndExtend(etran, e.Origin, substExpr, e => Bpl.Expr.Eq(e, rIe), "let expression binding"));
+        }
+        CheckWellformedWithResult(Substitute(e.Body, null, substMap), wfOptions, locals, builder, etran, addResultCommands);
+
+      } else {
+        // CheckWellformed(var b :| RHS(b); Body(b)) =
+        //   var b;
+        //   if (typeAntecedent(b)) {
+        //     CheckWellformed(RHS(b));
+        //   }
+        //   assert (exists b' :: typeAntecedent' && RHS(b'));
+        //   assume typeAntecedent(b);
+        //   assume RHS(b);
+        //   CheckWellformed(Body(b));
+        //   If non-ghost:  var b' where typeAntecedent; assume RHS(b'); assert Body(b) == Body(b');
+        //   assume CanCall
+        Contract.Assert(e.RHSs.Count == 1);  // this is true of all successfully resolved let-such-that expressions
+        var lhsVars = e.BoundVars.ToList<BoundVar>();
+        var substMap = SetupBoundVarsAsLocals(lhsVars, out var typeAntecedent, builder, locals, etran);
+        var rhs = Substitute(e.RHSs[0], null, substMap);
+        if (checkRhs) {
+          var wellFormednessBuilder = new BoogieStmtListBuilder(this, this.options, builder.Context);
+          CheckWellformed(rhs, wfOptions, locals, wellFormednessBuilder, etran);
+          var ifCmd = new Bpl.IfCmd(e.Origin, typeAntecedent, wellFormednessBuilder.Collect(e.Origin), null, null);
+          builder.Add(ifCmd);
+
+          var bounds = lhsVars.ConvertAll(_ => (BoundedPool)new SpecialAllocIndependenceAllocatedBoundedPool());  // indicate "no alloc" (is this what we want?)
+          GenerateAndCheckGuesses(e.Origin, lhsVars, bounds, e.RHSs[0], TrTrigger(etran, e.Attributes, e.Origin), builder, etran);
+        }
+        // assume typeAntecedent(b);
+        builder.Add(TrAssumeCmd(e.Origin, typeAntecedent));
+        // assume RHS(b);
+        builder.Add(TrAssumeCmd(e.Origin, etran.TrExpr(rhs)));
+        var letBody = Substitute(e.Body, null, substMap);
+        CheckWellformed(letBody, wfOptions, locals, builder, etran);
+        if (e.Constraint_Bounds != null) {
+          var substMap2 = SetupBoundVarsAsLocals(lhsVars, builder, locals, etran);
+          var nonGhostMapPrime = new Dictionary<IVariable, Expression>();
+          foreach (BoundVar bv in lhsVars) {
+            nonGhostMapPrime.Add(bv, bv.IsGhost ? substMap[bv] : substMap2[bv]);
+          }
+          var rhsPrime = Substitute(e.RHSs[0], null, nonGhostMapPrime);
+          var letBodyPrime = Substitute(e.Body, null, nonGhostMapPrime);
+          builder.Add(TrAssumeCmd(e.Origin, etran.CanCallAssumption(rhsPrime)));
+          builder.Add(TrAssumeCmdWithDependencies(etran, e.Origin, rhsPrime, "assign-such-that constraint"));
+          builder.Add(TrAssumeCmd(e.Origin, etran.CanCallAssumption(letBodyPrime)));
+          var eq = Expression.CreateEq(letBody, letBodyPrime, e.Body.Type);
+          builder.Add(Assert(GetToken(e), etran.TrExpr(eq),
+            new LetSuchThatUnique(e.RHSs[0], e.BoundVars.ToList()), builder.Context));
+        }
+        // assume $let$canCall(g);
+        etran.LetDesugaring(e);  // call LetDesugaring to prepare the desugaring and populate letSuchThatExprInfo with something for e
+        var info = letSuchThatExprInfo[e];
+        builder.Add(new Bpl.AssumeCmd(e.Origin, info.CanCallFunctionCall(this, etran)));
+        // If we are supposed to assume "result" to equal this expression, then use the body of the let-such-that, not the generated $let#... function
+        addResultCommands?.Invoke(builder, letBody);
+      }
+    }
+
+    void CheckFrameWellFormed(WFOptions wfo, List<FrameExpression> fes, Variables locals, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+      Contract.Requires(fes != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+      foreach (var fe in fes) {
+        CheckWellformed(fe.E, wfo, locals, builder, etran);
+        if (fe.Field != null && fe.E.Type.IsRefType) {
+          builder.Add(Assert(fe.Origin, Bpl.Expr.Neq(etran.TrExpr(fe.E), Predef.Null), new FrameDereferenceNonNull(fe.E), builder.Context));
+        }
+      }
+    }
+
+
+    /// <summary>
+    /// Check that all indices are in the domain of the given function.  That is, for an array ("forArray"):
+    ///     assert (forall i0,i1,i2,... :: 0 <= i0 < dims[0] && ... ==> init.requires(i0,i1,i2,...));
+    /// and for a sequence ("!forArray"):
+    ///     assert (forall i0 :: 0 <= i0 < dims[0] && ... ==> init.requires(i0));
+    /// </summary>
+    private void CheckElementInit(IOrigin tok, bool forArray, List<Expression> dims, Type elementType, Expression init,
+      Bpl.IdentifierExpr/*?*/ nw, BoogieStmtListBuilder builder, ExpressionTranslator etran, WFOptions options) {
+      Contract.Requires(tok != null);
+      Contract.Requires(dims != null && dims.Count != 0);
+      Contract.Requires(elementType != null);
+      Contract.Requires(init != null);
+      Contract.Requires(!forArray || nw != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+
+      Bpl.Expr ante = Bpl.Expr.True;
+      var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator(forArray ? "arrayinit#" : "seqinit#");
+      var bvs = new List<Bpl.Variable>();
+      var indices = new List<Bpl.Expr>();
+      for (var i = 0; i < dims.Count; i++) {
+        var nm = varNameGen.FreshId(string.Format("#i{0}#", i));
+        var bv = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, nm, Bpl.Type.Int));
+        bvs.Add(bv);
+        var ie = new Bpl.IdentifierExpr(tok, bv);
+        indices.Add(ie);
+        ante = BplAnd(ante, BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(0), ie), Bpl.Expr.Lt(ie, etran.TrExpr(dims[i]))));
+      }
+
+      var sourceType = init.Type.AsArrowType;
+      Contract.Assert(sourceType.Args.Count == dims.Count);
+      var args = Concat(
+        Map(Enumerable.Range(0, dims.Count), ii => TypeToTy(sourceType.Args[ii])),
+        Cons(TypeToTy(sourceType.Result),
+          Cons(etran.HeapExpr,
+            Cons(etran.TrExpr(init),
+              indices.ConvertAll(idx => (Bpl.Expr)FunctionCall(tok, BuiltinFunction.Box, null, idx))))));
+      // check precond
+      var pre = FunctionCall(tok, Requires(dims.Count), Bpl.Type.Bool, args);
+      var q = new Bpl.ForallExpr(tok, bvs, BplImp(ante, pre));
+      var indicesDesc = new IndicesInDomain(forArray ? "array" : "sequence", dims, init);
+      builder.Add(AssertAndForget(builder.Context, tok, q, indicesDesc));
+      if (!forArray && options.DoReadsChecks) {
+        // unwrap renamed local lambdas
+        var unwrappedFunc = init;
+        while (unwrappedFunc is ConcreteSyntaxExpression { ResolvedExpression: not null } cse) {
+          unwrappedFunc = cse.ResolvedExpression;
+        }
+        if (unwrappedFunc is IdentifierExpr { Origin: var origin, DafnyName: var dafnyName }) {
+          unwrappedFunc = new IdentifierExpr(origin, dafnyName);
+        }
+        // check read effects
+        Type objset = program.SystemModuleManager.ObjectSetType();
+        Expression wrap = new BoogieWrapper(
+          FunctionCall(tok, Reads(1), TrType(objset), args),
+          objset);
+        var reads = new FrameExpression(tok, wrap, null);
+        Action<IOrigin, Bpl.Expr, ProofObligationDescription, Bpl.QKeyValue> maker = (t, e, d, qk) => {
+          var qe = new Bpl.ForallExpr(t, bvs, BplImp(ante, e));
+          options.AssertSink(this, builder)(t, qe, d, qk);
+        };
+
+        Utils.MakeQuantifierVarsForDims(dims, out var indexVars, out var indexVarExprs, out var indicesRange);
+        var readsCall = new ApplyExpr(
+          Token.NoToken,
+          new ExprDotName(Token.NoToken, unwrappedFunc, new Name("reads"), null),
+          indexVarExprs,
+          Token.NoToken
+        );
+        readsCall.Type = objset;
+        var contextReads = GetContextReadsFrames();
+        var readsDescExpr = new ForallExpr(
+          Token.NoToken,
+          indexVars,
+          indicesRange,
+          Utils.MakeDafnyFrameCheck(contextReads, readsCall, null),
+          null
+        );
+        var readsDesc = new ReadFrameSubset("invoke the function passed as an argument to the sequence constructor", readsDescExpr);
+        CheckFrameSubset(tok, new List<FrameExpression> { reads }, null, null,
+          etran, etran.ReadsFrame(tok), maker, (ta, qa) => builder.Add(new Bpl.AssumeCmd(ta, qa)), readsDesc, options.AssertKv);
+      }
+      // Check that the values coming out of the function satisfy any appropriate subset-type constraints
+      var apply = UnboxUnlessInherentlyBoxed(FunctionCall(tok, Apply(dims.Count), TrType(elementType), args), elementType);
+
+      CheckElementInitReturnSubrangeCheck(dims, init, out var dafnySource, out var checkContext);
+      var cre = GetSubrangeCheck(apply.tok, apply, sourceType.Result, elementType, dafnySource, checkContext, out var subrangeDesc);
+      if (cre != null) {
+        // assert (forall i0,i1,i2,... ::
+        //            0 <= i0 < ... && ... ==> init.requires(i0,i1,i2,...) is Subtype);
+        q = new Bpl.ForallExpr(tok, bvs, BplImp(ante, cre));
+        builder.Add(AssertAndForget(builder.Context, init.Origin, q, subrangeDesc));
+      }
+
+      if (forArray) {
+        // Assume that array elements have initial values according to the given initialization function.  That is:
+        // assume (forall i0,i1,i2,... :: { nw[i0,i1,i2,...] }
+        //            0 <= i0 < ... && ... ==>
+        //                CanCallAssumptions[[ init(i0,i1,i2,...) ]] &&
+        //                nw[i0,i1,i2,...] == init.requires(i0,i1,i2,...));
+        var dafnyInitApplication = new ApplyExpr(tok, init,
+          bvs.ConvertAll(indexBv => (Expression)new BoogieWrapper(new Bpl.IdentifierExpr(indexBv.tok, indexBv), Type.Int)).ToList(),
+          Token.NoToken) {
+          Type = sourceType.Result
+        };
+        var canCall = etran.CanCallAssumption(dafnyInitApplication);
+
+        var ai = ReadHeap(tok, etran.HeapExpr, nw, GetArrayIndexFieldName(tok, indices));
+        var ai_prime = UnboxUnlessBoxType(tok, ai, elementType);
+        var tr = new Bpl.Trigger(tok, true, new List<Bpl.Expr> { ai });
+        q = new Bpl.ForallExpr(tok, bvs, tr, BplImp(ante, BplAnd(canCall, Bpl.Expr.Eq(ai_prime, apply))));
+        builder.Add(new Bpl.AssumeCmd(tok, q));
+      }
+    }
+
+    private static void CheckElementInitReturnSubrangeCheck(List<Expression> dims, Expression init, out Expression dafnySource, out SubrangeCheckContext checkContext) {
+      var quantifiedVars =
+        Enumerable.Range(0, dims.Count)
+          .Select(i => {
+            var name = $"i{i}";
+            var ident = new IdentifierExpr(Token.NoToken, name);
+            var range = new BinaryExpr(
+              Token.NoToken,
+              BinaryExpr.Opcode.And,
+              new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Le, new LiteralExpr(Token.NoToken, 0), ident),
+              new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Lt, ident, dims[i])
+            );
+            return new QuantifiedVar(Token.NoToken, $"i{i}", Type.Int, null, range);
+          })
+          .ToList();
+      dafnySource = new ApplyExpr(
+        Token.NoToken,
+        init,
+        quantifiedVars
+          .Select(ident => new IdentifierExpr(ident.Origin, ident) as Expression)
+          .ToList(),
+        Token.NoToken
+      );
+      QuantifiedVar.ExtractSingleRange(quantifiedVars, out var boundVars, out var singleRange);
+      checkContext = check => new ForallExpr(Token.NoToken, boundVars, singleRange, check, null);
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.Extremes.cs b/Source/DafnyCore/Verifier/BoogieGenerator.Extremes.cs
new file mode 100644
index 00000000000..421f6361429
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.Extremes.cs
@@ -0,0 +1,329 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Reflection;
+using System.Security.Cryptography;
+using Bpl = Microsoft.Boogie;
+using BplParser = Microsoft.Boogie.Parser;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using Core;
+using DafnyCore.Verifier;
+using Microsoft.BaseTypes;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Dafny.Triggers;
+using Action = System.Action;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+using static Microsoft.Dafny.GenericErrors;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+
+
+  /// <summary>
+  /// In the following,
+  /// if "pp" is a greatest predicate, then QQQ and NNN and HHH and EEE stand for "forall" and "" and "==>" and REVERSE-IMPLIES, and
+  /// if "pp" is a least predicate, then QQQ and NNN and HHH and EEE stand for "exists" and "!" and "&&" and "==>".
+  /// ==========  For co-predicates:
+  /// Add the axioms:
+  ///   forall args :: P(args) ==> QQQ k: nat :: P#[k](args)
+  ///   forall args :: (QQQ k: nat :: P#[k](args)) ==> P(args)
+  ///   forall args,k :: k == 0 ==> NNN P#[k](args)
+  /// where "args" is "heap, formals".  In more details:
+  ///   forall args :: { P(args) } args-have-appropriate-values && P(args) ==> QQQ k { P#[k](args) } :: 0 ATMOST k HHH P#[k](args)
+  ///   forall args :: { P(args) } args-have-appropriate-values && (QQQ k :: 0 ATMOST k HHH P#[k](args)) ==> P(args)
+  ///   forall args,k :: args-have-appropriate-values && k == 0 ==> NNN P#0#[k](args)
+  ///   forall args,k,m :: args-have-appropriate-values && 0 ATMOST k LESS m ==> (P#[k](args) EEE P#[m](args))  (*)
+  /// There is also a specialized version of (*) for least predicates.
+  /// </summary>
+  void AddPrefixPredicateAxioms(PrefixPredicate pp) {
+    Contract.Requires(pp != null);
+    Contract.Requires(Predef != null);
+    var co = pp.ExtremePred;
+    var tok = pp.Origin;
+    var etran = new ExpressionTranslator(this, Predef, tok, pp);
+
+    var tyvars = MkTyParamBinders(GetTypeParams(pp), out var tyexprs);
+
+    var bvs = new List<Variable>(tyvars);
+    var coArgs = new List<Bpl.Expr>(tyexprs);
+    var prefixArgs = new List<Bpl.Expr>(tyexprs);
+    var prefixArgsLimited = new List<Bpl.Expr>(tyexprs);
+    var prefixArgsLimitedM = new List<Bpl.Expr>(tyexprs);
+    if (pp.IsFuelAware()) {
+      var sV = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$ly", Predef.LayerType));
+      var s = new Bpl.IdentifierExpr(tok, sV);
+      var succS = FunctionCall(tok, BuiltinFunction.LayerSucc, null, s);
+      bvs.Add(sV);
+      coArgs.Add(succS);
+      prefixArgs.Add(succS);
+      prefixArgsLimited.Add(s);
+      prefixArgsLimitedM.Add(s);
+    }
+
+    Bpl.Expr h;
+    if (pp.ReadsHeap) {
+      var heapIdent = new Bpl.TypedIdent(tok, Predef.HeapVarName, Predef.HeapType);
+      var bv = new Bpl.BoundVariable(tok, heapIdent);
+      h = new Bpl.IdentifierExpr(tok, bv);
+      bvs.Add(bv);
+      coArgs.Add(h);
+      prefixArgs.Add(h);
+      prefixArgsLimited.Add(h);
+      prefixArgsLimitedM.Add(h);
+    } else {
+      h = null;
+    }
+
+    // ante:  $IsGoodHeap($Heap) && this != null && formals-have-the-expected-types &&
+    Bpl.Expr ante = h != null
+      ? FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, etran.HeapExpr)
+      : (Bpl.Expr)Bpl.Expr.True;
+
+    if (!pp.IsStatic) {
+      var bvThis = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, etran.This, TrReceiverType(pp)));
+      bvs.Add(bvThis);
+      var bvThisIdExpr = new Bpl.IdentifierExpr(tok, bvThis);
+      coArgs.Add(bvThisIdExpr);
+      prefixArgs.Add(bvThisIdExpr);
+      prefixArgsLimited.Add(bvThisIdExpr);
+      prefixArgsLimitedM.Add(bvThisIdExpr);
+      // add well-typedness conjunct to antecedent
+      Type thisType = ModuleResolver.GetReceiverType(tok, pp);
+      Bpl.Expr wh = BplAnd(
+        ReceiverNotNull(bvThisIdExpr),
+        GetWhereClause(tok, bvThisIdExpr, thisType, etran, NOALLOC));
+      ante = BplAnd(ante, wh);
+    }
+
+    Bpl.Expr kWhere = null, kId = null, mId = null;
+    Bpl.Variable k = null;
+    Bpl.Variable m = null;
+
+    // DR: Changed to add the pp formals instead of co (since types would otherwise be wrong)
+    //     Note that k is not added to bvs or coArgs.
+    foreach (var p in pp.Ins) {
+      bool is_k = p == pp.Ins[0];
+      var bv = new Bpl.BoundVariable(p.Origin,
+        new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(pp.IdGenerator), TrType(p.Type)));
+      var formal = new Bpl.IdentifierExpr(p.Origin, bv);
+      if (!is_k) {
+        coArgs.Add(formal);
+      }
+
+      prefixArgs.Add(formal);
+      prefixArgsLimited.Add(formal);
+      if (is_k) {
+        m = new Bpl.BoundVariable(p.Origin, new Bpl.TypedIdent(p.Origin, "_m", TrType(p.Type)));
+        mId = new Bpl.IdentifierExpr(m.tok, m);
+        prefixArgsLimitedM.Add(mId);
+      } else {
+        prefixArgsLimitedM.Add(formal);
+      }
+
+      var wh = GetWhereClause(p.Origin, formal, p.Type, etran, NOALLOC);
+      if (is_k) {
+        // add the formal _k
+        k = bv;
+        kId = formal;
+        kWhere = wh;
+      } else {
+        bvs.Add(bv);
+        if (wh != null) {
+          // add well-typedness conjunct to antecedent
+          ante = BplAnd(ante, wh);
+        }
+      }
+    }
+
+    Contract.Assert(k != null && m != null); // the loop should have filled these in
+
+    var funcID = new Bpl.IdentifierExpr(tok, co.FullSanitizedName, TrType(co.ResultType));
+    var coAppl = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), coArgs);
+    funcID = new Bpl.IdentifierExpr(tok, pp.FullSanitizedName, TrType(pp.ResultType));
+    var prefixAppl = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgs);
+
+    // forall args :: { P(args) } args-have-appropriate-values && P(args) ==> QQQ k { P#[k](args) } :: 0 ATMOST k HHH P#[k](args)
+    var tr = BplTrigger(prefixAppl);
+    var qqqK = pp.ExtremePred is GreatestPredicate
+      ? (Bpl.Expr)new Bpl.ForallExpr(tok, new List<Variable> { k }, tr,
+        kWhere == null ? prefixAppl : BplImp(kWhere, prefixAppl))
+      : (Bpl.Expr)new Bpl.ExistsExpr(tok, new List<Variable> { k }, tr,
+        kWhere == null ? prefixAppl : BplAnd(kWhere, prefixAppl));
+    tr = BplTriggerHeap(this, tok, coAppl, pp.ReadsHeap ? null : h);
+    var allS = new Bpl.ForallExpr(tok, bvs, tr, BplImp(BplAnd(ante, coAppl), qqqK));
+    sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, allS, "1st prefix predicate axiom for " + pp.FullSanitizedName));
+
+    // forall args :: { P(args) } args-have-appropriate-values && (QQQ k :: 0 ATMOST k HHH P#[k](args)) ==> P(args)
+    allS = new Bpl.ForallExpr(tok, bvs, tr, BplImp(BplAnd(ante, qqqK), coAppl));
+    sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, allS, "2nd prefix predicate axiom"));
+
+    // forall args,k :: args-have-appropriate-values && k == 0 ==> NNN P#0#[k](args)
+    var moreBvs = new List<Variable>();
+    moreBvs.AddRange(bvs);
+    moreBvs.Add(k);
+    var z = Bpl.Expr.Eq(kId,
+      pp.Ins[0].Type.IsBigOrdinalType
+        ? (Bpl.Expr)FunctionCall(tok, "ORD#FromNat", Predef.BigOrdinalType, Bpl.Expr.Literal(0))
+        : Bpl.Expr.Literal(0));
+    funcID = new Bpl.IdentifierExpr(tok, pp.FullSanitizedName, TrType(pp.ResultType));
+    Bpl.Expr prefixLimitedBody = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgsLimited);
+    Bpl.Expr prefixLimited = pp.ExtremePred is LeastPredicate ? Bpl.Expr.Not(prefixLimitedBody) : prefixLimitedBody;
+
+    var trigger = BplTriggerHeap(this, prefixLimitedBody.tok, prefixLimitedBody, pp.ReadsHeap ? null : h);
+    var trueAtZero = new Bpl.ForallExpr(tok, moreBvs, trigger, BplImp(BplAnd(ante, z), prefixLimited));
+    sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, trueAtZero, "3rd prefix predicate axiom"));
+
+#if WILLING_TO_TAKE_THE_PERFORMANCE_HIT
+      // forall args,k,m :: args-have-appropriate-values && 0 <= k <= m ==> (P#[k](args) EEE P#[m](args))
+      moreBvs = new List<Variable>();
+      moreBvs.AddRange(bvs);
+      moreBvs.Add(k);
+      moreBvs.Add(m);
+      Bpl.Expr smaller;
+      if (kId.Type.IsInt) {
+        smaller = BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(0), kId), Bpl.Expr.Lt(kId, mId));
+      } else {
+        smaller = FunctionCall(tok, "ORD#Less", Bpl.Type.Bool, kId, mId);
+      }
+      funcID = new Bpl.IdentifierExpr(tok, pp.FullSanitizedName, TrType(pp.ResultType));
+      var prefixPred_K = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgsLimited);
+      var prefixPred_M = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgsLimitedM);
+      var direction =
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      pp.ExtremePred is LeastPredicate ? BplImp(prefixPred_K, prefixPred_M) : BplImp(prefixPred_M, prefixPred_K);
+
+      var trigger2 = new Bpl.Trigger(tok, true, new List<Bpl.Expr> { prefixPred_K, prefixPred_M });
+      var monotonicity = new Bpl.ForallExpr(tok, moreBvs, trigger2, BplImp(smaller, direction));
+      AddRootAxiom(new Bpl.Axiom(tok, monotonicity, "prefix predicate monotonicity axiom"));
+#endif
+    // A more targeted monotonicity axiom used to increase the power of automation for proving the limit case for
+    // least predicates that have more than one focal-predicate term.
+    if (pp.ExtremePred is LeastPredicate && pp.Ins[0].Type.IsBigOrdinalType) {
+      // forall args,k,m,limit ::
+      //   { P#[k](args), ORD#LessThanLimit(k,limit), ORD#LessThanLimit(m,limit) }
+      //   args-have-appropriate-values && k < m && P#[k](args) ==> P#[m](args))
+      var limit = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "_limit", TrType(Type.BigOrdinal)));
+      var limitId = new Bpl.IdentifierExpr(limit.tok, limit);
+      moreBvs = new List<Variable>();
+      moreBvs.AddRange(bvs);
+      moreBvs.Add(k);
+      moreBvs.Add(m);
+      moreBvs.Add(limit);
+      var kLessLimit = FunctionCall(tok, "ORD#LessThanLimit", Bpl.Type.Bool, kId, limitId);
+      var mLessLimit = FunctionCall(tok, "ORD#LessThanLimit", Bpl.Type.Bool, mId, limitId);
+      var kLessM = FunctionCall(tok, "ORD#Less", Bpl.Type.Bool, kId, mId);
+      funcID = new Bpl.IdentifierExpr(tok, pp.FullSanitizedName, TrType(pp.ResultType));
+      var prefixPred_K = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgsLimited);
+      var prefixPred_M = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgsLimitedM);
+      var direction = BplImp(prefixPred_K, prefixPred_M);
+
+      var trigger3 = new Bpl.Trigger(tok, true, new List<Bpl.Expr> { prefixPred_K, kLessLimit, mLessLimit });
+      var monotonicity = new Bpl.ForallExpr(tok, moreBvs, trigger3, BplImp(kLessM, direction));
+      sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, monotonicity, "targeted prefix predicate monotonicity axiom"));
+    }
+  }
+
+  /// <summary>
+  /// For an extreme predicate P, "pp" is the prefix predicate for P (such that P = pp.ExtremePred) and
+  /// "body" is the body of P.  Return what would be the body of the prefix predicate pp.
+  /// In particular, return
+  /// #if _k has type nat:
+  ///   0 LESS _k  IMPLIES  body'                        // for greatest predicates
+  ///   0 LESS _k  AND  body'                            // for least predicates
+  /// #elsif _k has type ORDINAL:
+  ///   (0 LESS ORD#Offset(_k)  IMPLIES  body') AND
+  ///   (0 == ORD#Offset(_k) IMPLIES forall _k':ORDINAL :: _k' LESS _k ==> pp(_k', args))  // for greatest predicates
+  ///   (0 == ORD#Offset(_k) IMPLIES exists _k':ORDINAL :: _k' LESS _k && pp(_k', args))   // for least predicates
+  /// #endif
+  /// where body' is body with the formals of P replaced by the corresponding
+  /// formals of pp and with self-calls P(s) replaced by recursive calls to
+  /// pp(_k - 1, s).
+  /// </summary>
+  Expression PrefixSubstitution(PrefixPredicate pp, Expression body) {
+    Contract.Requires(pp != null);
+
+    var typeMap = Util.Dict<TypeParameter, Type>(pp.ExtremePred.TypeArgs, Map(pp.TypeArgs, x => new UserDefinedType(x)));
+
+    var paramMap = new Dictionary<IVariable, Expression>();
+    for (int i = 0; i < pp.ExtremePred.Ins.Count; i++) {
+      var replacement = pp.Ins[i + 1];  // the +1 is to skip pp's _k parameter
+      var param = new IdentifierExpr(replacement.Origin, replacement.Name);
+      param.Var = replacement;  // resolve here
+      param.Type = replacement.Type;  // resolve here
+      paramMap.Add(pp.ExtremePred.Ins[i], param);
+    }
+
+    var k = new IdentifierExpr(pp.Origin, pp.K.Name);
+    k.Var = pp.K;  // resolve here
+    k.Type = pp.K.Type;  // resolve here
+    Expression kMinusOne = Expression.CreateSubtract(k, Expression.CreateNatLiteral(pp.Origin, 1, pp.K.Type));
+
+    var s = new PrefixCallSubstituter(null, paramMap, typeMap, pp.ExtremePred, kMinusOne);
+    body = s.Substitute(body);
+
+    if (pp.K.Type.IsBigOrdinalType) {
+      // 0 < k.Offset
+      Contract.Assume(program.SystemModuleManager.ORDINAL_Offset != null);  // should have been filled in by the resolver
+      var kOffset = new MemberSelectExpr(pp.Origin, k, program.SystemModuleManager.ORDINAL_Offset);
+      var kIsPositive = Expression.CreateLess(Expression.CreateIntLiteral(pp.Origin, 0), kOffset);
+      var kIsLimit = Expression.CreateEq(Expression.CreateIntLiteral(pp.Origin, 0), kOffset, Type.Int);
+      var kprimeVar = new BoundVar(pp.Origin, "_k'", Type.BigOrdinal);
+      var kprime = new IdentifierExpr(pp.Origin, kprimeVar);
+
+      var substMap = new Dictionary<IVariable, Expression>();
+      substMap.Add(pp.K, kprime);
+      Expression recursiveCallReceiver;
+      List<Expression> recursiveCallArgs;
+      pp.RecursiveCallParameters(pp.Origin, pp.TypeArgs, pp.Ins, null, substMap, out recursiveCallReceiver, out recursiveCallArgs);
+      var ppCall = new FunctionCallExpr(pp.Origin, pp.NameNode, recursiveCallReceiver, pp.Origin, Token.NoToken, recursiveCallArgs);
+      ppCall.Function = pp;
+      ppCall.Type = Type.Bool;
+      ppCall.TypeApplication_AtEnclosingClass = pp.EnclosingClass.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
+      ppCall.TypeApplication_JustFunction = pp.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
+
+      Attributes triggerAttr = new Attributes("trigger", new List<Expression> { ppCall }, null);
+      Expression limitCalls;
+      if (pp.ExtremePred is GreatestPredicate) {
+        // forall k':ORDINAL | _k' LESS _k :: pp(_k', args)
+        var smaller = Expression.CreateLess(kprime, k);
+        limitCalls = new ForallExpr(pp.Origin, new List<BoundVar> { kprimeVar }, smaller, ppCall, triggerAttr) {
+          Type = Type.Bool,
+          Bounds = new List<BoundedPool>() { new AllocFreeBoundedPool(kprimeVar.Type) }
+        };
+      } else {
+        // exists k':ORDINAL | _k' LESS _k :: pp(_k', args)
+        // Here, instead of using the usual ORD#Less, we use the semantically equivalent ORD#LessThanLimit, because this
+        // allows us to write a good trigger for a targeted monotonicity axiom.  That axiom, in turn, makes the
+        // automatic verification more powerful for least lemmas that have more than one focal-predicate term.
+        var smaller = new BinaryExpr(kprime.Origin, BinaryExpr.Opcode.Lt, kprime, k) {
+          ResolvedOp = BinaryExpr.ResolvedOpcode.LessThanLimit,
+          Type = Type.Bool
+        };
+        limitCalls = new ExistsExpr(pp.Origin, new List<BoundVar> { kprimeVar }, smaller, ppCall, triggerAttr) {
+          Type = Type.Bool,
+          Bounds = new List<BoundedPool>() { new AllocFreeBoundedPool(kprimeVar.Type) }
+        };
+      }
+      var a = Expression.CreateImplies(kIsPositive, body);
+      var b = Expression.CreateImplies(kIsLimit, limitCalls);
+      return Expression.CreateAnd(a, b);
+    } else {
+      // 0 < k
+      var kIsPositive = Expression.CreateLess(Expression.CreateIntLiteral(pp.Origin, 0), k);
+      if (pp.ExtremePred is GreatestPredicate) {
+        // add antecedent "0 < _k ==>"
+        return Expression.CreateImplies(kIsPositive, body);
+      } else {
+        // add initial conjunct "0 < _k &&"
+        return Expression.CreateAnd(kIsPositive, body);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.Fields.cs b/Source/DafnyCore/Verifier/BoogieGenerator.Fields.cs
new file mode 100644
index 00000000000..d6dfd1aa735
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.Fields.cs
@@ -0,0 +1,234 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using System.Text;
+using Microsoft.Boogie;
+using Bpl = Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny {
+  public partial class BoogieGenerator {
+
+
+
+    Bpl.Constant GetField(Field f) {
+      Contract.Requires(f != null && f.IsMutable);
+      Contract.Requires(sink != null && Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.Constant>() != null);
+
+      Contract.Assert(VisibleInScope(f));
+
+      Bpl.Constant fc;
+      if (fields.TryGetValue(f, out fc)) {
+        Contract.Assert(fc != null);
+      } else {
+        // const f: Field ty;
+        Bpl.Type ty = Predef.FieldName(f.Origin);
+        fc = new Bpl.Constant(f.Origin, new Bpl.TypedIdent(f.Origin, f.FullSanitizedName, ty), false);
+        fields.Add(f, fc);
+        // axiom FDim(f) == 0 && FieldOfDecl(C, name) == f &&
+        //       $IsGhostField(f);    // if the field is a ghost field
+        // OR:
+        //       !$IsGhostField(f);    // if the field is not a ghost field
+        Bpl.Expr fdim = Bpl.Expr.Eq(FunctionCall(f.Origin, BuiltinFunction.FDim, ty, Bpl.Expr.Ident(fc)), Bpl.Expr.Literal(0));
+        Bpl.Expr declType = Bpl.Expr.Eq(FunctionCall(f.Origin, BuiltinFunction.FieldOfDecl, ty, new Bpl.IdentifierExpr(f.Origin, GetClass(cce.NonNull(f.EnclosingClass))), new Bpl.IdentifierExpr(f.Origin, GetFieldNameFamily(f.Name))), Bpl.Expr.Ident(fc));
+        Bpl.Expr cond = BplAnd(fdim, declType);
+        var ig = FunctionCall(f.Origin, BuiltinFunction.IsGhostField, ty, Bpl.Expr.Ident(fc));
+        cond = BplAnd(cond, f.IsGhost ? ig : Bpl.Expr.Not(ig));
+        Bpl.Axiom ax = new Bpl.Axiom(f.Origin, cond);
+        AddOtherDefinition(fc, ax);
+      }
+      return fc;
+    }
+
+
+    Bpl.Function GetReadonlyField(Field f) {
+      Contract.Requires(f != null && !f.IsMutable);
+      Contract.Requires(sink != null && Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.Function>() != null);
+
+      Contract.Assert(VisibleInScope(f));
+
+      Bpl.Function ff;
+      if (fieldFunctions.TryGetValue(f, out ff)) {
+        Contract.Assert(ff != null);
+      } else {
+        // Here are some built-in functions defined in "predef" (so there's no need to cache them in "fieldFunctions")
+        if (f.EnclosingClass is ArrayClassDecl && f.Name == "Length") {
+          return Predef.ArrayLength;
+        } else if (f.EnclosingClass is ValuetypeDecl { Name: "real" } && f.Name == "Floor") {
+          return Predef.RealFloor;
+        } else if (f is SpecialField && !(f is DatatypeDestructor || f.EnclosingClass is TopLevelDeclWithMembers and not ValuetypeDecl)) {
+          if (f.Name is "Keys" or "Values" or "Items") {
+            var fType = f.Type.NormalizeExpand();
+            Contract.Assert(fType is SetType);
+            var setType = (SetType)fType;
+            return f.Name switch {
+              "Keys" => setType.Finite ? Predef.MapDomain : Predef.IMapDomain,
+              "Values" => setType.Finite ? Predef.MapValues : Predef.IMapValues,
+              _ => setType.Finite ? Predef.MapItems : Predef.IMapItems
+            };
+          }
+          if (f.Name == "IsLimit") {
+            return Predef.ORDINAL_IsLimit;
+          } else if (f.Name == "IsSucc") {
+            return Predef.ORDINAL_IsSucc;
+          } else if (f.Name == "Offset") {
+            return Predef.ORDINAL_Offset;
+          } else if (f.Name == "IsNat") {
+            return Predef.ORDINAL_IsNat;
+          }
+        } else if (f.FullSanitizedName == "_System.Tuple2._0") {
+          return Predef.Tuple2Destructors0;
+        } else if (f.FullSanitizedName == "_System.Tuple2._1") {
+          return Predef.Tuple2Destructors1;
+        }
+
+        // Create a new function
+        // function f(Ref): ty;
+        List<Variable> formals = new List<Variable>();
+        if (f is ConstantField) {
+          formals.AddRange(MkTyParamFormals(GetTypeParams(f.EnclosingClass), false));
+        }
+        if (!f.IsStatic) {
+          var udt = UserDefinedType.FromTopLevelDecl(f.Origin, f.EnclosingClass);
+          Bpl.Type receiverType = TrType(udt);
+          formals.Add(new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, f is ConstantField ? "this" : Bpl.TypedIdent.NoName, receiverType), true));
+        }
+        Bpl.Formal result = new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, Bpl.TypedIdent.NoName, TrType(f.Type)), false);
+        ff = new Bpl.Function(f.Origin, f.FullSanitizedName, new List<TypeVariable>(), formals, result, null, null);
+
+        if (InsertChecksums) {
+          var dt = f.EnclosingClass as DatatypeDecl;
+          if (dt != null) {
+            InsertChecksum(dt, ff);
+          }
+          // TODO(wuestholz): Do we need to handle more cases?
+        }
+
+        // add the newly created function to the cache, so that there will only be one copy of it
+        fieldFunctions.Add(f, ff);
+
+        // declare function among Boogie top-level declarations, if needed, and treat certain fields specially
+        if (f is ConstantField) {
+          // declare the function with its initial value, if any
+          // function QQ():int { 3 }
+          var cf = (ConstantField)f;
+          if (cf.Rhs != null && RevealedInScope(cf)) {
+            var etran = new ExpressionTranslator(this, Predef, NewOneHeapExpr(f.Origin), null);
+            if (!IsOpaque(cf, options)) {
+              var definitionAxiom = ff.CreateDefinitionAxiom(etran.TrExpr(cf.Rhs));
+              definitionAxiom.CanHide = true;
+              sink.AddTopLevelDeclaration(definitionAxiom);
+            }
+          }
+          sink.AddTopLevelDeclaration(ff);
+
+        } else if (f.EnclosingClass is ArrayClassDecl) {
+          // add non-negative-range axioms for array Length fields
+          // axiom (forall o: Ref :: 0 <= array.Length(o));
+          Bpl.BoundVariable oVar = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "o", Predef.RefType));
+          Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(f.Origin, oVar);
+          var rhs = new Bpl.NAryExpr(f.Origin, new Bpl.FunctionCall(ff), new List<Bpl.Expr> { o });
+          Bpl.Expr body = Bpl.Expr.Le(Bpl.Expr.Literal(0), rhs);
+          var trigger = BplTrigger(rhs);
+          Bpl.Expr qq = new Bpl.ForallExpr(f.Origin, new List<Variable> { oVar }, trigger, body);
+          sink.AddTopLevelDeclaration(new Bpl.Axiom(f.Origin, qq));
+        }
+      }
+      return ff;
+    }
+
+    Bpl.Expr GetField(MemberSelectExpr fse) {
+      Contract.Requires(fse != null);
+      Contract.Requires(fse.Member != null && fse.Member is Field && ((Field)(fse.Member)).IsMutable);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      return new Bpl.IdentifierExpr(fse.Origin, GetField((Field)fse.Member));
+    }
+
+    void AddWellformednessCheck(ConstantField decl) {
+      Contract.Requires(decl != null);
+      Contract.Requires(sink != null && Predef != null);
+      Contract.Requires(currentModule == null && codeContext == null && IsAllocContext == null && fuelContext == null);
+      Contract.Ensures(currentModule == null && codeContext == null && IsAllocContext == null && fuelContext == null);
+
+      proofDependencies.SetCurrentDefinition(MethodVerboseName(decl.FullDafnyName, MethodTranslationKind.SpecWellformedness), null);
+      if (!InVerificationScope(decl)) {
+        // Checked in other file
+        return;
+      }
+
+      // If there's no RHS, there's nothing to do
+      if (decl.Rhs == null) {
+        return;
+      }
+
+      currentModule = decl.EnclosingModule;
+      codeContext = decl;
+      fuelContext = FuelSetting.NewFuelContext(decl);
+      var etran = new ExpressionTranslator(this, Predef, decl.Origin, null);
+
+      // parameters of the procedure
+      List<Variable> inParams = MkTyParamFormals(GetTypeParams(decl.EnclosingClass), true);
+      if (!decl.IsStatic) {
+        var receiverType = ModuleResolver.GetThisType(decl.Origin, (TopLevelDeclWithMembers)decl.EnclosingClass);
+        Contract.Assert(VisibleInScope(receiverType));
+
+        var th = new Bpl.IdentifierExpr(decl.Origin, "this", TrReceiverType(decl));
+        var wh = BplAnd(
+          ReceiverNotNull(th),
+          etran.GoodRef(decl.Origin, th, receiverType));
+        // for class constructors, the receiver is encoded as an output parameter
+        var thVar = new Bpl.Formal(decl.Origin, new Bpl.TypedIdent(decl.Origin, "this", TrReceiverType(decl), wh), true);
+        inParams.Add(thVar);
+      }
+
+      // the procedure itself
+      var req = new List<Bpl.Requires>();
+      foreach (var typeBoundAxiom in TypeBoundAxioms(decl.Origin, decl.EnclosingClass.TypeArgs)) {
+        req.Add(FreeRequires(decl.Origin, typeBoundAxiom, null));
+      }
+
+      var heapVar = new Bpl.IdentifierExpr(decl.Origin, "$Heap", false);
+      var varlist = new List<Bpl.IdentifierExpr> { heapVar };
+      var name = MethodName(decl, MethodTranslationKind.SpecWellformedness);
+      var proc = new Bpl.Procedure(decl.Origin, name, new List<Bpl.TypeVariable>(),
+        inParams, new List<Variable>(),
+        false, req, varlist, new List<Bpl.Ensures>(), etran.TrAttributes(decl.Attributes, null));
+      AddVerboseNameAttribute(proc, decl.FullDafnyName, MethodTranslationKind.SpecWellformedness);
+      sink.AddTopLevelDeclaration(proc);
+
+      var implInParams = Bpl.Formal.StripWhereClauses(inParams);
+      var locals = new Variables();
+      var builder = new BoogieStmtListBuilder(this, options, new BodyTranslationContext(false));
+      builder.Add(new CommentCmd($"AddWellformednessCheck for {decl.WhatKind} {decl}"));
+      builder.AddCaptureState(decl.Origin, false, "initial state");
+      IsAllocContext = new IsAllocContext(options, true);
+
+      DefineFrame(decl.Origin, etran.ReadsFrame(decl.Origin), new List<FrameExpression>(), builder, locals, null);
+
+      // check well-formedness of the RHS expression
+      CheckWellformed(decl.Rhs, new WFOptions(null, true), locals, builder, etran);
+      builder.Add(new Bpl.AssumeCmd(decl.Rhs.Origin, etran.CanCallAssumption(decl.Rhs)));
+      CheckSubrange(decl.Rhs.Origin, etran.TrExpr(decl.Rhs), decl.Rhs.Type, decl.Type, decl.Rhs, builder);
+
+      if (EmitImplementation(decl.Attributes)) {
+        // emit the impl only when there are proof obligations.
+        QKeyValue kv = etran.TrAttributes(decl.Attributes, null);
+        var implBody = builder.Collect(decl.Origin);
+
+        AddImplementationWithAttributes(GetToken(decl), proc, implInParams,
+          new List<Variable>(), locals, implBody, kv);
+      }
+
+      Contract.Assert(currentModule == decl.EnclosingModule);
+      Contract.Assert(codeContext == decl);
+      IsAllocContext = null;
+      fuelContext = null;
+      Reset();
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.Functions.Wellformedness.cs b/Source/DafnyCore/Verifier/BoogieGenerator.Functions.Wellformedness.cs
new file mode 100644
index 00000000000..4af18d4ff47
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.Functions.Wellformedness.cs
@@ -0,0 +1,404 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using Bpl = Microsoft.Boogie;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+  class FunctionWellformednessChecker {
+    private readonly BoogieGenerator generator;
+
+    public FunctionWellformednessChecker(BoogieGenerator generator) {
+      this.generator = generator;
+    }
+
+    public void Check(Function f) {
+
+      Contract.Assert(generator.InVerificationScope(f));
+
+      generator.proofDependencies.SetCurrentDefinition(MethodVerboseName(f.FullDafnyName,
+        MethodTranslationKind.SpecWellformedness), f);
+      generator.currentModule = f.EnclosingClass.EnclosingModuleDefinition;
+      generator.codeContext = f;
+
+      ExpressionTranslator ordinaryEtran = new ExpressionTranslator(generator, generator.Predef, f.Origin, f);
+      var etran = GetExpressionTranslator(f, ordinaryEtran, out var additionalRequires, out var heapParameters);
+
+      // parameters of the procedure
+      var typeInParams = generator.MkTyParamFormals(GetTypeParams(f), true);
+      var procedureParameters = GetParameters(f, etran);
+      var outParams = GetWellformednessProcedureOutParameters(f, etran);
+      var requires = GetWellformednessProcedureRequires(f, etran);
+      requires.AddRange(additionalRequires);
+
+      // modifies $Heap
+      var mod = new List<Bpl.IdentifierExpr> {
+        ordinaryEtran.HeapCastToIdentifierExpr,
+      };
+
+      var context = new BodyTranslationContext(f.ContainsHide);
+      var ens = new List<Bpl.Ensures>();
+      foreach (AttributedExpression ensures in ConjunctsOf(f.Ens)) {
+        var functionHeight = generator.currentModule.CallGraph.GetSCCRepresentativePredecessorCount(f);
+        var splits = new List<SplitExprInfo>();
+        bool splitHappened /*we actually don't care*/ = generator.TrSplitExpr(context, ensures.E, splits, true, functionHeight, true, etran);
+        var (errorMessage, successMessage) = generator.CustomErrorMessage(ensures.Attributes);
+        var canCalls = etran.CanCallAssumption(ensures.E, new CanCallOptions(true, f));
+        generator.AddEnsures(ens, generator.FreeEnsures(ensures.E.Origin, canCalls, null, true));
+        foreach (var s in splits) {
+          if (s.IsChecked && !s.Tok.IsInherited(generator.currentModule)) {
+            generator.AddEnsures(ens, generator.EnsuresWithDependencies(s.Tok, false, ensures.E, s.E, errorMessage, successMessage, null));
+          }
+        }
+      }
+
+      var selfCall = GetSelfCall(f, etran, procedureParameters);
+      // Enforce 'older' conditions
+      var (olderParameterCount, olderCondition) = generator.OlderCondition(f, selfCall, procedureParameters);
+      if (olderParameterCount != 0) {
+        generator.AddEnsures(ens, new Ensures(f.Origin, false, olderCondition, null) {
+          Description = new IsOlderProofObligation(olderParameterCount, f.Ins.Count + (f.IsStatic ? 0 : 1))
+        });
+      }
+
+      var proc = new Procedure(f.Origin, "CheckWellformed" + NameSeparator + f.FullSanitizedName,
+        new List<TypeVariable>(),
+        Concat(Concat(typeInParams, heapParameters), procedureParameters), outParams,
+        false, requires, mod, ens, etran.TrAttributes(f.Attributes, null));
+      AddVerboseNameAttribute(proc, f.FullDafnyName, MethodTranslationKind.SpecWellformedness);
+      generator.sink.AddTopLevelDeclaration(proc);
+
+      if (generator.InsertChecksums) {
+        generator.InsertChecksum(f, proc, true);
+      }
+
+      Contract.Assert(proc.InParams.Count == typeInParams.Count + heapParameters.Count + procedureParameters.Count);
+      // Changed the next line to strip from inParams instead of proc.InParams
+      // They should be the same, but hence the added contract
+      var locals = new Variables();
+      var builder = new BoogieStmtListBuilder(generator, generator.options, context);
+      var builderInitializationArea = new BoogieStmtListBuilder(generator, generator.options, context);
+      if (f is TwoStateFunction) {
+        // $Heap := current$Heap;
+        var heap = ordinaryEtran.HeapCastToIdentifierExpr;
+        builder.Add(Cmd.SimpleAssign(f.Origin, heap, etran.HeapExpr));
+        etran = ordinaryEtran; // we no longer need the special heap names
+      }
+
+      builder.AddCaptureState(f.Origin, false, "initial state");
+
+      generator.DefineFrame(f.Origin, etran.ReadsFrame(f.Origin), f.Reads.Expressions, builder, locals, null);
+      generator.InitializeFuelConstant(f.Origin, builder, etran);
+
+      var delayer = new ReadsCheckDelayer(etran, null, locals, builderInitializationArea, builder);
+
+      // Check well-formedness of any default-value expressions (before assuming preconditions).
+      delayer.DoWithDelayedReadsChecks(true, wfo => {
+        foreach (var formal in f.Ins.Where(formal => formal.DefaultValue != null)) {
+          var e = formal.DefaultValue;
+          generator.CheckWellformed(e, wfo, locals, builder,
+            etran.WithReadsFrame(etran.readsFrame, null)); // No frame scope for default values
+          builder.Add(new AssumeCmd(e.Origin, etran.CanCallAssumption(e)));
+          generator.CheckSubrange(e.Origin, etran.TrExpr(e), e.Type, formal.Type, e, builder);
+
+          if (formal.IsOld) {
+            Expr wh = generator.GetWhereClause(e.Origin, etran.TrExpr(e), e.Type, etran.Old, ISALLOC, true);
+            if (wh != null) {
+              var desc = new IsAllocated("default value", "in the two-state function's previous state", e);
+              builder.Add(generator.Assert(generator.GetToken(e), wh, desc, builder.Context));
+            }
+          }
+        }
+      });
+
+      // Check well-formedness of the preconditions (including termination), and then
+      // assume each one of them.  After all that (in particular, after assuming all
+      // of them), do the postponed reads checks.
+      delayer.DoWithDelayedReadsChecks(false, wfo => {
+        builder.Add(new CommentCmd("Check well-formedness of preconditions, and then assume them"));
+        foreach (AttributedExpression require in ConjunctsOf(f.Req)) {
+          if (require.Label != null) {
+            require.Label.E = (f is TwoStateFunction ? ordinaryEtran : etran.Old).TrExpr(require.E);
+            generator.CheckWellformed(require.E, wfo, locals, builder, etran);
+          } else {
+            generator.CheckWellformedAndAssume(require.E, wfo, locals, builder, etran, "requires clause");
+          }
+        }
+      });
+
+      // Check well-formedness of the reads clause.  Note that this is done after assuming
+      // the preconditions.  In other words, the well-formedness of the reads clause is
+      // allowed to assume the precondition (yet, the requires clause is checked to
+      // read only those things indicated in the reads clause).
+      builder.Add(new CommentCmd("Check well-formedness of the reads clause"));
+      delayer.DoWithDelayedReadsChecks(false,
+        wfo => { generator.CheckFrameWellFormed(wfo, f.Reads.Expressions, locals, builder, etran); });
+
+      ConcurrentAttributeCheck(f, etran, builder);
+
+      // check well-formedness of the decreases clauses (including termination, but no reads checks)
+      builder.Add(new CommentCmd("Check well-formedness of the decreases clause"));
+      foreach (Expression p in f.Decreases.Expressions) {
+        generator.CheckWellformed(p, new WFOptions(null, false), locals, builder, etran);
+      }
+
+      var implementationParameters = Bpl.Formal.StripWhereClauses(procedureParameters);
+      CheckBodyAndEnsuresClauseWellformedness(f, etran, locals, implementationParameters, builderInitializationArea, builder);
+
+      if (generator.EmitImplementation(f.Attributes)) {
+        var s0 = builderInitializationArea.Collect(f.Origin);
+        var s1 = builder.Collect(f.Origin);
+        var implBody = new StmtList(new List<BigBlock>(s0.BigBlocks.Concat(s1.BigBlocks)), f.Origin);
+
+        // emit the impl only when there are proof obligations.
+        QKeyValue kv = etran.TrAttributes(f.Attributes, null);
+        var parameters = Concat(Concat(Bpl.Formal.StripWhereClauses(typeInParams), heapParameters), implementationParameters);
+        var impl = generator.AddImplementationWithAttributes(generator.GetToken(f), proc,
+          parameters,
+          Bpl.Formal.StripWhereClauses(outParams),
+          locals, implBody, kv);
+        if (generator.InsertChecksums) {
+          generator.InsertChecksum(f, impl);
+        }
+      }
+
+      Contract.Assert(generator.currentModule == f.EnclosingClass.EnclosingModuleDefinition);
+      Contract.Assert(generator.codeContext == f);
+      generator.Reset();
+    }
+
+    private void ConcurrentAttributeCheck(Function f, ExpressionTranslator etran, BoogieStmtListBuilder builder) {
+      // If the function is marked as {:concurrent}, check that the reads clause is empty.
+      if (Attributes.Contains(f.Attributes, Attributes.ConcurrentAttributeName)) {
+        var desc = new ConcurrentFrameEmpty(f, "reads");
+        generator.CheckFrameEmpty(f.Origin, etran, etran.ReadsFrame(f.Origin), builder, desc, null);
+      }
+    }
+
+    private void CheckBodyAndEnsuresClauseWellformedness(Function f, ExpressionTranslator etran, Variables locals, List<Variable> inParams,
+      BoogieStmtListBuilder builderInitializationArea, BoogieStmtListBuilder builder) {
+      builder.Add(new CommentCmd("Check body and ensures clauses"));
+      // Generate:
+      //   if (*) {
+      //     check well-formedness of postcondition
+      //     assume false;  // don't go on to check the postconditions
+      //   } else {
+      //     check well-formedness of body
+      //     // fall through to check the postconditions themselves
+      //   }
+      // Here go the postconditions (termination checks included, but no reads checks)
+      var postCheckBuilder = GetPostCheckBuilder(f, etran, locals);
+
+      // Here goes the body (and include both termination checks and reads checks)
+      var bodyCheckBuilder = GetBodyCheckBuilder(f, etran, inParams, locals, builderInitializationArea);
+
+      // Combine the two, letting the postcondition be checked on after the "bodyCheckBuilder" branch
+      builder.Add(new IfCmd(f.Origin, null, postCheckBuilder.Collect(f.Origin), null, bodyCheckBuilder.Collect(f.Origin)));
+    }
+
+    private BoogieStmtListBuilder GetBodyCheckBuilder(Function f, ExpressionTranslator etran,
+      List<Variable> parameters,
+      Variables locals, BoogieStmtListBuilder builderInitializationArea) {
+      var selfCall = GetSelfCall(f, etran, parameters);
+      var context = new BodyTranslationContext(f.ContainsHide);
+      var bodyCheckBuilder = new BoogieStmtListBuilder(generator, generator.options, context);
+      bodyCheckBuilder.Add(new CommentCmd("Check well-formedness of body and result subset type constraint"));
+      if (f.Body != null && generator.RevealedInScope(f)) {
+        var doReadsChecks = etran.readsFrame != null;
+        var wfo = new WFOptions(null, doReadsChecks, doReadsChecks, false);
+
+        void CheckPostcondition(BoogieStmtListBuilder innerBuilder, Expression innerBody) {
+          generator.CheckSubsetType(etran, innerBody, selfCall, f.ResultType, innerBuilder, "function call result");
+          if (f.Result != null) {
+            var cmd = TrAssumeCmd(f.Origin, Expr.Eq(selfCall, generator.TrVar(f.Origin, f.Result)));
+            generator.proofDependencies?.AddProofDependencyId(cmd, f.Origin, new FunctionDefinitionDependency(f));
+            innerBuilder.Add(cmd);
+          }
+          if (doReadsChecks) {
+            // assert b$reads_guards#0;  ...
+            foreach (var a in wfo.CreateAsserts) {
+              innerBuilder.Add(a());
+            }
+          }
+
+          innerBuilder.Add(new ReturnCmd(innerBody.Origin));
+        }
+
+        generator.CheckWellformedWithResult(f.Body, wfo, locals, bodyCheckBuilder, etran, CheckPostcondition);
+
+        // var b$reads_guards#0 : bool  ...
+        locals.AddRange(wfo.Locals.Values);
+        // b$reads_guards#0 := true   ...
+        foreach (var cmd in wfo.AssignLocals) {
+          builderInitializationArea.Add(cmd);
+        }
+      }
+      bodyCheckBuilder.Add(TrAssumeCmd(f.Origin, Expr.False));
+
+      return bodyCheckBuilder;
+    }
+
+    private Expr GetSelfCall(Function f, ExpressionTranslator etran, List<Variable> parameters) {
+      var funcId = new FunctionCall(new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName, generator.TrType(f.ResultType)));
+      var args = new List<Expr>();
+      foreach (var p in GetTypeParams(f)) {
+        args.Add(generator.TrTypeParameter(p));
+      }
+
+      if (f.IsFuelAware()) {
+        args.Add(etran.layerInterCluster.GetFunctionFuel(f));
+      }
+
+      if (f.IsOpaque || f.IsMadeImplicitlyOpaque(generator.options)) {
+        args.Add(generator.GetRevealConstant(f));
+      }
+
+      if (f is TwoStateFunction) {
+        args.Add(etran.Old.HeapExpr);
+      }
+
+      if (f.ReadsHeap) {
+        args.Add(etran.HeapExpr);
+      }
+
+      foreach (Variable parameter in parameters) {
+        args.Add(new Bpl.IdentifierExpr(f.Origin, parameter));
+      }
+
+      Expr funcAppl = new NAryExpr(f.Origin, funcId, args);
+      return funcAppl;
+    }
+
+    private BoogieStmtListBuilder GetPostCheckBuilder(Function f, ExpressionTranslator etran, Variables locals) {
+      var context = new BodyTranslationContext(f.ContainsHide);
+      var postCheckBuilder = new BoogieStmtListBuilder(generator, generator.options, context);
+      postCheckBuilder.Add(new CommentCmd("Check well-formedness of postcondition and assume false"));
+
+      // Assume the type returned by the call itself respects its type (this matters if the type is "nat", for example)
+      var args = new List<Expr>();
+      foreach (var p in GetTypeParams(f)) {
+        args.Add(generator.TrTypeParameter(p));
+      }
+
+      if (f.IsFuelAware()) {
+        args.Add(etran.layerInterCluster.GetFunctionFuel(f));
+      }
+
+      if (f.IsOpaque || f.IsMadeImplicitlyOpaque(generator.options)) {
+        args.Add(generator.GetRevealConstant(f));
+      }
+
+      if (f is TwoStateFunction) {
+        args.Add(etran.Old.HeapExpr);
+      }
+
+      if (f.ReadsHeap) {
+        args.Add(etran.HeapExpr);
+      }
+
+      if (!f.IsStatic) {
+        args.Add(new Bpl.IdentifierExpr(f.Origin, etran.This));
+      }
+
+      foreach (var p in f.Ins) {
+        args.Add(new Bpl.IdentifierExpr(p.Origin, p.AssignUniqueName(f.IdGenerator), generator.TrType(p.Type)));
+      }
+
+      Bpl.IdentifierExpr funcID = new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName, generator.TrType(f.ResultType));
+      Expr funcAppl = new NAryExpr(f.Origin, new FunctionCall(funcID), args);
+
+      var wh = generator.GetWhereClause(f.Origin, funcAppl, f.ResultType, etran, NOALLOC);
+      if (wh != null) {
+        postCheckBuilder.Add(TrAssumeCmd(f.Origin, wh));
+        if (f.Result != null) {
+          var resultVarId = new Bpl.IdentifierExpr(f.Result.Origin, f.Result.AssignUniqueName(f.IdGenerator), generator.TrType(f.Result.Type));
+          wh = generator.GetWhereClause(f.Result.Origin, resultVarId, f.Result.Type, etran, NOALLOC);
+          postCheckBuilder.Add(TrAssumeCmd(f.Result.Origin, wh));
+        }
+      }
+      // Now for the ensures clauses
+      foreach (AttributedExpression p in f.Ens) {
+        // assume the postcondition for the benefit of checking the remaining postconditions
+        generator.CheckWellformedAndAssume(p.E, new WFOptions(f, false), locals, postCheckBuilder, etran, "ensures clause");
+      }
+
+      postCheckBuilder.Add(TrAssumeCmd(f.Origin, Expr.False));
+      return postCheckBuilder;
+    }
+
+    private ExpressionTranslator GetExpressionTranslator(Function f, ExpressionTranslator ordinaryEtran,
+      out List<Bpl.Requires> additionalRequires, out List<Variable> inParams_Heap) {
+      ExpressionTranslator etran;
+      additionalRequires = new();
+      inParams_Heap = new List<Variable>();
+      if (f is TwoStateFunction) {
+        var prevHeapVar = new Bpl.Formal(f.Origin, new TypedIdent(f.Origin, "previous$Heap", generator.Predef.HeapType), true);
+        var currHeapVar = new Bpl.Formal(f.Origin, new TypedIdent(f.Origin, "current$Heap", generator.Predef.HeapType), true);
+        inParams_Heap.Add(prevHeapVar);
+        inParams_Heap.Add(currHeapVar);
+        Expr prevHeap = new Bpl.IdentifierExpr(f.Origin, prevHeapVar);
+        Expr currHeap = new Bpl.IdentifierExpr(f.Origin, currHeapVar);
+        etran = new ExpressionTranslator(generator, generator.Predef, currHeap, prevHeap, f);
+
+        // free requires prevHeap == Heap && HeapSucc(prevHeap, currHeap) && IsHeap(currHeap)
+        var a0 = Expr.Eq(prevHeap, ordinaryEtran.HeapExpr);
+        var a1 = generator.HeapSucc(prevHeap, currHeap);
+        var a2 = generator.FunctionCall(f.Origin, BuiltinFunction.IsGoodHeap, null, currHeap);
+        additionalRequires.Add(generator.Requires(f.Origin, true, null, BplAnd(a0, BplAnd(a1, a2)), null, null, null));
+      } else {
+        etran = ordinaryEtran;
+      }
+
+      return etran;
+    }
+
+    private List<Variable> GetWellformednessProcedureOutParameters(Function f, ExpressionTranslator etran) {
+      var outParams = new List<Variable>();
+      if (f.Result != null) {
+        Formal p = f.Result;
+        Contract.Assert(!p.IsOld);
+        Bpl.Type varType = generator.TrType(p.Type);
+        // Note, this variable should NOT have a "where" clause, because it gets assumed already at the beginning of the CheckWellformed procedure
+        outParams.Add(new Bpl.Formal(p.Origin, new TypedIdent(p.Origin, p.AssignUniqueName(f.IdGenerator), varType), true));
+      }
+
+      return outParams;
+    }
+
+    private List<Bpl.Requires> GetWellformednessProcedureRequires(Function f, ExpressionTranslator etran) {
+      var requires = new List<Bpl.Requires>();
+      foreach (var typeBoundAxiom in generator.TypeBoundAxioms(f.Origin, Concat(f.EnclosingClass.TypeArgs, f.TypeArgs))) {
+        requires.Add(generator.Requires(f.Origin, true, null, typeBoundAxiom, null, null, null));
+      }
+      return requires;
+    }
+
+    private List<Variable> GetParameters(Function f, ExpressionTranslator etran) {
+      var inParams = new List<Variable>();
+      if (!f.IsStatic) {
+        var th = new Bpl.IdentifierExpr(f.Origin, "this", generator.TrReceiverType(f));
+        Expr wh = BplAnd(
+          generator.ReceiverNotNull(th),
+          (f is TwoStateFunction ? etran.Old : etran).GoodRef(f.Origin, th, ModuleResolver.GetReceiverType(f.Origin, f)));
+        Bpl.Formal thVar = new Bpl.Formal(f.Origin, new TypedIdent(f.Origin, "this", generator.TrReceiverType(f), wh), true);
+        inParams.Add(thVar);
+      }
+
+      foreach (Formal parameter in f.Ins) {
+        Bpl.Type varType = generator.TrType(parameter.Type);
+        Expr wh = generator.GetWhereClause(parameter.Origin,
+          new Bpl.IdentifierExpr(parameter.Origin, parameter.AssignUniqueName(f.IdGenerator), varType), parameter.Type,
+          parameter.IsOld ? etran.Old : etran, f is TwoStateFunction ? ISALLOC : NOALLOC);
+        inParams.Add(new Bpl.Formal(parameter.Origin,
+          new TypedIdent(parameter.Origin, parameter.AssignUniqueName(f.IdGenerator), varType, wh), true));
+      }
+
+      return inParams;
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.Functions.cs b/Source/DafnyCore/Verifier/BoogieGenerator.Functions.cs
new file mode 100644
index 00000000000..5e086024362
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.Functions.cs
@@ -0,0 +1,943 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using Bpl = Microsoft.Boogie;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+using static Microsoft.Dafny.GenericErrors;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+
+  void AddFunctionAxiom(Bpl.Function boogieFunction, Function f, Expression body) {
+    Contract.Requires(f != null);
+    Contract.Requires(body != null);
+
+    var ax = GetFunctionAxiom(f, body, null);
+    AddOtherDefinition(boogieFunction, ax);
+    // TODO(namin) Is checking f.Reads.Count==0 excluding Valid() of BinaryTree in the right way?
+    //             I don't see how this in the decreasing clause would help there.
+    if (!(f is ExtremePredicate) && f.CoClusterTarget == Function.CoCallClusterInvolvement.None && f.Reads.Expressions.Count == 0) {
+      var FVs = new HashSet<IVariable>();
+      Type usesThis = null;
+      bool dontCare0 = false, dontCare1 = false;
+      var dontCareHeapAt = new HashSet<Label>();
+      foreach (var e in f.Decreases.Expressions) {
+        FreeVariablesUtil.ComputeFreeVariables(options, e, FVs, ref dontCare0, ref dontCare1, dontCareHeapAt, ref usesThis, false);
+      }
+
+      var allFormals = new List<Formal>();
+      var decs = new List<Formal>();
+      if (f.IsStatic) {
+        Contract.Assert(usesThis == null);
+      } else {
+        var surrogate = new ThisSurrogate(f.Origin, ModuleResolver.GetReceiverType(f.Origin, f));
+        allFormals.Add(surrogate);
+        if (usesThis != null) {
+          decs.Add(surrogate);
+        }
+      }
+      foreach (var formal in f.Ins) {
+        allFormals.Add(formal);
+        if (FVs.Contains(formal)) {
+          decs.Add(formal);
+        }
+      }
+
+      Contract.Assert(decs.Count <= allFormals.Count);
+      if (0 < decs.Count && decs.Count < allFormals.Count) {
+        var decreasesAxiom = GetFunctionAxiom(f, body, decs);
+        AddOtherDefinition(boogieFunction, decreasesAxiom);
+      }
+
+      var formalsAxiom = GetFunctionAxiom(f, body, allFormals);
+      AddOtherDefinition(boogieFunction, formalsAxiom);
+    }
+  }
+
+  void AddFunctionConsequenceAxiom(Boogie.Function boogieFunction, Function f, List<AttributedExpression> ens) {
+    Contract.Requires(f != null);
+    Contract.Requires(Predef != null);
+    Contract.Requires(f.EnclosingClass != null);
+
+    bool readsHeap = f.ReadsHeap;
+    foreach (AttributedExpression e in f.Req.Concat(ens)) {
+      readsHeap = readsHeap || UsesHeap(e.E);
+    }
+
+    ExpressionTranslator etranHeap;
+    ExpressionTranslator etran;
+    Bpl.BoundVariable bvPrevHeap = null;
+    if (f is TwoStateFunction) {
+      bvPrevHeap = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$prevHeap", Predef.HeapType));
+      etran = new ExpressionTranslator(this, Predef,
+        f.ReadsHeap ? new Bpl.IdentifierExpr(f.Origin, Predef.HeapVarName, Predef.HeapType) : null,
+        new Bpl.IdentifierExpr(f.Origin, bvPrevHeap), f);
+      etranHeap = etran;
+    } else {
+      etranHeap = new ExpressionTranslator(this, Predef, f.Origin, f);
+      etran = readsHeap ? etranHeap : new ExpressionTranslator(this, Predef, (Bpl.Expr)null, f);
+    }
+
+    // This method generate the Consequence Axiom, which has information about the function's
+    // return type and postconditions
+    //
+    // axiom  // consequence axiom
+    //   (forall s, $Heap, formals ::                  // let args := $Heap,formals
+    //       { f(s, args) }
+    //       f#canCall(args)
+    //       ==>
+    //       ens &&
+    //       OlderCondition &&
+    //       f(s, args)-has-the-expected type);
+    //
+    // where:
+    //
+    // OlderCondition is added if the function has some 'older' parameters.
+    //
+    // Note, an antecedent $Heap[this,alloc] is intentionally left out:  including it would only weaken
+    // the axiom.  Moreover, leaving it out does not introduce any soundness problem, because the Dafny
+    // allocation statement changes only an allocation bit and then re-assumes $IsGoodHeap; so if it is
+    // sound after that, then it would also have been sound just before the allocation.
+    //
+    List<Bpl.Expr> tyargs;
+    var formals = MkTyParamBinders(GetTypeParams(f), out tyargs);
+    var args = new List<Bpl.Expr>();
+    var olderInParams = new List<Bpl.Variable>(); // for use with older-condition
+    Bpl.BoundVariable layer;
+    if (f.IsFuelAware()) {
+      layer = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$ly", Predef.LayerType));
+      formals.Add(layer);
+      etran = etran.WithCustomFuelSetting(new CustomFuelSettings { { f, new FuelSetting(this, 0, new Bpl.IdentifierExpr(f.Origin, layer)) } });
+      //etran = etran.WithLayer(new Bpl.IdentifierExpr(f.Tok, layer));
+      // Note, "layer" is not added to "args" here; rather, that's done below, as needed
+    } else {
+      layer = null;
+    }
+
+    Bpl.BoundVariable reveal;
+    if (f.IsOpaque || f.IsMadeImplicitlyOpaque(options)) {
+      reveal = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$reveal", Boogie.Type.Bool));
+      formals.Add(reveal);
+    } else {
+      reveal = null;
+    }
+
+    Bpl.Expr ante = Bpl.Expr.True;
+    Bpl.Expr anteIsAlloc = Bpl.Expr.True;
+    if (f is TwoStateFunction) {
+      Contract.Assert(bvPrevHeap != null);
+      formals.Add(bvPrevHeap);
+      args.Add(etran.Old.HeapExpr);
+      // ante:  $IsGoodHeap($prevHeap) &&
+      var goodHeap = FunctionCall(f.Origin, BuiltinFunction.IsGoodHeap, null, etran.Old.HeapExpr);
+      ante = BplAnd(ante, goodHeap);
+      anteIsAlloc = BplAnd(anteIsAlloc, goodHeap);
+    }
+    var bvHeap = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, Predef.HeapVarName, Predef.HeapType));
+    if (f.ReadsHeap) {
+      args.Add(new Bpl.IdentifierExpr(f.Origin, bvHeap));
+    }
+    // ante:  $IsGoodHeap($Heap) && $HeapSucc($prevHeap, $Heap) && this != null && formals-have-the-expected-types &&
+    if (readsHeap) {
+      Bpl.Expr goodHeap = FunctionCall(f.Origin, BuiltinFunction.IsGoodHeap, null, etranHeap.HeapExpr);
+      formals.Add(bvHeap);
+      ante = BplAnd(ante, goodHeap);
+      anteIsAlloc = BplAnd(anteIsAlloc, f.ReadsHeap ? goodHeap : Bpl.Expr.True);
+      if (f is TwoStateFunction) {
+        var heapSucc = HeapSucc(etran.Old.HeapExpr, etran.HeapExpr);
+        ante = BplAnd(ante, heapSucc);
+        anteIsAlloc = BplAnd(anteIsAlloc, f.ReadsHeap ? heapSucc : Bpl.Expr.True);
+      }
+    }
+    // ante:  conditions on bounded type parameters
+    foreach (var typeBoundAxiom in TypeBoundAxioms(f.Origin, Concat(f.EnclosingClass.TypeArgs, f.TypeArgs))) {
+      ante = BplAnd(ante, typeBoundAxiom);
+      anteIsAlloc = BplAnd(anteIsAlloc, typeBoundAxiom);
+    }
+
+    if (!f.IsStatic) {
+      var bvThis = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, etran.This, TrReceiverType(f)));
+      formals.Add(bvThis);
+      olderInParams.Add(bvThis);
+      var bvThisIdExpr = new Bpl.IdentifierExpr(f.Origin, bvThis);
+      args.Add(bvThisIdExpr);
+      // add well-typedness conjunct to antecedent
+      Type thisType = ModuleResolver.GetReceiverType(f.Origin, f);
+      Bpl.Expr wh = BplAnd(
+        ReceiverNotNull(bvThisIdExpr),
+        (f is TwoStateFunction ? etran.Old : etran).GoodRef(f.Origin, bvThisIdExpr, thisType));
+      ante = BplAnd(ante, wh);
+      anteIsAlloc = BplAnd(anteIsAlloc, ReceiverNotNull(bvThisIdExpr));
+      wh = GetWhereClause(f.Origin, bvThisIdExpr, thisType, f is TwoStateFunction ? etranHeap.Old : etranHeap, ISALLOC, true);
+      if (wh != null) {
+        anteIsAlloc = BplAnd(anteIsAlloc, wh);
+      }
+    }
+    foreach (Formal p in f.Ins) {
+      var bv = new Bpl.BoundVariable(p.Origin, new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(CurrentDeclaration.IdGenerator), TrType(p.Type)));
+      Bpl.Expr formal = new Bpl.IdentifierExpr(p.Origin, bv);
+      formals.Add(bv);
+      olderInParams.Add(bv);
+      args.Add(formal);
+      // add well-typedness conjunct to antecedent
+      Bpl.Expr wh = GetWhereClause(p.Origin, formal, p.Type, p.IsOld ? etran.Old : etran, ISALLOC);
+      if (wh != null) { ante = BplAnd(ante, wh); }
+      wh = GetWhereClause(p.Origin, formal, p.Type, p.IsOld ? etranHeap.Old : etranHeap, ISALLOC);
+      if (wh != null) { anteIsAlloc = BplAnd(anteIsAlloc, wh); }
+    }
+
+    Bpl.Expr funcAppl;
+    {
+      var funcID = new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName, TrType(f.ResultType));
+      var funcArgs = new List<Bpl.Expr>();
+      funcArgs.AddRange(tyargs);
+      /*
+      if (f.IsFueled) {
+          funcArgs.Add(etran.layerInterCluster.GetFunctionFuel(f));
+      } else if (layer != null) {
+         var ly = new Bpl.IdentifierExpr(f.Tok, layer);
+         funcArgs.Add(FunctionCall(f.Tok, BuiltinFunction.LayerSucc, null, ly));
+      }
+       */
+      if (layer != null) {
+        funcArgs.Add(new Bpl.IdentifierExpr(f.Origin, layer));
+      }
+
+      if (reveal != null) {
+        funcArgs.Add(new Bpl.IdentifierExpr(f.Origin, reveal));
+      }
+
+      funcArgs.AddRange(args);
+      funcAppl = new Bpl.NAryExpr(f.Origin, new Bpl.FunctionCall(funcID), funcArgs);
+    }
+
+    Bpl.Expr pre = Bpl.Expr.True;
+    foreach (AttributedExpression req in ConjunctsOf(f.Req)) {
+      pre = BplAnd(pre, etran.TrExpr(req.E));
+    }
+    // useViaCanCall: f#canCall(args)
+    var canCallFuncID = new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName + "#canCall", Bpl.Type.Bool);
+    var useViaCanCall = new Bpl.NAryExpr(f.Origin, new Bpl.FunctionCall(canCallFuncID), Concat(tyargs, args));
+
+    // ante := useViaCanCall
+    ante = useViaCanCall;
+    anteIsAlloc = useViaCanCall;
+
+    var tr = BplTriggerHeap(this, f.Origin, funcAppl, (f.ReadsHeap || !readsHeap) ? null : etran.HeapExpr);
+    Bpl.Expr post = Bpl.Expr.True;
+    // substitute function return value with the function call.
+    var substMap = new Dictionary<IVariable, Expression>();
+    if (f.Result != null) {
+      substMap.Add(f.Result, new BoogieWrapper(funcAppl, f.ResultType));
+    }
+    foreach (AttributedExpression p in ens) {
+      var bodyWithSubst = Substitute(p.E, null, substMap);
+      var canCallEns = etran.CanCallAssumption(bodyWithSubst);
+      post = BplAnd(post, canCallEns);
+      var q = etran.TrExpr(bodyWithSubst);
+      post = BplAnd(post, q);
+    }
+    var (olderParameterCount, olderCondition) = OlderCondition(f, funcAppl, olderInParams);
+    if (olderParameterCount != 0) {
+      post = BplAnd(post, olderCondition);
+    }
+    Bpl.Expr whr = GetWhereClause(f.Origin, funcAppl, f.ResultType, etran, NOALLOC);
+    if (whr != null) { post = BplAnd(post, whr); }
+
+    Bpl.Expr axBody = BplImp(ante, post);
+    Bpl.Expr ax = BplForall(f.Origin, new List<Bpl.TypeVariable>(), formals, null, tr, axBody);
+    if (RemoveLit(axBody) != Bpl.Expr.True) {
+      AddOtherDefinition(boogieFunction, new Bpl.Axiom(f.Origin, ax, "consequence axiom for " + f.FullSanitizedName));
+    }
+
+    if (f.ResultType.MayInvolveReferences) {
+      whr = GetWhereClause(f.Origin, funcAppl, f.ResultType, etranHeap, ISALLOC, true);
+      if (whr != null) {
+        if (readsHeap) {
+          Contract.Assert(formals.Contains(bvHeap));
+        } else {
+          formals = Util.Cons(bvHeap, formals);
+          var goodHeap = FunctionCall(f.Origin, BuiltinFunction.IsGoodHeap, null, etranHeap.HeapExpr);
+          anteIsAlloc = BplAnd(anteIsAlloc, goodHeap);
+        }
+
+        axBody = BplImp(anteIsAlloc, whr);
+        ax = BplForall(f.Origin, new List<Bpl.TypeVariable>(), formals, null, BplTrigger(whr), axBody);
+
+        if (RemoveLit(axBody) != Bpl.Expr.True) {
+          var allocConsequenceAxiom = new Bpl.Axiom(f.Origin, ax, "alloc consequence axiom for " + f.FullSanitizedName);
+          AddOtherDefinition(boogieFunction, allocConsequenceAxiom);
+        }
+      }
+    }
+  }
+
+  /// <summary>
+  /// The list of formals "lits" is allowed to contain an object of type ThisSurrogate, which indicates that
+  /// the receiver parameter of the function should be included among the lit formals.
+  /// </summary>
+  private Axiom GetFunctionAxiom(Function f, Expression body, List<Formal> lits) {
+    Contract.Requires(f != null);
+    Contract.Requires(Predef != null);
+    Contract.Requires(f.EnclosingClass != null);
+    Contract.Ensures((Contract.Result<Axiom>() == null) == (body == null)); // return null iff body is null
+
+    // This method generates the Definition Axiom, suitably modified according to the optional "lits".
+    //
+    // axiom  // definition axiom
+    //   (forall s, $Heap, formals ::                  // let args := $Heap,formals
+    //       { f(Succ(s), args) }                      // (*)
+    //       f#canCall(args)
+    //       ==>
+    //       BODY-can-make-its-calls &&
+    //       f(Succ(s), args) == BODY);                // (*)
+    //
+    // NOTE: this is lifted out to a #requires function for intra module calls,
+    //       and used in the function pseudo-handles for top level functions.
+    //       For body-less functions, this is emitted when body is null.
+    //
+    // BODY
+    // means:
+    //   the body of f translated with "s" as the layer argument
+    //
+    // The variables "formals" are the formals of function "f".
+    // The list "args" is the list of formals of function "f".
+    //
+    // The translation of "body" uses "s" as the layer argument for intra-cluster calls and the default layer argument
+    // (which is Succ(0)) for other calls.  Usually, the layer argument in the LHS of the definition (and also in the trigger,
+    // see the two occurrences of (*) above) use Succ(s) as the layer argument.  However, if "lits" are specified, then
+    // then the argument used is just "s" (in both the LHS and trigger).
+    //
+    // Note, an antecedent $Heap[this,alloc] is intentionally left out:  including it would only weaken
+    // the axiom.  Moreover, leaving it out does not introduce any soundness problem, because the Dafny
+    // allocation statement changes only an allocation bit and then re-assumes $IsGoodHeap; so if it is
+    // sound after that, then it would also have been sound just before the allocation.
+    //
+
+    bool readsHeap = f.ReadsHeap;
+    foreach (AttributedExpression e in f.Req) {
+      readsHeap = readsHeap || UsesHeap(e.E);
+    }
+
+    if (body != null && UsesHeap(body)) {
+      readsHeap = true;
+    }
+
+    ExpressionTranslator etran;
+    Bpl.BoundVariable bvPrevHeap = null;
+    if (f is TwoStateFunction) {
+      bvPrevHeap = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$prevHeap", Predef.HeapType));
+      etran = new ExpressionTranslator(this, Predef,
+        f.ReadsHeap ? new Bpl.IdentifierExpr(f.Origin, Predef.HeapVarName, Predef.HeapType) : null,
+        new Bpl.IdentifierExpr(f.Origin, bvPrevHeap), f);
+    } else {
+      etran = f.ReadsHeap
+        ? new ExpressionTranslator(this, Predef, f.Origin, f)
+        : new ExpressionTranslator(this, Predef, readsHeap ? NewOneHeapExpr(f.Origin) : null, f);
+    }
+
+    // quantify over the type arguments, and add them first to the arguments
+    List<Bpl.Expr> args = new List<Bpl.Expr>();
+    List<Bpl.Expr> tyargs = GetTypeArguments(f, null).ConvertAll(TypeToTy);
+
+    var forallFormals = MkTyParamBinders(GetTypeParams(f), out _);
+    var funcFormals = MkTyParamBinders(GetTypeParams(f), out _);
+    var reqFuncArguments = new List<Bpl.Expr>(tyargs);
+
+    Bpl.BoundVariable layer;
+    Bpl.BoundVariable reveal;
+    if (f.IsFuelAware()) {
+      layer = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$ly", Predef.LayerType));
+      forallFormals.Add(layer);
+      funcFormals.Add(layer);
+      reqFuncArguments.Add(new Bpl.IdentifierExpr(f.Origin, layer));
+      // Note, "layer" is not added to "args" here; rather, that's done below, as needed
+    } else {
+      layer = null;
+    }
+
+    if (f.IsOpaque || f.IsMadeImplicitlyOpaque(options)) {
+      reveal = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$reveal", Boogie.Type.Bool));
+      //funcFormals.Add(reveal);
+      //reqFuncArguments.Add(new Bpl.IdentifierExpr(f.Tok, reveal));
+      // Note, "reveal" is not added to "args" here; rather, that's done below, as needed
+    } else {
+      reveal = null;
+    }
+
+    Bpl.Expr ante = Bpl.Expr.True;
+    if (f is TwoStateFunction) {
+      Contract.Assert(bvPrevHeap != null);
+      forallFormals.Add(bvPrevHeap);
+      funcFormals.Add(bvPrevHeap);
+      args.Add(etran.Old.HeapExpr);
+      reqFuncArguments.Add(new Bpl.IdentifierExpr(f.Origin, bvPrevHeap));
+      // ante:  $IsGoodHeap($prevHeap) &&
+      ante = BplAnd(ante, FunctionCall(f.Origin, BuiltinFunction.IsGoodHeap, null, etran.Old.HeapExpr));
+    }
+
+    if (f.ReadsHeap) {
+      var bv = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, Predef.HeapVarName, Predef.HeapType));
+      funcFormals.Add(bv);
+      args.Add(new Bpl.IdentifierExpr(f.Origin, bv));
+      reqFuncArguments.Add(new Bpl.IdentifierExpr(f.Origin, bv));
+
+      // ante:  $IsGoodHeap($Heap) && $HeapSucc($prevHeap, $Heap) && this != null && formals-have-the-expected-types &&
+      forallFormals.Add(bv);
+      var goodHeap = FunctionCall(f.Origin, BuiltinFunction.IsGoodHeap, null, etran.HeapExpr);
+      ante = BplAnd(ante, goodHeap);
+      if (f is TwoStateFunction) {
+        ante = BplAnd(ante, HeapSucc(etran.Old.HeapExpr, etran.HeapExpr));
+      }
+    }
+
+    // ante:  conditions on bounded type parameters
+    foreach (var typeBoundAxiom in TypeBoundAxioms(f.Origin, Concat(f.EnclosingClass.TypeArgs, f.TypeArgs))) {
+      ante = BplAnd(ante, typeBoundAxiom);
+    }
+
+    Expression receiverReplacement = null;
+    if (!f.IsStatic) {
+      var bvThis = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, etran.This, TrReceiverType(f)));
+      forallFormals.Add(bvThis);
+      funcFormals.Add(bvThis);
+      reqFuncArguments.Add(new Bpl.IdentifierExpr(f.Origin, bvThis));
+      var bvThisIdExpr = new Bpl.IdentifierExpr(f.Origin, bvThis);
+      if (lits != null && lits.Exists(p => p is ThisSurrogate)) {
+        args.Add(Lit(bvThisIdExpr));
+        var th = new ThisExpr(f);
+        var l = new UnaryOpExpr(f.Origin, UnaryOpExpr.Opcode.Lit, th) {
+          Type = th.Type
+        };
+        receiverReplacement = l;
+      } else {
+        args.Add(bvThisIdExpr);
+      }
+
+      // add well-typedness conjunct to antecedent
+      Type thisType = ModuleResolver.GetReceiverType(f.Origin, f);
+      Bpl.Expr wh = BplAnd(
+        ReceiverNotNull(bvThisIdExpr),
+        (f is TwoStateFunction ? etran.Old : etran).GoodRef(f.Origin, bvThisIdExpr, thisType));
+      ante = BplAnd(ante, wh);
+    }
+
+    var typeMap = new Dictionary<TypeParameter, Type>();
+    var anteReqAxiom = ante; // note that antecedent so far is the same for #requires axioms, even the receiver parameter of a two-state function
+    var substMap = new Dictionary<IVariable, Expression>();
+    foreach (Formal p in f.Ins) {
+      var pType = p.Type.Subst(typeMap);
+      var bv = new Bpl.BoundVariable(p.Origin,
+        new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(CurrentDeclaration.IdGenerator), TrType(pType)));
+      forallFormals.Add(bv);
+      funcFormals.Add(bv);
+      reqFuncArguments.Add(new Bpl.IdentifierExpr(f.Origin, bv));
+      Bpl.Expr formal = new Bpl.IdentifierExpr(p.Origin, bv);
+      if (lits != null && lits.Contains(p) && !substMap.ContainsKey(p)) {
+        args.Add(Lit(formal));
+        var ie = new IdentifierExpr(p.Origin, p.AssignUniqueName(f.IdGenerator));
+        ie.Var = p;
+        ie.Type = ie.Var.Type;
+        var l = new UnaryOpExpr(p.Origin, UnaryOpExpr.Opcode.Lit, ie);
+        l.Type = ie.Var.Type;
+        substMap.Add(p, l);
+      } else {
+        args.Add(formal);
+      }
+
+      // add well-typedness conjunct to antecedent
+      Bpl.Expr wh = GetWhereClause(p.Origin, formal, pType, p.IsOld ? etran.Old : etran, NOALLOC);
+      if (wh != null) {
+        ante = BplAnd(ante, wh);
+      }
+
+      wh = GetWhereClause(p.Origin, formal, pType, etran, NOALLOC);
+      if (wh != null) {
+        anteReqAxiom = BplAnd(anteReqAxiom, wh);
+      }
+    }
+
+    Bpl.Expr pre = Bpl.Expr.True;
+    foreach (AttributedExpression req in ConjunctsOf(f.Req)) {
+      pre = BplAnd(pre, etran.TrExpr(Substitute(req.E, receiverReplacement, substMap)));
+    }
+
+    var preReqAxiom = pre;
+    if (f is TwoStateFunction) {
+      // Checked preconditions that old parameters really existed in previous state
+      var index = 0;
+      Bpl.Expr preRA = Bpl.Expr.True;
+      foreach (var formal in f.Ins) {
+        if (formal.IsOld) {
+          var dafnyFormalIdExpr = new IdentifierExpr(formal.Origin, formal);
+          preRA = BplAnd(preRA, MkIsAlloc(etran.TrExpr(dafnyFormalIdExpr), formal.Type, etran.Old.HeapExpr));
+        }
+
+        index++;
+      }
+
+      preReqAxiom = BplAnd(preRA, pre);
+    }
+
+    var canCallFuncID = new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName + "#canCall", Bpl.Type.Bool);
+    var useViaCanCall = new Bpl.NAryExpr(f.Origin, new Bpl.FunctionCall(canCallFuncID), Concat(tyargs, args));
+
+    // Add the precondition function and its axiom (which is equivalent to the anteReqAxiom)
+    if (body == null || (RevealedInScope(f) && lits == null)) {
+      var precondF = new Bpl.Function(f.Origin,
+        RequiresName(f), new List<Bpl.TypeVariable>(),
+        funcFormals.ConvertAll(v => (Bpl.Variable)BplFormalVar(null, v.TypedIdent.Type, true)),
+        BplFormalVar(null, Bpl.Type.Bool, false));
+      sink.AddTopLevelDeclaration(precondF);
+
+      var appl = FunctionCall(f.Origin, RequiresName(f), Bpl.Type.Bool, reqFuncArguments);
+      Bpl.Trigger trig = BplTriggerHeap(this, f.Origin, appl, f.ReadsHeap ? etran.HeapExpr : null);
+      // axiom (forall params :: { f#requires(params) }  ante ==> f#requires(params) == pre);
+      AddOtherDefinition(precondF, new Axiom(f.Origin,
+        BplForall(forallFormals, trig, BplImp(anteReqAxiom, Bpl.Expr.Eq(appl, preReqAxiom))),
+        "#requires axiom for " + f.FullSanitizedName));
+
+      AddOtherDefinition(precondF, new Bpl.Axiom(f.Origin,
+        BplForall(f.Origin, new List<Bpl.TypeVariable>(), forallFormals, null, trig, Bpl.Expr.Imp(appl, useViaCanCall)),
+        "#requires ==> #canCall for " + f.FullSanitizedName));
+    }
+
+    if (body == null || !RevealedInScope(f)) {
+      return null;
+    }
+
+    // useViaCanCall: f#canCall(args)
+    ante = useViaCanCall;
+
+    Bpl.Expr funcAppl;
+    {
+      var funcID = new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName, TrType(f.ResultType));
+      var funcArgs = new List<Bpl.Expr>();
+      funcArgs.AddRange(tyargs);
+      if (layer != null) {
+        var ly = new Bpl.IdentifierExpr(f.Origin, layer);
+        //if (lits == null) {
+        funcArgs.Add(LayerSucc(ly));
+        //} else {
+        //  funcArgs.Add(ly);
+        //}
+      }
+
+      if (reveal != null) {
+        funcArgs.Add(new Bpl.LiteralExpr(f.Origin, true));
+      }
+
+      funcArgs.AddRange(args);
+      funcAppl = new Bpl.NAryExpr(f.Origin, new Bpl.FunctionCall(funcID), funcArgs);
+    }
+
+    Bpl.Trigger tr = BplTriggerHeap(this, f.Origin, funcAppl, f.ReadsHeap ? etran.HeapExpr : null);
+    Bpl.Expr tastyVegetarianOption; // a.k.a. the "meat" of the operation :)
+    if (!RevealedInScope(f)) {
+      tastyVegetarianOption = Bpl.Expr.True;
+    } else {
+      var bodyWithSubst = Substitute(body, receiverReplacement, substMap);
+      if (f is PrefixPredicate) {
+        var pp = (PrefixPredicate)f;
+        bodyWithSubst = PrefixSubstitution(pp, bodyWithSubst);
+      }
+
+      Bpl.Expr ly = null;
+      if (layer != null) {
+        ly = new Bpl.IdentifierExpr(f.Origin, layer);
+        if (lits != null) {
+          // Lit axiom doesn't consume any fuel
+          ly = LayerSucc(ly);
+        }
+      }
+
+      var etranBody = layer == null ? etran : etran.LimitedFunctions(f, ly);
+      var trbody = AdaptBoxing(f.Origin, etranBody.TrExpr(bodyWithSubst), f.Body.Type, f.ResultType);
+      tastyVegetarianOption = BplAnd(etranBody.CanCallAssumption(bodyWithSubst),
+        BplAnd(TrFunctionSideEffect(bodyWithSubst, etranBody), Bpl.Expr.Eq(funcAppl, trbody)));
+    }
+
+    QKeyValue kv = null;
+    if (lits != null) {
+      kv = new QKeyValue(f.Origin, "weight", new List<object>() { Bpl.Expr.Literal(3) }, null);
+    }
+
+    Bpl.Expr ax = BplForall(f.Origin, new List<Bpl.TypeVariable>(), forallFormals, kv, tr,
+      BplImp(ante, tastyVegetarianOption));
+    string comment;
+    comment = "definition axiom for " + f.FullSanitizedName;
+    if (lits != null) {
+      if (lits.Count == f.Ins.Count + (f.IsStatic ? 0 : 1)) {
+        comment += " for all literals";
+      } else {
+        comment += " for decreasing-related literals";
+      }
+    }
+
+    if (RevealedInScope(f)) {
+      comment += " (revealed)";
+    } else {
+      comment += " (opaque)";
+    }
+    var axe = new Axiom(f.Origin, ax, comment) {
+      CanHide = true
+    };
+    if (proofDependencies == null) {
+      return axe;
+    }
+
+    proofDependencies.SetCurrentDefinition(f.FullSanitizedName, f);
+    proofDependencies.AddProofDependencyId(axe, f.Origin, new FunctionDefinitionDependency(f));
+    return axe;
+  }
+
+
+  Expr TrFunctionSideEffect(Expression expr, ExpressionTranslator etran) {
+    Expr e = Bpl.Expr.True;
+    if (expr is StmtExpr) {
+      // if there is a call to reveal_ lemma, we need to record its side effect.
+      var stmt = ((StmtExpr)expr).S;
+      e = TrFunctionSideEffect(stmt, etran);
+    }
+    return e;
+  }
+
+  Expr TrFunctionSideEffect(Statement stmt, ExpressionTranslator etran) {
+    Expr e = Bpl.Expr.True;
+    e = TrStmtSideEffect(e, stmt, etran);
+    foreach (var ss in stmt.SubStatements) {
+      e = TrStmtSideEffect(e, ss, etran);
+    }
+    return e;
+  }
+
+
+
+  public string FunctionHandle(Function f) {
+    Contract.Requires(f != null);
+    string name;
+    if (functionHandles.TryGetValue(f, out name)) {
+      Contract.Assert(name != null);
+    } else {
+      name = f.FullSanitizedName + "#Handle";
+      functionHandles[f] = name;
+      var args = new List<Bpl.Expr>();
+      var vars = MkTyParamBinders(GetTypeParams(f), out args);
+      var argsRequires = new List<Bpl.Expr>(args); // Requires don't have reveal parameters
+      var formals = MkTyParamFormals(GetTypeParams(f), false, true);
+      var tyargs = new List<Bpl.Expr>();
+      foreach (var fm in f.Ins) {
+        tyargs.Add(TypeToTy(fm.Type));
+      }
+      tyargs.Add(TypeToTy(f.ResultType));
+      if (f.IsFuelAware()) {
+        vars.Add(BplBoundVar("$ly", Predef.LayerType, out var ly));
+        args.Add(ly);
+        argsRequires.Add(ly);
+        formals.Add(BplFormalVar("$fuel", Predef.LayerType, true));
+        AddFuelSuccSynonymAxiom(f, true);
+      }
+      if (f.IsOpaque || f.IsMadeImplicitlyOpaque(options)) {
+        vars.Add(BplBoundVar("$reveal", Boogie.Type.Bool, out var reveal));
+        args.Add(reveal);
+        formals.Add(BplFormalVar("$reveal", Boogie.Type.Bool, true));
+      }
+
+      Func<List<Bpl.Expr>, List<Bpl.Expr>> SnocSelf = x => x;
+      Func<List<Bpl.Expr>, List<Bpl.Expr>> SnocPrevH = x => x;
+      Expression selfExpr;
+      Dictionary<IVariable, Expression> rhs_dict = new Dictionary<IVariable, Expression>();
+      if (f is TwoStateFunction) {
+        // also add previous-heap to the list of fixed arguments of the handle
+        var prevH = BplBoundVar("$prevHeap", Predef.HeapType, vars);
+        formals.Add(BplFormalVar("h", Predef.HeapType, true));
+        SnocPrevH = xs => Snoc(xs, prevH);
+      }
+      if (f.IsStatic) {
+        selfExpr = null;
+      } else {
+        var selfTy = TrType(UserDefinedType.FromTopLevelDecl(f.Origin, f.EnclosingClass));
+        var self = BplBoundVar("$self", selfTy, vars);
+        formals.Add(BplFormalVar("self", selfTy, true));
+        SnocSelf = xs => Snoc(xs, self);
+        var wrapperType = UserDefinedType.FromTopLevelDecl(f.Origin, f.EnclosingClass);
+        selfExpr = new BoogieWrapper(self, wrapperType);
+      }
+
+      // F#Handle(Ty, .., Ty, LayerType, ref) : HandleType
+      sink.AddTopLevelDeclaration(
+        new Bpl.Function(f.Origin, name, formals, BplFormalVar(null, Predef.HandleType, false)));
+
+      var bvars = new List<Bpl.Variable>();
+      var lhs_args = new List<Bpl.Expr>();
+      var rhs_args = new List<Bpl.Expr>();
+      var func_vars = new List<Bpl.Variable>();
+      var func_args = new List<Bpl.Expr>();
+      var boxed_func_args = new List<Bpl.Expr>();
+
+      var idGen = f.IdGenerator.NestedFreshIdGenerator("$fh$");
+      foreach (var fm in f.Ins) {
+        string fm_name = idGen.FreshId("x#");
+        // Box and its [Unbox]args
+        var fe = BplBoundVar(fm_name, Predef.BoxType, bvars);
+        lhs_args.Add(fe);
+        var be = UnboxUnlessInherentlyBoxed(fe, fm.Type);
+        rhs_args.Add(be);
+
+        rhs_dict[fm] = new BoogieWrapper(be, fm.Type);
+        // args and its [Box]args
+        var arg = BplBoundVar(fm_name, TrType(fm.Type), func_vars);
+        func_args.Add(arg);
+        var boxed = BoxIfNotNormallyBoxed(arg.tok, arg, fm.Type);
+        boxed_func_args.Add(boxed);
+      }
+
+      var h = BplBoundVar("$heap", Predef.HeapType, vars);
+
+      int arity = f.Ins.Count;
+
+      {
+        // Apply(Ty.., F#Handle( Ty1, ..., TyN, Layer, self), Heap, arg1, ..., argN)
+        //   = [Box] F(Ty1, .., TyN, Layer, Heap, self, [Unbox] arg1, .., [Unbox] argN)
+
+        var fhandle = FunctionCall(f.Origin, name, Predef.HandleType, SnocSelf(SnocPrevH(args)));
+        var lhs = FunctionCall(f.Origin, Apply(arity), TrType(f.ResultType),
+          Concat(tyargs, Cons(h, Cons(fhandle, lhs_args))));
+        var args_h = f.ReadsHeap ? Snoc(SnocPrevH(args), h) : args;
+        var rhs = FunctionCall(f.Origin, f.FullSanitizedName, TrType(f.ResultType), Concat(SnocSelf(args_h), rhs_args));
+        var rhs_boxed = BoxIfNotNormallyBoxed(rhs.tok, rhs, f.ResultType);
+
+        AddOtherDefinition(GetOrCreateFunction(f), (new Axiom(f.Origin,
+          BplForall(Concat(vars, bvars), BplTrigger(lhs), Bpl.Expr.Eq(lhs, rhs_boxed)))));
+      }
+
+      {
+        // As a first approximation, the following axiom is of the form:
+        // Requires(Ty.., F#Handle( Ty1, ..., TyN, Layer, reveal, self), Heap, arg1, ..., argN)
+        //   = F#Requires(Ty1, .., TyN, Layer, Heap, self, [Unbox] arg1, .., [Unbox] argN)
+        // However, .reads ands .requires functions require special attention.
+        // To understand the rationale for these axioms, refer to the section on arrow types of the reference manual.
+        // The requires clause of the .requires function is simply true.
+        // The requires clause of the .reads function checks that the precondition of the receiving function holds.
+
+        var fhandle = FunctionCall(f.Origin, name, Predef.HandleType, SnocSelf(SnocPrevH(args)));
+        var lhs = FunctionCall(f.Origin, Requires(arity), Bpl.Type.Bool, Concat(tyargs, Cons(h, Cons(fhandle, lhs_args))));
+        Bpl.Expr rhs;
+        if (f.EnclosingClass is ArrowTypeDecl && f.Name == "requires") {
+          AddOtherDefinition(GetOrCreateFunction(f), new Axiom(f.Origin,
+              BplForall(Concat(vars, bvars), BplTrigger(lhs), Bpl.Expr.Eq(lhs, Bpl.Expr.True))));
+        } else if (f.EnclosingClass is ArrowTypeDecl && f.Name == "reads") {
+          var args_h = f.ReadsHeap ? Snoc(SnocPrevH(argsRequires), h) : argsRequires;
+          var pre = FunctionCall(f.Origin, Requires(arity), Bpl.Type.Bool, Concat(SnocSelf(args_h), lhs_args));
+          AddOtherDefinition(GetOrCreateFunction(f), (new Axiom(f.Origin,
+            BplForall(Concat(vars, bvars), BplTrigger(lhs), Bpl.Expr.Eq(lhs, pre)))));
+        } else {
+          var args_h = f.ReadsHeap ? Snoc(SnocPrevH(argsRequires), h) : argsRequires;
+          rhs = FunctionCall(f.Origin, RequiresName(f), Bpl.Type.Bool, Concat(SnocSelf(args_h), rhs_args));
+          AddOtherDefinition(GetOrCreateFunction(f), new Axiom(f.Origin,
+            BplForall(Concat(vars, bvars), BplTrigger(lhs), Bpl.Expr.Eq(lhs, rhs))));
+        }
+
+
+      }
+
+      {
+        // As a first approximation, the following axiom is of the form:
+        // Reads(Ty.., F#Handle( Ty1, ..., TyN, Layer, self), Heap, arg1, ..., argN)
+        //   =  $Frame_F(args...)
+        // However, .reads ands .requires functions require special attention.
+        // To understand the rationale for these axioms, refer to the section on arrow types of the reference manual.
+        // In both cases, the precondition of the receiving function must be checked before its reads clause can
+        // be referred to.
+
+        var fhandle = FunctionCall(f.Origin, name, Predef.HandleType, SnocSelf(SnocPrevH(args)));
+        Bpl.Expr lhs_inner = FunctionCall(f.Origin, Reads(arity), TrType(program.SystemModuleManager.ObjectSetType()), Concat(tyargs, Cons(h, Cons(fhandle, lhs_args))));
+
+        Bpl.Expr bx; var bxVar = BplBoundVar("$bx", Predef.BoxType, out bx);
+        Bpl.Expr unboxBx = FunctionCall(f.Origin, BuiltinFunction.Unbox, Predef.RefType, bx);
+        Bpl.Expr lhs = IsSetMember(f.Origin, lhs_inner, bx, true);
+
+        var et = new ExpressionTranslator(this, Predef, h, f);
+        var rhs = InRWClause_Aux(f.Origin, unboxBx, bx, null, f.Reads.Expressions, false, et, selfExpr, rhs_dict);
+
+        if (f.EnclosingClass is ArrowTypeDecl) {
+          var args_h = f.ReadsHeap ? Snoc(SnocPrevH(argsRequires), h) : argsRequires;
+          var precondition = FunctionCall(f.Origin, Requires(arity), Bpl.Type.Bool, Concat(SnocSelf(args_h), lhs_args));
+          sink.AddTopLevelDeclaration(new Axiom(f.Origin,
+            BplForall(Cons(bxVar, Concat(vars, bvars)), BplTrigger(lhs), BplImp(precondition, Bpl.Expr.Eq(lhs, rhs)))));
+        } else {
+          sink.AddTopLevelDeclaration(new Axiom(f.Origin,
+            BplForall(Cons(bxVar, Concat(vars, bvars)), BplTrigger(lhs), Bpl.Expr.Eq(lhs, rhs))));
+        }
+      }
+
+      {
+        // F(Ty1, .., TyN, Layer, Heap, self, arg1, .., argN)
+        // = [Unbox]Apply1(Ty.., F#Handle( Ty1, ..., TyN, Layer, self), Heap, [Box]arg1, ..., [Box]argN)
+
+        var fhandle = FunctionCall(f.Origin, name, Predef.HandleType, SnocSelf(SnocPrevH(args)));
+        var args_h = f.ReadsHeap ? Snoc(SnocPrevH(args), h) : args;
+        var lhs = FunctionCall(f.Origin, f.FullSanitizedName, TrType(f.ResultType), Concat(SnocSelf(args_h), func_args));
+        var rhs = FunctionCall(f.Origin, Apply(arity), TrType(f.ResultType), Concat(tyargs, Cons(h, Cons(fhandle, boxed_func_args))));
+        var rhs_unboxed = UnboxUnlessInherentlyBoxed(rhs, f.ResultType);
+        var tr = BplTriggerHeap(this, f.Origin, lhs, f.ReadsHeap ? null : h);
+
+        AddOtherDefinition(GetOrCreateFunction(f), (new Axiom(f.Origin,
+          BplForall(Concat(vars, func_vars), tr, Bpl.Expr.Eq(lhs, rhs_unboxed)))));
+      }
+    }
+    return name;
+  }
+
+
+  /// <summary>
+  /// Generates:
+  ///   axiom (forall s, h0: HeapType, h1: HeapType, formals... ::
+  ///        { IsHeapAnchor(h0), HeapSucc(h0,h1), F(s,h1,formals) }
+  ///        heaps are well-formed and [formals are allocated AND]
+  ///        IsHeapAnchor(h0) AND HeapSucc(h0,h1)
+  ///        AND
+  ///        (forall o: ref, f: Field ::
+  ///            o != null [AND h0[o,alloc] AND]  // note that HeapSucc(h0,h1) && h0[o,alloc] ==> h1[o,alloc]
+  ///            o in reads clause of formals in h0
+  ///            IMPLIES h0[o,f] == h1[o,f])
+  ///        IMPLIES
+  ///        F(s,h0,formals) == F(s,h1,formals)
+  ///      );
+  /// Expressions in [...] are omitted if
+  ///   - /allocated:0, or
+  ///   - /allocated:1, or
+  ///   - /allocated:3, except if "reads" clause is "*" of if the function is a two-state function;
+  /// see comments in AddArrowTypeAxioms
+  /// Also, with /allocated:3, the frame axiom is omitted altogether if the (one-state) function has an
+  /// empty "reads" clause (because then the function doesn't take a heap argument at all).
+  /// </summary>
+  void AddFrameAxiom(Function f) {
+    Contract.Requires(f != null);
+    Contract.Requires(sink != null && Predef != null);
+
+    var comment = "frame axiom for " + f.FullSanitizedName;
+    // This is the general case
+    Bpl.Expr prevH = null;
+    Bpl.BoundVariable prevHVar = null;
+    Bpl.Expr reveal = null;
+    Bpl.BoundVariable revealVar = null;
+    if (f.IsOpaque || f.IsMadeImplicitlyOpaque(options)) {
+      revealVar = BplBoundVar("$reveal", Bpl.Type.Bool, out reveal);
+    }
+    if (f is TwoStateFunction) {
+      // The previous-heap argument is the same for both function arguments.  That is,
+      // the frame axiom says nothing about functions invoked with different previous heaps.
+      prevHVar = BplBoundVar("$prevHeap", Predef.HeapType, out prevH);
+    }
+    Bpl.Expr h0; var h0Var = BplBoundVar("$h0", Predef.HeapType, out h0);
+    Bpl.Expr h1; var h1Var = BplBoundVar("$h1", Predef.HeapType, out h1);
+
+    var etran0 = new ExpressionTranslator(this, Predef, h0, f);
+    var etran1 = new ExpressionTranslator(this, Predef, h1, f);
+
+    Bpl.Expr wellFormed = BplAnd(
+      FunctionCall(f.Origin, BuiltinFunction.IsGoodHeap, null, etran0.HeapExpr),
+      FunctionCall(f.Origin, BuiltinFunction.IsGoodHeap, null, etran1.HeapExpr));
+
+    Bpl.Expr o; var oVar = BplBoundVar("$o", Predef.RefType, out o);
+    Bpl.Expr field; var fieldVar = BplBoundVar("$f", Predef.FieldName(f.Origin), out field);
+    Bpl.Expr oNotNull = Bpl.Expr.Neq(o, Predef.Null);
+    Bpl.Expr oNotNullAlloced = oNotNull;
+    Bpl.Expr unchanged = Bpl.Expr.Eq(ReadHeap(f.Origin, h0, o, field), ReadHeap(f.Origin, h1, o, field));
+
+    Bpl.Expr h0IsHeapAnchor = FunctionCall(h0.tok, BuiltinFunction.IsHeapAnchor, null, h0);
+    Bpl.Expr heapSucc = HeapSucc(h0, h1);
+    Bpl.Expr r0 = InRWClause(f.Origin, o, field, f.Reads.Expressions, etran0, null, null);
+    Bpl.Expr q0 = new Bpl.ForallExpr(f.Origin, new List<TypeVariable> { }, new List<Variable> { oVar, fieldVar },
+      BplImp(BplAnd(oNotNullAlloced, r0), unchanged));
+
+    List<Bpl.Expr> tyexprs;
+    var bvars = MkTyParamBinders(GetTypeParams(f), out tyexprs);
+    var f0args = new List<Bpl.Expr>(tyexprs);
+    var f1args = new List<Bpl.Expr>(tyexprs);
+    var f0argsCanCall = new List<Bpl.Expr>(tyexprs);
+    var f1argsCanCall = new List<Bpl.Expr>(tyexprs);
+    if (f.IsFuelAware()) {
+      Bpl.Expr s; var sV = BplBoundVar("$ly", Predef.LayerType, out s);
+      bvars.Add(sV);
+      f0args.Add(s); f1args.Add(s);  // but don't add to f0argsCanCall or f1argsCanCall
+    }
+
+    if (reveal != null) {
+      bvars.Add(revealVar);
+      f0args.Add(reveal); f1args.Add(reveal);
+    }
+
+    if (prevH != null) {
+      bvars.Add(prevHVar);
+      f0args.Add(prevH); f1args.Add(prevH); f0argsCanCall.Add(prevH); f1argsCanCall.Add(prevH);
+    }
+    bvars.Add(h0Var); bvars.Add(h1Var);
+    f0args.Add(h0); f1args.Add(h1); f0argsCanCall.Add(h0); f1argsCanCall.Add(h1);
+
+    var useAlloc = f.Reads.Expressions.Exists(fe => fe.E is WildcardExpr) ? ISALLOC : NOALLOC;
+    if (!f.IsStatic) {
+      Bpl.Expr th; var thVar = BplBoundVar("this", TrReceiverType(f), out th);
+      bvars.Add(thVar);
+      f0args.Add(th); f1args.Add(th); f0argsCanCall.Add(th); f1argsCanCall.Add(th);
+
+      Type thisType = ModuleResolver.GetReceiverType(f.Origin, f);
+      Bpl.Expr wh = BplAnd(ReceiverNotNull(th), GetWhereClause(f.Origin, th, thisType, etran0, useAlloc));
+      wellFormed = BplAnd(wellFormed, wh);
+    }
+
+    // (formalsAreWellFormed[h0] || canCallF(h0,...)) && (formalsAreWellFormed[h1] || canCallF(h1,...))
+    Bpl.Expr fwf0 = Bpl.Expr.True;
+    Bpl.Expr fwf1 = Bpl.Expr.True;
+    foreach (Formal p in f.Ins) {
+      Bpl.BoundVariable bv = new Bpl.BoundVariable(p.Origin, new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)));
+      bvars.Add(bv);
+      Bpl.Expr formal = new Bpl.IdentifierExpr(p.Origin, bv);
+      f0args.Add(formal); f1args.Add(formal); f0argsCanCall.Add(formal); f1argsCanCall.Add(formal);
+      Bpl.Expr wh = GetWhereClause(p.Origin, formal, p.Type, etran0, useAlloc);
+      if (wh != null) {
+        fwf0 = BplAnd(fwf0, wh);
+      }
+      wh = GetWhereClause(p.Origin, formal, p.Type, etran1, useAlloc);
+      if (wh != null) {
+        fwf1 = BplAnd(fwf1, wh);
+      }
+    }
+    var canCall = new Bpl.FunctionCall(new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName + "#canCall", Bpl.Type.Bool));
+    var f0canCall = new Bpl.NAryExpr(f.Origin, canCall, f0argsCanCall);
+    var f1canCall = new Bpl.NAryExpr(f.Origin, canCall, f1argsCanCall);
+    wellFormed = BplAnd(wellFormed, Bpl.Expr.Or(
+      BplOr(f0canCall, fwf0),
+      BplOr(f1canCall, fwf1)));
+    /*
+    JA: I conjecture that we don't need fwf0 or fwf1 here. But, we
+        will need both can calls,
+        i.e.,
+        wellFormed = BplAnd(wellFormed, BplOr(f0canCall, f1canCall))
+    */
+    /*
+    DR: I conjecture that this should be enough,
+        as the requires is preserved when the frame is:
+
+    wellFormed = BplAnd(wellFormed,
+      BplOr(new Bpl.NAryExpr(f.Tok, canCall, f0argsCanCall), fwf0));
+    */
+
+    var fn = new Bpl.FunctionCall(new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName, TrType(f.ResultType)));
+    var F0 = new Bpl.NAryExpr(f.Origin, fn, f0args);
+    var F1 = new Bpl.NAryExpr(f.Origin, fn, f1args);
+    var eq = BplAnd(Bpl.Expr.Eq(F0, F1), Bpl.Expr.Eq(f0canCall, f1canCall));
+    var tr = new Bpl.Trigger(f.Origin, true, new List<Bpl.Expr> { h0IsHeapAnchor, heapSucc, F1 });
+
+    var ax = new Bpl.ForallExpr(f.Origin, new List<Bpl.TypeVariable>(), bvars, null, tr,
+      BplImp(BplAnd(wellFormed, BplAnd(h0IsHeapAnchor, heapSucc)),
+      BplImp(q0, eq)));
+    sink.AddTopLevelDeclaration(new Bpl.Axiom(f.Origin, ax, comment));
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.Iterators.cs b/Source/DafnyCore/Verifier/BoogieGenerator.Iterators.cs
new file mode 100644
index 00000000000..ae680b4f5ce
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.Iterators.cs
@@ -0,0 +1,400 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Reflection;
+using System.Security.Cryptography;
+using Bpl = Microsoft.Boogie;
+using BplParser = Microsoft.Boogie.Parser;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using Core;
+using DafnyCore.Verifier;
+using Microsoft.BaseTypes;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Dafny.Triggers;
+using Action = System.Action;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+using static Microsoft.Dafny.GenericErrors;
+
+namespace Microsoft.Dafny {
+  public partial class BoogieGenerator {
+    void AddIteratorSpecAndBody(IteratorDecl iter) {
+      Contract.Requires(iter != null);
+      Contract.Ensures(fuelContext == Contract.OldValue(fuelContext));
+
+      FuelContext oldFuelContext = this.fuelContext;
+      this.fuelContext = FuelSetting.NewFuelContext(iter);
+      IsAllocContext = new IsAllocContext(options, false);
+
+      // wellformedness check for method specification
+      Bpl.Procedure proc = AddIteratorProc(iter, MethodTranslationKind.SpecWellformedness);
+      sink.AddTopLevelDeclaration(proc);
+      if (InVerificationScope(iter)) {
+        AddIteratorWellformednessCheck(iter, proc);
+      }
+      // the method itself
+      if (iter.Body != null && InVerificationScope(iter)) {
+        proc = AddIteratorProc(iter, MethodTranslationKind.Implementation);
+        sink.AddTopLevelDeclaration(proc);
+        // ...and its implementation
+        AddIteratorImpl(iter, proc);
+      }
+      this.fuelContext = oldFuelContext;
+      IsAllocContext = null;
+    }
+
+
+    Bpl.Procedure AddIteratorProc(IteratorDecl iter, MethodTranslationKind kind) {
+      Contract.Requires(iter != null);
+      Contract.Requires(kind == MethodTranslationKind.SpecWellformedness || kind == MethodTranslationKind.Implementation);
+      Contract.Requires(Predef != null);
+      Contract.Requires(currentModule == null && codeContext == null);
+      Contract.Ensures(currentModule == null && codeContext == null);
+      Contract.Ensures(Contract.Result<Bpl.Procedure>() != null);
+
+      proofDependencies.SetCurrentDefinition(MethodVerboseName(iter.FullDafnyName, kind), iter);
+      currentModule = iter.EnclosingModuleDefinition;
+      codeContext = iter;
+
+      var etran = new ExpressionTranslator(this, Predef, iter.Origin, iter);
+
+      var inParams = new List<Bpl.Variable>();
+      GenerateMethodParametersChoose(iter.Origin, iter, kind,
+        true, true, false, etran, inParams, out var outParams);
+
+      var req = new List<Bpl.Requires>();
+      var mod = new List<Bpl.IdentifierExpr>();
+      var ens = new List<Bpl.Ensures>();
+      // FREE PRECONDITIONS
+      mod.Add(etran.HeapCastToIdentifierExpr);
+
+      if (kind != MethodTranslationKind.SpecWellformedness) {
+        // USER-DEFINED SPECIFICATIONS
+        var comment = "user-defined preconditions";
+        foreach (var p in iter.Requires) {
+          req.Add(FreeRequires(p.E.Origin, etran.CanCallAssumption(p.E), comment, true));
+          var (errorMessage, successMessage) = CustomErrorMessage(p.Attributes);
+          if (p.Label != null && kind == MethodTranslationKind.Implementation) {
+            // don't include this precondition here, but record it for later use
+            p.Label.E = etran.Old.TrExpr(p.E);
+          } else {
+            foreach (var split in TrSplitExprForMethodSpec(new BodyTranslationContext(false), p.E, etran, kind)) {
+              if (kind == MethodTranslationKind.Call && split.Tok.IsInherited(currentModule)) {
+                // this precondition was inherited into this module, so just ignore it
+              } else {
+                req.Add(Requires(split.Tok, split.IsOnlyFree, p.E, split.E, errorMessage, successMessage, comment));
+                comment = null;
+                // the free here is not linked to the free on the original expression (this is free things generated in the splitting.)
+              }
+            }
+          }
+        }
+        comment = "user-defined postconditions";
+        foreach (var p in iter.Ensures) {
+          var canCalls = etran.CanCallAssumption(p.E);
+          AddEnsures(ens, FreeEnsures(p.E.Origin, canCalls, comment, true));
+
+          foreach (var split in TrSplitExprForMethodSpec(new BodyTranslationContext(false), p.E, etran, kind)) {
+            if (kind == MethodTranslationKind.Implementation && split.Tok.IsInherited(currentModule)) {
+              // this postcondition was inherited into this module, so just ignore it
+            } else {
+              ens.Add(Ensures(split.Tok, split.IsOnlyFree, p.E, split.E, null, null, comment));
+              comment = null;
+            }
+          }
+        }
+        foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(iter.Origin, iter.Modifies.Expressions, false, iter.AllowsAllocation, etran.Old, etran, etran.Old)) {
+          ens.Add(Ensures(tri.tok, tri.IsFree, null, tri.Expr, tri.ErrorMessage, tri.SuccessMessage, tri.Comment));
+        }
+      }
+
+      var name = MethodName(iter, kind);
+      var proc = new Bpl.Procedure(iter.Origin, name, new List<Bpl.TypeVariable>(),
+        inParams, outParams.Values.ToList(), false, req, mod, ens, etran.TrAttributes(iter.Attributes, null));
+      AddVerboseNameAttribute(proc, iter.FullDafnyName, kind);
+
+      currentModule = null;
+      codeContext = null;
+
+      return proc;
+    }
+
+    void AddIteratorWellformednessCheck(IteratorDecl iter, Procedure proc) {
+      Contract.Requires(iter != null);
+      Contract.Requires(proc != null);
+      Contract.Requires(currentModule == null && codeContext == null);
+      Contract.Ensures(currentModule == null && codeContext == null);
+
+      proofDependencies.SetCurrentDefinition(proc.VerboseName, iter);
+      currentModule = iter.EnclosingModuleDefinition;
+      codeContext = iter;
+
+      List<Variable> inParams = Bpl.Formal.StripWhereClauses(proc.InParams);
+      Contract.Assert(1 <= inParams.Count);  // there should at least be a receiver parameter
+      Contract.Assert(proc.OutParams.Count == 0);
+
+      var builder = new BoogieStmtListBuilder(this, options, new BodyTranslationContext(false));
+      var etran = new ExpressionTranslator(this, Predef, iter.Origin, iter);
+      // Don't do reads checks since iterator reads clauses mean something else.
+      // See comment inside GenerateIteratorImplPrelude().
+      etran = etran.WithReadsFrame(null);
+      var localVariables = new Variables();
+      GenerateIteratorImplPrelude(iter, inParams, new List<Variable>(), builder, localVariables, etran);
+
+      // check well-formedness of any default-value expressions (before assuming preconditions)
+      foreach (var formal in iter.Ins.Where(formal => formal.DefaultValue != null)) {
+        var e = formal.DefaultValue;
+        CheckWellformed(e, new WFOptions(null, false, false, true), localVariables, builder, etran.WithReadsFrame(etran.readsFrame, null));
+        builder.Add(new Bpl.AssumeCmd(e.Origin, etran.CanCallAssumption(e)));
+        CheckSubrange(e.Origin, etran.TrExpr(e), e.Type, formal.Type, e, builder);
+      }
+      // check well-formedness of the preconditions, and then assume each one of them
+      var wfOptions = new WFOptions();
+      foreach (var p in iter.Requires) {
+        CheckWellformedAndAssume(p.E, wfOptions, localVariables, builder, etran, "iterator requires clause");
+      }
+      // check well-formedness of the modifies and reads clauses
+      CheckFrameWellFormed(wfOptions, iter.Modifies.Expressions, localVariables, builder, etran);
+      CheckFrameWellFormed(wfOptions, iter.Reads.Expressions, localVariables, builder, etran);
+      // check well-formedness of the decreases clauses
+      foreach (var p in iter.Decreases.Expressions) {
+        CheckWellformed(p, wfOptions, localVariables, builder, etran);
+      }
+
+      // Next, we assume about this.* whatever we said that the iterator constructor promises
+      foreach (var p in ConjunctsOf(iter.Member_Init.Ens)) {
+        builder.Add(TrAssumeCmdWithDependencies(etran, p.E.Origin, p.E, "iterator ensures clause"));
+      }
+
+      // play havoc with the heap, except at the locations prescribed by (this._reads - this._modifies - {this})
+      var th = new ThisExpr(iter);  // resolve here
+      var rds = new MemberSelectExpr(iter.Origin, th, iter.Member_Reads);
+      var mod = new MemberSelectExpr(iter.Origin, th, iter.Member_Modifies);
+      builder.Add(Call(builder.Context, iter.Origin, "$IterHavoc0",
+        new List<Expr>() { etran.TrExpr(th), etran.TrExpr(rds), etran.TrExpr(mod) },
+        new List<Bpl.IdentifierExpr>()));
+
+      // assume the automatic yield-requires precondition (which is always well-formed):  this.Valid()
+      var validCall = new FunctionCallExpr(iter.Origin, new Name("Valid"), th, iter.Origin, Token.NoToken, new List<Expression>());
+      validCall.Function = iter.Member_Valid;  // resolve here
+      validCall.Type = Type.Bool;  // resolve here
+      validCall.TypeApplication_AtEnclosingClass = iter.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));  // resolve here
+      validCall.TypeApplication_JustFunction = new List<Type>(); // resolved here
+
+      builder.Add(TrAssumeCmd(iter.Origin, etran.TrExpr(validCall)));
+
+      // check well-formedness of the user-defined part of the yield-requires
+      foreach (var p in iter.YieldRequires) {
+        CheckWellformedAndAssume(p.E, new WFOptions(), localVariables, builder, etran, "iterator yield-requires clause");
+      }
+
+      // save the heap (representing the state where yield-requires holds):  $_OldIterHeap := Heap;
+      var oldIterHeap = localVariables.GetOrAdd(new Bpl.LocalVariable(iter.Origin, new Bpl.TypedIdent(iter.Origin, "$_OldIterHeap", Predef.HeapType)));
+      builder.Add(Bpl.Cmd.SimpleAssign(iter.Origin, new Bpl.IdentifierExpr(iter.Origin, oldIterHeap), etran.HeapExpr));
+      // simulate a modifies this, this._modifies, this._new;
+      var nw = new MemberSelectExpr(iter.Origin, th, iter.Member_New);
+      builder.Add(Call(builder.Context, iter.Origin, "$IterHavoc1",
+        new List<Bpl.Expr>() { etran.TrExpr(th), etran.TrExpr(mod), etran.TrExpr(nw) },
+        new List<Bpl.IdentifierExpr>()));
+      // assume the implicit postconditions promised by MoveNext:
+      // assume fresh(_new - old(_new));
+      var yeEtran = new ExpressionTranslator(this, Predef, etran.HeapExpr, new Bpl.IdentifierExpr(iter.Origin, "$_OldIterHeap", Predef.HeapType), iter);
+      var old_nw = new OldExpr(iter.Origin, nw);
+      old_nw.Type = nw.Type;  // resolve here
+      var setDiff = new BinaryExpr(iter.Origin, BinaryExpr.Opcode.Sub, nw, old_nw);
+      setDiff.ResolvedOp = BinaryExpr.ResolvedOpcode.SetDifference; setDiff.Type = nw.Type;  // resolve here
+      Expression cond = new FreshExpr(iter.Origin, setDiff);
+      cond.Type = Type.Bool;  // resolve here
+      builder.Add(TrAssumeCmd(iter.Origin, yeEtran.TrExpr(cond)));
+
+      // check wellformedness of postconditions
+      var yeBuilder = new BoogieStmtListBuilder(this, options, builder.Context);
+      var endBuilder = new BoogieStmtListBuilder(this, options, builder.Context);
+      // In the yield-ensures case:  assume this.Valid();
+      yeBuilder.Add(TrAssumeCmdWithDependencies(yeEtran, iter.Origin, validCall, "iterator validity"));
+      Contract.Assert(iter.OutsFields.Count == iter.OutsHistoryFields.Count);
+      for (int i = 0; i < iter.OutsFields.Count; i++) {
+        var y = iter.OutsFields[i];
+        var ys = iter.OutsHistoryFields[i];
+        var thisY = new MemberSelectExpr(iter.Origin, th, y);
+        var thisYs = new MemberSelectExpr(iter.Origin, th, ys);
+        var oldThisYs = new OldExpr(iter.Origin, thisYs);
+        oldThisYs.Type = thisYs.Type;  // resolve here
+        var singleton = new SeqDisplayExpr(iter.Origin, new List<Expression>() { thisY });
+        singleton.Type = thisYs.Type;  // resolve here
+        var concat = new BinaryExpr(iter.Origin, BinaryExpr.Opcode.Add, oldThisYs, singleton);
+        concat.ResolvedOp = BinaryExpr.ResolvedOpcode.Concat; concat.Type = oldThisYs.Type;  // resolve here
+
+        // In the yield-ensures case:  assume this.ys == old(this.ys) + [this.y];
+        yeBuilder.Add(TrAssumeCmd(iter.Origin, Bpl.Expr.Eq(yeEtran.TrExpr(thisYs), yeEtran.TrExpr(concat))));
+        // In the ensures case:  assume this.ys == old(this.ys);
+        endBuilder.Add(TrAssumeCmd(iter.Origin, Bpl.Expr.Eq(yeEtran.TrExpr(thisYs), yeEtran.TrExpr(oldThisYs))));
+      }
+
+      foreach (var p in iter.YieldEnsures) {
+        CheckWellformedAndAssume(p.E, wfOptions, localVariables, yeBuilder, yeEtran, "iterator yield-ensures clause");
+      }
+      foreach (var p in iter.Ensures) {
+        CheckWellformedAndAssume(p.E, wfOptions, localVariables, endBuilder, yeEtran, "iterator ensures clause");
+      }
+      builder.Add(new Bpl.IfCmd(iter.Origin, null, yeBuilder.Collect(iter.Origin), null, endBuilder.Collect(iter.Origin)));
+
+      Bpl.StmtList stmts = builder.Collect(iter.Origin);
+
+      if (EmitImplementation(iter.Attributes)) {
+        QKeyValue kv = etran.TrAttributes(iter.Attributes, null);
+        AddImplementationWithAttributes(GetToken(iter), proc, inParams, new List<Variable>(),
+          localVariables, stmts, kv);
+      }
+
+      Reset();
+    }
+
+    void AddIteratorImpl(IteratorDecl iter, Bpl.Procedure proc) {
+      Contract.Requires(iter != null);
+      Contract.Requires(proc != null);
+      Contract.Requires(sink != null && Predef != null);
+      Contract.Requires(iter.Body != null);
+      Contract.Requires(currentModule == null && codeContext == null && yieldCountVariable == null && _tmpIEs.Count == 0);
+      Contract.Ensures(currentModule == null && codeContext == null && yieldCountVariable == null && _tmpIEs.Count == 0);
+
+      proofDependencies.SetCurrentDefinition(proc.VerboseName, iter);
+      currentModule = iter.EnclosingModuleDefinition;
+      codeContext = iter;
+
+      List<Variable> inParams = Bpl.Formal.StripWhereClauses(proc.InParams);
+      Contract.Assert(1 <= inParams.Count);  // there should at least be a receiver parameter
+      Contract.Assert(proc.OutParams.Count == 0);
+
+      var builder = new BoogieStmtListBuilder(this, options, new BodyTranslationContext(iter.ContainsHide));
+      var etran = new ExpressionTranslator(this, Predef, iter.Origin, iter);
+      // Don't do reads checks since iterator reads clauses mean something else.
+      // See comment inside GenerateIteratorImplPrelude().
+      etran = etran.WithReadsFrame(null);
+      var localVariables = new Variables();
+      GenerateIteratorImplPrelude(iter, inParams, new List<Variable>(), builder, localVariables, etran);
+
+      // add locals for the yield-history variables and the extra variables
+      // Assume the precondition and postconditions of the iterator constructor method
+      foreach (var p in ConjunctsOf(iter.Member_Init.Req)) {
+        if (p.Label != null) {
+          // don't include this precondition here
+          Contract.Assert(p.Label.E != null);  // it should already have been recorded
+        } else {
+          builder.Add(TrAssumeCmdWithDependencies(etran, p.E.Origin, p.E, "iterator constructor requires clause"));
+        }
+      }
+      foreach (var p in ConjunctsOf(iter.Member_Init.Ens)) {
+        // these postconditions are two-state predicates, but that's okay, because we haven't changed anything yet
+        builder.Add(TrAssumeCmdWithDependencies(etran, p.E.Origin, p.E, "iterator constructor ensures clause"));
+      }
+      // add the _yieldCount variable, and assume its initial value to be 0
+      yieldCountVariable = (Bpl.LocalVariable)localVariables.GetOrAdd(new Bpl.LocalVariable(iter.Origin,
+        new Bpl.TypedIdent(iter.Origin, iter.YieldCountVariable.AssignUniqueName(CurrentDeclaration.IdGenerator), TrType(iter.YieldCountVariable.Type))));
+      yieldCountVariable.TypedIdent.WhereExpr = YieldCountAssumption(iter, etran);  // by doing this after setting "yieldCountVariable", the variable can be used by YieldCountAssumption
+      builder.Add(TrAssumeCmd(iter.Origin, Bpl.Expr.Eq(new Bpl.IdentifierExpr(iter.Origin, yieldCountVariable), Bpl.Expr.Literal(0))));
+      // add a variable $_OldIterHeap
+      var oih = new Bpl.IdentifierExpr(iter.Origin, "$_OldIterHeap", Predef.HeapType);
+      Bpl.Expr wh = BplAnd(
+        FunctionCall(iter.Origin, BuiltinFunction.IsGoodHeap, null, oih),
+        HeapSucc(oih, etran.HeapExpr));
+      localVariables.GetOrAdd(new Bpl.LocalVariable(iter.Origin, new Bpl.TypedIdent(iter.Origin, "$_OldIterHeap", Predef.HeapType, wh)));
+
+      // do an initial YieldHavoc
+      YieldHavoc(iter.Origin, iter, builder, etran);
+
+      // translate the body of the iterator
+      var stmts = TrStmt2StmtList(builder, iter.Body, localVariables, etran);
+
+      if (EmitImplementation(iter.Attributes)) {
+        // emit the impl only when there are proof obligations.
+        QKeyValue kv = etran.TrAttributes(iter.Attributes, null);
+
+        AddImplementationWithAttributes(GetToken(iter), proc, inParams,
+          new List<Variable>(), localVariables, stmts, kv);
+      }
+
+      yieldCountVariable = null;
+      Reset();
+    }
+
+    Bpl.Expr YieldCountAssumption(IteratorDecl iter, ExpressionTranslator etran) {
+      Contract.Requires(iter != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(yieldCountVariable != null);
+      Bpl.Expr wh = Bpl.Expr.True;
+      foreach (var ys in iter.OutsHistoryFields) {
+        // add the conjunct:  _yieldCount == |this.ys|
+        wh = BplAnd(wh, Bpl.Expr.Eq(new Bpl.IdentifierExpr(iter.Origin, yieldCountVariable),
+          FunctionCall(iter.Origin, BuiltinFunction.SeqLength, null,
+            ApplyUnbox(iter.Origin, ReadHeap(iter.Origin, etran.HeapExpr,
+              new Bpl.IdentifierExpr(iter.Origin, etran.This, Predef.RefType),
+              new Bpl.IdentifierExpr(iter.Origin, GetField(ys))), TrType(ys.Type)))));
+      }
+      return wh;
+    }
+
+    void GenerateIteratorImplPrelude(IteratorDecl iter, List<Variable> inParams, List<Variable> outParams,
+      BoogieStmtListBuilder builder, Variables localVariables, ExpressionTranslator etran) {
+      Contract.Requires(iter != null);
+      Contract.Requires(inParams != null);
+      Contract.Requires(outParams != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(localVariables != null);
+      Contract.Requires(Predef != null);
+
+      // set up the information used to verify the method's modifies clause
+      var iteratorFrame = new List<FrameExpression>();
+      var th = new ThisExpr(iter);
+      iteratorFrame.Add(new FrameExpression(iter.Origin, th, null));
+      iteratorFrame.AddRange(iter.Modifies.Expressions);
+      // Note we explicitly do NOT use iter.Reads, because reads clauses on iterators
+      // mean something different from reads clauses on functions or methods:
+      // the memory locations that are not havoced by a yield statement.
+      // Look for the references to the YieldHavoc, IterHavoc0 and IterHavoc1 DafnyPrelude.bpl functions for details.
+      Contract.Assert(etran.readsFrame == null);
+      DefineFrame(iter.Origin, etran.ModifiesFrame(iter.Origin), iteratorFrame, builder, localVariables, null);
+      builder.AddCaptureState(iter.Origin, false, "initial state");
+    }
+
+    /// <summary>
+    /// Generate:
+    ///   havoc Heap \ {this} \ _reads \ _new;
+    ///   assume this.Valid();
+    ///   assume YieldRequires;
+    ///   $_OldIterHeap := Heap;
+    /// </summary>
+    void YieldHavoc(IOrigin tok, IteratorDecl iter, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+      Contract.Requires(tok != null);
+      Contract.Requires(iter != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+      // havoc Heap \ {this} \ _reads \ _new;
+      var th = new ThisExpr(iter);
+      var rds = new MemberSelectExpr(tok, th, iter.Member_Reads);
+      var nw = new MemberSelectExpr(tok, th, iter.Member_New);
+      builder.Add(Call(builder.Context, tok, "$YieldHavoc",
+        new List<Bpl.Expr>() { etran.TrExpr(th), etran.TrExpr(rds), etran.TrExpr(nw) },
+        new List<Bpl.IdentifierExpr>()));
+      // assume YieldRequires;
+      foreach (var p in iter.YieldRequires) {
+        builder.Add(TrAssumeCmdWithDependencies(etran, tok, p.E, "iterator yield-requires clause"));
+      }
+      // $_OldIterHeap := Heap;
+      builder.Add(Bpl.Cmd.SimpleAssign(tok, new Bpl.IdentifierExpr(tok, "$_OldIterHeap", Predef.HeapType), etran.HeapExpr));
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.LetExpr.cs b/Source/DafnyCore/Verifier/BoogieGenerator.LetExpr.cs
new file mode 100644
index 00000000000..36c2310e6f6
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.LetExpr.cs
@@ -0,0 +1,490 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Diagnostics.Contracts;
+using Bpl = Microsoft.Boogie;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+
+namespace Microsoft.Dafny {
+  public partial class BoogieGenerator {
+    public partial class ExpressionTranslator {
+
+      private Expr LetCanCallAssumption(LetExpr expr, CanCallOptions cco) {
+        if (!expr.Exact) {
+          // CanCall[[ var b0,b1 :| RHS(b0,b1,g); Body(b0,b1,g,h) ]] =
+          //   $let$canCall(g) &&
+          //   CanCall[[ Body($let$b0(g), $let$b1(g), h) ]]
+          LetDesugaring(expr);  // call LetDesugaring to prepare the desugaring and populate letSuchThatExprInfo with something for e
+          var info = BoogieGenerator.letSuchThatExprInfo[expr];
+          // $let$canCall(g)
+          var canCall = info.CanCallFunctionCall(BoogieGenerator, this);
+          Dictionary<IVariable, Expression> substMap = new Dictionary<IVariable, Expression>();
+          foreach (var bv in expr.BoundVars) {
+            // create a call to $let$x(g)
+            var args = info.SkolemFunctionArgs(bv, BoogieGenerator, this);
+            var call = new BoogieFunctionCall(bv.Origin, info.SkolemFunctionName(bv), info.UsesHeap, info.UsesOldHeap, info.UsesHeapAt, args.Item1, args.Item2);
+            call.Type = bv.Type;
+            substMap.Add(bv, call);
+          }
+          var p = Substitute(expr.Body, null, substMap);
+          var cc = BplAnd(canCall, CanCallAssumption(p, cco));
+          return cc;
+        } else {
+          // CanCall[[ var b := RHS(g); Body(b,g,h) ]] =
+          //   CanCall[[ RHS(g) ]] &&
+          //   (var lhs0,lhs1,... := rhs0,rhs1,...;  CanCall[[ Body ]])
+          Boogie.Expr canCallRHS = Boogie.Expr.True;
+          foreach (var rhs in expr.RHSs) {
+            canCallRHS = BplAnd(canCallRHS, CanCallAssumption(rhs, cco));
+          }
+
+          var bodyCanCall = CanCallAssumption(expr.Body);
+          // We'd like to compute the free variables if "bodyCanCall". It would be nice to use the Boogie
+          // routine Bpl.Expr.ComputeFreeVariables for this purpose. However, calling it requires the Boogie
+          // expression to be resolved. Instead, we do the cheesy thing of computing the set of names of
+          // free variables in "bodyCanCall".
+          var vis = new VariableNameVisitor();
+          vis.Visit(bodyCanCall);
+
+          List<Boogie.Variable> lhssAll;
+          List<Boogie.Expr> rhssAll;
+          TrLetExprPieces(expr, out lhssAll, out rhssAll);
+          Contract.Assert(lhssAll.Count == rhssAll.Count);
+
+          // prune lhss,rhss to contain only those pairs where the LHS is used in the body
+          var lhssPruned = new List<Boogie.Variable>();
+          var rhssPruned = new List<Boogie.Expr>();
+          for (var i = 0; i < lhssAll.Count; i++) {
+            var bv = lhssAll[i];
+            if (vis.Names.Contains(bv.Name)) {
+              lhssPruned.Add(bv);
+              rhssPruned.Add(rhssAll[i]);
+            }
+          }
+          Boogie.Expr let = lhssPruned.Count == 0 ? bodyCanCall : new Boogie.LetExpr(expr.Origin, lhssPruned, rhssPruned, null, bodyCanCall);
+          return BplAnd(canCallRHS, let);
+        }
+      }
+
+      private Expr TrLetExpr(LetExpr letExpr) {
+        if (!letExpr.Exact) {
+          var d = LetDesugaring(letExpr);
+          return TrExpr(d);
+        } else {
+          TrLetExprPieces(letExpr, out var lhss, out var rhss);
+          // in the translation of body, treat a let-bound variable as IsLit if its RHS definition is IsLit
+          Contract.Assert(lhss.Count == rhss.Count); // this is a postcondition of TrLetExprPieces
+          var previousCount = BoogieGenerator.letBoundVariablesWithLitRHS.Count;
+          for (var i = 0; i < lhss.Count; i++) {
+            if (BoogieGenerator.IsLit(rhss[i])) {
+              BoogieGenerator.letBoundVariablesWithLitRHS.Add(lhss[i].Name);
+            }
+
+            i++;
+          }
+
+          var body = TrExpr(letExpr.Body);
+          foreach (var v in lhss) {
+            BoogieGenerator.letBoundVariablesWithLitRHS.Remove(v.Name);
+          }
+
+          Contract.Assert(previousCount == BoogieGenerator.letBoundVariablesWithLitRHS.Count);
+          // in the following, use the token for Body instead of the token for the whole let expression; this gives better error locations
+          return new Boogie.LetExpr(GetToken(letExpr.Body), lhss, rhss, null, body);
+        }
+      }
+
+      public void TrLetExprPieces(LetExpr let, out List<Boogie.Variable> lhss, out List<Boogie.Expr> rhss) {
+        Contract.Requires(let != null);
+        var substMap = new Dictionary<IVariable, Expression>();
+        for (int i = 0; i < let.LHSs.Count; i++) {
+          var rhs = TrExpr(let.RHSs[i]);
+          var toType = let.LHSs[i].Var?.Type ?? let.LHSs[i].Expr.Type;
+          rhs = BoogieGenerator.CondApplyBox(rhs.tok, rhs, let.RHSs[i].Type, toType);
+          BoogieGenerator.AddCasePatternVarSubstitutions(let.LHSs[i], rhs, substMap);
+        }
+        lhss = new List<Boogie.Variable>();
+        rhss = new List<Boogie.Expr>();
+        foreach (var v in let.BoundVars) {
+          var rhs = substMap[v];  // this should succeed (that is, "v" is in "substMap"), because the AddCasePatternVarSubstitutions calls above should have added a mapping for each bound variable in let.BoundVars
+          var bv = BplBoundVar(v.AssignUniqueName(BoogieGenerator.CurrentDeclaration.IdGenerator), BoogieGenerator.TrType(v.Type), out var bvIde);
+          lhss.Add(bv);
+          rhss.Add(TrExpr(rhs));
+        }
+      }
+
+      /// <summary>
+      /// Fills in, if necessary, the e.translationDesugaring field, and returns it.
+      /// Also, makes sure that letSuchThatExprInfo maps e to something.
+      /// </summary>
+      public Expression LetDesugaring(LetExpr e) {
+        Contract.Requires(e != null);
+        Contract.Requires(!e.Exact);
+        Contract.Ensures(Contract.Result<Expression>() != null);
+        if (e.GetTranslationDesugaring(BoogieGenerator) == null) {
+          // For let-such-that expression:
+          //   var x:X, y:Y :| P(x,y,g); F(...)
+          // where
+          //   - g has type G, and
+          //   - tt* denotes the list of type variables in the types X and Y and expression F(...),
+          // declare a function for each bound variable:
+          //   function $let$x(Ty*, G): X;
+          //   function $let$y(Ty*, G): Y;
+          //   function $let_canCall(Ty*, G): bool;
+          // and add an axiom about these functions:
+          //   axiom (forall tt*:Ty*, g:G ::
+          //            { $let$x(tt*, g) }
+          //            { $let$y(tt*, g) }
+          //            $let$_canCall(tt*, g)) ==>
+          //            P($let$x(tt*, g), $let$y(tt*, g), g));
+          // and create the desugaring:
+          //   var x:X, y:Y := $let$x(tt*, g), $let$y(tt*, g); F(...)
+          if (e is SubstLetExpr) {
+            // desugar based on the original letexpr.
+            var expr = (SubstLetExpr)e;
+            var orgExpr = expr.orgExpr;
+            Expression d = LetDesugaring(orgExpr);
+            e.SetTranslationDesugaring(BoogieGenerator, Substitute(d, null, expr.substMap, expr.typeMap));
+            var orgInfo = BoogieGenerator.letSuchThatExprInfo[orgExpr];
+            BoogieGenerator.letSuchThatExprInfo.Add(expr, new LetSuchThatExprInfo(orgInfo, BoogieGenerator, expr.substMap, expr.typeMap));
+          } else {
+            // First, determine "g" as a list of Dafny variables FVs plus possibly this, $Heap, and old($Heap),
+            // and determine "tt*" as a list of Dafny type variables
+            LetSuchThatExprInfo info;
+            {
+              var FVs = new HashSet<IVariable>();
+              bool usesHeap = false, usesOldHeap = false;
+              var FVsHeapAt = new HashSet<Label>();
+              Type usesThis = null;
+              FreeVariablesUtil.ComputeFreeVariables(options, e.RHSs[0], FVs, ref usesHeap, ref usesOldHeap, FVsHeapAt,
+                ref usesThis, false);
+              var FTVs = new HashSet<TypeParameter>();
+              foreach (var bv in e.BoundVars) {
+                FVs.Remove(bv);
+                ComputeFreeTypeVariables(bv.Type, FTVs);
+              }
+
+              ComputeFreeTypeVariables(e.RHSs[0], FTVs);
+              info = new LetSuchThatExprInfo(e.Origin, BoogieGenerator.letSuchThatExprInfo.Count, FVs.ToList(), FTVs.ToList(), usesHeap,
+                usesOldHeap, FVsHeapAt, usesThis, BoogieGenerator.CurrentDeclaration);
+              BoogieGenerator.letSuchThatExprInfo.Add(e, info);
+            }
+
+            foreach (var bv in e.BoundVars) {
+              Bpl.Variable resType = new Bpl.Formal(bv.Origin,
+                new Bpl.TypedIdent(bv.Origin, Bpl.TypedIdent.NoName, BoogieGenerator.TrType(bv.Type)), false);
+              Bpl.Expr ante;
+              List<Variable> formals = info.GAsVars(BoogieGenerator, true, out ante, null);
+              var fn = new Bpl.Function(bv.Origin, info.SkolemFunctionName(bv), formals, resType);
+
+              if (BoogieGenerator.InsertChecksums) {
+                BoogieGenerator.InsertChecksum(e.Body, fn);
+              }
+
+              BoogieGenerator.sink.AddTopLevelDeclaration(fn);
+            }
+
+            var canCallFunction = AddLetSuchThatCanCallFunction(e, info);
+            AddLetSuchThenCanCallAxiom(e, info, canCallFunction);
+
+            // now that we've declared the functions and axioms, let's prepare the let-such-that desugaring
+            {
+              var etran = new ExpressionTranslator(BoogieGenerator, Predef, e.Origin, null);
+              var rhss = new List<Expression>();
+              foreach (var bv in e.BoundVars) {
+                var args = info.SkolemFunctionArgs(bv, BoogieGenerator, etran);
+                var rhs = new BoogieFunctionCall(bv.Origin, info.SkolemFunctionName(bv), info.UsesHeap, info.UsesOldHeap,
+                  info.UsesHeapAt, args.Item1, args.Item2);
+                rhs.Type = bv.Type;
+                rhss.Add(rhs);
+              }
+
+              var expr = new LetExpr(e.Origin, e.LHSs, rhss, e.Body, true);
+              expr.Type = e.Type; // resolve here
+              e.SetTranslationDesugaring(BoogieGenerator, expr);
+            }
+          }
+        }
+
+        return e.GetTranslationDesugaring(BoogieGenerator);
+      }
+
+      private Bpl.Function AddLetSuchThatCanCallFunction(LetExpr e, LetSuchThatExprInfo info) {
+        Bpl.Variable resType = new Bpl.Formal(e.Origin, new Bpl.TypedIdent(e.Origin, Bpl.TypedIdent.NoName, Bpl.Type.Bool),
+          false);
+        List<Variable> formals = info.GAsVars(BoogieGenerator, true, out var ante, null);
+        var canCallFunction = new Bpl.Function(e.Origin, info.CanCallFunctionName(), formals, resType);
+
+        if (BoogieGenerator.InsertChecksums) {
+          BoogieGenerator.InsertChecksum(e.Body, canCallFunction);
+        }
+
+        BoogieGenerator.sink.AddTopLevelDeclaration(canCallFunction);
+        return canCallFunction;
+      }
+
+      private void AddLetSuchThenCanCallAxiom(LetExpr e, LetSuchThatExprInfo info, Bpl.Function canCallFunction) {
+        var etranCC =
+          new ExpressionTranslator(BoogieGenerator, Predef, info.HeapExpr(BoogieGenerator, false), info.HeapExpr(BoogieGenerator, true), null);
+        Bpl.Expr typeAntecedents; // later ignored
+        List<Variable> gg = info.GAsVars(BoogieGenerator, false, out typeAntecedents, etranCC);
+        var gExprs = new List<Bpl.Expr>();
+        foreach (Bpl.Variable g in gg) {
+          gExprs.Add(new Bpl.IdentifierExpr(g.tok, g));
+        }
+
+        Bpl.Trigger tr = null;
+        Dictionary<IVariable, Expression> substMap = new Dictionary<IVariable, Expression>();
+        Bpl.Expr antecedent = Bpl.Expr.True;
+        foreach (var bv in e.BoundVars) {
+          // create a call to $let$x(g)
+          var call = FunctionCall(e.Origin, info.SkolemFunctionName(bv), BoogieGenerator.TrType(bv.Type), gExprs);
+          tr = new Bpl.Trigger(e.Origin, true, new List<Bpl.Expr> { call }, tr);
+          substMap.Add(bv, new BoogieWrapper(call, bv.Type));
+          if (!bv.Type.IsTypeParameter) {
+            Bpl.Expr wh = BoogieGenerator.GetWhereClause(bv.Origin, call, bv.Type, etranCC, NOALLOC);
+            if (wh != null) {
+              antecedent = BplAnd(antecedent, wh);
+            }
+          }
+        }
+
+        var i = info.FTVs.Count + (info.UsesHeap ? 1 : 0) + (info.UsesOldHeap ? 1 : 0) + info.UsesHeapAt.Count;
+        Expression receiverReplacement;
+        if (info.ThisType == null) {
+          receiverReplacement = null;
+        } else {
+          receiverReplacement = new BoogieWrapper(gExprs[i], info.ThisType);
+          i++;
+        }
+
+        foreach (var fv in info.FVs) {
+          var ge = gExprs[i];
+          substMap.Add(fv, new BoogieWrapper(ge, fv.Type));
+          i++;
+        }
+
+        var canCall = FunctionCall(e.Origin, info.CanCallFunctionName(), Bpl.Type.Bool, gExprs);
+        var p = Substitute(e.RHSs[0], receiverReplacement, substMap);
+        var canCallBody = etranCC.CanCallAssumption(p);
+        Bpl.Expr ax = BplImp(canCall, BplAnd(antecedent, BplAnd(canCallBody, etranCC.TrExpr(p))));
+        ax = BplForall(gg, tr, ax);
+        BoogieGenerator.AddOtherDefinition(canCallFunction, new Bpl.Axiom(e.Origin, ax));
+      }
+    }
+
+    public Dictionary<LetExpr, LetSuchThatExprInfo> letSuchThatExprInfo = new();
+
+    public class LetSuchThatExprInfo {
+      public readonly IOrigin Tok;
+      public readonly int LetId;
+      public readonly List<IVariable> FVs;
+
+      public readonly List<Expression>
+        FV_Exprs; // these are what initially were the free variables, but they may have undergone substitution so they are here Expression's.
+
+      public readonly List<TypeParameter> FTVs;
+      public readonly List<Type> FTV_Types;
+      public readonly bool UsesHeap;
+      public readonly bool UsesOldHeap;
+      public readonly List<Label> UsesHeapAt;
+      public readonly Type ThisType; // null if 'this' is not used
+
+      public LetSuchThatExprInfo(IOrigin tok, int uniqueLetId,
+        List<IVariable> freeVariables, List<TypeParameter> freeTypeVars,
+        bool usesHeap, bool usesOldHeap, ISet<Label> usesHeapAt, Type thisType, Declaration currentDeclaration) {
+        Tok = tok;
+        LetId = uniqueLetId;
+        FTVs = freeTypeVars;
+        FTV_Types = Map(freeTypeVars, tt => (Type)new UserDefinedType(tt));
+        FVs = freeVariables;
+        FV_Exprs = new List<Expression>();
+        foreach (var v in FVs) {
+          var idExpr = new IdentifierExpr(v.Origin, v.AssignUniqueName(currentDeclaration.IdGenerator));
+          idExpr.Var = v;
+          idExpr.Type = v.Type; // resolve here
+          FV_Exprs.Add(idExpr);
+        }
+
+        UsesHeap = usesHeap;
+        UsesOldHeap = usesOldHeap;
+        // we convert the set of heap-at variables to a list here, once and for all; the order itself is not material, what matters is that we always use the same order
+        UsesHeapAt = new List<Label>(usesHeapAt);
+        ThisType = thisType;
+      }
+
+      public LetSuchThatExprInfo(LetSuchThatExprInfo template, BoogieGenerator boogieGenerator,
+        Dictionary<IVariable, Expression> substMap,
+        Dictionary<TypeParameter, Type> typeMap) {
+        Contract.Requires(template != null);
+        Contract.Requires(boogieGenerator != null);
+        Contract.Requires(substMap != null);
+        Tok = template.Tok;
+        LetId = template.LetId; // reuse the ID, which ensures we get the same $let functions
+        FTVs = template.FTVs;
+        FTV_Types = template.FTV_Types.ConvertAll(t => t.Subst(typeMap));
+        FVs = template.FVs;
+        FV_Exprs = template.FV_Exprs.ConvertAll(e => BoogieGenerator.Substitute(e, null, substMap, typeMap));
+        UsesHeap = template.UsesHeap;
+        UsesOldHeap = template.UsesOldHeap;
+        UsesHeapAt = template.UsesHeapAt;
+        ThisType = template.ThisType;
+      }
+
+      public Tuple<List<Expression>, List<Type>> SkolemFunctionArgs(BoundVar bv, BoogieGenerator boogieGenerator,
+        ExpressionTranslator etran) {
+        Contract.Requires(bv != null);
+        Contract.Requires(boogieGenerator != null);
+        Contract.Requires(etran != null);
+        var args = new List<Expression>();
+        if (ThisType != null) {
+          var th = new ThisExpr(bv.Origin);
+          th.Type = ThisType;
+          args.Add(th);
+        }
+
+        args.AddRange(FV_Exprs);
+        return Tuple.Create(args, new List<Type>(FTV_Types));
+      }
+
+      public string SkolemFunctionName(BoundVar bv) {
+        Contract.Requires(bv != null);
+        return string.Format("$let#{0}_{1}", LetId, bv.Name);
+      }
+
+      public Bpl.Expr CanCallFunctionCall(BoogieGenerator boogieGenerator, ExpressionTranslator etran) {
+        Contract.Requires(boogieGenerator != null);
+        Contract.Requires(etran != null);
+        var gExprs = new List<Bpl.Expr>();
+        gExprs.AddRange(Map(FTV_Types, tt => boogieGenerator.TypeToTy(tt)));
+        if (UsesHeap) {
+          gExprs.Add(etran.HeapExpr);
+        }
+
+        if (UsesOldHeap) {
+          gExprs.Add(etran.Old.HeapExpr);
+        }
+
+        foreach (var heapAtLabel in UsesHeapAt) {
+          Bpl.Expr ve;
+          var bv = BplBoundVar("$Heap_at_" + heapAtLabel.AssignUniqueId(boogieGenerator.CurrentIdGenerator),
+            boogieGenerator.Predef.HeapType, out ve);
+          gExprs.Add(ve);
+        }
+
+        if (ThisType != null) {
+          var th = new Bpl.IdentifierExpr(Tok, etran.This);
+          gExprs.Add(th);
+        }
+
+        foreach (var v in FV_Exprs) {
+          gExprs.Add(etran.TrExpr(v));
+        }
+
+        return FunctionCall(Tok, CanCallFunctionName(), Bpl.Type.Bool, gExprs);
+      }
+
+      public string CanCallFunctionName() {
+        return string.Format("$let#{0}$canCall", LetId);
+      }
+
+      public Bpl.Expr HeapExpr(BoogieGenerator boogieGenerator, bool old) {
+        Contract.Requires(boogieGenerator != null);
+        return new Bpl.IdentifierExpr(Tok, old ? "$heap$old" : "$heap", boogieGenerator.Predef.HeapType);
+      }
+
+      /// <summary>
+      /// "wantFormals" means the returned list will consist of all in-parameters.
+      /// "!wantFormals" means the returned list will consist of all bound variables.
+      /// Guarantees that, in the list returned, "this" is the parameter immediately following
+      /// the (0, 1, or 2) heap arguments, if there is a "this" parameter at all.
+      /// Note, "typeAntecedents" is meaningfully filled only if "etran" is not null.
+      /// </summary>
+      public List<Variable> GAsVars(BoogieGenerator boogieGenerator, bool wantFormals, out Bpl.Expr typeAntecedents,
+        ExpressionTranslator etran) {
+        Contract.Requires(boogieGenerator != null);
+        var vv = new List<Variable>();
+        // first, add the type variables
+        vv.AddRange(Map(FTVs, tp => NewVar(NameTypeParam(tp), boogieGenerator.Predef.Ty, wantFormals)));
+        typeAntecedents = Bpl.Expr.True;
+        if (UsesHeap) {
+          var nv = NewVar("$heap", boogieGenerator.Predef.HeapType, wantFormals);
+          vv.Add(nv);
+          if (etran != null) {
+            var isGoodHeap = boogieGenerator.FunctionCall(Tok, BuiltinFunction.IsGoodHeap, null,
+              new Bpl.IdentifierExpr(Tok, nv));
+            typeAntecedents = BplAnd(typeAntecedents, isGoodHeap);
+          }
+        }
+
+        if (UsesOldHeap) {
+          var nv = NewVar("$heap$old", boogieGenerator.Predef.HeapType, wantFormals);
+          vv.Add(nv);
+          if (etran != null) {
+            var isGoodHeap = boogieGenerator.FunctionCall(Tok, BuiltinFunction.IsGoodHeap, null,
+              new Bpl.IdentifierExpr(Tok, nv));
+            typeAntecedents = BplAnd(typeAntecedents, isGoodHeap);
+          }
+        }
+
+        foreach (var heapAtLabel in UsesHeapAt) {
+          var nv = NewVar("$Heap_at_" + heapAtLabel.AssignUniqueId(boogieGenerator.CurrentIdGenerator),
+            boogieGenerator.Predef.HeapType, wantFormals);
+          vv.Add(nv);
+          if (etran != null) {
+            // TODO: It's not clear to me that $IsGoodHeap predicates are needed for these axioms. (Same comment applies above for $heap$old.)
+            // But $HeapSucc relations among the various heap variables appears not needed for either soundness or completeness, since the
+            // let-such-that functions will always be invoked on arguments for which these properties are known.
+            var isGoodHeap = boogieGenerator.FunctionCall(Tok, BuiltinFunction.IsGoodHeap, null,
+              new Bpl.IdentifierExpr(Tok, nv));
+            typeAntecedents = BplAnd(typeAntecedents, isGoodHeap);
+          }
+        }
+
+        if (ThisType != null) {
+          var nv = NewVar("this", boogieGenerator.TrType(ThisType), wantFormals);
+          vv.Add(nv);
+          if (etran != null) {
+            var th = new Bpl.IdentifierExpr(Tok, nv);
+            typeAntecedents = BplAnd(typeAntecedents, boogieGenerator.ReceiverNotNull(th));
+            var wh = boogieGenerator.GetWhereClause(Tok, th, ThisType, etran, NOALLOC);
+            if (wh != null) {
+              typeAntecedents = BplAnd(typeAntecedents, wh);
+            }
+          }
+        }
+
+        foreach (var v in FVs) {
+          var nv = NewVar(v.Name, boogieGenerator.TrType(v.Type), wantFormals);
+          vv.Add(nv);
+          if (etran != null) {
+            var wh = boogieGenerator.GetWhereClause(Tok, new Bpl.IdentifierExpr(Tok, nv), v.Type, etran, NOALLOC);
+            if (wh != null) {
+              typeAntecedents = BplAnd(typeAntecedents, wh);
+            }
+          }
+        }
+
+        return vv;
+      }
+
+      Bpl.Variable NewVar(string name, Bpl.Type type, bool wantFormal) {
+        Contract.Requires(name != null);
+        Contract.Requires(type != null);
+        if (wantFormal) {
+          return new Bpl.Formal(Tok, new Bpl.TypedIdent(Tok, name, type), true);
+        } else {
+          return new Bpl.BoundVariable(Tok, new Bpl.TypedIdent(Tok, name, type));
+        }
+      }
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.Methods.cs b/Source/DafnyCore/Verifier/BoogieGenerator.Methods.cs
new file mode 100644
index 00000000000..96cf0ff5298
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.Methods.cs
@@ -0,0 +1,1983 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using System.Text;
+using Microsoft.Boogie;
+using Bpl = Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny {
+  public partial class BoogieGenerator {
+    void AddClassMembers(TopLevelDeclWithMembers c, bool includeAllMethods, bool includeInformationAboutType) {
+      Contract.Requires(sink != null && Predef != null);
+      Contract.Requires(c != null);
+      Contract.Ensures(fuelContext == Contract.OldValue(fuelContext));
+      Contract.Assert(VisibleInScope(c));
+
+      if (includeInformationAboutType) {
+        sink.AddTopLevelDeclaration(GetClass(c));
+        if (c is ArrayClassDecl) {
+          // classes.Add(c, predef.ClassDotArray);
+          AddAllocationAxiom(null, null, (ArrayClassDecl)c, true);
+        }
+
+        if (c is ClassLikeDecl { IsReferenceTypeDecl: true } referenceTypeDecl) {
+          AddIsAndIsAllocForReferenceType(referenceTypeDecl);
+        }
+
+        if (c is TraitDecl) {
+          //this adds: function implements$J(Ty, typeArgs): bool;
+          var arg_ref = new Bpl.Formal(c.Origin, new Bpl.TypedIdent(c.Origin, "ty", Predef.Ty), true);
+          var vars = new List<Bpl.Variable> { arg_ref };
+          vars.AddRange(MkTyParamFormals(GetTypeParams(c), false));
+          var res = new Bpl.Formal(c.Origin, new Bpl.TypedIdent(c.Origin, Bpl.TypedIdent.NoName, Bpl.Type.Bool), false);
+          var implement_intr = new Bpl.Function(c.Origin, "implements$" + c.FullSanitizedName, vars, res);
+          sink.AddTopLevelDeclaration(implement_intr);
+        } else if (c is ClassDecl classDecl) {
+          AddImplementsAxioms(classDecl);
+        }
+      }
+
+      foreach (MemberDecl member in c.Members.FindAll(VisibleInScope)) {
+        Contract.Assert(IsAllocContext == null);
+        CurrentDeclaration = member;
+        var ignored =
+          filesWhereOnlyMembersAreVerified.Contains(member.Origin.Uri) &&
+          !member.HasUserAttribute("only", out _);
+        if (ignored) {
+          assertionOnlyFilter = _ => false;
+        } else {
+          SetAssertionOnlyFilter(member);
+        }
+
+        if (member is Field) {
+          Field f = (Field)member;
+          Boogie.Declaration fieldDeclaration;
+          if (f is ConstantField) {
+            // The following call has the side effect of idempotently creating and adding the function to the sink's top-level declarations
+            Contract.Assert(currentModule == null);
+            currentModule = f.EnclosingClass.EnclosingModuleDefinition;
+            var oldFuelContext = fuelContext;
+            fuelContext = FuelSetting.NewFuelContext(f);
+            fieldDeclaration = GetReadonlyField(f);
+            fuelContext = oldFuelContext;
+            currentModule = null;
+          } else {
+            if (f.IsMutable) {
+              fieldDeclaration = GetField(f);
+              sink.AddTopLevelDeclaration(fieldDeclaration);
+            } else {
+              fieldDeclaration = GetReadonlyField(f);
+              if (fieldDeclaration != Predef.ArrayLength) {
+                sink.AddTopLevelDeclaration(fieldDeclaration);
+              }
+            }
+          }
+          AddAllocationAxiom(fieldDeclaration, f, c);
+        } else if (member is Function function) {
+          AddFunction_Top(function, includeAllMethods);
+        } else if (member is Method method) {
+          AddMethod_Top(method, false, includeAllMethods);
+        } else {
+          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected member
+        }
+        ResetAssertionOnlyFilter();
+      }
+    }
+
+    /**
+      Add $Is and $IsAlloc for this class :
+         axiom (forall p: ref, G: Ty ::
+            { $Is(p, TClassA(G), h) }
+            $Is(p, TClassA(G), h) <==> (p == null || dtype(p) == TClassA(G));
+         axiom (forall p: ref, h: Heap, G: Ty ::
+            { $IsAlloc(p, TClassA(G), h) }
+            $IsAlloc(p, TClassA(G), h) ==> (p == null || h[p, alloc]);
+     */
+    private void AddIsAndIsAllocForReferenceType(ClassLikeDecl c) {
+      Contract.Requires(c.IsReferenceTypeDecl);
+
+      MapM(Bools, is_alloc => {
+        var vars = MkTyParamBinders(GetTypeParams(c), out var tyexprs);
+
+        var o = BplBoundVar("$o", Predef.RefType, vars);
+
+        Bpl.Expr body, is_o;
+        Bpl.Expr o_null = Bpl.Expr.Eq(o, Predef.Null);
+        Bpl.Expr o_ty = ClassTyCon(c, tyexprs);
+        string name;
+
+        if (is_alloc) {
+          name = $"$IsAlloc axiom for {c.WhatKind} {c}";
+          var h = BplBoundVar("$h", Predef.HeapType, vars);
+          // $IsAlloc(o, ..)
+          is_o = MkIsAlloc(o, o_ty, h);
+          body = BplIff(is_o, BplOr(o_null, IsAlloced(c.Origin, h, o)));
+        } else {
+          name = $"$Is axiom for {c.WhatKind} {c}";
+          // $Is(o, ..)
+          is_o = MkIs(o, o_ty);
+          Bpl.Expr rhs;
+          if (c == program.SystemModuleManager.ObjectDecl) {
+            rhs = Bpl.Expr.True;
+          } else if (c is TraitDecl) {
+            //generating $o == null || implements$J(dtype(x), typeArgs)
+            var t = (TraitDecl)c;
+            var dtypeFunc = FunctionCall(o.tok, BuiltinFunction.DynamicType, null, o);
+            var implementsJ_Arguments = new List<Expr> { dtypeFunc }; // TODO: also needs type parameters
+            implementsJ_Arguments.AddRange(tyexprs);
+            Bpl.Expr implementsFunc =
+              FunctionCall(t.Origin, "implements$" + t.FullSanitizedName, Bpl.Type.Bool, implementsJ_Arguments);
+            rhs = BplOr(o_null, implementsFunc);
+          } else {
+            rhs = BplOr(o_null, DType(o, o_ty));
+          }
+
+          body = BplIff(is_o, rhs);
+        }
+
+        var axiom = new Boogie.Axiom(c.Origin, BplForall(vars, BplTrigger(is_o), body), name);
+        AddOtherDefinition(GetOrCreateTypeConstructor(c), axiom);
+      });
+    }
+
+    void AddFunction_Top(Function f, bool includeAllMethods) {
+      FuelContext oldFuelContext = this.fuelContext;
+      this.fuelContext = FuelSetting.NewFuelContext(f);
+      IsAllocContext = new IsAllocContext(options, true);
+
+      AddClassMember_Function(f);
+
+      if (InVerificationScope(f)) {
+        new FunctionWellformednessChecker(this).Check(f);
+        if (f.OverriddenFunction != null) { //it means that f is overriding its associated parent function
+          AddFunctionOverrideCheckImpl(f);
+        }
+      }
+      if (f is ExtremePredicate cop) {
+        AddClassMember_Function(cop.PrefixPredicate);
+        // skip the well-formedness check, because it has already been done for the extreme predicate
+      } else if (f.ByMethodDecl != null) {
+        AddMethod_Top(f.ByMethodDecl, true, includeAllMethods);
+      }
+
+      this.fuelContext = oldFuelContext;
+      IsAllocContext = null;
+    }
+
+    void AddMethod_Top(Method m, bool isByMethod, bool includeAllMethods) {
+      if (!includeAllMethods && !InVerificationScope(m) && !referencedMembers.Contains(m)) {
+        // do nothing
+        return;
+      }
+
+      FuelContext oldFuelContext = this.fuelContext;
+      this.fuelContext = FuelSetting.NewFuelContext(m);
+
+      // wellformedness check for method specification
+      if (m.EnclosingClass is IteratorDecl && m == ((IteratorDecl)m.EnclosingClass).Member_MoveNext) {
+        // skip the well-formedness check, because it has already been done for the iterator
+      } else {
+        if (!isByMethod) {
+          var proc = AddMethod(m, MethodTranslationKind.SpecWellformedness);
+          sink.AddTopLevelDeclaration(proc);
+          if (InVerificationScope(m)) {
+            AddMethodImpl(m, proc, true);
+          }
+        }
+        if (m.OverriddenMethod != null && InVerificationScope(m)) //method has overridden a parent method
+        {
+          var procOverrideChk = AddMethod(m, MethodTranslationKind.OverrideCheck);
+          sink.AddTopLevelDeclaration(procOverrideChk);
+          AddMethodOverrideCheckImpl(m, procOverrideChk);
+        }
+      }
+      // the method spec itself
+      if (!isByMethod) {
+        sink.AddTopLevelDeclaration(AddMethod(m, MethodTranslationKind.Call));
+      }
+      if (m is ExtremeLemma) {
+        // Let the CoCall and Impl forms to use m.PrefixLemma signature and specification (and
+        // note that m.PrefixLemma.Body == m.Body.
+        m = ((ExtremeLemma)m).PrefixLemma;
+        sink.AddTopLevelDeclaration(AddMethod(m, MethodTranslationKind.CoCall));
+
+      }
+      if (!m.HasVerifyFalseAttribute && m.Body != null && InVerificationScope(m)) {
+        // ...and its implementation
+        assertionCount = 0;
+        var proc = AddMethod(m, MethodTranslationKind.Implementation);
+        sink.AddTopLevelDeclaration(proc);
+        AddMethodImpl(m, proc, false);
+      }
+      Reset();
+      this.fuelContext = oldFuelContext;
+    }
+
+    private void AddAllocationAxiom(Boogie.Declaration fieldDeclaration, Field f, TopLevelDeclWithMembers c, bool is_array = false) {
+      Contract.Requires(c != null);
+      // IFF you're adding the array axioms, then the field should be null
+      Contract.Requires(is_array == (f == null));
+      Contract.Requires(sink != null && Predef != null);
+
+      if (f is ConstantField cf) {
+        AddWellformednessCheck(cf);
+      }
+
+      if (f is ConstantField && f.IsStatic) {
+        AddStaticConstFieldAllocationAxiom(fieldDeclaration, f, c);
+      } else {
+        AddInstanceFieldAllocationAxioms(fieldDeclaration, f, c, is_array);
+      }
+    }
+
+    /// <summary>
+    /// For a non-static field "f" in a class "c(G)", generate:
+    ///     // type axiom:
+    ///     // If "G" is empty, then TClassA(G) is omitted from trigger.
+    ///     // If "c" is an array declaration, then the bound variables also include the index variables "ii" and "h[o, f]" has the form "h[o, Index(ii)]".
+    ///     // If "f" is readonly, then "h[o, f]" has the form "f(o)" (for special fields) or "f(G,o)" (for programmer-declared const fields),
+    ///     // so "h" and $IsHeap(h) are omitted.
+    ///     axiom
+    ///       (forall o: ref, h: Heap, G : Ty ::
+    ///         { h[o, f], TClassA(G) }
+    ///         $IsHeap(h) &&
+    ///         o != null && $Is(o, TClassA(G))  // or dtype(o) = TClassA(G)
+    ///         ==>
+    ///         $Is(h[o, f], TT(PP)));
+    ///
+    ///     // allocation axiom:
+    ///     // As above for "G" and "ii", but "h" is included no matter what.
+    ///     axiom
+    ///       (forall o: ref, h: Heap, G : Ty ::
+    ///         { h[o, f], TClassA(G) }
+    ///         $IsHeap(h) &&
+    ///         o != null && $Is(o, TClassA(G)) &&  // or dtype(o) = TClassA(G)
+    ///         h[o, alloc]
+    ///         ==>
+    ///         $IsAlloc(h[o, f], TT(PP), h));
+    /// </summary>
+    private void AddInstanceFieldAllocationAxioms(Bpl.Declaration fieldDeclaration, Field f, TopLevelDeclWithMembers c, bool is_array) {
+      var bvsTypeAxiom = new List<Bpl.Variable>();
+      var bvsAllocationAxiom = new List<Bpl.Variable>();
+
+      var tyvars = MkTyParamBinders(GetTypeParams(c), out var tyexprs);
+      bvsTypeAxiom.AddRange(tyvars);
+      bvsAllocationAxiom.AddRange(tyvars);
+
+      // This is the typical case (that is, f is not a static const field)
+
+      var hVar = BplBoundVar("$h", Predef.HeapType, out var h);
+      var oVar = BplBoundVar("$o", TrType(ModuleResolver.GetThisType(c.Origin, c)), out var o);
+
+      Bpl.Expr o_ty; // to hold TClassA(G)
+      var isGoodHeap = FunctionCall(c.Origin, BuiltinFunction.IsGoodHeap, null, h);
+      Bpl.Expr isalloc_o;
+      if (c is not ClassLikeDecl { IsReferenceTypeDecl: true }) {
+        var udt = UserDefinedType.FromTopLevelDecl(c.Origin, c);
+        o_ty = ClassTyCon(c, tyexprs);
+        isalloc_o = MkIsAlloc(o, udt, h);
+      } else if (RevealedInScope(c)) {
+        o_ty = ClassTyCon(c, tyexprs);
+        isalloc_o = IsAlloced(c.Origin, h, o);
+      } else {
+        // c is only provided, not revealed, in the scope. Use the non-null type decl's internal synonym
+        var cl = (ClassLikeDecl)c;
+        Contract.Assert(cl.NonNullTypeDecl != null);
+        o_ty = ClassTyCon(cl.NonNullTypeDecl, tyexprs);
+        var udt = UserDefinedType.FromTopLevelDecl(c.Origin, cl.NonNullTypeDecl);
+        isalloc_o = MkIsAlloc(o, udt, h);
+      }
+
+      Bpl.Expr indexBounds = Bpl.Expr.True;
+      Bpl.Expr oDotF;
+      if (is_array) {
+        // generate h[o,Index(ii)]
+        bvsTypeAxiom.Add(hVar);
+        bvsTypeAxiom.Add(oVar);
+        bvsAllocationAxiom.Add(hVar);
+        bvsAllocationAxiom.Add(oVar);
+
+        var ac = (ArrayClassDecl)c;
+        var ixs = new List<Bpl.Expr>();
+        for (int i = 0; i < ac.Dims; i++) {
+          Bpl.Variable v = BplBoundVar("$i" + i, Bpl.Type.Int, out var e);
+          ixs.Add(e);
+          bvsTypeAxiom.Add(v);
+          bvsAllocationAxiom.Add(v);
+        }
+
+        oDotF = ReadHeap(c.Origin, h, o, GetArrayIndexFieldName(c.Origin, ixs));
+
+        for (int i = 0; i < ac.Dims; i++) {
+          // 0 <= i && i < _System.array.Length(o)
+          var e1 = Bpl.Expr.Le(Bpl.Expr.Literal(0), ixs[i]);
+          var ff = GetReadonlyField((Field)(ac.Members[i]));
+          var e2 = Bpl.Expr.Lt(ixs[i], new Bpl.NAryExpr(c.Origin, new Bpl.FunctionCall(ff), new List<Bpl.Expr> { o }));
+          indexBounds = BplAnd(indexBounds, BplAnd(e1, e2));
+        }
+      } else if (f.IsMutable) {
+        // generate h[o,f]
+        var ty = TrType(f.Type);
+        oDotF = ReadHeap(c.Origin, h, o, new Bpl.IdentifierExpr(c.Origin, GetField(f)));
+        oDotF = ty == Predef.BoxType ? oDotF : ApplyUnbox(c.Origin, oDotF, ty);
+        bvsTypeAxiom.Add(hVar);
+        bvsTypeAxiom.Add(oVar);
+        bvsAllocationAxiom.Add(hVar);
+        bvsAllocationAxiom.Add(oVar);
+      } else {
+        // generate f(G,o)
+        var args = new List<Bpl.Expr> { o };
+        if (f is ConstantField) {
+          args = Concat(tyexprs, args);
+        }
+
+        oDotF = new Bpl.NAryExpr(c.Origin, new Bpl.FunctionCall(GetReadonlyField(f)), args);
+        bvsTypeAxiom.Add(oVar);
+        bvsAllocationAxiom.Add(hVar);
+        bvsAllocationAxiom.Add(oVar);
+      }
+
+      // antecedent: some subset of: $IsHeap(h) && o != null && $Is(o, TClassA(G)) && indexBounds
+      Bpl.Expr ante = Bpl.Expr.True;
+      if (is_array || f.IsMutable) {
+        ante = BplAnd(ante, isGoodHeap);
+        // Note: for the allocation axiom, isGoodHeap is added back in for !f.IsMutable below
+      }
+
+      Bpl.Expr is_o = BplAnd(
+        ReceiverNotNull(o),
+        !o.Type.Equals(Predef.RefType) || c is TraitDecl
+          ? MkIs(o, o_ty, ModeledAsBoxType(ModuleResolver.GetThisType(c.Origin, c))) // $Is(o, ..)
+          : DType(o, o_ty)); // dtype(o) == o_ty
+      ante = BplAnd(ante, is_o);
+
+      ante = BplAnd(ante, indexBounds);
+
+      // trigger
+      var t_es = new List<Bpl.Expr>();
+      t_es.Add(oDotF);
+      if (tyvars.Count > 0 && (is_array || !(f is ConstantField))) {
+        t_es.Add(o_ty);
+      }
+
+      var tr = new Bpl.Trigger(c.Origin, true, t_es);
+
+      // Now for the conclusion of the axioms
+      Bpl.Expr is_hf, isalloc_hf;
+      if (is_array) {
+        is_hf = MkIs(oDotF, tyexprs[0], true);
+        isalloc_hf = MkIsAlloc(oDotF, tyexprs[0], h, true);
+      } else {
+        is_hf = MkIs(oDotF, f.Type); // $Is(h[o, f], ..)
+        isalloc_hf = MkIsAlloc(oDotF, f.Type, h); // $IsAlloc(h[o, f], ..)
+      }
+
+      Bpl.Expr ax = BplForall(bvsTypeAxiom, tr, BplImp(ante, is_hf));
+      AddOtherDefinition(fieldDeclaration, new Bpl.Axiom(c.Origin, ax, $"{c}.{f}: Type axiom"));
+
+      if (isalloc_hf != null) {
+        if (!is_array && !f.IsMutable) {
+          // isGoodHeap wasn't added above, so add it now
+          ante = BplAnd(isGoodHeap, ante);
+        }
+
+        ante = BplAnd(ante, isalloc_o);
+
+        // compute a different trigger
+        t_es = new List<Bpl.Expr>();
+        t_es.Add(oDotF);
+        if (!is_array && !f.IsMutable) {
+          // since "h" is not part of oDotF, we add a separate term that mentions "h"
+          t_es.Add(isalloc_o);
+        }
+
+        if (!(f is ConstantField) && tyvars.Count > 0) {
+          t_es.Add(o_ty);
+        }
+
+        tr = new Bpl.Trigger(c.Origin, true, t_es);
+
+        ax = BplForall(bvsAllocationAxiom, tr, BplImp(ante, isalloc_hf));
+        AddOtherDefinition(fieldDeclaration, new Boogie.Axiom(c.Origin, ax, $"{c}.{f}: Allocation axiom"));
+      }
+    }
+
+    /// <summary>
+    /// For a static (necessarily "const") field "f" in a class "c(G)", the expression corresponding to "h[o, f]" or "f(G,o)" above is "f(G)",
+    /// so generate:
+    ///     // type axiom:
+    ///     axiom
+    ///       (forall G : Ty ::
+    ///         { f(G) }
+    ///         $Is(f(G), TT(PP)));
+    ///     // Or in the case where G is empty:
+    ///     axiom $Is(f(G), TT);
+    ///
+    ///     // allocation axiom:
+    ///     axiom
+    ///       (forall h: Heap, G : Ty ::
+    ///         { $IsAlloc(f(G), TT(PP), h) }
+    ///         $IsHeap(h)
+    ///       ==>
+    ///         $IsAlloc(f(G), TT(PP), h));
+    ///
+    ///
+    /// The axioms above could be optimised to something along the lines of:
+    ///     axiom
+    ///       (forall o: ref, h: Heap ::
+    ///         { h[o, f] }
+    ///         $IsHeap(h) && o != null && Tag(dtype(o)) = TagClass
+    ///         ==>
+    ///         (h[o, alloc] ==> $IsAlloc(h[o, f], TT(TClassA_Inv_i(dtype(o)),..), h)) &&
+    ///         $Is(h[o, f], TT(TClassA_Inv_i(dtype(o)),..), h);
+    /// </summary>
+    private void AddStaticConstFieldAllocationAxiom(Boogie.Declaration fieldDeclaration, Field f, TopLevelDeclWithMembers c) {
+
+      var bvsTypeAxiom = new List<Bpl.Variable>();
+      var bvsAllocationAxiom = new List<Bpl.Variable>();
+
+      var tyvars = MkTyParamBinders(GetTypeParams(c), out var tyexprs);
+      bvsTypeAxiom.AddRange(tyvars);
+      bvsAllocationAxiom.AddRange(tyvars);
+
+      var oDotF = new Boogie.NAryExpr(c.Origin, new Boogie.FunctionCall(GetReadonlyField(f)), tyexprs);
+      var is_hf = MkIs(oDotF, f.Type); // $Is(h[o, f], ..)
+      Boogie.Expr ax = bvsTypeAxiom.Count == 0 ? is_hf : BplForall(bvsTypeAxiom, BplTrigger(oDotF), is_hf);
+      var isAxiom = new Boogie.Axiom(c.Origin, ax, $"{c}.{f}: Type axiom");
+      AddOtherDefinition(fieldDeclaration, isAxiom);
+
+      {
+        var hVar = BplBoundVar("$h", Predef.HeapType, out var h);
+        bvsAllocationAxiom.Add(hVar);
+        var isGoodHeap = FunctionCall(c.Origin, BuiltinFunction.IsGoodHeap, null, h);
+        var isalloc_hf = MkIsAlloc(oDotF, f.Type, h); // $IsAlloc(h[o, f], ..)
+        ax = BplForall(bvsAllocationAxiom, BplTrigger(isalloc_hf), BplImp(isGoodHeap, isalloc_hf));
+        var isAllocAxiom = new Boogie.Axiom(c.Origin, ax, $"{c}.{f}: Allocation axiom");
+        sink.AddTopLevelDeclaration(isAllocAxiom);
+      }
+    }
+
+    private void AddImplementsAxioms(ClassDecl c) {
+      //this adds: axiom implements$J(class.C, typeInstantiations);
+      var vars = MkTyParamBinders(GetTypeParams(c), out var tyexprs);
+
+      foreach (var parent in c.ParentTraits) {
+        var trait = ((UserDefinedType)parent).AsParentTraitDecl();
+        Contract.Assert(trait != null);
+        var arg = ClassTyCon(c, tyexprs);
+        var args = new List<Bpl.Expr> { arg };
+        foreach (var targ in parent.TypeArgs) {
+          args.Add(TypeToTy(targ));
+        }
+        var expr = FunctionCall(c.Origin, "implements$" + trait.FullSanitizedName, Bpl.Type.Bool, args);
+        var implements_axiom = new Bpl.Axiom(c.Origin, BplForall(vars, null, expr));
+        AddOtherDefinition(GetOrCreateTypeConstructor(c), implements_axiom);
+      }
+    }
+
+    private void AddClassMember_Function(Function f) {
+      Contract.Ensures(currentModule == null && codeContext == null);
+      Contract.Ensures(currentModule == null && codeContext == null);
+
+      currentModule = f.EnclosingClass.EnclosingModuleDefinition;
+      codeContext = f;
+
+      // declare function
+      var boogieFunction = GetOrCreateFunction(f);
+      // add synonym axiom
+      if (f.IsFuelAware()) {
+        AddFuelSuccSynonymAxiom(f);
+        AddFuelZeroSynonymAxiom(f);
+      }
+      // add frame axiom
+      if (f.ReadsHeap) {
+        AddFrameAxiom(f);
+      }
+      // add consequence axiom
+      AddFunctionConsequenceAxiom(boogieFunction, f, f.Ens);
+      // add definition axioms, suitably specialized for literals
+      if (f.Body != null && RevealedInScope(f)) {
+        AddFunctionAxiom(boogieFunction, f, f.Body.Resolved);
+      } else {
+        // for body-less functions, at least generate its #requires function
+        var b = GetFunctionAxiom(f, null, null);
+        Contract.Assert(b == null);
+      }
+      // for a function in a class C that overrides a function in a trait J, add an axiom that connects J.F and C.F
+      if (f.OverriddenFunction != null) {
+        sink.AddTopLevelDeclaration(FunctionOverrideAxiom(f.OverriddenFunction, f));
+      }
+
+      // supply the connection between least/greatest predicates and prefix predicates
+      if (f is ExtremePredicate) {
+        AddPrefixPredicateAxioms(((ExtremePredicate)f).PrefixPredicate);
+      }
+
+      Reset();
+    }
+
+    private void AddMethodImpl(Method m, Bpl.Procedure proc, bool wellformednessProc) {
+      Contract.Requires(m != null);
+      Contract.Requires(proc != null);
+      Contract.Requires(sink != null && Predef != null);
+      Contract.Requires(wellformednessProc || m.Body != null);
+      Contract.Requires(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && IsAllocContext == null);
+      Contract.Ensures(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && IsAllocContext == null);
+
+      proofDependencies.SetCurrentDefinition(proc.VerboseName, m);
+      currentModule = m.EnclosingClass.EnclosingModuleDefinition;
+      codeContext = m;
+      IsAllocContext = new IsAllocContext(options, m.IsGhost);
+
+      List<Variable> inParams = Boogie.Formal.StripWhereClauses(proc.InParams);
+      List<Variable> outParams = Boogie.Formal.StripWhereClauses(proc.OutParams);
+
+      var builder = new BoogieStmtListBuilder(this, options, new BodyTranslationContext(m.ContainsHide));
+      builder.Add(new CommentCmd("AddMethodImpl: " + m + ", " + proc));
+      var etran = new ExpressionTranslator(this, Predef, m.Origin,
+        m.IsByMethod ? m.FunctionFromWhichThisIsByMethodDecl : m);
+      // Only do reads checks for methods, not lemmas
+      // (which aren't allowed to declare frames and don't check reads and writes against them).
+      // Also don't do any reads checks if the reads clause is *,
+      // since all the checks will be trivially true
+      // and we don't need to cause additional verification cost for existing code.
+      if (!options.Get(Method.ReadsClausesOnMethods) || m.IsLemmaLike || m.Reads.Expressions.Exists(e => e.E is WildcardExpr)) {
+        etran = etran.WithReadsFrame(null);
+      }
+      InitializeFuelConstant(m.Origin, builder, etran);
+      var localVariables = new Variables();
+      GenerateImplPrelude(m, wellformednessProc, inParams, outParams, builder, localVariables, etran);
+
+      if (UseOptimizationInZ3) {
+        // We ask Z3 to minimize all parameters of type 'nat'.
+        foreach (var f in m.Ins) {
+          if (f.Type.NormalizeExpandKeepConstraints() is UserDefinedType udt && udt.Name == "nat") {
+            builder.Add(optimizeExpr(true, new IdentifierExpr(f.Origin, f), f.Origin, etran));
+          }
+        }
+      }
+
+      var stmts = wellformednessProc
+        ? TrMethodContractWellformednessCheck(m, etran, localVariables, builder, outParams)
+        : TrMethodBody(m, builder, localVariables, etran);
+
+      if (EmitImplementation(m.Attributes)) {
+        // emit impl only when there are proof obligations.
+        QKeyValue kv = etran.TrAttributes(m.Attributes, null);
+        var impl = AddImplementationWithAttributes(GetToken(m), proc,
+           inParams, outParams, localVariables, stmts, kv);
+
+        if (InsertChecksums) {
+          InsertChecksum(m, impl);
+        }
+      }
+
+      IsAllocContext = null;
+      Reset();
+    }
+
+    private StmtList TrMethodContractWellformednessCheck(Method m, ExpressionTranslator etran, Variables localVariables,
+      BoogieStmtListBuilder builder, List<Variable> outParams) {
+      var builderInitializationArea = new BoogieStmtListBuilder(this, options, builder.Context);
+      StmtList stmts;
+      var readsCheckDelayer = new ReadsCheckDelayer(etran, null, localVariables, builderInitializationArea, builder);
+
+      // check well-formedness of any default-value expressions (before assuming preconditions)
+      readsCheckDelayer.DoWithDelayedReadsChecks(true, wfo => {
+        foreach (var formal in m.Ins.Where(formal => formal.DefaultValue != null)) {
+          var e = formal.DefaultValue;
+          CheckWellformed(e, wfo, localVariables, builder, etran.WithReadsFrame(etran.readsFrame, null)); // No scope for default parameters
+          builder.Add(new Boogie.AssumeCmd(e.Origin, etran.CanCallAssumption(e)));
+          CheckSubrange(e.Origin, etran.TrExpr(e), e.Type, formal.Type, e, builder);
+
+          if (formal.IsOld) {
+            Boogie.Expr wh = GetWhereClause(e.Origin, etran.TrExpr(e), e.Type, etran.Old, ISALLOC, true);
+            if (wh != null) {
+              var desc = new IsAllocated("default value", "in the two-state lemma's previous state", e);
+              builder.Add(Assert(e.Origin, wh, desc, builder.Context));
+            }
+          }
+        }
+      });
+
+      // check well-formedness of the preconditions, and then assume each one of them
+      readsCheckDelayer.DoWithDelayedReadsChecks(false, wfo => {
+        foreach (AttributedExpression p in ConjunctsOf(m.Req)) {
+          CheckWellformedAndAssume(p.E, wfo, localVariables, builder, etran, "method requires clause");
+        }
+      });
+
+      // check well-formedness of the reads clauses
+      readsCheckDelayer.DoWithDelayedReadsChecks(false, wfo => {
+        CheckFrameWellFormed(wfo, m.Reads.Expressions, localVariables, builder, etran);
+      });
+      // Also check that the reads clause == {} if the {:concurrent} attribute is present
+      // on the method, and {:assume_concurrent} is NOT present on the reads clause.
+      if (Attributes.Contains(m.Attributes, Attributes.ConcurrentAttributeName) &&
+          !Attributes.Contains(m.Reads.Attributes, Attributes.AssumeConcurrentAttributeName)) {
+        var desc = new ConcurrentFrameEmpty(m, "reads");
+        if (etran.readsFrame != null) {
+          CheckFrameEmpty(m.Origin, etran, etran.ReadsFrame(m.Origin), builder, desc, null);
+        } else {
+          // etran.readsFrame being null indicates the default of reads *,
+          // so this is an automatic failure.
+          builder.Add(Assert(m.Origin, Expr.False, desc, builder.Context));
+        }
+      }
+
+      // check well-formedness of the modifies clauses
+      readsCheckDelayer.DoWithDelayedReadsChecks(false, wfo => {
+        CheckFrameWellFormed(wfo, m.Mod.Expressions, localVariables, builder, etran);
+      });
+      // Also check that the modifies clause == {} if the {:concurrent} attribute is present,
+      // and {:assume_concurrent} is NOT present on the modifies clause.
+      if (Attributes.Contains(m.Attributes, Attributes.ConcurrentAttributeName) &&
+          !Attributes.Contains(m.Mod.Attributes, Attributes.AssumeConcurrentAttributeName)) {
+        var desc = new ConcurrentFrameEmpty(m, "modifies");
+        CheckFrameEmpty(m.Origin, etran, etran.ModifiesFrame(m.Origin), builder, desc, null);
+      }
+
+      // check well-formedness of the decreases clauses
+      var wfOptions = new WFOptions();
+      foreach (Expression p in m.Decreases.Expressions) {
+        CheckWellformed(p, wfOptions, localVariables, builder, etran);
+      }
+
+      if (m is not TwoStateLemma) {
+        var modifies = m.Mod;
+        var allowsAllocation = m.AllowsAllocation;
+
+        ApplyModifiesEffect(m, etran, builder, modifies, allowsAllocation, m.IsGhost);
+      }
+
+      // also play havoc with the out parameters
+      if (outParams.Count != 0) {  // don't create an empty havoc statement
+        List<Boogie.IdentifierExpr> outH = new List<Boogie.IdentifierExpr>();
+        foreach (Boogie.Variable b in outParams) {
+          Contract.Assert(b != null);
+          outH.Add(new Boogie.IdentifierExpr(b.tok, b));
+        }
+        builder.Add(new Boogie.HavocCmd(m.Origin, outH));
+        if (m is Constructor) {
+          var receiverType = ModuleResolver.GetReceiverType(m.Origin, m);
+          var receiver = new Bpl.IdentifierExpr(m.Origin, "this", TrType(receiverType));
+          var wh = BplAnd(
+            ReceiverNotNull(receiver),
+            GetWhereClause(m.Origin, receiver, receiverType, etran, IsAllocType.ISALLOC));
+          builder.Add(TrAssumeCmd(m.Origin, wh));
+        }
+      }
+      // mark the end of the modifies/out-parameter havocking with a CaptureState; make its location be the first ensures clause, if any (and just
+      // omit the CaptureState if there's no ensures clause)
+      if (m.Ens.Count != 0) {
+        builder.AddCaptureState(m.Ens[0].E.Origin, false, "post-state");
+      }
+
+      // check wellformedness of postconditions
+      foreach (AttributedExpression p in ConjunctsOf(m.Ens)) {
+        CheckWellformedAndAssume(p.E, wfOptions, localVariables, builder, etran, "method ensures clause");
+      }
+
+      var s0 = builderInitializationArea.Collect(m.Origin);
+      var s1 = builder.Collect(m.Origin);
+      stmts = new StmtList(new List<BigBlock>(s0.BigBlocks.Concat(s1.BigBlocks)), m.Origin);
+      return stmts;
+    }
+
+    public void ApplyModifiesEffect(INode node, ExpressionTranslator etran, BoogieStmtListBuilder builder,
+      Specification<FrameExpression> modifies, bool allowsAllocation, bool isGhostContext) {
+      // play havoc with the heap according to the modifies clause
+      builder.Add(new Boogie.HavocCmd(node.Origin, new List<Boogie.IdentifierExpr> { etran.HeapCastToIdentifierExpr }));
+      // assume the usual two-state boilerplate information
+      foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(node.Origin, modifies.Expressions, isGhostContext, allowsAllocation, etran.Old, etran, etran.Old)) {
+        if (tri.IsFree) {
+          builder.Add(TrAssumeCmd(node.Origin, tri.Expr));
+        }
+      }
+    }
+
+    private StmtList TrMethodBody(Method m, BoogieStmtListBuilder builder, Variables localVariables,
+      ExpressionTranslator etran) {
+      var inductionVars = ApplyInduction(m.Ins, m.Attributes);
+      if (inductionVars.Count != 0) {
+        // Let the parameters be this,x,y of the method M and suppose ApplyInduction returns this,y.
+        // Also, let Pre be the precondition and VF be the decreases clause.
+        // Then, insert into the method body what amounts to:
+        //     assume case-analysis-on-parameter[[ y' ]];
+        //     forall this',y' | Pre(this', x, y') && (VF(this', x, y') << VF(this', x, y)) {
+        //       this'.M(x, y');
+        //     }
+        // Generate bound variables for the forall statement, and a substitution for the Pre and VF
+
+        // assume case-analysis-on-parameter[[ y' ]];
+        foreach (var inFormal in m.Ins) {
+          var dt = inFormal.Type.AsDatatype;
+          if (dt != null) {
+            var funcID = new Boogie.FunctionCall(new Boogie.IdentifierExpr(inFormal.Origin, "$IsA#" + dt.FullSanitizedName, Boogie.Type.Bool));
+            var f = new Boogie.IdentifierExpr(inFormal.Origin, inFormal.AssignUniqueName(m.IdGenerator), TrType(inFormal.Type));
+            builder.Add(TrAssumeCmd(inFormal.Origin, new Boogie.NAryExpr(inFormal.Origin, funcID, new List<Boogie.Expr> { f })));
+          }
+        }
+
+        var parBoundVars = new List<BoundVar>();
+        var parBounds = new List<BoundedPool>();
+        var substMap = new Dictionary<IVariable, Expression>();
+        Expression receiverSubst = null;
+        foreach (var iv in inductionVars) {
+          BoundVar bv;
+          if (iv == null) {
+            // this corresponds to "this"
+            Contract.Assert(!m.IsStatic);  // if "m" is static, "this" should never have gone into the _induction attribute
+            Contract.Assert(receiverSubst == null);  // we expect at most one
+            var receiverType = ModuleResolver.GetThisType(m.Origin, (TopLevelDeclWithMembers)m.EnclosingClass);
+            bv = new BoundVar(m.Origin, CurrentIdGenerator.FreshId("$ih#this"), receiverType); // use this temporary variable counter, but for a Dafny name (the idea being that the number and the initial "_" in the name might avoid name conflicts)
+            var ie = new IdentifierExpr(m.Origin, bv.Name) {
+              Var = bv,
+              Type = bv.Type
+            };
+            receiverSubst = ie;
+          } else {
+            CloneVariableAsBoundVar(iv.Origin, iv, "$ih#" + iv.Name, out bv, out var ie);
+            substMap.Add(iv, ie);
+          }
+          parBoundVars.Add(bv);
+          parBounds.Add(new SpecialAllocIndependenceAllocatedBoundedPool());  // record that we don't want alloc antecedents for these variables
+        }
+
+        // Generate a CallStmt to be used as the body of the 'forall' statement.
+        m.RecursiveCallParameters(m.Origin, m.TypeArgs, m.Ins, receiverSubst, substMap, out var recursiveCallReceiver, out var recursiveCallArgs);
+        var methodSel = new MemberSelectExpr(m.Origin, recursiveCallReceiver, m.NameNode) {
+          Member = m,
+          TypeApplicationAtEnclosingClass = m.EnclosingClass.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp.Origin, tp)),
+          TypeApplicationJustMember = m.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp.Origin, tp)),
+          Type = new InferredTypeProxy()
+        };
+        var recursiveCall = new CallStmt(m.Origin, new List<Expression>(), methodSel, recursiveCallArgs) {
+          IsGhost = m.IsGhost
+        };
+
+        Expression parRange = Expression.CreateBoolLiteral(m.Origin, true);
+        foreach (var pre in m.Req) {
+          parRange = Expression.CreateAnd(parRange, Substitute(pre.E, receiverSubst, substMap));
+        }
+
+        // construct an expression (generator) for:  VF' << VF
+        ExpressionConverter decrCheck = delegate (Dictionary<IVariable, Expression> decrSubstMap, ExpressionTranslator exprTran) {
+          var decrToks = new List<IOrigin>();
+          var decrTypes = new List<Type>();
+          var decrCallee = new List<Expr>();
+          var decrCaller = new List<Expr>();
+          var decrCalleeDafny = new List<Expression>();
+          var decrCallerDafny = new List<Expression>();
+          Bpl.Expr canCalls = Bpl.Expr.True;
+          foreach (var ee in m.Decreases.Expressions) {
+            decrToks.Add(ee.Origin);
+            decrTypes.Add(ee.Type.NormalizeExpand());
+            decrCallerDafny.Add(ee);
+            canCalls = BplAnd(canCalls, exprTran.CanCallAssumption(ee));
+            decrCaller.Add(exprTran.TrExpr(ee));
+            Expression es = Substitute(ee, receiverSubst, substMap);
+            es = Substitute(es, null, decrSubstMap);
+            decrCalleeDafny.Add(es);
+            canCalls = BplAnd(canCalls, exprTran.CanCallAssumption(ee));
+            decrCallee.Add(exprTran.TrExpr(es));
+          }
+          return BplImp(canCalls,
+            DecreasesCheck(decrToks, null, decrCalleeDafny, decrCallerDafny, decrCallee, decrCaller, null, null, false, true));
+        };
+
+        var triggers = m.Attributes.AsEnumerable()
+          .Where(attr => attr.Name is "inductionTrigger" or "_inductionTrigger")
+          .Select(attr => attr.Args)
+          .ToList();
+#if VERIFY_CORRECTNESS_OF_TRANSLATION_FORALL_STATEMENT_RANGE
+        var definedness = new BoogieStmtListBuilder(this, options, builder.Context);
+        var exporter = new BoogieStmtListBuilder(this, options, builder.Context);
+        TrForallStmtCall(m.Origin, parBoundVars, parBounds, parRange, decrCheck, null, triggers, recursiveCall, definedness,
+          exporter, localVariables, etran);
+        // All done, so put the two pieces together
+        builder.Add(new Bpl.IfCmd(m.Origin, null, definedness.Collect(m.Origin), null, exporter.Collect(m.Origin)));
+#else
+        TrForallStmtCall(m.Origin, parBoundVars, parBounds, parRange, decrCheck, null, triggers, recursiveCall, null,
+          builder, localVariables, etran, includeCanCalls: true);
+#endif
+      }
+      // translate the body of the method
+      Contract.Assert(m.Body != null);  // follows from method precondition and the if guard
+
+      // $_reverifyPost := false;
+      builder.Add(Boogie.Cmd.SimpleAssign(m.Origin, new Boogie.IdentifierExpr(m.Origin, "$_reverifyPost", Boogie.Type.Bool), Boogie.Expr.False));
+      // register output parameters with definite-assignment trackers
+
+      var beforeOutTrackers = DefiniteAssignmentTrackers;
+      m.Outs.ForEach(p => AddExistingDefiniteAssignmentTracker(p, m.IsGhost));
+      // translate the body
+      TrStmt(m.Body, builder, localVariables, etran);
+      m.Outs.ForEach(p => CheckDefiniteAssignmentReturn(m.Body.Origin.EndToken, p, builder));
+      if (m is { FunctionFromWhichThisIsByMethodDecl: { ByMethodTok: { } } fun }) {
+        AssumeCanCallForByMethodDecl(m, builder);
+      }
+      var stmts = builder.Collect(m.Body.Origin.StartToken); // EndToken might make more sense, but it requires updating most of the regression tests.
+      DefiniteAssignmentTrackers = beforeOutTrackers;
+      return stmts;
+    }
+
+    private void AddMethodOverrideCheckImpl(Method m, Boogie.Procedure proc) {
+      Contract.Requires(m != null);
+      Contract.Requires(proc != null);
+      Contract.Requires(sink != null && Predef != null);
+      Contract.Requires(m.OverriddenMethod != null);
+      Contract.Requires(m.Ins.Count == m.OverriddenMethod.Ins.Count);
+      Contract.Requires(m.Outs.Count == m.OverriddenMethod.Outs.Count);
+      //Contract.Requires(wellformednessProc || m.Body != null);
+      Contract.Requires(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && IsAllocContext == null);
+      Contract.Ensures(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && IsAllocContext == null);
+
+      proofDependencies.SetCurrentDefinition(proc.VerboseName, m);
+      currentModule = m.EnclosingClass.EnclosingModuleDefinition;
+      codeContext = m;
+      IsAllocContext = new IsAllocContext(options, m.IsGhost);
+
+      List<Variable> inParams = Boogie.Formal.StripWhereClauses(proc.InParams);
+      List<Variable> outParams = Boogie.Formal.StripWhereClauses(proc.OutParams);
+
+      var builder = new BoogieStmtListBuilder(this, options, new BodyTranslationContext(false));
+      var etran = new ExpressionTranslator(this, Predef, m.Origin, m);
+      var localVariables = new Variables();
+      InitializeFuelConstant(m.Origin, builder, etran);
+
+      // assume traitTypeParameter == G(overrideTypeParameters);
+      AddOverrideCheckTypeArgumentInstantiations(m, builder, localVariables);
+
+      if (m is TwoStateLemma) {
+        // $Heap := current$Heap;
+        var heap = ExpressionTranslator.HeapIdentifierExpr(Predef, m.Origin);
+        builder.Add(Boogie.Cmd.SimpleAssign(m.Origin, heap, new Boogie.IdentifierExpr(m.Origin, "current$Heap", Predef.HeapType)));
+      }
+
+
+      var substMap = new Dictionary<IVariable, Expression>();
+      for (int i = 0; i < m.Ins.Count; i++) {
+        // get corresponding formal in the class
+        var ie = new IdentifierExpr(m.Ins[i].Origin, m.Ins[i].AssignUniqueName(m.IdGenerator));
+        ie.Var = m.Ins[i]; ie.Type = ie.Var.Type;
+        substMap.Add(m.OverriddenMethod.Ins[i], ie);
+      }
+      for (int i = 0; i < m.Outs.Count; i++) {
+        // get corresponding formal in the class
+        var ie = new IdentifierExpr(m.Outs[i].Origin, m.Outs[i].AssignUniqueName(m.IdGenerator));
+        ie.Var = m.Outs[i]; ie.Type = ie.Var.Type;
+        substMap.Add(m.OverriddenMethod.Outs[i], ie);
+      }
+
+      var typeMap = GetTypeArgumentSubstitutionMap(m.OverriddenMethod, m);
+
+      Boogie.StmtList stmts;
+      //adding assume Pre’; assert P; // this checks that Pre’ implies P
+      AddMethodOverrideReqsChk(m, builder, etran, substMap, typeMap);
+
+      //adding assert R <= Rank’;
+      AddOverrideTerminationChk(m, m.OverriddenMethod, builder, etran, substMap, typeMap);
+
+      //adding assert F <= Frame’ (for both reads and modifies clauses)
+      AddMethodOverrideFrameSubsetChk(m, false, builder, etran, localVariables, substMap, typeMap);
+      AddMethodOverrideFrameSubsetChk(m, true, builder, etran, localVariables, substMap, typeMap);
+
+      if (!(m is TwoStateLemma)) {
+        //change the heap at locations W
+        HavocMethodFrameLocations(m, builder, etran, localVariables);
+      }
+
+      //adding assume Q; assert Post’;
+      AddMethodOverrideEnsChk(m, builder, etran, substMap, typeMap);
+
+      stmts = builder.Collect(m.Origin);
+
+      if (EmitImplementation(m.Attributes)) {
+        // emit the impl only when there are proof obligations.
+        QKeyValue kv = etran.TrAttributes(m.Attributes, null);
+
+        Boogie.Implementation impl = AddImplementationWithAttributes(GetToken(m), proc, inParams, outParams, localVariables, stmts, kv);
+
+        if (InsertChecksums) {
+          InsertChecksum(m, impl);
+        }
+      }
+
+      IsAllocContext = null;
+      Reset();
+    }
+
+    private void HavocMethodFrameLocations(Method m, BoogieStmtListBuilder builder, ExpressionTranslator etran, Variables localVariables) {
+      Contract.Requires(m != null);
+      Contract.Requires(m.EnclosingClass != null && m.EnclosingClass is ClassLikeDecl);
+
+      // play havoc with the heap according to the modifies clause
+      builder.Add(new Bpl.HavocCmd(m.Origin, new List<Bpl.IdentifierExpr> { etran.HeapCastToIdentifierExpr }));
+      // assume the usual two-state boilerplate information
+      foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(m.Origin, m.Mod.Expressions, m.IsGhost, m.AllowsAllocation, etran.Old, etran, etran.Old)) {
+        if (tri.IsFree) {
+          builder.Add(TrAssumeCmd(m.Origin, tri.Expr));
+        }
+      }
+    }
+
+    private void AddFunctionOverrideCheckImpl(Function f) {
+      Contract.Requires(f != null);
+      Contract.Requires(f.EnclosingClass is TopLevelDeclWithMembers);
+      Contract.Requires(sink != null && Predef != null);
+      Contract.Requires(f.OverriddenFunction != null);
+      Contract.Requires(f.Ins.Count == f.OverriddenFunction.Ins.Count);
+      Contract.Requires(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && IsAllocContext != null);
+      Contract.Ensures(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && IsAllocContext != null);
+
+      proofDependencies.SetCurrentDefinition(MethodVerboseName(f.FullDafnyName, MethodTranslationKind.OverrideCheck), f);
+      #region first procedure, no impl yet
+      //Function nf = new Function(f.Tok, "OverrideCheck_" + f.Name, f.IsStatic, f.IsGhost, f.TypeArgs, f.OpenParen, f.Formals, f.ResultType, f.Req, f.Reads, f.Ens, f.Decreases, f.Body, f.Attributes, f.SignatureEllipsis);
+      //AddFunction(f);
+      currentModule = f.EnclosingClass.EnclosingModuleDefinition;
+      codeContext = f;
+
+      Boogie.Expr prevHeap = null;
+      Boogie.Expr currHeap = null;
+      var ordinaryEtran = new ExpressionTranslator(this, Predef, f.Origin, f);
+      ExpressionTranslator etran;
+      var inParams_Heap = new List<Boogie.Variable>();
+      if (f is TwoStateFunction) {
+        var prevHeapVar = new Boogie.Formal(f.Origin, new Boogie.TypedIdent(f.Origin, "previous$Heap", Predef.HeapType), true);
+        inParams_Heap.Add(prevHeapVar);
+        prevHeap = new Boogie.IdentifierExpr(f.Origin, prevHeapVar);
+        if (f.ReadsHeap) {
+          var currHeapVar = new Boogie.Formal(f.Origin, new Boogie.TypedIdent(f.Origin, "current$Heap", Predef.HeapType), true);
+          inParams_Heap.Add(currHeapVar);
+          currHeap = new Boogie.IdentifierExpr(f.Origin, currHeapVar);
+        }
+        etran = new ExpressionTranslator(this, Predef, currHeap, prevHeap, f);
+      } else {
+        etran = ordinaryEtran;
+      }
+
+      // parameters of the procedure
+      var typeInParams = MkTyParamFormals(GetTypeParams(f), true);
+      var inParams = new List<Variable>();
+      var outParams = new List<Boogie.Variable>();
+      if (!f.IsStatic) {
+        var th = new Boogie.IdentifierExpr(f.Origin, "this", TrReceiverType(f));
+        Boogie.Expr wh = BplAnd(
+          ReceiverNotNull(th),
+          etran.GoodRef(f.Origin, th, ModuleResolver.GetReceiverType(f.Origin, f)));
+        Boogie.Formal thVar = new Boogie.Formal(f.Origin, new Boogie.TypedIdent(f.Origin, "this", TrReceiverType(f), wh), true);
+        inParams.Add(thVar);
+      }
+      foreach (Formal p in f.Ins) {
+        Boogie.Type varType = TrType(p.Type);
+        Boogie.Expr wh = GetWhereClause(p.Origin, new Boogie.IdentifierExpr(p.Origin, p.AssignUniqueName(f.IdGenerator), varType), p.Type, etran, NOALLOC);
+        inParams.Add(new Boogie.Formal(p.Origin, new Boogie.TypedIdent(p.Origin, p.AssignUniqueName(f.IdGenerator), varType, wh), true));
+      }
+
+      Formal pOut = null;
+      if (f.Result != null || f.OverriddenFunction.Result != null) {
+        if (f.Result != null) {
+          pOut = f.Result;
+          Contract.Assert(!pOut.IsOld);
+        } else {
+          var pp = f.OverriddenFunction.Result;
+          Contract.Assert(!pp.IsOld);
+          pOut = new Formal(pp.Origin, pp.NameNode, f.ResultType, false, pp.IsGhost, null);
+        }
+        var varType = TrType(pOut.Type);
+        var wh = GetWhereClause(pOut.Origin, new Boogie.IdentifierExpr(pOut.Origin, pOut.AssignUniqueName(f.IdGenerator), varType), pOut.Type, etran, NOALLOC);
+        outParams.Add(new Boogie.Formal(pOut.Origin, new Boogie.TypedIdent(pOut.Origin, pOut.AssignUniqueName(f.IdGenerator), varType, wh), true));
+      }
+      // the procedure itself
+      var req = new List<Boogie.Requires>();
+      if (f is TwoStateFunction) {
+        // free requires prevHeap == Heap && HeapSucc(prevHeap, currHeap) && IsHeap(currHeap)
+        var a0 = Boogie.Expr.Eq(prevHeap, ordinaryEtran.HeapExpr);
+        var a1 = HeapSucc(prevHeap, currHeap);
+        var a2 = FunctionCall(f.Origin, BuiltinFunction.IsGoodHeap, null, currHeap);
+        req.Add(FreeRequires(f.Origin, BplAnd(a0, BplAnd(a1, a2)), null));
+      }
+      foreach (var typeBoundAxiom in TypeBoundAxioms(f.Origin, Concat(f.EnclosingClass.TypeArgs, f.TypeArgs))) {
+        req.Add(Requires(f.Origin, true, null, typeBoundAxiom, null, null, null));
+      }
+
+      // modifies $Heap
+      var mod = new List<Boogie.IdentifierExpr> {
+        ordinaryEtran.HeapCastToIdentifierExpr,
+      };
+      var ens = new List<Boogie.Ensures>();
+
+      var name = MethodName(f, MethodTranslationKind.OverrideCheck);
+      var implicitParameters = Util.Concat(typeInParams, inParams_Heap);
+      var proc = new Boogie.Procedure(f.Origin, name, new List<Boogie.TypeVariable>(),
+        Util.Concat(implicitParameters, inParams), outParams,
+        false, req, mod, ens, etran.TrAttributes(f.Attributes, null));
+      AddVerboseNameAttribute(proc, f.FullDafnyName, MethodTranslationKind.OverrideCheck);
+      sink.AddTopLevelDeclaration(proc);
+      var implImplicitParams = Boogie.Formal.StripWhereClauses(implicitParameters);
+      var implInParams = Boogie.Formal.StripWhereClauses(inParams);
+      var implOutParams = Boogie.Formal.StripWhereClauses(outParams);
+
+      #endregion
+
+      BoogieStmtListBuilder builder = new BoogieStmtListBuilder(this, options, new BodyTranslationContext(false));
+      var localVariables = new Variables();
+
+      InitializeFuelConstant(f.Origin, builder, etran);
+
+      // assume traitTypeParameter == G(overrideTypeParameters);
+      AddOverrideCheckTypeArgumentInstantiations(f, builder, localVariables);
+
+      if (f is TwoStateFunction) {
+        // $Heap := current$Heap;
+        var heap = ordinaryEtran.HeapCastToIdentifierExpr;
+        builder.Add(Boogie.Cmd.SimpleAssign(f.Origin, heap, etran.HeapExpr));
+        etran = ordinaryEtran;  // we no longer need the special heap names
+      }
+
+      var substMap = new Dictionary<IVariable, Expression>();
+      foreach (var (formal, overriddenFormal) in f.Ins.Zip(f.OverriddenFunction.Ins, Tuple.Create)) {
+        // get corresponding formal in the class
+        var ie = new IdentifierExpr(formal.Origin, formal.AssignUniqueName(f.IdGenerator)) { Var = formal, Type = formal.Type };
+        substMap.Add(overriddenFormal, ie);
+      }
+
+      if (f.OverriddenFunction.Result != null) {
+        Contract.Assert(pOut != null);
+        //get corresponding formal in the class
+        var ie = new IdentifierExpr(pOut.Origin, pOut.AssignUniqueName(f.IdGenerator)) { Var = pOut, Type = pOut.Type };
+        substMap.Add(f.OverriddenFunction.Result, ie);
+      }
+
+      var typeMap = GetTypeArgumentSubstitutionMap(f.OverriddenFunction, f);
+
+      //adding assume Pre’; assert P; // this checks that Pre’ implies P
+      AddFunctionOverrideReqsChk(f, builder, etran, substMap, typeMap);
+
+      //adding assert R <= Rank’;
+      AddOverrideTerminationChk(f, f.OverriddenFunction, builder, etran, substMap, typeMap);
+
+      //adding assert W <= Frame’
+      AddFunctionOverrideSubsetChk(f, builder, etran, localVariables, substMap, typeMap);
+
+      //adding assume Q; assert Post’;
+      AddFunctionOverrideEnsChk(f, builder, etran, substMap, typeMap, implInParams, implOutParams.Count == 0 ? null : implOutParams[0]);
+
+      var stmts = builder.Collect(f.Origin);
+
+      if (EmitImplementation(f.Attributes)) {
+        // emit the impl only when there are proof obligations.
+        QKeyValue kv = etran.TrAttributes(f.Attributes, null);
+
+        AddImplementationWithAttributes(GetToken(f), proc,
+            Util.Concat(implImplicitParams, implInParams),
+            implOutParams, localVariables, stmts, kv);
+      }
+
+      if (InsertChecksums) {
+        InsertChecksum(f, proc, true);
+      }
+
+      Reset();
+    }
+
+
+    private void AddFunctionOverrideEnsChk(Function f, BoogieStmtListBuilder builder, ExpressionTranslator etran,
+      Dictionary<IVariable, Expression> substMap,
+      Dictionary<TypeParameter, Type> typeMap,
+      List<Bpl.Variable> implInParams,
+      Bpl.Variable/*?*/ resultVariable) {
+      Contract.Requires(f.Ins.Count <= implInParams.Count);
+
+      var cco = new CanCallOptions(true, f);
+      //generating class post-conditions
+      foreach (var en in ConjunctsOf(f.Ens)) {
+        builder.Add(TrAssumeCmd(f.Origin, etran.CanCallAssumption(en.E, cco)));
+        builder.Add(TrAssumeCmdWithDependencies(etran, f.Origin, en.E, "overridden function ensures clause"));
+      }
+
+      //generating assume C.F(ins) == out, if a result variable was given
+      if (resultVariable != null) {
+        var funcIdC = new FunctionCall(new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName, TrType(f.ResultType)));
+        var argsC = new List<Bpl.Expr>();
+
+        // add type arguments
+        argsC.AddRange(GetTypeArguments(f, null).ConvertAll(TypeToTy));
+
+        // add fuel arguments
+        if (f.IsFuelAware()) {
+          argsC.Add(etran.layerInterCluster.GetFunctionFuel(f));
+        }
+
+        if (f.IsOpaque || f.IsMadeImplicitlyOpaque(options)) {
+          argsC.Add(GetRevealConstant(f));
+        }
+
+        // add heap arguments
+        if (f is TwoStateFunction) {
+          argsC.Add(etran.Old.HeapExpr);
+        }
+        if (f.ReadsHeap) {
+          argsC.Add(etran.HeapExpr);
+        }
+
+        argsC.AddRange(implInParams.Select(var => new Bpl.IdentifierExpr(f.Origin, var)));
+
+        var funcExpC = new Bpl.NAryExpr(f.Origin, funcIdC, argsC);
+        var resultVar = new Bpl.IdentifierExpr(resultVariable.tok, resultVariable);
+        builder.Add(TrAssumeCmd(f.Origin, Bpl.Expr.Eq(funcExpC, resultVar)));
+      }
+
+      // conjunction of class post-conditions
+      var allOverrideEns = f.Ens.Count == 0 ? null : f.Ens
+        .Select(e => e.E)
+        .Aggregate((e0, e1) => new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, e0, e1));
+      //generating trait post-conditions with class variables
+      cco = new CanCallOptions(true, f, true);
+      FunctionCallSubstituter sub = null;
+      foreach (var en in ConjunctsOf(f.OverriddenFunction.Ens)) {
+        sub ??= new FunctionCallSubstituter(substMap, typeMap, (TraitDecl)f.OverriddenFunction.EnclosingClass, (TopLevelDeclWithMembers)f.EnclosingClass);
+        var subEn = sub.Substitute(en.E);
+        foreach (var s in TrSplitExpr(new BodyTranslationContext(false), subEn, etran, false, out _).Where(s => s.IsChecked)) {
+          builder.Add(TrAssumeCmd(f.Origin, etran.CanCallAssumption(subEn, cco)));
+          var constraint = allOverrideEns == null
+            ? null
+            : new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Imp, allOverrideEns, subEn);
+          builder.Add(Assert(f.Origin, s.E, new FunctionContractOverride(true, constraint), builder.Context));
+        }
+      }
+    }
+
+    private void AddOverrideCheckTypeArgumentInstantiations(MemberDecl member, BoogieStmtListBuilder builder, Variables localVariables) {
+      Contract.Requires(member is Function || member is Method);
+      Contract.Requires(member.EnclosingClass is TopLevelDeclWithMembers);
+      Contract.Requires(builder != null);
+      Contract.Requires(localVariables != null);
+
+      MemberDecl overriddenMember;
+      List<TypeParameter> overriddenTypeParameters;
+      if (member is Function) {
+        var o = ((Function)member).OverriddenFunction;
+        overriddenMember = o;
+        overriddenTypeParameters = o.TypeArgs;
+      } else {
+        var o = ((Method)member).OverriddenMethod;
+        overriddenMember = o;
+        overriddenTypeParameters = o.TypeArgs;
+      }
+      var typeMap = GetTypeArgumentSubstitutionMap(overriddenMember, member);
+      foreach (var tp in Util.Concat(overriddenMember.EnclosingClass.TypeArgs, overriddenTypeParameters)) {
+        localVariables.GetOrAdd(BplLocalVar(NameTypeParam(tp), Predef.Ty, out var lhs));
+        var rhs = TypeToTy(typeMap[tp]);
+        builder.Add(new Boogie.AssumeCmd(tp.Origin, Boogie.Expr.Eq(lhs, rhs)));
+      }
+    }
+
+
+    private void AddFunctionOverrideSubsetChk(Function func, BoogieStmtListBuilder builder, ExpressionTranslator etran, Variables localVariables,
+      Dictionary<IVariable, Expression> substMap,
+      Dictionary<TypeParameter, Type> typeMap) {
+      //getting framePrime
+      List<FrameExpression> traitFrameExps = new List<FrameExpression>();
+      FunctionCallSubstituter sub = null;
+      foreach (var e in func.OverriddenFunction.Reads.Expressions) {
+        sub ??= new FunctionCallSubstituter(substMap, typeMap, (TraitDecl)func.OverriddenFunction.EnclosingClass, (TopLevelDeclWithMembers)func.EnclosingClass);
+        var newE = sub.Substitute(e.E);
+        FrameExpression fe = new FrameExpression(e.Origin, newE, e.FieldName);
+        traitFrameExps.Add(fe);
+      }
+
+      QKeyValue kv = etran.TrAttributes(func.Attributes, null);
+
+      IOrigin tok = func.Origin;
+      // Declare a local variable $_ReadsFrame: [ref, Field]bool
+      Bpl.IdentifierExpr traitFrame = etran.ReadsFrame(func.OverriddenFunction.Origin);  // this is a throw-away expression, used only to extract the type and name of the $_ReadsFrame variable
+      traitFrame.Name = func.EnclosingClass.Name + "_" + traitFrame.Name;
+      Contract.Assert(traitFrame.Type != null);  // follows from the postcondition of ReadsFrame
+      var frame = localVariables.GetOrAdd(new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, null ?? traitFrame.Name, traitFrame.Type)));
+      // $_ReadsFrame := (lambda $o: ref, $f: Field :: $o != null && $Heap[$o,alloc] ==> ($o,$f) in Modifies/Reads-Clause);
+      Bpl.BoundVariable oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", Predef.RefType));
+      Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(tok, oVar);
+      Bpl.BoundVariable fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", Predef.FieldName(tok)));
+      Bpl.IdentifierExpr f = new Bpl.IdentifierExpr(tok, fVar);
+      Bpl.Expr ante = BplAnd(Bpl.Expr.Neq(o, Predef.Null), etran.IsAlloced(tok, o));
+      Bpl.Expr consequent = InRWClause(tok, o, f, traitFrameExps, etran, null, null);
+      Bpl.Expr lambda = new Bpl.LambdaExpr(tok, new List<TypeVariable>(), new List<Variable> { oVar, fVar }, null,
+                                           BplImp(ante, consequent));
+
+      //to initialize $_ReadsFrame variable to Frame'
+      builder.Add(Bpl.Cmd.SimpleAssign(tok, new Bpl.IdentifierExpr(tok, frame), lambda));
+
+      // emit: assert (forall o: ref, f: Field :: o != null && $Heap[o,alloc] && (o,f) in subFrame ==> $_ReadsFrame[o,f]);
+      Bpl.Expr oInCallee = InRWClause(tok, o, f, func.Reads.Expressions, etran, null, null);
+      Bpl.Expr consequent2 = InRWClause(tok, o, f, traitFrameExps, etran, null, null);
+      Bpl.Expr q = new Bpl.ForallExpr(tok, new List<TypeVariable>(), new List<Variable> { oVar, fVar },
+                                      BplImp(BplAnd(ante, oInCallee), consequent2));
+      var description = new TraitFrame(func.WhatKind, false, func.Reads.Expressions, traitFrameExps);
+      builder.Add(Assert(tok, q, description, builder.Context, kv));
+    }
+
+    private void AddFunctionOverrideReqsChk(Function f, BoogieStmtListBuilder builder, ExpressionTranslator etran,
+      Dictionary<IVariable, Expression> substMap,
+      Dictionary<TypeParameter, Type> typeMap) {
+      Contract.Requires(f != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(substMap != null);
+      //generating trait pre-conditions with class variables
+      var cco = new CanCallOptions(true, f, true);
+      FunctionCallSubstituter sub = null;
+      var subReqs = new List<Expression>();
+      foreach (var req in ConjunctsOf(f.OverriddenFunction.Req)) {
+        sub ??= new FunctionCallSubstituter(substMap, typeMap, (TraitDecl)f.OverriddenFunction.EnclosingClass, (TopLevelDeclWithMembers)f.EnclosingClass);
+        var subReq = sub.Substitute(req.E);
+        builder.Add(TrAssumeCmd(f.Origin, etran.CanCallAssumption(subReq, cco)));
+        builder.Add(TrAssumeCmdWithDependencies(etran, f.Origin, subReq, "overridden function requires clause"));
+        subReqs.Add(subReq);
+      }
+      var allTraitReqs = subReqs.Count == 0 ? null : subReqs
+        .Aggregate((e0, e1) => new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, e0, e1));
+      //generating class pre-conditions
+      cco = new CanCallOptions(true, f);
+      foreach (var req in ConjunctsOf(f.Req)) {
+        foreach (var s in TrSplitExpr(new BodyTranslationContext(false), req.E, etran, false, out _).Where(s => s.IsChecked)) {
+          builder.Add(TrAssumeCmd(f.Origin, etran.CanCallAssumption(req.E, cco)));
+          var constraint = allTraitReqs == null
+            ? null
+            : new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Imp, allTraitReqs, req.E);
+          builder.Add(Assert(f.Origin, s.E, new FunctionContractOverride(false, constraint), builder.Context));
+        }
+      }
+    }
+
+    /// <summary>
+    /// Essentially, the function override axiom looks like:
+    ///   axiom (forall $heap: HeapType, typeArgs: Ty, this: ref, x#0: int, fuel: LayerType ::
+    ///     { J.F(fuel, $heap, G(typeArgs), this, x#0), C.F(fuel, $heap, typeArgs, this, x#0) }
+    ///     { J.F(fuel, $heap, G(typeArgs), this, x#0), $Is(this, C) }
+    ///     C.F#canCall(args) || (J.F#canCall(args) && $Is(this, C))
+    ///     ==>
+    ///     (J.F#canCall(args) ==> C.F#canCall(args)) &&
+    ///     J.F(fuel, $heap, G(typeArgs), this, x#0) == C.F(fuel, $heap, typeArgs, this, x#0));
+    /// (without the other usual antecedents).  Essentially, the override gives a part of the body of the
+    /// trait's function, so we call FunctionAxiom to generate a conditional axiom (that is, we pass in the "overridingFunction"
+    /// parameter to FunctionAxiom, which will add 'dtype(this) == class.C' as an additional antecedent) for a
+    /// body of 'C.F(this, x#0)'.
+    /// </summary>
+    private Boogie.Axiom FunctionOverrideAxiom(Function f, Function overridingFunction) {
+      Contract.Requires(f != null);
+      Contract.Requires(overridingFunction != null);
+      Contract.Requires(Predef != null);
+      Contract.Requires(f.EnclosingClass != null);
+      Contract.Requires(!f.IsStatic);
+      Contract.Requires(overridingFunction.EnclosingClass is TopLevelDeclWithMembers);
+      Contract.Ensures(Contract.Result<Boogie.Axiom>() != null);
+
+      bool readsHeap = f.ReadsHeap || overridingFunction.ReadsHeap;
+
+      ExpressionTranslator etran;
+      Boogie.BoundVariable bvPrevHeap = null;
+      if (f is TwoStateFunction) {
+        bvPrevHeap = new Boogie.BoundVariable(f.Origin, new Boogie.TypedIdent(f.Origin, "$prevHeap", Predef.HeapType));
+        etran = new ExpressionTranslator(this, Predef,
+          f.ReadsHeap ? new Boogie.IdentifierExpr(f.Origin, Predef.HeapVarName, Predef.HeapType) : null,
+          new Boogie.IdentifierExpr(f.Origin, bvPrevHeap),
+          f);
+      } else if (readsHeap) {
+        etran = new ExpressionTranslator(this, Predef, f.Origin, f);
+      } else {
+        etran = new ExpressionTranslator(this, Predef, (Boogie.Expr)null, f);
+      }
+
+      // "forallFormals" is built to hold the bound variables of the quantification
+      // argsJF are the arguments to J.F (the function in the trait)
+      // argsCF are the arguments to C.F (the overriding function)
+      var forallFormals = new List<Boogie.Variable>();
+      var argsJF = new List<Boogie.Expr>();
+      var argsJFCanCall = new List<Boogie.Expr>();
+      var argsCF = new List<Boogie.Expr>();
+      var argsCFCanCall = new List<Boogie.Expr>();
+
+      // Add type arguments
+      forallFormals.AddRange(MkTyParamBinders(GetTypeParams(overridingFunction), out _));
+      {
+        var typeArguments = GetTypeArguments(f, overridingFunction).ConvertAll(TypeToTy);
+        argsJF.AddRange(typeArguments);
+        argsJFCanCall.AddRange(typeArguments);
+        typeArguments = GetTypeArguments(overridingFunction, null).ConvertAll(TypeToTy);
+        argsCF.AddRange(typeArguments);
+        argsCFCanCall.AddRange(typeArguments);
+      }
+
+      var moreArgsJF = new List<Boogie.Expr>(); // non-type-parameters, non-fuel, non-reveal arguments
+      var moreArgsCF = new List<Boogie.Expr>(); // non-type-parameters, non-fuel, non-reveal arguments
+      Expr layer = null;
+      Expr reveal = null;
+
+      // Add the fuel argument
+      if (f.IsFuelAware()) {
+        Contract.Assert(overridingFunction.IsFuelAware());  // f.IsFuelAware() ==> overridingFunction.IsFuelAware()
+        var fuel = new Boogie.BoundVariable(f.Origin, new Boogie.TypedIdent(f.Origin, "$fuel", Predef.LayerType));
+        forallFormals.Add(fuel);
+        layer = new Boogie.IdentifierExpr(f.Origin, fuel);
+        argsJF.Add(layer);
+      } else if (overridingFunction.IsFuelAware()) {
+        // We can't use a bound variable $fuel, because then one of the triggers won't be mentioning this $fuel.
+        // Instead, we do the next best thing: use the literal $LZ.
+        layer = new Boogie.IdentifierExpr(f.Origin, "$LZ", Predef.LayerType); // $LZ
+      }
+
+      if (f.IsOpaque || f.IsMadeImplicitlyOpaque(options)) {
+        Contract.Assert(overridingFunction.IsOpaque || options.Get(CommonOptionBag.DefaultFunctionOpacity) == CommonOptionBag.DefaultFunctionOpacityOptions.Opaque || options.Get(CommonOptionBag.DefaultFunctionOpacity) == CommonOptionBag.DefaultFunctionOpacityOptions.AutoRevealDependencies);
+        var revealVar = new Boogie.BoundVariable(f.Origin, new Boogie.TypedIdent(f.Origin, "reveal", Boogie.Type.Bool));
+        forallFormals.Add(revealVar);
+        reveal = new Boogie.IdentifierExpr(f.Origin, revealVar);
+        argsJF.Add(reveal);
+      } else if (overridingFunction.IsOpaque || overridingFunction.IsMadeImplicitlyOpaque(options)) {
+        reveal = GetRevealConstant(overridingFunction);
+      }
+
+      // Add heap arguments
+      if (f is TwoStateFunction) {
+        Contract.Assert(bvPrevHeap != null);
+        forallFormals.Add(bvPrevHeap);
+        moreArgsJF.Add(etran.Old.HeapExpr);
+        moreArgsCF.Add(etran.Old.HeapExpr);
+      }
+      if (f.ReadsHeap || overridingFunction.ReadsHeap) {
+        var heap = new Boogie.BoundVariable(f.Origin, new Boogie.TypedIdent(f.Origin, Predef.HeapVarName, Predef.HeapType));
+        forallFormals.Add(heap);
+        if (f.ReadsHeap) {
+          moreArgsJF.Add(new Boogie.IdentifierExpr(f.Origin, heap));
+        }
+        if (overridingFunction.ReadsHeap) {
+          moreArgsCF.Add(new Boogie.IdentifierExpr(overridingFunction.Origin, heap));
+        }
+      }
+
+      // Add receiver parameter
+      Type thisType = ModuleResolver.GetReceiverType(f.Origin, overridingFunction);
+      var bvThis = new Boogie.BoundVariable(f.Origin, new Boogie.TypedIdent(f.Origin, etran.This, TrType(thisType)));
+      forallFormals.Add(bvThis);
+      var bvThisExpr = new Boogie.IdentifierExpr(f.Origin, bvThis);
+      moreArgsJF.Add(BoxifyForTraitParent(f.Origin, bvThisExpr, f, thisType));
+      moreArgsCF.Add(bvThisExpr);
+      // $Is(this, C)
+      var isOfSubtype = GetWhereClause(overridingFunction.Origin, bvThisExpr, thisType, f is TwoStateFunction ? etran.Old : etran,
+        IsAllocType.NEVERALLOC, alwaysUseSymbolicName: true);
+
+      // Add other arguments
+      var typeMap = GetTypeArgumentSubstitutionMap(f, overridingFunction);
+      foreach (Formal p in f.Ins) {
+        var pType = p.Type.Subst(typeMap);
+        var bv = new Boogie.BoundVariable(p.Origin, new Boogie.TypedIdent(p.Origin, p.AssignUniqueName(CurrentDeclaration.IdGenerator), TrType(pType)));
+        forallFormals.Add(bv);
+        var jfArg = new Boogie.IdentifierExpr(p.Origin, bv);
+        moreArgsJF.Add(ModeledAsBoxType(p.Type) ? BoxIfNotNormallyBoxed(p.Origin, jfArg, pType) : jfArg);
+        moreArgsCF.Add(new Boogie.IdentifierExpr(p.Origin, bv));
+      }
+
+      if (layer != null) {
+        argsCF.Add(layer);
+      }
+
+      if (reveal != null) {
+        argsCF.Add(reveal);
+      }
+
+      argsJF = Concat(argsJF, moreArgsJF);
+      argsJFCanCall = Concat(argsJFCanCall, moreArgsJF);
+      argsCF = Concat(argsCF, moreArgsCF);
+      argsCFCanCall = Concat(argsCFCanCall, moreArgsCF);
+
+      Bpl.Expr canCallFunc, canCallOverridingFunc;
+      {
+        var callName = new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName + "#canCall", Bpl.Type.Bool);
+        canCallFunc = new Bpl.NAryExpr(f.Origin, new Bpl.FunctionCall(callName), argsJFCanCall);
+        callName = new Bpl.IdentifierExpr(overridingFunction.Origin, overridingFunction.FullSanitizedName + "#canCall", Bpl.Type.Bool);
+        canCallOverridingFunc = new Bpl.NAryExpr(f.Origin, new Bpl.FunctionCall(callName), argsCFCanCall);
+      }
+
+      // useViaCanCall: C.F#canCall(args)
+      Bpl.Expr useViaCanCall = canCallFunc;
+
+      // ante := C.F#canCall(args) || (J.F#canCall(args) && $Is(this, C))
+      var ante = BplOr(canCallOverridingFunc, BplAnd(canCallFunc, isOfSubtype));
+
+      Boogie.Expr funcAppl;
+      {
+        var funcID = new Boogie.IdentifierExpr(f.Origin, f.FullSanitizedName, TrType(f.ResultType));
+        funcAppl = new Boogie.NAryExpr(f.Origin, new Boogie.FunctionCall(funcID), argsJF);
+      }
+      Boogie.Expr overridingFuncAppl;
+      {
+        var funcID = new Boogie.IdentifierExpr(overridingFunction.Origin, overridingFunction.FullSanitizedName, TrType(overridingFunction.ResultType));
+        overridingFuncAppl = new Boogie.NAryExpr(overridingFunction.Origin, new Boogie.FunctionCall(funcID), argsCF);
+      }
+
+      // Build the triggers
+      // { f'(Succ(s), args') }
+      Boogie.Trigger tr = BplTriggerHeap(this, overridingFunction.Origin,
+        overridingFuncAppl,
+        readsHeap ? etran.HeapExpr : null);
+      // { f(Succ(s), args), $Is(this, T') }
+      var exprs = new List<Boogie.Expr>() { funcAppl, isOfSubtype };
+      if (readsHeap) {
+        exprs.Add(FunctionCall(overridingFunction.Origin, BuiltinFunction.IsGoodHeap, null, etran.HeapExpr));
+      }
+      tr = new Boogie.Trigger(overridingFunction.Origin, true, exprs, tr);
+
+      // The equality that is what it's all about
+      var synonyms = Boogie.Expr.Eq(
+        funcAppl,
+        ModeledAsBoxType(f.ResultType) ? BoxIfNotNormallyBoxed(overridingFunction.Origin, overridingFuncAppl, overridingFunction.ResultType) : overridingFuncAppl);
+      // add overridingFunction#canCall ==> f#canCall to the axiom
+      var canCallImp = BplImp(canCallFunc, canCallOverridingFunc);
+
+      // The axiom
+      Boogie.Expr ax = BplForall(f.Origin, new List<Boogie.TypeVariable>(), forallFormals, null, tr,
+        BplImp(ante, BplAnd(canCallImp, synonyms)));
+      var comment = $"override axiom for {f.FullSanitizedName} in {overridingFunction.EnclosingClass.WhatKind} {overridingFunction.EnclosingClass.FullSanitizedName}";
+      return new Boogie.Axiom(f.Origin, ax, comment);
+    }
+
+    /// <summary>
+    /// Return a type-parameter substitution map for function "f", as instantiated by the context of "overridingFunction".
+    ///
+    /// In more symbols, suppose "f" is declared as follows:
+    ///     class/trait Tr[A,B] {
+    ///       function f[C,D](...): ...
+    ///     }
+    /// and "overridingFunction" is declared as follows:
+    ///     class/trait Cl[G] extends Tr[X(G),Y(G)] {
+    ///       function f[R,S](...): ...
+    ///     }
+    /// Then, return the following map:
+    ///     A -> X(G)
+    ///     B -> Y(G)
+    ///     C -> R
+    ///     D -> S
+    ///
+    /// See also GetTypeArguments.
+    /// </summary>
+    private static Dictionary<TypeParameter, Type> GetTypeArgumentSubstitutionMap(MemberDecl member, MemberDecl overridingMember) {
+      Contract.Requires(member is Function || member is Method);
+      Contract.Requires(overridingMember is Function || overridingMember is Method);
+      Contract.Requires(overridingMember.EnclosingClass is TopLevelDeclWithMembers);
+      Contract.Requires(((ICallable)member).TypeArgs.Count == ((ICallable)overridingMember).TypeArgs.Count);
+
+      var typeMap = new Dictionary<TypeParameter, Type>();
+
+      var cl = (TopLevelDeclWithMembers)overridingMember.EnclosingClass;
+      var classTypeMap = cl.ParentFormalTypeParametersToActuals;
+      member.EnclosingClass.TypeArgs.ForEach(tp => typeMap.Add(tp, classTypeMap[tp]));
+
+      var origTypeArgs = ((ICallable)member).TypeArgs;
+      var overridingTypeArgs = ((ICallable)overridingMember).TypeArgs;
+      for (var i = 0; i < origTypeArgs.Count; i++) {
+        var otp = overridingTypeArgs[i];
+        typeMap.Add(origTypeArgs[i], new UserDefinedType(otp.Origin, otp));
+      }
+
+      return typeMap;
+    }
+
+    private void AddMethodOverrideEnsChk(Method m, BoogieStmtListBuilder builder, ExpressionTranslator etran,
+      Dictionary<IVariable, Expression> substMap,
+      Dictionary<TypeParameter, Type> typeMap) {
+      Contract.Requires(m != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(substMap != null);
+      //generating class post-conditions
+      foreach (var en in ConjunctsOf(m.Ens)) {
+        builder.Add(TrAssumeCmd(m.Origin, etran.CanCallAssumption(en.E)));
+        builder.Add(TrAssumeCmdWithDependencies(etran, m.Origin, en.E, "overridden ensures clause"));
+      }
+      // conjunction of class post-conditions
+      var allOverrideEns = m.Ens.Count == 0 ? null : m.Ens
+        .Select(e => e.E)
+        .Aggregate((e0, e1) => new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, e0, e1));
+      //generating trait post-conditions with class variables
+      FunctionCallSubstituter sub = null;
+      foreach (var en in ConjunctsOf(m.OverriddenMethod.Ens)) {
+        sub ??= new FunctionCallSubstituter(substMap, typeMap, (TraitDecl)m.OverriddenMethod.EnclosingClass, (TopLevelDeclWithMembers)m.EnclosingClass);
+        var subEn = sub.Substitute(en.E);
+        foreach (var s in TrSplitExpr(new BodyTranslationContext(false), subEn, etran, false, out _).Where(s => s.IsChecked)) {
+          builder.Add(TrAssumeCmd(m.OverriddenMethod.Origin, etran.CanCallAssumption(subEn)));
+          var constraint = allOverrideEns == null
+            ? null
+            : new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Imp, allOverrideEns, subEn);
+          builder.Add(Assert(m.Origin, s.E, new EnsuresStronger(constraint), builder.Context));
+        }
+      }
+    }
+
+    private void AddMethodOverrideReqsChk(Method m, BoogieStmtListBuilder builder, ExpressionTranslator etran,
+      Dictionary<IVariable, Expression> substMap,
+      Dictionary<TypeParameter, Type> typeMap) {
+      Contract.Requires(m != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(substMap != null);
+      //generating trait pre-conditions with class variables
+      FunctionCallSubstituter sub = null;
+      var subReqs = new List<Expression>();
+      foreach (var req in ConjunctsOf(m.OverriddenMethod.Req)) {
+        sub ??= new FunctionCallSubstituter(substMap, typeMap, (TraitDecl)m.OverriddenMethod.EnclosingClass, (TopLevelDeclWithMembers)m.EnclosingClass);
+        var subReq = sub.Substitute(req.E);
+        builder.Add(TrAssumeCmd(m.OverriddenMethod.Origin, etran.CanCallAssumption(subReq)));
+        builder.Add(TrAssumeCmdWithDependencies(etran, m.Origin, subReq, "overridden requires clause"));
+        subReqs.Add(subReq);
+      }
+      var allTraitReqs = subReqs.Count == 0 ? null : subReqs
+        .Aggregate((e0, e1) => new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, e0, e1));
+      //generating class pre-conditions
+      foreach (var req in ConjunctsOf(m.Req)) {
+        foreach (var s in TrSplitExpr(new BodyTranslationContext(false), req.E, etran, false, out _).Where(s => s.IsChecked)) {
+          builder.Add(TrAssumeCmd(m.Origin, etran.CanCallAssumption(req.E)));
+          var constraint = allTraitReqs == null
+            ? null
+            : new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Imp, allTraitReqs, req.E);
+          builder.Add(Assert(m.Origin, s.E, new RequiresWeaker(constraint), builder.Context));
+        }
+      }
+    }
+
+    private void AddOverrideTerminationChk(ICallable original, ICallable overryd, BoogieStmtListBuilder builder, ExpressionTranslator etran,
+      Dictionary<IVariable, Expression> substMap,
+      Dictionary<TypeParameter, Type> typeMap) {
+      Contract.Requires(original != null);
+      Contract.Requires(overryd != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(substMap != null);
+      // Note, it is as if the trait's method is calling the class's method.
+      var contextDecreases = overryd.Decreases.Expressions;
+      var calleeDecreases = original.Decreases.Expressions;
+      var T = (TraitDecl)((MemberDecl)overryd).EnclosingClass;
+      var I = (TopLevelDeclWithMembers)((MemberDecl)original).EnclosingClass;
+
+      // We want to check:  calleeDecreases <= contextDecreases (note, we can allow equality, since there is a bounded, namely 1, number of dynamic dispatches)
+      if (Contract.Exists(contextDecreases, e => e is WildcardExpr)) {
+        // no check needed
+        return;
+      }
+
+      int N = Math.Min(contextDecreases.Count, calleeDecreases.Count);
+      var toks = new List<IOrigin>();
+      var callee = new List<Expr>();
+      var caller = new List<Expr>();
+      var calleeDafny = new List<Expression>();
+      var callerDafny = new List<Expression>();
+      FunctionCallSubstituter sub = new FunctionCallSubstituter(substMap, typeMap, T, I);
+
+      for (int i = 0; i < N; i++) {
+        Expression e0 = calleeDecreases[i];
+        Expression e1 = sub.Substitute(contextDecreases[i]);
+        if (!CompatibleDecreasesTypes(e0.Type, e1.Type)) {
+          N = i;
+          break;
+        }
+        toks.Add(new NestedOrigin(original.Origin.StartToken, e1.Origin));
+        calleeDafny.Add(e0);
+        callerDafny.Add(e1);
+        callee.Add(etran.TrExpr(e0));
+        caller.Add(etran.TrExpr(e1));
+        var canCall = BplAnd(etran.CanCallAssumption(e1), etran.CanCallAssumption((e0)));
+        builder.Add(new Bpl.AssumeCmd(e1.Origin, canCall));
+      }
+
+      var decrCountT = contextDecreases.Count;
+      var decrCountC = calleeDecreases.Count;
+      // Generally, we want to produce a check "decrClass <= decrTrait", allowing (the common case where) they are equal.
+      // * If N < decrCountC && N < decrCountT, then "decrClass <= decrTrait" if the comparison ever gets beyond the
+      //   parts that survived truncation.  Thus, we compare with "allowNoChange" set to "false".
+      // Otherwise:
+      // * If decrCountC == decrCountT, then the truncation we did above had no effect and we pass in "allowNoChange" as "true".
+      // * If decrCountC > decrCountT, then we will have truncated decrClass above.  Let x,y and x' denote decrClass and
+      //   decrTrait, respectively, where x and x' have the same length.  Considering how Dafny in effect pads the end of
+      //   decreases tuples with a \top, we were supposed to evaluate (x,(y,\top)) <= (x',\top), which by lexicographic pairs
+      //   we can expand to:
+      //       x <= x' && (x == x' ==> (y,\top) <= \top)
+      //   which is equivalent to just x <= x'.  Thus, we called DecreasesCheck to compare x and x' and we pass in "allowNoChange"
+      //   as "true".
+      // * If decrCountC < decrCountT, then we will have truncated decrTrait above.  Let x and x',y' denote decrClass and
+      //   decrTrait, respectively, where x and x' have the same length.  We then want to check (x,\top) <= (x',(y',\top)), which
+      //   expands to:
+      //       x <= x' && (x == x' ==> \top <= (y',\top))
+      //    =      { \top is strictly larger than a pair }
+      //       x <= x' && (x == x' ==> false)
+      //    =
+      //       x < x'
+      //   So we perform our desired check by calling DecreasesCheck to strictly compare x and x', so we pass in "allowNoChange"
+      //   as "false".
+      bool allowNoChange = N == decrCountT && decrCountT <= decrCountC;
+      var decrChk = DecreasesCheck(toks, null, calleeDafny, callerDafny, callee, caller, null,
+        null, allowNoChange, false);
+      var assertedExpr = new DecreasesToExpr(
+        Token.NoToken,
+        contextDecreases.Select(sub.Substitute).ToList(),
+        calleeDecreases,
+        true);
+      var desc = new TraitDecreases(original.WhatKind, assertedExpr);
+      builder.Add(Assert(original.Origin, decrChk, desc, builder.Context));
+    }
+
+    private void AddMethodOverrideFrameSubsetChk(Method m, bool isModifies, BoogieStmtListBuilder builder, ExpressionTranslator etran, Variables localVariables,
+      Dictionary<IVariable, Expression> substMap,
+      Dictionary<TypeParameter, Type> typeMap) {
+
+      List<FrameExpression> classFrameExps;
+      List<FrameExpression> originalTraitFrameExps;
+      if (isModifies) {
+        classFrameExps = m.Mod != null ? m.Mod.Expressions : new List<FrameExpression>();
+        originalTraitFrameExps = m.OverriddenMethod.Mod?.Expressions;
+      } else {
+        classFrameExps = m.Reads != null ? m.Reads.Expressions : new List<FrameExpression>();
+        originalTraitFrameExps = m.OverriddenMethod.Reads?.Expressions;
+      }
+
+      var traitFrameExps = new List<FrameExpression>();
+      if (originalTraitFrameExps != null) {
+        // Not currently possible for modifies, but is supported for reads
+        if (originalTraitFrameExps.Any(e => e.E is WildcardExpr)) {
+          // Trivially true
+          return;
+        }
+        foreach (var e in originalTraitFrameExps) {
+          var newE = Substitute(e.E, null, substMap, typeMap);
+          var fe = new FrameExpression(e.Origin, newE, e.FieldName);
+          traitFrameExps.Add(fe);
+        }
+      }
+
+
+      var kv = etran.TrAttributes(m.Attributes, null);
+      var tok = m.Origin;
+      var canCalls = traitFrameExps.Concat(classFrameExps)
+        .Select(e => etran.CanCallAssumption(e.E))
+        .Aggregate((Bpl.Expr)Bpl.Expr.True, BplAnd);
+      builder.Add(TrAssumeCmd(tok, canCalls));
+      var oVar = new Boogie.BoundVariable(tok, new Boogie.TypedIdent(tok, "$o", Predef.RefType));
+      var o = new Boogie.IdentifierExpr(tok, oVar);
+      var fVar = new Boogie.BoundVariable(tok, new Boogie.TypedIdent(tok, "$f", Predef.FieldName(tok)));
+      var f = new Boogie.IdentifierExpr(tok, fVar);
+      var ante = BplAnd(Boogie.Expr.Neq(o, Predef.Null), etran.IsAlloced(tok, o));
+
+      // emit: assert (forall o: ref, f: Field :: o != null && $Heap[o,alloc] && (o,f) in subFrame ==> $_Frame[o,f]);
+      var oInCallee = InRWClause(tok, o, f, classFrameExps, etran, null, null);
+      var consequent2 = InRWClause(tok, o, f, traitFrameExps, etran, null, null);
+      var q = new Boogie.ForallExpr(tok, new List<TypeVariable>(), new List<Variable> { oVar, fVar },
+        BplImp(BplAnd(ante, oInCallee), consequent2));
+      var description = new TraitFrame(m.WhatKind, isModifies, classFrameExps, traitFrameExps);
+      builder.Add(Assert(m.Origin, q, description, builder.Context, kv));
+    }
+
+    // Return a way to know if an assertion should be converted to an assumption
+    private void SetAssertionOnlyFilter(Node m) {
+      List<IOrigin> rangesOnly = new List<IOrigin>();
+      m.Visit(node => {
+        if (node is AssertStmt assertStmt &&
+            assertStmt.HasAssertOnlyAttribute(out var assertOnlyKind)) {
+          var ifAfterLastToken = m.EndToken;
+          if (rangesOnly.FindIndex(r => r.Contains(node.StartToken)) is var x && x >= 0) {
+            if (assertOnlyKind == AssertStmt.AssertOnlyKind.Before) {// Just shorten the previous range
+              rangesOnly[x] = new SourceOrigin(rangesOnly[x].StartToken, node.EndToken);
+              return true;
+            }
+
+            ifAfterLastToken = rangesOnly[x].EndToken;
+            rangesOnly.RemoveAt(x);
+          }
+
+          var rangeToAdd =
+            assertOnlyKind == AssertStmt.AssertOnlyKind.Before ?
+              new SourceOrigin(m.StartToken, assertStmt.EndToken) :
+              assertOnlyKind == AssertStmt.AssertOnlyKind.After ?
+              new SourceOrigin(assertStmt.StartToken, ifAfterLastToken)
+              : assertStmt.Origin;
+          if (assertOnlyKind == AssertStmt.AssertOnlyKind.Before && rangesOnly.Any(other => rangeToAdd.Intersects(other))) {
+            // There are more precise ranges so we don't add this one
+            return true;
+          }
+          rangesOnly.Add(rangeToAdd);
+        }
+        return true;
+      });
+      if (rangesOnly.Any()) {
+        // TODO: What to do with refined postconditions?
+        assertionOnlyFilter = token => rangesOnly.Any(range => range.Contains(token));
+      }
+    }
+
+    private void ResetAssertionOnlyFilter() {
+      assertionOnlyFilter = null;
+    }
+
+    /// <summary>
+    /// This method is expected to be called at most once for each parameter combination, and in particular
+    /// at most once for each value of "kind".
+    /// </summary>
+    private Boogie.Procedure AddMethod(Method m, MethodTranslationKind kind) {
+      Contract.Requires(m != null);
+      Contract.Requires(m.EnclosingClass != null);
+      Contract.Requires(Predef != null);
+      Contract.Requires(currentModule == null && codeContext == null && IsAllocContext == null);
+      Contract.Ensures(currentModule == null && codeContext == null && IsAllocContext == null);
+      Contract.Ensures(Contract.Result<Boogie.Procedure>() != null);
+      Contract.Assert(VisibleInScope(m));
+
+      proofDependencies.SetCurrentDefinition(MethodVerboseName(m.FullDafnyName, kind), m);
+      currentModule = m.EnclosingClass.EnclosingModuleDefinition;
+      codeContext = m;
+      IsAllocContext = new IsAllocContext(options, m.IsGhost);
+      Boogie.Expr prevHeap = null;
+      Boogie.Expr currHeap = null;
+      var ordinaryEtran = new ExpressionTranslator(this, Predef, m.Origin, m);
+      ExpressionTranslator etran;
+      var inParams = new List<Boogie.Variable>();
+      var bodyKind = kind == MethodTranslationKind.SpecWellformedness || kind == MethodTranslationKind.Implementation;
+      if (m is TwoStateLemma) {
+        var prevHeapVar = new Boogie.Formal(m.Origin, new Boogie.TypedIdent(m.Origin, "previous$Heap", Predef.HeapType), true);
+        var currHeapVar = new Boogie.Formal(m.Origin, new Boogie.TypedIdent(m.Origin, "current$Heap", Predef.HeapType), true);
+        inParams.Add(prevHeapVar);
+        inParams.Add(currHeapVar);
+        prevHeap = new Boogie.IdentifierExpr(m.Origin, prevHeapVar);
+        currHeap = new Boogie.IdentifierExpr(m.Origin, currHeapVar);
+        etran = new ExpressionTranslator(this, Predef, currHeap, prevHeap, m);
+      } else {
+        etran = ordinaryEtran;
+      }
+
+      GenerateMethodParameters(m.Origin, m, kind, etran, inParams, out var outParams);
+
+
+      var name = MethodName(m, kind);
+      var req = GetRequires();
+      var mod = new List<Bpl.IdentifierExpr> { ordinaryEtran.HeapCastToIdentifierExpr };
+      var ens = GetEnsures();
+      var proc = new Bpl.Procedure(m.Origin, name, new List<Bpl.TypeVariable>(),
+        inParams, outParams.Values.ToList(), false, req, mod, ens, etran.TrAttributes(m.Attributes, null));
+      AddVerboseNameAttribute(proc, m.FullDafnyName, kind);
+
+      if (InsertChecksums) {
+        InsertChecksum(m, proc, true);
+      }
+
+      currentModule = null;
+      codeContext = null;
+      IsAllocContext = null;
+
+      return proc;
+
+      List<Boogie.Requires> GetRequires() {
+        var req = new List<Boogie.Requires>();
+        // FREE PRECONDITIONS
+        if (kind == MethodTranslationKind.SpecWellformedness || kind == MethodTranslationKind.Implementation || kind == MethodTranslationKind.OverrideCheck) {  // the other cases have no need for a free precondition
+          if (m is TwoStateLemma) {
+            // free requires prevHeap == Heap && HeapSucc(prevHeap, currHeap) && IsHeap(currHeap)
+            var a0 = Boogie.Expr.Eq(prevHeap, ordinaryEtran.HeapExpr);
+            var a1 = HeapSucc(prevHeap, currHeap);
+            var a2 = FunctionCall(m.Origin, BuiltinFunction.IsGoodHeap, null, currHeap);
+            req.Add(FreeRequires(m.Origin, BplAnd(a0, BplAnd(a1, a2)), null));
+          }
+
+          foreach (var typeBoundAxiom in TypeBoundAxioms(m.Origin, Concat(m.EnclosingClass.TypeArgs, m.TypeArgs))) {
+            req.Add(Requires(m.Origin, true, null, typeBoundAxiom, null, null, null));
+          }
+        }
+        if (m is TwoStateLemma) {
+          // Checked preconditions that old parameters really existed in previous state
+          var index = 0;
+          foreach (var formal in m.Ins) {
+            if (formal.IsOld) {
+              var dafnyFormalIdExpr = new IdentifierExpr(formal.Origin, formal);
+              var pIdx = m.Ins.Count == 1 ? "" : " at index " + index;
+              var desc = new IsAllocated($"argument{pIdx} for parameter '{formal.Name}'",
+                "in the two-state lemma's previous state" + IsAllocated.HelperFormal(formal),
+                dafnyFormalIdExpr
+              );
+              var require = Requires(formal.Origin, false, null, MkIsAlloc(etran.TrExpr(dafnyFormalIdExpr), formal.Type, prevHeap),
+                desc.FailureDescription, desc.SuccessDescription, null);
+              require.Description = desc;
+              req.Add(require);
+            }
+            index++;
+          }
+        }
+
+        if (kind is MethodTranslationKind.SpecWellformedness or MethodTranslationKind.OverrideCheck) {
+          return req;
+        }
+
+        // USER-DEFINED SPECIFICATIONS
+        var comment = "user-defined preconditions";
+        foreach (var p in ConjunctsOf(m.Req)) {
+          var (errorMessage, successMessage) = CustomErrorMessage(p.Attributes);
+          req.Add(FreeRequires(p.E.Origin, etran.CanCallAssumption(p.E), comment, true));
+          comment = null;
+          if (p.Label != null && kind == MethodTranslationKind.Implementation) {
+            // don't include this precondition here, but record it for later use
+            p.Label.E = (m is TwoStateLemma ? ordinaryEtran : etran.Old).TrExpr(p.E);
+          } else {
+            foreach (var s in TrSplitExprForMethodSpec(new BodyTranslationContext(m.ContainsHide), p.E, etran,
+                       kind)) {
+              if (s.IsOnlyChecked && bodyKind) {
+                // don't include in split
+              } else if (s.IsOnlyFree && !bodyKind) {
+                // don't include in split -- it would be ignored, anyhow
+              } else {
+                req.Add(RequiresWithDependencies(s.Tok, s.IsOnlyFree, p.E, s.E, errorMessage, successMessage, null));
+                // the free here is not linked to the free on the original expression (this is free things generated in the splitting.)
+              }
+            }
+          }
+        }
+
+        // assume can-call conditions for the modifies clause
+        comment = "user-defined frame expressions";
+        foreach (var frameExpression in m.Mod.Expressions) {
+          req.Add(FreeRequires(frameExpression.Origin, etran.CanCallAssumption(frameExpression.E), comment, true));
+          comment = null;
+        }
+
+        return req;
+      }
+
+      List<Bpl.Ensures> GetEnsures() {
+        var ens = new List<Bpl.Ensures>();
+        if (kind is MethodTranslationKind.SpecWellformedness or MethodTranslationKind.OverrideCheck) {
+          return ens;
+        }
+
+        // USER-DEFINED SPECIFICATIONS
+        var comment = "user-defined postconditions";
+        foreach (var p in ConjunctsOf(m.Ens)) {
+          var (errorMessage, successMessage) = CustomErrorMessage(p.Attributes);
+          AddEnsures(ens, FreeEnsures(p.E.Origin, etran.CanCallAssumption(p.E), comment, true));
+          comment = null;
+          foreach (var split in TrSplitExprForMethodSpec(new BodyTranslationContext(m.ContainsHide), p.E, etran, kind)) {
+            var post = split.E;
+            if (kind == MethodTranslationKind.Implementation && split.Tok.IsInherited(currentModule)) {
+              // this postcondition was inherited into this module, so make it into the form "$_reverifyPost ==> s.E"
+              post = BplImp(new Boogie.IdentifierExpr(split.E.tok, "$_reverifyPost", Boogie.Type.Bool), post);
+            }
+            if (split.IsOnlyFree && bodyKind) {
+              // don't include in split -- it would be ignored, anyhow
+            } else if (split.IsOnlyChecked && !bodyKind) {
+              // don't include in split
+            } else {
+              AddEnsures(ens, EnsuresWithDependencies(split.Tok, split.IsOnlyFree || this.assertionOnlyFilter != null, p.E, post, errorMessage, successMessage, null));
+            }
+          }
+        }
+        if (m is Constructor && kind == MethodTranslationKind.Call) {
+          var dafnyFresh = new OldExpr(Token.NoToken,
+            new UnaryOpExpr(Token.NoToken, UnaryOpExpr.Opcode.Not,
+              new UnaryOpExpr(Token.NoToken, UnaryOpExpr.Opcode.Allocated, new IdentifierExpr(Token.NoToken, "this"))));
+          var fresh = Boogie.Expr.Not(etran.Old.IsAlloced(m.Origin, new Boogie.IdentifierExpr(m.Origin, "this", TrReceiverType(m))));
+          AddEnsures(ens, Ensures(m.Origin, false || this.assertionOnlyFilter != null, dafnyFresh, fresh, null, null, "constructor allocates the object"));
+        }
+        foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(m.Origin, m.Mod.Expressions, m.IsGhost, m.AllowsAllocation, ordinaryEtran.Old, ordinaryEtran, ordinaryEtran.Old)) {
+          AddEnsures(ens, Ensures(tri.tok, tri.IsFree || this.assertionOnlyFilter != null, null, tri.Expr, tri.ErrorMessage, tri.SuccessMessage, tri.Comment));
+        }
+
+        // add the fuel assumption for the reveal method of a opaque method
+        if (IsOpaqueRevealLemma(m)) {
+          List<Expression> args = Attributes.FindExpressions(m.Attributes, "revealedFunction");
+          if (args != null) {
+            if (args[0].Resolved is MemberSelectExpr selectExpr) {
+              var f = selectExpr.Member as Function;
+              AddEnsures(ens, FreeEnsures(m.Origin, GetRevealConstant(f), null));
+            }
+          }
+        }
+        return ens;
+      }
+    }
+
+    public static bool ModifiesClauseIsEmpty(Specification<FrameExpression> modifiesClause) {
+      return modifiesClause.Expressions.All(e => e.E is SetDisplayExpr setDisplayExpr && !setDisplayExpr.Elements.Any());
+    }
+
+    private void InsertChecksum(Method m, Boogie.Declaration decl, bool specificationOnly = false) {
+      Contract.Requires(VisibleInScope(m));
+      byte[] data;
+      using (var writer = new System.IO.StringWriter()) {
+        var printer = new Printer(writer, options);
+        printer.PrintAttributes(m.Attributes, false, -1);
+        printer.PrintFormals(m.Ins, m);
+        if (m.Outs.Any()) {
+          writer.Write("returns ");
+          printer.PrintFormals(m.Outs, m);
+        }
+        printer.PrintSpec("", m.Req, 0);
+        printer.PrintFrameSpecLine("", m.Mod, 0);
+        printer.PrintSpec("", m.Ens, 0);
+        printer.PrintDecreasesSpec(m.Decreases, 0);
+        writer.WriteLine();
+        if (!specificationOnly && m.Body != null && RevealedInScope(m)) {
+          printer.PrintStatement(m.Body, 0);
+        }
+        data = Encoding.UTF8.GetBytes(writer.ToString());
+      }
+
+      InsertChecksum(decl, data);
+    }
+
+    internal IEnumerable<Bpl.Expr> TypeBoundAxioms(IOrigin tok, List<TypeParameter> typeParameters) {
+      foreach (var typeParameter in typeParameters.Where(typeParameter => typeParameter.TypeBounds.Any())) {
+        TypeBoundAxiomExpressions(tok, new List<Variable>(), new UserDefinedType(typeParameter), typeParameter.TypeBounds,
+          out var isBoxExpr, out var isAllocBoxExpr);
+        yield return isBoxExpr;
+        yield return isAllocBoxExpr;
+      }
+    }
+
+    public void TypeBoundAxiomExpressions(IOrigin tok, List<Bpl.Variable> bvarsTypeParameters, Type type, List<Type> typeBounds,
+      out Bpl.Expr isBoxExpr, out Bpl.Expr isAllocBoxExpr) {
+      {
+        // (forall bvarsTypeParameters, bx: Box ::
+        //   { $IsBox(bx, typeExpression) }
+        //   $IsBox(bx, typeExpression) ==>
+        //     $IsBox(bx, Bound0) && $IsBox(bx, Bound1) && ...);
+        var vars = new List<Bpl.Variable>();
+        vars.AddRange(bvarsTypeParameters);
+        var bx = BplBoundVar("bx", Predef.BoxType, vars);
+        var isBox = MkIs(bx, TypeToTy(type), true);
+        Bpl.Expr bounds = Bpl.Expr.True;
+        foreach (var typeBound in typeBounds) {
+          bounds = BplAnd(bounds, MkIs(bx, TypeToTy(typeBound), true));
+        }
+
+        var body = BplImp(isBox, bounds);
+        isBoxExpr = new Bpl.ForallExpr(tok, vars, BplTrigger(isBox), body);
+      }
+
+      {
+        // (forall bx: Box, $Heap: Heap ::
+        //   { $IsAllocBox(bx, X, $h) }
+        //   $IsAllocBox(bx, X, $h) && $IsGoodHeap($h) ==>
+        //     $IsAllocBox(bx, Bound0, $h) && $IsAllocBox(bx, Bound1, $h) && ...);
+        var vars = new List<Bpl.Variable>();
+        vars.AddRange(bvarsTypeParameters);
+        var bx = BplBoundVar("bx", Predef.BoxType, vars);
+        var heap = BplBoundVar("$h", Predef.HeapType, vars);
+        var isGoodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, heap);
+        var isAllocBox = MkIsAlloc(bx, TypeToTy(type), heap, true);
+        Bpl.Expr bounds = Bpl.Expr.True;
+        foreach (var typeBound in typeBounds) {
+          bounds = BplAnd(bounds, MkIsAlloc(bx, TypeToTy(typeBound), heap, true));
+        }
+
+        var body = BplImp(BplAnd(isAllocBox, isGoodHeap), bounds);
+        isAllocBoxExpr = new Bpl.ForallExpr(tok, vars, BplTrigger(isAllocBox), body);
+      }
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.Reveal.cs b/Source/DafnyCore/Verifier/BoogieGenerator.Reveal.cs
new file mode 100644
index 00000000000..98551ccda5f
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.Reveal.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using Bpl = Microsoft.Boogie;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+using static Microsoft.Dafny.GenericErrors;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+
+  private static void TranslateRevealStmt(BoogieGenerator boogieGenerator, BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran,
+    HideRevealStmt revealStmt) {
+    AddComment(builder, revealStmt, "hide/reveal statement");
+    foreach (var la in revealStmt.LabeledAsserts) {
+      Contract.Assert(la.E != null);  // this should have been filled in by now
+      builder.Add(new AssumeCmd(revealStmt.Origin, la.E));
+    }
+
+    if (builder.Context.ContainsHide) {
+      if (revealStmt.Wildcard) {
+        builder.Add(new HideRevealCmd(revealStmt.Origin, revealStmt.Mode));
+      } else {
+        foreach (var member in revealStmt.OffsetMembers) {
+          builder.Add(new HideRevealCmd(new Bpl.IdentifierExpr(revealStmt.Origin, member.FullSanitizedName), revealStmt.Mode));
+        }
+      }
+    }
+
+    boogieGenerator.TrStmtList(revealStmt.ResolvedStatements, builder, locals, etran);
+  }
+
+  Expr TrStmtSideEffect(Expr e, Statement stmt, ExpressionTranslator etran) {
+    switch (stmt) {
+      case CallStmt call: {
+          var m = call.Method;
+          if (!IsOpaqueRevealLemma(m)) {
+            return e;
+          }
+
+          var args = Attributes.FindExpressions(m.Attributes, "fuel");
+          if (args == null) {
+            return e;
+          }
+
+          if (args[0].Resolved is not MemberSelectExpr selectExpr) {
+            return e;
+          }
+
+          var f = selectExpr.Member as Function;
+          var fuelConstant = functionFuel.Find(x => x.f == f);
+          if (fuelConstant == null) {
+            return e;
+          }
+
+          var startFuel = fuelConstant.startFuel;
+          var startFuelAssert = fuelConstant.startFuelAssert;
+          var moreFuelExpr = fuelConstant.MoreFuel(sink, Predef, f.IdGenerator);
+          var layer = etran.layerInterCluster.LayerN(1, moreFuelExpr);
+          var layerAssert = etran.layerInterCluster.LayerN(2, moreFuelExpr);
+
+          e = BplAnd(e, Expr.Eq(startFuel, layer));
+          e = BplAnd(e, Expr.Eq(startFuelAssert, layerAssert));
+          e = BplAnd(e, Expr.Eq(FunctionCall(f.Origin, BuiltinFunction.AsFuelBottom, null, moreFuelExpr), moreFuelExpr));
+
+          return e;
+        }
+      case HideRevealStmt reveal: {
+          foreach (var s in reveal.ResolvedStatements) {
+            e = BplAnd(e, TrFunctionSideEffect(s, etran));
+          }
+
+          return e;
+        }
+      default: return e;
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.SplitExpr.cs b/Source/DafnyCore/Verifier/BoogieGenerator.SplitExpr.cs
new file mode 100644
index 00000000000..6832394c143
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.SplitExpr.cs
@@ -0,0 +1,664 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Reflection;
+using System.Security.Cryptography;
+using Bpl = Microsoft.Boogie;
+using BplParser = Microsoft.Boogie.Parser;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using Core;
+using DafnyCore.Verifier;
+using Microsoft.BaseTypes;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Dafny.Triggers;
+using Action = System.Action;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+using static Microsoft.Dafny.GenericErrors;
+
+namespace Microsoft.Dafny {
+  public record BodyTranslationContext(bool ContainsHide, int ScopeDepth = 0, bool ReturnPosition = true, AssertMode AssertMode = AssertMode.Keep);
+
+  public partial class BoogieGenerator {
+    /// <summary>
+    /// Tries to split the expression into tactical conjuncts (if "position") or disjuncts (if "!position").
+    /// If a (necessarily boolean) function call appears as a top-level conjunct, then inline the function
+    /// if its body is available in the current context and its height is less than "heightLimit" (if "heightLimit" is
+    /// passed in as 0, then no functions will be inlined).
+    /// </summary>
+    bool TrSplitExpr(BodyTranslationContext context, Expression expr, List<SplitExprInfo> splits, /*!*/ /*!*/
+      bool position, int heightLimit, bool applyInduction, ExpressionTranslator etran) {
+      Contract.Requires(expr != null);
+      Contract.Requires(expr.Type.IsBoolType || (expr is BoxingCastExpr && ((BoxingCastExpr)expr).E.Type.IsBoolType));
+      Contract.Requires(splits != null);
+      Contract.Requires(etran != null);
+
+      switch (expr) {
+        case BoxingCastExpr castExpr: {
+            var bce = castExpr;
+            var ss = new List<SplitExprInfo>();
+            if (TrSplitExpr(context, bce.E, ss, position, heightLimit, applyInduction, etran)) {
+              foreach (var s in ss) {
+                splits.Add(ToSplitExprInfo(s.Kind, CondApplyBox(s.Tok, s.E, bce.FromType, bce.ToType)));
+              }
+              return true;
+            }
+
+            break;
+          }
+        case ConcreteSyntaxExpression expression: {
+            var e = expression;
+            return TrSplitExpr(context, e.ResolvedExpression, splits, position, heightLimit, applyInduction, etran);
+          }
+        case NestedMatchExpr nestedMatchExpr:
+          return TrSplitExpr(context, nestedMatchExpr.Flattened, splits, position, heightLimit, applyInduction, etran);
+        case LetExpr letExpr: {
+            var e = letExpr;
+            if (!e.Exact) {
+              var d = etran.LetDesugaring(e);
+              return TrSplitExpr(context, d, splits, position, heightLimit, applyInduction, etran);
+            } else {
+              var ss = new List<SplitExprInfo>();
+              if (TrSplitExpr(context, e.Body, ss, position, heightLimit, applyInduction, etran)) {
+                // We don't know where the RHSs of the let are used in the body. In particular, we don't know if a RHS
+                // will end up in a spot where TrSplitExpr would like to increase the Layer offset or not. In fact, different
+                // uses of the same let variable may end up needing different Layer constants. The following code will
+                // always bump the Layer offset in the RHS. This seems likely to be desireable in many cases, because the
+                // LetExpr sits in a position for which TrSplitExpr is invoked.
+                List<Bpl.Variable> lhss;
+                List<Bpl.Expr> rhss;
+                etran.LayerOffset(1).TrLetExprPieces(e, out lhss, out rhss);
+                foreach (var s in ss) {
+                  // as the source location in the following let, use that of the translated "s"
+                  splits.Add(ToSplitExprInfo(s.Kind, new Bpl.LetExpr(s.E.tok, lhss, rhss, null, s.E)));
+                }
+                return true;
+              }
+            }
+
+            break;
+          }
+        case UnchangedExpr unchangedExpr: {
+            var e = unchangedExpr;
+            if (position && e.Frame.Count > 1) {
+              // split into a number of UnchangeExpr's, one for each FrameExpression
+              foreach (var fe in e.Frame) {
+                var tok = new NestedOrigin(GetToken(e), fe.Origin);
+                Expression ee = new UnchangedExpr(tok, new List<FrameExpression> { fe }, e.At) { AtLabel = e.AtLabel };
+                ee.Type = Type.Bool;  // resolve here
+                TrSplitExpr(context, ee, splits, position, heightLimit, applyInduction, etran);
+              }
+              return true;
+            }
+
+            break;
+          }
+        case UnaryOpExpr opExpr: {
+            var e = opExpr;
+            if (e.ResolvedOp == UnaryOpExpr.ResolvedOpcode.BoolNot) {
+              var ss = new List<SplitExprInfo>();
+              if (TrSplitExpr(context, e.E, ss, !position, heightLimit, applyInduction, etran)) {
+                foreach (var s in ss) {
+                  splits.Add(ToSplitExprInfo(s.Kind, Bpl.Expr.Unary(s.E.tok, UnaryOperator.Opcode.Not, s.E)));
+                }
+                return true;
+              }
+            }
+
+            break;
+          }
+        case BinaryExpr binaryExpr: {
+            var bin = binaryExpr;
+            if (position && bin.ResolvedOp == BinaryExpr.ResolvedOpcode.And) {
+              TrSplitExpr(context, bin.E0, splits, position, heightLimit, applyInduction, etran);
+              TrSplitExpr(context, bin.E1, splits, position, heightLimit, applyInduction, etran);
+              return true;
+
+            } else if (!position && bin.ResolvedOp == BinaryExpr.ResolvedOpcode.Or) {
+              TrSplitExpr(context, bin.E0, splits, position, heightLimit, applyInduction, etran);
+              TrSplitExpr(context, bin.E1, splits, position, heightLimit, applyInduction, etran);
+              return true;
+
+            } else if (bin.ResolvedOp == BinaryExpr.ResolvedOpcode.Imp) {
+              // non-conditionally split these, so we get the source location to point to a subexpression
+              if (position) {
+                var lhs = etran.TrExpr(bin.E0);
+                var ss = new List<SplitExprInfo>();
+                TrSplitExpr(context, bin.E1, ss, position, heightLimit, applyInduction, etran);
+                foreach (var s in ss) {
+                  // as the source location in the following implication, use that of the translated "s"
+                  splits.Add(ToSplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, BinaryOperator.Opcode.Imp, lhs, s.E)));
+                }
+              } else {
+                var ss = new List<SplitExprInfo>();
+                TrSplitExpr(context, bin.E0, ss, !position, heightLimit, applyInduction, etran);
+                var rhs = etran.TrExpr(bin.E1);
+                foreach (var s in ss) {
+                  // as the source location in the following implication, use that of the translated "s"
+                  splits.Add(ToSplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, BinaryOperator.Opcode.Imp, s.E, rhs)));
+                }
+              }
+              return true;
+            }
+
+            break;
+          }
+        case TernaryExpr ternaryExpr: {
+            var e = ternaryExpr;
+            if ((e.Op == TernaryExpr.Opcode.PrefixEqOp && position) || (e.Op == TernaryExpr.Opcode.PrefixNeqOp && !position)) {
+              var e1type = e.E1.Type.NormalizeExpand();
+              var e2type = e.E2.Type.NormalizeExpand();
+              var codecl = e1type.AsCoDatatype;
+              Contract.Assert(codecl != null);
+              var k = etran.TrExpr(e.E0);
+              var A = etran.TrExpr(e.E1);
+              var B = etran.TrExpr(e.E2);
+              // split as shown here for possibly infinite lists:
+              //   checked $PrefixEqual#Dt(k, A, B) || (k_has_successor ==> A.Nil? ==> B.Nil?)
+              //   checked $PrefixEqual#Dt(k, A, B) || (k_has_successor ==> A.Cons? ==> B.Cons? && A.head == B.head && $PrefixEqual#2#Dt(k - 1, A.tail, B.tail))  // note the #2 in the recursive call, just like for user-defined predicates that are inlined by TrSplitExpr
+              //   checked $PrefixEqual#Dt(k, A, B) || (k != 0 && k.IsLimit ==> $Equal#Dt(A, B))  // (*)
+              //   free $PrefixEqual#Dt(k, A, B);
+              // Note:  First off, (*) is used only when ORDINAL is involved. Moreover, if there's an error among the first checked
+              // conditions, it seems confusing to get yet another error message.  Therefore, we add a middle disjunct to (*), namely
+              // the conjunction of all the previous RHSs.
+              var kAsORD = !e.E0.Type.IsBigOrdinalType ? FunctionCall(k.tok, "ORD#FromNat", Bpl.Type.Int, k) : k;
+              var prefixEqK = CoEqualCall(codecl, e1type.TypeArgs, e2type.TypeArgs, kAsORD, etran.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH), A, B); // FunctionCall(expr.Tok, CoPrefixName(codecl, 1), Bpl.Type.Bool, k, A, B);
+              Bpl.Expr kHasSuccessor, kMinusOne;
+              if (e.E0.Type.IsBigOrdinalType) {
+                kHasSuccessor = Bpl.Expr.Lt(Bpl.Expr.Literal(0), FunctionCall(k.tok, "ORD#Offset", Bpl.Type.Int, k));
+                kMinusOne = FunctionCall(k.tok, "ORD#Minus", Predef.BigOrdinalType, k, FunctionCall(k.tok, "ORD#FromNat", Bpl.Type.Int, Bpl.Expr.Literal(1)));
+              } else {
+                kHasSuccessor = Bpl.Expr.Lt(Bpl.Expr.Literal(0), k);
+                kMinusOne = Bpl.Expr.Sub(k, Bpl.Expr.Literal(1));
+                kMinusOne = FunctionCall(k.tok, "ORD#FromNat", Bpl.Type.Int, kMinusOne);
+              }
+              // for the inlining of the definition of prefix equality, translate the two main equality operands arguments with a higher offset (to obtain #2 functions)
+              var etran2 = etran.LayerOffset(1);
+              var A2 = etran2.TrExpr(e.E1);
+              var B2 = etran2.TrExpr(e.E2);
+              var needsTokenAdjust = TrSplitNeedsTokenAdjustment(ternaryExpr);
+              var tok = needsTokenAdjust ? new ForceCheckOrigin(ternaryExpr.Origin) : ternaryExpr.Origin;
+              Bpl.Expr layer = etran.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH);
+              Bpl.Expr eqComponents = Bpl.Expr.True;
+              foreach (var c in CoPrefixEquality(tok, codecl, e1type.TypeArgs, e2type.TypeArgs, kMinusOne, layer, A2, B2, true)) {
+                eqComponents = BplAnd(eqComponents, c);
+                var p = Bpl.Expr.Binary(c.tok, BinaryOperator.Opcode.Or, prefixEqK, BplImp(kHasSuccessor, c));
+                splits.Add(ToSplitExprInfo(SplitExprInfo.K.Checked, p));
+              }
+              if (e.E0.Type.IsBigOrdinalType) {
+                var kIsNonZeroLimit = BplAnd(
+                  Bpl.Expr.Neq(k, FunctionCall(k.tok, "ORD#FromNat", Predef.BigOrdinalType, Bpl.Expr.Literal(0))),
+                  FunctionCall(k.tok, "ORD#IsLimit", Bpl.Type.Bool, k));
+                var eq = CoEqualCall(codecl, e1type.TypeArgs, e2type.TypeArgs, null, etran.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH), A, B);
+                var p = Bpl.Expr.Binary(tok, BinaryOperator.Opcode.Or, prefixEqK, BplOr(BplImp(kHasSuccessor, eqComponents), BplImp(kIsNonZeroLimit, eq)));
+                splits.Add(ToSplitExprInfo(SplitExprInfo.K.Checked, p));
+              }
+              splits.Add(ToSplitExprInfo(SplitExprInfo.K.Free, prefixEqK));
+              return true;
+            }
+
+            break;
+          }
+        case ITEExpr iteExpr: {
+            var ite = iteExpr;
+
+            var ssThen = new List<SplitExprInfo>();
+            var ssElse = new List<SplitExprInfo>();
+
+            TrSplitExpr(context, ite.Thn, ssThen, position, heightLimit, applyInduction, etran);
+            TrSplitExpr(context, ite.Els, ssElse, position, heightLimit, applyInduction, etran);
+
+            var op = position ? BinaryOperator.Opcode.Imp : BinaryOperator.Opcode.And;
+            var test = etran.TrExpr(ite.Test);
+            foreach (var s in ssThen) {
+              // as the source location in the following implication, use that of the translated "s"
+              splits.Add(ToSplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, op, test, s.E)));
+            }
+
+            var negatedTest = Bpl.Expr.Not(test);
+            foreach (var s in ssElse) {
+              // as the source location in the following implication, use that of the translated "s"
+              splits.Add(ToSplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, op, negatedTest, s.E)));
+            }
+
+            return true;
+          }
+        case MatchExpr matchExpr: {
+            var e = matchExpr;
+            var ite = etran.DesugarMatchExpr(e);
+            return TrSplitExpr(context, ite, splits, position, heightLimit, applyInduction, etran);
+          }
+        case StmtExpr stmtExpr: {
+            var e = stmtExpr;
+            // For an expression S;E in split position, the conclusion of S can be used as an assumption.  Unfortunately,
+            // this assumption is not generated in non-split positions (because I don't know how.)
+            // So, treat "S; E" like "SConclusion ==> E".
+            if (position) {
+              var conclusion = etran.TrExpr(e.GetStatementConclusion());
+              var ss = new List<SplitExprInfo>();
+              TrSplitExpr(context, e.E, ss, position, heightLimit, applyInduction, etran);
+              foreach (var s in ss) {
+                // as the source location in the following implication, use that of the translated "s"
+                splits.Add(ToSplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, BinaryOperator.Opcode.Imp, conclusion, s.E)));
+              }
+            } else {
+              var ss = new List<SplitExprInfo>();
+              TrSplitExpr(context, e.GetStatementConclusion(), ss, !position, heightLimit, applyInduction, etran);
+              var rhs = etran.TrExpr(e.E);
+              foreach (var s in ss) {
+                // as the source location in the following implication, use that of the translated "s"
+                splits.Add(ToSplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, BinaryOperator.Opcode.Imp, s.E, rhs)));
+              }
+            }
+            return true;
+          }
+        case OldExpr oldExpr: {
+            var e = oldExpr;
+            return TrSplitExpr(context, e.E, splits, position, heightLimit, applyInduction, etran.OldAt(e.AtLabel));
+          }
+        case FunctionCallExpr callExpr when position: {
+            var fexp = callExpr;
+            if (TrSplitFunctionCallExpr(context, callExpr, splits, heightLimit, applyInduction, etran, fexp)) {
+              return true;
+            }
+
+            break;
+          }
+        case QuantifierExpr quantifierExpr when quantifierExpr.SplitQuantifier != null:
+          return TrSplitExpr(context, quantifierExpr.SplitQuantifierExpression, splits, position, heightLimit, applyInduction, etran);
+        default: {
+            if (((position && expr is ForallExpr) || (!position && expr is ExistsExpr))) {
+              var e = (QuantifierExpr)expr;
+              var inductionVariables = ApplyInduction(e.BoundVars, e.Attributes);
+              if (applyInduction && inductionVariables.Count != 0) {
+                // From the given quantifier (forall n :: P(n)), generate the seemingly weaker proof obligation
+                //   (forall n :: (forall k :: k < n ==> P(k)) ==> P(n))
+                // For an existential (exists n :: P(n)), it is
+                //   (exists n :: (forall k :: k < n ==> !P(k)) && P(n))
+                //    ^^^^^^                             ^      ^^        <--- note these 3 differences
+                var kvars = new List<BoundVar>();
+                var kk = new List<Bpl.Expr>();
+                var nn = new List<Bpl.Expr>();
+                var kkDafny = new List<Expression>();
+                var nnDafny = new List<Expression>();
+                var toks = new List<IOrigin>();
+                var substMap = new Dictionary<IVariable, Expression>();
+                foreach (var n in inductionVariables) {
+                  toks.Add(n.Origin);
+                  BoundVar k = new BoundVar(n.Origin, CurrentIdGenerator.FreshId(n.Name + "$ih#"), n.Type);
+                  kvars.Add(k);
+
+                  IdentifierExpr ieK = new IdentifierExpr(k.Origin, k.AssignUniqueName(CurrentDeclaration.IdGenerator));
+                  ieK.Var = k; ieK.Type = ieK.Var.Type;  // resolve it here
+                  kkDafny.Add(ieK);
+                  kk.Add(etran.TrExpr(ieK));
+
+                  IdentifierExpr ieN = new IdentifierExpr(n.Origin, n.AssignUniqueName(CurrentDeclaration.IdGenerator));
+                  ieN.Var = n; ieN.Type = ieN.Var.Type;  // resolve it here
+                  nnDafny.Add(ieN);
+                  nn.Add(etran.TrExpr(ieN));
+
+                  substMap.Add(n, ieK);
+                }
+                Expression bodyK = Substitute(e.LogicalBody(), null, substMap);
+                Bpl.Expr less = DecreasesCheck(toks, null, kkDafny, nnDafny, kk, nn,
+                  null, null, false, true);
+
+                Bpl.Expr ihBody = etran.TrExpr(bodyK);
+                if (!position) {
+                  ihBody = Bpl.Expr.Not(ihBody);
+                }
+                ihBody = BplAnd(etran.CanCallAssumption(bodyK), ihBody);
+                ihBody = BplImp(less, ihBody);
+                List<Variable> bvars = new List<Variable>();
+                Bpl.Expr typeAntecedent = etran.TrBoundVariables(kvars, bvars);  // no need to use allocation antecedent here, because the well-founded less-than ordering assures kk are allocated
+                Bpl.Expr ih;
+                var tr = TrTrigger(etran, e.Attributes, expr.Origin, substMap);
+                ih = new Bpl.ForallExpr(expr.Origin, bvars, tr, BplImp(typeAntecedent, ihBody));
+
+                // More precisely now:
+                //   (forall n :: n-has-expected-type && (forall k :: k < n ==> P(k)) && case0(n)   ==> P(n))
+                //   (forall n :: n-has-expected-type && (forall k :: k < n ==> P(k)) && case...(n) ==> P(n))
+                // or similar for existentials.
+                var caseProduct = new List<Bpl.Expr>() {
+                // make sure to include the correct token information (so, don't just use Bpl.Expr.True here)
+                new Bpl.LiteralExpr(TrSplitNeedsTokenAdjustment(expr) ? new ForceCheckOrigin(expr.Origin) : expr.Origin, true)
+              };
+                var i = 0;
+                foreach (var n in inductionVariables) {
+                  var newCases = new List<Bpl.Expr>();
+                  foreach (var kase in InductionCases(n.Type, nn[i], etran)) {
+                    foreach (var cs in caseProduct) {
+                      if (kase != Bpl.Expr.True) {  // if there's no case, don't add anything to the token
+                        newCases.Add(Bpl.Expr.Binary(new NestedOrigin(ToDafnyToken(flags.ReportRanges, cs.tok), ToDafnyToken(flags.ReportRanges, kase.tok)), Bpl.BinaryOperator.Opcode.And, cs, kase));
+                      } else {
+                        newCases.Add(cs);
+                      }
+                    }
+                  }
+                  caseProduct = newCases;
+                  i++;
+                }
+                List<bool> freeOfAlloc = BoundedPool.HasBounds(e.Bounds, BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
+                bvars = new List<Variable>();
+                typeAntecedent = etran.TrBoundVariables(e.BoundVars, bvars, false, freeOfAlloc);
+                foreach (var kase in caseProduct) {
+                  var ante = BplAnd(BplAnd(typeAntecedent, ih), kase);
+                  var etranBody = etran.LayerOffset(1);
+                  var bdy = etranBody.TrExpr(e.LogicalBody());
+                  Bpl.Expr q;
+                  var trig = TrTrigger(etranBody, e.Attributes, expr.Origin);
+                  if (position) {
+                    q = new Bpl.ForallExpr(kase.tok, bvars, trig, BplImp(ante, bdy));
+                  } else {
+                    q = new Bpl.ExistsExpr(kase.tok, bvars, trig, BplAnd(ante, bdy));
+                  }
+                  splits.Add(ToSplitExprInfo(SplitExprInfo.K.Checked, q));
+                }
+
+                // Finally, assume the original quantifier (forall/exists n :: P(n))
+                splits.Add(ToSplitExprInfo(SplitExprInfo.K.Free, etran.TrExpr(expr)));
+                return true;
+              } else {
+                // Don't use induction on these quantifiers.
+                // Nevertheless, produce two translated versions of the quantifier, one that uses #2 functions (that is, layerOffset 1)
+                // for checking and one that uses #1 functions (that is, layerOffset 0) for assuming.
+                var etranBoost = etran.LayerOffset(1);
+                var r = etranBoost.TrExpr(expr);
+                var needsTokenAdjustment = TrSplitNeedsTokenAdjustment(expr);
+                if (needsTokenAdjustment) {
+                  r.tok = new ForceCheckOrigin(expr.Origin);
+                }
+                if (etranBoost.Statistics_CustomLayerFunctionCount == 0) {
+                  // apparently, the LayerOffset(1) we did had no effect
+                  splits.Add(ToSplitExprInfo(SplitExprInfo.K.Both, r));
+                  return needsTokenAdjustment;
+                } else {
+                  splits.Add(ToSplitExprInfo(SplitExprInfo.K.Checked, r));  // check the boosted expression
+                  splits.Add(ToSplitExprInfo(SplitExprInfo.K.Free, etran.TrExpr(expr)));  // assume the ordinary expression
+                  return true;
+                }
+              }
+            } else if (((position && expr is ExistsExpr) || (!position && expr is ForallExpr))) {
+              // produce two translated versions of the quantifier, one that uses #1 functions (that is, layerOffset 0)
+              // for checking and one that uses #2 functions (that is, layerOffset 1) for assuming.
+              adjustFuelForExists = false; // based on the above comment, we use the etran with correct fuel amount already. No need to adjust anymore.
+              var etranBoost = etran.LayerOffset(1);
+              var r = etran.TrExpr(expr);
+              var needsTokenAdjustment = TrSplitNeedsTokenAdjustment(expr);
+              if (needsTokenAdjustment) {
+                r.tok = new ForceCheckOrigin(expr.Origin);
+              }
+              if (etran.Statistics_CustomLayerFunctionCount == 0) {
+                // apparently, doesn't use layer
+                splits.Add(ToSplitExprInfo(SplitExprInfo.K.Both, r));
+                return needsTokenAdjustment;
+              } else {
+                splits.Add(ToSplitExprInfo(SplitExprInfo.K.Checked, r));  // check the ordinary expression
+                splits.Add(ToSplitExprInfo(SplitExprInfo.K.Free, etranBoost.TrExpr(expr)));  // assume the boosted expression
+                return true;
+              }
+            }
+
+            break;
+          }
+      }
+
+      Bpl.Expr translatedExpression;
+      bool splitHappened;
+      if ((position && expr is ExistsExpr) || (!position && expr is ForallExpr)) {
+        translatedExpression = etran.TrExpr(expr);
+        splitHappened = false;
+      } else {
+        etran = etran.LayerOffset(1);
+        translatedExpression = etran.TrExpr(expr);
+        splitHappened = etran.Statistics_CustomLayerFunctionCount != 0;  // return true if the LayerOffset(1) came into play
+      }
+      if (TrSplitNeedsTokenAdjustment(expr)) {
+        translatedExpression.tok = new ForceCheckOrigin(expr.Origin);
+        splitHappened = true;
+      }
+      splits.Add(ToSplitExprInfo(SplitExprInfo.K.Both, translatedExpression));
+      return splitHappened;
+    }
+
+
+    IEnumerable<Bpl.Expr> InductionCases(Type ty, Bpl.Expr expr, ExpressionTranslator etran) {
+      ty = ty.NormalizeExpand();
+      IndDatatypeDecl dt = ty.AsIndDatatype;
+      if (dt == null) {
+        yield return Bpl.Expr.True;
+      } else {
+        UserDefinedType instantiatedType = (UserDefinedType)ty;  // correctness of cast follows from the non-null return of ty.AsDatatype
+        var subst = new Dictionary<TypeParameter, Type>();
+        for (int i = 0; i < dt.TypeArgs.Count; i++) {
+          subst.Add(dt.TypeArgs[i], instantiatedType.TypeArgs[i]);
+        }
+
+        foreach (DatatypeCtor ctor in dt.Ctors) {
+          List<Variable> bvs;
+          List<Bpl.Expr> args;
+          CreateBoundVariables(ctor.Formals, out bvs, out args);
+          Bpl.Expr ct = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+          // (exists args :: args-have-the-expected-types && ct(args) == expr)
+          Bpl.Expr q = Bpl.Expr.Binary(ctor.Origin, BinaryOperator.Opcode.Eq, ct, expr);
+          if (bvs.Count != 0) {
+            int i = 0;
+            Bpl.Expr typeAntecedent = Bpl.Expr.True;
+            foreach (Formal arg in ctor.Formals) {
+              var instantiatedArgType = arg.Type.Subst(subst);
+              Bpl.Expr wh = GetWhereClause(arg.Origin, CondApplyUnbox(arg.Origin, args[i], arg.Type, instantiatedArgType), instantiatedArgType, etran, NOALLOC);
+              if (wh != null) {
+                typeAntecedent = BplAnd(typeAntecedent, wh);
+              }
+              i++;
+            }
+            var trigger = BplTrigger(ct);  // this is probably never used, because this quantifier is not expected ever to appear in a context where it needs to be instantiated
+            q = new Bpl.ExistsExpr(ctor.Origin, bvs, trigger, BplAnd(typeAntecedent, q));
+          }
+          yield return q;
+        }
+      }
+    }
+
+    private bool TrSplitFunctionCallExpr(BodyTranslationContext context,
+      Expression expr, List<SplitExprInfo> splits, int heightLimit,
+      bool applyInduction, ExpressionTranslator etran, FunctionCallExpr fexp) {
+      var f = fexp.Function;
+      Contract.Assert(f != null); // filled in during resolution
+      var module = f.EnclosingClass.EnclosingModuleDefinition;
+      var functionHeight = module.CallGraph.GetSCCRepresentativePredecessorCount(f);
+
+      if (functionHeight < heightLimit && f.Body != null && RevealedInScope(f)) {
+        if (fexp.Origin.IsInherited(currentModule) &&
+            f is Predicate && ((Predicate)f).BodyOrigin == Predicate.BodyOriginKind.DelayedDefinition &&
+            (codeContext == null || !codeContext.MustReverify)) {
+          // The function was inherited as body-less but is now given a body. Don't inline the body (since, apparently, everything
+          // that needed to be proved about the function was proved already in the previous module, even without the body definition).
+        } else if (!FunctionBodyIsAvailable(f, currentModule, currentScope)) {
+          // Don't inline opaque functions
+        } else if (context.ContainsHide) {
+          // Do not inline in a blind context
+        } else if (Attributes.Contains(f.Attributes, "no_inline")) {
+          // User manually prevented inlining
+        } else {
+          // Produce, for a "body" split into b0, b1, b2:
+          //     checked F#canCall(args) ==> F(args) || b0
+          //     checked F#canCall(args) ==> F(args) || b1
+          //     checked F#canCall(args) ==> F(args) || b2
+          //     free F#canCall(args) && F(args) && (b0 && b1 && b2)
+          // For "inCoContext", split into:
+          //     checked F#canCall(args) ==> F'(args) || b0''
+          //     checked F#canCall(args) ==> F'(args) || b1''
+          //     checked F#canCall(args) ==> F'(args) || b2''
+          //     free F#canCall(args) && F'(args)
+          // where the primes indicate certificate translations.
+          // The checked conjuncts of the body make use of the type-specialized body.
+
+          // F#canCall(args)
+          Bpl.IdentifierExpr canCallFuncID = new Bpl.IdentifierExpr(expr.Origin, f.FullSanitizedName + "#canCall", Bpl.Type.Bool);
+          List<Bpl.Expr> args = etran.FunctionInvocationArguments(fexp, null, null);
+          Bpl.Expr canCall = new Bpl.NAryExpr(GetToken(expr), new Bpl.FunctionCall(canCallFuncID), args);
+
+          Bpl.Expr fargs;
+          // F(args)
+          fargs = etran.TrExpr(fexp);
+
+          if (!CanSafelyInline(fexp, f)) {
+            // Skip inlining, as it would cause arbitrary expressions to pop up in the trigger
+            // TODO this should appear at the outmost call site, not at the innermost. See SnapshotableTrees.dfy
+            reporter.Info(MessageSource.Translator, fexp.Origin, "Some instances of this call are not inlined.");
+            // F#canCall(args) ==> F(args)
+            var p = Bpl.Expr.Binary(fargs.tok, BinaryOperator.Opcode.Imp, canCall, fargs);
+            splits.Add(ToSplitExprInfo(SplitExprInfo.K.Checked, p));
+            // F#canCall(args) && F(args)
+            var fr = BplAnd(canCall, fargs);
+            splits.Add(ToSplitExprInfo(SplitExprInfo.K.Free, fr));
+          } else {
+            // inline this body
+            var typeSpecializedBody = GetSubstitutedBody(fexp, f);
+            var typeSpecializedResultType = f.ResultType.Subst(fexp.GetTypeArgumentSubstitutions());
+
+            // recurse on body
+            var ss = new List<SplitExprInfo>();
+            TrSplitExpr(context, typeSpecializedBody, ss, true, functionHeight, applyInduction, etran);
+            var needsTokenAdjust = TrSplitNeedsTokenAdjustment(typeSpecializedBody);
+            foreach (var s in ss) {
+              if (s.IsChecked) {
+                var unboxedConjunct = CondApplyUnbox(s.E.tok, s.E, typeSpecializedResultType, expr.Type);
+                var bodyOrConjunct = BplOr(fargs, unboxedConjunct);
+                var tok = needsTokenAdjust
+                  ? (IOrigin)new ForceCheckOrigin(typeSpecializedBody.Origin)
+                  : (IOrigin)new NestedOrigin(GetToken(fexp), s.Tok);
+                var p = Bpl.Expr.Binary(tok, BinaryOperator.Opcode.Imp, canCall, bodyOrConjunct);
+                splits.Add(ToSplitExprInfo(SplitExprInfo.K.Checked, p));
+              }
+            }
+
+            // allocatedness for arguments to the inlined call in body
+            if (typeSpecializedBody is FunctionCallExpr) {
+              FunctionCallExpr e = (FunctionCallExpr)typeSpecializedBody;
+              for (int i = 0; i < e.Args.Count; i++) {
+                Expression ee = e.Args[i];
+                Type t = e.Function.Ins[i].Type;
+                Expr tr_ee = etran.TrExpr(ee);
+                Bpl.Expr wh = GetWhereClause(e.Origin, tr_ee, cce.NonNull(ee.Type), etran, NOALLOC);
+                if (wh != null) {
+                  fargs = BplAnd(fargs, wh);
+                }
+              }
+            }
+
+            // body
+            var trBody = etran.TrExpr(typeSpecializedBody);
+            trBody = CondApplyUnbox(trBody.tok, trBody, typeSpecializedResultType, expr.Type);
+            // F#canCall(args) && F(args) && (b0 && b1 && b2)
+            var fr = BplAnd(canCall, BplAnd(fargs, trBody));
+            splits.Add(ToSplitExprInfo(SplitExprInfo.K.Free, fr));
+          }
+
+          return true;
+        }
+      }
+      return false;
+    }
+
+
+    private bool CanSafelyInline(FunctionCallExpr fexp, Function f) {
+      var visitor = new TriggersExplorer();
+      if (f.Body != null) {
+        var body = f.Body;
+        if (f is PrefixPredicate pp) {
+          body = PrefixSubstitution(pp, body);
+        }
+        visitor.Visit(body);
+      }
+      return
+        !triggersCollector.IsTriggerKiller(fexp.Receiver) &&
+        Enumerable.Zip(f.Ins, fexp.Args).All(formal_concrete => CanSafelySubstitute(visitor.TriggerVariables, formal_concrete.Item1, formal_concrete.Item2));
+    }
+
+
+    // Using an empty set of old expressions is ok here; the only uses of the triggersCollector will be to check for trigger killers.
+    Triggers.TriggersCollector triggersCollector;
+
+    private bool CanSafelySubstitute(ISet<IVariable> protectedVariables, IVariable variable, Expression substitution) {
+      return !(protectedVariables.Contains(variable) && triggersCollector.IsTriggerKiller(substitution));
+    }
+
+    private class TriggersExplorer : BottomUpVisitor {
+      private readonly VariablesCollector collector;
+
+      internal ISet<IVariable> TriggerVariables => collector.variables;
+
+      internal TriggersExplorer() {
+        collector = new VariablesCollector();
+      }
+
+      protected override void VisitOneExpr(Expression expr) {
+        if (expr is QuantifierExpr quantifierExpr && quantifierExpr.SplitQuantifier == null) {
+          foreach (var trigger in quantifierExpr.Attributes.AsEnumerable().Where(a => a.Name == "trigger").SelectMany(a => a.Args)) {
+            collector.Visit(trigger);
+          }
+        }
+      }
+    }
+
+    private Expression GetSubstitutedBody(FunctionCallExpr fexp, Function f) {
+      Contract.Requires(fexp != null);
+      Contract.Requires(f != null);
+      var substMap = new Dictionary<IVariable, Expression>();
+      Contract.Assert(fexp.Args.Count == f.Ins.Count);
+      for (int i = 0; i < f.Ins.Count; i++) {
+        Formal p = f.Ins[i];
+        var formalType = p.Type.Subst(fexp.GetTypeArgumentSubstitutions());
+        Expression arg = fexp.Args[i];
+        arg = new BoxingCastExpr(arg, cce.NonNull(arg.Type), formalType);
+        arg.Type = formalType;  // resolve here
+        substMap.Add(p, arg);
+      }
+      var body = f.Body;
+      if (f is PrefixPredicate) {
+        var pp = (PrefixPredicate)f;
+        body = PrefixSubstitution(pp, body);
+      }
+      body = Substitute(body, fexp.Receiver, substMap, fexp.GetTypeArgumentSubstitutions(), fexp.AtLabel);
+      return body;
+    }
+
+
+    SplitExprInfo ToSplitExprInfo(SplitExprInfo.K kind, Expr e) {
+      return new SplitExprInfo(flags.ReportRanges, kind, e);
+    }
+
+    public class SplitExprInfo {
+      public enum K { Free, Checked, Both }
+      public K Kind;
+      public bool IsOnlyFree { get { return Kind == K.Free; } }
+      public bool IsOnlyChecked { get { return Kind == K.Checked; } }
+      public bool IsChecked { get { return Kind != K.Free; } }
+      public readonly Expr E;
+      public IOrigin Tok;
+      public SplitExprInfo(bool reportRanges, K kind, Expr e) {
+        Contract.Requires(e != null && e.tok != null);
+        // TODO:  Contract.Requires(kind == K.Free || e.Tok.IsValid);
+        Kind = kind;
+        E = e;
+        Tok = ToDafnyToken(reportRanges, e.tok);
+      }
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.Types.cs b/Source/DafnyCore/Verifier/BoogieGenerator.Types.cs
new file mode 100644
index 00000000000..4cd424bf9f7
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.Types.cs
@@ -0,0 +1,1636 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Reflection;
+using System.Security.Cryptography;
+using Bpl = Microsoft.Boogie;
+using BplParser = Microsoft.Boogie.Parser;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using Core;
+using DafnyCore.Verifier;
+using Microsoft.BaseTypes;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Dafny.Triggers;
+using Action = System.Action;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+using static Microsoft.Dafny.GenericErrors;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+
+
+  private void AddArrowTypeAxioms(ArrowTypeDecl ad) {
+    Contract.Requires(ad != null);
+    var arity = ad.Arity;
+    var tok = ad.Origin;
+
+    // [Heap, Box, ..., Box]
+    var map_args = Cons(Predef.HeapType, Map(Enumerable.Range(0, arity), i => Predef.BoxType));
+    // [Heap, Box, ..., Box] Box
+    var apply_ty = new Bpl.MapType(tok, new List<Bpl.TypeVariable>(), map_args, Predef.BoxType);
+    // [Heap, Box, ..., Box] Bool
+    var requires_ty = new Bpl.MapType(tok, new List<Bpl.TypeVariable>(), map_args, Bpl.Type.Bool);
+    // Set Box
+    var objset_ty = TrType(program.SystemModuleManager.ObjectSetType());
+    // [Heap, Box, ..., Box] (Set Box)
+    var reads_ty = new Bpl.MapType(tok, new List<Bpl.TypeVariable>(), map_args, objset_ty);
+
+    {
+      // function HandleN([Heap, Box, ..., Box] Box, [Heap, Box, ..., Box] Bool) : HandleType
+      var res = BplFormalVar(null, Predef.HandleType, true);
+      var arg = new List<Bpl.Variable> {
+          BplFormalVar(null, apply_ty, true),
+          BplFormalVar(null, requires_ty, true),
+          BplFormalVar(null, reads_ty, true)
+        };
+      var declaration = new Bpl.Function(Token.NoToken, Handle(arity), arg, res);
+      sink.AddTopLevelDeclaration(declaration);
+    }
+
+    Action<Function, string, Bpl.Type> SelectorFunction = (dafnyFunction, name, t) => {
+      var args = new List<Bpl.Variable>();
+      MapM(Enumerable.Range(0, arity + 1), i => args.Add(BplFormalVar(null, Predef.Ty, true)));
+      args.Add(BplFormalVar(null, Predef.HeapType, true));
+      args.Add(BplFormalVar(null, Predef.HandleType, true));
+      MapM(Enumerable.Range(0, arity), i => args.Add(BplFormalVar(null, Predef.BoxType, true)));
+      var boogieFunction = new Bpl.Function(Token.NoToken, name, args, BplFormalVar(null, t, false));
+      if (dafnyFunction != null) {
+        declarationMapping[dafnyFunction] = boogieFunction;
+      }
+      sink.AddTopLevelDeclaration(boogieFunction);
+    };
+
+    // function ApplyN(Ty, ... Ty, HandleType, Heap, Box, ..., Box) : Box
+    if (arity != 1) {  // Apply1 is already declared in DafnyPrelude.bpl
+      SelectorFunction(null, Apply(arity), Predef.BoxType);
+    }
+    // function RequiresN(Ty, ... Ty, HandleType, Heap, Box, ..., Box) : Bool
+    SelectorFunction(ad.Requires, Requires(arity), Bpl.Type.Bool);
+    // function ReadsN(Ty, ... Ty, HandleType, Heap, Box, ..., Box) : Set Box
+    SelectorFunction(ad.Reads, Reads(arity), objset_ty);
+
+    {
+      // forall t1, .., tN+1 : Ty, p: [Heap, Box, ..., Box] Box, heap : Heap, b1, ..., bN : Box
+      //      :: ApplyN(t1, .. tN+1, heap, HandleN(h, r, rd), b1, ..., bN) == h[heap, b1, ..., bN]
+      //      :: RequiresN(t1, .. tN+1, heap, HandleN(h, r, rd), b1, ..., bN) <== r[heap, b1, ..., bN]
+      //      :: ReadsN(t1, .. tN+1, heap, HandleN(h, r, rd), b1, ..., bN) == rd[heap, b1, ..., bN]
+      Action<string, Bpl.Type, string, Bpl.Type, string, Bpl.Type> SelectorSemantics = (selector, selectorTy, selectorVar, selectorVarTy, precond, precondTy) => {
+        Contract.Assert((precond == null) == (precondTy == null));
+        var bvars = new List<Bpl.Variable>();
+
+        var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, Predef.Ty, bvars));
+
+        var heap = BplBoundVar("heap", Predef.HeapType, bvars);
+
+        var handleargs = new List<Bpl.Expr> {
+            BplBoundVar("h", apply_ty, bvars),
+            BplBoundVar("r", requires_ty, bvars),
+            BplBoundVar("rd", reads_ty, bvars)
+          };
+
+        var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, Predef.BoxType, bvars));
+
+        var lhsargs = Concat(types, Cons(heap, Cons(FunctionCall(tok, Handle(arity), Predef.HandleType, handleargs), boxes)));
+        Bpl.Expr lhs = FunctionCall(tok, selector, selectorTy, lhsargs);
+        Func<Bpl.Expr, Bpl.Expr> pre = x => x;
+        if (precond != null) {
+          pre = x => FunctionCall(tok, precond, precondTy, lhsargs);
+        }
+
+        Bpl.Expr rhs = new Bpl.NAryExpr(tok, new Bpl.MapSelect(tok, arity + 1),
+          Cons(new Bpl.IdentifierExpr(tok, selectorVar, selectorVarTy), Cons(heap, boxes)));
+        Func<Bpl.Expr, Bpl.Expr, Bpl.Expr> op = Bpl.Expr.Eq;
+        if (selectorVar == "rd") {
+          var bx = BplBoundVar("bx", Predef.BoxType, bvars);
+          lhs = IsSetMember(tok, lhs, bx, true);
+          rhs = IsSetMember(tok, rhs, bx, true);
+          // op = BplImp;
+        }
+        if (selectorVar == "r") {
+          op = (u, v) => BplImp(v, u);
+        }
+        AddOtherDefinition(GetOrCreateTypeConstructor(ad), new Axiom(tok,
+          BplForall(bvars, BplTrigger(lhs), op(lhs, rhs))));
+      };
+      SelectorSemantics(Apply(arity), Predef.BoxType, "h", apply_ty, Requires(arity), requires_ty);
+      SelectorSemantics(Requires(arity), Bpl.Type.Bool, "r", requires_ty, null, null);
+      SelectorSemantics(Reads(arity), objset_ty, "rd", reads_ty, null, null);
+
+      // function {:inline true}
+      //   FuncN._requires#canCall(G...G G: Ty, H:Heap, f:Handle, x ... x :Box): bool
+      //   { true }
+      // + similar for Reads
+      Action<string, Function> UserSelectorFunction = (fname, f) => {
+        var formals = new List<Bpl.Variable>();
+        var rhsargs = new List<Bpl.Expr>();
+
+        MapM(Enumerable.Range(0, arity + 1), i => rhsargs.Add(BplFormalVar("t" + i, Predef.Ty, true, formals)));
+
+        var heap = BplFormalVar("heap", Predef.HeapType, true, formals);
+        rhsargs.Add(heap);
+        rhsargs.Add(BplFormalVar("f", Predef.HandleType, true, formals));
+
+        MapM(Enumerable.Range(0, arity), i => rhsargs.Add(BplFormalVar("bx" + i, Predef.BoxType, true, formals)));
+
+        sink.AddTopLevelDeclaration(
+          new Bpl.Function(f.Origin, f.FullSanitizedName + "#canCall", new List<TypeVariable>(), formals,
+            BplFormalVar(null, Bpl.Type.Bool, false), null,
+            InlineAttribute(f.Origin)) {
+            Body = Bpl.Expr.True
+          });
+      };
+
+      UserSelectorFunction(Requires(ad.Arity), ad.Requires);
+      UserSelectorFunction(Reads(ad.Arity), ad.Reads);
+
+      // frame axiom
+      /*
+
+        forall t0..tN+1 : Ty, h0, h1 : Heap, f : Handle, bx1 .. bxN : Box,
+          HeapSucc(h0, h1) && GoodHeap(h0) && GoodHeap(h1)
+          && Is[&IsAllocBox](bxI, tI, h0)              // in h0, not hN
+          && Is[&IsAlloc](f, Func(t1,..,tN, tN+1), h0) // in h0, not hN
+          &&
+          (forall o : ref::
+               o != null [&& h0[o, alloc] && h1[o, alloc] &&]
+               Reads(h,hN,bxs)[Box(o)]             // for hN in h0 and h1
+            ==> h0[o,field] == h1[o,field])
+        ==>  Reads(..h0..) == Reads(..h1..)
+         AND Requires(f,h0,bxs) == Requires(f,h1,bxs) // which is needed for the next
+         AND  Apply(f,h0,bxs) == Apply(f,h0,bxs)
+
+         The [...] expressions are omitted for /allocated:0 and /allocated:1:
+           - in these modes, functions are pure values and IsAlloc of a function is trivially true
+           - o may be unallocated even if f reads it, so we require a stronger condition that
+             even fields of *unallocated* objects o are unchanged from h0 to h1
+           - given this stronger condition, we can say that f(bx1...bxN) does not change from h0 to h1
+             even if some of bx1...bxN are unallocated
+           - it's harder to satisfy the stronger condition, but two cases are nevertheless useful:
+             1) f has an empty reads clause
+             2) f explictly states that everything is its reads clause is allocated
+       */
+      {
+        var bvars = new List<Bpl.Variable>();
+
+        var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, Predef.Ty, bvars));
+
+        var h0 = BplBoundVar("h0", Predef.HeapType, bvars);
+        var h1 = BplBoundVar("h1", Predef.HeapType, bvars);
+        var heapSucc = HeapSucc(h0, h1);
+        var goodHeaps = BplAnd(
+          FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h0),
+          FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h1));
+
+        var f = BplBoundVar("f", Predef.HandleType, bvars);
+        var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, Predef.BoxType, bvars));
+
+        var isness = BplAnd(
+          Snoc(Map(Enumerable.Range(0, arity), i =>
+            BplAnd(MkIs(boxes[i], types[i], true), Bpl.Expr.True)),
+          BplAnd(MkIs(f, ClassTyCon(ad, types)), Bpl.Expr.True)));
+
+        Action<Bpl.Expr, string> AddFrameForFunction = (hN, fname) => {
+
+          // inner forall vars
+          var ivars = new List<Bpl.Variable>();
+          var o = BplBoundVar("o", Predef.RefType, ivars);
+          var fld = BplBoundVar("fld", Predef.FieldName(tok), ivars);
+
+          var inner_forall = new Bpl.ForallExpr(tok, new List<TypeVariable>(), ivars, BplImp(
+            BplAnd(
+              Bpl.Expr.Neq(o, Predef.Null),
+              // Note, the MkIsAlloc conjunct of "isness" implies that everything in the reads frame is allocated in "h0", which by HeapSucc(h0,h1) also implies the frame is allocated in "h1"
+              IsSetMember(tok,
+                FunctionCall(tok, Reads(ad.Arity), objset_ty, Concat(types, Cons(hN, Cons(f, boxes)))),
+                FunctionCall(tok, BuiltinFunction.Box, null, o),
+                true)
+            ),
+            Bpl.Expr.Eq(ReadHeap(tok, h0, o, fld), ReadHeap(tok, h1, o, fld))));
+
+          Func<Bpl.Expr, Bpl.Expr> fn = h => FunctionCall(tok, fname, Bpl.Type.Bool, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
+
+          sink.AddTopLevelDeclaration(new Axiom(tok,
+            BplForall(bvars,
+              new Bpl.Trigger(tok, true, new List<Bpl.Expr> { heapSucc, fn(h1) }),
+              BplImp(
+                BplAnd(BplAnd(BplAnd(heapSucc, goodHeaps), isness), inner_forall),
+                Bpl.Expr.Eq(fn(h0), fn(h1)))), "frame axiom for " + fname));
+        };
+
+        AddFrameForFunction(h0, Reads(ad.Arity));
+        AddFrameForFunction(h1, Reads(ad.Arity));
+        AddFrameForFunction(h0, Requires(ad.Arity));
+        AddFrameForFunction(h1, Requires(ad.Arity));
+        AddFrameForFunction(h0, Apply(ad.Arity));
+        AddFrameForFunction(h1, Apply(ad.Arity));
+      }
+
+      /* axiom (forall T..: Ty, heap: Heap, f: HandleType, bx..: Box ::
+       *   { ReadsN(T.., $OneHeap, f, bx..), $IsGoodHeap(heap) }
+       *   { ReadsN(T.., heap, f, bx..) }
+       *   $IsGoodHeap(heap) && Is...(f...bx...) ==>
+       *   Set#Equal(ReadsN(T.., OneHeap, f, bx..), EmptySet) == Set#Equal(ReadsN(T.., heap, f, bx..), EmptySet));
+       */
+      {
+        var bvars = new List<Bpl.Variable>();
+        var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, Predef.Ty, bvars));
+        var oneheap = NewOneHeapExpr(tok);
+        var h = BplBoundVar("heap", Predef.HeapType, bvars);
+        var f = BplBoundVar("f", Predef.HandleType, bvars);
+        var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, Predef.BoxType, bvars));
+
+        var goodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h);
+
+        var isness = BplAnd(
+          Snoc(Map(Enumerable.Range(0, arity), i =>
+            BplAnd(MkIs(boxes[i], types[i], true), Bpl.Expr.True)),
+          BplAnd(MkIs(f, ClassTyCon(ad, types)), Bpl.Expr.True)));
+
+        var readsOne = FunctionCall(tok, Reads(arity), objset_ty, Concat(types, Cons(oneheap, Cons(f, boxes))));
+        var readsH = FunctionCall(tok, Reads(arity), objset_ty, Concat(types, Cons(h, Cons(f, boxes))));
+        var empty = FunctionCall(tok, BuiltinFunction.SetEmpty, Predef.BoxType);
+        var readsNothingOne = FunctionCall(tok, BuiltinFunction.SetEqual, null, readsOne, empty);
+        var readsNothingH = FunctionCall(tok, BuiltinFunction.SetEqual, null, readsH, empty);
+
+        sink.AddTopLevelDeclaration(new Axiom(tok, BplForall(bvars,
+          new Bpl.Trigger(tok, true, new List<Bpl.Expr> { readsOne, goodHeap },
+          new Bpl.Trigger(tok, true, new List<Bpl.Expr> { readsH })),
+          BplImp(
+            BplAnd(goodHeap, isness),
+            BplIff(readsNothingOne, readsNothingH))),
+          string.Format("empty-reads property for {0} ", Reads(arity))));
+      }
+
+      /* axiom (forall T..: Ty, heap: Heap, f: HandleType, bx..: Box ::
+       *   { RequiresN(T.., OneHeap, f, bx..), $IsGoodHeap(heap) }
+       *   { RequiresN(T.., heap, f, bx..) }
+       *   $IsGoodHeap(heap) && Is...(f...bx...) &&
+       *   Set#Equal(ReadsN(T.., OneHeap, f, bx..), EmptySet)
+       *   ==>
+       *   RequiresN(T.., OneHeap, f, bx..) == RequiresN(T.., heap, f, bx..));
+       */
+      {
+        var bvars = new List<Bpl.Variable>();
+        var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, Predef.Ty, bvars));
+        var oneheap = NewOneHeapExpr(tok);
+        var h = BplBoundVar("heap", Predef.HeapType, bvars);
+        var f = BplBoundVar("f", Predef.HandleType, bvars);
+        var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, Predef.BoxType, bvars));
+
+        var goodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h);
+
+        var isness = BplAnd(
+          Snoc(Map(Enumerable.Range(0, arity), i =>
+            BplAnd(MkIs(boxes[i], types[i], true), Bpl.Expr.True)),
+          BplAnd(MkIs(f, ClassTyCon(ad, types)), Bpl.Expr.True)));
+
+        var readsOne = FunctionCall(tok, Reads(arity), objset_ty, Concat(types, Cons(oneheap, Cons(f, boxes))));
+        var empty = FunctionCall(tok, BuiltinFunction.SetEmpty, Predef.BoxType);
+        var readsNothingOne = FunctionCall(tok, BuiltinFunction.SetEqual, null, readsOne, empty);
+
+        var requiresOne = FunctionCall(tok, Requires(arity), Bpl.Type.Bool, Concat(types, Cons(oneheap, Cons(f, boxes))));
+        var requiresH = FunctionCall(tok, Requires(arity), Bpl.Type.Bool, Concat(types, Cons(h, Cons(f, boxes))));
+
+        sink.AddTopLevelDeclaration(new Axiom(tok, BplForall(bvars,
+          new Bpl.Trigger(tok, true, new List<Bpl.Expr> { requiresOne, goodHeap },
+          new Bpl.Trigger(tok, true, new List<Bpl.Expr> { requiresH })),
+          BplImp(
+            BplAnd(BplAnd(goodHeap, isness), readsNothingOne),
+            Bpl.Expr.Eq(requiresOne, requiresH))),
+          string.Format("empty-reads property for {0}", Requires(arity))));
+      }
+
+      // $Is and $IsAlloc axioms
+      /*
+        axiom (forall f: HandleType, t0: Ty, t1: Ty ::
+          { $Is(f, Tclass._System.___hFunc1(t0, t1)) }
+          $Is(f, Tclass._System.___hFunc1(t0, t1))
+             <==> (forall h: Heap, bx0: Box ::
+               { Apply1(t0, t1, f, h, bx0) }
+               $IsGoodHeap(h) && $IsBox(bx0, t0)
+               && precondition of f(bx0) holds in h
+               ==> $IsBox(Apply1(t0, t1, f, h, bx0), t1)));
+      */
+      {
+        var bvarsOuter = new List<Bpl.Variable>();
+        var f = BplBoundVar("f", Predef.HandleType, bvarsOuter);
+        var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, Predef.Ty, bvarsOuter));
+        var Is = MkIs(f, ClassTyCon(ad, types));
+
+        var bvarsInner = new List<Bpl.Variable>();
+        var h = BplBoundVar("h", Predef.HeapType, bvarsInner);
+        var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, Predef.BoxType, bvarsInner));
+        var goodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h);
+        var isBoxes = BplAnd(Map(Enumerable.Range(0, arity), i => MkIs(boxes[i], types[i], true)));
+        var pre = FunctionCall(tok, Requires(ad.Arity), Predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
+        var applied = FunctionCall(tok, Apply(ad.Arity), Predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
+        var applied_is = MkIs(applied, types[ad.Arity], true);
+
+        sink.AddTopLevelDeclaration(new Axiom(tok,
+          BplForall(bvarsOuter, BplTrigger(Is),
+            BplIff(Is,
+              BplForall(bvarsInner, BplTrigger(applied),
+                BplImp(BplAnd(BplAnd(goodHeap, isBoxes), pre), applied_is))))));
+      }
+      /*
+         axiom (forall f: HandleType, t0: Ty, t1: Ty, u0: Ty, u1: Ty ::
+           { $Is(f, Tclass._System.___hFunc1(t0, t1)), $Is(f, Tclass._System.___hFunc1(u0, u1)) }
+           $Is(f, Tclass._System.___hFunc1(t0, t1)) &&
+           (forall bx: Box :: { $IsBox(bx, u0), $IsBox(bx, t0) }
+               $IsBox(bx, u0) ==> $IsBox(bx, t0)) &&  // contravariant arguments
+           (forall bx: Box :: { $IsBox(bx, t1), $IsBox(bx, u1) }
+               $IsBox(bx, t1) ==> $IsBox(bx, u1))     // covariant result
+           ==>
+           $Is(f, Tclass._System.___hFunc1(u0, u1)));
+      */
+      {
+        var bvarsOuter = new List<Bpl.Variable>();
+        var f = BplBoundVar("f", Predef.HandleType, bvarsOuter);
+        var typesT = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, Predef.Ty, bvarsOuter));
+        var IsT = MkIs(f, ClassTyCon(ad, typesT));
+        var typesU = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("u" + i, Predef.Ty, bvarsOuter));
+        var IsU = MkIs(f, ClassTyCon(ad, typesU));
+
+        Func<Expr, Expr, Expr> Inner = (a, b) => {
+          var bvarsInner = new List<Bpl.Variable>();
+          var bx = BplBoundVar("bx", Predef.BoxType, bvarsInner);
+          var isBoxA = MkIs(bx, a, true);
+          var isBoxB = MkIs(bx, b, true);
+          var tr = new Bpl.Trigger(tok, true, new[] { isBoxA }, new Bpl.Trigger(tok, true, new[] { isBoxB }));
+          var imp = BplImp(isBoxA, isBoxB);
+          return BplForall(bvarsInner, tr, imp);
+        };
+
+        var body = IsT;
+        for (int i = 0; i < arity; i++) {
+          body = BplAnd(body, Inner(typesU[i], typesT[i]));
+        }
+        body = BplAnd(body, Inner(typesT[arity], typesU[arity]));
+        body = BplImp(body, IsU);
+        sink.AddTopLevelDeclaration(new Axiom(tok,
+          BplForall(bvarsOuter, new Bpl.Trigger(tok, true, new[] { IsT, IsU }), body)));
+      }
+      /*  This is the definition of $IsAlloc function the arrow type:
+        axiom (forall f: HandleType, t0: Ty, t1: Ty, h: Heap ::
+          { $IsAlloc(f, Tclass._System.___hFunc1(t0, t1), h) }
+          $IsGoodHeap(h)
+          ==>
+          (
+            $IsAlloc(f, Tclass._System.___hFunc1(t0, t1), h)
+              <==>
+              (forall bx0: Box ::
+                { Apply1(t0, t1, f, h, bx0) } { Reads1(t0, t1, f, h, bx0) }
+                $IsBox(bx0, t0) && $IsAllocBox(bx0, t0, h)
+                && precondition of f(bx0) holds in h
+                ==>
+                  (everything in reads set of f(bx0) is allocated in h)
+          ));
+        However, for /allocated:0 and /allocated:1, IsAlloc for arrow types is trivially true
+        and implies nothing about the reads set.
+      */
+      {
+        var bvarsOuter = new List<Bpl.Variable>();
+        var f = BplBoundVar("f", Predef.HandleType, bvarsOuter);
+        var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, Predef.Ty, bvarsOuter));
+        var h = BplBoundVar("h", Predef.HeapType, bvarsOuter);
+        var goodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h);
+        var isAlloc = MkIsAlloc(f, ClassTyCon(ad, types), h);
+
+        var bvarsInner = new List<Bpl.Variable>();
+        var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, Predef.BoxType, bvarsInner));
+        var isAllocBoxes = BplAnd(Map(Enumerable.Range(0, arity), i =>
+          BplAnd(MkIs(boxes[i], types[i], true), MkIsAlloc(boxes[i], types[i], h, true))));
+        var pre = FunctionCall(tok, Requires(ad.Arity), Predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
+        var applied = FunctionCall(tok, Apply(ad.Arity), Predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
+
+        // (forall r: ref :: {Reads1(t0, t1, f, h, bx0)[$Box(r)]}  r != null && Reads1(t0, t1, f, h, bx0)[$Box(r)] ==> h[r, alloc])
+        var bvarsR = new List<Bpl.Variable>();
+        var r = BplBoundVar("r", Predef.RefType, bvarsR);
+        var rNonNull = Bpl.Expr.Neq(r, Predef.Null);
+        var reads = FunctionCall(tok, Reads(ad.Arity), Predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
+        var rInReads = IsSetMember(tok, reads, FunctionCall(tok, BuiltinFunction.Box, null, r), true);
+        var rAlloc = IsAlloced(tok, h, r);
+        var isAllocReads = BplForall(bvarsR, BplTrigger(rInReads), BplImp(BplAnd(rNonNull, rInReads), rAlloc));
+
+        sink.AddTopLevelDeclaration(new Axiom(tok,
+          BplForall(bvarsOuter, BplTrigger(isAlloc),
+            BplImp(goodHeap,
+              BplIff(isAlloc,
+                BplForall(bvarsInner,
+                  new Bpl.Trigger(tok, true, new List<Bpl.Expr> { applied }, BplTrigger(reads)),
+                  BplImp(BplAnd(isAllocBoxes, pre), isAllocReads)))))));
+      }
+      /*  This is the allocatedness consequence axiom of arrow types:
+        axiom (forall f: HandleType, t0: Ty, t1: Ty, h: Heap ::
+          { $IsAlloc(f, Tclass._System.___hFunc1(t0, t1), h) }
+          $IsGoodHeap(h) &&
+          $IsAlloc(f, Tclass._System.___hFunc1(t0, t1), h)
+          ==>
+              (forall bx0: Box ::
+                { Apply1(t0, t1, f, h, bx0) }
+                $IsAllocBox(bx0, t0, h)
+                && precondition of f(bx0) holds in h
+                ==>
+                  $IsAllocBox(Apply1(t0, t1, f, h, bx0), t1, h))
+          ));
+      */
+      {
+        var bvarsOuter = new List<Bpl.Variable>();
+        var f = BplBoundVar("f", Predef.HandleType, bvarsOuter);
+        var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, Predef.Ty, bvarsOuter));
+        var h = BplBoundVar("h", Predef.HeapType, bvarsOuter);
+        var goodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h);
+        var isAlloc = MkIsAlloc(f, ClassTyCon(ad, types), h);
+
+        var bvarsInner = new List<Bpl.Variable>();
+        var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, Predef.BoxType, bvarsInner));
+        var isAllocBoxes = BplAnd(Map(Enumerable.Range(0, arity), i => MkIsAlloc(boxes[i], types[i], h, true)));
+        var pre = FunctionCall(tok, Requires(ad.Arity), Predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
+        var applied = FunctionCall(tok, Apply(ad.Arity), Predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
+        var applied_isAlloc = MkIsAlloc(applied, types[ad.Arity], h, true);
+
+        sink.AddTopLevelDeclaration(new Axiom(tok,
+          BplForall(bvarsOuter, BplTrigger(isAlloc),
+            BplImp(BplAnd(goodHeap, isAlloc),
+              BplForall(bvarsInner, BplTrigger(applied),
+                BplImp(BplAnd(isAllocBoxes, pre), applied_isAlloc))))));
+      }
+    }
+  }
+
+  private string AddTyAxioms(TopLevelDecl td) {
+    Contract.Requires(td != null);
+    IOrigin tok = td.Origin;
+
+    // use the internal type synonym, if any
+    if (!RevealedInScope(td) && td is RevealableTypeDecl revealableTypeDecl) {
+      td = revealableTypeDecl.SelfSynonymDecl();
+    }
+    Contract.Assume(td is SubsetTypeDecl or not TypeSynonymDecl); // this is expected of the caller
+
+    var func = GetOrCreateTypeConstructor(td);
+    var name = func.Name;
+
+    // Produce uniqueness or injectivity axioms, unless the type is one that may (non-uniquely) stand for another type.
+    if (td is not AbstractTypeDecl and not InternalTypeSynonymDecl) {
+      var tagAxiom = CreateTagAndCallingForTypeConstructor(td);
+      AddOtherDefinition(func, tagAxiom);
+
+      // Create the injectivity axiom and its function
+      /*
+         function List_0(Ty) : Ty;
+         axiom (forall t0: Ty :: { List(t0) } List_0(List(t0)) == t0);
+      */
+      for (int i = 0; i < func.InParams.Count; i++) {
+        var args = MkTyParamBinders(td.TypeArgs, out var argExprs);
+        var inner = FunctionCall(tok, name, Predef.Ty, argExprs);
+        Bpl.Variable tyVarIn = BplFormalVar(null, Predef.Ty, true);
+        Bpl.Variable tyVarOut = BplFormalVar(null, Predef.Ty, false);
+        var injname = name + "_" + i;
+        var injfunc = new Bpl.Function(tok, injname, Singleton(tyVarIn), tyVarOut);
+        sink.AddTopLevelDeclaration(injfunc);
+        var outer = FunctionCall(tok, injname, args[i].TypedIdent.Type, inner);
+        Bpl.Expr qq = BplForall(args, BplTrigger(inner), Bpl.Expr.Eq(outer, argExprs[i]));
+        var injectivityAxiom = new Axiom(tok, qq, name + " injectivity " + i);
+        AddOtherDefinition(injfunc, injectivityAxiom);
+      }
+    }
+
+    // Boxing axiom (important for the properties of unbox)
+    /*
+       axiom (forall T: Ty, bx: Box ::
+         { $IsBox(bx, List(T)) }
+         $IsBox(bx, List(T))
+            ==> $Box($Unbox(bx): DatatypeType) == bx
+             && $Is($Unbox(bx): DatatypeType, List(T)));
+    */
+    if (!ModeledAsBoxType(UserDefinedType.FromTopLevelDecl(td.Origin, td))) {
+      var args = MkTyParamBinders(td.TypeArgs, out var argExprs);
+      var ty_repr = TrType(UserDefinedType.FromTopLevelDecl(td.Origin, td));
+      var typeTerm = FunctionCall(tok, name, Predef.Ty, argExprs);
+      AddBoxUnboxAxiom(tok, name, typeTerm, ty_repr, args);
+    }
+
+    return name;
+  }
+
+  /* Create the Tag and calling Tag on this type constructor
+   *
+   * The common case:
+   *     const unique TagList: TyTag;
+   *     const unique tytagFamily$List: TyTagFamily;  // defined once for each type named "List"
+   *     axiom (forall t0: Ty :: { List(t0) } Tag(List(t0)) == TagList && TagFamily(List(t0)) == tytagFamily$List);
+   * For types obtained via an abstract import, just do:
+   *     const unique tytagFamily$List: TyTagFamily;  // defined once for each type named "List"
+   *     axiom (forall t0: Ty :: { List(t0) } TagFamily(List(t0)) == tytagFamily$List);
+   */
+  private Axiom CreateTagAndCallingForTypeConstructor(TopLevelDecl td) {
+    IOrigin tok = td.Origin;
+    var inner_name = GetClass(td).TypedIdent.Name;
+    string name = "T" + inner_name;
+
+    var args = MkTyParamBinders(td.TypeArgs, out var argExprs);
+    var inner = FunctionCall(tok, name, Predef.Ty, argExprs);
+    Bpl.Expr body = Bpl.Expr.True;
+
+    if (!td.EnclosingModuleDefinition.IsFacade) {
+      var tagName = "Tag" + inner_name;
+      var tag = new Bpl.Constant(tok, new Bpl.TypedIdent(tok, tagName, Predef.TyTag), true);
+      sink.AddTopLevelDeclaration(tag);
+      body = Bpl.Expr.Eq(FunctionCall(tok, "Tag", Predef.TyTag, inner), new Bpl.IdentifierExpr(tok, tag));
+    }
+
+    if (!tytagConstants.TryGetValue(td.Name, out var tagFamily)) {
+      tagFamily = new Bpl.Constant(Token.NoToken,
+        new Bpl.TypedIdent(Token.NoToken, "tytagFamily$" + td.Name, Predef.TyTagFamily), true);
+      tytagConstants.Add(td.Name, tagFamily);
+    }
+
+    body = BplAnd(body,
+      Bpl.Expr.Eq(FunctionCall(tok, "TagFamily", Predef.TyTagFamily, inner), new Bpl.IdentifierExpr(tok, tagFamily)));
+
+    var qq = BplForall(args, BplTrigger(inner), body);
+    var tagAxiom = new Axiom(tok, qq, name + " Tag");
+    return tagAxiom;
+  }
+
+  private void AddBitvectorTypeAxioms(int w) {
+    Contract.Requires(0 <= w);
+
+    if (w == 0) {
+      // the axioms for bv0 are already in DafnyPrelude.bpl
+      return;
+    }
+
+    // box/unbox axiom
+    var tok = Token.NoToken;
+    var printableName = "bv" + w;
+    var dafnyType = new BitvectorType(options, w);
+    var boogieType = BplBvType(w);
+    var typeTerm = TypeToTy(dafnyType);
+    AddBoxUnboxAxiom(tok, printableName, typeTerm, boogieType, new List<Variable>());
+
+    // axiom (forall v: bv3 :: { $Is(v, TBitvector(3)) } $Is(v, TBitvector(3)));
+    var vVar = BplBoundVar("v", boogieType, out var v);
+    var bvs = new List<Variable>() { vVar };
+    var isBv = MkIs(v, typeTerm);
+    var tr = BplTrigger(isBv);
+    sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, new Bpl.ForallExpr(tok, bvs, tr, isBv)));
+
+    // axiom (forall v: bv3, heap: Heap :: { $IsAlloc(v, TBitvector(3), h) } $IsAlloc(v, TBitvector(3), heap));
+    vVar = BplBoundVar("v", boogieType, out v);
+    var heapVar = BplBoundVar("heap", Predef.HeapType, out var heap);
+    bvs = new List<Variable>() { vVar, heapVar };
+    var isAllocBv = MkIsAlloc(v, typeTerm, heap);
+    tr = BplTrigger(isAllocBv);
+    sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, new Bpl.ForallExpr(tok, bvs, tr, isAllocBv)));
+  }
+
+  /// <summary>
+  /// Generate:
+  ///     axiom (forall args: Ty, bx: Box ::
+  ///       { $IsBox(bx, name(argExprs)) }
+  ///       $IsBox(bx, name(argExprs)) ==>
+  ///         $Box($Unbox(bx): tyRepr) == bx &&
+  ///         $Is($Unbox(bx): tyRepr, name(argExprs)));
+  /// </summary>
+  private void AddBoxUnboxAxiom(IOrigin tok, string printableName, Bpl.Expr typeTerm, Bpl.Type tyRepr, List<Variable> args) {
+    Contract.Requires(tok != null);
+    Contract.Requires(printableName != null);
+    Contract.Requires(typeTerm != null);
+    Contract.Requires(tyRepr != null);
+    Contract.Requires(args != null);
+
+    var bxVar = BplBoundVar("bx", Predef.BoxType, out var bx);
+    var unbox = FunctionCall(tok, BuiltinFunction.Unbox, tyRepr, bx);
+    var box_is = MkIs(bx, typeTerm, true);
+    var unbox_is = MkIs(unbox, typeTerm, false);
+    var box_unbox = FunctionCall(tok, BuiltinFunction.Box, null, unbox);
+    sink.AddTopLevelDeclaration(
+      new Axiom(tok,
+        BplForall(Snoc(args, bxVar), BplTrigger(box_is),
+          BplImp(box_is, BplAnd(Bpl.Expr.Eq(box_unbox, bx), unbox_is))),
+        "Box/unbox axiom for " + printableName));
+  }
+
+
+  private void GenerateAndCheckGuesses(IOrigin tok, List<BoundVar> bvars, List<BoundedPool> bounds, Expression expr, Trigger triggers, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+    Contract.Requires(tok != null);
+    Contract.Requires(bvars != null);
+    Contract.Requires(bounds != null);
+    Contract.Requires(expr != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(etran != null);
+
+    List<Tuple<List<Tuple<BoundVar, Expression>>, Expression>> partialGuesses = GeneratePartialGuesses(bvars, expr);
+    Bpl.Expr w = Bpl.Expr.False;
+    foreach (var tup in partialGuesses) {
+      var body = etran.TrExpr(tup.Item2);
+      Bpl.Expr typeConstraints = Bpl.Expr.True;
+      var undetermined = new List<BoundVar>();
+      foreach (var be in tup.Item1) {
+        if (be.Item2 == null) {
+          undetermined.Add(be.Item1);
+        } else {
+          typeConstraints = BplAnd(typeConstraints, MkIs(etran.TrExpr(be.Item2), be.Item1.Type));
+        }
+      }
+      var canCalls = etran.CanCallAssumption(tup.Item2);
+      body = BplImp(canCalls, body);
+      body = BplAnd(typeConstraints, body);
+
+      if (undetermined.Count != 0) {
+        List<bool> freeOfAlloc = BoundedPool.HasBounds(bounds, BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
+        var bvs = new List<Variable>();
+        var typeAntecedent = etran.TrBoundVariables(undetermined, bvs, false, freeOfAlloc);
+        body = new Bpl.ExistsExpr(tok, bvs, triggers, BplAnd(typeAntecedent, body));
+      }
+      w = BplOr(body, w);
+    }
+    builder.Add(Assert(tok, w, new LetSuchThatExists(bvars, expr), builder.Context));
+  }
+
+  List<Tuple<List<Tuple<BoundVar, Expression>>, Expression>> GeneratePartialGuesses(List<BoundVar> bvars, Expression expression) {
+    if (bvars.Count == 0) {
+      var tup = new Tuple<List<Tuple<BoundVar, Expression>>, Expression>(new List<Tuple<BoundVar, Expression>>(), expression);
+      return new List<Tuple<List<Tuple<BoundVar, Expression>>, Expression>>() { tup };
+    }
+    var result = new List<Tuple<List<Tuple<BoundVar, Expression>>, Expression>>();
+    var x = bvars[0];
+    var otherBvars = bvars.GetRange(1, bvars.Count - 1);
+    foreach (var tup in GeneratePartialGuesses(otherBvars, expression)) {
+      // in the special case that x does not even occur in expression (and we know the type has a value for x), we can just ignore x
+      if (!FreeVariablesUtil.ContainsFreeVariable(tup.Item2, false, x) && x.Type.KnownToHaveToAValue(x.IsGhost)) {
+        result.Add(tup);
+        continue;
+      }
+      // one possible result is to quantify over all the variables
+      var vs = new List<Tuple<BoundVar, Expression>>() { new Tuple<BoundVar, Expression>(x, null) };
+      vs.AddRange(tup.Item1);
+      result.Add(new Tuple<List<Tuple<BoundVar, Expression>>, Expression>(vs, tup.Item2));
+      // other possibilities involve guessing a value for x
+      foreach (var guess in GuessWitnesses(x, tup.Item2)) {
+        var g = Substitute(tup.Item2, x, guess);
+        vs = new List<Tuple<BoundVar, Expression>>() { new Tuple<BoundVar, Expression>(x, guess) };
+        AddRangeSubst(vs, tup.Item1, x, guess);
+        result.Add(new Tuple<List<Tuple<BoundVar, Expression>>, Expression>(vs, g));
+      }
+    }
+    return result;
+  }
+
+  private void AddRangeSubst(List<Tuple<BoundVar, Expression>> vs, List<Tuple<BoundVar, Expression>> aa, IVariable v, Expression e) {
+    Contract.Requires(vs != null);
+    Contract.Requires(aa != null);
+    Contract.Requires(v != null);
+    Contract.Requires(e != null);
+    foreach (var be in aa) {
+      if (be.Item2 == null) {
+        vs.Add(be);
+      } else {
+        vs.Add(new Tuple<BoundVar, Expression>(be.Item1, Substitute(be.Item2, v, e)));
+      }
+    }
+  }
+
+  IEnumerable<Expression> GuessWitnesses(BoundVar x, Expression expr) {
+    Contract.Requires(x != null);
+    Contract.Requires(expr != null);
+    var xType = x.Type.NormalizeExpand();
+    if (xType is BoolType) {
+      var lit = Expression.CreateBoolLiteral(x.Origin, false);
+      yield return lit;
+      lit = Expression.CreateBoolLiteral(x.Origin, true);
+      yield return lit;
+      yield break;  // there are no more possible witnesses for booleans
+    } else if (xType is CharType) {
+      // TODO: something could be done for character literals
+    } else if (xType.IsBitVectorType) {
+      // TODO: something could be done for bitvectors
+    } else if (xType.IsRefType) {
+      var lit = new LiteralExpr(x.Origin) { Type = xType };  // null
+      yield return lit;
+    } else if (xType.IsDatatype) {
+      var dt = xType.AsDatatype;
+      Expression zero = Zero(x.Origin, xType);
+      if (zero != null) {
+        yield return zero;
+      }
+      foreach (var ctor in dt.Ctors) {
+        if (ctor.Formals.Count == 0) {
+          var v = new DatatypeValue(x.Origin, dt.Name, ctor.Name, new List<Expression>());
+          v.Ctor = ctor;  // resolve here
+          v.InferredTypeArgs = xType.TypeArgs; // resolved here.
+          v.Type = xType;  // resolve here
+          yield return v;
+        }
+      }
+    } else if (xType is SetType) {
+      var empty = new SetDisplayExpr(x.Origin, ((SetType)xType).Finite, new List<Expression>());
+      empty.Type = xType;
+      yield return empty;
+    } else if (xType is MultiSetType) {
+      var empty = new MultiSetDisplayExpr(x.Origin, new List<Expression>());
+      empty.Type = xType;
+      yield return empty;
+    } else if (xType is SeqType) {
+      var empty = new SeqDisplayExpr(x.Origin, new List<Expression>());
+      empty.Type = xType;
+      yield return empty;
+    } else if (xType.IsNumericBased(Type.NumericPersuasion.Int)) {
+      var lit = new LiteralExpr(x.Origin, 0);
+      lit.Type = xType;  // resolve here
+      yield return lit;
+    } else if (xType.IsNumericBased(Type.NumericPersuasion.Real)) {
+      var lit = new LiteralExpr(x.Origin, BaseTypes.BigDec.ZERO);
+      lit.Type = xType;  // resolve here
+      yield return lit;
+    }
+
+    var bounds = ModuleResolver.DiscoverAllBounds_SingleVar(x, expr, out _);
+    foreach (var bound in bounds) {
+      if (bound is IntBoundedPool) {
+        var bnd = (IntBoundedPool)bound;
+        if (bnd.LowerBound != null) {
+          yield return bnd.LowerBound;
+        }
+
+        if (bnd.UpperBound != null) {
+          yield return Expression.CreateDecrement(bnd.UpperBound, 1);
+        }
+      } else if (bound is SubSetBoundedPool) {
+        var bnd = (SubSetBoundedPool)bound;
+        yield return bnd.UpperBound;
+      } else if (bound is SuperSetBoundedPool) {
+        var bnd = (SuperSetBoundedPool)bound;
+        yield return bnd.LowerBound;
+      } else if (bound is SetBoundedPool) {
+        var st = ((SetBoundedPool)bound).Set.Resolved;
+        if (st is DisplayExpression) {
+          var display = (DisplayExpression)st;
+          foreach (var el in display.Elements) {
+            yield return el;
+          }
+        } else if (st is MapDisplayExpr) {
+          var display = (MapDisplayExpr)st;
+          foreach (var maplet in display.Elements) {
+            yield return maplet.A;
+          }
+        }
+      } else if (bound is MultiSetBoundedPool) {
+        var st = ((MultiSetBoundedPool)bound).MultiSet.Resolved;
+        if (st is DisplayExpression) {
+          var display = (DisplayExpression)st;
+          foreach (var el in display.Elements) {
+            yield return el;
+          }
+        } else if (st is MapDisplayExpr) {
+          var display = (MapDisplayExpr)st;
+          foreach (var maplet in display.Elements) {
+            yield return maplet.A;
+          }
+        }
+      } else if (bound is SeqBoundedPool) {
+        var sq = ((SeqBoundedPool)bound).Seq.Resolved;
+        var display = sq as DisplayExpression;
+        if (display != null) {
+          foreach (var el in display.Elements) {
+            yield return el;
+          }
+        }
+      } else if (bound is ExactBoundedPool) {
+        yield return ((ExactBoundedPool)bound).E;
+      }
+    }
+  }
+
+  /// <summary>
+  /// Return a zero-equivalent value for "typ", or return null (for any reason whatsoever).
+  /// </summary>
+  Expression Zero(IOrigin tok, Type typ) {
+    Contract.Requires(tok != null);
+    Contract.Requires(typ != null);
+    typ = typ.NormalizeToAncestorType();
+    if (typ is BoolType) {
+      return Expression.CreateBoolLiteral(tok, false);
+    } else if (typ is CharType) {
+      var z = new CharLiteralExpr(tok, CharType.DefaultValue.ToString());
+      z.Type = Type.Char;  // resolve here
+      return z;
+    } else if (typ.IsNumericBased(Type.NumericPersuasion.Int)) {
+      return Expression.CreateIntLiteral(tok, 0);
+    } else if (typ.IsNumericBased(Type.NumericPersuasion.Real)) {
+      return Expression.CreateRealLiteral(tok, BaseTypes.BigDec.ZERO);
+    } else if (typ.IsBigOrdinalType) {
+      return Expression.CreateNatLiteral(tok, 0, Type.BigOrdinal);
+    } else if (typ.IsBitVectorType) {
+      var z = new LiteralExpr(tok, 0);
+      z.Type = typ;
+      return z;
+    } else if (typ.IsRefType) {
+      var z = new LiteralExpr(tok);  // null
+      z.Type = typ;
+      return z;
+    } else if (typ.IsDatatype) {
+      return null;  // this can be improved
+    } else if (typ is SetType) {
+      var empty = new SetDisplayExpr(tok, ((SetType)typ).Finite, new List<Expression>());
+      empty.Type = typ;
+      return empty;
+    } else if (typ is MultiSetType) {
+      var empty = new MultiSetDisplayExpr(tok, new List<Expression>());
+      empty.Type = typ;
+      return empty;
+    } else if (typ is SeqType) {
+      var empty = new SeqDisplayExpr(tok, new List<Expression>());
+      empty.Type = typ;
+      return empty;
+    } else if (typ is MapType) {
+      var empty = new MapDisplayExpr(tok, ((MapType)typ).Finite, new List<ExpressionPair>());
+      empty.Type = typ;
+      return empty;
+    } else if (typ is ArrowType) {
+      // TODO: do better than just returning null
+      return null;
+    } else if (typ.IsAbstractType || typ.IsInternalTypeSynonym) {
+      return null;
+    } else if (typ.IsTraitType) {
+      Contract.Assert(options.Get(CommonOptionBag.GeneralTraits) != CommonOptionBag.GeneralTraitsOptions.Legacy);
+      return null;
+    } else if (typ.IsTypeParameter) {
+      return null;
+    } else {
+      Contract.Assume(false);  // unexpected type
+      return null;
+    }
+  }
+
+  void AddRevealableTypeDecl(RevealableTypeDecl d) {
+    Contract.Requires(d != null);
+    if (RevealedInScope(d)) {
+      if (d is NewtypeDecl) {
+        var dd = (NewtypeDecl)d;
+        AddTypeDecl(dd);
+        AddClassMembers(dd, true, true);
+      } else if (d is DefaultClassDecl defaultClassDecl) {
+        AddClassMembers(defaultClassDecl, options.OptimizeResolution < 1, true);
+      } else if (d is ClassLikeDecl) {
+        var cl = (ClassLikeDecl)d;
+        AddClassMembers(cl, options.OptimizeResolution < 1, true);
+        if (cl.NonNullTypeDecl != null) {
+          AddTypeDecl(cl.NonNullTypeDecl);
+        }
+        if (d is IteratorDecl) {
+          AddIteratorSpecAndBody((IteratorDecl)d);
+        }
+      } else if (d is DatatypeDecl) {
+        var dd = (DatatypeDecl)d;
+        AddDatatype(dd);
+        AddClassMembers(dd, true, true);
+      } else if (d is SubsetTypeDecl) {
+        AddTypeDecl((SubsetTypeDecl)d);
+      } else if (d is TypeSynonymDecl) {
+        //do nothing, this type will be transparent to translation
+      } else {
+        Contract.Assert(false);
+      }
+    } else {
+      // Create a type constructor for the export-provided type. But note:
+      //   -- A DefaultClassDecl does not need a type constructor.
+      //   -- Reference types give rise to two type declarations, the nullable version and the non-null version.
+      //      For a type that is only export-provided, the type that is exported is an abstract-type version
+      //      of the non-null type. Thus, for a class declaration and reference-type trait declaration, we
+      //      do not create a type constructor.
+      if (d is not DefaultClassDecl && d is not ClassLikeDecl { IsReferenceTypeDecl: true }) {
+        GetOrCreateTypeConstructor(d.SelfSynonymDecl());
+      }
+
+      if (d is TopLevelDeclWithMembers topLevelDeclWithMembers) {
+        AddClassMembers(topLevelDeclWithMembers, true, false);
+      }
+    }
+  }
+
+  void AddTypeDecl(NewtypeDecl dd) {
+    Contract.Requires(dd != null);
+    Contract.Ensures(fuelContext == Contract.OldValue(fuelContext));
+
+    FuelContext oldFuelContext = this.fuelContext;
+    this.fuelContext = FuelSetting.NewFuelContext(dd);
+
+    AddWellformednessCheck(dd);
+
+    // Add $Is and $IsAlloc axioms for the newtype
+    currentModule = dd.EnclosingModuleDefinition;
+    AddRedirectingTypeDeclAxioms(false, dd, dd.FullName);
+    AddRedirectingTypeDeclAxioms(true, dd, dd.FullName);
+    currentModule = null;
+
+    this.fuelContext = oldFuelContext;
+  }
+
+  void AddTypeDecl(SubsetTypeDecl dd) {
+    Contract.Requires(dd != null);
+    Contract.Ensures(fuelContext == Contract.OldValue(fuelContext));
+
+    FuelContext oldFuelContext = this.fuelContext;
+    this.fuelContext = FuelSetting.NewFuelContext(dd);
+
+    if (!Attributes.Contains(dd.Attributes, "axiom")) {
+      AddWellformednessCheck(dd);
+    }
+    currentModule = dd.EnclosingModuleDefinition;
+    // Add $Is and $IsAlloc axioms for the subset type
+    AddRedirectingTypeDeclAxioms(false, dd, dd.FullName);
+    AddRedirectingTypeDeclAxioms(true, dd, dd.FullName);
+    currentModule = null;
+    this.fuelContext = oldFuelContext;
+  }
+
+  /// <summary>
+  /// Generate $Is (if "!generateIsAlloc") or $IsAlloc (if "generateIsAlloc") axioms for the newtype/subset-type "dd",
+  /// whose printable name is "fullName".
+  /// 
+  /// Given that the type "dd" is
+  ///
+  ///     (new)type dd<X> = x: Base<Y> | constraint
+  ///
+  /// the $Is axioms have the form
+  ///
+  ///     axiom (forall o: dd ::
+  ///         { $Is(o, Tclass.dd) }
+  ///         $Is(o, Tclass.dd) ==>
+  ///             $Is(o, Tclass.Base) && constraintCanCall && constraint);
+  ///     axiom (forall o: dd ::
+  ///         { $Is(o, Tclass.dd) }
+  ///         $Is(o, Tclass.Base) && (constraintCanCall ==> constraint) ==>
+  ///             $Is(o, Tclass.dd));
+  /// 
+  /// and the $IsAlloc axiom has the form
+  ///
+  ///     axiom (forall o: dd, $h: Heap ::
+  ///         { $IsAlloc(o, Tclass.dd, $h) }
+  ///         $IsAlloc(o, Tclass.dd, $h) <==> $IsAlloc(o, Tclass.Base, $h));
+  /// </summary>
+  void AddRedirectingTypeDeclAxioms<T>(bool generateIsAlloc, T dd, string fullName)
+    where T : TopLevelDecl, RedirectingTypeDecl {
+    Contract.Requires(dd != null);
+    Contract.Requires((dd.Var != null && dd.Constraint != null) || dd is NewtypeDecl);
+    Contract.Requires(fullName != null);
+
+    var vars = MkTyParamBinders(dd.TypeArgs, out var typeArgs);
+    var typeTerm = ClassTyCon(dd, typeArgs);
+
+    var baseType = dd.Var != null ? dd.Var.Type : ((NewtypeDecl)(object)dd).BaseType;
+    var oBplType = TrType(baseType);
+    var c = new BoundVar(dd.Origin, CurrentIdGenerator.FreshId("c"), baseType);
+    var o = BplBoundVar((dd.Var ?? c).AssignUniqueName((dd.IdGenerator)), oBplType, vars);
+
+    if (generateIsAlloc) {
+      var h = BplBoundVar("$h", Predef.HeapType, vars);
+      // $IsAlloc(o, ..)
+      var isAlloc = MkIsAlloc(o, typeTerm, h, ModeledAsBoxType(baseType));
+      Bpl.Expr body;
+      var trigger = BplTrigger(isAlloc);
+      if (baseType.IsNumericBased() || baseType.IsBitVectorType || baseType.IsBoolType || baseType.IsCharType) {
+        body = isAlloc;
+      } else {
+        Bpl.Expr rhs = MkIsAlloc(o, baseType, h);
+        if (dd is NonNullTypeDecl) {
+          trigger.Next = BplTrigger(rhs);
+        }
+        body = BplIff(isAlloc, rhs);
+      }
+
+      var comment = $"$IsAlloc axiom for {dd.WhatKind} {fullName}";
+      var axiom = new Bpl.Axiom(dd.Tok, BplForall(vars, BplTrigger(isAlloc), body), comment);
+      AddOtherDefinition(GetOrCreateTypeConstructor(dd), axiom);
+
+    } else {
+      // $Is(o, ..)
+      var isPredicate = MkIs(o, typeTerm, ModeledAsBoxType(baseType));
+      var trigger = BplTrigger(isPredicate);
+      var etran = new ExpressionTranslator(this, Predef, NewOneHeapExpr(dd.Origin), null);
+      Bpl.Expr parentConstraint;
+      Expression condition;
+      if (baseType.IsNumericBased() || baseType.IsBitVectorType || baseType.IsBoolType || baseType.IsCharType) {
+        // optimize this to only use the numeric/bitvector constraint, not the whole $Is thing on the base type
+        parentConstraint = Bpl.Expr.True;
+        var udt = UserDefinedType.FromTopLevelDecl(dd.Origin, dd);
+        var idExpr = Expression.CreateIdentExpr(dd.Var ?? c);
+        condition = ModuleResolver.GetImpliedTypeConstraint(idExpr, udt);
+      } else {
+        parentConstraint = MkIs(o, baseType);
+        if (dd is NonNullTypeDecl) {
+          trigger.Next = BplTrigger(parentConstraint);
+        }
+        condition = dd.Constraint ?? Expression.CreateBoolLiteral(dd.Origin, true);
+      }
+
+      var constraintCanCall = etran.CanCallAssumption(condition);
+      if (ArrowType.IsPartialArrowTypeName(dd.Name)) {
+        // Hack for now. TODO: The resolver currently sets up the constraint of a partial arrow as being
+        // a total arrow such that "forall bx: Box :: f(bx) == {}". However, it ought to be
+        // "forall bx: Box :: f.requires(bx) ==> f(bx) == {}". When that gets fixed, the hack here is no longer needed.
+        constraintCanCall = Bpl.Expr.True;
+      }
+      var canCallIsJustTrue = constraintCanCall == Bpl.Expr.True;
+      var constraint = etran.TrExpr(condition);
+      var comment = $"$Is axiom{(canCallIsJustTrue ? "" : "s")} for {dd.WhatKind} {fullName}";
+
+      var rhs = BplAnd(parentConstraint, BplAnd(constraintCanCall, constraint));
+      var body = canCallIsJustTrue ? BplIff(isPredicate, rhs) : BplImp(isPredicate, rhs);
+      var axiom = new Bpl.Axiom(dd.Origin, BplForall(vars, trigger, body), comment);
+      AddOtherDefinition(GetOrCreateTypeConstructor(dd), axiom);
+
+      if (!canCallIsJustTrue) {
+        body = BplImp(BplAnd(parentConstraint, BplImp(constraintCanCall, constraint)), isPredicate);
+        axiom = new Bpl.Axiom(dd.Origin, BplForall(vars, BplTrigger(isPredicate), body), null);
+        AddOtherDefinition(GetOrCreateTypeConstructor(dd), axiom);
+      }
+    }
+  }
+
+
+  /// <summary>
+  /// Returns the translation of converting "r", whose Dafny type was "fromType", to a value of type "toType".
+  /// The translation assumes that "r" is known to be a value of type "toType".
+  /// </summary>
+  Bpl.Expr ConvertExpression(IOrigin tok, Bpl.Expr r, Type fromType, Type toType) {
+    Contract.Requires(tok != null);
+    Contract.Requires(r != null);
+    Contract.Requires(fromType != null);
+    Contract.Requires(toType != null);
+    toType = toType.NormalizeToAncestorType();
+    fromType = fromType.NormalizeToAncestorType();
+    if (fromType.IsTypeParameter) {
+      return UnboxUnlessInherentlyBoxed(r, toType);
+    } else if (fromType.IsNumericBased(Type.NumericPersuasion.Int)) {
+      if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        // do nothing
+      } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        r = FunctionCall(tok, BuiltinFunction.IntToReal, null, r);
+      } else if (toType.IsCharType) {
+        r = FunctionCall(tok, BuiltinFunction.CharFromInt, null, r);
+      } else if (toType.IsBitVectorType) {
+        r = IntToBV(tok, r, toType);
+      } else if (toType.IsBigOrdinalType) {
+        r = FunctionCall(tok, "ORD#FromNat", Predef.BigOrdinalType, r);
+      } else {
+        Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
+      }
+      return r;
+    } else if (fromType.IsBitVectorType) {
+      var fromWidth = fromType.AsBitVectorType.Width;
+      if (toType.IsBitVectorType) {
+        // conversion from one bitvector type to another
+        var toWidth = toType.AsBitVectorType.Width;
+        if (fromWidth == toWidth) {
+          // no conversion
+        } else if (fromWidth < toWidth) {
+          var zeros = BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, toWidth - fromWidth);
+          if (fromWidth == 0) {
+            r = zeros;
+          } else {
+            var concat = new Bpl.BvConcatExpr(tok, zeros, r);
+            // There's a bug in Boogie that causes a warning to be emitted if a BvConcatExpr is passed as the argument
+            // to $Box, which takes a type argument.  The bug can apparently be worked around by giving an explicit
+            // (and other redudant) type conversion.
+            r = Bpl.Expr.CoerceType(tok, concat, BplBvType(toWidth));
+          }
+        } else if (toWidth == 0) {
+          r = BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, toWidth);
+        } else {
+          r = new Bpl.BvExtractExpr(tok, r, toWidth, 0);
+        }
+      } else if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        r = FunctionCall(tok, "nat_from_bv" + fromWidth, Bpl.Type.Int, r);
+      } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        r = FunctionCall(tok, "nat_from_bv" + fromWidth, Bpl.Type.Int, r);
+        r = FunctionCall(tok, BuiltinFunction.IntToReal, null, r);
+      } else if (toType.IsCharType) {
+        r = FunctionCall(tok, "nat_from_bv" + fromWidth, Bpl.Type.Int, r);
+        r = FunctionCall(tok, BuiltinFunction.CharFromInt, null, r);
+      } else if (toType.IsBigOrdinalType) {
+        r = FunctionCall(tok, "nat_from_bv" + fromWidth, Bpl.Type.Int, r);
+        r = FunctionCall(tok, "ORD#FromNat", Predef.BigOrdinalType, r);
+      } else {
+        Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
+      }
+      return r;
+    } else if (fromType.IsCharType) {
+      if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        r = FunctionCall(tok, BuiltinFunction.CharToInt, null, r);
+      } else if (toType.IsCharType) {
+        // do nothing
+      } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        r = FunctionCall(tok, BuiltinFunction.CharToInt, null, r);
+        r = FunctionCall(tok, BuiltinFunction.IntToReal, null, r);
+      } else if (toType.IsBitVectorType) {
+        r = FunctionCall(tok, BuiltinFunction.CharToInt, null, r);
+        r = IntToBV(tok, r, toType);
+      } else if (toType.IsBigOrdinalType) {
+        r = FunctionCall(tok, BuiltinFunction.CharToInt, null, r);
+        r = FunctionCall(tok, "ORD#FromNat", Bpl.Type.Int, r);
+      } else {
+        Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
+      }
+      return r;
+    } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
+      if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        // do nothing
+      } else if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        r = FunctionCall(tok, BuiltinFunction.RealToInt, null, r);
+      } else if (toType.IsBitVectorType) {
+        r = FunctionCall(tok, BuiltinFunction.RealToInt, null, r);
+        r = IntToBV(tok, r, toType);
+      } else if (toType.IsCharType) {
+        r = FunctionCall(tok, BuiltinFunction.RealToInt, null, r);
+        r = FunctionCall(tok, BuiltinFunction.CharFromInt, null, r);
+      } else if (toType.IsBigOrdinalType) {
+        r = FunctionCall(tok, BuiltinFunction.RealToInt, null, r);
+        r = FunctionCall(tok, "ORD#FromNat", Bpl.Type.Int, r);
+      } else {
+        Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
+      }
+      return r;
+      // "r" now denotes an integer
+    } else if (fromType.IsBigOrdinalType) {
+      if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        r = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, r);
+      } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        r = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, r);
+        r = FunctionCall(tok, BuiltinFunction.IntToReal, null, r);
+      } else if (toType.IsCharType) {
+        r = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, r);
+        r = FunctionCall(tok, BuiltinFunction.CharFromInt, null, r);
+      } else if (toType.IsBitVectorType) {
+        r = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, r);
+        r = IntToBV(tok, r, toType);
+      } else if (toType.IsBigOrdinalType) {
+        // do nothing
+      } else {
+        Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
+      }
+      return r;
+    } else if (fromType.IsRefType && toType.IsRefType) {
+      return r;
+    } else if (fromType.IsRefType) {
+      Contract.Assert(toType.IsTraitType);
+      return BoxIfNecessary(r.tok, r, fromType);
+    } else if (toType.IsRefType) {
+      Contract.Assert(fromType.IsTraitType);
+      return UnboxUnlessInherentlyBoxed(r, toType);
+    } else if (toType.IsTraitType) {
+      // cast to a non-reference trait
+      return BoxIfNecessary(r.tok, r, fromType);
+    } else if (fromType.IsTraitType) {
+      // cast from a non-reference trait
+      return UnboxUnlessInherentlyBoxed(r, toType);
+    } else if (fromType.IsSubtypeOf(toType, false, false)) {
+      return AdaptBoxing(r.tok, r, fromType, toType);
+    } else if (fromType is CollectionType && toType is CollectionType) {
+      // the Boogie representation of collection types is the same for all element types
+      return r;
+    } else if (fromType.Equals(toType) || fromType.AsNewtype != null || toType.AsNewtype != null) {
+      return r;
+    } else {
+      Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
+    }
+    return r;
+  }
+
+  private Bpl.Expr IntToBV(IOrigin tok, Bpl.Expr r, Type toType) {
+    var toWidth = toType.AsBitVectorType.Width;
+    if (RemoveLit(r) is Bpl.LiteralExpr) {
+      Bpl.LiteralExpr e = (Bpl.LiteralExpr)RemoveLit(r);
+      if (e.isBigNum) {
+        var toBound = BaseTypes.BigNum.FromBigInt(BigInteger.One << toWidth);  // 1 << toWidth
+        if (e.asBigNum <= toBound) {
+          return BplBvLiteralExpr(r.tok, e.asBigNum, toType.AsBitVectorType);
+        }
+      }
+    }
+    return FunctionCall(tok, "nat_to_bv" + toWidth, BplBvType(toWidth), r);
+  }
+
+  /// <summary>
+  /// Emit checks that "expr" (which may or may not be a value of type "expr.Type"!) is a value of type "toType".
+  /// </summary>
+  void CheckResultToBeInType(IOrigin tok, Expression expr, Type toType, Variables locals, BoogieStmtListBuilder builder, ExpressionTranslator etran, string errorMsgPrefix = "") {
+    Contract.Requires(tok != null);
+    Contract.Requires(expr != null);
+    Contract.Requires(toType != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(errorMsgPrefix != null);
+
+    var toTypeFamily = toType.NormalizeToAncestorType();
+    var fromType = expr.Type;
+    var fromTypeFamily = expr.Type.NormalizeToAncestorType();
+
+    // Lazily create a local variable "o" to hold the value of the from-expression
+    Bpl.IdentifierExpr o = null;
+    void PutSourceIntoLocal() {
+      if (o == null) {
+        var oType = fromType.IsCharType ? Type.Int : fromType;
+        var oVar = locals.GetOrAdd(new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, CurrentIdGenerator.FreshId("newtype$check#"), TrType(oType))));
+        o = new Bpl.IdentifierExpr(tok, oVar);
+        var rhs = etran.TrExpr(expr);
+        if (fromType.IsCharType) {
+          rhs = FunctionCall(expr.Origin, "char#ToInt", Bpl.Type.Int, rhs);
+        }
+        builder.Add(Bpl.Cmd.SimpleAssign(tok, o, rhs));
+      }
+    }
+
+    Contract.Assert(options.Get(CommonOptionBag.GeneralTraits) != CommonOptionBag.GeneralTraitsOptions.Legacy ||
+                    fromType.IsRefType == toType.IsRefType ||
+                    (fromType.IsTypeParameter && toType.IsTraitType));
+    if (toType.IsRefType) {
+      PutSourceIntoLocal();
+      CheckSubrange(tok, o, fromType, toType, expr, builder, errorMsgPrefix);
+      return;
+    } else if (fromType.IsTraitType) {
+      PutSourceIntoLocal();
+      CheckSubrange(tok, o, fromType, toType, expr, builder, errorMsgPrefix);
+      return;
+    }
+
+    if (fromType.IsNumericBased(Type.NumericPersuasion.Real) && !toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+      // this operation is well-formed only if the real-based number represents an integer
+      //   assert Real(Int(o)) == o;
+      PutSourceIntoLocal();
+      Bpl.Expr from = FunctionCall(tok, BuiltinFunction.RealToInt, null, o);
+      Bpl.Expr e = FunctionCall(tok, BuiltinFunction.IntToReal, null, from);
+      e = Bpl.Expr.Binary(tok, Bpl.BinaryOperator.Opcode.Eq, e, o);
+      builder.Add(Assert(tok, e, new IsInteger(expr, errorMsgPrefix), builder.Context));
+    }
+
+    if (fromType.IsBigOrdinalType && !toType.IsBigOrdinalType) {
+      PutSourceIntoLocal();
+      Bpl.Expr boundsCheck = FunctionCall(tok, "ORD#IsNat", Bpl.Type.Bool, o);
+      builder.Add(Assert(tok, boundsCheck, new ConversionIsNatural(errorMsgPrefix, expr), builder.Context));
+    }
+
+    if (toTypeFamily.IsBitVectorType) {
+      var toWidth = toTypeFamily.AsBitVectorType.Width;
+      var toBound = BaseTypes.BigNum.FromBigInt(BigInteger.One << toWidth);  // 1 << toWidth
+      Bpl.Expr boundsCheck = null;
+      var dafnyBound = new BinaryExpr(expr.Origin, BinaryExpr.Opcode.LeftShift, Expression.CreateIntLiteral(expr.Origin, 1), Expression.CreateIntLiteral(expr.Origin, toWidth));
+      Expression dafnyBoundsCheck = null;
+      if (fromTypeFamily.IsBitVectorType) {
+        var fromWidth = fromTypeFamily.AsBitVectorType.Width;
+        if (toWidth < fromWidth) {
+          // Check "expr < (1 << toWidth)" in type "fromType" (note that "1 << toWidth" is indeed a value in "fromType")
+          PutSourceIntoLocal();
+          var bound = BplBvLiteralExpr(tok, toBound, fromTypeFamily.AsBitVectorType);
+          boundsCheck = FunctionCall(expr.Origin, "lt_bv" + fromWidth, Bpl.Type.Bool, o, bound);
+          dafnyBoundsCheck = new BinaryExpr(expr.Origin, BinaryExpr.Opcode.And,
+            new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Le, new LiteralExpr(expr.Origin, 0), expr),
+            new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Lt, expr, dafnyBound)
+        );
+        }
+      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Int) || fromTypeFamily.IsCharType) {
+        // Check "expr < (1 << toWidth)" in type "int"
+        PutSourceIntoLocal();
+        var bound = Bpl.Expr.Literal(toBound);
+        boundsCheck = BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(0), o), Bpl.Expr.Lt(o, bound));
+        dafnyBoundsCheck = Expression.CreateAnd(
+          Expression.CreateLess(Expression.CreateIntLiteral(expr.Origin, 0), expr),
+          Expression.CreateAtMost(expr, dafnyBound));
+      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        // Check "Int(expr) < (1 << toWidth)" in type "int"
+        PutSourceIntoLocal();
+        var bound = Bpl.Expr.Literal(toBound);
+        var oi = FunctionCall(tok, BuiltinFunction.RealToInt, null, o);
+        boundsCheck = BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(0), oi), Bpl.Expr.Lt(oi, bound));
+        var intExpr = new ExprDotName(expr.Origin, expr, new Name("Floor"), null);
+        dafnyBoundsCheck = new BinaryExpr(expr.Origin, BinaryExpr.Opcode.And,
+          new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Le, new LiteralExpr(expr.Origin, 0), intExpr),
+          new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Lt, intExpr, dafnyBound)
+        );
+      } else if (fromType.IsBigOrdinalType) {
+        var bound = Bpl.Expr.Literal(toBound);
+        var oi = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, o);
+        boundsCheck = Bpl.Expr.Lt(oi, bound);
+        var intExpr = new ExprDotName(expr.Origin, expr, new Name("Offset"), null);
+        dafnyBoundsCheck = new BinaryExpr(expr.Origin, BinaryExpr.Opcode.And,
+          new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Le, new LiteralExpr(expr.Origin, 0), intExpr),
+          new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Lt, intExpr, dafnyBound)
+        );
+      }
+
+      if (boundsCheck != null) {
+        builder.Add(Assert(tok, boundsCheck, new ConversionFit("value", toType, dafnyBoundsCheck, errorMsgPrefix), builder.Context));
+      }
+
+    } else if (toType.IsCharType) {
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        PutSourceIntoLocal();
+        var boundsCheck = FunctionCall(Token.NoToken, BuiltinFunction.IsChar, null, o);
+        var dafnyBoundsCheck = Utils.MakeCharBoundsCheck(options, expr);
+        builder.Add(Assert(tok, boundsCheck, new ConversionFit("value", toType, dafnyBoundsCheck, errorMsgPrefix), builder.Context));
+      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        PutSourceIntoLocal();
+        var oi = FunctionCall(tok, BuiltinFunction.RealToInt, null, o);
+        var boundsCheck = FunctionCall(Token.NoToken, BuiltinFunction.IsChar, null, oi);
+        Expression intExpr = new ExprDotName(expr.Origin, expr, new Name("Floor"), null);
+        var dafnyBoundsCheck = Utils.MakeCharBoundsCheck(options, intExpr);
+        builder.Add(Assert(tok, boundsCheck, new ConversionFit("real value", toType, dafnyBoundsCheck, errorMsgPrefix), builder.Context));
+      } else if (fromType.IsBitVectorType) {
+        PutSourceIntoLocal();
+        var fromWidth = fromType.AsBitVectorType.Width;
+        var toWidth = 16;
+        if (toWidth < fromWidth) {
+          // Check "expr < (1 << toWidth)" in type "fromType" (note that "1 << toWidth" is indeed a value in "fromType")
+          PutSourceIntoLocal();
+          var toBound = BaseTypes.BigNum.FromBigInt(BigInteger.One << toWidth); // 1 << toWidth
+          var bound = BplBvLiteralExpr(tok, toBound, fromType.AsBitVectorType);
+          var boundsCheck = FunctionCall(expr.Origin, "lt_bv" + fromWidth, Bpl.Type.Bool, o, bound);
+          var dafnyBound = new BinaryExpr(expr.Origin, BinaryExpr.Opcode.LeftShift, Expression.CreateIntLiteral(expr.Origin, 1), Expression.CreateIntLiteral(expr.Origin, toWidth));
+          var dafnyBoundsCheck = new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Lt, expr, dafnyBound);
+          builder.Add(Assert(tok, boundsCheck, new ConversionFit("bit-vector value", toType, dafnyBoundsCheck, errorMsgPrefix), builder.Context));
+        }
+      } else if (fromType.IsBigOrdinalType) {
+        PutSourceIntoLocal();
+        var oi = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, o);
+        int toWidth = 16;
+        var toBound = BaseTypes.BigNum.FromBigInt(BigInteger.One << toWidth); // 1 << toWidth
+        var bound = Bpl.Expr.Literal(toBound);
+        var boundsCheck = Bpl.Expr.Lt(oi, bound);
+        var dafnyBound = new BinaryExpr(expr.Origin, BinaryExpr.Opcode.LeftShift, Expression.CreateIntLiteral(expr.Origin, 1), Expression.CreateIntLiteral(expr.Origin, toWidth));
+        var offset = new ExprDotName(expr.Origin, expr, new Name("Offset"), null);
+        var dafnyBoundsCheck = new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Lt, offset, dafnyBound);
+        builder.Add(Assert(tok, boundsCheck, new ConversionFit("ORDINAL value", toType, dafnyBoundsCheck, errorMsgPrefix), builder.Context));
+      }
+
+    } else if (toType.IsBigOrdinalType) {
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Int)) {
+        PutSourceIntoLocal();
+        Bpl.Expr boundsCheck = Bpl.Expr.Le(Bpl.Expr.Literal(0), o);
+        var desc = new ConversionPositive("integer", toType, expr, errorMsgPrefix);
+        builder.Add(Assert(tok, boundsCheck, desc, builder.Context));
+      }
+      if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
+        PutSourceIntoLocal();
+        var oi = FunctionCall(tok, BuiltinFunction.RealToInt, null, o);
+        Bpl.Expr boundsCheck = Bpl.Expr.Le(Bpl.Expr.Literal(0), oi);
+        var intExpr = new ExprDotName(expr.Origin, expr, new Name("Floor"), null);
+        var desc = new ConversionPositive("real", toType, intExpr, errorMsgPrefix);
+        builder.Add(Assert(tok, boundsCheck, desc, builder.Context));
+      }
+
+    } else if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
+      // already checked that BigOrdinal or real inputs are integral
+    } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
+      // already checked that BigOrdinal is integral
+    }
+
+    if (toType.NormalizeExpandKeepConstraints().AsRedirectingType != null) {
+      PutSourceIntoLocal();
+      Bpl.Expr be;
+      if (fromType.IsNumericBased() || fromTypeFamily.IsBitVectorType) {
+        be = ConvertExpression(expr.Origin, o, fromType, toType);
+      } else if (fromType.IsCharType) {
+        be = ConvertExpression(expr.Origin, o, Dafny.Type.Int, toType);
+      } else if (fromType.IsBigOrdinalType) {
+        be = FunctionCall(expr.Origin, "ORD#Offset", Bpl.Type.Int, o);
+        be = ConvertExpression(expr.Origin, be, Dafny.Type.Int, toType);
+      } else {
+        be = o;
+      }
+      CheckResultToBeInType_Aux(tok, new BoogieWrapper(be, toTypeFamily), expr, toType.NormalizeExpandKeepConstraints(), builder, etran, errorMsgPrefix);
+    }
+  }
+
+  void CheckResultToBeInType_Aux(IOrigin tok, Expression boogieExpr, Expression origExpr, Type toType, BoogieStmtListBuilder builder, ExpressionTranslator etran, string errorMsgPrefix) {
+    Contract.Requires(tok != null);
+    Contract.Requires(boogieExpr != null);
+    Contract.Requires(origExpr != null);
+    Contract.Requires(toType != null && toType.AsRedirectingType != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(errorMsgPrefix != null);
+    // First, check constraints of base types
+    var udt = (UserDefinedType)toType;
+    var rdt = (RedirectingTypeDecl)udt.ResolvedClass;
+    Type baseType;
+    string kind;
+    if (rdt is SubsetTypeDecl) {
+      baseType = ((SubsetTypeDecl)rdt).RhsWithArgument(udt.TypeArgs);
+      kind = "subset type";
+    } else if (rdt is NewtypeDecl) {
+      baseType = ((NewtypeDecl)rdt).BaseType;
+      kind = "newtype";
+    } else {
+      baseType = ((TypeSynonymDecl)rdt).RhsWithArgument(udt.TypeArgs);
+      kind = "type synonym";
+    }
+
+    if (baseType.AsRedirectingType != null) {
+      CheckResultToBeInType_Aux(tok, boogieExpr, origExpr, baseType, builder, etran, errorMsgPrefix);
+    }
+    // Check any constraint defined in 'dd'
+    if (rdt.Var != null) {
+      // TODO: use TrSplitExpr
+      var typeMap = TypeParameter.SubstitutionMap(rdt.TypeArgs, udt.TypeArgs);
+      var dafnyConstraint = Substitute(rdt.Constraint, null, new() { { rdt.Var, origExpr } }, typeMap);
+      var boogieConstraint = Substitute(rdt.Constraint, null, new() { { rdt.Var, boogieExpr } }, typeMap);
+
+      var canCall = etran.CanCallAssumption(boogieConstraint);
+      var constraint = etran.TrExpr(boogieConstraint);
+      builder.Add(Assert(tok, BplImp(canCall, constraint), new ConversionSatisfiesConstraints(errorMsgPrefix, kind, rdt.Name, dafnyConstraint), builder.Context));
+    }
+  }
+
+
+  void AddWellformednessCheck(RedirectingTypeDecl decl) {
+    Contract.Requires(decl != null);
+    Contract.Requires(sink != null && Predef != null);
+    Contract.Requires(currentModule == null && codeContext == null && IsAllocContext == null);
+    Contract.Ensures(currentModule == null && codeContext == null && IsAllocContext == null);
+
+    proofDependencies.SetCurrentDefinition(MethodVerboseName(decl.FullDafnyName, MethodTranslationKind.SpecWellformedness), null);
+
+    if (!InVerificationScope(decl)) {
+      // Checked in other file
+      return;
+    }
+
+    currentModule = decl.Module;
+    codeContext = new CallableWrapper(decl, true);
+    var etran = new ExpressionTranslator(this, Predef, decl.Tok, null);
+
+    // parameters of the procedure
+    var inParams = MkTyParamFormals(decl.TypeArgs, true);
+    Type baseType;
+    Bpl.Expr whereClause;
+    if (decl.Var != null) {
+      baseType = decl.Var.Type;
+      Bpl.Type varType = TrType(baseType);
+      whereClause = GetWhereClause(decl.Var.Origin, new Bpl.IdentifierExpr(decl.Var.Origin, decl.Var.AssignUniqueName(decl.IdGenerator), varType), baseType, etran, NOALLOC);
+      // Do NOT use a where-clause in this declaration, because that would spoil the witness checking.
+      inParams.Add(new Bpl.Formal(decl.Var.Origin, new Bpl.TypedIdent(decl.Var.Origin, decl.Var.AssignUniqueName(decl.IdGenerator), varType), true));
+    } else {
+      baseType = ((NewtypeDecl)decl).BaseType;
+      whereClause = null;
+    }
+
+    // the procedure itself
+    var req = new List<Bpl.Requires>();
+    // modifies $Heap
+    var mod = new List<Bpl.IdentifierExpr> {
+        etran.HeapCastToIdentifierExpr,
+      };
+    var name = MethodName(decl, MethodTranslationKind.SpecWellformedness);
+    var proc = new Bpl.Procedure(decl.Tok, name, new List<Bpl.TypeVariable>(),
+      inParams, new List<Variable>(),
+      false, req, mod, new List<Bpl.Ensures>(), etran.TrAttributes(decl.Attributes, null));
+    AddVerboseNameAttribute(proc, decl.FullDafnyName, MethodTranslationKind.SpecWellformedness);
+    sink.AddTopLevelDeclaration(proc);
+
+    // TODO: Can a checksum be inserted here?
+
+    Contract.Assert(proc.InParams.Count == inParams.Count);
+    // Changed the next line to strip from inParams instead of proc.InParams
+    // They should be the same, but hence the added contract
+    var implInParams = Bpl.Formal.StripWhereClauses(inParams);
+    var locals = new Variables();
+    var context = new BodyTranslationContext(false);
+    var builder = new BoogieStmtListBuilder(this, options, context);
+    builder.Add(new CommentCmd(string.Format("AddWellformednessCheck for {0} {1}", decl.WhatKind, decl)));
+    builder.AddCaptureState(decl.Tok, false, "initial state");
+    IsAllocContext = new IsAllocContext(options, true);
+
+    DefineFrame(decl.Tok, etran.ReadsFrame(decl.Tok), new List<FrameExpression>(), builder, locals, null);
+
+    // some initialization stuff;  // This is collected in builderInitializationArea
+    // define frame;
+    // if (*) {
+    //   // The following is collected in constraintCheckBuilder:
+    //   assume the where-clause for the bound variable
+    //   check constraint is well-formed;
+    //   assume constraint;
+    //   do reads checks;
+    // } else {
+    //   // The following is collected in witnessCheckBuilder:
+    //   check witness;
+    // }
+
+    // check well-formedness of the constraint (including termination, and delayed reads checks)
+    var builderInitializationArea = CheckConstraintWellformedness(decl, context, whereClause, etran, locals, builder);
+
+    // Check that the type is inhabited.
+    // Note, the possible witness in this check should be coordinated with the compiler, so the compiler knows how to do the initialization
+    Expression witnessExpr = null;
+    var witnessCheckBuilder = new BoogieStmtListBuilder(this, options, context);
+    witnessCheckBuilder.Add(new Bpl.CommentCmd($"check well-formedness of {decl.WhatKind} witness, and that it satisfies the constraint"));
+    string witnessString = null;
+    if (decl.Witness != null) {
+      // check well-formedness of the witness expression (including termination, and reads checks)
+      var ghostCodeContext = codeContext;
+      codeContext = decl.WitnessKind == SubsetTypeDecl.WKind.Compiled ? new CallableWrapper(decl, false) : ghostCodeContext;
+      CheckWellformedWithResult(decl.Witness, new WFOptions(null, true), locals, witnessCheckBuilder, etran,
+        (returnBuilder, result) => {
+          // check that the witness is assignable to the type of the given bound variable
+          if (decl is SubsetTypeDecl) {
+            // Note, for new-types, this has already been checked by CheckWellformed.
+            CheckResultToBeInType(result.Origin, result, decl.Var.Type, locals, returnBuilder, etran);
+          }
+
+          // check that the witness is assignable to the type of the given bound variable
+          CheckResultToBeInType(decl.Witness.Origin, decl.Witness, baseType, locals, witnessCheckBuilder, etran);
+          // check that the witness expression checks out
+          witnessExpr = decl.Constraint != null ? Substitute(decl.Constraint, decl.Var, decl.Witness) : null;
+          if (witnessExpr != null) {
+            witnessExpr.SetOrigin(result.Origin);
+            var desc = new WitnessCheck(witnessString, witnessExpr);
+            SplitAndAssertExpression(returnBuilder, witnessExpr, etran, context, desc);
+          }
+        });
+      codeContext = ghostCodeContext;
+    } else if (decl.WitnessKind == SubsetTypeDecl.WKind.CompiledZero) {
+      var witness = Zero(decl.Tok, baseType);
+      if (witness == null) {
+        witnessString = "";
+        witnessCheckBuilder.Add(Assert(decl.Tok, Bpl.Expr.False, new WitnessCheck(witnessString), builder.Context));
+      } else {
+        // before trying 0 as a witness, check that 0 can be assigned to baseType
+        witnessString = Printer.ExprToString(options, witness);
+        CheckResultToBeInType(decl.Tok, witness, baseType, locals, witnessCheckBuilder, etran, $"trying witness {witnessString}: ");
+        witnessExpr = decl.Constraint != null ? Substitute(decl.Constraint, decl.Var, witness) : null;
+        if (witnessExpr != null) {
+          witnessExpr.SetOrigin(decl.Tok);
+          var desc = new WitnessCheck(witnessString, witnessExpr);
+          SplitAndAssertExpression(witnessCheckBuilder, witnessExpr, etran, context, desc);
+        }
+      }
+    }
+    PathAsideBlock(decl.Origin, witnessCheckBuilder, builder);
+
+    var s0 = builderInitializationArea.Collect(decl.Tok);
+    var s1 = builder.Collect(decl.Tok);
+    var implBody = new StmtList(new List<BigBlock>(s0.BigBlocks.Concat(s1.BigBlocks)), decl.Tok);
+
+    if (EmitImplementation(decl.Attributes)) {
+      // emit the impl only when there are proof obligations.
+      QKeyValue kv = etran.TrAttributes(decl.Attributes, null);
+
+      AddImplementationWithAttributes(GetToken(decl), proc, implInParams, new List<Variable>(), locals, implBody, kv);
+    }
+
+    // TODO: Should a checksum be inserted here?
+
+    Contract.Assert(currentModule == decl.Module);
+    Contract.Assert(CodeContextWrapper.Unwrap(codeContext) == decl);
+    IsAllocContext = null;
+    Reset();
+  }
+
+  private void SplitAndAssertExpression(BoogieStmtListBuilder witnessCheckBuilder, Expression witnessExpr,
+    ExpressionTranslator etran, BodyTranslationContext context, WitnessCheck desc) {
+    witnessCheckBuilder.Add(new Bpl.AssumeCmd(witnessExpr.Origin, etran.CanCallAssumption(witnessExpr)));
+
+    var ss = TrSplitExpr(context, witnessExpr, etran, true, out var splitHappened);
+    if (!splitHappened) {
+      witnessCheckBuilder.Add(Assert(witnessExpr.Origin, etran.TrExpr(witnessExpr), desc, context));
+    } else {
+      foreach (var split in ss) {
+        if (split.IsChecked) {
+          var tok = witnessExpr.Origin is { } t ? new NestedOrigin(t, split.Tok) : witnessExpr.Origin;
+          witnessCheckBuilder.Add(AssertAndForget(witnessCheckBuilder.Context, tok, split.E, desc));
+        }
+      }
+    }
+  }
+
+  private BoogieStmtListBuilder CheckConstraintWellformedness(RedirectingTypeDecl decl, BodyTranslationContext context,
+    Bpl.Expr whereClause, ExpressionTranslator etran, Variables locals, BoogieStmtListBuilder builder) {
+    var constraintCheckBuilder = new BoogieStmtListBuilder(this, options, context);
+    var builderInitializationArea = new BoogieStmtListBuilder(this, options, context);
+    if (decl.Constraint == null) {
+      constraintCheckBuilder.Add(new Bpl.CommentCmd($"well-formedness of {decl.WhatKind} constraint is trivial"));
+    } else {
+      constraintCheckBuilder.Add(new Bpl.CommentCmd($"check well-formedness of {decl.WhatKind} constraint"));
+      if (whereClause != null) {
+        constraintCheckBuilder.Add(new Bpl.AssumeCmd(decl.Tok, whereClause));
+      }
+      var delayer = new ReadsCheckDelayer(etran, null, locals, builderInitializationArea, constraintCheckBuilder);
+      delayer.DoWithDelayedReadsChecks(false, wfo => {
+        CheckWellformedAndAssume(decl.Constraint, wfo, locals, constraintCheckBuilder, etran, "predicate subtype constraint");
+      });
+    }
+
+    PathAsideBlock(decl.Origin, constraintCheckBuilder, builder);
+    return builderInitializationArea;
+  }
+}
diff --git a/Source/DafnyCore/Verifier/BoogieGenerator.cs b/Source/DafnyCore/Verifier/BoogieGenerator.cs
new file mode 100644
index 00000000000..cf7b1fbf860
--- /dev/null
+++ b/Source/DafnyCore/Verifier/BoogieGenerator.cs
@@ -0,0 +1,4864 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using Bpl = Microsoft.Boogie;
+using BplParser = Microsoft.Boogie.Parser;
+using System.Text;
+using System.Threading;
+using DafnyCore;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using DafnyCore.Verifier;
+using JetBrains.Annotations;
+using Microsoft.Dafny;
+using Microsoft.Dafny.Triggers;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+using static Microsoft.Dafny.GenericErrors;
+
+namespace Microsoft.Dafny {
+  public partial class BoogieGenerator {
+    private DafnyOptions options;
+    public DafnyOptions Options => options;
+    public const string NameSeparator = "$$";
+    public const string CallPrefix = "Call";
+    private HashSet<Uri> filesWhereOnlyMembersAreVerified = new();
+
+    ErrorReporter reporter;
+    // TODO(wuestholz): Enable this once Dafny's recommended Z3 version includes changeset 0592e765744497a089c42021990740f303901e67.
+    public bool UseOptimizationInZ3 { get; set; }
+
+    void AddOtherDefinition(Bpl.Declaration declaration, Axiom axiom) {
+      sink.AddTopLevelDeclaration(axiom);
+
+      // Axioms that have triggers and bound variables do not need to be inside
+      // uses clauses. Putting such axioms inside uses clauses weakens pruning
+      // when the trigger contains more than one function or constant symbol combined.
+      // The early return would happen whenever axiom is of the form:
+      // axiom (<quantifier> <(optionally) type variables> <at least one dummy variable> :: { ... } ...
+      if (axiom.Expr is Microsoft.Boogie.QuantifierExpr qe && qe.Dummies != null && qe.Dummies.Any() &&
+          qe.Triggers != null && qe.Triggers.Tr != null && qe.Triggers.Tr.Any()) {
+        return;
+      }
+
+      switch (declaration) {
+        case null:
+          break;
+        case Boogie.Function boogieFunction:
+          boogieFunction.OtherDefinitionAxioms.Add(axiom);
+          break;
+        case Boogie.Constant boogieConstant:
+          boogieConstant.DefinitionAxioms.Add(axiom);
+          break;
+        default: throw new ArgumentException("Declaration must be a function or constant");
+      }
+    }
+
+    public class TranslatorFlags {
+      public TranslatorFlags(DafnyOptions options) {
+        InsertChecksums = 0 < options.VerifySnapshots;
+      }
+
+      public bool InsertChecksums { get; init; }
+      public string UniqueIdPrefix = null;
+      public bool ReportRanges = false;
+    }
+
+    [NotDelayed]
+    public BoogieGenerator(ErrorReporter reporter, ProofDependencyManager depManager, TranslatorFlags flags = null) {
+      this.options = reporter.Options;
+      this.flags = new TranslatorFlags(options);
+      this.proofDependencies = depManager;
+      this.reporter = reporter;
+      if (flags == null) {
+        flags = new TranslatorFlags(options) {
+          ReportRanges = options.Get(Snippets.ShowSnippets)
+        };
+      }
+      this.flags = flags;
+      Bpl.Program boogieProgram = ReadPrelude();
+      if (boogieProgram != null) {
+        sink = boogieProgram;
+        foreach (var function in boogieProgram.TopLevelDeclarations.OfType<Bpl.Function>()) {
+          function.AlwaysRevealed = true;
+        }
+        Predef = FindPredefinedDecls(boogieProgram);
+      }
+    }
+
+    public void SetReporter(ErrorReporter reporter) {
+      this.reporter = reporter;
+    }
+
+    private void EstablishModuleScope(ModuleDefinition systemModule, ModuleDefinition m) {
+      currentScope = new VisibilityScope();
+      verificationScope = new VisibilityScope();
+
+      currentScope.Augment(m.VisibilityScope);
+      verificationScope.Augment(currentScope);
+
+      currentScope.Augment(systemModule.VisibilityScope);
+      foreach (var decl in m.TopLevelDecls) {
+        if (decl is ModuleDecl && !(decl is ModuleExportDecl)) {
+          var mdecl = (ModuleDecl)decl;
+          currentScope.Augment(mdecl.AccessibleSignature().VisibilityScope);
+        }
+      }
+
+    }
+
+    // translation state
+    readonly Dictionary<TopLevelDecl/*!*/, Bpl.Constant/*!*/>/*!*/ classes = new Dictionary<TopLevelDecl/*!*/, Bpl.Constant/*!*/>();
+    readonly Dictionary<TopLevelDecl, string>/*!*/ classConstants = new Dictionary<TopLevelDecl, string>();
+    readonly Dictionary<Function, string> functionHandles = new Dictionary<Function, string>();
+    readonly List<FuelConstant> functionFuel = new List<FuelConstant>();
+    readonly Dictionary<Function, Bpl.Expr> functionReveals = new();
+    readonly Dictionary<Field/*!*/, Bpl.Constant/*!*/>/*!*/ fields = new Dictionary<Field/*!*/, Bpl.Constant/*!*/>();
+    readonly Dictionary<Field/*!*/, Bpl.Function/*!*/>/*!*/ fieldFunctions = new Dictionary<Field/*!*/, Bpl.Function/*!*/>();
+    readonly Dictionary<string, Bpl.Constant> fieldConstants = new Dictionary<string, Constant>();
+    readonly Dictionary<string, Bpl.Constant> tytagConstants = new Dictionary<string, Constant>();
+
+    private ProofDependencyManager proofDependencies;
+
+    // optimizing translation
+    readonly ISet<MemberDecl> referencedMembers = new HashSet<MemberDecl>();
+
+    public void AddReferencedMember(MemberDecl m) {
+      if (m is Method && !InVerificationScope(m)) {
+        referencedMembers.Add(m);
+      }
+    }
+
+    FuelContext fuelContext = null;
+    public IsAllocContext IsAllocContext { get; set; } = null;
+    Program program;
+
+    [ContractInvariantMethod]
+    void ObjectInvariant() {
+      Contract.Invariant(cce.NonNullDictionaryAndValues(classes));
+      Contract.Invariant(cce.NonNullDictionaryAndValues(fields));
+      Contract.Invariant(cce.NonNullDictionaryAndValues(fieldFunctions));
+      Contract.Invariant(codeContext == null || codeContext.EnclosingModule == currentModule);
+    }
+
+    [System.Diagnostics.Contracts.Pure]
+    bool VisibleInScope(Declaration d) {
+      Contract.Requires(d != null);
+      if (d is ClassLikeDecl { NonNullTypeDecl: { } nntd }) {
+        // "provides" is recorded in the non-null type declaration, not the class
+        return nntd.IsVisibleInScope(currentScope);
+      }
+      return d.IsVisibleInScope(currentScope);
+    }
+
+    [System.Diagnostics.Contracts.Pure]
+    bool VisibleInScope(Type t) {
+      if (t is UserDefinedType udt && udt.ResolvedClass != null && !t.IsTypeParameter) {
+        return VisibleInScope(udt.ResolvedClass);
+      }
+      return true;
+    }
+
+    [System.Diagnostics.Contracts.Pure]
+    bool RevealedInScope(Declaration d) {
+      Contract.Requires(d != null);
+      return d.IsRevealedInScope(currentScope);
+    }
+
+    [System.Diagnostics.Contracts.Pure]
+    bool RevealedInScope(RevealableTypeDecl d) {
+      Contract.Requires(d != null);
+      return RevealedInScope(d.AsTopLevelDecl);
+    }
+
+    [System.Diagnostics.Contracts.Pure]
+    bool InVerificationScope(Declaration d) {
+      Contract.Requires(d != null);
+      if (!d.ShouldVerify(program.Compilation)) {
+        return false;
+      }
+
+      if (d.IsVisibleInScope(verificationScope)) {
+        Contract.Assert(d.IsRevealedInScope(verificationScope));
+        if (d is MemberDecl m && m.EnclosingClass.EnclosingModuleDefinition is { IsFacade: true }) {
+          return false;
+        }
+
+        return true;
+      }
+      return false;
+    }
+
+    [System.Diagnostics.Contracts.Pure]
+    bool InVerificationScope(RedirectingTypeDecl d) {
+      Contract.Requires(d != null);
+      Contract.Requires(d is Declaration);
+      return InVerificationScope((Declaration)d);
+    }
+
+    private Bpl.Program sink;
+    private VisibilityScope currentScope;
+    private VisibilityScope verificationScope;
+    private Dictionary<Declaration, Bpl.Function> declarationMapping = new();
+
+    public PredefinedDecls Predef { get; }
+
+    private TranslatorFlags flags;
+    private bool InsertChecksums { get { return flags.InsertChecksums; } }
+    private string UniqueIdPrefix { get { return flags.UniqueIdPrefix; } }
+
+    public class PredefinedDecls {
+      public readonly Bpl.Type CharType;
+      public readonly Bpl.Type RefType;
+      public readonly Bpl.Type BoxType;
+      public readonly Bpl.Type SetType;
+      public readonly Bpl.Type ISetType;
+      public readonly Bpl.Type MultiSetType;
+      public readonly Bpl.Type SeqType;
+      public readonly Bpl.Type MapType;
+      public readonly Bpl.Type IMapType;
+      public Bpl.Type BigOrdinalType {
+        get { return BoxType; }
+      }
+      public readonly Bpl.Function ArrayLength;
+      public readonly Bpl.Function RealFloor;
+      public readonly Bpl.Function ORDINAL_IsLimit;
+      public readonly Bpl.Function ORDINAL_IsSucc;
+      public readonly Bpl.Function ORDINAL_Offset;
+      public readonly Bpl.Function ORDINAL_IsNat;
+      public readonly Bpl.Function MapDomain;
+      public readonly Bpl.Function IMapDomain;
+      public readonly Bpl.Function MapValues;
+      public readonly Bpl.Function IMapValues;
+      public readonly Bpl.Function MapItems;
+      public readonly Bpl.Function IMapItems;
+      public readonly Bpl.Function ObjectTypeConstructor;
+      public readonly Bpl.Function Tuple2TypeConstructor;
+      public readonly Bpl.Function Tuple2Destructors0;
+      public readonly Bpl.Function Tuple2Destructors1;
+      public readonly Bpl.Function Tuple2Constructor;
+      private readonly Bpl.TypeCtorDecl seqTypeCtor;
+      public readonly Bpl.Type Bv0Type;
+      readonly Bpl.TypeCtorDecl fieldName;
+      public readonly Bpl.Type HeapType;
+      public readonly string HeapVarName;
+      public readonly Bpl.Type ClassNameType;
+      public readonly Bpl.Type NameFamilyType;
+      public readonly Bpl.Type DatatypeType;
+      public readonly Bpl.Type HandleType;
+      public readonly Bpl.Type LayerType;
+      public readonly Bpl.Type DtCtorId;
+      public readonly Bpl.Type Ty;
+      public readonly Bpl.Type TyTag;
+      public readonly Bpl.Type TyTagFamily;
+      public readonly Bpl.Expr Null;
+      public readonly Bpl.Constant AllocField;
+      [ContractInvariantMethod]
+      void ObjectInvariant() {
+        Contract.Invariant(CharType != null);
+        Contract.Invariant(RefType != null);
+        Contract.Invariant(BoxType != null);
+        Contract.Invariant(SetType != null);
+        Contract.Invariant(ISetType != null);
+        Contract.Invariant(MultiSetType != null);
+        Contract.Invariant(SeqType != null);
+        Contract.Invariant(MapType != null);
+        Contract.Invariant(IMapType != null);
+        Contract.Invariant(ArrayLength != null);
+        Contract.Invariant(RealFloor != null);
+        Contract.Invariant(ORDINAL_IsLimit != null);
+        Contract.Invariant(ORDINAL_IsSucc != null);
+        Contract.Invariant(ORDINAL_Offset != null);
+        Contract.Invariant(ORDINAL_IsNat != null);
+        Contract.Invariant(MapDomain != null);
+        Contract.Invariant(IMapDomain != null);
+        Contract.Invariant(MapValues != null);
+        Contract.Invariant(IMapValues != null);
+        Contract.Invariant(MapItems != null);
+        Contract.Invariant(IMapItems != null);
+        Contract.Invariant(Tuple2Destructors0 != null);
+        Contract.Invariant(Tuple2Destructors1 != null);
+        Contract.Invariant(Tuple2Constructor != null);
+        Contract.Invariant(seqTypeCtor != null);
+        Contract.Invariant(fieldName != null);
+        Contract.Invariant(HeapVarName != null);
+        Contract.Invariant(ClassNameType != null);
+        Contract.Invariant(NameFamilyType != null);
+        Contract.Invariant(DatatypeType != null);
+        Contract.Invariant(HandleType != null);
+        Contract.Invariant(LayerType != null);
+        Contract.Invariant(DtCtorId != null);
+        Contract.Invariant(Ty != null);
+        Contract.Invariant(TyTag != null);
+        Contract.Invariant(TyTagFamily != null);
+        Contract.Invariant(Null != null);
+        Contract.Invariant(AllocField != null);
+      }
+
+      public Bpl.Type FieldName(Bpl.IToken tok) {
+        Contract.Requires(tok != null);
+        Contract.Ensures(Contract.Result<Bpl.Type>() != null);
+
+        return new Bpl.CtorType(tok, fieldName, new List<Bpl.Type> { });
+      }
+
+      public Bpl.IdentifierExpr Alloc(Bpl.IToken tok) {
+        Contract.Requires(tok != null);
+        Contract.Ensures(Contract.Result<Bpl.IdentifierExpr>() != null);
+
+        return new Bpl.IdentifierExpr(tok, AllocField);
+      }
+
+      public PredefinedDecls(Bpl.TypeCtorDecl charType, Bpl.TypeCtorDecl refType, Bpl.TypeCtorDecl boxType,
+                             Bpl.TypeCtorDecl setTypeCtor, Bpl.TypeSynonymDecl isetTypeCtor, Bpl.TypeCtorDecl multiSetTypeCtor,
+                             Bpl.TypeCtorDecl mapTypeCtor, Bpl.TypeCtorDecl imapTypeCtor,
+                             Bpl.Function arrayLength, Bpl.Function realFloor,
+                             Bpl.Function ORD_isLimit, Bpl.Function ORD_isSucc, Bpl.Function ORD_offset, Bpl.Function ORD_isNat,
+                             Bpl.Function mapDomain, Bpl.Function imapDomain,
+                             Bpl.Function mapValues, Bpl.Function imapValues, Bpl.Function mapItems, Bpl.Function imapItems,
+                             Bpl.Function objectTypeConstructor,
+                             Bpl.Function tuple2Destructors0, Bpl.Function tuple2Destructors1, Bpl.Function tuple2Constructor, Bpl.Function tuple2TypeConstructor,
+                             Bpl.TypeCtorDecl seqTypeCtor, Bpl.TypeSynonymDecl bv0TypeDecl,
+                             Bpl.TypeCtorDecl fieldNameType, Bpl.TypeCtorDecl tyType, Bpl.TypeCtorDecl tyTagType, Bpl.TypeCtorDecl tyTagFamilyType,
+                             Bpl.GlobalVariable heap, Bpl.TypeCtorDecl classNameType, Bpl.TypeCtorDecl nameFamilyType,
+                             Bpl.TypeCtorDecl datatypeType, Bpl.TypeCtorDecl handleType, Bpl.TypeCtorDecl layerType, Bpl.TypeCtorDecl dtCtorId,
+                             Bpl.Constant allocField) {
+        #region Non-null preconditions on parameters
+        Contract.Requires(charType != null);
+        Contract.Requires(refType != null);
+        Contract.Requires(boxType != null);
+        Contract.Requires(setTypeCtor != null);
+        Contract.Requires(isetTypeCtor != null);
+        Contract.Requires(multiSetTypeCtor != null);
+        Contract.Requires(mapTypeCtor != null);
+        Contract.Requires(imapTypeCtor != null);
+        Contract.Requires(arrayLength != null);
+        Contract.Requires(realFloor != null);
+        Contract.Requires(ORD_isLimit != null);
+        Contract.Requires(ORD_isSucc != null);
+        Contract.Requires(ORD_offset != null);
+        Contract.Requires(ORD_isNat != null);
+        Contract.Requires(mapDomain != null);
+        Contract.Requires(imapDomain != null);
+        Contract.Requires(mapValues != null);
+        Contract.Requires(imapValues != null);
+        Contract.Requires(mapItems != null);
+        Contract.Requires(imapItems != null);
+        Contract.Requires(tuple2Destructors0 != null);
+        Contract.Requires(tuple2Destructors1 != null);
+        Contract.Requires(tuple2Constructor != null);
+        Contract.Requires(seqTypeCtor != null);
+        Contract.Requires(bv0TypeDecl != null);
+        Contract.Requires(fieldNameType != null);
+        Contract.Requires(heap != null);
+        Contract.Requires(classNameType != null);
+        Contract.Requires(datatypeType != null);
+        Contract.Requires(layerType != null);
+        Contract.Requires(dtCtorId != null);
+        Contract.Requires(allocField != null);
+        Contract.Requires(tyType != null);
+        Contract.Requires(tyTagType != null);
+        Contract.Requires(tyTagFamilyType != null);
+        #endregion
+
+        this.CharType = new Bpl.CtorType(Token.NoToken, charType, new List<Bpl.Type>());
+        Bpl.CtorType refT = new Bpl.CtorType(Token.NoToken, refType, new List<Bpl.Type>());
+        this.RefType = refT;
+        this.BoxType = new Bpl.CtorType(Token.NoToken, boxType, new List<Bpl.Type>());
+        this.SetType = new Bpl.CtorType(Token.NoToken, setTypeCtor, new List<Bpl.Type> { });
+        this.ISetType = new Bpl.TypeSynonymAnnotation(Token.NoToken, isetTypeCtor, new List<Bpl.Type> { });
+        this.MultiSetType = new Bpl.CtorType(Token.NoToken, multiSetTypeCtor, new List<Bpl.Type> { });
+        this.SeqType = new Bpl.CtorType(Token.NoToken, seqTypeCtor, new List<Bpl.Type> { });
+        this.MapType = new Bpl.CtorType(Token.NoToken, mapTypeCtor, new List<Bpl.Type> { });
+        this.IMapType = new Bpl.CtorType(Token.NoToken, imapTypeCtor, new List<Bpl.Type> { });
+        this.ArrayLength = arrayLength;
+        this.RealFloor = realFloor;
+        this.ORDINAL_IsLimit = ORD_isLimit;
+        this.ORDINAL_IsSucc = ORD_isSucc;
+        this.ORDINAL_Offset = ORD_offset;
+        this.ORDINAL_IsNat = ORD_isNat;
+        this.MapDomain = mapDomain;
+        this.IMapDomain = imapDomain;
+        this.MapValues = mapValues;
+        this.IMapValues = imapValues;
+        this.MapItems = mapItems;
+        this.IMapItems = imapItems;
+        this.ObjectTypeConstructor = objectTypeConstructor;
+        this.Tuple2Destructors0 = tuple2Destructors0;
+        this.Tuple2Destructors1 = tuple2Destructors1;
+        this.Tuple2Constructor = tuple2Constructor;
+        this.Tuple2TypeConstructor = tuple2TypeConstructor;
+        this.seqTypeCtor = seqTypeCtor;
+        this.Bv0Type = new Bpl.TypeSynonymAnnotation(Token.NoToken, bv0TypeDecl, new List<Bpl.Type>());
+        this.fieldName = fieldNameType;
+        this.HeapType = heap.TypedIdent.Type;
+        this.HeapVarName = heap.Name;
+        this.Ty = new Bpl.CtorType(Token.NoToken, tyType, new List<Bpl.Type>());
+        this.TyTag = new Bpl.CtorType(Token.NoToken, tyTagType, new List<Bpl.Type>());
+        this.TyTagFamily = new Bpl.CtorType(Token.NoToken, tyTagFamilyType, new List<Bpl.Type>());
+        this.ClassNameType = new Bpl.CtorType(Token.NoToken, classNameType, new List<Bpl.Type>());
+        this.NameFamilyType = new Bpl.CtorType(Token.NoToken, nameFamilyType, new List<Bpl.Type>());
+        this.DatatypeType = new Bpl.CtorType(Token.NoToken, datatypeType, new List<Bpl.Type>());
+        this.HandleType = new Bpl.CtorType(Token.NoToken, handleType, new List<Bpl.Type>());
+        this.LayerType = new Bpl.CtorType(Token.NoToken, layerType, new List<Bpl.Type>());
+        this.DtCtorId = new Bpl.CtorType(Token.NoToken, dtCtorId, new List<Bpl.Type>());
+        this.AllocField = allocField;
+        this.Null = new Bpl.IdentifierExpr(Token.NoToken, "null", refT);
+      }
+    }
+
+    PredefinedDecls FindPredefinedDecls(Bpl.Program prog) {
+      Contract.Requires(prog != null);
+      if (prog.Resolve(options) != 0) {
+        options.OutputWriter.WriteLine("Error: resolution errors encountered in Dafny prelude");
+        return null;
+      }
+
+      Bpl.TypeCtorDecl charType = null;
+      Bpl.TypeCtorDecl refType = null;
+      Bpl.TypeCtorDecl setTypeCtor = null;
+      Bpl.TypeSynonymDecl isetTypeCtor = null;
+      Bpl.TypeCtorDecl multiSetTypeCtor = null;
+      Bpl.Function arrayLength = null;
+      Bpl.Function realFloor = null;
+      Bpl.Function ORDINAL_isLimit = null;
+      Bpl.Function ORDINAL_isSucc = null;
+      Bpl.Function ORDINAL_offset = null;
+      Bpl.Function ORDINAL_isNat = null;
+      Bpl.Function mapDomain = null;
+      Bpl.Function imapDomain = null;
+      Bpl.Function mapValues = null;
+      Bpl.Function imapValues = null;
+      Bpl.Function mapItems = null;
+      Bpl.Function imapItems = null;
+      Bpl.Function objectTypeConstructor = null;
+      Bpl.Function tuple2TypeConstructor = null;
+      Bpl.Function tuple2Destructors0 = null;
+      Bpl.Function tuple2Destructors1 = null;
+      Bpl.Function tuple2Constructor = null;
+      Bpl.TypeCtorDecl seqTypeCtor = null;
+      Bpl.TypeCtorDecl fieldNameType = null;
+      Bpl.TypeCtorDecl classNameType = null;
+      Bpl.TypeSynonymDecl bv0TypeDecl = null;
+      Bpl.TypeCtorDecl tyType = null;
+      Bpl.TypeCtorDecl tyTagType = null;
+      Bpl.TypeCtorDecl tyTagFamilyType = null;
+      Bpl.TypeCtorDecl nameFamilyType = null;
+      Bpl.TypeCtorDecl datatypeType = null;
+      Bpl.TypeCtorDecl handleType = null;
+      Bpl.TypeCtorDecl layerType = null;
+      Bpl.TypeCtorDecl dtCtorId = null;
+      Bpl.TypeCtorDecl boxType = null;
+      Bpl.TypeCtorDecl mapTypeCtor = null;
+      Bpl.TypeCtorDecl imapTypeCtor = null;
+      Bpl.GlobalVariable heap = null;
+      Bpl.Constant allocField = null;
+      foreach (var d in prog.TopLevelDeclarations) {
+        if (d is Bpl.TypeCtorDecl) {
+          Bpl.TypeCtorDecl dt = (Bpl.TypeCtorDecl)d;
+          if (dt.Name == "Seq") {
+            seqTypeCtor = dt;
+          } else if (dt.Name == "Field") {
+            fieldNameType = dt;
+          } else if (dt.Name == "ClassName") {
+            classNameType = dt;
+          } else if (dt.Name == "Ty") {
+            tyType = dt;
+          } else if (dt.Name == "TyTag") {
+            tyTagType = dt;
+          } else if (dt.Name == "TyTagFamily") {
+            tyTagFamilyType = dt;
+          } else if (dt.Name == "DatatypeType") {
+            datatypeType = dt;
+          } else if (dt.Name == "HandleType") {
+            handleType = dt;
+          } else if (dt.Name == "LayerType") {
+            layerType = dt;
+          } else if (dt.Name == "DtCtorId") {
+            dtCtorId = dt;
+          } else if (dt.Name == "char") {
+            charType = dt;
+          } else if (dt.Name == "ref") {
+            refType = dt;
+          } else if (dt.Name == "NameFamily") {
+            nameFamilyType = dt;
+          } else if (dt.Name == "Box") {
+            boxType = dt;
+          } else if (dt.Name == "Set") {
+            setTypeCtor = dt;
+          } else if (dt.Name == "MultiSet") {
+            multiSetTypeCtor = dt;
+          } else if (dt.Name == "Map") {
+            mapTypeCtor = dt;
+          } else if (dt.Name == "IMap") {
+            imapTypeCtor = dt;
+          }
+        } else if (d is Bpl.TypeSynonymDecl) {
+          Bpl.TypeSynonymDecl dt = (Bpl.TypeSynonymDecl)d;
+          if (dt.Name == "ISet") {
+            isetTypeCtor = dt;
+          } else if (dt.Name == "Bv0") {
+            bv0TypeDecl = dt;
+          }
+        } else if (d is Bpl.Constant) {
+          Bpl.Constant c = (Bpl.Constant)d;
+          if (c.Name == "alloc") {
+            allocField = c;
+          }
+        } else if (d is Bpl.GlobalVariable) {
+          Bpl.GlobalVariable v = (Bpl.GlobalVariable)d;
+          if (v.Name == "$Heap") {
+            heap = v;
+          }
+        } else if (d is Bpl.Function) {
+          var f = (Bpl.Function)d;
+          if (f.Name == "_System.array.Length") {
+            arrayLength = f;
+          } else if (f.Name == "_System.real.Floor") {
+            realFloor = f;
+          } else if (f.Name == "ORD#IsLimit") {
+            ORDINAL_isLimit = f;
+          } else if (f.Name == "ORD#IsSucc") {
+            ORDINAL_isSucc = f;
+          } else if (f.Name == "ORD#Offset") {
+            ORDINAL_offset = f;
+          } else if (f.Name == "ORD#IsNat") {
+            ORDINAL_isNat = f;
+          } else if (f.Name == "Map#Domain") {
+            mapDomain = f;
+          } else if (f.Name == "IMap#Domain") {
+            imapDomain = f;
+          } else if (f.Name == "Map#Values") {
+            mapValues = f;
+          } else if (f.Name == "IMap#Values") {
+            imapValues = f;
+          } else if (f.Name == "Map#Items") {
+            mapItems = f;
+          } else if (f.Name == "IMap#Items") {
+            imapItems = f;
+          } else if (f.Name == "_System.Tuple2._0") {
+            tuple2Destructors0 = f;
+          } else if (f.Name == "_System.Tuple2._1") {
+            tuple2Destructors1 = f;
+          } else if (f.Name == "#_System._tuple#2._#Make2") {
+            tuple2Constructor = f;
+          } else if (f.Name == "Tclass._System.Tuple2") {
+            tuple2TypeConstructor = f;
+          } else if (f.Name == "Tclass._System.object?") {
+            objectTypeConstructor = f;
+          }
+        }
+      }
+      if (seqTypeCtor == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Seq");
+      } else if (setTypeCtor == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Set");
+      } else if (isetTypeCtor == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type ISet");
+      } else if (multiSetTypeCtor == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type MultiSet");
+      } else if (mapTypeCtor == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Map");
+      } else if (imapTypeCtor == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type IMap");
+      } else if (arrayLength == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function _System.array.Length");
+      } else if (realFloor == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function _System.real.Floor");
+      } else if (ORDINAL_isLimit == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function ORD#IsLimit");
+      } else if (ORDINAL_isSucc == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function ORD#IsSucc");
+      } else if (ORDINAL_offset == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function ORD#Offset");
+      } else if (ORDINAL_isNat == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function ORD#IsNat");
+      } else if (mapDomain == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function Map#Domain");
+      } else if (imapDomain == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function IMap#Domain");
+      } else if (mapValues == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function Map#Values");
+      } else if (imapValues == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function IMap#Values");
+      } else if (mapItems == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function Map#Items");
+      } else if (imapItems == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function IMap#Items");
+      } else if (tuple2Destructors0 == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function _System.Tuple2._0");
+      } else if (tuple2Destructors1 == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function _System.Tuple2._1");
+      } else if (tuple2Constructor == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function #_System._tuple#2._#Make2");
+      } else if (bv0TypeDecl == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Bv0");
+      } else if (fieldNameType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Field");
+      } else if (classNameType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type ClassName");
+      } else if (tyType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Ty");
+      } else if (tyTagType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type TyTag");
+      } else if (tyTagFamilyType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type TyTagFamily");
+      } else if (nameFamilyType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type NameFamily");
+      } else if (datatypeType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type DatatypeType");
+      } else if (handleType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type HandleType");
+      } else if (layerType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type LayerType");
+      } else if (dtCtorId == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type DtCtorId");
+      } else if (charType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type char");
+      } else if (refType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type ref");
+      } else if (boxType == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Box");
+      } else if (heap == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of $Heap");
+      } else if (allocField == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of constant alloc");
+      } else if (tuple2TypeConstructor == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of tuple2TypeConstructor");
+      } else if (objectTypeConstructor == null) {
+        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of objectTypeConstructor");
+      } else {
+        return new PredefinedDecls(charType, refType, boxType,
+                                   setTypeCtor, isetTypeCtor, multiSetTypeCtor,
+                                   mapTypeCtor, imapTypeCtor,
+                                   arrayLength, realFloor,
+                                   ORDINAL_isLimit, ORDINAL_isSucc, ORDINAL_offset, ORDINAL_isNat,
+                                   mapDomain, imapDomain,
+                                   mapValues, imapValues, mapItems, imapItems,
+                                   objectTypeConstructor,
+                                   tuple2Destructors0, tuple2Destructors1, tuple2Constructor, tuple2TypeConstructor,
+                                   seqTypeCtor, bv0TypeDecl,
+                                   fieldNameType, tyType, tyTagType, tyTagFamilyType,
+                                   heap, classNameType, nameFamilyType,
+                                   datatypeType, handleType, layerType, dtCtorId,
+                                   allocField);
+      }
+      return null;
+    }
+
+    Bpl.Program ReadPrelude() {
+      string preludePath = options.DafnyPrelude;
+      if (preludePath == null) {
+        //using (System.IO.Stream stream = cce.NonNull( System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("DafnyPrelude.bpl")) // Use this once Spec#/VSIP supports designating a non-.resx project item as an embedded resource
+        string codebase = cce.NonNull(System.IO.Path.GetDirectoryName(cce.NonNull(System.Reflection.Assembly.GetExecutingAssembly().Location)));
+        preludePath = System.IO.Path.Combine(codebase, "DafnyPrelude.bpl");
+      }
+
+      var defines = new List<string>();
+      if (6 <= options.ArithMode) {
+        defines.Add("ARITH_DISTR");
+      }
+      if (8 <= options.ArithMode) {
+        defines.Add("ARITH_MUL_DIV_MOD");
+      }
+      if (9 <= options.ArithMode) {
+        defines.Add("ARITH_MUL_SIGN");
+      }
+      if (10 <= options.ArithMode) {
+        defines.Add("ARITH_MUL_COMM");
+        defines.Add("ARITH_MUL_ASSOC");
+      }
+      if (options.Get(CommonOptionBag.UnicodeCharacters)) {
+        defines.Add("UNICODE_CHAR");
+      }
+      int errorCount = BplParser.Parse(preludePath, defines, out var prelude);
+      if (prelude == null || errorCount > 0) {
+        return null;
+      } else {
+        return prelude;
+      }
+    }
+
+    public Bpl.IdentifierExpr TrVar(IOrigin tok, IVariable var) {
+      Contract.Requires(var != null);
+      Contract.Requires(tok != null);
+      Contract.Ensures(Contract.Result<Bpl.IdentifierExpr>() != null);
+      return new Bpl.IdentifierExpr(tok, var.AssignUniqueName(CurrentDeclaration.IdGenerator), TrType(var.Type));
+    }
+
+    public Bpl.Program DoTranslation(Program p, ModuleDefinition forModule) {
+      if (sink == null) {
+        return new Bpl.Program();
+      }
+
+      foreach (var plugin in p.Options.Plugins) {
+        foreach (var rewriter in plugin.GetRewriters(p.Reporter)) {
+          rewriter.PreVerify(forModule);
+        }
+      }
+
+      program = p;
+      this.forModule = forModule;
+      triggersCollector = new TriggersCollector(new Dictionary<Expression, HashSet<OldExpr>>(), options, forModule);
+      Type.EnableScopes();
+
+      EstablishModuleScope(p.SystemModuleManager.SystemModule, forModule);
+      Type.PushScope(this.currentScope);
+
+      foreach (var w in program.SystemModuleManager.Bitwidths) {
+        // type axioms
+        AddBitvectorTypeAxioms(w);
+        // bitwise operations
+        AddBitvectorFunction(w, "and_bv", "bvand");
+        AddBitvectorFunction(w, "or_bv", "bvor");
+        AddBitvectorFunction(w, "xor_bv", "bvxor");  // Z3 supports this, but it seems not to be in the SMT-LIB 2 standard
+        AddBitvectorFunction(w, "not_bv", "bvnot", false);
+        // arithmetic operations
+        AddBitvectorFunction(w, "add_bv", "bvadd");
+        AddBitvectorFunction(w, "sub_bv", "bvsub");  // Z3 supports this, but it seems not to be in the SMT-LIB 2 standard
+        AddBitvectorFunction(w, "mul_bv", "bvmul");
+        AddBitvectorFunction(w, "div_bv", "bvudiv");
+        AddBitvectorFunction(w, "mod_bv", "bvurem");
+        // comparisons
+        AddBitvectorFunction(w, "lt_bv", "bvult", true, Bpl.Type.Bool, false);
+        AddBitvectorFunction(w, "le_bv", "bvule", true, Bpl.Type.Bool, true);  // Z3 supports this, but it seems not to be in the SMT-LIB 2 standard
+        AddBitvectorFunction(w, "ge_bv", "bvuge", true, Bpl.Type.Bool, true);  // Z3 supports this, but it seems not to be in the SMT-LIB 2 standard
+        AddBitvectorFunction(w, "gt_bv", "bvugt", true, Bpl.Type.Bool, false);  // Z3 supports this, but it seems not to be in the SMT-LIB 2 standard
+        // shifts
+        AddBitvectorShiftFunction(w, "LeftShift_bv", "bvshl");
+        AddBitvectorShiftFunction(w, "RightShift_bv", "bvlshr");
+        // rotates
+        AddBitvectorShiftFunction(w, "LeftRotate_bv", "ext_rotate_left");
+        AddBitvectorShiftFunction(w, "RightRotate_bv", "ext_rotate_right");
+        // conversion functions
+        AddBitvectorNatConversionFunction(w);
+      }
+
+      foreach (TopLevelDecl d in program.SystemModuleManager.SystemModule.TopLevelDecls) {
+        CurrentDeclaration = d;
+        if (d is AbstractTypeDecl abstractType) {
+          GetOrCreateTypeConstructor(abstractType);
+          AddClassMembers(abstractType, true, true);
+        } else if (d is NewtypeDecl) {
+          var dd = (NewtypeDecl)d;
+          AddTypeDecl(dd);
+          AddClassMembers(dd, true, true);
+        } else if (d is SubsetTypeDecl) {
+          AddTypeDecl((SubsetTypeDecl)d);
+        } else if (d is TypeSynonymDecl) {
+          // do nothing, just bypass type synonyms in the translation
+        } else if (d is DatatypeDecl) {
+          var dd = (DatatypeDecl)d;
+          AddDatatype(dd);
+          AddClassMembers(dd, true, true);
+        } else if (d is ArrowTypeDecl) {
+          var ad = (ArrowTypeDecl)d;
+          GetClassTyCon(ad);
+          AddArrowTypeAxioms(ad);
+        } else if (d is ClassLikeDecl) {
+          var cl = (ClassLikeDecl)d;
+          AddClassMembers(cl, true, true);
+          if (cl.NonNullTypeDecl != null) {
+            AddTypeDecl(cl.NonNullTypeDecl);
+          }
+        } else {
+          Contract.Assert(d is ValuetypeDecl);
+        }
+      }
+
+      ComputeFunctionFuel(); // compute which function needs fuel constants.
+
+      //translate us first
+      List<ModuleDefinition> mods = program.RawModules().ToList();
+      mods.Remove(forModule);
+      mods.Insert(0, forModule);
+
+      var visibleTopLevelDecls =
+        mods.SelectMany(m => m.TopLevelDecls.Where(VisibleInScope)).ToList();
+
+      foreach (var d in visibleTopLevelDecls) {
+        if (d is TopLevelDeclWithMembers memberContainer) {
+          foreach (var member in memberContainer.Members) {
+            if (Attributes.Contains(member.Attributes, "only")) {
+              filesWhereOnlyMembersAreVerified.Add(member.Origin.Uri);
+            }
+          }
+        }
+      }
+
+      foreach (TopLevelDecl d in visibleTopLevelDecls) {
+        CurrentDeclaration = d;
+        if (d is AbstractTypeDecl abstractType) {
+          AddClassMembers(abstractType, true, true);
+        } else if (d is ModuleDecl) {
+          // submodules have already been added as a top level module, ignore this.
+        } else if (d is RevealableTypeDecl revealableTypeDecl) {
+          AddRevealableTypeDecl(revealableTypeDecl);
+        } else {
+          Contract.Assert(false);
+        }
+      }
+
+      filesWhereOnlyMembersAreVerified = new();
+
+      AddTraitParentAxioms();
+
+      foreach (var c in tytagConstants.Values) {
+        sink.AddTopLevelDeclaration(c);
+      }
+      foreach (var c in fieldConstants.Values) {
+        sink.AddTopLevelDeclaration(c);
+      }
+
+      if (InsertChecksums) {
+        foreach (var impl in sink.Implementations) {
+          if (impl.FindAttribute("checksum") == null) {
+            impl.AddAttribute("checksum", "stable");
+          }
+        }
+        foreach (var func in sink.Functions) {
+          if (func.FindAttribute("checksum") == null) {
+            func.AddAttribute("checksum", "stable");
+          }
+        }
+      }
+
+      Type.PopScope(this.currentScope);
+      Type.DisableScopes();
+      return sink;
+
+    }
+
+    // Don't verify modules which only contain other modules
+    public static bool ShouldVerifyModule(Program program, ModuleDefinition m) {
+      if (!m.ShouldVerify(program.Compilation)) {
+        return false;
+      }
+
+      foreach (var top in m.TopLevelDecls) {
+        if (top is DefaultClassDecl) {
+          if (((DefaultClassDecl)top).Members.Count > 0) {
+            return true;
+          }
+        } else if (!(top is ModuleDecl)) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    public static IEnumerable<ModuleDefinition> VerifiableModules(Program p) {
+      return p.RawModules().Where(m => ShouldVerifyModule(p, m));
+    }
+
+    public static IEnumerable<Tuple<string, Bpl.Program>> Translate(Program p, ErrorReporter reporter, TranslatorFlags flags = null) {
+      Contract.Requires(p != null);
+      Contract.Requires(p.ModuleSigs.Count > 0);
+
+      Type.ResetScopes();
+
+      foreach (ModuleDefinition outerModule in VerifiableModules(p)) {
+        var translator = new BoogieGenerator(reporter, p.ProofDependencyManager, flags);
+
+        if (translator.sink == null || translator.sink == null) {
+          // something went wrong during construction, which reads the prelude; an error has
+          // already been printed, so just return an empty program here (which is non-null)
+          yield return new Tuple<string, Bpl.Program>(outerModule.SanitizedName, new Bpl.Program());
+        }
+        yield return new Tuple<string, Bpl.Program>(outerModule.SanitizedName, translator.DoTranslation(p, outerModule));
+      }
+    }
+
+    /// <summary>
+    /// Declare and add to the sink a Boogie function named "namePrefix + w".
+    /// If "binary", then the function takes two arguments; otherwise, it takes one.  Arguments have the type
+    /// corresponding to the Dafny type for w-width bitvectors.
+    /// The function's result type is the same as the argument type, unless "resultType" is non-null, in which
+    /// case the function's result type is "resultType".
+    /// For w > 0:
+    ///     Attach an attribute {:bvbuiltin smtFunctionName}.
+    /// For w == 0:
+    ///     Attach an attribute {:inline} and add a .Body to the function.
+    ///     If "resultType" is null, then use 0 as the body; otherwise, use "bodyForBv0" as the body (which
+    ///     assumes "resultType" is actually Bpl.Type.Bool).
+    /// </summary>
+    private void AddBitvectorFunction(int w, string namePrefix, string smtFunctionName, bool binary = true, Bpl.Type resultType = null, bool bodyForBv0 = false) {
+      Contract.Requires(0 <= w);
+      Contract.Requires(namePrefix != null);
+      Contract.Requires(smtFunctionName != null);
+      var tok = Token.NoToken;
+      var t = BplBvType(w);
+      List<Bpl.Variable> args;
+      if (binary) {
+        var a0 = BplFormalVar(null, t, true);
+        var a1 = BplFormalVar(null, t, true);
+        args = new List<Variable>() { a0, a1 };
+      } else {
+        var a0 = BplFormalVar(null, t, true);
+        args = new List<Variable>() { a0 };
+      }
+      var r = BplFormalVar(null, resultType ?? t, false);
+      Bpl.QKeyValue attr;
+      if (w == 0) {
+        attr = InlineAttribute(tok);
+      } else {
+        attr = new Bpl.QKeyValue(tok, "bvbuiltin", new List<object>() { smtFunctionName }, null);
+      }
+      var func = new Bpl.Function(tok, namePrefix + w, new List<TypeVariable>(), args, r, null, attr);
+      if (w == 0) {
+        if (resultType != null) {
+          func.Body = Bpl.Expr.Literal(bodyForBv0);
+        } else {
+          func.Body = BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, w);
+        }
+      }
+      sink.AddTopLevelDeclaration(func);
+    }
+
+    private void AddBitvectorShiftFunction(int w, string namePrefix, string smtFunctionName) {
+      Contract.Requires(0 <= w);
+      Contract.Requires(namePrefix != null);
+      Contract.Requires(smtFunctionName != null);
+      var tok = Token.NoToken;
+      var t = BplBvType(w);
+      List<Bpl.Variable> args;
+      var a0 = BplFormalVar(null, t, true);
+      var a1 = BplFormalVar(null, t, true);
+      args = new List<Variable>() { a0, a1 };
+      var r = BplFormalVar(null, t, false);
+      Bpl.QKeyValue attr;
+      if (w == 0) {
+        attr = InlineAttribute(tok);
+      } else {
+        attr = new Bpl.QKeyValue(tok, "bvbuiltin", new List<object>() { smtFunctionName }, null);
+      }
+      var func = new Bpl.Function(tok, namePrefix + w, new List<TypeVariable>(), args, r, null, attr);
+      if (w == 0) {
+        func.Body = BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, w);
+      }
+      sink.AddTopLevelDeclaration(func);
+    }
+
+    private void AddBitvectorNatConversionFunction(int w) {
+      Contract.Requires(0 <= w);
+      var tok = Token.NoToken;
+      var bv = BplBvType(w);
+      Bpl.QKeyValue attr;
+      Bpl.Function func;
+
+      // function {:bvbuiltin "(_ int2bv 67)"} nat_to_bv67(int) : bv67;
+      // OR:
+      // function {:inline} nat_to_bv0(int) : Bv0 { ZERO }
+      if (w == 0) {
+        attr = InlineAttribute(tok);
+      } else {
+        var smt_int2bv = string.Format("(_ int2bv {0})", w);
+        attr = new Bpl.QKeyValue(tok, "bvbuiltin", new List<object>() { smt_int2bv }, null);  // SMT-LIB 2 calls this function nat2bv, but Z3 apparently calls it int2bv
+      }
+      func = new Bpl.Function(tok, "nat_to_bv" + w, new List<TypeVariable>(),
+        new List<Variable>() { BplFormalVar(null, Bpl.Type.Int, true) }, BplFormalVar(null, bv, false),
+        null, attr);
+      if (w == 0) {
+        func.Body = BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, w);
+      }
+      sink.AddTopLevelDeclaration(func);
+
+      if (w == 0) {
+        // function {:inline} nat_from_bv0_smt(Bv0) : int { 0 }
+        attr = InlineAttribute(tok);
+        func = new Bpl.Function(tok, "nat_from_bv" + w, new List<TypeVariable>(),
+          new List<Variable>() { BplFormalVar(null, bv, true) }, BplFormalVar(null, Bpl.Type.Int, false),
+          null, attr);
+        func.Body = Bpl.Expr.Literal(0);
+        sink.AddTopLevelDeclaration(func);
+      } else {
+        // function {:bvbuiltin "bv2int"} smt_nat_from_bv67(bv67) : int;
+        attr = new Bpl.QKeyValue(tok, "bvbuiltin", new List<object>() { "bv2int" }, null);  // SMT-LIB 2 calls this function bv2nat, but Z3 apparently calls it bv2int
+        var smtFunc = new Bpl.Function(tok, "smt_nat_from_bv" + w, new List<TypeVariable>(),
+          new List<Variable>() { BplFormalVar(null, bv, true) }, BplFormalVar(null, Bpl.Type.Int, false),
+          null, attr);
+        sink.AddTopLevelDeclaration(smtFunc);
+        // function nat_from_bv67(bv67) : int;
+        func = new Bpl.Function(tok, "nat_from_bv" + w, new List<TypeVariable>(),
+          new List<Variable>() { BplFormalVar(null, bv, true) }, BplFormalVar(null, Bpl.Type.Int, false),
+          null, null);
+        sink.AddTopLevelDeclaration(func);
+        // axiom (forall b: bv67 :: { nat_from_bv67(b) }
+        //          0 <= nat_from_bv67(b) && nat_from_bv67(b) < 0x8_0000_0000_0000_0000 &&
+        //          nat_from_bv67(b) == smt_nat_from_bv67(b));
+        var bVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "b", BplBvType(w)));
+        var b = new Bpl.IdentifierExpr(tok, bVar);
+        var bv2nat = FunctionCall(tok, "nat_from_bv" + w, Bpl.Type.Int, b);
+        var smt_bv2nat = FunctionCall(tok, "smt_nat_from_bv" + w, Bpl.Type.Int, b);
+        var body = BplAnd(BplAnd(
+          Bpl.Expr.Le(Bpl.Expr.Literal(0), bv2nat),
+          Bpl.Expr.Lt(bv2nat, Bpl.Expr.Literal(BaseTypes.BigNum.FromBigInt(BigInteger.One << w)))),
+          Bpl.Expr.Eq(bv2nat, smt_bv2nat));
+        var ax = new Bpl.ForallExpr(tok, new List<Variable>() { bVar }, BplTrigger(bv2nat), body);
+        sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, ax));
+      }
+    }
+
+    private void ComputeFunctionFuel() {
+      foreach (ModuleDefinition m in program.RawModules()) {
+        foreach (TopLevelDecl d in m.TopLevelDecls) {
+          if (d is TopLevelDeclWithMembers) {
+            var c = (TopLevelDeclWithMembers)d;
+            foreach (MemberDecl member in c.Members) {
+              if (member is Function && RevealedInScope(member)) {
+                Function f = (Function)member;
+                // declare the fuel constant
+                if (f.IsFueled) {
+                  // const BaseFuel_FunctionA : LayerType
+                  Bpl.Constant baseFuel = new Bpl.Constant(f.Origin, new Bpl.TypedIdent(f.Origin, "BaseFuel_" + f.FullName, Predef.LayerType), false);
+                  sink.AddTopLevelDeclaration(baseFuel);
+                  Bpl.Expr baseFuel_expr = new Bpl.IdentifierExpr(f.Origin, baseFuel);
+                  // const StartFuel_FunctionA : LayerType
+                  Bpl.Constant startFuel = new Bpl.Constant(f.Origin, new Bpl.TypedIdent(f.Origin, "StartFuel_" + f.FullName, Predef.LayerType), false);
+                  sink.AddTopLevelDeclaration(startFuel);
+                  Bpl.Expr startFuel_expr = new Bpl.IdentifierExpr(f.Origin, startFuel);
+                  // const StartFuelAssert_FunctionA : LayerType
+                  Bpl.Constant startFuelAssert = new Bpl.Constant(f.Origin, new Bpl.TypedIdent(f.Origin, "StartFuelAssert_" + f.FullName, Predef.LayerType), false);
+                  sink.AddTopLevelDeclaration(startFuelAssert);
+                  Bpl.Expr startFuelAssert_expr = new Bpl.IdentifierExpr(f.Origin, startFuelAssert);
+                  this.functionFuel.Add(new FuelConstant(f, baseFuel_expr, startFuel_expr, startFuelAssert_expr));
+                }
+
+                if (f.IsOpaque || f.IsMadeImplicitlyOpaque(options)) {
+                  CreateRevealableConstant(f);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    private void CreateRevealableConstant(Function f) {
+      if (!this.functionReveals.ContainsKey(f)) {
+        // const reveal_FunctionA : bool
+        Bpl.Constant revealTrigger =
+          new Bpl.Constant(f.Origin, new Bpl.TypedIdent(f.Origin, HideRevealStmt.RevealLemmaPrefix + f.FullName, Bpl.Type.Bool), false);
+        sink.AddTopLevelDeclaration(revealTrigger);
+        Bpl.Expr revealTrigger_expr = new Bpl.IdentifierExpr(f.Origin, revealTrigger);
+        this.functionReveals[f] = revealTrigger_expr;
+
+        // If this is an override, generate:
+        //     axiom reveal_FunctionA ==> reveal_FunctionParent;
+        if (f.OverriddenFunction is { IsOpaque: true }) {
+          var revealParent = GetRevealConstant(f.OverriddenFunction);
+          var implication = BplImp(revealTrigger_expr, revealParent);
+          AddOtherDefinition(revealTrigger, new Axiom(f.Origin, implication));
+        }
+      }
+    }
+
+    /// <summary>
+    /// For every revealed type (class or trait) C<T> that extends a trait J<G(T)>, add:
+    ///   axiom (forall T: Ty, $o: ref ::
+    ///       { $Is($o, C(T)) }
+    ///       $o != null && $Is($o, C(T)) ==> $Is($o, J(G(T)));
+    ///   axiom (forall T: Ty, $Heap: Heap, $o: ref ::
+    ///       { $IsAlloc($o, C(T), $Heap) }
+    ///       $o != null && $IsAlloc($o, C(T), $Heap) ==> $IsAlloc($o, J(G(T)), $Heap);
+    /// Note:
+    ///   It is sometimes useful also to be able to determine the _absence_ of trait-parent relationships.
+    ///   For example, suppose one can tell from the looking at the "extends" clauses in a program
+    ///   that a class C does not (directly or transitively) extend a trait T. Then, given variables c and t
+    ///   of static types C and T, respectively, the verifier should be able to infer c != t. This is not
+    ///   possible with the axioms below. It will require an axiomatization of _all_ possible parent traits, not just
+    ///   saying that some are possible. When this becomes needed, the axiomatization will need to be
+    ///   embellished.
+    /// </summary>
+    private void AddTraitParentAxioms() {
+      foreach (ModuleDefinition m in program.RawModules()) {
+        foreach (var c in m.TopLevelDecls.OfType<TopLevelDeclWithMembers>().Where(RevealedInScope)) {
+          foreach (var parentTypeInExtendsClause in c.ParentTraits) {
+            var childType = UserDefinedType.FromTopLevelDecl(c.Origin, c);
+            var parentType = (UserDefinedType)parentTypeInExtendsClause;
+            if (parentType.IsRefType) {
+              // use the nullable versions of the types
+              Contract.Assert(childType.IsRefType);
+              parentType = UserDefinedType.CreateNullableType(parentType);
+            } else {
+              childType = UserDefinedType.CreateNonNullTypeIfReferenceType(childType);
+            }
+
+            var bvarsTypeParameters = MkTyParamBinders(GetTypeParams(c), out _);
+
+            // axioms with "$IsBox(...) ==> ..." and "$IsAllocBox(...) ==> ..."
+            TypeBoundAxiomExpressions(c.Origin, bvarsTypeParameters, childType, new List<Type>() { parentType },
+              out var isBoxExpr, out var isAllocBoxExpr);
+
+            var heapVar = BplBoundVar("$heap", Predef.HeapType, out var heap);
+            var oVar = BplBoundVar("$o", TrType(childType), out var o);
+
+            var oj = BoxifyForTraitParent(c.Origin, o, ((UserDefinedType)parentType.NormalizeExpand()).ResolvedClass, childType);
+
+            // axiom (forall T: Ty, $o: ref ::
+            //     { $Is($o, C(T)) }
+            //     $Is($o, C(T)) ==> $Is($o, J(G(T)));
+            var isC = MkIs(o, childType);
+            var isJ = MkIs(oj, parentType);
+            var bvs = new List<Bpl.Variable>();
+            bvs.AddRange(bvarsTypeParameters);
+            bvs.Add(oVar);
+            var tr = BplTrigger(isC);
+            var body = BplImp(isC, isJ);
+
+            sink.AddTopLevelDeclaration(new Bpl.Axiom(c.Origin, new Bpl.ForallExpr(c.Origin, bvs, tr, body),
+              $"type axiom for trait parent: {childType.Name} extends {parentType}"));
+            sink.AddTopLevelDeclaration(new Bpl.Axiom(c.Origin, isBoxExpr));
+
+            // axiom (forall T: Ty, $Heap: Heap, $o: ref ::
+            //     { $IsAlloc($o, C(T), $Heap) }
+            //     $IsAlloc($o, C(T), $Heap) ==> $IsAlloc($o, J(G(T)), $Heap);
+            var isAllocC = MkIsAlloc(o, childType, heap);
+            var isAllocJ = MkIsAlloc(oj, parentType, heap);
+            bvs = new List<Bpl.Variable>();
+            bvs.AddRange(bvarsTypeParameters);
+            bvs.Add(oVar);
+            bvs.Add(heapVar);
+            tr = BplTrigger(isAllocC);
+            body = BplImp(isAllocC, isAllocJ);
+            sink.AddTopLevelDeclaration(new Bpl.Axiom(c.Origin, new Bpl.ForallExpr(c.Origin, bvs, tr, body),
+              $"allocation axiom for trait parent: {childType.Name} extends {parentType}"));
+            sink.AddTopLevelDeclaration(new Bpl.Axiom(c.Origin, isAllocBoxExpr));
+          }
+        }
+      }
+    }
+
+    /// <summary>
+    /// Construct an expression denoting the equality of e0 and e1, taking advantage of
+    /// any available extensional equality based on the given Dafny type.
+    /// </summary>
+    public Expr TypeSpecificEqual(IOrigin tok, Dafny.Type type, Expr e0, Expr e1) {
+      Contract.Requires(tok != null);
+      Contract.Requires(type != null);
+      Contract.Requires(e0 != null);
+      Contract.Requires(e1 != null);
+
+      type = type.NormalizeToAncestorType();
+      if (type.AsSetType != null) {
+        var finite = type.NormalizeToAncestorType().AsSetType.Finite;
+        return FunctionCall(tok, finite ? BuiltinFunction.SetEqual : BuiltinFunction.ISetEqual, null, e0, e1);
+      } else if (type.AsMapType != null) {
+        var finite = type.AsMapType.Finite;
+        return FunctionCall(tok, finite ? BuiltinFunction.MapEqual : BuiltinFunction.IMapEqual, null, e0, e1);
+      } else if (type.AsMultiSetType != null) {
+        return FunctionCall(tok, BuiltinFunction.MultiSetEqual, null, e0, e1);
+      } else if (type.AsSeqType != null) {
+        return FunctionCall(tok, BuiltinFunction.SeqEqual, null, e0, e1);
+      } else if (type.IsIndDatatype) {
+        return FunctionCall(tok, type.AsIndDatatype.FullSanitizedName + "#Equal", Bpl.Type.Bool, e0, e1);
+      } else {
+        return Bpl.Expr.Eq(e0, e1);
+      }
+    }
+
+    /// <summary>
+    /// Return a sequence of expressions whose conjunction denotes a memberwise equality of "dt".  Recursive
+    /// codatatype equalities are written in one of the following ways:
+    /// If the codatatype equality is on a type outside the SCC of "dt", then resort to ordinary equality.
+    /// Else if the k==null, then:
+    ///   Depending on "limited", use the #2, #1, or #0 (limited) form of codatatype equality.
+    /// Else:
+    ///   Depending on "limited", use the #2, #1, or #0 (limited) form of prefix equality, passing "k"
+    ///   as the first argument.
+    /// </summary>
+    IEnumerable<Bpl.Expr> CoPrefixEquality(IOrigin tok, CoDatatypeDecl dt, List<Type> largs, List<Type> rargs, Bpl.Expr k, Bpl.Expr l, Bpl.Expr A, Bpl.Expr B, bool conjuncts = false) {
+      Contract.Requires(tok != null);
+      Contract.Requires(dt != null);
+      Contract.Requires(A != null);
+      Contract.Requires(B != null);
+      Contract.Requires(l != null);
+      Contract.Requires(Predef != null);
+      var etran = new ExpressionTranslator(this, Predef, dt.Origin, dt);
+      // For example, for possibly infinite lists:
+      //     codatatype SList<T> = Nil | SCons(head: T, tail: SList<T>);
+      // produce with conjucts=false (default):
+      //   (A.Nil? && B.Nil?) ||
+      //   (A.Cons? && B.Cons? && A.head == B.head && Equal(k, A.tail, B.tail))
+      //
+      // with conjuncts=true:
+      //   (A.Nil? ==> B.Nil?) &&
+      //   (A.Cons? ==> (B.Cons? && A.head == B.head && Equal(k, A.tail, B.tail)))
+
+      Dictionary<TypeParameter, Type> lsu = Util.Dict(GetTypeParams(dt), largs);
+      Dictionary<TypeParameter, Type> rsu = Util.Dict(GetTypeParams(dt), rargs);
+
+      foreach (var ctor in dt.Ctors) {
+        Bpl.Expr aq = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(GetReadonlyField(ctor.QueryField)), new List<Bpl.Expr> { A });
+        Bpl.Expr bq = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(GetReadonlyField(ctor.QueryField)), new List<Bpl.Expr> { B });
+        Bpl.Expr chunk = Bpl.Expr.True;
+        foreach (var dtor in ctor.Destructors) {  // note, ctor.Destructors has a field for every constructor parameter, whether or not the parameter was named in the source
+          var a = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(GetReadonlyField(dtor)), new List<Bpl.Expr> { A });
+          var b = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(GetReadonlyField(dtor)), new List<Bpl.Expr> { B });
+          var ty = dtor.Type;
+          Bpl.Expr q;
+          var codecl = ty.AsCoDatatype;
+          if (codecl != null && codecl.SscRepr == dt.SscRepr) {
+            var lexprs = Map(ty.TypeArgs, tt => tt.Subst(lsu));
+            var rexprs = Map(ty.TypeArgs, tt => tt.Subst(rsu));
+            q = CoEqualCall(codecl, lexprs, rexprs, k, l, a, b);
+          } else {
+            // ordinary equality; let the usual translation machinery figure out the translation
+            var tyA = ty.Subst(lsu);
+            var tyB = ty.Subst(rsu);
+            var aa = CondApplyUnbox(tok, a, ty, tyA);
+            var bb = CondApplyUnbox(tok, b, ty, tyB);
+            var equal = new BinaryExpr(tok, BinaryExpr.Opcode.Eq, new BoogieWrapper(aa, tyA), new BoogieWrapper(bb, tyB));
+            equal.ResolvedOp = ModuleResolver.ResolveOp(equal.Op, tyA, tyB);  // resolve here
+            equal.Type = Type.Bool;  // resolve here
+            q = etran.TrExpr(equal);
+          }
+          chunk = BplAnd(chunk, q);
+        }
+        if (conjuncts) {
+          yield return Bpl.Expr.Binary(new NestedOrigin(tok, ctor.Origin), BinaryOperator.Opcode.Imp, aq, BplAnd(bq, chunk));
+        } else {
+          yield return BplAnd(BplAnd(aq, bq), BplImp(BplAnd(aq, bq), chunk));
+        }
+      }
+    }
+
+    public Bpl.Expr LayerSucc(Bpl.Expr e, int amt = 1) {
+      if (amt == 0) {
+        return e;
+      } else if (amt > 0) {
+        return FunctionCall(e.tok, BuiltinFunction.LayerSucc, null, LayerSucc(e, amt - 1));
+      } else {
+        Contract.Assert(false);
+        return null;
+      }
+    }
+
+    // Makes a call to equality, if k is null, or otherwise prefix equality. For codatatypes.
+    Bpl.Expr CoEqualCall(CoDatatypeDecl codecl, List<Bpl.Expr> largs, List<Bpl.Expr> rargs, Bpl.Expr k, Bpl.Expr l, Bpl.Expr A, Bpl.Expr B, Bpl.IToken tok = null) {
+      Contract.Requires(codecl != null);
+      Contract.Requires(largs != null);
+      Contract.Requires(rargs != null);
+      Contract.Requires(l != null);
+      Contract.Requires(A != null);
+      Contract.Requires(B != null);
+      if (tok == null) {
+        tok = A.tok;
+      }
+      List<Bpl.Expr> args = Concat(largs, rargs);
+      if (k != null) {
+        args.Add(k);
+      }
+      args.AddRange(new List<Bpl.Expr> { l, A, B });
+      var fn = k == null ? CoEqualName(codecl) : CoPrefixName(codecl);
+      return FunctionCall(tok, fn, Bpl.Type.Bool, args);
+    }
+
+    // Same as above, but with Dafny-typed type-argument lists
+    Bpl.Expr CoEqualCall(CoDatatypeDecl codecl, List<Type> largs, List<Type> rargs, Bpl.Expr k, Bpl.Expr l, Bpl.Expr A, Bpl.Expr B, IOrigin tok = null) {
+      Contract.Requires(codecl != null);
+      Contract.Requires(largs != null);
+      Contract.Requires(rargs != null);
+      Contract.Requires(l != null);
+      Contract.Requires(A != null);
+      Contract.Requires(B != null);
+      return CoEqualCall(codecl, Map(largs, TypeToTy), Map(rargs, TypeToTy), k, l, A, B, tok);
+    }
+
+    static string CoEqualName(CoDatatypeDecl codecl) {
+      Contract.Requires(codecl != null);
+      return "$Eq#" + codecl.FullSanitizedName;
+    }
+
+    static string CoPrefixName(CoDatatypeDecl codecl) {
+      Contract.Requires(codecl != null);
+      return "$PrefixEq#" + codecl.FullSanitizedName;
+    }
+
+    void CreateBoundVariables<VT>(List<VT> formals, out List<Variable> bvs, out List<Bpl.Expr> args) where VT : IVariable {
+      Contract.Requires(formals != null);
+      Contract.Ensures(Contract.ValueAtReturn(out bvs).Count == Contract.ValueAtReturn(out args).Count);
+      Contract.Ensures(Contract.ValueAtReturn(out bvs) != null);
+      Contract.Ensures(cce.NonNullElements(Contract.ValueAtReturn(out args)));
+
+      var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator("a#");
+      bvs = new List<Variable>();
+      args = new List<Bpl.Expr>();
+      foreach (var arg in formals) {
+        Contract.Assert(arg != null);
+        var nm = varNameGen.FreshId(string.Format("#{0}#", bvs.Count));
+        Bpl.Variable bv = new Bpl.BoundVariable(arg.Origin, new Bpl.TypedIdent(arg.Origin, nm, TrType(arg.Type)));
+        bvs.Add(bv);
+        args.Add(new Bpl.IdentifierExpr(arg.Origin, bv));
+      }
+    }
+
+    // This one says that this is /directly/ allocated, not that its "children" are,
+    // i.e. h[x, alloc]
+    public Bpl.Expr IsAlloced(IOrigin tok, Bpl.Expr heapExpr, Bpl.Expr e) {
+      Contract.Requires(tok != null);
+      Contract.Requires(heapExpr != null);
+      Contract.Requires(e != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      return ApplyUnbox(tok, ReadHeap(tok, heapExpr, e, Predef.Alloc(tok)), Bpl.Type.Bool);
+    }
+
+    /// <summary>
+    /// Returns read(heap: Heap, r: ref, f: Field) : Box.
+    /// </summary>
+    public Bpl.Expr ReadHeap(IOrigin tok, Expr heap, Expr r, Expr f) {
+      Contract.Requires(tok != null);
+      Contract.Requires(heap != null);
+      Contract.Requires(r != null);
+      Contract.Requires(f != null);
+      Contract.Ensures(Contract.Result<Bpl.NAryExpr>() != null);
+
+      var res = new Bpl.NAryExpr(tok,
+        new Bpl.FunctionCall(new Bpl.IdentifierExpr(tok, "read", Predef.BoxType)),
+        new List<Bpl.Expr> { heap, r, f });
+      res.Type = Predef.BoxType;
+      return res;
+    }
+
+    public Bpl.NAryExpr ReadHeap(IOrigin tok, Expr heap, Expr r) {
+      Contract.Requires(tok != null);
+      Contract.Requires(heap != null);
+      Contract.Requires(r != null);
+      Contract.Ensures(Contract.Result<Bpl.NAryExpr>() != null);
+      return new Bpl.NAryExpr(tok, new Bpl.MapSelect(tok, 1), new List<Bpl.Expr> { heap, r });
+    }
+
+    /// <summary>
+    /// Returns update(h: Heap, r: ref, f: Field, v: Box) : Heap.
+    /// </summary>
+    public Boogie.NAryExpr UpdateHeap(IOrigin tok, Expr heap, Expr r, Expr f, Expr v) {
+      Contract.Requires(tok != null);
+      Contract.Requires(heap != null);
+      Contract.Requires(r != null);
+      Contract.Requires(f != null);
+      Contract.Requires(v != null);
+      Contract.Ensures(Contract.Result<Boogie.NAryExpr>() != null);
+
+
+      return new Boogie.NAryExpr(tok,
+        new Boogie.FunctionCall(new Boogie.IdentifierExpr(tok, "update", heap.Type)),
+        new List<Boogie.Expr> { heap, r, f, ApplyBox(tok, v) });
+    }
+
+    public Bpl.Expr DType(Bpl.Expr e, Bpl.Expr type) {
+      return Bpl.Expr.Eq(FunctionCall(e.tok, BuiltinFunction.DynamicType, null, e), type);
+    }
+
+    public Bpl.Expr GetArrayIndexFieldName(IOrigin tok, List<Bpl.Expr> indices) {
+      Bpl.Expr fieldName = null;
+      foreach (Bpl.Expr index in indices) {
+        if (fieldName == null) {
+          // the index in dimension 0:  IndexField(index0)
+          fieldName = FunctionCall(tok, BuiltinFunction.IndexField, null, index);
+        } else {
+          // the index in dimension n:  MultiIndexField(...field name for first n indices..., index_n)
+          fieldName = FunctionCall(tok, BuiltinFunction.MultiIndexField, null, fieldName, index);
+        }
+      }
+      return fieldName;
+    }
+
+    /// <summary>
+    /// Returns true if the body of function "f" is available in module "context".
+    /// This happens when the following conditions all hold:
+    ///   - "f" has a body
+    ///   - "f" is not opaque
+    /// </summary>
+    bool FunctionBodyIsAvailable(Function f, ModuleDefinition context, VisibilityScope scope) {
+      Contract.Requires(f != null);
+      Contract.Requires(context != null);
+      return f.Body != null && !IsOpaque(f, options) && f.IsRevealedInScope(scope);
+    }
+    public static bool IsOpaque(MemberDecl f, DafnyOptions options) {
+      Contract.Requires(f != null);
+      if (f is Function f1) {
+        return Attributes.Contains(f.Attributes, "opaque") || f.IsOpaque || f1.IsMadeImplicitlyOpaque(options);
+      } else {
+        return Attributes.Contains(f.Attributes, "opaque") || f.IsOpaque;
+      }
+    }
+    static bool IsOpaqueRevealLemma(Method m) {
+      Contract.Requires(m != null);
+      return Attributes.Contains(m.Attributes, "opaque_reveal");
+    }
+
+
+    void AddEnsures(List<Bpl.Ensures> list, Bpl.Ensures ens) {
+      list.Add(ens);
+      if (!ens.Free) {
+        this.assertionCount++;
+      }
+    }
+
+    private Implementation AddImplementationWithAttributes(IOrigin tok, Procedure proc, List<Variable> inParams,
+      List<Variable> outParams, Variables localVariables, StmtList stmts, QKeyValue kv) {
+      Bpl.Implementation impl = new Bpl.Implementation(tok, proc.Name,
+        new List<Bpl.TypeVariable>(), inParams, outParams,
+        localVariables.Values.ToList<Variable>(), stmts, kv);
+      AddVerboseNameAttribute(impl, proc.VerboseName);
+      if (options.IsUsingZ3()) {
+        if (DisableNonLinearArithmetic) {
+          AddSmtOptionAttribute(impl, "smt.arith.nl", "false");
+        }
+
+        AddSmtOptionAttribute(impl, "smt.arith.solver", ArithmeticSolver.ToString());
+      }
+      sink.AddTopLevelDeclaration(impl);
+      return impl;
+    }
+
+    bool EmitImplementation(Attributes attributes) {
+      // emit the impl only when there are proof obligations
+      if (assertionCount > 0) {
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+    private void Reset() {
+      currentModule = null;
+      codeContext = null;
+      CurrentIdGenerator.Reset();
+      _tmpIEs.Clear();
+      assertionCount = 0;
+      DefiniteAssignmentTrackers.Clear();
+    }
+
+    public static Bpl.QKeyValue InlineAttribute(Bpl.IToken tok, Bpl.QKeyValue/*?*/ next = null) {
+      Contract.Requires(tok != null);
+      return new QKeyValue(tok, "inline", new List<object>(), next);
+    }
+
+    public static Bpl.QKeyValue AlwaysAssumeAttribute(Bpl.IToken tok, Bpl.QKeyValue next = null) {
+      Contract.Requires(tok != null);
+      return new QKeyValue(tok, "always_assume", new List<object>(), next);
+    }
+
+    class Specialization {
+      public readonly List<Formal/*!*/> Formals;
+      public readonly List<Expression/*!*/> ReplacementExprs;
+      public readonly List<BoundVar/*!*/> ReplacementFormals;
+      public readonly Dictionary<IVariable, Expression> SubstMap;
+      readonly BoogieGenerator boogieGenerator;
+      [ContractInvariantMethod]
+      void ObjectInvariant() {
+        Contract.Invariant(cce.NonNullElements(Formals));
+        Contract.Invariant(cce.NonNullElements(ReplacementExprs));
+        Contract.Invariant(Formals.Count == ReplacementExprs.Count);
+        Contract.Invariant(cce.NonNullElements(ReplacementFormals));
+        Contract.Invariant(SubstMap != null);
+      }
+
+      public Specialization(IVariable formal, MatchCase mc, Specialization prev, BoogieGenerator boogieGenerator) {
+        Contract.Requires(formal is Formal || formal is BoundVar);
+        Contract.Requires(mc != null);
+        Contract.Requires(prev == null || formal is BoundVar || !prev.Formals.Contains((Formal)formal));
+        Contract.Requires(boogieGenerator != null);
+
+        this.boogieGenerator = boogieGenerator;
+
+        List<Expression> rArgs = new List<Expression>();
+        foreach (BoundVar p in mc.Arguments) {
+          IdentifierExpr ie = new IdentifierExpr(p.Origin, p.AssignUniqueName(boogieGenerator.CurrentDeclaration.IdGenerator));
+          ie.Var = p; ie.Type = ie.Var.Type;  // resolve it here
+          rArgs.Add(ie);
+        }
+        // create and resolve datatype value
+        var r = new DatatypeValue(mc.Origin, mc.Ctor.EnclosingDatatype.Name, mc.Ctor.Name, rArgs);
+        r.Ctor = mc.Ctor;
+        r.Type = new UserDefinedType(mc.Origin, mc.Ctor.EnclosingDatatype.Name, new List<Type>()/*this is not right, but it seems like it won't matter here*/);
+
+        Dictionary<IVariable, Expression> substMap = new Dictionary<IVariable, Expression>();
+        substMap.Add(formal, r);
+
+        // Fill in the fields
+        Formals = new List<Formal>();
+        ReplacementExprs = new List<Expression>();
+        ReplacementFormals = new List<BoundVar>();
+        SubstMap = new Dictionary<IVariable, Expression>();
+        if (prev != null) {
+          Formals.AddRange(prev.Formals);
+          foreach (var e in prev.ReplacementExprs) {
+            ReplacementExprs.Add(BoogieGenerator.Substitute(e, null, substMap));
+          }
+          foreach (var rf in prev.ReplacementFormals) {
+            if (rf != formal) {
+              ReplacementFormals.Add(rf);
+            }
+          }
+          foreach (var entry in prev.SubstMap) {
+            SubstMap.Add(entry.Key, BoogieGenerator.Substitute(entry.Value, null, substMap));
+          }
+        }
+        if (formal is Formal) {
+          Formals.Add((Formal)formal);
+          ReplacementExprs.Add(r);
+        }
+        ReplacementFormals.AddRange(mc.Arguments);
+        SubstMap.Add(formal, r);
+      }
+    }
+
+    (int olderParameterCount, Bpl.Expr olderCondition) OlderCondition(Function f, Bpl.Expr funcAppl, List<Bpl.Variable> inParams) {
+      Contract.Requires(f != null);
+      Contract.Requires(funcAppl != null);
+      Contract.Requires(inParams != null);
+
+      var olderParameterCount = f.Ins.Count(formal => formal.IsOlder);
+      if (olderParameterCount == 0) {
+        // nothing to do
+        return (olderParameterCount, Bpl.Expr.True);
+      }
+
+      // For a function F(older x: X, y: Y), generate:
+      //     (forall h: Heap :: { OlderTag(h) }
+      //         IsGoodHeap(h) && OlderTag(h) && F(x, y) && IsAlloc(y, Y, h)
+      //         ==>  IsAlloc(x, X, h))
+      var heapVar = BplBoundVar("$olderHeap", Predef.HeapType, out var heap);
+      var etran = new ExpressionTranslator(this, Predef, heap, f);
+
+      var isGoodHeap = FunctionCall(f.Origin, BuiltinFunction.IsGoodHeap, null, heap);
+      var olderTag = FunctionCall(f.Origin, "$OlderTag", Bpl.Type.Bool, heap);
+      Bpl.Expr older = Bpl.Expr.True;
+      Bpl.Expr newer = Bpl.Expr.True;
+      var i = 0;
+      if (!f.IsStatic) {
+        var th = new Bpl.IdentifierExpr(f.Origin, inParams[i]);
+        i++;
+        var wh = GetWhereClause(f.Origin, th, ModuleResolver.GetReceiverType(f.Origin, f), etran, ISALLOC, true);
+        newer = BplAnd(newer, wh);
+      }
+      foreach (var formal in f.Ins) {
+        var p = new Bpl.IdentifierExpr(f.Origin, inParams[i]);
+        i++;
+        var wh = GetWhereClause(formal.Origin, p, formal.Type, etran, ISALLOC, true);
+        if (wh != null) {
+          if (formal.IsOlder) {
+            older = BplAnd(older, wh);
+          } else {
+            newer = BplAnd(newer, wh);
+          }
+        }
+      }
+      Contract.Assert(i == inParams.Count); // we should have used all the given inParams by now
+
+      var body = BplImp(BplAnd(BplAnd(isGoodHeap, olderTag), BplAnd(funcAppl, newer)), older);
+      var tr = new Bpl.Trigger(f.Origin, true, new List<Bpl.Expr> { olderTag });
+      var olderCondition = new Bpl.ForallExpr(f.Origin, new List<Bpl.TypeVariable>(), new List<Variable>() { heapVar }, null, tr, body);
+      return (olderParameterCount, olderCondition);
+    }
+
+    Bpl.Type TrReceiverType(MemberDecl f) {
+      Contract.Requires(f != null);
+      return TrType(ModuleResolver.GetReceiverType(f.Origin, f));
+    }
+
+    Bpl.Expr ReceiverNotNull(Bpl.Expr th) {
+      Contract.Requires(th != null);
+      if (th.Type == Predef.RefType) {
+        return Bpl.Expr.Neq(th, Predef.Null);
+      } else {
+        return Bpl.Expr.True;
+      }
+    }
+
+    void AddFuelSuccSynonymAxiom(Function f, bool forHandle = false) {
+      Contract.Requires(f != null);
+      Contract.Requires(f.IsFuelAware());
+      Contract.Requires(sink != null && Predef != null);
+      // axiom  // layer synonym axiom
+      //   (forall s, $Heap, formals ::
+      //       { f(Succ(s), $Heap, formals) }
+      //       f(Succ(s), $Heap, formals) == f(s, $Heap, formals));
+
+      List<Bpl.Expr> tyargs;
+      var formals = MkTyParamBinders(GetTypeParams(f), out tyargs);
+      var args1 = new List<Bpl.Expr>(tyargs);
+      var args0 = new List<Bpl.Expr>(tyargs);
+
+      var bv = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$ly", Predef.LayerType));
+      formals.Add(bv);
+      var s = new Bpl.IdentifierExpr(f.Origin, bv);
+      args1.Add(FunctionCall(f.Origin, BuiltinFunction.LayerSucc, null, s));
+      args0.Add(s);
+      if (f.IsOpaque || f.IsMadeImplicitlyOpaque(options)) {
+        var bvReveal = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$reveal", Boogie.Type.Bool));
+        formals.Add(bvReveal);
+        var sReveal = new Bpl.IdentifierExpr(f.Origin, bvReveal);
+        args1.Add(sReveal);
+        args0.Add(sReveal);
+      }
+
+      if (f is TwoStateFunction) {
+        bv = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$prevHeap", Predef.HeapType));
+        formals.Add(bv);
+        s = new Bpl.IdentifierExpr(f.Origin, bv);
+        args1.Add(s);
+        args0.Add(s);
+      }
+      if (!forHandle && f.ReadsHeap) {
+        bv = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, Predef.HeapVarName, Predef.HeapType));
+        formals.Add(bv);
+        s = new Bpl.IdentifierExpr(f.Origin, bv);
+        args1.Add(s);
+        args0.Add(s);
+      }
+
+      if (!f.IsStatic) {
+        bv = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "this", TrReceiverType(f)));
+        formals.Add(bv);
+        s = new Bpl.IdentifierExpr(f.Origin, bv);
+        args1.Add(s);
+        args0.Add(s);
+      }
+      if (!forHandle) {
+        foreach (var p in f.Ins) {
+          bv = new Bpl.BoundVariable(p.Origin, new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)));
+          formals.Add(bv);
+          s = new Bpl.IdentifierExpr(f.Origin, bv);
+          args1.Add(s);
+          args0.Add(s);
+        }
+      }
+
+      var name = forHandle ? f.FullSanitizedName + "#Handle" : f.FullSanitizedName;
+      var funcID = new Bpl.FunctionCall(new Bpl.IdentifierExpr(f.Origin, name, TrType(f.ResultType)));
+      var funcAppl1 = new Bpl.NAryExpr(f.Origin, funcID, args1);
+      var funcAppl0 = new Bpl.NAryExpr(f.Origin, funcID, args0);
+
+      Bpl.Trigger tr = new Bpl.Trigger(f.Origin, true, new List<Bpl.Expr> { funcAppl1 });
+      Bpl.Expr ax = new Bpl.ForallExpr(f.Origin, new List<Bpl.TypeVariable>(), formals, null, tr, Bpl.Expr.Eq(funcAppl1, funcAppl0));
+      AddOtherDefinition(GetOrCreateFunction(f), new Bpl.Axiom(f.Origin, ax, "layer synonym axiom"));
+    }
+
+    void AddFuelZeroSynonymAxiom(Function f) {
+      // axiom  // fuel axiom
+      //   (forall s, $Heap, formals ::
+      //       { f(AsFuelBottom(s), $Heap, formals) }
+      //       f(s, $Heap, formals) == f($LZ, $Heap, formals));
+      Contract.Requires(f != null);
+      Contract.Requires(f.IsFuelAware());
+      Contract.Requires(sink != null && Predef != null);
+
+      List<Bpl.Expr> tyargs;
+      var formals = MkTyParamBinders(GetTypeParams(f), out tyargs);
+      var args2 = new List<Bpl.Expr>(tyargs);
+      var args1 = new List<Bpl.Expr>(tyargs);
+      var args0 = new List<Bpl.Expr>(tyargs);
+
+      var bv = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$ly", Predef.LayerType));
+      formals.Add(bv);
+      var s = new Bpl.IdentifierExpr(f.Origin, bv);
+      args2.Add(FunctionCall(f.Origin, BuiltinFunction.AsFuelBottom, null, s));
+      args1.Add(s);
+      args0.Add(new Bpl.IdentifierExpr(f.Origin, "$LZ", Predef.LayerType)); // $LZ
+      if (f.IsOpaque || f.IsMadeImplicitlyOpaque(options)) {
+        var bvReveal = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$reveal", Boogie.Type.Bool));
+        formals.Add(bvReveal);
+        var sReveal = new Bpl.IdentifierExpr(f.Origin, bvReveal);
+        args2.Add(sReveal);
+        args1.Add(sReveal);
+        args0.Add(sReveal);
+      }
+
+      if (f is TwoStateFunction) {
+        bv = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "$prevHeap", Predef.HeapType));
+        formals.Add(bv);
+        s = new Bpl.IdentifierExpr(f.Origin, bv);
+        args2.Add(s);
+        args1.Add(s);
+        args0.Add(s);
+      }
+      if (f.ReadsHeap) {
+        bv = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, Predef.HeapVarName, Predef.HeapType));
+        formals.Add(bv);
+        s = new Bpl.IdentifierExpr(f.Origin, bv);
+        args2.Add(s);
+        args1.Add(s);
+        args0.Add(s);
+      }
+
+      if (!f.IsStatic) {
+        bv = new Bpl.BoundVariable(f.Origin, new Bpl.TypedIdent(f.Origin, "this", TrReceiverType(f)));
+        formals.Add(bv);
+        s = new Bpl.IdentifierExpr(f.Origin, bv);
+        args2.Add(s);
+        args1.Add(s);
+        args0.Add(s);
+      }
+      foreach (var p in f.Ins) {
+        bv = new Bpl.BoundVariable(p.Origin, new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)));
+        formals.Add(bv);
+        s = new Bpl.IdentifierExpr(f.Origin, bv);
+        args2.Add(s);
+        args1.Add(s);
+        args0.Add(s);
+      }
+
+      var funcID = new Bpl.FunctionCall(new Bpl.IdentifierExpr(f.Origin, f.FullSanitizedName, TrType(f.ResultType)));
+      var funcAppl2 = new Bpl.NAryExpr(f.Origin, funcID, args2);
+      var funcAppl1 = new Bpl.NAryExpr(f.Origin, funcID, args1);
+      var funcAppl0 = new Bpl.NAryExpr(f.Origin, funcID, args0);
+
+      Bpl.Trigger tr = new Bpl.Trigger(f.Origin, true, new List<Bpl.Expr> { funcAppl2 });
+      Bpl.Expr ax = new Bpl.ForallExpr(f.Origin, new List<Bpl.TypeVariable>(), formals, null, tr, Bpl.Expr.Eq(funcAppl1, funcAppl0));
+      AddOtherDefinition(GetOrCreateFunction(f), (new Bpl.Axiom(f.Origin, ax, "fuel synonym axiom")));
+    }
+
+    Bpl.Expr InSeqRange(IOrigin tok, Bpl.Expr index, Type indexType, Bpl.Expr seq, bool isSequence, Bpl.Expr lowerBound, bool includeUpperBound) {
+      Contract.Requires(tok != null);
+      Contract.Requires(index != null);
+      Contract.Requires(indexType != null);
+      Contract.Requires(seq != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      if (indexType.IsBitVectorType) {
+        index = ConvertExpression(tok, index, indexType, Type.Int);
+      }
+      Bpl.Expr lower;
+      if (indexType.IsBitVectorType && lowerBound == null) {
+        lower = Bpl.Expr.True;  // bitvectors are always non-negative
+      } else {
+        lower = Bpl.Expr.Le(lowerBound ?? Bpl.Expr.Literal(0), index);
+      }
+      Bpl.Expr length = isSequence ?
+        FunctionCall(tok, BuiltinFunction.SeqLength, null, seq) :
+        ArrayLength(tok, seq, 1, 0);
+      Bpl.Expr upper;
+      if (includeUpperBound) {
+        upper = Bpl.Expr.Le(index, length);
+      } else {
+        upper = Bpl.Expr.Lt(index, length);
+      }
+      return BplAnd(lower, upper);
+    }
+
+    ModuleDefinition currentModule = null;  // the module whose members are currently being translated
+    ModuleDefinition forModule = null;  // the root module
+    ICallable codeContext = null;  // the method/iterator whose implementation is currently being translated or the function whose specification is being checked for well-formedness
+    Bpl.LocalVariable yieldCountVariable = null;  // non-null when an iterator body is being translated
+    bool inBodyInitContext = false;  // true during the translation of the .BodyInit portion of a divided constructor body
+
+    public ImmutableDictionary<string, Bpl.IdentifierExpr> DefiniteAssignmentTrackers { get; set; } = ImmutableDictionary<string, Bpl.IdentifierExpr>.Empty;
+
+    Func<IOrigin, bool> assertionOnlyFilter = null; // generate assume statements instead of assert statements if not targeted by {:only}
+    public enum StmtType { NONE, ASSERT, ASSUME };
+    public StmtType stmtContext = StmtType.NONE;  // the Statement that is currently being translated
+    public bool adjustFuelForExists = true;  // fuel need to be adjusted for exists based on whether exists is in assert or assume stmt.
+
+    public readonly VerificationIdGenerator defaultIdGenerator = new VerificationIdGenerator();
+
+    public VerificationIdGenerator CurrentIdGenerator {
+      get {
+        var decl = codeContext as Declaration;
+        if (decl != null) {
+          return decl.IdGenerator;
+        }
+        return defaultIdGenerator;
+      }
+    }
+
+    Dictionary<string, Bpl.IdentifierExpr> _tmpIEs = new Dictionary<string, Bpl.IdentifierExpr>();
+
+    public int assertionCount = 0;
+
+    Bpl.IdentifierExpr GetTmpVar_IdExpr(Bpl.IToken tok, string name, Bpl.Type ty, Variables locals)  // local variable that's shared between statements that need it
+    {
+      Contract.Requires(tok != null);
+      Contract.Requires(name != null);
+      Contract.Requires(ty != null);
+      Contract.Requires(locals != null);
+      Contract.Ensures(Contract.Result<Bpl.IdentifierExpr>() != null);
+
+      Bpl.IdentifierExpr ie;
+      if (_tmpIEs.TryGetValue(name, out ie)) {
+        Contract.Assume(ie.Type.Equals(ty));
+      } else {
+        // the "tok" and "ty" of the first request for this variable is the one we use
+        var v = locals.GetOrAdd(new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, name, ty)));  // important for the "$nw" client: no where clause (see GetNewVar_IdExpr)
+        ie = new Bpl.IdentifierExpr(tok, v);
+        _tmpIEs.Add(name, ie);
+      }
+      return ie;
+    }
+
+    Bpl.IdentifierExpr GetPrevHeapVar_IdExpr(IOrigin tok, Variables locals)  // local variable that's shared between statements that need it
+    {
+      Contract.Requires(tok != null);
+      Contract.Requires(locals != null); Contract.Requires(Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.IdentifierExpr>() != null);
+
+      return GetTmpVar_IdExpr(tok, "$prevHeap", Predef.HeapType, locals);
+    }
+
+    Bpl.IdentifierExpr GetNewVar_IdExpr(IOrigin tok, Variables locals)  // local variable that's shared between statements that need it
+    {
+      Contract.Requires(tok != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.IdentifierExpr>() != null);
+
+      // important: the following declaration produces no where clause (that's why we're going through the trouble of setting of this variable in the first place)
+      return GetTmpVar_IdExpr(tok, "$nw", Predef.RefType, locals);
+    }
+
+    /// <summary>
+    /// Returns an expression whose value is the same as "expr", but that is guaranteed to preserve the its value passed
+    /// the evaluation of other expressions.  If necessary, a new local variable called "name" with type "ty" is added to "locals" and
+    /// assigned in "builder" to be used to hold the value of "expr".  It is assumed that all requests for a given "name"
+    /// have the same type "ty" and that these variables can be shared.
+    /// As an optimization, if "otherExprsCanAffectPreviouslyKnownExpressions" is "false", then "expr" itself is returned.
+    /// </summary>
+    Bpl.Expr SaveInTemp(Bpl.Expr expr, bool otherExprsCanAffectPreviouslyKnownExpressions, string name, Bpl.Type ty, BoogieStmtListBuilder builder, Variables locals) {
+      Contract.Requires(expr != null);
+      Contract.Requires(name != null);
+      Contract.Requires(ty != null);
+      Contract.Requires(locals != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      if (otherExprsCanAffectPreviouslyKnownExpressions) {
+        var save = GetTmpVar_IdExpr(expr.tok, name, ty, locals);
+        builder.Add(Bpl.Cmd.SimpleAssign(expr.tok, save, expr));
+        return save;
+      } else {
+        return expr;
+      }
+    }
+
+    void InitializeFuelConstant(IOrigin tok, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+      if (this.functionFuel.Count > 0) {
+        builder.Add(new CommentCmd("initialize fuel constant"));
+      }
+      FuelContext fuelContext = this.fuelContext;
+      foreach (FuelConstant fuelConstant in this.functionFuel) {
+        Function f = fuelConstant.f;
+        Bpl.Expr baseFuel = fuelConstant.baseFuel;
+        Bpl.Expr startFuel = fuelConstant.startFuel;
+        Bpl.Expr startFuelAssert = fuelConstant.startFuelAssert;
+        // find out what the initial value should be
+        FuelSettingPair settings;
+        var found = fuelContext.TryGetValue(f, out settings);
+        if (!found) {
+          // If the context doesn't define fuel for this function, check for a fuel attribute (which supplies a default value if none is found)
+          settings = FuelSetting.FuelAttrib(f, out found);
+        }
+
+        if (settings.low == 0 && settings.high == 0) {
+          // Don't say anything about what startFuel and startFuel are set to
+          // Just add the fixpoints that allow us to shortcut to LZ:
+          // assume AsFuelBottom(startFuel) == startFuel
+          // assume AsFuelBottom(startFuelAssert) == startFuelAssert
+          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(FunctionCall(f.Origin, BuiltinFunction.AsFuelBottom, null, startFuel), startFuel)));
+          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(FunctionCall(f.Origin, BuiltinFunction.AsFuelBottom, null, startFuelAssert), startFuelAssert)));
+        } else {
+          Bpl.Expr layer = etran.layerInterCluster.LayerN(settings.low, baseFuel);
+          Bpl.Expr layerAssert = etran.layerInterCluster.LayerN(settings.high, baseFuel);
+          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(startFuel, layer)));
+          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(startFuelAssert, layerAssert)));
+          // assume AsFuelBottom(BaseFuel_F) == BaseFuel_F;
+          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(FunctionCall(f.Origin, BuiltinFunction.AsFuelBottom, null, baseFuel), baseFuel)));
+        }
+      }
+    }
+
+    bool DefineFuelConstant(IOrigin tok, Attributes attribs, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+      bool defineFuel = false;
+      builder.Add(new CommentCmd("Assume Fuel Constant"));
+      FuelContext fuelContext = new FuelContext();
+      FuelSetting.FindFuelAttributes(attribs, fuelContext);
+      foreach (KeyValuePair<Function, FuelSettingPair> fuel in fuelContext) {
+        Function f = fuel.Key;
+        FuelSettingPair settings = fuel.Value;
+        FuelConstant fuelConstant = this.functionFuel.Find(x => x.f == f);
+        if (fuelConstant != null) {
+          Bpl.Expr startFuel = fuelConstant.startFuel;
+          Bpl.Expr startFuelAssert = fuelConstant.startFuelAssert;
+          Bpl.Expr moreFuel_expr = fuelConstant.MoreFuel(sink, Predef, f.IdGenerator);
+          Bpl.Expr layer = etran.layerInterCluster.LayerN(settings.low, moreFuel_expr);
+          Bpl.Expr layerAssert = etran.layerInterCluster.LayerN(settings.high, moreFuel_expr);
+          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(startFuel, layer)));
+          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(startFuelAssert, layerAssert)));
+          defineFuel = true;
+        }
+      }
+      return defineFuel;
+    }
+
+    internal static AssumeCmd optimizeExpr(bool minimize, Expression expr, IOrigin tok, ExpressionTranslator etran) {
+      Contract.Requires(expr != null);
+      Contract.Requires(expr.Type.IsIntegerType || expr.Type.IsRealType);
+      Contract.Requires(tok != null && etran != null);
+
+      var assumeCmd = new AssumeCmd(tok, Expr.True);
+      assumeCmd.Attributes = new QKeyValue(expr.Origin, (minimize ? "minimize" : "maximize"), new List<object> { etran.TrExpr(expr) }, null);
+      return assumeCmd;
+    }
+
+    /// <summary>
+    /// Return type arguments for function "f", where any type parameters are in terms of
+    /// the context of "overridingFunction ?? f".
+    ///
+    /// In more symbols, suppose "f" is declared as follows:
+    ///     class/trait Tr[A,B] {
+    ///       function f[C,D](...): ...
+    ///     }
+    /// When "overridingFunction" is null, return:
+    ///     [A, B, C, D]
+    /// When "overridingFunction" is non-null and stands for:
+    ///     class/trait Cl[G] extends Tr[X(G),Y(G)] {
+    ///       function f[R,S](...): ...
+    ///     }
+    /// return:
+    ///     [X(G), Y(G), R, S]
+    ///
+    /// See also GetTypeArgumentSubstitutionMap.
+    /// </summary>
+    private static List<Type> GetTypeArguments(Function f, Function/*?*/ overridingFunction) {
+      Contract.Requires(f != null);
+      Contract.Requires(overridingFunction == null || overridingFunction.EnclosingClass is TopLevelDeclWithMembers);
+      Contract.Requires(overridingFunction == null || f.TypeArgs.Count == overridingFunction.TypeArgs.Count);
+
+      List<Type> tyargs;
+      if (overridingFunction == null) {
+        tyargs = f.EnclosingClass.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp.Origin, tp));
+      } else {
+        var cl = (TopLevelDeclWithMembers)overridingFunction.EnclosingClass;
+        var typeMap = cl.ParentFormalTypeParametersToActuals;
+        tyargs = f.EnclosingClass.TypeArgs.ConvertAll(tp => typeMap[tp]);
+      }
+      tyargs.AddRange((overridingFunction ?? f).TypeArgs.ConvertAll(tp => new UserDefinedType(tp.Origin, tp)));
+      return tyargs;
+    }
+
+    private void InsertChecksum(DatatypeDecl d, Bpl.Declaration decl) {
+      Contract.Requires(VisibleInScope(d));
+      byte[] data;
+      using (var writer = new System.IO.StringWriter()) {
+        var printer = new Printer(writer, options);
+        printer.PrintDatatype(d, 0, null);
+        data = Encoding.UTF8.GetBytes(writer.ToString());
+      }
+
+      InsertChecksum(decl, data);
+    }
+
+    private void InsertChecksum(Expression e, Bpl.Declaration decl) {
+      byte[] data;
+      using (var writer = new System.IO.StringWriter()) {
+        var printer = new Printer(writer, options);
+        printer.PrintExpression(e, false);
+        data = Encoding.UTF8.GetBytes(writer.ToString());
+      }
+
+      InsertChecksum(decl, data);
+    }
+
+    private void InsertChecksum(Function f, Bpl.Declaration decl, bool specificationOnly = false) {
+      Contract.Requires(f != null);
+      Contract.Requires(decl != null);
+      Contract.Requires(VisibleInScope(f));
+      byte[] data;
+      using (var writer = new System.IO.StringWriter()) {
+        var printer = new Printer(writer, options);
+        writer.Write(f.GetFunctionDeclarationKeywords(options));
+        printer.PrintAttributes(f.Attributes, false, -1);
+        printer.PrintFormals(f.Ins, f);
+        writer.Write(": ");
+        printer.PrintType(f.ResultType);
+        printer.PrintSpec("", f.Req, 0);
+        printer.PrintFrameSpecLine("", f.Reads, 0);
+        printer.PrintSpec("", f.Ens, 0);
+        printer.PrintDecreasesSpec(f.Decreases, 0);
+        writer.WriteLine();
+        if (!specificationOnly && f.Body != null && RevealedInScope(f)) {
+          printer.PrintExpression(f.Body, false);
+        }
+        data = Encoding.UTF8.GetBytes(writer.ToString());
+      }
+
+      InsertChecksum(decl, data);
+    }
+
+    private void InsertChecksum(Bpl.Declaration decl, byte[] data) {
+      Contract.Requires(decl != null);
+      Contract.Requires(data != null);
+      var md5 = System.Security.Cryptography.MD5.Create();
+      var hashedData = md5.ComputeHash(data);
+      var checksum = BitConverter.ToString(hashedData);
+
+      decl.AddAttribute("checksum", checksum);
+
+      InsertUniqueIdForImplementation(decl);
+    }
+
+    public void InsertUniqueIdForImplementation(Bpl.Declaration decl) {
+      var impl = decl as Bpl.Implementation;
+      var prefix = UniqueIdPrefix ?? (decl.tok.filename == null ? "" : System.Text.RegularExpressions.Regex.Replace(decl.tok.filename, @".v\d+.dfy", ".dfy"));
+      if (impl != null && !string.IsNullOrEmpty(prefix)) {
+        decl.AddAttribute("id", prefix + ":" + impl.Name + ":0");
+      }
+    }
+
+    void GenerateImplPrelude(Method m, bool wellformednessProc, List<Variable> inParams, List<Variable> outParams,
+                             BoogieStmtListBuilder builder, Variables localVariables, ExpressionTranslator etran) {
+      Contract.Requires(m != null);
+      Contract.Requires(inParams != null);
+      Contract.Requires(outParams != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(localVariables != null);
+      Contract.Requires(Predef != null);
+      Contract.Requires(wellformednessProc || m.Body != null);
+
+      if (m is TwoStateLemma) {
+        // $Heap := current$Heap;
+        var heap = ExpressionTranslator.HeapIdentifierExpr(Predef, m.Origin);
+        builder.Add(Bpl.Cmd.SimpleAssign(m.Origin, heap, new Bpl.IdentifierExpr(m.Origin, "current$Heap", Predef.HeapType)));
+      }
+
+      // set up the information used to verify the method's reads and modifies clauses
+      if (etran.readsFrame != null) {
+        DefineFrame(m.Origin, etran.ReadsFrame(m.Origin), m.Reads.Expressions, builder, localVariables, null);
+      }
+      DefineFrame(m.Origin, etran.ModifiesFrame(m.Origin), m.Mod.Expressions, builder, localVariables, null);
+      if (wellformednessProc) {
+        builder.AddCaptureState(m.Origin, false, "initial state");
+      } else {
+        Contract.Assert(m.Body != null);  // follows from precondition and the if guard
+        // use the position immediately after the open-curly-brace of the body
+        builder.AddCaptureState(m.Body.Origin, true, "initial state");
+      }
+    }
+
+    public void DefineFrame(IOrigin/*!*/ tok, Boogie.IdentifierExpr frameIdentifier, List<FrameExpression/*!*/>/*!*/ frameClause,
+      BoogieStmtListBuilder/*!*/ builder, Variables localVariables, string name, ExpressionTranslator/*?*/ etran = null) {
+      Contract.Requires(tok != null);
+      Contract.Requires(frameIdentifier != null);
+      Contract.Requires(frameIdentifier.Type != null);
+      Contract.Requires(cce.NonNullElements(frameClause));
+      Contract.Requires(builder != null);
+      Contract.Requires(Predef != null);
+
+      if (etran == null) {
+        // This is the common case. It means that the frame will be defined in terms of the usual variable $Heap.
+        // The one case where a frame is needed for a different heap is for lambda expressions, because they may
+        // sit inside of an "old" expression.
+        etran = new ExpressionTranslator(this, Predef, tok, null);
+      }
+      // Declare a local variable $_Frame: [ref, Field]bool
+      var frame = localVariables.GetOrAdd(new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, name ?? frameIdentifier.Name, frameIdentifier.Type)));
+      // $_Frame := (lambda $o: ref, $f: Field :: $o != null && $Heap[$o,alloc] ==> ($o,$f) in Modifies/Reads-Clause);
+      // $_Frame := (lambda $o: ref, $f: Field :: $o != null                    ==> ($o,$f) in Modifies/Reads-Clause);
+      Bpl.BoundVariable oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", Predef.RefType));
+      Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(tok, oVar);
+      Bpl.BoundVariable fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", Predef.FieldName(tok)));
+      Bpl.IdentifierExpr f = new Bpl.IdentifierExpr(tok, fVar);
+      Bpl.Expr oNotNull = Bpl.Expr.Neq(o, Predef.Null);
+      Bpl.Expr ante = BplAnd(oNotNull, etran.IsAlloced(tok, o));
+      Bpl.Expr consequent = InRWClause(tok, o, f, frameClause, etran, null, null);
+      Bpl.Expr lambda = new Bpl.LambdaExpr(tok, new List<TypeVariable>(), new List<Variable> { oVar, fVar }, null,
+                                           BplImp(ante, consequent));
+
+      builder.Add(Bpl.Cmd.SimpleAssign(tok, new Bpl.IdentifierExpr(tok, frame), lambda));
+    }
+
+    public void CheckFrameSubset(IOrigin tok, List<FrameExpression> calleeFrame,
+                          Expression receiverReplacement, Dictionary<IVariable, Expression /*!*/> substMap,
+                          ExpressionTranslator /*!*/ etran, Boogie.IdentifierExpr /*!*/ enclosingFrame,
+                          BoogieStmtListBuilder /*!*/ builder,
+                          ProofObligationDescription desc,
+                          Bpl.QKeyValue kv) {
+      CheckFrameSubset(tok, calleeFrame, receiverReplacement, substMap, etran, enclosingFrame,
+        (t, e, d, q) => builder.Add(Assert(t, e, d, builder.Context, q)),
+        (t, e) => builder.Add(TrAssumeCmd(t, e)),
+        desc, kv);
+    }
+
+    void CheckFrameSubset(IOrigin tok, List<FrameExpression> calleeFrame,
+                          Expression receiverReplacement, Dictionary<IVariable, Expression/*!*/> substMap,
+                          ExpressionTranslator/*!*/ etran, Boogie.IdentifierExpr /*!*/ enclosingFrame,
+                          Action<IOrigin, Bpl.Expr, ProofObligationDescription, Bpl.QKeyValue> makeAssert,
+                          Action<IOrigin, Bpl.Expr> makeAssume,
+                          ProofObligationDescription desc,
+                          Bpl.QKeyValue kv) {
+      Contract.Requires(tok != null);
+      Contract.Requires(calleeFrame != null);
+      Contract.Requires(receiverReplacement == null || substMap != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(makeAssert != null);
+      Contract.Requires(Predef != null);
+
+      foreach (var frameExpression in calleeFrame) {
+        var e = substMap != null ? Substitute(frameExpression.E, receiverReplacement, substMap) : frameExpression.E;
+        makeAssume(frameExpression.Origin, etran.CanCallAssumption(e));
+      }
+
+      // emit: assert (forall o: ref, f: Field :: o != null && $Heap[o,alloc] && (o,f) in subFrame ==> enclosingFrame[o,f]);
+      var oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", Predef.RefType));
+      var o = new Bpl.IdentifierExpr(tok, oVar);
+      var fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", Predef.FieldName(tok)));
+      var f = new Bpl.IdentifierExpr(tok, fVar);
+      var ante = Bpl.Expr.And(Bpl.Expr.Neq(o, Predef.Null), etran.IsAlloced(tok, o));
+      var oInCallee = InRWClause(tok, o, f, calleeFrame, etran, receiverReplacement, substMap);
+      var inEnclosingFrame = Bpl.Expr.Select(enclosingFrame, o, f);
+
+      var q = new Bpl.ForallExpr(tok, new List<TypeVariable>(), new List<Variable> { oVar, fVar },
+                                      BplImp(BplAnd(ante, oInCallee), inEnclosingFrame));
+      if (IsExprAlways(q, true)) {
+        return;
+      }
+      makeAssert(tok, q, desc, kv);
+    }
+
+    void CheckFrameEmpty(IOrigin tok,
+                         ExpressionTranslator/*!*/ etran, Boogie.IdentifierExpr /*!*/ frame,
+                         BoogieStmtListBuilder/*!*/ builder, ProofObligationDescription desc,
+                         Bpl.QKeyValue kv) {
+      Contract.Requires(tok != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(frame != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(Predef != null);
+
+      // emit: assert (forall o: ref, f: Field :: o != null && $Heap[o,alloc] ==> !frame[o,f]);
+      var oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", Predef.RefType));
+      var o = new Bpl.IdentifierExpr(tok, oVar);
+      var fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", Predef.FieldName(tok)));
+      var f = new Bpl.IdentifierExpr(tok, fVar);
+      var ante = BplAnd(Bpl.Expr.Neq(o, Predef.Null), etran.IsAlloced(tok, o));
+      var inFrame = Bpl.Expr.Select(frame, o, f);
+      var notInFrame = Bpl.Expr.Not(inFrame);
+
+      var q = new Bpl.ForallExpr(tok, new List<TypeVariable>(), new List<Variable> { oVar, fVar },
+        BplImp(ante, notInFrame));
+      if (IsExprAlways(q, true)) {
+        return;
+      }
+      builder.Add(Assert(tok, q, desc, builder.Context, kv));
+    }
+
+    /// <summary>
+    /// Returns true if it can statically determine that the expression q always evaluates to truth
+    /// </summary>
+    /// <param name="q">The expression</param>
+    /// <param name="truth">The expected truth value that q might always have</param>
+    /// <returns>True if q is always of the boolean value "truth"</returns>
+    public static bool IsExprAlways(Bpl.Expr q, bool truth) {
+      if (q is Bpl.ForallExpr forallExpr) {
+        return truth && IsExprAlways(forallExpr.Body, true);
+      }
+      if (q is Bpl.ExistsExpr existsExpr) {
+        return !truth && IsExprAlways(existsExpr.Body, false);
+      }
+      if (q is Bpl.LiteralExpr { isBool: true } lit && lit.asBool == truth) {
+        return true;
+      }
+
+      if (q is Bpl.NAryExpr n) {
+        if (n.Fun is Bpl.BinaryOperator op && n.Args.Count == 2) {
+          switch (op.Op) {
+            case BinaryOperator.Opcode.And:
+              return truth
+                ? IsExprAlways(n.Args[0], true) && IsExprAlways(n.Args[1], true)
+                : IsExprAlways(n.Args[0], false) || IsExprAlways(n.Args[1], false);
+            case BinaryOperator.Opcode.Or:
+              return truth
+                ? IsExprAlways(n.Args[0], true) || IsExprAlways(n.Args[1], true)
+                : IsExprAlways(n.Args[0], false) && IsExprAlways(n.Args[1], false);
+            case BinaryOperator.Opcode.Imp:
+              return truth
+                ? IsExprAlways(n.Args[0], false) || IsExprAlways(n.Args[1], true)
+                : IsExprAlways(n.Args[0], true) && IsExprAlways(n.Args[1], false);
+          }
+        } else if (n.Fun is Bpl.UnaryOperator uop && n.Args.Count == 1) {
+          switch (uop.Op) {
+            case UnaryOperator.Opcode.Not:
+              return IsExprAlways(n.Args[0], !truth);
+          }
+        }
+      }
+
+      return false;
+    }
+
+    Bpl.Expr InRWClause(IOrigin tok, Bpl.Expr o, Bpl.Expr f, List<FrameExpression> rw, ExpressionTranslator etran,
+                        Expression receiverReplacement, Dictionary<IVariable, Expression> substMap) {
+      Contract.Requires(tok != null);
+      Contract.Requires(o != null);
+      // Contract.Requires(f != null); // f == null means approximate
+      Contract.Requires(etran != null);
+      Contract.Requires(cce.NonNullElements(rw));
+      Contract.Requires(substMap == null || cce.NonNullDictionaryAndValues(substMap));
+      Contract.Requires(Predef != null);
+      Contract.Requires(receiverReplacement == null || substMap != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+      return InRWClause(tok, o, f, rw, false, etran, receiverReplacement, substMap);
+    }
+    Bpl.Expr InRWClause(IOrigin tok, Bpl.Expr o, Bpl.Expr f, List<FrameExpression> rw, bool useInUnchanged,
+                        ExpressionTranslator etran,
+                        Expression receiverReplacement, Dictionary<IVariable, Expression> substMap) {
+      Contract.Requires(tok != null);
+      Contract.Requires(o != null);
+      // Contract.Requires(f != null); // f == null means approximate
+      Contract.Requires(etran != null);
+      Contract.Requires(cce.NonNullElements(rw));
+      Contract.Requires(substMap == null || cce.NonNullDictionaryAndValues(substMap));
+      Contract.Requires(Predef != null);
+      Contract.Requires(receiverReplacement == null || substMap != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+      var boxO = FunctionCall(tok, BuiltinFunction.Box, null, o);
+      return InRWClause_Aux(tok, o, boxO, f, rw, useInUnchanged, etran, receiverReplacement, substMap);
+    }
+
+    /// <summary>
+    /// By taking both an "o" and a "boxO" parameter, the caller has a choice of passing in either
+    /// "o, Box(o)" for some "o" or "Unbox(bx), bx" for some "bx".
+    /// </summary>
+    Bpl.Expr InRWClause_Aux(IOrigin tok, Bpl.Expr o, Bpl.Expr boxO, Bpl.Expr f, List<FrameExpression> rw, bool usedInUnchanged,
+                        ExpressionTranslator etran,
+                        Expression receiverReplacement, Dictionary<IVariable, Expression> substMap) {
+      Contract.Requires(tok != null);
+      Contract.Requires(o != null);
+      Contract.Requires(boxO != null);
+      // Contract.Requires(f != null); // f == null means approximate
+      Contract.Requires(etran != null);
+      Contract.Requires(cce.NonNullElements(rw));
+      Contract.Requires(substMap == null || cce.NonNullDictionaryAndValues(substMap));
+      Contract.Requires(Predef != null);
+      Contract.Requires((substMap == null && receiverReplacement == null) || substMap != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      // requires o to denote an expression of type RefType
+      // "rw" is allowed to contain a WildcardExpr
+
+      Bpl.Expr disjunction = Bpl.Expr.False;
+      foreach (FrameExpression rwComponent in rw) {
+        Expression e = rwComponent.E;
+        if (substMap != null) {
+          e = Substitute(e, receiverReplacement, substMap);
+        }
+
+        Bpl.Expr disjunct;
+        var eType = e.Type.NormalizeToAncestorType();
+        if (e is WildcardExpr) {
+          // For /allocated:{0,1,3}, "function f(...)... reads *"
+          // is more useful if "reads *" excludes unallocated references,
+          // because otherwise, "reads *" lets f depend on unallocated state,
+          // which means that f may change whenever any new allocation occurs,
+          // which is generally undesirable.  Also, Dafny doesn't let you
+          // say "reads set o :: allocated(o)", so it's hard to work around
+          // this issue.
+          disjunct = etran.IsAlloced(tok, o);
+        } else if (eType is SetType setType) {
+          // e[Box(o)]
+          bool pr;
+          disjunct = etran.TrInSet_Aux(tok, o, boxO, e, setType.Finite, true, out pr);
+        } else if (eType is MultiSetType) {
+          // e[Box(o)] > 0
+          disjunct = etran.TrInMultiSet_Aux(tok, o, boxO, e, true);
+        } else if (eType is SeqType) {
+          // (exists i: int :: 0 <= i && i < Seq#Length(e) && Seq#Index(e,i) == Box(o))
+          Bpl.Variable iVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$i", Bpl.Type.Int));
+          Bpl.Expr i = new Bpl.IdentifierExpr(tok, iVar);
+          Bpl.Expr iBounds = InSeqRange(tok, i, Type.Int, etran.TrExpr(e), true, null, false);
+          Bpl.Expr XsubI = FunctionCall(tok, BuiltinFunction.SeqIndex, Predef.BoxType, etran.TrExpr(e), i);
+          // TODO: the equality in the next line should be changed to one that understands extensionality
+          //TRIG (exists $i: int :: 0 <= $i && $i < Seq#Length(read($h0, this, _module.DoublyLinkedList.Nodes)) && Seq#Index(read($h0, this, _module.DoublyLinkedList.Nodes), $i) == $Box($o))
+          disjunct = new Bpl.ExistsExpr(tok, new List<Variable> { iVar }, BplAnd(iBounds, Bpl.Expr.Eq(XsubI, boxO)));  // LL_TRIGGER
+        } else {
+          // o == e
+          disjunct = Bpl.Expr.Eq(o, etran.TrExpr(e));
+        }
+        if (rwComponent.Field != null && f != null) {
+          Bpl.Expr q = Bpl.Expr.Eq(f, new Bpl.IdentifierExpr(rwComponent.E.Origin, GetField(rwComponent.Field)));
+          if (usedInUnchanged) {
+            q = BplOr(q,
+              Bpl.Expr.Eq(f, new Bpl.IdentifierExpr(rwComponent.E.Origin, Predef.AllocField)));
+          }
+          disjunct = BplAnd(disjunct, q);
+        }
+        disjunction = BplOr(disjunction, disjunct);
+      }
+      return disjunction;
+    }
+
+    public Bpl.Expr CtorInvocation(IOrigin tok, DatatypeCtor ctor, ExpressionTranslator etran,
+      Variables locals, BoogieStmtListBuilder localTypeAssumptions) {
+      Contract.Requires(tok != null);
+      Contract.Requires(ctor != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(localTypeAssumptions != null);
+      Contract.Requires(Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      // create local variables for the formals
+      var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator("a#");
+      var args = new List<Bpl.Expr>();
+      foreach (Formal arg in ctor.Formals) {
+        Contract.Assert(arg != null);
+        var nm = varNameGen.FreshId(string.Format("#{0}#", args.Count));
+        var bv = locals.GetOrAdd(new Bpl.LocalVariable(arg.Origin, new Bpl.TypedIdent(arg.Origin, nm, TrType(arg.Type))));
+        args.Add(new Bpl.IdentifierExpr(arg.Origin, bv));
+      }
+
+      Bpl.IdentifierExpr id = new Bpl.IdentifierExpr(tok, ctor.FullName, Predef.DatatypeType);
+      return new Bpl.NAryExpr(tok, new Bpl.FunctionCall(id), args);
+    }
+
+    void AddCasePatternVarSubstitutions(CasePattern<BoundVar> pat, Bpl.Expr rhs, Dictionary<IVariable, Expression> substMap) {
+      Contract.Requires(pat != null);
+      Contract.Requires(rhs != null);
+      Contract.Requires(substMap != null);
+      if (pat.Var != null) {
+        substMap.Add(pat.Var, new BoogieWrapper(rhs, pat.Var.Type));
+      } else if (pat.Arguments != null) {
+        Contract.Assert(pat.Ctor != null);  // follows from successful resolution
+        Contract.Assert(pat.Arguments.Count == pat.Ctor.Destructors.Count);  // follows from successful resolution
+        for (int i = 0; i < pat.Arguments.Count; i++) {
+          var arg = pat.Arguments[i];
+          var dtor = pat.Ctor.Destructors[i];
+          var r = new Bpl.NAryExpr(pat.Origin, new Bpl.FunctionCall(GetReadonlyField(dtor)), new List<Bpl.Expr> { rhs });
+          var de = CondApplyUnbox(pat.Origin, r, dtor.Type, arg.Expr.Type);
+          AddCasePatternVarSubstitutions(arg, de, substMap);
+        }
+      }
+    }
+
+    /// <summary>
+    /// If "expr" is a binary boolean operation, then try to re-associate it to make the left argument smaller.
+    /// If it is possible, then "true" is returned and "expr" returns as the re-associated expression (no boolean simplifications are performed).
+    /// If not, then "false" is returned and "expr" is unchanged.
+    /// </summary>
+    bool ReAssociateToTheRight(ref Expression expr) {
+      if (expr is BinaryExpr top && Expression.StripParens(top.E0) is BinaryExpr left) {
+        // We have an expression of the form "(A oo B) pp C"
+        var A = left.E0;
+        var oo = left.ResolvedOp;
+        var B = left.E1;
+        var pp = top.ResolvedOp;
+        var C = top.E1;
+
+        if (oo == BinaryExpr.ResolvedOpcode.And && pp == BinaryExpr.ResolvedOpcode.And) {
+          // rewrite    (A && B) && C    into    A && (B && C)
+          expr = Expression.CreateAnd(A, Expression.CreateAnd(B, C, false), false);
+          return true;
+        } else if (oo == BinaryExpr.ResolvedOpcode.And && pp == BinaryExpr.ResolvedOpcode.Imp) {
+          // rewrite    (A && B) ==> C    into    A ==> (B ==> C)
+          expr = Expression.CreateImplies(A, Expression.CreateImplies(B, C, false), false);
+          return true;
+        } else if (oo == BinaryExpr.ResolvedOpcode.Or && pp == BinaryExpr.ResolvedOpcode.Or) {
+          // rewrite    (A || B) || C    into    A || (B || C)
+          expr = Expression.CreateOr(A, Expression.CreateOr(B, C, false), false);
+          return true;
+        } else if (oo == BinaryExpr.ResolvedOpcode.Imp && pp == BinaryExpr.ResolvedOpcode.Or) {
+          // rewrite    (A ==> B) || C    into    A ==> (B || C)
+          expr = Expression.CreateImplies(A, Expression.CreateOr(B, C, false), false);
+          return true;
+        }
+      }
+      return false;
+    }
+
+    void CheckCasePatternShape<VT>(CasePattern<VT> pat, Expression dRhs, Bpl.Expr rhs, IOrigin rhsTok, Type rhsType, BoogieStmtListBuilder builder)
+      where VT : class, IVariable {
+      Contract.Requires(pat != null);
+      Contract.Requires(rhs != null);
+      Contract.Requires(rhsTok != null);
+      Contract.Requires(rhsType != null);
+      Contract.Requires(builder != null);
+      if (pat.Var != null) {
+        CheckSubrange(rhsTok, rhs, rhsType, pat.Var.Type, dRhs, builder);
+      } else if (pat.Arguments != null) {
+        Contract.Assert(pat.Ctor != null);  // follows from successful resolution
+        Contract.Assert(pat.Arguments.Count == pat.Ctor.Destructors.Count);  // follows from successful resolution
+        rhsType = rhsType.Normalize();
+        Contract.Assert(rhsType is UserDefinedType && ((UserDefinedType)rhsType).ResolvedClass != null);
+        var rhsTypeUdt = (UserDefinedType)rhsType;
+        var typeSubstMap = TypeParameter.SubstitutionMap(rhsTypeUdt.ResolvedClass.TypeArgs, rhsTypeUdt.TypeArgs);
+
+        var ctor = pat.Ctor;
+        var correctConstructor = FunctionCall(pat.Origin, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, rhs);
+        if (ctor.EnclosingDatatype.Ctors.Count == 1) {
+          // There is only one constructor, so the value must have been constructed by it; might as well assume that here.
+          builder.Add(TrAssumeCmd(pat.Origin, correctConstructor));
+        } else {
+          builder.Add(Assert(pat.Origin, correctConstructor, new PatternShapeIsValid(dRhs, ctor.Name), builder.Context));
+        }
+        for (int i = 0; i < pat.Arguments.Count; i++) {
+          var arg = pat.Arguments[i];
+          var dtor = ctor.Destructors[i];
+
+          var r = new Bpl.NAryExpr(arg.Origin, new Bpl.FunctionCall(GetReadonlyField(dtor)), new List<Bpl.Expr> { rhs });
+          Type argType = dtor.Type.Subst(typeSubstMap);
+          var de = CondApplyUnbox(arg.Origin, r, dtor.Type, argType);
+          CheckCasePatternShape(arg, arg.Expr, de, arg.Origin, argType, builder);
+        }
+      }
+    }
+
+    void CheckNonNull(IOrigin tok, Expression e, BoogieStmtListBuilder builder, ExpressionTranslator etran, Bpl.QKeyValue kv) {
+      Contract.Requires(tok != null);
+      Contract.Requires(e != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(Predef != null);
+
+      if (!e.Type.IsRefType) {
+        // nothing to do
+      } else if (e is ThisExpr) {
+        // already known to be non-null
+      } else if (e is StaticReceiverExpr) {
+        // also ok
+      } else {
+        builder.Add(Assert(tok, Bpl.Expr.Neq(etran.TrExpr(e), Predef.Null),
+          new NonNull("target object", e), builder.Context, kv));
+      }
+    }
+
+    void CloneVariableAsBoundVar(IOrigin tok, IVariable iv, string prefix, out BoundVar bv, out IdentifierExpr ie) {
+      Contract.Requires(tok != null);
+      Contract.Requires(iv != null);
+      Contract.Requires(prefix != null);
+      Contract.Ensures(Contract.ValueAtReturn(out bv) != null);
+      Contract.Ensures(Contract.ValueAtReturn(out ie) != null);
+
+      bv = new BoundVar(tok, CurrentIdGenerator.FreshId(prefix), iv.Type); // use this temporary variable counter, but for a Dafny name (the idea being that the number and the initial "_" in the name might avoid name conflicts)
+      ie = new IdentifierExpr(tok, bv.Name) {
+        Var = bv, // resolve here
+        Type = bv.Type // resolve here
+      };
+    }
+
+    // Use trType to translate types in the args list
+    Bpl.Expr ClassTyCon(UserDefinedType cl, List<Bpl.Expr> args) {
+      Contract.Requires(cl != null);
+      Contract.Requires(cce.NonNullElements(args));
+      return ClassTyCon(cl.ResolvedClass, args);
+    }
+
+    Bpl.Expr ClassTyCon(TopLevelDecl cl, List<Bpl.Expr> args) {
+      Contract.Requires(cl != null);
+      Contract.Requires(cce.NonNullElements(args));
+      return FunctionCall(cl.Origin, GetClassTyCon(cl), Predef.Ty, args);
+    }
+
+    // Takes a Bpl.Constant, which typically will be one from GetClass,
+    // or some built-in type which has a class name, like Arrays or Arrows.
+    // Note: Prefer to call ClassTyCon or TypeToTy instead.
+    private string GetClassTyCon(TopLevelDecl dl) {
+      Contract.Requires(dl != null);
+      if (dl is InternalTypeSynonymDecl isyn) {
+        dl = ((UserDefinedType)isyn.Rhs).ResolvedClass;
+      }
+      string name;
+      if (classConstants.TryGetValue(dl, out name)) {
+        Contract.Assert(name != null);
+      } else {
+        name = AddTyAxioms(dl);
+        classConstants.Add(dl, name);
+      }
+      return name;
+    }
+
+    public string Handle(int arity) {
+      return "Handle" + arity;
+    }
+
+    public static string Apply(int arity) {
+      return "Apply" + arity;
+    }
+
+    public static string Requires(int arity) {
+      return "Requires" + arity;
+    }
+
+    public static string Reads(int arity) {
+      return "Reads" + arity;
+    }
+
+    public string RequiresName(Function f) {
+      return f.FullSanitizedName + "#requires";
+    }
+
+    private Expr NewOneHeapExpr(IOrigin tok) {
+      return new Bpl.IdentifierExpr(tok, "$OneHeap", Predef.HeapType);
+    }
+
+    /// <summary>
+    /// For expression "e" that is expected to come from a modifies/unchanged frame, return information
+    /// that is useful for checking every reference from "e". More precisely,
+    ///  * If "e" denotes a reference, then return
+    ///       -- "description" as the string "object",
+    ///       -- "type" as the type of that reference,
+    ///       -- "obj" as the translation of that reference, and
+    ///       -- "antecedent" as "true".
+    ///  * If "e" denotes a set of references, then return
+    ///       -- "description" as the string "set element",
+    ///       -- "type" as the element type of that set,
+    ///       -- "obj" as a new identifier of type "type", and
+    ///       -- "antecedent" as "obj in e".
+    ///  * If "e" denotes a multiset of references, then return
+    ///       -- "description" as the string "multiset element",
+    ///       -- "type" as the element type of that multiset,
+    ///       -- "obj" as a new identifier of type "type", and
+    ///       -- "antecedent" as "e[obj] > 0".
+    ///  * If "e" denotes a sequence of references, then return
+    ///       -- "description" as the string "sequence element",
+    ///       -- "type" as the element type of that sequence,
+    ///       -- "obj" as an expression "e[i]", where "i" is a new identifier, and
+    ///       -- "antecedent" as "0 <= i < |e|".
+    /// </summary>
+    void EachReferenceInFrameExpression(Expression e, Variables locals, BoogieStmtListBuilder builder, ExpressionTranslator etran,
+      out string description, out Type type, out Bpl.Expr obj, out Bpl.Expr antecedent) {
+      Contract.Requires(e != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+
+      if (e.Type.IsRefType) {
+        description = "object";
+        type = e.Type;
+        obj = etran.TrExpr(e);
+        antecedent = Bpl.Expr.True;
+        return;
+      }
+
+      var eType = e.Type.NormalizeToAncestorType();
+      var isSetType = eType.AsSetType != null;
+      var isMultisetType = eType.AsMultiSetType != null;
+      Contract.Assert(isSetType || isMultisetType || eType.AsSeqType != null);
+      var sType = eType.AsCollectionType;
+      Contract.Assert(sType != null);
+      type = sType.Arg;
+      // var $x
+      var name = CurrentIdGenerator.FreshId("$unchanged#x");
+      var xVar = locals.GetOrAdd(new Bpl.LocalVariable(e.Origin, new Bpl.TypedIdent(e.Origin, name, isSetType || isMultisetType ? TrType(type) : Bpl.Type.Int)));
+      var x = new Bpl.IdentifierExpr(e.Origin, xVar);
+      // havoc $x
+      builder.Add(new Bpl.HavocCmd(e.Origin, new List<Bpl.IdentifierExpr>() { x }));
+
+      var s = etran.TrExpr(e);
+      if (isSetType) {
+        description = "set element";
+        obj = x;
+        antecedent = IsSetMember(e.Origin, s, BoxIfNecessary(e.Origin, x, type), eType.NormalizeToAncestorType().AsSetType.Finite);
+      } else if (isMultisetType) {
+        description = "multiset element";
+        obj = x;
+        antecedent = Boogie.Expr.Gt(MultisetMultiplicity(e.Origin, s, BoxIfNecessary(e.Origin, x, type)), Boogie.Expr.Literal(0));
+      } else {
+        description = "sequence element";
+        obj = UnboxUnlessInherentlyBoxed(FunctionCall(e.Origin, BuiltinFunction.SeqIndex, Predef.BoxType, s, x), type);
+        antecedent = InSeqRange(e.Origin, x, Type.Int, s, true, null, false);
+      }
+    }
+
+    private Bpl.Expr IsSetMember(IToken tok, Bpl.Expr set, Bpl.Expr boxedElement, bool isFiniteSet) {
+      if (isFiniteSet) {
+        return FunctionCall(tok, BuiltinFunction.SetIsMember, null, set, boxedElement);
+      } else {
+        return Bpl.Expr.SelectTok(tok, set, boxedElement);
+      }
+    }
+
+    private Bpl.Expr MultisetMultiplicity(IToken tok, Bpl.Expr multiset, Bpl.Expr boxedElement) {
+      return FunctionCall(tok, BuiltinFunction.MultiSetMultiplicity, null, multiset, boxedElement);
+    }
+
+    private Bpl.Expr UpdateMultisetMultiplicity(IToken tok, Bpl.Expr multiset, Bpl.Expr boxedElement, Bpl.Expr newMultiplicity) {
+      return FunctionCall(tok, BuiltinFunction.MultiSetUpdateMultiplicity, null, multiset, boxedElement, newMultiplicity);
+    }
+
+    private Bpl.Function GetOrCreateTypeConstructor(TopLevelDecl td) {
+      if (declarationMapping.TryGetValue(td, out var result)) {
+        return result;
+      }
+
+      Bpl.Function func;
+      if (td is TraitDecl { IsObjectTrait: true }) {
+        // the type constructor for "object" is in DafnyPrelude.bpl
+        func = Predef.ObjectTypeConstructor;
+      } else if (td is TupleTypeDecl ttd && ttd.Dims == 2 && ttd.NonGhostDims == 2) {
+        // the type constructor for "Tuple2" is in DafnyPrelude.bpl
+        func = this.Predef.Tuple2TypeConstructor;
+      } else {
+        var inner_name = GetClass(td).TypedIdent.Name;
+        string name = "T" + inner_name;
+
+        Bpl.Variable tyVarOut = BplFormalVar(null, Predef.Ty, false);
+        var args = td.TypeArgs.ConvertAll(_ => (Bpl.Variable)BplFormalVar(null, Predef.Ty, true));
+        func = new Bpl.Function(td.Origin, name, args, tyVarOut);
+        sink.AddTopLevelDeclaration(func);
+
+        if (td is AbstractTypeDecl or InternalTypeSynonymDecl) {
+          // axiom (forall T0, T1, ... { T(T0, T1, T2) } :: WhereClause( T(T0, T1, T2) ));
+          var argBoundVars = new List<Bpl.Variable>();
+          var argExprs = td.TypeArgs.ConvertAll(ta => BplBoundVar(ta.Name, Predef.Ty, argBoundVars));
+          var funcAppl = FunctionCall(td.Origin, name, Predef.Ty, argExprs);
+          var characteristics = td is AbstractTypeDecl ? ((AbstractTypeDecl)td).Characteristics : ((InternalTypeSynonymDecl)td).Characteristics;
+          var whereClause = GetTyWhereClause(funcAppl, characteristics);
+          if (whereClause != null) {
+            Bpl.Expr axiom;
+            if (td.TypeArgs.Count == 0) {
+              axiom = whereClause;
+            } else {
+              var tr = new Bpl.Trigger(td.Origin, true, new List<Bpl.Expr> { funcAppl });
+              axiom = new Bpl.ForallExpr(td.Origin, new List<Bpl.TypeVariable>(), argBoundVars, null, tr, whereClause);
+            }
+            AddOtherDefinition(func, BplAxiom(axiom));
+          }
+        }
+      }
+
+      declarationMapping[td] = func;
+      return func;
+    }
+
+    Bpl.Constant GetClass(TopLevelDecl cl) {
+      Contract.Requires(cl != null);
+      Contract.Requires(Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.Constant>() != null);
+
+      if (classes.TryGetValue(cl, out var cc)) {
+        Contract.Assert(cc != null);
+      } else {
+        var name = cl.FullSanitizedName;
+        if (cl is ClassLikeDecl { NonNullTypeDecl: { } }) {
+          name = name + "?";  // TODO: this doesn't seem like the best place to do this name transformation
+        }
+        cc = new Bpl.Constant(cl.Origin, new Bpl.TypedIdent(cl.Origin, "class." + name, Predef.ClassNameType), !cl.EnclosingModuleDefinition.IsFacade);
+        classes.Add(cl, cc);
+      }
+      return cc;
+    }
+
+    Bpl.Constant GetFieldNameFamily(string n) {
+      Contract.Requires(n != null);
+      Contract.Requires(Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.Constant>() != null);
+
+      if (fieldConstants.TryGetValue(n, out var cc)) {
+        Contract.Assert(cc != null);
+      } else {
+        cc = new Bpl.Constant(Token.NoToken, new Bpl.TypedIdent(Token.NoToken, "field$" + n, Predef.NameFamilyType), true);
+        fieldConstants.Add(n, cc);
+      }
+      return cc;
+    }
+
+    /// <summary>
+    /// This method is expected to be called just once for each function in the program.
+    /// </summary>
+    Bpl.Function GetOrCreateFunction(Function f) {
+      if (declarationMapping.TryGetValue(f, out var result)) {
+        return result;
+      }
+
+      Contract.Requires(f != null);
+      Contract.Requires(Predef != null && sink != null);
+
+      var func = GetFunctionBoogieDefinition(f);
+      sink.AddTopLevelDeclaration(func);
+
+      sink.AddTopLevelDeclaration(GetCanCallFunction(f));
+
+      declarationMapping[f] = func;
+      return func;
+    }
+
+    private Bpl.Function GetFunctionBoogieDefinition(Function f) {
+      Bpl.Function func;
+      {
+        var formals = new List<Variable>();
+        formals.AddRange(MkTyParamFormals(GetTypeParams(f), false));
+        if (f.IsFuelAware()) {
+          formals.Add(new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, "$ly", Predef.LayerType), true));
+        }
+
+        if (f.IsOpaque || f.IsMadeImplicitlyOpaque(options)) {
+          formals.Add(new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, "$reveal", Boogie.Type.Bool), true));
+        }
+        if (f is TwoStateFunction) {
+          formals.Add(new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, "$prevHeap", Predef.HeapType), true));
+        }
+        if (f.ReadsHeap) {
+          formals.Add(new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, "$heap", Predef.HeapType), true));
+        }
+        if (!f.IsStatic) {
+          formals.Add(new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, "this", TrReceiverType(f)), true));
+        }
+        foreach (var p in f.Ins) {
+          formals.Add(new Bpl.Formal(p.Origin, new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)), true));
+        }
+        var res = new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, Bpl.TypedIdent.NoName, TrType(f.ResultType)), false);
+        func = new Bpl.Function(new FromDafnyNode(f), f.FullSanitizedName, new List<Bpl.TypeVariable>(), formals, res, "function declaration for " + f.FullName);
+        if (InsertChecksums) {
+          InsertChecksum(f, func);
+        }
+      }
+      return func;
+    }
+
+    private Bpl.Function GetCanCallFunction(Function f) {
+      Bpl.Function canCallF;
+      {
+        var formals = new List<Variable>();
+        formals.AddRange(MkTyParamFormals(GetTypeParams(f), false));
+        if (f is TwoStateFunction) {
+          formals.Add(new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, "$prevHeap", Predef.HeapType), true));
+        }
+        if (f.ReadsHeap) {
+          formals.Add(new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, "$heap", Predef.HeapType), true));
+        }
+        if (!f.IsStatic) {
+          formals.Add(new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, "this", TrReceiverType(f)), true));
+        }
+        foreach (var p in f.Ins) {
+          formals.Add(new Bpl.Formal(p.Origin, new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)), true));
+        }
+        var res = new Bpl.Formal(f.Origin, new Bpl.TypedIdent(f.Origin, Bpl.TypedIdent.NoName, Bpl.Type.Bool), false);
+        canCallF = new Bpl.Function(f.Origin, f.FullSanitizedName + "#canCall", new List<Bpl.TypeVariable>(), formals, res);
+      }
+      return canCallF;
+    }
+
+    /// <summary>
+    /// A method can have several translations, suitable for different purposes.
+    /// SpecWellformedness
+    ///    This procedure is suitable for the wellformedness check of the
+    ///    method's specification.
+    ///    This means the pre- and postconditions are not filled in, since the
+    ///    body of the procedure is going to check that these are well-formed in
+    ///    the first place.
+    /// InterModuleCall
+    ///    This procedure is suitable for inter-module callers.
+    ///    This means that predicate definitions inlined only for non-protected predicates.
+    /// IntraModuleCall
+    ///    This procedure is suitable for non-co-call intra-module callers.
+    ///    This means that predicates can be inlined in the usual way.
+    /// CoCall
+    ///    This procedure is suitable for (intra-module) co-calls.
+    ///    In these calls, some uses of greatest predicates may be replaced by
+    ///    proof certificates.  Note, unless the method is a greatest lemma, there
+    ///    is no reason to include a procedure for co-calls.
+    /// Implementation
+    ///    This procedure is suitable for checking the implementation of the
+    ///    method.
+    ///    If the method has no body, there is no reason to include this kind
+    ///    of procedure.
+    ///
+    /// Note that SpecWellformedness and Implementation have procedure implementations
+    /// but no callers, and vice versa for InterModuleCall, IntraModuleCall, and CoCall.
+    /// </summary>
+    enum MethodTranslationKind { SpecWellformedness, Call, CoCall, Implementation, OverrideCheck }
+
+    private static readonly Dictionary<MethodTranslationKind, string> kindSanitizedPrefix =
+      new() {
+        { MethodTranslationKind.SpecWellformedness, "CheckWellFormed" },
+        { MethodTranslationKind.Call, CallPrefix },
+        { MethodTranslationKind.CoCall, "CoCall" },
+        { MethodTranslationKind.Implementation, "Impl" },
+        { MethodTranslationKind.OverrideCheck, "OverrideCheck" },
+      };
+
+    static string MethodName(ICodeContext m, MethodTranslationKind kind) {
+      Contract.Requires(m != null);
+      return $"{kindSanitizedPrefix[kind]}{NameSeparator}{m.FullSanitizedName}";
+    }
+
+    private static readonly Dictionary<MethodTranslationKind, string> kindDescription =
+      new() {
+        {MethodTranslationKind.SpecWellformedness, "well-formedness"},
+        {MethodTranslationKind.Call, "call"},
+        {MethodTranslationKind.CoCall, "co-call"},
+        {MethodTranslationKind.Implementation, "correctness"},
+        {MethodTranslationKind.OverrideCheck, "override check"},
+      };
+
+    static string MethodVerboseName(string fullName, MethodTranslationKind kind) {
+      Contract.Requires(fullName != null);
+      return $"{fullName} ({kindDescription[kind]})";
+    }
+
+    private static void AddVerboseNameAttribute(Bpl.NamedDeclaration boogieDecl, string dafnyName, MethodTranslationKind kind) {
+      var verboseName = MethodVerboseName(dafnyName, kind);
+      AddVerboseNameAttribute(boogieDecl, verboseName);
+    }
+
+    private static void AddVerboseNameAttribute(Bpl.NamedDeclaration targetDecl, string verboseName) {
+      targetDecl.AddAttribute("verboseName", new object[] { verboseName });
+    }
+
+    private static void AddSmtOptionAttribute(Bpl.NamedDeclaration targetDecl, string name, string value) {
+      targetDecl.Attributes = new QKeyValue(targetDecl.tok, "smt_option", new List<object>() { name, value }, targetDecl.Attributes);
+    }
+
+    private static CallCmd Call(BodyTranslationContext context, IOrigin tok, string methodName,
+      List<Expr> ins, List<Bpl.IdentifierExpr> outs) {
+      Contract.Requires(tok != null);
+      Contract.Requires(methodName != null);
+      Contract.Requires(ins != null);
+      Contract.Requires(outs != null);
+
+      var call = new CallCmd(tok, methodName, ins, outs) {
+        IsFree = context.AssertMode == AssertMode.Assume
+      };
+      // CLEMENT enable this: call.ErrorData = "possible violation of function precondition";
+      return call;
+    }
+
+    private void GenerateMethodParameters(IOrigin tok, Method m, MethodTranslationKind kind, ExpressionTranslator etran,
+      List<Variable> inParams, out Variables outParams) {
+      GenerateMethodParametersChoose(tok, m, kind, !m.IsStatic, true, true, etran, inParams, out outParams);
+    }
+
+    private void GenerateMethodParametersChoose(IOrigin tok, IMethodCodeContext m, MethodTranslationKind kind, bool includeReceiver, bool includeInParams, bool includeOutParams,
+      ExpressionTranslator etran, List<Variable> inParams, out Variables outParams) {
+      outParams = new Variables();
+      // Add type parameters first, always!
+      inParams.AddRange(MkTyParamFormals(GetTypeParams(m), true));
+      if (includeReceiver) {
+        var receiverType = m is MemberDecl ? ModuleResolver.GetReceiverType(tok, (MemberDecl)m) : ModuleResolver.GetThisType(tok, (IteratorDecl)m);
+        Contract.Assert(VisibleInScope(receiverType));
+
+        Bpl.Expr wh;
+        var receiver = new Bpl.IdentifierExpr(tok, "this", TrType(receiverType));
+        if (m is Constructor && kind is MethodTranslationKind.Implementation or MethodTranslationKind.SpecWellformedness) {
+          // For constructors, the typical "where" condition is added in an assumption in the body, rather than in the parameter declaration itself
+          wh = null;
+        } else {
+          wh = BplAnd(
+            ReceiverNotNull(receiver),
+            (m is TwoStateLemma ? etran.Old : etran).GoodRef(tok, receiver, receiverType));
+        }
+        // for class constructors, the receiver is encoded as an output parameter
+        Bpl.Formal thVar = new Bpl.Formal(tok, new Bpl.TypedIdent(tok, "this", TrType(receiverType), wh),
+          m is not Constructor);
+        if (thVar.InComing) {
+          inParams.Add(thVar);
+        } else {
+          outParams.GetOrAdd(thVar);
+        }
+      }
+      if (includeInParams) {
+        foreach (Formal p in m.Ins) {
+          Contract.Assert(VisibleInScope(p.Type));
+          Bpl.Type varType = TrType(p.Type);
+          Bpl.Expr wh = GetExtendedWhereClause(p.Origin,
+            new Bpl.IdentifierExpr(p.Origin, p.AssignUniqueName(CurrentDeclaration.IdGenerator), varType),
+            p.Type, p.IsOld ? etran.Old : etran, IsAllocContext.Var(p));
+          inParams.Add(new Bpl.Formal(p.Origin, new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(CurrentDeclaration.IdGenerator), varType, wh), true));
+        }
+      }
+      if (includeOutParams) {
+        var beforeTrackers = DefiniteAssignmentTrackers;
+        Contract.Assume(DefiniteAssignmentTrackers.Count == 0);
+        foreach (Formal p in m.Outs) {
+          Contract.Assert(VisibleInScope(p.Type));
+          Contract.Assert(!p.IsOld);  // out-parameters are never old (perhaps we want to relax this condition in the future)
+          Bpl.Type varType = TrType(p.Type);
+          Bpl.Expr wh = GetWhereClause(p.Origin,
+            new Bpl.IdentifierExpr(p.Origin, p.AssignUniqueName(CurrentDeclaration.IdGenerator), varType),
+            p.Type, etran, IsAllocContext.Var(p));
+          if (kind == MethodTranslationKind.Implementation) {
+            var tracker = AddDefiniteAssignmentTracker(p, outParams, true, m.IsGhost);
+            if (wh != null && tracker != null) {
+              wh = BplImp(tracker, wh);
+            }
+          }
+          outParams.GetOrAdd(new Bpl.Formal(p.Origin, new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(CurrentDeclaration.IdGenerator), varType, wh), false));
+          DefiniteAssignmentTrackers = beforeTrackers;
+        }
+
+        if (kind == MethodTranslationKind.Implementation) {
+          outParams.GetOrAdd(new Bpl.Formal(tok, new Bpl.TypedIdent(tok, "$_reverifyPost", Bpl.Type.Bool), false));
+        }
+      }
+    }
+
+    class BoilerplateTriple {  // a triple that is now a quintuple
+      [ContractInvariantMethod]
+      void ObjectInvariant() {
+        Contract.Invariant(tok != null);
+        Contract.Invariant(Expr != null);
+        Contract.Invariant(IsFree || ErrorMessage != null);
+      }
+
+      public readonly IOrigin tok;
+      public readonly bool IsFree;
+      public readonly Bpl.Expr Expr;
+      public readonly string ErrorMessage;
+      public readonly string SuccessMessage;
+      public readonly string Comment;
+
+
+      public BoilerplateTriple(IOrigin tok, bool isFree, Bpl.Expr expr, string errorMessage, string successMessage, string comment) {
+        Contract.Requires(tok != null);
+        Contract.Requires(expr != null);
+        Contract.Requires(isFree || errorMessage != null);
+        this.tok = tok;
+        IsFree = isFree;
+        Expr = expr;
+        ErrorMessage = errorMessage;
+        SuccessMessage = successMessage;
+        Comment = comment;
+      }
+    }
+
+    /// <summary>
+    /// There are 3 states of interest when generating two-state boilerplate:
+    ///  S0. the beginning of the method or loop, which is where the modifies clause is interpreted
+    ///  S1. the pre-state of the two-state interval
+    ///  S2. the post-state of the two-state interval
+    /// This method assumes that etranPre denotes S1, etran denotes S2, and that etranMod denotes S0.
+    /// </summary>
+    List<BoilerplateTriple/*!*/>/*!*/ GetTwoStateBoilerplate(IOrigin/*!*/ tok,
+      List<FrameExpression/*!*/>/*!*/ modifiesClause, bool isGhostContext, bool canAllocate,
+      ExpressionTranslator/*!*/ etranPre, ExpressionTranslator/*!*/ etran, ExpressionTranslator/*!*/ etranMod) {
+      Contract.Requires(tok != null);
+      Contract.Requires(modifiesClause != null);
+      Contract.Requires(etranPre != null);
+      Contract.Requires(etran != null);
+      Contract.Ensures(cce.NonNullElements(Contract.Result<List<BoilerplateTriple>>()));
+
+      var boilerplate = new List<BoilerplateTriple>();
+      if (!canAllocate && modifiesClause.Count == 0) {
+        // plain and simple:  S1 == S2
+        boilerplate.Add(new BoilerplateTriple(tok, true, Bpl.Expr.Eq(etranPre.HeapExpr, etran.HeapExpr), null, null, "frame condition"));
+      } else {
+        bool fieldGranularity = true;
+        bool objectGranularity = !fieldGranularity;
+        // the frame condition, which is free since it is checked with every heap update and call
+        boilerplate.Add(new BoilerplateTriple(tok, true, FrameCondition(tok, modifiesClause, canAllocate, FrameExpressionUse.Modifies, etranPre, etran, etranMod, objectGranularity), null, null, "frame condition: object granularity"));
+        if (modifiesClause.Exists(fe => fe.FieldName != null)) {
+          boilerplate.Add(new BoilerplateTriple(tok, true, FrameCondition(tok, modifiesClause, canAllocate, FrameExpressionUse.Modifies, etranPre, etran, etranMod, fieldGranularity), null, null, "frame condition: field granularity"));
+        }
+        // HeapSucc(S1, S2) or HeapSuccGhost(S1, S2)
+        Bpl.Expr heapSucc = HeapSucc(etranPre.HeapExpr, etran.HeapExpr, isGhostContext);
+        boilerplate.Add(new BoilerplateTriple(tok, true, heapSucc, null, null, "boilerplate"));
+      }
+      return boilerplate;
+    }
+
+    /// <summary>
+    /// There are 3 states of interest when generating a frame condition:
+    ///  S0. the beginning of the method/loop, which is where the frame is interpreted
+    ///  S1. the pre-state of the two-state interval
+    ///  S2. the post-state of the two-state interval
+    /// This method assumes that etranPre denotes S1, etran denotes S2, and that etranMod denotes S0.
+    /// "use" being "Modifies" says to produce this frame condition:
+    ///      if it's not in the frame, then it is unchanged
+    /// "use" being "Reads" says to produce this frame condition:
+    ///      if it's in the frame, then it is unchanged
+    /// "use" being "Unchanged" says to produce this frame condition:
+    ///      if it's in the frame, then it is unchanged,
+    ///      and if it has a field designation, then furthermore 'alloc' is unchanged
+    /// </summary>
+    Bpl.Expr/*!*/ FrameCondition(IOrigin/*!*/ tok, List<FrameExpression/*!*/>/*!*/ frame, bool canAllocate, FrameExpressionUse use,
+      ExpressionTranslator/*!*/ etranPre, ExpressionTranslator/*!*/ etran, ExpressionTranslator/*!*/ etranMod, bool fieldGranularity) {
+      Contract.Requires(tok != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(etranPre != null);
+      Contract.Requires(cce.NonNullElements(frame));
+      Contract.Requires(Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      // read is handled in AddFrameAxiom
+      //
+      // if field granularity:
+      // generate:
+      //  (forall o: ref, f: Field :: { $Heap[o][f] }
+      //      o != null
+      // #if use==Modifies
+      //      && old($Heap)[o][alloc]                     // include only in contexts that can allocate
+      // #endif
+      //      ==>
+      // #if use==Modifies
+      //        $Heap[o][f] == PreHeap[o][f] ||
+      //        (o,f) in modifiesClause)
+      // #else
+      //        (o,f) in readsClause
+      // #if use==Unchanged
+      //        or f==alloc && there's some f' such that (o,f') in readsClause
+      // #endif
+      //        ==>
+      //        $Heap[o][f] == PreHeap[o][f])
+      // #endif
+      //
+      // if object granularity:
+      // generate:
+      //  (forall o: ref :: { $Heap[o] }
+      //      o != null
+      // #if use==Modifies
+      //      && old($Heap)[o][alloc]                     // include only in contexts that can allocate
+      // #endif
+      //      ==>
+      // #if use==Modifies
+      //        $Heap[o] == PreHeap[o] ||
+      //        o in modifiesClause)
+      // #else
+      //        o in readsClause
+      //        ==>
+      //        $Heap[o] == PreHeap[o])
+      // #endif
+      var oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", Predef.RefType));
+      var o = new Bpl.IdentifierExpr(tok, oVar);
+
+      Bpl.Expr f;
+      List<Variable> quantifiedVars;
+      List<TypeVariable> typeVars;
+      Bpl.Expr heapOF;
+      Bpl.Expr preHeapOF;
+      if (fieldGranularity) {
+        typeVars = new List<TypeVariable> { };
+        var fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", Predef.FieldName(tok)));
+        f = new Bpl.IdentifierExpr(tok, fVar);
+        quantifiedVars = new List<Variable> { oVar, fVar };
+        heapOF = ReadHeap(tok, etran.HeapExpr, o, f);
+        preHeapOF = ReadHeap(tok, etranPre.HeapExpr, o, f);
+      } else {
+        // object granularity
+        typeVars = new List<TypeVariable>();
+        f = null;
+        quantifiedVars = new List<Variable> { oVar };
+        heapOF = ReadHeap(tok, etran.HeapExpr, o);
+        preHeapOF = ReadHeap(tok, etranPre.HeapExpr, o);  // Box type is Bpl.Type.Bool, but no need to unbox for equality check
+      }
+
+      Bpl.Expr ante = Bpl.Expr.Neq(o, Predef.Null);
+      if (canAllocate && use == FrameExpressionUse.Modifies) {
+        ante = BplAnd(ante, etranMod.IsAlloced(tok, o));
+      }
+      var eq = Bpl.Expr.Eq(heapOF, preHeapOF);
+      var ofInFrame = InRWClause(tok, o, f, frame, use == FrameExpressionUse.Unchanged, etranMod, null, null);
+      Bpl.Expr consequent = use == FrameExpressionUse.Modifies ? BplOr(eq, ofInFrame) : BplImp(ofInFrame, eq);
+
+      var tr = new Bpl.Trigger(tok, true, new List<Bpl.Expr> { heapOF });
+      return new Bpl.ForallExpr(tok, typeVars, quantifiedVars, null, tr, BplImp(ante, consequent));
+    }
+
+    Bpl.Expr/*!*/ FrameConditionUsingDefinedFrame(IOrigin/*!*/ tok, ExpressionTranslator/*!*/ etranPre, ExpressionTranslator/*!*/ etran, ExpressionTranslator/*!*/ etranMod, Boogie.IdentifierExpr frameExpr) {
+      Contract.Requires(tok != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(etranPre != null);
+      Contract.Requires(Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      // generate:
+      //  (forall o: ref, f: Field :: { $Heap[o,f] }
+      //      o != null && old($Heap)[o,alloc] ==>
+      //        $Heap[o,f] == PreHeap[o,f] ||
+      //        $_Frame[o,f])
+      Bpl.BoundVariable oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", Predef.RefType));
+      Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(tok, oVar);
+      Bpl.BoundVariable fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", Predef.FieldName(tok)));
+      Bpl.IdentifierExpr f = new Bpl.IdentifierExpr(tok, fVar);
+
+      Bpl.Expr heapOF = ReadHeap(tok, etran.HeapExpr, o, f);
+      Bpl.Expr preHeapOF = ReadHeap(tok, etranPre.HeapExpr, o, f);
+      Bpl.Expr ante = BplAnd(Bpl.Expr.Neq(o, Predef.Null), etranPre.IsAlloced(tok, o));
+      Bpl.Expr consequent = Bpl.Expr.Eq(heapOF, preHeapOF);
+
+      consequent = BplOr(consequent, Bpl.Expr.SelectTok(tok, frameExpr, o, f));
+
+      Bpl.Trigger tr = new Bpl.Trigger(tok, true, new List<Bpl.Expr> { heapOF });
+      return new Bpl.ForallExpr(tok, new List<TypeVariable>(), new List<Variable> { oVar, fVar }, null, tr, BplImp(ante, consequent));
+    }
+    // ----- Type ---------------------------------------------------------------------------------
+
+    static Type NormalizeToVerificationTypeRepresentation(Type type) {
+      while (true) {
+        type = type.NormalizeExpand();
+        if (type is TypeProxy) {
+          Contract.Assume(false);  // we assume that all proxies have been dealt with in the resolver
+        }
+        if (type.AsNewtype is not { } newtypeDecl) {
+          break;
+        }
+        type = newtypeDecl.RhsWithArgument(type.TypeArgs);  // the Boogie type to be used for the newtype is the same as for the base type
+      }
+      return type;
+    }
+
+    // Translates a type into the representation Boogie type,
+    // c.f. TypeToTy which translates a type to its Boogie expression
+    // to be used in $Is and $IsAlloc.
+    public Bpl.Type TrType(Type type) {
+      Contract.Requires(type != null);
+      Contract.Requires(Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.Type>() != null);
+
+      type = NormalizeToVerificationTypeRepresentation(type);
+
+      if (type is BoolType) {
+        return Bpl.Type.Bool;
+      } else if (type is CharType) {
+        return Predef.CharType;
+      } else if (type is IntType) {
+        return Bpl.Type.Int;
+      } else if (type is RealType) {
+        return Bpl.Type.Real;
+      } else if (type is BigOrdinalType) {
+        return Predef.BigOrdinalType;
+      } else if (type is BitvectorType) {
+        var t = (BitvectorType)type;
+        return BplBvType(t.Width);
+      } else if (type is IteratorDecl.EverIncreasingType) {
+        return Bpl.Type.Int;
+      } else if (type is ArrowType) {
+        return Predef.HandleType;
+      } else if (type.IsTypeParameter || type.IsAbstractType) {
+        return Predef.BoxType;
+      } else if (type.IsInternalTypeSynonym) {
+        return Predef.BoxType;
+      } else if (type.IsRefType) {
+        // object and class types translate to ref
+        return Predef.RefType;
+      } else if (type is UserDefinedType { ResolvedClass: TraitDecl }) {
+        // non-reference trait type
+        return Predef.BoxType;
+      } else if (type.IsDatatype) {
+        return Predef.DatatypeType;
+      } else if (type is SetType) {
+        return ((SetType)type).Finite ? Predef.SetType : Predef.ISetType;
+      } else if (type is MultiSetType) {
+        return Predef.MultiSetType;
+      } else if (type is MapType) {
+        return ((MapType)type).Finite ? Predef.MapType : Predef.IMapType;
+      } else if (type is SeqType) {
+        return Predef.SeqType;
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    public Bpl.Expr AdaptBoxing(Bpl.IToken tok, Bpl.Expr e, Type fromType, Type toType) {
+      if (fromType.IsTypeParameter) {
+        return CondApplyUnbox(tok, e, fromType, toType);
+      } else {
+        return CondApplyBox(tok, e, fromType, toType);
+      }
+    }
+
+    public Bpl.Expr CondApplyBox(Bpl.IToken tok, Bpl.Expr e, Type fromType, Type toType) {
+      Contract.Requires(tok != null);
+      Contract.Requires(e != null);
+      Contract.Requires(fromType != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      if (!ModeledAsBoxType(fromType) && (toType == null || ModeledAsBoxType(toType))) {
+        // if "e" denotes "Unbox(E): T", then just return "E"
+        if (e is Bpl.NAryExpr { Fun: Bpl.TypeCoercion } coerce) {
+          Contract.Assert(coerce.Args.Count == 1);
+          Contract.Assert(Bpl.Type.Equals(((Bpl.TypeCoercion)coerce.Fun).Type, TrType(fromType)));
+          if (coerce.Args[0] is Bpl.NAryExpr { Fun: Bpl.FunctionCall { FunctionName: UnboxFunctionName } } call) {
+            Contract.Assert(call.Args.Count == 1);
+            return call.Args[0];
+          }
+        }
+        // return "Box(e)"
+        return FunctionCall(tok, BuiltinFunction.Box, null, e);
+      } else {
+        return e;
+      }
+    }
+
+    public Bpl.Expr BoxIfNecessary(Bpl.IToken tok, Bpl.Expr e, Type fromType) {
+      Contract.Requires(tok != null);
+      Contract.Requires(e != null);
+      Contract.Requires(fromType != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      return CondApplyBox(tok, e, fromType, null);
+    }
+
+    public Bpl.Expr CondApplyUnbox(Bpl.IToken tok, Bpl.Expr e, Type fromType, Type toType) {
+      Contract.Requires(tok != null);
+      Contract.Requires(e != null);
+      Contract.Requires(fromType != null);
+      Contract.Requires(toType != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      if (ModeledAsBoxType(fromType) && !ModeledAsBoxType(toType)) {
+        return FunctionCall(tok, BuiltinFunction.Unbox, TrType(toType), e);
+      } else {
+        return e;
+      }
+    }
+
+    /// <summary>
+    ///   If the type is not normally boxed, insert a box around it.
+    ///   For lambda functions.
+    /// </summary>
+    public Bpl.Expr BoxIfNotNormallyBoxed(Bpl.IToken tok, Bpl.Expr e, Type t) {
+      if (!ModeledAsBoxType(t)) {
+        return ApplyBox(tok, e);
+      } else {
+        return e;
+      }
+    }
+
+    /// <summary>
+    ///   If the passed expression is not already boxed, box it.
+    /// </summary>
+    public Bpl.Expr ApplyBox(Bpl.IToken tok, Bpl.Expr e) {
+      Contract.Assert(tok != null);
+      Contract.Assert(e != null);
+      if (e.Type == Predef.BoxType || e is NAryExpr { Fun.FunctionName: BoxFunctionName }) {
+        return e;
+      }
+      return FunctionCall(tok, BuiltinFunction.Box, null, e);
+    }
+
+    /// <summary>
+    ///   If the expression is boxed, but the type is not boxed, this unboxes it.
+    ///   For lambda functions.
+    /// </summary>
+    public Bpl.Expr UnboxUnlessInherentlyBoxed(Bpl.Expr e, Type t) {
+      if (!ModeledAsBoxType(t)) {
+        return FunctionCall(e.tok, BuiltinFunction.Unbox, TrType(t), e);
+      } else {
+        return e;
+      }
+    }
+
+    public Expr UnboxUnlessBoxType(IOrigin tok, Expr e, Type type) {
+      return TrType(type) == Predef.BoxType ? e : ApplyUnbox(tok, e, TrType(type));
+    }
+
+    /// <summary>
+    ///   Unboxes an expression with the Box type.
+    /// </summary>
+    public Bpl.Expr ApplyUnbox(Bpl.IToken tok, Bpl.Expr e, Bpl.Type ty) {
+      Contract.Assert(e != null);
+      Contract.Assert(ty != null);
+      Contract.Assert(tok != null);
+      Contract.Assert((e.Type != null && e.Type.Equals(Predef.BoxType) ||
+                      (e.ShallowType != null && e.ShallowType.Equals(Predef.BoxType))));
+      return FunctionCall(tok, BuiltinFunction.Unbox, ty, e);
+    }
+
+    public Boogie.Expr BoxifyForTraitParent(Bpl.IToken tok, Boogie.Expr obj, MemberDecl member, Type fromType) {
+      return BoxifyForTraitParent(tok, obj, member.EnclosingClass, fromType);
+    }
+
+    public Boogie.Expr BoxifyForTraitParent(Bpl.IToken tok, Boogie.Expr obj, TopLevelDecl topLevelDecl, Type fromType) {
+      if (topLevelDecl is TraitDecl { IsReferenceTypeDecl: false }) {
+        return BoxIfNecessary(tok, obj, fromType);
+      }
+      return obj;
+    }
+
+    public static bool ModeledAsBoxType(Type t) {
+      Contract.Requires(t != null);
+      t = NormalizeToVerificationTypeRepresentation(t);
+      if (t is TypeProxy) {
+        // unresolved proxy
+        return false;
+      }
+      var res = t.IsTypeParameter || (t.IsTraitType && !t.IsRefType) || t.IsAbstractType || t.IsInternalTypeSynonym;
+      Contract.Assert(t.IsArrowType ? !res : true);
+      return res;
+    }
+
+    /// <summary>
+    /// This method returns "expr" after stripping off any type coercions and box/unbox functions.
+    /// </summary>
+    public static Boogie.Expr StripBoxAdjustments(Boogie.Expr expr) {
+      while (expr is Boogie.NAryExpr { Fun: Boogie.FunctionCall { FunctionName: BoxFunctionName or UnboxFunctionName } or Boogie.TypeCoercion } nAryExpr) {
+        Contract.Assert(nAryExpr.Args.Count == 1);
+        expr = nAryExpr.Args[0];
+      }
+      return expr;
+    }
+
+    // ----- Statement ----------------------------------------------------------------------------
+
+    /// <summary>
+    /// A ForceCheckToken is a token wrapper whose purpose is to hide inheritance.
+    /// </summary>
+    public class ForceCheckOrigin : OriginWrapper {
+      public ForceCheckOrigin(IOrigin tok)
+        : base(tok) {
+        Contract.Requires(tok != null);
+      }
+      public static IOrigin Unwrap(IOrigin tok) {
+        Contract.Requires(tok != null);
+        Contract.Ensures(Contract.Result<IOrigin>() != null);
+        var ftok = tok as ForceCheckOrigin;
+        return ftok != null ? ftok.WrappedToken : tok;
+      }
+
+      public override IOrigin WithVal(string newVal) {
+        return new ForceCheckOrigin(WrappedToken.WithVal(newVal));
+      }
+
+      public override bool IsInherited(ModuleDefinition m) {
+        return false;
+      }
+    }
+
+    public Bpl.PredicateCmd Assert(IOrigin tok, Bpl.Expr condition, ProofObligationDescription description,
+      BodyTranslationContext context, Bpl.QKeyValue kv = null) {
+      return Assert(tok, condition, description, tok, context, kv);
+    }
+
+    private PredicateCmd Assert(IOrigin tok, Expr condition, ProofObligationDescription description,
+      IOrigin refinesToken, BodyTranslationContext context, QKeyValue kv = null) {
+      Contract.Requires(tok != null);
+      Contract.Requires(condition != null);
+      Contract.Ensures(Contract.Result<Bpl.PredicateCmd>() != null);
+
+      Bpl.PredicateCmd cmd;
+      if (context.AssertMode == AssertMode.Assume
+          || (assertionOnlyFilter != null && !assertionOnlyFilter(tok))
+          || (refinesToken.IsInherited(currentModule) && codeContext is not { MustReverify: true })) {
+        // produce an assume instead
+        cmd = TrAssumeCmd(tok, condition, kv);
+        proofDependencies?.AddProofDependencyId(cmd, tok, new AssumedProofObligationDependency(tok, description));
+      } else {
+        cmd = TrAssertCmdDesc(ForceCheckOrigin.Unwrap(tok), condition, description, kv);
+        proofDependencies?.AddProofDependencyId(cmd, tok, new ProofObligationDependency(tok, description));
+      }
+      return cmd;
+    }
+
+    PredicateCmd AssertAndForget(BodyTranslationContext context, IOrigin tok, Bpl.Expr condition, ProofObligationDescription desc) {
+      return AssertAndForget(context, tok, condition, desc, tok, null);
+    }
+
+    PredicateCmd AssertAndForget(BodyTranslationContext context, IOrigin tok, Bpl.Expr condition, ProofObligationDescription desc, IOrigin refinesTok, Bpl.QKeyValue kv) {
+      Contract.Requires(tok != null);
+      Contract.Requires(desc != null);
+      Contract.Requires(condition != null);
+      Contract.Ensures(Contract.Result<Bpl.PredicateCmd>() != null);
+
+      PredicateCmd cmd;
+      if (context.AssertMode == AssertMode.Assume ||
+          (assertionOnlyFilter != null && !assertionOnlyFilter(tok)) ||
+          (refinesTok.IsInherited(currentModule) && (codeContext == null || !codeContext.MustReverify))) {
+        // produce a "skip" instead
+        cmd = TrAssumeCmd(tok, Bpl.Expr.True, kv);
+      } else {
+        tok = ForceCheckOrigin.Unwrap(tok);
+        var args = new List<object>();
+        args.Add(Bpl.Expr.Literal(0));
+        cmd = TrAssertCmdDesc(tok, condition, desc, new Bpl.QKeyValue(tok, "subsumption", args, kv));
+        proofDependencies?.AddProofDependencyId(cmd, tok, new ProofObligationDependency(tok, desc));
+      }
+
+      return cmd;
+    }
+
+    Bpl.Ensures EnsuresWithDependencies(IOrigin tok, bool free, Expression dafnyCondition, Bpl.Expr condition, string errorMessage, string successMessage, string comment) {
+      Contract.Requires(tok != null);
+      Contract.Requires(dafnyCondition != null);
+      Contract.Ensures(Contract.Result<Bpl.Ensures>() != null);
+
+      var ens = Ensures(tok, free, dafnyCondition, condition, errorMessage, successMessage, comment);
+      proofDependencies?.AddProofDependencyId(ens, tok, new EnsuresDependency(tok, dafnyCondition));
+      return ens;
+    }
+    Bpl.Ensures FreeEnsures(IOrigin tok, Bpl.Expr condition, string comment, bool alwaysAssume = false) {
+      var kv = alwaysAssume ? AlwaysAssumeAttribute(tok) : null;
+      return Ensures(tok, true, null, condition, null, null, comment, kv);
+    }
+
+
+    Bpl.Ensures Ensures(IOrigin tok, bool free, Expression dafnyCondition, Bpl.Expr condition, string errorMessage, string successMessage, string comment, QKeyValue kv = null) {
+      Contract.Requires(tok != null);
+      Contract.Requires(condition != null);
+      Contract.Ensures(Contract.Result<Bpl.Ensures>() != null);
+
+      var unwrappedToken = ForceCheckOrigin.Unwrap(tok);
+      Bpl.Ensures ens = new Bpl.Ensures(unwrappedToken, free, condition, comment, kv);
+      var description = new EnsuresDescription(dafnyCondition, errorMessage, successMessage);
+      ens.Description = description;
+      if (!free) {
+        ReportAssertion(unwrappedToken, description);
+      }
+      return ens;
+    }
+
+    Bpl.Requires RequiresWithDependencies(IOrigin tok, bool free, Expression dafnyCondition, Bpl.Expr condition, string errorMessage, string successMessage, string comment) {
+      Contract.Requires(tok != null);
+      Contract.Requires(dafnyCondition != null);
+      Contract.Ensures(Contract.Result<Bpl.Ensures>() != null);
+
+      var req = Requires(tok, free, dafnyCondition, condition, errorMessage, successMessage, comment);
+      proofDependencies?.AddProofDependencyId(req, tok, new RequiresDependency(tok, dafnyCondition));
+      return req;
+    }
+    Bpl.Requires FreeRequires(IOrigin tok, Bpl.Expr bCondition, string comment, bool alwaysAssume = false) {
+      var kv = alwaysAssume ? AlwaysAssumeAttribute(tok) : null;
+      return Requires(tok, true, null, bCondition, null, null, comment, kv);
+    }
+
+    Bpl.Requires Requires(IOrigin tok, bool free, Expression dafnyCondition, Bpl.Expr bCondition, string errorMessage, string successMessage, string comment, QKeyValue kv = null) {
+      Contract.Requires(tok != null);
+      Contract.Requires(bCondition != null);
+      Contract.Ensures(Contract.Result<Bpl.Requires>() != null);
+      Bpl.Requires req = new Bpl.Requires(ForceCheckOrigin.Unwrap(tok), free, bCondition, comment, kv);
+      req.Description = new RequiresDescription(dafnyCondition, errorMessage, successMessage);
+      return req;
+    }
+
+    public Bpl.StmtList TrStmt2StmtList(BoogieStmtListBuilder builder,
+      Statement block, Variables locals, ExpressionTranslator etran, bool introduceScope = false) {
+      Contract.Requires(builder != null);
+      Contract.Requires(block != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(codeContext != null && Predef != null);
+      Contract.Ensures(Contract.Result<Bpl.StmtList>() != null);
+
+      TrStmtList(new List<Statement> { block }, builder, locals, etran, introduceScope ? block.Origin : null, processLabels: false);
+      return builder.Collect(block.Origin);  // TODO: would be nice to have an end-curly location for "block"
+    }
+
+    /// <summary>
+    /// Add to "builder" the following:
+    ///     if (*) { S ; assume false; }
+    /// where "S" is the given "builderToCollect".  This method consumes what has been built up in "builderToCollect".
+    /// </summary>
+    public void PathAsideBlock(IOrigin tok, BoogieStmtListBuilder builderToCollect, BoogieStmtListBuilder builder) {
+      Contract.Requires(tok != null);
+      Contract.Requires(builderToCollect != null);
+      Contract.Requires(builderToCollect != null);
+
+      if (!builderToCollect.Commands.Any()) {
+        return;
+      }
+      builderToCollect.Add(new AssumeCmd(tok, Bpl.Expr.False));
+      var ifCmd = new IfCmd(tok, null, builderToCollect.Collect(tok), null, null);
+      builder.Add(ifCmd);
+    }
+
+    (string, string) CustomErrorMessage(Attributes attrs) {
+      if (attrs == null) { return (null, null); }
+      List<Expression> args = Attributes.FindExpressions(attrs, "error");
+      if (args == null) { return (null, null); }
+      if (args.Count > 0) {
+        var lErr = (string)(args[0] as StringLiteralExpr)?.Value;
+        var lSucc = args.Count > 1 ? (string)(args[1] as StringLiteralExpr).Value : null;
+        return (lErr, lSucc);
+      } else {
+        return (null, null);
+      }
+    }
+
+    /// <summary>
+    /// Generates a Boogie expression "lo <= x <= hi", but leaving the lo/hi bound if null.
+    /// </summary>
+    private static Bpl.Expr ForLoopBounds(Bpl.Expr x, Bpl.Expr/*?*/ lo, Bpl.Expr/*?*/ hi) {
+      Bpl.Expr r = Bpl.Expr.True;
+      if (lo != null) {
+        r = BplAnd(r, Bpl.Expr.Le(lo, x));
+      }
+      if (hi != null) {
+        r = BplAnd(r, Bpl.Expr.Le(x, hi));
+      }
+      return r;
+    }
+
+    delegate Bpl.Expr ExpressionConverter(Dictionary<IVariable, Expression> substMap, ExpressionTranslator etran);
+
+    // Note: not trying to reduce duplication between this and TrAssertCmdDesc because this one should ultimately be removed.
+    Bpl.AssertCmd TrAssertCmd(IOrigin tok, Bpl.Expr expr, Bpl.QKeyValue attributes = null) {
+      // TODO: move the following comment once this method disappears
+
+      // It may be that "expr" is a Lit expression. It might seem we don't need a Lit expression
+      // around the boolean expression that is being asserted. However, we keep it. For one,
+      // it doesn't change the semantics of the assert command. More importantly, leaving
+      // a Lit around the expression is useful to avoid sending an "assert false;" to Boogie--since
+      // Boogie looks especially for "assert false;" commands and processes them in such a way
+      // that loops no longer are loops (which is confusing for Dafny users).
+      return attributes == null ? new Bpl.AssertCmd(tok, expr) : new Bpl.AssertCmd(tok, expr, attributes);
+    }
+
+    Bpl.AssertCmd TrAssertCmdDesc(IOrigin tok, Bpl.Expr expr,
+      ProofObligationDescription description, Bpl.QKeyValue attributes = null) {
+      ReportAssertion(tok, description);
+      return new Bpl.AssertCmd(tok, expr, description, attributes);
+    }
+
+    private ISet<(Uri, int)> reportedAssertions = new HashSet<(Uri, int)>();
+    private void ReportAssertion(IOrigin tok, ProofObligationDescription description) {
+      if (!reportedAssertions.Add((tok.Uri, tok.pos))) {
+        return;
+      }
+
+      if (options.Get(CommonOptionBag.ShowAssertions) > CommonOptionBag.AssertionShowMode.None && description.IsImplicit) {
+        reporter.Info(MessageSource.Translator, ToDafnyToken(false, tok), "Implicit assertion: " + description.ShortDescription, "isAssertion");
+      } else if (options.Get(CommonOptionBag.ShowAssertions) == CommonOptionBag.AssertionShowMode.All) {
+        reporter.Info(MessageSource.Translator, ToDafnyToken(false, tok), "Explicit assertion: " + description.ShortDescription, "isAssertion");
+      }
+    }
+
+    delegate void BodyTranslator(BoogieStmtListBuilder builder, ExpressionTranslator etr);
+
+    List<Bpl.Expr> TrTypeArgs(Dictionary<TypeParameter, Type> tySubst, List<TypeParameter> tyArgs) {
+      var res = new List<Bpl.Expr>();
+      foreach (var p in tyArgs) {
+        res.Add(TypeToTy(tySubst[p]));
+      }
+      return res;
+    }
+
+    Dictionary<IVariable, Expression> SetupBoundVarsAsLocals(List<BoundVar> boundVars, out Bpl.Expr typeAntecedent,
+      BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran,
+      string nameSuffix = null) {
+      Contract.Requires(boundVars != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(etran != null);
+      Contract.Ensures(Contract.ValueAtReturn(out typeAntecedent) != null);
+
+      typeAntecedent = Bpl.Expr.True;
+      var substMap = new Dictionary<IVariable, Expression>();
+      foreach (BoundVar bv in boundVars) {
+        LocalVariable local = new LocalVariable(bv.Origin, nameSuffix == null ? bv.Name : bv.Name + nameSuffix, bv.Type, bv.IsGhost);
+        local.type = local.SyntacticType;  // resolve local here
+        IdentifierExpr ie = new IdentifierExpr(local.Origin, local.AssignUniqueName(CurrentDeclaration.IdGenerator));
+        ie.Var = local; ie.Type = ie.Var.Type;  // resolve ie here
+        substMap.Add(bv, ie);
+        Bpl.LocalVariable bvar = new Bpl.LocalVariable(local.Origin, new Bpl.TypedIdent(local.Origin, local.AssignUniqueName(CurrentDeclaration.IdGenerator), TrType(local.Type)));
+        locals.GetOrAdd(bvar);
+        var bIe = new Bpl.IdentifierExpr(bvar.tok, bvar);
+        builder.Add(new Bpl.HavocCmd(bv.Origin, new List<Bpl.IdentifierExpr> { bIe }));
+        Bpl.Expr wh = GetWhereClause(bv.Origin, bIe, local.Type, etran, IsAllocType.ISALLOC);
+        if (wh != null) {
+          typeAntecedent = BplAnd(typeAntecedent, wh);
+        }
+      }
+      return substMap;
+    }
+
+    Dictionary<IVariable, Expression> SetupBoundVarsAsLocals(List<BoundVar> boundVars, BoogieStmtListBuilder builder,
+      Variables locals, ExpressionTranslator etran,
+      string nameSuffix = null) {
+      Contract.Requires(boundVars != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(etran != null);
+
+      var substMap = SetupBoundVarsAsLocals(boundVars, out var typeAntecedent, builder, locals, etran, nameSuffix);
+      builder.Add(TrAssumeCmd(typeAntecedent.tok, typeAntecedent));
+      return substMap;
+    }
+
+    /// <summary>
+    /// Clone Dafny variable "v" into a new Dafny local variable "l".
+    /// Add to "substMap" the substitution from "v" to an IdentifierExpr for "l".
+    /// Also, generate a Boogie variable "bvar" for "l", add "bvar" to "locals", and
+    /// emit to "builder" a havoc statement for "bvar". The type antecedent for "bvar"
+    /// is NOT emitted; rather, it is returned by this method.
+    /// </summary>
+    Bpl.Expr SetupVariableAsLocal(IVariable v, Dictionary<IVariable, Expression> substMap,
+      BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran) {
+      Contract.Requires(v != null);
+      Contract.Requires(substMap != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(etran != null);
+
+      var local = new LocalVariable(v.Origin, v.Name, v.Type, v.IsGhost);
+      local.type = local.SyntacticType;  // resolve local here
+      var ie = new IdentifierExpr(local.Origin, local.AssignUniqueName(CurrentDeclaration.IdGenerator));
+      ie.Var = local; ie.Type = ie.Var.Type;  // resolve ie here
+      substMap.Add(v, ie);
+
+      var bvar = new Bpl.LocalVariable(local.Origin, new Bpl.TypedIdent(local.Origin, local.AssignUniqueName(CurrentDeclaration.IdGenerator), TrType(local.Type)));
+      locals.GetOrAdd(bvar);
+      var bIe = new Bpl.IdentifierExpr(bvar.tok, bvar);
+      builder.Add(new Bpl.HavocCmd(v.Origin, new List<Bpl.IdentifierExpr> { bIe }));
+      var wh = GetWhereClause(v.Origin, bIe, local.Type, etran, ISALLOC);
+      return wh ?? Bpl.Expr.True;
+    }
+
+    List<Bpl.Expr> RecordDecreasesValue(List<Expression> decreases, BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran, string varPrefix) {
+      Contract.Requires(locals != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(varPrefix != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(decreases != null);
+      List<Bpl.Expr> oldBfs = new List<Bpl.Expr>();
+      var idGen = new VerificationIdGenerator();
+      foreach (Expression e in decreases) {
+        Contract.Assert(e != null);
+        Bpl.LocalVariable bfVar = new Bpl.LocalVariable(e.Origin, new Bpl.TypedIdent(e.Origin, idGen.FreshId(varPrefix), TrType(cce.NonNull(e.Type))));
+        locals.GetOrAdd(bfVar);
+        Bpl.IdentifierExpr bf = new Bpl.IdentifierExpr(e.Origin, bfVar);
+        oldBfs.Add(bf);
+        // record value of each decreases expression at beginning of the loop iteration
+        Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(e.Origin, bf, etran.TrExpr(e));
+        builder.Add(cmd);
+      }
+      return oldBfs;
+    }
+
+
+    public static void AddComment(BoogieStmtListBuilder builder, Statement stmt, string comment) {
+      Contract.Requires(builder != null);
+      Contract.Requires(stmt != null);
+      Contract.Requires(comment != null);
+      builder.Add(new Bpl.CommentCmd(string.Format("----- {0} ----- {1}({2},{3})", comment, stmt.Origin.Filepath, stmt.Origin.line, stmt.Origin.col)));
+    }
+
+    /// <summary>
+    /// Therefore, these properties are applied to method in-parameters.
+    /// For now, this only allows you to case split on incoming data type values.
+    /// This used to add IsGood[Multi]Set_Extendend, but that is always
+    /// added for sets & multisets now in the prelude.
+    /// </summary>
+    Bpl.Expr GetExtendedWhereClause(IOrigin tok, Bpl.Expr x, Type type, ExpressionTranslator etran, IsAllocType alloc) {
+      Contract.Requires(tok != null);
+      Contract.Requires(x != null);
+      Contract.Requires(type != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(Predef != null);
+      var r = GetWhereClause(tok, x, type, etran, alloc);
+      type = type.NormalizeExpand();
+      if (type.IsDatatype) {
+        UserDefinedType udt = (UserDefinedType)type;
+        var oneOfTheCases = FunctionCall(tok, "$IsA#" + udt.ResolvedClass.FullSanitizedName, Bpl.Type.Bool, x);
+        return BplAnd(r, oneOfTheCases);
+      } else {
+        return r;
+      }
+    }
+
+    /// <summary>
+    /// Translates an AST Type to a Boogie expression of type Ty.
+    /// </summary>
+    Bpl.Expr TypeToTy(Type type) {
+      Contract.Requires(type != null);
+      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+
+      type = type.NormalizeExpandKeepConstraints();
+
+      if (type.IsTypeParameter) {
+        var udt = (UserDefinedType)type;
+        return TrTypeParameter((TypeParameter)udt.ResolvedClass);
+      } else if (type.IsAbstractType) {
+        var udt = (UserDefinedType)type;
+        return TrAbstractType((AbstractTypeDecl)udt.ResolvedClass, udt.TypeArgs);
+      } else if (type is UserDefinedType) {
+        // Classes, (co-)datatypes, newtypes, subset types, ...
+        var args = type.TypeArgs.ConvertAll(TypeToTy);
+        return ClassTyCon(((UserDefinedType)type), args);
+      } else if (type is SetType) {
+        bool finite = ((SetType)type).Finite;
+        return FunctionCall(Token.NoToken, finite ? "TSet" : "TISet", Predef.Ty, TypeToTy(((CollectionType)type).Arg));
+      } else if (type is MultiSetType) {
+        return FunctionCall(Token.NoToken, "TMultiSet", Predef.Ty, TypeToTy(((CollectionType)type).Arg));
+      } else if (type is SeqType) {
+        return FunctionCall(Token.NoToken, "TSeq", Predef.Ty, TypeToTy(((CollectionType)type).Arg));
+      } else if (type is MapType) {
+        bool finite = ((MapType)type).Finite;
+        return FunctionCall(Token.NoToken, finite ? "TMap" : "TIMap", Predef.Ty,
+          TypeToTy(((MapType)type).Domain),
+          TypeToTy(((MapType)type).Range));
+      } else if (type is BoolType) {
+        return new Bpl.IdentifierExpr(Token.NoToken, "TBool", Predef.Ty);
+      } else if (type is CharType) {
+        return new Bpl.IdentifierExpr(Token.NoToken, "TChar", Predef.Ty);
+      } else if (type is RealType) {
+        return new Bpl.IdentifierExpr(Token.NoToken, "TReal", Predef.Ty);
+      } else if (type is BitvectorType) {
+        var t = (BitvectorType)type;
+        return FunctionCall(Token.NoToken, "TBitvector", Predef.Ty, Bpl.Expr.Literal(t.Width));
+      } else if (type is IntType) {
+        return new Bpl.IdentifierExpr(Token.NoToken, "TInt", Predef.Ty);
+      } else if (type is BigOrdinalType) {
+        return new Bpl.IdentifierExpr(Token.NoToken, "TORDINAL", Predef.Ty);
+      } else if (type is ParamTypeProxy) {
+        return TrTypeParameter(((ParamTypeProxy)type).orig);
+      } else {
+        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
+      }
+    }
+
+    static string NameTypeParam(TypeParameter tp) {
+      if (tp.Parent != null) {
+        return tp.Parent.FullName + "$" + tp.Name;
+      } else {
+        // This happens for builtins, like arrays, that don't have a parent
+        return "#$" + tp.Name;
+      }
+    }
+
+    Bpl.Expr TrTypeParameter(TypeParameter tp) {
+      var nm = NameTypeParam(tp);
+      // return an identifier denoting a constant
+      return new Bpl.IdentifierExpr(tp.Origin, nm, Predef.Ty);
+    }
+
+    Bpl.Expr TrAbstractType(AbstractTypeDecl abstractType, List<Type> tyArguments) {
+      Contract.Requires(tyArguments != null);
+
+      var fn = GetOrCreateTypeConstructor(abstractType);
+      var args = tyArguments.ConvertAll(TypeToTy);
+      return FunctionCall(abstractType.Origin, fn.Name, Predef.Ty, args);
+    }
+
+    public List<TypeParameter> GetTypeParams(IMethodCodeContext cc) {
+      if (cc is Method) {
+        Method m = (Method)cc;
+        return Concat(GetTypeParams(m.EnclosingClass), m.TypeArgs);
+      } else if (cc is IteratorDecl) {
+        return cc.TypeArgs; // This one cannot be enclosed in a class
+      } else {
+        Contract.Assert(false);
+        return null;
+      }
+    }
+
+    static public List<TypeParameter> GetTypeParams(TopLevelDecl d) {
+      Contract.Requires(d is ClassLikeDecl || d is DatatypeDecl || d is NewtypeDecl || d is ValuetypeDecl);
+      return d.TypeArgs;
+    }
+
+    static List<TypeParameter> GetTypeParams(Function f) {
+      if (f.EnclosingClass == null) {
+        return f.TypeArgs;
+      } else {
+        return Concat(GetTypeParams(f.EnclosingClass), f.TypeArgs);
+      }
+    }
+
+    /// <summary>
+    /// Return $IsBox(x, t).
+    /// </summary>
+    Bpl.Expr MkIsBox(Bpl.Expr x, Type t) {
+      return MkIs(x, TypeToTy(t), true);
+    }
+
+    // Boxes, if necessary
+    Bpl.Expr MkIs(Bpl.Expr x, Type t, Bpl.IToken tok = null) {
+      return MkIs(x, TypeToTy(t), ModeledAsBoxType(t), tok);
+    }
+
+    Bpl.Expr MkIs(Bpl.Expr x, Bpl.Expr t, bool box = false, Bpl.IToken tok = null) {
+      if (box) {
+        return FunctionCall(tok ?? x.tok, BuiltinFunction.IsBox, null, x, t);
+      } else {
+        return FunctionCall(tok ?? x.tok, BuiltinFunction.Is, null, x, t);
+      }
+    }
+
+    // Boxes, if necessary
+    Bpl.Expr MkIsAlloc(Bpl.Expr x, Type t, Bpl.Expr h) {
+      return MkIsAlloc(x, TypeToTy(t), h, ModeledAsBoxType(t));
+    }
+
+    Bpl.Expr MkIsAllocBox(Bpl.Expr x, Type t, Bpl.Expr h) {
+      return MkIsAlloc(x, TypeToTy(t), h, true);
+    }
+
+    Bpl.Expr MkIsAlloc(Bpl.Expr x, Bpl.Expr t, Bpl.Expr h, bool box = false) {
+      if (box) {
+        return FunctionCall(x.tok, BuiltinFunction.IsAllocBox, null, x, t, h);
+      } else {
+        return FunctionCall(x.tok, BuiltinFunction.IsAlloc, null, x, t, h);
+      }
+    }
+
+    /// <summary>
+    /// A "where" clause for a variable in Boogie turns into an assumption anytime that Boogie is tasked
+    /// with assigning an arbitrary value to that variable. This happens at the beginning of a procedure
+    /// implementation, after a procedure call, or as part of a "havoc" command. Each one of these can
+    /// easily be followed by a manual "assume" command. However, the use-case that makes "where" clauses
+    /// especially valuable is in loops, because when Boogie cuts the backedge, it inserts "havoc" commands.
+    /// To do this in Dafny, Dafny would have to compute loop targets, which is better done in Boogie (which
+    /// already has to do it).
+    /// </summary>
+    public Bpl.Expr GetWhereClause(IOrigin tok, Bpl.Expr x, Type type, ExpressionTranslator etran, IsAllocType alloc,
+      bool allocatednessOnly = false, bool alwaysUseSymbolicName = false) {
+      Contract.Requires(tok != null);
+      Contract.Requires(x != null);
+      Contract.Requires(type != null);
+      Contract.Requires(etran != null);
+      Contract.Requires(Predef != null);
+
+      if (type.NormalizeExpand() is TypeProxy) {
+        // Unresolved proxy
+        // Omit where clause (in other places, unresolved proxies are treated as a reference type; we could do that here too, but
+        // we might as well leave out the where clause altogether).
+        return null;
+      }
+
+      var normType = type.NormalizeExpandKeepConstraints();
+      var verificationType = NormalizeToVerificationTypeRepresentation(type);
+      Bpl.Expr isAlloc;
+      if (type.IsNumericBased() || type.IsBitVectorType || type.IsBoolType || type.IsCharType || type.IsBigOrdinalType) {
+        isAlloc = null;
+      } else if (alloc == ISALLOC && etran.HeapExpr != null) {
+        isAlloc = MkIsAlloc(x, normType, etran.HeapExpr);
+      } else {
+        isAlloc = null;
+      }
+      if (allocatednessOnly) {
+        return isAlloc;
+      }
+
+      Bpl.Expr isPred = null;
+      if (alwaysUseSymbolicName) {
+        // go for the symbolic name
+        isPred = MkIs(x, normType);
+      } else if (normType is BoolType or IntType or RealType or BigOrdinalType) {
+        // nothing to do
+      } else if (normType is BitvectorType) {
+        var t = (BitvectorType)normType;
+        if (t.Width == 0) {
+          // type bv0 has only one value
+          return Bpl.Expr.Eq(BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, t), x);
+        }
+      } else if ((normType.AsTypeSynonym != null || normType.AsNewtype != null) &&
+        (verificationType.IsNumericBased() || verificationType.IsBitVectorType || verificationType.IsBoolType)) {
+        var constraint = ModuleResolver.GetImpliedTypeConstraint(new BoogieWrapper(x, normType), normType);
+        isPred = etran.TrExpr(constraint);
+      } else {
+        // go for the symbolic name
+        isPred = MkIs(x, normType);
+      }
+      return isAlloc == null ? isPred : isPred == null ? isAlloc : BplAnd(isPred, isAlloc);
+    }
+
+    // Returns expressions, which, if false, means that the two LHS expressions are
+    // not distinct; if null then the LHSs are trivially distinct
+    void CheckDistinctness(Expression lhsa, Expression lhsb, ExpressionTranslator etran, out Expression dExpr, out Bpl.Expr bExpr) {
+      // Helper functions to make the following more concise
+      Expression DfyBin(BinaryExpr.Opcode op, Expression e0, Expression e1) =>
+        new BinaryExpr(Token.NoToken, op, e0, e1);
+      Expression DfyOr(Expression e0, Expression e1) => DfyBin(BinaryExpr.Opcode.Or, e0, e1);
+      Expression DfyNeq(Expression e0, Expression e1) => DfyBin(BinaryExpr.Opcode.Neq, e0, e1);
+      Expression DfyLe(Expression e0, Expression e1) => DfyBin(BinaryExpr.Opcode.Le, e0, e1);
+      Expression DfyLt(Expression e0, Expression e1) => DfyBin(BinaryExpr.Opcode.Lt, e0, e1);
+
+      {
+        dExpr = null;
+        bExpr = null;
+        if (lhsa is IdentifierExpr iea && lhsb is IdentifierExpr ieb) {
+          if (iea.Name != ieb.Name) {
+            return;
+          }
+
+          dExpr = new LiteralExpr(Token.NoToken, false);
+          bExpr = Bpl.Expr.False;
+          return;
+        }
+      }
+      {
+        if (lhsa is MemberSelectExpr iea && lhsb is MemberSelectExpr ieb) {
+          if (iea.Member is Field fa && ieb.Member is Field fb) {
+            if (fa != fb) {
+              return;
+            }
+
+            dExpr = DfyNeq(iea.Obj, ieb.Obj);
+            bExpr = Bpl.Expr.Neq(etran.TrExpr(iea.Obj), etran.TrExpr(ieb.Obj));
+            return;
+          }
+        }
+      }
+      {
+        if (lhsa is SeqSelectExpr iea && lhsb is SeqSelectExpr ieb) {
+          dExpr = DfyNeq(iea.Seq, ieb.Seq);
+          bExpr = Bpl.Expr.Neq(etran.TrExpr(iea.Seq), etran.TrExpr(ieb.Seq));
+
+          if (iea.E1 == null && ieb.E1 == null) {
+            dExpr = DfyOr(dExpr, DfyNeq(iea.E0, ieb.E0));
+            bExpr = BplOr(bExpr, Bpl.Expr.Neq(etran.TrExpr(iea.E0), etran.TrExpr(ieb.E0)));
+          } else if (iea.E1 == null && ieb.E1 != null) {
+            dExpr = DfyOr(dExpr, DfyLe(ieb.E1, iea.E0));
+            dExpr = DfyOr(dExpr, DfyLt(iea.E0, ieb.E0));
+            bExpr = BplOr(bExpr, Bpl.Expr.Le(etran.TrExpr(ieb.E1), etran.TrExpr(iea.E0)));
+            bExpr = BplOr(bExpr, Bpl.Expr.Lt(etran.TrExpr(iea.E0), etran.TrExpr(ieb.E0)));
+          } else if (iea.E1 != null && ieb.E1 == null) {
+            dExpr = DfyOr(dExpr, DfyLe(iea.E1, ieb.E0));
+            dExpr = DfyOr(dExpr, DfyLt(ieb.E0, iea.E0));
+            bExpr = BplOr(bExpr, Bpl.Expr.Le(etran.TrExpr(iea.E1), etran.TrExpr(ieb.E0)));
+            bExpr = BplOr(bExpr, Bpl.Expr.Lt(etran.TrExpr(ieb.E0), etran.TrExpr(iea.E0)));
+          } else {
+            dExpr = DfyOr(dExpr, DfyLe(iea.E1, ieb.E0));
+            dExpr = DfyOr(dExpr, DfyLe(ieb.E1, iea.E0));
+            bExpr = BplOr(bExpr, Bpl.Expr.Le(etran.TrExpr(iea.E1), etran.TrExpr(ieb.E0)));
+            bExpr = BplOr(bExpr, Bpl.Expr.Le(etran.TrExpr(ieb.E1), etran.TrExpr(iea.E0)));
+          }
+
+          return;
+        }
+      }
+      {
+        if (lhsa is MultiSelectExpr iea && lhsb is MultiSelectExpr ieb && iea.Indices.Count == ieb.Indices.Count) {
+          dExpr = DfyNeq(iea.Array, ieb.Array);
+          bExpr = Bpl.Expr.Neq(etran.TrExpr(iea.Array), etran.TrExpr(ieb.Array));
+          for (int i = 0; i < iea.Indices.Count; i++) {
+            dExpr = DfyOr(dExpr, DfyNeq(iea.Indices[i], ieb.Indices[i]));
+            bExpr = BplOr(bExpr, Bpl.Expr.Neq(etran.TrExpr(iea.Indices[i]), etran.TrExpr(ieb.Indices[i])));
+          }
+        }
+      }
+    }
+
+    /// <summary>
+    /// Returns the name of the local variable used as a stand-in for a field in the BodyInit part of a divided
+    /// constructor body.
+    /// </summary>
+    string SurrogateName(Field field) {
+      Contract.Requires(field != null);
+      return "this." + field.Name;
+    }
+
+    // Surrounds the given subrange-check expression with necessary context (e.g. quantifier bounds)
+    public delegate Expression SubrangeCheckContext(Expression check);
+
+    Bpl.Expr GetSubrangeCheck(
+      Bpl.IToken tok,
+      Bpl.Expr bSource, Type sourceType, Type targetType,
+      // allow null for checked expressions that cannot necessarily be named without side effects, such as method out-params
+      [CanBeNull] Expression source,
+      [CanBeNull] SubrangeCheckContext context,
+      out ProofObligationDescription desc, string errorMessagePrefix = "") {
+      Contract.Requires(bSource != null);
+      Contract.Requires(sourceType != null);
+      Contract.Requires(targetType != null);
+
+      if (Type.IsSupertype(targetType, sourceType) && !(sourceType.IsRefType && !sourceType.IsNonNullRefType && !targetType.IsRefType)) {
+        // We should always be able to use Is, but this is an optimisation.
+        desc = null;
+        return null;
+      }
+      targetType = targetType.NormalizeExpandKeepConstraints();
+      var udt = targetType as UserDefinedType;
+      Bpl.Expr cre;
+      if (udt?.ResolvedClass is RedirectingTypeDecl redirectingTypeDecl &&
+          ModeledAsBoxType((redirectingTypeDecl as NewtypeDecl)?.BaseType ?? redirectingTypeDecl.Var.Type)) {
+        cre = MkIs(BoxIfNecessary(bSource.tok, bSource, sourceType), TypeToTy(targetType), true, tok);
+      } else if (ModeledAsBoxType(sourceType)) {
+        cre = MkIs(bSource, TypeToTy(targetType), true, tok);
+      } else if (targetType is UserDefinedType targetUdt) {
+        cre = MkIs(BoxifyForTraitParent(bSource.tok, bSource, udt.ResolvedClass, sourceType), targetType, tok);
+      } else {
+        cre = MkIs(bSource, targetType, tok);
+      }
+
+      Expression dafnyCheck = null;
+      context ??= (e => e);
+      if (source != null) {
+        dafnyCheck = context(new TypeTestExpr(source.Origin, source, targetType));
+      }
+      // type checks of the form `f is T -> U` are only available in the refreshed type system
+      var canTestFunctionTypes = options.Get(CommonOptionBag.TypeSystemRefresh);
+
+      if (udt != null && udt.IsRefType) {
+        var s = sourceType.NormalizeExpandKeepConstraints();
+        var certain = false;
+        string cause = null;
+        if (s is UserDefinedType sudt && udt.ResolvedClass is NonNullTypeDecl nntd && nntd.Class == sudt.ResolvedClass) {
+          certain = udt.ResolvedClass.TypeArgs.Count == 0;
+          cause = "it may be null";
+        }
+        desc = new SubrangeCheck(errorMessagePrefix, sourceType.ToString(), targetType.ToString(), false, certain, cause, dafnyCheck);
+      } else if (udt != null && ArrowType.IsTotalArrowTypeName(udt.Name)) {
+        desc = new SubrangeCheck(errorMessagePrefix, sourceType.ToString(), targetType.ToString(), true, false,
+          "it may be partial or have read effects",
+          canTestFunctionTypes ? dafnyCheck : null
+        );
+      } else if (udt != null && ArrowType.IsPartialArrowTypeName(udt.Name)) {
+        desc = new SubrangeCheck(errorMessagePrefix, sourceType.ToString(), targetType.ToString(), true, false,
+          "it may have read effects",
+          canTestFunctionTypes ? dafnyCheck : null
+        );
+      } else {
+        desc = new SubrangeCheck(errorMessagePrefix, sourceType.ToString(), targetType.ToString(),
+          targetType.NormalizeExpandKeepConstraints() is UserDefinedType {
+            ResolvedClass: SubsetTypeDecl or NewtypeDecl { Var: { } }
+          },
+          false, null, dafnyCheck);
+      }
+      return cre;
+    }
+
+    public void CheckSubrange(IOrigin tok, Bpl.Expr bSource, Type sourceType, Type targetType,
+      Expression source, BoogieStmtListBuilder builder, string errorMsgPrefix = "") {
+      Contract.Requires(tok != null);
+      Contract.Requires(bSource != null);
+      Contract.Requires(sourceType != null);
+      Contract.Requires(targetType != null);
+      Contract.Requires(builder != null);
+
+      var cre = GetSubrangeCheck(tok, bSource, sourceType, targetType, source, null, out var desc, errorMsgPrefix);
+      if (cre != null) {
+        builder.Add(Assert(tok, cre, desc, builder.Context));
+      }
+    }
+
+    void Check_NewRestrictions(IOrigin tok, Expression dObj, Bpl.Expr obj, Field f, Bpl.Expr rhs, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+      Contract.Requires(tok != null);
+      Contract.Requires(obj != null);
+      Contract.Requires(f != null);
+      Contract.Requires(rhs != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(etran != null);
+      var iter = f.EnclosingClass as IteratorDecl;
+      if (iter != null && f == iter.Member_New) {
+        // Assignments to an iterator _new field is only allowed to shrink the set, so:
+        // assert Set#Subset(rhs, obj._new);
+        var fId = new Bpl.IdentifierExpr(tok, GetField(f));
+        var subset = FunctionCall(tok, BuiltinFunction.SetSubset, null, rhs,
+          ApplyUnbox(tok, ReadHeap(tok, etran.HeapExpr, obj, fId), Predef.SetType));
+        builder.Add(Assert(tok, subset, new AssignmentShrinks(dObj, f.Name), builder.Context));
+      }
+    }
+
+    Bpl.AssumeCmd AssumeGoodHeap(IOrigin tok, ExpressionTranslator etran) {
+      Contract.Requires(tok != null);
+      Contract.Requires(etran != null);
+      Contract.Ensures(Contract.Result<AssumeCmd>() != null);
+
+      return TrAssumeCmd(tok, FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, etran.HeapExpr));
+    }
+
+    /// <summary>
+    /// Idempotently fills in "mc.ProjectionFunctions"
+    /// </summary>
+    void CreateMapComprehensionProjectionFunctions(MapComprehension mc) {
+      Contract.Requires(mc != null && mc.TermLeft != null);
+      if (mc.ProjectionFunctions == null) {
+        var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator(string.Format("map$project${0}#", projectionFunctionCount));
+        projectionFunctionCount++;
+        mc.ProjectionFunctions = new List<Bpl.Function>();
+        foreach (var bv in mc.BoundVars) {
+          var arg = BplFormalVar(null, TrType(mc.TermLeft.Type), false);
+          var res = BplFormalVar(null, TrType(bv.Type), true);
+          var projectFn = new Bpl.Function(mc.Origin, varNameGen.FreshId(string.Format("#{0}#", bv.Name)), new List<Variable>() { arg }, res);
+          mc.ProjectionFunctions.Add(projectFn);
+          sink.AddTopLevelDeclaration(projectFn);
+        }
+      }
+    }
+
+    int projectionFunctionCount = 0;
+    public Declaration CurrentDeclaration { get; set; }
+
+    // ----- Expression ---------------------------------------------------------------------------
+
+    /// <summary>
+    /// This class gives a way to represent a Boogie translation target as if it were still a Dafny expression.
+    /// </summary>
+    internal class BoogieWrapper : Expression {
+      public readonly Bpl.Expr Expr;
+
+      public BoogieWrapper(Bpl.Expr expr, Type dafnyType)
+        : base(ToDafnyToken(false, expr.tok)) {
+        Contract.Requires(expr != null);
+        Contract.Requires(dafnyType != null);
+        Expr = expr;
+        Type = dafnyType;  // resolve immediately
+      }
+    }
+
+    internal class BoogieFunctionCall : Expression {
+      public readonly string FunctionName;
+      public readonly bool UsesHeap;
+      public readonly bool UsesOldHeap;
+      public readonly List<Label> HeapAtLabels;
+      public readonly List<Type> TyArgs; // Note: also has a bunch of type arguments
+      public readonly List<Expression> Args;
+      public BoogieFunctionCall(IOrigin origin, string functionName, bool usesHeap, bool usesOldHeap, List<Label> heapAtLabels, List<Expression> args, List<Type> tyArgs)
+        : base(origin) {
+        Contract.Requires(origin != null);
+        Contract.Requires(functionName != null);
+        Contract.Requires(heapAtLabels != null);
+        Contract.Requires(args != null);
+        FunctionName = functionName;
+        UsesHeap = usesHeap;
+        UsesOldHeap = usesOldHeap;
+        HeapAtLabels = heapAtLabels;
+        Args = args;
+        TyArgs = tyArgs;
+      }
+      public override IEnumerable<Expression> SubExpressions {
+        get {
+          foreach (var v in Args) {
+            yield return v;
+          }
+        }
+      }
+    }
+
+    internal class SubstLetExpr : LetExpr {
+      public LetExpr orgExpr;
+      public Dictionary<IVariable, Expression> substMap;
+      public Dictionary<TypeParameter, Type> typeMap;
+
+      public SubstLetExpr(IOrigin origin, List<CasePattern<BoundVar>> lhss, List<Expression> rhss, Expression body, bool exact,
+         LetExpr orgExpr, Dictionary<IVariable, Expression> substMap, Dictionary<TypeParameter, Type> typeMap, List<BoundedPool>/*?*/ constraintBounds)
+        : base(origin, lhss, rhss, body, exact) {
+        this.orgExpr = orgExpr;
+        this.substMap = substMap;
+        this.typeMap = typeMap;
+        this.Constraint_Bounds = constraintBounds;
+      }
+    }
+
+    internal class FuelSettingPair {
+      public int low;
+      public int high;
+
+      public FuelSettingPair(int low = (int)FuelSetting.FuelAmount.LOW, int high = (int)FuelSetting.FuelAmount.HIGH) {
+        this.low = low;
+        this.high = high;
+      }
+    }
+
+    // C#'s version of a type alias
+    internal class FuelContext : Dictionary<Function, FuelSettingPair> { }
+    internal class CustomFuelSettings : Dictionary<Function, FuelSetting> { }
+
+    internal class FuelConstant {
+      public Function f;
+      public Bpl.Expr baseFuel;
+      public Bpl.Expr startFuel;
+      public Bpl.Expr startFuelAssert;
+
+      public FuelConstant(Function f, Bpl.Expr baseFuel, Bpl.Expr startFuel, Bpl.Expr startFuelAssert) {
+        this.f = f;
+        this.baseFuel = baseFuel;
+        this.startFuel = startFuel;
+        this.startFuelAssert = startFuelAssert;
+      }
+
+      public Bpl.Expr MoreFuel(Bpl.Program sink, PredefinedDecls predef, FreshIdGenerator idGen) {
+        string uniqueId = idGen.FreshId("MoreFuel_" + f.FullName);
+        Bpl.Constant moreFuel = new Bpl.Constant(f.Origin, new Bpl.TypedIdent(f.Origin, uniqueId, predef.LayerType), false);
+        sink.AddTopLevelDeclaration(moreFuel);
+        Bpl.Expr moreFuel_expr = new Bpl.IdentifierExpr(f.Origin, moreFuel);
+        return moreFuel_expr;
+      }
+    }
+
+    internal class FuelSetting {
+
+      public enum FuelAmount { NONE, LOW, HIGH };
+      public static AsyncLocal<Stack<FuelContext>> SavedContexts = new();
+
+      public static FuelSettingPair FuelAttrib(Function f, out bool found) {
+        Contract.Requires(f != null);
+        Contract.Ensures(Contract.Result<FuelSettingPair>() != null);
+        FuelSettingPair setting = new FuelSettingPair();
+        found = false;
+
+        if (f.Attributes != null) {
+          List<Expression> args = Attributes.FindExpressions(f.Attributes, "fuel");
+          if (args != null) {
+            found = true;
+            if (args.Count >= 2) {
+              LiteralExpr literalLow = args[0] as LiteralExpr;
+              LiteralExpr literalHigh = args[1] as LiteralExpr;
+
+              if (literalLow != null && literalLow.Value is BigInteger && literalHigh != null && literalHigh.Value is BigInteger) {
+                setting.low = (int)((BigInteger)literalLow.Value);
+                setting.high = (int)((BigInteger)literalHigh.Value);
+              }
+            } else if (args.Count >= 1) {
+              LiteralExpr literal = args[0] as LiteralExpr;
+              if (literal != null && literal.Value is BigInteger) {
+                setting.low = (int)((BigInteger)literal.Value);
+                setting.high = setting.low + 1;
+              }
+            }
+          }
+        }
+
+        return setting;
+      }
+
+      public int amount;        // Amount of fuel above that represented by start
+      private Bpl.Expr start;   // Starting fuel argument (null indicates LZ)
+      private BoogieGenerator boogieGenerator;
+      private CustomFuelSettings customFuelSettings;
+
+      public FuelSetting(BoogieGenerator boogieGenerator, int amount, Bpl.Expr start = null, CustomFuelSettings customFuelSettings = null) {
+        this.boogieGenerator = boogieGenerator;
+        this.amount = amount;
+        this.start = start;
+        this.customFuelSettings = customFuelSettings;
+      }
+
+      public FuelSetting Offset(int offset) {
+        return new FuelSetting(boogieGenerator, this.amount + offset, start);
+      }
+
+      public FuelSetting Decrease(int offset) {
+        Contract.Ensures(this.amount - offset >= 0);
+        return new FuelSetting(boogieGenerator, this.amount - offset, start);
+      }
+
+      public FuelSetting WithLayer(Bpl.Expr layer) {
+        return new FuelSetting(boogieGenerator, amount, layer);
+      }
+
+      public FuelSetting WithContext(CustomFuelSettings settings) {
+        return new FuelSetting(boogieGenerator, amount, start, settings);
+      }
+
+      public Bpl.Expr LayerZero() {
+        Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+        return new Bpl.IdentifierExpr(Token.NoToken, "$LZ", boogieGenerator.Predef.LayerType);
+      }
+
+      public Bpl.Expr LayerN(int n) {
+        Contract.Requires(0 <= n);
+        Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+        return boogieGenerator.LayerSucc(LayerZero(), n);
+      }
+
+      public Bpl.Expr LayerN(int n, Bpl.Expr baseLayer) {
+        Contract.Requires(0 <= n);
+        Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+        return boogieGenerator.LayerSucc(baseLayer, n);
+      }
+
+      private Bpl.Expr ToExpr(int amount) {
+        if (start == null) {
+          return LayerN(amount);
+        } else {
+          return boogieGenerator.LayerSucc(start, amount);
+        }
+      }
+
+      public Bpl.Expr ToExpr() {
+        return this.ToExpr(this.amount);
+      }
+
+      /// <summary>
+      /// Get the fuel value for this function, given the ambient environment (represented by the fuel setting)
+      /// the function itself, and the function call's context (if any)
+      /// </summary>
+      public Bpl.Expr GetFunctionFuel(Function f) {
+        Contract.Requires(f != null);
+        Bpl.Expr finalFuel;
+        if (customFuelSettings != null && customFuelSettings.ContainsKey(f)) {
+          finalFuel = customFuelSettings[f].GetFunctionFuel(f);
+        } else if (this.amount == (int)FuelAmount.NONE) {
+          finalFuel = this.ToExpr();
+        } else {
+          FuelSettingPair setting = null;
+          var found = boogieGenerator.fuelContext.TryGetValue(f, out setting);
+
+          if (!found) {  // If the context doesn't define fuel for this function, check for a fuel attribute (which supplies a default value if none is found)
+            setting = FuelAttrib(f, out found);
+          }
+
+          FuelConstant fuelConstant = boogieGenerator.functionFuel.Find(x => x.f == f);
+          if (this.amount == (int)FuelAmount.LOW) {
+            finalFuel = GetFunctionFuel(setting.low > 0 ? setting.low : this.amount, found, fuelConstant);
+          } else if (this.amount >= (int)FuelAmount.HIGH) {
+            finalFuel = GetFunctionFuel(setting.high > 0 ? setting.high : this.amount, found, fuelConstant);
+          } else {
+            Contract.Assert(false); // Should not reach here
+            finalFuel = null;
+          }
+        }
+        return finalFuel;
+      }
+
+      private Bpl.Expr GetFunctionFuel(int amount, bool hasFuel, FuelConstant fuelConstant) {
+        if (fuelConstant != null) {
+          /*
+          if (hasFuel) {
+            // it has fuel context
+            return LayerN(amount, fuelConstant.baseFuel);
+          } else {
+           */
+          // startfuel
+          if (amount == (int)FuelAmount.LOW) {
+            return fuelConstant.startFuel;
+          } else {
+            return fuelConstant.startFuelAssert;
+          }
+          //}
+        } else {
+          return ToExpr(amount);
+        }
+      }
+
+      /// <summary>
+      /// Finds all fuel related attributes of the form {:fuel function low [high]}
+      /// Adds the setting to the context _if_ the context does not already have a setting for that function.
+      /// In other words, it should be called in order from most to least specific context scope.
+      /// </summary>
+      public static void FindFuelAttributes(Attributes attribs, FuelContext fuelContext) {
+        Function f = null;
+        FuelSettingPair setting = null;
+
+        if (attribs != null) {
+          List<List<Expression>> results = Attributes.FindAllExpressions(attribs, "fuel");
+
+          if (results != null) {
+            foreach (List<Expression> args in results) {
+              if (args != null && args.Count >= 2) {
+                // Try to extract the function from the first argument
+                MemberSelectExpr selectExpr = args[0].Resolved as MemberSelectExpr;
+                if (selectExpr != null) {
+                  f = selectExpr.Member as Function;
+                }
+
+                // Try to extract the lower fuel setting
+                LiteralExpr literalLow = args[1] as LiteralExpr;
+                if (literalLow != null && literalLow.Value is BigInteger) {
+                  setting = new FuelSettingPair();
+                  setting.low = (int)((BigInteger)literalLow.Value);
+                }
+
+                // The user may supply an additional high argument; if not, it defaults to low + 1
+                if (f != null && args.Count >= 3) {
+                  LiteralExpr literalHigh = args[2] as LiteralExpr;
+                  if (setting != null && literalHigh != null && literalHigh.Value is BigInteger) {
+                    setting.high = (int)((BigInteger)literalHigh.Value);
+                    if (!fuelContext.ContainsKey(f)) {
+                      fuelContext.Add(f, setting);
+                    }
+                  }
+                } else if (f != null && setting != null) {
+                  setting.high = setting.low + 1;
+                  if (!fuelContext.ContainsKey(f)) {
+                    fuelContext.Add(f, setting);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+
+      /// <summary>
+      /// Extend the given context with fuel information from the declaration itself, and enclosing modules
+      /// </summary>
+      private static void AddFuelContext(FuelContext context, TopLevelDecl decl) {
+        FindFuelAttributes(decl.Attributes, context);
+
+        var module = decl.EnclosingModuleDefinition;
+        while (module != null) {
+          FindFuelAttributes(module.Attributes, context);
+          module = module.EnclosingModule;
+        }
+      }
+
+      /// <summary>
+      /// Creates a summary of all fuel settings in scope, starting from the given class declaration
+      /// </summary>
+      public static FuelContext NewFuelContext(TopLevelDecl decl) {
+        FuelContext context = new FuelContext();
+        AddFuelContext(context, decl);
+        return context;
+      }
+
+      /// <summary>
+      /// Creates a summary of all fuel settings in scope, starting from the given member declaration
+      /// </summary>
+      public static FuelContext NewFuelContext(MemberDecl decl) {
+        FuelContext context = new FuelContext();
+
+        FindFuelAttributes(decl.Attributes, context);
+        AddFuelContext(context, decl.EnclosingClass);
+
+        return context;
+      }
+
+      /// <summary>
+      /// Extends the given fuel context with any new fuel settings found in attribs
+      /// </summary>
+      public static FuelContext ExpandFuelContext(Attributes attribs, IOrigin tok, FuelContext oldFuelContext, ErrorReporter reporter) {
+        Contract.Ensures(GetSavedContexts().Count == Contract.OldValue(GetSavedContexts().Count) + 1);
+        FuelContext newContext = new FuelContext();
+        FindFuelAttributes(attribs, newContext);
+        if (newContext.Count > 0) {
+          // first make sure that the fuel only increase relative to the oldContext
+          foreach (var pair in newContext) {
+            FuelSettingPair newSetting = pair.Value;
+            FuelSettingPair oldSetting;
+            var found = oldFuelContext.TryGetValue(pair.Key, out oldSetting);
+            if (!found) {    // the default is {:fuel, 1, 2}
+              oldSetting = new FuelSettingPair();
+            }
+            // make sure that the fuel can only increase within a given scope
+            if (newSetting.low < oldSetting.low || newSetting.high < oldSetting.high) {
+              reporter.Error(MessageSource.Translator, ErrorId.g_fuel_must_increase, tok, "Fuel can only increase within a given scope.");
+            }
+          }
+          // add oldContext to newContext if it doesn't exist already
+          foreach (var pair in oldFuelContext) {
+            if (!newContext.ContainsKey(pair.Key)) {    // Local setting takes precedence over old context
+              newContext.Add(pair.Key, pair.Value);
+            }
+          }
+        } else {
+          newContext = oldFuelContext;
+        }
+        GetSavedContexts().Push(oldFuelContext);
+
+        return newContext;
+      }
+
+      private static Stack<FuelContext> GetSavedContexts() {
+        var result = SavedContexts.Value;
+        if (result == null) {
+          SavedContexts.Value = result = new();
+        }
+        return result;
+      }
+
+      public static FuelContext PopFuelContext() {
+        Contract.Requires(GetSavedContexts().Count > 0);
+        return GetSavedContexts().Pop();
+      }
+
+    }
+
+    private bool DisableNonLinearArithmetic => DetermineDisableNonLinearArithmetic(forModule, options);
+    private int ArithmeticSolver {
+      get {
+        var arithmeticSolver = Attributes.Find(forModule.Attributes, "z3ArithmeticSolver");
+
+        // The value 2 tends to lead to the best all-around arithmetic
+        // performance, though some programs can be verified more quickly
+        // (or verified at all) using a different solver.
+        // https://microsoft.github.io/z3guide/programming/Parameters/
+        var defaultSolver = 2;
+        if (arithmeticSolver == null) {
+          return defaultSolver;
+        }
+
+        var arg = arithmeticSolver.Args.Count > 0 ? arithmeticSolver.Args[0] : null;
+        if (arg == null) {
+          return defaultSolver;
+        }
+
+        if (!Expression.IsIntLiteral(arg, out var value)) {
+          return 0;
+        }
+        try {
+          return (int)value;
+        } catch (OverflowException) {
+          return defaultSolver;
+        }
+      }
+    }
+
+    public static bool DetermineDisableNonLinearArithmetic(ModuleDefinition module, DafnyOptions dafnyOptions) {
+      var nlaAttribute = Attributes.Find(module.Attributes, "disableNonlinearArithmetic");
+      if (nlaAttribute != null) {
+        var value = true;
+        var arg = nlaAttribute.Args.Count > 0 ? nlaAttribute.Args[0] : null;
+        if (arg != null) {
+          Expression.IsBoolLiteral(arg, out value);
+        }
+
+        return value;
+      }
+
+      return dafnyOptions.DisableNLarith;
+    }
+
+    /// <summary>
+    /// Return the conjuncts of "attributedExpressions".
+    /// </summary>
+    public static IEnumerable<AttributedExpression> ConjunctsOf(List<AttributedExpression> attributedExpressions) {
+      foreach (var attrExpr in attributedExpressions) {
+        if (attrExpr.Label != null) {
+          // don't mess with labeled expressions
+          yield return attrExpr;
+        } else {
+          foreach (var conjunct in Expression.ConjunctsWithLetsOnOutside(attrExpr.E)) {
+            yield return new AttributedExpression(conjunct, attrExpr.Attributes);
+          }
+        }
+      }
+    }
+
+    List<SplitExprInfo> /*!*/ TrSplitExpr(BodyTranslationContext context, Expression expr, ExpressionTranslator etran, bool applyInduction,
+      out bool splitHappened) {
+      Contract.Requires(expr != null);
+      Contract.Requires(etran != null);
+      Contract.Ensures(Contract.Result<List<SplitExprInfo>>() != null);
+
+      var splits = new List<SplitExprInfo>();
+      splitHappened = TrSplitExpr(context, expr, splits, true, int.MaxValue, applyInduction, etran);
+      return splits;
+    }
+
+    List<SplitExprInfo> TrSplitExprForMethodSpec(BodyTranslationContext context, Expression expr, ExpressionTranslator etran, MethodTranslationKind kind) {
+      Contract.Requires(expr != null);
+      Contract.Requires(etran != null);
+      Contract.Ensures(Contract.Result<List<SplitExprInfo>>() != null);
+
+      var splits = new List<SplitExprInfo>();
+      var applyInduction = kind == MethodTranslationKind.Implementation;
+      TrSplitExpr(context, expr, splits, true, int.MaxValue, applyInduction, etran);
+      return splits;
+    }
+
+    Bpl.Trigger TrTrigger(ExpressionTranslator etran, Attributes attribs, IOrigin tok, Dictionary<IVariable, Expression> substMap = null) {
+      Contract.Requires(etran != null);
+      Contract.Requires(tok != null);
+      var argsEtran = etran.WithNoLits();
+      Bpl.Trigger tr = null;
+      foreach (var trigger in attribs.AsEnumerable().Where(aa => aa.Name == "trigger").Select(aa => aa.Args)) {
+        List<Bpl.Expr> tt = new List<Bpl.Expr>();
+        foreach (var arg in trigger) {
+          Bpl.Expr term;
+          if (substMap == null) {
+            term = argsEtran.TrExpr(arg);
+          } else {
+            term = argsEtran.TrExpr(Substitute(arg, null, substMap));
+          }
+          tt.Add(StripBoxAdjustments(term));
+        }
+        tr = new Bpl.Trigger(tok, true, tt, tr);
+      }
+      return tr;
+    }
+
+    Bpl.Trigger TrTrigger(ExpressionTranslator etran, Attributes attribs, IOrigin tok, List<Variable> bvars, Dictionary<IVariable, Expression> substMap, Dictionary<TypeParameter, Type> typeMap) {
+      Contract.Requires(etran != null);
+      Contract.Requires(tok != null);
+      var argsEtran = etran.WithNoLits();
+      Bpl.Trigger tr = null;
+      var fueledTrigger = new Dictionary<List<Expression>, bool>();
+      // translate the triggers once to see if fuel or the heap is used as quantifier boundvar
+      foreach (var aa in attribs.AsEnumerable()) {
+        if (aa.Name == "trigger") {
+          int fuelCount = argsEtran.Statistics_CustomLayerFunctionCount;
+          foreach (var arg in aa.Args) {
+            argsEtran.TrExpr(arg);
+          }
+          fueledTrigger[aa.Args] = argsEtran.Statistics_CustomLayerFunctionCount > fuelCount;
+        }
+      }
+
+      bool useFuelAsQuantifier = argsEtran.Statistics_CustomLayerFunctionCount > 0;
+      bool useHeapAsQuantifier = argsEtran.Statistics_HeapAsQuantifierCount > 0;
+      if (useHeapAsQuantifier) {
+        var heapExpr = BplBoundVar(CurrentIdGenerator.FreshId("tr$heap#"), Predef.HeapType, bvars);
+        argsEtran = new ExpressionTranslator(argsEtran, heapExpr);
+      }
+
+      // now translate it with the correct layer and heapExpr
+      foreach (var trigger in attribs.AsEnumerable().Where(aa => aa.Name == "trigger")) {
+        List<Bpl.Expr> tt = new List<Bpl.Expr>();
+        foreach (var arg in trigger.Args) {
+          Bpl.Expr term;
+          if (substMap == null) {
+            term = argsEtran.TrExpr(arg);
+          } else {
+            term = argsEtran.TrExpr(Substitute(arg, null, substMap, typeMap));
+          }
+          tt.Add(StripBoxAdjustments(term));
+        }
+        if (useHeapAsQuantifier) {
+          tt.Add(FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, argsEtran.HeapExpr));
+        }
+        tr = new Bpl.Trigger(tok, true, tt, tr);
+      }
+      return tr;
+    }
+
+    private class VariablesCollector : BottomUpVisitor {
+      internal ISet<IVariable> variables;
+
+      internal VariablesCollector() {
+        this.variables = new HashSet<IVariable>();
+      }
+
+      protected override void VisitOneExpr(Expression expr) {
+        if (expr is IdentifierExpr) {
+          variables.Add((expr as IdentifierExpr).Var);
+        }
+      }
+    }
+
+    bool TrSplitNeedsTokenAdjustment(Expression expr) {
+      Contract.Requires(expr != null);
+      return expr.Origin.IsInherited(currentModule) && (codeContext == null || !codeContext.MustReverify) && RefinementTransformer.ContainsChange(expr, currentModule);
+    }
+
+    /// <summary>
+    /// Return a list of variables specified by the arguments of :_induction in "attributes", if any.
+    /// If an argument of :_induction is a ThisExpr, "null" is returned as the corresponding variable.
+    /// </summary>
+    List<VarType/*?*/> ApplyInduction<VarType>(List<VarType> boundVars, Attributes attributes) where VarType : class, IVariable {
+      Contract.Requires(boundVars != null);
+      Contract.Ensures(Contract.Result<List<VarType>>() != null);
+
+      var args = Attributes.FindExpressions(attributes, "_induction");
+      if (args == null) {
+        return new List<VarType>();  // don't apply induction
+      } else {
+        return args.ConvertAll(e => e is ThisExpr ? null : (VarType)((IdentifierExpr)e).Var);
+      }
+    }
+
+    // No expression introduces a type variable
+    static void ComputeFreeTypeVariables(Expression expr, ISet<TypeParameter> fvs) {
+      ComputeFreeTypeVariables(expr.Type, fvs);
+      expr.ComponentTypes.ForEach(ty => ComputeFreeTypeVariables((Type)ty, fvs));
+      expr.SubExpressions.ForEach(ee => ComputeFreeTypeVariables(ee, fvs));
+    }
+
+    static void ComputeFreeTypeVariables(Type ty, ISet<TypeParameter> fvs) {
+      // Add type parameters
+      var tp = ty.AsTypeParameter;
+      if (tp != null) {
+        Contract.Assert(ty.TypeArgs.Count == 0);
+        fvs.Add(tp);
+      } else {
+        ty.NormalizeExpandKeepConstraints().TypeArgs.ForEach(tt => ComputeFreeTypeVariables(tt, fvs));
+      }
+    }
+
+    static void ComputeFreeTypeVariables_All(Type ty, ISet<TypeParameter> fvs) {
+      // Add type parameters
+      if (ty.IsTypeParameter) {
+        fvs.Add(ty.AsTypeParameter);
+      }
+      ty.NormalizeExpandKeepConstraints().TypeArgs.ForEach(tt => ComputeFreeTypeVariables_All(tt, fvs));
+    }
+
+    public bool UsesHeap(Expression expr) {
+      UsesHeapVisitor visitor = new UsesHeapVisitor();
+      visitor.Visit(expr);
+      if (visitor.foundHeap) {
+        return true;
+      }
+      bool usesHeap = false, usesOldHeap = false;
+      var FVsHeapAt = new HashSet<Label>();
+      Type usesThis = null;
+      FreeVariablesUtil.ComputeFreeVariables(options, expr, new HashSet<IVariable>(), ref usesHeap, ref usesOldHeap, FVsHeapAt, ref usesThis, false);
+      return usesHeap || usesOldHeap || FVsHeapAt.Count != 0;
+    }
+
+    class UsesHeapVisitor : BottomUpVisitor {
+      internal bool foundHeap = false;
+      Type usesThis = null;
+      protected override void VisitOneExpr(Expression expr) {
+        LetExpr letExpr = expr as LetExpr;
+        if (letExpr != null && !letExpr.Exact) {
+          foundHeap = true; // see comment in LetSuchThatExprInfo: "UsesHeap = true;  // note, we ignore "usesHeap" and always record it as "true", because various type antecedents need access to the heap (hopefully, this is okay in the contexts in which the let-such-that expression is used)"
+        }
+        FunctionCallExpr call = expr as FunctionCallExpr;
+        if (call != null && call.Function != null && call.Function.ReadsHeap) {
+          foundHeap = true;
+        }
+        if (expr is ApplyExpr || expr is SeqConstructionExpr) {
+          foundHeap = true;
+        }
+        ThisExpr thisExpr = expr as ThisExpr;
+        if (thisExpr != null && thisExpr.Type == null) { // this shouldn't happen, but there appears to be a bug in trait resolution (see TraitCompile.dfy); it causes ComputeFreeVariables to blow up
+          foundHeap = true;
+        } else if (thisExpr != null && usesThis != null && !thisExpr.Type.Equals(usesThis)) { // also causes ComputeFreeVariables to blow up (see TraitExample.dfy)
+          foundHeap = true;
+        } else if (thisExpr != null) {
+          usesThis = thisExpr.Type;
+        }
+      }
+    }
+
+    /// <summary>
+    /// Returns an expression like "expr", but where free occurrences of "v" have been replaced by "e".
+    /// </summary>
+    public static Expression Substitute(Expression expr, IVariable v, Expression e) {
+      Contract.Requires(expr != null);
+      Contract.Requires(v != null);
+      Contract.Requires(e != null);
+      Contract.Ensures(Contract.Result<Expression>() != null);
+      var substMap = new Dictionary<IVariable, Expression>();
+      substMap.Add(v, e);
+      return Substitute(expr, null, substMap);
+    }
+
+    public static Expression Substitute(Expression expr, Expression receiverReplacement, Dictionary<IVariable, Expression/*!*/>/*!*/ substMap,
+      Dictionary<TypeParameter, Type> typeMap = null, Label oldLabel = null) {
+      Contract.Requires(expr != null);
+      Contract.Requires(cce.NonNullDictionaryAndValues(substMap));
+      Contract.Ensures(Contract.Result<Expression>() != null);
+      var s = new Substituter(receiverReplacement, substMap, typeMap ?? new Dictionary<TypeParameter, Type>(), oldLabel);
+      return s.Substitute(expr);
+    }
+
+    public static Expression InlineLet(LetExpr letExpr) {
+      Contract.Requires(letExpr.LHSs.All(p => p.Var != null));
+      var substMap = new Dictionary<IVariable, Expression>();
+      for (var i = 0; i < letExpr.LHSs.Count; i++) {
+        substMap.Add(letExpr.LHSs[i].Var, letExpr.RHSs[i]);
+      }
+      return BoogieGenerator.Substitute(letExpr.Body, null, substMap);
+    }
+
+    Bpl.Expr HeapSameOrSucc(Bpl.Expr oldHeap, Bpl.Expr newHeap) {
+      return BplOr(
+        Bpl.Expr.Eq(oldHeap, newHeap),
+        FunctionCall(newHeap.tok, BuiltinFunction.HeapSucc, null, oldHeap, newHeap));
+    }
+    Bpl.Expr HeapSucc(Bpl.Expr oldHeap, Bpl.Expr newHeap, bool useGhostHeapSucc = false) {
+      return FunctionCall(newHeap.tok, useGhostHeapSucc ? BuiltinFunction.HeapSuccGhost : BuiltinFunction.HeapSucc, null, oldHeap, newHeap);
+    }
+
+    // Bpl-making-utilities
+
+    /// <summary>
+    /// Create a Boogie quantifier with body "A ==> body" and triggers "trg", but use only the subset of bound
+    /// variables from "varsAndAntecedents" that actually occur free in "body" or "trg", and "A" is the conjunction of
+    /// antecedents for those corresponding bound variables.  If none of the bound variables is used, "body"
+    /// is returned. Also, if none of the bound variables is used in "body" (whether or not they are used in "trg"),
+    /// then "body" is returned.
+    /// The order of the contents of "varsAndAntecedents" matters: For any index "i" into "varsAndAntecedents", the
+    /// antecedent varsAndAntecedents[i].Item2 may depend on a variable varsAndAntecedents[j].Item1 if "j GREATER-OR-EQUAL i"
+    /// but not if "j LESS i".
+    /// Caution: if "trg" is null, makes a forall without any triggers.
+    /// </summary>
+    static Bpl.Expr BplForallTrim(IEnumerable<Tuple<Bpl.Variable, Bpl.Expr/*?*/>> varsAndAntecedents, Bpl.Trigger trg, Bpl.Expr body) {
+      Contract.Requires(varsAndAntecedents != null);
+      Contract.Requires(body != null);
+
+      // We'd like to compute the free variables if "body" and "trg". It would be nice to use the Boogie
+      // routine Bpl.Expr.ComputeFreeVariables for this purpose. However, calling it requires the Boogie
+      // expression to be resolved. Instead, we do the cheesy thing of computing the set of names of
+      // free variables in "body" and "trg".
+      var vis = new VariableNameVisitor();
+      vis.Visit(body);
+      if (varsAndAntecedents.All(pair => !vis.Names.Contains(pair.Item1.Name))) {
+        // the body doesn't mention any of the bound variables, so no point in wrapping a quantifier around it
+        return body;
+      }
+      for (var tt = trg; tt != null; tt = tt.Next) {
+        tt.Tr.ForEach(ee => vis.Visit(ee));
+      }
+
+      var args = new List<Bpl.Variable>();
+      Bpl.Expr typeAntecedent = Bpl.Expr.True;
+      foreach (var pair in varsAndAntecedents) {
+        var bv = pair.Item1;
+        var wh = pair.Item2;
+        if (vis.Names.Contains(bv.Name)) {
+          args.Add(bv);
+          if (wh != null) {
+            typeAntecedent = BplAnd(typeAntecedent, wh);
+            vis.Visit(wh);  // this adds to "vis.Names" the free variables of "wh"
+          }
+        }
+      }
+      if (args.Count == 0) {
+        return body;
+      } else {
+        return new Bpl.ForallExpr(body.tok, args, trg, BplImp(typeAntecedent, body));
+      }
+    }
+    class VariableNameVisitor : Boogie.StandardVisitor {
+      public readonly HashSet<string> Names = new HashSet<string>();
+      public override Expr VisitIdentifierExpr(Bpl.IdentifierExpr node) {
+        Names.Add(node.Name);
+        return base.VisitIdentifierExpr(node);
+      }
+      public override BinderExpr VisitBinderExpr(BinderExpr node) {
+        var vis = new VariableNameVisitor();
+        vis.Visit(node.Body);
+        var dummyNames = new HashSet<string>(node.Dummies.Select(v => v.Name));
+        foreach (var nm in vis.Names) {
+          if (!dummyNames.Contains(nm)) {
+            Names.Add(nm);
+          }
+        }
+        return (BinderExpr)base.VisitBinderExpr(node);
+      }
+    }
+
+    List<Bpl.Variable> MkTyParamBinders(List<TypeParameter> args) {
+      return MkTyParamBinders(args, out _);
+    }
+
+    List<Bpl.Variable> MkTyParamBinders(List<TypeParameter> args, out List<Bpl.Expr> exprs) {
+      var vars = new List<Bpl.Variable>();
+      exprs = new List<Bpl.Expr>();
+      foreach (TypeParameter v in args) {
+        vars.Add(BplBoundVar(NameTypeParam(v), Predef.Ty, out var e));
+        exprs.Add(e);
+      }
+      return vars;
+    }
+
+    // For incoming formals
+    List<Variable> MkTyParamFormals(List<TypeParameter> args, bool includeWhereClause, bool named = true) {
+      return MkTyParamFormals(args, out _, includeWhereClause, named);
+    }
+
+    // For incoming formals
+    List<Bpl.Variable> MkTyParamFormals(List<TypeParameter> args, out List<Bpl.Expr> exprs, bool includeWhereClause, bool named) {
+      var vars = new List<Bpl.Variable>();
+      exprs = new List<Bpl.Expr>();
+      foreach (TypeParameter v in args) {
+        var whereClause = includeWhereClause ? GetTyWhereClause(new Bpl.IdentifierExpr(v.Origin, NameTypeParam(v), Predef.Ty), v.Characteristics) : null;
+        vars.Add(BplFormalVar(named ? NameTypeParam(v) : null, Predef.Ty, true, out var e, whereClause));
+        exprs.Add(e);
+      }
+      return vars;
+    }
+
+    public Bpl.Expr/*?*/ GetTyWhereClause(Bpl.Expr expr, TypeParameter.TypeParameterCharacteristics characteristics) {
+      Contract.Requires(expr != null);
+      if (characteristics.ContainsNoReferenceTypes) {
+        return FunctionCall(expr.tok, "$AlwaysAllocated", Bpl.Type.Bool, expr);
+      }
+      return null;
+    }
+
+    public static void MapM<A>(IEnumerable<A> xs, Action<A> K) {
+      Contract.Requires(xs != null);
+      Contract.Requires(K != null);
+      foreach (A x in xs) {
+        K(x);
+      }
+    }
+
+    static readonly List<Boolean> Bools = new List<Boolean> { false, true };
+
+    public Expr GetRevealConstant(Function f) {
+      this.CreateRevealableConstant(f);
+      return this.functionReveals[f];
+    }
+
+    public static IsAllocType ISALLOC { get { return IsAllocType.ISALLOC; } }
+    public static IsAllocType NOALLOC { get { return IsAllocType.NOALLOC; } }
+  }
+
+  public enum AssertMode { Keep, Assume, Check }
+}
+
+public enum IsAllocType { ISALLOC, NOALLOC, NEVERALLOC };  // NEVERALLOC is like NOALLOC, but overrides AlwaysAlloc
+
+class FromDafnyNode : VCGeneration.TokenWrapper {
+  public INode Node { get; }
+
+  public FromDafnyNode(INode node) : base(node.Origin) {
+    this.Node = node;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/BoogieStmtListBuilder.cs b/Source/DafnyCore/Verifier/BoogieStmtListBuilder.cs
index 59a80ed3d87..ce71e619066 100644
--- a/Source/DafnyCore/Verifier/BoogieStmtListBuilder.cs
+++ b/Source/DafnyCore/Verifier/BoogieStmtListBuilder.cs
@@ -1,23 +1,44 @@
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Boogie;
 
 namespace Microsoft.Dafny {
-  internal class BoogieStmtListBuilder {
+  public class BoogieStmtListBuilder {
     public DafnyOptions Options { get; }
+    public BodyTranslationContext Context { get; set; }
     public StmtListBuilder builder;
-    public Translator tran;
+    public readonly List<object> Commands;
+    public BoogieGenerator tran;
 
-    public BoogieStmtListBuilder(Translator tran, DafnyOptions options) {
-      builder = new Boogie.StmtListBuilder();
+    public BoogieStmtListBuilder WithContext(BodyTranslationContext context) {
+      if (context == Context) {
+        return this;
+      }
+      return new BoogieStmtListBuilder(Commands, builder, tran, Options, context);
+    }
+
+    private BoogieStmtListBuilder(List<object> commands, StmtListBuilder builder, BoogieGenerator tran, DafnyOptions options, BodyTranslationContext context) {
+      Commands = commands;
+      this.builder = builder;
       this.tran = tran;
-      this.Options = options;
+      Options = options;
+      Context = context;
+    }
+
+    public BoogieStmtListBuilder(BoogieGenerator tran, DafnyOptions options, BodyTranslationContext context) {
+      builder = new StmtListBuilder();
+      this.tran = tran;
+      Options = options;
+      Commands = new();
+      Context = context;
     }
 
     public void Add(Cmd cmd) {
+      Commands.Add(cmd);
       builder.Add(cmd);
-      if (cmd is Boogie.AssertCmd) {
+      if (cmd is AssertCmd) {
         tran.assertionCount++;
-      } else if (cmd is Boogie.CallCmd call) {
+      } else if (cmd is CallCmd call) {
         // A call command may involve a precondition, but we can't tell for sure until the callee
         // procedure has been generated. Therefore, to be on the same side, we count this call
         // as a possible assertion, unless it's a procedure that's part of the translation and
@@ -31,14 +52,22 @@ public void Add(Cmd cmd) {
     }
 
     public void Add(StructuredCmd scmd) {
+      Commands.Add(scmd);
       builder.Add(scmd);
       if (scmd is Boogie.WhileCmd whyle && whyle.Invariants.Any(inv => inv is Boogie.AssertCmd)) {
         tran.assertionCount++;
       }
     }
 
-    public void Add(TransferCmd tcmd) { builder.Add(tcmd); }
-    public void AddLabelCmd(string label) { builder.AddLabelCmd(label); }
+    public void Add(TransferCmd tcmd) {
+      Commands.Add(tcmd);
+      builder.Add(tcmd);
+    }
+
+    public void AddLabelCmd(IOrigin token, string label) {
+      Commands.Add(label);
+      builder.AddLabelCmd(token, label);
+    }
     public void AddLocalVariable(string name) { builder.AddLocalVariable(name); }
 
     public StmtList Collect(Boogie.IToken tok) {
diff --git a/Source/DafnyCore/Verifier/CaptureStateExtensions.cs b/Source/DafnyCore/Verifier/CaptureStateExtensions.cs
index fa8a57a7eb4..38dad4db45b 100644
--- a/Source/DafnyCore/Verifier/CaptureStateExtensions.cs
+++ b/Source/DafnyCore/Verifier/CaptureStateExtensions.cs
@@ -3,10 +3,12 @@
 using Bpl = Microsoft.Boogie;
 
 namespace Microsoft.Dafny {
-  static class CaptureStateExtensions {
+  public static class CaptureStateExtensions {
 
-    public static void AddCaptureState(this BoogieStmtListBuilder builder, Statement statement) {
-      if (builder.Options.ModelViewFile != null || builder.Options.TestGenOptions.Mode != TestGenerationOptions.Modes.None) {
+    public const string AfterLoopIterationsStateMarker = "after some loop iterations";
+
+    internal static void AddCaptureState(this BoogieStmtListBuilder builder, Statement statement) {
+      if (builder.Options.ExpectingModel || builder.Options.TestGenOptions.Mode != TestGenerationOptions.Modes.None) {
         builder.Add(CaptureState(builder.Options, statement));
       }
     }
@@ -14,16 +16,16 @@ public static void AddCaptureState(this BoogieStmtListBuilder builder, Statement
     private static Bpl.Cmd CaptureState(DafnyOptions options, Statement stmt) {
       Contract.Requires(stmt != null);
       Contract.Ensures(Contract.Result<Bpl.Cmd>() != null);
-      return CaptureState(options, stmt.RangeToken.EndToken, true, null);
+      return CaptureState(options, stmt.Origin.EndToken, true, null);
     }
 
-    public static void AddCaptureState(this BoogieStmtListBuilder builder, IToken tok, bool isEndToken, string /*?*/ additionalInfo) {
-      if (builder.Options.ModelViewFile != null || builder.Options.TestGenOptions.Mode != TestGenerationOptions.Modes.None) {
+    internal static void AddCaptureState(this BoogieStmtListBuilder builder, IOrigin tok, bool isEndToken, string /*?*/ additionalInfo) {
+      if (builder.Options.ExpectingModel || builder.Options.TestGenOptions.Mode != TestGenerationOptions.Modes.None) {
         builder.Add(CaptureState(builder.Options, tok, isEndToken, additionalInfo));
       }
     }
 
-    private static Bpl.Cmd CaptureState(DafnyOptions options, IToken tok, bool isEndToken, string/*?*/ additionalInfo) {
+    private static Bpl.Cmd CaptureState(DafnyOptions options, IOrigin tok, bool isEndToken, string/*?*/ additionalInfo) {
       Contract.Requires(tok != null);
       Contract.Ensures(Contract.Result<Bpl.Cmd>() != null);
       string description;
@@ -33,7 +35,7 @@ private static Bpl.Cmd CaptureState(DafnyOptions options, IToken tok, bool isEnd
         description = $"{tok.TokenToString(options)}{(additionalInfo == null ? "" : (": " + additionalInfo))}";
       }
       Bpl.QKeyValue kv = new Bpl.QKeyValue(tok, "captureState", new List<object>() { description }, null);
-      return Translator.TrAssumeCmd(tok, Bpl.Expr.True, kv);
+      return BoogieGenerator.TrAssumeCmd(tok, Bpl.Expr.True, kv);
     }
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/Datatypes/BoogieGenerator.DataTypes.cs b/Source/DafnyCore/Verifier/Datatypes/BoogieGenerator.DataTypes.cs
new file mode 100644
index 00000000000..18299d14d14
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Datatypes/BoogieGenerator.DataTypes.cs
@@ -0,0 +1,870 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using Bpl = Microsoft.Boogie;
+using BplParser = Microsoft.Boogie.Parser;
+using System.Text;
+using Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+
+namespace Microsoft.Dafny {
+  partial class BoogieGenerator {
+    void AddDatatype(DatatypeDecl dt) {
+      Contract.Requires(dt != null);
+      Contract.Requires(sink != null && Predef != null);
+
+      var mayInvolveReferences = UserDefinedType.FromTopLevelDecl(dt.Origin, dt).MayInvolveReferences;
+      var constructorFunctions = dt.Ctors.ToDictionary(ctor => ctor, ctor => AddDataTypeConstructor(dt, ctor, mayInvolveReferences));
+      if (!mayInvolveReferences) {
+        AddCommonIsAllocConstructorAxiom(dt);
+      }
+
+      AddDepthOneCaseSplitFunction(dt);
+
+      // The axiom above ($IsA#Dt(d) <==> Dt.Ctor0?(d) || Dt.Ctor1?(d)) gets triggered only with $IsA#Dt(d).  The $IsA#Dt(d)
+      // predicate is generated only where the translation inserts it; in other words, the user cannot write any assertion
+      // that causes the $IsA#Dt(d) predicate to be emitted.  This is what we want, because making the RHS disjunction be
+      // available too often makes performance go down.  However, we do want to allow the disjunction to be introduced if the
+      // user explicitly talks about one of its disjuncts.  To make this useful, we introduce the following axiom.  Note that
+      // the DtType(d) information is available everywhere.
+      // axiom (forall G: Ty, d: DatatypeType ::
+      //         { Dt.Ctor0?(G,d) }
+      //         { Dt.Ctor1?(G,d) }
+      //         $Is(d, T(G)) ==> Dt.Ctor0?(G,d) || Dt.Ctor1?(G,d) || ...);
+      {
+        MkIsPredicateForDatatype(dt, out var boundVariables, out var d, out _, out var isPredicate);
+        Bpl.Expr cases_body = Bpl.Expr.False;
+        Bpl.Trigger tr = null;
+        foreach (DatatypeCtor ctor in dt.Ctors) {
+          var disj = FunctionCall(ctor.Origin, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, d);
+          cases_body = BplOr(cases_body, disj);
+          tr = new Bpl.Trigger(ctor.Origin, true, new List<Bpl.Expr> { disj, isPredicate }, tr);
+        }
+        var body = BplImp(isPredicate, cases_body);
+        var ax = BplForall(boundVariables, tr, body);
+        var axiom = new Bpl.Axiom(dt.Origin, ax, "Questionmark data type disjunctivity");
+        sink.AddTopLevelDeclaration(axiom);
+      }
+
+      if (dt is IndDatatypeDecl indDatatypeDecl) {
+        AddInductiveDatatypeAxioms(constructorFunctions, indDatatypeDecl);
+        AddExtensionalityAxiom(indDatatypeDecl);
+      }
+
+      if (dt is CoDatatypeDecl coDatatypeDecl) {
+        AddCoDatatypeDeclAxioms(coDatatypeDecl);
+      }
+    }
+
+    /// <summary>
+    /// Add function Dt#Equal(DatatypeType, DatatypeType): bool;
+    /// For each constructor Ctor(x: X, y: Y), add an axiom of the form
+    ///     forall a, b ::
+    ///       { Dt#Equal(a, b), Ctor?(a) }
+    ///       { Dt#Equal(a, b), Ctor?(b) }
+    ///       Ctor?(a) && Ctor?(b)
+    ///       ==>
+    ///       (Dt#Equal(a, b) <==>
+    ///           X#Equal(a.x, b.x) &&
+    ///           Y#Equal(a.y, b.y)
+    ///       )
+    /// where X#Equal is the equality predicate for type X and a.x denotes Dtor#x(a), and similarly
+    /// for Y and b.
+    /// Except, in the event that the datatype has exactly one constructor, then instead generate:
+    ///     forall a, b ::
+    ///       { Dt#Equal(a, b) }
+    ///       true
+    ///       ==>
+    ///       ...as before
+    /// </summary>
+    private void AddInductiveDatatypeAxioms(Dictionary<DatatypeCtor, Bpl.Function> constructorFunctions,
+      IndDatatypeDecl dt) {
+      var dtEqualName = DtEqualName(dt);
+
+      var args = new List<Variable>();
+      args.Add(new Bpl.Formal(dt.Origin, new Bpl.TypedIdent(dt.Origin, Bpl.TypedIdent.NoName, Predef.DatatypeType), false));
+      args.Add(new Bpl.Formal(dt.Origin, new Bpl.TypedIdent(dt.Origin, Bpl.TypedIdent.NoName, Predef.DatatypeType), false));
+      var ctorEqualResult =
+        new Bpl.Formal(dt.Origin, new Bpl.TypedIdent(dt.Origin, Bpl.TypedIdent.NoName, Bpl.Type.Bool), false);
+      sink.AddTopLevelDeclaration(new Bpl.Function(dt.Origin, dtEqualName, args, ctorEqualResult,
+        "Datatype extensional equality declaration"));
+
+      var aVar = BplBoundVar("a", Predef.DatatypeType, out var a);
+      var bVar = BplBoundVar("b", Predef.DatatypeType, out var b);
+
+      var dtEqual = FunctionCall(dt.Origin, dtEqualName, Bpl.Type.Bool, a, b);
+
+      foreach (var ctor in dt.Ctors) {
+        Bpl.Trigger trigger;
+        Bpl.Expr ante;
+        if (dt.Ctors.Count == 1) {
+          ante = Bpl.Expr.True;
+          trigger = BplTrigger(dtEqual);
+        } else {
+          var ctorQ = GetReadonlyField(ctor.QueryField);
+          var ctorQa = FunctionCall(ctor.Origin, ctorQ.Name, Bpl.Type.Bool, a);
+          var ctorQb = FunctionCall(ctor.Origin, ctorQ.Name, Bpl.Type.Bool, b);
+          ante = BplAnd(ctorQa, ctorQb);
+          trigger = dt.Ctors.Count == 1
+            ? BplTrigger(dtEqual)
+            : new Bpl.Trigger(ctor.Origin, true, new List<Bpl.Expr> { dtEqual, ctorQa },
+              new Bpl.Trigger(ctor.Origin, true, new List<Bpl.Expr> { dtEqual, ctorQb }));
+        }
+
+        Bpl.Expr eqs = Bpl.Expr.True;
+        for (var i = 0; i < ctor.Formals.Count; i++) {
+          var arg = ctor.Formals[i];
+          var dtor = GetReadonlyField(ctor.Destructors[i]);
+          var dtorA = FunctionCall(ctor.Origin, dtor.Name, TrType(arg.Type), a);
+          var dtorB = FunctionCall(ctor.Origin, dtor.Name, TrType(arg.Type), b);
+          var eq = TypeSpecificEqual(ctor.Origin, arg.Type, dtorA, dtorB);
+          eqs = BplAnd(eqs, eq);
+        }
+
+        var ax = BplForall(new List<Variable> { aVar, bVar }, trigger, BplImp(ante, BplIff(dtEqual, eqs)));
+        AddOtherDefinition(constructorFunctions[ctor], new Bpl.Axiom(dt.Origin, ax, $"Datatype extensional equality definition: {ctor.FullName}"));
+      }
+    }
+
+    private static string DtEqualName(IndDatatypeDecl dt) {
+      return dt.FullSanitizedName + "#Equal";
+    }
+
+    // Add extensionality axiom: forall a, b :: { Dt#Equal(a, b) } Dt#Equal(a, b) <==> a == b
+    private void AddExtensionalityAxiom(IndDatatypeDecl dt) {
+      var dtEqualName = DtEqualName(dt);
+      {
+        var aVar = BplBoundVar("a", Predef.DatatypeType, out var a);
+        var bVar = BplBoundVar("b", Predef.DatatypeType, out var b);
+
+        var lhs = FunctionCall(dt.Origin, dtEqualName, Bpl.Type.Bool, a, b);
+        var rhs = Bpl.Expr.Eq(a, b);
+
+        var ax = BplForall(new List<Variable> { aVar, bVar }, BplTrigger(lhs), BplIff(lhs, rhs));
+        sink.AddTopLevelDeclaration(new Bpl.Axiom(dt.Origin, ax, $"Datatype extensionality axiom: {dt.FullName}"));
+      }
+    }
+
+    private void AddCoDatatypeDeclAxioms(CoDatatypeDecl codecl) {
+      Func<Bpl.Expr, Bpl.Expr> MinusOne = k => {
+        if (k == null) {
+          return null;
+        } else if (k.Type.IsInt) {
+          return Bpl.Expr.Sub(k, Bpl.Expr.Literal(1));
+        } else {
+          return FunctionCall(k.tok, "ORD#Minus", k.Type, k,
+            FunctionCall(k.tok, "ORD#FromNat", k.Type, Bpl.Expr.Literal(1)));
+        }
+      };
+
+      Action<Bpl.Type, Action<Tuple<List<Type>, List<Type>>, List<Bpl.Variable>, List<Bpl.Expr>, List<Bpl.Expr>,
+        Bpl.Variable, Bpl.Expr, Bpl.Expr, Bpl.Expr, Bpl.Expr, Bpl.Expr, Bpl.Expr, Bpl.Expr, Bpl.Expr>> CoAxHelper =
+        (typeOfK, K) => {
+          List<TypeParameter> Renew(string s) => Map(codecl.TypeArgs, tp => new TypeParameter(tp.Origin, tp.NameNode.Append("#" + s), tp.PositionalIndex, tp.Parent));
+          List<TypeParameter> typaramsL = Renew("l"), typaramsR = Renew("r");
+          var lvars = MkTyParamBinders(typaramsL, out var lexprs);
+          var rvars = MkTyParamBinders(typaramsR, out var rexprs);
+          Func<List<TypeParameter>, List<Type>> Types = l => Map(l, tp => (Type)new UserDefinedType(tp));
+          var tyargs = Tuple.Create(Types(typaramsL), Types(typaramsR));
+
+          var vars = Concat(lvars, rvars);
+
+          Bpl.Expr k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit;
+          Bpl.Variable kVar;
+          if (typeOfK != null) {
+            kVar = BplBoundVar("k", typeOfK, out k);
+            vars.Add(kVar);
+            if (typeOfK.IsInt) {
+              kIsValid = Bpl.Expr.Le(Bpl.Expr.Literal(0), k);
+              kIsNonZero = Bpl.Expr.Neq(Bpl.Expr.Literal(0), k);
+              kHasSuccessor = Bpl.Expr.Lt(Bpl.Expr.Literal(0), k);
+              kIsLimit = Bpl.Expr.False;
+            } else {
+              kIsValid = Bpl.Expr.True;
+              kIsNonZero = Bpl.Expr.Neq(k, FunctionCall(k.tok, "ORD#FromNat", Bpl.Type.Int, Bpl.Expr.Literal(0)));
+              kHasSuccessor = Bpl.Expr.Lt(Bpl.Expr.Literal(0), FunctionCall(k.tok, "ORD#Offset", Bpl.Type.Int, k));
+              kIsLimit = FunctionCall(k.tok, "ORD#IsLimit", Bpl.Type.Bool, k);
+            }
+          } else {
+            kVar = null;
+            k = null;
+            kIsValid = Bpl.Expr.True;
+            kIsNonZero = Bpl.Expr.True;
+            kHasSuccessor = Bpl.Expr.True;
+            kIsLimit = Bpl.Expr.True;
+          }
+
+          var ly = BplBoundVar("ly", Predef.LayerType, vars);
+          var d0 = BplBoundVar("d0", Predef.DatatypeType, vars);
+          var d1 = BplBoundVar("d1", Predef.DatatypeType, vars);
+
+          K(tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1);
+        };
+
+      Action<Bpl.Type> AddAxioms = typeOfK => {
+        {
+          // Add two copies of the type parameter lists!
+          var args = MkTyParamFormals(Concat(GetTypeParams(codecl), GetTypeParams(codecl)), false, false);
+          if (typeOfK != null) {
+            args.Add(BplFormalVar(null, typeOfK, true));
+          }
+
+          args.Add(BplFormalVar(null, Predef.LayerType, true));
+          args.Add(BplFormalVar(null, Predef.DatatypeType, true));
+          args.Add(BplFormalVar(null, Predef.DatatypeType, true));
+          var r = BplFormalVar(null, Bpl.Type.Bool, false);
+          var fn_nm = typeOfK != null ? CoPrefixName(codecl) : CoEqualName(codecl);
+          var fn = new Bpl.Function(codecl.Origin, fn_nm, args, r);
+          if (InsertChecksums) {
+            InsertChecksum(codecl, fn);
+          }
+
+          sink.AddTopLevelDeclaration(fn);
+        }
+
+        // axiom (forall G0,...,Gn : Ty, k: int, ly : Layer, d0, d1: DatatypeType ::
+        //  { Eq(G0, .., Gn, S(ly), k, d0, d1) }
+        //  Is(d0, T(G0, .., Gn)) && Is(d1, T(G0, ... Gn)) ==>
+        //  (Eq(G0, .., Gn, S(ly), k, d0, d1)
+        //    <==>
+        //      (0 < k.Offset ==>
+        //        (d0.Nil? && d1.Nil?) ||
+        //        (d0.Cons? && d1.Cons? && d0.head == d1.head && Eq(G0, .., Gn, ly, k-1, d0.tail, d1.tail))) &&
+        //      (k != 0 && k.IsLimit ==>                        // for prefix equality only
+        //        FullEq(G0, .., Gn, ly, d0.tail, d1.tail)))    // for prefix equality only
+        CoAxHelper(typeOfK,
+          (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
+            var eqDt = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
+            var iss = BplAnd(MkIs(d0, ClassTyCon(codecl, lexprs)), MkIs(d1, ClassTyCon(codecl, rexprs)));
+            var body = BplImp(
+              iss,
+              BplIff(eqDt,
+                BplAnd(
+                  BplImp(kHasSuccessor,
+                    BplOr(CoPrefixEquality(codecl.Origin, codecl, tyargs.Item1, tyargs.Item2, MinusOne(k), ly, d0, d1))),
+                  k == null
+                    ? Bpl.Expr.True
+                    : BplImp(BplAnd(kIsNonZero, kIsLimit),
+                      CoEqualCall(codecl, tyargs.Item1, tyargs.Item2, null, ly, d0, d1)))));
+            var ax = BplForall(vars, BplTrigger(eqDt), body);
+            AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Bpl.Axiom(codecl.Origin, ax, "Layered co-equality axiom"));
+          });
+
+        // axiom (forall G0,...,Gn : Ty, k: int, ly : Layer, d0, d1: DatatypeType ::
+        //  { Eq(G0, .., Gn, S(ly), k, d0, d1) }
+        //    0 < k ==>
+        //      (Eq(G0, .., Gn, S(ly), k, d0, d1) <==>
+        //       Eq(G0, .., Gn, ly, k, d0, d))
+        CoAxHelper(typeOfK,
+          (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
+            var eqDtSL = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
+            var eqDtL = CoEqualCall(codecl, lexprs, rexprs, k, ly, d0, d1);
+            var body = BplImp(kIsNonZero, BplIff(eqDtSL, eqDtL));
+            var ax = BplForall(vars, BplTrigger(eqDtSL), body);
+            AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Bpl.Axiom(codecl.Origin, ax, "Unbump layer co-equality axiom"));
+          });
+      };
+
+      AddAxioms(null); // Add the above axioms for $Equal
+
+      // axiom (forall d0, d1: DatatypeType, k: int :: { $Equal(d0, d1) } :: Equal(d0, d1) <==> d0 == d1);
+      CoAxHelper(null, (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
+        var Eq = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
+        var equal = Bpl.Expr.Eq(d0, d1);
+        AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Axiom(codecl.Origin,
+          BplForall(vars, BplTrigger(Eq), BplIff(Eq, equal)),
+          "Equality for codatatypes"));
+      });
+
+      Bpl.Type theTypeOfK = Predef.BigOrdinalType;
+      AddAxioms(Predef.BigOrdinalType); // Add the above axioms for $PrefixEqual
+
+      // The connection between the full codatatype equality and its prefix version
+      // axiom (forall d0, d1: DatatypeType :: $Eq#Dt(d0, d1) <==>
+      //                                       (forall k: int :: 0 <= k ==> $PrefixEqual#Dt(k, d0, d1)));
+      CoAxHelper(theTypeOfK, (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
+        var Eq = CoEqualCall(codecl, lexprs, rexprs, null, LayerSucc(ly), d0, d1);
+        var PEq = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
+        vars.Remove(kVar);
+        AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Axiom(codecl.Origin,
+          BplForall(vars, BplTrigger(Eq), BplIff(Eq, BplForall(kVar, BplTrigger(PEq), BplImp(kIsValid, PEq)))),
+          "Coequality and prefix equality connection"));
+      });
+      // In addition, the following special case holds for $Eq#Dt:
+      // axiom (forall d0, d1: DatatypeType :: $Eq#Dt(d0, d1) <==
+      //                                       (forall k: int :: 0 <= k ==> $PrefixEqual#Dt(ORD#FromNat(k), d0, d1)));
+      if (!theTypeOfK.IsInt) {
+        CoAxHelper(Bpl.Type.Int,
+          (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
+            var Eq = CoEqualCall(codecl, lexprs, rexprs, null, LayerSucc(ly), d0, d1);
+            var PEq = CoEqualCall(codecl, lexprs, rexprs, FunctionCall(k.tok, "ORD#FromNat", Predef.BigOrdinalType, k),
+              LayerSucc(ly), d0, d1);
+            vars.Remove(kVar);
+            AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Axiom(codecl.Origin,
+              BplForall(vars, BplTrigger(Eq), BplImp(BplForall(kVar, BplTrigger(PEq), BplImp(kIsValid, PEq)), Eq)),
+              "Coequality and prefix equality connection"));
+          });
+      }
+
+      // A consequence of the definition of prefix equalities is the following:
+      // axiom (forall k, m: int, d0, d1: DatatypeType :: 0 <= k <= m && $PrefixEq#Dt(m, d0, d1) ==> $PrefixEq#0#Dt(k, d0, d1));
+      CoAxHelper(theTypeOfK,
+        (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
+          var m = BplBoundVar("m", k.Type, vars);
+          var PEqK = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
+          var PEqM = CoEqualCall(codecl, lexprs, rexprs, m, LayerSucc(ly), d0, d1);
+          Bpl.Expr kLtM;
+          if (k.Type.IsInt) {
+            kLtM = Bpl.Expr.Lt(k, m);
+          } else {
+            kLtM = FunctionCall(codecl.Origin, "ORD#Less", Bpl.Type.Bool, k, m);
+          }
+          AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Axiom(codecl.Origin,
+            BplForall(vars,
+              new Bpl.Trigger(codecl.Origin, true, new List<Bpl.Expr> { PEqK, PEqM }),
+              BplImp(BplAnd(BplAnd(kIsValid, kLtM), PEqM), PEqK)),
+            "Prefix equality consequence"));
+        });
+
+      // With the axioms above, going from d0==d1 to a prefix equality requires going via the full codatatype
+      // equality, which in turn requires the full codatatype equality to be present.  The following axiom
+      // provides a shortcut:
+      // axiom (forall d0, d1: DatatypeType, k: int :: d0 == d1 && 0 <= k ==> $PrefixEqual#_module.Stream(k, d0, d1));
+      CoAxHelper(theTypeOfK,
+        (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
+          var equal = Bpl.Expr.Eq(d0, d1);
+          var PEq = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
+          var trigger = BplTrigger(PEq);
+          AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Axiom(codecl.Origin,
+            BplForall(vars, trigger, BplImp(BplAnd(equal, kIsValid), PEq)), "Prefix equality shortcut"));
+        });
+    }
+
+    private void AddDepthOneCaseSplitFunction(DatatypeDecl dt) {
+      // Add:
+      //   function $IsA#Dt(G: Ty,d: DatatypeType): bool {
+      //     Dt.Ctor0?(G, d) || Dt.Ctor1?(G, d) || ...
+      //   }
+      var cases_dBv = new Bpl.Formal(dt.Origin, new Bpl.TypedIdent(dt.Origin, Bpl.TypedIdent.NoName, Predef.DatatypeType), true);
+      var cases_resType = new Bpl.Formal(dt.Origin, new Bpl.TypedIdent(dt.Origin, Bpl.TypedIdent.NoName, Bpl.Type.Bool), false);
+      var cases_fn = new Bpl.Function(dt.Origin, "$IsA#" + dt.FullSanitizedName,
+        new List<Variable> { cases_dBv },
+        cases_resType,
+        "Depth-one case-split function");
+
+      if (InsertChecksums) {
+        InsertChecksum(dt, cases_fn);
+      }
+
+      sink.AddTopLevelDeclaration(cases_fn);
+      // and here comes the actual axiom:
+      var dVar = BplBoundVar("d", Predef.DatatypeType, out var d);
+      var lhs = FunctionCall(dt.Origin, cases_fn.Name, Bpl.Type.Bool, d);
+      Bpl.Expr cases_body = Bpl.Expr.False;
+      foreach (DatatypeCtor ctor in dt.Ctors) {
+        var disj = FunctionCall(ctor.Origin, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, d);
+        cases_body = BplOr(cases_body, disj);
+      }
+
+      var ax = BplForall(new List<Variable> { dVar }, BplTrigger(lhs), BplImp(lhs, cases_body));
+      sink.AddTopLevelDeclaration(new Bpl.Axiom(dt.Origin, ax, "Depth-one case-split axiom"));
+    }
+
+    private Bpl.Function AddDataTypeConstructor(DatatypeDecl dt, DatatypeCtor ctor, bool includeIsAllocAxiom) {
+      // Add:  function #dt.ctor(tyVars, paramTypes) returns (DatatypeType);
+
+      List<Bpl.Variable> argTypes = new List<Bpl.Variable>();
+      foreach (Formal arg in ctor.Formals) {
+        Bpl.Variable a = new Bpl.Formal(arg.Origin, new Bpl.TypedIdent(arg.Origin, Bpl.TypedIdent.NoName, TrType(arg.Type)),
+          true);
+        argTypes.Add(a);
+      }
+
+      Bpl.Variable resType = new Bpl.Formal(ctor.Origin,
+        new Bpl.TypedIdent(ctor.Origin, Bpl.TypedIdent.NoName, Predef.DatatypeType), false);
+      Bpl.Function fn;
+      if (dt is TupleTypeDecl ttd && ttd.Dims == 2 && ttd.NonGhostDims == 2) {
+        fn = Predef.Tuple2Constructor;
+      } else {
+        fn = new Bpl.Function(ctor.Origin, ctor.FullName, argTypes, resType, "Constructor function declaration");
+        sink.AddTopLevelDeclaration(fn);
+      }
+
+      if (InsertChecksums) {
+        InsertChecksum(dt, fn);
+      }
+
+
+      {
+        // Add:  const unique ##dt.ctor: DtCtorId;
+        var definitionAxioms = new List<Axiom>();
+        Bpl.Constant constructorId = new Bpl.Constant(ctor.Origin,
+          new Bpl.TypedIdent(ctor.Origin, "#" + ctor.FullName, Predef.DtCtorId), true,
+          definitionAxioms: definitionAxioms);
+        Bpl.Expr constructorIdReference = new Bpl.IdentifierExpr(ctor.Origin, constructorId);
+        var constructorIdentifierAxiom = CreateConstructorIdentifierAxiom(ctor, constructorIdReference);
+        AddOtherDefinition(fn, constructorIdentifierAxiom);
+        definitionAxioms.Add(constructorIdentifierAxiom);
+        sink.AddTopLevelDeclaration(constructorId);
+
+        {
+          // Add:  function dt.ctor?(this: DatatypeType): bool { DatatypeCtorId(this) == ##dt.ctor }
+          var queryField = GetReadonlyField(ctor.QueryField);
+          sink.AddTopLevelDeclaration(queryField);
+
+          // and here comes the associated axiom:
+
+          var thVar = BplBoundVar("d", Predef.DatatypeType, out var th);
+          var queryPredicate = FunctionCall(ctor.Origin, queryField.Name, Bpl.Type.Bool, th);
+          var ctorId = FunctionCall(ctor.Origin, BuiltinFunction.DatatypeCtorId, null, th);
+          var rhs = Bpl.Expr.Eq(ctorId, constructorIdReference);
+          var body = BplIff(queryPredicate, rhs);
+          var tr = BplTrigger(queryPredicate);
+          var ax = BplForall(thVar, tr, body);
+          sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.Origin, ax, "Questionmark and identifier"));
+        }
+
+        // check well-formedness of any default-value expressions
+        AddWellformednessCheck(ctor);
+      }
+
+
+      {
+        // Add:  axiom (forall d: DatatypeType :: dt.ctor?(d) ==> (exists params :: d == #dt.ctor(params));
+        CreateBoundVariables(ctor.Formals, out var bvs, out var args);
+        Bpl.Expr rhs = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+        var dBv = BplBoundVar("d", Predef.DatatypeType, out var dId);
+        Bpl.Expr q = Bpl.Expr.Eq(dId, rhs);
+        if (bvs.Count != 0) {
+          q = new Bpl.ExistsExpr(ctor.Origin, bvs, null /*always in a Skolemization context*/, q);
+        }
+
+        Bpl.Expr dtq = FunctionCall(ctor.Origin, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, dId);
+        var trigger = BplTrigger(dtq);
+        q = BplForall(dBv, trigger, BplImp(dtq, q));
+        sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.Origin, q, "Constructor questionmark has arguments"));
+      }
+
+      AddConstructorAxioms(dt, ctor, fn, includeIsAllocAxiom);
+
+      if (dt is IndDatatypeDecl) {
+        // Add Lit axiom:
+        // axiom (forall p0, ..., pn :: #dt.ctor(Lit(p0), ..., Lit(pn)) == Lit(#dt.ctor(p0, .., pn)));
+        CreateBoundVariables(ctor.Formals, out var bvs, out var args);
+        var litargs = new List<Bpl.Expr>();
+        foreach (Bpl.Expr arg in args) {
+          litargs.Add(Lit(arg));
+        }
+
+        Bpl.Expr lhs = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, litargs);
+        Bpl.Expr rhs = Lit(FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args), Predef.DatatypeType);
+        Bpl.Expr q = BplForall(bvs, BplTrigger(lhs), Bpl.Expr.Eq(lhs, rhs));
+        var constructorLiteralAxiom = new Bpl.Axiom(ctor.Origin, q, "Constructor literal");
+        AddOtherDefinition(fn, constructorLiteralAxiom);
+      }
+
+      // Injectivity axioms for normal arguments
+      for (int i = 0; i < ctor.Formals.Count; i++) {
+        var arg = ctor.Formals[i];
+        // function ##dt.ctor#i(DatatypeType) returns (Ti);
+        var sf = ctor.Destructors[i];
+        Contract.Assert(sf != null);
+        fn = GetReadonlyField(sf);
+        if (fn == Predef.Tuple2Destructors0 || fn == Predef.Tuple2Destructors1) {
+          // the two destructors for 2-tuples are predefined in Prelude for use
+          // by the Map#Items axiom
+        } else if (sf.EnclosingCtors[0] != ctor) {
+          // this special field, which comes from a shared destructor, is being declared in a different iteration of this loop
+        } else {
+          sink.AddTopLevelDeclaration(fn);
+        }
+
+        // axiom (forall params :: ##dt.ctor#i(#dt.ctor(params)) == params_i);
+        CreateBoundVariables(ctor.Formals, out var bvs, out var args);
+        var inner = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+        var outer = FunctionCall(ctor.Origin, fn.Name, TrType(arg.Type), inner);
+        var q = BplForall(bvs, BplTrigger(inner), Bpl.Expr.Eq(outer, args[i]));
+        AddOtherDefinition(fn, (new Bpl.Axiom(ctor.Origin, q, "Constructor injectivity")));
+
+        if (dt is IndDatatypeDecl) {
+          var argType = arg.Type.NormalizeExpand();
+          if (argType.IsDatatype || argType.IsTypeParameter) {
+            // for datatype:             axiom (forall params :: {#dt.ctor(params)} DtRank(params_i) < DtRank(#dt.ctor(params)));
+            // for type-parameter type:  axiom (forall params :: {#dt.ctor(params)} BoxRank(params_i) < DtRank(#dt.ctor(params)));
+            CreateBoundVariables(ctor.Formals, out bvs, out args);
+            Bpl.Expr lhs = FunctionCall(ctor.Origin, arg.Type.IsDatatype ? BuiltinFunction.DtRank : BuiltinFunction.BoxRank,
+              null, args[i]);
+            /* CHECK
+              Bpl.Expr lhs = FunctionCall(ctor.Tok, BuiltinFunction.DtRank, null,
+                argType.IsDatatype ? args[i] : FunctionCall(ctor.Tok, BuiltinFunction.Unbox, predef.DatatypeType, args[i]));
+              */
+            Bpl.Expr ct = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+            var rhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, ct);
+            var trigger = BplTrigger(ct);
+            q = new Bpl.ForallExpr(ctor.Origin, bvs, trigger, Bpl.Expr.Lt(lhs, rhs));
+            AddOtherDefinition(fn, new Bpl.Axiom(ctor.Origin, q, "Inductive rank"));
+          } else if (argType is SeqType) {
+            // axiom (forall params, i: int {#dt.ctor(params)} :: 0 <= i && i < |arg| ==> DtRank(arg[i]) < DtRank(#dt.ctor(params)));
+            // that is:
+            // axiom (forall params, i: int {#dt.ctor(params)} :: 0 <= i && i < |arg| ==> DtRank(Unbox(Seq#Index(arg,i))) < DtRank(#dt.ctor(params)));
+            {
+              CreateBoundVariables(ctor.Formals, out bvs, out args);
+              Bpl.Variable iVar = new Bpl.BoundVariable(arg.Origin, new Bpl.TypedIdent(arg.Origin, "i", Bpl.Type.Int));
+              bvs.Add(iVar);
+              Bpl.IdentifierExpr ie = new Bpl.IdentifierExpr(arg.Origin, iVar);
+              Bpl.Expr ante = BplAnd(
+                Bpl.Expr.Le(Bpl.Expr.Literal(0), ie),
+                Bpl.Expr.Lt(ie, FunctionCall(arg.Origin, BuiltinFunction.SeqLength, null, args[i])));
+              var seqIndex = FunctionCall(arg.Origin, BuiltinFunction.SeqIndex, Predef.DatatypeType, args[i], ie);
+              Bpl.Expr lhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null,
+                FunctionCall(arg.Origin, BuiltinFunction.Unbox, Predef.DatatypeType, seqIndex));
+              var ct = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+              var rhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, ct);
+              q = new Bpl.ForallExpr(ctor.Origin, bvs, new Trigger(lhs.tok, true, new List<Bpl.Expr> { seqIndex, ct }),
+                BplImp(ante, Bpl.Expr.Lt(lhs, rhs)));
+              sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.Origin, q, "Inductive seq element rank"));
+            }
+
+            // axiom (forall params {#dt.ctor(params)} :: SeqRank(arg) < DtRank(#dt.ctor(params)));
+            {
+              CreateBoundVariables(ctor.Formals, out bvs, out args);
+              var lhs = FunctionCall(ctor.Origin, BuiltinFunction.SeqRank, null, args[i]);
+              var ct = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+              var rhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, ct);
+              var trigger = BplTrigger(ct);
+              q = new Bpl.ForallExpr(ctor.Origin, bvs, trigger, Bpl.Expr.Lt(lhs, rhs));
+              AddOtherDefinition(fn, new Bpl.Axiom(ctor.Origin, q, "Inductive seq rank"));
+            }
+          } else if (argType is SetType) {
+            // axiom (forall params, d: Datatype {arg[d], #dt.ctor(params)}  :: arg[d] ==> DtRank(d) < DtRank(#dt.ctor(params)));
+            // that is:
+            // axiom (forall params, d: Datatype {arg[Box(d)], #dt.ctor(params)} :: arg[Box(d)] ==> DtRank(d) < DtRank(#dt.ctor(params)));
+            CreateBoundVariables(ctor.Formals, out bvs, out args);
+            Bpl.Variable dVar = new Bpl.BoundVariable(arg.Origin, new Bpl.TypedIdent(arg.Origin, "d", Predef.DatatypeType));
+            bvs.Add(dVar);
+            Bpl.IdentifierExpr ie = new Bpl.IdentifierExpr(arg.Origin, dVar);
+            var inSet = IsSetMember(arg.Origin, args[i], FunctionCall(arg.Origin, BuiltinFunction.Box, null, ie), argType.NormalizeToAncestorType().AsSetType.Finite);
+            Bpl.Expr lhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, ie);
+            var ct = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+            var rhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, ct);
+            var trigger = new Bpl.Trigger(ctor.Origin, true, new List<Bpl.Expr> { inSet, ct });
+            q = new Bpl.ForallExpr(ctor.Origin, bvs, trigger, BplImp(inSet, Bpl.Expr.Lt(lhs, rhs)));
+            sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.Origin, q, "Inductive set element rank"));
+          } else if (argType is MultiSetType) {
+            // axiom (forall params, d: Datatype {arg[d], #dt.ctor(params)} :: 0 < arg[d] ==> DtRank(d) < DtRank(#dt.ctor(params)));
+            // that is:
+            // axiom (forall params, d: Datatype {arg[Box(d)], #dt.ctor(params)} :: 0 < arg[Box(d)] ==> DtRank(d) < DtRank(#dt.ctor(params)));
+            CreateBoundVariables(ctor.Formals, out bvs, out args);
+            Bpl.Variable dVar = new Bpl.BoundVariable(arg.Origin, new Bpl.TypedIdent(arg.Origin, "d", Predef.DatatypeType));
+            bvs.Add(dVar);
+            Bpl.IdentifierExpr ie = new Bpl.IdentifierExpr(arg.Origin, dVar);
+            var multiplicity = MultisetMultiplicity(arg.Origin, args[i], FunctionCall(arg.Origin, BuiltinFunction.Box, null, ie));
+            Bpl.Expr ante = Bpl.Expr.Gt(multiplicity, Bpl.Expr.Literal(0));
+            Bpl.Expr lhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, ie);
+            var ct = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+            var rhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, ct);
+            var trigger = new Bpl.Trigger(ctor.Origin, true, new List<Bpl.Expr> { multiplicity, ct });
+            q = new Bpl.ForallExpr(ctor.Origin, bvs, trigger, BplImp(ante, Bpl.Expr.Lt(lhs, rhs)));
+            sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.Origin, q, "Inductive multiset element rank"));
+          } else if (argType is MapType) {
+            var finite = ((MapType)argType).Finite;
+            {
+              // axiom (forall params, d: DatatypeType
+              //   { Map#Domain(arg)[$Box(d)], #dt.ctor(params) }
+              //   Map#Domain(arg)[$Box(d)] ==> DtRank(d) < DtRank(#dt.ctor(params)));
+              CreateBoundVariables(ctor.Formals, out bvs, out args);
+              var dVar = new Bpl.BoundVariable(arg.Origin, new Bpl.TypedIdent(arg.Origin, "d", Predef.DatatypeType));
+              bvs.Add(dVar);
+              var ie = new Bpl.IdentifierExpr(arg.Origin, dVar);
+              var f = finite ? BuiltinFunction.MapDomain : BuiltinFunction.IMapDomain;
+              var domain = FunctionCall(arg.Origin, f, finite ? Predef.MapType : Predef.IMapType,
+                args[i]);
+              var inDomain = IsSetMember(arg.Origin, domain, FunctionCall(arg.Origin, BuiltinFunction.Box, null, ie), finite);
+              var lhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, ie);
+              var ct = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+              var rhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, ct);
+              var trigger = new Bpl.Trigger(ctor.Origin, true, new List<Bpl.Expr> { inDomain, ct });
+              q = new Bpl.ForallExpr(ctor.Origin, bvs, trigger, BplImp(inDomain, Bpl.Expr.Lt(lhs, rhs)));
+              sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.Origin, q, "Inductive map key rank"));
+            }
+            {
+              // axiom(forall params, bx: Box ::
+              //   { Map#Elements(arg)[bx], #dt.ctor(params) }
+              //   Map#Domain(arg)[bx] ==> DtRank($Unbox(Map#Elements(arg)[bx]): DatatypeType) < DtRank(#dt.ctor(params)));
+              CreateBoundVariables(ctor.Formals, out bvs, out args);
+              var bxVar = new Bpl.BoundVariable(arg.Origin, new Bpl.TypedIdent(arg.Origin, "bx", Predef.BoxType));
+              bvs.Add(bxVar);
+              var ie = new Bpl.IdentifierExpr(arg.Origin, bxVar);
+              var f = finite ? BuiltinFunction.MapDomain : BuiltinFunction.IMapDomain;
+              var domain = FunctionCall(arg.Origin, f, finite ? Predef.MapType : Predef.IMapType,
+                args[i]);
+              var inDomain = IsSetMember(arg.Origin, domain, ie, finite);
+              var ef = finite ? BuiltinFunction.MapElements : BuiltinFunction.IMapElements;
+              var element = FunctionCall(arg.Origin, ef, finite ? Predef.MapType : Predef.IMapType,
+                args[i]);
+              var elmt = Bpl.Expr.SelectTok(arg.Origin, element, ie);
+              var unboxElmt = FunctionCall(arg.Origin, BuiltinFunction.Unbox, Predef.DatatypeType, elmt);
+              var lhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, unboxElmt);
+              var ct = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+              var rhs = FunctionCall(ctor.Origin, BuiltinFunction.DtRank, null, ct);
+              var trigger = new Bpl.Trigger(ctor.Origin, true, new List<Bpl.Expr> { inDomain, ct });
+              q = new Bpl.ForallExpr(ctor.Origin, bvs, trigger, BplImp(inDomain, Bpl.Expr.Lt(lhs, rhs)));
+              sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.Origin, q, "Inductive map value rank"));
+            }
+          }
+        }
+      }
+
+      return fn;
+    }
+
+    private void AddConstructorAxioms(DatatypeDecl dt, DatatypeCtor ctor, Bpl.Function ctorFunction, bool includeIsAllocAxiom) {
+      var tyvars = MkTyParamBinders(dt.TypeArgs, out var tyexprs);
+      CreateBoundVariables(ctor.Formals, out var bvs, out var args);
+      bvs.InsertRange(0, tyvars);
+      var c_params = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+      var c_ty = ClassTyCon(dt, tyexprs);
+      AddsIsConstructorAxiom(ctor, ctorFunction, args, bvs, c_params, c_ty);
+      if (includeIsAllocAxiom) {
+        AddIsAllocConstructorAxiom(dt, ctor, ctorFunction, args, bvs, c_params, c_ty);
+      }
+      AddDestructorAxiom(dt, ctor, ctorFunction, tyvars, c_ty);
+    }
+
+    /*
+          (forall x0 : C0, ..., xn : Cn, G : Ty, H : Heap •
+              { $IsAlloc(C(G, x0,...,xn), T(G), H) }
+              IsGoodHeap(H) ==>
+                 ($IsAlloc(C(G, x0,...,xn), T(G), H) <==>
+                  $IsAlloc[Box](x0, C0(G), H) && ... && $IsAlloc[Box](xn, Cn(G), H)));
+        */
+    private void AddIsAllocConstructorAxiom(DatatypeDecl dt, DatatypeCtor ctor, Bpl.Function ctorFunction,
+      List<Expr> args, List<Variable> bvs, NAryExpr c_params, Expr c_ty) {
+      var hVar = BplBoundVar("$h", Predef.HeapType, out var h);
+
+      Bpl.Expr conj = Bpl.Expr.True;
+      for (var i = 0; i < ctor.Formals.Count; i++) {
+        var arg = ctor.Formals[i];
+        conj = BplAnd(conj, MkIsAlloc(args[i], arg.Type, h));
+      }
+
+      {
+        var isGoodHeap = FunctionCall(ctor.Origin, BuiltinFunction.IsGoodHeap, null, h);
+        var c_alloc = MkIsAlloc(c_params, c_ty, h);
+        bvs.Add(hVar);
+        var constructorIsAllocAxiom = new Bpl.Axiom(ctor.Origin,
+          BplForall(bvs, BplTrigger(c_alloc),
+            BplImp(isGoodHeap, BplIff(c_alloc, conj))),
+          "Constructor $IsAlloc");
+        AddOtherDefinition(ctorFunction, constructorIsAllocAxiom);
+      }
+    }
+
+    /// <summary>
+    /// If no value of the datatype depends on allocation, then this axiom states the property
+    /// for all datatype values. It can be used in place of one axiom per constructor.
+    ///
+    /// (forall d: DatatypeValue, T0,T1,...: Ty, H: Heap •
+    ///   { $IsAlloc(d, T(T0,T1,...), H) }
+    ///   IsGoodHeap(H) && $Is(d, T(T0,T1,...)) ==>
+    ///     $IsAlloc(d, T(T0,T1,...), H))
+    /// </summary>
+    private void AddCommonIsAllocConstructorAxiom(DatatypeDecl dt) {
+
+      MkIsPredicateForDatatype(dt, out var boundVariables, out var d, out var tyExpr, out var isPredicate);
+
+      var hVar = BplBoundVar("$h", Predef.HeapType, out var h);
+      var isGoodHeap = FunctionCall(dt.Origin, BuiltinFunction.IsGoodHeap, null, h);
+
+      var isAlloc = MkIsAlloc(d, tyExpr, h);
+
+      var body = BplImp(BplAnd(isGoodHeap, isPredicate), isAlloc);
+
+      {
+        var tr = BplTrigger(isAlloc);
+        var ax = new Bpl.Axiom(dt.Origin, BplForall(Snoc(boundVariables, hVar), tr, body), "Datatype $IsAlloc");
+        sink.AddTopLevelDeclaration(ax);
+      }
+    }
+
+    /// <summary>
+    /// Return list of variables
+    ///     d: DatatypeValue, T0,T1,...: Ty  // in out-parameter "boundVariables"
+    /// expression
+    ///     d                                // in out-parameter "varExpression"
+    /// expression
+    ///     T(T0,T1,...)                     // in out-parameter "typeExpression"
+    /// and predicate
+    ///     $Is(d, T(T0,T1,...))             // in out-parameter "isPredicate"
+    /// </summary>
+    private void MkIsPredicateForDatatype(DatatypeDecl datatypeDecl, out List<Bpl.Variable> boundVariables,
+      out Bpl.Expr varExpression, out Bpl.Expr typeExpression, out Bpl.Expr isPredicate) {
+      var typeVariables = MkTyParamBinders(datatypeDecl.TypeArgs, out var typeExpressions);
+      var dVar = BplBoundVar("d", Predef.DatatypeType, out varExpression);
+      boundVariables = Snoc(typeVariables, dVar);
+      typeExpression = ClassTyCon(datatypeDecl, typeExpressions);
+      isPredicate = MkIs(varExpression, typeExpression);
+    }
+
+    /* (forall d : DatatypeType, G : Ty, H : Heap •
+               { $IsAlloc[Box](Dtor(d), D(G), H) }
+               IsGoodHeap(H) &&
+               C?(d) &&
+               (exists G' : Ty :: $IsAlloc(d, T(G,G'), H))
+               ==>
+                   $IsAlloc[Box](Dtor(d), D(G), H))
+         */
+    private void AddDestructorAxiom(DatatypeDecl dt, DatatypeCtor ctor, Bpl.Function ctorFunction, List<Variable> tyvars, Expr c_ty) {
+
+      var hVar = BplBoundVar("$h", Predef.HeapType, out var h);
+      for (int i = 0; i < ctor.Formals.Count; i++) {
+        var arg = ctor.Formals[i];
+        var dtor = GetReadonlyField(ctor.Destructors[i]);
+        var dBv = BplBoundVar("d", Predef.DatatypeType, out var dId);
+        var isGoodHeap = FunctionCall(ctor.Origin, BuiltinFunction.IsGoodHeap, null, h);
+        Bpl.Expr dtq = FunctionCall(ctor.Origin, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, dId);
+        var c_alloc = MkIsAlloc(dId, c_ty, h);
+        var dtorD = FunctionCall(ctor.Origin, dtor.Name, TrType(arg.Type), dId);
+        var d_alloc = MkIsAlloc(dtorD, arg.Type, h);
+
+        // split tyvars into G,G' where G are the type variables that are used in the type of the destructor
+        var freeTypeVars = new HashSet<TypeParameter>();
+        ComputeFreeTypeVariables_All(arg.Type, freeTypeVars);
+        var tyvarsG = new List<Bpl.Variable>();
+        var tyvarsGprime = new List<Bpl.Variable>();
+        Contract.Assert(dt.TypeArgs.Count == tyvars.Count);
+        for (int j = 0; j < dt.TypeArgs.Count; j++) {
+          var tv = tyvars[j];
+          if (freeTypeVars.Contains(dt.TypeArgs[j])) {
+            tyvarsG.Add(tv);
+          } else {
+            tyvarsGprime.Add(tv);
+          }
+        }
+
+        var bvs = new List<Bpl.Variable>();
+        bvs.Add(dBv);
+        bvs.AddRange(tyvarsG);
+        bvs.Add(hVar);
+        if (tyvarsGprime.Count != 0) {
+          c_alloc = new Bpl.ExistsExpr(ctor.Origin, tyvarsGprime, BplTrigger(c_alloc), c_alloc);
+        }
+
+        var destructorAxiom = new Bpl.Axiom(ctor.Origin,
+          BplForall(bvs, BplTrigger(d_alloc),
+            BplImp(BplAnd(isGoodHeap, BplAnd(dtq, c_alloc)), d_alloc)),
+          "Destructor $IsAlloc");
+        AddOtherDefinition(ctorFunction, destructorAxiom);
+      }
+    }
+
+    /*
+        (forall x0 : C0, ..., xn : Cn, G : Ty •
+          { $Is(C(x0,...,xn), T(G)) }
+          $Is(C(x0,...,xn), T(G)) <==>
+          $Is[Box](x0, C0(G)) && ... && $Is[Box](xn, Cn(G)));
+      */
+    private void AddsIsConstructorAxiom(DatatypeCtor ctor, Bpl.Function ctorFunction, List<Expr> args, List<Variable> bvs, NAryExpr c_params, Expr c_ty) {
+      Bpl.Expr conj = Bpl.Expr.True;
+      for (var i = 0; i < ctor.Formals.Count; i++) {
+        var arg = ctor.Formals[i];
+        conj = BplAnd(conj, MkIs(args[i], arg.Type));
+      }
+
+      var isCall = MkIs(c_params, c_ty);
+      var constructorIsAxiom = new Bpl.Axiom(ctor.Origin,
+        BplForall(bvs, BplTrigger(isCall), BplIff(isCall, conj)),
+        "Constructor $Is");
+      AddOtherDefinition(ctorFunction, constructorIsAxiom);
+    }
+
+    private Axiom CreateConstructorIdentifierAxiom(DatatypeCtor ctor, Expr c) {
+      // Add:  axiom (forall params :: DatatypeCtorId(#dt.ctor(params)) == ##dt.ctor);
+      CreateBoundVariables(ctor.Formals, out var bvs, out var args);
+      var constructorCall = FunctionCall(ctor.Origin, ctor.FullName, Predef.DatatypeType, args);
+      var lhs = FunctionCall(ctor.Origin, BuiltinFunction.DatatypeCtorId, null, constructorCall);
+      Bpl.Expr q = Bpl.Expr.Eq(lhs, c);
+      var trigger = BplTrigger(constructorCall);
+      var axiom = new Bpl.Axiom(ctor.Origin, BplForall(bvs, trigger, q), "Constructor identifier");
+      return axiom;
+    }
+
+    void AddWellformednessCheck(DatatypeCtor ctor) {
+      Contract.Requires(ctor != null);
+      Contract.Requires(sink != null && Predef != null);
+      Contract.Requires(currentModule == null && codeContext == null && IsAllocContext == null && fuelContext == null);
+      Contract.Ensures(currentModule == null && codeContext == null && IsAllocContext == null && fuelContext == null);
+
+      proofDependencies.SetCurrentDefinition(MethodVerboseName(ctor.FullName, MethodTranslationKind.SpecWellformedness), ctor.EnclosingDatatype);
+
+      if (!InVerificationScope(ctor)) {
+        // Checked in other file
+        return;
+      }
+
+      // If there are no parameters with default values, there's nothing to do
+      if (ctor.Formals.TrueForAll(f => f.DefaultValue == null)) {
+        return;
+      }
+
+      currentModule = ctor.EnclosingDatatype.EnclosingModuleDefinition;
+      codeContext = ctor.EnclosingDatatype;
+      fuelContext = FuelSetting.NewFuelContext(ctor.EnclosingDatatype);
+      var etran = new ExpressionTranslator(this, Predef, ctor.Origin, null);
+
+      // parameters of the procedure
+      List<Variable> inParams = MkTyParamFormals(GetTypeParams(ctor.EnclosingDatatype), true);
+      foreach (var p in ctor.Formals) {
+        Bpl.Type varType = TrType(p.Type);
+        Bpl.Expr wh = GetWhereClause(p.Origin, new Bpl.IdentifierExpr(p.Origin, p.AssignUniqueName(ctor.IdGenerator), varType), p.Type, etran, NOALLOC);
+        inParams.Add(new Bpl.Formal(p.Origin, new Bpl.TypedIdent(p.Origin, p.AssignUniqueName(ctor.IdGenerator), varType, wh), true));
+      }
+
+      // the procedure itself
+      var req = new List<Bpl.Requires>();
+      var heapVar = new Bpl.IdentifierExpr(ctor.Origin, "$Heap", false);
+      var varlist = new List<Bpl.IdentifierExpr> { heapVar };
+      var proc = new Bpl.Procedure(ctor.Origin, "CheckWellformed" + NameSeparator + ctor.FullName, new List<Bpl.TypeVariable>(),
+        inParams, new List<Variable>(),
+        false, req, varlist, new List<Bpl.Ensures>(), etran.TrAttributes(ctor.Attributes, null));
+      AddVerboseNameAttribute(proc, ctor.FullName, MethodTranslationKind.SpecWellformedness);
+      sink.AddTopLevelDeclaration(proc);
+
+      var implInParams = Bpl.Formal.StripWhereClauses(inParams);
+      var locals = new Variables();
+      var builder = new BoogieStmtListBuilder(this, options, new BodyTranslationContext(false));
+      builder.Add(new CommentCmd($"AddWellformednessCheck for datatype constructor {ctor}"));
+      builder.AddCaptureState(ctor.Origin, false, "initial state");
+      IsAllocContext = new IsAllocContext(options, true);
+
+      DefineFrame(ctor.Origin, etran.ReadsFrame(ctor.Origin), new List<FrameExpression>(), builder, locals, null);
+
+      // check well-formedness of each default-value expression
+      foreach (var formal in ctor.Formals.Where(formal => formal.DefaultValue != null)) {
+        var e = formal.DefaultValue;
+        CheckWellformedWithResult(e, new WFOptions(null, true,
+            false, true), locals, builder, etran, (returnBuilder, result) => {
+              builder.Add(new Bpl.AssumeCmd(e.Origin, etran.CanCallAssumption(e)));
+              CheckSubrange(result.Origin, etran.TrExpr(result), e.Type, formal.Type, e, returnBuilder);
+            });
+      }
+
+      if (EmitImplementation(ctor.Attributes)) {
+        // emit the impl only when there are proof obligations.
+        QKeyValue kv = etran.TrAttributes(ctor.Attributes, null);
+        var implBody = builder.Collect(ctor.Origin);
+        AddImplementationWithAttributes(GetToken(ctor), proc, implInParams,
+          new List<Variable>(), locals, implBody, kv);
+      }
+
+      Contract.Assert(currentModule == ctor.EnclosingDatatype.EnclosingModuleDefinition);
+      Contract.Assert(codeContext == ctor.EnclosingDatatype);
+      IsAllocContext = null;
+      fuelContext = null;
+      Reset();
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/FreshIdGenerator.cs b/Source/DafnyCore/Verifier/FreshIdGenerator.cs
index 4196ea040c1..d6f71d52623 100644
--- a/Source/DafnyCore/Verifier/FreshIdGenerator.cs
+++ b/Source/DafnyCore/Verifier/FreshIdGenerator.cs
@@ -1,9 +1,10 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
 
 namespace Microsoft.Dafny {
-  public class FreshIdGenerator {
+  public abstract class FreshIdGenerator {
     string tipString;  // a string representation of Tip
     int tipChildrenCount = 0;
     readonly Stack<Dictionary<string, int>> prefixToCountStack = new();  // invariant PrefixToCount_Stack.Count == Tip.Count
@@ -35,7 +36,7 @@ public FreshIdGenerator() {
       prefixToCountStack.Push(new());
     }
 
-    private FreshIdGenerator(string commonPrefix) : this() {
+    protected FreshIdGenerator(string commonPrefix) : this() {
       this.commonPrefix = commonPrefix;
     }
 
@@ -50,11 +51,7 @@ public string FreshId(string prefix) {
       return commonPrefix + prefix + FreshNumericId(prefix);
     }
 
-    public FreshIdGenerator NestedFreshIdGenerator(string prefix) {
-      return new(FreshId(prefix));
-    }
-
-    public string FreshNumericId(string prefix = "") {
+    public virtual string FreshNumericId(string prefix = "") {
       var prefixToCount = prefixToCountStack.Peek();
       lock (prefixToCount) {
         if (!prefixToCount.TryGetValue(prefix, out var old)) {
@@ -64,5 +61,22 @@ public string FreshNumericId(string prefix = "") {
         return tipString == null ? old.ToString() : tipString + "_" + old.ToString();
       }
     }
+
+    public override string ToString() {
+      throw new InvalidOperationException("Did not expect to convert the fresh Id generator itself to a string");
+    }
+  }
+
+  public class CodeGenIdGenerator : FreshIdGenerator {
+  }
+
+  public class VerificationIdGenerator : FreshIdGenerator {
+    public VerificationIdGenerator() {
+    }
+    public VerificationIdGenerator(string commonPrefix) : base(commonPrefix) {
+    }
+    public VerificationIdGenerator NestedFreshIdGenerator(string prefix) {
+      return new(FreshId(prefix));
+    }
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/FunctionCallSubstituter.cs b/Source/DafnyCore/Verifier/FunctionCallSubstituter.cs
index 2a214b25c49..e5629a48be5 100644
--- a/Source/DafnyCore/Verifier/FunctionCallSubstituter.cs
+++ b/Source/DafnyCore/Verifier/FunctionCallSubstituter.cs
@@ -4,16 +4,16 @@
 namespace Microsoft.Dafny {
   public class FunctionCallSubstituter : Substituter {
     public readonly TraitDecl Tr;
-    public readonly ClassLikeDecl Cl;
+    public readonly TopLevelDeclWithMembers Impl;
 
     // We replace all occurrences of the trait version of the function with the class version. This is only allowed if
     // the receiver is `this`. We underapproximate this by looking for a `ThisExpr`, which misses more complex
     // expressions that evaluate to one.
     public FunctionCallSubstituter(Dictionary<IVariable, Expression /*!*/> /*!*/ substMap, Dictionary<TypeParameter, Type> typeMap,
-      TraitDecl parentTrait, ClassLikeDecl cl)
-      : base(new ThisExpr(cl.tok) { Type = UserDefinedType.FromTopLevelDecl(cl.tok, cl) }, substMap, typeMap) {
-      this.Tr = parentTrait;
-      this.Cl = cl;
+      TraitDecl parentTrait, TopLevelDeclWithMembers impl)
+      : base(new ThisExpr(impl.Origin) { Type = UserDefinedType.FromTopLevelDecl(impl.Origin, impl) }, substMap, typeMap) {
+      Tr = parentTrait;
+      Impl = impl;
     }
 
     public override Expression Substitute(Expression expr) {
@@ -24,16 +24,16 @@ public override Expression Substitute(Expression expr) {
         Function function;
         if ((e.Function.EnclosingClass == Tr || Tr.InheritedMembers.Contains(e.Function)) &&
             e.Receiver.Resolved is ThisExpr && receiver.Resolved is ThisExpr &&
-            Cl.Members.Find(m => m.OverriddenMember == e.Function) is { } f) {
+            Impl.Members.Find(m => m.OverriddenMember == e.Function) is { } f) {
           receiver = new ThisExpr((TopLevelDeclWithMembers)f.EnclosingClass);
           function = (Function)f;
-          typeApplicationAtEnclosingClass = receiver.Type.AsParentType(Cl).TypeArgs.ToList();
+          typeApplicationAtEnclosingClass = receiver.Type.AsParentType(Impl).TypeArgs.ToList();
         } else {
           function = e.Function;
         }
-        return new FunctionCallExpr(e.tok, e.Name, receiver, e.OpenParen, e.CloseParen, newArgs, e.AtLabel) {
+        return new FunctionCallExpr(e.Origin, e.NameNode, receiver, e.OpenParen, e.CloseParen, newArgs, e.AtLabel) {
           Function = function,
-          Type = e.Type, // TODO: this may not work with type parameters.
+          Type = e.Type.Subst(typeMap),
           TypeApplication_AtEnclosingClass = SubstituteTypeList(typeApplicationAtEnclosingClass), // resolve here
           TypeApplication_JustFunction = SubstituteTypeList(e.TypeApplication_JustFunction), // resolve here
           IsByMethodCall = e.IsByMethodCall
diff --git a/Source/DafnyCore/Verifier/IsAllocContext.cs b/Source/DafnyCore/Verifier/IsAllocContext.cs
new file mode 100644
index 00000000000..5d9a92cfa64
--- /dev/null
+++ b/Source/DafnyCore/Verifier/IsAllocContext.cs
@@ -0,0 +1,31 @@
+using Microsoft.Dafny;
+
+public class IsAllocContext {
+  private DafnyOptions options;
+  internal bool allVarsGhost;
+
+  internal IsAllocContext(DafnyOptions options, bool allVarsGhost) {
+    this.options = options;
+    this.allVarsGhost = allVarsGhost;
+  }
+
+  internal IsAllocType Var(bool isGhost) {
+    return BoogieGenerator.ISALLOC;
+  }
+
+  internal IsAllocType Var(LocalVariable local) {
+    return Var(allVarsGhost || local.IsGhost);
+  }
+
+  internal IsAllocType Var(NonglobalVariable var) {
+    return Var(allVarsGhost || var.IsGhost);
+  }
+
+  internal IsAllocType Var(bool ghostStmt, LocalVariable var) {
+    return Var(allVarsGhost || ghostStmt || var.IsGhost);
+  }
+
+  internal IsAllocType Var(bool ghostStmt, NonglobalVariable var) {
+    return Var(allVarsGhost || ghostStmt || var.IsGhost);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/ProofDependency.cs b/Source/DafnyCore/Verifier/ProofDependency.cs
new file mode 100644
index 00000000000..dcbda2aedf7
--- /dev/null
+++ b/Source/DafnyCore/Verifier/ProofDependency.cs
@@ -0,0 +1,231 @@
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using Microsoft.Dafny;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace DafnyCore.Verifier;
+
+// A proof dependency represents a particular part of a Dafny program
+// that may be used in the process of proving its correctness. When
+// Boogie proves a particular verification condition, it returns a
+// list of strings, returned by the SMT solver, indicating which
+// program elements were used in completing the proof. After this, the
+// ProofDependencyManager can map each string to a more structured
+// ProofDependency.
+public abstract class ProofDependency {
+  public abstract string Description { get; }
+
+  public abstract IOrigin Range { get; }
+
+  public string LocationString() {
+    if (Range?.StartToken is null) {
+      return "<no location>";
+    }
+    var fn = Range.StartToken.filename;
+    var sl = Range.StartToken.line;
+    var sc = Range.StartToken.col;
+    return $"{fn}({sl},{sc})";
+  }
+
+  public string RangeString() {
+    if (Range?.StartToken is null) {
+      return "<no range>";
+    }
+    var fn = Range.StartToken.filename;
+    var sl = Range.StartToken.line;
+    var sc = Range.StartToken.col;
+    var el = Range.EndToken.line;
+    var ec = Range.EndToken.col;
+    return $"{fn}({sl},{sc})-({el},{ec})";
+  }
+
+  public string OriginalString() {
+    return Range?.PrintOriginal();
+  }
+}
+
+// Represents the portion of a Dafny program corresponding to a proof
+// obligation. This is particularly important to track because if a particular
+// assertion batch can be proved without proving one of the assertions that is
+// a proof obligation within it, that assertion must have been proved vacuously.
+public class ProofObligationDependency : ProofDependency {
+  public override IOrigin Range { get; }
+
+  public ProofObligationDescription ProofObligation { get; }
+
+  public override string Description =>
+      $"{ProofObligation.SuccessDescription}";
+
+  public ProofObligationDependency(Microsoft.Boogie.IToken tok, ProofObligationDescription proofObligation) {
+    Range = tok as SourceOrigin ?? (proofObligation as AssertStatementDescription)?.AssertStatement.Origin ?? BoogieGenerator.ToDafnyToken(true, tok);
+    ProofObligation = proofObligation;
+  }
+}
+
+public class AssumedProofObligationDependency : ProofDependency {
+  public override IOrigin Range { get; }
+
+  public ProofObligationDescription ProofObligation { get; }
+
+  public override string Description =>
+      $"assumption that {ProofObligation.SuccessDescription}";
+
+  public AssumedProofObligationDependency(IOrigin tok, ProofObligationDescription proofObligation) {
+    Range = tok;
+    ProofObligation = proofObligation;
+  }
+}
+
+// Represents the assumption of a requires clause in the process of
+// proving a Dafny definition.
+public class RequiresDependency : ProofDependency {
+  private Expression requires;
+
+  private IOrigin tok;
+
+  public override IOrigin Range =>
+    tok as SourceOrigin ?? requires.Origin;
+
+  public override string Description =>
+    $"requires clause";
+
+  public RequiresDependency(IOrigin token, Expression requires) {
+    this.requires = requires;
+    this.tok = token;
+  }
+}
+
+// Represents the goal of proving an ensures clause of a Dafny definition.
+public class EnsuresDependency : ProofDependency {
+  private readonly Expression ensures;
+
+  private readonly IOrigin tok;
+
+  public override IOrigin Range =>
+    tok as SourceOrigin ?? ensures.Origin;
+
+  public override string Description =>
+    "ensures clause";
+
+  public EnsuresDependency(IOrigin token, Expression ensures) {
+    this.ensures = ensures;
+    this.tok = token;
+  }
+}
+
+// Represents the goal of proving a specific requires clause of a specific
+// call.
+public class CallRequiresDependency : ProofDependency {
+  public readonly CallDependency call;
+  private readonly RequiresDependency requires;
+
+  public override IOrigin Range =>
+    call.Range;
+
+  public override string Description =>
+    $"requires clause at {requires.RangeString()} from call";
+
+  public CallRequiresDependency(CallDependency call, RequiresDependency requires) {
+    this.call = call;
+    this.requires = requires;
+  }
+}
+
+// Represents the assumption of a specific ensures clause of a specific
+// call.
+public class CallEnsuresDependency : ProofDependency {
+  public readonly CallDependency call;
+  private readonly EnsuresDependency ensures;
+
+  public override IOrigin Range =>
+    call.Range;
+
+  public override string Description =>
+    $"ensures clause at {ensures.RangeString()} from call";
+
+  public CallEnsuresDependency(CallDependency call, EnsuresDependency ensures) {
+    this.call = call;
+    this.ensures = ensures;
+  }
+}
+
+// Represents the fact that a particular call occurred.
+public class CallDependency : ProofDependency {
+  public readonly CallStmt call;
+
+  public override IOrigin Range =>
+    call.Origin;
+
+  public override string Description =>
+    $"call";
+
+  public CallDependency(CallStmt call) {
+    this.call = call;
+  }
+}
+
+// Represents the assumption of a predicate in an `assume` statement.
+public class AssumptionDependency : ProofDependency {
+  public override IOrigin Range =>
+    Expr.Origin;
+
+  public override string Description =>
+    comment ?? OriginalString();
+
+  public bool WarnWhenUnused { get; }
+
+  private readonly string comment;
+
+  public Expression Expr { get; }
+
+  public AssumptionDependency(bool warnWhenUnused, string comment, Expression expr) {
+    this.WarnWhenUnused = warnWhenUnused;
+    this.comment = comment;
+    this.Expr = expr;
+  }
+}
+
+// Represents the invariant of a loop.
+public class InvariantDependency : ProofDependency {
+  private readonly Expression invariant;
+
+  public override IOrigin Range =>
+    invariant.Origin;
+
+  public override string Description =>
+    $"loop invariant";
+
+  public InvariantDependency(Expression invariant) {
+    this.invariant = invariant;
+  }
+}
+
+// Represents an assignment statement. This includes the assignment to an
+// out parameter implicit in a return statement.
+public class AssignmentDependency : ProofDependency {
+  public override IOrigin Range { get; }
+
+  public override string Description =>
+     "assignment (or return)";
+
+  public AssignmentDependency(IOrigin rangeOrigin) {
+    this.Range = rangeOrigin;
+  }
+}
+
+// Represents dependency of a proof on the definition of a specific function.
+public class FunctionDefinitionDependency : ProofDependency {
+  public override IOrigin Range => function.Origin;
+
+  public override string Description =>
+    $"function definition for {function.Name}";
+
+  public Function function;
+
+  public FunctionDefinitionDependency(Function f) {
+    function = f;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/ProofDependencyManager.cs b/Source/DafnyCore/Verifier/ProofDependencyManager.cs
new file mode 100644
index 00000000000..4458b219ad5
--- /dev/null
+++ b/Source/DafnyCore/Verifier/ProofDependencyManager.cs
@@ -0,0 +1,89 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Boogie;
+using DafnyCore.Verifier;
+
+namespace Microsoft.Dafny {
+  public class ProofDependencyManager {
+    // proof dependency tracking state
+    public Dictionary<string, ProofDependency> ProofDependenciesById { get; } = new();
+    public readonly Dictionary<string, (Declaration Decl, HashSet<ProofDependency> Deps)> idsByMemberName = new();
+    private UInt64 proofDependencyIdCount = 0;
+    private string currentDeclarationString;
+    private Declaration currentDeclaration;
+
+    public string GetProofDependencyId(ProofDependency dep) {
+      var idString = $"id{proofDependencyIdCount}";
+      ProofDependenciesById[idString] = dep;
+      proofDependencyIdCount++;
+      var (_, currentSet) = idsByMemberName.GetOrCreate(currentDeclarationString, () => (currentDeclaration, new HashSet<ProofDependency>()));
+      currentSet.Add(dep);
+      return idString;
+    }
+
+    public void SetCurrentDefinition(string verificationScopeId, Declaration decl) {
+      currentDeclarationString = verificationScopeId;
+      currentDeclaration = decl;
+    }
+
+    public IEnumerable<ProofDependency> GetPotentialDependenciesForDefinition(string defName) {
+      return idsByMemberName.TryGetValue(defName, out var result) ? result.Deps : Enumerable.Empty<ProofDependency>();
+    }
+
+    public IEnumerable<ProofDependency> GetAllPotentialDependencies() {
+      return idsByMemberName.Values.SelectMany(x => x.Deps);
+    }
+
+    // The "id" attribute on a Boogie AST node is used by Boogie to label
+    // that AST node in the SMT-Lib formula when constructing a verification
+    // condition.
+    private const string idAttributeName = "id";
+
+    public void AddProofDependencyId(ICarriesAttributes boogieNode, IOrigin tok, ProofDependency dep) {
+      var idString = GetProofDependencyId(dep);
+      boogieNode.Attributes =
+        new QKeyValue(tok, idAttributeName, new List<object>() { idString }, boogieNode.Attributes);
+    }
+
+    public ProofDependency GetFullIdDependency(TrackedNodeComponent component) {
+      if (component is TrackedCallRequiresGoal requiresGoal) {
+        var reqId = ProofDependenciesById[requiresGoal.requiresId];
+        var callId = ProofDependenciesById[requiresGoal.callId];
+        return new CallRequiresDependency((CallDependency)callId, (RequiresDependency)reqId);
+      } else if (component is TrackedCallRequiresAssumed requiresAssumed) {
+        var reqId = ProofDependenciesById[requiresAssumed.requiresId];
+        var callId = ProofDependenciesById[requiresAssumed.callId];
+        return new CallRequiresDependency((CallDependency)callId, (RequiresDependency)reqId);
+      } else if (component is TrackedCallEnsures callEnsures) {
+        var ensId = ProofDependenciesById[callEnsures.ensuresId];
+        var callId = ProofDependenciesById[callEnsures.callId];
+        return new CallEnsuresDependency((CallDependency)callId, (EnsuresDependency)ensId);
+      } else if (component is TrackedInvariantEstablished invariantEstablished) {
+        return ProofDependenciesById[invariantEstablished.invariantId];
+      } else if (component is TrackedInvariantMaintained invariantMaintained) {
+        return ProofDependenciesById[invariantMaintained.invariantId];
+      } else if (component is TrackedInvariantAssumed invariantAssumed) {
+        return ProofDependenciesById[invariantAssumed.invariantId];
+      } else if (component is LabeledNodeComponent labeledNodeComponent) {
+        return ProofDependenciesById[labeledNodeComponent.SolverLabel];
+      } else {
+        throw new ArgumentException($"Malformed dependency ID: {component.SolverLabel}");
+      }
+    }
+
+    public IEnumerable<ProofDependency> GetOrderedFullDependencies(IEnumerable<TrackedNodeComponent> components) {
+      return components
+        .Select(GetFullIdDependency)
+        .OrderBy(dep => dep.Range.Center)
+        .ThenBy(dep => dep.Description);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/ProofObligationDescription.cs b/Source/DafnyCore/Verifier/ProofObligationDescription.cs
index a54985ae22d..4d3fefe6b0f 100644
--- a/Source/DafnyCore/Verifier/ProofObligationDescription.cs
+++ b/Source/DafnyCore/Verifier/ProofObligationDescription.cs
@@ -1,28 +1,67 @@
+using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
 using JetBrains.Annotations;
 using Microsoft.Boogie;
 
-namespace Microsoft.Dafny.ProofObligationDescription;
+namespace Microsoft.Dafny;
 
 public abstract class ProofObligationDescription : Boogie.ProofObligationDescription {
+  public virtual bool IsImplicit => true;
+
   // An expression that, if verified, would trigger a success for this ProofObligationDescription
   // It is only printed for the user, so it does not need to be resolved.
-  public abstract Expression GetAssertedExpr(DafnyOptions options);
+  public virtual Expression GetAssertedExpr(DafnyOptions options) {
+    return null;
+  }
 
   // Substituting replaces the token of a substituting expression by the token of the identifierExpr being susbstituted,
   // Since the printer requires the token of IdentifierExpr to be Token.NoToken to print the custom name in Dafny mode,
   // we just wrap the identifierExpr into a ParensExpression, as it is the case for any other expression.
   protected static Expression ToSubstitutableExpression(BoundVar bvar) {
-    var expression = new IdentifierExpr(bvar.tok, bvar);
-    return new ParensExpression(bvar.tok, expression) { Type = bvar.Type, ResolvedExpression = expression };
+    var expression = new IdentifierExpr(bvar.Origin, bvar);
+    return new ParensExpression(bvar.Origin, expression) { Type = bvar.Type, ResolvedExpression = expression };
+  }
+
+  // Returns a list of primed copies of the given `BoundVar`s.
+  protected static List<BoundVar> MakePrimedBoundVars(List<BoundVar> bvars) {
+    return bvars.Select(bvar => new BoundVar(Token.NoToken, bvar.Name + "'", bvar.Type)).ToList();
   }
-}
 
-// When there is no way to translate the asserted constraint in Dafny yet
-public abstract class ProofObligationDescriptionWithNoExpr : ProofObligationDescription {
-  public sealed override Expression GetAssertedExpr(DafnyOptions options) {
+  // Returns a substitution map from each given `BoundVar`s to a substitutable expression of a primed copy of the var.
+  protected static Dictionary<IVariable, Expression> MakePrimedBoundVarSubstMap(List<BoundVar> bvars, out List<BoundVar> primedVars, out List<Expression> primedExprs) {
+    primedVars = MakePrimedBoundVars(bvars);
+    primedExprs = primedVars.Select(ToSubstitutableExpression).ToList();
+    return bvars.Zip(primedExprs).ToDictionary(item => item.Item1 as IVariable, item => item.Item2);
+  }
+
+  // Creates primed copies of the given `BoundVar`s along with a Substituter for substituting the primed vars,
+  // and also returns a combined quantifier range of the form
+  //
+  //   range && range[i0 := i0', i1 := i1', ...] && (i0 != i0' || i1 != i1' || ...)
+  //
+  // Made for use in comparing expressions across loop iterations / quantified bodies.
+  protected static void MakePrimedBoundVarsAndRange(List<BoundVar> bvars, Expression range,
+    out List<BoundVar> primedVars, out Substituter sub, out Expression combinedRange) {
+    var substMap = MakePrimedBoundVarSubstMap(bvars, out primedVars, out _);
+    sub = new Substituter(null, substMap, new());
+
+    var rangeAndRangePrime = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, range, sub.Substitute(range));
+    var indicesDistinct = bvars
+      .Select(var =>
+        new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Neq, ToSubstitutableExpression(var), substMap[var]))
+      .Aggregate((acc, disjunct) =>
+        new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Or, acc, disjunct));
+    combinedRange = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, rangeAndRangePrime, indicesDistinct);
+  }
+
+  public virtual bool ProvedOutsideUserCode => false;
+
+  public virtual string GetExtraExplanation() {
     return null;
   }
 }
@@ -45,37 +84,60 @@ public DivisorNonZero(Expression divisor) {
   }
 
   public override Expression GetAssertedExpr(DafnyOptions options) {
-    return new BinaryExpr(divisor.tok, BinaryExpr.Opcode.Neq, divisor, new LiteralExpr(divisor.tok, 0));
+    return new BinaryExpr(divisor.Origin, BinaryExpr.Opcode.Neq, divisor, new LiteralExpr(divisor.Origin, 0));
   }
 }
 
-public class ShiftLowerBound : ProofObligationDescriptionWithNoExpr {
+public abstract class ShiftOrRotateBound : ProofObligationDescription {
+  protected readonly string shiftOrRotate;
+  protected readonly Expression amount;
+
+  public ShiftOrRotateBound(bool shift, Expression amount) {
+    shiftOrRotate = shift ? "shift" : "rotate";
+    this.amount = amount;
+  }
+}
+
+public class ShiftLowerBound : ShiftOrRotateBound {
   public override string SuccessDescription =>
-    "shift amount is always non-negative";
+    $"{shiftOrRotate} amount is always non-negative";
 
   public override string FailureDescription =>
-    "shift amount must be non-negative";
+    $"{shiftOrRotate} amount must be non-negative";
+
+  public override string ShortDescription => $"{shiftOrRotate} lower bound";
+
+  public ShiftLowerBound(bool shift, Expression amount)
+    : base(shift, amount) {
+  }
 
-  public override string ShortDescription => "shift lower bound";
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new BinaryExpr(amount.Origin, BinaryExpr.Opcode.Le, Expression.CreateIntLiteral(amount.Origin, 0), amount);
+  }
 }
 
-public class ShiftUpperBound : ProofObligationDescriptionWithNoExpr {
+public class ShiftUpperBound : ShiftOrRotateBound {
   public override string SuccessDescription =>
-    $"shift amount is always within the width of the result ({width})";
+    $"{shiftOrRotate} amount is always within the width of the result ({width})";
 
   public override string FailureDescription =>
-    $"shift amount must not exceed the width of the result ({width})";
+    $"{shiftOrRotate} amount must not exceed the width of the result ({width})";
 
-  public override string ShortDescription => "shift upper bound";
+  public override string ShortDescription => $"{shiftOrRotate} upper bound";
 
   private readonly int width;
 
-  public ShiftUpperBound(int width) {
+  public ShiftUpperBound(int width, bool shift, Expression amount)
+    : base(shift, amount) {
     this.width = width;
   }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new BinaryExpr(amount.Origin, BinaryExpr.Opcode.Le, amount, Expression.CreateIntLiteral(amount.Origin, width));
+  }
 }
 
-public class ConversionIsNatural : ProofObligationDescriptionWithNoExpr {
+public class ConversionIsNatural : ProofObligationDescription {
   public override string SuccessDescription =>
     $"{prefix}value to be converted is always a natural number";
 
@@ -85,13 +147,19 @@ public class ConversionIsNatural : ProofObligationDescriptionWithNoExpr {
   public override string ShortDescription => "converted value is natural";
 
   private readonly string prefix;
+  private readonly Expression value;
 
-  public ConversionIsNatural(string prefix) {
+  public ConversionIsNatural(string prefix, Expression value) {
     this.prefix = prefix;
+    this.value = value;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new TypeTestExpr(value.Origin, value, Type.Nat());
   }
 }
 
-public class ConversionSatisfiesConstraints : ProofObligationDescriptionWithNoExpr {
+public class ConversionSatisfiesConstraints : ProofObligationDescription {
   public override string SuccessDescription =>
     $"{prefix}result of operation never violates {kind} constraints for '{name}'";
 
@@ -103,15 +171,21 @@ public class ConversionSatisfiesConstraints : ProofObligationDescriptionWithNoEx
   private readonly string prefix;
   private readonly string kind;
   private readonly string name;
+  private readonly Expression constraint;
 
-  public ConversionSatisfiesConstraints(string prefix, string kind, string name) {
+  public ConversionSatisfiesConstraints(string prefix, string kind, string name, Expression constraint) {
     this.prefix = prefix;
     this.kind = kind;
     this.name = name;
+    this.constraint = constraint;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return constraint;
   }
 }
 
-public class OrdinalSubtractionIsNatural : ProofObligationDescriptionWithNoExpr {
+public class OrdinalSubtractionIsNatural : ProofObligationDescription {
   public override string SuccessDescription =>
     "RHS of ORDINAL subtraction is always a natural number";
 
@@ -119,9 +193,19 @@ public class OrdinalSubtractionIsNatural : ProofObligationDescriptionWithNoExpr
     "RHS of ORDINAL subtraction must be a natural number, but the given RHS might be larger";
 
   public override string ShortDescription => "ordinal subtraction is natural";
+
+  private readonly Expression rhs;
+
+  public OrdinalSubtractionIsNatural(Expression rhs) {
+    this.rhs = rhs;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new ExprDotName(rhs.Origin, rhs, new Name("IsNat"), null);
+  }
 }
 
-public class OrdinalSubtractionUnderflow : ProofObligationDescriptionWithNoExpr {
+public class OrdinalSubtractionUnderflow : ProofObligationDescription {
   public override string SuccessDescription =>
     "ORDINAL subtraction will never go below limit ordinal";
 
@@ -129,9 +213,26 @@ public class OrdinalSubtractionUnderflow : ProofObligationDescriptionWithNoExpr
     "ORDINAL subtraction might underflow a limit ordinal (that is, RHS might be too large)";
 
   public override string ShortDescription => "ordinal subtraction underflow";
+
+  private readonly Expression lhs;
+  private readonly Expression rhs;
+
+  public OrdinalSubtractionUnderflow(Expression lhs, Expression rhs) {
+    this.lhs = lhs;
+    this.rhs = rhs;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new BinaryExpr(
+      rhs.Origin,
+      BinaryExpr.Opcode.Le,
+      new ExprDotName(rhs.Origin, rhs, new Name("Offset"), null),
+      new ExprDotName(lhs.Origin, lhs, new Name("Offset"), null)
+    );
+  }
 }
 
-public class CharOverflow : ProofObligationDescriptionWithNoExpr {
+public class CharOverflow : ProofObligationDescription {
   public override string SuccessDescription =>
     "char addition will not overflow";
 
@@ -139,9 +240,27 @@ public class CharOverflow : ProofObligationDescriptionWithNoExpr {
     "char addition might overflow";
 
   public override string ShortDescription => "char overflow";
+
+  private readonly Expression e0;
+  private readonly Expression e1;
+
+  public CharOverflow(Expression e0, Expression e1) {
+    this.e0 = e0;
+    this.e1 = e1;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    var sum = new BinaryExpr(
+      e0.Origin,
+      BinaryExpr.Opcode.Add,
+      new ConversionExpr(e0.Origin, e0, Type.Int),
+      new ConversionExpr(e1.Origin, e1, Type.Int)
+    );
+    return Utils.MakeCharBoundsCheck(options, sum);
+  }
 }
 
-public class CharUnderflow : ProofObligationDescriptionWithNoExpr {
+public class CharUnderflow : ProofObligationDescription {
   public override string SuccessDescription =>
     "char subtraction will not underflow";
 
@@ -149,9 +268,27 @@ public class CharUnderflow : ProofObligationDescriptionWithNoExpr {
     "char subtraction might underflow";
 
   public override string ShortDescription => "char underflow";
+
+  private readonly Expression e0;
+  private readonly Expression e1;
+
+  public CharUnderflow(Expression e0, Expression e1) {
+    this.e0 = e0;
+    this.e1 = e1;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    var diff = new BinaryExpr(
+      e0.Origin,
+      BinaryExpr.Opcode.Sub,
+      new ConversionExpr(e0.Origin, e0, Type.Int),
+      new ConversionExpr(e1.Origin, e1, Type.Int)
+    );
+    return Utils.MakeCharBoundsCheck(options, diff);
+  }
 }
 
-public class ConversionFit : ProofObligationDescriptionWithNoExpr {
+public class ConversionFit : ProofObligationDescription {
   public override string SuccessDescription =>
     $"{prefix}{what} to be converted will always fit in {toType}";
 
@@ -163,15 +300,21 @@ public class ConversionFit : ProofObligationDescriptionWithNoExpr {
   private readonly string prefix;
   private readonly string what;
   private readonly Type toType;
+  private readonly Expression boundsCheck;
 
-  public ConversionFit(string what, Type toType, string prefix = "") {
+  public ConversionFit(string what, Type toType, Expression boundsCheck, string prefix = "") {
     this.prefix = prefix;
     this.what = what;
+    this.boundsCheck = boundsCheck;
     this.toType = toType;
   }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return boundsCheck;
+  }
 }
 
-public class NonNegative : ProofObligationDescriptionWithNoExpr {
+public class NonNegative : ProofObligationDescription {
   public override string SuccessDescription =>
     $"{what} is never negative";
 
@@ -181,13 +324,24 @@ public class NonNegative : ProofObligationDescriptionWithNoExpr {
   public override string ShortDescription => "non-negative";
 
   private readonly string what;
+  private readonly Expression expr;
 
-  public NonNegative(string what) {
+  public NonNegative(string what, Expression expr) {
     this.what = what;
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new BinaryExpr(
+      expr.Origin,
+      BinaryExpr.Opcode.Le,
+      Expression.CreateIntLiteral(expr.Origin, 0),
+      expr
+    );
   }
 }
 
-public class ConversionPositive : ProofObligationDescriptionWithNoExpr {
+public class ConversionPositive : ProofObligationDescription {
   public override string SuccessDescription =>
     $"{prefix}{what} is always positive";
 
@@ -199,15 +353,26 @@ public class ConversionPositive : ProofObligationDescriptionWithNoExpr {
   private readonly string prefix;
   private readonly string what;
   private readonly Type toType;
+  private readonly Expression expr;
 
-  public ConversionPositive(string what, Type toType, string prefix = "") {
+  public ConversionPositive(string what, Type toType, Expression expr, string prefix = "") {
     this.prefix = prefix;
     this.what = what;
     this.toType = toType;
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new BinaryExpr(
+      expr.Origin,
+      BinaryExpr.Opcode.Le,
+      Expression.CreateIntLiteral(expr.Origin, 0),
+      expr
+    );
   }
 }
 
-public class IsInteger : ProofObligationDescriptionWithNoExpr {
+public class IsInteger : ProofObligationDescription {
   public override string SuccessDescription =>
     $"{prefix}the real-based number is an integer";
 
@@ -217,34 +382,51 @@ public class IsInteger : ProofObligationDescriptionWithNoExpr {
   public override string ShortDescription => "is integer";
 
   private readonly string prefix;
+  private readonly Expression expr;
 
-  public IsInteger(string prefix = "") {
+  public IsInteger(Expression expr, string prefix = "") {
+    this.expr = expr;
     this.prefix = prefix;
   }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new BinaryExpr(
+      expr.Origin,
+      BinaryExpr.Opcode.Eq,
+      expr,
+      new ConversionExpr(expr.Origin, new ExprDotName(expr.Origin, expr, new Name("Floor"), null), Type.Real)
+    );
+  }
 }
 
 //// Object properties
 
-public class NonNull : ProofObligationDescriptionWithNoExpr {
+public class NonNull : ProofObligationDescription {
   public override string SuccessDescription =>
-    $"{PluralSuccess}{what} object is never null";
+    $"{PluralSuccess}{what} is never null";
 
   public override string FailureDescription =>
     $"{PluralFailure}{what} might be null";
 
   public override string ShortDescription => $"{what} non-null";
   private readonly string what;
+  private readonly Expression expr;
   private bool plural;
   private string PluralSuccess => plural ? "each " : "";
   private string PluralFailure => plural ? "some " : "";
 
-  public NonNull(string what, bool plural = false) {
+  public NonNull(string what, Expression expr, bool plural = false) {
     this.what = what;
+    this.expr = expr;
     this.plural = plural;
   }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Neq, expr, new LiteralExpr(expr.Origin));
+  }
 }
 
-public class IsAllocated : ProofObligationDescriptionWithNoExpr {
+public class IsAllocated : ProofObligationDescription {
   public override string SuccessDescription =>
     $"{PluralSuccess}{what} is always allocated{WhenSuffix}";
 
@@ -255,19 +437,32 @@ public class IsAllocated : ProofObligationDescriptionWithNoExpr {
 
   private readonly string what;
   [CanBeNull] private readonly string when;
+  private readonly Expression expr;
+  [CanBeNull] private readonly Label atLabel;
   private bool plural;
   private string WhenSuffix => when is null ? "" : $" {when}";
   private string PluralSuccess => plural ? "each " : "";
   private string PluralFailure => plural ? "some " : "";
 
-  public IsAllocated(string what, string when, bool plural = false) {
+  public static string HelperFormal(Formal formal) {
+    return $" -- if you add 'new' before the parameter declaration, like 'new {formal.Name}: {formal.Type.ToString()}',"
+           + " arguments can refer to expressions possibly unallocated in the previous state";
+  }
+
+  public IsAllocated(string what, string when, Expression expr, [CanBeNull] Label atLabel = null, bool plural = false) {
     this.what = what;
     this.when = when;
+    this.expr = expr;
+    this.atLabel = atLabel;
     this.plural = plural;
   }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new OldExpr(expr.Origin, new UnaryOpExpr(expr.Origin, UnaryOpExpr.Opcode.Allocated, expr), atLabel?.Name);
+  }
 }
 
-public class IsOlderProofObligation : ProofObligationDescriptionWithNoExpr {
+public class IsOlderProofObligation : ProofObligationDescription {
   public override string SuccessDescription {
     get {
       var successOlder = olderParameterCount == 1 ? " is" : "s are";
@@ -302,7 +497,7 @@ public IsOlderProofObligation(int olderParameterCount, int allParameterCount) {
 
 //// Contract constraints
 
-public abstract class ProofObligationDescriptionCustomMessages : ProofObligationDescriptionWithNoExpr {
+public abstract class ProofObligationDescriptionCustomMessages : ProofObligationDescription {
   protected readonly string customErrMsg;
   private readonly string customSuccessMsg;
 
@@ -328,12 +523,19 @@ public class PreconditionSatisfied : ProofObligationDescriptionCustomMessages {
 
   public override string ShortDescription => "precondition";
 
-  public PreconditionSatisfied([CanBeNull] string customErrMsg, [CanBeNull] string customSuccessMsg)
+  private readonly Expression expr;
+
+  public PreconditionSatisfied(Expression expr, [CanBeNull] string customErrMsg, [CanBeNull] string customSuccessMsg)
     : base(customErrMsg, customSuccessMsg) {
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
   }
 }
 
-public class AssertStatement : ProofObligationDescriptionCustomMessages {
+public class AssertStatementDescription : ProofObligationDescriptionCustomMessages {
   public override string DefaultSuccessDescription =>
     "assertion always holds";
 
@@ -342,9 +544,24 @@ public class AssertStatement : ProofObligationDescriptionCustomMessages {
 
   public override string ShortDescription => "assert statement";
 
-  public AssertStatement([CanBeNull] string customErrMsg, [CanBeNull] string customSuccessMsg)
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return AssertStatement.Expr;
+  }
+
+  public PredicateStmt AssertStatement { get; }
+
+  // We provide a way to mark an assertion as an intentional element of a
+  // proof by contradiction with the `{:contradiction}` attribute. Dafny
+  // skips warning about such assertions being proved due to contradictory
+  // assumptions.
+  public bool IsIntentionalContradiction => Attributes.Contains(AssertStatement.Attributes, "contradiction");
+
+  public AssertStatementDescription(PredicateStmt assertStmt, [CanBeNull] string customErrMsg, [CanBeNull] string customSuccessMsg)
     : base(customErrMsg, customSuccessMsg) {
+    this.AssertStatement = assertStmt;
   }
+
+  public override bool IsImplicit => false;
 }
 
 // The Boogie version does not support custom error messages yet
@@ -357,8 +574,15 @@ public class RequiresDescription : ProofObligationDescriptionCustomMessages {
 
   public override string ShortDescription => "requires";
 
-  public RequiresDescription([CanBeNull] string customErrMsg, [CanBeNull] string customSuccessMsg)
+  private readonly Expression expr;
+
+  public RequiresDescription(Expression expr, [CanBeNull] string customErrMsg, [CanBeNull] string customSuccessMsg)
     : base(customErrMsg, customSuccessMsg) {
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
   }
 }
 
@@ -379,8 +603,17 @@ public class EnsuresDescription : ProofObligationDescriptionCustomMessages {
 
   public override string ShortDescription => "ensures";
 
-  public EnsuresDescription([CanBeNull] string customErrMsg, [CanBeNull] string customSuccessMsg)
+  private readonly Expression expr;
+
+  public EnsuresDescription(Expression expr, [CanBeNull] string customErrMsg, [CanBeNull] string customSuccessMsg)
     : base(customErrMsg, customSuccessMsg) {
+    this.expr = expr;
+  }
+
+  public override bool IsImplicit => false;
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
   }
 }
 
@@ -393,12 +626,19 @@ public class LoopInvariant : ProofObligationDescriptionCustomMessages {
 
   public override string ShortDescription => "loop invariant";
 
-  public LoopInvariant([CanBeNull] string customErrMsg, [CanBeNull] string customSuccessMsg)
+  private readonly Expression expr;
+
+  public LoopInvariant(Expression expr, [CanBeNull] string customErrMsg, [CanBeNull] string customSuccessMsg)
     : base(customErrMsg, customSuccessMsg) {
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
   }
 }
 
-public class CalculationStep : ProofObligationDescriptionWithNoExpr {
+public class CalculationStep : ProofObligationDescription {
   public override string SuccessDescription =>
     "the calculation step between the previous line and this line always holds";
 
@@ -406,9 +646,42 @@ public class CalculationStep : ProofObligationDescriptionWithNoExpr {
     "the calculation step between the previous line and this line could not be proved";
 
   public override string ShortDescription => "calc step";
+
+  private readonly Expression expr;
+  private readonly BlockStmt hints;
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
+  }
+
+  public override string GetExtraExplanation() {
+    if (hints is null || hints.Body is null || hints.Body.Count == 0) {
+      return null;
+    }
+
+    StringBuilder builder = new();
+    builder.Append("\n  asserted after the following statements:");
+
+    // These can be deeply nested for some reason
+    List<Statement> stmts = hints.Body;
+    while (stmts.Count == 1 && stmts[0] is BlockStmt bs) {
+      stmts = bs.Body;
+    }
+
+    foreach (var stmt in stmts) {
+      builder.Append($"\n    {stmt}");
+    }
+
+    return builder.ToString();
+  }
+
+  public CalculationStep(Expression expr, BlockStmt hints) {
+    this.expr = expr;
+    this.hints = hints;
+  }
 }
 
-public class EnsuresStronger : ProofObligationDescriptionWithNoExpr {
+public class EnsuresStronger : ProofObligationDescription {
   public override string SuccessDescription =>
     "the method provides a postcondition equal to or more detailed than in its parent trait";
 
@@ -416,9 +689,21 @@ public class EnsuresStronger : ProofObligationDescriptionWithNoExpr {
     "the method must provide an equal or more detailed postcondition than in its parent trait";
 
   public override string ShortDescription => "ensures stronger";
+
+  public override bool ProvedOutsideUserCode => true;
+
+  private readonly Expression expr;
+
+  public EnsuresStronger(Expression expr) {
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
+  }
 }
 
-public class RequiresWeaker : ProofObligationDescriptionWithNoExpr {
+public class RequiresWeaker : ProofObligationDescription {
   public override string SuccessDescription =>
     "the method provides a precondition equal to or more permissive than in its parent trait";
 
@@ -426,9 +711,21 @@ public class RequiresWeaker : ProofObligationDescriptionWithNoExpr {
     "the method must provide an equal or more permissive precondition than in its parent trait";
 
   public override string ShortDescription => "requires weaker";
+
+  public override bool ProvedOutsideUserCode => true;
+
+  private readonly Expression expr;
+
+  public RequiresWeaker(Expression expr) {
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
+  }
 }
 
-public class ForallPostcondition : ProofObligationDescriptionWithNoExpr {
+public class ForallPostcondition : ProofObligationDescription {
   public override string SuccessDescription =>
     "postcondition of forall statement always holds";
 
@@ -436,9 +733,19 @@ public class ForallPostcondition : ProofObligationDescriptionWithNoExpr {
     "possible violation of postcondition of forall statement";
 
   public override string ShortDescription => "forall ensures";
+
+  private readonly Expression expr;
+
+  public ForallPostcondition(Expression expr) {
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
+  }
 }
 
-public class YieldEnsures : ProofObligationDescriptionWithNoExpr {
+public class YieldEnsures : ProofObligationDescription {
   public override string SuccessDescription =>
     "yield-ensures condition always holds";
 
@@ -446,9 +753,19 @@ public class YieldEnsures : ProofObligationDescriptionWithNoExpr {
     "possible violation of yield-ensures condition";
 
   public override string ShortDescription => "yield ensures";
+
+  private readonly Expression expr;
+
+  public YieldEnsures(Expression expr) {
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
+  }
 }
 
-public class TraitFrame : ProofObligationDescriptionWithNoExpr {
+public class TraitFrame : ProofObligationDescription {
   public override string SuccessDescription =>
     isModify
       ? $"{whatKind} abides by trait context's modifies clause"
@@ -464,14 +781,22 @@ public class TraitFrame : ProofObligationDescriptionWithNoExpr {
 
   private readonly string whatKind;
   private bool isModify;
+  private readonly List<FrameExpression> subsetFrames;
+  private readonly List<FrameExpression> supersetFrames;
 
-  public TraitFrame(string whatKind, bool isModify) {
+  public TraitFrame(string whatKind, bool isModify, List<FrameExpression> subsetFrames, List<FrameExpression> supersetFrames) {
     this.whatKind = whatKind;
     this.isModify = isModify;
+    this.subsetFrames = subsetFrames;
+    this.supersetFrames = supersetFrames;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return Utils.MakeDafnyMultiFrameCheck(supersetFrames, subsetFrames);
   }
 }
 
-public class TraitDecreases : ProofObligationDescriptionWithNoExpr {
+public class TraitDecreases : ProofObligationDescription {
   public override string SuccessDescription =>
     $"{whatKind}'s decreases clause is below or equal to that in the trait";
 
@@ -480,36 +805,120 @@ public class TraitDecreases : ProofObligationDescriptionWithNoExpr {
 
   public override string ShortDescription => "trait decreases";
 
+  public override bool ProvedOutsideUserCode => true;
+
+  private readonly string whatKind;
+  private readonly Expression expr;
+
+  public TraitDecreases(string whatKind, Expression expr) {
+    this.whatKind = whatKind;
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
+  }
+}
+
+public class ReadFrameSubset : ProofObligationDescription {
+  public override string SuccessDescription =>
+    $"sufficient reads clause to {whatKind}";
+
+  public override string FailureDescription =>
+    $"insufficient reads clause to {whatKind}" + ExtendedFailureHint();
+
+  public string ExtendedFailureHint() {
+    if (readExpression is null) {
+      return "";
+    }
+    if (scope is { Designator: var designator }) {
+      var lambdaScope = scope as LambdaExpr;
+      var extraHint = "";
+      var obj = "object";
+      if (readExpression is MemberSelectExpr e) {
+        obj = Printer.ExprToString(DafnyOptions.DefaultImmutableOptions, e.Obj, new PrintFlags(UseOriginalDafnyNames: true));
+      } else if (readExpression is SeqSelectExpr s) {
+        obj = Printer.ExprToString(DafnyOptions.DefaultImmutableOptions, s.Seq, new PrintFlags(UseOriginalDafnyNames: true));
+      } else if (readExpression is MultiSelectExpr m) {
+        obj = Printer.ExprToString(DafnyOptions.DefaultImmutableOptions, m.Array,
+          new PrintFlags(UseOriginalDafnyNames: true));
+      }
+
+      if (scope is Function { CoClusterTarget: var x } && x != Function.CoCallClusterInvolvement.None) {
+      } else {
+        if (lambdaScope == null && readExpression is MemberSelectExpr { MemberName: var field }) {
+          extraHint = $" or 'reads {obj}`{field}'";
+        }
+        var hint = $"adding 'reads {obj}'{extraHint} in the enclosing {designator} specification for resolution";
+        if (lambdaScope != null && lambdaScope.Reads.Expressions.Count == 0) {
+          hint = $"extracting {readExpression} to a local variable before the lambda expression, or {hint}";
+        }
+
+        return $"; Consider {hint}";
+      }
+    }
+
+    string whyNotWhat = "Memory locations";
+
+    if (whatKind == "read field") {
+      whyNotWhat = "Mutable fields";
+    } else if (whatKind is "read array element" or "read the indicated range of array elements") {
+      whyNotWhat = "Array elements";
+    }
+    return $"; {whyNotWhat} cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls";
+
+  }
+
+  public override string ShortDescription => "read frame subset";
+
   private readonly string whatKind;
+  private readonly Expression assertedExpr;
+  private readonly Expression readExpression;
+  [CanBeNull] private readonly IFrameScope scope;
+
+  public ReadFrameSubset(string whatKind, FrameExpression subsetFrame, List<FrameExpression> supersetFrames, Expression readExpression = null, [CanBeNull] IFrameScope scope = null)
+    : this(whatKind, new List<FrameExpression> { subsetFrame }, supersetFrames, readExpression, scope) { }
+
+  public ReadFrameSubset(string whatKind, List<FrameExpression> subsetFrames, List<FrameExpression> supersetFrames, Expression readExpression = null, [CanBeNull] IFrameScope scope = null)
+    : this(whatKind, Utils.MakeDafnyMultiFrameCheck(supersetFrames, subsetFrames), readExpression, scope) { }
 
-  public TraitDecreases(string whatKind) {
+  public ReadFrameSubset(string whatKind, Expression assertedExpr, Expression readExpression = null, [CanBeNull] IFrameScope scope = null) {
     this.whatKind = whatKind;
+    this.assertedExpr = assertedExpr;
+    this.readExpression = readExpression;
+    this.scope = scope;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return assertedExpr;
   }
 }
 
-public class FrameSubset : ProofObligationDescriptionWithNoExpr {
+public class ModifyFrameSubset : ProofObligationDescription {
   public override string SuccessDescription =>
-    isWrite
-      ? $"{whatKind} is allowed by context's modifies clause"
-      : $"sufficient reads clause to {whatKind}";
+      $"{whatKind} is allowed by context's modifies clause";
 
   public override string FailureDescription =>
-    isWrite
-      ? $"{whatKind} might violate context's modifies clause"
-      : $"insufficient reads clause to {whatKind}";
+      $"{whatKind} might violate context's modifies clause";
 
-  public override string ShortDescription => "frame subset";
+  public override string ShortDescription => "modify frame subset";
 
   private readonly string whatKind;
-  private readonly bool isWrite;
+  private readonly List<FrameExpression> subsetFrames;
+  private readonly List<FrameExpression> supersetFrames;
 
-  public FrameSubset(string whatKind, bool isWrite) {
+  public ModifyFrameSubset(string whatKind, List<FrameExpression> subsetFrames, List<FrameExpression> supersetFrames) {
     this.whatKind = whatKind;
-    this.isWrite = isWrite;
+    this.subsetFrames = subsetFrames;
+    this.supersetFrames = supersetFrames;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return Utils.MakeDafnyMultiFrameCheck(supersetFrames, subsetFrames);
   }
 }
 
-public class FrameDereferenceNonNull : ProofObligationDescriptionWithNoExpr {
+public class FrameDereferenceNonNull : ProofObligationDescription {
   public override string SuccessDescription =>
     "frame expression does not dereference null";
 
@@ -517,9 +926,19 @@ public class FrameDereferenceNonNull : ProofObligationDescriptionWithNoExpr {
     "frame expression might dereference null";
 
   public override string ShortDescription => "frame dereference";
+
+  private readonly Expression expr;
+
+  public FrameDereferenceNonNull(Expression expr) {
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Neq, expr, new LiteralExpr(Token.NoToken));
+  }
 }
 
-public class Terminates : ProofObligationDescriptionWithNoExpr {
+public class Terminates : ProofObligationDescription {
   public override string SuccessDescription =>
     "loop or recursion terminates";
 
@@ -532,18 +951,53 @@ public class Terminates : ProofObligationDescriptionWithNoExpr {
   public override string ShortDescription => "termination";
 
   private readonly bool inferredDescreases;
-  private readonly bool isLoop;
+  private bool isLoop => prevGhostLocals is not null;
   private readonly string hint;
   private string FormDescription => isLoop ? "expression" : "clause";
 
-  public Terminates(bool inferredDescreases, bool isLoop, string hint = null) {
+  private readonly Expression allowance;
+  private readonly List<Expression> oldExpressions;
+  private readonly List<Expression> newExpressions;
+  private readonly List<VarDeclStmt> prevGhostLocals;
+  private bool allowNoChange;
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    Expression expr = new DecreasesToExpr(Token.NoToken, oldExpressions, newExpressions, allowNoChange);
+    if (allowance is not null) {
+      expr = Expression.CreateOr(allowance, expr);
+    }
+    return expr;
+  }
+
+  public override string GetExtraExplanation() {
+    var builder = new StringBuilder();
+    if (prevGhostLocals is not null) {
+      builder.Append("\n  with the label `LoopEntry` applied to the loop");
+      if (prevGhostLocals.Count > 0) {
+        builder.Append("\n  and with the following declarations at the beginning of the loop body:");
+        foreach (var decl in prevGhostLocals) {
+          builder.Append($"\n    {decl}");
+        }
+      }
+
+      return builder.ToString();
+    }
+
+    return null;
+  }
+
+  public Terminates(bool inferredDescreases, List<VarDeclStmt> prevGhostLocals, Expression allowance, List<Expression> oldExpressions, List<Expression> newExpressions, bool allowNoChange, string hint = null) {
     this.inferredDescreases = inferredDescreases;
-    this.isLoop = isLoop;
+    this.prevGhostLocals = prevGhostLocals;
+    this.allowance = allowance;
+    this.oldExpressions = oldExpressions;
+    this.newExpressions = newExpressions;
+    this.allowNoChange = allowNoChange;
     this.hint = hint;
   }
 }
 
-public class DecreasesBoundedBelow : ProofObligationDescriptionWithNoExpr {
+public class DecreasesBoundedBelow : ProofObligationDescription {
   public override string SuccessDescription =>
     $"decreases {component} is bounded below by {zeroStr}";
 
@@ -552,20 +1006,47 @@ public class DecreasesBoundedBelow : ProofObligationDescriptionWithNoExpr {
 
   public override string ShortDescription => "bounded decreases expression";
 
+  public override bool ProvedOutsideUserCode => true;
+
   private string component => N == 1 ? "expression" : $"expression at index {k}";
   private readonly string zeroStr;
   private readonly string suffix;
   private readonly int N, k;
+  private readonly Expression bound;
+  private readonly List<VarDeclStmt> prevGhostLocals;
 
-  public DecreasesBoundedBelow(int N, int k, string zeroStr, string suffix) {
+  public override Expression GetAssertedExpr(DafnyOptions _) {
+    return bound;
+  }
+
+  public override string GetExtraExplanation() {
+    var builder = new StringBuilder();
+    if (prevGhostLocals is not null) {
+      builder.Append("\n  with the label `LoopEntry` applied to the loop");
+      if (prevGhostLocals.Count > 0) {
+        builder.Append("\n  and with the following declarations at the beginning of the loop body:");
+        foreach (var decl in prevGhostLocals) {
+          builder.Append($"\n    {decl}");
+        }
+      }
+
+      return builder.ToString();
+    }
+
+    return null;
+  }
+
+  public DecreasesBoundedBelow(int N, int k, string zeroStr, List<VarDeclStmt> prevGhostLocals, Expression bound, string suffix) {
     this.N = N;
     this.k = k;
     this.zeroStr = zeroStr;
     this.suffix = suffix;
+    this.prevGhostLocals = prevGhostLocals;
+    this.bound = bound;
   }
 }
 
-public class Modifiable : ProofObligationDescriptionWithNoExpr {
+public class Modifiable : ProofObligationDescription {
   public override string SuccessDescription =>
     $"{description} is in the enclosing context's modifies clause";
 
@@ -575,13 +1056,23 @@ public class Modifiable : ProofObligationDescriptionWithNoExpr {
   public override string ShortDescription => "modifiable";
 
   private readonly string description;
+  private readonly List<FrameExpression> frames;
+  private readonly Expression obj;
+  private readonly Field field;
 
-  public Modifiable(string description) {
+  public Modifiable(string description, List<FrameExpression> frames, Expression obj, Field field) {
     this.description = description;
+    this.frames = frames;
+    this.obj = obj;
+    this.field = field;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return Utils.MakeDafnyFrameCheck(frames, obj, field);
   }
 }
 
-public class FunctionContractOverride : ProofObligationDescriptionWithNoExpr {
+public class FunctionContractOverride : ProofObligationDescription {
   public override string SuccessDescription =>
     $"the function provides an equal or {RestrictionDesc} than in its parent trait";
 
@@ -590,18 +1081,27 @@ public class FunctionContractOverride : ProofObligationDescriptionWithNoExpr {
 
   public override string ShortDescription => "contract override valid";
 
+  public override bool ProvedOutsideUserCode => true;
+
   private readonly bool isEnsures;
   private string RestrictionDesc =>
     isEnsures ? "more detailed postcondition" : "more permissive precondition";
 
-  public FunctionContractOverride(bool isEnsures) {
+  private readonly Expression expr;
+
+  public FunctionContractOverride(bool isEnsures, Expression expr) {
     this.isEnsures = isEnsures;
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
   }
 }
 
 //// Structural constraints
 
-public class MatchIsComplete : ProofObligationDescriptionWithNoExpr {
+public class MatchIsComplete : ProofObligationDescription {
   public override string SuccessDescription =>
     $"match {matchForm} covers all cases";
 
@@ -610,25 +1110,53 @@ public class MatchIsComplete : ProofObligationDescriptionWithNoExpr {
 
   public override string ShortDescription => "match complete";
 
+  public override bool ProvedOutsideUserCode => true;
+
   private readonly string matchForm;
   private readonly string missing;
   public MatchIsComplete(string matchForm, string missing) {
     this.matchForm = matchForm;
     this.missing = missing;
   }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new LiteralExpr(Token.NoToken, false);
+  }
+
+  // ReSharper disable once UnusedMember.Global
+  public override string GetExtraExplanation() {
+    return (
+      "\n  in an added catch-all case:"
+      + "\n    case _ => ..."
+    );
+  }
 }
 
-public class AlternativeIsComplete : ProofObligationDescriptionWithNoExpr {
+public class AlternativeIsComplete : ProofObligationDescription {
   public override string SuccessDescription =>
-    $"alternative cases cover all possibilties";
+    $"alternative cases cover all possibilities";
 
   public override string FailureDescription =>
-    $"alternative cases fail to cover all possibilties";
+    $"alternative cases fail to cover all possibilities";
 
   public override string ShortDescription => "alternative complete";
+
+  public override bool ProvedOutsideUserCode => true;
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new LiteralExpr(Token.NoToken, false);
+  }
+
+  // ReSharper disable once UnusedMember.Global
+  public override string GetExtraExplanation() {
+    return (
+      "\n  in an added catch-all case:"
+      + "\n    case true => ..."
+    );
+  }
 }
 
-public class PatternShapeIsValid : ProofObligationDescriptionWithNoExpr {
+public class PatternShapeIsValid : ProofObligationDescription {
   public override string SuccessDescription =>
     $"RHS will always match the pattern '{ctorName}'";
 
@@ -637,14 +1165,20 @@ public class PatternShapeIsValid : ProofObligationDescriptionWithNoExpr {
 
   public override string ShortDescription => "pattern shape valid";
 
+  private readonly Expression expr;
   private readonly string ctorName;
 
-  public PatternShapeIsValid(string ctorName) {
+  public PatternShapeIsValid(Expression expr, string ctorName) {
+    this.expr = expr;
     this.ctorName = ctorName;
   }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new ExprDotName(Token.NoToken, expr, new Name(ctorName + "?"), null);
+  }
 }
 
-public class ValidConstructorNames : ProofObligationDescriptionWithNoExpr {
+public class ValidConstructorNames : ProofObligationDescription {
   public override string SuccessDescription =>
     $"source of datatype update is constructed by {ctorNames}";
 
@@ -654,13 +1188,21 @@ public class ValidConstructorNames : ProofObligationDescriptionWithNoExpr {
   public override string ShortDescription => "valid constructor names";
 
   private readonly string ctorNames;
+  private readonly Expression root;
+  private readonly List<DatatypeCtor> ctors;
+
+  public ValidConstructorNames(Expression root, List<DatatypeCtor> ctors) {
+    this.ctorNames = DatatypeDestructor.PrintableCtorNameList(ctors, "or");
+    this.root = root;
+    this.ctors = ctors;
+  }
 
-  public ValidConstructorNames(string ctorNames) {
-    this.ctorNames = ctorNames;
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return Utils.MakeIsOneCtorAssertion(root, ctors);
   }
 }
 
-public class DestructorValid : ProofObligationDescriptionWithNoExpr {
+public class DestructorValid : ProofObligationDescription {
   public override string SuccessDescription =>
     $"destructor '{dtorName}' is only applied to datatype values constructed by {ctorNames}";
 
@@ -671,14 +1213,22 @@ public class DestructorValid : ProofObligationDescriptionWithNoExpr {
 
   private readonly string dtorName;
   private readonly string ctorNames;
+  private readonly Expression root;
+  private readonly List<DatatypeCtor> ctors;
+
+  public DestructorValid(DatatypeDestructor dtor, Expression root, List<DatatypeCtor> ctors) {
+    this.dtorName = dtor.Name;
+    this.ctorNames = dtor.EnclosingCtorNames("or");
+    this.root = root;
+    this.ctors = ctors;
+  }
 
-  public DestructorValid(string dtorName, string ctorNames) {
-    this.dtorName = dtorName;
-    this.ctorNames = ctorNames;
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return Utils.MakeIsOneCtorAssertion(root, ctors);
   }
 }
 
-public class NotGhostVariant : ProofObligationDescriptionWithNoExpr {
+public class NotGhostVariant : ProofObligationDescription {
   public override string SuccessDescription =>
     $"in a compiled context, {subject} is not applied to a datatype value of a ghost variant (ghost constructor {ctorNames})";
 
@@ -689,22 +1239,29 @@ public class NotGhostVariant : ProofObligationDescriptionWithNoExpr {
 
   private readonly string subject;
   private readonly string ctorNames;
+  private readonly Expression root;
+  private readonly List<DatatypeCtor> ctors;
 
-  public NotGhostVariant(string subject, List<DatatypeCtor> ctors) {
+  public NotGhostVariant(string subject, Expression root, List<DatatypeCtor> ctors) {
     this.subject = subject;
     this.ctorNames = DatatypeDestructor.PrintableCtorNameList(ctors, "or");
+    this.root = root;
+    this.ctors = ctors;
   }
 
-  public NotGhostVariant(string whatKind, string dtorNames, List<DatatypeCtor> ctors) {
-    this.subject = $"{whatKind} {dtorNames}";
-    this.ctorNames = DatatypeDestructor.PrintableCtorNameList(ctors, "or");
+  public NotGhostVariant(string whatKind, string dtorNames, Expression root, List<DatatypeCtor> ctors)
+  : this($"{whatKind} {dtorNames}", root, ctors) {
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new UnaryOpExpr(Token.NoToken, UnaryOpExpr.Opcode.Not, Utils.MakeIsOneCtorAssertion(root, ctors));
   }
 }
 
 
 //// Misc constraints
 
-public class IndicesInDomain : ProofObligationDescriptionWithNoExpr {
+public class IndicesInDomain : ProofObligationDescription {
   public override string SuccessDescription =>
     $"all {objType} indices are in the domain of the initialization function";
 
@@ -714,13 +1271,24 @@ public class IndicesInDomain : ProofObligationDescriptionWithNoExpr {
   public override string ShortDescription => "indices in domain";
 
   private readonly string objType;
+  private readonly List<Expression> dims;
+  private readonly Expression init;
 
-  public IndicesInDomain(string objType) {
+  public IndicesInDomain(string objType, List<Expression> dims, Expression init) {
+    Contract.Requires(dims is { Count: > 0 });
     this.objType = objType;
+    this.dims = dims;
+    this.init = init;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    Utils.MakeQuantifierVarsForDims(dims, out var indexVars, out var indexVarExprs, out var indicesRange);
+    var precond = new FunctionCallExpr("requires", init, Token.NoToken, Token.NoToken, new ActualBindings(indexVarExprs));
+    return new ForallExpr(Token.NoToken, indexVars, indicesRange, precond, null);
   }
 }
 
-public class SubrangeCheck : ProofObligationDescriptionWithNoExpr {
+public class SubrangeCheck : ProofObligationDescription {
   public override string SuccessDescription =>
     isSubset
       ? $"value always satisfies the subset constraints of '{targetType}'"
@@ -742,18 +1310,27 @@ public class SubrangeCheck : ProofObligationDescriptionWithNoExpr {
   private readonly bool isSubset;
   private readonly bool isCertain;
   private readonly string cause;
+  private readonly Expression check;
 
-  public SubrangeCheck(string prefix, string sourceType, string targetType, bool isSubset, bool isCertain, [CanBeNull] string cause) {
+  public SubrangeCheck(
+    string prefix, string sourceType, string targetType,
+    bool isSubset, bool isCertain, [CanBeNull] string cause, [CanBeNull] Expression check
+  ) {
     this.prefix = prefix;
     this.sourceType = sourceType;
     this.targetType = targetType;
     this.isSubset = isSubset;
     this.isCertain = isCertain;
     this.cause = cause is null ? "" : $" (possible cause: {cause})";
+    this.check = check;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return check;
   }
 }
 
-public class WitnessCheck : ProofObligationDescriptionWithNoExpr {
+public class WitnessCheck : ProofObligationDescription {
   public override string SuccessDescription =>
     "type is inhabited";
 
@@ -764,17 +1341,25 @@ witnessString is null
 
   public override string ShortDescription => "witness check";
 
+  public override bool ProvedOutsideUserCode => true;
+
   private readonly string errMsg = "cannot find witness that shows type is inhabited";
   private readonly string hintMsg =
     "; try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type";
   private readonly string witnessString;
+  [CanBeNull] private readonly Expression witnessExpr;
 
-  public WitnessCheck(string witnessString) {
+  public WitnessCheck(string witnessString, Expression witnessExpr = null) {
     this.witnessString = witnessString;
+    this.witnessExpr = witnessExpr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return witnessExpr ?? base.GetAssertedExpr(options);
   }
 }
 
-public class PrefixEqualityLimit : ProofObligationDescriptionWithNoExpr {
+public class PrefixEqualityLimit : ProofObligationDescription {
   public override string SuccessDescription =>
     "prefix-equality limit is at least 0";
 
@@ -782,9 +1367,19 @@ public class PrefixEqualityLimit : ProofObligationDescriptionWithNoExpr {
     "prefix-equality limit must be at least 0";
 
   public override string ShortDescription => "prefix-equality limit";
+
+  private readonly Expression expr;
+
+  public PrefixEqualityLimit(Expression expr) {
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Le, new LiteralExpr(Token.NoToken, 0), expr);
+  }
 }
 
-public class ForRangeBoundsValid : ProofObligationDescriptionWithNoExpr {
+public class ForRangeBoundsValid : ProofObligationDescription {
   public override string SuccessDescription =>
     "lower bound does not exceed upper bound";
 
@@ -792,9 +1387,21 @@ public class ForRangeBoundsValid : ProofObligationDescriptionWithNoExpr {
     "lower bound must not exceed upper bound";
 
   public override string ShortDescription => "for range bounds";
+
+  private readonly Expression lo;
+  private readonly Expression hi;
+
+  public ForRangeBoundsValid(Expression lo, Expression hi) {
+    this.lo = lo;
+    this.hi = hi;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new BinaryExpr(lo.Origin, BinaryExpr.Opcode.Le, lo, hi);
+  }
 }
 
-public class ForRangeAssignable : ProofObligationDescriptionWithNoExpr {
+public class ForRangeAssignable : ProofObligationDescription {
   public override string SuccessDescription =>
     "entire range is assignable to index variable";
 
@@ -804,31 +1411,19 @@ public class ForRangeAssignable : ProofObligationDescriptionWithNoExpr {
   public override string ShortDescription => "for range assignable";
 
   private readonly ProofObligationDescription desc;
+  private readonly Expression expr;
 
-  public ForRangeAssignable(ProofObligationDescription desc) {
+  public ForRangeAssignable(ProofObligationDescription desc, Expression expr) {
     this.desc = desc;
+    this.expr = expr;
   }
-}
-
-public class ValidInRecursion : ProofObligationDescriptionWithNoExpr {
-  public override string SuccessDescription =>
-    $"{what} is valid in recursive setting";
 
-  public override string FailureDescription =>
-    $"cannot use {what} in recursive setting.{hint ?? ""}";
-
-  public override string ShortDescription => "valid in recursion";
-
-  private readonly string what;
-  private readonly string hint;
-
-  public ValidInRecursion(string what, string hint) {
-    this.what = what;
-    this.hint = hint;
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
   }
 }
 
-public class IsNonRecursive : ProofObligationDescriptionWithNoExpr {
+public class IsNonRecursive : ProofObligationDescription {
   public override string SuccessDescription =>
     "default value is non-recursive";
 
@@ -838,14 +1433,39 @@ public class IsNonRecursive : ProofObligationDescriptionWithNoExpr {
   public override string ShortDescription => "default nonrecursive";
 }
 
-public class ForallLHSUnique : ProofObligationDescriptionWithNoExpr {
+public class ForallLHSUnique : ProofObligationDescription {
   public override string SuccessDescription =>
-    "left-hand sides of forall-statement bound variables are unique";
+    "left-hand sides of forall-statement bound variables are unique (or right-hand sides are equivalent)";
 
   public override string FailureDescription =>
-    "left-hand sides for different forall-statement bound variables might refer to the same location";
+    "left-hand sides for different forall-statement bound variables might refer to the same location (and right-hand sides might not be equivalent)";
 
   public override string ShortDescription => "forall bound unique";
+
+  private readonly List<BoundVar> bvars;
+  private readonly Expression range;
+  private readonly List<Expression> lhsComponents;
+  private readonly Expression rhs;
+
+  public ForallLHSUnique(List<BoundVar> bvars, Expression range, List<Expression> lhsComponents, Expression rhs) {
+    this.bvars = bvars;
+    this.range = range;
+    this.lhsComponents = lhsComponents;
+    this.rhs = rhs;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    MakePrimedBoundVarsAndRange(bvars, range, out var primedVars, out var sub, out var combinedRange);
+    var combinedVars = bvars.Concat(primedVars).ToList();
+    var condition = lhsComponents
+      // either at least one LHS component is distinct...
+      .Select(lhs => new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Neq, lhs, sub.Substitute(lhs)))
+      // ... or the RHS is always the same
+      .Append(new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Eq, rhs, sub.Substitute(rhs)))
+      .Aggregate((acc, disjunct) => new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Or, acc, disjunct));
+
+    return new ForallExpr(Token.NoToken, combinedVars, combinedRange, condition, null);
+  }
 }
 
 public class ElementInDomain : ProofObligationDescription {
@@ -864,29 +1484,35 @@ public ElementInDomain(Expression sequence, Expression index) {
     this.index = index;
   }
   public override Expression GetAssertedExpr(DafnyOptions options) {
-    return new BinaryExpr(sequence.tok, BinaryExpr.Opcode.In,
+    return new BinaryExpr(sequence.Origin, BinaryExpr.Opcode.In,
       index,
       sequence
     );
   }
 }
 
-public class DefiniteAssignment : ProofObligationDescriptionWithNoExpr {
+public class DefiniteAssignment : ProofObligationDescription {
   public override string SuccessDescription =>
-    $"{what}, which is subject to definite-assignment rules, is always initialized {where}";
+    $"{kind} '{name}', which is subject to definite-assignment rules, is always initialized {where}";
 
   public override string FailureDescription =>
-    $"{what}, which is subject to definite-assignment rules, might be uninitialized {where}";
+    $"{kind} '{name}', which is subject to definite-assignment rules, might be uninitialized {where}";
 
   public override string ShortDescription => "definite assignment";
 
-  private readonly string what;
+  private readonly string kind;
+  private readonly string name;
   private readonly string where;
 
-  public DefiniteAssignment(string what, string where) {
-    this.what = what;
+  public DefiniteAssignment(string kind, string name, string where) {
+    this.kind = kind;
+    this.name = name;
     this.where = where;
   }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return new UnaryOpExpr(Token.NoToken, UnaryOpExpr.Opcode.Assigned, new IdentifierExpr(Token.NoToken, name));
+  }
 }
 
 public class InRange : ProofObligationDescription {
@@ -911,20 +1537,20 @@ public InRange(Expression sequence, Expression index, bool upperExcluded, string
   public override Expression GetAssertedExpr(DafnyOptions options) {
     if (sequence.Type is SeqType || sequence.Type.IsArrayType) {
       Expression bound = sequence.Type.IsArrayType ?
-          new MemberSelectExpr(sequence.tok, sequence, "Length" + (dimension >= 0 ? "" + dimension : ""))
-        : new UnaryOpExpr(sequence.tok, UnaryOpExpr.Opcode.Cardinality, sequence);
-      return new ChainingExpression(sequence.tok, new List<Expression>() {
-        new LiteralExpr(sequence.tok, 0),
+          new MemberSelectExpr(sequence.Origin, sequence, new Name("Length" + (dimension >= 0 ? "" + dimension : "")))
+        : new UnaryOpExpr(sequence.Origin, UnaryOpExpr.Opcode.Cardinality, sequence);
+      return new ChainingExpression(sequence.Origin, new List<Expression>() {
+        new LiteralExpr(sequence.Origin, 0),
         index,
         bound
       }, new List<BinaryExpr.Opcode>() {
         BinaryExpr.Opcode.Le,
         upperExcluded ? BinaryExpr.Opcode.Lt : BinaryExpr.Opcode.Le
-      }, new List<IToken>() { Token.NoToken, Token.NoToken },
+      }, new List<IOrigin>() { Token.NoToken, Token.NoToken },
         new List<Expression>() { null, null });
     }
 
-    return new BinaryExpr(sequence.tok, BinaryExpr.Opcode.In,
+    return new BinaryExpr(sequence.Origin, BinaryExpr.Opcode.In,
       index,
       sequence
     );
@@ -953,18 +1579,18 @@ public SequenceSelectRangeValid(Expression sequence, Expression lowerBound, Expr
   }
 
   public override Expression GetAssertedExpr(DafnyOptions options) {
-    return new ChainingExpression(sequence.tok, new List<Expression>() {
+    return new ChainingExpression(sequence.Origin, new List<Expression>() {
       lowerBound,
       upperBound,
-      new UnaryOpExpr(sequence.tok, UnaryOpExpr.Opcode.Cardinality, sequence)
+      new UnaryOpExpr(sequence.Origin, UnaryOpExpr.Opcode.Cardinality, sequence)
     }, new List<BinaryExpr.Opcode>() {
       BinaryExpr.Opcode.Le,
       BinaryExpr.Opcode.Le
-    }, new List<IToken>() { Token.NoToken, Token.NoToken }, new List<Expression>() { null, null });
+    }, new List<IOrigin>() { Token.NoToken, Token.NoToken }, new List<Expression>() { null, null });
   }
 }
 
-public class ComprehensionNoAlias : ProofObligationDescriptionWithNoExpr {
+public class ComprehensionNoAlias : ProofObligationDescription {
   public override string SuccessDescription =>
     "key expressions refer to unique values";
 
@@ -972,9 +1598,31 @@ public class ComprehensionNoAlias : ProofObligationDescriptionWithNoExpr {
     "key expressions might be referring to the same value";
 
   public override string ShortDescription => "unique key expressions";
+
+  private readonly List<BoundVar> bvars;
+  private readonly Expression range;
+  private readonly Expression key;
+  private readonly Expression value;
+
+  public ComprehensionNoAlias(List<BoundVar> bvars, Expression range, Expression key, Expression value) {
+    this.bvars = bvars;
+    this.range = range;
+    this.key = key;
+    this.value = value;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    MakePrimedBoundVarsAndRange(bvars, range, out var primedVars, out var sub, out var combinedRange);
+    var combinedVars = bvars.Concat(primedVars).ToList();
+    var condition = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Or,
+      new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Neq, key, sub.Substitute(key)),
+      new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Eq, value, sub.Substitute(value))
+    );
+    return new ForallExpr(Token.NoToken, combinedVars, combinedRange, condition, null);
+  }
 }
 
-public class DistinctLHS : ProofObligationDescriptionWithNoExpr {
+public class DistinctLHS : ProofObligationDescription {
   public override string SuccessDescription =>
     $"left-hand sides {lhsa} and {lhsb} are distinct";
 
@@ -988,17 +1636,23 @@ public class DistinctLHS : ProofObligationDescriptionWithNoExpr {
   private readonly string might;
   private readonly string when;
   private readonly string whenSuffix;
+  private readonly Expression expr;
 
-  public DistinctLHS(string lhsa, string lhsb, bool useMight, bool useWhen) {
+  public DistinctLHS(string lhsa, string lhsb, bool useMight, bool useWhen, Expression expr) {
     this.lhsa = lhsa;
     this.lhsb = lhsb;
     this.might = useMight ? "might " : "";
     this.when = useWhen ? "when " : "";
     this.whenSuffix = useWhen ? ", they must be assigned the same value" : "";
+    this.expr = expr;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    return expr;
   }
 }
 
-public class ArrayInitSizeValid : ProofObligationDescriptionWithNoExpr {
+public class ArrayInitSizeValid : ProofObligationDescription {
   public override string SuccessDescription =>
     $"given array size agrees with the number of expressions in the initializing display ({size})";
 
@@ -1007,14 +1661,22 @@ public class ArrayInitSizeValid : ProofObligationDescriptionWithNoExpr {
 
   public override string ShortDescription => "array initializer size";
 
-  private readonly int size;
+  private readonly TypeRhs rhs;
+  private readonly Expression dim;
+  private int size => rhs.InitDisplay.Count;
+
+  public ArrayInitSizeValid(TypeRhs rhs, Expression dim) {
+    this.rhs = rhs;
+    this.dim = dim;
+  }
 
-  public ArrayInitSizeValid(int size) {
-    this.size = size;
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    var initDisplaySize = new UnaryOpExpr(rhs.Origin, UnaryOpExpr.Opcode.Cardinality, new SeqDisplayExpr(rhs.Origin, rhs.InitDisplay));
+    return new BinaryExpr(dim.Origin, BinaryExpr.Opcode.Eq, dim, initDisplaySize);
   }
 }
 
-public class ArrayInitEmpty : ProofObligationDescriptionWithNoExpr {
+public class ArrayInitEmpty : ProofObligationDescription {
   public override string SuccessDescription =>
     "array initializer has empty size";
 
@@ -1024,9 +1686,25 @@ public class ArrayInitEmpty : ProofObligationDescriptionWithNoExpr {
   public override string ShortDescription => "array initializer empty";
 
   private readonly string typeDesc;
+  private readonly ImmutableList<Expression> dims;
 
-  public ArrayInitEmpty(string typeDesc) {
+  public ArrayInitEmpty(string typeDesc, List<Expression> dims) {
     this.typeDesc = typeDesc;
+    this.dims = dims.ToImmutableList();
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    Expression zero = Expression.CreateIntLiteral(dims[0].Origin, 0);
+    Expression zeroSize = new BinaryExpr(dims[0].Origin, BinaryExpr.Opcode.Eq, dims[0], zero);
+    foreach (Expression dim in dims.Skip(1)) {
+      zeroSize = new BinaryExpr(
+        dim.Origin,
+        BinaryExpr.Opcode.Or,
+        zeroSize,
+        new BinaryExpr(dim.Origin, BinaryExpr.Opcode.Eq, dim, zero)
+      );
+    }
+    return zeroSize;
   }
 }
 
@@ -1046,14 +1724,9 @@ public LetSuchThatUnique(Expression condition, List<BoundVar> bvars) {
     this.bvars = bvars;
   }
   public override Expression GetAssertedExpr(DafnyOptions options) {
-    var bvarsExprs = bvars.Select(bvar => new IdentifierExpr(bvar.tok, bvar)).ToList();
-    var bvarprimes = bvars.Select(bvar => new BoundVar(Token.NoToken, bvar.DafnyName + "'", bvar.Type)).ToList();
-    var bvarprimesExprs = bvarprimes.Select(ToSubstitutableExpression).ToList();
-    var subContract = new Substituter(null,
-      Enumerable.Zip(bvars, bvarprimesExprs).ToDictionary<(BoundVar, Expression), IVariable, Expression>(
-        item => item.Item1, item => item.Item2),
-      new Dictionary<TypeParameter, Type>()
-    );
+    var bvarsExprs = bvars.Select(bvar => new IdentifierExpr(bvar.Origin, bvar)).ToList();
+    var substMap = MakePrimedBoundVarSubstMap(bvars, out var bvarprimes, out var bvarprimesExprs);
+    var subContract = new Substituter(null, substMap, new Dictionary<TypeParameter, Type>());
     var conditionSecondBoundVar = subContract.Substitute(condition);
     var conclusion = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Eq, bvarsExprs[0], bvarprimesExprs[0]);
     for (var i = 1; i < bvarsExprs.Count; i++) {
@@ -1062,7 +1735,7 @@ public override Expression GetAssertedExpr(DafnyOptions options) {
         new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Eq, bvarsExprs[i], bvarprimesExprs[i])
         );
     }
-    return new ForallExpr(Token.NoToken, RangeToken.NoToken, bvars.Concat(bvarprimes).ToList(),
+    return new ForallExpr(Token.NoToken, bvars.Concat(bvarprimes).ToList(),
       new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, condition, conditionSecondBoundVar),
 
       conclusion, null);
@@ -1086,12 +1759,12 @@ public LetSuchThatExists(List<BoundVar> bvars, Expression condition) {
     this.bvars = bvars;
   }
   public override Expression GetAssertedExpr(DafnyOptions options) {
-    return new ExistsExpr(bvars[0].tok, bvars[0].RangeToken, bvars,
+    return new ExistsExpr(bvars[0].Origin, bvars,
       null, condition, null);
   }
 }
 
-public class AssignmentShrinks : ProofObligationDescriptionWithNoExpr {
+public class AssignmentShrinks : ProofObligationDescription {
   public override string SuccessDescription =>
     $"the assignment to {fieldName} always shrinks the set";
 
@@ -1100,11 +1773,53 @@ public class AssignmentShrinks : ProofObligationDescriptionWithNoExpr {
 
   public override string ShortDescription => "assignment shrinks";
 
+  private readonly Expression receiver;
   private readonly string fieldName;
 
-  public AssignmentShrinks(string fieldName) {
+  public AssignmentShrinks(Expression receiver, string fieldName) {
+    this.receiver = receiver;
     this.fieldName = fieldName;
   }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    var receiverDotField = new ExprDotName(Token.NoToken, receiver, new Name(fieldName), null);
+    return new BinaryExpr(
+      Token.NoToken,
+      BinaryExpr.Opcode.And,
+      new OldExpr(Token.NoToken, new UnaryOpExpr(Token.NoToken, UnaryOpExpr.Opcode.Allocated, receiver)),
+      new BinaryExpr(Token.NoToken, BinaryExpr.ResolvedOpcode.Subset, receiverDotField, new OldExpr(Token.NoToken, receiverDotField))
+    );
+  }
+}
+
+public class ConcurrentFrameEmpty : ProofObligationDescription {
+  public override string SuccessDescription =>
+    $"{frameName} clause is empty ({{:concurrent}} restriction)";
+
+  public override string FailureDescription =>
+    $"{frameName} clause could not be proved to be empty ({{:concurrent}} restriction)";
+
+  public override string ShortDescription => "concurrency safety";
+
+  public override bool ProvedOutsideUserCode => true;
+
+  private readonly MethodOrFunction decl;
+  private readonly string frameName;
+
+  public ConcurrentFrameEmpty(MethodOrFunction decl, string frameName) {
+    this.decl = decl;
+    this.frameName = frameName;
+  }
+
+  public override Expression GetAssertedExpr(DafnyOptions options) {
+    var bvars = decl.Ins.Select(formal => new BoundVar(formal.Origin, formal.Name, formal.Type)).ToList();
+    var func = new ExprDotName(Token.NoToken, new NameSegment(Token.NoToken, decl.Name, null), new Name(frameName), null);
+    var args = bvars.Select(bvar => new IdentifierExpr(Token.NoToken, bvar) as Expression).ToList();
+    var call = new ApplyExpr(Token.NoToken, func, args, Token.NoToken);
+    var isEmpty = new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Eq, call,
+      new SetDisplayExpr(Token.NoToken, true, new()));
+    return new ForallExpr(Token.NoToken, bvars, null, isEmpty, null);
+  }
 }
 
 public class BoilerplateTriple : ProofObligationDescriptionCustomMessages {
@@ -1119,3 +1834,140 @@ public BoilerplateTriple(string errorMessage, string successMessage, string comm
     this.DefaultFailureDescription = comment;
   }
 }
+
+internal class Utils {
+  public static Expression MakeCharBoundsCheck(DafnyOptions options, Expression expr) {
+    return options.Get(CommonOptionBag.UnicodeCharacters)
+      ? MakeCharBoundsCheckUnicode(expr)
+      : MakeCharBoundsCheckNonUnicode(expr);
+  }
+
+  public static Expression MakeCharBoundsCheckNonUnicode(Expression expr) {
+    return new BinaryExpr(
+      expr.Origin,
+      BinaryExpr.Opcode.And,
+      new BinaryExpr(
+        expr.Origin, BinaryExpr.Opcode.Le, Expression.CreateIntLiteral(Token.NoToken, 0), expr),
+      new BinaryExpr(
+        expr.Origin, BinaryExpr.Opcode.Lt, expr, Expression.CreateIntLiteral(expr.Origin, 0x1_0000))
+    );
+  }
+
+  public static Expression MakeCharBoundsCheckUnicode(Expression expr) {
+    Expression lowRange = new BinaryExpr(
+      expr.Origin,
+      BinaryExpr.Opcode.And,
+      new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Le, Expression.CreateIntLiteral(Token.NoToken, 0), expr),
+      new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Lt, expr, Expression.CreateIntLiteral(expr.Origin, 0xD800))
+    );
+    Expression highRange = new BinaryExpr(
+      expr.Origin,
+      BinaryExpr.Opcode.And,
+      new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Le, Expression.CreateIntLiteral(Token.NoToken, 0xE000), expr),
+      new BinaryExpr(expr.Origin, BinaryExpr.Opcode.Lt, expr, Expression.CreateIntLiteral(expr.Origin, 0x11_0000))
+    );
+    return new BinaryExpr(lowRange.Origin, BinaryExpr.Opcode.Or, lowRange, highRange);
+  }
+
+  public static void MakeQuantifierVarsForDims(List<Expression> dims, out List<BoundVar> vars, out List<Expression> varExprs, out Expression range) {
+    var zero = new LiteralExpr(Token.NoToken, 0);
+    vars = dims.Select((_, i) => new BoundVar("i" + i, Type.Int)).ToList();
+
+    // can't assign to out-param immediately, since it's accessed in the lambda below
+    var tempVarExprs = vars.Select(var => new IdentifierExpr(Token.NoToken, var) as Expression).ToList();
+    var indexRanges = dims.Select((dim, i) => new ChainingExpression(
+      Token.NoToken,
+      new() { zero, tempVarExprs[i], dim },
+      new() { BinaryExpr.Opcode.Le, BinaryExpr.Opcode.Lt },
+      new() { Token.NoToken, Token.NoToken },
+      new() { null, null }
+    ) as Expression).ToList();
+    varExprs = tempVarExprs;
+
+    range = dims.Count == 1 ? indexRanges[0] : new ChainingExpression(
+      Token.NoToken,
+      indexRanges,
+      Enumerable.Repeat(BinaryExpr.Opcode.And, dims.Count - 1).ToList(),
+      Enumerable.Repeat((IOrigin)Token.NoToken, dims.Count - 1).ToList(),
+      Enumerable.Repeat(null as Expression, dims.Count - 1).ToList()
+    );
+  }
+
+  internal static Expression MakeIsOneCtorAssertion(Expression root, List<DatatypeCtor> ctors) {
+    return ctors
+      .Select(ctor => new ExprDotName(Token.NoToken, root, ctor.NameNode.Append("?"), null) as Expression)
+      .Aggregate((e0, e1) => new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Or, e0, e1));
+  }
+
+  /// <summary>
+  /// Builds an expression that represents whether (the relevant subset of) the given `supersetFrames`
+  /// permit read/modification access to all objects, arrays, and/or sets of objects/arrays in the `subsetFrames`.
+  /// </summary>
+  public static Expression MakeDafnyMultiFrameCheck(List<FrameExpression> supersetFrames, List<FrameExpression> subsetFrames) {
+    if (subsetFrames.Count == 0) {
+      return null;
+    }
+    return subsetFrames
+      .Select(target => MakeDafnyFrameCheck(supersetFrames, target.E, target.Field))
+      .Aggregate((e0, e1) => new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, e0, e1));
+  }
+
+  /// <summary>
+  /// Builds an expression that represents whether (the relevant subset of) the given frames
+  /// permit read/modification access to an object/array (or set of objects/arrays).
+  /// </summary>
+  public static Expression MakeDafnyFrameCheck(List<FrameExpression> frames, Expression objOrObjSet, Field field) {
+    if (frames.Any(frame => frame.E is WildcardExpr)) {
+      return new LiteralExpr(Token.NoToken, true);
+    }
+
+    Type objType;
+    BoundVar objVar;
+    Expression objOperand;
+    var isSetObj = objOrObjSet.Type.AsSetType != null;
+    if (isSetObj) {
+      objType = objOrObjSet.Type.AsSetType.Arg;
+      objVar = new BoundVar(Token.NoToken, "obj", objType);
+      objOperand = new IdentifierExpr(Token.NoToken, objVar);
+    } else {
+      objType = objOrObjSet.Type;
+      objVar = null;
+      objOperand = objOrObjSet;
+    }
+
+    var disjuncts = new List<Expression>();
+    foreach (var frame in frames) {
+      var isSetFrame = frame.E.Type.AsSetType != null;
+      var frameObjType = isSetFrame ? frame.E.Type.AsSetType.Arg : frame.E.Type;
+      var isTypeRelated =
+        objType.IsSubtypeOf(frameObjType, false, false) ||
+        frameObjType.IsSubtypeOf(objType, false, false);
+      var isFieldRelated = field == null || frame.Field == null || field.Name.Equals(frame.Field.Name);
+      if (!(isTypeRelated && isFieldRelated)) {
+        continue;
+      }
+
+      var relationOp = isSetFrame ? BinaryExpr.Opcode.In : BinaryExpr.Opcode.Eq;
+      disjuncts.Add(new BinaryExpr(Token.NoToken, relationOp, objOperand, frame.E));
+    }
+
+    if (disjuncts.Count == 0) {
+      var emptySet = new SetDisplayExpr(Token.NoToken, true, new());
+      disjuncts.Add(new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.In, objOperand, emptySet));
+    }
+
+    var check = disjuncts.Aggregate((e0, e1) =>
+      new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Or, e0, e1));
+    if (!isSetObj) {
+      return check;
+    }
+
+    return new ForallExpr(
+      Token.NoToken,
+      new() { objVar },
+      new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.In, objOperand, objOrObjSet),
+      check,
+      null
+    );
+  }
+}
diff --git a/Source/DafnyCore/Verifier/SpecialFieldSubstituter.cs b/Source/DafnyCore/Verifier/SpecialFieldSubstituter.cs
new file mode 100644
index 00000000000..d2d302ae934
--- /dev/null
+++ b/Source/DafnyCore/Verifier/SpecialFieldSubstituter.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace Microsoft.Dafny {
+  /**
+   * A substituter for references to special fields (like out-params) in method specifications.
+   */
+  internal class SpecialFieldSubstituter : Substituter {
+    private readonly Dictionary<string, Expression> fieldMap;
+
+    internal SpecialFieldSubstituter(Dictionary<string, Expression> fieldMap)
+      : base(null, new(), new()) {
+      this.fieldMap = fieldMap;
+    }
+
+    public override Expression Substitute(Expression expr) {
+      if (expr is MemberSelectExpr {
+        Obj: ThisExpr,
+        Member: SpecialField {
+          SpecialId: SpecialField.ID.UseIdParam,
+          IdParam: string idParam
+        }
+      } && fieldMap.TryGetValue(idParam, out var replacement)) {
+        return replacement;
+      }
+      return base.Substitute(expr);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/Statements/BlockByProofStmtVerifier.cs b/Source/DafnyCore/Verifier/Statements/BlockByProofStmtVerifier.cs
new file mode 100644
index 00000000000..b0544b71112
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Statements/BlockByProofStmtVerifier.cs
@@ -0,0 +1,24 @@
+using Microsoft.Dafny;
+
+namespace Microsoft.Dafny;
+
+public class BlockByProofStmtVerifier {
+  public static void EmitBoogie(BoogieGenerator generator, BlockByProofStmt block, BoogieStmtListBuilder builder,
+    Variables locals, BoogieGenerator.ExpressionTranslator etran, ICodeContext codeContext) {
+    var proofBuilder = new BoogieStmtListBuilder(generator, builder.Options, builder.Context);
+
+    var previousTrackers = generator.DefiniteAssignmentTrackers;
+    generator.CurrentIdGenerator.Push();
+    generator.TrStmtList(block.Proof.Body, proofBuilder, locals, etran);
+    generator.CurrentIdGenerator.Pop();
+    generator.DefiniteAssignmentTrackers = previousTrackers;
+
+    generator.TrStmt(block.Body, proofBuilder, locals, etran);
+
+    generator.PathAsideBlock(block.Origin, proofBuilder, builder);
+    generator.TrStmt(block.Body, builder.WithContext(builder.Context with {
+      AssertMode = AssertMode.Assume
+    }), locals, etran);
+
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrAssignment.cs b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrAssignment.cs
new file mode 100644
index 00000000000..88bcc354466
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrAssignment.cs
@@ -0,0 +1,555 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
+using Bpl = Microsoft.Boogie;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+
+
+  /// <summary>
+  /// "lhs" is expected to be a resolved form of an expression, i.e., not a concrete-syntax expression.
+  /// </summary>
+  void TrAssignment(Statement stmt, Expression lhs, AssignmentRhs rhs,
+    BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran) {
+    Contract.Requires(stmt != null);
+    Contract.Requires(lhs != null);
+    Contract.Requires(!(lhs is ConcreteSyntaxExpression));
+    Contract.Requires(!(lhs is SeqSelectExpr && !((SeqSelectExpr)lhs).SelectOne));  // these were once allowed, but their functionality is now provided by 'forall' statements
+    Contract.Requires(rhs != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(Predef != null);
+
+    var lhss = new List<Expression>() { lhs };
+    ProcessLhss(lhss, rhs.CanAffectPreviouslyKnownExpressions, true, builder, locals, etran, stmt,
+      out var lhsBuilder, out var bLhss, out var ignore1, out var ignore2, out var ignore3);
+    Contract.Assert(lhsBuilder.Count == 1 && bLhss.Count == 1);  // guaranteed by postcondition of ProcessLhss
+
+    var rhss = new List<AssignmentRhs>() { rhs };
+    ProcessRhss(lhsBuilder, bLhss, lhss, rhss, builder, locals, etran, stmt);
+    builder.AddCaptureState(stmt);
+  }
+
+  void ProcessRhss(List<AssignToLhs> lhsBuilder, List<Bpl.IdentifierExpr/*may be null*/> bLhss,
+    List<Expression> lhss, List<AssignmentRhs> rhss,
+    BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran, Statement stmt) {
+    Contract.Requires(lhsBuilder != null);
+    Contract.Requires(bLhss != null);
+    Contract.Requires(cce.NonNullElements(lhss));
+    Contract.Requires(cce.NonNullElements(rhss));
+    Contract.Requires(builder != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(Predef != null);
+
+    var finalRhss = new List<Bpl.Expr>();
+    for (int i = 0; i < lhss.Count; i++) {
+      var lhs = lhss[i];
+      // the following assumes are part of the precondition, really
+      Contract.Assume(!(lhs is ConcreteSyntaxExpression));
+      Contract.Assume(!(lhs is SeqSelectExpr && !((SeqSelectExpr)lhs).SelectOne));  // array-range assignments are not allowed
+
+      Type lhsType, rhsTypeConstraint;
+      if (lhs is IdentifierExpr) {
+        var ide = (IdentifierExpr)lhs;
+        lhsType = ide.Var.Type;
+        rhsTypeConstraint = lhsType;
+      } else if (lhs is MemberSelectExpr) {
+        var fse = (MemberSelectExpr)lhs;
+        var field = (Field)fse.Member;
+        Contract.Assert(VisibleInScope(field));
+        lhsType = field.Type;
+        rhsTypeConstraint = lhsType.Subst(fse.TypeArgumentSubstitutionsWithParents());
+      } else if (lhs is SeqSelectExpr) {
+        var e = (SeqSelectExpr)lhs;
+        lhsType = null;  // for an array update, always make sure the value assigned is boxed
+        rhsTypeConstraint = e.Seq.Type.NormalizeExpand().TypeArgs[0];
+      } else {
+        var e = (MultiSelectExpr)lhs;
+        lhsType = null;  // for an array update, always make sure the value assigned is boxed
+        rhsTypeConstraint = e.Array.Type.NormalizeExpand().TypeArgs[0];
+      }
+      var bRhs = TrAssignmentRhs(rhss[i].Origin, bLhss[i], null, lhsType, rhss[i], rhsTypeConstraint, builder, locals, etran, stmt);
+      if (bLhss[i] != null) {
+        Contract.Assert(bRhs == bLhss[i]);  // this is what the postcondition of TrAssignmentRhs promises
+        // assignment has already been done by TrAssignmentRhs
+        finalRhss.Add(null);
+      } else {
+        Contract.Assert(bRhs != null);  // this is what the postcondition of TrAssignmentRhs promises
+        finalRhss.Add(bRhs);
+      }
+    }
+    for (int i = 0; i < lhss.Count; i++) {
+      lhsBuilder[i](finalRhss[i], rhss[i] is HavocRhs, builder, etran);
+    }
+  }
+
+  List<Bpl.Expr> ProcessUpdateAssignRhss(List<Expression> lhss, List<AssignmentRhs> rhss,
+    BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran,
+    Statement stmt) {
+    Contract.Requires(cce.NonNullElements(lhss));
+    Contract.Requires(cce.NonNullElements(rhss));
+    Contract.Requires(builder != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(Predef != null);
+    Contract.Ensures(Contract.ForAll(Contract.Result<List<Bpl.Expr>>(), i => i != null));
+
+    var finalRhss = new List<Bpl.Expr>();
+    for (int i = 0; i < lhss.Count; i++) {
+      var lhs = lhss[i];
+      // the following assumes are part of the precondition, really
+      Contract.Assume(!(lhs is ConcreteSyntaxExpression));
+      Contract.Assume(!(lhs is SeqSelectExpr && !((SeqSelectExpr)lhs).SelectOne));  // array-range assignments are not allowed
+
+      Type lhsType, rhsTypeConstraint;
+      if (lhs is IdentifierExpr) {
+        lhsType = ((IdentifierExpr)lhs).Var.Type;
+        rhsTypeConstraint = lhsType;
+      } else if (lhs is MemberSelectExpr) {
+        var fse = (MemberSelectExpr)lhs;
+        var field = (Field)fse.Member;
+        Contract.Assert(VisibleInScope(field));
+        lhsType = field.Type;
+        rhsTypeConstraint = lhsType.Subst(fse.TypeArgumentSubstitutionsWithParents());
+      } else if (lhs is SeqSelectExpr) {
+        var e = (SeqSelectExpr)lhs;
+        lhsType = null;  // for an array update, always make sure the value assigned is boxed
+        rhsTypeConstraint = e.Seq.Type.NormalizeExpand().TypeArgs[0];
+      } else {
+        var e = (MultiSelectExpr)lhs;
+        lhsType = null;  // for an array update, always make sure the value assigned is boxed
+        rhsTypeConstraint = e.Array.Type.NormalizeExpand().TypeArgs[0];
+      }
+      var bRhs = TrAssignmentRhs(rhss[i].Origin, null, (lhs as IdentifierExpr)?.Var, lhsType, rhss[i], rhsTypeConstraint, builder, locals, etran, stmt);
+      finalRhss.Add(bRhs);
+    }
+    return finalRhss;
+  }
+
+
+  private void CheckLhssDistinctness(List<Bpl.Expr> rhs, List<AssignmentRhs> rhsOriginal, List<Expression> lhss,
+    BoogieStmtListBuilder builder, ExpressionTranslator etran,
+    Bpl.Expr[] objs, Bpl.Expr[] fields, string[] names, Expression originalInitialLhs = null) {
+    Contract.Requires(rhs != null);
+    Contract.Requires(rhsOriginal != null);
+    Contract.Requires(lhss != null);
+    Contract.Requires(rhs.Count == rhsOriginal.Count);
+    Contract.Requires(lhss.Count == rhsOriginal.Count);
+    Contract.Requires(builder != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(Predef != null);
+
+    for (int i = 0; i < lhss.Count; i++) {
+      var lhs = lhss[i];
+      Contract.Assume(!(lhs is ConcreteSyntaxExpression));
+      if (originalInitialLhs != null) {
+        // TODO - check RHS values?
+        AssertDistinctness(lhs, originalInitialLhs, builder, etran);
+      }
+      for (int j = 0; j < i; j++) {
+        if (rhsOriginal[i] is HavocRhs || rhsOriginal[j] is HavocRhs) {
+          AssertDistinctness(lhs, lhss[j], builder, etran);
+        } else {
+          AssertDistinctness(lhs, lhss[j], rhs[i], rhs[j], builder, etran);
+        }
+      }
+    }
+  }
+
+  /// <summary>
+  /// Note, if "rhs" is "null", then the assignment has already been done elsewhere. However, any other bookkeeping
+  /// is still done.
+  /// </summary>
+  delegate void AssignToLhs(Bpl.Expr/*?*/ rhs, bool origRhsIsHavoc, BoogieStmtListBuilder builder, ExpressionTranslator etran);
+
+  void AssertDistinctness(Expression lhsa, Expression lhsb, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+    CheckDistinctness(lhsa, lhsb, etran, out var dExpr, out var bExpr);
+    if (bExpr != null) {
+      builder.Add(Assert(GetToken(lhsa), bExpr, new DistinctLHS(Printer.ExprToString(options, lhsa),
+        Printer.ExprToString(options, lhsb), bExpr != Bpl.Expr.False, false, dExpr), builder.Context));
+    }
+  }
+
+  void AssertDistinctness(Expression lhsa, Expression lhsb, Bpl.Expr rhsa, Bpl.Expr rhsb, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+    CheckDistinctness(lhsa, lhsb, etran, out var dExpr, out var bExpr);
+    if (bExpr != null) {
+      bExpr = BplOr(bExpr, Bpl.Expr.Eq(rhsa, rhsb));
+      builder.Add(Assert(GetToken(lhsa), bExpr, new DistinctLHS(Printer.ExprToString(options, lhsa),
+        Printer.ExprToString(options, lhsb), false, true, dExpr), builder.Context));
+    }
+  }
+
+  /// <summary>
+  /// Creates a list of protected Boogie LHSs for the given Dafny LHSs.  Along the way,
+  /// builds code that checks that the LHSs are well-defined,
+  /// and are allowed by the enclosing reads and modifies clause.
+  /// Checks that they denote different locations iff checkDistinctness is true.
+  /// </summary>
+  void ProcessLhss(List<Expression> lhss, bool rhsCanAffectPreviouslyKnownExpressions, bool checkDistinctness,
+    BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran, Statement stmt,
+    out List<AssignToLhs> lhsBuilders, out List<Bpl.IdentifierExpr/*may be null*/> bLhss,
+    out Bpl.Expr[] prevObj, out Bpl.Expr[] prevIndex, out string[] prevNames, Expression originalInitialLhs = null) {
+
+    Contract.Requires(cce.NonNullElements(lhss));
+    Contract.Requires(builder != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(Predef != null);
+    Contract.Ensures(Contract.ValueAtReturn(out lhsBuilders).Count == lhss.Count);
+    Contract.Ensures(Contract.ValueAtReturn(out lhsBuilders).Count == Contract.ValueAtReturn(out bLhss).Count);
+
+    rhsCanAffectPreviouslyKnownExpressions = rhsCanAffectPreviouslyKnownExpressions || lhss.Count != 1;
+
+    // for each Dafny LHS, build a protected Boogie LHS for the eventual assignment
+    lhsBuilders = new List<AssignToLhs>();
+    bLhss = new List<Bpl.IdentifierExpr>();
+    prevObj = new Bpl.Expr[lhss.Count];
+    prevIndex = new Bpl.Expr[lhss.Count];
+    prevNames = new string[lhss.Count];
+    int i = 0;
+
+    var lhsNameSet = new Dictionary<string, object>();
+
+    var contextModFrames = GetContextModifiesFrames();
+
+    // Note, the resolver does not check for duplicate IdentifierExpr's in LHSs, so do it here.
+    foreach (var lhs in lhss) {
+      Contract.Assume(!(lhs is ConcreteSyntaxExpression));
+      if (checkDistinctness) {
+        if (originalInitialLhs != null) {
+          AssertDistinctness(lhs, originalInitialLhs.Resolved, builder, etran);
+        }
+        for (int j = 0; j < i; j++) {
+          AssertDistinctness(lhs, lhss[j], builder, etran);
+        }
+      }
+      i++;
+    }
+
+    i = 0;
+    foreach (var lhs in lhss) {
+      IOrigin tok = lhs.Origin;
+      TrStmt_CheckWellformed(lhs, builder, locals, etran, true, true);
+
+      if (lhs is IdentifierExpr) {
+        var ie = (IdentifierExpr)lhs;
+        prevNames[i] = ie.Name;
+        var bLhs = (Bpl.IdentifierExpr)etran.TrExpr(lhs);  // TODO: is this cast always justified?
+        bLhss.Add(rhsCanAffectPreviouslyKnownExpressions ? null : bLhs);
+        lhsBuilders.Add(delegate (Bpl.Expr rhs, bool origRhsIsHavoc, BoogieStmtListBuilder bldr, ExpressionTranslator et) {
+          if (rhs != null) {
+            var cmd = Bpl.Cmd.SimpleAssign(tok, bLhs, rhs);
+            proofDependencies?.AddProofDependencyId(cmd, lhs.Origin, new AssignmentDependency(stmt.Origin));
+            bldr.Add(cmd);
+          }
+
+          if (!origRhsIsHavoc || ie.Type.HavocCountsAsDefiniteAssignment(ie.Var.IsGhost)) {
+            MarkDefiniteAssignmentTracker(ie, bldr);
+          }
+        });
+
+      } else if (lhs is MemberSelectExpr) {
+        var fse = (MemberSelectExpr)lhs;
+        var field = fse.Member as Field;
+        Contract.Assert(field != null);
+        Contract.Assert(VisibleInScope(field));
+
+        var useSurrogateLocal = inBodyInitContext && Expression.AsThis(fse.Obj) != null;
+
+        var obj = SaveInTemp(etran.TrExpr(fse.Obj), rhsCanAffectPreviouslyKnownExpressions,
+          "$obj" + i, Predef.RefType, builder, locals);
+        prevObj[i] = obj;
+        if (!useSurrogateLocal) {
+          // check that the enclosing modifies clause allows this object to be written:  assert $_ModifiesFrame[obj]);
+          var desc = new Modifiable("an object", contextModFrames, fse.Obj, field);
+          builder.Add(Assert(tok, Bpl.Expr.SelectTok(tok, etran.ModifiesFrame(tok), obj, GetField(fse)), desc, builder.Context));
+        }
+
+        if (useSurrogateLocal) {
+          var nm = SurrogateName(field);
+          var bLhs = new Bpl.IdentifierExpr(fse.Origin, nm, TrType(field.Type));
+          bLhss.Add(rhsCanAffectPreviouslyKnownExpressions ? null : bLhs);
+          lhsBuilders.Add(delegate (Bpl.Expr rhs, bool origRhsIsHavoc, BoogieStmtListBuilder bldr, ExpressionTranslator et) {
+            if (rhs != null) {
+              var cmd = Bpl.Cmd.SimpleAssign(tok, bLhs, rhs);
+              proofDependencies?.AddProofDependencyId(cmd, fse.Origin, new AssignmentDependency(stmt.Origin));
+              bldr.Add(cmd);
+            }
+
+            if (!origRhsIsHavoc || field.Type.HavocCountsAsDefiniteAssignment(field.IsGhost)) {
+              MarkDefiniteAssignmentTracker(lhs.Origin, nm, bldr);
+            }
+          });
+        } else {
+          bLhss.Add(null);
+          lhsBuilders.Add(delegate (Bpl.Expr rhs, bool origRhsIsHavoc, BoogieStmtListBuilder bldr, ExpressionTranslator et) {
+            if (rhs != null) {
+              var fseField = fse.Member as Field;
+              Contract.Assert(fseField != null);
+              Check_NewRestrictions(tok, fse.Obj, obj, fseField, rhs, bldr, et);
+              var h = (Bpl.IdentifierExpr)et.HeapExpr;  // TODO: is this cast always justified?
+              var cmd = Bpl.Cmd.SimpleAssign(tok, h, UpdateHeap(tok, h, obj, new Bpl.IdentifierExpr(tok, GetField(fseField)), rhs));
+              proofDependencies?.AddProofDependencyId(cmd, lhs.Origin, new AssignmentDependency(stmt.Origin));
+              bldr.Add(cmd);
+              // assume $IsGoodHeap($Heap);
+              bldr.Add(AssumeGoodHeap(tok, et));
+            }
+          });
+        }
+
+      } else if (lhs is SeqSelectExpr) {
+        SeqSelectExpr sel = (SeqSelectExpr)lhs;
+        Contract.Assert(sel.SelectOne);  // array-range assignments are not allowed
+        Contract.Assert(sel.Seq.Type != null && sel.Seq.Type.IsArrayType);
+        Contract.Assert(sel.E0 != null);
+        var obj = SaveInTemp(etran.TrExpr(sel.Seq), rhsCanAffectPreviouslyKnownExpressions,
+          "$obj" + i, Predef.RefType, builder, locals);
+        var idx = etran.TrExpr(sel.E0);
+        idx = ConvertExpression(sel.E0.Origin, idx, sel.E0.Type, Type.Int);
+        var fieldName = SaveInTemp(FunctionCall(tok, BuiltinFunction.IndexField, null, idx), rhsCanAffectPreviouslyKnownExpressions,
+          "$index" + i, Predef.FieldName(tok), builder, locals);
+        prevObj[i] = obj;
+        prevIndex[i] = fieldName;
+        // check that the enclosing modifies clause allows this object to be written:  assert $_Frame[obj,index]);
+        var desc = new Modifiable("an array element", contextModFrames, sel.Seq, null);
+        builder.Add(Assert(tok, Bpl.Expr.SelectTok(tok, etran.ModifiesFrame(tok), obj, fieldName), desc, builder.Context));
+
+        bLhss.Add(null);
+        lhsBuilders.Add(delegate (Bpl.Expr rhs, bool origRhsIsHavoc, BoogieStmtListBuilder bldr, ExpressionTranslator et) {
+          if (rhs != null) {
+            var h = (Bpl.IdentifierExpr)et.HeapExpr;  // TODO: is this cast always justified?
+            var cmd = Bpl.Cmd.SimpleAssign(tok, h, UpdateHeap(tok, h, obj, fieldName, rhs));
+            proofDependencies?.AddProofDependencyId(cmd, lhs.Origin, new AssignmentDependency(stmt.Origin));
+            bldr.Add(cmd);
+            // assume $IsGoodHeap($Heap);
+            bldr.Add(AssumeGoodHeap(tok, et));
+          }
+        });
+
+      } else {
+        MultiSelectExpr mse = (MultiSelectExpr)lhs;
+        Contract.Assert(mse.Array.Type != null && mse.Array.Type.IsArrayType);
+
+        var obj = SaveInTemp(etran.TrExpr(mse.Array), rhsCanAffectPreviouslyKnownExpressions,
+          "$obj" + i, Predef.RefType, builder, locals);
+        var fieldName = SaveInTemp(etran.GetArrayIndexFieldName(mse.Origin, mse.Indices), rhsCanAffectPreviouslyKnownExpressions,
+          "$index" + i, Predef.FieldName(mse.Origin), builder, locals);
+        prevObj[i] = obj;
+        prevIndex[i] = fieldName;
+        var desc = new Modifiable("an array element", contextModFrames, mse.Array, null);
+        builder.Add(Assert(tok, Bpl.Expr.SelectTok(tok, etran.ModifiesFrame(tok), obj, fieldName), desc, builder.Context));
+
+        bLhss.Add(null);
+        lhsBuilders.Add(delegate (Bpl.Expr rhs, bool origRhsIsHavoc, BoogieStmtListBuilder bldr, ExpressionTranslator et) {
+          if (rhs != null) {
+            var h = (Bpl.IdentifierExpr)et.HeapExpr;  // TODO: is this cast always justified?
+            var cmd = Bpl.Cmd.SimpleAssign(tok, h, UpdateHeap(tok, h, obj, fieldName, rhs));
+            proofDependencies?.AddProofDependencyId(cmd, lhs.Origin, new AssignmentDependency(stmt.Origin));
+            bldr.Add(cmd);
+            // assume $IsGoodHeap($Heap);
+            bldr.Add(AssumeGoodHeap(tok, etran));
+          }
+        });
+      }
+
+      i++;
+    }
+  }
+
+  /// <summary>
+  /// if "bGivenLhs" is non-null, generates an assignment of the translation of "rhs" to "bGivenLhs" and then returns "bGivenLhs".
+  /// If "bGivenLhs" is null, then this method will return an expression that in a stable way denotes the translation of "rhs";
+  /// this is achieved by creating a new temporary Boogie variable to hold the result and returning an expression that mentions
+  /// that new temporary variable.
+  ///
+  /// Before the assignment, the generated code will check that "rhs" obeys any subrange requirements entailed by "rhsTypeConstraint".
+  ///
+  /// The purpose of "lhsVar" is to determine an appropriate Boogie "where" clause for any temporary variable generated.
+  /// If passed in as non-null, it says that "lhsVar" is the LHS of the assignment being translated. If the type is subject to
+  /// definite-assignment rules and the RHS is "*", then the "where" clause of the temporary variable will have the form
+  /// "defass#lhs ==> wh" where "defass#lhs" is the definite-assignment tracker for "lhsVar" and "wh" is the "where"
+  /// clause for type "lhsType" for the temporary variable.
+  ///
+  /// The purpose of "lhsType" is to determine if the expression should be boxed before doing the assignment.  It is allowed to be null,
+  /// which indicates that the result should always be a box.  Note that "lhsType" may refer to a formal type parameter that is not in
+  /// scope; this is okay, since the purpose of "lhsType" is just to say whether or not the result should be boxed.
+  /// </summary>
+  Bpl.Expr TrAssignmentRhs(IOrigin tok, Bpl.IdentifierExpr bGivenLhs, IVariable lhsVar, Type lhsType,
+    AssignmentRhs rhs, Type rhsTypeConstraint,
+    BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran,
+    Statement stmt) {
+    Contract.Requires(tok != null);
+    Contract.Requires(rhs != null);
+    Contract.Requires(rhsTypeConstraint != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(Predef != null);
+    Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
+    Contract.Ensures(bGivenLhs == null || Contract.Result<Bpl.Expr>() == bGivenLhs);
+
+    Bpl.IdentifierExpr bLhs;
+    if (bGivenLhs != null) {
+      bLhs = bGivenLhs;
+    } else {
+      Type localType = rhsTypeConstraint;  // this is a type that is appropriate for capturing the value of the RHS
+      var ty = TrType(localType);
+      var nm = CurrentIdGenerator.FreshId("$rhs#");
+      Bpl.Expr wh;
+      if (rhs is HavocRhs && localType.IsNonempty) {
+        wh = GetWhereClause(tok, new Bpl.IdentifierExpr(tok, nm, ty), localType, etran, NOALLOC);
+      } else if (rhs is HavocRhs && lhsVar != null && GetDefiniteAssignmentTracker(lhsVar) != null) {
+        // This "where" clause expresses that the new variable has a value of the given type only if
+        // the variable has already been definitely assigned. (If it has not already been assigned,
+        // then the variable will get a new value, but Dafny's definite-assginment rules prevent that
+        // value from being used, so it's appropriate to use effectively-"true" as the "where" clause
+        // in that case.
+        wh = BplImp(GetDefiniteAssignmentTracker(lhsVar),
+          GetWhereClause(tok, new Bpl.IdentifierExpr(tok, nm, ty), localType, etran, NOALLOC));
+      } else {
+        // In this case, it could be unsound to use a "where" clause, see issue #1619.
+        // Luckily, leaving it out is harmless, because we don't need a "where" clause here in the first
+        // place--because the variable is short lived, we know it will not be havoc'ed by Boogie, so a
+        // "where" wouldn't provide additional information over the assigned value.
+        wh = null;
+      }
+      var v = locals.GetOrCreate(nm, () => new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, nm, ty, wh)));
+      bLhs = new Bpl.IdentifierExpr(tok, v);
+    }
+
+    if (rhs is ExprRhs) {
+      var e = (ExprRhs)rhs;
+
+      var bRhs = etran.TrExpr(e.Expr);
+      var cre = GetSubrangeCheck(tok, bRhs, e.Expr.Type, rhsTypeConstraint, e.Expr, null, out var desc, "");
+      TrStmt_CheckWellformed(e.Expr, builder, locals, etran, true, addResultCommands:
+        (returnBuilder, result) => {
+          if (cre != null) {
+            returnBuilder.Add(Assert(result.Origin, cre, desc, builder.Context));
+          }
+        });
+
+      if (bGivenLhs != null) {
+        Contract.Assert(bGivenLhs == bLhs);
+        // box the RHS, then do the assignment
+        var cmd = Bpl.Cmd.SimpleAssign(tok, bGivenLhs, AdaptBoxing(tok, bRhs, e.Expr.Type, lhsType));
+        proofDependencies?.AddProofDependencyId(cmd, tok, new AssignmentDependency(stmt.Origin));
+        builder.Add(cmd);
+        return bGivenLhs;
+      } else {
+        // box from RHS type to tmp-var type, then do the assignment; then return LHS, boxed from tmp-var type to result type
+        var cmd = Bpl.Cmd.SimpleAssign(tok, bLhs, AdaptBoxing(tok, bRhs, e.Expr.Type, rhsTypeConstraint));
+        proofDependencies?.AddProofDependencyId(cmd, tok, new AssignmentDependency(stmt.Origin));
+        builder.Add(cmd);
+        return CondApplyBox(tok, bLhs, rhsTypeConstraint, lhsType);
+      }
+
+    } else if (rhs is HavocRhs) {
+      builder.Add(new Bpl.HavocCmd(tok, new List<Bpl.IdentifierExpr> { bLhs }));
+      return CondApplyBox(tok, bLhs, rhsTypeConstraint, lhsType);
+    } else {
+      // x := new Something
+      Contract.Assert(rhs is TypeRhs);  // otherwise, an unexpected AssignmentRhs
+      TypeRhs tRhs = (TypeRhs)rhs;
+
+      var callsConstructor = tRhs.InitCall != null && tRhs.InitCall.Method is Constructor;
+
+      if (tRhs.ArrayDimensions == null) {
+        Contract.Assert(tRhs.ElementInit == null && tRhs.InitDisplay == null);
+      } else {
+        int i = 0;
+        foreach (Expression dim in tRhs.ArrayDimensions) {
+          CheckWellformed(dim, new WFOptions(), locals, builder, etran);
+          var desc = new NonNegative(tRhs.ArrayDimensions.Count == 1
+            ? "array size" : $"array size (dimension {i})", dim);
+          builder.Add(Assert(GetToken(dim), Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(dim)), desc, builder.Context));
+          i++;
+        }
+        if (tRhs.ElementInit != null) {
+          CheckWellformed(tRhs.ElementInit, new WFOptions(), locals, builder, etran);
+        } else if (tRhs.InitDisplay != null) {
+          var dim = tRhs.ArrayDimensions[0];
+          var desc = new ArrayInitSizeValid(tRhs, dim);
+          builder.Add(Assert(GetToken(dim), Bpl.Expr.Eq(etran.TrExpr(dim), Bpl.Expr.Literal(tRhs.InitDisplay.Count)), desc, builder.Context));
+          foreach (var v in tRhs.InitDisplay) {
+            CheckWellformed(v, new WFOptions(), locals, builder, etran);
+          }
+        } else if (options.DefiniteAssignmentLevel == 0) {
+          // cool
+        } else if ((2 <= options.DefiniteAssignmentLevel && options.DefiniteAssignmentLevel != 4) ||
+                   options.Get(CommonOptionBag.EnforceDeterminism) ||
+                   !tRhs.EType.HasCompilableValue) {
+          // this is allowed only if the array size is such that it has no elements
+          Bpl.Expr zeroSize = Bpl.Expr.False;
+          foreach (Expression dim in tRhs.ArrayDimensions) {
+            zeroSize = BplOr(zeroSize, Bpl.Expr.Eq(Bpl.Expr.Literal(0), etran.TrExpr(dim)));
+          }
+          var desc = new ArrayInitEmpty(tRhs.EType.ToString(), tRhs.ArrayDimensions);
+          builder.Add(Assert(tRhs.Origin, zeroSize, desc, builder.Context));
+        }
+      }
+
+      Bpl.IdentifierExpr nw = GetNewVar_IdExpr(tok, locals);
+      if (!callsConstructor) {
+        SelectAllocateObject(tok, nw, tRhs.Type, true, builder, etran);
+        if (tRhs.ArrayDimensions != null) {
+          int i = 0;
+          foreach (Expression dim in tRhs.ArrayDimensions) {
+            // assume Array#Length($nw, i) == arraySize;
+            Bpl.Expr arrayLength = ArrayLength(tok, nw, tRhs.ArrayDimensions.Count, i);
+            builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(arrayLength, etran.TrExpr(dim))));
+            i++;
+          }
+          if (tRhs.ElementInit != null) {
+            CheckElementInit(tok, true, tRhs.ArrayDimensions, tRhs.EType, tRhs.ElementInit, nw, builder, etran, new WFOptions());
+          } else if (tRhs.InitDisplay != null) {
+            int ii = 0;
+            foreach (var v in tRhs.InitDisplay) {
+              var EE_ii = etran.TrExpr(v);
+              // assert EE_ii satisfies any subset-type constraints;
+              CheckSubrange(v.Origin, EE_ii, v.Type, tRhs.EType, v, builder);
+              // assume nw[ii] == EE_ii;
+              var ai = ReadHeap(tok, etran.HeapExpr, nw, GetArrayIndexFieldName(tok, new List<Bpl.Expr> { Bpl.Expr.Literal(ii) }));
+              builder.Add(new Bpl.AssumeCmd(tok, Bpl.Expr.Eq(UnboxUnlessInherentlyBoxed(ai, tRhs.EType), AdaptBoxing(tok, EE_ii, v.Type, tRhs.EType))));
+              ii++;
+            }
+          }
+        }
+        Bpl.Cmd heapAllocationRecorder = null;
+        if (codeContext is IteratorDecl) {
+          var iter = (IteratorDecl)codeContext;
+          // $Heap[this, _new] := Set#UnionOne($Heap[this, _new], $Box($nw));
+          var th = new Bpl.IdentifierExpr(tok, etran.This, Predef.RefType);
+          var nwField = new Bpl.IdentifierExpr(tok, GetField(iter.Member_New));
+          var thisDotNew = ApplyUnbox(tok, ReadHeap(tok, etran.HeapExpr, th, nwField), Predef.SetType);
+          var unionOne = FunctionCall(tok, BuiltinFunction.SetUnionOne, Predef.BoxType, thisDotNew, ApplyBox(tok, nw));
+          var heapRhs = UpdateHeap(tok, etran.HeapExpr, th, nwField, unionOne);
+          heapAllocationRecorder = Bpl.Cmd.SimpleAssign(tok, etran.HeapCastToIdentifierExpr, heapRhs);
+        }
+        CommitAllocatedObject(tok, nw, heapAllocationRecorder, builder, etran);
+      }
+      if (tRhs.InitCall != null) {
+        AddComment(builder, tRhs.InitCall, "init call statement");
+        TrCallStmt(tRhs.InitCall, builder, locals, etran, nw);
+      }
+      // bLhs := $nw;
+      CheckSubrange(tok, nw, tRhs.Type, rhsTypeConstraint, null, builder);
+      if (bGivenLhs != null) {
+        Contract.Assert(bGivenLhs == bLhs);
+        // box the RHS, then do the assignment
+        var cmd = Bpl.Cmd.SimpleAssign(tok, bGivenLhs, CondApplyBox(tok, nw, tRhs.Type, lhsType));
+        proofDependencies?.AddProofDependencyId(cmd, tok, new AssignmentDependency(stmt.Origin));
+        builder.Add(cmd);
+        return bGivenLhs;
+      } else {
+        // do the assignment, then box the result
+        var cmd = Bpl.Cmd.SimpleAssign(tok, bLhs, nw);
+        proofDependencies?.AddProofDependencyId(cmd, tok, new AssignmentDependency(stmt.Origin));
+        builder.Add(cmd);
+        return CondApplyBox(tok, bLhs, tRhs.Type, lhsType);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrCall.cs b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrCall.cs
new file mode 100644
index 00000000000..9b50061f0cc
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrCall.cs
@@ -0,0 +1,381 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
+using Bpl = Microsoft.Boogie;
+using BplParser = Microsoft.Boogie.Parser;
+using static Microsoft.Dafny.Util;
+using Action = System.Action;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+
+  void TrCallStmt(CallStmt s, BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran, Bpl.IdentifierExpr actualReceiver) {
+    Contract.Requires(s != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(!(s.Method is Constructor) || (s.Lhs.Count == 0 && actualReceiver != null));
+
+    var tySubst = s.MethodSelect.TypeArgumentSubstitutionsWithParents();
+    ProcessLhss(s.Lhs, true, true, builder, locals, etran, s, out var lhsBuilders, out var bLhss,
+      out _, out _, out _, s.OriginalInitialLhs);
+    Contract.Assert(s.Lhs.Count == lhsBuilders.Count);
+    Contract.Assert(s.Lhs.Count == bLhss.Count);
+    var lhsTypes = new List<Type>();
+    if (s.Method is Constructor) {
+      lhsTypes.Add(s.Receiver.Type);
+      bLhss.Add(actualReceiver);
+    } else {
+      for (int i = 0; i < s.Lhs.Count; i++) {
+        var lhs = s.Lhs[i];
+        lhsTypes.Add(lhs.Type);
+        builder.Add(new CommentCmd("TrCallStmt: Adding lhs with type " + lhs.Type));
+        if (bLhss[i] == null) {  // (in the current implementation, the second parameter "true" to ProcessLhss implies that all bLhss[*] will be null)
+          // create temporary local and assign it to bLhss[i]
+          string nm = CurrentIdGenerator.FreshId("$rhs##");
+          var formalOutType = s.Method.Outs[i].Type.Subst(tySubst);
+          var ty = TrType(formalOutType);
+          var var = locals.GetOrCreate(nm, () => new Bpl.LocalVariable(lhs.Origin, new Bpl.TypedIdent(lhs.Origin, nm, ty)));
+          bLhss[i] = new Bpl.IdentifierExpr(lhs.Origin, var.Name, ty);
+        }
+      }
+    }
+    Bpl.IdentifierExpr initHeap = null;
+    if (codeContext is IteratorDecl) {
+      // var initHeap := $Heap;
+      var initHeapVar = new Bpl.LocalVariable(s.Origin, new Bpl.TypedIdent(s.Origin, CurrentIdGenerator.FreshId("$initHeapCallStmt#"), Predef.HeapType));
+      locals.Add(initHeapVar);
+      initHeap = new Bpl.IdentifierExpr(s.Origin, initHeapVar);
+      // initHeap := $Heap;
+      builder.Add(Bpl.Cmd.SimpleAssign(s.Origin, initHeap, etran.HeapExpr));
+    }
+    builder.Add(new CommentCmd("TrCallStmt: Before ProcessCallStmt"));
+    ProcessCallStmt(s, tySubst, actualReceiver, bLhss, lhsTypes, builder, locals, etran);
+    builder.Add(new CommentCmd("TrCallStmt: After ProcessCallStmt"));
+    for (int i = 0; i < lhsBuilders.Count; i++) {
+      var lhs = s.Lhs[i];
+      Type lhsType, rhsTypeConstraint;
+      if (lhs is IdentifierExpr) {
+        var ide = (IdentifierExpr)lhs;
+        lhsType = ide.Var.Type;
+        rhsTypeConstraint = lhsType;
+      } else if (lhs is MemberSelectExpr) {
+        var fse = (MemberSelectExpr)lhs;
+        var field = (Field)fse.Member;
+        Contract.Assert(field != null);
+        Contract.Assert(VisibleInScope(field));
+        lhsType = field.Type;
+        rhsTypeConstraint = lhsType.Subst(fse.TypeArgumentSubstitutionsWithParents());
+      } else if (lhs is SeqSelectExpr) {
+        var e = (SeqSelectExpr)lhs;
+        lhsType = null;  // for arrays, always make sure the value assigned is boxed
+        rhsTypeConstraint = e.Seq.Type.TypeArgs[0];
+      } else {
+        var e = (MultiSelectExpr)lhs;
+        lhsType = null;  // for arrays, always make sure the value assigned is boxed
+        rhsTypeConstraint = e.Array.Type.TypeArgs[0];
+      }
+
+      Bpl.Expr bRhs = bLhss[i];  // the RHS (bRhs) of the assignment to the actual call-LHS (lhs) was a LHS (bLhss[i]) in the Boogie call statement
+      CheckSubrange(lhs.Origin, bRhs, s.Method.Outs[i].Type.Subst(tySubst), rhsTypeConstraint, null, builder);
+      bRhs = CondApplyBox(lhs.Origin, bRhs, lhs.Type, lhsType);
+
+      lhsBuilders[i](bRhs, false, builder, etran);
+    }
+    if (codeContext is IteratorDecl) {
+      var iter = (IteratorDecl)codeContext;
+      Contract.Assert(initHeap != null);
+      RecordNewObjectsIn_New(s.Origin, iter, initHeap, etran.HeapCastToIdentifierExpr, builder, locals, etran);
+    }
+    builder.AddCaptureState(s);
+  }
+
+  void ProcessCallStmt(CallStmt cs, Dictionary<TypeParameter, Type> tySubst, Bpl.Expr bReceiver,
+    List<Bpl.IdentifierExpr> Lhss, List<Type> LhsTypes,
+    BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran) {
+
+    Contract.Requires(cs != null);
+    Contract.Requires(Lhss != null);
+    Contract.Requires(LhsTypes != null);
+    // Note, a Dafny class constructor is declared to have no output parameters, but it is encoded in Boogie as
+    // having an output parameter.
+    Contract.Requires(cs.Method is Constructor || cs.Method.Outs.Count == Lhss.Count);
+    Contract.Requires(cs.Method is Constructor || cs.Method.Outs.Count == LhsTypes.Count);
+    Contract.Requires(!(cs.Method is Constructor) || (cs.Method.Outs.Count == 0 && Lhss.Count == 1 && LhsTypes.Count == 1));
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(tySubst != null);
+    var tok = GetToken(cs);
+    var tyArgs = GetTypeParams(cs.Method);
+    var dafnyReceiver = cs.Receiver;
+    var method = cs.Method;
+    var atLabel = cs.MethodSelect.AtLabel;
+    var Args = cs.Args;
+
+    // Figure out if the call is recursive or not, which will be used below to determine the need for a
+    // termination check and the need to include an implicit _k-1 argument.
+    bool isRecursiveCall = false;
+    // consult the call graph to figure out if this is a recursive call
+    var module = method.EnclosingClass.EnclosingModuleDefinition;
+    if (codeContext != null && module == currentModule) {
+      // Note, prefix lemmas are not recorded in the call graph, but their corresponding greatest lemmas are.
+      // Similarly, an iterator is not recorded in the call graph, but its MoveNext method is.
+      ICallable cllr =
+        codeContext is PrefixLemma ? ((PrefixLemma)codeContext).ExtremeLemma :
+        codeContext is IteratorDecl ? ((IteratorDecl)codeContext).Member_MoveNext :
+        codeContext;
+      if (ModuleDefinition.InSameSCC(method, cllr)) {
+        isRecursiveCall = true;
+      }
+    }
+
+    bool isCoCall = false;
+    var callee = method;
+    if (method is ExtremeLemma && isRecursiveCall) {
+      isCoCall = true;
+      callee = ((ExtremeLemma)method).PrefixLemma;
+    } else if (method is PrefixLemma) {
+      // an explicit call to a prefix lemma is allowed only inside the SCC of the corresponding greatest lemma,
+      // so we consider this to be a co-call
+      isCoCall = true;
+    }
+
+    var ins = new List<Bpl.Expr>();
+    if (callee is TwoStateLemma) {
+      ins.Add(etran.OldAt(atLabel).HeapExpr);
+      ins.Add(etran.HeapExpr);
+    }
+    // Add type arguments
+    ins.AddRange(TrTypeArgs(tySubst, tyArgs));
+
+    // Translate receiver argument, if any
+    Expression receiver = bReceiver == null ? dafnyReceiver : new BoogieWrapper(bReceiver, dafnyReceiver.Type);
+    if (!method.IsStatic && method is not Constructor) {
+      if (bReceiver == null) {
+        TrStmt_CheckWellformed(dafnyReceiver, builder, locals, etran, true);
+        if (!(dafnyReceiver is ThisExpr)) {
+          CheckNonNull(dafnyReceiver.Origin, dafnyReceiver, builder, etran, null);
+        }
+      }
+      var obj = etran.TrExpr(receiver);
+      if (bReceiver == null) {
+        obj = BoxifyForTraitParent(tok, obj, method, dafnyReceiver.Type);
+      }
+      ins.Add(obj);
+    } else if (receiver is StaticReceiverExpr stexpr) {
+      if (stexpr.ObjectToDiscard != null) {
+        TrStmt_CheckWellformed(stexpr.ObjectToDiscard, builder, locals, etran, true);
+      }
+    }
+
+    // Ideally, the modifies and decreases checks would be done after the precondition check,
+    // but Boogie doesn't give us a hook for that.  So, we set up our own local variables here to
+    // store the actual parameters.
+    // Create a local variable for each formal parameter, and assign each actual parameter to the corresponding local
+    var substMap = new Dictionary<IVariable, Expression>();
+    var directSubstMap = new Dictionary<IVariable, Expression>();
+    for (int i = 0; i < callee.Ins.Count; i++) {
+      var formal = callee.Ins[i];
+      var local = new LocalVariable(formal.Origin, formal.Name + "#", formal.Type.Subst(tySubst), formal.IsGhost);
+      local.type = local.SyntacticType;  // resolve local here
+      var localName = local.AssignUniqueName(CurrentDeclaration.IdGenerator);
+      var ie = new IdentifierExpr(local.Origin, localName);
+      ie.Var = local; ie.Type = ie.Var.Type;  // resolve ie here
+      substMap.Add(formal, ie);
+      locals.GetOrCreate(localName, () => new Bpl.LocalVariable(local.Origin, new Bpl.TypedIdent(local.Origin, localName, TrType(local.Type))));
+
+      var param = (Bpl.IdentifierExpr)etran.TrExpr(ie);  // TODO: is this cast always justified?
+      Bpl.Expr bActual;
+      Expression dActual;
+      if (i == 0 && method is ExtremeLemma && isRecursiveCall) {
+        // Treat this call to M(args) as a call to the corresponding prefix lemma M#(_k - 1, args), so insert an argument here.
+        var k = ((PrefixLemma)callee).K;
+        var bplK = new Bpl.IdentifierExpr(k.Origin, k.AssignUniqueName(CurrentDeclaration.IdGenerator), TrType(k.Type));
+        dActual = Expression.CreateSubtract(Expression.CreateIdentExpr(k), Expression.CreateNatLiteral(k.Origin, 1, k.Type));
+        if (k.Type.IsBigOrdinalType) {
+          bActual = FunctionCall(k.Origin, "ORD#Minus", Predef.BigOrdinalType,
+            bplK,
+            FunctionCall(k.Origin, "ORD#FromNat", Predef.BigOrdinalType, Bpl.Expr.Literal(1)));
+        } else {
+          bActual = Bpl.Expr.Sub(bplK, Bpl.Expr.Literal(1));
+        }
+      } else {
+        Expression actual;
+        if (method is ExtremeLemma && isRecursiveCall) {
+          actual = Args[i - 1];
+        } else {
+          actual = Args[i];
+        }
+        if (!(actual is DefaultValueExpression)) {
+          TrStmt_CheckWellformed(actual, builder, locals, etran, true);
+        }
+        builder.Add(new CommentCmd("ProcessCallStmt: CheckSubrange"));
+        // Check the subrange without boxing
+        var beforeBox = etran.TrExpr(actual);
+        CheckSubrange(actual.Origin, beforeBox, actual.Type, formal.Type.Subst(tySubst), actual, builder);
+        bActual = AdaptBoxing(actual.Origin, beforeBox, actual.Type, formal.Type.Subst(tySubst));
+        dActual = actual;
+      }
+      directSubstMap.Add(formal, dActual);
+      Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(formal.Origin, param, bActual);
+      builder.Add(cmd);
+      ins.Add(AdaptBoxing(ToDafnyToken(flags.ReportRanges, param.tok), param, formal.Type.Subst(tySubst), formal.Type));
+    }
+
+    // Check that every parameter is available in the state in which the method is invoked; this means checking that it has
+    // the right type and is allocated.  These checks usually hold trivially, on account of that the Dafny language only gives
+    // access to expressions of the appropriate type and that are allocated in the current state.  However, if the method is
+    // invoked in the 'old' state or if the method invoked is a two-state lemma with a non-new parameter, then we need to
+    // check that its arguments were all available at that time as well.
+    if (etran.UsesOldHeap) {
+      if (!method.IsStatic && !(method is Constructor)) {
+        Bpl.Expr wh = GetWhereClause(receiver.Origin, etran.TrExpr(receiver), receiver.Type, etran, ISALLOC, true);
+        if (wh != null) {
+          var desc = new IsAllocated("receiver argument", "in the state in which the method is invoked", receiver);
+          builder.Add(Assert(receiver.Origin, wh, desc, builder.Context));
+        }
+      }
+      for (int i = 0; i < Args.Count; i++) {
+        Expression ee = Args[i];
+        Bpl.Expr wh = GetWhereClause(ee.Origin, etran.TrExpr(ee), ee.Type, etran, ISALLOC, true);
+        if (wh != null) {
+          var desc = new IsAllocated("argument", "in the state in which the method is invoked", ee);
+          builder.Add(Assert(ee.Origin, wh, desc, builder.Context));
+        }
+      }
+    } else if (method is TwoStateLemma) {
+      if (!method.IsStatic) {
+        Bpl.Expr wh = GetWhereClause(receiver.Origin, etran.TrExpr(receiver), receiver.Type, etran.OldAt(atLabel), ISALLOC, true);
+        if (wh != null) {
+          var desc = new IsAllocated("receiver argument", "in the two-state lemma's previous state", receiver, atLabel);
+          builder.Add(Assert(receiver.Origin, wh, desc, builder.Context));
+        }
+      }
+      Contract.Assert(callee.Ins.Count == Args.Count);
+      for (int i = 0; i < Args.Count; i++) {
+        var formal = callee.Ins[i];
+        if (formal.IsOld) {
+          Expression ee = Args[i];
+          Bpl.Expr wh = GetWhereClause(ee.Origin, etran.TrExpr(ee), ee.Type, etran.OldAt(atLabel), ISALLOC, true);
+          if (wh != null) {
+            var pIdx = Args.Count == 1 ? "" : " at index " + i;
+            var desc = new IsAllocated(
+              $"argument{pIdx} for parameter '{formal.Name}'",
+              "in the two-state lemma's previous state" + IsAllocated.HelperFormal(formal),
+              ee,
+              atLabel
+            );
+            builder.Add(Assert(ee.Origin, wh, desc, builder.Context));
+          }
+        }
+      }
+    }
+
+    var directSub = new Substituter(null, directSubstMap, tySubst);
+
+    // Check that the reads clause of a subcall is a subset of the current reads frame,
+    // but support the optimization that we don't define a reads frame at all if it's `reads *`. 
+    if (etran.readsFrame != null) {
+      // substitute actual args for parameters in description expression frames...
+      var requiredFrames = callee.Reads.Expressions.ConvertAll(directSub.SubstFrameExpr);
+      var desc = new ReadFrameSubset("call", requiredFrames, GetContextReadsFrames());
+
+      // ... but that substitution isn't needed for frames passed to CheckFrameSubset
+      var readsSubst = new Substituter(null, new Dictionary<IVariable, Expression>(), tySubst);
+      CheckFrameSubset(tok, callee.Reads.Expressions.ConvertAll(readsSubst.SubstFrameExpr),
+        receiver, substMap, etran, etran.ReadsFrame(tok), builder, desc, null);
+    }
+
+    // substitute actual args for parameters in description expression frames...
+    var frameExpressions = callee.Mod.Expressions.ConvertAll(directSub.SubstFrameExpr);
+    // Check that the modifies clause of a subcall is a subset of the current modifies frame,
+    // but only if we're in a context that defines a modifies frame.
+    if (codeContext is IMethodCodeContext methodCodeContext) {
+      var desc = new ModifyFrameSubset(
+        "call",
+        frameExpressions,
+        methodCodeContext.Modifies.Expressions
+      );
+      // ... but that substitution isn't needed for frames passed to CheckFrameSubset
+      var modifiesSubst = new Substituter(null, new(), tySubst);
+      CheckFrameSubset(
+        tok, callee.Mod.Expressions.ConvertAll(modifiesSubst.SubstFrameExpr),
+        receiver, substMap, etran, etran.ModifiesFrame(tok), builder, desc, null);
+    }
+
+    // Check termination
+    if (isRecursiveCall) {
+      Contract.Assert(codeContext != null);
+      if (codeContext is DatatypeDecl) {
+        builder.Add(Assert(tok, Bpl.Expr.False, new IsNonRecursive(), builder.Context));
+      } else {
+        List<Expression> contextDecreases = codeContext.Decreases.Expressions;
+        List<Expression> calleeDecreases = callee.Decreases.Expressions;
+        CheckCallTermination(tok, contextDecreases, calleeDecreases, null, receiver, substMap, directSubstMap, tySubst, etran, true, builder, codeContext.InferredDecreases, null);
+      }
+    }
+
+    // Create variables to hold the output parameters of the call, so that appropriate unboxes can be introduced.
+    var outs = new List<Bpl.IdentifierExpr>();
+    var tmpOuts = new List<Bpl.IdentifierExpr>();
+    if (method is Constructor) {
+      tmpOuts.Add(null);
+      outs.Add(Lhss[0]);
+    } else {
+      for (int i = 0; i < Lhss.Count; i++) {
+        var bLhs = Lhss[i];
+        if (ModeledAsBoxType(callee.Outs[i].Type) && !ModeledAsBoxType(LhsTypes[i])) {
+          // we need an Unbox
+          Bpl.LocalVariable var = new Bpl.LocalVariable(bLhs.tok, new Bpl.TypedIdent(bLhs.tok, CurrentIdGenerator.FreshId("$tmp##"), Predef.BoxType));
+          locals.Add(var);
+          Bpl.IdentifierExpr varIdE = new Bpl.IdentifierExpr(bLhs.tok, var.Name, Predef.BoxType);
+          tmpOuts.Add(varIdE);
+          outs.Add(varIdE);
+        } else {
+          tmpOuts.Add(null);
+          outs.Add(bLhs);
+        }
+      }
+    }
+
+    AddReferencedMember(callee);
+    var calleeName = MethodName(callee, isCoCall ? MethodTranslationKind.CoCall : MethodTranslationKind.Call);
+    var call = Call(builder.Context, tok, calleeName, ins, outs);
+    proofDependencies?.AddProofDependencyId(call, tok, new CallDependency(cs));
+    if (
+      (assertionOnlyFilter != null && !assertionOnlyFilter(tok)) ||
+      (module != currentModule && tok.IsInherited(currentModule) && (codeContext == null || !codeContext.MustReverify))) {
+      // The call statement is inherited, so the refined module already checked that the precondition holds.  Note,
+      // preconditions are not allowed to be strengthened, except if they use a predicate whose body has been strengthened.
+      // But if the callee sits in a different module, then any predicate it uses will be treated as opaque (that is,
+      // uninterpreted) anyway, so the refined module will have checked the call precondition for all possible definitions
+      // of the predicate.
+      call.IsFree = true;
+    }
+    builder.Add(call);
+
+    // Unbox results as needed
+    for (int i = 0; i < Lhss.Count; i++) {
+      Bpl.IdentifierExpr bLhs = Lhss[i];
+      Bpl.IdentifierExpr tmpVarIdE = tmpOuts[i];
+      if (tmpVarIdE != null) {
+        // Instead of an assignment:
+        //    e := UnBox(tmpVar);
+        // we use:
+        //    havoc e; assume e == UnBox(tmpVar);
+        // because that will reap the benefits of e's where clause, so that some additional type information will be known about
+        // the out-parameter.
+        Bpl.Cmd cmd = new Bpl.HavocCmd(bLhs.tok, new List<Bpl.IdentifierExpr> { bLhs });
+        builder.Add(cmd);
+        cmd = TrAssumeCmd(bLhs.tok, Bpl.Expr.Eq(bLhs, FunctionCall(bLhs.tok, BuiltinFunction.Unbox, TrType(LhsTypes[i]), tmpVarIdE)));
+        builder.Add(cmd);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrForallStmt.cs b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrForallStmt.cs
new file mode 100644
index 00000000000..4849f41a9c1
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrForallStmt.cs
@@ -0,0 +1,575 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using Microsoft.Boogie;
+using Bpl = Microsoft.Boogie;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+
+
+  private void TrForallStmt(BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran,
+    ForallStmt forallStmt) {
+    this.fuelContext = FuelSetting.ExpandFuelContext(forallStmt.Attributes, forallStmt.Origin, this.fuelContext, this.reporter);
+
+    CurrentIdGenerator.Push();
+    if (forallStmt.Kind == ForallStmt.BodyKind.Assign) {
+      AddComment(builder, forallStmt, "forall statement (assign)");
+      Contract.Assert(forallStmt.Ens.Count == 0);
+      if (forallStmt.BoundVars.Count == 0) {
+        TrStmt(forallStmt.Body, builder, locals, etran);
+      } else {
+        var s0 = (SingleAssignStmt)forallStmt.S0;
+        var definedness = new BoogieStmtListBuilder(this, options, builder.Context);
+        var updater = new BoogieStmtListBuilder(this, options, builder.Context);
+        DefineFuelConstant(forallStmt.Origin, forallStmt.Attributes, definedness, etran);
+        TrForallAssign(forallStmt, s0, definedness, updater, locals, etran);
+        // All done, so put the two pieces together
+        builder.Add(new Bpl.IfCmd(forallStmt.Origin, null, definedness.Collect(forallStmt.Origin), null, updater.Collect(forallStmt.Origin)));
+        builder.AddCaptureState(forallStmt);
+      }
+
+    } else if (forallStmt.Kind == ForallStmt.BodyKind.Call) {
+      AddComment(builder, forallStmt, "forall statement (call)");
+      Contract.Assert(forallStmt.Ens.Count == 0);
+      if (forallStmt.BoundVars.Count == 0) {
+        Contract.Assert(LiteralExpr.IsTrue(forallStmt.Range));  // follows from the invariant of ForallStmt
+        TrStmt(forallStmt.Body, builder, locals, etran);
+      } else {
+        var s0 = (CallStmt)forallStmt.S0;
+        if (Attributes.Contains(forallStmt.Attributes, "_trustWellformed")) {
+          TrForallStmtCall(forallStmt.Origin, forallStmt.BoundVars, forallStmt.Bounds, forallStmt.Range, null,
+            forallStmt.EffectiveEnsuresClauses, null, s0, null, builder, locals, etran);
+        } else {
+          var definedness = new BoogieStmtListBuilder(this, options, builder.Context);
+          DefineFuelConstant(forallStmt.Origin, forallStmt.Attributes, definedness, etran);
+          var exporter = new BoogieStmtListBuilder(this, options, builder.Context);
+          TrForallStmtCall(forallStmt.Origin, forallStmt.BoundVars, forallStmt.Bounds, forallStmt.Range, null,
+            forallStmt.EffectiveEnsuresClauses, null, s0, definedness, exporter, locals, etran);
+          // All done, so put the two pieces together
+          builder.Add(new Bpl.IfCmd(forallStmt.Origin, null, definedness.Collect(forallStmt.Origin), null, exporter.Collect(forallStmt.Origin)));
+        }
+        builder.AddCaptureState(forallStmt);
+      }
+
+    } else if (forallStmt.Kind == ForallStmt.BodyKind.Proof) {
+      AddComment(builder, forallStmt, "forall statement (proof)");
+      var definedness = new BoogieStmtListBuilder(this, options, builder.Context);
+      var exporter = new BoogieStmtListBuilder(this, options, builder.Context);
+      DefineFuelConstant(forallStmt.Origin, forallStmt.Attributes, definedness, etran);
+      TrForallProof(forallStmt, definedness, exporter, locals, etran);
+      // All done, so put the two pieces together
+      builder.Add(new Bpl.IfCmd(forallStmt.Origin, null, definedness.Collect(forallStmt.Origin), null, exporter.Collect(forallStmt.Origin)));
+      builder.AddCaptureState(forallStmt);
+
+    } else {
+      Contract.Assert(false);  // unexpected kind
+    }
+    CurrentIdGenerator.Pop();
+    this.fuelContext = FuelSetting.PopFuelContext();
+  }
+
+
+  void TrForallStmtCall(IOrigin tok, List<BoundVar> boundVars, List<BoundedPool> bounds,
+    Expression range, ExpressionConverter additionalRange, List<Expression> forallExpressions, List<List<Expression>> triggers, CallStmt s0,
+    BoogieStmtListBuilder definedness, BoogieStmtListBuilder exporter, Variables locals, ExpressionTranslator etran,
+    bool includeCanCalls = true) {
+    Contract.Requires(tok != null);
+    Contract.Requires(boundVars != null);
+    Contract.Requires(bounds != null);
+    Contract.Requires(range != null);
+    // additionalRange is allowed to be null
+    Contract.Requires(forallExpressions == null || triggers == null || triggers.Count == 0);
+    Contract.Requires(s0 != null);
+    // definedness is allowed to be null
+    Contract.Requires(exporter != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+
+    // Translate:
+    //   forall (x,y | Range(x,y)) {
+    //     E(x,y) . M( Args(x,y) );
+    //   }
+    // as:
+    //   if (*) {
+    //     var x,y;
+    //     havoc x,y;
+    //     CheckWellformed( Range );
+    //     assume Range(x,y);
+    //     assume additionalRange;
+    //     Tr( Call );
+    //     assume false;
+    //   } else {
+    //     initHeap := $Heap;
+    //     advance $Heap;
+    //     assume (forall x,y :: (Range(x,y) && additionalRange)[INIT] &&
+    //                           ==> Post[old($Heap) := initHeap]( E(x,y)[INIT], Args(x,y)[INIT] ));
+    //   }
+    // where Post(this,args) is the postcondition of method M and
+    // INIT is the substitution [old($Heap),$Heap := old($Heap),initHeap].
+
+    if (definedness != null) {
+      if (boundVars.Count != 0) {
+        // Note, it would be nicer (and arguably more appropriate) to do a SetupBoundVarsAsLocals
+        // here (rather than a TrBoundVariables).  However, there is currently no way to apply
+        // a substMap to a statement (in particular, to s.Body), so that doesn't work here.
+        List<bool> freeOfAlloc = BoundedPool.HasBounds(bounds, BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
+        List<Variable> bvars = new List<Variable>();
+        var ante = etran.TrBoundVariables(boundVars, bvars, true, freeOfAlloc);
+        locals.AddRange(bvars);
+        var havocIds = new List<Bpl.IdentifierExpr>();
+        foreach (Bpl.Variable bv in bvars) {
+          havocIds.Add(new Bpl.IdentifierExpr(tok, bv));
+        }
+        definedness.Add(new Bpl.HavocCmd(tok, havocIds));
+        definedness.Add(TrAssumeCmd(tok, ante));
+      }
+      TrStmt_CheckWellformed(range, definedness, locals, etran, false);
+      definedness.Add(TrAssumeCmd(range.Origin, etran.TrExpr(range)));
+      if (additionalRange != null) {
+        var es = additionalRange(new Dictionary<IVariable, Expression>(), etran);
+        definedness.Add(TrAssumeCmd(es.tok, es));
+      }
+
+      TrStmt(s0, definedness, locals, etran);
+
+      definedness.Add(TrAssumeCmd(tok, Bpl.Expr.False));
+    }
+
+    // Now for the other branch, where the postcondition of the call is exported.
+    {
+      var initHeapVar = new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, CurrentIdGenerator.FreshId("$initHeapForallStmt#"), Predef.HeapType));
+      locals.Add(initHeapVar);
+      var initHeap = new Bpl.IdentifierExpr(tok, initHeapVar);
+      var initEtran = new ExpressionTranslator(this, Predef, initHeap, etran.Old.HeapExpr, etran.scope);
+      // initHeap := $Heap;
+      exporter.Add(Bpl.Cmd.SimpleAssign(tok, initHeap, etran.HeapExpr));
+      var heapIdExpr = etran.HeapCastToIdentifierExpr;
+      // advance $Heap;
+      exporter.Add(new Bpl.HavocCmd(tok, new List<Bpl.IdentifierExpr> { heapIdExpr }));
+      Contract.Assert(s0.Method.Mod.Expressions.Count == 0);  // checked by the resolver
+      foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(tok, new List<FrameExpression>(), s0.IsGhost, s0.Method.AllowsAllocation, initEtran, etran, initEtran)) {
+        if (tri.IsFree) {
+          exporter.Add(TrAssumeCmd(tok, tri.Expr));
+        }
+      }
+      if (codeContext is IteratorDecl) {
+        var iter = (IteratorDecl)codeContext;
+        RecordNewObjectsIn_New(tok, iter, initHeap, heapIdExpr, exporter, locals, etran);
+      }
+
+      // Note, in the following, we need to do a bit of a song and dance.  The actual arguments of the
+      // call should be translated using "initEtran", whereas the method postcondition should be translated
+      // using "callEtran".  To accomplish this, we translate the arguments and then tuck the resulting
+      // Boogie expressions into BoogieExprWrappers that are used in the DafnyExpr-to-DafnyExpr substitution.
+      var bvars = new List<Variable>();
+      Dictionary<IVariable, Expression> substMap;
+      var argsSubstMap = new Dictionary<IVariable, Expression>();  // maps formal arguments to actuals
+      Contract.Assert(s0.Method.Ins.Count == s0.Args.Count);
+      var callEtran = new ExpressionTranslator(this, Predef, etran.HeapExpr, initHeap, etran.scope);
+      Bpl.Expr anteCanCalls, ante;
+      Bpl.Expr post = Bpl.Expr.True;
+      Bpl.Trigger tr;
+      if (forallExpressions != null) {
+        // translate based on the forallExpressions since the triggers are computed based on it already.
+        QuantifierExpr expr = (QuantifierExpr)forallExpressions[0];
+        while (expr.SplitQuantifier != null) {
+          expr = (QuantifierExpr)expr.SplitQuantifierExpression;
+        }
+        boundVars = expr.BoundVars;
+        ante = initEtran.TrBoundVariablesRename(boundVars, bvars, out substMap);
+        tr = TrTrigger(callEtran, expr.Attributes, expr.Origin, bvars, substMap, s0.MethodSelect.TypeArgumentSubstitutionsWithParents());
+
+        var p = Substitute(expr.Range, null, substMap);
+        anteCanCalls = initEtran.CanCallAssumption(p);
+        ante = BplAnd(ante, initEtran.TrExpr(p));
+        if (additionalRange != null) {
+          ante = BplAnd(ante, additionalRange(substMap, initEtran));
+        }
+        p = Substitute(expr.Term, null, substMap);
+        post = BplAnd(post, callEtran.CanCallAssumption(p));
+        post = BplAnd(post, callEtran.TrExpr(p));
+      } else {
+        ante = initEtran.TrBoundVariablesRename(boundVars, bvars, out substMap);
+
+        var p = Substitute(range, null, substMap);
+        anteCanCalls = initEtran.CanCallAssumption(p);
+        ante = BplAnd(ante, initEtran.TrExpr(p));
+        if (additionalRange != null) {
+          // additionalRange produces something of the form canCallAssumptions ==> TrExpr
+          ante = BplAnd(ante, additionalRange(substMap, initEtran));
+        }
+
+        var receiver = new BoogieWrapper(initEtran.TrExpr(Substitute(s0.Receiver, null, substMap, s0.MethodSelect.TypeArgumentSubstitutionsWithParents())), s0.Receiver.Type);
+        for (int i = 0; i < s0.Method.Ins.Count; i++) {
+          var arg = Substitute(s0.Args[i], null, substMap, s0.MethodSelect.TypeArgumentSubstitutionsWithParents());  // substitute the renamed bound variables for the declared ones
+          argsSubstMap.Add(s0.Method.Ins[i], new BoogieWrapper(initEtran.TrExpr(arg), s0.Args[i].Type));
+        }
+        foreach (var ens in ConjunctsOf(s0.Method.Ens)) {
+          p = Substitute(ens.E, receiver, argsSubstMap, s0.MethodSelect.TypeArgumentSubstitutionsWithParents());  // substitute the call's actuals for the method's formals
+          if (includeCanCalls) {
+            post = BplAnd(post, callEtran.CanCallAssumption(p));
+          }
+          post = BplAnd(post, callEtran.TrExpr(p));
+        }
+
+        tr = null;
+        if (triggers != null) {
+          foreach (var trigger in triggers) {
+            Contract.Assert(trigger.Count != 0);
+            var terms = trigger.ConvertAll(expr => {
+              expr = Substitute(expr, receiver, argsSubstMap, s0.MethodSelect.TypeArgumentSubstitutionsWithParents());
+              return callEtran.TrExpr(expr);
+            });
+            tr = new Trigger(trigger[0].Origin, true, terms, tr);
+          }
+        }
+      }
+
+      // TRIG (forall $ih#s0#0: Seq :: $Is($ih#s0#0, TSeq(TChar)) && $IsAlloc($ih#s0#0, TSeq(TChar), $initHeapForallStmt#0) && Seq#Length($ih#s0#0) != 0 && Seq#Rank($ih#s0#0) < Seq#Rank(s#0) ==> (forall i#2: int :: true ==> LitInt(0) <= i#2 && i#2 < Seq#Length($ih#s0#0) ==> char#ToInt(_module.CharChar.MinChar($LS($LZ), $Heap, this, $ih#s0#0)) <= char#ToInt($Unbox(Seq#Index($ih#s0#0, i#2)): char)))
+      // TRIG (forall $ih#pat0#0: Seq, $ih#a0#0: Seq :: $Is($ih#pat0#0, TSeq(_module._default.Same0$T)) && $IsAlloc($ih#pat0#0, TSeq(_module._default.Same0$T), $initHeapForallStmt#0) && $Is($ih#a0#0, TSeq(_module._default.Same0$T)) && $IsAlloc($ih#a0#0, TSeq(_module._default.Same0$T), $initHeapForallStmt#0) && Seq#Length($ih#pat0#0) <= Seq#Length($ih#a0#0) && Seq#SameUntil($ih#pat0#0, $ih#a0#0, Seq#Length($ih#pat0#0)) && (Seq#Rank($ih#pat0#0) < Seq#Rank(pat#0) || (Seq#Rank($ih#pat0#0) == Seq#Rank(pat#0) && Seq#Rank($ih#a0#0) < Seq#Rank(a#0))) ==> _module.__default.IsRelaxedPrefixAux(_module._default.Same0$T, $LS($LZ), $Heap, $ih#pat0#0, $ih#a0#0, LitInt(1)))'
+      // TRIG (forall $ih#m0#0: DatatypeType, $ih#n0#0: DatatypeType :: $Is($ih#m0#0, Tclass._module.Nat()) && $IsAlloc($ih#m0#0, Tclass._module.Nat(), $initHeapForallStmt#0) && $Is($ih#n0#0, Tclass._module.Nat()) && $IsAlloc($ih#n0#0, Tclass._module.Nat(), $initHeapForallStmt#0) && Lit(true) && (DtRank($ih#m0#0) < DtRank(m#0) || (DtRank($ih#m0#0) == DtRank(m#0) && DtRank($ih#n0#0) < DtRank(n#0))) ==> _module.__default.mult($LS($LZ), $Heap, $ih#m0#0, _module.__default.plus($LS($LZ), $Heap, $ih#n0#0, $ih#n0#0)) == _module.__default.mult($LS($LZ), $Heap, _module.__default.plus($LS($LZ), $Heap, $ih#m0#0, $ih#m0#0), $ih#n0#0))
+      var body = BplImp(ante, post);
+      if (includeCanCalls) {
+        body = BplAnd(anteCanCalls, body);
+      }
+      var qq = new Bpl.ForallExpr(tok, bvars, tr, body);
+      exporter.Add(TrAssumeCmd(tok, qq));
+    }
+  }
+
+  void TrForallAssign(ForallStmt s, SingleAssignStmt s0,
+    BoogieStmtListBuilder definedness, BoogieStmtListBuilder updater, Variables locals, ExpressionTranslator etran) {
+    // The statement:
+    //   forall (x,y | Range(x,y)) {
+    //     (a)   E(x,y) . f :=  G(x,y);
+    //     (b)   A(x,y) [ I0(x,y), I1(x,y), ... ] :=  G(x,y);
+    //   }
+    // translate into:
+    //   if (*) {
+    //     // check definedness of Range
+    //     var x,y;
+    //     havoc x,y;
+    //     CheckWellformed( Range );
+    //     assume Range;
+    //     // check definedness of the other expressions
+    //     (a)
+    //       CheckWellformed( E.F );
+    //       check that E.f is in the modifies frame;
+    //       CheckWellformed( G );
+    //       check nat restrictions for the RHS
+    //     (b)
+    //       CheckWellformed( A[I0,I1,...] );
+    //       check that A[I0,I1,...] is in the modifies frame;
+    //       CheckWellformed( G );
+    //       check nat restrictions for the RHS
+    //     // check for duplicate LHSs
+    //     var x', y';
+    //     havoc x', y';
+    //     assume Range[x,y := x',y'];
+    //     assume !(x == x' && y == y');
+    //     (a)
+    //       assert E(x,y) != E(x',y') || G(x,y) == G(x',y');
+    //     (b)
+    //       assert !( A(x,y)==A(x',y') && I0(x,y)==I0(x',y') && I1(x,y)==I1(x',y') && ... ) || G(x,y) == G(x',y');
+    //
+    //     assume false;
+    //
+    //   } else {
+    //     var oldHeap := $Heap;
+    //     havoc $Heap;
+    //     assume $HeapSucc(oldHeap, $Heap);
+    //     (a)
+    //       assume (forall o: ref, F: Field ::
+    //         { $Heap[o,F] }
+    //         $Heap[o,F] = oldHeap[o,F] ||
+    //         (exists x,y :: Range(x,y) && o == E(x,y) && F = f));
+    //       assume (forall x,y ::  Range ==> $Heap[ E[$Heap:=oldHeap], F] == G[$Heap:=oldHeap]); (**)
+    //     (b)
+    //       assume (forall o: ref, F: Field ::
+    //         { $Heap[o,F] }
+    //         $Heap[o,F] = oldHeap[o,F] ||
+    //         (exists x,y :: Range(x,y) && o == A(x,y) && F = Index(I0,I1,...)));
+    //       assume (forall x,y ::  Range ==> $Heap[ A[$Heap:=oldHeap], Index(I0,I1,...)] == G[$Heap:=oldHeap]); (**)
+    //   }
+    //
+    // Note: In order to get a good trigger for the quantifiers (**), we will attempt to make the parameters
+    // that select from $Heap in the LHS of the equalities as plain as possible.  This involves taking the inverse
+    // of an expression, which isn't always easy or possible, so we settle for handling some common cases.  In
+    // particular, we change:
+    //   0: forall i | R(i) { F(i).f := E(i); }
+    //   1: forall i | R(i) { A[F(i)] := E(i); }
+    //   2: forall i | R(i) { F(i)[N] := E(i); }
+    // where f is some field and A and N are expressions that do not depend on i, into:
+    //   0: forall j | Q(j) { j.f := E(F-1(j)); }
+    //   1: forall j | Q(j) { A[j] := E(F-1(j)); }
+    //   2: forall j | Q(j) { j[N] := E(F-1(j)); }
+    // where we ensure that, for all i and j:
+    //   R(i) && j == F(i)    <==>    Q(j) && F-1(j) == i
+    // If the transformation succeeds, we use, respectively, j.f, A[j], and j[N] (each evaluated in the new heap) as
+    // the trigger of the quantifier generated.
+
+    var substMap = SetupBoundVarsAsLocals(s.BoundVars, definedness, locals, etran);
+    Expression range = Substitute(s.Range, null, substMap);
+    TrStmt_CheckWellformed(range, definedness, locals, etran, false);
+    definedness.Add(TrAssumeCmd(s.Range.Origin, etran.TrExpr(range)));
+
+    var lhs = Substitute(s0.Lhs.Resolved, null, substMap);
+    TrStmt_CheckWellformed(lhs, definedness, locals, etran, false);
+    string description = GetObjFieldDetails(lhs, etran, out var obj, out var F);
+    var (lhsObj, lhsField) = lhs switch {
+      MemberSelectExpr e => (e.Obj, e.Member as Field),
+      SeqSelectExpr e => (e.Seq, null),
+      MultiSelectExpr e => (e.Array, null),
+      _ => throw new cce.UnreachableException()
+    };
+    var desc = new Modifiable(description, GetContextModifiesFrames(), lhsObj, lhsField);
+    definedness.Add(Assert(lhs.Origin, Bpl.Expr.SelectTok(lhs.Origin, etran.ModifiesFrame(lhs.Origin), obj, F),
+      desc, definedness.Context));
+    if (s0.Rhs is ExprRhs) {
+      var r = (ExprRhs)s0.Rhs;
+      var rhs = Substitute(r.Expr, null, substMap);
+      TrStmt_CheckWellformed(rhs, definedness, locals, etran, false);
+      // check nat restrictions for the RHS
+      Type lhsType;
+      if (lhs is MemberSelectExpr) {
+        lhsType = ((MemberSelectExpr)lhs).Type;
+      } else if (lhs is SeqSelectExpr) {
+        lhsType = ((SeqSelectExpr)lhs).Type;
+      } else {
+        lhsType = ((MultiSelectExpr)lhs).Type;
+      }
+      var translatedRhs = etran.TrExpr(rhs);
+      CheckSubrange(r.Origin, translatedRhs, rhs.Type, lhsType, rhs, definedness);
+      if (lhs is MemberSelectExpr) {
+        var fse = (MemberSelectExpr)lhs;
+        Contract.Assert(lhsField != null);
+        Check_NewRestrictions(fse.Origin, fse.Obj, obj, lhsField, translatedRhs, definedness, etran);
+      }
+    }
+
+    // check for duplicate LHSs
+    if (s0.Rhs is ExprRhs) {  // if Rhs denotes a havoc, then no duplicate check is performed
+      var substMapPrime = SetupBoundVarsAsLocals(s.BoundVars, definedness, locals, etran);
+      var lhsPrime = Substitute(s0.Lhs.Resolved, null, substMapPrime);
+      range = Substitute(s.Range, null, substMapPrime);
+      definedness.Add(TrAssumeCmd(range.Origin, etran.TrExpr(range)));
+      // assume !(x == x' && y == y');
+      Bpl.Expr eqs = Bpl.Expr.True;
+      foreach (var bv in s.BoundVars) {
+        var x = substMap[bv];
+        var xPrime = substMapPrime[bv];
+        // TODO: in the following line, is the term equality okay, or does it have to include things like Set#Equal sometimes too?
+        eqs = BplAnd(eqs, Bpl.Expr.Eq(etran.TrExpr(x), etran.TrExpr(xPrime)));
+      }
+      definedness.Add(TrAssumeCmd(s.Origin, Bpl.Expr.Not(eqs)));
+      GetObjFieldDetails(lhsPrime, etran, out var objPrime, out var FPrime);
+      var Rhs = ((ExprRhs)s0.Rhs).Expr;
+      var rhs = etran.TrExpr(Substitute(Rhs, null, substMap));
+      var rhsPrime = etran.TrExpr(Substitute(Rhs, null, substMapPrime));
+      var lhsComponents = new List<Expression> { lhsObj };
+      if (lhs is SeqSelectExpr sse) {
+        lhsComponents.Add(sse.E0);
+      } else if (lhs is MultiSelectExpr multi) {
+        lhsComponents.AddRange(multi.Indices);
+      }
+
+      definedness.Add(Assert(s0.Origin,
+        BplOr(
+          BplOr(Bpl.Expr.Neq(obj, objPrime), Bpl.Expr.Neq(F, FPrime)),
+          Bpl.Expr.Eq(rhs, rhsPrime)),
+        new ForallLHSUnique(s.BoundVars, s.Range, lhsComponents, Rhs), definedness.Context));
+    }
+
+    definedness.Add(TrAssumeCmd(s.Origin, Bpl.Expr.False));
+
+    // Now for the translation of the update itself
+
+    Bpl.IdentifierExpr prevHeap = GetPrevHeapVar_IdExpr(s.Origin, locals);
+    var prevEtran = new ExpressionTranslator(this, Predef, prevHeap, etran.scope);
+    updater.Add(Bpl.Cmd.SimpleAssign(s.Origin, prevHeap, etran.HeapExpr));
+    updater.Add(new Bpl.HavocCmd(s.Origin, new List<Bpl.IdentifierExpr> { etran.HeapCastToIdentifierExpr }));
+    updater.Add(TrAssumeCmd(s.Origin, HeapSucc(prevHeap, etran.HeapExpr)));
+
+    // Here comes:
+    //   assume (forall o: ref, f: Field ::
+    //     { $Heap[o,f] }
+    //     $Heap[o,f] = oldHeap[o,f] ||
+    //     (exists x,y :: Range(x,y)[$Heap:=oldHeap] &&
+    //                    o == Object(x,y)[$Heap:=oldHeap] && f == Field(x,y)[$Heap:=oldHeap]));
+    Bpl.BoundVariable oVar = new Bpl.BoundVariable(s.Origin, new Bpl.TypedIdent(s.Origin, "$o", Predef.RefType));
+    Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(s.Origin, oVar);
+    Bpl.BoundVariable fVar = new Bpl.BoundVariable(s.Origin, new Bpl.TypedIdent(s.Origin, "$f", Predef.FieldName(s.Origin)));
+    Bpl.IdentifierExpr f = new Bpl.IdentifierExpr(s.Origin, fVar);
+    Bpl.Expr heapOF = ReadHeap(s.Origin, etran.HeapExpr, o, f);
+    Bpl.Expr oldHeapOF = ReadHeap(s.Origin, prevHeap, o, f);
+    List<bool> freeOfAlloc = BoundedPool.HasBounds(s.Bounds, BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
+    List<Variable> xBvars = new List<Variable>();
+    var xBody = etran.TrBoundVariables(s.BoundVars, xBvars, false, freeOfAlloc);
+    xBody = BplAnd(xBody, prevEtran.TrExpr(s.Range));
+    GetObjFieldDetails(s0.Lhs.Resolved, prevEtran, out var xObj, out var xField);
+    xBody = BplAnd(xBody, Bpl.Expr.Eq(o, xObj));
+    xBody = BplAnd(xBody, Bpl.Expr.Eq(f, xField));
+    //TRIG (exists k#2: int :: (k#2 == LitInt(0 - 3) || k#2 == LitInt(4)) && $o == read($prevHeap, this, _module.MyClass.arr) && $f == MultiIndexField(IndexField(i#0), j#0))
+    Bpl.Expr xObjField = new Bpl.ExistsExpr(s.Origin, xBvars, xBody);  // LL_TRIGGER
+    Bpl.Expr body = BplOr(Bpl.Expr.Eq(heapOF, oldHeapOF), xObjField);
+    var tr = new Trigger(s.Origin, true, new List<Expr>() { heapOF });
+    Bpl.Expr qq = new Bpl.ForallExpr(s.Origin, new List<TypeVariable> { }, new List<Variable> { oVar, fVar }, null, tr, body);
+    updater.Add(TrAssumeCmd(s.Origin, qq));
+
+    if (s.EffectiveEnsuresClauses != null) {
+      foreach (ForallExpr expr in s.EffectiveEnsuresClauses) {
+        BinaryExpr term = (BinaryExpr)expr.Term;
+        Contract.Assert(term != null);
+        var e0 = ((BinaryExpr)term).E0.Resolved;
+        var e1 = ((BinaryExpr)term).E1;
+        qq = TrForall_NewValueAssumption(expr.Origin, expr.BoundVars, expr.Bounds, expr.Range, e0, e1, expr.Attributes, etran, prevEtran);
+        updater.Add(TrAssumeCmd(s.Origin, qq));
+      }
+    }
+  }
+
+  /// <summary>
+  /// Generate:
+  ///   assume (forall x,y :: Range#canCall AND
+  ///                         (Range(x,y)[$Heap:=oldHeap] ==>
+  ///                           $Heap[ Object(x,y)[$Heap:=oldHeap], Field(x,y)[$Heap:=oldHeap] ] == G[$Heap:=oldHeap])));
+  /// where
+  ///   x,y           represent boundVars
+  ///   Object(x,y)   is the first part of lhs
+  ///   Field(x,y)    is the second part of lhs
+  ///   G             is rhs
+  /// If lhsAsTrigger is true, then use the LHS of the equality above as the trigger; otherwise, don't specify any trigger.
+  /// </summary>
+  private Bpl.Expr TrForall_NewValueAssumption(IOrigin tok, List<BoundVar> boundVars, List<BoundedPool> bounds, Expression range, Expression lhs, Expression rhs, Attributes attributes, ExpressionTranslator etran, ExpressionTranslator prevEtran) {
+    Contract.Requires(tok != null);
+    Contract.Requires(boundVars != null);
+    Contract.Requires(bounds != null);
+    Contract.Requires(range != null);
+    Contract.Requires(lhs != null);
+    Contract.Requires(rhs != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(prevEtran != null);
+
+    List<bool> freeOfAlloc = BoundedPool.HasBounds(bounds, BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
+    var xBvars = new List<Variable>();
+    Bpl.Expr xAnte = etran.TrBoundVariables(boundVars, xBvars, false, freeOfAlloc);
+    xAnte = BplAnd(xAnte, prevEtran.TrExpr(range));
+    var g = prevEtran.TrExpr(rhs);
+    GetObjFieldDetails(lhs, prevEtran, out var obj, out var field);
+    var xHeapOF = ReadHeap(tok, etran.HeapExpr, obj, field);
+
+    g = BoxIfNotNormallyBoxed(rhs.Origin, g, rhs.Type);
+
+    Bpl.Trigger tr = null;
+    var argsEtran = etran.WithNoLits();
+    foreach (var aa in attributes.AsEnumerable()) {
+      if (aa.Name == "trigger") {
+        List<Bpl.Expr> tt = new List<Bpl.Expr>();
+        foreach (var arg in aa.Args) {
+          if (arg == lhs) {
+            tt.Add(xHeapOF);
+          } else {
+            tt.Add(argsEtran.TrExpr(arg));
+          }
+        }
+        tr = new Bpl.Trigger(tok, true, tt, tr);
+      }
+    }
+    var canCalls = BplAnd(prevEtran.CanCallAssumption(lhs), prevEtran.CanCallAssumption(rhs));
+    var canCallRange = prevEtran.CanCallAssumption(range);
+    var body = BplAnd(canCalls, Bpl.Expr.Eq(xHeapOF, g));
+    body = BplImp(xAnte, body);
+    body = BplAnd(canCallRange, body);
+    return new Bpl.ForallExpr(tok, xBvars, tr, body);
+  }
+
+  IEnumerable<Statement> TransitiveSubstatements(Statement s) {
+    yield return s;
+    foreach (var ss in s.SubStatements.SelectMany(TransitiveSubstatements)) {
+      yield return ss;
+    }
+  }
+
+  void TrForallProof(ForallStmt forallStmt, BoogieStmtListBuilder definedness, BoogieStmtListBuilder exporter,
+    Variables locals, ExpressionTranslator etran) {
+    // Translate:
+    //   forall (x,y | Range(x,y))
+    //     ensures Post(x,y);
+    //   {
+    //     Body;
+    //   }
+    // as:
+    //   if (*) {
+    //     var x,y;
+    //     havoc x,y;
+    //     CheckWellformed( Range );
+    //     assume Range(x,y);
+    //     CheckWellformed( Post );
+    //     Tr( Body );       // include only if there is a Body
+    //     assert Post;      // include only if there is a Body
+    //     assume false;
+    //   } else {
+    //     assume (forall x,y :: Range(x,y) ==> Post(x,y));
+    //   }
+
+    if (forallStmt.BoundVars.Count != 0) {
+      // Note, it would be nicer (and arguably more appropriate) to do a SetupBoundVarsAsLocals
+      // here (rather than a TrBoundVariables).  However, there is currently no way to apply
+      // a substMap to a statement (in particular, to s.Body), so that doesn't work here.
+      List<bool> freeOfAlloc = BoundedPool.HasBounds(forallStmt.Bounds, BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
+
+      var bVars = new List<Variable>();
+      var typeAntecedent = etran.TrBoundVariables(forallStmt.BoundVars, bVars, true, freeOfAlloc);
+      locals.AddRange(bVars);
+      var havocIds = new List<Bpl.IdentifierExpr>();
+      foreach (Bpl.Variable bv in bVars) {
+        havocIds.Add(new Bpl.IdentifierExpr(forallStmt.Origin, bv));
+      }
+      definedness.Add(new Bpl.HavocCmd(forallStmt.Origin, havocIds));
+      definedness.Add(TrAssumeCmd(forallStmt.Origin, typeAntecedent));
+    }
+    TrStmt_CheckWellformed(forallStmt.Range, definedness, locals, etran, false);
+    definedness.Add(TrAssumeCmdWithDependencies(etran, forallStmt.Range.Origin, forallStmt.Range, "forall statement range"));
+
+    var ensuresDefinedness = new BoogieStmtListBuilder(this, options, definedness.Context);
+    foreach (var ens in ConjunctsOf(forallStmt.Ens)) {
+      TrStmt_CheckWellformed(ens.E, ensuresDefinedness, locals, etran, false);
+      ensuresDefinedness.Add(TrAssumeCmdWithDependencies(etran, ens.E.Origin, ens.E, "forall statement ensures clause"));
+    }
+    PathAsideBlock(forallStmt.Origin, ensuresDefinedness, definedness);
+
+    if (forallStmt.Body != null) {
+      TrStmt(forallStmt.Body, definedness, locals, etran);
+
+      // check that postconditions hold
+      foreach (var ens in ConjunctsOf(forallStmt.Ens)) {
+        definedness.Add(TrAssumeCmd(ens.E.Origin, etran.CanCallAssumption(ens.E)));
+
+        foreach (var split in TrSplitExpr(definedness.Context, ens.E, etran, true, out var splitHappened)) {
+          if (split.IsChecked) {
+            definedness.Add(Assert(split.Tok, split.E, new ForallPostcondition(ens.E), definedness.Context));
+          }
+        }
+      }
+    }
+
+    definedness.Add(TrAssumeCmd(forallStmt.Origin, Bpl.Expr.False));
+
+    // Now for the other branch, where the ensures clauses are exported.
+    // If the forall body has side effect such as call to a reveal function,
+    // it needs to be exported too.
+    var se = forallStmt.Body == null ? Bpl.Expr.True : TrFunctionSideEffect(forallStmt.Body, etran);
+    var substMap = new Dictionary<IVariable, Expression>();
+    var p = Substitute(forallStmt.EffectiveEnsuresClauses[0], null, substMap);
+    exporter.Add(TrAssumeCmd(forallStmt.Origin, etran.CanCallAssumption(p)));
+    var qq = etran.TrExpr(p);
+    if (forallStmt.BoundVars.Count != 0) {
+      exporter.Add(TrAssumeCmd(forallStmt.Origin, BplAnd(se, qq)));
+    } else {
+      exporter.Add(TrAssumeCmd(forallStmt.Origin, BplAnd(se, ((Bpl.ForallExpr)qq).Body)));
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrLoop.cs b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrLoop.cs
new file mode 100644
index 00000000000..0052086a530
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrLoop.cs
@@ -0,0 +1,445 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
+using Bpl = Microsoft.Boogie;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+
+  private void TrAlternativeLoopStmt(AlternativeLoopStmt stmt, BoogieStmtListBuilder builder, Variables locals,
+    ExpressionTranslator etran) {
+    AddComment(builder, stmt, "alternative loop statement");
+    var tru = Expression.CreateBoolLiteral(stmt.Origin, true);
+    TrLoop(stmt, tru,
+      delegate (BoogieStmtListBuilder bld, ExpressionTranslator e) {
+        TrAlternatives(stmt.Alternatives, stmt.Origin,
+          b => {
+            foreach (var _ in Enumerable.Range(0, b.Context.ScopeDepth - builder.Context.ScopeDepth)) {
+              b.Add(new ChangeScope(stmt.Origin, ChangeScope.Modes.Pop));
+            }
+            b.Add(new Bpl.BreakCmd(stmt.Origin, null));
+          },
+          bld, locals, e, stmt.IsGhost);
+        InsertContinueTarget(stmt, bld);
+      },
+      builder, locals, etran);
+  }
+
+  private void TrForLoop(ForLoopStmt stmt, BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran) {
+    Contract.Requires(stmt != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+
+    AddComment(builder, stmt, "for-loop statement");
+
+    var indexVar = stmt.LoopIndex;
+    var indexVarName = indexVar.AssignUniqueName(CurrentDeclaration.IdGenerator);
+    var dIndex = new IdentifierExpr(indexVar.Origin, indexVar);
+    locals.GetOrCreate(indexVarName, () => new Bpl.LocalVariable(indexVar.Origin, new Bpl.TypedIdent(indexVar.Origin, indexVarName, TrType(indexVar.Type))));
+    var bIndex = new Bpl.IdentifierExpr(indexVar.Origin, indexVarName);
+
+    var lo = stmt.GoingUp ? stmt.Start : stmt.End;
+    var hi = stmt.GoingUp ? stmt.End : stmt.Start;
+    Expression dLo = null;
+    Expression dHi = null;
+    Bpl.IdentifierExpr bLo = null;
+    Bpl.IdentifierExpr bHi = null;
+    if (lo != null) {
+      var name = indexVarName + "#lo";
+      locals.GetOrCreate(name, () => new Bpl.LocalVariable(lo.Origin, new Bpl.TypedIdent(lo.Origin, name, Bpl.Type.Int)));
+      bLo = new Bpl.IdentifierExpr(lo.Origin, name);
+      CheckWellformed(lo, new WFOptions(null, false), locals, builder, etran);
+      builder.Add(Bpl.Cmd.SimpleAssign(lo.Origin, bLo, etran.TrExpr(lo)));
+      dLo = new BoogieWrapper(bLo, lo.Type);
+    }
+    if (hi != null) {
+      var name = indexVarName + "#hi";
+      locals.GetOrCreate(name, () => new Bpl.LocalVariable(hi.Origin, new Bpl.TypedIdent(hi.Origin, name, Bpl.Type.Int)));
+      bHi = new Bpl.IdentifierExpr(hi.Origin, name);
+      CheckWellformed(hi, new WFOptions(null, false), locals, builder, etran);
+      builder.Add(Bpl.Cmd.SimpleAssign(hi.Origin, bHi, etran.TrExpr(hi)));
+      dHi = new BoogieWrapper(bHi, hi.Type);
+    }
+
+    // check lo <= hi
+    if (lo != null && hi != null) {
+      builder.Add(Assert(lo.Origin, Bpl.Expr.Le(bLo, bHi), new ForRangeBoundsValid(lo, hi), builder.Context));
+    }
+    // check forall x :: lo <= x <= hi ==> Is(x, typ)
+    {
+      // The check, if needed, is performed like this:
+      //   var x: int;
+      //   havoc x;
+      //   assume lo <= x <= hi;
+      //   assert Is(x, typ);
+      var tok = indexVar.Origin;
+      var name = indexVarName + "#x";
+      var x = new Bpl.IdentifierExpr(tok, name);
+
+      var sourceBoundVar = new BoundVar(Token.NoToken, "x", Type.Int);
+      var checkContext = MakeNumericBoundsSubrangeCheckContext(sourceBoundVar, dLo, dHi);
+      var cre = GetSubrangeCheck(
+        x.tok, x, Type.Int, indexVar.Type,
+        new IdentifierExpr(Token.NoToken, sourceBoundVar),
+        checkContext, out var desc);
+
+      if (cre != null) {
+        locals.GetOrCreate(name, () => new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, name, Bpl.Type.Int)));
+        builder.Add(new Bpl.HavocCmd(tok, new List<Bpl.IdentifierExpr>() { x }));
+        builder.Add(new Bpl.AssumeCmd(tok, ForLoopBounds(x, bLo, bHi)));
+        List<Expression> dafnyRangeBounds = new();
+        if (lo != null) {
+          dafnyRangeBounds.Add(new BinaryExpr(stmt.Origin, BinaryExpr.Opcode.Le, lo, dIndex));
+        }
+        if (hi != null) {
+          dafnyRangeBounds.Add(new BinaryExpr(stmt.Origin, BinaryExpr.Opcode.Le, dIndex, hi));
+        }
+
+        Expression dafnyRange = dafnyRangeBounds.Count == 1
+          ? dafnyRangeBounds[0]
+          : new BinaryExpr(stmt.Origin, BinaryExpr.Opcode.And, dafnyRangeBounds[0], dafnyRangeBounds[1]);
+        var dafnyAssertion = new ForallExpr(stmt.Origin, new List<BoundVar> { indexVar },
+          dafnyRange, new TypeTestExpr(indexVar.Origin, dIndex, indexVar.Type), null);
+        builder.Add(Assert(tok, cre, new ForRangeAssignable(desc, dafnyAssertion), builder.Context));
+      }
+    }
+
+    // initialize the index variable
+    builder.Add(Bpl.Cmd.SimpleAssign(indexVar.Origin, bIndex, stmt.GoingUp ? bLo : bHi));
+
+    // build the guard expression
+    Expression guard;
+    if (lo == null || hi == null) {
+      guard = LiteralExpr.CreateBoolLiteral(stmt.Origin, true);
+    } else {
+      guard = Expression.CreateNot(stmt.Origin, Expression.CreateEq(dIndex, stmt.GoingUp ? dHi : dLo, indexVar.Type));
+    }
+
+    // free invariant lo <= i <= hi
+    var freeInvariant = ForLoopBounds(bIndex, bLo, bHi);
+
+    BodyTranslator bodyTr = null;
+    if (stmt.Body != null) {
+      bodyTr = delegate (BoogieStmtListBuilder bld, ExpressionTranslator e) {
+        CurrentIdGenerator.Push();
+        if (!stmt.GoingUp) {
+          bld.Add(Bpl.Cmd.SimpleAssign(stmt.Origin, bIndex, Bpl.Expr.Sub(bIndex, Bpl.Expr.Literal(1))));
+        }
+        TrStmt(stmt.Body, bld, locals, e);
+        InsertContinueTarget(stmt, bld);
+        if (stmt.GoingUp) {
+          bld.Add(Bpl.Cmd.SimpleAssign(stmt.Origin, bIndex, Bpl.Expr.Add(bIndex, Bpl.Expr.Literal(1))));
+        }
+        CurrentIdGenerator.Pop();
+      };
+    }
+
+    TrLoop(stmt, guard, bodyTr, builder, locals, etran, freeInvariant, stmt.Decreases.Expressions.Count != 0);
+  }
+
+  private void TrWhileStmt(WhileStmt stmt, BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran) {
+    Contract.Requires(stmt != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+
+    AddComment(builder, stmt, "while statement");
+    this.fuelContext = FuelSetting.ExpandFuelContext(stmt.Attributes, stmt.Origin, this.fuelContext, this.reporter);
+    DefineFuelConstant(stmt.Origin, stmt.Attributes, builder, etran);
+    BodyTranslator bodyTr = null;
+    if (stmt.Body != null) {
+      bodyTr = delegate (BoogieStmtListBuilder bld, ExpressionTranslator e) {
+        CurrentIdGenerator.Push();
+        TrStmt(stmt.Body, bld, locals, e);
+        InsertContinueTarget(stmt, bld);
+        CurrentIdGenerator.Pop();
+      };
+    }
+    TrLoop(stmt, stmt.Guard, bodyTr, builder, locals, etran);
+    this.fuelContext = FuelSetting.PopFuelContext();
+  }
+
+  void TrLoop(LoopStmt loop, Expression Guard, BodyTranslator/*?*/ bodyTr,
+    BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran,
+    Bpl.Expr freeInvariant = null, bool includeTerminationCheck = true) {
+    Contract.Requires(loop != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+
+    loop.ScopeDepth = builder.Context.ScopeDepth;
+
+    var suffix = CurrentIdGenerator.FreshId("loop#");
+
+    var theDecreases = loop.Decreases.Expressions;
+
+    var preloopheap = "$PreLoopHeap$" + suffix;
+    var preLoopHeapVar = locals.GetOrCreate(preloopheap, () => new Bpl.LocalVariable(loop.Origin, new Bpl.TypedIdent(loop.Origin, preloopheap, Predef.HeapType)));
+    Bpl.IdentifierExpr preLoopHeap = new Bpl.IdentifierExpr(loop.Origin, preLoopHeapVar);
+    ExpressionTranslator etranPreLoop = new ExpressionTranslator(this, Predef, preLoopHeap, etran.scope);
+    ExpressionTranslator updatedFrameEtran;
+    string loopFrameName = FrameVariablePrefix + suffix;
+    if (loop.Mod.Expressions != null) {
+      updatedFrameEtran = etran.WithModifiesFrame(loopFrameName);
+    } else {
+      updatedFrameEtran = etran;
+    }
+
+    if (loop.Mod.Expressions != null) { // check well-formedness and that the modifies is a subset
+      CheckFrameWellFormed(new WFOptions(), loop.Mod.Expressions, locals, builder, etran);
+      var desc = new ModifyFrameSubset("loop modifies clause", loop.Mod.Expressions, GetContextModifiesFrames());
+      CheckFrameSubset(loop.Origin, loop.Mod.Expressions, null, null, etran, etran.ModifiesFrame(loop.Origin), builder, desc, null);
+      DefineFrame(loop.Origin, etran.ModifiesFrame(loop.Origin), loop.Mod.Expressions, builder, locals, loopFrameName);
+    }
+    builder.Add(Bpl.Cmd.SimpleAssign(loop.Origin, preLoopHeap, etran.HeapExpr));
+
+    var assignedVariables = loop.DescendantsAndSelf.
+      SelectMany(s => s.GetAssignedLocals()).Select(ie => ie.Var)
+      .ToHashSet();
+
+    var daTrackersMonotonicity = new List<Tuple<Bpl.IdentifierExpr, Bpl.IdentifierExpr>>();
+    foreach (var local in assignedVariables) {
+      if (local.UniqueName == null || !DefiniteAssignmentTrackers.TryGetValue(local.UniqueName, out var dat)) {
+        continue;
+      }
+
+      var name = "preLoop$" + suffix + "$" + dat.Name;
+      var preLoopDat = locals.GetOrCreate(name, () => new Bpl.LocalVariable(dat.tok, new Bpl.TypedIdent(dat.tok, name, dat.Type)));
+      var ie = new Bpl.IdentifierExpr(loop.Origin, preLoopDat);
+      daTrackersMonotonicity.Add(new Tuple<Bpl.IdentifierExpr, Bpl.IdentifierExpr>(ie, dat));
+      builder.Add(Cmd.SimpleAssign(loop.Origin, ie, dat));
+    }
+
+    List<Bpl.Expr> initDecr = null;
+    if (!Contract.Exists(theDecreases, e => e is WildcardExpr)) {
+      initDecr = RecordDecreasesValue(theDecreases, builder, locals, etran, "$decr_init$" + suffix);
+    }
+
+    // The variable w is used to coordinate the definedness checking of the loop invariant.
+    // It is also used for body-less loops to turn off invariant checking after the generated body.
+    var wVar = locals.GetOrAdd(new Bpl.LocalVariable(loop.Origin, new Bpl.TypedIdent(loop.Origin, "$w$" + suffix, Bpl.Type.Bool)));
+    Bpl.IdentifierExpr w = new Bpl.IdentifierExpr(loop.Origin, wVar);
+    // havoc w;
+    builder.Add(new Bpl.HavocCmd(loop.Origin, new List<Bpl.IdentifierExpr> { w }));
+
+    List<Bpl.PredicateCmd> invariants = new List<Bpl.PredicateCmd>();
+    if (freeInvariant != null) {
+      invariants.Add(new Bpl.AssumeCmd(freeInvariant.tok, freeInvariant));
+    }
+    BoogieStmtListBuilder invDefinednessBuilder = new BoogieStmtListBuilder(this, options, builder.Context);
+    foreach (AttributedExpression loopInv in loop.Invariants) {
+      var (errorMessage, successMessage) = CustomErrorMessage(loopInv.Attributes);
+      TrStmt_CheckWellformed(loopInv.E, invDefinednessBuilder, locals, etran, false);
+      invDefinednessBuilder.Add(TrAssumeCmdWithDependencies(etran, loopInv.E.Origin, loopInv.E, "loop invariant"));
+
+      builder.Add(TrAssumeCmd(loopInv.E.Origin, BplImp(w, etran.CanCallAssumption(loopInv.E))));
+      invariants.Add(TrAssumeCmd(loopInv.E.Origin, BplImp(w, etran.CanCallAssumption(loopInv.E))));
+      var ss = TrSplitExpr(builder.Context, loopInv.E, etran, false, out var splitHappened);
+      if (!splitHappened) {
+        var wInv = BplImp(w, etran.TrExpr(loopInv.E));
+        invariants.Add(Assert(loopInv.E.Origin, wInv, new LoopInvariant(loopInv.E, errorMessage, successMessage), builder.Context));
+      } else {
+        foreach (var split in ss) {
+          var wInv = Bpl.Expr.Binary(split.E.tok, BinaryOperator.Opcode.Imp, w, split.E);
+          if (split.IsChecked) {
+            invariants.Add(Assert(split.Tok, wInv, new LoopInvariant(loopInv.E, errorMessage, successMessage), builder.Context));  // TODO: it would be fine to have this use {:subsumption 0}
+          } else {
+            var cmd = TrAssumeCmd(split.E.tok, wInv);
+            proofDependencies?.AddProofDependencyId(cmd, loopInv.E.Origin, new InvariantDependency(loopInv.E));
+            invariants.Add(cmd);
+          }
+        }
+      }
+    }
+    // check definedness of decreases clause
+    foreach (Expression e in theDecreases) {
+      builder.Add(TrAssumeCmd(e.Origin, Bpl.Expr.Imp(w, etran.CanCallAssumption(e))));
+      TrStmt_CheckWellformed(e, invDefinednessBuilder, locals, etran, true);
+    }
+    if (codeContext is IMethodCodeContext) {
+      var modifiesClause = ((IMethodCodeContext)codeContext).Modifies.Expressions;
+      if (codeContext is IteratorDecl) {
+        // add "this" to the explicit modifies clause
+        var explicitModifies = modifiesClause;
+        modifiesClause = new List<FrameExpression>();
+        modifiesClause.Add(new FrameExpression(loop.Origin, new ThisExpr((IteratorDecl)codeContext), null));
+        modifiesClause.AddRange(explicitModifies);
+      }
+      // include boilerplate invariants
+      foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(loop.Origin, modifiesClause, loop.IsGhost, codeContext.AllowsAllocation, etranPreLoop, etran, etran.Old)) {
+        if (tri.IsFree) {
+          invariants.Add(TrAssumeCmd(loop.Origin, tri.Expr));
+        } else {
+          Contract.Assert(tri.ErrorMessage != null);  // follows from BoilerplateTriple invariant
+          invariants.Add(Assert(loop.Origin, tri.Expr, new Microsoft.Dafny.BoilerplateTriple(tri.ErrorMessage, tri.SuccessMessage, tri.Comment), builder.Context));
+        }
+      }
+      // add a free invariant which says that the heap hasn't changed outside of the modifies clause.
+      invariants.Add(TrAssumeCmd(loop.Origin, FrameConditionUsingDefinedFrame(loop.Origin, etranPreLoop, etran, updatedFrameEtran, updatedFrameEtran.ModifiesFrame(loop.Origin))));
+      // for iterators, add "fresh(_new)" as an invariant
+      if (codeContext is IteratorDecl iter) {
+        var th = new ThisExpr(iter);
+        var thisDotNew = new MemberSelectExpr(loop.Origin, th, iter.Member_New);
+        var fr = new FreshExpr(loop.Origin, thisDotNew);
+        fr.Type = Type.Bool;
+        invariants.Add(TrAssertCmd(loop.Origin, etran.TrExpr(fr)));
+      }
+    }
+
+    // include a free invariant that says that all definite-assignment trackers have only become more "true"
+    foreach (var pair in daTrackersMonotonicity) {
+      Bpl.Expr monotonic = BplImp(pair.Item1, pair.Item2);
+      invariants.Add(TrAssumeCmd(loop.Origin, monotonic));
+    }
+
+    // include a free invariant that says that all completed iterations so far have only decreased the termination metric
+    if (initDecr != null) {
+      var toks = new List<IOrigin>();
+      var decrs = new List<Expr>();
+      var decrsDafny = new List<Expression>();
+      var initDecrsDafny = new List<Expression>();
+      var prevGhostLocals = new List<VarDeclStmt>();
+      foreach (Expression e in theDecreases) {
+        toks.Add(e.Origin);
+        decrsDafny.Add(e);
+        decrs.Add(etran.TrExpr(e));
+        var (prevVars, eInit) = TranslateToLoopEntry(loop, e, "LoopEntry");
+        prevGhostLocals.AddRange(prevVars);
+        initDecrsDafny.Add(eInit);
+      }
+      Bpl.Expr decrCheck = DecreasesCheck(toks, prevGhostLocals, decrsDafny, initDecrsDafny, decrs, initDecr,
+        null, null, true, false);
+      invariants.Add(TrAssumeCmd(loop.Origin, decrCheck));
+    }
+
+    var loopBodyBuilder = new BoogieStmtListBuilder(this, options, builder.Context);
+    loopBodyBuilder.AddCaptureState(loop.Origin, true, CaptureStateExtensions.AfterLoopIterationsStateMarker);
+
+    // As the first thing inside the loop, generate:  if (!w) { CheckWellformed(inv); assume false; }
+    invDefinednessBuilder.Add(TrAssumeCmd(loop.Origin, Bpl.Expr.False));
+    loopBodyBuilder.Add(new Bpl.IfCmd(loop.Origin, Bpl.Expr.Not(w), invDefinednessBuilder.Collect(loop.Origin), null, null));
+
+    // Generate:  CheckWellformed(guard); if (!guard) { break; }
+    // but if this is a body-less loop, put all of that inside:  if (*) { ... }
+    // Without this, Boogie's abstract interpreter may figure out that the loop guard is always false
+    // on entry to the loop, and then Boogie wouldn't consider this a loop at all. (See also comment
+    // in methods GuardAlwaysHoldsOnEntry_BodyLessLoop and GuardAlwaysHoldsOnEntry_LoopWithBody in
+    // Test/dafny0/DirtyLoops.dfy.)
+    var isBodyLessLoop = loop is OneBodyLoopStmt { BodySurrogate: { } };
+    var whereToBuildLoopGuard = isBodyLessLoop ? new BoogieStmtListBuilder(this, options, builder.Context) : loopBodyBuilder;
+    Bpl.Expr guard = null;
+    if (Guard != null) {
+      TrStmt_CheckWellformed(Guard, whereToBuildLoopGuard, locals, etran, true);
+      guard = Bpl.Expr.Not(etran.TrExpr(Guard));
+    }
+    var guardBreak = new BoogieStmtListBuilder(this, options, builder.Context);
+    guardBreak.Add(new Bpl.BreakCmd(loop.Origin, null));
+    whereToBuildLoopGuard.Add(new Bpl.IfCmd(loop.Origin, guard, guardBreak.Collect(loop.Origin), null, null));
+    if (isBodyLessLoop) {
+      loopBodyBuilder.Add(new Bpl.IfCmd(loop.Origin, null, whereToBuildLoopGuard.Collect(loop.Origin), null, null));
+    }
+
+    if (bodyTr != null) {
+      // termination checking
+      if (Contract.Exists(theDecreases, e => e is WildcardExpr)) {
+        // omit termination checking for this loop
+        bodyTr(loopBodyBuilder, updatedFrameEtran);
+      } else {
+        foreach (Expression e in theDecreases) {
+          loopBodyBuilder.Add(TrAssumeCmd(e.Origin, BplImp(w, etran.CanCallAssumption(e))));
+        }
+        List<Bpl.Expr> oldBfs = RecordDecreasesValue(theDecreases, loopBodyBuilder, locals, etran, "$decr$" + suffix);
+        // time for the actual loop body
+        bodyTr(loopBodyBuilder, updatedFrameEtran);
+        // check definedness of decreases expressions
+        var toks = new List<IOrigin>();
+        var decrs = new List<Expr>();
+        var decrsDafny = new List<Expression>();
+        var initDecrsDafny = new List<Expression>();
+        var prevGhostLocals = new List<VarDeclStmt>();
+        foreach (Expression e in theDecreases) {
+          toks.Add(e.Origin);
+          // Note: the label "LoopEntry" doesn't exist in the program, and is
+          // useful only for explanatory purposes.
+          decrsDafny.Add(e);
+          var (prevVars, eInit) = TranslateToLoopEntry(loop, e, "LoopEntry");
+          prevGhostLocals.AddRange(prevVars);
+          initDecrsDafny.Add(eInit);
+          decrs.Add(etran.TrExpr(e));
+          // need to add can calls again because the actual loop body updates the variables
+          loopBodyBuilder.Add(TrAssumeCmd(e.Origin, BplImp(w, etran.CanCallAssumption(e))));
+        }
+        if (includeTerminationCheck) {
+          AddComment(loopBodyBuilder, loop, "loop termination check");
+          Bpl.Expr decrCheck = DecreasesCheck(toks, prevGhostLocals, decrsDafny, initDecrsDafny, decrs, oldBfs,
+            loopBodyBuilder, " at end of loop iteration", false, false);
+          var description = new
+            Terminates(loop.InferredDecreases, prevGhostLocals, null, initDecrsDafny, theDecreases, false);
+          loopBodyBuilder.Add(Assert(loop.NavigationToken, decrCheck, description, builder.Context));
+        }
+      }
+    } else if (isBodyLessLoop) {
+      var bodySurrogate = ((OneBodyLoopStmt)loop).BodySurrogate;
+      // This is a body-less loop. Havoc the targets and then set w to false, to make the loop-invariant
+      // maintenance check vaccuous.
+      var bplTargets = bodySurrogate.LocalLoopTargets.ConvertAll(v => TrVar(loop.Origin, v));
+      if (bodySurrogate.UsesHeap) {
+        bplTargets.Add(etran.HeapCastToIdentifierExpr);
+      }
+      loopBodyBuilder.Add(new Bpl.HavocCmd(loop.Origin, bplTargets));
+      loopBodyBuilder.Add(Bpl.Cmd.SimpleAssign(loop.Origin, w, Bpl.Expr.False));
+    }
+    // Finally, assume the well-formedness of the invariant (which has been checked once and for all above), so that the check
+    // of invariant-maintenance can use the appropriate canCall predicates. Note, it is important (see Test/git-issues/git-issue-1812.dfy)
+    // that each CanCall assumption uses the preceding invariants as antecedents--this is achieved by treating all "invariant"
+    // declarations as one big conjunction, because then CanCallAssumption will add the needed antecedents.
+    if (loop.Invariants.Any()) {
+      var allInvariants = loop.Invariants.Select(inv => inv.E).Aggregate((a, b) => Expression.CreateAnd(a, b));
+      loopBodyBuilder.Add(TrAssumeCmd(loop.Origin, etran.CanCallAssumption(allInvariants)));
+    }
+
+    Bpl.StmtList body = loopBodyBuilder.Collect(loop.Origin);
+    builder.Add(new Bpl.WhileCmd(loop.Origin, Bpl.Expr.True, invariants, new List<CallCmd>(), body));
+  }
+
+  // Return the version of e that holds at the beginnging of the loop,
+  // Along with the local variable assignments that need to happen at
+  // the beginning of the loop for it to be valid.
+  private (List<VarDeclStmt>, Expression) TranslateToLoopEntry(LoopStmt loop, Expression e, string loopLabel) {
+    var prevGhostLocals = new List<VarDeclStmt>();
+    Expression olde = new OldExpr(e.Origin, e, loopLabel) {
+      Type = e.Type
+    };
+
+    var subStmts = TransitiveSubstatements(loop);
+    var modifiedVars =
+      subStmts
+        .OfType<SingleAssignStmt>()
+        .Select(s => s.Lhs)
+        .OfType<IdentifierExpr>();
+    foreach (var ie in modifiedVars) {
+      var prevName = $"prev_{ie.Name}";
+      var prevDecl = Statement.CreateLocalVariable(SourceOrigin.NoToken, prevName, ie);
+      var prevRef = Expression.CreateIdentExpr(prevDecl.Locals[0]);
+      olde = Substitute(olde, ie.Var, prevRef);
+      prevGhostLocals.Add(prevDecl);
+    }
+
+    return (prevGhostLocals, olde);
+
+  }
+
+  void InsertContinueTarget(LoopStmt loop, BoogieStmtListBuilder builder) {
+    Contract.Requires(loop != null);
+    Contract.Requires(builder != null);
+    if (loop.Labels != null) {
+      builder.AddLabelCmd(loop.Origin, "continue_" + loop.Labels.Data.AssignUniqueId(CurrentIdGenerator));
+    }
+  }
+}
diff --git a/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrPredicateStatement.cs b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrPredicateStatement.cs
new file mode 100644
index 00000000000..c9d8e768b2e
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrPredicateStatement.cs
@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
+using Bpl = Microsoft.Boogie;
+using BplParser = Microsoft.Boogie.Parser;
+using static Microsoft.Dafny.Util;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny {
+  public partial class BoogieGenerator {
+
+    private void TrPredicateStmt(PredicateStmt stmt, BoogieStmtListBuilder builder,
+      Variables locals, ExpressionTranslator etran) {
+      Contract.Requires(stmt != null);
+      Contract.Requires(builder != null);
+      Contract.Requires(locals != null);
+      Contract.Requires(etran != null);
+
+      fuelContext = FuelSetting.ExpandFuelContext(stmt.Attributes, stmt.Origin, fuelContext, reporter);
+      if (stmt is AssertStmt || options.DisallowSoundnessCheating) {
+        TrAssertStmt(stmt, builder, locals, etran);
+      } else if (stmt is ExpectStmt expectStmt) {
+        TrExpectStmt(builder, locals, etran, expectStmt);
+      } else if (stmt is AssumeStmt assumeStmt) {
+        TrAssumeStmt(assumeStmt, builder, locals, etran);
+      }
+      fuelContext = FuelSetting.PopFuelContext();
+    }
+
+    private void TrAssumeStmt(AssumeStmt assumeStmt, BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran) {
+      AddComment(builder, assumeStmt, "assume statement");
+      stmtContext = StmtType.ASSUME;
+      TrStmt_CheckWellformed(assumeStmt.Expr, builder, locals, etran, false);
+      builder.Add(TrAssumeCmdWithDependencies(etran, assumeStmt.Origin, assumeStmt.Expr, "assume statement", true,
+        etran.TrAttributes(assumeStmt.Attributes, null)));
+      stmtContext = StmtType.NONE; // done with translating assume stmt.
+      if (options.TestGenOptions.Mode != TestGenerationOptions.Modes.None) {
+        builder.AddCaptureState(assumeStmt);
+      }
+    }
+
+    private void TrExpectStmt(BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran, ExpectStmt expectStmt) {
+      AddComment(builder, expectStmt, "expect statement");
+      stmtContext = StmtType.ASSUME;
+      TrStmt_CheckWellformed(expectStmt.Expr, builder, locals, etran, false);
+
+      // Need to check the message is well-formed, assuming the expected expression
+      // does NOT hold:
+      //
+      // if Not(TrExpr[[ s.Expr ]]) {
+      //  CheckWellformed[[ s.Message ]]
+      //  assume false;
+      // }
+      BoogieStmtListBuilder thnBuilder = new BoogieStmtListBuilder(this, options, builder.Context);
+      TrStmt_CheckWellformed(expectStmt.Message, thnBuilder, locals, etran, false);
+      thnBuilder.Add(TrAssumeCmd(expectStmt.Origin, new Bpl.LiteralExpr(expectStmt.Origin, false),
+        etran.TrAttributes(expectStmt.Attributes, null)));
+      Bpl.StmtList thn = thnBuilder.Collect(expectStmt.Origin);
+      builder.Add(new Bpl.IfCmd(expectStmt.Origin, Bpl.Expr.Not(etran.TrExpr(expectStmt.Expr)), thn, null, null));
+
+      stmtContext = StmtType.NONE; // done with translating expect stmt.
+    }
+
+    public void TrAssertStmt(PredicateStmt stmt, BoogieStmtListBuilder builder, Variables locals,
+      ExpressionTranslator etran) {
+      var stmtBuilder = new BoogieStmtListBuilder(this, options, builder.Context);
+      var defineFuel = DefineFuelConstant(stmt.Origin, stmt.Attributes, stmtBuilder, etran);
+      var b = defineFuel ? stmtBuilder : builder;
+      stmtContext = StmtType.ASSERT;
+      AddComment(b, stmt, "assert statement");
+      TrStmt_CheckWellformed(stmt.Expr, b, locals, etran, false);
+
+      var hiddenProof = false;
+      BoogieStmtListBuilder proofBuilder = null;
+      var assertStmt = stmt as AssertStmt;
+      if (assertStmt is { Label: not null }) {
+        hiddenProof = true;
+        proofBuilder = new BoogieStmtListBuilder(this, options, builder.Context);
+        AddComment(proofBuilder, stmt, "assert statement proof");
+      }
+      proofBuilder ??= b;
+
+      var splitHappened = TrAssertCondition(stmt, etran, proofBuilder);
+
+      if (hiddenProof) {
+        PathAsideBlock(stmt.Origin, proofBuilder, b);
+      }
+
+      stmtContext = StmtType.NONE; // done with translating assert stmt
+      if (splitHappened || hiddenProof) {
+        if (assertStmt is { Label: not null }) {
+          // make copies of the variables used in the assertion
+          var name = "$Heap_at_" + assertStmt.Label.AssignUniqueId(CurrentIdGenerator);
+          var heapAt = locals.GetOrAdd(new Bpl.LocalVariable(stmt.Origin, new Bpl.TypedIdent(stmt.Origin, name, Predef.HeapType)));
+          var heapReference = new Bpl.IdentifierExpr(stmt.Origin, heapAt);
+          b.Add(Bpl.Cmd.SimpleAssign(stmt.Origin, heapReference, etran.HeapExpr));
+          var substMap = new Dictionary<IVariable, Expression>();
+          foreach (var v in FreeVariablesUtil.ComputeFreeVariables(options, assertStmt.Expr)) {
+            if (v is LocalVariable) {
+              var vcopy = new LocalVariable(stmt.Origin, string.Format("##{0}#{1}", name, v.Name), v.Type,
+                v.IsGhost);
+              vcopy.type = vcopy.SyntacticType; // resolve local here
+              IdentifierExpr ie = new IdentifierExpr(vcopy.Origin,
+                vcopy.AssignUniqueName(CurrentDeclaration.IdGenerator));
+              ie.Var = vcopy;
+              ie.Type = ie.Var.Type; // resolve ie here
+              substMap.Add(v, ie);
+              locals.GetOrAdd(new Bpl.LocalVariable(vcopy.Origin,
+                new Bpl.TypedIdent(vcopy.Origin, vcopy.AssignUniqueName(CurrentDeclaration.IdGenerator),
+                  TrType(vcopy.Type))));
+              b.Add(Bpl.Cmd.SimpleAssign(stmt.Origin, TrVar(stmt.Origin, vcopy), TrVar(stmt.Origin, v)));
+            }
+          }
+
+          var exprToBeRevealed = Substitute(assertStmt.Expr, null, substMap);
+          var etr = new ExpressionTranslator(etran, heapReference);
+          assertStmt.Label.E = etr.TrExpr(exprToBeRevealed);
+        } else if (!defineFuel) {
+          // Adding the assume stmt, resetting the stmtContext
+          stmtContext = StmtType.ASSUME;
+          adjustFuelForExists = true;
+          b.Add(TrAssumeCmdWithDependencies(etran, stmt.Origin, stmt.Expr, "assert statement", true));
+          stmtContext = StmtType.NONE;
+        }
+      }
+
+      if (defineFuel) {
+        var ifCmd = new Bpl.IfCmd(stmt.Origin, null, b.Collect(stmt.Origin), null,
+          null); // BUGBUG: shouldn't this first append "assume false" to "b"? (use PathAsideBlock to do this)  --KRML
+        builder.Add(ifCmd);
+        // Adding the assume stmt, resetting the stmtContext
+        stmtContext = StmtType.ASSUME;
+        adjustFuelForExists = true;
+        builder.Add(TrAssumeCmdWithDependencies(etran, stmt.Origin, stmt.Expr, "assert statement", true));
+        stmtContext = StmtType.NONE;
+      }
+
+      if (options.TestGenOptions.Mode != TestGenerationOptions.Modes.None) {
+        builder.AddCaptureState(stmt);
+      }
+    }
+
+    private bool TrAssertCondition(PredicateStmt stmt,
+      ExpressionTranslator etran, BoogieStmtListBuilder proofBuilder) {
+
+      var (errorMessage, successMessage) = CustomErrorMessage(stmt.Attributes);
+      var splits = TrSplitExpr(proofBuilder.Context, stmt.Expr, etran, true, out var splitHappened);
+      if (!splitHappened) {
+        var desc = new AssertStatementDescription(stmt, errorMessage, successMessage);
+        proofBuilder.Add(Assert(stmt.Origin, etran.TrExpr(stmt.Expr), desc, stmt.Origin, proofBuilder.Context,
+          etran.TrAttributes(stmt.Attributes, null)));
+      } else {
+        foreach (var split in splits) {
+          if (split.IsChecked) {
+            var tok = split.E.tok;
+            var desc = new AssertStatementDescription(stmt, errorMessage, successMessage);
+            proofBuilder.Add(AssertAndForget(proofBuilder.Context, ToDafnyToken(flags.ReportRanges, tok), split.E, desc, stmt.Origin,
+              etran.TrAttributes(stmt.Attributes, null))); // attributes go on every split
+          }
+        }
+      }
+
+      return splitHappened;
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrStatement.cs b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrStatement.cs
new file mode 100644
index 00000000000..5205e0a227b
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Statements/BoogieGenerator.TrStatement.cs
@@ -0,0 +1,891 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using DafnyCore.Verifier;
+using DafnyCore.Verifier.Statements;
+using Microsoft.Boogie;
+using Bpl = Microsoft.Boogie;
+using static Microsoft.Dafny.Util;
+using PODesc = Microsoft.Dafny.ProofObligationDescription;
+
+namespace Microsoft.Dafny;
+
+public partial class BoogieGenerator {
+  public const string FrameVariablePrefix = "$Frame$";
+
+  public void TrStmt(Statement stmt, BoogieStmtListBuilder builder,
+    Variables locals, ExpressionTranslator etran) {
+
+    stmt.ScopeDepth = builder.Context.ScopeDepth;
+
+    Contract.Requires(stmt != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(codeContext != null && Predef != null);
+    Contract.Ensures(fuelContext == Contract.OldValue(fuelContext));
+
+    stmtContext = StmtType.NONE;
+    adjustFuelForExists = true;  // fuel for exists might need to be adjusted based on whether it's in an assert or assume stmt.
+    if (stmt is PredicateStmt predicateStmt) {
+      TrPredicateStmt(predicateStmt, builder, locals, etran);
+
+    } else if (stmt is PrintStmt) {
+      AddComment(builder, stmt, "print statement");
+      PrintStmt s = (PrintStmt)stmt;
+      foreach (var arg in s.Args) {
+        TrStmt_CheckWellformed(arg, builder, locals, etran, false);
+      }
+      if (options.TestGenOptions.Mode != TestGenerationOptions.Modes.None) {
+        builder.AddCaptureState(s);
+      }
+
+    } else if (stmt is HideRevealStmt revealStmt) {
+      TranslateRevealStmt(this, builder, locals, etran, revealStmt);
+    } else if (stmt is BreakOrContinueStmt breakStmt) {
+      TrBreakStmt(builder, etran, breakStmt);
+    } else if (stmt is ReturnStmt returnStmt) {
+      AddComment(builder, returnStmt, "return statement");
+      if (returnStmt.ReverifyPost) {
+        // $_reverifyPost := true;
+        builder.Add(Bpl.Cmd.SimpleAssign(returnStmt.Origin, new Bpl.IdentifierExpr(returnStmt.Origin, "$_reverifyPost", Bpl.Type.Bool), Bpl.Expr.True));
+      }
+      if (returnStmt.HiddenUpdate != null) {
+        TrStmt(returnStmt.HiddenUpdate, builder, locals, etran);
+      }
+      if (codeContext is IMethodCodeContext) {
+        var method = (IMethodCodeContext)codeContext;
+        method.Outs.ForEach(p => CheckDefiniteAssignmentReturn(stmt.Origin, p, builder));
+      }
+
+      if (codeContext is Method { FunctionFromWhichThisIsByMethodDecl: { ByMethodTok: { } } fun } method2) {
+        AssumeCanCallForByMethodDecl(method2, builder);
+      }
+
+      foreach (var _ in Enumerable.Range(0, builder.Context.ScopeDepth)) {
+        builder.Add(new ChangeScope(returnStmt.Origin, ChangeScope.Modes.Pop));
+      }
+      builder.Add(new ReturnCmd(returnStmt.Origin) {
+        Attributes = etran.TrAttributes(returnStmt.Attributes)
+      });
+    } else if (stmt is YieldStmt) {
+      var s = (YieldStmt)stmt;
+      AddComment(builder, s, "yield statement");
+      Contract.Assert(codeContext is IteratorDecl);
+      var iter = (IteratorDecl)codeContext;
+      // if the yield statement has arguments, do them first
+      if (s.HiddenUpdate != null) {
+        TrStmt(s.HiddenUpdate, builder, locals, etran);
+      }
+      // this.ys := this.ys + [this.y];
+      var th = new ThisExpr(iter);
+      var dafnyOutExprs = new List<Expression>();
+      Contract.Assert(iter.OutsFields.Count == iter.OutsHistoryFields.Count);
+      for (int i = 0; i < iter.OutsFields.Count; i++) {
+        var y = iter.OutsFields[i];
+        var dafnyY = new MemberSelectExpr(s.Origin, th, y);
+        dafnyOutExprs.Add(dafnyY);
+        var ys = iter.OutsHistoryFields[i];
+        var dafnyYs = new MemberSelectExpr(s.Origin, th, ys);
+        var dafnySingletonY = new SeqDisplayExpr(s.Origin, new List<Expression>() { dafnyY });
+        dafnySingletonY.Type = ys.Type;  // resolve here
+        var rhs = new BinaryExpr(s.Origin, BinaryExpr.Opcode.Add, dafnyYs, dafnySingletonY);
+        rhs.ResolvedOp = BinaryExpr.ResolvedOpcode.Concat;
+        rhs.Type = ys.Type;  // resolve here
+        var cmd = Bpl.Cmd.SimpleAssign(s.Origin, etran.HeapCastToIdentifierExpr,
+          UpdateHeap(s.Origin, etran.HeapExpr, etran.TrExpr(th), new Bpl.IdentifierExpr(s.Origin, GetField(ys)), etran.TrExpr(rhs)));
+        builder.Add(cmd);
+      }
+      // yieldCount := yieldCount + 1;  assume yieldCount == |ys|;
+      var yc = new Bpl.IdentifierExpr(s.Origin, yieldCountVariable);
+      var incYieldCount = Bpl.Cmd.SimpleAssign(s.Origin, yc, Bpl.Expr.Binary(s.Origin, Bpl.BinaryOperator.Opcode.Add, yc, Bpl.Expr.Literal(1)));
+      builder.Add(incYieldCount);
+      builder.Add(TrAssumeCmd(s.Origin, YieldCountAssumption(iter, etran)));
+      // assume $IsGoodHeap($Heap);
+      builder.Add(AssumeGoodHeap(s.Origin, etran));
+      // assert YieldEnsures[subst];  // where 'subst' replaces "old(E)" with "E" being evaluated in $_OldIterHeap
+      var yeEtran = new ExpressionTranslator(this, Predef, etran.HeapExpr, new Bpl.IdentifierExpr(s.Origin, "$_OldIterHeap", Predef.HeapType), iter);
+
+      var rhss = s.Rhss == null
+        ? dafnyOutExprs
+        : s.Rhss.Select(rhs => rhs is ExprRhs e ? e.Expr : null).ToList();
+      var fieldSubstMap = iter.OutsFields.Zip(rhss)
+        .Where(outRhs => outRhs.Second != null)
+        .ToDictionary(
+          outRhs => outRhs.First.Name,
+          outRhs => outRhs.Second
+        );
+      var fieldSub = new SpecialFieldSubstituter(fieldSubstMap);
+
+      foreach (var p in iter.YieldEnsures) {
+        var ss = TrSplitExpr(builder.Context, p.E, yeEtran, true, out var splitHappened);
+        foreach (var split in ss) {
+          if (split.Tok.IsInherited(currentModule)) {
+            // this postcondition was inherited into this module, so just ignore it
+          } else if (split.IsChecked) {
+            var yieldToken = new NestedOrigin(s.Origin, split.Tok);
+            var desc = new YieldEnsures(fieldSub.Substitute(p.E));
+            builder.Add(AssertAndForget(builder.Context, yieldToken, split.E, desc, stmt.Origin, null));
+          }
+        }
+        builder.Add(TrAssumeCmdWithDependencies(yeEtran, stmt.Origin, p.E, "yield ensures clause"));
+      }
+      YieldHavoc(iter.Origin, iter, builder, etran);
+      builder.AddCaptureState(s);
+
+    } else if (stmt is AssignSuchThatStmt) {
+      var s = (AssignSuchThatStmt)stmt;
+      AddComment(builder, s, "assign-such-that statement");
+      // Essentially, treat like an assert (that values for the LHS exist), a havoc (of the LHS), and an
+      // assume (of the RHS).  However, we also need to check the well-formedness of the LHS and RHS.
+      // The well-formedness of the LHS is done by the havoc. The well-formedness of the RHS is most
+      // easily done after that havoc, but we need to be careful about two things:
+      //   - We should not generate any errors for uses of LHSs. This is not an issue for fields or
+      //     array elements, because they already have values before reaching the assign-such-that statement.
+      //     (Note, "this.f" is not allowed as a LHS in the first division of a constructor.)
+      //     For any local variable or out-parameter x that's a LHS, we create a new variable x' and
+      //     substitute x' for x in the RHS before doing the well-formedness check.
+      //   - The well-formedness checks need to be able to assume that each x' has a value of its
+      //     type. However, this assumption must not carry over to the existence assertion, because
+      //     then everything will be provable if x' is of a known-empty type. Instead, the well-formedness
+      //     check is wrapped inside an "if" whose guard is the type antecedent. After the existence
+      //     check, the type antecedent is assumed of the original x, the RHS is assumed, and x is
+      //     marked off has having been definitely assigned.
+      //
+      // So, the Dafny statement
+      //     E.f, x :| RHS(x);
+      // is translated into the following Boogie code:
+      //     var x';
+      //     Tr[[ E.f := *; ]]  // this havoc is translated like a Dafny assignment statement, which means
+      //                        // the well-formedness of E is checked here
+      //     if (typeAntecedent(x')) {
+      //       check well-formedness of RHS(x');
+      //     }
+      //     assert (exists x'' :: RHS(x''));  // for ":| assume", omit this line; for ":|", LHS is only allowed to contain simple variables
+      //     defass#x := true;
+      //     havoc x;
+      //     assume RHS(x);
+
+      var simpleLHSs = new List<IdentifierExpr>();
+      Bpl.Expr typeAntecedent = Bpl.Expr.True;
+      var havocLHSs = new List<Expression>();
+      var havocRHSs = new List<AssignmentRhs>();
+      var substMap = new Dictionary<IVariable, Expression>();
+      foreach (var lhs in s.Lhss) {
+        var lvalue = lhs.Resolved;
+        if (lvalue is IdentifierExpr ide) {
+          simpleLHSs.Add(ide);
+          var wh = SetupVariableAsLocal(ide.Var, substMap, builder, locals, etran);
+          typeAntecedent = BplAnd(typeAntecedent, wh);
+        } else {
+          havocLHSs.Add(lvalue);
+          havocRHSs.Add(new HavocRhs(lhs.Origin));  // note, a HavocRhs is constructed as already resolved
+        }
+      }
+      ProcessLhss(havocLHSs, false, true, builder, locals, etran, stmt, out var lhsBuilder, out var bLhss, out _, out _, out _);
+      ProcessRhss(lhsBuilder, bLhss, havocLHSs, havocRHSs, builder, locals, etran, stmt);
+
+      // Here comes the well-formedness check
+      var wellFormednessBuilder = new BoogieStmtListBuilder(this, options, builder.Context);
+      var rhs = Substitute(s.Expr, null, substMap);
+      TrStmt_CheckWellformed(rhs, wellFormednessBuilder, locals, etran, false);
+      var ifCmd = new Bpl.IfCmd(s.Origin, typeAntecedent, wellFormednessBuilder.Collect(s.Origin), null, null);
+      builder.Add(ifCmd);
+
+      // Here comes the assert part
+      if (s.AssumeToken == null) {
+        substMap = new Dictionary<IVariable, Expression>();
+        var bvars = new List<BoundVar>();
+        foreach (var lhs in s.Lhss) {
+          var l = lhs.Resolved;
+          if (l is IdentifierExpr x) {
+            CloneVariableAsBoundVar(x.Origin, x.Var, "$as#" + x.Name, out var bv, out var ie);
+            bvars.Add(bv);
+            substMap.Add(x.Var, ie);
+          } else {
+            // other forms of LHSs have been ruled out by the resolver (it would be possible to
+            // handle them, but it would involve heap-update expressions--the translation would take
+            // effort, and it's not certain that the existential would be successful in verification).
+            Contract.Assume(false);  // unexpected case
+          }
+        }
+
+        GenerateAndCheckGuesses(s.Origin, bvars, s.Bounds, Substitute(s.Expr, null, substMap), TrTrigger(etran, s.Attributes, s.Origin, substMap), builder, etran);
+      }
+
+      // Mark off the simple variables as having definitely been assigned AND THEN havoc their values. By doing them
+      // in this order, the type antecedents will in effect be assumed.
+      var bHavocLHSs = new List<Bpl.IdentifierExpr>();
+      foreach (var lhs in simpleLHSs) {
+        MarkDefiniteAssignmentTracker(lhs, builder);
+        bHavocLHSs.Add((Bpl.IdentifierExpr)etran.TrExpr(lhs));
+      }
+      builder.Add(new Bpl.HavocCmd(s.Origin, bHavocLHSs));
+
+      // End by doing the assume
+      builder.Add(TrAssumeCmdWithDependencies(etran, s.Origin, s.Expr, "assign-such-that constraint"));
+      builder.AddCaptureState(s);  // just do one capture state--here, at the very end (that is, don't do one before the assume)
+
+    } else if (stmt is AssignStatement statement) {
+      TrUpdateStmt(builder, locals, etran, statement);
+    } else if (stmt is AssignOrReturnStmt) {
+      AddComment(builder, stmt, "assign-or-return statement (:-)");
+      AssignOrReturnStmt s = (AssignOrReturnStmt)stmt;
+      TrStmtList(s.ResolvedStatements, builder, locals, etran);
+
+    } else if (stmt is SingleAssignStmt) {
+      AddComment(builder, stmt, "assignment statement");
+      SingleAssignStmt s = (SingleAssignStmt)stmt;
+      TrAssignment(stmt, s.Lhs.Resolved, s.Rhs, builder, locals, etran);
+
+    } else if (stmt is CallStmt) {
+      AddComment(builder, stmt, "call statement");
+      TrCallStmt((CallStmt)stmt, builder, locals, etran, null);
+
+    } else if (stmt is DividedBlockStmt) {
+      var s = (DividedBlockStmt)stmt;
+      AddComment(builder, stmt, "divided block before new;");
+      var previousTrackers = DefiniteAssignmentTrackers;
+      var tok = s.SeparatorTok ?? s.Origin;
+      // a DividedBlockStmt occurs only inside a Constructor body of a class
+      var cl = (ClassDecl)((Constructor)codeContext).EnclosingClass;
+      var fields = Concat(cl.InheritedMembers, cl.Members).ConvertAll(member =>
+        member is Field && !member.IsStatic && !member.IsInstanceIndependentConstant ? (Field)member : null);
+      fields.RemoveAll(f => f == null);
+      var localSurrogates = fields.ConvertAll(f => new Bpl.LocalVariable(f.Origin, new TypedIdent(f.Origin, SurrogateName(f), TrType(f.Type))));
+      locals.AddRange(localSurrogates);
+      var beforeTrackers = DefiniteAssignmentTrackers;
+      fields.ForEach(f => AddDefiniteAssignmentTrackerSurrogate(f, cl, locals, codeContext is Constructor && codeContext.IsGhost));
+
+      Contract.Assert(!inBodyInitContext);
+      inBodyInitContext = true;
+      TrStmtList(s.BodyInit, builder, locals, etran);
+      Contract.Assert(inBodyInitContext);
+      inBodyInitContext = false;
+
+      // The "new;" translates into an allocation of "this"
+      AddComment(builder, stmt, "new;");
+      fields.ForEach(f => CheckDefiniteAssignmentSurrogate(s.SeparatorTok ?? s.Origin.EndToken, f, true, builder));
+      DefiniteAssignmentTrackers = beforeTrackers;
+      var th = new ThisExpr(cl);
+      var bplThis = (Bpl.IdentifierExpr)etran.TrExpr(th);
+      SelectAllocateObject(tok, bplThis, th.Type, false, builder, etran);
+      for (int i = 0; i < fields.Count; i++) {
+        // assume $Heap[this, f] == this.f;
+        var mse = new MemberSelectExpr(tok, th, fields[i]);
+        Bpl.Expr surr = new Bpl.IdentifierExpr(tok, localSurrogates[i]);
+        surr = CondApplyUnbox(tok, surr, fields[i].Type, mse.Type);
+        builder.Add(new Bpl.AssumeCmd(tok, Bpl.Expr.Eq(etran.TrExpr(mse), surr)));
+      }
+      CommitAllocatedObject(tok, bplThis, null, builder, etran);
+
+      AddComment(builder, stmt, "divided block after new;");
+      TrStmtList(s.BodyProper, builder, locals, etran);
+      DefiniteAssignmentTrackers = previousTrackers;
+
+    } else if (stmt is OpaqueBlock opaqueBlock) {
+      OpaqueBlockVerifier.EmitBoogie(this, opaqueBlock, builder, locals, etran, (IMethodCodeContext)codeContext);
+    } else if (stmt is BlockByProofStmt blockByProof) {
+      BlockByProofStmtVerifier.EmitBoogie(this, blockByProof, builder, locals, etran, codeContext);
+    } else if (stmt is BlockStmt blockStmt) {
+      var previousTrackers = DefiniteAssignmentTrackers;
+      TrStmtList(blockStmt.Body, builder, locals, etran, blockStmt.Origin);
+      DefiniteAssignmentTrackers = previousTrackers;
+    } else if (stmt is IfStmt ifStmt) {
+      IfStatementVerifier.EmitBoogie(this, ifStmt, builder, locals, etran);
+    } else if (stmt is AlternativeStmt) {
+      AddComment(builder, stmt, "alternative statement");
+      var s = (AlternativeStmt)stmt;
+      var elseCase = Assert(s.Origin, Bpl.Expr.False, new AlternativeIsComplete(), builder.Context);
+      TrAlternatives(s.Alternatives, s.Origin, b => b.Add(elseCase), builder, locals, etran, stmt.IsGhost);
+
+    } else if (stmt is WhileStmt whileStmt) {
+      TrWhileStmt(whileStmt, builder, locals, etran);
+
+    } else if (stmt is AlternativeLoopStmt alternativeLoopStmt) {
+      TrAlternativeLoopStmt(alternativeLoopStmt, builder, locals, etran);
+    } else if (stmt is ForLoopStmt forLoopStmt) {
+      TrForLoop(forLoopStmt, builder, locals, etran);
+
+    } else if (stmt is ModifyStmt) {
+      AddComment(builder, stmt, "modify statement");
+      var s = (ModifyStmt)stmt;
+      // check well-formedness of the modifies clauses
+      var wfOptions = new WFOptions();
+      CheckFrameWellFormed(wfOptions, s.Mod.Expressions, locals, builder, etran);
+      // check that the modifies is a subset
+      var desc = new ModifyFrameSubset("modify statement", s.Mod.Expressions, GetContextModifiesFrames());
+      CheckFrameSubset(s.Origin, s.Mod.Expressions, null, null, etran, etran.ModifiesFrame(s.Origin), builder, desc, null);
+      // cause the change of the heap according to the given frame
+      var suffix = CurrentIdGenerator.FreshId("modify#");
+      string modifyFrameName = FrameVariablePrefix + suffix;
+      var preModifyHeapVar = locals.GetOrAdd(new Bpl.LocalVariable(s.Origin, new Bpl.TypedIdent(s.Origin, "$PreModifyHeap$" + suffix, Predef.HeapType)));
+      DefineFrame(s.Origin, etran.ModifiesFrame(s.Origin), s.Mod.Expressions, builder, locals, modifyFrameName);
+      if (s.Body == null) {
+        var preModifyHeap = new Bpl.IdentifierExpr(s.Origin, preModifyHeapVar);
+        // preModifyHeap := $Heap;
+        builder.Add(Bpl.Cmd.SimpleAssign(s.Origin, preModifyHeap, etran.HeapExpr));
+        // havoc $Heap;
+        builder.Add(new Bpl.HavocCmd(s.Origin, new List<Bpl.IdentifierExpr> { etran.HeapCastToIdentifierExpr }));
+        // assume $HeapSucc(preModifyHeap, $Heap);   OR $HeapSuccGhost
+        builder.Add(TrAssumeCmd(s.Origin, HeapSucc(preModifyHeap, etran.HeapExpr, s.IsGhost)));
+        // assume nothing outside the frame was changed
+        var etranPreLoop = new ExpressionTranslator(this, Predef, preModifyHeap, this.CurrentDeclaration is IFrameScope fs ? fs : null);
+        var updatedFrameEtran = etran.WithModifiesFrame(modifyFrameName);
+        builder.Add(TrAssumeCmd(s.Origin, FrameConditionUsingDefinedFrame(s.Origin, etranPreLoop, etran, updatedFrameEtran, updatedFrameEtran.ModifiesFrame(s.Origin))));
+      } else {
+        // do the body, but with preModifyHeapVar as the governing frame
+        var updatedFrameEtran = etran.WithModifiesFrame(modifyFrameName);
+        CurrentIdGenerator.Push();
+        TrStmt(s.Body, builder, locals, updatedFrameEtran);
+        CurrentIdGenerator.Pop();
+      }
+      builder.AddCaptureState(stmt);
+
+    } else if (stmt is ForallStmt forallStmt) {
+      TrForallStmt(builder, locals, etran, forallStmt);
+    } else if (stmt is CalcStmt calcStmt) {
+      TrCalcStmt(calcStmt, builder, locals, etran);
+    } else if (stmt is NestedMatchStmt nestedMatchStmt) {
+      TrStmt(nestedMatchStmt.Flattened, builder, locals, etran);
+    } else if (stmt is MatchStmt matchStmt) {
+      MatchStmtVerifier.TrMatchStmt(this, matchStmt, builder, locals, etran);
+    } else if (stmt is VarDeclStmt) {
+      var s = (VarDeclStmt)stmt;
+      TrVarDeclStmt(s, builder, locals, etran);
+    } else if (stmt is VarDeclPattern varDeclPattern) {
+      foreach (var dafnyLocal in varDeclPattern.LocalVars) {
+        var boogieLocal = locals.GetOrAdd(new Bpl.LocalVariable(dafnyLocal.Origin,
+          new Bpl.TypedIdent(dafnyLocal.Origin, dafnyLocal.AssignUniqueName(CurrentDeclaration.IdGenerator),
+            TrType(dafnyLocal.Type))));
+        var variableReference = new Bpl.IdentifierExpr(boogieLocal.tok, boogieLocal);
+        builder.Add(new Bpl.HavocCmd(dafnyLocal.Origin, new List<Bpl.IdentifierExpr>
+        {
+          variableReference
+        }));
+        var wh = GetWhereClause(dafnyLocal.Origin, variableReference, dafnyLocal.Type, etran,
+          IsAllocContext.Var(varDeclPattern.IsGhost, dafnyLocal));
+        if (wh != null) {
+          builder.Add(TrAssumeCmd(dafnyLocal.Origin, wh));
+        }
+      }
+
+      var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator("let#");
+      var pat = varDeclPattern.LHS;
+      var rhs = varDeclPattern.RHS;
+      var nm = varNameGen.FreshId("#0#");
+      var boogieTupleLocal = locals.GetOrAdd(new Bpl.LocalVariable(pat.Origin, new TypedIdent(pat.Origin, nm, TrType(rhs.Type))));
+      var boogieTupleReference = new Bpl.IdentifierExpr(rhs.Origin, boogieTupleLocal);
+
+      void AddResultCommands(BoogieStmtListBuilder returnBuilder, Expression result) {
+        Contract.Assert(pat.Expr.Type != null);
+        var bResult = etran.TrExpr(result);
+        CheckSubrange(result.Origin, bResult, rhs.Type, pat.Expr.Type, rhs, returnBuilder);
+        returnBuilder.Add(TrAssumeCmdWithDependenciesAndExtend(etran, rhs.Origin, rhs,
+          e => Bpl.Expr.Eq(boogieTupleReference, AdaptBoxing(rhs.Origin, e, rhs.Type, pat.Expr.Type))));
+      }
+
+      TrStmt_CheckWellformed(rhs, builder, locals, etran, false, false, AddResultCommands);
+      builder.Add(TrAssumeCmd(rhs.Origin, etran.CanCallAssumption(rhs)));
+      builder.Add(new CommentCmd("CheckWellformedWithResult: any expression"));
+      builder.Add(TrAssumeCmd(rhs.Origin, MkIs(boogieTupleReference, pat.Expr.Type)));
+
+      CheckCasePatternShape(pat, rhs, boogieTupleReference, rhs.Origin, pat.Expr.Type, builder);
+      builder.Add(TrAssumeCmdWithDependenciesAndExtend(etran, varDeclPattern.Origin, pat.Expr,
+        e => Expr.Eq(e, boogieTupleReference), "variable declaration"));
+    } else if (stmt is TryRecoverStatement haltRecoveryStatement) {
+      // try/recover statements are currently internal-only AST nodes that cannot be
+      // directly used in user Dafny code. They are only generated by rewriters, and verifying
+      // their use is low value.
+      throw new NotSupportedException("Verification of try/recover statements is not supported");
+    } else {
+      Contract.Assert(false); throw new cce.UnreachableException();  // unexpected statement
+    }
+  }
+
+  private void TrBreakStmt(BoogieStmtListBuilder builder, ExpressionTranslator etran, BreakOrContinueStmt breakOrContinueStmt) {
+    AddComment(builder, breakOrContinueStmt, $"{breakOrContinueStmt.Kind} statement");
+    foreach (var _ in Enumerable.Range(0, builder.Context.ScopeDepth - breakOrContinueStmt.TargetStmt.ScopeDepth)) {
+      builder.Add(new ChangeScope(breakOrContinueStmt.Origin, ChangeScope.Modes.Pop));
+    }
+    var lbl = (breakOrContinueStmt.IsContinue ? "continue_" : "after_") + breakOrContinueStmt.TargetStmt.Labels.Data.AssignUniqueId(CurrentIdGenerator);
+    builder.Add(new GotoCmd(breakOrContinueStmt.Origin, new List<string> { lbl }) {
+      Attributes = etran.TrAttributes(breakOrContinueStmt.Attributes)
+    });
+  }
+
+  private void TrUpdateStmt(BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran, AssignStatement statement) {
+    // This UpdateStmt can be single-target assignment, a multi-assignment, a call statement, or
+    // an array-range update.  Handle the multi-assignment here and handle the others as for .ResolvedStatements.
+    var resolved = statement.ResolvedStatements;
+    if (resolved.Count == 1) {
+      TrStmt(resolved[0], builder, locals, etran);
+    } else {
+      AddComment(builder, statement, "update statement");
+      var assignStmts = resolved.Cast<SingleAssignStmt>().ToList();
+      var lhss = assignStmts.Select(a => a.Lhs).ToList();
+      var rhss = assignStmts.Select(a => a.Rhs).ToList();
+      // note: because we have more than one expression, we always must assign to Boogie locals in a two
+      // phase operation. Thus rhssCanAffectPreviouslyKnownExpressions is just true.
+      Contract.Assert(1 < lhss.Count);
+
+      ProcessLhss(lhss, true, false, builder, locals, etran, statement, out var lhsBuilder, out var bLhss, out var lhsObjs, out var lhsFields, out var lhsNames);
+      // We know that, because the translation saves to a local variable, that the RHS always need to
+      // generate a new local, i.e. bLhss is just all nulls.
+      Contract.Assert(Contract.ForAll(bLhss, lhs => lhs == null));
+      // This generates the assignments, and gives them to us as finalRhss.
+      var finalRhss = ProcessUpdateAssignRhss(lhss, rhss, builder, locals, etran, statement);
+      // ProcessLhss has laid down framing conditions and the ProcessUpdateAssignRhss will check subranges (nats),
+      // but we need to generate the distinctness condition (two LHS are equal only when the RHS is also
+      // equal). We need both the LHS and the RHS to do this, which is why we need to do it here.
+      CheckLhssDistinctness(finalRhss, statement.Rhss, lhss, builder, etran, lhsObjs, lhsFields, lhsNames, statement.OriginalInitialLhs);
+      // Now actually perform the assignments to the LHS.
+      for (int i = 0; i < lhss.Count; i++) {
+        lhsBuilder[i](finalRhss[i], statement.Rhss[i] is HavocRhs, builder, etran);
+      }
+      builder.AddCaptureState(statement);
+    }
+  }
+
+  void TrVarDeclStmt(VarDeclStmt varDeclStmt, BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran) {
+
+    var newLocalIds = new List<Bpl.IdentifierExpr>();
+    int i = 0;
+    foreach (var local in varDeclStmt.Locals) {
+      Bpl.Type varType = TrType(local.Type);
+      Bpl.Expr wh = GetWhereClause(local.Origin,
+        new Bpl.IdentifierExpr(local.Origin, local.AssignUniqueName(CurrentDeclaration.IdGenerator), varType),
+        local.Type, etran, IsAllocContext.Var(varDeclStmt.IsGhost, local));
+      // if needed, register definite-assignment tracking for this local
+      var needDefiniteAssignmentTracking = varDeclStmt.Assign == null || varDeclStmt.Assign is AssignSuchThatStmt;
+      if (varDeclStmt.Assign is AssignStatement) {
+        // there is an initial assignment, but we need to look out for "*" being that assignment
+        var us = (AssignStatement)varDeclStmt.Assign;
+        if (i < us.Rhss.Count && us.Rhss[i] is HavocRhs) {
+          needDefiniteAssignmentTracking = true;
+        }
+      }
+      if (!local.Type.IsNonempty) {
+        // This prevents generating an unsatisfiable where clause for possibly empty types
+        needDefiniteAssignmentTracking = true;
+      }
+      if (needDefiniteAssignmentTracking) {
+        var defassExpr = AddDefiniteAssignmentTracker(local, locals);
+        if (wh != null && defassExpr != null) {
+          // make the "where" expression be "defass ==> wh", because we don't want to assume anything
+          // before the variable has been assigned (for a variable that needs definite-assignment tracking
+          // in the first place)
+          wh = BplImp(defassExpr, wh);
+        }
+      }
+      // create the variable itself (now that "wh" may mention the definite-assignment tracker)
+      var var = locals.GetOrAdd(new Bpl.LocalVariable(local.Origin, new Bpl.TypedIdent(local.Origin, local.AssignUniqueName(CurrentDeclaration.IdGenerator), varType, wh)));
+      var.Attributes = etran.TrAttributes(local.Attributes, null);
+      newLocalIds.Add(new Bpl.IdentifierExpr(local.Origin, var));
+      i++;
+    }
+    if (varDeclStmt.Assign == null) {
+      // it is necessary to do a havoc here in order to give the variable the correct allocation state
+      builder.Add(new HavocCmd(varDeclStmt.Origin, newLocalIds));
+    }
+    // processing of "assumption" variables happens after the variable is possibly havocked above
+    foreach (var local in varDeclStmt.Locals) {
+      if (Attributes.Contains(local.Attributes, "assumption")) {
+        Bpl.Type varType = TrType(local.Type);
+        builder.Add(new AssumeCmd(local.Origin, new Bpl.IdentifierExpr(local.Origin, local.AssignUniqueName(CurrentDeclaration.IdGenerator), varType), new QKeyValue(local.Origin, "assumption_variable_initialization", new List<object>(), null)));
+      }
+    }
+    if (varDeclStmt.Assign != null) {
+      TrStmt(varDeclStmt.Assign, builder, locals, etran);
+    }
+  }
+
+  private void TrCalcStmt(CalcStmt stmt, BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran) {
+    Contract.Requires(stmt != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+
+    /* Translate into:
+      if (*) {
+          assert wf(line0);
+      } else if (*) {
+          assume wf(line0);
+          // if op is ==>: assume line0;
+          hint0;
+          assert wf(line1);
+          assert line0 op line1;
+          assume false;
+      } else if (*) { ...
+      } else if (*) {
+          assume wf(line<n-1>);
+          // if op is ==>: assume line<n-1>;
+          hint<n-1>;
+          assert wf(line<n>);
+          assert line<n-1> op line<n>;
+          assume false;
+      }
+      assume CanCallAssumptions for line<0> and line<n>;
+      assume line<0> op line<n>;
+      */
+    Contract.Assert(stmt.Steps.Count == stmt.Hints.Count); // established by the resolver
+    AddComment(builder, stmt, "calc statement");
+    this.fuelContext = FuelSetting.ExpandFuelContext(stmt.Attributes, stmt.Origin, this.fuelContext, this.reporter);
+    DefineFuelConstant(stmt.Origin, stmt.Attributes, builder, etran);
+    CurrentIdGenerator.Push(); // put the entire calc statement within its own sub-branch
+    if (stmt.Lines.Count > 0) {
+      Bpl.IfCmd ifCmd = null;
+      BoogieStmtListBuilder b;
+      // if the dangling hint is empty, do not generate anything for the dummy step
+      var stepCount = stmt.Hints.Last().Body.Count == 0 ? stmt.Steps.Count - 1 : stmt.Steps.Count;
+      // check steps:
+      for (int i = stepCount; 0 <= --i;) {
+        b = new BoogieStmtListBuilder(this, options, builder.Context);
+        // assume wf[line<i>]:
+        AddComment(b, stmt, "assume wf[lhs]");
+        CurrentIdGenerator.Push();
+        TrStmt_CheckWellformed(CalcStmt.Lhs(stmt.Steps[i]), b.WithContext(b.Context with {
+          AssertMode = AssertMode.Assume
+        }), locals, etran, false);
+        if (stmt.Steps[i] is BinaryExpr && (((BinaryExpr)stmt.Steps[i]).ResolvedOp == BinaryExpr.ResolvedOpcode.Imp)) {
+          // assume line<i>:
+          AddComment(b, stmt, "assume lhs");
+          b.Add(TrAssumeCmdWithDependencies(etran, stmt.Origin, CalcStmt.Lhs(stmt.Steps[i]), "calc statement step"));
+        }
+        // hint:
+        AddComment(b, stmt, "Hint" + i.ToString());
+
+        TrStmt(stmt.Hints[i], b, locals, etran);
+        if (i < stmt.Steps.Count - 1) {
+          // non-dummy step
+          // check well formedness of the goal line:
+          AddComment(b, stmt, "assert wf[rhs]");
+          if (stmt.Steps[i] is TernaryExpr) {
+            // check the prefix-equality limit
+            var index = ((TernaryExpr)stmt.Steps[i]).E0;
+            TrStmt_CheckWellformed(index, b, locals, etran, false);
+            if (index.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
+              var desc = new PrefixEqualityLimit(index);
+              b.Add(AssertAndForget(b.Context, index.Origin, Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(index)), desc));
+            }
+          }
+          TrStmt_CheckWellformed(CalcStmt.Rhs(stmt.Steps[i]), b, locals, etran, false);
+          var ss = TrSplitExpr(builder.Context, stmt.Steps[i], etran, true, out var splitHappened);
+          // assert step:
+          AddComment(b, stmt, "assert line" + i.ToString() + " " + (stmt.StepOps[i] ?? stmt.Op).ToString() + " line" + (i + 1).ToString());
+          if (!splitHappened) {
+            b.Add(AssertAndForget(b.Context, stmt.Lines[i + 1].Origin, etran.TrExpr(stmt.Steps[i]), new CalculationStep(stmt.Steps[i], stmt.Hints[i])));
+          } else {
+            foreach (var split in ss) {
+              if (split.IsChecked) {
+                b.Add(AssertAndForget(b.Context, stmt.Lines[i + 1].Origin, split.E, new CalculationStep(stmt.Steps[i], stmt.Hints[i])));
+              }
+            }
+          }
+        }
+        b.Add(TrAssumeCmd(stmt.Origin, Bpl.Expr.False));
+        ifCmd = new Bpl.IfCmd(stmt.Origin, null, b.Collect(stmt.Origin), ifCmd, null);
+        CurrentIdGenerator.Pop();
+      }
+      // check well formedness of the first line:
+      b = new BoogieStmtListBuilder(this, options, builder.Context);
+      AddComment(b, stmt, "assert wf[initial]");
+      Contract.Assert(stmt.Result != null); // established by the resolver
+      TrStmt_CheckWellformed(CalcStmt.Lhs(stmt.Result), b, locals, etran, false);
+      b.Add(TrAssumeCmd(stmt.Origin, Bpl.Expr.False));
+      ifCmd = new Bpl.IfCmd(stmt.Origin, null, b.Collect(stmt.Origin), ifCmd, null);
+      builder.Add(ifCmd);
+      // assume result:
+      if (stmt.Steps.Count > 1) {
+        builder.Add(TrAssumeCmd(stmt.Origin, etran.CanCallAssumption(stmt.Result)));
+        builder.Add(TrAssumeCmdWithDependencies(etran, stmt.Origin, stmt.Result, "calc statement result"));
+      }
+    }
+    CurrentIdGenerator.Pop();
+    this.fuelContext = FuelSetting.PopFuelContext();
+  }
+
+  private static SubrangeCheckContext MakeNumericBoundsSubrangeCheckContext(BoundVar bvar, Expression lo, Expression hi) {
+    var source = new IdentifierExpr(Token.NoToken, bvar);
+    var loBound = lo == null ? null : new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Le, lo, source);
+    var hiBound = hi == null ? null : new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.Lt, source, hi);
+    var bounds = (loBound, hiBound) switch {
+      (not null, not null) => new BinaryExpr(Token.NoToken, BinaryExpr.Opcode.And, loBound, hiBound),
+      (not null, null) => loBound,
+      (null, not null) => hiBound,
+    };
+    Expression CheckContext(Expression check) => new ForallExpr(
+      Token.NoToken,
+      new() { bvar },
+      bounds,
+      check,
+      null
+    );
+
+    return CheckContext;
+  }
+
+  void TrAlternatives(List<GuardedAlternative> alternatives, IOrigin elseToken, Action<BoogieStmtListBuilder> buildElseCase,
+    BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran, bool isGhost) {
+    Contract.Requires(alternatives != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+
+    if (alternatives.Count == 0) {
+      buildElseCase(builder);
+      return;
+    }
+
+    // alpha-rename any binding guards
+    var guards = alternatives.ConvertAll(alt => alt.IsBindingGuard ? ((ExistsExpr)alt.Guard).AlphaRename("eg$") : alt.Guard);
+
+    // build the negation of the disjunction of all guards (that is, the conjunction of their negations)
+    Bpl.Expr noGuard = Bpl.Expr.True;
+    var b = new BoogieStmtListBuilder(this, options, builder.Context);
+    foreach (var g in guards) {
+      b.Add(TrAssumeCmd(g.Origin, etran.CanCallAssumption(g)));
+      noGuard = BplAnd(noGuard, Bpl.Expr.Not(etran.TrExpr(g)));
+    }
+
+    b.Add(TrAssumeCmd(elseToken, noGuard));
+    buildElseCase(b);
+    Bpl.StmtList els = b.Collect(elseToken);
+
+    Bpl.IfCmd elsIf = null;
+    for (int i = alternatives.Count; 0 <= --i;) {
+      Contract.Assert(elsIf == null || els == null);  // loop invariant
+      CurrentIdGenerator.Push();
+      var alternative = alternatives[i];
+      b = new BoogieStmtListBuilder(this, options, builder.Context);
+      TrStmt_CheckWellformed(guards[i], b, locals, etran, true);
+      if (alternative.IsBindingGuard) {
+        var exists = (ExistsExpr)alternative.Guard;  // the original (that is, not alpha-renamed) guard
+        IntroduceAndAssignExistentialVars(exists, b, builder, locals, etran, isGhost);
+      } else {
+        b.Add(TrAssumeCmdWithDependencies(etran, alternative.Guard.Origin, alternative.Guard, "alternative guard"));
+      }
+      var prevDefiniteAssignmentTrackers = DefiniteAssignmentTrackers;
+      TrStmtList(alternative.Body, b, locals, etran, alternative.Origin);
+      DefiniteAssignmentTrackers = prevDefiniteAssignmentTrackers;
+      Bpl.StmtList thn = b.Collect(alternative.Origin);
+      elsIf = new Bpl.IfCmd(alternative.Origin, null, thn, elsIf, els);
+      els = null;
+      CurrentIdGenerator.Pop();
+    }
+    Contract.Assert(elsIf != null && els == null); // follows from loop invariant and the fact that there's more than one alternative
+    builder.Add(elsIf);
+  }
+
+
+  void RecordNewObjectsIn_New(IOrigin tok, IteratorDecl iter, Bpl.Expr initHeap, Bpl.IdentifierExpr currentHeap,
+    BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran) {
+    Contract.Requires(tok != null);
+    Contract.Requires(iter != null);
+    Contract.Requires(initHeap != null);
+    Contract.Requires(currentHeap != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+    // Add all newly allocated objects to the set this._new
+    var updatedSet = locals.GetOrAdd(new Bpl.LocalVariable(iter.Origin, new Bpl.TypedIdent(iter.Origin, CurrentIdGenerator.FreshId("$iter_newUpdate"), Predef.SetType)));
+    var updatedSetIE = new Bpl.IdentifierExpr(iter.Origin, updatedSet);
+    // call $iter_newUpdate := $IterCollectNewObjects(initHeap, $Heap, this, _new);
+    var th = new Bpl.IdentifierExpr(iter.Origin, etran.This, Predef.RefType);
+    var nwField = new Bpl.IdentifierExpr(tok, GetField(iter.Member_New));
+    Cmd cmd = Call(builder.Context, iter.Origin, "$IterCollectNewObjects",
+      new List<Bpl.Expr>() { initHeap, etran.HeapExpr, th, nwField },
+      new List<Bpl.IdentifierExpr>() { updatedSetIE });
+    builder.Add(cmd);
+    // $Heap[this, _new] := $iter_newUpdate;
+    cmd = Bpl.Cmd.SimpleAssign(iter.Origin, currentHeap, UpdateHeap(iter.Origin, currentHeap, th, nwField, updatedSetIE));
+    builder.Add(cmd);
+    // assume $IsGoodHeap($Heap)
+    builder.Add(AssumeGoodHeap(tok, etran));
+  }
+
+  private string GetObjFieldDetails(Expression lhs, ExpressionTranslator etran, out Bpl.Expr obj, out Bpl.Expr F) {
+    string description;
+    if (lhs is MemberSelectExpr) {
+      var fse = (MemberSelectExpr)lhs;
+      obj = etran.TrExpr(fse.Obj);
+      F = GetField(fse);
+      description = "an object field";
+    } else if (lhs is SeqSelectExpr) {
+      var sel = (SeqSelectExpr)lhs;
+      obj = etran.TrExpr(sel.Seq);
+      var idx = etran.TrExpr(sel.E0);
+      idx = ConvertExpression(sel.E0.Origin, idx, sel.E0.Type, Type.Int);
+      F = FunctionCall(sel.Origin, BuiltinFunction.IndexField, null, idx);
+      description = "an array element";
+    } else {
+      MultiSelectExpr mse = (MultiSelectExpr)lhs;
+      obj = etran.TrExpr(mse.Array);
+      F = etran.GetArrayIndexFieldName(mse.Origin, mse.Indices);
+      description = "an array element";
+    }
+    return description;
+  }
+
+  private void SelectAllocateObject(IOrigin tok, Bpl.IdentifierExpr nw, Type type, bool includeHavoc, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+    Contract.Requires(tok != null);
+    Contract.Requires(nw != null);
+    Contract.Requires(type != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(etran != null);
+    if (type is UserDefinedType { ResolvedClass: NonNullTypeDecl nnt }) {
+      type = nnt.RhsWithArgument(type.TypeArgs);
+    }
+
+    if (includeHavoc) {
+      // havoc $nw;
+      builder.Add(new Bpl.HavocCmd(tok, new List<Bpl.IdentifierExpr> { nw }));
+    }
+
+    // assume $nw != null && $Is($nw, type);
+    var nwNotNull = Bpl.Expr.Neq(nw, Predef.Null);
+    // drop the $Is conjunct if the type is "object", because "new object" allocates an object of an arbitrary type
+    var rightType = type.IsObjectQ ? Bpl.Expr.True : MkIs(nw, type);
+    builder.Add(TrAssumeCmd(tok, BplAnd(nwNotNull, rightType)));
+
+    // assume !$Heap[$nw, alloc];
+    var notAlloc = Bpl.Expr.Not(etran.IsAlloced(tok, nw));
+    builder.Add(TrAssumeCmd(tok, notAlloc));
+  }
+
+  private void CommitAllocatedObject(IOrigin tok, Bpl.IdentifierExpr nw, Bpl.Cmd extraCmd, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
+    Contract.Requires(tok != null);
+    Contract.Requires(nw != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(etran != null);
+
+    // $Heap[$nw, alloc] := true;
+    Bpl.Expr alloc = Predef.Alloc(tok);
+    Bpl.IdentifierExpr heap = etran.HeapCastToIdentifierExpr;
+    Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(tok, heap, UpdateHeap(tok, heap, nw, alloc, Bpl.Expr.True));
+    builder.Add(cmd);
+    if (extraCmd != null) {
+      builder.Add(extraCmd);
+    }
+    // assume $IsGoodHeap($Heap);
+    builder.Add(AssumeGoodHeap(tok, etran));
+    // assume $IsHeapAnchor($Heap);
+    builder.Add(new Bpl.AssumeCmd(tok, FunctionCall(tok, BuiltinFunction.IsHeapAnchor, null, etran.HeapExpr)));
+  }
+
+  public void IntroduceAndAssignExistentialVars(ExistsExpr exists, BoogieStmtListBuilder builder,
+    BoogieStmtListBuilder builderOutsideIfConstruct, Variables locals, ExpressionTranslator etran, bool isGhost) {
+    Contract.Requires(exists != null);
+    Contract.Requires(exists.Range == null);
+    Contract.Requires(builder != null);
+    Contract.Requires(builderOutsideIfConstruct != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+    // declare and havoc the bound variables of 'exists' as local variables
+    var iesForHavoc = new List<Bpl.IdentifierExpr>();
+    foreach (var bv in exists.BoundVars) {
+      Bpl.Type varType = TrType(bv.Type);
+      Bpl.Expr wh = GetWhereClause(bv.Origin,
+        new Bpl.IdentifierExpr(bv.Origin, bv.AssignUniqueName(CurrentDeclaration.IdGenerator), varType),
+        bv.Type, etran, IsAllocContext.Var(isGhost, bv));
+      Bpl.Variable local = locals.GetOrAdd(new Bpl.LocalVariable(bv.Origin, new Bpl.TypedIdent(bv.Origin, bv.AssignUniqueName(CurrentDeclaration.IdGenerator), varType, wh)));
+      iesForHavoc.Add(new Bpl.IdentifierExpr(local.tok, local));
+    }
+    builderOutsideIfConstruct.Add(new Bpl.HavocCmd(exists.Origin, iesForHavoc));
+    builder.Add(TrAssumeCmd(exists.Origin, etran.TrExpr(exists.Term)));
+  }
+
+  public void TrStmtList(List<Statement> stmts, BoogieStmtListBuilder builder, Variables locals, ExpressionTranslator etran,
+    IOrigin scopeRange = null, bool processLabels = true) {
+    Contract.Requires(stmts != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+
+    BoogieStmtListBuilder innerBuilder = builder;
+    if (scopeRange != null && !builder.Context.ReturnPosition) {
+      /*
+       * Boogie's reports at which return location
+       * the postconditions of a procedure could not be satisfied.
+       *
+       * The return locations are the sinks of the Boogie control flow graph.
+       * However, adding a command to the end of a Boogie block, can cause previous sinks in the CFG to then lead
+       * to that new command, which changes the reported error location.
+       *
+       * Because of this reason, we need to make sure not to pop at points right before the implementation returns,
+       * which is why we check builder.Context.ReturnPosition
+       *
+       * A more reliable way of Boogie error reporting would be not to rely on sinks in the CFG,
+       * By for example reporting all points at which a control flow decision was made.
+       */
+      builder.Add(new ChangeScope(scopeRange.StartToken, ChangeScope.Modes.Push));
+      innerBuilder = builder.WithContext(builder.Context with {
+        ScopeDepth = builder.Context.ScopeDepth + 1
+      });
+    }
+
+    for (var index = 0; index < stmts.Count; index++) {
+      var ss = stmts[index];
+      var last = index == stmts.Count - 1;
+      var indexContext = innerBuilder.Context with {
+        ReturnPosition = innerBuilder.Context.ReturnPosition && last
+      };
+      var indexBuilder = innerBuilder.WithContext(indexContext);
+      if (processLabels) {
+        for (var l = ss.Labels; l != null; l = l.Next) {
+          var heapAt = locals.GetOrAdd(new Bpl.LocalVariable(ss.Origin,
+            new Bpl.TypedIdent(ss.Origin, "$Heap_at_" + l.Data.AssignUniqueId(CurrentIdGenerator), Predef.HeapType)));
+          builder.Add(Bpl.Cmd.SimpleAssign(ss.Origin, new Bpl.IdentifierExpr(ss.Origin, heapAt), etran.HeapExpr));
+        }
+      }
+
+      TrStmt(ss, indexBuilder, locals, etran);
+      if (processLabels && ss.Labels != null) {
+        builder.AddLabelCmd(ss.Origin, "after_" + ss.Labels.Data.AssignUniqueId(CurrentIdGenerator));
+      }
+    }
+
+    if (scopeRange != null && !builder.Context.ReturnPosition) {
+      builder.Add(new ChangeScope(scopeRange.EndToken, ChangeScope.Modes.Pop));
+    }
+  }
+
+  public void TrStmt_CheckWellformed(Expression expr, BoogieStmtListBuilder builder, Variables locals,
+    ExpressionTranslator etran, bool subsumption, bool lValueContext = false, AddResultCommands addResultCommands = null) {
+    Contract.Requires(expr != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(Predef != null);
+
+    Bpl.QKeyValue kv;
+    if (subsumption) {
+      kv = null;  // this is the default behavior of Boogie's assert
+    } else {
+      List<object> args = new List<object>();
+      // {:subsumption 0}
+      args.Add(Bpl.Expr.Literal(0));
+      kv = new Bpl.QKeyValue(expr.Origin, "subsumption", args, null);
+    }
+    var options = new WFOptions(kv);
+    // Only do reads checks if reads clauses on methods are enabled and the reads clause is not *.
+    // The latter is important to avoid any extra verification cost for backwards compatibility.
+    if (etran.readsFrame != null) {
+      options = options.WithReadsChecks(true);
+    }
+    if (lValueContext) {
+      options = options.WithLValueContext(true);
+    }
+    CheckWellformedWithResult(expr, options, locals, builder, etran, addResultCommands);
+    builder.Add(TrAssumeCmd(expr.Origin, etran.CanCallAssumption(expr)));
+  }
+
+  List<FrameExpression> GetContextReadsFrames() {
+    return (codeContext as MethodOrFunction)?.Reads?.Expressions ?? new();
+  }
+
+  List<FrameExpression> GetContextModifiesFrames() {
+    return (codeContext as IMethodCodeContext)?.Modifies?.Expressions ?? new();
+  }
+}
diff --git a/Source/DafnyCore/Verifier/Statements/IfStatementVerifier.cs b/Source/DafnyCore/Verifier/Statements/IfStatementVerifier.cs
new file mode 100644
index 00000000000..40d0c4edf1c
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Statements/IfStatementVerifier.cs
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using Microsoft.Boogie;
+using Microsoft.Dafny;
+using VCGeneration.Splits;
+using ExistsExpr = Microsoft.Dafny.ExistsExpr;
+
+namespace DafnyCore.Verifier.Statements;
+
+public class IfStatementVerifier {
+
+  public static void EmitBoogie(BoogieGenerator generator, IfStmt stmt, BoogieStmtListBuilder builder,
+    Variables locals, BoogieGenerator.ExpressionTranslator etran) {
+    Contract.Requires(stmt != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+
+    BoogieGenerator.AddComment(builder, stmt, "if statement");
+    Expression guard;
+    if (stmt.Guard == null) {
+      guard = null;
+    } else {
+      guard = stmt.IsBindingGuard ? ((ExistsExpr)stmt.Guard).AlphaRename("eg$") : stmt.Guard;
+      generator.TrStmt_CheckWellformed(guard, builder, locals, etran, true);
+    }
+    var thenBuilder = new BoogieStmtListBuilder(generator, generator.Options, builder.Context);
+    if (stmt.IsBindingGuard) {
+      generator.CurrentIdGenerator.Push();
+      var exists = (ExistsExpr)stmt.Guard; // the original (that is, not alpha-renamed) guard
+      generator.IntroduceAndAssignExistentialVars(exists, thenBuilder, builder, locals, etran, stmt.IsGhost);
+      generator.CurrentIdGenerator.Pop();
+    }
+    generator.CurrentIdGenerator.Push();
+    StmtList thenList = generator.TrStmt2StmtList(thenBuilder, stmt.Thn, locals, etran, stmt.Thn is not BlockStmt);
+    generator.CurrentIdGenerator.Pop();
+    StmtList elseList;
+    IfCmd elseIf = null;
+    var elseBuilder = new BoogieStmtListBuilder(generator, generator.Options, builder.Context);
+    if (stmt.IsBindingGuard) {
+      elseBuilder.Add(generator.TrAssumeCmdWithDependenciesAndExtend(etran, guard.Origin, guard, Expr.Not, "if statement binding guard"));
+    }
+    if (stmt.Els == null) {
+      elseList = elseBuilder.Collect(stmt.Origin);
+    } else {
+      generator.CurrentIdGenerator.Push();
+      elseList = generator.TrStmt2StmtList(elseBuilder, stmt.Els, locals, etran, stmt.Els is not BlockStmt);
+      generator.CurrentIdGenerator.Pop();
+      if (elseList.BigBlocks.Count == 1) {
+        BigBlock bb = elseList.BigBlocks[0];
+        if (bb.LabelName == null && bb.simpleCmds.Count == 0 && bb.ec is IfCmd ec) {
+          elseIf = ec;
+          elseList = null;
+        }
+      }
+    }
+    builder.Add(new IfCmd(stmt.Origin,
+      guard == null || stmt.IsBindingGuard ? null : etran.TrExpr(guard),
+      thenList, elseIf, elseList, BlockRewriter.AllowSplitQ));
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/Statements/MatchVerifier.cs b/Source/DafnyCore/Verifier/Statements/MatchVerifier.cs
new file mode 100644
index 00000000000..a68e6fb8eb5
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Statements/MatchVerifier.cs
@@ -0,0 +1,217 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using Microsoft.Boogie;
+using Microsoft.Dafny;
+using VCGeneration.Splits;
+using IdentifierExpr = Microsoft.Boogie.IdentifierExpr;
+using Type = Microsoft.Dafny.Type;
+
+namespace DafnyCore.Verifier.Statements;
+
+public class MatchStmtVerifier {
+  public static void TrMatchStmt(BoogieGenerator generator, MatchStmt stmt, BoogieStmtListBuilder builder, Variables locals, BoogieGenerator.ExpressionTranslator etran) {
+    Contract.Requires(stmt != null);
+    Contract.Requires(builder != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(etran != null);
+
+    FillMissingCases(stmt);
+
+    generator.TrStmt_CheckWellformed(stmt.Source, builder, locals, etran, true);
+    Expr source = etran.TrExpr(stmt.Source);
+    var b = new BoogieStmtListBuilder(generator, generator.Options, builder.Context);
+    b.Add(BoogieGenerator.TrAssumeCmd(stmt.Origin, Expr.False));
+    StmtList els = b.Collect(stmt.Origin);
+    IfCmd ifCmd = null;
+    foreach (var missingCtor in stmt.MissingCases) {
+      // havoc all bound variables
+      b = new BoogieStmtListBuilder(generator, generator.Options, builder.Context);
+      var newLocals = new Variables();
+      Expr r = generator.CtorInvocation(stmt.Origin, missingCtor, etran, newLocals, b);
+      locals.AddRange(newLocals.Values);
+
+      if (newLocals.Count != 0) {
+        List<IdentifierExpr> havocIds = new List<IdentifierExpr>();
+        foreach (Variable local in newLocals.Values) {
+          havocIds.Add(new IdentifierExpr(local.tok, local));
+        }
+        builder.Add(new HavocCmd(stmt.Origin, havocIds));
+      }
+      String missingStr = stmt.Context.FillHole(new IdCtx(missingCtor)).AbstractAllHoles()
+        .ToString();
+      var desc = new MatchIsComplete("statement", missingStr);
+      b.Add(generator.Assert(stmt.Origin, Expr.False, desc, builder.Context));
+
+      Expr guard = Expr.Eq(source, r);
+      ifCmd = new IfCmd(stmt.Origin, guard, b.Collect(stmt.Origin), ifCmd, els);
+      els = null;
+    }
+    for (int i = stmt.Cases.Count; 0 <= --i;) {
+      var mc = stmt.Cases[i];
+      generator.CurrentIdGenerator.Push();
+      // havoc all bound variables
+      b = new BoogieStmtListBuilder(generator, generator.Options, builder.Context);
+      var newLocals = new Variables();
+      Expr r = CtorInvocation(generator, mc, stmt.Source.Type, etran, newLocals, b,
+        stmt.IsGhost ? BoogieGenerator.NOALLOC : BoogieGenerator.ISALLOC);
+      locals.AddRange(newLocals.Values);
+
+      if (newLocals.Count != 0) {
+        List<IdentifierExpr> havocIds = new List<IdentifierExpr>();
+        foreach (Variable local in newLocals.Values) {
+          havocIds.Add(new IdentifierExpr(local.tok, local));
+        }
+        builder.Add(new HavocCmd(mc.Origin, havocIds));
+      }
+
+      // translate the body into b
+      var prevDefiniteAssignmentTrackers = generator.DefiniteAssignmentTrackers;
+      generator.TrStmtList(mc.Body, b, locals, etran);
+      generator.DefiniteAssignmentTrackers = prevDefiniteAssignmentTrackers;
+
+      Expr guard = Expr.Eq(source, r);
+      ifCmd = new IfCmd(mc.Origin, guard, b.Collect(mc.Origin), ifCmd, els, BlockRewriter.AllowSplitQ);
+      els = null;
+      generator.CurrentIdGenerator.Pop();
+    }
+    if (ifCmd != null) {
+      builder.Add(ifCmd);
+    }
+  }
+
+  private static void FillMissingCases(IMatch match) {
+    Contract.Requires(match != null);
+    if (match.MissingCases.Any()) {
+      return;
+    }
+
+    var dtd = match.Source.Type.AsDatatype;
+    var constructors = dtd?.ConstructorsByName;
+
+    ISet<string> memberNamesUsed = new HashSet<string>();
+
+    foreach (var matchCase in match.Cases) {
+      if (constructors != null) {
+        Contract.Assert(dtd != null);
+        var ctorId = matchCase.Ctor.Name;
+        if (match.Source.Type.AsDatatype is TupleTypeDecl) {
+          var tuple = (TupleTypeDecl)match.Source.Type.AsDatatype;
+          ctorId = SystemModuleManager.TupleTypeCtorName(tuple.Dims);
+        }
+
+        if (constructors.ContainsKey(ctorId)) {
+          memberNamesUsed.Add(ctorId); // add mc.Id to the set of names used
+        }
+      }
+    }
+    if (dtd != null && memberNamesUsed.Count != dtd.Ctors.Count) {
+      // We could complain about the syntactic omission of constructors:
+      //   Reporter.Error(MessageSource.Resolver, stmt, "match statement does not cover all constructors");
+      // but instead we let the verifier do a semantic check.
+      // So, for now, record the missing constructors:
+      foreach (var ctr in dtd.Ctors) {
+        if (!memberNamesUsed.Contains(ctr.Name)) {
+          match.MissingCases.Add(ctr);
+        }
+      }
+      Contract.Assert(memberNamesUsed.Count + match.MissingCases.Count == dtd.Ctors.Count);
+    }
+  }
+
+  /// <summary>
+  /// If "declareLocals" is "false", then the locals are added only if they are new, that is, if
+  /// they don't already exist in "locals".
+  /// </summary>
+  private static Expr CtorInvocation(BoogieGenerator generator, MatchCase mc, Type sourceType,
+    BoogieGenerator.ExpressionTranslator etran, Variables locals, BoogieStmtListBuilder localTypeAssumptions,
+    IsAllocType isAlloc, bool declareLocals = true) {
+    Contract.Requires(mc != null);
+    Contract.Requires(sourceType != null);
+    Contract.Requires(etran != null);
+    Contract.Requires(locals != null);
+    Contract.Requires(localTypeAssumptions != null);
+    Contract.Ensures(Contract.Result<Expr>() != null);
+
+    sourceType = sourceType.NormalizeExpand();
+    Contract.Assert(sourceType.TypeArgs.Count == mc.Ctor.EnclosingDatatype.TypeArgs.Count);
+    var subst = new Dictionary<TypeParameter, Type>();
+    for (var i = 0; i < mc.Ctor.EnclosingDatatype.TypeArgs.Count; i++) {
+      subst.Add(mc.Ctor.EnclosingDatatype.TypeArgs[i], sourceType.TypeArgs[i]);
+    }
+
+    List<Expr> args = new List<Expr>();
+    for (int i = 0; i < mc.Arguments.Count; i++) {
+      BoundVar p = mc.Arguments[i];
+      var nm = p.AssignUniqueName(generator.CurrentDeclaration.IdGenerator);
+      Variable local = declareLocals ? null : locals.GetValueOrDefault(nm);  // find previous local
+      if (local == null) {
+        local = new Microsoft.Boogie.LocalVariable(p.Origin, new TypedIdent(p.Origin, nm, generator.TrType(p.Type)));
+        locals.Add(local);
+      } else {
+        Contract.Assert(Equals(local.TypedIdent.Type, generator.TrType(p.Type)));
+      }
+      var pFormalType = mc.Ctor.Formals[i].Type.Subst(subst);
+      var pIsAlloc = (isAlloc == BoogieGenerator.ISALLOC) ? generator.IsAllocContext.Var(p) : BoogieGenerator.NOALLOC;
+      Expr wh = generator.GetWhereClause(p.Origin, new IdentifierExpr(p.Origin, local), pFormalType, etran, pIsAlloc);
+      if (wh != null) {
+        localTypeAssumptions.Add(BoogieGenerator.TrAssumeCmd(p.Origin, wh));
+      }
+      generator.CheckSubrange(p.Origin, new IdentifierExpr(p.Origin, local), pFormalType, p.Type,
+        new Microsoft.Dafny.IdentifierExpr(p.Origin, p), localTypeAssumptions);
+      args.Add(generator.CondApplyBox(mc.Origin, new IdentifierExpr(p.Origin, local), cce.NonNull(p.Type), mc.Ctor.Formals[i].Type));
+    }
+    IdentifierExpr id = new IdentifierExpr(mc.Origin, mc.Ctor.FullName, generator.Predef.DatatypeType);
+    return new NAryExpr(mc.Origin, new FunctionCall(id), args);
+  }
+
+  public static void TrMatchExpr(BoogieGenerator boogieGenerator, MatchExpr me, WFOptions wfOptions, Variables locals,
+    BoogieStmtListBuilder builder, BoogieGenerator.ExpressionTranslator etran, BoogieGenerator.AddResultCommands addResultCommands) {
+    FillMissingCases(me);
+
+    boogieGenerator.CheckWellformed(me.Source, wfOptions, locals, builder, etran);
+    Expr src = etran.TrExpr(me.Source);
+    IfCmd ifCmd = null;
+    BoogieStmtListBuilder elsBldr = new BoogieStmtListBuilder(boogieGenerator, boogieGenerator.Options, builder.Context);
+    elsBldr.Add(BoogieGenerator.TrAssumeCmd(me.Origin, Expr.False));
+    StmtList els = elsBldr.Collect(me.Origin);
+    foreach (var missingCtor in me.MissingCases) {
+      // havoc all bound variables
+      var b = new BoogieStmtListBuilder(boogieGenerator, boogieGenerator.Options, builder.Context);
+      var newLocals = new Variables();
+      Expr r = boogieGenerator.CtorInvocation(me.Origin, missingCtor, etran, newLocals, b);
+      locals.AddRange(newLocals.Values);
+
+      if (newLocals.Count != 0) {
+        List<IdentifierExpr> havocIds = new List<IdentifierExpr>();
+        foreach (Variable local in newLocals.Values) {
+          havocIds.Add(new IdentifierExpr(local.tok, local));
+        }
+
+        builder.Add(new HavocCmd(me.Origin, havocIds));
+      }
+
+      String missingStr = me.Context.FillHole(new IdCtx(missingCtor)).AbstractAllHoles().ToString();
+      b.Add(boogieGenerator.Assert(boogieGenerator.GetToken(me), Expr.False,
+        new MatchIsComplete("expression", missingStr), builder.Context));
+
+      Expr guard = Expr.Eq(src, r);
+      ifCmd = new IfCmd(me.Origin, guard, b.Collect(me.Origin), ifCmd, els, BlockRewriter.AllowSplitQ);
+      els = null;
+    }
+
+    for (int i = me.Cases.Count; 0 <= --i;) {
+      MatchCaseExpr mc = me.Cases[i];
+      var b = new BoogieStmtListBuilder(boogieGenerator, boogieGenerator.Options, builder.Context);
+      Expr ct = CtorInvocation(boogieGenerator, mc, me.Source.Type, etran, locals, b, BoogieGenerator.NOALLOC, false);
+      // generate:  if (src == ctor(args)) { assume args-is-well-typed; mc.Body is well-formed; assume Result == TrExpr(case); } else ...
+
+      boogieGenerator.CheckWellformedWithResult(mc.Body, wfOptions, locals, b, etran, addResultCommands);
+      ifCmd = new IfCmd(mc.Origin, Expr.Eq(src, ct), b.Collect(mc.Origin), ifCmd, els);
+      els = null;
+    }
+
+    builder.Add(ifCmd);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/Statements/OpaqueBlockVerifier.cs b/Source/DafnyCore/Verifier/Statements/OpaqueBlockVerifier.cs
new file mode 100644
index 00000000000..b6bb3898aba
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Statements/OpaqueBlockVerifier.cs
@@ -0,0 +1,110 @@
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Boogie;
+using DafnyIdentifierExpr = Microsoft.Dafny.IdentifierExpr;
+using BoogieIdentifierExpr = Microsoft.Boogie.IdentifierExpr;
+
+namespace Microsoft.Dafny;
+
+public static class OpaqueBlockVerifier {
+  public static void EmitBoogie(BoogieGenerator generator, OpaqueBlock block, BoogieStmtListBuilder builder,
+    Variables locals, BoogieGenerator.ExpressionTranslator etran, IMethodCodeContext codeContext) {
+
+    var blockBuilder = new BoogieStmtListBuilder(generator, builder.Options, builder.Context);
+
+    var bodyTranslator = GetBodyTranslator(generator, block, locals, etran, blockBuilder);
+    var prevDefiniteAssignmentTrackers = generator.DefiniteAssignmentTrackers;
+    generator.TrStmtList(block.Body, blockBuilder, locals, bodyTranslator, block.Origin);
+    generator.DefiniteAssignmentTrackers = prevDefiniteAssignmentTrackers;
+
+    var assignedVariables = block.DescendantsAndSelf.
+      SelectMany(s => s.GetAssignedLocals()).Select(ie => ie.Var)
+      .ToHashSet();
+    List<AttributedExpression> totalEnsures = new();
+
+    var variablesUsedInEnsures = block.Ensures.SelectMany(ae => ae.E.DescendantsAndSelf).
+      OfType<DafnyIdentifierExpr>().DistinctBy(ie => ie.Var);
+    var implicitAssignedIdentifiers =
+      variablesUsedInEnsures.Where(v => assignedVariables.Contains(v.Var) && generator.DefiniteAssignmentTrackers.ContainsKey(v.Var.UniqueName));
+    foreach (var v in implicitAssignedIdentifiers) {
+      var expression = new AttributedExpression(Expression.CreateAssigned(v.Origin, v));
+      totalEnsures.Add(expression);
+      blockBuilder.Add(generator.Assert(
+        v.Origin, etran.TrExpr(expression.E),
+        new DefiniteAssignment("variable", v.Var.Name, "here"), builder.Context));
+    }
+
+    foreach (var ensure in block.Ensures) {
+      totalEnsures.Add(ensure);
+      blockBuilder.Add(generator.Assert(
+        ensure.Origin, etran.TrExpr(ensure.E),
+        new OpaqueEnsuresDescription(), builder.Context,
+        etran.TrAttributes(ensure.Attributes, null)));
+    }
+
+    if (block.Modifies.Expressions.Any()) {
+      var context = new OpaqueBlockContext(codeContext, block);
+      if (context is IMethodCodeContext methodCodeContext) {
+        generator.CheckFrameSubset(
+          block.Origin, block.Modifies.Expressions,
+          null, null, etran, etran.ModifiesFrame(block.Origin), blockBuilder, new ModifyFrameSubset(
+            "opaque block",
+            block.Modifies.Expressions,
+            methodCodeContext.Modifies.Expressions
+          ), null);
+      }
+    }
+
+    generator.PathAsideBlock(block.Origin, blockBuilder, builder);
+    builder.Add(new HavocCmd(Token.NoToken, assignedVariables.Select(v => new BoogieIdentifierExpr(v.Origin, v.UniqueName)).ToList()));
+
+    var effectiveModifies = block.Modifies.Expressions.Any() ? block.Modifies : codeContext.Modifies;
+    var emptyModifies = BoogieGenerator.ModifiesClauseIsEmpty(effectiveModifies);
+    if (!emptyModifies) {
+      generator.ApplyModifiesEffect(block, etran, builder, block.Modifies, true, block.IsGhost);
+    }
+
+    foreach (var ensure in totalEnsures) {
+      generator.CheckWellformedAndAssume(ensure.E, new WFOptions(null, false),
+        locals, builder, etran, null);
+    }
+  }
+
+  private static BoogieGenerator.ExpressionTranslator GetBodyTranslator(BoogieGenerator generator, OpaqueBlock block, Variables locals,
+    BoogieGenerator.ExpressionTranslator etran, BoogieStmtListBuilder blockBuilder) {
+    BoogieGenerator.ExpressionTranslator bodyTranslator;
+    if (block.Modifies.Expressions.Any()) {
+      string modifyFrameName = BoogieGenerator.FrameVariablePrefix + generator.CurrentIdGenerator.FreshId("opaque#");
+      generator.DefineFrame(block.Origin, etran.ModifiesFrame(block.Origin), block.Modifies.Expressions, blockBuilder, locals, modifyFrameName);
+      bodyTranslator = etran.WithModifiesFrame(modifyFrameName);
+    } else {
+      bodyTranslator = etran;
+    }
+
+    return bodyTranslator;
+  }
+
+  class OpaqueEnsuresDescription : ProofObligationDescription {
+    public override string SuccessDescription => "ensures always holds";
+
+    public override string FailureDescription => "ensures might not hold";
+
+    public override string ShortDescription => "opaque block ensure clause";
+    public override bool IsImplicit => false;
+  }
+
+  class OpaqueBlockContext : CallableWrapper, IMethodCodeContext {
+    private readonly IMethodCodeContext callable;
+    private readonly OpaqueBlock opaqueBlock;
+
+    public OpaqueBlockContext(IMethodCodeContext callable, OpaqueBlock opaqueBlock)
+      : base(callable, callable.IsGhost) {
+      this.callable = callable;
+      this.opaqueBlock = opaqueBlock;
+    }
+
+    public List<Formal> Outs => callable.Outs;
+
+    public Specification<FrameExpression> Modifies => opaqueBlock.Modifies;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/Verifier/Translator.BoogieFactory.cs b/Source/DafnyCore/Verifier/Translator.BoogieFactory.cs
deleted file mode 100644
index 2d4a2ccd661..00000000000
--- a/Source/DafnyCore/Verifier/Translator.BoogieFactory.cs
+++ /dev/null
@@ -1,903 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.IO;
-using Bpl = Microsoft.Boogie;
-using static Microsoft.Dafny.Util;
-
-namespace Microsoft.Dafny {
-  partial class Translator {
-    public Bpl.Type BplBvType(int width) {
-      Contract.Requires(0 <= width);
-      if (width == 0) {
-        // Boogie claims to support bv0, but it translates it straight down to the SMT solver's 0-width bitvector type.
-        // However, the SMT-LIB 2 standard does not define such a bitvector width, so this is a bug in Boogie.  The
-        // best would be to fix this in Boogie, but for now, we simply work around it here.
-        return predef.Bv0Type;
-      } else {
-        return Bpl.Type.GetBvType(width);
-      }
-    }
-
-    internal Bpl.Expr BplBvLiteralExpr(Bpl.IToken tok, BaseTypes.BigNum n, BitvectorType bitvectorType) {
-      Contract.Requires(tok != null);
-      Contract.Requires(bitvectorType != null);
-      return BplBvLiteralExpr(tok, n, bitvectorType.Width);
-    }
-    internal Bpl.Expr BplBvLiteralExpr(Bpl.IToken tok, BaseTypes.BigNum n, int width) {
-      Contract.Requires(tok != null);
-      Contract.Requires(0 <= width);
-      if (width == 0) {
-        // see comment in BplBvType
-        Contract.Assert(n.IsZero);
-        return Bpl.Expr.Literal(0);
-      } else if (n.IsNegative) {
-        // This can only happen if some error is reported elsewhere. Nevertheless, we do need to
-        // generate a Boogie expression and Boogie would crash if we pass a negative number to
-        // Bpl.LiteralExpr for a bitvector.
-        var zero = new Bpl.LiteralExpr(tok, BaseTypes.BigNum.ZERO, width);
-        var absN = new Bpl.LiteralExpr(tok, -n, width);
-        var etran = new ExpressionTranslator(this, predef, tok);
-        return etran.TrToFunctionCall(tok, "sub_bv" + width, BplBvType(width), zero, absN, false);
-      } else {
-        return new Bpl.LiteralExpr(tok, n, width);
-      }
-    }
-
-    enum BuiltinFunction {
-      Lit,
-      LitInt,
-      LitReal,
-      LayerSucc,
-      AsFuelBottom,
-      CharFromInt,
-      CharToInt,
-      IsChar,
-
-      Is, IsBox,
-      IsAlloc, IsAllocBox,
-
-      IsTraitParent,
-
-      SetCard,
-      SetEmpty,
-      SetUnionOne,
-      SetUnion,
-      SetIntersection,
-      SetDifference,
-      SetEqual,
-      SetSubset,
-      SetDisjoint,
-
-      ISetEmpty,
-      ISetUnionOne,
-      ISetUnion,
-      ISetIntersection,
-      ISetDifference,
-      ISetEqual,
-      ISetSubset,
-      ISetDisjoint,
-
-      MultiSetCard,
-      MultiSetEmpty,
-      MultiSetUnionOne,
-      MultiSetUnion,
-      MultiSetIntersection,
-      MultiSetDifference,
-      MultiSetEqual,
-      MultiSetSubset,
-      MultiSetDisjoint,
-      MultiSetFromSet,
-      MultiSetFromSeq,
-      IsGoodMultiSet,
-
-      SeqLength,
-      SeqEmpty,
-      SeqBuild,
-      SeqAppend,
-      SeqIndex,
-      SeqUpdate,
-      SeqContains,
-      SeqDrop,
-      SeqTake,
-      SeqEqual,
-      SeqSameUntil,
-      SeqFromArray,
-      SeqRank,
-
-      MapEmpty,
-      MapCard,
-      MapDomain,
-      MapElements,
-      MapEqual,
-      MapDisjoint,
-      MapUnion,
-      MapGlue,
-
-      IMapEmpty,
-      IMapDomain,
-      IMapElements,
-      IMapEqual,
-      IMapGlue,
-
-      IndexField,
-      MultiIndexField,
-
-      Box,
-      Unbox,
-
-      RealToInt,
-      IntToReal,
-
-      IsGoodHeap,
-      IsHeapAnchor,
-      HeapSucc,
-      HeapSuccGhost,
-
-      DynamicType,  // allocated type (of object reference)
-      TypeTuple,
-      DeclType,
-      FieldOfDecl,
-      FDim,  // field dimension (0 - named, 1 or more - indexed)
-      IsGhostField,
-
-      DatatypeCtorId,
-      DtRank,
-      BoxRank,
-
-      GenericAlloc,
-
-      AtLayer
-    }
-
-    Bpl.Expr Lit(Bpl.Expr expr, Bpl.Type typ) {
-      Contract.Requires(expr != null);
-      Contract.Requires(typ != null);
-      // To avoid Boogie's int_2_U and U_2_int conversions, which seem to cause problems with
-      // arithmetic reasoning, we use several Lit functions.  In particular, we use one for
-      // integers, one for reals, and one for everything else.
-      if (typ.IsInt) {
-        return FunctionCall(expr.tok, BuiltinFunction.LitInt, null, expr);
-      } else if (typ.IsReal) {
-        return FunctionCall(expr.tok, BuiltinFunction.LitReal, null, expr);
-      } else {
-        return FunctionCall(expr.tok, BuiltinFunction.Lit, typ, expr);
-      }
-    }
-
-    Bpl.Expr Lit(Bpl.Expr expr) {
-      return Lit(expr, expr.Type);
-    }
-
-    private static Bpl.Expr GetLit(Bpl.Expr expr) {
-      if (expr is Bpl.NAryExpr) {
-        Bpl.NAryExpr app = (Bpl.NAryExpr)expr;
-        switch (app.Fun.FunctionName) {
-          case "LitInt":
-          case "LitReal":
-          case "Lit":
-            return app.Args[0];
-          default:
-            break;
-        }
-      }
-      return null;
-    }
-
-    public static Bpl.AssumeCmd TrAssumeCmd(Bpl.IToken tok, Bpl.Expr expr, Bpl.QKeyValue attributes = null) {
-      var litArgument = GetLit(expr);
-      if (litArgument is Bpl.LiteralExpr literalExpr && literalExpr.asBool) {
-        // In most cases, we leave any Lit brackets that "expr" may have. In the past, these brackets
-        // had always been removed here. Alas, some brittle test cases stopped verifying if we
-        // keep "assume Lit(true)" instead of simplifying it to "assume true". Therefore, as a
-        // special case, we remove the Lit brackets from the literal "true".
-        expr = litArgument;
-      }
-      return attributes == null ? new Bpl.AssumeCmd(tok, expr) : new Bpl.AssumeCmd(tok, expr, attributes);
-    }
-
-    static Bpl.Expr RemoveLit(Bpl.Expr expr) {
-      return GetLit(expr) ?? expr;
-    }
-
-    readonly ISet<string> letBoundVariablesWithLitRHS = new HashSet<string>();
-
-    bool IsLit(Bpl.Expr expr) {
-      if (expr is Bpl.IdentifierExpr ie) {
-        return letBoundVariablesWithLitRHS.Contains(ie.Name);
-      }
-      return GetLit(expr) != null;
-    }
-
-    // The "typeInstantiation" argument is passed in to help construct the result type of the function.
-    Bpl.NAryExpr FunctionCall(Bpl.IToken tok, BuiltinFunction f, Bpl.Type typeInstantiation, params Bpl.Expr[] args) {
-      Contract.Requires(tok != null);
-      Contract.Requires(args != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.NAryExpr>() != null);
-
-      switch (f) {
-        case BuiltinFunction.LitInt:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "LitInt", Bpl.Type.Int, args);
-        case BuiltinFunction.LitReal:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "LitReal", Bpl.Type.Real, args);
-        case BuiltinFunction.Lit:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Lit", typeInstantiation, args);
-        case BuiltinFunction.LayerSucc:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$LS", predef.LayerType, args);
-        case BuiltinFunction.AsFuelBottom:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "AsFuelBottom", predef.LayerType, args);
-        case BuiltinFunction.CharFromInt:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "char#FromInt", predef.CharType, args);
-        case BuiltinFunction.CharToInt:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "char#ToInt", predef.CharType, args);
-        case BuiltinFunction.IsChar:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "char#IsChar", Bpl.Type.Bool, args);
-
-        case BuiltinFunction.Is:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$Is", Bpl.Type.Bool, args);
-        case BuiltinFunction.IsBox:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$IsBox", Bpl.Type.Bool, args);
-        case BuiltinFunction.IsAlloc:
-          Contract.Assert(args.Length == 3);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$IsAlloc", Bpl.Type.Bool, args);
-        case BuiltinFunction.IsAllocBox:
-          Contract.Assert(args.Length == 3);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$IsAllocBox", Bpl.Type.Bool, args);
-
-        case BuiltinFunction.IsTraitParent:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "IsTraitParent", Bpl.Type.Bool, args);
-
-        case BuiltinFunction.SetCard:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Set#Card", Bpl.Type.Int, args);
-        case BuiltinFunction.SetEmpty: {
-            Contract.Assert(args.Length == 0);
-            Contract.Assert(typeInstantiation != null);
-            Bpl.Type resultType = predef.SetType(tok, true, typeInstantiation);
-            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "Set#Empty", resultType, args), resultType);
-          }
-        case BuiltinFunction.SetUnionOne:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Set#UnionOne", predef.SetType(tok, true, typeInstantiation), args);
-        case BuiltinFunction.SetUnion:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Set#Union", predef.SetType(tok, true, typeInstantiation), args);
-        case BuiltinFunction.SetIntersection:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Set#Intersection", predef.SetType(tok, true, typeInstantiation), args);
-        case BuiltinFunction.SetDifference:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Set#Difference", predef.SetType(tok, true, typeInstantiation), args);
-        case BuiltinFunction.SetEqual:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Set#Equal", Bpl.Type.Bool, args);
-        case BuiltinFunction.SetSubset:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Set#Subset", Bpl.Type.Bool, args);
-        case BuiltinFunction.SetDisjoint:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Set#Disjoint", Bpl.Type.Bool, args);
-        case BuiltinFunction.ISetEmpty: {
-            Contract.Assert(args.Length == 0);
-            Contract.Assert(typeInstantiation != null);
-            Bpl.Type resultType = predef.SetType(tok, false, typeInstantiation);
-            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "ISet#Empty", resultType, args), resultType);
-          }
-        case BuiltinFunction.ISetUnionOne:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "ISet#UnionOne", predef.SetType(tok, false, typeInstantiation), args);
-        case BuiltinFunction.ISetUnion:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "ISet#Union", predef.SetType(tok, false, typeInstantiation), args);
-        case BuiltinFunction.ISetIntersection:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "ISet#Intersection", predef.SetType(tok, false, typeInstantiation), args);
-        case BuiltinFunction.ISetDifference:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "ISet#Difference", predef.SetType(tok, false, typeInstantiation), args);
-        case BuiltinFunction.ISetEqual:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "ISet#Equal", Bpl.Type.Bool, args);
-        case BuiltinFunction.ISetSubset:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "ISet#Subset", Bpl.Type.Bool, args);
-        case BuiltinFunction.ISetDisjoint:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "ISet#Disjoint", Bpl.Type.Bool, args);
-        case BuiltinFunction.MultiSetCard:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "MultiSet#Card", Bpl.Type.Int, args);
-        case BuiltinFunction.MultiSetEmpty: {
-            Contract.Assert(args.Length == 0);
-            Contract.Assert(typeInstantiation != null);
-            Bpl.Type resultType = predef.MultiSetType(tok, typeInstantiation);
-            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "MultiSet#Empty", resultType, args), resultType);
-          }
-        case BuiltinFunction.MultiSetUnionOne:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "MultiSet#UnionOne", predef.MultiSetType(tok, typeInstantiation), args);
-        case BuiltinFunction.MultiSetUnion:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "MultiSet#Union", predef.MultiSetType(tok, typeInstantiation), args);
-        case BuiltinFunction.MultiSetIntersection:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "MultiSet#Intersection", predef.MultiSetType(tok, typeInstantiation), args);
-        case BuiltinFunction.MultiSetDifference:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "MultiSet#Difference", predef.MultiSetType(tok, typeInstantiation), args);
-        case BuiltinFunction.MultiSetEqual:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "MultiSet#Equal", Bpl.Type.Bool, args);
-        case BuiltinFunction.MultiSetSubset:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "MultiSet#Subset", Bpl.Type.Bool, args);
-        case BuiltinFunction.MultiSetDisjoint:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "MultiSet#Disjoint", Bpl.Type.Bool, args);
-        case BuiltinFunction.MultiSetFromSet:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "MultiSet#FromSet", predef.MultiSetType(tok, typeInstantiation), args);
-        case BuiltinFunction.MultiSetFromSeq:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "MultiSet#FromSeq", predef.MultiSetType(tok, typeInstantiation), args);
-        case BuiltinFunction.IsGoodMultiSet:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$IsGoodMultiSet", Bpl.Type.Bool, args);
-
-        case BuiltinFunction.SeqLength:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Seq#Length", Bpl.Type.Int, args);
-        case BuiltinFunction.SeqEmpty: {
-            Contract.Assert(args.Length == 0);
-            Contract.Assert(typeInstantiation != null);
-            Bpl.Type resultType = predef.SeqType(tok, typeInstantiation);
-            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "Seq#Empty", resultType, args), resultType);
-          }
-        case BuiltinFunction.SeqBuild:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Seq#Build", predef.SeqType(tok, typeInstantiation), args);
-        case BuiltinFunction.SeqAppend:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Seq#Append", predef.SeqType(tok, typeInstantiation), args);
-        case BuiltinFunction.SeqIndex:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Seq#Index", typeInstantiation, args);
-        case BuiltinFunction.SeqUpdate:
-          Contract.Assert(args.Length == 3);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Seq#Update", predef.SeqType(tok, typeInstantiation), args);
-        case BuiltinFunction.SeqContains:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Seq#Contains", Bpl.Type.Bool, args);
-        case BuiltinFunction.SeqDrop:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Seq#Drop", predef.SeqType(tok, typeInstantiation), args);
-        case BuiltinFunction.SeqTake:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Seq#Take", predef.SeqType(tok, typeInstantiation), args);
-        case BuiltinFunction.SeqEqual:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Seq#Equal", Bpl.Type.Bool, args);
-        case BuiltinFunction.SeqSameUntil:
-          Contract.Assert(args.Length == 3);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Seq#SameUntil", Bpl.Type.Bool, args);
-        case BuiltinFunction.SeqFromArray:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "Seq#FromArray", typeInstantiation, args);
-        case BuiltinFunction.SeqRank:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Seq#Rank", Bpl.Type.Int, args);
-
-        case BuiltinFunction.MapEmpty: {
-            Contract.Assert(args.Length == 0);
-            Contract.Assert(typeInstantiation != null);
-            Bpl.Type resultType = predef.MapType(tok, true, typeInstantiation, typeInstantiation);  // use 'typeInstantiation' (which is really always just BoxType anyway) as both type arguments
-            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "Map#Empty", resultType, args), resultType);
-          }
-        case BuiltinFunction.MapCard:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Map#Card", Bpl.Type.Int, args);
-        case BuiltinFunction.MapDomain:
-          Contract.Assert(args.Length == 1);
-          return FunctionCall(tok, "Map#Domain", typeInstantiation, args);
-        case BuiltinFunction.MapElements:
-          Contract.Assert(args.Length == 1);
-          return FunctionCall(tok, "Map#Elements", typeInstantiation, args);
-        case BuiltinFunction.MapGlue:
-          Contract.Assert(args.Length == 3);
-          return FunctionCall(tok, "Map#Glue", predef.MapType(tok, true, predef.BoxType, predef.BoxType), args);
-        case BuiltinFunction.MapEqual:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Map#Equal", Bpl.Type.Bool, args);
-        case BuiltinFunction.MapDisjoint:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Map#Disjoint", Bpl.Type.Bool, args);
-        case BuiltinFunction.MapUnion:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "Map#Disjoint", typeInstantiation, args);
-
-        case BuiltinFunction.IMapEmpty: {
-            Contract.Assert(args.Length == 0);
-            Contract.Assert(typeInstantiation != null);
-            Bpl.Type resultType = predef.MapType(tok, false, typeInstantiation, typeInstantiation);  // use 'typeInstantiation' (which is really always just BoxType anyway) as both type arguments
-            return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "IMap#Empty", resultType, args), resultType);
-          }
-        case BuiltinFunction.IMapDomain:
-          Contract.Assert(args.Length == 1);
-          return FunctionCall(tok, "IMap#Domain", typeInstantiation, args);
-        case BuiltinFunction.IMapElements:
-          Contract.Assert(args.Length == 1);
-          return FunctionCall(tok, "IMap#Elements", typeInstantiation, args);
-        case BuiltinFunction.IMapGlue:
-          Contract.Assert(args.Length == 3);
-          return FunctionCall(tok, "IMap#Glue", predef.MapType(tok, false, predef.BoxType, predef.BoxType), args);
-        case BuiltinFunction.IMapEqual:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "IMap#Equal", Bpl.Type.Bool, args);
-
-        case BuiltinFunction.IndexField:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "IndexField", predef.FieldName(tok, predef.BoxType), args);
-        case BuiltinFunction.MultiIndexField:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "MultiIndexField", predef.FieldName(tok, predef.BoxType), args);
-
-        case BuiltinFunction.Box:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$Box", predef.BoxType, args);
-        case BuiltinFunction.Unbox:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation != null);
-          return Bpl.Expr.CoerceType(tok, FunctionCall(tok, "$Unbox", typeInstantiation, args), typeInstantiation);
-
-        case BuiltinFunction.RealToInt:
-          Contract.Assume(args.Length == 1);
-          Contract.Assume(typeInstantiation == null);
-          return FunctionCall(tok, "Int", Bpl.Type.Int, args);
-        case BuiltinFunction.IntToReal:
-          Contract.Assume(args.Length == 1);
-          Contract.Assume(typeInstantiation == null);
-          return FunctionCall(tok, "Real", Bpl.Type.Real, args);
-
-        case BuiltinFunction.IsGoodHeap:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$IsGoodHeap", Bpl.Type.Bool, args);
-        case BuiltinFunction.IsHeapAnchor:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$IsHeapAnchor", Bpl.Type.Bool, args);
-        case BuiltinFunction.HeapSucc:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$HeapSucc", Bpl.Type.Bool, args);
-        case BuiltinFunction.HeapSuccGhost:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "$HeapSuccGhost", Bpl.Type.Bool, args);
-
-        case BuiltinFunction.DynamicType:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "dtype", predef.ClassNameType, args);
-        case BuiltinFunction.TypeTuple:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "TypeTuple", predef.ClassNameType, args);
-        case BuiltinFunction.DeclType:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "DeclType", predef.ClassNameType, args);
-        case BuiltinFunction.FieldOfDecl:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "FieldOfDecl", predef.FieldName(tok, typeInstantiation), args);
-        case BuiltinFunction.FDim:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "FDim", Bpl.Type.Int, args);
-        case BuiltinFunction.IsGhostField:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "$IsGhostField", Bpl.Type.Bool, args);
-
-        case BuiltinFunction.DatatypeCtorId:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "DatatypeCtorId", predef.DtCtorId, args);
-        case BuiltinFunction.DtRank:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "DtRank", Bpl.Type.Int, args);
-        case BuiltinFunction.BoxRank:
-          Contract.Assert(args.Length == 1);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "BoxRank", Bpl.Type.Int, args);
-
-        case BuiltinFunction.GenericAlloc:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation == null);
-          return FunctionCall(tok, "GenericAlloc", Bpl.Type.Bool, args);
-
-        case BuiltinFunction.AtLayer:
-          Contract.Assert(args.Length == 2);
-          Contract.Assert(typeInstantiation != null);
-          return FunctionCall(tok, "AtLayer", typeInstantiation, args);
-
-        default:
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected built-in function
-      }
-    }
-
-    static Bpl.NAryExpr FunctionCall(Bpl.IToken tok, string function, Bpl.Type returnType, params Bpl.Expr[] args) {
-      Contract.Requires(tok != null);
-      Contract.Requires(function != null);
-      Contract.Requires(returnType != null);
-      Contract.Requires(args != null);
-      Contract.Ensures(Contract.Result<Bpl.NAryExpr>() != null);
-
-      return new Bpl.NAryExpr(tok, new Bpl.FunctionCall(new Bpl.IdentifierExpr(tok, function, returnType)), new List<Bpl.Expr>(args));
-    }
-
-    static Bpl.NAryExpr FunctionCall(Bpl.IToken tok, string function, Bpl.Type returnType, List<Bpl.Expr> args) {
-      Contract.Requires(tok != null);
-      Contract.Requires(function != null);
-      Contract.Requires(returnType != null);
-      Contract.Requires(cce.NonNullElements(args));
-      Contract.Ensures(Contract.Result<Bpl.NAryExpr>() != null);
-
-      List<Bpl.Expr> aa = new List<Bpl.Expr>();
-      foreach (Bpl.Expr arg in args) {
-        aa.Add(arg);
-      }
-      return new Bpl.NAryExpr(tok, new Bpl.FunctionCall(new Bpl.IdentifierExpr(tok, function, returnType)), aa);
-    }
-
-    public Bpl.Expr ProperSubset(Bpl.IToken tok, Bpl.Expr e0, Bpl.Expr e1) {
-      Contract.Requires(tok != null);
-      Contract.Requires(e0 != null);
-      Contract.Requires(e1 != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      return Bpl.Expr.Binary(tok, Bpl.BinaryOperator.Opcode.And,
-        FunctionCall(tok, BuiltinFunction.SetSubset, null, e0, e1),
-        Bpl.Expr.Not(FunctionCall(tok, BuiltinFunction.SetSubset, null, e1, e0)));
-    }
-    public Bpl.Expr ProperMultiset(Bpl.IToken tok, Bpl.Expr e0, Bpl.Expr e1) {
-      Contract.Requires(tok != null);
-      Contract.Requires(e0 != null);
-      Contract.Requires(e1 != null);
-      return Bpl.Expr.Binary(tok, Bpl.BinaryOperator.Opcode.And,
-        FunctionCall(tok, BuiltinFunction.MultiSetSubset, null, e0, e1),
-        Bpl.Expr.Not(FunctionCall(tok, BuiltinFunction.MultiSetEqual, null, e0, e1)));
-    }
-    public Bpl.Expr ProperPrefix(Bpl.IToken tok, Bpl.Expr e0, Bpl.Expr e1) {
-      Contract.Requires(tok != null);
-      Contract.Requires(e0 != null);
-      Contract.Requires(e1 != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-      Bpl.Expr len0 = FunctionCall(tok, BuiltinFunction.SeqLength, null, e0);
-      Bpl.Expr len1 = FunctionCall(tok, BuiltinFunction.SeqLength, null, e1);
-      var result = Bpl.Expr.And(
-        Bpl.Expr.Lt(len0, len1),
-        FunctionCall(tok, BuiltinFunction.SeqSameUntil, null, e0, e1, len0));
-      result.tok = tok;
-      return result;
-    }
-
-    Bpl.Expr ArrayLength(Bpl.IToken tok, Bpl.Expr arr, int totalDims, int dim) {
-      Contract.Requires(tok != null);
-      Contract.Requires(arr != null);
-      Contract.Requires(1 <= totalDims);
-      Contract.Requires(0 <= dim && dim < totalDims);
-
-      string name = "_System." + SystemModuleManager.ArrayClassName(totalDims) + ".Length";
-      if (totalDims != 1) {
-        name += dim;
-      }
-      return new Bpl.NAryExpr(tok, new Bpl.FunctionCall(new Bpl.IdentifierExpr(tok, name, Bpl.Type.Int)), new List<Bpl.Expr> { arr });
-    }
-
-    static Bpl.Expr BplForall(IEnumerable<Bpl.Variable> args_in, Bpl.Expr body) {
-      Contract.Requires(args_in != null);
-      Contract.Requires(body != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-      var args = new List<Bpl.Variable>(args_in);
-      if (args.Count == 0) {
-        return body;
-      } else {
-        return new Bpl.ForallExpr(body.tok, args, body); // NO_TRIGGER
-      }
-    }
-
-    // Note: if the trigger is null, makes a forall without any triggers
-    static Bpl.Expr BplForall(IEnumerable<Bpl.Variable> args_in, Bpl.Trigger trg, Bpl.Expr body) {
-      if (trg == null) {
-        return BplForall(args_in, body); // NO_TRIGGER
-      } else {
-        var args = new List<Bpl.Variable>(args_in);
-        if (args.Count == 0) {
-          return body;
-        } else {
-          return new Bpl.ForallExpr(body.tok, args, trg, body);
-        }
-      }
-    }
-
-    static Bpl.Expr BplForall(Bpl.Variable arg, Bpl.Trigger trg, Bpl.Expr body) {
-      return BplForall(Singleton(arg), trg, body);
-    }
-
-    static Bpl.Expr BplForall(Bpl.IToken tok, List<Bpl.TypeVariable> typeParams,
-      List<Bpl.Variable> formals, Bpl.QKeyValue kv, Bpl.Trigger triggers, Bpl.Expr body, bool immutable = false) {
-      return (typeParams.Count == 0 && formals.Count == 0) ? body
-        : new Bpl.ForallExpr(tok, typeParams, formals, kv, triggers, body, immutable);
-    }
-
-    static Bpl.Expr BplAnd(IEnumerable<Bpl.Expr> conjuncts) {
-      Contract.Requires(conjuncts != null);
-      Bpl.Expr eq = Bpl.Expr.True;
-      foreach (var c in conjuncts) {
-        eq = BplAnd(eq, c);
-      }
-      return eq;
-    }
-
-    static Bpl.Expr BplAnd(Bpl.Expr a, Bpl.Expr b) {
-      Contract.Requires(a != null);
-      Contract.Requires(b != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      if (a == Bpl.Expr.True) {
-        return b;
-      } else if (b == Bpl.Expr.True) {
-        return a;
-      } else {
-        return Bpl.Expr.Binary(a.tok, Bpl.BinaryOperator.Opcode.And, a, b);
-      }
-    }
-
-    static Bpl.Expr BplOr(IEnumerable<Bpl.Expr> disjuncts) {
-      Contract.Requires(disjuncts != null);
-      Bpl.Expr eq = Bpl.Expr.False;
-      foreach (var d in disjuncts) {
-        eq = BplOr(eq, d);
-      }
-      return eq;
-    }
-
-    static Bpl.Expr BplOr(Bpl.Expr a, Bpl.Expr b) {
-      Contract.Requires(a != null);
-      Contract.Requires(b != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      if (a == Bpl.Expr.False) {
-        return b;
-      } else if (b == Bpl.Expr.False) {
-        return a;
-      } else {
-        return Bpl.Expr.Binary(a.tok, Bpl.BinaryOperator.Opcode.Or, a, b);
-      }
-    }
-
-    Bpl.Expr BplIff(Bpl.Expr a, Bpl.Expr b) {
-      Contract.Requires(a != null);
-      Contract.Requires(b != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      if (a == Bpl.Expr.True) {
-        return b;
-      } else if (b == Bpl.Expr.True) {
-        return a;
-      } else {
-        return Bpl.Expr.Iff(a, b);
-      }
-    }
-
-    static Bpl.Expr BplImp(Bpl.Expr a, Bpl.Expr b) {
-      Contract.Requires(a != null);
-      Contract.Requires(b != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      if (a == Bpl.Expr.True || b == Bpl.Expr.True) {
-        return b;
-      } else if (a == Bpl.Expr.False) {
-        return Bpl.Expr.True;
-      } else {
-        return Bpl.Expr.Imp(a, b);
-      }
-    }
-
-    private void BplIfIf(Bpl.IToken tk, bool yes, Bpl.Expr guard, BoogieStmtListBuilder builder, Action<BoogieStmtListBuilder> k) {
-      if (yes) {
-        var newBuilder = new BoogieStmtListBuilder(builder.tran, options);
-        k(newBuilder);
-        builder.Add(new Bpl.IfCmd(tk, guard, newBuilder.Collect(tk), null, null));
-      } else {
-        k(builder);
-      }
-    }
-
-    /// <summary>
-    /// lhs should be a Bpl.IdentifierExpr.
-    /// Creates lhs := rhs;
-    /// </summary>
-    static Bpl.Cmd BplSimplestAssign(Bpl.Expr lhs, Bpl.Expr rhs) {
-      Contract.Requires(lhs is Bpl.IdentifierExpr);
-      return new Bpl.AssignCmd(rhs.tok,
-        Singleton((Bpl.AssignLhs)new Bpl.SimpleAssignLhs(rhs.tok, (Bpl.IdentifierExpr)lhs)),
-        Singleton(rhs));
-    }
-
-    /// Makes a simple trigger
-    static Bpl.Trigger BplTrigger(Bpl.Expr e) {
-      return new Bpl.Trigger(e.tok, true, new List<Bpl.Expr> { e });
-    }
-
-    static Bpl.Trigger BplTriggerHeap(Translator translator, Bpl.IToken tok, Bpl.Expr e, Bpl.Expr/*?*/ optionalHeap, Bpl.Expr/*?*/ ePrime = null) {
-      Contract.Requires(translator != null);
-      Contract.Requires(tok != null);
-      Contract.Requires(e != null);
-
-      var exprs = new List<Bpl.Expr> { e };
-      if (ePrime != null) {
-        exprs.Add(ePrime);
-      }
-      if (optionalHeap != null) {
-        exprs.Add(translator.FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, optionalHeap));
-      }
-      return new Bpl.Trigger(tok, true, exprs);
-    }
-
-    static Bpl.Axiom BplAxiom(Bpl.Expr e) {
-      return new Bpl.Axiom(e.tok, e);
-    }
-
-    static Bpl.Expr BplLocalVar(string name, Bpl.Type ty, List<Bpl.Variable> lvars) {
-      lvars.Add(BplLocalVar(name, ty, out var v));
-      return v;
-    }
-
-    static Bpl.LocalVariable BplLocalVar(string name, Bpl.Type ty, out Bpl.Expr e) {
-      Contract.Requires(ty != null);
-      var v = new Bpl.LocalVariable(ty.tok, new Bpl.TypedIdent(ty.tok, name, ty));
-      e = new Bpl.IdentifierExpr(ty.tok, name, ty);
-      return v;
-    }
-
-    /* This function allows you to replace, for example:
-
-           Bpl.BoundVariable iVar = new Bpl.BoundVariable(e.tok, new Bpl.TypedIdent(e.tok, "$i", Bpl.Type.Int));
-           Bpl.IdentifierExpr i = new Bpl.IdentifierExpr(e.tok, iVar);
-
-       with:
-
-           Bpl.Expr i; var iVar = BplBoundVar("$i", Bpl.Type.Int, out i);
-    */
-    static Bpl.BoundVariable BplBoundVar(string name, Bpl.Type ty, out Bpl.Expr e) {
-      Contract.Requires(ty != null);
-      var v = new Bpl.BoundVariable(ty.tok, new Bpl.TypedIdent(ty.tok, name, ty));
-      e = new Bpl.IdentifierExpr(ty.tok, name, ty);
-      return v;
-    }
-
-    static Bpl.Expr BplBoundVar(string name, Bpl.Type ty, List<Bpl.Variable> bvars) {
-      bvars.Add(BplBoundVar(name, ty, out var e));
-      return e;
-    }
-
-    // Makes a formal variable
-    static Bpl.Formal BplFormalVar(string/*?*/ name, Bpl.Type ty, bool incoming) {
-      return BplFormalVar(name, ty, incoming, out _);
-    }
-
-    static Bpl.Formal BplFormalVar(string/*?*/ name, Bpl.Type ty, bool incoming, out Bpl.Expr e, Bpl.Expr whereClause = null) {
-      if (name == null) {
-        name = Bpl.TypedIdent.NoName;
-      }
-      var res = new Bpl.Formal(ty.tok, new Bpl.TypedIdent(ty.tok, name, ty, whereClause), incoming);
-      e = new Bpl.IdentifierExpr(ty.tok, res);
-      return res;
-    }
-
-    static Bpl.Expr BplFormalVar(string name, Bpl.Type ty, bool incoming, List<Bpl.Variable> fvars) {
-      fvars.Add(BplFormalVar(name, ty, incoming, out var e));
-      return e;
-    }
-
-    public static IToken ToDafnyToken(Bpl.IToken exprTok) {
-      if (exprTok == null) {
-        return null;
-      } else if (exprTok is IToken t) {
-        return t;
-      } else if (exprTok == Boogie.Token.NoToken) {
-        return Token.NoToken;
-      } else {
-        // These boogie Tokens can be created by TokenTextWriter
-        // This is defensive programming but we aren't expecting to hit this case
-        return new Token {
-          col = exprTok.col,
-          Uri = new Uri("untitled:" + exprTok.filename),
-          kind = exprTok.kind,
-          LeadingTrivia = "",
-          line = exprTok.line,
-          Next = null,
-          pos = exprTok.pos,
-          TrailingTrivia = "",
-          val = exprTok.val
-        };
-      }
-    }
-  }
-}
diff --git a/Source/DafnyCore/Verifier/Translator.ClassMembers.cs b/Source/DafnyCore/Verifier/Translator.ClassMembers.cs
deleted file mode 100644
index c8df7d1d3e9..00000000000
--- a/Source/DafnyCore/Verifier/Translator.ClassMembers.cs
+++ /dev/null
@@ -1,1609 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using System.Text;
-using Microsoft.Boogie;
-using Bpl = Microsoft.Boogie;
-using static Microsoft.Dafny.Util;
-using PODesc = Microsoft.Dafny.ProofObligationDescription;
-
-namespace Microsoft.Dafny {
-  public partial class Translator {
-    void AddClassMembers(TopLevelDeclWithMembers c, bool includeAllMethods, bool includeInformationAboutType) {
-      Contract.Requires(sink != null && predef != null);
-      Contract.Requires(c != null);
-      Contract.Ensures(fuelContext == Contract.OldValue(fuelContext));
-      Contract.Assert(VisibleInScope(c));
-
-      if (includeInformationAboutType) {
-        sink.AddTopLevelDeclaration(GetClass(c));
-        if (c is ArrayClassDecl) {
-          // classes.Add(c, predef.ClassDotArray);
-          AddAllocationAxiom(null, null, (ArrayClassDecl)c, true);
-        }
-
-        if (c is ClassLikeDecl { IsReferenceTypeDecl: true } referenceTypeDecl) {
-          AddIsAndIsAllocForReferenceType(referenceTypeDecl);
-        }
-
-        if (c is TraitDecl) {
-          //this adds: function implements$J(Ty, typeArgs): bool;
-          var arg_ref = new Bpl.Formal(c.tok, new Bpl.TypedIdent(c.tok, "ty", predef.Ty), true);
-          var vars = new List<Bpl.Variable> { arg_ref };
-          vars.AddRange(MkTyParamFormals(GetTypeParams(c), false));
-          var res = new Bpl.Formal(c.tok, new Bpl.TypedIdent(c.tok, Bpl.TypedIdent.NoName, Bpl.Type.Bool), false);
-          var implement_intr = new Bpl.Function(c.tok, "implements$" + c.FullSanitizedName, vars, res);
-          sink.AddTopLevelDeclaration(implement_intr);
-        } else if (c is ClassDecl classDecl) {
-          AddImplementsAxioms(classDecl);
-        }
-      }
-
-      foreach (MemberDecl member in c.Members.FindAll(VisibleInScope)) {
-        Contract.Assert(isAllocContext == null);
-        currentDeclaration = member;
-        if (!filterOnlyMembers || member.HasUserAttribute("only", out _)) {
-          SetAssertionOnlyFilter(member);
-        } else {
-          assertionOnlyFilter = _ => false;
-        }
-
-        if (member is Field) {
-          Field f = (Field)member;
-          Boogie.Declaration fieldDeclaration;
-          if (f is ConstantField) {
-            // The following call has the side effect of idempotently creating and adding the function to the sink's top-level declarations
-            Contract.Assert(currentModule == null);
-            currentModule = f.EnclosingClass.EnclosingModuleDefinition;
-            var oldFuelContext = fuelContext;
-            fuelContext = FuelSetting.NewFuelContext(f);
-            fieldDeclaration = GetReadonlyField(f);
-            fuelContext = oldFuelContext;
-            currentModule = null;
-          } else {
-            if (f.IsMutable) {
-              fieldDeclaration = GetField(f);
-              sink.AddTopLevelDeclaration(fieldDeclaration);
-            } else {
-              fieldDeclaration = GetReadonlyField(f);
-              if (fieldDeclaration != predef.ArrayLength) {
-                sink.AddTopLevelDeclaration(fieldDeclaration);
-              }
-            }
-          }
-          AddAllocationAxiom(fieldDeclaration, f, c);
-        } else if (member is Function function) {
-          AddFunction_Top(function, includeAllMethods);
-        } else if (member is Method method) {
-          AddMethod_Top(method, false, includeAllMethods);
-        } else {
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected member
-        }
-        ResetAssertionOnlyFilter();
-      }
-    }
-
-    /**
-      Add $Is and $IsAlloc for this class :
-         axiom (forall p: ref, G: Ty ::
-            { $Is(p, TClassA(G), h) }
-            $Is(p, TClassA(G), h) <=> (p == null || dtype(p) == TClassA(G));
-         axiom (forall p: ref, h: Heap, G: Ty ::
-            { $IsAlloc(p, TClassA(G), h) }
-            $IsAlloc(p, TClassA(G), h) => (p == null || h[p, alloc]);
-     */
-    private void AddIsAndIsAllocForReferenceType(ClassLikeDecl c) {
-      Contract.Requires(c.IsReferenceTypeDecl);
-
-      MapM(Bools, is_alloc => {
-        var vars = MkTyParamBinders(GetTypeParams(c), out var tyexprs);
-
-        var o = BplBoundVar("$o", predef.RefType, vars);
-
-        Bpl.Expr body, is_o;
-        Bpl.Expr o_null = Bpl.Expr.Eq(o, predef.Null);
-        Bpl.Expr o_ty = ClassTyCon(c, tyexprs);
-        string name;
-
-        if (is_alloc) {
-          name = $"$IsAlloc axiom for {c.WhatKind} {c}";
-          var h = BplBoundVar("$h", predef.HeapType, vars);
-          // $IsAlloc(o, ..)
-          is_o = MkIsAlloc(o, o_ty, h);
-          body = BplIff(is_o, BplOr(o_null, IsAlloced(c.tok, h, o)));
-        } else {
-          name = $"$Is axiom for {c.WhatKind} {c}";
-          // $Is(o, ..)
-          is_o = MkIs(o, o_ty);
-          Bpl.Expr rhs;
-          if (c == program.SystemModuleManager.ObjectDecl) {
-            rhs = Bpl.Expr.True;
-          } else if (c is TraitDecl) {
-            //generating $o == null || implements$J(dtype(x), typeArgs)
-            var t = (TraitDecl)c;
-            var dtypeFunc = FunctionCall(o.tok, BuiltinFunction.DynamicType, null, o);
-            var implementsJ_Arguments = new List<Expr> { dtypeFunc }; // TODO: also needs type parameters
-            implementsJ_Arguments.AddRange(tyexprs);
-            Bpl.Expr implementsFunc =
-              FunctionCall(t.tok, "implements$" + t.FullSanitizedName, Bpl.Type.Bool, implementsJ_Arguments);
-            rhs = BplOr(o_null, implementsFunc);
-          } else {
-            rhs = BplOr(o_null, DType(o, o_ty));
-          }
-
-          body = BplIff(is_o, rhs);
-        }
-
-        var axiom = new Boogie.Axiom(c.tok, BplForall(vars, BplTrigger(is_o), body), name);
-        AddOtherDefinition(GetOrCreateTypeConstructor(c), axiom);
-      });
-    }
-
-    void AddFunction_Top(Function f, bool includeAllMethods) {
-      FuelContext oldFuelContext = this.fuelContext;
-      this.fuelContext = FuelSetting.NewFuelContext(f);
-      isAllocContext = new IsAllocContext(options, true);
-
-      AddClassMember_Function(f);
-
-      if (InVerificationScope(f)) {
-        AddWellformednessCheck(f);
-        if (f.OverriddenFunction != null) { //it means that f is overriding its associated parent function
-          AddFunctionOverrideCheckImpl(f);
-        }
-      }
-      if (f is ExtremePredicate cop) {
-        AddClassMember_Function(cop.PrefixPredicate);
-        // skip the well-formedness check, because it has already been done for the extreme predicate
-      } else if (f.ByMethodDecl != null) {
-        AddMethod_Top(f.ByMethodDecl, true, includeAllMethods);
-      }
-
-      this.fuelContext = oldFuelContext;
-      isAllocContext = null;
-    }
-
-    void AddMethod_Top(Method m, bool isByMethod, bool includeAllMethods) {
-      if (!includeAllMethods && !InVerificationScope(m) && !referencedMembers.Contains(m)) {
-        // do nothing
-        return;
-      }
-
-      FuelContext oldFuelContext = this.fuelContext;
-      this.fuelContext = FuelSetting.NewFuelContext(m);
-
-      // wellformedness check for method specification
-      if (m.EnclosingClass is IteratorDecl && m == ((IteratorDecl)m.EnclosingClass).Member_MoveNext) {
-        // skip the well-formedness check, because it has already been done for the iterator
-      } else {
-        if (!isByMethod) {
-          var proc = AddMethod(m, MethodTranslationKind.SpecWellformedness);
-          sink.AddTopLevelDeclaration(proc);
-          if (InVerificationScope(m)) {
-            AddMethodImpl(m, proc, true);
-          }
-        }
-        if (m.OverriddenMethod != null && InVerificationScope(m)) //method has overridden a parent method
-        {
-          var procOverrideChk = AddMethod(m, MethodTranslationKind.OverrideCheck);
-          sink.AddTopLevelDeclaration(procOverrideChk);
-          AddMethodOverrideCheckImpl(m, procOverrideChk);
-        }
-      }
-      // the method spec itself
-      if (!isByMethod) {
-        sink.AddTopLevelDeclaration(AddMethod(m, MethodTranslationKind.Call));
-      }
-      if (m is ExtremeLemma) {
-        // Let the CoCall and Impl forms to use m.PrefixLemma signature and specification (and
-        // note that m.PrefixLemma.Body == m.Body.
-        m = ((ExtremeLemma)m).PrefixLemma;
-        sink.AddTopLevelDeclaration(AddMethod(m, MethodTranslationKind.CoCall));
-      }
-      if (!m.HasVerifyFalseAttribute && m.Body != null && InVerificationScope(m)) {
-        // ...and its implementation
-        assertionCount = 0;
-        var proc = AddMethod(m, MethodTranslationKind.Implementation);
-        sink.AddTopLevelDeclaration(proc);
-        AddMethodImpl(m, proc, false);
-      }
-      Reset();
-      this.fuelContext = oldFuelContext;
-    }
-
-    private void AddAllocationAxiom(Boogie.Declaration fieldDeclaration, Field f, TopLevelDeclWithMembers c, bool is_array = false) {
-      Contract.Requires(c != null);
-      // IFF you're adding the array axioms, then the field should be null
-      Contract.Requires(is_array == (f == null));
-      Contract.Requires(sink != null && predef != null);
-
-      Bpl.Expr heightAntecedent = Bpl.Expr.True;
-      if (f is ConstantField) {
-        var cf = (ConstantField)f;
-        AddWellformednessCheck(cf);
-        if (InVerificationScope(cf)) {
-          var etran = new ExpressionTranslator(this, predef, f.tok);
-          heightAntecedent = Bpl.Expr.Lt(Bpl.Expr.Literal(cf.EnclosingModule.CallGraph.GetSCCRepresentativePredecessorCount(cf)), etran.FunctionContextHeight());
-        }
-      }
-
-      if (f is ConstantField && f.IsStatic) {
-        AddStaticConstFieldAllocationAxiom(fieldDeclaration, f, c, heightAntecedent);
-      } else {
-        AddInstanceFieldAllocationAxioms(fieldDeclaration, f, c, is_array, heightAntecedent);
-      }
-    }
-
-    /// <summary>
-    /// For a non-static field "f" in a class "c(G)", generate:
-    ///     // type axiom:
-    ///     // If "G" is empty, then TClassA(G) is omitted from trigger.
-    ///     // If "c" is an array declaration, then the bound variables also include the index variables "ii" and "h[o, f]" has the form "h[o, Index(ii)]".
-    ///     // If "f" is readonly, then "h[o, f]" has the form "f(o)" (for special fields) or "f(G,o)" (for programmer-declared const fields),
-    ///     // so "h" and $IsHeap(h) are omitted.
-    ///     axiom fh < FunctionContextHeight ==>
-    ///       (forall o: ref, h: Heap, G : Ty ::
-    ///         { h[o, f], TClassA(G) }
-    ///         $IsHeap(h) &&
-    ///         o != null && $Is(o, TClassA(G))  // or dtype(o) = TClassA(G)
-    ///         ==>
-    ///         $Is(h[o, f], TT(PP)));
-    ///
-    ///     // allocation axiom:
-    ///     // As above for "G" and "ii", but "h" is included no matter what.
-    ///     axiom fh < FunctionContextHeight ==>
-    ///       (forall o: ref, h: Heap, G : Ty ::
-    ///         { h[o, f], TClassA(G) }
-    ///         $IsHeap(h) &&
-    ///         o != null && $Is(o, TClassA(G)) &&  // or dtype(o) = TClassA(G)
-    ///         h[o, alloc]
-    ///         ==>
-    ///         $IsAlloc(h[o, f], TT(PP), h));
-    /// </summary>
-    private void AddInstanceFieldAllocationAxioms(Bpl.Declaration fieldDeclaration, Field f, TopLevelDeclWithMembers c,
-      bool is_array, Expr heightAntecedent) {
-      var bvsTypeAxiom = new List<Bpl.Variable>();
-      var bvsAllocationAxiom = new List<Bpl.Variable>();
-
-      var tyvars = MkTyParamBinders(GetTypeParams(c), out var tyexprs);
-      bvsTypeAxiom.AddRange(tyvars);
-      bvsAllocationAxiom.AddRange(tyvars);
-
-      // This is the typical case (that is, f is not a static const field)
-
-      var hVar = BplBoundVar("$h", predef.HeapType, out var h);
-      var oVar = BplBoundVar("$o", TrType(ModuleResolver.GetThisType(c.tok, c)), out var o);
-
-      Bpl.Expr o_ty; // to hold TClassA(G)
-      var isGoodHeap = FunctionCall(c.tok, BuiltinFunction.IsGoodHeap, null, h);
-      Bpl.Expr isalloc_o;
-      if (c is not ClassLikeDecl { IsReferenceTypeDecl: true }) {
-        var udt = UserDefinedType.FromTopLevelDecl(c.tok, c);
-        o_ty = ClassTyCon(c, tyexprs);
-        isalloc_o = MkIsAlloc(o, udt, h);
-      } else if (RevealedInScope(c)) {
-        o_ty = ClassTyCon(c, tyexprs);
-        isalloc_o = IsAlloced(c.tok, h, o);
-      } else {
-        // c is only provided, not revealed, in the scope. Use the non-null type decl's internal synonym
-        var cl = (ClassLikeDecl)c;
-        Contract.Assert(cl.NonNullTypeDecl != null);
-        o_ty = ClassTyCon(cl.NonNullTypeDecl, tyexprs);
-        var udt = UserDefinedType.FromTopLevelDecl(c.tok, cl.NonNullTypeDecl);
-        isalloc_o = MkIsAlloc(o, udt, h);
-      }
-
-      Bpl.Expr indexBounds = Bpl.Expr.True;
-      Bpl.Expr oDotF;
-      if (is_array) {
-        // generate h[o,Index(ii)]
-        bvsTypeAxiom.Add(hVar);
-        bvsTypeAxiom.Add(oVar);
-        bvsAllocationAxiom.Add(hVar);
-        bvsAllocationAxiom.Add(oVar);
-
-        var ac = (ArrayClassDecl)c;
-        var ixs = new List<Bpl.Expr>();
-        for (int i = 0; i < ac.Dims; i++) {
-          Bpl.Variable v = BplBoundVar("$i" + i, Bpl.Type.Int, out var e);
-          ixs.Add(e);
-          bvsTypeAxiom.Add(v);
-          bvsAllocationAxiom.Add(v);
-        }
-
-        oDotF = ReadHeap(c.tok, h, o, GetArrayIndexFieldName(c.tok, ixs));
-
-        for (int i = 0; i < ac.Dims; i++) {
-          // 0 <= i && i < _System.array.Length(o)
-          var e1 = Bpl.Expr.Le(Bpl.Expr.Literal(0), ixs[i]);
-          var ff = GetReadonlyField((Field)(ac.Members[i]));
-          var e2 = Bpl.Expr.Lt(ixs[i], new Bpl.NAryExpr(c.tok, new Bpl.FunctionCall(ff), new List<Bpl.Expr> { o }));
-          indexBounds = BplAnd(indexBounds, BplAnd(e1, e2));
-        }
-      } else if (f.IsMutable) {
-        // generate h[o,f]
-        oDotF = ReadHeap(c.tok, h, o, new Bpl.IdentifierExpr(c.tok, GetField(f)), TrType(f.Type));
-        bvsTypeAxiom.Add(hVar);
-        bvsTypeAxiom.Add(oVar);
-        bvsAllocationAxiom.Add(hVar);
-        bvsAllocationAxiom.Add(oVar);
-      } else {
-        // generate f(G,o)
-        var args = new List<Bpl.Expr> { o };
-        if (f is ConstantField) {
-          args = Concat(tyexprs, args);
-        }
-
-        oDotF = new Bpl.NAryExpr(c.tok, new Bpl.FunctionCall(GetReadonlyField(f)), args);
-        bvsTypeAxiom.Add(oVar);
-        bvsAllocationAxiom.Add(hVar);
-        bvsAllocationAxiom.Add(oVar);
-      }
-
-      // antecedent: some subset of: $IsHeap(h) && o != null && $Is(o, TClassA(G)) && indexBounds
-      Bpl.Expr ante = Bpl.Expr.True;
-      if (is_array || f.IsMutable) {
-        ante = BplAnd(ante, isGoodHeap);
-        // Note: for the allocation axiom, isGoodHeap is added back in for !f.IsMutable below
-      }
-
-      Bpl.Expr is_o = BplAnd(
-        ReceiverNotNull(o),
-        !o.Type.Equals(predef.RefType) || c is TraitDecl
-          ? MkIs(o, o_ty, ModeledAsBoxType(ModuleResolver.GetThisType(c.tok, c))) // $Is(o, ..)
-          : DType(o, o_ty)); // dtype(o) == o_ty
-      ante = BplAnd(ante, is_o);
-
-      ante = BplAnd(ante, indexBounds);
-
-      // trigger
-      var t_es = new List<Bpl.Expr>();
-      t_es.Add(oDotF);
-      if (tyvars.Count > 0 && (is_array || !(f is ConstantField))) {
-        t_es.Add(o_ty);
-      }
-
-      var tr = new Bpl.Trigger(c.tok, true, t_es);
-
-      // Now for the conclusion of the axioms
-      Bpl.Expr is_hf, isalloc_hf = null;
-      if (is_array) {
-        is_hf = MkIs(oDotF, tyexprs[0], true);
-        isalloc_hf = MkIsAlloc(oDotF, tyexprs[0], h, true);
-      } else {
-        is_hf = MkIs(oDotF, f.Type); // $Is(h[o, f], ..)
-        isalloc_hf = MkIsAlloc(oDotF, f.Type, h); // $IsAlloc(h[o, f], ..)
-      }
-
-      Bpl.Expr ax = BplForall(bvsTypeAxiom, tr, BplImp(ante, is_hf));
-      AddOtherDefinition(fieldDeclaration, new Bpl.Axiom(c.tok, BplImp(heightAntecedent, ax), string.Format("{0}.{1}: Type axiom", c, f)));
-
-      if (isalloc_hf != null) {
-        if (!is_array && !f.IsMutable) {
-          // isGoodHeap wasn't added above, so add it now
-          ante = BplAnd(isGoodHeap, ante);
-        }
-
-        ante = BplAnd(ante, isalloc_o);
-
-        // compute a different trigger
-        t_es = new List<Bpl.Expr>();
-        t_es.Add(oDotF);
-        if (!is_array && !f.IsMutable) {
-          // since "h" is not part of oDotF, we add a separate term that mentions "h"
-          t_es.Add(isalloc_o);
-        }
-
-        if (!(f is ConstantField) && tyvars.Count > 0) {
-          t_es.Add(o_ty);
-        }
-
-        tr = new Bpl.Trigger(c.tok, true, t_es);
-
-        ax = BplForall(bvsAllocationAxiom, tr, BplImp(ante, isalloc_hf));
-        AddOtherDefinition(fieldDeclaration, new Boogie.Axiom(c.tok, BplImp(heightAntecedent, ax), $"{c}.{f}: Allocation axiom"));
-      }
-    }
-
-    /// <summary>
-    /// For a static (necessarily "const") field "f" in a class "c(G)", the expression corresponding to "h[o, f]" or "f(G,o)" above is "f(G)",
-    /// so generate:
-    ///     // type axiom:
-    ///     axiom fh < FunctionContextHeight ==>
-    ///       (forall G : Ty ::
-    ///         { f(G) }
-    ///         $Is(f(G), TT(PP)));
-    ///     // Or in the case where G is empty:
-    ///     axiom $Is(f(G), TT);
-    ///
-    ///     // allocation axiom:
-    ///     axiom fh < FunctionContextHeight ==>
-    ///       (forall h: Heap, G : Ty ::
-    ///         { $IsAlloc(f(G), TT(PP), h) }
-    ///         $IsHeap(h)
-    ///       ==>
-    ///         $IsAlloc(f(G), TT(PP), h));
-    ///
-    ///
-    /// The axioms above could be optimised to something along the lines of:
-    ///     axiom fh < FunctionContextHeight ==>
-    ///       (forall o: ref, h: Heap ::
-    ///         { h[o, f] }
-    ///         $IsHeap(h) && o != null && Tag(dtype(o)) = TagClass
-    ///         ==>
-    ///         (h[o, alloc] ==> $IsAlloc(h[o, f], TT(TClassA_Inv_i(dtype(o)),..), h)) &&
-    ///         $Is(h[o, f], TT(TClassA_Inv_i(dtype(o)),..), h);
-    /// <summary>
-    private void AddStaticConstFieldAllocationAxiom(Boogie.Declaration fieldDeclaration, Field f, TopLevelDeclWithMembers c, Expr heightAntecedent) {
-
-      var bvsTypeAxiom = new List<Bpl.Variable>();
-      var bvsAllocationAxiom = new List<Bpl.Variable>();
-
-      var tyvars = MkTyParamBinders(GetTypeParams(c), out var tyexprs);
-      bvsTypeAxiom.AddRange(tyvars);
-      bvsAllocationAxiom.AddRange(tyvars);
-
-      var oDotF = new Boogie.NAryExpr(c.tok, new Boogie.FunctionCall(GetReadonlyField(f)), tyexprs);
-      var is_hf = MkIs(oDotF, f.Type); // $Is(h[o, f], ..)
-      Boogie.Expr ax = bvsTypeAxiom.Count == 0 ? is_hf : BplForall(bvsTypeAxiom, BplTrigger(oDotF), is_hf);
-      var isAxiom = new Boogie.Axiom(c.tok, BplImp(heightAntecedent, ax), $"{c}.{f}: Type axiom");
-      AddOtherDefinition(fieldDeclaration, isAxiom);
-
-      {
-        var hVar = BplBoundVar("$h", predef.HeapType, out var h);
-        bvsAllocationAxiom.Add(hVar);
-        var isGoodHeap = FunctionCall(c.tok, BuiltinFunction.IsGoodHeap, null, h);
-        var isalloc_hf = MkIsAlloc(oDotF, f.Type, h); // $IsAlloc(h[o, f], ..)
-        ax = BplForall(bvsAllocationAxiom, BplTrigger(isalloc_hf), BplImp(isGoodHeap, isalloc_hf));
-        var isAllocAxiom = new Boogie.Axiom(c.tok, BplImp(heightAntecedent, ax), $"{c}.{f}: Allocation axiom");
-        sink.AddTopLevelDeclaration(isAllocAxiom);
-      }
-    }
-
-    private void AddImplementsAxioms(ClassDecl c) {
-      //this adds: axiom implements$J(class.C, typeInstantiations);
-      var vars = MkTyParamBinders(GetTypeParams(c), out var tyexprs);
-
-      foreach (var parent in c.ParentTraits) {
-        var trait = ((UserDefinedType)parent).AsParentTraitDecl();
-        Contract.Assert(trait != null);
-        var arg = ClassTyCon(c, tyexprs);
-        var args = new List<Bpl.Expr> { arg };
-        foreach (var targ in parent.TypeArgs) {
-          args.Add(TypeToTy(targ));
-        }
-        var expr = FunctionCall(c.tok, "implements$" + trait.FullSanitizedName, Bpl.Type.Bool, args);
-        var implements_axiom = new Bpl.Axiom(c.tok, BplForall(vars, null, expr));
-        AddOtherDefinition(GetOrCreateTypeConstructor(c), implements_axiom);
-      }
-    }
-
-    private void AddClassMember_Function(Function f) {
-      Contract.Ensures(currentModule == null && codeContext == null);
-      Contract.Ensures(currentModule == null && codeContext == null);
-
-      currentModule = f.EnclosingClass.EnclosingModuleDefinition;
-      codeContext = f;
-
-      // declare function
-      var boogieFunction = GetOrCreateFunction(f);
-      // add synonym axiom
-      if (f.IsFuelAware()) {
-        AddFuelSuccSynonymAxiom(f);
-        AddFuelZeroSynonymAxiom(f);
-      }
-      // add frame axiom
-      if (f.ReadsHeap) {
-        AddFrameAxiom(f);
-      }
-      // add consequence axiom
-      AddFunctionConsequenceAxiom(boogieFunction, f, f.Ens);
-      // add definition axioms, suitably specialized for literals
-      if (f.Body != null && RevealedInScope(f)) {
-        AddFunctionAxiom(boogieFunction, f, f.Body.Resolved);
-      } else {
-        // for body-less functions, at least generate its #requires function
-        var b = GetFunctionAxiom(f, null, null);
-        Contract.Assert(b == null);
-      }
-      // for a function in a class C that overrides a function in a trait J, add an axiom that connects J.F and C.F
-      if (f.OverriddenFunction != null) {
-        sink.AddTopLevelDeclaration(FunctionOverrideAxiom(f.OverriddenFunction, f));
-      }
-
-      // supply the connection between least/greatest predicates and prefix predicates
-      if (f is ExtremePredicate) {
-        AddPrefixPredicateAxioms(((ExtremePredicate)f).PrefixPredicate);
-      }
-
-      Reset();
-    }
-
-    private void AddMethodImpl(Method m, Boogie.Procedure proc, bool wellformednessProc) {
-      Contract.Requires(m != null);
-      Contract.Requires(proc != null);
-      Contract.Requires(sink != null && predef != null);
-      Contract.Requires(wellformednessProc || m.Body != null);
-      Contract.Requires(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && isAllocContext == null);
-      Contract.Ensures(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && isAllocContext == null);
-
-      currentModule = m.EnclosingClass.EnclosingModuleDefinition;
-      codeContext = m;
-      isAllocContext = new IsAllocContext(options, m.IsGhost);
-
-      List<Variable> inParams = Boogie.Formal.StripWhereClauses(proc.InParams);
-      List<Variable> outParams = Boogie.Formal.StripWhereClauses(proc.OutParams);
-
-      BoogieStmtListBuilder builder = new BoogieStmtListBuilder(this, options);
-      builder.Add(new CommentCmd("AddMethodImpl: " + m + ", " + proc));
-      var etran = new ExpressionTranslator(this, predef, m.tok);
-      InitializeFuelConstant(m.tok, builder, etran);
-      var localVariables = new List<Variable>();
-      GenerateImplPrelude(m, wellformednessProc, inParams, outParams, builder, localVariables);
-
-      if (UseOptimizationInZ3) {
-        // We ask Z3 to minimize all parameters of type 'nat'.
-        foreach (var f in m.Ins) {
-          var udt = f.Type.NormalizeExpandKeepConstraints() as UserDefinedType;
-          if (udt != null && udt.Name == "nat") {
-            builder.Add(optimizeExpr(true, new IdentifierExpr(f.tok, f), f.Tok, etran));
-          }
-        }
-      }
-
-      Boogie.StmtList stmts;
-      if (!wellformednessProc) {
-        var inductionVars = ApplyInduction(m.Ins, m.Attributes);
-        if (inductionVars.Count != 0) {
-          // Let the parameters be this,x,y of the method M and suppose ApplyInduction returns this,y.
-          // Also, let Pre be the precondition and VF be the decreases clause.
-          // Then, insert into the method body what amounts to:
-          //     assume case-analysis-on-parameter[[ y' ]];
-          //     forall this',y' | Pre(this', x, y') && (VF(this', x, y') << VF(this', x, y)) {
-          //       this'.M(x, y');
-          //     }
-          // Generate bound variables for the forall statement, and a substitution for the Pre and VF
-
-          // assume case-analysis-on-parameter[[ y' ]];
-          foreach (var inFormal in m.Ins) {
-            var dt = inFormal.Type.AsDatatype;
-            if (dt != null) {
-              var funcID = new Boogie.FunctionCall(new Boogie.IdentifierExpr(inFormal.tok, "$IsA#" + dt.FullSanitizedName, Boogie.Type.Bool));
-              var f = new Boogie.IdentifierExpr(inFormal.tok, inFormal.AssignUniqueName(m.IdGenerator), TrType(inFormal.Type));
-              builder.Add(TrAssumeCmd(inFormal.tok, new Boogie.NAryExpr(inFormal.tok, funcID, new List<Boogie.Expr> { f })));
-            }
-          }
-
-          var parBoundVars = new List<BoundVar>();
-          var parBounds = new List<ComprehensionExpr.BoundedPool>();
-          var substMap = new Dictionary<IVariable, Expression>();
-          Expression receiverSubst = null;
-          foreach (var iv in inductionVars) {
-            BoundVar bv;
-            if (iv == null) {
-              // this corresponds to "this"
-              Contract.Assert(!m.IsStatic);  // if "m" is static, "this" should never have gone into the _induction attribute
-              Contract.Assert(receiverSubst == null);  // we expect at most one
-              var receiverType = ModuleResolver.GetThisType(m.tok, (TopLevelDeclWithMembers)m.EnclosingClass);
-              bv = new BoundVar(m.tok, CurrentIdGenerator.FreshId("$ih#this"), receiverType); // use this temporary variable counter, but for a Dafny name (the idea being that the number and the initial "_" in the name might avoid name conflicts)
-              var ie = new IdentifierExpr(m.tok, bv.Name) {
-                Var = bv,
-                Type = bv.Type
-              };
-              receiverSubst = ie;
-            } else {
-              CloneVariableAsBoundVar(iv.tok, iv, "$ih#" + iv.Name, out bv, out var ie);
-              substMap.Add(iv, ie);
-            }
-            parBoundVars.Add(bv);
-            parBounds.Add(new ComprehensionExpr.SpecialAllocIndependenceAllocatedBoundedPool());  // record that we don't want alloc antecedents for these variables
-          }
-
-          // Generate a CallStmt to be used as the body of the 'forall' statement.
-          RecursiveCallParameters(m.tok, m, m.TypeArgs, m.Ins, receiverSubst, substMap, out var recursiveCallReceiver, out var recursiveCallArgs);
-          var methodSel = new MemberSelectExpr(m.tok, recursiveCallReceiver, m.Name) {
-            Member = m,
-            TypeApplication_AtEnclosingClass = m.EnclosingClass.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp.tok, tp)),
-            TypeApplication_JustMember = m.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp.tok, tp)),
-            Type = new InferredTypeProxy()
-          };
-          var recursiveCall = new CallStmt(m.tok.ToRange(), new List<Expression>(), methodSel, recursiveCallArgs) {
-            IsGhost = m.IsGhost
-          };
-
-          Expression parRange = new LiteralExpr(m.tok, true) {
-            Type = Type.Bool
-          };
-          foreach (var pre in m.Req) {
-            parRange = Expression.CreateAnd(parRange, Substitute(pre.E, receiverSubst, substMap));
-          }
-          // construct an expression (generator) for:  VF' << VF
-          ExpressionConverter decrCheck = delegate (Dictionary<IVariable, Expression> decrSubstMap, ExpressionTranslator exprTran) {
-            var decrToks = new List<IToken>();
-            var decrTypes = new List<Type>();
-            var decrCallee = new List<Expr>();
-            var decrCaller = new List<Expr>();
-            foreach (var ee in m.Decreases.Expressions) {
-              decrToks.Add(ee.tok);
-              decrTypes.Add(ee.Type.NormalizeExpand());
-              decrCaller.Add(exprTran.TrExpr(ee));
-              Expression es = Substitute(ee, receiverSubst, substMap);
-              es = Substitute(es, null, decrSubstMap);
-              decrCallee.Add(exprTran.TrExpr(es));
-            }
-            return DecreasesCheck(decrToks, decrTypes, decrTypes, decrCallee, decrCaller, null, null, false, true);
-          };
-
-#if VERIFY_CORRECTNESS_OF_TRANSLATION_FORALL_STATEMENT_RANGE
-          var definedness = new BoogieStmtListBuilder(this, options);
-          var exporter = new BoogieStmtListBuilder(this, options);
-          TrForallStmtCall(m.tok, parBoundVars, parRange, decrCheck, null, recursiveCall, definedness, exporter, localVariables, etran);
-          // All done, so put the two pieces together
-          builder.Add(new Bpl.IfCmd(m.tok, null, definedness.Collect(m.tok), null, exporter.Collect(m.tok)));
-#else
-          TrForallStmtCall(m.tok, parBoundVars, parBounds, parRange, decrCheck, null, recursiveCall, null, builder, localVariables, etran);
-#endif
-        }
-        // translate the body of the method
-        Contract.Assert(m.Body != null);  // follows from method precondition and the if guard
-
-        // $_reverifyPost := false;
-        builder.Add(Boogie.Cmd.SimpleAssign(m.tok, new Boogie.IdentifierExpr(m.tok, "$_reverifyPost", Boogie.Type.Bool), Boogie.Expr.False));
-        // register output parameters with definite-assignment trackers
-        Contract.Assert(definiteAssignmentTrackers.Count == 0);
-        m.Outs.ForEach(p => AddExistingDefiniteAssignmentTracker(p, m.IsGhost));
-        // translate the body
-        TrStmt(m.Body, builder, localVariables, etran);
-        m.Outs.ForEach(p => CheckDefiniteAssignmentReturn(m.Body.RangeToken.EndToken, p, builder));
-        if (m is { FunctionFromWhichThisIsByMethodDecl: { ByMethodTok: { } } fun }) {
-          AssumeCanCallForByMethodDecl(m, builder);
-        }
-        stmts = builder.Collect(m.Body.RangeToken.StartToken); // TODO should this be EndToken?  the parameter name suggests it should be the closing curly
-        // tear down definite-assignment trackers
-        m.Outs.ForEach(RemoveDefiniteAssignmentTracker);
-
-        Contract.Assert(definiteAssignmentTrackers.Count == 0);
-      } else {
-        // check well-formedness of any default-value expressions (before assuming preconditions)
-        foreach (var formal in m.Ins.Where(formal => formal.DefaultValue != null)) {
-          var e = formal.DefaultValue;
-          CheckWellformed(e, new WFOptions(null, false, false, true), localVariables, builder, etran);
-          builder.Add(new Boogie.AssumeCmd(e.tok, CanCallAssumption(e, etran)));
-          CheckSubrange(e.tok, etran.TrExpr(e), e.Type, formal.Type, builder);
-
-          if (formal.IsOld) {
-            Boogie.Expr wh = GetWhereClause(e.tok, etran.TrExpr(e), e.Type, etran.Old, ISALLOC, true);
-            if (wh != null) {
-              var desc = new PODesc.IsAllocated("default value", "in the two-state lemma's previous state");
-              builder.Add(Assert(e.tok, wh, desc));
-            }
-          }
-        }
-        // check well-formedness of the preconditions, and then assume each one of them
-        foreach (AttributedExpression p in m.Req) {
-          CheckWellformedAndAssume(p.E, new WFOptions(), localVariables, builder, etran);
-        }
-        // check well-formedness of the modifies clauses
-        CheckFrameWellFormed(new WFOptions(), m.Mod.Expressions, localVariables, builder, etran);
-        // check well-formedness of the decreases clauses
-        foreach (Expression p in m.Decreases.Expressions) {
-          CheckWellformed(p, new WFOptions(), localVariables, builder, etran);
-        }
-
-        if (!(m is TwoStateLemma)) {
-          // play havoc with the heap according to the modifies clause
-          builder.Add(new Boogie.HavocCmd(m.tok, new List<Boogie.IdentifierExpr> { etran.HeapCastToIdentifierExpr }));
-          // assume the usual two-state boilerplate information
-          foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(m.tok, m.Mod.Expressions, m.IsGhost, m.AllowsAllocation, etran.Old, etran, etran.Old)) {
-            if (tri.IsFree) {
-              builder.Add(TrAssumeCmd(m.tok, tri.Expr));
-            }
-          }
-        }
-
-        // also play havoc with the out parameters
-        if (outParams.Count != 0) {  // don't create an empty havoc statement
-          List<Boogie.IdentifierExpr> outH = new List<Boogie.IdentifierExpr>();
-          foreach (Boogie.Variable b in outParams) {
-            Contract.Assert(b != null);
-            outH.Add(new Boogie.IdentifierExpr(b.tok, b));
-          }
-          builder.Add(new Boogie.HavocCmd(m.tok, outH));
-        }
-        // mark the end of the modifles/out-parameter havocking with a CaptureState; make its location be the first ensures clause, if any (and just
-        // omit the CaptureState if there's no ensures clause)
-        if (m.Ens.Count != 0) {
-          builder.AddCaptureState(m.Ens[0].E.tok, false, "post-state");
-        }
-
-        // check wellformedness of postconditions
-        foreach (AttributedExpression p in m.Ens) {
-          CheckWellformedAndAssume(p.E, new WFOptions(), localVariables, builder, etran);
-        }
-
-        stmts = builder.Collect(m.tok);
-      }
-
-      if (EmitImplementation(m.Attributes)) {
-        // emit impl only when there are proof obligations.
-        QKeyValue kv = etran.TrAttributes(m.Attributes, null);
-        Boogie.Implementation impl = AddImplementationWithVerboseName(GetToken(m), proc,
-           inParams, outParams, localVariables, stmts, kv);
-
-        if (InsertChecksums) {
-          InsertChecksum(m, impl);
-        }
-      }
-
-      isAllocContext = null;
-      Reset();
-    }
-
-    private void AddMethodOverrideCheckImpl(Method m, Boogie.Procedure proc) {
-      Contract.Requires(m != null);
-      Contract.Requires(proc != null);
-      Contract.Requires(sink != null && predef != null);
-      Contract.Requires(m.OverriddenMethod != null);
-      Contract.Requires(m.Ins.Count == m.OverriddenMethod.Ins.Count);
-      Contract.Requires(m.Outs.Count == m.OverriddenMethod.Outs.Count);
-      //Contract.Requires(wellformednessProc || m.Body != null);
-      Contract.Requires(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && isAllocContext == null);
-      Contract.Ensures(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && isAllocContext == null);
-
-      currentModule = m.EnclosingClass.EnclosingModuleDefinition;
-      codeContext = m;
-      isAllocContext = new IsAllocContext(options, m.IsGhost);
-
-      List<Variable> inParams = Boogie.Formal.StripWhereClauses(proc.InParams);
-      List<Variable> outParams = Boogie.Formal.StripWhereClauses(proc.OutParams);
-
-      var builder = new BoogieStmtListBuilder(this, options);
-      var etran = new ExpressionTranslator(this, predef, m.tok);
-      var localVariables = new List<Variable>();
-      InitializeFuelConstant(m.tok, builder, etran);
-
-      // assume traitTypeParameter == G(overrideTypeParameters);
-      AddOverrideCheckTypeArgumentInstantiations(m, builder, localVariables);
-
-      if (m is TwoStateLemma) {
-        // $Heap := current$Heap;
-        var heap = ExpressionTranslator.HeapIdentifierExpr(predef, m.tok);
-        builder.Add(Boogie.Cmd.SimpleAssign(m.tok, heap, new Boogie.IdentifierExpr(m.tok, "current$Heap", predef.HeapType)));
-      }
-
-
-      var substMap = new Dictionary<IVariable, Expression>();
-      for (int i = 0; i < m.Ins.Count; i++) {
-        // get corresponding formal in the class
-        var ie = new IdentifierExpr(m.Ins[i].tok, m.Ins[i].AssignUniqueName(m.IdGenerator));
-        ie.Var = m.Ins[i]; ie.Type = ie.Var.Type;
-        substMap.Add(m.OverriddenMethod.Ins[i], ie);
-      }
-      for (int i = 0; i < m.Outs.Count; i++) {
-        // get corresponding formal in the class
-        var ie = new IdentifierExpr(m.Outs[i].tok, m.Outs[i].AssignUniqueName(m.IdGenerator));
-        ie.Var = m.Outs[i]; ie.Type = ie.Var.Type;
-        substMap.Add(m.OverriddenMethod.Outs[i], ie);
-      }
-
-      var typeMap = GetTypeArgumentSubstitutionMap(m.OverriddenMethod, m);
-
-      Boogie.StmtList stmts;
-      //adding assume Pre’; assert P; // this checks that Pre’ implies P
-      AddMethodOverrideReqsChk(m, builder, etran, substMap, typeMap);
-
-      //adding assert R <= Rank’;
-      AddOverrideTerminationChk(m, m.OverriddenMethod, builder, etran, substMap, typeMap);
-
-      //adding assert W <= Frame’
-      AddMethodOverrideSubsetChk(m, builder, etran, localVariables, substMap, typeMap);
-
-      if (!(m is TwoStateLemma)) {
-        //change the heap at locations W
-        HavocMethodFrameLocations(m, builder, etran, localVariables);
-      }
-
-      //adding assume Q; assert Post’;
-      AddMethodOverrideEnsChk(m, builder, etran, substMap, typeMap);
-
-      stmts = builder.Collect(m.tok);
-
-      if (EmitImplementation(m.Attributes)) {
-        // emit the impl only when there are proof obligations.
-        QKeyValue kv = etran.TrAttributes(m.Attributes, null);
-
-        Boogie.Implementation impl = AddImplementationWithVerboseName(GetToken(m), proc, inParams, outParams, localVariables, stmts, kv);
-
-        if (InsertChecksums) {
-          InsertChecksum(m, impl);
-        }
-      }
-
-      isAllocContext = null;
-      Reset();
-    }
-
-    private void AddFunctionOverrideCheckImpl(Function f) {
-      Contract.Requires(f != null);
-      Contract.Requires(f.EnclosingClass is TopLevelDeclWithMembers);
-      Contract.Requires(sink != null && predef != null);
-      Contract.Requires(f.OverriddenFunction != null);
-      Contract.Requires(f.Formals.Count == f.OverriddenFunction.Formals.Count);
-      Contract.Requires(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && isAllocContext != null);
-      Contract.Ensures(currentModule == null && codeContext == null && _tmpIEs.Count == 0 && isAllocContext != null);
-
-      #region first procedure, no impl yet
-      //Function nf = new Function(f.tok, "OverrideCheck_" + f.Name, f.IsStatic, f.IsGhost, f.TypeArgs, f.OpenParen, f.Formals, f.ResultType, f.Req, f.Reads, f.Ens, f.Decreases, f.Body, f.Attributes, f.SignatureEllipsis);
-      //AddFunction(f);
-      currentModule = f.EnclosingClass.EnclosingModuleDefinition;
-      codeContext = f;
-
-      Boogie.Expr prevHeap = null;
-      Boogie.Expr currHeap = null;
-      var ordinaryEtran = new ExpressionTranslator(this, predef, f.tok);
-      ExpressionTranslator etran;
-      var inParams_Heap = new List<Boogie.Variable>();
-      if (f is TwoStateFunction) {
-        var prevHeapVar = new Boogie.Formal(f.tok, new Boogie.TypedIdent(f.tok, "previous$Heap", predef.HeapType), true);
-        inParams_Heap.Add(prevHeapVar);
-        prevHeap = new Boogie.IdentifierExpr(f.tok, prevHeapVar);
-        if (f.ReadsHeap) {
-          var currHeapVar = new Boogie.Formal(f.tok, new Boogie.TypedIdent(f.tok, "current$Heap", predef.HeapType), true);
-          inParams_Heap.Add(currHeapVar);
-          currHeap = new Boogie.IdentifierExpr(f.tok, currHeapVar);
-        }
-        etran = new ExpressionTranslator(this, predef, currHeap, prevHeap);
-      } else {
-        etran = ordinaryEtran;
-      }
-
-      // parameters of the procedure
-      var typeInParams = MkTyParamFormals(GetTypeParams(f), true);
-      var inParams = new List<Variable>();
-      var outParams = new List<Boogie.Variable>();
-      if (!f.IsStatic) {
-        var th = new Boogie.IdentifierExpr(f.tok, "this", TrReceiverType(f));
-        Boogie.Expr wh = Boogie.Expr.And(
-          ReceiverNotNull(th),
-          etran.GoodRef(f.tok, th, ModuleResolver.GetReceiverType(f.tok, f)));
-        Boogie.Formal thVar = new Boogie.Formal(f.tok, new Boogie.TypedIdent(f.tok, "this", TrReceiverType(f), wh), true);
-        inParams.Add(thVar);
-      }
-      foreach (Formal p in f.Formals) {
-        Boogie.Type varType = TrType(p.Type);
-        Boogie.Expr wh = GetWhereClause(p.tok, new Boogie.IdentifierExpr(p.tok, p.AssignUniqueName(f.IdGenerator), varType), p.Type, etran, NOALLOC);
-        inParams.Add(new Boogie.Formal(p.tok, new Boogie.TypedIdent(p.tok, p.AssignUniqueName(f.IdGenerator), varType, wh), true));
-      }
-
-      Formal pOut = null;
-      if (f.Result != null || f.OverriddenFunction.Result != null) {
-        if (f.Result != null) {
-          pOut = f.Result;
-          Contract.Assert(!pOut.IsOld);
-        } else {
-          var pp = f.OverriddenFunction.Result;
-          Contract.Assert(!pp.IsOld);
-          pOut = new Formal(pp.tok, pp.Name, f.ResultType, false, pp.IsGhost, null);
-        }
-        var varType = TrType(pOut.Type);
-        var wh = GetWhereClause(pOut.tok, new Boogie.IdentifierExpr(pOut.tok, pOut.AssignUniqueName(f.IdGenerator), varType), pOut.Type, etran, NOALLOC);
-        outParams.Add(new Boogie.Formal(pOut.tok, new Boogie.TypedIdent(pOut.tok, pOut.AssignUniqueName(f.IdGenerator), varType, wh), true));
-      }
-      // the procedure itself
-      var req = new List<Boogie.Requires>();
-      // free requires fh == FunctionContextHeight;
-      req.Add(Requires(f.tok, true, etran.HeightContext(f), null, null, null));
-      if (f is TwoStateFunction) {
-        // free requires prevHeap == Heap && HeapSucc(prevHeap, currHeap) && IsHeap(currHeap)
-        var a0 = Boogie.Expr.Eq(prevHeap, ordinaryEtran.HeapExpr);
-        var a1 = HeapSucc(prevHeap, currHeap);
-        var a2 = FunctionCall(f.tok, BuiltinFunction.IsGoodHeap, null, currHeap);
-        req.Add(Requires(f.tok, true, BplAnd(a0, BplAnd(a1, a2)), null, null, null));
-      }
-      // modifies $Heap
-      var mod = new List<Boogie.IdentifierExpr> {
-        ordinaryEtran.HeapCastToIdentifierExpr,
-      };
-      var ens = new List<Boogie.Ensures>();
-
-      var name = MethodName(f, MethodTranslationKind.OverrideCheck);
-      var proc = new Boogie.Procedure(f.tok, name, new List<Boogie.TypeVariable>(),
-        Util.Concat(Util.Concat(typeInParams, inParams_Heap), inParams), outParams,
-        false, req, mod, ens, etran.TrAttributes(f.Attributes, null));
-      AddVerboseName(proc, f.FullDafnyName, MethodTranslationKind.OverrideCheck);
-      sink.AddTopLevelDeclaration(proc);
-      var implInParams = Boogie.Formal.StripWhereClauses(inParams);
-      var implOutParams = Boogie.Formal.StripWhereClauses(outParams);
-
-      #endregion
-
-      //List<Variable> outParams = Bpl.Formal.StripWhereClauses(proc.OutParams);
-
-      BoogieStmtListBuilder builder = new BoogieStmtListBuilder(this, options);
-      List<Variable> localVariables = new List<Variable>();
-
-      InitializeFuelConstant(f.tok, builder, etran);
-
-      // assume traitTypeParameter == G(overrideTypeParameters);
-      AddOverrideCheckTypeArgumentInstantiations(f, builder, localVariables);
-
-      if (f is TwoStateFunction) {
-        // $Heap := current$Heap;
-        var heap = ordinaryEtran.HeapCastToIdentifierExpr;
-        builder.Add(Boogie.Cmd.SimpleAssign(f.tok, heap, etran.HeapExpr));
-        etran = ordinaryEtran;  // we no longer need the special heap names
-      }
-
-      var substMap = new Dictionary<IVariable, Expression>();
-      foreach (var (formal, overriddenFormal) in f.Formals.Zip(f.OverriddenFunction.Formals, Tuple.Create)) {
-        // get corresponding formal in the class
-        var ie = new IdentifierExpr(formal.tok, formal.AssignUniqueName(f.IdGenerator)) { Var = formal, Type = formal.Type };
-        substMap.Add(overriddenFormal, ie);
-      }
-
-      if (f.OverriddenFunction.Result != null) {
-        Contract.Assert(pOut != null);
-        //get corresponding formal in the class
-        var ie = new IdentifierExpr(pOut.tok, pOut.AssignUniqueName(f.IdGenerator)) { Var = pOut, Type = pOut.Type };
-        substMap.Add(f.OverriddenFunction.Result, ie);
-      }
-
-      var typeMap = GetTypeArgumentSubstitutionMap(f.OverriddenFunction, f);
-
-      //adding assume Pre’; assert P; // this checks that Pre’ implies P
-      AddFunctionOverrideReqsChk(f, builder, etran, substMap, typeMap);
-
-      //adding assert R <= Rank’;
-      AddOverrideTerminationChk(f, f.OverriddenFunction, builder, etran, substMap, typeMap);
-
-      //adding assert W <= Frame’
-      AddFunctionOverrideSubsetChk(f, builder, etran, localVariables, substMap, typeMap);
-
-      //adding assume Q; assert Post’;
-      AddFunctionOverrideEnsChk(f, builder, etran, substMap, typeMap, implInParams, implOutParams.Count == 0 ? null : implOutParams[0]);
-
-      var stmts = builder.Collect(f.tok);
-
-      if (EmitImplementation(f.Attributes)) {
-        // emit the impl only when there are proof obligations.
-        QKeyValue kv = etran.TrAttributes(f.Attributes, null);
-
-        AddImplementationWithVerboseName(GetToken(f), proc,
-            Util.Concat(Util.Concat(typeInParams, inParams_Heap), implInParams),
-            implOutParams, localVariables, stmts, kv);
-      }
-
-      if (InsertChecksums) {
-        InsertChecksum(f, proc, true);
-      }
-
-      Reset();
-    }
-
-    private void AddOverrideCheckTypeArgumentInstantiations(MemberDecl member, BoogieStmtListBuilder builder, List<Variable> localVariables) {
-      Contract.Requires(member is Function || member is Method);
-      Contract.Requires(member.EnclosingClass is TopLevelDeclWithMembers);
-      Contract.Requires(builder != null);
-      Contract.Requires(localVariables != null);
-
-      MemberDecl overriddenMember;
-      List<TypeParameter> overriddenTypeParameters;
-      if (member is Function) {
-        var o = ((Function)member).OverriddenFunction;
-        overriddenMember = o;
-        overriddenTypeParameters = o.TypeArgs;
-      } else {
-        var o = ((Method)member).OverriddenMethod;
-        overriddenMember = o;
-        overriddenTypeParameters = o.TypeArgs;
-      }
-      var typeMap = GetTypeArgumentSubstitutionMap(overriddenMember, member);
-      foreach (var tp in Util.Concat(overriddenMember.EnclosingClass.TypeArgs, overriddenTypeParameters)) {
-        var local = BplLocalVar(NameTypeParam(tp), predef.Ty, out var lhs);
-        localVariables.Add(local);
-        var rhs = TypeToTy(typeMap[tp]);
-        builder.Add(new Boogie.AssumeCmd(tp.tok, Boogie.Expr.Eq(lhs, rhs)));
-      }
-    }
-
-    /// <summary>
-    /// Essentially, the function override axiom looks like:
-    ///   axiom (forall $heap: HeapType, typeArgs: Ty, this: ref, x#0: int, fuel: LayerType ::
-    ///     { J.F(fuel, $heap, G(typeArgs), this, x#0), C.F(fuel, $heap, typeArgs, this, x#0) }
-    ///     { J.F(fuel, $heap, G(typeArgs), this, x#0), $Is(this, C) }
-    ///     C.F#canCall(args) || (fh < FunctionContextHeight && this != null && $Is(this, C))
-    ///     ==>
-    ///     J.F(fuel, $heap, G(typeArgs), this, x#0) == C.F(fuel, $heap, typeArgs, this, x#0));
-    /// (without the other usual antecedents).  Essentially, the override gives a part of the body of the
-    /// trait's function, so we call FunctionAxiom to generate a conditional axiom (that is, we pass in the "overridingFunction"
-    /// parameter to FunctionAxiom, which will add 'dtype(this) == class.C' as an additional antecedent) for a
-    /// body of 'C.F(this, x#0)'.
-    /// </summary>
-    private Boogie.Axiom FunctionOverrideAxiom(Function f, Function overridingFunction) {
-      Contract.Requires(f != null);
-      Contract.Requires(overridingFunction != null);
-      Contract.Requires(predef != null);
-      Contract.Requires(f.EnclosingClass != null);
-      Contract.Requires(!f.IsStatic);
-      Contract.Requires(overridingFunction.EnclosingClass is TopLevelDeclWithMembers);
-      Contract.Ensures(Contract.Result<Boogie.Axiom>() != null);
-
-      bool readsHeap = f.ReadsHeap || overridingFunction.ReadsHeap;
-
-      ExpressionTranslator etran;
-      Boogie.BoundVariable bvPrevHeap = null;
-      if (f is TwoStateFunction) {
-        bvPrevHeap = new Boogie.BoundVariable(f.tok, new Boogie.TypedIdent(f.tok, "$prevHeap", predef.HeapType));
-        etran = new ExpressionTranslator(this, predef,
-          f.ReadsHeap ? new Boogie.IdentifierExpr(f.tok, predef.HeapVarName, predef.HeapType) : null,
-          new Boogie.IdentifierExpr(f.tok, bvPrevHeap));
-      } else if (readsHeap) {
-        etran = new ExpressionTranslator(this, predef, f.tok);
-      } else {
-        etran = new ExpressionTranslator(this, predef, (Boogie.Expr)null);
-      }
-
-      // "forallFormals" is built to hold the bound variables of the quantification
-      // argsJF are the arguments to J.F (the function in the trait)
-      // argsCF are the arguments to C.F (the overriding function)
-      var forallFormals = new List<Boogie.Variable>();
-      var argsJF = new List<Boogie.Expr>();
-      var argsCF = new List<Boogie.Expr>();
-
-      // Add type arguments
-      forallFormals.AddRange(MkTyParamBinders(GetTypeParams(overridingFunction), out _));
-      argsJF.AddRange(GetTypeArguments(f, overridingFunction).ConvertAll(TypeToTy));
-      argsCF.AddRange(GetTypeArguments(overridingFunction, null).ConvertAll(TypeToTy));
-
-      var moreArgsCF = new List<Boogie.Expr>();
-      Expr layer = null;
-      Expr reveal = null;
-
-      // Add the fuel argument
-      if (f.IsFuelAware()) {
-        Contract.Assert(overridingFunction.IsFuelAware());  // f.IsFuelAware() ==> overridingFunction.IsFuelAware()
-        var fuel = new Boogie.BoundVariable(f.tok, new Boogie.TypedIdent(f.tok, "$fuel", predef.LayerType));
-        forallFormals.Add(fuel);
-        layer = new Boogie.IdentifierExpr(f.tok, fuel);
-        argsJF.Add(layer);
-      } else if (overridingFunction.IsFuelAware()) {
-        // We can't use a bound variable $fuel, because then one of the triggers won't be mentioning this $fuel.
-        // Instead, we do the next best thing: use the literal $LZ.
-        layer = new Boogie.IdentifierExpr(f.tok, "$LZ", predef.LayerType); // $LZ
-      }
-
-      if (f.IsOpaque) {
-        Contract.Assert(overridingFunction.IsOpaque);
-        var revealVar = new Boogie.BoundVariable(f.tok, new Boogie.TypedIdent(f.tok, "reveal", Boogie.Type.Bool));
-        forallFormals.Add(revealVar);
-        reveal = new Boogie.IdentifierExpr(f.tok, revealVar);
-        argsJF.Add(reveal);
-      } else if (overridingFunction.IsOpaque) {
-        // We can't use a bound variable $fuel, because then one of the triggers won't be mentioning this $fuel.
-        // Instead, we do the next best thing: use the literal false.
-        reveal = new Boogie.LiteralExpr(f.tok, false);
-      }
-
-      // Add heap arguments
-      if (f is TwoStateFunction) {
-        Contract.Assert(bvPrevHeap != null);
-        forallFormals.Add(bvPrevHeap);
-        argsJF.Add(etran.Old.HeapExpr);
-        moreArgsCF.Add(etran.Old.HeapExpr);
-      }
-      if (f.ReadsHeap || overridingFunction.ReadsHeap) {
-        var heap = new Boogie.BoundVariable(f.tok, new Boogie.TypedIdent(f.tok, predef.HeapVarName, predef.HeapType));
-        forallFormals.Add(heap);
-        if (f.ReadsHeap) {
-          argsJF.Add(new Boogie.IdentifierExpr(f.tok, heap));
-        }
-        if (overridingFunction.ReadsHeap) {
-          moreArgsCF.Add(new Boogie.IdentifierExpr(overridingFunction.tok, heap));
-        }
-      }
-
-      // Add receiver parameter
-      Type thisType = ModuleResolver.GetReceiverType(f.tok, overridingFunction);
-      var bvThis = new Boogie.BoundVariable(f.tok, new Boogie.TypedIdent(f.tok, etran.This, TrType(thisType)));
-      forallFormals.Add(bvThis);
-      var bvThisExpr = new Boogie.IdentifierExpr(f.tok, bvThis);
-      argsJF.Add(BoxifyForTraitParent(f.tok, bvThisExpr, f, thisType));
-      moreArgsCF.Add(bvThisExpr);
-      // $Is(this, C)
-      var isOfSubtype = GetWhereClause(overridingFunction.tok, bvThisExpr, thisType, f is TwoStateFunction ? etran.Old : etran,
-        IsAllocType.NEVERALLOC, alwaysUseSymbolicName: true);
-
-      Bpl.Expr ante = Boogie.Expr.And(ReceiverNotNull(bvThisExpr), isOfSubtype);
-
-      // Add other arguments
-      var typeMap = GetTypeArgumentSubstitutionMap(f, overridingFunction);
-      foreach (Formal p in f.Formals) {
-        var pType = p.Type.Subst(typeMap);
-        var bv = new Boogie.BoundVariable(p.tok, new Boogie.TypedIdent(p.tok, p.AssignUniqueName(currentDeclaration.IdGenerator), TrType(pType)));
-        forallFormals.Add(bv);
-        var jfArg = new Boogie.IdentifierExpr(p.tok, bv);
-        argsJF.Add(ModeledAsBoxType(p.Type) ? BoxIfUnboxed(jfArg, pType) : jfArg);
-        moreArgsCF.Add(new Boogie.IdentifierExpr(p.tok, bv));
-      }
-
-      // useViaContext: fh < FunctionContextHeight
-      Boogie.Expr useViaContext = !InVerificationScope(overridingFunction)
-        ? Boogie.Expr.True
-        : Boogie.Expr.Lt(Boogie.Expr.Literal(forModule.CallGraph.GetSCCRepresentativePredecessorCount(overridingFunction)), etran.FunctionContextHeight());
-
-      // useViaCanCall: C.F#canCall(args)
-      Bpl.IdentifierExpr canCallFuncID = new Bpl.IdentifierExpr(overridingFunction.tok, overridingFunction.FullSanitizedName + "#canCall", Bpl.Type.Bool);
-      Bpl.Expr useViaCanCall = new Bpl.NAryExpr(f.tok, new Bpl.FunctionCall(canCallFuncID), Concat(argsCF, moreArgsCF));
-
-      if (layer != null) {
-        argsCF.Add(layer);
-      }
-
-      if (reveal != null) {
-        argsCF.Add(reveal);
-      }
-
-      argsCF = Concat(argsCF, moreArgsCF);
-
-      // ante := useViaCanCall || (useViaContext && this != null && $Is(this, C))
-      ante = Bpl.Expr.Or(useViaCanCall, BplAnd(useViaContext, ante));
-
-      Boogie.Expr funcAppl;
-      {
-        var funcID = new Boogie.IdentifierExpr(f.tok, f.FullSanitizedName, TrType(f.ResultType));
-        funcAppl = new Boogie.NAryExpr(f.tok, new Boogie.FunctionCall(funcID), argsJF);
-      }
-      Boogie.Expr overridingFuncAppl;
-      {
-        var funcID = new Boogie.IdentifierExpr(overridingFunction.tok, overridingFunction.FullSanitizedName, TrType(overridingFunction.ResultType));
-        overridingFuncAppl = new Boogie.NAryExpr(overridingFunction.tok, new Boogie.FunctionCall(funcID), argsCF);
-      }
-
-      // Build the triggers
-      // { f(Succ(s), args), f'(Succ(s), args') }
-      Boogie.Trigger tr = BplTriggerHeap(this, overridingFunction.tok,
-        funcAppl,
-        readsHeap ? etran.HeapExpr : null,
-        overridingFuncAppl);
-      // { f(Succ(s), args), $Is(this, T') }
-      var exprs = new List<Boogie.Expr>() { funcAppl, isOfSubtype };
-      if (readsHeap) {
-        exprs.Add(FunctionCall(overridingFunction.tok, BuiltinFunction.IsGoodHeap, null, etran.HeapExpr));
-      }
-      tr = new Boogie.Trigger(overridingFunction.tok, true, exprs, tr);
-
-      // The equality that is what it's all about
-      var synonyms = Boogie.Expr.Eq(
-        funcAppl,
-        ModeledAsBoxType(f.ResultType) ? BoxIfUnboxed(overridingFuncAppl, overridingFunction.ResultType) : overridingFuncAppl);
-
-      // The axiom
-      Boogie.Expr ax = BplForall(f.tok, new List<Boogie.TypeVariable>(), forallFormals, null, tr,
-        Boogie.Expr.Imp(ante, synonyms));
-      var activate = AxiomActivation(overridingFunction, etran);
-      string comment = "override axiom for " + f.FullSanitizedName + " in class " + overridingFunction.EnclosingClass.FullSanitizedName;
-      return new Boogie.Axiom(f.tok, Boogie.Expr.Imp(activate, ax), comment);
-    }
-
-    /// <summary>
-    /// Return a type-parameter substitution map for function "f", as instantiated by the context of "overridingFunction".
-    ///
-    /// In more symbols, suppose "f" is declared as follows:
-    ///     class/trait Tr[A,B] {
-    ///       function f[C,D](...): ...
-    ///     }
-    /// and "overridingFunction" is declared as follows:
-    ///     class/trait Cl[G] extends Tr[X(G),Y(G)] {
-    ///       function f[R,S](...): ...
-    ///     }
-    /// Then, return the following map:
-    ///     A -> X(G)
-    ///     B -> Y(G)
-    ///     C -> R
-    ///     D -> S
-    ///
-    /// See also GetTypeArguments.
-    /// </summary>
-    private static Dictionary<TypeParameter, Type> GetTypeArgumentSubstitutionMap(MemberDecl member, MemberDecl overridingMember) {
-      Contract.Requires(member is Function || member is Method);
-      Contract.Requires(overridingMember is Function || overridingMember is Method);
-      Contract.Requires(overridingMember.EnclosingClass is TopLevelDeclWithMembers);
-      Contract.Requires(((ICallable)member).TypeArgs.Count == ((ICallable)overridingMember).TypeArgs.Count);
-
-      var typeMap = new Dictionary<TypeParameter, Type>();
-
-      var cl = (TopLevelDeclWithMembers)overridingMember.EnclosingClass;
-      var classTypeMap = cl.ParentFormalTypeParametersToActuals;
-      member.EnclosingClass.TypeArgs.ForEach(tp => typeMap.Add(tp, classTypeMap[tp]));
-
-      var origTypeArgs = ((ICallable)member).TypeArgs;
-      var overridingTypeArgs = ((ICallable)overridingMember).TypeArgs;
-      for (var i = 0; i < origTypeArgs.Count; i++) {
-        var otp = overridingTypeArgs[i];
-        typeMap.Add(origTypeArgs[i], new UserDefinedType(otp.tok, otp));
-      }
-
-      return typeMap;
-    }
-
-    private void AddMethodOverrideEnsChk(Method m, BoogieStmtListBuilder builder, ExpressionTranslator etran,
-      Dictionary<IVariable, Expression> substMap,
-      Dictionary<TypeParameter, Type> typeMap) {
-      Contract.Requires(m != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(substMap != null);
-      //generating class post-conditions
-      foreach (var en in m.Ens) {
-        builder.Add(TrAssumeCmd(m.tok, etran.TrExpr(en.E)));
-      }
-      //generating trait post-conditions with class variables
-      FunctionCallSubstituter sub = null;
-      foreach (var en in m.OverriddenMethod.Ens) {
-        sub ??= new FunctionCallSubstituter(substMap, typeMap, (TraitDecl)m.OverriddenMethod.EnclosingClass, (ClassLikeDecl)m.EnclosingClass);
-        foreach (var s in TrSplitExpr(sub.Substitute(en.E), etran, false, out _).Where(s => s.IsChecked)) {
-          builder.Add(Assert(m.tok, s.E, new PODesc.EnsuresStronger()));
-        }
-      }
-    }
-
-    private void AddMethodOverrideReqsChk(Method m, BoogieStmtListBuilder builder, ExpressionTranslator etran,
-      Dictionary<IVariable, Expression> substMap,
-      Dictionary<TypeParameter, Type> typeMap) {
-      Contract.Requires(m != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(substMap != null);
-      //generating trait pre-conditions with class variables
-      FunctionCallSubstituter sub = null;
-      foreach (var req in m.OverriddenMethod.Req) {
-        sub ??= new FunctionCallSubstituter(substMap, typeMap, (TraitDecl)m.OverriddenMethod.EnclosingClass, (ClassLikeDecl)m.EnclosingClass);
-        builder.Add(TrAssumeCmd(m.tok, etran.TrExpr(sub.Substitute(req.E))));
-      }
-      //generating class pre-conditions
-      foreach (var s in m.Req.SelectMany(req => TrSplitExpr(req.E, etran, false, out _).Where(s => s.IsChecked))) {
-        builder.Add(Assert(m.tok, s.E, new PODesc.RequiresWeaker()));
-      }
-    }
-
-    private void AddOverrideTerminationChk(ICallable original, ICallable overryd, BoogieStmtListBuilder builder, ExpressionTranslator etran,
-      Dictionary<IVariable, Expression> substMap,
-      Dictionary<TypeParameter, Type> typeMap) {
-      Contract.Requires(original != null);
-      Contract.Requires(overryd != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(substMap != null);
-      // Note, it is as if the trait's method is calling the class's method.
-      var contextDecreases = overryd.Decreases.Expressions;
-      var calleeDecreases = original.Decreases.Expressions;
-      // We want to check:  calleeDecreases <= contextDecreases (note, we can allow equality, since there is a bounded, namely 1, number of dynamic dispatches)
-      if (Contract.Exists(contextDecreases, e => e is WildcardExpr)) {
-        // no check needed
-        return;
-      }
-
-      int N = Math.Min(contextDecreases.Count, calleeDecreases.Count);
-      var toks = new List<IToken>();
-      var types0 = new List<Type>();
-      var types1 = new List<Type>();
-      var callee = new List<Expr>();
-      var caller = new List<Expr>();
-
-      for (int i = 0; i < N; i++) {
-        Expression e0 = calleeDecreases[i];
-        Expression e1 = Substitute(contextDecreases[i], null, substMap, typeMap);
-        if (!CompatibleDecreasesTypes(e0.Type, e1.Type)) {
-          N = i;
-          break;
-        }
-        toks.Add(new NestedToken(original.RangeToken.StartToken, e1.tok));
-        types0.Add(e0.Type.NormalizeExpand());
-        types1.Add(e1.Type.NormalizeExpand());
-        callee.Add(etran.TrExpr(e0));
-        caller.Add(etran.TrExpr(e1));
-      }
-
-      var decrCountT = contextDecreases.Count;
-      var decrCountC = calleeDecreases.Count;
-      // Generally, we want to produce a check "decrClass <= decrTrait", allowing (the common case where) they are equal.
-      // * If N < decrCountC && N < decrCountT, then "decrClass <= decrTrait" if the comparison ever gets beyond the
-      //   parts that survived truncation.  Thus, we compare with "allowNoChange" set to "false".
-      // Otherwise:
-      // * If decrCountC == decrCountT, then the truncation we did above had no effect and we pass in "allowNoChange" as "true".
-      // * If decrCountC > decrCountT, then we will have truncated decrClass above.  Let x,y and x' denote decrClass and
-      //   decrTrait, respectively, where x and x' have the same length.  Considering how Dafny in effect pads the end of
-      //   decreases tuples with a \top, we were supposed to evaluate (x,(y,\top)) <= (x',\top), which by lexicographic pairs
-      //   we can expand to:
-      //       x <= x' && (x == x' ==> (y,\top) <= \top)
-      //   which is equivalent to just x <= x'.  Thus, we called DecreasesCheck to compare x and x' and we pass in "allowNoChange"
-      //   as "true".
-      // * If decrCountC < decrCountT, then we will have truncated decrTrait above.  Let x and x',y' denote decrClass and
-      //   decrTrait, respectively, where x and x' have the same length.  We then want to check (x,\top) <= (x',(y',\top)), which
-      //   expands to:
-      //       x <= x' && (x == x' ==> \top <= (y',\top))
-      //    =      { \top is strictly larger than a pair }
-      //       x <= x' && (x == x' ==> false)
-      //    =
-      //       x < x'
-      //   So we perform our desired check by calling DecreasesCheck to strictly compare x and x', so we pass in "allowNoChange"
-      //   as "false".
-      bool allowNoChange = N == decrCountT && decrCountT <= decrCountC;
-      var decrChk = DecreasesCheck(toks, types0, types1, callee, caller, null, null, allowNoChange, false);
-      builder.Add(Assert(original.Tok, decrChk, new PODesc.TraitDecreases(original.WhatKind)));
-    }
-
-    private void AddMethodOverrideSubsetChk(Method m, BoogieStmtListBuilder builder, ExpressionTranslator etran, List<Variable> localVariables,
-      Dictionary<IVariable, Expression> substMap,
-      Dictionary<TypeParameter, Type> typeMap) {
-      //getting framePrime
-      List<FrameExpression> traitFrameExps = new List<FrameExpression>();
-      List<FrameExpression> classFrameExps = m.Mod != null ? m.Mod.Expressions : new List<FrameExpression>();
-      if (m.OverriddenMethod.Mod != null) {
-        foreach (var e in m.OverriddenMethod.Mod.Expressions) {
-          var newE = Substitute(e.E, null, substMap, typeMap);
-          FrameExpression fe = new FrameExpression(e.tok, newE, e.FieldName);
-          traitFrameExps.Add(fe);
-        }
-      }
-
-      QKeyValue kv = etran.TrAttributes(m.Attributes, null);
-
-      IToken tok = m.tok;
-      // Declare a local variable $_Frame: <alpha>[ref, Field alpha]bool
-      Boogie.IdentifierExpr traitFrame = etran.TheFrame(m.OverriddenMethod.tok);  // this is a throw-away expression, used only to extract the type and name of the $_Frame variable
-      traitFrame.Name = m.EnclosingClass.Name + "_" + traitFrame.Name;
-      Contract.Assert(traitFrame.Type != null);  // follows from the postcondition of TheFrame
-      Boogie.LocalVariable frame = new Boogie.LocalVariable(tok, new Boogie.TypedIdent(tok, null ?? traitFrame.Name, traitFrame.Type));
-      localVariables.Add(frame);
-      // $_Frame := (lambda<alpha> $o: ref, $f: Field alpha :: $o != null && $Heap[$o,alloc] ==> ($o,$f) in Modifies/Reads-Clause);
-      Boogie.TypeVariable alpha = new Boogie.TypeVariable(tok, "alpha");
-      Boogie.BoundVariable oVar = new Boogie.BoundVariable(tok, new Boogie.TypedIdent(tok, "$o", predef.RefType));
-      Boogie.IdentifierExpr o = new Boogie.IdentifierExpr(tok, oVar);
-      Boogie.BoundVariable fVar = new Boogie.BoundVariable(tok, new Boogie.TypedIdent(tok, "$f", predef.FieldName(tok, alpha)));
-      Boogie.IdentifierExpr f = new Boogie.IdentifierExpr(tok, fVar);
-      Boogie.Expr ante = Boogie.Expr.And(Boogie.Expr.Neq(o, predef.Null), etran.IsAlloced(tok, o));
-      Boogie.Expr consequent = InRWClause(tok, o, f, traitFrameExps, etran, null, null);
-      Boogie.Expr lambda = new Boogie.LambdaExpr(tok, new List<TypeVariable> { alpha }, new List<Variable> { oVar, fVar }, null,
-        Boogie.Expr.Imp(ante, consequent));
-
-      //to initialize $_Frame variable to Frame'
-      builder.Add(Boogie.Cmd.SimpleAssign(tok, new Boogie.IdentifierExpr(tok, frame), lambda));
-
-      // emit: assert (forall<alpha> o: ref, f: Field alpha :: o != null && $Heap[o,alloc] && (o,f) in subFrame ==> $_Frame[o,f]);
-      Boogie.Expr oInCallee = InRWClause(tok, o, f, classFrameExps, etran, null, null);
-      Boogie.Expr consequent2 = InRWClause(tok, o, f, traitFrameExps, etran, null, null);
-      Boogie.Expr q = new Boogie.ForallExpr(tok, new List<TypeVariable> { alpha }, new List<Variable> { oVar, fVar },
-        Boogie.Expr.Imp(Boogie.Expr.And(ante, oInCallee), consequent2));
-      builder.Add(Assert(tok, q, new PODesc.TraitFrame(m.WhatKind, true), kv));
-    }
-
-    // Return a way to know if an assertion should be converted to an assumption
-    private void SetAssertionOnlyFilter(Node m) {
-      List<RangeToken> rangesOnly = new List<RangeToken>();
-      m.Visit(node => {
-        if (node is AssertStmt assertStmt &&
-            assertStmt.HasAssertOnlyAttribute(out var assertOnlyKind)) {
-          var ifAfterLastToken = m.EndToken;
-          if (rangesOnly.FindIndex(r => r.Contains(node.StartToken.pos)) is var x && x >= 0) {
-            if (assertOnlyKind == AssertStmt.AssertOnlyKind.Before) {// Just shorten the previous range
-              rangesOnly[x] = new RangeToken(rangesOnly[x].StartToken, node.EndToken);
-              return true;
-            }
-
-            ifAfterLastToken = rangesOnly[x].EndToken;
-            rangesOnly.RemoveAt(x);
-          }
-
-          var rangeToAdd =
-            assertOnlyKind == AssertStmt.AssertOnlyKind.Before ?
-              new RangeToken(m.StartToken, assertStmt.EndToken) :
-              assertOnlyKind == AssertStmt.AssertOnlyKind.After ?
-              new RangeToken(assertStmt.StartToken, ifAfterLastToken)
-              : assertStmt.RangeToken;
-          if (assertOnlyKind == AssertStmt.AssertOnlyKind.Before && rangesOnly.Any(other => rangeToAdd.Intersects(other))) {
-            // There are more precise ranges so we don't add this one
-            return true;
-          }
-          rangesOnly.Add(rangeToAdd);
-        }
-        return true;
-      });
-      if (rangesOnly.Any()) {
-        // TODO: What to do with refined postconditions?
-        assertionOnlyFilter = token => rangesOnly.Any(range => range.Contains((token.pos)));
-      }
-    }
-
-    private void ResetAssertionOnlyFilter() {
-      assertionOnlyFilter = null;
-    }
-
-    /// <summary>
-    /// This method is expected to be called at most once for each parameter combination, and in particular
-    /// at most once for each value of "kind".
-    /// </summary>
-    private Boogie.Procedure AddMethod(Method m, MethodTranslationKind kind) {
-      Contract.Requires(m != null);
-      Contract.Requires(m.EnclosingClass != null);
-      Contract.Requires(predef != null);
-      Contract.Requires(currentModule == null && codeContext == null && isAllocContext == null);
-      Contract.Ensures(currentModule == null && codeContext == null && isAllocContext == null);
-      Contract.Ensures(Contract.Result<Boogie.Procedure>() != null);
-      Contract.Assert(VisibleInScope(m));
-
-      currentModule = m.EnclosingClass.EnclosingModuleDefinition;
-      codeContext = m;
-      isAllocContext = new IsAllocContext(options, m.IsGhost);
-      Boogie.Expr prevHeap = null;
-      Boogie.Expr currHeap = null;
-      var ordinaryEtran = new ExpressionTranslator(this, predef, m.tok);
-      ExpressionTranslator etran;
-      var inParams = new List<Boogie.Variable>();
-      if (m is TwoStateLemma) {
-        var prevHeapVar = new Boogie.Formal(m.tok, new Boogie.TypedIdent(m.tok, "previous$Heap", predef.HeapType), true);
-        var currHeapVar = new Boogie.Formal(m.tok, new Boogie.TypedIdent(m.tok, "current$Heap", predef.HeapType), true);
-        inParams.Add(prevHeapVar);
-        inParams.Add(currHeapVar);
-        prevHeap = new Boogie.IdentifierExpr(m.tok, prevHeapVar);
-        currHeap = new Boogie.IdentifierExpr(m.tok, currHeapVar);
-        etran = new ExpressionTranslator(this, predef, currHeap, prevHeap);
-      } else {
-        etran = ordinaryEtran;
-      }
-
-      GenerateMethodParameters(m.tok, m, kind, etran, inParams, out var outParams);
-
-      var req = new List<Boogie.Requires>();
-      var mod = new List<Boogie.IdentifierExpr>();
-      var ens = new List<Boogie.Ensures>();
-      // FREE PRECONDITIONS
-      if (kind == MethodTranslationKind.SpecWellformedness || kind == MethodTranslationKind.Implementation || kind == MethodTranslationKind.OverrideCheck) {  // the other cases have no need for a free precondition
-        // free requires mh == ModuleContextHeight && fh == FunctionContextHeight;
-        req.Add(Requires(m.tok, true, etran.HeightContext(m), null, null, null));
-        if (m is TwoStateLemma) {
-          // free requires prevHeap == Heap && HeapSucc(prevHeap, currHeap) && IsHeap(currHeap)
-          var a0 = Boogie.Expr.Eq(prevHeap, ordinaryEtran.HeapExpr);
-          var a1 = HeapSucc(prevHeap, currHeap);
-          var a2 = FunctionCall(m.tok, BuiltinFunction.IsGoodHeap, null, currHeap);
-          req.Add(Requires(m.tok, true, BplAnd(a0, BplAnd(a1, a2)), null, null, null));
-        }
-      }
-      if (m is TwoStateLemma) {
-        // Checked preconditions that old parameters really existed in previous state
-        var index = 0;
-        foreach (var formal in m.Ins) {
-          if (formal.IsOld) {
-            var dafnyFormalIdExpr = new IdentifierExpr(formal.tok, formal);
-            var pIdx = m.Ins.Count == 1 ? "" : " at index " + index;
-            var desc = new PODesc.IsAllocated($"parameter{pIdx} ('{formal.Name}')", "in the two-state lemma's previous state");
-            var require = Requires(formal.tok, false, MkIsAlloc(etran.TrExpr(dafnyFormalIdExpr), formal.Type, prevHeap),
-              desc.FailureDescription, desc.SuccessDescription, null);
-            require.Description = desc;
-            req.Add(require);
-          }
-          index++;
-        }
-      }
-      mod.Add(ordinaryEtran.HeapCastToIdentifierExpr);
-
-      var bodyKind = kind == MethodTranslationKind.SpecWellformedness || kind == MethodTranslationKind.Implementation;
-
-      if (kind != MethodTranslationKind.SpecWellformedness && kind != MethodTranslationKind.OverrideCheck) {
-        // USER-DEFINED SPECIFICATIONS
-        var comment = "user-defined preconditions";
-        foreach (var p in m.Req) {
-          var (errorMessage, successMessage) = CustomErrorMessage(p.Attributes);
-          if (p.Label != null && kind == MethodTranslationKind.Implementation) {
-            // don't include this precondition here, but record it for later use
-            p.Label.E = (m is TwoStateLemma ? ordinaryEtran : etran.Old).TrExpr(p.E);
-          } else {
-            foreach (var s in TrSplitExprForMethodSpec(p.E, etran, kind)) {
-              if (s.IsOnlyChecked && bodyKind) {
-                // don't include in split
-              } else if (s.IsOnlyFree && !bodyKind) {
-                // don't include in split -- it would be ignored, anyhow
-              } else {
-                req.Add(Requires(s.Tok, s.IsOnlyFree, s.E, errorMessage, successMessage, comment));
-                comment = null;
-                // the free here is not linked to the free on the original expression (this is free things generated in the splitting.)
-              }
-            }
-          }
-        }
-        comment = "user-defined postconditions";
-        foreach (var p in m.Ens) {
-          var (errorMessage, successMessage) = CustomErrorMessage(p.Attributes);
-          AddEnsures(ens, Ensures(p.E.tok, true, CanCallAssumption(p.E, etran), errorMessage, successMessage, comment));
-          comment = null;
-          foreach (var s in TrSplitExprForMethodSpec(p.E, etran, kind)) {
-            var post = s.E;
-            if (kind == MethodTranslationKind.Implementation && RefinementToken.IsInherited(s.Tok, currentModule)) {
-              // this postcondition was inherited into this module, so make it into the form "$_reverifyPost ==> s.E"
-              post = Boogie.Expr.Imp(new Boogie.IdentifierExpr(s.E.tok, "$_reverifyPost", Boogie.Type.Bool), post);
-            }
-            if (s.IsOnlyFree && bodyKind) {
-              // don't include in split -- it would be ignored, anyhow
-            } else if (s.IsOnlyChecked && !bodyKind) {
-              // don't include in split
-            } else {
-              AddEnsures(ens, Ensures(s.Tok, s.IsOnlyFree || this.assertionOnlyFilter != null, post, errorMessage, successMessage, null));
-            }
-          }
-        }
-        if (m is Constructor && kind == MethodTranslationKind.Call) {
-          var fresh = Boogie.Expr.Not(etran.Old.IsAlloced(m.tok, new Boogie.IdentifierExpr(m.tok, "this", TrReceiverType(m))));
-          AddEnsures(ens, Ensures(m.tok, false || this.assertionOnlyFilter != null, fresh, null,  null, "constructor allocates the object"));
-        }
-        foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(m.tok, m.Mod.Expressions, m.IsGhost, m.AllowsAllocation, ordinaryEtran.Old, ordinaryEtran, ordinaryEtran.Old)) {
-          AddEnsures(ens, Ensures(tri.tok, tri.IsFree || this.assertionOnlyFilter != null, tri.Expr, tri.ErrorMessage, tri.SuccessMessage, tri.Comment));
-        }
-
-        // add the fuel assumption for the reveal method of a opaque method
-        if (IsOpaqueRevealLemma(m)) {
-          List<Expression> args = Attributes.FindExpressions(m.Attributes, "fuel");
-          if (args != null) {
-            MemberSelectExpr selectExpr = args[0].Resolved as MemberSelectExpr;
-            if (selectExpr != null) {
-              Function f = selectExpr.Member as Function;
-              FuelConstant fuelConstant = this.functionFuel.Find(x => x.f == f);
-              if (fuelConstant != null) {
-                Boogie.Expr startFuel = fuelConstant.startFuel;
-                Boogie.Expr startFuelAssert = fuelConstant.startFuelAssert;
-                Boogie.Expr moreFuel_expr = fuelConstant.MoreFuel(sink, predef, f.IdGenerator);
-                Boogie.Expr layer = etran.layerInterCluster.LayerN(1, moreFuel_expr);
-                Boogie.Expr layerAssert = etran.layerInterCluster.LayerN(2, moreFuel_expr);
-
-                AddEnsures(ens, Ensures(m.tok, true, Boogie.Expr.Eq(startFuel, layer), null, null, null));
-                AddEnsures(ens, Ensures(m.tok, true, Boogie.Expr.Eq(startFuelAssert, layerAssert), null, null, null));
-                AddEnsures(ens, Ensures(m.tok, true, GetRevealConstant(f), null, null, null));
-
-                AddEnsures(ens, Ensures(m.tok, true, Boogie.Expr.Eq(FunctionCall(f.tok, BuiltinFunction.AsFuelBottom, null, moreFuel_expr), moreFuel_expr), null, null, "Shortcut to LZ"));
-              }
-            }
-          }
-        }
-      }
-
-      var name = MethodName(m, kind);
-      var proc = new Boogie.Procedure(m.tok, name, new List<Boogie.TypeVariable>(), inParams, outParams, false, req, mod, ens, etran.TrAttributes(m.Attributes, null));
-      AddVerboseName(proc, m.FullDafnyName, kind);
-
-      if (InsertChecksums) {
-        InsertChecksum(m, proc, true);
-      }
-
-      currentModule = null;
-      codeContext = null;
-      isAllocContext = null;
-
-      return proc;
-    }
-
-    private void InsertChecksum(Method m, Boogie.Declaration decl, bool specificationOnly = false) {
-      Contract.Requires(VisibleInScope(m));
-      byte[] data;
-      using (var writer = new System.IO.StringWriter()) {
-        var printer = new Printer(writer, options);
-        printer.PrintAttributes(m.Attributes);
-        printer.PrintFormals(m.Ins, m);
-        if (m.Outs.Any()) {
-          writer.Write("returns ");
-          printer.PrintFormals(m.Outs, m);
-        }
-        printer.PrintSpec("", m.Req, 0);
-        printer.PrintFrameSpecLine("", m.Mod.Expressions, 0, null);
-        printer.PrintSpec("", m.Ens, 0);
-        printer.PrintDecreasesSpec(m.Decreases, 0);
-        writer.WriteLine();
-        if (!specificationOnly && m.Body != null && RevealedInScope(m)) {
-          printer.PrintStatement(m.Body, 0);
-        }
-        data = Encoding.UTF8.GetBytes(writer.ToString());
-      }
-
-      InsertChecksum(decl, data);
-    }
-  }
-}
diff --git a/Source/DafnyCore/Verifier/Translator.DataTypes.cs b/Source/DafnyCore/Verifier/Translator.DataTypes.cs
deleted file mode 100644
index 58c1550988a..00000000000
--- a/Source/DafnyCore/Verifier/Translator.DataTypes.cs
+++ /dev/null
@@ -1,797 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.Diagnostics.Contracts;
-using Bpl = Microsoft.Boogie;
-using BplParser = Microsoft.Boogie.Parser;
-using System.Text;
-using Microsoft.Boogie;
-using static Microsoft.Dafny.Util;
-
-namespace Microsoft.Dafny {
-  partial class Translator {
-    void AddDatatype(DatatypeDecl dt) {
-      Contract.Requires(dt != null);
-      Contract.Requires(sink != null && predef != null);
-
-      var mayInvolveReferences = UserDefinedType.FromTopLevelDecl(dt.tok, dt).MayInvolveReferences;
-      var constructorFunctions = dt.Ctors.ToDictionary(ctor => ctor, ctor => AddDataTypeConstructor(dt, ctor, mayInvolveReferences));
-      if (!mayInvolveReferences) {
-        AddCommonIsAllocConstructorAxiom(dt);
-      }
-
-      AddDepthOneCaseSplitFunction(dt);
-
-      // The axiom above ($IsA#Dt(d) <==> Dt.Ctor0?(d) || Dt.Ctor1?(d)) gets triggered only with $IsA#Dt(d).  The $IsA#Dt(d)
-      // predicate is generated only where the translation inserts it; in other words, the user cannot write any assertion
-      // that causes the $IsA#Dt(d) predicate to be emitted.  This is what we want, because making the RHS disjunction be
-      // available too often makes performance go down.  However, we do want to allow the disjunction to be introduced if the
-      // user explicitly talks about one of its disjuncts.  To make this useful, we introduce the following axiom.  Note that
-      // the DtType(d) information is available everywhere.
-      // axiom (forall G: Ty, d: DatatypeType ::
-      //         { Dt.Ctor0?(G,d) }
-      //         { Dt.Ctor1?(G,d) }
-      //         $Is(d, T(G)) ==> Dt.Ctor0?(G,d) || Dt.Ctor1?(G,d) || ...);
-      {
-        MkIsPredicateForDatatype(dt, out var boundVariables, out var d, out _, out var isPredicate);
-        Bpl.Expr cases_body = Bpl.Expr.False;
-        Bpl.Trigger tr = null;
-        foreach (DatatypeCtor ctor in dt.Ctors) {
-          var disj = FunctionCall(ctor.tok, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, d);
-          cases_body = BplOr(cases_body, disj);
-          tr = new Bpl.Trigger(ctor.tok, true, new List<Bpl.Expr> { disj, isPredicate }, tr);
-        }
-        var body = Bpl.Expr.Imp(isPredicate, cases_body);
-        var ax = BplForall(boundVariables, tr, body);
-        var axiom = new Bpl.Axiom(dt.tok, ax, "Questionmark data type disjunctivity");
-        sink.AddTopLevelDeclaration(axiom);
-      }
-
-      if (dt is IndDatatypeDecl indDatatypeDecl) {
-        AddInductiveDatatypeAxioms(constructorFunctions, indDatatypeDecl);
-        AddExtensionalityAxiom(indDatatypeDecl);
-      }
-
-      if (dt is CoDatatypeDecl coDatatypeDecl) {
-        AddCoDatatypeDeclAxioms(coDatatypeDecl);
-      }
-    }
-
-    /// <summary>
-    /// Add function Dt#Equal(DatatypeType, DatatypeType): bool;
-    /// For each constructor Ctor(x: X, y: Y), add an axiom of the form
-    ///     forall a, b ::
-    ///       { Dt#Equal(a, b), Ctor?(a) }
-    ///       { Dt#Equal(a, b), Ctor?(b) }
-    ///       Ctor?(a) && Ctor?(b)
-    ///       ==>
-    ///       (Dt#Equal(a, b) <==>
-    ///           X#Equal(a.x, b.x) &&
-    ///           Y#Equal(a.y, b.y)
-    ///       )
-    /// where X#Equal is the equality predicate for type X and a.x denotes Dtor#x(a), and similarly
-    /// for Y and b.
-    /// Except, in the event that the datatype has exactly one constructor, then instead generate:
-    ///     forall a, b ::
-    ///       { Dt#Equal(a, b) }
-    ///       true
-    ///       ==>
-    ///       ...as before
-    /// </summary>
-    private void AddInductiveDatatypeAxioms(Dictionary<DatatypeCtor, Bpl.Function> constructorFunctions,
-      IndDatatypeDecl dt) {
-      var dtEqualName = DtEqualName(dt);
-
-      var args = new List<Variable>();
-      args.Add(new Bpl.Formal(dt.tok, new Bpl.TypedIdent(dt.tok, Bpl.TypedIdent.NoName, predef.DatatypeType), false));
-      args.Add(new Bpl.Formal(dt.tok, new Bpl.TypedIdent(dt.tok, Bpl.TypedIdent.NoName, predef.DatatypeType), false));
-      var ctorEqualResult =
-        new Bpl.Formal(dt.tok, new Bpl.TypedIdent(dt.tok, Bpl.TypedIdent.NoName, Bpl.Type.Bool), false);
-      sink.AddTopLevelDeclaration(new Bpl.Function(dt.tok, dtEqualName, args, ctorEqualResult,
-        "Datatype extensional equality declaration"));
-
-      var aVar = BplBoundVar("a", predef.DatatypeType, out var a);
-      var bVar = BplBoundVar("b", predef.DatatypeType, out var b);
-
-      var dtEqual = FunctionCall(dt.tok, dtEqualName, Bpl.Type.Bool, a, b);
-
-      foreach (var ctor in dt.Ctors) {
-        Bpl.Trigger trigger;
-        Bpl.Expr ante;
-        if (dt.Ctors.Count == 1) {
-          ante = Bpl.Expr.True;
-          trigger = BplTrigger(dtEqual);
-        } else {
-          var ctorQ = GetReadonlyField(ctor.QueryField);
-          var ctorQa = FunctionCall(ctor.tok, ctorQ.Name, Bpl.Type.Bool, a);
-          var ctorQb = FunctionCall(ctor.tok, ctorQ.Name, Bpl.Type.Bool, b);
-          ante = BplAnd(ctorQa, ctorQb);
-          trigger = dt.Ctors.Count == 1
-            ? BplTrigger(dtEqual)
-            : new Bpl.Trigger(ctor.tok, true, new List<Bpl.Expr> { dtEqual, ctorQa },
-              new Bpl.Trigger(ctor.tok, true, new List<Bpl.Expr> { dtEqual, ctorQb }));
-        }
-
-        Bpl.Expr eqs = Bpl.Expr.True;
-        for (var i = 0; i < ctor.Formals.Count; i++) {
-          var arg = ctor.Formals[i];
-          var dtor = GetReadonlyField(ctor.Destructors[i]);
-          var dtorA = FunctionCall(ctor.tok, dtor.Name, TrType(arg.Type), a);
-          var dtorB = FunctionCall(ctor.tok, dtor.Name, TrType(arg.Type), b);
-          var eq = TypeSpecificEqual(ctor.tok, arg.Type, dtorA, dtorB);
-          eqs = BplAnd(eqs, eq);
-        }
-
-        var ax = BplForall(new List<Variable> { aVar, bVar }, trigger, Bpl.Expr.Imp(ante, Bpl.Expr.Iff(dtEqual, eqs)));
-        AddOtherDefinition(constructorFunctions[ctor], new Bpl.Axiom(dt.tok, ax, $"Datatype extensional equality definition: {ctor.FullName}"));
-      }
-    }
-
-    private static string DtEqualName(IndDatatypeDecl dt) {
-      return dt.FullSanitizedName + "#Equal";
-    }
-
-    // Add extensionality axiom: forall a, b :: { Dt#Equal(a, b) } Dt#Equal(a, b) <==> a == b
-    private void AddExtensionalityAxiom(IndDatatypeDecl dt) {
-      var dtEqualName = DtEqualName(dt);
-      {
-        var aVar = BplBoundVar("a", predef.DatatypeType, out var a);
-        var bVar = BplBoundVar("b", predef.DatatypeType, out var b);
-
-        var lhs = FunctionCall(dt.tok, dtEqualName, Bpl.Type.Bool, a, b);
-        var rhs = Bpl.Expr.Eq(a, b);
-
-        var ax = BplForall(new List<Variable> { aVar, bVar }, BplTrigger(lhs), Bpl.Expr.Iff(lhs, rhs));
-        sink.AddTopLevelDeclaration(new Bpl.Axiom(dt.tok, ax, $"Datatype extensionality axiom: {dt.FullName}"));
-      }
-    }
-
-    private void AddCoDatatypeDeclAxioms(CoDatatypeDecl codecl) {
-      Func<Bpl.Expr, Bpl.Expr> MinusOne = k => {
-        if (k == null) {
-          return null;
-        } else if (k.Type.IsInt) {
-          return Bpl.Expr.Sub(k, Bpl.Expr.Literal(1));
-        } else {
-          return FunctionCall(k.tok, "ORD#Minus", k.Type, k,
-            FunctionCall(k.tok, "ORD#FromNat", k.Type, Bpl.Expr.Literal(1)));
-        }
-      };
-
-      Action<Bpl.Type, Action<Tuple<List<Type>, List<Type>>, List<Bpl.Variable>, List<Bpl.Expr>, List<Bpl.Expr>,
-        Bpl.Variable, Bpl.Expr, Bpl.Expr, Bpl.Expr, Bpl.Expr, Bpl.Expr, Bpl.Expr, Bpl.Expr, Bpl.Expr>> CoAxHelper =
-        (typeOfK, K) => {
-          Func<string, List<TypeParameter>> renew = s =>
-            Map(codecl.TypeArgs, tp =>
-              new TypeParameter(tp.RangeToken, tp.NameNode.Append("#" + s), tp.PositionalIndex, tp.Parent));
-          List<TypeParameter> typaramsL = renew("l"), typaramsR = renew("r");
-          var lvars = MkTyParamBinders(typaramsL, out var lexprs);
-          var rvars = MkTyParamBinders(typaramsR, out var rexprs);
-          Func<List<TypeParameter>, List<Type>> Types = l => Map(l, tp => (Type)new UserDefinedType(tp));
-          var tyargs = Tuple.Create(Types(typaramsL), Types(typaramsR));
-
-          var vars = Concat(lvars, rvars);
-
-          Bpl.Expr k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit;
-          Bpl.Variable kVar;
-          if (typeOfK != null) {
-            kVar = BplBoundVar("k", typeOfK, out k);
-            vars.Add(kVar);
-            if (typeOfK.IsInt) {
-              kIsValid = Bpl.Expr.Le(Bpl.Expr.Literal(0), k);
-              kIsNonZero = Bpl.Expr.Neq(Bpl.Expr.Literal(0), k);
-              kHasSuccessor = Bpl.Expr.Lt(Bpl.Expr.Literal(0), k);
-              kIsLimit = Bpl.Expr.False;
-            } else {
-              kIsValid = Bpl.Expr.True;
-              kIsNonZero = Bpl.Expr.Neq(k, FunctionCall(k.tok, "ORD#FromNat", Bpl.Type.Int, Bpl.Expr.Literal(0)));
-              kHasSuccessor = Bpl.Expr.Lt(Bpl.Expr.Literal(0), FunctionCall(k.tok, "ORD#Offset", Bpl.Type.Int, k));
-              kIsLimit = FunctionCall(k.tok, "ORD#IsLimit", Bpl.Type.Bool, k);
-            }
-          } else {
-            kVar = null;
-            k = null;
-            kIsValid = Bpl.Expr.True;
-            kIsNonZero = Bpl.Expr.True;
-            kHasSuccessor = Bpl.Expr.True;
-            kIsLimit = Bpl.Expr.True;
-          }
-
-          var ly = BplBoundVar("ly", predef.LayerType, vars);
-          var d0 = BplBoundVar("d0", predef.DatatypeType, vars);
-          var d1 = BplBoundVar("d1", predef.DatatypeType, vars);
-
-          K(tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1);
-        };
-
-      Action<Bpl.Type> AddAxioms = typeOfK => {
-        {
-          // Add two copies of the type parameter lists!
-          var args = MkTyParamFormals(Concat(GetTypeParams(codecl), GetTypeParams(codecl)), false, false);
-          if (typeOfK != null) {
-            args.Add(BplFormalVar(null, typeOfK, true));
-          }
-
-          args.Add(BplFormalVar(null, predef.LayerType, true));
-          args.Add(BplFormalVar(null, predef.DatatypeType, true));
-          args.Add(BplFormalVar(null, predef.DatatypeType, true));
-          var r = BplFormalVar(null, Bpl.Type.Bool, false);
-          var fn_nm = typeOfK != null ? CoPrefixName(codecl) : CoEqualName(codecl);
-          var fn = new Bpl.Function(codecl.tok, fn_nm, args, r);
-          if (InsertChecksums) {
-            InsertChecksum(codecl, fn);
-          }
-
-          sink.AddTopLevelDeclaration(fn);
-        }
-
-        // axiom (forall G0,...,Gn : Ty, k: int, ly : Layer, d0, d1: DatatypeType ::
-        //  { Eq(G0, .., Gn, S(ly), k, d0, d1) }
-        //  Is(d0, T(G0, .., Gn)) && Is(d1, T(G0, ... Gn)) ==>
-        //  (Eq(G0, .., Gn, S(ly), k, d0, d1)
-        //    <==>
-        //      (0 < k.Offset ==>
-        //        (d0.Nil? && d1.Nil?) ||
-        //        (d0.Cons? && d1.Cons? && d0.head == d1.head && Eq(G0, .., Gn, ly, k-1, d0.tail, d1.tail))) &&
-        //      (k != 0 && k.IsLimit ==>                        // for prefix equality only
-        //        FullEq(G0, .., Gn, ly, d0.tail, d1.tail)))    // for prefix equality only
-        CoAxHelper(typeOfK,
-          (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
-            var eqDt = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
-            var iss = BplAnd(MkIs(d0, ClassTyCon(codecl, lexprs)), MkIs(d1, ClassTyCon(codecl, rexprs)));
-            var body = BplImp(
-              iss,
-              BplIff(eqDt,
-                BplAnd(
-                  BplImp(kHasSuccessor,
-                    BplOr(CoPrefixEquality(codecl.tok, codecl, tyargs.Item1, tyargs.Item2, MinusOne(k), ly, d0, d1))),
-                  k == null
-                    ? Bpl.Expr.True
-                    : BplImp(BplAnd(kIsNonZero, kIsLimit),
-                      CoEqualCall(codecl, tyargs.Item1, tyargs.Item2, null, ly, d0, d1)))));
-            var ax = BplForall(vars, BplTrigger(eqDt), body);
-            AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Bpl.Axiom(codecl.tok, ax, "Layered co-equality axiom"));
-          });
-
-        // axiom (forall G0,...,Gn : Ty, k: int, ly : Layer, d0, d1: DatatypeType ::
-        //  { Eq(G0, .., Gn, S(ly), k, d0, d1) }
-        //    0 < k ==>
-        //      (Eq(G0, .., Gn, S(ly), k, d0, d1) <==>
-        //       Eq(G0, .., Gn, ly, k, d0, d))
-        CoAxHelper(typeOfK,
-          (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
-            var eqDtSL = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
-            var eqDtL = CoEqualCall(codecl, lexprs, rexprs, k, ly, d0, d1);
-            var body = BplImp(kIsNonZero, BplIff(eqDtSL, eqDtL));
-            var ax = BplForall(vars, BplTrigger(eqDtSL), body);
-            AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Bpl.Axiom(codecl.tok, ax, "Unbump layer co-equality axiom"));
-          });
-      };
-
-      AddAxioms(null); // Add the above axioms for $Equal
-
-      // axiom (forall d0, d1: DatatypeType, k: int :: { $Equal(d0, d1) } :: Equal(d0, d1) <==> d0 == d1);
-      CoAxHelper(null, (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
-        var Eq = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
-        var equal = Bpl.Expr.Eq(d0, d1);
-        AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Axiom(codecl.tok,
-          BplForall(vars, BplTrigger(Eq), BplIff(Eq, equal)),
-          "Equality for codatatypes"));
-      });
-
-      Bpl.Type theTypeOfK = predef.BigOrdinalType;
-      AddAxioms(predef.BigOrdinalType); // Add the above axioms for $PrefixEqual
-
-      // The connection between the full codatatype equality and its prefix version
-      // axiom (forall d0, d1: DatatypeType :: $Eq#Dt(d0, d1) <==>
-      //                                       (forall k: int :: 0 <= k ==> $PrefixEqual#Dt(k, d0, d1)));
-      CoAxHelper(theTypeOfK, (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
-        var Eq = CoEqualCall(codecl, lexprs, rexprs, null, LayerSucc(ly), d0, d1);
-        var PEq = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
-        vars.Remove(kVar);
-        AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Axiom(codecl.tok,
-          BplForall(vars, BplTrigger(Eq), BplIff(Eq, BplForall(kVar, BplTrigger(PEq), BplImp(kIsValid, PEq)))),
-          "Coequality and prefix equality connection"));
-      });
-      // In addition, the following special case holds for $Eq#Dt:
-      // axiom (forall d0, d1: DatatypeType :: $Eq#Dt(d0, d1) <==
-      //                                       (forall k: int :: 0 <= k ==> $PrefixEqual#Dt(ORD#FromNat(k), d0, d1)));
-      if (!theTypeOfK.IsInt) {
-        CoAxHelper(Bpl.Type.Int,
-          (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
-            var Eq = CoEqualCall(codecl, lexprs, rexprs, null, LayerSucc(ly), d0, d1);
-            var PEq = CoEqualCall(codecl, lexprs, rexprs, FunctionCall(k.tok, "ORD#FromNat", predef.BigOrdinalType, k),
-              LayerSucc(ly), d0, d1);
-            vars.Remove(kVar);
-            AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Axiom(codecl.tok,
-              BplForall(vars, BplTrigger(Eq), BplImp(BplForall(kVar, BplTrigger(PEq), BplImp(kIsValid, PEq)), Eq)),
-              "Coequality and prefix equality connection"));
-          });
-      }
-
-      // A consequence of the definition of prefix equalities is the following:
-      // axiom (forall k, m: int, d0, d1: DatatypeType :: 0 <= k <= m && $PrefixEq#Dt(m, d0, d1) ==> $PrefixEq#0#Dt(k, d0, d1));
-      CoAxHelper(theTypeOfK,
-        (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
-          var m = BplBoundVar("m", k.Type, vars);
-          var PEqK = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
-          var PEqM = CoEqualCall(codecl, lexprs, rexprs, m, LayerSucc(ly), d0, d1);
-          Bpl.Expr kLtM;
-          if (k.Type.IsInt) {
-            kLtM = Bpl.Expr.Lt(k, m);
-          } else {
-            kLtM = FunctionCall(codecl.tok, "ORD#Less", Bpl.Type.Bool, k, m);
-          }
-          AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Axiom(codecl.tok,
-            BplForall(vars,
-              new Bpl.Trigger(codecl.tok, true, new List<Bpl.Expr> { PEqK, PEqM }),
-              BplImp(BplAnd(BplAnd(kIsValid, kLtM), PEqM), PEqK)),
-            "Prefix equality consequence"));
-        });
-
-      // With the axioms above, going from d0==d1 to a prefix equality requires going via the full codatatype
-      // equality, which in turn requires the full codatatype equality to be present.  The following axiom
-      // provides a shortcut:
-      // axiom (forall d0, d1: DatatypeType, k: int :: d0 == d1 && 0 <= k ==> $PrefixEqual#_module.Stream(k, d0, d1));
-      CoAxHelper(theTypeOfK,
-        (tyargs, vars, lexprs, rexprs, kVar, k, kIsValid, kIsNonZero, kHasSuccessor, kIsLimit, ly, d0, d1) => {
-          var equal = Bpl.Expr.Eq(d0, d1);
-          var PEq = CoEqualCall(codecl, lexprs, rexprs, k, LayerSucc(ly), d0, d1);
-          var trigger = BplTrigger(PEq);
-          AddOtherDefinition(GetOrCreateTypeConstructor(codecl), new Axiom(codecl.tok,
-            BplForall(vars, trigger, BplImp(BplAnd(equal, kIsValid), PEq)), "Prefix equality shortcut"));
-        });
-    }
-
-    private void AddDepthOneCaseSplitFunction(DatatypeDecl dt) {
-      // Add:
-      //   function $IsA#Dt(G: Ty,d: DatatypeType): bool {
-      //     Dt.Ctor0?(G, d) || Dt.Ctor1?(G, d) || ...
-      //   }
-      var cases_dBv = new Bpl.Formal(dt.tok, new Bpl.TypedIdent(dt.tok, Bpl.TypedIdent.NoName, predef.DatatypeType), true);
-      var cases_resType = new Bpl.Formal(dt.tok, new Bpl.TypedIdent(dt.tok, Bpl.TypedIdent.NoName, Bpl.Type.Bool), false);
-      var cases_fn = new Bpl.Function(dt.tok, "$IsA#" + dt.FullSanitizedName,
-        new List<Variable> { cases_dBv },
-        cases_resType,
-        "Depth-one case-split function");
-
-      if (InsertChecksums) {
-        InsertChecksum(dt, cases_fn);
-      }
-
-      sink.AddTopLevelDeclaration(cases_fn);
-      // and here comes the actual axiom:
-      var dVar = BplBoundVar("d", predef.DatatypeType, out var d);
-      var lhs = FunctionCall(dt.tok, cases_fn.Name, Bpl.Type.Bool, d);
-      Bpl.Expr cases_body = Bpl.Expr.False;
-      foreach (DatatypeCtor ctor in dt.Ctors) {
-        var disj = FunctionCall(ctor.tok, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, d);
-        cases_body = BplOr(cases_body, disj);
-      }
-
-      var ax = BplForall(new List<Variable> { dVar }, BplTrigger(lhs), BplImp(lhs, cases_body));
-      sink.AddTopLevelDeclaration(new Bpl.Axiom(dt.tok, ax, "Depth-one case-split axiom"));
-    }
-
-    private Bpl.Function AddDataTypeConstructor(DatatypeDecl dt, DatatypeCtor ctor, bool includeIsAllocAxiom) {
-      // Add:  function #dt.ctor(tyVars, paramTypes) returns (DatatypeType);
-
-      List<Bpl.Variable> argTypes = new List<Bpl.Variable>();
-      foreach (Formal arg in ctor.Formals) {
-        Bpl.Variable a = new Bpl.Formal(arg.tok, new Bpl.TypedIdent(arg.tok, Bpl.TypedIdent.NoName, TrType(arg.Type)),
-          true);
-        argTypes.Add(a);
-      }
-
-      Bpl.Variable resType = new Bpl.Formal(ctor.tok,
-        new Bpl.TypedIdent(ctor.tok, Bpl.TypedIdent.NoName, predef.DatatypeType), false);
-      Bpl.Function fn;
-      if (dt is TupleTypeDecl ttd && ttd.Dims == 2 && ttd.NonGhostDims == 2) {
-        fn = predef.Tuple2Constructor;
-      } else {
-        fn = new Bpl.Function(ctor.tok, ctor.FullName, argTypes, resType, "Constructor function declaration");
-        sink.AddTopLevelDeclaration(fn);
-      }
-
-      if (InsertChecksums) {
-        InsertChecksum(dt, fn);
-      }
-
-
-      {
-        // Add:  const unique ##dt.ctor: DtCtorId;
-        var definitionAxioms = new List<Axiom>();
-        Bpl.Constant constructorId = new Bpl.Constant(ctor.tok,
-          new Bpl.TypedIdent(ctor.tok, "#" + ctor.FullName, predef.DtCtorId), true,
-          definitionAxioms: definitionAxioms);
-        Bpl.Expr constructorIdReference = new Bpl.IdentifierExpr(ctor.tok, constructorId);
-        var constructorIdentifierAxiom = CreateConstructorIdentifierAxiom(ctor, constructorIdReference);
-        AddOtherDefinition(fn, constructorIdentifierAxiom);
-        definitionAxioms.Add(constructorIdentifierAxiom);
-        sink.AddTopLevelDeclaration(constructorId);
-
-        {
-          // Add:  function dt.ctor?(this: DatatypeType): bool { DatatypeCtorId(this) == ##dt.ctor }
-          var queryField = GetReadonlyField(ctor.QueryField);
-          sink.AddTopLevelDeclaration(queryField);
-
-          // and here comes the associated axiom:
-
-          var thVar = BplBoundVar("d", predef.DatatypeType, out var th);
-          var queryPredicate = FunctionCall(ctor.tok, queryField.Name, Bpl.Type.Bool, th);
-          var ctorId = FunctionCall(ctor.tok, BuiltinFunction.DatatypeCtorId, null, th);
-          var rhs = Bpl.Expr.Eq(ctorId, constructorIdReference);
-          var body = Bpl.Expr.Iff(queryPredicate, rhs);
-          var tr = BplTrigger(queryPredicate);
-          var ax = BplForall(thVar, tr, body);
-          sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.tok, ax, "Questionmark and identifier"));
-        }
-
-        // check well-formedness of any default-value expressions
-        AddWellformednessCheck(ctor);
-      }
-
-
-      {
-        // Add:  axiom (forall d: DatatypeType :: dt.ctor?(d) ==> (exists params :: d == #dt.ctor(params));
-        CreateBoundVariables(ctor.Formals, out var bvs, out var args);
-        Bpl.Expr rhs = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-        var dBv = BplBoundVar("d", predef.DatatypeType, out var dId);
-        Bpl.Expr q = Bpl.Expr.Eq(dId, rhs);
-        if (bvs.Count != 0) {
-          q = new Bpl.ExistsExpr(ctor.tok, bvs, null /*always in a Skolemization context*/, q);
-        }
-
-        Bpl.Expr dtq = FunctionCall(ctor.tok, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, dId);
-        var trigger = BplTrigger(dtq);
-        q = BplForall(dBv, trigger, BplImp(dtq, q));
-        sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.tok, q, "Constructor questionmark has arguments"));
-      }
-
-      AddConstructorAxioms(dt, ctor, fn, includeIsAllocAxiom);
-
-      if (dt is IndDatatypeDecl) {
-        // Add Lit axiom:
-        // axiom (forall p0, ..., pn :: #dt.ctor(Lit(p0), ..., Lit(pn)) == Lit(#dt.ctor(p0, .., pn)));
-        CreateBoundVariables(ctor.Formals, out var bvs, out var args);
-        var litargs = new List<Bpl.Expr>();
-        foreach (Bpl.Expr arg in args) {
-          litargs.Add(Lit(arg));
-        }
-
-        Bpl.Expr lhs = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, litargs);
-        Bpl.Expr rhs = Lit(FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args), predef.DatatypeType);
-        Bpl.Expr q = BplForall(bvs, BplTrigger(lhs), Bpl.Expr.Eq(lhs, rhs));
-        var constructorLiteralAxiom = new Bpl.Axiom(ctor.tok, q, "Constructor literal");
-        AddOtherDefinition(fn, constructorLiteralAxiom);
-      }
-
-      // Injectivity axioms for normal arguments
-      for (int i = 0; i < ctor.Formals.Count; i++) {
-        var arg = ctor.Formals[i];
-        // function ##dt.ctor#i(DatatypeType) returns (Ti);
-        var sf = ctor.Destructors[i];
-        Contract.Assert(sf != null);
-        fn = GetReadonlyField(sf);
-        if (fn == predef.Tuple2Destructors0 || fn == predef.Tuple2Destructors1) {
-          // the two destructors for 2-tuples are predefined in Prelude for use
-          // by the Map#Items axiom
-        } else if (sf.EnclosingCtors[0] != ctor) {
-          // this special field, which comes from a shared destructor, is being declared in a different iteration of this loop
-        } else {
-          sink.AddTopLevelDeclaration(fn);
-        }
-
-        // axiom (forall params :: ##dt.ctor#i(#dt.ctor(params)) == params_i);
-        CreateBoundVariables(ctor.Formals, out var bvs, out var args);
-        var inner = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-        var outer = FunctionCall(ctor.tok, fn.Name, TrType(arg.Type), inner);
-        var q = BplForall(bvs, BplTrigger(inner), Bpl.Expr.Eq(outer, args[i]));
-        AddOtherDefinition(fn, (new Bpl.Axiom(ctor.tok, q, "Constructor injectivity")));
-
-        if (dt is IndDatatypeDecl) {
-          var argType = arg.Type.NormalizeExpand();
-          if (argType.IsDatatype || argType.IsTypeParameter) {
-            // for datatype:             axiom (forall params :: {#dt.ctor(params)} DtRank(params_i) < DtRank(#dt.ctor(params)));
-            // for type-parameter type:  axiom (forall params :: {#dt.ctor(params)} BoxRank(params_i) < DtRank(#dt.ctor(params)));
-            CreateBoundVariables(ctor.Formals, out bvs, out args);
-            Bpl.Expr lhs = FunctionCall(ctor.tok, arg.Type.IsDatatype ? BuiltinFunction.DtRank : BuiltinFunction.BoxRank,
-              null, args[i]);
-            /* CHECK
-              Bpl.Expr lhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null,
-                argType.IsDatatype ? args[i] : FunctionCall(ctor.tok, BuiltinFunction.Unbox, predef.DatatypeType, args[i]));
-              */
-            Bpl.Expr ct = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-            var rhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, ct);
-            var trigger = BplTrigger(ct);
-            q = new Bpl.ForallExpr(ctor.tok, bvs, trigger, Bpl.Expr.Lt(lhs, rhs));
-            AddOtherDefinition(fn, new Bpl.Axiom(ctor.tok, q, "Inductive rank"));
-          } else if (argType is SeqType) {
-            // axiom (forall params, i: int {#dt.ctor(params)} :: 0 <= i && i < |arg| ==> DtRank(arg[i]) < DtRank(#dt.ctor(params)));
-            // that is:
-            // axiom (forall params, i: int {#dt.ctor(params)} :: 0 <= i && i < |arg| ==> DtRank(Unbox(Seq#Index(arg,i))) < DtRank(#dt.ctor(params)));
-            {
-              CreateBoundVariables(ctor.Formals, out bvs, out args);
-              Bpl.Variable iVar = new Bpl.BoundVariable(arg.tok, new Bpl.TypedIdent(arg.tok, "i", Bpl.Type.Int));
-              bvs.Add(iVar);
-              Bpl.IdentifierExpr ie = new Bpl.IdentifierExpr(arg.tok, iVar);
-              Bpl.Expr ante = Bpl.Expr.And(
-                Bpl.Expr.Le(Bpl.Expr.Literal(0), ie),
-                Bpl.Expr.Lt(ie, FunctionCall(arg.tok, BuiltinFunction.SeqLength, null, args[i])));
-              var seqIndex = FunctionCall(arg.tok, BuiltinFunction.SeqIndex, predef.DatatypeType, args[i], ie);
-              Bpl.Expr lhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null,
-                FunctionCall(arg.tok, BuiltinFunction.Unbox, predef.DatatypeType, seqIndex));
-              var ct = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-              var rhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, ct);
-              q = new Bpl.ForallExpr(ctor.tok, bvs, new Trigger(lhs.tok, true, new List<Bpl.Expr> { seqIndex, ct }),
-                Bpl.Expr.Imp(ante, Bpl.Expr.Lt(lhs, rhs)));
-              sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.tok, q, "Inductive seq element rank"));
-            }
-
-            // axiom (forall params {#dt.ctor(params)} :: SeqRank(arg) < DtRank(#dt.ctor(params)));
-            {
-              CreateBoundVariables(ctor.Formals, out bvs, out args);
-              var lhs = FunctionCall(ctor.tok, BuiltinFunction.SeqRank, null, args[i]);
-              var ct = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-              var rhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, ct);
-              var trigger = BplTrigger(ct);
-              q = new Bpl.ForallExpr(ctor.tok, bvs, trigger, Bpl.Expr.Lt(lhs, rhs));
-              AddOtherDefinition(fn, new Bpl.Axiom(ctor.tok, q, "Inductive seq rank"));
-            }
-          } else if (argType is SetType) {
-            // axiom (forall params, d: Datatype {arg[d], #dt.ctor(params)}  :: arg[d] ==> DtRank(d) < DtRank(#dt.ctor(params)));
-            // that is:
-            // axiom (forall params, d: Datatype {arg[Box(d)], #dt.ctor(params)} :: arg[Box(d)] ==> DtRank(d) < DtRank(#dt.ctor(params)));
-            CreateBoundVariables(ctor.Formals, out bvs, out args);
-            Bpl.Variable dVar = new Bpl.BoundVariable(arg.tok, new Bpl.TypedIdent(arg.tok, "d", predef.DatatypeType));
-            bvs.Add(dVar);
-            Bpl.IdentifierExpr ie = new Bpl.IdentifierExpr(arg.tok, dVar);
-            Bpl.Expr inSet = Bpl.Expr.SelectTok(arg.tok, args[i], FunctionCall(arg.tok, BuiltinFunction.Box, null, ie));
-            Bpl.Expr lhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, ie);
-            var ct = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-            var rhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, ct);
-            var trigger = new Bpl.Trigger(ctor.tok, true, new List<Bpl.Expr> { inSet, ct });
-            q = new Bpl.ForallExpr(ctor.tok, bvs, trigger, Bpl.Expr.Imp(inSet, Bpl.Expr.Lt(lhs, rhs)));
-            sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.tok, q, "Inductive set element rank"));
-          } else if (argType is MultiSetType) {
-            // axiom (forall params, d: Datatype {arg[d], #dt.ctor(params)} :: 0 < arg[d] ==> DtRank(d) < DtRank(#dt.ctor(params)));
-            // that is:
-            // axiom (forall params, d: Datatype {arg[Box(d)], #dt.ctor(params)} :: 0 < arg[Box(d)] ==> DtRank(d) < DtRank(#dt.ctor(params)));
-            CreateBoundVariables(ctor.Formals, out bvs, out args);
-            Bpl.Variable dVar = new Bpl.BoundVariable(arg.tok, new Bpl.TypedIdent(arg.tok, "d", predef.DatatypeType));
-            bvs.Add(dVar);
-            Bpl.IdentifierExpr ie = new Bpl.IdentifierExpr(arg.tok, dVar);
-            var inMultiset = Bpl.Expr.SelectTok(arg.tok, args[i], FunctionCall(arg.tok, BuiltinFunction.Box, null, ie));
-            Bpl.Expr ante = Bpl.Expr.Gt(inMultiset, Bpl.Expr.Literal(0));
-            Bpl.Expr lhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, ie);
-            var ct = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-            var rhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, ct);
-            var trigger = new Bpl.Trigger(ctor.tok, true, new List<Bpl.Expr> { inMultiset, ct });
-            q = new Bpl.ForallExpr(ctor.tok, bvs, trigger, Bpl.Expr.Imp(ante, Bpl.Expr.Lt(lhs, rhs)));
-            sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.tok, q, "Inductive multiset element rank"));
-          } else if (argType is MapType) {
-            var finite = ((MapType)argType).Finite;
-            {
-              // axiom (forall params, d: DatatypeType
-              //   { Map#Domain(arg)[$Box(d)], #dt.ctor(params) }
-              //   Map#Domain(arg)[$Box(d)] ==> DtRank(d) < DtRank(#dt.ctor(params)));
-              CreateBoundVariables(ctor.Formals, out bvs, out args);
-              var dVar = new Bpl.BoundVariable(arg.tok, new Bpl.TypedIdent(arg.tok, "d", predef.DatatypeType));
-              bvs.Add(dVar);
-              var ie = new Bpl.IdentifierExpr(arg.tok, dVar);
-              var f = finite ? BuiltinFunction.MapDomain : BuiltinFunction.IMapDomain;
-              var domain = FunctionCall(arg.tok, f, predef.MapType(arg.tok, finite, predef.BoxType, predef.BoxType),
-                args[i]);
-              var inDomain = Bpl.Expr.SelectTok(arg.tok, domain, FunctionCall(arg.tok, BuiltinFunction.Box, null, ie));
-              var lhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, ie);
-              var ct = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-              var rhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, ct);
-              var trigger = new Bpl.Trigger(ctor.tok, true, new List<Bpl.Expr> { inDomain, ct });
-              q = new Bpl.ForallExpr(ctor.tok, bvs, trigger, Bpl.Expr.Imp(inDomain, Bpl.Expr.Lt(lhs, rhs)));
-              sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.tok, q, "Inductive map key rank"));
-            }
-            {
-              // axiom(forall params, bx: Box ::
-              //   { Map#Elements(arg)[bx], #dt.ctor(params) }
-              //   Map#Domain(arg)[bx] ==> DtRank($Unbox(Map#Elements(arg)[bx]): DatatypeType) < DtRank(#dt.ctor(params)));
-              CreateBoundVariables(ctor.Formals, out bvs, out args);
-              var bxVar = new Bpl.BoundVariable(arg.tok, new Bpl.TypedIdent(arg.tok, "bx", predef.BoxType));
-              bvs.Add(bxVar);
-              var ie = new Bpl.IdentifierExpr(arg.tok, bxVar);
-              var f = finite ? BuiltinFunction.MapDomain : BuiltinFunction.IMapDomain;
-              var domain = FunctionCall(arg.tok, f, predef.MapType(arg.tok, finite, predef.BoxType, predef.BoxType),
-                args[i]);
-              var inDomain = Bpl.Expr.SelectTok(arg.tok, domain, ie);
-              var ef = finite ? BuiltinFunction.MapElements : BuiltinFunction.IMapElements;
-              var element = FunctionCall(arg.tok, ef, predef.MapType(arg.tok, finite, predef.BoxType, predef.BoxType),
-                args[i]);
-              var elmt = Bpl.Expr.SelectTok(arg.tok, element, ie);
-              var unboxElmt = FunctionCall(arg.tok, BuiltinFunction.Unbox, predef.DatatypeType, elmt);
-              var lhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, unboxElmt);
-              var ct = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-              var rhs = FunctionCall(ctor.tok, BuiltinFunction.DtRank, null, ct);
-              var trigger = new Bpl.Trigger(ctor.tok, true, new List<Bpl.Expr> { inDomain, ct });
-              q = new Bpl.ForallExpr(ctor.tok, bvs, trigger, Bpl.Expr.Imp(inDomain, Bpl.Expr.Lt(lhs, rhs)));
-              sink.AddTopLevelDeclaration(new Bpl.Axiom(ctor.tok, q, "Inductive map value rank"));
-            }
-          }
-        }
-      }
-
-      return fn;
-    }
-
-    private void AddConstructorAxioms(DatatypeDecl dt, DatatypeCtor ctor, Bpl.Function ctorFunction, bool includeIsAllocAxiom) {
-      var tyvars = MkTyParamBinders(dt.TypeArgs, out var tyexprs);
-      CreateBoundVariables(ctor.Formals, out var bvs, out var args);
-      bvs.InsertRange(0, tyvars);
-      var c_params = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-      var c_ty = ClassTyCon(dt, tyexprs);
-      AddsIsConstructorAxiom(ctor, ctorFunction, args, bvs, c_params, c_ty);
-      if (includeIsAllocAxiom) {
-        AddIsAllocConstructorAxiom(dt, ctor, ctorFunction, args, bvs, c_params, c_ty);
-      }
-      AddDestructorAxiom(dt, ctor, ctorFunction, tyvars, c_ty);
-    }
-
-    /*
-          (forall x0 : C0, ..., xn : Cn, G : Ty, H : Heap •
-              { $IsAlloc(C(G, x0,...,xn), T(G), H) }
-              IsGoodHeap(H) ==>
-                 ($IsAlloc(C(G, x0,...,xn), T(G), H) <==>
-                  $IsAlloc[Box](x0, C0(G), H) && ... && $IsAlloc[Box](xn, Cn(G), H)));
-        */
-    private void AddIsAllocConstructorAxiom(DatatypeDecl dt, DatatypeCtor ctor, Bpl.Function ctorFunction,
-      List<Expr> args, List<Variable> bvs, NAryExpr c_params, Expr c_ty) {
-      var hVar = BplBoundVar("$h", predef.HeapType, out var h);
-
-      Bpl.Expr conj = Bpl.Expr.True;
-      for (var i = 0; i < ctor.Formals.Count; i++) {
-        var arg = ctor.Formals[i];
-        conj = BplAnd(conj, MkIsAlloc(args[i], arg.Type, h));
-      }
-
-      {
-        var isGoodHeap = FunctionCall(ctor.tok, BuiltinFunction.IsGoodHeap, null, h);
-        var c_alloc = MkIsAlloc(c_params, c_ty, h);
-        bvs.Add(hVar);
-        var constructorIsAllocAxiom = new Bpl.Axiom(ctor.tok,
-          BplForall(bvs, BplTrigger(c_alloc),
-            BplImp(isGoodHeap, BplIff(c_alloc, conj))),
-          "Constructor $IsAlloc");
-        AddOtherDefinition(ctorFunction, constructorIsAllocAxiom);
-      }
-    }
-
-    /// <summary>
-    /// If no value of the datatype depends on allocation, then this axiom states the property
-    /// for all datatype values. It can be used in place of one axiom per constructor.
-    ///
-    /// (forall d: DatatypeValue, T0,T1,...: Ty, H: Heap •
-    ///   { $IsAlloc(d, T(T0,T1,...), H) }
-    ///   IsGoodHeap(H) && $Is(d, T(T0,T1,...)) ==>
-    ///     $IsAlloc(d, T(T0,T1,...), H))
-    /// </summary>
-    private void AddCommonIsAllocConstructorAxiom(DatatypeDecl dt) {
-
-      MkIsPredicateForDatatype(dt, out var boundVariables, out var d, out var tyExpr, out var isPredicate);
-
-      var hVar = BplBoundVar("$h", predef.HeapType, out var h);
-      var isGoodHeap = FunctionCall(dt.tok, BuiltinFunction.IsGoodHeap, null, h);
-
-      var isAlloc = MkIsAlloc(d, tyExpr, h);
-
-      var body = BplImp(BplAnd(isGoodHeap, isPredicate), isAlloc);
-
-      {
-        var tr = BplTrigger(isAlloc);
-        var ax = new Bpl.Axiom(dt.tok, BplForall(Snoc(boundVariables, hVar), tr, body), "Datatype $IsAlloc");
-        sink.AddTopLevelDeclaration(ax);
-      }
-    }
-
-    /// <summary>
-    /// Return list of variables
-    ///     d: DatatypeValue, T0,T1,...: Ty  // in out-parameter "boundVariables"
-    /// expression
-    ///     d                                // in out-parameter "varExpression"
-    /// expression
-    ///     T(T0,T1,...)                     // in out-parameter "typeExpression"
-    /// and predicate
-    ///     $Is(d, T(T0,T1,...))             // in out-parameter "isPredicate"
-    /// </summary>
-    private void MkIsPredicateForDatatype(DatatypeDecl datatypeDecl, out List<Bpl.Variable> boundVariables,
-      out Bpl.Expr varExpression, out Bpl.Expr typeExpression, out Bpl.Expr isPredicate) {
-      var typeVariables = MkTyParamBinders(datatypeDecl.TypeArgs, out var typeExpressions);
-      var dVar = BplBoundVar("d", predef.DatatypeType, out varExpression);
-      boundVariables = Snoc(typeVariables, dVar);
-      typeExpression = ClassTyCon(datatypeDecl, typeExpressions);
-      isPredicate = MkIs(varExpression, typeExpression);
-    }
-
-    /* (forall d : DatatypeType, G : Ty, H : Heap •
-               { $IsAlloc[Box](Dtor(d), D(G), H) }
-               IsGoodHeap(H) &&
-               C?(d) &&
-               (exists G' : Ty :: $IsAlloc(d, T(G,G'), H))
-               ==>
-                   $IsAlloc[Box](Dtor(d), D(G), H))
-         */
-    private void AddDestructorAxiom(DatatypeDecl dt, DatatypeCtor ctor, Bpl.Function ctorFunction, List<Variable> tyvars, Expr c_ty) {
-
-      var hVar = BplBoundVar("$h", predef.HeapType, out var h);
-      for (int i = 0; i < ctor.Formals.Count; i++) {
-        var arg = ctor.Formals[i];
-        var dtor = GetReadonlyField(ctor.Destructors[i]);
-        var dBv = BplBoundVar("d", predef.DatatypeType, out var dId);
-        var isGoodHeap = FunctionCall(ctor.tok, BuiltinFunction.IsGoodHeap, null, h);
-        Bpl.Expr dtq = FunctionCall(ctor.tok, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, dId);
-        var c_alloc = MkIsAlloc(dId, c_ty, h);
-        var dtorD = FunctionCall(ctor.tok, dtor.Name, TrType(arg.Type), dId);
-        var d_alloc = MkIsAlloc(dtorD, arg.Type, h);
-
-        // split tyvars into G,G' where G are the type variables that are used in the type of the destructor
-        var freeTypeVars = new HashSet<TypeParameter>();
-        ComputeFreeTypeVariables_All(arg.Type, freeTypeVars);
-        var tyvarsG = new List<Bpl.Variable>();
-        var tyvarsGprime = new List<Bpl.Variable>();
-        Contract.Assert(dt.TypeArgs.Count == tyvars.Count);
-        for (int j = 0; j < dt.TypeArgs.Count; j++) {
-          var tv = tyvars[j];
-          if (freeTypeVars.Contains(dt.TypeArgs[j])) {
-            tyvarsG.Add(tv);
-          } else {
-            tyvarsGprime.Add(tv);
-          }
-        }
-
-        var bvs = new List<Bpl.Variable>();
-        bvs.Add(dBv);
-        bvs.AddRange(tyvarsG);
-        bvs.Add(hVar);
-        if (tyvarsGprime.Count != 0) {
-          c_alloc = new Bpl.ExistsExpr(ctor.tok, tyvarsGprime, BplTrigger(c_alloc), c_alloc);
-        }
-
-        var destructorAxiom = new Bpl.Axiom(ctor.tok,
-          BplForall(bvs, BplTrigger(d_alloc),
-            BplImp(BplAnd(isGoodHeap, BplAnd(dtq, c_alloc)), d_alloc)),
-          "Destructor $IsAlloc");
-        AddOtherDefinition(ctorFunction, destructorAxiom);
-      }
-    }
-
-    /*
-        (forall x0 : C0, ..., xn : Cn, G : Ty •
-          { $Is(C(x0,...,xn), T(G)) }
-          $Is(C(x0,...,xn), T(G)) <==>
-          $Is[Box](x0, C0(G)) && ... && $Is[Box](xn, Cn(G)));
-      */
-    private void AddsIsConstructorAxiom(DatatypeCtor ctor, Bpl.Function ctorFunction, List<Expr> args, List<Variable> bvs, NAryExpr c_params, Expr c_ty) {
-      Bpl.Expr conj = Bpl.Expr.True;
-      for (var i = 0; i < ctor.Formals.Count; i++) {
-        var arg = ctor.Formals[i];
-        conj = BplAnd(conj, MkIs(args[i], arg.Type));
-      }
-
-      var isCall = MkIs(c_params, c_ty);
-      var constructorIsAxiom = new Bpl.Axiom(ctor.tok,
-        BplForall(bvs, BplTrigger(isCall), BplIff(isCall, conj)),
-        "Constructor $Is");
-      AddOtherDefinition(ctorFunction, constructorIsAxiom);
-    }
-
-    private Axiom CreateConstructorIdentifierAxiom(DatatypeCtor ctor, Expr c) {
-      // Add:  axiom (forall params :: DatatypeCtorId(#dt.ctor(params)) == ##dt.ctor);
-      CreateBoundVariables(ctor.Formals, out var bvs, out var args);
-      var constructor_call = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-      var lhs = FunctionCall(ctor.tok, BuiltinFunction.DatatypeCtorId, null, constructor_call);
-      Bpl.Expr q = Bpl.Expr.Eq(lhs, c);
-      var trigger = BplTrigger(constructor_call);
-      var axiom = new Bpl.Axiom(ctor.tok, BplForall(bvs, trigger, q), "Constructor identifier");
-      return axiom;
-    }
-  }
-}
diff --git a/Source/DafnyCore/Verifier/Translator.ExpressionTranslator.cs b/Source/DafnyCore/Verifier/Translator.ExpressionTranslator.cs
deleted file mode 100644
index bff021ebe47..00000000000
--- a/Source/DafnyCore/Verifier/Translator.ExpressionTranslator.cs
+++ /dev/null
@@ -1,1943 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using System.Numerics;
-using Microsoft.Boogie;
-using static Microsoft.Dafny.Util;
-
-namespace Microsoft.Dafny {
-  public partial class Translator {
-
-    internal class ExpressionTranslator {
-      private DafnyOptions options;
-      // HeapExpr == null ==> translation of pure (no-heap) expression
-      readonly Boogie.Expr _the_heap_expr;
-      public Boogie.Expr HeapExpr {
-        // The increment of Statistics_HeapUses in the following line is a hack and not entirely a good idea.
-        // Not only does one need to be careful not to mention HeapExpr in contracts (in particular, in ObjectInvariant()
-        // below), but also, the debugger may invoke HeapExpr and that will cause an increment as well.
-        get { Statistics_HeapUses++; return _the_heap_expr; }
-      }
-
-      /// <summary>
-      /// Return HeapExpr as an IdentifierExpr.
-      /// CAUTION: This getter should be used only if the caller "knows" that HeapExpr really is an IdentifierExpr.
-      /// </summary>
-      public Boogie.IdentifierExpr HeapCastToIdentifierExpr {
-        get {
-          Contract.Assume(HeapExpr is Boogie.IdentifierExpr);
-          return (Boogie.IdentifierExpr)HeapExpr;
-        }
-      }
-
-      public readonly PredefinedDecls predef;
-      public readonly Translator translator;
-      public readonly string This;
-      public readonly string modifiesFrame; // the name of the context's frame variable.
-      readonly Function applyLimited_CurrentFunction;
-      public readonly FuelSetting layerInterCluster;
-      public readonly FuelSetting layerIntraCluster = null;  // a value of null says to do the same as for inter-cluster calls
-      public int Statistics_CustomLayerFunctionCount = 0;
-      public int Statistics_HeapAsQuantifierCount = 0;
-      public int Statistics_HeapUses = 0;
-      public readonly bool stripLits = false;
-      [ContractInvariantMethod]
-      void ObjectInvariant() {
-        // In the following line, it is important to use _the_heap_expr directly, rather than HeapExpr, because
-        // the HeapExpr getter has a side effect on Statistics_HeapUses.
-        Contract.Invariant(_the_heap_expr == null || _the_heap_expr is Boogie.OldExpr || _the_heap_expr is Boogie.IdentifierExpr);
-        Contract.Invariant(predef != null);
-        Contract.Invariant(translator != null);
-        Contract.Invariant(This != null);
-        Contract.Invariant(modifiesFrame != null);
-        Contract.Invariant(layerInterCluster != null);
-        Contract.Invariant(0 <= Statistics_CustomLayerFunctionCount);
-      }
-
-      /// <summary>
-      /// This is the most general constructor.  It is private and takes all the parameters.  Whenever
-      /// one ExpressionTranslator is constructed from another, unchanged parameters are just copied in.
-      /// </summary>
-      ExpressionTranslator(Translator translator, PredefinedDecls predef, Boogie.Expr heap, string thisVar,
-        Function applyLimited_CurrentFunction, FuelSetting layerInterCluster, FuelSetting layerIntraCluster, string modifiesFrame, bool stripLits) {
-
-        Contract.Requires(translator != null);
-        Contract.Requires(predef != null);
-        Contract.Requires(thisVar != null);
-        Contract.Requires(modifiesFrame != null);
-
-        this.translator = translator;
-        this.predef = predef;
-        this._the_heap_expr = heap;
-        this.This = thisVar;
-        this.applyLimited_CurrentFunction = applyLimited_CurrentFunction;
-        this.layerInterCluster = layerInterCluster;
-        if (layerIntraCluster == null) {
-          this.layerIntraCluster = layerInterCluster;
-        } else {
-          this.layerIntraCluster = layerIntraCluster;
-        }
-        this.modifiesFrame = modifiesFrame;
-        this.stripLits = stripLits;
-        this.options = translator.options;
-      }
-
-      public static Boogie.IdentifierExpr HeapIdentifierExpr(PredefinedDecls predef, Boogie.IToken heapToken) {
-        return new Boogie.IdentifierExpr(heapToken, predef.HeapVarName, predef.HeapType);
-      }
-
-      public ExpressionTranslator(Translator translator, PredefinedDecls predef, Boogie.IToken heapToken)
-        : this(translator, predef, HeapIdentifierExpr(predef, heapToken)) {
-        Contract.Requires(translator != null);
-        Contract.Requires(predef != null);
-        Contract.Requires(heapToken != null);
-      }
-
-      public ExpressionTranslator(Translator translator, PredefinedDecls predef, Boogie.Expr heap)
-        : this(translator, predef, heap, "this") {
-        Contract.Requires(translator != null);
-        Contract.Requires(predef != null);
-      }
-
-      public ExpressionTranslator(Translator translator, PredefinedDecls predef, Boogie.Expr heap, Boogie.Expr oldHeap)
-        : this(translator, predef, heap, "this") {
-        Contract.Requires(translator != null);
-        Contract.Requires(predef != null);
-        Contract.Requires(oldHeap != null);
-
-        var old = new ExpressionTranslator(translator, predef, oldHeap);
-        old.oldEtran = old;
-        this.oldEtran = old;
-      }
-
-      public ExpressionTranslator(Translator translator, PredefinedDecls predef, Boogie.Expr heap, string thisVar)
-        : this(translator, predef, heap, thisVar, null, new FuelSetting(translator, 1), null, "$_Frame", false) {
-        Contract.Requires(translator != null);
-        Contract.Requires(predef != null);
-        Contract.Requires(thisVar != null);
-      }
-
-      public ExpressionTranslator(ExpressionTranslator etran, Boogie.Expr heap)
-        : this(etran.translator, etran.predef, heap, etran.This, etran.applyLimited_CurrentFunction, etran.layerInterCluster, etran.layerIntraCluster, etran.modifiesFrame, etran.stripLits) {
-        Contract.Requires(etran != null);
-      }
-
-      public ExpressionTranslator(ExpressionTranslator etran, string modifiesFrame)
-        : this(etran.translator, etran.predef, etran.HeapExpr, etran.This, etran.applyLimited_CurrentFunction, etran.layerInterCluster, etran.layerIntraCluster, modifiesFrame, etran.stripLits) {
-        Contract.Requires(etran != null);
-        Contract.Requires(modifiesFrame != null);
-      }
-
-      internal IToken GetToken(Expression expression) {
-        return translator.GetToken(expression);
-      }
-
-      ExpressionTranslator oldEtran;
-      public ExpressionTranslator Old {
-        get {
-          Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
-
-          if (oldEtran == null) {
-            oldEtran = new ExpressionTranslator(translator, predef, new Boogie.OldExpr(HeapExpr.tok, HeapExpr), This, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, modifiesFrame, stripLits);
-            oldEtran.oldEtran = oldEtran;
-          }
-          return oldEtran;
-        }
-      }
-
-      public ExpressionTranslator OldAt(Label/*?*/ label) {
-        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
-        if (label == null) {
-          return Old;
-        }
-        var heapAt = new Boogie.IdentifierExpr(Token.NoToken, "$Heap_at_" + label.AssignUniqueId(translator.CurrentIdGenerator), predef.HeapType);
-        return new ExpressionTranslator(translator, predef, heapAt, This, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, modifiesFrame, stripLits);
-      }
-
-      public bool UsesOldHeap {
-        get {
-          return HeapExpr is Boogie.OldExpr || (HeapExpr is Boogie.IdentifierExpr ide && ide.Name.StartsWith("$Heap_at_"));
-        }
-      }
-
-      public ExpressionTranslator WithLayer(Boogie.Expr layerArgument) {
-        // different layer and 0 fuel amount.
-        Contract.Requires(layerArgument != null);
-        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
-
-        return CloneExpressionTranslator(this, translator, predef, HeapExpr, This, null, new FuelSetting(translator, 0, layerArgument), new FuelSetting(translator, 0, layerArgument), modifiesFrame, stripLits);
-      }
-
-      public ExpressionTranslator WithCustomFuelSetting(CustomFuelSettings customSettings) {
-        // Use the existing layers but with some per-function customizations
-        Contract.Requires(customSettings != null);
-        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
-
-        return CloneExpressionTranslator(this, translator, predef, HeapExpr, This, null, layerInterCluster.WithContext(customSettings), layerIntraCluster.WithContext(customSettings), modifiesFrame, stripLits);
-      }
-
-      public ExpressionTranslator ReplaceLayer(Boogie.Expr layerArgument) {
-        // different layer with same fuel amount.
-        Contract.Requires(layerArgument != null);
-        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
-
-        return CloneExpressionTranslator(this, translator, predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster.WithLayer(layerArgument), layerIntraCluster.WithLayer(layerArgument), modifiesFrame, stripLits);
-      }
-
-      public ExpressionTranslator WithNoLits() {
-        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
-        return CloneExpressionTranslator(this, translator, predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, modifiesFrame, true);
-      }
-
-      public ExpressionTranslator LimitedFunctions(Function applyLimited_CurrentFunction, Boogie.Expr layerArgument) {
-        Contract.Requires(applyLimited_CurrentFunction != null);
-        Contract.Requires(layerArgument != null);
-        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
-
-        return CloneExpressionTranslator(this, translator, predef, HeapExpr, This, applyLimited_CurrentFunction, /* layerArgument */ layerInterCluster, new FuelSetting(translator, 0, layerArgument), modifiesFrame, stripLits);
-      }
-
-      public ExpressionTranslator LayerOffset(int offset) {
-        Contract.Requires(0 <= offset);
-        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
-
-        return CloneExpressionTranslator(this, translator, predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster.Offset(offset), layerIntraCluster, modifiesFrame, stripLits);
-      }
-
-      public ExpressionTranslator DecreaseFuel(int offset) {
-        Contract.Requires(0 <= offset);
-        Contract.Ensures(Contract.Result<ExpressionTranslator>() != null);
-
-        return CloneExpressionTranslator(this, translator, predef, HeapExpr, This, applyLimited_CurrentFunction, layerInterCluster.Decrease(offset), layerIntraCluster, modifiesFrame, stripLits);
-      }
-
-      private static ExpressionTranslator CloneExpressionTranslator(ExpressionTranslator orig,
-        Translator translator, PredefinedDecls predef, Boogie.Expr heap, string thisVar,
-        Function applyLimited_CurrentFunction, FuelSetting layerInterCluster, FuelSetting layerIntraCluster, string modifiesFrame, bool stripLits) {
-        var et = new ExpressionTranslator(translator, predef, heap, thisVar, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, modifiesFrame, stripLits);
-        if (orig.oldEtran != null) {
-          var etOld = new ExpressionTranslator(translator, predef, orig.Old.HeapExpr, thisVar, applyLimited_CurrentFunction, layerInterCluster, layerIntraCluster, modifiesFrame, stripLits);
-          etOld.oldEtran = etOld;
-          et.oldEtran = etOld;
-        }
-        return et;
-      }
-
-      public Boogie.IdentifierExpr TheFrame(IToken tok) {
-        Contract.Requires(tok != null);
-        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>() != null);
-        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>().Type != null);
-
-        Boogie.TypeVariable alpha = new Boogie.TypeVariable(tok, "beta");
-        Boogie.Type fieldAlpha = predef.FieldName(tok, alpha);
-        Boogie.Type ty = new Boogie.MapType(tok, new List<TypeVariable> { alpha }, new List<Boogie.Type> { predef.RefType, fieldAlpha }, Boogie.Type.Bool);
-        return new Boogie.IdentifierExpr(tok, this.modifiesFrame, ty);
-      }
-
-      public Boogie.IdentifierExpr ArbitraryBoxValue() {
-        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>() != null);
-        return new Boogie.IdentifierExpr(Token.NoToken, "$ArbitraryBoxValue", predef.BoxType);
-      }
-      public Boogie.Expr ArbitraryValue(Type type) {
-        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
-        var bx = ArbitraryBoxValue();
-        if (!ModeledAsBoxType(type)) {
-          return translator.FunctionCall(Token.NoToken, BuiltinFunction.Unbox, translator.TrType(type), bx);
-        } else {
-          return bx;
-        }
-      }
-
-      public Boogie.IdentifierExpr FunctionContextHeight() {
-        Contract.Ensures(Contract.Result<Boogie.IdentifierExpr>().Type != null);
-        return new Boogie.IdentifierExpr(Token.NoToken, "$FunctionContextHeight", Boogie.Type.Int);
-      }
-
-      public Boogie.Expr HeightContext(ICallable m) {
-        Contract.Requires(m != null);
-        // free requires fh == FunctionContextHeight;
-        var module = m.EnclosingModule;
-        Boogie.Expr context =
-          Boogie.Expr.Eq(Boogie.Expr.Literal(module.CallGraph.GetSCCRepresentativePredecessorCount(m)), FunctionContextHeight());
-        return context;
-      }
-
-      public Expression GetSubstitutedBody(LetExpr e) {
-        Contract.Requires(e != null);
-        Contract.Requires(e.Exact);
-        Contract.Assert(e.LHSs.Count == e.RHSs.Count);  // checked by resolution
-        var substMap = new Dictionary<IVariable, Expression>();
-        for (int i = 0; i < e.LHSs.Count; i++) {
-          translator.AddCasePatternVarSubstitutions(e.LHSs[i], TrExpr(e.RHSs[i]), substMap);
-        }
-        return Translator.Substitute(e.Body, null, substMap);
-      }
-
-      public Expr MaybeLit(Expr expr, Boogie.Type type) {
-        return stripLits ? expr : translator.Lit(expr, type);
-      }
-
-      public Expr MaybeLit(Expr expr) {
-        return stripLits ? expr : translator.Lit(expr);
-      }
-
-      /// <summary>
-      /// Translates Dafny expression "expr" into a Boogie expression.  If the type of "expr" can be a boolean, then the
-      /// token (source location) of the resulting expression is filled in (it wouldn't hurt if the token were always
-      /// filled in, but it is really necessary for anything that may show up in a Boogie assert, since that location may
-      /// then show up in an error message).
-      /// </summary>
-      public Boogie.Expr TrExpr(Expression expr) {
-        Contract.Requires(expr != null);
-        Contract.Requires(predef != null);
-
-        switch (expr) {
-          case LiteralExpr literalExpr: {
-              LiteralExpr e = literalExpr;
-              if (e.Value == null) {
-                return predef.Null;
-              } else if (e.Value is bool) {
-                return MaybeLit(new Boogie.LiteralExpr(GetToken(e), (bool)e.Value));
-              } else if (e is CharLiteralExpr) {
-                // we expect e.Value to be a string representing exactly one char
-                Boogie.Expr rawElement = null;  // assignment to please compiler's definite assignment rule
-                foreach (var ch in Util.UnescapedCharacters(options, (string)e.Value, false)) {
-                  Contract.Assert(rawElement == null);  // we should get here only once
-                  rawElement = translator.FunctionCall(GetToken(literalExpr), BuiltinFunction.CharFromInt, null, Boogie.Expr.Literal(ch));
-                }
-                Contract.Assert(rawElement != null);  // there should have been an iteration of the loop above
-                return MaybeLit(rawElement, predef.CharType);
-              } else if (e is StringLiteralExpr) {
-                var str = (StringLiteralExpr)e;
-                Boogie.Expr seq = translator.FunctionCall(GetToken(literalExpr), BuiltinFunction.SeqEmpty, predef.BoxType);
-                foreach (var ch in Util.UnescapedCharacters(options, (string)e.Value, str.IsVerbatim)) {
-                  var rawElement = translator.FunctionCall(GetToken(literalExpr), BuiltinFunction.CharFromInt, null, Boogie.Expr.Literal(ch));
-                  Boogie.Expr elt = BoxIfNecessary(GetToken(literalExpr), rawElement, Type.Char);
-                  seq = translator.FunctionCall(GetToken(literalExpr), BuiltinFunction.SeqBuild, predef.BoxType, seq, elt);
-                }
-                return MaybeLit(seq, translator.TrType(new SeqType(Type.Char)));
-              } else if (e.Value is BigInteger) {
-                var n = Microsoft.BaseTypes.BigNum.FromBigInt((BigInteger)e.Value);
-                if (e.Type is BitvectorType) {
-                  return MaybeLit(translator.BplBvLiteralExpr(GetToken(e), n, e.Type.AsBitVectorType));
-                } else if (e.Type.IsBigOrdinalType) {
-                  var fromNat = FunctionCall(GetToken(literalExpr), "ORD#FromNat", predef.BigOrdinalType, Boogie.Expr.Literal(n));
-                  return MaybeLit(fromNat, predef.BigOrdinalType);
-                } else {
-                  return MaybeLit(Boogie.Expr.Literal(n));
-                }
-              } else if (e.Value is BaseTypes.BigDec) {
-                return MaybeLit(Boogie.Expr.Literal((BaseTypes.BigDec)e.Value));
-              } else {
-                Contract.Assert(false); throw new cce.UnreachableException();  // unexpected literal
-              }
-            }
-          case ThisExpr:
-            return new Boogie.IdentifierExpr(GetToken(expr), This, translator.TrType(expr.Type));
-          case IdentifierExpr identifierExpr: {
-              IdentifierExpr e = identifierExpr;
-              Contract.Assert(e.Var != null);
-              return translator.TrVar(GetToken(identifierExpr), e.Var);
-            }
-          case BoogieWrapper wrapper: {
-              var e = wrapper;
-              return e.Expr;
-            }
-          case BoogieFunctionCall call: {
-              var e = call;
-              var id = new Boogie.IdentifierExpr(GetToken(e), e.FunctionName, translator.TrType(e.Type));
-              var args = new List<Boogie.Expr>();
-              foreach (var arg in e.TyArgs) {
-                args.Add(translator.TypeToTy(arg));
-              }
-              if (e.UsesHeap) {
-                args.Add(HeapExpr);
-              }
-              if (e.UsesOldHeap) {
-                args.Add(Old.HeapExpr);
-              }
-              foreach (var heapAtLabel in e.HeapAtLabels) {
-                var bv = BplBoundVar("$Heap_at_" + heapAtLabel.AssignUniqueId(translator.CurrentIdGenerator), translator.predef.HeapType, out var ve);
-                args.Add(ve);
-              }
-              foreach (var arg in e.Args) {
-                args.Add(TrExpr(arg));
-              }
-              return new Boogie.NAryExpr(GetToken(e), new Boogie.FunctionCall(id), args);
-            }
-          case SetDisplayExpr displayExpr: {
-              SetDisplayExpr e = displayExpr;
-              Boogie.Expr s = translator.FunctionCall(GetToken(displayExpr), e.Finite ? BuiltinFunction.SetEmpty : BuiltinFunction.ISetEmpty, predef.BoxType);
-              var isLit = true;
-              foreach (Expression ee in e.Elements) {
-                var rawElement = TrExpr(ee);
-                isLit = isLit && translator.IsLit(rawElement);
-                Boogie.Expr ss = BoxIfNecessary(GetToken(displayExpr), rawElement, cce.NonNull(ee.Type));
-                s = translator.FunctionCall(GetToken(displayExpr), e.Finite ? BuiltinFunction.SetUnionOne : BuiltinFunction.ISetUnionOne, predef.BoxType, s, ss);
-              }
-              if (isLit) {
-                // Lit-lifting: All elements are lit, so the set is Lit too
-                s = MaybeLit(s, predef.BoxType);
-              }
-              return s;
-            }
-          case MultiSetDisplayExpr displayExpr: {
-              MultiSetDisplayExpr e = displayExpr;
-              Boogie.Expr s = translator.FunctionCall(GetToken(displayExpr), BuiltinFunction.MultiSetEmpty, predef.BoxType);
-              var isLit = true;
-              foreach (Expression ee in e.Elements) {
-                var rawElement = TrExpr(ee);
-                isLit = isLit && translator.IsLit(rawElement);
-                Boogie.Expr ss = BoxIfNecessary(GetToken(displayExpr), rawElement, cce.NonNull(ee.Type));
-                s = translator.FunctionCall(GetToken(displayExpr), BuiltinFunction.MultiSetUnionOne, predef.BoxType, s, ss);
-              }
-              if (isLit) {
-                // Lit-lifting: All elements are lit, so the multiset is Lit too
-                s = MaybeLit(s, predef.BoxType);
-              }
-              return s;
-            }
-          case SeqDisplayExpr displayExpr: {
-              SeqDisplayExpr e = displayExpr;
-              // Note: a LiteralExpr(string) is really another kind of SeqDisplayExpr
-              Boogie.Expr s = translator.FunctionCall(GetToken(displayExpr), BuiltinFunction.SeqEmpty, predef.BoxType);
-              var isLit = true;
-              foreach (Expression ee in e.Elements) {
-                var rawElement = TrExpr(ee);
-                isLit = isLit && translator.IsLit(rawElement);
-                Boogie.Expr elt = BoxIfNecessary(GetToken(displayExpr), rawElement, ee.Type);
-                s = translator.FunctionCall(GetToken(displayExpr), BuiltinFunction.SeqBuild, predef.BoxType, s, elt);
-              }
-              if (isLit) {
-                // Lit-lifting: All elements are lit, so the sequence is Lit too
-                s = MaybeLit(s, predef.BoxType);
-              }
-              return s;
-            }
-          case MapDisplayExpr displayExpr: {
-              MapDisplayExpr e = displayExpr;
-              Boogie.Type maptype = predef.MapType(GetToken(displayExpr), e.Finite, predef.BoxType, predef.BoxType);
-              Boogie.Expr s = translator.FunctionCall(GetToken(displayExpr), e.Finite ? BuiltinFunction.MapEmpty : BuiltinFunction.IMapEmpty, predef.BoxType);
-              var isLit = true;
-              foreach (ExpressionPair p in e.Elements) {
-                var rawA = TrExpr(p.A);
-                var rawB = TrExpr(p.B);
-                isLit = isLit && translator.IsLit(rawA) && translator.IsLit(rawB);
-                Boogie.Expr elt = BoxIfNecessary(GetToken(displayExpr), rawA, cce.NonNull(p.A.Type));
-                Boogie.Expr elt2 = BoxIfNecessary(GetToken(displayExpr), rawB, cce.NonNull(p.B.Type));
-                s = FunctionCall(GetToken(displayExpr), e.Finite ? "Map#Build" : "IMap#Build", maptype, s, elt, elt2);
-              }
-              if (isLit) {
-                // Lit-lifting: All keys and values are lit, so the map is Lit too
-                s = MaybeLit(s, predef.BoxType);
-              }
-              return s;
-            }
-          case MemberSelectExpr selectExpr: {
-              var e = selectExpr;
-              return e.MemberSelectCase(
-                field => {
-                  var useSurrogateLocal = translator.inBodyInitContext && Expression.AsThis(e.Obj) != null && !field.IsInstanceIndependentConstant;
-                  var fType = translator.TrType(field.Type);
-                  if (useSurrogateLocal) {
-                    return new Boogie.IdentifierExpr(GetToken(expr), translator.SurrogateName(field), fType);
-                  } else if (field is ConstantField) {
-                    var typeMap = e.TypeArgumentSubstitutionsWithParents();
-                    var args = GetTypeParams(field.EnclosingClass).ConvertAll(tp => translator.TypeToTy(typeMap[tp]));
-                    Boogie.Expr result;
-                    if (field.IsStatic) {
-                      result = new Boogie.NAryExpr(GetToken(expr), new Boogie.FunctionCall(translator.GetReadonlyField(field)), args);
-                    } else {
-                      Boogie.Expr obj = translator.BoxifyForTraitParent(e.tok, TrExpr(e.Obj), e.Member, e.Obj.Type);
-                      args.Add(obj);
-                      result = new Boogie.NAryExpr(GetToken(expr), new Boogie.FunctionCall(translator.GetReadonlyField(field)), args);
-                    }
-                    result = translator.CondApplyUnbox(GetToken(expr), result, field.Type, expr.Type);
-                    return result;
-                  } else {
-                    Boogie.Expr obj = TrExpr(e.Obj);
-                    Boogie.Expr result;
-                    if (field.IsMutable) {
-                      result = ReadHeap(GetToken(expr), HeapExpr, obj, new Boogie.IdentifierExpr(GetToken(expr), translator.GetField(field)), fType);
-                      return translator.CondApplyUnbox(GetToken(expr), result, field.Type, expr.Type);
-                    } else {
-                      result = new Boogie.NAryExpr(GetToken(expr), new Boogie.FunctionCall(translator.GetReadonlyField(field)),
-                        new List<Boogie.Expr> { obj });
-                      result = translator.CondApplyUnbox(GetToken(expr), result, field.Type, expr.Type);
-                      if (translator.IsLit(obj)) {
-                        result = MaybeLit(result, translator.TrType(expr.Type));
-                      }
-                      return result;
-                    }
-                  }
-                },
-                fn => {
-                  var typeMap = e.TypeArgumentSubstitutionsWithParents();
-                  var args = GetTypeParams(fn).ConvertAll(tp => translator.TypeToTy(typeMap[tp]));
-                  if (fn.IsFuelAware()) {
-                    args.Add(this.layerInterCluster.GetFunctionFuel(fn));
-                  }
-                  if (fn.IsOpaque) {
-                    args.Add(translator.GetRevealConstant(fn));
-                  }
-                  if (fn is TwoStateFunction) {
-                    args.Add(Old.HeapExpr);
-                  }
-                  if (!fn.IsStatic) {
-                    args.Add(/* translator.BoxIfUnboxed */(TrExpr(e.Obj)/*, e.Type */));
-                  }
-                  return FunctionCall(GetToken(e), translator.FunctionHandle(fn), predef.HandleType, args);
-                });
-            }
-          case SeqSelectExpr selectExpr: {
-              SeqSelectExpr e = selectExpr;
-              Boogie.Expr seq = TrExpr(e.Seq);
-              var seqType = e.Seq.Type.NormalizeExpand();
-              Type elmtType = null;
-              Type domainType = null;
-              Contract.Assert(seqType != null);  // the expression has been successfully resolved
-              if (seqType.IsArrayType) {
-                domainType = Type.Int;
-                elmtType = UserDefinedType.ArrayElementType(seqType);
-              } else if (seqType is SeqType) {
-                domainType = Type.Int;
-                elmtType = ((SeqType)seqType).Arg;
-              } else if (seqType is MapType) {
-                domainType = ((MapType)seqType).Domain;
-                elmtType = ((MapType)seqType).Range;
-              } else if (seqType is MultiSetType) {
-                domainType = ((MultiSetType)seqType).Arg;
-                elmtType = Type.Int;
-              } else { Contract.Assert(false); }
-              Boogie.Type elType = translator.TrType(elmtType);
-              Boogie.Type dType = translator.TrType(domainType);
-              Boogie.Expr e0 = e.E0 == null ? null : TrExpr(e.E0);
-              if (e0 != null && e.E0.Type.IsBitVectorType) {
-                e0 = translator.ConvertExpression(GetToken(e.E0), e0, e.E0.Type, Type.Int);
-              }
-              Boogie.Expr e1 = e.E1 == null ? null : TrExpr(e.E1);
-              if (e1 != null && e.E1.Type.IsBitVectorType) {
-                e1 = translator.ConvertExpression(GetToken(e.E1), e1, e.E1.Type, Type.Int);
-              }
-              if (e.SelectOne) {
-                Contract.Assert(e1 == null);
-                Boogie.Expr x;
-                if (seqType.IsArrayType) {
-                  Boogie.Expr fieldName = translator.FunctionCall(GetToken(selectExpr), BuiltinFunction.IndexField, null, e0);
-                  x = ReadHeap(GetToken(selectExpr), HeapExpr, TrExpr(e.Seq), fieldName);
-                } else if (seqType is SeqType) {
-                  x = translator.FunctionCall(GetToken(selectExpr), BuiltinFunction.SeqIndex, predef.BoxType, seq, e0);
-                } else if (seqType is MapType) {
-                  bool finite = ((MapType)seqType).Finite;
-                  var f = finite ? BuiltinFunction.MapElements : BuiltinFunction.IMapElements;
-                  x = translator.FunctionCall(GetToken(selectExpr), f, predef.MapType(GetToken(e), finite, predef.BoxType, predef.BoxType), seq);
-                  x = Boogie.Expr.Select(x, BoxIfNecessary(GetToken(e), e0, domainType));
-                } else if (seqType is MultiSetType) {
-                  x = Boogie.Expr.SelectTok(GetToken(selectExpr), TrExpr(e.Seq), BoxIfNecessary(GetToken(selectExpr), e0, domainType));
-                } else { Contract.Assert(false); x = null; }
-                if (!ModeledAsBoxType(elmtType) && !(seqType is MultiSetType)) {
-                  x = translator.FunctionCall(GetToken(selectExpr), BuiltinFunction.Unbox, elType, x);
-                }
-                return x;
-              } else {
-                if (seqType.IsArrayType) {
-                  seq = translator.FunctionCall(GetToken(selectExpr), BuiltinFunction.SeqFromArray, elType, HeapExpr, seq);
-                }
-                var isLit = translator.IsLit(seq);
-                if (e1 != null) {
-                  isLit = isLit && translator.IsLit(e1);
-                  seq = translator.FunctionCall(GetToken(selectExpr), BuiltinFunction.SeqTake, elType, seq, e1);
-                }
-                if (e0 != null) {
-                  isLit = isLit && translator.IsLit(e0);
-                  seq = translator.FunctionCall(GetToken(selectExpr), BuiltinFunction.SeqDrop, elType, seq, e0);
-                }
-                // if e0 == null && e1 == null, then we have the identity operation seq[..] == seq;
-                if (isLit && (e0 != null || e1 != null)) {
-                  // Lit-lift the expression
-                  seq = MaybeLit(seq, translator.TrType(selectExpr.Type));
-                }
-                return seq;
-              }
-            }
-          case SeqUpdateExpr updateExpr: {
-              SeqUpdateExpr e = updateExpr;
-              Boogie.Expr seq = TrExpr(e.Seq);
-              var seqType = e.Seq.Type.NormalizeExpand();
-              if (seqType is SeqType) {
-                Boogie.Expr index = TrExpr(e.Index);
-                index = translator.ConvertExpression(GetToken(e.Index), index, e.Index.Type, Type.Int);
-                Boogie.Expr val = BoxIfNecessary(GetToken(updateExpr), TrExpr(e.Value), e.Value.Type);
-                return translator.FunctionCall(GetToken(updateExpr), BuiltinFunction.SeqUpdate, predef.BoxType, seq, index, val);
-              } else if (seqType is MapType) {
-                MapType mt = (MapType)seqType;
-                Boogie.Type maptype = predef.MapType(GetToken(updateExpr), mt.Finite, predef.BoxType, predef.BoxType);
-                Boogie.Expr index = BoxIfNecessary(GetToken(updateExpr), TrExpr(e.Index), mt.Domain);
-                Boogie.Expr val = BoxIfNecessary(GetToken(updateExpr), TrExpr(e.Value), mt.Range);
-                return FunctionCall(GetToken(updateExpr), mt.Finite ? "Map#Build" : "IMap#Build", maptype, seq, index, val);
-              } else if (seqType is MultiSetType) {
-                Type elmtType = cce.NonNull((MultiSetType)seqType).Arg;
-                Boogie.Expr index = BoxIfNecessary(GetToken(updateExpr), TrExpr(e.Index), elmtType);
-                Boogie.Expr val = TrExpr(e.Value);
-                return Boogie.Expr.StoreTok(GetToken(updateExpr), seq, index, val);
-              } else {
-                Contract.Assert(false);
-                throw new cce.UnreachableException();
-              }
-            }
-          case MultiSelectExpr selectExpr: {
-              MultiSelectExpr e = selectExpr;
-              Type elmtType = UserDefinedType.ArrayElementType(e.Array.Type); ;
-              Boogie.Type elType = translator.TrType(elmtType);
-
-              Boogie.Expr fieldName = GetArrayIndexFieldName(GetToken(selectExpr), e.Indices);
-              Boogie.Expr x = ReadHeap(GetToken(selectExpr), HeapExpr, TrExpr(e.Array), fieldName);
-              if (!ModeledAsBoxType(elmtType)) {
-                x = translator.FunctionCall(GetToken(selectExpr), BuiltinFunction.Unbox, elType, x);
-              }
-              return x;
-            }
-          case ApplyExpr applyExpr: {
-              ApplyExpr e = applyExpr;
-              int arity = e.Args.Count;
-              var tt = e.Function.Type.AsArrowType;
-              Contract.Assert(tt != null);
-              Contract.Assert(tt.Arity == arity);
-
-              {
-                // optimisation: if this could have just as well been a FunctionCallExpr, call it as such!
-                var con = e.Function as ConcreteSyntaxExpression;
-                var recv = con == null ? e.Function : con.Resolved;
-                var mem = recv as MemberSelectExpr;
-                var fn = mem == null ? null : mem.Member as Function;
-                if (fn != null) {
-                  return TrExpr(new FunctionCallExpr(e.tok, fn.Name, mem.Obj, e.tok, e.CloseParen, e.Args) {
-                    Function = fn,
-                    Type = e.Type,
-                    TypeApplication_AtEnclosingClass = mem.TypeApplication_AtEnclosingClass,
-                    TypeApplication_JustFunction = mem.TypeApplication_JustMember
-                  });
-                }
-              }
-
-              Func<Expression, Boogie.Expr> TrArg = arg => translator.BoxIfUnboxed(TrExpr(arg), arg.Type);
-
-              var applied = FunctionCall(GetToken(applyExpr), Translator.Apply(arity), predef.BoxType,
-                Concat(Map(tt.TypeArgs, translator.TypeToTy),
-                  Cons(HeapExpr, Cons(TrExpr(e.Function), e.Args.ConvertAll(arg => TrArg(arg))))));
-
-              return translator.UnboxIfBoxed(applied, tt.Result);
-            }
-          case FunctionCallExpr callExpr: {
-              FunctionCallExpr e = callExpr;
-              if (e.Function is SpecialFunction) {
-                return TrExprSpecialFunctionCall(e);
-              } else {
-                Boogie.Expr layerArgument;
-                Boogie.Expr revealArgument;
-                var etran = this;
-                if (e.Function.ContainsQuantifier && translator.stmtContext == StmtType.ASSUME && translator.adjustFuelForExists) {
-                  // we need to increase fuel functions that contain quantifier expr in the assume context.
-                  etran = etran.LayerOffset(1);
-                  translator.adjustFuelForExists = false;
-                }
-                if (e.Function.IsFuelAware()) {
-                  Statistics_CustomLayerFunctionCount++;
-                  ModuleDefinition module = e.Function.EnclosingClass.EnclosingModuleDefinition;
-                  if (etran.applyLimited_CurrentFunction != null &&
-                      etran.layerIntraCluster != null &&
-                      ModuleDefinition.InSameSCC(e.Function, applyLimited_CurrentFunction)) {
-                    layerArgument = etran.layerIntraCluster.GetFunctionFuel(e.Function);
-                  } else {
-                    layerArgument = etran.layerInterCluster.GetFunctionFuel(e.Function);
-                  }
-                } else {
-                  layerArgument = null;
-                }
-
-                if (e.Function.IsOpaque) {
-                  revealArgument = translator.GetRevealConstant(e.Function);
-                } else {
-                  revealArgument = null;
-                }
-
-                var ty = translator.TrType(e.Type);
-                var id = new Boogie.IdentifierExpr(GetToken(e), e.Function.FullSanitizedName, ty);
-
-                var args = FunctionInvocationArguments(e, layerArgument, revealArgument, false, out var argsAreLit);
-                Expr result = new Boogie.NAryExpr(GetToken(e), new Boogie.FunctionCall(id), args);
-                result = translator.CondApplyUnbox(GetToken(e), result, e.Function.ResultType, e.Type);
-
-                bool callIsLit = argsAreLit
-                                 && Translator.FunctionBodyIsAvailable(e.Function, translator.currentModule, translator.currentScope, true)
-                                 && !e.Function.Reads.Any(); // Function could depend on external values
-                if (callIsLit) {
-                  result = MaybeLit(result, ty);
-                }
-
-                return result;
-              }
-            }
-          case DatatypeValue value: {
-              DatatypeValue dtv = value;
-              Contract.Assert(dtv.Ctor != null);  // since dtv has been successfully resolved
-              List<Boogie.Expr> args = new List<Boogie.Expr>();
-
-              bool argsAreLit = true;
-              for (int i = 0; i < dtv.Arguments.Count; i++) {
-                Expression arg = dtv.Arguments[i];
-                Type t = dtv.Ctor.Formals[i].Type;
-                var bArg = TrExpr(arg);
-                argsAreLit = argsAreLit && translator.IsLit(bArg);
-                args.Add(translator.CondApplyBox(GetToken(value), bArg, cce.NonNull(arg.Type), t));
-              }
-              Boogie.IdentifierExpr id = new Boogie.IdentifierExpr(GetToken(dtv), dtv.Ctor.FullName, predef.DatatypeType);
-              Boogie.Expr ret = new Boogie.NAryExpr(GetToken(dtv), new Boogie.FunctionCall(id), args);
-              if (argsAreLit) {
-                // If all arguments are Lit, so is the whole expression
-                ret = MaybeLit(ret, predef.DatatypeType);
-              }
-              return ret;
-            }
-          case SeqConstructionExpr constructionExpr: {
-              var e = constructionExpr;
-              var eType = e.Type.AsSeqType.Arg.NormalizeExpand();
-              return FunctionCall(GetToken(constructionExpr), "Seq#Create", predef.SeqType(GetToken(e), predef.BoxType), translator.TypeToTy(eType), HeapExpr, TrExpr(e.N), TrExpr(e.Initializer));
-            }
-          case MultiSetFormingExpr formingExpr: {
-              MultiSetFormingExpr e = formingExpr;
-              var eType = e.E.Type.NormalizeExpand();
-              if (eType is SetType) {
-                return translator.FunctionCall(GetToken(formingExpr), BuiltinFunction.MultiSetFromSet, translator.TrType(cce.NonNull((SetType)eType).Arg), TrExpr(e.E));
-              } else if (eType is SeqType) {
-                return translator.FunctionCall(GetToken(formingExpr), BuiltinFunction.MultiSetFromSeq, translator.TrType(cce.NonNull((SeqType)eType).Arg), TrExpr(e.E));
-              } else {
-                Contract.Assert(false); throw new cce.UnreachableException();
-              }
-            }
-          case OldExpr oldExpr: {
-              var e = oldExpr;
-              return OldAt(e.AtLabel).TrExpr(e.E);
-            }
-          case UnchangedExpr unchangedExpr: {
-              var e = unchangedExpr;
-              return translator.FrameCondition(GetToken(e), e.Frame, false, FrameExpressionUse.Unchanged, OldAt(e.AtLabel), this, this, true);
-            }
-          case UnaryOpExpr opExpr: {
-              var e = opExpr;
-              Boogie.Expr arg = TrExpr(e.E);
-              switch (e.ResolvedOp) {
-                case UnaryOpExpr.ResolvedOpcode.Lit:
-                  return MaybeLit(arg);
-                case UnaryOpExpr.ResolvedOpcode.BVNot:
-                  var bvWidth = opExpr.Type.AsBitVectorType.Width;
-                  var bvType = translator.BplBvType(bvWidth);
-                  Boogie.Expr r = FunctionCall(GetToken(opExpr), "not_bv" + bvWidth, bvType, arg);
-                  if (translator.IsLit(arg)) {
-                    r = MaybeLit(r, bvType);
-                  }
-                  return r;
-                case UnaryOpExpr.ResolvedOpcode.BoolNot:
-                  return Boogie.Expr.Unary(GetToken(opExpr), UnaryOperator.Opcode.Not, arg);
-                case UnaryOpExpr.ResolvedOpcode.SeqLength:
-                  Contract.Assert(e.E.Type.NormalizeExpand() is SeqType);
-                  return translator.FunctionCall(GetToken(opExpr), BuiltinFunction.SeqLength, null, arg);
-                case UnaryOpExpr.ResolvedOpcode.SetCard:
-                  Contract.Assert(e.E.Type.NormalizeExpand() is SetType { Finite: true });
-                  return translator.FunctionCall(GetToken(opExpr), BuiltinFunction.SetCard, null, arg);
-                case UnaryOpExpr.ResolvedOpcode.MultiSetCard:
-                  Contract.Assert(e.E.Type.NormalizeExpand() is MultiSetType);
-                  return translator.FunctionCall(GetToken(opExpr), BuiltinFunction.MultiSetCard, null, arg);
-                case UnaryOpExpr.ResolvedOpcode.MapCard:
-                  Contract.Assert(e.E.Type.NormalizeExpand() is MapType { Finite: true });
-                  return translator.FunctionCall(GetToken(opExpr), BuiltinFunction.MapCard, null, arg);
-                case UnaryOpExpr.ResolvedOpcode.Fresh:
-                  var freshLabel = ((FreshExpr)e).AtLabel;
-                  var eeType = e.E.Type.NormalizeExpand();
-                  if (eeType is SetType) {
-                    // generate:  (forall $o: ref :: { X[Box($o)] } X[Box($o)] ==> $o != null && !old($Heap)[$o,alloc])
-                    // OR, if X[Box($o)] is rewritten into smaller parts, use the less good trigger old($Heap)[$o,alloc]
-                    Boogie.Variable oVar = new Boogie.BoundVariable(GetToken(opExpr), new Boogie.TypedIdent(GetToken(opExpr), "$o", predef.RefType));
-                    Boogie.Expr o = new Boogie.IdentifierExpr(GetToken(opExpr), oVar);
-                    Boogie.Expr oNotNull = Boogie.Expr.Neq(o, predef.Null);
-                    Boogie.Expr oInSet = TrInSet(GetToken(opExpr), o, e.E, ((SetType)eeType).Arg, true, out var performedInSetRewrite);
-                    Boogie.Expr oNotFresh = OldAt(freshLabel).IsAlloced(GetToken(opExpr), o);
-                    Boogie.Expr oIsFresh = Boogie.Expr.Not(oNotFresh);
-                    Boogie.Expr body = Boogie.Expr.Imp(oInSet, Boogie.Expr.And(oNotNull, oIsFresh));
-                    var trigger = BplTrigger(performedInSetRewrite ? oNotFresh : oInSet);
-                    return new Boogie.ForallExpr(GetToken(opExpr), new List<Variable> { oVar }, trigger, body);
-                  } else if (eeType is SeqType) {
-                    // generate:  (forall $i: int :: 0 <= $i && $i < Seq#Length(X) ==> Unbox(Seq#Index(X,$i)) != null && !old($Heap)[Unbox(Seq#Index(X,$i)),alloc])
-                    Boogie.Variable iVar = new Boogie.BoundVariable(GetToken(opExpr), new Boogie.TypedIdent(GetToken(opExpr), "$i", Boogie.Type.Int));
-                    Boogie.Expr i = new Boogie.IdentifierExpr(GetToken(opExpr), iVar);
-                    Boogie.Expr iBounds = translator.InSeqRange(GetToken(opExpr), i, Type.Int, TrExpr(e.E), true, null, false);
-                    Boogie.Expr XsubI = translator.FunctionCall(GetToken(opExpr), BuiltinFunction.SeqIndex, predef.RefType, TrExpr(e.E), i);
-                    XsubI = translator.FunctionCall(GetToken(opExpr), BuiltinFunction.Unbox, predef.RefType, XsubI);
-                    Boogie.Expr oNotFresh = OldAt(freshLabel).IsAlloced(GetToken(opExpr), XsubI);
-                    Boogie.Expr oIsFresh = Boogie.Expr.Not(oNotFresh);
-                    Boogie.Expr xsubiNotNull = Boogie.Expr.Neq(XsubI, predef.Null);
-                    Boogie.Expr body = Boogie.Expr.Imp(iBounds, Boogie.Expr.And(xsubiNotNull, oIsFresh));
-                    //TRIGGERS: Does this make sense? dafny0\SmallTests
-                    // BROKEN // NEW_TRIGGER
-                    //TRIG (forall $i: int :: 0 <= $i && $i < Seq#Length(Q#0) && $Unbox(Seq#Index(Q#0, $i)): ref != null ==> !read(old($Heap), $Unbox(Seq#Index(Q#0, $i)): ref, alloc))
-                    return new Boogie.ForallExpr(GetToken(opExpr), new List<Variable> { iVar }, body);
-                  } else {
-                    // generate:  x != null && !old($Heap)[x]
-                    Boogie.Expr oNull = Boogie.Expr.Neq(TrExpr(e.E), predef.Null);
-                    Boogie.Expr oIsFresh = Boogie.Expr.Not(OldAt(freshLabel).IsAlloced(GetToken(opExpr), TrExpr(e.E)));
-                    return Boogie.Expr.Binary(GetToken(opExpr), BinaryOperator.Opcode.And, oNull, oIsFresh);
-                  }
-                case UnaryOpExpr.ResolvedOpcode.Allocated:
-                  // Translate with $IsAllocBox, even if it requires boxing the argument. This has the effect of giving
-                  // both the $IsAllocBox and $IsAlloc forms, because the axioms that connects these two is triggered
-                  // by $IsAllocBox.
-                  return translator.MkIsAllocBox(BoxIfNecessary(e.E.tok, TrExpr(e.E), e.E.Type), e.E.Type, HeapExpr);
-                default:
-                  Contract.Assert(false); throw new cce.UnreachableException();  // unexpected unary expression
-              }
-            }
-          case ConversionExpr conversionExpr: {
-              var e = conversionExpr;
-              return translator.ConvertExpression(GetToken(e), TrExpr(e.E), e.E.Type, e.ToType);
-            }
-          case TypeTestExpr testExpr: {
-              var e = testExpr;
-              return translator.GetSubrangeCheck(TrExpr(e.E), e.E.Type, e.ToType, out var _) ?? Boogie.Expr.True;
-            }
-          case BinaryExpr binaryExpr: {
-              BinaryExpr e = binaryExpr;
-              bool isReal = e.E0.Type.IsNumericBased(Type.NumericPersuasion.Real);
-              int bvWidth = e.E0.Type.IsBitVectorType ? e.E0.Type.AsBitVectorType.Width : -1;  // -1 indicates "not a bitvector type"
-              Boogie.Expr e0 = TrExpr(e.E0);
-              if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.InSet) {
-                return TrInSet(GetToken(binaryExpr), e0, e.E1, cce.NonNull(e.E0.Type), false, out var pr);  // let TrInSet translate e.E1
-              } else if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.NotInSet) {
-                Boogie.Expr arg = TrInSet(GetToken(binaryExpr), e0, e.E1, cce.NonNull(e.E0.Type), false, out var pr);  // let TrInSet translate e.E1
-                return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, arg);
-              } else if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.InMultiSet) {
-                return TrInMultiSet(GetToken(binaryExpr), e0, e.E1, cce.NonNull(e.E0.Type), false); // let TrInMultiSet translate e.E1
-              } else if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.NotInMultiSet) {
-                Boogie.Expr arg = TrInMultiSet(GetToken(binaryExpr), e0, e.E1, cce.NonNull(e.E0.Type), false);  // let TrInMultiSet translate e.E1
-                return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, arg);
-              }
-              Boogie.Expr e1 = TrExpr(e.E1);
-              BinaryOperator.Opcode bOpcode;
-              Boogie.Type typ;
-              var oe0 = e0;
-              var oe1 = e1;
-              var lit0 = Translator.GetLit(e0);
-              var lit1 = Translator.GetLit(e1);
-              bool liftLit = translator.IsLit(e0) && translator.IsLit(e1);
-              // NOTE(namin): We usually avoid keeping literals, because their presence might mess up triggers that do not expect them.
-              //              Still for equality-related operations, it's useful to keep them instead of lifting them, so that they can be propagated.
-              bool keepLits = false;
-              if (lit0 != null) {
-                e0 = lit0;
-              }
-              if (lit1 != null) {
-                e1 = lit1;
-              }
-              switch (e.ResolvedOp) {
-                case BinaryExpr.ResolvedOpcode.Iff:
-                  typ = Boogie.Type.Bool;
-                  bOpcode = BinaryOperator.Opcode.Iff; break;
-                case BinaryExpr.ResolvedOpcode.Imp:
-                  typ = Boogie.Type.Bool;
-                  bOpcode = BinaryOperator.Opcode.Imp; break;
-                case BinaryExpr.ResolvedOpcode.And:
-                  typ = Boogie.Type.Bool;
-                  bOpcode = BinaryOperator.Opcode.And; break;
-                case BinaryExpr.ResolvedOpcode.Or:
-                  typ = Boogie.Type.Bool;
-                  bOpcode = BinaryOperator.Opcode.Or; break;
-
-                case BinaryExpr.ResolvedOpcode.EqCommon:
-                  keepLits = true;
-                  if (ModeledAsBoxType(e.E0.Type)) {
-                    e1 = BoxIfNecessary(expr.tok, e1, e.E1.Type);
-                    oe1 = BoxIfNecessary(expr.tok, oe1, e.E1.Type);
-                  } else if (ModeledAsBoxType(e.E1.Type)) {
-                    e0 = BoxIfNecessary(expr.tok, e0, e.E0.Type);
-                    oe0 = BoxIfNecessary(expr.tok, oe0, e.E0.Type);
-                  }
-                  var cot = e.E0.Type.AsCoDatatype;
-                  if (cot != null) {
-                    var e0args = e.E0.Type.NormalizeExpand().TypeArgs;
-                    var e1args = e.E1.Type.NormalizeExpand().TypeArgs;
-                    return translator.CoEqualCall(cot, e0args, e1args, null, this.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH), e0, e1, GetToken(binaryExpr));
-                  }
-                  if (e.E0.Type.IsIndDatatype) {
-                    return translator.TypeSpecificEqual(GetToken(binaryExpr), e.E0.Type, e0, e1);
-                  }
-                  typ = Boogie.Type.Bool;
-                  bOpcode = BinaryOperator.Opcode.Eq; break;
-                case BinaryExpr.ResolvedOpcode.NeqCommon:
-                  if (ModeledAsBoxType(e.E0.Type)) {
-                    e1 = BoxIfNecessary(expr.tok, e1, e.E1.Type);
-                    oe1 = BoxIfNecessary(expr.tok, oe1, e.E1.Type);
-                  } else if (ModeledAsBoxType(e.E1.Type)) {
-                    e0 = BoxIfNecessary(expr.tok, e0, e.E0.Type);
-                    oe0 = BoxIfNecessary(expr.tok, oe0, e.E0.Type);
-                  }
-                  var cotx = e.E0.Type.AsCoDatatype;
-                  if (cotx != null) {
-                    var e0args = e.E0.Type.NormalizeExpand().TypeArgs;
-                    var e1args = e.E1.Type.NormalizeExpand().TypeArgs;
-                    var eq = translator.CoEqualCall(cotx, e0args, e1args, null, this.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH), e0, e1, GetToken(binaryExpr));
-                    return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, eq);
-                  }
-                  if (e.E0.Type.IsIndDatatype) {
-                    var eq = translator.TypeSpecificEqual(GetToken(binaryExpr), e.E0.Type, e0, e1);
-                    return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, eq);
-                  }
-                  typ = Boogie.Type.Bool;
-                  bOpcode = BinaryOperator.Opcode.Neq; break;
-                case BinaryExpr.ResolvedOpcode.Lt:
-                  if (0 <= bvWidth) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "lt_bv" + bvWidth, Boogie.Type.Bool, e0, e1, liftLit);
-                  } else if (e.E0.Type.IsBigOrdinalType) {
-                    return FunctionCall(GetToken(binaryExpr), "ORD#Less", Boogie.Type.Bool, e0, e1);
-                  } else if (isReal || !options.DisableNLarith) {
-                    typ = Boogie.Type.Bool;
-                    bOpcode = BinaryOperator.Opcode.Lt;
-                    break;
-                  } else {
-                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_lt_boogie", Boogie.Type.Bool, e0, e1, liftLit);
-                  }
-                case BinaryExpr.ResolvedOpcode.LessThanLimit:
-                  return FunctionCall(GetToken(binaryExpr), "ORD#LessThanLimit", Boogie.Type.Bool, e0, e1);
-                case BinaryExpr.ResolvedOpcode.Le:
-                  keepLits = true;
-                  if (0 <= bvWidth) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "le_bv" + bvWidth, Boogie.Type.Bool, e0, e1, false);
-                  } else if (e.E0.Type.IsBigOrdinalType) {
-                    var less = FunctionCall(GetToken(binaryExpr), "ORD#Less", Boogie.Type.Bool, e0, e1);
-                    var eq = Boogie.Expr.Eq(e0, e1);
-                    return BplOr(eq, less);
-                  } else if (isReal || !options.DisableNLarith) {
-                    typ = Boogie.Type.Bool;
-                    bOpcode = BinaryOperator.Opcode.Le;
-                    break;
-                  } else {
-                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_le_boogie", Boogie.Type.Bool, e0, e1, false);
-                  }
-                case BinaryExpr.ResolvedOpcode.Ge:
-                  keepLits = true;
-                  if (0 <= bvWidth) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "ge_bv" + bvWidth, Boogie.Type.Bool, e0, e1, false);
-                  } else if (e.E0.Type.IsBigOrdinalType) {
-                    var less = FunctionCall(GetToken(binaryExpr), "ORD#Less", Boogie.Type.Bool, e1, e0);
-                    var eq = Boogie.Expr.Eq(e1, e0);
-                    return BplOr(eq, less);
-                  } else if (isReal || !options.DisableNLarith) {
-                    typ = Boogie.Type.Bool;
-                    bOpcode = BinaryOperator.Opcode.Ge;
-                    break;
-                  } else {
-                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_ge_boogie", Boogie.Type.Bool, e0, e1, false);
-                  }
-                case BinaryExpr.ResolvedOpcode.Gt:
-                  if (0 <= bvWidth) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "gt_bv" + bvWidth, Boogie.Type.Bool, e0, e1, liftLit);
-                  } else if (e.E0.Type.IsBigOrdinalType) {
-                    return FunctionCall(GetToken(binaryExpr), "ORD#Less", Boogie.Type.Bool, e1, e0);
-                  } else if (isReal || !options.DisableNLarith) {
-                    typ = Boogie.Type.Bool;
-                    bOpcode = BinaryOperator.Opcode.Gt;
-                    break;
-                  } else {
-                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_gt_boogie", Boogie.Type.Bool, e0, e1, liftLit);
-                  }
-
-                case BinaryExpr.ResolvedOpcode.Add:
-                  if (0 <= bvWidth) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "add_bv" + bvWidth, translator.BplBvType(bvWidth), e0, e1, liftLit);
-                  } else if (e.E0.Type.IsBigOrdinalType) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "ORD#Plus", predef.BigOrdinalType, e0, e1, liftLit);
-                  } else if (e.E0.Type.IsCharType) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "char#Plus", predef.CharType, e0, e1, liftLit);
-                  } else if (!isReal && options.DisableNLarith) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_add_boogie", Boogie.Type.Int, e0, e1, liftLit);
-                  } else if (!isReal && (options.ArithMode == 2 || 5 <= options.ArithMode)) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "Add", Boogie.Type.Int, oe0, oe1, liftLit);
-                  } else {
-                    typ = isReal ? Boogie.Type.Real : Boogie.Type.Int;
-                    bOpcode = BinaryOperator.Opcode.Add;
-                    break;
-                  }
-                case BinaryExpr.ResolvedOpcode.Sub:
-                  if (0 <= bvWidth) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "sub_bv" + bvWidth, translator.BplBvType(bvWidth), e0, e1, liftLit);
-                  } else if (e.E0.Type.IsBigOrdinalType) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "ORD#Minus", predef.BigOrdinalType, e0, e1, liftLit);
-                  } else if (e.E0.Type.IsCharType) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "char#Minus", predef.CharType, e0, e1, liftLit);
-                  } else if (!isReal && options.DisableNLarith) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_sub_boogie", Boogie.Type.Int, e0, e1, liftLit);
-                  } else if (!isReal && (options.ArithMode == 2 || 5 <= options.ArithMode)) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "Sub", Boogie.Type.Int, oe0, oe1, liftLit);
-                  } else {
-                    typ = isReal ? Boogie.Type.Real : Boogie.Type.Int;
-                    bOpcode = BinaryOperator.Opcode.Sub;
-                    break;
-                  }
-                case BinaryExpr.ResolvedOpcode.Mul:
-                  if (0 <= bvWidth) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "mul_bv" + bvWidth, translator.BplBvType(bvWidth), e0, e1, liftLit);
-                  } else if (!isReal && options.DisableNLarith) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_mul_boogie", Boogie.Type.Int, e0, e1, liftLit);
-                  } else if (!isReal && options.ArithMode != 0 && options.ArithMode != 3) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "Mul", Boogie.Type.Int, oe0, oe1, liftLit);
-                  } else {
-                    typ = isReal ? Boogie.Type.Real : Boogie.Type.Int;
-                    bOpcode = BinaryOperator.Opcode.Mul;
-                    break;
-                  }
-                case BinaryExpr.ResolvedOpcode.Div:
-                  if (0 <= bvWidth) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "div_bv" + bvWidth, translator.BplBvType(bvWidth), e0, e1, liftLit);
-                  } else if (!isReal && options.DisableNLarith && !isReal) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_div_boogie", Boogie.Type.Int, e0, e1, liftLit);
-                  } else if (!isReal && options.ArithMode != 0 && options.ArithMode != 3) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "Div", Boogie.Type.Int, e0, oe1, liftLit);
-                  } else if (isReal) {
-                    typ = Boogie.Type.Real;
-                    bOpcode = BinaryOperator.Opcode.RealDiv;
-                    break;
-                  } else {
-                    typ = Boogie.Type.Int;
-                    bOpcode = BinaryOperator.Opcode.Div;
-                    break;
-                  }
-                case BinaryExpr.ResolvedOpcode.Mod:
-                  if (0 <= bvWidth) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "mod_bv" + bvWidth, translator.BplBvType(bvWidth), e0, e1, liftLit);
-                  } else if (options.DisableNLarith && !isReal) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "INTERNAL_mod_boogie", Boogie.Type.Int, e0, e1, liftLit);
-                  } else if (!isReal && options.ArithMode != 0 && options.ArithMode != 3) {
-                    return TrToFunctionCall(GetToken(binaryExpr), "Mod", Boogie.Type.Int, e0, oe1, liftLit);
-                  } else {
-                    typ = isReal ? Boogie.Type.Real : Boogie.Type.Int;
-                    bOpcode = BinaryOperator.Opcode.Mod;
-                    break;
-                  }
-
-                case BinaryExpr.ResolvedOpcode.LeftShift: {
-                    Contract.Assert(0 <= bvWidth);
-                    return TrToFunctionCall(GetToken(binaryExpr), "LeftShift_bv" + bvWidth, translator.BplBvType(bvWidth), e0, translator.ConvertExpression(GetToken(binaryExpr), e1, e.E1.Type, e.Type), liftLit);
-                  }
-                case BinaryExpr.ResolvedOpcode.RightShift: {
-                    Contract.Assert(0 <= bvWidth);
-                    return TrToFunctionCall(GetToken(binaryExpr), "RightShift_bv" + bvWidth, translator.BplBvType(bvWidth), e0, translator.ConvertExpression(GetToken(binaryExpr), e1, e.E1.Type, e.Type), liftLit);
-                  }
-                case BinaryExpr.ResolvedOpcode.BitwiseAnd: {
-                    Contract.Assert(0 <= bvWidth);
-                    return TrToFunctionCall(GetToken(binaryExpr), "and_bv" + bvWidth, translator.BplBvType(bvWidth), e0, e1, liftLit);
-                  }
-                case BinaryExpr.ResolvedOpcode.BitwiseOr: {
-                    Contract.Assert(0 <= bvWidth);
-                    return TrToFunctionCall(GetToken(binaryExpr), "or_bv" + bvWidth, translator.BplBvType(bvWidth), e0, e1, liftLit);
-                  }
-                case BinaryExpr.ResolvedOpcode.BitwiseXor: {
-                    Contract.Assert(0 <= bvWidth);
-                    return TrToFunctionCall(GetToken(binaryExpr), "xor_bv" + bvWidth, translator.BplBvType(bvWidth), e0, e1, liftLit);
-                  }
-
-                case BinaryExpr.ResolvedOpcode.LtChar:
-                case BinaryExpr.ResolvedOpcode.LeChar:
-                case BinaryExpr.ResolvedOpcode.GeChar:
-                case BinaryExpr.ResolvedOpcode.GtChar: {
-                    // work off the original operands (that is, allow them to be lit-wrapped)
-                    var operand0 = translator.FunctionCall(e0.tok, BuiltinFunction.CharToInt, null, oe0);
-                    var operand1 = translator.FunctionCall(e0.tok, BuiltinFunction.CharToInt, null, oe1);
-                    BinaryOperator.Opcode bOp;
-                    switch (e.ResolvedOp) {
-                      case BinaryExpr.ResolvedOpcode.LtChar: bOp = BinaryOperator.Opcode.Lt; break;
-                      case BinaryExpr.ResolvedOpcode.LeChar: bOp = BinaryOperator.Opcode.Le; break;
-                      case BinaryExpr.ResolvedOpcode.GeChar: bOp = BinaryOperator.Opcode.Ge; break;
-                      case BinaryExpr.ResolvedOpcode.GtChar: bOp = BinaryOperator.Opcode.Gt; break;
-                      default:
-                        Contract.Assert(false);  // unexpected case
-                        throw new cce.UnreachableException();  // to please compiler
-                    }
-                    return Boogie.Expr.Binary(GetToken(binaryExpr), bOp, operand0, operand1);
-                  }
-
-                case BinaryExpr.ResolvedOpcode.SetEq:
-                case BinaryExpr.ResolvedOpcode.MultiSetEq:
-                case BinaryExpr.ResolvedOpcode.SeqEq:
-                case BinaryExpr.ResolvedOpcode.MapEq:
-                  return translator.TypeSpecificEqual(GetToken(binaryExpr), e.E0.Type, e0, e1);
-                case BinaryExpr.ResolvedOpcode.SetNeq:
-                case BinaryExpr.ResolvedOpcode.MultiSetNeq:
-                case BinaryExpr.ResolvedOpcode.SeqNeq:
-                case BinaryExpr.ResolvedOpcode.MapNeq:
-                  return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, translator.TypeSpecificEqual(GetToken(binaryExpr), e.E0.Type, e0, e1));
-
-                case BinaryExpr.ResolvedOpcode.ProperSubset: {
-                    return translator.ProperSubset(GetToken(binaryExpr), e0, e1);
-                  }
-                case BinaryExpr.ResolvedOpcode.Subset: {
-                    bool finite = e.E1.Type.AsSetType.Finite;
-                    var f = finite ? BuiltinFunction.SetSubset : BuiltinFunction.ISetSubset;
-                    return translator.FunctionCall(GetToken(binaryExpr), f, null, e0, e1);
-                  }
-                case BinaryExpr.ResolvedOpcode.Superset: {
-                    bool finite = e.E1.Type.AsSetType.Finite;
-                    var f = finite ? BuiltinFunction.SetSubset : BuiltinFunction.ISetSubset;
-                    return translator.FunctionCall(GetToken(binaryExpr), f, null, e1, e0);
-                  }
-                case BinaryExpr.ResolvedOpcode.ProperSuperset:
-                  return translator.ProperSubset(GetToken(binaryExpr), e1, e0);
-                case BinaryExpr.ResolvedOpcode.Disjoint: {
-                    bool finite = e.E1.Type.AsSetType.Finite;
-                    var f = finite ? BuiltinFunction.SetDisjoint : BuiltinFunction.ISetDisjoint;
-                    return translator.FunctionCall(GetToken(binaryExpr), f, null, e0, e1);
-                  }
-                case BinaryExpr.ResolvedOpcode.InSet:
-                  Contract.Assert(false); throw new cce.UnreachableException();  // this case handled above
-                case BinaryExpr.ResolvedOpcode.NotInSet:
-                  Contract.Assert(false); throw new cce.UnreachableException();  // this case handled above
-                case BinaryExpr.ResolvedOpcode.Union: {
-                    bool finite = e.E1.Type.AsSetType.Finite;
-                    var f = finite ? BuiltinFunction.SetUnion : BuiltinFunction.ISetUnion;
-                    return translator.FunctionCall(GetToken(binaryExpr), f, translator.TrType(binaryExpr.Type.AsSetType.Arg), e0, e1);
-                  }
-                case BinaryExpr.ResolvedOpcode.Intersection: {
-                    bool finite = e.E1.Type.AsSetType.Finite;
-                    var f = finite ? BuiltinFunction.SetIntersection : BuiltinFunction.ISetIntersection;
-                    return translator.FunctionCall(GetToken(binaryExpr), f, translator.TrType(binaryExpr.Type.AsSetType.Arg), e0, e1);
-                  }
-                case BinaryExpr.ResolvedOpcode.SetDifference: {
-                    bool finite = e.E1.Type.AsSetType.Finite;
-                    var f = finite ? BuiltinFunction.SetDifference : BuiltinFunction.ISetDifference;
-                    return translator.FunctionCall(GetToken(binaryExpr), f, translator.TrType(binaryExpr.Type.AsSetType.Arg), e0, e1);
-                  }
-                case BinaryExpr.ResolvedOpcode.ProperMultiSubset:
-                  return translator.ProperMultiset(GetToken(binaryExpr), e0, e1);
-                case BinaryExpr.ResolvedOpcode.MultiSubset:
-                  return translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetSubset, null, e0, e1);
-                case BinaryExpr.ResolvedOpcode.MultiSuperset:
-                  return translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetSubset, null, e1, e0);
-                case BinaryExpr.ResolvedOpcode.ProperMultiSuperset:
-                  return translator.ProperMultiset(GetToken(binaryExpr), e1, e0);
-                case BinaryExpr.ResolvedOpcode.MultiSetDisjoint:
-                  return translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetDisjoint, null, e0, e1);
-                case BinaryExpr.ResolvedOpcode.InMultiSet:
-                  Contract.Assert(false); throw new cce.UnreachableException();  // this case handled above
-                case BinaryExpr.ResolvedOpcode.NotInMultiSet:
-                  Contract.Assert(false); throw new cce.UnreachableException();  // this case handled above
-                case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-                  return translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetUnion, translator.TrType(binaryExpr.Type.AsMultiSetType.Arg), e0, e1);
-                case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-                  return translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetIntersection, translator.TrType(binaryExpr.Type.AsMultiSetType.Arg), e0, e1);
-                case BinaryExpr.ResolvedOpcode.MultiSetDifference:
-                  return translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.MultiSetDifference, translator.TrType(binaryExpr.Type.AsMultiSetType.Arg), e0, e1);
-
-                case BinaryExpr.ResolvedOpcode.ProperPrefix:
-                  return translator.ProperPrefix(GetToken(binaryExpr), e0, e1);
-                case BinaryExpr.ResolvedOpcode.Prefix: {
-                    Boogie.Expr len0 = translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqLength, null, e0);
-                    Boogie.Expr len1 = translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqLength, null, e1);
-                    return Boogie.Expr.Binary(GetToken(binaryExpr), BinaryOperator.Opcode.And,
-                      Boogie.Expr.Le(len0, len1),
-                      translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqSameUntil, null, e0, e1, len0));
-                  }
-                case BinaryExpr.ResolvedOpcode.Concat:
-                  return translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqAppend, translator.TrType(binaryExpr.Type.AsSeqType.Arg), e0, e1);
-                case BinaryExpr.ResolvedOpcode.InSeq:
-                  return translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqContains, null, e1,
-                    BoxIfNecessary(GetToken(binaryExpr), e0, cce.NonNull(e.E0.Type)));
-                case BinaryExpr.ResolvedOpcode.NotInSeq:
-                  Boogie.Expr arg = translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.SeqContains, null, e1,
-                    BoxIfNecessary(GetToken(binaryExpr), e0, cce.NonNull(e.E0.Type)));
-                  return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, arg);
-                case BinaryExpr.ResolvedOpcode.InMap: {
-                    bool finite = e.E1.Type.AsMapType.Finite;
-                    var f = finite ? BuiltinFunction.MapDomain : BuiltinFunction.IMapDomain;
-                    return Boogie.Expr.SelectTok(GetToken(binaryExpr), translator.FunctionCall(GetToken(binaryExpr), f, predef.MapType(GetToken(e), finite, predef.BoxType, predef.BoxType), e1),
-                      BoxIfNecessary(GetToken(binaryExpr), e0, e.E0.Type));
-                  }
-                case BinaryExpr.ResolvedOpcode.NotInMap: {
-                    bool finite = e.E1.Type.AsMapType.Finite;
-                    var f = finite ? BuiltinFunction.MapDomain : BuiltinFunction.IMapDomain;
-                    Boogie.Expr inMap = Boogie.Expr.SelectTok(GetToken(binaryExpr), translator.FunctionCall(GetToken(binaryExpr), f, predef.MapType(GetToken(e), finite, predef.BoxType, predef.BoxType), e1),
-                      BoxIfNecessary(GetToken(binaryExpr), e0, e.E0.Type));
-                    return Boogie.Expr.Unary(GetToken(binaryExpr), UnaryOperator.Opcode.Not, inMap);
-                  }
-                case BinaryExpr.ResolvedOpcode.MapMerge: {
-                    bool finite = e.E0.Type.AsMapType.Finite;
-                    var f = finite ? "Map#Merge" : "IMap#Merge";
-                    return FunctionCall(GetToken(binaryExpr), f, translator.TrType(binaryExpr.Type), e0, e1);
-                  }
-                case BinaryExpr.ResolvedOpcode.MapSubtraction: {
-                    bool finite = e.E0.Type.AsMapType.Finite;
-                    var f = finite ? "Map#Subtract" : "IMap#Subtract";
-                    return FunctionCall(GetToken(binaryExpr), f, translator.TrType(binaryExpr.Type), e0, e1);
-                  }
-
-                case BinaryExpr.ResolvedOpcode.RankLt:
-                  return Boogie.Expr.Binary(GetToken(binaryExpr), BinaryOperator.Opcode.Lt,
-                    translator.FunctionCall(GetToken(binaryExpr), e.E0.Type.IsDatatype ? BuiltinFunction.DtRank : BuiltinFunction.BoxRank, null, e0),
-                    translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.DtRank, null, e1));
-                case BinaryExpr.ResolvedOpcode.RankGt:
-                  return Boogie.Expr.Binary(GetToken(binaryExpr), BinaryOperator.Opcode.Gt,
-                    translator.FunctionCall(GetToken(binaryExpr), BuiltinFunction.DtRank, null, e0),
-                    translator.FunctionCall(GetToken(binaryExpr), e.E1.Type.IsDatatype ? BuiltinFunction.DtRank : BuiltinFunction.BoxRank, null, e1));
-
-                default:
-                  Contract.Assert(false); throw new cce.UnreachableException();  // unexpected binary expression
-              }
-              liftLit = liftLit && !keepLits;
-              var ae0 = keepLits ? oe0 : e0;
-              var ae1 = keepLits ? oe1 : e1;
-              Boogie.Expr re = Boogie.Expr.Binary(GetToken(binaryExpr), bOpcode, ae0, ae1);
-              if (liftLit) {
-                re = MaybeLit(re, typ);
-              }
-              return re;
-            }
-          case TernaryExpr ternaryExpr: {
-              var e = ternaryExpr;
-              var e0 = TrExpr(e.E0);
-              if (!TernaryExpr.PrefixEqUsesNat && !e.E0.Type.IsBigOrdinalType) {
-                e0 = FunctionCall(e0.tok, "ORD#FromNat", predef.BigOrdinalType, e0);
-              }
-              var e1 = TrExpr(e.E1);
-              var e2 = TrExpr(e.E2);
-              switch (e.Op) {
-                case TernaryExpr.Opcode.PrefixEqOp:
-                case TernaryExpr.Opcode.PrefixNeqOp:
-                  var e1type = e.E1.Type.NormalizeExpand();
-                  var e2type = e.E2.Type.NormalizeExpand();
-                  var cot = e1type.AsCoDatatype;
-                  Contract.Assert(cot != null);  // the argument types of prefix equality (and prefix disequality) are codatatypes
-                  var r = translator.CoEqualCall(cot, e1type.TypeArgs, e2type.TypeArgs, e0, this.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH), e1, e2);
-                  if (e.Op == TernaryExpr.Opcode.PrefixEqOp) {
-                    return r;
-                  } else {
-                    return Boogie.Expr.Unary(GetToken(ternaryExpr), UnaryOperator.Opcode.Not, r);
-                  }
-                default:
-                  Contract.Assert(false); throw new cce.UnreachableException();  // unexpected ternary expression
-              }
-            }
-          case LetExpr letExpr: {
-              var e = letExpr;
-              if (!e.Exact) {
-                var d = translator.LetDesugaring(e);
-                return TrExpr(d);
-              } else {
-                TrLetExprPieces(e, out var lhss, out var rhss);
-                // in the translation of body, treat a let-bound variable as IsLit if its RHS definition is IsLit
-                Contract.Assert(lhss.Count == rhss.Count);  // this is a postcondition of TrLetExprPieces
-                var previousCount = translator.letBoundVariablesWithLitRHS.Count;
-                for (var i = 0; i < lhss.Count; i++) {
-                  if (translator.IsLit(rhss[i])) {
-                    translator.letBoundVariablesWithLitRHS.Add(lhss[i].Name);
-                  }
-                  i++;
-                }
-                var body = TrExpr(e.Body);
-                foreach (var v in lhss) {
-                  translator.letBoundVariablesWithLitRHS.Remove(v.Name);
-                }
-                Contract.Assert(previousCount == translator.letBoundVariablesWithLitRHS.Count);
-                // in the following, use the token for Body instead of the token for the whole let expression; this gives better error locations
-                return new Boogie.LetExpr(GetToken(e.Body), lhss, rhss, null, body);
-              }
-            }
-          case QuantifierExpr quantifierExpr: {
-              QuantifierExpr e = quantifierExpr;
-
-              if (e.SplitQuantifier != null) {
-                return TrExpr(e.SplitQuantifierExpression);
-              } else {
-                List<Variable> bvars = new List<Variable>();
-                var bodyEtran = this;
-                if (e is ExistsExpr && translator.stmtContext == StmtType.ASSERT && translator.adjustFuelForExists) {
-                  // assert exists need decrease fuel by 1
-                  bodyEtran = bodyEtran.DecreaseFuel(1);
-                  // set adjustFuelForExists to false so that we don't keep decrease the fuel in cases like the expr below.
-                  // assert exists p:int :: exists t:T :: ToInt(t) > 0;
-                  translator.adjustFuelForExists = false;
-                } else if (e is ExistsExpr && translator.stmtContext == StmtType.ASSUME && translator.adjustFuelForExists) {
-                  // assume exists need increase fuel by 1
-                  bodyEtran = bodyEtran.LayerOffset(1);
-                  translator.adjustFuelForExists = false;
-                }
-
-                Boogie.Expr antecedent = Boogie.Expr.True;
-
-                List<bool> freeOfAlloc = ComprehensionExpr.BoundedPool.HasBounds(e.Bounds, ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
-                antecedent = BplAnd(antecedent, bodyEtran.TrBoundVariables(e.BoundVars, bvars, false, freeOfAlloc)); // initHeapForAllStmt
-
-                Boogie.QKeyValue kv = TrAttributes(e.Attributes, "trigger");
-                Boogie.Trigger tr = translator.TrTrigger(bodyEtran, e.Attributes, GetToken(e), bvars, null, null);
-
-                if (e.Range != null) {
-                  antecedent = BplAnd(antecedent, bodyEtran.TrExpr(e.Range));
-                }
-                Boogie.Expr body = bodyEtran.TrExpr(e.Term);
-
-                if (e is ForallExpr) {
-                  return new Boogie.ForallExpr(GetToken(quantifierExpr), new List<TypeVariable>(), bvars, kv, tr, Boogie.Expr.Imp(antecedent, body));
-                } else {
-                  Contract.Assert(e is ExistsExpr);
-                  return new Boogie.ExistsExpr(GetToken(quantifierExpr), new List<TypeVariable>(), bvars, kv, tr, Boogie.Expr.And(antecedent, body));
-                }
-              }
-            }
-          case SetComprehension comprehension: {
-              var e = comprehension;
-              List<bool> freeOfAlloc = ComprehensionExpr.BoundedPool.HasBounds(e.Bounds, ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
-
-              // Translate "set xs | R :: T" into:
-              //     lambda y: BoxType :: (exists xs :: CorrectType(xs) && R && y==Box(T))
-              // or if "T" is "xs", then:
-              //     lambda y: BoxType :: CorrectType(y) && R[xs := Unbox(y)]
-              var yVar = new Boogie.BoundVariable(GetToken(comprehension), new Boogie.TypedIdent(GetToken(comprehension), translator.CurrentIdGenerator.FreshId("$y#"), predef.BoxType));
-              Boogie.Expr y = new Boogie.IdentifierExpr(GetToken(comprehension), yVar);
-              Boogie.Expr lbody;
-              if (e.TermIsSimple) {
-                var bv = e.BoundVars[0];
-                // lambda y: BoxType :: CorrectType(y) && R[xs := yUnboxed]
-                Boogie.Expr typeAntecedent = translator.MkIsBox(new Boogie.IdentifierExpr(GetToken(comprehension), yVar), bv.Type);
-                if (freeOfAlloc != null && !freeOfAlloc[0]) {
-                  var isAlloc = translator.MkIsAllocBox(new Boogie.IdentifierExpr(GetToken(comprehension), yVar), bv.Type, HeapExpr);
-                  typeAntecedent = BplAnd(typeAntecedent, isAlloc);
-                }
-                var yUnboxed = translator.UnboxIfBoxed(new Boogie.IdentifierExpr(GetToken(comprehension), yVar), bv.Type);
-                var range = Translator.Substitute(e.Range, bv, new BoogieWrapper(yUnboxed, bv.Type));
-                lbody = BplAnd(typeAntecedent, TrExpr(range));
-              } else {
-                // lambda y: BoxType :: (exists xs :: CorrectType(xs) && R && y==Box(T))
-                List<Variable> bvars = new List<Variable>();
-                Boogie.Expr typeAntecedent = TrBoundVariables(e.BoundVars, bvars, false, freeOfAlloc);
-
-                var eq = Boogie.Expr.Eq(y, BoxIfNecessary(GetToken(comprehension), TrExpr(e.Term), e.Term.Type));
-                var ebody = Boogie.Expr.And(BplAnd(typeAntecedent, TrExpr(e.Range)), eq);
-                var triggers = translator.TrTrigger(this, e.Attributes, GetToken(e));
-                lbody = new Boogie.ExistsExpr(GetToken(comprehension), bvars, triggers, ebody);
-              }
-              Boogie.QKeyValue kv = TrAttributes(e.Attributes, "trigger");
-              return new Boogie.LambdaExpr(GetToken(comprehension), new List<TypeVariable>(), new List<Variable> { yVar }, kv, lbody);
-            }
-          case MapComprehension comprehension: {
-              var e = comprehension;
-              // Translate "map x,y | R(x,y) :: F(x,y) := G(x,y)" into
-              // Map#Glue(lambda w: BoxType :: exists x,y :: R(x,y) && unbox(w) == F(x,y),
-              //          lambda w: BoxType :: G(project_x(unbox(w)), project_y(unbox(w))),
-              //          type)".
-              // where project_x and project_y are functions defined (elsewhere, in CanCallAssumption) by the following axiom:
-              //     forall x,y :: R(x,y) ==> var x',y' := project_x(unbox(F(x,y))),project_y(unbox(F(x,y))); R(x',y') && F(x',y') == F(x,y)
-              // that is (without the let expression):
-              //     forall x,y :: R(x,y) ==> R(project_x(unbox(F(x,y))), project_y(unbox(F(x,y)))) && F(project_x(unbox(F(x,y))), project_y(unbox(F(x,y)))) == F(x,y)
-              //
-              // In the common case where F(x,y) is omitted (in which case the list of bound variables is restricted to length 1):
-              // Translate "map x | R(x) :: G(x)" into
-              // Map#Glue(lambda w: BoxType :: R(unbox(w)),
-              //          lambda w: BoxType :: G(unbox(w)),
-              //          type)".
-              List<Variable> bvars = new List<Variable>();
-              List<bool> freeOfAlloc = ComprehensionExpr.BoundedPool.HasBounds(e.Bounds, ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
-
-              Boogie.QKeyValue kv = TrAttributes(e.Attributes, "trigger");
-
-              var wVar = new Boogie.BoundVariable(GetToken(comprehension), new Boogie.TypedIdent(GetToken(comprehension), translator.CurrentIdGenerator.FreshId("$w#"), predef.BoxType));
-
-              Boogie.Expr keys, values;
-              if (!e.IsGeneralMapComprehension) {
-                var bv = e.BoundVars[0];
-                var w = new Boogie.IdentifierExpr(GetToken(comprehension), wVar);
-                Boogie.Expr unboxw = translator.UnboxIfBoxed(w, bv.Type);
-                Boogie.Expr typeAntecedent = translator.MkIsBox(w, bv.Type);
-                if (freeOfAlloc != null && !freeOfAlloc[0]) {
-                  var isAlloc = translator.MkIsAllocBox(w, bv.Type, HeapExpr);
-                  typeAntecedent = BplAnd(typeAntecedent, isAlloc);
-                }
-                var subst = new Dictionary<IVariable, Expression>();
-                subst.Add(bv, new BoogieWrapper(unboxw, bv.Type));
-
-                var ebody = BplAnd(typeAntecedent, TrExpr(Translator.Substitute(e.Range, null, subst)));
-                keys = new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), new List<Variable> { wVar }, kv, ebody);
-                ebody = TrExpr(Translator.Substitute(e.Term, null, subst));
-                values = new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), new List<Variable> { wVar }, kv, BoxIfNecessary(GetToken(comprehension), ebody, e.Term.Type));
-              } else {
-                var t = e.TermLeft;
-                var w = new Boogie.IdentifierExpr(GetToken(comprehension), wVar);
-                Boogie.Expr unboxw = translator.UnboxIfBoxed(w, t.Type);
-                Boogie.Expr typeAntecedent = translator.MkIsBox(w, t.Type);
-                if (freeOfAlloc != null && !freeOfAlloc[0]) {
-                  var isAlloc = translator.MkIsAllocBox(w, t.Type, HeapExpr);
-                  typeAntecedent = BplAnd(typeAntecedent, isAlloc);
-                }
-
-                translator.CreateBoundVariables(e.BoundVars, out var bvs, out var args);
-                Contract.Assert(e.BoundVars.Count == bvs.Count);
-                var subst = new Dictionary<IVariable, Expression>();
-                for (var i = 0; i < e.BoundVars.Count; i++) {
-                  subst.Add(e.BoundVars[i], new BoogieWrapper(args[i], e.BoundVars[i].Type));
-                }
-                var rr = TrExpr(Translator.Substitute(e.Range, null, subst));
-                var ff = TrExpr(Translator.Substitute(t, null, subst));
-                var exst_body = BplAnd(rr, Boogie.Expr.Eq(unboxw, ff));
-                var ebody = BplAnd(typeAntecedent, new Boogie.ExistsExpr(GetToken(e), bvs, exst_body));
-                keys = new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), new List<Variable> { wVar }, kv, ebody);
-
-                translator.CreateMapComprehensionProjectionFunctions(e);
-                Contract.Assert(e.ProjectionFunctions != null && e.ProjectionFunctions.Count == e.BoundVars.Count);
-                subst = new Dictionary<IVariable, Expression>();
-                for (var i = 0; i < e.BoundVars.Count; i++) {
-                  var p = new Boogie.NAryExpr(GetToken(e), new Boogie.FunctionCall(e.ProjectionFunctions[i]), new List<Boogie.Expr> { unboxw });
-                  var prj = new BoogieWrapper(p, e.BoundVars[i].Type);
-                  subst.Add(e.BoundVars[i], prj);
-                }
-                ebody = TrExpr(Translator.Substitute(e.Term, null, subst));
-                values = new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), new List<Variable> { wVar }, kv, BoxIfNecessary(GetToken(comprehension), ebody, e.Term.Type));
-              }
-
-              bool finite = e.Finite;
-              var f = finite ? BuiltinFunction.MapGlue : BuiltinFunction.IMapGlue;
-              return translator.FunctionCall(GetToken(e), f, null, keys, values, translator.TypeToTy(comprehension.Type));
-            }
-          case LambdaExpr lambdaExpr: {
-              var e = lambdaExpr;
-              return TrLambdaExpr(e);
-            }
-          case StmtExpr stmtExpr: {
-              var e = stmtExpr;
-              return TrExpr(e.E);
-            }
-          case ITEExpr iteExpr: {
-              ITEExpr e = iteExpr;
-              var g = Translator.RemoveLit(TrExpr(e.Test));
-              var thn = Translator.RemoveLit(TrExpr(e.Thn));
-              var els = Translator.RemoveLit(TrExpr(e.Els));
-              return new NAryExpr(GetToken(iteExpr), new IfThenElse(GetToken(iteExpr)), new List<Boogie.Expr> { g, thn, els });
-            }
-          case MatchExpr matchExpr: {
-              var e = matchExpr;
-              var ite = DesugarMatchExpr(e);
-              return TrExpr(ite);
-            }
-          case ConcreteSyntaxExpression expression: {
-              var e = expression;
-              return TrExpr(e.ResolvedExpression);
-            }
-          case NestedMatchExpr nestedMatchExpr:
-            return TrExpr(nestedMatchExpr.Flattened);
-          case BoxingCastExpr castExpr: {
-              BoxingCastExpr e = castExpr;
-              return translator.CondApplyBox(GetToken(e), TrExpr(e.E), e.FromType, e.ToType);
-            }
-          case UnboxingCastExpr castExpr: {
-              UnboxingCastExpr e = castExpr;
-              return translator.CondApplyUnbox(GetToken(e), TrExpr(e.E), e.FromType, e.ToType);
-            }
-          default:
-            Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
-        }
-      }
-
-      public Expr TrExprSpecialFunctionCall(FunctionCallExpr expr) {
-        Contract.Requires(expr.Function is SpecialFunction);
-        string name = expr.Function.Name;
-        if (name == "RotateLeft") {
-          var w = expr.Type.AsBitVectorType.Width;
-          Expression arg = expr.Args[0];
-          return TrToFunctionCall(GetToken(expr), "LeftRotate_bv" + w, translator.BplBvType(w), TrExpr(expr.Receiver), translator.ConvertExpression(GetToken(expr), TrExpr(arg), arg.Type, expr.Type), false);
-        } else if (name == "RotateRight") {
-          var w = expr.Type.AsBitVectorType.Width;
-          Expression arg = expr.Args[0];
-          return TrToFunctionCall(GetToken(expr), "RightRotate_bv" + w, translator.BplBvType(w), TrExpr(expr.Receiver), translator.ConvertExpression(GetToken(expr), TrExpr(arg), arg.Type, expr.Type), false);
-        } else {
-          bool argsAreLitDummy;
-          var args = FunctionInvocationArguments(expr, null, null, true, out argsAreLitDummy);
-          var id = new Boogie.IdentifierExpr(GetToken(expr), expr.Function.FullSanitizedName, translator.TrType(expr.Type));
-          return new Boogie.NAryExpr(GetToken(expr), new Boogie.FunctionCall(id), args);
-        }
-      }
-      public Expr TrToFunctionCall(Boogie.IToken tok, string function, Boogie.Type returnType, Boogie.Expr e0, Boogie.Expr e1, bool liftLit) {
-        Boogie.Expr re = FunctionCall(tok, function, returnType, e0, e1);
-        if (liftLit) {
-          re = MaybeLit(re, returnType);
-        }
-        return re;
-      }
-
-      private Expr TrLambdaExpr(LambdaExpr e) {
-        Contract.Requires(e != null);
-
-        var bvars = new List<Boogie.Variable>();
-
-        var varNameGen = translator.CurrentIdGenerator.NestedFreshIdGenerator("$l#");
-
-        var heap = BplBoundVar(varNameGen.FreshId("#heap#"), predef.HeapType, bvars);
-
-        var ves = (from bv in e.BoundVars
-                   select
-BplBoundVar(varNameGen.FreshId(string.Format("#{0}#", bv.Name)), predef.BoxType, bvars)).ToList();
-        var subst = e.BoundVars.Zip(ves, (bv, ve) => {
-          var unboxy = translator.UnboxIfBoxed(ve, bv.Type);
-          return new KeyValuePair<IVariable, Expression>(bv, new BoogieWrapper(unboxy, bv.Type));
-        }).ToDictionary(x => x.Key, x => x.Value);
-        var su = new Substituter(null, subst, new Dictionary<TypeParameter, Type>());
-
-        var et = new ExpressionTranslator(this, heap);
-        var lvars = new List<Boogie.Variable>();
-        var ly = BplBoundVar(varNameGen.FreshId("#ly#"), predef.LayerType, lvars);
-        et = et.WithLayer(ly);
-
-        var ebody = et.TrExpr(Translator.Substitute(e.Body, null, subst));
-        ebody = translator.BoxIfUnboxed(ebody, e.Body.Type);
-
-        var isBoxes = BplAnd(ves.Zip(e.BoundVars, (ve, bv) => translator.MkIsBox(ve, bv.Type)));
-        var reqbody = e.Range == null
-          ? isBoxes
-          : BplAnd(isBoxes, et.TrExpr(Translator.Substitute(e.Range, null, subst)));
-
-        var rdvars = new List<Boogie.Variable>();
-        var o = BplBoundVar(varNameGen.FreshId("#o#"), predef.RefType, rdvars);
-        Boogie.Expr rdbody = new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), rdvars, null,
-          translator.InRWClause(GetToken(e), o, null, e.Reads.ConvertAll(su.SubstFrameExpr), et, null, null));
-        rdbody = FunctionCall(GetToken(e), "SetRef_to_SetBox", predef.SetType(GetToken(e), true, predef.BoxType), rdbody);
-
-        return MaybeLit(
-          translator.FunctionCall(GetToken(e), BuiltinFunction.AtLayer, predef.HandleType,
-            new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), lvars, null,
-              FunctionCall(GetToken(e), translator.Handle(e.BoundVars.Count), predef.BoxType,
-                new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), bvars, null, ebody),
-                new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), bvars, null, reqbody),
-                new Boogie.LambdaExpr(GetToken(e), new List<TypeVariable>(), bvars, null, rdbody))),
-            layerIntraCluster != null ? layerIntraCluster.ToExpr() : layerInterCluster.ToExpr()),
-          predef.HandleType);
-      }
-
-      public void TrLetExprPieces(LetExpr let, out List<Boogie.Variable> lhss, out List<Boogie.Expr> rhss) {
-        Contract.Requires(let != null);
-        var substMap = new Dictionary<IVariable, Expression>();
-        for (int i = 0; i < let.LHSs.Count; i++) {
-          translator.AddCasePatternVarSubstitutions(let.LHSs[i], TrExpr(let.RHSs[i]), substMap);
-        }
-        lhss = new List<Boogie.Variable>();
-        rhss = new List<Boogie.Expr>();
-        foreach (var v in let.BoundVars) {
-          var rhs = substMap[v];  // this should succeed (that is, "v" is in "substMap"), because the AddCasePatternVarSubstitutions calls above should have added a mapping for each bound variable in let.BoundVars
-          var bv = BplBoundVar(v.AssignUniqueName(translator.currentDeclaration.IdGenerator), translator.TrType(v.Type), out var bvIde);
-          lhss.Add(bv);
-          rhss.Add(TrExpr(rhs));
-        }
-      }
-
-      public Expression DesugarMatchExpr(MatchExpr e) {
-        Contract.Requires(e != null);
-        // Translate:
-        //   match S
-        //   case C(i, j) => X
-        //   case D(k, l) => Y
-        //   case E(m, n) => Z
-        // into:
-        //   if S.C? then
-        //     X[i,j := S.dC0, S.dC1]
-        //   else if S.D? then
-        //     Y[k,l := S.dD0, S.dD1]
-        //   else
-        //     Z[m,n := S.dE0, S.dE1]
-        // As a special case, when there are no cases at all (which, in a correct program, means the
-        // match expression is unreachable), the translation is:
-        //   t
-        // where is "t" is some value (in particular, the default value) of the expected type.
-        Expression r = null;
-        for (int i = e.Cases.Count; 0 <= --i;) {
-          var mc = e.Cases[i];
-          var substMap = new Dictionary<IVariable, Expression>();
-          var argIndex = 0;
-          foreach (var bv in mc.Arguments) {
-            if (!LocalVariable.HasWildcardName(bv)) {
-              var dtor = mc.Ctor.Destructors[argIndex];
-              var dv = new MemberSelectExpr(bv.tok, e.Source, dtor);
-              substMap.Add(bv, dv);
-            }
-            argIndex++;
-          }
-          var c = Translator.Substitute(mc.Body, null, substMap);
-          if (r == null) {
-            r = c;
-          } else {
-            var test = new MemberSelectExpr(mc.tok, e.Source, mc.Ctor.QueryField);
-            var ite = new ITEExpr(mc.tok, false, test, c, r);
-            ite.Type = e.Type;
-            r = ite;
-          }
-        }
-        return r ?? new BoogieWrapper(ArbitraryValue(e.Type), e.Type);
-      }
-
-      public Boogie.Expr TrBoundVariables(List<BoundVar/*!*/> boundVars, List<Variable> bvars) {
-        return TrBoundVariables(boundVars, bvars, false);
-      }
-
-      public Boogie.Expr TrBoundVariables(List<BoundVar/*!*/> boundVars, List<Variable> bvars, bool translateAsLocals, List<bool>/*?*/ freeOfAlloc = null) {
-        Contract.Requires(boundVars != null);
-        Contract.Requires(bvars != null);
-        Contract.Requires(freeOfAlloc == null || freeOfAlloc.Count == boundVars.Count);
-        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
-
-        Boogie.Expr typeAntecedent = Boogie.Expr.True;
-        var i = 0;
-        foreach (BoundVar bv in boundVars) {
-          var tid = new Boogie.TypedIdent(bv.tok, bv.AssignUniqueName(translator.currentDeclaration.IdGenerator), translator.TrType(bv.Type));
-          Boogie.Variable bvar;
-          if (translateAsLocals) {
-            bvar = new Boogie.LocalVariable(bv.tok, tid);
-          } else {
-            bvar = new Boogie.BoundVariable(bv.tok, tid);
-          }
-          bvars.Add(bvar);
-          var useAlloc = freeOfAlloc == null || freeOfAlloc[i] ? NOALLOC : ISALLOC;
-          Boogie.Expr wh = translator.GetWhereClause(bv.tok, new Boogie.IdentifierExpr(bv.tok, bvar), bv.Type, this, useAlloc);
-          if (wh != null) {
-            typeAntecedent = BplAnd(typeAntecedent, wh);
-          }
-          i++;
-        }
-        return typeAntecedent;
-      }
-
-      public List<Tuple<Boogie.Variable, Boogie.Expr>> TrBoundVariables_SeparateWhereClauses(List<BoundVar/*!*/> boundVars) {
-        Contract.Requires(boundVars != null);
-        Contract.Ensures(Contract.Result<List<Tuple<Boogie.Variable, Boogie.Expr>>>() != null);
-
-        var varsAndAntecedents = new List<Tuple<Boogie.Variable, Boogie.Expr>>();
-        foreach (BoundVar bv in boundVars) {
-          var tid = new Boogie.TypedIdent(bv.tok, bv.AssignUniqueName(translator.currentDeclaration.IdGenerator), translator.TrType(bv.Type));
-          var bvar = new Boogie.BoundVariable(bv.tok, tid);
-          var wh = translator.GetWhereClause(bv.tok, new Boogie.IdentifierExpr(bv.tok, bvar), bv.Type, this, NOALLOC);
-          varsAndAntecedents.Add(Tuple.Create<Boogie.Variable, Boogie.Expr>(bvar, wh));
-        }
-        return varsAndAntecedents;
-      }
-
-      public Boogie.Expr TrBoundVariablesRename(List<BoundVar> boundVars, List<Variable> bvars, out Dictionary<IVariable, Expression> substMap, out Boogie.Trigger antitriggers) {
-        Contract.Requires(boundVars != null);
-        Contract.Requires(bvars != null);
-
-        substMap = new Dictionary<IVariable, Expression>();
-        antitriggers = null;
-        Boogie.Expr typeAntecedent = Boogie.Expr.True;
-        foreach (BoundVar bv in boundVars) {
-          var newBoundVar = new BoundVar(bv.tok, bv.Name, bv.Type);
-          IdentifierExpr ie = new IdentifierExpr(newBoundVar.tok, newBoundVar.AssignUniqueName(translator.currentDeclaration.IdGenerator));
-          ie.Var = newBoundVar; ie.Type = ie.Var.Type;  // resolve ie here
-          substMap.Add(bv, ie);
-          Boogie.Variable bvar = new Boogie.BoundVariable(newBoundVar.tok, new Boogie.TypedIdent(newBoundVar.tok, newBoundVar.AssignUniqueName(translator.currentDeclaration.IdGenerator), translator.TrType(newBoundVar.Type)));
-          bvars.Add(bvar);
-          var bIe = new Boogie.IdentifierExpr(bvar.tok, bvar);
-          Boogie.Expr wh = translator.GetWhereClause(bv.tok, bIe, newBoundVar.Type, this, NOALLOC);
-          if (wh != null) {
-            typeAntecedent = BplAnd(typeAntecedent, wh);
-          }
-        }
-        return typeAntecedent;
-      }
-
-      public List<Boogie.Expr> FunctionInvocationArguments(FunctionCallExpr e, Boogie.Expr layerArgument, Boogie.Expr revealArgument) {
-        bool dummy;
-        return FunctionInvocationArguments(e, layerArgument, revealArgument, false, out dummy);
-      }
-
-      public List<Boogie.Expr> FunctionInvocationArguments(FunctionCallExpr e, Boogie.Expr layerArgument, Boogie.Expr revealArgument, bool omitHeapArgument, out bool argsAreLit) {
-        Contract.Requires(e != null);
-        Contract.Ensures(Contract.Result<List<Boogie.Expr>>() != null);
-
-        var args = new List<Boogie.Expr>();
-
-        // first add type arguments
-        var tyParams = GetTypeParams(e.Function);
-        var tySubst = e.TypeArgumentSubstitutionsWithParents();
-        args.AddRange(translator.trTypeArgs(tySubst, tyParams));
-
-        if (layerArgument != null) {
-          args.Add(layerArgument);
-        }
-        if (revealArgument != null) {
-          args.Add(revealArgument);
-        }
-        if (e.Function is TwoStateFunction) {
-          args.Add(OldAt(e.AtLabel).HeapExpr);
-        }
-        if (!omitHeapArgument && e.Function.ReadsHeap) {
-          Contract.Assert(HeapExpr != null);
-          args.Add(HeapExpr);
-          // If the function doesn't use the heap, but global settings say to use it,
-          // then we want to quantify over the heap so that heap in the trigger can match over
-          // heap modifying operations. (see Test/dafny4/Bug144.dfy)
-          bool usesHeap = e.Function.ReadsHeap || e.Function.Formals.Any(f => f.Type.IsRefType);
-          if (!usesHeap) {
-            Statistics_HeapAsQuantifierCount++;
-          }
-        }
-        argsAreLit = true;
-        if (!e.Function.IsStatic) {
-          var tr_ee = translator.BoxifyForTraitParent(e.tok, TrExpr(e.Receiver), e.Function, e.Receiver.Type);
-          argsAreLit = argsAreLit && translator.IsLit(tr_ee);
-          args.Add(tr_ee);
-        }
-        for (int i = 0; i < e.Args.Count; i++) {
-          Expression ee = e.Args[i];
-          Type t = e.Function.Formals[i].Type;
-          Expr tr_ee = TrExpr(ee);
-          argsAreLit = argsAreLit && translator.IsLit(tr_ee);
-          args.Add(translator.CondApplyBox(GetToken(e), tr_ee, cce.NonNull(ee.Type), t));
-        }
-        return args;
-      }
-
-      public Boogie.Expr GetArrayIndexFieldName(IToken tok, List<Expression> indices) {
-        return translator.GetArrayIndexFieldName(tok, indices.ConvertAll(idx => {
-          var e = TrExpr(idx);
-          return translator.ConvertExpression(GetToken(idx), e, idx.Type, Type.Int);
-        }));
-      }
-
-      public Boogie.Expr BoxIfNecessary(IToken tok, Boogie.Expr e, Type fromType) {
-        Contract.Requires(tok != null);
-        Contract.Requires(e != null);
-        Contract.Requires(fromType != null);
-        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
-        return translator.BoxIfNecessary(tok, e, fromType);
-      }
-
-      /// <summary>
-      /// Translate like s[Box(elmt)], but try to avoid as many set functions as possible in the
-      /// translation, because such functions can mess up triggering.
-      /// </summary>
-      public Boogie.Expr TrInSet(IToken tok, Boogie.Expr elmt, Expression s, Type elmtType, bool aggressive, out bool performedRewrite) {
-        Contract.Requires(tok != null);
-        Contract.Requires(elmt != null);
-        Contract.Requires(s != null);
-        Contract.Requires(elmtType != null);
-        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
-
-        var elmtBox = BoxIfNecessary(tok, elmt, elmtType);
-        var r = TrInSet_Aux(tok, elmt, elmtBox, s, aggressive, out performedRewrite);
-        Contract.Assert(performedRewrite == RewriteInExpr(s, aggressive)); // sanity check
-        return r;
-      }
-      /// <summary>
-      /// The worker routine for TrInSet.  This method takes both "elmt" and "elmtBox" as parameters,
-      /// using the former when the unboxed form is needed and the latter when the boxed form is needed.
-      /// This gives the caller the flexibility to pass in either "o, Box(o)" or "Unbox(bx), bx".
-      /// Note: This method must be kept in synch with RewriteInExpr.
-      /// </summary>
-      public Boogie.Expr TrInSet_Aux(IToken tok, Boogie.Expr elmt, Boogie.Expr elmtBox, Expression s, bool aggressive, out bool performedRewrite) {
-        Contract.Requires(tok != null);
-        Contract.Requires(elmt != null);
-        Contract.Requires(elmtBox != null);
-        Contract.Requires(s != null);
-        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
-
-        performedRewrite = true;  // assume a rewrite will happen
-        s = s.Resolved;
-        bool pr;
-        if (s is BinaryExpr && aggressive) {
-          BinaryExpr bin = (BinaryExpr)s;
-          switch (bin.ResolvedOp) {
-            case BinaryExpr.ResolvedOpcode.Union:
-              return Boogie.Expr.Or(TrInSet_Aux(tok, elmt, elmtBox, bin.E0, aggressive, out pr), TrInSet_Aux(tok, elmt, elmtBox, bin.E1, aggressive, out pr));
-            case BinaryExpr.ResolvedOpcode.Intersection:
-              return Boogie.Expr.And(TrInSet_Aux(tok, elmt, elmtBox, bin.E0, aggressive, out pr), TrInSet_Aux(tok, elmt, elmtBox, bin.E1, aggressive, out pr));
-            case BinaryExpr.ResolvedOpcode.SetDifference:
-              return Boogie.Expr.And(TrInSet_Aux(tok, elmt, elmtBox, bin.E0, aggressive, out pr), Boogie.Expr.Not(TrInSet_Aux(tok, elmt, elmtBox, bin.E1, aggressive, out pr)));
-            default:
-              break;
-          }
-        } else if (s is SetDisplayExpr) {
-          SetDisplayExpr disp = (SetDisplayExpr)s;
-          Boogie.Expr disjunction = null;
-          foreach (Expression a in disp.Elements) {
-            Boogie.Expr disjunct = Boogie.Expr.Eq(elmt, TrExpr(a));
-            if (disjunction == null) {
-              disjunction = disjunct;
-            } else {
-              disjunction = Boogie.Expr.Or(disjunction, disjunct);
-            }
-          }
-          if (disjunction == null) {
-            return Boogie.Expr.False;
-          } else {
-            return disjunction;
-          }
-        } else if (s is SetComprehension) {
-          var compr = (SetComprehension)s;
-          // Translate "elmt in set xs | R :: T" into:
-          //     exists xs :: CorrectType(xs) && R && elmt==T
-          // or if "T" is "xs", then:
-          //     CorrectType(elmt) && R[xs := elmt]
-          if (compr.TermIsSimple) {
-            // CorrectType(elmt) && R[xs := elmt]
-            // Note, we can always use NOALLOC here.
-            Boogie.Expr typeAntecedent = translator.GetWhereClause(GetToken(compr), elmt, compr.BoundVars[0].Type, this, NOALLOC) ?? Boogie.Expr.True;
-            var range = Translator.Substitute(compr.Range, compr.BoundVars[0], new BoogieWrapper(elmt, compr.BoundVars[0].Type));
-            return BplAnd(typeAntecedent, TrExpr(range));
-          } else {
-            // exists xs :: CorrectType(xs) && R && elmt==T
-            List<bool> freeOfAlloc = ComprehensionExpr.BoundedPool.HasBounds(compr.Bounds, ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
-            var bvars = new List<Variable>();
-            Boogie.Expr typeAntecedent = TrBoundVariables(compr.BoundVars, bvars, false, freeOfAlloc) ?? Boogie.Expr.True;
-            var eq = Boogie.Expr.Eq(elmtBox, BoxIfNecessary(GetToken(compr), TrExpr(compr.Term), compr.Term.Type));
-            var ebody = Boogie.Expr.And(BplAnd(typeAntecedent, TrExpr(compr.Range)), eq);
-            var triggers = translator.TrTrigger(this, compr.Attributes, GetToken(compr));
-            return new Boogie.ExistsExpr(GetToken(compr), bvars, triggers, ebody);
-          }
-        }
-        performedRewrite = false;
-        return Boogie.Expr.SelectTok(tok, TrExpr(s), elmtBox);
-      }
-
-      /// <summary>
-      /// Translate like 0 < s[Box(elmt)], but try to avoid as many set functions as possible in the
-      /// translation, because such functions can mess up triggering.
-      /// Note: This method must be kept in synch with RewriteInExpr.
-      /// </summary>
-      public Boogie.Expr TrInMultiSet(IToken tok, Boogie.Expr elmt, Expression s, Type elmtType, bool aggressive) {
-        Contract.Requires(tok != null);
-        Contract.Requires(elmt != null);
-        Contract.Requires(s != null);
-        Contract.Requires(elmtType != null);
-
-        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
-        var elmtBox = BoxIfNecessary(tok, elmt, elmtType);
-        return TrInMultiSet_Aux(tok, elmt, elmtBox, s, aggressive);
-      }
-      public Boogie.Expr TrInMultiSet_Aux(IToken tok, Boogie.Expr elmt, Boogie.Expr elmtBox, Expression s, bool aggressive) {
-        Contract.Requires(tok != null);
-        Contract.Requires(elmt != null);
-        Contract.Requires(s != null);
-        Contract.Requires(elmtBox != null);
-
-        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
-
-        s = s.Resolved;
-        if (s is BinaryExpr && aggressive) {
-          BinaryExpr bin = (BinaryExpr)s;
-          switch (bin.ResolvedOp) {
-            case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-              return Boogie.Expr.Binary(tok, BinaryOperator.Opcode.Or, TrInMultiSet_Aux(tok, elmt, elmtBox, bin.E0, aggressive), TrInMultiSet_Aux(tok, elmt, elmtBox, bin.E1, aggressive));
-            case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-              return Boogie.Expr.Binary(tok, BinaryOperator.Opcode.And, TrInMultiSet_Aux(tok, elmt, elmtBox, bin.E0, aggressive), TrInMultiSet_Aux(tok, elmt, elmtBox, bin.E1, aggressive));
-            default:
-              break;
-          }
-        } else if (s is MultiSetDisplayExpr) {
-          MultiSetDisplayExpr disp = (MultiSetDisplayExpr)s;
-          Boogie.Expr disjunction = null;
-          foreach (Expression a in disp.Elements) {
-            Boogie.Expr disjunct = Boogie.Expr.Eq(elmt, TrExpr(a));
-            if (disjunction == null) {
-              disjunction = disjunct;
-            } else {
-              disjunction = Boogie.Expr.Or(disjunction, disjunct);
-            }
-          }
-          if (disjunction == null) {
-            return Boogie.Expr.False;
-          } else {
-            return disjunction;
-          }
-        }
-        var result = Boogie.Expr.Gt(Boogie.Expr.SelectTok(tok, TrExpr(s), elmtBox), Boogie.Expr.Literal(0));
-        result.tok = tok;
-        return result;
-      }
-
-      /// <summary>
-      /// This method returns "true" iff TrInSet_Aux/TrInMultiSet_Aux will rewrite an expression "x in s".
-      /// Note: This method must be kept in synch with TrInSet_Aux/TrInMultiSet_Aux.
-      /// </summary>
-      public static bool RewriteInExpr(Expression s, bool aggressive) {
-        Contract.Requires(s != null);
-
-        s = s.Resolved;
-        if (s is BinaryExpr && aggressive) {
-          BinaryExpr bin = (BinaryExpr)s;
-          switch (bin.ResolvedOp) {
-            case BinaryExpr.ResolvedOpcode.Union:
-            case BinaryExpr.ResolvedOpcode.Intersection:
-            case BinaryExpr.ResolvedOpcode.SetDifference:
-            case BinaryExpr.ResolvedOpcode.MultiSetUnion:
-            case BinaryExpr.ResolvedOpcode.MultiSetIntersection:
-              return true;
-            default:
-              break;
-          }
-        } else if (s is SetDisplayExpr || s is MultiSetDisplayExpr) {
-          return true;
-        } else if (s is SetComprehension) {
-          return true;
-        }
-        return false;
-      }
-
-      public Boogie.QKeyValue TrAttributes(Attributes attrs, string skipThisAttribute) {
-        Boogie.QKeyValue kv = null;
-        bool hasNewTimeLimit = Attributes.Contains(attrs, "_timeLimit");
-        bool hasNewRLimit = Attributes.Contains(attrs, "_rlimit");
-        foreach (var attr in attrs.AsEnumerable()) {
-          if (attr.Name == skipThisAttribute
-              || attr.Name == "axiom"  // Dafny's axiom attribute clashes with Boogie's axiom keyword
-              || attr.Name == "fuel"   // Fuel often uses function names as arguments, which adds extra axioms unnecessarily
-              || (options.DisallowExterns && attr.Name == "extern") // omit the extern attribute when /noExterns option is specified.
-              || attr.Name == "timeLimitMultiplier"  // This is a Dafny-specific attribute
-              || (attr.Name == "timeLimit" && hasNewTimeLimit)
-              || (attr.Name == "rlimit" && hasNewRLimit)
-          ) {
-            continue;
-          }
-          List<object> parms = new List<object>();
-          foreach (var arg in attr.Args) {
-            var s = arg.AsStringLiteral();
-            if (s != null) {
-              // pass string literals down to Boogie as string literals, not as their expression translation
-              parms.Add(s);
-            } else {
-              var e = TrExpr(arg);
-              e = Translator.RemoveLit(e);
-              parms.Add(e);
-            }
-          }
-
-          var name = attr.Name;
-          if (name == "_timeLimit") {
-            name = "timeLimit";
-          } else if (name == "_rlimit") {
-            name = "rlimit";
-          } else if (name == "synthesize") {
-            name = "extern";
-          }
-          kv = new Boogie.QKeyValue(Token.NoToken, name, parms, kv);
-        }
-        return kv;
-      }
-
-      // --------------- help routines ---------------
-
-      public Boogie.Expr IsAlloced(IToken tok, Boogie.Expr e) {
-        Contract.Requires(HeapExpr != null);
-        return translator.IsAlloced(tok, HeapExpr, e);
-      }
-
-      public Boogie.Expr GoodRef(IToken tok, Boogie.Expr e, Type type) {
-        Contract.Requires(tok != null);
-        Contract.Requires(e != null);
-        Contract.Requires(type != null);
-        Contract.Ensures(Contract.Result<Boogie.Expr>() != null);
-
-        // Add $Is and $IsAlloc
-        return translator.GetWhereClause(tok, e, type, this, ISALLOC);
-      }
-    }
-  }
-}
diff --git a/Source/DafnyCore/Verifier/Translator.ExpressionWellformed.cs b/Source/DafnyCore/Verifier/Translator.ExpressionWellformed.cs
deleted file mode 100644
index b287ca2c4f7..00000000000
--- a/Source/DafnyCore/Verifier/Translator.ExpressionWellformed.cs
+++ /dev/null
@@ -1,1429 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) Microsoft Corporation.  All Rights Reserved.
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-//
-//-----------------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.Diagnostics.Contracts;
-using Bpl = Microsoft.Boogie;
-using Microsoft.Boogie;
-using static Microsoft.Dafny.Util;
-using PODesc = Microsoft.Dafny.ProofObligationDescription;
-
-namespace Microsoft.Dafny {
-  public partial class Translator {
-    /// <summary>
-    /// Instances of WFContext are used as an argument to CheckWellformed, supplying options for the
-    /// checks to be performed.
-    /// If "SelfCallsAllowance" is non-null, termination checks will be omitted for calls that look
-    /// like it.  This is useful in function postconditions, where the result of the function is
-    /// syntactically given as what looks like a recursive call with the same arguments.
-    /// "DoReadsChecks" indicates whether or not to perform reads checks.  If so, the generated code
-    /// will make references to $_Frame.  If "saveReadsChecks" is true, then the reads checks will
-    /// be recorded but postponsed.  In particular, CheckWellformed will append to .Locals a list of
-    /// fresh local variables and will append to .Assert assertions with appropriate error messages
-    /// that can be used later.  As a convenience, the ProcessSavedReadsChecks will make use of .Locals
-    /// and .Asserts (and AssignLocals) and update a given StmtListBuilder.
-    /// "LValueContext" indicates that the expression checked for well-formedness is an L-value of
-    /// some assignment.
-    /// </summary>
-    private class WFOptions {
-      public readonly Function SelfCallsAllowance;
-      public readonly bool DoReadsChecks;
-      public readonly bool DoOnlyCoarseGrainedTerminationChecks; // termination checks don't look at decreases clause, but reports errors for any intra-SCC call (this is used in default-value expressions)
-      public readonly List<Bpl.Variable> Locals;
-      public readonly List<Bpl.Cmd> Asserts;
-      public readonly bool LValueContext;
-      public readonly Bpl.QKeyValue AssertKv;
-
-      public WFOptions() {
-      }
-
-      public WFOptions(Function selfCallsAllowance, bool doReadsChecks, bool saveReadsChecks = false, bool doOnlyCoarseGrainedTerminationChecks = false) {
-        Contract.Requires(!saveReadsChecks || doReadsChecks);  // i.e., saveReadsChecks ==> doReadsChecks
-        SelfCallsAllowance = selfCallsAllowance;
-        DoReadsChecks = doReadsChecks;
-        DoOnlyCoarseGrainedTerminationChecks = doOnlyCoarseGrainedTerminationChecks;
-        if (saveReadsChecks) {
-          Locals = new List<Variable>();
-          Asserts = new List<Bpl.Cmd>();
-        }
-      }
-
-      public WFOptions(Bpl.QKeyValue kv) {
-        AssertKv = kv;
-      }
-
-      /// <summary>
-      /// This constructor clones the given "options", but turns off reads checks.  (I wish C# allowed
-      /// me to name the constructor something to indicate this semantics in its name.  Sigh.)
-      /// </summary>
-      public WFOptions(WFOptions options) {
-        Contract.Requires(options != null);
-        SelfCallsAllowance = options.SelfCallsAllowance;
-        DoReadsChecks = false;  // so just leave .Locals and .Asserts as null
-        DoOnlyCoarseGrainedTerminationChecks = options.DoOnlyCoarseGrainedTerminationChecks;
-        LValueContext = options.LValueContext;
-        AssertKv = options.AssertKv;
-      }
-
-      /// <summary>
-      /// This constructor clones the given "options", but sets "LValueContext" to "lValueContext".
-      /// (I wish C# allowed me to name the constructor something to indicate this semantics in its name.  Sigh.)
-      /// </summary>
-      public WFOptions(bool lValueContext, WFOptions options) {
-        Contract.Requires(options != null);
-        SelfCallsAllowance = options.SelfCallsAllowance;
-        DoReadsChecks = options.DoReadsChecks;
-        DoOnlyCoarseGrainedTerminationChecks = options.DoOnlyCoarseGrainedTerminationChecks;
-        Locals = options.Locals;
-        Asserts = options.Asserts;
-        LValueContext = lValueContext;
-        AssertKv = options.AssertKv;
-      }
-
-      public Action<IToken, Bpl.Expr, PODesc.ProofObligationDescription, Bpl.QKeyValue> AssertSink(Translator tran, BoogieStmtListBuilder builder) {
-        return (t, e, d, qk) => {
-          if (Locals != null) {
-            var b = BplLocalVar(tran.CurrentIdGenerator.FreshId("b$reqreads#"), Bpl.Type.Bool, Locals);
-            Asserts.Add(tran.Assert(t, b, d, qk));
-            builder.Add(Bpl.Cmd.SimpleAssign(e.tok, (Bpl.IdentifierExpr)b, e));
-          } else {
-            builder.Add(tran.Assert(t, e, d, qk));
-          }
-        };
-      }
-
-      public List<Bpl.AssignCmd> AssignLocals {
-        get {
-          return Map(Locals, l =>
-            Bpl.Cmd.SimpleAssign(l.tok,
-              new Bpl.IdentifierExpr(Token.NoToken, l),
-              Bpl.Expr.True)
-            );
-        }
-      }
-
-      public void ProcessSavedReadsChecks(List<Variable> locals, BoogieStmtListBuilder builderInitializationArea, BoogieStmtListBuilder builder) {
-        Contract.Requires(locals != null);
-        Contract.Requires(builderInitializationArea != null);
-        Contract.Requires(builder != null);
-        Contract.Requires(Locals != null && Asserts != null);  // ProcessSavedReadsChecks should be called only if the constructor was called with saveReadsChecks
-
-        // var b$reads_guards#0 : bool  ...
-        locals.AddRange(Locals);
-        // b$reads_guards#0 := true   ...
-        foreach (var cmd in AssignLocals) {
-          builderInitializationArea.Add(cmd);
-        }
-        // assert b$reads_guards#0;  ...
-        foreach (var a in Asserts) {
-          builder.Add(a);
-        }
-      }
-    }
-
-    void CheckWellformedAndAssume(Expression expr, WFOptions wfOptions, List<Variable> locals, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Contract.Requires(expr != null);
-      Contract.Requires(expr.Type != null && expr.Type.IsBoolType);
-      Contract.Requires(wfOptions != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-      if (expr is BinaryExpr) {
-        var e = (BinaryExpr)expr;
-        switch (e.ResolvedOp) {
-          case BinaryExpr.ResolvedOpcode.And:
-            // WF[e0]; assume e0; WF[e1]; assume e1;
-            CheckWellformedAndAssume(e.E0, wfOptions, locals, builder, etran);
-            CheckWellformedAndAssume(e.E1, wfOptions, locals, builder, etran);
-            return;
-          case BinaryExpr.ResolvedOpcode.Imp: {
-              // if (*) {
-              //   WF[e0]; assume e0; WF[e1]; assume e1;
-              // } else {
-              //   assume e0 ==> e1;
-              // }
-              var bAnd = new BoogieStmtListBuilder(this, options);
-              CheckWellformedAndAssume(e.E0, wfOptions, locals, bAnd, etran);
-              CheckWellformedAndAssume(e.E1, wfOptions, locals, bAnd, etran);
-              var bImp = new BoogieStmtListBuilder(this, options);
-              bImp.Add(TrAssumeCmd(expr.tok, etran.TrExpr(expr)));
-              builder.Add(new Bpl.IfCmd(expr.tok, null, bAnd.Collect(expr.tok), null, bImp.Collect(expr.tok)));
-            }
-            return;
-          case BinaryExpr.ResolvedOpcode.Or: {
-              // if (*) {
-              //   WF[e0]; assume e0;
-              // } else {
-              //   assume !e0;
-              //   WF[e1]; assume e1;
-              // }
-              var b0 = new BoogieStmtListBuilder(this, options);
-              CheckWellformedAndAssume(e.E0, wfOptions, locals, b0, etran);
-              var b1 = new BoogieStmtListBuilder(this, options);
-              b1.Add(TrAssumeCmd(expr.tok, Bpl.Expr.Not(etran.TrExpr(e.E0))));
-              CheckWellformedAndAssume(e.E1, wfOptions, locals, b1, etran);
-              builder.Add(new Bpl.IfCmd(expr.tok, null, b0.Collect(expr.tok), null, b1.Collect(expr.tok)));
-            }
-            return;
-          default:
-            break;
-        }
-      } else if (expr is ITEExpr) {
-        var e = (ITEExpr)expr;
-        // if (*) {
-        //   WF[test]; assume test;
-        //   WF[thn]; assume thn;
-        // } else {
-        //   assume !test;
-        //   WF[els]; assume els;
-        // }
-        var bThn = new BoogieStmtListBuilder(this, options);
-        CheckWellformedAndAssume(e.Test, wfOptions, locals, bThn, etran);
-        CheckWellformedAndAssume(e.Thn, wfOptions, locals, bThn, etran);
-        var bEls = new BoogieStmtListBuilder(this, options);
-        bEls.Add(TrAssumeCmd(expr.tok, Bpl.Expr.Not(etran.TrExpr(e.Test))));
-        CheckWellformedAndAssume(e.Els, wfOptions, locals, bEls, etran);
-        builder.Add(new Bpl.IfCmd(expr.tok, null, bThn.Collect(expr.tok), null, bEls.Collect(expr.tok)));
-        return;
-      } else if (expr is QuantifierExpr) {
-        var e = (QuantifierExpr)expr;
-        // For (Q x :: body(x)), introduce fresh local variable x'.  Then:
-        //   havoc x'
-        //   WF[body(x')]; assume body(x');
-        // If the quantifier is universal, then continue as:
-        //   assume (\forall x :: body(x));
-
-        // Create local variables corresponding to the bound variables:
-        var substMap = SetupBoundVarsAsLocals(e.BoundVars, builder, locals, etran);
-        // Get the body of the quantifier and suitably substitute for the type variables and bound variables
-        var body = Substitute(e.LogicalBody(true), null, substMap);
-        CheckWellformedAndAssume(body, wfOptions, locals, builder, etran);
-
-        if (e is ForallExpr) {
-          // Although we do the WF check on the original quantifier, we assume the split one.
-          // This ensures that cases like forall x :: x != null && f(x.a) do not fail to verify.
-          builder.Add(TrAssumeCmd(expr.tok, etran.TrExpr(e.SplitQuantifierExpression ?? e)));
-        }
-        return;
-      }
-
-      // resort to the behavior of simply checking well-formedness followed by assuming the translated expression
-      CheckWellformed(expr, wfOptions, locals, builder, etran);
-
-      // NOTE: If the CheckWellformed call above found a split quantifier, it ignored
-      //       the splitting and proceeded to decompose the full quantifier as
-      //       normal. This call to TrExpr, on the other hand, will indeed use the
-      //       split quantifier.
-      builder.Add(TrAssumeCmd(expr.tok, etran.TrExpr(expr)));
-    }
-
-    /// <summary>
-    /// Check the well-formedness of "expr" (but don't leave hanging around any assumptions that affect control flow)
-    /// </summary>
-    void CheckWellformed(Expression expr, WFOptions options, List<Variable> locals, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Contract.Requires(expr != null);
-      Contract.Requires(options != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-      CheckWellformedWithResult(expr, options, null, null, locals, builder, etran);
-    }
-
-    /// <summary>
-    /// Adds to "builder" code that checks the well-formedness of "expr".  Any local variables introduced
-    /// in this code are added to "locals".
-    /// If "result" is non-null, then after checking the well-formedness of "expr", the generated code will
-    /// assume the equivalent of "result == expr".
-    /// See class WFOptions for descriptions of the specified options.
-    /// </summary>
-    void CheckWellformedWithResult(Expression expr, WFOptions wfOptions, Bpl.Expr result, Type resultType,
-                                   List<Bpl.Variable> locals, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Contract.Requires(expr != null);
-      Contract.Requires(wfOptions != null);
-      Contract.Requires((result == null) == (resultType == null));
-      Contract.Requires(locals != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-
-      var origOptions = wfOptions;
-      if (wfOptions.LValueContext) {
-        // Turn off LValueContext for any recursive call
-        wfOptions = new WFOptions(false, wfOptions);
-      }
-
-      switch (expr) {
-        case StaticReceiverExpr stexpr: {
-            if (stexpr.ObjectToDiscard != null) {
-              CheckWellformedWithResult(stexpr.ObjectToDiscard, wfOptions, null, null, locals, builder, etran);
-            }
-
-            break;
-          }
-        case LiteralExpr:
-          CheckResultToBeInType(expr.tok, expr, expr.Type, locals, builder, etran);
-          break;
-        case ThisExpr:
-        case WildcardExpr:
-        case BoogieWrapper:
-          // always allowed
-          break;
-        case IdentifierExpr identifierExpr: {
-            var e = identifierExpr;
-            if (!origOptions.LValueContext) {
-              CheckDefiniteAssignment(e, builder);
-            }
-
-            break;
-          }
-        case DisplayExpression expression: {
-            DisplayExpression e = expression;
-            Contract.Assert(e.Type is CollectionType);
-            var elementType = ((CollectionType)e.Type).Arg;
-            foreach (Expression el in e.Elements) {
-              CheckWellformed(el, wfOptions, locals, builder, etran);
-              CheckSubrange(el.tok, etran.TrExpr(el), el.Type, elementType, builder);
-            }
-
-            break;
-          }
-        case MapDisplayExpr displayExpr: {
-            MapDisplayExpr e = displayExpr;
-            Contract.Assert(e.Type is MapType);
-            var keyType = ((MapType)e.Type).Domain;
-            var valType = ((MapType)e.Type).Range;
-            foreach (ExpressionPair p in e.Elements) {
-              CheckWellformed(p.A, wfOptions, locals, builder, etran);
-              CheckSubrange(p.A.tok, etran.TrExpr(p.A), p.A.Type, keyType, builder);
-              CheckWellformed(p.B, wfOptions, locals, builder, etran);
-              CheckSubrange(p.B.tok, etran.TrExpr(p.B), p.B.Type, valType, builder);
-            }
-
-            break;
-          }
-        case MemberSelectExpr selectExpr: {
-            MemberSelectExpr e = selectExpr;
-            CheckFunctionSelectWF("naked function", builder, etran, e, " Possible solution: eta expansion.");
-            CheckWellformed(e.Obj, wfOptions, locals, builder, etran);
-            if (e.Obj.Type.IsRefType) {
-              if (inBodyInitContext && Expression.AsThis(e.Obj) != null && !e.Member.IsInstanceIndependentConstant) {
-                // this uses the surrogate local
-                if (!origOptions.LValueContext) {
-                  CheckDefiniteAssignmentSurrogate(selectExpr.tok, (Field)e.Member, false, builder);
-                }
-              } else {
-                CheckNonNull(selectExpr.tok, e.Obj, builder, etran, wfOptions.AssertKv);
-                // Check that the receiver is available in the state in which the dereference occurs
-              }
-            } else if (e.Member is DatatypeDestructor dtor) {
-              var correctConstructor = BplOr(dtor.EnclosingCtors.ConvertAll(
-                ctor => FunctionCall(e.tok, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, etran.TrExpr(e.Obj))));
-              if (dtor.EnclosingCtors.Count == dtor.EnclosingCtors[0].EnclosingDatatype.Ctors.Count) {
-                // Every constructor has this destructor; might as well assume that here.
-                builder.Add(TrAssumeCmd(selectExpr.tok, correctConstructor));
-              } else {
-                builder.Add(Assert(GetToken(expr), correctConstructor,
-                  new PODesc.DestructorValid(dtor.Name, dtor.EnclosingCtorNames("or"))));
-              }
-              CheckNotGhostVariant(e, "destructor", dtor.EnclosingCtors, builder, etran);
-            } else if (e.Member is DatatypeDiscriminator discriminator) {
-              CheckNotGhostVariant(e, "discriminator", ((DatatypeDecl)discriminator.EnclosingClass).Ctors, builder, etran);
-            }
-            if (!e.Member.IsStatic) {
-              if (e.Member is TwoStateFunction) {
-                Bpl.Expr wh = GetWhereClause(selectExpr.tok, etran.TrExpr(e.Obj), e.Obj.Type, etran.OldAt(e.AtLabel), ISALLOC, true);
-                if (wh != null) {
-                  var desc = new PODesc.IsAllocated("receiver argument", "in the two-state function's previous state");
-                  builder.Add(Assert(GetToken(expr), wh, desc));
-                }
-              } else if (etran.UsesOldHeap) {
-                Bpl.Expr wh = GetWhereClause(selectExpr.tok, etran.TrExpr(e.Obj), e.Obj.Type, etran, ISALLOC, true);
-                if (wh != null) {
-                  var desc = new PODesc.IsAllocated("receiver",
-                    $"in the state in which its {(e.Member is Field ? "fields" : "members")} are accessed");
-                  builder.Add(Assert(GetToken(expr), wh, desc));
-                }
-              }
-            }
-            if (wfOptions.DoReadsChecks && e.Member is Field && ((Field)e.Member).IsMutable) {
-              wfOptions.AssertSink(this, builder)(selectExpr.tok, Bpl.Expr.SelectTok(selectExpr.tok, etran.TheFrame(selectExpr.tok), etran.TrExpr(e.Obj), GetField(e)),
-                new PODesc.FrameSubset("read field", false), wfOptions.AssertKv);
-            }
-
-            break;
-          }
-        case SeqSelectExpr selectExpr: {
-            SeqSelectExpr e = selectExpr;
-            var eSeqType = e.Seq.Type.NormalizeExpand();
-            bool isSequence = eSeqType is SeqType;
-            CheckWellformed(e.Seq, wfOptions, locals, builder, etran);
-            Bpl.Expr seq = etran.TrExpr(e.Seq);
-            if (eSeqType.IsArrayType) {
-              builder.Add(Assert(GetToken(e.Seq), Bpl.Expr.Neq(seq, predef.Null), new PODesc.NonNull("array")));
-              if (etran.UsesOldHeap) {
-                builder.Add(Assert(GetToken(e.Seq), MkIsAlloc(seq, eSeqType, etran.HeapExpr), new PODesc.IsAllocated("array", null)));
-              }
-            }
-            Bpl.Expr e0 = null;
-            if (eSeqType is MapType) {
-              bool finite = ((MapType)eSeqType).Finite;
-              e0 = etran.TrExpr(e.E0);
-              CheckWellformed(e.E0, wfOptions, locals, builder, etran);
-              var f = finite ? BuiltinFunction.MapDomain : BuiltinFunction.IMapDomain;
-              Bpl.Expr inDomain = FunctionCall(selectExpr.tok, f, predef.MapType(e.tok, finite, predef.BoxType, predef.BoxType), seq);
-              inDomain = Bpl.Expr.Select(inDomain, BoxIfNecessary(e.tok, e0, e.E0.Type));
-              builder.Add(Assert(GetToken(expr), inDomain, new PODesc.ElementInDomain(e.Seq, e.E0), wfOptions.AssertKv));
-            } else if (eSeqType is MultiSetType) {
-              // cool
-
-            } else {
-              if (e.E0 != null) {
-                e0 = etran.TrExpr(e.E0);
-                CheckWellformed(e.E0, wfOptions, locals, builder, etran);
-                var desc = new PODesc.InRange(e.Seq, e.E0, e.SelectOne, e.SelectOne ? "index" : "lower bound");
-                builder.Add(Assert(GetToken(expr), InSeqRange(selectExpr.tok, e0, e.E0.Type, seq, isSequence, null, !e.SelectOne), desc, wfOptions.AssertKv));
-              }
-              if (e.E1 != null) {
-                CheckWellformed(e.E1, wfOptions, locals, builder, etran);
-                Bpl.Expr lowerBound;
-                if (e0 != null && e.E0.Type.IsBitVectorType) {
-                  lowerBound = ConvertExpression(e.E0.tok, e0, e.E0.Type, Type.Int);
-                } else {
-                  lowerBound = e0;
-                }
-                builder.Add(Assert(GetToken(expr), InSeqRange(selectExpr.tok, etran.TrExpr(e.E1), e.E1.Type, seq, isSequence, lowerBound, true),
-                  new PODesc.SequenceSelectRangeValid(e.Seq, e.E0, e.E1, isSequence ? "sequence" : "array"), wfOptions.AssertKv));
-              }
-            }
-            if (wfOptions.DoReadsChecks && eSeqType.IsArrayType) {
-              if (e.SelectOne) {
-                Contract.Assert(e.E0 != null);
-                var i = etran.TrExpr(e.E0);
-                i = ConvertExpression(selectExpr.tok, i, e.E0.Type, Type.Int);
-                Bpl.Expr fieldName = FunctionCall(selectExpr.tok, BuiltinFunction.IndexField, null, i);
-                wfOptions.AssertSink(this, builder)(selectExpr.tok, Bpl.Expr.SelectTok(selectExpr.tok, etran.TheFrame(selectExpr.tok), seq, fieldName),
-                  new PODesc.FrameSubset("read array element", false), wfOptions.AssertKv);
-              } else {
-                Bpl.Expr lowerBound = e.E0 == null ? Bpl.Expr.Literal(0) : etran.TrExpr(e.E0);
-                Contract.Assert(eSeqType.AsArrayType.Dims == 1);
-                Bpl.Expr upperBound = e.E1 == null ? ArrayLength(e.tok, seq, 1, 0) : etran.TrExpr(e.E1);
-                // check that, for all i in lowerBound..upperBound, a[i] is in the frame
-                Bpl.BoundVariable iVar = new Bpl.BoundVariable(e.tok, new Bpl.TypedIdent(e.tok, "$i", Bpl.Type.Int));
-                Bpl.IdentifierExpr i = new Bpl.IdentifierExpr(e.tok, iVar);
-                var range = BplAnd(Bpl.Expr.Le(lowerBound, i), Bpl.Expr.Lt(i, upperBound));
-                var fieldName = FunctionCall(e.tok, BuiltinFunction.IndexField, null, i);
-                var allowedToRead = Bpl.Expr.SelectTok(e.tok, etran.TheFrame(e.tok), seq, fieldName);
-                var trigger = BplTrigger(allowedToRead); // Note, the assertion we're about to produce only seems useful in the check-only mode (that is, with subsumption 0), but if it were to be assumed, we'll use this entire RHS as the trigger
-                var qq = new Bpl.ForallExpr(e.tok, new List<Variable> { iVar }, trigger, BplImp(range, allowedToRead));
-                wfOptions.AssertSink(this, builder)(selectExpr.tok, qq,
-                  new PODesc.FrameSubset("read the indicated range of array elements", false),
-                  wfOptions.AssertKv);
-              }
-            }
-
-            break;
-          }
-        case MultiSelectExpr selectExpr: {
-            MultiSelectExpr e = selectExpr;
-            CheckWellformed(e.Array, wfOptions, locals, builder, etran);
-            Bpl.Expr array = etran.TrExpr(e.Array);
-            builder.Add(Assert(GetToken(e.Array), Bpl.Expr.Neq(array, predef.Null), new PODesc.NonNull("array")));
-            if (etran.UsesOldHeap) {
-              builder.Add(Assert(GetToken(e.Array), MkIsAlloc(array, e.Array.Type, etran.HeapExpr), new PODesc.IsAllocated("array", null)));
-            }
-            for (int idxId = 0; idxId < e.Indices.Count; idxId++) {
-              var idx = e.Indices[idxId];
-              CheckWellformed(idx, wfOptions, locals, builder, etran);
-
-              var index = etran.TrExpr(idx);
-              index = ConvertExpression(idx.tok, index, idx.Type, Type.Int);
-              var lower = Bpl.Expr.Le(Bpl.Expr.Literal(0), index);
-              var length = ArrayLength(idx.tok, array, e.Indices.Count, idxId);
-              var upper = Bpl.Expr.Lt(index, length);
-              var tok = idx is IdentifierExpr ? e.tok : idx.tok; // TODO: Reusing the token of an identifier expression would underline its definition. but this is still not perfect.
-
-              var desc = new PODesc.InRange(e.Array, e.Indices[idxId], true, $"index {idxId}", idxId);
-              builder.Add(Assert(tok, Bpl.Expr.And(lower, upper), desc, wfOptions.AssertKv));
-            }
-            if (wfOptions.DoReadsChecks) {
-              Bpl.Expr fieldName = etran.GetArrayIndexFieldName(e.tok, e.Indices);
-              wfOptions.AssertSink(this, builder)(selectExpr.tok, Bpl.Expr.SelectTok(selectExpr.tok, etran.TheFrame(selectExpr.tok), array, fieldName),
-                new PODesc.FrameSubset("read array element", false), wfOptions.AssertKv);
-            }
-
-            break;
-          }
-        case SeqUpdateExpr updateExpr: {
-            var e = updateExpr;
-            CheckWellformed(e.Seq, wfOptions, locals, builder, etran);
-            Bpl.Expr seq = etran.TrExpr(e.Seq);
-            Bpl.Expr index = etran.TrExpr(e.Index);
-            Bpl.Expr value = etran.TrExpr(e.Value);
-            var collectionType = (CollectionType)e.Seq.Type.NormalizeExpand();
-            // validate index
-            CheckWellformed(e.Index, wfOptions, locals, builder, etran);
-            if (collectionType is SeqType) {
-              var desc = new PODesc.InRange(e.Seq, e.Index, true, "index");
-              builder.Add(Assert(GetToken(e.Index), InSeqRange(updateExpr.tok, index, e.Index.Type, seq, true, null, false), desc, wfOptions.AssertKv));
-            } else {
-              CheckSubrange(e.Index.tok, index, e.Index.Type, collectionType.Arg, builder);
-            }
-            // validate value
-            CheckWellformed(e.Value, wfOptions, locals, builder, etran);
-            if (collectionType is SeqType) {
-              CheckSubrange(e.Value.tok, value, e.Value.Type, collectionType.Arg, builder);
-            } else if (collectionType is MapType mapType) {
-              CheckSubrange(e.Value.tok, value, e.Value.Type, mapType.Range, builder);
-            } else if (collectionType is MultiSetType) {
-              var desc = new PODesc.NonNegative("new number of occurrences");
-              builder.Add(Assert(GetToken(e.Value), Bpl.Expr.Le(Bpl.Expr.Literal(0), value), desc, wfOptions.AssertKv));
-            } else {
-              Contract.Assert(false);
-            }
-
-            break;
-          }
-        case ApplyExpr applyExpr: {
-            var e = applyExpr;
-            int arity = e.Args.Count;
-            var tt = e.Function.Type.AsArrowType;
-            Contract.Assert(tt != null);
-            Contract.Assert(tt.Arity == arity);
-
-            // check WF of receiver and arguments
-            CheckWellformed(e.Function, wfOptions, locals, builder, etran);
-            foreach (Expression arg in e.Args) {
-              CheckWellformed(arg, wfOptions, locals, builder, etran);
-            }
-
-            // check subranges of arguments
-            for (int i = 0; i < arity; ++i) {
-              CheckSubrange(e.Args[i].tok, etran.TrExpr(e.Args[i]), e.Args[i].Type, tt.Args[i], builder);
-            }
-
-            // check parameter availability
-            if (etran.UsesOldHeap) {
-              Bpl.Expr wh = GetWhereClause(e.Function.tok, etran.TrExpr(e.Function), e.Function.Type, etran, ISALLOC, true);
-              if (wh != null) {
-                var desc = new PODesc.IsAllocated("function", "in the state in which the function is invoked");
-                builder.Add(Assert(GetToken(e.Function), wh, desc));
-              }
-              for (int i = 0; i < e.Args.Count; i++) {
-                Expression ee = e.Args[i];
-                wh = GetWhereClause(ee.tok, etran.TrExpr(ee), ee.Type, etran, ISALLOC, true);
-                if (wh != null) {
-                  var desc = new PODesc.IsAllocated("argument", "in the state in which the function is invoked");
-                  builder.Add(Assert(GetToken(ee), wh, desc));
-                }
-              }
-            }
-
-            // translate arguments to requires and reads
-            Func<Expression, Bpl.Expr> TrArg = arg => {
-              Bpl.Expr inner = etran.TrExpr(arg);
-              if (ModeledAsBoxType(arg.Type)) {
-                return inner;
-              } else {
-                return FunctionCall(arg.tok, BuiltinFunction.Box, null, inner);
-              }
-            };
-
-            var args = Concat(
-              Map(tt.TypeArgs, TypeToTy),
-              Cons(etran.HeapExpr,
-                Cons(etran.TrExpr(e.Function),
-                  e.Args.ConvertAll(arg => TrArg(arg)))));
-
-            // Because type inference often gravitates towards inferring non-constrained types, we'll
-            // do some digging on our own to see if we can discover a more precise type.
-            var fnCore = e.Function;
-            while (true) {
-              var prevCore = fnCore;
-              fnCore = Expression.StripParens(fnCore.Resolved);
-              if (object.ReferenceEquals(fnCore, prevCore)) {
-                break;  // we've done what we can do
-              }
-            }
-            Type fnCoreType;
-            if (fnCore is IdentifierExpr) {
-              var v = (IdentifierExpr)fnCore;
-              fnCoreType = v.Var.Type;
-            } else if (fnCore is MemberSelectExpr) {
-              var m = (MemberSelectExpr)fnCore;
-              fnCoreType = m.Member is Field ? ((Field)m.Member).Type : ((Function)m.Member).GetMemberType((ArrowTypeDecl)tt.ResolvedClass);
-            } else {
-              fnCoreType = fnCore.Type;
-            }
-
-            if (!fnCoreType.IsArrowTypeWithoutPreconditions) {
-              // check precond
-              var precond = FunctionCall(e.tok, Requires(arity), Bpl.Type.Bool, args);
-              builder.Add(Assert(GetToken(expr), precond, new PODesc.PreconditionSatisfied(null, null)));
-            }
-
-            if (wfOptions.DoReadsChecks && !fnCoreType.IsArrowTypeWithoutReadEffects) {
-              // check read effects
-              Type objset = new SetType(true, program.SystemModuleManager.ObjectQ());
-              Expression wrap = new BoogieWrapper(
-                FunctionCall(e.tok, Reads(arity), TrType(objset), args),
-                objset);
-              var reads = new FrameExpression(e.tok, wrap, null);
-              CheckFrameSubset(applyExpr.tok, new List<FrameExpression> { reads }, null, null,
-                etran, wfOptions.AssertSink(this, builder), new PODesc.FrameSubset("invoke function", false), wfOptions.AssertKv);
-            }
-
-            break;
-          }
-        case DatatypeValue value: {
-            DatatypeValue dtv = value;
-            for (int i = 0; i < dtv.Ctor.Formals.Count; i++) {
-              var formal = dtv.Ctor.Formals[i];
-              var arg = dtv.Arguments[i];
-              if (!(arg is DefaultValueExpression)) {
-                CheckWellformed(arg, wfOptions, locals, builder, etran);
-              }
-              // Cannot use the datatype's formals, so we substitute the inferred type args:
-              var su = new Dictionary<TypeParameter, Type>();
-              foreach (var p in Enumerable.Zip(dtv.Ctor.EnclosingDatatype.TypeArgs, dtv.InferredTypeArgs)) {
-                su[p.Item1] = p.Item2;
-              }
-              Type ty = formal.Type.Subst(su);
-              CheckSubrange(arg.tok, etran.TrExpr(arg), arg.Type, ty, builder);
-            }
-
-            break;
-          }
-        case FunctionCallExpr callExpr: {
-            FunctionCallExpr e = callExpr;
-            Contract.Assert(e.Function != null);  // follows from the fact that expr has been successfully resolved
-            if (e.Function is SpecialFunction) {
-              CheckWellformedSpecialFunction(e, wfOptions, null, null, locals, builder, etran);
-            } else {
-              // check well-formedness of receiver
-              CheckWellformed(e.Receiver, wfOptions, locals, builder, etran);
-              if (!e.Function.IsStatic && !(e.Receiver is ThisExpr) && !e.Receiver.Type.IsArrowType) {
-                CheckNonNull(callExpr.tok, e.Receiver, builder, etran, wfOptions.AssertKv);
-              } else if (e.Receiver.Type.IsArrowType) {
-                CheckFunctionSelectWF("function specification", builder, etran, e.Receiver, "");
-              }
-              if (!e.Function.IsStatic && !etran.UsesOldHeap) {
-                // the argument can't be assumed to be allocated for the old heap
-                Type et = UserDefinedType.FromTopLevelDecl(e.tok, e.Function.EnclosingClass).Subst(e.GetTypeArgumentSubstitutions());
-                builder.Add(new Bpl.CommentCmd("assume allocatedness for receiver argument to function"));
-                builder.Add(TrAssumeCmd(e.Receiver.tok, MkIsAlloc(etran.TrExpr(e.Receiver), et, etran.HeapExpr)));
-              }
-              // check well-formedness of the other parameters
-              foreach (Expression arg in e.Args) {
-                if (!(arg is DefaultValueExpression)) {
-                  CheckWellformed(arg, wfOptions, locals, builder, etran);
-                }
-              }
-              // create a local variable for each formal parameter, and assign each actual parameter to the corresponding local
-              Dictionary<IVariable, Expression> substMap = new Dictionary<IVariable, Expression>();
-              for (int i = 0; i < e.Function.Formals.Count; i++) {
-                Formal p = e.Function.Formals[i];
-                // Note, in the following, the "##" makes the variable invisible in BVD.  An alternative would be to communicate
-                // to BVD what this variable stands for and display it as such to the user.
-                Type et = p.Type.Subst(e.GetTypeArgumentSubstitutions());
-                LocalVariable local = new LocalVariable(p.RangeToken, "##" + p.Name, et, p.IsGhost);
-                local.type = local.OptionalType;  // resolve local here
-                IdentifierExpr ie = new IdentifierExpr(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator));
-                ie.Var = local; ie.Type = ie.Var.Type;  // resolve ie here
-                substMap.Add(p, ie);
-                locals.Add(new Bpl.LocalVariable(local.Tok, new Bpl.TypedIdent(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator), TrType(local.Type))));
-                Bpl.IdentifierExpr lhs = (Bpl.IdentifierExpr)etran.TrExpr(ie);  // TODO: is this cast always justified?
-                Expression ee = e.Args[i];
-                CheckSubrange(ee.tok, etran.TrExpr(ee), ee.Type, et, builder);
-                Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(p.tok, lhs, CondApplyBox(p.tok, etran.TrExpr(ee), cce.NonNull(ee.Type), et));
-                builder.Add(cmd);
-                if (!etran.UsesOldHeap) {
-                  // the argument can't be assumed to be allocated for the old heap
-                  builder.Add(new Bpl.CommentCmd("assume allocatedness for argument to function"));
-                  builder.Add(TrAssumeCmd(e.Args[i].tok, MkIsAlloc(lhs, et, etran.HeapExpr)));
-                }
-              }
-
-              // Check that every parameter is available in the state in which the function is invoked; this means checking that it has
-              // the right type and is allocated.  These checks usually hold trivially, on account of that the Dafny language only gives
-              // access to expressions of the appropriate type and that are allocated in the current state.  However, if the function is
-              // invoked in the 'old' state or if the function invoked is a two-state function with a non-new parameter, then we need to
-              // check that its arguments were all available at that time as well.
-              if (etran.UsesOldHeap) {
-                if (!e.Function.IsStatic) {
-                  Bpl.Expr wh = GetWhereClause(e.Receiver.tok, etran.TrExpr(e.Receiver), e.Receiver.Type, etran, ISALLOC, true);
-                  if (wh != null) {
-                    var desc = new PODesc.IsAllocated("receiver argument", "in the state in which the function is invoked");
-                    builder.Add(Assert(GetToken(e.Receiver), wh, desc));
-                  }
-                }
-                for (int i = 0; i < e.Args.Count; i++) {
-                  Expression ee = e.Args[i];
-                  Bpl.Expr wh = GetWhereClause(ee.tok, etran.TrExpr(ee), ee.Type, etran, ISALLOC, true);
-                  if (wh != null) {
-                    var desc = new PODesc.IsAllocated("argument", "in the state in which the function is invoked");
-                    builder.Add(Assert(GetToken(ee), wh, desc));
-                  }
-                }
-              } else if (e.Function is TwoStateFunction) {
-                if (!e.Function.IsStatic) {
-                  Bpl.Expr wh = GetWhereClause(e.Receiver.tok, etran.TrExpr(e.Receiver), e.Receiver.Type, etran.OldAt(e.AtLabel), ISALLOC, true);
-                  if (wh != null) {
-                    var desc = new PODesc.IsAllocated("receiver argument", "in the two-state function's previous state");
-                    builder.Add(Assert(GetToken(e.Receiver), wh, desc));
-                  }
-                }
-                Contract.Assert(e.Function.Formals.Count == e.Args.Count);
-                for (int i = 0; i < e.Args.Count; i++) {
-                  var formal = e.Function.Formals[i];
-                  if (formal.IsOld) {
-                    Expression ee = e.Args[i];
-                    Bpl.Expr wh = GetWhereClause(ee.tok, etran.TrExpr(ee), ee.Type, etran.OldAt(e.AtLabel), ISALLOC, true);
-                    if (wh != null) {
-                      var pIdx = e.Args.Count == 1 ? "" : " at index " + i;
-                      var desc = new PODesc.IsAllocated($"argument{pIdx} ('{formal.Name}')", "in the two-state function's previous state");
-                      builder.Add(Assert(GetToken(ee), wh, desc));
-                    }
-                  }
-                }
-              }
-              // check that the preconditions for the call hold
-              foreach (AttributedExpression p in e.Function.Req) {
-                Expression precond = Substitute(p.E, e.Receiver, substMap, e.GetTypeArgumentSubstitutions());
-                var (errorMessage, successMessage) = CustomErrorMessage(p.Attributes);
-                foreach (var ss in TrSplitExpr(precond, etran, true, out var splitHappened)) {
-                  if (ss.IsChecked) {
-                    var tok = new NestedToken(GetToken(expr), ss.Tok);
-                    var desc = new PODesc.PreconditionSatisfied(errorMessage, successMessage);
-                    if (wfOptions.AssertKv != null) {
-                      // use the given assert attribute only
-                      builder.Add(Assert(tok, ss.E, new PODesc.PreconditionSatisfied(errorMessage, successMessage), wfOptions.AssertKv));
-                    } else {
-                      builder.Add(AssertNS(tok, ss.E, new PODesc.PreconditionSatisfied(errorMessage, successMessage)));
-                    }
-                  }
-                }
-                if (wfOptions.AssertKv == null) {
-                  // assume only if no given assert attribute is given
-                  builder.Add(TrAssumeCmd(callExpr.tok, etran.TrExpr(precond)));
-                }
-              }
-              if (wfOptions.DoReadsChecks) {
-                // check that the callee reads only what the caller is already allowed to read
-                var s = new Substituter(null, new Dictionary<IVariable, Expression>(), e.GetTypeArgumentSubstitutions());
-                CheckFrameSubset(callExpr.tok,
-                  e.Function.Reads.ConvertAll(s.SubstFrameExpr),
-                  e.Receiver, substMap, etran, wfOptions.AssertSink(this, builder), new PODesc.FrameSubset("invoke function", false), wfOptions.AssertKv);
-              }
-
-              Bpl.Expr allowance = null;
-              if (codeContext != null && e.CoCall != FunctionCallExpr.CoCallResolution.Yes && !(e.Function is ExtremePredicate)) {
-                // check that the decreases measure goes down
-                var calleeSCCLookup = e.IsByMethodCall ? (ICallable)e.Function.ByMethodDecl : e.Function;
-                Contract.Assert(calleeSCCLookup != null);
-                if (ModuleDefinition.InSameSCC(calleeSCCLookup, codeContext)) {
-                  if (wfOptions.DoOnlyCoarseGrainedTerminationChecks) {
-                    builder.Add(Assert(GetToken(expr), Bpl.Expr.False, new PODesc.IsNonRecursive()));
-                  } else {
-                    List<Expression> contextDecreases = codeContext.Decreases.Expressions;
-                    List<Expression> calleeDecreases = e.Function.Decreases.Expressions;
-                    if (e.Function == wfOptions.SelfCallsAllowance) {
-                      allowance = Bpl.Expr.True;
-                      if (!e.Function.IsStatic) {
-                        allowance = BplAnd(allowance, Bpl.Expr.Eq(etran.TrExpr(e.Receiver), new Bpl.IdentifierExpr(e.tok, etran.This)));
-                      }
-                      for (int i = 0; i < e.Args.Count; i++) {
-                        Expression ee = e.Args[i];
-                        Formal ff = e.Function.Formals[i];
-                        allowance = BplAnd(allowance,
-                          Bpl.Expr.Eq(etran.TrExpr(ee),
-                            new Bpl.IdentifierExpr(e.tok, ff.AssignUniqueName(currentDeclaration.IdGenerator), TrType(ff.Type))));
-                      }
-                    }
-                    string hint;
-                    switch (e.CoCall) {
-                      case FunctionCallExpr.CoCallResolution.NoBecauseFunctionHasSideEffects:
-                        hint = "note that only functions without side effects can be called co-recursively";
-                        break;
-                      case FunctionCallExpr.CoCallResolution.NoBecauseFunctionHasPostcondition:
-                        hint = "note that only functions without any ensures clause can be called co-recursively";
-                        break;
-                      case FunctionCallExpr.CoCallResolution.NoBecauseIsNotGuarded:
-                        hint = "note that the call is not sufficiently guarded to be used co-recursively";
-                        break;
-                      case FunctionCallExpr.CoCallResolution.NoBecauseRecursiveCallsAreNotAllowedInThisContext:
-                        hint = "note that calls cannot be co-recursive in this context";
-                        break;
-                      case FunctionCallExpr.CoCallResolution.NoBecauseRecursiveCallsInDestructiveContext:
-                        hint = "note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts";
-                        break;
-                      case FunctionCallExpr.CoCallResolution.No:
-                        hint = null;
-                        break;
-                      default:
-                        Contract.Assert(false); // unexpected CoCallResolution
-                        goto case FunctionCallExpr.CoCallResolution.No; // please the compiler
-                    }
-                    if (e.CoCallHint != null) {
-                      hint = hint == null ? e.CoCallHint : string.Format("{0}; {1}", hint, e.CoCallHint);
-                    }
-                    CheckCallTermination(callExpr.tok, contextDecreases, calleeDecreases, allowance, e.Receiver, substMap, e.GetTypeArgumentSubstitutions(),
-                      etran, etran, builder, codeContext.InferredDecreases, hint);
-                  }
-                }
-              }
-              // all is okay, so allow this function application access to the function's axiom, except if it was okay because of the self-call allowance.
-              Bpl.IdentifierExpr canCallFuncID = new Bpl.IdentifierExpr(callExpr.tok, e.Function.FullSanitizedName + "#canCall", Bpl.Type.Bool);
-              List<Bpl.Expr> args = etran.FunctionInvocationArguments(e, null, null);
-              Bpl.Expr canCallFuncAppl = new Bpl.NAryExpr(GetToken(expr), new Bpl.FunctionCall(canCallFuncID), args);
-              builder.Add(TrAssumeCmd(callExpr.tok, allowance == null ? canCallFuncAppl : Bpl.Expr.Or(allowance, canCallFuncAppl)));
-
-              var returnType = e.Type.AsDatatype;
-              if (returnType != null && returnType.Ctors.Count == 1) {
-                var correctConstructor = FunctionCall(e.tok, returnType.Ctors[0].QueryField.FullSanitizedName, Bpl.Type.Bool, etran.TrExpr(e));
-                // There is only one constructor, so the value must be been constructed by it; might as well assume that here.
-                builder.Add(TrAssumeCmd(callExpr.tok, correctConstructor));
-              }
-            }
-
-            break;
-          }
-        case SeqConstructionExpr constructionExpr: {
-            var e = constructionExpr;
-            CheckWellformed(e.N, wfOptions, locals, builder, etran);
-            var desc = new PODesc.NonNegative("sequence size");
-            builder.Add(Assert(GetToken(e.N), Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(e.N)), desc));
-
-            CheckWellformed(e.Initializer, wfOptions, locals, builder, etran);
-            var eType = e.Type.AsSeqType.Arg;
-            CheckElementInit(e.tok, false, new List<Expression>() { e.N }, eType, e.Initializer, null, builder, etran, wfOptions);
-            break;
-          }
-        case MultiSetFormingExpr formingExpr: {
-            MultiSetFormingExpr e = formingExpr;
-            CheckWellformed(e.E, wfOptions, locals, builder, etran);
-            break;
-          }
-        case OldExpr oldExpr: {
-            var e = oldExpr;
-            // Anything read inside the 'old' expressions depends only on the old heap, which isn't included in the
-            // frame axiom.  In other words, 'old' expressions have no dependencies on the current heap.  Therefore,
-            // we turn off any reads checks for "e.E".
-            CheckWellformed(e.E, new WFOptions(wfOptions), locals, builder, etran.OldAt(e.AtLabel));
-            break;
-          }
-        case UnchangedExpr unchangedExpr: {
-            var e = unchangedExpr;
-            foreach (var fe in e.Frame) {
-              CheckWellformed(fe.E, wfOptions, locals, builder, etran);
-
-              EachReferenceInFrameExpression(fe.E, locals, builder, etran, out var description, out var ty, out var r, out var ante);
-              Bpl.Expr nonNull;
-              if (ty.IsNonNullRefType) {
-                nonNull = Bpl.Expr.True;
-              } else {
-                Contract.Assert(ty.IsRefType);
-                nonNull = Bpl.Expr.Neq(r, predef.Null);
-                builder.Add(Assert(GetToken(fe.E), BplImp(ante, nonNull), new PODesc.NonNull(description, description != "object")));
-              }
-              // check that "r" was allocated in the "e.AtLabel" state
-              Bpl.Expr wh = GetWhereClause(fe.E.tok, r, ty, etran.OldAt(e.AtLabel), ISALLOC, true);
-              if (wh != null) {
-                var desc = new PODesc.IsAllocated(description, "in the old-state of the 'unchanged' predicate",
-                  description != "object");
-                builder.Add(Assert(GetToken(fe.E), BplImp(BplAnd(ante, nonNull), wh), desc));
-              }
-              // check that the 'unchanged' argument reads only what the context is allowed to read
-              if (wfOptions.DoReadsChecks) {
-                CheckFrameSubset(fe.E.tok,
-                  new List<FrameExpression>() { fe },
-                  null, new Dictionary<IVariable, Expression>(), etran, wfOptions.AssertSink(this, builder),
-                  new PODesc.FrameSubset($"read state of 'unchanged' {description}", false), wfOptions.AssertKv);
-              }
-            }
-
-            break;
-          }
-        case UnaryExpr unaryExpr: {
-            UnaryExpr e = unaryExpr;
-            CheckWellformed(e.E, wfOptions, locals, builder, etran);
-            if (e is ConversionExpr) {
-              var ee = (ConversionExpr)e;
-              CheckResultToBeInType(unaryExpr.tok, ee.E, ee.ToType, locals, builder, etran, ee.messagePrefix);
-            }
-
-            break;
-          }
-        case BinaryExpr binaryExpr: {
-            BinaryExpr e = binaryExpr;
-            CheckWellformed(e.E0, wfOptions, locals, builder, etran);
-            switch (e.ResolvedOp) {
-              case BinaryExpr.ResolvedOpcode.And:
-              case BinaryExpr.ResolvedOpcode.Imp: {
-                  BoogieStmtListBuilder b = new BoogieStmtListBuilder(this, options);
-                  CheckWellformed(e.E1, wfOptions, locals, b, etran);
-                  builder.Add(new Bpl.IfCmd(binaryExpr.tok, etran.TrExpr(e.E0), b.Collect(binaryExpr.tok), null, null));
-                }
-                break;
-              case BinaryExpr.ResolvedOpcode.Or: {
-                  BoogieStmtListBuilder b = new BoogieStmtListBuilder(this, options);
-                  CheckWellformed(e.E1, wfOptions, locals, b, etran);
-                  builder.Add(new Bpl.IfCmd(binaryExpr.tok, Bpl.Expr.Not(etran.TrExpr(e.E0)), b.Collect(binaryExpr.tok), null, null));
-                }
-                break;
-              case BinaryExpr.ResolvedOpcode.Add:
-              case BinaryExpr.ResolvedOpcode.Sub:
-              case BinaryExpr.ResolvedOpcode.Mul:
-                CheckWellformed(e.E1, wfOptions, locals, builder, etran);
-                if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.Sub && e.E0.Type.IsBigOrdinalType) {
-                  var rhsIsNat = FunctionCall(binaryExpr.tok, "ORD#IsNat", Bpl.Type.Bool, etran.TrExpr(e.E1));
-                  builder.Add(Assert(GetToken(expr), rhsIsNat, new PODesc.OrdinalSubtractionIsNatural()));
-                  var offset0 = FunctionCall(binaryExpr.tok, "ORD#Offset", Bpl.Type.Int, etran.TrExpr(e.E0));
-                  var offset1 = FunctionCall(binaryExpr.tok, "ORD#Offset", Bpl.Type.Int, etran.TrExpr(e.E1));
-                  builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(offset1, offset0), new PODesc.OrdinalSubtractionUnderflow()));
-                } else if (e.Type.IsCharType) {
-                  var e0 = FunctionCall(binaryExpr.tok, "char#ToInt", Bpl.Type.Int, etran.TrExpr(e.E0));
-                  var e1 = FunctionCall(binaryExpr.tok, "char#ToInt", Bpl.Type.Int, etran.TrExpr(e.E1));
-                  if (e.ResolvedOp == BinaryExpr.ResolvedOpcode.Add) {
-                    builder.Add(Assert(GetToken(expr),
-                      FunctionCall(Token.NoToken, BuiltinFunction.IsChar, null,
-                        Bpl.Expr.Binary(BinaryOperator.Opcode.Add, e0, e1)), new PODesc.CharOverflow()));
-                  } else {
-                    Contract.Assert(e.ResolvedOp == BinaryExpr.ResolvedOpcode.Sub);  // .Mul is not supported for char
-                    builder.Add(Assert(GetToken(expr),
-                      FunctionCall(Token.NoToken, BuiltinFunction.IsChar, null,
-                        Bpl.Expr.Binary(BinaryOperator.Opcode.Sub, e0, e1)), new PODesc.CharUnderflow()));
-                  }
-                }
-                CheckResultToBeInType(binaryExpr.tok, binaryExpr, binaryExpr.Type, locals, builder, etran);
-                break;
-              case BinaryExpr.ResolvedOpcode.Div:
-              case BinaryExpr.ResolvedOpcode.Mod: {
-                  Bpl.Expr zero;
-                  if (e.E1.Type.IsBitVectorType) {
-                    zero = BplBvLiteralExpr(e.tok, BaseTypes.BigNum.ZERO, e.E1.Type.AsBitVectorType);
-                  } else if (e.E1.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-                    zero = Bpl.Expr.Literal(BaseTypes.BigDec.ZERO);
-                  } else {
-                    zero = Bpl.Expr.Literal(0);
-                  }
-                  CheckWellformed(e.E1, wfOptions, locals, builder, etran);
-                  builder.Add(Assert(GetToken(expr), Bpl.Expr.Neq(etran.TrExpr(e.E1), zero), new PODesc.DivisorNonZero(e.E1), wfOptions.AssertKv));
-                  CheckResultToBeInType(binaryExpr.tok, binaryExpr, binaryExpr.Type, locals, builder, etran);
-                }
-                break;
-              case BinaryExpr.ResolvedOpcode.LeftShift:
-              case BinaryExpr.ResolvedOpcode.RightShift: {
-                  CheckWellformed(e.E1, wfOptions, locals, builder, etran);
-                  var w = e.Type.AsBitVectorType.Width;
-                  var upperDesc = new PODesc.ShiftUpperBound(w);
-                  if (e.E1.Type.IsBitVectorType) {
-                    // Known to be non-negative, so we don't need to check lower bound.
-                    // Check upper bound, that is, check "E1 <= w"
-                    var e1Width = e.E1.Type.AsBitVectorType.Width;
-                    if (w < (BigInteger.One << e1Width)) {
-                      // w is a number that can be represented in the e.E1.Type, so do the comparison in that bitvector type.
-                      var bound = BplBvLiteralExpr(e.tok, BaseTypes.BigNum.FromInt(w), e1Width);
-                      var cmp = etran.TrToFunctionCall(binaryExpr.tok, "le_bv" + e1Width, Bpl.Type.Bool, etran.TrExpr(e.E1), bound, false);
-                      builder.Add(Assert(GetToken(expr), cmp, upperDesc, wfOptions.AssertKv));
-                    } else {
-                      // In the previous branch, we had:
-                      //     w < 2^e1Width               (*)
-                      // From the type of E1, we have:
-                      //     E1 < 2^e1Width
-                      // In this branch, (*) does not hold, so we therefore have the following:
-                      //     E1 < 2^e1Width <= w
-                      // In other words, the condition
-                      //     E1 <= w
-                      // already holds, so there is no reason to check it.
-                    }
-                  } else {
-                    var positiveDesc = new PODesc.ShiftLowerBound();
-                    builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(e.E1)), positiveDesc, wfOptions.AssertKv));
-                    builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(etran.TrExpr(e.E1), Bpl.Expr.Literal(w)), upperDesc, wfOptions.AssertKv));
-                  }
-                }
-                break;
-              case BinaryExpr.ResolvedOpcode.EqCommon:
-              case BinaryExpr.ResolvedOpcode.NeqCommon:
-                CheckWellformed(e.E1, wfOptions, locals, builder, etran);
-                if (e.InCompiledContext) {
-                  if (CheckTypeCharacteristics_Visitor.CanCompareWith(e.E0) || CheckTypeCharacteristics_Visitor.CanCompareWith(e.E1)) {
-                    // everything's fine
-                  } else {
-                    Contract.Assert(!e.E0.Type.SupportsEquality); // otherwise, CanCompareWith would have returned "true" above
-                    Contract.Assert(!e.E1.Type.SupportsEquality); // otherwise, CanCompareWith would have returned "true" above
-                    Contract.Assert(e.E0.Type.PartiallySupportsEquality); // otherwise, the code wouldn't have got passed the resolver
-                    Contract.Assert(e.E1.Type.PartiallySupportsEquality); // otherwise, the code wouldn't have got passed the resolver
-                    var dt = e.E0.Type.AsIndDatatype;
-                    Contract.Assert(dt != null); // only inductive datatypes support equality partially
-
-                    // to compare the datatype values for equality, there must not be any possibility that either of the datatype
-                    // variants is a ghost constructor
-                    var ghostConstructors = dt.Ctors.Where(ctor => ctor.IsGhost).ToList();
-                    Contract.Assert(ghostConstructors.Count != 0);
-
-                    void CheckOperand(Expression operand) {
-                      var value = etran.TrExpr(operand);
-                      var notGhostCtor = BplAnd(ghostConstructors.ConvertAll(
-                        ctor => Bpl.Expr.Not(FunctionCall(expr.tok, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, value))));
-                      builder.Add(Assert(GetToken(expr), notGhostCtor,
-                        new PODesc.NotGhostVariant("equality", ghostConstructors)));
-                    }
-
-                    CheckOperand(e.E0);
-                    CheckOperand(e.E1);
-                  }
-
-
-                }
-                break;
-              default:
-                CheckWellformed(e.E1, wfOptions, locals, builder, etran);
-                break;
-            }
-
-            break;
-          }
-        case TernaryExpr ternaryExpr: {
-            var e = ternaryExpr;
-            foreach (var ee in e.SubExpressions) {
-              CheckWellformed(ee, wfOptions, locals, builder, etran);
-            }
-            switch (e.Op) {
-              case TernaryExpr.Opcode.PrefixEqOp:
-              case TernaryExpr.Opcode.PrefixNeqOp:
-                if (e.E0.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
-                  builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(e.E0)), new PODesc.PrefixEqualityLimit(), wfOptions.AssertKv));
-                }
-                break;
-              default:
-                Contract.Assert(false);  // unexpected ternary expression
-                break;
-            }
-
-            break;
-          }
-        case LetExpr letExpr:
-          CheckWellformedLetExprWithResult(letExpr, wfOptions, result, resultType, locals, builder, etran, true);
-          result = null;
-          break;
-        case ComprehensionExpr comprehensionExpr: {
-            var e = comprehensionExpr;
-            var q = e as QuantifierExpr;
-            var lam = e as LambdaExpr;
-            var mc = e as MapComprehension;
-            if (mc != null && !mc.IsGeneralMapComprehension) {
-              mc = null;  // mc will be non-null when "e" is a general map comprehension
-            }
-
-            // This is a WF check, so we look at the original quantifier, not the split one.
-            // This ensures that cases like forall x :: x != null && f(x.a) do not fail to verify.
-
-            builder.Add(new Bpl.CommentCmd("Begin Comprehension WF check"));
-            BplIfIf(e.tok, lam != null, null, builder, nextBuilder => {
-              var comprehensionEtran = etran;
-              if (lam != null) {
-                // Havoc heap
-                locals.Add(BplLocalVar(CurrentIdGenerator.FreshId((etran.UsesOldHeap ? "$Heap_at_" : "") + "$lambdaHeap#"), predef.HeapType, out var lambdaHeap));
-                comprehensionEtran = new ExpressionTranslator(comprehensionEtran, lambdaHeap);
-                nextBuilder.Add(new HavocCmd(expr.tok, Singleton((Bpl.IdentifierExpr)comprehensionEtran.HeapExpr)));
-                nextBuilder.Add(new AssumeCmd(expr.tok, FunctionCall(expr.tok, BuiltinFunction.IsGoodHeap, null, comprehensionEtran.HeapExpr)));
-                nextBuilder.Add(new AssumeCmd(expr.tok, HeapSameOrSucc(etran.HeapExpr, comprehensionEtran.HeapExpr)));
-              }
-
-              var substMap = SetupBoundVarsAsLocals(e.BoundVars, out var typeAntecedents, nextBuilder, locals, comprehensionEtran);
-              BplIfIf(e.tok, true, typeAntecedents, nextBuilder, newBuilder => {
-                var s = new Substituter(null, substMap, new Dictionary<TypeParameter, Type>());
-                var body = Substitute(e.Term, null, substMap);
-                var bodyLeft = mc != null ? Substitute(mc.TermLeft, null, substMap) : null;
-                var substMapPrime = mc != null ? SetupBoundVarsAsLocals(e.BoundVars, newBuilder, locals, comprehensionEtran, "#prime") : null;
-                var bodyLeftPrime = mc != null ? Substitute(mc.TermLeft, null, substMapPrime) : null;
-                var bodyPrime = mc != null ? Substitute(e.Term, null, substMapPrime) : null;
-                List<FrameExpression> reads = null;
-
-                var newOptions = wfOptions;
-                if (lam != null) {
-                  // Set up a new frame
-                  var frameName = CurrentIdGenerator.FreshId("$_Frame#l");
-                  reads = lam.Reads.ConvertAll(s.SubstFrameExpr);
-                  DefineFrame(e.tok, reads, newBuilder, locals, frameName, comprehensionEtran);
-                  comprehensionEtran = new ExpressionTranslator(comprehensionEtran, frameName);
-
-                  // Check frame WF and that it read covers itself
-                  newOptions = new WFOptions(wfOptions.SelfCallsAllowance, true /* check reads clauses */, true /* delay reads checks */);
-                  CheckFrameWellFormed(newOptions, reads, locals, newBuilder, comprehensionEtran);
-                  // new options now contains the delayed reads checks
-                  newOptions.ProcessSavedReadsChecks(locals, builder, newBuilder);
-
-                  // continue doing reads checks, but don't delay them
-                  newOptions = new WFOptions(wfOptions.SelfCallsAllowance, true, false);
-                }
-
-                // check requires/range
-                Bpl.Expr guard = null;
-                if (e.Range != null) {
-                  var range = Substitute(e.Range, null, substMap);
-                  CheckWellformed(range, newOptions, locals, newBuilder, comprehensionEtran);
-                  guard = comprehensionEtran.TrExpr(range);
-                }
-
-                if (mc != null) {
-                  Contract.Assert(bodyLeft != null);
-                  BplIfIf(e.tok, guard != null, guard, newBuilder, b => { CheckWellformed(bodyLeft, newOptions, locals, b, comprehensionEtran); });
-                }
-                BplIfIf(e.tok, guard != null, guard, newBuilder, b => {
-                  Bpl.Expr resultIe = null;
-                  Type rangeType = null;
-                  if (lam != null) {
-                    var resultName = CurrentIdGenerator.FreshId("lambdaResult#");
-                    var resultVar = new Bpl.LocalVariable(body.tok, new Bpl.TypedIdent(body.tok, resultName, TrType(body.Type)));
-                    locals.Add(resultVar);
-                    resultIe = new Bpl.IdentifierExpr(body.tok, resultVar);
-                    rangeType = lam.Type.AsArrowType.Result;
-                  }
-                  CheckWellformedWithResult(body, newOptions, resultIe, rangeType, locals, b, comprehensionEtran);
-                });
-
-                if (mc != null) {
-                  Contract.Assert(substMapPrime != null);
-                  Contract.Assert(bodyLeftPrime != null);
-                  Contract.Assert(bodyPrime != null);
-                  Bpl.Expr guardPrime = null;
-                  if (guard != null) {
-                    Contract.Assert(e.Range != null);
-                    var rangePrime = Substitute(e.Range, null, substMapPrime);
-                    guardPrime = comprehensionEtran.TrExpr(rangePrime);
-                  }
-                  BplIfIf(e.tok, guard != null, BplAnd(guard, guardPrime), newBuilder, b => {
-                    var different = BplOr(
-                      Bpl.Expr.Neq(comprehensionEtran.TrExpr(bodyLeft), comprehensionEtran.TrExpr(bodyLeftPrime)),
-                      Bpl.Expr.Eq(comprehensionEtran.TrExpr(body), comprehensionEtran.TrExpr(bodyPrime)));
-                    b.Add(Assert(GetToken(mc.TermLeft), different, new PODesc.ComprehensionNoAlias()));
-                  });
-                }
-              });
-
-              if (lam != null) {
-                // assume false (heap was havoced inside an if)
-                Contract.Assert(nextBuilder != builder);
-                nextBuilder.Add(new AssumeCmd(e.tok, Bpl.Expr.False));
-              }
-            });
-            builder.Add(new Bpl.CommentCmd("End Comprehension WF check"));
-            break;
-          }
-        case StmtExpr stmtExpr:
-          CheckWellformedStmtExpr(stmtExpr, wfOptions, result, resultType, locals, builder, etran);
-          result = null;
-          break;
-        case ITEExpr iteExpr: {
-            ITEExpr e = iteExpr;
-            CheckWellformed(e.Test, wfOptions, locals, builder, etran);
-            var bThen = new BoogieStmtListBuilder(this, options);
-            var bElse = new BoogieStmtListBuilder(this, options);
-            if (e.IsBindingGuard) {
-              // if it is BindingGuard, e.Thn is a let-such-that created from the BindingGuard.
-              // We don't need to do well-formedness check on the Rhs of the LetExpr since it
-              // has already been checked in e.Test
-              var letExpr = (LetExpr)e.Thn;
-              Contract.Assert(letExpr != null);
-              CheckWellformedLetExprWithResult(letExpr, wfOptions, result, resultType, locals, bThen, etran, false);
-            } else {
-              CheckWellformedWithResult(e.Thn, wfOptions, result, resultType, locals, bThen, etran);
-            }
-            CheckWellformedWithResult(e.Els, wfOptions, result, resultType, locals, bElse, etran);
-            builder.Add(new Bpl.IfCmd(iteExpr.tok, etran.TrExpr(e.Test), bThen.Collect(iteExpr.tok), null, bElse.Collect(iteExpr.tok)));
-            result = null;
-            break;
-          }
-        case MatchExpr matchExpr:
-          result = TrMatchExpr(matchExpr, wfOptions, result, resultType, locals, builder, etran);
-          break;
-        case DatatypeUpdateExpr updateExpr: {
-            var e = updateExpr;
-            // check that source expression is created from one of the legal source constructors, then proceed according to the .ResolvedExpression
-            var correctConstructor = BplOr(e.LegalSourceConstructors.ConvertAll(
-              ctor => FunctionCall(e.tok, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, etran.TrExpr(e.Root))));
-            if (e.LegalSourceConstructors.Count == e.Type.AsDatatype.Ctors.Count) {
-              // Every constructor has this destructor; no need to check anything
-            } else {
-              builder.Add(Assert(GetToken(expr), correctConstructor,
-                new PODesc.ValidConstructorNames(DatatypeDestructor.PrintableCtorNameList(e.LegalSourceConstructors, "or"))));
-            }
-
-            CheckNotGhostVariant(e.InCompiledContext, updateExpr, e.Root, "update of", e.Members,
-              e.LegalSourceConstructors, builder, etran);
-
-            CheckWellformedWithResult(e.ResolvedExpression, wfOptions, result, resultType, locals, builder, etran);
-            result = null;
-            break;
-          }
-        case ConcreteSyntaxExpression expression: {
-            var e = expression;
-            CheckWellformedWithResult(e.ResolvedExpression, wfOptions, result, resultType, locals, builder, etran);
-            result = null;
-            break;
-          }
-        case NestedMatchExpr nestedMatchExpr:
-          CheckWellformedWithResult(nestedMatchExpr.Flattened, wfOptions, result, resultType, locals, builder, etran);
-          result = null;
-          break;
-        case BoogieFunctionCall call: {
-            var e = call;
-            foreach (var arg in e.Args) {
-              CheckWellformed(arg, wfOptions, locals, builder, etran);
-            }
-
-            break;
-          }
-        default:
-          Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
-      }
-
-      if (result != null) {
-        Contract.Assert(resultType != null);
-        var bResult = etran.TrExpr(expr);
-        CheckSubrange(expr.tok, bResult, expr.Type, resultType, builder);
-        builder.Add(TrAssumeCmd(expr.tok, Bpl.Expr.Eq(result, bResult)));
-        builder.Add(TrAssumeCmd(expr.tok, CanCallAssumption(expr, etran)));
-        builder.Add(new CommentCmd("CheckWellformedWithResult: any expression"));
-        builder.Add(TrAssumeCmd(expr.tok, MkIs(result, resultType)));
-      }
-    }
-
-    private Expr TrMatchExpr(MatchExpr me, WFOptions wfOptions, Expr result, Type resultType, List<Variable> locals,
-      BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      FillMissingCases(me);
-
-      CheckWellformed(me.Source, wfOptions, locals, builder, etran);
-      Bpl.Expr src = etran.TrExpr(me.Source);
-      Bpl.IfCmd ifCmd = null;
-      BoogieStmtListBuilder elsBldr = new BoogieStmtListBuilder(this, options);
-      elsBldr.Add(TrAssumeCmd(me.tok, Bpl.Expr.False));
-      StmtList els = elsBldr.Collect(me.tok);
-      foreach (var missingCtor in me.MissingCases) {
-        // havoc all bound variables
-        var b = new BoogieStmtListBuilder(this, options);
-        List<Variable> newLocals = new List<Variable>();
-        Bpl.Expr r = CtorInvocation(me.tok, missingCtor, etran, newLocals, b);
-        locals.AddRange(newLocals);
-
-        if (newLocals.Count != 0) {
-          List<Bpl.IdentifierExpr> havocIds = new List<Bpl.IdentifierExpr>();
-          foreach (Variable local in newLocals) {
-            havocIds.Add(new Bpl.IdentifierExpr(local.tok, local));
-          }
-
-          builder.Add(new Bpl.HavocCmd(me.tok, havocIds));
-        }
-
-        String missingStr = me.Context.FillHole(new IdCtx(missingCtor)).AbstractAllHoles().ToString();
-        b.Add(Assert(GetToken(me), Bpl.Expr.False, new PODesc.MatchIsComplete("expression", missingStr)));
-
-        Bpl.Expr guard = Bpl.Expr.Eq(src, r);
-        ifCmd = new Bpl.IfCmd(me.tok, guard, b.Collect(me.tok), ifCmd, els);
-        els = null;
-      }
-
-      for (int i = me.Cases.Count; 0 <= --i;) {
-        MatchCaseExpr mc = me.Cases[i];
-        BoogieStmtListBuilder b = new BoogieStmtListBuilder(this, options);
-        Bpl.Expr ct = CtorInvocation(mc, me.Source.Type, etran, locals, b, NOALLOC, false);
-        // generate:  if (src == ctor(args)) { assume args-is-well-typed; mc.Body is well-formed; assume Result == TrExpr(case); } else ...
-        CheckWellformedWithResult(mc.Body, wfOptions, result, resultType, locals, b, etran);
-        ifCmd = new Bpl.IfCmd(mc.tok, Bpl.Expr.Eq(src, ct), b.Collect(mc.tok), ifCmd, els);
-        els = null;
-      }
-
-      builder.Add(ifCmd);
-      result = null;
-      return result;
-    }
-
-    private void CheckWellformedStmtExpr(StmtExpr stmtExpr, WFOptions options, Expr result, Type resultType, List<Variable> locals,
-      BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      // If we're inside an "old" expression, then "etran" will know how to translate
-      // expressions. However, here, we're also having to translate e.S, which is a
-      // Statement. Since statement translation (in particular, translation of CallStmt's)
-      // work directly on the global variable $Heap, we temporarily change its value here.
-      if (etran.UsesOldHeap) {
-        BuildWithHeapAs(stmtExpr.S.Tok, etran.HeapExpr, "StmtExpr#", locals, builder,
-          () => TrStmt(stmtExpr.S, builder, locals, etran));
-      } else {
-        TrStmt(stmtExpr.S, builder, locals, etran);
-      }
-
-      CheckWellformedWithResult(stmtExpr.E, options, result, resultType, locals, builder, etran);
-    }
-
-    /// <summary>
-    /// Temporarily set the heap to the value etran.HeapExpr and call build().
-    ///
-    /// The Boogie code generated by build() should have just one exit point, namely at the
-    /// end of the code generated. (Any other exit would cause control flow to miss
-    /// BuildWithHeapAs's assignment that restores the value of $Heap.)
-    /// </summary>
-    void BuildWithHeapAs(IToken token, Bpl.Expr temporaryHeap, string heapVarSuffix, List<Variable> locals,
-      BoogieStmtListBuilder builder, System.Action build) {
-      var suffix = CurrentIdGenerator.FreshId(heapVarSuffix);
-      var tmpHeapVar = new Bpl.LocalVariable(token, new Bpl.TypedIdent(token, "Heap$" + suffix, predef.HeapType));
-      locals.Add(tmpHeapVar);
-      var tmpHeap = new Bpl.IdentifierExpr(token, tmpHeapVar);
-      var generalEtran = new ExpressionTranslator(this, predef, token);
-      var theHeap = generalEtran.HeapCastToIdentifierExpr;
-
-      // tmpHeap := $Heap;
-      builder.Add(Bpl.Cmd.SimpleAssign(token, tmpHeap, theHeap));
-      // $Heap := etran.HeapExpr;
-      builder.Add(Bpl.Cmd.SimpleAssign(token, theHeap, temporaryHeap));
-
-      build();
-
-      // $Heap := tmpHeap;
-      builder.Add(Bpl.Cmd.SimpleAssign(token, theHeap, tmpHeap));
-    }
-
-    private void CheckNotGhostVariant(MemberSelectExpr expr, string whatKind, List<DatatypeCtor> candidateCtors,
-      BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      CheckNotGhostVariant(expr.InCompiledContext, expr, expr.Obj, whatKind, new List<MemberDecl>() { expr.Member },
-        candidateCtors, builder, etran);
-    }
-
-    private void CheckNotGhostVariant(bool inCompiledContext, Expression exprUsedForToken, Expression datatypeValue,
-      string whatKind, List<MemberDecl> members, List<DatatypeCtor> candidateCtors, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      if (inCompiledContext) {
-        // check that there is no possibility that the datatype variant is a ghost constructor
-        var enclosingGhostConstructors = candidateCtors.Where(ctor => ctor.IsGhost).ToList();
-        if (enclosingGhostConstructors.Count != 0) {
-          var obj = etran.TrExpr(datatypeValue);
-          var notGhostCtor = BplAnd(enclosingGhostConstructors.ConvertAll(
-            ctor => Bpl.Expr.Not(FunctionCall(exprUsedForToken.tok, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, obj))));
-          builder.Add(Assert(GetToken(exprUsedForToken), notGhostCtor,
-            new PODesc.NotGhostVariant(whatKind,
-              Util.PrintableNameList(members.ConvertAll(member => member.Name), "and"),
-              enclosingGhostConstructors)));
-        }
-      }
-    }
-
-    void CheckWellformedSpecialFunction(FunctionCallExpr expr, WFOptions options, Bpl.Expr result, Type resultType, List<Bpl.Variable> locals,
-                               BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Contract.Requires(expr.Function is SpecialFunction);
-
-      string name = expr.Function.Name;
-      CheckWellformed(expr.Receiver, options, locals, builder, etran);
-      if (name == "RotateLeft" || name == "RotateRight") {
-        var w = expr.Type.AsBitVectorType.Width;
-        Expression arg = expr.Args[0];
-        builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(arg)), new PODesc.ShiftLowerBound(), options.AssertKv));
-        builder.Add(Assert(GetToken(expr), Bpl.Expr.Le(etran.TrExpr(arg), Bpl.Expr.Literal(w)), new PODesc.ShiftUpperBound(w), options.AssertKv));
-      }
-    }
-
-    void CheckWellformedLetExprWithResult(LetExpr e, WFOptions wfOptions, Bpl.Expr result, Type resultType, List<Bpl.Variable> locals,
-      BoogieStmtListBuilder builder, ExpressionTranslator etran, bool checkRhs) {
-      if (e.Exact) {
-        var uniqueSuffix = "#Z" + defaultIdGenerator.FreshNumericId("#Z");
-        var substMap = SetupBoundVarsAsLocals(e.BoundVars.ToList<BoundVar>(), builder, locals, etran, "#Z");
-        Contract.Assert(e.LHSs.Count == e.RHSs.Count);  // checked by resolution
-        var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator("let#");
-        for (int i = 0; i < e.LHSs.Count; i++) {
-          var pat = e.LHSs[i];
-          var rhs = e.RHSs[i];
-          var nm = varNameGen.FreshId(string.Format("#{0}#", i));
-          var r = new Bpl.LocalVariable(pat.tok, new Bpl.TypedIdent(pat.tok, nm, TrType(rhs.Type)));
-          locals.Add(r);
-          var rIe = new Bpl.IdentifierExpr(rhs.tok, r);
-          CheckWellformedWithResult(e.RHSs[i], wfOptions, rIe, pat.Expr.Type, locals, builder, etran);
-          CheckCasePatternShape(pat, rIe, rhs.tok, pat.Expr.Type, builder);
-          builder.Add(TrAssumeCmd(pat.tok, Bpl.Expr.Eq(etran.TrExpr(Substitute(pat.Expr, null, substMap)), rIe)));
-        }
-        CheckWellformedWithResult(Substitute(e.Body, null, substMap), wfOptions, result, resultType, locals, builder, etran);
-
-      } else {
-        // CheckWellformed(var b :| RHS(b); Body(b)) =
-        //   var b;
-        //   if (typeAntecedent(b)) {
-        //     CheckWellformed(RHS(b));
-        //   }
-        //   assert (exists b' :: typeAntecedent' && RHS(b'));
-        //   assume typeAntecedent(b);
-        //   assume RHS(b);
-        //   CheckWellformed(Body(b));
-        //   If non-ghost:  var b' where typeAntecedent; assume RHS(b'); assert Body(b) == Body(b');
-        //   assume CanCall
-        Contract.Assert(e.RHSs.Count == 1);  // this is true of all successfully resolved let-such-that expressions
-        var lhsVars = e.BoundVars.ToList<BoundVar>();
-        var substMap = SetupBoundVarsAsLocals(lhsVars, out var typeAntecedent, builder, locals, etran);
-        var rhs = Substitute(e.RHSs[0], null, substMap);
-        if (checkRhs) {
-          var wellFormednessBuilder = new BoogieStmtListBuilder(this, this.options);
-          CheckWellformed(rhs, wfOptions, locals, wellFormednessBuilder, etran);
-          var ifCmd = new Bpl.IfCmd(e.tok, typeAntecedent, wellFormednessBuilder.Collect(e.tok), null, null);
-          builder.Add(ifCmd);
-
-          var bounds = lhsVars.ConvertAll(_ => (ComprehensionExpr.BoundedPool)new ComprehensionExpr.SpecialAllocIndependenceAllocatedBoundedPool());  // indicate "no alloc" (is this what we want?)
-          GenerateAndCheckGuesses(e.tok, lhsVars, bounds, e.RHSs[0], TrTrigger(etran, e.Attributes, e.tok), builder, etran);
-        }
-        // assume typeAntecedent(b);
-        builder.Add(TrAssumeCmd(e.tok, typeAntecedent));
-        // assume RHS(b);
-        builder.Add(TrAssumeCmd(e.tok, etran.TrExpr(rhs)));
-        var letBody = Substitute(e.Body, null, substMap);
-        CheckWellformed(letBody, wfOptions, locals, builder, etran);
-        if (e.Constraint_Bounds != null) {
-          var substMap_prime = SetupBoundVarsAsLocals(lhsVars, builder, locals, etran);
-          var nonGhostMap_prime = new Dictionary<IVariable, Expression>();
-          foreach (BoundVar bv in lhsVars) {
-            nonGhostMap_prime.Add(bv, bv.IsGhost ? substMap[bv] : substMap_prime[bv]);
-          }
-          var rhs_prime = Substitute(e.RHSs[0], null, nonGhostMap_prime);
-          var letBody_prime = Substitute(e.Body, null, nonGhostMap_prime);
-          builder.Add(TrAssumeCmd(e.tok, CanCallAssumption(rhs_prime, etran)));
-          builder.Add(TrAssumeCmd(e.tok, etran.TrExpr(rhs_prime)));
-          builder.Add(TrAssumeCmd(e.tok, CanCallAssumption(letBody_prime, etran)));
-          var eq = Expression.CreateEq(letBody, letBody_prime, e.Body.Type);
-          builder.Add(Assert(GetToken(e), etran.TrExpr(eq),
-            new PODesc.LetSuchThatUnique(e.RHSs[0], e.BoundVars.ToList())));
-        }
-        // assume $let$canCall(g);
-        LetDesugaring(e);  // call LetDesugaring to prepare the desugaring and populate letSuchThatExprInfo with something for e
-        var info = letSuchThatExprInfo[e];
-        builder.Add(new Bpl.AssumeCmd(e.tok, info.CanCallFunctionCall(this, etran)));
-        // If we are supposed to assume "result" to equal this expression, then use the body of the let-such-that, not the generated $let#... function
-        if (result != null) {
-          Contract.Assert(resultType != null);
-          var bResult = etran.TrExpr(letBody);
-          CheckSubrange(letBody.tok, bResult, letBody.Type, resultType, builder);
-          builder.Add(TrAssumeCmd(letBody.tok, Bpl.Expr.Eq(result, bResult)));
-          builder.Add(TrAssumeCmd(letBody.tok, CanCallAssumption(letBody, etran)));
-          builder.Add(new CommentCmd("CheckWellformedWithResult: Let expression"));
-          builder.Add(TrAssumeCmd(letBody.tok, MkIs(result, resultType)));
-        }
-      }
-    }
-
-    void CheckFrameWellFormed(WFOptions wfo, List<FrameExpression> fes, List<Variable> locals, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Contract.Requires(fes != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      foreach (var fe in fes) {
-        CheckWellformed(fe.E, wfo, locals, builder, etran);
-        if (fe.Field != null && fe.E.Type.IsRefType) {
-          builder.Add(Assert(fe.tok, Bpl.Expr.Neq(etran.TrExpr(fe.E), predef.Null), new PODesc.FrameDereferenceNonNull()));
-        }
-      }
-    }
-
-  }
-}
diff --git a/Source/DafnyCore/Verifier/Translator.TrStatement.cs b/Source/DafnyCore/Verifier/Translator.TrStatement.cs
deleted file mode 100644
index ad89f22fee4..00000000000
--- a/Source/DafnyCore/Verifier/Translator.TrStatement.cs
+++ /dev/null
@@ -1,2154 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using Microsoft.Boogie;
-using Bpl = Microsoft.Boogie;
-using BplParser = Microsoft.Boogie.Parser;
-using static Microsoft.Dafny.Util;
-using PODesc = Microsoft.Dafny.ProofObligationDescription;
-
-namespace Microsoft.Dafny {
-  public partial class Translator {
-    private void TrStmt(Statement stmt, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(codeContext != null && predef != null);
-      Contract.Ensures(fuelContext == Contract.OldValue(fuelContext));
-
-      stmtContext = StmtType.NONE;
-      adjustFuelForExists = true;  // fuel for exists might need to be adjusted based on whether it's in an assert or assume stmt.
-      if (stmt is PredicateStmt predicateStmt) {
-        TrPredicateStmt(predicateStmt, builder, locals, etran);
-
-      } else if (stmt is PrintStmt) {
-        AddComment(builder, stmt, "print statement");
-        PrintStmt s = (PrintStmt)stmt;
-        foreach (var arg in s.Args) {
-          TrStmt_CheckWellformed(arg, builder, locals, etran, false);
-        }
-
-      } else if (stmt is RevealStmt) {
-        AddComment(builder, stmt, "reveal statement");
-        var s = (RevealStmt)stmt;
-        foreach (var la in s.LabeledAsserts) {
-          Contract.Assert(la.E != null);  // this should have been filled in by now
-          builder.Add(new Bpl.AssumeCmd(s.Tok, la.E));
-        }
-        TrStmtList(s.ResolvedStatements, builder, locals, etran);
-
-      } else if (stmt is BreakStmt) {
-        var s = (BreakStmt)stmt;
-        AddComment(builder, stmt, $"{s.Kind} statement");
-        var lbl = (s.IsContinue ? "continue_" : "after_") + s.TargetStmt.Labels.Data.AssignUniqueId(CurrentIdGenerator);
-        builder.Add(new GotoCmd(s.Tok, new List<string> { lbl }));
-      } else if (stmt is ReturnStmt) {
-        var s = (ReturnStmt)stmt;
-        AddComment(builder, stmt, "return statement");
-        if (s.ReverifyPost) {
-          // $_reverifyPost := true;
-          builder.Add(Bpl.Cmd.SimpleAssign(s.Tok, new Bpl.IdentifierExpr(s.Tok, "$_reverifyPost", Bpl.Type.Bool), Bpl.Expr.True));
-        }
-        if (s.HiddenUpdate != null) {
-          TrStmt(s.HiddenUpdate, builder, locals, etran);
-        }
-        if (codeContext is IMethodCodeContext) {
-          var method = (IMethodCodeContext)codeContext;
-          method.Outs.ForEach(p => CheckDefiniteAssignmentReturn(stmt.Tok, p, builder));
-        }
-
-        if (codeContext is Method { FunctionFromWhichThisIsByMethodDecl: { ByMethodTok: { } } fun } method2) {
-          AssumeCanCallForByMethodDecl(method2, builder);
-        }
-
-        builder.Add(new Bpl.ReturnCmd(stmt.Tok));
-      } else if (stmt is YieldStmt) {
-        var s = (YieldStmt)stmt;
-        AddComment(builder, s, "yield statement");
-        Contract.Assert(codeContext is IteratorDecl);
-        var iter = (IteratorDecl)codeContext;
-        // if the yield statement has arguments, do them first
-        if (s.HiddenUpdate != null) {
-          TrStmt(s.HiddenUpdate, builder, locals, etran);
-        }
-        // this.ys := this.ys + [this.y];
-        var th = new ThisExpr(iter);
-        Contract.Assert(iter.OutsFields.Count == iter.OutsHistoryFields.Count);
-        for (int i = 0; i < iter.OutsFields.Count; i++) {
-          var y = iter.OutsFields[i];
-          var dafnyY = new MemberSelectExpr(s.Tok, th, y);
-          var ys = iter.OutsHistoryFields[i];
-          var dafnyYs = new MemberSelectExpr(s.Tok, th, ys);
-          var dafnySingletonY = new SeqDisplayExpr(s.Tok, new List<Expression>() { dafnyY });
-          dafnySingletonY.Type = ys.Type;  // resolve here
-          var rhs = new BinaryExpr(s.Tok, BinaryExpr.Opcode.Add, dafnyYs, dafnySingletonY);
-          rhs.ResolvedOp = BinaryExpr.ResolvedOpcode.Concat;
-          rhs.Type = ys.Type;  // resolve here
-          var cmd = Bpl.Cmd.SimpleAssign(s.Tok, etran.HeapCastToIdentifierExpr,
-            UpdateHeap(s.Tok, etran.HeapExpr, etran.TrExpr(th), new Bpl.IdentifierExpr(s.Tok, GetField(ys)), etran.TrExpr(rhs)));
-          builder.Add(cmd);
-        }
-        // yieldCount := yieldCount + 1;  assume yieldCount == |ys|;
-        var yc = new Bpl.IdentifierExpr(s.Tok, yieldCountVariable);
-        var incYieldCount = Bpl.Cmd.SimpleAssign(s.Tok, yc, Bpl.Expr.Binary(s.Tok, Bpl.BinaryOperator.Opcode.Add, yc, Bpl.Expr.Literal(1)));
-        builder.Add(incYieldCount);
-        builder.Add(TrAssumeCmd(s.Tok, YieldCountAssumption(iter, etran)));
-        // assume $IsGoodHeap($Heap);
-        builder.Add(AssumeGoodHeap(s.Tok, etran));
-        // assert YieldEnsures[subst];  // where 'subst' replaces "old(E)" with "E" being evaluated in $_OldIterHeap
-        var yeEtran = new ExpressionTranslator(this, predef, etran.HeapExpr, new Bpl.IdentifierExpr(s.Tok, "$_OldIterHeap", predef.HeapType));
-        foreach (var p in iter.YieldEnsures) {
-          var ss = TrSplitExpr(p.E, yeEtran, true, out var splitHappened);
-          foreach (var split in ss) {
-            if (RefinementToken.IsInherited(split.Tok, currentModule)) {
-              // this postcondition was inherited into this module, so just ignore it
-            } else if (split.IsChecked) {
-              var yieldToken = new NestedToken(s.Tok, split.Tok);
-              var desc = new PODesc.YieldEnsures();
-              builder.Add(AssertNS(yieldToken, split.E, desc, stmt.Tok, null));
-            }
-          }
-          builder.Add(TrAssumeCmd(stmt.Tok, yeEtran.TrExpr(p.E)));
-        }
-        YieldHavoc(iter.tok, iter, builder, etran);
-        builder.AddCaptureState(s);
-
-      } else if (stmt is AssignSuchThatStmt) {
-        var s = (AssignSuchThatStmt)stmt;
-        AddComment(builder, s, "assign-such-that statement");
-        // Essentially, treat like an assert (that values for the LHS exist), a havoc (of the LHS), and an
-        // assume (of the RHS).  However, we also need to check the well-formedness of the LHS and RHS.
-        // The well-formedness of the LHS is done by the havoc. The well-formedness of the RHS is most
-        // easily done after that havoc, but we need to be careful about two things:
-        //   - We should not generate any errors for uses of LHSs. This is not an issue for fields or
-        //     array elements, because they already have values before reaching the assign-such-that statement.
-        //     (Note, "this.f" is not allowed as a LHS in the first division of a constructor.)
-        //     For any local variable or out-parameter x that's a LHS, we create a new variable x' and
-        //     substitute x' for x in the RHS before doing the well-formedness check.
-        //   - The well-formedness checks need to be able to assume that each x' has a value of its
-        //     type. However, this assumption must not carry over to the existence assertion, because
-        //     then everything will be provable if x' is of a known-empty type. Instead, the well-formedness
-        //     check is wrapped inside an "if" whose guard is the type antecedent. After the existence
-        //     check, the type antecedent is assumed of the original x, the RHS is assumed, and x is
-        //     marked off has having been definitely assigned.
-        //
-        // So, the Dafny statement
-        //     E.f, x :| RHS(x);
-        // is translated into the following Boogie code:
-        //     var x';
-        //     Tr[[ E.f := *; ]]  // this havoc is translated like a Dafny assignment statement, which means
-        //                        // the well-formedness of E is checked here
-        //     if (typeAntecedent(x')) {
-        //       check well-formedness of RHS(x');
-        //     }
-        //     assert (exists x'' :: RHS(x''));  // for ":| assume", omit this line; for ":|", LHS is only allowed to contain simple variables
-        //     defass#x := true;
-        //     havoc x;
-        //     assume RHS(x);
-
-        var simpleLHSs = new List<IdentifierExpr>();
-        Bpl.Expr typeAntecedent = Bpl.Expr.True;
-        var havocLHSs = new List<Expression>();
-        var havocRHSs = new List<AssignmentRhs>();
-        var substMap = new Dictionary<IVariable, Expression>();
-        foreach (var lhs in s.Lhss) {
-          var lvalue = lhs.Resolved;
-          if (lvalue is IdentifierExpr ide) {
-            simpleLHSs.Add(ide);
-            var wh = SetupVariableAsLocal(ide.Var, substMap, builder, locals, etran);
-            typeAntecedent = BplAnd(typeAntecedent, wh);
-          } else {
-            havocLHSs.Add(lvalue);
-            havocRHSs.Add(new HavocRhs(lhs.tok));  // note, a HavocRhs is constructed as already resolved
-          }
-        }
-        ProcessLhss(havocLHSs, false, true, builder, locals, etran, out var lhsBuilder, out var bLhss, out _, out _, out _);
-        ProcessRhss(lhsBuilder, bLhss, havocLHSs, havocRHSs, builder, locals, etran);
-
-        // Here comes the well-formedness check
-        var wellFormednessBuilder = new BoogieStmtListBuilder(this, options);
-        var rhs = Substitute(s.Expr, null, substMap);
-        TrStmt_CheckWellformed(rhs, wellFormednessBuilder, locals, etran, false);
-        var ifCmd = new Bpl.IfCmd(s.Tok, typeAntecedent, wellFormednessBuilder.Collect(s.Tok), null, null);
-        builder.Add(ifCmd);
-
-        // Here comes the assert part
-        if (s.AssumeToken == null) {
-          substMap = new Dictionary<IVariable, Expression>();
-          var bvars = new List<BoundVar>();
-          foreach (var lhs in s.Lhss) {
-            var l = lhs.Resolved;
-            if (l is IdentifierExpr x) {
-              CloneVariableAsBoundVar(x.tok, x.Var, "$as#" + x.Name, out var bv, out var ie);
-              bvars.Add(bv);
-              substMap.Add(x.Var, ie);
-            } else {
-              // other forms of LHSs have been ruled out by the resolver (it would be possible to
-              // handle them, but it would involve heap-update expressions--the translation would take
-              // effort, and it's not certain that the existential would be successful in verification).
-              Contract.Assume(false);  // unexpected case
-            }
-          }
-
-          GenerateAndCheckGuesses(s.Tok, bvars, s.Bounds, Substitute(s.Expr, null, substMap), TrTrigger(etran, s.Attributes, s.Tok, substMap), builder, etran);
-        }
-
-        // Mark off the simple variables as having definitely been assigned AND THEN havoc their values. By doing them
-        // in this order, they type antecedents will in effect be assumed.
-        var bHavocLHSs = new List<Bpl.IdentifierExpr>();
-        foreach (var lhs in simpleLHSs) {
-          MarkDefiniteAssignmentTracker(lhs, builder);
-          bHavocLHSs.Add((Bpl.IdentifierExpr)etran.TrExpr(lhs));
-        }
-        builder.Add(new Bpl.HavocCmd(s.Tok, bHavocLHSs));
-
-        // End by doing the assume
-        builder.Add(TrAssumeCmd(s.Tok, etran.TrExpr(s.Expr)));
-        builder.AddCaptureState(s);  // just do one capture state--here, at the very end (that is, don't do one before the assume)
-
-      } else if (stmt is UpdateStmt) {
-        var s = (UpdateStmt)stmt;
-        // This UpdateStmt can be single-target assignment, a multi-assignment, a call statement, or
-        // an array-range update.  Handle the multi-assignment here and handle the others as for .ResolvedStatements.
-        var resolved = s.ResolvedStatements;
-        if (resolved.Count == 1) {
-          TrStmt(resolved[0], builder, locals, etran);
-        } else {
-          AddComment(builder, s, "update statement");
-          var assignStmts = resolved.Cast<AssignStmt>().ToList();
-          var lhss = assignStmts.Select(a => a.Lhs).ToList();
-          var rhss = assignStmts.Select(a => a.Rhs).ToList();
-          // note: because we have more than one expression, we always must assign to Boogie locals in a two
-          // phase operation. Thus rhssCanAffectPreviouslyKnownExpressions is just true.
-          Contract.Assert(1 < lhss.Count);
-
-          ProcessLhss(lhss, true, false, builder, locals, etran, out var lhsBuilder, out var bLhss, out var lhsObjs, out var lhsFields, out var lhsNames);
-          // We know that, because the translation saves to a local variable, that the RHS always need to
-          // generate a new local, i.e. bLhss is just all nulls.
-          Contract.Assert(Contract.ForAll(bLhss, lhs => lhs == null));
-          // This generates the assignments, and gives them to us as finalRhss.
-          var finalRhss = ProcessUpdateAssignRhss(lhss, rhss, builder, locals, etran);
-          // ProcessLhss has laid down framing conditions and the ProcessUpdateAssignRhss will check subranges (nats),
-          // but we need to generate the distinctness condition (two LHS are equal only when the RHS is also
-          // equal). We need both the LHS and the RHS to do this, which is why we need to do it here.
-          CheckLhssDistinctness(finalRhss, s.Rhss, lhss, builder, etran, lhsObjs, lhsFields, lhsNames, s.OriginalInitialLhs);
-          // Now actually perform the assignments to the LHS.
-          for (int i = 0; i < lhss.Count; i++) {
-            lhsBuilder[i](finalRhss[i], s.Rhss[i] is HavocRhs, builder, etran);
-          }
-          builder.AddCaptureState(s);
-        }
-
-      } else if (stmt is AssignOrReturnStmt) {
-        AddComment(builder, stmt, "assign-or-return statement (:-)");
-        AssignOrReturnStmt s = (AssignOrReturnStmt)stmt;
-        TrStmtList(s.ResolvedStatements, builder, locals, etran);
-
-      } else if (stmt is AssignStmt) {
-        AddComment(builder, stmt, "assignment statement");
-        AssignStmt s = (AssignStmt)stmt;
-        TrAssignment(stmt, s.Lhs.Resolved, s.Rhs, builder, locals, etran);
-
-      } else if (stmt is CallStmt) {
-        AddComment(builder, stmt, "call statement");
-        TrCallStmt((CallStmt)stmt, builder, locals, etran, null);
-
-      } else if (stmt is DividedBlockStmt) {
-        var s = (DividedBlockStmt)stmt;
-        AddComment(builder, stmt, "divided block before new;");
-        var prevDefiniteAssignmentTrackerCount = definiteAssignmentTrackers.Count;
-        var tok = s.SeparatorTok ?? s.Tok;
-        // a DividedBlockStmt occurs only inside a Constructor body of a class
-        var cl = (ClassDecl)((Constructor)codeContext).EnclosingClass;
-        var fields = Concat(cl.InheritedMembers, cl.Members).ConvertAll(member =>
-          member is Field && !member.IsStatic && !member.IsInstanceIndependentConstant ? (Field)member : null);
-        fields.RemoveAll(f => f == null);
-        var localSurrogates = fields.ConvertAll(f => new Bpl.LocalVariable(f.tok, new TypedIdent(f.tok, SurrogateName(f), TrType(f.Type))));
-        locals.AddRange(localSurrogates);
-        fields.ForEach(f => AddDefiniteAssignmentTrackerSurrogate(f, cl, locals, codeContext is Constructor && codeContext.IsGhost));
-
-        Contract.Assert(!inBodyInitContext);
-        inBodyInitContext = true;
-        TrStmtList(s.BodyInit, builder, locals, etran);
-        Contract.Assert(inBodyInitContext);
-        inBodyInitContext = false;
-
-        // The "new;" translates into an allocation of "this"
-        AddComment(builder, stmt, "new;");
-        fields.ForEach(f => CheckDefiniteAssignmentSurrogate(s.SeparatorTok ?? s.RangeToken.EndToken, f, true, builder));
-        fields.ForEach(RemoveDefiniteAssignmentTrackerSurrogate);
-        var th = new ThisExpr(cl);
-        var bplThis = (Bpl.IdentifierExpr)etran.TrExpr(th);
-        SelectAllocateObject(tok, bplThis, th.Type, false, builder, etran);
-        for (int i = 0; i < fields.Count; i++) {
-          // assume $Heap[this, f] == this.f;
-          var mse = new MemberSelectExpr(tok, th, fields[i]);
-          Bpl.Expr surr = new Bpl.IdentifierExpr(tok, localSurrogates[i]);
-          surr = CondApplyUnbox(tok, surr, fields[i].Type, mse.Type);
-          builder.Add(new Bpl.AssumeCmd(tok, Bpl.Expr.Eq(etran.TrExpr(mse), surr)));
-        }
-        CommitAllocatedObject(tok, bplThis, null, builder, etran);
-
-        AddComment(builder, stmt, "divided block after new;");
-        TrStmtList(s.BodyProper, builder, locals, etran);
-        RemoveDefiniteAssignmentTrackers(s.Body, prevDefiniteAssignmentTrackerCount);
-
-      } else if (stmt is BlockStmt) {
-        var s = (BlockStmt)stmt;
-        var prevDefiniteAssignmentTrackerCount = definiteAssignmentTrackers.Count;
-        TrStmtList(s.Body, builder, locals, etran);
-        RemoveDefiniteAssignmentTrackers(s.Body, prevDefiniteAssignmentTrackerCount);
-
-      } else if (stmt is IfStmt ifStmt) {
-        TrIfStmt(ifStmt, builder, locals, etran);
-
-      } else if (stmt is AlternativeStmt) {
-        AddComment(builder, stmt, "alternative statement");
-        var s = (AlternativeStmt)stmt;
-        var elseCase = Assert(s.Tok, Bpl.Expr.False, new PODesc.AlternativeIsComplete());
-        TrAlternatives(s.Alternatives, elseCase, null, builder, locals, etran, stmt.IsGhost);
-
-      } else if (stmt is WhileStmt whileStmt) {
-        TrWhileStmt(whileStmt, builder, locals, etran);
-
-      } else if (stmt is AlternativeLoopStmt) {
-        AddComment(builder, stmt, "alternative loop statement");
-        var s = (AlternativeLoopStmt)stmt;
-        var tru = new LiteralExpr(s.Tok, true);
-        tru.Type = Type.Bool; // resolve here
-        TrLoop(s, tru,
-          delegate (BoogieStmtListBuilder bld, ExpressionTranslator e) {
-            TrAlternatives(s.Alternatives, null, new Bpl.BreakCmd(s.Tok, null), bld, locals, e, stmt.IsGhost);
-            InsertContinueTarget(s, bld);
-          },
-          builder, locals, etran);
-
-      } else if (stmt is ForLoopStmt forLoopStmt) {
-        TrForLoop(forLoopStmt, builder, locals, etran);
-
-      } else if (stmt is ModifyStmt) {
-        AddComment(builder, stmt, "modify statement");
-        var s = (ModifyStmt)stmt;
-        // check well-formedness of the modifies clauses
-        CheckFrameWellFormed(new WFOptions(), s.Mod.Expressions, locals, builder, etran);
-        // check that the modifies is a subset
-        CheckFrameSubset(s.Tok, s.Mod.Expressions, null, null, etran, builder, new PODesc.FrameSubset("modify statement", true), null);
-        // cause the change of the heap according to the given frame
-        var suffix = CurrentIdGenerator.FreshId("modify#");
-        string modifyFrameName = "$Frame$" + suffix;
-        var preModifyHeapVar = new Bpl.LocalVariable(s.Tok, new Bpl.TypedIdent(s.Tok, "$PreModifyHeap$" + suffix, predef.HeapType));
-        locals.Add(preModifyHeapVar);
-        DefineFrame(s.Tok, s.Mod.Expressions, builder, locals, modifyFrameName);
-        if (s.Body == null) {
-          var preModifyHeap = new Bpl.IdentifierExpr(s.Tok, preModifyHeapVar);
-          // preModifyHeap := $Heap;
-          builder.Add(Bpl.Cmd.SimpleAssign(s.Tok, preModifyHeap, etran.HeapExpr));
-          // havoc $Heap;
-          builder.Add(new Bpl.HavocCmd(s.Tok, new List<Bpl.IdentifierExpr> { etran.HeapCastToIdentifierExpr }));
-          // assume $HeapSucc(preModifyHeap, $Heap);   OR $HeapSuccGhost
-          builder.Add(TrAssumeCmd(s.Tok, HeapSucc(preModifyHeap, etran.HeapExpr, s.IsGhost)));
-          // assume nothing outside the frame was changed
-          var etranPreLoop = new ExpressionTranslator(this, predef, preModifyHeap);
-          var updatedFrameEtran = new ExpressionTranslator(etran, modifyFrameName);
-          builder.Add(TrAssumeCmd(s.Tok, FrameConditionUsingDefinedFrame(s.Tok, etranPreLoop, etran, updatedFrameEtran)));
-        } else {
-          // do the body, but with preModifyHeapVar as the governing frame
-          var updatedFrameEtran = new ExpressionTranslator(etran, modifyFrameName);
-          CurrentIdGenerator.Push();
-          TrStmt(s.Body, builder, locals, updatedFrameEtran);
-          CurrentIdGenerator.Pop();
-        }
-        builder.AddCaptureState(stmt);
-
-      } else if (stmt is ForallStmt) {
-        var s = (ForallStmt)stmt;
-        this.fuelContext = FuelSetting.ExpandFuelContext(stmt.Attributes, stmt.Tok, this.fuelContext, this.reporter);
-
-        CurrentIdGenerator.Push();
-        if (s.Kind == ForallStmt.BodyKind.Assign) {
-          AddComment(builder, stmt, "forall statement (assign)");
-          Contract.Assert(s.Ens.Count == 0);
-          if (s.BoundVars.Count == 0) {
-            TrStmt(s.Body, builder, locals, etran);
-          } else {
-            var s0 = (AssignStmt)s.S0;
-            var definedness = new BoogieStmtListBuilder(this, options);
-            var updater = new BoogieStmtListBuilder(this, options);
-            DefineFuelConstant(stmt.Tok, stmt.Attributes, definedness, etran);
-            TrForallAssign(s, s0, definedness, updater, locals, etran);
-            // All done, so put the two pieces together
-            builder.Add(new Bpl.IfCmd(s.Tok, null, definedness.Collect(s.Tok), null, updater.Collect(s.Tok)));
-            builder.AddCaptureState(stmt);
-          }
-
-        } else if (s.Kind == ForallStmt.BodyKind.Call) {
-          AddComment(builder, stmt, "forall statement (call)");
-          Contract.Assert(s.Ens.Count == 0);
-          if (s.BoundVars.Count == 0) {
-            Contract.Assert(LiteralExpr.IsTrue(s.Range));  // follows from the invariant of ForallStmt
-            TrStmt(s.Body, builder, locals, etran);
-          } else {
-            var s0 = (CallStmt)s.S0;
-            if (Attributes.Contains(s.Attributes, "_trustWellformed")) {
-              TrForallStmtCall(s.Tok, s.BoundVars, s.Bounds, s.Range, null, s.ForallExpressions, s0, null, builder, locals, etran);
-            } else {
-              var definedness = new BoogieStmtListBuilder(this, options);
-              DefineFuelConstant(stmt.Tok, stmt.Attributes, definedness, etran);
-              var exporter = new BoogieStmtListBuilder(this, options);
-              TrForallStmtCall(s.Tok, s.BoundVars, s.Bounds, s.Range, null, s.ForallExpressions, s0, definedness, exporter, locals, etran);
-              // All done, so put the two pieces together
-              builder.Add(new Bpl.IfCmd(s.Tok, null, definedness.Collect(s.Tok), null, exporter.Collect(s.Tok)));
-            }
-            builder.AddCaptureState(stmt);
-          }
-
-        } else if (s.Kind == ForallStmt.BodyKind.Proof) {
-          AddComment(builder, stmt, "forall statement (proof)");
-          var definedness = new BoogieStmtListBuilder(this, options);
-          var exporter = new BoogieStmtListBuilder(this, options);
-          DefineFuelConstant(stmt.Tok, stmt.Attributes, definedness, etran);
-          TrForallProof(s, definedness, exporter, locals, etran);
-          // All done, so put the two pieces together
-          builder.Add(new Bpl.IfCmd(s.Tok, null, definedness.Collect(s.Tok), null, exporter.Collect(s.Tok)));
-          builder.AddCaptureState(stmt);
-
-        } else {
-          Contract.Assert(false);  // unexpected kind
-        }
-        CurrentIdGenerator.Pop();
-        this.fuelContext = FuelSetting.PopFuelContext();
-
-      } else if (stmt is CalcStmt calcStmt) {
-        TrCalcStmt(calcStmt, builder, locals, etran);
-
-      } else if (stmt is NestedMatchStmt nestedMatchStmt) {
-        TrStmt(nestedMatchStmt.Flattened, builder, locals, etran);
-      } else if (stmt is MatchStmt matchStmt) {
-        TrMatchStmt(matchStmt, builder, locals, etran);
-      } else if (stmt is VarDeclStmt) {
-        var s = (VarDeclStmt)stmt;
-        var newLocalIds = new List<Bpl.IdentifierExpr>();
-        int i = 0;
-        foreach (var local in s.Locals) {
-          Bpl.Type varType = TrType(local.Type);
-          Bpl.Expr wh = GetWhereClause(local.Tok,
-            new Bpl.IdentifierExpr(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator), varType),
-            local.Type, etran, isAllocContext.Var(stmt.IsGhost, local));
-          // if needed, register definite-assignment tracking for this local
-          var needDefiniteAssignmentTracking = s.Update == null || s.Update is AssignSuchThatStmt;
-          if (s.Update is UpdateStmt) {
-            // there is an initial assignment, but we need to look out for "*" being that assignment
-            var us = (UpdateStmt)s.Update;
-            if (i < us.Rhss.Count && us.Rhss[i] is HavocRhs) {
-              needDefiniteAssignmentTracking = true;
-            }
-          }
-          if (!local.Type.IsNonempty) {
-            // This prevents generating an unsatisfiable where clause for possibly empty types
-            needDefiniteAssignmentTracking = true;
-          }
-          if (needDefiniteAssignmentTracking) {
-            var defassExpr = AddDefiniteAssignmentTracker(local, locals);
-            if (wh != null && defassExpr != null) {
-              // make the "where" expression be "defass ==> wh", because we don't want to assume anything
-              // before the variable has been assigned (for a variable that needs definite-assignment tracking
-              // in the first place)
-              wh = BplImp(defassExpr, wh);
-            }
-          }
-          // create the variable itself (now that "wh" may mention the definite-assignment tracker)
-          Bpl.LocalVariable var = new Bpl.LocalVariable(local.Tok, new Bpl.TypedIdent(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator), varType, wh));
-          var.Attributes = etran.TrAttributes(local.Attributes, null);
-          newLocalIds.Add(new Bpl.IdentifierExpr(local.Tok, var));
-          locals.Add(var);
-          i++;
-        }
-        if (s.Update == null) {
-          // it is necessary to do a havoc here in order to give the variable the correct allocation state
-          builder.Add(new HavocCmd(s.Tok, newLocalIds));
-        }
-        // processing of "assumption" variables happens after the variable is possibly havocked above
-        foreach (var local in s.Locals) {
-          if (Attributes.Contains(local.Attributes, "assumption")) {
-            Bpl.Type varType = TrType(local.Type);
-            builder.Add(new AssumeCmd(local.Tok, new Bpl.IdentifierExpr(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator), varType), new QKeyValue(local.Tok, "assumption_variable_initialization", new List<object>(), null)));
-          }
-        }
-        if (s.Update != null) {
-          TrStmt(s.Update, builder, locals, etran);
-        }
-      } else if (stmt is VarDeclPattern) {
-        var s = (VarDeclPattern)stmt;
-        foreach (var local in s.LocalVars) {
-          Bpl.LocalVariable bvar = new Bpl.LocalVariable(local.Tok, new Bpl.TypedIdent(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator), TrType(local.Type)));
-          locals.Add(bvar);
-          var bIe = new Bpl.IdentifierExpr(bvar.tok, bvar);
-          builder.Add(new Bpl.HavocCmd(local.Tok, new List<Bpl.IdentifierExpr> { bIe }));
-          Bpl.Expr wh = GetWhereClause(local.Tok, bIe, local.Type, etran, isAllocContext.Var(stmt.IsGhost, local));
-          if (wh != null) {
-            builder.Add(TrAssumeCmd(local.Tok, wh));
-          }
-        }
-        var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator("let#");
-        var pat = s.LHS;
-        var rhs = s.RHS;
-        var nm = varNameGen.FreshId(string.Format("#{0}#", 0));
-        var r = new Bpl.LocalVariable(pat.tok, new Bpl.TypedIdent(pat.tok, nm, TrType(rhs.Type)));
-        locals.Add(r);
-        var rIe = new Bpl.IdentifierExpr(rhs.tok, r);
-        CheckWellformedWithResult(rhs, new WFOptions(null, false, false), rIe, pat.Expr.Type, locals, builder, etran);
-        CheckCasePatternShape(pat, rIe, rhs.tok, pat.Expr.Type, builder);
-        builder.Add(TrAssumeCmd(pat.tok, Bpl.Expr.Eq(etran.TrExpr(pat.Expr), rIe)));
-      } else if (stmt is TryRecoverStatement haltRecoveryStatement) {
-        // try/recover statements are currently internal-only AST nodes that cannot be
-        // directly used in user Dafny code. They are only generated by rewriters, and verifying
-        // their use is low value.
-        throw new NotSupportedException("Verification of try/recover statements is not supported");
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected statement
-      }
-    }
-
-    private void TrPredicateStmt(PredicateStmt stmt, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      var stmtBuilder = new BoogieStmtListBuilder(this, options);
-      var (errorMessage, successMessage) = CustomErrorMessage(stmt.Attributes);
-      this.fuelContext = FuelSetting.ExpandFuelContext(stmt.Attributes, stmt.Tok, this.fuelContext, this.reporter);
-      var defineFuel = DefineFuelConstant(stmt.Tok, stmt.Attributes, stmtBuilder, etran);
-      var b = defineFuel ? stmtBuilder : builder;
-      if (stmt is AssertStmt || options.DisallowSoundnessCheating) {
-        stmtContext = StmtType.ASSERT;
-        AddComment(b, stmt, "assert statement");
-        TrStmt_CheckWellformed(stmt.Expr, b, locals, etran, false);
-        IToken enclosingToken = null;
-        if (Attributes.Contains(stmt.Attributes, "_prependAssertToken")) {
-          enclosingToken = stmt.Tok;
-        }
-        BoogieStmtListBuilder proofBuilder = null;
-        var assertStmt = stmt as AssertStmt;
-        if (assertStmt != null) {
-          if (assertStmt.Proof != null) {
-            proofBuilder = new BoogieStmtListBuilder(this, options);
-            AddComment(proofBuilder, stmt, "assert statement proof");
-            CurrentIdGenerator.Push();
-            TrStmt(((AssertStmt)stmt).Proof, proofBuilder, locals, etran);
-            CurrentIdGenerator.Pop();
-          } else if (assertStmt.Label != null) {
-            proofBuilder = new BoogieStmtListBuilder(this, options);
-            AddComment(proofBuilder, stmt, "assert statement proof");
-          }
-        }
-
-        var ss = TrSplitExpr(stmt.Expr, etran, true, out var splitHappened);
-        if (!splitHappened) {
-          var tok = enclosingToken == null ? GetToken(stmt.Expr) : new NestedToken(enclosingToken, GetToken(stmt.Expr));
-          var desc = new PODesc.AssertStatement(errorMessage, successMessage);
-          (proofBuilder ?? b).Add(Assert(tok, etran.TrExpr(stmt.Expr), desc, stmt.Tok,
-            etran.TrAttributes(stmt.Attributes, null)));
-        } else {
-          foreach (var split in ss) {
-            if (split.IsChecked) {
-              var tok = enclosingToken == null ? split.E.tok : new NestedToken(enclosingToken, split.Tok);
-              var desc = new PODesc.AssertStatement(errorMessage, successMessage);
-              (proofBuilder ?? b).Add(AssertNS(ToDafnyToken(tok), split.E, desc, stmt.Tok,
-                etran.TrAttributes(stmt.Attributes, null))); // attributes go on every split
-            }
-          }
-        }
-        if (proofBuilder != null) {
-          PathAsideBlock(stmt.Tok, proofBuilder, b);
-        }
-        stmtContext = StmtType.NONE; // done with translating assert stmt
-        if (splitHappened || proofBuilder != null) {
-          if (assertStmt != null && assertStmt.Label != null) {
-            // make copies of the variables used in the assertion
-            var name = "$Heap_at_" + assertStmt.Label.AssignUniqueId(CurrentIdGenerator);
-            var heapAt = new Bpl.LocalVariable(stmt.Tok, new Bpl.TypedIdent(stmt.Tok, name, predef.HeapType));
-            locals.Add(heapAt);
-            var h = new Bpl.IdentifierExpr(stmt.Tok, heapAt);
-            b.Add(Bpl.Cmd.SimpleAssign(stmt.Tok, h, etran.HeapExpr));
-            var substMap = new Dictionary<IVariable, Expression>();
-            foreach (var v in FreeVariablesUtil.ComputeFreeVariables(options, assertStmt.Expr)) {
-              if (v is LocalVariable) {
-                var vcopy = new LocalVariable(stmt.RangeToken, string.Format("##{0}#{1}", name, v.Name), v.Type, v.IsGhost);
-                vcopy.type = vcopy.OptionalType; // resolve local here
-                IdentifierExpr ie = new IdentifierExpr(vcopy.Tok, vcopy.AssignUniqueName(currentDeclaration.IdGenerator));
-                ie.Var = vcopy;
-                ie.Type = ie.Var.Type; // resolve ie here
-                substMap.Add(v, ie);
-                locals.Add(new Bpl.LocalVariable(vcopy.Tok,
-                  new Bpl.TypedIdent(vcopy.Tok, vcopy.AssignUniqueName(currentDeclaration.IdGenerator), TrType(vcopy.Type))));
-                b.Add(Bpl.Cmd.SimpleAssign(stmt.Tok, TrVar(stmt.Tok, vcopy), TrVar(stmt.Tok, v)));
-              }
-            }
-            var exprToBeRevealed = Substitute(assertStmt.Expr, null, substMap);
-            var etr = new ExpressionTranslator(etran, h);
-            assertStmt.Label.E = etr.TrExpr(exprToBeRevealed);
-          } else if (!defineFuel) {
-            // Adding the assume stmt, resetting the stmtContext
-            stmtContext = StmtType.ASSUME;
-            adjustFuelForExists = true;
-            b.Add(TrAssumeCmd(stmt.Tok, etran.TrExpr(stmt.Expr)));
-            stmtContext = StmtType.NONE;
-          }
-        }
-        if (defineFuel) {
-          var ifCmd = new Bpl.IfCmd(stmt.Tok, null, b.Collect(stmt.Tok), null,
-            null); // BUGBUG: shouldn't this first append "assume false" to "b"? (use PathAsideBlock to do this)  --KRML
-          builder.Add(ifCmd);
-          // Adding the assume stmt, resetting the stmtContext
-          stmtContext = StmtType.ASSUME;
-          adjustFuelForExists = true;
-          builder.Add(TrAssumeCmd(stmt.Tok, etran.TrExpr(stmt.Expr)));
-          stmtContext = StmtType.NONE;
-        }
-      } else if (stmt is ExpectStmt) {
-        AddComment(builder, stmt, "expect statement");
-        var s = (ExpectStmt)stmt;
-        stmtContext = StmtType.ASSUME;
-        TrStmt_CheckWellformed(s.Expr, builder, locals, etran, false);
-
-        // Need to check the message is well-formed, assuming the expected expression
-        // does NOT hold:
-        //
-        // if Not(TrExpr[[ s.Expr ]]) {
-        //  CheckWellformed[[ s.Message ]]
-        //  assume false;
-        // }
-        BoogieStmtListBuilder thnBuilder = new BoogieStmtListBuilder(this, options);
-        TrStmt_CheckWellformed(s.Message, thnBuilder, locals, etran, false);
-        thnBuilder.Add(TrAssumeCmd(stmt.Tok, new Bpl.LiteralExpr(stmt.Tok, false), etran.TrAttributes(stmt.Attributes, null)));
-        Bpl.StmtList thn = thnBuilder.Collect(s.Tok);
-        builder.Add(new Bpl.IfCmd(stmt.Tok, Bpl.Expr.Not(etran.TrExpr(s.Expr)), thn, null, null));
-
-        stmtContext = StmtType.NONE; // done with translating expect stmt.
-      } else if (stmt is AssumeStmt) {
-        AddComment(builder, stmt, "assume statement");
-        var s = (AssumeStmt)stmt;
-        stmtContext = StmtType.ASSUME;
-        TrStmt_CheckWellformed(s.Expr, builder, locals, etran, false);
-        builder.Add(TrAssumeCmd(stmt.Tok, etran.TrExpr(s.Expr), etran.TrAttributes(stmt.Attributes, null)));
-        stmtContext = StmtType.NONE; // done with translating assume stmt.
-      }
-      this.fuelContext = FuelSetting.PopFuelContext();
-    }
-
-    private void TrCalcStmt(CalcStmt stmt, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      /* Translate into:
-        if (*) {
-            assert wf(line0);
-        } else if (*) {
-            assume wf(line0);
-            // if op is ==>: assume line0;
-            hint0;
-            assert wf(line1);
-            assert line0 op line1;
-            assume false;
-        } else if (*) { ...
-        } else if (*) {
-            assume wf(line<n-1>);
-            // if op is ==>: assume line<n-1>;
-            hint<n-1>;
-            assert wf(line<n>);
-            assert line<n-1> op line<n>;
-            assume false;
-        }
-        assume line<0> op line<n>;
-        */
-      Contract.Assert(stmt.Steps.Count == stmt.Hints.Count); // established by the resolver
-      AddComment(builder, stmt, "calc statement");
-      this.fuelContext = FuelSetting.ExpandFuelContext(stmt.Attributes, stmt.Tok, this.fuelContext, this.reporter);
-      DefineFuelConstant(stmt.Tok, stmt.Attributes, builder, etran);
-      CurrentIdGenerator.Push(); // put the entire calc statement within its own sub-branch
-      if (stmt.Lines.Count > 0) {
-        Bpl.IfCmd ifCmd = null;
-        BoogieStmtListBuilder b;
-        // if the dangling hint is empty, do not generate anything for the dummy step
-        var stepCount = stmt.Hints.Last().Body.Count == 0 ? stmt.Steps.Count - 1 : stmt.Steps.Count;
-        // check steps:
-        for (int i = stepCount; 0 <= --i;) {
-          b = new BoogieStmtListBuilder(this, options);
-          // assume wf[line<i>]:
-          AddComment(b, stmt, "assume wf[lhs]");
-          CurrentIdGenerator.Push();
-          assertAsAssume = true;
-          TrStmt_CheckWellformed(CalcStmt.Lhs(stmt.Steps[i]), b, locals, etran, false);
-          assertAsAssume = false;
-          if (stmt.Steps[i] is BinaryExpr && (((BinaryExpr)stmt.Steps[i]).ResolvedOp == BinaryExpr.ResolvedOpcode.Imp)) {
-            // assume line<i>:
-            AddComment(b, stmt, "assume lhs");
-            b.Add(TrAssumeCmd(stmt.Tok, etran.TrExpr(CalcStmt.Lhs(stmt.Steps[i]))));
-          }
-          // hint:
-          AddComment(b, stmt, "Hint" + i.ToString());
-          TrStmt(stmt.Hints[i], b, locals, etran);
-          if (i < stmt.Steps.Count - 1) {
-            // non-dummy step
-            // check well formedness of the goal line:
-            AddComment(b, stmt, "assert wf[rhs]");
-            if (stmt.Steps[i] is TernaryExpr) {
-              // check the prefix-equality limit
-              var index = ((TernaryExpr)stmt.Steps[i]).E0;
-              TrStmt_CheckWellformed(index, b, locals, etran, false);
-              if (index.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
-                var desc = new PODesc.PrefixEqualityLimit();
-                b.Add(AssertNS(index.tok, Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(index)), desc));
-              }
-            }
-            TrStmt_CheckWellformed(CalcStmt.Rhs(stmt.Steps[i]), b, locals, etran, false);
-            var ss = TrSplitExpr(stmt.Steps[i], etran, true, out var splitHappened);
-            // assert step:
-            AddComment(b, stmt, "assert line" + i.ToString() + " " + (stmt.StepOps[i] ?? stmt.Op).ToString() + " line" + (i + 1).ToString());
-            if (!splitHappened) {
-              b.Add(AssertNS(stmt.Lines[i + 1].tok, etran.TrExpr(stmt.Steps[i]), new PODesc.CalculationStep()));
-            } else {
-              foreach (var split in ss) {
-                if (split.IsChecked) {
-                  b.Add(AssertNS(stmt.Lines[i + 1].tok, split.E, new PODesc.CalculationStep()));
-                }
-              }
-            }
-          }
-          b.Add(TrAssumeCmd(stmt.Tok, Bpl.Expr.False));
-          ifCmd = new Bpl.IfCmd(stmt.Tok, null, b.Collect(stmt.Tok), ifCmd, null);
-          CurrentIdGenerator.Pop();
-        }
-        // check well formedness of the first line:
-        b = new BoogieStmtListBuilder(this, options);
-        AddComment(b, stmt, "assert wf[initial]");
-        Contract.Assert(stmt.Result != null); // established by the resolver
-        TrStmt_CheckWellformed(CalcStmt.Lhs(stmt.Result), b, locals, etran, false);
-        b.Add(TrAssumeCmd(stmt.Tok, Bpl.Expr.False));
-        ifCmd = new Bpl.IfCmd(stmt.Tok, null, b.Collect(stmt.Tok), ifCmd, null);
-        builder.Add(ifCmd);
-        // assume result:
-        if (stmt.Steps.Count > 1) {
-          builder.Add(TrAssumeCmd(stmt.Tok, etran.TrExpr(stmt.Result)));
-        }
-      }
-      CurrentIdGenerator.Pop();
-      this.fuelContext = FuelSetting.PopFuelContext();
-    }
-
-    private void TrMatchStmt(MatchStmt stmt, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      FillMissingCases(stmt);
-
-      TrStmt_CheckWellformed(stmt.Source, builder, locals, etran, true);
-      Bpl.Expr source = etran.TrExpr(stmt.Source);
-      var b = new BoogieStmtListBuilder(this, options);
-      b.Add(TrAssumeCmd(stmt.Tok, Bpl.Expr.False));
-      Bpl.StmtList els = b.Collect(stmt.Tok);
-      Bpl.IfCmd ifCmd = null;
-      foreach (var missingCtor in stmt.MissingCases) {
-        // havoc all bound variables
-        b = new BoogieStmtListBuilder(this, options);
-        List<Variable> newLocals = new List<Variable>();
-        Bpl.Expr r = CtorInvocation(stmt.Tok, missingCtor, etran, newLocals, b);
-        locals.AddRange(newLocals);
-
-        if (newLocals.Count != 0) {
-          List<Bpl.IdentifierExpr> havocIds = new List<Bpl.IdentifierExpr>();
-          foreach (Variable local in newLocals) {
-            havocIds.Add(new Bpl.IdentifierExpr(local.tok, local));
-          }
-          builder.Add(new Bpl.HavocCmd(stmt.Tok, havocIds));
-        }
-        String missingStr = stmt.Context.FillHole(new IdCtx(missingCtor)).AbstractAllHoles()
-          .ToString();
-        var desc = new PODesc.MatchIsComplete("statement", missingStr);
-        b.Add(Assert(stmt.Tok, Bpl.Expr.False, desc));
-
-        Bpl.Expr guard = Bpl.Expr.Eq(source, r);
-        ifCmd = new Bpl.IfCmd(stmt.Tok, guard, b.Collect(stmt.Tok), ifCmd, els);
-        els = null;
-      }
-      for (int i = stmt.Cases.Count; 0 <= --i;) {
-        var mc = (MatchCaseStmt)stmt.Cases[i];
-        CurrentIdGenerator.Push();
-        // havoc all bound variables
-        b = new BoogieStmtListBuilder(this, options);
-        List<Variable> newLocals = new List<Variable>();
-        Bpl.Expr r = CtorInvocation(mc, stmt.Source.Type, etran, newLocals, b, stmt.IsGhost ? NOALLOC : ISALLOC);
-        locals.AddRange(newLocals);
-
-        if (newLocals.Count != 0) {
-          List<Bpl.IdentifierExpr> havocIds = new List<Bpl.IdentifierExpr>();
-          foreach (Variable local in newLocals) {
-            havocIds.Add(new Bpl.IdentifierExpr(local.tok, local));
-          }
-          builder.Add(new Bpl.HavocCmd(mc.tok, havocIds));
-        }
-
-        // translate the body into b
-        var prevDefiniteAssignmentTrackerCount = definiteAssignmentTrackers.Count;
-        TrStmtList(mc.Body, b, locals, etran);
-        RemoveDefiniteAssignmentTrackers(mc.Body, prevDefiniteAssignmentTrackerCount);
-
-        Bpl.Expr guard = Bpl.Expr.Eq(source, r);
-        ifCmd = new Bpl.IfCmd(mc.tok, guard, b.Collect(mc.tok), ifCmd, els);
-        els = null;
-        CurrentIdGenerator.Pop();
-      }
-      if (ifCmd != null) {
-        builder.Add(ifCmd);
-      }
-    }
-
-    void FillMissingCases(IMatch match) {
-      Contract.Requires(match != null);
-      if (match.MissingCases.Any()) {
-        return;
-      }
-
-      var dtd = match.Source.Type.AsDatatype;
-      var constructors = dtd?.ConstructorsByName;
-
-      ISet<string> memberNamesUsed = new HashSet<string>();
-
-      foreach (var matchCase in match.Cases) {
-        if (constructors != null) {
-          Contract.Assert(dtd != null);
-          var ctorId = matchCase.Ctor.Name;
-          if (match.Source.Type.AsDatatype is TupleTypeDecl) {
-            var tuple = (TupleTypeDecl)match.Source.Type.AsDatatype;
-            ctorId = SystemModuleManager.TupleTypeCtorName(tuple.Dims);
-          }
-
-          if (constructors.ContainsKey(ctorId)) {
-            memberNamesUsed.Add(ctorId); // add mc.Id to the set of names used
-          }
-        }
-      }
-      if (dtd != null && memberNamesUsed.Count != dtd.Ctors.Count) {
-        // We could complain about the syntactic omission of constructors:
-        //   Reporter.Error(MessageSource.Resolver, stmt, "match statement does not cover all constructors");
-        // but instead we let the verifier do a semantic check.
-        // So, for now, record the missing constructors:
-        foreach (var ctr in dtd.Ctors) {
-          if (!memberNamesUsed.Contains(ctr.Name)) {
-            match.MissingCases.Add(ctr);
-          }
-        }
-        Contract.Assert(memberNamesUsed.Count + match.MissingCases.Count == dtd.Ctors.Count);
-      }
-    }
-
-    private void TrForLoop(ForLoopStmt stmt, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      AddComment(builder, stmt, "for-loop statement");
-
-      var indexVar = stmt.LoopIndex;
-      var indexVarName = indexVar.AssignUniqueName(currentDeclaration.IdGenerator);
-      var dIndex = new IdentifierExpr(indexVar.tok, indexVar);
-      var bIndexVar = new Bpl.LocalVariable(indexVar.tok, new Bpl.TypedIdent(indexVar.Tok, indexVarName, TrType(indexVar.Type)));
-      locals.Add(bIndexVar);
-      var bIndex = new Bpl.IdentifierExpr(indexVar.tok, indexVarName);
-
-      var lo = stmt.GoingUp ? stmt.Start : stmt.End;
-      var hi = stmt.GoingUp ? stmt.End : stmt.Start;
-      Expression dLo = null;
-      Expression dHi = null;
-      Bpl.IdentifierExpr bLo = null;
-      Bpl.IdentifierExpr bHi = null;
-      if (lo != null) {
-        var name = indexVarName + "#lo";
-        var bLoVar = new Bpl.LocalVariable(lo.tok, new Bpl.TypedIdent(lo.tok, name, Bpl.Type.Int));
-        locals.Add(bLoVar);
-        bLo = new Bpl.IdentifierExpr(lo.tok, name);
-        CheckWellformed(lo, new WFOptions(null, false), locals, builder, etran);
-        builder.Add(Bpl.Cmd.SimpleAssign(lo.tok, bLo, etran.TrExpr(lo)));
-        dLo = new BoogieWrapper(bLo, lo.Type);
-      }
-      if (hi != null) {
-        var name = indexVarName + "#hi";
-        var bHiVar = new Bpl.LocalVariable(hi.tok, new Bpl.TypedIdent(hi.tok, name, Bpl.Type.Int));
-        locals.Add(bHiVar);
-        bHi = new Bpl.IdentifierExpr(hi.tok, name);
-        CheckWellformed(hi, new WFOptions(null, false), locals, builder, etran);
-        builder.Add(Bpl.Cmd.SimpleAssign(hi.tok, bHi, etran.TrExpr(hi)));
-        dHi = new BoogieWrapper(bHi, hi.Type);
-      }
-
-      // check lo <= hi
-      if (lo != null && hi != null) {
-        builder.Add(Assert(lo.tok, Bpl.Expr.Le(bLo, bHi), new PODesc.ForRangeBoundsValid()));
-      }
-      // check forall x :: lo <= x <= hi ==> Is(x, typ)
-      {
-        // The check, if needed, is performed like this:
-        //   var x: int;
-        //   havoc x;
-        //   assume lo <= x <= hi;
-        //   assert Is(x, typ);
-        var tok = indexVar.tok;
-        var name = indexVarName + "#x";
-        var xVar = new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, name, Bpl.Type.Int));
-        var x = new Bpl.IdentifierExpr(tok, name);
-        var cre = GetSubrangeCheck(x, Type.Int, indexVar.Type, out var desc);
-        if (cre != null) {
-          locals.Add(xVar);
-          builder.Add(new Bpl.HavocCmd(tok, new List<Bpl.IdentifierExpr>() { x }));
-          builder.Add(new Bpl.AssumeCmd(tok, ForLoopBounds(x, bLo, bHi)));
-          builder.Add(Assert(tok, cre, new PODesc.ForRangeAssignable(desc)));
-        }
-      }
-
-      // initialize the index variable
-      builder.Add(Bpl.Cmd.SimpleAssign(indexVar.tok, bIndex, stmt.GoingUp ? bLo : bHi));
-
-      // build the guard expression
-      Expression guard;
-      if (lo == null || hi == null) {
-        guard = LiteralExpr.CreateBoolLiteral(stmt.Tok, true);
-      } else {
-        guard = Expression.CreateNot(stmt.Tok, Expression.CreateEq(dIndex, stmt.GoingUp ? dHi : dLo, indexVar.Type));
-      }
-
-      // free invariant lo <= i <= hi
-      var freeInvariant = ForLoopBounds(bIndex, bLo, bHi);
-
-      BodyTranslator bodyTr = null;
-      if (stmt.Body != null) {
-        bodyTr = delegate (BoogieStmtListBuilder bld, ExpressionTranslator e) {
-          CurrentIdGenerator.Push();
-          if (!stmt.GoingUp) {
-            bld.Add(Bpl.Cmd.SimpleAssign(stmt.Tok, bIndex, Bpl.Expr.Sub(bIndex, Bpl.Expr.Literal(1))));
-          }
-          TrStmt(stmt.Body, bld, locals, e);
-          InsertContinueTarget(stmt, bld);
-          if (stmt.GoingUp) {
-            bld.Add(Bpl.Cmd.SimpleAssign(stmt.Tok, bIndex, Bpl.Expr.Add(bIndex, Bpl.Expr.Literal(1))));
-          }
-          CurrentIdGenerator.Pop();
-        };
-      }
-
-      TrLoop(stmt, guard, bodyTr, builder, locals, etran, freeInvariant, stmt.Decreases.Expressions.Count != 0);
-    }
-
-    private void TrWhileStmt(WhileStmt stmt, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      AddComment(builder, stmt, "while statement");
-      this.fuelContext = FuelSetting.ExpandFuelContext(stmt.Attributes, stmt.Tok, this.fuelContext, this.reporter);
-      DefineFuelConstant(stmt.Tok, stmt.Attributes, builder, etran);
-      BodyTranslator bodyTr = null;
-      if (stmt.Body != null) {
-        bodyTr = delegate (BoogieStmtListBuilder bld, ExpressionTranslator e) {
-          CurrentIdGenerator.Push();
-          TrStmt(stmt.Body, bld, locals, e);
-          InsertContinueTarget(stmt, bld);
-          CurrentIdGenerator.Pop();
-        };
-      }
-      TrLoop(stmt, stmt.Guard, bodyTr, builder, locals, etran);
-      this.fuelContext = FuelSetting.PopFuelContext();
-    }
-
-    private void TrIfStmt(IfStmt stmt, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      AddComment(builder, stmt, "if statement");
-      Expression guard;
-      if (stmt.Guard == null) {
-        guard = null;
-      } else {
-        guard = stmt.IsBindingGuard ? AlphaRename((ExistsExpr)stmt.Guard, "eg$") : stmt.Guard;
-        TrStmt_CheckWellformed(guard, builder, locals, etran, true);
-      }
-      BoogieStmtListBuilder b = new BoogieStmtListBuilder(this, options);
-      if (stmt.IsBindingGuard) {
-        CurrentIdGenerator.Push();
-        var exists = (ExistsExpr)stmt.Guard; // the original (that is, not alpha-renamed) guard
-        IntroduceAndAssignExistentialVars(exists, b, builder, locals, etran, stmt.IsGhost);
-        CurrentIdGenerator.Pop();
-      }
-      CurrentIdGenerator.Push();
-      Bpl.StmtList thn = TrStmt2StmtList(b, stmt.Thn, locals, etran);
-      CurrentIdGenerator.Pop();
-      Bpl.StmtList els;
-      Bpl.IfCmd elsIf = null;
-      b = new BoogieStmtListBuilder(this, options);
-      if (stmt.IsBindingGuard) {
-        b.Add(TrAssumeCmd(guard.tok, Bpl.Expr.Not(etran.TrExpr(guard))));
-      }
-      if (stmt.Els == null) {
-        els = b.Collect(stmt.Tok);
-      } else {
-        CurrentIdGenerator.Push();
-        els = TrStmt2StmtList(b, stmt.Els, locals, etran);
-        CurrentIdGenerator.Pop();
-        if (els.BigBlocks.Count == 1) {
-          Bpl.BigBlock bb = els.BigBlocks[0];
-          if (bb.LabelName == null && bb.simpleCmds.Count == 0 && bb.ec is Bpl.IfCmd) {
-            elsIf = (Bpl.IfCmd)bb.ec;
-            els = null;
-          }
-        }
-      }
-      builder.Add(new Bpl.IfCmd(stmt.Tok, guard == null || stmt.IsBindingGuard ? null : etran.TrExpr(guard), thn, elsIf, els));
-    }
-
-
-    void TrForallProof(ForallStmt s, BoogieStmtListBuilder definedness, BoogieStmtListBuilder exporter, List<Variable> locals, ExpressionTranslator etran) {
-      // Translate:
-      //   forall (x,y | Range(x,y))
-      //     ensures Post(x,y);
-      //   {
-      //     Body;
-      //   }
-      // as:
-      //   if (*) {
-      //     var x,y;
-      //     havoc x,y;
-      //     CheckWellformed( Range );
-      //     assume Range(x,y);
-      //     CheckWellformed( Post );
-      //     Tr( Body );       // include only if there is a Body
-      //     assert Post;      // include only if there is a Body
-      //     assume false;
-      //   } else {
-      //     assume (forall x,y :: Range(x,y) ==> Post(x,y));
-      //   }
-
-      if (s.BoundVars.Count != 0) {
-        // Note, it would be nicer (and arguably more appropriate) to do a SetupBoundVarsAsLocals
-        // here (rather than a TrBoundVariables).  However, there is currently no way to apply
-        // a substMap to a statement (in particular, to s.Body), so that doesn't work here.
-        List<bool> freeOfAlloc = ComprehensionExpr.BoundedPool.HasBounds(s.Bounds, ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
-
-        var bVars = new List<Variable>();
-        var typeAntecedent = etran.TrBoundVariables(s.BoundVars, bVars, true, freeOfAlloc);
-        locals.AddRange(bVars);
-        var havocIds = new List<Bpl.IdentifierExpr>();
-        foreach (Bpl.Variable bv in bVars) {
-          havocIds.Add(new Bpl.IdentifierExpr(s.Tok, bv));
-        }
-        definedness.Add(new Bpl.HavocCmd(s.Tok, havocIds));
-        definedness.Add(TrAssumeCmd(s.Tok, typeAntecedent));
-      }
-      TrStmt_CheckWellformed(s.Range, definedness, locals, etran, false);
-      definedness.Add(TrAssumeCmd(s.Range.tok, etran.TrExpr(s.Range)));
-
-      var ensuresDefinedness = new BoogieStmtListBuilder(this, options);
-      foreach (var ens in s.Ens) {
-        TrStmt_CheckWellformed(ens.E, ensuresDefinedness, locals, etran, false);
-        ensuresDefinedness.Add(TrAssumeCmd(ens.E.tok, etran.TrExpr(ens.E)));
-      }
-      PathAsideBlock(s.Tok, ensuresDefinedness, definedness);
-
-      if (s.Body != null) {
-        TrStmt(s.Body, definedness, locals, etran);
-
-        // check that postconditions hold
-        foreach (var ens in s.Ens) {
-          foreach (var split in TrSplitExpr(ens.E, etran, true, out var splitHappened)) {
-            if (split.IsChecked) {
-              definedness.Add(Assert(split.Tok, split.E, new PODesc.ForallPostcondition()));
-            }
-          }
-        }
-      }
-
-      definedness.Add(TrAssumeCmd(s.Tok, Bpl.Expr.False));
-
-      // Now for the other branch, where the ensures clauses are exported.
-      // If the forall body has side effect such as call to a reveal function,
-      // it needs to be exported too.
-      var se = s.Body == null ? Bpl.Expr.True : TrFunctionSideEffect(s.Body, etran);
-      var substMap = new Dictionary<IVariable, Expression>();
-      var p = Substitute(s.ForallExpressions[0], null, substMap);
-      var qq = etran.TrExpr(p);
-      if (s.BoundVars.Count != 0) {
-        exporter.Add(TrAssumeCmd(s.Tok, BplAnd(se, qq)));
-      } else {
-        exporter.Add(TrAssumeCmd(s.Tok, BplAnd(se, ((Bpl.ForallExpr)qq).Body)));
-      }
-    }
-
-    /// <summary>
-    /// "lhs" is expected to be a resolved form of an expression, i.e., not a concrete-syntax expression.
-    /// </summary>
-    void TrAssignment(Statement stmt, Expression lhs, AssignmentRhs rhs,
-      BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(stmt != null);
-      Contract.Requires(lhs != null);
-      Contract.Requires(!(lhs is ConcreteSyntaxExpression));
-      Contract.Requires(!(lhs is SeqSelectExpr && !((SeqSelectExpr)lhs).SelectOne));  // these were once allowed, but their functionality is now provided by 'forall' statements
-      Contract.Requires(rhs != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(cce.NonNullElements(locals));
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-
-      var lhss = new List<Expression>() { lhs };
-      ProcessLhss(lhss, rhs.CanAffectPreviouslyKnownExpressions, true, builder, locals, etran,
-        out var lhsBuilder, out var bLhss, out var ignore1, out var ignore2, out var ignore3);
-      Contract.Assert(lhsBuilder.Count == 1 && bLhss.Count == 1);  // guaranteed by postcondition of ProcessLhss
-
-      var rhss = new List<AssignmentRhs>() { rhs };
-      ProcessRhss(lhsBuilder, bLhss, lhss, rhss, builder, locals, etran);
-      builder.AddCaptureState(stmt);
-    }
-
-    void TrForallAssign(ForallStmt s, AssignStmt s0,
-      BoogieStmtListBuilder definedness, BoogieStmtListBuilder updater, List<Variable> locals, ExpressionTranslator etran) {
-      // The statement:
-      //   forall (x,y | Range(x,y)) {
-      //     (a)   E(x,y) . f :=  G(x,y);
-      //     (b)   A(x,y) [ I0(x,y), I1(x,y), ... ] :=  G(x,y);
-      //   }
-      // translate into:
-      //   if (*) {
-      //     // check definedness of Range
-      //     var x,y;
-      //     havoc x,y;
-      //     CheckWellformed( Range );
-      //     assume Range;
-      //     // check definedness of the other expressions
-      //     (a)
-      //       CheckWellformed( E.F );
-      //       check that E.f is in the modifies frame;
-      //       CheckWellformed( G );
-      //       check nat restrictions for the RHS
-      //     (b)
-      //       CheckWellformed( A[I0,I1,...] );
-      //       check that A[I0,I1,...] is in the modifies frame;
-      //       CheckWellformed( G );
-      //       check nat restrictions for the RHS
-      //     // check for duplicate LHSs
-      //     var x', y';
-      //     havoc x', y';
-      //     assume Range[x,y := x',y'];
-      //     assume !(x == x' && y == y');
-      //     (a)
-      //       assert E(x,y) != E(x',y') || G(x,y) == G(x',y');
-      //     (b)
-      //       assert !( A(x,y)==A(x',y') && I0(x,y)==I0(x',y') && I1(x,y)==I1(x',y') && ... ) || G(x,y) == G(x',y');
-      //
-      //     assume false;
-      //
-      //   } else {
-      //     var oldHeap := $Heap;
-      //     havoc $Heap;
-      //     assume $HeapSucc(oldHeap, $Heap);
-      //     (a)
-      //       assume (forall<alpha> o: ref, F: Field alpha ::
-      //         { $Heap[o,F] }
-      //         $Heap[o,F] = oldHeap[o,F] ||
-      //         (exists x,y :: Range(x,y) && o == E(x,y) && F = f));
-      //       assume (forall x,y ::  Range ==> $Heap[ E[$Heap:=oldHeap], F] == G[$Heap:=oldHeap]); (**)
-      //     (b)
-      //       assume (forall<alpha> o: ref, F: Field alpha ::
-      //         { $Heap[o,F] }
-      //         $Heap[o,F] = oldHeap[o,F] ||
-      //         (exists x,y :: Range(x,y) && o == A(x,y) && F = Index(I0,I1,...)));
-      //       assume (forall x,y ::  Range ==> $Heap[ A[$Heap:=oldHeap], Index(I0,I1,...)] == G[$Heap:=oldHeap]); (**)
-      //   }
-      //
-      // Note: In order to get a good trigger for the quantifiers (**), we will attempt to make the parameters
-      // that select from $Heap in the LHS of the equalities as plain as possible.  This involves taking the inverse
-      // of an expression, which isn't always easy or possible, so we settle for handling some common cases.  In
-      // particular, we change:
-      //   0: forall i | R(i) { F(i).f := E(i); }
-      //   1: forall i | R(i) { A[F(i)] := E(i); }
-      //   2: forall i | R(i) { F(i)[N] := E(i); }
-      // where f is some field and A and N are expressions that do not depend on i, into:
-      //   0: forall j | Q(j) { j.f := E(F-1(j)); }
-      //   1: forall j | Q(j) { A[j] := E(F-1(j)); }
-      //   2: forall j | Q(j) { j[N] := E(F-1(j)); }
-      // where we ensure that, for all i and j:
-      //   R(i) && j == F(i)    <==>    Q(j) && F-1(j) == i
-      // If the transformation succeeds, we use, respectively, j.f, A[j], and j[N] (each evaluated in the new heap) as
-      // the trigger of the quantifier generated.
-
-      var substMap = SetupBoundVarsAsLocals(s.BoundVars, definedness, locals, etran);
-      Expression range = Substitute(s.Range, null, substMap);
-      TrStmt_CheckWellformed(range, definedness, locals, etran, false);
-      definedness.Add(TrAssumeCmd(s.Range.tok, etran.TrExpr(range)));
-
-      var lhs = Substitute(s0.Lhs.Resolved, null, substMap);
-      TrStmt_CheckWellformed(lhs, definedness, locals, etran, false);
-      string description = GetObjFieldDetails(lhs, etran, out var obj, out var F);
-      definedness.Add(Assert(lhs.tok, Bpl.Expr.SelectTok(lhs.tok, etran.TheFrame(lhs.tok), obj, F),
-        new PODesc.Modifiable(description)));
-      if (s0.Rhs is ExprRhs) {
-        var r = (ExprRhs)s0.Rhs;
-        var rhs = Substitute(r.Expr, null, substMap);
-        TrStmt_CheckWellformed(rhs, definedness, locals, etran, false);
-        // check nat restrictions for the RHS
-        Type lhsType;
-        if (lhs is MemberSelectExpr) {
-          lhsType = ((MemberSelectExpr)lhs).Type;
-        } else if (lhs is SeqSelectExpr) {
-          lhsType = ((SeqSelectExpr)lhs).Type;
-        } else {
-          lhsType = ((MultiSelectExpr)lhs).Type;
-        }
-        var translatedRhs = etran.TrExpr(rhs);
-        CheckSubrange(r.Tok, translatedRhs, rhs.Type, lhsType, definedness);
-        if (lhs is MemberSelectExpr) {
-          var fse = (MemberSelectExpr)lhs;
-          var field = fse.Member as Field;
-          Contract.Assert(field != null);
-          Check_NewRestrictions(fse.tok, obj, field, translatedRhs, definedness, etran);
-        }
-      }
-
-      // check for duplicate LHSs
-      if (s0.Rhs is ExprRhs) {  // if Rhs denotes a havoc, then no duplicate check is performed
-        var substMapPrime = SetupBoundVarsAsLocals(s.BoundVars, definedness, locals, etran);
-        var lhsPrime = Substitute(s0.Lhs.Resolved, null, substMapPrime);
-        range = Substitute(s.Range, null, substMapPrime);
-        definedness.Add(TrAssumeCmd(range.tok, etran.TrExpr(range)));
-        // assume !(x == x' && y == y');
-        Bpl.Expr eqs = Bpl.Expr.True;
-        foreach (var bv in s.BoundVars) {
-          var x = substMap[bv];
-          var xPrime = substMapPrime[bv];
-          // TODO: in the following line, is the term equality okay, or does it have to include things like Set#Equal sometimes too?
-          eqs = BplAnd(eqs, Bpl.Expr.Eq(etran.TrExpr(x), etran.TrExpr(xPrime)));
-        }
-        definedness.Add(TrAssumeCmd(s.Tok, Bpl.Expr.Not(eqs)));
-        GetObjFieldDetails(lhsPrime, etran, out var objPrime, out var FPrime);
-        var Rhs = ((ExprRhs)s0.Rhs).Expr;
-        var rhs = etran.TrExpr(Substitute(Rhs, null, substMap));
-        var rhsPrime = etran.TrExpr(Substitute(Rhs, null, substMapPrime));
-        definedness.Add(Assert(s0.Tok,
-          Bpl.Expr.Or(
-            Bpl.Expr.Or(Bpl.Expr.Neq(obj, objPrime), Bpl.Expr.Neq(F, FPrime)),
-            Bpl.Expr.Eq(rhs, rhsPrime)),
-          new PODesc.ForallLHSUnique()));
-      }
-
-      definedness.Add(TrAssumeCmd(s.Tok, Bpl.Expr.False));
-
-      // Now for the translation of the update itself
-
-      Bpl.IdentifierExpr prevHeap = GetPrevHeapVar_IdExpr(s.Tok, locals);
-      var prevEtran = new ExpressionTranslator(this, predef, prevHeap);
-      updater.Add(Bpl.Cmd.SimpleAssign(s.Tok, prevHeap, etran.HeapExpr));
-      updater.Add(new Bpl.HavocCmd(s.Tok, new List<Bpl.IdentifierExpr> { etran.HeapCastToIdentifierExpr }));
-      updater.Add(TrAssumeCmd(s.Tok, HeapSucc(prevHeap, etran.HeapExpr)));
-
-      // Here comes:
-      //   assume (forall<alpha> o: ref, f: Field alpha ::
-      //     { $Heap[o,f] }
-      //     $Heap[o,f] = oldHeap[o,f] ||
-      //     (exists x,y :: Range(x,y)[$Heap:=oldHeap] &&
-      //                    o == Object(x,y)[$Heap:=oldHeap] && f == Field(x,y)[$Heap:=oldHeap]));
-      Bpl.TypeVariable alpha = new Bpl.TypeVariable(s.Tok, "alpha");
-      Bpl.BoundVariable oVar = new Bpl.BoundVariable(s.Tok, new Bpl.TypedIdent(s.Tok, "$o", predef.RefType));
-      Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(s.Tok, oVar);
-      Bpl.BoundVariable fVar = new Bpl.BoundVariable(s.Tok, new Bpl.TypedIdent(s.Tok, "$f", predef.FieldName(s.Tok, alpha)));
-      Bpl.IdentifierExpr f = new Bpl.IdentifierExpr(s.Tok, fVar);
-      Bpl.Expr heapOF = ReadHeap(s.Tok, etran.HeapExpr, o, f, alpha);
-      Bpl.Expr oldHeapOF = ReadHeap(s.Tok, prevHeap, o, f, alpha);
-      List<bool> freeOfAlloc = ComprehensionExpr.BoundedPool.HasBounds(s.Bounds, ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
-      List<Variable> xBvars = new List<Variable>();
-      var xBody = etran.TrBoundVariables(s.BoundVars, xBvars, false, freeOfAlloc);
-      xBody = BplAnd(xBody, prevEtran.TrExpr(s.Range));
-      GetObjFieldDetails(s0.Lhs.Resolved, prevEtran, out var xObj, out var xField);
-      xBody = BplAnd(xBody, Bpl.Expr.Eq(o, xObj));
-      xBody = BplAnd(xBody, Bpl.Expr.Eq(f, xField));
-      //TRIG (exists k#2: int :: (k#2 == LitInt(0 - 3) || k#2 == LitInt(4)) && $o == read($prevHeap, this, _module.MyClass.arr) && $f == MultiIndexField(IndexField(i#0), j#0))
-      Bpl.Expr xObjField = new Bpl.ExistsExpr(s.Tok, xBvars, xBody);  // LL_TRIGGER
-      Bpl.Expr body = Bpl.Expr.Or(Bpl.Expr.Eq(heapOF, oldHeapOF), xObjField);
-      var tr = new Trigger(s.Tok, true, new List<Expr>() { heapOF });
-      Bpl.Expr qq = new Bpl.ForallExpr(s.Tok, new List<TypeVariable> { alpha }, new List<Variable> { oVar, fVar }, null, tr, body);
-      updater.Add(TrAssumeCmd(s.Tok, qq));
-
-      if (s.ForallExpressions != null) {
-        foreach (ForallExpr expr in s.ForallExpressions) {
-          BinaryExpr term = (BinaryExpr)expr.Term;
-          Contract.Assert(term != null);
-          var e0 = ((BinaryExpr)term).E0.Resolved;
-          var e1 = ((BinaryExpr)term).E1;
-          qq = TrForall_NewValueAssumption(expr.tok, expr.BoundVars, expr.Bounds, expr.Range, e0, e1, expr.Attributes, etran, prevEtran);
-          updater.Add(TrAssumeCmd(s.Tok, qq));
-        }
-      }
-    }
-
-    /// <summary>
-    /// Generate:
-    ///   assume (forall x,y :: Range(x,y)[$Heap:=oldHeap] ==>
-    ///                         $Heap[ Object(x,y)[$Heap:=oldHeap], Field(x,y)[$Heap:=oldHeap] ] == G[$Heap:=oldHeap] ));
-    /// where
-    ///   x,y           represent boundVars
-    ///   Object(x,y)   is the first part of lhs
-    ///   Field(x,y)    is the second part of lhs
-    ///   G             is rhs
-    /// If lhsAsTrigger is true, then use the LHS of the equality above as the trigger; otherwise, don't specify any trigger.
-    /// </summary>
-    private Bpl.Expr TrForall_NewValueAssumption(IToken tok, List<BoundVar> boundVars, List<ComprehensionExpr.BoundedPool> bounds, Expression range, Expression lhs, Expression rhs, Attributes attributes, ExpressionTranslator etran, ExpressionTranslator prevEtran) {
-      Contract.Requires(tok != null);
-      Contract.Requires(boundVars != null);
-      Contract.Requires(bounds != null);
-      Contract.Requires(range != null);
-      Contract.Requires(lhs != null);
-      Contract.Requires(rhs != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(prevEtran != null);
-
-      List<bool> freeOfAlloc = ComprehensionExpr.BoundedPool.HasBounds(bounds, ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
-      var xBvars = new List<Variable>();
-      Bpl.Expr xAnte = etran.TrBoundVariables(boundVars, xBvars, false, freeOfAlloc);
-      xAnte = BplAnd(xAnte, prevEtran.TrExpr(range));
-      var g = prevEtran.TrExpr(rhs);
-      GetObjFieldDetails(lhs, prevEtran, out var obj, out var field);
-      var xHeapOF = ReadHeap(tok, etran.HeapExpr, obj, field);
-
-      Type lhsType = lhs is MemberSelectExpr ? ((MemberSelectExpr)lhs).Type : null;
-
-      g = CondApplyBox(rhs.tok, g, rhs.Type, lhsType);
-
-      Bpl.Trigger tr = null;
-      var argsEtran = etran.WithNoLits();
-      foreach (var aa in attributes.AsEnumerable()) {
-        if (aa.Name == "trigger") {
-          List<Bpl.Expr> tt = new List<Bpl.Expr>();
-          foreach (var arg in aa.Args) {
-            if (arg == lhs) {
-              tt.Add(xHeapOF);
-            } else {
-              tt.Add(argsEtran.TrExpr(arg));
-            }
-          }
-          tr = new Bpl.Trigger(tok, true, tt, tr);
-        }
-      }
-      return new Bpl.ForallExpr(tok, xBvars, tr, Bpl.Expr.Imp(xAnte, Bpl.Expr.Eq(xHeapOF, g)));
-    }
-
-    void TrLoop(LoopStmt s, Expression Guard, BodyTranslator/*?*/ bodyTr,
-                BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran,
-                Bpl.Expr freeInvariant = null, bool includeTerminationCheck = true) {
-      Contract.Requires(s != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      var suffix = CurrentIdGenerator.FreshId("loop#");
-
-      var theDecreases = s.Decreases.Expressions;
-
-      Bpl.LocalVariable preLoopHeapVar = new Bpl.LocalVariable(s.Tok, new Bpl.TypedIdent(s.Tok, "$PreLoopHeap$" + suffix, predef.HeapType));
-      locals.Add(preLoopHeapVar);
-      Bpl.IdentifierExpr preLoopHeap = new Bpl.IdentifierExpr(s.Tok, preLoopHeapVar);
-      ExpressionTranslator etranPreLoop = new ExpressionTranslator(this, predef, preLoopHeap);
-      ExpressionTranslator updatedFrameEtran;
-      string loopFrameName = "$Frame$" + suffix;
-      if (s.Mod.Expressions != null) {
-        updatedFrameEtran = new ExpressionTranslator(etran, loopFrameName);
-      } else {
-        updatedFrameEtran = etran;
-      }
-
-      if (s.Mod.Expressions != null) { // check well-formedness and that the modifies is a subset
-        CheckFrameWellFormed(new WFOptions(), s.Mod.Expressions, locals, builder, etran);
-        CheckFrameSubset(s.Tok, s.Mod.Expressions, null, null, etran, builder, new PODesc.FrameSubset("loop modifies clause", true), null);
-        DefineFrame(s.Tok, s.Mod.Expressions, builder, locals, loopFrameName);
-      }
-      builder.Add(Bpl.Cmd.SimpleAssign(s.Tok, preLoopHeap, etran.HeapExpr));
-
-      var daTrackersMonotonicity = new List<Tuple<Bpl.IdentifierExpr, Bpl.IdentifierExpr>>();
-      foreach (var dat in definiteAssignmentTrackers.Values) {  // TODO: the order is non-deterministic and may change between invocations of Dafny
-        var preLoopDat = new Bpl.LocalVariable(dat.tok, new Bpl.TypedIdent(dat.tok, "preLoop$" + suffix + "$" + dat.Name, dat.Type));
-        locals.Add(preLoopDat);
-        var ie = new Bpl.IdentifierExpr(s.Tok, preLoopDat);
-        daTrackersMonotonicity.Add(new Tuple<Bpl.IdentifierExpr, Bpl.IdentifierExpr>(ie, dat));
-        builder.Add(Bpl.Cmd.SimpleAssign(s.Tok, ie, dat));
-      }
-
-      List<Bpl.Expr> initDecr = null;
-      if (!Contract.Exists(theDecreases, e => e is WildcardExpr)) {
-        initDecr = RecordDecreasesValue(theDecreases, builder, locals, etran, "$decr_init$" + suffix);
-      }
-
-      // The variable w is used to coordinate the definedness checking of the loop invariant.
-      // It is also used for body-less loops to turn off invariant checking after the generated body.
-      Bpl.LocalVariable wVar = new Bpl.LocalVariable(s.Tok, new Bpl.TypedIdent(s.Tok, "$w$" + suffix, Bpl.Type.Bool));
-      Bpl.IdentifierExpr w = new Bpl.IdentifierExpr(s.Tok, wVar);
-      locals.Add(wVar);
-      // havoc w;
-      builder.Add(new Bpl.HavocCmd(s.Tok, new List<Bpl.IdentifierExpr> { w }));
-
-      List<Bpl.PredicateCmd> invariants = new List<Bpl.PredicateCmd>();
-      if (freeInvariant != null) {
-        invariants.Add(new Bpl.AssumeCmd(freeInvariant.tok, freeInvariant));
-      }
-      BoogieStmtListBuilder invDefinednessBuilder = new BoogieStmtListBuilder(this, options);
-      foreach (AttributedExpression loopInv in s.Invariants) {
-        var (errorMessage, successMessage) = CustomErrorMessage(loopInv.Attributes);
-        TrStmt_CheckWellformed(loopInv.E, invDefinednessBuilder, locals, etran, false);
-        invDefinednessBuilder.Add(TrAssumeCmd(loopInv.E.tok, etran.TrExpr(loopInv.E)));
-
-        invariants.Add(TrAssumeCmd(loopInv.E.tok, Bpl.Expr.Imp(w, CanCallAssumption(loopInv.E, etran))));
-        var ss = TrSplitExpr(loopInv.E, etran, false, out var splitHappened);
-        if (!splitHappened) {
-          var wInv = Bpl.Expr.Imp(w, etran.TrExpr(loopInv.E));
-          invariants.Add(Assert(loopInv.E.tok, wInv, new PODesc.LoopInvariant(errorMessage, successMessage)));
-        } else {
-          foreach (var split in ss) {
-            var wInv = Bpl.Expr.Binary(split.E.tok, BinaryOperator.Opcode.Imp, w, split.E);
-            if (split.IsChecked) {
-              invariants.Add(Assert(split.Tok, wInv, new PODesc.LoopInvariant(errorMessage, successMessage)));  // TODO: it would be fine to have this use {:subsumption 0}
-            } else {
-              invariants.Add(TrAssumeCmd(split.E.tok, wInv));
-            }
-          }
-        }
-      }
-      // check definedness of decreases clause
-      foreach (Expression e in theDecreases) {
-        TrStmt_CheckWellformed(e, invDefinednessBuilder, locals, etran, true);
-      }
-      if (codeContext is IMethodCodeContext) {
-        var modifiesClause = ((IMethodCodeContext)codeContext).Modifies.Expressions;
-        if (codeContext is IteratorDecl) {
-          // add "this" to the explicit modifies clause
-          var explicitModifies = modifiesClause;
-          modifiesClause = new List<FrameExpression>();
-          modifiesClause.Add(new FrameExpression(s.Tok, new ThisExpr((IteratorDecl)codeContext), null));
-          modifiesClause.AddRange(explicitModifies);
-        }
-        // include boilerplate invariants
-        foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(s.Tok, modifiesClause, s.IsGhost, codeContext.AllowsAllocation, etranPreLoop, etran, etran.Old)) {
-          if (tri.IsFree) {
-            invariants.Add(TrAssumeCmd(s.Tok, tri.Expr));
-          } else {
-            Contract.Assert(tri.ErrorMessage != null);  // follows from BoilerplateTriple invariant
-            invariants.Add(Assert(s.Tok, tri.Expr, new PODesc.BoilerplateTriple(tri.ErrorMessage, tri.SuccessMessage, tri.Comment)));
-          }
-        }
-        // add a free invariant which says that the heap hasn't changed outside of the modifies clause.
-        invariants.Add(TrAssumeCmd(s.Tok, FrameConditionUsingDefinedFrame(s.Tok, etranPreLoop, etran, updatedFrameEtran)));
-        // for iterators, add "fresh(_new)" as an invariant
-        if (codeContext is IteratorDecl iter) {
-          var th = new ThisExpr(iter);
-          var thisDotNew = new MemberSelectExpr(s.Tok, th, iter.Member_New);
-          var fr = new FreshExpr(s.Tok, thisDotNew);
-          fr.Type = Type.Bool;
-          invariants.Add(TrAssertCmd(s.Tok, etran.TrExpr(fr)));
-        }
-      }
-
-      // include a free invariant that says that all definite-assignment trackers have only become more "true"
-      foreach (var pair in daTrackersMonotonicity) {
-        Bpl.Expr monotonic = Bpl.Expr.Imp(pair.Item1, pair.Item2);
-        invariants.Add(TrAssumeCmd(s.Tok, monotonic));
-      }
-
-      // include a free invariant that says that all completed iterations so far have only decreased the termination metric
-      if (initDecr != null) {
-        var toks = new List<IToken>();
-        var types = new List<Type>();
-        var decrs = new List<Expr>();
-        foreach (Expression e in theDecreases) {
-          toks.Add(e.tok);
-          types.Add(e.Type.NormalizeExpand());
-          decrs.Add(etran.TrExpr(e));
-        }
-        Bpl.Expr decrCheck = DecreasesCheck(toks, types, types, decrs, initDecr, null, null, true, false);
-        invariants.Add(TrAssumeCmd(s.Tok, decrCheck));
-      }
-
-      var loopBodyBuilder = new BoogieStmtListBuilder(this, options);
-      loopBodyBuilder.AddCaptureState(s.Tok, true, "after some loop iterations");
-
-      // As the first thing inside the loop, generate:  if (!w) { CheckWellformed(inv); assume false; }
-      invDefinednessBuilder.Add(TrAssumeCmd(s.Tok, Bpl.Expr.False));
-      loopBodyBuilder.Add(new Bpl.IfCmd(s.Tok, Bpl.Expr.Not(w), invDefinednessBuilder.Collect(s.Tok), null, null));
-
-      // Generate:  CheckWellformed(guard); if (!guard) { break; }
-      // but if this is a body-less loop, put all of that inside:  if (*) { ... }
-      // Without this, Boogie's abstract interpreter may figure out that the loop guard is always false
-      // on entry to the loop, and then Boogie wouldn't consider this a loop at all. (See also comment
-      // in methods GuardAlwaysHoldsOnEntry_BodyLessLoop and GuardAlwaysHoldsOnEntry_LoopWithBody in
-      // Test/dafny0/DirtyLoops.dfy.)
-      var isBodyLessLoop = s is OneBodyLoopStmt { BodySurrogate: { } };
-      var whereToBuildLoopGuard = isBodyLessLoop ? new BoogieStmtListBuilder(this, options) : loopBodyBuilder;
-      Bpl.Expr guard = null;
-      if (Guard != null) {
-        TrStmt_CheckWellformed(Guard, whereToBuildLoopGuard, locals, etran, true);
-        guard = Bpl.Expr.Not(etran.TrExpr(Guard));
-      }
-      var guardBreak = new BoogieStmtListBuilder(this, options);
-      guardBreak.Add(new Bpl.BreakCmd(s.Tok, null));
-      whereToBuildLoopGuard.Add(new Bpl.IfCmd(s.Tok, guard, guardBreak.Collect(s.Tok), null, null));
-      if (isBodyLessLoop) {
-        loopBodyBuilder.Add(new Bpl.IfCmd(s.Tok, null, whereToBuildLoopGuard.Collect(s.Tok), null, null));
-      }
-
-      if (bodyTr != null) {
-        // termination checking
-        if (Contract.Exists(theDecreases, e => e is WildcardExpr)) {
-          // omit termination checking for this loop
-          bodyTr(loopBodyBuilder, updatedFrameEtran);
-        } else {
-          List<Bpl.Expr> oldBfs = RecordDecreasesValue(theDecreases, loopBodyBuilder, locals, etran, "$decr$" + suffix);
-          // time for the actual loop body
-          bodyTr(loopBodyBuilder, updatedFrameEtran);
-          // check definedness of decreases expressions
-          var toks = new List<IToken>();
-          var types = new List<Type>();
-          var decrs = new List<Expr>();
-          foreach (Expression e in theDecreases) {
-            toks.Add(e.tok);
-            types.Add(e.Type.NormalizeExpand());
-            decrs.Add(etran.TrExpr(e));
-          }
-          if (includeTerminationCheck) {
-            AddComment(loopBodyBuilder, s, "loop termination check");
-            Bpl.Expr decrCheck = DecreasesCheck(toks, types, types, decrs, oldBfs, loopBodyBuilder, " at end of loop iteration", false, false);
-            loopBodyBuilder.Add(Assert(s.Tok, decrCheck, new PODesc.Terminates(s.InferredDecreases, true)));
-          }
-        }
-      } else if (isBodyLessLoop) {
-        var bodySurrogate = ((OneBodyLoopStmt)s).BodySurrogate;
-        // This is a body-less loop. Havoc the targets and then set w to false, to make the loop-invariant
-        // maintenance check vaccuous.
-        var bplTargets = bodySurrogate.LocalLoopTargets.ConvertAll(v => TrVar(s.Tok, v));
-        if (bodySurrogate.UsesHeap) {
-          bplTargets.Add(etran.HeapCastToIdentifierExpr);
-        }
-        loopBodyBuilder.Add(new Bpl.HavocCmd(s.Tok, bplTargets));
-        loopBodyBuilder.Add(Bpl.Cmd.SimpleAssign(s.Tok, w, Bpl.Expr.False));
-      }
-      // Finally, assume the well-formedness of the invariant (which has been checked once and for all above), so that the check
-      // of invariant-maintenance can use the appropriate canCall predicates. Note, it is important (see Test/git-issues/git-issue-1812.dfy)
-      // that each CanCall assumption uses the preceding invariants as antecedents--this is achieved by treating all "invariant"
-      // declarations as one big conjunction, because then CanCallAssumption will add the needed antecedents.
-      if (s.Invariants.Any()) {
-        var allInvariants = s.Invariants.Select(inv => inv.E).Aggregate((a, b) => Expression.CreateAnd(a, b));
-        loopBodyBuilder.Add(TrAssumeCmd(s.Tok, CanCallAssumption(allInvariants, etran)));
-      }
-
-      Bpl.StmtList body = loopBodyBuilder.Collect(s.Tok);
-      builder.Add(new Bpl.WhileCmd(s.Tok, Bpl.Expr.True, invariants, new List<CallCmd>(), body));
-    }
-
-    void InsertContinueTarget(LoopStmt loop, BoogieStmtListBuilder builder) {
-      Contract.Requires(loop != null);
-      Contract.Requires(builder != null);
-      if (loop.Labels != null) {
-        builder.AddLabelCmd("continue_" + loop.Labels.Data.AssignUniqueId(CurrentIdGenerator));
-      }
-    }
-
-    void TrAlternatives(List<GuardedAlternative> alternatives, Bpl.Cmd elseCase0, Bpl.StructuredCmd elseCase1,
-                        BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran, bool isGhost) {
-      Contract.Requires(alternatives != null);
-      Contract.Requires((elseCase0 == null) != (elseCase1 == null));  // ugly way of doing a type union
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      if (alternatives.Count == 0) {
-        if (elseCase0 != null) {
-          builder.Add(elseCase0);
-        } else {
-          builder.Add(elseCase1);
-        }
-        return;
-      }
-
-      // alpha-rename any binding guards
-      var guards = alternatives.ConvertAll(alt => alt.IsBindingGuard ? AlphaRename((ExistsExpr)alt.Guard, "eg$") : alt.Guard);
-
-      // build the negation of the disjunction of all guards (that is, the conjunction of their negations)
-      Bpl.Expr noGuard = Bpl.Expr.True;
-      var b = new BoogieStmtListBuilder(this, options);
-      foreach (var g in guards) {
-        b.Add(TrAssumeCmd(g.tok, CanCallAssumption(g, etran)));
-        noGuard = BplAnd(noGuard, Bpl.Expr.Not(etran.TrExpr(g)));
-      }
-
-      var elseTok = elseCase0 != null ? elseCase0.tok : elseCase1.tok;
-      b.Add(TrAssumeCmd(elseTok, noGuard));
-      if (elseCase0 != null) {
-        b.Add(elseCase0);
-      } else {
-        b.Add(elseCase1);
-      }
-      Bpl.StmtList els = b.Collect(elseTok);
-
-      Bpl.IfCmd elsIf = null;
-      for (int i = alternatives.Count; 0 <= --i;) {
-        Contract.Assert(elsIf == null || els == null);  // loop invariant
-        CurrentIdGenerator.Push();
-        var alternative = alternatives[i];
-        b = new BoogieStmtListBuilder(this, options);
-        TrStmt_CheckWellformed(guards[i], b, locals, etran, true);
-        if (alternative.IsBindingGuard) {
-          var exists = (ExistsExpr)alternative.Guard;  // the original (that is, not alpha-renamed) guard
-          IntroduceAndAssignExistentialVars(exists, b, builder, locals, etran, isGhost);
-        } else {
-          b.Add(new AssumeCmd(alternative.Guard.tok, etran.TrExpr(alternative.Guard)));
-        }
-        var prevDefiniteAssignmentTrackerCount = definiteAssignmentTrackers.Count;
-        TrStmtList(alternative.Body, b, locals, etran);
-        RemoveDefiniteAssignmentTrackers(alternative.Body, prevDefiniteAssignmentTrackerCount);
-        Bpl.StmtList thn = b.Collect(alternative.Tok);
-        elsIf = new Bpl.IfCmd(alternative.Tok, null, thn, elsIf, els);
-        els = null;
-        CurrentIdGenerator.Pop();
-      }
-      Contract.Assert(elsIf != null && els == null); // follows from loop invariant and the fact that there's more than one alternative
-      builder.Add(elsIf);
-    }
-
-    void TrCallStmt(CallStmt s, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran, Bpl.IdentifierExpr actualReceiver) {
-      Contract.Requires(s != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(!(s.Method is Constructor) || (s.Lhs.Count == 0 && actualReceiver != null));
-
-      var tySubst = s.MethodSelect.TypeArgumentSubstitutionsWithParents();
-      ProcessLhss(s.Lhs, true, true, builder, locals, etran, out var lhsBuilders, out var bLhss,
-        out _, out _, out _, s.OriginalInitialLhs);
-      Contract.Assert(s.Lhs.Count == lhsBuilders.Count);
-      Contract.Assert(s.Lhs.Count == bLhss.Count);
-      var lhsTypes = new List<Type>();
-      if (s.Method is Constructor) {
-        lhsTypes.Add(s.Receiver.Type);
-        bLhss.Add(actualReceiver);
-      } else {
-        for (int i = 0; i < s.Lhs.Count; i++) {
-          var lhs = s.Lhs[i];
-          lhsTypes.Add(lhs.Type);
-          builder.Add(new CommentCmd("TrCallStmt: Adding lhs with type " + lhs.Type));
-          if (bLhss[i] == null) {  // (in the current implementation, the second parameter "true" to ProcessLhss implies that all bLhss[*] will be null)
-            // create temporary local and assign it to bLhss[i]
-            string nm = CurrentIdGenerator.FreshId("$rhs##");
-            var formalOutType = s.Method.Outs[i].Type.Subst(tySubst);
-            var ty = TrType(formalOutType);
-            Bpl.LocalVariable var = new Bpl.LocalVariable(lhs.tok, new Bpl.TypedIdent(lhs.tok, nm, ty));
-            locals.Add(var);
-            bLhss[i] = new Bpl.IdentifierExpr(lhs.tok, var.Name, ty);
-          }
-        }
-      }
-      Bpl.IdentifierExpr initHeap = null;
-      if (codeContext is IteratorDecl) {
-        // var initHeap := $Heap;
-        var initHeapVar = new Bpl.LocalVariable(s.Tok, new Bpl.TypedIdent(s.Tok, CurrentIdGenerator.FreshId("$initHeapCallStmt#"), predef.HeapType));
-        locals.Add(initHeapVar);
-        initHeap = new Bpl.IdentifierExpr(s.Tok, initHeapVar);
-        // initHeap := $Heap;
-        builder.Add(Bpl.Cmd.SimpleAssign(s.Tok, initHeap, etran.HeapExpr));
-      }
-      builder.Add(new CommentCmd("TrCallStmt: Before ProcessCallStmt"));
-      ProcessCallStmt(GetToken(s), tySubst, GetTypeParams(s.Method), s.Receiver, actualReceiver, s.Method, s.MethodSelect.AtLabel, s.Args, bLhss, lhsTypes, builder, locals, etran);
-      builder.Add(new CommentCmd("TrCallStmt: After ProcessCallStmt"));
-      for (int i = 0; i < lhsBuilders.Count; i++) {
-        var lhs = s.Lhs[i];
-        Type lhsType, rhsTypeConstraint;
-        if (lhs is IdentifierExpr) {
-          var ide = (IdentifierExpr)lhs;
-          lhsType = ide.Var.Type;
-          rhsTypeConstraint = lhsType;
-        } else if (lhs is MemberSelectExpr) {
-          var fse = (MemberSelectExpr)lhs;
-          var field = (Field)fse.Member;
-          Contract.Assert(field != null);
-          Contract.Assert(VisibleInScope(field));
-          lhsType = field.Type;
-          rhsTypeConstraint = lhsType.Subst(fse.TypeArgumentSubstitutionsWithParents());
-        } else if (lhs is SeqSelectExpr) {
-          var e = (SeqSelectExpr)lhs;
-          lhsType = null;  // for arrays, always make sure the value assigned is boxed
-          rhsTypeConstraint = e.Seq.Type.TypeArgs[0];
-        } else {
-          var e = (MultiSelectExpr)lhs;
-          lhsType = null;  // for arrays, always make sure the value assigned is boxed
-          rhsTypeConstraint = e.Array.Type.TypeArgs[0];
-        }
-
-        Bpl.Expr bRhs = bLhss[i];  // the RHS (bRhs) of the assignment to the actual call-LHS (lhs) was a LHS (bLhss[i]) in the Boogie call statement
-        CheckSubrange(lhs.tok, bRhs, s.Method.Outs[i].Type.Subst(tySubst), rhsTypeConstraint, builder);
-        bRhs = CondApplyBox(lhs.tok, bRhs, lhs.Type, lhsType);
-
-        lhsBuilders[i](bRhs, false, builder, etran);
-      }
-      if (codeContext is IteratorDecl) {
-        var iter = (IteratorDecl)codeContext;
-        Contract.Assert(initHeap != null);
-        RecordNewObjectsIn_New(s.Tok, iter, initHeap, etran.HeapCastToIdentifierExpr, builder, locals, etran);
-      }
-      builder.AddCaptureState(s);
-    }
-
-    void ProcessCallStmt(IToken tok,
-      Dictionary<TypeParameter, Type> tySubst, List<TypeParameter> tyArgs,
-      Expression dafnyReceiver, Bpl.Expr bReceiver,
-      Method method, Label/*?*/ atLabel, List<Expression> Args,
-      List<Bpl.IdentifierExpr> Lhss, List<Type> LhsTypes,
-      BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-
-      Contract.Requires(tok != null);
-      Contract.Requires(dafnyReceiver != null || bReceiver != null);
-      Contract.Requires(method != null);
-      Contract.Requires(VisibleInScope(method));
-      Contract.Requires(method is TwoStateLemma || atLabel == null);
-      Contract.Requires(Args != null);
-      Contract.Requires(Lhss != null);
-      Contract.Requires(LhsTypes != null);
-      // Note, a Dafny class constructor is declared to have no output parameters, but it is encoded in Boogie as
-      // having an output parameter.
-      Contract.Requires(method is Constructor || method.Outs.Count == Lhss.Count);
-      Contract.Requires(method is Constructor || method.Outs.Count == LhsTypes.Count);
-      Contract.Requires(!(method is Constructor) || (method.Outs.Count == 0 && Lhss.Count == 1 && LhsTypes.Count == 1));
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(tySubst != null);
-      Contract.Requires(tyArgs != null);
-      Contract.Requires(tyArgs.Count <= tySubst.Count);  // more precisely, the members of tyArgs are required to be keys of tySubst, but this is a cheap sanity test
-
-      // Figure out if the call is recursive or not, which will be used below to determine the need for a
-      // termination check and the need to include an implicit _k-1 argument.
-      bool isRecursiveCall = false;
-      // consult the call graph to figure out if this is a recursive call
-      var module = method.EnclosingClass.EnclosingModuleDefinition;
-      if (codeContext != null && module == currentModule) {
-        // Note, prefix lemmas are not recorded in the call graph, but their corresponding greatest lemmas are.
-        // Similarly, an iterator is not recorded in the call graph, but its MoveNext method is.
-        ICallable cllr =
-          codeContext is PrefixLemma ? ((PrefixLemma)codeContext).ExtremeLemma :
-          codeContext is IteratorDecl ? ((IteratorDecl)codeContext).Member_MoveNext :
-          codeContext;
-        if (ModuleDefinition.InSameSCC(method, cllr)) {
-          isRecursiveCall = true;
-        }
-      }
-
-      MethodTranslationKind kind;
-      var callee = method;
-      if (method is ExtremeLemma && isRecursiveCall) {
-        kind = MethodTranslationKind.CoCall;
-        callee = ((ExtremeLemma)method).PrefixLemma;
-      } else if (method is PrefixLemma) {
-        // an explicit call to a prefix lemma is allowed only inside the SCC of the corresponding greatest lemma,
-        // so we consider this to be a co-call
-        kind = MethodTranslationKind.CoCall;
-      } else {
-        kind = MethodTranslationKind.Call;
-      }
-
-
-      var ins = new List<Bpl.Expr>();
-      if (callee is TwoStateLemma) {
-        ins.Add(etran.OldAt(atLabel).HeapExpr);
-        ins.Add(etran.HeapExpr);
-      }
-      // Add type arguments
-      ins.AddRange(trTypeArgs(tySubst, tyArgs));
-
-      // Translate receiver argument, if any
-      Expression receiver = bReceiver == null ? dafnyReceiver : new BoogieWrapper(bReceiver, dafnyReceiver.Type);
-      if (!method.IsStatic && !(method is Constructor)) {
-        if (bReceiver == null) {
-          TrStmt_CheckWellformed(dafnyReceiver, builder, locals, etran, true);
-          if (!(dafnyReceiver is ThisExpr)) {
-            CheckNonNull(dafnyReceiver.tok, dafnyReceiver, builder, etran, null);
-          }
-        }
-        var obj = etran.TrExpr(receiver);
-        if (bReceiver == null) {
-          obj = BoxifyForTraitParent(tok, obj, method, dafnyReceiver.Type);
-        }
-        ins.Add(obj);
-      } else if (receiver is StaticReceiverExpr stexpr) {
-        if (stexpr.ObjectToDiscard != null) {
-          TrStmt_CheckWellformed(stexpr.ObjectToDiscard, builder, locals, etran, true);
-        }
-      }
-
-      // Ideally, the modifies and decreases checks would be done after the precondition check,
-      // but Boogie doesn't give us a hook for that.  So, we set up our own local variables here to
-      // store the actual parameters.
-      // Create a local variable for each formal parameter, and assign each actual parameter to the corresponding local
-      var substMap = new Dictionary<IVariable, Expression>();
-      for (int i = 0; i < callee.Ins.Count; i++) {
-        var formal = callee.Ins[i];
-        var local = new LocalVariable(formal.RangeToken, formal.Name + "#", formal.Type.Subst(tySubst), formal.IsGhost);
-        local.type = local.OptionalType;  // resolve local here
-        var ie = new IdentifierExpr(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator));
-        ie.Var = local; ie.Type = ie.Var.Type;  // resolve ie here
-        substMap.Add(formal, ie);
-        locals.Add(new Bpl.LocalVariable(local.Tok, new Bpl.TypedIdent(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator), TrType(local.Type))));
-
-        var param = (Bpl.IdentifierExpr)etran.TrExpr(ie);  // TODO: is this cast always justified?
-        Bpl.Expr bActual;
-        if (i == 0 && method is ExtremeLemma && isRecursiveCall) {
-          // Treat this call to M(args) as a call to the corresponding prefix lemma M#(_k - 1, args), so insert an argument here.
-          var k = ((PrefixLemma)callee).K;
-          var bplK = new Bpl.IdentifierExpr(k.tok, k.AssignUniqueName(currentDeclaration.IdGenerator), TrType(k.Type));
-          if (k.Type.IsBigOrdinalType) {
-            bActual = FunctionCall(k.tok, "ORD#Minus", predef.BigOrdinalType,
-              bplK,
-              FunctionCall(k.tok, "ORD#FromNat", predef.BigOrdinalType, Bpl.Expr.Literal(1)));
-          } else {
-            bActual = Bpl.Expr.Sub(bplK, Bpl.Expr.Literal(1));
-          }
-        } else {
-          Expression actual;
-          if (method is ExtremeLemma && isRecursiveCall) {
-            actual = Args[i - 1];
-          } else {
-            actual = Args[i];
-          }
-          if (!(actual is DefaultValueExpression)) {
-            TrStmt_CheckWellformed(actual, builder, locals, etran, true);
-          }
-          builder.Add(new CommentCmd("ProcessCallStmt: CheckSubrange"));
-          // Check the subrange without boxing
-          var beforeBox = etran.TrExpr(actual);
-          CheckSubrange(actual.tok, beforeBox, actual.Type, formal.Type.Subst(tySubst), builder);
-          bActual = CondApplyBox(actual.tok, beforeBox, actual.Type, formal.Type.Subst(tySubst));
-        }
-        Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(formal.tok, param, bActual);
-        builder.Add(cmd);
-        ins.Add(CondApplyBox(ToDafnyToken(param.tok), param, formal.Type.Subst(tySubst), formal.Type));
-      }
-
-      // Check that every parameter is available in the state in which the method is invoked; this means checking that it has
-      // the right type and is allocated.  These checks usually hold trivially, on account of that the Dafny language only gives
-      // access to expressions of the appropriate type and that are allocated in the current state.  However, if the method is
-      // invoked in the 'old' state or if the method invoked is a two-state lemma with a non-new parameter, then we need to
-      // check that its arguments were all available at that time as well.
-      if (etran.UsesOldHeap) {
-        if (!method.IsStatic && !(method is Constructor)) {
-          Bpl.Expr wh = GetWhereClause(receiver.tok, etran.TrExpr(receiver), receiver.Type, etran, ISALLOC, true);
-          if (wh != null) {
-            var desc = new PODesc.IsAllocated("receiver argument", "in the state in which the method is invoked");
-            builder.Add(Assert(receiver.tok, wh, desc));
-          }
-        }
-        for (int i = 0; i < Args.Count; i++) {
-          Expression ee = Args[i];
-          Bpl.Expr wh = GetWhereClause(ee.tok, etran.TrExpr(ee), ee.Type, etran, ISALLOC, true);
-          if (wh != null) {
-            var desc = new PODesc.IsAllocated("argument", "in the state in which the method is invoked");
-            builder.Add(Assert(ee.tok, wh, desc));
-          }
-        }
-      } else if (method is TwoStateLemma) {
-        if (!method.IsStatic) {
-          Bpl.Expr wh = GetWhereClause(receiver.tok, etran.TrExpr(receiver), receiver.Type, etran.OldAt(atLabel), ISALLOC, true);
-          if (wh != null) {
-            var desc = new PODesc.IsAllocated("receiver argument", "in the two-state lemma's previous state");
-            builder.Add(Assert(receiver.tok, wh, desc));
-          }
-        }
-        Contract.Assert(callee.Ins.Count == Args.Count);
-        for (int i = 0; i < Args.Count; i++) {
-          var formal = callee.Ins[i];
-          if (formal.IsOld) {
-            Expression ee = Args[i];
-            Bpl.Expr wh = GetWhereClause(ee.tok, etran.TrExpr(ee), ee.Type, etran.OldAt(atLabel), ISALLOC, true);
-            if (wh != null) {
-              var pIdx = Args.Count == 1 ? "" : " at index " + i;
-              var desc = new PODesc.IsAllocated($"parameter{pIdx} ('{formal.Name}')", "in the two-state lemma's previous state");
-              builder.Add(Assert(ee.tok, wh, desc));
-            }
-          }
-        }
-      }
-
-      // Check modifies clause of a subcall is a subset of the current frame.
-      if (codeContext is IMethodCodeContext) {
-        var s = new Substituter(null, new Dictionary<IVariable, Expression>(), tySubst);
-        CheckFrameSubset(tok, callee.Mod.Expressions.ConvertAll(s.SubstFrameExpr),
-          receiver, substMap, etran, builder, new PODesc.FrameSubset("call", true), null);
-      }
-
-      // Check termination
-      if (isRecursiveCall) {
-        Contract.Assert(codeContext != null);
-        if (codeContext is DatatypeDecl) {
-          builder.Add(Assert(tok, Bpl.Expr.False, new PODesc.IsNonRecursive()));
-        } else {
-          List<Expression> contextDecreases = codeContext.Decreases.Expressions;
-          List<Expression> calleeDecreases = callee.Decreases.Expressions;
-          CheckCallTermination(tok, contextDecreases, calleeDecreases, null, receiver, substMap, tySubst, etran, etran.Old, builder, codeContext.InferredDecreases, null);
-        }
-      }
-
-      // Create variables to hold the output parameters of the call, so that appropriate unboxes can be introduced.
-      var outs = new List<Bpl.IdentifierExpr>();
-      var tmpOuts = new List<Bpl.IdentifierExpr>();
-      if (method is Constructor) {
-        tmpOuts.Add(null);
-        outs.Add(Lhss[0]);
-      } else {
-        for (int i = 0; i < Lhss.Count; i++) {
-          var bLhs = Lhss[i];
-          if (ModeledAsBoxType(callee.Outs[i].Type) && !ModeledAsBoxType(LhsTypes[i])) {
-            // we need an Unbox
-            Bpl.LocalVariable var = new Bpl.LocalVariable(bLhs.tok, new Bpl.TypedIdent(bLhs.tok, CurrentIdGenerator.FreshId("$tmp##"), predef.BoxType));
-            locals.Add(var);
-            Bpl.IdentifierExpr varIdE = new Bpl.IdentifierExpr(bLhs.tok, var.Name, predef.BoxType);
-            tmpOuts.Add(varIdE);
-            outs.Add(varIdE);
-          } else {
-            tmpOuts.Add(null);
-            outs.Add(bLhs);
-          }
-        }
-      }
-
-      builder.Add(new CommentCmd("ProcessCallStmt: Make the call"));
-      // Make the call
-      AddReferencedMember(callee);
-      Bpl.CallCmd call = Call(tok, MethodName(callee, kind), ins, outs);
-      if (
-        (assertionOnlyFilter != null && !assertionOnlyFilter(tok)) ||
-        (module != currentModule && RefinementToken.IsInherited(tok, currentModule) && (codeContext == null || !codeContext.MustReverify))) {
-        // The call statement is inherited, so the refined module already checked that the precondition holds.  Note,
-        // preconditions are not allowed to be strengthened, except if they use a predicate whose body has been strengthened.
-        // But if the callee sits in a different module, then any predicate it uses will be treated as opaque (that is,
-        // uninterpreted) anyway, so the refined module will have checked the call precondition for all possible definitions
-        // of the predicate.
-        call.IsFree = true;
-      }
-      builder.Add(call);
-
-      // Unbox results as needed
-      for (int i = 0; i < Lhss.Count; i++) {
-        Bpl.IdentifierExpr bLhs = Lhss[i];
-        Bpl.IdentifierExpr tmpVarIdE = tmpOuts[i];
-        if (tmpVarIdE != null) {
-          // Instead of an assignment:
-          //    e := UnBox(tmpVar);
-          // we use:
-          //    havoc e; assume e == UnBox(tmpVar);
-          // because that will reap the benefits of e's where clause, so that some additional type information will be known about
-          // the out-parameter.
-          Bpl.Cmd cmd = new Bpl.HavocCmd(bLhs.tok, new List<Bpl.IdentifierExpr> { bLhs });
-          builder.Add(cmd);
-          cmd = TrAssumeCmd(bLhs.tok, Bpl.Expr.Eq(bLhs, FunctionCall(bLhs.tok, BuiltinFunction.Unbox, TrType(LhsTypes[i]), tmpVarIdE)));
-          builder.Add(cmd);
-        }
-      }
-    }
-
-    void TrForallStmtCall(IToken tok, List<BoundVar> boundVars, List<ComprehensionExpr.BoundedPool> bounds,
-      Expression range, ExpressionConverter additionalRange, List<Expression> forallExpressions, CallStmt s0,
-      BoogieStmtListBuilder definedness, BoogieStmtListBuilder exporter, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(tok != null);
-      Contract.Requires(boundVars != null);
-      Contract.Requires(bounds != null);
-      Contract.Requires(range != null);
-      // additionalRange is allowed to be null
-      Contract.Requires(s0 != null);
-      // definedness is allowed to be null
-      Contract.Requires(exporter != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      // Translate:
-      //   forall (x,y | Range(x,y)) {
-      //     E(x,y) . M( Args(x,y) );
-      //   }
-      // as:
-      //   if (*) {
-      //     var x,y;
-      //     havoc x,y;
-      //     CheckWellformed( Range );
-      //     assume Range(x,y);
-      //     assume additionalRange;
-      //     Tr( Call );
-      //     assume false;
-      //   } else {
-      //     initHeap := $Heap;
-      //     advance $Heap;
-      //     assume (forall x,y :: (Range(x,y) && additionalRange)[INIT] &&
-      //                           ==> Post[old($Heap) := initHeap]( E(x,y)[INIT], Args(x,y)[INIT] ));
-      //   }
-      // where Post(this,args) is the postcondition of method M and
-      // INIT is the substitution [old($Heap),$Heap := old($Heap),initHeap].
-
-      if (definedness != null) {
-        if (boundVars.Count != 0) {
-          // Note, it would be nicer (and arguably more appropriate) to do a SetupBoundVarsAsLocals
-          // here (rather than a TrBoundVariables).  However, there is currently no way to apply
-          // a substMap to a statement (in particular, to s.Body), so that doesn't work here.
-          List<bool> freeOfAlloc = ComprehensionExpr.BoundedPool.HasBounds(bounds, ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
-          List<Variable> bvars = new List<Variable>();
-          var ante = etran.TrBoundVariables(boundVars, bvars, true, freeOfAlloc);
-          locals.AddRange(bvars);
-          var havocIds = new List<Bpl.IdentifierExpr>();
-          foreach (Bpl.Variable bv in bvars) {
-            havocIds.Add(new Bpl.IdentifierExpr(tok, bv));
-          }
-          definedness.Add(new Bpl.HavocCmd(tok, havocIds));
-          definedness.Add(TrAssumeCmd(tok, ante));
-        }
-        TrStmt_CheckWellformed(range, definedness, locals, etran, false);
-        definedness.Add(TrAssumeCmd(range.tok, etran.TrExpr(range)));
-        if (additionalRange != null) {
-          var es = additionalRange(new Dictionary<IVariable, Expression>(), etran);
-          definedness.Add(TrAssumeCmd(es.tok, es));
-        }
-
-        TrStmt(s0, definedness, locals, etran);
-
-        definedness.Add(TrAssumeCmd(tok, Bpl.Expr.False));
-      }
-
-      // Now for the other branch, where the postcondition of the call is exported.
-      {
-        var initHeapVar = new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, CurrentIdGenerator.FreshId("$initHeapForallStmt#"), predef.HeapType));
-        locals.Add(initHeapVar);
-        var initHeap = new Bpl.IdentifierExpr(tok, initHeapVar);
-        var initEtran = new ExpressionTranslator(this, predef, initHeap, etran.Old.HeapExpr);
-        // initHeap := $Heap;
-        exporter.Add(Bpl.Cmd.SimpleAssign(tok, initHeap, etran.HeapExpr));
-        var heapIdExpr = etran.HeapCastToIdentifierExpr;
-        // advance $Heap;
-        exporter.Add(new Bpl.HavocCmd(tok, new List<Bpl.IdentifierExpr> { heapIdExpr }));
-        Contract.Assert(s0.Method.Mod.Expressions.Count == 0);  // checked by the resolver
-        foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(tok, new List<FrameExpression>(), s0.IsGhost, s0.Method.AllowsAllocation, initEtran, etran, initEtran)) {
-          if (tri.IsFree) {
-            exporter.Add(TrAssumeCmd(tok, tri.Expr));
-          }
-        }
-        if (codeContext is IteratorDecl) {
-          var iter = (IteratorDecl)codeContext;
-          RecordNewObjectsIn_New(tok, iter, initHeap, heapIdExpr, exporter, locals, etran);
-        }
-
-        // Note, in the following, we need to do a bit of a song and dance.  The actual arguments of the
-        // call should be translated using "initEtran", whereas the method postcondition should be translated
-        // using "callEtran".  To accomplish this, we translate the argument and then tuck the resulting
-        // Boogie expressions into BoogieExprWrappers that are used in the DafnyExpr-to-DafnyExpr substitution.
-        var bvars = new List<Variable>();
-        Dictionary<IVariable, Expression> substMap;
-        Bpl.Trigger antitriggerBoundVarTypes;
-        Bpl.Expr ante;
-        var argsSubstMap = new Dictionary<IVariable, Expression>();  // maps formal arguments to actuals
-        Contract.Assert(s0.Method.Ins.Count == s0.Args.Count);
-        var callEtran = new ExpressionTranslator(this, predef, etran.HeapExpr, initHeap);
-        Bpl.Expr post = Bpl.Expr.True;
-        Bpl.Trigger tr;
-        if (forallExpressions != null) {
-          // translate based on the forallExpressions since the triggers are computed based on it already.
-          QuantifierExpr expr = (QuantifierExpr)forallExpressions[0];
-          while (expr.SplitQuantifier != null) {
-            expr = (QuantifierExpr)expr.SplitQuantifierExpression;
-          }
-          boundVars = expr.BoundVars;
-          ante = initEtran.TrBoundVariablesRename(boundVars, bvars, out substMap, out antitriggerBoundVarTypes);
-          ante = BplAnd(ante, initEtran.TrExpr(Substitute(expr.Range, null, substMap)));
-          if (additionalRange != null) {
-            ante = BplAnd(ante, additionalRange(substMap, initEtran));
-          }
-          tr = TrTrigger(callEtran, expr.Attributes, expr.tok, bvars, substMap, s0.MethodSelect.TypeArgumentSubstitutionsWithParents());
-          post = callEtran.TrExpr(Substitute(expr.Term, null, substMap));
-        } else {
-          ante = initEtran.TrBoundVariablesRename(boundVars, bvars, out substMap, out antitriggerBoundVarTypes);
-          for (int i = 0; i < s0.Method.Ins.Count; i++) {
-            var arg = Substitute(s0.Args[i], null, substMap, s0.MethodSelect.TypeArgumentSubstitutionsWithParents());  // substitute the renamed bound variables for the declared ones
-            argsSubstMap.Add(s0.Method.Ins[i], new BoogieWrapper(initEtran.TrExpr(arg), s0.Args[i].Type));
-          }
-          ante = BplAnd(ante, initEtran.TrExpr(Substitute(range, null, substMap)));
-          if (additionalRange != null) {
-            ante = BplAnd(ante, additionalRange(substMap, initEtran));
-          }
-          var receiver = new BoogieWrapper(initEtran.TrExpr(Substitute(s0.Receiver, null, substMap, s0.MethodSelect.TypeArgumentSubstitutionsWithParents())), s0.Receiver.Type);
-          foreach (var ens in s0.Method.Ens) {
-            var p = Substitute(ens.E, receiver, argsSubstMap, s0.MethodSelect.TypeArgumentSubstitutionsWithParents());  // substitute the call's actuals for the method's formals
-            post = BplAnd(post, callEtran.TrExpr(p));
-          }
-          tr = antitriggerBoundVarTypes;
-        }
-
-        // TRIG (forall $ih#s0#0: Seq Box :: $Is($ih#s0#0, TSeq(TChar)) && $IsAlloc($ih#s0#0, TSeq(TChar), $initHeapForallStmt#0) && Seq#Length($ih#s0#0) != 0 && Seq#Rank($ih#s0#0) < Seq#Rank(s#0) ==> (forall i#2: int :: true ==> LitInt(0) <= i#2 && i#2 < Seq#Length($ih#s0#0) ==> char#ToInt(_module.CharChar.MinChar($LS($LZ), $Heap, this, $ih#s0#0)) <= char#ToInt($Unbox(Seq#Index($ih#s0#0, i#2)): char)))
-        // TRIG (forall $ih#pat0#0: Seq Box, $ih#a0#0: Seq Box :: $Is($ih#pat0#0, TSeq(_module._default.Same0$T)) && $IsAlloc($ih#pat0#0, TSeq(_module._default.Same0$T), $initHeapForallStmt#0) && $Is($ih#a0#0, TSeq(_module._default.Same0$T)) && $IsAlloc($ih#a0#0, TSeq(_module._default.Same0$T), $initHeapForallStmt#0) && Seq#Length($ih#pat0#0) <= Seq#Length($ih#a0#0) && Seq#SameUntil($ih#pat0#0, $ih#a0#0, Seq#Length($ih#pat0#0)) && (Seq#Rank($ih#pat0#0) < Seq#Rank(pat#0) || (Seq#Rank($ih#pat0#0) == Seq#Rank(pat#0) && Seq#Rank($ih#a0#0) < Seq#Rank(a#0))) ==> _module.__default.IsRelaxedPrefixAux(_module._default.Same0$T, $LS($LZ), $Heap, $ih#pat0#0, $ih#a0#0, LitInt(1)))'
-        // TRIG (forall $ih#m0#0: DatatypeType, $ih#n0#0: DatatypeType :: $Is($ih#m0#0, Tclass._module.Nat()) && $IsAlloc($ih#m0#0, Tclass._module.Nat(), $initHeapForallStmt#0) && $Is($ih#n0#0, Tclass._module.Nat()) && $IsAlloc($ih#n0#0, Tclass._module.Nat(), $initHeapForallStmt#0) && Lit(true) && (DtRank($ih#m0#0) < DtRank(m#0) || (DtRank($ih#m0#0) == DtRank(m#0) && DtRank($ih#n0#0) < DtRank(n#0))) ==> _module.__default.mult($LS($LZ), $Heap, $ih#m0#0, _module.__default.plus($LS($LZ), $Heap, $ih#n0#0, $ih#n0#0)) == _module.__default.mult($LS($LZ), $Heap, _module.__default.plus($LS($LZ), $Heap, $ih#m0#0, $ih#m0#0), $ih#n0#0))
-        var qq = new Bpl.ForallExpr(tok, bvars, tr, Bpl.Expr.Imp(ante, post));  // TODO: Add a SMART_TRIGGER here.  If we can't find one, abort the attempt to do induction automatically
-        exporter.Add(TrAssumeCmd(tok, qq));
-      }
-    }
-
-    void RecordNewObjectsIn_New(IToken tok, IteratorDecl iter, Bpl.Expr initHeap, Bpl.IdentifierExpr currentHeap,
-      BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(tok != null);
-      Contract.Requires(iter != null);
-      Contract.Requires(initHeap != null);
-      Contract.Requires(currentHeap != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      // Add all newly allocated objects to the set this._new
-      var updatedSet = new Bpl.LocalVariable(iter.tok, new Bpl.TypedIdent(iter.tok, CurrentIdGenerator.FreshId("$iter_newUpdate"), predef.SetType(iter.tok, true, predef.BoxType)));
-      locals.Add(updatedSet);
-      var updatedSetIE = new Bpl.IdentifierExpr(iter.tok, updatedSet);
-      // call $iter_newUpdate := $IterCollectNewObjects(initHeap, $Heap, this, _new);
-      var th = new Bpl.IdentifierExpr(iter.tok, etran.This, predef.RefType);
-      var nwField = new Bpl.IdentifierExpr(tok, GetField(iter.Member_New));
-      Bpl.Cmd cmd = new CallCmd(iter.tok, "$IterCollectNewObjects",
-        new List<Bpl.Expr>() { initHeap, etran.HeapExpr, th, nwField },
-        new List<Bpl.IdentifierExpr>() { updatedSetIE });
-      builder.Add(cmd);
-      // $Heap[this, _new] := $iter_newUpdate;
-      cmd = Bpl.Cmd.SimpleAssign(iter.tok, currentHeap, UpdateHeap(iter.tok, currentHeap, th, nwField, updatedSetIE));
-      builder.Add(cmd);
-      // assume $IsGoodHeap($Heap)
-      builder.Add(AssumeGoodHeap(tok, etran));
-    }
-
-    private string GetObjFieldDetails(Expression lhs, ExpressionTranslator etran, out Bpl.Expr obj, out Bpl.Expr F) {
-      string description;
-      if (lhs is MemberSelectExpr) {
-        var fse = (MemberSelectExpr)lhs;
-        obj = etran.TrExpr(fse.Obj);
-        F = GetField(fse);
-        description = "an object field";
-      } else if (lhs is SeqSelectExpr) {
-        var sel = (SeqSelectExpr)lhs;
-        obj = etran.TrExpr(sel.Seq);
-        var idx = etran.TrExpr(sel.E0);
-        idx = ConvertExpression(sel.E0.tok, idx, sel.E0.Type, Type.Int);
-        F = FunctionCall(sel.tok, BuiltinFunction.IndexField, null, idx);
-        description = "an array element";
-      } else {
-        MultiSelectExpr mse = (MultiSelectExpr)lhs;
-        obj = etran.TrExpr(mse.Array);
-        F = etran.GetArrayIndexFieldName(mse.tok, mse.Indices);
-        description = "an array element";
-      }
-      return description;
-    }
-  }
-}
diff --git a/Source/DafnyCore/Verifier/Translator.cs b/Source/DafnyCore/Verifier/Translator.cs
deleted file mode 100644
index 86edcc4ed16..00000000000
--- a/Source/DafnyCore/Verifier/Translator.cs
+++ /dev/null
@@ -1,10989 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) Microsoft Corporation.  All Rights Reserved.
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-//
-//-----------------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Reflection;
-using System.Security.Cryptography;
-using Bpl = Microsoft.Boogie;
-using BplParser = Microsoft.Boogie.Parser;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using Microsoft.Boogie;
-using static Microsoft.Dafny.Util;
-using Core;
-using Microsoft.BaseTypes;
-using Microsoft.Dafny.Triggers;
-using Action = System.Action;
-using PODesc = Microsoft.Dafny.ProofObligationDescription;
-using static Microsoft.Dafny.GenericErrors;
-
-namespace Microsoft.Dafny {
-  public partial class Translator {
-    private DafnyOptions options;
-    public const string NameSeparator = "$$";
-    private bool filterOnlyMembers;
-
-    ErrorReporter reporter;
-    // TODO(wuestholz): Enable this once Dafny's recommended Z3 version includes changeset 0592e765744497a089c42021990740f303901e67.
-    public bool UseOptimizationInZ3 { get; set; }
-
-    void AddOtherDefinition(Bpl.Declaration declaration, Axiom axiom) {
-
-      switch (declaration) {
-        case null:
-          break;
-        case Boogie.Function boogieFunction:
-          boogieFunction.AddOtherDefinitionAxiom(axiom);
-          break;
-        case Boogie.Constant boogieConstant:
-          boogieConstant.DefinitionAxioms.Add(axiom);
-          break;
-        default: throw new ArgumentException("Declaration must be a function or constant");
-      }
-
-      sink.AddTopLevelDeclaration(axiom);
-    }
-
-    public class TranslatorFlags {
-      public TranslatorFlags(DafnyOptions options) {
-        InsertChecksums = 0 < options.VerifySnapshots;
-      }
-
-      public bool InsertChecksums { get; init; }
-      public string UniqueIdPrefix = null;
-      public bool ReportRanges = false;
-    }
-
-    [NotDelayed]
-    public Translator(ErrorReporter reporter, TranslatorFlags flags = null) {
-      this.options = reporter.Options;
-      this.flags = new TranslatorFlags(options);
-      triggersCollector = new Triggers.TriggersCollector(new Dictionary<Expression, HashSet<OldExpr>>(), options);
-      this.reporter = reporter;
-      if (flags == null) {
-        flags = new TranslatorFlags(options) {
-          ReportRanges = options.Get(DafnyConsolePrinter.ShowSnippets)
-        };
-      }
-      this.flags = flags;
-      Bpl.Program boogieProgram = ReadPrelude();
-      if (boogieProgram != null) {
-        sink = boogieProgram;
-        predef = FindPredefinedDecls(boogieProgram);
-      }
-    }
-
-    public void SetReporter(ErrorReporter reporter) {
-      this.reporter = reporter;
-    }
-
-    private void EstablishModuleScope(ModuleDefinition systemModule, ModuleDefinition m) {
-      currentScope = new VisibilityScope();
-      verificationScope = new VisibilityScope();
-
-      currentScope.Augment(m.VisibilityScope);
-      verificationScope.Augment(currentScope);
-
-      currentScope.Augment(systemModule.VisibilityScope);
-
-      foreach (var decl in m.TopLevelDecls) {
-        if (decl is ModuleDecl && !(decl is ModuleExportDecl)) {
-          var mdecl = (ModuleDecl)decl;
-          currentScope.Augment(mdecl.AccessibleSignature().VisibilityScope);
-        }
-      }
-
-    }
-
-    // translation state
-    readonly Dictionary<TopLevelDecl/*!*/, Bpl.Constant/*!*/>/*!*/ classes = new Dictionary<TopLevelDecl/*!*/, Bpl.Constant/*!*/>();
-    readonly Dictionary<TopLevelDecl, string>/*!*/ classConstants = new Dictionary<TopLevelDecl, string>();
-    readonly Dictionary<Function, string> functionHandles = new Dictionary<Function, string>();
-    readonly List<FuelConstant> functionFuel = new List<FuelConstant>();
-    readonly Dictionary<Function, Bpl.Expr> functionReveals = new();
-    readonly Dictionary<Field/*!*/, Bpl.Constant/*!*/>/*!*/ fields = new Dictionary<Field/*!*/, Bpl.Constant/*!*/>();
-    readonly Dictionary<Field/*!*/, Bpl.Function/*!*/>/*!*/ fieldFunctions = new Dictionary<Field/*!*/, Bpl.Function/*!*/>();
-    readonly Dictionary<string, Bpl.Constant> fieldConstants = new Dictionary<string, Constant>();
-    readonly Dictionary<string, Bpl.Constant> tytagConstants = new Dictionary<string, Constant>();
-
-    // optimizing translation
-    readonly ISet<MemberDecl> referencedMembers = new HashSet<MemberDecl>();
-
-    public void AddReferencedMember(MemberDecl m) {
-      if (m is Method && !InVerificationScope(m)) {
-        referencedMembers.Add(m);
-      }
-    }
-
-    FuelContext fuelContext = null;
-    IsAllocContext isAllocContext = null;
-    Program program;
-
-    [ContractInvariantMethod]
-    void ObjectInvariant() {
-      Contract.Invariant(cce.NonNullDictionaryAndValues(classes));
-      Contract.Invariant(cce.NonNullDictionaryAndValues(fields));
-      Contract.Invariant(cce.NonNullDictionaryAndValues(fieldFunctions));
-      Contract.Invariant(codeContext == null || codeContext.EnclosingModule == currentModule);
-    }
-
-    [Pure]
-    bool VisibleInScope(Declaration d) {
-      Contract.Requires(d != null);
-      if (d is ClassLikeDecl { NonNullTypeDecl: { } nntd }) {
-        // "provides" is recorded in the non-null type declaration, not the class
-        return nntd.IsVisibleInScope(currentScope);
-      }
-      return d.IsVisibleInScope(currentScope);
-    }
-
-    [Pure]
-    bool VisibleInScope(Type t) {
-      if (t is UserDefinedType udt && udt.ResolvedClass != null && !t.IsTypeParameter) {
-        return VisibleInScope(udt.ResolvedClass);
-      }
-      return true;
-    }
-
-    [Pure]
-    bool RevealedInScope(Declaration d) {
-      Contract.Requires(d != null);
-      return d.IsRevealedInScope(currentScope);
-    }
-
-    [Pure]
-    bool RevealedInScope(RevealableTypeDecl d) {
-      Contract.Requires(d != null);
-      return RevealedInScope(d.AsTopLevelDecl);
-    }
-
-    [Pure]
-    bool InVerificationScope(Declaration d) {
-      Contract.Requires(d != null);
-      if (!d.ShouldVerify(program.Compilation)) {
-        return false;
-      }
-
-      if (d.IsVisibleInScope(verificationScope)) {
-        Contract.Assert(d.IsRevealedInScope(verificationScope));
-        if (d is MemberDecl m && m.EnclosingClass.EnclosingModuleDefinition is { IsFacade: true }) {
-          return false;
-        }
-
-        return true;
-      }
-      return false;
-    }
-
-    [Pure]
-    bool InVerificationScope(RedirectingTypeDecl d) {
-      Contract.Requires(d != null);
-      Contract.Requires(d is Declaration);
-      return InVerificationScope((Declaration)d);
-    }
-
-    private Bpl.Program sink;
-    private VisibilityScope currentScope;
-    private VisibilityScope verificationScope;
-    private Dictionary<Declaration, Bpl.Function> declarationMapping = new();
-
-    readonly PredefinedDecls predef;
-
-    private TranslatorFlags flags;
-    private bool InsertChecksums { get { return flags.InsertChecksums; } }
-    private string UniqueIdPrefix { get { return flags.UniqueIdPrefix; } }
-
-    internal class PredefinedDecls {
-      public readonly Bpl.Type CharType;
-      public readonly Bpl.Type RefType;
-      public readonly Bpl.Type BoxType;
-      public Bpl.Type BigOrdinalType {
-        get { return BoxType; }
-      }
-      private readonly Bpl.TypeSynonymDecl setTypeCtor;
-      private readonly Bpl.TypeSynonymDecl isetTypeCtor;
-      private readonly Bpl.TypeSynonymDecl multiSetTypeCtor;
-      private readonly Bpl.TypeCtorDecl mapTypeCtor;
-      private readonly Bpl.TypeCtorDecl imapTypeCtor;
-      public readonly Bpl.Function ArrayLength;
-      public readonly Bpl.Function RealFloor;
-      public readonly Bpl.Function ORDINAL_IsLimit;
-      public readonly Bpl.Function ORDINAL_IsSucc;
-      public readonly Bpl.Function ORDINAL_Offset;
-      public readonly Bpl.Function ORDINAL_IsNat;
-      public readonly Bpl.Function MapDomain;
-      public readonly Bpl.Function IMapDomain;
-      public readonly Bpl.Function MapValues;
-      public readonly Bpl.Function IMapValues;
-      public readonly Bpl.Function MapItems;
-      public readonly Bpl.Function IMapItems;
-      public readonly Bpl.Function ObjectTypeConstructor;
-      public readonly Bpl.Function Tuple2TypeConstructor;
-      public readonly Bpl.Function Tuple2Destructors0;
-      public readonly Bpl.Function Tuple2Destructors1;
-      public readonly Bpl.Function Tuple2Constructor;
-      private readonly Bpl.TypeCtorDecl seqTypeCtor;
-      public readonly Bpl.Type Bv0Type;
-      readonly Bpl.TypeCtorDecl fieldName;
-      public readonly Bpl.Type HeapType;
-      public readonly string HeapVarName;
-      public readonly Bpl.Type ClassNameType;
-      public readonly Bpl.Type NameFamilyType;
-      public readonly Bpl.Type DatatypeType;
-      public readonly Bpl.Type HandleType;
-      public readonly Bpl.Type LayerType;
-      public readonly Bpl.Type DtCtorId;
-      public readonly Bpl.Type Ty;
-      public readonly Bpl.Type TyTag;
-      public readonly Bpl.Type TyTagFamily;
-      public readonly Bpl.Expr Null;
-      public readonly Bpl.Constant AllocField;
-      [ContractInvariantMethod]
-      void ObjectInvariant() {
-        Contract.Invariant(CharType != null);
-        Contract.Invariant(RefType != null);
-        Contract.Invariant(BoxType != null);
-        Contract.Invariant(setTypeCtor != null);
-        Contract.Invariant(multiSetTypeCtor != null);
-        Contract.Invariant(ArrayLength != null);
-        Contract.Invariant(RealFloor != null);
-        Contract.Invariant(ORDINAL_IsLimit != null);
-        Contract.Invariant(ORDINAL_IsSucc != null);
-        Contract.Invariant(ORDINAL_Offset != null);
-        Contract.Invariant(ORDINAL_IsNat != null);
-        Contract.Invariant(MapDomain != null);
-        Contract.Invariant(IMapDomain != null);
-        Contract.Invariant(MapValues != null);
-        Contract.Invariant(IMapValues != null);
-        Contract.Invariant(MapItems != null);
-        Contract.Invariant(IMapItems != null);
-        Contract.Invariant(Tuple2Destructors0 != null);
-        Contract.Invariant(Tuple2Destructors1 != null);
-        Contract.Invariant(Tuple2Constructor != null);
-        Contract.Invariant(seqTypeCtor != null);
-        Contract.Invariant(fieldName != null);
-        Contract.Invariant(HeapVarName != null);
-        Contract.Invariant(ClassNameType != null);
-        Contract.Invariant(NameFamilyType != null);
-        Contract.Invariant(DatatypeType != null);
-        Contract.Invariant(HandleType != null);
-        Contract.Invariant(LayerType != null);
-        Contract.Invariant(DtCtorId != null);
-        Contract.Invariant(Ty != null);
-        Contract.Invariant(TyTag != null);
-        Contract.Invariant(TyTagFamily != null);
-        Contract.Invariant(Null != null);
-        Contract.Invariant(AllocField != null);
-      }
-
-      public Bpl.Type SetType(Bpl.IToken tok, bool finite, Bpl.Type ty) {
-        Contract.Requires(tok != null);
-        Contract.Requires(ty != null);
-        Contract.Ensures(Contract.Result<Bpl.Type>() != null);
-
-        return new Bpl.TypeSynonymAnnotation(Token.NoToken, finite ? setTypeCtor : isetTypeCtor, new List<Bpl.Type> { ty });
-      }
-
-      public Bpl.Type MultiSetType(Bpl.IToken tok, Bpl.Type ty) {
-        Contract.Requires(tok != null);
-        Contract.Requires(ty != null);
-        Contract.Ensures(Contract.Result<Bpl.Type>() != null);
-
-        return new Bpl.TypeSynonymAnnotation(Token.NoToken, multiSetTypeCtor, new List<Bpl.Type> { ty });
-      }
-      public Bpl.Type MapType(Bpl.IToken tok, bool finite, Bpl.Type tya, Bpl.Type tyb) {
-        Contract.Requires(tok != null);
-        Contract.Requires(tya != null && tyb != null);
-        Contract.Ensures(Contract.Result<Bpl.Type>() != null);
-
-        return new Bpl.CtorType(Token.NoToken, finite ? mapTypeCtor : imapTypeCtor, new List<Bpl.Type> { tya, tyb });
-      }
-
-      public Bpl.Type SeqType(Bpl.IToken tok, Bpl.Type ty) {
-        Contract.Requires(tok != null);
-        Contract.Requires(ty != null);
-        Contract.Ensures(Contract.Result<Bpl.Type>() != null);
-        return new Bpl.CtorType(Token.NoToken, seqTypeCtor, new List<Bpl.Type> { ty });
-      }
-
-      public Bpl.Type FieldName(Bpl.IToken tok, Bpl.Type ty) {
-        Contract.Requires(tok != null);
-        Contract.Requires(ty != null);
-        Contract.Ensures(Contract.Result<Bpl.Type>() != null);
-
-        return new Bpl.CtorType(tok, fieldName, new List<Bpl.Type> { ty });
-      }
-
-      public Bpl.IdentifierExpr Alloc(Bpl.IToken tok) {
-        Contract.Requires(tok != null);
-        Contract.Ensures(Contract.Result<Bpl.IdentifierExpr>() != null);
-
-        return new Bpl.IdentifierExpr(tok, AllocField);
-      }
-
-      public PredefinedDecls(Bpl.TypeCtorDecl charType, Bpl.TypeCtorDecl refType, Bpl.TypeCtorDecl boxType,
-                             Bpl.TypeSynonymDecl setTypeCtor, Bpl.TypeSynonymDecl isetTypeCtor, Bpl.TypeSynonymDecl multiSetTypeCtor,
-                             Bpl.TypeCtorDecl mapTypeCtor, Bpl.TypeCtorDecl imapTypeCtor,
-                             Bpl.Function arrayLength, Bpl.Function realFloor,
-                             Bpl.Function ORD_isLimit, Bpl.Function ORD_isSucc, Bpl.Function ORD_offset, Bpl.Function ORD_isNat,
-                             Bpl.Function mapDomain, Bpl.Function imapDomain,
-                             Bpl.Function mapValues, Bpl.Function imapValues, Bpl.Function mapItems, Bpl.Function imapItems,
-                             Bpl.Function objectTypeConstructor,
-                             Bpl.Function tuple2Destructors0, Bpl.Function tuple2Destructors1, Bpl.Function tuple2Constructor, Bpl.Function tuple2TypeConstructor,
-                             Bpl.TypeCtorDecl seqTypeCtor, Bpl.TypeSynonymDecl bv0TypeDecl,
-                             Bpl.TypeCtorDecl fieldNameType, Bpl.TypeCtorDecl tyType, Bpl.TypeCtorDecl tyTagType, Bpl.TypeCtorDecl tyTagFamilyType,
-                             Bpl.GlobalVariable heap, Bpl.TypeCtorDecl classNameType, Bpl.TypeCtorDecl nameFamilyType,
-                             Bpl.TypeCtorDecl datatypeType, Bpl.TypeCtorDecl handleType, Bpl.TypeCtorDecl layerType, Bpl.TypeCtorDecl dtCtorId,
-                             Bpl.Constant allocField) {
-        #region Non-null preconditions on parameters
-        Contract.Requires(charType != null);
-        Contract.Requires(refType != null);
-        Contract.Requires(boxType != null);
-        Contract.Requires(setTypeCtor != null);
-        Contract.Requires(isetTypeCtor != null);
-        Contract.Requires(multiSetTypeCtor != null);
-        Contract.Requires(mapTypeCtor != null);
-        Contract.Requires(imapTypeCtor != null);
-        Contract.Requires(arrayLength != null);
-        Contract.Requires(realFloor != null);
-        Contract.Requires(ORD_isLimit != null);
-        Contract.Requires(ORD_isSucc != null);
-        Contract.Requires(ORD_offset != null);
-        Contract.Requires(ORD_isNat != null);
-        Contract.Requires(mapDomain != null);
-        Contract.Requires(imapDomain != null);
-        Contract.Requires(mapValues != null);
-        Contract.Requires(imapValues != null);
-        Contract.Requires(mapItems != null);
-        Contract.Requires(imapItems != null);
-        Contract.Requires(tuple2Destructors0 != null);
-        Contract.Requires(tuple2Destructors1 != null);
-        Contract.Requires(tuple2Constructor != null);
-        Contract.Requires(seqTypeCtor != null);
-        Contract.Requires(bv0TypeDecl != null);
-        Contract.Requires(fieldNameType != null);
-        Contract.Requires(heap != null);
-        Contract.Requires(classNameType != null);
-        Contract.Requires(datatypeType != null);
-        Contract.Requires(layerType != null);
-        Contract.Requires(dtCtorId != null);
-        Contract.Requires(allocField != null);
-        Contract.Requires(tyType != null);
-        Contract.Requires(tyTagType != null);
-        Contract.Requires(tyTagFamilyType != null);
-        #endregion
-
-        this.CharType = new Bpl.CtorType(Token.NoToken, charType, new List<Bpl.Type>());
-        Bpl.CtorType refT = new Bpl.CtorType(Token.NoToken, refType, new List<Bpl.Type>());
-        this.RefType = refT;
-        this.BoxType = new Bpl.CtorType(Token.NoToken, boxType, new List<Bpl.Type>());
-        this.setTypeCtor = setTypeCtor;
-        this.isetTypeCtor = isetTypeCtor;
-        this.multiSetTypeCtor = multiSetTypeCtor;
-        this.mapTypeCtor = mapTypeCtor;
-        this.imapTypeCtor = imapTypeCtor;
-        this.ArrayLength = arrayLength;
-        this.RealFloor = realFloor;
-        this.ORDINAL_IsLimit = ORD_isLimit;
-        this.ORDINAL_IsSucc = ORD_isSucc;
-        this.ORDINAL_Offset = ORD_offset;
-        this.ORDINAL_IsNat = ORD_isNat;
-        this.MapDomain = mapDomain;
-        this.IMapDomain = imapDomain;
-        this.MapValues = mapValues;
-        this.IMapValues = imapValues;
-        this.MapItems = mapItems;
-        this.IMapItems = imapItems;
-        this.ObjectTypeConstructor = objectTypeConstructor;
-        this.Tuple2Destructors0 = tuple2Destructors0;
-        this.Tuple2Destructors1 = tuple2Destructors1;
-        this.Tuple2Constructor = tuple2Constructor;
-        this.Tuple2TypeConstructor = tuple2TypeConstructor;
-        this.seqTypeCtor = seqTypeCtor;
-        this.Bv0Type = new Bpl.TypeSynonymAnnotation(Token.NoToken, bv0TypeDecl, new List<Bpl.Type>());
-        this.fieldName = fieldNameType;
-        this.HeapType = heap.TypedIdent.Type;
-        this.HeapVarName = heap.Name;
-        this.Ty = new Bpl.CtorType(Token.NoToken, tyType, new List<Bpl.Type>());
-        this.TyTag = new Bpl.CtorType(Token.NoToken, tyTagType, new List<Bpl.Type>());
-        this.TyTagFamily = new Bpl.CtorType(Token.NoToken, tyTagFamilyType, new List<Bpl.Type>());
-        this.ClassNameType = new Bpl.CtorType(Token.NoToken, classNameType, new List<Bpl.Type>());
-        this.NameFamilyType = new Bpl.CtorType(Token.NoToken, nameFamilyType, new List<Bpl.Type>());
-        this.DatatypeType = new Bpl.CtorType(Token.NoToken, datatypeType, new List<Bpl.Type>());
-        this.HandleType = new Bpl.CtorType(Token.NoToken, handleType, new List<Bpl.Type>());
-        this.LayerType = new Bpl.CtorType(Token.NoToken, layerType, new List<Bpl.Type>());
-        this.DtCtorId = new Bpl.CtorType(Token.NoToken, dtCtorId, new List<Bpl.Type>());
-        this.AllocField = allocField;
-        this.Null = new Bpl.IdentifierExpr(Token.NoToken, "null", refT);
-      }
-    }
-
-    PredefinedDecls FindPredefinedDecls(Bpl.Program prog) {
-      Contract.Requires(prog != null);
-      if (prog.Resolve(options) != 0) {
-        options.OutputWriter.WriteLine("Error: resolution errors encountered in Dafny prelude");
-        return null;
-      }
-
-      Bpl.TypeCtorDecl charType = null;
-      Bpl.TypeCtorDecl refType = null;
-      Bpl.TypeSynonymDecl setTypeCtor = null;
-      Bpl.TypeSynonymDecl isetTypeCtor = null;
-      Bpl.TypeSynonymDecl multiSetTypeCtor = null;
-      Bpl.Function arrayLength = null;
-      Bpl.Function realFloor = null;
-      Bpl.Function ORDINAL_isLimit = null;
-      Bpl.Function ORDINAL_isSucc = null;
-      Bpl.Function ORDINAL_offset = null;
-      Bpl.Function ORDINAL_isNat = null;
-      Bpl.Function mapDomain = null;
-      Bpl.Function imapDomain = null;
-      Bpl.Function mapValues = null;
-      Bpl.Function imapValues = null;
-      Bpl.Function mapItems = null;
-      Bpl.Function imapItems = null;
-      Bpl.Function objectTypeConstructor = null;
-      Bpl.Function tuple2TypeConstructor = null;
-      Bpl.Function tuple2Destructors0 = null;
-      Bpl.Function tuple2Destructors1 = null;
-      Bpl.Function tuple2Constructor = null;
-      Bpl.TypeCtorDecl seqTypeCtor = null;
-      Bpl.TypeCtorDecl fieldNameType = null;
-      Bpl.TypeCtorDecl classNameType = null;
-      Bpl.TypeSynonymDecl bv0TypeDecl = null;
-      Bpl.TypeCtorDecl tyType = null;
-      Bpl.TypeCtorDecl tyTagType = null;
-      Bpl.TypeCtorDecl tyTagFamilyType = null;
-      Bpl.TypeCtorDecl nameFamilyType = null;
-      Bpl.TypeCtorDecl datatypeType = null;
-      Bpl.TypeCtorDecl handleType = null;
-      Bpl.TypeCtorDecl layerType = null;
-      Bpl.TypeCtorDecl dtCtorId = null;
-      Bpl.TypeCtorDecl boxType = null;
-      Bpl.TypeCtorDecl mapTypeCtor = null;
-      Bpl.TypeCtorDecl imapTypeCtor = null;
-      Bpl.GlobalVariable heap = null;
-      Bpl.Constant allocField = null;
-      foreach (var d in prog.TopLevelDeclarations) {
-        if (d is Bpl.TypeCtorDecl) {
-          Bpl.TypeCtorDecl dt = (Bpl.TypeCtorDecl)d;
-          if (dt.Name == "Seq") {
-            seqTypeCtor = dt;
-          } else if (dt.Name == "Field") {
-            fieldNameType = dt;
-          } else if (dt.Name == "ClassName") {
-            classNameType = dt;
-          } else if (dt.Name == "Ty") {
-            tyType = dt;
-          } else if (dt.Name == "TyTag") {
-            tyTagType = dt;
-          } else if (dt.Name == "TyTagFamily") {
-            tyTagFamilyType = dt;
-          } else if (dt.Name == "DatatypeType") {
-            datatypeType = dt;
-          } else if (dt.Name == "HandleType") {
-            handleType = dt;
-          } else if (dt.Name == "LayerType") {
-            layerType = dt;
-          } else if (dt.Name == "DtCtorId") {
-            dtCtorId = dt;
-          } else if (dt.Name == "char") {
-            charType = dt;
-          } else if (dt.Name == "ref") {
-            refType = dt;
-          } else if (dt.Name == "NameFamily") {
-            nameFamilyType = dt;
-          } else if (dt.Name == "Box") {
-            boxType = dt;
-          } else if (dt.Name == "Map") {
-            mapTypeCtor = dt;
-          } else if (dt.Name == "IMap") {
-            imapTypeCtor = dt;
-          }
-        } else if (d is Bpl.TypeSynonymDecl) {
-          Bpl.TypeSynonymDecl dt = (Bpl.TypeSynonymDecl)d;
-          if (dt.Name == "Set") {
-            setTypeCtor = dt;
-          } else if (dt.Name == "MultiSet") {
-            multiSetTypeCtor = dt;
-          } else if (dt.Name == "ISet") {
-            isetTypeCtor = dt;
-          } else if (dt.Name == "Bv0") {
-            bv0TypeDecl = dt;
-          }
-        } else if (d is Bpl.Constant) {
-          Bpl.Constant c = (Bpl.Constant)d;
-          if (c.Name == "alloc") {
-            allocField = c;
-          }
-        } else if (d is Bpl.GlobalVariable) {
-          Bpl.GlobalVariable v = (Bpl.GlobalVariable)d;
-          if (v.Name == "$Heap") {
-            heap = v;
-          }
-        } else if (d is Bpl.Function) {
-          var f = (Bpl.Function)d;
-          if (f.Name == "_System.array.Length") {
-            arrayLength = f;
-          } else if (f.Name == "_System.real.Floor") {
-            realFloor = f;
-          } else if (f.Name == "ORD#IsLimit") {
-            ORDINAL_isLimit = f;
-          } else if (f.Name == "ORD#IsSucc") {
-            ORDINAL_isSucc = f;
-          } else if (f.Name == "ORD#Offset") {
-            ORDINAL_offset = f;
-          } else if (f.Name == "ORD#IsNat") {
-            ORDINAL_isNat = f;
-          } else if (f.Name == "Map#Domain") {
-            mapDomain = f;
-          } else if (f.Name == "IMap#Domain") {
-            imapDomain = f;
-          } else if (f.Name == "Map#Values") {
-            mapValues = f;
-          } else if (f.Name == "IMap#Values") {
-            imapValues = f;
-          } else if (f.Name == "Map#Items") {
-            mapItems = f;
-          } else if (f.Name == "IMap#Items") {
-            imapItems = f;
-          } else if (f.Name == "_System.Tuple2._0") {
-            tuple2Destructors0 = f;
-          } else if (f.Name == "_System.Tuple2._1") {
-            tuple2Destructors1 = f;
-          } else if (f.Name == "#_System._tuple#2._#Make2") {
-            tuple2Constructor = f;
-          } else if (f.Name == "Tclass._System.Tuple2") {
-            tuple2TypeConstructor = f;
-          } else if (f.Name == "Tclass._System.object?") {
-            objectTypeConstructor = f;
-          }
-        }
-      }
-      if (seqTypeCtor == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Seq");
-      } else if (setTypeCtor == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Set");
-      } else if (isetTypeCtor == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type ISet");
-      } else if (multiSetTypeCtor == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type MultiSet");
-      } else if (mapTypeCtor == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Map");
-      } else if (imapTypeCtor == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type IMap");
-      } else if (arrayLength == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function _System.array.Length");
-      } else if (realFloor == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function _System.real.Floor");
-      } else if (ORDINAL_isLimit == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function ORD#IsLimit");
-      } else if (ORDINAL_isSucc == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function ORD#IsSucc");
-      } else if (ORDINAL_offset == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function ORD#Offset");
-      } else if (ORDINAL_isNat == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function ORD#IsNat");
-      } else if (mapDomain == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function Map#Domain");
-      } else if (imapDomain == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function IMap#Domain");
-      } else if (mapValues == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function Map#Values");
-      } else if (imapValues == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function IMap#Values");
-      } else if (mapItems == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function Map#Items");
-      } else if (imapItems == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function IMap#Items");
-      } else if (tuple2Destructors0 == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function _System.Tuple2._0");
-      } else if (tuple2Destructors1 == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function _System.Tuple2._1");
-      } else if (tuple2Constructor == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of function #_System._tuple#2._#Make2");
-      } else if (bv0TypeDecl == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Bv0");
-      } else if (fieldNameType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Field");
-      } else if (classNameType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type ClassName");
-      } else if (tyType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Ty");
-      } else if (tyTagType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type TyTag");
-      } else if (tyTagFamilyType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type TyTagFamily");
-      } else if (nameFamilyType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type NameFamily");
-      } else if (datatypeType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type DatatypeType");
-      } else if (handleType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type HandleType");
-      } else if (layerType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type LayerType");
-      } else if (dtCtorId == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type DtCtorId");
-      } else if (charType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type char");
-      } else if (refType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type ref");
-      } else if (boxType == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of type Box");
-      } else if (heap == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of $Heap");
-      } else if (allocField == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of constant alloc");
-      } else if (tuple2TypeConstructor == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of tuple2TypeConstructor");
-      } else if (objectTypeConstructor == null) {
-        options.OutputWriter.WriteLine("Error: Dafny prelude is missing declaration of objectTypeConstructor");
-      } else {
-        return new PredefinedDecls(charType, refType, boxType,
-                                   setTypeCtor, isetTypeCtor, multiSetTypeCtor,
-                                   mapTypeCtor, imapTypeCtor,
-                                   arrayLength, realFloor,
-                                   ORDINAL_isLimit, ORDINAL_isSucc, ORDINAL_offset, ORDINAL_isNat,
-                                   mapDomain, imapDomain,
-                                   mapValues, imapValues, mapItems, imapItems,
-                                   objectTypeConstructor,
-                                   tuple2Destructors0, tuple2Destructors1, tuple2Constructor, tuple2TypeConstructor,
-                                   seqTypeCtor, bv0TypeDecl,
-                                   fieldNameType, tyType, tyTagType, tyTagFamilyType,
-                                   heap, classNameType, nameFamilyType,
-                                   datatypeType, handleType, layerType, dtCtorId,
-                                   allocField);
-      }
-      return null;
-    }
-
-    Bpl.Program ReadPrelude() {
-      string preludePath = options.DafnyPrelude;
-      if (preludePath == null) {
-        //using (System.IO.Stream stream = cce.NonNull( System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("DafnyPrelude.bpl")) // Use this once Spec#/VSIP supports designating a non-.resx project item as an embedded resource
-        string codebase = cce.NonNull(System.IO.Path.GetDirectoryName(cce.NonNull(System.Reflection.Assembly.GetExecutingAssembly().Location)));
-        preludePath = System.IO.Path.Combine(codebase, "DafnyPrelude.bpl");
-      }
-
-      var defines = new List<string>();
-      if (6 <= options.ArithMode) {
-        defines.Add("ARITH_DISTR");
-      }
-      if (8 <= options.ArithMode) {
-        defines.Add("ARITH_MUL_DIV_MOD");
-      }
-      if (9 <= options.ArithMode) {
-        defines.Add("ARITH_MUL_SIGN");
-      }
-      if (10 <= options.ArithMode) {
-        defines.Add("ARITH_MUL_COMM");
-        defines.Add("ARITH_MUL_ASSOC");
-      }
-      if (options.Get(CommonOptionBag.UnicodeCharacters)) {
-        defines.Add("UNICODE_CHAR");
-      }
-      int errorCount = BplParser.Parse(preludePath, defines, out var prelude);
-      if (prelude == null || errorCount > 0) {
-        return null;
-      } else {
-        return prelude;
-      }
-    }
-
-    public Bpl.IdentifierExpr TrVar(IToken tok, IVariable var) {
-      Contract.Requires(var != null);
-      Contract.Requires(tok != null);
-      Contract.Ensures(Contract.Result<Bpl.IdentifierExpr>() != null);
-      return new Bpl.IdentifierExpr(tok, var.AssignUniqueName(currentDeclaration.IdGenerator), TrType(var.Type));
-    }
-
-    public Bpl.Program DoTranslation(Program p, ModuleDefinition forModule) {
-      if (sink == null) {
-        return new Bpl.Program();
-      }
-
-      foreach (var plugin in p.Options.Plugins) {
-        foreach (var rewriter in plugin.GetRewriters(p.Reporter)) {
-          rewriter.PreVerify(forModule);
-        }
-      }
-
-      program = p;
-      this.forModule = forModule;
-      Type.EnableScopes();
-
-      EstablishModuleScope(p.SystemModuleManager.SystemModule, forModule);
-      Type.PushScope(this.currentScope);
-
-      foreach (var w in program.SystemModuleManager.Bitwidths) {
-        // type axioms
-        AddBitvectorTypeAxioms(w);
-        // bitwise operations
-        AddBitvectorFunction(w, "and_bv", "bvand");
-        AddBitvectorFunction(w, "or_bv", "bvor");
-        AddBitvectorFunction(w, "xor_bv", "bvxor");  // Z3 supports this, but it seems not to be in the SMT-LIB 2 standard
-        AddBitvectorFunction(w, "not_bv", "bvnot", false);
-        // arithmetic operations
-        AddBitvectorFunction(w, "add_bv", "bvadd");
-        AddBitvectorFunction(w, "sub_bv", "bvsub");  // Z3 supports this, but it seems not to be in the SMT-LIB 2 standard
-        AddBitvectorFunction(w, "mul_bv", "bvmul");
-        AddBitvectorFunction(w, "div_bv", "bvudiv");
-        AddBitvectorFunction(w, "mod_bv", "bvurem");
-        // comparisons
-        AddBitvectorFunction(w, "lt_bv", "bvult", true, Bpl.Type.Bool, false);
-        AddBitvectorFunction(w, "le_bv", "bvule", true, Bpl.Type.Bool, true);  // Z3 supports this, but it seems not to be in the SMT-LIB 2 standard
-        AddBitvectorFunction(w, "ge_bv", "bvuge", true, Bpl.Type.Bool, true);  // Z3 supports this, but it seems not to be in the SMT-LIB 2 standard
-        AddBitvectorFunction(w, "gt_bv", "bvugt", true, Bpl.Type.Bool, false);  // Z3 supports this, but it seems not to be in the SMT-LIB 2 standard
-        // shifts
-        AddBitvectorShiftFunction(w, "LeftShift_bv", "bvshl");
-        AddBitvectorShiftFunction(w, "RightShift_bv", "bvlshr");
-        // rotates
-        AddBitvectorShiftFunction(w, "LeftRotate_bv", "ext_rotate_left");
-        AddBitvectorShiftFunction(w, "RightRotate_bv", "ext_rotate_right");
-        // conversion functions
-        AddBitvectorNatConversionFunction(w);
-      }
-
-      foreach (TopLevelDecl d in program.SystemModuleManager.SystemModule.TopLevelDecls) {
-        currentDeclaration = d;
-        if (d is AbstractTypeDecl abstractType) {
-          GetOrCreateTypeConstructor(abstractType);
-          AddClassMembers(abstractType, true, true);
-        } else if (d is NewtypeDecl) {
-          var dd = (NewtypeDecl)d;
-          AddTypeDecl(dd);
-          AddClassMembers(dd, true, true);
-        } else if (d is SubsetTypeDecl) {
-          AddTypeDecl((SubsetTypeDecl)d);
-        } else if (d is TypeSynonymDecl) {
-          // do nothing, just bypass type synonyms in the translation
-        } else if (d is DatatypeDecl) {
-          var dd = (DatatypeDecl)d;
-          AddDatatype(dd);
-          AddClassMembers(dd, true, true);
-        } else if (d is ArrowTypeDecl) {
-          var ad = (ArrowTypeDecl)d;
-          GetClassTyCon(ad);
-          AddArrowTypeAxioms(ad);
-        } else if (d is ClassLikeDecl) {
-          var cl = (ClassLikeDecl)d;
-          AddClassMembers(cl, true, true);
-          if (cl.NonNullTypeDecl != null) {
-            AddTypeDecl(cl.NonNullTypeDecl);
-          }
-        } else {
-          Contract.Assert(d is ValuetypeDecl);
-        }
-      }
-
-      ComputeFunctionFuel(); // compute which function needs fuel constants.
-
-      //translate us first
-      List<ModuleDefinition> mods = program.RawModules().ToList();
-      mods.Remove(forModule);
-      mods.Insert(0, forModule);
-
-      var visibleTopLevelDecls =
-        mods.SelectMany(m => m.TopLevelDecls.Where(VisibleInScope));
-
-      if (visibleTopLevelDecls.Any(
-            d => d is TopLevelDeclWithMembers memberContainer &&
-                 memberContainer.Members.Any(
-                   member =>
-                     Attributes.Contains(member.Attributes, "only")
-                 ))) {
-        filterOnlyMembers = true;
-      }
-
-      foreach (TopLevelDecl d in visibleTopLevelDecls) {
-        currentDeclaration = d;
-        if (d is AbstractTypeDecl abstractType) {
-          AddClassMembers(abstractType, true, true);
-        } else if (d is ModuleDecl) {
-          // submodules have already been added as a top level module, ignore this.
-        } else if (d is RevealableTypeDecl revealableTypeDecl) {
-          AddRevealableTypeDecl(revealableTypeDecl);
-        } else {
-          Contract.Assert(false);
-        }
-      }
-
-      filterOnlyMembers = false;
-
-      foreach (var c in tytagConstants.Values) {
-        sink.AddTopLevelDeclaration(c);
-      }
-      foreach (var c in fieldConstants.Values) {
-        sink.AddTopLevelDeclaration(c);
-      }
-
-      AddTraitParentAxioms();
-
-      if (InsertChecksums) {
-        foreach (var impl in sink.Implementations) {
-          if (impl.FindAttribute("checksum") == null) {
-            impl.AddAttribute("checksum", "stable");
-          }
-        }
-        foreach (var func in sink.Functions) {
-          if (func.FindAttribute("checksum") == null) {
-            func.AddAttribute("checksum", "stable");
-          }
-        }
-      }
-
-      Type.PopScope(this.currentScope);
-      Type.DisableScopes();
-      return sink;
-
-    }
-
-    // Don't verify modules which only contain other modules
-    private static bool ShouldVerifyModule(Program program, ModuleDefinition m) {
-      if (!m.ShouldVerify(program.Compilation)) {
-        return false;
-      }
-
-      foreach (var top in m.TopLevelDecls) {
-        if (top is DefaultClassDecl) {
-          if (((DefaultClassDecl)top).Members.Count > 0) {
-            return true;
-          }
-        } else if (!(top is ModuleDecl)) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    public static IEnumerable<ModuleDefinition> VerifiableModules(Program p) {
-      return p.RawModules().Where(m => ShouldVerifyModule(p, m));
-    }
-
-    public static IEnumerable<Tuple<string, Bpl.Program>> Translate(Program p, ErrorReporter reporter, TranslatorFlags flags = null) {
-      Contract.Requires(p != null);
-      Contract.Requires(p.ModuleSigs.Count > 0);
-
-      Type.ResetScopes();
-
-      foreach (ModuleDefinition outerModule in VerifiableModules(p)) {
-        var translator = new Translator(reporter, flags);
-
-        if (translator.sink == null || translator.sink == null) {
-          // something went wrong during construction, which reads the prelude; an error has
-          // already been printed, so just return an empty program here (which is non-null)
-          yield return new Tuple<string, Bpl.Program>(outerModule.SanitizedName, new Bpl.Program());
-        }
-        yield return new Tuple<string, Bpl.Program>(outerModule.SanitizedName, translator.DoTranslation(p, outerModule));
-      }
-    }
-
-    private void AddBitvectorTypeAxioms(int w) {
-      Contract.Requires(0 <= w);
-
-      if (w == 0) {
-        // the axioms for bv0 are already in DafnyPrelude.bpl
-        return;
-      }
-
-      // box/unbox axiom
-      var tok = Token.NoToken;
-      var printableName = "bv" + w;
-      var dafnyType = new BitvectorType(options, w);
-      var boogieType = BplBvType(w);
-      var typeTerm = TypeToTy(dafnyType);
-      AddBoxUnboxAxiom(tok, printableName, typeTerm, boogieType, new List<Variable>());
-
-      // axiom (forall v: bv3 :: { $Is(v, TBitvector(3)) } $Is(v, TBitvector(3)));
-      var vVar = BplBoundVar("v", boogieType, out var v);
-      var bvs = new List<Variable>() { vVar };
-      var isBv = MkIs(v, typeTerm);
-      var tr = BplTrigger(isBv);
-      sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, new Bpl.ForallExpr(tok, bvs, tr, isBv)));
-
-      // axiom (forall v: bv3, heap: Heap :: { $IsAlloc(v, TBitvector(3), h) } $IsAlloc(v, TBitvector(3), heap));
-      vVar = BplBoundVar("v", boogieType, out v);
-      var heapVar = BplBoundVar("heap", predef.HeapType, out var heap);
-      bvs = new List<Variable>() { vVar, heapVar };
-      var isAllocBv = MkIsAlloc(v, typeTerm, heap);
-      tr = BplTrigger(isAllocBv);
-      sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, new Bpl.ForallExpr(tok, bvs, tr, isAllocBv)));
-    }
-
-    /// <summary>
-    /// Declare and add to the sink a Boogie function named "namePrefix + w".
-    /// If "binary", then the function takes two arguments; otherwise, it takes one.  Arguments have the type
-    /// corresponding to the Dafny type for w-width bitvectors.
-    /// The function's result type is the same as the argument type, unless "resultType" is non-null, in which
-    /// case the function's result type is "resultType".
-    /// For w > 0:
-    ///     Attach an attribute {:bvbuiltin smtFunctionName}.
-    /// For w == 0:
-    ///     Attach an attribute {:inline} and add a .Body to the function.
-    ///     If "resultType" is null, then use 0 as the body; otherwise, use "bodyForBv0" as the body (which
-    ///     assumes "resultType" is actually Bpl.Type.Bool).
-    /// </summary>
-    private void AddBitvectorFunction(int w, string namePrefix, string smtFunctionName, bool binary = true, Bpl.Type resultType = null, bool bodyForBv0 = false) {
-      Contract.Requires(0 <= w);
-      Contract.Requires(namePrefix != null);
-      Contract.Requires(smtFunctionName != null);
-      var tok = Token.NoToken;
-      var t = BplBvType(w);
-      List<Bpl.Variable> args;
-      if (binary) {
-        var a0 = BplFormalVar(null, t, true);
-        var a1 = BplFormalVar(null, t, true);
-        args = new List<Variable>() { a0, a1 };
-      } else {
-        var a0 = BplFormalVar(null, t, true);
-        args = new List<Variable>() { a0 };
-      }
-      var r = BplFormalVar(null, resultType ?? t, false);
-      Bpl.QKeyValue attr;
-      if (w == 0) {
-        attr = InlineAttribute(tok);
-      } else {
-        attr = new Bpl.QKeyValue(tok, "bvbuiltin", new List<object>() { smtFunctionName }, null);
-      }
-      var func = new Bpl.Function(tok, namePrefix + w, new List<TypeVariable>(), args, r, null, attr);
-      if (w == 0) {
-        if (resultType != null) {
-          func.Body = Bpl.Expr.Literal(bodyForBv0);
-        } else {
-          func.Body = BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, w);
-        }
-      }
-      sink.AddTopLevelDeclaration(func);
-    }
-
-    private void AddBitvectorShiftFunction(int w, string namePrefix, string smtFunctionName) {
-      Contract.Requires(0 <= w);
-      Contract.Requires(namePrefix != null);
-      Contract.Requires(smtFunctionName != null);
-      var tok = Token.NoToken;
-      var t = BplBvType(w);
-      List<Bpl.Variable> args;
-      var a0 = BplFormalVar(null, t, true);
-      var a1 = BplFormalVar(null, t, true);
-      args = new List<Variable>() { a0, a1 };
-      var r = BplFormalVar(null, t, false);
-      Bpl.QKeyValue attr;
-      if (w == 0) {
-        attr = InlineAttribute(tok);
-      } else {
-        attr = new Bpl.QKeyValue(tok, "bvbuiltin", new List<object>() { smtFunctionName }, null);
-      }
-      var func = new Bpl.Function(tok, namePrefix + w, new List<TypeVariable>(), args, r, null, attr);
-      if (w == 0) {
-        func.Body = BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, w);
-      }
-      sink.AddTopLevelDeclaration(func);
-    }
-
-    private void AddBitvectorNatConversionFunction(int w) {
-      Contract.Requires(0 <= w);
-      var tok = Token.NoToken;
-      var bv = BplBvType(w);
-      Bpl.QKeyValue attr;
-      Bpl.Function func;
-
-      // function {:bvbuiltin "(_ int2bv 67)"} nat_to_bv67(int) : bv67;
-      // OR:
-      // function {:inline} nat_to_bv0(int) : Bv0 { ZERO }
-      if (w == 0) {
-        attr = InlineAttribute(tok);
-      } else {
-        var smt_int2bv = string.Format("(_ int2bv {0})", w);
-        attr = new Bpl.QKeyValue(tok, "bvbuiltin", new List<object>() { smt_int2bv }, null);  // SMT-LIB 2 calls this function nat2bv, but Z3 apparently calls it int2bv
-      }
-      func = new Bpl.Function(tok, "nat_to_bv" + w, new List<TypeVariable>(),
-        new List<Variable>() { BplFormalVar(null, Bpl.Type.Int, true) }, BplFormalVar(null, bv, false),
-        null, attr);
-      if (w == 0) {
-        func.Body = BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, w);
-      }
-      sink.AddTopLevelDeclaration(func);
-
-      if (w == 0) {
-        // function {:inline} nat_from_bv0_smt(Bv0) : int { 0 }
-        attr = InlineAttribute(tok);
-        func = new Bpl.Function(tok, "nat_from_bv" + w, new List<TypeVariable>(),
-          new List<Variable>() { BplFormalVar(null, bv, true) }, BplFormalVar(null, Bpl.Type.Int, false),
-          null, attr);
-        func.Body = Bpl.Expr.Literal(0);
-        sink.AddTopLevelDeclaration(func);
-      } else {
-        // function {:bvbuiltin "bv2int"} smt_nat_from_bv67(bv67) : int;
-        attr = new Bpl.QKeyValue(tok, "bvbuiltin", new List<object>() { "bv2int" }, null);  // SMT-LIB 2 calls this function bv2nat, but Z3 apparently calls it bv2int
-        var smtFunc = new Bpl.Function(tok, "smt_nat_from_bv" + w, new List<TypeVariable>(),
-          new List<Variable>() { BplFormalVar(null, bv, true) }, BplFormalVar(null, Bpl.Type.Int, false),
-          null, attr);
-        sink.AddTopLevelDeclaration(smtFunc);
-        // function nat_from_bv67(bv67) : int;
-        func = new Bpl.Function(tok, "nat_from_bv" + w, new List<TypeVariable>(),
-          new List<Variable>() { BplFormalVar(null, bv, true) }, BplFormalVar(null, Bpl.Type.Int, false),
-          null, null);
-        sink.AddTopLevelDeclaration(func);
-        // axiom (forall b: bv67 :: { nat_from_bv67(b) }
-        //          0 <= nat_from_bv67(b) && nat_from_bv67(b) < 0x8_0000_0000_0000_0000 &&
-        //          nat_from_bv67(b) == smt_nat_from_bv67(b));
-        var bVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "b", BplBvType(w)));
-        var b = new Bpl.IdentifierExpr(tok, bVar);
-        var bv2nat = FunctionCall(tok, "nat_from_bv" + w, Bpl.Type.Int, b);
-        var smt_bv2nat = FunctionCall(tok, "smt_nat_from_bv" + w, Bpl.Type.Int, b);
-        var body = BplAnd(BplAnd(
-          Bpl.Expr.Le(Bpl.Expr.Literal(0), bv2nat),
-          Bpl.Expr.Lt(bv2nat, Bpl.Expr.Literal(BaseTypes.BigNum.FromBigInt(BigInteger.One << w)))),
-          Bpl.Expr.Eq(bv2nat, smt_bv2nat));
-        var ax = new Bpl.ForallExpr(tok, new List<Variable>() { bVar }, BplTrigger(bv2nat), body);
-        sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, ax));
-      }
-    }
-
-    private void ComputeFunctionFuel() {
-      foreach (ModuleDefinition m in program.RawModules()) {
-        foreach (TopLevelDecl d in m.TopLevelDecls) {
-          if (d is TopLevelDeclWithMembers) {
-            var c = (TopLevelDeclWithMembers)d;
-            foreach (MemberDecl member in c.Members) {
-              if (member is Function && RevealedInScope(member)) {
-                Function f = (Function)member;
-                // declare the fuel constant
-                if (f.IsFueled) {
-                  // const BaseFuel_FunctionA : LayerType
-                  Bpl.Constant baseFuel = new Bpl.Constant(f.tok, new Bpl.TypedIdent(f.tok, "BaseFuel_" + f.FullName, predef.LayerType), false);
-                  sink.AddTopLevelDeclaration(baseFuel);
-                  Bpl.Expr baseFuel_expr = new Bpl.IdentifierExpr(f.tok, baseFuel);
-                  // const StartFuel_FunctionA : LayerType
-                  Bpl.Constant startFuel = new Bpl.Constant(f.tok, new Bpl.TypedIdent(f.tok, "StartFuel_" + f.FullName, predef.LayerType), false);
-                  sink.AddTopLevelDeclaration(startFuel);
-                  Bpl.Expr startFuel_expr = new Bpl.IdentifierExpr(f.tok, startFuel);
-                  // const StartFuelAssert_FunctionA : LayerType
-                  Bpl.Constant startFuelAssert = new Bpl.Constant(f.tok, new Bpl.TypedIdent(f.tok, "StartFuelAssert_" + f.FullName, predef.LayerType), false);
-                  sink.AddTopLevelDeclaration(startFuelAssert);
-                  Bpl.Expr startFuelAssert_expr = new Bpl.IdentifierExpr(f.tok, startFuelAssert);
-                  this.functionFuel.Add(new FuelConstant(f, baseFuel_expr, startFuel_expr, startFuelAssert_expr));
-                }
-
-                if (f.IsOpaque) {
-                  CreateRevealableConstant(f);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    private void CreateRevealableConstant(Function f) {
-      if (!this.functionReveals.ContainsKey(f)) {
-        // const reveal_FunctionA : bool
-        Bpl.Constant revealTrigger =
-          new Bpl.Constant(f.tok, new Bpl.TypedIdent(f.tok, "reveal_" + f.FullName, Bpl.Type.Bool), false);
-        sink.AddTopLevelDeclaration(revealTrigger);
-        Bpl.Expr revealTrigger_expr = new Bpl.IdentifierExpr(f.tok, revealTrigger);
-        this.functionReveals[f] = revealTrigger_expr;
-      }
-    }
-
-    /// <summary>
-    /// For every revealed type (class or trait) C<T> that extends a trait J<G(T)>, add:
-    ///   axiom (forall T: Ty, $o: ref ::
-    ///       { $Is($o, C(T)) }
-    ///       $o != null && $Is($o, C(T)) ==> $Is($o, J(G(T)));
-    ///   axiom (forall T: Ty, $Heap: Heap, $o: ref ::
-    ///       { $IsAlloc($o, C(T), $Heap) }
-    ///       $o != null && $IsAlloc($o, C(T), $Heap) ==> $IsAlloc($o, J(G(T)), $Heap);
-    /// Note:
-    ///   It is sometimes useful also to be able to determine the _absence_ of trait-parent relationships.
-    ///   For example, suppose one can tell from the looking at the "extends" clauses in a program
-    ///   that a class C does not (directly or transitively) extend a trait T. Then, given variables c and t
-    ///   of static types C and T, respectively, the verifier should be able to infer c != t. This is not
-    ///   possible with the axioms below. It will require an axiomatization of _all_ possible parent traits, not just
-    ///   saying that some are possible. When this becomes needed, the axiomatization will need to be
-    ///   embellished.
-    /// </summary>
-    private void AddTraitParentAxioms() {
-      foreach (ModuleDefinition m in program.RawModules()) {
-        foreach (TopLevelDecl d in m.TopLevelDecls) {
-          var c = d as TopLevelDeclWithMembers;
-          if (c == null || !RevealedInScope(d)) {
-            continue;
-          }
-          foreach (var parentType in c.ParentTraits) {
-            var childType = UserDefinedType.FromTopLevelDecl(c.tok, c);
-
-            Bpl.Expr heap; var heapVar = BplBoundVar("$heap", predef.HeapType, out heap);
-            Bpl.Expr o; var oVar = BplBoundVar("$o", TrType(childType), out o);
-            Bpl.Expr oNotNull = childType.IsRefType ? Bpl.Expr.Neq(o, predef.Null) : Bpl.Expr.True;
-
-            var oj = BoxifyForTraitParent(c.tok, o, ((UserDefinedType)parentType.NormalizeExpand()).ResolvedClass, childType);
-
-            List<Bpl.Expr> tyexprs;
-            var bvarsTypeParameters = MkTyParamBinders(GetTypeParams(c), out tyexprs);
-
-            // axiom (forall T: Ty, $o: ref ::
-            //     { $Is($o, C(T)) }
-            //     $o != null && $Is($o, C(T)) ==> $Is($o, J(G(T)));
-            var isC = MkIs(o, childType);
-            var isJ = MkIs(oj, parentType);
-            var bvs = new List<Bpl.Variable>();
-            bvs.AddRange(bvarsTypeParameters);
-            bvs.Add(oVar);
-            var tr = BplTrigger(isC);
-            var body = BplImp(BplAnd(oNotNull, isC), isJ);
-
-            sink.AddTopLevelDeclaration(new Bpl.Axiom(c.tok, new Bpl.ForallExpr(c.tok, bvs, tr, body),
-              $"type axiom for trait parent: {d} extends {parentType}"));
-
-            // axiom (forall T: Ty, $Heap: Heap, $o: ref ::
-            //     { $IsAlloc($o, C(T), $Heap) }
-            //     $o != null && $IsAlloc($o, C(T), $Heap) ==> $IsAlloc($o, J(G(T)), $Heap);
-            var isAllocC = MkIsAlloc(o, childType, heap);
-            var isAllocJ = MkIsAlloc(oj, parentType, heap);
-            bvs = new List<Bpl.Variable>();
-            bvs.AddRange(bvarsTypeParameters);
-            bvs.Add(oVar);
-            bvs.Add(heapVar);
-            tr = BplTrigger(isAllocC);
-            body = BplImp(BplAnd(oNotNull, isAllocC), isAllocJ);
-            sink.AddTopLevelDeclaration(new Bpl.Axiom(c.tok, new Bpl.ForallExpr(c.tok, bvs, tr, body),
-              $"allocation axiom for trait parent: {d} extends {parentType}"));
-          }
-        }
-      }
-    }
-
-    /// <summary>
-    /// Construct an expression denoting the equality of e0 and e1, taking advantage of
-    /// any available extensional equality based on the given Dafny type.
-    /// </summary>
-    public Expr TypeSpecificEqual(IToken tok, Dafny.Type type, Expr e0, Expr e1) {
-      Contract.Requires(tok != null);
-      Contract.Requires(type != null);
-      Contract.Requires(e0 != null);
-      Contract.Requires(e1 != null);
-
-      if (type.AsSetType != null) {
-        var finite = type.AsSetType.Finite;
-        return FunctionCall(tok, finite ? BuiltinFunction.SetEqual : BuiltinFunction.ISetEqual, null, e0, e1);
-      } else if (type.AsMapType != null) {
-        var finite = type.AsMapType.Finite;
-        return FunctionCall(tok, finite ? BuiltinFunction.MapEqual : BuiltinFunction.IMapEqual, null, e0, e1);
-      } else if (type.AsMultiSetType != null) {
-        return FunctionCall(tok, BuiltinFunction.MultiSetEqual, null, e0, e1);
-      } else if (type.AsSeqType != null) {
-        return FunctionCall(tok, BuiltinFunction.SeqEqual, null, e0, e1);
-      } else if (type.IsIndDatatype) {
-        return FunctionCall(tok, type.AsIndDatatype.FullSanitizedName + "#Equal", Bpl.Type.Bool, e0, e1);
-      } else {
-        return Bpl.Expr.Eq(e0, e1);
-      }
-    }
-
-    void AddRevealableTypeDecl(RevealableTypeDecl d) {
-      Contract.Requires(d != null);
-      if (RevealedInScope(d)) {
-        if (d is NewtypeDecl) {
-          var dd = (NewtypeDecl)d;
-          AddTypeDecl(dd);
-          AddClassMembers(dd, true, true);
-        } else if (d is DefaultClassDecl defaultClassDecl) {
-          AddClassMembers(defaultClassDecl, options.OptimizeResolution < 1, true);
-        } else if (d is ClassLikeDecl) {
-          var cl = (ClassLikeDecl)d;
-          AddClassMembers(cl, options.OptimizeResolution < 1, true);
-          if (cl.NonNullTypeDecl != null) {
-            AddTypeDecl(cl.NonNullTypeDecl);
-          }
-          if (d is IteratorDecl) {
-            AddIteratorSpecAndBody((IteratorDecl)d);
-          }
-        } else if (d is DatatypeDecl) {
-          var dd = (DatatypeDecl)d;
-          AddDatatype(dd);
-          AddClassMembers(dd, true, true);
-        } else if (d is SubsetTypeDecl) {
-          AddTypeDecl((SubsetTypeDecl)d);
-        } else if (d is TypeSynonymDecl) {
-          //do nothing, this type will be transparent to translation
-        } else {
-          Contract.Assert(false);
-        }
-      } else {
-        // Create a type constructor for the export-provided type. But note:
-        //   -- A DefaultClassDecl does not need a type constructor.
-        //   -- Reference types give rise to two type declarations, the nullable version and the non-null version.
-        //      For a type that is only export-provided, the type that is exported is an abstract-type version
-        //      of the non-null type. Thus, for a class declaration and reference-type trait declaration, we
-        //      do not create a type constructor.
-        if (d is not DefaultClassDecl && d is not ClassLikeDecl { IsReferenceTypeDecl: true }) {
-          GetOrCreateTypeConstructor(d.SelfSynonymDecl());
-        }
-
-        if (d is TopLevelDeclWithMembers topLevelDeclWithMembers) {
-          AddClassMembers(topLevelDeclWithMembers, true, false);
-        }
-      }
-    }
-
-    void AddTypeDecl(NewtypeDecl dd) {
-      Contract.Requires(dd != null);
-      Contract.Ensures(fuelContext == Contract.OldValue(fuelContext));
-
-      FuelContext oldFuelContext = this.fuelContext;
-      this.fuelContext = FuelSetting.NewFuelContext(dd);
-
-      if (dd.Var != null) {
-        AddWellformednessCheck(dd);
-      }
-
-      // Add $Is and $IsAlloc axioms for the newtype
-      currentModule = dd.EnclosingModuleDefinition;
-      AddRedirectingTypeDeclAxioms(false, dd, dd.FullName);
-      AddRedirectingTypeDeclAxioms(true, dd, dd.FullName);
-      currentModule = null;
-
-      this.fuelContext = oldFuelContext;
-    }
-
-    void AddTypeDecl(SubsetTypeDecl dd) {
-      Contract.Requires(dd != null);
-      Contract.Ensures(fuelContext == Contract.OldValue(fuelContext));
-
-      FuelContext oldFuelContext = this.fuelContext;
-      this.fuelContext = FuelSetting.NewFuelContext(dd);
-
-      if (!Attributes.Contains(dd.Attributes, "axiom")) {
-        AddWellformednessCheck(dd);
-      }
-      currentModule = dd.EnclosingModuleDefinition;
-      // Add $Is and $IsAlloc axioms for the subset type
-      AddRedirectingTypeDeclAxioms(false, dd, dd.FullName);
-      AddRedirectingTypeDeclAxioms(true, dd, dd.FullName);
-      currentModule = null;
-      this.fuelContext = oldFuelContext;
-    }
-
-    /**
-     * Example:
-      // _System.object: subset type $Is
-      axiom (forall c#0: ref :: 
-        { $Is(c#0, Tclass._System.object()) } 
-        $Is(c#0, Tclass._System.object())
-           <==> $Is(c#0, Tclass._System.object?()) && c#0 != null);
-
-      // _System.object: subset type $IsAlloc
-      axiom (forall c#0: ref, $h: Heap :: 
-        { $IsAlloc(c#0, Tclass._System.object(), $h) } 
-        $IsAlloc(c#0, Tclass._System.object(), $h)
-           <==> $IsAlloc(c#0, Tclass._System.object?(), $h));
-     */
-    void AddRedirectingTypeDeclAxioms<T>(bool is_alloc, T dd, string fullName)
-      where T : TopLevelDecl, RedirectingTypeDecl {
-      Contract.Requires(dd != null);
-      Contract.Requires((dd.Var != null && dd.Constraint != null) || dd is NewtypeDecl);
-      Contract.Requires(fullName != null);
-
-      List<Bpl.Expr> typeArgs;
-      var vars = MkTyParamBinders(dd.TypeArgs, out typeArgs);
-      var o_ty = ClassTyCon(dd, typeArgs);
-
-      var baseType = dd.Var != null ? dd.Var.Type : ((NewtypeDecl)(object)dd).BaseType;
-      var oBplType = TrType(baseType);
-      var c = new BoundVar(dd.tok, CurrentIdGenerator.FreshId("c"), baseType);
-      var o = BplBoundVar((dd.Var ?? c).AssignUniqueName((dd.IdGenerator)), oBplType, vars);
-
-      Bpl.Expr body, is_o;
-      string comment;
-
-      if (is_alloc) {
-        comment = $"$IsAlloc axiom for {dd.WhatKind} {fullName}";
-        var h = BplBoundVar("$h", predef.HeapType, vars);
-        // $IsAlloc(o, ..)
-        is_o = MkIsAlloc(o, o_ty, h, ModeledAsBoxType(baseType));
-        if (baseType.IsNumericBased() || baseType.IsBitVectorType || baseType.IsBoolType || baseType.IsCharType) {
-          body = is_o;
-        } else {
-          Bpl.Expr rhs = MkIsAlloc(o, baseType, h);
-          body = BplIff(is_o, rhs);
-        }
-      } else {
-        comment = $"$Is axiom for {dd.WhatKind} {fullName}";
-        // $Is(o, ..)
-        is_o = MkIs(o, o_ty, ModeledAsBoxType(baseType));
-        var etran = new ExpressionTranslator(this, predef, NewOneHeapExpr(dd.tok));
-        Bpl.Expr parentConstraint, constraint;
-        if (baseType.IsNumericBased() || baseType.IsBitVectorType || baseType.IsBoolType || baseType.IsCharType) {
-          // optimize this to only use the numeric/bitvector constraint, not the whole $Is thing on the base type
-          parentConstraint = Bpl.Expr.True;
-          var udt = UserDefinedType.FromTopLevelDecl(dd.tok, dd);
-          var substitutee = Expression.CreateIdentExpr(dd.Var ?? c);
-          constraint = etran.TrExpr(ModuleResolver.GetImpliedTypeConstraint(substitutee, udt));
-        } else {
-          parentConstraint = MkIs(o, baseType);
-          // conjoin the constraint
-          constraint = etran.TrExpr(dd.Constraint ?? Expression.CreateBoolLiteral(dd.tok, true));
-        }
-        body = BplIff(is_o, BplAnd(parentConstraint, constraint));
-      }
-
-      var axiom = new Bpl.Axiom(dd.tok, BplForall(vars, BplTrigger(is_o), body), comment);
-      AddOtherDefinition(GetOrCreateTypeConstructor(dd), axiom);
-    }
-
-    /// <summary>
-    /// Return a sequence of expressions whose conjunction denotes a memberwise equality of "dt".  Recursive
-    /// codatatype equalities are written in one of the following ways:
-    /// If the codatatype equality is on a type outside the SCC of "dt", then resort to ordinary equality.
-    /// Else if the k==null, then:
-    ///   Depending on "limited", use the #2, #1, or #0 (limited) form of codatatype equality.
-    /// Else:
-    ///   Depending on "limited", use the #2, #1, or #0 (limited) form of prefix equality, passing "k"
-    ///   as the first argument.
-    /// </summary>
-    IEnumerable<Bpl.Expr> CoPrefixEquality(IToken tok, CoDatatypeDecl dt, List<Type> largs, List<Type> rargs, Bpl.Expr k, Bpl.Expr l, Bpl.Expr A, Bpl.Expr B, bool conjuncts = false) {
-      Contract.Requires(tok != null);
-      Contract.Requires(dt != null);
-      Contract.Requires(A != null);
-      Contract.Requires(B != null);
-      Contract.Requires(l != null);
-      Contract.Requires(predef != null);
-      var etran = new ExpressionTranslator(this, predef, dt.tok);
-      // For example, for possibly infinite lists:
-      //     codatatype SList<T> = Nil | SCons(head: T, tail: SList<T>);
-      // produce with conjucts=false (default):
-      //   (A.Nil? && B.Nil?) ||
-      //   (A.Cons? && B.Cons? && A.head == B.head && Equal(k, A.tail, B.tail))
-      //
-      // with conjuncts=true:
-      //   (A.Nil? ==> B.Nil?) &&
-      //   (A.Cons? ==> (B.Cons? && A.head == B.head && Equal(k, A.tail, B.tail)))
-
-      Dictionary<TypeParameter, Type> lsu = Util.Dict(GetTypeParams(dt), largs);
-      Dictionary<TypeParameter, Type> rsu = Util.Dict(GetTypeParams(dt), rargs);
-
-      foreach (var ctor in dt.Ctors) {
-        Bpl.Expr aq = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(GetReadonlyField(ctor.QueryField)), new List<Bpl.Expr> { A });
-        Bpl.Expr bq = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(GetReadonlyField(ctor.QueryField)), new List<Bpl.Expr> { B });
-        Bpl.Expr chunk = Bpl.Expr.True;
-        foreach (var dtor in ctor.Destructors) {  // note, ctor.Destructors has a field for every constructor parameter, whether or not the parameter was named in the source
-          var a = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(GetReadonlyField(dtor)), new List<Bpl.Expr> { A });
-          var b = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(GetReadonlyField(dtor)), new List<Bpl.Expr> { B });
-          var ty = dtor.Type;
-          Bpl.Expr q;
-          var codecl = ty.AsCoDatatype;
-          if (codecl != null && codecl.SscRepr == dt.SscRepr) {
-            var lexprs = Map(ty.TypeArgs, tt => tt.Subst(lsu));
-            var rexprs = Map(ty.TypeArgs, tt => tt.Subst(rsu));
-            q = CoEqualCall(codecl, lexprs, rexprs, k, l, a, b);
-          } else {
-            // ordinary equality; let the usual translation machinery figure out the translation
-            var tyA = ty.Subst(lsu);
-            var tyB = ty.Subst(rsu);
-            var aa = CondApplyUnbox(tok, a, ty, tyA);
-            var bb = CondApplyUnbox(tok, b, ty, tyB);
-            var equal = new BinaryExpr(tok, BinaryExpr.Opcode.Eq, new BoogieWrapper(aa, tyA), new BoogieWrapper(bb, tyB));
-            equal.ResolvedOp = ModuleResolver.ResolveOp(equal.Op, tyA, tyB);  // resolve here
-            equal.Type = Type.Bool;  // resolve here
-            q = etran.TrExpr(equal);
-          }
-          chunk = BplAnd(chunk, q);
-        }
-        if (conjuncts) {
-          yield return Bpl.Expr.Binary(new NestedToken(tok, ctor.tok), BinaryOperator.Opcode.Imp, aq, BplAnd(bq, chunk));
-        } else {
-          yield return BplAnd(BplAnd(aq, bq), BplImp(BplAnd(aq, bq), chunk));
-        }
-      }
-    }
-
-    public Bpl.Expr LayerSucc(Bpl.Expr e, int amt = 1) {
-      if (amt == 0) {
-        return e;
-      } else if (amt > 0) {
-        return FunctionCall(e.tok, BuiltinFunction.LayerSucc, null, LayerSucc(e, amt - 1));
-      } else {
-        Contract.Assert(false);
-        return null;
-      }
-    }
-
-    // Makes a call to equality, if k is null, or otherwise prefix equality. For codatatypes.
-    Bpl.Expr CoEqualCall(CoDatatypeDecl codecl, List<Bpl.Expr> largs, List<Bpl.Expr> rargs, Bpl.Expr k, Bpl.Expr l, Bpl.Expr A, Bpl.Expr B, Bpl.IToken tok = null) {
-      Contract.Requires(codecl != null);
-      Contract.Requires(largs != null);
-      Contract.Requires(rargs != null);
-      Contract.Requires(l != null);
-      Contract.Requires(A != null);
-      Contract.Requires(B != null);
-      if (tok == null) {
-        tok = A.tok;
-      }
-      List<Bpl.Expr> args = Concat(largs, rargs);
-      if (k != null) {
-        args.Add(k);
-      }
-      args.AddRange(new List<Bpl.Expr> { l, A, B });
-      var fn = k == null ? CoEqualName(codecl) : CoPrefixName(codecl);
-      return FunctionCall(tok, fn, Bpl.Type.Bool, args);
-    }
-
-    // Same as above, but with Dafny-typed type-argument lists
-    Bpl.Expr CoEqualCall(CoDatatypeDecl codecl, List<Type> largs, List<Type> rargs, Bpl.Expr k, Bpl.Expr l, Bpl.Expr A, Bpl.Expr B, IToken tok = null) {
-      Contract.Requires(codecl != null);
-      Contract.Requires(largs != null);
-      Contract.Requires(rargs != null);
-      Contract.Requires(l != null);
-      Contract.Requires(A != null);
-      Contract.Requires(B != null);
-      return CoEqualCall(codecl, Map(largs, TypeToTy), Map(rargs, TypeToTy), k, l, A, B, tok);
-    }
-
-    static string CoEqualName(CoDatatypeDecl codecl) {
-      Contract.Requires(codecl != null);
-      return "$Eq#" + codecl.FullSanitizedName;
-    }
-
-    static string CoPrefixName(CoDatatypeDecl codecl) {
-      Contract.Requires(codecl != null);
-      return "$PrefixEq#" + codecl.FullSanitizedName;
-    }
-
-    void CreateBoundVariables<VT>(List<VT> formals, out List<Variable> bvs, out List<Bpl.Expr> args) where VT : IVariable {
-      Contract.Requires(formals != null);
-      Contract.Ensures(Contract.ValueAtReturn(out bvs).Count == Contract.ValueAtReturn(out args).Count);
-      Contract.Ensures(Contract.ValueAtReturn(out bvs) != null);
-      Contract.Ensures(cce.NonNullElements(Contract.ValueAtReturn(out args)));
-
-      var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator("a#");
-      bvs = new List<Variable>();
-      args = new List<Bpl.Expr>();
-      foreach (var arg in formals) {
-        Contract.Assert(arg != null);
-        var nm = varNameGen.FreshId(string.Format("#{0}#", bvs.Count));
-        Bpl.Variable bv = new Bpl.BoundVariable(arg.Tok, new Bpl.TypedIdent(arg.Tok, nm, TrType(arg.Type)));
-        bvs.Add(bv);
-        args.Add(new Bpl.IdentifierExpr(arg.Tok, bv));
-      }
-    }
-
-    // This one says that this is /directly/ allocated, not that its "children" are,
-    // i.e. h[x, alloc]
-    public Bpl.Expr IsAlloced(IToken tok, Bpl.Expr heapExpr, Bpl.Expr e) {
-      Contract.Requires(tok != null);
-      Contract.Requires(heapExpr != null);
-      Contract.Requires(e != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      return ReadHeap(tok, heapExpr, e, predef.Alloc(tok), Bpl.Type.Bool);
-    }
-
-    public static Bpl.Expr ReadHeap(IToken tok, Expr heap, Expr r, Expr f, Bpl.Type ty = null) {
-      Contract.Requires(tok != null);
-      Contract.Requires(heap != null);
-      Contract.Requires(r != null);
-      Contract.Requires(f != null);
-      Contract.Ensures(Contract.Result<Bpl.NAryExpr>() != null);
-
-      List<Bpl.Expr> args = new List<Bpl.Expr>();
-      args.Add(heap);
-      args.Add(r);
-      args.Add(f);
-      Bpl.Type t = (f.Type != null) ? f.Type : f.ShallowType;
-      Bpl.Expr readCall =
-        new Bpl.NAryExpr(tok,
-          new Bpl.FunctionCall(new Bpl.IdentifierExpr(tok, "read", t.AsCtor.Arguments[0])),
-          args);
-      // Add a type coercion if supplied
-      if (ty is not null) {
-        Contract.Assert(ty.Equals(t.AsCtor.Arguments[0]));
-      }
-      return ty is null ? readCall : Bpl.Expr.CoerceType(tok, readCall, ty);
-    }
-
-    public static Bpl.NAryExpr ReadHeap(IToken tok, Expr heap, Expr r) {
-      Contract.Requires(tok != null);
-      Contract.Requires(heap != null);
-      Contract.Requires(r != null);
-      Contract.Ensures(Contract.Result<Bpl.NAryExpr>() != null);
-
-      List<Bpl.Expr> args = new List<Bpl.Expr>();
-      args.Add(heap);
-      args.Add(r);
-      return new Bpl.NAryExpr(tok,
-        new Bpl.MapSelect(tok, 1),
-        args);
-    }
-
-    public static Boogie.NAryExpr UpdateHeap(IToken tok, Expr heap, Expr r, Expr f, Expr v) {
-      Contract.Requires(tok != null);
-      Contract.Requires(heap != null);
-      Contract.Requires(r != null);
-      Contract.Requires(f != null);
-      Contract.Requires(v != null);
-      Contract.Ensures(Contract.Result<Boogie.NAryExpr>() != null);
-
-      List<Boogie.Expr> args = new List<Boogie.Expr>();
-      args.Add(heap);
-      args.Add(r);
-      args.Add(f);
-      args.Add(v);
-      return new Boogie.NAryExpr(tok,
-        new Boogie.FunctionCall(new Boogie.IdentifierExpr(tok, "update", heap.Type)),
-        args);
-    }
-
-    public Bpl.Expr DType(Bpl.Expr e, Bpl.Expr type) {
-      return Bpl.Expr.Eq(FunctionCall(e.tok, BuiltinFunction.DynamicType, null, e), type);
-    }
-
-    public Bpl.Expr GetArrayIndexFieldName(IToken tok, List<Bpl.Expr> indices) {
-      Bpl.Expr fieldName = null;
-      foreach (Bpl.Expr index in indices) {
-        if (fieldName == null) {
-          // the index in dimension 0:  IndexField(index0)
-          fieldName = FunctionCall(tok, BuiltinFunction.IndexField, null, index);
-        } else {
-          // the index in dimension n:  MultiIndexField(...field name for first n indices..., index_n)
-          fieldName = FunctionCall(tok, BuiltinFunction.MultiIndexField, null, fieldName, index);
-        }
-      }
-      return fieldName;
-    }
-
-    /// <summary>
-    /// Returns true if the body of function "f" is available in module "context".
-    /// This happens when the following conditions all hold:
-    ///   - "f" has a body
-    ///   - "f" is not opaque
-    /// </summary>
-    static bool FunctionBodyIsAvailable(Function f, ModuleDefinition context, VisibilityScope scope, bool revealProtectedBody) {
-      Contract.Requires(f != null);
-      Contract.Requires(context != null);
-      return f.Body != null && !IsOpaque(f) && f.IsRevealedInScope(scope);
-    }
-    static bool IsOpaque(MemberDecl f) {
-      Contract.Requires(f != null);
-      return Attributes.Contains(f.Attributes, "opaque") || f.IsOpaque;
-    }
-    static bool IsOpaqueRevealLemma(Method m) {
-      Contract.Requires(m != null);
-      return Attributes.Contains(m.Attributes, "opaque_reveal");
-    }
-
-    void AddIteratorSpecAndBody(IteratorDecl iter) {
-      Contract.Requires(iter != null);
-      Contract.Ensures(fuelContext == Contract.OldValue(fuelContext));
-
-      FuelContext oldFuelContext = this.fuelContext;
-      this.fuelContext = FuelSetting.NewFuelContext(iter);
-      isAllocContext = new IsAllocContext(options, false);
-
-      // wellformedness check for method specification
-      Bpl.Procedure proc = AddIteratorProc(iter, MethodTranslationKind.SpecWellformedness);
-      sink.AddTopLevelDeclaration(proc);
-      if (InVerificationScope(iter)) {
-        AddWellformednessCheck(iter, proc);
-      }
-      // the method itself
-      if (iter.Body != null && InVerificationScope(iter)) {
-        proc = AddIteratorProc(iter, MethodTranslationKind.Implementation);
-        sink.AddTopLevelDeclaration(proc);
-        // ...and its implementation
-        AddIteratorImpl(iter, proc);
-      }
-      this.fuelContext = oldFuelContext;
-      isAllocContext = null;
-    }
-
-    Bpl.Procedure AddIteratorProc(IteratorDecl iter, MethodTranslationKind kind) {
-      Contract.Requires(iter != null);
-      Contract.Requires(kind == MethodTranslationKind.SpecWellformedness || kind == MethodTranslationKind.Implementation);
-      Contract.Requires(predef != null);
-      Contract.Requires(currentModule == null && codeContext == null);
-      Contract.Ensures(currentModule == null && codeContext == null);
-      Contract.Ensures(Contract.Result<Bpl.Procedure>() != null);
-
-      currentModule = iter.EnclosingModuleDefinition;
-      codeContext = iter;
-
-      var etran = new ExpressionTranslator(this, predef, iter.tok);
-
-      var inParams = new List<Bpl.Variable>();
-      List<Variable> outParams;
-      GenerateMethodParametersChoose(iter.tok, iter, kind, true, true, false, etran, inParams, out outParams);
-
-      var req = new List<Bpl.Requires>();
-      var mod = new List<Bpl.IdentifierExpr>();
-      var ens = new List<Bpl.Ensures>();
-      // FREE PRECONDITIONS
-      if (kind == MethodTranslationKind.SpecWellformedness || kind == MethodTranslationKind.Implementation) {  // the other cases have no need for a free precondition
-        // free requires mh == ModuleContextHeight && fh = FunctionContextHeight;
-        req.Add(Requires(iter.tok, true, etran.HeightContext(iter), null, null, null));
-      }
-      mod.Add(etran.HeapCastToIdentifierExpr);
-
-      if (kind != MethodTranslationKind.SpecWellformedness) {
-        // USER-DEFINED SPECIFICATIONS
-        var comment = "user-defined preconditions";
-        foreach (var p in iter.Requires) {
-          var (errorMessage, successMessage) = CustomErrorMessage(p.Attributes);
-          if (p.Label != null && kind == MethodTranslationKind.Implementation) {
-            // don't include this precondition here, but record it for later use
-            p.Label.E = etran.Old.TrExpr(p.E);
-          } else {
-            foreach (var s in TrSplitExprForMethodSpec(p.E, etran, kind)) {
-              if (kind == MethodTranslationKind.Call && RefinementToken.IsInherited(s.Tok, currentModule)) {
-                // this precondition was inherited into this module, so just ignore it
-              } else {
-                req.Add(Requires(s.Tok, s.IsOnlyFree, s.E, errorMessage, successMessage, comment));
-                comment = null;
-                // the free here is not linked to the free on the original expression (this is free things generated in the splitting.)
-              }
-            }
-          }
-        }
-        comment = "user-defined postconditions";
-        foreach (var p in iter.Ensures) {
-          foreach (var s in TrSplitExprForMethodSpec(p.E, etran, kind)) {
-            if (kind == MethodTranslationKind.Implementation && RefinementToken.IsInherited(s.Tok, currentModule)) {
-              // this postcondition was inherited into this module, so just ignore it
-            } else {
-              ens.Add(Ensures(s.Tok, s.IsOnlyFree, s.E, null, null, comment));
-              comment = null;
-            }
-          }
-        }
-        foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(iter.tok, iter.Modifies.Expressions, false, iter.AllowsAllocation, etran.Old, etran, etran.Old)) {
-          ens.Add(Ensures(tri.tok, tri.IsFree, tri.Expr, tri.ErrorMessage, tri.SuccessMessage, tri.Comment));
-        }
-      }
-
-      var name = MethodName(iter, kind);
-      var proc = new Bpl.Procedure(iter.tok, name, new List<Bpl.TypeVariable>(), inParams, outParams, false, req, mod, ens, etran.TrAttributes(iter.Attributes, null));
-      AddVerboseName(proc, iter.FullDafnyName, kind);
-
-      currentModule = null;
-      codeContext = null;
-
-      return proc;
-    }
-
-    void AddEnsures(List<Bpl.Ensures> list, Bpl.Ensures ens) {
-      list.Add(ens);
-      if (!ens.Free) {
-        this.assertionCount++;
-      }
-    }
-
-    void AddWellformednessCheck(IteratorDecl iter, Procedure proc) {
-      Contract.Requires(iter != null);
-      Contract.Requires(proc != null);
-      Contract.Requires(currentModule == null && codeContext == null);
-      Contract.Ensures(currentModule == null && codeContext == null);
-
-      currentModule = iter.EnclosingModuleDefinition;
-      codeContext = iter;
-
-      List<Variable> inParams = Bpl.Formal.StripWhereClauses(proc.InParams);
-      Contract.Assert(1 <= inParams.Count);  // there should at least be a receiver parameter
-      Contract.Assert(proc.OutParams.Count == 0);
-
-      var builder = new BoogieStmtListBuilder(this, options);
-      var etran = new ExpressionTranslator(this, predef, iter.tok);
-      var localVariables = new List<Variable>();
-      GenerateIteratorImplPrelude(iter, inParams, new List<Variable>(), builder, localVariables);
-
-      // check well-formedness of any default-value expressions (before assuming preconditions)
-      foreach (var formal in iter.Ins.Where(formal => formal.DefaultValue != null)) {
-        var e = formal.DefaultValue;
-        CheckWellformed(e, new WFOptions(null, false, false, true), localVariables, builder, etran);
-        builder.Add(new Bpl.AssumeCmd(e.tok, CanCallAssumption(e, etran)));
-        CheckSubrange(e.tok, etran.TrExpr(e), e.Type, formal.Type, builder);
-      }
-      // check well-formedness of the preconditions, and then assume each one of them
-      foreach (var p in iter.Requires) {
-        CheckWellformedAndAssume(p.E, new WFOptions(), localVariables, builder, etran);
-      }
-      // check well-formedness of the modifies and reads clauses
-      CheckFrameWellFormed(new WFOptions(), iter.Modifies.Expressions, localVariables, builder, etran);
-      CheckFrameWellFormed(new WFOptions(), iter.Reads.Expressions, localVariables, builder, etran);
-      // check well-formedness of the decreases clauses
-      foreach (var p in iter.Decreases.Expressions) {
-        CheckWellformed(p, new WFOptions(), localVariables, builder, etran);
-      }
-
-      // Next, we assume about this.* whatever we said that the iterator constructor promises
-      foreach (var p in iter.Member_Init.Ens) {
-        builder.Add(TrAssumeCmd(p.E.tok, etran.TrExpr(p.E)));
-      }
-
-      // play havoc with the heap, except at the locations prescribed by (this._reads - this._modifies - {this})
-      var th = new ThisExpr(iter);  // resolve here
-      var rds = new MemberSelectExpr(iter.tok, th, iter.Member_Reads);
-      var mod = new MemberSelectExpr(iter.tok, th, iter.Member_Modifies);
-      builder.Add(new Bpl.CallCmd(iter.tok, "$IterHavoc0",
-        new List<Bpl.Expr>() { etran.TrExpr(th), etran.TrExpr(rds), etran.TrExpr(mod) },
-        new List<Bpl.IdentifierExpr>()));
-
-      // assume the automatic yield-requires precondition (which is always well-formed):  this.Valid()
-      var validCall = new FunctionCallExpr(iter.tok, "Valid", th, iter.tok, iter.tok, new List<Expression>());
-      validCall.Function = iter.Member_Valid;  // resolve here
-      validCall.Type = Type.Bool;  // resolve here
-      validCall.TypeApplication_AtEnclosingClass = iter.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));  // resolve here
-      validCall.TypeApplication_JustFunction = new List<Type>(); // resolved here
-
-      builder.Add(TrAssumeCmd(iter.tok, etran.TrExpr(validCall)));
-
-      // check well-formedness of the user-defined part of the yield-requires
-      foreach (var p in iter.YieldRequires) {
-        CheckWellformedAndAssume(p.E, new WFOptions(), localVariables, builder, etran);
-      }
-
-      // save the heap (representing the state where yield-requires holds):  $_OldIterHeap := Heap;
-      var oldIterHeap = new Bpl.LocalVariable(iter.tok, new Bpl.TypedIdent(iter.tok, "$_OldIterHeap", predef.HeapType));
-      localVariables.Add(oldIterHeap);
-      builder.Add(Bpl.Cmd.SimpleAssign(iter.tok, new Bpl.IdentifierExpr(iter.tok, oldIterHeap), etran.HeapExpr));
-      // simulate a modifies this, this._modifies, this._new;
-      var nw = new MemberSelectExpr(iter.tok, th, iter.Member_New);
-      builder.Add(new Bpl.CallCmd(iter.tok, "$IterHavoc1",
-        new List<Bpl.Expr>() { etran.TrExpr(th), etran.TrExpr(mod), etran.TrExpr(nw) },
-        new List<Bpl.IdentifierExpr>()));
-      // assume the implicit postconditions promised by MoveNext:
-      // assume fresh(_new - old(_new));
-      var yeEtran = new ExpressionTranslator(this, predef, etran.HeapExpr, new Bpl.IdentifierExpr(iter.tok, "$_OldIterHeap", predef.HeapType));
-      var old_nw = new OldExpr(iter.tok, nw);
-      old_nw.Type = nw.Type;  // resolve here
-      var setDiff = new BinaryExpr(iter.tok, BinaryExpr.Opcode.Sub, nw, old_nw);
-      setDiff.ResolvedOp = BinaryExpr.ResolvedOpcode.SetDifference; setDiff.Type = nw.Type;  // resolve here
-      Expression cond = new FreshExpr(iter.tok, setDiff);
-      cond.Type = Type.Bool;  // resolve here
-      builder.Add(TrAssumeCmd(iter.tok, yeEtran.TrExpr(cond)));
-
-      // check wellformedness of postconditions
-      var yeBuilder = new BoogieStmtListBuilder(this, options);
-      var endBuilder = new BoogieStmtListBuilder(this, options);
-      // In the yield-ensures case:  assume this.Valid();
-      yeBuilder.Add(TrAssumeCmd(iter.tok, yeEtran.TrExpr(validCall)));
-      Contract.Assert(iter.OutsFields.Count == iter.OutsHistoryFields.Count);
-      for (int i = 0; i < iter.OutsFields.Count; i++) {
-        var y = iter.OutsFields[i];
-        var ys = iter.OutsHistoryFields[i];
-        var thisY = new MemberSelectExpr(iter.tok, th, y);
-        var thisYs = new MemberSelectExpr(iter.tok, th, ys);
-        var oldThisYs = new OldExpr(iter.tok, thisYs);
-        oldThisYs.Type = thisYs.Type;  // resolve here
-        var singleton = new SeqDisplayExpr(iter.tok, new List<Expression>() { thisY });
-        singleton.Type = thisYs.Type;  // resolve here
-        var concat = new BinaryExpr(iter.tok, BinaryExpr.Opcode.Add, oldThisYs, singleton);
-        concat.ResolvedOp = BinaryExpr.ResolvedOpcode.Concat; concat.Type = oldThisYs.Type;  // resolve here
-
-        // In the yield-ensures case:  assume this.ys == old(this.ys) + [this.y];
-        yeBuilder.Add(TrAssumeCmd(iter.tok, Bpl.Expr.Eq(yeEtran.TrExpr(thisYs), yeEtran.TrExpr(concat))));
-        // In the ensures case:  assume this.ys == old(this.ys);
-        endBuilder.Add(TrAssumeCmd(iter.tok, Bpl.Expr.Eq(yeEtran.TrExpr(thisYs), yeEtran.TrExpr(oldThisYs))));
-      }
-
-      foreach (var p in iter.YieldEnsures) {
-        CheckWellformedAndAssume(p.E, new WFOptions(), localVariables, yeBuilder, yeEtran);
-      }
-      foreach (var p in iter.Ensures) {
-        CheckWellformedAndAssume(p.E, new WFOptions(), localVariables, endBuilder, yeEtran);
-      }
-      builder.Add(new Bpl.IfCmd(iter.tok, null, yeBuilder.Collect(iter.tok), null, endBuilder.Collect(iter.tok)));
-
-      Bpl.StmtList stmts = builder.Collect(iter.tok);
-
-      if (EmitImplementation(iter.Attributes)) {
-        QKeyValue kv = etran.TrAttributes(iter.Attributes, null);
-        AddImplementationWithVerboseName(GetToken(iter), proc, inParams, new List<Variable>(),
-          localVariables, stmts, kv);
-      }
-
-      Reset();
-    }
-
-    private Implementation AddImplementationWithVerboseName(IToken tok, Procedure proc, List<Variable> inParams,
-      List<Variable> outParams, List<Variable> localVariables, StmtList stmts, QKeyValue kv) {
-      Bpl.Implementation impl = new Bpl.Implementation(tok, proc.Name,
-        new List<Bpl.TypeVariable>(), inParams, outParams,
-        localVariables, stmts, kv);
-      AddVerboseName(impl, proc.VerboseName);
-      sink.AddTopLevelDeclaration(impl);
-      return impl;
-    }
-
-    bool EmitImplementation(Attributes attributes) {
-      // emit the impl only when there are proof obligations
-      if (assertionCount > 0) {
-        return true;
-      } else {
-        return false;
-      }
-    }
-    void AddIteratorImpl(IteratorDecl iter, Bpl.Procedure proc) {
-      Contract.Requires(iter != null);
-      Contract.Requires(proc != null);
-      Contract.Requires(sink != null && predef != null);
-      Contract.Requires(iter.Body != null);
-      Contract.Requires(currentModule == null && codeContext == null && yieldCountVariable == null && _tmpIEs.Count == 0);
-      Contract.Ensures(currentModule == null && codeContext == null && yieldCountVariable == null && _tmpIEs.Count == 0);
-
-      currentModule = iter.EnclosingModuleDefinition;
-      codeContext = iter;
-
-      List<Variable> inParams = Bpl.Formal.StripWhereClauses(proc.InParams);
-      Contract.Assert(1 <= inParams.Count);  // there should at least be a receiver parameter
-      Contract.Assert(proc.OutParams.Count == 0);
-
-      var builder = new BoogieStmtListBuilder(this, options);
-      var etran = new ExpressionTranslator(this, predef, iter.tok);
-      var localVariables = new List<Variable>();
-      GenerateIteratorImplPrelude(iter, inParams, new List<Variable>(), builder, localVariables);
-
-      // add locals for the yield-history variables and the extra variables
-      // Assume the precondition and postconditions of the iterator constructor method
-      foreach (var p in iter.Member_Init.Req) {
-        if (p.Label != null) {
-          // don't include this precondition here
-          Contract.Assert(p.Label.E != null);  // it should already have been recorded
-        } else {
-          builder.Add(TrAssumeCmd(p.E.tok, etran.TrExpr(p.E)));
-        }
-      }
-      foreach (var p in iter.Member_Init.Ens) {
-        // these postconditions are two-state predicates, but that's okay, because we haven't changed anything yet
-        builder.Add(TrAssumeCmd(p.E.tok, etran.TrExpr(p.E)));
-      }
-      // add the _yieldCount variable, and assume its initial value to be 0
-      yieldCountVariable = new Bpl.LocalVariable(iter.tok,
-        new Bpl.TypedIdent(iter.tok, iter.YieldCountVariable.AssignUniqueName(currentDeclaration.IdGenerator), TrType(iter.YieldCountVariable.Type)));
-      yieldCountVariable.TypedIdent.WhereExpr = YieldCountAssumption(iter, etran);  // by doing this after setting "yieldCountVariable", the variable can be used by YieldCountAssumption
-      localVariables.Add(yieldCountVariable);
-      builder.Add(TrAssumeCmd(iter.tok, Bpl.Expr.Eq(new Bpl.IdentifierExpr(iter.tok, yieldCountVariable), Bpl.Expr.Literal(0))));
-      // add a variable $_OldIterHeap
-      var oih = new Bpl.IdentifierExpr(iter.tok, "$_OldIterHeap", predef.HeapType);
-      Bpl.Expr wh = BplAnd(
-        FunctionCall(iter.tok, BuiltinFunction.IsGoodHeap, null, oih),
-        HeapSucc(oih, etran.HeapExpr));
-      localVariables.Add(new Bpl.LocalVariable(iter.tok, new Bpl.TypedIdent(iter.tok, "$_OldIterHeap", predef.HeapType, wh)));
-
-      // do an initial YieldHavoc
-      YieldHavoc(iter.tok, iter, builder, etran);
-
-      // translate the body of the iterator
-      var stmts = TrStmt2StmtList(builder, iter.Body, localVariables, etran);
-
-      if (EmitImplementation(iter.Attributes)) {
-        // emit the impl only when there are proof obligations.
-        QKeyValue kv = etran.TrAttributes(iter.Attributes, null);
-
-        AddImplementationWithVerboseName(GetToken(iter), proc, inParams,
-          new List<Variable>(), localVariables, stmts, kv);
-      }
-
-      yieldCountVariable = null;
-      Reset();
-    }
-
-    private void Reset() {
-      currentModule = null;
-      codeContext = null;
-      CurrentIdGenerator.Reset();
-      _tmpIEs.Clear();
-      assertionCount = 0;
-    }
-
-    Bpl.Expr YieldCountAssumption(IteratorDecl iter, ExpressionTranslator etran) {
-      Contract.Requires(iter != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(yieldCountVariable != null);
-      Bpl.Expr wh = Bpl.Expr.True;
-      foreach (var ys in iter.OutsHistoryFields) {
-        // add the conjunct:  _yieldCount == |this.ys|
-        wh = Bpl.Expr.And(wh, Bpl.Expr.Eq(new Bpl.IdentifierExpr(iter.tok, yieldCountVariable),
-          FunctionCall(iter.tok, BuiltinFunction.SeqLength, null,
-          ReadHeap(iter.tok, etran.HeapExpr,
-            new Bpl.IdentifierExpr(iter.tok, etran.This, predef.RefType),
-            new Bpl.IdentifierExpr(iter.tok, GetField(ys))))));
-      }
-      return wh;
-    }
-
-    public static Bpl.QKeyValue InlineAttribute(Bpl.IToken tok, Bpl.QKeyValue/*?*/ next = null) {
-      Contract.Requires(tok != null);
-      return new QKeyValue(tok, "inline", new List<object>(), next);
-    }
-
-    class Specialization {
-      public readonly List<Formal/*!*/> Formals;
-      public readonly List<Expression/*!*/> ReplacementExprs;
-      public readonly List<BoundVar/*!*/> ReplacementFormals;
-      public readonly Dictionary<IVariable, Expression> SubstMap;
-      readonly Translator translator;
-      [ContractInvariantMethod]
-      void ObjectInvariant() {
-        Contract.Invariant(cce.NonNullElements(Formals));
-        Contract.Invariant(cce.NonNullElements(ReplacementExprs));
-        Contract.Invariant(Formals.Count == ReplacementExprs.Count);
-        Contract.Invariant(cce.NonNullElements(ReplacementFormals));
-        Contract.Invariant(SubstMap != null);
-      }
-
-      public Specialization(IVariable formal, MatchCase mc, Specialization prev, Translator translator) {
-        Contract.Requires(formal is Formal || formal is BoundVar);
-        Contract.Requires(mc != null);
-        Contract.Requires(prev == null || formal is BoundVar || !prev.Formals.Contains((Formal)formal));
-        Contract.Requires(translator != null);
-
-        this.translator = translator;
-
-        List<Expression> rArgs = new List<Expression>();
-        foreach (BoundVar p in mc.Arguments) {
-          IdentifierExpr ie = new IdentifierExpr(p.tok, p.AssignUniqueName(translator.currentDeclaration.IdGenerator));
-          ie.Var = p; ie.Type = ie.Var.Type;  // resolve it here
-          rArgs.Add(ie);
-        }
-        // create and resolve datatype value
-        var r = new DatatypeValue(mc.tok, mc.Ctor.EnclosingDatatype.Name, mc.Ctor.Name, rArgs);
-        r.Ctor = mc.Ctor;
-        r.Type = new UserDefinedType(mc.tok, mc.Ctor.EnclosingDatatype.Name, new List<Type>()/*this is not right, but it seems like it won't matter here*/);
-
-        Dictionary<IVariable, Expression> substMap = new Dictionary<IVariable, Expression>();
-        substMap.Add(formal, r);
-
-        // Fill in the fields
-        Formals = new List<Formal>();
-        ReplacementExprs = new List<Expression>();
-        ReplacementFormals = new List<BoundVar>();
-        SubstMap = new Dictionary<IVariable, Expression>();
-        if (prev != null) {
-          Formals.AddRange(prev.Formals);
-          foreach (var e in prev.ReplacementExprs) {
-            ReplacementExprs.Add(Translator.Substitute(e, null, substMap));
-          }
-          foreach (var rf in prev.ReplacementFormals) {
-            if (rf != formal) {
-              ReplacementFormals.Add(rf);
-            }
-          }
-          foreach (var entry in prev.SubstMap) {
-            SubstMap.Add(entry.Key, Translator.Substitute(entry.Value, null, substMap));
-          }
-        }
-        if (formal is Formal) {
-          Formals.Add((Formal)formal);
-          ReplacementExprs.Add(r);
-        }
-        ReplacementFormals.AddRange(mc.Arguments);
-        SubstMap.Add(formal, r);
-      }
-    }
-
-    void AddFunctionAxiom(Bpl.Function boogieFunction, Function f, Expression body) {
-      Contract.Requires(f != null);
-      Contract.Requires(body != null);
-
-      var ax = GetFunctionAxiom(f, body, null);
-      AddOtherDefinition(boogieFunction, ax);
-      // TODO(namin) Is checking f.Reads.Count==0 excluding Valid() of BinaryTree in the right way?
-      //             I don't see how this in the decreasing clause would help there.
-      if (!(f is ExtremePredicate) && f.CoClusterTarget == Function.CoCallClusterInvolvement.None && f.Reads.Count == 0) {
-        var FVs = new HashSet<IVariable>();
-        Type usesThis = null;
-        bool dontCare0 = false, dontCare1 = false;
-        var dontCareHeapAt = new HashSet<Label>();
-        foreach (var e in f.Decreases.Expressions) {
-          FreeVariablesUtil.ComputeFreeVariables(options, e, FVs, ref dontCare0, ref dontCare1, dontCareHeapAt, ref usesThis, false);
-        }
-
-        var allFormals = new List<Formal>();
-        var decs = new List<Formal>();
-        if (f.IsStatic) {
-          Contract.Assert(usesThis == null);
-        } else {
-          var surrogate = new ThisSurrogate(f.tok, ModuleResolver.GetReceiverType(f.tok, f));
-          allFormals.Add(surrogate);
-          if (usesThis != null) {
-            decs.Add(surrogate);
-          }
-        }
-        foreach (var formal in f.Formals) {
-          allFormals.Add(formal);
-          if (FVs.Contains(formal)) {
-            decs.Add(formal);
-          }
-        }
-
-        Contract.Assert(decs.Count <= allFormals.Count);
-        if (0 < decs.Count && decs.Count < allFormals.Count) {
-          var decreasesAxiom = GetFunctionAxiom(f, body, decs);
-          AddOtherDefinition(boogieFunction, decreasesAxiom);
-        }
-
-        var formalsAxiom = GetFunctionAxiom(f, body, allFormals);
-        AddOtherDefinition(boogieFunction, formalsAxiom);
-      }
-    }
-
-    void AddFunctionConsequenceAxiom(Boogie.Function boogieFunction, Function f, List<AttributedExpression> ens) {
-      Contract.Requires(f != null);
-      Contract.Requires(predef != null);
-      Contract.Requires(f.EnclosingClass != null);
-
-      bool readsHeap = f.ReadsHeap;
-      foreach (AttributedExpression e in f.Req.Concat(ens)) {
-        readsHeap = readsHeap || UsesHeap(e.E);
-      }
-
-      ExpressionTranslator etranHeap;
-      ExpressionTranslator etran;
-      Bpl.BoundVariable bvPrevHeap = null;
-      if (f is TwoStateFunction) {
-        bvPrevHeap = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$prevHeap", predef.HeapType));
-        etran = new ExpressionTranslator(this, predef,
-          f.ReadsHeap ? new Bpl.IdentifierExpr(f.tok, predef.HeapVarName, predef.HeapType) : null,
-          new Bpl.IdentifierExpr(f.tok, bvPrevHeap));
-        etranHeap = etran;
-      } else {
-        etranHeap = new ExpressionTranslator(this, predef, f.tok);
-        etran = readsHeap ? etranHeap : new ExpressionTranslator(this, predef, (Bpl.Expr)null);
-      }
-
-      // This method generate the Consequence Axiom, which has information about the function's
-      // return type and postconditions
-      //
-      // axiom  // consequence axiom
-      //   AXIOM_ACTIVATION
-      //   ==>
-      //   (forall s, $Heap, formals ::                  // let args := $Heap,formals
-      //       { f(s, args) }
-      //       f#canCall(args) || USE_VIA_CONTEXT
-      //       ==>
-      //       ens &&
-      //       OlderCondition &&
-      //       f(s, args)-has-the-expected type);
-      //
-      // where:
-      //
-      // AXIOM_ACTIVATION
-      // means:
-      //   fh <= FunctionContextHeight
-      //
-      // USE_VIA_CONTEXT
-      //   fh < FunctionContextHeight &&
-      //   GOOD_PARAMETERS
-      // where GOOD_PARAMETERS means:
-      //   $IsGoodHeap($Heap) && this != null && formals-have-the-expected-types &&
-      //   Pre($Heap,formals)
-      //
-      // OlderCondition is added if the function has some 'older' parameters.
-      //
-      // Note, an antecedent $Heap[this,alloc] is intentionally left out:  including it would only weaken
-      // the axiom.  Moreover, leaving it out does not introduce any soundness problem, because the Dafny
-      // allocation statement changes only an allocation bit and then re-assumes $IsGoodHeap; so if it is
-      // sound after that, then it would also have been sound just before the allocation.
-      //
-      List<Bpl.Expr> tyargs;
-      var formals = MkTyParamBinders(GetTypeParams(f), out tyargs);
-      var args = new List<Bpl.Expr>();
-      var olderInParams = new List<Bpl.Variable>(); // for use with older-condition
-      Bpl.BoundVariable layer;
-      if (f.IsFuelAware()) {
-        layer = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$ly", predef.LayerType));
-        formals.Add(layer);
-        etran = etran.WithCustomFuelSetting(new CustomFuelSettings { { f, new FuelSetting(this, 0, new Bpl.IdentifierExpr(f.tok, layer)) } });
-        //etran = etran.WithLayer(new Bpl.IdentifierExpr(f.tok, layer));
-        // Note, "layer" is not added to "args" here; rather, that's done below, as needed
-      } else {
-        layer = null;
-      }
-
-      Bpl.BoundVariable reveal;
-      if (f.IsOpaque) {
-        reveal = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$reveal", Boogie.Type.Bool));
-        formals.Add(reveal);
-      } else {
-        reveal = null;
-      }
-
-      Bpl.Expr ante = Bpl.Expr.True;
-      Bpl.Expr anteIsAlloc = Bpl.Expr.True;
-      if (f is TwoStateFunction) {
-        Contract.Assert(bvPrevHeap != null);
-        formals.Add(bvPrevHeap);
-        args.Add(etran.Old.HeapExpr);
-        // ante:  $IsGoodHeap($prevHeap) &&
-        var goodHeap = FunctionCall(f.tok, BuiltinFunction.IsGoodHeap, null, etran.Old.HeapExpr);
-        ante = BplAnd(ante, goodHeap);
-        anteIsAlloc = BplAnd(anteIsAlloc, goodHeap);
-      }
-      var bvHeap = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, predef.HeapVarName, predef.HeapType));
-      if (f.ReadsHeap) {
-        args.Add(new Bpl.IdentifierExpr(f.tok, bvHeap));
-      }
-      // ante:  $IsGoodHeap($Heap) && $HeapSucc($prevHeap, $Heap) && this != null && formals-have-the-expected-types &&
-      if (readsHeap) {
-        Bpl.Expr goodHeap = FunctionCall(f.tok, BuiltinFunction.IsGoodHeap, null, etranHeap.HeapExpr);
-        formals.Add(bvHeap);
-        ante = BplAnd(ante, goodHeap);
-        anteIsAlloc = BplAnd(anteIsAlloc, f.ReadsHeap ? goodHeap : Bpl.Expr.True);
-        if (f is TwoStateFunction) {
-          var heapSucc = HeapSucc(etran.Old.HeapExpr, etran.HeapExpr);
-          ante = BplAnd(ante, heapSucc);
-          anteIsAlloc = BplAnd(anteIsAlloc, f.ReadsHeap ? heapSucc : Bpl.Expr.True);
-        }
-      }
-
-      if (!f.IsStatic) {
-        var bvThis = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, etran.This, TrReceiverType(f)));
-        formals.Add(bvThis);
-        olderInParams.Add(bvThis);
-        var bvThisIdExpr = new Bpl.IdentifierExpr(f.tok, bvThis);
-        args.Add(bvThisIdExpr);
-        // add well-typedness conjunct to antecedent
-        Type thisType = ModuleResolver.GetReceiverType(f.tok, f);
-        Bpl.Expr wh = Bpl.Expr.And(
-          ReceiverNotNull(bvThisIdExpr),
-          (f is TwoStateFunction ? etran.Old : etran).GoodRef(f.tok, bvThisIdExpr, thisType));
-        ante = BplAnd(ante, wh);
-        anteIsAlloc = BplAnd(anteIsAlloc, ReceiverNotNull(bvThisIdExpr));
-        wh = GetWhereClause(f.tok, bvThisIdExpr, thisType, f is TwoStateFunction ? etranHeap.Old : etranHeap, ISALLOC, true);
-        if (wh != null) {
-          anteIsAlloc = BplAnd(anteIsAlloc, wh);
-        }
-      }
-      foreach (Formal p in f.Formals) {
-        var bv = new Bpl.BoundVariable(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(currentDeclaration.IdGenerator), TrType(p.Type)));
-        Bpl.Expr formal = new Bpl.IdentifierExpr(p.tok, bv);
-        formals.Add(bv);
-        olderInParams.Add(bv);
-        args.Add(formal);
-        // add well-typedness conjunct to antecedent
-        Bpl.Expr wh = GetWhereClause(p.tok, formal, p.Type, p.IsOld ? etran.Old : etran, NOALLOC);
-        if (wh != null) { ante = BplAnd(ante, wh); }
-        wh = GetWhereClause(p.tok, formal, p.Type, p.IsOld ? etranHeap.Old : etranHeap, ISALLOC);
-        if (wh != null) { anteIsAlloc = BplAnd(anteIsAlloc, wh); }
-      }
-
-      Bpl.Expr funcAppl;
-      {
-        var funcID = new Bpl.IdentifierExpr(f.tok, f.FullSanitizedName, TrType(f.ResultType));
-        var funcArgs = new List<Bpl.Expr>();
-        funcArgs.AddRange(tyargs);
-        /*
-        if (f.IsFueled) {
-            funcArgs.Add(etran.layerInterCluster.GetFunctionFuel(f));
-        } else if (layer != null) {
-           var ly = new Bpl.IdentifierExpr(f.tok, layer);
-           funcArgs.Add(FunctionCall(f.tok, BuiltinFunction.LayerSucc, null, ly));
-        }
-         */
-        if (layer != null) {
-          funcArgs.Add(new Bpl.IdentifierExpr(f.tok, layer));
-        }
-
-        if (reveal != null) {
-          funcArgs.Add(new Bpl.IdentifierExpr(f.tok, reveal));
-        }
-
-        funcArgs.AddRange(args);
-        funcAppl = new Bpl.NAryExpr(f.tok, new Bpl.FunctionCall(funcID), funcArgs);
-      }
-
-      Bpl.Expr pre = Bpl.Expr.True;
-      foreach (AttributedExpression req in f.Req) {
-        pre = BplAnd(pre, etran.TrExpr(req.E));
-      }
-      // useViaContext: fh < FunctionContextHeight
-      Expr useViaContext = !(InVerificationScope(f) || (f.EnclosingClass is TraitDecl))
-        ? Bpl.Expr.True
-        : Bpl.Expr.Lt(Expr.Literal(forModule.CallGraph.GetSCCRepresentativePredecessorCount(f)), etran.FunctionContextHeight());
-      // useViaCanCall: f#canCall(args)
-      Bpl.IdentifierExpr canCallFuncID = new Bpl.IdentifierExpr(f.tok, f.FullSanitizedName + "#canCall", Bpl.Type.Bool);
-      Bpl.Expr useViaCanCall = new Bpl.NAryExpr(f.tok, new Bpl.FunctionCall(canCallFuncID), Concat(tyargs, args));
-
-      // ante := useViaCanCall || (useViaContext && typeAnte && pre)
-      ante = Bpl.Expr.Or(useViaCanCall, BplAnd(useViaContext, BplAnd(ante, pre)));
-      anteIsAlloc = Bpl.Expr.Or(useViaCanCall, BplAnd(useViaContext, BplAnd(anteIsAlloc, pre)));
-
-      Bpl.Trigger tr = BplTriggerHeap(this, f.tok, funcAppl,
-        (f.ReadsHeap || !readsHeap) ? null : etran.HeapExpr);
-      Bpl.Expr post = Bpl.Expr.True;
-      // substitute function return value with the function call.
-      var substMap = new Dictionary<IVariable, Expression>();
-      if (f.Result != null) {
-        substMap.Add(f.Result, new BoogieWrapper(funcAppl, f.ResultType));
-      }
-      foreach (AttributedExpression p in ens) {
-        Bpl.Expr q = etran.TrExpr(Substitute(p.E, null, substMap));
-        post = BplAnd(post, q);
-      }
-      var (olderParameterCount, olderCondition) = OlderCondition(f, funcAppl, olderInParams);
-      if (olderParameterCount != 0) {
-        post = BplAnd(post, olderCondition);
-      }
-      Bpl.Expr whr = GetWhereClause(f.tok, funcAppl, f.ResultType, etran, NOALLOC);
-      if (whr != null) { post = Bpl.Expr.And(post, whr); }
-
-      Bpl.Expr ax = BplForall(f.tok, new List<Bpl.TypeVariable>(), formals, null, tr, Bpl.Expr.Imp(ante, post));
-      var activate = AxiomActivation(f, etran);
-      string comment = "consequence axiom for " + f.FullSanitizedName;
-      var consequenceAxiom = new Bpl.Axiom(f.tok, Bpl.Expr.Imp(activate, ax), comment);
-      AddOtherDefinition(boogieFunction, consequenceAxiom);
-
-      if (f.ResultType.MayInvolveReferences) {
-        whr = GetWhereClause(f.tok, funcAppl, f.ResultType, etranHeap, ISALLOC, true);
-        if (whr != null) {
-          if (readsHeap) {
-            Contract.Assert(formals.Contains(bvHeap));
-          } else {
-            formals = Util.Cons(bvHeap, formals);
-            var goodHeap = FunctionCall(f.tok, BuiltinFunction.IsGoodHeap, null, etranHeap.HeapExpr);
-            anteIsAlloc = BplAnd(anteIsAlloc, goodHeap);
-          }
-
-          ax = BplForall(f.tok, new List<Bpl.TypeVariable>(), formals, null, BplTrigger(whr), Bpl.Expr.Imp(anteIsAlloc, whr));
-
-          comment = "alloc consequence axiom for " + f.FullSanitizedName;
-          var allocConsequenceAxiom = new Bpl.Axiom(f.tok, Bpl.Expr.Imp(activate, ax), comment);
-          AddOtherDefinition(boogieFunction, allocConsequenceAxiom);
-        }
-      }
-    }
-
-    (int olderParameterCount, Bpl.Expr olderCondition) OlderCondition(Function f, Bpl.Expr funcAppl, List<Bpl.Variable> inParams) {
-      Contract.Requires(f != null);
-      Contract.Requires(funcAppl != null);
-      Contract.Requires(inParams != null);
-
-      var olderParameterCount = f.Formals.Count(formal => formal.IsOlder);
-      if (olderParameterCount == 0) {
-        // nothing to do
-        return (olderParameterCount, Bpl.Expr.True);
-      }
-
-      // For a function F(older x: X, y: Y), generate:
-      //     (forall h: Heap :: { OlderTag(h) }
-      //         IsGoodHeap(h) && OlderTag(h) && F(x, y) && IsAlloc(y, Y, h)
-      //         ==>  IsAlloc(x, X, h))
-      var heapVar = BplBoundVar("$olderHeap", predef.HeapType, out var heap);
-      var etran = new ExpressionTranslator(this, predef, heap);
-
-      var isGoodHeap = FunctionCall(f.tok, BuiltinFunction.IsGoodHeap, null, heap);
-      var olderTag = FunctionCall(f.tok, "$OlderTag", Bpl.Type.Bool, heap);
-      Bpl.Expr older = Bpl.Expr.True;
-      Bpl.Expr newer = Bpl.Expr.True;
-      var i = 0;
-      if (!f.IsStatic) {
-        var th = new Bpl.IdentifierExpr(f.tok, inParams[i]);
-        i++;
-        var wh = GetWhereClause(f.tok, th, ModuleResolver.GetReceiverType(f.tok, f), etran, ISALLOC, true);
-        newer = BplAnd(newer, wh);
-      }
-      foreach (var formal in f.Formals) {
-        var p = new Bpl.IdentifierExpr(f.tok, inParams[i]);
-        i++;
-        var wh = GetWhereClause(formal.tok, p, formal.Type, etran, ISALLOC, true);
-        if (wh != null) {
-          if (formal.IsOlder) {
-            older = BplAnd(older, wh);
-          } else {
-            newer = BplAnd(newer, wh);
-          }
-        }
-      }
-      Contract.Assert(i == inParams.Count); // we should have used all the given inParams by now
-
-      var body = BplImp(BplAnd(BplAnd(isGoodHeap, olderTag), BplAnd(funcAppl, newer)), older);
-      var tr = new Bpl.Trigger(f.tok, true, new List<Bpl.Expr> { olderTag });
-      var olderCondition = new Bpl.ForallExpr(f.tok, new List<Bpl.TypeVariable>(), new List<Variable>() { heapVar }, null, tr, body);
-      return (olderParameterCount, olderCondition);
-    }
-
-    Bpl.Expr AxiomActivation(Function f, ExpressionTranslator etran) {
-      Contract.Requires(f != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(VisibleInScope(f));
-      if (InVerificationScope(f)) {
-        return
-          Bpl.Expr.Le(Bpl.Expr.Literal(forModule.CallGraph.GetSCCRepresentativePredecessorCount(f)), etran.FunctionContextHeight());
-      } else {
-        return Bpl.Expr.True;
-      }
-    }
-
-    /// <summary>
-    /// The list of formals "lits" is allowed to contain an object of type ThisSurrogate, which indicates that
-    /// the receiver parameter of the function should be included among the lit formals.
-    /// </summary>
-    private Axiom GetFunctionAxiom(Function f, Expression body, List<Formal> lits) {
-      Contract.Requires(f != null);
-      Contract.Requires(predef != null);
-      Contract.Requires(f.EnclosingClass != null);
-      Contract.Ensures((Contract.Result<Axiom>() == null) == (body == null)); // return null iff body is null
-
-      // This method generates the Definition Axiom, suitably modified according to the optional "lits".
-      //
-      // axiom  // definition axiom
-      //   AXIOM_ACTIVATION
-      //   ==>
-      //   (forall s, $Heap, formals ::                  // let args := $Heap,formals
-      //       { f(Succ(s), args) }                      // (*)
-      //       (f#canCall(args) || USE_VIA_CONTEXT)
-      //       ==>
-      //       BODY-can-make-its-calls &&
-      //       f(Succ(s), args) == BODY);                // (*)
-      //
-      // where:
-      //
-      // AXIOM_ACTIVATION
-      // for visibility==ForeignModuleOnly, means:
-      //   true
-      // for visibility==IntraModuleOnly, means:
-      //   fh <= FunctionContextHeight
-      //
-      // USE_VIA_CONTEXT
-      // for visibility==ForeignModuleOnly, means:
-      //   GOOD_PARAMETERS
-      // for visibility==IntraModuleOnly, means:
-      //   fh < FunctionContextHeight &&
-      //   GOOD_PARAMETERS
-      // where GOOD_PARAMETERS means:
-      //   $IsGoodHeap($Heap) && this != null && formals-have-the-expected-types &&
-      //   Pre($Heap,formals)
-      //
-      // NOTE: this is lifted out to a #requires function for intra module calls,
-      //       and used in the function pseudo-handles for top level functions.
-      //       For body-less functions, this is emitted when body is null.
-      //
-      // BODY
-      // means:
-      //   the body of f translated with "s" as the layer argument
-      //
-      // The variables "formals" are the formals of function "f".
-      // The list "args" is the list of formals of function "f".
-      //
-      // The translation of "body" uses "s" as the layer argument for intra-cluster calls and the default layer argument
-      // (which is Succ(0)) for other calls.  Usually, the layer argument in the LHS of the definition (and also in the trigger,
-      // see the two occurrences of (*) above) use Succ(s) as the layer argument.  However, if "lits" are specified, then
-      // then the argument used is just "s" (in both the LHS and trigger).
-      //
-      // Note, an antecedent $Heap[this,alloc] is intentionally left out:  including it would only weaken
-      // the axiom.  Moreover, leaving it out does not introduce any soundness problem, because the Dafny
-      // allocation statement changes only an allocation bit and then re-assumes $IsGoodHeap; so if it is
-      // sound after that, then it would also have been sound just before the allocation.
-      //
-
-      bool readsHeap = f.ReadsHeap;
-      foreach (AttributedExpression e in f.Req) {
-        readsHeap = readsHeap || UsesHeap(e.E);
-      }
-
-      if (body != null && UsesHeap(body)) {
-        readsHeap = true;
-      }
-
-      ExpressionTranslator etran;
-      Bpl.BoundVariable bvPrevHeap = null;
-      if (f is TwoStateFunction) {
-        bvPrevHeap = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$prevHeap", predef.HeapType));
-        etran = new ExpressionTranslator(this, predef,
-          f.ReadsHeap ? new Bpl.IdentifierExpr(f.tok, predef.HeapVarName, predef.HeapType) : null,
-          new Bpl.IdentifierExpr(f.tok, bvPrevHeap));
-      } else {
-        etran = readsHeap
-          ? new ExpressionTranslator(this, predef, f.tok)
-          : new ExpressionTranslator(this, predef, (Bpl.Expr)null);
-      }
-
-      // quantify over the type arguments, and add them first to the arguments
-      List<Bpl.Expr> args = new List<Bpl.Expr>();
-      List<Bpl.Expr> tyargs = GetTypeArguments(f, null).ConvertAll(TypeToTy);
-
-      var forallFormals = MkTyParamBinders(GetTypeParams(f), out _);
-      var funcFormals = MkTyParamBinders(GetTypeParams(f), out _);
-      var reqFuncArguments = new List<Bpl.Expr>(tyargs);
-
-      Bpl.BoundVariable layer;
-      Bpl.BoundVariable reveal;
-      if (f.IsFuelAware()) {
-        layer = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$ly", predef.LayerType));
-        forallFormals.Add(layer);
-        funcFormals.Add(layer);
-        reqFuncArguments.Add(new Bpl.IdentifierExpr(f.tok, layer));
-        // Note, "layer" is not added to "args" here; rather, that's done below, as needed
-      } else {
-        layer = null;
-      }
-
-      if (f.IsOpaque) {
-        reveal = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$reveal", Boogie.Type.Bool));
-        //funcFormals.Add(reveal);
-        //reqFuncArguments.Add(new Bpl.IdentifierExpr(f.tok, reveal));
-        // Note, "reveal" is not added to "args" here; rather, that's done below, as needed
-      } else {
-        reveal = null;
-      }
-
-      Bpl.Expr ante = Bpl.Expr.True;
-      if (f is TwoStateFunction) {
-        Contract.Assert(bvPrevHeap != null);
-        forallFormals.Add(bvPrevHeap);
-        funcFormals.Add(bvPrevHeap);
-        args.Add(etran.Old.HeapExpr);
-        reqFuncArguments.Add(new Bpl.IdentifierExpr(f.tok, bvPrevHeap));
-        // ante:  $IsGoodHeap($prevHeap) &&
-        ante = BplAnd(ante, FunctionCall(f.tok, BuiltinFunction.IsGoodHeap, null, etran.Old.HeapExpr));
-      }
-
-      Bpl.Expr goodHeap = null;
-      var bv = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, predef.HeapVarName, predef.HeapType));
-      if (f.ReadsHeap) {
-        funcFormals.Add(bv);
-      }
-
-      if (f.ReadsHeap) {
-        args.Add(new Bpl.IdentifierExpr(f.tok, bv));
-        reqFuncArguments.Add(new Bpl.IdentifierExpr(f.tok, bv));
-      }
-
-      // ante:  $IsGoodHeap($Heap) && $HeapSucc($prevHeap, $Heap) && this != null && formals-have-the-expected-types &&
-      if (readsHeap) {
-        forallFormals.Add(bv);
-        goodHeap = FunctionCall(f.tok, BuiltinFunction.IsGoodHeap, null, etran.HeapExpr);
-        ante = BplAnd(ante, goodHeap);
-      }
-
-      if (f is TwoStateFunction && f.ReadsHeap) {
-        ante = BplAnd(ante, HeapSucc(etran.Old.HeapExpr, etran.HeapExpr));
-      }
-
-      Expression receiverReplacement = null;
-      if (!f.IsStatic) {
-        var bvThis = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, etran.This, TrReceiverType(f)));
-        forallFormals.Add(bvThis);
-        funcFormals.Add(bvThis);
-        reqFuncArguments.Add(new Bpl.IdentifierExpr(f.tok, bvThis));
-        var bvThisIdExpr = new Bpl.IdentifierExpr(f.tok, bvThis);
-        if (lits != null && lits.Exists(p => p is ThisSurrogate)) {
-          args.Add(Lit(bvThisIdExpr));
-          var th = new ThisExpr(f);
-          var l = new UnaryOpExpr(f.tok, UnaryOpExpr.Opcode.Lit, th) {
-            Type = th.Type
-          };
-          receiverReplacement = l;
-        } else {
-          args.Add(bvThisIdExpr);
-        }
-
-        // add well-typedness conjunct to antecedent
-        Type thisType = ModuleResolver.GetReceiverType(f.tok, f);
-        Bpl.Expr wh = Bpl.Expr.And(
-          ReceiverNotNull(bvThisIdExpr),
-          (f is TwoStateFunction ? etran.Old : etran).GoodRef(f.tok, bvThisIdExpr, thisType));
-        ante = BplAnd(ante, wh);
-      }
-
-      var typeMap = new Dictionary<TypeParameter, Type>();
-      var anteReqAxiom = ante; // note that antecedent so far is the same for #requires axioms, even the receiver parameter of a two-state function
-      var substMap = new Dictionary<IVariable, Expression>();
-      foreach (Formal p in f.Formals) {
-        var pType = p.Type.Subst(typeMap);
-        bv = new Bpl.BoundVariable(p.tok,
-          new Bpl.TypedIdent(p.tok, p.AssignUniqueName(currentDeclaration.IdGenerator), TrType(pType)));
-        forallFormals.Add(bv);
-        funcFormals.Add(bv);
-        reqFuncArguments.Add(new Bpl.IdentifierExpr(f.tok, bv));
-        Bpl.Expr formal = new Bpl.IdentifierExpr(p.tok, bv);
-        if (lits != null && lits.Contains(p) && !substMap.ContainsKey(p)) {
-          args.Add(Lit(formal));
-          var ie = new IdentifierExpr(p.tok, p.AssignUniqueName(f.IdGenerator));
-          ie.Var = p;
-          ie.Type = ie.Var.Type;
-          var l = new UnaryOpExpr(p.tok, UnaryOpExpr.Opcode.Lit, ie);
-          l.Type = ie.Var.Type;
-          substMap.Add(p, l);
-        } else {
-          args.Add(formal);
-        }
-
-        // add well-typedness conjunct to antecedent
-        Bpl.Expr wh = GetWhereClause(p.tok, formal, pType, p.IsOld ? etran.Old : etran, NOALLOC);
-        if (wh != null) {
-          ante = BplAnd(ante, wh);
-        }
-
-        wh = GetWhereClause(p.tok, formal, pType, etran, NOALLOC);
-        if (wh != null) {
-          anteReqAxiom = BplAnd(anteReqAxiom, wh);
-        }
-      }
-
-      Bpl.Expr pre = Bpl.Expr.True;
-      foreach (AttributedExpression req in f.Req) {
-        pre = BplAnd(pre, etran.TrExpr(Substitute(req.E, receiverReplacement, substMap)));
-      }
-
-      var preReqAxiom = pre;
-      if (f is TwoStateFunction) {
-        // Checked preconditions that old parameters really existed in previous state
-        var index = 0;
-        Bpl.Expr preRA = Bpl.Expr.True;
-        foreach (var formal in f.Formals) {
-          if (formal.IsOld) {
-            var dafnyFormalIdExpr = new IdentifierExpr(formal.tok, formal);
-            preRA = BplAnd(preRA, MkIsAlloc(etran.TrExpr(dafnyFormalIdExpr), formal.Type, etran.Old.HeapExpr));
-          }
-
-          index++;
-        }
-
-        preReqAxiom = BplAnd(preRA, pre);
-      }
-
-      // Add the precondition function and its axiom (which is equivalent to the anteReqAxiom)
-      if (body == null || (RevealedInScope(f) && lits == null)) {
-        var precondF = new Bpl.Function(f.tok,
-          RequiresName(f), new List<Bpl.TypeVariable>(),
-          funcFormals.ConvertAll(v => (Bpl.Variable)BplFormalVar(null, v.TypedIdent.Type, true)),
-          BplFormalVar(null, Bpl.Type.Bool, false));
-        sink.AddTopLevelDeclaration(precondF);
-
-        var appl = FunctionCall(f.tok, RequiresName(f), Bpl.Type.Bool, reqFuncArguments);
-        Bpl.Trigger trig = BplTriggerHeap(this, f.tok, appl, readsHeap ? etran.HeapExpr : null);
-        // axiom (forall params :: { f#requires(params) }  ante ==> f#requires(params) == pre);
-        AddOtherDefinition(precondF, new Axiom(f.tok,
-          BplForall(forallFormals, trig, BplImp(anteReqAxiom, Bpl.Expr.Eq(appl, preReqAxiom))),
-          "#requires axiom for " + f.FullSanitizedName));
-      }
-
-      if (body == null || !RevealedInScope(f)) {
-        return null;
-      }
-
-      // useViaContext: fh < FunctionContextHeight
-      ModuleDefinition mod = f.EnclosingClass.EnclosingModuleDefinition;
-      Bpl.Expr useViaContext = !InVerificationScope(f)
-        ? Bpl.Expr.True
-        : Bpl.Expr.Lt(Bpl.Expr.Literal(forModule.CallGraph.GetSCCRepresentativePredecessorCount(f)), etran.FunctionContextHeight());
-      // ante := (useViaContext && typeAnte && pre)
-      ante = BplAnd(useViaContext, BplAnd(ante, pre));
-
-      // useViaCanCall: f#canCall(args)
-      Bpl.IdentifierExpr canCallFuncID = new Bpl.IdentifierExpr(f.tok, f.FullSanitizedName + "#canCall", Bpl.Type.Bool);
-      Bpl.Expr useViaCanCall = new Bpl.NAryExpr(f.tok, new Bpl.FunctionCall(canCallFuncID), Concat(tyargs, args));
-
-      // ante := useViaCanCall || (useViaContext && typeAnte && pre)
-      ante = Bpl.Expr.Or(useViaCanCall, ante);
-
-      Bpl.Expr funcAppl;
-      {
-        var funcID = new Bpl.IdentifierExpr(f.tok, f.FullSanitizedName, TrType(f.ResultType));
-        var funcArgs = new List<Bpl.Expr>();
-        funcArgs.AddRange(tyargs);
-        if (layer != null) {
-          var ly = new Bpl.IdentifierExpr(f.tok, layer);
-          //if (lits == null) {
-          funcArgs.Add(LayerSucc(ly));
-          //} else {
-          //  funcArgs.Add(ly);
-          //}
-        }
-
-        if (reveal != null) {
-          funcArgs.Add(new Bpl.LiteralExpr(f.tok, true));
-        }
-
-        funcArgs.AddRange(args);
-        funcAppl = new Bpl.NAryExpr(f.tok, new Bpl.FunctionCall(funcID), funcArgs);
-      }
-
-      Bpl.Trigger tr = BplTriggerHeap(this, f.tok, funcAppl, readsHeap ? etran.HeapExpr : null);
-      Bpl.Expr tastyVegetarianOption; // a.k.a. the "meat" of the operation :)
-      if (!RevealedInScope(f)) {
-        tastyVegetarianOption = Bpl.Expr.True;
-      } else {
-        var bodyWithSubst = Substitute(body, receiverReplacement, substMap);
-        if (f is PrefixPredicate) {
-          var pp = (PrefixPredicate)f;
-          bodyWithSubst = PrefixSubstitution(pp, bodyWithSubst);
-        }
-
-        Bpl.Expr ly = null;
-        if (layer != null) {
-          ly = new Bpl.IdentifierExpr(f.tok, layer);
-          if (lits != null) {
-            // Lit axiom doesn't consume any fuel
-            ly = LayerSucc(ly);
-          }
-        }
-
-        var etranBody = layer == null ? etran : etran.LimitedFunctions(f, ly);
-        var trbody = etranBody.TrExpr(bodyWithSubst);
-        tastyVegetarianOption = BplAnd(CanCallAssumption(bodyWithSubst, etranBody),
-          BplAnd(TrFunctionSideEffect(bodyWithSubst, etranBody), Bpl.Expr.Eq(funcAppl, trbody)));
-      }
-
-      QKeyValue kv = null;
-      if (lits != null) {
-        kv = new QKeyValue(f.tok, "weight", new List<object>() { Bpl.Expr.Literal(3) }, null);
-      }
-
-      Bpl.Expr ax = BplForall(f.tok, new List<Bpl.TypeVariable>(), forallFormals, kv, tr,
-        Bpl.Expr.Imp(ante, tastyVegetarianOption));
-      var activate = AxiomActivation(f, etran);
-      string comment;
-      comment = "definition axiom for " + f.FullSanitizedName;
-      if (lits != null) {
-        if (lits.Count == f.Formals.Count + (f.IsStatic ? 0 : 1)) {
-          comment += " for all literals";
-        } else {
-          comment += " for decreasing-related literals";
-        }
-      }
-
-      if (RevealedInScope(f)) {
-        comment += " (revealed)";
-      } else {
-        comment += " (opaque)";
-      }
-      return new Axiom(f.tok, Bpl.Expr.Imp(activate, ax), comment);
-    }
-
-    Bpl.Type TrReceiverType(MemberDecl f) {
-      Contract.Requires(f != null);
-      return TrType(ModuleResolver.GetReceiverType(f.tok, f));
-    }
-
-    Bpl.Expr ReceiverNotNull(Bpl.Expr th) {
-      Contract.Requires(th != null);
-      if (th.Type == predef.RefType) {
-        return Bpl.Expr.Neq(th, predef.Null);
-      } else {
-        return Bpl.Expr.True;
-      }
-    }
-
-    Expr TrFunctionSideEffect(Expression expr, ExpressionTranslator etran) {
-      Expr e = Bpl.Expr.True;
-      if (expr is StmtExpr) {
-        // if there is a call to reveal_ lemma, we need to record its side effect.
-        var stmt = ((StmtExpr)expr).S;
-        e = TrFunctionSideEffect(stmt, etran);
-      }
-      return e;
-    }
-
-    Expr TrFunctionSideEffect(Statement stmt, ExpressionTranslator etran) {
-      Expr e = Bpl.Expr.True;
-      e = TrStmtSideEffect(e, stmt, etran);
-      foreach (var ss in stmt.SubStatements) {
-        e = TrStmtSideEffect(e, ss, etran);
-      }
-      return e;
-    }
-
-    Expr TrStmtSideEffect(Expr e, Statement stmt, ExpressionTranslator etran) {
-      if (stmt is CallStmt) {
-        var call = (CallStmt)stmt;
-        var m = call.Method;
-        if (IsOpaqueRevealLemma(m)) {
-          List<Expression> args = Attributes.FindExpressions(m.Attributes, "fuel");
-          if (args != null) {
-            MemberSelectExpr selectExpr = args[0].Resolved as MemberSelectExpr;
-            if (selectExpr != null) {
-              Function f = selectExpr.Member as Function;
-              FuelConstant fuelConstant = this.functionFuel.Find(x => x.f == f);
-              if (fuelConstant != null) {
-                Bpl.Expr startFuel = fuelConstant.startFuel;
-                Bpl.Expr startFuelAssert = fuelConstant.startFuelAssert;
-                Bpl.Expr moreFuel_expr = fuelConstant.MoreFuel(sink, predef, f.IdGenerator);
-                Bpl.Expr layer = etran.layerInterCluster.LayerN(1, moreFuel_expr);
-                Bpl.Expr layerAssert = etran.layerInterCluster.LayerN(2, moreFuel_expr);
-
-                e = BplAnd(e, Bpl.Expr.Eq(startFuel, layer));
-                e = BplAnd(e, Bpl.Expr.Eq(startFuelAssert, layerAssert));
-                e = BplAnd(e, Bpl.Expr.Eq(this.FunctionCall(f.tok, BuiltinFunction.AsFuelBottom, null, moreFuel_expr), moreFuel_expr));
-              }
-            }
-          }
-        }
-      } else if (stmt is RevealStmt) {
-        var reveal = (RevealStmt)stmt;
-        foreach (var s in reveal.ResolvedStatements) {
-          e = BplAnd(e, TrFunctionSideEffect(s, etran));
-        }
-      }
-      return e;
-    }
-
-    /// <summary>
-    /// For an extreme predicate P, "pp" is the prefix predicate for P (such that P = pp.ExtremePred) and
-    /// "body" is the body of P.  Return what would be the body of the prefix predicate pp.
-    /// In particular, return
-    /// #if _k has type nat:
-    ///   0 LESS _k  IMPLIES  body'                        // for greatest predicates
-    ///   0 LESS _k  AND  body'                            // for least predicates
-    /// #elsif _k has type ORDINAL:
-    ///   (0 LESS ORD#Offset(_k)  IMPLIES  body') AND
-    ///   (0 == ORD#Offset(_k) IMPLIES forall _k':ORDINAL :: _k' LESS _k ==> pp(_k', args))  // for greatest predicates
-    ///   (0 == ORD#Offset(_k) IMPLIES exists _k':ORDINAL :: _k' LESS _k && pp(_k', args))   // for least predicates
-    /// #endif
-    /// where body' is body with the formals of P replaced by the corresponding
-    /// formals of pp and with self-calls P(s) replaced by recursive calls to
-    /// pp(_k - 1, s).
-    /// </summary>
-    Expression PrefixSubstitution(PrefixPredicate pp, Expression body) {
-      Contract.Requires(pp != null);
-
-      var typeMap = Util.Dict<TypeParameter, Type>(pp.ExtremePred.TypeArgs, Map(pp.TypeArgs, x => new UserDefinedType(x)));
-
-      var paramMap = new Dictionary<IVariable, Expression>();
-      for (int i = 0; i < pp.ExtremePred.Formals.Count; i++) {
-        var replacement = pp.Formals[i + 1];  // the +1 is to skip pp's _k parameter
-        var param = new IdentifierExpr(replacement.tok, replacement.Name);
-        param.Var = replacement;  // resolve here
-        param.Type = replacement.Type;  // resolve here
-        paramMap.Add(pp.ExtremePred.Formals[i], param);
-      }
-
-      var k = new IdentifierExpr(pp.tok, pp.K.Name);
-      k.Var = pp.K;  // resolve here
-      k.Type = pp.K.Type;  // resolve here
-      Expression kMinusOne = Expression.CreateSubtract(k, Expression.CreateNatLiteral(pp.tok, 1, pp.K.Type));
-
-      var s = new PrefixCallSubstituter(null, paramMap, typeMap, pp.ExtremePred, kMinusOne);
-      body = s.Substitute(body);
-
-      if (pp.K.Type.IsBigOrdinalType) {
-        // 0 < k.Offset
-        Contract.Assume(program.SystemModuleManager.ORDINAL_Offset != null);  // should have been filled in by the resolver
-        var kOffset = new MemberSelectExpr(pp.tok, k, program.SystemModuleManager.ORDINAL_Offset);
-        var kIsPositive = Expression.CreateLess(Expression.CreateIntLiteral(pp.tok, 0), kOffset);
-        var kIsLimit = Expression.CreateEq(Expression.CreateIntLiteral(pp.tok, 0), kOffset, Type.Int);
-        var kprimeVar = new BoundVar(pp.tok, "_k'", Type.BigOrdinal);
-        var kprime = new IdentifierExpr(pp.tok, kprimeVar);
-
-        var substMap = new Dictionary<IVariable, Expression>();
-        substMap.Add(pp.K, kprime);
-        Expression recursiveCallReceiver;
-        List<Expression> recursiveCallArgs;
-        RecursiveCallParameters(pp.tok, pp, pp.TypeArgs, pp.Formals, null, substMap, out recursiveCallReceiver, out recursiveCallArgs);
-        var ppCall = new FunctionCallExpr(pp.tok, pp.Name, recursiveCallReceiver, pp.tok, pp.tok, recursiveCallArgs);
-        ppCall.Function = pp;
-        ppCall.Type = Type.Bool;
-        ppCall.TypeApplication_AtEnclosingClass = pp.EnclosingClass.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
-        ppCall.TypeApplication_JustFunction = pp.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp));
-
-        Attributes triggerAttr = new Attributes("trigger", new List<Expression> { ppCall }, null);
-        Expression limitCalls;
-        if (pp.ExtremePred is GreatestPredicate) {
-          // forall k':ORDINAL | _k' LESS _k :: pp(_k', args)
-          var smaller = Expression.CreateLess(kprime, k);
-          limitCalls = new ForallExpr(pp.tok, pp.RangeToken, new List<BoundVar> { kprimeVar }, smaller, ppCall, triggerAttr) {
-            Type = Type.Bool,
-            Bounds = new List<ComprehensionExpr.BoundedPool>() { new ComprehensionExpr.AllocFreeBoundedPool(kprimeVar.Type) }
-          };
-        } else {
-          // exists k':ORDINAL | _k' LESS _k :: pp(_k', args)
-          // Here, instead of using the usual ORD#Less, we use the semantically equivalent ORD#LessThanLimit, because this
-          // allows us to write a good trigger for a targeted monotonicity axiom.  That axiom, in turn, makes the
-          // automatic verification more powerful for least lemmas that have more than one focal-predicate term.
-          var smaller = new BinaryExpr(kprime.tok, BinaryExpr.Opcode.Lt, kprime, k) {
-            ResolvedOp = BinaryExpr.ResolvedOpcode.LessThanLimit,
-            Type = Type.Bool
-          };
-          limitCalls = new ExistsExpr(pp.tok, pp.RangeToken, new List<BoundVar> { kprimeVar }, smaller, ppCall, triggerAttr) {
-            Type = Type.Bool,
-            Bounds = new List<ComprehensionExpr.BoundedPool>() { new ComprehensionExpr.AllocFreeBoundedPool(kprimeVar.Type) }
-          };
-        }
-        var a = Expression.CreateImplies(kIsPositive, body);
-        var b = Expression.CreateImplies(kIsLimit, limitCalls);
-        return Expression.CreateAnd(a, b);
-      } else {
-        // 0 < k
-        var kIsPositive = Expression.CreateLess(Expression.CreateIntLiteral(pp.tok, 0), k);
-        if (pp.ExtremePred is GreatestPredicate) {
-          // add antecedent "0 < _k ==>"
-          return Expression.CreateImplies(kIsPositive, body);
-        } else {
-          // add initial conjunct "0 < _k &&"
-          return Expression.CreateAnd(kIsPositive, body);
-        }
-      }
-    }
-
-    public static void RecursiveCallParameters(IToken tok, MemberDecl member, List<TypeParameter> typeParams, List<Formal> ins,
-      Expression receiverSubst, Dictionary<IVariable, Expression> substMap,
-      out Expression receiver, out List<Expression> arguments) {
-      Contract.Requires(tok != null);
-      Contract.Requires(member != null);
-      Contract.Requires(member.EnclosingClass is TopLevelDeclWithMembers);
-      Contract.Requires(typeParams != null);
-      Contract.Requires(ins != null);
-      // receiverSubst is allowed to be null
-      Contract.Requires(substMap != null);
-      Contract.Ensures(Contract.ValueAtReturn(out receiver) != null);
-      Contract.Ensures(Contract.ValueAtReturn(out arguments) != null);
-
-      if (member.IsStatic) {
-        receiver = new StaticReceiverExpr(tok, (TopLevelDeclWithMembers)member.EnclosingClass, true); // this also resolves it
-      } else if (receiverSubst != null) {
-        receiver = receiverSubst;
-      } else {
-        receiver = new ImplicitThisExpr(tok);
-        receiver.Type = ModuleResolver.GetReceiverType(tok, member);  // resolve here
-      }
-
-      arguments = new List<Expression>();
-      foreach (var inFormal in ins) {
-        Expression inE;
-        if (substMap.TryGetValue(inFormal, out inE)) {
-          arguments.Add(inE);
-        } else {
-          var ie = new IdentifierExpr(inFormal.tok, inFormal.Name);
-          ie.Var = inFormal;  // resolve here
-          ie.Type = inFormal.Type;  // resolve here
-          arguments.Add(ie);
-        }
-      }
-    }
-
-    void AddFuelSuccSynonymAxiom(Function f, bool forHandle = false) {
-      Contract.Requires(f != null);
-      Contract.Requires(f.IsFuelAware());
-      Contract.Requires(sink != null && predef != null);
-      // axiom  // layer synonym axiom
-      //   (forall s, $Heap, formals ::
-      //       { f(Succ(s), $Heap, formals) }
-      //       f(Succ(s), $Heap, formals) == f(s, $Heap, formals));
-
-      List<Bpl.Expr> tyargs;
-      var formals = MkTyParamBinders(GetTypeParams(f), out tyargs);
-      var args1 = new List<Bpl.Expr>(tyargs);
-      var args0 = new List<Bpl.Expr>(tyargs);
-
-      var bv = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$ly", predef.LayerType));
-      formals.Add(bv);
-      var s = new Bpl.IdentifierExpr(f.tok, bv);
-      args1.Add(FunctionCall(f.tok, BuiltinFunction.LayerSucc, null, s));
-      args0.Add(s);
-      if (f.IsOpaque) {
-        var bvReveal = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$reveal", Boogie.Type.Bool));
-        formals.Add(bvReveal);
-        var sReveal = new Bpl.IdentifierExpr(f.tok, bvReveal);
-        args1.Add(sReveal);
-        args0.Add(sReveal);
-      }
-
-      if (f is TwoStateFunction) {
-        bv = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$prevHeap", predef.HeapType));
-        formals.Add(bv);
-        s = new Bpl.IdentifierExpr(f.tok, bv);
-        args1.Add(s);
-        args0.Add(s);
-      }
-      if (!forHandle && f.ReadsHeap) {
-        bv = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, predef.HeapVarName, predef.HeapType));
-        formals.Add(bv);
-        s = new Bpl.IdentifierExpr(f.tok, bv);
-        args1.Add(s);
-        args0.Add(s);
-      }
-
-      if (!f.IsStatic) {
-        bv = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "this", TrReceiverType(f)));
-        formals.Add(bv);
-        s = new Bpl.IdentifierExpr(f.tok, bv);
-        args1.Add(s);
-        args0.Add(s);
-      }
-      if (!forHandle) {
-        foreach (var p in f.Formals) {
-          bv = new Bpl.BoundVariable(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)));
-          formals.Add(bv);
-          s = new Bpl.IdentifierExpr(f.tok, bv);
-          args1.Add(s);
-          args0.Add(s);
-        }
-      }
-
-      var name = forHandle ? f.FullSanitizedName + "#Handle" : f.FullSanitizedName;
-      var funcID = new Bpl.FunctionCall(new Bpl.IdentifierExpr(f.tok, name, TrType(f.ResultType)));
-      var funcAppl1 = new Bpl.NAryExpr(f.tok, funcID, args1);
-      var funcAppl0 = new Bpl.NAryExpr(f.tok, funcID, args0);
-
-      Bpl.Trigger tr = new Bpl.Trigger(f.tok, true, new List<Bpl.Expr> { funcAppl1 });
-      Bpl.Expr ax = new Bpl.ForallExpr(f.tok, new List<Bpl.TypeVariable>(), formals, null, tr, Bpl.Expr.Eq(funcAppl1, funcAppl0));
-      AddOtherDefinition(GetOrCreateFunction(f), new Bpl.Axiom(f.tok, ax, "layer synonym axiom"));
-    }
-
-    void AddFuelZeroSynonymAxiom(Function f) {
-      // axiom  // fuel axiom
-      //   (forall s, $Heap, formals ::
-      //       { f(AsFuelBottom(s), $Heap, formals) }
-      //       f(s, $Heap, formals) == f($LZ, $Heap, formals));
-      Contract.Requires(f != null);
-      Contract.Requires(f.IsFuelAware());
-      Contract.Requires(sink != null && predef != null);
-
-      List<Bpl.Expr> tyargs;
-      var formals = MkTyParamBinders(GetTypeParams(f), out tyargs);
-      var args2 = new List<Bpl.Expr>(tyargs);
-      var args1 = new List<Bpl.Expr>(tyargs);
-      var args0 = new List<Bpl.Expr>(tyargs);
-
-      var bv = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$ly", predef.LayerType));
-      formals.Add(bv);
-      var s = new Bpl.IdentifierExpr(f.tok, bv);
-      args2.Add(FunctionCall(f.tok, BuiltinFunction.AsFuelBottom, null, s));
-      args1.Add(s);
-      args0.Add(new Bpl.IdentifierExpr(f.tok, "$LZ", predef.LayerType)); // $LZ
-      if (f.IsOpaque) {
-        var bvReveal = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$reveal", Boogie.Type.Bool));
-        formals.Add(bvReveal);
-        var sReveal = new Bpl.IdentifierExpr(f.tok, bvReveal);
-        args2.Add(sReveal);
-        args1.Add(sReveal);
-        args0.Add(sReveal);
-      }
-
-      if (f is TwoStateFunction) {
-        bv = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "$prevHeap", predef.HeapType));
-        formals.Add(bv);
-        s = new Bpl.IdentifierExpr(f.tok, bv);
-        args2.Add(s);
-        args1.Add(s);
-        args0.Add(s);
-      }
-      if (f.ReadsHeap) {
-        bv = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, predef.HeapVarName, predef.HeapType));
-        formals.Add(bv);
-        s = new Bpl.IdentifierExpr(f.tok, bv);
-        args2.Add(s);
-        args1.Add(s);
-        args0.Add(s);
-      }
-
-      if (!f.IsStatic) {
-        bv = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "this", TrReceiverType(f)));
-        formals.Add(bv);
-        s = new Bpl.IdentifierExpr(f.tok, bv);
-        args2.Add(s);
-        args1.Add(s);
-        args0.Add(s);
-      }
-      foreach (var p in f.Formals) {
-        bv = new Bpl.BoundVariable(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)));
-        formals.Add(bv);
-        s = new Bpl.IdentifierExpr(f.tok, bv);
-        args2.Add(s);
-        args1.Add(s);
-        args0.Add(s);
-      }
-
-      var funcID = new Bpl.FunctionCall(new Bpl.IdentifierExpr(f.tok, f.FullSanitizedName, TrType(f.ResultType)));
-      var funcAppl2 = new Bpl.NAryExpr(f.tok, funcID, args2);
-      var funcAppl1 = new Bpl.NAryExpr(f.tok, funcID, args1);
-      var funcAppl0 = new Bpl.NAryExpr(f.tok, funcID, args0);
-
-      Bpl.Trigger tr = new Bpl.Trigger(f.tok, true, new List<Bpl.Expr> { funcAppl2 });
-      Bpl.Expr ax = new Bpl.ForallExpr(f.tok, new List<Bpl.TypeVariable>(), formals, null, tr, Bpl.Expr.Eq(funcAppl1, funcAppl0));
-      AddOtherDefinition(GetOrCreateFunction(f), (new Bpl.Axiom(f.tok, ax, "fuel synonym axiom")));
-    }
-
-    /// <summary>
-    /// In the following,
-    /// if "pp" is a greatest predicate, then QQQ and NNN and HHH and EEE stand for "forall" and "" and "==>" and REVERSE-IMPLIES, and
-    /// if "pp" is a least predicate, then QQQ and NNN and HHH and EEE stand for "exists" and "!" and "&&" and "==>".
-    /// ==========  For co-predicates:
-    /// Add the axioms:
-    ///   forall args :: P(args) ==> QQQ k: nat :: P#[k](args)
-    ///   forall args :: (QQQ k: nat :: P#[k](args)) ==> P(args)
-    ///   forall args,k :: k == 0 ==> NNN P#[k](args)
-    /// where "args" is "heap, formals".  In more details:
-    ///   AXIOM_ACTIVATION ==> forall args :: { P(args) } args-have-appropriate-values && P(args) ==> QQQ k { P#[k](args) } :: 0 ATMOST k HHH P#[k](args)
-    ///   AXIOM_ACTIVATION ==> forall args :: { P(args) } args-have-appropriate-values && (QQQ k :: 0 ATMOST k HHH P#[k](args)) ==> P(args)
-    ///   AXIOM_ACTIVATION ==> forall args,k :: args-have-appropriate-values && k == 0 ==> NNN P#0#[k](args)
-    ///   AXIOM_ACTIVATION ==> forall args,k,m :: args-have-appropriate-values && 0 ATMOST k LESS m ==> (P#[k](args) EEE P#[m](args))  (*)
-    /// where
-    /// AXIOM_ACTIVATION
-    /// means:
-    ///   mh LESS ModuleContextHeight ||
-    ///   (mh == ModuleContextHeight && fh ATMOST FunctionContextHeight)
-    /// There is also a specialized version of (*) for least predicates.
-    /// </summary>
-    void AddPrefixPredicateAxioms(PrefixPredicate pp) {
-      Contract.Requires(pp != null);
-      Contract.Requires(predef != null);
-      var co = pp.ExtremePred;
-      var tok = pp.tok;
-      var etran = new ExpressionTranslator(this, predef, tok);
-
-      var tyvars = MkTyParamBinders(GetTypeParams(pp), out var tyexprs);
-
-      var bvs = new List<Variable>(tyvars);
-      var coArgs = new List<Bpl.Expr>(tyexprs);
-      var prefixArgs = new List<Bpl.Expr>(tyexprs);
-      var prefixArgsLimited = new List<Bpl.Expr>(tyexprs);
-      var prefixArgsLimitedM = new List<Bpl.Expr>(tyexprs);
-      if (pp.IsFuelAware()) {
-        var sV = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$ly", predef.LayerType));
-        var s = new Bpl.IdentifierExpr(tok, sV);
-        var succS = FunctionCall(tok, BuiltinFunction.LayerSucc, null, s);
-        bvs.Add(sV);
-        coArgs.Add(succS);
-        prefixArgs.Add(succS);
-        prefixArgsLimited.Add(s);
-        prefixArgsLimitedM.Add(s);
-      }
-      Bpl.Expr h;
-      if (pp.ReadsHeap) {
-        var heapIdent = new Bpl.TypedIdent(tok, predef.HeapVarName, predef.HeapType);
-        var bv = new Bpl.BoundVariable(tok, heapIdent);
-        h = new Bpl.IdentifierExpr(tok, bv);
-        bvs.Add(bv);
-        coArgs.Add(h);
-        prefixArgs.Add(h);
-        prefixArgsLimited.Add(h);
-        prefixArgsLimitedM.Add(h);
-      } else {
-        h = null;
-      }
-      // ante:  $IsGoodHeap($Heap) && this != null && formals-have-the-expected-types &&
-      Bpl.Expr ante = h != null ? FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, etran.HeapExpr) : (Bpl.Expr)Bpl.Expr.True;
-
-      if (!pp.IsStatic) {
-        var bvThis = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, etran.This, TrReceiverType(pp)));
-        bvs.Add(bvThis);
-        var bvThisIdExpr = new Bpl.IdentifierExpr(tok, bvThis);
-        coArgs.Add(bvThisIdExpr);
-        prefixArgs.Add(bvThisIdExpr);
-        prefixArgsLimited.Add(bvThisIdExpr);
-        prefixArgsLimitedM.Add(bvThisIdExpr);
-        // add well-typedness conjunct to antecedent
-        Type thisType = ModuleResolver.GetReceiverType(tok, pp);
-        Bpl.Expr wh = Bpl.Expr.And(
-          ReceiverNotNull(bvThisIdExpr),
-          GetWhereClause(tok, bvThisIdExpr, thisType, etran, NOALLOC));
-        ante = Bpl.Expr.And(ante, wh);
-      }
-
-      Bpl.Expr kWhere = null, kId = null, mId = null;
-      Bpl.Variable k = null;
-      Bpl.Variable m = null;
-
-      // DR: Changed to add the pp formals instead of co (since types would otherwise be wrong)
-      //     Note that k is not added to bvs or coArgs.
-      foreach (var p in pp.Formals) {
-        bool is_k = p == pp.Formals[0];
-        var bv = new Bpl.BoundVariable(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(pp.IdGenerator), TrType(p.Type)));
-        var formal = new Bpl.IdentifierExpr(p.tok, bv);
-        if (!is_k) {
-          coArgs.Add(formal);
-        }
-        prefixArgs.Add(formal);
-        prefixArgsLimited.Add(formal);
-        if (is_k) {
-          m = new Bpl.BoundVariable(p.tok, new Bpl.TypedIdent(p.tok, "_m", TrType(p.Type)));
-          mId = new Bpl.IdentifierExpr(m.tok, m);
-          prefixArgsLimitedM.Add(mId);
-        } else {
-          prefixArgsLimitedM.Add(formal);
-        }
-        var wh = GetWhereClause(p.tok, formal, p.Type, etran, NOALLOC);
-        if (is_k) {
-          // add the formal _k
-          k = bv;
-          kId = formal;
-          kWhere = wh;
-        } else {
-          bvs.Add(bv);
-          if (wh != null) {
-            // add well-typedness conjunct to antecedent
-            ante = Bpl.Expr.And(ante, wh);
-          }
-        }
-      }
-      Contract.Assert(k != null && m != null);  // the loop should have filled these in
-
-      var funcID = new Bpl.IdentifierExpr(tok, co.FullSanitizedName, TrType(co.ResultType));
-      var coAppl = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), coArgs);
-      funcID = new Bpl.IdentifierExpr(tok, pp.FullSanitizedName, TrType(pp.ResultType));
-      var prefixAppl = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgs);
-
-      var activation = AxiomActivation(pp, etran);
-
-      // forall args :: { P(args) } args-have-appropriate-values && P(args) ==> QQQ k { P#[k](args) } :: 0 ATMOST k HHH P#[k](args)
-      var tr = BplTrigger(prefixAppl);
-      var qqqK = pp.ExtremePred is GreatestPredicate ?
-        (Bpl.Expr)new Bpl.ForallExpr(tok, new List<Variable> { k }, tr, kWhere == null ? prefixAppl : BplImp(kWhere, prefixAppl)) :
-        (Bpl.Expr)new Bpl.ExistsExpr(tok, new List<Variable> { k }, tr, kWhere == null ? prefixAppl : BplAnd(kWhere, prefixAppl));
-      tr = BplTriggerHeap(this, tok, coAppl, pp.ReadsHeap ? null : h);
-      var allS = new Bpl.ForallExpr(tok, bvs, tr, BplImp(BplAnd(ante, coAppl), qqqK));
-      sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, Bpl.Expr.Imp(activation, allS),
-        "1st prefix predicate axiom for " + pp.FullSanitizedName));
-
-      // forall args :: { P(args) } args-have-appropriate-values && (QQQ k :: 0 ATMOST k HHH P#[k](args)) ==> P(args)
-      allS = new Bpl.ForallExpr(tok, bvs, tr, BplImp(BplAnd(ante, qqqK), coAppl));
-      sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, Bpl.Expr.Imp(activation, allS),
-        "2nd prefix predicate axiom"));
-
-      // forall args,k :: args-have-appropriate-values && k == 0 ==> NNN P#0#[k](args)
-      var moreBvs = new List<Variable>();
-      moreBvs.AddRange(bvs);
-      moreBvs.Add(k);
-      var z = Bpl.Expr.Eq(kId, pp.Formals[0].Type.IsBigOrdinalType ?
-        (Bpl.Expr)FunctionCall(tok, "ORD#FromNat", predef.BigOrdinalType, Bpl.Expr.Literal(0)) :
-        Bpl.Expr.Literal(0));
-      funcID = new Bpl.IdentifierExpr(tok, pp.FullSanitizedName, TrType(pp.ResultType));
-      Bpl.Expr prefixLimitedBody = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgsLimited);
-      Bpl.Expr prefixLimited = pp.ExtremePred is LeastPredicate ? Bpl.Expr.Not(prefixLimitedBody) : prefixLimitedBody;
-
-      var trigger = BplTriggerHeap(this, prefixLimitedBody.tok, prefixLimitedBody, pp.ReadsHeap ? null : h);
-      var trueAtZero = new Bpl.ForallExpr(tok, moreBvs, trigger, BplImp(BplAnd(ante, z), prefixLimited));
-      sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, Bpl.Expr.Imp(activation, trueAtZero),
-        "3rd prefix predicate axiom"));
-
-#if WILLING_TO_TAKE_THE_PERFORMANCE_HIT
-      // forall args,k,m :: args-have-appropriate-values && 0 <= k <= m ==> (P#[k](args) EEE P#[m](args))
-      moreBvs = new List<Variable>();
-      moreBvs.AddRange(bvs);
-      moreBvs.Add(k);
-      moreBvs.Add(m);
-      Bpl.Expr smaller;
-      if (kId.Type.IsInt) {
-        smaller = BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(0), kId), Bpl.Expr.Lt(kId, mId));
-      } else {
-        smaller = FunctionCall(tok, "ORD#Less", Bpl.Type.Bool, kId, mId);
-      }
-      funcID = new Bpl.IdentifierExpr(tok, pp.FullSanitizedName, TrType(pp.ResultType));
-      var prefixPred_K = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgsLimited);
-      var prefixPred_M = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgsLimitedM);
-      var direction = pp.ExtremePred is LeastPredicate ? BplImp(prefixPred_K, prefixPred_M) : BplImp(prefixPred_M, prefixPred_K);
-
-      var trigger2 = new Bpl.Trigger(tok, true, new List<Bpl.Expr> { prefixPred_K, prefixPred_M });
-      var monotonicity = new Bpl.ForallExpr(tok, moreBvs, trigger2, BplImp(smaller, direction));
-      AddRootAxiom(new Bpl.Axiom(tok, Bpl.Expr.Imp(activation, monotonicity),
-        "prefix predicate monotonicity axiom"));
-#endif
-      // A more targeted monotonicity axiom used to increase the power of automation for proving the limit case for
-      // least predicates that have more than one focal-predicate term.
-      if (pp.ExtremePred is LeastPredicate && pp.Formals[0].Type.IsBigOrdinalType) {
-        // forall args,k,m,limit ::
-        //   { P#[k](args), ORD#LessThanLimit(k,limit), ORD#LessThanLimit(m,limit) }
-        //   args-have-appropriate-values && k < m && P#[k](args) ==> P#[m](args))
-        var limit = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "_limit", TrType(Type.BigOrdinal)));
-        var limitId = new Bpl.IdentifierExpr(limit.tok, limit);
-        moreBvs = new List<Variable>();
-        moreBvs.AddRange(bvs);
-        moreBvs.Add(k);
-        moreBvs.Add(m);
-        moreBvs.Add(limit);
-        var kLessLimit = FunctionCall(tok, "ORD#LessThanLimit", Bpl.Type.Bool, kId, limitId);
-        var mLessLimit = FunctionCall(tok, "ORD#LessThanLimit", Bpl.Type.Bool, mId, limitId);
-        var kLessM = FunctionCall(tok, "ORD#Less", Bpl.Type.Bool, kId, mId);
-        funcID = new Bpl.IdentifierExpr(tok, pp.FullSanitizedName, TrType(pp.ResultType));
-        var prefixPred_K = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgsLimited);
-        var prefixPred_M = new Bpl.NAryExpr(tok, new Bpl.FunctionCall(funcID), prefixArgsLimitedM);
-        var direction = BplImp(prefixPred_K, prefixPred_M);
-
-        var trigger3 = new Bpl.Trigger(tok, true, new List<Bpl.Expr> { prefixPred_K, kLessLimit, mLessLimit });
-        var monotonicity = new Bpl.ForallExpr(tok, moreBvs, trigger3, BplImp(kLessM, direction));
-        sink.AddTopLevelDeclaration(new Bpl.Axiom(tok, Bpl.Expr.Imp(activation, monotonicity),
-          "targeted prefix predicate monotonicity axiom"));
-      }
-    }
-
-    Bpl.Expr InSeqRange(IToken tok, Bpl.Expr index, Type indexType, Bpl.Expr seq, bool isSequence, Bpl.Expr lowerBound, bool includeUpperBound) {
-      Contract.Requires(tok != null);
-      Contract.Requires(index != null);
-      Contract.Requires(indexType != null);
-      Contract.Requires(seq != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      if (indexType.IsBitVectorType) {
-        index = ConvertExpression(tok, index, indexType, Type.Int);
-      }
-      Bpl.Expr lower;
-      if (indexType.IsBitVectorType && lowerBound == null) {
-        lower = Bpl.Expr.True;  // bitvectors are always non-negative
-      } else {
-        lower = Bpl.Expr.Le(lowerBound ?? Bpl.Expr.Literal(0), index);
-      }
-      Bpl.Expr length = isSequence ?
-        FunctionCall(tok, BuiltinFunction.SeqLength, null, seq) :
-        ArrayLength(tok, seq, 1, 0);
-      Bpl.Expr upper;
-      if (includeUpperBound) {
-        upper = Bpl.Expr.Le(index, length);
-      } else {
-        upper = Bpl.Expr.Lt(index, length);
-      }
-      return BplAnd(lower, upper);
-    }
-
-    ModuleDefinition currentModule = null;  // the module whose members are currently being translated
-    ModuleDefinition forModule = null;  // the root module
-    ICallable codeContext = null;  // the method/iterator whose implementation is currently being translated or the function whose specification is being checked for well-formedness
-    Bpl.LocalVariable yieldCountVariable = null;  // non-null when an iterator body is being translated
-    bool inBodyInitContext = false;  // true during the translation of the .BodyInit portion of a divided constructor body
-    readonly Dictionary<string, Bpl.IdentifierExpr> definiteAssignmentTrackers = new Dictionary<string, Bpl.IdentifierExpr>();
-    bool assertAsAssume = false; // generate assume statements instead of assert statements
-    Func<IToken, bool> assertionOnlyFilter = null; // generate assume statements instead of assert statements if not targeted by {:only}
-    public enum StmtType { NONE, ASSERT, ASSUME };
-    public StmtType stmtContext = StmtType.NONE;  // the Statement that is currently being translated
-    public bool adjustFuelForExists = true;  // fuel need to be adjusted for exists based on whether exists is in assert or assume stmt.
-
-    public readonly FreshIdGenerator defaultIdGenerator = new FreshIdGenerator();
-
-    public FreshIdGenerator CurrentIdGenerator {
-      get {
-        var decl = codeContext as Declaration;
-        if (decl != null) {
-          return decl.IdGenerator;
-        }
-        return defaultIdGenerator;
-      }
-    }
-
-    Dictionary<string, Bpl.IdentifierExpr> _tmpIEs = new Dictionary<string, Bpl.IdentifierExpr>();
-
-    public int assertionCount = 0;
-
-    Bpl.IdentifierExpr GetTmpVar_IdExpr(Bpl.IToken tok, string name, Bpl.Type ty, List<Variable> locals)  // local variable that's shared between statements that need it
-    {
-      Contract.Requires(tok != null);
-      Contract.Requires(name != null);
-      Contract.Requires(ty != null);
-      Contract.Requires(locals != null);
-      Contract.Ensures(Contract.Result<Bpl.IdentifierExpr>() != null);
-
-      Bpl.IdentifierExpr ie;
-      if (_tmpIEs.TryGetValue(name, out ie)) {
-        Contract.Assume(ie.Type.Equals(ty));
-      } else {
-        // the "tok" and "ty" of the first request for this variable is the one we use
-        var v = new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, name, ty));  // important for the "$nw" client: no where clause (see GetNewVar_IdExpr)
-        locals.Add(v);
-        ie = new Bpl.IdentifierExpr(tok, v);
-        _tmpIEs.Add(name, ie);
-      }
-      return ie;
-    }
-
-    Bpl.IdentifierExpr GetPrevHeapVar_IdExpr(IToken tok, List<Variable> locals)  // local variable that's shared between statements that need it
-    {
-      Contract.Requires(tok != null);
-      Contract.Requires(locals != null); Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.IdentifierExpr>() != null);
-
-      return GetTmpVar_IdExpr(tok, "$prevHeap", predef.HeapType, locals);
-    }
-
-    Bpl.IdentifierExpr GetNewVar_IdExpr(IToken tok, List<Variable> locals)  // local variable that's shared between statements that need it
-    {
-      Contract.Requires(tok != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.IdentifierExpr>() != null);
-
-      // important: the following declaration produces no where clause (that's why we're going through the trouble of setting of this variable in the first place)
-      return GetTmpVar_IdExpr(tok, "$nw", predef.RefType, locals);
-    }
-
-    /// <summary>
-    /// Returns an expression whose value is the same as "expr", but that is guaranteed to preserve the its value passed
-    /// the evaluation of other expressions.  If necessary, a new local variable called "name" with type "ty" is added to "locals" and
-    /// assigned in "builder" to be used to hold the value of "expr".  It is assumed that all requests for a given "name"
-    /// have the same type "ty" and that these variables can be shared.
-    /// As an optimization, if "otherExprsCanAffectPreviouslyKnownExpressions" is "false", then "expr" itself is returned.
-    /// </summary>
-    Bpl.Expr SaveInTemp(Bpl.Expr expr, bool otherExprsCanAffectPreviouslyKnownExpressions, string name, Bpl.Type ty, BoogieStmtListBuilder builder, List<Variable> locals) {
-      Contract.Requires(expr != null);
-      Contract.Requires(name != null);
-      Contract.Requires(ty != null);
-      Contract.Requires(locals != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      if (otherExprsCanAffectPreviouslyKnownExpressions) {
-        var save = GetTmpVar_IdExpr(expr.tok, name, ty, locals);
-        builder.Add(Bpl.Cmd.SimpleAssign(expr.tok, save, expr));
-        return save;
-      } else {
-        return expr;
-      }
-    }
-
-    #region Definite-assignment tracking
-
-    bool NeedsDefiniteAssignmentTracker(bool isGhost, Type type, bool isFIeld) {
-      Contract.Requires(type != null);
-
-      if (options.DefiniteAssignmentLevel == 0) {
-        return false;
-      } else if (options.DefiniteAssignmentLevel == 1 ||
-                 (options.DefiniteAssignmentLevel == 4 && isFIeld && !options.ForbidNondeterminism)) {
-        if (isGhost && type.IsNonempty) {
-          return false;
-        } else if (!isGhost && type.HasCompilableValue) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    Bpl.Expr/*?*/ AddDefiniteAssignmentTracker(IVariable p, List<Bpl.Variable> localVariables, bool isOutParam = false, bool forceGhostVar = false) {
-      Contract.Requires(p != null);
-      Contract.Requires(localVariables != null);
-
-      if (!NeedsDefiniteAssignmentTracker(p.IsGhost || forceGhostVar, p.Type, false)) {
-        return null;
-      }
-      Bpl.Variable tracker;
-      if (isOutParam) {
-        tracker = new Bpl.Formal(p.Tok, new Bpl.TypedIdent(p.Tok, "defass#" + p.UniqueName, Bpl.Type.Bool), false);
-      } else {
-        tracker = new Bpl.LocalVariable(p.Tok, new Bpl.TypedIdent(p.Tok, "defass#" + p.UniqueName, Bpl.Type.Bool));
-      }
-      localVariables.Add(tracker);
-      var ie = new Bpl.IdentifierExpr(p.Tok, tracker);
-      definiteAssignmentTrackers.Add(p.UniqueName, ie);
-      return ie;
-    }
-
-    void AddExistingDefiniteAssignmentTracker(IVariable p, bool forceGhostVar) {
-      Contract.Requires(p != null);
-
-      if (NeedsDefiniteAssignmentTracker(p.IsGhost || forceGhostVar, p.Type, false)) {
-        var ie = new Bpl.IdentifierExpr(p.Tok, "defass#" + p.UniqueName, Bpl.Type.Bool);
-        definiteAssignmentTrackers.Add(p.UniqueName, ie);
-      }
-    }
-
-    void AddDefiniteAssignmentTrackerSurrogate(Field field, TopLevelDeclWithMembers enclosingClass, List<Variable> localVariables, bool forceGhostVar) {
-      Contract.Requires(field != null);
-      Contract.Requires(localVariables != null);
-
-      var type = field.Type.Subst(enclosingClass.ParentFormalTypeParametersToActuals);
-      if (!NeedsDefiniteAssignmentTracker(field.IsGhost || forceGhostVar, type, true)) {
-        return;
-      }
-      var nm = SurrogateName(field);
-      var tracker = new Bpl.LocalVariable(field.tok, new Bpl.TypedIdent(field.tok, "defass#" + nm, Bpl.Type.Bool));
-      localVariables.Add(tracker);
-      var ie = new Bpl.IdentifierExpr(field.tok, tracker);
-      definiteAssignmentTrackers.Add(nm, ie);
-    }
-
-    void RemoveDefiniteAssignmentTrackers(List<Statement> ss, int prevDefAssTrackerCount) {
-      Contract.Requires(ss != null);
-      foreach (var s in ss) {
-        if (s is VarDeclStmt vdecl) {
-          if (vdecl.Update is AssignOrReturnStmt ars) {
-            foreach (var sx in ars.ResolvedStatements) {
-              if (sx is VarDeclStmt vdecl2) {
-                vdecl2.Locals.ForEach(RemoveDefiniteAssignmentTracker);
-              }
-            }
-          }
-          vdecl.Locals.ForEach(RemoveDefiniteAssignmentTracker);
-        } else if (s is AssignOrReturnStmt ars) {
-          foreach (var sx in ars.ResolvedStatements) {
-            if (sx is VarDeclStmt vdecl2) {
-              vdecl2.Locals.ForEach(RemoveDefiniteAssignmentTracker);
-            }
-          }
-        }
-      }
-      Contract.Assert(prevDefAssTrackerCount == definiteAssignmentTrackers.Count);
-    }
-
-    void RemoveDefiniteAssignmentTracker(IVariable p) {
-      Contract.Requires(p != null);
-      definiteAssignmentTrackers.Remove(p.UniqueName);
-    }
-
-    void RemoveDefiniteAssignmentTrackerSurrogate(Field field) {
-      Contract.Requires(field != null);
-      definiteAssignmentTrackers.Remove(SurrogateName(field));
-    }
-
-    void MarkDefiniteAssignmentTracker(IdentifierExpr expr, BoogieStmtListBuilder builder) {
-      Contract.Requires(expr != null);
-      Contract.Requires(builder != null);
-      MarkDefiniteAssignmentTracker(expr.tok, expr.Var.UniqueName, builder);
-    }
-
-    void MarkDefiniteAssignmentTracker(IToken tok, string name, BoogieStmtListBuilder builder) {
-      Contract.Requires(tok != null);
-      Contract.Requires(name != null);
-      Contract.Requires(builder != null);
-
-      Bpl.IdentifierExpr ie;
-      if (definiteAssignmentTrackers.TryGetValue(name, out ie)) {
-        builder.Add(Bpl.Cmd.SimpleAssign(tok, ie, Bpl.Expr.True));
-      }
-    }
-
-    internal IToken GetToken(INode node) {
-      if (flags.ReportRanges) {
-        // Filter against IHasUsages to only select declarations, not usages.
-        if (node is IDeclarationOrUsage declarationOrUsage && node is not IHasUsages) {
-          return new BoogieRangeToken(node.StartToken, node.EndToken, declarationOrUsage.NameToken);
-        }
-        return node.RangeToken.ToToken();
-      } else {
-        return node.Tok;
-      }
-    }
-
-    void CheckDefiniteAssignment(IdentifierExpr expr, BoogieStmtListBuilder builder) {
-      Contract.Requires(expr != null);
-      Contract.Requires(builder != null);
-
-      Bpl.IdentifierExpr ie;
-      if (definiteAssignmentTrackers.TryGetValue(expr.Var.UniqueName, out ie)) {
-        builder.Add(Assert(GetToken(expr), ie, new PODesc.DefiniteAssignment($"variable '{expr.Var.Name}'", "here")));
-      }
-    }
-
-    /// <summary>
-    /// Returns an expression denoting the definite-assignment tracker for "var", or "null" if there is none.
-    /// </summary>
-    Bpl.IdentifierExpr/*?*/ GetDefiniteAssignmentTracker(IVariable var) {
-      Bpl.IdentifierExpr ie;
-      if (definiteAssignmentTrackers.TryGetValue(var.UniqueName, out ie)) {
-        return ie;
-      }
-      return null;
-    }
-
-    void CheckDefiniteAssignmentSurrogate(IToken tok, Field field, bool atNew, BoogieStmtListBuilder builder) {
-      Contract.Requires(tok != null);
-      Contract.Requires(field != null);
-      Contract.Requires(builder != null);
-
-      var nm = SurrogateName(field);
-      Bpl.IdentifierExpr ie;
-      if (definiteAssignmentTrackers.TryGetValue(nm, out ie)) {
-        var desc = new PODesc.DefiniteAssignment($"field '{field.Name}'",
-          atNew ? "at this point in the constructor body" : "here");
-        builder.Add(Assert(tok, ie, desc));
-      }
-    }
-
-    void AssumeCanCallForByMethodDecl(Method method, BoogieStmtListBuilder builder) {
-      if (method?.FunctionFromWhichThisIsByMethodDecl?.ByMethodTok != null && // Otherwise nothing is checked anyway
-          method.Ens.Count == 1 &&
-          method.Ens[0].E is BinaryExpr { E1: var e1 } &&
-          e1.Resolved is FunctionCallExpr { Args: var arguments } fnCall) {
-        // fnCall == (m.Ens[0].E as BinaryExpr).E1;
-        // fn == new FunctionCallExpr(tok, f.Name, receiver, tok, tok, f.Formals.ConvertAll(Expression.CreateIdentExpr));
-        Bpl.IdentifierExpr canCallFuncID =
-          new Bpl.IdentifierExpr(method.tok, method.FullSanitizedName + "#canCall", Bpl.Type.Bool);
-        var etran = new ExpressionTranslator(this, predef, method.tok);
-        List<Bpl.Expr> args = arguments.Select(arg => etran.TrExpr(arg)).ToList();
-        var formals = MkTyParamBinders(GetTypeParams(method), out var tyargs);
-        if (method.FunctionFromWhichThisIsByMethodDecl.ReadsHeap) {
-          Contract.Assert(etran.HeapExpr != null);
-          tyargs.Add(etran.HeapExpr);
-        }
-
-        if (!method.IsStatic) {
-          var thVar = BplBoundVar("this", TrReceiverType(method.FunctionFromWhichThisIsByMethodDecl), out var th);
-          tyargs.Add(th);
-        }
-        Bpl.Expr boogieAssumeCanCall =
-          new Bpl.NAryExpr(method.tok, new FunctionCall(canCallFuncID), Concat(tyargs, args));
-        builder.Add(new AssumeCmd(method.tok, boogieAssumeCanCall));
-      } else {
-        Contract.Assert(false, "Error in shape of by-method");
-      }
-    }
-
-    void CheckDefiniteAssignmentReturn(IToken tok, Formal p, BoogieStmtListBuilder builder) {
-      Contract.Requires(tok != null);
-      Contract.Requires(p != null && !p.InParam);
-      Contract.Requires(builder != null);
-
-      Bpl.IdentifierExpr ie;
-      if (definiteAssignmentTrackers.TryGetValue(p.UniqueName, out ie)) {
-        var desc = new PODesc.DefiniteAssignment($"out-parameter '{p.Name}'", "at this return point");
-        builder.Add(Assert(tok, ie, desc));
-      }
-    }
-    #endregion  // definite-assignment tracking
-
-    void InitializeFuelConstant(IToken tok, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      if (this.functionFuel.Count > 0) {
-        builder.Add(new CommentCmd("initialize fuel constant"));
-      }
-      FuelContext fuelContext = this.fuelContext;
-      foreach (FuelConstant fuelConstant in this.functionFuel) {
-        Function f = fuelConstant.f;
-        Bpl.Expr baseFuel = fuelConstant.baseFuel;
-        Bpl.Expr startFuel = fuelConstant.startFuel;
-        Bpl.Expr startFuelAssert = fuelConstant.startFuelAssert;
-        // find out what the initial value should be
-        FuelSettingPair settings;
-        var found = fuelContext.TryGetValue(f, out settings);
-        if (!found) {
-          // If the context doesn't define fuel for this function, check for a fuel attribute (which supplies a default value if none is found)
-          settings = FuelSetting.FuelAttrib(f, out found);
-        }
-
-        if (settings.low == 0 && settings.high == 0) {
-          // Don't say anything about what startFuel and startFuel are set to
-          // Just add the fixpoints that allow us to shortcut to LZ:
-          // assume AsFuelBottom(startFuel) == startFuel
-          // assume AsFuelBottom(startFuelAssert) == startFuelAssert
-          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(FunctionCall(f.tok, BuiltinFunction.AsFuelBottom, null, startFuel), startFuel)));
-          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(FunctionCall(f.tok, BuiltinFunction.AsFuelBottom, null, startFuelAssert), startFuelAssert)));
-        } else {
-          Bpl.Expr layer = etran.layerInterCluster.LayerN(settings.low, baseFuel);
-          Bpl.Expr layerAssert = etran.layerInterCluster.LayerN(settings.high, baseFuel);
-          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(startFuel, layer)));
-          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(startFuelAssert, layerAssert)));
-          // assume AsFuelBottom(BaseFuel_F) == BaseFuel_F;
-          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(FunctionCall(f.tok, BuiltinFunction.AsFuelBottom, null, baseFuel), baseFuel)));
-        }
-      }
-    }
-
-    bool DefineFuelConstant(IToken tok, Attributes attribs, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      bool defineFuel = false;
-      builder.Add(new CommentCmd("Assume Fuel Constant"));
-      FuelContext fuelContext = new FuelContext();
-      FuelSetting.FindFuelAttributes(attribs, fuelContext);
-      foreach (KeyValuePair<Function, FuelSettingPair> fuel in fuelContext) {
-        Function f = fuel.Key;
-        FuelSettingPair settings = fuel.Value;
-        FuelConstant fuelConstant = this.functionFuel.Find(x => x.f == f);
-        if (fuelConstant != null) {
-          Bpl.Expr startFuel = fuelConstant.startFuel;
-          Bpl.Expr startFuelAssert = fuelConstant.startFuelAssert;
-          Bpl.Expr moreFuel_expr = fuelConstant.MoreFuel(sink, predef, f.IdGenerator);
-          Bpl.Expr layer = etran.layerInterCluster.LayerN(settings.low, moreFuel_expr);
-          Bpl.Expr layerAssert = etran.layerInterCluster.LayerN(settings.high, moreFuel_expr);
-          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(startFuel, layer)));
-          builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(startFuelAssert, layerAssert)));
-          defineFuel = true;
-        }
-      }
-      return defineFuel;
-    }
-
-    internal static AssumeCmd optimizeExpr(bool minimize, Expression expr, IToken tok, ExpressionTranslator etran) {
-      Contract.Requires(expr != null);
-      Contract.Requires(expr.Type.IsIntegerType || expr.Type.IsRealType);
-      Contract.Requires(tok != null && etran != null);
-
-      var assumeCmd = new AssumeCmd(tok, Expr.True);
-      assumeCmd.Attributes = new QKeyValue(expr.tok, (minimize ? "minimize" : "maximize"), new List<object> { etran.TrExpr(expr) }, null);
-      return assumeCmd;
-    }
-
-    private void AddFunctionOverrideEnsChk(Function f, BoogieStmtListBuilder builder, ExpressionTranslator etran,
-      Dictionary<IVariable, Expression> substMap,
-      Dictionary<TypeParameter, Type> typeMap,
-      List<Bpl.Variable> implInParams,
-      Bpl.Variable/*?*/ resultVariable) {
-      Contract.Requires(f.Formals.Count <= implInParams.Count);
-
-      //generating class post-conditions
-      foreach (var en in f.Ens) {
-        builder.Add(TrAssumeCmd(f.tok, etran.TrExpr(en.E)));
-      }
-
-      //generating assume C.F(ins) == out, if a result variable was given
-      if (resultVariable != null) {
-        var funcIdC = new FunctionCall(new Bpl.IdentifierExpr(f.tok, f.FullSanitizedName, TrType(f.ResultType)));
-        var argsC = new List<Bpl.Expr>();
-
-        // add type arguments
-        argsC.AddRange(GetTypeArguments(f, null).ConvertAll(TypeToTy));
-
-        // add fuel arguments
-        if (f.IsFuelAware()) {
-          argsC.Add(etran.layerInterCluster.GetFunctionFuel(f));
-        }
-
-        if (f.IsOpaque) {
-          argsC.Add(GetRevealConstant(f));
-        }
-
-        // add heap arguments
-        if (f is TwoStateFunction) {
-          argsC.Add(etran.Old.HeapExpr);
-        }
-        if (f.ReadsHeap) {
-          argsC.Add(etran.HeapExpr);
-        }
-
-        argsC.AddRange(implInParams.Select(var => new Bpl.IdentifierExpr(f.tok, var)));
-
-        var funcExpC = new Bpl.NAryExpr(f.tok, funcIdC, argsC);
-        var resultVar = new Bpl.IdentifierExpr(resultVariable.tok, resultVariable);
-        builder.Add(TrAssumeCmd(f.tok, Bpl.Expr.Eq(funcExpC, resultVar)));
-      }
-
-      //generating trait post-conditions with class variables
-      FunctionCallSubstituter sub = null;
-      foreach (var en in f.OverriddenFunction.Ens) {
-        sub ??= new FunctionCallSubstituter(substMap, typeMap, (TraitDecl)f.OverriddenFunction.EnclosingClass, (ClassLikeDecl)f.EnclosingClass);
-        foreach (var s in TrSplitExpr(sub.Substitute(en.E), etran, false, out _).Where(s => s.IsChecked)) {
-          builder.Add(Assert(f.tok, s.E, new PODesc.FunctionContractOverride(true)));
-        }
-      }
-    }
-
-    /// <summary>
-    /// Return type arguments for function "f", where any type parameters are in terms of
-    /// the context of "overridingFunction ?? f".
-    ///
-    /// In more symbols, suppose "f" is declared as follows:
-    ///     class/trait Tr[A,B] {
-    ///       function f[C,D](...): ...
-    ///     }
-    /// When "overridingFunction" is null, return:
-    ///     [A, B, C, D]
-    /// When "overridingFunction" is non-null and stands for:
-    ///     class/trait Cl[G] extends Tr[X(G),Y(G)] {
-    ///       function f[R,S](...): ...
-    ///     }
-    /// return:
-    ///     [X(G), Y(G), R, S]
-    ///
-    /// See also GetTypeArgumentSubstitutionMap.
-    /// </summary>
-    private static List<Type> GetTypeArguments(Function f, Function/*?*/ overridingFunction) {
-      Contract.Requires(f != null);
-      Contract.Requires(overridingFunction == null || overridingFunction.EnclosingClass is TopLevelDeclWithMembers);
-      Contract.Requires(overridingFunction == null || f.TypeArgs.Count == overridingFunction.TypeArgs.Count);
-
-      List<Type> tyargs;
-      if (overridingFunction == null) {
-        tyargs = f.EnclosingClass.TypeArgs.ConvertAll(tp => (Type)new UserDefinedType(tp.tok, tp));
-      } else {
-        var cl = (TopLevelDeclWithMembers)overridingFunction.EnclosingClass;
-        var typeMap = cl.ParentFormalTypeParametersToActuals;
-        tyargs = f.EnclosingClass.TypeArgs.ConvertAll(tp => typeMap[tp]);
-      }
-      tyargs.AddRange((overridingFunction ?? f).TypeArgs.ConvertAll(tp => new UserDefinedType(tp.tok, tp)));
-      return tyargs;
-    }
-
-    private void AddFunctionOverrideSubsetChk(Function func, BoogieStmtListBuilder builder, ExpressionTranslator etran, List<Variable> localVariables,
-      Dictionary<IVariable, Expression> substMap,
-      Dictionary<TypeParameter, Type> typeMap) {
-      //getting framePrime
-      List<FrameExpression> traitFrameExps = new List<FrameExpression>();
-      FunctionCallSubstituter sub = null;
-      foreach (var e in func.OverriddenFunction.Reads) {
-        sub ??= new FunctionCallSubstituter(substMap, typeMap, (TraitDecl)func.OverriddenFunction.EnclosingClass, (ClassLikeDecl)func.EnclosingClass);
-        var newE = sub.Substitute(e.E);
-        FrameExpression fe = new FrameExpression(e.tok, newE, e.FieldName);
-        traitFrameExps.Add(fe);
-      }
-
-      QKeyValue kv = etran.TrAttributes(func.Attributes, null);
-
-      IToken tok = func.tok;
-      // Declare a local variable $_Frame: <alpha>[ref, Field alpha]bool
-      Bpl.IdentifierExpr traitFrame = etran.TheFrame(func.OverriddenFunction.tok);  // this is a throw-away expression, used only to extract the type and name of the $_Frame variable
-      traitFrame.Name = func.EnclosingClass.Name + "_" + traitFrame.Name;
-      Contract.Assert(traitFrame.Type != null);  // follows from the postcondition of TheFrame
-      Bpl.LocalVariable frame = new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, null ?? traitFrame.Name, traitFrame.Type));
-      localVariables.Add(frame);
-      // $_Frame := (lambda<alpha> $o: ref, $f: Field alpha :: $o != null && $Heap[$o,alloc] ==> ($o,$f) in Modifies/Reads-Clause);
-      Bpl.TypeVariable alpha = new Bpl.TypeVariable(tok, "alpha");
-      Bpl.BoundVariable oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", predef.RefType));
-      Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(tok, oVar);
-      Bpl.BoundVariable fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", predef.FieldName(tok, alpha)));
-      Bpl.IdentifierExpr f = new Bpl.IdentifierExpr(tok, fVar);
-      Bpl.Expr ante = Bpl.Expr.And(Bpl.Expr.Neq(o, predef.Null), etran.IsAlloced(tok, o));
-      Bpl.Expr consequent = InRWClause(tok, o, f, traitFrameExps, etran, null, null);
-      Bpl.Expr lambda = new Bpl.LambdaExpr(tok, new List<TypeVariable> { alpha }, new List<Variable> { oVar, fVar }, null,
-                                           Bpl.Expr.Imp(ante, consequent));
-
-      //to initialize $_Frame variable to Frame'
-      builder.Add(Bpl.Cmd.SimpleAssign(tok, new Bpl.IdentifierExpr(tok, frame), lambda));
-
-      // emit: assert (forall<alpha> o: ref, f: Field alpha :: o != null && $Heap[o,alloc] && (o,f) in subFrame ==> $_Frame[o,f]);
-      Bpl.Expr oInCallee = InRWClause(tok, o, f, func.Reads, etran, null, null);
-      Bpl.Expr consequent2 = InRWClause(tok, o, f, traitFrameExps, etran, null, null);
-      Bpl.Expr q = new Bpl.ForallExpr(tok, new List<TypeVariable> { alpha }, new List<Variable> { oVar, fVar },
-                                      Bpl.Expr.Imp(Bpl.Expr.And(ante, oInCallee), consequent2));
-      builder.Add(Assert(tok, q, new PODesc.TraitFrame(func.WhatKind, false), kv));
-    }
-
-    private void AddFunctionOverrideReqsChk(Function f, BoogieStmtListBuilder builder, ExpressionTranslator etran,
-      Dictionary<IVariable, Expression> substMap,
-      Dictionary<TypeParameter, Type> typeMap) {
-      Contract.Requires(f != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(substMap != null);
-      //generating trait pre-conditions with class variables
-      FunctionCallSubstituter sub = null;
-      foreach (var req in f.OverriddenFunction.Req) {
-        sub ??= new FunctionCallSubstituter(substMap, typeMap, (TraitDecl)f.OverriddenFunction.EnclosingClass, (ClassLikeDecl)f.EnclosingClass);
-        builder.Add(TrAssumeCmd(f.tok, etran.TrExpr(sub.Substitute(req.E))));
-      }
-      //generating class pre-conditions
-      foreach (var s in f.Req.SelectMany(req => TrSplitExpr(req.E, etran, false, out _).Where(s => s.IsChecked))) {
-        builder.Add(Assert(f.tok, s.E, new PODesc.FunctionContractOverride(false)));
-      }
-    }
-
-    private void HavocMethodFrameLocations(Method m, BoogieStmtListBuilder builder, ExpressionTranslator etran, List<Variable> localVariables) {
-      Contract.Requires(m != null);
-      Contract.Requires(m.EnclosingClass != null && m.EnclosingClass is ClassLikeDecl);
-
-      // play havoc with the heap according to the modifies clause
-      builder.Add(new Bpl.HavocCmd(m.tok, new List<Bpl.IdentifierExpr> { etran.HeapCastToIdentifierExpr }));
-      // assume the usual two-state boilerplate information
-      foreach (BoilerplateTriple tri in GetTwoStateBoilerplate(m.tok, m.Mod.Expressions, m.IsGhost, m.AllowsAllocation, etran.Old, etran, etran.Old)) {
-        if (tri.IsFree) {
-          builder.Add(TrAssumeCmd(m.tok, tri.Expr));
-        }
-      }
-    }
-
-    private void InsertChecksum(DatatypeDecl d, Bpl.Declaration decl) {
-      Contract.Requires(VisibleInScope(d));
-      byte[] data;
-      using (var writer = new System.IO.StringWriter()) {
-        var printer = new Printer(writer, options);
-        printer.PrintDatatype(d, 0, null);
-        data = Encoding.UTF8.GetBytes(writer.ToString());
-      }
-
-      InsertChecksum(decl, data);
-    }
-
-    private void InsertChecksum(Expression e, Bpl.Declaration decl) {
-      byte[] data;
-      using (var writer = new System.IO.StringWriter()) {
-        var printer = new Printer(writer, options);
-        printer.PrintExpression(e, false);
-        data = Encoding.UTF8.GetBytes(writer.ToString());
-      }
-
-      InsertChecksum(decl, data);
-    }
-
-    private void InsertChecksum(Function f, Bpl.Declaration decl, bool specificationOnly = false) {
-      Contract.Requires(f != null);
-      Contract.Requires(decl != null);
-      Contract.Requires(VisibleInScope(f));
-      byte[] data;
-      using (var writer = new System.IO.StringWriter()) {
-        var printer = new Printer(writer, options);
-        writer.Write(f.GetFunctionDeclarationKeywords(options));
-        printer.PrintAttributes(f.Attributes);
-        printer.PrintFormals(f.Formals, f);
-        writer.Write(": ");
-        printer.PrintType(f.ResultType);
-        printer.PrintSpec("", f.Req, 0);
-        printer.PrintFrameSpecLine("", f.Reads, 0, null);
-        printer.PrintSpec("", f.Ens, 0);
-        printer.PrintDecreasesSpec(f.Decreases, 0);
-        writer.WriteLine();
-        if (!specificationOnly && f.Body != null && RevealedInScope(f)) {
-          printer.PrintExpression(f.Body, false);
-        }
-        data = Encoding.UTF8.GetBytes(writer.ToString());
-      }
-
-      InsertChecksum(decl, data);
-    }
-
-    private void InsertChecksum(Bpl.Declaration decl, byte[] data) {
-      Contract.Requires(decl != null);
-      Contract.Requires(data != null);
-      var md5 = System.Security.Cryptography.MD5.Create();
-      var hashedData = md5.ComputeHash(data);
-      var checksum = BitConverter.ToString(hashedData);
-
-      decl.AddAttribute("checksum", checksum);
-
-      InsertUniqueIdForImplementation(decl);
-    }
-
-    public void InsertUniqueIdForImplementation(Bpl.Declaration decl) {
-      var impl = decl as Bpl.Implementation;
-      var prefix = UniqueIdPrefix ?? (decl.tok.filename == null ? "" : System.Text.RegularExpressions.Regex.Replace(decl.tok.filename, @".v\d+.dfy", ".dfy"));
-      if (impl != null && !string.IsNullOrEmpty(prefix)) {
-        decl.AddAttribute("id", prefix + ":" + impl.Name + ":0");
-      }
-    }
-
-    void GenerateImplPrelude(Method m, bool wellformednessProc, List<Variable> inParams, List<Variable> outParams,
-                             BoogieStmtListBuilder builder, List<Variable> localVariables) {
-      Contract.Requires(m != null);
-      Contract.Requires(inParams != null);
-      Contract.Requires(outParams != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(localVariables != null);
-      Contract.Requires(predef != null);
-      Contract.Requires(wellformednessProc || m.Body != null);
-
-      if (m is TwoStateLemma) {
-        // $Heap := current$Heap;
-        var heap = ExpressionTranslator.HeapIdentifierExpr(predef, m.tok);
-        builder.Add(Bpl.Cmd.SimpleAssign(m.tok, heap, new Bpl.IdentifierExpr(m.tok, "current$Heap", predef.HeapType)));
-      }
-
-      // set up the information used to verify the method's modifies clause
-      DefineFrame(m.tok, m.Mod.Expressions, builder, localVariables, null);
-      if (wellformednessProc) {
-        builder.AddCaptureState(m.tok, false, "initial state");
-      } else {
-        Contract.Assert(m.Body != null);  // follows from precondition and the if guard
-        // use the position immediately after the open-curly-brace of the body
-        builder.AddCaptureState(m.Body.Tok, true, "initial state");
-      }
-    }
-
-    void GenerateIteratorImplPrelude(IteratorDecl iter, List<Variable> inParams, List<Variable> outParams,
-                                     BoogieStmtListBuilder builder, List<Variable> localVariables) {
-      Contract.Requires(iter != null);
-      Contract.Requires(inParams != null);
-      Contract.Requires(outParams != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(localVariables != null);
-      Contract.Requires(predef != null);
-
-      // set up the information used to verify the method's modifies clause
-      var iteratorFrame = new List<FrameExpression>();
-      var th = new ThisExpr(iter);
-      iteratorFrame.Add(new FrameExpression(iter.tok, th, null));
-      iteratorFrame.AddRange(iter.Modifies.Expressions);
-      DefineFrame(iter.tok, iteratorFrame, builder, localVariables, null);
-      builder.AddCaptureState(iter.tok, false, "initial state");
-    }
-
-    void DefineFrame(IToken/*!*/ tok, List<FrameExpression/*!*/>/*!*/ frameClause,
-      BoogieStmtListBuilder/*!*/ builder, List<Variable>/*!*/ localVariables, string name, ExpressionTranslator/*?*/ etran = null) {
-      Contract.Requires(tok != null);
-      Contract.Requires(cce.NonNullElements(frameClause));
-      Contract.Requires(builder != null);
-      Contract.Requires(cce.NonNullElements(localVariables));
-      Contract.Requires(predef != null);
-
-      if (etran == null) {
-        // This is the common case. It means that the frame will be defined in terms of the usual variable $Heap.
-        // The one case where a frame is needed for a different heap is for lambda expressions, because they may
-        // sit inside of an "old" expression.
-        etran = new ExpressionTranslator(this, predef, tok);
-      }
-      // Declare a local variable $_Frame: <alpha>[ref, Field alpha]bool
-      Bpl.IdentifierExpr theFrame = etran.TheFrame(tok);  // this is a throw-away expression, used only to extract the type and name of the $_Frame variable
-      Contract.Assert(theFrame.Type != null);  // follows from the postcondition of TheFrame
-      Bpl.LocalVariable frame = new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, name ?? theFrame.Name, theFrame.Type));
-      localVariables.Add(frame);
-      // $_Frame := (lambda<alpha> $o: ref, $f: Field alpha :: $o != null && $Heap[$o,alloc] ==> ($o,$f) in Modifies/Reads-Clause);
-      // $_Frame := (lambda<alpha> $o: ref, $f: Field alpha :: $o != null                    ==> ($o,$f) in Modifies/Reads-Clause);
-      Bpl.TypeVariable alpha = new Bpl.TypeVariable(tok, "alpha");
-      Bpl.BoundVariable oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", predef.RefType));
-      Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(tok, oVar);
-      Bpl.BoundVariable fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", predef.FieldName(tok, alpha)));
-      Bpl.IdentifierExpr f = new Bpl.IdentifierExpr(tok, fVar);
-      Bpl.Expr oNotNull = Bpl.Expr.Neq(o, predef.Null);
-      Bpl.Expr ante = Bpl.Expr.And(oNotNull, etran.IsAlloced(tok, o));
-      Bpl.Expr consequent = InRWClause(tok, o, f, frameClause, etran, null, null);
-      Bpl.Expr lambda = new Bpl.LambdaExpr(tok, new List<TypeVariable> { alpha }, new List<Variable> { oVar, fVar }, null,
-                                           Bpl.Expr.Imp(ante, consequent));
-
-      builder.Add(Bpl.Cmd.SimpleAssign(tok, new Bpl.IdentifierExpr(tok, frame), lambda));
-    }
-
-    void CheckFrameSubset(IToken tok, List<FrameExpression> calleeFrame,
-                          Expression receiverReplacement, Dictionary<IVariable, Expression /*!*/> substMap,
-                          ExpressionTranslator /*!*/ etran,
-                          BoogieStmtListBuilder /*!*/ builder,
-                          PODesc.ProofObligationDescription desc,
-                          Bpl.QKeyValue kv) {
-      CheckFrameSubset(tok, calleeFrame, receiverReplacement, substMap, etran,
-        (t, e, d, q) => builder.Add(Assert(t, e, d, q)), desc, kv);
-    }
-
-    void CheckFrameSubset(IToken tok, List<FrameExpression> calleeFrame,
-                          Expression receiverReplacement, Dictionary<IVariable, Expression/*!*/> substMap,
-                          ExpressionTranslator/*!*/ etran,
-                          Action<IToken, Bpl.Expr, PODesc.ProofObligationDescription, Bpl.QKeyValue> MakeAssert,
-                          PODesc.ProofObligationDescription desc,
-                          Bpl.QKeyValue kv) {
-      Contract.Requires(tok != null);
-      Contract.Requires(calleeFrame != null);
-      Contract.Requires(receiverReplacement == null || substMap != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(MakeAssert != null);
-      Contract.Requires(predef != null);
-
-      // emit: assert (forall<alpha> o: ref, f: Field alpha :: o != null && $Heap[o,alloc] && (o,f) in subFrame ==> $_Frame[o,f]);
-      Bpl.TypeVariable alpha = new Bpl.TypeVariable(tok, "alpha");
-      Bpl.BoundVariable oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", predef.RefType));
-      Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(tok, oVar);
-      Bpl.BoundVariable fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", predef.FieldName(tok, alpha)));
-      Bpl.IdentifierExpr f = new Bpl.IdentifierExpr(tok, fVar);
-      Bpl.Expr ante = Bpl.Expr.And(Bpl.Expr.Neq(o, predef.Null), etran.IsAlloced(tok, o));
-      Bpl.Expr oInCallee = InRWClause(tok, o, f, calleeFrame, etran, receiverReplacement, substMap);
-      Bpl.Expr inEnclosingFrame = Bpl.Expr.Select(etran.TheFrame(tok), o, f);
-
-      Bpl.Expr q = new Bpl.ForallExpr(tok, new List<TypeVariable> { alpha }, new List<Variable> { oVar, fVar },
-                                      Bpl.Expr.Imp(Bpl.Expr.And(ante, oInCallee), inEnclosingFrame));
-      if (IsExprAlways(q, true)) {
-        return;
-      }
-      MakeAssert(tok, q, desc, kv);
-    }
-
-    /// <summary>
-    /// Returns true if it can statically determine that the expression q always evaluates to truth
-    /// </summary>
-    /// <param name="q">The expression</param>
-    /// <param name="truth">The expected truth value that q might always have</param>
-    /// <returns>True if q is always of the boolean value "truth"</returns>
-    public static bool IsExprAlways(Bpl.Expr q, bool truth) {
-      if (q is Bpl.ForallExpr forallExpr) {
-        return truth && IsExprAlways(forallExpr.Body, true);
-      }
-      if (q is Bpl.ExistsExpr existsExpr) {
-        return !truth && IsExprAlways(existsExpr.Body, false);
-      }
-      if (q is Bpl.LiteralExpr { isBool: true } lit && lit.asBool == truth) {
-        return true;
-      }
-
-      if (q is Bpl.NAryExpr n) {
-        if (n.Fun is Bpl.BinaryOperator op && n.Args.Count == 2) {
-          switch (op.Op) {
-            case BinaryOperator.Opcode.And:
-              return truth
-                ? IsExprAlways(n.Args[0], true) && IsExprAlways(n.Args[1], true)
-                : IsExprAlways(n.Args[0], false) || IsExprAlways(n.Args[1], false);
-            case BinaryOperator.Opcode.Or:
-              return truth
-                ? IsExprAlways(n.Args[0], true) || IsExprAlways(n.Args[1], true)
-                : IsExprAlways(n.Args[0], false) && IsExprAlways(n.Args[1], false);
-            case BinaryOperator.Opcode.Imp:
-              return truth
-                ? IsExprAlways(n.Args[0], false) || IsExprAlways(n.Args[1], true)
-                : IsExprAlways(n.Args[0], true) && IsExprAlways(n.Args[1], false);
-          }
-        } else if (n.Fun is Bpl.UnaryOperator uop && n.Args.Count == 1) {
-          switch (uop.Op) {
-            case UnaryOperator.Opcode.Not:
-              return IsExprAlways(n.Args[0], !truth);
-          }
-        }
-      }
-
-      return false;
-    }
-
-    /// <summary>
-    /// Generates:
-    ///   axiom (forall s, h0: HeapType, h1: HeapType, formals... ::
-    ///        { IsHeapAnchor(h0), HeapSucc(h0,h1), F(s,h1,formals) }
-    ///        heaps are well-formed and [formals are allocated AND]
-    ///        IsHeapAnchor(h0) AND HeapSucc(h0,h1)
-    ///        AND
-    ///        (forall(alpha) o: ref, f: Field alpha ::
-    ///            o != null [AND h0[o,alloc] AND]  // note that HeapSucc(h0,h1) && h0[o,alloc] ==> h1[o,alloc]
-    ///            o in reads clause of formals in h0
-    ///            IMPLIES h0[o,f] == h1[o,f])
-    ///        IMPLIES
-    ///        F(s,h0,formals) == F(s,h1,formals)
-    ///      );
-    /// Expressions in [...] are omitted if
-    ///   - /allocated:0, or
-    ///   - /allocated:1, or
-    ///   - /allocated:3, except if "reads" clause is "*" of if the function is a two-state function;
-    /// see comments in AddArrowTypeAxioms
-    /// Also, with /allocated:3, the frame axiom is omitted altogether if the (one-state) function has an
-    /// empty "reads" clause (because then the function doesn't take a heap argument at all).
-    /// </summary>
-    void AddFrameAxiom(Function f) {
-      Contract.Requires(f != null);
-      Contract.Requires(sink != null && predef != null);
-
-      var comment = "frame axiom for " + f.FullSanitizedName;
-      // This is the general case
-      Bpl.Expr prevH = null;
-      Bpl.BoundVariable prevHVar = null;
-      Bpl.Expr reveal = null;
-      Bpl.BoundVariable revealVar = null;
-      if (f.IsOpaque) {
-        revealVar = BplBoundVar("$reveal", Bpl.Type.Bool, out reveal);
-      }
-      if (f is TwoStateFunction) {
-        // The previous-heap argument is the same for both function arguments.  That is,
-        // the frame axiom says nothing about functions invoked with different previous heaps.
-        prevHVar = BplBoundVar("$prevHeap", predef.HeapType, out prevH);
-      }
-      Bpl.Expr h0; var h0Var = BplBoundVar("$h0", predef.HeapType, out h0);
-      Bpl.Expr h1; var h1Var = BplBoundVar("$h1", predef.HeapType, out h1);
-
-      var etran0 = new ExpressionTranslator(this, predef, h0);
-      var etran1 = new ExpressionTranslator(this, predef, h1);
-
-      Bpl.Expr wellFormed = Bpl.Expr.And(
-        FunctionCall(f.tok, BuiltinFunction.IsGoodHeap, null, etran0.HeapExpr),
-        FunctionCall(f.tok, BuiltinFunction.IsGoodHeap, null, etran1.HeapExpr));
-
-      Bpl.TypeVariable alpha = new Bpl.TypeVariable(f.tok, "alpha");
-      Bpl.Expr o; var oVar = BplBoundVar("$o", predef.RefType, out o);
-      Bpl.Expr field; var fieldVar = BplBoundVar("$f", predef.FieldName(f.tok, alpha), out field);
-      Bpl.Expr oNotNull = Bpl.Expr.Neq(o, predef.Null);
-      Bpl.Expr oNotNullAlloced = oNotNull;
-      Bpl.Expr unchanged = Bpl.Expr.Eq(ReadHeap(f.tok, h0, o, field, alpha), ReadHeap(f.tok, h1, o, field, alpha));
-
-      Bpl.Expr h0IsHeapAnchor = FunctionCall(h0.tok, BuiltinFunction.IsHeapAnchor, null, h0);
-      Bpl.Expr heapSucc = HeapSucc(h0, h1);
-      Bpl.Expr r0 = InRWClause(f.tok, o, field, f.Reads, etran0, null, null);
-      Bpl.Expr q0 = new Bpl.ForallExpr(f.tok, new List<TypeVariable> { alpha }, new List<Variable> { oVar, fieldVar },
-        Bpl.Expr.Imp(Bpl.Expr.And(oNotNullAlloced, r0), unchanged));
-
-      List<Bpl.Expr> tyexprs;
-      var bvars = MkTyParamBinders(GetTypeParams(f), out tyexprs);
-      var f0args = new List<Bpl.Expr>(tyexprs);
-      var f1args = new List<Bpl.Expr>(tyexprs);
-      var f0argsCanCall = new List<Bpl.Expr>(tyexprs);
-      var f1argsCanCall = new List<Bpl.Expr>(tyexprs);
-      if (f.IsFuelAware()) {
-        Bpl.Expr s; var sV = BplBoundVar("$ly", predef.LayerType, out s);
-        bvars.Add(sV);
-        f0args.Add(s); f1args.Add(s);  // but don't add to f0argsCanCall or f1argsCanCall
-      }
-
-      if (reveal != null) {
-        bvars.Add(revealVar);
-        f0args.Add(reveal); f1args.Add(reveal);
-      }
-
-      if (prevH != null) {
-        bvars.Add(prevHVar);
-        f0args.Add(prevH); f1args.Add(prevH); f0argsCanCall.Add(prevH); f1argsCanCall.Add(prevH);
-      }
-      bvars.Add(h0Var); bvars.Add(h1Var);
-      f0args.Add(h0); f1args.Add(h1); f0argsCanCall.Add(h0); f1argsCanCall.Add(h1);
-
-      var useAlloc = f.Reads.Exists(fe => fe.E is WildcardExpr) ? ISALLOC : NOALLOC;
-      if (!f.IsStatic) {
-        Bpl.Expr th; var thVar = BplBoundVar("this", TrReceiverType(f), out th);
-        bvars.Add(thVar);
-        f0args.Add(th); f1args.Add(th); f0argsCanCall.Add(th); f1argsCanCall.Add(th);
-
-        Type thisType = ModuleResolver.GetReceiverType(f.tok, f);
-        Bpl.Expr wh = Bpl.Expr.And(ReceiverNotNull(th), GetWhereClause(f.tok, th, thisType, etran0, useAlloc));
-        wellFormed = Bpl.Expr.And(wellFormed, wh);
-      }
-
-      // (formalsAreWellFormed[h0] || canCallF(h0,...)) && (formalsAreWellFormed[h1] || canCallF(h1,...))
-      Bpl.Expr fwf0 = Bpl.Expr.True;
-      Bpl.Expr fwf1 = Bpl.Expr.True;
-      foreach (Formal p in f.Formals) {
-        Bpl.BoundVariable bv = new Bpl.BoundVariable(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)));
-        bvars.Add(bv);
-        Bpl.Expr formal = new Bpl.IdentifierExpr(p.tok, bv);
-        f0args.Add(formal); f1args.Add(formal); f0argsCanCall.Add(formal); f1argsCanCall.Add(formal);
-        Bpl.Expr wh = GetWhereClause(p.tok, formal, p.Type, etran0, useAlloc);
-        if (wh != null) { fwf0 = Bpl.Expr.And(fwf0, wh); }
-      }
-      var canCall = new Bpl.FunctionCall(new Bpl.IdentifierExpr(f.tok, f.FullSanitizedName + "#canCall", Bpl.Type.Bool));
-      wellFormed = Bpl.Expr.And(wellFormed, Bpl.Expr.And(
-        Bpl.Expr.Or(new Bpl.NAryExpr(f.tok, canCall, f0argsCanCall), fwf0),
-        Bpl.Expr.Or(new Bpl.NAryExpr(f.tok, canCall, f1argsCanCall), fwf1)));
-
-      /*
-      DR: I conjecture that this should be enough,
-          as the requires is preserved when the frame is:
-
-      wellFormed = Bpl.Expr.And(wellFormed,
-        Bpl.Expr.Or(new Bpl.NAryExpr(f.tok, canCall, f0argsCanCall), fwf0));
-      */
-
-      var fn = new Bpl.FunctionCall(new Bpl.IdentifierExpr(f.tok, f.FullSanitizedName, TrType(f.ResultType)));
-      var F0 = new Bpl.NAryExpr(f.tok, fn, f0args);
-      var F1 = new Bpl.NAryExpr(f.tok, fn, f1args);
-      var eq = Bpl.Expr.Eq(F0, F1);
-      var tr = new Bpl.Trigger(f.tok, true, new List<Bpl.Expr> { h0IsHeapAnchor, heapSucc, F1 });
-
-      var ax = new Bpl.ForallExpr(f.tok, new List<Bpl.TypeVariable>(), bvars, null, tr,
-        Bpl.Expr.Imp(Bpl.Expr.And(wellFormed, Bpl.Expr.And(h0IsHeapAnchor, heapSucc)),
-        Bpl.Expr.Imp(q0, eq)));
-      sink.AddTopLevelDeclaration(new Bpl.Axiom(f.tok, ax, comment));
-    }
-
-    Bpl.Expr InRWClause(IToken tok, Bpl.Expr o, Bpl.Expr f, List<FrameExpression> rw, ExpressionTranslator etran,
-                        Expression receiverReplacement, Dictionary<IVariable, Expression> substMap) {
-      Contract.Requires(tok != null);
-      Contract.Requires(o != null);
-      // Contract.Requires(f != null); // f == null means approximate
-      Contract.Requires(etran != null);
-      Contract.Requires(cce.NonNullElements(rw));
-      Contract.Requires(substMap == null || cce.NonNullDictionaryAndValues(substMap));
-      Contract.Requires(predef != null);
-      Contract.Requires(receiverReplacement == null || substMap != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-      return InRWClause(tok, o, f, rw, false, etran, receiverReplacement, substMap);
-    }
-    Bpl.Expr InRWClause(IToken tok, Bpl.Expr o, Bpl.Expr f, List<FrameExpression> rw, bool useInUnchanged,
-                        ExpressionTranslator etran,
-                        Expression receiverReplacement, Dictionary<IVariable, Expression> substMap) {
-      Contract.Requires(tok != null);
-      Contract.Requires(o != null);
-      // Contract.Requires(f != null); // f == null means approximate
-      Contract.Requires(etran != null);
-      Contract.Requires(cce.NonNullElements(rw));
-      Contract.Requires(substMap == null || cce.NonNullDictionaryAndValues(substMap));
-      Contract.Requires(predef != null);
-      Contract.Requires(receiverReplacement == null || substMap != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-      var boxO = FunctionCall(tok, BuiltinFunction.Box, null, o);
-      return InRWClause_Aux(tok, o, boxO, f, rw, useInUnchanged, etran, receiverReplacement, substMap);
-    }
-
-    /// <summary>
-    /// By taking both an "o" and a "boxO" parameter, the caller has a choice of passing in either
-    /// "o, Box(o)" for some "o" or "Unbox(bx), bx" for some "bx".
-    /// </summary>
-    Bpl.Expr InRWClause_Aux(IToken tok, Bpl.Expr o, Bpl.Expr boxO, Bpl.Expr f, List<FrameExpression> rw, bool usedInUnchanged,
-                        ExpressionTranslator etran,
-                        Expression receiverReplacement, Dictionary<IVariable, Expression> substMap) {
-      Contract.Requires(tok != null);
-      Contract.Requires(o != null);
-      Contract.Requires(boxO != null);
-      // Contract.Requires(f != null); // f == null means approximate
-      Contract.Requires(etran != null);
-      Contract.Requires(cce.NonNullElements(rw));
-      Contract.Requires(substMap == null || cce.NonNullDictionaryAndValues(substMap));
-      Contract.Requires(predef != null);
-      Contract.Requires((substMap == null && receiverReplacement == null) || substMap != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      // requires o to denote an expression of type RefType
-      // "rw" is allowed to contain a WildcardExpr
-
-      Bpl.Expr disjunction = Bpl.Expr.False;
-      foreach (FrameExpression rwComponent in rw) {
-        Expression e = rwComponent.E;
-        if (substMap != null) {
-          e = Substitute(e, receiverReplacement, substMap);
-        }
-
-        Bpl.Expr disjunct;
-        var eType = e.Type.NormalizeExpand();
-        if (e is WildcardExpr) {
-          // For /allocated:{0,1,3}, "function f(...)... reads *"
-          // is more useful if "reads *" excludes unallocated references,
-          // because otherwise, "reads *" lets f depend on unallocated state,
-          // which means that f may change whenever any new allocation occurs,
-          // which is generally undesirable.  Also, Dafny doesn't let you
-          // say "reads set o :: allocated(o)", so it's hard to work around
-          // this issue.
-          disjunct = etran.IsAlloced(tok, o);
-        } else if (eType is SetType) {
-          // e[Box(o)]
-          bool pr;
-          disjunct = etran.TrInSet_Aux(tok, o, boxO, e, true, out pr);
-        } else if (eType is MultiSetType) {
-          // e[Box(o)] > 0
-          disjunct = etran.TrInMultiSet_Aux(tok, o, boxO, e, true);
-        } else if (eType is SeqType) {
-          // (exists i: int :: 0 <= i && i < Seq#Length(e) && Seq#Index(e,i) == Box(o))
-          Bpl.Variable iVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$i", Bpl.Type.Int));
-          Bpl.Expr i = new Bpl.IdentifierExpr(tok, iVar);
-          Bpl.Expr iBounds = InSeqRange(tok, i, Type.Int, etran.TrExpr(e), true, null, false);
-          Bpl.Expr XsubI = FunctionCall(tok, BuiltinFunction.SeqIndex, predef.BoxType, etran.TrExpr(e), i);
-          // TODO: the equality in the next line should be changed to one that understands extensionality
-          //TRIG (exists $i: int :: 0 <= $i && $i < Seq#Length(read($h0, this, _module.DoublyLinkedList.Nodes)) && Seq#Index(read($h0, this, _module.DoublyLinkedList.Nodes), $i) == $Box($o))
-          disjunct = new Bpl.ExistsExpr(tok, new List<Variable> { iVar }, Bpl.Expr.And(iBounds, Bpl.Expr.Eq(XsubI, boxO)));  // LL_TRIGGER
-        } else {
-          // o == e
-          disjunct = Bpl.Expr.Eq(o, etran.TrExpr(e));
-        }
-        if (rwComponent.Field != null && f != null) {
-          Bpl.Expr q = Bpl.Expr.Eq(f, new Bpl.IdentifierExpr(rwComponent.E.tok, GetField(rwComponent.Field)));
-          if (usedInUnchanged) {
-            q = Bpl.Expr.Or(q,
-              Bpl.Expr.Eq(f, new Bpl.IdentifierExpr(rwComponent.E.tok, predef.AllocField)));
-          }
-          disjunct = Bpl.Expr.And(disjunct, q);
-        }
-        disjunction = BplOr(disjunction, disjunct);
-      }
-      return disjunction;
-    }
-
-    void AddWellformednessCheck(Function f) {
-      Contract.Requires(f != null);
-      Contract.Requires(sink != null && predef != null);
-      Contract.Requires(f.EnclosingClass != null);
-      Contract.Requires(currentModule == null && codeContext == null && isAllocContext != null);
-      Contract.Ensures(currentModule == null && codeContext == null && isAllocContext != null);
-
-      Contract.Assert(InVerificationScope(f));
-
-      currentModule = f.EnclosingClass.EnclosingModuleDefinition;
-      codeContext = f;
-
-      Bpl.Expr prevHeap = null;
-      Bpl.Expr currHeap = null;
-      var ordinaryEtran = new ExpressionTranslator(this, predef, f.tok);
-      ExpressionTranslator etran;
-      var inParams_Heap = new List<Bpl.Variable>();
-      if (f is TwoStateFunction) {
-        var prevHeapVar = new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "previous$Heap", predef.HeapType), true);
-        var currHeapVar = new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "current$Heap", predef.HeapType), true);
-        inParams_Heap.Add(prevHeapVar);
-        inParams_Heap.Add(currHeapVar);
-        prevHeap = new Bpl.IdentifierExpr(f.tok, prevHeapVar);
-        currHeap = new Bpl.IdentifierExpr(f.tok, currHeapVar);
-        etran = new ExpressionTranslator(this, predef, currHeap, prevHeap);
-      } else {
-        etran = ordinaryEtran;
-      }
-
-      // parameters of the procedure
-      var typeInParams = MkTyParamFormals(GetTypeParams(f), true);
-      var inParams = new List<Bpl.Variable>();
-      var outParams = new List<Bpl.Variable>();
-      if (!f.IsStatic) {
-        var th = new Bpl.IdentifierExpr(f.tok, "this", TrReceiverType(f));
-        Bpl.Expr wh = Bpl.Expr.And(
-          ReceiverNotNull(th),
-          (f is TwoStateFunction ? etran.Old : etran).GoodRef(f.tok, th, ModuleResolver.GetReceiverType(f.tok, f)));
-        Bpl.Formal thVar = new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "this", TrReceiverType(f), wh), true);
-        inParams.Add(thVar);
-      }
-      foreach (Formal p in f.Formals) {
-        Bpl.Type varType = TrType(p.Type);
-        Bpl.Expr wh = GetWhereClause(p.tok, new Bpl.IdentifierExpr(p.tok, p.AssignUniqueName(f.IdGenerator), varType), p.Type,
-          p.IsOld ? etran.Old : etran, f is TwoStateFunction ? ISALLOC : NOALLOC);
-        inParams.Add(new Bpl.Formal(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(f.IdGenerator), varType, wh), true));
-      }
-      if (f.Result != null) {
-        Formal p = f.Result;
-        Contract.Assert(!p.IsOld);
-        Bpl.Type varType = TrType(p.Type);
-        Bpl.Expr wh = GetWhereClause(p.tok, new Bpl.IdentifierExpr(p.tok, p.AssignUniqueName(f.IdGenerator), varType), p.Type, etran, NOALLOC);
-        outParams.Add(new Bpl.Formal(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(f.IdGenerator), varType, wh), true));
-      }
-      // the procedure itself
-      var req = new List<Bpl.Requires>();
-      // free requires mh == ModuleContextHeight && fh == FunctionContextHeight;
-      req.Add(Requires(f.tok, true, etran.HeightContext(f), null, null, null));
-      if (f is TwoStateFunction) {
-        // free requires prevHeap == Heap && HeapSucc(prevHeap, currHeap) && IsHeap(currHeap)
-        var a0 = Bpl.Expr.Eq(prevHeap, ordinaryEtran.HeapExpr);
-        var a1 = HeapSucc(prevHeap, currHeap);
-        var a2 = FunctionCall(f.tok, BuiltinFunction.IsGoodHeap, null, currHeap);
-        req.Add(Requires(f.tok, true, BplAnd(a0, BplAnd(a1, a2)), null, null, null));
-      }
-
-      // modifies $Heap
-      var mod = new List<Bpl.IdentifierExpr> {
-        ordinaryEtran.HeapCastToIdentifierExpr,
-      };
-      // check that postconditions hold
-      var ens = new List<Bpl.Ensures>();
-      foreach (AttributedExpression p in f.Ens) {
-        var functionHeight = currentModule.CallGraph.GetSCCRepresentativePredecessorCount(f);
-        var splits = new List<SplitExprInfo>();
-        bool splitHappened /*we actually don't care*/ = TrSplitExpr(p.E, splits, true, functionHeight, true, true, etran);
-        var (errorMessage, successMessage) = CustomErrorMessage(p.Attributes);
-        foreach (var s in splits) {
-          if (s.IsChecked && !RefinementToken.IsInherited(s.Tok, currentModule)) {
-            AddEnsures(ens, Ensures(s.Tok, false, s.E, errorMessage, successMessage, null));
-          }
-        }
-      }
-      var proc = new Bpl.Procedure(f.tok, "CheckWellformed" + NameSeparator + f.FullSanitizedName, new List<Bpl.TypeVariable>(),
-        Concat(Concat(typeInParams, inParams_Heap), inParams), outParams,
-        false, req, mod, ens, etran.TrAttributes(f.Attributes, null));
-      AddVerboseName(proc, f.FullDafnyName, MethodTranslationKind.SpecWellformedness);
-      sink.AddTopLevelDeclaration(proc);
-
-      if (InsertChecksums) {
-        InsertChecksum(f, proc, true);
-      }
-
-      Contract.Assert(proc.InParams.Count == typeInParams.Count + inParams_Heap.Count + inParams.Count);
-      // Changed the next line to strip from inParams instead of proc.InParams
-      // They should be the same, but hence the added contract
-      var implInParams = Bpl.Formal.StripWhereClauses(inParams);
-      var implOutParams = Bpl.Formal.StripWhereClauses(outParams);
-      var locals = new List<Variable>();
-      var builder = new BoogieStmtListBuilder(this, options);
-      var builderInitializationArea = new BoogieStmtListBuilder(this, options);
-      builder.Add(new CommentCmd("AddWellformednessCheck for function " + f));
-      if (f is TwoStateFunction) {
-        // $Heap := current$Heap;
-        var heap = ordinaryEtran.HeapCastToIdentifierExpr;
-        builder.Add(Bpl.Cmd.SimpleAssign(f.tok, heap, etran.HeapExpr));
-        etran = ordinaryEtran;  // we no longer need the special heap names
-      }
-      builder.AddCaptureState(f.tok, false, "initial state");
-
-      DefineFrame(f.tok, f.Reads, builder, locals, null);
-      InitializeFuelConstant(f.tok, builder, etran);
-
-      // Check well-formedness of any default-value expressions (before assuming preconditions).
-      var wfo = new WFOptions(null, true, true, true); // no reads or termination checks
-      foreach (var formal in f.Formals.Where(formal => formal.DefaultValue != null)) {
-        var e = formal.DefaultValue;
-        CheckWellformed(e, wfo, locals, builder, etran);
-        builder.Add(new Bpl.AssumeCmd(e.tok, CanCallAssumption(e, etran)));
-        CheckSubrange(e.tok, etran.TrExpr(e), e.Type, formal.Type, builder);
-
-        if (formal.IsOld) {
-          Bpl.Expr wh = GetWhereClause(e.tok, etran.TrExpr(e), e.Type, etran.Old, ISALLOC, true);
-          if (wh != null) {
-            var desc = new PODesc.IsAllocated("default value", "in the two-state function's previous state");
-            builder.Add(Assert(GetToken(e), wh, desc));
-          }
-        }
-      }
-      wfo.ProcessSavedReadsChecks(locals, builderInitializationArea, builder);
-
-      // Check well-formedness of the preconditions (including termination), and then
-      // assume each one of them.  After all that (in particular, after assuming all
-      // of them), do the postponed reads checks.
-      wfo = new WFOptions(null, true, true /* do delayed reads checks */);
-      foreach (AttributedExpression p in f.Req) {
-        if (p.Label != null) {
-          p.Label.E = (f is TwoStateFunction ? ordinaryEtran : etran.Old).TrExpr(p.E);
-          CheckWellformed(p.E, wfo, locals, builder, etran);
-        } else {
-          CheckWellformedAndAssume(p.E, wfo, locals, builder, etran);
-        }
-      }
-      wfo.ProcessSavedReadsChecks(locals, builderInitializationArea, builder);
-
-      // Check well-formedness of the reads clause.  Note that this is done after assuming
-      // the preconditions.  In other words, the well-formedness of the reads clause is
-      // allowed to assume the precondition (yet, the requires clause is checked to
-      // read only those things indicated in the reads clause).
-      wfo = new WFOptions(null, true, true /* do delayed reads checks */);
-      CheckFrameWellFormed(wfo, f.Reads, locals, builder, etran);
-      wfo.ProcessSavedReadsChecks(locals, builderInitializationArea, builder);
-
-      // check well-formedness of the decreases clauses (including termination, but no reads checks)
-      foreach (Expression p in f.Decreases.Expressions) {
-        CheckWellformed(p, new WFOptions(null, false), locals, builder, etran);
-      }
-      // Generate:
-      //   if (*) {
-      //     check well-formedness of postcondition
-      //     assume false;  // don't go on to check the postconditions
-      //   } else {
-      //     check well-formedness of body
-      //     // fall through to check the postconditions themselves
-      //   }
-      // Here go the postconditions (termination checks included, but no reads checks)
-      BoogieStmtListBuilder postCheckBuilder = new BoogieStmtListBuilder(this, options);
-      // Assume the type returned by the call itself respects its type (this matters if the type is "nat", for example)
-      {
-        var args = new List<Bpl.Expr>();
-        foreach (var p in GetTypeParams(f)) {
-          args.Add(TrTypeParameter(p));
-        }
-        if (f.IsFuelAware()) {
-          args.Add(etran.layerInterCluster.GetFunctionFuel(f));
-        }
-
-        if (f.IsOpaque) {
-          args.Add(GetRevealConstant(f));
-        }
-        if (f is TwoStateFunction) {
-          args.Add(etran.Old.HeapExpr);
-        }
-        if (f.ReadsHeap) {
-          args.Add(etran.HeapExpr);
-        }
-        if (!f.IsStatic) {
-          args.Add(new Bpl.IdentifierExpr(f.tok, etran.This));
-        }
-        foreach (var p in f.Formals) {
-          args.Add(new Bpl.IdentifierExpr(p.tok, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)));
-        }
-        Bpl.IdentifierExpr funcID = new Bpl.IdentifierExpr(f.tok, f.FullSanitizedName, TrType(f.ResultType));
-        Bpl.Expr funcAppl = new Bpl.NAryExpr(f.tok, new Bpl.FunctionCall(funcID), args);
-
-        var wh = GetWhereClause(f.tok, funcAppl, f.ResultType, etran, NOALLOC);
-        if (wh != null) {
-          postCheckBuilder.Add(TrAssumeCmd(f.tok, wh));
-        }
-      }
-      // Now for the ensures clauses
-      foreach (AttributedExpression p in f.Ens) {
-        // assume the postcondition for the benefit of checking the remaining postconditions
-        CheckWellformedAndAssume(p.E, new WFOptions(f, false), locals, postCheckBuilder, etran);
-      }
-      // Here goes the body (and include both termination checks and reads checks)
-      BoogieStmtListBuilder bodyCheckBuilder = new BoogieStmtListBuilder(this, options);
-      if (f.Body == null || !RevealedInScope(f)) {
-        // don't fall through to postcondition checks
-        bodyCheckBuilder.Add(TrAssumeCmd(f.tok, Bpl.Expr.False));
-      } else {
-        var funcID = new Bpl.FunctionCall(new Bpl.IdentifierExpr(f.tok, f.FullSanitizedName, TrType(f.ResultType)));
-        var args = new List<Bpl.Expr>();
-        foreach (var p in GetTypeParams(f)) {
-          args.Add(TrTypeParameter(p));
-        }
-        if (f.IsFuelAware()) {
-          args.Add(etran.layerInterCluster.GetFunctionFuel(f));
-        }
-
-        if (f.IsOpaque) {
-          args.Add(GetRevealConstant(f));
-        }
-        if (f is TwoStateFunction) {
-          args.Add(etran.Old.HeapExpr);
-        }
-        if (f.ReadsHeap) {
-          args.Add(etran.HeapExpr);
-        }
-        foreach (Variable p in implInParams) {
-          args.Add(new Bpl.IdentifierExpr(f.tok, p));
-        }
-        Bpl.Expr funcAppl = new Bpl.NAryExpr(f.tok, funcID, args);
-
-        wfo = new WFOptions(null, true, true /* do delayed reads checks */);
-        CheckWellformedWithResult(f.Body, wfo, funcAppl, f.ResultType, locals, bodyCheckBuilder, etran);
-        if (f.Result != null) {
-          bodyCheckBuilder.Add(TrAssumeCmd(f.tok, Bpl.Expr.Eq(funcAppl, TrVar(f.tok, f.Result))));
-        }
-        wfo.ProcessSavedReadsChecks(locals, builderInitializationArea, bodyCheckBuilder);
-
-        // Enforce 'older' conditions
-        var (olderParameterCount, olderCondition) = OlderCondition(f, funcAppl, implInParams);
-        if (olderParameterCount != 0) {
-          bodyCheckBuilder.Add(Assert(f.tok, olderCondition, new PODesc.IsOlderProofObligation(olderParameterCount, f.Formals.Count + (f.IsStatic ? 0 : 1))));
-        }
-      }
-      // Combine the two, letting the postcondition be checked on after the "bodyCheckBuilder" branch
-      postCheckBuilder.Add(TrAssumeCmd(f.tok, Bpl.Expr.False));
-      builder.Add(new Bpl.IfCmd(f.tok, null, postCheckBuilder.Collect(f.tok), null, bodyCheckBuilder.Collect(f.tok)));
-
-      var s0 = builderInitializationArea.Collect(f.tok);
-      var s1 = builder.Collect(f.tok);
-      var implBody = new StmtList(new List<BigBlock>(s0.BigBlocks.Concat(s1.BigBlocks)), f.tok);
-
-      if (EmitImplementation(f.Attributes)) {
-        // emit the impl only when there are proof obligations.
-        QKeyValue kv = etran.TrAttributes(f.Attributes, null);
-        var impl = AddImplementationWithVerboseName(GetToken(f), proc,
-          Concat(Concat(Bpl.Formal.StripWhereClauses(typeInParams), inParams_Heap), implInParams),
-          implOutParams,
-          locals, implBody, kv);
-        if (InsertChecksums) {
-          InsertChecksum(f, impl);
-        }
-      }
-
-      Contract.Assert(currentModule == f.EnclosingClass.EnclosingModuleDefinition);
-      Contract.Assert(codeContext == f);
-      Reset();
-    }
-
-    void AddWellformednessCheck(RedirectingTypeDecl decl) {
-      Contract.Requires(decl != null);
-      Contract.Requires(sink != null && predef != null);
-      Contract.Requires(currentModule == null && codeContext == null && isAllocContext == null);
-      Contract.Ensures(currentModule == null && codeContext == null && isAllocContext == null);
-
-      if (!InVerificationScope(decl)) {
-        // Checked in other file
-        return;
-      }
-
-      // If there's no constraint, there's nothing to do
-      if (decl.Var == null) {
-        Contract.Assert(decl.Constraint == null);  // there's a constraint only if there's a variable to be constrained
-        Contract.Assert(decl.WitnessKind == SubsetTypeDecl.WKind.CompiledZero);  // a witness makes sense only if there is a constraint
-        Contract.Assert(decl.Witness == null);  // a witness makes sense only if there is a constraint
-        return;
-      }
-      Contract.Assert(decl.Constraint != null);  // follows from the test above and the RedirectingTypeDecl class invariant
-
-      currentModule = decl.Module;
-      codeContext = new CallableWrapper(decl, true);
-      var etran = new ExpressionTranslator(this, predef, decl.tok);
-
-      // parameters of the procedure
-      var inParams = MkTyParamFormals(decl.TypeArgs, true);
-      Bpl.Type varType = TrType(decl.Var.Type);
-      Bpl.Expr wh = GetWhereClause(decl.Var.tok, new Bpl.IdentifierExpr(decl.Var.tok, decl.Var.AssignUniqueName(decl.IdGenerator), varType), decl.Var.Type, etran, NOALLOC);
-      inParams.Add(new Bpl.Formal(decl.Var.tok, new Bpl.TypedIdent(decl.Var.tok, decl.Var.AssignUniqueName(decl.IdGenerator), varType, wh), true));
-
-      // the procedure itself
-      var req = new List<Bpl.Requires>();
-      // free requires mh == ModuleContextHeight && fh == TypeContextHeight;
-      req.Add(Requires(decl.tok, true, etran.HeightContext(decl), null, null, null));
-      // modifies $Heap
-      var mod = new List<Bpl.IdentifierExpr> {
-        etran.HeapCastToIdentifierExpr,
-      };
-      var name = MethodName(decl, MethodTranslationKind.SpecWellformedness);
-      var proc = new Bpl.Procedure(decl.tok, name, new List<Bpl.TypeVariable>(),
-        inParams, new List<Variable>(),
-        false, req, mod, new List<Bpl.Ensures>(), etran.TrAttributes(decl.Attributes, null));
-      AddVerboseName(proc, decl.Name, MethodTranslationKind.SpecWellformedness);
-      sink.AddTopLevelDeclaration(proc);
-
-      // TODO: Can a checksum be inserted here?
-
-      Contract.Assert(proc.InParams.Count == inParams.Count);
-      // Changed the next line to strip from inParams instead of proc.InParams
-      // They should be the same, but hence the added contract
-      var implInParams = Bpl.Formal.StripWhereClauses(inParams);
-      var locals = new List<Variable>();
-      var builder = new BoogieStmtListBuilder(this, options);
-      builder.Add(new CommentCmd(string.Format("AddWellformednessCheck for {0} {1}", decl.WhatKind, decl)));
-      builder.AddCaptureState(decl.tok, false, "initial state");
-      isAllocContext = new IsAllocContext(options, true);
-
-      DefineFrame(decl.tok, new List<FrameExpression>(), builder, locals, null);
-
-      // some initialization stuff;  // This is collected in builderInitializationArea
-      // define frame;
-      // if (*) {
-      //   // The following is collected in constraintCheckBuilder:
-      //   check constraint is well-formed;
-      //   assume constraint;
-      //   do reads checks;
-      // } else {
-      //   // The following is collected in witnessCheckBuilder:
-      //   check witness;
-      // }
-
-      // check well-formedness of the constraint (including termination, and delayed reads checks)
-      var constraintCheckBuilder = new BoogieStmtListBuilder(this, options);
-      var builderInitializationArea = new BoogieStmtListBuilder(this, options);
-      var wfo = new WFOptions(null, true, true /* do delayed reads checks */);
-      CheckWellformedAndAssume(decl.Constraint, wfo, locals, constraintCheckBuilder, etran);
-      wfo.ProcessSavedReadsChecks(locals, builderInitializationArea, constraintCheckBuilder);
-
-      // Check that the type is inhabited.
-      // Note, the possible witness in this check should be coordinated with the compiler, so the compiler knows how to do the initialization
-      Expression witnessExpr = null;
-      var witnessCheckBuilder = new BoogieStmtListBuilder(this, options);
-      string witnessString = null;
-      if (decl.Witness != null) {
-        // check well-formedness of the witness expression (including termination, and reads checks)
-        var ghostCodeContext = codeContext;
-        codeContext = decl.WitnessKind == SubsetTypeDecl.WKind.Compiled ? new CallableWrapper(decl, false) : ghostCodeContext;
-        CheckWellformed(decl.Witness, new WFOptions(null, true), locals, witnessCheckBuilder, etran);
-        codeContext = ghostCodeContext;
-        // check that the witness is assignable to the type of the given bound variable
-        if (decl is SubsetTypeDecl) {
-          // Note, for new-types, this has already been checked by CheckWellformed.
-          CheckResultToBeInType(decl.Witness.tok, decl.Witness, decl.Var.Type, locals, witnessCheckBuilder, etran);
-        }
-        // check that the witness expression checks out
-        witnessExpr = Substitute(decl.Constraint, decl.Var, decl.Witness);
-      } else if (decl.WitnessKind == SubsetTypeDecl.WKind.CompiledZero) {
-        var witness = Zero(decl.tok, decl.Var.Type);
-        if (witness == null) {
-          witnessString = "";
-          witnessCheckBuilder.Add(Assert(decl.tok, Bpl.Expr.False, new PODesc.WitnessCheck(witnessString)));
-        } else {
-          // before trying 0 as a witness, check that 0 can be assigned to decl.Var
-          witnessString = Printer.ExprToString(options, witness);
-          CheckResultToBeInType(decl.tok, witness, decl.Var.Type, locals, witnessCheckBuilder, etran, $"trying witness {witnessString}: ");
-          witnessExpr = Substitute(decl.Constraint, decl.Var, witness);
-        }
-      }
-      if (witnessExpr != null) {
-        var witnessCheckTok = decl.Witness != null ? GetToken(decl.Witness) : decl.tok;
-        witnessCheckBuilder.Add(new Bpl.AssumeCmd(witnessCheckTok, CanCallAssumption(witnessExpr, etran)));
-        var witnessCheck = etran.TrExpr(witnessExpr);
-
-        bool splitHappened;
-        var ss = TrSplitExpr(witnessExpr, etran, true, out splitHappened);
-        var desc = new PODesc.WitnessCheck(witnessString);
-        if (!splitHappened) {
-          witnessCheckBuilder.Add(Assert(witnessCheckTok, etran.TrExpr(witnessExpr), desc));
-        } else {
-          foreach (var split in ss) {
-            if (split.IsChecked) {
-              var tok = witnessCheckTok is IToken t ? new NestedToken(t, split.Tok) : witnessCheckTok;
-              witnessCheckBuilder.Add(AssertNS(tok, split.E, desc));
-            }
-          }
-        }
-      }
-
-      builder.Add(new Bpl.IfCmd(decl.tok, null, constraintCheckBuilder.Collect(decl.tok), null, witnessCheckBuilder.Collect(decl.tok)));
-
-      var s0 = builderInitializationArea.Collect(decl.tok);
-      var s1 = builder.Collect(decl.tok);
-      var implBody = new StmtList(new List<BigBlock>(s0.BigBlocks.Concat(s1.BigBlocks)), decl.tok);
-
-      if (EmitImplementation(decl.Attributes)) {
-        // emit the impl only when there are proof obligations.
-        QKeyValue kv = etran.TrAttributes(decl.Attributes, null);
-
-        AddImplementationWithVerboseName(GetToken(decl), proc, implInParams, new List<Variable>(), locals, implBody, kv);
-      }
-
-      // TODO: Should a checksum be inserted here?
-
-      Contract.Assert(currentModule == decl.Module);
-      Contract.Assert(CodeContextWrapper.Unwrap(codeContext) == decl);
-      isAllocContext = null;
-      Reset();
-    }
-
-    void AddWellformednessCheck(ConstantField decl) {
-      Contract.Requires(decl != null);
-      Contract.Requires(sink != null && predef != null);
-      Contract.Requires(currentModule == null && codeContext == null && isAllocContext == null && fuelContext == null);
-      Contract.Ensures(currentModule == null && codeContext == null && isAllocContext == null && fuelContext == null);
-
-      if (!InVerificationScope(decl)) {
-        // Checked in other file
-        return;
-      }
-
-      // If there's no RHS, there's nothing to do
-      if (decl.Rhs == null) {
-        return;
-      }
-
-      currentModule = decl.EnclosingModule;
-      codeContext = decl;
-      fuelContext = FuelSetting.NewFuelContext(decl);
-      var etran = new ExpressionTranslator(this, predef, decl.tok);
-
-      // parameters of the procedure
-      List<Variable> inParams = MkTyParamFormals(GetTypeParams(decl.EnclosingClass), true);
-      if (!decl.IsStatic) {
-        var receiverType = ModuleResolver.GetThisType(decl.tok, (TopLevelDeclWithMembers)decl.EnclosingClass);
-        Contract.Assert(VisibleInScope(receiverType));
-
-        var th = new Bpl.IdentifierExpr(decl.tok, "this", TrReceiverType(decl));
-        var wh = Bpl.Expr.And(
-          ReceiverNotNull(th),
-          etran.GoodRef(decl.tok, th, receiverType));
-        // for class constructors, the receiver is encoded as an output parameter
-        var thVar = new Bpl.Formal(decl.tok, new Bpl.TypedIdent(decl.tok, "this", TrReceiverType(decl), wh), true);
-        inParams.Add(thVar);
-      }
-
-      // the procedure itself
-      var req = new List<Bpl.Requires>();
-      // free requires mh == ModuleContextHeight && fh == TypeContextHeight;
-      req.Add(Requires(decl.tok, true, etran.HeightContext(decl), null, null, null));
-      var heapVar = new Bpl.IdentifierExpr(decl.tok, "$Heap", false);
-      var varlist = new List<Bpl.IdentifierExpr> { heapVar };
-      var name = MethodName(decl, MethodTranslationKind.SpecWellformedness);
-      var proc = new Bpl.Procedure(decl.tok, name, new List<Bpl.TypeVariable>(),
-        inParams, new List<Variable>(),
-        false, req, varlist, new List<Bpl.Ensures>(), etran.TrAttributes(decl.Attributes, null));
-      AddVerboseName(proc, decl.FullDafnyName, MethodTranslationKind.SpecWellformedness);
-      sink.AddTopLevelDeclaration(proc);
-
-      var implInParams = Bpl.Formal.StripWhereClauses(inParams);
-      var locals = new List<Variable>();
-      var builder = new BoogieStmtListBuilder(this, options);
-      builder.Add(new CommentCmd(string.Format("AddWellformednessCheck for {0} {1}", decl.WhatKind, decl)));
-      builder.AddCaptureState(decl.tok, false, "initial state");
-      isAllocContext = new IsAllocContext(options, true);
-
-      DefineFrame(decl.tok, new List<FrameExpression>(), builder, locals, null);
-
-      // check well-formedness of the RHS expression
-      CheckWellformed(decl.Rhs, new WFOptions(null, true), locals, builder, etran);
-      builder.Add(new Bpl.AssumeCmd(decl.Rhs.tok, CanCallAssumption(decl.Rhs, etran)));
-      CheckSubrange(decl.Rhs.tok, etran.TrExpr(decl.Rhs), decl.Rhs.Type, decl.Type, builder);
-
-      if (EmitImplementation(decl.Attributes)) {
-        // emit the impl only when there are proof obligations.
-        QKeyValue kv = etran.TrAttributes(decl.Attributes, null);
-        var implBody = builder.Collect(decl.tok);
-
-        AddImplementationWithVerboseName(GetToken(decl), proc, implInParams,
-          new List<Variable>(), locals, implBody, kv);
-      }
-
-      Contract.Assert(currentModule == decl.EnclosingModule);
-      Contract.Assert(codeContext == decl);
-      isAllocContext = null;
-      fuelContext = null;
-      Reset();
-    }
-
-    void AddWellformednessCheck(DatatypeCtor ctor) {
-      Contract.Requires(ctor != null);
-      Contract.Requires(sink != null && predef != null);
-      Contract.Requires(currentModule == null && codeContext == null && isAllocContext == null && fuelContext == null);
-      Contract.Ensures(currentModule == null && codeContext == null && isAllocContext == null && fuelContext == null);
-
-      if (!InVerificationScope(ctor)) {
-        // Checked in other file
-        return;
-      }
-
-      // If there are no parameters with default values, there's nothing to do
-      if (ctor.Formals.TrueForAll(f => f.DefaultValue == null)) {
-        return;
-      }
-
-      currentModule = ctor.EnclosingDatatype.EnclosingModuleDefinition;
-      codeContext = ctor.EnclosingDatatype;
-      fuelContext = FuelSetting.NewFuelContext(ctor.EnclosingDatatype);
-      var etran = new ExpressionTranslator(this, predef, ctor.tok);
-
-      // parameters of the procedure
-      List<Variable> inParams = MkTyParamFormals(GetTypeParams(ctor.EnclosingDatatype), true);
-      foreach (var p in ctor.Formals) {
-        Bpl.Type varType = TrType(p.Type);
-        Bpl.Expr wh = GetWhereClause(p.tok, new Bpl.IdentifierExpr(p.tok, p.AssignUniqueName(ctor.IdGenerator), varType), p.Type, etran, NOALLOC);
-        inParams.Add(new Bpl.Formal(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(ctor.IdGenerator), varType, wh), true));
-      }
-
-      // the procedure itself
-      var req = new List<Bpl.Requires>();
-      // free requires mh == ModuleContextHeight && fh == TypeContextHeight;
-      req.Add(Requires(ctor.tok, true, etran.HeightContext(ctor.EnclosingDatatype), null, null, null));
-      var heapVar = new Bpl.IdentifierExpr(ctor.tok, "$Heap", false);
-      var varlist = new List<Bpl.IdentifierExpr> { heapVar };
-      var proc = new Bpl.Procedure(ctor.tok, "CheckWellformed" + NameSeparator + ctor.FullName, new List<Bpl.TypeVariable>(),
-        inParams, new List<Variable>(),
-        false, req, varlist, new List<Bpl.Ensures>(), etran.TrAttributes(ctor.Attributes, null));
-      AddVerboseName(proc, ctor.FullName, MethodTranslationKind.SpecWellformedness);
-      sink.AddTopLevelDeclaration(proc);
-
-      var implInParams = Bpl.Formal.StripWhereClauses(inParams);
-      var locals = new List<Variable>();
-      var builder = new BoogieStmtListBuilder(this, options);
-      builder.Add(new CommentCmd(string.Format("AddWellformednessCheck for datatype constructor {0}", ctor)));
-      builder.AddCaptureState(ctor.tok, false, "initial state");
-      isAllocContext = new IsAllocContext(options, true);
-
-      DefineFrame(ctor.tok, new List<FrameExpression>(), builder, locals, null);
-
-      // check well-formedness of each default-value expression
-      foreach (var formal in ctor.Formals.Where(formal => formal.DefaultValue != null)) {
-        var e = formal.DefaultValue;
-        CheckWellformed(e, new WFOptions(null, true, false, true), locals, builder, etran);
-        builder.Add(new Bpl.AssumeCmd(e.tok, CanCallAssumption(e, etran)));
-        CheckSubrange(e.tok, etran.TrExpr(e), e.Type, formal.Type, builder);
-      }
-
-      if (EmitImplementation(ctor.Attributes)) {
-        // emit the impl only when there are proof obligations.
-        QKeyValue kv = etran.TrAttributes(ctor.Attributes, null);
-        var implBody = builder.Collect(ctor.tok);
-        AddImplementationWithVerboseName(GetToken(ctor), proc, implInParams,
-          new List<Variable>(), locals, implBody, kv);
-      }
-
-      Contract.Assert(currentModule == ctor.EnclosingDatatype.EnclosingModuleDefinition);
-      Contract.Assert(codeContext == ctor.EnclosingDatatype);
-      isAllocContext = null;
-      fuelContext = null;
-      Reset();
-    }
-
-    /// <summary>
-    /// If "declareLocals" is "false", then the locals are added only if they are new, that is, if
-    /// they don't already exist in "locals".
-    /// </summary>
-    Bpl.Expr CtorInvocation(MatchCase mc, Type sourceType, ExpressionTranslator etran, List<Variable> locals, BoogieStmtListBuilder localTypeAssumptions, IsAllocType isAlloc, bool declareLocals = true) {
-      Contract.Requires(mc != null);
-      Contract.Requires(sourceType != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(localTypeAssumptions != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      sourceType = sourceType.NormalizeExpand();
-      Contract.Assert(sourceType.TypeArgs.Count == mc.Ctor.EnclosingDatatype.TypeArgs.Count);
-      var subst = new Dictionary<TypeParameter, Type>();
-      for (var i = 0; i < mc.Ctor.EnclosingDatatype.TypeArgs.Count; i++) {
-        subst.Add(mc.Ctor.EnclosingDatatype.TypeArgs[i], sourceType.TypeArgs[i]);
-      }
-
-      List<Bpl.Expr> args = new List<Bpl.Expr>();
-      for (int i = 0; i < mc.Arguments.Count; i++) {
-        BoundVar p = mc.Arguments[i];
-        var nm = p.AssignUniqueName(currentDeclaration.IdGenerator);
-        Bpl.Variable local = declareLocals ? null : locals.FirstOrDefault(v => v.Name == nm);  // find previous local
-        if (local == null) {
-          local = new Bpl.LocalVariable(p.tok, new Bpl.TypedIdent(p.tok, nm, TrType(p.Type)));
-          locals.Add(local);
-        } else {
-          Contract.Assert(Bpl.Type.Equals(local.TypedIdent.Type, TrType(p.Type)));
-        }
-        var pFormalType = mc.Ctor.Formals[i].Type.Subst(subst);
-        var pIsAlloc = (isAlloc == ISALLOC) ? isAllocContext.Var(p) : NOALLOC;
-        Bpl.Expr wh = GetWhereClause(p.tok, new Bpl.IdentifierExpr(p.tok, local), pFormalType, etran, pIsAlloc);
-        if (wh != null) {
-          localTypeAssumptions.Add(TrAssumeCmd(p.tok, wh));
-        }
-        CheckSubrange(p.tok, new Bpl.IdentifierExpr(p.tok, local), pFormalType, p.Type, localTypeAssumptions);
-        args.Add(CondApplyBox(mc.tok, new Bpl.IdentifierExpr(p.tok, local), cce.NonNull(p.Type), mc.Ctor.Formals[i].Type));
-      }
-      Bpl.IdentifierExpr id = new Bpl.IdentifierExpr(mc.tok, mc.Ctor.FullName, predef.DatatypeType);
-      return new Bpl.NAryExpr(mc.tok, new Bpl.FunctionCall(id), args);
-    }
-
-    Bpl.Expr CtorInvocation(IToken tok, DatatypeCtor ctor, ExpressionTranslator etran, List<Variable> locals, BoogieStmtListBuilder localTypeAssumptions) {
-      Contract.Requires(tok != null);
-      Contract.Requires(ctor != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(localTypeAssumptions != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      // create local variables for the formals
-      var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator("a#");
-      var args = new List<Bpl.Expr>();
-      foreach (Formal arg in ctor.Formals) {
-        Contract.Assert(arg != null);
-        var nm = varNameGen.FreshId(string.Format("#{0}#", args.Count));
-        Bpl.Variable bv = new Bpl.LocalVariable(arg.tok, new Bpl.TypedIdent(arg.tok, nm, TrType(arg.Type)));
-        locals.Add(bv);
-        args.Add(new Bpl.IdentifierExpr(arg.tok, bv));
-      }
-
-      Bpl.IdentifierExpr id = new Bpl.IdentifierExpr(tok, ctor.FullName, predef.DatatypeType);
-      return new Bpl.NAryExpr(tok, new Bpl.FunctionCall(id), args);
-    }
-
-    Bpl.Expr CanCallAssumption(Expression expr, ExpressionTranslator etran) {
-      Contract.Requires(expr != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      if (expr is LiteralExpr || expr is ThisExpr || expr is IdentifierExpr || expr is WildcardExpr || expr is BoogieWrapper) {
-        return Bpl.Expr.True;
-      } else if (expr is DisplayExpression) {
-        DisplayExpression e = (DisplayExpression)expr;
-        return CanCallAssumption(e.Elements, etran);
-      } else if (expr is MapDisplayExpr) {
-        MapDisplayExpr e = (MapDisplayExpr)expr;
-        List<Expression> l = new List<Expression>();
-        foreach (ExpressionPair p in e.Elements) {
-          l.Add(p.A); l.Add(p.B);
-        }
-        return CanCallAssumption(l, etran);
-      } else if (expr is MemberSelectExpr) {
-        MemberSelectExpr e = (MemberSelectExpr)expr;
-        var r = CanCallAssumption(e.Obj, etran);
-        if (e.Member is DatatypeDestructor) {
-          var dtor = (DatatypeDestructor)e.Member;
-          if (dtor.EnclosingCtors.Count == dtor.EnclosingCtors[0].EnclosingDatatype.Ctors.Count) {
-            // Every constructor has this destructor; might as well assume that here.
-            var correctConstructor = BplOr(dtor.EnclosingCtors.ConvertAll(
-              ctor => FunctionCall(e.tok, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, etran.TrExpr(e.Obj))));
-            r = BplAnd(r, correctConstructor);
-          }
-        }
-        return r;
-      } else if (expr is SeqSelectExpr) {
-        SeqSelectExpr e = (SeqSelectExpr)expr;
-        Bpl.Expr total = CanCallAssumption(e.Seq, etran);
-        if (e.E0 != null) {
-          total = BplAnd(total, CanCallAssumption(e.E0, etran));
-        }
-        if (e.E1 != null) {
-          total = BplAnd(total, CanCallAssumption(e.E1, etran));
-        }
-        return total;
-      } else if (expr is MultiSelectExpr) {
-        MultiSelectExpr e = (MultiSelectExpr)expr;
-        Bpl.Expr total = CanCallAssumption(e.Array, etran);
-        foreach (Expression idx in e.Indices) {
-          total = BplAnd(total, CanCallAssumption(idx, etran));
-        }
-        return total;
-      } else if (expr is SeqUpdateExpr) {
-        SeqUpdateExpr e = (SeqUpdateExpr)expr;
-        Bpl.Expr total = CanCallAssumption(e.Seq, etran);
-        total = BplAnd(total, CanCallAssumption(e.Index, etran));
-        total = BplAnd(total, CanCallAssumption(e.Value, etran));
-        return total;
-      } else if (expr is ApplyExpr) {
-        ApplyExpr e = (ApplyExpr)expr;
-        return BplAnd(
-          Cons(CanCallAssumption(e.Function, etran),
-          e.Args.ConvertAll(ee => CanCallAssumption(ee, etran))));
-      } else if (expr is FunctionCallExpr) {
-        FunctionCallExpr e = (FunctionCallExpr)expr;
-        Bpl.Expr r = CanCallAssumption(e.Receiver, etran);
-        r = BplAnd(r, CanCallAssumption(e.Args, etran));
-        if (!(e.Function is SpecialFunction)) {
-          // get to assume canCall
-          Bpl.IdentifierExpr canCallFuncID = new Bpl.IdentifierExpr(expr.tok, e.Function.FullSanitizedName + "#canCall", Bpl.Type.Bool);
-          List<Bpl.Expr> args = etran.FunctionInvocationArguments(e, null, null);
-          Bpl.Expr canCallFuncAppl = new Bpl.NAryExpr(GetToken(expr), new Bpl.FunctionCall(canCallFuncID), args);
-          r = BplAnd(r, canCallFuncAppl);
-        }
-        return r;
-      } else if (expr is DatatypeValue) {
-        DatatypeValue dtv = (DatatypeValue)expr;
-        return CanCallAssumption(dtv.Arguments, etran);
-      } else if (expr is SeqConstructionExpr) {
-        var e = (SeqConstructionExpr)expr;
-        return BplAnd(CanCallAssumption(e.N, etran), CanCallAssumption(e.Initializer, etran));
-      } else if (expr is MultiSetFormingExpr) {
-        MultiSetFormingExpr e = (MultiSetFormingExpr)expr;
-        return CanCallAssumption(e.E, etran);
-      } else if (expr is OldExpr) {
-        var e = (OldExpr)expr;
-        return CanCallAssumption(e.E, etran.OldAt(e.AtLabel));
-      } else if (expr is UnchangedExpr) {
-        var e = (UnchangedExpr)expr;
-        Bpl.Expr be = Bpl.Expr.True;
-        foreach (var fe in e.Frame) {
-          be = BplAnd(be, CanCallAssumption(fe.E, etran));
-        }
-        return be;
-      } else if (expr is UnaryExpr) {
-        var e = (UnaryExpr)expr;
-        return CanCallAssumption(e.E, etran);
-      } else if (expr is BinaryExpr) {
-        // The short-circuiting boolean operators &&, ||, and ==> end up duplicating their
-        // left argument. Therefore, we first try to re-associate the expression to make
-        // left arguments smaller.
-        if (ReAssociateToTheRight(ref expr)) {
-          return CanCallAssumption(expr, etran);
-        }
-        var e = (BinaryExpr)expr;
-
-        Bpl.Expr t0 = CanCallAssumption(e.E0, etran);
-        Bpl.Expr t1 = CanCallAssumption(e.E1, etran);
-        switch (e.ResolvedOp) {
-          case BinaryExpr.ResolvedOpcode.And:
-          case BinaryExpr.ResolvedOpcode.Imp:
-            t1 = BplImp(etran.TrExpr(e.E0), t1);
-            break;
-          case BinaryExpr.ResolvedOpcode.Or:
-            t1 = BplImp(Bpl.Expr.Not(etran.TrExpr(e.E0)), t1);
-            break;
-          case BinaryExpr.ResolvedOpcode.EqCommon:
-          case BinaryExpr.ResolvedOpcode.NeqCommon: {
-              Bpl.Expr r = Bpl.Expr.True;
-              var dt = e.E0.Type.AsDatatype;
-              if (dt != null) {
-                var funcID = new Bpl.FunctionCall(new Bpl.IdentifierExpr(expr.tok, "$IsA#" + dt.FullSanitizedName, Bpl.Type.Bool));
-                if (!(e.E0.Resolved is DatatypeValue)) {
-                  r = BplAnd(r, new Bpl.NAryExpr(expr.tok, funcID, new List<Bpl.Expr> { etran.TrExpr(e.E0) }));
-                }
-                if (!(e.E1.Resolved is DatatypeValue)) {
-                  r = BplAnd(r, new Bpl.NAryExpr(expr.tok, funcID, new List<Bpl.Expr> { etran.TrExpr(e.E1) }));
-                }
-              }
-              return BplAnd(r, BplAnd(t0, t1));
-            }
-          case BinaryExpr.ResolvedOpcode.Mul:
-            if (7 <= options.ArithMode) {
-              if (e.E0.Type.IsNumericBased(Type.NumericPersuasion.Int) && !options.DisableNLarith) {
-                // Produce a useful fact about the associativity of multiplication. It is a bit dicey to do as an axiom.
-                // Change (k*A)*B or (A*k)*B into (A*B)*k, where k is a numeric literal
-                var left = e.E0.Resolved as BinaryExpr;
-                if (left != null && left.ResolvedOp == BinaryExpr.ResolvedOpcode.Mul) {
-                  Bpl.Expr r = Bpl.Expr.True;
-                  if (left.E0.Resolved is LiteralExpr) {
-                    // (K*A)*B == (A*B)*k
-                    var y = Expression.CreateMul(Expression.CreateMul(left.E1, e.E1), left.E0);
-                    var eq = Expression.CreateEq(e, y, e.E0.Type);
-                    r = BplAnd(r, etran.TrExpr(eq));
-                  }
-                  if (left.E1.Resolved is LiteralExpr) {
-                    // (A*k)*B == (A*B)*k
-                    var y = Expression.CreateMul(Expression.CreateMul(left.E0, e.E1), left.E1);
-                    var eq = Expression.CreateEq(e, y, e.E0.Type);
-                    r = BplAnd(r, etran.TrExpr(eq));
-                  }
-                  if (r != Bpl.Expr.True) {
-                    return BplAnd(BplAnd(t0, t1), r);
-                  }
-                }
-              }
-            }
-            break;
-          default:
-            break;
-        }
-        return BplAnd(t0, t1);
-      } else if (expr is TernaryExpr) {
-        var e = (TernaryExpr)expr;
-        return BplAnd(CanCallAssumption(e.E0, etran), BplAnd(CanCallAssumption(e.E1, etran), CanCallAssumption(e.E2, etran)));
-
-      } else if (expr is LetExpr) {
-        var e = (LetExpr)expr;
-        if (!e.Exact) {
-          // CanCall[[ var b0,b1 :| RHS(b0,b1,g); Body(b0,b1,g,h) ]] =
-          //   $let$canCall(g) &&
-          //   CanCall[[ Body($let$b0(g), $let$b1(g), h) ]]
-          LetDesugaring(e);  // call LetDesugaring to prepare the desugaring and populate letSuchThatExprInfo with something for e
-          var info = letSuchThatExprInfo[e];
-          // $let$canCall(g)
-          var canCall = info.CanCallFunctionCall(this, etran);
-          Dictionary<IVariable, Expression> substMap = new Dictionary<IVariable, Expression>();
-          foreach (var bv in e.BoundVars) {
-            // create a call to $let$x(g)
-            var args = info.SkolemFunctionArgs(bv, this, etran);
-            var call = new BoogieFunctionCall(bv.tok, info.SkolemFunctionName(bv), info.UsesHeap, info.UsesOldHeap, info.UsesHeapAt, args.Item1, args.Item2);
-            call.Type = bv.Type;
-            substMap.Add(bv, call);
-          }
-          var p = Substitute(e.Body, null, substMap);
-          var cc = BplAnd(canCall, CanCallAssumption(p, etran));
-          return cc;
-        } else {
-          // CanCall[[ var b := RHS(g); Body(b,g,h) ]] =
-          //   CanCall[[ RHS(g) ]] &&
-          //   (var lhs0,lhs1,... := rhs0,rhs1,...;  CanCall[[ Body ]])
-          Bpl.Expr canCallRHS = Bpl.Expr.True;
-          foreach (var rhs in e.RHSs) {
-            canCallRHS = BplAnd(canCallRHS, CanCallAssumption(rhs, etran));
-          }
-
-          var bodyCanCall = CanCallAssumption(e.Body, etran);
-          // We'd like to compute the free variables if "bodyCanCall". It would be nice to use the Boogie
-          // routine Bpl.Expr.ComputeFreeVariables for this purpose. However, calling it requires the Boogie
-          // expression to be resolved. Instead, we do the cheesy thing of computing the set of names of
-          // free variables in "bodyCanCall".
-          var vis = new VariableNameVisitor();
-          vis.Visit(bodyCanCall);
-
-          List<Bpl.Variable> lhssAll;
-          List<Bpl.Expr> rhssAll;
-          etran.TrLetExprPieces(e, out lhssAll, out rhssAll);
-          Contract.Assert(lhssAll.Count == rhssAll.Count);
-
-          // prune lhss,rhss to contain only those pairs where the LHS is used in the body
-          var lhssPruned = new List<Bpl.Variable>();
-          var rhssPruned = new List<Bpl.Expr>();
-          for (var i = 0; i < lhssAll.Count; i++) {
-            var bv = lhssAll[i];
-            if (vis.Names.Contains(bv.Name)) {
-              lhssPruned.Add(bv);
-              rhssPruned.Add(rhssAll[i]);
-            }
-          }
-          Bpl.Expr let = lhssPruned.Count == 0 ? bodyCanCall : new Bpl.LetExpr(e.tok, lhssPruned, rhssPruned, null, bodyCanCall);
-          return BplAnd(canCallRHS, let);
-        }
-
-      } else if (expr is LambdaExpr) {
-        var e = (LambdaExpr)expr;
-
-        var bvarsAndAntecedents = new List<Tuple<Bpl.Variable, Bpl.Expr>>();
-        var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator("$l#");
-
-        Bpl.Expr heap; var hVar = BplBoundVar(varNameGen.FreshId("#heap#"), predef.HeapType, out heap);
-        var et = new ExpressionTranslator(etran, heap);
-
-        Dictionary<IVariable, Expression> subst = new Dictionary<IVariable, Expression>();
-        foreach (var bv in e.BoundVars) {
-          Bpl.Expr ve; var yVar = BplBoundVar(varNameGen.FreshId(string.Format("#{0}#", bv.Name)), TrType(bv.Type), out ve);
-          var wh = GetWhereClause(bv.tok, new Bpl.IdentifierExpr(bv.tok, yVar), bv.Type, et, NOALLOC);
-          bvarsAndAntecedents.Add(Tuple.Create<Bpl.Variable, Bpl.Expr>(yVar, wh));
-          subst[bv] = new BoogieWrapper(ve, bv.Type);
-        }
-
-        var canCall = CanCallAssumption(Substitute(e.Body, null, subst), et);
-        if (e.Range != null) {
-          var range = Substitute(e.Range, null, subst);
-          canCall = BplAnd(CanCallAssumption(range, etran), BplImp(etran.TrExpr(range), canCall));
-        }
-
-        // It's important to add the heap last to "bvarsAndAntecedents", because the heap may occur in the antecedents of
-        // the other variables and BplForallTrim processes the given tuples in order.
-        var goodHeap = FunctionCall(e.tok, BuiltinFunction.IsGoodHeap, null, heap);
-        bvarsAndAntecedents.Add(Tuple.Create<Bpl.Variable, Bpl.Expr>(hVar, goodHeap));
-
-        //TRIG (forall $l#0#heap#0: Heap, $l#0#x#0: int :: true)
-        //TRIG (forall $l#0#heap#0: Heap, $l#0#t#0: DatatypeType :: _module.__default.TMap#canCall(_module._default.TMap$A, _module._default.TMap$B, $l#0#heap#0, $l#0#t#0, f#0))
-        //TRIG (forall $l#4#heap#0: Heap, $l#4#x#0: Box :: _0_Monad.__default.Bind#canCall(Monad._default.Associativity$B, Monad._default.Associativity$C, $l#4#heap#0, Apply1(Monad._default.Associativity$A, #$M$B, f#0, $l#4#heap#0, $l#4#x#0), g#0))
-        return BplForallTrim(bvarsAndAntecedents, null, canCall); // L_TRIGGER
-
-      } else if (expr is ComprehensionExpr) {
-        var e = (ComprehensionExpr)expr;
-        if (e is QuantifierExpr q && q.SplitQuantifier != null) {
-          return CanCallAssumption(q.SplitQuantifierExpression, etran);
-        }
-
-        // Determine the CanCall's for the range and term
-        var canCall = CanCallAssumption(e.Term, etran);
-        if (e.Range != null) {
-          canCall = BplAnd(CanCallAssumption(e.Range, etran), BplImp(etran.TrExpr(e.Range), canCall));
-        }
-        if (expr is MapComprehension mc && mc.IsGeneralMapComprehension) {
-          canCall = BplAnd(canCall, CanCallAssumption(mc.TermLeft, etran));
-
-          // The translation of "map x,y | R(x,y) :: F(x,y) := G(x,y)" makes use of projection
-          // functions project_x,project_y.  These are functions defined here by the following axiom:
-          //     forall x,y :: R(x,y) ==> var x',y' := project_x(F(x,y)),project_y(F(x,y)); R(x',y') && F(x',y') == F(x,y)
-          // that is (without the let expression):
-          //     forall x,y :: R(x,y) ==> R(project_x(F(x,y)), project_y(F(x,y))) && F(project_x(F(x,y)), project_y(F(x,y))) == F(x,y)
-          // The triggers for the quantification are those detected for the given map comprehension, if any.
-          List<Bpl.Variable> bvs;
-          List<Bpl.Expr> args;
-          CreateBoundVariables(mc.BoundVars, out bvs, out args);
-          Contract.Assert(mc.BoundVars.Count == bvs.Count);
-          CreateMapComprehensionProjectionFunctions(mc);
-          Contract.Assert(mc.ProjectionFunctions != null);
-          Contract.Assert(mc.ProjectionFunctions.Count == mc.BoundVars.Count);
-          var substMap = new Dictionary<IVariable, Expression>();
-          for (var i = 0; i < mc.BoundVars.Count; i++) {
-            substMap.Add(mc.BoundVars[i], new BoogieWrapper(args[i], mc.BoundVars[i].Type));
-          }
-          var R = etran.TrExpr(Substitute(mc.Range, null, substMap));
-          var F = etran.TrExpr(Substitute(mc.TermLeft, null, substMap));
-          var trig = TrTrigger(etran, e.Attributes, expr.tok, substMap);
-          substMap = new Dictionary<IVariable, Expression>();
-          for (var i = 0; i < mc.BoundVars.Count; i++) {
-            var p = new Bpl.NAryExpr(GetToken(mc), new Bpl.FunctionCall(mc.ProjectionFunctions[i]), new List<Bpl.Expr> { F });
-            substMap.Add(e.BoundVars[i], new BoogieWrapper(p, e.BoundVars[i].Type));
-          }
-          var Rprime = etran.TrExpr(Substitute(mc.Range, null, substMap));
-          var Fprime = etran.TrExpr(Substitute(mc.TermLeft, null, substMap));
-          var defn = BplForall(bvs, trig, BplImp(R, BplAnd(Rprime, Bpl.Expr.Eq(F, Fprime))));
-          canCall = BplAnd(canCall, defn);
-        }
-        // Create a list of all possible bound variables
-        var bvarsAndAntecedents = etran.TrBoundVariables_SeparateWhereClauses(e.BoundVars);
-        // Produce the quantified CanCall expression, with a suitably reduced set of bound variables
-        var tr = TrTrigger(etran, e.Attributes, expr.tok);
-        return BplForallTrim(bvarsAndAntecedents, tr, canCall);
-
-      } else if (expr is StmtExpr) {
-        var e = (StmtExpr)expr;
-        return CanCallAssumption(e.E, etran);
-      } else if (expr is ITEExpr) {
-        ITEExpr e = (ITEExpr)expr;
-        Bpl.Expr total = CanCallAssumption(e.Test, etran);
-        Bpl.Expr test = etran.TrExpr(e.Test);
-        total = BplAnd(total, BplImp(test, CanCallAssumption(e.Thn, etran)));
-        total = BplAnd(total, BplImp(Bpl.Expr.Not(test), CanCallAssumption(e.Els, etran)));
-        return total;
-      } else if (expr is ConcreteSyntaxExpression) {
-        var e = (ConcreteSyntaxExpression)expr;
-        return CanCallAssumption(e.ResolvedExpression, etran);
-      } else if (expr is NestedMatchExpr nestedMatchExpr) {
-        return CanCallAssumption(nestedMatchExpr.Flattened, etran);
-      } else if (expr is BoogieFunctionCall) {
-        var e = (BoogieFunctionCall)expr;
-        return CanCallAssumption(e.Args, etran);
-      } else if (expr is MatchExpr) {
-        var e = (MatchExpr)expr;
-        var ite = etran.DesugarMatchExpr(e);
-        return CanCallAssumption(ite, etran);
-      } else if (expr is BoxingCastExpr) {
-        var e = (BoxingCastExpr)expr;
-        return CanCallAssumption(e.E, etran);
-      } else if (expr is UnboxingCastExpr) {
-        var e = (UnboxingCastExpr)expr;
-        return CanCallAssumption(e.E, etran);
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected expression
-      }
-    }
-
-    void AddCasePatternVarSubstitutions(CasePattern<BoundVar> pat, Bpl.Expr rhs, Dictionary<IVariable, Expression> substMap) {
-      Contract.Requires(pat != null);
-      Contract.Requires(rhs != null);
-      Contract.Requires(substMap != null);
-      if (pat.Var != null) {
-        substMap.Add(pat.Var, new BoogieWrapper(rhs, pat.Var.Type));
-      } else if (pat.Arguments != null) {
-        Contract.Assert(pat.Ctor != null);  // follows from successful resolution
-        Contract.Assert(pat.Arguments.Count == pat.Ctor.Destructors.Count);  // follows from successful resolution
-        for (int i = 0; i < pat.Arguments.Count; i++) {
-          var arg = pat.Arguments[i];
-          var dtor = pat.Ctor.Destructors[i];
-          var r = new Bpl.NAryExpr(pat.tok, new Bpl.FunctionCall(GetReadonlyField(dtor)), new List<Bpl.Expr> { rhs });
-          var de = CondApplyUnbox(pat.tok, r, dtor.Type, arg.Expr.Type);
-          AddCasePatternVarSubstitutions(arg, de, substMap);
-        }
-      }
-    }
-
-    /// <summary>
-    /// If "expr" is a binary boolean operation, then try to re-associate it to make the left argument smaller.
-    /// If it is possible, then "true" is returned and "expr" returns as the re-associated expression (no boolean simplifications are performed).
-    /// If not, then "false" is returned and "expr" is unchanged.
-    /// </summary>
-    bool ReAssociateToTheRight(ref Expression expr) {
-      if (expr is BinaryExpr top && Expression.StripParens(top.E0) is BinaryExpr left) {
-        // We have an expression of the form "(A oo B) pp C"
-        var A = left.E0;
-        var oo = left.ResolvedOp;
-        var B = left.E1;
-        var pp = top.ResolvedOp;
-        var C = top.E1;
-
-        if (oo == BinaryExpr.ResolvedOpcode.And && pp == BinaryExpr.ResolvedOpcode.And) {
-          // rewrite    (A && B) && C    into    A && (B && C)
-          expr = Expression.CreateAnd(A, Expression.CreateAnd(B, C, false), false);
-          return true;
-        } else if (oo == BinaryExpr.ResolvedOpcode.And && pp == BinaryExpr.ResolvedOpcode.Imp) {
-          // rewrite    (A && B) ==> C    into    A ==> (B ==> C)
-          expr = Expression.CreateImplies(A, Expression.CreateImplies(B, C, false), false);
-          return true;
-        } else if (oo == BinaryExpr.ResolvedOpcode.Or && pp == BinaryExpr.ResolvedOpcode.Or) {
-          // rewrite    (A || B) || C    into    A || (B || C)
-          expr = Expression.CreateOr(A, Expression.CreateOr(B, C, false), false);
-          return true;
-        } else if (oo == BinaryExpr.ResolvedOpcode.Imp && pp == BinaryExpr.ResolvedOpcode.Or) {
-          // rewrite    (A ==> B) || C    into    A ==> (B || C)
-          expr = Expression.CreateImplies(A, Expression.CreateOr(B, C, false), false);
-          return true;
-        }
-      }
-      return false;
-    }
-
-    void CheckCasePatternShape<VT>(CasePattern<VT> pat, Bpl.Expr rhs, IToken rhsTok, Type rhsType, BoogieStmtListBuilder builder)
-      where VT : class, IVariable {
-      Contract.Requires(pat != null);
-      Contract.Requires(rhs != null);
-      Contract.Requires(rhsTok != null);
-      Contract.Requires(rhsType != null);
-      Contract.Requires(builder != null);
-      if (pat.Var != null) {
-        CheckSubrange(rhsTok, rhs, rhsType, pat.Var.Type, builder);
-      } else if (pat.Arguments != null) {
-        Contract.Assert(pat.Ctor != null);  // follows from successful resolution
-        Contract.Assert(pat.Arguments.Count == pat.Ctor.Destructors.Count);  // follows from successful resolution
-        rhsType = rhsType.Normalize();
-        Contract.Assert(rhsType is UserDefinedType && ((UserDefinedType)rhsType).ResolvedClass != null);
-        var rhsTypeUdt = (UserDefinedType)rhsType;
-        var typeSubstMap = TypeParameter.SubstitutionMap(rhsTypeUdt.ResolvedClass.TypeArgs, rhsTypeUdt.TypeArgs);
-
-        var ctor = pat.Ctor;
-        var correctConstructor = FunctionCall(pat.tok, ctor.QueryField.FullSanitizedName, Bpl.Type.Bool, rhs);
-        if (ctor.EnclosingDatatype.Ctors.Count == 1) {
-          // There is only one constructor, so the value must have been constructed by it; might as well assume that here.
-          builder.Add(TrAssumeCmd(pat.tok, correctConstructor));
-        } else {
-          builder.Add(Assert(pat.tok, correctConstructor, new PODesc.PatternShapeIsValid(ctor.Name)));
-        }
-        for (int i = 0; i < pat.Arguments.Count; i++) {
-          var arg = pat.Arguments[i];
-          var dtor = ctor.Destructors[i];
-
-          var r = new Bpl.NAryExpr(arg.tok, new Bpl.FunctionCall(GetReadonlyField(dtor)), new List<Bpl.Expr> { rhs });
-          Type argType = dtor.Type.Subst(typeSubstMap);
-          var de = CondApplyUnbox(arg.tok, r, dtor.Type, argType);
-          CheckCasePatternShape(arg, de, arg.tok, argType, builder);
-        }
-      }
-    }
-
-    Bpl.Expr/*!*/ CanCallAssumption(List<Expression/*!*/>/*!*/ exprs, ExpressionTranslator/*!*/ etran) {
-      Contract.Requires(etran != null);
-      Contract.Requires(exprs != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      Bpl.Expr total = Bpl.Expr.True;
-      foreach (Expression e in exprs) {
-        Contract.Assert(e != null);
-        total = BplAnd(total, CanCallAssumption(e, etran));
-      }
-      return total;
-    }
-
-    void CheckNonNull(IToken tok, Expression e, BoogieStmtListBuilder builder, ExpressionTranslator etran, Bpl.QKeyValue kv) {
-      Contract.Requires(tok != null);
-      Contract.Requires(e != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-
-      if (!e.Type.IsRefType) {
-        // nothing to do
-      } else if (e is ThisExpr) {
-        // already known to be non-null
-      } else if (e is StaticReceiverExpr) {
-        // also ok
-      } else {
-        builder.Add(Assert(tok, Bpl.Expr.Neq(etran.TrExpr(e), predef.Null), new PODesc.NonNull("target object"), kv));
-      }
-    }
-
-    void TrStmt_CheckWellformed(Expression expr, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran, bool subsumption, bool lValueContext = false) {
-      Contract.Requires(expr != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-
-      Bpl.QKeyValue kv;
-      if (subsumption) {
-        kv = null;  // this is the default behavior of Boogie's assert
-      } else {
-        List<object> args = new List<object>();
-        // {:subsumption 0}
-        args.Add(Bpl.Expr.Literal(0));
-        kv = new Bpl.QKeyValue(expr.tok, "subsumption", args, null);
-      }
-      var options = new WFOptions(kv);
-      if (lValueContext) {
-        options = new WFOptions(true, options);
-      }
-      CheckWellformed(expr, options, locals, builder, etran);
-      builder.Add(TrAssumeCmd(expr.tok, CanCallAssumption(expr, etran)));
-    }
-
-    /// <summary>
-    /// Returns the translation of converting "r", whose Dafny type was "fromType", to a value of type "toType".
-    /// The translation assumes that "r" is known to be a value of type "toType".
-    /// </summary>
-    Bpl.Expr ConvertExpression(IToken tok, Bpl.Expr r, Type fromType, Type toType) {
-      Contract.Requires(tok != null);
-      Contract.Requires(r != null);
-      Contract.Requires(fromType != null);
-      Contract.Requires(toType != null);
-      toType = toType.NormalizeExpand();
-      fromType = fromType.NormalizeExpand();
-      if (fromType.IsNumericBased(Type.NumericPersuasion.Int)) {
-        if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
-          // do nothing
-        } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          r = FunctionCall(tok, BuiltinFunction.IntToReal, null, r);
-        } else if (toType.IsCharType) {
-          r = FunctionCall(tok, BuiltinFunction.CharFromInt, null, r);
-        } else if (toType.IsBitVectorType) {
-          r = IntToBV(tok, r, toType);
-        } else if (toType.IsBigOrdinalType) {
-          r = FunctionCall(tok, "ORD#FromNat", predef.BigOrdinalType, r);
-        } else {
-          Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
-        }
-        return r;
-      } else if (fromType.IsBitVectorType) {
-        var fromWidth = fromType.AsBitVectorType.Width;
-        if (toType.IsBitVectorType) {
-          // conversion from one bitvector type to another
-          var toWidth = toType.AsBitVectorType.Width;
-          if (fromWidth == toWidth) {
-            // no conversion
-          } else if (fromWidth < toWidth) {
-            var zeros = BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, toWidth - fromWidth);
-            if (fromWidth == 0) {
-              r = zeros;
-            } else {
-              var concat = new Bpl.BvConcatExpr(tok, zeros, r);
-              // There's a bug in Boogie that causes a warning to be emitted if a BvConcatExpr is passed as the argument
-              // to $Box, which takes a type argument.  The bug can apparently be worked around by giving an explicit
-              // (and other redudant) type conversion.
-              r = Bpl.Expr.CoerceType(tok, concat, BplBvType(toWidth));
-            }
-          } else if (toWidth == 0) {
-            r = BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, toWidth);
-          } else {
-            r = new Bpl.BvExtractExpr(tok, r, toWidth, 0);
-          }
-        } else if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
-          r = FunctionCall(tok, "nat_from_bv" + fromWidth, Bpl.Type.Int, r);
-        } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          r = FunctionCall(tok, "nat_from_bv" + fromWidth, Bpl.Type.Int, r);
-          r = FunctionCall(tok, BuiltinFunction.IntToReal, null, r);
-        } else if (toType.IsCharType) {
-          r = FunctionCall(tok, "nat_from_bv" + fromWidth, Bpl.Type.Int, r);
-          r = FunctionCall(tok, BuiltinFunction.CharFromInt, null, r);
-        } else if (toType.IsBigOrdinalType) {
-          r = FunctionCall(tok, "nat_from_bv" + fromWidth, Bpl.Type.Int, r);
-          r = FunctionCall(tok, "ORD#FromNat", predef.BigOrdinalType, r);
-        } else {
-          Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
-        }
-        return r;
-      } else if (fromType.IsCharType) {
-        if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
-          r = FunctionCall(tok, BuiltinFunction.CharToInt, null, r);
-        } else if (toType.IsCharType) {
-          // do nothing
-        } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          r = FunctionCall(tok, BuiltinFunction.CharToInt, null, r);
-          r = FunctionCall(tok, BuiltinFunction.IntToReal, null, r);
-        } else if (toType.IsBitVectorType) {
-          r = FunctionCall(tok, BuiltinFunction.CharToInt, null, r);
-          r = IntToBV(tok, r, toType);
-        } else if (toType.IsBigOrdinalType) {
-          r = FunctionCall(tok, BuiltinFunction.CharToInt, null, r);
-          r = FunctionCall(tok, "ORD#FromNat", Bpl.Type.Int, r);
-        } else {
-          Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
-        }
-        return r;
-      } else if (fromType.IsNumericBased(Type.NumericPersuasion.Real)) {
-        if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // do nothing
-        } else if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
-          r = FunctionCall(tok, BuiltinFunction.RealToInt, null, r);
-        } else if (toType.IsBitVectorType) {
-          r = FunctionCall(tok, BuiltinFunction.RealToInt, null, r);
-          r = IntToBV(tok, r, toType);
-        } else if (toType.IsCharType) {
-          r = FunctionCall(tok, BuiltinFunction.RealToInt, null, r);
-          r = FunctionCall(tok, BuiltinFunction.CharFromInt, null, r);
-        } else if (toType.IsBigOrdinalType) {
-          r = FunctionCall(tok, BuiltinFunction.RealToInt, null, r);
-          r = FunctionCall(tok, "ORD#FromNat", Bpl.Type.Int, r);
-        } else {
-          Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
-        }
-        return r;
-        // "r" now denotes an integer
-      } else if (fromType.IsBigOrdinalType) {
-        if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
-          r = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, r);
-        } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
-          r = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, r);
-          r = FunctionCall(tok, BuiltinFunction.IntToReal, null, r);
-        } else if (toType.IsCharType) {
-          r = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, r);
-          r = FunctionCall(tok, BuiltinFunction.CharFromInt, null, r);
-        } else if (toType.IsBitVectorType) {
-          r = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, r);
-          r = IntToBV(tok, r, toType);
-        } else if (toType.IsBigOrdinalType) {
-          // do nothing
-        } else {
-          Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
-        }
-        return r;
-      } else if (fromType.IsRefType && toType.IsRefType) {
-        return r;
-      } else if (fromType.IsRefType) {
-        Contract.Assert(toType.IsTraitType);
-        return BoxIfNecessary(r.tok, r, fromType);
-      } else if (toType.IsRefType) {
-        Contract.Assert(fromType.IsTraitType);
-        return UnboxIfBoxed(r, toType);
-      } else if (toType.IsTraitType) {
-        // cast to a non-reference trait
-        return BoxIfNecessary(r.tok, r, fromType);
-      } else if (fromType.IsTraitType) {
-        // cast from a non-reference trait
-        return UnboxIfBoxed(r, toType);
-      } else {
-        Contract.Assert(false, $"No translation implemented from {fromType} to {toType}");
-      }
-      return r;
-    }
-
-    private Bpl.Expr IntToBV(IToken tok, Bpl.Expr r, Type toType) {
-      var toWidth = toType.AsBitVectorType.Width;
-      if (RemoveLit(r) is Bpl.LiteralExpr) {
-        Bpl.LiteralExpr e = (Bpl.LiteralExpr)RemoveLit(r);
-        if (e.isBigNum) {
-          var toBound = BaseTypes.BigNum.FromBigInt(BigInteger.One << toWidth);  // 1 << toWidth
-          if (e.asBigNum <= toBound) {
-            return BplBvLiteralExpr(r.tok, e.asBigNum, toType.AsBitVectorType);
-          }
-        }
-      }
-      return FunctionCall(tok, "nat_to_bv" + toWidth, BplBvType(toWidth), r);
-    }
-
-    /// <summary>
-    /// Emit checks that "expr" (which may or may not be a value of type "expr.Type"!) is a value of type "toType".
-    /// </summary>
-    void CheckResultToBeInType(IToken tok, Expression expr, Type toType, List<Bpl.Variable> locals, BoogieStmtListBuilder builder, ExpressionTranslator etran, string errorMsgPrefix = "") {
-      Contract.Requires(tok != null);
-      Contract.Requires(expr != null);
-      Contract.Requires(toType != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(errorMsgPrefix != null);
-
-      // Lazily create a local variable "o" to hold the value of the from-expression
-      Bpl.IdentifierExpr o = null;
-      void PutSourceIntoLocal() {
-        if (o == null) {
-          var oType = expr.Type.IsCharType ? Type.Int : expr.Type;
-          var oVar = new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, CurrentIdGenerator.FreshId("newtype$check#"), TrType(oType)));
-          locals.Add(oVar);
-          o = new Bpl.IdentifierExpr(tok, oVar);
-          var rhs = etran.TrExpr(expr);
-          if (expr.Type.IsCharType) {
-            rhs = FunctionCall(expr.tok, "char#ToInt", Bpl.Type.Int, rhs);
-          }
-          builder.Add(Bpl.Cmd.SimpleAssign(tok, o, rhs));
-        }
-      }
-
-      Contract.Assert(options.Get(CommonOptionBag.GeneralTraits) || expr.Type.IsRefType == toType.IsRefType);
-      if (toType.IsRefType) {
-        PutSourceIntoLocal();
-        CheckSubrange(tok, o, expr.Type, toType, builder, errorMsgPrefix);
-        return;
-      } else if (expr.Type.IsTraitType) {
-        PutSourceIntoLocal();
-        CheckSubrange(tok, o, expr.Type, toType, builder, errorMsgPrefix);
-        return;
-      }
-
-      if (expr.Type.IsNumericBased(Type.NumericPersuasion.Real) && !toType.IsNumericBased(Type.NumericPersuasion.Real)) {
-        // this operation is well-formed only if the real-based number represents an integer
-        //   assert Real(Int(o)) == o;
-        PutSourceIntoLocal();
-        Bpl.Expr from = FunctionCall(tok, BuiltinFunction.RealToInt, null, o);
-        Bpl.Expr e = FunctionCall(tok, BuiltinFunction.IntToReal, null, from);
-        e = Bpl.Expr.Binary(tok, Bpl.BinaryOperator.Opcode.Eq, e, o);
-        builder.Add(Assert(tok, e, new PODesc.IsInteger(errorMsgPrefix)));
-      }
-
-      if (expr.Type.IsBigOrdinalType && !toType.IsBigOrdinalType) {
-        PutSourceIntoLocal();
-        Bpl.Expr boundsCheck = FunctionCall(tok, "ORD#IsNat", Bpl.Type.Bool, o);
-        builder.Add(Assert(tok, boundsCheck, new PODesc.ConversionIsNatural(errorMsgPrefix)));
-      }
-
-      if (toType.IsBitVectorType) {
-        var toWidth = toType.AsBitVectorType.Width;
-        var toBound = BaseTypes.BigNum.FromBigInt(BigInteger.One << toWidth);  // 1 << toWidth
-        Bpl.Expr boundsCheck = null;
-        if (expr.Type.IsBitVectorType) {
-          var fromWidth = expr.Type.AsBitVectorType.Width;
-          if (toWidth < fromWidth) {
-            // Check "expr < (1 << toWidth)" in type "fromType" (note that "1 << toWidth" is indeed a value in "fromType")
-            PutSourceIntoLocal();
-            var bound = BplBvLiteralExpr(tok, toBound, expr.Type.AsBitVectorType);
-            boundsCheck = FunctionCall(expr.tok, "lt_bv" + fromWidth, Bpl.Type.Bool, o, bound);
-          }
-        } else if (expr.Type.IsNumericBased(Type.NumericPersuasion.Int) || expr.Type.IsCharType) {
-          // Check "expr < (1 << toWdith)" in type "int"
-          PutSourceIntoLocal();
-          var bound = Bpl.Expr.Literal(toBound);
-          boundsCheck = Bpl.Expr.And(Bpl.Expr.Le(Bpl.Expr.Literal(0), o), Bpl.Expr.Lt(o, bound));
-        } else if (expr.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-          // Check "Int(expr) < (1 << toWdith)" in type "int"
-          PutSourceIntoLocal();
-          var bound = Bpl.Expr.Literal(toBound);
-          var oi = FunctionCall(tok, BuiltinFunction.RealToInt, null, o);
-          boundsCheck = Bpl.Expr.And(Bpl.Expr.Le(Bpl.Expr.Literal(0), oi), Bpl.Expr.Lt(oi, bound));
-        } else if (expr.Type.IsBigOrdinalType) {
-          var bound = Bpl.Expr.Literal(toBound);
-          var oi = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, o);
-          boundsCheck = Bpl.Expr.Lt(oi, bound);
-        }
-
-        if (boundsCheck != null) {
-          builder.Add(Assert(tok, boundsCheck, new PODesc.ConversionFit("value", toType, errorMsgPrefix)));
-        }
-      }
-
-      if (toType.IsCharType) {
-        if (expr.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
-          PutSourceIntoLocal();
-          var boundsCheck = FunctionCall(Token.NoToken, BuiltinFunction.IsChar, null, o);
-          builder.Add(Assert(tok, boundsCheck, new PODesc.ConversionFit("value", toType, errorMsgPrefix)));
-        } else if (expr.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-          PutSourceIntoLocal();
-          var oi = FunctionCall(tok, BuiltinFunction.RealToInt, null, o);
-          var boundsCheck = FunctionCall(Token.NoToken, BuiltinFunction.IsChar, null, oi);
-          builder.Add(Assert(tok, boundsCheck, new PODesc.ConversionFit("real value", toType, errorMsgPrefix)));
-        } else if (expr.Type.IsBitVectorType) {
-          PutSourceIntoLocal();
-          var fromWidth = expr.Type.AsBitVectorType.Width;
-          var toWidth = 16;
-          if (toWidth < fromWidth) {
-            // Check "expr < (1 << toWidth)" in type "fromType" (note that "1 << toWidth" is indeed a value in "fromType")
-            PutSourceIntoLocal();
-            var toBound = BaseTypes.BigNum.FromBigInt(BigInteger.One << toWidth); // 1 << toWidth
-            var bound = BplBvLiteralExpr(tok, toBound, expr.Type.AsBitVectorType);
-            var boundsCheck = FunctionCall(expr.tok, "lt_bv" + fromWidth, Bpl.Type.Bool, o, bound);
-            builder.Add(Assert(tok, boundsCheck, new PODesc.ConversionFit("bit-vector value", toType, errorMsgPrefix)));
-          }
-        } else if (expr.Type.IsBigOrdinalType) {
-          PutSourceIntoLocal();
-          var oi = FunctionCall(tok, "ORD#Offset", Bpl.Type.Int, o);
-          int toWidth = 16;
-          var toBound = BaseTypes.BigNum.FromBigInt(BigInteger.One << toWidth); // 1 << toWidth
-          var bound = Bpl.Expr.Literal(toBound);
-          var boundsCheck = Bpl.Expr.Lt(oi, bound);
-          builder.Add(Assert(tok, boundsCheck, new PODesc.ConversionFit("ORDINAL value", toType, errorMsgPrefix)));
-        }
-      } else if (toType.IsBigOrdinalType) {
-        if (expr.Type.IsNumericBased(Type.NumericPersuasion.Int)) {
-          PutSourceIntoLocal();
-          Bpl.Expr boundsCheck = Bpl.Expr.Le(Bpl.Expr.Literal(0), o);
-          var desc = new PODesc.ConversionPositive("integer", toType, errorMsgPrefix);
-          builder.Add(Assert(tok, boundsCheck, desc));
-        }
-        if (expr.Type.IsNumericBased(Type.NumericPersuasion.Real)) {
-          PutSourceIntoLocal();
-          var oi = FunctionCall(tok, BuiltinFunction.RealToInt, null, o);
-          Bpl.Expr boundsCheck = Bpl.Expr.Le(Bpl.Expr.Literal(0), oi);
-          var desc = new PODesc.ConversionPositive("real", toType, errorMsgPrefix);
-          builder.Add(Assert(tok, boundsCheck, desc));
-        }
-      } else if (toType.IsNumericBased(Type.NumericPersuasion.Int)) {
-        // already checked that BigOrdinal or real inputs are integral
-      } else if (toType.IsNumericBased(Type.NumericPersuasion.Real)) {
-        // already checked that BigOrdinal is integral
-      }
-
-      if (toType.NormalizeExpandKeepConstraints().AsRedirectingType != null) {
-        PutSourceIntoLocal();
-        Bpl.Expr be;
-        if (expr.Type.IsNumericBased() || expr.Type.IsBitVectorType) {
-          be = ConvertExpression(expr.tok, o, expr.Type, toType);
-        } else if (expr.Type.IsCharType) {
-          be = ConvertExpression(expr.tok, o, Dafny.Type.Int, toType);
-        } else if (expr.Type.IsBigOrdinalType) {
-          be = FunctionCall(expr.tok, "ORD#Offset", Bpl.Type.Int, o);
-          be = ConvertExpression(expr.tok, be, Dafny.Type.Int, toType);
-        } else {
-          be = o;
-        }
-        var dafnyType = toType.NormalizeExpand();
-        CheckResultToBeInType_Aux(tok, new BoogieWrapper(be, dafnyType), toType.NormalizeExpandKeepConstraints(), builder, etran, errorMsgPrefix);
-      }
-    }
-
-    void CheckResultToBeInType_Aux(IToken tok, Expression expr, Type toType, BoogieStmtListBuilder builder, ExpressionTranslator etran, string errorMsgPrefix) {
-      Contract.Requires(tok != null);
-      Contract.Requires(expr != null);
-      Contract.Requires(toType != null && toType.AsRedirectingType != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(errorMsgPrefix != null);
-      // First, check constraints of base types
-      var udt = (UserDefinedType)toType;
-      var rdt = (RedirectingTypeDecl)udt.ResolvedClass;
-      Type baseType;
-      string kind;
-      if (rdt is SubsetTypeDecl) {
-        baseType = ((SubsetTypeDecl)rdt).RhsWithArgument(udt.TypeArgs);
-        kind = "subset type";
-      } else if (rdt is NewtypeDecl) {
-        baseType = ((NewtypeDecl)rdt).BaseType;
-        kind = "newtype";
-      } else {
-        baseType = ((TypeSynonymDecl)rdt).RhsWithArgument(udt.TypeArgs);
-        kind = "type synonym";
-      }
-
-      if (baseType.AsRedirectingType != null) {
-        CheckResultToBeInType_Aux(tok, expr, baseType, builder, etran, errorMsgPrefix);
-      }
-      // Check any constraint defined in 'dd'
-      if (rdt.Var != null) {
-        // TODO: use TrSplitExpr
-        var substMap = new Dictionary<IVariable, Expression>();
-        substMap.Add(rdt.Var, expr);
-        var typeMap = TypeParameter.SubstitutionMap(rdt.TypeArgs, udt.TypeArgs);
-        var constraint = etran.TrExpr(Substitute(rdt.Constraint, null, substMap, typeMap));
-        builder.Add(Assert(tok, constraint, new PODesc.ConversionSatisfiesConstraints(errorMsgPrefix, kind, rdt.Name)));
-      }
-    }
-
-
-    void CheckFunctionSelectWF(string what, BoogieStmtListBuilder builder, ExpressionTranslator etran, Expression e, string hint) {
-      if (e is MemberSelectExpr sel && sel.Member is Function fn) {
-        Bpl.Expr assertion = !InVerificationScope(fn) ? Bpl.Expr.True : Bpl.Expr.Not(etran.HeightContext(fn));
-        builder.Add(Assert(GetToken(e), assertion, new PODesc.ValidInRecursion(what, hint)));
-      }
-    }
-
-    void CloneVariableAsBoundVar(IToken tok, IVariable iv, string prefix, out BoundVar bv, out IdentifierExpr ie) {
-      Contract.Requires(tok != null);
-      Contract.Requires(iv != null);
-      Contract.Requires(prefix != null);
-      Contract.Ensures(Contract.ValueAtReturn(out bv) != null);
-      Contract.Ensures(Contract.ValueAtReturn(out ie) != null);
-
-      bv = new BoundVar(tok, CurrentIdGenerator.FreshId(prefix), iv.Type); // use this temporary variable counter, but for a Dafny name (the idea being that the number and the initial "_" in the name might avoid name conflicts)
-      ie = new IdentifierExpr(tok, bv.Name);
-      ie.Var = bv;  // resolve here
-      ie.Type = bv.Type;  // resolve here
-    }
-
-    // Use trType to translate types in the args list
-    Bpl.Expr ClassTyCon(UserDefinedType cl, List<Bpl.Expr> args) {
-      Contract.Requires(cl != null);
-      Contract.Requires(cce.NonNullElements(args));
-      return ClassTyCon(cl.ResolvedClass, args);
-    }
-
-    Bpl.Expr ClassTyCon(TopLevelDecl cl, List<Bpl.Expr> args) {
-      Contract.Requires(cl != null);
-      Contract.Requires(cce.NonNullElements(args));
-      return FunctionCall(cl.tok, GetClassTyCon(cl), predef.Ty, args);
-    }
-
-    // Takes a Bpl.Constant, which typically will be one from GetClass,
-    // or some built-in type which has a class name, like Arrays or Arrows.
-    // Note: Prefer to call ClassTyCon or TypeToTy instead.
-    private string GetClassTyCon(TopLevelDecl dl) {
-      Contract.Requires(dl != null);
-      if (dl is InternalTypeSynonymDecl isyn) {
-        dl = ((UserDefinedType)isyn.Rhs).ResolvedClass;
-      }
-      string name;
-      if (classConstants.TryGetValue(dl, out name)) {
-        Contract.Assert(name != null);
-      } else {
-        name = AddTyAxioms(dl);
-        classConstants.Add(dl, name);
-      }
-      return name;
-    }
-
-    public string Handle(int arity) {
-      return "Handle" + arity;
-    }
-
-    public static string Apply(int arity) {
-      return "Apply" + arity;
-    }
-
-    public static string Requires(int arity) {
-      return "Requires" + arity;
-    }
-
-    public static string Reads(int arity) {
-      return "Reads" + arity;
-    }
-
-    public string RequiresName(Function f) {
-      return f.FullSanitizedName + "#requires";
-    }
-
-    public string FunctionHandle(Function f) {
-      Contract.Requires(f != null);
-      string name;
-      if (functionHandles.TryGetValue(f, out name)) {
-        Contract.Assert(name != null);
-      } else {
-        name = f.FullSanitizedName + "#Handle";
-        functionHandles[f] = name;
-        var args = new List<Bpl.Expr>();
-        var vars = MkTyParamBinders(GetTypeParams(f), out args);
-        var argsRequires = new List<Bpl.Expr>(args); // Requires don't have reveal parameters
-        var formals = MkTyParamFormals(GetTypeParams(f), false, true);
-        var tyargs = new List<Bpl.Expr>();
-        foreach (var fm in f.Formals) {
-          tyargs.Add(TypeToTy(fm.Type));
-        }
-        tyargs.Add(TypeToTy(f.ResultType));
-        if (f.IsFuelAware()) {
-          vars.Add(BplBoundVar("$ly", predef.LayerType, out var ly));
-          args.Add(ly);
-          argsRequires.Add(ly);
-          formals.Add(BplFormalVar("$fuel", predef.LayerType, true));
-          AddFuelSuccSynonymAxiom(f, true);
-        }
-        if (f.IsOpaque) {
-          vars.Add(BplBoundVar("$reveal", Boogie.Type.Bool, out var reveal));
-          args.Add(reveal);
-          formals.Add(BplFormalVar("$reveal", Boogie.Type.Bool, true));
-        }
-
-        Func<List<Bpl.Expr>, List<Bpl.Expr>> SnocSelf = x => x;
-        Func<List<Bpl.Expr>, List<Bpl.Expr>> SnocPrevH = x => x;
-        Expression selfExpr;
-        Dictionary<IVariable, Expression> rhs_dict = new Dictionary<IVariable, Expression>();
-        if (f is TwoStateFunction) {
-          // also add previous-heap to the list of fixed arguments of the handle
-          var prevH = BplBoundVar("$prevHeap", predef.HeapType, vars);
-          formals.Add(BplFormalVar("h", predef.HeapType, true));
-          SnocPrevH = xs => Snoc(xs, prevH);
-        }
-        if (f.IsStatic) {
-          selfExpr = null;
-        } else {
-          var selfTy = TrType(UserDefinedType.FromTopLevelDecl(f.tok, f.EnclosingClass));
-          var self = BplBoundVar("$self", selfTy, vars);
-          formals.Add(BplFormalVar("self", selfTy, true));
-          SnocSelf = xs => Snoc(xs, self);
-          var wrapperType = UserDefinedType.FromTopLevelDecl(f.tok, f.EnclosingClass);
-          selfExpr = new BoogieWrapper(self, wrapperType);
-        }
-
-        // F#Handle(Ty, .., Ty, LayerType, ref) : HandleType
-        sink.AddTopLevelDeclaration(
-          new Bpl.Function(f.tok, name, formals, BplFormalVar(null, predef.HandleType, false)));
-
-        var bvars = new List<Bpl.Variable>();
-        var lhs_args = new List<Bpl.Expr>();
-        var rhs_args = new List<Bpl.Expr>();
-        var func_vars = new List<Bpl.Variable>();
-        var func_args = new List<Bpl.Expr>();
-        var boxed_func_args = new List<Bpl.Expr>();
-
-        var idGen = f.IdGenerator.NestedFreshIdGenerator("$fh$");
-        foreach (var fm in f.Formals) {
-          string fm_name = idGen.FreshId("x#");
-          // Box and its [Unbox]args
-          var fe = BplBoundVar(fm_name, predef.BoxType, bvars);
-          lhs_args.Add(fe);
-          var be = UnboxIfBoxed(fe, fm.Type);
-          rhs_args.Add(be);
-
-          rhs_dict[fm] = new BoogieWrapper(be, fm.Type);
-          // args and its [Box]args
-          var arg = BplBoundVar(fm_name, TrType(fm.Type), func_vars);
-          func_args.Add(arg);
-          var boxed = BoxIfUnboxed(arg, fm.Type);
-          boxed_func_args.Add(boxed);
-        }
-
-        var h = BplBoundVar("$heap", predef.HeapType, vars);
-
-        int arity = f.Formals.Count;
-
-        {
-          // Apply(Ty.., F#Handle( Ty1, ..., TyN, Layer, self), Heap, arg1, ..., argN)
-          //   = [Box] F(Ty1, .., TyN, Layer, Heap, self, [Unbox] arg1, .., [Unbox] argN)
-
-          var fhandle = FunctionCall(f.tok, name, predef.HandleType, SnocSelf(SnocPrevH(args)));
-          var lhs = FunctionCall(f.tok, Apply(arity), TrType(f.ResultType),
-            Concat(tyargs, Cons(h, Cons(fhandle, lhs_args))));
-          var args_h = f.ReadsHeap ? Snoc(SnocPrevH(args), h) : args;
-          var rhs = FunctionCall(f.tok, f.FullSanitizedName, TrType(f.ResultType), Concat(SnocSelf(args_h), rhs_args));
-          var rhs_boxed = BoxIfUnboxed(rhs, f.ResultType);
-
-          AddOtherDefinition(GetOrCreateFunction(f), (new Axiom(f.tok,
-            BplForall(Concat(vars, bvars), BplTrigger(lhs), Bpl.Expr.Eq(lhs, rhs_boxed)))));
-        }
-
-        {
-          // Requires(Ty.., F#Handle( Ty1, ..., TyN, Layer, reveal, self), Heap, arg1, ..., argN)
-          //   = F#Requires(Ty1, .., TyN, Layer, Heap, self, [Unbox] arg1, .., [Unbox] argN)
-
-          var fhandle = FunctionCall(f.tok, name, predef.HandleType, SnocSelf(SnocPrevH(args)));
-          var lhs = FunctionCall(f.tok, Requires(arity), Bpl.Type.Bool, Concat(tyargs, Cons(h, Cons(fhandle, lhs_args))));
-          Bpl.Expr rhs;
-          if (f.EnclosingClass is ArrowTypeDecl) {
-            // In case this is the /requires/ or /reads/ function, then there is no precondition
-            rhs = Bpl.Expr.True;
-          } else {
-            var args_h = f.ReadsHeap ? Snoc(SnocPrevH(argsRequires), h) : argsRequires;
-            rhs = FunctionCall(f.tok, RequiresName(f), Bpl.Type.Bool, Concat(SnocSelf(args_h), rhs_args));
-          }
-
-          AddOtherDefinition(GetOrCreateFunction(f), (new Axiom(f.tok,
-            BplForall(Concat(vars, bvars), BplTrigger(lhs), Bpl.Expr.Eq(lhs, rhs)))));
-        }
-
-        {
-          // Reads(Ty.., F#Handle( Ty1, ..., TyN, Layer, self), Heap, arg1, ..., argN)
-          //   =  $Frame_F(args...)
-
-          var fhandle = FunctionCall(f.tok, name, predef.HandleType, SnocSelf(SnocPrevH(args)));
-          Bpl.Expr lhs_inner = FunctionCall(f.tok, Reads(arity), TrType(new SetType(true, program.SystemModuleManager.ObjectQ())), Concat(tyargs, Cons(h, Cons(fhandle, lhs_args))));
-
-          Bpl.Expr bx; var bxVar = BplBoundVar("$bx", predef.BoxType, out bx);
-          Bpl.Expr unboxBx = FunctionCall(f.tok, BuiltinFunction.Unbox, predef.RefType, bx);
-          Bpl.Expr lhs = Bpl.Expr.SelectTok(f.tok, lhs_inner, bx);
-
-          var et = new ExpressionTranslator(this, predef, h);
-          var rhs = InRWClause_Aux(f.tok, unboxBx, bx, null, f.Reads, false, et, selfExpr, rhs_dict);
-
-          sink.AddTopLevelDeclaration(new Axiom(f.tok,
-            BplForall(Cons(bxVar, Concat(vars, bvars)), BplTrigger(lhs), Bpl.Expr.Eq(lhs, rhs))));
-        }
-
-        {
-          // F(Ty1, .., TyN, Layer, Heap, self, arg1, .., argN)
-          // = [Unbox]Apply1(Ty.., F#Handle( Ty1, ..., TyN, Layer, self), Heap, [Box]arg1, ..., [Box]argN)
-
-          var fhandle = FunctionCall(f.tok, name, predef.HandleType, SnocSelf(SnocPrevH(args)));
-          var args_h = f.ReadsHeap ? Snoc(SnocPrevH(args), h) : args;
-          var lhs = FunctionCall(f.tok, f.FullSanitizedName, TrType(f.ResultType), Concat(SnocSelf(args_h), func_args));
-          var rhs = FunctionCall(f.tok, Apply(arity), TrType(f.ResultType), Concat(tyargs, Cons(h, Cons(fhandle, boxed_func_args))));
-          var rhs_unboxed = UnboxIfBoxed(rhs, f.ResultType);
-          var tr = BplTriggerHeap(this, f.tok, lhs, f.ReadsHeap ? null : h);
-
-          AddOtherDefinition(GetOrCreateFunction(f), (new Axiom(f.tok,
-            BplForall(Concat(vars, func_vars), tr, Bpl.Expr.Eq(lhs, rhs_unboxed)))));
-        }
-      }
-      return name;
-    }
-
-    private Expr NewOneHeapExpr(IToken tok) {
-      return new Bpl.IdentifierExpr(tok, "$OneHeap", predef.HeapType);
-    }
-
-    /// <summary>
-    /// For expression "e" that is expected to come from a modifies/unchanged frame, return information
-    /// that is useful for checking every reference from "e". More precisely,
-    ///  * If "e" denotes a reference, then return
-    ///       -- "description" as the string "object",
-    ///       -- "type" as the type of that reference,
-    ///       -- "obj" as the translation of that reference, and
-    ///       -- "antecedent" as "true".
-    ///  * If "e" denotes a set of references, then return
-    ///       -- "description" as the string "set element",
-    ///       -- "type" as the element type of that set,
-    ///       -- "obj" as a new identifier of type "type", and
-    ///       -- "antecedent" as "obj in e".
-    ///  * If "e" denotes a multiset of references, then return
-    ///       -- "description" as the string "multiset element",
-    ///       -- "type" as the element type of that multiset,
-    ///       -- "obj" as a new identifier of type "type", and
-    ///       -- "antecedent" as "e[obj] > 0".
-    ///  * If "e" denotes a sequence of references, then return
-    ///       -- "description" as the string "sequence element",
-    ///       -- "type" as the element type of that sequence,
-    ///       -- "obj" as an expression "e[i]", where "i" is a new identifier, and
-    ///       -- "antecedent" as "0 <= i < |e|".
-    /// </summary>
-    void EachReferenceInFrameExpression(Expression e, List<Bpl.Variable> locals, BoogieStmtListBuilder builder, ExpressionTranslator etran,
-      out string description, out Type type, out Bpl.Expr obj, out Bpl.Expr antecedent) {
-      Contract.Requires(e != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-
-      if (e.Type.IsRefType) {
-        description = "object";
-        type = e.Type;
-        obj = etran.TrExpr(e);
-        antecedent = Bpl.Expr.True;
-        return;
-      }
-
-      var isSetType = e.Type.AsSetType != null;
-      var isMultisetType = e.Type.AsMultiSetType != null;
-      Contract.Assert(isSetType || isMultisetType || e.Type.AsSeqType != null);
-      var sType = e.Type.AsCollectionType;
-      Contract.Assert(sType != null);
-      type = sType.Arg;
-      // var $x
-      var name = CurrentIdGenerator.FreshId("$unchanged#x");
-      var xVar = new Bpl.LocalVariable(e.tok, new Bpl.TypedIdent(e.tok, name, isSetType || isMultisetType ? TrType(type) : Bpl.Type.Int));
-      locals.Add(xVar);
-      var x = new Bpl.IdentifierExpr(e.tok, xVar);
-      // havoc $x
-      builder.Add(new Bpl.HavocCmd(e.tok, new List<Bpl.IdentifierExpr>() { x }));
-
-      var s = etran.TrExpr(e);
-      if (isSetType) {
-        description = "set element";
-        obj = x;
-        antecedent = Bpl.Expr.SelectTok(e.tok, s, BoxIfNecessary(e.tok, x, type));
-      } else if (isMultisetType) {
-        description = "multiset element";
-        obj = x;
-        antecedent = Boogie.Expr.Gt(Bpl.Expr.SelectTok(e.tok, s, BoxIfNecessary(e.tok, x, type)), Boogie.Expr.Literal(0));
-      } else {
-        description = "sequence element";
-        obj = UnboxIfBoxed(FunctionCall(e.tok, BuiltinFunction.SeqIndex, predef.BoxType, s, x), type);
-        antecedent = InSeqRange(e.tok, x, Type.Int, s, true, null, false);
-      }
-    }
-
-    private void AddArrowTypeAxioms(ArrowTypeDecl ad) {
-      Contract.Requires(ad != null);
-      var arity = ad.Arity;
-      var tok = ad.tok;
-
-      // [Heap, Box, ..., Box]
-      var map_args = Cons(predef.HeapType, Map(Enumerable.Range(0, arity), i => predef.BoxType));
-      // [Heap, Box, ..., Box] Box
-      var apply_ty = new Bpl.MapType(tok, new List<Bpl.TypeVariable>(), map_args, predef.BoxType);
-      // [Heap, Box, ..., Box] Bool
-      var requires_ty = new Bpl.MapType(tok, new List<Bpl.TypeVariable>(), map_args, Bpl.Type.Bool);
-      // Set Box
-      var objset_ty = TrType(new SetType(true, program.SystemModuleManager.ObjectQ()));
-      // [Heap, Box, ..., Box] (Set Box)
-      var reads_ty = new Bpl.MapType(tok, new List<Bpl.TypeVariable>(), map_args, objset_ty);
-
-      {
-        // function HandleN([Heap, Box, ..., Box] Box, [Heap, Box, ..., Box] Bool) : HandleType
-        var res = BplFormalVar(null, predef.HandleType, true);
-        var arg = new List<Bpl.Variable> {
-          BplFormalVar(null, apply_ty, true),
-          BplFormalVar(null, requires_ty, true),
-          BplFormalVar(null, reads_ty, true)
-        };
-        sink.AddTopLevelDeclaration(new Bpl.Function(Token.NoToken, Handle(arity), arg, res));
-      }
-
-      Action<Function, string, Bpl.Type> SelectorFunction = (dafnyFunction, name, t) => {
-        var args = new List<Bpl.Variable>();
-        MapM(Enumerable.Range(0, arity + 1), i => args.Add(BplFormalVar(null, predef.Ty, true)));
-        args.Add(BplFormalVar(null, predef.HeapType, true));
-        args.Add(BplFormalVar(null, predef.HandleType, true));
-        MapM(Enumerable.Range(0, arity), i => args.Add(BplFormalVar(null, predef.BoxType, true)));
-        var boogieFunction = new Bpl.Function(Token.NoToken, name, args, BplFormalVar(null, t, false));
-        if (dafnyFunction != null) {
-          declarationMapping[dafnyFunction] = boogieFunction;
-        }
-        sink.AddTopLevelDeclaration(boogieFunction);
-      };
-
-      // function ApplyN(Ty, ... Ty, HandleType, Heap, Box, ..., Box) : Box
-      if (arity != 1) {  // Apply1 is already declared in DafnyPrelude.bpl
-        SelectorFunction(null, Apply(arity), predef.BoxType);
-      }
-      // function RequiresN(Ty, ... Ty, HandleType, Heap, Box, ..., Box) : Bool
-      SelectorFunction(ad.Requires, Requires(arity), Bpl.Type.Bool);
-      // function ReadsN(Ty, ... Ty, HandleType, Heap, Box, ..., Box) : Set Box
-      SelectorFunction(ad.Reads, Reads(arity), objset_ty);
-
-      {
-        // forall t1, .., tN+1 : Ty, p: [Heap, Box, ..., Box] Box, heap : Heap, b1, ..., bN : Box
-        //      :: ApplyN(t1, .. tN+1, heap, HandleN(h, r, rd), b1, ..., bN) == h[heap, b1, ..., bN]
-        //      :: RequiresN(t1, .. tN+1, heap, HandleN(h, r, rd), b1, ..., bN) <== r[heap, b1, ..., bN]
-        //      :: ReadsN(t1, .. tN+1, heap, HandleN(h, r, rd), b1, ..., bN) == rd[heap, b1, ..., bN]
-        Action<string, Bpl.Type, string, Bpl.Type, string, Bpl.Type> SelectorSemantics = (selector, selectorTy, selectorVar, selectorVarTy, precond, precondTy) => {
-          Contract.Assert((precond == null) == (precondTy == null));
-          var bvars = new List<Bpl.Variable>();
-
-          var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, predef.Ty, bvars));
-
-          var heap = BplBoundVar("heap", predef.HeapType, bvars);
-
-          var handleargs = new List<Bpl.Expr> {
-            BplBoundVar("h", apply_ty, bvars),
-            BplBoundVar("r", requires_ty, bvars),
-            BplBoundVar("rd", reads_ty, bvars)
-          };
-
-          var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, predef.BoxType, bvars));
-
-          var lhsargs = Concat(types, Cons(heap, Cons(FunctionCall(tok, Handle(arity), predef.HandleType, handleargs), boxes)));
-          Bpl.Expr lhs = FunctionCall(tok, selector, selectorTy, lhsargs);
-          Func<Bpl.Expr, Bpl.Expr> pre = x => x;
-          if (precond != null) {
-            pre = x => FunctionCall(tok, precond, precondTy, lhsargs);
-          }
-
-          Bpl.Expr rhs = new Bpl.NAryExpr(tok, new Bpl.MapSelect(tok, arity + 1),
-            Cons(new Bpl.IdentifierExpr(tok, selectorVar, selectorVarTy), Cons(heap, boxes)));
-          Func<Bpl.Expr, Bpl.Expr, Bpl.Expr> op = Bpl.Expr.Eq;
-          if (selectorVar == "rd") {
-            var bx = BplBoundVar("bx", predef.BoxType, bvars);
-            lhs = Bpl.Expr.SelectTok(tok, lhs, bx);
-            rhs = Bpl.Expr.SelectTok(tok, rhs, bx);
-            // op = Bpl.Expr.Imp;
-          }
-          if (selectorVar == "r") {
-            op = (u, v) => Bpl.Expr.Imp(v, u);
-          }
-          AddOtherDefinition(GetOrCreateTypeConstructor(ad), new Axiom(tok,
-            BplForall(bvars, BplTrigger(lhs), op(lhs, rhs))));
-        };
-        SelectorSemantics(Apply(arity), predef.BoxType, "h", apply_ty, Requires(arity), requires_ty);
-        SelectorSemantics(Requires(arity), Bpl.Type.Bool, "r", requires_ty, null, null);
-        SelectorSemantics(Reads(arity), objset_ty, "rd", reads_ty, null, null);
-
-        // function {:inline true}
-        //   FuncN._requires#canCall(G...G G: Ty, H:Heap, f:Handle, x ... x :Box): bool
-        //   { true }
-        // + similar for Reads
-        Action<string, Function> UserSelectorFunction = (fname, f) => {
-          var formals = new List<Bpl.Variable>();
-          var rhsargs = new List<Bpl.Expr>();
-
-          MapM(Enumerable.Range(0, arity + 1), i => rhsargs.Add(BplFormalVar("t" + i, predef.Ty, true, formals)));
-
-          var heap = BplFormalVar("heap", predef.HeapType, true, formals);
-          rhsargs.Add(heap);
-          rhsargs.Add(BplFormalVar("f", predef.HandleType, true, formals));
-
-          MapM(Enumerable.Range(0, arity), i => rhsargs.Add(BplFormalVar("bx" + i, predef.BoxType, true, formals)));
-
-          sink.AddTopLevelDeclaration(
-            new Bpl.Function(f.tok, f.FullSanitizedName + "#canCall", new List<TypeVariable>(), formals,
-              BplFormalVar(null, Bpl.Type.Bool, false), null,
-              InlineAttribute(f.tok)) {
-              Body = Bpl.Expr.True
-            });
-        };
-
-        UserSelectorFunction(Requires(ad.Arity), ad.Requires);
-        UserSelectorFunction(Reads(ad.Arity), ad.Reads);
-
-        // frame axiom
-        /*
-
-          forall t0..tN+1 : Ty, h0, h1 : Heap, f : Handle, bx1 .. bxN : Box,
-            HeapSucc(h0, h1) && GoodHeap(h0) && GoodHeap(h1)
-            && Is[&IsAllocBox](bxI, tI, h0)              // in h0, not hN
-            && Is[&IsAlloc](f, Func(t1,..,tN, tN+1), h0) // in h0, not hN
-            &&
-            (forall o : ref::
-                 o != null [&& h0[o, alloc] && h1[o, alloc] &&]
-                 Reads(h,hN,bxs)[Box(o)]             // for hN in h0 and h1
-              ==> h0[o,field] == h1[o,field])
-          ==>  Reads(..h0..) == Reads(..h1..)
-           AND Requires(f,h0,bxs) == Requires(f,h1,bxs) // which is needed for the next
-           AND  Apply(f,h0,bxs) == Apply(f,h0,bxs)
-
-           The [...] expressions are omitted for /allocated:0 and /allocated:1:
-             - in these modes, functions are pure values and IsAlloc of a function is trivially true
-             - o may be unallocated even if f reads it, so we require a stronger condition that
-               even fields of *unallocated* objects o are unchanged from h0 to h1
-             - given this stronger condition, we can say that f(bx1...bxN) does not change from h0 to h1
-               even if some of bx1...bxN are unallocated
-             - it's harder to satisfy the stronger condition, but two cases are nevertheless useful:
-               1) f has an empty reads clause
-               2) f explictly states that everything is its reads clause is allocated
-         */
-        {
-          var bvars = new List<Bpl.Variable>();
-
-          var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, predef.Ty, bvars));
-
-          var h0 = BplBoundVar("h0", predef.HeapType, bvars);
-          var h1 = BplBoundVar("h1", predef.HeapType, bvars);
-          var heapSucc = HeapSucc(h0, h1);
-          var goodHeaps = BplAnd(
-            FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h0),
-            FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h1));
-
-          var f = BplBoundVar("f", predef.HandleType, bvars);
-          var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, predef.BoxType, bvars));
-
-          var isness = BplAnd(
-            Snoc(Map(Enumerable.Range(0, arity), i =>
-              BplAnd(MkIs(boxes[i], types[i], true), Bpl.Expr.True)),
-            BplAnd(MkIs(f, ClassTyCon(ad, types)), Bpl.Expr.True)));
-
-          Action<Bpl.Expr, string> AddFrameForFunction = (hN, fname) => {
-
-            // inner forall vars
-            var ivars = new List<Bpl.Variable>();
-            var o = BplBoundVar("o", predef.RefType, ivars);
-            var a = new TypeVariable(tok, "a");
-            var fld = BplBoundVar("fld", predef.FieldName(tok, a), ivars);
-
-            var inner_forall = new Bpl.ForallExpr(tok, Singleton(a), ivars, BplImp(
-              BplAnd(
-                Bpl.Expr.Neq(o, predef.Null),
-                // Note, the MkIsAlloc conjunct of "isness" implies that everything in the reads frame is allocated in "h0", which by HeapSucc(h0,h1) also implies the frame is allocated in "h1"
-                new Bpl.NAryExpr(tok, new Bpl.MapSelect(tok, 1), new List<Bpl.Expr> {
-                  FunctionCall(tok, Reads(ad.Arity), objset_ty, Concat(types, Cons(hN, Cons(f, boxes)))),
-                  FunctionCall(tok, BuiltinFunction.Box, null, o)
-                })
-              ),
-              Bpl.Expr.Eq(ReadHeap(tok, h0, o, fld, a), ReadHeap(tok, h1, o, fld, a))));
-
-            Func<Bpl.Expr, Bpl.Expr> fn = h => FunctionCall(tok, fname, Bpl.Type.Bool, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
-
-            sink.AddTopLevelDeclaration(new Axiom(tok,
-              BplForall(bvars,
-                new Bpl.Trigger(tok, true, new List<Bpl.Expr> { heapSucc, fn(h1) }),
-                BplImp(
-                  BplAnd(BplAnd(BplAnd(heapSucc, goodHeaps), isness), inner_forall),
-                  Bpl.Expr.Eq(fn(h0), fn(h1)))), "frame axiom for " + fname));
-          };
-
-          AddFrameForFunction(h0, Reads(ad.Arity));
-          AddFrameForFunction(h1, Reads(ad.Arity));
-          AddFrameForFunction(h0, Requires(ad.Arity));
-          AddFrameForFunction(h1, Requires(ad.Arity));
-          AddFrameForFunction(h0, Apply(ad.Arity));
-          AddFrameForFunction(h1, Apply(ad.Arity));
-        }
-
-        /* axiom (forall T..: Ty, heap: Heap, f: HandleType, bx..: Box ::
-         *   { ReadsN(T.., $OneHeap, f, bx..), $IsGoodHeap(heap) }
-         *   { ReadsN(T.., heap, f, bx..) }
-         *   $IsGoodHeap(heap) && Is...(f...bx...) ==>
-         *   Set#Equal(ReadsN(T.., OneHeap, f, bx..), EmptySet) == Set#Equal(ReadsN(T.., heap, f, bx..), EmptySet));
-         */
-        {
-          var bvars = new List<Bpl.Variable>();
-          var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, predef.Ty, bvars));
-          var oneheap = NewOneHeapExpr(tok);
-          var h = BplBoundVar("heap", predef.HeapType, bvars);
-          var f = BplBoundVar("f", predef.HandleType, bvars);
-          var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, predef.BoxType, bvars));
-
-          var goodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h);
-
-          var isness = BplAnd(
-            Snoc(Map(Enumerable.Range(0, arity), i =>
-              BplAnd(MkIs(boxes[i], types[i], true), Bpl.Expr.True)),
-            BplAnd(MkIs(f, ClassTyCon(ad, types)), Bpl.Expr.True)));
-
-          var readsOne = FunctionCall(tok, Reads(arity), objset_ty, Concat(types, Cons(oneheap, Cons(f, boxes))));
-          var readsH = FunctionCall(tok, Reads(arity), objset_ty, Concat(types, Cons(h, Cons(f, boxes))));
-          var empty = FunctionCall(tok, BuiltinFunction.SetEmpty, predef.BoxType);
-          var readsNothingOne = FunctionCall(tok, BuiltinFunction.SetEqual, null, readsOne, empty);
-          var readsNothingH = FunctionCall(tok, BuiltinFunction.SetEqual, null, readsH, empty);
-
-          sink.AddTopLevelDeclaration(new Axiom(tok, BplForall(bvars,
-            new Bpl.Trigger(tok, true, new List<Bpl.Expr> { readsOne, goodHeap },
-            new Bpl.Trigger(tok, true, new List<Bpl.Expr> { readsH })),
-            BplImp(
-              BplAnd(goodHeap, isness),
-              BplIff(readsNothingOne, readsNothingH))),
-            string.Format("empty-reads property for {0} ", Reads(arity))));
-        }
-
-        /* axiom (forall T..: Ty, heap: Heap, f: HandleType, bx..: Box ::
-         *   { RequiresN(T.., OneHeap, f, bx..), $IsGoodHeap(heap) }
-         *   { RequiresN(T.., heap, f, bx..) }
-         *   $IsGoodHeap(heap) && Is...(f...bx...) &&
-         *   Set#Equal(ReadsN(T.., OneHeap, f, bx..), EmptySet)
-         *   ==>
-         *   RequiresN(T.., OneHeap, f, bx..) == RequiresN(T.., heap, f, bx..));
-         */
-        {
-          var bvars = new List<Bpl.Variable>();
-          var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, predef.Ty, bvars));
-          var oneheap = NewOneHeapExpr(tok);
-          var h = BplBoundVar("heap", predef.HeapType, bvars);
-          var f = BplBoundVar("f", predef.HandleType, bvars);
-          var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, predef.BoxType, bvars));
-
-          var goodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h);
-
-          var isness = BplAnd(
-            Snoc(Map(Enumerable.Range(0, arity), i =>
-              BplAnd(MkIs(boxes[i], types[i], true), Bpl.Expr.True)),
-            BplAnd(MkIs(f, ClassTyCon(ad, types)), Bpl.Expr.True)));
-
-          var readsOne = FunctionCall(tok, Reads(arity), objset_ty, Concat(types, Cons(oneheap, Cons(f, boxes))));
-          var empty = FunctionCall(tok, BuiltinFunction.SetEmpty, predef.BoxType);
-          var readsNothingOne = FunctionCall(tok, BuiltinFunction.SetEqual, null, readsOne, empty);
-
-          var requiresOne = FunctionCall(tok, Requires(arity), Bpl.Type.Bool, Concat(types, Cons(oneheap, Cons(f, boxes))));
-          var requiresH = FunctionCall(tok, Requires(arity), Bpl.Type.Bool, Concat(types, Cons(h, Cons(f, boxes))));
-
-          sink.AddTopLevelDeclaration(new Axiom(tok, BplForall(bvars,
-            new Bpl.Trigger(tok, true, new List<Bpl.Expr> { requiresOne, goodHeap },
-            new Bpl.Trigger(tok, true, new List<Bpl.Expr> { requiresH })),
-            BplImp(
-              BplAnd(BplAnd(goodHeap, isness), readsNothingOne),
-              Bpl.Expr.Eq(requiresOne, requiresH))),
-            string.Format("empty-reads property for {0}", Requires(arity))));
-        }
-
-        // $Is and $IsAlloc axioms
-        /*
-          axiom (forall f: HandleType, t0: Ty, t1: Ty ::
-            { $Is(f, Tclass._System.___hFunc1(t0, t1)) }
-            $Is(f, Tclass._System.___hFunc1(t0, t1))
-               <==> (forall h: Heap, bx0: Box ::
-                 { Apply1(t0, t1, f, h, bx0) }
-                 $IsGoodHeap(h) && $IsBox(bx0, t0)
-                 && precondition of f(bx0) holds in h
-                 ==> $IsBox(Apply1(t0, t1, f, h, bx0), t1)));
-        */
-        {
-          var bvarsOuter = new List<Bpl.Variable>();
-          var f = BplBoundVar("f", predef.HandleType, bvarsOuter);
-          var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, predef.Ty, bvarsOuter));
-          var Is = MkIs(f, ClassTyCon(ad, types));
-
-          var bvarsInner = new List<Bpl.Variable>();
-          var h = BplBoundVar("h", predef.HeapType, bvarsInner);
-          var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, predef.BoxType, bvarsInner));
-          var goodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h);
-          var isBoxes = BplAnd(Map(Enumerable.Range(0, arity), i => MkIs(boxes[i], types[i], true)));
-          var pre = FunctionCall(tok, Requires(ad.Arity), predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
-          var applied = FunctionCall(tok, Apply(ad.Arity), predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
-          var applied_is = MkIs(applied, types[ad.Arity], true);
-
-          sink.AddTopLevelDeclaration(new Axiom(tok,
-            BplForall(bvarsOuter, BplTrigger(Is),
-              BplIff(Is,
-                BplForall(bvarsInner, BplTrigger(applied),
-                  BplImp(BplAnd(BplAnd(goodHeap, isBoxes), pre), applied_is))))));
-        }
-        /*
-           axiom (forall f: HandleType, t0: Ty, t1: Ty, u0: Ty, u1: Ty ::
-             { $Is(f, Tclass._System.___hFunc1(t0, t1)), $Is(f, Tclass._System.___hFunc1(u0, u1)) }
-             $Is(f, Tclass._System.___hFunc1(t0, t1)) &&
-             (forall bx: Box :: { $IsBox(bx, u0), $IsBox(bx, t0) }
-                 $IsBox(bx, u0) ==> $IsBox(bx, t0)) &&  // contravariant arguments
-             (forall bx: Box :: { $IsBox(bx, t1), $IsBox(bx, u1) }
-                 $IsBox(bx, t1) ==> $IsBox(bx, u1))     // covariant result
-             ==>
-             $Is(f, Tclass._System.___hFunc1(u0, u1)));
-        */
-        {
-          var bvarsOuter = new List<Bpl.Variable>();
-          var f = BplBoundVar("f", predef.HandleType, bvarsOuter);
-          var typesT = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, predef.Ty, bvarsOuter));
-          var IsT = MkIs(f, ClassTyCon(ad, typesT));
-          var typesU = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("u" + i, predef.Ty, bvarsOuter));
-          var IsU = MkIs(f, ClassTyCon(ad, typesU));
-
-          Func<Expr, Expr, Expr> Inner = (a, b) => {
-            var bvarsInner = new List<Bpl.Variable>();
-            var bx = BplBoundVar("bx", predef.BoxType, bvarsInner);
-            var isBoxA = MkIs(bx, a, true);
-            var isBoxB = MkIs(bx, b, true);
-            var tr = new Bpl.Trigger(tok, true, new[] { isBoxA }, new Bpl.Trigger(tok, true, new[] { isBoxB }));
-            var imp = BplImp(isBoxA, isBoxB);
-            return BplForall(bvarsInner, tr, imp);
-          };
-
-          var body = IsT;
-          for (int i = 0; i < arity; i++) {
-            body = BplAnd(body, Inner(typesU[i], typesT[i]));
-          }
-          body = BplAnd(body, Inner(typesT[arity], typesU[arity]));
-          body = BplImp(body, IsU);
-          sink.AddTopLevelDeclaration(new Axiom(tok,
-            BplForall(bvarsOuter, new Bpl.Trigger(tok, true, new[] { IsT, IsU }), body)));
-        }
-        /*  This is the definition of $IsAlloc function the arrow type:
-          axiom (forall f: HandleType, t0: Ty, t1: Ty, h: Heap ::
-            { $IsAlloc(f, Tclass._System.___hFunc1(t0, t1), h) }
-            $IsGoodHeap(h)
-            ==>
-            (
-              $IsAlloc(f, Tclass._System.___hFunc1(t0, t1), h)
-                <==>
-                (forall bx0: Box ::
-                  { Apply1(t0, t1, f, h, bx0) } { Reads1(t0, t1, f, h, bx0) }
-                  $IsBox(bx0, t0) && $IsAllocBox(bx0, t0, h)
-                  && precondition of f(bx0) holds in h
-                  ==>
-                    (everything in reads set of f(bx0) is allocated in h)
-            ));
-          However, for /allocated:0 and /allocated:1, IsAlloc for arrow types is trivially true
-          and implies nothing about the reads set.
-        */
-        {
-          var bvarsOuter = new List<Bpl.Variable>();
-          var f = BplBoundVar("f", predef.HandleType, bvarsOuter);
-          var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, predef.Ty, bvarsOuter));
-          var h = BplBoundVar("h", predef.HeapType, bvarsOuter);
-          var goodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h);
-          var isAlloc = MkIsAlloc(f, ClassTyCon(ad, types), h);
-
-          var bvarsInner = new List<Bpl.Variable>();
-          var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, predef.BoxType, bvarsInner));
-          var isAllocBoxes = BplAnd(Map(Enumerable.Range(0, arity), i =>
-            BplAnd(MkIs(boxes[i], types[i], true), MkIsAlloc(boxes[i], types[i], h, true))));
-          var pre = FunctionCall(tok, Requires(ad.Arity), predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
-          var applied = FunctionCall(tok, Apply(ad.Arity), predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
-
-          // (forall r: ref :: {Reads1(t0, t1, f, h, bx0)[$Box(r)]}  r != null && Reads1(t0, t1, f, h, bx0)[$Box(r)] ==> h[r, alloc])
-          var bvarsR = new List<Bpl.Variable>();
-          var r = BplBoundVar("r", predef.RefType, bvarsR);
-          var rNonNull = Bpl.Expr.Neq(r, predef.Null);
-          var reads = FunctionCall(tok, Reads(ad.Arity), predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
-          var rInReads = Bpl.Expr.Select(reads, FunctionCall(tok, BuiltinFunction.Box, null, r));
-          var rAlloc = IsAlloced(tok, h, r);
-          var isAllocReads = BplForall(bvarsR, BplTrigger(rInReads), BplImp(BplAnd(rNonNull, rInReads), rAlloc));
-
-          sink.AddTopLevelDeclaration(new Axiom(tok,
-            BplForall(bvarsOuter, BplTrigger(isAlloc),
-              BplImp(goodHeap,
-                BplIff(isAlloc,
-                  BplForall(bvarsInner,
-                    new Bpl.Trigger(tok, true, new List<Bpl.Expr> { applied }, BplTrigger(reads)),
-                    BplImp(BplAnd(isAllocBoxes, pre), isAllocReads)))))));
-        }
-        /*  This is the allocatedness consequence axiom of arrow types:
-          axiom (forall f: HandleType, t0: Ty, t1: Ty, h: Heap ::
-            { $IsAlloc(f, Tclass._System.___hFunc1(t0, t1), h) }
-            $IsGoodHeap(h) &&
-            $IsAlloc(f, Tclass._System.___hFunc1(t0, t1), h)
-            ==>
-                (forall bx0: Box ::
-                  { Apply1(t0, t1, f, h, bx0) }
-                  $IsAllocBox(bx0, t0, h)
-                  && precondition of f(bx0) holds in h
-                  ==>
-                    $IsAllocBox(Apply1(t0, t1, f, h, bx0), t1, h))
-            ));
-        */
-        {
-          var bvarsOuter = new List<Bpl.Variable>();
-          var f = BplBoundVar("f", predef.HandleType, bvarsOuter);
-          var types = Map(Enumerable.Range(0, arity + 1), i => BplBoundVar("t" + i, predef.Ty, bvarsOuter));
-          var h = BplBoundVar("h", predef.HeapType, bvarsOuter);
-          var goodHeap = FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, h);
-          var isAlloc = MkIsAlloc(f, ClassTyCon(ad, types), h);
-
-          var bvarsInner = new List<Bpl.Variable>();
-          var boxes = Map(Enumerable.Range(0, arity), i => BplBoundVar("bx" + i, predef.BoxType, bvarsInner));
-          var isAllocBoxes = BplAnd(Map(Enumerable.Range(0, arity), i => MkIsAlloc(boxes[i], types[i], h, true)));
-          var pre = FunctionCall(tok, Requires(ad.Arity), predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
-          var applied = FunctionCall(tok, Apply(ad.Arity), predef.BoxType, Concat(types, Cons(h, Cons<Bpl.Expr>(f, boxes))));
-          var applied_isAlloc = MkIsAlloc(applied, types[ad.Arity], h, true);
-
-          sink.AddTopLevelDeclaration(new Axiom(tok,
-            BplForall(bvarsOuter, BplTrigger(isAlloc),
-              BplImp(BplAnd(goodHeap, isAlloc),
-                BplForall(bvarsInner, BplTrigger(applied),
-                  BplImp(BplAnd(isAllocBoxes, pre), applied_isAlloc))))));
-        }
-      }
-    }
-
-    private string AddTyAxioms(TopLevelDecl td) {
-      Contract.Requires(td != null);
-      IToken tok = td.tok;
-
-      // use the internal type synonym, if any
-      if (!RevealedInScope(td) && td is RevealableTypeDecl revealableTypeDecl) {
-        td = revealableTypeDecl.SelfSynonymDecl();
-      }
-      Contract.Assume(td is SubsetTypeDecl or not TypeSynonymDecl); // this is expected of the caller
-
-      var func = GetOrCreateTypeConstructor(td);
-      var name = func.Name;
-
-      // Produce uniqueness or injectivity axioms, unless the type is one that may (non-uniquely) stand for another type.
-      if (td is not AbstractTypeDecl and not InternalTypeSynonymDecl) {
-        var tagAxiom = CreateTagAndCallingForTypeConstructor(td);
-        AddOtherDefinition(func, tagAxiom);
-
-        // Create the injectivity axiom and its function
-        /*
-           function List_0(Ty) : Ty;
-           axiom (forall t0: Ty :: { List(t0) } List_0(List(t0)) == t0);
-        */
-        for (int i = 0; i < func.InParams.Count; i++) {
-          var args = MkTyParamBinders(td.TypeArgs, out var argExprs);
-          var inner = FunctionCall(tok, name, predef.Ty, argExprs);
-          Bpl.Variable tyVarIn = BplFormalVar(null, predef.Ty, true);
-          Bpl.Variable tyVarOut = BplFormalVar(null, predef.Ty, false);
-          var injname = name + "_" + i;
-          var injfunc = new Bpl.Function(tok, injname, Singleton(tyVarIn), tyVarOut);
-          sink.AddTopLevelDeclaration(injfunc);
-          var outer = FunctionCall(tok, injname, args[i].TypedIdent.Type, inner);
-          Bpl.Expr qq = BplForall(args, BplTrigger(inner), Bpl.Expr.Eq(outer, argExprs[i]));
-          var injectivityAxiom = new Axiom(tok, qq, name + " injectivity " + i);
-          AddOtherDefinition(injfunc, injectivityAxiom);
-        }
-      }
-
-      // Boxing axiom (important for the properties of unbox)
-      /*
-         axiom (forall T: Ty, bx: Box ::
-           { $IsBox(bx, List(T)) }
-           $IsBox(bx, List(T))
-              ==> $Box($Unbox(bx): DatatypeType) == bx
-               && $Is($Unbox(bx): DatatypeType, List(T)));
-      */
-      if (!ModeledAsBoxType(UserDefinedType.FromTopLevelDecl(td.tok, td))) {
-        var args = MkTyParamBinders(td.TypeArgs, out var argExprs);
-        var ty_repr = TrType(UserDefinedType.FromTopLevelDecl(td.tok, td));
-        var typeTerm = FunctionCall(tok, name, predef.Ty, argExprs);
-        AddBoxUnboxAxiom(tok, name, typeTerm, ty_repr, args);
-      }
-
-      return name;
-    }
-
-    private Bpl.Function GetOrCreateTypeConstructor(TopLevelDecl td) {
-      if (declarationMapping.TryGetValue(td, out var result)) {
-        return result;
-      }
-
-      Bpl.Function func;
-      if (td is TraitDecl { IsObjectTrait: true }) {
-        // the type constructor for "object" is in DafnyPrelude.bpl
-        func = predef.ObjectTypeConstructor;
-      } else if (td is TupleTypeDecl ttd && ttd.Dims == 2 && ttd.NonGhostDims == 2) {
-        // the type constructor for "Tuple2" is in DafnyPrelude.bpl
-        func = this.predef.Tuple2TypeConstructor;
-      } else {
-        var inner_name = GetClass(td).TypedIdent.Name;
-        string name = "T" + inner_name;
-
-        Bpl.Variable tyVarOut = BplFormalVar(null, predef.Ty, false);
-        var args = td.TypeArgs.ConvertAll(_ => (Bpl.Variable)BplFormalVar(null, predef.Ty, true));
-        func = new Bpl.Function(td.tok, name, args, tyVarOut);
-        sink.AddTopLevelDeclaration(func);
-
-        if (td is AbstractTypeDecl or InternalTypeSynonymDecl) {
-          // axiom (forall T0, T1, ... { T(T0, T1, T2) } :: WhereClause( T(T0, T1, T2) ));
-          var argBoundVars = new List<Bpl.Variable>();
-          var argExprs = td.TypeArgs.ConvertAll(ta => BplBoundVar(ta.Name, predef.Ty, argBoundVars));
-          var funcAppl = FunctionCall(td.tok, name, predef.Ty, argExprs);
-          var characteristics = td is AbstractTypeDecl ? ((AbstractTypeDecl)td).Characteristics : ((InternalTypeSynonymDecl)td).Characteristics;
-          var whereClause = GetTyWhereClause(funcAppl, characteristics);
-          if (whereClause != null) {
-            Bpl.Expr axiom;
-            if (td.TypeArgs.Count == 0) {
-              axiom = whereClause;
-            } else {
-              var tr = new Bpl.Trigger(td.tok, true, new List<Bpl.Expr> { funcAppl });
-              axiom = new Bpl.ForallExpr(td.tok, new List<Bpl.TypeVariable>(), argBoundVars, null, tr, whereClause);
-            }
-            AddOtherDefinition(func, BplAxiom(axiom));
-          }
-        }
-      }
-
-      declarationMapping[td] = func;
-      return func;
-    }
-
-    /* Create the Tag and calling Tag on this type constructor
-     *
-     * The common case:
-     *     const unique TagList: TyTag;
-     *     const unique tytagFamily$List: TyTagFamily;  // defined once for each type named "List"
-     *     axiom (forall t0: Ty :: { List(t0) } Tag(List(t0)) == TagList && TagFamily(List(t0)) == tytagFamily$List);
-     * For types obtained via an abstract import, just do:
-     *     const unique tytagFamily$List: TyTagFamily;  // defined once for each type named "List"
-     *     axiom (forall t0: Ty :: { List(t0) } TagFamily(List(t0)) == tytagFamily$List);
-     */
-    private Axiom CreateTagAndCallingForTypeConstructor(TopLevelDecl td) {
-      IToken tok = td.tok;
-      var inner_name = GetClass(td).TypedIdent.Name;
-      string name = "T" + inner_name;
-
-      var args = MkTyParamBinders(td.TypeArgs, out var argExprs);
-      var inner = FunctionCall(tok, name, predef.Ty, argExprs);
-      Bpl.Expr body = Bpl.Expr.True;
-
-      if (!td.EnclosingModuleDefinition.IsFacade) {
-        var tagName = "Tag" + inner_name;
-        var tag = new Bpl.Constant(tok, new Bpl.TypedIdent(tok, tagName, predef.TyTag), true);
-        sink.AddTopLevelDeclaration(tag);
-        body = Bpl.Expr.Eq(FunctionCall(tok, "Tag", predef.TyTag, inner), new Bpl.IdentifierExpr(tok, tag));
-      }
-
-      if (!tytagConstants.TryGetValue(td.Name, out var tagFamily)) {
-        tagFamily = new Bpl.Constant(Token.NoToken,
-          new Bpl.TypedIdent(Token.NoToken, "tytagFamily$" + td.Name, predef.TyTagFamily), true);
-        tytagConstants.Add(td.Name, tagFamily);
-      }
-
-      body = BplAnd(body,
-        Bpl.Expr.Eq(FunctionCall(tok, "TagFamily", predef.TyTagFamily, inner), new Bpl.IdentifierExpr(tok, tagFamily)));
-
-      var qq = BplForall(args, BplTrigger(inner), body);
-      var tagAxiom = new Axiom(tok, qq, name + " Tag");
-      return tagAxiom;
-    }
-
-    /// <summary>
-    /// Generate:
-    ///     axiom (forall args: Ty, bx: Box ::
-    ///       { $IsBox(bx, name(argExprs)) }
-    ///       $IsBox(bx, name(argExprs)) ==>
-    ///         $Box($Unbox(bx): tyRepr) == bx &&
-    ///         $Is($Unbox(bx): tyRepr, name(argExprs)));
-    /// </summary>
-    private void AddBoxUnboxAxiom(IToken tok, string printableName, Bpl.Expr typeTerm, Bpl.Type tyRepr, List<Variable> args) {
-      Contract.Requires(tok != null);
-      Contract.Requires(printableName != null);
-      Contract.Requires(typeTerm != null);
-      Contract.Requires(tyRepr != null);
-      Contract.Requires(args != null);
-
-      var bxVar = BplBoundVar("bx", predef.BoxType, out var bx);
-      var unbox = FunctionCall(tok, BuiltinFunction.Unbox, tyRepr, bx);
-      var box_is = MkIs(bx, typeTerm, true);
-      var unbox_is = MkIs(unbox, typeTerm, false);
-      var box_unbox = FunctionCall(tok, BuiltinFunction.Box, null, unbox);
-      sink.AddTopLevelDeclaration(
-        new Axiom(tok,
-          BplForall(Snoc(args, bxVar), BplTrigger(box_is),
-            BplImp(box_is, BplAnd(Bpl.Expr.Eq(box_unbox, bx), unbox_is))),
-          "Box/unbox axiom for " + printableName));
-    }
-
-    Bpl.Constant GetClass(TopLevelDecl cl) {
-      Contract.Requires(cl != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Constant>() != null);
-
-      if (classes.TryGetValue(cl, out var cc)) {
-        Contract.Assert(cc != null);
-      } else {
-        var name = cl.FullSanitizedName;
-        if (cl is ClassLikeDecl { NonNullTypeDecl: { } }) {
-          name = name + "?";  // TODO: this doesn't seem like the best place to do this name transformation
-        }
-        cc = new Bpl.Constant(cl.tok, new Bpl.TypedIdent(cl.tok, "class." + name, predef.ClassNameType), !cl.EnclosingModuleDefinition.IsFacade);
-        classes.Add(cl, cc);
-      }
-      return cc;
-    }
-
-    Bpl.Constant GetFieldNameFamily(string n) {
-      Contract.Requires(n != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Constant>() != null);
-
-      if (fieldConstants.TryGetValue(n, out var cc)) {
-        Contract.Assert(cc != null);
-      } else {
-        cc = new Bpl.Constant(Token.NoToken, new Bpl.TypedIdent(Token.NoToken, "field$" + n, predef.NameFamilyType), true);
-        fieldConstants.Add(n, cc);
-      }
-      return cc;
-    }
-
-    Bpl.Constant GetField(Field f) {
-      Contract.Requires(f != null && f.IsMutable);
-      Contract.Requires(sink != null && predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Constant>() != null);
-
-      Contract.Assert(VisibleInScope(f));
-
-      Bpl.Constant fc;
-      if (fields.TryGetValue(f, out fc)) {
-        Contract.Assert(fc != null);
-      } else {
-        // const f: Field ty;
-        Bpl.Type ty = predef.FieldName(f.tok, TrType(f.Type));
-        fc = new Bpl.Constant(f.tok, new Bpl.TypedIdent(f.tok, f.FullSanitizedName, ty), false);
-        fields.Add(f, fc);
-        // axiom FDim(f) == 0 && FieldOfDecl(C, name) == f &&
-        //       $IsGhostField(f);    // if the field is a ghost field
-        // OR:
-        //       !$IsGhostField(f);    // if the field is not a ghost field
-        Bpl.Expr fdim = Bpl.Expr.Eq(FunctionCall(f.tok, BuiltinFunction.FDim, ty, Bpl.Expr.Ident(fc)), Bpl.Expr.Literal(0));
-        Bpl.Expr declType = Bpl.Expr.Eq(FunctionCall(f.tok, BuiltinFunction.FieldOfDecl, ty, new Bpl.IdentifierExpr(f.tok, GetClass(cce.NonNull(f.EnclosingClass))), new Bpl.IdentifierExpr(f.tok, GetFieldNameFamily(f.Name))), Bpl.Expr.Ident(fc));
-        Bpl.Expr cond = Bpl.Expr.And(fdim, declType);
-        var ig = FunctionCall(f.tok, BuiltinFunction.IsGhostField, ty, Bpl.Expr.Ident(fc));
-        cond = Bpl.Expr.And(cond, f.IsGhost ? ig : Bpl.Expr.Not(ig));
-        Bpl.Axiom ax = new Bpl.Axiom(f.tok, cond);
-        AddOtherDefinition(fc, ax);
-      }
-      return fc;
-    }
-
-
-    Bpl.Function GetReadonlyField(Field f) {
-      Contract.Requires(f != null && !f.IsMutable);
-      Contract.Requires(sink != null && predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Function>() != null);
-
-      Contract.Assert(VisibleInScope(f));
-
-      Bpl.Function ff;
-      if (fieldFunctions.TryGetValue(f, out ff)) {
-        Contract.Assert(ff != null);
-      } else {
-        // Here are some built-in functions defined in "predef" (so there's no need to cache them in "fieldFunctions")
-        if (f.EnclosingClass is ArrayClassDecl && f.Name == "Length") {
-          return predef.ArrayLength;
-        } else if (f.EnclosingClass is ValuetypeDecl { Name: "real" } && f.Name == "Floor") {
-          return predef.RealFloor;
-        } else if (f is SpecialField && !(f is DatatypeDestructor)) {
-          if (f.Name is "Keys" or "Values" or "Items") {
-            Contract.Assert(f.Type is SetType);
-            var setType = (SetType)f.Type;
-            return f.Name switch {
-              "Keys" => setType.Finite ? predef.MapDomain : predef.IMapDomain,
-              "Values" => setType.Finite ? predef.MapValues : predef.IMapValues,
-              _ => setType.Finite ? predef.MapItems : predef.IMapItems
-            };
-          }
-          if (f.Name == "IsLimit") {
-            return predef.ORDINAL_IsLimit;
-          } else if (f.Name == "IsSucc") {
-            return predef.ORDINAL_IsSucc;
-          } else if (f.Name == "Offset") {
-            return predef.ORDINAL_Offset;
-          } else if (f.Name == "IsNat") {
-            return predef.ORDINAL_IsNat;
-          }
-        } else if (f.FullSanitizedName == "_System.Tuple2._0") {
-          return predef.Tuple2Destructors0;
-        } else if (f.FullSanitizedName == "_System.Tuple2._1") {
-          return predef.Tuple2Destructors1;
-        }
-
-        // Create a new function
-        // function f(Ref): ty;
-        List<Variable> formals = new List<Variable>();
-        if (f is ConstantField) {
-          formals.AddRange(MkTyParamFormals(GetTypeParams(f.EnclosingClass), false));
-        }
-        if (!f.IsStatic) {
-          var udt = UserDefinedType.FromTopLevelDecl(f.tok, f.EnclosingClass);
-          Bpl.Type receiverType = TrType(udt);
-          formals.Add(new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, f is ConstantField ? "this" : Bpl.TypedIdent.NoName, receiverType), true));
-        }
-        Bpl.Formal result = new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, Bpl.TypedIdent.NoName, TrType(f.Type)), false);
-        ff = new Bpl.Function(f.tok, f.FullSanitizedName, new List<TypeVariable>(), formals, result, null, null);
-
-        if (InsertChecksums) {
-          var dt = f.EnclosingClass as DatatypeDecl;
-          if (dt != null) {
-            InsertChecksum(dt, ff);
-          }
-          // TODO(wuestholz): Do we need to handle more cases?
-        }
-
-        // add the newly created function to the cache, so that there will only be one copy of it
-        fieldFunctions.Add(f, ff);
-
-        // declare function among Boogie top-level declarations, if needed, and treat certain fields specially
-        if (f is ConstantField) {
-          // declare the function with its initial value, if any
-          // function QQ():int { 3 }
-          var cf = (ConstantField)f;
-          if (cf.Rhs != null && RevealedInScope(cf)) {
-            var etran = new ExpressionTranslator(this, predef, NewOneHeapExpr(f.tok));
-            if (!IsOpaque(cf)) {
-              sink.AddTopLevelDeclaration(ff.CreateDefinitionAxiom(etran.TrExpr(cf.Rhs)));
-            }
-          }
-          sink.AddTopLevelDeclaration(ff);
-
-        } else if (f.EnclosingClass is ArrayClassDecl) {
-          // add non-negative-range axioms for array Length fields
-          // axiom (forall o: Ref :: 0 <= array.Length(o));
-          Bpl.BoundVariable oVar = new Bpl.BoundVariable(f.tok, new Bpl.TypedIdent(f.tok, "o", predef.RefType));
-          Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(f.tok, oVar);
-          var rhs = new Bpl.NAryExpr(f.tok, new Bpl.FunctionCall(ff), new List<Bpl.Expr> { o });
-          Bpl.Expr body = Bpl.Expr.Le(Bpl.Expr.Literal(0), rhs);
-          var trigger = BplTrigger(rhs);
-          Bpl.Expr qq = new Bpl.ForallExpr(f.tok, new List<Variable> { oVar }, trigger, body);
-          sink.AddTopLevelDeclaration(new Bpl.Axiom(f.tok, qq));
-        }
-      }
-      return ff;
-    }
-
-    Bpl.Expr GetField(MemberSelectExpr fse) {
-      Contract.Requires(fse != null);
-      Contract.Requires(fse.Member != null && fse.Member is Field && ((Field)(fse.Member)).IsMutable);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      return new Bpl.IdentifierExpr(fse.tok, GetField((Field)fse.Member));
-    }
-
-    /// <summary>
-    /// This method is expected to be called just once for each function in the program.
-    /// </summary>
-    Bpl.Function GetOrCreateFunction(Function f) {
-      if (this.declarationMapping.TryGetValue(f, out var result)) {
-        return result;
-      }
-
-      Contract.Requires(f != null);
-      Contract.Requires(predef != null && sink != null);
-
-      // declare the function
-      Bpl.Function func;
-      {
-        var formals = new List<Variable>();
-        formals.AddRange(MkTyParamFormals(GetTypeParams(f), false));
-        if (f.IsFuelAware()) {
-          formals.Add(new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "$ly", predef.LayerType), true));
-        }
-
-        if (f.IsOpaque) {
-          formals.Add(new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "$reveal", Boogie.Type.Bool), true));
-        }
-        if (f is TwoStateFunction) {
-          formals.Add(new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "$prevHeap", predef.HeapType), true));
-        }
-        if (f.ReadsHeap) {
-          formals.Add(new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "$heap", predef.HeapType), true));
-        }
-        if (!f.IsStatic) {
-          formals.Add(new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "this", TrReceiverType(f)), true));
-        }
-        foreach (var p in f.Formals) {
-          formals.Add(new Bpl.Formal(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)), true));
-        }
-        var res = new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, Bpl.TypedIdent.NoName, TrType(f.ResultType)), false);
-        func = new Bpl.Function(f.tok, f.FullSanitizedName, new List<Bpl.TypeVariable>(), formals, res, "function declaration for " + f.FullName);
-        if (InsertChecksums) {
-          InsertChecksum(f, func);
-        }
-        sink.AddTopLevelDeclaration(func);
-      }
-
-      // declare the corresponding canCall function
-      {
-        var formals = new List<Variable>();
-        formals.AddRange(MkTyParamFormals(GetTypeParams(f), false));
-        if (f is TwoStateFunction) {
-          formals.Add(new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "$prevHeap", predef.HeapType), true));
-        }
-        if (f.ReadsHeap) {
-          formals.Add(new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "$heap", predef.HeapType), true));
-        }
-        if (!f.IsStatic) {
-          formals.Add(new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, "this", TrReceiverType(f)), true));
-        }
-        foreach (var p in f.Formals) {
-          formals.Add(new Bpl.Formal(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(f.IdGenerator), TrType(p.Type)), true));
-        }
-        var res = new Bpl.Formal(f.tok, new Bpl.TypedIdent(f.tok, Bpl.TypedIdent.NoName, Bpl.Type.Bool), false);
-        var canCallF = new Bpl.Function(f.tok, f.FullSanitizedName + "#canCall", new List<Bpl.TypeVariable>(), formals, res);
-        sink.AddTopLevelDeclaration(canCallF);
-      }
-
-      declarationMapping[f] = func;
-      return func;
-    }
-
-    /// <summary>
-    /// A method can have several translations, suitable for different purposes.
-    /// SpecWellformedness
-    ///    This procedure is suitable for the wellformedness check of the
-    ///    method's specification.
-    ///    This means the pre- and postconditions are not filled in, since the
-    ///    body of the procedure is going to check that these are well-formed in
-    ///    the first place.
-    /// InterModuleCall
-    ///    This procedure is suitable for inter-module callers.
-    ///    This means that predicate definitions inlined only for non-protected predicates.
-    /// IntraModuleCall
-    ///    This procedure is suitable for non-co-call intra-module callers.
-    ///    This means that predicates can be inlined in the usual way.
-    /// CoCall
-    ///    This procedure is suitable for (intra-module) co-calls.
-    ///    In these calls, some uses of greatest predicates may be replaced by
-    ///    proof certificates.  Note, unless the method is a greatest lemma, there
-    ///    is no reason to include a procedure for co-calls.
-    /// Implementation
-    ///    This procedure is suitable for checking the implementation of the
-    ///    method.
-    ///    If the method has no body, there is no reason to include this kind
-    ///    of procedure.
-    ///
-    /// Note that SpecWellformedness and Implementation have procedure implementations
-    /// but no callers, and vice versa for InterModuleCall, IntraModuleCall, and CoCall.
-    /// </summary>
-    enum MethodTranslationKind { SpecWellformedness, Call, CoCall, Implementation, OverrideCheck }
-
-    private static readonly Dictionary<MethodTranslationKind, string> kindSanitizedPrefix =
-      new Dictionary<MethodTranslationKind, string>() {
-        {MethodTranslationKind.SpecWellformedness, "CheckWellFormed"},
-        {MethodTranslationKind.Call, "Call"},
-        {MethodTranslationKind.CoCall, "CoCall"},
-        {MethodTranslationKind.Implementation, "Impl"},
-        {MethodTranslationKind.OverrideCheck, "OverrideCheck"},
-      };
-
-    static string MethodName(ICodeContext m, MethodTranslationKind kind) {
-      Contract.Requires(m != null);
-      return $"{kindSanitizedPrefix[kind]}{NameSeparator}{m.FullSanitizedName}";
-    }
-
-    private static readonly Dictionary<MethodTranslationKind, string> kindDescription =
-      new Dictionary<MethodTranslationKind, string>() {
-        {MethodTranslationKind.SpecWellformedness, "well-formedness"},
-        {MethodTranslationKind.Call, "call"},
-        {MethodTranslationKind.CoCall, "co-call"},
-        {MethodTranslationKind.Implementation, "correctness"},
-        {MethodTranslationKind.OverrideCheck, "override check"},
-      };
-
-    static string MethodVerboseName(string fullName, MethodTranslationKind kind) {
-      Contract.Requires(fullName != null);
-      return $"{fullName} ({kindDescription[kind]})";
-    }
-
-    private static void AddVerboseName(Bpl.NamedDeclaration boogieDecl, string dafnyName, MethodTranslationKind kind) {
-      var verboseName = MethodVerboseName(dafnyName, kind);
-      AddVerboseName(boogieDecl, verboseName);
-    }
-
-    private static void AddVerboseName(Bpl.NamedDeclaration targetDecl, string verboseName) {
-      targetDecl.AddAttribute("verboseName", new object[] { verboseName });
-    }
-
-    private static CallCmd Call(IToken tok, string methodName, List<Expr> ins, List<Bpl.IdentifierExpr> outs) {
-      Contract.Requires(tok != null);
-      Contract.Requires(methodName != null);
-      Contract.Requires(ins != null);
-      Contract.Requires(outs != null);
-
-      CallCmd call;
-      call = new CallCmd(tok, methodName, ins, outs);
-      // CLEMENT enable this: call.ErrorData = "possible violation of function precondition";
-      return call;
-    }
-
-    private void GenerateMethodParameters(IToken tok, Method m, MethodTranslationKind kind, ExpressionTranslator etran, List<Variable> inParams, out List<Variable> outParams) {
-      GenerateMethodParametersChoose(tok, m, kind, !m.IsStatic, true, true, etran, inParams, out outParams);
-    }
-
-    private void GenerateMethodParametersChoose(IToken tok, IMethodCodeContext m, MethodTranslationKind kind, bool includeReceiver, bool includeInParams, bool includeOutParams,
-      ExpressionTranslator etran, List<Variable> inParams, out List<Variable> outParams) {
-      outParams = new List<Variable>();
-      // Add type parameters first, always!
-      inParams.AddRange(MkTyParamFormals(GetTypeParams(m), true));
-      if (includeReceiver) {
-        var receiverType = m is MemberDecl ? ModuleResolver.GetReceiverType(tok, (MemberDecl)m) : ModuleResolver.GetThisType(tok, (IteratorDecl)m);
-        Contract.Assert(VisibleInScope(receiverType));
-
-        Bpl.Expr wh;
-        if (m is Constructor && kind == MethodTranslationKind.Implementation) {
-          var th = new Bpl.IdentifierExpr(tok, "this", TrType(receiverType));
-          wh = Bpl.Expr.And(
-            ReceiverNotNull(th),
-            GetWhereClause(tok, th, receiverType, etran, IsAllocType.NEVERALLOC));
-        } else {
-          var th = new Bpl.IdentifierExpr(tok, "this", TrType(receiverType));
-          wh = Bpl.Expr.And(
-            ReceiverNotNull(th),
-            (m is TwoStateLemma ? etran.Old : etran).GoodRef(tok, th, receiverType));
-        }
-        // for class constructors, the receiver is encoded as an output parameter
-        Bpl.Formal thVar = new Bpl.Formal(tok, new Bpl.TypedIdent(tok, "this", TrType(receiverType), wh), !(m is Constructor && kind != MethodTranslationKind.SpecWellformedness));
-        if (thVar.InComing) {
-          inParams.Add(thVar);
-        } else {
-          outParams.Add(thVar);
-        }
-      }
-      if (includeInParams) {
-        foreach (Formal p in m.Ins) {
-          Contract.Assert(VisibleInScope(p.Type));
-          Bpl.Type varType = TrType(p.Type);
-          Bpl.Expr wh = GetExtendedWhereClause(p.tok,
-            new Bpl.IdentifierExpr(p.tok, p.AssignUniqueName(currentDeclaration.IdGenerator), varType),
-            p.Type, p.IsOld ? etran.Old : etran, isAllocContext.Var(p));
-          inParams.Add(new Bpl.Formal(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(currentDeclaration.IdGenerator), varType, wh), true));
-        }
-      }
-      if (includeOutParams) {
-        Contract.Assume(definiteAssignmentTrackers.Count == 0);
-        foreach (Formal p in m.Outs) {
-          Contract.Assert(VisibleInScope(p.Type));
-          Contract.Assert(!p.IsOld);  // out-parameters are never old (perhaps we want to relax this condition in the future)
-          Bpl.Type varType = TrType(p.Type);
-          Bpl.Expr wh = GetWhereClause(p.tok,
-            new Bpl.IdentifierExpr(p.tok, p.AssignUniqueName(currentDeclaration.IdGenerator), varType),
-            p.Type, etran, isAllocContext.Var(p));
-          if (kind == MethodTranslationKind.Implementation) {
-            var tracker = AddDefiniteAssignmentTracker(p, outParams, true, m.IsGhost);
-            if (wh != null && tracker != null) {
-              wh = BplImp(tracker, wh);
-            }
-          }
-          outParams.Add(new Bpl.Formal(p.tok, new Bpl.TypedIdent(p.tok, p.AssignUniqueName(currentDeclaration.IdGenerator), varType, wh), false));
-        }
-        // tear down definite-assignment trackers
-        m.Outs.ForEach(RemoveDefiniteAssignmentTracker);
-        Contract.Assert(definiteAssignmentTrackers.Count == 0);
-
-        if (kind == MethodTranslationKind.Implementation) {
-          outParams.Add(new Bpl.Formal(tok, new Bpl.TypedIdent(tok, "$_reverifyPost", Bpl.Type.Bool), false));
-        }
-      }
-    }
-
-    class BoilerplateTriple {  // a triple that is now a quintuple
-      [ContractInvariantMethod]
-      void ObjectInvariant() {
-        Contract.Invariant(tok != null);
-        Contract.Invariant(Expr != null);
-        Contract.Invariant(IsFree || ErrorMessage != null);
-      }
-
-      public readonly IToken tok;
-      public readonly bool IsFree;
-      public readonly Bpl.Expr Expr;
-      public readonly string ErrorMessage;
-      public readonly string SuccessMessage;
-      public readonly string Comment;
-
-
-      public BoilerplateTriple(IToken tok, bool isFree, Bpl.Expr expr, string errorMessage, string successMessage, string comment) {
-        Contract.Requires(tok != null);
-        Contract.Requires(expr != null);
-        Contract.Requires(isFree || errorMessage != null);
-        this.tok = tok;
-        IsFree = isFree;
-        Expr = expr;
-        ErrorMessage = errorMessage;
-        SuccessMessage = successMessage;
-        Comment = comment;
-      }
-    }
-
-    /// <summary>
-    /// There are 3 states of interest when generating two-state boilerplate:
-    ///  S0. the beginning of the method or loop, which is where the modifies clause is interpreted
-    ///  S1. the pre-state of the two-state interval
-    ///  S2. the post-state of the two-state interval
-    /// This method assumes that etranPre denotes S1, etran denotes S2, and that etranMod denotes S0.
-    /// </summary>
-    List<BoilerplateTriple/*!*/>/*!*/ GetTwoStateBoilerplate(IToken/*!*/ tok,
-      List<FrameExpression/*!*/>/*!*/ modifiesClause, bool isGhostContext, bool canAllocate,
-      ExpressionTranslator/*!*/ etranPre, ExpressionTranslator/*!*/ etran, ExpressionTranslator/*!*/ etranMod) {
-      Contract.Requires(tok != null);
-      Contract.Requires(modifiesClause != null);
-      Contract.Requires(etranPre != null);
-      Contract.Requires(etran != null);
-      Contract.Ensures(cce.NonNullElements(Contract.Result<List<BoilerplateTriple>>()));
-
-      var boilerplate = new List<BoilerplateTriple>();
-      if (!canAllocate && modifiesClause.Count == 0) {
-        // plain and simple:  S1 == S2
-        boilerplate.Add(new BoilerplateTriple(tok, true, Bpl.Expr.Eq(etranPre.HeapExpr, etran.HeapExpr), null, null, "frame condition"));
-      } else {
-        bool fieldGranularity = true;
-        bool objectGranularity = !fieldGranularity;
-        // the frame condition, which is free since it is checked with every heap update and call
-        boilerplate.Add(new BoilerplateTriple(tok, true, FrameCondition(tok, modifiesClause, canAllocate, FrameExpressionUse.Modifies, etranPre, etran, etranMod, objectGranularity), null, null, "frame condition: object granularity"));
-        if (modifiesClause.Exists(fe => fe.FieldName != null)) {
-          boilerplate.Add(new BoilerplateTriple(tok, true, FrameCondition(tok, modifiesClause, canAllocate, FrameExpressionUse.Modifies, etranPre, etran, etranMod, fieldGranularity), null, null, "frame condition: field granularity"));
-        }
-        // HeapSucc(S1, S2) or HeapSuccGhost(S1, S2)
-        Bpl.Expr heapSucc = HeapSucc(etranPre.HeapExpr, etran.HeapExpr, isGhostContext);
-        boilerplate.Add(new BoilerplateTriple(tok, true, heapSucc, null, null, "boilerplate"));
-      }
-      return boilerplate;
-    }
-
-    /// <summary>
-    /// There are 3 states of interest when generating a frame condition:
-    ///  S0. the beginning of the method/loop, which is where the frame is interpreted
-    ///  S1. the pre-state of the two-state interval
-    ///  S2. the post-state of the two-state interval
-    /// This method assumes that etranPre denotes S1, etran denotes S2, and that etranMod denotes S0.
-    /// "use" being "Modifies" says to produce this frame condition:
-    ///      if it's not in the frame, then it is unchanged
-    /// "use" being "Reads" says to produce this frame condition:
-    ///      if it's in the frame, then it is unchanged
-    /// "use" being "Unchanged" says to produce this frame condition:
-    ///      if it's in the frame, then it is unchanged,
-    ///      and if it has a field designation, then furthermore 'alloc' is unchanged
-    /// </summary>
-    Bpl.Expr/*!*/ FrameCondition(IToken/*!*/ tok, List<FrameExpression/*!*/>/*!*/ frame, bool canAllocate, FrameExpressionUse use,
-      ExpressionTranslator/*!*/ etranPre, ExpressionTranslator/*!*/ etran, ExpressionTranslator/*!*/ etranMod, bool fieldGranularity) {
-      Contract.Requires(tok != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(etranPre != null);
-      Contract.Requires(cce.NonNullElements(frame));
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      // read is handled in AddFrameAxiom
-      //
-      // if field granularity:
-      // generate:
-      //  (forall<alpha> o: ref, f: Field alpha :: { $Heap[o][f] }
-      //      o != null
-      // #if use==Modifies
-      //      && old($Heap)[o][alloc]                     // include only in contexts that can allocate
-      // #endif
-      //      ==>
-      // #if use==Modifies
-      //        $Heap[o][f] == PreHeap[o][f] ||
-      //        (o,f) in modifiesClause)
-      // #else
-      //        (o,f) in readsClause
-      // #if use==Unchanged
-      //        or f==alloc && there's some f' such that (o,f') in readsClause
-      // #endif
-      //        ==>
-      //        $Heap[o][f] == PreHeap[o][f])
-      // #endif
-      //
-      // if object granularity:
-      // generate:
-      //  (forall o: ref :: { $Heap[o] }
-      //      o != null
-      // #if use==Modifies
-      //      && old($Heap)[o][alloc]                     // include only in contexts that can allocate
-      // #endif
-      //      ==>
-      // #if use==Modifies
-      //        $Heap[o] == PreHeap[o] ||
-      //        o in modifiesClause)
-      // #else
-      //        o in readsClause
-      //        ==>
-      //        $Heap[o] == PreHeap[o])
-      // #endif
-      var oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", predef.RefType));
-      var o = new Bpl.IdentifierExpr(tok, oVar);
-
-      Bpl.TypeVariable alpha;
-      Bpl.Expr f;
-      List<Variable> quantifiedVars;
-      List<TypeVariable> typeVars;
-      Bpl.Expr heapOF;
-      Bpl.Expr preHeapOF;
-      if (fieldGranularity) {
-        alpha = new Bpl.TypeVariable(tok, "alpha");
-        typeVars = new List<TypeVariable> { alpha };
-        var fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", predef.FieldName(tok, alpha)));
-        f = new Bpl.IdentifierExpr(tok, fVar);
-        quantifiedVars = new List<Variable> { oVar, fVar };
-        heapOF = ReadHeap(tok, etran.HeapExpr, o, f, alpha);
-        preHeapOF = ReadHeap(tok, etranPre.HeapExpr, o, f, alpha);
-      } else {
-        // object granularity
-        typeVars = new List<TypeVariable>();
-        f = null;
-        quantifiedVars = new List<Variable> { oVar };
-        heapOF = ReadHeap(tok, etran.HeapExpr, o);
-        preHeapOF = ReadHeap(tok, etranPre.HeapExpr, o);
-      }
-
-      Bpl.Expr ante = Bpl.Expr.Neq(o, predef.Null);
-      if (canAllocate && use == FrameExpressionUse.Modifies) {
-        ante = Bpl.Expr.And(ante, etranMod.IsAlloced(tok, o));
-      }
-      var eq = Bpl.Expr.Eq(heapOF, preHeapOF);
-      var ofInFrame = InRWClause(tok, o, f, frame, use == FrameExpressionUse.Unchanged, etranMod, null, null);
-      Bpl.Expr consequent = use == FrameExpressionUse.Modifies ? Bpl.Expr.Or(eq, ofInFrame) : Bpl.Expr.Imp(ofInFrame, eq);
-
-      var tr = new Bpl.Trigger(tok, true, new List<Bpl.Expr> { heapOF });
-      return new Bpl.ForallExpr(tok, typeVars, quantifiedVars, null, tr, Bpl.Expr.Imp(ante, consequent));
-    }
-
-    Bpl.Expr/*!*/ FrameConditionUsingDefinedFrame(IToken/*!*/ tok, ExpressionTranslator/*!*/ etranPre, ExpressionTranslator/*!*/ etran, ExpressionTranslator/*!*/ etranMod) {
-      Contract.Requires(tok != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(etranPre != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      // generate:
-      //  (forall<alpha> o: ref, f: Field alpha :: { $Heap[o,f] }
-      //      o != null && old($Heap)[o,alloc] ==>
-      //        $Heap[o,f] == PreHeap[o,f] ||
-      //        $_Frame[o,f])
-      Bpl.TypeVariable alpha = new Bpl.TypeVariable(tok, "alpha");
-      Bpl.BoundVariable oVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$o", predef.RefType));
-      Bpl.IdentifierExpr o = new Bpl.IdentifierExpr(tok, oVar);
-      Bpl.BoundVariable fVar = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, "$f", predef.FieldName(tok, alpha)));
-      Bpl.IdentifierExpr f = new Bpl.IdentifierExpr(tok, fVar);
-
-      Bpl.Expr heapOF = ReadHeap(tok, etran.HeapExpr, o, f, alpha);
-      Bpl.Expr preHeapOF = ReadHeap(tok, etranPre.HeapExpr, o, f, alpha);
-      Bpl.Expr ante = Bpl.Expr.And(Bpl.Expr.Neq(o, predef.Null), etranPre.IsAlloced(tok, o));
-      Bpl.Expr consequent = Bpl.Expr.Eq(heapOF, preHeapOF);
-
-      consequent = Bpl.Expr.Or(consequent, Bpl.Expr.SelectTok(tok, etranMod.TheFrame(tok), o, f));
-
-      Bpl.Trigger tr = new Bpl.Trigger(tok, true, new List<Bpl.Expr> { heapOF });
-      return new Bpl.ForallExpr(tok, new List<TypeVariable> { alpha }, new List<Variable> { oVar, fVar }, null, tr, Bpl.Expr.Imp(ante, consequent));
-    }
-    // ----- Type ---------------------------------------------------------------------------------
-    // Translates a type into the representation Boogie type,
-    // c.f. TypeToTy which translates a type to its Boogie expression
-    // to be used in $Is and $IsAlloc.
-    Bpl.Type TrType(Type type) {
-      Contract.Requires(type != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Type>() != null);
-
-      while (true) {
-        type = type.NormalizeExpand();
-        if (type is TypeProxy) {
-          Contract.Assume(false);  // we assume that all proxies should have been dealt with in the resolver
-        }
-        var d = type.AsNewtype;
-        if (d == null) {
-          break;
-        } else {
-          type = d.BaseType;  // the Boogie type to be used for the newtype is the same as for the base type
-        }
-      }
-
-      if (type is BoolType) {
-        return Bpl.Type.Bool;
-      } else if (type is CharType) {
-        return predef.CharType;
-      } else if (type is IntType) {
-        return Bpl.Type.Int;
-      } else if (type is RealType) {
-        return Bpl.Type.Real;
-      } else if (type is BigOrdinalType) {
-        return predef.BigOrdinalType;
-      } else if (type is BitvectorType) {
-        var t = (BitvectorType)type;
-        return BplBvType(t.Width);
-      } else if (type is IteratorDecl.EverIncreasingType) {
-        return Bpl.Type.Int;
-      } else if (type is ArrowType) {
-        return predef.HandleType;
-      } else if (type.IsTypeParameter || type.IsAbstractType) {
-        return predef.BoxType;
-      } else if (type.IsInternalTypeSynonym) {
-        return predef.BoxType;
-      } else if (type.IsRefType) {
-        // object and class types translate to ref
-        return predef.RefType;
-      } else if (type is UserDefinedType { ResolvedClass: TraitDecl }) {
-        // non-reference trait type
-        return predef.BoxType;
-      } else if (type.IsDatatype) {
-        return predef.DatatypeType;
-      } else if (type is SetType) {
-        return predef.SetType(Token.NoToken, ((SetType)type).Finite, predef.BoxType);
-      } else if (type is MultiSetType) {
-        return predef.MultiSetType(Token.NoToken, predef.BoxType);
-      } else if (type is MapType) {
-        return predef.MapType(Token.NoToken, ((MapType)type).Finite, predef.BoxType, predef.BoxType);
-      } else if (type is SeqType) {
-        return predef.SeqType(Token.NoToken, predef.BoxType);
-
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    public Bpl.Expr CondApplyBox(Bpl.IToken tok, Bpl.Expr e, Type fromType, Type toType) {
-      Contract.Requires(tok != null);
-      Contract.Requires(e != null);
-      Contract.Requires(fromType != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      if (!ModeledAsBoxType(fromType) && (toType == null || ModeledAsBoxType(toType))) {
-        // if "e" denotes "Unbox(E): T", then just return "E"
-        var coerce = e as Bpl.NAryExpr;
-        if (coerce != null && coerce.Fun is Bpl.TypeCoercion) {
-          Contract.Assert(coerce.Args.Count == 1);
-          Contract.Assert(Bpl.Type.Equals(((Bpl.TypeCoercion)coerce.Fun).Type, TrType(fromType))); ;
-          var call = coerce.Args[0] as Bpl.NAryExpr;
-          if (call != null && call.Fun is Bpl.FunctionCall) {
-            var fn = (Bpl.FunctionCall)call.Fun;
-            if (fn.FunctionName == "$Unbox") {
-              Contract.Assert(call.Args.Count == 1);
-              return call.Args[0];
-            }
-          }
-        }
-        // return "Box(e)"
-        return FunctionCall(tok, BuiltinFunction.Box, null, e);
-      } else {
-        return e;
-      }
-    }
-
-    public Bpl.Expr BoxIfNecessary(Bpl.IToken tok, Bpl.Expr e, Type fromType) {
-      Contract.Requires(tok != null);
-      Contract.Requires(e != null);
-      Contract.Requires(fromType != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      return CondApplyBox(tok, e, fromType, null);
-    }
-
-    public Bpl.Expr CondApplyUnbox(Bpl.IToken tok, Bpl.Expr e, Type fromType, Type toType) {
-      Contract.Requires(tok != null);
-      Contract.Requires(e != null);
-      Contract.Requires(fromType != null);
-      Contract.Requires(toType != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      if (ModeledAsBoxType(fromType) && !ModeledAsBoxType(toType)) {
-        return FunctionCall(tok, BuiltinFunction.Unbox, TrType(toType), e);
-      } else {
-        return e;
-      }
-    }
-
-    /// <summary>
-    ///   If the type is not normally boxed, insert a box around it.
-    ///   For lambda functions.
-    /// </summary>
-    public Bpl.Expr BoxIfUnboxed(Bpl.Expr e, Type t) {
-      if (!ModeledAsBoxType(t)) {
-        return FunctionCall(e.tok, BuiltinFunction.Box, null, e);
-      } else {
-        return e;
-      }
-    }
-
-    /// <summary>
-    ///   If the expression is boxed, but the type is not boxed, this unboxes it.
-    ///   For lambda functions.
-    /// KRML: The name of this method is really confusing. It seems it should be named something like UnboxUnlessInherentlyBoxed.
-    /// </summary>
-    public Bpl.Expr UnboxIfBoxed(Bpl.Expr e, Type t) {
-      if (!ModeledAsBoxType(t)) {
-        return FunctionCall(e.tok, BuiltinFunction.Unbox, TrType(t), e);
-      } else {
-        return e;
-      }
-    }
-
-    public Boogie.Expr BoxifyForTraitParent(Bpl.IToken tok, Boogie.Expr obj, MemberDecl member, Type fromType) {
-      return BoxifyForTraitParent(tok, obj, member.EnclosingClass, fromType);
-    }
-
-    public Boogie.Expr BoxifyForTraitParent(Bpl.IToken tok, Boogie.Expr obj, TopLevelDecl topLevelDecl, Type fromType) {
-      if (topLevelDecl is TraitDecl { IsReferenceTypeDecl: false }) {
-        return BoxIfNecessary(tok, obj, fromType);
-      }
-      return obj;
-    }
-
-    public static bool ModeledAsBoxType(Type t) {
-      Contract.Requires(t != null);
-      t = t.NormalizeExpand();
-      if (t is TypeProxy) {
-        // unresolved proxy
-        return false;
-      }
-      var res = t.IsTypeParameter || (t.IsTraitType && !t.IsRefType) || t.IsAbstractType || t.IsInternalTypeSynonym;
-      Contract.Assert(t.IsArrowType ? !res : true);
-      return res;
-    }
-
-    // ----- Statement ----------------------------------------------------------------------------
-
-    /// <summary>
-    /// A ForceCheckToken is a token wrapper whose purpose is to hide inheritance.
-    /// </summary>
-    public class ForceCheckToken : TokenWrapper {
-      public ForceCheckToken(IToken tok)
-        : base(tok) {
-        Contract.Requires(tok != null);
-      }
-      public static IToken Unwrap(IToken tok) {
-        Contract.Requires(tok != null);
-        Contract.Ensures(Contract.Result<IToken>() != null);
-        var ftok = tok as ForceCheckToken;
-        return ftok != null ? ftok.WrappedToken : tok;
-      }
-
-      public override IToken WithVal(string newVal) {
-        return new ForceCheckToken(WrappedToken.WithVal(newVal));
-      }
-    }
-
-    Bpl.PredicateCmd Assert(IToken tok, Bpl.Expr condition, PODesc.ProofObligationDescription description, Bpl.QKeyValue kv = null) {
-      return Assert(tok, condition, description, tok, kv);
-    }
-
-    Bpl.PredicateCmd Assert(IToken tok, Bpl.Expr condition, PODesc.ProofObligationDescription description, IToken refinesToken, Bpl.QKeyValue kv = null) {
-      Contract.Requires(tok != null);
-      Contract.Requires(condition != null);
-      Contract.Ensures(Contract.Result<Bpl.PredicateCmd>() != null);
-
-      if (assertAsAssume
-          || (assertionOnlyFilter != null && !assertionOnlyFilter(tok))
-          || (RefinementToken.IsInherited(refinesToken, currentModule) && (codeContext == null || !codeContext.MustReverify))) {
-        // produce an assume instead
-        return TrAssumeCmd(tok, condition, kv);
-      } else {
-        var cmd = TrAssertCmdDesc(ForceCheckToken.Unwrap(tok), condition, description, kv);
-        return cmd;
-      }
-    }
-
-    Bpl.PredicateCmd AssertNS(IToken tok, Bpl.Expr condition, PODesc.ProofObligationDescription desc) {
-      return AssertNS(tok, condition, desc, tok, null);
-    }
-
-    Bpl.PredicateCmd AssertNS(IToken tok, Bpl.Expr condition, PODesc.ProofObligationDescription desc, IToken refinesTok, Bpl.QKeyValue kv) {
-      Contract.Requires(tok != null);
-      Contract.Requires(desc != null);
-      Contract.Requires(condition != null);
-      Contract.Ensures(Contract.Result<Bpl.PredicateCmd>() != null);
-
-      if ((assertionOnlyFilter != null && !assertionOnlyFilter(tok)) ||
-          (RefinementToken.IsInherited(refinesTok, currentModule) && (codeContext == null || !codeContext.MustReverify))) {
-        // produce a "skip" instead
-        return TrAssumeCmd(tok, Bpl.Expr.True, kv);
-      } else {
-        tok = ForceCheckToken.Unwrap(tok);
-        var args = new List<object>();
-        args.Add(Bpl.Expr.Literal(0));
-        Bpl.AssertCmd cmd = TrAssertCmdDesc(tok, condition, desc, new Bpl.QKeyValue(tok, "subsumption", args, kv));
-        return cmd;
-      }
-    }
-
-    Bpl.Ensures Ensures(IToken tok, bool free, Bpl.Expr condition, string errorMessage, string successMessage, string comment) {
-      Contract.Requires(tok != null);
-      Contract.Requires(condition != null);
-      Contract.Ensures(Contract.Result<Bpl.Ensures>() != null);
-
-      Bpl.Ensures ens = new Bpl.Ensures(ForceCheckToken.Unwrap(tok), free, condition, comment);
-      ens.Description = new PODesc.EnsuresDescription(errorMessage, successMessage);
-      return ens;
-    }
-
-    Bpl.Requires Requires(IToken tok, bool free, Bpl.Expr condition, string errorMessage, string successMessage, string comment) {
-      Contract.Requires(tok != null);
-      Contract.Requires(condition != null);
-      Contract.Ensures(Contract.Result<Bpl.Requires>() != null);
-      Bpl.Requires req = new Bpl.Requires(ForceCheckToken.Unwrap(tok), free, condition, comment);
-      req.Description = new PODesc.RequiresDescription(errorMessage, successMessage);
-      return req;
-    }
-
-    Bpl.StmtList TrStmt2StmtList(BoogieStmtListBuilder builder, Statement block, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(builder != null);
-      Contract.Requires(block != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(codeContext != null && predef != null);
-      Contract.Ensures(Contract.Result<Bpl.StmtList>() != null);
-
-      TrStmt(block, builder, locals, etran);
-      return builder.Collect(block.Tok);  // TODO: would be nice to have an end-curly location for "block"
-    }
-
-    /// <summary>
-    /// Add to "builder" the following:
-    ///     if (*) { S ; assume false; }
-    /// where "S" is the given "builderToCollect".  This method consumes what has been built up in "builderToCollect".
-    /// </summary>
-    void PathAsideBlock(IToken tok, BoogieStmtListBuilder builderToCollect, BoogieStmtListBuilder builder) {
-      Contract.Requires(tok != null);
-      Contract.Requires(builderToCollect != null);
-      Contract.Requires(builderToCollect != null);
-
-      builderToCollect.Add(new Bpl.AssumeCmd(tok, Bpl.Expr.False));
-      var ifCmd = new Bpl.IfCmd(tok, null, builderToCollect.Collect(tok), null, null);
-      builder.Add(ifCmd);
-    }
-
-    (string, string) CustomErrorMessage(Attributes attrs) {
-      if (attrs == null) { return (null, null); }
-      List<Expression> args = Attributes.FindExpressions(attrs, "error");
-      if (args == null) { return (null, null); }
-      if (args.Count > 0) {
-        var lErr = (string)(args[0] as StringLiteralExpr)?.Value;
-        var lSucc = args.Count > 1 ? (string)(args[1] as StringLiteralExpr).Value : null;
-        return (lErr, lSucc);
-      } else {
-        return (null, null);
-      }
-    }
-
-    /// <summary>
-    /// Generates a Boogie expression "lo <= x <= hi", but leaving the lo/hi bound if null.
-    /// </summary>
-    private static Bpl.Expr ForLoopBounds(Bpl.Expr x, Bpl.Expr/*?*/ lo, Bpl.Expr/*?*/ hi) {
-      Bpl.Expr r = Bpl.Expr.True;
-      if (lo != null) {
-        r = BplAnd(r, Bpl.Expr.Le(lo, x));
-      }
-      if (hi != null) {
-        r = BplAnd(r, Bpl.Expr.Le(x, hi));
-      }
-      return r;
-    }
-
-    private void GenerateAndCheckGuesses(IToken tok, List<BoundVar> bvars, List<ComprehensionExpr.BoundedPool> bounds, Expression expr, Trigger triggers, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Contract.Requires(tok != null);
-      Contract.Requires(bvars != null);
-      Contract.Requires(bounds != null);
-      Contract.Requires(expr != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-
-      List<Tuple<List<Tuple<BoundVar, Expression>>, Expression>> partialGuesses = GeneratePartialGuesses(bvars, expr);
-      Bpl.Expr w = Bpl.Expr.False;
-      foreach (var tup in partialGuesses) {
-        var body = etran.TrExpr(tup.Item2);
-        Bpl.Expr typeConstraints = Bpl.Expr.True;
-        var undetermined = new List<BoundVar>();
-        foreach (var be in tup.Item1) {
-          if (be.Item2 == null) {
-            undetermined.Add(be.Item1);
-          } else {
-            typeConstraints = BplAnd(typeConstraints, MkIs(etran.TrExpr(be.Item2), be.Item1.Type));
-          }
-        }
-        body = BplAnd(typeConstraints, body);
-        if (undetermined.Count != 0) {
-          List<bool> freeOfAlloc = ComprehensionExpr.BoundedPool.HasBounds(bounds, ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
-          var bvs = new List<Variable>();
-          var typeAntecedent = etran.TrBoundVariables(undetermined, bvs, false, freeOfAlloc);
-          body = new Bpl.ExistsExpr(tok, bvs, triggers, BplAnd(typeAntecedent, body));
-        }
-        w = BplOr(body, w);
-      }
-      builder.Add(Assert(tok, w, new PODesc.LetSuchThatExists(bvars, expr)));
-    }
-
-    private void IntroduceAndAssignExistentialVars(ExistsExpr exists, BoogieStmtListBuilder builder, BoogieStmtListBuilder builderOutsideIfConstruct, List<Variable> locals, ExpressionTranslator etran, bool isGhost) {
-      Contract.Requires(exists != null);
-      Contract.Requires(exists.Range == null);
-      Contract.Requires(builder != null);
-      Contract.Requires(builderOutsideIfConstruct != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      // declare and havoc the bound variables of 'exists' as local variables
-      var iesForHavoc = new List<Bpl.IdentifierExpr>();
-      foreach (var bv in exists.BoundVars) {
-        Bpl.Type varType = TrType(bv.Type);
-        Bpl.Expr wh = GetWhereClause(bv.Tok,
-          new Bpl.IdentifierExpr(bv.Tok, bv.AssignUniqueName(currentDeclaration.IdGenerator), varType),
-          bv.Type, etran, isAllocContext.Var(isGhost, bv));
-        Bpl.Variable local = new Bpl.LocalVariable(bv.Tok, new Bpl.TypedIdent(bv.Tok, bv.AssignUniqueName(currentDeclaration.IdGenerator), varType, wh));
-        locals.Add(local);
-        iesForHavoc.Add(new Bpl.IdentifierExpr(local.tok, local));
-      }
-      builderOutsideIfConstruct.Add(new Bpl.HavocCmd(exists.tok, iesForHavoc));
-      builder.Add(TrAssumeCmd(exists.tok, etran.TrExpr(exists.Term)));
-    }
-
-    void TrStmtList(List<Statement> stmts, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(stmts != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      foreach (Statement ss in stmts) {
-        for (var l = ss.Labels; l != null; l = l.Next) {
-          var heapAt = new Bpl.LocalVariable(ss.Tok, new Bpl.TypedIdent(ss.Tok, "$Heap_at_" + l.Data.AssignUniqueId(CurrentIdGenerator), predef.HeapType));
-          locals.Add(heapAt);
-          builder.Add(Bpl.Cmd.SimpleAssign(ss.Tok, new Bpl.IdentifierExpr(ss.Tok, heapAt), etran.HeapExpr));
-        }
-        TrStmt(ss, builder, locals, etran);
-        if (ss.Labels != null) {
-          builder.AddLabelCmd("after_" + ss.Labels.Data.AssignUniqueId(CurrentIdGenerator));
-        }
-      }
-    }
-
-    /// <summary>
-    /// Returns an expression like 'exists' but where the bound variables have been renamed to have
-    /// 'prefix' as a prefix to their previous names.
-    /// Assumes the expression has been resolved.
-    /// </summary>
-    public static Expression AlphaRename(ExistsExpr exists, string prefix) {
-      Contract.Requires(exists != null);
-      Contract.Requires(prefix != null);
-
-      if (exists.SplitQuantifier != null) {
-        // TODO: what to do?  Substitute(exists.SplitQuantifierExpression);
-      }
-
-      var substMap = new Dictionary<IVariable, Expression>();
-      var var4var = new Dictionary<BoundVar, BoundVar>();
-      var bvars = new List<BoundVar>();
-      foreach (var bv in exists.BoundVars) {
-        var newBv = new BoundVar(bv.tok, prefix + bv.Name, bv.Type);
-        bvars.Add(newBv);
-        var4var.Add(bv, newBv);
-        var ie = new IdentifierExpr(newBv.tok, newBv.Name);
-        ie.Var = newBv;  // resolve here
-        ie.Type = newBv.Type;  // resolve here
-        substMap.Add(bv, ie);
-      }
-      var s = new Substituter(null, substMap, new Dictionary<TypeParameter, Type>());
-      var range = exists.Range == null ? null : s.Substitute(exists.Range);
-      var term = s.Substitute(exists.Term);
-      var attrs = s.SubstAttributes(exists.Attributes);
-      var ex = new ExistsExpr(exists.tok, exists.RangeToken, bvars, range, term, attrs);
-      ex.Type = Type.Bool;
-      ex.Bounds = s.SubstituteBoundedPoolList(exists.Bounds);
-      return ex;
-    }
-
-    /// <summary>
-    /// Generate:
-    ///   havoc Heap \ {this} \ _reads \ _new;
-    ///   assume this.Valid();
-    ///   assume YieldRequires;
-    ///   $_OldIterHeap := Heap;
-    /// </summary>
-    void YieldHavoc(IToken tok, IteratorDecl iter, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Contract.Requires(tok != null);
-      Contract.Requires(iter != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      // havoc Heap \ {this} \ _reads \ _new;
-      var th = new ThisExpr(iter);
-      var rds = new MemberSelectExpr(tok, th, iter.Member_Reads);
-      var nw = new MemberSelectExpr(tok, th, iter.Member_New);
-      builder.Add(new Bpl.CallCmd(tok, "$YieldHavoc",
-        new List<Bpl.Expr>() { etran.TrExpr(th), etran.TrExpr(rds), etran.TrExpr(nw) },
-        new List<Bpl.IdentifierExpr>()));
-      // assume YieldRequires;
-      foreach (var p in iter.YieldRequires) {
-        builder.Add(TrAssumeCmd(tok, etran.TrExpr(p.E)));
-      }
-      // $_OldIterHeap := Heap;
-      builder.Add(Bpl.Cmd.SimpleAssign(tok, new Bpl.IdentifierExpr(tok, "$_OldIterHeap", predef.HeapType), etran.HeapExpr));
-    }
-
-    List<Tuple<List<Tuple<BoundVar, Expression>>, Expression>> GeneratePartialGuesses(List<BoundVar> bvars, Expression expression) {
-      if (bvars.Count == 0) {
-        var tup = new Tuple<List<Tuple<BoundVar, Expression>>, Expression>(new List<Tuple<BoundVar, Expression>>(), expression);
-        return new List<Tuple<List<Tuple<BoundVar, Expression>>, Expression>>() { tup };
-      }
-      var result = new List<Tuple<List<Tuple<BoundVar, Expression>>, Expression>>();
-      var x = bvars[0];
-      var otherBvars = bvars.GetRange(1, bvars.Count - 1);
-      foreach (var tup in GeneratePartialGuesses(otherBvars, expression)) {
-        // in the special case that x does not even occur in expression (and we know the type has a value for x), we can just ignore x
-        if (!FreeVariablesUtil.ContainsFreeVariable(tup.Item2, false, x) && x.Type.KnownToHaveToAValue(x.IsGhost)) {
-          result.Add(tup);
-          continue;
-        }
-        // one possible result is to quantify over all the variables
-        var vs = new List<Tuple<BoundVar, Expression>>() { new Tuple<BoundVar, Expression>(x, null) };
-        vs.AddRange(tup.Item1);
-        result.Add(new Tuple<List<Tuple<BoundVar, Expression>>, Expression>(vs, tup.Item2));
-        // other possibilities involve guessing a value for x
-        foreach (var guess in GuessWitnesses(x, tup.Item2)) {
-          var g = Substitute(tup.Item2, x, guess);
-          vs = new List<Tuple<BoundVar, Expression>>() { new Tuple<BoundVar, Expression>(x, guess) };
-          AddRangeSubst(vs, tup.Item1, x, guess);
-          result.Add(new Tuple<List<Tuple<BoundVar, Expression>>, Expression>(vs, g));
-        }
-      }
-      return result;
-    }
-
-    private void AddRangeSubst(List<Tuple<BoundVar, Expression>> vs, List<Tuple<BoundVar, Expression>> aa, IVariable v, Expression e) {
-      Contract.Requires(vs != null);
-      Contract.Requires(aa != null);
-      Contract.Requires(v != null);
-      Contract.Requires(e != null);
-      foreach (var be in aa) {
-        if (be.Item2 == null) {
-          vs.Add(be);
-        } else {
-          vs.Add(new Tuple<BoundVar, Expression>(be.Item1, Substitute(be.Item2, v, e)));
-        }
-      }
-    }
-
-    IEnumerable<Expression> GuessWitnesses(BoundVar x, Expression expr) {
-      Contract.Requires(x != null);
-      Contract.Requires(expr != null);
-      var xType = x.Type.NormalizeExpand();
-      if (xType is BoolType) {
-        var lit = new LiteralExpr(x.tok, false);
-        lit.Type = Type.Bool;  // resolve here
-        yield return lit;
-        lit = new LiteralExpr(x.tok, true);
-        lit.Type = Type.Bool;  // resolve here
-        yield return lit;
-        yield break;  // there are no more possible witnesses for booleans
-      } else if (xType is CharType) {
-        // TODO: something could be done for character literals
-      } else if (xType.IsBitVectorType) {
-        // TODO: something could be done for bitvectors
-      } else if (xType.IsRefType) {
-        var lit = new LiteralExpr(x.tok);  // null
-        lit.Type = xType;
-        yield return lit;
-      } else if (xType.IsDatatype) {
-        var dt = xType.AsDatatype;
-        Expression zero = Zero(x.tok, xType);
-        if (zero != null) {
-          yield return zero;
-        }
-        foreach (var ctor in dt.Ctors) {
-          if (ctor.Formals.Count == 0) {
-            var v = new DatatypeValue(x.tok, dt.Name, ctor.Name, new List<Expression>());
-            v.Ctor = ctor;  // resolve here
-            v.InferredTypeArgs = xType.TypeArgs; // resolved here.
-            v.Type = xType;  // resolve here
-            yield return v;
-          }
-        }
-      } else if (xType is SetType) {
-        var empty = new SetDisplayExpr(x.tok, ((SetType)xType).Finite, new List<Expression>());
-        empty.Type = xType;
-        yield return empty;
-      } else if (xType is MultiSetType) {
-        var empty = new MultiSetDisplayExpr(x.tok, new List<Expression>());
-        empty.Type = xType;
-        yield return empty;
-      } else if (xType is SeqType) {
-        var empty = new SeqDisplayExpr(x.tok, new List<Expression>());
-        empty.Type = xType;
-        yield return empty;
-      } else if (xType.IsNumericBased(Type.NumericPersuasion.Int)) {
-        var lit = new LiteralExpr(x.tok, 0);
-        lit.Type = xType;  // resolve here
-        yield return lit;
-      } else if (xType.IsNumericBased(Type.NumericPersuasion.Real)) {
-        var lit = new LiteralExpr(x.tok, BaseTypes.BigDec.ZERO);
-        lit.Type = xType;  // resolve here
-        yield return lit;
-      }
-
-      var bounds = ModuleResolver.DiscoverAllBounds_SingleVar(x, expr);
-      foreach (var bound in bounds) {
-        if (bound is ComprehensionExpr.IntBoundedPool) {
-          var bnd = (ComprehensionExpr.IntBoundedPool)bound;
-          if (bnd.LowerBound != null) {
-            yield return bnd.LowerBound;
-          }
-
-          if (bnd.UpperBound != null) {
-            yield return Expression.CreateDecrement(bnd.UpperBound, 1);
-          }
-        } else if (bound is ComprehensionExpr.SubSetBoundedPool) {
-          var bnd = (ComprehensionExpr.SubSetBoundedPool)bound;
-          yield return bnd.UpperBound;
-        } else if (bound is ComprehensionExpr.SuperSetBoundedPool) {
-          var bnd = (ComprehensionExpr.SuperSetBoundedPool)bound;
-          yield return bnd.LowerBound;
-        } else if (bound is ComprehensionExpr.SetBoundedPool) {
-          var st = ((ComprehensionExpr.SetBoundedPool)bound).Set.Resolved;
-          if (st is DisplayExpression) {
-            var display = (DisplayExpression)st;
-            foreach (var el in display.Elements) {
-              yield return el;
-            }
-          } else if (st is MapDisplayExpr) {
-            var display = (MapDisplayExpr)st;
-            foreach (var maplet in display.Elements) {
-              yield return maplet.A;
-            }
-          }
-        } else if (bound is ComprehensionExpr.MultiSetBoundedPool) {
-          var st = ((ComprehensionExpr.MultiSetBoundedPool)bound).MultiSet.Resolved;
-          if (st is DisplayExpression) {
-            var display = (DisplayExpression)st;
-            foreach (var el in display.Elements) {
-              yield return el;
-            }
-          } else if (st is MapDisplayExpr) {
-            var display = (MapDisplayExpr)st;
-            foreach (var maplet in display.Elements) {
-              yield return maplet.A;
-            }
-          }
-        } else if (bound is ComprehensionExpr.SeqBoundedPool) {
-          var sq = ((ComprehensionExpr.SeqBoundedPool)bound).Seq.Resolved;
-          var display = sq as DisplayExpression;
-          if (display != null) {
-            foreach (var el in display.Elements) {
-              yield return el;
-            }
-          }
-        } else if (bound is ComprehensionExpr.ExactBoundedPool) {
-          yield return ((ComprehensionExpr.ExactBoundedPool)bound).E;
-        }
-      }
-    }
-
-    /// <summary>
-    /// Return a zero-equivalent value for "typ", or return null (for any reason whatsoever).
-    /// </summary>
-    Expression Zero(IToken tok, Type typ) {
-      Contract.Requires(tok != null);
-      Contract.Requires(typ != null);
-      typ = typ.NormalizeExpand();
-      if (typ is BoolType) {
-        return Expression.CreateBoolLiteral(tok, false);
-      } else if (typ is CharType) {
-        var z = new CharLiteralExpr(tok, CharType.DefaultValue.ToString());
-        z.Type = Type.Char;  // resolve here
-        return z;
-      } else if (typ.IsNumericBased(Type.NumericPersuasion.Int)) {
-        return Expression.CreateIntLiteral(tok, 0);
-      } else if (typ.IsNumericBased(Type.NumericPersuasion.Real)) {
-        return Expression.CreateRealLiteral(tok, BaseTypes.BigDec.ZERO);
-      } else if (typ.IsBigOrdinalType) {
-        return Expression.CreateNatLiteral(tok, 0, Type.BigOrdinal);
-      } else if (typ.IsBitVectorType) {
-        var z = new LiteralExpr(tok, 0);
-        z.Type = typ;
-        return z;
-      } else if (typ.IsRefType) {
-        var z = new LiteralExpr(tok);  // null
-        z.Type = typ;
-        return z;
-      } else if (typ.IsDatatype) {
-        return null;  // this can be improved
-      } else if (typ is SetType) {
-        var empty = new SetDisplayExpr(tok, ((SetType)typ).Finite, new List<Expression>());
-        empty.Type = typ;
-        return empty;
-      } else if (typ is MultiSetType) {
-        var empty = new MultiSetDisplayExpr(tok, new List<Expression>());
-        empty.Type = typ;
-        return empty;
-      } else if (typ is SeqType) {
-        var empty = new SeqDisplayExpr(tok, new List<Expression>());
-        empty.Type = typ;
-        return empty;
-      } else if (typ is MapType) {
-        var empty = new MapDisplayExpr(tok, ((MapType)typ).Finite, new List<ExpressionPair>());
-        empty.Type = typ;
-        return empty;
-      } else if (typ is ArrowType) {
-        // TODO: do better than just returning null
-        return null;
-      } else if (typ.IsAbstractType || typ.IsInternalTypeSynonym) {
-        return null;
-      } else {
-        Contract.Assume(false);  // unexpected type
-        return null;
-      }
-    }
-
-
-
-
-    delegate Bpl.Expr ExpressionConverter(Dictionary<IVariable, Expression> substMap, ExpressionTranslator etran);
-
-    // Note: not trying to reduce duplication between this and TrAssertCmdDesc because this one should ultimately be removed.
-    Bpl.AssertCmd TrAssertCmd(IToken tok, Bpl.Expr expr, Bpl.QKeyValue attributes = null) {
-      // TODO: move the following comment once this method disappears
-
-      // It may be that "expr" is a Lit expression. It might seem we don't need a Lit expression
-      // around the boolean expression that is being asserted. However, we keep it. For one,
-      // it doesn't change the semantics of the assert command. More importantly, leaving
-      // a Lit around the expression is useful to avoid sending an "assert false;" to Boogie--since
-      // Boogie looks especially for "assert false;" commands and processes them in such a way
-      // that loops no longer are loops (which is confusing for Dafny users).
-      return attributes == null ? new Bpl.AssertCmd(tok, expr) : new Bpl.AssertCmd(tok, expr, attributes);
-    }
-
-    Bpl.AssertCmd TrAssertCmdDesc(IToken tok, Bpl.Expr expr, PODesc.ProofObligationDescription description, Bpl.QKeyValue attributes = null) {
-      return new Bpl.AssertCmd(tok, expr, description, attributes);
-    }
-
-    delegate void BodyTranslator(BoogieStmtListBuilder builder, ExpressionTranslator etr);
-
-    List<Bpl.Expr> trTypeArgs(Dictionary<TypeParameter, Type> tySubst, List<TypeParameter> tyArgs) {
-      var res = new List<Bpl.Expr>();
-      foreach (var p in tyArgs) {
-        res.Add(TypeToTy(tySubst[p]));
-      }
-      return res;
-    }
-
-    Dictionary<IVariable, Expression> SetupBoundVarsAsLocals(List<BoundVar> boundVars, out Bpl.Expr typeAntecedent,
-      BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran,
-      string nameSuffix = null) {
-      Contract.Requires(boundVars != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      Contract.Ensures(Contract.ValueAtReturn(out typeAntecedent) != null);
-
-      typeAntecedent = Bpl.Expr.True;
-      var substMap = new Dictionary<IVariable, Expression>();
-      foreach (BoundVar bv in boundVars) {
-        LocalVariable local = new LocalVariable(bv.RangeToken, nameSuffix == null ? bv.Name : bv.Name + nameSuffix, bv.Type, bv.IsGhost);
-        local.type = local.OptionalType;  // resolve local here
-        IdentifierExpr ie = new IdentifierExpr(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator));
-        ie.Var = local; ie.Type = ie.Var.Type;  // resolve ie here
-        substMap.Add(bv, ie);
-        Bpl.LocalVariable bvar = new Bpl.LocalVariable(local.Tok, new Bpl.TypedIdent(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator), TrType(local.Type)));
-        locals.Add(bvar);
-        var bIe = new Bpl.IdentifierExpr(bvar.tok, bvar);
-        builder.Add(new Bpl.HavocCmd(bv.tok, new List<Bpl.IdentifierExpr> { bIe }));
-        Bpl.Expr wh = GetWhereClause(bv.tok, bIe, local.Type, etran, IsAllocType.ISALLOC);
-        if (wh != null) {
-          typeAntecedent = BplAnd(typeAntecedent, wh);
-        }
-      }
-      return substMap;
-    }
-
-    Dictionary<IVariable, Expression> SetupBoundVarsAsLocals(List<BoundVar> boundVars, BoogieStmtListBuilder builder,
-      List<Variable> locals, ExpressionTranslator etran,
-      string nameSuffix = null) {
-      Contract.Requires(boundVars != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      var substMap = SetupBoundVarsAsLocals(boundVars, out var typeAntecedent, builder, locals, etran, nameSuffix);
-      builder.Add(TrAssumeCmd(typeAntecedent.tok, typeAntecedent));
-      return substMap;
-    }
-
-    /// <summary>
-    /// Clone Dafny variable "v" into a new Dafny local variable "l".
-    /// Add to "substMap" the substitution from "v" to an IdentifierExpr for "l".
-    /// Also, generate a Boogie variable "bvar" for "l", add "bvar" to "locals", and
-    /// emit to "builder" a havoc statement for "bvar". The type antecedent for "bvar"
-    /// is NOT emitted; rather, it is returned by this method.
-    /// </summary>
-    Bpl.Expr SetupVariableAsLocal(IVariable v, Dictionary<IVariable, Expression> substMap,
-      BoogieStmtListBuilder builder, List<Bpl.Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(v != null);
-      Contract.Requires(substMap != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-
-      var local = new LocalVariable(v.RangeToken, v.Name, v.Type, v.IsGhost);
-      local.type = local.OptionalType;  // resolve local here
-      var ie = new IdentifierExpr(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator));
-      ie.Var = local; ie.Type = ie.Var.Type;  // resolve ie here
-      substMap.Add(v, ie);
-
-      var bvar = new Bpl.LocalVariable(local.Tok, new Bpl.TypedIdent(local.Tok, local.AssignUniqueName(currentDeclaration.IdGenerator), TrType(local.Type)));
-      locals.Add(bvar);
-      var bIe = new Bpl.IdentifierExpr(bvar.tok, bvar);
-      builder.Add(new Bpl.HavocCmd(v.Tok, new List<Bpl.IdentifierExpr> { bIe }));
-      var wh = GetWhereClause(v.Tok, bIe, local.Type, etran, ISALLOC);
-      return wh ?? Bpl.Expr.True;
-    }
-
-    List<Bpl.Expr> RecordDecreasesValue(List<Expression> decreases, BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran, string varPrefix) {
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(varPrefix != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(decreases != null);
-      List<Bpl.Expr> oldBfs = new List<Bpl.Expr>();
-      var idGen = new FreshIdGenerator();
-      foreach (Expression e in decreases) {
-        Contract.Assert(e != null);
-        Bpl.LocalVariable bfVar = new Bpl.LocalVariable(e.tok, new Bpl.TypedIdent(e.tok, idGen.FreshId(varPrefix), TrType(cce.NonNull(e.Type))));
-        locals.Add(bfVar);
-        Bpl.IdentifierExpr bf = new Bpl.IdentifierExpr(e.tok, bfVar);
-        oldBfs.Add(bf);
-        // record value of each decreases expression at beginning of the loop iteration
-        Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(e.tok, bf, etran.TrExpr(e));
-        builder.Add(cmd);
-      }
-      return oldBfs;
-    }
-
-    /// <summary>
-    /// Emit to "builder" a check that calleeDecreases is less than contextDecreases.  More precisely,
-    /// the check is:
-    ///     allowance || (calleeDecreases LESS contextDecreases).
-    /// </summary>
-    void CheckCallTermination(IToken tok, List<Expression> contextDecreases, List<Expression> calleeDecreases,
-                              Bpl.Expr allowance,
-                              Expression receiverReplacement, Dictionary<IVariable, Expression> substMap,
-                              Dictionary<TypeParameter, Type> typeMap,
-                              ExpressionTranslator etranCurrent, ExpressionTranslator etranInitial, BoogieStmtListBuilder builder, bool inferredDecreases, string hint) {
-      Contract.Requires(tok != null);
-      Contract.Requires(cce.NonNullElements(contextDecreases));
-      Contract.Requires(cce.NonNullElements(calleeDecreases));
-      Contract.Requires(cce.NonNullDictionaryAndValues(substMap));
-      Contract.Requires(etranCurrent != null);
-      Contract.Requires(etranInitial != null);
-      Contract.Requires(builder != null);
-
-      // The interpretation of the given decreases-clause expression tuples is as a lexicographic tuple, extended into
-      // an infinite tuple by appending TOP elements.  The TOP element is strictly larger than any other value given
-      // by a Dafny expression.  Each Dafny types has its own ordering, and these orderings are combined into a partial
-      // order where elements from different Dafny types are incomparable.  Thus, as an optimization below, if two
-      // components from different types are compared, the answer is taken to be false.
-
-      if (Contract.Exists(calleeDecreases, e => e is WildcardExpr)) {
-        // no check needed
-        return;
-      }
-
-      int N = Math.Min(contextDecreases.Count, calleeDecreases.Count);
-      var toks = new List<IToken>();
-      var types0 = new List<Type>();
-      var types1 = new List<Type>();
-      var callee = new List<Expr>();
-      var caller = new List<Expr>();
-      if (RefinementToken.IsInherited(tok, currentModule) && contextDecreases.All(e => !RefinementToken.IsInherited(e.tok, currentModule))) {
-        // the call site is inherited but all the context decreases expressions are new
-        tok = new ForceCheckToken(tok);
-      }
-      for (int i = 0; i < N; i++) {
-        Expression e0 = Substitute(calleeDecreases[i], receiverReplacement, substMap, typeMap);
-        Expression e1 = contextDecreases[i];
-        if (!CompatibleDecreasesTypes(e0.Type, e1.Type)) {
-          N = i;
-          break;
-        }
-        toks.Add(new NestedToken(tok, e1.tok));
-        types0.Add(e0.Type.NormalizeExpand());
-        types1.Add(e1.Type.NormalizeExpand());
-        callee.Add(etranCurrent.TrExpr(e0));
-        caller.Add(etranInitial.TrExpr(e1));
-      }
-      bool endsWithWinningTopComparison = N == contextDecreases.Count && N < calleeDecreases.Count;
-      Bpl.Expr decrExpr = DecreasesCheck(toks, types0, types1, callee, caller, builder, "", endsWithWinningTopComparison, false);
-      if (allowance != null) {
-        decrExpr = Bpl.Expr.Or(allowance, decrExpr);
-      }
-      builder.Add(Assert(tok, decrExpr, new PODesc.Terminates(inferredDecreases, false, hint)));
-    }
-
-    /// <summary>
-    /// Returns the expression that says whether or not the decreases function has gone down (if !allowNoChange)
-    /// or has gone down or stayed the same (if allowNoChange).
-    /// ee0 represents the new values and ee1 represents old values.
-    /// If builder is non-null, then the check '0 ATMOST decr' is generated to builder.
-    /// Requires all types in types0 and types1 to be non-proxy non-synonym types (that is, callers should invoke NormalizeExpand)
-    /// </summary>
-    Bpl.Expr DecreasesCheck(List<IToken> toks, List<Type> types0, List<Type> types1, List<Bpl.Expr> ee0, List<Bpl.Expr> ee1,
-                            BoogieStmtListBuilder builder, string suffixMsg, bool allowNoChange, bool includeLowerBound) {
-      Contract.Requires(cce.NonNullElements(toks));
-      Contract.Requires(cce.NonNullElements(types0));
-      Contract.Requires(cce.NonNullElements(types1));
-      Contract.Requires(cce.NonNullElements(ee0));
-      Contract.Requires(cce.NonNullElements(ee1));
-      Contract.Requires(predef != null);
-      Contract.Requires(types0.Count == types1.Count && types0.Count == ee0.Count && ee0.Count == ee1.Count);
-      Contract.Requires(builder == null || suffixMsg != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      int N = types0.Count;
-
-      // compute eq and less for each component of the lexicographic tuple
-      List<Bpl.Expr> Eq = new List<Bpl.Expr>(N);
-      List<Bpl.Expr> Less = new List<Bpl.Expr>(N);
-      for (int i = 0; i < N; i++) {
-        Bpl.Expr less, atmost, eq;
-        ComputeLessEq(toks[i], types0[i], types1[i], ee0[i], ee1[i], out less, out atmost, out eq, includeLowerBound);
-        Eq.Add(eq);
-        Less.Add(allowNoChange ? atmost : less);
-      }
-      if (builder != null) {
-        // check: 0 <= ee1
-        // more precisely, for component k of the lexicographic decreases function, check:
-        //   ee0[0] < ee1[0] || ee0[1] < ee1[1] || ... || ee0[k-1] < ee1[k-1] || ee0[k] == ee1[k] || 0 <= ee1[k]
-        for (int k = 0; k < N; k++) {
-          // we only need to check lower bound for integers--sets, sequences, booleans, references, and datatypes all have natural lower bounds
-          Bpl.Expr prefixIsLess = Bpl.Expr.False;
-          for (int i = 0; i < k; i++) {
-            prefixIsLess = Bpl.Expr.Or(prefixIsLess, Less[i]);
-          };
-
-          Bpl.Expr zero = null;
-          string zeroStr = null;
-          if (types0[k].IsNumericBased(Type.NumericPersuasion.Int)) {
-            zero = Bpl.Expr.Literal(0);
-            zeroStr = "0";
-          } else if (types0[k].IsNumericBased(Type.NumericPersuasion.Real)) {
-            zero = Bpl.Expr.Literal(BaseTypes.BigDec.ZERO);
-            zeroStr = "0.0";
-          }
-          if (zero != null) {
-            Bpl.Expr bounded = Bpl.Expr.Le(zero, ee1[k]);
-            for (int i = 0; i < k; i++) {
-              bounded = Bpl.Expr.Or(bounded, Less[i]);
-            }
-            Bpl.Cmd cmd = Assert(toks[k], Bpl.Expr.Or(bounded, Eq[k]), new PODesc.DecreasesBoundedBelow(N, k, zeroStr, suffixMsg));
-            builder.Add(cmd);
-          }
-        }
-      }
-      // check: ee0 < ee1 (or ee0 <= ee1, if allowNoChange)
-      Bpl.Expr decrCheck = allowNoChange ? Bpl.Expr.True : Bpl.Expr.False;
-      for (int i = N; 0 <= --i;) {
-        Bpl.Expr less = Less[i];
-        Bpl.Expr eq = Eq[i];
-        if (allowNoChange) {
-          // decrCheck = atmost && (eq ==> decrCheck)
-          decrCheck = Bpl.Expr.And(less, Bpl.Expr.Imp(eq, decrCheck));
-        } else {
-          // decrCheck = less || (eq && decrCheck)
-          decrCheck = Bpl.Expr.Or(less, Bpl.Expr.And(eq, decrCheck));
-        }
-      }
-      return decrCheck;
-    }
-
-    bool CompatibleDecreasesTypes(Type t, Type u) {
-      Contract.Requires(t != null);
-      Contract.Requires(u != null);
-      t = t.NormalizeExpand();
-      u = u.NormalizeExpand();
-      if (t is BoolType) {
-        return u is BoolType;
-      } else if (t is CharType) {
-        return u is CharType;
-      } else if (t.IsNumericBased(Type.NumericPersuasion.Int)) {
-        // we can allow different kinds of int-based types
-        return u.IsNumericBased(Type.NumericPersuasion.Int);
-      } else if (t.IsNumericBased(Type.NumericPersuasion.Real)) {
-        // we can allow different kinds of real-based types
-        return u.IsNumericBased(Type.NumericPersuasion.Real);
-      } else if (t is SetType) {
-        return u is SetType;
-      } else if (t is SeqType) {
-        return u is SeqType || u.IsIndDatatype;
-      } else if (t.IsDatatype) {
-        return u.IsDatatype || (t.IsIndDatatype && u is SeqType);
-      } else if (t.IsRefType) {
-        return u.IsRefType;
-      } else if (t is MultiSetType) {
-        return u is MultiSetType;
-      } else if (t is MapType) {
-        return u is MapType && ((MapType)t).Finite == ((MapType)u).Finite;
-      } else if (t is ArrowType) {
-        return u is ArrowType;
-      } else if (t is BitvectorType) {
-        return u is BitvectorType;
-      } else if (t is BigOrdinalType) {
-        return u is BigOrdinalType;
-      } else {
-        Contract.Assert(t.IsTypeParameter || t.IsAbstractType || t.IsInternalTypeSynonym);
-        return false;  // don't consider any type parameters to be the same (since we have no comparison function for them anyway)
-      }
-    }
-
-    Nullable<BuiltinFunction> RankFunction(Type/*!*/ ty) {
-      Contract.Requires(ty != null);
-      if (ty is SeqType) {
-        return BuiltinFunction.SeqRank;
-      } else if (ty.IsIndDatatype) {
-        return BuiltinFunction.DtRank;
-      } else {
-        return null;
-      }
-    }
-
-    void ComputeLessEq(IToken tok, Type ty0, Type ty1, Bpl.Expr e0, Bpl.Expr e1, out Bpl.Expr less, out Bpl.Expr atmost, out Bpl.Expr eq, bool includeLowerBound) {
-      Contract.Requires(tok != null);
-      Contract.Requires(ty0 != null);
-      Contract.Requires(ty1 != null);
-      Contract.Requires(e0 != null);
-      Contract.Requires(e1 != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.ValueAtReturn(out less) != null);
-      Contract.Ensures(Contract.ValueAtReturn(out atmost) != null);
-      Contract.Ensures(Contract.ValueAtReturn(out eq) != null);
-
-      ty0 = ty0.NormalizeExpand();
-      ty1 = ty1.NormalizeExpand();
-      var rk0 = RankFunction(ty0);
-      var rk1 = RankFunction(ty1);
-      if (rk0 != null && rk1 != null && rk0 != rk1) {
-        eq = Bpl.Expr.False;
-        Bpl.Expr b0 = FunctionCall(tok, rk0.Value, null, e0);
-        Bpl.Expr b1 = FunctionCall(tok, rk1.Value, null, e1);
-        less = Bpl.Expr.Lt(b0, b1);
-        atmost = Bpl.Expr.Le(b0, b1);
-      } else if (ty0 is BoolType) {
-        eq = Bpl.Expr.Iff(e0, e1);
-        less = Bpl.Expr.And(Bpl.Expr.Not(e0), e1);
-        atmost = Bpl.Expr.Imp(e0, e1);
-      } else if (ty0 is CharType) {
-        eq = Bpl.Expr.Eq(e0, e1);
-        var operand0 = FunctionCall(e0.tok, BuiltinFunction.CharToInt, null, e0);
-        var operand1 = FunctionCall(e0.tok, BuiltinFunction.CharToInt, null, e1);
-        less = Bpl.Expr.Binary(tok, BinaryOperator.Opcode.Lt, operand0, operand1);
-        atmost = Bpl.Expr.Binary(tok, BinaryOperator.Opcode.Le, operand0, operand1);
-      } else if (ty0.IsNumericBased(Type.NumericPersuasion.Int) || ty0 is SeqType || ty0.IsDatatype) {
-        Bpl.Expr b0, b1;
-        if (ty0.IsNumericBased(Type.NumericPersuasion.Int)) {
-          b0 = e0;
-          b1 = e1;
-        } else if (ty0 is SeqType) {
-          b0 = FunctionCall(tok, BuiltinFunction.SeqRank, null, e0);
-          b1 = FunctionCall(tok, BuiltinFunction.SeqRank, null, e1);
-        } else if (ty0.IsDatatype) {
-          b0 = FunctionCall(tok, BuiltinFunction.DtRank, null, e0);
-          b1 = FunctionCall(tok, BuiltinFunction.DtRank, null, e1);
-        } else {
-          Contract.Assert(false); throw new cce.UnreachableException();
-        }
-        eq = Bpl.Expr.Eq(b0, b1);
-        less = Bpl.Expr.Lt(b0, b1);
-        atmost = Bpl.Expr.Le(b0, b1);
-        if (ty0.IsNumericBased(Type.NumericPersuasion.Int) && includeLowerBound) {
-          less = Bpl.Expr.And(Bpl.Expr.Le(Bpl.Expr.Literal(0), b0), less);
-          atmost = Bpl.Expr.And(Bpl.Expr.Le(Bpl.Expr.Literal(0), b0), atmost);
-        }
-
-      } else if (ty0.IsNumericBased(Type.NumericPersuasion.Real)) {
-        eq = Bpl.Expr.Eq(e0, e1);
-        less = Bpl.Expr.Le(e0, Bpl.Expr.Sub(e1, Bpl.Expr.Literal(BaseTypes.BigDec.FromInt(1))));
-        atmost = Bpl.Expr.Le(e0, e1);
-        if (includeLowerBound) {
-          less = Bpl.Expr.And(Bpl.Expr.Le(Bpl.Expr.Literal(BaseTypes.BigDec.ZERO), e0), less);
-          atmost = Bpl.Expr.And(Bpl.Expr.Le(Bpl.Expr.Literal(BaseTypes.BigDec.ZERO), e0), atmost);
-        }
-
-      } else if (ty0 is IteratorDecl.EverIncreasingType) {
-        eq = Bpl.Expr.Eq(e0, e1);
-        less = Bpl.Expr.Gt(e0, e1);
-        atmost = Bpl.Expr.Ge(e0, e1);
-
-      } else if ((ty0 is SetType && ((SetType)ty0).Finite) || (ty0 is MapType && ((MapType)ty0).Finite)) {
-        Bpl.Expr b0, b1;
-        if (ty0 is SetType) {
-          b0 = e0;
-          b1 = e1;
-        } else {
-          // for maps, compare their domains as sets
-          b0 = FunctionCall(tok, BuiltinFunction.MapDomain, predef.MapType(tok, true, predef.BoxType, predef.BoxType), e0);
-          b1 = FunctionCall(tok, BuiltinFunction.MapDomain, predef.MapType(tok, true, predef.BoxType, predef.BoxType), e1);
-        }
-        eq = FunctionCall(tok, BuiltinFunction.SetEqual, null, b0, b1);
-        less = ProperSubset(tok, b0, b1);
-        atmost = FunctionCall(tok, BuiltinFunction.SetSubset, null, b0, b1);
-
-      } else if (ty0 is SetType || ty0 is MapType) {
-        Bpl.Expr b0, b1;
-        if (ty0 is SetType) {
-          Contract.Assert(!((SetType)ty0).Finite);
-          b0 = e0;
-          b1 = e1;
-        } else {
-          Contract.Assert(!((MapType)ty0).Finite);
-          // for maps, compare their domains as sets
-          b0 = FunctionCall(tok, BuiltinFunction.IMapDomain, predef.MapType(tok, false, predef.BoxType, predef.BoxType), e0);
-          b1 = FunctionCall(tok, BuiltinFunction.IMapDomain, predef.MapType(tok, false, predef.BoxType, predef.BoxType), e1);
-        }
-        eq = FunctionCall(tok, BuiltinFunction.ISetEqual, null, b0, b1);
-        less = Bpl.Expr.False;
-        atmost = BplOr(less, eq);
-
-      } else if (ty0 is MultiSetType) {
-        eq = FunctionCall(tok, BuiltinFunction.MultiSetEqual, null, e0, e1);
-        less = ProperMultiset(tok, e0, e1);
-        atmost = FunctionCall(tok, BuiltinFunction.MultiSetSubset, null, e0, e1);
-
-      } else if (ty0 is ArrowType) {
-        eq = Bpl.Expr.Eq(e0, e1);
-        less = Bpl.Expr.False;  // TODO: try to do better than this
-        atmost = BplOr(less, eq);
-
-      } else if (ty0 is BitvectorType) {
-        BitvectorType bv = (BitvectorType)ty0;
-        eq = Bpl.Expr.Eq(e0, e1);
-        less = FunctionCall(tok, "lt_bv" + bv.Width, Bpl.Type.Bool, e0, e1);
-        atmost = FunctionCall(tok, "le_bv" + bv.Width, Bpl.Type.Bool, e0, e1);
-
-      } else if (ty0 is BigOrdinalType) {
-        eq = Bpl.Expr.Eq(e0, e1);
-        less = FunctionCall(tok, "ORD#Less", Bpl.Type.Bool, e0, e1);
-        atmost = BplOr(eq, less);
-
-      } else if (ty0.IsTypeParameter || ty0.IsAbstractType) {
-        eq = Bpl.Expr.Eq(e0, e1);
-        less = Bpl.Expr.False;
-        atmost = BplOr(less, eq);
-
-      } else {
-        // reference type
-        Contract.Assert(ty0.IsRefType);  // otherwise, unexpected type
-        var b0 = Bpl.Expr.Neq(e0, predef.Null);
-        var b1 = Bpl.Expr.Neq(e1, predef.Null);
-        eq = Bpl.Expr.Iff(b0, b1);
-        less = Bpl.Expr.And(Bpl.Expr.Not(b0), b1);
-        atmost = Bpl.Expr.Imp(b0, b1);
-      }
-    }
-
-    void AddComment(BoogieStmtListBuilder builder, Statement stmt, string comment) {
-      Contract.Requires(builder != null);
-      Contract.Requires(stmt != null);
-      Contract.Requires(comment != null);
-      builder.Add(new Bpl.CommentCmd(string.Format("----- {0} ----- {1}({2},{3})", comment, stmt.Tok.Filepath, stmt.Tok.line, stmt.Tok.col)));
-    }
-
-    /// <summary>
-    /// Therefore, these properties are applied to method in-parameters.
-    /// For now, this only allows you to case split on incoming data type values.
-    /// This used to add IsGood[Multi]Set_Extendend, but that is always
-    /// added for sets & multisets now in the prelude.
-    /// </summary>
-    Bpl.Expr GetExtendedWhereClause(IToken tok, Bpl.Expr x, Type type, ExpressionTranslator etran, IsAllocType alloc) {
-      Contract.Requires(tok != null);
-      Contract.Requires(x != null);
-      Contract.Requires(type != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-      var r = GetWhereClause(tok, x, type, etran, alloc);
-      type = type.NormalizeExpand();
-      if (type.IsDatatype) {
-        UserDefinedType udt = (UserDefinedType)type;
-        var oneOfTheCases = FunctionCall(tok, "$IsA#" + udt.ResolvedClass.FullSanitizedName, Bpl.Type.Bool, x);
-        return BplAnd(r, oneOfTheCases);
-      } else {
-        return r;
-      }
-    }
-
-    /// <summary>
-    /// Translates an AST Type to a Boogie expression of type Ty.
-    /// </summary>
-    Bpl.Expr TypeToTy(Type type) {
-      Contract.Requires(type != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-
-      type = type.NormalizeExpandKeepConstraints();
-
-      if (type.IsTypeParameter) {
-        var udt = (UserDefinedType)type;
-        return TrTypeParameter((TypeParameter)udt.ResolvedClass);
-      } else if (type.IsAbstractType) {
-        var udt = (UserDefinedType)type;
-        return TrAbstractType((AbstractTypeDecl)udt.ResolvedClass, udt.TypeArgs);
-      } else if (type is UserDefinedType) {
-        // Classes, (co-)datatypes, newtypes, subset types, ...
-        var args = type.TypeArgs.ConvertAll(TypeToTy);
-        return ClassTyCon(((UserDefinedType)type), args);
-      } else if (type is SetType) {
-        bool finite = ((SetType)type).Finite;
-        return FunctionCall(Token.NoToken, finite ? "TSet" : "TISet", predef.Ty, TypeToTy(((CollectionType)type).Arg));
-      } else if (type is MultiSetType) {
-        return FunctionCall(Token.NoToken, "TMultiSet", predef.Ty, TypeToTy(((CollectionType)type).Arg));
-      } else if (type is SeqType) {
-        return FunctionCall(Token.NoToken, "TSeq", predef.Ty, TypeToTy(((CollectionType)type).Arg));
-      } else if (type is MapType) {
-        bool finite = ((MapType)type).Finite;
-        return FunctionCall(Token.NoToken, finite ? "TMap" : "TIMap", predef.Ty,
-          TypeToTy(((MapType)type).Domain),
-          TypeToTy(((MapType)type).Range));
-      } else if (type is BoolType) {
-        return new Bpl.IdentifierExpr(Token.NoToken, "TBool", predef.Ty);
-      } else if (type is CharType) {
-        return new Bpl.IdentifierExpr(Token.NoToken, "TChar", predef.Ty);
-      } else if (type is RealType) {
-        return new Bpl.IdentifierExpr(Token.NoToken, "TReal", predef.Ty);
-      } else if (type is BitvectorType) {
-        var t = (BitvectorType)type;
-        return FunctionCall(Token.NoToken, "TBitvector", predef.Ty, Bpl.Expr.Literal(t.Width));
-      } else if (type is IntType) {
-        return new Bpl.IdentifierExpr(Token.NoToken, "TInt", predef.Ty);
-      } else if (type is BigOrdinalType) {
-        return new Bpl.IdentifierExpr(Token.NoToken, "TORDINAL", predef.Ty);
-      } else if (type is ParamTypeProxy) {
-        return TrTypeParameter(((ParamTypeProxy)type).orig);
-      } else {
-        Contract.Assert(false); throw new cce.UnreachableException();  // unexpected type
-      }
-    }
-
-    static string NameTypeParam(TypeParameter tp) {
-      if (tp.Parent != null) {
-        return tp.Parent.FullName + "$" + tp.Name;
-      } else {
-        // This happens for builtins, like arrays, that don't have a parent
-        return "#$" + tp.Name;
-      }
-    }
-
-    Bpl.Expr TrTypeParameter(TypeParameter tp) {
-      var nm = NameTypeParam(tp);
-      // return an identifier denoting a constant
-      return new Bpl.IdentifierExpr(tp.tok, nm, predef.Ty);
-    }
-
-    Bpl.Expr TrAbstractType(AbstractTypeDecl abstractType, List<Type> tyArguments) {
-      Contract.Requires(tyArguments != null);
-
-      var fn = GetOrCreateTypeConstructor(abstractType);
-      var args = tyArguments.ConvertAll(TypeToTy);
-      return FunctionCall(abstractType.tok, fn.Name, predef.Ty, args);
-    }
-
-    public List<TypeParameter> GetTypeParams(IMethodCodeContext cc) {
-      if (cc is Method) {
-        Method m = (Method)cc;
-        return Concat(GetTypeParams(m.EnclosingClass), m.TypeArgs);
-      } else if (cc is IteratorDecl) {
-        return cc.TypeArgs; // This one cannot be enclosed in a class
-      } else {
-        Contract.Assert(false);
-        return null;
-      }
-    }
-
-    static public List<TypeParameter> GetTypeParams(TopLevelDecl d) {
-      Contract.Requires(d is ClassLikeDecl || d is DatatypeDecl || d is NewtypeDecl || d is ValuetypeDecl);
-      return d.TypeArgs;
-    }
-
-    static List<TypeParameter> GetTypeParams(Function f) {
-      if (f.EnclosingClass == null) {
-        return f.TypeArgs;
-      } else {
-        return Concat(GetTypeParams(f.EnclosingClass), f.TypeArgs);
-      }
-    }
-
-    /// <summary>
-    /// Return $IsBox(x, t).
-    /// </summary>
-    Bpl.Expr MkIsBox(Bpl.Expr x, Type t) {
-      return MkIs(x, TypeToTy(t), true);
-    }
-
-    // Boxes, if necessary
-    Bpl.Expr MkIs(Bpl.Expr x, Type t) {
-      return MkIs(x, TypeToTy(t), ModeledAsBoxType(t));
-    }
-
-    Bpl.Expr MkIs(Bpl.Expr x, Bpl.Expr t, bool box = false) {
-      if (box) {
-        return FunctionCall(x.tok, BuiltinFunction.IsBox, null, x, t);
-      } else {
-        return FunctionCall(x.tok, BuiltinFunction.Is, null, x, t);
-      }
-    }
-
-    // Boxes, if necessary
-    Bpl.Expr MkIsAlloc(Bpl.Expr x, Type t, Bpl.Expr h) {
-      return MkIsAlloc(x, TypeToTy(t), h, ModeledAsBoxType(t));
-    }
-
-    Bpl.Expr MkIsAllocBox(Bpl.Expr x, Type t, Bpl.Expr h) {
-      return MkIsAlloc(x, TypeToTy(t), h, true);
-    }
-
-    Bpl.Expr MkIsAlloc(Bpl.Expr x, Bpl.Expr t, Bpl.Expr h, bool box = false) {
-      if (box) {
-        return FunctionCall(x.tok, BuiltinFunction.IsAllocBox, null, x, t, h);
-      } else {
-        return FunctionCall(x.tok, BuiltinFunction.IsAlloc, null, x, t, h);
-      }
-    }
-
-    /// <summary>
-    /// A "where" clause for a variable in Boogie turns into an assumption anytime that Boogie is tasked
-    /// with assigning an arbitrary value to that variable. This happens at the beginning of a procedure
-    /// implementation, after a procedure call, or as part of a "havoc" command. Each one of these can
-    /// easily be followed by a manual "assume" command. However, the use-case that makes "where" clauses
-    /// especially valuable is in loops, because when Boogie cuts the backedge, it inserts "havoc" commands.
-    /// To do this in Dafny, Dafny would have to compute loop targets, which is better done in Boogie (which
-    /// already has to do it).
-    /// </summary>
-    Bpl.Expr GetWhereClause(IToken tok, Bpl.Expr x, Type type, ExpressionTranslator etran, IsAllocType alloc,
-      bool allocatednessOnly = false, bool alwaysUseSymbolicName = false) {
-      Contract.Requires(tok != null);
-      Contract.Requires(x != null);
-      Contract.Requires(type != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-
-      if (type.NormalizeExpand() is TypeProxy) {
-        // Unresolved proxy
-        // Omit where clause (in other places, unresolved proxies are treated as a reference type; we could do that here too, but
-        // we might as well leave out the where clause altogether).
-        return null;
-      }
-
-      var normType = type.NormalizeExpandKeepConstraints();
-      Bpl.Expr isAlloc;
-      if (type.IsNumericBased() || type.IsBitVectorType || type.IsBoolType || type.IsCharType || type.IsBigOrdinalType) {
-        isAlloc = null;
-      } else if (alloc == ISALLOC && etran.HeapExpr != null) {
-        isAlloc = MkIsAlloc(x, normType, etran.HeapExpr);
-      } else {
-        isAlloc = null;
-      }
-      if (allocatednessOnly) {
-        return isAlloc;
-      }
-
-      Bpl.Expr isPred = null;
-      if (alwaysUseSymbolicName) {
-        // go for the symbolic name
-        isPred = MkIs(x, normType);
-      } else if (normType is BoolType || normType is IntType || normType is RealType || normType is BigOrdinalType) {
-        // nothing to do
-      } else if (normType is BitvectorType) {
-        var t = (BitvectorType)normType;
-        if (t.Width == 0) {
-          // type bv0 has only one value
-          return Bpl.Expr.Eq(BplBvLiteralExpr(tok, BaseTypes.BigNum.ZERO, t), x);
-        }
-      } else if ((normType.AsTypeSynonym != null || normType.AsNewtype != null) &&
-        (normType.IsNumericBased() || normType.IsBitVectorType || normType.IsBoolType)) {
-        var constraint = ModuleResolver.GetImpliedTypeConstraint(new BoogieWrapper(x, normType), normType);
-        isPred = etran.TrExpr(constraint);
-      } else {
-        // go for the symbolic name
-        isPred = MkIs(x, normType);
-      }
-      return isAlloc == null ? isPred : isPred == null ? isAlloc : BplAnd(isPred, isAlloc);
-    }
-
-    void ProcessRhss(List<AssignToLhs> lhsBuilder, List<Bpl.IdentifierExpr/*may be null*/> bLhss,
-      List<Expression> lhss, List<AssignmentRhs> rhss,
-      BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(lhsBuilder != null);
-      Contract.Requires(bLhss != null);
-      Contract.Requires(cce.NonNullElements(lhss));
-      Contract.Requires(cce.NonNullElements(rhss));
-      Contract.Requires(builder != null);
-      Contract.Requires(cce.NonNullElements(locals));
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-
-      var finalRhss = new List<Bpl.Expr>();
-      for (int i = 0; i < lhss.Count; i++) {
-        var lhs = lhss[i];
-        // the following assumes are part of the precondition, really
-        Contract.Assume(!(lhs is ConcreteSyntaxExpression));
-        Contract.Assume(!(lhs is SeqSelectExpr && !((SeqSelectExpr)lhs).SelectOne));  // array-range assignments are not allowed
-
-        Type lhsType, rhsTypeConstraint;
-        if (lhs is IdentifierExpr) {
-          var ide = (IdentifierExpr)lhs;
-          lhsType = ide.Var.Type;
-          rhsTypeConstraint = lhsType;
-        } else if (lhs is MemberSelectExpr) {
-          var fse = (MemberSelectExpr)lhs;
-          var field = (Field)fse.Member;
-          Contract.Assert(VisibleInScope(field));
-          lhsType = field.Type;
-          rhsTypeConstraint = lhsType.Subst(fse.TypeArgumentSubstitutionsWithParents());
-        } else if (lhs is SeqSelectExpr) {
-          var e = (SeqSelectExpr)lhs;
-          lhsType = null;  // for an array update, always make sure the value assigned is boxed
-          rhsTypeConstraint = e.Seq.Type.NormalizeExpand().TypeArgs[0];
-        } else {
-          var e = (MultiSelectExpr)lhs;
-          lhsType = null;  // for an array update, always make sure the value assigned is boxed
-          rhsTypeConstraint = e.Array.Type.NormalizeExpand().TypeArgs[0];
-        }
-        var bRhs = TrAssignmentRhs(rhss[i].Tok, bLhss[i], null, lhsType, rhss[i], rhsTypeConstraint, builder, locals, etran);
-        if (bLhss[i] != null) {
-          Contract.Assert(bRhs == bLhss[i]);  // this is what the postcondition of TrAssignmentRhs promises
-          // assignment has already been done by TrAssignmentRhs
-          finalRhss.Add(null);
-        } else {
-          Contract.Assert(bRhs != null);  // this is what the postcondition of TrAssignmentRhs promises
-          finalRhss.Add(bRhs);
-        }
-      }
-      for (int i = 0; i < lhss.Count; i++) {
-        lhsBuilder[i](finalRhss[i], rhss[i] is HavocRhs, builder, etran);
-      }
-    }
-
-    List<Bpl.Expr> ProcessUpdateAssignRhss(List<Expression> lhss, List<AssignmentRhs> rhss,
-      BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(cce.NonNullElements(lhss));
-      Contract.Requires(cce.NonNullElements(rhss));
-      Contract.Requires(builder != null);
-      Contract.Requires(cce.NonNullElements(locals));
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.ForAll(Contract.Result<List<Bpl.Expr>>(), i => i != null));
-
-      var finalRhss = new List<Bpl.Expr>();
-      for (int i = 0; i < lhss.Count; i++) {
-        var lhs = lhss[i];
-        // the following assumes are part of the precondition, really
-        Contract.Assume(!(lhs is ConcreteSyntaxExpression));
-        Contract.Assume(!(lhs is SeqSelectExpr && !((SeqSelectExpr)lhs).SelectOne));  // array-range assignments are not allowed
-
-        Type lhsType, rhsTypeConstraint;
-        if (lhs is IdentifierExpr) {
-          lhsType = ((IdentifierExpr)lhs).Var.Type;
-          rhsTypeConstraint = lhsType;
-        } else if (lhs is MemberSelectExpr) {
-          var fse = (MemberSelectExpr)lhs;
-          var field = (Field)fse.Member;
-          Contract.Assert(VisibleInScope(field));
-          lhsType = field.Type;
-          rhsTypeConstraint = lhsType.Subst(fse.TypeArgumentSubstitutionsWithParents());
-        } else if (lhs is SeqSelectExpr) {
-          var e = (SeqSelectExpr)lhs;
-          lhsType = null;  // for an array update, always make sure the value assigned is boxed
-          rhsTypeConstraint = e.Seq.Type.NormalizeExpand().TypeArgs[0];
-        } else {
-          var e = (MultiSelectExpr)lhs;
-          lhsType = null;  // for an array update, always make sure the value assigned is boxed
-          rhsTypeConstraint = e.Array.Type.NormalizeExpand().TypeArgs[0];
-        }
-        var bRhs = TrAssignmentRhs(rhss[i].Tok, null, (lhs as IdentifierExpr)?.Var, lhsType, rhss[i], rhsTypeConstraint, builder, locals, etran);
-        finalRhss.Add(bRhs);
-      }
-      return finalRhss;
-    }
-
-
-    private void CheckLhssDistinctness(List<Bpl.Expr> rhs, List<AssignmentRhs> rhsOriginal, List<Expression> lhss,
-      BoogieStmtListBuilder builder, ExpressionTranslator etran,
-      Bpl.Expr[] objs, Bpl.Expr[] fields, string[] names, Expression originalInitialLhs = null) {
-      Contract.Requires(rhs != null);
-      Contract.Requires(rhsOriginal != null);
-      Contract.Requires(lhss != null);
-      Contract.Requires(rhs.Count == rhsOriginal.Count);
-      Contract.Requires(lhss.Count == rhsOriginal.Count);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-
-      for (int i = 0; i < lhss.Count; i++) {
-        var lhs = lhss[i];
-        Contract.Assume(!(lhs is ConcreteSyntaxExpression));
-        if (originalInitialLhs != null) {
-          // TODO - check RHS values?
-          AssertDistinctness(lhs, originalInitialLhs, builder, etran);
-        }
-        for (int j = 0; j < i; j++) {
-          if (rhsOriginal[i] is HavocRhs || rhsOriginal[j] is HavocRhs) {
-            AssertDistinctness(lhs, lhss[j], builder, etran);
-          } else {
-            AssertDistinctness(lhs, lhss[j], rhs[i], rhs[j], builder, etran);
-          }
-        }
-      }
-    }
-
-    /// <summary>
-    /// Note, if "rhs" is "null", then the assignment has already been done elsewhere. However, any other bookkeeping
-    /// is still done.
-    /// </summary>
-    delegate void AssignToLhs(Bpl.Expr/*?*/ rhs, bool origRhsIsHavoc, BoogieStmtListBuilder builder, ExpressionTranslator etran);
-
-    // Returns an expression, which, if false, means that the two LHS expressions are
-    // not distinct; if null then the LHSs are trivially distinct
-    Bpl.Expr CheckDistinctness(Expression lhsa, Expression lhsb, ExpressionTranslator etran) {
-      {
-        if (lhsa is IdentifierExpr iea && lhsb is IdentifierExpr ieb) {
-          if (iea.Name != ieb.Name) {
-            return null;
-          }
-
-          return Bpl.Expr.False;
-        }
-      }
-      {
-        if (lhsa is MemberSelectExpr iea && lhsb is MemberSelectExpr ieb) {
-          if (iea.Member is Field fa && ieb.Member is Field fb) {
-            if (fa != fb) {
-              return null;
-            }
-
-            return Bpl.Expr.Neq(etran.TrExpr(iea.Obj), etran.TrExpr(ieb.Obj));
-          }
-        }
-      }
-      {
-        if (lhsa is SeqSelectExpr iea && lhsb is SeqSelectExpr ieb) {
-          Bpl.Expr ex = Bpl.Expr.Neq(etran.TrExpr(iea.Seq), etran.TrExpr(ieb.Seq));
-          if (iea.E1 == null && ieb.E1 == null) {
-            ex = Bpl.Expr.Or(ex, Bpl.Expr.Neq(etran.TrExpr(iea.E0), etran.TrExpr(ieb.E0)));
-          } else if (iea.E1 == null && ieb.E1 != null) {
-            ex = Bpl.Expr.Or(ex, Bpl.Expr.Le(etran.TrExpr(ieb.E1), etran.TrExpr(iea.E0)));
-            ex = Bpl.Expr.Or(ex, Bpl.Expr.Lt(etran.TrExpr(iea.E0), etran.TrExpr(ieb.E0)));
-          } else if (iea.E1 != null && ieb.E1 == null) {
-            ex = Bpl.Expr.Or(ex, Bpl.Expr.Le(etran.TrExpr(iea.E1), etran.TrExpr(ieb.E0)));
-            ex = Bpl.Expr.Or(ex, Bpl.Expr.Lt(etran.TrExpr(ieb.E0), etran.TrExpr(iea.E0)));
-          } else {
-            ex = Bpl.Expr.Or(ex, Bpl.Expr.Le(etran.TrExpr(iea.E1), etran.TrExpr(ieb.E0)));
-            ex = Bpl.Expr.Or(ex, Bpl.Expr.Le(etran.TrExpr(ieb.E1), etran.TrExpr(iea.E0)));
-          }
-          return ex;
-        }
-      }
-      {
-        if (lhsa is MultiSelectExpr iea && lhsb is MultiSelectExpr ieb && iea.Indices.Count == ieb.Indices.Count) {
-          Bpl.Expr ex = Bpl.Expr.Neq(etran.TrExpr(iea.Array), etran.TrExpr(ieb.Array));
-          for (int i = 0; i < iea.Indices.Count; i++) {
-            ex = Bpl.Expr.Or(ex, Bpl.Expr.Neq(etran.TrExpr(iea.Indices[i]), etran.TrExpr(ieb.Indices[i])));
-          }
-          return ex;
-        }
-      }
-
-      return null;
-    }
-
-    void AssertDistinctness(Expression lhsa, Expression lhsb, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Bpl.Expr e = CheckDistinctness(lhsa, lhsb, etran);
-      if (e != null) {
-        builder.Add(Assert(GetToken(lhsa), e, new PODesc.DistinctLHS(Printer.ExprToString(options, lhsa),
-          Printer.ExprToString(options, lhsb), e != Bpl.Expr.False, false)));
-      }
-    }
-
-    void AssertDistinctness(Expression lhsa, Expression lhsb, Bpl.Expr rhsa, Bpl.Expr rhsb, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Bpl.Expr e = CheckDistinctness(lhsa, lhsb, etran);
-      if (e != null) {
-        e = Bpl.Expr.Or(e, Bpl.Expr.Eq(rhsa, rhsb));
-        builder.Add(Assert(GetToken(lhsa), e, new PODesc.DistinctLHS(Printer.ExprToString(options, lhsa),
-          Printer.ExprToString(options, lhsb), false, true)));
-      }
-    }
-
-    /// <summary>
-    /// Creates a list of protected Boogie LHSs for the given Dafny LHSs.  Along the way,
-    /// builds code that checks that the LHSs are well-defined,
-    /// and are allowed by the enclosing modifies clause.
-    /// Checks that they denote different locations iff checkDistinctness is true.
-    /// </summary>
-    void ProcessLhss(List<Expression> lhss, bool rhsCanAffectPreviouslyKnownExpressions, bool checkDistinctness,
-      BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran,
-      out List<AssignToLhs> lhsBuilders, out List<Bpl.IdentifierExpr/*may be null*/> bLhss,
-      out Bpl.Expr[] prevObj, out Bpl.Expr[] prevIndex, out string[] prevNames, Expression originalInitialLhs = null) {
-
-      Contract.Requires(cce.NonNullElements(lhss));
-      Contract.Requires(builder != null);
-      Contract.Requires(cce.NonNullElements(locals));
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.ValueAtReturn(out lhsBuilders).Count == lhss.Count);
-      Contract.Ensures(Contract.ValueAtReturn(out lhsBuilders).Count == Contract.ValueAtReturn(out bLhss).Count);
-
-      rhsCanAffectPreviouslyKnownExpressions = rhsCanAffectPreviouslyKnownExpressions || lhss.Count != 1;
-
-      // for each Dafny LHS, build a protected Boogie LHS for the eventual assignment
-      lhsBuilders = new List<AssignToLhs>();
-      bLhss = new List<Bpl.IdentifierExpr>();
-      prevObj = new Bpl.Expr[lhss.Count];
-      prevIndex = new Bpl.Expr[lhss.Count];
-      prevNames = new string[lhss.Count];
-      int i = 0;
-
-      var lhsNameSet = new Dictionary<string, object>();
-
-      // Note, the resolver does not check for duplicate IdentifierExpr's in LHSs, so do it here.
-      foreach (var lhs in lhss) {
-        Contract.Assume(!(lhs is ConcreteSyntaxExpression));
-        if (checkDistinctness) {
-          if (originalInitialLhs != null) {
-            AssertDistinctness(lhs, originalInitialLhs.Resolved, builder, etran);
-          }
-          for (int j = 0; j < i; j++) {
-            AssertDistinctness(lhs, lhss[j], builder, etran);
-          }
-        }
-        i++;
-      }
-
-      i = 0;
-      foreach (var lhs in lhss) {
-        IToken tok = lhs.tok;
-        TrStmt_CheckWellformed(lhs, builder, locals, etran, true, true);
-
-        if (lhs is IdentifierExpr) {
-          var ie = (IdentifierExpr)lhs;
-          prevNames[i] = ie.Name;
-          var bLhs = (Bpl.IdentifierExpr)etran.TrExpr(lhs);  // TODO: is this cast always justified?
-          bLhss.Add(rhsCanAffectPreviouslyKnownExpressions ? null : bLhs);
-          lhsBuilders.Add(delegate (Bpl.Expr rhs, bool origRhsIsHavoc, BoogieStmtListBuilder bldr, ExpressionTranslator et) {
-            if (rhs != null) {
-              bldr.Add(Bpl.Cmd.SimpleAssign(tok, bLhs, rhs));
-            }
-
-            if (!origRhsIsHavoc || ie.Type.IsNonempty) {
-              MarkDefiniteAssignmentTracker(ie, bldr);
-            }
-          });
-
-        } else if (lhs is MemberSelectExpr) {
-          var fse = (MemberSelectExpr)lhs;
-          var field = fse.Member as Field;
-          Contract.Assert(field != null);
-          Contract.Assert(VisibleInScope(field));
-
-          var useSurrogateLocal = inBodyInitContext && Expression.AsThis(fse.Obj) != null;
-
-          var obj = SaveInTemp(etran.TrExpr(fse.Obj), rhsCanAffectPreviouslyKnownExpressions,
-            "$obj" + i, predef.RefType, builder, locals);
-          prevObj[i] = obj;
-          if (!useSurrogateLocal) {
-            // check that the enclosing modifies clause allows this object to be written:  assert $_Frame[obj]);
-            builder.Add(Assert(tok, Bpl.Expr.SelectTok(tok, etran.TheFrame(tok), obj, GetField(fse)), new PODesc.Modifiable("an object")));
-          }
-
-          if (useSurrogateLocal) {
-            var nm = SurrogateName(field);
-            var bLhs = new Bpl.IdentifierExpr(fse.tok, nm, TrType(field.Type));
-            bLhss.Add(rhsCanAffectPreviouslyKnownExpressions ? null : bLhs);
-            lhsBuilders.Add(delegate (Bpl.Expr rhs, bool origRhsIsHavoc, BoogieStmtListBuilder bldr, ExpressionTranslator et) {
-              if (rhs != null) {
-                bldr.Add(Bpl.Cmd.SimpleAssign(tok, bLhs, rhs));
-              }
-
-              if (!origRhsIsHavoc || field.Type.IsNonempty) {
-                MarkDefiniteAssignmentTracker(lhs.tok, nm, bldr);
-              }
-            });
-          } else {
-            bLhss.Add(null);
-            lhsBuilders.Add(delegate (Bpl.Expr rhs, bool origRhsIsHavoc, BoogieStmtListBuilder bldr, ExpressionTranslator et) {
-              if (rhs != null) {
-                var fseField = fse.Member as Field;
-                Contract.Assert(fseField != null);
-                Check_NewRestrictions(tok, obj, fseField, rhs, bldr, et);
-                var h = (Bpl.IdentifierExpr)et.HeapExpr;  // TODO: is this cast always justified?
-                Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(tok, h, UpdateHeap(tok, h, obj, new Bpl.IdentifierExpr(tok, GetField(fseField)), rhs));
-                bldr.Add(cmd);
-                // assume $IsGoodHeap($Heap);
-                bldr.Add(AssumeGoodHeap(tok, et));
-              }
-            });
-          }
-
-        } else if (lhs is SeqSelectExpr) {
-          SeqSelectExpr sel = (SeqSelectExpr)lhs;
-          Contract.Assert(sel.SelectOne);  // array-range assignments are not allowed
-          Contract.Assert(sel.Seq.Type != null && sel.Seq.Type.IsArrayType);
-          Contract.Assert(sel.E0 != null);
-          var obj = SaveInTemp(etran.TrExpr(sel.Seq), rhsCanAffectPreviouslyKnownExpressions,
-            "$obj" + i, predef.RefType, builder, locals);
-          var idx = etran.TrExpr(sel.E0);
-          idx = ConvertExpression(sel.E0.tok, idx, sel.E0.Type, Type.Int);
-          var fieldName = SaveInTemp(FunctionCall(tok, BuiltinFunction.IndexField, null, idx), rhsCanAffectPreviouslyKnownExpressions,
-            "$index" + i, predef.FieldName(tok, predef.BoxType), builder, locals);
-          prevObj[i] = obj;
-          prevIndex[i] = fieldName;
-          // check that the enclosing modifies clause allows this object to be written:  assert $_Frame[obj,index]);
-          builder.Add(Assert(tok, Bpl.Expr.SelectTok(tok, etran.TheFrame(tok), obj, fieldName), new PODesc.Modifiable("an array element")));
-
-          bLhss.Add(null);
-          lhsBuilders.Add(delegate (Bpl.Expr rhs, bool origRhsIsHavoc, BoogieStmtListBuilder bldr, ExpressionTranslator et) {
-            if (rhs != null) {
-              var h = (Bpl.IdentifierExpr)et.HeapExpr;  // TODO: is this cast always justified?
-              Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(tok, h, UpdateHeap(tok, h, obj, fieldName, rhs));
-              bldr.Add(cmd);
-              // assume $IsGoodHeap($Heap);
-              bldr.Add(AssumeGoodHeap(tok, et));
-            }
-          });
-
-        } else {
-          MultiSelectExpr mse = (MultiSelectExpr)lhs;
-          Contract.Assert(mse.Array.Type != null && mse.Array.Type.IsArrayType);
-
-          var obj = SaveInTemp(etran.TrExpr(mse.Array), rhsCanAffectPreviouslyKnownExpressions,
-            "$obj" + i, predef.RefType, builder, locals);
-          var fieldName = SaveInTemp(etran.GetArrayIndexFieldName(mse.tok, mse.Indices), rhsCanAffectPreviouslyKnownExpressions,
-            "$index" + i, predef.FieldName(mse.tok, predef.BoxType), builder, locals);
-          prevObj[i] = obj;
-          prevIndex[i] = fieldName;
-          builder.Add(Assert(tok, Bpl.Expr.SelectTok(tok, etran.TheFrame(tok), obj, fieldName), new PODesc.Modifiable("an array element")));
-
-          bLhss.Add(null);
-          lhsBuilders.Add(delegate (Bpl.Expr rhs, bool origRhsIsHavoc, BoogieStmtListBuilder bldr, ExpressionTranslator et) {
-            if (rhs != null) {
-              var h = (Bpl.IdentifierExpr)et.HeapExpr;  // TODO: is this cast always justified?
-              Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(tok, h, UpdateHeap(tok, h, obj, fieldName, rhs));
-              bldr.Add(cmd);
-              // assume $IsGoodHeap($Heap);
-              bldr.Add(AssumeGoodHeap(tok, etran));
-            }
-          });
-        }
-
-        i++;
-      }
-    }
-
-    /// <summary>
-    /// if "bGivenLhs" is non-null, generates an assignment of the translation of "rhs" to "bGivenLhs" and then returns "bGivenLhs".
-    /// If "bGivenLhs" is null, then this method will return an expression that in a stable way denotes the translation of "rhs";
-    /// this is achieved by creating a new temporary Boogie variable to hold the result and returning an expression that mentions
-    /// that new temporary variable.
-    ///
-    /// Before the assignment, the generated code will check that "rhs" obeys any subrange requirements entailed by "rhsTypeConstraint".
-    ///
-    /// The purpose of "lhsVar" is to determine an appropriate Boogie "where" clause for any temporary variable generated.
-    /// If passed in as non-null, it says that "lhsVar" is the LHS of the assignment being translated. If the type is subject to
-    /// definite-assignment rules and the RHS is "*", then the "where" clause of the temporary variable will have the form
-    /// "defass#lhs ==> wh" where "defass#lhs" is the definite-assignment tracker for "lhsVar" and "wh" is the "where"
-    /// clause for type "lhsType" for the temporary variable.
-    ///
-    /// The purpose of "lhsType" is to determine if the expression should be boxed before doing the assignment.  It is allowed to be null,
-    /// which indicates that the result should always be a box.  Note that "lhsType" may refer to a formal type parameter that is not in
-    /// scope; this is okay, since the purpose of "lhsType" is just to say whether or not the result should be boxed.
-    /// </summary>
-    Bpl.Expr TrAssignmentRhs(IToken tok, Bpl.IdentifierExpr bGivenLhs, IVariable lhsVar, Type lhsType,
-                             AssignmentRhs rhs, Type rhsTypeConstraint,
-                             BoogieStmtListBuilder builder, List<Variable> locals, ExpressionTranslator etran) {
-      Contract.Requires(tok != null);
-      Contract.Requires(rhs != null);
-      Contract.Requires(rhsTypeConstraint != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(locals != null);
-      Contract.Requires(etran != null);
-      Contract.Requires(predef != null);
-      Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-      Contract.Ensures(bGivenLhs == null || Contract.Result<Bpl.Expr>() == bGivenLhs);
-
-      Bpl.IdentifierExpr bLhs;
-      if (bGivenLhs != null) {
-        bLhs = bGivenLhs;
-      } else {
-        Type localType = rhsTypeConstraint;  // this is a type that is appropriate for capturing the value of the RHS
-        var ty = TrType(localType);
-        var nm = CurrentIdGenerator.FreshId("$rhs#");
-        Bpl.Expr wh;
-        if (rhs is HavocRhs && localType.IsNonempty) {
-          wh = GetWhereClause(tok, new Bpl.IdentifierExpr(tok, nm, ty), localType, etran, NOALLOC);
-        } else if (rhs is HavocRhs && lhsVar != null && GetDefiniteAssignmentTracker(lhsVar) != null) {
-          // This "where" clause expresses that the new variable has a value of the given type only if
-          // the variable has already been definitely assigned. (If it has not already been assigned,
-          // then the variable will get a new value, but Dafny's definite-assginment rules prevent that
-          // value from being used, so it's appropriate to use effectively-"true" as the "where" clause
-          // in that case.
-          wh = BplImp(GetDefiniteAssignmentTracker(lhsVar),
-            GetWhereClause(tok, new Bpl.IdentifierExpr(tok, nm, ty), localType, etran, NOALLOC));
-        } else {
-          // In this case, it could be unsound to use a "where" clause, see issue #1619.
-          // Luckily, leaving it out is harmless, because we don't need a "where" clause here in the first
-          // place--because the variable is short lived, we know it will not be havoc'ed by Boogie, so a
-          // "where" wouldn't provide additional information over the assigned value.
-          wh = null;
-        }
-        var v = new Bpl.LocalVariable(tok, new Bpl.TypedIdent(tok, nm, ty, wh));
-        locals.Add(v);
-        bLhs = new Bpl.IdentifierExpr(tok, v);
-      }
-
-      if (rhs is ExprRhs) {
-        var e = (ExprRhs)rhs;
-
-        TrStmt_CheckWellformed(e.Expr, builder, locals, etran, true);
-
-        Bpl.Expr bRhs = etran.TrExpr(e.Expr);
-        CheckSubrange(tok, bRhs, e.Expr.Type, rhsTypeConstraint, builder);
-        if (bGivenLhs != null) {
-          Contract.Assert(bGivenLhs == bLhs);
-          // box the RHS, then do the assignment
-          var cmd = Bpl.Cmd.SimpleAssign(tok, bGivenLhs, CondApplyBox(tok, bRhs, e.Expr.Type, lhsType));
-          builder.Add(cmd);
-          return bGivenLhs;
-        } else {
-          // box from RHS type to tmp-var type, then do the assignment; then return LHS, boxed from tmp-var type to result type
-          var cmd = Bpl.Cmd.SimpleAssign(tok, bLhs, CondApplyBox(tok, bRhs, e.Expr.Type, rhsTypeConstraint));
-          builder.Add(cmd);
-          return CondApplyBox(tok, bLhs, rhsTypeConstraint, lhsType);
-        }
-
-      } else if (rhs is HavocRhs) {
-        builder.Add(new Bpl.HavocCmd(tok, new List<Bpl.IdentifierExpr> { bLhs }));
-        return CondApplyBox(tok, bLhs, rhsTypeConstraint, lhsType);
-      } else {
-        // x := new Something
-        Contract.Assert(rhs is TypeRhs);  // otherwise, an unexpected AssignmentRhs
-        TypeRhs tRhs = (TypeRhs)rhs;
-
-        var callsConstructor = tRhs.InitCall != null && tRhs.InitCall.Method is Constructor;
-
-        if (tRhs.ArrayDimensions == null) {
-          Contract.Assert(tRhs.ElementInit == null && tRhs.InitDisplay == null);
-        } else {
-          int i = 0;
-          foreach (Expression dim in tRhs.ArrayDimensions) {
-            CheckWellformed(dim, new WFOptions(), locals, builder, etran);
-            var desc = new PODesc.NonNegative(tRhs.ArrayDimensions.Count == 1
-              ? "array size" : $"array size (dimension {i})");
-            builder.Add(Assert(GetToken(dim), Bpl.Expr.Le(Bpl.Expr.Literal(0), etran.TrExpr(dim)), desc));
-            i++;
-          }
-          if (tRhs.ElementInit != null) {
-            CheckWellformed(tRhs.ElementInit, new WFOptions(), locals, builder, etran);
-          } else if (tRhs.InitDisplay != null) {
-            var dim = tRhs.ArrayDimensions[0];
-            var desc = new PODesc.ArrayInitSizeValid(tRhs.InitDisplay.Count);
-            builder.Add(Assert(GetToken(dim), Bpl.Expr.Eq(etran.TrExpr(dim), Bpl.Expr.Literal(tRhs.InitDisplay.Count)), desc));
-            foreach (var v in tRhs.InitDisplay) {
-              CheckWellformed(v, new WFOptions(), locals, builder, etran);
-            }
-          } else if (options.DefiniteAssignmentLevel == 0) {
-            // cool
-          } else if ((2 <= options.DefiniteAssignmentLevel && options.DefiniteAssignmentLevel != 4) ||
-                     options.Get(CommonOptionBag.EnforceDeterminism) ||
-                     !tRhs.EType.HasCompilableValue) {
-            // this is allowed only if the array size is such that it has no elements
-            Bpl.Expr zeroSize = Bpl.Expr.False;
-            foreach (Expression dim in tRhs.ArrayDimensions) {
-              zeroSize = BplOr(zeroSize, Bpl.Expr.Eq(Bpl.Expr.Literal(0), etran.TrExpr(dim)));
-            }
-            var desc = new PODesc.ArrayInitEmpty(tRhs.EType.ToString());
-            builder.Add(Assert(tRhs.Tok, zeroSize, desc));
-          }
-        }
-
-        Bpl.IdentifierExpr nw = GetNewVar_IdExpr(tok, locals);
-        if (!callsConstructor) {
-          SelectAllocateObject(tok, nw, tRhs.Type, true, builder, etran);
-          if (tRhs.ArrayDimensions != null) {
-            int i = 0;
-            foreach (Expression dim in tRhs.ArrayDimensions) {
-              // assume Array#Length($nw, i) == arraySize;
-              Bpl.Expr arrayLength = ArrayLength(tok, nw, tRhs.ArrayDimensions.Count, i);
-              builder.Add(TrAssumeCmd(tok, Bpl.Expr.Eq(arrayLength, etran.TrExpr(dim))));
-              i++;
-            }
-            if (tRhs.ElementInit != null) {
-              CheckElementInit(tok, true, tRhs.ArrayDimensions, tRhs.EType, tRhs.ElementInit, nw, builder, etran, new WFOptions());
-            } else if (tRhs.InitDisplay != null) {
-              int ii = 0;
-              foreach (var v in tRhs.InitDisplay) {
-                var EE_ii = etran.TrExpr(v);
-                // assert EE_ii satisfies any subset-type constraints;
-                CheckSubrange(v.tok, EE_ii, v.Type, tRhs.EType, builder);
-                // assume nw[ii] == EE_ii;
-                var ai = ReadHeap(tok, etran.HeapExpr, nw, GetArrayIndexFieldName(tok, new List<Bpl.Expr> { Bpl.Expr.Literal(ii) }));
-                builder.Add(new Bpl.AssumeCmd(tok, Bpl.Expr.Eq(UnboxIfBoxed(ai, tRhs.EType), EE_ii)));
-                ii++;
-              }
-            }
-          }
-          Bpl.Cmd heapAllocationRecorder = null;
-          if (codeContext is IteratorDecl) {
-            var iter = (IteratorDecl)codeContext;
-            // $Heap[this, _new] := Set#UnionOne<BoxType>($Heap[this, _new], $Box($nw));
-            var th = new Bpl.IdentifierExpr(tok, etran.This, predef.RefType);
-            var nwField = new Bpl.IdentifierExpr(tok, GetField(iter.Member_New));
-            var thisDotNew = ReadHeap(tok, etran.HeapExpr, th, nwField);
-            var unionOne = FunctionCall(tok, BuiltinFunction.SetUnionOne, predef.BoxType, thisDotNew, FunctionCall(tok, BuiltinFunction.Box, null, nw));
-            var heapRhs = UpdateHeap(tok, etran.HeapExpr, th, nwField, unionOne);
-            heapAllocationRecorder = Bpl.Cmd.SimpleAssign(tok, etran.HeapCastToIdentifierExpr, heapRhs);
-          }
-          CommitAllocatedObject(tok, nw, heapAllocationRecorder, builder, etran);
-        }
-        if (tRhs.InitCall != null) {
-          AddComment(builder, tRhs.InitCall, "init call statement");
-          TrCallStmt(tRhs.InitCall, builder, locals, etran, nw);
-        }
-        // bLhs := $nw;
-        CheckSubrange(tok, nw, tRhs.Type, rhsTypeConstraint, builder);
-        if (bGivenLhs != null) {
-          Contract.Assert(bGivenLhs == bLhs);
-          // box the RHS, then do the assignment
-          builder.Add(Bpl.Cmd.SimpleAssign(tok, bGivenLhs, CondApplyBox(tok, nw, tRhs.Type, lhsType)));
-          return bGivenLhs;
-        } else {
-          // do the assignment, then box the result
-          builder.Add(Bpl.Cmd.SimpleAssign(tok, bLhs, nw));
-          return CondApplyBox(tok, bLhs, tRhs.Type, lhsType);
-        }
-      }
-    }
-
-    /// <summary>
-    /// Check that all indices are in the domain of the given function.  That is, for an array ("forArray"):
-    ///     assert (forall i0,i1,i2,... :: 0 <= i0 < dims[0] && ... ==> init.requires(i0,i1,i2,...));
-    /// and for a sequence ("!forArray"):
-    ///     assert (forall i0 :: 0 <= i0 < dims[0] && ... ==> init.requires(i0));
-    /// </summary>
-    private void CheckElementInit(IToken tok, bool forArray, List<Expression> dims, Type elementType, Expression init,
-      Bpl.IdentifierExpr/*?*/ nw, BoogieStmtListBuilder builder, ExpressionTranslator etran, WFOptions options) {
-      Contract.Requires(tok != null);
-      Contract.Requires(dims != null && dims.Count != 0);
-      Contract.Requires(elementType != null);
-      Contract.Requires(init != null);
-      Contract.Requires(!forArray || nw != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-
-      Bpl.Expr ante = Bpl.Expr.True;
-      var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator(forArray ? "arrayinit#" : "seqinit#");
-      var bvs = new List<Bpl.Variable>();
-      var indices = new List<Bpl.Expr>();
-      for (var i = 0; i < dims.Count; i++) {
-        var nm = varNameGen.FreshId(string.Format("#i{0}#", i));
-        var bv = new Bpl.BoundVariable(tok, new Bpl.TypedIdent(tok, nm, Bpl.Type.Int));
-        bvs.Add(bv);
-        var ie = new Bpl.IdentifierExpr(tok, bv);
-        indices.Add(ie);
-        ante = BplAnd(ante, BplAnd(Bpl.Expr.Le(Bpl.Expr.Literal(0), ie), Bpl.Expr.Lt(ie, etran.TrExpr(dims[i]))));
-      }
-
-      var sourceType = init.Type.AsArrowType;
-      Contract.Assert(sourceType.Args.Count == dims.Count);
-      var args = Concat(
-        Map(Enumerable.Range(0, dims.Count), ii => TypeToTy(sourceType.Args[ii])),
-        Cons(TypeToTy(sourceType.Result),
-          Cons(etran.HeapExpr,
-            Cons(etran.TrExpr(init),
-              indices.ConvertAll(idx => (Bpl.Expr)FunctionCall(tok, BuiltinFunction.Box, null, idx))))));
-      // check precond
-      var pre = FunctionCall(tok, Requires(dims.Count), Bpl.Type.Bool, args);
-      var q = new Bpl.ForallExpr(tok, bvs, Bpl.Expr.Imp(ante, pre));
-      var desc = new PODesc.IndicesInDomain(forArray ? "array" : "sequence");
-      builder.Add(AssertNS(tok, q, desc));
-      if (!forArray && options.DoReadsChecks) {
-        // check read effects
-        Type objset = new SetType(true, program.SystemModuleManager.ObjectQ());
-        Expression wrap = new BoogieWrapper(
-          FunctionCall(tok, Reads(1), TrType(objset), args),
-          objset);
-        var reads = new FrameExpression(tok, wrap, null);
-        Action<IToken, Bpl.Expr, PODesc.ProofObligationDescription, Bpl.QKeyValue> maker = (t, e, d, qk) => {
-          var qe = new Bpl.ForallExpr(t, bvs, Bpl.Expr.Imp(ante, e));
-          options.AssertSink(this, builder)(t, qe, d, qk);
-        };
-        CheckFrameSubset(tok, new List<FrameExpression> { reads }, null, null,
-          etran, maker,
-          new PODesc.FrameSubset("invoke the function passed as an argument to the sequence constructor", false),
-          options.AssertKv);
-      }
-      // Check that the values coming out of the function satisfy any appropriate subset-type constraints
-      var apply = UnboxIfBoxed(FunctionCall(tok, Apply(dims.Count), TrType(elementType), args), elementType);
-      var cre = GetSubrangeCheck(apply, sourceType.Result, elementType, out var subrangeDesc);
-      if (cre != null) {
-        // assert (forall i0,i1,i2,... ::
-        //            0 <= i0 < ... && ... ==> init.requires(i0,i1,i2,...) is Subtype);
-        q = new Bpl.ForallExpr(tok, bvs, Bpl.Expr.Imp(ante, cre));
-        builder.Add(AssertNS(init.tok, q, subrangeDesc));
-      }
-
-      if (forArray) {
-        // Assume that array elements have initial values according to the given initialization function.  That is:
-        // assume (forall i0,i1,i2,... :: { nw[i0,i1,i2,...] }
-        //            0 <= i0 < ... && ... ==> nw[i0,i1,i2,...] == init.requires(i0,i1,i2,...));
-        var ai = ReadHeap(tok, etran.HeapExpr, nw, GetArrayIndexFieldName(tok, indices));
-        var ai_prime = UnboxIfBoxed(ai, elementType);
-        var tr = new Bpl.Trigger(tok, true, new List<Bpl.Expr> { ai });
-        q = new Bpl.ForallExpr(tok, bvs, tr,
-          Bpl.Expr.Imp(ante, Bpl.Expr.Eq(ai_prime, apply))); // TODO: use a more general Equality translation
-        builder.Add(new Bpl.AssumeCmd(tok, q));
-      }
-    }
-
-    private void SelectAllocateObject(IToken tok, Bpl.IdentifierExpr nw, Type type, bool includeHavoc, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Contract.Requires(tok != null);
-      Contract.Requires(nw != null);
-      Contract.Requires(type != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      var udt = type as UserDefinedType;
-      if (udt != null && udt.ResolvedClass is NonNullTypeDecl) {
-        var nnt = (NonNullTypeDecl)udt.ResolvedClass;
-        type = nnt.RhsWithArgument(type.TypeArgs);
-      }
-      if (includeHavoc) {
-        // havoc $nw;
-        builder.Add(new Bpl.HavocCmd(tok, new List<Bpl.IdentifierExpr> { nw }));
-        // assume $nw != null && $Is($nw, type);
-        var nwNotNull = Bpl.Expr.Neq(nw, predef.Null);
-        // drop the $Is conjunct if the type is "object", because "new object" allocates an object of an arbitrary type
-        var rightType = type.IsObjectQ ? Bpl.Expr.True : MkIs(nw, type);
-        builder.Add(TrAssumeCmd(tok, Bpl.Expr.And(nwNotNull, rightType)));
-      }
-      // assume !$Heap[$nw, alloc];
-      var notAlloc = Bpl.Expr.Not(etran.IsAlloced(tok, nw));
-      builder.Add(TrAssumeCmd(tok, notAlloc));
-    }
-
-    private void CommitAllocatedObject(IToken tok, Bpl.IdentifierExpr nw, Bpl.Cmd extraCmd, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Contract.Requires(tok != null);
-      Contract.Requires(nw != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-
-      // $Heap[$nw, alloc] := true;
-      Bpl.Expr alloc = predef.Alloc(tok);
-      Bpl.IdentifierExpr heap = etran.HeapCastToIdentifierExpr;
-      Bpl.Cmd cmd = Bpl.Cmd.SimpleAssign(tok, heap, UpdateHeap(tok, heap, nw, alloc, Bpl.Expr.True));
-      builder.Add(cmd);
-      if (extraCmd != null) {
-        builder.Add(extraCmd);
-      }
-      // assume $IsGoodHeap($Heap);
-      builder.Add(AssumeGoodHeap(tok, etran));
-      // assume $IsHeapAnchor($Heap);
-      builder.Add(new Bpl.AssumeCmd(tok, FunctionCall(tok, BuiltinFunction.IsHeapAnchor, null, etran.HeapExpr)));
-    }
-
-    /// <summary>
-    /// Returns the name of the local variable used as a stand-in for a field in the BodyInit part of a divided
-    /// constructor body.
-    /// </summary>
-    string SurrogateName(Field field) {
-      Contract.Requires(field != null);
-      return "this." + field.Name;
-    }
-
-    Bpl.Expr GetSubrangeCheck(Bpl.Expr bSource, Type sourceType, Type targetType, out PODesc.ProofObligationDescription desc, string errorMessagePrefix = "") {
-      Contract.Requires(bSource != null);
-      Contract.Requires(sourceType != null);
-      Contract.Requires(targetType != null);
-
-      if (Type.IsSupertype(targetType, sourceType) && !(sourceType.IsRefType && !sourceType.IsNonNullRefType && !targetType.IsRefType)) {
-        // We should always be able to use Is, but this is an optimisation.
-        desc = null;
-        return null;
-      }
-      targetType = targetType.NormalizeExpandKeepConstraints();
-      var udt = targetType as UserDefinedType;
-      Bpl.Expr cre;
-      if (udt?.ResolvedClass is RedirectingTypeDecl redirectingTypeDecl &&
-          ModeledAsBoxType((redirectingTypeDecl as NewtypeDecl)?.BaseType ?? redirectingTypeDecl.Var.Type)) {
-        cre = MkIs(BoxIfNecessary(bSource.tok, bSource, sourceType), TypeToTy(targetType), true);
-      } else if (ModeledAsBoxType(sourceType)) {
-        cre = MkIs(bSource, TypeToTy(targetType), true);
-      } else if (targetType is UserDefinedType targetUdt) {
-        cre = MkIs(BoxifyForTraitParent(bSource.tok, bSource, udt.ResolvedClass, sourceType), targetType);
-      } else {
-        cre = MkIs(bSource, targetType);
-      }
-      if (udt != null && udt.IsRefType) {
-        var s = sourceType.NormalizeExpandKeepConstraints();
-        var certain = false;
-        string cause = null;
-        if (s is UserDefinedType sudt && udt.ResolvedClass is NonNullTypeDecl nntd && nntd.Class == sudt.ResolvedClass) {
-          certain = udt.ResolvedClass.TypeArgs.Count == 0;
-          cause = "it may be null";
-        }
-        desc = new PODesc.SubrangeCheck(errorMessagePrefix, sourceType.ToString(), targetType.ToString(), false, certain, cause);
-      } else if (udt != null && ArrowType.IsTotalArrowTypeName(udt.Name)) {
-        desc = new PODesc.SubrangeCheck(errorMessagePrefix, sourceType.ToString(), targetType.ToString(), true, false,
-          "it may be partial or have read effects");
-      } else if (udt != null && ArrowType.IsPartialArrowTypeName(udt.Name)) {
-        desc = new PODesc.SubrangeCheck(errorMessagePrefix, sourceType.ToString(), targetType.ToString(), true, false,
-          "it may have read effects");
-      } else {
-        desc = new PODesc.SubrangeCheck(errorMessagePrefix, sourceType.ToString(), targetType.ToString(),
-          targetType.NormalizeExpandKeepConstraints() is UserDefinedType
-          {
-            ResolvedClass: SubsetTypeDecl or NewtypeDecl { Var: { } }
-          },
-          false, null);
-      }
-      return cre;
-    }
-
-    void CheckSubrange(IToken tok, Bpl.Expr bSource, Type sourceType, Type targetType, BoogieStmtListBuilder builder, string errorMsgPrefix = "") {
-      Contract.Requires(tok != null);
-      Contract.Requires(bSource != null);
-      Contract.Requires(sourceType != null);
-      Contract.Requires(targetType != null);
-      Contract.Requires(builder != null);
-
-      var cre = GetSubrangeCheck(bSource, sourceType, targetType, out var desc, errorMsgPrefix);
-      if (cre != null) {
-        builder.Add(Assert(tok, cre, desc));
-      }
-    }
-
-    void Check_NewRestrictions(IToken tok, Bpl.Expr obj, Field f, Bpl.Expr rhs, BoogieStmtListBuilder builder, ExpressionTranslator etran) {
-      Contract.Requires(tok != null);
-      Contract.Requires(obj != null);
-      Contract.Requires(f != null);
-      Contract.Requires(rhs != null);
-      Contract.Requires(builder != null);
-      Contract.Requires(etran != null);
-      var iter = f.EnclosingClass as IteratorDecl;
-      if (iter != null && f == iter.Member_New) {
-        // Assignments to an iterator _new field is only allowed to shrink the set, so:
-        // assert Set#Subset(rhs, obj._new);
-        var fId = new Bpl.IdentifierExpr(tok, GetField(f));
-        var subset = FunctionCall(tok, BuiltinFunction.SetSubset, null, rhs, ReadHeap(tok, etran.HeapExpr, obj, fId, TrType(f.Type)));
-        builder.Add(Assert(tok, subset, new PODesc.AssignmentShrinks(f.Name)));
-      }
-    }
-
-    Bpl.AssumeCmd AssumeGoodHeap(IToken tok, ExpressionTranslator etran) {
-      Contract.Requires(tok != null);
-      Contract.Requires(etran != null);
-      Contract.Ensures(Contract.Result<AssumeCmd>() != null);
-
-      return TrAssumeCmd(tok, FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, etran.HeapExpr));
-    }
-
-    /// <summary>
-    /// Idempotently fills in "mc.ProjectionFunctions"
-    /// </summary>
-    void CreateMapComprehensionProjectionFunctions(MapComprehension mc) {
-      Contract.Requires(mc != null && mc.TermLeft != null);
-      if (mc.ProjectionFunctions == null) {
-        var varNameGen = CurrentIdGenerator.NestedFreshIdGenerator(string.Format("map$project${0}#", projectionFunctionCount));
-        projectionFunctionCount++;
-        mc.ProjectionFunctions = new List<Bpl.Function>();
-        foreach (var bv in mc.BoundVars) {
-          var arg = BplFormalVar(null, TrType(mc.TermLeft.Type), false);
-          var res = BplFormalVar(null, TrType(bv.Type), true);
-          var projectFn = new Bpl.Function(mc.tok, varNameGen.FreshId(string.Format("#{0}#", bv.Name)), new List<Variable>() { arg }, res);
-          mc.ProjectionFunctions.Add(projectFn);
-          sink.AddTopLevelDeclaration(projectFn);
-        }
-      }
-    }
-
-    int projectionFunctionCount = 0;
-
-    /// <summary>
-    /// Fills in, if necessary, the e.translationDesugaring field, and returns it.
-    /// Also, makes sure that letSuchThatExprInfo maps e to something.
-    /// </summary>
-    Expression LetDesugaring(LetExpr e) {
-      Contract.Requires(e != null);
-      Contract.Requires(!e.Exact);
-      Contract.Ensures(Contract.Result<Expression>() != null);
-      if (e.GetTranslationDesugaring(this) == null) {
-        // For let-such-that expression:
-        //   var x:X, y:Y :| P(x,y,g); F(...)
-        // where
-        //   - g has type G, and
-        //   - tt* denotes the list of type variables in the types X and Y and expression F(...),
-        // declare a function for each bound variable:
-        //   function $let$x(Ty*, G): X;
-        //   function $let$y(Ty*, G): Y;
-        //   function $let_canCall(Ty*, G): bool;
-        // and add an axiom about these functions:
-        //   axiom (forall tt*:Ty*, g:G ::
-        //            { $let$x(tt*, g) }
-        //            { $let$y(tt*, g) }
-        //            $let$_canCall(tt*, g)) ==>
-        //            P($let$x(tt*, g), $let$y(tt*, g), g));
-        // and create the desugaring:
-        //   var x:X, y:Y := $let$x(tt*, g), $let$y(tt*, g); F(...)
-        if (e is SubstLetExpr) {
-          // desugar based on the original letexpr.
-          var expr = (SubstLetExpr)e;
-          var orgExpr = expr.orgExpr;
-          Expression d = LetDesugaring(orgExpr);
-          e.SetTranslationDesugaring(this, Substitute(d, null, expr.substMap, expr.typeMap));
-          var orgInfo = letSuchThatExprInfo[orgExpr];
-          letSuchThatExprInfo.Add(expr, new LetSuchThatExprInfo(orgInfo, this, expr.substMap, expr.typeMap));
-        } else {
-          // First, determine "g" as a list of Dafny variables FVs plus possibly this, $Heap, and old($Heap),
-          // and determine "tt*" as a list of Dafny type variables
-          LetSuchThatExprInfo info;
-          {
-            var FVs = new HashSet<IVariable>();
-            bool usesHeap = false, usesOldHeap = false;
-            var FVsHeapAt = new HashSet<Label>();
-            Type usesThis = null;
-            FreeVariablesUtil.ComputeFreeVariables(options, e.RHSs[0], FVs, ref usesHeap, ref usesOldHeap, FVsHeapAt, ref usesThis, false);
-            var FTVs = new HashSet<TypeParameter>();
-            foreach (var bv in e.BoundVars) {
-              FVs.Remove(bv);
-              ComputeFreeTypeVariables(bv.Type, FTVs);
-            }
-            ComputeFreeTypeVariables(e.RHSs[0], FTVs);
-            info = new LetSuchThatExprInfo(e.tok, letSuchThatExprInfo.Count, FVs.ToList(), FTVs.ToList(), usesHeap, usesOldHeap, FVsHeapAt, usesThis, currentDeclaration);
-            letSuchThatExprInfo.Add(e, info);
-          }
-
-          foreach (var bv in e.BoundVars) {
-            Bpl.Variable resType = new Bpl.Formal(bv.tok, new Bpl.TypedIdent(bv.tok, Bpl.TypedIdent.NoName, TrType(bv.Type)), false);
-            Bpl.Expr ante;
-            List<Variable> formals = info.GAsVars(this, true, out ante, null);
-            var fn = new Bpl.Function(bv.tok, info.SkolemFunctionName(bv), formals, resType);
-
-            if (InsertChecksums) {
-              InsertChecksum(e.Body, fn);
-            }
-
-            sink.AddTopLevelDeclaration(fn);
-          }
-          var canCallFunction = AddLetSuchThatCanCallFunction(e, info);
-          AddLetSuchThenCanCallAxiom(e, info, canCallFunction);
-
-          // now that we've declared the functions and axioms, let's prepare the let-such-that desugaring
-          {
-            var etran = new ExpressionTranslator(this, predef, e.tok);
-            var rhss = new List<Expression>();
-            foreach (var bv in e.BoundVars) {
-              var args = info.SkolemFunctionArgs(bv, this, etran);
-              var rhs = new BoogieFunctionCall(bv.tok, info.SkolemFunctionName(bv), info.UsesHeap, info.UsesOldHeap, info.UsesHeapAt, args.Item1, args.Item2);
-              rhs.Type = bv.Type;
-              rhss.Add(rhs);
-            }
-            var expr = new LetExpr(e.tok, e.LHSs, rhss, e.Body, true);
-            expr.Type = e.Type; // resolve here
-            e.SetTranslationDesugaring(this, expr);
-          }
-        }
-      }
-      return e.GetTranslationDesugaring(this);
-    }
-
-    private Bpl.Function AddLetSuchThatCanCallFunction(LetExpr e, LetSuchThatExprInfo info) {
-      Bpl.Variable resType = new Bpl.Formal(e.tok, new Bpl.TypedIdent(e.tok, Bpl.TypedIdent.NoName, Bpl.Type.Bool),
-        false);
-      List<Variable> formals = info.GAsVars(this, true, out var ante, null);
-      var canCallFunction = new Bpl.Function(e.tok, info.CanCallFunctionName(), formals, resType);
-
-      if (InsertChecksums) {
-        InsertChecksum(e.Body, canCallFunction);
-      }
-
-      sink.AddTopLevelDeclaration(canCallFunction);
-      return canCallFunction;
-    }
-
-    private void AddLetSuchThenCanCallAxiom(LetExpr e, LetSuchThatExprInfo info, Bpl.Function canCallFunction) {
-      var etranCC = new ExpressionTranslator(this, predef, info.HeapExpr(this, false), info.HeapExpr(this, true));
-      Bpl.Expr typeAntecedents; // later ignored
-      List<Variable> gg = info.GAsVars(this, false, out typeAntecedents, etranCC);
-      var gExprs = new List<Bpl.Expr>();
-      foreach (Bpl.Variable g in gg) {
-        gExprs.Add(new Bpl.IdentifierExpr(g.tok, g));
-      }
-
-      Bpl.Trigger tr = null;
-      Dictionary<IVariable, Expression> substMap = new Dictionary<IVariable, Expression>();
-      Bpl.Expr antecedent = Bpl.Expr.True;
-      foreach (var bv in e.BoundVars) {
-        // create a call to $let$x(g)
-        var call = FunctionCall(e.tok, info.SkolemFunctionName(bv), TrType(bv.Type), gExprs);
-        tr = new Bpl.Trigger(e.tok, true, new List<Bpl.Expr> { call }, tr);
-        substMap.Add(bv, new BoogieWrapper(call, bv.Type));
-        if (!(bv.Type.IsTypeParameter)) {
-          Bpl.Expr wh = GetWhereClause(bv.tok, call, bv.Type, etranCC, NOALLOC);
-          if (wh != null) {
-            antecedent = BplAnd(antecedent, wh);
-          }
-        }
-      }
-
-      var i = info.FTVs.Count + (info.UsesHeap ? 1 : 0) + (info.UsesOldHeap ? 1 : 0) + info.UsesHeapAt.Count;
-      Expression receiverReplacement;
-      if (info.ThisType == null) {
-        receiverReplacement = null;
-      } else {
-        receiverReplacement = new BoogieWrapper(gExprs[i], info.ThisType);
-        i++;
-      }
-
-      foreach (var fv in info.FVs) {
-        var ge = gExprs[i];
-        substMap.Add(fv, new BoogieWrapper(ge, fv.Type));
-        i++;
-      }
-
-      var canCall = FunctionCall(e.tok, info.CanCallFunctionName(), Bpl.Type.Bool, gExprs);
-      var p = Substitute(e.RHSs[0], receiverReplacement, substMap);
-      Bpl.Expr ax = Bpl.Expr.Imp(canCall, BplAnd(antecedent, etranCC.TrExpr(p)));
-      ax = BplForall(gg, tr, ax);
-      AddOtherDefinition(canCallFunction, new Bpl.Axiom(e.tok, ax));
-    }
-
-    class LetSuchThatExprInfo {
-      public readonly IToken Tok;
-      public readonly int LetId;
-      public readonly List<IVariable> FVs;
-      public readonly List<Expression> FV_Exprs;  // these are what initially were the free variables, but they may have undergone substitution so they are here Expression's.
-      public readonly List<TypeParameter> FTVs;
-      public readonly List<Type> FTV_Types;
-      public readonly bool UsesHeap;
-      public readonly bool UsesOldHeap;
-      public readonly List<Label> UsesHeapAt;
-      public readonly Type ThisType;  // null if 'this' is not used
-      public LetSuchThatExprInfo(IToken tok, int uniqueLetId,
-      List<IVariable> freeVariables, List<TypeParameter> freeTypeVars,
-      bool usesHeap, bool usesOldHeap, ISet<Label> usesHeapAt, Type thisType, Declaration currentDeclaration) {
-        Tok = tok;
-        LetId = uniqueLetId;
-        FTVs = freeTypeVars;
-        FTV_Types = Map(freeTypeVars, tt => (Type)new UserDefinedType(tt));
-        FVs = freeVariables;
-        FV_Exprs = new List<Expression>();
-        foreach (var v in FVs) {
-          var idExpr = new IdentifierExpr(v.Tok, v.AssignUniqueName(currentDeclaration.IdGenerator));
-          idExpr.Var = v; idExpr.Type = v.Type;  // resolve here
-          FV_Exprs.Add(idExpr);
-        }
-        UsesHeap = usesHeap;
-        UsesOldHeap = usesOldHeap;
-        // we convert the set of heap-at variables to a list here, once and for all; the order itself is not material, what matters is that we always use the same order
-        UsesHeapAt = new List<Label>(usesHeapAt);
-        ThisType = thisType;
-      }
-      public LetSuchThatExprInfo(LetSuchThatExprInfo template, Translator translator,
-           Dictionary<IVariable, Expression> substMap,
-           Dictionary<TypeParameter, Type> typeMap) {
-        Contract.Requires(template != null);
-        Contract.Requires(translator != null);
-        Contract.Requires(substMap != null);
-        Tok = template.Tok;
-        LetId = template.LetId;  // reuse the ID, which ensures we get the same $let functions
-        FTVs = template.FTVs;
-        FTV_Types = template.FTV_Types.ConvertAll(t => t.Subst(typeMap));
-        FVs = template.FVs;
-        FV_Exprs = template.FV_Exprs.ConvertAll(e => Translator.Substitute(e, null, substMap, typeMap));
-        UsesHeap = template.UsesHeap;
-        UsesOldHeap = template.UsesOldHeap;
-        UsesHeapAt = template.UsesHeapAt;
-        ThisType = template.ThisType;
-      }
-      public Tuple<List<Expression>, List<Type>> SkolemFunctionArgs(BoundVar bv, Translator translator, ExpressionTranslator etran) {
-        Contract.Requires(bv != null);
-        Contract.Requires(translator != null);
-        Contract.Requires(etran != null);
-        var args = new List<Expression>();
-        if (ThisType != null) {
-          var th = new ThisExpr(bv.tok);
-          th.Type = ThisType;
-          args.Add(th);
-        }
-        args.AddRange(FV_Exprs);
-        return Tuple.Create(args, new List<Type>(FTV_Types));
-      }
-      public string SkolemFunctionName(BoundVar bv) {
-        Contract.Requires(bv != null);
-        return string.Format("$let#{0}_{1}", LetId, bv.Name);
-      }
-      public Bpl.Expr CanCallFunctionCall(Translator translator, ExpressionTranslator etran) {
-        Contract.Requires(translator != null);
-        Contract.Requires(etran != null);
-        var gExprs = new List<Bpl.Expr>();
-        gExprs.AddRange(Map(FTV_Types, tt => translator.TypeToTy(tt)));
-        if (UsesHeap) {
-          gExprs.Add(etran.HeapExpr);
-        }
-        if (UsesOldHeap) {
-          gExprs.Add(etran.Old.HeapExpr);
-        }
-        foreach (var heapAtLabel in UsesHeapAt) {
-          Bpl.Expr ve;
-          var bv = BplBoundVar("$Heap_at_" + heapAtLabel.AssignUniqueId(translator.CurrentIdGenerator), translator.predef.HeapType, out ve);
-          gExprs.Add(ve);
-        }
-        if (ThisType != null) {
-          var th = new Bpl.IdentifierExpr(Tok, etran.This);
-          gExprs.Add(th);
-        }
-        foreach (var v in FV_Exprs) {
-          gExprs.Add(etran.TrExpr(v));
-        }
-        return FunctionCall(Tok, CanCallFunctionName(), Bpl.Type.Bool, gExprs);
-      }
-      public string CanCallFunctionName() {
-        return string.Format("$let#{0}$canCall", LetId);
-      }
-      public Bpl.Expr HeapExpr(Translator translator, bool old) {
-        Contract.Requires(translator != null);
-        return new Bpl.IdentifierExpr(Tok, old ? "$heap$old" : "$heap", translator.predef.HeapType);
-      }
-      /// <summary>
-      /// "wantFormals" means the returned list will consist of all in-parameters.
-      /// "!wantFormals" means the returned list will consist of all bound variables.
-      /// Guarantees that, in the list returned, "this" is the parameter immediately following
-      /// the (0, 1, or 2) heap arguments, if there is a "this" parameter at all.
-      /// Note, "typeAntecedents" is meaningfully filled only if "etran" is not null.
-      /// </summary>
-      public List<Variable> GAsVars(Translator translator, bool wantFormals, out Bpl.Expr typeAntecedents, ExpressionTranslator etran) {
-        Contract.Requires(translator != null);
-        var vv = new List<Variable>();
-        // first, add the type variables
-        vv.AddRange(Map(FTVs, tp => NewVar(NameTypeParam(tp), translator.predef.Ty, wantFormals)));
-        typeAntecedents = Bpl.Expr.True;
-        if (UsesHeap) {
-          var nv = NewVar("$heap", translator.predef.HeapType, wantFormals);
-          vv.Add(nv);
-          if (etran != null) {
-            var isGoodHeap = translator.FunctionCall(Tok, BuiltinFunction.IsGoodHeap, null, new Bpl.IdentifierExpr(Tok, nv));
-            typeAntecedents = BplAnd(typeAntecedents, isGoodHeap);
-          }
-        }
-        if (UsesOldHeap) {
-          var nv = NewVar("$heap$old", translator.predef.HeapType, wantFormals);
-          vv.Add(nv);
-          if (etran != null) {
-            var isGoodHeap = translator.FunctionCall(Tok, BuiltinFunction.IsGoodHeap, null, new Bpl.IdentifierExpr(Tok, nv));
-            typeAntecedents = BplAnd(typeAntecedents, isGoodHeap);
-          }
-        }
-        foreach (var heapAtLabel in UsesHeapAt) {
-          var nv = NewVar("$Heap_at_" + heapAtLabel.AssignUniqueId(translator.CurrentIdGenerator), translator.predef.HeapType, wantFormals);
-          vv.Add(nv);
-          if (etran != null) {
-            // TODO: It's not clear to me that $IsGoodHeap predicates are needed for these axioms. (Same comment applies above for $heap$old.)
-            // But $HeapSucc relations among the various heap variables appears not needed for either soundness or completeness, since the
-            // let-such-that functions will always be invoked on arguments for which these properties are known.
-            var isGoodHeap = translator.FunctionCall(Tok, BuiltinFunction.IsGoodHeap, null, new Bpl.IdentifierExpr(Tok, nv));
-            typeAntecedents = BplAnd(typeAntecedents, isGoodHeap);
-          }
-        }
-        if (ThisType != null) {
-          var nv = NewVar("this", translator.TrType(ThisType), wantFormals);
-          vv.Add(nv);
-          if (etran != null) {
-            var th = new Bpl.IdentifierExpr(Tok, nv);
-            typeAntecedents = BplAnd(typeAntecedents, translator.ReceiverNotNull(th));
-            var wh = translator.GetWhereClause(Tok, th, ThisType, etran, NOALLOC);
-            if (wh != null) {
-              typeAntecedents = BplAnd(typeAntecedents, wh);
-            }
-          }
-        }
-        foreach (var v in FVs) {
-          var nv = NewVar(v.Name, translator.TrType(v.Type), wantFormals);
-          vv.Add(nv);
-          if (etran != null) {
-            var wh = translator.GetWhereClause(Tok, new Bpl.IdentifierExpr(Tok, nv), v.Type, etran, NOALLOC);
-            if (wh != null) {
-              typeAntecedents = BplAnd(typeAntecedents, wh);
-            }
-          }
-        }
-        return vv;
-      }
-      Bpl.Variable NewVar(string name, Bpl.Type type, bool wantFormal) {
-        Contract.Requires(name != null);
-        Contract.Requires(type != null);
-        if (wantFormal) {
-          return new Bpl.Formal(Tok, new Bpl.TypedIdent(Tok, name, type), true);
-        } else {
-          return new Bpl.BoundVariable(Tok, new Bpl.TypedIdent(Tok, name, type));
-        }
-      }
-    }
-    Dictionary<LetExpr, LetSuchThatExprInfo> letSuchThatExprInfo = new Dictionary<LetExpr, LetSuchThatExprInfo>();
-    private Declaration currentDeclaration;
-
-    // ----- Expression ---------------------------------------------------------------------------
-
-    /// <summary>
-    /// This class gives a way to represent a Boogie translation target as if it were still a Dafny expression.
-    /// </summary>
-    internal class BoogieWrapper : Expression {
-      public readonly Bpl.Expr Expr;
-      public BoogieWrapper(Bpl.Expr expr, Type dafnyType)
-        : base(ToDafnyToken(expr.tok)) {
-        Contract.Requires(expr != null);
-        Contract.Requires(dafnyType != null);
-        Expr = expr;
-        Type = dafnyType;  // resolve immediately
-      }
-    }
-
-    internal class BoogieFunctionCall : Expression {
-      public readonly string FunctionName;
-      public readonly bool UsesHeap;
-      public readonly bool UsesOldHeap;
-      public readonly List<Label> HeapAtLabels;
-      public readonly List<Type> TyArgs; // Note: also has a bunch of type arguments
-      public readonly List<Expression> Args;
-      public BoogieFunctionCall(IToken tok, string functionName, bool usesHeap, bool usesOldHeap, List<Label> heapAtLabels, List<Expression> args, List<Type> tyArgs)
-        : base(tok) {
-        Contract.Requires(tok != null);
-        Contract.Requires(functionName != null);
-        Contract.Requires(heapAtLabels != null);
-        Contract.Requires(args != null);
-        FunctionName = functionName;
-        UsesHeap = usesHeap;
-        UsesOldHeap = usesOldHeap;
-        HeapAtLabels = heapAtLabels;
-        Args = args;
-        TyArgs = tyArgs;
-      }
-      public override IEnumerable<Expression> SubExpressions {
-        get {
-          foreach (var v in Args) {
-            yield return v;
-          }
-        }
-      }
-    }
-
-    internal class SubstLetExpr : LetExpr {
-      public LetExpr orgExpr;
-      public Dictionary<IVariable, Expression> substMap;
-      public Dictionary<TypeParameter, Type> typeMap;
-
-      public SubstLetExpr(IToken tok, List<CasePattern<BoundVar>> lhss, List<Expression> rhss, Expression body, bool exact,
-         LetExpr orgExpr, Dictionary<IVariable, Expression> substMap, Dictionary<TypeParameter, Type> typeMap, List<ComprehensionExpr.BoundedPool>/*?*/ constraintBounds)
-        : base(tok, lhss, rhss, body, exact) {
-        this.orgExpr = orgExpr;
-        this.substMap = substMap;
-        this.typeMap = typeMap;
-        this.Constraint_Bounds = constraintBounds;
-      }
-    }
-
-    internal class FuelSettingPair {
-      public int low;
-      public int high;
-
-      public FuelSettingPair(int low = (int)FuelSetting.FuelAmount.LOW, int high = (int)FuelSetting.FuelAmount.HIGH) {
-        this.low = low;
-        this.high = high;
-      }
-    }
-
-    // C#'s version of a type alias
-    internal class FuelContext : Dictionary<Function, FuelSettingPair> { }
-    internal class CustomFuelSettings : Dictionary<Function, FuelSetting> { }
-
-    internal class FuelConstant {
-      public Function f;
-      public Bpl.Expr baseFuel;
-      public Bpl.Expr startFuel;
-      public Bpl.Expr startFuelAssert;
-
-      public FuelConstant(Function f, Bpl.Expr baseFuel, Bpl.Expr startFuel, Bpl.Expr startFuelAssert) {
-        this.f = f;
-        this.baseFuel = baseFuel;
-        this.startFuel = startFuel;
-        this.startFuelAssert = startFuelAssert;
-      }
-
-      public Bpl.Expr MoreFuel(Bpl.Program sink, PredefinedDecls predef, FreshIdGenerator idGen) {
-        string uniqueId = idGen.FreshId("MoreFuel_" + f.FullName);
-        Bpl.Constant moreFuel = new Bpl.Constant(f.tok, new Bpl.TypedIdent(f.tok, uniqueId, predef.LayerType), false);
-        sink.AddTopLevelDeclaration(moreFuel);
-        Bpl.Expr moreFuel_expr = new Bpl.IdentifierExpr(f.tok, moreFuel);
-        return moreFuel_expr;
-      }
-    }
-
-    internal class FuelSetting {
-
-      public enum FuelAmount { NONE, LOW, HIGH };
-      public static AsyncLocal<Stack<FuelContext>> SavedContexts = new();
-
-      public static FuelSettingPair FuelAttrib(Function f, out bool found) {
-        Contract.Requires(f != null);
-        Contract.Ensures(Contract.Result<FuelSettingPair>() != null);
-        FuelSettingPair setting = new FuelSettingPair();
-        found = false;
-
-        if (f.Attributes != null) {
-          List<Expression> args = Attributes.FindExpressions(f.Attributes, "fuel");
-          if (args != null) {
-            found = true;
-            if (args.Count >= 2) {
-              LiteralExpr literalLow = args[0] as LiteralExpr;
-              LiteralExpr literalHigh = args[1] as LiteralExpr;
-
-              if (literalLow != null && literalLow.Value is BigInteger && literalHigh != null && literalHigh.Value is BigInteger) {
-                setting.low = (int)((BigInteger)literalLow.Value);
-                setting.high = (int)((BigInteger)literalHigh.Value);
-              }
-            } else if (args.Count >= 1) {
-              LiteralExpr literal = args[0] as LiteralExpr;
-              if (literal != null && literal.Value is BigInteger) {
-                setting.low = (int)((BigInteger)literal.Value);
-                setting.high = setting.low + 1;
-              }
-            }
-          }
-        }
-
-        return setting;
-      }
-
-      public int amount;        // Amount of fuel above that represented by start
-      private Bpl.Expr start;   // Starting fuel argument (null indicates LZ)
-      private Translator translator;
-      private CustomFuelSettings customFuelSettings;
-
-      public FuelSetting(Translator translator, int amount, Bpl.Expr start = null, CustomFuelSettings customFuelSettings = null) {
-        this.translator = translator;
-        this.amount = amount;
-        this.start = start;
-        this.customFuelSettings = customFuelSettings;
-      }
-
-      public FuelSetting Offset(int offset) {
-        return new FuelSetting(translator, this.amount + offset, start);
-      }
-
-      public FuelSetting Decrease(int offset) {
-        Contract.Ensures(this.amount - offset >= 0);
-        return new FuelSetting(translator, this.amount - offset, start);
-      }
-
-      public FuelSetting WithLayer(Bpl.Expr layer) {
-        return new FuelSetting(translator, amount, layer);
-      }
-
-      public FuelSetting WithContext(CustomFuelSettings settings) {
-        return new FuelSetting(translator, amount, start, settings);
-      }
-
-      public Bpl.Expr LayerZero() {
-        Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-        return new Bpl.IdentifierExpr(Token.NoToken, "$LZ", translator.predef.LayerType);
-      }
-
-      public Bpl.Expr LayerN(int n) {
-        Contract.Requires(0 <= n);
-        Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-        return translator.LayerSucc(LayerZero(), n);
-      }
-
-      public Bpl.Expr LayerN(int n, Bpl.Expr baseLayer) {
-        Contract.Requires(0 <= n);
-        Contract.Ensures(Contract.Result<Bpl.Expr>() != null);
-        return translator.LayerSucc(baseLayer, n);
-      }
-
-      private Bpl.Expr ToExpr(int amount) {
-        if (start == null) {
-          return LayerN(amount);
-        } else {
-          return translator.LayerSucc(start, amount);
-        }
-      }
-
-      public Bpl.Expr ToExpr() {
-        return this.ToExpr(this.amount);
-      }
-
-      /// <summary>
-      /// Get the fuel value for this function, given the ambient environment (represented by the fuel setting)
-      /// the function itself, and the function call's context (if any)
-      /// </summary>
-      public Bpl.Expr GetFunctionFuel(Function f) {
-        Contract.Requires(f != null);
-        Bpl.Expr finalFuel;
-        if (customFuelSettings != null && customFuelSettings.ContainsKey(f)) {
-          finalFuel = customFuelSettings[f].GetFunctionFuel(f);
-        } else if (this.amount == (int)FuelAmount.NONE) {
-          finalFuel = this.ToExpr();
-        } else {
-          FuelSettingPair setting = null;
-          var found = translator.fuelContext.TryGetValue(f, out setting);
-
-          if (!found) {  // If the context doesn't define fuel for this function, check for a fuel attribute (which supplies a default value if none is found)
-            setting = FuelAttrib(f, out found);
-          }
-
-          FuelConstant fuelConstant = translator.functionFuel.Find(x => x.f == f);
-          if (this.amount == (int)FuelAmount.LOW) {
-            finalFuel = GetFunctionFuel(setting.low > 0 ? setting.low : this.amount, found, fuelConstant);
-          } else if (this.amount >= (int)FuelAmount.HIGH) {
-            finalFuel = GetFunctionFuel(setting.high > 0 ? setting.high : this.amount, found, fuelConstant);
-          } else {
-            Contract.Assert(false); // Should not reach here
-            finalFuel = null;
-          }
-        }
-        return finalFuel;
-      }
-
-      private Bpl.Expr GetFunctionFuel(int amount, bool hasFuel, FuelConstant fuelConstant) {
-        if (fuelConstant != null) {
-          /*
-          if (hasFuel) {
-            // it has fuel context
-            return LayerN(amount, fuelConstant.baseFuel);
-          } else {
-           */
-          // startfuel
-          if (amount == (int)FuelAmount.LOW) {
-            return fuelConstant.startFuel;
-          } else {
-            return fuelConstant.startFuelAssert;
-          }
-          //}
-        } else {
-          return ToExpr(amount);
-        }
-      }
-
-      /// <summary>
-      /// Finds all fuel related attributes of the form {:fuel function low [high]}
-      /// Adds the setting to the context _if_ the context does not already have a setting for that function.
-      /// In other words, it should be called in order from most to least specific context scope.
-      /// </summary>
-      public static void FindFuelAttributes(Attributes attribs, FuelContext fuelContext) {
-        Function f = null;
-        FuelSettingPair setting = null;
-
-        if (attribs != null) {
-          List<List<Expression>> results = Attributes.FindAllExpressions(attribs, "fuel");
-
-          if (results != null) {
-            foreach (List<Expression> args in results) {
-              if (args != null && args.Count >= 2) {
-                // Try to extract the function from the first argument
-                MemberSelectExpr selectExpr = args[0].Resolved as MemberSelectExpr;
-                if (selectExpr != null) {
-                  f = selectExpr.Member as Function;
-                }
-
-                // Try to extract the lower fuel setting
-                LiteralExpr literalLow = args[1] as LiteralExpr;
-                if (literalLow != null && literalLow.Value is BigInteger) {
-                  setting = new FuelSettingPair();
-                  setting.low = (int)((BigInteger)literalLow.Value);
-                }
-
-                // The user may supply an additional high argument; if not, it defaults to low + 1
-                if (f != null && args.Count >= 3) {
-                  LiteralExpr literalHigh = args[2] as LiteralExpr;
-                  if (setting != null && literalHigh != null && literalHigh.Value is BigInteger) {
-                    setting.high = (int)((BigInteger)literalHigh.Value);
-                    if (!fuelContext.ContainsKey(f)) {
-                      fuelContext.Add(f, setting);
-                    }
-                  }
-                } else if (f != null && setting != null) {
-                  setting.high = setting.low + 1;
-                  if (!fuelContext.ContainsKey(f)) {
-                    fuelContext.Add(f, setting);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-
-      /// <summary>
-      /// Extend the given context with fuel information from the declaration itself, and enclosing modules
-      /// </summary>
-      private static void AddFuelContext(FuelContext context, TopLevelDecl decl) {
-        FindFuelAttributes(decl.Attributes, context);
-
-        var module = decl.EnclosingModuleDefinition;
-        while (module != null) {
-          FindFuelAttributes(module.Attributes, context);
-          module = module.EnclosingModule;
-        }
-      }
-
-      /// <summary>
-      /// Creates a summary of all fuel settings in scope, starting from the given class declaration
-      /// </summary>
-      public static FuelContext NewFuelContext(TopLevelDecl decl) {
-        FuelContext context = new FuelContext();
-        AddFuelContext(context, decl);
-        return context;
-      }
-
-      /// <summary>
-      /// Creates a summary of all fuel settings in scope, starting from the given member declaration
-      /// </summary>
-      public static FuelContext NewFuelContext(MemberDecl decl) {
-        FuelContext context = new FuelContext();
-
-        FindFuelAttributes(decl.Attributes, context);
-        AddFuelContext(context, decl.EnclosingClass);
-
-        return context;
-      }
-
-      /// <summary>
-      /// Extends the given fuel context with any new fuel settings found in attribs
-      /// </summary>
-      public static FuelContext ExpandFuelContext(Attributes attribs, IToken tok, FuelContext oldFuelContext, ErrorReporter reporter) {
-        Contract.Ensures(GetSavedContexts().Count == Contract.OldValue(GetSavedContexts().Count) + 1);
-        FuelContext newContext = new FuelContext();
-        FindFuelAttributes(attribs, newContext);
-        if (newContext.Count > 0) {
-          // first make sure that the fuel only increase relative to the oldContext
-          foreach (var pair in newContext) {
-            FuelSettingPair newSetting = pair.Value;
-            FuelSettingPair oldSetting;
-            var found = oldFuelContext.TryGetValue(pair.Key, out oldSetting);
-            if (!found) {    // the default is {:fuel, 1, 2}
-              oldSetting = new FuelSettingPair();
-            }
-            // make sure that the fuel can only increase within a given scope
-            if (newSetting.low < oldSetting.low || newSetting.high < oldSetting.high) {
-              reporter.Error(MessageSource.Translator, ErrorId.g_fuel_must_increase, tok, "Fuel can only increase within a given scope.");
-            }
-          }
-          // add oldContext to newContext if it doesn't exist already
-          foreach (var pair in oldFuelContext) {
-            if (!newContext.ContainsKey(pair.Key)) {    // Local setting takes precedence over old context
-              newContext.Add(pair.Key, pair.Value);
-            }
-          }
-        } else {
-          newContext = oldFuelContext;
-        }
-        GetSavedContexts().Push(oldFuelContext);
-
-        return newContext;
-      }
-
-      private static Stack<FuelContext> GetSavedContexts() {
-        var result = SavedContexts.Value;
-        if (result == null) {
-          SavedContexts.Value = result = new();
-        }
-        return result;
-      }
-
-      public static FuelContext PopFuelContext() {
-        Contract.Requires(GetSavedContexts().Count > 0);
-        return GetSavedContexts().Pop();
-      }
-
-    }
-
-    internal enum IsAllocType { ISALLOC, NOALLOC, NEVERALLOC };  // NEVERALLOC is like NOALLOC, but overrides AlwaysAlloc
-    static IsAllocType ISALLOC { get { return IsAllocType.ISALLOC; } }
-    static IsAllocType NOALLOC { get { return IsAllocType.NOALLOC; } }
-
-    internal class IsAllocContext {
-      private DafnyOptions options;
-      internal bool allVarsGhost;
-
-      internal IsAllocContext(DafnyOptions options, bool allVarsGhost) {
-        this.options = options;
-        this.allVarsGhost = allVarsGhost;
-      }
-
-      internal IsAllocType Var(bool isGhost) {
-        return ISALLOC;
-      }
-
-      internal IsAllocType Var(LocalVariable local) {
-        return Var(allVarsGhost || local.IsGhost);
-      }
-
-      internal IsAllocType Var(NonglobalVariable var) {
-        return Var(allVarsGhost || var.IsGhost);
-      }
-
-      internal IsAllocType Var(bool ghostStmt, LocalVariable var) {
-        return Var(allVarsGhost || ghostStmt || var.IsGhost);
-      }
-
-      internal IsAllocType Var(bool ghostStmt, NonglobalVariable var) {
-        return Var(allVarsGhost || ghostStmt || var.IsGhost);
-      }
-    }
-
-    public class SplitExprInfo {
-      public enum K { Free, Checked, Both }
-      public K Kind;
-      public bool IsOnlyFree { get { return Kind == K.Free; } }
-      public bool IsOnlyChecked { get { return Kind == K.Checked; } }
-      public bool IsChecked { get { return Kind != K.Free; } }
-      public readonly Expr E;
-      public IToken Tok => ToDafnyToken(E.tok);
-      public SplitExprInfo(K kind, Expr e) {
-        Contract.Requires(e != null && e.tok != null);
-        // TODO:  Contract.Requires(kind == K.Free || e.tok.IsValid);
-        Kind = kind;
-        E = e;
-      }
-    }
-
-    List<SplitExprInfo/*!*/>/*!*/ TrSplitExpr(Expression expr, ExpressionTranslator etran, bool apply_induction, out bool splitHappened) {
-      Contract.Requires(expr != null);
-      Contract.Requires(etran != null);
-      Contract.Ensures(Contract.Result<List<SplitExprInfo>>() != null);
-
-      var splits = new List<SplitExprInfo>();
-      splitHappened = TrSplitExpr(expr, splits, true, int.MaxValue, true, apply_induction, etran);
-      return splits;
-    }
-
-    List<SplitExprInfo> TrSplitExprForMethodSpec(Expression expr, ExpressionTranslator etran, MethodTranslationKind kind) {
-      Contract.Requires(expr != null);
-      Contract.Requires(etran != null);
-      Contract.Ensures(Contract.Result<List<SplitExprInfo>>() != null);
-
-      var splits = new List<SplitExprInfo>();
-      var apply_induction = kind == MethodTranslationKind.Implementation;
-      bool splitHappened;  // we don't actually care
-      splitHappened = TrSplitExpr(expr, splits, true, int.MaxValue, kind != MethodTranslationKind.Call, apply_induction, etran);
-      return splits;
-    }
-
-    Bpl.Trigger TrTrigger(ExpressionTranslator etran, Attributes attribs, IToken tok, Dictionary<IVariable, Expression> substMap = null) {
-      Contract.Requires(etran != null);
-      Contract.Requires(tok != null);
-      var argsEtran = etran.WithNoLits();
-      Bpl.Trigger tr = null;
-      foreach (var trigger in attribs.AsEnumerable().Where(aa => aa.Name == "trigger").Select(aa => aa.Args)) {
-        List<Bpl.Expr> tt = new List<Bpl.Expr>();
-        foreach (var arg in trigger) {
-          if (substMap == null) {
-            tt.Add(argsEtran.TrExpr(arg));
-          } else {
-            tt.Add(argsEtran.TrExpr(Substitute(arg, null, substMap)));
-          }
-        }
-        tr = new Bpl.Trigger(tok, true, tt, tr);
-      }
-      return tr;
-    }
-
-    Bpl.Trigger TrTrigger(ExpressionTranslator etran, Attributes attribs, IToken tok, List<Variable> bvars, Dictionary<IVariable, Expression> substMap, Dictionary<TypeParameter, Type> typeMap) {
-      Contract.Requires(etran != null);
-      Contract.Requires(tok != null);
-      var argsEtran = etran.WithNoLits();
-      Bpl.Trigger tr = null;
-      var fueledTrigger = new Dictionary<List<Expression>, bool>();
-      // translate the triggers once to see if fuel or the heap is used as quantifier boundvar
-      foreach (var aa in attribs.AsEnumerable()) {
-        if (aa.Name == "trigger") {
-          int fuelCount = argsEtran.Statistics_CustomLayerFunctionCount;
-          foreach (var arg in aa.Args) {
-            argsEtran.TrExpr(arg);
-          }
-          fueledTrigger[aa.Args] = argsEtran.Statistics_CustomLayerFunctionCount > fuelCount;
-        }
-      }
-
-      bool useFuelAsQuantifier = argsEtran.Statistics_CustomLayerFunctionCount > 0;
-      bool useHeapAsQuantifier = argsEtran.Statistics_HeapAsQuantifierCount > 0;
-      if (useHeapAsQuantifier) {
-        var heapExpr = BplBoundVar(CurrentIdGenerator.FreshId("tr$heap#"), predef.HeapType, bvars);
-        argsEtran = new ExpressionTranslator(argsEtran, heapExpr);
-      }
-
-      // now translate it with the correct layer and heapExpr
-      foreach (var trigger in attribs.AsEnumerable().Where(aa => aa.Name == "trigger")) {
-        List<Bpl.Expr> tt = new List<Bpl.Expr>();
-        foreach (var arg in trigger.Args) {
-          if (substMap == null) {
-            tt.Add(argsEtran.TrExpr(arg));
-          } else {
-            tt.Add(argsEtran.TrExpr(Substitute(arg, null, substMap, typeMap)));
-          }
-        }
-        if (useHeapAsQuantifier) {
-          tt.Add(FunctionCall(tok, BuiltinFunction.IsGoodHeap, null, argsEtran.HeapExpr));
-        }
-        tr = new Bpl.Trigger(tok, true, tt, tr);
-      }
-      return tr;
-    }
-
-    /// <summary>
-    /// Tries to split the expression into tactical conjuncts (if "position") or disjuncts (if "!position").
-    /// If a (necessarily boolean) function call appears as a top-level conjunct, then inline the function
-    /// if its body is available in the current context and its height is less than "heightLimit" (if "heightLimit" is
-    /// passed in as 0, then no functions will be inlined).
-    /// </summary>
-    bool TrSplitExpr(Expression expr, List<SplitExprInfo/*!*/>/*!*/ splits, bool position, int heightLimit, bool inlineProtectedFunctions, bool apply_induction, ExpressionTranslator etran) {
-      Contract.Requires(expr != null);
-      Contract.Requires(expr.Type.IsBoolType || (expr is BoxingCastExpr && ((BoxingCastExpr)expr).E.Type.IsBoolType));
-      Contract.Requires(splits != null);
-      Contract.Requires(etran != null);
-
-      switch (expr) {
-        case BoxingCastExpr castExpr: {
-            var bce = castExpr;
-            var ss = new List<SplitExprInfo>();
-            if (TrSplitExpr(bce.E, ss, position, heightLimit, inlineProtectedFunctions, apply_induction, etran)) {
-              foreach (var s in ss) {
-                splits.Add(new SplitExprInfo(s.Kind, CondApplyBox(s.Tok, s.E, bce.FromType, bce.ToType)));
-              }
-              return true;
-            }
-
-            break;
-          }
-        case ConcreteSyntaxExpression expression: {
-            var e = expression;
-            return TrSplitExpr(e.ResolvedExpression, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-          }
-        case NestedMatchExpr nestedMatchExpr:
-          return TrSplitExpr(nestedMatchExpr.Flattened, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-        case LetExpr letExpr: {
-            var e = letExpr;
-            if (!e.Exact) {
-              var d = LetDesugaring(e);
-              return TrSplitExpr(d, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-            } else {
-              var ss = new List<SplitExprInfo>();
-              if (TrSplitExpr(e.Body, ss, position, heightLimit, inlineProtectedFunctions, apply_induction, etran)) {
-                // We don't know where the RHSs of the let are used in the body. In particular, we don't know if a RHS
-                // will end up in a spot where TrSplitExpr would like to increase the Layer offset or not. In fact, different
-                // uses of the same let variable may end up needing different Layer constants. The following code will
-                // always bump the Layer offset in the RHS. This seems likely to be desireable in many cases, because the
-                // LetExpr sits in a position for which TrSplitExpr is invoked.
-                List<Bpl.Variable> lhss;
-                List<Bpl.Expr> rhss;
-                etran.LayerOffset(1).TrLetExprPieces(e, out lhss, out rhss);
-                foreach (var s in ss) {
-                  // as the source location in the following let, use that of the translated "s"
-                  splits.Add(new SplitExprInfo(s.Kind, new Bpl.LetExpr(s.E.tok, lhss, rhss, null, s.E)));
-                }
-                return true;
-              }
-            }
-
-            break;
-          }
-        case UnchangedExpr unchangedExpr: {
-            var e = unchangedExpr;
-            if (position && e.Frame.Count > 1) {
-              // split into a number of UnchangeExpr's, one for each FrameExpression
-              foreach (var fe in e.Frame) {
-                var tok = new NestedToken(GetToken(e), fe.tok);
-                Expression ee = new UnchangedExpr(tok, new List<FrameExpression> { fe }, e.At) { AtLabel = e.AtLabel };
-                ee.Type = Type.Bool;  // resolve here
-                TrSplitExpr(ee, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-              }
-              return true;
-            }
-
-            break;
-          }
-        case UnaryOpExpr opExpr: {
-            var e = opExpr;
-            if (e.ResolvedOp == UnaryOpExpr.ResolvedOpcode.BoolNot) {
-              var ss = new List<SplitExprInfo>();
-              if (TrSplitExpr(e.E, ss, !position, heightLimit, inlineProtectedFunctions, apply_induction, etran)) {
-                foreach (var s in ss) {
-                  splits.Add(new SplitExprInfo(s.Kind, Bpl.Expr.Unary(s.E.tok, UnaryOperator.Opcode.Not, s.E)));
-                }
-                return true;
-              }
-            }
-
-            break;
-          }
-        case BinaryExpr binaryExpr: {
-            var bin = binaryExpr;
-            if (position && bin.ResolvedOp == BinaryExpr.ResolvedOpcode.And) {
-              TrSplitExpr(bin.E0, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-              TrSplitExpr(bin.E1, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-              return true;
-
-            } else if (!position && bin.ResolvedOp == BinaryExpr.ResolvedOpcode.Or) {
-              TrSplitExpr(bin.E0, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-              TrSplitExpr(bin.E1, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-              return true;
-
-            } else if (bin.ResolvedOp == BinaryExpr.ResolvedOpcode.Imp) {
-              // non-conditionally split these, so we get the source location to point to a subexpression
-              if (position) {
-                var lhs = etran.TrExpr(bin.E0);
-                var ss = new List<SplitExprInfo>();
-                TrSplitExpr(bin.E1, ss, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-                foreach (var s in ss) {
-                  // as the source location in the following implication, use that of the translated "s"
-                  splits.Add(new SplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, BinaryOperator.Opcode.Imp, lhs, s.E)));
-                }
-              } else {
-                var ss = new List<SplitExprInfo>();
-                TrSplitExpr(bin.E0, ss, !position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-                var rhs = etran.TrExpr(bin.E1);
-                foreach (var s in ss) {
-                  // as the source location in the following implication, use that of the translated "s"
-                  splits.Add(new SplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, BinaryOperator.Opcode.Imp, s.E, rhs)));
-                }
-              }
-              return true;
-            }
-
-            break;
-          }
-        case TernaryExpr ternaryExpr: {
-            var e = ternaryExpr;
-            if ((e.Op == TernaryExpr.Opcode.PrefixEqOp && position) || (e.Op == TernaryExpr.Opcode.PrefixNeqOp && !position)) {
-              var e1type = e.E1.Type.NormalizeExpand();
-              var e2type = e.E2.Type.NormalizeExpand();
-              var codecl = e1type.AsCoDatatype;
-              Contract.Assert(codecl != null);
-              var k = etran.TrExpr(e.E0);
-              var A = etran.TrExpr(e.E1);
-              var B = etran.TrExpr(e.E2);
-              // split as shown here for possibly infinite lists:
-              //   checked $PrefixEqual#Dt(k, A, B) || (k_has_successor ==> A.Nil? ==> B.Nil?)
-              //   checked $PrefixEqual#Dt(k, A, B) || (k_has_successor ==> A.Cons? ==> B.Cons? && A.head == B.head && $PrefixEqual#2#Dt(k - 1, A.tail, B.tail))  // note the #2 in the recursive call, just like for user-defined predicates that are inlined by TrSplitExpr
-              //   checked $PrefixEqual#Dt(k, A, B) || (k != 0 && k.IsLimit ==> $Equal#Dt(A, B))  // (*)
-              //   free $PrefixEqual#Dt(k, A, B);
-              // Note:  First off, (*) is used only when ORDINAL is involved. Moreover, if there's an error among the first checked
-              // conditions, it seems confusing to get yet another error message.  Therefore, we add a middle disjunct to (*), namely
-              // the conjunction of all the previous RHSs.
-              var kAsORD = !e.E0.Type.IsBigOrdinalType && !TernaryExpr.PrefixEqUsesNat ? FunctionCall(k.tok, "ORD#FromNat", Bpl.Type.Int, k) : k;
-              var prefixEqK = CoEqualCall(codecl, e1type.TypeArgs, e2type.TypeArgs, kAsORD, etran.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH), A, B); // FunctionCall(expr.tok, CoPrefixName(codecl, 1), Bpl.Type.Bool, k, A, B);
-              Bpl.Expr kHasSuccessor, kMinusOne;
-              if (e.E0.Type.IsBigOrdinalType) {
-                kHasSuccessor = Bpl.Expr.Lt(Bpl.Expr.Literal(0), FunctionCall(k.tok, "ORD#Offset", Bpl.Type.Int, k));
-                kMinusOne = FunctionCall(k.tok, "ORD#Minus", predef.BigOrdinalType, k, FunctionCall(k.tok, "ORD#FromNat", Bpl.Type.Int, Bpl.Expr.Literal(1)));
-              } else {
-                kHasSuccessor = Bpl.Expr.Lt(Bpl.Expr.Literal(0), k);
-                kMinusOne = Bpl.Expr.Sub(k, Bpl.Expr.Literal(1));
-                if (!TernaryExpr.PrefixEqUsesNat) {
-                  kMinusOne = FunctionCall(k.tok, "ORD#FromNat", Bpl.Type.Int, kMinusOne);
-                }
-              }
-              // for the inlining of the definition of prefix equality, translate the two main equality operands arguments with a higher offset (to obtain #2 functions)
-              var etran2 = etran.LayerOffset(1);
-              var A2 = etran2.TrExpr(e.E1);
-              var B2 = etran2.TrExpr(e.E2);
-              var needsTokenAdjust = TrSplitNeedsTokenAdjustment(ternaryExpr);
-              var tok = needsTokenAdjust ? new ForceCheckToken(ternaryExpr.tok) : ternaryExpr.tok;
-              Bpl.Expr layer = etran.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH);
-              Bpl.Expr eqComponents = Bpl.Expr.True;
-              foreach (var c in CoPrefixEquality(tok, codecl, e1type.TypeArgs, e2type.TypeArgs, kMinusOne, layer, A2, B2, true)) {
-                eqComponents = BplAnd(eqComponents, c);
-                var p = Bpl.Expr.Binary(c.tok, BinaryOperator.Opcode.Or, prefixEqK, Bpl.Expr.Imp(kHasSuccessor, c));
-                splits.Add(new SplitExprInfo(SplitExprInfo.K.Checked, p));
-              }
-              if (e.E0.Type.IsBigOrdinalType) {
-                var kIsNonZeroLimit = BplAnd(
-                  Bpl.Expr.Neq(k, FunctionCall(k.tok, "ORD#FromNat", predef.BigOrdinalType, Bpl.Expr.Literal(0))),
-                  FunctionCall(k.tok, "ORD#IsLimit", Bpl.Type.Bool, k));
-                var eq = CoEqualCall(codecl, e1type.TypeArgs, e2type.TypeArgs, null, etran.layerInterCluster.LayerN((int)FuelSetting.FuelAmount.HIGH), A, B);
-                var p = Bpl.Expr.Binary(tok, BinaryOperator.Opcode.Or, prefixEqK, BplOr(BplImp(kHasSuccessor, eqComponents), Bpl.Expr.Imp(kIsNonZeroLimit, eq)));
-                splits.Add(new SplitExprInfo(SplitExprInfo.K.Checked, p));
-              }
-              splits.Add(new SplitExprInfo(SplitExprInfo.K.Free, prefixEqK));
-              return true;
-            }
-
-            break;
-          }
-        case ITEExpr iteExpr: {
-            var ite = iteExpr;
-
-            var ssThen = new List<SplitExprInfo>();
-            var ssElse = new List<SplitExprInfo>();
-
-            TrSplitExpr(ite.Thn, ssThen, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-            TrSplitExpr(ite.Els, ssElse, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-
-            var op = position ? BinaryOperator.Opcode.Imp : BinaryOperator.Opcode.And;
-            var test = etran.TrExpr(ite.Test);
-            foreach (var s in ssThen) {
-              // as the source location in the following implication, use that of the translated "s"
-              splits.Add(new SplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, op, test, s.E)));
-            }
-
-            var negatedTest = Bpl.Expr.Not(test);
-            foreach (var s in ssElse) {
-              // as the source location in the following implication, use that of the translated "s"
-              splits.Add(new SplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, op, negatedTest, s.E)));
-            }
-
-            return true;
-          }
-        case MatchExpr matchExpr: {
-            var e = matchExpr;
-            var ite = etran.DesugarMatchExpr(e);
-            return TrSplitExpr(ite, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-          }
-        case StmtExpr stmtExpr: {
-            var e = stmtExpr;
-            // For an expression S;E in split position, the conclusion of S can be used as an assumption.  Unfortunately,
-            // this assumption is not generated in non-split positions (because I don't know how.)
-            // So, treat "S; E" like "SConclusion ==> E".
-            if (position) {
-              var conclusion = etran.TrExpr(e.GetSConclusion());
-              var ss = new List<SplitExprInfo>();
-              TrSplitExpr(e.E, ss, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-              foreach (var s in ss) {
-                // as the source location in the following implication, use that of the translated "s"
-                splits.Add(new SplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, BinaryOperator.Opcode.Imp, conclusion, s.E)));
-              }
-            } else {
-              var ss = new List<SplitExprInfo>();
-              TrSplitExpr(e.GetSConclusion(), ss, !position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-              var rhs = etran.TrExpr(e.E);
-              foreach (var s in ss) {
-                // as the source location in the following implication, use that of the translated "s"
-                splits.Add(new SplitExprInfo(s.Kind, Bpl.Expr.Binary(s.E.tok, BinaryOperator.Opcode.Imp, s.E, rhs)));
-              }
-            }
-            return true;
-          }
-        case OldExpr oldExpr: {
-            var e = oldExpr;
-            return TrSplitExpr(e.E, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran.OldAt(e.AtLabel));
-          }
-        case FunctionCallExpr callExpr when position: {
-            var fexp = callExpr;
-            if (TrSplitFunctionCallExpr(callExpr, splits, heightLimit, inlineProtectedFunctions, apply_induction, etran, fexp)) {
-              return true;
-            }
-
-            break;
-          }
-        case QuantifierExpr quantifierExpr when quantifierExpr.SplitQuantifier != null:
-          return TrSplitExpr(quantifierExpr.SplitQuantifierExpression, splits, position, heightLimit, inlineProtectedFunctions, apply_induction, etran);
-        default: {
-            if (((position && expr is ForallExpr) || (!position && expr is ExistsExpr))) {
-              var e = (QuantifierExpr)expr;
-              var inductionVariables = ApplyInduction(e.BoundVars, e.Attributes);
-              if (apply_induction && inductionVariables.Count != 0) {
-                // From the given quantifier (forall n :: P(n)), generate the seemingly weaker proof obligation
-                //   (forall n :: (forall k :: k < n ==> P(k)) ==> P(n))
-                // For an existential (exists n :: P(n)), it is
-                //   (exists n :: (forall k :: k < n ==> !P(k)) && P(n))
-                //    ^^^^^^                             ^      ^^        <--- note these 3 differences
-                var kvars = new List<BoundVar>();
-                var kk = new List<Bpl.Expr>();
-                var nn = new List<Bpl.Expr>();
-                var toks = new List<IToken>();
-                var types = new List<Type>();
-                var substMap = new Dictionary<IVariable, Expression>();
-                foreach (var n in inductionVariables) {
-                  toks.Add(n.tok);
-                  types.Add(n.Type.NormalizeExpandKeepConstraints());
-                  BoundVar k = new BoundVar(n.tok, CurrentIdGenerator.FreshId(n.Name + "$ih#"), n.Type);
-                  kvars.Add(k);
-
-                  IdentifierExpr ieK = new IdentifierExpr(k.tok, k.AssignUniqueName(currentDeclaration.IdGenerator));
-                  ieK.Var = k; ieK.Type = ieK.Var.Type;  // resolve it here
-                  kk.Add(etran.TrExpr(ieK));
-
-                  IdentifierExpr ieN = new IdentifierExpr(n.tok, n.AssignUniqueName(currentDeclaration.IdGenerator));
-                  ieN.Var = n; ieN.Type = ieN.Var.Type;  // resolve it here
-                  nn.Add(etran.TrExpr(ieN));
-
-                  substMap.Add(n, ieK);
-                }
-                Expression bodyK = Substitute(e.LogicalBody(), null, substMap);
-                Bpl.Expr less = DecreasesCheck(toks, types, types, kk, nn, null, null, false, true);
-
-                Bpl.Expr ihBody = etran.TrExpr(bodyK);
-                if (!position) {
-                  ihBody = Bpl.Expr.Not(ihBody);
-                }
-                ihBody = Bpl.Expr.Imp(less, ihBody);
-                List<Variable> bvars = new List<Variable>();
-                Bpl.Expr typeAntecedent = etran.TrBoundVariables(kvars, bvars);  // no need to use allocation antecedent here, because the well-founded less-than ordering assures kk are allocated
-                Bpl.Expr ih;
-                var tr = TrTrigger(etran, e.Attributes, expr.tok, substMap);
-                ih = new Bpl.ForallExpr(expr.tok, bvars, tr, Bpl.Expr.Imp(typeAntecedent, ihBody));
-
-                // More precisely now:
-                //   (forall n :: n-has-expected-type && (forall k :: k < n ==> P(k)) && case0(n)   ==> P(n))
-                //   (forall n :: n-has-expected-type && (forall k :: k < n ==> P(k)) && case...(n) ==> P(n))
-                // or similar for existentials.
-                var caseProduct = new List<Bpl.Expr>() {
-                // make sure to include the correct token information (so, don't just use Bpl.Expr.True here)
-                new Bpl.LiteralExpr(TrSplitNeedsTokenAdjustment(expr) ? new ForceCheckToken(expr.tok) : expr.tok, true)
-              };
-                var i = 0;
-                foreach (var n in inductionVariables) {
-                  var newCases = new List<Bpl.Expr>();
-                  foreach (var kase in InductionCases(n.Type, nn[i], etran)) {
-                    foreach (var cs in caseProduct) {
-                      if (kase != Bpl.Expr.True) {  // if there's no case, don't add anything to the token
-                        newCases.Add(Bpl.Expr.Binary(new NestedToken(ToDafnyToken(cs.tok), ToDafnyToken(kase.tok)), Bpl.BinaryOperator.Opcode.And, cs, kase));
-                      } else {
-                        newCases.Add(cs);
-                      }
-                    }
-                  }
-                  caseProduct = newCases;
-                  i++;
-                }
-                List<bool> freeOfAlloc = ComprehensionExpr.BoundedPool.HasBounds(e.Bounds, ComprehensionExpr.BoundedPool.PoolVirtues.IndependentOfAlloc_or_ExplicitAlloc);
-                bvars = new List<Variable>();
-                typeAntecedent = etran.TrBoundVariables(e.BoundVars, bvars, false, freeOfAlloc);
-                foreach (var kase in caseProduct) {
-                  var ante = BplAnd(BplAnd(typeAntecedent, ih), kase);
-                  var etranBody = etran.LayerOffset(1);
-                  var bdy = etranBody.TrExpr(e.LogicalBody());
-                  Bpl.Expr q;
-                  var trig = TrTrigger(etranBody, e.Attributes, expr.tok);
-                  if (position) {
-                    q = new Bpl.ForallExpr(kase.tok, bvars, trig, Bpl.Expr.Imp(ante, bdy));
-                  } else {
-                    q = new Bpl.ExistsExpr(kase.tok, bvars, trig, Bpl.Expr.And(ante, bdy));
-                  }
-                  splits.Add(new SplitExprInfo(SplitExprInfo.K.Checked, q));
-                }
-
-                // Finally, assume the original quantifier (forall/exists n :: P(n))
-                splits.Add(new SplitExprInfo(SplitExprInfo.K.Free, etran.TrExpr(expr)));
-                return true;
-              } else {
-                // Don't use induction on these quantifiers.
-                // Nevertheless, produce two translated versions of the quantifier, one that uses #2 functions (that is, layerOffset 1)
-                // for checking and one that uses #1 functions (that is, layerOffset 0) for assuming.
-                var etranBoost = etran.LayerOffset(1);
-                var r = etranBoost.TrExpr(expr);
-                var needsTokenAdjustment = TrSplitNeedsTokenAdjustment(expr);
-                if (needsTokenAdjustment) {
-                  r.tok = new ForceCheckToken(expr.tok);
-                }
-                if (etranBoost.Statistics_CustomLayerFunctionCount == 0) {
-                  // apparently, the LayerOffset(1) we did had no effect
-                  splits.Add(new SplitExprInfo(SplitExprInfo.K.Both, r));
-                  return needsTokenAdjustment;
-                } else {
-                  splits.Add(new SplitExprInfo(SplitExprInfo.K.Checked, r));  // check the boosted expression
-                  splits.Add(new SplitExprInfo(SplitExprInfo.K.Free, etran.TrExpr(expr)));  // assume the ordinary expression
-                  return true;
-                }
-              }
-            } else if (((position && expr is ExistsExpr) || (!position && expr is ForallExpr))) {
-              // produce two translated versions of the quantifier, one that uses #1 functions (that is, layerOffset 0)
-              // for checking and one that uses #2 functions (that is, layerOffset 1) for assuming.
-              adjustFuelForExists = false; // based on the above comment, we use the etran with correct fuel amount already. No need to adjust anymore.
-              var etranBoost = etran.LayerOffset(1);
-              var r = etran.TrExpr(expr);
-              var needsTokenAdjustment = TrSplitNeedsTokenAdjustment(expr);
-              if (needsTokenAdjustment) {
-                r.tok = new ForceCheckToken(expr.tok);
-              }
-              if (etran.Statistics_CustomLayerFunctionCount == 0) {
-                // apparently, doesn't use layer
-                splits.Add(new SplitExprInfo(SplitExprInfo.K.Both, r));
-                return needsTokenAdjustment;
-              } else {
-                splits.Add(new SplitExprInfo(SplitExprInfo.K.Checked, r));  // check the ordinary expression
-                splits.Add(new SplitExprInfo(SplitExprInfo.K.Free, etranBoost.TrExpr(expr)));  // assume the boosted expression
-                return true;
-              }
-            }
-
-            break;
-          }
-      }
-
-      Bpl.Expr translatedExpression;
-      bool splitHappened;
-      if ((position && expr is ExistsExpr) || (!position && expr is ForallExpr)) {
-        translatedExpression = etran.TrExpr(expr);
-        splitHappened = false;
-      } else {
-        etran = etran.LayerOffset(1);
-        translatedExpression = etran.TrExpr(expr);
-        splitHappened = etran.Statistics_CustomLayerFunctionCount != 0;  // return true if the LayerOffset(1) came into play
-      }
-      if (TrSplitNeedsTokenAdjustment(expr)) {
-        translatedExpression.tok = new ForceCheckToken(expr.tok);
-        splitHappened = true;
-      }
-      splits.Add(new SplitExprInfo(SplitExprInfo.K.Both, translatedExpression));
-      return splitHappened;
-    }
-
-    private bool TrSplitFunctionCallExpr(Expression expr, List<SplitExprInfo> splits, int heightLimit, bool inlineProtectedFunctions,
-      bool apply_induction, ExpressionTranslator etran, FunctionCallExpr fexp) {
-      var f = fexp.Function;
-      Contract.Assert(f != null); // filled in during resolution
-      var module = f.EnclosingClass.EnclosingModuleDefinition;
-      var functionHeight = module.CallGraph.GetSCCRepresentativePredecessorCount(f);
-
-      if (functionHeight < heightLimit && f.Body != null && RevealedInScope(f)) {
-        if (RefinementToken.IsInherited(fexp.tok, currentModule) &&
-            f is Predicate && ((Predicate)f).BodyOrigin == Predicate.BodyOriginKind.DelayedDefinition &&
-            (codeContext == null || !codeContext.MustReverify)) {
-          // The function was inherited as body-less but is now given a body. Don't inline the body (since, apparently, everything
-          // that needed to be proved about the function was proved already in the previous module, even without the body definition).
-        } else if (!FunctionBodyIsAvailable(f, currentModule, currentScope, inlineProtectedFunctions)) {
-          // Don't inline opaque functions
-        } else if (Attributes.Contains(f.Attributes, "no_inline")) {
-          // User manually prevented inlining
-        } else {
-          // Produce, for a "body" split into b0, b1, b2:
-          //     checked F#canCall(args) ==> F(args) || b0
-          //     checked F#canCall(args) ==> F(args) || b1
-          //     checked F#canCall(args) ==> F(args) || b2
-          //     free F#canCall(args) && F(args) && (b0 && b1 && b2)
-          // For "inCoContext", split into:
-          //     checked F#canCall(args) ==> F'(args) || b0''
-          //     checked F#canCall(args) ==> F'(args) || b1''
-          //     checked F#canCall(args) ==> F'(args) || b2''
-          //     free F#canCall(args) && F'(args)
-          // where the primes indicate certificate translations.
-          // The checked conjuncts of the body make use of the type-specialized body.
-
-          // F#canCall(args)
-          Bpl.IdentifierExpr canCallFuncID = new Bpl.IdentifierExpr(expr.tok, f.FullSanitizedName + "#canCall", Bpl.Type.Bool);
-          List<Bpl.Expr> args = etran.FunctionInvocationArguments(fexp, null, null);
-          Bpl.Expr canCall = new Bpl.NAryExpr(GetToken(expr), new Bpl.FunctionCall(canCallFuncID), args);
-
-          Bpl.Expr fargs;
-          // F(args)
-          fargs = etran.TrExpr(fexp);
-
-          if (!CanSafelyInline(fexp, f)) {
-            // Skip inlining, as it would cause arbitrary expressions to pop up in the trigger
-            // TODO this should appear at the outmost call site, not at the innermost. See SnapshotableTrees.dfy
-            reporter.Info(MessageSource.Translator, fexp.tok, "Some instances of this call are not inlined.");
-            // F#canCall(args) ==> F(args)
-            var p = Bpl.Expr.Binary(fargs.tok, BinaryOperator.Opcode.Imp, canCall, fargs);
-            splits.Add(new SplitExprInfo(SplitExprInfo.K.Checked, p));
-            // F#canCall(args) && F(args)
-            var fr = Bpl.Expr.And(canCall, fargs);
-            splits.Add(new SplitExprInfo(SplitExprInfo.K.Free, fr));
-          } else {
-            // inline this body
-            var typeSpecializedBody = GetSubstitutedBody(fexp, f);
-            var typeSpecializedResultType = f.ResultType.Subst(fexp.GetTypeArgumentSubstitutions());
-
-            // recurse on body
-            var ss = new List<SplitExprInfo>();
-            TrSplitExpr(typeSpecializedBody, ss, true, functionHeight, inlineProtectedFunctions, apply_induction, etran);
-            var needsTokenAdjust = TrSplitNeedsTokenAdjustment(typeSpecializedBody);
-            foreach (var s in ss) {
-              if (s.IsChecked) {
-                var unboxedConjunct = CondApplyUnbox(s.E.tok, s.E, typeSpecializedResultType, expr.Type);
-                var bodyOrConjunct = Bpl.Expr.Or(fargs, unboxedConjunct);
-                var tok = needsTokenAdjust
-                  ? (IToken)new ForceCheckToken(typeSpecializedBody.tok)
-                  : (IToken)new NestedToken(GetToken(fexp), s.Tok);
-                var p = Bpl.Expr.Binary(tok, BinaryOperator.Opcode.Imp, canCall, bodyOrConjunct);
-                splits.Add(new SplitExprInfo(SplitExprInfo.K.Checked, p));
-              }
-            }
-
-            // allocatedness for arguments to the inlined call in body
-            if (typeSpecializedBody is FunctionCallExpr) {
-              FunctionCallExpr e = (FunctionCallExpr)typeSpecializedBody;
-              for (int i = 0; i < e.Args.Count; i++) {
-                Expression ee = e.Args[i];
-                Type t = e.Function.Formals[i].Type;
-                Expr tr_ee = etran.TrExpr(ee);
-                Bpl.Expr wh = GetWhereClause(e.tok, tr_ee, cce.NonNull(ee.Type), etran, NOALLOC);
-                if (wh != null) {
-                  fargs = Bpl.Expr.And(fargs, wh);
-                }
-              }
-            }
-
-            // body
-            var trBody = etran.TrExpr(typeSpecializedBody);
-            trBody = CondApplyUnbox(trBody.tok, trBody, typeSpecializedResultType, expr.Type);
-            // F#canCall(args) && F(args) && (b0 && b1 && b2)
-            var fr = Bpl.Expr.And(canCall, BplAnd(fargs, trBody));
-            splits.Add(new SplitExprInfo(SplitExprInfo.K.Free, fr));
-          }
-
-          return true;
-        }
-      }
-      return false;
-    }
-
-    private bool CanSafelyInline(FunctionCallExpr fexp, Function f) {
-      var visitor = new TriggersExplorer();
-      if (f.Body != null) {
-        var body = f.Body;
-        if (f is PrefixPredicate pp) {
-          body = PrefixSubstitution(pp, body);
-        }
-        visitor.Visit(body);
-      }
-      return
-        !triggersCollector.IsTriggerKiller(fexp.Receiver) &&
-        Enumerable.Zip(f.Formals, fexp.Args).All(formal_concrete => CanSafelySubstitute(visitor.TriggerVariables, formal_concrete.Item1, formal_concrete.Item2));
-    }
-
-    // Using an empty set of old expressions is ok here; the only uses of the triggersCollector will be to check for trigger killers.
-    Triggers.TriggersCollector triggersCollector;
-
-    private bool CanSafelySubstitute(ISet<IVariable> protectedVariables, IVariable variable, Expression substitution) {
-      return !(protectedVariables.Contains(variable) && triggersCollector.IsTriggerKiller(substitution));
-    }
-
-    private class VariablesCollector : BottomUpVisitor {
-      internal ISet<IVariable> variables;
-
-      internal VariablesCollector() {
-        this.variables = new HashSet<IVariable>();
-      }
-
-      protected override void VisitOneExpr(Expression expr) {
-        if (expr is IdentifierExpr) {
-          variables.Add((expr as IdentifierExpr).Var);
-        }
-      }
-    }
-
-    private class TriggersExplorer : BottomUpVisitor {
-      private readonly VariablesCollector collector;
-
-      internal ISet<IVariable> TriggerVariables => collector.variables;
-
-      internal TriggersExplorer() {
-        collector = new VariablesCollector();
-      }
-
-      protected override void VisitOneExpr(Expression expr) {
-        if (expr is QuantifierExpr quantifierExpr && quantifierExpr.SplitQuantifier == null) {
-          foreach (var trigger in quantifierExpr.Attributes.AsEnumerable().Where(a => a.Name == "trigger").SelectMany(a => a.Args)) {
-            collector.Visit(trigger);
-          }
-        }
-      }
-    }
-
-    private Expression GetSubstitutedBody(FunctionCallExpr fexp, Function f) {
-      Contract.Requires(fexp != null);
-      Contract.Requires(f != null);
-      var substMap = new Dictionary<IVariable, Expression>();
-      Contract.Assert(fexp.Args.Count == f.Formals.Count);
-      for (int i = 0; i < f.Formals.Count; i++) {
-        Formal p = f.Formals[i];
-        var formalType = p.Type.Subst(fexp.GetTypeArgumentSubstitutions());
-        Expression arg = fexp.Args[i];
-        arg = new BoxingCastExpr(arg, cce.NonNull(arg.Type), formalType);
-        arg.Type = formalType;  // resolve here
-        substMap.Add(p, arg);
-      }
-      var body = f.Body;
-      if (f is PrefixPredicate) {
-        var pp = (PrefixPredicate)f;
-        body = PrefixSubstitution(pp, body);
-      }
-      body = Substitute(body, fexp.Receiver, substMap, fexp.GetTypeArgumentSubstitutions(), fexp.AtLabel);
-      return body;
-    }
-
-    bool TrSplitNeedsTokenAdjustment(Expression expr) {
-      Contract.Requires(expr != null);
-      return RefinementToken.IsInherited(expr.tok, currentModule) && (codeContext == null || !codeContext.MustReverify) && RefinementTransformer.ContainsChange(expr, currentModule);
-    }
-
-    /// <summary>
-    /// Return a list of variables specified by the arguments of :_induction in "attributes", if any.
-    /// If an argument of :_induction is a ThisExpr, "null" is returned as the corresponding variable.
-    /// </summary>
-    List<VarType/*?*/> ApplyInduction<VarType>(List<VarType> boundVars, Attributes attributes) where VarType : class, IVariable {
-      Contract.Requires(boundVars != null);
-      Contract.Ensures(Contract.Result<List<VarType>>() != null);
-
-      var args = Attributes.FindExpressions(attributes, "_induction");
-      if (args == null) {
-        return new List<VarType>();  // don't apply induction
-      } else {
-        return args.ConvertAll(e => e is ThisExpr ? null : (VarType)((IdentifierExpr)e).Var);
-      }
-    }
-
-    IEnumerable<Bpl.Expr> InductionCases(Type ty, Bpl.Expr expr, ExpressionTranslator etran) {
-      ty = ty.NormalizeExpand();
-      IndDatatypeDecl dt = ty.AsIndDatatype;
-      if (dt == null) {
-        yield return Bpl.Expr.True;
-      } else {
-        UserDefinedType instantiatedType = (UserDefinedType)ty;  // correctness of cast follows from the non-null return of ty.AsDatatype
-        var subst = new Dictionary<TypeParameter, Type>();
-        for (int i = 0; i < dt.TypeArgs.Count; i++) {
-          subst.Add(dt.TypeArgs[i], instantiatedType.TypeArgs[i]);
-        }
-
-        foreach (DatatypeCtor ctor in dt.Ctors) {
-          List<Variable> bvs;
-          List<Bpl.Expr> args;
-          CreateBoundVariables(ctor.Formals, out bvs, out args);
-          Bpl.Expr ct = FunctionCall(ctor.tok, ctor.FullName, predef.DatatypeType, args);
-          // (exists args :: args-have-the-expected-types && ct(args) == expr)
-          Bpl.Expr q = Bpl.Expr.Binary(ctor.tok, BinaryOperator.Opcode.Eq, ct, expr);
-          if (bvs.Count != 0) {
-            int i = 0;
-            Bpl.Expr typeAntecedent = Bpl.Expr.True;
-            foreach (Formal arg in ctor.Formals) {
-              var instantiatedArgType = arg.Type.Subst(subst);
-              Bpl.Expr wh = GetWhereClause(arg.tok, CondApplyUnbox(arg.tok, args[i], arg.Type, instantiatedArgType), instantiatedArgType, etran, NOALLOC);
-              if (wh != null) {
-                typeAntecedent = BplAnd(typeAntecedent, wh);
-              }
-              i++;
-            }
-            var trigger = BplTrigger(ct);  // this is probably never used, because this quantifier is not expected ever to appear in a context where it needs to be instantiated
-            q = new Bpl.ExistsExpr(ctor.tok, bvs, trigger, BplAnd(typeAntecedent, q));
-          }
-          yield return q;
-        }
-      }
-    }
-
-    // No expression introduces a type variable
-    static void ComputeFreeTypeVariables(Expression expr, ISet<TypeParameter> fvs) {
-      ComputeFreeTypeVariables(expr.Type, fvs);
-      expr.ComponentTypes.ForEach(ty => ComputeFreeTypeVariables((Type)ty, fvs));
-      expr.SubExpressions.ForEach(ee => ComputeFreeTypeVariables(ee, fvs));
-    }
-
-    static void ComputeFreeTypeVariables(Type ty, ISet<TypeParameter> fvs) {
-      // Add type parameters
-      var tp = ty.AsTypeParameter;
-      if (tp != null) {
-        Contract.Assert(ty.TypeArgs.Count == 0);
-        fvs.Add(tp);
-      } else {
-        ty.NormalizeExpandKeepConstraints().TypeArgs.ForEach(tt => ComputeFreeTypeVariables(tt, fvs));
-      }
-    }
-
-    static void ComputeFreeTypeVariables_All(Type ty, ISet<TypeParameter> fvs) {
-      // Add type parameters
-      if (ty.IsTypeParameter) {
-        fvs.Add(ty.AsTypeParameter);
-      }
-      ty.NormalizeExpandKeepConstraints().TypeArgs.ForEach(tt => ComputeFreeTypeVariables_All(tt, fvs));
-    }
-
-    public bool UsesHeap(Expression expr) {
-      UsesHeapVisitor visitor = new UsesHeapVisitor();
-      visitor.Visit(expr);
-      if (visitor.foundHeap) {
-        return true;
-      }
-      bool usesHeap = false, usesOldHeap = false;
-      var FVsHeapAt = new HashSet<Label>();
-      Type usesThis = null;
-      FreeVariablesUtil.ComputeFreeVariables(options, expr, new HashSet<IVariable>(), ref usesHeap, ref usesOldHeap, FVsHeapAt, ref usesThis, false);
-      return usesHeap || usesOldHeap || FVsHeapAt.Count != 0;
-    }
-
-    class UsesHeapVisitor : BottomUpVisitor {
-      internal bool foundHeap = false;
-      Type usesThis = null;
-      protected override void VisitOneExpr(Expression expr) {
-        LetExpr letExpr = expr as LetExpr;
-        if (letExpr != null && !letExpr.Exact) {
-          foundHeap = true; // see comment in LetSuchThatExprInfo: "UsesHeap = true;  // note, we ignore "usesHeap" and always record it as "true", because various type antecedents need access to the heap (hopefully, this is okay in the contexts in which the let-such-that expression is used)"
-        }
-        FunctionCallExpr call = expr as FunctionCallExpr;
-        if (call != null && call.Function != null && call.Function.ReadsHeap) {
-          foundHeap = true;
-        }
-        if (expr is ApplyExpr || expr is SeqConstructionExpr) {
-          foundHeap = true;
-        }
-        ThisExpr thisExpr = expr as ThisExpr;
-        if (thisExpr != null && thisExpr.Type == null) { // this shouldn't happen, but there appears to be a bug in trait resolution (see TraitCompile.dfy); it causes ComputeFreeVariables to blow up
-          foundHeap = true;
-        } else if (thisExpr != null && usesThis != null && !thisExpr.Type.Equals(usesThis)) { // also causes ComputeFreeVariables to blow up (see TraitExample.dfy)
-          foundHeap = true;
-        } else if (thisExpr != null) {
-          usesThis = thisExpr.Type;
-        }
-      }
-    }
-
-    /// <summary>
-    /// Returns an expression like "expr", but where free occurrences of "v" have been replaced by "e".
-    /// </summary>
-    public static Expression Substitute(Expression expr, IVariable v, Expression e) {
-      Contract.Requires(expr != null);
-      Contract.Requires(v != null);
-      Contract.Requires(e != null);
-      Contract.Ensures(Contract.Result<Expression>() != null);
-      var substMap = new Dictionary<IVariable, Expression>();
-      substMap.Add(v, e);
-      return Substitute(expr, null, substMap);
-    }
-
-    public static Expression Substitute(Expression expr, Expression receiverReplacement, Dictionary<IVariable, Expression/*!*/>/*!*/ substMap,
-      Dictionary<TypeParameter, Type> typeMap = null, Label oldLabel = null) {
-      Contract.Requires(expr != null);
-      Contract.Requires(cce.NonNullDictionaryAndValues(substMap));
-      Contract.Ensures(Contract.Result<Expression>() != null);
-      var s = new Substituter(receiverReplacement, substMap, typeMap ?? new Dictionary<TypeParameter, Type>(), oldLabel);
-      return s.Substitute(expr);
-    }
-
-    public static Expression InlineLet(LetExpr letExpr) {
-      Contract.Requires(letExpr.LHSs.All(p => p.Var != null));
-      var substMap = new Dictionary<IVariable, Expression>();
-      for (var i = 0; i < letExpr.LHSs.Count; i++) {
-        substMap.Add(letExpr.LHSs[i].Var, letExpr.RHSs[i]);
-      }
-      return Translator.Substitute(letExpr.Body, null, substMap);
-    }
-
-    Bpl.Expr HeapSameOrSucc(Bpl.Expr oldHeap, Bpl.Expr newHeap) {
-      return Bpl.Expr.Or(
-        Bpl.Expr.Eq(oldHeap, newHeap),
-        FunctionCall(newHeap.tok, BuiltinFunction.HeapSucc, null, oldHeap, newHeap));
-    }
-    Bpl.Expr HeapSucc(Bpl.Expr oldHeap, Bpl.Expr newHeap, bool useGhostHeapSucc = false) {
-      return FunctionCall(newHeap.tok, useGhostHeapSucc ? BuiltinFunction.HeapSuccGhost : BuiltinFunction.HeapSucc, null, oldHeap, newHeap);
-    }
-
-    // Bpl-making-utilities
-
-    /// <summary>
-    /// Create a Boogie quantifier with body "A ==> body" and triggers "trg", but use only the subset of bound
-    /// variables from "varsAndAntecedents" that actually occur free in "body" or "trg", and "A" is the conjunction of
-    /// antecedents for those corresponding bound variables.  If none of the bound variables is used, "body"
-    /// is returned. Also, if none of the bound variables is used in "body" (whether or not they are used in "trg"),
-    /// then "body" is returned.
-    /// The order of the contents of "varsAndAntecedents" matters: For any index "i" into "varsAndAntecedents", the
-    /// antecedent varsAndAntecedents[i].Item2 may depend on a variable varsAndAntecedents[j].Item1 if "j GREATER-OR-EQUAL i"
-    /// but not if "j LESS i".
-    /// Caution: if "trg" is null, makes a forall without any triggers.
-    /// </summary>
-    static Bpl.Expr BplForallTrim(IEnumerable<Tuple<Bpl.Variable, Bpl.Expr/*?*/>> varsAndAntecedents, Bpl.Trigger trg, Bpl.Expr body) {
-      Contract.Requires(varsAndAntecedents != null);
-      Contract.Requires(body != null);
-
-      // We'd like to compute the free variables if "body" and "trg". It would be nice to use the Boogie
-      // routine Bpl.Expr.ComputeFreeVariables for this purpose. However, calling it requires the Boogie
-      // expression to be resolved. Instead, we do the cheesy thing of computing the set of names of
-      // free variables in "body" and "trg".
-      var vis = new VariableNameVisitor();
-      vis.Visit(body);
-      if (varsAndAntecedents.All(pair => !vis.Names.Contains(pair.Item1.Name))) {
-        // the body doesn't mention any of the bound variables, so no point in wrapping a quantifier around it
-        return body;
-      }
-      for (var tt = trg; tt != null; tt = tt.Next) {
-        tt.Tr.ForEach(ee => vis.Visit(ee));
-      }
-
-      var args = new List<Bpl.Variable>();
-      Bpl.Expr typeAntecedent = Bpl.Expr.True;
-      foreach (var pair in varsAndAntecedents) {
-        var bv = pair.Item1;
-        var wh = pair.Item2;
-        if (vis.Names.Contains(bv.Name)) {
-          args.Add(bv);
-          if (wh != null) {
-            typeAntecedent = BplAnd(typeAntecedent, wh);
-            vis.Visit(wh);  // this adds to "vis.Names" the free variables of "wh"
-          }
-        }
-      }
-      if (args.Count == 0) {
-        return body;
-      } else {
-        return new Bpl.ForallExpr(body.tok, args, trg, BplImp(typeAntecedent, body));
-      }
-    }
-    class VariableNameVisitor : Boogie.StandardVisitor {
-      public readonly HashSet<string> Names = new HashSet<string>();
-      public override Expr VisitIdentifierExpr(Bpl.IdentifierExpr node) {
-        Names.Add(node.Name);
-        return base.VisitIdentifierExpr(node);
-      }
-      public override BinderExpr VisitBinderExpr(BinderExpr node) {
-        var vis = new VariableNameVisitor();
-        vis.Visit(node.Body);
-        var dummyNames = new HashSet<string>(node.Dummies.Select(v => v.Name));
-        foreach (var nm in vis.Names) {
-          if (!dummyNames.Contains(nm)) {
-            Names.Add(nm);
-          }
-        }
-        return (BinderExpr)base.VisitBinderExpr(node);
-      }
-    }
-
-    List<Bpl.Variable> MkTyParamBinders(List<TypeParameter> args) {
-      return MkTyParamBinders(args, out _);
-    }
-
-    List<Bpl.Variable> MkTyParamBinders(List<TypeParameter> args, out List<Bpl.Expr> exprs) {
-      var vars = new List<Bpl.Variable>();
-      exprs = new List<Bpl.Expr>();
-      foreach (TypeParameter v in args) {
-        vars.Add(BplBoundVar(NameTypeParam(v), predef.Ty, out var e));
-        exprs.Add(e);
-      }
-      return vars;
-    }
-
-    // For incoming formals
-    List<Variable> MkTyParamFormals(List<TypeParameter> args, bool includeWhereClause, bool named = true) {
-      return MkTyParamFormals(args, out _, includeWhereClause, named);
-    }
-
-    // For incoming formals
-    List<Bpl.Variable> MkTyParamFormals(List<TypeParameter> args, out List<Bpl.Expr> exprs, bool includeWhereClause, bool named) {
-      var vars = new List<Bpl.Variable>();
-      exprs = new List<Bpl.Expr>();
-      foreach (TypeParameter v in args) {
-        var whereClause = includeWhereClause ? GetTyWhereClause(new Bpl.IdentifierExpr(v.tok, NameTypeParam(v), predef.Ty), v.Characteristics) : null;
-        vars.Add(BplFormalVar(named ? NameTypeParam(v) : null, predef.Ty, true, out var e, whereClause));
-        exprs.Add(e);
-      }
-      return vars;
-    }
-
-    public Bpl.Expr/*?*/ GetTyWhereClause(Bpl.Expr expr, TypeParameter.TypeParameterCharacteristics characteristics) {
-      Contract.Requires(expr != null);
-      if (characteristics.ContainsNoReferenceTypes) {
-        return FunctionCall(expr.tok, "$AlwaysAllocated", Bpl.Type.Bool, expr);
-      }
-      return null;
-    }
-
-    public static void MapM<A>(IEnumerable<A> xs, Action<A> K) {
-      Contract.Requires(xs != null);
-      Contract.Requires(K != null);
-      foreach (A x in xs) {
-        K(x);
-      }
-    }
-
-    static readonly List<Boolean> Bools = new List<Boolean> { false, true };
-
-    public Expr GetRevealConstant(Function f) {
-      this.CreateRevealableConstant(f);
-      return this.functionReveals[f];
-    }
-  }
-}
diff --git a/Source/DafnyCore/Verifier/Variables.cs b/Source/DafnyCore/Verifier/Variables.cs
new file mode 100644
index 00000000000..bd112bd9d83
--- /dev/null
+++ b/Source/DafnyCore/Verifier/Variables.cs
@@ -0,0 +1,9 @@
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+public class Variables : OrderedDictionary<string, Variable> {
+  public Variables() : base(v => v.Name) {
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyCore/bash.exe.stackdump b/Source/DafnyCore/bash.exe.stackdump
new file mode 100644
index 00000000000..ab93e0789e0
--- /dev/null
+++ b/Source/DafnyCore/bash.exe.stackdump
@@ -0,0 +1,52 @@
+Exception: STATUS_ACCESS_VIOLATION at rip=0002101729BC
+rax=0000000800000000 rbx=006D0069006D005C rcx=0000000000000007
+rdx=0000000000000009 rsi=0000000000000007 rdi=00000002102ADAE0
+r8 =000000080000CE78 r9 =FFFFFF978CD18691 r10=000000080000CE78
+r11=FEFEFEFEFEFEFEFF r12=0000000000000007 r13=000000080000C7D0
+r14=0000000000000003 r15=0000000800009228
+rbp=00000002102686E0 rsp=00000007FFFFC6B0
+program=C:\Users\mimayere\AppData\Local\Programs\Git\usr\bin\bash.exe, pid 2869, thread main
+cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
+Stack trace:
+Frame         Function      Args
+0002102686E0  0002101729BC (000000000000, 000000000000, 000000000000, B34B498AE1C5) msys-2.0.dll+0x1329BC
+000800008D00  00021017378B (0002102684E0, 000000000003, 000210173660, 00080000CC58) msys-2.0.dll+0x13378B
+000800008D00  00021021CE4F (000003E706FF, 0003000000FF, 6C4C8C2A00000006, 000000000000) msys-2.0.dll+0x1DCE4F
+000000000003  00021021CBCB (000000000000, 000210268500, 000210173590, 000000000E68) msys-2.0.dll+0x1DCBCB
+000000000003  000210058F8C (000800008D00, 000000000000, 0002100FBB76, 000800008D00) msys-2.0.dll+0x18F8C
+000000000003  000210059271 (000000000000, 0002100649F0, 0007FFFFC950, 0000000000FF) msys-2.0.dll+0x19271
+0007FFFFCAB0  0002100D0229 (000000000001, 0007FFFFCA3C, 000210214700, 000000000003) msys-2.0.dll+0x90229
+0007FFFFCAB0  0002101948DB (000000000001, 0007FFFFCA3C, 000210214700, 000000000003) msys-2.0.dll+0x1548DB
+0007FFFFCAB0  00010040EC29 (0007FFFFCAB0, 000000000050, FFFFFFFFFFFF978C, 000000000005) bash.exe+0xEC29
+0007FFFFCAB0  0001004E9A70 (000A00000460, 000A00000160, 000000000164, 000000000000) bash.exe+0xE9A70
+0007FFFFCD30  000210047F11 (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x7F11
+000000000000  000210045AC3 (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x5AC3
+0007FFFFFFF0  000210045B74 (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x5B74
+End of stack trace
+Loaded modules:
+000100400000 bash.exe
+7FFF0BD10000 ntdll.dll
+7FFF0AA50000 KERNEL32.DLL
+7FFF09780000 KERNELBASE.dll
+7FFF0B320000 USER32.dll
+000210040000 msys-2.0.dll
+7FFF09A80000 win32u.dll
+7FFF0B150000 GDI32.dll
+7FFF09520000 gdi32full.dll
+7FFF096E0000 msvcp_win.dll
+7FFF09C40000 ucrtbase.dll
+7FFF0B0A0000 advapi32.dll
+7FFF0AB20000 msvcrt.dll
+7FFF0B530000 sechost.dll
+7FFF0B180000 RPCRT4.dll
+7FFF09640000 bcrypt.dll
+7FFF08BB0000 CRYPTBASE.DLL
+7FFF09AB0000 bcryptPrimitives.dll
+7FFF0ABC0000 IMM32.DLL
+000000B40000 umppc18511.dll
+7FFF08720000 iphlpapi.dll
+7FFF08760000 DNSAPI.dll
+7FFF0ABF0000 NSI.dll
+7FFF01E30000 dhcpcsvc6.DLL
+7FFF01B60000 dhcpcsvc.DLL
+7FFF02230000 WINNSI.DLL
diff --git a/Source/DafnyCore/dfyconfig.toml b/Source/DafnyCore/dfyconfig.toml
new file mode 100644
index 00000000000..afc7fafcc55
--- /dev/null
+++ b/Source/DafnyCore/dfyconfig.toml
@@ -0,0 +1,5 @@
+includes = ["Backends/**/*.dfy","AST/Formatting.dfy"]
+excludes = []
+
+[options]
+standard-libraries=true
diff --git a/Source/DafnyDriver.Test/DafnyDriver.Test.csproj b/Source/DafnyDriver.Test/DafnyDriver.Test.csproj
index ddb68962778..670c6f2ec65 100644
--- a/Source/DafnyDriver.Test/DafnyDriver.Test.csproj
+++ b/Source/DafnyDriver.Test/DafnyDriver.Test.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -9,10 +8,12 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
         <PackageReference Include="OmniSharp.Extensions.JsonRpc" Version="0.19.5" />
         <PackageReference Include="OmniSharp.Extensions.LanguageProtocol" Version="0.19.5" />
         <PackageReference Include="xunit" Version="2.4.2" />
+        <PackageReference Include="Xunit.AssertMessages" Version="2.4.0" />
         <PackageReference Include="xunit.extensibility.core" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Source/DafnyDriver.Test/FormatterCommandTest.cs b/Source/DafnyDriver.Test/FormatterCommandTest.cs
new file mode 100644
index 00000000000..f1f0a7c71e2
--- /dev/null
+++ b/Source/DafnyDriver.Test/FormatterCommandTest.cs
@@ -0,0 +1,65 @@
+using System.Diagnostics;
+using System.IO.Pipelines;
+using System.Reactive.Concurrency;
+using System.Reflection;
+using System.Text;
+using Microsoft.Dafny;
+using Microsoft.Extensions.Logging.Abstractions;
+using OmniSharp.Extensions.JsonRpc;
+using OmniSharp.Extensions.JsonRpc.Client;
+using OmniSharp.Extensions.JsonRpc.Serialization;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace DafnyDriver.Test;
+
+public class FormatterCommandTest {
+  [Fact]
+  public async Task GitIssueVSCode452FormattingWorksOnBigFiles() {
+    // We write to a temporary file
+    var oneSource = (int i) => $@"function Test{i}(x: int): int
+// This returns {i} if x is greater than 20
+{{
+  if x < 10 then
+                  0
+                  else if x < 20 then
+                                       1
+                                          else {i}
+}}
+
+";
+
+    var oneSourceFormatted = (int i) => $@"function Test{i}(x: int): int
+  // This returns {i} if x is greater than 20
+{{
+  if x < 10 then
+    0
+  else if x < 20 then
+    1
+  else {i}
+}}
+
+";
+    var source = "";
+    var sourceFormatted = "";
+    for (var i = 0; i < 1000; i++) {
+      source += oneSource(i);
+      sourceFormatted += oneSourceFormatted(i);
+    }
+
+    var file = Path.GetTempFileName() + ".dfy";
+
+    await File.WriteAllTextAsync(file, source);
+    StringWriter strWriter = new StringWriter();
+    var options = DafnyOptions.CreateUsingOldParser(strWriter, null,
+      file
+      );
+
+    var exitValue = await FormatCommand.DoFormatting(options);
+    Assert.Equal(0, (int)exitValue);
+
+    var result = await File.ReadAllTextAsync(file);
+    Assert.Equal(sourceFormatted, result);
+    File.Delete(file);
+  }
+}
diff --git a/Source/DafnyDriver.Test/LanguageServerProcessTest.cs b/Source/DafnyDriver.Test/LanguageServerProcessTest.cs
new file mode 100644
index 00000000000..a180c2401a2
--- /dev/null
+++ b/Source/DafnyDriver.Test/LanguageServerProcessTest.cs
@@ -0,0 +1,221 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using System.Collections.Generic;
+using System.IO.Pipelines;
+using System.Linq;
+using System.Reactive.Concurrency;
+using System.Text;
+using System.Text.Json;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.Logging.Abstractions;
+using OmniSharp.Extensions.JsonRpc;
+using OmniSharp.Extensions.JsonRpc.Client;
+using OmniSharp.Extensions.JsonRpc.Serialization;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Xunit;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Various {
+
+  [Collection("Sequential Collection")] // Let slow tests run sequentially
+  public class LanguageServerProcessTest {
+
+    [Fact]
+    public async Task InitialisationWorks() {
+
+      var process = StartLanguageServer();
+      var initializeMessage = await GetLspInitializeMessage(process.Id);
+      await process.StandardInput.WriteAsync(initializeMessage);
+
+      var initializedResponseFirstLine = await process.StandardOutput.ReadLineAsync();
+      Assert.False(string.IsNullOrEmpty(initializedResponseFirstLine));
+      process.Kill();
+      await process.WaitForExitAsync();
+    }
+
+    private Process StartLanguageServer() {
+      var serverBinary = Path.Join(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "DafnyDriver.dll");
+
+      var processInfo = new ProcessStartInfo("dotnet") {
+        RedirectStandardOutput = true,
+        RedirectStandardError = true,
+        RedirectStandardInput = true,
+        UseShellExecute = false,
+        ArgumentList = { serverBinary, "server" }
+      };
+
+      return Process.Start(processInfo)!;
+    }
+
+    [Fact]
+    public async Task LanguageServerStaysAliveIfParentDiesButNoParentIdWasProvided() {
+      var process = await StartLanguageServerRunnerProcess();
+
+      var languageServerProcessId = await process.StandardOutput.ReadLineAsync();
+      Assert.NotNull(languageServerProcessId);
+
+      await Task.Delay(1000); // Give the process some time to die
+      var initializeMessage = await GetLspInitializeMessage(null);
+      await process.StandardInput.WriteAsync(initializeMessage);
+
+      var initializedResponseFirstLine = await process.StandardOutput.ReadLineAsync();
+      Assert.False(string.IsNullOrEmpty(initializedResponseFirstLine));
+
+      await process.WaitForExitAsync();
+
+      await Task.Delay(100); // Give the process some time to die
+
+      Assert.False(string.IsNullOrEmpty(initializedResponseFirstLine));
+      try {
+        var languageServer = Process.GetProcessById(int.Parse(languageServerProcessId));
+        languageServer.Kill();
+      } catch (ArgumentException) {
+        Assert.Fail("Language server should not have killed itself if it doesn't know the parent.");
+      }
+    }
+
+    [Fact(Timeout = 20_000)]
+    public async Task LanguageServerShutsDownIfParentDies() {
+      var process = await StartLanguageServerRunnerProcess();
+
+      var languageServerProcessId = await process.StandardOutput.ReadLineAsync();
+
+      var initializeMessage = await GetLspInitializeMessage(process.Id);
+      await process.StandardInput.WriteAsync(initializeMessage);
+
+      var initializedResponseFirstLine = await process.StandardOutput.ReadLineAsync();
+      Assert.False(string.IsNullOrEmpty(initializedResponseFirstLine));
+
+      var error = await process.StandardError.ReadToEndAsync();
+      var didExit = process.WaitForExit(-1);
+      Assert.True(didExit);
+      Assert.NotNull(languageServerProcessId);
+      Assert.True(string.IsNullOrEmpty(error), error);
+
+      // Wait for the language server to kill itself by waiting until it closes the output stream.
+      await process.StandardOutput.ReadToEndAsync();
+
+      for (int attempts = 0; attempts < 500; attempts++) {
+        // Give the language server time to kill itself
+        await Task.Delay(10);
+
+        try {
+          Process.GetProcessById(int.Parse(languageServerProcessId));
+        } catch {
+          return;
+        }
+      }
+
+      var languageServer = Process.GetProcessById(int.Parse(languageServerProcessId));
+      languageServer.Kill();
+      Assert.Fail("Language server should have killed itself if the parent is gone.");
+    }
+
+    private static async Task<Process> StartLanguageServerRunnerProcess() {
+      var serverBinary = Path.Join(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "DafnyDriver.dll");
+      var languageServerRunnerPath = await CreateDotNetDllThatStartsGivenFilepath(serverBinary.Replace(@"\", @"\\"));
+
+      var processInfo = new ProcessStartInfo("dotnet", languageServerRunnerPath) {
+        RedirectStandardOutput = true,
+        RedirectStandardError = true,
+        RedirectStandardInput = true,
+        UseShellExecute = false,
+      };
+      return Process.Start(processInfo)!;
+    }
+
+    class AlwaysOutputFilter : IOutputFilter {
+      public bool ShouldOutput(object value) => true;
+    }
+
+    private static async Task<string> GetLspInitializeMessage(int? processId) {
+      var buffer = new MemoryStream();
+      OutputHandler outputHandler = new OutputHandler(PipeWriter.Create(buffer), new JsonRpcSerializer(),
+        new List<IOutputFilter> { new AlwaysOutputFilter() },
+        TaskPoolScheduler.Default, new NullLogger<OutputHandler>());
+      outputHandler.Send(new OutgoingRequest {
+        Id = 1,
+        Method = "initialize",
+        Params = new InitializeParams {
+          ProcessId = processId,
+          ClientInfo = new ClientInfo(),
+          Capabilities = new ClientCapabilities(),
+        }
+      });
+      await outputHandler.StopAsync();
+      return Encoding.ASCII.GetString(buffer.ToArray());
+    }
+
+    /// <summary>
+    /// This method creates a binary and returns the path to that binary.
+    /// Running the binary mimics the situation in which an IDE starts the Dafny language server and then dies.
+    /// 
+    /// The reason we create this binary at runtime instead of compile time is to prevent having to add
+    /// another .NET project to the Dafny solution, which incurs a build time overhead.
+    /// The downside if this choice is that we have to define the source code of our binary in a string literal,
+    /// which makes it harder to develop.
+    /// </summary>
+    private static async Task<string> CreateDotNetDllThatStartsGivenFilepath(string filePathToStart) {
+      var code = @$"using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+
+public class ShortLivedProcessStarter {{
+  public static async Task<int> Main(string[] args) {{
+    var processInfo = new ProcessStartInfo(""dotnet"") {{
+      // Prevents keeping stdio open after the outer process closes. 
+      RedirectStandardOutput = true,
+      RedirectStandardError = true,
+      UseShellExecute = false,
+      ArgumentList = {{ ""{filePathToStart}"", ""server"" }}
+    }};
+    using var process = Process.Start(processInfo)!;
+    await Console.Out.WriteLineAsync(process.Id.ToString());
+    var firstLine = await process.StandardOutput.ReadLineAsync();
+    await Console.Out.WriteLineAsync(firstLine);
+    return 0;
+  }}
+}}";
+      var temp = Path.GetTempFileName();
+      var compilation = CSharpCompilation.Create("tempAssembly");
+      var standardLibraries = new List<string>()
+      {
+        "System.Runtime",
+        "System.Console",
+        "System.Diagnostics.Process",
+        "System.ComponentModel.Primitives"
+      };
+      compilation = compilation.AddReferences(standardLibraries.Select(fileName =>
+            MetadataReference.CreateFromFile(Assembly.Load(fileName).Location)))
+        .AddReferences(
+            MetadataReference.CreateFromFile(typeof(object).GetTypeInfo().Assembly.Location),
+            MetadataReference.CreateFromFile(Assembly.Load("mscorlib").Location))
+        .WithOptions(new CSharpCompilationOptions(OutputKind.ConsoleApplication));
+      var syntaxTree = CSharpSyntaxTree.ParseText(code);
+      compilation = compilation.AddSyntaxTrees(syntaxTree);
+      var assemblyPath = $"{temp}.dll";
+      var result = compilation.Emit(assemblyPath);
+
+      var configuration = JsonSerializer.Serialize(
+        new {
+          runtimeOptions = new {
+            tfm = "net8.0",
+            framework = new {
+              name = "Microsoft.NETCore.App",
+              version = "8.0.0",
+              rollForward = "LatestMinor"
+            }
+          }
+        }, new JsonSerializerOptions() { WriteIndented = true });
+      await File.WriteAllTextAsync(temp + ".runtimeconfig.json", configuration + Environment.NewLine);
+
+      Assert.True(result.Success, string.Join("\n", result.Diagnostics.Select(d => d.ToString())));
+      return assemblyPath;
+    }
+  }
+}
diff --git a/Source/DafnyDriver.Test/ServerCommandTest.cs b/Source/DafnyDriver.Test/ServerCommandTest.cs
index 0023fe5adc4..99ea8514a3e 100644
--- a/Source/DafnyDriver.Test/ServerCommandTest.cs
+++ b/Source/DafnyDriver.Test/ServerCommandTest.cs
@@ -9,6 +9,7 @@
 using OmniSharp.Extensions.JsonRpc.Serialization;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using XunitAssertMessages;
 
 namespace DafnyDriver.Test;
 
@@ -21,7 +22,7 @@ public async Task InitialisationWorks() {
     await process.StandardInput.WriteAsync(initializeMessage);
 
     var initializedResponseFirstLine = await process.StandardOutput.ReadLineAsync();
-    Assert.False(string.IsNullOrEmpty(initializedResponseFirstLine));
+    AssertM.False(string.IsNullOrEmpty(initializedResponseFirstLine), initializedResponseFirstLine);
     process.Kill();
     await process.WaitForExitAsync();
   }
diff --git a/Source/DafnyDriver.Test/coverlet.runsettings b/Source/DafnyDriver.Test/coverlet.runsettings
new file mode 100644
index 00000000000..11c8afc63f8
--- /dev/null
+++ b/Source/DafnyDriver.Test/coverlet.runsettings
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat Code Coverage">
+        <Configuration>
+          <Exclude>[*]DAST.*,[*]DCOMP.*</Exclude>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
diff --git a/Source/DafnyDriver/CSVTestLogger.cs b/Source/DafnyDriver/CSVTestLogger.cs
index 6db93b18fb1..11d89173794 100644
--- a/Source/DafnyDriver/CSVTestLogger.cs
+++ b/Source/DafnyDriver/CSVTestLogger.cs
@@ -12,7 +12,7 @@ public class CSVTestLogger : ITestLoggerWithParameters {
 
     private readonly ConcurrentBag<TestResult> results = new();
     private TextWriter writer;
-    private TextWriter logWriter;
+    private readonly TextWriter logWriter;
     private string writerFilename;
 
     public CSVTestLogger(TextWriter logWriter) {
@@ -70,14 +70,16 @@ private void TestResultHandler(object sender, TestResultEventArgs e) {
     }
 
     private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e) {
-      writer.WriteLine("TestResult.DisplayName,TestResult.Outcome,TestResult.Duration,TestResult.ResourceCount");
+      writer.WriteLine("TestResult.DisplayName,TestResult.Outcome,TestResult.Duration,TestResult.ResourceCount,RandomSeed");
       foreach (var result in results.OrderByDescending(r => r.Duration)) {
-        var resCount = result.GetPropertyValue(VerificationResultLogger.ResourceCountProperty);
-        writer.WriteLine($"{result.TestCase.DisplayName},{result.Outcome},{result.Duration},{resCount}");
+        var resourceCount = result.GetPropertyValue(VerificationResultLogger.ResourceCountProperty);
+        var randomSeed = result.GetPropertyValue(VerificationResultLogger.RandomSeedProperty) ?? "unknown";
+        writer.WriteLine($"{result.TestCase.DisplayName},{result.Outcome},{result.Duration},{resourceCount},{randomSeed}");
       }
 
-      writer.Close();
+      writer.Flush();
       logWriter.WriteLine("Results File: " + Path.GetFullPath(writerFilename));
+      logWriter.Flush();
     }
   }
 }
diff --git a/Source/DafnyDriver/CliCanVerifyState.cs b/Source/DafnyDriver/CliCanVerifyState.cs
new file mode 100644
index 00000000000..548f1550919
--- /dev/null
+++ b/Source/DafnyDriver/CliCanVerifyState.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Boogie;
+
+namespace DafnyDriver.Commands;
+
+public record CliCanVerifyState {
+  public Func<IVerificationTask, bool> TaskFilter = _ => true;
+  public readonly TaskCompletionSource Finished = new();
+  public int CompletedCount = 0;
+  public readonly ConcurrentQueue<(IVerificationTask Task, Completed Result)> CompletedParts = new();
+  public int TaskCount;
+}
\ No newline at end of file
diff --git a/Source/DafnyDriver/CliCompilation.cs b/Source/DafnyDriver/CliCompilation.cs
new file mode 100644
index 00000000000..98fba2d30d1
--- /dev/null
+++ b/Source/DafnyDriver/CliCompilation.cs
@@ -0,0 +1,369 @@
+#nullable enable
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Boogie;
+using Microsoft.Dafny;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Dafny.LanguageServer.Language;
+using Microsoft.Dafny.LanguageServer.Language.Symbols;
+using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
+using VC;
+using VCGeneration;
+using Token = Microsoft.Dafny.Token;
+
+namespace DafnyDriver.Commands;
+
+public record CanVerifyResult(ICanVerify CanVerify, IReadOnlyList<VerificationTaskResult> Results);
+
+public class CliCompilation {
+  public Compilation Compilation { get; }
+  private readonly ConcurrentDictionary<MessageSource, int> errorsPerSource = new();
+  private int errorCount;
+  private int warningCount;
+  public bool DidVerification { get; private set; }
+
+  private CliCompilation(
+    CreateCompilation createCompilation,
+    DafnyOptions options) {
+    Options = options;
+
+    if (options.DafnyProject == null) {
+      var firstFile = options.CliRootSourceUris.FirstOrDefault();
+      var uri = firstFile ?? new Uri(Directory.GetCurrentDirectory());
+      options.DafnyProject = new DafnyProject(null, uri, null, new HashSet<string>() { uri.LocalPath }, new HashSet<string>(),
+        new Dictionary<string, object>()) {
+        ImplicitFromCli = true
+      };
+    }
+
+    options.RunningBoogieFromCommandLine = true;
+
+    var input = new CompilationInput(options, 0, options.DafnyProject);
+    var executionEngine = new ExecutionEngine(options, new EmptyVerificationResultCache(), DafnyMain.LargeThreadScheduler);
+    Compilation = createCompilation(executionEngine, input);
+  }
+
+  public async Task<int> GetAndReportExitCode() {
+    var value = await GetAndReportExitValue();
+    return (int)value;
+  }
+
+  public async Task<ExitValue> GetAndReportExitValue() {
+    if (errorCount > 0) {
+      if (HasErrorsFromSource(MessageSource.Project)) {
+        return ExitValue.PREPROCESSING_ERROR;
+      }
+
+      if (HasErrorsFromSource(MessageSource.Verifier)) {
+        return ExitValue.VERIFICATION_ERROR;
+      }
+      return ExitValue.DAFNY_ERROR;
+    }
+
+    if (warningCount > 0 && !Options.Get(CommonOptionBag.AllowWarnings)) {
+      await Options.OutputWriter.WriteLineAsync(
+        "Compilation failed because warnings were found and --allow-warnings is false");
+      return ExitValue.DAFNY_ERROR;
+    }
+
+    return ExitValue.SUCCESS;
+
+    bool HasErrorsFromSource(MessageSource source) {
+      return errorsPerSource.GetOrAdd(source, _ => 0) != 0;
+    }
+  }
+
+  public Task<ResolutionResult?> Resolution => Compilation.Resolution;
+
+  public static CliCompilation Create(DafnyOptions options) {
+    var fileSystem = OnDiskFileSystem.Instance;
+    ILoggerFactory factory = new LoggerFactory();
+    var telemetryPublisher = new CliTelemetryPublisher(factory.CreateLogger<TelemetryPublisherBase>());
+    return new CliCompilation(CreateCompilation, options);
+
+    Compilation CreateCompilation(ExecutionEngine engine, CompilationInput input) =>
+      new(factory.CreateLogger<Compilation>(), fileSystem,
+        new TextDocumentLoader(factory.CreateLogger<ITextDocumentLoader>(),
+          new DafnyLangParser(options, fileSystem, telemetryPublisher,
+            factory.CreateLogger<DafnyLangParser>(),
+            factory.CreateLogger<CachingParser>()),
+          new DafnyLangSymbolResolver(factory.CreateLogger<DafnyLangSymbolResolver>(), factory.CreateLogger<CachingResolver>(), telemetryPublisher)),
+        new DafnyProgramVerifier(factory.CreateLogger<DafnyProgramVerifier>()), engine, input);
+  }
+
+  public void Start() {
+    if (Compilation.Started) {
+      throw new InvalidOperationException("Compilation was already started");
+    }
+
+    ErrorReporter consoleReporter = Options.DiagnosticsFormat switch {
+      DafnyOptions.DiagnosticsFormats.PlainText => new ConsoleErrorReporter(Options),
+      DafnyOptions.DiagnosticsFormats.JSON => new JsonConsoleErrorReporter(Options),
+      _ => throw new ArgumentOutOfRangeException()
+    };
+
+    var internalExceptionsFound = 0;
+    Compilation.Updates.Subscribe(ev => {
+      if (ev is NewDiagnostic newDiagnostic) {
+        if (newDiagnostic.Diagnostic.Level == ErrorLevel.Error) {
+          errorsPerSource.AddOrUpdate(newDiagnostic.Diagnostic.Source,
+            _ => 1,
+            (_, previous) => previous + 1);
+          Interlocked.Increment(ref errorCount);
+        }
+
+        if (newDiagnostic.Diagnostic.Level == ErrorLevel.Warning) {
+          Interlocked.Increment(ref warningCount);
+        }
+        var dafnyDiagnostic = newDiagnostic.Diagnostic;
+        consoleReporter.Message(dafnyDiagnostic.Source, dafnyDiagnostic.Level,
+          dafnyDiagnostic.ErrorId, dafnyDiagnostic.Token, dafnyDiagnostic.Message);
+      } else if (ev is FinishedParsing finishedParsing) {
+        if (errorCount > 0) {
+          var programName = finishedParsing.ParseResult.Program.Name;
+          Options.OutputWriter.WriteLine($"{errorCount} parse errors detected in {programName}");
+        }
+      } else if (ev is FinishedResolution finishedResolution) {
+        DafnyMain.MaybePrintProgram(finishedResolution.Result.ResolvedProgram, Options.DafnyPrintResolvedFile, true);
+
+        if (errorCount > 0) {
+          var programName = finishedResolution.Result.ResolvedProgram.Name;
+          Options.OutputWriter.WriteLine($"{errorCount} resolution/type errors detected in {programName}");
+        }
+      } else if (ev is InternalCompilationException internalCompilationException) {
+        if (Interlocked.Increment(ref internalExceptionsFound) == 1) {
+          Options.OutputWriter.WriteLine($"Encountered internal compilation exception: {internalCompilationException.Exception.Message}");
+        }
+      }
+
+    });
+    Compilation.Start();
+  }
+
+  public DafnyOptions Options { get; }
+
+  public bool VerifiedAssertions { get; private set; }
+
+  public async IAsyncEnumerable<CanVerifyResult> VerifyAllLazily(int? randomSeed = null) {
+    if (!Options.Get(CommonOptionBag.UnicodeCharacters) && Options.Backend is not CppBackend) {
+      Compilation.Reporter.Deprecated(MessageSource.Verifier, "unicodeCharDeprecated", Token.Cli,
+        "the option unicode-char has been deprecated.");
+    }
+
+    var canVerifyResults = new Dictionary<ICanVerify, CliCanVerifyState>();
+    using var subscription = Compilation.Updates.Subscribe(ev => {
+
+      if (ev is CanVerifyPartsIdentified canVerifyPartsIdentified) {
+        var canVerifyResult = canVerifyResults[canVerifyPartsIdentified.CanVerify];
+        foreach (var part in canVerifyPartsIdentified.Parts.Where(canVerifyResult.TaskFilter)) {
+          Interlocked.Increment(ref canVerifyResult.TaskCount);
+        }
+
+        if (canVerifyResult.CompletedParts.Count == canVerifyResult.TaskCount) {
+          canVerifyResult.Finished.SetResult();
+        }
+      }
+      if (ev is InternalCompilationException internalCompilationException) {
+        foreach (var state in canVerifyResults.Values) {
+          state.Finished.TrySetException(internalCompilationException.Exception);
+        }
+      }
+
+      if (ev is BoogieException boogieException) {
+        var canVerifyResult = canVerifyResults[boogieException.CanVerify];
+        canVerifyResult.Finished.SetException(boogieException.Exception);
+      }
+
+      if (ev is BoogieUpdate { BoogieStatus: Completed completed } boogieUpdate) {
+        var canVerifyResult = canVerifyResults[boogieUpdate.CanVerify];
+        canVerifyResult.CompletedParts.Enqueue((boogieUpdate.VerificationTask, completed));
+        var completedPartsCount = Interlocked.Increment(ref canVerifyResult.CompletedCount);
+
+        if (Options.Get(CommonOptionBag.ProgressOption) == CommonOptionBag.ProgressLevel.VerificationJobs) {
+          var partOrigin = boogieUpdate.VerificationTask.Split.Token;
+
+          var wellFormedness = boogieUpdate.VerificationTask.Split.Implementation.Name.Contains("CheckWellFormed$");
+
+          string OriginDescription(IImplementationPartOrigin origin, bool outer) {
+            if (outer && origin is ImplementationRootOrigin) {
+              return (wellFormedness ? "contract consistency" : "entire body");
+            }
+            var result = origin switch {
+              PathOrigin pathOrigin => $"{OriginDescription(pathOrigin.Inner, false)}" +
+                                       $"after executing lines {string.Join(", ", pathOrigin.BranchTokens.Select(b => b.line))}",
+              RemainingAssertionsOrigin remainingAssertions => OriginDescription(remainingAssertions.Origin, false) + (outer ? "remaining assertions" : ""),
+              IsolatedAssertionOrigin isolateOrigin => $"{OriginDescription(isolateOrigin.Origin, false)}assertion at line {isolateOrigin.line}",
+              JumpOrigin returnOrigin => $"{OriginDescription(returnOrigin.Origin, false)}{JumpOriginKind(returnOrigin)} at line {returnOrigin.line}",
+              AfterSplitOrigin splitOrigin => $"{OriginDescription(splitOrigin.Inner, false)}assertions after split_here at line {splitOrigin.line}",
+              FocusOrigin focusOrigin =>
+                $"{OriginDescription(focusOrigin.Inner, false)}with focus " +
+                $"{string.Join(", ", focusOrigin.FocusChoices.Select(b => (b.DidFocus ? "+" : "-") + b.Token.line))}",
+              UntilFirstSplitOrigin untilFirstSplit => $"{OriginDescription(untilFirstSplit.Inner, false)}assertions until first split",
+              ImplementationRootOrigin => "",
+              _ => throw new ArgumentOutOfRangeException(nameof(origin), origin, null)
+            };
+            if (!outer && !string.IsNullOrEmpty(result)) {
+              result += ", ";
+            }
+            return result;
+          }
+
+          var runResult = completed.Result;
+          var timeString = runResult.RunTime.ToString("g");
+          Options.OutputWriter.WriteLine(
+            $"Verified {completedPartsCount}/{canVerifyResult.TaskCount} of {boogieUpdate.CanVerify.FullDafnyName}: " +
+            $"{OriginDescription(partOrigin, true)} - " +
+            $"{DescribeOutcome(Compilation.GetOutcome(runResult.Outcome))}" +
+            $" (time: {timeString}, resource count: {runResult.ResourceCount})");
+        }
+        if (completedPartsCount == canVerifyResult.TaskCount) {
+          canVerifyResult.Finished.TrySetResult();
+        }
+      }
+    });
+
+    var resolution = await Compilation.Resolution;
+    if (resolution == null || resolution.HasErrors) {
+      yield break;
+    }
+
+    var canVerifies = resolution.CanVerifies?.ToList();
+
+    if (canVerifies == null) {
+      yield break;
+    }
+
+    DidVerification = true;
+
+    canVerifies = FilterCanVerifies(canVerifies, out var line);
+    VerifiedAssertions = line != null;
+
+    int done = 0;
+
+    var canVerifiesPerModule = canVerifies.GroupBy(c => c.ContainingModule);
+    foreach (var canVerifiesForModule in canVerifiesPerModule.
+               OrderBy(v => v.Key.Origin.pos)) {
+      var toAwait = new List<ICanVerify>();
+      foreach (var canVerify in canVerifiesForModule.OrderBy(v => v.Origin.pos)) {
+        var results = new CliCanVerifyState();
+        canVerifyResults[canVerify] = results;
+        if (line != null) {
+          results.TaskFilter = t => KeepVerificationTask(t, line.Value);
+        }
+
+        var shouldVerify = await Compilation.VerifyLocation(canVerify.Origin.GetFilePosition(), results.TaskFilter, randomSeed);
+        if (shouldVerify) {
+          toAwait.Add(canVerify);
+        }
+      }
+
+      foreach (var canVerify in toAwait) {
+        var results = canVerifyResults[canVerify];
+        try {
+          if (Options.Get(CommonOptionBag.ProgressOption) > CommonOptionBag.ProgressLevel.None) {
+            await Options.OutputWriter.WriteLineAsync(
+              $"Verified {done}/{canVerifies.ToList().Count} symbols. Waiting for {canVerify.FullDafnyName} to verify.");
+          }
+
+          await results.Finished.Task;
+          done++;
+        } catch (ProverException e) {
+          Compilation.Reporter.Error(MessageSource.Verifier, ResolutionErrors.ErrorId.none, canVerify.Origin, e.Message);
+          yield break;
+        } catch (OperationCanceledException) {
+
+        } catch (Exception e) {
+          Compilation.Reporter.Error(MessageSource.Verifier, ResolutionErrors.ErrorId.none, canVerify.Origin,
+            $"Internal error occurred during verification: {e.Message}\n{e.StackTrace}");
+          throw;
+        }
+
+        yield return new CanVerifyResult(canVerify,
+          results.CompletedParts.Select(c => new VerificationTaskResult(c.Task, c.Result.Result)).ToList());
+
+        canVerifyResults.Remove(canVerify); // Free memory
+        Compilation.ClearCanVerifyCache(canVerify);
+      }
+      Compilation.ClearModuleCache(canVerifiesForModule.Key);
+    }
+  }
+
+  private static string JumpOriginKind(JumpOrigin returnOrigin) {
+    return returnOrigin.IsolatedReturn is GotoCmd ? "continue" : "return";
+  }
+
+  public static string DescribeOutcome(VcOutcome outcome) {
+    return outcome switch {
+      VcOutcome.Correct => "verified successfully",
+      VcOutcome.Errors => "could not be verified",
+      VcOutcome.Inconclusive => "was inconclusive",
+      VcOutcome.TimedOut => "timed out",
+      VcOutcome.OutOfResource => "ran out of resources",
+      VcOutcome.OutOfMemory => "ran out of memory",
+      VcOutcome.SolverException => "ran into a solver exception",
+      _ => throw new ArgumentOutOfRangeException(nameof(outcome), outcome, null)
+    };
+  }
+
+  private List<ICanVerify> FilterCanVerifies(List<ICanVerify> canVerifies, out int? line) {
+    var symbolFilter = Options.Get(VerifyCommand.FilterSymbol);
+    if (symbolFilter != null) {
+      if (symbolFilter.EndsWith(".")) {
+        var withoutDot = new string(symbolFilter.SkipLast(1).ToArray());
+        canVerifies = canVerifies.Where(canVerify => canVerify.FullDafnyName.EndsWith(withoutDot)).ToList();
+      } else {
+        canVerifies = canVerifies.Where(canVerify => canVerify.FullDafnyName.Contains(symbolFilter)).ToList();
+      }
+    }
+
+    var filterPosition = Options.Get(VerifyCommand.FilterPosition);
+    if (filterPosition == null) {
+      line = null;
+      return canVerifies;
+    }
+
+    var regex = new Regex(@"(.*)(?::(\d+))?", RegexOptions.RightToLeft);
+    var result = regex.Match(filterPosition);
+    if (result.Length != filterPosition.Length || !result.Success) {
+      Compilation.Reporter.Error(MessageSource.Project, Token.Cli, "Could not parse value passed to --filter-position");
+      line = null;
+      return new List<ICanVerify>();
+    }
+    var filePart = result.Groups[1].Value;
+    string? linePart = result.Groups.Count > 2 ? result.Groups[2].Value : null;
+    var fileFiltered = canVerifies.Where(c => c.Origin.Uri.ToString().EndsWith(filePart)).ToList();
+    if (string.IsNullOrEmpty(linePart)) {
+      line = null;
+      return fileFiltered;
+    }
+
+    var parsedLine = int.Parse(linePart);
+    line = parsedLine;
+    return fileFiltered.Where(c =>
+        c.Origin.StartToken.line <= parsedLine && parsedLine <= c.Origin.EndToken.line).ToList();
+  }
+
+  private bool KeepVerificationTask(IVerificationTask task, int line) {
+    return task.ScopeToken.line == line || task.Token.line == line;
+  }
+}
+
+record VerificationStatistics {
+  public int ErrorCount;
+  public int VerifiedAssertions;
+  public int VerifiedSymbols;
+  public int InconclusiveCount;
+  public int TimeoutCount;
+  public int OutOfResourceCount;
+  public int OutOfMemoryCount;
+  public int SolverExceptionCount;
+  public int TotalResourcesUsed;
+  public int MaxVcResourcesUsed;
+}
diff --git a/Source/DafnyDriver/CliTelemetryPublisher.cs b/Source/DafnyDriver/CliTelemetryPublisher.cs
new file mode 100644
index 00000000000..28f21b9fe67
--- /dev/null
+++ b/Source/DafnyDriver/CliTelemetryPublisher.cs
@@ -0,0 +1,13 @@
+using System.Collections.Immutable;
+using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
+
+namespace DafnyDriver.Commands;
+
+class CliTelemetryPublisher : TelemetryPublisherBase {
+  public CliTelemetryPublisher(ILogger<TelemetryPublisherBase> logger) : base(logger) {
+  }
+
+  public override void PublishTelemetry(ImmutableDictionary<string, object> data) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyDriver/Commands/AuditCommand.cs b/Source/DafnyDriver/Commands/AuditCommand.cs
index 248370ce0bf..54e9b3a8976 100644
--- a/Source/DafnyDriver/Commands/AuditCommand.cs
+++ b/Source/DafnyDriver/Commands/AuditCommand.cs
@@ -5,23 +5,28 @@
 
 namespace Microsoft.Dafny;
 
-class AuditCommand : ICommandSpec {
+static class AuditCommand {
 
-  public IEnumerable<Option> Options => new Option[] {
+  public static IEnumerable<Option> Options => new Option[] {
     Auditor.Auditor.ReportFileOption,
     Auditor.Auditor.ReportFormatOption,
     Auditor.Auditor.CompareReportOption
-  }.Concat(ICommandSpec.ResolverOptions);
+  }.Concat(DafnyCommands.ResolverOptions);
 
-  public Command Create() {
+  public static Command Create() {
     var result = new Command("audit", "Report issues in the Dafny code that might limit the soundness claims of verification, emitting them as warnings or in a report document.");
-    result.AddArgument(ICommandSpec.FilesArgument);
-    return result;
-  }
+    result.AddArgument(DafnyCommands.FilesArgument);
 
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    dafnyOptions.Compile = false;
-    dafnyOptions.Verify = false;
-    dafnyOptions.AuditProgram = true;
+    foreach (var option in Options) {
+      result.AddOption(option);
+    }
+
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, (options, _) => {
+      options.Compile = false;
+      options.Verify = false;
+      options.AuditProgram = true;
+      return SynchronousCliCompilation.Run(options);
+    });
+    return result;
   }
 }
diff --git a/Source/DafnyDriver/Commands/BoogieExtractor.cs b/Source/DafnyDriver/Commands/BoogieExtractor.cs
new file mode 100644
index 00000000000..a4d8d7e7b88
--- /dev/null
+++ b/Source/DafnyDriver/Commands/BoogieExtractor.cs
@@ -0,0 +1,378 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Diagnostics.Contracts;
+using Microsoft.BaseTypes;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny.Compilers {
+  public class ExtractorError : Exception {
+    public readonly IToken Tok;
+    public ExtractorError(IToken tok, string message)
+      : base(message) {
+      Tok = tok;
+    }
+  }
+
+  public class BoogieExtractor : ASTVisitor<IASTVisitorContext> {
+    /// <summary>
+    /// Says to look inside the module for contents to extract.
+    /// Can be applied to a module.
+    /// 
+    /// Note: This attribute isn't used yet, so the use of the attribute is just a stylistic thing at the moment.
+    /// Similarly, one can imagine that the extractor will look at a module's export clauses, to--in some way--check that
+    /// the set of Boogie declarations exported are self consistent. But that isn't done yet, either. Instead, all contents
+    /// of all files given to the extractor are considered for extraction.  
+    /// </summary>
+    private const string ExtractAttribute = "extract_boogie";
+
+    /// <summary>
+    /// Gives the Boogie name to be used in the extraction.
+    /// Can be applied to types and functions.
+    /// </summary>
+    private const string NameAttribute = "extract_boogie_name";
+
+    /// <summary>
+    /// Says to place the extracted axiom declaration in the "uses" block of the given function.
+    /// Can be applied to lemmas.
+    /// </summary>
+    private const string UsedByAttribute = "extract_used_by";
+
+    /// <summary>
+    /// Gives a matching pattern to be applied in the quantifier emitted from a lemma or from a quantifier.
+    /// Can be applied to lemmas and quantifiers.
+    /// </summary>
+    private const string PatternAttribute = "extract_pattern";
+
+    /// <summary>
+    /// Specifies an additional attribute to be attached to the quantifier emitted from a lemma.
+    /// Can be applied to lemmas.
+    /// </summary>
+    private const string AttributeAttribute = "extract_attribute";
+
+    /// <summary>
+    /// Throws an "ExtractorError" if the input is unexpected or unsupported.
+    /// </summary>
+    public static Boogie.Program Extract(Program program, string sourceModuleName) {
+      var extractor = new BoogieExtractor(sourceModuleName);
+      extractor.VisitModule(program.DefaultModule);
+      extractor.FixUpUsedByInformation();
+
+      var extractedProgram = new Boogie.Program();
+      extractedProgram.AddTopLevelDeclarations(extractor.allDeclarations);
+      return extractedProgram;
+    }
+
+    private readonly string SourceModuleName;
+    private List<Boogie.Declaration> declarations = new(); // for the current module
+    private List<Boogie.Declaration> allDeclarations = new(); // these are the declarations for all modules selected for extraction 
+    private readonly Dictionary<Function, Boogie.Function> functionExtractions = new();
+    private readonly List<(IToken, Boogie.Axiom, Function)> axiomUsedBy = new();
+
+    private BoogieExtractor(string sourceModuleName) {
+      SourceModuleName = sourceModuleName;
+    }
+
+    void FixUpUsedByInformation() {
+      foreach (var (tok, axiom, function) in axiomUsedBy) {
+        if (!functionExtractions.TryGetValue(function, out var boogieFunction)) {
+          throw new ExtractorError(tok, $":{UsedByAttribute} attribute mentions non-extracted function: {function.Name}");
+        }
+        boogieFunction.OtherDefinitionAxioms.Add(axiom);
+      }
+      axiomUsedBy.Clear();
+    }
+
+    public override IASTVisitorContext GetContext(IASTVisitorContext astVisitorContext, bool inFunctionPostcondition) {
+      return astVisitorContext;
+    }
+
+    void VisitModule(ModuleDecl module) {
+      var previousDeclarations = declarations;
+      declarations = new();
+
+      VisitDeclarations(module.Signature.TopLevels.Values.ToList());
+
+      if (Attributes.Contains(module.Signature.ModuleDef.Attributes, ExtractAttribute)) {
+        declarations.Sort((d0, d1) => d0.tok.pos - d1.tok.pos);
+        allDeclarations.AddRange(declarations);
+      }
+      declarations = previousDeclarations;
+    }
+
+    protected override void VisitOneDeclaration(TopLevelDecl decl) {
+      if (decl is ModuleDecl moduleDecl) {
+        VisitModule(moduleDecl);
+        return;
+      }
+
+      if (decl.EnclosingModuleDefinition.Name != SourceModuleName) {
+        // ignore this declaration
+        return;
+      }
+
+      if (GetExtractName(decl.Attributes) is { } extractName) {
+        var ty = new Boogie.TypeCtorDecl(decl.Origin, extractName, decl.TypeArgs.Count);
+        declarations.Add(ty);
+      }
+
+      base.VisitOneDeclaration(decl); // this will visit the declaration's members
+    }
+
+    public override void VisitMethod(Method method) {
+      if (method is not Lemma lemma) {
+        return;
+      }
+
+      var patterns = Attributes.FindAllExpressions(lemma.Attributes, PatternAttribute);
+      var usedByInfo = Attributes.Find(lemma.Attributes, UsedByAttribute);
+      if (patterns == null && usedByInfo == null) {
+        return;
+      }
+
+      if ((lemma.Ins.Count == 0) != (patterns == null)) {
+        throw new ExtractorError(lemma.Origin, $"a parameterized lemma must specify at least one :{PatternAttribute}: {lemma.Name}");
+      }
+      if (lemma.TypeArgs.Count != 0) {
+        throw new ExtractorError(lemma.Origin, $"an extracted lemma is not allowed to have type parameters: {lemma.Name}");
+      }
+      if (lemma.Outs.Count != 0) {
+        throw new ExtractorError(lemma.Origin, $"an extracted lemma is not allowed to have out-parameters: {lemma.Name}");
+      }
+
+      var tok = lemma.Origin;
+
+      var boundVars = lemma.Ins.ConvertAll(formal =>
+        (Boogie.Variable)new Boogie.BoundVariable(tok, new TypedIdent(tok, formal.Name, ExtractType(formal.Type)))
+      );
+
+      var triggers = GetTriggers(tok, patterns);
+
+      var ante = BoogieGenerator.BplAnd(lemma.Req.ConvertAll(req => ExtractExpr(req.E)));
+      var post = BoogieGenerator.BplAnd(lemma.Ens.ConvertAll(ens => ExtractExpr(ens.E)));
+      var body = BoogieGenerator.BplImp(ante, post);
+
+      Boogie.Expr axiomBody;
+      if (boundVars.Count == 0) {
+        axiomBody = body;
+      } else {
+        var kv = GetKeyValues(tok, lemma.Attributes);
+        axiomBody = new Boogie.ForallExpr(tok, new List<TypeVariable>(), boundVars, kv, triggers, body);
+      }
+      var axiom = new Boogie.Axiom(tok, axiomBody);
+      declarations.Add(axiom);
+
+      if (usedByInfo != null) {
+        if (usedByInfo.Args.Count == 1 && usedByInfo.Args[0].Resolved is MemberSelectExpr { Member: Function function }) {
+          axiomUsedBy.Add((usedByInfo.Origin, axiom, function));
+        } else {
+          throw new ExtractorError(usedByInfo.Origin, $":{UsedByAttribute} argument on lemma '{lemma.Name}' is expected to be an extracted function");
+        }
+      }
+    }
+
+    private Trigger? GetTriggers(IOrigin tok, List<List<Expression>>? patterns) {
+      if (patterns == null) {
+        return null;
+      }
+
+      Boogie.Trigger? triggers = null;
+      for (var i = 0; i < patterns.Count; i++) {
+        var terms = patterns![i].ConvertAll(ExtractExpr);
+        triggers = new Boogie.Trigger(tok, true, terms, triggers);
+      }
+
+      return triggers;
+    }
+
+    private QKeyValue? GetKeyValues(IOrigin tok, Attributes? attributes) {
+      QKeyValue? kv = null;
+      var extractAttributes = Attributes.FindAllExpressions(attributes, AttributeAttribute);
+      if (extractAttributes == null) {
+        return kv;
+      }
+
+      if (extractAttributes.Count == 0) {
+        throw new ExtractorError(tok, $"first argument to :{AttributeAttribute} is expected to be a literal string; got no arguments");
+      }
+      for (var i = extractAttributes.Count; 0 <= --i;) {
+        string? attrName = null;
+        var parameters = new List<object>();
+        foreach (var argument in extractAttributes[i]) {
+          if (attrName != null) {
+            parameters.Add(ExtractExpr(argument));
+          } else if (argument is StringLiteralExpr { Value: string name }) {
+            attrName = name;
+          } else {
+            throw new ExtractorError(tok, $"first argument to :{AttributeAttribute} is expected to be a literal string; got: {argument}");
+          }
+        }
+
+        kv = new QKeyValue(tok, attrName, parameters, kv);
+      }
+
+      return kv;
+    }
+
+    public override void VisitFunction(Function function) {
+      if (GetExtractName(function.Attributes) is { } extractName) {
+        var tok = function.Origin;
+        if (function.TypeArgs.Count != 0) {
+          throw new ExtractorError(tok, $"an extracted function is not allowed to have type parameters: {function.Name}");
+        }
+        var inParams = function.Ins.ConvertAll(formal =>
+          (Boogie.Variable)new Boogie.Formal(tok, new TypedIdent(tok, formal.Name, ExtractType(formal.Type)), true)
+        );
+        var result = new Boogie.Formal(tok, new TypedIdent(tok, TypedIdent.NoName, ExtractType(function.ResultType)), false);
+        var fn = new Boogie.Function(tok, extractName, inParams, result);
+        if (extractName is not ("[]" or "[:=]")) {
+          declarations.Add(fn);
+          functionExtractions.Add(function, fn);
+        }
+      }
+    }
+
+    private Boogie.Type ExtractType(Type type) {
+      switch (type) {
+        case IntType:
+          return Boogie.Type.Int;
+        case BoolType:
+          return Boogie.Type.Bool;
+        case UserDefinedType udt: {
+            var cl = udt.ResolvedClass;
+            var name = GetExtractName(cl.Attributes) ?? cl.Name;
+            return new Boogie.UnresolvedTypeIdentifier(Boogie.Token.NoToken, name, udt.TypeArgs.ConvertAll(ExtractType));
+          }
+        default:
+          throw new ExtractorError(type.Origin, $"type not supported by extractor: {type}");
+      }
+    }
+
+    private string? GetExtractName(Attributes attributes) {
+      if (Attributes.Find(attributes, NameAttribute) is { } extractNameAttribute) {
+        if (extractNameAttribute.Args.Count == 1 && extractNameAttribute.Args[0] is StringLiteralExpr { Value: string extractName }) {
+          return extractName;
+        }
+      }
+      return null;
+    }
+
+    private Boogie.Expr ExtractExpr(Expression expr) {
+      expr = expr.Resolved;
+      var tok = expr.Origin;
+      switch (expr) {
+        case LiteralExpr literalExpr: {
+            if (literalExpr.Value is bool boolValue) {
+              // use the specific literals, rather than Boogie.LiteralExpr(bool), in order for the
+              // peephole optimizations to kick in
+              return boolValue ? Boogie.Expr.True : Boogie.Expr.False;
+            } else if (literalExpr.Value is BigInteger intValue) {
+              var n = BigNum.FromBigInt(intValue);
+              return Boogie.Expr.Literal(n);
+            }
+            break;
+          }
+
+        case IdentifierExpr identifierExpr:
+          return new Boogie.IdentifierExpr(tok, identifierExpr.Name);
+
+        case FunctionCallExpr functionCallExpr: {
+            var function = functionCallExpr.Function;
+            var functionName = GetExtractName(function.Attributes) ?? function.Name;
+            Contract.Assert(function.IsStatic);
+            if (functionName == "[]") {
+              if (functionCallExpr.Args.Count != 2) {
+                throw new ExtractorError(tok, $"function {functionName} expects 2 arguments, got {functionCallExpr.Args.Count}");
+              }
+              return Boogie.Expr.SelectTok(tok, ExtractExpr(functionCallExpr.Args[0]), ExtractExpr(functionCallExpr.Args[1]));
+            } else if (functionName == "[:=]") {
+              if (functionCallExpr.Args.Count != 3) {
+                throw new ExtractorError(tok, $"function {functionName} expects 3 arguments, got {functionCallExpr.Args.Count}");
+              }
+              return Boogie.Expr.StoreTok(tok, ExtractExpr(functionCallExpr.Args[0]),
+                ExtractExpr(functionCallExpr.Args[1]), ExtractExpr(functionCallExpr.Args[2]));
+            } else {
+              var arguments = functionCallExpr.Args.ConvertAll(ExtractExpr);
+              return new Boogie.NAryExpr(tok, new Boogie.FunctionCall(new Boogie.IdentifierExpr(tok, functionName)), arguments);
+            }
+          }
+
+        case BinaryExpr binaryExpr: {
+            var e0 = ExtractExpr(binaryExpr.E0);
+            var e1 = ExtractExpr(binaryExpr.E1);
+            switch (binaryExpr.ResolvedOp) {
+              case BinaryExpr.ResolvedOpcode.EqCommon:
+                return Boogie.Expr.Eq(e0, e1);
+              case BinaryExpr.ResolvedOpcode.NeqCommon:
+                return Boogie.Expr.Neq(e0, e1);
+              case BinaryExpr.ResolvedOpcode.Iff:
+                return BoogieGenerator.BplIff(e0, e1);
+              case BinaryExpr.ResolvedOpcode.Imp:
+                return BoogieGenerator.BplImp(e0, e1);
+              case BinaryExpr.ResolvedOpcode.And:
+                return BoogieGenerator.BplAnd(e0, e1);
+              case BinaryExpr.ResolvedOpcode.Or:
+                return BoogieGenerator.BplOr(e0, e1);
+              case BinaryExpr.ResolvedOpcode.Le:
+                return Boogie.Expr.Le(e0, e1);
+              case BinaryExpr.ResolvedOpcode.Lt:
+                return Boogie.Expr.Lt(e0, e1);
+              case BinaryExpr.ResolvedOpcode.Add:
+                return Boogie.Expr.Add(e0, e1);
+              case BinaryExpr.ResolvedOpcode.Sub:
+                return Boogie.Expr.Sub(e0, e1);
+              case BinaryExpr.ResolvedOpcode.Mul:
+                return Boogie.Expr.Mul(e0, e1);
+              default:
+                break;
+            }
+            break;
+          }
+
+        case UnaryOpExpr unaryOpExpr:
+          if (unaryOpExpr.ResolvedOp == UnaryOpExpr.ResolvedOpcode.BoolNot) {
+            var e = ExtractExpr(unaryOpExpr.E);
+            return Boogie.Expr.Not(e);
+          } else {
+            throw new ExtractorError(unaryOpExpr.Origin, $"extractor does not support unary operator {unaryOpExpr.ResolvedOp}");
+          }
+
+        case QuantifierExpr quantifierExpr: {
+            var boundVars = quantifierExpr.BoundVars.ConvertAll(boundVar =>
+              (Boogie.Variable)new Boogie.BoundVariable(tok, new TypedIdent(tok, boundVar.Name, ExtractType(boundVar.Type)))
+            );
+
+            var patterns = Attributes.FindAllExpressions(quantifierExpr.Attributes, PatternAttribute);
+            if (patterns == null || patterns.Count == 0) {
+              throw new ExtractorError(quantifierExpr.Origin, $"extraction expects every quantifier to specify at least one :{PatternAttribute}");
+            }
+            var triggers = GetTriggers(tok, patterns);
+
+            var kv = GetKeyValues(tok, quantifierExpr.Attributes);
+            var body = ExtractExpr(quantifierExpr.LogicalBody());
+            if (quantifierExpr is ExistsExpr) {
+              return new Boogie.ExistsExpr(tok, new List<TypeVariable>(), boundVars, kv, triggers, body);
+            } else {
+              Contract.Assert(quantifierExpr is ForallExpr);
+              return new Boogie.ForallExpr(tok, new List<TypeVariable>(), boundVars, kv, triggers, body);
+            }
+          }
+
+        default:
+          break;
+      }
+
+      throw new ExtractorError(expr.Origin, $"extraction does not support expression of type {expr.GetType()}: {expr}");
+    }
+  }
+}
diff --git a/Source/DafnyDriver/Commands/BuildCommand.cs b/Source/DafnyDriver/Commands/BuildCommand.cs
index 52d6e085f72..42232ea1c67 100644
--- a/Source/DafnyDriver/Commands/BuildCommand.cs
+++ b/Source/DafnyDriver/Commands/BuildCommand.cs
@@ -1,26 +1,26 @@
-using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.Linq;
 
 namespace Microsoft.Dafny;
 
-class BuildCommand : ICommandSpec {
-  public IEnumerable<Option> Options => new Option[] {
-    CommonOptionBag.Output,
-  }.Concat(ICommandSpec.ExecutionOptions).
-    Concat(ICommandSpec.ConsoleOutputOptions).
-    Concat(ICommandSpec.ResolverOptions);
+public static class BuildCommand {
 
-  public Command Create() {
+  public static Command Create() {
     var result = new Command("build", "Produce an executable binary or a library.");
-    result.AddArgument(ICommandSpec.FilesArgument);
-    return result;
-  }
+    result.AddArgument(DafnyCommands.FilesArgument);
+    foreach (var option in new Option[] {
+                 CommonOptionBag.Output,
+               }.Concat(DafnyCommands.ExecutionOptions)
+               .Concat(DafnyCommands.ConsoleOutputOptions)
+               .Concat(DafnyCommands.ResolverOptions)) {
+      result.AddOption(option);
+    }
 
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    dafnyOptions.Compile = true;
-    dafnyOptions.RunAfterCompile = false;
-    dafnyOptions.ForceCompile = dafnyOptions.Get(BoogieOptionBag.NoVerify);
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, (options, _) => {
+      options.Compile = true;
+      options.RunAfterCompile = false;
+      options.ForceCompile = options.Get(BoogieOptionBag.NoVerify) || options.Get(BoogieOptionBag.HiddenNoVerify);
+      return SynchronousCliCompilation.Run(options);
+    });
+    return result;
   }
 }
diff --git a/Source/DafnyDriver/Commands/CommandRegistry.cs b/Source/DafnyDriver/Commands/CommandRegistry.cs
deleted file mode 100644
index 039cc8b2af2..00000000000
--- a/Source/DafnyDriver/Commands/CommandRegistry.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.CommandLine;
-using System.CommandLine.Builder;
-using System.CommandLine.Help;
-using System.CommandLine.Invocation;
-using System.CommandLine.IO;
-using System.CommandLine.Parsing;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using DafnyCore;
-using JetBrains.Annotations;
-using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer;
-
-namespace Microsoft.Dafny;
-
-public interface ParseArgumentResult {
-}
-
-public record ParseArgumentSuccess(DafnyOptions DafnyOptions) : ParseArgumentResult;
-record ParseArgumentFailure(DafnyDriver.CommandLineArgumentsResult ExitResult) : ParseArgumentResult;
-
-public static class CommandRegistry {
-  private const string ToolchainDebuggingHelpName = "--help-internal";
-  private static readonly HashSet<ICommandSpec> Commands = new();
-
-  static void AddCommand(ICommandSpec command) {
-    Commands.Add(command);
-  }
-
-  static CommandRegistry() {
-    AddCommand(new ResolveCommand());
-    AddCommand(new VerifyCommand());
-    AddCommand(new BuildCommand());
-    AddCommand(new RunCommand());
-    AddCommand(new TranslateCommand());
-    AddCommand(new FormatCommand());
-    AddCommand(new DocCommand());
-    AddCommand(new MeasureComplexityCommand());
-    AddCommand(ServerCommand.Instance);
-    AddCommand(new TestCommand());
-    AddCommand(new GenerateTestsCommand());
-    AddCommand(new DeadCodeCommand());
-    AddCommand(new AuditCommand());
-    AddCommand(new CoverageReportCommand());
-
-    // Check that the .doo file format is aware of all options,
-    // and therefore which have to be saved to safely support separate verification/compilation.
-    DooFile.CheckOptions(AllOptions);
-
-    FileArgument = new Argument<FileInfo>("file", "Dafny input file or Dafny project file");
-
-    // This SHOULD find the same method but returns null for some reason:
-    // typeof(ParseResult).GetMethod("GetValueForOption", 1, new[] { typeof(Option<>) });
-    foreach (var method in typeof(ParseResult).GetMethods()) {
-      if (method.Name == "GetValueForOption" && method.GetGenericArguments().Length == 1) {
-        GetValueForOptionMethod = method;
-      }
-    }
-    Debug.Assert(GetValueForOptionMethod != null);
-  }
-
-  public static Argument<FileInfo> FileArgument { get; }
-
-  class WritersConsole : IConsole {
-    private readonly TextWriter errWriter;
-    private readonly TextWriter outWriter;
-
-    public WritersConsole(TextWriter outWriter, TextWriter errWriter) {
-      this.errWriter = errWriter;
-      this.outWriter = outWriter;
-    }
-
-    public IStandardStreamWriter Out => StandardStreamWriter.Create(outWriter ?? TextWriter.Null);
-
-    public bool IsOutputRedirected => outWriter != null;
-    public IStandardStreamWriter Error => StandardStreamWriter.Create(errWriter ?? TextWriter.Null);
-    public bool IsErrorRedirected => errWriter != null;
-    public bool IsInputRedirected => false;
-  }
-
-  [CanBeNull]
-  public static ParseArgumentResult Create(TextWriter outputWriter, TextWriter errorWriter, TextReader inputReader, string[] arguments) {
-    bool allowHidden = arguments.All(a => a != ToolchainDebuggingHelpName);
-    var console = new WritersConsole(outputWriter, errorWriter);
-    var wasInvoked = false;
-    var dafnyOptions = new DafnyOptions(inputReader, outputWriter, errorWriter);
-    var optionValues = new Dictionary<Option, object>();
-    var options = new Options(optionValues, new Dictionary<Argument, object>());
-    dafnyOptions.ShowEnv = ExecutionEngineOptions.ShowEnvironment.Never;
-    dafnyOptions.Environment = "Command-line arguments: " + string.Join(" ", arguments);
-    dafnyOptions.Options = options;
-
-    foreach (var option in AllOptions) {
-      if (!allowHidden) {
-        option.IsHidden = false;
-      }
-      if (!option.Arity.Equals(ArgumentArity.ZeroOrMore) && !option.Arity.Equals(ArgumentArity.OneOrMore)) {
-        option.AllowMultipleArgumentsPerToken = true;
-      }
-    }
-
-    var commandToSpec = Commands.ToDictionary(c => {
-      var result = c.Create();
-      foreach (var option in c.Options) {
-        result.AddOption(option);
-      }
-      return result;
-    }, c => c);
-    foreach (var command in commandToSpec.Keys) {
-      command.SetHandler(CommandHandler);
-    }
-
-    if (arguments.Length != 0) {
-      var first = arguments[0];
-      var keywordForNewMode = commandToSpec.Keys.Select(c => c.Name).
-        Union(new[] { "--version", "-h", ToolchainDebuggingHelpName, "--help", "[parse]", "[suggest]" });
-      if (!keywordForNewMode.Contains(first)) {
-        if (first.Length > 0 && first[0] != '/' && first[0] != '-' && !File.Exists(first) && first.IndexOf('.') == -1) {
-          dafnyOptions.Printer.ErrorWriteLine(dafnyOptions.OutputWriter,
-            "*** Error: '{0}': The first input must be a command or a legacy option or file with supported extension", first);
-          return new ParseArgumentFailure(DafnyDriver.CommandLineArgumentsResult.PREPROCESSING_ERROR);
-        }
-        var oldOptions = new DafnyOptions(inputReader, outputWriter, errorWriter);
-        if (oldOptions.Parse(arguments)) {
-          return new ParseArgumentSuccess(oldOptions);
-        }
-
-        return new ParseArgumentFailure(DafnyDriver.CommandLineArgumentsResult.PREPROCESSING_ERROR);
-      }
-    }
-    dafnyOptions.UsingNewCli = true;
-
-    var rootCommand = new RootCommand("The Dafny CLI enables working with Dafny, a verification-aware programming language. Use 'dafny -?' to see help for the previous CLI format.");
-    foreach (var command in commandToSpec.Keys) {
-      rootCommand.AddCommand(command);
-    }
-
-    var errorOccurred = false;
-    async Task CommandHandler(InvocationContext context) {
-      wasInvoked = true;
-      var command = context.ParseResult.CommandResult.Command;
-      var commandSpec = commandToSpec[command];
-      dafnyOptions.Command = command;
-
-      var singleFile = context.ParseResult.GetValueForArgument(FileArgument);
-      if (singleFile != null) {
-        if (!await ProcessFile(dafnyOptions, singleFile)) {
-          errorOccurred = true;
-          return;
-        }
-      }
-      var files = context.ParseResult.GetValueForArgument(ICommandSpec.FilesArgument);
-      if (files != null) {
-        foreach (var file in files) {
-          if (!await ProcessFile(dafnyOptions, file)) {
-            errorOccurred = true;
-            return;
-          }
-        }
-      }
-
-      foreach (var argument in command.Arguments) {
-        var result = context.ParseResult.FindResultFor(argument)?.GetValueOrDefault();
-        if (result != null) {
-          options.Arguments[argument] = result;
-        }
-      }
-
-      foreach (var option in command.Options) {
-        var result = context.ParseResult.FindResultFor(option);
-        object projectFileValue = null;
-        var hasProjectFileValue = dafnyOptions.DafnyProject?.TryGetValue(option, errorWriter, out projectFileValue) ?? false;
-        object value;
-        if (option.Arity.MaximumNumberOfValues <= 1) {
-          // If multiple values aren't allowed, CLI options take precedence over project file options
-          value = (result == null || Equals(result.Token, null)) && hasProjectFileValue
-            ? projectFileValue
-            : GetValueForOption(context.ParseResult, option);
-        } else {
-          // If multiple values ARE allowed, CLI options come after project file options
-          var elementType = option.ValueType.GetGenericArguments()[0];
-          var valueAsList = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(elementType));
-          if (hasProjectFileValue) {
-            foreach (var element in (IEnumerable)projectFileValue) {
-              valueAsList.Add(element);
-            }
-          }
-          if (result != null) {
-            foreach (var element in (IEnumerable)GetValueForOption(context.ParseResult, option)) {
-              valueAsList.Add(element);
-            }
-          }
-
-          value = valueAsList;
-        }
-
-        options.OptionArguments[option] = value;
-        try {
-          dafnyOptions.ApplyBinding(option);
-        } catch (Exception e) {
-          errorOccurred = true;
-          dafnyOptions.Printer.ErrorWriteLine(dafnyOptions.OutputWriter,
-            $"Invalid value for option {option.Name}: {e.Message}");
-          return;
-        }
-      }
-
-      dafnyOptions.CurrentCommand = command;
-      dafnyOptions.ApplyDefaultOptionsWithoutSettingsDefault();
-      commandSpec.PostProcess(dafnyOptions, options, context);
-    }
-
-    var builder = new CommandLineBuilder(rootCommand).UseDefaults();
-    builder = AddDeveloperHelp(rootCommand, builder);
-
-#pragma warning disable VSTHRD002
-    var exitCode = builder.Build().InvokeAsync(arguments, console).Result;
-#pragma warning restore VSTHRD002
-
-    if (errorOccurred) {
-      return new ParseArgumentFailure(DafnyDriver.CommandLineArgumentsResult.PREPROCESSING_ERROR);
-    }
-
-    if (!wasInvoked) {
-      if (exitCode == 0) {
-        return new ParseArgumentFailure(DafnyDriver.CommandLineArgumentsResult.OK_EXIT_EARLY);
-      }
-
-      return new ParseArgumentFailure(DafnyDriver.CommandLineArgumentsResult.PREPROCESSING_ERROR);
-    }
-    if (exitCode == 0) {
-      return new ParseArgumentSuccess(dafnyOptions);
-    }
-
-    return new ParseArgumentFailure(DafnyDriver.CommandLineArgumentsResult.PREPROCESSING_ERROR);
-  }
-
-  private static readonly MethodInfo GetValueForOptionMethod;
-
-  // This bit of reflective trickery is necessary because
-  // ParseResult.GetValueForOption<T>(Option<T>) will convert tokens to T as necessary,
-  // but ParseResult.GetValueForOption(Option) behaves like it was passed a Option<object> and doesn't.
-  // To work around this we use reflection to invoke the former, passing Option.ValueType as the T argument.
-  // This technique could also be used to fix the discrepancy between
-  // DafnyOptions.Get<T>(Option<T>) and DafnyOptions.Get(Option)
-  // (where in that case the latter doesn't set the default value).
-  private static object GetValueForOption(ParseResult result, Option option) {
-    // Use Reflection to invoke GetValueForOption<T> for the correct T
-    var generic = GetValueForOptionMethod.MakeGenericMethod(option.ValueType);
-    return generic.Invoke(result, new object[] { option });
-  }
-
-  private static async Task<bool> ProcessFile(DafnyOptions dafnyOptions, FileInfo singleFile) {
-    var filePathForErrors = dafnyOptions.UseBaseNameForFileName
-      ? Path.GetFileName(singleFile.FullName)
-      : singleFile.FullName;
-    if (Path.GetExtension(singleFile.FullName) == ".toml") {
-      if (dafnyOptions.DafnyProject != null) {
-        await dafnyOptions.ErrorWriter.WriteLineAsync($"Only one project file can be used at a time. Both {dafnyOptions.DafnyProject.Uri.LocalPath} and {filePathForErrors} were specified");
-        return false;
-      }
-
-      if (!File.Exists(singleFile.FullName)) {
-        await dafnyOptions.ErrorWriter.WriteLineAsync($"Error: file {filePathForErrors} not found");
-        return false;
-      }
-      var projectFile = await DafnyProject.Open(OnDiskFileSystem.Instance, new Uri(singleFile.FullName), dafnyOptions.OutputWriter, dafnyOptions.ErrorWriter);
-      if (projectFile == null) {
-        return false;
-      }
-      projectFile.Validate(dafnyOptions.OutputWriter, AllOptions);
-      dafnyOptions.DafnyProject = projectFile;
-    } else {
-      dafnyOptions.CliRootSourceUris.Add(new Uri(singleFile.FullName));
-    }
-    return true;
-  }
-
-  private static IEnumerable<Option> AllOptions {
-    get { return Commands.SelectMany(c => c.Options); }
-  }
-
-  private static CommandLineBuilder AddDeveloperHelp(RootCommand rootCommand, CommandLineBuilder builder) {
-    var languageDeveloperHelp = new Option<bool>(ToolchainDebuggingHelpName,
-      "Show help and usage information, including options designed for developing the Dafny language and toolchain.");
-    rootCommand.AddGlobalOption(languageDeveloperHelp);
-    builder = builder.AddMiddleware(async (context, next) => {
-      if (context.ParseResult.FindResultFor(languageDeveloperHelp) is { }) {
-        context.InvocationResult = new HelpResult();
-      } else {
-        await next(context);
-      }
-    }, MiddlewareOrder.Configuration - 101);
-    return builder;
-  }
-}
-
-/// <summary>
-/// The class HelpResult is internal to System.CommandLine so we have to include it as source.
-/// It seems System.CommandLine didn't consider having more than one help option as a use-case.
-/// </summary>
-internal class HelpResult : IInvocationResult {
-  public void Apply(InvocationContext context) {
-    var output = context.Console.Out.CreateTextWriter();
-    var helpBuilder = ((HelpBuilder)context.BindingContext.GetService(typeof(HelpBuilder)))!;
-    var helpContext = new HelpContext(helpBuilder,
-      context.ParseResult.CommandResult.Command,
-      output,
-      context.ParseResult);
-
-    helpBuilder.Write(helpContext);
-  }
-}
diff --git a/Source/DafnyDriver/Commands/CoverageReportCommand.cs b/Source/DafnyDriver/Commands/CoverageReportCommand.cs
index c911ca94218..42ec1770877 100644
--- a/Source/DafnyDriver/Commands/CoverageReportCommand.cs
+++ b/Source/DafnyDriver/Commands/CoverageReportCommand.cs
@@ -4,18 +4,29 @@
 #nullable disable
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
+using DafnyCore;
 
-namespace Microsoft.Dafny; 
+namespace Microsoft.Dafny;
 
-public class CoverageReportCommand : ICommandSpec {
+static class CoverageReportCommand {
+
+  public static readonly Option<CoverageLabel?> OnlyLabelOption = new("--only-label",
+    "Skip coverage labels other than the given one, after merging labels from the input reports.");
+
+  public static IEnumerable<Option> Options =>
+    new Option[] {
+      CommonOptionBag.NoTimeStampForCoverageReport,
+      OnlyLabelOption
+    };
 
   static CoverageReportCommand() {
     ReportsArgument = new("reports", r => {
       return r.Tokens.Where(t => !string.IsNullOrEmpty(t.Value)).Select(t => new FileInfo(t.Value)).ToList();
     }, true, "directories with coverage reports to be merged");
+    OptionRegistry.RegisterOption(OnlyLabelOption, OptionScope.Cli);
   }
 
   // FilesArgument is intended for Dafny files, so CoverageReportCommand adds its own argument instead
@@ -23,15 +34,21 @@ static CoverageReportCommand() {
   public static readonly Argument<string> OutDirArgument = new("outDir",
     @"directory in which to save the combined coverage report");
 
-  public IEnumerable<Option> Options => new List<Option>();
-
-  public Command Create() {
+  public static Command Create() {
     var result = new Command("merge-coverage-reports",
       "Merge several previously generated coverage reports together.");
     result.AddArgument(OutDirArgument);
     result.AddArgument(ReportsArgument);
+    foreach (var option in Options) {
+      result.AddOption(option);
+    }
+
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, async (options, _) => {
+      var coverageReporter = new CoverageReporter(options);
+      await coverageReporter.Merge(options.Get(ReportsArgument).ConvertAll(fileInfo => fileInfo.FullName),
+        options.Get(OutDirArgument));
+      return 0;
+    });
     return result;
   }
-
-  public void PostProcess(DafnyOptions dafnyOptions, Microsoft.Dafny.Options options, InvocationContext context) { }
 }
diff --git a/Source/DafnyDriver/Commands/DeadCodeCommand.cs b/Source/DafnyDriver/Commands/DeadCodeCommand.cs
new file mode 100644
index 00000000000..dd85114765f
--- /dev/null
+++ b/Source/DafnyDriver/Commands/DeadCodeCommand.cs
@@ -0,0 +1,47 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+
+#nullable disable
+using System.Collections.Generic;
+using System.CommandLine;
+using System.CommandLine.Invocation;
+using System.Linq;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+static class DeadCodeCommand {
+  public static IEnumerable<Option> Options =>
+    new Option[] {
+      GenerateTestsCommand.LoopUnroll,
+      GenerateTestsCommand.SequenceLengthLimit,
+      GenerateTestsCommand.ExpectedCoverageReport,
+      GenerateTestsCommand.ForcePrune,
+      GenerateTestsCommand.PrintBpl,
+      BoogieOptionBag.SolverLog,
+      BoogieOptionBag.SolverOption,
+      BoogieOptionBag.SolverOptionHelp,
+      BoogieOptionBag.SolverPath,
+      BoogieOptionBag.SolverResourceLimit,
+      BoogieOptionBag.VerificationTimeLimit,
+    }.Concat(DafnyCommands.ConsoleOutputOptions).
+      Concat(DafnyCommands.ResolverOptions);
+
+  public static Command Create() {
+    var result = new Command("find-dead-code", "(Experimental) Use counterexample generation to warn about potential dead code.");
+    result.AddArgument(DafnyCommands.FilesArgument);
+
+    foreach (var option in Options) {
+      result.AddOption(option);
+    }
+
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, async (options, context) => {
+      GenerateTestsCommand.PostProcess(options, TestGenerationOptions.Modes.Block);
+
+      options.TestGenOptions.WarnDeadCode = true;
+      var exitCode = await GenerateTestsCommand.GenerateTests(options);
+      return (int)exitCode;
+    });
+    return result;
+  }
+}
diff --git a/Source/DafnyDriver/Commands/DocCommand.cs b/Source/DafnyDriver/Commands/DocCommand.cs
index 3190483cff5..d3601d8946a 100644
--- a/Source/DafnyDriver/Commands/DocCommand.cs
+++ b/Source/DafnyDriver/Commands/DocCommand.cs
@@ -1,11 +1,9 @@
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.Linq;
 
 namespace Microsoft.Dafny;
 
-class DocCommand : ICommandSpec {
+static class DocCommand {
 
   public static readonly Option<string> DocProgramNameOption = new("--program-name",
     "[doc] The text to use as program name in generated documentation"
@@ -25,27 +23,27 @@ class DocCommand : ICommandSpec {
     DocProgramNameOption,
     DocFilenameFormat,
     DocShowModifyTime,
-  }.Concat(ICommandSpec.ResolverOptions);
-
-  public DocCommand() {
-    DafnyCore.DooFile.RegisterNoChecksNeeded(
-      DocProgramNameOption,
-      DocFilenameFormat,
-      DocShowModifyTime
-    );
+  }.Concat(DafnyCommands.ResolverOptions);
+
+  static DocCommand() {
+    OptionRegistry.RegisterOption(DocProgramNameOption, OptionScope.Cli);
+    OptionRegistry.RegisterOption(DocFilenameFormat, OptionScope.Cli);
+    OptionRegistry.RegisterOption(DocShowModifyTime, OptionScope.Cli);
   }
 
-  public IEnumerable<Option> Options => DocOptions;
+  public static IEnumerable<Option> Options => DocOptions;
 
-  public Command Create() {
+  public static Command Create() {
     var result = new Command("doc", @"[Experimental] Create a description page for each module. Files are placed in the folder specified by --output (default is ./docs).");
-    result.AddArgument(ICommandSpec.FilesArgument);
+    result.AddArgument(DafnyCommands.FilesArgument);
+    foreach (var option in Options) {
+      result.AddOption(option);
+    }
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, async (options, _) => {
+      options.AllowSourceFolders = true;
+      var exitValue = await DafnyDoc.DoDocumenting(options);
+      return (int)exitValue;
+    });
     return result;
   }
-
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    dafnyOptions.Compile = false;
-    dafnyOptions.DafnyVerify = false;
-    dafnyOptions.AllowSourceFolders = true;
-  }
 }
diff --git a/Source/DafnyDriver/Commands/DocumentationCommand.cs b/Source/DafnyDriver/Commands/DocumentationCommand.cs
new file mode 100644
index 00000000000..c0a59f51afb
--- /dev/null
+++ b/Source/DafnyDriver/Commands/DocumentationCommand.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.CommandLine.Invocation;
+using System.IO;
+using Microsoft.Dafny;
+using Microsoft.Dafny.Compilers;
+
+namespace DafnyDriver.Commands;
+
+public class DocumentationCommand {
+  private static readonly Argument<FileInfo> FileInfoArgument = new();
+
+  static DocumentationCommand() {
+    GeneratorErrors.RunStaticConstructor();
+    ResolutionErrors.RunStaticConstructor();
+    ParseErrors.RunStaticConstructor();
+  }
+  public static Command Create() {
+    var result = new Command("documentation", "Generates some Dafny documentation files for errors based on a template");
+    result.IsHidden = true;
+
+    result.AddArgument(FileInfoArgument);
+    result.SetHandler(CreateDocumentation);
+
+    return result;
+  }
+
+  private static void CreateDocumentation(InvocationContext context) {
+    var file = context.ParseResult.GetValueForArgument(FileInfoArgument);
+
+    var outputPath = file.FullName.Replace("template", "tmp");
+    using var reader = file.OpenRead();
+    var textReader = new StreamReader(reader);
+    using var textWriter = new StreamWriter(outputPath);
+    string errorId = null;
+    int lineNumber = 0;
+    while (textReader.ReadLine() is { } line) {
+      lineNumber++;
+      if (line.StartsWith("## **")) {
+        int errorIdStart = line.IndexOf("{#", StringComparison.Ordinal);
+        int errorIdEnd = line.LastIndexOf("}", StringComparison.Ordinal);
+        if (errorIdStart == -1 || errorIdEnd == -1) {
+          Console.WriteLine("SYNTAX ERROR IN TEMPLATE LINE " + lineNumber + ": no errorid");
+          context.ExitCode = 1;
+          return;
+        }
+        errorId = line.Substring(errorIdStart + 2, errorIdEnd - (errorIdStart + 2));
+        textWriter.WriteLine(line);
+        continue;
+      }
+      if (line.Contains("INSERT-TEXT")) {
+        var text = ErrorRegistry.GetDetail(errorId);
+        if (text != null) {
+          textWriter.Write(text); // text already has trailing newline
+        } else {
+          textWriter.WriteLine(line);
+          Console.Out.WriteLine("Unknown errorId: " + errorId);
+        }
+      } else {
+        textWriter.WriteLine(line);
+      }
+    }
+    textWriter.Flush();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyDriver/Commands/ExtractCommand.cs b/Source/DafnyDriver/Commands/ExtractCommand.cs
new file mode 100644
index 00000000000..3a670c431a7
--- /dev/null
+++ b/Source/DafnyDriver/Commands/ExtractCommand.cs
@@ -0,0 +1,64 @@
+#nullable enable
+using System.Collections.Generic;
+using System.CommandLine;
+using System.IO;
+using System.Threading.Tasks;
+using DafnyDriver.Commands;
+using Microsoft.Boogie;
+using Microsoft.Dafny.Compilers;
+
+namespace Microsoft.Dafny;
+
+public static class ExtractCommand {
+  public static Command Create() {
+
+    var result = new Command("extract", "Can be used to generate DafnyPrelude.bpl. Uses the ':extract_boogie_name' attribute to rename symbols. Turns lemmas into universally quantified axioms, as opposed to verify which turns them into Boogie procedures. When translating Dafny expressions to Boogie ones, no well-formedness checks are created.");
+
+    result.IsHidden = true;
+    result.AddArgument(SourceModule);
+    result.AddArgument(Target);
+    result.AddArgument(DafnyCommands.FilesArgument);
+    foreach (var option in ExtractOptions) {
+      result.AddOption(option);
+    }
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, (options, _) => HandleExtraction(options));
+    return result;
+  }
+
+  private static readonly Argument<string> SourceModule = new("The name of the module to be extracted.");
+
+  private static readonly Argument<FileInfo> Target = new("The path of the extracted file.");
+
+  private static IReadOnlyList<Option> ExtractOptions =>
+    new Option[] { }.
+      Concat(DafnyCommands.ConsoleOutputOptions).
+      Concat(DafnyCommands.ResolverOptions);
+
+  public static async Task<int> HandleExtraction(DafnyOptions options) {
+    if (options.Get(CommonOptionBag.VerificationCoverageReport) != null) {
+      options.TrackVerificationCoverage = true;
+    }
+
+    var compilation = CliCompilation.Create(options);
+    compilation.Start();
+
+    var resolution = await compilation.Resolution;
+    if (resolution is not { HasErrors: false }) {
+      return await compilation.GetAndReportExitCode();
+    }
+
+    var sourceModuleName = options.Get(SourceModule);
+    var outputPath = options.Get(Target).FullName;
+    using var engine = ExecutionEngine.CreateWithoutSharedCache(options);
+    try {
+      var extractedProgram = BoogieExtractor.Extract(resolution.ResolvedProgram, sourceModuleName);
+      engine.PrintBplFile(outputPath, extractedProgram, true, pretty: true);
+    } catch (ExtractorError extractorError) {
+      var tok = extractorError.Tok;
+      await options.OutputWriter.WriteLineAsync($"{tok.filename}({tok.line},{tok.col}): Boogie axiom extraction error: {extractorError.Message}");
+      return 1;
+    }
+
+    return await compilation.GetAndReportExitCode();
+  }
+}
diff --git a/Source/DafnyDriver/Commands/FormatCommand.cs b/Source/DafnyDriver/Commands/FormatCommand.cs
index d129f589f4b..5c4b70677f4 100644
--- a/Source/DafnyDriver/Commands/FormatCommand.cs
+++ b/Source/DafnyDriver/Commands/FormatCommand.cs
@@ -1,25 +1,182 @@
+using System;
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
+using System.Diagnostics.Contracts;
+using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
+using DafnyCore;
 
 namespace Microsoft.Dafny;
 
-class FormatCommand : ICommandSpec {
+public static class FormatCommand {
 
-  public IEnumerable<Option> Options => ICommandSpec.FormatOptions;
+  static FormatCommand() {
+    DafnyOptions.RegisterLegacyBinding(CheckOption, (options, value) => {
+      options.FormatCheck = value;
+    });
 
-  public Command Create() {
+    DafnyOptions.RegisterLegacyBinding(FormatPrint, (options, value) => {
+      options.DafnyPrintFile = value ? "-" : null;
+    });
+    OptionRegistry.RegisterOption(CheckOption, OptionScope.Cli);
+    OptionRegistry.RegisterOption(FormatPrint, OptionScope.Cli);
+  }
+
+  public static IEnumerable<Option> Options => new Option[] {
+    CheckOption,
+    FormatPrint,
+  }.Concat(DafnyCommands.ParserOptions);
+
+  public static readonly Option<bool> CheckOption = new("--check", () => false, @"
+Instead of formatting files, verify that all files are already
+formatted through and return a non-zero exit code if it is not the case".TrimStart());
+
+  public static readonly Option<bool> FormatPrint = new("--print",
+    @"Print Dafny program to stdout after formatting it instead of altering the files.") {
+  };
+
+  public static Command Create() {
     var result = new Command("format", @"Format the dafny file in-place.
 If no dafny file is provided, will look for every available Dafny file.
-Use '--print -' to output the content of the formatted files instead of overwriting them.");
-    result.AddArgument(ICommandSpec.FilesArgument);
+Use '--print' to output the content of the formatted files instead of overwriting them.");
+    result.AddArgument(DafnyCommands.FilesArgument);
+
+    foreach (var option in Options) {
+      result.AddOption(option);
+    }
+
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, async (options, _) => {
+      options.AllowSourceFolders = true;
+      var exitValue = await DoFormatting(options);
+      return (int)exitValue;
+    });
+
     return result;
   }
 
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    dafnyOptions.Format = true;
-    dafnyOptions.Compile = false;
-    dafnyOptions.AllowSourceFolders = true;
+  public static async Task<ExitValue> DoFormatting(DafnyOptions options) {
+    var (code, dafnyFiles, _) = await SynchronousCliCompilation.GetDafnyFiles(options);
+    if (code != 0) {
+      return code;
+    }
+    var errorWriter = options.ErrorWriter;
+    var dafnyFileNames = DafnyFile.FileNames(dafnyFiles);
+    string programName = dafnyFileNames.Count == 1 ? dafnyFileNames[0] : "the_program";
+
+    var exitValue = ExitValue.SUCCESS;
+    Contract.Assert(dafnyFiles.Count > 0 || options.SourceFolders.Count > 0);
+    var folderFiles = options.SourceFolders.Select(folderPath => GetFilesForFolder(options, folderPath)).SelectMany(x => x);
+    dafnyFiles = dafnyFiles.Concat(folderFiles).ToList();
+
+    var failedToParseFiles = new List<string>();
+    var emptyFiles = new List<string>();
+    var doCheck = options.FormatCheck;
+    var doPrint = options.DafnyPrintFile == "-";
+    options.DafnyPrintFile = null;
+    var neededFormatting = 0;
+    foreach (var file in dafnyFiles) {
+      var dafnyFile = file;
+      if (dafnyFile.Uri.Scheme == "stdin" && !doCheck && !doPrint) {
+        await errorWriter.WriteLineAsync("Please use the '--check' and/or '--print' option as stdin cannot be formatted in place.");
+        exitValue = ExitValue.PREPROCESSING_ERROR;
+        continue;
+      }
+      if (dafnyFile.Extension == DooFile.Extension && !doCheck && !doPrint) {
+        await errorWriter.WriteLineAsync("Please use the '--check' and/or '--print' option as doo files cannot be formatted in place.");
+        exitValue = ExitValue.PREPROCESSING_ERROR;
+        continue;
+      }
+
+      string tempFileName = null;
+      if (dafnyFile.Uri.Scheme == "stdin") {
+        tempFileName = Path.GetTempFileName() + ".dfy";
+        SynchronousCliCompilation.WriteFile(tempFileName, await Console.In.ReadToEndAsync());
+        dafnyFile = DafnyFile.HandleDafnyFile(OnDiskFileSystem.Instance, new ConsoleErrorReporter(options), options, new Uri(tempFileName), Token.NoToken);
+      }
+
+      var content = dafnyFile.GetContent();
+      var originalText = await content.Reader.ReadToEndAsync();
+      content.Reader.Close(); // Manual closing because we want to overwrite
+      dafnyFile.GetContent = () => content with { Reader = new StringReader(originalText) };
+      // Might not be totally optimized but let's do that for now
+      var (dafnyProgram, err) = await DafnyMain.Parse(new List<DafnyFile> { dafnyFile }, programName, options);
+      if (err != null) {
+        exitValue = ExitValue.DAFNY_ERROR;
+        await errorWriter.WriteLineAsync(err);
+        failedToParseFiles.Add(dafnyFile.BaseName);
+      } else {
+        var firstToken = dafnyProgram.GetFirstTokenForUri(file.Uri);
+        var result = originalText;
+        if (firstToken != null) {
+          result = Formatting.__default.ReindentProgramFromFirstToken(firstToken,
+            IndentationFormatter.ForProgram(dafnyProgram, file.Uri));
+          if (result != originalText) {
+            neededFormatting += 1;
+            if (doCheck) {
+              exitValue = exitValue != ExitValue.DAFNY_ERROR ? ExitValue.FORMAT_ERROR : exitValue;
+            }
+
+            if (doCheck && (!doPrint || options.Verbose)) {
+              await options.OutputWriter.WriteLineAsync(
+                $"The file {options.GetPrintPath(dafnyFile.FilePath)} needs to be formatted");
+            }
+
+            if (!doCheck && !doPrint) {
+              SynchronousCliCompilation.WriteFile(dafnyFile.FilePath, result);
+            }
+          }
+        } else {
+          // TODO: is this necessary? there already is a warning about files containing no code
+          if (options.Verbose) {
+            await options.ErrorWriter.WriteLineAsync(dafnyFile.BaseName + " was empty.");
+          }
+
+          emptyFiles.Add(options.GetPrintPath(dafnyFile.FilePath));
+        }
+        if (doPrint) {
+          await options.OutputWriter.WriteAsync(result);
+        }
+      }
+
+      if (tempFileName != null) {
+        File.Delete(tempFileName);
+      }
+    }
+
+    string Files(int num) {
+      return num + (num != 1 ? " files" : " file");
+    }
+
+    // Report any errors
+    var reportMsg = "";
+    if (failedToParseFiles.Count > 0) {
+      reportMsg += $"\n{Files(failedToParseFiles.Count)} failed to parse:\n  " + string.Join("\n  ", failedToParseFiles);
+    }
+    if (emptyFiles.Count > 0) {
+      reportMsg += $"\n{Files(emptyFiles.Count)} {(emptyFiles.Count > 1 ? "were" : "was")} empty:\n  " + string.Join("\n  ", emptyFiles);
+    }
+
+    var unchanged = dafnyFiles.Count - failedToParseFiles.Count - emptyFiles.Count - neededFormatting;
+    reportMsg += unchanged > 0 && (failedToParseFiles.Count > 0 || emptyFiles.Count > 0) ? $"\n{Files(unchanged)} {(unchanged > 1 ? "were" : "was")} already formatted." : "";
+    var filesNeedFormatting = neededFormatting == 0 ? "" : $"{Files(neededFormatting)} need{(neededFormatting > 1 ? "" : "s")} formatting.";
+    reportMsg = filesNeedFormatting + reportMsg;
+
+    if (doCheck) {
+      await options.OutputWriter.WriteLineAsync(neededFormatting > 0
+        ? $"Error: {reportMsg}"
+        : "All files are correctly formatted");
+    } else if (failedToParseFiles.Count > 0 || options.Verbose) {
+      // We don't display anything if we just format files without verbosity and there was no parse error
+      await options.OutputWriter.WriteLineAsync($"{reportMsg}");
+    }
+
+    return exitValue;
+  }
+
+  public static IEnumerable<DafnyFile> GetFilesForFolder(DafnyOptions options, string folderPath) {
+    return Directory.GetFiles(folderPath, "*.dfy", SearchOption.AllDirectories)
+      .Select(name => DafnyFile.HandleDafnyFile(OnDiskFileSystem.Instance,
+        new ConsoleErrorReporter(options), options, new Uri(name), Token.Cli));
   }
 }
diff --git a/Source/DafnyDriver/Commands/GenerateTestsCommand.cs b/Source/DafnyDriver/Commands/GenerateTestsCommand.cs
new file mode 100644
index 00000000000..9be4449ba8e
--- /dev/null
+++ b/Source/DafnyDriver/Commands/GenerateTestsCommand.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using DafnyCore;
+using DafnyTestGeneration;
+using Microsoft.Boogie;
+
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+
+#nullable disable
+namespace Microsoft.Dafny;
+
+static class GenerateTestsCommand {
+  public static IEnumerable<Option> Options {
+    get {
+      return new Option[] {
+        IgnoreWarnings,
+        LoopUnroll,
+        SequenceLengthLimit,
+        BoogieOptionBag.SolverLog,
+        BoogieOptionBag.SolverOption,
+        BoogieOptionBag.SolverOptionHelp,
+        BoogieOptionBag.SolverPath,
+        BoogieOptionBag.SolverPlugin,
+        BoogieOptionBag.SolverResourceLimit,
+        BoogieOptionBag.VerificationTimeLimit,
+        PrintBpl,
+        ExpectedCoverageReport,
+        CommonOptionBag.NoTimeStampForCoverageReport,
+        ForcePrune,
+      }.Concat(DafnyCommands.ConsoleOutputOptions.Except(new[] { CommonOptionBag.AllowWarnings }).ToList()).
+        Concat(DafnyCommands.ResolverOptions);
+    }
+  }
+
+  private enum Mode {
+    Path,
+    Block,
+    InlinedBlock
+  }
+
+  private static readonly Argument<Mode> modeArgument = new("mode", @"
+Block - Generate tests targeting block-coverage.
+InlinedBlock - Generate tests targeting block coverage after inlining (call-graph sensitive block coverage).
+Path - Generate tests targeting path-coverage.");
+
+  public static Command Create() {
+    var result = new Command("generate-tests", "(Experimental) Generate Dafny tests that ensure block or path coverage of a particular Dafny program.");
+    result.AddArgument(modeArgument);
+    result.AddArgument(DafnyCommands.FilesArgument);
+
+    foreach (var option in Options) {
+      result.AddOption(option);
+    }
+
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, async (options, context) => {
+      var mode = context.ParseResult.GetValueForArgument(modeArgument) switch {
+        Mode.Path => TestGenerationOptions.Modes.Path,
+        Mode.Block => TestGenerationOptions.Modes.Block,
+        Mode.InlinedBlock => TestGenerationOptions.Modes.InlinedBlock,
+        _ => throw new ArgumentOutOfRangeException()
+      };
+      PostProcess(options, mode);
+
+      var exitCode = await GenerateTests(options);
+      return (int)exitCode;
+    });
+
+    return result;
+  }
+
+  public static async Task<ExitValue> GenerateTests(DafnyOptions options) {
+    var (exitValue, dafnyFiles, _) = await SynchronousCliCompilation.GetDafnyFiles(options);
+    if (exitValue != ExitValue.SUCCESS) {
+      return exitValue;
+    }
+
+    if (dafnyFiles.Count > 1 &&
+        options.TestGenOptions.Mode != TestGenerationOptions.Modes.None) {
+      await options.OutputWriter.WriteLineAsync(
+        "*** Error: Only one .dfy file can be specified for testing");
+      return ExitValue.PREPROCESSING_ERROR;
+    }
+
+    var dafnyFileNames = DafnyFile.FileNames(dafnyFiles);
+
+    var uri = new Uri(dafnyFileNames[0]);
+    var source = new StreamReader(dafnyFileNames[0]);
+    var coverageReport = new CoverageReport(name: "Expected Test Coverage", units: "Lines", suffix: "_tests_expected", program: null);
+    if (options.TestGenOptions.WarnDeadCode) {
+      await foreach (var line in TestGenerator.GetDeadCodeStatistics(source, uri, options, coverageReport)) {
+        await options.OutputWriter.WriteLineAsync(line);
+      }
+    } else {
+      await foreach (var line in TestGenerator.GetTestClassForProgram(source, uri, options, coverageReport)) {
+        await options.OutputWriter.WriteLineAsync(line);
+      }
+    }
+    if (options.TestGenOptions.CoverageReport != null) {
+      await new CoverageReporter(options).SerializeCoverageReports(coverageReport, options.TestGenOptions.CoverageReport);
+    }
+    if (TestGenerator.SetNonZeroExitCode) {
+      exitValue = ExitValue.DAFNY_ERROR;
+    }
+    return exitValue;
+  }
+
+  internal static void PostProcess(DafnyOptions dafnyOptions, TestGenerationOptions.Modes mode) {
+    dafnyOptions.CompilerName = "cs";
+    dafnyOptions.Compile = true;
+    dafnyOptions.RunAfterCompile = false;
+    dafnyOptions.ForceCompile = false;
+    dafnyOptions.DeprecationNoise = 0;
+    dafnyOptions.ForbidNondeterminism = true;
+    dafnyOptions.DefiniteAssignmentLevel = 2;
+    dafnyOptions.UseBaseNameForFileName = false;
+    dafnyOptions.VerifyAllModules = true;
+    dafnyOptions.TypeEncodingMethod = CoreOptions.TypeEncoding.Predicates;
+    dafnyOptions.Set(Snippets.ShowSnippets, false);
+    dafnyOptions.TestGenOptions.Mode = mode;
+  }
+
+  public static readonly Option<bool> IgnoreWarnings = new("--ignore-warnings",
+    "Ignore warnings when generating tests.");
+
+  public static readonly Option<uint> SequenceLengthLimit = new("--length-limit",
+    "Add an axiom that sets the length of all sequences to be no greater than <n>. 0 (default) indicates no limit.");
+
+  public static readonly Option<int> LoopUnroll = new("--loop-unroll", () => -1,
+    "Higher values can improve accuracy of the analysis at the cost of taking longer to run.");
+
+  public static readonly Option<string> PrintBpl = new("--print-bpl",
+    "Print the Boogie code used during test generation.") {
+    ArgumentHelpName = "filename"
+  };
+  public static readonly Option<string> ExpectedCoverageReport = new(new[] { "--expected-coverage-report", "--coverage-report" },
+    "Emit expected test coverage report to a given directory.") {
+    ArgumentHelpName = "directory"
+  };
+  public static readonly Option<bool> ForcePrune = new("--force-prune",
+    "Enable axiom pruning that Dafny uses to speed up verification. This may negatively affect the quality of tests.");
+  static GenerateTestsCommand() {
+    DafnyOptions.RegisterLegacyBinding(IgnoreWarnings, (options, value) => {
+      options.TestGenOptions.IgnoreWarnings = value;
+    });
+    DafnyOptions.RegisterLegacyBinding(LoopUnroll, (options, value) => {
+      options.LoopUnrollCount = value;
+    });
+    DafnyOptions.RegisterLegacyBinding(SequenceLengthLimit, (options, value) => {
+      options.TestGenOptions.SeqLengthLimit = value;
+    });
+    DafnyOptions.RegisterLegacyBinding(PrintBpl, (options, value) => {
+      options.TestGenOptions.PrintBpl = value;
+    });
+    DafnyOptions.RegisterLegacyBinding(ExpectedCoverageReport, (options, value) => {
+      options.TestGenOptions.CoverageReport = value;
+    });
+    DafnyOptions.RegisterLegacyBinding(ForcePrune, (options, value) => {
+      options.TestGenOptions.ForcePrune = value;
+    });
+
+    OptionRegistry.RegisterOption(LoopUnroll, OptionScope.Cli);
+    OptionRegistry.RegisterOption(SequenceLengthLimit, OptionScope.Cli);
+    OptionRegistry.RegisterOption(PrintBpl, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ExpectedCoverageReport, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ForcePrune, OptionScope.Cli);
+    OptionRegistry.RegisterOption(IgnoreWarnings, OptionScope.Cli);
+  }
+}
diff --git a/Source/DafnyDriver/Commands/MeasureComplexityCommand.cs b/Source/DafnyDriver/Commands/MeasureComplexityCommand.cs
index b759393269c..f02d8c7ded0 100644
--- a/Source/DafnyDriver/Commands/MeasureComplexityCommand.cs
+++ b/Source/DafnyDriver/Commands/MeasureComplexityCommand.cs
@@ -1,44 +1,139 @@
+using System;
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
 using System.Linq;
+using System.Reactive.Subjects;
+using System.Threading;
+using System.Threading.Tasks;
 using DafnyCore;
+using DafnyDriver.Commands;
+using Microsoft.Boogie;
+using VC;
 
 namespace Microsoft.Dafny;
 
-public class MeasureComplexityCommand : ICommandSpec {
-  public IEnumerable<Option> Options => new Option[] {
+static class MeasureComplexityCommand {
+  public static IEnumerable<Option> Options => new Option[] {
     Iterations,
     RandomSeed,
-  }.Concat(ICommandSpec.VerificationOptions).
-    Concat(ICommandSpec.ResolverOptions);
+    TopX,
+    VerifyCommand.FilterSymbol,
+    VerifyCommand.FilterPosition,
+  }.Concat(DafnyCommands.VerificationOptions).
+    Concat(DafnyCommands.ResolverOptions).
+    Concat(DafnyCommands.ConsoleOutputOptions);
 
   static MeasureComplexityCommand() {
     DafnyOptions.RegisterLegacyBinding(Iterations, (o, v) => o.RandomizeVcIterations = (int)v);
     DafnyOptions.RegisterLegacyBinding(RandomSeed, (o, v) => o.RandomSeed = (int)v);
 
-    DooFile.RegisterNoChecksNeeded(
-      Iterations,
-      RandomSeed
-    );
+    OptionRegistry.RegisterOption(Iterations, OptionScope.Cli);
+    OptionRegistry.RegisterOption(RandomSeed, OptionScope.Cli);
+    OptionRegistry.RegisterOption(TopX, OptionScope.Cli);
   }
 
+  private static readonly Option<uint> TopX = new("--worst-amount", () => 10U,
+    $"Configures the amount of worst performing verification tasks that are reported.");
+
   private static readonly Option<uint> RandomSeed = new("--random-seed", () => 0U,
     $"Turn on randomization of the input that Dafny passes to the SMT solver and turn on randomization in the SMT solver itself. Certain Dafny proofs are complex in the sense that changes to the proof that preserve its meaning may cause its verification result to change. This option simulates meaning-preserving changes to the proofs without requiring the user to actually make those changes. The proof changes are renaming variables and reordering declarations in the SMT input passed to the solver, and setting solver options that have similar effects.");
 
-  private static readonly Option<uint> Iterations = new("--iterations", () => 10U,
+  private static readonly Option<uint> Iterations = new("--iterations", () => 1U,
     $"Attempt to verify each proof n times with n random seeds, each seed derived from the previous one. {RandomSeed.Name} can be used to specify the first seed, which will otherwise be 0.") {
     ArgumentHelpName = "n"
   };
 
-
-  public Command Create() {
+  public static Command Create() {
     var result = new Command("measure-complexity", "(Experimental) Measure the complexity of verifying the program.");
-    result.AddArgument(ICommandSpec.FilesArgument);
+    result.AddArgument(DafnyCommands.FilesArgument);
+    foreach (var option in Options) {
+      result.AddOption(option);
+    }
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, (options, _) => Execute(options));
     return result;
   }
 
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    dafnyOptions.Compile = false;
+  private static async Task<int> Execute(DafnyOptions options) {
+    if (options.Get(CommonOptionBag.VerificationCoverageReport) != null) {
+      options.TrackVerificationCoverage = true;
+    }
+
+    var compilation = CliCompilation.Create(options);
+    compilation.Start();
+
+    var resolution = await compilation.Resolution;
+    if (resolution != null) {
+      Subject<CanVerifyResult> verificationResults = new();
+
+      // We should redesign the output of this command 
+      // It should start out with a summary that reports how many proofs are brittle, and shows statistical data,
+      // such as averages and standard-deviations.
+      // For error diagnostics, we should group duplicates and say how often they occur.
+      // Performance data of individual verification tasks (VCs) should be grouped by VcNum (the assertion batch).
+      VerifyCommand.ReportVerificationDiagnostics(compilation, verificationResults);
+      var summaryReported = ReportResourceSummary(compilation, verificationResults);
+      var proofDependenciesReported = VerifyCommand.ReportProofDependencies(compilation, resolution, verificationResults);
+      var verificationResultsLogged = VerifyCommand.LogVerificationResults(compilation, resolution, verificationResults);
+
+      await RunVerificationIterations(options, compilation, verificationResults);
+      await summaryReported;
+      await verificationResultsLogged;
+      await proofDependenciesReported;
+    }
+
+    return await compilation.GetAndReportExitCode();
+  }
+
+  public static async Task ReportResourceSummary(
+    CliCompilation cliCompilation,
+    IObservable<CanVerifyResult> verificationResults) {
+
+    PriorityQueue<VerificationTaskResult, int> worstPerformers = new();
+
+    var totalResources = 0;
+    var worstAmount = cliCompilation.Options.Get(TopX);
+    verificationResults.Subscribe(result => {
+      foreach (var taskResult in result.Results) {
+        var runResult = taskResult.Result;
+        totalResources += runResult.ResourceCount;
+        worstPerformers.Enqueue(taskResult, runResult.ResourceCount);
+        if (worstPerformers.Count > worstAmount) {
+          worstPerformers.Dequeue();
+        }
+      }
+    });
+    await verificationResults.WaitForComplete();
+    var output = cliCompilation.Options.OutputWriter;
+    var decreasingWorst = new Stack<VerificationTaskResult>();
+    while (worstPerformers.Count > 0) {
+      decreasingWorst.Push(worstPerformers.Dequeue());
+    }
+
+    await output.WriteLineAsync($"The total consumed resources are {totalResources}");
+    await output.WriteLineAsync($"The most demanding {worstAmount} verification tasks consumed these resources:");
+    foreach (var performer in decreasingWorst) {
+      var location = BoogieGenerator.ToDafnyToken(false, performer.Task.Token).TokenToString(cliCompilation.Options);
+      await output.WriteLineAsync($"{location}: {performer.Result.ResourceCount}");
+    }
+  }
+
+  private static async Task RunVerificationIterations(DafnyOptions options, CliCompilation compilation,
+    IObserver<CanVerifyResult> verificationResultsObserver) {
+    int iterationSeed = (int)options.Get(RandomSeed);
+    var random = new Random(iterationSeed);
+    var iterations = (int)options.Get(Iterations);
+    foreach (var iteration in Enumerable.Range(0, iterations)) {
+      await options.OutputWriter.WriteLineAsync(
+        $"Starting verification of iteration {iteration + 1}/{iterations} with seed {iterationSeed}");
+      try {
+        await foreach (var result in compilation.VerifyAllLazily(iterationSeed)) {
+          verificationResultsObserver.OnNext(result);
+        }
+      } catch (Exception e) {
+        verificationResultsObserver.OnError(e);
+      }
+      iterationSeed = random.Next();
+    }
+    verificationResultsObserver.OnCompleted();
   }
 }
diff --git a/Source/DafnyDriver/Commands/ResolveCommand.cs b/Source/DafnyDriver/Commands/ResolveCommand.cs
new file mode 100644
index 00000000000..628036c5fb7
--- /dev/null
+++ b/Source/DafnyDriver/Commands/ResolveCommand.cs
@@ -0,0 +1,30 @@
+using System;
+using System.CommandLine;
+using DafnyDriver.Commands;
+
+namespace Microsoft.Dafny;
+
+static class ResolveCommand {
+
+  public static Command Create() {
+    var result = new Command("resolve", "Only check for parse and type resolution errors.");
+    result.AddArgument(DafnyCommands.FilesArgument);
+    foreach (var option in DafnyCommands.ConsoleOutputOptions.Concat(DafnyCommands.ResolverOptions)) {
+      result.AddOption(option);
+    }
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, async (options, _) => {
+      options.Set(DafnyFile.DoNotVerifyDependencies, true);
+      var compilation = CliCompilation.Create(options);
+      compilation.Compilation.ShouldProcessSolverOptions = false;
+      compilation.Start();
+      await compilation.Resolution;
+
+      var value = await compilation.GetAndReportExitValue();
+      if (value == ExitValue.SUCCESS) {
+        await options.OutputWriter.WriteLineAsync("\nDafny program verifier did not attempt verification");
+      }
+      return (int)value;
+    });
+    return result;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyDriver/Commands/RunCommand.cs b/Source/DafnyDriver/Commands/RunCommand.cs
index a159657801f..ce994f0d1bc 100644
--- a/Source/DafnyDriver/Commands/RunCommand.cs
+++ b/Source/DafnyDriver/Commands/RunCommand.cs
@@ -2,56 +2,94 @@
 using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
+using System.CommandLine.Parsing;
+using System.Data;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using DafnyCore;
 
 namespace Microsoft.Dafny;
 
-class RunCommand : ICommandSpec {
-  private readonly Argument<IEnumerable<string>> userProgramArguments;
+public static class RunCommand {
+  private static readonly Argument<IEnumerable<string>> UserProgramArguments;
 
   public static readonly Option<IEnumerable<string>> Inputs = new("--input", "Specify an additional input file.") {
     ArgumentHelpName = "file"
   };
 
   static RunCommand() {
+    UserProgramArguments = new Argument<IEnumerable<string>>("program-arguments", "arguments to the Dafny program");
+    UserProgramArguments.SetDefaultValue(new List<string>());
+
     DafnyOptions.RegisterLegacyBinding(Inputs, (options, files) => {
       foreach (var file in files) {
         options.CliRootSourceUris.Add(new Uri(Path.GetFullPath(file)));
       }
     });
 
-    DooFile.RegisterNoChecksNeeded(
-      Inputs
-    );
+    DafnyOptions.RegisterLegacyBinding(MainOverride, (options, value) => {
+      options.MainMethod = value;
+    });
+
+    OptionRegistry.RegisterOption(Inputs, OptionScope.Cli);
+    OptionRegistry.RegisterOption(MainOverride, OptionScope.Cli);
+    OptionRegistry.RegisterOption(CommonOptionBag.BuildFile, OptionScope.Cli);
   }
 
-  public IEnumerable<Option> Options =>
+  public static readonly Option<string> MainOverride =
+    new("--main-method", "Override the method called to start the program, using a fully qualified method name.");
+
+  public static IEnumerable<Option> Options =>
     new Option[] {
       Inputs,
-    }.Concat(ICommandSpec.ExecutionOptions).
-      Concat(ICommandSpec.ConsoleOutputOptions).
-      Concat(ICommandSpec.ResolverOptions);
-
-  public RunCommand() {
-    userProgramArguments = new Argument<IEnumerable<string>>("program-arguments", "arguments to the Dafny program");
-    userProgramArguments.SetDefaultValue(new List<string>());
-  }
+      MainOverride,
+      CommonOptionBag.BuildFile,
+    }.Concat(DafnyCommands.ExecutionOptions).
+      Concat(DafnyCommands.ConsoleOutputOptions).
+      Concat(DafnyCommands.ResolverOptions);
 
-  public Command Create() {
+  public static Command Create() {
     var result = new Command("run", "Run the program.");
-    result.AddArgument(CommandRegistry.FileArgument);
-    result.AddArgument(userProgramArguments);
+    result.AddArgument(DafnyCommands.FileArgument);
+    result.AddArgument(UserProgramArguments);
+    // result.TreatUnmatchedTokensAsErrors = false;
+    foreach (var option in Options) {
+      result.AddOption(option);
+    }
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, async (options, context) => {
+      await CheckForMistypedDafnyOption(context, options);
+      options.MainArgs = context.ParseResult.GetValueForArgument(UserProgramArguments).ToList();
+      options.Compile = true;
+      options.RunAfterCompile = true;
+      options.ForceCompile = options.Get(BoogieOptionBag.NoVerify);
+
+      return await SynchronousCliCompilation.Run(options);
+    });
     return result;
   }
 
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    dafnyOptions.MainArgs = context.ParseResult.GetValueForArgument(userProgramArguments).ToList();
-    var inputFile = context.ParseResult.GetValueForArgument(CommandRegistry.FileArgument);
-    dafnyOptions.CliRootSourceUris.Add(new Uri(Path.GetFullPath(inputFile.FullName)));
-    dafnyOptions.Compile = true;
-    dafnyOptions.RunAfterCompile = true;
-    dafnyOptions.ForceCompile = dafnyOptions.Get(BoogieOptionBag.NoVerify);
+  /// <summary>
+  /// This check tries to determine if users tried to use a Dafny option but mistyped the option name.
+  /// This check uses the position of a `--` token in a way that is not compliant with POSIX conventions,
+  /// but we believe this is worth the improved feedback.
+  /// </summary>
+  private static async Task CheckForMistypedDafnyOption(InvocationContext context, DafnyOptions options) {
+    var userProgramArgumentTokens = context.ParseResult.FindResultFor(UserProgramArguments)!.Tokens.Select(t => t.Value).ToHashSet();
+    foreach (var token in context.ParseResult.Tokens) {
+      // This check may lead to false positives if CLI is given the same value twice,
+      // once as a Dafny option and once as a user program argument
+      // The problem is that the tokens in context.ParseResult.FindResultFor(UserProgramArguments)!.Tokens
+      // are not aware of their position in the argument list,
+      // and cannot be compared with the tokens in context.ParseResult.Tokens,
+      // so it's not possible to determine whether they occurred before the -- or not.
+      var valueOfUserProgramArgument = userProgramArgumentTokens.Contains(token.Value);
+      if (token.Value.StartsWith("--") && token.Type == TokenType.Argument && valueOfUserProgramArgument) {
+        await options.OutputWriter.WriteLineAsync($"Argument {token.Value} is not a Dafny option so it was interpreted as an argument to the user program, even though it starts with '--'. Move this argument to after a `--` token to silence this message.");
+      }
+      if (token.Value == "--") {
+        break;
+      }
+    }
   }
 }
diff --git a/Source/DafnyDriver/Commands/ServerCommand.cs b/Source/DafnyDriver/Commands/ServerCommand.cs
new file mode 100644
index 00000000000..51381672ef5
--- /dev/null
+++ b/Source/DafnyDriver/Commands/ServerCommand.cs
@@ -0,0 +1,41 @@
+using System.CommandLine;
+using Microsoft.Dafny.LanguageServer.Language;
+using Microsoft.Dafny.LanguageServer.Language.Symbols;
+using Microsoft.Dafny.LanguageServer.Workspace;
+
+namespace Microsoft.Dafny.LanguageServer;
+
+public class ServerCommand {
+  public static readonly Command Instance = Create();
+
+  private ServerCommand() {
+  }
+
+  static ServerCommand() {
+    DafnyOptions.RegisterLegacyBinding(LanguageServer.VerifySnapshots, (options, u) => options.VerifySnapshots = (int)u);
+
+    OptionRegistry.RegisterOption(ProjectManager.Verification, OptionScope.Cli);
+    OptionRegistry.RegisterOption(GhostStateDiagnosticCollector.GhostIndicators, OptionScope.Cli);
+    OptionRegistry.RegisterOption(GutterIconAndHoverVerificationDetailsManager.LineVerificationStatus, OptionScope.Cli);
+    OptionRegistry.RegisterOption(LanguageServer.VerifySnapshots, OptionScope.Cli);
+    OptionRegistry.RegisterOption(DafnyLangSymbolResolver.UseCaching, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ProjectManager.UpdateThrottling, OptionScope.Cli);
+    OptionRegistry.RegisterOption(ProjectManager.ReuseSolvers, OptionScope.Cli);
+    OptionRegistry.RegisterOption(LegacySignatureAndCompletionTable.MigrateSignatureAndCompletionTable, OptionScope.Cli);
+  }
+
+  private static Command Create() {
+    var result = new Command("server", "Start the Dafny language server");
+    foreach (var option in LanguageServer.Options) {
+      result.Add(option);
+    }
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, async (options, context) => {
+      options.Set(DafnyFile.DoNotVerifyDependencies, true);
+      LanguageServer.ConfigureDafnyOptionsForServer(options);
+      await LanguageServer.Start(options);
+      return 0;
+    });
+    return result;
+  }
+
+}
diff --git a/Source/DafnyDriver/Commands/TestCommand.cs b/Source/DafnyDriver/Commands/TestCommand.cs
index 5a619b588ec..6cd26b9b4a4 100644
--- a/Source/DafnyDriver/Commands/TestCommand.cs
+++ b/Source/DafnyDriver/Commands/TestCommand.cs
@@ -1,42 +1,55 @@
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.Linq;
 using DafnyCore;
 
 namespace Microsoft.Dafny;
 
-public class TestCommand : ICommandSpec {
-  public IEnumerable<Option> Options =>
-    new Option[] {
-      CommonOptionBag.Output,
-      MethodsToTest,
-    }.Concat(ICommandSpec.ExecutionOptions).
-      Concat(ICommandSpec.ConsoleOutputOptions).
-      Concat(ICommandSpec.ResolverOptions);
-
-  public static readonly Option<string> MethodsToTest = new("--methods-to-test",
-    "A regex (over fully qualified names) selecting which methods or functions to test") {
-  };
+static class TestCommand {
 
   static TestCommand() {
     DafnyOptions.RegisterLegacyBinding(MethodsToTest, (o, v) => { o.MethodsToTest = v; });
 
-    DooFile.RegisterNoChecksNeeded(MethodsToTest);
+    OptionRegistry.RegisterOption(MethodsToTest, OptionScope.Cli);
+
+    DafnyOptions.RegisterLegacyUi(RunAllTestsMainMethod.IncludeTestRunner, DafnyOptions.ParseBoolean, "Compilation options", "runAllTests", @"0 (default) - Annotates compiled methods with the {:test}
+        attribute such that they can be tested using a testing framework
+        in the target language (e.g. xUnit for C#).
+    1 - Emits a main method in the target language that will execute
+        every method in the program with the {:test} attribute. Cannot
+        be used if the program already contains a main method. Note that
+        /compile:3 or 4 must be provided as well to actually execute
+        this main method!", argumentName: "n");
   }
 
+  public static IEnumerable<Option> Options =>
+    new Option[] {
+      CommonOptionBag.Output,
+      MethodsToTest,
+    }.Concat(DafnyCommands.ExecutionOptions).
+      Concat(DafnyCommands.ConsoleOutputOptions).
+      Concat(DafnyCommands.ResolverOptions);
 
-  public Command Create() {
+  private static readonly Option<string> MethodsToTest = new("--methods-to-test",
+    "A regex (over fully qualified names) selecting which methods or functions to test") {
+  };
+
+  public static Command Create() {
     var result = new Command("test", "(Experimental) Execute every method in the program that's annotated with the {:test} attribute.");
-    result.AddArgument(ICommandSpec.FilesArgument);
+    result.AddArgument(DafnyCommands.FilesArgument);
+    foreach (var option in Options) {
+      result.AddOption(option);
+    }
+
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, (options, _) => {
+      options.Compile = true;
+      options.RunAfterCompile = true;
+      options.Set(RunAllTestsMainMethod.IncludeTestRunner, true);
+      options.ForceCompile = options.Get(BoogieOptionBag.NoVerify);
+      options.MainMethod = RunAllTestsMainMethod.SyntheticTestMainName;
+      return SynchronousCliCompilation.Run(options);
+    });
     return result;
   }
 
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    dafnyOptions.Compile = true;
-    dafnyOptions.RunAfterCompile = true;
-    dafnyOptions.RunAllTests = true;
-    dafnyOptions.ForceCompile = dafnyOptions.Get(BoogieOptionBag.NoVerify);
-    dafnyOptions.MainMethod = RunAllTestsMainMethod.SyntheticTestMainName;
-  }
+  public static void EnsureStaticConstructorHasRun() { }
 }
diff --git a/Source/DafnyDriver/Commands/TranslateCommand.cs b/Source/DafnyDriver/Commands/TranslateCommand.cs
index 7dbefb6538b..88e293a22f2 100644
--- a/Source/DafnyDriver/Commands/TranslateCommand.cs
+++ b/Source/DafnyDriver/Commands/TranslateCommand.cs
@@ -1,41 +1,54 @@
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.Linq;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Dafny.Plugins;
 
 namespace Microsoft.Dafny;
 
-class TranslateCommand : ICommandSpec {
-  public IEnumerable<Option> Options =>
+static class TranslateCommand {
+
+  static TranslateCommand() {
+  }
+
+  public static IEnumerable<Option> Options =>
     new Option[] {
       CommonOptionBag.Output,
+      IExecutableBackend.OuterModule,
       CommonOptionBag.IncludeRuntimeOption,
-    }.Concat(ICommandSpec.TranslationOptions).
-      Concat(ICommandSpec.ConsoleOutputOptions).
-      Concat(ICommandSpec.ResolverOptions);
-
-  private static readonly Argument<string> Target = new("language", @"
-cs - Translate to C#.
-go - Translate to Go.
-js - Translate to JavaScript.
-java - Translate to Java.
-py - Translate to Python.
-cpp - Translate to C++.
-
-Note that the C++ backend has various limitations (see Docs/Compilation/Cpp.md). This includes lack of support for BigIntegers (aka int), most higher order functions, and advanced features like traits or co-inductive types.".TrimStart()
-  );
-
-  public Command Create() {
+      RunAllTestsMainMethod.IncludeTestRunner,
+      IExecutableBackend.TranslationRecordOutput
+    }.Concat(DafnyCommands.TranslationOptions).
+      Concat(DafnyCommands.ConsoleOutputOptions).
+      Concat(DafnyCommands.ResolverOptions);
+
+
+  public static Command Create() {
     var result = new Command("translate", "Translate Dafny sources to source and build files in a specified language.");
-    result.AddArgument(Target);
-    result.AddArgument(ICommandSpec.FilesArgument);
-    return result;
-  }
 
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    dafnyOptions.Compile = false;
-    var noVerify = dafnyOptions.Get(BoogieOptionBag.NoVerify);
-    dafnyOptions.CompilerName = context.ParseResult.GetValueForArgument(Target);
-    dafnyOptions.SpillTargetCode = noVerify ? 3U : 2U;
+    foreach (var backend in SinglePassCodeGenerator.Plugin.GetCompilers(DafnyOptions.Default)) {
+      var command = backend.GetCommand();
+      result.AddCommand(command);
+      if (!backend.IsStable) {
+        command.IsHidden = true;
+      }
+    }
+
+    foreach (var subCommand in result.Subcommands) {
+      subCommand.AddArgument(DafnyCommands.FilesArgument);
+
+      foreach (var option in Options) {
+        subCommand.AddGlobalOption(option);
+      }
+
+      DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(subCommand, async (options, context) => {
+        options.Compile = false;
+        var noVerify = options.Get(BoogieOptionBag.NoVerify);
+        options.CompilerName = subCommand.Name;
+        options.SpillTargetCode = noVerify ? 3U : 2U;
+        return await SynchronousCliCompilation.Run(options);
+      });
+    }
+
+    return result;
   }
 }
diff --git a/Source/DafnyDriver/Commands/VerifyCommand.cs b/Source/DafnyDriver/Commands/VerifyCommand.cs
index 0747778e28f..789db4ee4b9 100644
--- a/Source/DafnyDriver/Commands/VerifyCommand.cs
+++ b/Source/DafnyDriver/Commands/VerifyCommand.cs
@@ -1,40 +1,248 @@
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
 using System.Linq;
+using System.Reactive.Subjects;
+using System.Threading;
+using System.Threading.Tasks;
+using DafnyCore;
+using DafnyCore.Options;
+using DafnyDriver.Commands;
+using Microsoft.Boogie;
+using Microsoft.Dafny.Compilers;
 
 namespace Microsoft.Dafny;
 
-class VerifyCommand : ICommandSpec {
-  public IEnumerable<Option> Options => new Option[] {
-    BoogieOptionBag.BoogieFilter,
-  }.Concat(ICommandSpec.VerificationOptions).
-    Concat(ICommandSpec.ConsoleOutputOptions).
-    Concat(ICommandSpec.ResolverOptions);
+public static class VerifyCommand {
 
-  public Command Create() {
+  static VerifyCommand() {
+    // Note these don't need checks because they are only "dafny verify" options;
+    // they can't be specified when building a doo file.
+    OptionRegistry.RegisterOption(FilterSymbol, OptionScope.Cli);
+    OptionRegistry.RegisterOption(FilterPosition, OptionScope.Cli);
+    OptionRegistry.RegisterOption(PerformanceStatisticsOption, OptionScope.Cli);
+  }
+
+  public static readonly Option<int> PerformanceStatisticsOption = new("--performance-stats",
+    "Report a summary of the verification performance. " +
+    "The given argument is used to divide all the output with, which can help ignore small differences.") {
+    IsHidden = true
+  };
+  public static readonly Option<string> FilterSymbol = new("--filter-symbol",
+    @"Filter what gets verified by selecting only symbols whose fully qualified name contains the given argument, for example: ""--filter-symbol=MyNestedModule.MyFooFunction"". Place a dot at the end of the argument to indicate the symbol name must end like this, which can be useful if one symbol name is a prefix of another.");
+
+  public static readonly Option<string> FilterPosition = new("--filter-position",
+    @"Filter what gets verified based on a source location. The location is specified as a file path suffix, optionally followed by a colon and a line number. For example, `dafny verify dfyconfig.toml --filter-position=source1.dfy:5` will only verify things that range over line 5 in the file `source1.dfy`. In combination with `--isolate-assertions`, individual assertions can be verified by filtering on the line that contains them. When processing a single file, the filename can be skipped, for example: `dafny verify MyFile.dfy --filter-position=:23`");
+
+  public static Command Create() {
     var result = new Command("verify", "Verify the program.");
-    result.AddArgument(ICommandSpec.FilesArgument);
+    result.AddArgument(DafnyCommands.FilesArgument);
+    foreach (var option in VerifyOptions) {
+      result.AddOption(option);
+    }
+    DafnyNewCli.SetHandlerUsingDafnyOptionsContinuation(result, (options, _) => HandleVerification(options));
     return result;
   }
 
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    dafnyOptions.Compile = false;
+  private static IReadOnlyList<Option> VerifyOptions =>
+    new Option[] {
+        PerformanceStatisticsOption,
+        FilterSymbol,
+        FilterPosition,
+        DafnyFile.DoNotVerifyDependencies
+      }.Concat(DafnyCommands.VerificationOptions).
+      Concat(DafnyCommands.ConsoleOutputOptions).
+      Concat(DafnyCommands.ResolverOptions);
+
+  public static async Task<int> HandleVerification(DafnyOptions options) {
+    if (options.Get(CommonOptionBag.VerificationCoverageReport) != null) {
+      options.TrackVerificationCoverage = true;
+    }
+
+    var compilation = CliCompilation.Create(options);
+    compilation.Start();
+
+    var resolution = await compilation.Resolution;
+
+    if (resolution != null) {
+      Subject<CanVerifyResult> verificationResults = new();
+
+      ReportVerificationDiagnostics(compilation, verificationResults);
+      var verificationSummarized = ReportVerificationSummary(compilation, verificationResults);
+      var proofDependenciesReported = ReportProofDependencies(compilation, resolution, verificationResults);
+      var verificationResultsLogged = LogVerificationResults(compilation, resolution, verificationResults);
+      compilation.VerifyAllLazily().ToObservable().Subscribe(verificationResults);
+      await verificationSummarized;
+      await verificationResultsLogged;
+      await proofDependenciesReported;
+    }
+
+    return await compilation.GetAndReportExitCode();
   }
-}
 
-class ResolveCommand : ICommandSpec {
-  public IEnumerable<Option> Options => ICommandSpec.ConsoleOutputOptions.
-    Concat(ICommandSpec.ResolverOptions);
+  public static async Task ReportVerificationSummary(
+    CliCompilation cliCompilation,
+    IObservable<CanVerifyResult> verificationResults) {
+    var statistics = new VerificationStatistics();
 
-  public Command Create() {
-    var result = new Command("resolve", "Only check for parse and type resolution errors.");
-    result.AddArgument(ICommandSpec.FilesArgument);
-    return result;
+    verificationResults.Subscribe(result => {
+      foreach (var taskResult in result.Results) {
+        var runResult = taskResult.Result;
+        Interlocked.Add(ref statistics.TotalResourcesUsed, runResult.ResourceCount);
+        lock (statistics) {
+          statistics.MaxVcResourcesUsed = Math.Max(statistics.MaxVcResourcesUsed, runResult.ResourceCount);
+        }
+
+        switch (runResult.Outcome) {
+          case SolverOutcome.Valid:
+          case SolverOutcome.Bounded:
+            Interlocked.Increment(ref statistics.VerifiedSymbols);
+            Interlocked.Add(ref statistics.VerifiedAssertions, runResult.Asserts.Count);
+            break;
+          case SolverOutcome.Invalid:
+            var total = runResult.Asserts.Count;
+            var errors = runResult.CounterExamples.Count;
+            Interlocked.Add(ref statistics.VerifiedAssertions, total - errors);
+            Interlocked.Add(ref statistics.ErrorCount, errors);
+            break;
+          case SolverOutcome.TimeOut:
+            Interlocked.Increment(ref statistics.TimeoutCount);
+            break;
+          case SolverOutcome.OutOfMemory:
+            Interlocked.Increment(ref statistics.OutOfMemoryCount);
+            break;
+          case SolverOutcome.OutOfResource:
+            Interlocked.Increment(ref statistics.OutOfResourceCount);
+            break;
+          case SolverOutcome.Undetermined:
+            Interlocked.Increment(ref statistics.InconclusiveCount);
+            break;
+          default:
+            throw new ArgumentOutOfRangeException();
+        }
+      }
+    }, e => {
+      Interlocked.Increment(ref statistics.SolverExceptionCount);
+    });
+    await verificationResults.WaitForComplete();
+    await WriteTrailer(cliCompilation, statistics);
+    var performanceStatisticsDivisor = cliCompilation.Options.Get(PerformanceStatisticsOption);
+    if (performanceStatisticsDivisor != 0) {
+      int Round(int number) {
+        var numberForUpRounding = number + performanceStatisticsDivisor / 2;
+        return (numberForUpRounding / performanceStatisticsDivisor) * performanceStatisticsDivisor;
+      }
+      var output = cliCompilation.Options.OutputWriter;
+      await output.WriteLineAsync($"Total resources used is {Round(statistics.TotalResourcesUsed)}");
+      await output.WriteLineAsync($"Max resources used by VC is {Round(statistics.MaxVcResourcesUsed)}");
+    }
   }
 
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    dafnyOptions.Compile = false;
-    dafnyOptions.Verify = false;
+  private static async Task WriteTrailer(CliCompilation cliCompilation,
+    VerificationStatistics statistics) {
+    if (cliCompilation.Options.Verbosity <= CoreOptions.VerbosityLevel.Quiet) {
+      return;
+    }
+
+    if (!cliCompilation.DidVerification) {
+      return;
+    }
+
+    var output = cliCompilation.Options.OutputWriter;
+
+    await output.WriteLineAsync();
+
+    if (cliCompilation.VerifiedAssertions) {
+      await output.WriteAsync($"{cliCompilation.Options.DescriptiveToolName} finished with {statistics.VerifiedAssertions} assertions verified, {statistics.ErrorCount} error{Util.Plural(statistics.ErrorCount)}");
+    } else {
+      await output.WriteAsync($"{cliCompilation.Options.DescriptiveToolName} finished with {statistics.VerifiedSymbols} verified, {statistics.ErrorCount} error{Util.Plural(statistics.ErrorCount)}");
+    };
+    if (statistics.InconclusiveCount != 0) {
+      await output.WriteAsync($", {statistics.InconclusiveCount} inconclusive{Util.Plural(statistics.InconclusiveCount)}");
+    }
+
+    if (statistics.TimeoutCount != 0) {
+      await output.WriteAsync($", {statistics.TimeoutCount} time out{Util.Plural(statistics.TimeoutCount)}");
+    }
+
+    if (statistics.OutOfMemoryCount != 0) {
+      await output.WriteAsync($", {statistics.OutOfMemoryCount} out of memory");
+    }
+
+    if (statistics.OutOfResourceCount != 0) {
+      await output.WriteAsync($", {statistics.OutOfResourceCount} out of resource");
+    }
+
+    if (statistics.SolverExceptionCount != 0) {
+      await output.WriteAsync($", {statistics.SolverExceptionCount} solver exceptions");
+    }
+
+    await output.WriteLineAsync();
+    await output.FlushAsync();
+  }
+
+  public static void ReportVerificationDiagnostics(CliCompilation compilation, IObservable<CanVerifyResult> verificationResults) {
+    verificationResults.Subscribe(result => {
+      // We use an intermediate reporter so we can sort the diagnostics from all parts by token
+      var batchReporter = new BatchErrorReporter(compilation.Options);
+      foreach (var completed in result.Results) {
+        Compilation.ReportDiagnosticsInResult(compilation.Options, result.CanVerify.FullDafnyName,
+          BoogieGenerator.ToDafnyToken(true, completed.Task.Token),
+          (uint)completed.Result.RunTime.TotalSeconds,
+          completed.Result, batchReporter);
+      }
+
+      foreach (var diagnostic in batchReporter.AllMessages.Order()) {
+        compilation.Compilation.Reporter.Message(diagnostic.Source, diagnostic.Level, diagnostic.ErrorId, diagnostic.Token,
+          diagnostic.Message);
+      }
+    });
+
+  }
+
+  public static async Task LogVerificationResults(CliCompilation cliCompilation, ResolutionResult resolution,
+    IObservable<CanVerifyResult> verificationResults) {
+    VerificationResultLogger? verificationResultLogger = null;
+    var proofDependencyManager = resolution.ResolvedProgram.ProofDependencyManager;
+    try {
+      verificationResultLogger = new VerificationResultLogger(cliCompilation.Options, proofDependencyManager);
+    } catch (ArgumentException e) {
+      cliCompilation.Compilation.Reporter.Error(MessageSource.Verifier, cliCompilation.Compilation.Project.StartingToken, e.Message);
+    }
+
+    verificationResults.Subscribe(result => verificationResultLogger?.Report(result),
+      e => { },
+      () => {
+      });
+    await verificationResults.WaitForComplete();
+    if (verificationResultLogger != null) {
+      await verificationResultLogger.Finish();
+    }
+  }
+
+  public static async Task ReportProofDependencies(
+    CliCompilation cliCompilation,
+    ResolutionResult resolution,
+    IObservable<CanVerifyResult> verificationResults) {
+    var usedDependencies = new HashSet<TrackedNodeComponent>();
+    var proofDependencyManager = resolution.ResolvedProgram.ProofDependencyManager;
+
+    verificationResults.Subscribe(result => {
+      ProofDependencyWarnings.ReportSuspiciousDependencies(cliCompilation.Options, result.Results,
+        resolution.ResolvedProgram.Reporter, resolution.ResolvedProgram.ProofDependencyManager);
+
+      foreach (var used in result.Results.SelectMany(part => part.Result.CoveredElements)) {
+        usedDependencies.Add(used);
+      }
+    }, e => { }, () => { });
+    await verificationResults.WaitForComplete();
+    var coverageReportDir = cliCompilation.Options.Get(CommonOptionBag.VerificationCoverageReport);
+    if (coverageReportDir != null) {
+      await new CoverageReporter(cliCompilation.Options).SerializeVerificationCoverageReport(
+        proofDependencyManager, resolution.ResolvedProgram,
+        usedDependencies,
+        coverageReportDir);
+    }
   }
 }
diff --git a/Source/DafnyDriver/CoverageReporter.cs b/Source/DafnyDriver/CoverageReporter.cs
index df8fdd8ae8e..b9e95f27ca7 100644
--- a/Source/DafnyDriver/CoverageReporter.cs
+++ b/Source/DafnyDriver/CoverageReporter.cs
@@ -4,8 +4,11 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
 
-namespace Microsoft.Dafny; 
+namespace Microsoft.Dafny;
 
 public class CoverageReporter {
 
@@ -22,14 +25,29 @@ public class CoverageReporter {
   private static readonly Regex TableFooterRegex = new(@"\{\{TABLE_FOOTER\}\}");
   private static readonly Regex TableBodyRegex = new(@"\{\{TABLE_BODY\}\}");
   private static readonly Regex IndexFileNameRegex = new(@"index(.*)\.html");
-  private static readonly Regex SpanRegexInverse = new("class=\"([a-z]+)\" id=\"line([0-9]+)col([0-9]+)-line([0-9]+)col([0-9]+)\"");
+  private static readonly Regex PosRegexInverse = new("class=\"([a-z]+)\" id=\"([0-9]+):([0-9]+)\"");
   private const string CoverageReportTemplatePath = "coverage_report_template.html";
   private const string CoverageReportIndexTemplatePath = "coverage_report_index_template.html";
   private const string CoverageReportSupportingFilesPath = ".resources";
 
   private readonly ErrorReporter reporter;
   private readonly DafnyOptions options;
+  private readonly Dictionary<(CoverageReport, string), string> paths = new();
 
+  public string GetPath(CoverageReport report, string desiredPath) {
+    return paths.GetOrCreate((report, desiredPath), () => {
+      var index = 0;
+      var extension = Path.GetExtension(desiredPath);
+      var withoutExtension = Path.GetFileNameWithoutExtension(desiredPath);
+      var actualPath = desiredPath;
+      while (File.Exists(actualPath)) {
+        actualPath = withoutExtension + "_" + index + extension;
+        index++;
+      }
+
+      return actualPath;
+    });
+  }
   public CoverageReporter(DafnyOptions options) {
     reporter = options.DiagnosticsFormat switch {
       DafnyOptions.DiagnosticsFormats.PlainText => new ConsoleErrorReporter(options),
@@ -39,9 +57,31 @@ public CoverageReporter(DafnyOptions options) {
     this.options = options;
   }
 
-  public void Merge(List<string> coverageReportsToMerge, string coverageReportOutDir) {
-    // assume only one report in directory for now
+
+  public async Task SerializeVerificationCoverageReport(ProofDependencyManager depManager, Program dafnyProgram, IEnumerable<TrackedNodeComponent> usedComponents, string coverageReportDir) {
+    var usedDependencies =
+      usedComponents.Select(depManager.GetFullIdDependency).ToHashSet();
+    var allDependencies =
+      depManager
+        .GetAllPotentialDependencies()
+        .OrderBy(dep => dep.Range.StartToken);
+    var coverageReport = new CoverageReport("Verification coverage", "Proof Dependencies", "_verification", dafnyProgram);
+    foreach (var proofDependency in allDependencies) {
+      if (proofDependency is FunctionDefinitionDependency) {
+        continue;
+      }
+      coverageReport.LabelCode(proofDependency.Range,
+        usedDependencies.Contains(proofDependency)
+          ? CoverageLabel.FullyCovered
+          : CoverageLabel.NotCovered);
+    }
+
+    await SerializeCoverageReports(coverageReport, coverageReportDir);
+  }
+
+  public async Task Merge(List<string> coverageReportsToMerge, string coverageReportOutDir) {
     List<CoverageReport> reports = new();
+    var mergedReport = new CoverageReport("Combined Coverage Report", "Locations", "_combined", null);
     foreach (var reportDir in coverageReportsToMerge) {
       if (!Directory.Exists(reportDir)) {
         reporter.Warning(MessageSource.Documentation, ErrorRegistry.NoneId, Token.NoToken,
@@ -52,17 +92,29 @@ public void Merge(List<string> coverageReportsToMerge, string coverageReportOutD
         var indexFileName = Path.GetFileName(pathToIndexFile);
         var indexFileMatch = IndexFileNameRegex.Match(indexFileName);
         if (!indexFileMatch.Success) {
-          reporter.Warning(MessageSource.Documentation, ErrorRegistry.NoneId, Token.NoToken,
-            $"Directory {reportDir} contains file {indexFileName} which is not part of a coverage report");
+          continue;
         }
         var suffix = indexFileMatch.Groups[1].Value;
-        var index = new StreamReader(pathToIndexFile).ReadToEnd();
+        var index = await new StreamReader(pathToIndexFile).ReadToEndAsync();
         var name = TitleRegexInverse.Match(index)?.Groups?[1]?.Value ?? "";
         var units = UnitsRegexInverse.Match(index)?.Groups?[1]?.Value ?? "";
         reports.Add(ParseCoverageReport(reportDir, $"{name} ({Path.GetFileName(reportDir)})", units, suffix));
       }
     }
-    SerializeCoverageReports(reports, coverageReportOutDir);
+
+    var onlyLabel = options.Get(CoverageReportCommand.OnlyLabelOption);
+    foreach (var report in reports) {
+      foreach (var fileName in report.AllFiles()) {
+        foreach (var span in report.CoverageSpansForFile(fileName)) {
+          mergedReport.RegisterFile(span.Span.Uri);
+          if ((onlyLabel ?? span.Label) == span.Label) {
+            mergedReport.LabelCode(span.Span, span.Label);
+          }
+        }
+      }
+    }
+    reports.Add(mergedReport);
+    await SerializeCoverageReports(reports, coverageReportOutDir);
   }
 
   /// <summary>
@@ -79,72 +131,91 @@ private static CoverageReport ParseCoverageReport(string reportDir, string name,
       if (!uriMatch.Success) {
         continue;
       }
+
       var uri = new Uri(uriMatch.Groups[1].Value);
+      var lastEndToken = new Token(1, 1);
+      lastEndToken.Uri = uri;
+      var lastLabel = CoverageLabel.NotApplicable;
       report.RegisterFile(uri);
-      foreach (var span in SpanRegexInverse.Matches(source).Where(match => match.Success)) {
-        if (int.TryParse(span.Groups[2].Value, out var startLine) &&
-            int.TryParse(span.Groups[3].Value, out var startCol) &&
-            int.TryParse(span.Groups[4].Value, out var endLine) &&
-            int.TryParse(span.Groups[5].Value, out var endCol)) {
-          var startToken = new Token(startLine, startCol);
-          startToken.Uri = uri;
-          var endToken = new Token(endLine, endCol);
-          startToken.Uri = uri;
-          var rangeToken = new RangeToken(startToken, endToken);
-          rangeToken.Uri = uri;
-          report.LabelCode(rangeToken, FromHtmlClass(span.Groups[1].Value));
+      foreach (var span in PosRegexInverse.Matches(source).Where(match => match.Success)) {
+        if (int.TryParse(span.Groups[2].Value, out var line) &&
+            int.TryParse(span.Groups[3].Value, out var col)) {
+          var nextToken = new Token(line, col);
+          nextToken.Uri = uri;
+          var precedingToken = new Token(line, col);
+          precedingToken.Uri = uri;
+          var rangeToken = new SourceOrigin(lastEndToken, precedingToken);
+          report.LabelCode(rangeToken, lastLabel);
+          lastLabel = FromHtmlClass(span.Groups[1].Value);
+          lastEndToken = nextToken;
         }
       }
+
+      var lastToken = new Token(source.Count(c => c == '\n') + 2, 0);
+      lastToken.Uri = uri;
+      var lastRangeToken = new SourceOrigin(lastEndToken, lastToken);
+      report.LabelCode(lastRangeToken, lastLabel);
     }
     return report;
   }
 
   /// <summary> Serialize a single coverage report to disk </summary>
-  public void SerializeCoverageReports(CoverageReport report, string directory) {
-    SerializeCoverageReports(new List<CoverageReport> { report }, directory);
+  public Task SerializeCoverageReports(CoverageReport report, string directory) {
+    return SerializeCoverageReports(new List<CoverageReport> { report }, directory);
   }
 
   /// <summary>
   /// Create a directory with HTML files to display a set of coverage reports for the same program. The reports
   /// will have links to each other to make comparison easier
   /// </summary>
-  private void SerializeCoverageReports(List<CoverageReport> reports, string reportsDirectory) {
-    var sessionName = DateTime.Now.ToString("yyyy-dd-M--HH-mm-ss");
-    var sessionDirectory = Path.Combine(reportsDirectory, sessionName);
+  private async Task SerializeCoverageReports(List<CoverageReport> reports, string reportsDirectory) {
+    var sessionDirectory = reportsDirectory;
+    if (!options.Get(CommonOptionBag.NoTimeStampForCoverageReport)) {
+      var sessionName = DateTime.Now.ToString("yyyy-dd-M--HH-mm-ss");
+      sessionDirectory = Path.Combine(reportsDirectory, sessionName);
+    }
     Directory.CreateDirectory(sessionDirectory);
-    HashSet<string> allFiles = new();
-    reports.ForEach(report => allFiles.UnionWith(report.AllFiles()));
-    if (allFiles.Count == 0) {
+    HashSet<Uri> allUris = new();
+    reports.ForEach(report => allUris.UnionWith(report.AllFiles()));
+    if (allUris.Count == 0) {
       reporter.Warning(MessageSource.Documentation, ErrorRegistry.NoneId, Token.NoToken,
         "No coverage data found in the reports.");
       return;
     }
     CopyStyleFiles(sessionDirectory);
+    // TODO: Handle arbitrary Uris better
+    var allFiles = allUris.Select(uri => uri.ToString());
     var prefixLength = new string(
       allFiles.First()[..allFiles.Min(s => Path.GetDirectoryName(s)?.Length ?? 0)]
         .TakeWhile((c, i) => allFiles.All(s => s[i] == c)).ToArray()).Length;
-    Dictionary<string, string> sourceFileToCoverageReport = new Dictionary<string, string>();
-    foreach (var fileName in allFiles) {
-      var directoryForFile = Path.Combine(sessionDirectory, Path.GetDirectoryName(fileName)?[prefixLength..] ?? "");
+    var sourceFileToCoverageReport = new Dictionary<Uri, string>();
+    foreach (var uri in allUris) {
+      // TODO: Handle arbitrary Uris better
+      var fileName = uri.ToString();
+      var directoryForFile = Path.Combine(sessionDirectory, Path.GetDirectoryName(fileName)?[prefixLength..].TrimStart('/') ?? "");
+      sourceFileToCoverageReport[uri] = Path.Combine(directoryForFile, Path.GetFileName(fileName));
       var pathToRoot = Path.GetRelativePath(directoryForFile, sessionDirectory);
       Directory.CreateDirectory(directoryForFile);
-      for (int i = 0; i < reports.Count; i++) {
-        var linksToOtherReports = GetHtmlLinksToOtherReports(reports[i], Path.GetFileName(fileName), reports);
-        var reportForFile = HtmlReportForFile(reports[i], fileName, pathToRoot, linksToOtherReports);
-        sourceFileToCoverageReport[fileName] = Path.Combine(directoryForFile, Path.GetFileName(fileName));
-        File.WriteAllText(Path.Combine(directoryForFile, Path.GetFileName(fileName)) + $"{reports[i].UniqueSuffix}.html", reportForFile);
+      foreach (var report in reports) {
+        var linksToOtherReports = GetHtmlLinksToOtherReports(report, fileName, reports);
+        var reportForFile = await HtmlReportForFile(report, uri, pathToRoot, linksToOtherReports);
+        var desiredPath = Path.Combine(directoryForFile, Path.GetFileName(fileName)) + $"{report.Suffix}.html";
+        await File.WriteAllTextAsync(GetPath(report, desiredPath), reportForFile);
       }
     }
 
     foreach (var report in reports) {
-      var linksToOtherReports = GetHtmlLinksToOtherReports(report, "index", reports);
+      var linksToOtherReports = GetHtmlLinksToOtherReports(report, Path.Combine(sessionDirectory, "index"), reports);
       CreateIndexFile(report, sourceFileToCoverageReport, sessionDirectory, linksToOtherReports);
     }
   }
 
   private string MakeIndexFileTableRow(List<object> row) {
     var result = new StringBuilder("<tr>\n");
-    foreach (var cell in row) {
+    foreach (var cell in row.Take(2)) {
+      result.Append($"\t<td class=\"name\">{cell}</td>\n");
+    }
+    foreach (var cell in row.Skip(2)) {
       result.Append($"\t<td class=\"ctr2\">{cell}</td>\n");
     }
     result.Append("</tr>\n");
@@ -154,7 +225,7 @@ private string MakeIndexFileTableRow(List<object> row) {
   /// <summary>
   /// Creates an index file with program-wide statistics for a particular report
   /// </summary>
-  private void CreateIndexFile(CoverageReport report, Dictionary<string, string> sourceFileToCoverageReportFile, string baseDirectory, string linksToOtherReports) {
+  private void CreateIndexFile(CoverageReport report, Dictionary<Uri, string> sourceFileToCoverageReportFile, string baseDirectory, string linksToOtherReports) {
     var assembly = System.Reflection.Assembly.GetCallingAssembly();
     var templateStream = assembly.GetManifestResourceStream(CoverageReportIndexTemplatePath);
     if (templateStream is null) {
@@ -163,23 +234,50 @@ private void CreateIndexFile(CoverageReport report, Dictionary<string, string> s
       return;
     }
     var coverageLabels = Enum.GetValues(typeof(CoverageLabel)).Cast<CoverageLabel>().ToList();
-    List<object> header = new() { "File" };
-    header.AddRange(coverageLabels.Select(label => $"{report.Units} {CoverageLabelExtension.ToString(label)}"));
+    List<object> header = new() { "File", "Module" };
+    header.AddRange(coverageLabels
+      .Where(label => label != CoverageLabel.None && label != CoverageLabel.NotApplicable)
+      .Select(label => $"{report.Units} {CoverageLabelExtension.ToString(label)}"));
 
     List<List<object>> body = new();
     foreach (var sourceFile in sourceFileToCoverageReportFile.Keys) {
-      var relativePath = Path.GetRelativePath(baseDirectory, sourceFileToCoverageReportFile[sourceFile]);
+      var desiredPath = sourceFileToCoverageReportFile[sourceFile] + $"{report.Suffix}.html";
+      var relativePath = Path.GetRelativePath(baseDirectory, GetPath(report, desiredPath));
+      var linkName = Path.GetRelativePath(baseDirectory, sourceFileToCoverageReportFile[sourceFile]);
+
       body.Add(new() {
-        $"<a href = \"{relativePath}{report.UniqueSuffix}.html\"" +
-        $"class = \"el_package\">{relativePath}</a>"
+        $"<a href = \"{relativePath}\"" +
+        $"class = \"el_package\">{linkName}</a>",
+        "All modules"
       });
-      body.Last().AddRange(coverageLabels.Select(label =>
-        report.CoverageSpansForFile(sourceFile).Count(span => span.Label == label)).OfType<object>());
+
+      body.Last().AddRange(coverageLabels
+        .Where(label => label != CoverageLabel.None && label != CoverageLabel.NotApplicable)
+        .Select(label => report.CoverageSpansForFile(sourceFile)
+                               .Count(span => span.Label == label)).OfType<object>());
+
+      foreach (var module in report.ModulesInFile(sourceFile).OrderBy(m => m.FullName)) {
+        body.Add(new() {
+          "",
+          module.FullName
+        });
+
+        var moduleRange = module.Origin.ToDafnyRange();
+        body.Last().AddRange(coverageLabels
+          .Where(label => label != CoverageLabel.None && label != CoverageLabel.NotApplicable)
+          .Select(label => report.CoverageSpansForFile(sourceFile)
+                                 // span.Span.Intersects(module.RangeToken) would be cleaner,
+                                 // but unfortunately coverage span tokens don't currently always
+                                 // have Token.pos set correctly. :(
+                                 .Where(span => moduleRange.Contains(span.Span.ToDafnyRange().Start))
+                                 .Count(span => span.Label == label)).OfType<object>());
+      }
     }
 
-    List<object> footer = new() { "Total" };
-    footer.AddRange(coverageLabels.Select(label =>
-      report.AllFiles().Select(sourceFile =>
+    List<object> footer = new() { "Total", "" };
+    footer.AddRange(coverageLabels
+      .Where(label => label != CoverageLabel.None && label != CoverageLabel.NotApplicable)
+      .Select(label => report.AllFiles().Select(sourceFile =>
         report.CoverageSpansForFile(sourceFile).Count(span => span.Label == label)).Sum()).OfType<object>());
 
     var templateText = new StreamReader(templateStream).ReadToEnd();
@@ -187,21 +285,21 @@ private void CreateIndexFile(CoverageReport report, Dictionary<string, string> s
     templateText = FileNameRegex.Replace(templateText, report.Name);
     templateText = TableHeaderRegex.Replace(templateText, MakeIndexFileTableRow(header));
     templateText = TableFooterRegex.Replace(templateText, MakeIndexFileTableRow(footer));
-    File.WriteAllText(Path.Combine(baseDirectory, $"index{report.UniqueSuffix}.html"),
-      TableBodyRegex.Replace(templateText, string.Join("\n", body.Select(MakeIndexFileTableRow))));
+    templateText = TableBodyRegex.Replace(templateText, string.Join("\n", body.Select(MakeIndexFileTableRow)));
+    File.WriteAllText(GetPath(report, Path.Combine(baseDirectory, $"index{report.Suffix}.html")), templateText);
   }
 
   /// <summary>
   /// Creates a set of links to be inserted in <param name="thisReport"></param> that point to corresponding
-  /// report files for the same <param name="sourceFileName"></param>
+  /// report files for the same <param name="reportAgnosticPath"></param>
   /// </summary>
-  private static string GetHtmlLinksToOtherReports(CoverageReport thisReport, string sourceFileName, List<CoverageReport> allReports) {
+  private string GetHtmlLinksToOtherReports(CoverageReport thisReport, string reportAgnosticPath, List<CoverageReport> allReports) {
     var result = new StringBuilder();
     foreach (var report in allReports) {
       if (report == thisReport) {
         continue;
       }
-      result.Append($"<a href=\"{sourceFileName}{report.UniqueSuffix}.html\" class=\"el_report\">{report.Name}</a>");
+      result.Append($"<a href=\"{Path.GetFileName(GetPath(thisReport, reportAgnosticPath + $"{report.Suffix}.html"))}\" class=\"el_report\">{report.Name}</a>");
     }
     return result.ToString();
   }
@@ -236,20 +334,59 @@ private void CopyStyleFiles(string baseDirectory) {
     }
   }
 
-  private string HtmlReportForFile(CoverageReport report, string pathToSourceFile, string baseDirectory, string linksToOtherReports) {
-    var source = new StreamReader(pathToSourceFile).ReadToEnd();
-    var lines = source.Split("\n");
-    IToken lastToken = new Token(0, 0);
+  private async Task<string> HtmlReportForFile(CoverageReport report, Uri uri, string baseDirectory, string linksToOtherReports) {
+    var files = await DafnyFile.CreateAndValidate(OnDiskFileSystem.Instance,
+        new ConsoleErrorReporter(options), options, uri, Token.Cli).ToListAsync();
+    var dafnyFile = files[0];
+    var source = await dafnyFile.GetContent().Reader.ReadToEndAsync();
+    var lines = source.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+    var characterLabels = new CoverageLabel[lines.Length][];
+    for (int i = 0; i < lines.Length; i++) {
+      characterLabels[i] = new CoverageLabel[lines[i].Length];
+      Array.Fill(characterLabels[i], CoverageLabel.None);
+    }
     var labeledCodeBuilder = new StringBuilder(source.Length);
-    foreach (var span in report.CoverageSpansForFile(pathToSourceFile)) {
-      AppendCodeBetweenTokens(labeledCodeBuilder, lines, lastToken, span.Span.StartToken);
-      labeledCodeBuilder.Append(OpenHtmlTag(span));
-      AppendCodeBetweenTokens(labeledCodeBuilder, lines, span.Span.StartToken, span.Span.EndToken);
-      labeledCodeBuilder.Append(CloseHtmlTag(span));
-      lastToken = span.Span.EndToken;
+    foreach (var span in report.CoverageSpansForFile(uri)) {
+      var line = span.Span.StartToken.line - 1;
+      var column = span.Span.StartToken.col - 1;
+      var endToken = span.Span.EndToken;
+      var endColumnExclusive = endToken.col - 1 + (span.Span.InclusiveEnd ? endToken.val.Length : 0);
+      var endLineExclusive = endToken.line;
+      while (true) {
+        if (characterLabels[line].Length <= column) {
+          do { line++; }
+          while (line < characterLabels.Length && characterLabels[line].Length == 0);
+          column = 0;
+          if (characterLabels.Length == line) {
+            break;
+          }
+        }
+
+        if (line >= endLineExclusive || (line == endToken.line - 1 && column >= endColumnExclusive)) {
+          break;
+        }
+        characterLabels[line][column] = CoverageLabelExtension.Combine(characterLabels[line][column], span.Label);
+        column++;
+      }
     }
-    AppendCodeBetweenTokens(labeledCodeBuilder, lines, lastToken, null);
-    var assembly = System.Reflection.Assembly.GetCallingAssembly();
+
+    var lastLabel = CoverageLabel.NotApplicable;
+    labeledCodeBuilder.Append(OpenHtmlTag(1, 1, CoverageLabel.NotApplicable));
+    for (var line = 0; line < lines.Length; line++) {
+      for (var col = 0; col < lines[line].Length; col++) {
+        var thisLabel = characterLabels[line][col] == CoverageLabel.None ? CoverageLabel.NotApplicable : characterLabels[line][col];
+        if (thisLabel != lastLabel) {
+          labeledCodeBuilder.Append(CloseHtmlTag());
+          labeledCodeBuilder.Append(OpenHtmlTag(line + 1, col + 1, thisLabel));
+        }
+        labeledCodeBuilder.Append(lines[line][col]);
+        lastLabel = thisLabel;
+      }
+      labeledCodeBuilder.Append(Environment.NewLine);
+    }
+    labeledCodeBuilder.Append(CloseHtmlTag());
+
+    var assembly = System.Reflection.Assembly.GetAssembly(typeof(CoverageReporter))!;
     var templateStream = assembly.GetManifestResourceStream(CoverageReportTemplatePath);
     var labeledCode = labeledCodeBuilder.ToString();
     if (templateStream is null) {
@@ -257,30 +394,15 @@ private string HtmlReportForFile(CoverageReport report, string pathToSourceFile,
         "Embedded HTML template for coverage report not found. Returning raw HTML.");
       return labeledCode;
     }
-    var templateText = new StreamReader(templateStream).ReadToEnd();
+    var templateText = await new StreamReader(templateStream).ReadToEndAsync();
     templateText = PathToRootRegex.Replace(templateText, baseDirectory);
     templateText = LinksToOtherReportsRegex.Replace(templateText, linksToOtherReports);
-    templateText = IndexLinkRegex.Replace(templateText, $"index{report.UniqueSuffix}.html");
-    templateText = FileNameRegex.Replace(templateText, $"{Path.GetFileName(pathToSourceFile)}, {report.Name}");
-    templateText = UriRegex.Replace(templateText, pathToSourceFile);
+    templateText = IndexLinkRegex.Replace(templateText, Path.GetFileName(GetPath(report, Path.Combine(baseDirectory, $"index{report.Suffix}.html"))));
+    templateText = FileNameRegex.Replace(templateText, $"{Path.GetFileName(uri.LocalPath)}, {report.Name}");
+    templateText = UriRegex.Replace(templateText, uri.ToString());
     return LabeledCodeRegex.Replace(templateText, labeledCode);
   }
 
-  /// <summary>
-  /// Append code from <param name="lines"></param> that lies between <param name="start"></param> and
-  /// <param name="end"></param> tokens to the <param name="stringBuilder"></param>
-  /// </summary>
-  private static void AppendCodeBetweenTokens(StringBuilder stringBuilder, string[] lines, IToken start, IToken end) {
-    var currToken = new Token(start.line, start.col);
-    while (currToken.line < lines.Length && (end == null || currToken.line < end.line)) {
-      stringBuilder.Append(lines[currToken.line][currToken.col..] + "\n");
-      currToken.line += 1;
-    }
-    if (end != null && currToken.line < lines.Length) {
-      stringBuilder.Append(lines[currToken.line][currToken.col..end.col]);
-    }
-  }
-
   /// <summary>
   /// Return HTML class used to highlight lines in different colors depending on the coverage.
   /// Look at assets/.resources/coverage.css for the styles corresponding to these classes
@@ -290,6 +412,8 @@ private static string ToHtmlClass(CoverageLabel label) {
       CoverageLabel.FullyCovered => "fc",
       CoverageLabel.NotCovered => "nc",
       CoverageLabel.PartiallyCovered => "pc",
+      CoverageLabel.None => "none",
+      CoverageLabel.NotApplicable => "na",
       _ => ""
     };
   }
@@ -304,13 +428,13 @@ private static CoverageLabel FromHtmlClass(string htmlClass) {
     return CoverageLabel.NotCovered; // this is a fallback in case the HTML has invalid classes
   }
 
-  private string OpenHtmlTag(CoverageSpan span) {
-    var id = $"id=\"line{span.Span.StartToken.line}col{span.Span.StartToken.col}-line{span.Span.EndToken.line}col{span.Span.EndToken.col}\"";
-    var classLabel = ToHtmlClass(span.Label);
+  private string OpenHtmlTag(int line, int col, CoverageLabel label) {
+    var id = $"id=\"{line}:{col}\"";
+    var classLabel = ToHtmlClass(label);
     return $"<span class=\"{classLabel}\" {id}>";
   }
 
-  private string CloseHtmlTag(CoverageSpan span) {
+  private string CloseHtmlTag() {
     return "</span>";
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyDriver/DafnyCliTests.cs b/Source/DafnyDriver/DafnyCliTests.cs
new file mode 100644
index 00000000000..ecdd0e3b991
--- /dev/null
+++ b/Source/DafnyDriver/DafnyCliTests.cs
@@ -0,0 +1,83 @@
+using System.Linq;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Dafny;
+
+public static class DafnyCliTests {
+
+  // Environment variables that the CLI directly or indirectly (through target language tools) reads.
+  // This is defined for the benefit of testing infrastructure to ensure that they are maintained
+  // through separate processes.
+  public static readonly string[] ReferencedEnvironmentVariables = {
+    "PATH",
+    "HOME",
+    "DOTNET_NOLOGO",
+    "DAFNY_INTEGRATION_TESTS_IN_PROCESS",
+    "DAFNY_INTEGRATION_TESTS_MODE",
+    "DAFNY_INTEGRATION_TESTS_ONLY_COMPILERS",
+    "DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE",
+    "DAFNY_INTEGRATION_TESTS_ROOT_DIR"
+  };
+
+  static DafnyCliTests() {
+    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+      ReferencedEnvironmentVariables = ReferencedEnvironmentVariables
+        .Concat(new[] { // Careful: Keep this list in sync with the one in lit.site.cfg
+          "APPDATA",
+          "HOMEDRIVE",
+          "HOMEPATH",
+          "INCLUDE",
+          "LIB",
+          "LOCALAPPDATA",
+          "NODE_PATH",
+          "ProgramFiles",
+          "ProgramFiles(x86)",
+          "SystemRoot",
+          "SystemDrive",
+          "TEMP",
+          "TMP",
+          "USERPROFILE"
+        }).ToArray();
+    }
+  }
+
+  public static readonly string[] DefaultArgumentsForTesting = new[] {
+    // Try to verify 2 verification conditions at once
+    "/vcsCores:2",
+
+    // We do not want absolute or relative paths in error messages, just the basename of the file
+    "/useBaseNameForFileName",
+
+    // We do not want output such as "Compiled program written to Foo.cs"
+    // from the compilers, since that changes with the target language
+    "/compileVerbose:0",
+
+    // Set a default resource limit, to catch cases where verification runs off the rails
+    "/rlimit:50000000",
+
+    // Also include a time limit, because we do care about using too much time.
+    "/timeLimit:300",
+    "/allowAxioms:1",
+
+    // test results do not include source code snippets
+    "/showSnippets:0"
+  };
+
+  public static readonly string[] NewDefaultArgumentsForTesting = new[] {
+    // Try to verify 2 verification conditions at once
+    "--cores=2",
+
+    // We do not want absolute or relative paths in error messages, just the basename of the file
+    "--use-basename-for-filename",
+
+    // Set a default resource limit, to catch cases where verification runs off the rails
+    "--resource-limit:50e6",
+
+    "--allow-axioms",
+    // Also include a time limit, because we do care about using too much time.
+    "--verification-time-limit:300",
+
+    // test results do not include source code snippets
+    "--show-snippets:false"
+  };
+}
diff --git a/Source/DafnyDriver/DafnyDoc.cs b/Source/DafnyDriver/DafnyDoc.cs
index 2632b14102f..3fbad8222f9 100644
--- a/Source/DafnyDriver/DafnyDoc.cs
+++ b/Source/DafnyDriver/DafnyDoc.cs
@@ -6,7 +6,7 @@
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 using System.Text;
-
+using System.Threading.Tasks;
 using static Microsoft.Dafny.DafnyDocHtml;
 
 namespace Microsoft.Dafny;
@@ -23,10 +23,10 @@ class Info {
 
   public string Source; // information on where the entity is declared
 
-  public Info(bool register, DafnyDoc dd, string kind, IToken tok, string name, string fullname) : this(register, dd, kind, tok, name, fullname, fullname) {
+  public Info(bool register, DafnyDoc dd, string kind, IOrigin tok, string name, string fullname) : this(register, dd, kind, tok, name, fullname, fullname) {
   }
 
-  public Info(bool register, DafnyDoc dd, string kind, IToken tok, string name, string fullname, string id) {
+  public Info(bool register, DafnyDoc dd, string kind, IOrigin tok, string name, string fullname, string id) {
     this.Contents = null;
     this.Kind = kind;
     this.Name = name;
@@ -42,21 +42,27 @@ public Info(bool register, DafnyDoc dd, string kind, IToken tok, string name, st
   }
 }
 class DafnyDoc {
-  public static DafnyDriver.ExitValue DoDocumenting(IReadOnlyList<DafnyFile> dafnyFiles, List<string> dafnyFolders,
-    string programName, DafnyOptions options) {
+  public static async Task<ExitValue> DoDocumenting(DafnyOptions options) {
+
+    var dafnyFolders = options.SourceFolders;
+    var (code, dafnyFiles, _) = await SynchronousCliCompilation.GetDafnyFiles(options);
+    if (code != 0) {
+      return code;
+    }
+    var dafnyFileNames = DafnyFile.FileNames(dafnyFiles);
+    string programName = dafnyFileNames.Count == 1 ? dafnyFileNames[0] : "the_program";
 
-    string outputdir = options.DafnyPrintCompiledFile;
-    if (outputdir == null) {
-      outputdir = DefaultOutputDir;
+    string outputDir = options.DafnyPrintCompiledFile;
+    if (outputDir == null) {
+      outputDir = DefaultOutputDir;
     }
 
     // Collect all the dafny files; dafnyFiles already includes files from a .toml project file
-    var exitValue = DafnyDriver.ExitValue.SUCCESS;
-    dafnyFiles = dafnyFiles.Concat(dafnyFolders.SelectMany(folderPath => {
-      return Directory.GetFiles(folderPath, "*.dfy", SearchOption.AllDirectories)
-          .Select(name => new DafnyFile(options, new Uri(Path.GetFullPath(name)))).ToList();
-    })).ToList();
-    Console.Out.Write($"Documenting {dafnyFiles.Count} files from {dafnyFolders.Count} folders\n");
+    var exitValue = ExitValue.SUCCESS;
+    var folderFiles = dafnyFolders.Select(folderPath =>
+      FormatCommand.GetFilesForFolder(options, folderPath)).SelectMany(x => x);
+    dafnyFiles = dafnyFiles.Concat(folderFiles).ToList();
+    await options.OutputWriter.WriteAsync($"Documenting {dafnyFiles.Count} files from {dafnyFolders.Count} folders\n");
     if (dafnyFiles.Count == 0) {
       return exitValue;
     }
@@ -65,33 +71,33 @@ public static DafnyDriver.ExitValue DoDocumenting(IReadOnlyList<DafnyFile> dafny
     string err = null;
     Program dafnyProgram = null;
     try {
-      err = DafnyMain.ParseCheck(options.Input, dafnyFiles, programName, options, out dafnyProgram);
+      (dafnyProgram, err) = await DafnyMain.ParseCheck(options.Input, dafnyFiles, programName, options);
     } catch (Exception e) {
       err = "Exception while parsing -- please report the error (use --verbose to see the call stack)";
       if (options.Verbose) {
-        Console.Out.WriteLine(e.ToString());
+        await options.OutputWriter.WriteLineAsync(e.ToString()).ConfigureAwait(false);
       }
     }
     if (err != null) {
-      exitValue = DafnyDriver.ExitValue.DAFNY_ERROR;
-      Console.Out.WriteLine(err);
+      exitValue = ExitValue.DAFNY_ERROR;
+      await options.OutputWriter.WriteLineAsync(err);
     } else {
       Contract.Assert(dafnyProgram != null);
 
       // create the output folder if needed
-      if (!Directory.Exists(outputdir)) {
-        Directory.CreateDirectory(outputdir);
+      if (!Directory.Exists(outputDir)) {
+        Directory.CreateDirectory(outputDir);
       }
 
       // Check writable
       try {
-        File.Create(outputdir + "/index.html").Dispose();
+        await File.Create(outputDir + "/index.html").DisposeAsync();
       } catch (Exception) {
-        Console.Out.WriteLine("Insufficient permission to create output files in " + outputdir);
-        return DafnyDriver.ExitValue.DAFNY_ERROR;
+        await options.OutputWriter.WriteLineAsync("Insufficient permission to create output files in " + outputDir);
+        return ExitValue.DAFNY_ERROR;
       }
       // Generate all the documentation
-      exitValue = new DafnyDoc(dafnyProgram, options, outputdir).GenerateDocs(dafnyFiles);
+      exitValue = new DafnyDoc(dafnyProgram, options, outputDir).GenerateDocs(dafnyFiles);
     }
     return exitValue;
   }
@@ -117,7 +123,7 @@ public DafnyDoc(Program dafnyProgram, DafnyOptions options, string outputdir) {
     this.Outputdir = outputdir;
   }
 
-  public DafnyDriver.ExitValue GenerateDocs(IReadOnlyList<DafnyFile> dafnyFiles) {
+  public ExitValue GenerateDocs(IReadOnlyList<DafnyFile> dafnyFiles) {
     try {
       var modDecls = new List<LiteralModuleDecl>();
       var rootModule = DafnyProgram.DefaultModule;
@@ -130,11 +136,11 @@ public DafnyDriver.ExitValue GenerateDocs(IReadOnlyList<DafnyFile> dafnyFiles) {
       WriteTOC();
       WritePages();
       WriteStyle();
-      return DafnyDriver.ExitValue.SUCCESS;
+      return ExitValue.SUCCESS;
     } catch (Exception e) {
       // This is a fail-safe backstop so that dafny itself does not crash
       Reporter.Error(MessageSource.Documentation, DafnyProgram.DefaultModule, $"Unexpected exception while generating documentation: {e.Message}\n{e.StackTrace}");
-      return DafnyDriver.ExitValue.DAFNY_ERROR;
+      return ExitValue.DAFNY_ERROR;
     }
   }
 
@@ -199,7 +205,7 @@ public Info ModuleInfo(bool register, LiteralModuleDecl module, ModuleDefinition
     }
     var defaultClass = moduleDef.TopLevelDecls.First(d => d is DefaultClassDecl cd) as DefaultClassDecl;
 
-    var info = new Info(register, this, "module", module == null ? null : module.Tok, moduleDef.IsDefaultModule ? "_" : moduleDef.Name, fullName);
+    var info = new Info(register, this, "module", module == null ? null : module.Origin, moduleDef.IsDefaultModule ? "_" : moduleDef.Name, fullName);
     info.Contents = new List<Info>();
 
     if (moduleDef.IsDefaultModule) {
@@ -211,7 +217,7 @@ public Info ModuleInfo(bool register, LiteralModuleDecl module, ModuleDefinition
         info.Source = FileInfo(dafnyFiles[0].CanonicalPath);
       }
     } else if (module != null) {
-      info.Source = FileInfo(module.Tok);
+      info.Source = FileInfo(module.Origin);
     }
 
     var docstring = Docstring(module);
@@ -220,17 +226,22 @@ public Info ModuleInfo(bool register, LiteralModuleDecl module, ModuleDefinition
       info.HtmlSummary = Row(Link(module.FullName, module.Name), DashShortDocstring(module));
     }
     var details = new StringBuilder();
-    var abs = moduleDef.IsAbstract ? "abstract " : ""; // The only modifier for modules
+    var modifier = moduleDef.ModuleKind switch {
+      ModuleKindEnum.Abstract => "abstract ",
+      ModuleKindEnum.Replaceable => "replaceable ",
+      _ => ""
+    };
 
     string refineText = "";
-    if (moduleDef.RefinementQId != null) {
-      refineText = (" refines " + QualifiedNameWithLinks(moduleDef.RefinementQId.Decl.FullDafnyName));
+    if (moduleDef.Implements != null) {
+      var kind = moduleDef.Implements.Kind == ImplementationKind.Replacement ? "replaces" : "refines";
+      refineText = ($" {kind} {QualifiedNameWithLinks(moduleDef.Implements.Target.Decl.FullDafnyName)}");
     }
     details.Append(MainStart("full"));
 
     if (module != null) {
       details.Append(AttrString(moduleDef.Attributes));
-      details.Append(Code(abs + "module " + moduleDef.Name + refineText));
+      details.Append(Code(modifier + "module " + moduleDef.Name + refineText));
       details.Append(br);
       details.Append(eol);
     } else {
@@ -259,7 +270,7 @@ public Info ModuleInfo(bool register, LiteralModuleDecl module, ModuleDefinition
 
 
   /** Returns printable info about the file containing the given token and the last modification time of the file */
-  public string FileInfo(IToken tok) {
+  public string FileInfo(IOrigin tok) {
     if (tok != null) {
       return FileInfo(tok.ActualFilename);
     }
@@ -306,7 +317,7 @@ public string ExportId(string fullname) {
   public Info ExportInfo(ModuleExportDecl ex, bool register) {
     var name = ex.Name;
     var docstring = Docstring(ex);
-    var info = new Info(register, this, "export", ex.Tok, name, ex.FullDafnyName, ExportId(ex.FullDafnyName));
+    var info = new Info(register, this, "export", ex.Origin, name, ex.FullDafnyName, ExportId(ex.FullDafnyName));
 
     info.HtmlSummary = Row($"{Keyword("export")} {Code(ex.EnclosingModuleDefinition.Name)}`{Link(info.Id, Code(Bold(ex.Name)))}",
      DashShortDocstring(ex));
@@ -376,7 +387,7 @@ public void AddExportSummaries(ModuleDefinition module, StringBuilder summaries,
   public Info ImportInfo(ModuleDecl md, bool register) {
     var name = md.Name;
     var docstring = Docstring(md);
-    var info = new Info(register, this, "import", md.Tok, name, md.FullDafnyName, md.FullDafnyName + "__import");
+    var info = new Info(register, this, "import", md.Origin, name, md.FullDafnyName, md.FullDafnyName + "__import");
 
     var styledName = Code(Bold(name));
     var details = new StringBuilder();
@@ -480,7 +491,7 @@ public void AddTypeSummaries(ModuleDefinition module, StringBuilder summaries, I
   }
 
   public Info ConstantInfo(bool register, ConstantField c) {
-    var info = new Info(register, this, "const", c.Tok, c.Name, c.FullDafnyName);
+    var info = new Info(register, this, "const", c.Origin, c.Name, c.FullDafnyName);
 
     var docstring = Docstring(c);
     var modifiers = c.ModifiersAsString();
@@ -500,7 +511,7 @@ public Info ConstantInfo(bool register, ConstantField c) {
   }
 
   public Info VarInfo(bool register, Field f) {
-    var info = new Info(register, this, "var", f.Tok, f.Name, f.FullDafnyName);
+    var info = new Info(register, this, "var", f.Origin, f.Name, f.FullDafnyName);
 
     var docstring = Docstring(f);
     var linkedName = Code(Link(f.FullDafnyName, Bold(f.Name)));
@@ -529,7 +540,7 @@ public Info ExecutableInfo(bool register, MemberDecl m, TopLevelDeclWithMembers
       }
     }
 
-    var info = new Info(register, this, m.WhatKind, m.Tok, name, m.FullDafnyName);
+    var info = new Info(register, this, m.WhatKind, m.Origin, name, m.FullDafnyName);
 
     var md = m as IHasDocstring;
     var docstring = Docstring(md);
@@ -554,7 +565,7 @@ public Info ExecutableInfo(bool register, MemberDecl m, TopLevelDeclWithMembers
         if (f.IsOpaque) {
           details.Append(br).Append(space4).Append("Function body is opaque").Append(br).Append(eol);
         }
-        var brackets = new RangeToken(body.StartToken.Prev, body.EndToken.Next);
+        var brackets = new SourceOrigin(body.StartToken.Prev, body.EndToken.Next);
         int column = brackets.StartToken.line != brackets.EndToken.line ? brackets.EndToken.col : 0;
         var offset = column <= 1 ? "" : new StringBuilder().Insert(0, " ", column - 1).ToString();
         details.Append(Pre(offset + brackets.PrintOriginal()));
@@ -568,7 +579,7 @@ public Info ExecutableInfo(bool register, MemberDecl m, TopLevelDeclWithMembers
   }
 
   public string ExpressionAsSource(Expression e) {
-    return e.RangeToken.PrintOriginal();
+    return e.Origin.PrintOriginal();
   }
 
   public Info TypeInfo(bool register, TopLevelDecl t, ModuleDefinition module, Info owner) {
@@ -580,7 +591,7 @@ public Info TypeInfo(bool register, TopLevelDecl t, ModuleDefinition module, Inf
     var typeparams = TypeFormals(t.TypeArgs);
     string kind = t.WhatKind.Replace("abstract ", "").Replace("opaque ", "").Replace("subset ", "").Replace(" synonym", "");
 
-    var info = new Info(register, this, t.WhatKind, t.Tok, t.Name, t.FullDafnyName);
+    var info = new Info(register, this, t.WhatKind, t.Origin, t.Name, t.FullDafnyName);
 
     var details = new StringBuilder();
 
@@ -631,7 +642,7 @@ public Info TypeInfo(bool register, TopLevelDecl t, ModuleDefinition module, Inf
       decl.Append(" = ");
       // datatype constructors are written out several lines down
     } else {
-      Reporter.Warning(MessageSource.Documentation, ParseErrors.ErrorId.none, t.Tok, "Kind of type not handled in dafny doc");
+      Reporter.Warning(MessageSource.Documentation, ParseErrors.ErrorId.none, t.Origin, "Kind of type not handled in dafny doc");
     }
     decl.Append(br).Append(eol);
     details.Append(AttrString(t.Attributes));
@@ -745,7 +756,7 @@ string MethodSig(MemberDecl m) {
       var f = m as Function;
       var typeparams = TypeFormals(f.TypeArgs);
       var allowNew = m is TwoStateFunction;
-      var formals = String.Join(", ", f.Formals.Select(ff => FormalAsString(ff, allowNew)));
+      var formals = String.Join(", ", f.Ins.Select(ff => FormalAsString(ff, allowNew)));
       return (Bold(m.Name) + typeparams) + "(" + formals + "): " + TypeLink(f.ResultType);
     } else {
       return "";
@@ -795,7 +806,7 @@ public static string AttrString(Attributes attr) {
   }
 
   public static bool IsGeneratedName(string name) {
-    return (name.Length > 1 && name[0] == '_') || name.StartsWith("reveal_");
+    return (name.Length > 1 && name[0] == '_') || name.StartsWith(HideRevealStmt.RevealLemmaPrefix);
   }
 
   public string IndentedHtml(string docstring, bool nothingIfNull = false) {
@@ -817,6 +828,11 @@ public bool AppendSpecs(StringBuilder details, MemberDecl d) {
         details.Append(space4).Append(Keyword("requires")).Append(" ").Append(Code(req.E.ToString())).Append(br).Append(eol);
         some = true;
       }
+      if (m.Reads.Expressions.Count > 0) {
+        var list = String.Join(", ", m.Reads.Expressions.Select(e => Code(e.OriginalExpression.ToString() + (e.FieldName != null ? "`" + e.FieldName : ""))));
+        details.Append(space4).Append(Keyword("reads")).Append(" ").Append(list).Append(br).Append(eol);
+        some = true;
+      }
       if (m.Mod != null && m.Mod.Expressions.Count > 0) {
         var list = String.Join(", ", m.Mod.Expressions.Select(e => Code(e.OriginalExpression.ToString() + (e.FieldName != null ? "`" + e.FieldName : ""))));
         details.Append(space4).Append(Keyword("modifies")).Append(" ").Append(list).Append(br).Append(eol);
@@ -833,8 +849,8 @@ public bool AppendSpecs(StringBuilder details, MemberDecl d) {
       }
     } else if (d is Function) {
       var m = d as Function;
-      if (m.Reads != null && m.Reads.Count > 0) {
-        var list = String.Join(", ", m.Reads.Select(e => Code(e.OriginalExpression.ToString() + (e.FieldName != null ? "`" + e.FieldName : ""))));
+      if (m.Reads != null && m.Reads.Expressions.Count > 0) {
+        var list = String.Join(", ", m.Reads.Expressions.Select(e => Code(e.OriginalExpression.ToString() + (e.FieldName != null ? "`" + e.FieldName : ""))));
         details.Append(space4).Append(Keyword("reads")).Append(" ").Append(list).Append(br).Append(eol);
         some = true;
       }
@@ -931,7 +947,7 @@ public string TypeLink(Type tin) {
         return Code(s);
       }
     }
-    Reporter.Warning(MessageSource.Documentation, ParseErrors.ErrorId.none, t.Tok, "Implementation missing for type " + t.GetType() + " " + t.ToString());
+    Reporter.Warning(MessageSource.Documentation, ParseErrors.ErrorId.none, t.Origin, "Implementation missing for type " + t.GetType() + " " + t.ToString());
     return Code(t.ToString());
   }
 
@@ -1024,7 +1040,7 @@ public string TypeActualParameters(List<Type> args, bool enclose = true) {
 
   public void AnnounceFile(string filename) {
     if (Options.Verbose) {
-      Console.WriteLine("Writing " + filename);
+      Options.OutputWriter.WriteLine("Writing " + filename);
     }
   }
 
diff --git a/Source/DafnyDriver/DafnyDriver.cs b/Source/DafnyDriver/DafnyDriver.cs
deleted file mode 100644
index 6f9b161221a..00000000000
--- a/Source/DafnyDriver/DafnyDriver.cs
+++ /dev/null
@@ -1,1021 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) Microsoft Corporation.  All Rights Reserved.
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-//
-//-----------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------
-// DafnyDriver
-//       - main program for taking a Dafny program and verifying it
-//---------------------------------------------------------------------------------------------
-
-using System.Collections.Concurrent;
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Linq;
-using Microsoft.Boogie;
-using Bpl = Microsoft.Boogie;
-using System.Diagnostics;
-using Microsoft.Dafny;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.Dafny.LanguageServer.CounterExampleGeneration;
-using Microsoft.Dafny.Plugins;
-
-namespace Microsoft.Dafny {
-
-  public class DafnyDriver : IDisposable {
-    public DafnyOptions Options { get; }
-
-    private readonly ExecutionEngine engine;
-
-    private DafnyDriver(DafnyOptions dafnyOptions) {
-      Options = dafnyOptions;
-      engine = ExecutionEngine.CreateWithoutSharedCache(dafnyOptions);
-    }
-
-    // TODO: Refactor so that non-errors (NOT_VERIFIED, DONT_PROCESS_FILES) don't result in non-zero exit codes
-    public enum ExitValue { SUCCESS = 0, PREPROCESSING_ERROR, DAFNY_ERROR, COMPILE_ERROR, VERIFICATION_ERROR, FORMAT_ERROR }
-
-    // Environment variables that the CLI directly or indirectly (through target language tools) reads.
-    // This is defined for the benefit of testing infrastructure to ensure that they are maintained
-    // through separate processes.
-    public static readonly string[] ReferencedEnvironmentVariables = { "PATH", "HOME", "DOTNET_NOLOGO" };
-
-    static DafnyDriver() {
-      if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
-        ReferencedEnvironmentVariables = ReferencedEnvironmentVariables
-          .Concat(new[] { // Careful: Keep this list in sync with the one in lit.site.cfg
-            "APPDATA",
-            "HOMEDRIVE",
-            "HOMEPATH",
-            "INCLUDE",
-            "LIB",
-            "LOCALAPPDATA",
-            "NODE_PATH",
-            "ProgramFiles",
-            "ProgramFiles(x86)",
-            "SystemRoot",
-            "SystemDrive",
-            "TEMP",
-            "TMP",
-            "USERPROFILE"
-          }).ToArray();
-      }
-    }
-
-    public static readonly string[] DefaultArgumentsForTesting = new[] {
-      // Try to verify 2 verification conditions at once
-      "/vcsCores:2",
-
-      // We do not want absolute or relative paths in error messages, just the basename of the file
-      "/useBaseNameForFileName",
-
-      // We do not want output such as "Compiled program written to Foo.cs"
-      // from the compilers, since that changes with the target language
-      "/compileVerbose:0",
-      
-      // Set a default time limit, to catch cases where verification time runs off the rails
-      "/timeLimit:300",
-
-      // test results do not include source code snippets
-      "/showSnippets:0"
-    };
-
-    public static readonly string[] NewDefaultArgumentsForTesting = new[] {
-      // Try to verify 2 verification conditions at once
-      "--cores=2",
-
-      // We do not want absolute or relative paths in error messages, just the basename of the file
-      "--use-basename-for-filename",
-
-      // Set a default time limit, to catch cases where verification time runs off the rails
-      "--verification-time-limit=300",
-
-      // test results do not include source code snippets
-      "--show-snippets:false"
-    };
-
-    public static int Main(string[] args) {
-      return MainWithWriters(Console.Out, Console.Error, Console.In, args);
-    }
-
-    public static int MainWithWriters(TextWriter outputWriter, TextWriter errorWriter, TextReader inputReader,
-      string[] args) {
-
-      // Code that shouldn't be needed, but prevents some exceptions when running the integration tests in parallel
-      // outputWriter = new UndisposableTextWriter(outputWriter);
-      // errorWriter = new UndisposableTextWriter(errorWriter);
-      // outputWriter = TextWriter.Synchronized(outputWriter);
-      // errorWriter = TextWriter.Synchronized(errorWriter);
-
-#pragma warning disable VSTHRD002
-      return Task.Run(() => ThreadMain(outputWriter, errorWriter, inputReader, args)).Result;
-#pragma warning restore VSTHRD002
-    }
-
-    private static int ThreadMain(TextWriter outputWriter, TextWriter errorWriter, TextReader inputReader, string[] args) {
-      Contract.Requires(cce.NonNullElements(args));
-
-      var cliArgumentsResult = ProcessCommandLineArguments(outputWriter, errorWriter, inputReader,
-        args, out var dafnyOptions, out var dafnyFiles, out var otherFiles);
-      ExitValue exitValue;
-
-      switch (cliArgumentsResult) {
-        case CommandLineArgumentsResult.OK:
-
-          if (dafnyOptions.Get(CoverageReportCommand.OutDirArgument) != null) {
-            new CoverageReporter(dafnyOptions)
-              .Merge(dafnyOptions.Get(CoverageReportCommand.ReportsArgument).ConvertAll(fileInfo => fileInfo.FullName), dafnyOptions.Get(CoverageReportCommand.OutDirArgument));
-            return 0;
-          }
-
-          if (dafnyOptions.RunLanguageServer) {
-#pragma warning disable VSTHRD002
-            LanguageServer.Server.Start(dafnyOptions).Wait();
-#pragma warning restore VSTHRD002
-            return 0;
-          }
-
-          using (var driver = new DafnyDriver(dafnyOptions)) {
-#pragma warning disable VSTHRD002
-            exitValue = driver.ProcessFilesAsync(dafnyFiles, otherFiles.AsReadOnly(), dafnyOptions).Result;
-#pragma warning restore VSTHRD002
-          }
-          break;
-        case CommandLineArgumentsResult.PREPROCESSING_ERROR:
-          return (int)ExitValue.PREPROCESSING_ERROR;
-        case CommandLineArgumentsResult.OK_EXIT_EARLY:
-          return (int)ExitValue.SUCCESS;
-        default:
-          throw new ArgumentOutOfRangeException();
-      }
-
-      dafnyOptions.XmlSink?.Close();
-
-      if (dafnyOptions.VerificationLoggerConfigs.Any()) {
-        try {
-          VerificationResultLogger.RaiseTestLoggerEvents(dafnyOptions);
-        } catch (ArgumentException ae) {
-          dafnyOptions.Printer.ErrorWriteLine(dafnyOptions.OutputWriter, $"*** Error: {ae.Message}");
-          exitValue = ExitValue.PREPROCESSING_ERROR;
-        }
-      }
-      if (dafnyOptions.Wait) {
-        Console.WriteLine("Press Enter to exit.");
-        Console.ReadLine();
-      }
-
-      //Console.ReadKey();
-      return (int)exitValue;
-    }
-
-    public enum CommandLineArgumentsResult {
-      /// Indicates that arguments were parsed successfully.
-      OK,
-      /// Indicates that arguments were not parsed successfully.
-      PREPROCESSING_ERROR,
-      /// Indicates that arguments were parsed successfully, but the program should exit without processing files.
-      OK_EXIT_EARLY
-    }
-
-    static HashSet<string> SplitOptionValueIntoFiles(HashSet<string> inputs) {
-      var result = new HashSet<string>();
-      foreach (var input in inputs) {
-        var values = input.Split(',');
-        foreach (var slice in values) {
-          var name = slice.Trim();
-          if (Directory.Exists(name)) {
-            var files = Directory.GetFiles(name, "*.dfy", SearchOption.AllDirectories);
-            foreach (var file in files) { result.Add(file); }
-          } else {
-            result.Add(name);
-          }
-        }
-      }
-      return result;
-    }
-
-    public static CommandLineArgumentsResult ProcessCommandLineArguments(TextWriter outputWriter,
-      TextWriter errorWriter,
-      TextReader inputReader,
-      string[] args, out DafnyOptions options, out List<DafnyFile> dafnyFiles, out List<string> otherFiles) {
-      dafnyFiles = new List<DafnyFile>();
-      otherFiles = new List<string>();
-
-      try {
-        switch (CommandRegistry.Create(outputWriter, errorWriter, inputReader, args)) {
-          case ParseArgumentSuccess success:
-            options = success.DafnyOptions;
-            break;
-          case ParseArgumentFailure failure:
-            options = null;
-            return failure.ExitResult;
-          default: throw new Exception("unreachable");
-        }
-
-        options.RunningBoogieFromCommandLine = true;
-      } catch (ProverException pe) {
-        new DafnyConsolePrinter(DafnyOptions.Create(outputWriter)).ErrorWriteLine(outputWriter, "*** ProverException: {0}", pe.Message);
-        options = null;
-        return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-      }
-
-      if (options.RunLanguageServer) {
-        return CommandLineArgumentsResult.OK;
-      }
-
-      if (options.Get(CoverageReportCommand.OutDirArgument) != null) {
-        return CommandLineArgumentsResult.OK;
-      }
-
-      if (options.DafnyProject != null) {
-        foreach (var uri in options.DafnyProject.GetRootSourceUris(OnDiskFileSystem.Instance)) {
-          options.CliRootSourceUris.Add(uri);
-        }
-      }
-
-      var nonOutOptions = options;
-      var compilers = options.Plugins.SelectMany(p => p.GetCompilers(nonOutOptions)).ToList();
-      var compiler = compilers.LastOrDefault(c => c.TargetId == nonOutOptions.CompilerName);
-      if (compiler == null) {
-        if (nonOutOptions.CompilerName != null) {
-          var known = String.Join(", ", compilers.Select(c => $"'{c.TargetId}' ({c.TargetName})"));
-          options.Printer.ErrorWriteLine(options.ErrorWriter, $"*** Error: No compiler found for target \"{options.CompilerName}\"{(options.CompilerName.StartsWith("-t") || options.CompilerName.StartsWith("--") ? " (use just a target name, not a -t or --target option)" : "")}; expecting one of {known}");
-          return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-        }
-
-        options.Backend = new NoExecutableBackend();
-      } else {
-        options.Backend = compiler;
-      }
-
-      // If requested, print version number, help, attribute help, etc. and exit.
-      if (options.ProcessInfoFlags()) {
-        return CommandLineArgumentsResult.OK_EXIT_EARLY;
-      }
-
-      if (options.UseStdin) {
-        var uri = new Uri("stdin:///");
-        options.CliRootSourceUris.Add(uri);
-        dafnyFiles.Add(new DafnyFile(options, uri));
-      } else if (options.CliRootSourceUris.Count == 0 && !options.Format) {
-        options.Printer.ErrorWriteLine(options.ErrorWriter, "*** Error: No input files were specified in command-line " + string.Join("|", args) + ".");
-        return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-      }
-      if (options.XmlSink != null) {
-        string errMsg = options.XmlSink.Open();
-        if (errMsg != null) {
-          options.Printer.ErrorWriteLine(options.ErrorWriter, "*** Error: " + errMsg);
-          return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-        }
-      }
-      if (options.ShowEnv == ExecutionEngineOptions.ShowEnvironment.Always) {
-        outputWriter.WriteLine("---Command arguments");
-        foreach (string arg in args) {
-          Contract.Assert(arg != null);
-          outputWriter.WriteLine(arg);
-        }
-        outputWriter.WriteLine("--------------------");
-      }
-
-      ISet<String> filesSeen = new HashSet<string>();
-      foreach (var file in options.CliRootSourceUris.Where(u => u.IsFile).Select(u => u.LocalPath).
-                 Concat(SplitOptionValueIntoFiles(options.LibraryFiles))) {
-        Contract.Assert(file != null);
-        string extension = Path.GetExtension(file);
-        if (extension != null) { extension = extension.ToLower(); }
-
-        bool isDafnyFile = false;
-        var relative = Path.GetFileName(file);
-        bool useRelative = options.UseBaseNameForFileName || relative.StartsWith("-");
-        var nameToShow = useRelative ? relative
-          : Path.GetRelativePath(Directory.GetCurrentDirectory(), file);
-        try {
-          var df = new DafnyFile(options, new Uri(Path.GetFullPath(file)));
-          if (options.LibraryFiles.Contains(file)) {
-            df.IsPreverified = true;
-            df.IsPrecompiled = true;
-          }
-          if (!filesSeen.Add(df.CanonicalPath)) {
-            continue; // silently ignore duplicate
-          }
-          dafnyFiles.Add(df);
-          isDafnyFile = true;
-        } catch (ArgumentException e) {
-          options.Printer.ErrorWriteLine(options.ErrorWriter, "*** Error: {0}: ", nameToShow, e.Message);
-          return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-        } catch (IllegalDafnyFile e) {
-          if (e.ProcessingError) {
-            return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-          }
-          // Fall through and try to handle the file as an "other file"
-        } catch (Exception e) {
-          options.Printer.ErrorWriteLine(options.ErrorWriter, "*** Error: {0}: {1}", nameToShow, e.Message);
-          return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-        }
-
-        var supportedExtensions = options.Backend.SupportedExtensions;
-        if (supportedExtensions.Contains(extension)) {
-          // .h files are not part of the build, they are just emitted as includes
-          // TODO: This should be delegated to the backend instead (i.e. the CppCompilerBackend)
-          if (File.Exists(file) || extension == ".h") {
-            otherFiles.Add(file);
-          } else {
-            options.Printer.ErrorWriteLine(options.OutputWriter, $"*** Error: file {nameToShow} not found");
-            return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-          }
-        } else if (options.AllowSourceFolders && Directory.Exists(file)) {
-          options.SourceFolders.Add(file);
-        } else if (!isDafnyFile) {
-          if (options.UsingNewCli && string.IsNullOrEmpty(extension) && file.Length > 0) {
-            options.Printer.ErrorWriteLine(options.OutputWriter,
-              "*** Error: Command-line argument '{0}' is neither a recognized option nor a filename with a supported extension ({1}).",
-              nameToShow,
-              string.Join(", ", Enumerable.Repeat(".dfy", 1).Concat(supportedExtensions)));
-          } else if (string.IsNullOrEmpty(extension) && file.Length > 0 && (file[0] == '/' || file[0] == '-')) {
-            options.Printer.ErrorWriteLine(options.OutputWriter,
-              "*** Error: Command-line argument '{0}' is neither a recognized option nor a filename with a supported extension ({1}).",
-              nameToShow, string.Join(", ", Enumerable.Repeat(".dfy", 1).Concat(supportedExtensions)));
-          } else {
-            options.Printer.ErrorWriteLine(options.OutputWriter,
-              "*** Error: '{0}': Filename extension '{1}' is not supported. Input files must be Dafny programs (.dfy) or supported auxiliary files ({2})",
-              nameToShow, extension, string.Join(", ", supportedExtensions));
-          }
-          return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-        }
-      }
-
-      if (dafnyFiles.Count == 0 && options.SourceFolders.Count == 0) {
-        if (!options.AllowSourceFolders) {
-          options.Printer.ErrorWriteLine(Console.Out, "*** Error: The command-line contains no .dfy files");
-          // TODO: With the test on CliRootUris.Count above, this code is no longer reachable
-          options.Printer.ErrorWriteLine(options.OutputWriter, "*** Error: The command-line contains no .dfy files");
-          return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-        } else {
-          options.Printer.ErrorWriteLine(Console.Out, "*** Error: The command-line contains no .dfy files or folders");
-          //options.Printer.ErrorWriteLine(Console.Out,
-          //  "Usage:\ndafny format [--check] [--print] <file/folder> <file/folder>...\nYou can use '.' for the current directory");
-          return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-        }
-      }
-
-      if (dafnyFiles.Count > 1 &&
-          options.TestGenOptions.Mode != TestGenerationOptions.Modes.None) {
-        options.Printer.ErrorWriteLine(options.OutputWriter,
-          "*** Error: Only one .dfy file can be specified for testing");
-        return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-      }
-
-      if (options.ExtractCounterexample && options.ModelViewFile == null) {
-        options.Printer.ErrorWriteLine(options.OutputWriter,
-          "*** Error: ModelView file must be specified when attempting counterexample extraction");
-        return CommandLineArgumentsResult.PREPROCESSING_ERROR;
-      }
-      return CommandLineArgumentsResult.OK;
-    }
-
-    private async Task<ExitValue> ProcessFilesAsync(IReadOnlyList<DafnyFile/*!*/>/*!*/ dafnyFiles,
-      ReadOnlyCollection<string> otherFileNames,
-      DafnyOptions options, bool lookForSnapshots = true, string programId = null) {
-      Contract.Requires(cce.NonNullElements(dafnyFiles));
-      var dafnyFileNames = DafnyFile.FileNames(dafnyFiles);
-
-      ExitValue exitValue = ExitValue.SUCCESS;
-      if (options.TestGenOptions.Mode != TestGenerationOptions.Modes.None) {
-        var coverageReport = new CoverageReport(name: "Expected Test Coverage", units: "Locations", suffix: "_tests_expected", program: null);
-        if (options.TestGenOptions.WarnDeadCode) {
-          await foreach (var line in DafnyTestGeneration.Main.GetDeadCodeStatistics(dafnyFileNames[0], options, coverageReport)) {
-            await options.OutputWriter.WriteLineAsync(line);
-          }
-        } else {
-          await foreach (var line in DafnyTestGeneration.Main.GetTestClassForProgram(dafnyFileNames[0], options, coverageReport)) {
-            await options.OutputWriter.WriteLineAsync(line);
-          }
-        }
-        if (options.TestGenOptions.CoverageReport != null) {
-          new CoverageReporter(options).SerializeCoverageReports(coverageReport, options.TestGenOptions.CoverageReport);
-        }
-        if (DafnyTestGeneration.Main.SetNonZeroExitCode) {
-          exitValue = ExitValue.DAFNY_ERROR;
-        }
-        return exitValue;
-      }
-
-      if (options.VerifySeparately && 1 < dafnyFiles.Count) {
-        foreach (var f in dafnyFiles) {
-          await options.OutputWriter.WriteLineAsync();
-          await options.OutputWriter.WriteLineAsync($"-------------------- {f} --------------------");
-          var ev = await ProcessFilesAsync(new List<DafnyFile> { f }, new List<string>().AsReadOnly(), options, lookForSnapshots, f.FilePath);
-          if (exitValue != ev && ev != ExitValue.SUCCESS) {
-            exitValue = ev;
-          }
-        }
-        return exitValue;
-      }
-
-      if (0 < options.VerifySnapshots && lookForSnapshots) {
-        var snapshotsByVersion = ExecutionEngine.LookForSnapshots(dafnyFileNames);
-        foreach (var s in snapshotsByVersion) {
-          var snapshots = new List<DafnyFile>();
-          foreach (var f in s) {
-            var uri = new Uri(Path.GetFullPath(f));
-            snapshots.Add(new DafnyFile(options, uri));
-            options.CliRootSourceUris.Add(uri);
-          }
-          var ev = await ProcessFilesAsync(snapshots, new List<string>().AsReadOnly(), options, false, programId);
-          if (exitValue != ev && ev != ExitValue.SUCCESS) {
-            exitValue = ev;
-          }
-        }
-        return exitValue;
-      }
-
-      string programName = dafnyFileNames.Count == 1 ? dafnyFileNames[0] : "the_program";
-      string err;
-      if (options.Format) {
-        return DoFormatting(dafnyFiles, options, programName, options.ErrorWriter);
-      }
-      if (options.Command?.Name == "doc") {
-        // dafny doc accepts folders as well as files, so it handles 'dafnyFiles' a bit differently than ParseCheck below
-        return DafnyDoc.DoDocumenting(dafnyFiles, options.SourceFolders, programName, options);
-      }
-
-      err = DafnyMain.ParseCheck(options.Input, dafnyFiles, programName, options, out var dafnyProgram);
-      if (err != null) {
-        exitValue = ExitValue.DAFNY_ERROR;
-        options.Printer.ErrorWriteLine(options.OutputWriter, err);
-      } else if (dafnyProgram != null && !options.NoResolve && !options.NoTypecheck
-          && options.DafnyVerify) {
-
-        var boogiePrograms =
-          await DafnyMain.LargeStackFactory.StartNew(() => Translate(engine.Options, dafnyProgram).ToList());
-
-        string baseName = cce.NonNull(Path.GetFileName(dafnyFileNames[^1]));
-        var (verified, outcome, moduleStats) = await BoogieAsync(options, baseName, boogiePrograms, programId);
-
-        bool compiled;
-        try {
-          compiled = await Compile(dafnyFileNames[0], otherFileNames, dafnyProgram, outcome, moduleStats, verified);
-        } catch (UnsupportedFeatureException e) {
-          if (!options.Backend.UnsupportedFeatures.Contains(e.Feature)) {
-            throw new Exception($"'{e.Feature}' is not an element of the {options.Backend.TargetId} compiler's UnsupportedFeatures set");
-          }
-          dafnyProgram.Reporter.Error(MessageSource.Compiler, Compilers.CompilerErrors.ErrorId.f_unsupported_feature, e.Token, e.Message);
-          compiled = false;
-        }
-
-        exitValue = verified && compiled ? ExitValue.SUCCESS : !verified ? ExitValue.VERIFICATION_ERROR : ExitValue.COMPILE_ERROR;
-      }
-
-      if (err == null && dafnyProgram != null && options.PrintStats) {
-        Util.PrintStats(dafnyProgram);
-      }
-      if (err == null && dafnyProgram != null && options.PrintFunctionCallGraph) {
-        Util.PrintFunctionCallGraph(dafnyProgram);
-      }
-      if (dafnyProgram != null && options.ExtractCounterexample && exitValue == ExitValue.VERIFICATION_ERROR) {
-        PrintCounterexample(options, options.ModelViewFile);
-      }
-      return exitValue;
-    }
-
-    private static ExitValue DoFormatting(IReadOnlyList<DafnyFile> dafnyFiles, DafnyOptions options, string programName, TextWriter errorWriter) {
-      var exitValue = ExitValue.SUCCESS;
-      Contract.Assert(dafnyFiles.Count > 0 || options.SourceFolders.Count > 0);
-      dafnyFiles = dafnyFiles.Concat(options.SourceFolders.SelectMany(folderPath => {
-        return Directory.GetFiles(folderPath, "*.dfy", SearchOption.AllDirectories)
-            .Select(name => new DafnyFile(options, new Uri(name))).ToList();
-      })).ToList();
-
-      var failedToParseFiles = new List<string>();
-      var emptyFiles = new List<string>();
-      var doCheck = options.FormatCheck;
-      var doPrint = options.DafnyPrintFile == "-";
-      options.DafnyPrintFile = null;
-      var neededFormatting = 0;
-      foreach (var file in dafnyFiles) {
-        var dafnyFile = file;
-        if (!dafnyFile.Uri.IsFile && !doCheck && !doPrint) {
-          errorWriter.WriteLine("Please use the '--check' and/or '--print' option as stdin cannot be formatted in place.");
-          exitValue = ExitValue.PREPROCESSING_ERROR;
-          continue;
-        }
-
-        string tempFileName = null;
-        if (!dafnyFile.Uri.IsFile) {
-          tempFileName = Path.GetTempFileName() + ".dfy";
-          WriteFile(tempFileName, Console.In.ReadToEnd());
-          dafnyFile = new DafnyFile(options, new Uri(tempFileName));
-        }
-
-        var originalText = dafnyFile.Content.ReadToEnd();
-        dafnyFile.Content = new StringReader(originalText);
-        // Might not be totally optimized but let's do that for now
-        var err = DafnyMain.Parse(new List<DafnyFile> { dafnyFile }, programName, options, out var dafnyProgram);
-        if (err != null) {
-          exitValue = ExitValue.DAFNY_ERROR;
-          errorWriter.WriteLine(err);
-          failedToParseFiles.Add(dafnyFile.BaseName);
-        } else {
-          var firstToken = dafnyProgram.GetFirstTopLevelToken();
-          var result = originalText;
-          if (firstToken != null) {
-            result = Formatting.__default.ReindentProgramFromFirstToken(firstToken,
-              IndentationFormatter.ForProgram(dafnyProgram));
-            if (result != originalText) {
-              neededFormatting += 1;
-              if (doCheck) {
-                exitValue = exitValue != ExitValue.DAFNY_ERROR ? ExitValue.FORMAT_ERROR : exitValue;
-              }
-
-              if (doCheck && (!doPrint || options.Verbose)) {
-                options.OutputWriter.WriteLine("The file " +
-                                               (options.UseBaseNameForFileName
-                                                 ? Path.GetFileName(dafnyFile.FilePath)
-                                                 : dafnyFile.FilePath) + " needs to be formatted");
-              }
-
-              if (!doCheck && !doPrint) {
-                WriteFile(dafnyFile.FilePath, result);
-              }
-            }
-          } else {
-            // TODO: is this necessary? there already is a warning about files containing no code
-            if (options.Verbose) {
-              options.ErrorWriter.WriteLine(dafnyFile.BaseName + " was empty.");
-            }
-
-            emptyFiles.Add((options.UseBaseNameForFileName
-              ? Path.GetFileName(dafnyFile.FilePath)
-              : dafnyFile.FilePath));
-          }
-          if (doPrint) {
-            options.OutputWriter.Write(result);
-          }
-        }
-
-        if (tempFileName != null) {
-          File.Delete(tempFileName);
-        }
-      }
-
-      string Files(int num) {
-        return num + (num != 1 ? " files" : " file");
-      }
-
-      // Report any errors
-      var reportMsg = "";
-      if (failedToParseFiles.Count > 0) {
-        reportMsg += $"\n{Files(failedToParseFiles.Count)} failed to parse:\n  " + string.Join("\n  ", failedToParseFiles);
-      }
-      if (emptyFiles.Count > 0) {
-        reportMsg += $"\n{Files(emptyFiles.Count)} {(emptyFiles.Count > 1 ? "were" : "was")} empty:\n  " + string.Join("\n  ", emptyFiles);
-      }
-
-      var unchanged = dafnyFiles.Count - failedToParseFiles.Count - emptyFiles.Count - neededFormatting;
-      reportMsg += unchanged > 0 && (failedToParseFiles.Count > 0 || emptyFiles.Count > 0) ? $"\n{Files(unchanged)} {(unchanged > 1 ? "were" : "was")} already formatted." : "";
-      var filesNeedFormatting = neededFormatting == 0 ? "" : $"{Files(neededFormatting)} need{(neededFormatting > 1 ? "" : "s")} formatting.";
-      reportMsg = filesNeedFormatting + reportMsg;
-
-      if (doCheck) {
-        options.OutputWriter.WriteLine(neededFormatting > 0
-          ? $"Error: {reportMsg}"
-          : "All files are correctly formatted");
-      } else if (failedToParseFiles.Count > 0 || options.Verbose) {
-        // We don't display anything if we just format files without verbosity and there was no parse error
-        options.OutputWriter.WriteLine($"{reportMsg}");
-      }
-
-      return exitValue;
-    }
-
-    /// <summary>
-    /// Extract the counterexample corresponding to the first failing
-    /// assertion and print it to the console
-    /// </summary>
-    /// <param name="modelViewFile"> Name of the file from which to read
-    /// the counterexample </param> 
-    private static void PrintCounterexample(DafnyOptions options, string modelViewFile) {
-      var model = DafnyModel.ExtractModel(options, File.ReadAllText(modelViewFile));
-      options.OutputWriter.WriteLine("Counterexample for first failing assertion: ");
-      foreach (var state in model.States.Where(state => !state.IsInitialState)) {
-        options.OutputWriter.WriteLine(state.FullStateName + ":");
-        var vars = state.ExpandedVariableSet(-1);
-        foreach (var variable in vars) {
-          options.OutputWriter.WriteLine($"\t{variable.ShortName} : " +
-                                   $"{DafnyModelTypeUtils.GetInDafnyFormat(variable.Type)} = " +
-                                   $"{variable.Value}");
-        }
-      }
-    }
-
-    private static string BoogieProgramSuffix(string printFile, string suffix) {
-      var baseName = Path.GetFileNameWithoutExtension(printFile);
-      var dirName = Path.GetDirectoryName(printFile);
-
-      return Path.Combine(dirName, baseName + "_" + suffix + Path.GetExtension(printFile));
-    }
-
-    public static IEnumerable<Tuple<string, Bpl.Program>> Translate(ExecutionEngineOptions options, Program dafnyProgram) {
-      var modulesCount = Translator.VerifiableModules(dafnyProgram).Count();
-
-
-      foreach (var prog in Translator.Translate(dafnyProgram, dafnyProgram.Reporter)) {
-
-        if (options.PrintFile != null) {
-
-          var fileName = modulesCount > 1 ? Dafny.DafnyMain.BoogieProgramSuffix(options.PrintFile, prog.Item1) : options.PrintFile;
-
-          ExecutionEngine.PrintBplFile(options, fileName, prog.Item2, false, false, options.PrettyPrint);
-        }
-
-        yield return prog;
-
-      }
-    }
-
-    public async Task<(bool IsVerified, PipelineOutcome Outcome, IDictionary<string, PipelineStatistics> ModuleStats)>
-      BoogieAsync(DafnyOptions options,
-        string baseName,
-        IEnumerable<Tuple<string, Bpl.Program>> boogiePrograms, string programId) {
-
-      var concurrentModuleStats = new ConcurrentDictionary<string, PipelineStatistics>();
-      var writerManager = new ConcurrentToSequentialWriteManager(options.OutputWriter);
-
-      var moduleTasks = boogiePrograms.Select(async program => {
-        await using var moduleWriter = writerManager.AppendWriter();
-        // ReSharper disable once AccessToDisposedClosure
-        var result = await Task.Run(() =>
-          BoogieOnceWithTimerAsync(moduleWriter, options, baseName, programId, program.Item1, program.Item2));
-        concurrentModuleStats.TryAdd(program.Item1, result.Stats);
-        return result;
-      }).ToList();
-
-      await Task.WhenAll(moduleTasks);
-      await options.OutputWriter.FlushAsync();
-      var outcome = moduleTasks.Select(t => t.Result.Outcome)
-        .Aggregate(PipelineOutcome.VerificationCompleted, MergeOutcomes);
-
-      var isVerified = moduleTasks.Select(t =>
-        Dafny.DafnyMain.IsBoogieVerified(t.Result.Outcome, t.Result.Stats)).All(x => x);
-      return (isVerified, outcome, concurrentModuleStats);
-    }
-
-    private async Task<(PipelineOutcome Outcome, PipelineStatistics Stats)> BoogieOnceWithTimerAsync(
-      TextWriter output,
-      DafnyOptions options,
-      string baseName, string programId,
-      string moduleName,
-      Bpl.Program program) {
-      Stopwatch watch = new Stopwatch();
-      watch.Start();
-      if (options.SeparateModuleOutput) {
-        options.Printer.AdvisoryWriteLine(output, "For module: {0}", moduleName);
-      }
-
-      var result =
-        await Dafny.DafnyMain.BoogieOnce(options, output, engine, baseName, moduleName, program, programId);
-
-      watch.Stop();
-
-      if (options.SeparateModuleOutput) {
-        TimeSpan ts = watch.Elapsed;
-        string elapsedTime = $"{ts.Hours:00}:{ts.Minutes:00}:{ts.Seconds:00}";
-        options.Printer.AdvisoryWriteLine(output, "Elapsed time: {0}", elapsedTime);
-        WriteTrailer(options, output, result.Statistics);
-      }
-
-      return result;
-    }
-
-    private static PipelineOutcome MergeOutcomes(PipelineOutcome first, PipelineOutcome second) {
-
-      if ((first == PipelineOutcome.VerificationCompleted || first == PipelineOutcome.Done) &&
-          second != PipelineOutcome.VerificationCompleted) {
-        return second;
-      }
-
-      return first;
-    }
-
-    private static void WriteTrailer(DafnyOptions options, TextWriter output, PipelineStatistics stats) {
-      if (!options.Verify && stats.ErrorCount == 0) {
-        output.WriteLine();
-        output.Write("{0} did not attempt verification", options.DescriptiveToolName);
-        if (stats.InconclusiveCount != 0) {
-          output.Write(", {0} inconclusive{1}", stats.InconclusiveCount, Util.Plural(stats.InconclusiveCount));
-        }
-        if (stats.TimeoutCount != 0) {
-          output.Write(", {0} time out{1}", stats.TimeoutCount, Util.Plural(stats.TimeoutCount));
-        }
-        if (stats.OutOfMemoryCount != 0) {
-          output.Write(", {0} out of memory", stats.OutOfMemoryCount);
-        }
-        if (stats.OutOfResourceCount != 0) {
-          output.Write(", {0} out of resource", stats.OutOfResourceCount);
-        }
-        if (stats.SolverExceptionCount != 0) {
-          output.Write(", {0} solver exceptions", stats.SolverExceptionCount);
-        }
-
-        output.WriteLine();
-        output.Flush();
-      } else {
-        // This calls a routine within Boogie
-        options.Printer.WriteTrailer(output, stats);
-      }
-    }
-
-    private static void WriteModuleStats(DafnyOptions options, TextWriter output, IDictionary<string, PipelineStatistics> moduleStats) {
-      var statSum = new PipelineStatistics();
-      foreach (var stats in moduleStats) {
-        statSum.VerifiedCount += stats.Value.VerifiedCount;
-        statSum.ErrorCount += stats.Value.ErrorCount;
-        statSum.TimeoutCount += stats.Value.TimeoutCount;
-        statSum.OutOfResourceCount += stats.Value.OutOfResourceCount;
-        statSum.OutOfMemoryCount += stats.Value.OutOfMemoryCount;
-        statSum.SolverExceptionCount += stats.Value.SolverExceptionCount;
-        statSum.CachedErrorCount += stats.Value.CachedErrorCount;
-        statSum.CachedInconclusiveCount += stats.Value.CachedInconclusiveCount;
-        statSum.CachedOutOfMemoryCount += stats.Value.CachedOutOfMemoryCount;
-        statSum.CachedTimeoutCount += stats.Value.CachedTimeoutCount;
-        statSum.CachedOutOfResourceCount += stats.Value.CachedOutOfResourceCount;
-        statSum.CachedSolverExceptionCount += stats.Value.CachedSolverExceptionCount;
-        statSum.CachedVerifiedCount += stats.Value.CachedVerifiedCount;
-        statSum.InconclusiveCount += stats.Value.InconclusiveCount;
-      }
-      WriteTrailer(options, output, statSum);
-    }
-
-
-    public static async Task<bool> Compile(string fileName, ReadOnlyCollection<string> otherFileNames, Program dafnyProgram,
-                               PipelineOutcome oc, IDictionary<string, PipelineStatistics> moduleStats, bool verified) {
-      var options = dafnyProgram.Options;
-      var resultFileName = options.DafnyPrintCompiledFile ?? fileName;
-      bool compiled = true;
-      switch (oc) {
-        case PipelineOutcome.VerificationCompleted:
-          WriteModuleStats(options, options.OutputWriter, moduleStats);
-          if ((options.Compile && verified && !options.UserConstrainedProcsToCheck) || options.ForceCompile) {
-            compiled = await CompileDafnyProgram(dafnyProgram, resultFileName, otherFileNames, true);
-          } else if ((2 <= options.SpillTargetCode && verified && !options.UserConstrainedProcsToCheck) || 3 <= options.SpillTargetCode) {
-            compiled = await CompileDafnyProgram(dafnyProgram, resultFileName, otherFileNames, false);
-          }
-          break;
-        case PipelineOutcome.Done:
-          WriteModuleStats(options, options.OutputWriter, moduleStats);
-          if (options.ForceCompile || 3 <= options.SpillTargetCode) {
-            compiled = await CompileDafnyProgram(dafnyProgram, resultFileName, otherFileNames, options.ForceCompile);
-          }
-          break;
-        default:
-          // error has already been reported to user
-          break;
-      }
-      return compiled;
-    }
-
-    #region Compilation
-
-    private record TargetPaths(string Directory, string Filename) {
-      private static Func<string, string> DeleteDot = p => p == "." ? "" : p;
-      private static Func<string, string> AddDot = p => p == "" ? "." : p;
-      private Func<string, string> RelativeToDirectory =
-        path => DeleteDot(Path.GetRelativePath(AddDot(Directory), path));
-
-      public string RelativeDirectory => RelativeToDirectory(AddDot(Path.GetDirectoryName(Filename)));
-      public string RelativeFilename => RelativeToDirectory(Filename);
-      public string SourceDirectory => Path.GetDirectoryName(Filename);
-    }
-
-    private static TargetPaths GenerateTargetPaths(DafnyOptions options, string dafnyProgramName) {
-      string targetBaseDir = options.Backend.TargetBaseDir(dafnyProgramName);
-      string targetExtension = options.Backend.TargetExtension;
-
-      // Note that using Path.ChangeExtension here does the wrong thing when dafnyProgramName has multiple periods (e.g., a.b.dfy)
-      string targetBaseName = options.Backend.TargetBasename(dafnyProgramName) + "." + targetExtension;
-      string targetDir = Path.Combine(Path.GetDirectoryName(dafnyProgramName), targetBaseDir);
-
-      string targetFilename = Path.Combine(targetDir, targetBaseName);
-
-      return new TargetPaths(Directory: Path.GetDirectoryName(dafnyProgramName), Filename: targetFilename);
-    }
-
-    static void WriteDafnyProgramToFiles(DafnyOptions options, TargetPaths paths, bool targetProgramHasErrors, string targetProgramText,
-      string/*?*/ callToMain, Dictionary<string, string> otherFiles, TextWriter outputWriter) {
-      if (targetProgramText.Length != 0) {
-        WriteFile(paths.Filename, targetProgramText, callToMain);
-      }
-
-      string NormalizeRelativeFilename(string fileName) {
-        return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-          ? fileName.Replace(@"\", "/")
-          : fileName;
-      }
-
-      var relativeTarget = NormalizeRelativeFilename(paths.RelativeFilename);
-      if (targetProgramHasErrors) {
-        // Something went wrong during compilation (e.g., the compiler may have found an "assume" statement).
-        // As a courtesy, we're still printing the text of the generated target program. We print a message regardless
-        // of the Verbose settings.
-        outputWriter.WriteLine("Wrote textual form of partial target program to {0}", relativeTarget);
-      } else if (options.Verbose) {
-        outputWriter.WriteLine("Wrote textual form of target program to {0}", relativeTarget);
-      }
-
-      foreach (var entry in otherFiles) {
-        var filename = entry.Key;
-        WriteFile(Path.Join(paths.SourceDirectory, filename), entry.Value);
-        if (options.Verbose) {
-          outputWriter.WriteLine("Additional target code written to {0}", NormalizeRelativeFilename(Path.Join(paths.RelativeDirectory, filename)));
-        }
-      }
-    }
-
-    static void WriteFile(string filename, string text, string moreText = null) {
-      var dir = Path.GetDirectoryName(filename);
-      if (dir != "") {
-        Directory.CreateDirectory(dir);
-      }
-
-      CheckFilenameIsLegal(filename);
-      using TextWriter target = new StreamWriter(new FileStream(filename, FileMode.Create));
-      target.Write(text);
-      if (moreText != null) {
-        target.Write(moreText);
-      }
-    }
-
-    private static void CheckFilenameIsLegal(string filename) {
-      // We cannot get the full path correctly on Windows if the file name uses some reserved words
-      // For example, Path.GetFullPath("con.txt") will return "//./con" which is incorrect.
-      // https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN
-      if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
-        var problematicNames =
-          "CON, PRN, AUX, NUL, COM1, COM2, COM3, COM4, COM5, COM6, COM7, COM8, COM9, LPT1, LPT2, LPT3, LPT4, LPT5, LPT6, LPT7, LPT8, LPT9";
-        var problematicRegex =
-          new Regex(@"^(.*[/\\]|^)(" +
-                    string.Join("|", problematicNames.Split(", ")) + @")(\.[^/\\]*)?$", RegexOptions.IgnoreCase);
-        var match = problematicRegex.Match(filename);
-        if (match.Success) {
-          throw new Exception($"Cannot create a file with the name {filename}." +
-                              $" Windows reserves the following file names: {problematicNames}");
-        }
-      }
-    }
-
-    /// <summary>
-    /// Generate a C# program from the Dafny program and, if "invokeCompiler" is "true", invoke
-    /// the C# compiler to compile it.
-    /// </summary>
-    public static async Task<bool> CompileDafnyProgram(Program dafnyProgram, string dafnyProgramName,
-                                           ReadOnlyCollection<string> otherFileNames, bool invokeCompiler) {
-
-      foreach (var rewriter in dafnyProgram.Compilation.Rewriters) {
-        rewriter.PostVerification(dafnyProgram);
-      }
-
-      Contract.Requires(dafnyProgram != null);
-      Contract.Assert(dafnyProgramName != null);
-
-      var outputWriter = dafnyProgram.Options.OutputWriter;
-      var errorWriter = dafnyProgram.Options.ErrorWriter;
-
-      // Compile the Dafny program into a string that contains the target program
-      var oldErrorCount = dafnyProgram.Reporter.Count(ErrorLevel.Error);
-      var options = dafnyProgram.Options;
-      options.Backend.OnPreCompile(dafnyProgram.Reporter, otherFileNames);
-
-      // Now that an internal compiler is instantiated, apply any plugin instrumentation.
-      foreach (var compilerInstrumenter in options.Plugins.SelectMany(p => p.GetCompilerInstrumenters(dafnyProgram.Reporter))) {
-        options.Backend.InstrumentCompiler(compilerInstrumenter, dafnyProgram);
-      }
-
-      var compiler = options.Backend;
-
-      var hasMain = Compilers.SinglePassCompiler.HasMain(dafnyProgram, out var mainMethod);
-      if (hasMain) {
-        mainMethod.IsEntryPoint = true;
-        dafnyProgram.MainMethod = mainMethod;
-      }
-      string targetProgramText;
-      var otherFiles = new Dictionary<string, string>();
-      {
-        var output = new ConcreteSyntaxTree();
-        await DafnyMain.LargeStackFactory.StartNew(() => compiler.Compile(dafnyProgram, output));
-        var writerOptions = new WriterState();
-        var targetProgramTextWriter = new StringWriter();
-        var files = new Queue<FileSyntax>();
-        output.Render(targetProgramTextWriter, 0, writerOptions, files, compiler.TargetIndentSize);
-        targetProgramText = targetProgramTextWriter.ToString();
-
-        while (files.Count > 0) {
-          var file = files.Dequeue();
-          var otherFileWriter = new StringWriter();
-          writerOptions.HasNewLine = false;
-          file.Tree.Render(otherFileWriter, 0, writerOptions, files, compiler.TargetIndentSize);
-          otherFiles.Add(file.Filename, otherFileWriter.ToString());
-        }
-      }
-      string callToMain = null;
-      if (hasMain) {
-        var callToMainTree = new ConcreteSyntaxTree();
-        string baseName = Path.GetFileNameWithoutExtension(dafnyProgramName);
-        compiler.EmitCallToMain(mainMethod, baseName, callToMainTree);
-        callToMain = callToMainTree.MakeString(compiler.TargetIndentSize); // assume there aren't multiple files just to call main
-      }
-      Contract.Assert(hasMain == (callToMain != null));
-      bool targetProgramHasErrors = dafnyProgram.Reporter.Count(ErrorLevel.Error) != oldErrorCount;
-
-      compiler.OnPostCompile();
-
-      // blurt out the code to a file, if requested, or if other target-language files were specified on the command line.
-      var paths = GenerateTargetPaths(options, dafnyProgramName);
-      if (options.SpillTargetCode > 0 || otherFileNames.Count > 0 || (invokeCompiler && !compiler.SupportsInMemoryCompilation) ||
-          (invokeCompiler && compiler.TextualTargetIsExecutable && !options.RunAfterCompile)) {
-        compiler.CleanSourceDirectory(paths.SourceDirectory);
-        WriteDafnyProgramToFiles(options, paths, targetProgramHasErrors, targetProgramText, callToMain, otherFiles, outputWriter);
-      }
-
-      if (targetProgramHasErrors) {
-        return false;
-      }
-      // If we got here, compilation succeeded
-      if (!invokeCompiler) {
-        return true; // If we're not asked to invoke the target compiler, we can report success
-      }
-
-      // compile the program into an assembly
-      var compiledCorrectly = compiler.CompileTargetProgram(dafnyProgramName, targetProgramText, callToMain, paths.Filename, otherFileNames,
-        hasMain && options.RunAfterCompile, outputWriter, out var compilationResult);
-      if (compiledCorrectly && options.RunAfterCompile) {
-        if (hasMain) {
-          if (options.Verbose) {
-            await outputWriter.WriteLineAsync("Running...");
-            await outputWriter.WriteLineAsync();
-          }
-
-          compiledCorrectly = compiler.RunTargetProgram(dafnyProgramName, targetProgramText, callToMain,
-            paths.Filename, otherFileNames, compilationResult, outputWriter, errorWriter);
-        } else {
-          // make sure to give some feedback to the user
-          if (options.Verbose) {
-            await outputWriter.WriteLineAsync("Program compiled successfully");
-          }
-        }
-      }
-      return compiledCorrectly;
-    }
-
-    #endregion
-
-    public void Dispose() {
-      engine.Dispose();
-    }
-  }
-
-  class NoExecutableBackend : IExecutableBackend {
-    public override IReadOnlySet<string> SupportedExtensions => new HashSet<string>();
-    public override string TargetName => throw new NotSupportedException();
-    public override bool IsStable => throw new NotSupportedException();
-    public override string TargetExtension => throw new NotSupportedException();
-    public override string PublicIdProtect(string name) {
-      throw new NotSupportedException();
-    }
-
-    public override bool TextualTargetIsExecutable => throw new NotSupportedException();
-
-    public override bool SupportsInMemoryCompilation => throw new NotSupportedException();
-    public override void Compile(Program dafnyProgram, ConcreteSyntaxTree output) {
-      throw new NotSupportedException();
-    }
-
-    public override void EmitCallToMain(Method mainMethod, string baseName, ConcreteSyntaxTree callToMainTree) {
-      throw new NotSupportedException();
-    }
-
-    public override bool CompileTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain, string pathsFilename,
-      ReadOnlyCollection<string> otherFileNames, bool runAfterCompile, TextWriter outputWriter, out object compilationResult) {
-      throw new NotSupportedException();
-    }
-
-    public override bool RunTargetProgram(string dafnyProgramName, string targetProgramText, string callToMain,
-      string pathsFilename,
-      ReadOnlyCollection<string> otherFileNames, object compilationResult, TextWriter outputWriter,
-      TextWriter errorWriter) {
-      throw new NotSupportedException();
-    }
-
-    public override void InstrumentCompiler(CompilerInstrumenter instrumenter, Program dafnyProgram) {
-      throw new NotSupportedException();
-    }
-  }
-}
diff --git a/Source/DafnyDriver/DafnyDriver.csproj b/Source/DafnyDriver/DafnyDriver.csproj
index 12c8698b678..0236f2ce5f6 100644
--- a/Source/DafnyDriver/DafnyDriver.csproj
+++ b/Source/DafnyDriver/DafnyDriver.csproj
@@ -5,7 +5,7 @@
       <AssemblyName>DafnyDriver</AssemblyName>
       <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
       <DefineConstants>TRACE</DefineConstants>
-      <TargetFramework>net6.0</TargetFramework>
+      <RollForward>Major</RollForward>
       <OutputPath>..\..\Binaries\</OutputPath>
       <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
 
@@ -13,20 +13,10 @@
 
       <IsPackable>true</IsPackable>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <!-- Working around some stange behavior in dotnet publish: https://github.com/dotnet/sdk/issues/10566 -->
-  <PropertyGroup Condition="$(RUNTIME_IDENTIFIER) != ''">
-    <RuntimeIdentifier>$(RUNTIME_IDENTIFIER)</RuntimeIdentifier>
-  </PropertyGroup>
     
   <ItemGroup>
-    <PackageReference Include="Microsoft.TestPlatform.Extensions.TrxLogger" Version="17.0.0" />
-    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="16.11.0" />
+    <PackageReference Include="Microsoft.TestPlatform.Extensions.TrxLogger" Version="17.9.0" />
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.9.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
       
     <!-- Locking down versions that would otherwise be downgraded -->
@@ -42,8 +32,8 @@
     
   <ItemGroup>
     <ProjectReference Include="..\DafnyCore\DafnyCore.csproj" />
+    <ProjectReference Include="..\DafnyLanguageServer\DafnyLanguageServer.csproj" />
     <ProjectReference Include="..\DafnyTestGeneration\DafnyTestGeneration.csproj" />
-    <ProjectReference Include="..\DafnyServer\DafnyServer.csproj" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/Source/DafnyDriver/DafnyNewCli.cs b/Source/DafnyDriver/DafnyNewCli.cs
new file mode 100644
index 00000000000..ce476e9d98b
--- /dev/null
+++ b/Source/DafnyDriver/DafnyNewCli.cs
@@ -0,0 +1,325 @@
+#nullable enable
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.CommandLine.Builder;
+using System.CommandLine.Invocation;
+using System.CommandLine.Parsing;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using DafnyCore;
+using DafnyDriver.Commands;
+using Microsoft.Boogie;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Dafny.LanguageServer;
+
+namespace Microsoft.Dafny;
+
+public static class DafnyNewCli {
+  public const string ToolchainDebuggingHelpName = "--help-internal";
+  public static readonly RootCommand RootCommand = new("The Dafny CLI enables working with Dafny, a verification-aware programming language. Use 'dafny -?' to see help for the previous CLI format.");
+
+  private static void AddCommand(Command command) {
+    RootCommand.AddCommand(command);
+    RootCommand.TreatUnmatchedTokensAsErrors = false;
+  }
+
+  static DafnyNewCli() {
+    DafnyFile.RegisterExtensionHandler(DafnyProject.Extension, (options, fileSystem, reporter, uri, uriOrigin, asLibrary) => HandleDafnyProject(fileSystem, options, reporter, uri, uriOrigin, asLibrary));
+    AddCommand(ResolveCommand.Create());
+    AddCommand(VerifyCommand.Create());
+    AddCommand(BuildCommand.Create());
+    AddCommand(RunCommand.Create());
+    AddCommand(TranslateCommand.Create());
+    AddCommand(FormatCommand.Create());
+    AddCommand(DocCommand.Create());
+    AddCommand(MeasureComplexityCommand.Create());
+    AddCommand(ServerCommand.Instance);
+    AddCommand(TestCommand.Create());
+    AddCommand(GenerateTestsCommand.Create());
+    AddCommand(DeadCodeCommand.Create());
+    AddCommand(AuditCommand.Create());
+    AddCommand(CoverageReportCommand.Create());
+    AddCommand(DocumentationCommand.Create());
+    AddCommand(ExtractCommand.Create());
+
+    OptionRegistry.CheckOptionsAreKnown(AllOptions);
+
+    // This SHOULD find the same method but returns null for some reason:
+    // typeof(ParseResult).GetMethod("GetValueForOption", 1, new[] { typeof(Option<>) });
+    foreach (var method in typeof(ParseResult).GetMethods()) {
+      if (method.Name == "GetValueForOption" && method.GetGenericArguments().Length == 1) {
+        GetValueForOptionMethod = method;
+      }
+    }
+    Debug.Assert(GetValueForOptionMethod != null);
+
+    var builder = new CommandLineBuilder(RootCommand).UseDefaults();
+    builder = AddDeveloperHelp(RootCommand, builder);
+    Parser = builder.Build();
+  }
+
+  public delegate Task<int> ContinueWithOptions(DafnyOptions dafnyOptions, InvocationContext context);
+  public static void SetHandlerUsingDafnyOptionsContinuation(Command command, ContinueWithOptions continuation) {
+
+    async Task Handle(InvocationContext context) {
+      WritersConsole console = (WritersConsole)context.Console;
+      var dafnyOptions = new DafnyOptions(console.InputWriter, console.OutWriter, console.ErrWriter);
+      dafnyOptions.Environment =
+        "Command-line arguments: " + string.Join(" ", context.ParseResult.Tokens.Select(t => t.Value).
+          Where(s => !string.IsNullOrEmpty(s)));
+      dafnyOptions.ShowEnv = ExecutionEngineOptions.ShowEnvironment.Never;
+      var optionValues = new Dictionary<Option, object>();
+      var options = new Options(optionValues, new Dictionary<Argument, object>());
+      dafnyOptions.Options = options;
+
+      foreach (var argument in command.Arguments) {
+        var result = context.ParseResult.FindResultFor(argument)?.GetValueOrDefault();
+        if (result != null) {
+          options.Arguments[argument] = result;
+        }
+      }
+
+      ProcessOption(context, CommonOptionBag.UseBaseFileName, dafnyOptions);
+      dafnyOptions.ApplyBinding(CommonOptionBag.UseBaseFileName);
+
+      var singleFile = context.ParseResult.GetValueForArgument(DafnyCommands.FileArgument);
+      if (singleFile != null) {
+        if (!await ProcessFile(dafnyOptions, singleFile)) {
+          context.ExitCode = (int)ExitValue.PREPROCESSING_ERROR;
+          return;
+        }
+      }
+      var files = context.ParseResult.GetValueForArgument(DafnyCommands.FilesArgument);
+      if (files != null) {
+        foreach (var file in files) {
+          if (!await ProcessFile(dafnyOptions, file)) {
+            context.ExitCode = (int)ExitValue.PREPROCESSING_ERROR;
+            return;
+          }
+        }
+      }
+
+      ProcessOption(context, DafnyProject.FindProjectOption, dafnyOptions);
+      var firstFile = dafnyOptions.CliRootSourceUris.FirstOrDefault();
+      if (dafnyOptions.DafnyProject == null && dafnyOptions.Get(DafnyProject.FindProjectOption) && firstFile != null) {
+        var opener = new ProjectFileOpener(OnDiskFileSystem.Instance, Token.Cli);
+        var project = await opener.TryFindProject(firstFile);
+        project?.Validate(dafnyOptions.OutputWriter, AllOptions);
+        dafnyOptions.DafnyProject = project;
+      }
+
+      foreach (var option in command.Options) {
+        if (option == CommonOptionBag.UseBaseFileName || option == DafnyProject.FindProjectOption) {
+          continue;
+        }
+        ProcessOption(context, option, dafnyOptions);
+      }
+
+      foreach (var option in command.Options) {
+        try {
+          dafnyOptions.ApplyBinding(option);
+        } catch (Exception e) {
+          context.ExitCode = (int)ExitValue.PREPROCESSING_ERROR;
+          await dafnyOptions.OutputWriter.WriteLineAsync(
+            $"Invalid value for option {option.Name}: {e.Message}");
+          return;
+        }
+      }
+
+      dafnyOptions.ApplyDefaultOptionsWithoutSettingsDefault();
+      dafnyOptions.UsingNewCli = true;
+      context.ExitCode = await continuation(dafnyOptions, context);
+    }
+
+    command.SetHandler(Handle);
+  }
+
+  private static void ProcessOption(InvocationContext context, Option option, DafnyOptions dafnyOptions) {
+    var options = dafnyOptions.Options;
+    var result = context.ParseResult.FindResultFor(option);
+    object? projectFileValue = null;
+    var hasProjectFileValue = dafnyOptions.DafnyProject?.TryGetValue(option, out projectFileValue) ?? false;
+    object value;
+    if (option.Arity.MaximumNumberOfValues <= 1) {
+      // If multiple values aren't allowed, CLI options take precedence over project file options
+      value = (result == null || Equals(result.Token, null)) && hasProjectFileValue
+        ? projectFileValue!
+        : GetValueForOption(context.ParseResult, option);
+    } else {
+      // If multiple values ARE allowed, CLI options come after project file options
+      var elementType = option.ValueType.GetGenericArguments()[0];
+      var valueAsList = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(elementType))!;
+      if (hasProjectFileValue) {
+        foreach (var element in (IEnumerable)projectFileValue!) {
+          valueAsList.Add(element);
+        }
+      }
+      if (result != null) {
+        foreach (var element in (IEnumerable)GetValueForOption(context.ParseResult, option)) {
+          valueAsList.Add(element);
+        }
+      }
+
+      value = valueAsList;
+    }
+
+    options.OptionArguments[option] = value;
+  }
+
+  public static Task<int> Execute(IConsole console, IReadOnlyList<string> arguments) {
+    foreach (var symbol in AllSymbols) {
+      if (symbol is Option option) {
+        if (!option.Arity.Equals(ArgumentArity.ZeroOrMore) && !option.Arity.Equals(ArgumentArity.OneOrMore)) {
+          option.AllowMultipleArgumentsPerToken = true;
+        }
+      }
+    }
+
+    return Parser.InvokeAsync(arguments.ToArray(), console);
+  }
+
+  private static readonly MethodInfo GetValueForOptionMethod;
+  private static readonly System.CommandLine.Parsing.Parser Parser;
+
+  // This bit of reflective trickery is necessary because
+  // ParseResult.GetValueForOption<T>(Option<T>) will convert tokens to T as necessary,
+  // but ParseResult.GetValueForOption(Option) behaves like it was passed a Option<object> and doesn't.
+  // To work around this we use reflection to invoke the former, passing Option.ValueType as the T argument.
+  // This technique could also be used to fix the discrepancy between
+  // DafnyOptions.Get<T>(Option<T>) and DafnyOptions.Get(Option)
+  // (where in that case the latter doesn't set the default value).
+  private static object GetValueForOption(ParseResult result, Option option) {
+    // Use Reflection to invoke GetValueForOption<T> for the correct T
+    var generic = GetValueForOptionMethod.MakeGenericMethod(option.ValueType);
+    return generic.Invoke(result, new object[] { option })!;
+  }
+
+  private static async Task<bool> ProcessFile(DafnyOptions dafnyOptions, FileInfo singleFile) {
+    var isProjectFile = Path.GetExtension(singleFile.FullName) == DafnyProject.Extension;
+    if (isProjectFile) {
+      return await ProcessProjectFile(dafnyOptions, new Uri(singleFile.FullName));
+    }
+
+    dafnyOptions.CliRootSourceUris.Add(new Uri(singleFile.FullName));
+    return true;
+  }
+
+  private static async Task<bool> ProcessProjectFile(DafnyOptions dafnyOptions, Uri file) {
+    if (dafnyOptions.DafnyProject != null) {
+      var first = dafnyOptions.GetPrintPath(dafnyOptions.DafnyProject.Uri.LocalPath);
+      await dafnyOptions.ErrorWriter.WriteLineAsync($"Only one project file can be used at a time. Both {first} and {dafnyOptions.GetPrintPath(file.LocalPath)} were specified");
+      return false;
+    }
+
+    if (!File.Exists(file.LocalPath)) {
+      await dafnyOptions.ErrorWriter.WriteLineAsync($"Error: file {dafnyOptions.GetPrintPath(file.LocalPath)} not found");
+      return false;
+    }
+    var projectFile = await DafnyProject.Open(OnDiskFileSystem.Instance, file, Token.Cli);
+
+    projectFile.Validate(dafnyOptions.OutputWriter, AllOptions);
+    dafnyOptions.DafnyProject = projectFile;
+    return true;
+  }
+
+  private static IEnumerable<IdentifierSymbol> AllSymbols {
+    get {
+      var result = new HashSet<IdentifierSymbol>();
+      var commands = new Stack<Command>();
+      commands.Push(RootCommand);
+      while (commands.Any()) {
+        var current = commands.Pop();
+        result.Add(current);
+        foreach (var option in current.Options) {
+          result.Add(option);
+        }
+        foreach (var child in current.Subcommands) {
+          commands.Push(child);
+        }
+      }
+      return result;
+    }
+  }
+
+  private static IEnumerable<Option> AllOptions => AllSymbols.OfType<Option>();
+
+  private static CommandLineBuilder AddDeveloperHelp(RootCommand rootCommand, CommandLineBuilder builder) {
+    var languageDeveloperHelp = new Option<bool>(ToolchainDebuggingHelpName,
+      "Show help and usage information, including options designed for developing the Dafny language and toolchain.");
+    rootCommand.AddGlobalOption(languageDeveloperHelp);
+    bool helpShown = false;
+    builder = builder.UseHelp(_ => helpShown = true);
+
+    builder = builder.AddMiddleware(async (context, next) => {
+      if ((context.ParseResult.CommandResult.Command.IsHidden && helpShown) || context.ParseResult.FindResultFor(languageDeveloperHelp) is { }) {
+
+        foreach (var symbol in AllSymbols) {
+          symbol.IsHidden = false;
+        }
+
+        context.InvocationResult = new HelpResult();
+      } else {
+        await next(context);
+      }
+    }, MiddlewareOrder.Configuration - 101);
+    return builder;
+  }
+
+  private static async IAsyncEnumerable<DafnyFile> HandleDafnyProject(IFileSystem fileSystem, DafnyOptions options,
+    ErrorReporter reporter,
+    Uri uri,
+    IOrigin uriOrigin,
+    bool asLibrary) {
+    if (!asLibrary) {
+      reporter.Error(MessageSource.Project, uriOrigin, "Using a Dafny project file as a source file is not supported.");
+      yield break;
+    }
+
+    var dependencyProject = await DafnyProject.Open(fileSystem, uri, uriOrigin);
+    var dependencyOptions =
+      DooFile.CheckAndGetLibraryOptions(reporter, uri, options, uriOrigin, dependencyProject.Options);
+    if (dependencyOptions == null) {
+      yield break;
+    }
+
+    if (options.Get(DafnyFile.DoNotVerifyDependencies) || !options.Verify) {
+      foreach (var libraryRootSetFile in dependencyProject.GetRootSourceUris(fileSystem)) {
+        var file = DafnyFile.HandleDafnyFile(fileSystem, reporter, dependencyOptions, libraryRootSetFile,
+          dependencyProject.StartingToken, true, false);
+        if (file != null) {
+          yield return file;
+        }
+      }
+    } else {
+      if (options.Verbose) {
+        await options.OutputWriter.WriteLineAsync($"Building dependency {options.GetPrintPath(uri.LocalPath)}");
+      }
+
+      dependencyOptions.Compile = true;
+      dependencyOptions.RunAfterCompile = false;
+      var libraryBackend = new LibraryBackend(dependencyOptions);
+      dependencyOptions.Backend = libraryBackend;
+      dependencyOptions.CompilerName = dependencyOptions.Backend.TargetId;
+
+      dependencyOptions.DafnyProject = dependencyProject;
+      dependencyOptions.CliRootSourceUris.Clear();
+      dependencyOptions.Compile = true;
+      dependencyOptions.RunAfterCompile = false;
+      var exitCode = await SynchronousCliCompilation.Run(dependencyOptions);
+      if (exitCode == 0 && libraryBackend.DooPath != null) {
+        var dooUri = new Uri(libraryBackend.DooPath);
+        await foreach (var dooResult in DafnyFile.HandleDooFile(fileSystem, reporter, options, dooUri, uriOrigin, true)) {
+          yield return dooResult;
+        }
+      } else {
+        reporter.Error(MessageSource.Project, uriOrigin, $"Failed to build dependency {options.GetPrintPath(uri.LocalPath)}");
+      }
+    }
+
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyDriver/HelpResult.cs b/Source/DafnyDriver/HelpResult.cs
new file mode 100644
index 00000000000..05d6b2f04bc
--- /dev/null
+++ b/Source/DafnyDriver/HelpResult.cs
@@ -0,0 +1,23 @@
+#nullable enable
+using System.CommandLine.Help;
+using System.CommandLine.Invocation;
+using System.CommandLine.IO;
+
+namespace Microsoft.Dafny;
+
+/// <summary>
+/// The class HelpResult is internal to System.CommandLine so we have to include it as source.
+/// It seems System.CommandLine didn't consider having more than one help option as a use-case.
+/// </summary>
+internal class HelpResult : IInvocationResult {
+  public void Apply(InvocationContext context) {
+    var output = context.Console.Out.CreateTextWriter();
+    var helpBuilder = (HelpBuilder)context.BindingContext.GetService(typeof(HelpBuilder))!;
+    var helpContext = new HelpContext(helpBuilder,
+      context.ParseResult.CommandResult.Command,
+      output,
+      context.ParseResult);
+
+    helpBuilder.Write(helpContext);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyDriver/JsonVerificationLogger.cs b/Source/DafnyDriver/JsonVerificationLogger.cs
new file mode 100644
index 00000000000..a2681ca28de
--- /dev/null
+++ b/Source/DafnyDriver/JsonVerificationLogger.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
+using VC;
+
+namespace Microsoft.Dafny;
+
+public class JsonVerificationLogger : IVerificationResultFormatLogger {
+  private TextWriter output;
+  private readonly TextWriter fallbackOutput;
+  private readonly ProofDependencyManager dependencyManager;
+
+  public JsonVerificationLogger(ProofDependencyManager dependencyManager, TextWriter fallbackOutput) {
+    this.dependencyManager = dependencyManager;
+    this.fallbackOutput = fallbackOutput;
+  }
+
+  public void Initialize(Dictionary<string, string> parameters) {
+    output = parameters.TryGetValue("LogFileName", out string filename) ? new StreamWriter(filename) : fallbackOutput;
+  }
+
+  private static JsonNode SerializeAssertion(AssertCmd assertion) {
+    return new JsonObject {
+      ["filename"] = assertion.tok.filename,
+      ["line"] = assertion.tok.line,
+      ["col"] = assertion.tok.col,
+      ["description"] = assertion.Description.SuccessDescription
+    };
+  }
+
+  public static JsonNode SerializeProofDependency(ProofDependency dependency) {
+    return new JsonObject {
+      ["startFile"] = dependency.Range.StartToken.Filepath,
+      ["startLine"] = dependency.Range.StartToken.line,
+      ["startCol"] = dependency.Range.StartToken.col,
+      ["endFile"] = dependency.Range.EndToken.Filepath,
+      ["endLine"] = dependency.Range.EndToken.line,
+      ["endCol"] = dependency.Range.EndToken.col,
+      ["description"] = dependency.Description,
+      ["originalText"] = dependency.OriginalString()
+    };
+  }
+
+  public static JsonNode SerializeVcResult(ProofDependencyManager dependencyManager, IReadOnlyList<ProofDependency> potentialDependencies, VerificationTaskResult taskResult) {
+    var vcResult = taskResult.Result;
+    var result = new JsonObject {
+      ["vcNum"] = vcResult.VcNum,
+      ["outcome"] = SerializeOutcome(vcResult.Outcome),
+      ["runTime"] = SerializeTimeSpan(vcResult.RunTime),
+      ["resourceCount"] = vcResult.ResourceCount,
+      ["assertions"] = new JsonArray(vcResult.Asserts.Select(SerializeAssertion).ToArray()),
+    };
+    if (taskResult.Task != null && taskResult.Task.Split.RandomSeed != 0) {
+      result["randomSeed"] = taskResult.Task.Split.RandomSeed.ToString();
+    }
+    if (potentialDependencies is not null) {
+      var fullDependencySet = dependencyManager.GetOrderedFullDependencies(vcResult.CoveredElements).ToHashSet();
+      var unusedDependencies = potentialDependencies.Where(dep => !fullDependencySet.Contains(dep));
+      result["coveredElements"] = new JsonArray(fullDependencySet.Select(SerializeProofDependency).ToArray());
+      result["uncoveredElements"] = new JsonArray(unusedDependencies.Select(SerializeProofDependency).ToArray());
+    }
+    return result;
+  }
+
+  private static JsonNode SerializeTimeSpan(TimeSpan timeSpan) {
+    return timeSpan.ToString();
+  }
+
+  private static JsonNode SerializeOutcome(SolverOutcome outcome) {
+    return outcome.ToString();
+  }
+  private static JsonNode SerializeOutcome(VcOutcome outcome) {
+    return outcome.ToString();
+  }
+
+  private JsonNode SerializeVerificationResult(VerificationScope scope, IReadOnlyList<VerificationTaskResult> results) {
+    var trackProofDependencies =
+      results.All(o => o.Result.Outcome == SolverOutcome.Valid) &&
+      results.Any(vcResult => vcResult.Result.CoveredElements.Any());
+    var potentialDependencies =
+      trackProofDependencies ? dependencyManager.GetPotentialDependenciesForDefinition(scope.Name).ToList() : null;
+    var result = new JsonObject {
+      ["name"] = scope.Name,
+      ["outcome"] = SerializeOutcome(results.Aggregate(VcOutcome.Correct, (o, r) => MergeOutcomes(o, r.Result.Outcome))),
+      ["runTime"] = SerializeTimeSpan(TimeSpan.FromSeconds(results.Sum(r => r.Result.RunTime.Seconds))),
+      ["resourceCount"] = results.Sum(r => r.Result.ResourceCount),
+      ["vcResults"] = new JsonArray(results.Select(r => SerializeVcResult(dependencyManager, potentialDependencies, r)).ToArray())
+    };
+    if (potentialDependencies is not null) {
+      result["programElements"] = new JsonArray(potentialDependencies.Select(SerializeProofDependency).ToArray());
+    }
+    return result;
+  }
+
+  /// <summary>
+  /// This method is copy pasted from a private Boogie method. It will be public Boogie version > 3.0.11
+  /// Then this method can be removed
+  public static VcOutcome MergeOutcomes(VcOutcome currentVcOutcome, SolverOutcome newOutcome) {
+    switch (newOutcome) {
+      case SolverOutcome.Valid:
+        return currentVcOutcome;
+      case SolverOutcome.Invalid:
+        return VcOutcome.Errors;
+      case SolverOutcome.OutOfMemory:
+        if (currentVcOutcome != VcOutcome.Errors && currentVcOutcome != VcOutcome.Inconclusive) {
+          return VcOutcome.OutOfMemory;
+        }
+
+        return currentVcOutcome;
+      case SolverOutcome.TimeOut:
+        if (currentVcOutcome != VcOutcome.Errors && currentVcOutcome != VcOutcome.Inconclusive) {
+          return VcOutcome.TimedOut;
+        }
+
+        return currentVcOutcome;
+      case SolverOutcome.OutOfResource:
+        if (currentVcOutcome != VcOutcome.Errors && currentVcOutcome != VcOutcome.Inconclusive) {
+          return VcOutcome.OutOfResource;
+        }
+
+        return currentVcOutcome;
+      case SolverOutcome.Undetermined:
+        if (currentVcOutcome != VcOutcome.Errors) {
+          return VcOutcome.Inconclusive;
+        }
+
+        return currentVcOutcome;
+      default:
+        Contract.Assert(false);
+        throw new cce.UnreachableException();
+    }
+  }
+
+  public void LogScopeResults(VerificationScopeResult scopeResult) {
+    verificationResultNode.Add(SerializeVerificationResult(scopeResult.Scope, scopeResult.Results.ToList()));
+  }
+
+  private readonly IList<JsonNode> verificationResultNode = new List<JsonNode>();
+
+  public async Task Flush() {
+    await output.WriteLineAsync(new JsonObject {
+      ["verificationResults"] = new JsonArray(verificationResultNode.ToArray())
+    }.ToJsonString());
+    await output.FlushAsync();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyDriver/Legacy/DafnyBackwardsCompatibleCli.cs b/Source/DafnyDriver/Legacy/DafnyBackwardsCompatibleCli.cs
new file mode 100644
index 00000000000..260b8a981ce
--- /dev/null
+++ b/Source/DafnyDriver/Legacy/DafnyBackwardsCompatibleCli.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny;
+
+public interface ILegacyParseArguments { }
+
+// TODO: Refactor so that non-errors (NOT_VERIFIED, DONT_PROCESS_FILES) don't result in non-zero exit codes
+public enum ExitValue { SUCCESS = 0, PREPROCESSING_ERROR = 1, DAFNY_ERROR = 2, COMPILE_ERROR = 3, VERIFICATION_ERROR = 4, FORMAT_ERROR = 5 }
+
+public record ParsedOptions(DafnyOptions DafnyOptions) : ILegacyParseArguments;
+record ExitImmediately(ExitValue ExitValue) : ILegacyParseArguments;
+
+public static class DafnyBackwardsCompatibleCli {
+
+  public static Task<int> Main(string[] args) {
+    return MainWithWriters(Console.Out, Console.Error, Console.In, args);
+  }
+
+  static DafnyBackwardsCompatibleCli() {
+    // Force all calls to RegisterLegacyUi to be done
+    CommonOptionBag.EnsureStaticConstructorHasRun();
+    TestCommand.EnsureStaticConstructorHasRun();
+  }
+
+  public static Task<int> MainWithWriters(TextWriter outputWriter, TextWriter errorWriter, TextReader inputReader,
+    string[] args) {
+    // Code that shouldn't be needed, but prevents some exceptions when running the integration tests in parallel
+    // outputWriter = new UndisposableTextWriter(outputWriter);
+    // errorWriter = new UndisposableTextWriter(errorWriter);
+    // outputWriter = TextWriter.Synchronized(outputWriter);
+    // errorWriter = TextWriter.Synchronized(errorWriter);
+
+    return Task.Run(() => ThreadMain(outputWriter, errorWriter, inputReader, args));
+  }
+
+  private static Task<int> ThreadMain(TextWriter outputWriter, TextWriter errorWriter, TextReader inputReader, string[] args) {
+    Contract.Requires(cce.NonNullElements(args));
+    var legacyResult = TryLegacyArgumentParser(inputReader, outputWriter, errorWriter, args);
+    if (legacyResult == null) {
+      var console = new WritersConsole(inputReader, outputWriter, errorWriter);
+      return DafnyNewCli.Execute(console, args);
+    }
+
+    switch (legacyResult) {
+      case ParsedOptions success:
+        var options = success.DafnyOptions;
+        return SynchronousCliCompilation.Run(options);
+      case ExitImmediately failure:
+        return Task.FromResult((int)failure.ExitValue);
+      default: throw new Exception("unreachable");
+    }
+  }
+
+  private static ILegacyParseArguments TryLegacyArgumentParser(
+    TextReader inputReader,
+    TextWriter outputWriter,
+    TextWriter errorWriter,
+    string[] arguments) {
+    if (arguments.Length == 0) {
+      return null;
+    }
+    var dafnyOptions = new DafnyOptions(inputReader, outputWriter, errorWriter) {
+      Environment = "Command-line arguments: " + string.Join(" ", arguments)
+    };
+
+    var first = arguments[0];
+    var keywordForNewMode = DafnyNewCli.RootCommand.Subcommands.Select(c => c.Name).Union(new[]
+      { "--version", "-h", DafnyNewCli.ToolchainDebuggingHelpName, "--help", "[parse]", "[suggest]" });
+    if (!keywordForNewMode.Contains(first)) {
+      if (first.Length > 0 && first[0] != '/' && first[0] != '-' && !File.Exists(first) &&
+          first.IndexOf('.') == -1) {
+        dafnyOptions.OutputWriter.WriteLine(
+          "*** Error: '{0}': The first input must be a command or a legacy option or file with supported extension",
+          first);
+        return new ExitImmediately(ExitValue.PREPROCESSING_ERROR);
+      } else {
+        var oldOptions = new DafnyOptions(dafnyOptions.Input, dafnyOptions.OutputWriter, dafnyOptions.ErrorWriter);
+        try {
+          if (oldOptions.Parse(arguments)) {
+            // If requested, print version number, help, attribute help, etc. and exit.
+            if (oldOptions.ProcessInfoFlags()) {
+              return new ExitImmediately(ExitValue.SUCCESS);
+            }
+
+            if (oldOptions.DeprecationNoise != 0) {
+              oldOptions.OutputWriter.WriteLine(
+                "Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format");
+            }
+
+            return new ParsedOptions(oldOptions);
+          }
+
+          return new ExitImmediately(ExitValue.PREPROCESSING_ERROR);
+        } catch (ProverException pe) {
+          new DafnyConsolePrinter(dafnyOptions).ErrorWriteLine(dafnyOptions.OutputWriter,
+            "*** ProverException: {0}", pe.Message);
+          return new ExitImmediately(ExitValue.PREPROCESSING_ERROR);
+        }
+      }
+    }
+
+    return null;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyDriver/Legacy/LegacyJsonVerificationLogger.cs b/Source/DafnyDriver/Legacy/LegacyJsonVerificationLogger.cs
new file mode 100644
index 00000000000..e6e27c8b151
--- /dev/null
+++ b/Source/DafnyDriver/Legacy/LegacyJsonVerificationLogger.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json.Nodes;
+using DafnyCore.Verifier;
+using Microsoft.Boogie;
+using VC;
+
+namespace Microsoft.Dafny;
+
+public class LegacyJsonVerificationLogger {
+  private TextWriter tw;
+  private readonly TextWriter outWriter;
+  private readonly ProofDependencyManager depManager;
+
+  public LegacyJsonVerificationLogger(ProofDependencyManager depManager, TextWriter outWriter) {
+    this.depManager = depManager;
+    this.outWriter = outWriter;
+  }
+
+  public void Initialize(Dictionary<string, string> parameters) {
+    tw = parameters.TryGetValue("LogFileName", out string filename) ? new StreamWriter(filename) : outWriter;
+  }
+
+  class DummyProofObligationDescription : Boogie.ProofObligationDescription {
+    public DummyProofObligationDescription(string success) {
+      SuccessDescription = success;
+    }
+
+    public override string SuccessDescription { get; }
+
+    public override string ShortDescription => throw new NotSupportedException();
+  }
+
+
+  private JsonNode SerializeVcResult(IEnumerable<ProofDependency> potentialDependencies, VerificationRunResultPartialCopy verificationRunResult) {
+    var runResult = VCResultLogEntryToPartialVerificationRunResult(verificationRunResult);
+    return JsonVerificationLogger.SerializeVcResult(depManager, potentialDependencies?.ToList(), runResult);
+  }
+
+  public static VerificationTaskResult VCResultLogEntryToPartialVerificationRunResult(VerificationRunResultPartialCopy verificationRunResult) {
+    var mockNumber = 42;
+    var mockAsserts = verificationRunResult.Asserts.Select(t => new AssertCmd(t.Tok, null, new DummyProofObligationDescription(t.Description)));
+    var runResult = new VerificationRunResult(verificationRunResult.VCNum, mockNumber, verificationRunResult.StartTime, verificationRunResult.Outcome, verificationRunResult.RunTime, mockNumber, null!,
+      mockAsserts.ToList(), verificationRunResult.CoveredElements, verificationRunResult.ResourceCount, null, new List<Boogie.Declaration>());
+    return new VerificationTaskResult(null, runResult);
+  }
+
+  private static JsonNode SerializeTimeSpan(TimeSpan timeSpan) {
+    return timeSpan.ToString();
+  }
+
+  private static JsonNode SerializeOutcome(SolverOutcome outcome) {
+    return outcome.ToString();
+  }
+  private static JsonNode SerializeOutcome(VcOutcome outcome) {
+    return outcome.ToString();
+  }
+
+  private JsonNode SerializeVerificationResult(DafnyConsolePrinter.ConsoleLogEntry logEntry) {
+    var (impl, verificationResult) = logEntry;
+    var trackProofDependencies =
+      verificationResult.Outcome == VcOutcome.Correct &&
+      verificationResult.VCResults.Any(vcResult => vcResult.CoveredElements.Any());
+    var potentialDependencies =
+      trackProofDependencies ? depManager.GetPotentialDependenciesForDefinition(impl.Name) : null;
+    var result = new JsonObject {
+      ["name"] = impl.Name,
+      ["outcome"] = SerializeOutcome(verificationResult.Outcome),
+      ["runTime"] = SerializeTimeSpan(verificationResult.RunTime),
+      ["resourceCount"] = verificationResult.ResourceCount,
+      ["vcResults"] = new JsonArray(verificationResult.VCResults.Select(r => SerializeVcResult(potentialDependencies, r)).ToArray())
+    };
+    if (potentialDependencies is not null) {
+      result["programElements"] = new JsonArray(potentialDependencies.Select(JsonVerificationLogger.SerializeProofDependency).ToArray());
+    }
+    return result;
+  }
+
+  private JsonObject SerializeVerificationResults(IEnumerable<DafnyConsolePrinter.ConsoleLogEntry> verificationResults) {
+    return new JsonObject {
+      ["verificationResults"] = new JsonArray(verificationResults.Select(SerializeVerificationResult).ToArray())
+    };
+  }
+
+  public void LogResults(IEnumerable<DafnyConsolePrinter.ConsoleLogEntry> verificationResults) {
+    tw.Write(SerializeVerificationResults(verificationResults).ToJsonString());
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyDriver/Legacy/LegacyTextVerificationLogger.cs b/Source/DafnyDriver/Legacy/LegacyTextVerificationLogger.cs
new file mode 100644
index 00000000000..3db7609acdc
--- /dev/null
+++ b/Source/DafnyDriver/Legacy/LegacyTextVerificationLogger.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using DafnyDriver.Commands;
+
+namespace Microsoft.Dafny;
+
+public class LegacyTextVerificationLogger {
+  private TextWriter tw;
+  private TextWriter outWriter;
+  private ProofDependencyManager depManager;
+
+  public LegacyTextVerificationLogger(ProofDependencyManager depManager, TextWriter outWriter) {
+    this.depManager = depManager;
+    this.outWriter = outWriter;
+  }
+
+  public void Initialize(Dictionary<string, string> parameters) {
+    tw = parameters.TryGetValue("LogFileName", out string filename) ? new StreamWriter(filename) : outWriter;
+  }
+
+  public void LogResults(IEnumerable<DafnyConsolePrinter.ConsoleLogEntry> verificationResults) {
+    foreach (var (implementation, result) in verificationResults.OrderBy(vr => (vr.Implementation.Tok.filename, vr.Implementation.Tok.line, vr.Implementation.Tok.col))) {
+      var taskResults = result.VCResults.Select(LegacyJsonVerificationLogger.VCResultLogEntryToPartialVerificationRunResult).ToList();
+      var scopeResult = new VerificationScopeResult(new VerificationScope(implementation.Name, implementation.Tok), taskResults);
+      TextVerificationLogger.LogResults(depManager, outWriter, scopeResult);
+    }
+    tw.Flush();
+  }
+}
diff --git a/Source/DafnyDriver/Legacy/LegacyVerificationResultLogger.cs b/Source/DafnyDriver/Legacy/LegacyVerificationResultLogger.cs
new file mode 100644
index 00000000000..928e8d6d3c2
--- /dev/null
+++ b/Source/DafnyDriver/Legacy/LegacyVerificationResultLogger.cs
@@ -0,0 +1,87 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using DafnyDriver.Commands;
+using Microsoft.Boogie;
+using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+namespace Microsoft.Dafny {
+
+  /// <summary>
+  /// Utility to translate verification results into logs in several formats:
+  ///  * TRX files, which can be understood and visualized by various .NET tools.
+  ///  * CSV files, which are easier to parse and summarize. 
+  ///  * human-readable text output.
+  /// </summary>
+  public static class LegacyVerificationResultLogger {
+
+    public static void RaiseTestLoggerEvents(DafnyOptions options, ProofDependencyManager depManager) {
+      var loggerConfigs = options.Get(CommonOptionBag.VerificationLogFormat);
+
+      var events = new LocalTestLoggerEvents();
+      var verificationResults = ((DafnyConsolePrinter)options.Printer).VerificationResults.ToList();
+      foreach (var loggerConfig in loggerConfigs) {
+        VerificationResultLogger.ParseParametersAndLoggerName(loggerConfig, out var parameters, out var loggerName);
+
+        if (loggerName == "trx") {
+          var logger = new TrxLogger();
+          logger.Initialize(events, parameters);
+        } else if (loggerName == "csv") {
+          var csvLogger = new CSVTestLogger(options.OutputWriter);
+          csvLogger.Initialize(events, parameters);
+        } else if (loggerName == "json") {
+          // This logger doesn't implement the ITestLogger interface because
+          // it uses information that's tricky to encode in a TestResult.
+          var jsonLogger = new LegacyJsonVerificationLogger(depManager, options.OutputWriter);
+          jsonLogger.Initialize(parameters);
+          jsonLogger.LogResults(verificationResults);
+        } else if (loggerName == "text") {
+          // This logger doesn't implement the ITestLogger interface because
+          // it uses information that's tricky to encode in a TestResult.
+          var textLogger = new LegacyTextVerificationLogger(depManager, options.OutputWriter);
+          textLogger.Initialize(parameters);
+          textLogger.LogResults(verificationResults);
+        } else {
+          throw new ArgumentException($"unsupported verification logger config: {loggerConfig}");
+        }
+      }
+      events.EnableEvents();
+
+      // Sort failures to the top, and then slower procedures first.
+      // Loggers may not maintain this ordering unfortunately.
+      var results = VerificationToTestResults(verificationResults.Select(e => (e.Implementation, e.Result.VCResults)))
+        .OrderBy(r => r.Outcome == TestOutcome.Passed)
+        .ThenByDescending(r => r.Duration);
+      foreach (var result in results) {
+        events.RaiseTestResult(new TestResultEventArgs(result));
+      }
+
+      events.RaiseTestRunComplete(new TestRunCompleteEventArgs(
+        new TestRunStatistics(),
+        false, false, null, null, new TimeSpan()
+      ));
+    }
+
+    private static IEnumerable<TestResult> VerificationToTestResults(IEnumerable<(DafnyConsolePrinter.ImplementationLogEntry, List<VerificationRunResultPartialCopy>)> verificationResults) {
+      var testResults = new List<TestResult>();
+
+      foreach (var ((verbName, currentFile), vcResults) in verificationResults) {
+        var scopeResult = new VerificationScopeResult(new VerificationScope(verbName, currentFile),
+          vcResults.Select(LegacyJsonVerificationLogger.VCResultLogEntryToPartialVerificationRunResult).ToList());
+        testResults.AddRange(VerificationResultLogger.VerificationToTestResults(scopeResult));
+      }
+
+      return testResults;
+    }
+  }
+}
diff --git a/Source/DafnyDriver/Legacy/SynchronousCliCompilation.cs b/Source/DafnyDriver/Legacy/SynchronousCliCompilation.cs
new file mode 100644
index 00000000000..73c9270560c
--- /dev/null
+++ b/Source/DafnyDriver/Legacy/SynchronousCliCompilation.cs
@@ -0,0 +1,770 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation.  All Rights Reserved.
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+//
+//-----------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+// DafnyDriver
+//       - main program for taking a Dafny program and verifying it
+//---------------------------------------------------------------------------------------------
+
+using System.Collections.Concurrent;
+using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics.Contracts;
+using System.IO;
+using System.Linq;
+using Microsoft.Boogie;
+using Bpl = Microsoft.Boogie;
+using System.Diagnostics;
+using Microsoft.Dafny.Compilers;
+using Microsoft.Dafny.Plugins;
+using VC;
+
+namespace Microsoft.Dafny {
+
+  /// <summary>
+  /// Calls into different phases of Dafny's compilation pipeline,
+  /// such as parsing, resolution, verification and code generation
+  /// 
+  /// Will be replaced by CompilationManager
+  /// </summary>
+  public class SynchronousCliCompilation : IDisposable {
+    private readonly ExecutionEngine engine;
+
+    public SynchronousCliCompilation(DafnyOptions dafnyOptions) {
+      engine = ExecutionEngine.CreateWithoutSharedCache(dafnyOptions);
+    }
+
+    public static async Task<int> Run(DafnyOptions options) {
+      options.RunningBoogieFromCommandLine = true;
+
+      var backend = GetBackend(options);
+      if (backend == null) {
+        return (int)ExitValue.PREPROCESSING_ERROR;
+      }
+      options.Backend = backend;
+
+      var (getFilesExitCode, dafnyFiles, otherFiles) = await GetDafnyFiles(options);
+      if (getFilesExitCode != ExitValue.SUCCESS) {
+        return (int)getFilesExitCode;
+      }
+
+      using var driver = new SynchronousCliCompilation(options);
+      ProofDependencyManager depManager = new();
+      var exitValue = await driver.ProcessFilesAsync(dafnyFiles, otherFiles.AsReadOnly(), options, depManager);
+      if (options.Get(CommonOptionBag.VerificationLogFormat)?.Any() == true) {
+        try {
+          LegacyVerificationResultLogger.RaiseTestLoggerEvents(options, depManager);
+        } catch (ArgumentException ae) {
+          options.Printer.ErrorWriteLine(options.OutputWriter, $"*** Error: {ae.Message}");
+          exitValue = ExitValue.PREPROCESSING_ERROR;
+        }
+      }
+
+      options.XmlSink?.Close();
+
+      if (options.Wait) {
+        Console.WriteLine("Press Enter to exit.");
+        Console.ReadLine();
+      }
+
+      return (int)exitValue;
+    }
+
+    public static async Task<(ExitValue ExitValue,
+      List<DafnyFile> DafnyFiles,
+      List<string> OtherFiles)> GetDafnyFiles(DafnyOptions options) {
+      if (options.Printer is NullPrinter) {
+        options.Printer = new DafnyConsolePrinter(options);
+      }
+
+      if (options.DafnyProject != null) {
+        foreach (var uri in options.DafnyProject.GetRootSourceUris(OnDiskFileSystem.Instance)) {
+          options.CliRootSourceUris.Add(uri);
+        }
+      }
+
+      var dafnyFiles = new List<DafnyFile>();
+      var otherFiles = new List<string>();
+      var outputWriter = options.OutputWriter;
+
+      if (options.UseStdin) {
+        var dafnyFile = DafnyFile.HandleStandardInput(options, Token.NoToken);
+        dafnyFiles.Add(dafnyFile);
+        options.CliRootSourceUris.Add(dafnyFile.Uri);
+      } else if (options.CliRootSourceUris.Count == 0) {
+        await options.ErrorWriter.WriteLineAsync("*** Error: No input files were specified in command-line. " + options.Environment);
+        return (ExitValue.PREPROCESSING_ERROR, dafnyFiles, otherFiles);
+      }
+      if (options.XmlSink != null) {
+        string errMsg = options.XmlSink.Open();
+        if (errMsg != null) {
+          await options.ErrorWriter.WriteLineAsync("*** Error: " + errMsg);
+          return (ExitValue.PREPROCESSING_ERROR, dafnyFiles, otherFiles);
+        }
+      }
+      if (options.ShowEnv == ExecutionEngineOptions.ShowEnvironment.Always) {
+        await outputWriter.WriteLineAsync(options.Environment);
+      }
+
+      ISet<String> filesSeen = new HashSet<string>();
+      var libraryFiles = CommonOptionBag.SplitOptionValueIntoFiles(options.LibraryFiles).ToHashSet();
+      foreach (var file in options.CliRootSourceUris.Where(u => u.IsFile).Select(u => u.LocalPath).
+                 Concat(libraryFiles).Distinct()) {
+        Contract.Assert(file != null);
+        var extension = Path.GetExtension(file);
+        if (extension != null) { extension = extension.ToLower(); }
+
+        var relative = Path.GetFileName(file);
+        bool useRelative = options.UseBaseNameForFileName || relative.StartsWith("-");
+        var nameToShow = useRelative ? relative
+          : Path.GetRelativePath(Directory.GetCurrentDirectory(), file);
+        var supportedExtensions = options.Backend.SupportedExtensions;
+        bool isDafnyFile = false;
+        try {
+          var consoleErrorReporter = new ConsoleErrorReporter(options);
+          await foreach (var df in DafnyFile.CreateAndValidate(
+                           OnDiskFileSystem.Instance, consoleErrorReporter, options, new Uri(Path.GetFullPath(file)),
+                           Token.Cli, options.LibraryFiles.Contains(file))) {
+            if (!filesSeen.Add(df.CanonicalPath)) {
+              continue; // silently ignore duplicate
+            }
+            dafnyFiles.Add(df);
+            isDafnyFile = true;
+          }
+          if (consoleErrorReporter.FailCompilation) {
+            return (ExitValue.PREPROCESSING_ERROR, dafnyFiles, otherFiles);
+          }
+        } catch (ArgumentException) {
+          await options.ErrorWriter.WriteLineAsync($"*** Error: {nameToShow}: ");
+          return (ExitValue.PREPROCESSING_ERROR, dafnyFiles, otherFiles);
+        } catch (Exception e) {
+          await options.ErrorWriter.WriteLineAsync($"*** Error: {nameToShow}: {e.Message}");
+          return (ExitValue.PREPROCESSING_ERROR, dafnyFiles, otherFiles);
+        }
+
+        if (supportedExtensions.Contains(extension)) {
+          // .h files are not part of the build, they are just emitted as includes
+          // TODO: This should be delegated to the backend instead (i.e. the CppCompilerBackend)
+          if (File.Exists(file) || extension == ".h") {
+            otherFiles.Add(file);
+          } else {
+            options.Printer.ErrorWriteLine(options.OutputWriter, $"*** Error: file {nameToShow} not found");
+            return (ExitValue.PREPROCESSING_ERROR, dafnyFiles, otherFiles);
+          }
+        } else if (options.AllowSourceFolders && Directory.Exists(file)) {
+          options.SourceFolders.Add(file);
+        } else if (!isDafnyFile) {
+          string errorOnNotRecognized;
+          if (options.UsingNewCli && string.IsNullOrEmpty(extension) && file.Length > 0) {
+            errorOnNotRecognized =
+              $"*** Error: Command-line argument '{nameToShow}' is neither a recognized option nor a filename with a supported extension ({string.Join(", ", Enumerable.Repeat(".dfy", 1).Concat(supportedExtensions))}).";
+          } else if (string.IsNullOrEmpty(extension) && file.Length > 0 && (file[0] == '/' || file[0] == '-')) {
+            errorOnNotRecognized =
+              $"*** Error: Command-line argument '{nameToShow}' is neither a recognized option nor a filename with a supported extension ({string.Join(", ", Enumerable.Repeat(".dfy", 1).Concat(supportedExtensions))}).";
+          } else {
+            errorOnNotRecognized =
+              $"*** Error: '{nameToShow}': Filename extension '{extension}' is not supported. Input files must be Dafny programs (.dfy) or supported auxiliary files ({string.Join(", ", supportedExtensions)})";
+          }
+
+          options.Printer.ErrorWriteLine(options.OutputWriter, errorOnNotRecognized);
+          return (ExitValue.PREPROCESSING_ERROR, dafnyFiles, otherFiles);
+        }
+      }
+
+      if (dafnyFiles.Count == 0 && options.SourceFolders.Count == 0) {
+        if (!options.AllowSourceFolders) {
+          options.Printer.ErrorWriteLine(Console.Out, "*** Error: The command-line contains no .dfy files");
+          // TODO: With the test on CliRootUris.Count above, this code is no longer reachable
+          options.Printer.ErrorWriteLine(options.OutputWriter, "*** Error: The command-line contains no .dfy files");
+          return (ExitValue.PREPROCESSING_ERROR, dafnyFiles, otherFiles);
+        }
+
+        options.Printer.ErrorWriteLine(Console.Out, "*** Error: The command-line contains no .dfy files or folders");
+        //options.Printer.ErrorWriteLine(Console.Out,
+        //  "Usage:\ndafny format [--check] [--print] <file/folder> <file/folder>...\nYou can use '.' for the current directory");
+        return (ExitValue.PREPROCESSING_ERROR, dafnyFiles, otherFiles);
+      }
+
+      // Add standard library .doo files after explicitly provided source files,
+      // only because if they are added first, one might be used as the program name,
+      // which is not handled well.
+      if (options.Get(CommonOptionBag.UseStandardLibraries)) {
+        if (options.Backend is LibraryBackend) {
+          options.Set(CommonOptionBag.TranslateStandardLibrary, false);
+        }
+
+        // For now the standard libraries are still translated from scratch.
+        // This creates issues with separate compilation and will be addressed in https://github.com/dafny-lang/dafny/pull/4877
+        var asLibrary = !options.Get(CommonOptionBag.TranslateStandardLibrary);
+
+        var reporter = new ConsoleErrorReporter(options);
+        if (options.CompilerName is null or "cs" or "java" or "go" or "py" or "js") {
+          var targetName = options.CompilerName ?? "notarget";
+          var stdlibDooUri = DafnyMain.StandardLibrariesDooUriTarget[targetName];
+          options.CliRootSourceUris.Add(stdlibDooUri);
+          await foreach (var targetSpecificFile in DafnyFile.CreateAndValidate(OnDiskFileSystem.Instance, reporter, options, stdlibDooUri, Token.Cli, asLibrary)) {
+            dafnyFiles.Add(targetSpecificFile);
+          }
+        }
+
+        options.CliRootSourceUris.Add(DafnyMain.StandardLibrariesDooUri);
+        await foreach (var targetAgnosticFile in DafnyFile.CreateAndValidate(OnDiskFileSystem.Instance, reporter, options, DafnyMain.StandardLibrariesDooUri, Token.Cli, asLibrary)) {
+          dafnyFiles.Add(targetAgnosticFile);
+        }
+      }
+
+      return (ExitValue.SUCCESS, dafnyFiles, otherFiles);
+    }
+
+    private static IExecutableBackend GetBackend(DafnyOptions options) {
+      if (options.Backend?.TargetId == options.CompilerName) {
+        return options.Backend;
+      }
+
+      var backends = options.Plugins.SelectMany(p => p.GetCompilers(options)).ToList();
+      var backend = backends.LastOrDefault(c => c.TargetId == options.CompilerName);
+      if (backend == null) {
+        if (options.CompilerName != null) {
+          var known = String.Join(", ", backends.Select(c => $"'{c.TargetId}' ({c.TargetName})"));
+          options.ErrorWriter.WriteLine(
+            $"*** Error: No compiler found for target \"{options.CompilerName}\"{(options.CompilerName.StartsWith("-t") || options.CompilerName.StartsWith("--") ? " (use just a target name, not a -t or --target option)" : "")}; expecting one of {known}");
+        } else {
+          backend = new NoExecutableBackend(options);
+        }
+      }
+
+      return backend;
+    }
+
+    public async Task<ExitValue> ProcessFilesAsync(IReadOnlyList<DafnyFile/*!*/>/*!*/ dafnyFiles,
+      ReadOnlyCollection<string> otherFileNames,
+      DafnyOptions options, ProofDependencyManager depManager,
+      bool lookForSnapshots = true, string programId = null) {
+      Contract.Requires(cce.NonNullElements(dafnyFiles));
+      var dafnyFileNames = DafnyFile.FileNames(dafnyFiles);
+
+      ExitValue exitValue = ExitValue.SUCCESS;
+
+      if (options.VerifySeparately && 1 < dafnyFiles.Count) {
+        foreach (var f in dafnyFiles) {
+          await options.OutputWriter.WriteLineAsync();
+          await options.OutputWriter.WriteLineAsync($"-------------------- {f} --------------------");
+          var ev = await ProcessFilesAsync(new List<DafnyFile> { f }, new List<string>().AsReadOnly(), options, depManager, lookForSnapshots, f.FilePath);
+          if (exitValue != ev && ev != ExitValue.SUCCESS) {
+            exitValue = ev;
+          }
+        }
+        return exitValue;
+      }
+
+      if (0 < options.VerifySnapshots && lookForSnapshots) {
+        var snapshotsByVersion = ExecutionEngine.LookForSnapshots(dafnyFileNames);
+        foreach (var s in snapshotsByVersion) {
+          var snapshots = new List<DafnyFile>();
+          foreach (var f in s) {
+            var uri = new Uri(Path.GetFullPath(f));
+            snapshots.Add(DafnyFile.HandleDafnyFile(OnDiskFileSystem.Instance, new ConsoleErrorReporter(options), options, uri, Token.Cli));
+            options.CliRootSourceUris.Add(uri);
+          }
+          var ev = await ProcessFilesAsync(snapshots, new List<string>().AsReadOnly(), options, depManager, false, programId);
+          if (exitValue != ev && ev != ExitValue.SUCCESS) {
+            exitValue = ev;
+          }
+        }
+        return exitValue;
+      }
+
+      string programName = dafnyFileNames.Count == 1 ? dafnyFileNames[0] : "the_program";
+      var (dafnyProgram, err) = await DafnyMain.ParseCheck(options.Input, dafnyFiles, programName, options);
+      if (err != null) {
+        exitValue = ExitValue.DAFNY_ERROR;
+        options.Printer.ErrorWriteLine(options.OutputWriter, err);
+      } else if (dafnyProgram != null && !options.NoResolve && !options.NoTypecheck
+          && options.DafnyVerify) {
+
+        dafnyProgram.ProofDependencyManager = depManager;
+        var boogiePrograms =
+          await DafnyMain.LargeStackFactory.StartNew(() => Translate(engine.Options, dafnyProgram).ToList());
+
+        string baseName = cce.NonNull(Path.GetFileName(dafnyFileNames[^1]));
+        var (verified, outcome, moduleStats) =
+          await BoogieAsync(dafnyProgram.Reporter, options, baseName, boogiePrograms, programId);
+
+        if (options.TrackVerificationCoverage) {
+          ProofDependencyWarnings.WarnAboutSuspiciousDependenciesUsingStoredPartialResults(options, dafnyProgram.Reporter, depManager);
+          var coverageReportDir = options.Get(CommonOptionBag.VerificationCoverageReport);
+          if (coverageReportDir != null) {
+            await new CoverageReporter(options).SerializeVerificationCoverageReport(
+              depManager, dafnyProgram,
+              boogiePrograms.SelectMany(tp => tp.Item2.AllCoveredElements),
+              coverageReportDir);
+          }
+        }
+
+        bool compiled;
+        try {
+          compiled = await Compile(dafnyFileNames[0], otherFileNames, dafnyProgram, outcome, moduleStats, verified);
+        } catch (UnsupportedFeatureException e) {
+          if (!options.Backend.UnsupportedFeatures.Contains(e.Feature)) {
+            throw new Exception(
+              $"'{e.Feature}' is not an element of the {options.Backend.TargetId} compiler's UnsupportedFeatures set");
+          }
+
+          dafnyProgram.Reporter.Error(MessageSource.Compiler, GeneratorErrors.ErrorId.f_unsupported_feature, e.Token,
+            e.Message);
+          compiled = false;
+        } catch (UnsupportedInvalidOperationException e) {
+          // Not having this catch makes all tests running for all compilers take 10-15x longer on Windows,
+          // just because of the Dafny compiler.
+          dafnyProgram.Reporter.Error(MessageSource.Compiler, GeneratorErrors.ErrorId.f_unsupported_feature, Token.NoToken, e.Message);
+          compiled = false;
+        }
+
+        var failBecauseOfDiagnostics = dafnyProgram.Reporter.FailCompilationMessage;
+        if (!verified) {
+          exitValue = ExitValue.VERIFICATION_ERROR;
+        } else if (!compiled) {
+          exitValue = ExitValue.COMPILE_ERROR;
+        } else if (failBecauseOfDiagnostics != null) {
+          exitValue = ExitValue.DAFNY_ERROR;
+          await options.OutputWriter.WriteLineAsync($"Returning exit code {exitValue} because {failBecauseOfDiagnostics}");
+        }
+      }
+
+      if (err == null && dafnyProgram != null && options.PrintStats) {
+        Util.PrintStats(dafnyProgram);
+      }
+      if (err == null && dafnyProgram != null && options.PrintFunctionCallGraph) {
+        Util.PrintFunctionCallGraph(dafnyProgram);
+      }
+      if (dafnyProgram != null && options.ExtractCounterexample && exitValue == ExitValue.VERIFICATION_ERROR) {
+        PrintCounterexample(options);
+      }
+
+      return exitValue;
+    }
+
+    /// <summary>
+    /// Extract the counterexample corresponding to the first failing
+    /// assertion and print it to the console
+    /// </summary>
+    private static void PrintCounterexample(DafnyOptions options) {
+      var firstCounterexample = ((DafnyConsolePrinter)options.Printer).VerificationResults
+        .Select(result => result.Result)
+        .Where(result => result.Outcome == VcOutcome.Errors)
+        .Select(result => result.Counterexamples)
+        .Where(counterexampleList => counterexampleList != null)
+        .Select(counterexampleList => counterexampleList.FirstOrDefault(counterexample => counterexample.Model != null))
+        .FirstOrDefault(counterexample => counterexample != null);
+      if (firstCounterexample == null) {
+        return;
+      }
+      var model = new DafnyModel(firstCounterexample.Model, options);
+      options.OutputWriter.Write("The following counterexample refers to the following failing assertion:\n");
+      options.OutputWriter.Write(model.ToString());
+    }
+
+    private static string BoogieProgramSuffix(string printFile, string suffix) {
+      var baseName = Path.GetFileNameWithoutExtension(printFile);
+      var dirName = Path.GetDirectoryName(printFile);
+
+      return Path.Combine(dirName, baseName + "_" + suffix + Path.GetExtension(printFile));
+    }
+
+    public static IEnumerable<Tuple<string, Bpl.Program>> Translate(ExecutionEngineOptions options, Program dafnyProgram) {
+      var modulesCount = BoogieGenerator.VerifiableModules(dafnyProgram).Count();
+
+
+      foreach (var prog in BoogieGenerator.Translate(dafnyProgram, dafnyProgram.Reporter)) {
+
+        if (options.PrintFile != null) {
+
+          var fileName = modulesCount > 1 ? Dafny.DafnyMain.BoogieProgramSuffix(options.PrintFile, prog.Item1) : options.PrintFile;
+
+          ExecutionEngine.PrintBplFile(options, fileName, prog.Item2, false, false, options.PrettyPrint);
+        }
+
+        yield return prog;
+
+      }
+    }
+
+    public async Task<(bool IsVerified, PipelineOutcome Outcome, IDictionary<string, PipelineStatistics> ModuleStats)>
+      BoogieAsync(
+        ErrorReporter errorReporter,
+        DafnyOptions options,
+        string baseName,
+        IEnumerable<Tuple<string, Bpl.Program>> boogiePrograms, string programId) {
+      var concurrentModuleStats = new ConcurrentDictionary<string, PipelineStatistics>();
+      var writerManager = new ConcurrentToSequentialWriteManager(options.OutputWriter);
+
+      if (options.Verify || options.Get(BoogieOptionBag.HiddenNoVerify)) {
+        var before = errorReporter.ErrorCount;
+        options.ProcessSolverOptions(errorReporter, Token.Cli);
+        if (before != errorReporter.ErrorCount) {
+          return (false, PipelineOutcome.FatalError, concurrentModuleStats);
+        }
+      }
+
+      var moduleTasks = boogiePrograms.Select(async program => {
+        await using var moduleWriter = writerManager.AppendWriter();
+        // ReSharper disable once AccessToDisposedClosure
+        var result = await Task.Run(() =>
+          BoogieOnceWithTimerAsync(errorReporter, moduleWriter, options, baseName, programId, program.Item1, program.Item2));
+        concurrentModuleStats.TryAdd(program.Item1, result.Stats);
+        return result;
+      }).ToList();
+
+      await Task.WhenAll(moduleTasks);
+      await options.OutputWriter.FlushAsync();
+      var outcome = moduleTasks.Select(t => t.Result.Outcome)
+        .Aggregate(PipelineOutcome.VerificationCompleted, MergeOutcomes);
+
+      var isVerified = moduleTasks.Select(t =>
+        DafnyMain.IsBoogieVerified(t.Result.Outcome, t.Result.Stats)).All(x => x);
+      return (isVerified, outcome, concurrentModuleStats);
+    }
+
+    private async Task<(PipelineOutcome Outcome, PipelineStatistics Stats)> BoogieOnceWithTimerAsync(
+      ErrorReporter errorReporter,
+      TextWriter output,
+      DafnyOptions options,
+      string baseName, string programId,
+      string moduleName,
+      Bpl.Program program) {
+      Stopwatch watch = new Stopwatch();
+      watch.Start();
+      if (options.SeparateModuleOutput) {
+        options.Printer.AdvisoryWriteLine(output, "For module: {0}", moduleName);
+      }
+
+      var result =
+        await await DafnyMain.LargeStackFactory.StartNew(() => DafnyMain.BoogieOnce(errorReporter, options, output, engine, baseName, moduleName, program, programId));
+
+      watch.Stop();
+
+      if (options.SeparateModuleOutput) {
+        TimeSpan ts = watch.Elapsed;
+        string elapsedTime = $"{ts.Hours:00}:{ts.Minutes:00}:{ts.Seconds:00}";
+        options.Printer.AdvisoryWriteLine(output, "Elapsed time: {0}", elapsedTime);
+        WriteTrailer(options, output, result.Statistics);
+      }
+
+      return result;
+    }
+
+    private static PipelineOutcome MergeOutcomes(PipelineOutcome first, PipelineOutcome second) {
+
+      if ((first == PipelineOutcome.VerificationCompleted || first == PipelineOutcome.Done) &&
+          second != PipelineOutcome.VerificationCompleted) {
+        return second;
+      }
+
+      return first;
+    }
+
+    public static void WriteTrailer(DafnyOptions options, TextWriter output, PipelineStatistics stats) {
+      if (!options.Verify && stats.ErrorCount == 0) {
+        output.WriteLine();
+        output.Write("{0} did not attempt verification", options.DescriptiveToolName);
+        if (stats.InconclusiveCount != 0) {
+          output.Write(", {0} inconclusive{1}", stats.InconclusiveCount, Util.Plural(stats.InconclusiveCount));
+        }
+        if (stats.TimeoutCount != 0) {
+          output.Write(", {0} time out{1}", stats.TimeoutCount, Util.Plural(stats.TimeoutCount));
+        }
+        if (stats.OutOfMemoryCount != 0) {
+          output.Write(", {0} out of memory", stats.OutOfMemoryCount);
+        }
+        if (stats.OutOfResourceCount != 0) {
+          output.Write(", {0} out of resource", stats.OutOfResourceCount);
+        }
+        if (stats.SolverExceptionCount != 0) {
+          output.Write(", {0} solver exceptions", stats.SolverExceptionCount);
+        }
+
+        output.WriteLine();
+        output.Flush();
+      } else {
+        // This calls a routine within Boogie
+        options.Printer.WriteTrailer(output, stats);
+      }
+    }
+
+    public static void WriteProgramVerificationSummary(DafnyOptions options, TextWriter output, IDictionary<string, PipelineStatistics> moduleStats) {
+      var statSum = new PipelineStatistics();
+      foreach (var stats in moduleStats) {
+        statSum.VerifiedCount += stats.Value.VerifiedCount;
+        statSum.ErrorCount += stats.Value.ErrorCount;
+        statSum.TimeoutCount += stats.Value.TimeoutCount;
+        statSum.OutOfResourceCount += stats.Value.OutOfResourceCount;
+        statSum.OutOfMemoryCount += stats.Value.OutOfMemoryCount;
+        statSum.SolverExceptionCount += stats.Value.SolverExceptionCount;
+        statSum.CachedErrorCount += stats.Value.CachedErrorCount;
+        statSum.CachedInconclusiveCount += stats.Value.CachedInconclusiveCount;
+        statSum.CachedOutOfMemoryCount += stats.Value.CachedOutOfMemoryCount;
+        statSum.CachedTimeoutCount += stats.Value.CachedTimeoutCount;
+        statSum.CachedOutOfResourceCount += stats.Value.CachedOutOfResourceCount;
+        statSum.CachedSolverExceptionCount += stats.Value.CachedSolverExceptionCount;
+        statSum.CachedVerifiedCount += stats.Value.CachedVerifiedCount;
+        statSum.InconclusiveCount += stats.Value.InconclusiveCount;
+      }
+      WriteTrailer(options, output, statSum);
+    }
+
+
+    public static async Task<bool> Compile(string fileName, ReadOnlyCollection<string> otherFileNames, Program dafnyProgram,
+                               PipelineOutcome oc, IDictionary<string, PipelineStatistics> moduleStats, bool verified) {
+      var options = dafnyProgram.Options;
+      var resultFileName = options.DafnyPrintCompiledFile ?? fileName;
+      bool compiled = true;
+      switch (oc) {
+        case PipelineOutcome.VerificationCompleted:
+          WriteProgramVerificationSummary(options, options.OutputWriter, moduleStats);
+          if ((options.Compile && verified && !options.UserConstrainedProcsToCheck) || options.ForceCompile) {
+            compiled = await CompileDafnyProgram(dafnyProgram, resultFileName, otherFileNames, true);
+          } else if ((2 <= options.SpillTargetCode && verified && !options.UserConstrainedProcsToCheck) || 3 <= options.SpillTargetCode) {
+            compiled = await CompileDafnyProgram(dafnyProgram, resultFileName, otherFileNames, false);
+          }
+          break;
+        case PipelineOutcome.Done:
+          WriteProgramVerificationSummary(options, options.OutputWriter, moduleStats);
+          if (options.ForceCompile || 3 <= options.SpillTargetCode) {
+            compiled = await CompileDafnyProgram(dafnyProgram, resultFileName, otherFileNames, options.ForceCompile);
+          }
+          break;
+        default:
+          // error has already been reported to user
+          break;
+      }
+      return compiled;
+    }
+
+    #region Compilation
+
+    private record TargetPaths(string Directory, string Filename) {
+      private static Func<string, string> DeleteDot = p => p == "." ? "" : p;
+      private static Func<string, string> AddDot = p => p == "" ? "." : p;
+      private Func<string, string> RelativeToDirectory =
+        path => DeleteDot(Path.GetRelativePath(AddDot(Directory), path));
+
+      public string RelativeDirectory => RelativeToDirectory(AddDot(Path.GetDirectoryName(Filename)));
+      public string RelativeFilename => RelativeToDirectory(Filename);
+      public string SourceDirectory => Path.GetDirectoryName(Filename);
+    }
+
+    private static TargetPaths GenerateTargetPaths(DafnyOptions options, string dafnyProgramName) {
+      string targetBaseDir = options.Backend.TargetBaseDir(dafnyProgramName);
+      string targetExtension = options.Backend.TargetExtension;
+
+      // Note that using Path.ChangeExtension here does the wrong thing when dafnyProgramName has multiple periods (e.g., a.b.dfy)
+      string targetBaseName = options.Backend.TargetBasename(dafnyProgramName) + "." + targetExtension;
+      string targetDir = Path.Combine(Path.GetDirectoryName(dafnyProgramName), targetBaseDir);
+
+      string targetFilename = Path.Combine(targetDir, targetBaseName);
+
+      return new TargetPaths(Directory: Path.GetDirectoryName(dafnyProgramName), Filename: targetFilename);
+    }
+
+    static void WriteDafnyProgramToFiles(DafnyOptions options, TargetPaths paths, bool targetProgramHasErrors, string targetProgramText,
+      string/*?*/ callToMain, Dictionary<string, string> otherFiles, TextWriter outputWriter) {
+      if (targetProgramText.Length != 0) {
+        WriteFile(paths.Filename, targetProgramText, callToMain);
+      }
+
+      string NormalizeRelativeFilename(string fileName) {
+        return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+          ? fileName.Replace(@"\", "/")
+          : fileName;
+      }
+
+      var relativeTarget = NormalizeRelativeFilename(paths.RelativeFilename);
+      if (targetProgramHasErrors) {
+        // Something went wrong during compilation (e.g., the compiler may have found an "assume" statement).
+        // As a courtesy, we're still printing the text of the generated target program. We print a message regardless
+        // of the Verbose settings.
+        outputWriter.WriteLine("Wrote textual form of partial target program to {0}", relativeTarget);
+      } else if (options.Verbose) {
+        outputWriter.WriteLine("Wrote textual form of target program to {0}", relativeTarget);
+      }
+
+      foreach (var (filename, value) in otherFiles) {
+        var absoluteFilename = Path.IsPathRooted(filename) ? filename : Path.Join(paths.SourceDirectory, filename);
+        WriteFile(absoluteFilename, value);
+        if (options.Verbose) {
+          outputWriter.WriteLine("Additional output written to {0}", NormalizeRelativeFilename(Path.Join(paths.RelativeDirectory, filename)));
+        }
+      }
+    }
+
+    public static void WriteFile(string filename, string text, string moreText = null) {
+      var dir = Path.GetDirectoryName(filename);
+      if (dir != "") {
+        Directory.CreateDirectory(dir);
+      }
+
+      CheckFilenameIsLegal(filename);
+      using TextWriter target = new StreamWriter(new FileStream(filename, FileMode.Create));
+      target.Write(text);
+      if (moreText != null) {
+        target.Write(moreText);
+      }
+    }
+
+    private static void CheckFilenameIsLegal(string filename) {
+      // We cannot get the full path correctly on Windows if the file name uses some reserved words
+      // For example, Path.GetFullPath("con.txt") will return "//./con" which is incorrect.
+      // https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN
+      if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+        var problematicNames =
+          "CON, PRN, AUX, NUL, COM1, COM2, COM3, COM4, COM5, COM6, COM7, COM8, COM9, LPT1, LPT2, LPT3, LPT4, LPT5, LPT6, LPT7, LPT8, LPT9";
+        var problematicRegex =
+          new Regex(@"^(.*[/\\]|^)(" +
+                    string.Join("|", problematicNames.Split(", ")) + @")(\.[^/\\]*)?$", RegexOptions.IgnoreCase);
+        var match = problematicRegex.Match(filename);
+        if (match.Success) {
+          throw new Exception($"Cannot create a file with the name {filename}." +
+                              $" Windows reserves the following file names: {problematicNames}");
+        }
+      }
+    }
+
+    /// <summary>
+    /// Generate a target language program from the Dafny program and, if "invokeCompiler" is "true", invoke
+    /// the target language compiler to compile it.
+    /// </summary>
+    public static async Task<bool> CompileDafnyProgram(Program dafnyProgram, string dafnyProgramName,
+                                           ReadOnlyCollection<string> otherFileNames, bool invokeCompiler) {
+      var rewriters = RewriterCollection.GetRewriters(dafnyProgram.Reporter, dafnyProgram);
+      foreach (var rewriter in rewriters) {
+        rewriter.PostVerification(dafnyProgram);
+      }
+
+      Contract.Requires(dafnyProgram != null);
+      Contract.Assert(dafnyProgramName != null);
+
+      var outputWriter = dafnyProgram.Options.OutputWriter;
+      var errorWriter = dafnyProgram.Options.ErrorWriter;
+
+      // Compile the Dafny program into a string that contains the target program
+      var oldErrorCount = dafnyProgram.Reporter.Count(ErrorLevel.Error);
+      var options = dafnyProgram.Options;
+
+      var compiler = options.Backend;
+      compiler.OnPreCompile(dafnyProgram.Reporter, otherFileNames);
+
+      // Now that an internal compiler is instantiated, apply any plugin instrumentation.
+      foreach (var compilerInstrumenter in options.Plugins.SelectMany(p => p.GetCompilerInstrumenters(dafnyProgram.Reporter))) {
+        compiler.InstrumentCompiler(compilerInstrumenter, dafnyProgram);
+      }
+
+      if (options.Get(CommonOptionBag.ExecutionCoverageReport) != null
+          && compiler.UnsupportedFeatures.Contains(Feature.RuntimeCoverageReport)) {
+        throw new UnsupportedFeatureException(dafnyProgram.GetStartOfFirstFileToken(), Feature.RuntimeCoverageReport);
+      }
+
+      var hasMain = SinglePassCodeGenerator.HasMain(dafnyProgram, out var mainMethod);
+      if (hasMain) {
+        mainMethod.IsEntryPoint = true;
+        dafnyProgram.MainMethod = mainMethod;
+      }
+      string targetProgramText;
+      var otherFiles = new Dictionary<string, string>();
+      {
+        var output = new ConcreteSyntaxTree();
+
+        await DafnyMain.LargeStackFactory.StartNew(() => compiler.Compile(dafnyProgram, dafnyProgramName, output));
+
+        var writerOptions = new WriterState();
+        var targetProgramTextWriter = new StringWriter();
+        var files = new Queue<FileSyntax>();
+        output.Render(targetProgramTextWriter, 0, writerOptions, files, compiler.TargetIndentSize);
+        targetProgramText = targetProgramTextWriter.ToString();
+
+        while (files.Count > 0) {
+          var file = files.Dequeue();
+          var otherFileWriter = new StringWriter();
+          writerOptions.HasNewLine = false;
+          file.Tree.Render(otherFileWriter, 0, writerOptions, files, compiler.TargetIndentSize);
+          otherFiles.Add(file.Filename, otherFileWriter.ToString());
+        }
+      }
+      string callToMain = null;
+      if (hasMain) {
+        var callToMainTree = new ConcreteSyntaxTree();
+        string baseName = Path.GetFileNameWithoutExtension(dafnyProgramName);
+        compiler.EmitCallToMain(mainMethod, baseName, callToMainTree);
+        callToMain = callToMainTree.MakeString(compiler.TargetIndentSize); // assume there aren't multiple files just to call main
+      }
+      Contract.Assert(hasMain == (callToMain != null));
+      bool targetProgramHasErrors = dafnyProgram.Reporter.Count(ErrorLevel.Error) != oldErrorCount;
+
+      var targetPaths = GenerateTargetPaths(options, dafnyProgramName);
+      if (dafnyProgram.Reporter.FailCompilation) {
+        await dafnyProgram.Options.OutputWriter.WriteLineAsync($"Translation was aborted because {dafnyProgram.Reporter.FailCompilationMessage}");
+        return false;
+      }
+      // blurt out the code to a file, if requested, or if other target-language files were specified on the command line.
+      if (options.SpillTargetCode > 0 || otherFileNames.Count > 0 || (invokeCompiler && !compiler.SupportsInMemoryCompilation) ||
+          (invokeCompiler && compiler.TextualTargetIsExecutable && !options.RunAfterCompile)) {
+        compiler.CleanSourceDirectory(targetPaths.SourceDirectory);
+        WriteDafnyProgramToFiles(options, targetPaths, targetProgramHasErrors, targetProgramText, callToMain, otherFiles, outputWriter);
+      }
+
+      var postGenerateFailed = !await compiler.OnPostGenerate(dafnyProgramName, targetPaths.SourceDirectory, outputWriter);
+      if (postGenerateFailed) {
+        return false;
+      }
+
+      // If we got here, compilation succeeded
+      if (!invokeCompiler) {
+        return true; // If we're not asked to invoke the target compiler, we can report success
+      }
+
+      // compile the program into an assembly
+      var (compiledCorrectly, compilationResult) = await compiler.CompileTargetProgram(dafnyProgramName,
+        targetProgramText, callToMain, targetPaths.Filename, otherFileNames,
+        hasMain && options.RunAfterCompile, outputWriter);
+      if (compiledCorrectly && options.RunAfterCompile) {
+        if (hasMain) {
+          if (options.Verbose) {
+            await outputWriter.WriteLineAsync("Running...");
+            await outputWriter.WriteLineAsync();
+          }
+
+          compiledCorrectly = await compiler.RunTargetProgram(dafnyProgramName, targetProgramText, callToMain,
+            targetPaths.Filename, otherFileNames, compilationResult, outputWriter, errorWriter);
+
+          if (compiledCorrectly) {
+            var coverageReportDir = options.Get(CommonOptionBag.ExecutionCoverageReport);
+            if (coverageReportDir != null) {
+              var coverageReport = new CoverageReport("Execution Coverage", "Branches", "_tests_actual", dafnyProgram);
+              compiler.PopulateCoverageReport(coverageReport);
+              await new CoverageReporter(options).SerializeCoverageReports(coverageReport, coverageReportDir);
+            }
+          }
+        } else {
+          // make sure to give some feedback to the user
+          if (options.Verbose) {
+            await outputWriter.WriteLineAsync("Program compiled successfully");
+          }
+        }
+      }
+      return compiledCorrectly;
+    }
+
+    #endregion
+
+    public void Dispose() {
+      engine.Dispose();
+    }
+  }
+}
diff --git a/Source/DafnyDriver/TextLogger.cs b/Source/DafnyDriver/TextLogger.cs
deleted file mode 100644
index 76fe748c4aa..00000000000
--- a/Source/DafnyDriver/TextLogger.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Boogie;
-
-namespace Microsoft.Dafny;
-
-public class TextLogger {
-  private TextWriter tw;
-  private TextWriter outWriter;
-
-  public TextLogger(TextWriter outWriter) {
-    this.outWriter = outWriter;
-  }
-
-  public void Initialize(Dictionary<string, string> parameters) {
-    tw = parameters.TryGetValue("LogFileName", out string filename) ? new StreamWriter(filename) : outWriter;
-  }
-
-  public void LogResults(List<(Implementation, VerificationResult)> verificationResults) {
-    var orderedResults = verificationResults.OrderBy(vr => vr.Item1.VerboseName);
-    foreach (var (implementation, result) in orderedResults) {
-      tw.WriteLine("");
-      tw.WriteLine($"Results for {implementation.VerboseName}");
-      tw.WriteLine($"  Overall outcome: {result.Outcome}");
-      tw.WriteLine($"  Overall time: {result.End - result.Start}");
-      tw.WriteLine($"  Overall resource count: {result.ResourceCount}");
-      // It doesn't seem possible to get a result with zero VCResults, but being careful with nulls just in case :)
-      var maximumTime = result.VCResults.MaxBy(r => r.runTime)?.runTime.ToString() ?? "N/A";
-      var maximumRC = result.VCResults.MaxBy(r => r.resourceCount)?.resourceCount.ToString() ?? "N/A";
-      tw.WriteLine($"  Maximum assertion batch time: {maximumTime}");
-      tw.WriteLine($"  Maximum assertion batch resource count: {maximumRC}");
-      foreach (var vcResult in result.VCResults.OrderBy(r => r.vcNum)) {
-        tw.WriteLine("");
-        tw.WriteLine($"  Assertion batch {vcResult.vcNum}:");
-        tw.WriteLine($"    Outcome: {vcResult.outcome}");
-        tw.WriteLine($"    Duration: {vcResult.runTime}");
-        tw.WriteLine($"    Resource count: {vcResult.resourceCount}");
-        tw.WriteLine("");
-        tw.WriteLine("    Assertions:");
-        foreach (var cmd in vcResult.asserts) {
-          tw.WriteLine(
-            $"      {((IToken)cmd.tok).Filepath}({cmd.tok.line},{cmd.tok.col}): {cmd.Description.SuccessDescription}");
-        }
-
-      }
-    }
-    tw.Flush();
-  }
-}
diff --git a/Source/DafnyDriver/TextVerificationLogger.cs b/Source/DafnyDriver/TextVerificationLogger.cs
new file mode 100644
index 00000000000..0eab9ca83cc
--- /dev/null
+++ b/Source/DafnyDriver/TextVerificationLogger.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Boogie;
+using VC;
+
+namespace Microsoft.Dafny;
+
+public class TextVerificationLogger : IVerificationResultFormatLogger {
+  private TextWriter output;
+  private TextWriter fallbackWriter;
+  private ProofDependencyManager depManager;
+
+  public TextVerificationLogger(ProofDependencyManager depManager, TextWriter fallbackWriter) {
+    this.depManager = depManager;
+    this.fallbackWriter = fallbackWriter;
+  }
+
+  public void Initialize(Dictionary<string, string> parameters) {
+    output = parameters.TryGetValue("LogFileName", out string filename) ? new StreamWriter(filename) : fallbackWriter;
+  }
+
+  public void LogScopeResults(VerificationScopeResult scopeResult) {
+    LogResults(depManager, output, scopeResult);
+  }
+
+  public static void LogResults(ProofDependencyManager proofDependencyManager, TextWriter textWriter, VerificationScopeResult scopeResult) {
+    var verificationScope = scopeResult.Scope;
+    var results = scopeResult.Results.Select(t => t.Result).ToList();
+    var outcome = results.Aggregate(VcOutcome.Correct, (o, r) => JsonVerificationLogger.MergeOutcomes(o, r.Outcome));
+    var runtime = results.Aggregate(TimeSpan.Zero, (a, r) => a + r.RunTime);
+    textWriter.WriteLine("");
+    textWriter.WriteLine($"Results for {verificationScope.Name}");
+    textWriter.WriteLine($"  Overall outcome: {outcome}");
+    textWriter.WriteLine($"  Overall time: {runtime}");
+    textWriter.WriteLine($"  Overall resource count: {results.Sum(r => r.ResourceCount)}");
+    // It doesn't seem possible to get a result with zero VCResults, but being careful with nulls just in case :)
+    var maximumTime = results.MaxBy(r => r.RunTime).RunTime.ToString() ?? "N/A";
+    var maximumResourceCount = results.MaxBy(r => r.ResourceCount).ResourceCount.ToString() ?? "N/A";
+    textWriter.WriteLine($"  Maximum assertion batch time: {maximumTime}");
+    textWriter.WriteLine($"  Maximum assertion batch resource count: {maximumResourceCount}");
+    foreach (var taskResult in scopeResult.Results.OrderBy(r => r.Result.VcNum)) {
+      var vcResult = taskResult.Result;
+      textWriter.WriteLine("");
+      textWriter.WriteLine($"  Assertion batch {vcResult.VcNum}:");
+      textWriter.WriteLine($"    Outcome: {vcResult.Outcome}");
+      if (taskResult.Task != null && taskResult.Task.Split.RandomSeed != 0) {
+        textWriter.WriteLine($"    Random seed: {taskResult.Task.Split.RandomSeed}");
+      }
+      textWriter.WriteLine($"    Duration: {vcResult.RunTime}");
+      textWriter.WriteLine($"    Resource count: {vcResult.ResourceCount}");
+      textWriter.WriteLine("");
+      textWriter.WriteLine("    Assertions:");
+      foreach (var cmd in vcResult.Asserts) {
+        textWriter.WriteLine(
+          $"      {cmd.tok.filename}({cmd.tok.line},{cmd.tok.col}): {cmd.Description.SuccessDescription}");
+      }
+
+      if (vcResult.CoveredElements.Any() && vcResult.Outcome == SolverOutcome.Valid) {
+        textWriter.WriteLine("");
+        textWriter.WriteLine("    Proof dependencies:");
+        var fullDependencies = proofDependencyManager.GetOrderedFullDependencies(vcResult.CoveredElements).ToList();
+        foreach (var dep in fullDependencies) {
+          textWriter.WriteLine($"      {dep.RangeString()}: {dep.Description}");
+        }
+        var allPotentialDependencies = proofDependencyManager.GetPotentialDependenciesForDefinition(verificationScope.Name);
+        var fullDependencySet = fullDependencies.ToHashSet();
+        var unusedDependencies = allPotentialDependencies.Where(dep => !fullDependencySet.Contains(dep));
+        textWriter.WriteLine("");
+        textWriter.WriteLine("    Unused by proof:");
+        foreach (var dep in unusedDependencies) {
+          textWriter.WriteLine($"      {dep.RangeString()}: {dep.Description}");
+        }
+      }
+
+    }
+    textWriter.Flush();
+  }
+
+  public Task Flush() {
+    return Task.CompletedTask;
+  }
+}
diff --git a/Source/DafnyDriver/VerificationResultLogger.cs b/Source/DafnyDriver/VerificationResultLogger.cs
index 905a097c757..dc5d4a252e8 100644
--- a/Source/DafnyDriver/VerificationResultLogger.cs
+++ b/Source/DafnyDriver/VerificationResultLogger.cs
@@ -1,3 +1,4 @@
+#nullable enable
 //-----------------------------------------------------------------------------
 //
 // Copyright (C) Microsoft Corporation.  All Rights Reserved.
@@ -8,14 +9,23 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
+using DafnyDriver.Commands;
 using Microsoft.Boogie;
 using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-using VC;
 
 namespace Microsoft.Dafny {
+  public record VerificationScope(string Name, Boogie.IToken Token);
+
+  public record VerificationScopeResult(VerificationScope Scope, IReadOnlyList<VerificationTaskResult> Results);
+
+  interface IVerificationResultFormatLogger {
+    void LogScopeResults(VerificationScopeResult result);
+    Task Flush();
+  }
 
   /// <summary>
   /// Utility to translate verification results into logs in several formats:
@@ -23,100 +33,125 @@ namespace Microsoft.Dafny {
   ///  * CSV files, which are easier to parse and summarize. 
   ///  * human-readable text output.
   /// </summary>
-  public static class VerificationResultLogger {
+  public class VerificationResultLogger {
+    private readonly DafnyOptions options;
 
     public static TestProperty ResourceCountProperty = TestProperty.Register("TestResult.ResourceCount", "TestResult.ResourceCount", typeof(int), typeof(TestResult));
+    public static TestProperty RandomSeedProperty = TestProperty.Register("TestResult.RandomSeed", "TestResult.RandomSeed", typeof(int), typeof(TestResult));
 
-    public static void RaiseTestLoggerEvents(DafnyOptions options) {
-      var loggerConfigs = options.VerificationLoggerConfigs;
-      // Provide just enough configuration for the loggers to work
-      var parameters = new Dictionary<string, string> {
-        ["TestRunDirectory"] = Constants.DefaultResultsDirectory
-      };
+    private readonly IList<IVerificationResultFormatLogger> formatLoggers = new List<IVerificationResultFormatLogger>();
+    private readonly LocalTestLoggerEvents events;
+
+    public VerificationResultLogger(DafnyOptions options, ProofDependencyManager depManager) {
+      this.options = options;
+      var loggerConfigs = options.Get(CommonOptionBag.VerificationLogFormat);
 
-      var events = new LocalTestLoggerEvents();
-      var verificationResults = (options.Printer as DafnyConsolePrinter).VerificationResults.ToList();
+      events = new LocalTestLoggerEvents();
+      events.EnableEvents();
       foreach (var loggerConfig in loggerConfigs) {
-        string loggerName;
-        int semiColonIndex = loggerConfig.IndexOf(";");
-        if (semiColonIndex >= 0) {
-          loggerName = loggerConfig[..semiColonIndex];
-          var parametersList = loggerConfig[(semiColonIndex + 1)..];
-          foreach (string s in parametersList.Split(",")) {
-            var equalsIndex = s.IndexOf("=");
-            if (equalsIndex >= 0) {
-              parameters.Add(s[..equalsIndex], s[(equalsIndex + 1)..]);
-            } else {
-              throw new ArgumentException($"unknown parameter to `/verificationLogger:csv`: {s}");
-            }
-          }
-        } else {
-          loggerName = loggerConfig;
-        }
+        ParseParametersAndLoggerName(loggerConfig, out var parameters, out var loggerName);
 
         if (loggerName == "trx") {
           var logger = new TrxLogger();
-          logger.Initialize(events, parameters);
+          logger.Initialize(events, parameters!);
         } else if (loggerName == "csv") {
           var csvLogger = new CSVTestLogger(options.OutputWriter);
           csvLogger.Initialize(events, parameters);
+        } else if (loggerName == "json") {
+          // This logger doesn't implement the ITestLogger interface because
+          // it uses information that's tricky to encode in a TestResult.
+          var jsonLogger = new JsonVerificationLogger(depManager, options.OutputWriter);
+          jsonLogger.Initialize(parameters);
+          formatLoggers.Add(jsonLogger);
         } else if (loggerName == "text") {
           // This logger doesn't implement the ITestLogger interface because
           // it uses information that's tricky to encode in a TestResult.
-          var textLogger = new TextLogger(options.OutputWriter);
+          var textLogger = new TextVerificationLogger(depManager, options.OutputWriter);
           textLogger.Initialize(parameters);
-          textLogger.LogResults(verificationResults);
-          return;
+          formatLoggers.Add(textLogger);
         } else {
           throw new ArgumentException($"unsupported verification logger config: {loggerConfig}");
         }
       }
-      events.EnableEvents();
+    }
 
-      // Sort failures to the top, and then slower procedures first.
-      // Loggers may not maintain this ordering unfortunately.
-      var results = VerificationToTestResults(verificationResults)
-        .OrderBy(r => r.Outcome == TestOutcome.Passed)
-        .ThenByDescending(r => r.Duration);
-      foreach (var result in results) {
-        events.RaiseTestResult(new TestResultEventArgs(result));
+    public static void ParseParametersAndLoggerName(string loggerConfig, out Dictionary<string, string> parameters, out string loggerName) {
+      // Provide just enough configuration for the loggers to work
+      parameters = new Dictionary<string, string> {
+        ["TestRunDirectory"] = Constants.DefaultResultsDirectory
+      };
+
+      int semiColonIndex = loggerConfig.IndexOf(";", StringComparison.Ordinal);
+      if (semiColonIndex >= 0) {
+        loggerName = loggerConfig[..semiColonIndex];
+        var parametersList = loggerConfig[(semiColonIndex + 1)..];
+        foreach (string s in parametersList.Split(",")) {
+          var equalsIndex = s.IndexOf("=", StringComparison.Ordinal);
+          if (equalsIndex >= 0) {
+            parameters.Add(s[..equalsIndex], s[(equalsIndex + 1)..]);
+          } else {
+            throw new ArgumentException($"unknown parameter to `/verificationLogger:csv`: {s}");
+          }
+        }
+      } else {
+        loggerName = loggerConfig;
+      }
+    }
+
+    public void Report(CanVerifyResult canVerifyResult) {
+      var scopeResults =
+        canVerifyResult.Results
+          .GroupBy(v => new VerificationScope(v.Task.ScopeId, v.Task.ScopeToken))
+          .Select(g => new VerificationScopeResult(g.Key, g.ToList())).ToList();
+      foreach (var scopeResult in scopeResults) {
+        foreach (var formatLogger in formatLoggers) {
+          formatLogger.LogScopeResults(scopeResult);
+        }
+        foreach (var result in VerificationToTestResults(scopeResult)) {
+          events.RaiseTestResult(new TestResultEventArgs(result));
+        }
       }
+    }
 
+    public async Task Finish() {
       events.RaiseTestRunComplete(new TestRunCompleteEventArgs(
         new TestRunStatistics(),
         false, false, null, null, new TimeSpan()
       ));
+      foreach (var formatLogger in formatLoggers) {
+        await formatLogger.Flush();
+      }
     }
 
-    private static IEnumerable<TestResult> VerificationToTestResults(List<(Implementation, VerificationResult)> verificationResults) {
+    public static IEnumerable<TestResult> VerificationToTestResults(VerificationScopeResult result) {
       var testResults = new List<TestResult>();
 
-      foreach (var (implementation, result) in verificationResults) {
-        var vcResults = result.VCResults.OrderBy(r => r.vcNum);
-        var currentFile = ((IToken)implementation.tok).Uri;
-        foreach (var vcResult in vcResults) {
-          var verbName = implementation.VerboseName;
-          var name = vcResults.Count() > 1
-            ? verbName + $" (assertion batch {vcResult.vcNum})"
-            : verbName;
-          var testCase = new TestCase {
-            FullyQualifiedName = name,
-            ExecutorUri = new Uri("executor://dafnyverifier/v1"),
-            Source = currentFile.LocalPath
-          };
-          var testResult = new TestResult(testCase) {
-            StartTime = vcResult.startTime,
-            Duration = vcResult.runTime
-          };
-          testResult.SetPropertyValue(ResourceCountProperty, vcResult.resourceCount);
-          if (vcResult.outcome == ProverInterface.Outcome.Valid) {
-            testResult.Outcome = TestOutcome.Passed;
-          } else {
-            testResult.Outcome = TestOutcome.Failed;
-            testResult.ErrorMessage = vcResult.outcome.ToString();
-          }
-          testResults.Add(testResult);
+      var verificationScope = result.Scope;
+      foreach (var (task, vcResult) in result.Results.OrderBy(r => r.Result.VcNum).
+                 Select(r => r)) {
+        var name = (result.Results.Count > 1
+          ? verificationScope.Name + $" (assertion batch {vcResult.VcNum})"
+          : verificationScope.Name);
+        var testCase = new TestCase {
+          FullyQualifiedName = name,
+          ExecutorUri = new Uri("executor://dafnyverifier/v1"),
+          Source = ((IOrigin)verificationScope.Token).Uri.LocalPath
+        };
+        var testResult = new TestResult(testCase) {
+          StartTime = vcResult.StartTime,
+          Duration = vcResult.RunTime
+        };
+        testResult.SetPropertyValue(ResourceCountProperty, vcResult.ResourceCount);
+        if (task != null && task.Split.RandomSeed != 0) {
+          testResult.SetPropertyValue(RandomSeedProperty, task.Split.RandomSeed);
+        }
+        if (vcResult.Outcome == SolverOutcome.Valid) {
+          testResult.Outcome = TestOutcome.Passed;
+        } else {
+          testResult.Outcome = TestOutcome.Failed;
+          testResult.ErrorMessage = vcResult.Outcome.ToString();
         }
+        testResults.Add(testResult);
       }
 
       return testResults;
diff --git a/Source/DafnyDriver/WritersConsole.cs b/Source/DafnyDriver/WritersConsole.cs
new file mode 100644
index 00000000000..471f41dbc7f
--- /dev/null
+++ b/Source/DafnyDriver/WritersConsole.cs
@@ -0,0 +1,25 @@
+#nullable enable
+using System.CommandLine;
+using System.CommandLine.IO;
+using System.IO;
+
+namespace Microsoft.Dafny;
+
+class WritersConsole : IConsole {
+  public TextReader InputWriter { get; }
+  public TextWriter ErrWriter { get; }
+  public TextWriter OutWriter { get; }
+
+  public WritersConsole(TextReader inputWriter, TextWriter outWriter, TextWriter errWriter) {
+    InputWriter = inputWriter;
+    this.ErrWriter = errWriter;
+    this.OutWriter = outWriter;
+  }
+
+  public IStandardStreamWriter Out => StandardStreamWriter.Create(OutWriter ?? TextWriter.Null);
+
+  public bool IsOutputRedirected => OutWriter != null;
+  public IStandardStreamWriter Error => StandardStreamWriter.Create(ErrWriter ?? TextWriter.Null);
+  public bool IsErrorRedirected => ErrWriter != null;
+  public bool IsInputRedirected => false;
+}
\ No newline at end of file
diff --git a/Source/DafnyDriver/assets/.resources/coverage.css b/Source/DafnyDriver/assets/.resources/coverage.css
index 06ec1515b50..af92c4fc608 100644
--- a/Source/DafnyDriver/assets/.resources/coverage.css
+++ b/Source/DafnyDriver/assets/.resources/coverage.css
@@ -49,6 +49,11 @@ table.coverage thead td {
     border-bottom:#b0b0b0 1px solid;
 }
 
+table.coverage thead td.name {
+    text-align:left;
+    padding-left:2px;
+}
+
 table.coverage thead td.ctr2 {
     text-align:right;
     padding-left:2px;
@@ -64,6 +69,12 @@ table.coverage tbody tr:hover {
     background: #f0f0d0 !important;
 }
 
+table.coverage tbody td.name {
+    text-align:left;
+    padding-right:14px;
+    padding-left:2px;
+}
+
 table.coverage tbody td.ctr2 {
     text-align:right;
     padding-right:14px;
diff --git a/Source/DafnyLanguageServer.Test/CodeActions/CodeActionsTest.cs b/Source/DafnyLanguageServer.Test/CodeActions/CodeActionsTest.cs
index 756b2ae9818..0a07486e222 100644
--- a/Source/DafnyLanguageServer.Test/CodeActions/CodeActionsTest.cs
+++ b/Source/DafnyLanguageServer.Test/CodeActions/CodeActionsTest.cs
@@ -1,4 +1,4 @@
-using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
+using System;
 using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using Xunit;
 using Xunit.Abstractions;
-using XunitAssertMessages;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.CodeActions {
   public class CodeActionTest : ClientBasedLanguageServerTest {
@@ -27,6 +27,87 @@ private async Task<CodeAction> RequestResolveCodeAction(CodeAction codeAction) {
       return await client.ResolveCodeAction(codeAction, CancellationToken);
     }
 
+    [Fact]
+    public async Task MethodKeywordCodeAction() {
+      await SetUp(o => o.Set(CommonOptionBag.RelaxDefiniteAssignment, true));
+
+      MarkupTestFile.GetPositionsAndAnnotatedRanges(@"
+method><".TrimStart(), out var source, out var positions,
+        out var ranges);
+      var documentItem = await CreateOpenAndWaitForResolve(source);
+      var position = positions[0];
+      var completionList = await RequestCodeActionAsync(documentItem, new Range(position, position));
+      Assert.Empty(completionList);
+    }
+
+    [Fact]
+    public async Task TypeTestCodeAction() {
+      await SetUp(o => o.Set(CommonOptionBag.RelaxDefiniteAssignment, true));
+
+      MarkupTestFile.GetPositionsAndAnnotatedRanges(@"module M {
+  trait Object {
+   ghost function typeId() : (id: string)
+  }
+
+  type A extends Object {
+   ghost function typeId() : (id: string)  { ""A"" }
+  }
+
+  type B extends Object {
+   ghost function typeId() : (id: string)  { ""B"" }
+  }
+  type C extends Object {
+   ghost function typeId() : (id: string)  { ""C"" }
+  }
+
+  lemma test(x: Object)
+    ensures multiset{x is A, x is B, x is C}[true] == 1
+  {
+    var _ := x.typeId();
+    if (x is A) {
+      assert x !is B.><
+    }
+  }
+}".TrimStart(), out var source, out var positions,
+        out var ranges);
+      var documentItem = await CreateOpenAndWaitForResolve(source);
+      var position = positions[0];
+      var completionList = await RequestCodeActionAsync(documentItem, new Range(position, position));
+      Assert.Empty(completionList);
+    }
+
+    [Fact]
+    public async Task TestAssertFalseNotSuggestingItself() {
+      await TestNoCodeAction(@"
+method NoCodeAction() {
+  assert fal><se;
+}");
+    }
+
+    [Fact]
+    public async Task TestEnsureFalseNotSuggestingItself() {
+      await TestNoCodeAction(@"
+method NoCodeAction() ensures f><alse {
+}", excepted: message => message == "Assert postcondition at return location where it fails");
+    }
+
+    [Fact]
+    public async Task TestInsertion() {
+      await TestCodeAction(@"
+datatype L = N | C(t: L)
+
+method Dec(c: L)
+  decreases c, 1, 1
+{(>Insert explicit failing assertion->
+  assert (old(c), old(1) decreases to c, 1);<)
+  Da><c(c);
+}
+method Dac(c: L) 
+  decreases c, 1 {
+    Dec(c);
+}");
+    }
+
     [Fact]
     public async Task GitIssue4401CorrectInsertionPlace() {
       await TestCodeAction(@"
@@ -305,13 +386,30 @@ match i {
 
     private static readonly Regex NewlineRegex = new Regex("\r?\n");
 
+    private async Task TestNoCodeAction(string source, Func<string, bool> excepted = null) {
+      await SetUp(o => o.Set(CommonOptionBag.RelaxDefiniteAssignment, true));
+      MarkupTestFile.GetPositionsAndAnnotatedRanges(source.TrimStart(), out var output, out var positions,
+        out var ranges);
+      var documentItem = await CreateOpenAndWaitForResolve(output);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Equal(0, ranges.Count);
+      foreach (var position in positions) {
+        var completionList = await RequestCodeActionAsync(documentItem, new Range(position, position));
+        completionList = excepted == null
+          ? completionList
+          : completionList.Where(completion =>
+            completion.CodeAction is not { Title: var title } || !excepted(title)).ToList();
+        Assert.Empty(completionList);
+      }
+    }
+
     private async Task TestCodeAction(string source) {
       await SetUp(o => o.Set(CommonOptionBag.RelaxDefiniteAssignment, true));
 
       MarkupTestFile.GetPositionsAndAnnotatedRanges(source.TrimStart(), out var output, out var positions,
         out var ranges);
-      var documentItem = await CreateAndOpenTestDocument(output);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+      var documentItem = await CreateOpenAndWaitForResolve(output);
+      var diagnostics = await GetLastDiagnostics(documentItem);
       Assert.Equal(ranges.Count, diagnostics.Length);
 
       if (positions.Count != ranges.Count) {
diff --git a/Source/DafnyLanguageServer.Test/Completion/AtCompletionTest.cs b/Source/DafnyLanguageServer.Test/Completion/AtCompletionTest.cs
new file mode 100644
index 00000000000..6a064e868ce
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Completion/AtCompletionTest.cs
@@ -0,0 +1,76 @@
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
+using OmniSharp.Extensions.LanguageServer.Protocol.Document;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Completion {
+  public class AtCompletionTest : ClientBasedLanguageServerTest {
+
+    private async Task<List<CompletionItem>> RequestCompletionAsync(TextDocumentItem documentItem, Position position) {
+      var completionList = await client.RequestCompletion(
+        new CompletionParams {
+          TextDocument = documentItem.Uri,
+          Position = position
+        },
+        CancellationToken
+      ).AsTask();
+      return completionList.OrderBy(completion => completion.Label).ToList();
+    }
+
+    [Fact]
+    public async Task CompleteNoAtAttributeDuringAtCall() {
+      var source = @"
+method Foo() { label start: previous@(x); }".TrimStart();
+      var documentItem = CreateAndOpenTestDocument(source, "CompleteAtCall.dfy");
+
+      var completionList = await RequestCompletionAsync(documentItem, (0, 37));
+      Assert.Empty(completionList);
+    }
+
+    private static void AssertEqualToAllCompletions(List<CompletionItem> completionList) {
+      Assert.Equal(Attributes.BuiltinAtAttributes.Count, completionList.Count);
+      for (var i = 0; i < completionList.Count; i++) {
+        Assert.Equal(Attributes.BuiltinAtAttributes[0].Name, completionList[0].Label);
+        Assert.Equal(CompletionItemKind.Constructor, completionList[1].Kind);
+      }
+    }
+
+    [Fact]
+    public async Task CompleteAtAttributeAtBeginningOfFile() {
+      var source = "@";
+      var documentItem = CreateTestDocument(source, "CompleteAt.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var completionList = await RequestCompletionAsync(documentItem, (0, 1));
+      AssertEqualToAllCompletions(completionList);
+    }
+
+    [Fact]
+    public async Task CompleteAtAttributeBeforeMethod() {
+      var source = @"
+/* Does what is expected */ @ method Foo() { }".TrimStart();
+      var documentItem = CreateTestDocument(source, "CompleteAtBeforeMethod.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var completionList = await RequestCompletionAsync(documentItem, (0, 29));
+      AssertEqualToAllCompletions(completionList);
+    }
+
+    [Fact]
+    public async Task CompleteAtAttributeBeforeMethodAfterNewline() {
+      var source = @"
+/* Does what is expected */".TrimStart() + "\n" +
+"@ method Foo() { }".TrimStart();
+      var documentItem = CreateTestDocument(source, "CompleteOnThisReturnsClassMembers.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var completionList = await RequestCompletionAsync(documentItem, (1, 1));
+      AssertEqualToAllCompletions(completionList);
+    }
+
+    public AtCompletionTest(ITestOutputHelper output) : base(output) {
+    }
+  }
+}
diff --git a/Source/DafnyLanguageServer.Test/Completion/DotCompletionTest.cs b/Source/DafnyLanguageServer.Test/Completion/DotCompletionTest.cs
index 13e27203d04..aafde7cc3e9 100644
--- a/Source/DafnyLanguageServer.Test/Completion/DotCompletionTest.cs
+++ b/Source/DafnyLanguageServer.Test/Completion/DotCompletionTest.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
-using Microsoft.Extensions.Logging;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -24,6 +23,16 @@ private async Task<List<CompletionItem>> RequestCompletionAsync(TextDocumentItem
       return completionList.OrderBy(completion => completion.Label).ToList();
     }
 
+    [Fact]
+    public async Task CodeCompletionInIncompleteTypeArgumentList() {
+      var source = @"
+function Foo<T>(): seq<".TrimStart();
+      var documentItem = CreateAndOpenTestDocument(source, "CompleteOnThisReturnsClassMembers.dfy");
+
+      var completionList = await RequestCompletionAsync(documentItem, (0, 23));
+      Assert.Empty(completionList);
+    }
+
     [Fact]
     public async Task CompleteOnThisReturnsClassMembers() {
       var source = @"
@@ -220,6 +229,92 @@ method GetConstant() returns (c: int) {
       Assert.Equal("GetConstant", completionList[0].Label);
     }
 
+    [Fact]
+    public async Task CompleteOnTypeAliasReturnsAliasedTypesOptions() {
+      var source = @"
+type T = array<int>
+class A {
+  var x: T
+
+  method DoIt() {
+
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "CompleteOnTypeAlias.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      ApplyChange(ref documentItem, new Range((5, 0), (5, 0)), @"var y := this.x.");
+
+      var completionList = await RequestCompletionAsync(documentItem, (5, 16));
+      Assert.Single(completionList);
+      Assert.Equal(CompletionItemKind.Field, completionList[0].Kind);
+      Assert.Equal("Length", completionList[0].Label);
+    }
+
+    [Fact]
+    public async Task CompleteOnChainedTypeAliases() {
+      var source = @"
+type T = array<int>
+type S = T
+class A {
+  var x: S
+
+  method DoIt() {
+
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "CompleteOnTypeAlias.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      ApplyChange(ref documentItem, new Range((6, 0), (6, 0)), @"var y := this.x.");
+
+      var completionList = await RequestCompletionAsync(documentItem, (6, 16));
+      Assert.Single(completionList);
+      Assert.Equal(CompletionItemKind.Field, completionList[0].Kind);
+      Assert.Equal("Length", completionList[0].Label);
+    }
+
+    [Fact]
+    public async Task CompleteOnParametricTypeAlias() {
+      var source = @"
+type T<R, S> = S
+class A {
+  var x: T<int, array<int>>
+
+  method DoIt() {
+
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "CompleteOnTypeAlias.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      ApplyChange(ref documentItem, new Range((5, 0), (5, 0)), @"var y := this.x.");
+
+      var completionList = await RequestCompletionAsync(documentItem, (5, 16));
+      Assert.Single(completionList);
+      Assert.Equal(CompletionItemKind.Field, completionList[0].Kind);
+      Assert.Equal("Length", completionList[0].Label);
+    }
+
+    [Fact]
+    public async Task CompleteOnParametricTypeAliasReturningSynonym() {
+      var source = @"
+type T1 = array<int>
+type T2<R, S> = S
+class A {
+  var x: T2<int, T1>
+
+  method DoIt() {
+
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "CompleteOnTypeAlias.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      ApplyChange(ref documentItem, new Range((6, 0), (6, 0)), @"var y := this.x.");
+
+      var completionList = await RequestCompletionAsync(documentItem, (6, 16));
+      Assert.Single(completionList);
+      Assert.Equal(CompletionItemKind.Field, completionList[0].Kind);
+      Assert.Equal("Length", completionList[0].Label);
+    }
+
     public DotCompletionTest(ITestOutputHelper output) : base(output) {
     }
   }
diff --git a/Source/DafnyLanguageServer.Test/DafnyLanguageServer.Test.csproj b/Source/DafnyLanguageServer.Test/DafnyLanguageServer.Test.csproj
index 392fa360a6c..16d4a63d5fb 100644
--- a/Source/DafnyLanguageServer.Test/DafnyLanguageServer.Test.csproj
+++ b/Source/DafnyLanguageServer.Test/DafnyLanguageServer.Test.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Microsoft.Dafny.LanguageServer.IntegrationTest</RootNamespace>
   </PropertyGroup>
@@ -10,7 +9,7 @@
     <PackageReference Include="DiffPlex" Version="1.7.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="Serilog.Sinks.InMemory" Version="0.11.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
@@ -25,7 +24,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\DafnyCore.Test\DafnyCore.Test.csproj" />
     <ProjectReference Include="..\DafnyLanguageServer\DafnyLanguageServer.csproj" />
+    <ProjectReference Include="..\DafnyPipeline\DafnyPipeline.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -45,6 +46,12 @@
     <None Update="Lookup\TestFiles\find-refs-b.dfy">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Lookup\TestFiles\defines-foo.dfy">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Lookup\TestFiles\includes-foo.dfy">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Synchronization\TestFiles\semanticError.dfy">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -105,13 +112,16 @@
     <None Update="Synchronization\TestFiles\multi2.dfy">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Formatting\TestFiles\empty.dfy">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\Test\dafny3\GenericSort.dfy" Link="Various\TestFiles\GenericSort.dfy">
+    <None Include="..\IntegrationTests\TestFiles\LitTests\LitTest\dafny3\GenericSort.dfy" Link="Various\TestFiles\GenericSort.dfy">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\Test\dafny4\GHC-MergeSort.dfy" Link="Various\TestFiles\GHC-MergeSort.dfy">
+    <None Include="..\IntegrationTests\TestFiles\LitTests\LitTest\dafny4\GHC-MergeSort.dfy" Link="Various\TestFiles\GHC-MergeSort.dfy">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/Source/DafnyLanguageServer.Test/DafnyLanguageServerTestBase.cs b/Source/DafnyLanguageServer.Test/DafnyLanguageServerTestBase.cs
index e75822dca20..de256011f11 100644
--- a/Source/DafnyLanguageServer.Test/DafnyLanguageServerTestBase.cs
+++ b/Source/DafnyLanguageServer.Test/DafnyLanguageServerTestBase.cs
@@ -16,6 +16,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using DafnyCore.Test;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Various;
 using Microsoft.Dafny.LanguageServer.Language;
 using OmniSharp.Extensions.LanguageServer.Client;
@@ -25,7 +27,7 @@ namespace Microsoft.Dafny.LanguageServer.IntegrationTest {
   public class DafnyLanguageServerTestBase : LanguageProtocolTestBase {
 
     protected readonly string SlowToVerify = @"
-lemma {:timeLimit 3} SquareRoot2NotRational(p: nat, q: nat)
+lemma {:resource_limit 100000} SquareRoot2NotRational(p: nat, q: nat)
   requires p > 0 && q > 0
   ensures (p * p) !=  2 * (q * q)
 { 
@@ -40,6 +42,8 @@ requires p > 0 && q > 0
   }
 }".TrimStart();
 
+    protected string SlowToVerifyNoLimit => SlowToVerify.Replace(" {:resource_limit 100000}", "");
+
     protected readonly string NeverVerifies = @"
 lemma {:neverVerify} HasNeverVerifyAttribute(p: nat, q: nat)
   ensures true
@@ -49,20 +53,26 @@ ensures true
     public const string LanguageId = "dafny";
     protected static int fileIndex;
     protected readonly TextWriter output;
+    protected readonly ILogger logger;
 
     public ILanguageServer Server { get; protected set; }
 
     public IProjectDatabase Projects => Server.GetRequiredService<IProjectDatabase>();
 
     protected DafnyLanguageServerTestBase(ITestOutputHelper output, LogLevel dafnyLogLevel = LogLevel.Information)
-      : base(new JsonRpcTestOptions(LoggerFactory.Create(
-      builder => {
-        builder.AddFilter("OmniSharp.Extensions.JsonRpc", LogLevel.None);
-        builder.AddFilter("OmniSharp", LogLevel.Warning);
-        builder.AddFilter("Microsoft.Dafny", dafnyLogLevel);
-        builder.AddConsole();
-      }))) {
+      : base(new JsonRpcTestOptions(CreateLoggerFactory(dafnyLogLevel))) {
       this.output = new WriterFromOutputHelper(output);
+      logger = CreateLoggerFactory(dafnyLogLevel).CreateLogger("default");
+    }
+
+    private static ILoggerFactory CreateLoggerFactory(LogLevel dafnyLogLevel) {
+      return LoggerFactory.Create(
+        builder => {
+          builder.AddFilter("OmniSharp.Extensions.JsonRpc", LogLevel.None);
+          builder.AddFilter("OmniSharp", LogLevel.Warning);
+          builder.AddFilter("Microsoft.Dafny", dafnyLogLevel);
+          builder.AddConsole();
+        });
     }
 
     protected virtual void ServerOptionsAction(LanguageServerOptions serverOptions) {
@@ -93,12 +103,15 @@ public AnonymousDisposable(Action action) {
     }
 
     private Action<LanguageServerOptions> GetServerOptionsAction(Action<DafnyOptions> modifyOptions) {
-      var dafnyOptions = DafnyOptions.Create(output);
+      var dafnyOptions = DafnyOptions.CreateUsingOldParser(output);
+      dafnyOptions.Set(ProjectManager.UpdateThrottling, 0);
+      dafnyOptions.Set(CachingProjectFileOpener.ProjectFileCacheExpiry, 0);
       modifyOptions?.Invoke(dafnyOptions);
-      ServerCommand.ConfigureDafnyOptionsForServer(dafnyOptions);
+      dafnyOptions.UsingNewCli = true;
+      LanguageServer.ConfigureDafnyOptionsForServer(dafnyOptions);
       ApplyDefaultOptionValues(dafnyOptions);
       return options => {
-        options.WithDafnyLanguageServer(() => { });
+        options.WithDafnyLanguageServer(dafnyOptions, () => { });
         options.Services.AddSingleton(dafnyOptions);
         options.Services.AddSingleton<IProgramVerifier>(serviceProvider => new SlowVerifier(
           serviceProvider.GetRequiredService<ILogger<DafnyProgramVerifier>>()
@@ -109,12 +122,12 @@ private Action<LanguageServerOptions> GetServerOptionsAction(Action<DafnyOptions
 
     private static void ApplyDefaultOptionValues(DafnyOptions dafnyOptions) {
       var testCommand = new System.CommandLine.Command("test");
-      foreach (var serverOption in ServerCommand.Instance.Options) {
+      foreach (var serverOption in LanguageServer.Options) {
         testCommand.AddOption(serverOption);
       }
 
       var result = testCommand.Parse("test");
-      foreach (var option in ServerCommand.Instance.Options) {
+      foreach (var option in LanguageServer.Options) {
         if (!dafnyOptions.Options.OptionArguments.ContainsKey(option)) {
           var value = result.GetValueForOption(option);
 
@@ -125,19 +138,30 @@ private static void ApplyDefaultOptionValues(DafnyOptions dafnyOptions) {
       }
     }
 
+    protected static string GetFreshTempPath() {
+      return Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    }
+
     protected static TextDocumentItem CreateTestDocument(string source, string filePath = null, int version = 1) {
+      DocumentUri uri;
       if (filePath == null) {
         var index = Interlocked.Increment(ref fileIndex);
-        filePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName(), $"testFile{index}.dfy");
+        filePath = Path.Combine(GetFreshTempPath(), $"testFile{index}.dfy");
       }
-      if (string.IsNullOrEmpty(Path.GetDirectoryName(filePath))) {
-        filePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName(), filePath);
+
+      if (filePath.StartsWith("untitled:")) {
+        uri = DocumentUri.Parse(filePath);
+      } else {
+        if (string.IsNullOrEmpty(Path.GetDirectoryName(filePath))) {
+          filePath = Path.Combine(GetFreshTempPath(), filePath);
+        }
+        filePath = Path.GetFullPath(filePath);
+        uri = DocumentUri.FromFileSystemPath(filePath);
       }
-      filePath = Path.GetFullPath(filePath);
       return new TextDocumentItem {
         LanguageId = LanguageId,
         Text = source,
-        Uri = filePath.StartsWith("untitled:") ? DocumentUri.Parse(filePath) : DocumentUri.FromFileSystemPath(filePath),
+        Uri = uri,
         Version = version
       };
     }
diff --git a/Source/DafnyLanguageServer.Test/Diagnostics/DiagnosticsTest.cs b/Source/DafnyLanguageServer.Test/Diagnostics/DiagnosticsTest.cs
new file mode 100644
index 00000000000..957ac6270d8
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Diagnostics/DiagnosticsTest.cs
@@ -0,0 +1,1444 @@
+using System;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Dafny.LanguageServer.Workspace;
+using OmniSharp.Extensions.LanguageServer.Protocol.Document;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit.Abstractions;
+using Xunit;
+using Xunit.Sdk;
+using XunitAssertMessages;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization {
+  public class DiagnosticsTest : ClientBasedLanguageServerTest {
+    private readonly string testFilesDirectory = Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles");
+
+    [Fact]
+    public async Task ResolutionErrorMigration() {
+      var source = @"module ResolutionError {
+  import   UnderlineComments2
+}";
+      var addition = @"module ParseError {
+  // I can underline comments in red.
+  function method Test() {
+  }
+}
+";
+      var documentItem = CreateAndOpenTestDocument(source);
+      var diagnostics1 = await GetLastDiagnostics(documentItem);
+      ApplyChange(ref documentItem, new Range(0, 0, 0, 0), addition);
+      var diagnostics2 = await GetLastDiagnostics(documentItem);
+      Assert.DoesNotContain(diagnostics2, d => d.Range.Start.Line == 1);
+    }
+
+    [Fact]
+    public async Task RedundantAssumptionsGetWarnings() {
+      var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+      Directory.CreateDirectory(directory);
+      await File.WriteAllTextAsync(Path.Combine(directory, DafnyProject.FileName), @"
+[options]
+warn-contradictory-assumptions = true
+warn-redundant-assumptions = true
+allow-axioms = false
+");
+
+      var source = @"
+method RedundantAssumeMethod(n: int)
+{
+    // either one or the other assumption shouldn't be covered
+    assume n > 4;
+    assume n > 3;
+    assert n > 1;
+}
+
+method ContradictoryAssumeMethod(n: int)
+{
+    assume n > 0;
+    assume n < 0;
+    assume n == 5; // shouldn't be covered
+    assert n < 10; // shouldn't be covered
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, Path.Combine(directory, "RedundantAssumptionsGetWarnings.dfy"));
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Equal(8, diagnostics.Length);
+      Assert.Contains(diagnostics, diagnostic =>
+        diagnostic.Severity == DiagnosticSeverity.Warning &&
+        diagnostic.Range == new Range(3, 11, 3, 16) &&
+        diagnostic.Message == "unnecessary (or partly unnecessary) assume statement"
+        );
+      Assert.Contains(diagnostics, diagnostic =>
+        diagnostic.Severity == DiagnosticSeverity.Warning &&
+        diagnostic.Range == new Range(13, 4, 13, 18) &&
+        diagnostic.Message == "proved using contradictory assumptions: assertion always holds. (Use the `{:contradiction}` attribute on the `assert` statement to silence.)"
+      );
+      Assert.Contains(diagnostics, diagnostic =>
+        diagnostic.Severity == DiagnosticSeverity.Warning &&
+        diagnostic.Range == new Range(12, 11, 12, 17) &&
+        diagnostic.Message == "unnecessary (or partly unnecessary) assume statement"
+      );
+      Directory.Delete(directory, true);
+    }
+
+    [Fact]
+    public async Task LeastLemmaIsVerified() {
+      var source = @"
+least lemma Foo()
+  ensures false
+{}";
+      var document = await CreateOpenAndWaitForResolve(source);
+      var diagnostics = await GetLastDiagnostics(document);
+      Assert.NotEmpty(diagnostics);
+    }
+
+    [Fact(Skip = "Not implemented. Requires separating diagnostics from different sources")]
+    public async Task FixedParseErrorUpdatesBeforeResolution() {
+      var source = @"
+mfunction HasParseAndResolutionError(): int {
+  true
+}".TrimStart();
+
+      var document = await CreateOpenAndWaitForResolve(source);
+      var parseDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Equal(MessageSource.Parser.ToString(), parseDiagnostics[0].Source);
+      ApplyChange(ref document, new Range(0, 0, 0, 1), " ");
+      var parseDiagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Empty(parseDiagnostics2);
+      var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(resolutionDiagnostics);
+    }
+
+    [Fact]
+    public async Task SelectedTriggersDiagnosticsDoesNotDisappear() {
+      var producerSource = @"
+module Producer {
+  function Zoo(): set<(int,int)> {
+    set x: int | 0 <= x < 5, y | 0 <= y < 6 :: (x,y)
+  }
+
+  const used := 3
+}
+".TrimStart();
+
+      var consumerSource = @"
+module Consumer {
+  import Producer
+  const user := Producer.used + 4
+}
+".TrimStart();
+
+      var directory = Path.GetRandomFileName();
+      var project = await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
+      var producer = await CreateOpenAndWaitForResolve(producerSource, Path.Combine(directory, "producer.dfy"));
+      var consumer = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(directory, "consumer.dfy"));
+      var diag1 = await GetLastDiagnostics(producer, DiagnosticSeverity.Hint, allowStale: true);
+      Assert.Equal(DiagnosticSeverity.Hint, diag1[0].Severity);
+      ApplyChange(ref consumer, new Range(0, 0, 0, 0), "//trigger change\n");
+      await AssertNoDiagnosticsAreComing(CancellationToken, producer);
+    }
+
+
+    [Fact]
+    public async Task CorrectParseDiagnosticsDoNotOverridePreviousResolutionOnes() {
+      var source = @"
+function HasResolutionError(): int {
+  true
+}".TrimStart();
+
+      var documentItem = await CreateOpenAndWaitForResolve(source);
+      var resolutionDiagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Equal(MessageSource.Resolver.ToString(), resolutionDiagnostics[0].Source);
+      ApplyChange(ref documentItem, new Range(2, 1, 2, 1), "\n// comment to trigger update\n");
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+      ApplyChange(ref documentItem, new Range(1, 0, 1, 0), "disturbFunctionKeyword");
+      var parseDiagnostics1 = await GetLastDiagnostics(documentItem);
+      Assert.Contains(parseDiagnostics1, d => d.Source == MessageSource.Parser.ToString());
+      ApplyChange(ref documentItem, new Range(1, 0, 1, "disturbFunctionKeyword".Length), "");
+      var parseDiagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(parseDiagnostics2);
+      Assert.Equal(MessageSource.Resolver.ToString(), parseDiagnostics2[0].Source);
+    }
+
+    [Fact]
+    public async Task DiagnosticsForVerificationTimeoutHasNameAsRange() {
+      var documentItem = CreateTestDocument(SlowToVerify, "DiagnosticsForVerificationTimeout.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Contains("Verification out of resource", diagnostics[0].Message);
+      Assert.Equal(new Range(0, 31, 0, 53), diagnostics[0].Range);
+    }
+
+    [Fact]
+    public async Task NoFlickeringWhenMixingCorrectAndErrorBatches() {
+      var source = @"
+method {:isolate_assertions} Foo(x: int) {
+  if (x == 0) {
+    assert true;
+  } else if (x == 1) {
+    assert true;
+  } else {
+    assert false;
+  }
+}";
+      var document = await CreateOpenAndWaitForResolve(source);
+      var status1 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      Assert.Equal(PublishedVerificationStatus.Stale, status1.NamedVerifiables[0].Status);
+      var status12 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      Assert.Equal(PublishedVerificationStatus.Queued, status12.NamedVerifiables[0].Status);
+      var status2 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      Assert.Equal(PublishedVerificationStatus.Running, status2.NamedVerifiables[0].Status);
+      var status3 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      Assert.Equal(PublishedVerificationStatus.Error, status3.NamedVerifiables[0].Status);
+      await AssertNoVerificationStatusIsComing(document, CancellationToken);
+    }
+
+    [Fact]
+    public async Task IncrementalBatchDiagnostics() {
+      var source = @"
+method {:isolate_assertions} Foo(x: int) {
+  if (x == 0) {
+    assert false;
+  } else {
+    assert false;
+  }
+}";
+      await CreateOpenAndWaitForResolve(source);
+      var diagnostics1 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(diagnostics1);
+      var diagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Equal(2, diagnostics2.Length);
+    }
+
+    [Fact]
+    public async Task ResolutionErrorInDifferentFileBlocksVerification() {
+      var source = @"
+include ""./semanticError.dfy""
+method Foo() ensures false { 
+  var x := SemanticError.untypedExport; 
+}
+";
+
+      var documentItem = CreateTestDocument(source, Path.Combine(testFilesDirectory, "test.dfy"));
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+
+      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(diagnostics);
+      Assert.Contains("semanticError.dfy", diagnostics[0].Message);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+    [Fact]
+    public async Task GitIssue3155ItemWithSameKeyAlreadyBeenAdded() {
+      var source = @"
+datatype Test =
+    | A(field: int)
+    | B(field: int)
+
+
+predicate updateTest(test: Test, test': Test)
+{
+    test' == test.(field := 1)
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "GitIssue3155ItemWithSameKeyAlreadyBeenAdded.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task GitIssue3062CrashOfLanguageServer() {
+      var source = @"
+function bullspec(s:seq<nat>, u:seq<nat>): (r: nat)
+  requires |s| > 0
+  requires |u| > 0
+  requires |s| == |u|
+  ensures forall i | i < r :: s[i] != u[i]
+  ensures r == |s| || s[r] == u[r]
+{
+  if |s| == 0 then 0 else
+  if |s| == 1 then
+    if s[0]==u[0] 
+    then 1 else 0
+  else
+    if s[0] != u[0] 
+    then bullspec(s[1..],u[1..])
+    else 1+bullspec(s[1..],u[1..])
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "GitIssue3062CrashOfLanguageServer.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      Assert.Equal(PublishedVerificationStatus.Stale, await PopNextStatus());
+      Assert.Equal(PublishedVerificationStatus.Queued, await PopNextStatus());
+      Assert.Equal(PublishedVerificationStatus.Running, await PopNextStatus());
+      Assert.Equal(PublishedVerificationStatus.Error, await PopNextStatus());
+      var diagnostics1 = diagnosticsReceiver.GetLatestAndClearQueue(documentItem);
+      Assert.Equal(4, diagnostics1.Length);
+      ApplyChange(ref documentItem, ((7, 25), (10, 17)), "");
+      await GetNextDiagnostics(documentItem); // Migrated verification diagnostics.
+      var diagnostics2 = await GetNextDiagnostics(documentItem);
+      Assert.Equal(3, diagnostics2.Length);
+      Assert.Equal("Parser", diagnostics2[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics2[0].Severity);
+      ApplyChange(ref documentItem, ((7, 20), (7, 25)), "");
+      Assert.Equal(PublishedVerificationStatus.Stale, await PopNextStatus());
+      Assert.Equal(PublishedVerificationStatus.Queued, await PopNextStatus());
+      Assert.Equal(PublishedVerificationStatus.Running, await PopNextStatus());
+      Assert.Equal(PublishedVerificationStatus.Error, await PopNextStatus());
+      var diagnostics3 = diagnosticsReceiver.GetLatestAndClearQueue(documentItem);
+      Assert.Equal(6, diagnostics3.Length);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningFailingFunctionPreconditionHasRelatedDiagnostics() {
+      var source = @"
+predicate P(i: int) {
+  i <= 0
+}
+
+function {:axiom} Call(i: int): int
+  requires P(i)
+
+method Test(i: int) returns (j: int)
+  requires i > 0
+{
+  return Call(2/i);
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningFailingFunctionPreconditionHasRelatedDiagnostics.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.NotNull(diagnostics[0].RelatedInformation);
+      var relatedInformation =
+        diagnostics[0].RelatedInformation.ToArray();
+      Assert.Equal(2, relatedInformation.Length);
+      Assert.Equal("this proposition could not be proved", relatedInformation[0].Message);
+    }
+
+    [Fact]
+    public async Task OpeningFlawlessDocumentReportsNoDiagnostics() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires y >= 0 && x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningFlawlessDocumentReportsNoDiagnostics.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task RefinementTokensCorrectlyReported() {
+      // git-issue-2402
+      var source = @"
+abstract module M 
+{ 
+    type T(00)
+    const t : T
+    lemma Randomlemma()
+    {
+        forall i:int {}
+    }
+}
+
+module N refines M 
+{
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "RefinementTokensCorrectlyReported.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Equal(2, diagnostics.Length);
+      Assert.Contains(diagnostics, d => d.Message.Contains(
+        "static non-ghost const field 't' of type 'T' (which does not have a default compiled value) must give a defining value"));
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task NoCrashWhenPressingEnterAfterSelectingAllTextAndInputtingText() {
+      var source = @"
+predicate {:opaque} m() {
+  true
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "NoCrashWhenPressingEnterAfterSelectingAllTextAndInputtingText.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      await AssertNoDiagnosticsAreComing(CancellationToken, documentItem);
+      ApplyChange(ref documentItem, ((0, 0), (3, 0)), "\n");
+
+      ApplyChange(ref documentItem, ((1, 0), (1, 0)), "const x := 1");
+      await AssertNoDiagnosticsAreComing(CancellationToken, documentItem);
+    }
+
+    [Fact]
+    public async Task OpeningOpaqueFunctionWorks() {
+      var source = @"
+predicate {:opaque} m() {
+  true
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningOpaqueFunctionWorks.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithSyntaxErrorReportsDiagnosticsWithParserErrors() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int
+  requires y >= 0 && x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithSyntaxErrorReportsDiagnosticsWithParserErrors.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(diagnostics);
+      Assert.Equal("Parser", diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithSemanticErrorReportsDiagnosticsWithSemanticErrors() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires y >= 0 && x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - ""1"");
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithSemanticErrorReportsDiagnosticsWithSemanticErrors.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(diagnostics);
+      Assert.Equal("Resolver", diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithMultipleSemanticErrorsReportsDiagnosticsWithAllSemanticErrors() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires y >= 0 && x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == ""0"" {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - ""1"");
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithMultipleSemanticErrorsReportsDiagnosticsWithAllSemanticErrors.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Equal(2, diagnostics.Length);
+      Assert.Equal("Resolver", diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      Assert.Equal("Resolver", diagnostics[1].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[1].Severity);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithVerificationErrorReportsDiagnosticsWithVerificationErrors() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithVerificationErrorReportsDiagnosticsWithVerificationErrors.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithDefaultParamErrorHighlightsCallSite() {
+      var source = @"
+function test(x: int := 99): bool
+  requires x >= 100
+{
+  false
+}
+
+method A()
+{
+  var b := test();
+} ".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithDefaultParamErrorHighlightsCallSite.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      Assert.Equal(8, diagnostics[0].Range.Start.Line);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithVerificationErrorDoesNotReportDiagnosticsWithVerificationErrorsIfNotVerifyOnChange() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Never));
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithVerificationErrorDoesNotReportDiagnosticsWithVerificationErrorsIfNotVerifyOnChange.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithMultipleVerificationErrorsReportsDiagnosticsWithAllVerificationErrorsAndRelatedInformation() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithMultipleVerificationErrorsReportsDiagnosticsWithAllVerificationErrorsAndRelatedInformation.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Equal(2, diagnostics.Length);
+      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[1].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[1].Severity);
+      Assert.Single(diagnostics[0].RelatedInformation);
+      var relatedInformation = diagnostics[0].RelatedInformation.First();
+      Assert.Equal("this is the postcondition that could not be proved", relatedInformation.Message);
+      Assert.Equal(new Range(new Position(2, 30), new Position(2, 42)), relatedInformation.Location.Range);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task ChangingCorrectDocumentToOneWithSyntaxErrorsReportsTheSyntaxErrors() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires y >= 0 && x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "ChangingCorrectDocumentToOneWithSyntaxErrorsReportsTheSyntaxErrors.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+      ApplyChange(ref documentItem, new Range((0, 53), (0, 54)), "");
+
+      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(diagnostics);
+      Assert.Equal("Parser", diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task ChangingCorrectDocumentToOneWithSyntaxErrorsReportsTheSyntaxErrorsIfNotVerifyOnChange() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires y >= 0 && x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Never));
+      var documentItem = CreateTestDocument(source, "ChangingCorrectDocumentToOneWithSyntaxErrorsReportsTheSyntaxErrorsIfNotVerifyOnChange.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+
+      ApplyChange(ref documentItem, new Range(0, 53, 0, 54), "");
+
+      var diagnostics = await GetNextDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Equal("Parser", diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task ChangingCorrectDocumentToOneWithVerificationErrorsReportsTheVerificationErrors() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires y >= 0 && x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "ChangingCorrectDocumentToOneWithVerificationErrorsReportsTheVerificationErrors.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+
+      ApplyChange(ref documentItem, new Range((8, 30), (8, 31)), "+");
+
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task ChangingCorrectDocumentToOneWithVerificationErrorsDoesNotReportVerificationErrorsIfNotVerifyOnChange() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires y >= 0 && x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Never));
+      var documentItem = CreateTestDocument(source, "ChangingCorrectDocumentToOneWithVerificationErrorsDoesNotReportVerificationErrorsIfNotVerifyOnChange.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+      ApplyChange(ref documentItem, new Range((8, 30), (8, 31)), "+");
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task ApplyingMultipleChangesInDocumentOnlySendsOneReport() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires y >= 0 && x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "ApplyingMultipleChangesInDocumentOnlySendsOneReport.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+      var newVersion = documentItem with { Version = documentItem.Version + 1 };
+      client.DidChangeTextDocument(new DidChangeTextDocumentParams {
+        TextDocument = new OptionalVersionedTextDocumentIdentifier {
+          Uri = newVersion.Uri,
+          Version = newVersion.Version
+        },
+        ContentChanges = new[] {
+          new TextDocumentContentChangeEvent {
+            Range = new Range((0, 53), (0, 54)),
+            Text = ""
+          },
+          new TextDocumentContentChangeEvent {
+            Range = new Range((0, 53), (0, 53)),
+            Text = ")"
+          }
+        }
+      });
+
+      // The test applies a change that introduces a syntax error and fixes it thereafter.
+      // Therefore, we know that the erroneous state was never reported when we now receive
+      // a report without any diagnostics/errors.
+      // Otherwise, we'd have to wait for a signal/diagnostic that should never be sent, e.g.
+      // with a timeout.
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task ClosingDocumentWithSyntaxErrorHidesDiagnosticsBySendingEmptyDiagnostics() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int
+  requires y >= 0 && x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "ClosingDocumentWithSyntaxErrorHidesDiagnosticsBySendingEmptyDiagnostics.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var errorDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(errorDiagnostics);
+      client.DidCloseTextDocument(new DidCloseTextDocumentParams { TextDocument = documentItem });
+      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Empty(diagnostics);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentThatIncludesNonExistentDocumentReportsParserErrorAtInclude() {
+      var source = "include \"doesNotExist.dfy\"";
+      var documentItem = CreateTestDocument(source, Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles/test.dfy"));
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(diagnostics);
+      Assert.Equal("Project", diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      Assert.Equal(new Range((0, 8), (0, 26)), diagnostics[0].Range);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentThatIncludesDocumentWithSyntaxErrorsReportsParserErrorAtInclude() {
+      var source = "include \"syntaxError.dfy\"";
+      var documentItem = CreateTestDocument(source, Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles/test.dfy"));
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(diagnostics);
+      Assert.Equal("Parser", diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      Assert.Equal(new Range((0, 0), (0, 1)), diagnostics[0].Range);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task DoubleIncludesGitHubIssue3599() {
+      var source = @"
+include ""./A.dfy""
+include ""./B.dfy""
+module ModC {
+  lemma Lem() ensures false {}
+}
+";
+      var documentItem = CreateTestDocument(source, Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles/test.dfy"));
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Contains("a postcondition", diagnostics[0].Message);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithSemanticErrorsInIncludeReportsResolverErrorAtIncludeStatement() {
+      var source = "include \"semanticError.dfy\"";
+      var documentItem = CreateTestDocument(source, Path.Combine(testFilesDirectory, "test.dfy"));
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Single(diagnostics);
+      Assert.Equal("Parser", diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      Assert.Equal(new Range((0, 0), (0, 1)), diagnostics[0].Range);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task SavingDocumentWithVerificationErrorDoesNotDiscardDiagnosticsWithVerificationErrorsIfVerifyOnChange() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "SavingDocumentWithVerificationErrorDoesNotDiscardDiagnosticsWithVerificationErrorsIfVerifyOnChange.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var changeDiagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(changeDiagnostics);
+      Assert.Equal(MessageSource.Verifier.ToString(), changeDiagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, changeDiagnostics[0].Severity);
+      client.SaveDocument(documentItem);
+
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task SavingDocumentWithVerificationErrorReportsDiagnosticsWithVerificationErrorsIfVerifyOnSave() {
+      var source = @"
+method Multiply(x: int, y: int) returns (product: int)
+  requires x >= 0
+  decreases y
+  ensures product == x * y && product >= 0
+{
+  if y == 0 {
+    product := 0;
+  } else {
+    var step := Multiply(x, y - 1);
+    product := x + step;
+  }
+}".TrimStart();
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Save));
+      var documentItem = CreateTestDocument(source, "SavingDocumentWithVerificationErrorReportsDiagnosticsWithVerificationErrorsIfVerifyOnSave.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+      client.SaveDocument(documentItem);
+      var saveDiagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(saveDiagnostics);
+      Assert.Equal(MessageSource.Verifier.ToString(), saveDiagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, saveDiagnostics[0].Severity);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithVerificationErrorReportsDiagnosticsWithVerificationErrorsAndNestedRelatedLocations() {
+      var source = @"
+class Test {
+    var a: nat
+    var b: nat
+    var c: nat
+
+    predicate Valid()
+        reads this
+    {
+        && a < b
+        && b < c
+    }
+
+    method Foo()
+        requires Valid()
+        ensures Valid()
+        modifies this
+    {
+        c := 10;
+    }
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithVerificationErrorReportsDiagnosticsWithVerificationErrorsAndNestedRelatedLocations.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      var relatedInformation = diagnostics[0].RelatedInformation.ToArray();
+      Assert.Equal(2, relatedInformation.Length);
+      Assert.Equal("this is the postcondition that could not be proved", relatedInformation[0].Message);
+      Assert.Equal(new Range((14, 16), (14, 23)), relatedInformation[0].Location.Range);
+      Assert.Equal("this proposition could not be proved", relatedInformation[1].Message);
+      Assert.Equal(new Range((9, 11), (9, 16)), relatedInformation[1].Location.Range);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithMultipleVerificationCoresReturnsStableDiagnostics() {
+      var sourceWithHighTimeout = new CancellationTokenSource();
+      sourceWithHighTimeout.CancelAfter(TimeSpan.FromSeconds(240));
+      var cancellationToken = sourceWithHighTimeout.Token;
+
+      var source = @"
+method t0() { assert true; }
+method t1() { assert true; }
+method t2() { assert true; }
+method t3() { assert true; }
+method t4() { assert true; }
+method t5() { assert true; }
+method t6() { assert false; }
+method t7() { assert false; }
+method t8() { assert false; }
+method t9() { assert false; }
+method t10() { assert false; }".TrimStart();
+      await SetUp(options => options.Set(BoogieOptionBag.Cores, 4U));
+      for (int i = 0; i < 10; i++) {
+        diagnosticsReceiver.ClearHistory();
+        var documentItem = CreateTestDocument(source, $"test_{i}.dfy");
+        client.OpenDocument(documentItem);
+        var diagnostics = await GetLastDiagnostics(documentItem);
+        try {
+          AssertM.Equal(5, diagnostics.Length, $"Iteration is {i}");
+        } catch (EqualException) {
+          WriteVerificationHistory();
+        }
+        Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
+        Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+        await AssertNoDiagnosticsAreComing(cancellationToken);
+      }
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithElephantOperatorDoesNotThrowException() {
+      var source = @"
+module {:options ""/functionSyntax:4""} Library {
+  // Library
+  datatype Option<T> = Some(value: T) | None
+  datatype Result<T> = Success(value: T) | Failure(s: string, pos: int) {
+    predicate IsFailure() {
+      Failure?
+    }
+    function PropagateFailure<U>(): Result<U>
+      requires IsFailure()
+    {
+      Failure(s, pos)
+    }
+    function Extract(): T
+      requires !IsFailure()
+    {
+      value
+    }
+  }
+}
+module Parser {
+  import opened Library
+
+  datatype Parser = Parser(expected: string) | Log(p: Parser, message: string)
+  {
+    method {:termination false} Parse(s: string, i: nat)
+      returns (result: Result<(string, nat)>)
+    {
+      if Log? {
+        var v1 :- p.Parse(s, i); // Removing this line makes the language server not crash anymore.
+      }
+      
+      result := Failure(""bam"", i);
+    }
+  }
+}".TrimStart();
+      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
+      diagnosticsReceiver.ClearHistory();
+      var documentItem = CreateTestDocument(source, $"test1.dfy");
+      client.OpenDocument(documentItem);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      AssertM.Equal(0, diagnostics.Count(diagnostic =>
+        diagnostic.Severity != DiagnosticSeverity.Information &&
+        diagnostic.Severity != DiagnosticSeverity.Hint), $"Expected no issue");
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithTimeoutReportsTimeoutDiagnostic() {
+      var source = @"
+function {:unroll 100} Ack(m: nat, n: nat): nat
+  decreases m, n
+{
+  if m == 0 then
+    n + 1
+  else if n == 0 then
+    Ack(m - 1, 1)
+  else
+    Ack(m - 1, Ack(m, n - 1))
+}
+
+method test() {
+  assert Ack(5, 5) == 0;
+}".TrimStart();
+      await SetUp(options => options.Set(BoogieOptionBag.VerificationTimeLimit, 1U));
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithTimeoutReportsTimeoutDiagnostic.dfy");
+      client.OpenDocument(documentItem);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.True(diagnostics.Length is 1 or 2); // Ack and Test sometimes time out at the same time
+      for (var i = 0; i < diagnostics.Length; i++) {
+        Assert.Contains("timed out", diagnostics[i].Message);
+      }
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithComplexExpressionUnderlinesAllOfIt() {
+      var source = @"
+method test(i: int, j: int) {
+  assert i > j || i < j; 
+//^^^^^^^^^^^^^^^^^^^^^^
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithComplexExpressionUnderlinesAllOfIt.dfy");
+      client.OpenDocument(documentItem);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      Assert.Equal(new Range((1, 2), (1, 24)), diagnostics[0].Range);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithFailedCallUnderlinesAllOfIt() {
+      var source = @"
+method test() {
+  other(2, 1);
+//^^^^^^^^^^^^
+}
+
+method other(i: int, j: int)
+  requires i < j {
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithFailedCallUnderlinesAllOfIt.dfy");
+      client.OpenDocument(documentItem);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      Assert.Equal(new Range((1, 2), (1, 14)), diagnostics[0].Range);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task OpeningDocumentWithFailedCallExpressionUnderlinesAllOfIt() {
+      var source = @"
+method test() {
+  var x := 1 + other(2, 1);
+//             ^^^^^^^^^^^
+}
+
+function other(i: int, j: int): int
+  requires i < j {
+  2
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "OpeningDocumentWithFailedCallExpressionUnderlinesAllOfIt.dfy");
+      client.OpenDocument(documentItem);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
+      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
+      Assert.Equal(new Range((1, 15), (1, 26)), diagnostics[0].Range);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task IncrementalVerificationDiagnosticsBetweenMethods() {
+      var source = SlowToVerify + @"
+method test() {
+  assert false;
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "IncrementalVerificationDiagnosticsBetweenMethods.dfy");
+      client.OpenDocument(documentItem);
+      var secondVerificationDiagnostics = await GetLastDiagnostics(documentItem);
+      var firstVerificationDiagnostics = diagnosticsReceiver.History[^2].Diagnostics.Where(d => d.Severity <= DiagnosticSeverity.Warning).ToList();
+      try {
+
+        Assert.Single(firstVerificationDiagnostics);
+        // Second diagnostic is a timeout exception from SlowToVerify
+        Assert.Equal(2, secondVerificationDiagnostics.Length);
+      } catch (OperationCanceledException) {
+        await output.WriteLineAsync($"firstVerificationDiagnostics: {firstVerificationDiagnostics.Stringify()}");
+        WriteVerificationHistory();
+      }
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task IncrementalVerificationDiagnosticsBetweenAssertionsAndWellFormedness() {
+      var source = @"
+method test() 
+  ensures 3 / 0 == 1 {
+  assert false;
+}
+".TrimStart();
+      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
+      var documentItem = CreateTestDocument(source, "IncrementalVerificationDiagnosticsBetweenAssertionsAndWellFormedness.dfy");
+      client.OpenDocument(documentItem);
+
+      var secondVerificationDiagnostics = await GetLastDiagnostics(documentItem);
+      AssertM.Equal(2, secondVerificationDiagnostics.Length, secondVerificationDiagnostics.Stringify());
+      var firstVerificationDiagnostics = diagnosticsReceiver.History[^2].Diagnostics.
+        Where(d => d.Severity <= DiagnosticSeverity.Warning).ToList();
+
+      Assert.Single(firstVerificationDiagnostics);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task NoDiagnosticFlickeringWhenIncremental() {
+      var source = @"
+method test() {
+  assert false;
+}
+method test2() {
+  assert false;
+}
+".TrimStart();
+      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
+      var documentItem = CreateTestDocument(source, "NoDiagnosticFlickeringWhenIncremental.dfy");
+      client.OpenDocument(documentItem);
+      var firstVerificationDiagnostics = await GetNextDiagnostics(documentItem);
+      var secondVerificationDiagnostics = await GetNextDiagnostics(documentItem);
+      Assert.Single(firstVerificationDiagnostics);
+      Assert.Equal(2, secondVerificationDiagnostics.Length);
+
+      ApplyChange(ref documentItem, new Range((1, 9), (1, 14)), "true"); ;
+
+      // Next line should not be needed after resolving https://github.com/dafny-lang/dafny/issues/4377
+      var parseDiagnostics2 = await GetNextDiagnostics(documentItem);
+      var resolutionDiagnostics2 = await GetNextDiagnostics(documentItem);
+      AssertDiagnosticListsAreEqualBesidesMigration(secondVerificationDiagnostics, resolutionDiagnostics2);
+      var firstVerificationDiagnostics2 = await GetLastDiagnostics(documentItem);
+      Assert.Single(firstVerificationDiagnostics2); // Still contains second failing method
+
+      ApplyChange(ref documentItem, new Range((4, 9), (4, 14)), "true");
+
+      // Next line should not be needed after resolving https://github.com/dafny-lang/dafny/issues/4377
+      var parseDiagnostics3 = await GetNextDiagnostics(documentItem);
+      var resolutionDiagnostics3 = await GetNextDiagnostics(documentItem);
+      AssertDiagnosticListsAreEqualBesidesMigration(firstVerificationDiagnostics2, resolutionDiagnostics3);
+      var secondVerificationDiagnostics3 = await GetLastDiagnostics(documentItem);
+      Assert.Empty(secondVerificationDiagnostics3);
+
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+
+    [Fact]
+    public async Task ApplyChangeBeforeVerificationFinishes() {
+      var source = @"
+method test() {
+  assert false;
+}
+".TrimStart() + SlowToVerifyNoLimit;
+      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
+      var documentItem = CreateTestDocument(source, "ApplyChangeBeforeVerificationFinishes.dfy");
+      client.OpenDocument(documentItem);
+      var status = await WaitForStatus(new Range(0, 7, 0, 11), PublishedVerificationStatus.Error);
+      var firstVerificationDiagnostics = diagnosticsReceiver.GetLatestAndClearQueue(documentItem);
+      Assert.Single(firstVerificationDiagnostics);
+
+      // Second verification diagnostics get cancelled.
+      ApplyChange(ref documentItem, new Range((1, 9), (1, 14)), "true");
+
+      // Next line should not be needed after resolving https://github.com/dafny-lang/dafny/issues/4377
+      var parseDiagnostics2 = await GetNextDiagnostics(documentItem);
+      // https://github.com/dafny-lang/dafny/issues/4377
+      var resolutionDiagnostics2 = await GetNextDiagnostics(documentItem);
+      AssertDiagnosticListsAreEqualBesidesMigration(firstVerificationDiagnostics, resolutionDiagnostics2);
+      var secondVerificationDiagnostics2 = await GetLastDiagnostics(documentItem);
+      var firstVerificationDiagnostics2 = diagnosticsReceiver.History[^2].Diagnostics.Where(d => d.Severity <= DiagnosticSeverity.Warning).ToArray();
+      Assert.Empty(firstVerificationDiagnostics2); // Still contains second failing method
+      Assert.Single(secondVerificationDiagnostics2);
+    }
+
+    [Fact]
+    public async Task DoNotMigrateDiagnosticsOfRemovedMethod() {
+      var source = @"
+method test() {
+  assert false;
+}
+method test2() {
+  assert false;
+}
+".TrimStart();
+      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
+      var documentItem = CreateTestDocument(source, "DoNotMigrateDiagnosticsOfRemovedMethod.dfy");
+      client.OpenDocument(documentItem);
+      var firstVerificationDiagnostics = await GetNextDiagnostics(documentItem);
+      var secondVerificationDiagnostics = await GetNextDiagnostics(documentItem);
+      Assert.Single(firstVerificationDiagnostics);
+      Assert.Equal(2, secondVerificationDiagnostics.Length);
+
+      /*
+       * New source becomes
+       * method test() {
+           assert false;
+           assert false;
+         }
+       */
+      ApplyChange(ref documentItem, new Range((2, 0), (4, 0)), "");
+
+      var resolutionDiagnosticsAfter = await GetNextDiagnostics(documentItem);
+      Assert.Single(resolutionDiagnosticsAfter);
+    }
+
+    private static void AssertDiagnosticListsAreEqualBesidesMigration(Diagnostic[] expected, Diagnostic[] actual) {
+      AssertM.Equal(expected.Length, actual.Length, $"expected: {expected.Stringify()}, but was: {actual.Stringify()}");
+      foreach (var t in expected.Zip(actual)) {
+        AssertM.Equal(IdeState.OutdatedPrefix + t.First.Message, t.Second.Message, t.Second.ToString());
+      }
+    }
+
+    [Fact]
+    public async Task DiagnosticsInDifferentImplementationUnderOneNamedVerificationTask() {
+      var source = @"
+method test() 
+  ensures 3 / 0 == 2 {
+  assert false;
+}
+".TrimStart();
+      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
+      var documentItem = CreateTestDocument(source, "DiagnosticsInDifferentImplementationUnderOneNamedVerificationTask.dfy");
+      client.OpenDocument(documentItem);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      AssertM.Equal(2, diagnostics.Length, diagnostics.Stringify());
+    }
+
+    [Fact]
+    public async Task MethodRenameDoesNotAffectMigration() {
+      var source = @"
+method Foo() {
+  assert false;
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "MethodRenameDoesNotAffectMigration.dfy");
+      client.OpenDocument(documentItem);
+      var preChangeDiagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(preChangeDiagnostics);
+      ApplyChange(ref documentItem, new Range(0, 7, 0, 10), "Bar");
+      var resolutionDiagnostics = await GetNextDiagnostics(documentItem);
+      AssertDiagnosticListsAreEqualBesidesMigration(preChangeDiagnostics, resolutionDiagnostics);
+    }
+
+    [Fact]
+    public async Task ModuleRenameDoesNotAffectMigration() {
+      var source = @"
+module Foo {
+  method Bar() {
+    assert false;
+  }
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "ModuleRenameDoesNotAffectMigration.dfy");
+      client.OpenDocument(documentItem);
+      var preChangeDiagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(preChangeDiagnostics);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+      ApplyChange(ref documentItem, new Range(0, 7, 0, 10), "Zap");
+      var resolutionDiagnostics = await GetNextDiagnostics(documentItem);
+      AssertDiagnosticListsAreEqualBesidesMigration(preChangeDiagnostics, resolutionDiagnostics);
+    }
+
+    /**
+     * This test is an indirect way to test performance. It tests that the diagnostics of
+     * resolution, verification task determination, and verification itself, are returned separately.
+     */
+    [Fact]
+    public async Task ResolutionDiagnosticsAreReturnedBeforeComputingVerificationTasks() {
+      var source = @"
+method Foo() { 
+  assert false; 
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "ResolutionDiagnosticsAreReturnedBeforeComputingVerificationTasks.dfy");
+      client.OpenDocument(documentItem);
+      var verificationDiagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(verificationDiagnostics);
+      ApplyChange(ref documentItem, new Range(0, 0, 0, 1), "");
+      var brokenSyntaxDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.True(brokenSyntaxDiagnostics.Length > 1);
+      documentItem = documentItem with { Version = documentItem.Version + 1 };
+      // Fix syntax error and replace method header so verification diagnostics are not migrated.
+      ApplyChange(ref documentItem, new Range(0, 0, 1, 0), "method Bar() {\n");
+      // Next line is made obsolete by resolving https://github.com/dafny-lang/dafny/issues/4377
+      var unnecessaryDiagnostics = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
+      var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
+      Assert.Empty(resolutionDiagnostics.Diagnostics);
+      var translationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      // Verification diagnostics were removed since task no longer exists.
+      Assert.Single(translationDiagnostics);
+      await AssertNoDiagnosticsAreComing(CancellationToken);
+    }
+
+    [Fact]
+    public async Task DiagnosticsAfterSavingWithVerifyOnChange() {
+      var source = @"
+method Foo() { 
+  assert false; 
+}".TrimStart();
+      var documentItem = CreateTestDocument(source, "DiagnosticsAfterSavingWithVerifyOnChange.dfy");
+      client.OpenDocument(documentItem);
+      await client.SaveDocumentAndWaitAsync(documentItem, CancellationToken);
+      var diagnostics1 = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics1);
+      ApplyChange(ref documentItem, new Range(1, 0, 2, 0), "");
+      var diagnostics2 = await GetLastDiagnostics(documentItem);
+      Assert.Empty(diagnostics2);
+    }
+
+    [Fact]
+    public async Task HiddenFunctionHints() {
+      var source = @"
+predicate Outer(x: int) {
+  Inner(x)
+}
+
+predicate Inner(x: int) {
+  x > 3
+}
+
+method {:isolate_assertions} InnerOuterUser() {
+  hide *;
+  assert Outer(0);
+  assert Outer(1) by {
+    reveal Outer;
+  }
+  assert Outer(2) by {
+    reveal Inner;
+  }
+  assert Outer(3) by {
+    reveal Outer, Inner;
+  }
+}
+
+
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "HiddenFunctionHints.dfy");
+      client.OpenDocument(documentItem);
+      var diagnostics = await GetLastDiagnostics(documentItem, minimumSeverity: DiagnosticSeverity.Hint);
+
+      Assert.Equal(6, diagnostics.Length);
+      var sorted = diagnostics.OrderBy(d => d.Range.Start).ToList();
+      for (int index = 0; index < 3; index++) {
+        Assert.Equal(sorted[index * 2].Range, sorted[index * 2 + 1].Range);
+      }
+    }
+
+    [Fact]
+    public async Task HiddenFunctionTooltipBlowup() {
+      var source = @"
+predicate A(x: int) {
+  x < 5
+}
+predicate B(x: int) {
+  x > 3
+}
+predicate P(x: int) {
+  A(x) && B(x)
+}
+
+method {:isolate_assertions} TestIsolateAssertions() {
+  hide *;
+  assert P(3);
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "HiddenFunctionHints.dfy");
+      client.OpenDocument(documentItem);
+      var diagnostics = await GetLastDiagnostics(documentItem, minimumSeverity: DiagnosticSeverity.Hint);
+
+      var infoDiagnostics = diagnostics.Where(d => d.Severity >= DiagnosticSeverity.Information).ToList();
+      Assert.Single(infoDiagnostics);
+    }
+
+    [Fact]
+    public async Task HiddenFunctionTooltipBlowup2() {
+      var source = @"
+predicate A(x: int) {
+  x < 5
+}
+predicate B(x: int) {
+  x > 3
+}
+predicate P(x: int) {
+  A(x) && B(x)
+}
+
+method {:isolate_assertions} TestIsolateAssertions() {
+  hide *;
+  reveal P;
+  assert P(3);
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "HiddenFunctionHints.dfy");
+      client.OpenDocument(documentItem);
+      var diagnostics = await GetLastDiagnostics(documentItem, minimumSeverity: DiagnosticSeverity.Hint);
+
+      var infoDiagnostics = diagnostics.Where(d => d.Severity >= DiagnosticSeverity.Information).ToList();
+      Assert.Single(infoDiagnostics);
+
+      var sorted = diagnostics.OrderBy(d => d.Range.Start).ToList();
+      for (int index = 0; index < sorted.Count / 2; index++) {
+        Assert.Equal(sorted[index * 2].Range, sorted[index * 2 + 1].Range);
+      }
+    }
+
+    [Fact]
+    public async Task HiddenFunctionTooltipBlowup3() {
+      var source = @"
+predicate A(x: int) {
+  x < 7 && C(x)
+}
+predicate B(x: int) {
+  x > 3
+}
+
+predicate C(x: int) {
+  x < 5
+}
+
+predicate P(x: int)
+  requires A(x) && B(x)
+{
+  true
+}
+
+@IsolateAssertions
+method TestIsolateAssertions(x: int) {
+  hide *;
+  reveal P;
+  assert P(x);
+}
+".TrimStart();
+      var documentItem = CreateTestDocument(source, "HiddenFunctionHints.dfy");
+      client.OpenDocument(documentItem);
+      var diagnostics = await GetLastDiagnostics(documentItem, minimumSeverity: DiagnosticSeverity.Hint);
+
+      var infoDiagnostics = diagnostics.Where(d => d.Severity >= DiagnosticSeverity.Information).ToList();
+      Assert.Single(infoDiagnostics);
+    }
+
+    public DiagnosticsTest(ITestOutputHelper output) : base(output) {
+    }
+  }
+}
diff --git a/Source/DafnyLanguageServer.Test/Diagnostics/ProjectFileDiagnosticsTest.cs b/Source/DafnyLanguageServer.Test/Diagnostics/ProjectFileDiagnosticsTest.cs
new file mode 100644
index 00000000000..7802308ba10
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Diagnostics/ProjectFileDiagnosticsTest.cs
@@ -0,0 +1,71 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Xunit;
+using Xunit.Abstractions;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization;
+
+public class ProjectFileDiagnosticsTest : ClientBasedLanguageServerTest {
+
+  [Fact]
+  public async Task ProjectFileErrorIsShown() {
+    var projectFileSource = @"includes = [stringWithoutQuotes]";
+    var projectFile = await CreateOpenAndWaitForResolve(projectFileSource, DafnyProject.FileName);
+    var diagnostics = await GetLastDiagnostics(projectFile, DiagnosticSeverity.Error);
+    Assert.Single(diagnostics);
+    Assert.Equal(new Range(0, 12, 0, 12), diagnostics.First().Range);
+    Assert.Contains("Unexpected token", diagnostics.First().Message);
+  }
+
+  [Fact]
+  public async Task ProjectFileErrorIsShownFromDafnyFile() {
+    var projectFileSource = @"includes = [stringWithoutQuotes]";
+    var directory = GetFreshTempPath();
+    Directory.CreateDirectory(directory);
+    var projectFilePath = Path.Combine(directory, DafnyProject.FileName);
+    await File.WriteAllTextAsync(projectFilePath, projectFileSource);
+    await CreateOpenAndWaitForResolve("method Foo() { }", Path.Combine(directory, "ProjectFileErrorIsShownFromDafnyFile.dfy"));
+    var diagnostics = (await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken));
+    var errors = diagnostics.Diagnostics.Where(d => d.Severity == DiagnosticSeverity.Error).ToList();
+    Assert.Equal(DocumentUri.File(projectFilePath), diagnostics.Uri.GetFileSystemPath());
+    Assert.Single(errors);
+    Assert.Contains(errors, d => d.Message.Contains("Unexpected token"));
+    Directory.Delete(directory, true);
+  }
+
+  [Fact]
+  public async Task IncludeNotFound() {
+    var projectFile = @"
+includes = [""doesNotExist.dfy""]
+".TrimStart();
+
+    var project = CreateAndOpenTestDocument(projectFile, DafnyProject.FileName);
+    var diagnostics = await GetLastDiagnostics(project);
+    Assert.Single(diagnostics);
+    Assert.Contains("no Dafny source files were specified as input", diagnostics[0].Message);
+  }
+
+  [Fact]
+  public async Task LibraryNotFound() {
+    var projectFile = @"
+[options]
+library = [""doesNotExist.dfy""]
+".TrimStart();
+
+    var project = CreateAndOpenTestDocument(projectFile, DafnyProject.FileName);
+    var diagnostics = await GetLastDiagnostics(project, DiagnosticSeverity.Error);
+    Assert.Equal(2, diagnostics.Length);
+    Assert.Contains(diagnostics, d => d.Message.Contains("not found"));
+  }
+
+  public ProjectFileDiagnosticsTest(ITestOutputHelper output, LogLevel dafnyLogLevel = LogLevel.Information)
+    : base(output, dafnyLogLevel) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Diagnostics/PublishedVerificationStatus.cs b/Source/DafnyLanguageServer.Test/Diagnostics/PublishedVerificationStatus.cs
new file mode 100644
index 00000000000..567b746900b
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Diagnostics/PublishedVerificationStatus.cs
@@ -0,0 +1,24 @@
+using Microsoft.Dafny.LanguageServer.Workspace;
+using Xunit;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization;
+
+public class PublishedVerificationStatusTests {
+  [Fact]
+  public void CombineTest() {
+    Assert.Equal(PublishedVerificationStatus.Running,
+      NotificationPublisher.Combine(PublishedVerificationStatus.Stale, PublishedVerificationStatus.Running));
+    Assert.Equal(PublishedVerificationStatus.Running,
+      NotificationPublisher.Combine(PublishedVerificationStatus.Queued, PublishedVerificationStatus.Running));
+    Assert.Equal(PublishedVerificationStatus.Queued,
+      NotificationPublisher.Combine(PublishedVerificationStatus.Stale, PublishedVerificationStatus.Queued));
+    Assert.Equal(PublishedVerificationStatus.Stale,
+      NotificationPublisher.Combine(PublishedVerificationStatus.Stale, PublishedVerificationStatus.Error));
+    Assert.Equal(PublishedVerificationStatus.Running,
+      NotificationPublisher.Combine(PublishedVerificationStatus.Running, PublishedVerificationStatus.Error));
+    Assert.Equal(PublishedVerificationStatus.Running,
+      NotificationPublisher.Combine(PublishedVerificationStatus.Running, PublishedVerificationStatus.Correct));
+    Assert.Equal(PublishedVerificationStatus.Error,
+      NotificationPublisher.Combine(PublishedVerificationStatus.Error, PublishedVerificationStatus.Correct));
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Diagnostics/VerificationDiagnostics.cs b/Source/DafnyLanguageServer.Test/Diagnostics/VerificationDiagnostics.cs
new file mode 100644
index 00000000000..9997e19d060
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Diagnostics/VerificationDiagnostics.cs
@@ -0,0 +1,199 @@
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Castle.Core.Logging;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization;
+
+public class VerificationDiagnostics : ClientBasedLanguageServerTest {
+
+  [Fact]
+  public async Task SubExpression() {
+    var source = @"predicate P(x: int) {
+  Q(x) && Q(x + 3)
+}
+
+predicate Q(x: int) {
+  x > 10 && x < 30
+}
+
+method Foo(x: int) requires P(x) {
+
+}
+
+method Main() {
+  Foo(30);
+}";
+    var document = CreateAndOpenTestDocument(source);
+    var diagnostics = await GetLastDiagnostics(document);
+    Assert.Single(diagnostics);
+    var diagnostic = diagnostics[0];
+    Assert.Contains("a precondition for this call could not be proved", diagnostic.Message);
+    Assert.NotNull(diagnostic.RelatedInformation);
+    var relatedInformation = diagnostic.RelatedInformation.ToList();
+    Assert.Equal(3, relatedInformation.Count);
+    Assert.Contains("this is the precondition that could not be proved", relatedInformation[0].Message);
+    Assert.Contains("this proposition could not be proved", relatedInformation[1].Message);
+    Assert.Contains("this proposition could not be proved", relatedInformation[2].Message);
+  }
+
+  [Fact]
+  public async Task BadSolverPath() {
+    var projectFile = @"
+[options]
+solver-path=""doesNotExist""
+";
+    var program = @"
+method Foo() ensures false { }";
+    var path = Path.GetRandomFileName();
+    var project = CreateAndOpenTestDocument(projectFile, Path.Combine(path, DafnyProject.FileName));
+    var document = CreateAndOpenTestDocument(program, Path.Combine(path, "BadSolverPath.dfy"));
+    await WaitUntilAllStatusAreCompleted(document);
+    var diagnostics = await GetLastDiagnostics(project);
+    Assert.Contains(diagnostics, d => d.Message.Contains("Z3 not found"));
+  }
+
+  [Fact]
+  public async Task Iterator() {
+    var program = @"
+
+class List<T> {
+  ghost var Contents: seq<T>
+  ghost var Repr: set<object>
+
+  var a: array<T>
+  var n: nat
+
+  ghost predicate Valid()
+    reads this, Repr
+    ensures Valid() ==> this in Repr
+  {
+    this in Repr &&
+    a in Repr &&
+    n <= a.Length &&
+    Contents == a[..n]
+  }
+
+  constructor Init()
+    ensures Valid() && fresh(Repr)
+    ensures Contents == []
+  {
+    Contents, n := [], 0;
+    a := new T[0];
+    Repr := {this, a};
+  }
+
+  method Add(t: T)
+    requires Valid()
+    modifies Repr
+    ensures Valid() && fresh(Repr - old(Repr))
+    ensures Contents == old(Contents) + [t]
+  {
+    if (n == a.Length) {
+      var b := new T[2 * a.Length + 1](i requires 0 <= i reads this, a =>
+                                       if i < a.Length then a[i] else t);
+      assert b[..n] == a[..n] == Contents;
+      a, Repr := b, Repr + {b};
+      assert b[..n] == Contents;
+    }
+    a[n], n, Contents := t, n + 1, Contents + [t];
+  }
+}
+
+class Cell { var data: int }
+
+iterator M<T(0)>(l: List<T>, c: Cell) yields (x: T)
+  requires l.Valid()
+  reads l.Repr
+  modifies c
+  yield requires true
+  yield ensures xs <= l.Contents  // this is needed in order for the next line to be well-formed
+  yield ensures x == l.Contents[|xs|-1]
+  ensures xs == l.Contents
+{
+  var i := 0;
+  while i < l.n
+    invariant i <= l.n && i == |xs| && xs <= l.Contents
+  {
+    if (*) { assert l.Valid(); }  // this property is maintained, due to the reads clause
+    if (*) {
+      x := l.a[i]; yield;  // or, equivalently, 'yield l.a[i]'
+      i := i + 1;
+    } else {
+      x, i := l.a[i], i + 1;
+      yield;
+    }
+  }
+}";
+    var document = CreateAndOpenTestDocument(program, "ErrorLimitReached.dfy");
+    await WaitUntilAllStatusAreCompleted(document);
+  }
+
+  [Fact]
+  public async Task ErrorLimitReached() {
+    var source = @"
+method ErrorLimitReached(x: int) {
+  assert x > 0;
+  assert x > 1;
+  assert x > 2;
+  assert x > 3;
+  assert x > 4;
+  assert x > 5;
+  if (*) {
+    assert false;
+  } else {
+    var x := 3 / 2;
+  }
+}".TrimStart();
+    var document = CreateAndOpenTestDocument(source, "ErrorLimitReached.dfy");
+    var diagnostics = await GetLastDiagnostics(document);
+    Assert.Contains(diagnostics, d => d.Message.Contains("Verification hit error limit"));
+  }
+
+  [Fact]
+  public async Task ShowImplicitAssertions() {
+    await SetUp(o => o.Set(CommonOptionBag.ShowAssertions, CommonOptionBag.AssertionShowMode.Implicit));
+
+    var source = @"
+method ImplicitAssertions(x: int) {
+  if (*) {
+    assert false;
+  } else {
+    var x := 3 / 2;
+  }
+}".TrimStart();
+    var document = CreateAndOpenTestDocument(source, "ErrorLimitReached.dfy");
+    var diagnostics = await GetLastDiagnostics(document, DiagnosticSeverity.Hint);
+    Assert.Contains(diagnostics, d => d.Message.Contains("Implicit assertion: non-zero divisor")
+                                      && d.Range == new Range(4, 13, 4, 18));
+    Assert.DoesNotContain(diagnostics, d => d.Message.Contains("Explicit assertion: assert statement"));
+  }
+
+  [Fact]
+  public async Task ShowAllAssertions() {
+    await SetUp(o => o.Set(CommonOptionBag.ShowAssertions, CommonOptionBag.AssertionShowMode.All));
+
+    var source = @"
+method ImplicitAssertions(x: int) {
+  if (*) {
+    assert false;
+  } else {
+    var x := 3 / 2;
+  }
+}".TrimStart();
+    var document = CreateAndOpenTestDocument(source, "ErrorLimitReached.dfy");
+    var diagnostics = await GetLastDiagnostics(document, DiagnosticSeverity.Hint);
+    Assert.Contains(diagnostics, d => d.Message.Contains("Implicit assertion: non-zero divisor"));
+    Assert.Contains(diagnostics, d => d.Message.Contains("Explicit assertion: assert statement")
+                                      && d.Range == new Range(2, 4, 2, 17));
+  }
+
+  public VerificationDiagnostics(ITestOutputHelper output, LogLevel dafnyLogLevel = LogLevel.Information) : base(output, dafnyLogLevel) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Formatting/FormattingTest.cs b/Source/DafnyLanguageServer.Test/Formatting/FormattingTest.cs
index 9b60cddd847..65bb8088f95 100644
--- a/Source/DafnyLanguageServer.Test/Formatting/FormattingTest.cs
+++ b/Source/DafnyLanguageServer.Test/Formatting/FormattingTest.cs
@@ -1,5 +1,6 @@
 
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.Handlers;
@@ -17,6 +18,23 @@ public override async Task InitializeAsync() {
     await SetUp(o => o.ProverOptions.Add("SOLVER=noop"));
   }
 
+  [Fact]
+  public async Task GitIssue4827() {
+    var source = @"
+include ""empty.dfy""
+
+module Main {
+  }
+";
+    var target = @"
+include ""empty.dfy""
+
+module Main {
+}
+";
+    await FormattingWorksFor(source, target, Path.Combine(Directory.GetCurrentDirectory(), "Formatting/TestFiles/FormattingWorksFor.dfy"));
+  }
+
   [Fact]
   public async Task TestFormatting1() {
     var source = @"
@@ -142,16 +160,14 @@ private async Task<List<TextEdit>> RequestFormattingAsync(TextDocumentItem docum
     }
   }
 
-  private async Task FormattingWorksFor(string source, string target = null) {
+  private async Task FormattingWorksFor(string source, string target = null, string filePath = "FormattingWorksFor.dfy") {
     if (target == null) {
       target = source;
     }
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, filePath);
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    CompilationAfterParsing compilation = await Projects.GetLastDocumentAsync(documentItem);
     var edits = await RequestFormattingAsync(documentItem);
     edits.Reverse();
-    Assert.NotNull(compilation);
 
     if (edits.Count == 0) {
       Assert.Equal(target, source);
diff --git a/Source/DafnyLanguageServer.Test/Formatting/TestFiles/empty.dfy b/Source/DafnyLanguageServer.Test/Formatting/TestFiles/empty.dfy
new file mode 100644
index 00000000000..5f282702bb0
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Formatting/TestFiles/empty.dfy
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/GutterStatus/CachedLinearVerificationGutterStatusTester.cs b/Source/DafnyLanguageServer.Test/GutterStatus/CachedLinearVerificationGutterStatusTester.cs
index 3b1bab2c4d8..52338f307c7 100644
--- a/Source/DafnyLanguageServer.Test/GutterStatus/CachedLinearVerificationGutterStatusTester.cs
+++ b/Source/DafnyLanguageServer.Test/GutterStatus/CachedLinearVerificationGutterStatusTester.cs
@@ -22,27 +22,27 @@ public class CachedLinearVerificationGutterStatusTester : LinearVerificationGutt
   public async Task EnsureCachingDoesNotMakeSquigglyLinesToRemain() {
     await SetUp(options => {
       options.Set(BoogieOptionBag.Cores, 1U);
-      options.Set(ServerCommand.VerifySnapshots, 1U);
+      options.Set(LanguageServer.VerifySnapshots, 1U);
     });
     await VerifyTrace(@"
- .  S  S  |  I  $  | :method test() {
- .  S  |  |  I  $  | :  assert true;
- .  S  S  |  I  $  | :  //Replace: 
- .  S  S  |  I  $  | :}", true);
+ .  S  |  I  $  | :method test() {
+ .  S  |  I  $  | :  assert true;
+ .  S  |  I  $  | :  //Replace: 
+ .  S  |  I  $  | :}", true);
   }
 
   [Fact]
   public async Task EnsureCachingDoesNotHideErrors() {
     await SetUp(options => {
       options.Set(BoogieOptionBag.Cores, 1U);
-      options.Set(ServerCommand.VerifySnapshots, 1U);
+      options.Set(LanguageServer.VerifySnapshots, 1U);
     });
     await VerifyTrace(@"
- .  S [S][ ][I][S][S][ ]:method test() {
- .  S [O][O][o][Q][O][O]:  assert true;
- .  S [=][=][-][~][=][=]:  assert false;
- .  S [S][ ][I][S][S][ ]:  //Replace: 
- .  S [S][ ][I][S][S][ ]:}", false, "ensureCachingDoesNotHideErrors.dfy");
+ .  S [ ][I][S][ ]:method test() {
+ .  S [O][o][Q][O]:  assert true;
+ .  S [=][-][~][=]:  assert false;
+ .  S [ ][I][S][ ]:  //Replace: 
+ .  S [ ][I][S][ ]:}", false, "ensureCachingDoesNotHideErrors.dfy");
   }
 
   public CachedLinearVerificationGutterStatusTester(ITestOutputHelper output) : base(output) {
diff --git a/Source/DafnyLanguageServer.Test/GutterStatus/ConcurrentLinearVerificationGutterStatusTester.cs b/Source/DafnyLanguageServer.Test/GutterStatus/ConcurrentLinearVerificationGutterStatusTester.cs
index e5cedcbbef8..d6430856cb1 100644
--- a/Source/DafnyLanguageServer.Test/GutterStatus/ConcurrentLinearVerificationGutterStatusTester.cs
+++ b/Source/DafnyLanguageServer.Test/GutterStatus/ConcurrentLinearVerificationGutterStatusTester.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Dafny.LanguageServer.Workspace;
 using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
 using OmniSharp.Extensions.JsonRpc;
 using Xunit;
@@ -24,15 +25,15 @@ private void NotifyAllVerificationGutterStatusReceivers(VerificationStatusGutter
 
   protected override async Task SetUp(Action<DafnyOptions> modifyOptions) {
     for (var i = 0; i < verificationStatusGutterReceivers.Length; i++) {
-      verificationStatusGutterReceivers[i] = new();
+      verificationStatusGutterReceivers[i] = new(logger);
     }
-    verificationStatusGutterReceiver = new();
+    verificationStatusGutterReceiver = new(logger);
     (client, Server) = await Initialize(options =>
       options
         .AddHandler(DafnyRequestNames.VerificationStatusGutter,
           NotificationHandler.For<VerificationStatusGutter>(NotifyAllVerificationGutterStatusReceivers))
     , o => {
-      o.Set(ServerCommand.LineVerificationStatus, true);
+      o.Set(GutterIconAndHoverVerificationDetailsManager.LineVerificationStatus, true);
       modifyOptions?.Invoke(o);
     });
   }
@@ -44,14 +45,14 @@ public async Task EnsuresManyDocumentsCanBeVerifiedAtOnce() {
     // That way, it can rebuild the trace for every file independently.
     for (var i = 0; i < MaxSimultaneousVerificationTasks; i++) {
       result.Add(VerifyTrace(@"
- .  |  |  |  |  I  |  |  | :predicate F(i: int) {
- .  |  |  |  |  I  |  |  | :  false // Should not be highlighted in gutter.
- .  |  |  |  |  I  |  |  | :}
-    |  |  |  |  I  |  |  | :
- .  .  S [S][ ][I][I][S][ ]:method H()
- .  .  S [=][=][-][-][~][O]:  ensures F(1)
- .  .  S [=][=][-][-][~][=]:{//Replace: { assert false;
- .  .  S [S][ ][I][I][S][ ]:}", false, $"EnsuresManyDocumentsCanBeVerifiedAtOnce{i}.dfy", true, true, verificationStatusGutterReceivers[i]));
+ .  |  |  |  I  |  |  | :predicate F(i: int) {
+ .  |  |  |  I  |  |  | :  false // Should not be highlighted in gutter.
+ .  |  |  |  I  |  |  | :}
+    |  |  |  I  |  |  | :
+ .  .  S [ ][I][I][S][ ]:method H()
+ .  .  S [=][-][-][~][O]:  ensures F(1)
+ .  .  S [=][-][-][~][=]:{//Replace: { assert false;
+ .  .  S [ ][I][I][S][ ]:}", false, $"EnsuresManyDocumentsCanBeVerifiedAtOnce{i}.dfy", true, true, verificationStatusGutterReceivers[i]));
     }
 
     for (var i = 0; i < MaxSimultaneousVerificationTasks; i++) {
diff --git a/Source/DafnyLanguageServer.Test/GutterStatus/LinearRenderingTest.cs b/Source/DafnyLanguageServer.Test/GutterStatus/LinearRenderingTest.cs
index ad6b3eec98e..569ec876d38 100644
--- a/Source/DafnyLanguageServer.Test/GutterStatus/LinearRenderingTest.cs
+++ b/Source/DafnyLanguageServer.Test/GutterStatus/LinearRenderingTest.cs
@@ -9,6 +9,8 @@ public static LineVerificationStatus RenderLineVerificationStatusOriginal(
       bool isSingleLine, bool contextHasErrors, bool contextIsPending,
       CurrentStatus currentStatus, GutterVerificationStatus verificationStatus) {
     return verificationStatus switch {
+      GutterVerificationStatus.Skipped =>
+        LineVerificationStatus.Skipped,
       GutterVerificationStatus.Nothing =>
         currentStatus switch {
           CurrentStatus.Current => LineVerificationStatus.Nothing,
diff --git a/Source/DafnyLanguageServer.Test/GutterStatus/LinearVerificationGutterStatusTester.cs b/Source/DafnyLanguageServer.Test/GutterStatus/LinearVerificationGutterStatusTester.cs
index 0bbf1e16ed8..415890633c8 100644
--- a/Source/DafnyLanguageServer.Test/GutterStatus/LinearVerificationGutterStatusTester.cs
+++ b/Source/DafnyLanguageServer.Test/GutterStatus/LinearVerificationGutterStatusTester.cs
@@ -12,6 +12,7 @@
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Client;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Serilog;
 using Xunit.Abstractions;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
@@ -21,11 +22,10 @@ public abstract class LinearVerificationGutterStatusTester : ClientBasedLanguage
   protected TestNotificationReceiver<VerificationStatusGutter> verificationStatusGutterReceiver;
 
   protected override async Task SetUp(Action<DafnyOptions> modifyOptions) {
-    verificationStatusGutterReceiver = new();
+    verificationStatusGutterReceiver = new(logger);
 
     void ModifyOptions(DafnyOptions options) {
-      options.Set(ServerCommand.LineVerificationStatus, true);
-      options.Set(ServerCommand.ProjectMode, true);
+      options.Set(GutterIconAndHoverVerificationDetailsManager.LineVerificationStatus, true);
       modifyOptions?.Invoke(options);
     }
     await base.SetUp(ModifyOptions);
@@ -276,13 +276,12 @@ public async Task VerifyTrace(string codeAndTrace, bool explicitProject, string
 
     var documentItem = CreateTestDocument(code.Trim(), fileName, 1);
     if (explicitProject) {
-      await CreateAndOpenTestDocument("", Path.Combine(Path.GetDirectoryName(documentItem.Uri.GetFileSystemPath())!, DafnyProject.FileName));
+      await CreateOpenAndWaitForResolve("", Path.Combine(Path.GetDirectoryName(documentItem.Uri.GetFileSystemPath())!, DafnyProject.FileName));
     }
     client.OpenDocument(documentItem);
     var traces = new List<LineVerificationStatus[]>();
     traces.AddRange(await GetAllLineVerificationStatuses(documentItem, verificationStatusGutterReceiver, intermediates: intermediates));
     foreach (var changes in changesList) {
-      await Projects.GetLastDocumentAsync(documentItem).WaitAsync(CancellationToken);
       ApplyChanges(ref documentItem, changes);
       traces.AddRange(await GetAllLineVerificationStatuses(documentItem, verificationStatusGutterReceiver, intermediates: intermediates));
     }
diff --git a/Source/DafnyLanguageServer.Test/GutterStatus/SimpleLinearVerificationGutterStatusTester.cs b/Source/DafnyLanguageServer.Test/GutterStatus/SimpleLinearVerificationGutterStatusTester.cs
index 69276482975..c3ba836b81e 100644
--- a/Source/DafnyLanguageServer.Test/GutterStatus/SimpleLinearVerificationGutterStatusTester.cs
+++ b/Source/DafnyLanguageServer.Test/GutterStatus/SimpleLinearVerificationGutterStatusTester.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
+using Microsoft.Dafny.LanguageServer.Workspace;
 using Microsoft.Extensions.Logging;
 using Xunit;
 using Xunit.Abstractions;
@@ -14,6 +15,60 @@ public class SimpleLinearVerificationGutterStatusTester : LinearVerificationGutt
   // the test will fail and give the correct output that can be use for the test
   // Add '//Replace<n>:' to edit a line multiple times
 
+  [Fact]
+  public async Task GitIssue4656GutterIconsResolutionError() {
+    await VerifyTrace(@"
+   :method Test() {
+/!\:  assert x == 1;
+   :}", false, intermediates: false);
+  }
+
+  [Fact]
+  public async Task GitIssue4432GutterIconsOnly() {
+    await VerifyTrace(@"
+ ? :method NotVerified() { // Should not be highlighted in green
+ ? :  assert 1 == 0;
+ ? :}
+ | :method {:only} Verified() { // Verified
+ | :  assert true;
+ | :}
+ ? :method NotVerified2() { // Should not be highlighted in green
+ ? :  assert 1 == 0;
+ ? :}", false, intermediates: false);
+  }
+
+  [Fact]
+  public async Task ConstantWithoutRhsMarkedAsVerified() {
+    await VerifyTrace(@"
+ | :class Test {
+ | :  const x: int
+ | :
+ | :  method Testing()
+ | :    requires x > 0
+ | :    ensures x != 0
+ | :  {
+ | :  }
+ | :}", false, intermediates: false);
+  }
+
+  [Fact]
+  public async Task Fields() {
+    var markedSource = @"
+| :method Test() {
+| :  assert true;
+| :}
+| :
+| :class A {
+| :  ghost var B: seq<int>
+| :  var C: array<int>
+| :
+| :  method Test() {
+| :    assert true;
+| :  }
+| :}";
+    await VerifyTrace(markedSource, false, intermediates: false);
+  }
+
   [Fact]
   public async Task GitIssue4287GutterHighlightingBroken() {
     await VerifyTrace(@"
@@ -24,12 +79,15 @@ await VerifyTrace(@"
 
   [Fact]
   public async Task GitIssue3821GutterIgnoredProblem() {
+    await SetUp(options => {
+      options.Set(BoogieOptionBag.Cores, 1u);
+    });
     await VerifyTrace(@"
  | :function fib(n: nat): nat {
  | :  if n <= 1 then n else fib(n-1) + fib(n-2)
  | :}
  | :
-[ ]:method {:rlimit 1} Test(s: seq<nat>)
+[ ]:method {:resource_limit 1000} Test(s: seq<nat>)
 [=]:  requires |s| >= 1 && s[0] >= 0 { assert fib(10) == 1; assert {:split_here} s[0] >= 0;
 [ ]:}", true, intermediates: false);
   }
@@ -39,12 +97,12 @@ public async Task NoGutterNotificationsReceivedWhenTurnedOff() {
     var source = @"
 method Foo() ensures false { } ";
     await SetUp(options => {
-      options.Set(ServerCommand.LineVerificationStatus, false);
+      options.Set(GutterIconAndHoverVerificationDetailsManager.LineVerificationStatus, false);
     });
 
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "NoGutterNotificationsReceivedWhenTurnedOff.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    await GetLastDiagnostics(documentItem, CancellationToken);
+    await GetLastDiagnostics(documentItem);
     Assert.False(verificationStatusGutterReceiver.HasPendingNotifications);
   }
 
@@ -60,61 +118,61 @@ await VerifyTrace(@"
   public async Task EnsureVerificationGutterStatusIsWorking() {
     await SetUp(o => o.Set(CommonOptionBag.RelaxDefiniteAssignment, true));
     await VerifyTrace(@"
- .  |  |  |  |  |  I  I  |  |  |  | :predicate Ok() {
- .  |  |  |  |  |  I  I  |  |  |  | :  true
- .  |  |  |  |  |  I  I  |  |  |  | :}
-    |  |  |  |  |  I  I  |  |  |  | :
- .  .  .  S [S][ ][I][I][I][I][S] | :method Test(x: bool) returns (i: int)
- .  .  .  S [=][=][-][-][-][-][~] | :   ensures i == 2
- .  .  .  S [S][ ][I][I][I][I][S] | :{
- .  .  .  S [S][ ][I][I][I][I][S] | :  if x {
- .  .  .  S [S][ ][I][I][I][I][S] | :    i := 2;
- .  .  .  S [=][=][-][-][-][-][~] | :  } else {
- .  .  .  S [S][ ]/!\[I][I][I][S] | :    i := 1; //Replace1:   i := /; //Replace2:    i := 2;
- .  .  .  S [S][ ][I][I][I][I][S] | :  }
- .  .  .  S [S][ ][I][I][I][I][S] | :}
-       |  |  |  |  I  I  I  |  |  | :    
- .  .  |  |  |  |  I  I  I  |  |  | :predicate OkBis() {
- .  .  |  |  |  |  I  I  I  |  |  | :  false
- .  .  |  |  |  |  I  I  I  |  |  | :}", true);
+ .  |  |  |  |  I  I  |  |  |  | :predicate Ok() {
+ .  |  |  |  |  I  I  |  |  |  | :  true
+ .  |  |  |  |  I  I  |  |  |  | :}
+    |  |  |  |  I  I  |  |  |  | :
+ .  .  .  S [ ][I][I][I][I][S] | :method Test(x: bool) returns (i: int)
+ .  .  .  S [=][-][-][-][-][~] | :   ensures i == 2
+ .  .  .  S [ ][I][I][I][I][S] | :{
+ .  .  .  S [ ][I][I][I][I][S] | :  if x {
+ .  .  .  S [ ][I][I][I][I][S] | :    i := 2;
+ .  .  .  S [=][-][-][-][-][~] | :  } else {
+ .  .  .  S [ ]/!\[I][I][I][S] | :    i := 1; //Replace1:   i := /; //Replace2:    i := 2;
+ .  .  .  S [ ][I][I][I][I][S] | :  }
+ .  .  .  S [ ][I][I][I][I][S] | :}
+       |  |  |  I  I  I  |  |  | :    
+ .  .  |  |  |  I  I  I  |  |  | :predicate OkBis() {
+ .  .  |  |  |  I  I  I  |  |  | :  false
+ .  .  |  |  |  I  I  I  |  |  | :}", true);
   }
   [Fact]
   public async Task EnsuresItWorksForSubsetTypes() {
     await VerifyTrace(@"
-    |  |  |  |  |  I  I  |  |  |  |  |  I  I  |  |  |  |  | :// The maximum Id
- .  |  |  |  |  |  I  I  |  |  |  |  |  I  I  |  |  |  |  | :ghost const maxId := 200;
-    |  |  |  |  |  I  I  |  |  |  |  |  I  I  |  |  |  |  | :
- .  .  |  |  |  |  I  I  I  |  |  |  |  I  I  I  |  |  |  | :ghost predicate isIssueIdValid(issueId: int) {
- .  .  |  |  |  |  I  I  I  |  |  |  |  I  I  I  |  |  |  | :  101 <= issueId < maxId
- .  .  |  |  |  |  I  I  I  |  |  |  |  I  I  I  |  |  |  | :}
-       |  |  |  |  I  I  I  |  |  |  |  I  I  I  |  |  |  | :
- .  .  .  S  S  |  I  .  .  .  S  S [=] I  .  .  .  S  S  | :type IssueId = i : int | isIssueIdValid(i)
- .  .  .  S  |  |  I  .  .  .  S  | [=] I  .  .  .  S  |  | :  witness 101 //Replace1:   witness 99 //Replace2:   witness 101 ", false, "EnsuresItWorksForSubsetTypes.dfy");
+    |  |  |  |  I  I  |  |  |  |  I  I  |  |  |  | :// The maximum Id
+ .  |  |  |  |  I  I  |  |  |  |  I  I  |  |  |  | :ghost const maxId := 200;
+    |  |  |  |  I  I  |  |  |  |  I  I  |  |  |  | :
+ .  .  |  |  |  I  I  I  |  |  |  I  I  I  |  |  | :ghost predicate isIssueIdValid(issueId: int) {
+ .  .  |  |  |  I  I  I  |  |  |  I  I  I  |  |  | :  101 <= issueId < maxId
+ .  .  |  |  |  I  I  I  |  |  |  I  I  I  |  |  | :}
+       |  |  |  I  I  I  |  |  |  I  I  I  |  |  | :
+ .  .  .  S  |  I  .  .  .  S [=] I  .  .  .  S  | :type IssueId = i : int | isIssueIdValid(i)
+ .  .  .  S  |  I  .  .  .  S [=] I  .  .  .  S  | :  witness 101 //Replace1:   witness 99 //Replace2:   witness 101 ", false, "EnsuresItWorksForSubsetTypes.dfy");
   }
 
-  [Fact(Timeout = MaxTestExecutionTimeMs)]
+  [Fact]
   public async Task EnsureItWorksForPostconditionsRelatedOutside() {
     await VerifyTrace(@"
- .  |  |  |  | :predicate F(i: int) {
- .  |  |  |  | :  false // Should not be highlighted in gutter.
- .  |  |  |  | :}
-    |  |  |  | :
- .  .  S [S][ ]:method H()
- .  .  S [=][=]:  ensures F(1)
- .  .  S [=][=]:{
- .  .  S [S][ ]:}", true);
+ .  |  |  | :predicate F(i: int) {
+ .  |  |  | :  false // Should not be highlighted in gutter.
+ .  |  |  | :}
+    |  |  | :
+ .  .  S [ ]:method H()
+ .  .  S [=]:  ensures F(1)
+ .  .  S [=]:{
+ .  .  S [ ]:}", true);
   }
 
   [Fact(Timeout = MaxTestExecutionTimeMs * 10)]
   public async Task EnsureNoAssertShowsVerified() {
     for (var i = 0; i < 10; i++) {
       await VerifyTrace(@"
- .  |  |  |  |  I  I  | :predicate P(x: int)
-    |  |  |  |  I  I  | :
- .  .  S [S][ ][I] |  | :method Main() {
- .  .  S [=][=][I] |  | :  ghost var x :| P(x); //Replace:  ghost var x := 1;
- .  .  S [S][ ][I] |  | :}
-                   |  | :// Comment to not trim this line", false, $"EnsureNoAssertShowsVerified{i}.dfy");
+ .  |  |  |  I  I  | :predicate P(x: int)
+    |  |  |  I  I  | :
+ .  .  S [ ][I] |  | :method Main() {
+ .  .  S [=][I] |  | :  ghost var x :| P(x); //Replace:  ghost var x := 1;
+ .  .  S [ ][I] |  | :}
+                |  | :// Comment to not trim this line", false, $"EnsureNoAssertShowsVerified{i}.dfy");
     }
   }
 
@@ -137,89 +195,89 @@ await VerifyTrace(@"
   [Fact/*(Timeout = MaxTestExecutionTimeMs)*/]
   public async Task EnsuresDefaultArgumentsShowsError() {
     await VerifyTrace(@"
- .  S [~][=]:datatype D = T(i: nat := -2)", true);
+ .  S [=]:datatype D = T(i: nat := -2)", true);
   }
 
   [Fact/*(Timeout = MaxTestExecutionTimeMs)*/]
   public async Task TopLevelConstantsHaveToBeVerifiedAlso() {
     await VerifyTrace(@"
-    |  |  |  | :// The following should trigger only one error
- .  |  |  |  | :ghost const a := [1, 2];
-    |  |  |  | :
- .  .  S [~][=]:ghost const b := a[-1];", false);
+    |  |  | :// The following should trigger only one error
+ .  |  |  | :ghost const a := [1, 2];
+    |  |  | :
+ .  .  S [=]:ghost const b := a[-1];", false);
   }
 
   [Fact/*(Timeout = MaxTestExecutionTimeMs)*/]
   public async Task EnsuresAddingNewlinesMigratesPositions() {
     await VerifyTrace(@"
- .  S [S][ ][I][S][ ][I][S][ ]:method f(x: int) {
- .  S [S][ ][I][S][ ][I][S][ ]:  //Replace1:\n  //Replace2:\\n  
- .  S [=][=][I][S][ ][I][S][ ]:  assert x == 2; }
-############[-][~][=][I][S][ ]:
-#####################[-][~][=]:", true, "EnsuresAddingNewlinesMigratesPositions.dfy");
+ .  S [ ][I][S][ ][I][S][ ]:method f(x: int) {
+ .  S [ ][I][S][ ][I][S][ ]:  //Replace1:\n  //Replace2:\\n  
+ .  S [=][I][S][ ][I][S][ ]:  assert x == 2; }
+#########[-][~][=][I][S][ ]:
+##################[-][~][=]:", true, "EnsuresAddingNewlinesMigratesPositions.dfy");
   }
 
   [Fact/*(Timeout = MaxTestExecutionTimeMs)*/]
   public async Task EnsuresWorkWithInformationsAsWell() {
     await SetUp(o => o.Set(CommonOptionBag.RelaxDefiniteAssignment, true));
     await VerifyTrace(@"
- .  S [S][ ][I][S][S][ ]:method f(x: int) returns (y: int)
- .  S [S][ ][I][S][S][ ]:ensures
- .  S [=][=][-][~][=][=]:  x > 3 { y := x;
- .  S [S][ ][I][S][S][ ]:  //Replace1:\n
- .  S [=][=][-][~][=][ ]:  while(y <= 1) invariant y >= 2 {
- .  S [S][ ][-][~][~][=]:    y := y + 1;
- .  S [S][ ][I][S][S][ ]:  }
- .  S [S][ ][I][S][S][ ]:}
-############[I][S][S][ ]:", false);
+ .  S [ ][I][S][ ]:method f(x: int) returns (y: int)
+ .  S [ ][I][S][ ]:ensures
+ .  S [=][-][~][=]:  x > 3 { y := x;
+ .  S [ ][I][S][ ]:  //Replace1:\n
+ .  S [=][-][~][ ]:  while(y <= 1) invariant y >= 2 {
+ .  S [ ][-][~][=]:    y := y + 1;
+ .  S [ ][I][S][ ]:  }
+ .  S [ ][I][S][ ]:}
+#########[I][S][ ]:", false);
   }
 
   [Fact]
   public async Task EnsureMultilineAssertIsCorreclyHandled() {
     await VerifyTrace(@"
- .  S [S][ ]:method x() {
- .  S [=][=]:  assert false
- .  S [=][=]:    || false;
- .  S [S][ ]:}", true);
+ .  S [ ]:method x() {
+ .  S [=]:  assert false
+ .  S [=]:    || false;
+ .  S [ ]:}", true);
   }
 
   [Fact]
   public async Task EnsureBodylessMethodsAreCovered() {
     await VerifyTrace(@"
- .  |  |  |  |  | :method test() {
- .  |  |  |  |  | :}
-    |  |  |  |  | :
- .  .  .  S [S][ ]:method {:extern} test3(a: nat, b: nat)
- .  .  .  S [S][ ]:  ensures true
- .  .  .  S [=][=]:  ensures test2(a - b)
- .  .  .  S [S][ ]:  ensures true
- .  .  .  S [O][O]:  ensures test2(a - b)
- .  .  .  S [S][ ]:  ensures true
-       |  |  |  | :
- .  .  |  |  |  | :predicate test2(x: nat) {
- .  .  |  |  |  | :  true
- .  .  |  |  |  | :}", false);
+ .  |  |  |  | :method test() {
+ .  |  |  |  | :}
+    |  |  |  | :
+ .  .  .  S [ ]:method {:extern} test3(a: nat, b: nat)
+ .  .  .  S [ ]:  ensures true
+ .  .  .  S [=]:  ensures test2(a - b)
+ .  .  .  S [ ]:  ensures true
+ .  .  .  S [O]:  ensures test2(a - b)
+ .  .  .  S [ ]:  ensures true
+       |  |  | :
+ .  .  |  |  | :predicate test2(x: nat) {
+ .  .  |  |  | :  true
+ .  .  |  |  | :}", false);
   }
 
 
   [Fact]
   public async Task EnsureBodylessFunctionsAreCovered() {
     await VerifyTrace(@"
- .  |  |  |  |  | :method test() {
- .  |  |  |  |  | :}
-    |  |  |  |  | :
- .  .  .  S [S][ ]:function {:extern} test4(a: nat, b: nat): nat
- .  .  .  S [S][ ]:  ensures true
- .  .  .  S [=][=]:  ensures test2(a - b)
- .  .  .  S [S][ ]:  ensures true
- .  .  .  S [O][O]:  ensures test2(a - b)
- .  .  .  S [S][ ]:  ensures true
-       |  |  |  | :
- .  .  |  |  |  | :predicate test2(x: nat) {
- .  .  |  |  |  | :  true
- .  .  |  |  |  | :}", true);
+ .  |  |  |  | :method test() {
+ .  |  |  |  | :}
+    |  |  |  | :
+ .  .  .  S [ ]:function {:extern} test4(a: nat, b: nat): nat
+ .  .  .  S [ ]:  ensures true
+ .  .  .  S [=]:  ensures test2(a - b)
+ .  .  .  S [ ]:  ensures true
+ .  .  .  S [O]:  ensures test2(a - b)
+ .  .  .  S [ ]:  ensures true
+       |  |  | :
+ .  .  |  |  | :predicate test2(x: nat) {
+ .  .  |  |  | :  true
+ .  .  |  |  | :}", true);
   }
 
   public SimpleLinearVerificationGutterStatusTester(ITestOutputHelper output) : base(output) {
   }
-}
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Lookup/DocumentSymbolTest.cs b/Source/DafnyLanguageServer.Test/Lookup/DocumentSymbolTest.cs
index 0a85db225df..239244abe25 100644
--- a/Source/DafnyLanguageServer.Test/Lookup/DocumentSymbolTest.cs
+++ b/Source/DafnyLanguageServer.Test/Lookup/DocumentSymbolTest.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
 using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
@@ -11,12 +12,83 @@
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Lookup {
   public class DocumentSymbolTest : ClientBasedLanguageServerTest {
 
+    [Fact]
+    public async Task ExportImport() {
+      var source = @"
+module Low {
+  const x := 3
+}
+
+module High {
+  import Low
+
+  export
+    provides
+      Low
+}
+".TrimStart();
+
+      var documentItem = CreateAndOpenTestDocument(source);
+      var symbols = (await RequestDocumentSymbol(documentItem)).ToList();
+      Assert.Equal(2, symbols.Count);
+    }
+
+    [Fact]
+    public async Task NamelessClass() {
+      var source = @"class {
+  function Foo(): int
+  function Bar(): int
+}";
+      var documentItem = CreateAndOpenTestDocument(source);
+
+      var symbols = (await RequestDocumentSymbol(documentItem)).ToList();
+      Assert.True(symbols.All(s => s.Range.Start.Line >= 0));
+      Assert.True(symbols.All(s => s.SelectionRange.Start.Line >= 0));
+      Assert.True(symbols.All(s => !string.IsNullOrEmpty(s.Name)));
+    }
+
+    [Fact]
+    public async Task NamelessModule() {
+      var source = @"module {
+  function Foo(): int
+  function Bar(): int
+}";
+      var documentItem = CreateAndOpenTestDocument(source);
+
+      var symbols = (await RequestDocumentSymbol(documentItem)).ToList();
+      SymbolsAreValid(symbols);
+    }
+
+    [Fact]
+    public async Task NoCrashOnJustFunction() {
+      var source = "function";
+      var documentItem = CreateAndOpenTestDocument(source);
+
+      var symbols = (await RequestDocumentSymbol(documentItem)).ToList();
+      SymbolsAreValid(symbols);
+    }
+
+    private static void SymbolsAreValid(List<DocumentSymbol> symbols) {
+      Assert.True(symbols.All(s => s.Range.Start.Line >= 0));
+      Assert.True(symbols.All(s => s.SelectionRange.Start.Line >= 0));
+      Assert.True(symbols.All(s => !string.IsNullOrEmpty(s.Name)));
+    }
+
+    [Fact]
+    public async Task NamelessFunction() {
+      var source = "function(): int";
+      var documentItem = CreateAndOpenTestDocument(source);
+
+      var symbols = (await RequestDocumentSymbol(documentItem)).ToList();
+      SymbolsAreValid(symbols);
+    }
+
     [Fact]
     public async Task CanResolveSymbolsForMultiFileProjects() {
-      var temp = Path.GetTempPath();
-      await CreateAndOpenTestDocument("", Path.Combine(temp, DafnyProject.FileName));
-      var file1 = await CreateAndOpenTestDocument("method Foo() {}", Path.Combine(temp, "file1.dfy"));
-      var file2 = await CreateAndOpenTestDocument("method Bar() {}", Path.Combine(temp, "file2.dfy"));
+      var temp = GetFreshTempPath();
+      await CreateOpenAndWaitForResolve("", Path.Combine(temp, DafnyProject.FileName));
+      var file1 = CreateAndOpenTestDocument("method Foo() {}", Path.Combine(temp, "file1.dfy"));
+      var file2 = CreateAndOpenTestDocument("method Bar() {}", Path.Combine(temp, "file2.dfy"));
 
       var fooSymbol = (await RequestDocumentSymbol(file1)).Single();
       Assert.Equal("Foo", fooSymbol.Name);
@@ -34,18 +106,42 @@ method DoIt() returns (x: int) {
   }
 }".TrimStart();
       var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      client.OpenDocument(documentItem);
 
       var symbols = (await RequestDocumentSymbol(documentItem)).ToList();
       Assert.Single(symbols);
-      var aChildren = symbols.First().Children!.ToList();
-      Assert.Single(aChildren);
-      var bChildren = aChildren.First().Children!.ToList();
-      Assert.Single(bChildren);
-      var cChildren = bChildren.First().Children!.ToList();
+      var c = symbols.First();
+      Assert.Equal(new Range(0, 0, 5, 1), c.Range);
+      Assert.Equal(new Range(0, 11, 0, 12), c.SelectionRange);
+      var cChildren = c.Children!.ToList();
       Assert.Single(cChildren);
     }
 
+    [Fact]
+    public async Task DoubleComma() {
+      var source = @"
+  method Foo(a: int,, b: int) returns (x: int) {
+  }".TrimStart();
+      var documentItem = CreateAndOpenTestDocument(source);
+      var allSymbols = await RequestDocumentSymbol(documentItem);
+      Assert.Single(allSymbols);
+    }
+
+    [Fact]
+    public async Task LoadCorrectDocumentCreatesTopLevelSymbols() {
+      var source = @"
+  method DoIt() returns (x: int) {
+  }
+
+  method CallIt() returns () {
+    var x := DoIt();
+  }".TrimStart();
+      var documentItem = CreateAndOpenTestDocument(source);
+      var allSymbols = await RequestDocumentSymbol(documentItem);
+      Assert.Equal(2, allSymbols.Count());
+    }
+
+
     [Fact]
     public async Task LoadCorrectDocumentCreatesSymbols() {
       var source = @"
@@ -59,8 +155,7 @@ method CallIt() returns () {
     var x := DoIt();
   }
 }".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var documentItem = CreateAndOpenTestDocument(source, "LoadCorrectDocumentCreatesSymbols.dfy");
 
       var classSymbol = (await RequestDocumentSymbol(documentItem)).Single();
       var classChildren = classSymbol.Children.ToArray();
@@ -108,8 +203,7 @@ method CallIt() returns () {
     [Fact]
     public async Task CanResolveSymbolsForMethodsWithoutBody() {
       var source = "method DoIt()";
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var documentItem = CreateAndOpenTestDocument(source, "CanResolveSymbolsForMethodsWithoutBody.dfy");
 
       var methodSymbol = (await RequestDocumentSymbol(documentItem)).Single();
       Assert.Equal("DoIt", methodSymbol.Name);
@@ -121,8 +215,7 @@ public async Task CanResolveSymbolsForMethodsWithoutBody() {
     [Fact]
     public async Task CanResolveSymbolsForFunctionWithoutBody() {
       var source = "function ConstOne(): int";
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var documentItem = CreateAndOpenTestDocument(source, "CanResolveSymbolsForFunctionWithoutBody.dfy");
 
       var methodSymbol = (await RequestDocumentSymbol(documentItem)).Single();
       Assert.Equal("ConstOne", methodSymbol.Name);
diff --git a/Source/DafnyLanguageServer.Test/Lookup/GoToDefinitionTest.cs b/Source/DafnyLanguageServer.Test/Lookup/GoToDefinitionTest.cs
index 2d82c173fe1..e8ec7ddd34a 100644
--- a/Source/DafnyLanguageServer.Test/Lookup/GoToDefinitionTest.cs
+++ b/Source/DafnyLanguageServer.Test/Lookup/GoToDefinitionTest.cs
@@ -11,9 +11,117 @@
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Lookup {
   public class GoToDefinitionTest : ClientBasedLanguageServerTest {
 
+    [Fact]
+    public async Task DatatypeFields() {
+      var source = @"
+datatype MultipleFields = MultipleFields(x: int, [>y<]: int)
+
+method Update(m: MultipleFields) {
+  var m2 := m.(><y := 3);
+}".TrimStart();
+      await AssertPositionsLineUpWithRanges(source);
+    }
+
+    [Fact]
+    public async Task ModuleImport1ResolutionErrorInDependency() {
+      var source = @"
+module User {
+ import Us><ed
+ 
+ const x := Used.x
+}
+
+module [>Used<] {
+  const x: bool := 3
+}".TrimStart();
+      await AssertPositionsLineUpWithRanges(source);
+    }
+
+    [Fact]
+    public async Task ResolutionErrorInDependency() {
+      var source = @"
+module User {
+ import Used
+ 
+ const x := Used.><x
+}
+
+module [>Used<] {
+  const x: bool := 3
+}".TrimStart();
+      MarkupTestFile.GetPositionsAndNamedRanges(source, out var cleanSource,
+        out var positions, out var ranges);
+
+      var documentItem = await CreateOpenAndWaitForResolve(cleanSource, null);
+      foreach (var position in positions) {
+        var result = (await RequestDefinition(documentItem, position));
+        Assert.Empty(result);
+      }
+    }
+
+    [Fact]
+    public async Task ResolutionError() {
+      var source = @"
+module User {
+ import Used
+ 
+ const x: bool := Used.><x
+}
+
+module Used {
+  const [>x<] := 3
+}".TrimStart();
+      await AssertPositionsLineUpWithRanges(source);
+    }
+
+    [Fact]
+    public async Task ResolutionErrorInDependent() {
+      var source = @"
+module User {
+ import Used
+ 
+ const x: bool := Used.3
+}
+
+module Used {
+  const [>y<] := 3
+  const x: bool := ><y
+}".TrimStart();
+      await AssertPositionsLineUpWithRanges(source);
+    }
+
+    [Fact]
+    public async Task ModuleImport1() {
+      var source = @"
+module User {
+ import Us><ed
+ 
+ const x := Used.x
+}
+
+module [>Used<] {
+  const x := 3
+}".TrimStart();
+      await AssertPositionsLineUpWithRanges(source);
+    }
+
+    [Fact]
+    public async Task ModuleImport2() {
+      var source = @"
+module User {
+ import Used
+ 
+ const x := Us><ed.x
+}
+
+module [>Used<] {
+  const x := 3
+}".TrimStart();
+      await AssertPositionsLineUpWithRanges(source);
+    }
+
     [Fact]
     public async Task ExplicitProjectToGoDefinitionWorks() {
-      await SetUp(o => o.Set(ServerCommand.ProjectMode, true));
       var sourceA = @"
 const a := 3;
 ".TrimStart();
@@ -23,9 +131,9 @@ public async Task ExplicitProjectToGoDefinitionWorks() {
 ".TrimStart();
 
       var directory = Path.GetRandomFileName();
-      await CreateAndOpenTestDocument("", Path.Combine(directory, DafnyProject.FileName));
-      var aFile = await CreateAndOpenTestDocument(sourceA, Path.Combine(directory, "A.dfy"));
-      var bFile = await CreateAndOpenTestDocument(sourceB, Path.Combine(directory, "B.dfy"));
+      await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
+      var aFile = await CreateOpenAndWaitForResolve(sourceA, Path.Combine(directory, "A.dfy"));
+      var bFile = await CreateOpenAndWaitForResolve(sourceB, Path.Combine(directory, "B.dfy"));
 
       var result1 = await RequestDefinition(bFile, new Position(0, 11));
       Assert.Equal(new Range(0, 6, 0, 7), result1.Single().Location!.Range);
@@ -75,24 +183,6 @@ requires Err?
       await AssertPositionsLineUpWithRanges(source);
     }
 
-    /// <summary>
-    /// Given <paramref name="source"/> with N positions, for each K from 0 to N exclusive,
-    /// assert that a RequestDefinition at position K
-    /// returns either the Kth range, or the range with key K (as a string).
-    /// </summary>
-    private async Task AssertPositionsLineUpWithRanges(string source) {
-      MarkupTestFile.GetPositionsAndNamedRanges(source, out var cleanSource,
-        out var positions, out var ranges);
-
-      var documentItem = await CreateAndOpenTestDocument(cleanSource);
-      for (var index = 0; index < positions.Count; index++) {
-        var position = positions[index];
-        var range = ranges.ContainsKey(string.Empty) ? ranges[string.Empty][index] : ranges[index.ToString()].Single();
-        var result = (await RequestDefinition(documentItem, position)).Single();
-        Assert.Equal(range, result.Location!.Range);
-      }
-    }
-
     [Fact]
     public async Task StaticFunctionCall() {
       var source = @"
@@ -124,7 +214,7 @@ public async Task FunctionCallAndGotoOnDeclaration() {
 
       MarkupTestFile.GetPositionsAndRanges(source, out var cleanSource,
         out var positions, out var ranges);
-      var documentItem = CreateTestDocument(cleanSource);
+      var documentItem = CreateTestDocument(cleanSource, "FunctionCallAndGotoOnDeclaration.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
       var fibonacciSpecOnItself = (await RequestDefinition(documentItem, positions[0]));
@@ -165,7 +255,7 @@ match v><alue {
 
       MarkupTestFile.GetPositionsAndRanges(source, out var cleanSource,
         out var positions, out var ranges);
-      var documentItem = CreateTestDocument(cleanSource);
+      var documentItem = CreateTestDocument(cleanSource, "DatatypesAndMatches.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var matchSource = (await RequestDefinition(documentItem, positions[0])).Single();
       Assert.Equal(ranges[2], matchSource.Location!.Range);
@@ -204,7 +294,7 @@ method DoIt() {
 }".TrimStart();
       MarkupTestFile.GetPositionsAndRanges(source, out var cleanSource,
         out var positions, out var ranges);
-      var documentItem = CreateTestDocument(cleanSource);
+      var documentItem = CreateTestDocument(cleanSource, "JumpToExternModule.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var usizeReference = (await RequestDefinition(documentItem, positions[2])).Single();
       Assert.Equal(documentItem.Uri, usizeReference.Location!.Uri);
@@ -223,7 +313,7 @@ method DoIt() {
     [Fact]
     public async Task JumpToOtherModule() {
       var source = @"
-module Provider {
+module {>2:Provider<} {
   class A {
     var [>x<]: int;
 
@@ -247,7 +337,7 @@ method DoIt() returns (x: int) {
 }
 
 module Consumer2 {
-  import [>Provider<]
+  import Provider
 
   type A2 = Pro><vider.A
 }".TrimStart();
@@ -270,7 +360,7 @@ method CallIts() returns () {
   var x := Container.GetIt();
   Container.DoIt(x);
 }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DefinitionOfMethodInvocationOfMethodDeclaredInSameDocumentReturnsLocation.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
       var containerReference = (await RequestDefinition(documentItem, (9, 11))).Single();
@@ -288,12 +378,12 @@ method CallIts() returns () {
 
     [Fact]
     public async Task DefinitionReturnsBeforeVerificationIsComplete() {
-      var documentItem = CreateTestDocument(NeverVerifies);
+      var documentItem = CreateTestDocument(NeverVerifies, "DefinitionReturnsBeforeVerificationIsComplete.dfy");
       client.OpenDocument(documentItem);
-      var verificationTask = GetLastDiagnostics(documentItem, CancellationToken);
+      var verificationTask = GetLastDiagnostics(documentItem);
       var definitionTask = RequestDefinition(documentItem, (4, 14));
       var first = await Task.WhenAny(verificationTask, definitionTask);
-      Assert.False(verificationTask.IsCompleted);
+      Assert.False(verificationTask.IsCompletedSuccessfully);
       Assert.Same(first, definitionTask);
     }
 
@@ -304,7 +394,7 @@ method DoIt() {
   var x := new int[0];
   var y := x.Length;
 }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DefinitionOfFieldOfSystemTypeReturnsNoLocation.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var locations = await RequestDefinition(documentItem, (2, 14));
       Assert.False(locations.Any());
@@ -333,7 +423,7 @@ public async Task DefinitionOfInvocationOfUnknownFunctionOrMethodReturnsNoLocati
 method DoIt() returns (x: int) {
   return GetX();
 }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DefinitionOfInvocationOfUnknownFunctionOrMethodReturnsNoLocation.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       Assert.False((await RequestDefinition(documentItem, (1, 12))).Any());
     }
@@ -349,7 +439,7 @@ method DoIt() {
     print x;
   }
 }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DefinitionOfVariableShadowingFieldReturnsTheVariable.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var definition = (await RequestDefinition(documentItem, (5, 10))).Single();
       var location = definition.Location;
@@ -368,7 +458,7 @@ method DoIt() {
     print this.x;
   }
 }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DefinitionOfVariableShadowingFieldReturnsTheFieldIfThisIsUsed.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var definition = (await RequestDefinition(documentItem, (5, 15))).Single();
       var location = definition.Location;
@@ -390,7 +480,7 @@ method DoIt() {
     }
   }
 }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DefinitionOfVariableShadowingAnotherVariableReturnsTheShadowingVariable.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var definition = (await RequestDefinition(documentItem, (7, 12))).Single();
       var location = definition.Location;
@@ -412,7 +502,7 @@ method DoIt() {
     print x;
   }
 }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DefinitionOfVariableShadowedByAnotherReturnsTheOriginalVariable.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var definition = (await RequestDefinition(documentItem, (8, 10))).Single();
       var location = definition.Location;
diff --git a/Source/DafnyLanguageServer.Test/Lookup/HoverTest.cs b/Source/DafnyLanguageServer.Test/Lookup/HoverTest.cs
index f3f3914a007..6b0e8e60823 100644
--- a/Source/DafnyLanguageServer.Test/Lookup/HoverTest.cs
+++ b/Source/DafnyLanguageServer.Test/Lookup/HoverTest.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using OmniSharp.Extensions.JsonRpc.Server;
 using Xunit.Abstractions;
 using Xunit;
 using XunitAssertMessages;
@@ -17,7 +18,6 @@ public class HoverTest : ClientBasedLanguageServerTest {
     protected override async Task SetUp(Action<DafnyOptions> modifyOptions = null) {
       void ModifyOptions(DafnyOptions options) {
         options.ProverOptions.Add("SOLVER=noop");
-        options.Set(ServerCommand.ProjectMode, true);
         modifyOptions?.Invoke(options);
       }
 
@@ -36,7 +36,7 @@ private Task<Hover> RequestHover(TextDocumentItem documentItem, Position positio
 
     private async Task AssertHoverContains(TextDocumentItem documentItem, Position hoverPosition, string expectedContent) {
       var hover = await RequestHover(documentItem, hoverPosition);
-      if (expectedContent == "null") {
+      if (expectedContent == "null" || expectedContent == null) {
         Assert.Null(hover);
         return;
       }
@@ -68,9 +68,9 @@ await SetUp(o => {
       var hoverRegex = new Regex(@"\n//\s*(?<ColumnChar>\^)\[(?<ExpectedContent>.*)\](?=\n|$)");
       var source = hoverRegex.Replace(sourceWithHovers, "");
       var hovers = hoverRegex.Matches(sourceWithHovers);
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "AssertHover.dfy");
       if (useProjectFile) {
-        await CreateAndOpenTestDocument("", Path.Combine(Path.GetDirectoryName(documentItem.Uri.GetFileSystemPath())!, DafnyProject.FileName));
+        await CreateOpenAndWaitForResolve("", Path.Combine(Path.GetDirectoryName(documentItem.Uri.GetFileSystemPath())!, DafnyProject.FileName));
       }
       client.OpenDocument(documentItem);
       var lineDelta = 0;
@@ -85,6 +85,55 @@ await SetUp(o => {
       Assert.True(hovers.Count > 0, "No hover expression detected.");
     }
 
+    [Fact]
+    public async Task Crash() {
+      var source = @"
+module M {
+  method m()
+}
+module P refines M {
+  method m ... {
+    while true { ...; }
+  }
+}";
+
+      var document = CreateAndOpenTestDocument(source);
+      var hoverResult = await client.RequestHover(new HoverParams() {
+        Position = new Position(0, 20),
+        TextDocument = document
+      }, CancellationToken);
+      Assert.Null(hoverResult);
+    }
+
+    [Fact]
+    public async Task RecoverableParseErrorTypeRhs() {
+      var markup = @"
+class Bla { }
+
+method Foo() {
+  var ><x := new Bla();
+}
+/".TrimStart();
+      MarkupTestFile.GetPositionAndRanges(markup, out var source, out var position, out _);
+      var document = CreateTestDocument(source);
+      client.OpenDocument(document);
+      var hoverResult = await client.RequestHover(new HoverParams() {
+        Position = position,
+        TextDocument = document
+      }, CancellationToken);
+      Assert.Contains("No hover information available", hoverResult.ToString());
+    }
+
+    [Fact]
+    public async Task RecoverableParseError() {
+      var document = await CreateOpenAndWaitForResolve(@"
+class Foo {
+  const x := '\U2345'
+//      ^[```dafny\nconst x: ?\n```]
+}".TrimStart());
+      await AssertHoverContains(document, new Position(1, 8), "No hover information available due to program error");
+    }
+
     [Fact]
     public async Task HoveringMethodInvocationOfMethodDeclaredInSameDocumentReturnsSignature() {
       await AssertHover(@"
@@ -97,7 +146,6 @@ method CallDoIt() returns () {
 }", true);
     }
 
-
     [Fact]
     public async Task HoveringBoundVariablesFormalsLocalVariablesInMatchExprOrStatement() {
       await AssertHover(@"
@@ -146,10 +194,10 @@ match dt {
 
     [Fact]
     public async Task HoverReturnsBeforeVerificationIsComplete() {
-      var documentItem = CreateTestDocument(NeverVerifies);
+      var documentItem = CreateTestDocument(NeverVerifies, "HoverReturnsBeforeVerificationIsComplete.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
-      var verificationTask = GetLastDiagnostics(documentItem, CancellationToken);
+      var verificationTask = GetLastDiagnostics(documentItem);
       var definitionTask = RequestHover(documentItem, (4, 14));
       var first = await Task.WhenAny(verificationTask, definitionTask);
       Assert.False(verificationTask.IsCompleted);
@@ -522,15 +570,15 @@ predicate pm()
   * @returns 1 no matter what*/
 function g(k: int, l: int): int { 1 }
 
-// No comment for pt
+/** A comment for pt */
 twostate predicate pt() { true }
 
 least predicate pl()
-  // No comment for pl
+  // A comment for pl
 { true }
 
-// A comment for pg
-// That spans two lines
+/** A comment for pg
+  * That spans two lines */
 greatest predicate pg() { true }
 
 /** Returns an integer without guarantee
@@ -554,8 +602,7 @@ static method m() {}
   /** Should be the number of x in C */
   var x: int
 
-  const X: int
-  // The expected number of x
+  const X: int // The expected number of x
 }
 
 function f(): int
@@ -594,9 +641,9 @@ method test(d: D, t: T, e: Even) {
   var x2 := pg();
 //          ^[A comment for pg\nThat spans two lines]
   var x3 := pl();
-//          ^[No comment for pl]
+//          ^[A comment for pl]
   var x4 := pt();
-//          ^[No comment for pt]
+//          ^[A comment for pt]
   var xg := g(0, 1);
 //          ^[Rich comment\n@param k The input\n         that is ignored\n@param l The second input that is ignored\n@returns 1 no matter what]
   C.m(); // TODO
@@ -644,7 +691,7 @@ method test() {
 //         ^[Unformatted comment] // Does not work yet.
   var xf := f();
 //          ^[Rich comment\n|  |  |\n| --- | --- |\n| **Returns** | 1 no matter what |]
-}", true, o => o.Set(CommonOptionBag.UseJavadocLikeDocstringRewriterOption, true));
+}", true, o => o.Set(InternalDocstringRewritersPluginConfiguration.UseJavadocLikeDocstringRewriterOption, true));
     }
   }
 }
diff --git a/Source/DafnyLanguageServer.Test/Lookup/HoverVerificationTest.cs b/Source/DafnyLanguageServer.Test/Lookup/HoverVerificationTest.cs
index 7cce743537e..21a23e4fdab 100644
--- a/Source/DafnyLanguageServer.Test/Lookup/HoverVerificationTest.cs
+++ b/Source/DafnyLanguageServer.Test/Lookup/HoverVerificationTest.cs
@@ -21,15 +21,28 @@ namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Lookup {
   [Collection("Sequential Collection")] // Let slow tests run sequentially
   public class HoverVerificationTest : ClientBasedLanguageServerTest {
 
-    protected override Task SetUp(Action<DafnyOptions> modifyOptions) {
-      return base.SetUp(o => {
-        o.Set(ServerCommand.ProjectMode, true);
-        modifyOptions?.Invoke(o);
-      });
-    }
-
     private const int MaxTestExecutionTimeMs = 30000;
 
+    [Fact(Timeout = MaxTestExecutionTimeMs)]
+    public async Task HoverPutsErrorsFirst() {
+      var documentItem = await GetDocumentItem(@"
+method {:isolate_assertions} Test(x: int, y: int)
+  requires x < y
+{
+  var callIt := giveIt(x, y);
+}
+function giveIt(x: int, y: int): int
+  requires x != y // OK
+  requires 0 < x  // Error
+  requires 0 < y  // OK
+  requires x + 1 < y // Error
+", "HoverPutsErrorsFirst.dfy", true);
+      // When hovering the postcondition, it should display the position of the failing path
+      await AssertVerificationHoverMatches(documentItem, (3, 21),
+        @"**Error:**???**Error:**???**Success:**???**Success:**???"
+      );
+    }
+
     [Fact(Timeout = MaxTestExecutionTimeMs)]
     public async Task HoverGetsBasicAssertionInformation() {
       var documentItem = await GetDocumentItem(@"
@@ -45,7 +58,7 @@ method Abs(x: int) returns (y: int)
 }
 ", "testFile.dfy", true);
       // When hovering the postcondition, it should display the position of the failing path
-      await AssertHoverMatches(documentItem, (2, 15),
+      await AssertVerificationHoverMatches(documentItem, (2, 15),
         @"[**Error:**](???) this postcondition could not be proved on a return path  
 This is assertion #??? of 4 in method `Abs`  
 Resource usage: ??? RU  
@@ -53,18 +66,18 @@ This is assertion #??? of 4 in method `Abs`
       );
       // When hovering the failing path, it does not display the position of the failing postcondition
       // because the IDE extension already does it.
-      await AssertHoverMatches(documentItem, (5, 4),
+      await AssertVerificationHoverMatches(documentItem, (5, 4),
         @"[**Error:**](???) a postcondition could not be proved on this return path  
 Could not prove: `y >= 0`  
 This is assertion #??? of 4 in method `Abs`  
 Resource usage: ??? RU"
       );
-      await AssertHoverMatches(documentItem, (7, 11),
+      await AssertVerificationHoverMatches(documentItem, (7, 11),
         @"[**Error:**](???) assertion could not be proved  
 This is assertion #??? of 4 in method `Abs`  
 Resource usage: ??? RU"
       );
-      await AssertHoverMatches(documentItem, (0, 7),
+      await AssertVerificationHoverMatches(documentItem, (0, 7),
         @"**Verification performance metrics for method `Abs`**:
 
 - Total resource usage: ??? RU  
@@ -88,7 +101,7 @@ ensures Q(x)
 //^ hover #1
 }", Path.Combine(Directory.GetCurrentDirectory(), "Lookup/TestFiles/test.dfy"), false);
       // When hovering the failing path, it should extract text from the included file
-      await AssertHoverMatches(documentItem, (9, 4),
+      await AssertVerificationHoverMatches(documentItem, (9, 4),
         @"[**Error:**](???) a postcondition could not be proved on this return path  
 Inside `Q(x)`  
 Inside `P(i)`  
@@ -105,28 +118,28 @@ await SetUp(o => {
         // LineVerificationStatusOption.Instance.Set(o, true);
       });
       var documentItem = await GetDocumentItem(@"
-method {:vcs_split_on_every_assert} f(x: int) {
+method {:isolate_assertions} f(x: int) {
   assert x >= 2; // Hover #1
   assert x >= 1; // Hover #2
 }
 ", "testfile.dfy", true);
-      await AssertHoverMatches(documentItem, (1, 12),
+      await AssertVerificationHoverMatches(documentItem, (1, 12),
         @"[**Error:**](???) assertion could not be proved  
 This is the only assertion in [batch](???) #??? of ??? in method `f`  
 [Batch](???) #??? resource usage: ??? RU"
       );
-      await AssertHoverMatches(documentItem, (2, 12),
+      await AssertVerificationHoverMatches(documentItem, (2, 12),
         @"<span style='color:green'>**Success:**</span> assertion always holds  
 This is the only assertion in [batch](???) #??? of ??? in method `f`  
 [Batch](???) #??? resource usage: ??? RU"
       );
-      await AssertHoverMatches(documentItem, (0, 36),
+      await AssertVerificationHoverMatches(documentItem, (0, 36),
         @"**Verification performance metrics for method `f`**:
 
 - Total resource usage: ??? RU  
-- Most costly [assertion batches](https://dafny-lang.github.io/dafny/DafnyRef/DafnyRef#sec-verification-attributes-on-assert-statements):  
-  - #???/??? with 1 assertion  at line ???, ??? RU  
-  - #???/??? with 1 assertion  at line ???, ??? RU  "
+- Most costly [assertion batches](https://dafny-lang.github.io/dafny/DafnyRef/DafnyRef#sec-assertion-batches):  
+  - #???/??? with 1 assertion at line ???, ??? RU  
+  - #???/??? with 1 assertion at line ???, ??? RU"
       );
     }
 
@@ -147,19 +160,19 @@ method main(k: int) {
   Test(k);
 }
 ", "testfile.dfy", false);
-      await AssertHoverMatches(documentItem, (6, 6),
+      await AssertVerificationHoverMatches(documentItem, (6, 6),
         @"**Success:**???argument is always even  
 Did prove: `i % 2 == 0`"
       );
-      await AssertHoverMatches(documentItem, (6, 6),
+      await AssertVerificationHoverMatches(documentItem, (6, 6),
         @"**Success:**???the precondition always holds  
 Did prove: `i > 0`"
       );
-      await AssertHoverMatches(documentItem, (7, 6),
+      await AssertVerificationHoverMatches(documentItem, (7, 6),
         @"**Error:**???argument should be even  
 Could not prove: `i % 2 == 0`"
       );
-      await AssertHoverMatches(documentItem, (7, 6),
+      await AssertVerificationHoverMatches(documentItem, (7, 6),
         @"**Error:**???this is the precondition that could not be proved  
 Could not prove: `i > 0`"
       );
@@ -174,12 +187,12 @@ ensures i > 0
 {
   i := j;
 }","testfile.dfy", false);
-      await AssertHoverMatches(documentItem, (3, 0),
+      await AssertVerificationHoverMatches(documentItem, (3, 0),
         @"**Error:**???return value should be even  
 Could not prove: `i % 2 == 0`"
       );
 
-      await AssertHoverMatches(documentItem, (3, 0),
+      await AssertVerificationHoverMatches(documentItem, (3, 0),
         @"**Error:**???a postcondition could not be proved on this return path  
 Could not prove: `i > 0`"
       );
@@ -196,21 +209,21 @@ function f(x: int): int {
   x
 }
 ", "testfile.dfy", false);
-      await AssertHoverMatches(documentItem, (2, 12),
+      await AssertVerificationHoverMatches(documentItem, (2, 12),
         @"???Success??? assertion always holds  
 This is assertion #2 of 2 in [batch](???) #1 of 2 in function `f`  
 [Batch](???) #1 resource usage: ??? RU"
       );
-      await AssertHoverMatches(documentItem, (3, 26),
+      await AssertVerificationHoverMatches(documentItem, (3, 26),
         @"[**Error:**](???) assertion could not be proved  
 This is assertion #1 of 2 in [batch](???) #2 of 2 in function `f`  
 [Batch](???) #2 resource usage: ??? RU"
       );
-      await AssertHoverMatches(documentItem, (0, 36),
+      await AssertVerificationHoverMatches(documentItem, (0, 36),
         @"**Verification performance metrics for function `f`**:
 
 - Total resource usage: ??? RU  
-- Most costly [assertion batches](https://dafny-lang.github.io/dafny/DafnyRef/DafnyRef#sec-verification-attributes-on-assert-statements):  
+- Most costly [assertion batches](https://dafny-lang.github.io/dafny/DafnyRef/DafnyRef#sec-assertion-batches):  
   - #???/2 with 2 assertions at line ???, ??? RU  
   - #???/2 with 2 assertions at line ???, ??? RU"
       );
@@ -222,12 +235,12 @@ public async Task MeaningfulMessageWhenMethodWithoutAssert() {
 method f(x: int) {
   print x;
 }", "testfile.dfy", true);
-      await AssertHoverMatches(documentItem, (0, 7),
+      await AssertVerificationHoverMatches(documentItem, (0, 7),
         @"**Verification performance metrics for method `f`**:
 
 No assertions."
       );
-      await AssertHoverMatches(documentItem, (0, 10),
+      await AssertVerificationHoverMatches(documentItem, (0, 9),
         "```dafny\nx: int\n```");
     }
 
@@ -243,7 +256,7 @@ method Test2(i: int)
   requires i > 0 {
 
 }", "testfile.dfy", false);
-      await AssertHoverMatches(documentItem, (1, 10),
+      await AssertVerificationHoverMatches(documentItem, (1, 10),
         @"???
 Failing precondition:???"
       );
@@ -255,7 +268,7 @@ public async Task MeaningfulMessageWhenMethodWithOneAssert() {
 method f(x: int) {
   assert false;
 }", "testfile1.dfy", true);
-      await AssertHoverMatches(documentItem, (0, 7),
+      await AssertVerificationHoverMatches(documentItem, (0, 7),
         @"**Verification performance metrics for method `f`**:
 
 - Total resource usage: ??? RU  
@@ -271,7 +284,7 @@ method f(x: int) {
   assert false;
   assert false;
 }", "testfile2.dfy", false);
-      await AssertHoverMatches(documentItem, (0, 7),
+      await AssertVerificationHoverMatches(documentItem, (0, 7),
         @"**Verification performance metrics for method `f`**:
 
 - Total resource usage: ??? RU  
@@ -297,15 +310,15 @@ static predicate CanAct(t: Test) requires Valid(t) {
   }
 }
 ", "testfile2.dfy", true);
-      await AssertHoverMatches(documentItem, (4, 20),
+      await AssertVerificationHoverMatches(documentItem, (4, 20),
         @"**Error:**???assertion could not be proved???
 Could not prove: `t.i > 0`  "
       );
-      await AssertHoverMatches(documentItem, (5, 20),
+      await AssertVerificationHoverMatches(documentItem, (5, 20),
         @"**Error:**???assertion could not be proved???
 Could not prove: `t.i > 1`  "
       );
-      await AssertHoverMatches(documentItem, (5, 20),
+      await AssertVerificationHoverMatches(documentItem, (5, 20),
         @"**Success:**???function precondition satisfied???
 Inside `Valid(t)`  
 Did prove: `t.i > 0`  "
@@ -335,7 +348,7 @@ predicate Valid(defaultValue: int := 0) {
   }
 }
 ", "testfile2.dfy", false);
-      await AssertHoverMatches(documentItem, (10, 16),
+      await AssertVerificationHoverMatches(documentItem, (10, 16),
         @"**Error:**???function precondition could not be proved???
 Inside `Valid()`  
 Could not prove: `((this.Tester? || this.Tester2?) && this.next.Valid()) || (this.Test3? && !this.next.Valid())`  "
@@ -361,15 +374,15 @@ method Tester(other: Test) {
 function Id<T>(t: T): T { t }
 
 ", "testfile2.dfy", true);
-      await AssertHoverMatches(documentItem, (9, 20),
+      await AssertVerificationHoverMatches(documentItem, (9, 20),
         @"**Error:**???assertion could not be proved???
 Could not prove: `i > 0`  "
       );
-      await AssertHoverMatches(documentItem, (10, 20),
+      await AssertVerificationHoverMatches(documentItem, (10, 20),
       @"**Error:**???assertion could not be proved???
 Could not prove: `i > 1`  "
     );
-      await AssertHoverMatches(documentItem, (10, 20),
+      await AssertVerificationHoverMatches(documentItem, (10, 20),
         @"**Success:**???function precondition satisfied???
 Inside `Valid()`  
 Did prove: `i > 0`  "
@@ -400,17 +413,17 @@ ensures Q(i, j)
   }
 }
 ", "testfile2.dfy", false);
-      await AssertHoverMatches(documentItem, (12, 11),
+      await AssertVerificationHoverMatches(documentItem, (12, 11),
         @"**Error:**???this postcondition could not be proved on a return path???
 Could not prove: `i == j || -i == j`???
 Return path: testfile2.dfy(18, 5)"
       );
-      await AssertHoverMatches(documentItem, (17, 6),
+      await AssertVerificationHoverMatches(documentItem, (17, 6),
         @"**Error:**???a postcondition could not be proved on this return path???
 Inside `Q(i, j)`???
 Could not prove: `i == j || -i == j`"
       );
-      await AssertHoverMatches(documentItem, (17, 13),
+      await AssertVerificationHoverMatches(documentItem, (17, 13),
         @"**Error:**???function precondition could not be proved???
 Inside `P(i)`???
 Could not prove: `i <= 0`"
@@ -437,7 +450,7 @@ method Test() returns (j: int)
   return 2;
 }
 ", "testfile2.dfy", true);
-      await AssertHoverMatches(documentItem, (14, 5),
+      await AssertVerificationHoverMatches(documentItem, (14, 5),
         @"**Error:**???a postcondition could not be proved on this return path???
 Could not prove: `j == 1`"
       );
@@ -455,20 +468,20 @@ method Test(i: int)
   assert P(1);
 }
 ", "testfile2.dfy", false);
-      await AssertHoverMatches(documentItem, (6, 11),
+      await AssertVerificationHoverMatches(documentItem, (6, 11),
         @"**Error:**???assertion could not be proved  
 Inside `P(1)`  
 Inside `P(1)`  
 Could not prove: `i <= 0`"
       );
       await ApplyChangesAndWaitCompletionAsync(
-        documentItem,
+        ref documentItem,
         new TextDocumentContentChangeEvent {
           Range = ((0, 0), (0, 0)),
           Text = @"/"
         });
-      await AssertHoverMatches(documentItem, (6, 11),
-        null
+      await AssertVerificationHoverMatches(documentItem, (6, 11),
+        "No hover information available due to program error"
       );
     }
     [Fact(Timeout = 5 * MaxTestExecutionTimeMs)]
@@ -476,30 +489,17 @@ public async Task IndicateClickableWarningSignsOnMethodHoverWhenResourceLimitRea
       var documentItem = await GetDocumentItem(@"
 ghost function f(i:nat, j:nat):int {if i == 0 then 0 else f(i - 1, i * j + 1) + f(i - 1, 2 * i * j)}
 
-lemma{:rlimit 10000} L()
+lemma{:resource_limit 10000000} L()
 {
   assert f(10, 5) == 0;
 } ", "testfileSlow.dfy", true);
-      await AssertHoverMatches(documentItem, (2, 22),
+      await AssertVerificationHoverMatches(documentItem, (2, 22),
         @"**Verification performance metrics for method `L`**:
 
 - Total resource usage: ??? RU [⚠](???)"
       );
     }
 
-    private async Task<TextDocumentItem> GetDocumentItem(string source, string filename, bool includeProjectFile) {
-      var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-      source = source.TrimStart();
-      if (includeProjectFile) {
-        var projectFile = CreateTestDocument("", Path.Combine(directory, DafnyProject.FileName));
-        await client.OpenDocumentAndWaitAsync(projectFile, CancellationToken);
-      }
-      var documentItem = CreateTestDocument(source, Path.Combine(directory, filename));
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var document = await Projects.GetLastDocumentAsync(documentItem);
-      Assert.True(document is CompilationAfterResolution);
-      return documentItem;
-    }
 
     public HoverVerificationTest(ITestOutputHelper output) : base(output) {
     }
diff --git a/Source/DafnyLanguageServer.Test/Lookup/ReferencesTest.cs b/Source/DafnyLanguageServer.Test/Lookup/ReferencesTest.cs
index f0111149a20..13eb88004bd 100644
--- a/Source/DafnyLanguageServer.Test/Lookup/ReferencesTest.cs
+++ b/Source/DafnyLanguageServer.Test/Lookup/ReferencesTest.cs
@@ -13,14 +13,17 @@
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Lookup {
   public class ReferencesTest : ClientBasedLanguageServerTest {
     private async Task<LocationContainer> RequestReferences(
-      TextDocumentItem documentItem, Position position) {
+      TextDocumentItem documentItem, Position position, bool includeDeclaration = false) {
       // We don't want resolution errors, but other diagnostics (like a cyclic-include warning) are okay
       await AssertNoResolutionErrors(documentItem);
 
       return await client.RequestReferences(
         new ReferenceParams {
           TextDocument = documentItem.Uri,
-          Position = position
+          Position = position,
+          Context = new ReferenceContext() {
+            IncludeDeclaration = includeDeclaration
+          }
         }, CancellationToken).AsTask();
     }
 
@@ -28,25 +31,117 @@ private async Task<LocationContainer> RequestReferences(
     /// Assert that when finding-references at each cursor position and each regular span,
     /// the client returns all ranges marked with regular spans.
     /// </summary>
-    /// <param name="source"></param>
-    private async Task AssertReferences(string source) {
+    private async Task AssertReferences(string source, string fileName, bool includeDeclaration = false) {
       MarkupTestFile.GetPositionsAndRanges(
         source, out var cleanSource, out var explicitPositions, out var expectedRangesArray);
       var expectedRanges = new HashSet<Range>(expectedRangesArray);
 
-      var positionsFromRanges = expectedRangesArray.SelectMany(r => new[] { r.Start, r.End });
+      var positionsFromRanges = expectedRangesArray.SelectMany(r => new[] {
+        r.Start,
+        new Position(r.End.Line, r.End.Character-1) });
       var allPositions = explicitPositions.Concat(positionsFromRanges);
 
-      var documentItem = CreateTestDocument(cleanSource);
+      var documentItem = CreateTestDocument(cleanSource, fileName);
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      await AssertNoResolutionErrors(documentItem);
 
       foreach (var position in allPositions) {
-        var result = await RequestReferences(documentItem, position);
+        var result = await RequestReferences(documentItem, position, includeDeclaration);
         var resultRanges = result.Select(location => location.Range).ToHashSet();
         Assert.Equal(expectedRanges, resultRanges);
       }
     }
 
+    [Fact]
+    public async Task UnusedModule() {
+      var source = @"
+module [>><C<] {}
+".TrimStart();
+
+      await AssertReferences(source, "ExportNamedImport.dfy", true);
+    }
+
+    [Fact]
+    public async Task ExplicitTypeBoundVariableInLambda() {
+      var source = @"
+datatype ><C = Cons
+method Foo() {
+  var f := (x: [>C<]) => 3;
+  var c: [>C<] := Cons;
+}
+".TrimStart();
+
+      await AssertReferences(source, "ExportNamedImport.dfy");
+    }
+
+    [Fact]
+    public async Task ExportNamedImport() {
+      var source = @"
+module Low {
+  const x := 3
+}
+
+module High {
+  import ><MyLow = Low
+
+  export
+    provides
+      [>MyLow<]
+}
+".TrimStart();
+
+      await AssertReferences(source, "ExportNamedImport.dfy");
+    }
+
+    [Fact]
+    public async Task ExportNamelessImport() {
+      var source = @"
+module ><Low {
+  const x := 3
+}
+
+module High {
+  import [>Low<]
+
+  export
+    provides
+      [>Low<]
+}
+".TrimStart();
+
+      await AssertReferences(source, "ExportImport.dfy");
+    }
+
+    [Fact]
+    public async Task AliasModuleDecl() {
+      var source = @"
+module ><ToAlias {
+  const x := 3
+}
+
+module Aliaser {
+  import Used = [>ToAlias<]
+  import Unused = [>ToAlias<]
+
+  const x := Used.x 
+}
+".TrimStart();
+
+      await AssertReferences(source, "AliasModuleDecl.dfy");
+    }
+
+    [Fact]
+    public async Task FunctionReturnTypeDatatype() {
+      var source = @"
+datatype ><Result<T, Error> = Ok(value: T) | Error(error: Error)
+function Foo(): [>Result<]<int, int> {
+  Ok(1)
+}
+".TrimStart();
+
+      await AssertReferences(source, "FunctionReturnTypeDatatype.dfy");
+    }
+
     [Fact]
     public async Task Const() {
       var source = @"
@@ -59,7 +154,7 @@ method M2() {
 }
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "Const.dfy");
     }
 
     [Fact]
@@ -73,7 +168,7 @@ method M() {
 }
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "Var.dfy");
     }
 
     [Fact]
@@ -89,7 +184,7 @@ method M3() {
 }
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "Method.dfy");
     }
 
     [Fact]
@@ -100,7 +195,7 @@ method M(><x: int) {
 }
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "Parameter.dfy");
     }
 
     [Fact]
@@ -117,7 +212,7 @@ import [>M1<]
 module MR refines [>M1<] {}
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "Module.dfy");
     }
 
     // It seems that datatype declaration/usage information is not tracked
@@ -132,7 +227,7 @@ method M(d: [>D<]) {
 }
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "DatatypeDeclaration.dfy");
     }
 
     [Fact]
@@ -148,7 +243,7 @@ print match l
 }
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "DatatypeConstructor.dfy");
     }
 
     [Fact]
@@ -163,7 +258,7 @@ print match o
 }
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "DatatypeDestructor.dfy");
     }
 
     // It seems that type declaration/usage information is not tracked
@@ -174,7 +269,7 @@ public async Task Type() {
 method M(t: [>T<]) {}
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "Type.dfy");
     }
 
     // It seems that newtype declaration/usage information is not tracked
@@ -185,7 +280,7 @@ public async Task Newtype() {
 method M(t: [>T<]) {}
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "Newtype.dfy");
     }
 
     [Fact]
@@ -195,7 +290,7 @@ public async Task Trait() {
 class C extends [>T<] {}
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "Trait.dfy");
     }
 
     // It seems that class declaration/usage information is not tracked
@@ -206,7 +301,7 @@ class ><C {}
 method M(c: [>C<]) {}
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "ClassDeclaration.dfy");
     }
 
     [Fact]
@@ -221,7 +316,7 @@ method M(c: C) {
 }
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "ClassField.dfy");
     }
 
     [Fact]
@@ -235,7 +330,7 @@ method M(c: C) {
 }
 ".TrimStart();
 
-      await AssertReferences(source);
+      await AssertReferences(source, "ClassMethod.dfy");
     }
 
     [Fact]
diff --git a/Source/DafnyLanguageServer.Test/Lookup/SignatureHelpTest.cs b/Source/DafnyLanguageServer.Test/Lookup/SignatureHelpTest.cs
index cfefeb14e3a..214a41ded2f 100644
--- a/Source/DafnyLanguageServer.Test/Lookup/SignatureHelpTest.cs
+++ b/Source/DafnyLanguageServer.Test/Lookup/SignatureHelpTest.cs
@@ -23,7 +23,7 @@ private async Task<SignatureHelp> RequestSignatureHelpAsync(TextDocumentItem doc
         CancellationToken
       );
       if (result == null && !allowNull) {
-        var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+        var diagnostics = await GetLastDiagnostics(documentItem);
         await output.WriteLineAsync($"diagnostics: {diagnostics.Stringify()}");
         Assert.NotNull(result);
       }
diff --git a/Source/DafnyLanguageServer.Test/Lookup/TestFiles/ProofDependencies/LSPProofDependencyTest.dfy b/Source/DafnyLanguageServer.Test/Lookup/TestFiles/ProofDependencies/LSPProofDependencyTest.dfy
new file mode 100644
index 00000000000..b3266b60248
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Lookup/TestFiles/ProofDependencies/LSPProofDependencyTest.dfy
@@ -0,0 +1,15 @@
+method RedundantAssumeMethod(n: int)
+{
+    // either one or the other assumption shouldn't be covered
+    assume n > 4;
+    assume n > 3;
+    assert n > 1;
+}
+
+method ContradictoryAssumeMethod(n: int)
+{
+    assume n > 0;
+    assume n < 0;
+    assume n == 5; // shouldn't be covered
+    assert n < 10; // shouldn't be covered
+}
diff --git a/Source/DafnyLanguageServer.Test/Lookup/TestFiles/ProofDependencies/dfyconfig.toml b/Source/DafnyLanguageServer.Test/Lookup/TestFiles/ProofDependencies/dfyconfig.toml
new file mode 100644
index 00000000000..573a16d03af
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Lookup/TestFiles/ProofDependencies/dfyconfig.toml
@@ -0,0 +1,3 @@
+[options]
+warn-contradictory-assumptions = true
+warn-redundant-assumptions = true
diff --git a/Source/DafnyLanguageServer.Test/Lookup/TestFiles/defines-foo.dfy b/Source/DafnyLanguageServer.Test/Lookup/TestFiles/defines-foo.dfy
new file mode 100644
index 00000000000..4cf062f840d
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Lookup/TestFiles/defines-foo.dfy
@@ -0,0 +1,3 @@
+method foo() returns (x: int) {
+    x := 42;
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Lookup/TestFiles/includes-foo.dfy b/Source/DafnyLanguageServer.Test/Lookup/TestFiles/includes-foo.dfy
new file mode 100644
index 00000000000..0755137bced
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Lookup/TestFiles/includes-foo.dfy
@@ -0,0 +1,6 @@
+include "defines-foo.dfy"
+
+method bar() returns (x: int) {
+    var temp := foo();
+    x := temp + 2;
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Lookup/WorkspaceSymbolTest.cs b/Source/DafnyLanguageServer.Test/Lookup/WorkspaceSymbolTest.cs
new file mode 100644
index 00000000000..5bc0f9ba29f
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Lookup/WorkspaceSymbolTest.cs
@@ -0,0 +1,142 @@
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using OmniSharp.Extensions.LanguageServer.Protocol.Workspace;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Lookup {
+
+  public class WorkspaceSymbolTest : ClientBasedLanguageServerTest {
+
+    [Fact]
+    public async Task WorkspaceSymbolsAcrossFiles() {
+      var cwd = Directory.GetCurrentDirectory();
+      // These tests are not inlined since a later test uses only "includes-foo.dfy", but not
+      // "defines-foo.dfy" but relies on the former existing. This would complicate
+      // the test setup when inlining the file contents.
+      var pathA = Path.Combine(cwd, "Lookup/TestFiles/defines-foo.dfy");
+      var pathB = Path.Combine(cwd, "Lookup/TestFiles/includes-foo.dfy");
+      var documentItemA = CreateTestDocument(await File.ReadAllTextAsync(pathA), pathA);
+      var documentItemB = CreateTestDocument(await File.ReadAllTextAsync(pathB), pathB);
+
+      await client.OpenDocumentAndWaitAsync(documentItemA, CancellationToken);
+      await client.OpenDocumentAndWaitAsync(documentItemB, CancellationToken);
+
+      var matchesFo = await client.RequestWorkspaceSymbols(
+        new WorkspaceSymbolParams {
+          Query = "fo"
+        }
+      );
+      Assert.Single(matchesFo);
+      Assert.Contains(matchesFo, si => si.Name == "foo" &&
+                                       si.Kind == SymbolKind.Method &&
+                                       si.Location.Uri.ToString().EndsWith("defines-foo.dfy"));
+
+      var matchesBar = await client.RequestWorkspaceSymbols(
+        new WorkspaceSymbolParams {
+          Query = "bar"
+        });
+      Assert.Single(matchesBar);
+      Assert.Contains(matchesBar, si => si.Name == "bar" &&
+                                        si.Kind == SymbolKind.Method &&
+                                        si.Location.Uri.ToString().EndsWith("includes-foo.dfy"));
+    }
+
+    [Fact]
+    public async Task AllRelevantSymbolKindsDetected() {
+      var documentItem = await GetDocumentItem(@"
+
+class TestClass {}
+
+module TestModule {}
+
+function TransparentTestFunction(): int { 42 }
+opaque function OpaqueTestFunction(): int { 42 }
+
+method TestMethod() returns (x: int) {
+  x := 42;
+}
+
+datatype TestDatatype = TestConstructor
+
+trait TestTrait {}
+
+predicate TestPredicate() { false }", "test-workspace-symbols.dfy", false);
+
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+
+      var testSymbols = new List<string> {
+        "TestClass",
+        "TestModule",
+        "TestMethod",
+        "TransparentTestFunction",
+        "OpaqueTestFunction",
+        "TestDatatype",
+        "TestConstructor",
+        "TestTrait",
+        "TestPredicate",
+      };
+
+      var allResponse = await client.RequestWorkspaceSymbols(new WorkspaceSymbolParams {
+        Query = "test"
+      });
+      Assert.Equal(testSymbols.Count, allResponse.Count());
+      foreach (var testSymbol in testSymbols) {
+        var singleResponse = await client.RequestWorkspaceSymbols(new WorkspaceSymbolParams() {
+          Query = testSymbol
+        });
+        Assert.Single(singleResponse);
+        Assert.True(allResponse.Count(symbol => symbol.Name == testSymbol) == 1,
+          $"Could not find {testSymbol}");
+      }
+    }
+
+    [Fact]
+    public async Task SymbolImportedFromUnopenedFileDetected() {
+      var cwd = Directory.GetCurrentDirectory();
+      var path = Path.Combine(cwd, "Lookup/TestFiles/includes-foo.dfy");
+      var documentItem = CreateTestDocument(await File.ReadAllTextAsync(path), path);
+
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+
+      var response = await client.RequestWorkspaceSymbols(new WorkspaceSymbolParams {
+        Query = "foo"
+      });
+      Assert.Single(response);
+      Assert.Contains(response, symbol => symbol.Name == "foo" &&
+                                        symbol.Location.Uri.ToString().EndsWith("defines-foo.dfy"));
+    }
+
+    [Fact]
+    public async Task TwoMatchesOrderedCorrectly() {
+      var documentItem = await GetDocumentItem(@"method longerNameWithFooInIt() returns (x: int) {
+    x := 42;
+}
+
+method prefixFoo() returns (x: int) {
+    x := 23;
+}", "multiple-matches.dfy", false);
+
+
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+
+      var response = await client.RequestWorkspaceSymbols(new WorkspaceSymbolParams {
+        Query = "foo"
+      });
+      var items = response.ToImmutableList();
+      Assert.Equal(2, response.Count());
+      Assert.Contains("prefixFoo", items[0].Name);
+      Assert.Contains("longerNameWithFooInIt", items[1].Name);
+    }
+
+    public WorkspaceSymbolTest(ITestOutputHelper output) : base(output) {
+    }
+
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/MultipleFilesNoProjectTest.cs b/Source/DafnyLanguageServer.Test/MultipleFilesNoProjectTest.cs
index 6bf1cbbffd9..967a888653c 100644
--- a/Source/DafnyLanguageServer.Test/MultipleFilesNoProjectTest.cs
+++ b/Source/DafnyLanguageServer.Test/MultipleFilesNoProjectTest.cs
@@ -6,7 +6,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest; 
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest;
 
 public class MultipleFilesNoProjectTest : ClientBasedLanguageServerTest {
   [Fact]
@@ -33,22 +33,18 @@ method Bar() {
     Assert.Contains("int", consumer1Diagnostics[0].Message);
 
     ApplyChange(ref producerItem, new Range(0, 0, 2, 0), "");
-    var producerDiagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, producerItem);
-    Assert.Single(producerDiagnostics2); // File has no code
 
     var consumer2 = CreateTestDocument(consumerSource, Path.Combine(Directory.GetCurrentDirectory(), "consumer2.dfy"));
     await client.OpenDocumentAndWaitAsync(consumer2, CancellationToken);
-    var consumer2Diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, consumer2);
+    var consumer2Diagnostics = await GetLastDiagnostics(consumer2);
     Assert.True(consumer2Diagnostics.Length > 1);
 
     client.CloseDocument(producerItem);
-    var producerDiagnostics3 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-    Assert.Empty(producerDiagnostics3); // File has no code
     var consumer3 = CreateTestDocument(consumerSource, Path.Combine(Directory.GetCurrentDirectory(), "consumer3.dfy"));
     await client.OpenDocumentAndWaitAsync(consumer3, CancellationToken);
     var consumer3Diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, consumer3);
     Assert.Single(consumer3Diagnostics);
-    Assert.Contains("Unable to open", consumer3Diagnostics[0].Message);
+    Assert.Contains("not found", consumer3Diagnostics[0].Message);
   }
 
   public MultipleFilesNoProjectTest(ITestOutputHelper output) : base(output) {
diff --git a/Source/DafnyLanguageServer.Test/Performance/LargeFilesTest.cs b/Source/DafnyLanguageServer.Test/Performance/LargeFilesTest.cs
new file mode 100644
index 00000000000..62c857c2203
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Performance/LargeFilesTest.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Dafny.LanguageServer.Language.Symbols;
+using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Performance;
+
+public class LargeFilesTest : ClientBasedLanguageServerTest {
+  protected override Task SetUp(Action<DafnyOptions> modifyOptions) {
+    return base.SetUp(options => {
+      modifyOptions?.Invoke(options);
+      // We're setting LineVerificationStatus to false already, with the expectation that this will become the default.
+      options.Set(GutterIconAndHoverVerificationDetailsManager.LineVerificationStatus, false);
+      options.Set(LegacySignatureAndCompletionTable.MigrateSignatureAndCompletionTable, false);
+      options.Set(ProjectManager.UpdateThrottling, ProjectManager.DefaultThrottleTime);
+    });
+  }
+
+  /// <summary>
+  /// When you run this test with a debugger, it grinds to a halt and will appear deadlocked.
+  /// Change all the numbers to smaller values (let's say 1) to workaround this problem.
+  /// 
+  /// This test should complete in less than a second, because it opens a moderately sized file
+  /// on which it makes edits so quickly that the edits should all be processed in a single compilation.
+  /// And a single compilation should complete in less than 200ms.
+  ///
+  /// Right now the test still takes more than 5 seconds.
+  /// To reduce runtime of this test,
+  /// remove ReportRealtimeDiagnostics (since it is called 10 times for each update,
+  /// and calls InitialIdeState, which often calls CompilationAfterResolution.ToIdeState (expensive))
+  /// </summary>
+  [Fact]
+  public async Task QuickEditsInLargeFile() {
+    string GetLineContent(int index) => $"method Foo{index}() {{ assume {{:axiom}} false; }}";
+    var contentBuilder = new StringBuilder();
+    for (int lineNumber = 0; lineNumber < 1000; lineNumber++) {
+      contentBuilder.AppendLine(GetLineContent(lineNumber));
+    }
+    var source = contentBuilder.ToString();
+
+    Exception lastException = null;
+    List<double> timeToScheduleHistory = new();
+    List<double> divisionHistory = new();
+    try {
+      for (int attempt = 0; attempt < 10; attempt++) {
+        var threadPoolSchedulingCancellationToken = new CancellationTokenSource();
+        var threadPoolSchedulingTimeTask = TrackThreadPoolSchedulingTime(threadPoolSchedulingCancellationToken.Token);
+        var beforeOpen = DateTime.Now;
+        var documentItem = await CreateOpenAndWaitForResolve(source, "ManyFastEditsUsingLargeFiles.dfy",
+          cancellationToken: CancellationTokenWithHighTimeout);
+        var afterOpen = DateTime.Now;
+        var openMilliseconds = (afterOpen - beforeOpen).TotalMilliseconds;
+        for (int i = 0; i < 100; i++) {
+          ApplyChange(ref documentItem, new Range(0, 0, 0, 0), "// added this comment\n");
+        }
+
+        await client.WaitForNotificationCompletionAsync(documentItem.Uri, CancellationTokenWithHighTimeout);
+        var afterChange = DateTime.Now;
+        var changeMilliseconds = (afterChange - afterOpen).TotalMilliseconds;
+        await AssertNoDiagnosticsAreComing(CancellationTokenWithHighTimeout);
+        await threadPoolSchedulingCancellationToken.CancelAsync();
+        var averageTimeToSchedule = await threadPoolSchedulingTimeTask;
+        var division = changeMilliseconds / openMilliseconds;
+
+        timeToScheduleHistory.Add(averageTimeToSchedule);
+        divisionHistory.Add(division);
+        // Commented code left in intentionally
+        // await output.WriteLineAsync("openMilliseconds: " + openMilliseconds);
+        // await output.WriteLineAsync("changeMilliseconds: " + changeMilliseconds);
+        // await output.WriteLineAsync("division: " + division);
+        // await output.WriteLineAsync("averageTimeToSchedule: " + averageTimeToSchedule);
+        try {
+          Assert.True(averageTimeToSchedule < 100, $"averageTimeToSchedule: {averageTimeToSchedule}");
+          // Migration should be constant time, which would allow this number to be about 1.
+          // Right now migration is still slow so this has been set to 10 so the test can pass.
+          var changeTimeMultiplier = 15;
+          Assert.True(division < changeTimeMultiplier,
+            $"changeMilliseconds {changeMilliseconds}, openMilliseconds {openMilliseconds}");
+
+          return;
+        } catch (AssertActualExpectedException e) {
+          lastException = e;
+        }
+      }
+    } catch (OperationCanceledException) {
+    }
+
+    logger.LogInformation("Average time to schedule history: \n" + string.Join(", ", timeToScheduleHistory));
+    logger.LogInformation("Division history: \n" + string.Join(", ", divisionHistory));
+    throw lastException!;
+  }
+
+  private async Task<double> TrackThreadPoolSchedulingTime(CancellationToken durationToken) {
+    int ticks = 0;
+    var waitTime = 100;
+    var start = DateTime.Now;
+    while (!durationToken.IsCancellationRequested) {
+      // Measuring the time Task.Run takes is the point of this method.
+      await Task.Run(() => {
+        Thread.Sleep(waitTime);
+      });
+
+      ticks++;
+    }
+
+    var end = DateTime.Now;
+    var span = end - start;
+    var totalSleepTime = ticks * waitTime;
+    var totalSchedulingTime = span.TotalMilliseconds - totalSleepTime;
+    var averageTimeToSchedule = totalSchedulingTime / ticks;
+    // await output.WriteLineAsync($"averageTimeToSchedule: {averageTimeToSchedule:0.##}");
+    return averageTimeToSchedule;
+  }
+
+  public LargeFilesTest(ITestOutputHelper output) : base(output) {
+  }
+}
diff --git a/Source/DafnyLanguageServer.Test/Performance/ThreadUsageTest.cs b/Source/DafnyLanguageServer.Test/Performance/ThreadUsageTest.cs
new file mode 100644
index 00000000000..91a9375cec8
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Performance/ThreadUsageTest.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Extensions.Logging;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Performance;
+
+[Collection("Sequential Collection")]  // Seems to deadlock when run in parallel
+public class ThreadUsageTest : ClientBasedLanguageServerTest {
+
+  [Fact]
+  public async Task NoExtraThreadAfterEachChange() {
+    Exception lastException = null;
+    var history = new List<int>();
+    for (var attempt = 0; attempt < 100; attempt++) {
+      try {
+        var source = "method Foo() { assert false; }";
+        var document = await CreateOpenAndWaitForResolve(source);
+        var threadCountBefore = Process.GetCurrentProcess().Threads.Count;
+        for (var i = 0; i < 10; i++) {
+          ApplyChange(ref document, new Range(0, 0, 0, 0), "//comment" + Environment.NewLine);
+          await GetLastDiagnostics(document);
+        }
+
+        var threadCountAfter = Process.GetCurrentProcess().Threads.Count;
+        const int maxThreadCountIncrease = 5;
+        var difference = threadCountAfter - threadCountBefore;
+        history.Add(difference);
+        Assert.InRange(difference, -maxThreadCountIncrease, maxThreadCountIncrease);
+        return;
+      } catch (InRangeException e) {
+        lastException = e;
+      }
+    }
+
+    logger.LogInformation("Difference history: " + string.Join(", ", history));
+    throw lastException!;
+  }
+
+  public ThreadUsageTest(ITestOutputHelper output, LogLevel dafnyLogLevel = LogLevel.Information)
+    : base(output, dafnyLogLevel) {
+  }
+}
diff --git a/Source/DafnyLanguageServer.Test/ProjectFiles/CompetingProjectFilesTest.cs b/Source/DafnyLanguageServer.Test/ProjectFiles/CompetingProjectFilesTest.cs
index 2036af3fa26..f8dbc0f1ada 100644
--- a/Source/DafnyLanguageServer.Test/ProjectFiles/CompetingProjectFilesTest.cs
+++ b/Source/DafnyLanguageServer.Test/ProjectFiles/CompetingProjectFilesTest.cs
@@ -1,24 +1,20 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Xunit;
 using Xunit.Abstractions;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.ProjectFiles; 
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.ProjectFiles;
 
 public class CompetingProjectFilesTest : ClientBasedLanguageServerTest {
 
-  protected override Task SetUp(Action<DafnyOptions> modifyOptions) {
-    return base.SetUp(o => {
-      o.Set(ServerCommand.ProjectMode, true);
-      modifyOptions?.Invoke(o);
-    });
-  }
-
 
   /// <summary>
   /// A project should only publish diagnostics for uris which it owns,
@@ -27,17 +23,19 @@ protected override Task SetUp(Action<DafnyOptions> modifyOptions) {
   /// </summary>
   [Fact]
   public async Task ProjectFileDoesNotOwnAllSourceFilesItUses() {
-    var tempDirectory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    var tempDirectory = GetFreshTempPath();
     var nestedDirectory = Path.Combine(tempDirectory, "nested");
     Directory.CreateDirectory(nestedDirectory);
     await File.WriteAllTextAsync(Path.Combine(nestedDirectory, "source.dfy"), "hasErrorInSyntax");
     await File.WriteAllTextAsync(Path.Combine(nestedDirectory, DafnyProject.FileName), "");
 
-    await CreateAndOpenTestDocument("", Path.Combine(tempDirectory, DafnyProject.FileName));
+    var project = await CreateOpenAndWaitForResolve("", Path.Combine(tempDirectory, DafnyProject.FileName));
 
-    var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-    Assert.Single(diagnostics);
-    Assert.Contains("the referenced file", diagnostics[0].Message);
+    var diagnostics = await GetLastDiagnostics(project);
+    var errors = diagnostics.Where(d => d.Severity == DiagnosticSeverity.Error).ToList();
+    Assert.Single(errors);
+    Assert.Contains("but is part of a different project", errors[0].Message);
+    Directory.Delete(tempDirectory, true);
   }
 
   public readonly string hasShadowingSource = @"
@@ -54,7 +52,7 @@ method Foo() {
   /// </summary>
   [Fact]
   public async Task NewProjectFileGrabsSourceFileOwnership() {
-    var tempDirectory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    var tempDirectory = GetFreshTempPath();
     var nestedDirectory = Path.Combine(tempDirectory, "nested");
     Directory.CreateDirectory(nestedDirectory);
     var sourceFilePath = Path.Combine(nestedDirectory, "source.dfy");
@@ -69,18 +67,18 @@ public async Task NewProjectFileGrabsSourceFileOwnership() {
     var sourceFile = CreateTestDocument(hasShadowingSource, sourceFilePath);
     await client.OpenDocumentAndWaitAsync(sourceFile, CancellationToken);
 
-    var diagnostics0 = await GetLastDiagnostics(sourceFile, CancellationToken);
+    var diagnostics0 = await GetLastDiagnostics(sourceFile);
     Assert.Single(diagnostics0);
     Assert.Contains("Shadowed", diagnostics0[0].Message);
 
     await File.WriteAllTextAsync(Path.Combine(nestedDirectory, DafnyProject.FileName), "");
-    await Task.Delay(ProjectManagerDatabase.ProjectFileCacheExpiryTime);
 
     ApplyChange(ref sourceFile, new Range(0, 0, 0, 0), "//comment\n");
-    var diagnostics1 = await GetLastDiagnostics(sourceFile, CancellationToken);
+    var diagnostics1 = await GetLastDiagnostics(sourceFile);
     Assert.Empty(diagnostics1);
+    Directory.Delete(tempDirectory, true);
   }
 
-  public CompetingProjectFilesTest(ITestOutputHelper output) : base(output) {
+  public CompetingProjectFilesTest(ITestOutputHelper output) : base(output, LogLevel.Debug) {
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/ProjectFiles/MultipleFilesProjectTest.cs b/Source/DafnyLanguageServer.Test/ProjectFiles/MultipleFilesProjectTest.cs
index aa5afd0651c..df71ac623cc 100644
--- a/Source/DafnyLanguageServer.Test/ProjectFiles/MultipleFilesProjectTest.cs
+++ b/Source/DafnyLanguageServer.Test/ProjectFiles/MultipleFilesProjectTest.cs
@@ -5,6 +5,8 @@
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Xunit;
 using Xunit.Abstractions;
@@ -13,43 +15,6 @@
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.ProjectFiles;
 
 public class MultipleFilesProjectTest : ClientBasedLanguageServerTest {
-  protected override Task SetUp(Action<DafnyOptions> modifyOptions) {
-    return base.SetUp(o => {
-      o.Set(ServerCommand.ProjectMode, true);
-      modifyOptions?.Invoke(o);
-    });
-  }
-
-  [Fact]
-  public async Task NoProjectModeWithProjectFileAndMultipleFiles() {
-    await SetUp(o => {
-      o.Set(ServerCommand.ProjectMode, false);
-    });
-    var producerSource = @"
-method Foo(x: int) { 
-  var y: char := 3.0;
-}
-".TrimStart();
-
-    var consumerSource = @"
-include ""A.dfy""
-method Bar() {
-  Foo(true); 
-}
-";
-
-    var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-    Directory.CreateDirectory(directory);
-    await File.WriteAllTextAsync(Path.Combine(directory, DafnyProject.FileName), "");
-    // The names A and B are important, because A must be alphabetically before B to trigger a particular cache without cloning bug 
-    await File.WriteAllTextAsync(Path.Combine(directory, "A.dfy"), producerSource);
-    await CreateAndOpenTestDocument(consumerSource, Path.Combine(directory, "B.dfy"));
-
-    var consumerDiagnostics = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-    Assert.Equal(2, consumerDiagnostics.Diagnostics.Count());
-    Assert.Contains(consumerDiagnostics.Diagnostics, diagnostic => diagnostic.Message.Contains("bool"));
-    await AssertNoDiagnosticsAreComing(CancellationToken);
-  }
 
   [Fact]
   public async Task OnDiskProducerResolutionErrors() {
@@ -65,19 +30,21 @@ method Bar() {
 }
 ";
 
-    var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    var directory = GetFreshTempPath();
     Directory.CreateDirectory(directory);
     await File.WriteAllTextAsync(Path.Combine(directory, "producer.dfy"), producerSource);
     await File.WriteAllTextAsync(Path.Combine(directory, DafnyProject.FileName), "");
-    await CreateAndOpenTestDocument(consumerSource, Path.Combine(directory, "src/consumer1.dfy"));
+    await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(directory, "src/consumer1.dfy"));
 
     var diagnostics1 = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
     var diagnostics2 = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-    var diagnostics = new[] { diagnostics1, diagnostics2 };
+    var diagnostics3 = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
+    var diagnostics = new[] { diagnostics1, diagnostics2, diagnostics3 };
     Assert.Single(diagnostics1.Diagnostics);
     Assert.Single(diagnostics2.Diagnostics);
     Assert.Contains(diagnostics, d => d.Diagnostics.First().Message.Contains("char"));
     Assert.Contains(diagnostics, d => d.Diagnostics.First().Message.Contains("int"));
+    Directory.Delete(directory, true);
   }
 
   [Fact]
@@ -97,21 +64,22 @@ method Bar() {
 }
 ";
 
-    var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    var directory = GetFreshTempPath();
     Directory.CreateDirectory(directory);
     await File.WriteAllTextAsync(Path.Combine(directory, "OnDiskProducerVerificationErrors_producer.dfy"), producerSource);
     await File.WriteAllTextAsync(Path.Combine(directory, DafnyProject.FileName), "");
-    await CreateAndOpenTestDocument(consumerSource, Path.Combine(directory, "OnDiskProducerVerificationErrors_consumer1.dfy"));
+    var consumer = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(directory, "OnDiskProducerVerificationErrors_consumer1.dfy"));
 
-    var diagnostics1 = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-    Assert.Single(diagnostics1.Diagnostics);
-    Assert.Contains("assertion might not hold", diagnostics1.Diagnostics.First().Message);
+    var diagnostics1 = await GetLastDiagnostics(consumer);
+    Assert.Single(diagnostics1);
+    Assert.Contains("assertion might not hold", diagnostics1.First().Message);
     await AssertNoDiagnosticsAreComing(CancellationToken);
+    Directory.Delete(directory, true);
   }
 
   [Fact]
   public async Task OnDiskProducerVerificationErrorsChangeProject() {
-    await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.ChangeProject));
+    await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.ChangeProject));
 
     var producerSource = @"
 method Foo(x: int) 
@@ -127,26 +95,26 @@ method Bar() {
 }
 ";
 
-    var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    var directory = GetFreshTempPath();
     Directory.CreateDirectory(directory);
-    await File.WriteAllTextAsync(Path.Combine(directory, "OnDiskProducerVerificationErrors_producer.dfy"), producerSource);
+    var producerPath = Path.Combine(directory, "OnDiskProducerVerificationErrors_producer.dfy");
+    var producerUri = DocumentUri.File(producerPath);
+    await File.WriteAllTextAsync(producerPath, producerSource);
     await File.WriteAllTextAsync(Path.Combine(directory, DafnyProject.FileName), "");
-    await CreateAndOpenTestDocument(consumerSource, Path.Combine(directory, "OnDiskProducerVerificationErrors_consumer1.dfy"));
-
-    var diagnostics1 = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-    var diagnostics2 = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-    try {
-      Assert.Single(diagnostics1.Diagnostics);
-      Assert.Contains("assertion might not hold", diagnostics1.Diagnostics.First().Message);
-      Assert.Single(diagnostics2.Diagnostics);
-      Assert.Contains("assertion might not hold", diagnostics2.Diagnostics.First().Message);
-    } catch (Exception) {
-      await output.WriteLineAsync($"diagnostics1: {diagnostics1.Stringify()}");
-      await output.WriteLineAsync($"diagnostics2: {diagnostics2.Stringify()}");
-      var diagnostics3 = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-      await output.WriteLineAsync($"diagnostics3: {diagnostics3.Stringify()}");
-      throw;
-    }
+    var consumer = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(directory, "OnDiskProducerVerificationErrors_consumer1.dfy"));
+
+    var producer = new TextDocumentItem() {
+      Version = null,
+      Uri = producerUri
+    };
+    var consumerDiagnostics = await GetLastDiagnostics(consumer);
+    var producerDiagnostics = await GetLastDiagnostics(producer);
+
+    Assert.Single(consumerDiagnostics);
+    Assert.Contains("assertion might not hold", consumerDiagnostics.First().Message);
+    Assert.Single(producerDiagnostics);
+    Assert.Contains("assertion might not hold", producerDiagnostics.First().Message);
+    Directory.Delete(directory, true);
   }
 
   [Fact]
@@ -161,19 +129,19 @@ method Consumes() {
 method Produces() {}
 ".TrimStart();
 
-    var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    var directory = GetFreshTempPath();
     Directory.CreateDirectory(directory);
-    var consumer = await CreateAndOpenTestDocument(consumerSource, Path.Combine(directory, "firstFile.dfy"));
-    await CreateAndOpenTestDocument(producer, Path.Combine(directory, "secondFile.dfy"));
+    var consumer = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(directory, "firstFile.dfy"));
+    await CreateOpenAndWaitForResolve(producer, Path.Combine(directory, "secondFile.dfy"));
 
     var producesDefinition1 = await RequestDefinition(consumer, new Position(1, 3));
     Assert.Empty(producesDefinition1);
 
     await File.WriteAllTextAsync(Path.Combine(directory, DafnyProject.FileName), "includes = [\"*.dfy\"]");
-    await Task.Delay(ProjectManagerDatabase.ProjectFileCacheExpiryTime);
 
     var producesDefinition2 = await RequestDefinition(consumer, new Position(1, 3));
     Assert.Single(producesDefinition2);
+    Directory.Delete(directory, true);
   }
 
   [Fact]
@@ -189,15 +157,13 @@ method Produces() {}
 ".TrimStart();
 
     var directory = Path.GetRandomFileName();
-    var consumer = await CreateAndOpenTestDocument(consumerSource, Path.Combine(directory, "firstFile.dfy"));
-    var secondFile = await CreateAndOpenTestDocument(producer, Path.Combine(directory, "secondFile.dfy"));
+    var consumer = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(directory, "firstFile.dfy"));
+    var secondFile = await CreateOpenAndWaitForResolve(producer, Path.Combine(directory, "secondFile.dfy"));
 
     var producesDefinition1 = await RequestDefinition(consumer, new Position(1, 3));
     Assert.Empty(producesDefinition1);
 
-    await CreateAndOpenTestDocument("", Path.Combine(directory, DafnyProject.FileName));
-
-    await Task.Delay(ProjectManagerDatabase.ProjectFileCacheExpiryTime);
+    await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
 
     var producesDefinition2 = await RequestDefinition(consumer, new Position(1, 3));
     Assert.Single(producesDefinition2);
@@ -210,8 +176,8 @@ await SetUp(options => {
     });
 
     var directory = Path.GetRandomFileName();
-    var projectFile = await CreateAndOpenTestDocument("", Path.Combine(directory, DafnyProject.FileName));
-    var codeFile = await CreateAndOpenTestDocument("method Foo() {}", Path.Combine(directory, "firstFile.dfy"));
+    var projectFile = await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
+    var codeFile = await CreateOpenAndWaitForResolve("method Foo() {}", Path.Combine(directory, "firstFile.dfy"));
 
     Assert.NotEmpty(Projects.Managers);
 
@@ -243,22 +209,22 @@ method Consumes() {
 method Produces() {}
 ".TrimStart();
 
-    var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    var directory = GetFreshTempPath();
     Directory.CreateDirectory(directory);
     var projectFilePath = Path.Combine(directory, DafnyProject.FileName);
     await File.WriteAllTextAsync(projectFilePath, projectFileSource);
 
-    var consumer = await CreateAndOpenTestDocument(consumerSource, Path.Combine(directory, "firstFile.dfy"));
-    var secondFile = await CreateAndOpenTestDocument(producer, Path.Combine(directory, "secondFile.dfy"));
+    var consumer = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(directory, "firstFile.dfy"));
+    var secondFile = await CreateOpenAndWaitForResolve(producer, Path.Combine(directory, "secondFile.dfy"));
 
     var producesDefinition1 = await RequestDefinition(consumer, new Position(1, 3));
     Assert.Empty(producesDefinition1);
 
     await FileTestExtensions.WriteWhenUnlocked(projectFilePath, @"includes = [""firstFile.dfy"", ""secondFile.dfy""]");
-    await Task.Delay(ProjectManagerDatabase.ProjectFileCacheExpiryTime);
 
     var producesDefinition2 = await RequestDefinition(consumer, new Position(1, 3));
     Assert.Single(producesDefinition2);
+    Directory.Delete(directory, true);
   }
 
   [Fact]
@@ -284,14 +250,13 @@ method Foo() {
 warn-shadowing = true
 ".Trim(); // includes must come before [options], even if there is a blank line
     var directory = Path.GetRandomFileName();
-    var projectFile = await CreateAndOpenTestDocument(projectFileSource, Path.Combine(directory, DafnyProject.FileName));
-    var sourceFile = await CreateAndOpenTestDocument(source, Path.Combine(directory, "src/file.dfy"));
+    var projectFile = await CreateOpenAndWaitForResolve(projectFileSource, Path.Combine(directory, DafnyProject.FileName));
+    var sourceFile = await CreateOpenAndWaitForResolve(source, Path.Combine(directory, "src/file.dfy"));
 
-    var diagnostics1 = await GetLastDiagnostics(sourceFile, CancellationToken);
+    var diagnostics1 = await GetLastDiagnostics(sourceFile);
     Assert.Equal(2, diagnostics1.Count(d => d.Severity <= DiagnosticSeverity.Warning));
     Assert.Contains(diagnostics1, s => s.Message.Contains("Shadowed"));
 
-    await Task.Delay(ProjectManagerDatabase.ProjectFileCacheExpiryTime);
     ApplyChange(ref projectFile, new Range(3, 17, 3, 21), "false");
 
     var resolutionDiagnostics2 = await diagnosticsReceiver.AwaitNextWarningOrErrorDiagnosticsAsync(CancellationToken);
@@ -316,18 +281,18 @@ method Bar() {
 includes = [""src/**/*.dfy""]
 ";
     var directory = Path.GetRandomFileName();
-    var projectFile = await CreateAndOpenTestDocument(projectFileSource, Path.Combine(directory, DafnyProject.FileName));
-    var producerItem = await CreateAndOpenTestDocument(producerSource, Path.Combine(directory, "src/producer.dfy"));
-    var consumer = await CreateAndOpenTestDocument(consumerSource, Path.Combine(directory, "src/consumer1.dfy"));
+    var projectFile = await CreateOpenAndWaitForResolve(projectFileSource, Path.Combine(directory, DafnyProject.FileName));
+    var producerItem = await CreateOpenAndWaitForResolve(producerSource, Path.Combine(directory, "src/producer.dfy"));
+    var consumer = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(directory, "src/consumer1.dfy"));
 
-    var consumerDiagnostics1 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, consumer);
+    var consumerDiagnostics1 = await GetLastDiagnostics(consumer);
     Assert.Single(consumerDiagnostics1);
     Assert.Contains("int", consumerDiagnostics1[0].Message);
 
     ApplyChange(ref producerItem, new Range(0, 14, 0, 17), "bool");
-    var consumerDiagnostics2 = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-    Assert.Equal(consumer.Uri, consumerDiagnostics2.Uri);
-    Assert.Empty(consumerDiagnostics2.Diagnostics);
+    await WaitUntilAllStatusAreCompleted(producerItem);
+    var consumerDiagnostics2 = await GetLastDiagnostics(consumer, allowStale: true);
+    Assert.Empty(consumerDiagnostics2);
   }
 
   [Fact]
@@ -344,30 +309,26 @@ method Bar() {
   var x: int := true; 
 }
 ";
-    var producerItem = await CreateAndOpenTestDocument(producerSource, Path.Combine(Directory.GetCurrentDirectory(), "A.dfy"));
-    var consumer = await CreateAndOpenTestDocument(consumerSource, Path.Combine(Directory.GetCurrentDirectory(), "consumer1.dfy"));
+    var producerItem = await CreateOpenAndWaitForResolve(producerSource, Path.Combine(Directory.GetCurrentDirectory(), "A.dfy"));
+    var consumer = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(Directory.GetCurrentDirectory(), "consumer1.dfy"));
 
     var consumer1Diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, consumer);
     Assert.Single(consumer1Diagnostics);
     Assert.Contains("int", consumer1Diagnostics[0].Message);
 
     ApplyChange(ref producerItem, new Range(0, 0, 2, 0), "");
-    var producerDiagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, producerItem);
-    Assert.Single(producerDiagnostics2); // File has no code
 
-    var consumer2 = await CreateAndOpenTestDocument(consumerSource, Path.Combine(Directory.GetCurrentDirectory(), "consumer2.dfy"));
-    var consumer2Diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, consumer2);
+    var consumer2 = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(Directory.GetCurrentDirectory(), "consumer2.dfy"));
+    var consumer2Diagnostics = await GetLastDiagnostics(consumer2);
     Assert.True(consumer2Diagnostics.Length > 1);
 
     client.CloseDocument(producerItem);
-    var producerDiagnostics3 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-    Assert.Empty(producerDiagnostics3); // File has no code
-    var consumer3 = await CreateAndOpenTestDocument(consumerSource, Path.Combine(Directory.GetCurrentDirectory(), "consumer3.dfy"));
+    var consumer3 = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(Directory.GetCurrentDirectory(), "consumer3.dfy"));
     var consumer3Diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, consumer3);
     Assert.Single(consumer3Diagnostics);
-    Assert.Contains("Unable to open", consumer3Diagnostics[0].Message);
+    Assert.Contains("not found", consumer3Diagnostics[0].Message);
   }
 
-  public MultipleFilesProjectTest(ITestOutputHelper output) : base(output) {
+  public MultipleFilesProjectTest(ITestOutputHelper output) : base(output, LogLevel.Trace) {
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/ProjectFiles/ProjectFilesTest.cs b/Source/DafnyLanguageServer.Test/ProjectFiles/ProjectFilesTest.cs
index a87ed26915e..51b3d09a08c 100644
--- a/Source/DafnyLanguageServer.Test/ProjectFiles/ProjectFilesTest.cs
+++ b/Source/DafnyLanguageServer.Test/ProjectFiles/ProjectFilesTest.cs
@@ -1,27 +1,100 @@
+using System;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using Microsoft.Dafny.LanguageServer.Workspace;
+using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Xunit;
 using Xunit.Abstractions;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest; 
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest;
 
 public class ProjectFilesTest : ClientBasedLanguageServerTest {
 
   [Fact]
-  public async Task ProjectFileByItselfHasNoDiagnostics() {
+  public async Task ProducerLibrary() {
+    var libraryDirectory = GetFreshTempPath();
+    var producerSource = @"
+module Producer {
+  const x := 3
+}".TrimStart();
+    Directory.CreateDirectory(libraryDirectory);
+    var producerPath = Path.Combine(libraryDirectory, "producer.dfy").Replace("\\", "/");
+    await File.WriteAllTextAsync(producerPath, producerSource);
+    var consumerSource = @"
+module Consumer {
+  import opened Producer
+  const y := x + 2
+}".TrimStart();
+
+    var projectFileSource = $@"
+[options]
+library = [""{producerPath}""]".TrimStart();
+
+    var consumerDirectory = GetFreshTempPath();
+    Directory.CreateDirectory(consumerDirectory);
+    await File.WriteAllTextAsync(Path.Combine(consumerDirectory, "consumer.dfy"), consumerSource);
+    var projectFile = await CreateOpenAndWaitForResolve(projectFileSource, Path.Combine(consumerDirectory, DafnyProject.FileName));
+
+    var diagnostics = await GetLastDiagnostics(projectFile);
+    Assert.Single(diagnostics);
+    Directory.Delete(libraryDirectory, true);
+    Directory.Delete(consumerDirectory, true);
+  }
+
+  /// <summary>
+  /// Previously this could cause two project managers for the same project to be created.
+  /// </summary>
+  [Fact]
+  public async Task OpenTwoFilesThenIntroduceProjectFile() {
     var tempDirectory = Path.GetRandomFileName();
-    await CreateAndOpenTestDocument("", Path.Combine(tempDirectory, DafnyProject.FileName));
-    await AssertNoDiagnosticsAreComing(CancellationToken);
+    var producerMarkup = @"
+module [>Producer<]Oops {
+  const x := 3
+}".TrimStart();
+    MarkupTestFile.GetPositionsAndRanges(producerMarkup, out var producerSource, out _, out var ranges);
+    var producer = await CreateOpenAndWaitForResolve(producerSource, Path.Combine(tempDirectory, "producer.dfy"));
+    var consumerSourceMarkup = @"
+include ""producer.dfy""
+module Consumer {
+  import opened Pro><ducer
+  const y := x + 2
+}".TrimStart();
+    MarkupTestFile.GetPositionAndRanges(consumerSourceMarkup, out var consumerSource, out var gotoPosition, out _);
+    var consumer = await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(tempDirectory, "consumer.dfy"));
+    await CreateOpenAndWaitForResolve("", Path.Combine(tempDirectory, DafnyProject.FileName));
+    // Let consumer.dfy realize it has a new project file 
+    var definition1 = await RequestDefinition(consumer, gotoPosition);
+    Assert.Empty(definition1);
+    ApplyChange(ref producer, new Range(0, 15, 0, 19), ""); // Delete oops
+    // Check that the project manager of consumer.dfy has incorporated the update in producer.dfy
+    var definition2 = await RequestDefinition(consumer, gotoPosition);
+    Assert.Single(definition2);
+    Assert.Equal(ranges[0], definition2.First().Location!.Range);
+  }
+
+  [Fact]
+  public async Task ProjectFileByItselfDiagnostics() {
+    var tempDirectory = Path.GetRandomFileName();
+    var projectFile = await CreateOpenAndWaitForResolve("", Path.Combine(tempDirectory, DafnyProject.FileName));
+    var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+    var errors = diagnostics.Where(d => d.Severity == DiagnosticSeverity.Error).ToList();
+    Assert.Single(errors);
+    Assert.Equal("no Dafny source files were specified as input", errors.First().Message);
   }
 
   [Fact]
   public async Task ProjectFileChangesArePickedUpAfterCacheExpiration() {
-    await SetUp(options => options.WarnShadowing = false);
-    var tempDirectory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    const int cacheExpiry = 1000;
+    await SetUp(options => {
+      options.WarnShadowing = false;
+      options.Set(CachingProjectFileOpener.ProjectFileCacheExpiry, cacheExpiry);
+    });
+    var tempDirectory = GetFreshTempPath();
     Directory.CreateDirectory(tempDirectory);
     var projectFilePath = Path.Combine(tempDirectory, DafnyProject.FileName);
     await File.WriteAllTextAsync(projectFilePath, "");
@@ -36,19 +109,22 @@ method Foo() {
 ";
     var documentItem = CreateTestDocument(source, Path.Combine(tempDirectory, "source.dfy"));
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    await AssertNoDiagnosticsAreComing(CancellationToken);
+    await AssertNoDiagnosticsAreComing(CancellationToken, documentItem);
 
     var warnShadowingOn = @"
 [options]
 warn-shadowing = true";
 
     await FileTestExtensions.WriteWhenUnlocked(projectFilePath, warnShadowingOn);
-    await Task.Delay(ProjectManagerDatabase.ProjectFileCacheExpiryTime);
     ApplyChange(ref documentItem, new Range(0, 0, 0, 0), "//touch comment\n");
-    var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    await AssertNoDiagnosticsAreComing(CancellationToken);
+    await Task.Delay(cacheExpiry);
+    ApplyChange(ref documentItem, new Range(0, 0, 0, 0), "//touch comment\n");
+    var diagnostics = await GetLastDiagnostics(documentItem);
 
     Assert.Single(diagnostics);
     Assert.Equal("Shadowed local-variable name: x", diagnostics[0].Message);
+    Directory.Delete(tempDirectory, true);
   }
 
   [Fact]
@@ -57,7 +133,7 @@ public async Task ClosestProjectFileIsFound() {
     var source = await File.ReadAllTextAsync(filePath);
     var documentItem = CreateTestDocument(source, filePath);
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var diagnostics = await GetLastDiagnostics(documentItem);
 
     Assert.Single(diagnostics);
     Assert.Equal("Shadowed local-variable name: x", diagnostics[0].Message);
@@ -67,41 +143,75 @@ public async Task ClosestProjectFileIsFound() {
   public async Task ProjectFileOverridesOptions() {
     await SetUp(options => {
       options.Set(Function.FunctionSyntaxOption, "3");
+      options.Set(CommonOptionBag.QuantifierSyntax, QuantifierSyntaxOptions.Version3);
       options.Set(CommonOptionBag.WarnShadowing, true);
     });
-    var filePath = Path.Combine(Directory.GetCurrentDirectory(), "ProjectFiles/TestFiles/noWarnShadowing.dfy");
-    var source = await File.ReadAllTextAsync(filePath);
-    source += "\nghost function Bar(): int { 3 }";
+    var source = @"
+method Foo() {
+  var x := 3;
+  if (true) {
+    var x := 4;
+  }
+}
+
+function Zoo(): set<(int,int)> {
+  set x: int | 0 <= x < 5, y | 0 <= y < 6 :: (x,y)
+}
+
+ghost function Bar(): int { 3 }".TrimStart();
+
+    var projectFileSource = @"
+includes = [""**/*.dfy""]
 
-    var doc1 = await CreateAndOpenTestDocument(source, "orphaned");
-    var diagnostics1 = await GetLastDiagnostics(doc1, CancellationToken);
+[options]
+warn-shadowing = false
+quantifier-syntax = 4
+function-syntax = 4";
+
+    var directory = GetFreshTempPath();
+    Directory.CreateDirectory(directory);
+
+    var noProjectFile = await CreateOpenAndWaitForResolve(source, "orphaned.dfy");
+    var diagnostics1 = await GetLastDiagnostics(noProjectFile);
     Assert.Single(diagnostics1); // Stops after parsing
-    await CreateAndOpenTestDocument(source, filePath);
-    await AssertNoDiagnosticsAreComing(CancellationToken);
+
+    await File.WriteAllTextAsync(Path.Combine(directory, DafnyProject.FileName), projectFileSource);
+    var sourceFile = await CreateOpenAndWaitForResolve(source, Path.Combine(directory, "source.dfy"));
+    var diagnostics2 = await GetLastDiagnostics(sourceFile);
+    Assert.Empty(diagnostics2.Where(d => d.Severity == DiagnosticSeverity.Error));
+    Directory.Delete(directory, true);
   }
 
   [Fact]
-  public async Task FileOnlyAttachedToProjectFileThatAppliesToIt() {
+  public async Task FileOnlyAttachedToProjectFileThatIncludesIt() {
     await SetUp(options => options.WarnShadowing = false);
 
-    var projectFileSource = @"
+    var outerSource = @"
 [options]
 warn-shadowing = true
 ";
-    var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-    var outerProjectFile = CreateTestDocument(projectFileSource, Path.Combine(directory, DafnyProject.FileName));
+    var directory = GetFreshTempPath();
+    var outerProjectFile = CreateTestDocument(outerSource, Path.Combine(directory, DafnyProject.FileName));
     await client.OpenDocumentAndWaitAsync(outerProjectFile, CancellationToken);
 
-    var innerProjectFile = CreateTestDocument("includes = []", Path.Combine(directory, "nested", DafnyProject.FileName));
+    var innerDirectory = Path.Combine(directory, "nested");
+    var innerProjectFile = CreateTestDocument("includes = []", Path.Combine(innerDirectory, DafnyProject.FileName));
     await client.OpenDocumentAndWaitAsync(innerProjectFile, CancellationToken);
 
-    var filePath = Path.Combine(Directory.GetCurrentDirectory(), "ProjectFiles/TestFiles/noWarnShadowing.dfy");
-    var source = await File.ReadAllTextAsync(filePath);
-    var documentItem = CreateTestDocument(source, Path.Combine(directory, "nested/A.dfy"));
+    var source = @"
+method Foo() {
+  var x := 3;
+  if (true) {
+    var x := 4;
+    var y: int := true; 
+  }
+}
+";
+    var documentItem = CreateTestDocument(source, Path.Combine(innerDirectory, "A.dfy"));
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-    Assert.Single(diagnostics);
-    Assert.Contains("Shadowed", diagnostics[0].Message);
+    var diagnostics = await GetLastDiagnostics(documentItem);
+    Assert.Equal(2, diagnostics.Length);
+    Assert.Contains(diagnostics, d => d.Message.Contains("Shadowed"));
   }
 
   [Fact]
@@ -112,7 +222,7 @@ public async Task InMemoryProjectFileOverridesOptions() {
 [options]
 warn-shadowing = true
 ";
-    var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    var directory = GetFreshTempPath();
     var projectFile = CreateTestDocument(projectFileSource, Path.Combine(directory, DafnyProject.FileName));
     await client.OpenDocumentAndWaitAsync(projectFile, CancellationToken);
 
@@ -120,7 +230,7 @@ public async Task InMemoryProjectFileOverridesOptions() {
     var source = await File.ReadAllTextAsync(filePath);
     var documentItem = CreateTestDocument(source, Path.Combine(directory, "A.dfy"));
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var diagnostics = await GetLastDiagnostics(documentItem);
     Assert.Single(diagnostics);
     Assert.Contains("Shadowed", diagnostics[0].Message);
   }
diff --git a/Source/DafnyLanguageServer.Test/ProjectFiles/SolverOptionsTest.cs b/Source/DafnyLanguageServer.Test/ProjectFiles/SolverOptionsTest.cs
new file mode 100644
index 00000000000..ec473072c64
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/ProjectFiles/SolverOptionsTest.cs
@@ -0,0 +1,37 @@
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.ProjectFiles;
+
+public class SolverOptionsTest : ClientBasedLanguageServerTest {
+
+  [Fact]
+  public async Task DisableNonLinearArithmeticIsUsed() {
+    var projectFileSource = @"
+[options]
+disable-nonlinear-arithmetic = true".TrimStart();
+
+    var source = @"
+lemma Test(a: real, b: real)
+  requires b != 0.0
+  ensures a / b == 1.0 / b * a
+{}".TrimStart();
+
+    var directory = Path.GetRandomFileName();
+    CreateAndOpenTestDocument(projectFileSource, Path.Combine(directory, DafnyProject.FileName));
+    var sourceDocument =
+      CreateAndOpenTestDocument(source, Path.Combine(directory, "DisableNonLinearArithmeticIsUsed.dfy"));
+    var diagnostics = await GetLastDiagnostics(sourceDocument);
+    Assert.Single(diagnostics);
+    Assert.Contains("a postcondition", diagnostics.First().Message);
+  }
+
+  public SolverOptionsTest(ITestOutputHelper output, LogLevel dafnyLogLevel = LogLevel.Information) : base(output, dafnyLogLevel) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/ProjectFiles/StandardLibrary.cs b/Source/DafnyLanguageServer.Test/ProjectFiles/StandardLibrary.cs
new file mode 100644
index 00000000000..77bddd23f08
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/ProjectFiles/StandardLibrary.cs
@@ -0,0 +1,34 @@
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.ProjectFiles;
+
+public class StandardLibrary : ClientBasedLanguageServerTest {
+
+  [Fact]
+  public async Task EditWhenUsingStandardLibrary() {
+    var projectFile = @"
+[options]
+standard-libraries=true
+";
+    var program = @"
+method Foo() ensures false { }
+".TrimStart();
+    var path = Path.GetRandomFileName();
+    var project = CreateAndOpenTestDocument(projectFile, Path.Combine(path, DafnyProject.FileName));
+    var document = CreateAndOpenTestDocument(program, Path.Combine(path, "EditWhenUsingStandardLibrary.dfy"));
+    var diagnostics1 = await GetLastDiagnostics(document);
+    Assert.Single(diagnostics1);
+    ApplyChange(ref document, new Range(0, 0, 1, 0), "method Bar() ensures true { }");
+    var diagnostics2 = await GetLastDiagnostics(document);
+    Assert.Empty(diagnostics2);
+  }
+
+  public StandardLibrary(ITestOutputHelper output, LogLevel dafnyLogLevel = LogLevel.Information) : base(output, dafnyLogLevel) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Refactoring/RenameTest.cs b/Source/DafnyLanguageServer.Test/Refactoring/RenameTest.cs
index 2d6d978298c..56e9a88c51f 100644
--- a/Source/DafnyLanguageServer.Test/Refactoring/RenameTest.cs
+++ b/Source/DafnyLanguageServer.Test/Refactoring/RenameTest.cs
@@ -20,21 +20,31 @@ public async Task ImplicitProjectFails() {
 const i := 0
 ".TrimStart();
 
-      var documentItem = await CreateAndOpenTestDocument(source);
+      var documentItem = await CreateOpenAndWaitForResolve(source);
       await Assert.ThrowsAnyAsync<Exception>(() => RequestRename(documentItem, new Position(0, 6), "j"));
     }
 
+    [Fact]
+    public async Task EmptyModules() {
+      var source = @"
+module [>><C<] {}
+".TrimStart();
+
+      var tempDir = SetUpProjectFile();
+      await AssertRangesRenamed(source, tempDir, "foobar");
+    }
+
     [Fact]
     public async Task InvalidNewNameIsNoOp() {
-      var documentItem = await CreateAndOpenTestDocument("");
+      var documentItem = await CreateOpenAndWaitForResolve("");
       var workspaceEdit = await RequestRename(documentItem, new Position(0, 0), "");
       Assert.Null(workspaceEdit);
     }
 
     [Fact]
     public async Task RenameNonSymbolFails() {
-      var tempDir = await SetUpProjectFile();
-      var documentItem = await CreateAndOpenTestDocument("module Foo {}", Path.Combine(tempDir, "tmp.dfy"));
+      var tempDir = SetUpProjectFile();
+      var documentItem = await CreateOpenAndWaitForResolve("module Foo {}", Path.Combine(tempDir, "tmp.dfy"));
       var workspaceEdit = await RequestRename(documentItem, new Position(0, 6), "space");
       Assert.Null(workspaceEdit);
     }
@@ -48,7 +58,7 @@ method M() {
 }
 ".TrimStart();
 
-      var tempDir = await SetUpProjectFile();
+      var tempDir = SetUpProjectFile();
       await AssertRangesRenamed(source, tempDir, "foobar");
     }
 
@@ -59,7 +69,7 @@ public async Task RenameUsageRenamesDeclaration() {
 method U() { [>><foobar<](); }
 ".TrimStart();
 
-      var tempDir = await SetUpProjectFile();
+      var tempDir = SetUpProjectFile();
       await AssertRangesRenamed(source, tempDir, "M");
     }
 
@@ -72,7 +82,7 @@ module C { import [>><A<] }
 module D { import [>A<] }
 ".TrimStart();
 
-      var tempDir = await SetUpProjectFile();
+      var tempDir = SetUpProjectFile();
       await AssertRangesRenamed(source, tempDir, "AAA");
     }
 
@@ -90,7 +100,7 @@ method M(c: A.[>C<]) {}
 }
 ".TrimStart();
 
-      var tempDir = await SetUpProjectFile();
+      var tempDir = SetUpProjectFile();
       await AssertRangesRenamed(new[] { sourceA, sourceB }, tempDir, "CCC");
     }
 
@@ -103,28 +113,19 @@ abstract module [>A<] {}
 abstract module B { import [>><A<] }
 ".TrimStart();
 
-      var tempDir = await SetUpProjectFile();
+      var tempDir = SetUpProjectFile();
       await AssertRangesRenamed(new[] { sourceA, sourceB }, tempDir, "AAA");
     }
 
     /// <summary>
     /// Create an empty project file in a new temporary directory, and return the temporary directory's path.
     /// </summary>
-    protected async Task<string> SetUpProjectFile() {
-      var tempDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-      Directory.CreateDirectory(tempDir);
-      var projectFilePath = Path.Combine(tempDir, DafnyProject.FileName);
-      await File.WriteAllTextAsync(projectFilePath, "");
+    protected string SetUpProjectFile() {
+      var tempDir = GetFreshTempPath();
+      CreateAndOpenTestDocument("", Path.Combine(tempDir, DafnyProject.FileName));
       return tempDir;
     }
 
-    protected override Task SetUp(Action<DafnyOptions> modifyOptions) {
-      return base.SetUp(o => {
-        o.Set(ServerCommand.ProjectMode, true);
-        modifyOptions?.Invoke(o);
-      });
-    }
-
     /// <summary>
     /// Assert that after requesting a rename to <paramref name="newName"/>
     /// at the markup position in <paramref name="source"/>
@@ -147,7 +148,7 @@ private async Task AssertRangesRenamed(IEnumerable<string> sources, string tempD
       var items = sources.Select(async (source, sourceIndex) => {
         MarkupTestFile.GetPositionsAndRanges(source, out var cleanSource,
           out var positions, out var ranges);
-        var documentItem = await CreateAndOpenTestDocument(cleanSource, Path.Combine(tempDir, $"tmp{sourceIndex}.dfy"));
+        var documentItem = await CreateOpenAndWaitForResolve(cleanSource, Path.Combine(tempDir, $"tmp{sourceIndex}.dfy"));
         Assert.InRange(positions.Count, 0, 1);
         return new DocPosRange(documentItem, positions.FirstOrDefault((Position)null), ranges);
       }).Select(task => task.Result).ToImmutableList();
diff --git a/Source/DafnyLanguageServer.Test/Refinement/RefinementTests.cs b/Source/DafnyLanguageServer.Test/Refinement/RefinementTests.cs
new file mode 100644
index 00000000000..2108251ce0b
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Refinement/RefinementTests.cs
@@ -0,0 +1,39 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Refinement;
+
+public class RefinementTests : ClientBasedLanguageServerTest {
+  [Fact]
+  public async Task RefinedLemmaNewEnsuresIsVerified() {
+    var source = @"
+module A {
+
+  lemma Test()
+  function F(): int
+}
+
+module B refines A {
+
+  lemma Test()
+    ensures false
+  {
+  }
+
+  function F(): int
+    ensures false { 3 }
+
+}".TrimStart();
+    var document = await CreateOpenAndWaitForResolve(source);
+    var diagnostics = await GetLastDiagnostics(document, DiagnosticSeverity.Error);
+    Assert.Equal(2, diagnostics.Length);
+  }
+
+  public RefinementTests(ITestOutputHelper output, LogLevel dafnyLogLevel = LogLevel.Information) : base(output, dafnyLogLevel) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/StandaloneServerTest.cs b/Source/DafnyLanguageServer.Test/StandaloneServerTest.cs
deleted file mode 100644
index f5c8f9b8021..00000000000
--- a/Source/DafnyLanguageServer.Test/StandaloneServerTest.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using Microsoft.Dafny.LanguageServer.Workspace;
-using Xunit.Abstractions;
-using Xunit;
-
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest;
-
-public class StandaloneServerTest {
-  private readonly TextWriter output;
-
-  public StandaloneServerTest(ITestOutputHelper output) {
-    this.output = new WriterFromOutputHelper(output);
-  }
-
-  [Fact]
-  public void OptionParsing() {
-    var arguments = new[] { "--documents:verify=onsave", "--verifier:timelimit=3", "--ghost:markStatements=true" };
-    var options = ServerProgram.GetOptionsFromArgs(output, TextReader.Null, arguments);
-    Assert.Equal(VerifyOnMode.Save, options.Get(ServerCommand.Verification));
-  }
-}
-
-public class WriterFromOutputHelper : TextWriter {
-  private readonly ITestOutputHelper output;
-  private bool failed = false;
-
-  public WriterFromOutputHelper(ITestOutputHelper output) {
-    this.output = output;
-  }
-
-  public override void Write(char value) {
-    if (!failed) {
-      failed = true;
-      WriteLine("Error: tried to write a single character, which WriterFromOutputHelper does not support.");
-    }
-  }
-
-  public override Encoding Encoding => Encoding.Default;
-
-  public override void WriteLine(string value) {
-    output.WriteLine(value);
-  }
-
-  public override void WriteLine(string format, params object[] arg) {
-    output.WriteLine(format, arg);
-  }
-}
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/CachingTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/CachingTest.cs
index 48a2176c294..087514c8902 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/CachingTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/CachingTest.cs
@@ -1,8 +1,13 @@
+#nullable enable
+
+using System;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Dafny.LanguageServer.Workspace;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
@@ -12,20 +17,110 @@
 using Serilog.Sinks.InMemory;
 using Xunit;
 using Xunit.Abstractions;
+using XunitAssertMessages;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization; 
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization;
 
 public class CachingTest : ClientBasedLanguageServerTest {
   private InMemorySink sink;
 
   protected override void ServerOptionsAction(LanguageServerOptions serverOptions) {
     sink = InMemorySink.Instance;
-    var logger = new LoggerConfiguration().MinimumLevel.Debug()
+    var memoryLogger = new LoggerConfiguration().MinimumLevel.Debug()
       .WriteTo.InMemory().CreateLogger();
-    var factory = LoggerFactory.Create(b => b.AddSerilog(logger));
+    var factory = LoggerFactory.Create(b => b.AddSerilog(memoryLogger));
     serverOptions.Services.Replace(new ServiceDescriptor(typeof(ILoggerFactory), factory));
   }
 
+  record CacheResults(int ParseHits, int ParseMisses, int ResolutionHits, int ResolutionMisses);
+
+  async Task<CacheResults> WaitAndCountHits(TextDocumentItem? documentItem, bool filterDocument = true) {
+    if (documentItem != null) {
+      await client.WaitForNotificationCompletionAsync(documentItem.Uri, CancellationToken);
+    }
+    var parseHits = 0;
+    var parseMisses = 0;
+    var resolutionHits = 0;
+    var resolutionMisses = 0;
+    foreach (var message in sink.Snapshot().LogEvents.Select(le => le.MessageTemplate.Text)) {
+      if (filterDocument && documentItem != null && !message.Contains(documentItem.Uri.GetFileSystemPath())) {
+        continue;
+      }
+
+      if (message.Contains("Parse cache hit")) {
+        parseHits++;
+      } else if (message.Contains("Parse cache miss")) {
+        parseMisses++;
+      } else if (message.Contains("Resolution cache hit")) {
+        resolutionHits++;
+      } else if (message.Contains("Resolution cache miss")) {
+        resolutionMisses++;
+      }
+    }
+
+    return new CacheResults(parseHits, parseMisses, resolutionHits, resolutionMisses);
+  }
+
+  [Fact]
+  public async Task ChangedImportAffectsExport() {
+
+    var importedSource = @"
+module Imported {
+  const x: int := 3
+  class Foo {
+    const r := 2
+
+    constructor() {
+
+    }
+  }
+}
+".TrimStart();
+
+    var exporter = @"
+module Exporter {
+  import Imported
+  export provides Imported, FooAlias, Wrapper
+
+  class Wrapper<T> {
+    method V() returns (r: T)
+  }
+  type FooAlias = Wrapper<Imported.Foo>
+}
+".TrimStart();
+
+    var importerSource = @"
+module Importer {
+  import Exporter
+  const i: int := 3
+  const x := Exporter.Imported.x
+
+  method Faz() {
+    var z : Exporter.FooAlias;
+
+    var q := new Exporter.Imported.Foo();
+    print q.r;
+  }  
+}
+".TrimStart();
+
+    var directory = Path.GetRandomFileName();
+    await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
+    var imported = await CreateOpenAndWaitForResolve(importedSource, Path.Combine(directory, "imported.dfy"));
+    await CreateOpenAndWaitForResolve(exporter, Path.Combine(directory, "exporter.dfy"));
+    var importer = await CreateOpenAndWaitForResolve(importerSource, Path.Combine(directory, "importer.dfy"));
+
+    // Make a change to imported, which could trigger a bug where some dependants of it are not marked dirty
+    ApplyChange(ref imported, ((0, 0), (0, 0)), "//comment" + Environment.NewLine);
+
+    // Make any change that should cause a diagnostic to be shown 
+    ApplyChange(ref importer, ((2, 18), (2, 19)), "true");
+    var diagnostics2 = await GetLastDiagnostics(importer);
+    Assert.Single(diagnostics2.Where(d => d.Severity == DiagnosticSeverity.Error));
+    await AssertNoDiagnosticsAreComing(CancellationToken);
+  }
+
   [Fact]
   public async Task GrowingSystemModule() {
 
@@ -39,12 +134,11 @@ public async Task GrowingSystemModule() {
 
     await AssertNoDiagnosticsAreComing(CancellationToken);
     ApplyChange(ref documentItem, ((0, 0), (0, 0)), "const tuple3: (int, int, bool) := (1,2,3) \n");
-    var diagnostics2 = await GetLastDiagnostics(documentItem, CancellationToken);
+    var diagnostics2 = await GetLastDiagnostics(documentItem);
     Assert.Single(diagnostics2);
     ApplyChange(ref documentItem, ((0, 0), (0, 0)), "const tuple4: (int, int, bool, bool) := (1,2,3, true) \n");
-    var diagnostics3 = await GetLastDiagnostics(documentItem, CancellationToken);
+    var diagnostics3 = await GetLastDiagnostics(documentItem);
     Assert.Equal(2, diagnostics3.Length);
-
   }
 
   [Fact]
@@ -80,31 +174,24 @@ match x {
 ".TrimStart();
 
 
-    var temp = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-    var noCachingProject = await CreateAndOpenTestDocument(@"[options]
+    var temp = GetFreshTempPath();
+    var noCachingProject = await CreateOpenAndWaitForResolve(@"[options]
 use-caching = false", Path.Combine(temp, "dfyconfig.toml"));
-    var noCaching = await CreateAndOpenTestDocument(source, Path.Combine(temp, "noCaching.dfy"));
+    var noCaching = await CreateOpenAndWaitForResolve(source, Path.Combine(temp, "noCaching.dfy"));
     ApplyChange(ref noCaching, ((0, 0), (0, 0)), "// Pointless comment that triggers a reparse\n");
-    var hitCountForNoCaching = await WaitAndCountHits(noCaching);
+    var hitCountForNoCaching = await WaitAndCountHits(noCaching, false);
     Assert.Equal(0, hitCountForNoCaching.ParseHits);
-    Assert.Equal(0, hitCountForNoCaching.ResolveHits);
+    Assert.Equal(0, hitCountForNoCaching.ResolutionHits);
 
     var testFiles = Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles");
     var hasCaching = CreateTestDocument(source, Path.Combine(testFiles, "test.dfy"));
     await client.OpenDocumentAndWaitAsync(hasCaching, CancellationToken);
-    var hits0 = await WaitAndCountHits(hasCaching);
+    var hits0 = await WaitAndCountHits(hasCaching, false);
     Assert.Equal(0, hits0.ParseHits);
-    Assert.Equal(0, hits0.ResolveHits);
-
-    async Task<(int ParseHits, int ResolveHits)> WaitAndCountHits(TextDocumentItem documentItem) {
-      await client.WaitForNotificationCompletionAsync(documentItem.Uri, CancellationToken);
-      var parseHits = sink.Snapshot().LogEvents.Count(le => le.MessageTemplate.Text.Contains("Parse cache hit"));
-      var resolveHits = sink.Snapshot().LogEvents.Count(le => le.MessageTemplate.Text.Contains("Resolution cache hit"));
-      return (parseHits, resolveHits);
-    }
+    Assert.Equal(0, hits0.ResolutionHits);
 
     ApplyChange(ref hasCaching, ((0, 0), (0, 0)), "// Pointless comment that triggers a reparse\n");
-    var hitCount1 = await WaitAndCountHits(hasCaching);
+    var hitCount1 = await WaitAndCountHits(hasCaching, false);
     Assert.Equal(2, hitCount1.ParseHits);
     var modules = new[] {
       "System",
@@ -113,21 +200,21 @@ match x {
       "PrefixModuleInDefaultModule", "Content",
       "SpreadOverMultipleFiles", "Child1", "Child2"
     };
-    Assert.Equal(modules.Length, hitCount1.ResolveHits);
+    Assert.Equal(modules.Length, hitCount1.ResolutionHits);
 
     // Removes the comment and the include and usage of B.dfy, which will prune the cache for B.dfy
     ApplyChange(ref hasCaching, ((2, 0), (3, 0)), "");
-    var hitCount2 = await WaitAndCountHits(hasCaching);
+    var hitCount2 = await WaitAndCountHits(hasCaching, false);
     Assert.Equal(hitCount1.ParseHits + 1, hitCount2.ParseHits);
     // No resolution was done because the import didn't resolve.
-    Assert.Equal(hitCount1.ResolveHits, hitCount2.ResolveHits);
+    Assert.Equal(hitCount1.ResolutionHits, hitCount2.ResolutionHits);
 
     ApplyChange(ref hasCaching, ((0, 0), (0, 0)), "  include \"./B.dfy\"\n");
-    var hitCount3 = await WaitAndCountHits(hasCaching);
+    var hitCount3 = await WaitAndCountHits(hasCaching, false);
     // No hit for B.dfy, since it was previously pruned
     Assert.Equal(hitCount2.ParseHits + 1, hitCount3.ParseHits);
     // The resolution cache was pruned after the previous change, so no cache hits here, except for the system module
-    Assert.Equal(hitCount2.ResolveHits + 1, hitCount3.ResolveHits);
+    Assert.Equal(hitCount2.ResolutionHits + 1, hitCount3.ResolutionHits);
   }
 
   /// <summary>
@@ -174,23 +261,18 @@ public async Task CachingDetectsStartAndEndAndUriChanges() {
     var firstFile = CreateTestDocument(source, "firstFile");
     await client.OpenDocumentAndWaitAsync(firstFile, CancellationToken);
 
-    async Task<int> WaitAndCountHits() {
-      await client.WaitForNotificationCompletionAsync(firstFile.Uri, CancellationToken);
-      return sink.Snapshot().LogEvents.Count(le => le.MessageTemplate.Text.Contains("Parse cache hit"));
-    }
-
     var secondFile = CreateTestDocument(source, "secondFile");
     await client.OpenDocumentAndWaitAsync(secondFile, CancellationToken);
     // No hit because Uri has changed
-    Assert.Equal(0, await WaitAndCountHits());
+    Assert.Equal(0, (await WaitAndCountHits(firstFile)).ParseHits);
 
     ApplyChange(ref secondFile, ((0, 0), (0, 0)), "// Make the file larger\n");
     // No hit because start of the file has changed
-    Assert.Equal(0, await WaitAndCountHits());
+    Assert.Equal(0, (await WaitAndCountHits(firstFile)).ParseHits);
 
     // No hit because end of file has changed
     ApplyChange(ref secondFile, ((19, 0), (19, 0)), "// Make the file larger\n");
-    Assert.Equal(0, await WaitAndCountHits());
+    Assert.Equal(0, (await WaitAndCountHits(firstFile)).ParseHits);
   }
 
   [Fact(Skip = "need hashing on modules to work")]
@@ -213,23 +295,17 @@ module C {{
     var testFiles = Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles");
     var documentItem = CreateTestDocument(source, Path.Combine(testFiles, "test.dfy"));
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    var hits0 = await WaitAndCountHits();
-    Assert.Equal(0, hits0);
+    var hits0 = await WaitAndCountHits(documentItem);
+    Assert.Equal(0, hits0.ResolutionHits);
 
-    async Task<int> WaitAndCountHits() {
-      await client.WaitForNotificationCompletionAsync(documentItem.Uri, CancellationToken);
-      var parseHits = sink.Snapshot().LogEvents.Count(le => le.MessageTemplate.Text.Contains("Parse cache hit"));
-      var resolveHits = sink.Snapshot().LogEvents.Count(le => le.MessageTemplate.Text.Contains("Resolve cache hit"));
-      return resolveHits;
-    }
 
     ApplyChange(ref documentItem, ((7, 17), (7, 18)), "22");
-    var hitCount1 = await WaitAndCountHits();
-    Assert.Equal(1, hitCount1);
+    var hitCount1 = await WaitAndCountHits(documentItem);
+    Assert.Equal(1, hitCount1.ResolutionHits);
 
     ApplyChange(ref documentItem, ((11, 17), (11, 18)), "32");
-    var hitCount2 = await WaitAndCountHits();
-    Assert.Equal(hitCount1 + 2, hitCount2);
+    var hitCount2 = await WaitAndCountHits(documentItem);
+    Assert.Equal(hitCount1.ResolutionHits + 2, hitCount2.ResolutionHits);
   }
 
   [Fact]
@@ -270,13 +346,95 @@ module ChangedClonedId {
     var testFiles = Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles");
     var documentItem1 = CreateTestDocument(usingFile, Path.Combine(testFiles, "notCached.dfy"));
     await client.OpenDocumentAndWaitAsync(documentItem1, CancellationToken);
-    var diagnostics1 = await GetLastDiagnostics(documentItem1, CancellationToken);
+    var diagnostics1 = await GetLastDiagnostics(documentItem1);
     Assert.Empty(diagnostics1.Where(d => d.Severity == DiagnosticSeverity.Error));
 
     ApplyChange(ref documentItem1, new Range(2, 0, 2, 0), "//comment\n");
     await AssertNoDiagnosticsAreComing(CancellationToken);
   }
 
-  public CachingTest(ITestOutputHelper output) : base(output) {
+  [Fact]
+  public async Task DocumentAddedToExistingProjectDoesNotCrash() {
+    var source1 = @"
+method Foo() {
+ var b: int := true;
+}";
+    var source2 = @"
+
+method Foo() {
+ var b: bool := 3;
+}";
+
+    var temp = GetFreshTempPath();
+    var file1 = CreateAndOpenTestDocument(source1, Path.Combine(temp, "source1.dfy"));
+    var file2 = CreateAndOpenTestDocument(source2, Path.Combine(temp, "source2.dfy"));
+    var project = CreateAndOpenTestDocument("", Path.Combine(temp, "dfyconfig.toml"));
+    // Change in file1 causes project detection to realize it's now part of project, so it is added there.
+    ApplyChange(ref file1, new Range(0, 0, 0, 0), "// added this comment\n");
+    ApplyChange(ref file2, new Range(0, 0, 0, 0), "// added this comment\n");
+    await client.WaitForNotificationCompletionAsync(project.Uri, CancellationToken);
+    var diagnostics0 = await GetLastDiagnostics(project);
+    var diagnostics1 = await GetLastDiagnostics(file1);
+    var diagnostics2 = await GetLastDiagnostics(file2);
+    var combined = diagnostics1.Concat(diagnostics2);
+    AssertM.Equal(3, combined.Count, $"diagnostics[{combined.Count},{diagnostics1.Length},{diagnostics2.Length},{diagnostics0.Length}]: " + string.Join("\n", combined.Concat(diagnostics0)));
+  }
+
+  [Fact]
+  public async Task CachingWorksWhenManyChangesAreMadeWithoutWaits() {
+    var largeImport1 = GetLargeFile("Imported1", 100);
+    var largeImport2 = GetLargeFile("Imported2", 100);
+
+    var importerSource = @"module Importer {
+  import Imported1
+  import Imported2
+  method Bar() {
+    Imported1.Foo0();
+    Imported2.Foo0();
+  }
+}";
+
+    var temp = GetFreshTempPath();
+    var project = CreateOpenAndWaitForResolve("", Path.Combine(temp, "dfyconfig.toml"));
+    var imported1 = CreateAndOpenTestDocument(largeImport1, Path.Combine(temp, "imported1.dfy"));
+    var imported2 = CreateAndOpenTestDocument(largeImport2, Path.Combine(temp, "imported2.dfy"));
+    var importer = CreateAndOpenTestDocument(importerSource, Path.Combine(temp, "importer.dfy"));
+
+    var before1 = await WaitAndCountHits(imported1);
+    var before2 = await WaitAndCountHits(imported2);
+    var beforeImporter = await WaitAndCountHits(importer);
+
+    for (int i = 0; i < 100; i++) {
+      ApplyChange(ref importer, new Range(0, 0, 0, 0), "// added this comment\n");
+    }
+
+    var after1 = await WaitAndCountHits(imported1);
+    var after2 = await WaitAndCountHits(imported2);
+    var afterImporter = await WaitAndCountHits(importer);
+    Assert.Equal(before1.ParseMisses, after1.ParseMisses);
+    Assert.Equal(before1.ResolutionMisses, after1.ResolutionMisses);
+    Assert.Equal(before2.ParseMisses, after2.ParseMisses);
+    Assert.Equal(before2.ResolutionMisses, after2.ResolutionMisses);
+    // Testing shows that importer can have many parse hits, even though it always gets changed.
+    // One explanation is that
+    // Although ProjectManagerDatabase.UpdateDocument is executed serially,
+    // because parsing is scheduled on a separate thread, it might be possible for 
+    // parsing to trigger twice after two calls to UpdateDocument, so then both parse calls work with the updated file system.
+  }
+
+  private static string GetLargeFile(string moduleName, int lines) {
+    string GetLineContent(int index) => $"  method Foo{index}() {{ assume {{:axiom}} false; }}";
+    var contentBuilder = new StringBuilder();
+    contentBuilder.AppendLine($"module {moduleName} {{");
+    for (int lineNumber = 0; lineNumber < lines; lineNumber++) {
+      contentBuilder.AppendLine(GetLineContent(lineNumber));
+    }
+    contentBuilder.AppendLine("}");
+    var largeImport = contentBuilder.ToString();
+    return largeImport;
+  }
+
+  public CachingTest(ITestOutputHelper output) : base(output, LogLevel.Debug) {
+    sink = null!;
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/CloseDocumentTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/CloseDocumentTest.cs
index 2760f8a07ed..d6a7136d9ca 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/CloseDocumentTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/CloseDocumentTest.cs
@@ -1,22 +1,43 @@
+using System.IO;
 using System.Linq;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client;
 using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization {
-  public class CloseDocumentTest : DafnyLanguageServerTestBase, IAsyncLifetime {
-    private ILanguageClient client;
+  public class CloseDocumentTest : ClientBasedLanguageServerTest {
 
-    public async Task InitializeAsync() {
-      (client, Server) = await Initialize(_ => { }, _ => { });
+    [Fact]
+    public async Task DiagnosticsAreClearedUponCloseWhenUsingProject() {
+      var source = "method Foo() { var c: int := true; }";
+      var directory = GetFreshTempPath();
+      Directory.CreateDirectory(directory);
+      await File.WriteAllTextAsync(Path.Combine(directory, DafnyProject.FileName), "");
+      var document = CreateAndOpenTestDocument(source, Path.Combine(directory, "DiagnosticsAreClearedUponCloseWhenUsingProject.dfy"));
+      var diagnostics = await GetLastDiagnostics(document);
+      Assert.Single(diagnostics);
+      client.CloseDocument(document);
+      var afterCloseDiagnostics = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
+      var afterCloseDiagnostics2 = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
+      Assert.Contains(new[] { afterCloseDiagnostics, afterCloseDiagnostics2 },
+        d => d.Uri == document.Uri && !d.Diagnostics.Any());
+      Directory.Delete(directory, true);
     }
 
-    public Task DisposeAsync() {
-      return Task.CompletedTask;
+    [Fact]
+    public async Task DiagnosticsAreClearedUponClose() {
+      var source = "method Foo() { var c: int := true; }";
+      var document = CreateAndOpenTestDocument(source);
+      var diagnostics = await GetLastDiagnostics(document);
+      Assert.Single(diagnostics);
+      client.CloseDocument(document);
+      var afterCloseDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+      Assert.Empty(afterCloseDiagnostics);
     }
 
     [Fact]
@@ -25,7 +46,7 @@ public async Task DocumentIsUnloadedWhenClosed() {
 function GetConstant(): int {
   1
 }".Trim();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DocumentIsUnloadedWhenClosed.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       client.CloseDocument(documentItem);
       for (int attempt = 0; attempt < 50; attempt++) {
@@ -44,7 +65,7 @@ public async Task DocumentStaysUnloadedWhenClosed() {
 function GetConstant(): int {
   1
 }".Trim();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DocumentStaysUnloadedWhenClosed.dfy");
       client.CloseDocument(documentItem);
       Assert.Null(await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri));
     }
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/DeclarationLocationMigrationTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/DeclarationLocationMigrationTest.cs
index 582b90b8203..67139c357a5 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/DeclarationLocationMigrationTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/DeclarationLocationMigrationTest.cs
@@ -51,14 +51,14 @@ class B {
 
   function GetX()
 }";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationLeavesLinesOfSymbolsBeforeUnchangedWhenChangingInTheMiddle.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((3, 0), (4, 1)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(TryFindSymbolDeclarationByName(document, "A", out var location));
       Assert.Equal(new Range((0, 6), (0, 7)), location.Name);
@@ -78,14 +78,14 @@ class C {
 }".TrimStart();
 
       var change = "";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationLeavesLinesOfSymbolsBeforeUnchangedWhenRemovingInTheMiddle.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((3, 0), (4, 0)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(TryFindSymbolDeclarationByName(document, "A", out var location));
       Assert.Equal(new Range((0, 6), (0, 7)), location.Name);
@@ -111,7 +111,7 @@ class B {
 
   function GetX()
 }";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationMovesLinesOfSymbolsAfterWhenChangingInTheMiddle.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
       await ApplyChangeAndWaitCompletionAsync(
@@ -119,14 +119,14 @@ await ApplyChangeAndWaitCompletionAsync(
         new Range((3, 0), (4, 1)),
         change
       );
-      var state = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var state = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(state);
       try {
         Assert.True(TryFindSymbolDeclarationByName(state, "C", out var location));
         Assert.Equal(new Range((10, 6), (10, 7)), location.Name);
         Assert.Equal(new Range((10, 0), (11, 0)), location.Declaration);
       } catch (AssertActualExpectedException) {
-        await output.WriteLineAsync($"state version is {state.Version}, diagnostics: {state.GetDiagnostics().Values.Stringify()}");
+        await output.WriteLineAsync($"state version is {state.Version}, diagnostics: {state.GetAllDiagnostics().Stringify()}");
         var programString = new StringWriter();
         var printer = new Printer(programString, DafnyOptions.Default);
         printer.PrintProgram((Program)state.Program, true);
@@ -147,14 +147,14 @@ class C {
 }".TrimStart();
 
       var change = "";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationMovesLinesOfSymbolsAfterWhenRemovingInTheMiddle.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((3, 0), (4, 0)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(TryFindSymbolDeclarationByName(document, "C", out var location));
       Assert.Equal(new Range((5, 6), (5, 7)), location.Name);
@@ -173,7 +173,7 @@ function GetX(): int {
 }".TrimStart();
 
       var change = "string reads thi";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationLeavesLocationUnchangedWhenChangingAtTheEndOfTheSignature.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
       await ApplyChangeAndWaitCompletionAsync(
@@ -181,9 +181,9 @@ await ApplyChangeAndWaitCompletionAsync(
         new Range((3, 19), (3, 22)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
-      Assert.NotNull(document);
-      Assert.True(TryFindSymbolDeclarationByName(document, "GetX", out var location));
+      var state = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      Assert.NotNull(state);
+      Assert.True(TryFindSymbolDeclarationByName(state, "GetX", out var location));
       Assert.Equal(new Range((3, 11), (3, 15)), location.Name);
       Assert.Equal(new Range((3, 2), (5, 2)), location.Declaration);
     }
@@ -198,14 +198,14 @@ class A {
       var change = @"var y: int;
 
   function GetY()";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationExpandsDeclarationRangeWhenChangingTheContents.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((1, 2), (1, 13)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(TryFindSymbolDeclarationByName(document, "A", out var location));
       Assert.Equal(new Range((0, 6), (0, 7)), location.Name);
@@ -216,14 +216,14 @@ await ApplyChangeAndWaitCompletionAsync(
     public async Task MigrationExpandsDeclarationRangeWhenChangingTheContentsOnTheSameLine() {
       var source = "class A { var x: int; }";
       var change = "var y: int; function GetY()";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationExpandsDeclarationRangeWhenChangingTheContentsOnTheSameLine.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((0, 10), (0, 21)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(TryFindSymbolDeclarationByName(document, "A", out var location));
       Assert.Equal(new Range((0, 6), (0, 7)), location.Name);
@@ -240,14 +240,14 @@ class A {
       var change = @"var y: int;
 
   function GetY()";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationRemovesLocationsWithinTheChangedRange.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((1, 2), (1, 13)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.False(TryFindSymbolDeclarationByName(document, "x", out var _));
     }
@@ -262,7 +262,7 @@ class B {
   var y: int;
 }".TrimStart();
 
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationMovesDeclarationWhenApplyingMultipleChangesAtOnce.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangesAndWaitCompletionAsync(
         documentItem,
@@ -279,20 +279,20 @@ var a
 }".TrimStart()
         }
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(TryFindSymbolDeclarationByName(document, "B", out var bLocation));
       Assert.Equal(new Range((4, 6), (4, 7)), bLocation.Name);
       Assert.Equal(new Range((4, 0), (7, 0)), bLocation.Declaration);
       Assert.True(TryFindSymbolDeclarationByName(document, "y", out var yLocation));
       Assert.Equal(new Range((6, 6), (6, 7)), yLocation.Name);
-      Assert.Equal(new Range((6, 6), (6, 7)), yLocation.Declaration);
+      Assert.Equal(new Range((6, 2), (6, 12)), yLocation.Declaration);
     }
 
     [Fact]
     public async Task PassingANullChangeRangeClearsSymbolsTable() {
       var source = "class X {}";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "PassingANullChangeRangeClearsSymbolsTable.dfy");
 
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var state = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
@@ -310,7 +310,7 @@ public async Task PassingANullChangeRangeClearsSymbolsTable() {
       // Next try a change that breaks resolution.
       // In this case symbols are relocated.  Since the change range is `null` all symbols for "test.dfy" are lost.
       await ApplyChangeAndWaitCompletionAsync(ref documentItem, null, "; class Y {}");
-      state = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem);
+      state = await Projects.GetParsedDocumentNormalizeUri(documentItem);
       Assert.NotNull(state);
       // Relocation happens due to the syntax error; range is null so table is cleared
       Assert.False(TryFindSymbolDeclarationByName(state, "X", out var _));
@@ -333,7 +333,7 @@ public async Task PassingANullChangeRangePreservesForeignSymbols() {
 
       // Try a change that breaks resolution.  Symbols for `foreign.dfy` are kept.
       await ApplyChangeAndWaitCompletionAsync(ref documentItem, null, "; include \"foreign.dfy\"\nclass Y {}");
-      document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem);
+      document = await Projects.GetParsedDocumentNormalizeUri(documentItem);
       Assert.NotNull(document);
       Assert.True(TryFindSymbolDeclarationByName(document, "A", out var _, new Uri(includePath)));
 
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/DiagnosticsTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/DiagnosticsTest.cs
deleted file mode 100644
index dbc9ee1d0ce..00000000000
--- a/Source/DafnyLanguageServer.Test/Synchronization/DiagnosticsTest.cs
+++ /dev/null
@@ -1,1170 +0,0 @@
-using System;
-using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
-using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
-using Microsoft.Dafny.LanguageServer.Workspace;
-using OmniSharp.Extensions.LanguageServer.Protocol.Document;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Dafny.LanguageServer.Workspace.ChangeProcessors;
-using Newtonsoft.Json;
-using Xunit.Abstractions;
-using Xunit;
-using Xunit.Sdk;
-using XunitAssertMessages;
-using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
-
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization {
-  public class DiagnosticsTest : ClientBasedLanguageServerTest {
-    private readonly string testFilesDirectory = Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles");
-
-    [Fact]
-    public async Task NoFlickeringWhenMixingCorrectAndErrorBatches() {
-      var source = @"
-method {:vcs_split_on_every_assert} Foo(x: int) {
-  if (x == 0) {
-    assert true;
-  } else if (x == 1) {
-    assert true;
-  } else {
-    assert false;
-  }
-}";
-      var document = await CreateAndOpenTestDocument(source);
-      var status1 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
-      Assert.Equal(PublishedVerificationStatus.Stale, status1.NamedVerifiables[0].Status);
-      var status2 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
-      Assert.Equal(PublishedVerificationStatus.Running, status2.NamedVerifiables[0].Status);
-      var status3 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
-      Assert.Equal(PublishedVerificationStatus.Error, status3.NamedVerifiables[0].Status);
-      await AssertNoVerificationStatusIsComing(document, CancellationToken);
-    }
-
-    [Fact]
-    public async Task IncrementalBatchDiagnostics() {
-      var source = @"
-method {:vcs_split_on_every_assert} Foo(x: int) {
-  if (x == 0) {
-    assert false;
-  } else {
-    assert false;
-  }
-}";
-      await CreateAndOpenTestDocument(source);
-      var diagnostics1 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Single(diagnostics1);
-      var diagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Equal(2, diagnostics2.Length);
-    }
-
-    [Fact]
-    public async Task ResolutionErrorInDifferentFileBlocksVerification() {
-      var source = @"
-include ""./semanticError.dfy""
-method Foo() ensures false { 
-  var x := SemanticError.untypedExport; 
-}
-";
-
-      var documentItem = CreateTestDocument(source, Path.Combine(testFilesDirectory, "test.dfy"));
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-
-      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Contains("semanticError.dfy", diagnostics[0].Message);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-    [Fact]
-    public async Task GitIssue3155ItemWithSameKeyAlreadyBeenAdded() {
-      var source = @"
-datatype Test =
-    | A(field: int)
-    | B(field: int)
-
-
-predicate updateTest(test: Test, test': Test)
-{
-    test' == test.(field := 1)
-}
-".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task GitIssue3062CrashOfLanguageServer() {
-      var source = @"
-function bullspec(s:seq<nat>, u:seq<nat>): (r: nat)
-  requires |s| > 0
-  requires |u| > 0
-  requires |s| == |u|
-  ensures forall i | i < r :: s[i] != u[i]
-  ensures r == |s| || s[r] == u[r]
-{
-  if |s| == 0 then 0 else
-  if |s| == 1 then
-    if s[0]==u[0] 
-    then 1 else 0
-  else
-    if s[0] != u[0] 
-    then bullspec(s[1..],u[1..])
-    else 1+bullspec(s[1..],u[1..])
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Equal(7, diagnostics.Length);
-      Assert.Equal(PublishedVerificationStatus.Stale, await PopNextStatus());
-      Assert.Equal(PublishedVerificationStatus.Running, await PopNextStatus());
-      Assert.Equal(PublishedVerificationStatus.Error, await PopNextStatus());
-      ApplyChange(ref documentItem, ((7, 25), (10, 17)), "");
-      diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Equal(5, diagnostics.Length);
-      Assert.Equal("Parser", diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      ApplyChange(ref documentItem, ((7, 20), (7, 25)), "");
-      diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Equal(8, diagnostics.Length);
-      Assert.Equal(PublishedVerificationStatus.Stale, await PopNextStatus());
-      Assert.Equal(PublishedVerificationStatus.Running, await PopNextStatus());
-      Assert.Equal(PublishedVerificationStatus.Error, await PopNextStatus());
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task EmptyFileNoCodeWarning() {
-      var source = "";
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Equal(new Range(0, 0, 0, 0), diagnostics[0].Range);
-    }
-
-    [Fact]
-    public async Task OpeningFailingFunctionPreconditionHasRelatedDiagnostics() {
-      var source = @"
-predicate P(i: int) {
-  i <= 0
-}
-
-function Call(i: int): int
-  requires P(i)
-
-method Test(i: int) returns (j: int)
-  requires i > 0
-{
-  return Call(2/i);
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.NotNull(diagnostics[0].RelatedInformation);
-      var relatedInformation =
-        diagnostics[0].RelatedInformation.ToArray();
-      Assert.Equal(2, relatedInformation.Length);
-      Assert.Equal("Could not prove: P(i)", relatedInformation[0].Message);
-      Assert.Equal("Could not prove: i <= 0", relatedInformation[1].Message);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningFlawlessDocumentReportsNoDiagnostics() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires y >= 0 && x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task RefinementTokensCorrectlyReported() {
-      // git-issue-2402
-      var source = @"
-abstract module M 
-{ 
-    type T(00)
-    const t : T
-    lemma Randomlemma()
-    {
-        forall i:int {}
-    }
-}
-
-module N refines M 
-{
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Equal(2, diagnostics.Length);
-      Assert.Equal(
-        "static non-ghost const field 't' of type 'T' (which does not have a default compiled value) must give a defining value",
-        diagnostics[1].Message);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task NoCrashWhenPressingEnterAfterSelectingAllTextAndInputtingText() {
-      var source = @"
-predicate {:opaque} m() {
-  true
-}
-".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-      ApplyChange(ref documentItem, ((0, 0), (3, 0)), "\n");
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      ApplyChange(ref documentItem, ((1, 0), (1, 0)), "const x := 1");
-      diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Empty(diagnostics);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningOpaqueFunctionWorks() {
-      var source = @"
-predicate {:opaque} m() {
-  true
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithSyntaxErrorReportsDiagnosticsWithParserErrors() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int
-  requires y >= 0 && x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal("Parser", diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithSemanticErrorReportsDiagnosticsWithSemanticErrors() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires y >= 0 && x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - ""1"");
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal("Resolver", diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithMultipleSemanticErrorsReportsDiagnosticsWithAllSemanticErrors() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires y >= 0 && x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == ""0"" {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - ""1"");
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Equal(2, diagnostics.Length);
-      Assert.Equal("Resolver", diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      Assert.Equal("Resolver", diagnostics[1].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[1].Severity);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithVerificationErrorReportsDiagnosticsWithVerificationErrors() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithDefaultParamErrorHighlightsCallSite() {
-      var source = @"
-function test(x: int := 99): bool
-  requires x >= 100
-{
-  false
-}
-
-method A()
-{
-  var b := test();
-} ".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      Assert.Equal(8, diagnostics[0].Range.Start.Line);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithVerificationErrorDoesNotReportDiagnosticsWithVerificationErrorsIfNotVerifyOnChange() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Never));
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithMultipleVerificationErrorsReportsDiagnosticsWithAllVerificationErrorsAndRelatedInformation() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Equal(2, diagnostics.Length);
-      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[1].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[1].Severity);
-      Assert.Single(diagnostics[0].RelatedInformation);
-      var relatedInformation = diagnostics[0].RelatedInformation.First();
-      Assert.Equal("this postcondition could not be proved: product >= 0", relatedInformation.Message);
-      Assert.Equal(new Range(new Position(2, 30), new Position(2, 42)), relatedInformation.Location.Range);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task ChangingCorrectDocumentToOneWithSyntaxErrorsReportsTheSyntaxErrors() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires y >= 0 && x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-      ApplyChange(ref documentItem, new Range((0, 53), (0, 54)), "");
-
-      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal("Parser", diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task ChangingCorrectDocumentToOneWithSyntaxErrorsReportsTheSyntaxErrorsIfNotVerifyOnChange() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires y >= 0 && x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Never));
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-
-      ApplyChange(ref documentItem, new Range(0, 53, 0, 54), "");
-
-      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      Assert.Single(diagnostics);
-      Assert.Equal("Parser", diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task ChangingCorrectDocumentToOneWithVerificationErrorsReportsTheVerificationErrors() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires y >= 0 && x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-
-      ApplyChange(ref documentItem, new Range((8, 30), (8, 31)), "+");
-
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task ChangingCorrectDocumentToOneWithVerificationErrorsDoesNotReportVerificationErrorsIfNotVerifyOnChange() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires y >= 0 && x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Never));
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-      ApplyChange(ref documentItem, new Range((8, 30), (8, 31)), "+");
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task ApplyingMultipleChangesInDocumentOnlySendsOneReport() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires y >= 0 && x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-      var newVersion = documentItem with { Version = documentItem.Version + 1 };
-      client.DidChangeTextDocument(new DidChangeTextDocumentParams {
-        TextDocument = new OptionalVersionedTextDocumentIdentifier {
-          Uri = newVersion.Uri,
-          Version = newVersion.Version
-        },
-        ContentChanges = new[] {
-          new TextDocumentContentChangeEvent {
-            Range = new Range((0, 53), (0, 54)),
-            Text = ""
-          },
-          new TextDocumentContentChangeEvent {
-            Range = new Range((0, 53), (0, 53)),
-            Text = ")"
-          }
-        }
-      });
-
-      // The test applies a change that introduces a syntax error and fixes it thereafter.
-      // Therefore, we know that the erroneous state was never reported when we now receive
-      // a report without any diagnostics/errors.
-      // Otherwise, we'd have to wait for a signal/diagnostic that should never be sent, e.g.
-      // with a timeout.
-      await Projects.GetLastDocumentAsync(newVersion); // For debug purposes.
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task ClosingDocumentWithSyntaxErrorHidesDiagnosticsBySendingEmptyDiagnostics() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int
-  requires y >= 0 && x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var errorDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Single(errorDiagnostics);
-      client.DidCloseTextDocument(new DidCloseTextDocumentParams { TextDocument = documentItem });
-      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Empty(diagnostics);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentThatIncludesNonExistentDocumentReportsParserErrorAtInclude() {
-      var source = "include \"doesNotExist.dfy\"";
-      var documentItem = CreateTestDocument(source, Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles/test.dfy"));
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal("Parser", diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      Assert.Equal(new Range((0, 8), (0, 26)), diagnostics[0].Range);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentThatIncludesDocumentWithSyntaxErrorsReportsParserErrorAtInclude() {
-      var source = "include \"syntaxError.dfy\"";
-      var documentItem = CreateTestDocument(source, Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles/test.dfy"));
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal("Parser", diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      Assert.Equal(new Range((0, 0), (0, 1)), diagnostics[0].Range);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task DoubleIncludesGitHubIssue3599() {
-      var source = @"
-include ""./A.dfy""
-include ""./B.dfy""
-module ModC {
-  lemma Lem() ensures false {}
-}
-";
-      var documentItem = CreateTestDocument(source, Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles/test.dfy"));
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Contains("a postcondition", diagnostics[0].Message);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithSemanticErrorsInIncludeReportsResolverErrorAtIncludeStatement() {
-      var source = "include \"semanticError.dfy\"";
-      var documentItem = CreateTestDocument(source, Path.Combine(testFilesDirectory, "test.dfy"));
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal("Parser", diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      Assert.Equal(new Range((0, 0), (0, 1)), diagnostics[0].Range);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task SavingDocumentWithVerificationErrorDoesNotDiscardDiagnosticsWithVerificationErrorsIfVerifyOnChange() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var changeDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(changeDiagnostics);
-      Assert.Equal(MessageSource.Verifier.ToString(), changeDiagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, changeDiagnostics[0].Severity);
-      client.SaveDocument(documentItem);
-
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task SavingDocumentWithVerificationErrorReportsDiagnosticsWithVerificationErrorsIfVerifyOnSave() {
-      var source = @"
-method Multiply(x: int, y: int) returns (product: int)
-  requires x >= 0
-  decreases y
-  ensures product == x * y && product >= 0
-{
-  if y == 0 {
-    product := 0;
-  } else {
-    var step := Multiply(x, y - 1);
-    product := x + step;
-  }
-}".TrimStart();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Save));
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-      client.SaveDocument(documentItem);
-      var saveDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Single(saveDiagnostics);
-      Assert.Equal(MessageSource.Verifier.ToString(), saveDiagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, saveDiagnostics[0].Severity);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithVerificationErrorReportsDiagnosticsWithVerificationErrorsAndNestedRelatedLocations() {
-      var source = @"
-class Test {
-    var a: nat
-    var b: nat
-    var c: nat
-
-    predicate Valid()
-        reads this
-    {
-        && a < b
-        && b < c
-    }
-
-    method Foo()
-        requires Valid()
-        ensures Valid()
-        modifies this
-    {
-        c := 10;
-    }
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      var relatedInformation = diagnostics[0].RelatedInformation.ToArray();
-      Assert.Equal(2, relatedInformation.Length);
-      Assert.Equal("this postcondition could not be proved: Valid()", relatedInformation[0].Message);
-      Assert.Equal(new Range((14, 16), (14, 23)), relatedInformation[0].Location.Range);
-      Assert.Equal("could not prove: b < c", relatedInformation[1].Message);
-      Assert.Equal(new Range((9, 11), (9, 16)), relatedInformation[1].Location.Range);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithMultipleVerificationCoresReturnsStableDiagnostics() {
-      var sourceWithHighTimeout = new CancellationTokenSource();
-      sourceWithHighTimeout.CancelAfter(TimeSpan.FromSeconds(240));
-      var cancellationToken = sourceWithHighTimeout.Token;
-
-      var source = @"
-method t0() { assert true; }
-method t1() { assert true; }
-method t2() { assert true; }
-method t3() { assert true; }
-method t4() { assert true; }
-method t5() { assert true; }
-method t6() { assert false; }
-method t7() { assert false; }
-method t8() { assert false; }
-method t9() { assert false; }
-method t10() { assert false; }".TrimStart();
-      await SetUp(options => options.Set(BoogieOptionBag.Cores, 4U));
-      for (int i = 0; i < 10; i++) {
-        diagnosticsReceiver.ClearHistory();
-        var documentItem = CreateTestDocument(source, $"test_{i}.dfy");
-        client.OpenDocument(documentItem);
-        var diagnostics = await GetLastDiagnostics(documentItem, cancellationToken);
-        try {
-          AssertM.Equal(5, diagnostics.Length, $"Iteration is {i}");
-        } catch (EqualException) {
-          WriteVerificationHistory();
-        }
-        Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
-        Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-        await AssertNoDiagnosticsAreComing(cancellationToken);
-      }
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithElephantOperatorDoesNotThrowException() {
-      var source = @"
-module {:options ""/functionSyntax:4""} Library {
-  // Library
-  datatype Option<T> = Some(value: T) | None
-  datatype Result<T> = Success(value: T) | Failure(s: string, pos: int) {
-    predicate IsFailure() {
-      Failure?
-    }
-    function PropagateFailure<U>(): Result<U>
-      requires IsFailure()
-    {
-      Failure(s, pos)
-    }
-    function Extract(): T
-      requires !IsFailure()
-    {
-      value
-    }
-  }
-}
-module Parser {
-  import opened Library
-
-  datatype Parser = Parser(expected: string) | Log(p: Parser, message: string)
-  {
-    method {:termination false} Parse(s: string, i: nat)
-      returns (result: Result<(string, nat)>)
-    {
-      if Log? {
-        var v1 :- p.Parse(s, i); // Removing this line makes the language server not crash anymore.
-      }
-      
-      result := Failure(""bam"", i);
-    }
-  }
-}".TrimStart();
-      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
-      diagnosticsReceiver.ClearHistory();
-      var documentItem = CreateTestDocument(source, $"test1.dfy");
-      client.OpenDocument(documentItem);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      AssertM.Equal(0, diagnostics.Count(diagnostic =>
-        diagnostic.Severity != DiagnosticSeverity.Information &&
-        diagnostic.Severity != DiagnosticSeverity.Hint), $"Expected no issue");
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithTimeoutReportsTimeoutDiagnostic() {
-      var source = @"
-function {:unroll 100} Ack(m: nat, n: nat): nat
-  decreases m, n
-{
-  if m == 0 then
-    n + 1
-  else if n == 0 then
-    Ack(m - 1, 1)
-  else
-    Ack(m - 1, Ack(m, n - 1))
-}
-
-method test() {
-  assert Ack(5, 5) == 0;
-}".TrimStart();
-      await SetUp(options => options.Set(BoogieOptionBag.VerificationTimeLimit, 1U));
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Contains("timed out", diagnostics[0].Message);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithComplexExpressionUnderlinesAllOfIt() {
-      var source = @"
-method test(i: int, j: int) {
-  assert i > j || i < j; 
-//       ^^^^^^^^^^^^^^
-}
-".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      Assert.Equal(new Range((1, 9), (1, 23)), diagnostics[0].Range);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithFailedCallUnderlinesAllOfIt() {
-      var source = @"
-method test() {
-  other(2, 1);
-//^^^^^^^^^^^^
-}
-
-method other(i: int, j: int)
-  requires i < j {
-}
-".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      Assert.Equal(new Range((1, 2), (1, 14)), diagnostics[0].Range);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task OpeningDocumentWithFailedCallExpressionUnderlinesAllOfIt() {
-      var source = @"
-method test() {
-  var x := 1 + other(2, 1);
-//             ^^^^^^^^^^^
-}
-
-function other(i: int, j: int): int
-  requires i < j {
-  2
-}
-".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics);
-      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics[0].Source);
-      Assert.Equal(DiagnosticSeverity.Error, diagnostics[0].Severity);
-      Assert.Equal(new Range((1, 15), (1, 26)), diagnostics[0].Range);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task IncrementalVerificationDiagnosticsBetweenMethods() {
-      var source = SlowToVerify + @"
-method test() {
-  assert false;
-}
-".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var firstVerificationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      try {
-        var secondVerificationDiagnostics =
-          await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-
-        Assert.Single(firstVerificationDiagnostics);
-        // Second diagnostic is a timeout exception from SlowToVerify
-        Assert.Equal(2, secondVerificationDiagnostics.Length);
-      } catch (OperationCanceledException) {
-        await output.WriteLineAsync($"firstVerificationDiagnostics: {firstVerificationDiagnostics.Stringify()}");
-      }
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task IncrementalVerificationDiagnosticsBetweenAssertionsAndWellFormedness() {
-      var source = @"
-method test() 
-  ensures 3 / 0 == 1 {
-  assert false;
-}
-".TrimStart();
-      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var firstVerificationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      var secondVerificationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-
-      Assert.Single(firstVerificationDiagnostics);
-      Assert.Equal(2, secondVerificationDiagnostics.Length);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task NoDiagnosticFlickeringWhenIncremental() {
-      var source = @"
-method test() {
-  assert false;
-}
-method test2() {
-  assert false;
-}
-".TrimStart();
-      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var firstVerificationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      var secondVerificationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      Assert.Single(firstVerificationDiagnostics);
-      Assert.Equal(2, secondVerificationDiagnostics.Length);
-
-      ApplyChange(ref documentItem, new Range((1, 9), (1, 14)), "true"); ;
-
-      // Next line should not be needed after resolving https://github.com/dafny-lang/dafny/issues/4377
-      var parseDiagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      var resolutionDiagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      AssertDiagnosticListsAreEqualBesidesMigration(secondVerificationDiagnostics, resolutionDiagnostics2);
-      var firstVerificationDiagnostics2 = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(firstVerificationDiagnostics2); // Still contains second failing method
-
-      ApplyChange(ref documentItem, new Range((4, 9), (4, 14)), "true");
-
-      // Next line should not be needed after resolving https://github.com/dafny-lang/dafny/issues/4377
-      var parseDiagnostics3 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      var resolutionDiagnostics3 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      AssertDiagnosticListsAreEqualBesidesMigration(firstVerificationDiagnostics2, resolutionDiagnostics3);
-      var secondVerificationDiagnostics3 = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Empty(secondVerificationDiagnostics3);
-
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-
-    [Fact]
-    public async Task ApplyChangeBeforeVerificationFinishes() {
-      var source = @"
-method test() {
-  assert false;
-}
-".TrimStart() + SlowToVerify;
-      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var firstVerificationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      Assert.Single(firstVerificationDiagnostics);
-
-      // Second verification diagnostics get cancelled.
-      ApplyChange(ref documentItem, new Range((1, 9), (1, 14)), "true");
-
-      // Next line should not be needed after resolving https://github.com/dafny-lang/dafny/issues/4377
-      var parseDiagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      // https://github.com/dafny-lang/dafny/issues/4377
-      var resolutionDiagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      AssertDiagnosticListsAreEqualBesidesMigration(firstVerificationDiagnostics, resolutionDiagnostics2);
-      var firstVerificationDiagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      Assert.Empty(firstVerificationDiagnostics2); // Still contains second failing method
-      try {
-        var secondVerificationDiagnostics2 =
-          await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-        Assert.Single(secondVerificationDiagnostics2);
-      } catch (SingleException) {
-        await output.WriteLineAsync($"firstVerificationDiagnostics2: {firstVerificationDiagnostics2.Stringify()}");
-      }
-
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-
-    [Fact]
-    public async Task DoNotMigrateDiagnosticsOfRemovedMethod() {
-      var source = @"
-method test() {
-  assert false;
-}
-method test2() {
-  assert false;
-}
-".TrimStart();
-      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var firstVerificationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      var secondVerificationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      Assert.Single(firstVerificationDiagnostics);
-      Assert.Equal(2, secondVerificationDiagnostics.Length);
-
-      /*
-       * New source becomes
-       * method test() {
-           assert false;
-           assert false;
-         }
-       */
-      ApplyChange(ref documentItem, new Range((2, 0), (4, 0)), "");
-
-      var resolutionDiagnosticsAfter = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      Assert.Single(resolutionDiagnosticsAfter);
-    }
-
-    private static void AssertDiagnosticListsAreEqualBesidesMigration(Diagnostic[] expected, Diagnostic[] actual) {
-      AssertM.Equal(expected.Length, actual.Length, $"expected: {expected.Stringify()}, but was: {actual.Stringify()}");
-      foreach (var t in expected.Zip(actual)) {
-        AssertM.Equal(CompilationAfterResolution.OutdatedPrefix + t.First.Message, t.Second.Message, t.Second.ToString());
-      }
-    }
-
-    [Fact]
-    public async Task DiagnosticsInDifferentImplementationUnderOneNamedVerificationTask() {
-      var source = @"
-method test() 
-  ensures 3 / 0 == 2 {
-  assert false;
-}
-".TrimStart();
-      await SetUp(options => options.Set(BoogieOptionBag.Cores, 1U));
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var diagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Equal(2, diagnostics.Length);
-    }
-
-    [Fact]
-    public async Task MethodRenameDoesNotAffectMigration() {
-      var source = @"
-method Foo() {
-  assert false;
-}
-".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var preChangeDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(preChangeDiagnostics);
-      ApplyChange(ref documentItem, new Range(0, 7, 0, 10), "Bar");
-      var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      AssertDiagnosticListsAreEqualBesidesMigration(preChangeDiagnostics, resolutionDiagnostics);
-    }
-
-    [Fact]
-    public async Task ModuleRenameDoesNotAffectMigration() {
-      var source = @"
-module Foo {
-  method Bar() {
-    assert false;
-  }
-}
-".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var preChangeDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(preChangeDiagnostics);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-      ApplyChange(ref documentItem, new Range(0, 7, 0, 10), "Zap");
-      var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-      AssertDiagnosticListsAreEqualBesidesMigration(preChangeDiagnostics, resolutionDiagnostics);
-    }
-
-    /**
-     * This test is an indirect way to test performance. It tests that the diagnostics of
-     * resolution, verification task determination, and verification itself, are returned separately.
-     */
-    [Fact]
-    public async Task ResolutionDiagnosticsAreReturnedBeforeComputingVerificationTasks() {
-      var source = @"
-method Foo() { 
-  assert false; 
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      var verificationDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(verificationDiagnostics);
-      ApplyChange(ref documentItem, new Range(0, 0, 0, 1), "");
-      var brokenSyntaxDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.True(brokenSyntaxDiagnostics.Length > 1);
-      documentItem = documentItem with { Version = documentItem.Version + 1 };
-      // Fix syntax error and replace method header so verification diagnostics are not migrated.
-      ApplyChange(ref documentItem, new Range(0, 0, 1, 0), "method Bar() {\n");
-      var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      Assert.Empty(resolutionDiagnostics);
-      var translationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-      // Verification diagnostics were removed since task no longer exists.
-      Assert.Single(translationDiagnostics);
-      await AssertNoDiagnosticsAreComing(CancellationToken);
-    }
-
-    [Fact]
-    public async Task DiagnosticsAfterSavingWithVerifyOnChange() {
-      var source = @"
-method Foo() { 
-  assert false; 
-}".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      client.OpenDocument(documentItem);
-      await client.SaveDocumentAndWaitAsync(documentItem, CancellationToken);
-      var diagnostics1 = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Single(diagnostics1);
-      ApplyChange(ref documentItem, new Range(1, 0, 2, 0), "");
-      var diagnostics2 = await GetLastDiagnostics(documentItem, CancellationToken);
-      Assert.Empty(diagnostics2);
-    }
-
-    public DiagnosticsTest(ITestOutputHelper output) : base(output) {
-    }
-  }
-}
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/EditDocumentTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/EditDocumentTest.cs
new file mode 100644
index 00000000000..4f38a9ac8fb
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Synchronization/EditDocumentTest.cs
@@ -0,0 +1,272 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Document;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Xunit;
+using Xunit.Abstractions;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization;
+
+[Collection("Sequential Collection")]
+public class EditDocumentTest : ClientBasedLanguageServerTest {
+
+  [Fact]
+  public async Task SlowlyTypeFile() {
+    var source = @"
+module Bla {
+  method Foo() { assume (0 decreases to 0);  }
+}
+
+module NoTypeArgs0 {
+
+
+  datatype List<+T> = Nil | Cons(T, List)
+  datatype Tree<+A,+B> = Leaf(A, B) | Node(Tree, Tree<B,A>)
+
+  method DoAPrefix0<A, B, C>(xs: List) returns (ys: List<A>)
+  {
+    ys := xs;
+  }
+
+  method DoAPrefix1<A, B, C>(xs: List) returns (ys: List<B>)
+  {
+    ys := xs;  // error: List<B> cannot be assign to a List<A>
+  }
+
+  method DoAPrefix2<A, B, C>(xs: List) returns (ys: List<B>)
+  {
+    ys := xs;  // error: List<B> cannot be assign to a List<A>
+  }
+
+  ghost function FTree0(t: Tree): Tree
+  {
+    match t
+    case Leaf(_,_) => t
+    case Node(x, y) => x
+  }
+
+  ghost function FTree1(t: Tree): Tree
+  {
+    match t
+    case Leaf(_,_) => t
+    case Node(x, y) => y  // error: y does not have the right type
+  }
+
+  ghost function FTree2<A,B,C>(t: Tree): Tree<A,B>
+  {
+    t
+  }
+}
+
+module NoTypeArgs1 {
+  datatype Tree<A,B> = Leaf(A, B) | Node(Tree, Tree<B,A>)
+
+  ghost function FTree3<T>(t: Tree): Tree<T,T>  // error: type of 't' does not have enough type parameters
+  {
+    t
+  }
+}
+
+// ----------- let-such-that expressions ------------------------
+
+module MiscMisc {
+  method LetSuchThat(ghost z: int, n: nat)
+  {
+    var x: int;
+    x := var y :| y < 0; y;  // fine for the resolver (but would give a verification error for not being deterministic)
+
+    x := var w :| w == 2*w; w;  // fine (even for the verifier, this one)
+    x := var w := 2*w; w;  // error: the 'w' in the RHS of the assignment is not in scope
+    ghost var xg := var w :| w == 2*w; w;
+  }
+}
+
+// ------------ quantified variables whose types are not inferred ----------
+
+module NonInferredType {
+  ghost predicate P<T>(x: T)
+
+  method InferredType(x: int)
+  {
+    var t;
+    assume forall z :: P(z) && z == t;
+    assume t == x;  // this statement determines the type of t and z
+  }
+
+  method NonInferredType(x: int)
+  {
+    var t;  // error: the type of t is not determined
+    assume forall z :: P(z) && z == t;  // error: the type of z is not determined
+  }
+}
+
+// ------------ Here are some tests that lemma contexts don't allocate objects -------------
+
+module GhostAllocationTests {
+  class G { }
+  iterator GIter() { }
+  class H { constructor () }
+  lemma GhostNew0()
+    ensures exists o: G :: fresh(o)
+  {
+    var p := new G;  // error: lemma context is not allowed to allocate state
+    p := new G;  // error: ditto
+  }
+
+  method GhostNew1(n: nat, ghost g: int) returns (t: G, z: int)
+  {
+    if n < 0 {
+      z, t := 5, new G;  // fine
+    }
+    if n < g {
+      var tt := new H();  // error: 'new' not allowed in ghost contexts
+    }
+  }
+
+  method GhostNew2(ghost b: bool)
+  {
+    if (b) {
+      var y := new GIter();  // error: 'new' not allowed in ghost contexts (and a non-ghost method is not allowed to be called here either)
+    }
+  }
+}
+module MoreGhostAllocationTests {
+  class G { }
+  method GhostNew3(n: nat) {
+    var g := new G;
+    calc {
+      5;
+      { var y := new G; }  // error: 'new' not allowed in lemma contexts
+      2 + 3;
+    }
+  }
+  ghost method GhostNew4(g: G)
+    modifies g
+  {
+  }
+}
+
+module NewForallAssign {
+  class G { }
+  method NewForallTest(n: nat) {
+    var a := new G[n];
+    forall i | 0 <= i < n {
+      a[i] := new G;  // error: 'new' is currently not supported in forall statements
+  } }
+}
+module NewForallProof {
+  class G { }
+  method NewForallTest(n: nat) { var a := new G[n];
+    forall i | 0 <= i < n ensures true { // this makes the whole 'forall' statement into a ghost statement
+      a[i] := new G;  // error: proof-forall cannot update state (and 'new' not allowed in ghost contexts, but that's checked at a later stage)
+  } }
+}
+
+// ------------------------- underspecified types ------------------------------
+
+module UnderspecifiedTypes {
+  method M(S: set<int>) {
+    var n, p, T0 :| 12 <= n && n in T0 && 10 <= p && p in T0 && T0 <= S && p % 2 != n % 2;
+    var T1 :| 12 in T1 && T1 <= S;
+    var T2 :| T2 <= S && 12 in T2;
+
+    var T3'0: set<int> :| 120 in T3'0;
+    var T3'1: multiset<int> :| 120 in T3'1;
+    var T3'2: map<int,bool> :| 120 in T3'2;
+    var T3'3: seq<int> :| 120 in T3'3;
+    var T3'4: bool :| 120 in T3'4;  // error: second argument to 'in' cannot be bool
+    var T4 :| T4 <= S;
+  }
+}
+
+module UnderspecifiedTypes' {
+  method M() {
+    var T3 :| 120 in T3;  // error: underspecified type
+  }
+}
+
+// ------------------------- lemmas ------------------------------
+
+module MiscLemma {
+  class L { }
+
+  // a lemma is allowed to have out-parameters, but not a modifies clause
+  lemma MyLemma(x: int, l: L) returns (y: int)
+    requires 0 <= x
+    modifies l
+    ensures 0 <= y
+  {
+    y := x;
+  }
+}
+";
+    await SlowlyTypeInSource(source, 200);
+  }
+
+  private async Task<TextDocumentItem> SlowlyTypeInSource(string source, int steps) {
+    await SetUp(dafnyOptions => {
+      dafnyOptions.Set(ProjectManager.UpdateThrottling, ProjectManager.DefaultThrottleTime);
+    });
+    var document = CreateAndOpenTestDocument("");
+
+    var sourceParts = Regex.Split(source, @"(?<=[\}])");
+    var stepSize = (int)Math.Ceiling(source.Length / (double)steps);
+
+    var index = 0;
+    var buffer = new TextBuffer("");
+    foreach (var midPart in sourceParts) {
+      for (var midIndex = 0; midIndex < midPart.Length; midIndex += stepSize) {
+        var length = Math.Min(midPart.Length, midIndex + stepSize) - midIndex;
+        var part = midPart.Substring(midIndex, length);
+        var cursorIndex = index + part.Length;
+
+        var position = buffer.FromIndex(index);
+        buffer = buffer.ApplyTextChange(new TextDocumentContentChangeEvent() {
+          Range = new Range(position, position),
+          Text = part
+        });
+        ApplyChange(ref document, new Range(position, position), part);
+
+        await WaitUntilResolutionFinished(document);
+        var position2 = buffer.FromIndex(midIndex + length);
+        var completionItems = await RequestCompletionAsync(document, position2);
+        var hover = await RequestHover(document, position2);
+        index = cursorIndex;
+      }
+    }
+
+    return document;
+  }
+
+  private Task<Hover> RequestHover(TextDocumentItem documentItem, Position position) {
+    return client.RequestHover(
+      new HoverParams {
+        TextDocument = documentItem.Uri,
+        Position = position
+      },
+      CancellationToken
+    );
+  }
+
+  private async Task<List<CompletionItem>> RequestCompletionAsync(TextDocumentItem documentItem, Position position) {
+    // TODO at this time we do not set the context since it appears that's also the case when used within VSCode.
+    var completionList = await client.RequestCompletion(
+      new CompletionParams {
+        TextDocument = documentItem.Uri,
+        Position = position
+      },
+      CancellationToken
+    ).AsTask();
+    return completionList.OrderBy(completion => completion.Label).ToList();
+  }
+
+  public EditDocumentTest(ITestOutputHelper output, LogLevel dafnyLogLevel = LogLevel.Information) : base(output, dafnyLogLevel) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/GhostDiagnosticsTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/GhostDiagnosticsTest.cs
index c33720c92f3..70e2073a0fc 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/GhostDiagnosticsTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/GhostDiagnosticsTest.cs
@@ -4,6 +4,7 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.Language;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -27,13 +28,13 @@ method Bar()
   BarLemma(); // this is ghost
 }".TrimStart();
       await SetUp(options => {
-        options.Set(ServerCommand.GhostIndicators, true);
+        options.Set(GhostStateDiagnosticCollector.GhostIndicators, true);
       });
 
       var directory = Path.GetRandomFileName();
-      var projectFile = await CreateAndOpenTestDocument("", Path.Combine(directory, DafnyProject.FileName));
-      var docA = await CreateAndOpenTestDocument(sourceA, Path.Combine(directory, "a.dfy"));
-      var docB = await CreateAndOpenTestDocument(sourceB, Path.Combine(directory, "b.dfy"));
+      var projectFile = await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
+      var docA = await CreateOpenAndWaitForResolve(sourceA, Path.Combine(directory, "a.dfy"));
+      var docB = await CreateOpenAndWaitForResolve(sourceB, Path.Combine(directory, "b.dfy"));
 
       var report = await ghostnessReceiver.AwaitNextNotificationAsync(CancellationToken);
       var report2 = await ghostnessReceiver.AwaitNextNotificationAsync(CancellationToken);
@@ -70,12 +71,13 @@ modifies this
   lemma MyLemma()
 }".TrimStart();
       await SetUp(options => {
-        options.Set(ServerCommand.GhostIndicators, false);
+        options.Set(GhostStateDiagnosticCollector.GhostIndicators, false);
       });
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "OpeningFlawlessDocumentWithoutGhostMarkDoesNotMarkAnything.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await GetLastDiagnostics(documentItem, CancellationToken);
-      await AssertNoGhostnessIsComing(CancellationToken);
+      await GetLastDiagnostics(documentItem);
+      await WaitUntilAllStatusAreCompleted(documentItem);
+      Assert.Equal(0, ghostnessReceiver.History.Count);
     }
 
     [Fact]
@@ -94,9 +96,9 @@ modifies this
   lemma MyLemma()
 }".TrimStart();
       await SetUp(options => {
-        options.Set(ServerCommand.GhostIndicators, true);
+        options.Set(GhostStateDiagnosticCollector.GhostIndicators, true);
       });
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "OpeningFlawlessDocumentWithGhostMarkStatementsMarksGhostVariableDeclarations.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var report = await ghostnessReceiver.AwaitNextNotificationAsync(CancellationToken);
       var diagnostics = report.Diagnostics.ToArray();
@@ -122,9 +124,9 @@ modifies this
   lemma MyLemma()
 }".TrimStart();
       await SetUp(options => {
-        options.Set(ServerCommand.GhostIndicators, true);
+        options.Set(GhostStateDiagnosticCollector.GhostIndicators, true);
       });
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "OpeningFlawlessDocumentWithGhostMarkStatementsMarksGhostIfStatements.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var report = await ghostnessReceiver.AwaitNextNotificationAsync(CancellationToken);
       var diagnostics = report.Diagnostics.ToArray();
@@ -148,9 +150,9 @@ modifies this
   lemma MyLemma()
 }".TrimStart();
       await SetUp(options => {
-        options.Set(ServerCommand.GhostIndicators, true);
+        options.Set(GhostStateDiagnosticCollector.GhostIndicators, true);
       });
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "OpeningFlawlessDocumentWithGhostMarkStatementsMarksGhostAssignments.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var report = await ghostnessReceiver.AwaitNextNotificationAsync(CancellationToken);
       var diagnostics = report.Diagnostics.ToArray();
@@ -174,9 +176,9 @@ modifies this
   lemma MyLemma()
 }".TrimStart();
       await SetUp(options => {
-        options.Set(ServerCommand.GhostIndicators, true);
+        options.Set(GhostStateDiagnosticCollector.GhostIndicators, true);
       });
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "OpeningFlawlessDocumentWithGhostMarkStatementsMarksGhostCalls.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var report = await ghostnessReceiver.AwaitNextNotificationAsync(CancellationToken);
       var diagnostics = report.Diagnostics.ToArray();
@@ -208,9 +210,9 @@ modifies this
   lemma MyLemma()
 }".TrimStart();
       await SetUp(options => {
-        options.Set(ServerCommand.GhostIndicators, true);
+        options.Set(GhostStateDiagnosticCollector.GhostIndicators, true);
       });
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "OpeningFlawlessDocumentWithGhostMarkStatementsMarksAllGhostStatements.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var report = await ghostnessReceiver.AwaitNextNotificationAsync(CancellationToken);
       var diagnostics = report.Diagnostics
@@ -223,6 +225,30 @@ await SetUp(options => {
       Assert.Equal(new Range((15, 4), (15, 14)), diagnostics[3].Range);
     }
 
+    [Fact]
+    public async Task OpeningDocumentContainingGhostAndRemovingGhostPublishesEmptyRange() {
+      var source = @"
+method Test() {
+  ghost var x := 2;
+  var nonghost := 3;
+}
+".TrimStart();
+      await SetUp(options => {
+        options.Set(GhostStateDiagnosticCollector.GhostIndicators, true);
+      });
+      var documentItem = CreateTestDocument(source, "OpeningDocumentContainingGhostAndRemovingGhostPublishesEmptyRange.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var report = await ghostnessReceiver.AwaitNextNotificationAsync(CancellationToken);
+      var diagnostics = report.Diagnostics
+        .OrderBy(diagnostic => diagnostic.Range.Start)
+        .ToArray();
+      Assert.Single(diagnostics);
+      Assert.Equal(new Range((1, 2), (1, 19)), diagnostics[0].Range);
+      ApplyChange(ref documentItem, ((1, 0), (2, 0)), "");
+      report = await ghostnessReceiver.AwaitNextNotificationAsync(CancellationToken);
+      Assert.Empty(report.Diagnostics.ToArray());
+    }
+
     public GhostDiagnosticsTest(ITestOutputHelper output) : base(output) {
     }
   }
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/IncludeFileTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/IncludeFileTest.cs
index 73af937eae9..3f80505b527 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/IncludeFileTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/IncludeFileTest.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -28,7 +29,7 @@ method Test() {
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
     Assert.NotNull(document);
-    Assert.All(document.GetDiagnostics(), a => Assert.Empty(a.Value));
+    Assert.Empty(document.GetAllDiagnostics());
   }
 
   // https://github.com/dafny-lang/language-server-csharp/issues/40
@@ -43,9 +44,8 @@ method Test() {
 }";
     var documentItem = CreateTestDocument(source, TestFilePath);
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    var document = await Projects.GetLastDocumentAsync(documentItem.Uri);
-    Assert.NotNull(document);
-    Assert.Single(document.GetDiagnostics(documentItem.Uri.ToUri()));
+    var diagnostics = await GetLastDiagnostics(documentItem);
+    Assert.Single(diagnostics);
   }
 
   [Fact]
@@ -54,9 +54,9 @@ public async Task NonErrorDiagnosticDoesNotProduceAnError() {
 include ""./hasWarning.dfy""
 ".TrimStart();
     var warningSource = "const tooManySemiColons := 3;";
-    await CreateAndOpenTestDocument(warningSource, Path.Combine(TestFileDirectory, "hasWarning.dfy"));
+    await CreateOpenAndWaitForResolve(warningSource, Path.Combine(TestFileDirectory, "hasWarning.dfy"));
     await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-    await CreateAndOpenTestDocument(source, TestFilePath);
+    await CreateOpenAndWaitForResolve(source, TestFilePath);
     await AssertNoDiagnosticsAreComing(CancellationToken);
   }
 
@@ -69,7 +69,7 @@ public async Task DirectlyIncludedFileFails() {
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
     Assert.Single(diagnostics);
-    Assert.Contains("the referenced file", diagnostics[0].Message);
+    Assert.Contains("but is part of a different project", diagnostics[0].Message);
     Assert.Contains("syntaxError.dfy", diagnostics[0].Message);
   }
 
@@ -83,7 +83,7 @@ public async Task IndirectlyIncludedFileFailsSyntax() {
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
     Assert.Single(diagnostics);
-    Assert.Contains("the referenced file", diagnostics[0].Message);
+    Assert.Contains("but is part of a different project", diagnostics[0].Message);
     Assert.Contains("The first error is:\nrbrace expected", diagnostics[0].Message);
     Assert.Contains("syntaxError.dfy", diagnostics[0].Message);
   }
@@ -95,14 +95,11 @@ public async Task IncludeCycle() {
 ".TrimStart();
     var documentItem = CreateTestDocument(source, TestFilePath);
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    var parseDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
-    Assert.Single(parseDiagnostics);
-    Assert.Contains(parseDiagnostics, d => d.Message.Contains("cycle of includes"));
-    var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
+    var resolutionDiagnostics = await GetLastDiagnostics(documentItem, DiagnosticSeverity.Hint);
     Assert.Equal(2, resolutionDiagnostics.Length);
     Assert.Contains(resolutionDiagnostics, d => d.Message.Contains("cycle of includes"));
-    Assert.Contains(resolutionDiagnostics, d => d.Message.Contains("the referenced file"));
-    Assert.Contains(resolutionDiagnostics, d => d.Message.Contains("the referenced file") && d.Message.Contains("cycleB.dfy"));
+    Assert.Contains(resolutionDiagnostics, d => d.Message.Contains("but is part of a different project"));
+    Assert.Contains(resolutionDiagnostics, d => d.Message.Contains("but is part of a different project") && d.Message.Contains("cycleB.dfy"));
   }
 
   [Fact]
@@ -115,7 +112,7 @@ public async Task IndirectlyIncludedFileFailsSemantic() {
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var diagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
     Assert.Single(diagnostics);
-    Assert.Contains("the referenced file", diagnostics[0].Message);
+    Assert.Contains("but is part of a different project", diagnostics[0].Message);
     Assert.Contains("semanticError.dfy", diagnostics[0].Message);
   }
 
@@ -134,9 +131,9 @@ ensures Foo(x) {{
 
 }}".TrimStart();
     await File.WriteAllTextAsync(temp, producer);
-    var documentItem2 = CreateTestDocument(consumer);
+    var documentItem2 = CreateTestDocument(consumer, "MethodWhosePostConditionFailsAndDependsOnIncludedFile.dfy");
     client.OpenDocument(documentItem2);
-    var verificationDiagnostics = await GetLastDiagnostics(documentItem2, CancellationToken);
+    var verificationDiagnostics = await GetLastDiagnostics(documentItem2);
     Assert.Single(verificationDiagnostics);
     await AssertNoDiagnosticsAreComing(CancellationToken);
   }
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/LookupMigrationTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/LookupMigrationTest.cs
index 8711b2fe1e6..abd10c91d62 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/LookupMigrationTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/LookupMigrationTest.cs
@@ -48,14 +48,14 @@ method GetXY() returns (x: int, y: int) {
 
 
 ";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationLeavesLinesOfSymbolsBeforeUnchangedWhenChangingInTheMiddle.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((10, 0), (14, 0)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(document.SignatureAndCompletionTable.TryGetSymbolAt((7, 10), out var symbol));
       Assert.Equal("x", symbol.Name);
@@ -87,14 +87,14 @@ reads this
 }".TrimStart();
 
       var change = "";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationLeavesLinesOfSymbolsBeforeUnchangedWhenRemovingInTheMiddle.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((12, 0), (14, 0)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(document.SignatureAndCompletionTable.TryGetSymbolAt((7, 10), out var symbol));
       Assert.Equal("x", symbol.Name);
@@ -134,21 +134,21 @@ method GetXY() returns (x: int, y: int) {
 
 
 ";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationMovesLinesOfSymbolsAfterWhenChangingInTheMiddle.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((10, 0), (14, 0)),
         change
       );
-      var state = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var state = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(state);
 
       try {
         Assert.True(state.SignatureAndCompletionTable.TryGetSymbolAt((22, 10), out var symbol));
         Assert.Equal("y", symbol.Name);
       } catch (AssertActualExpectedException) {
-        await output.WriteLineAsync($"state version is {state.Version}, diagnostics: {state.GetDiagnostics().Values.Stringify()}");
+        await output.WriteLineAsync($"state version is {state.Version}, diagnostics: {state.GetAllDiagnostics().Stringify()}");
         var programString = new StringWriter();
         var printer = new Printer(programString, DafnyOptions.Default);
         printer.PrintProgram((Program)state.Program, true);
@@ -182,14 +182,14 @@ reads this
 }".TrimStart();
 
       var change = "";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationMovesLinesOfSymbolsAfterWhenRemovingInTheMiddle.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((12, 0), (14, 0)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(document.SignatureAndCompletionTable.TryGetSymbolAt((16, 10), out var symbol));
       Assert.Equal("y", symbol.Name);
@@ -209,14 +209,14 @@ reads this
 }".TrimStart();
 
       var change = " +";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationLeavesCharacterOfSymbolsBeforeUnchangedWhenChangingInTheMiddleOfLine.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((6, 10), (6, 10)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(document.SignatureAndCompletionTable.TryGetSymbolAt((6, 10), out var symbol));
       Assert.Equal("x", symbol.Name);
@@ -236,14 +236,14 @@ reads this
 }".TrimStart();
 
       var change = "y + ";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationMovesCharacterOfSymbolsAfterWhenChangingInTheMiddleOfLine.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((6, 4), (6, 9)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(document.SignatureAndCompletionTable.TryGetSymbolAt((6, 9), out var symbol));
       Assert.Equal("x", symbol.Name);
@@ -263,7 +263,7 @@ reads this
 }".TrimStart();
 
       var change = "y + ";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationRemovesSymbolLocationsWithinTheChangedRange.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var originalDocument = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
       Assert.NotNull(originalDocument);
@@ -274,7 +274,7 @@ await ApplyChangeAndWaitCompletionAsync(
         new Range((6, 9), (6, 10)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.False(document.SignatureAndCompletionTable.TryGetSymbolAt((6, 9), out var _));
       Assert.Equal(lookupCountBefore - 1, document.SignatureAndCompletionTable.LookupTreePerUri.First().Value.Count);
@@ -293,7 +293,7 @@ reads this
   }
 }".TrimStart();
 
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MigrationMovesSymbolLocationsWhenApplyingMultipleChangesAtOnce.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangesAndWaitCompletionAsync(
         documentItem,
@@ -312,7 +312,7 @@ function GetY(): int {
   "
         }
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
       Assert.True(document.SignatureAndCompletionTable.TryGetSymbolAt((12, 7), out var symbol));
       Assert.Equal("x", symbol.Name);
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/OpenDocumentTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/OpenDocumentTest.cs
index 19e417bb0b6..93e0393e050 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/OpenDocumentTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/OpenDocumentTest.cs
@@ -6,25 +6,13 @@
 using System.Threading.Tasks;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using System.IO;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using Xunit.Abstractions;
 using Xunit;
 
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization {
 
-  public class OpenDocumentTest : DafnyLanguageServerTestBase, IAsyncLifetime {
-    private ILanguageClient client;
-
-    public async Task InitializeAsync() {
-      await SetUp(null);
-    }
-
-    public Task DisposeAsync() {
-      return Task.CompletedTask;
-    }
-
-    private async Task SetUp(Action<DafnyOptions> modifyOptions) {
-      (client, Server) = await Initialize(options => { }, modifyOptions);
-    }
+  public class OpenDocumentTest : ClientBasedLanguageServerTest {
 
     [Fact]
     public async Task CorrectDocumentCanBeParsedResolvedAndVerifiedWithoutErrors() {
@@ -32,11 +20,11 @@ public async Task CorrectDocumentCanBeParsedResolvedAndVerifiedWithoutErrors() {
 function GetConstant(): int {
   1
 }".Trim();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "CorrectDocumentCanBeParsedResolvedAndVerifiedWithoutErrors.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
-      Assert.NotNull(document);
-      Assert.True(document.GetDiagnostics().Values.All(x => !x.Any()));
+      var state = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      Assert.NotNull(state);
+      Assert.Empty(state.GetAllDiagnostics());
     }
 
     [Fact]
@@ -45,13 +33,13 @@ public async Task ParseErrorsOfDocumentAreCaptured() {
 function GetConstant() int {
   1
 }".Trim();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ParseErrorsOfDocumentAreCaptured.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
-      Assert.Single(document.GetDiagnostics());
-      var message = document.GetDiagnostics()[documentItem.Uri.ToUri()].ElementAt(0);
-      Assert.Equal(MessageSource.Parser.ToString(), message.Source);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Equal(MessageSource.Parser.ToString(), diagnostics[0].Source);
     }
 
     [Fact]
@@ -60,13 +48,13 @@ public async Task SemanticErrorsOfDocumentAreCaptured() {
 function GetConstant(): int {
   ""1""
 }".Trim();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SemanticErrorsOfDocumentAreCaptured.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
-      Assert.Single(document.GetDiagnostics());
-      var message = document.GetDiagnostics()[documentItem.Uri.ToUri()].ElementAt(0);
-      Assert.Equal(MessageSource.Resolver.ToString(), message.Source);
+      var diagnostics = await GetLastDiagnostics(documentItem);
+      Assert.Single(diagnostics);
+      Assert.Equal(MessageSource.Resolver.ToString(), diagnostics[0].Source);
     }
 
     [Fact]
@@ -79,14 +67,11 @@ method Recurse(x: int) returns (r: int) {
         r := Recurse(x - 1);
     }
 }".Trim();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "VerificationErrorsOfDocumentAreCaptured.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var document = await Projects.GetLastDocumentAsync(documentItem.Uri);
-      Assert.NotNull(document);
-      var dafnyDiagnostics = document.GetDiagnostics(documentItem.Uri.ToUri()).ToList();
-      Assert.Equal(1, dafnyDiagnostics.Count(d => d.Level == ErrorLevel.Error));
-      var message = dafnyDiagnostics.First(d => d.Level == ErrorLevel.Error);
-      Assert.Equal(MessageSource.Verifier, message.Source);
+      var diagnostics = await GetLastDiagnostics(documentItem, DiagnosticSeverity.Error);
+      Assert.Single(diagnostics);
+      Assert.Equal(MessageSource.Verifier.ToString(), diagnostics.First().Source);
     }
 
     [Fact]
@@ -100,34 +85,28 @@ method Recurse(x: int) returns (r: int) {
         r := Recurse(x - 1);
     }
 }".Trim();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Never));
-      var documentItem = CreateTestDocument(source);
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Never));
+      var documentItem = CreateTestDocument(source, "VerificationErrorsOfDocumentAreNotCapturedIfAutoVerificationIsNotOnChange.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
-      Assert.NotNull(document);
-      Assert.True(document.GetDiagnostics()[documentItem.Uri.ToUri()].All(d => d.Severity != DiagnosticSeverity.Error));
+      await AssertNoDiagnosticsAreComing(CancellationToken, documentItem);
     }
 
     [Fact]
     public async Task EmptyDocumentCanBeOpened() {
       var source = "";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "EmptyDocumentCanBeOpened.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
-      // Empty files currently yield only a warning.
-      var diagnostics = document.GetDiagnostics();
-      Assert.True(diagnostics[documentItem.Uri.ToUri()].All(d => d.Severity != DiagnosticSeverity.Error));
     }
 
     [Fact]
     public async Task DocumentWithNoValidTokensCanBeOpened() {
       var source = "";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DocumentWithNoValidTokensCanBeOpened.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
-      Assert.True(document.GetDiagnostics()[documentItem.Uri.ToUri()].All(d => d.Severity != DiagnosticSeverity.Error));
     }
 
     [Fact]
@@ -135,9 +114,7 @@ public async Task EmptyDocumentCanBeIncluded() {
       var source = "include \"empty.dfy\"";
       var documentItem = CreateTestDocument(source, Path.Combine(Directory.GetCurrentDirectory(), "Synchronization/TestFiles/test.dfy"));
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
-      Assert.NotNull(document);
-      Assert.False(document.GetDiagnostics().ContainsKey(documentItem.Uri.ToUri()));
+      await AssertNoDiagnosticsAreComing(CancellationToken, forDocument: documentItem);
     }
 
     public OpenDocumentTest(ITestOutputHelper output) : base(output) {
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/ProjectManagerDatabaseTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/ProjectManagerDatabaseTest.cs
index 69a33446b84..90bff1b8fb0 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/ProjectManagerDatabaseTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/ProjectManagerDatabaseTest.cs
@@ -8,19 +8,50 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Xunit;
 using Xunit.Abstractions;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization; 
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization;
 
 [Collection("Sequential Collection")]
 public class ProjectManagerDatabaseTest : ClientBasedLanguageServerTest {
 
+  [Fact]
+  public async Task CloseAndReopenProject() {
+    var path = GetFreshTempPath();
+    var project = CreateAndOpenTestDocument("", Path.Combine(path, DafnyProject.FileName));
+    var file1 = CreateAndOpenTestDocument("method Foo() { }", Path.Combine(path, "file1.dfy"));
+
+    client.CloseDocument(project);
+    var project2 = CreateAndOpenTestDocument("", Path.Combine(path, DafnyProject.FileName));
+    ApplyChange(ref file1, new Range(0, 0, 0, 0), @"syntaxError");
+    var error = await GetLastDiagnostics(file1);
+    Assert.NotEmpty(error);
+  }
+
+  [Fact]
+  public async Task ChangeAndUndoProjectWithMultipleFiles() {
+    var path = GetFreshTempPath();
+    var project = CreateAndOpenTestDocument("", Path.Combine(path, DafnyProject.FileName));
+    var file1 = CreateAndOpenTestDocument("method Foo() { }", Path.Combine(path, "file1.dfy"));
+    var file2 = CreateAndOpenTestDocument("method Bar() { }", Path.Combine(path, "file2.dfy"));
+
+    ApplyChange(ref project, new Range(0, 0, 0, 0), @"includes = [""**/*.dfy""]
+");
+    ApplyChange(ref file1, new Range(0, 0, 0, 0), @"//comment\n");
+    ApplyChange(ref project, new Range(0, 0, 1, 0), "");
+    var fine = await GetLastDiagnostics(project);
+    ApplyChange(ref file2, new Range(0, 0, 0, 0), @"syntaxError");
+    var error = await GetLastDiagnostics(file2);
+    Assert.NotEmpty(error);
+  }
+
   [Fact]
   public async Task OpenAndCloseConcurrentlySeparateProjects() {
     int documentsToLoadConcurrently = 50;
     var source = "// comment";
     var loadingDocuments = new List<TextDocumentItem>();
     for (int i = 0; i < documentsToLoadConcurrently; i++) {
-      var documentItem = await CreateAndOpenTestDocument(source, $"pmdtest1_{i}.dfy");
+      var documentItem = await CreateOpenAndWaitForResolve(source, $"pmdtest1_{i}.dfy");
       loadingDocuments.Add(documentItem);
     }
 
@@ -41,13 +72,13 @@ public async Task ConcurrentProjectMigration() {
     var loadingDocuments = new List<TextDocumentItem>();
     var directory = Path.GetRandomFileName();
     for (int i = 0; i < documentsToLoadConcurrently; i++) {
-      var documentItem = await CreateAndOpenTestDocument(source, Path.Combine(directory, $"nested{i}/pmdtest2.dfy"));
+      var documentItem = await CreateOpenAndWaitForResolve(source, Path.Combine(directory, $"nested{i}/pmdtest2.dfy"));
       loadingDocuments.Add(documentItem);
     }
 
     // Create a project file for each test document.
     for (int i = 0; i < documentsToLoadConcurrently; i++) {
-      await CreateAndOpenTestDocument("", Path.Combine(directory, $"nested{i}/{DafnyProject.FileName}"));
+      await CreateOpenAndWaitForResolve("", Path.Combine(directory, $"nested{i}/{DafnyProject.FileName}"));
     }
 
     // Concurrently migrate projects
@@ -70,7 +101,7 @@ public async Task OpenAndCloseConcurrentlySameProject() {
     var project = CreateTestDocument("", Path.Combine(directory, DafnyProject.FileName));
     client.OpenDocument(project);
     for (int i = 0; i < documentsToLoadConcurrently; i++) {
-      var documentItem = await CreateAndOpenTestDocument(source, Path.Combine(directory, $"pmdtest3_{i}.dfy"));
+      var documentItem = await CreateOpenAndWaitForResolve(source, Path.Combine(directory, $"pmdtest3_{i}.dfy"));
       loadingDocuments.Add(documentItem);
     }
 
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/SaveDocumentTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/SaveDocumentTest.cs
index 77ca76878ab..93d0f310d6d 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/SaveDocumentTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/SaveDocumentTest.cs
@@ -15,7 +15,7 @@ public async Task LeavesDocumentUnchangedIfVerifyOnChange() {
 function GetConstant(): int {
   1
 }".Trim();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "LeavesDocumentUnchangedIfVerifyOnChange.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await AssertNoDiagnosticsAreComing(CancellationToken);
       await client.SaveDocumentAndWaitAsync(documentItem, CancellationToken);
@@ -28,8 +28,8 @@ public async Task LeavesDocumentUnchangedIfVerifyNever() {
 function GetConstant(): int {
   1
 }".Trim();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Never));
-      var documentItem = CreateTestDocument(source);
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Never));
+      var documentItem = CreateTestDocument(source, "LeavesDocumentUnchangedIfVerifyNever.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await AssertNoDiagnosticsAreComing(CancellationToken);
       await client.SaveDocumentAndWaitAsync(documentItem, CancellationToken);
@@ -42,10 +42,10 @@ public async Task LeavesDocumentUnchangedIfDocumentContainsSyntaxErrorsIfVerifyO
 function GetConstant() int {
   1
 }".Trim();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Save));
-      var documentItem = CreateTestDocument(source);
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Save));
+      var documentItem = CreateTestDocument(source, "LeavesDocumentUnchangedIfDocumentContainsSyntaxErrorsIfVerifyOnSave.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await GetLastDiagnostics(documentItem, CancellationToken);
+      await GetLastDiagnostics(documentItem);
       await client.SaveDocumentAndWaitAsync(documentItem, CancellationToken);
       await AssertNoDiagnosticsAreComing(CancellationToken);
     }
@@ -56,10 +56,10 @@ public async Task LeavesDocumentUnchangedIfDocumentContainsSemanticErrorsIfVerif
 function GetConstant(): int {
   d
 }".Trim();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Save));
-      var documentItem = CreateTestDocument(source);
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Save));
+      var documentItem = CreateTestDocument(source, "LeavesDocumentUnchangedIfDocumentContainsSemanticErrorsIfVerifyOnSave.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await GetLastDiagnostics(documentItem, CancellationToken);
+      await GetLastDiagnostics(documentItem);
       await client.SaveDocumentAndWaitAsync(documentItem, CancellationToken);
       await AssertNoDiagnosticsAreComing(CancellationToken);
     }
@@ -70,8 +70,8 @@ public async Task UpdatesFlawlessDocumentIfVerifyOnSave() {
 function GetConstant(): int {
   1
 }".Trim();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Save));
-      var documentItem = CreateTestDocument(source);
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Save));
+      var documentItem = CreateTestDocument(source, "UpdatesFlawlessDocumentIfVerifyOnSave.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await AssertNoDiagnosticsAreComing(CancellationToken);
       await client.SaveDocumentAndWaitAsync(documentItem, CancellationToken);
@@ -84,12 +84,12 @@ public async Task VerificationErrorsAreCapturedIfVerifyOnSave() {
 method DoIt() {
   assert false;
 }".Trim();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Save));
-      var documentItem = CreateTestDocument(source);
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Save));
+      var documentItem = CreateTestDocument(source, "VerificationErrorsAreCapturedIfVerifyOnSave.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await AssertNoDiagnosticsAreComing(CancellationToken);
       await client.SaveDocumentAndWaitAsync(documentItem, CancellationToken);
-      var afterSaveDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+      var afterSaveDiagnostics = await GetLastDiagnostics(documentItem);
       Assert.Single(afterSaveDiagnostics);
       var message = afterSaveDiagnostics.First();
       Assert.Equal(MessageSource.Verifier.ToString(), message.Source);
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/SymbolMigrationTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/SymbolMigrationTest.cs
index a83a3053539..6295bbbbb59 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/SymbolMigrationTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/SymbolMigrationTest.cs
@@ -20,7 +20,7 @@ function GetConstant2(): int {
 }
 
 ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ChangeToSemanticallyCorrectDocumentUsesDafnyResolver.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
@@ -45,7 +45,7 @@ function GetConstant2(): int {
 }
 
 ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ChangeToSemanticallyIncorrectDocumentUsesMigration.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
@@ -65,14 +65,14 @@ function GetConstant(): int {
 
 ".TrimStart();
       var change = "function GetConstant2(): int {";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ChangeToSyntacticallyIncorrectDocumentUsesMigration.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
         new Range((4, 0), (4, 0)),
         change
       );
-      var document = await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri);
+      var document = await Projects.GetParsedDocumentNormalizeUri(documentItem.Uri);
       Assert.NotNull(document);
     }
 
@@ -88,7 +88,7 @@ method GetIt(x: int) returns (y: int) {
   } else {
     y := GetIt(x - 1);
   }";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ChangeToDocumentWithVerificationErrorsUsesDafnyResolver.dfy");
       await Client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       await ApplyChangeAndWaitCompletionAsync(
         ref documentItem,
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/VerificationOrderTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/VerificationOrderTest.cs
index 64b257efccd..f14e124e41c 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/VerificationOrderTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/VerificationOrderTest.cs
@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
@@ -12,12 +14,48 @@ namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization;
 [Collection("Sequential Collection")]
 public class VerificationOrderTest : ClientBasedLanguageServerTest {
 
+  [Fact]
+  public async Task VerificationOrderStaysCorrectAfterMigrationOfSymbolHeaders() {
+    await SetUp(options => {
+      options.Set(BoogieOptionBag.Cores, 1U);
+      options.Set(ProjectManager.Verification, VerifyOnMode.ChangeProject);
+    });
+
+    var sourceA = @"
+method Foo() {
+  assert false;
+}
+".TrimStart();
+
+    var document = await CreateOpenAndWaitForResolve(sourceA, "MigrationOfRecentlyRelatedChanges.dfy");
+
+    await WaitUntilCompletedForUris(1, CancellationToken);
+    verificationStatusReceiver.ClearHistory();
+
+    ApplyChange(ref document, new Range(3, 0, 3, 0), "method GetsPriority() { assert false; }\n");
+    await WaitUntilAllStatusAreCompleted(document);
+    AssertFirstFinishedVerifiableIs(new Range(3, 7, 3, 19));
+    ApplyChange(ref document, new Range(0, 0, 0, 0), "//comment before assert false\n");
+
+    await WaitUntilAllStatusAreCompleted(document);
+    AssertFirstFinishedVerifiableIs(new Range(4, 7, 4, 19));
+
+    void AssertFirstFinishedVerifiableIs(Range expectedRange) {
+      var nonMigratedResults = verificationStatusReceiver.History.
+        SkipWhile(h => h.NamedVerifiables.All(s => s.Status >= PublishedVerificationStatus.Error));
+      var firstErrorStatus = nonMigratedResults.First(h => h.Uri == document.Uri && h.NamedVerifiables.Any(v => v.Status == PublishedVerificationStatus.Error));
+      var errorRange = firstErrorStatus.NamedVerifiables.First(v => v.Status == PublishedVerificationStatus.Error);
+      Assert.Equal(expectedRange, errorRange.NameRange);
+      Assert.Contains(firstErrorStatus.NamedVerifiables, v => v.Status != PublishedVerificationStatus.Error);
+      verificationStatusReceiver.ClearHistory();
+    }
+  }
+
   [Fact]
   public async Task VerificationPriorityBasedOnChangesWorksWithMultipleFiles() {
     await SetUp(options => {
       options.Set(BoogieOptionBag.Cores, 1U);
-      options.Set(ServerCommand.ProjectMode, true);
-      options.Set(ServerCommand.Verification, VerifyOnMode.ChangeProject);
+      options.Set(ProjectManager.Verification, VerifyOnMode.ChangeProject);
     });
 
     var sourceA = @"
@@ -33,20 +71,33 @@ method Bar() {
 ".TrimStart();
 
     var directory = Path.GetRandomFileName();
-    var projectFile = await CreateAndOpenTestDocument("", Path.Combine(directory, DafnyProject.FileName));
-    var firstFile = await CreateAndOpenTestDocument(sourceA, Path.Combine(directory, "firstFile.dfy"));
-    var secondFile = await CreateAndOpenTestDocument(sourceB, Path.Combine(directory, "secondFile.dfy"));
+    await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
+    var firstFile = await CreateOpenAndWaitForResolve(sourceA, Path.Combine(directory, "firstFile.dfy"));
+    var secondFile = await CreateOpenAndWaitForResolve(sourceB, Path.Combine(directory, "secondFile.dfy"));
 
-    var history0 = await WaitUntilCompletedForUris(2, CancellationToken);
+    await WaitUntilCompletedForUris(2, CancellationToken);
 
+    ApplyChange(ref firstFile, new Range(3, 0, 3, 0), "method GetsPriority() { assert false; }\n");
+    var history2 = await WaitUntilCompletedForUris(2, CancellationToken);
+    AssertExpectedOrderForFirstFile(history2);
+    /*
+     * This change is chosen so that without a Uri check, it would incorrectly migrate the previously made change (in a different file!)
+     * so it wouldn't map to a GetsPriority any more and change the verification order
+     */
     ApplyChange(ref secondFile, new Range(1, 0, 1, 0), "  //comment before assert false\n");
 
-    var history1 = await WaitUntilCompletedForUris(2, CancellationToken);
-    Assert.Equal(firstFile.Uri.ToUri(), history1[^1].Uri);
-    ApplyChange(ref firstFile, new Range(1, 0, 1, 0), "  //comment before assert false\n");
+    var history3 = await WaitUntilCompletedForUris(2, CancellationToken);
 
-    var history2 = await WaitUntilCompletedForUris(2, CancellationToken);
-    Assert.Equal(secondFile.Uri.ToUri(), history2[^1].Uri);
+    AssertExpectedOrderForFirstFile(history3);
+    Assert.Equal(firstFile.Uri.ToUri(), history3[^1].Uri);
+
+    void AssertExpectedOrderForFirstFile(IList<FileVerificationStatus> history) {
+      var firstErrorStatus = history.First(h =>
+        h.Uri == firstFile.Uri && h.NamedVerifiables.Any(v => v.Status == PublishedVerificationStatus.Error));
+      var errorRange = firstErrorStatus.NamedVerifiables.First(v => v.Status == PublishedVerificationStatus.Error);
+      Assert.Equal(new Range(3, 7, 3, 19), errorRange.NameRange);
+      Assert.Contains(firstErrorStatus.NamedVerifiables, v => v.Status != PublishedVerificationStatus.Error);
+    }
   }
 
   public VerificationOrderTest(ITestOutputHelper output) : base(output) {
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/VerificationOrderTest2.cs b/Source/DafnyLanguageServer.Test/Synchronization/VerificationOrderTest2.cs
index b2ac4876359..b7faa9f4e39 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/VerificationOrderTest2.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/VerificationOrderTest2.cs
@@ -161,6 +161,7 @@ async Task CompareWithExpectation(List<string> expectedSymbols) {
         await CompareWithExpectation(expectedSymbols);
       }
     }
+    WriteVerificationHistory();
   }
 
   private IEnumerable<string> GetSymbols(string code, List<Position> positions) {
diff --git a/Source/DafnyLanguageServer.Test/Synchronization/VerificationStatusTest.cs b/Source/DafnyLanguageServer.Test/Synchronization/VerificationStatusTest.cs
index 9103a0e735e..86803500d0e 100644
--- a/Source/DafnyLanguageServer.Test/Synchronization/VerificationStatusTest.cs
+++ b/Source/DafnyLanguageServer.Test/Synchronization/VerificationStatusTest.cs
@@ -15,6 +15,128 @@ namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Synchronization;
 
 public class VerificationStatusTest : ClientBasedLanguageServerTest {
 
+  [Fact]
+  public async Task ParentModuleProjectFileVerification() {
+
+    await SetUp(options => {
+      options.Set(ProjectManager.Verification, VerifyOnMode.Never);
+    });
+    var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+    Directory.CreateDirectory(directory);
+    await File.WriteAllTextAsync(Path.Combine(directory, "dfyconfig.toml"), "");
+    await File.WriteAllTextAsync(Path.Combine(directory, "a.dfy"), "module A {}");
+    var b = CreateAndOpenTestDocument("module A.B { \n  method Test() { assert true; }\n}", Path.Combine(directory, "b.dfy"));
+
+    var methodHeader = new Position(1, 11);
+    verificationStatusReceiver.GetLatestAndClearQueue(_ => true);
+    await client.RunSymbolVerification(new TextDocumentIdentifier(b.Uri), methodHeader, CancellationToken);
+    var result = await WaitUntilAllStatusAreCompleted(b);
+    Assert.Equal(PublishedVerificationStatus.Correct, result.NamedVerifiables[0].Status);
+  }
+
+  /// <summary>
+  /// The client does not correctly migrate symbolStatus information,
+  /// so we have to republish it if the positions change.
+  /// </summary>
+  [Fact]
+  public async Task NoClientSideMigrationOfCanVerifies() {
+    var source = @"const x := 3".TrimStart();
+
+    var documentA = await CreateOpenAndWaitForResolve(source);
+    var status = await WaitUntilAllStatusAreCompleted(documentA);
+    Assert.Equal(1, status.NamedVerifiables.Count);
+    ApplyChange(ref documentA, new Range(0, 0, 0, 12), "");
+    var status2 = await WaitUntilAllStatusAreCompleted(documentA);
+    Assert.Equal(0, status2.NamedVerifiables.Count);
+  }
+
+  [Fact]
+  public async Task DoNotMigrateWrongUri() {
+    var sourceA = @"
+method NotAffectedByChange() {
+  assert false;
+}
+".TrimStart();
+
+    var sourceB = @"
+// 1
+// 2
+// 3
+method ShouldNotBeAffectedByChange() {
+  assert false;
+}
+".TrimStart();
+
+    var directory = Path.GetRandomFileName();
+    await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
+    var documentA = await CreateOpenAndWaitForResolve(sourceA, Path.Combine(directory, "sourceA.dfy"));
+    await WaitUntilAllStatusAreCompleted(documentA);
+    var documentB = await CreateOpenAndWaitForResolve(sourceB, Path.Combine(directory, "sourceB.dfy"));
+    await WaitUntilAllStatusAreCompleted(documentB);
+    ApplyChange(ref documentA, new Range(3, 0, 3, 0), "// change\n");
+    await AssertNoVerificationStatusIsComing(documentB, CancellationToken);
+  }
+
+  [Fact]
+  public async Task ANoopChangeWillCauseVerificationToTriggerAgain() {
+    var source = @"
+method WillVerify() {
+  assert false;
+}
+".TrimStart();
+
+    var document = await CreateOpenAndWaitForResolve(source);
+    await WaitForStatus(null, PublishedVerificationStatus.Error, CancellationToken, document);
+    ApplyChange(ref document, new Range(3, 0, 3, 0), "//change comment\n");
+    await WaitForStatus(null, PublishedVerificationStatus.Error, CancellationToken, document);
+  }
+
+  [Fact]
+  public async Task TryingToVerifyShowsUpAsQueued() {
+    var source = @"
+method Foo() returns (x: int) ensures x / 2 == 1; {
+  return 2;
+}
+
+method Bar() returns (x: int) ensures x / 2 == 1; {
+  return 2;
+}
+
+method Zap() returns (x: int) ensures x / 2 == 1; {
+  return 2;
+}".TrimStart();
+    await SetUp(options => {
+      options.Set(ProjectManager.Verification, VerifyOnMode.Never);
+    });
+    var documentItem1 = await CreateOpenAndWaitForResolve(source, "PreparingVerificationShowsUpAsAllQueued.dfy");
+    _ = client.RunSymbolVerification(documentItem1, new Position(0, 7), CancellationToken);
+    _ = client.RunSymbolVerification(documentItem1, new Position(4, 7), CancellationToken);
+    while (true) {
+      CancellationToken.ThrowIfCancellationRequested();
+      var status = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      if (status.NamedVerifiables.Count(v => v.Status == PublishedVerificationStatus.Queued) == 2) {
+        Assert.Contains(status.NamedVerifiables, v => v.Status == PublishedVerificationStatus.Stale);
+        break;
+      }
+
+      if (status.NamedVerifiables.All(v => v.Status >= PublishedVerificationStatus.Error)) {
+        Assert.Fail("Finished without getting to a dual queued state");
+      }
+    }
+
+    while (true) {
+      CancellationToken.ThrowIfCancellationRequested();
+      var status = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      if (status.NamedVerifiables.Count(v => v.Status == PublishedVerificationStatus.Stale) > 1) {
+        Assert.Fail("May not become stale after both being queued. ");
+      }
+
+      if (status.NamedVerifiables.Count(v => v.Status >= PublishedVerificationStatus.Error) == 2) {
+        return;
+      }
+    }
+  }
+
   [Fact]
   public async Task RunWithMultipleSimilarDocuments() {
     var source = @"
@@ -22,13 +144,12 @@ public async Task RunWithMultipleSimilarDocuments() {
   return 2;
 }".TrimStart();
     await SetUp(options => {
-      options.Set(ServerCommand.Verification, VerifyOnMode.Never);
-      options.Set(ServerCommand.ProjectMode, true);
+      options.Set(ProjectManager.Verification, VerifyOnMode.Never);
     });
-    var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-    await CreateAndOpenTestDocument("", Path.Combine(directory, DafnyProject.FileName));
-    var documentItem1 = await CreateAndOpenTestDocument(source, Path.Combine(directory, "RunWithMultipleDocuments1.dfy"));
-    var documentItem2 = await CreateAndOpenTestDocument(source.Replace("Foo", "Bar"), Path.Combine(directory, "RunWithMultipleDocuments2.dfy"));
+    var directory = GetFreshTempPath();
+    await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
+    var documentItem1 = await CreateOpenAndWaitForResolve(source, Path.Combine(directory, "RunWithMultipleDocuments1.dfy"));
+    var documentItem2 = await CreateOpenAndWaitForResolve(source.Replace("Foo", "Bar"), Path.Combine(directory, "RunWithMultipleDocuments2.dfy"));
 
     var fooRange = new Range(0, 7, 0, 10);
     await client.RunSymbolVerification(documentItem1, fooRange.Start, CancellationToken);
@@ -44,12 +165,44 @@ public async Task AssertlessMethodBecomesCorrect() {
     var source = @"
 method Foo() {
 }";
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "AssertlessMethodBecomesCorrect.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var fooSymbol = (await RequestDocumentSymbol(documentItem)).Single();
     await WaitForStatus(fooSymbol.SelectionRange, PublishedVerificationStatus.Correct, CancellationToken);
   }
 
+  [Fact]
+  public async Task VerifyPositionFromFile1AndUriFromFile2WherePrefixModuleIsInBothFiles() {
+    var source = @"
+module A.B.C {
+  method Foo() returns (x: int) ensures x == 2 {
+    return 2;
+  }
+}".TrimStart();
+
+    var source2 = @"
+include ""A.dfy""
+module A.B.D {
+  method Foo() returns (x: int) ensures x == 2 {
+    return 2;
+  }
+}".TrimStart();
+    await SetUp(options => {
+      options.Set(ProjectManager.Verification, VerifyOnMode.Never);
+      options.Set(CommonOptionBag.VerifyIncludedFiles, true);
+
+    });
+    var directory = GetFreshTempPath();
+    var documentItem1 = CreateTestDocument(source, Path.Combine(directory, "A.dfy"));
+    await client.OpenDocumentAndWaitAsync(documentItem1, CancellationToken);
+    var documentItem2 = CreateTestDocument(source2, Path.Combine(directory, "B.dfy"));
+    await client.OpenDocumentAndWaitAsync(documentItem2, CancellationToken);
+    await AssertNoDiagnosticsAreComing(CancellationToken);
+    var fooInFileOnePosition = new Position(1, 9);
+    var failsBecausePositionAndUriDoNotMatch = await client.RunSymbolVerification(documentItem2, fooInFileOnePosition, CancellationToken);
+    Assert.False(failsBecausePositionAndUriDoNotMatch);
+  }
+
   [Fact]
   public async Task ManuallyRunMethodInPrefixModule() {
     var source = @"
@@ -59,7 +212,7 @@ method Foo() returns (x: int) ensures x == 2 {
   }
 }".TrimStart();
     await SetUp(options => {
-      options.Set(ServerCommand.Verification, VerifyOnMode.Never);
+      options.Set(ProjectManager.Verification, VerifyOnMode.Never);
     });
     var documentItem = CreateTestDocument(source);
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
@@ -76,9 +229,9 @@ public async Task ManuallyRunMethodWithTwoUnderlyingTasks() {
   return 2;
 }";
     await SetUp(options => {
-      options.Set(ServerCommand.Verification, VerifyOnMode.Never);
+      options.Set(ProjectManager.Verification, VerifyOnMode.Never);
     });
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "ManuallyRunMethodWithTwoUnderlyingTasks.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var fooSymbol = (await RequestDocumentSymbol(documentItem)).Single();
     var fooPosition = fooSymbol.SelectionRange.Start;
@@ -100,7 +253,7 @@ function MultiplyByPlus(x: nat, y: nat): nat {
   }
   return result;
 }";
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "FunctionByMethodIsSeenAsSingleVerifiable.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var header = (await RequestDocumentSymbol(documentItem)).Single().SelectionRange;
     await WaitForStatus(header, PublishedVerificationStatus.Running, CancellationToken);
@@ -110,7 +263,7 @@ function MultiplyByPlus(x: nat, y: nat): nat {
   [Fact]
   public async Task NoDuplicateStaleMessages() {
     var source = "method m1() { assert false; }";
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "NoDuplicateStaleMessages.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
     var foundStale = false;
@@ -134,7 +287,7 @@ public async Task NoVerificationStatusPublishedForUnparsedDocument() {
 method m1() {
   assert 3 == 55;
 }".TrimStart();
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "NoVerificationStatusPublishedForUnparsedDocument.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
     await WaitUntilAllStatusAreCompleted(documentItem);
@@ -142,6 +295,7 @@ method m1() {
     ApplyChange(ref documentItem, new Range(0, 0, 0, 0), "\n");
 
     await AssertNoVerificationStatusIsComing(documentItem, CancellationToken);
+
   }
 
   [Fact]
@@ -150,10 +304,10 @@ public async Task NoVerificationStatusPublishedForUnresolvedDocument() {
 method m1() {
   assert 3 == 55;
 }".TrimStart();
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "NoVerificationStatusPublishedForUnresolvedDocument.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
-    await WaitUntilAllStatusAreCompleted(documentItem);
+    var lastStatus = await WaitUntilAllStatusAreCompleted(documentItem);
     ApplyChange(ref documentItem, new Range(1, 9, 1, 10), "foo");
     ApplyChange(ref documentItem, new Range(0, 0, 0, 0), "\n");
 
@@ -182,9 +336,9 @@ function fib(n: nat): nat {
   if (n <= 1) then n else fib(n - 1) + fib(n - 2)
 }".TrimStart();
     await SetUp(options => {
-      options.Set(ServerCommand.Verification, VerifyOnMode.Never);
+      options.Set(ProjectManager.Verification, VerifyOnMode.Never);
     });
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "ManyConcurrentVerificationRuns.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
     var m1 = new Position(0, 7);
@@ -206,9 +360,9 @@ await SetUp(options => {
   public async Task MigrateDeletedVerifiableSymbol() {
     var source = @"method Foo() { assert false; }";
     await SetUp(options => {
-      options.Set(ServerCommand.Verification, VerifyOnMode.Never);
+      options.Set(ProjectManager.Verification, VerifyOnMode.Never);
     });
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "MigrateDeletedVerifiableSymbol.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
     var translatedStatusBefore = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
@@ -217,27 +371,30 @@ await SetUp(options => {
     // Delete the end of the Foo range, so Foo() becomes F()
     ApplyChange(ref documentItem, new Range(0, 8, 0, 12), "()");
 
-    var translatedStatusAfter = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
-    Assert.Equal(1, translatedStatusAfter.NamedVerifiables.Count);
+    var translatedStatusAfter1 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+    Assert.Equal(0, translatedStatusAfter1.NamedVerifiables.Count);
+
+    var translatedStatusAfter2 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+    Assert.Equal(1, translatedStatusAfter2.NamedVerifiables.Count);
   }
 
   [Fact]
   public async Task ChangeRunSaveWithVerify() {
     await SetUp(options => {
-      options.Set(ServerCommand.Verification, VerifyOnMode.Save);
+      options.Set(ProjectManager.Verification, VerifyOnMode.Save);
     });
     var source = @"method Foo() { assert true; }
 method Bar() { assert false; }";
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "ChangeRunSaveWithVerify.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     ApplyChange(ref documentItem, new Range(0, 22, 0, 26), "false");
     var methodHeader = new Position(0, 7);
-    await client.RunSymbolVerification(new TextDocumentIdentifier(documentItem.Uri), methodHeader, CancellationToken);
-    await client.WaitForNotificationCompletionAsync(documentItem.Uri, CancellationToken);
-    var preSaveDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var startedVerification = await client.RunSymbolVerification(new TextDocumentIdentifier(documentItem.Uri), methodHeader, CancellationToken);
+    Assert.True(startedVerification);
+    var preSaveDiagnostics = await GetLastDiagnostics(documentItem, allowStale: true);
     Assert.Single(preSaveDiagnostics);
     await client.SaveDocumentAndWaitAsync(documentItem, CancellationToken);
-    var lastDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var lastDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Equal(2, lastDiagnostics.Length);
   }
 
@@ -245,9 +402,9 @@ await SetUp(options => {
   public async Task MigratedDiagnosticsAfterManualRun() {
     var source = @"method Foo() { assert false; }";
     await SetUp(options => {
-      options.Set(ServerCommand.Verification, VerifyOnMode.Never);
+      options.Set(ProjectManager.Verification, VerifyOnMode.Never);
     });
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "MigratedDiagnosticsAfterManualRun.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
     var methodHeader = new Position(0, 7);
@@ -267,16 +424,21 @@ await SetUp(options => {
   public async Task ManualRunCancelCancelRunRun() {
 
     await SetUp(options => {
-      options.Set(ServerCommand.Verification, VerifyOnMode.Never);
+      options.Set(ProjectManager.Verification, VerifyOnMode.Never);
     });
-    var documentItem = CreateTestDocument(SlowToVerify);
+    var documentItem = CreateTestDocument(SlowToVerify, "ManualRunCancelCancelRunRun.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var stale = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+    Assert.Equal(documentItem.Uri, stale.Uri);
     Assert.Equal(PublishedVerificationStatus.Stale, stale.NamedVerifiables[0].Status);
     await AssertNoVerificationStatusIsComing(documentItem, CancellationToken);
 
     var methodHeader = new Position(0, 21);
     await client.RunSymbolVerification(new TextDocumentIdentifier(documentItem.Uri), methodHeader, CancellationToken);
+    var running0 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+    Assert.Equal(documentItem.Uri, running0.Uri);
+    Assert.Equal(PublishedVerificationStatus.Queued, running0.NamedVerifiables[0].Status);
+
     var running1 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
     Assert.Equal(PublishedVerificationStatus.Running, running1.NamedVerifiables[0].Status);
 
@@ -289,7 +451,7 @@ await SetUp(options => {
 
     var successfulRun = await client.RunSymbolVerification(new TextDocumentIdentifier(documentItem.Uri), methodHeader, CancellationToken);
     Assert.True(successfulRun);
-    var range = new Range(0, 21, 0, 43);
+    var range = new Range(0, 31, 0, 53);
     await WaitForStatus(range, PublishedVerificationStatus.Running, CancellationToken);
     await WaitForStatus(range, PublishedVerificationStatus.Error, CancellationToken);
 
@@ -298,17 +460,19 @@ await SetUp(options => {
   }
 
   [Fact]
-  public async Task SingleMethodGoesThroughAllPhasesExceptQueued() {
+  public async Task SingleMethodGoesThroughAllPhases() {
     var source = @"method Foo() { assert false; }";
 
     await SetUp(options => {
-      options.Set(ServerCommand.Verification, VerifyOnMode.Save);
+      options.Set(ProjectManager.Verification, VerifyOnMode.Save);
     });
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "SingleMethodGoesThroughAllPhasesExceptQueued.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var stale = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
     Assert.Equal(PublishedVerificationStatus.Stale, stale.NamedVerifiables[0].Status);
     client.SaveDocument(documentItem);
+    var queued = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+    Assert.Equal(PublishedVerificationStatus.Queued, queued.NamedVerifiables[0].Status);
     var verifying = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
     Assert.Equal(PublishedVerificationStatus.Running, verifying.NamedVerifiables[0].Status);
     var errored = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
@@ -323,7 +487,7 @@ public async Task QueuedMethodGoesThroughAllPhases() {
     await SetUp(options => {
       options.Set(BoogieOptionBag.Cores, 1U);
     });
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "QueuedMethodGoesThroughAllPhases.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
     var barRange = new Range(new Position(1, 7), new Position(1, 10));
@@ -340,18 +504,20 @@ public async Task WhenUsingOnSaveMethodStaysStaleUntilSave() {
 ";
 
     await SetUp(options => {
-      options.Set(ServerCommand.Verification, VerifyOnMode.Save);
+      options.Set(ProjectManager.Verification, VerifyOnMode.Save);
     });
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "WhenUsingOnSaveMethodStaysStaleUntilSave.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+    var stale1 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+    Assert.Equal(PublishedVerificationStatus.Stale, stale1.NamedVerifiables[0].Status);
 
     // Send a change to enable getting a new status notification.
     ApplyChange(ref documentItem, new Range(new Position(1, 0), new Position(1, 0)), "\n");
 
     await client.SaveDocumentAndWaitAsync(documentItem, CancellationToken);
 
-    var stale2 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
-    Assert.Equal(PublishedVerificationStatus.Stale, stale2.NamedVerifiables[0].Status);
+    var queued = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+    Assert.Equal(PublishedVerificationStatus.Queued, queued.NamedVerifiables[0].Status);
     var running = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
     Assert.Equal(PublishedVerificationStatus.Running, running.NamedVerifiables[0].Status);
 
@@ -366,34 +532,25 @@ public async Task CachingDoesNotWork() {
 
     await SetUp(options => {
       options.Set(BoogieOptionBag.Cores, 1U);
-      options.Set(ServerCommand.VerifySnapshots, 1U);
+      options.Set(LanguageServer.VerifySnapshots, 1U);
     });
 
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "CachingDoesNotWork.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
     await WaitUntilAllStatusAreCompleted(documentItem);
 
     ApplyChange(ref documentItem, new Range(new Position(1, 22), new Position(1, 26)), "false");
+
+    var stale = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
     await AssertNoResolutionErrors(documentItem);
-    var correct = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+
     // Uncomment when caching works
     // Assert.Equal(PublishedVerificationStatus.Correct, correct.NamedVerifiables[0].Status);
-    Assert.Equal(PublishedVerificationStatus.Stale, correct.NamedVerifiables[0].Status);
-    Assert.True(correct.NamedVerifiables[1].Status < PublishedVerificationStatus.Error);
+    Assert.Equal(PublishedVerificationStatus.Stale, stale.NamedVerifiables[0].Status);
+    Assert.True(stale.NamedVerifiables[1].Status < PublishedVerificationStatus.Error);
   }
 
-  private async Task<FileVerificationStatus> WaitUntilAllStatusAreCompleted(TextDocumentIdentifier documentId) {
-    var lastDocument = (CompilationAfterResolution)(await Projects.GetLastDocumentAsync(documentId));
-    var symbols = lastDocument!.Verifiables.ToHashSet();
-    FileVerificationStatus beforeChangeStatus;
-    do {
-      beforeChangeStatus = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
-    } while (beforeChangeStatus.NamedVerifiables.Count != symbols.Count ||
-             beforeChangeStatus.NamedVerifiables.Any(method => method.Status < PublishedVerificationStatus.Error));
-
-    return beforeChangeStatus;
-  }
 
   [Fact]
   public async Task StatusesOfDifferentImplementationUnderOneNamedVerifiableAreCorrectlyMerged() {
@@ -410,7 +567,7 @@ method InvalidPostCondition() ensures false {
 }
 ";
 
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "StatusesOfDifferentImplementationUnderOneNamedVerifiableAreCorrectlyMerged.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     FileVerificationStatus status;
     do {
@@ -469,7 +626,7 @@ ensures y > 0 && z > 0 {
   yield;
 }".TrimStart();
 
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "AllTypesOfNamedVerifiablesAreIdentified.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     await AssertNoResolutionErrors(documentItem);
     var status = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
@@ -492,7 +649,7 @@ ensures y > 0 && z > 0 {
   public async Task VerificationStatusNotUpdatedOnResolutionError() {
     var source = @"method Foo() { assert false; }
 ";
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "VerificationStatusNotUpdatedOnResolutionError.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     await WaitUntilAllStatusAreCompleted(documentItem);
     ApplyChange(ref documentItem, new Range(1, 0, 1, 0), "Garbage"); // Remove 'm'
@@ -503,7 +660,7 @@ public async Task VerificationStatusNotUpdatedOnResolutionError() {
   public async Task AddedMethodIsShownBeforeItVerifies() {
     var source = @"method Foo() { assert false; }
 ";
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "AddedMethodIsShownBeforeItVerifies.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var status1 = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
     Assert.Equal(1, status1.NamedVerifiables.Count);
@@ -519,7 +676,7 @@ public async Task AddedMethodIsShownBeforeItVerifies() {
   /// Without changing that, we can not show the status of individual refining declarations.
   /// </summary>
   [Fact]
-  public async Task RefiningDeclarationStatusIsFoldedIntoTheBase() {
+  public async Task RefiningDeclarationStatusIsNotFoldedIntoTheBase() {
     var source = @"
 abstract module BaseModule {
   method Foo() returns (x: int) ensures x > 2 
@@ -536,18 +693,20 @@ method Foo() returns (x: int) ensures x > 2 {
     return 1;
   }
 }".TrimStart();
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "RefiningDeclarationStatusIsFoldedIntoTheBase.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     var status = await verificationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
 
-    Assert.Equal(1, status.NamedVerifiables.Count);
+    Assert.Equal(3, status.NamedVerifiables.Count);
     Assert.Equal(new Range(1, 9, 1, 12), status.NamedVerifiables[0].NameRange);
+    Assert.Equal(new Range(5, 9, 5, 12), status.NamedVerifiables[1].NameRange);
+    Assert.Equal(new Range(11, 9, 11, 12), status.NamedVerifiables[2].NameRange);
   }
 
   [Fact]
   public async Task SymbolStatusIsMigrated() {
     var source = @"method Foo() { assert false; }";
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "SymbolStatusIsMigrated.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
     await WaitUntilAllStatusAreCompleted(documentItem);
     ApplyChange(ref documentItem, new Range(0, 0, 0, 0), "\n");
diff --git a/Source/DafnyLanguageServer.Test/Unit/ByteArrayEqualityTest.cs b/Source/DafnyLanguageServer.Test/Unit/ByteArrayEqualityTest.cs
index 509f942eebe..24ca25042c4 100644
--- a/Source/DafnyLanguageServer.Test/Unit/ByteArrayEqualityTest.cs
+++ b/Source/DafnyLanguageServer.Test/Unit/ByteArrayEqualityTest.cs
@@ -2,7 +2,7 @@
 using Microsoft.Dafny.LanguageServer.Language;
 using Xunit;
 
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Unit; 
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Unit;
 
 public class ByteArrayEqualityTest {
   [Fact]
diff --git a/Source/DafnyLanguageServer.Test/Unit/CompilationManagerTest.cs b/Source/DafnyLanguageServer.Test/Unit/CompilationManagerTest.cs
index c00660fd0a9..bfa2ee7b145 100644
--- a/Source/DafnyLanguageServer.Test/Unit/CompilationManagerTest.cs
+++ b/Source/DafnyLanguageServer.Test/Unit/CompilationManagerTest.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.Language;
@@ -7,21 +8,19 @@
 using Moq;
 using Xunit;
 
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Unit; 
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Unit;
 
 public class CompilationManagerTest {
   [Fact]
   public async Task CancelUnstartedCompilationLeadsToCancelledTasks() {
-    var dafnyOptions = DafnyOptions.Create(TextWriter.Null, TextReader.Null);
-    var compilationManager = new CompilationManager(new Mock<ILogger<CompilationManager>>().Object,
+    var dafnyOptions = DafnyOptions.CreateUsingOldParser(TextWriter.Null, TextReader.Null);
+    var compilationManager = new Compilation(new Mock<ILogger<Compilation>>().Object,
+      new Mock<IFileSystem>().Object,
       new Mock<ITextDocumentLoader>().Object,
-      new Mock<INotificationPublisher>().Object,
       new Mock<IProgramVerifier>().Object,
-      new Mock<ICompilationStatusNotificationPublisher>().Object,
-      new Mock<IVerificationProgressReporter>().Object,
-      dafnyOptions,
-      null, new Compilation(0, new DafnyProject() { Uri = new Uri(Directory.GetCurrentDirectory()) }, new Uri[] { }), null);
+      null!, new CompilationInput(dafnyOptions, 0,
+        new DafnyProject(null, new Uri(Directory.GetCurrentDirectory()), null, new HashSet<string>())));
     compilationManager.CancelPendingUpdates();
-    await Assert.ThrowsAsync<TaskCanceledException>(() => compilationManager.ParsedCompilation);
+    await Assert.ThrowsAsync<TaskCanceledException>(() => compilationManager.ParsedProgram);
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Unit/DafnyHoverHandlerTest.cs b/Source/DafnyLanguageServer.Test/Unit/DafnyHoverHandlerTest.cs
index 5be278f1961..a87144c0327 100644
--- a/Source/DafnyLanguageServer.Test/Unit/DafnyHoverHandlerTest.cs
+++ b/Source/DafnyLanguageServer.Test/Unit/DafnyHoverHandlerTest.cs
@@ -4,6 +4,7 @@
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Unit;
 
 public class DafnyHoverHandlerTest {
+
   [Fact]
   public void FormatResourceUnitTest() {
     void OneTest(string expected, long input) {
diff --git a/Source/DafnyLanguageServer.Test/Unit/DafnyLangSymbolResolverTest.cs b/Source/DafnyLanguageServer.Test/Unit/DafnyLangSymbolResolverTest.cs
deleted file mode 100644
index ffe7434c0b4..00000000000
--- a/Source/DafnyLanguageServer.Test/Unit/DafnyLangSymbolResolverTest.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Dafny.LanguageServer.Language.Symbols;
-using Microsoft.Dafny.LanguageServer.Workspace;
-using Microsoft.Extensions.Logging;
-using Moq;
-
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Unit;
-
-public class DafnyLangSymbolResolverTest {
-  private DafnyLangSymbolResolver dafnyLangSymbolResolver;
-
-  public DafnyLangSymbolResolverTest() {
-    var loggerFactory = new Mock<ILoggerFactory>();
-    dafnyLangSymbolResolver = new DafnyLangSymbolResolver(
-      new Mock<ILogger<DafnyLangSymbolResolver>>().Object,
-      new Mock<ILogger<CachingResolver>>().Object,
-      new Mock<ITelemetryPublisher>().Object
-    );
-  }
-
-  class CollectingErrorReporter : BatchErrorReporter {
-    public Dictionary<ErrorLevel, List<DafnyDiagnostic>> GetErrors() {
-      return this.AllMessagesByLevel;
-    }
-
-    public CollectingErrorReporter(DafnyOptions options) : base(options) {
-    }
-  }
-
-  class DummyModuleDecl : LiteralModuleDecl {
-    public DummyModuleDecl() : base(
-      new DefaultModuleDefinition(new List<Uri>()), null, Guid.NewGuid()) {
-    }
-    public override object Dereference() {
-      return this;
-    }
-  }
-}
diff --git a/Source/DafnyLanguageServer.Test/Unit/GhostStateDiagnosticCollectorTest.cs b/Source/DafnyLanguageServer.Test/Unit/GhostStateDiagnosticCollectorTest.cs
index 92ca320393f..4f29d702b16 100644
--- a/Source/DafnyLanguageServer.Test/Unit/GhostStateDiagnosticCollectorTest.cs
+++ b/Source/DafnyLanguageServer.Test/Unit/GhostStateDiagnosticCollectorTest.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading;
+using DafnyCore.Test;
 using IntervalTree;
 using Microsoft.Dafny.LanguageServer.Language;
 using Microsoft.Dafny.LanguageServer.Language.Symbols;
@@ -32,8 +33,8 @@ public IDisposable BeginScope<TState>(TState state) {
   }
 
   public GhostStateDiagnosticCollectorTest(ITestOutputHelper output) {
-    var options = new DafnyOptions(TextReader.Null, new WriterFromOutputHelper(output), new WriterFromOutputHelper(output));
-    options.Set(ServerCommand.GhostIndicators, true);
+    var options = new DafnyOptions(TextReader.Null, (TextWriter)new WriterFromOutputHelper(output), (TextWriter)new WriterFromOutputHelper(output));
+    options.Set(GhostStateDiagnosticCollector.GhostIndicators, true);
     ghostStateDiagnosticCollector = new GhostStateDiagnosticCollector(
       options,
       new DummyLogger());
@@ -49,8 +50,8 @@ public CollectingErrorReporter(DafnyOptions options) : base(options) {
   }
 
   class DummyModuleDecl : LiteralModuleDecl {
-    public DummyModuleDecl(IList<Uri> rootUris) : base(
-      new DefaultModuleDefinition(rootUris), null, Guid.NewGuid()) {
+    public DummyModuleDecl(DafnyOptions options) : base(options,
+      new DefaultModuleDefinition(), null, Guid.NewGuid()) {
     }
     public override object Dereference() {
       return this;
@@ -62,7 +63,7 @@ public void EnsureResilienceAgainstErrors() {
     // Builtins is null to trigger an error.
     var options = DafnyOptions.DefaultImmutableOptions;
     var rootUri = new Uri(Directory.GetCurrentDirectory());
-    var dummyModuleDecl = new DummyModuleDecl(new List<Uri> { rootUri });
+    var dummyModuleDecl = new DummyModuleDecl(options);
     var reporter = new CollectingErrorReporter(options);
     var compilation = new CompilationData(reporter, new List<Include>(), new List<Uri>(), Sets.Empty<Uri>(),
       Sets.Empty<Uri>());
diff --git a/Source/DafnyLanguageServer.Test/Unit/TextDocumentLoaderTest.cs b/Source/DafnyLanguageServer.Test/Unit/TextDocumentLoaderTest.cs
index 0a2c5d48de1..5ec823455e8 100644
--- a/Source/DafnyLanguageServer.Test/Unit/TextDocumentLoaderTest.cs
+++ b/Source/DafnyLanguageServer.Test/Unit/TextDocumentLoaderTest.cs
@@ -1,14 +1,14 @@
-using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Dafny.LanguageServer.Language.Symbols;
-using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Dafny.LanguageServer.Workspace;
 using Moq;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
+using DafnyCore.Test;
+using Microsoft.Boogie;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using Xunit;
@@ -21,30 +21,19 @@ public class TextDocumentLoaderTest {
     private Mock<IFileSystem> fileSystem;
     private Mock<IDafnyParser> parser;
     private Mock<ISymbolResolver> symbolResolver;
-    private Mock<ISymbolTableFactory> symbolTableFactory;
-    private Mock<IGhostStateDiagnosticCollector> ghostStateDiagnosticCollector;
-    private Mock<ICompilationStatusNotificationPublisher> notificationPublisher;
     private TextDocumentLoader textDocumentLoader;
     private Mock<ILogger<ITextDocumentLoader>> logger;
-    private Mock<INotificationPublisher> diagnosticPublisher;
 
     public TextDocumentLoaderTest(ITestOutputHelper output) {
       this.output = new WriterFromOutputHelper(output);
       parser = new();
       symbolResolver = new();
-      symbolTableFactory = new();
-      ghostStateDiagnosticCollector = new();
-      notificationPublisher = new();
       fileSystem = new();
       logger = new Mock<ILogger<ITextDocumentLoader>>();
-      diagnosticPublisher = new Mock<INotificationPublisher>();
-      textDocumentLoader = TextDocumentLoader.Create(
+      textDocumentLoader = new TextDocumentLoader(
+        logger.Object,
         parser.Object,
-        symbolResolver.Object,
-        symbolTableFactory.Object,
-        ghostStateDiagnosticCollector.Object,
-        notificationPublisher.Object,
-        logger.Object
+        symbolResolver.Object
       );
     }
 
@@ -55,24 +44,14 @@ private static VersionedTextDocumentIdentifier CreateTestDocumentId() {
       };
     }
 
-    private static DocumentTextBuffer CreateTestDocument() {
-      return new DocumentTextBuffer(new TextDocumentItem() {
-        Uri = DocumentUri.Parse("untitled:untitled1"),
-        LanguageId = "dafny",
-        Version = 1,
-        Text = ""
-      });
-    }
-
     [Fact]
     public async Task LoadReturnsCanceledTaskIfOperationIsCanceled() {
       var source = new CancellationTokenSource();
       parser.Setup(p => p.Parse(
           It.IsAny<Compilation>(),
-          It.IsAny<ErrorReporter>(),
           It.IsAny<CancellationToken>())).Callback(() => source.Cancel())
         .Throws<TaskCanceledException>();
-      var task = textDocumentLoader.ParseAsync(DafnyOptions.Default, GetCompilation(), ImmutableDictionary<Uri, VerificationTree>.Empty, source.Token);
+      var task = textDocumentLoader.ParseAsync(GetCompilation(), source.Token);
       try {
         await task;
         Assert.Fail("document load was not cancelled");
@@ -83,19 +62,26 @@ public async Task LoadReturnsCanceledTaskIfOperationIsCanceled() {
       }
     }
 
-    private static Compilation GetCompilation() {
+    private Compilation GetCompilation() {
       var versionedTextDocumentIdentifier = CreateTestDocumentId();
-      var compilation = new Compilation(0, ProjectManagerDatabase.ImplicitProject(versionedTextDocumentIdentifier.Uri.ToUri()), new[] { versionedTextDocumentIdentifier.Uri.ToUri() });
+      var uri = versionedTextDocumentIdentifier.Uri.ToUri();
+      var fs = new InMemoryFileSystem(ImmutableDictionary<Uri, string>.Empty.Add(uri, ""));
+      var file = DafnyFile.HandleDafnyFile(fs, new ErrorReporterSink(DafnyOptions.Default), DafnyOptions.Default, uri, Token.NoToken, false);
+      var input = new CompilationInput(DafnyOptions.Default, 0, ProjectManagerDatabase.ImplicitProject(uri));
+      var engine = new ExecutionEngine(DafnyOptions.Default, new VerificationResultCache(),
+        CustomStackSizePoolTaskScheduler.Create(0, 0));
+      var compilation = new Compilation(new Mock<ILogger<Compilation>>().Object, new Mock<IFileSystem>().Object, textDocumentLoader,
+        new Mock<IProgramVerifier>().Object, engine, input);
+      compilation.RootFiles = Task.FromResult<IReadOnlyList<DafnyFile>>(new[] { file });
       return compilation;
     }
 
     [Fact]
     public async Task LoadReturnsFaultedTaskIfAnyExceptionOccured() {
       parser.Setup(p => p.Parse(It.IsAny<Compilation>(),
-          It.IsAny<ErrorReporter>(),
           It.IsAny<CancellationToken>()))
         .Throws<InvalidOperationException>();
-      var task = textDocumentLoader.ParseAsync(DafnyOptions.Default, GetCompilation(), ImmutableDictionary<Uri, VerificationTree>.Empty, default);
+      var task = textDocumentLoader.ParseAsync(GetCompilation(), default);
       try {
         await task;
         Assert.Fail("document load did not fail");
diff --git a/Source/DafnyLanguageServer.Test/Unit/TextReaderFromCharArraysTest.cs b/Source/DafnyLanguageServer.Test/Unit/TextReaderFromCharArraysTest.cs
index 4049b445c23..43cd7185c8f 100644
--- a/Source/DafnyLanguageServer.Test/Unit/TextReaderFromCharArraysTest.cs
+++ b/Source/DafnyLanguageServer.Test/Unit/TextReaderFromCharArraysTest.cs
@@ -2,7 +2,7 @@
 using Microsoft.Dafny.LanguageServer.Language;
 using Xunit;
 
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Unit; 
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Unit;
 
 public class TextReaderFromCharArraysTest {
 
diff --git a/Source/DafnyLanguageServer.Test/Util/ClientBasedLanguageServerTest.cs b/Source/DafnyLanguageServer.Test/Util/ClientBasedLanguageServerTest.cs
index c1895ad4797..836b8d0c59b 100644
--- a/Source/DafnyLanguageServer.Test/Util/ClientBasedLanguageServerTest.cs
+++ b/Source/DafnyLanguageServer.Test/Util/ClientBasedLanguageServerTest.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.IO;
 using System.Linq;
 using System.Reactive.Threading.Tasks;
 using System.Text.RegularExpressions;
@@ -13,9 +14,11 @@
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Client;
+using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client;
 using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using OmniSharp.Extensions.LanguageServer.Protocol.Window;
 using Xunit.Abstractions;
 using Xunit;
 using Xunit.Sdk;
@@ -29,6 +32,7 @@ public class ClientBasedLanguageServerTest : DafnyLanguageServerTestBase, IAsync
   protected ILanguageClient client;
   protected TestNotificationReceiver<FileVerificationStatus> verificationStatusReceiver;
   protected TestNotificationReceiver<CompilationStatusParams> compilationStatusReceiver;
+  protected TestNotificationReceiver<TelemetryEventParams> telemetryReceiver;
   protected DiagnosticsReceiver diagnosticsReceiver;
   protected TestNotificationReceiver<GhostDiagnosticsParams> ghostnessReceiver;
 
@@ -46,17 +50,27 @@ protected ClientBasedLanguageServerTest(ITestOutputHelper output, LogLevel dafny
     : base(output, dafnyLogLevel) {
   }
 
-  protected async Task<TextDocumentItem> CreateAndOpenTestDocument(string source, string filePath = null,
+  protected TextDocumentItem CreateAndOpenTestDocument(string source, string filePath = null,
     int version = 1) {
     var document = CreateTestDocument(source, filePath, version);
-    await client.OpenDocumentAndWaitAsync(document, CancellationToken);
+    client.OpenDocument(document);
     return document;
   }
 
+  protected async Task<TextDocumentItem> CreateOpenAndWaitForResolve(string source, string filePath = null,
+    int version = 1, CancellationToken? cancellationToken = null) {
+    var document = CreateTestDocument(source, filePath, version);
+    await client.OpenDocumentAndWaitAsync(document, cancellationToken ?? CancellationToken);
+    return document;
+  }
+
+  protected async Task AssertVerificationHoverMatches(TextDocumentItem documentItem, Position hoverPosition,
+    [CanBeNull] string expected) {
+    await WaitUntilAllStatusAreCompleted(documentItem, CancellationToken, false);
+    await AssertHoverMatches(documentItem, hoverPosition, expected);
+  }
+
   protected async Task AssertHoverMatches(TextDocumentItem documentItem, Position hoverPosition, [CanBeNull] string expected) {
-    if (expected != null && errorTests.Matches(expected).Count >= 2) {
-      Assert.Fail("Found multiple hover messages in one test; the order is currently not stable, so please test one at a time.");
-    }
     var hover = await RequestHover(documentItem, hoverPosition);
     if (expected == null) {
       Assert.True(hover == null || hover.Contents.MarkupContent is null or { Value: "" });
@@ -82,24 +96,27 @@ private Task<Hover> RequestHover(TextDocumentItem documentItem, Position positio
   private void AssertMatchRegex(string expected, string value) {
     var regexExpected = Regex.Escape(expected).Replace(@"\?\?\?", "[\\s\\S]*");
     var matched = new Regex(regexExpected).Match(value).Success;
-    if (!matched) {
-      // A simple helper to determine what portion of the regex did not match
-      var helper = "";
-      foreach (var chunk in expected.Split("???")) {
-        if (!value.Contains(chunk)) {
-          helper += $"\nThe result string did not contain '{chunk}'";
-        }
+    if (matched) {
+      return;
+    }
+
+    // A simple helper to determine what portion of the regex did not match
+    var helper = "";
+    foreach (var chunk in expected.Split("???")) {
+      if (!value.Contains(chunk)) {
+        helper += $"\nThe result string did not contain '{chunk}'";
       }
-      Assert.Fail($"{value} did not match {regexExpected}." + helper);
     }
+    Assert.Fail($"value '{value}' did not match {regexExpected}." + helper);
   }
 
-  public async Task<NamedVerifiableStatus> WaitForStatus(Range nameRange, PublishedVerificationStatus statusToFind,
-    CancellationToken cancellationToken, [CanBeNull] TextDocumentIdentifier documentIdentifier = null) {
+  public async Task<NamedVerifiableStatus> WaitForStatus([CanBeNull] Range nameRange, PublishedVerificationStatus statusToFind,
+    CancellationToken? cancellationToken = null, [CanBeNull] TextDocumentIdentifier documentIdentifier = null) {
+    cancellationToken ??= CancellationToken;
     while (true) {
       try {
-        var foundStatus = await verificationStatusReceiver.AwaitNextNotificationAsync(cancellationToken);
-        var namedVerifiableStatus = foundStatus.NamedVerifiables.FirstOrDefault(n => n.NameRange == nameRange);
+        var foundStatus = await verificationStatusReceiver.AwaitNextNotificationAsync(cancellationToken.Value);
+        var namedVerifiableStatus = foundStatus.NamedVerifiables.FirstOrDefault(n => nameRange == null || n.NameRange == nameRange);
         if (namedVerifiableStatus?.Status == statusToFind) {
           if (documentIdentifier != null) {
             Assert.Equal(documentIdentifier.Uri, foundStatus.Uri);
@@ -116,7 +133,10 @@ public async Task<NamedVerifiableStatus> WaitForStatus(Range nameRange, Publishe
 
   protected void WriteVerificationHistory() {
     output.WriteLine($"\nOld to new history was:");
-    verificationStatusReceiver.History.Stringify(output);
+    verificationStatusReceiver.History.Stringify(output,
+      overrides: StringifyUtil.EmptyOverrides().
+        UseToString(typeof(Range)).
+        UseToString(typeof(DocumentUri)));
   }
 
   public async Task<IList<FileVerificationStatus>> WaitUntilCompletedForUris(int uriCount, CancellationToken cancellationToken) {
@@ -153,28 +173,66 @@ public async Task<IEnumerable<DocumentSymbol>> RequestDocumentSymbol(TextDocumen
     return things.Select(t => t.DocumentSymbol!);
   }
 
-  public async Task<PublishDiagnosticsParams> GetLastDiagnosticsParams(TextDocumentItem documentItem, CancellationToken cancellationToken) {
-    await client.WaitForNotificationCompletionAsync(documentItem.Uri, cancellationToken);
-    var compilation = (await Projects.GetLastDocumentAsync(documentItem))!;
-    Assert.NotNull(compilation);
-    var expectedDiagnostics = compilation.GetDiagnostics(documentItem.Uri.ToUri()).
-      Select(d => d.ToLspDiagnostic()).
-      OrderBy(d => d.Range.Start).ToList();
-    PublishDiagnosticsParams result;
-    while (true) {
-      result = await diagnosticsReceiver.AwaitNextNotificationAsync(cancellationToken);
-      if (result.Uri == documentItem.Uri && result.Diagnostics.OrderBy(d => d.Range.Start).
-            SequenceEqual(expectedDiagnostics)) {
-        break;
+  protected async Task<FileVerificationStatus> WaitUntilAllStatusAreCompleted(TextDocumentItem documentId,
+    CancellationToken? cancellationToken = null,
+    bool allowStale = false) {
+    cancellationToken ??= CancellationToken;
+
+    if ((!await WaitUntilResolutionFinished(documentId, cancellationToken.Value))) {
+      return null;
+    }
+
+    var fileVerificationStatus = verificationStatusReceiver.GetLatestAndClearQueue(v => v.Uri == documentId.Uri);
+    if (fileVerificationStatus != null && fileVerificationStatus.Version == documentId.Version) {
+      while (fileVerificationStatus.Uri != documentId.Uri || !fileVerificationStatus.NamedVerifiables.All(FinishedStatus)) {
+        fileVerificationStatus = await verificationStatusReceiver.AwaitNextNotificationAsync(cancellationToken.Value);
       }
     }
 
+    return fileVerificationStatus;
+
+    bool FinishedStatus(NamedVerifiableStatus method) {
+      if (allowStale && method.Status == PublishedVerificationStatus.Stale) {
+        return true;
+      }
+
+      return method.Status >= PublishedVerificationStatus.Error;
+    }
+  }
+
+  public async Task<bool> WaitUntilResolutionFinished(TextDocumentItem documentId,
+    CancellationToken cancellationToken = default, bool allowException = false) {
+
+    CompilationStatusParams compilationStatusParams = compilationStatusReceiver.GetLatestAndClearQueue(s => s.Uri == documentId.Uri);
+    while (compilationStatusParams == null || compilationStatusParams.Version != documentId.Version || compilationStatusParams.Uri != documentId.Uri ||
+           compilationStatusParams.Status is CompilationStatus.Parsing or CompilationStatus.ResolutionStarted) {
+      compilationStatusParams = await compilationStatusReceiver.AwaitNextNotificationAsync(cancellationToken);
+    }
+
+    if (!allowException && compilationStatusParams.Status == CompilationStatus.InternalException) {
+      throw new Exception("Encountered internal exception");
+    }
+    return compilationStatusParams.Status == CompilationStatus.ResolutionSucceeded;
+  }
+
+  public async Task<PublishDiagnosticsParams> GetLatestDiagnosticsParams(TextDocumentItem documentItem, CancellationToken cancellationToken, bool allowStale = false) {
+    var status = await WaitUntilAllStatusAreCompleted(documentItem, cancellationToken, allowStale);
+    var result = diagnosticsReceiver.GetLatestAndClearQueue(d => d.Uri == documentItem.Uri);
+    while (result == null) {
+      var diagnostics = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
+      if (diagnostics.Uri == documentItem.Uri) {
+        result = diagnostics;
+      }
+      logger.LogInformation(
+        $"GetLastDiagnosticsParams didn't find the right diagnostics after getting status {status}. Waited to get these diagnostics: {diagnostics.Stringify()}");
+    }
     return result;
   }
 
-  public async Task<Diagnostic[]> GetLastDiagnostics(TextDocumentItem documentItem, CancellationToken cancellationToken) {
-    var paramsResult = await GetLastDiagnosticsParams(documentItem, CancellationToken);
-    return paramsResult.Diagnostics.ToArray();
+  public async Task<Diagnostic[]> GetLastDiagnostics(TextDocumentItem documentItem, DiagnosticSeverity minimumSeverity = DiagnosticSeverity.Warning,
+    CancellationToken? cancellationToken = null, bool allowStale = false) {
+    var paramsResult = await GetLatestDiagnosticsParams(documentItem, cancellationToken ?? CancellationToken, allowStale);
+    return paramsResult.Diagnostics.Where(d => d.Severity <= minimumSeverity).ToArray();
   }
 
   public virtual Task InitializeAsync() {
@@ -182,24 +240,25 @@ public virtual Task InitializeAsync() {
   }
 
   public Task DisposeAsync() {
-    return Task.CompletedTask;
+    return client.Shutdown();
   }
 
   protected virtual async Task SetUp(Action<DafnyOptions> modifyOptions) {
-
     // We use a custom cancellation token with a higher timeout to clearly identify where the request got stuck.
     cancellationSource = new();
     cancellationSource.CancelAfter(MaxRequestExecutionTimeMs);
 
-    diagnosticsReceiver = new();
-    compilationStatusReceiver = new();
-    verificationStatusReceiver = new();
-    ghostnessReceiver = new();
+    diagnosticsReceiver = new(logger);
+    compilationStatusReceiver = new(logger);
+    telemetryReceiver = new(logger);
+    verificationStatusReceiver = new(logger);
+    ghostnessReceiver = new(logger);
     (client, Server) = await Initialize(InitialiseClientHandler, modifyOptions);
   }
 
   protected virtual void InitialiseClientHandler(LanguageClientOptions options) {
     options.OnPublishDiagnostics(diagnosticsReceiver.NotificationReceived);
+    options.OnTelemetryEvent(telemetryReceiver.NotificationReceived);
     options.AddHandler(DafnyRequestNames.CompilationStatus,
       NotificationHandler.For<CompilationStatusParams>(compilationStatusReceiver.NotificationReceived));
     options.AddHandler(DafnyRequestNames.GhostDiagnostics,
@@ -244,16 +303,9 @@ protected void ApplyChanges(ref TextDocumentItem documentItem, List<Change> chan
     });
   }
 
-  public async Task AssertNoVerificationStatusIsComing(TextDocumentItem documentItem, CancellationToken cancellationToken) {
-    foreach (var entry in Projects.Managers) {
-      try {
-        await entry.GetLastDocumentAsync();
-      } catch (TaskCanceledException) {
-
-      }
-    }
-    var verificationDocumentItem = CreateTestDocument("method Foo() { assert false; }", $"verification{fileIndex++}.dfy");
-    await client.OpenDocumentAndWaitAsync(verificationDocumentItem, CancellationToken);
+  protected async Task AssertNoVerificationStatusIsComing(TextDocumentItem documentItem, CancellationToken cancellationToken) {
+    var verificationDocumentItem = CreateTestDocument("method Foo() { assert false; }", $"verificationStatus{fileIndex++}.dfy");
+    await client.OpenDocumentAndWaitAsync(verificationDocumentItem, cancellationToken);
     var statusReport = await verificationStatusReceiver.AwaitNextNotificationAsync(cancellationToken);
     try {
       Assert.Equal(verificationDocumentItem.Uri, statusReport.Uri);
@@ -263,64 +315,66 @@ public async Task AssertNoVerificationStatusIsComing(TextDocumentItem documentIt
     client.DidCloseTextDocument(new DidCloseTextDocumentParams {
       TextDocument = verificationDocumentItem
     });
+    var emptyReport = await verificationStatusReceiver.AwaitNextNotificationAsync(cancellationToken);
   }
 
-  public async Task AssertNoGhostnessIsComing(CancellationToken cancellationToken) {
-    foreach (var entry in Projects.Managers) {
-      try {
-        await entry.GetLastDocumentAsync();
-      } catch (TaskCanceledException) {
+  protected async Task<Diagnostic[]> GetNextDiagnostics(TextDocumentItem documentItem, CancellationToken? cancellationToken = null, DiagnosticSeverity minimumSeverity = DiagnosticSeverity.Warning) {
+    cancellationToken ??= CancellationToken;
+    var result = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(cancellationToken.Value, documentItem);
+    return result.Where(d => d.Severity <= minimumSeverity).ToArray();
+  }
+
+  protected async Task AssertNoDiagnosticsAreComing(CancellationToken cancellationToken, TextDocumentItem forDocument = null, DiagnosticSeverity minimumSeverity = DiagnosticSeverity.Warning) {
 
+    var verificationDocumentItem = CreateTestDocument("class X {does not parse", $"AssertNoDiagnosticsAreComing{fileIndex++}.dfy");
+    await client.OpenDocumentAndWaitAsync(verificationDocumentItem, cancellationToken);
+
+    while (true) {
+      var resolutionReport = await diagnosticsReceiver.AwaitNextNotificationAsync(cancellationToken);
+      if (verificationDocumentItem.Uri.Equals(resolutionReport.Uri)) {
+        break;
       }
+
+      if (forDocument != null && !forDocument.Uri.Equals(resolutionReport.Uri)) {
+        continue;
+      }
+
+      if (!resolutionReport.Diagnostics.Any(d => d.Severity <= minimumSeverity)) {
+        continue;
+      }
+
+      AssertM.Equal(verificationDocumentItem.Uri, resolutionReport.Uri,
+        "1) Unexpected diagnostics were received whereas none were expected:\n" +
+        string.Join(",", resolutionReport.Diagnostics.Select(diagnostic => diagnostic.ToString())));
     }
-    var verificationDocumentItem = CreateTestDocument(@"class X {does not parse", $"verification{fileIndex++}.dfy");
-    await client.OpenDocumentAndWaitAsync(verificationDocumentItem, CancellationToken);
-    var resolutionReport = await diagnosticsReceiver.AwaitNextNotificationAsync(cancellationToken);
-    AssertM.Equal(verificationDocumentItem.Uri, resolutionReport.Uri,
-      "Unexpected diagnostics were received whereas none were expected:\n" +
-      string.Join(",", resolutionReport.Diagnostics.Select(diagnostic =>
-        diagnostic.ToString())));
     client.DidCloseTextDocument(new DidCloseTextDocumentParams {
       TextDocument = verificationDocumentItem
     });
-    var hideReport = await diagnosticsReceiver.AwaitNextNotificationAsync(cancellationToken);
-    Assert.Equal(verificationDocumentItem.Uri, hideReport.Uri);
-  }
 
-  public async Task AssertNoDiagnosticsAreComing(CancellationToken cancellationToken, bool waitFirst = true) {
-    if (waitFirst) {
-      foreach (var entry in Projects.Managers) {
-        try {
-          await entry.GetLastDocumentAsync().WaitAsync(cancellationToken);
-        } catch (TaskCanceledException) {
+    while (true) {
+      var hideReport = await diagnosticsReceiver.AwaitNextNotificationAsync(cancellationToken);
+      if (verificationDocumentItem.Uri.Equals(hideReport.Uri)) {
+        break;
+      }
+
+      if (forDocument != null && !forDocument.Uri.Equals(hideReport.Uri)) {
+        continue;
+      }
 
-        }
+      if (!hideReport.Diagnostics.Any(d => d.Severity <= minimumSeverity)) {
+        continue;
       }
+
+      AssertM.Equal(verificationDocumentItem.Uri, hideReport.Uri,
+        "2) Unexpected diagnostics were received whereas none were expected:\n" +
+        string.Join(",", hideReport.Diagnostics.Select(diagnostic => diagnostic.ToString())));
     }
-    var verificationDocumentItem = CreateTestDocument("class X {does not parse", $"AssertNoDiagnosticsAreComing{fileIndex++}.dfy");
-    await client.OpenDocumentAndWaitAsync(verificationDocumentItem, CancellationToken);
-    var resolutionReport = await diagnosticsReceiver.AwaitNextNotificationAsync(cancellationToken);
-    AssertM.Equal(verificationDocumentItem.Uri, resolutionReport.Uri,
-      "1) Unexpected diagnostics were received whereas none were expected:\n" +
-      string.Join(",", resolutionReport.Diagnostics.Select(diagnostic => diagnostic.ToString())));
-    client.DidCloseTextDocument(new DidCloseTextDocumentParams {
-      TextDocument = verificationDocumentItem
-    });
-    var hideReport = await diagnosticsReceiver.AwaitNextNotificationAsync(cancellationToken);
-    AssertM.Equal(verificationDocumentItem.Uri, hideReport.Uri,
-      "2) Unexpected diagnostics were received whereas none were expected:\n" +
-      string.Join(",", hideReport.Diagnostics.Select(diagnostic => diagnostic.ToString())));
   }
 
   protected async Task AssertNoResolutionErrors(TextDocumentItem documentItem) {
-    var fullDiagnostics = (await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem))!.GetDiagnostics();
     // A document without diagnostics may be absent, even if resolved successfully
-    var resolutionDiagnostics = fullDiagnostics.GetValueOrDefault(documentItem.Uri.ToUri(), ImmutableList<Diagnostic>.Empty);
-    var resolutionErrors = resolutionDiagnostics.Count(d => d.Severity == DiagnosticSeverity.Error);
-    if (0 != resolutionErrors) {
-      await Console.Out.WriteAsync(string.Join("\n", resolutionDiagnostics.Where(d => d.Severity == DiagnosticSeverity.Error).Select(d => d.ToString())));
-      Assert.Equal(0, resolutionErrors);
-    }
+    var success = await WaitUntilResolutionFinished(documentItem, CancellationToken);
+    Assert.True(success);
   }
 
   public async Task<PublishedVerificationStatus> PopNextStatus() {
@@ -340,12 +394,16 @@ protected Task<LocationOrLocationLinks> RequestDefinition(TextDocumentItem docum
     ).AsTask();
   }
 
-  protected Task ApplyChangesAndWaitCompletionAsync(TextDocumentItem documentItem,
+  protected Task ApplyChangesAndWaitCompletionAsync(ref TextDocumentItem documentItem,
     params TextDocumentContentChangeEvent[] changes) {
-    return ApplyChangesAndWaitCompletionAsync(new VersionedTextDocumentIdentifier() {
+    var result = ApplyChangesAndWaitCompletionAsync(new VersionedTextDocumentIdentifier() {
       Version = documentItem.Version!.Value,
       Uri = documentItem.Uri
     }, changes);
+    documentItem = documentItem with {
+      Version = documentItem.Version + 1
+    };
+    return result;
   }
 
   protected Task ApplyChangesAndWaitCompletionAsync(VersionedTextDocumentIdentifier documentItem, params TextDocumentContentChangeEvent[] changes) {
@@ -358,4 +416,34 @@ protected Task ApplyChangesAndWaitCompletionAsync(VersionedTextDocumentIdentifie
     });
     return client.WaitForNotificationCompletionAsync(documentItem.Uri, CancellationToken);
   }
-}
+
+  protected async Task<TextDocumentItem> GetDocumentItem(string source, string filename, bool includeProjectFile) {
+    var directory = GetFreshTempPath();
+    source = source.TrimStart();
+    if (includeProjectFile) {
+      var projectFile = CreateTestDocument("", Path.Combine(directory, DafnyProject.FileName));
+      await client.OpenDocumentAndWaitAsync(projectFile, CancellationToken);
+    }
+    var documentItem = CreateTestDocument(source, Path.Combine(directory, filename));
+    await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+    return documentItem;
+  }
+
+  /// <summary>
+  /// Given <paramref name="source"/> with N positions, for each K from 0 to N exclusive,
+  /// assert that a RequestDefinition at position K
+  /// returns either the Kth range, or the range with key K (as a string).
+  /// </summary>
+  protected async Task AssertPositionsLineUpWithRanges(string source, string filePath = null) {
+    MarkupTestFile.GetPositionsAndNamedRanges(source, out var cleanSource,
+      out var positions, out var ranges);
+
+    var documentItem = await CreateOpenAndWaitForResolve(cleanSource, filePath);
+    for (var index = 0; index < positions.Count; index++) {
+      var position = positions[index];
+      var range = ranges.ContainsKey(index.ToString()) ? ranges[index.ToString()].Single() : ranges[string.Empty][index];
+      var result = (await RequestDefinition(documentItem, position)).Single();
+      Assert.Equal(range, result.Location!.Range);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Util/DiagnosticsReceiver.cs b/Source/DafnyLanguageServer.Test/Util/DiagnosticsReceiver.cs
index d25ef82973b..b624fa1ddab 100644
--- a/Source/DafnyLanguageServer.Test/Util/DiagnosticsReceiver.cs
+++ b/Source/DafnyLanguageServer.Test/Util/DiagnosticsReceiver.cs
@@ -1,6 +1,9 @@
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Xunit;
 using XunitAssertMessages;
@@ -9,20 +12,43 @@ namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 
 public class DiagnosticsReceiver : TestNotificationReceiver<PublishDiagnosticsParams> {
 
+
+  static DiagnosticsReceiver() {
+    StringifyUtil.AddGlobalOverride<DocumentUri>((par, writer) => {
+      writer.Write(par.ToString());
+    });
+    StringifyUtil.AddGlobalOverride<Diagnostic>((par, writer) => {
+      writer.Write(par.ToString());
+    });
+    StringifyUtil.AddGlobalOverride<PublishDiagnosticsParams>((par, writer) => {
+      writer.Write($"{{ Uri: {par.Uri}, Diags: {par.Diagnostics.Stringify()} }}");
+    });
+  }
+
   public async Task<Diagnostic[]> AwaitNextWarningOrErrorDiagnosticsAsync(CancellationToken cancellationToken,
     TextDocumentItem textDocumentItem = null) {
     var result = await AwaitNextDiagnosticsAsync(cancellationToken, textDocumentItem);
     return result.Where(d => d.Severity <= DiagnosticSeverity.Warning).ToArray();
   }
 
+  public Diagnostic[] GetLatestAndClearQueue(TextDocumentIdentifier document, DiagnosticSeverity minimumSeverity = DiagnosticSeverity.Warning) {
+    var last = GetLatestAndClearQueue(d => d.Uri == document.Uri);
+    return last?.Diagnostics.Where(d => d.Severity <= minimumSeverity).ToArray() ?? Array.Empty<Diagnostic>();
+  }
+
   public async Task<Diagnostic[]> AwaitNextDiagnosticsAsync(CancellationToken cancellationToken,
     TextDocumentItem textDocumentItem = null) {
     var result = await AwaitNextNotificationAsync(cancellationToken);
     if (textDocumentItem != null) {
-      AssertM.Equal(textDocumentItem.Version, result.Version,
-        $"result diagnostics were: [{string.Join(", ", result.Diagnostics)}]");
+      // Before parsing finishes, the version can be null even for open files.
+      var resultVersion = result.Version ?? textDocumentItem.Version;
+      AssertM.Equal(textDocumentItem.Version, resultVersion,
+        $"received incorrect version, diagnostics were: [{string.Join(", ", result.Diagnostics)}]");
       Assert.Equal(textDocumentItem.Uri, result.Uri);
     }
     return result.Diagnostics.ToArray();
   }
+
+  public DiagnosticsReceiver(ILogger logger) : base(logger) {
+  }
 }
diff --git a/Source/DafnyLanguageServer.Test/Util/Stringify.cs b/Source/DafnyLanguageServer.Test/Util/Stringify.cs
deleted file mode 100644
index ab123ea7a96..00000000000
--- a/Source/DafnyLanguageServer.Test/Util/Stringify.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-#nullable enable
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
-
-public static class StringifyUtil {
-
-  public static void Stringify(this object root, TextWriter writer, bool showNullChildren = false) {
-
-    void Helper(ImmutableHashSet<object> visited, object? value, int indentation) {
-      if (value == null) {
-        writer.Write("null");
-        return;
-      }
-
-      if (value is string) {
-        writer.Write($"\"{value}\"");
-        return;
-      }
-
-      var newIndentation = indentation + 2;
-      if (value is IEnumerable enumerable) {
-        var sep = "";
-        writer.Write("[");
-        foreach (var child in enumerable) {
-          writer.WriteLine(sep);
-          writer.Write(new String(' ', newIndentation));
-          Helper(visited, child, newIndentation);
-          sep = ", ";
-        }
-
-        if (sep != "") {
-          writer.WriteLine();
-          writer.Write(new String(' ', indentation));
-        }
-        writer.Write("]");
-
-        return;
-      }
-
-      var type = value.GetType();
-      var isKeyValuePair = type.Name == "KeyValuePair`2";
-      if (type.Namespace?.StartsWith("System") == true && !isKeyValuePair) {
-        writer.Write(value);
-        return;
-      }
-
-
-      if (visited.Contains(value)) {
-        writer.Write("<visited>");
-        return;
-      }
-
-      var newVisited = visited.Add(value);
-
-      writer.Write((isKeyValuePair ? "" : (type.Name + " ")) + "{");
-      var objectSep = "";
-      var properties = type.GetProperties();
-      foreach (var property in properties) {
-        var child = property.GetValue(value);
-        if (!showNullChildren && child == null) {
-          continue;
-        }
-
-        writer.WriteLine(objectSep);
-        writer.Write(new String(' ', newIndentation));
-        writer.Write(property.Name + " = ");
-        Helper(newVisited, child, newIndentation);
-        objectSep = ",";
-      }
-
-      writer.WriteLine();
-      writer.Write(new String(' ', indentation) + "}");
-    }
-
-    Helper(ImmutableHashSet.Create<object>(), root, 0);
-  }
-
-  public static string Stringify(this object root, bool showNullChildren = false) {
-    var stringWriter = new StringWriter();
-    Stringify(root, stringWriter, showNullChildren);
-    return stringWriter.ToString();
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/Util/StringifyTest.cs b/Source/DafnyLanguageServer.Test/Util/StringifyTest.cs
index 7306abaa247..f0b678f03ac 100644
--- a/Source/DafnyLanguageServer.Test/Util/StringifyTest.cs
+++ b/Source/DafnyLanguageServer.Test/Util/StringifyTest.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Xunit;
 
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Util; 
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 
 public class StringifyTest {
 
diff --git a/Source/DafnyLanguageServer.Test/Util/TestNotificationReceiver.cs b/Source/DafnyLanguageServer.Test/Util/TestNotificationReceiver.cs
index 1e9fe25f081..94d4d114fda 100644
--- a/Source/DafnyLanguageServer.Test/Util/TestNotificationReceiver.cs
+++ b/Source/DafnyLanguageServer.Test/Util/TestNotificationReceiver.cs
@@ -1,24 +1,40 @@
-using System.Collections.Concurrent;
+#nullable enable
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Boogie;
+using Microsoft.Extensions.Logging;
+using Xunit;
 
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Util {
+
   /// <summary>
   /// Test-class to receive and handle notifications sent by the language server.
   /// </summary>
   /// <typeparam name="TNotification">The type of the notifications sent by the language server.</typeparam>
   public class TestNotificationReceiver<TNotification> {
-    private readonly SemaphoreSlim availableNotifications = new(0);
-    private readonly ConcurrentQueue<TNotification> notifications = new();
+
+    private readonly AsyncQueue<TNotification> notifications = new();
     private readonly List<TNotification> notificationHistory = new();
+    private readonly ILogger logger;
+
+    public TestNotificationReceiver(ILogger logger) {
+      this.logger = logger;
+    }
 
     public void NotificationReceived(TNotification request) {
-      notifications.Enqueue(request);
-      availableNotifications.Release();
+      Assert.NotNull(request);
+      logger.LogTrace($"Received {request.Stringify()}");
+
+      lock (this) {
+        notificationHistory.Add(request);
+        notifications.Enqueue(request);
+      }
     }
 
-    public bool HasPendingNotifications => !notifications.IsEmpty;
+    public bool HasPendingNotifications => notifications.Size != 0;
 
     public IReadOnlyList<TNotification> History => notificationHistory;
 
@@ -26,13 +42,26 @@ public void ClearHistory() {
       notificationHistory.Clear();
     }
 
+    public TNotification? GetLatestAndClearQueue(Func<TNotification, bool> predicate) {
+      lock (this) {
+        while (notifications.Size > 0) {
+          _ = notifications.Dequeue();
+        }
+
+        return History.LastOrDefault(predicate);
+      }
+    }
+
     public async Task<TNotification> AwaitNextNotificationAsync(CancellationToken cancellationToken) {
-      await availableNotifications.WaitAsync(cancellationToken);
-      if (notifications.TryDequeue(out var notification)) {
-        notificationHistory.Add(notification);
-        return notification;
+      var start = DateTime.Now;
+      try {
+        return await notifications.Dequeue().WaitAsync(cancellationToken);
+      } catch (OperationCanceledException) {
+        var last = History.Any() ? History[^1].Stringify() : "none";
+        logger.LogInformation($"Waited for {(DateTime.Now - start).Seconds} seconds for new notification.\n" +
+                              $"Last received notification was {last}");
+        throw;
       }
-      throw new System.InvalidOperationException("got a signal for a received notification but it was not present in the queue");
     }
   }
 }
diff --git a/Source/DafnyLanguageServer.Test/Various/CancelVerificationTest.cs b/Source/DafnyLanguageServer.Test/Various/CancelVerificationTest.cs
index fcb5527a26b..ea89bc035ad 100644
--- a/Source/DafnyLanguageServer.Test/Various/CancelVerificationTest.cs
+++ b/Source/DafnyLanguageServer.Test/Various/CancelVerificationTest.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Xunit;
 using Xunit.Abstractions;
@@ -17,13 +18,17 @@ public async Task ChangingTheDocumentStopsOnChangeVerification() {
       await SetUp(options => {
         options.Set(BoogieOptionBag.Cores, 2U);
       });
-      var documentItem = CreateTestDocument(SlowToVerify2);
+      var documentItem = CreateTestDocument(SlowToVerify2, "ChangingTheDocumentStopsOnChangeVerification.dfy");
       client.OpenDocument(documentItem);
 
-      await WaitForStatus(new Range(11, 23, 11, 27), PublishedVerificationStatus.Running, CancellationToken);
+      await WaitForStatus(new Range(11, 32, 11, 36), PublishedVerificationStatus.Running, CancellationToken);
 
       // Should cancel the previous request.
       ApplyChange(ref documentItem, new Range((12, 9), (12, 23)), "true");
+
+      // Next line is only to gather more information for solving https://github.com/dafny-lang/dafny/issues/5436 
+      await WaitUntilResolutionFinished(documentItem);
+
       await AssertNothingIsQueued(documentItem);
     }
 
@@ -31,13 +36,13 @@ await SetUp(options => {
     public async Task ChangingTheDocumentStopsOnSaveVerification() {
       await SetUp(options => {
         options.Set(BoogieOptionBag.Cores, 2U);
-        options.Set(ServerCommand.Verification, VerifyOnMode.Save);
+        options.Set(ProjectManager.Verification, VerifyOnMode.Save);
       });
-      var documentItem = CreateTestDocument(SlowToVerify2);
+      var documentItem = CreateTestDocument(SlowToVerify2, "ChangingTheDocumentStopsOnSaveVerification.dfy");
       client.OpenDocument(documentItem);
       client.SaveDocument(documentItem);
 
-      await WaitForStatus(new Range(11, 23, 11, 27), PublishedVerificationStatus.Running, CancellationToken);
+      await WaitForStatus(new Range(11, 32, 11, 36), PublishedVerificationStatus.Running, CancellationToken);
 
       // Should cancel the previous request.
       ApplyChange(ref documentItem, new Range((12, 9), (12, 23)), "true");
@@ -50,14 +55,13 @@ await SetUp(options => {
     public async Task ChangingTheDocumentStopsManualVerification() {
       await SetUp(options => {
         options.Set(BoogieOptionBag.Cores, 2U);
-        options.Set(ServerCommand.Verification, VerifyOnMode.Save);
+        options.Set(ProjectManager.Verification, VerifyOnMode.Save);
       });
-      var documentItem = CreateTestDocument(SlowToVerify2);
-      client.OpenDocument(documentItem);
+      var documentItem = CreateAndOpenTestDocument(SlowToVerify2, "ChangingTheDocumentStopsManualVerification.dfy");
       Assert.True(await client.RunSymbolVerification(documentItem, new Position(11, 23), CancellationToken));
       Assert.True(await client.RunSymbolVerification(documentItem, new Position(0, 23), CancellationToken));
 
-      await WaitForStatus(new Range(11, 23, 11, 27), PublishedVerificationStatus.Running, CancellationToken);
+      await WaitForStatus(new Range(11, 32, 11, 36), PublishedVerificationStatus.Running, CancellationToken);
 
       // Should cancel the previous request.
       ApplyChange(ref documentItem, new Range((12, 9), (12, 23)), "true");
@@ -80,7 +84,7 @@ await SetUp(options => {
     Ack(m - 1, Ack(m, n - 1))
 }
 
-method {:timeLimit 10} test() {
+method {:resource_limit ""10e6""} test() {
   assert Ack(5, 5) == 0;
 }".TrimStart();
 
@@ -102,7 +106,7 @@ private async Task AssertNothingIsQueued(TextDocumentItem documentItem) {
       }
     }
 
-    public CancelVerificationTest(ITestOutputHelper output) : base(output) {
+    public CancelVerificationTest(ITestOutputHelper output) : base(output, LogLevel.Debug) {
     }
   }
 }
diff --git a/Source/DafnyLanguageServer.Test/Various/CompilationStatusNotificationTest.cs b/Source/DafnyLanguageServer.Test/Various/CompilationStatusNotificationTest.cs
index c8c755f7234..943c68195d2 100644
--- a/Source/DafnyLanguageServer.Test/Various/CompilationStatusNotificationTest.cs
+++ b/Source/DafnyLanguageServer.Test/Various/CompilationStatusNotificationTest.cs
@@ -19,32 +19,70 @@ public class CompilationStatusNotificationTest : ClientBasedLanguageServerTest {
     private const int MaxTestExecutionTimeMs = 10000;
 
     [Fact]
-    public async Task MultipleDocuments() {
+    public async Task DidOpenOfEquivalentDocumentDoesNotTriggerCompilation() {
+      var producerSource = @"
+method Foo(x: int) { 
+  var y := 3.0;
+}
+".TrimStart();
+
+      var consumerSource = @"
+method Bar() {
+  Foo(3); 
+}
+";
+
+      var directory = GetFreshTempPath();
+      Directory.CreateDirectory(directory);
+      await File.WriteAllTextAsync(Path.Combine(directory, "producer.dfy"), producerSource);
+      await File.WriteAllTextAsync(Path.Combine(directory, DafnyProject.FileName), "");
+      await CreateOpenAndWaitForResolve(consumerSource, Path.Combine(directory, "consumer.dfy"));
+
+      var a = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      var a2 = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      var a3 = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      var a4 = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      var a5 = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      var a6 = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      await CreateOpenAndWaitForResolve(producerSource, Path.Combine(directory, "producer.dfy"));
+      var somethingElse = await CreateOpenAndWaitForResolve("method Foo() {}", "somethingElse");
+      var a7 = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      Assert.Equal(somethingElse.Uri, a7.Uri);
+      Directory.Delete(directory, true);
+    }
+
+    [Fact]
+    public async Task MultipleDocumentsFailedResolution() {
       var source = @"
-method Foo() returns (x: int) ensures x / 2 == 1; {
+method Foo() returns (x: int) {
   return 2;
 }".TrimStart();
-      await SetUp(options => {
-        options.Set(ServerCommand.ProjectMode, true);
-      });
-      var directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+      var directory = GetFreshTempPath();
       Directory.CreateDirectory(directory);
-      await CreateAndOpenTestDocument("", Path.Combine(directory, DafnyProject.FileName));
+      var projectFile = await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
+      var status = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      Assert.Equal(CompilationStatus.ParsingFailed, status.Status);
       var secondFilePath = Path.Combine(directory, "RunWithMultipleDocuments2.dfy");
-      await File.WriteAllTextAsync(secondFilePath, source.Replace("Foo", "Bar"));
-      var documentItem1 = await CreateAndOpenTestDocument(source, Path.Combine(directory, "RunWithMultipleDocuments1.dfy"));
+      await File.WriteAllTextAsync(secondFilePath, source.Replace("Foo", "Bar").Replace("2", "true"));
+      var documentItem1 = await CreateOpenAndWaitForResolve(source, Path.Combine(directory, "RunWithMultipleDocuments1.dfy"));
 
       var expectedStatuses = new[] {
-        CompilationStatus.Parsing, CompilationStatus.ResolutionStarted, CompilationStatus.CompilationSucceeded,
-        CompilationStatus.PreparingVerification
+        CompilationStatus.ResolutionStarted,
+        CompilationStatus.ResolutionFailed
       };
-      var documents = new[] { documentItem1.Uri, DocumentUri.File(secondFilePath) };
+      var documents = new[] { projectFile.Uri, documentItem1.Uri, DocumentUri.File(secondFilePath) };
+      await CheckExpectedStatuses(expectedStatuses, documents);
+      Directory.Delete(directory, true);
+    }
+
+    private async Task CheckExpectedStatuses(CompilationStatus[] expectedStatuses, DocumentUri[] documents) {
       foreach (var expectedStatus in expectedStatuses) {
         var statuses = new Dictionary<DocumentUri, CompilationStatusParams>();
         foreach (var _ in documents) {
           var statusParams = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
           statuses.Add(statusParams.Uri, statusParams);
         }
+
         foreach (var document in documents) {
           var status = statuses[document];
           Assert.Equal(expectedStatus, status.Status);
@@ -52,6 +90,33 @@ await SetUp(options => {
       }
     }
 
+    [Fact]
+    public async Task MultipleDocumentsSuccessfulResolution() {
+      var directory = GetFreshTempPath();
+      Directory.CreateDirectory(directory);
+      var projectFile = await CreateOpenAndWaitForResolve("", Path.Combine(directory, DafnyProject.FileName));
+      var status = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
+      Assert.Equal(CompilationStatus.ParsingFailed, status.Status);
+      var secondFilePath = Path.Combine(directory, "RunWithMultipleDocuments2.dfy");
+      var source = @"
+method Foo() returns (x: int) {
+  return 2;
+}".TrimStart();
+      await File.WriteAllTextAsync(secondFilePath, source.Replace("Foo", "Bar"));
+      var documentItem1 = await CreateOpenAndWaitForResolve(source, Path.Combine(directory, "RunWithMultipleDocuments1.dfy"));
+
+      var expectedStatuses = new[] {
+        CompilationStatus.ResolutionStarted,
+        CompilationStatus.ResolutionSucceeded
+      };
+      var allDocuments = new[] { projectFile.Uri, documentItem1.Uri, DocumentUri.File(secondFilePath) };
+      await CheckExpectedStatuses(expectedStatuses, allDocuments);
+      foreach (var _ in new[] { documentItem1.Uri, DocumentUri.File(secondFilePath) }) {
+        await WaitForStatus(null, PublishedVerificationStatus.Stale, CancellationToken);
+      }
+      Directory.Delete(directory, true);
+    }
+
     [Fact(Timeout = MaxTestExecutionTimeMs)]
     public async Task DocumentWithParserErrorsSendsParsingFailedStatus() {
       var source = @"
@@ -61,15 +126,13 @@ method Abs(x: int) returns (y: int)
   return x
 }
 ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DocumentWithParserErrorsSendsParsingFailedStatus.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertProgress(documentItem, CompilationStatus.Parsing);
       await AssertProgress(documentItem, CompilationStatus.ParsingFailed);
 
       // We re-send the same erroneous document again to check that we don't have a CompilationSucceeded event queued.
       var otherDoc = CreateTestDocument(source, "Test2.dfy");
       client.OpenDocument(otherDoc);
-      await AssertProgress(otherDoc, CompilationStatus.Parsing);
       await AssertProgress(otherDoc, CompilationStatus.ParsingFailed);
     }
 
@@ -82,16 +145,14 @@ method Abs(x: int) returns (y: int)
   return z;
 }
 ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DocumentWithResolverErrorsSendsResolutionFailedStatus.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertProgress(documentItem, CompilationStatus.Parsing);
       await AssertProgress(documentItem, CompilationStatus.ResolutionStarted);
       await AssertProgress(documentItem, CompilationStatus.ResolutionFailed);
 
       // We re-send the same erroneous document again to check that we don't have a CompilationSucceeded event queued.
       var otherDoc = CreateTestDocument(source, "Test2.dfy");
       client.OpenDocument(otherDoc);
-      await AssertProgress(otherDoc, CompilationStatus.Parsing);
       await AssertProgress(otherDoc, CompilationStatus.ResolutionStarted);
       await AssertProgress(otherDoc, CompilationStatus.ResolutionFailed);
     }
@@ -108,11 +169,10 @@ method Abs(x: int) returns (y: int)
   return x;
 }
 ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DocumentWithoutErrorsSendsCompilationSucceededVerificationStartedAndVerificationSucceededStatuses.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertProgress(documentItem, CompilationStatus.Parsing);
       await AssertProgress(documentItem, CompilationStatus.ResolutionStarted);
-      await AssertProgress(documentItem, CompilationStatus.CompilationSucceeded);
+      await WaitForStatus(null, PublishedVerificationStatus.Correct, CancellationToken, documentItem);
     }
     private async Task AssertProgress(TextDocumentItem documentItem, CompilationStatus expectedStatus, [CanBeNull] string expectedMessage = null) {
       var lastResult = await compilationStatusReceiver.AwaitNextNotificationAsync(CancellationToken);
@@ -133,33 +193,30 @@ method Abs(x: int) returns (y: int)
   return x;
 }
 ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DocumentWithOnlyVerifierErrorsSendsCompilationSucceededVerificationStartedAndVerificationFailedStatuses.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertProgress(documentItem, CompilationStatus.Parsing);
       await AssertProgress(documentItem, CompilationStatus.ResolutionStarted);
-      await AssertProgress(documentItem, CompilationStatus.CompilationSucceeded);
+      await WaitForStatus(null, PublishedVerificationStatus.Error, CancellationToken, documentItem);
     }
 
-    [Fact(Timeout = MaxTestExecutionTimeMs)]
+    [Fact]
     public async Task DocumentWithOnlyCodedVerifierTimeoutSendsCompilationSucceededVerificationStartedAndVerificationFailedStatuses() {
-      var documentItem = CreateTestDocument(SlowToVerify);
+      var documentItem = CreateTestDocument(SlowToVerify, "DocumentWithOnlyCodedVerifierTimeoutSendsCompilationSucceededVerificationStartedAndVerificationFailedStatuses.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertProgress(documentItem, CompilationStatus.Parsing);
       await AssertProgress(documentItem, CompilationStatus.ResolutionStarted);
-      await AssertProgress(documentItem, CompilationStatus.CompilationSucceeded);
+      await WaitForStatus(null, PublishedVerificationStatus.Error, CancellationToken, documentItem);
     }
 
     [Fact(Timeout = MaxTestExecutionTimeMs)]
     public async Task DocumentWithOnlyConfiguredVerifierTimeoutSendsCompilationSucceededVerificationStartedAndVerificationFailedStatuses() {
       await SetUp(options => options.Set(BoogieOptionBag.VerificationTimeLimit, 3U));
-      var documentItem = CreateTestDocument(SlowToVerify);
+      var documentItem = CreateTestDocument(SlowToVerify, "DocumentWithOnlyConfiguredVerifierTimeoutSendsCompilationSucceededVerificationStartedAndVerificationFailedStatuses.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertProgress(documentItem, CompilationStatus.Parsing);
       await AssertProgress(documentItem, CompilationStatus.ResolutionStarted);
-      await AssertProgress(documentItem, CompilationStatus.CompilationSucceeded);
+      await WaitForStatus(null, PublishedVerificationStatus.Error, CancellationToken, documentItem);
     }
 
-    [Fact(Timeout = MaxTestExecutionTimeMs)]
+    [Fact]
     public async Task DocumentLoadWithOnSaveVerificationDoesNotSendVerificationStatuses() {
       var source = @"
 method Abs(x: int) returns (y: int)
@@ -168,23 +225,23 @@ method Abs(x: int) returns (y: int)
   return x;
 }
 ".TrimStart();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Save));
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Save));
 
       // We load two documents. If no verification is executed, we should receive each
       // compilation status twice without any verification status inbetween.
       var documentItem1 = CreateTestDocument(source, "test_1.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem1, CancellationToken);
-      await AssertProgress(documentItem1, CompilationStatus.Parsing);
       await AssertProgress(documentItem1, CompilationStatus.ResolutionStarted);
-      await AssertProgress(documentItem1, CompilationStatus.CompilationSucceeded);
-      var documentItem2 = CreateTestDocument(source, "test_2dfy");
+      await AssertProgress(documentItem1, CompilationStatus.ResolutionSucceeded);
+      await WaitForStatus(null, PublishedVerificationStatus.Stale, CancellationToken, documentItem1);
+      var documentItem2 = CreateTestDocument(source, "test_2.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem2, CancellationToken);
-      await AssertProgress(documentItem2, CompilationStatus.Parsing);
       await AssertProgress(documentItem2, CompilationStatus.ResolutionStarted);
-      await AssertProgress(documentItem2, CompilationStatus.CompilationSucceeded);
+      await AssertProgress(documentItem2, CompilationStatus.ResolutionSucceeded);
+      await WaitForStatus(null, PublishedVerificationStatus.Stale, CancellationToken, documentItem2);
     }
 
-    [Fact(Timeout = MaxTestExecutionTimeMs)]
+    [Fact]
     public async Task DocumentLoadAndSaveWithNeverVerifySendsNoVerificationStatuses() {
       var source = @"
 method Abs(x: int) returns (y: int)
@@ -193,22 +250,22 @@ method Abs(x: int) returns (y: int)
   return x;
 }
 ".TrimStart();
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Never));
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Never));
 
       // We load two and save two documents. If no verification is executed, we should receive each
       // compilation status twice without any verification status inbetween.
       var documentItem1 = CreateTestDocument(source, "test_1.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem1, CancellationToken);
       await client.SaveDocumentAndWaitAsync(documentItem1, CancellationToken);
-      await AssertProgress(documentItem1, CompilationStatus.Parsing);
       await AssertProgress(documentItem1, CompilationStatus.ResolutionStarted);
-      await AssertProgress(documentItem1, CompilationStatus.CompilationSucceeded);
-      var documentItem2 = CreateTestDocument(source, "test_2dfy");
+      await AssertProgress(documentItem1, CompilationStatus.ResolutionSucceeded);
+      await WaitForStatus(null, PublishedVerificationStatus.Stale, CancellationToken, documentItem1);
+      var documentItem2 = CreateTestDocument(source, "test_2.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem2, CancellationToken);
       await client.SaveDocumentAndWaitAsync(documentItem2, CancellationToken);
-      await AssertProgress(documentItem2, CompilationStatus.Parsing);
       await AssertProgress(documentItem2, CompilationStatus.ResolutionStarted);
-      await AssertProgress(documentItem2, CompilationStatus.CompilationSucceeded);
+      await AssertProgress(documentItem2, CompilationStatus.ResolutionSucceeded);
+      await WaitForStatus(null, PublishedVerificationStatus.Stale, CancellationToken, documentItem2);
     }
 
     [Fact(Timeout = MaxTestExecutionTimeMs)]
@@ -220,9 +277,8 @@ lemma Something(i: int)
         multiset
       }
     }";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MultisetShouldNotCrashParser.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      await AssertProgress(documentItem, CompilationStatus.Parsing);
       await AssertProgress(documentItem, CompilationStatus.ParsingFailed);
     }
 
diff --git a/Source/DafnyLanguageServer.Test/Various/ConcurrentInteractionsTest.cs b/Source/DafnyLanguageServer.Test/Various/ConcurrentInteractionsTest.cs
index f3e41f32a56..54a6d565ac8 100644
--- a/Source/DafnyLanguageServer.Test/Various/ConcurrentInteractionsTest.cs
+++ b/Source/DafnyLanguageServer.Test/Various/ConcurrentInteractionsTest.cs
@@ -10,6 +10,7 @@
 using OmniSharp.Extensions.JsonRpc.Server;
 using Xunit;
 using Xunit.Abstractions;
+using XunitAssertMessages;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Various {
@@ -23,7 +24,7 @@ public class ConcurrentInteractionsTest : ClientBasedLanguageServerTest {
     [Fact]
     public async Task UpdateDuringARequestWillCancelTheRequest() {
       var programThatResolvesSlowlyEnough = RepeatStrBuilder(@"method Foo() {}", 1000);
-      var documentItem = CreateTestDocument(programThatResolvesSlowlyEnough);
+      var documentItem = CreateTestDocument(programThatResolvesSlowlyEnough, "UpdateDuringARequestWillCancelTheRequest.dfy");
       client.OpenDocument(documentItem);
       var hoverTask = client.RequestHover(new HoverParams { Position = (0, 0), TextDocument = documentItem }, CancellationToken);
       ApplyChange(ref documentItem, new Range(0, 0, 0, 0), "//comment\n");
@@ -55,8 +56,8 @@ decreases y
   }
 }".TrimStart();
       var failSource = @"method Contradiction() { assert false; }";
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Save));
-      var documentItem = CreateTestDocument(source);
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Save));
+      var documentItem = CreateTestDocument(source, "VerificationErrorDetectedAfterCanceledSave.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationTokenWithHighTimeout);
 
       DidChangeTextDocumentParams MakeChange(int? version, Range range, string text) {
@@ -75,38 +76,39 @@ DidChangeTextDocumentParams MakeChange(int? version, Range range, string text) {
       }
 
       // Add a space in the document
-      var change1 = MakeChange(documentItem.Version + 1, new Range((0, 6), (0, 6)), " ");
-      client.DidChangeTextDocument(change1);
+      ApplyChange(ref documentItem, new Range((0, 6), (0, 6)), " ");
       // Save and don't wait, so the next save will interrupt and cancel verification
       client.SaveDocument(documentItem);
 
       // Remove the space, and use a non-consecutive version to test that the server doesn't drop the change
-      var change2 = MakeChange(documentItem.Version + 4, new Range((0, 6), (0, 7)), "");
+      var change2 = MakeChange(documentItem.Version + 2, new Range((0, 6), (0, 7)), "");
+      documentItem = documentItem with { Version = change2.TextDocument.Version };
       client.DidChangeTextDocument(change2);
       // Save and don't wait, so the next save will interrupt and cancel verification
       client.SaveDocument(documentItem);
 
       // Do the previous again a few times. This seems to be what it takes to guarantee cancelling verification.
-      client.DidChangeTextDocument(MakeChange(documentItem.Version + 5, new Range((0, 6), (0, 6)), " "));
+      ApplyChange(ref documentItem, new Range((0, 6), (0, 7)), " ");
       client.SaveDocument(documentItem);
-      client.DidChangeTextDocument(MakeChange(documentItem.Version + 6, new Range((0, 6), (0, 7)), ""));
+      ApplyChange(ref documentItem, new Range((0, 6), (0, 7)), "");
       client.SaveDocument(documentItem);
-      client.DidChangeTextDocument(MakeChange(documentItem.Version + 8, new Range((0, 6), (0, 6)), " "));
+      ApplyChange(ref documentItem, new Range((0, 6), (0, 7)), " ");
       client.SaveDocument(documentItem);
-      client.DidChangeTextDocument(MakeChange(documentItem.Version + 9, new Range((0, 6), (0, 7)), ""));
+      ApplyChange(ref documentItem, new Range((0, 6), (0, 7)), "");
       client.SaveDocument(documentItem);
 
       // Make a verification-breaking change, and use a non-consecutive version
       // to test that the server doesn't drop the change
-      var change3 = MakeChange(documentItem.Version + 11, new Range((0, 0), (11, 1)), failSource);
+      var change3 = MakeChange(documentItem.Version + 2, new Range((0, 0), (11, 1)), failSource);
+      documentItem = documentItem with { Version = change3.TextDocument.Version };
       client.DidChangeTextDocument(change3);
       // Save and wait for the final result
       await client.SaveDocumentAndWaitAsync(documentItem, CancellationTokenWithHighTimeout);
 
-      var diagnostics = await GetLastDiagnosticsParams(documentItem, CancellationToken);
-      Assert.Equal(documentItem.Version + 11, diagnostics.Version);
+      var diagnostics = await GetLatestDiagnosticsParams(documentItem, CancellationToken);
+      Assert.Equal(documentItem.Version, diagnostics.Version);
       Assert.Single(diagnostics.Diagnostics);
-      Assert.Equal("assertion could not be proved", diagnostics.Diagnostics.First().Message);
+      AssertM.Equal("assertion could not be proved", diagnostics.Diagnostics.First().Message, "actual diagnostic message was: " + diagnostics.Diagnostics.First().Message);
     }
 
     [Fact]
@@ -153,10 +155,10 @@ public async Task ChangeDocumentCancelsPreviousResolution() {
       // Fix resolution error, cancel previous diagnostics
       ApplyChange(ref documentItem, new Range((0, 30), (0, 31)), "1");
 
-      var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
+      var resolutionDiagnostics = await GetNextDiagnostics(documentItem);
       Assert.Empty(resolutionDiagnostics);
 
-      var verificationDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
+      var verificationDiagnostics = await GetNextDiagnostics(documentItem);
       Assert.Empty(verificationDiagnostics);
 
       await AssertNoDiagnosticsAreComing(CancellationToken);
@@ -190,7 +192,6 @@ decreases y
       }
       for (int i = 0; i < documentsToLoadConcurrently; i++) {
         await client.WaitForNotificationCompletionAsync(loadingDocuments[i].Uri, CancellationTokenWithHighTimeout);
-        await Projects.GetLastDocumentAsync(loadingDocuments[i]).WaitAsync(CancellationTokenWithHighTimeout);
       }
 
       foreach (var loadingDocument in loadingDocuments) {
diff --git a/Source/DafnyLanguageServer.Test/Various/CounterExampleTest.cs b/Source/DafnyLanguageServer.Test/Various/CounterExampleTest.cs
index 40a1d941723..d57d6dc0f18 100644
--- a/Source/DafnyLanguageServer.Test/Various/CounterExampleTest.cs
+++ b/Source/DafnyLanguageServer.Test/Various/CounterExampleTest.cs
@@ -5,6 +5,7 @@
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using System.Linq;
+using System.Numerics;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.Boogie;
@@ -14,11 +15,6 @@
 using Xunit.Abstractions;
 
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Various {
-  static class StringAssert {
-    public static void Matches(string value, Regex regex) {
-      Assert.True(regex.Matches(value).Any());
-    }
-  }
 
   public class CounterExampleTest : ClientBasedLanguageServerTest {
 
@@ -46,21 +42,21 @@ private async Task SetUpOptions(Action<DafnyOptions> optionSettings) {
     [MemberData(nameof(OptionSettings))]
     public async Task CounterexamplesStillWorksIfNothingHasBeenVerified(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
-      await SetUp(options => options.Set(ServerCommand.Verification, VerifyOnMode.Never));
+      await SetUp(options => options.Set(ProjectManager.Verification, VerifyOnMode.Never));
       var source = @"
       method Abs(x: int) returns (y: int)
-        ensures y > 0
+        ensures y >= 0
       {
       }
       ".TrimStart();
       await SetUp(o => o.Set(CommonOptionBag.RelaxDefiniteAssignment, true));
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "CounterexamplesStillWorksIfNothingHasBeenVerified.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
       Assert.Equal((2, 6), counterExamples[0].Position);
-      Assert.True(counterExamples[0].Variables.ContainsKey("y:int"));
+      Assert.Matches("-[0-9]+ == y", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -69,18 +65,18 @@ public async Task FileWithBodyLessMethodReturnsSingleCounterExampleForPostcondit
       await SetUpOptions(optionSettings);
       var source = @"
       method Abs(x: int) returns (y: int)
-        ensures y > 0
+        ensures y >= 0
       {
       }
       ".TrimStart();
       await SetUp(o => o.Set(CommonOptionBag.RelaxDefiniteAssignment, true));
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "FileWithBodyLessMethodReturnsSingleCounterExampleForPostconditions.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
       Assert.Equal((2, 6), counterExamples[0].Position);
-      Assert.True(counterExamples[0].Variables.ContainsKey("y:int"));
+      Assert.Matches("-[0-9]+ == y", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -95,7 +91,7 @@ method Abs(x: int) returns (y: int)
         y := z;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "FileWithMethodWithErrorsReturnsCounterExampleForPostconditionsAndEveryUpdateLine.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
@@ -103,9 +99,7 @@ method Abs(x: int) returns (y: int)
       Assert.Equal((2, 6), counterExamples[0].Position);
       Assert.Equal((3, 18), counterExamples[1].Position);
       Assert.Equal((4, 14), counterExamples[2].Position);
-      Assert.True(counterExamples[2].Variables.ContainsKey("x:int"));
-      Assert.True(counterExamples[2].Variables.ContainsKey("y:int"));
-      Assert.True(counterExamples[2].Variables.ContainsKey("z:int"));
+      Assert.Matches("-[0-9]+ == [xyz]", counterExamples[2].Assumption);
     }
 
     [Theory]
@@ -122,7 +116,7 @@ method Abs(x: int) returns (y: int)
         return -x;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "FileWithMethodWithoutErrorsReturnsEmptyCounterExampleList.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
@@ -135,7 +129,7 @@ public async Task GetCounterExampleWithMultipleMethodsWithErrorsReturnsCounterEx
       await SetUpOptions(optionSettings);
       var source = @"
       method Abs(x: int) returns (y: int)
-        ensures y > 0
+        ensures y >= 0
       {
       }
 
@@ -147,18 +141,21 @@ method Negate(a: int) returns (b: int)
 
       await SetUp(o => o.Set(CommonOptionBag.RelaxDefiniteAssignment, true));
 
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "GetCounterExampleWithMultipleMethodsWithErrorsReturnsCounterExamplesForEveryMethod.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri))
-        .OrderBy(counterExample => counterExample.Position)
-        .
-        OrderBy(counterexample => counterexample.Position).ToArray();
+        .OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
       Assert.Equal((2, 6), counterExamples[0].Position);
-      Assert.True(counterExamples[0].Variables.ContainsKey("y:int"));
+      Assert.Matches(new Regex("-[0-9]+ == y"), counterExamples[0].Assumption);
       Assert.Equal((7, 6), counterExamples[1].Position);
-      Assert.True(counterExamples[1].Variables.ContainsKey("a:int"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("b:int"));
+      var aRegex = new Regex("(-?[0-9]+) == a");
+      var bRegex = new Regex("(-?[0-9]+) == b");
+      Assert.Matches(aRegex, counterExamples[1].Assumption);
+      Assert.Matches(bRegex, counterExamples[1].Assumption);
+      Assert.NotEqual(
+        aRegex.Match(counterExamples[1].Assumption).Groups[1].Value,
+        bRegex.Match(counterExamples[1].Assumption).Groups[1].Value);
     }
 
     [Theory]
@@ -170,14 +167,29 @@ method a(r:real) {
         assert r != 1.0;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "WholeNumberAsReal.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("r:real"));
-      Assert.Equal("1.0", counterExamples[0].Variables["r:real"]);
+      Assert.Contains("1.0 == r", counterExamples[0].Assumption);
+    }
+
+    [Theory]
+    [MemberData(nameof(OptionSettings))]
+    public async Task SpecificInteger(Action<DafnyOptions> optionSettings) {
+      await SetUpOptions(optionSettings);
+      var source = @"
+      method a(i:int) {
+        assert i != 25;
+      }
+      ".TrimStart();
+      var documentItem = CreateTestDocument(source, "integer.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
+        OrderBy(counterexample => counterexample.Position).ToArray();
+      Assert.Single(counterExamples);
+      Assert.Contains("25 == i", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -189,14 +201,12 @@ method a(r:real) {
         assert r != 0.4;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "FractionAsAReal.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("r:real"));
-      StringAssert.Matches(counterExamples[0].Variables["r:real"], new Regex("[0-9]+\\.[0-9]+/[0-9]+\\.[0-9]+"));
+      Assert.Matches("[0-9]+\\.[0-9]+ / [0-9]+\\.[0-9]+ == r;", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -211,14 +221,12 @@ method a(v:Value) {
         assert v.v != 0.0;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "WholeNumberFieldAsReal.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("v:_module.Value"));
-      Assert.Equal("(v := 0.0)", counterExamples[0].Variables["v:_module.Value"]);
+      Assert.Contains("0.0 == v.v", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -233,14 +241,12 @@ method a(v:Value) {
         assert v.with_underscore_ != 42;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ConstantFields.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("v:_module.Value"));
-      Assert.Equal("(with_underscore_ := 42)", counterExamples[0].Variables["v:_module.Value"]);
+      Assert.Contains("42 == v.with_underscore_", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -255,14 +261,12 @@ method a(v:Value) {
         assert v.v != 0.4;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "FractionFieldAsReal.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("v:_module.Value"));
-      StringAssert.Matches(counterExamples[0].Variables["v:_module.Value"], new Regex("\\(v := [0-9]+\\.[0-9]+/[0-9]+\\.[0-9]+\\)"));
+      Assert.Matches($"\\(?[0-9]+\\.[0-9]+ / [0-9]+\\.[0-9]+\\)? == v.v", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -277,17 +281,15 @@ method IsSelfReferring(n:Node) {
         assert n.next != n;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SelfReferringObject.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("n:_module.Node"));
-      Assert.Equal("(next := n)", counterExamples[0].Variables["n:_module.Node"]);
+      Assert.Matches("n == n.next", counterExamples[0].Assumption);
     }
 
-    [Theory]
+    [Theory(Skip = "This test should be re-enabled once we can assert inequality between objects")]
     [MemberData(nameof(OptionSettings))]
     public async Task ObjectWithANonNullField(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
@@ -299,14 +301,13 @@ method IsSelfRecursive(n:Node) {
         assert (n.next == n) || (n.next == null);
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ObjectWithANonNullField.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(2, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("n:_module.Node"));
-      StringAssert.Matches(counterExamples[0].Variables["n:_module.Node"], new Regex("\\(next := @[0-9]+\\)"));
+      Assert.Contains("n != null", counterExamples[0].Assumption);
+      Assert.Contains("n.next != n", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -321,14 +322,12 @@ method IsSelfRecursive(n:Node) {
         assert n.next != null;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ObjectWithANullField.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("n:_module.Node"));
-      Assert.Equal("(next := null)", counterExamples[0].Variables["n:_module.Node"]);
+      Assert.Contains("null == n.next", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -350,19 +349,12 @@ modifies this
         }
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ObjectWithAFieldOfBasicType.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
-      Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(2, counterExamples[0].Variables.Count);
-      Assert.Equal(2, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("amount:int"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("amount:int"));
-      Assert.True(counterExamples[0].Variables.ContainsKey("this:_module.BankAccountUnsafe"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("this:_module.BankAccountUnsafe"));
-      StringAssert.Matches(counterExamples[0].Variables["this:_module.BankAccountUnsafe"], new Regex("\\(balance := [0-9]+\\)"));
-      StringAssert.Matches(counterExamples[1].Variables["this:_module.BankAccountUnsafe"], new Regex("\\(balance := \\-[0-9]+\\)"));
+      Assert.Matches("[0-9]+ == this.balance", counterExamples[0].Assumption);
+      Assert.Matches("-[0-9]+ == this.balance", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -374,14 +366,34 @@ method a(c:char) {
         assert c != '0';
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SpecificCharacter.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
+        OrderBy(counterexample => counterexample.Position).ToArray();
+      Assert.Single(counterExamples);
+      Assert.Contains("'0' == c", counterExamples[0].Assumption);
+    }
+
+    [Theory]
+    [MemberData(nameof(OptionSettings))]
+    public async Task TwoCharacters(Action<DafnyOptions> optionSettings) {
+      await SetUpOptions(optionSettings);
+      var source = @"
+      method a(c1:char, c2:char) {
+        assert c1 == c2;
+      }
+      ".TrimStart();
+      var documentItem = CreateTestDocument(source, "TwoCharacters.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("c:char"));
-      Assert.Equal("'0'", counterExamples[0].Variables["c:char"]);
+      var charRegex = "(\'[^']+\')";
+      Assert.Matches(charRegex + " == c1", counterExamples[0].Assumption);
+      Assert.Matches(charRegex + " == c2", counterExamples[0].Assumption);
+      var c1 = Regex.Match(counterExamples[0].Assumption, charRegex + " == c1").Groups[1];
+      var c2 = Regex.Match(counterExamples[0].Assumption, charRegex + " == c2").Groups[1];
+      Assert.NotEqual(c1, c2);
     }
 
     [Theory]
@@ -393,15 +405,12 @@ method a(c:char) {
         assert c == '0';
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ArbitraryCharacter.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("c:char"));
-      StringAssert.Matches(counterExamples[0].Variables["c:char"], new Regex("('.'|\\?#[0-9]+)"));
-      Assert.NotEqual("'0'", counterExamples[0].Variables["c:char"]);
+      Assert.Matches("'.+' == c", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -414,20 +423,36 @@ method a(b:B) {
         assert b != A(5);
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DatatypeWithUnnamedDestructor.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
+        OrderBy(counterexample => counterexample.Position).ToArray();
+      Assert.Single(counterExamples);
+      Assert.Contains("B.A(5) == b", counterExamples[0].Assumption);
+    }
+
+    [Theory]
+    [MemberData(nameof(OptionSettings))]
+    public async Task DatatypeWithUnnamedDestructor2(Action<DafnyOptions> optionSettings) {
+      await SetUpOptions(optionSettings);
+      var source = @"
+      datatype A = A(i:int)
+      datatype B = B(A)
+      method a(b:B) {
+        assert b != B(A(5));
+      }
+      ".TrimStart();
+      var documentItem = CreateTestDocument(source, "DatatypeWithUnnamedDestructor.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("b:_module.B"));
-      // Unnamed destructors are implicitly assigned names starting with "#" during resolution:
-      Assert.Equal("A(#0 := 5)", counterExamples[0].Variables["b:_module.B"]);
+      Assert.Contains("B.B(A.A(5)) == b", counterExamples[0].Assumption);
     }
 
     [Theory]
     [MemberData(nameof(OptionSettings))]
-    public async Task DatatypeWithDestructorThanIsADataValue(Action<DafnyOptions> optionSettings) {
+    public async Task DatatypeWithDestructorThatIsADataValue(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
       var source = @"
       datatype A = B(x:real)
@@ -435,14 +460,13 @@ method destructorNameTest(a:A) {
         assert a.x >= 0.0 || a.x < -0.5;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DatatypeWithDestructorThanIsADataValue.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("a:_module.A"));
-      StringAssert.Matches(counterExamples[0].Variables["a:_module.A"], new Regex("B\\(x := -[0-9]+\\.[0-9]+/[0-9]+\\.[0-9]+\\)"));
+      var realRegex = "-\\(?[0-9]+\\.[0-9]+ / [0-9]+\\.[0-9]+\\)";
+      Assert.Matches($"A.B\\({realRegex}\\) == a", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -456,16 +480,13 @@ requires h0.Right? && h1.Left? {
         assert h0 == h1;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DatatypeWithDifferentDestructorsForDifferentConstructors.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(2, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("h0:_module.Hand"));
-      Assert.True(counterExamples[0].Variables.ContainsKey("h1:_module.Hand"));
-      StringAssert.Matches(counterExamples[0].Variables["h0:_module.Hand"], new Regex("Right\\([a|b] := -?[0-9]+, [b|a] := -?[0-9]+\\)"));
-      StringAssert.Matches(counterExamples[0].Variables["h1:_module.Hand"], new Regex("Left\\([x|y] := -?[0-9]+, [x|y] := -?[0-9]+\\)"));
+      Assert.Matches("Hand\\.Right\\([0-9]+, [0-9]+\\) == h0", counterExamples[0].Assumption);
+      Assert.Matches("Hand\\.Left\\([0-9]+, [0-9]+\\) == h1", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -478,14 +499,12 @@ method T_datatype0_1(h:Hand)  {
         assert h.a != h.b || h.a != 3;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DatatypeObjectWithTwoDestructorsWhoseValuesAreEqual.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("h:_module.Hand"));
-      StringAssert.Matches(counterExamples[0].Variables["h:_module.Hand"], new Regex("Left\\([a|b] := 3, [a|b] := 3\\)"));
+      Assert.Contains("Hand.Left(3, 3) == h", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -498,14 +517,12 @@ method m (a:A) requires !a.B_?{
         assert a.C_q || a.B_q || a.D_q;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DatatypeWithDestructorsWhoseNamesShadowBuiltInDestructors.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("a:_module.A"));
-      StringAssert.Matches(counterExamples[0].Variables["a:_module.A"], new Regex("C\\((B_q|C_q|D_q) := false, (B_q|C_q|D_q) := false, (B_q|C_q|D_q) := false\\)"));
+      Assert.Contains("A.C(false, false, false) == a", counterExamples[0].Assumption);
     }
 
 
@@ -519,41 +536,17 @@ method m(a:A<bool>) requires a == One(false) || a == One(true) {
         assert a.b;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DatatypeWithTypeParameters.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("a:_module.A<bool>"));
-      Assert.Equal("One(b := false)", counterExamples[0].Variables["a:_module.A<bool>"]);
+      Assert.Contains("A<bool>.One(false) == a", counterExamples[0].Assumption);
     }
 
     [Theory]
     [MemberData(nameof(OptionSettings))]
-    public async Task ArbitraryBool(Action<DafnyOptions> optionSettings) {
-      await SetUpOptions(optionSettings);
-      var source = @"
-      datatype List<T> = Nil | Cons(head: T, tail: List<T>)
-      method listHasSingleElement(list:List<bool>)
-        requires list != Nil
-      {
-        assert list.tail != Nil;
-      }
-      ".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
-        OrderBy(counterexample => counterexample.Position).ToArray();
-      Assert.Single(counterExamples);
-      Assert.Equal(2, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("list:_module.List<bool>"));
-      StringAssert.Matches(counterExamples[0].Variables["list:_module.List<bool>"], new Regex("Cons\\(head := (true|false), tail := @[0-9]+\\)"));
-    }
-
-    [Theory]
-    [MemberData(nameof(OptionSettings))]
-    public async Task ArbitraryInt(Action<DafnyOptions> optionSettings) {
+    public async Task DestructorDoesNotMatter(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
       var source = @"
       datatype List<T> = Nil | Cons(head: T, tail: List<T>)
@@ -563,36 +556,12 @@ method listHasSingleElement(list:List<int>)
         assert list.tail != Nil;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ArbitraryInt.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(2, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("list:_module.List<int>"));
-      StringAssert.Matches(counterExamples[0].Variables["list:_module.List<int>"], new Regex("Cons\\(head := -?[0-9]+, tail := @[0-9]+\\)"));
-    }
-
-    [Theory]
-    [MemberData(nameof(OptionSettings))]
-    public async Task ArbitraryReal(Action<DafnyOptions> optionSettings) {
-      await SetUpOptions(optionSettings);
-      var source = @"
-      datatype List<T> = Nil | Cons(head: T, tail: List<T>)
-      method listHasSingleElement(list:List<real>)
-        requires list != Nil
-      {
-        assert list.tail != Nil;
-      }
-      ".TrimStart();
-      var documentItem = CreateTestDocument(source);
-      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
-        OrderBy(counterexample => counterexample.Position).ToArray();
-      Assert.Single(counterExamples);
-      Assert.Equal(2, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("list:_module.List<real>"));
-      StringAssert.Matches(counterExamples[0].Variables["list:_module.List<real>"], new Regex("Cons\\(head := -?[0-9]+\\.[0-9], tail := @[0-9]+\\)"));
+      Assert.Matches("List<int>\\.Cons\\([0-9]+, List<int>\\.Nil\\) == list", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -604,14 +573,14 @@ method a(arr:array<int>) requires arr.Length == 2 {
         assert arr[0] != 4 || arr[1] != 5;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ArraySimpleTest.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("arr:_System.array<int>"), string.Join(", ", counterExamples[0].Variables));
-      Assert.Equal("(Length := 2, [0] := 4, [1] := 5)", counterExamples[0].Variables["arr:_System.array<int>"]);
+      Assert.Contains("2 == arr.Length", counterExamples[0].Assumption);
+      Assert.Contains("4 == arr[0]", counterExamples[0].Assumption);
+      Assert.Contains("5 == arr[1]", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -623,14 +592,13 @@ method a(s:seq<int>) requires |s| == 1 {
         assert s[0] != 4;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SequenceSimpleTest.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("s:seq<int>"));
-      Assert.Equal("[4]", counterExamples[0].Variables["s:seq<int>"]);
+      Assert.Contains("1 == |s|", counterExamples[0].Assumption);
+      Assert.Contains("4 == s[0]", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -642,14 +610,13 @@ method a(s:seq<bv5>) requires |s| == 2 {
         assert s[1] != (2 as bv5);
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SequenceOfBitVectors.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("s:seq<bv5>"));
-      Assert.Equal("(Length := 2, [1] := 2)", counterExamples[0].Variables["s:seq<bv5>"]);
+      Assert.Contains("2 == |s|", counterExamples[0].Assumption);
+      Assert.Contains("2 == s[1]", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -661,14 +628,12 @@ method a(bv:bv7) {
         assert bv != (2 as bv7);
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SpecificBitVector.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("bv:bv7"));
-      Assert.Equal("2", counterExamples[0].Variables["bv:bv7"]);
+      Assert.Contains("2 == bv", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -680,14 +645,12 @@ method a(b:bv2) {
         assert b == (1 as bv2);
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ArbitraryBitVector.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("b:bv2"));
-      StringAssert.Matches(counterExamples[0].Variables["b:bv2"], new Regex("[023]"));
+      Assert.Matches("[023] == b", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -699,16 +662,13 @@ method m(a:bv1, b:bv1) {
         assert a & b != (1 as bv1);
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "BitWiseAnd.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(2, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("a:bv1"));
-      Assert.True(counterExamples[0].Variables.ContainsKey("b:bv1"));
-      StringAssert.Matches(counterExamples[0].Variables["a:bv1"], new Regex("(1|b)"));
-      StringAssert.Matches(counterExamples[0].Variables["b:bv1"], new Regex("(1|a)"));
+      Assert.Contains("1 == a", counterExamples[0].Assumption);
+      Assert.Contains("1 == b", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -723,14 +683,12 @@ method a(v:Value) {
         assert v.b != (2 as bv5);
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "BitVectorField.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("v:_module.Value"));
-      Assert.Equal("(b := 2)", counterExamples[0].Variables["v:_module.Value"]);
+      Assert.Matches("2 == v.b", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -742,13 +700,13 @@ method a(s:set<seq<set<array<int>>>>) requires |s| <= 1{
         assert |s| == 0;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SeqSetAndArrayAsTypeParameters.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.True(counterExamples[0].Variables.ContainsKey("s:set<seq<set<_System.array<int>>>>"));
-      StringAssert.Matches(counterExamples[0].Variables["s:set<seq<set<_System.array<int>>>>"], new Regex("\\{@[0-9]+ := true\\}"));
+      Assert.Contains("exists boundVar0: seq<set<array<int>>>", counterExamples[0].Assumption);
+      Assert.Contains("boundVar0 in s", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -760,14 +718,15 @@ method m(a:array3<int>) requires a.Length0 == 4 requires a.Length1 == 5 requires
         assert a[2, 3, 1] != 7;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MultiDimensionalArray.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("a:_System.array3<int>"), string.Join(", ", counterExamples[0].Variables));
-      Assert.Equal("(Length0 := 4, Length1 := 5, Length2 := 6, [2,3,1] := 7)", counterExamples[0].Variables["a:_System.array3<int>"]);
+      Assert.Matches("(a.Length0 == 4|4 == a.Length0)", counterExamples[0].Assumption);
+      Assert.Matches("(a.Length1 == 5|5 == a.Length1)", counterExamples[0].Assumption);
+      Assert.Matches("(a.Length2 == 6|6 == a.Length2)", counterExamples[0].Assumption);
+      Assert.Contains("7 == a[2, 3, 1]", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -779,15 +738,12 @@ method test(x:array<int>, y:array<int>)   {
         assert x != y;
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ArrayEqualityByReference.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(2, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("x:_System.array<int>"));
-      Assert.True(counterExamples[0].Variables.ContainsKey("y:_System.array<int>"));
-      Assert.True(counterExamples[0].Variables["y:_System.array<int>"] == "x" || counterExamples[0].Variables["x:_System.array<int>"] == "y");
+      Assert.Matches("(x == y|y == x)", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -802,32 +758,21 @@ method a(s1:set<char>, s2:set<char>) {
         assert !('a' in sUnion) || ('a' in sInter) || !('b' in sInter) || !('a' in sDiff);
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SetBasicOperations.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(4, counterExamples.Length);
-      Assert.Equal(5, counterExamples[2].Variables.Count);
-      Assert.True(counterExamples[3].Variables.ContainsKey("s1:set<char>"));
-      Assert.True(counterExamples[3].Variables.ContainsKey("s2:set<char>"));
-      Assert.True(counterExamples[3].Variables.ContainsKey("sUnion:set<char>"));
-      Assert.True(counterExamples[3].Variables.ContainsKey("sInter:set<char>"));
-      Assert.True(counterExamples[3].Variables.ContainsKey("sDiff:set<char>"));
-      var s1 = counterExamples[3].Variables["s1:set<char>"][1..^1].Split(", ");
-      var s2 = counterExamples[3].Variables["s2:set<char>"][1..^1].Split(", ");
-      var sUnion = counterExamples[3].Variables["sUnion:set<char>"][1..^1].Split(", ");
-      var sInter = counterExamples[3].Variables["sInter:set<char>"][1..^1].Split(", ");
-      var sDiff = counterExamples[3].Variables["sDiff:set<char>"][1..^1].Split(", ");
-      Assert.Contains("'a' := true", s1);
-      Assert.Contains("'a' := false", s2);
-      Assert.Contains("'a' := true", sDiff);
-      Assert.Contains("'a' := true", sUnion);
-      Assert.Contains("'a' := false", sInter);
-      Assert.Contains("'b' := true", s1);
-      Assert.Contains("'b' := true", s2);
-      Assert.Contains("'b' := false", sDiff);
-      Assert.Contains("'b' := true", sUnion);
-      Assert.Contains("'b' := true", sInter);
+      Assert.Contains("'a' in s1", counterExamples[3].Assumption);
+      Assert.Contains("'a' !in s2", counterExamples[3].Assumption);
+      Assert.Contains("'a' in sDiff", counterExamples[3].Assumption);
+      Assert.Contains("'a' in sUnion", counterExamples[3].Assumption);
+      Assert.Contains("'a' !in sInter", counterExamples[3].Assumption);
+      Assert.Contains("'b' in s1", counterExamples[3].Assumption);
+      Assert.Contains("'b' in s2", counterExamples[3].Assumption);
+      Assert.Contains("'b' !in sDiff", counterExamples[3].Assumption);
+      Assert.Contains("'b' in sUnion", counterExamples[3].Assumption);
+      Assert.Contains("'b' in sInter", counterExamples[3].Assumption);
     }
 
     [Theory]
@@ -839,14 +784,12 @@ method test() {
         var s := {6};
         assert 6 !in s;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SetSingleElement.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(1, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("s:set<int>"));
-      StringAssert.Matches(counterExamples[1].Variables["s:set<int>"], new Regex("\\{.*6 := true.*\\}"));
+      Assert.Contains("6 in s", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -857,14 +800,12 @@ public async Task StringBuilding(Action<DafnyOptions> optionSettings) {
       "method a(s:string) {" +
       "  assert s != \"abc\";" +
       "  }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "StringBuilding.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("s:seq<char>"));
-      Assert.Equal("['a', 'b', 'c']", counterExamples[0].Variables["s:seq<char>"]);
+      Assert.Contains("['a', 'b', 'c'] == s", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -875,18 +816,15 @@ public async Task SequenceEdit(Action<DafnyOptions> optionSettings) {
       "method a(c:char, s1:string) requires s1 == \"abc\"{" +
       "  var s2:string := s1[1 := c];" +
       "  assert s2[0] != 'a' || s2[1] !='d' || s2[2] != 'c';}".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SequenceEdit.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(3, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("s1:seq<char>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("s2:seq<char>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("c:char"));
-      Assert.Equal("['a', 'b', 'c']", counterExamples[1].Variables["s1:seq<char>"]);
-      Assert.Equal("['a', 'd', 'c']", counterExamples[1].Variables["s2:seq<char>"]);
-      Assert.Equal("'d'", counterExamples[1].Variables["c:char"]);
+      Assert.Contains("3 == |s2|", counterExamples[1].Assumption);
+      Assert.Contains("'a' == s2[0]", counterExamples[1].Assumption);
+      Assert.Contains("'d' == s2[1]", counterExamples[1].Assumption);
+      Assert.Contains("'c' == s2[2]", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -898,14 +836,12 @@ method test() {
         var s := [6];
         assert 6 !in s;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SequenceSingleElement.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(1, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("s:seq<int>"));
-      StringAssert.Matches(counterExamples[1].Variables["s:seq<int>"], new Regex("\\[6\\]"));
+      Assert.Contains("[6] == s", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -914,24 +850,23 @@ public async Task SequenceConcat(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
       var source = @"
       method a(s1:string, s2:string) requires |s1| == 1 && |s2| == 1 {
-        var sCat:string := s2 + s1;
+        var sCat:string := s1 + s2;
         assert sCat[0] != 'a' || sCat[1] != 'b';
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SequenceConcat.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(3, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("s1:seq<char>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("s2:seq<char>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("sCat:seq<char>"));
-      Assert.Equal("['b']", counterExamples[1].Variables["s1:seq<char>"]);
-      Assert.Equal("['a']", counterExamples[1].Variables["s2:seq<char>"]);
-      Assert.Equal("['a', 'b']", counterExamples[1].Variables["sCat:seq<char>"]);
+      Assert.Contains("1 == |s1|", counterExamples[1].Assumption);
+      Assert.Contains("1 == |s2|", counterExamples[1].Assumption);
+      Assert.Contains("'a' == sCat[0]", counterExamples[1].Assumption);
+      Assert.Contains("'a' == s1[0]", counterExamples[1].Assumption);
+      Assert.Contains("'b' == sCat[1]", counterExamples[1].Assumption);
+      Assert.Contains("'b' == s2[0]", counterExamples[1].Assumption);
     }
 
-    [Theory]
+    [Theory(Skip = "This test should be re-enabled once counterexamples support lambda expressions")]
     [MemberData(nameof(OptionSettings))]
     public async Task SequenceGenerate(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
@@ -940,15 +875,11 @@ method a(multiplier:int) {
         var s:seq<int> := seq(3, i => i * multiplier);
         assert s[2] != 6;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SequenceGenerate.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
-      Assert.Equal(2, counterExamples.Length);
-      Assert.True(counterExamples[1].Variables.ContainsKey("multiplier:int"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("s:seq<int>"));
-      StringAssert.Matches(counterExamples[1].Variables["s:seq<int>"], new Regex("\\(Length := 3, .*\\[2\\] := 6.*\\)"));
-      Assert.Equal("3", counterExamples[1].Variables["multiplier:int"]);
+      Assert.Fail("This test needs to be updated in a way that deals with the variables introduced as part of the lambda expression.");
     }
 
     [Theory]
@@ -956,20 +887,21 @@ method a(multiplier:int) {
     public async Task SequenceSub(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
       var source = @"
-      method a(s:seq<char>) requires |s| == 5 {
-        var sSub:seq<char> := s[2..4];
+      method a(s:seq<char>) requires |s| == 7 {
+        var sSub:seq<char> := s[2..6];
         assert sSub[0] != 'a' || sSub[1] != 'b';
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SequenceSub.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(2, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("sSub:seq<char>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("s:seq<char>"));
-      Assert.Equal("['a', 'b']", counterExamples[1].Variables["sSub:seq<char>"]);
-      StringAssert.Matches(counterExamples[0].Variables["s:seq<char>"], new Regex("\\(Length := 5,.*\\[2\\] := 'a', \\[3\\] := 'b'.*"));
+      Assert.Contains("4 == |sSub|", counterExamples[1].Assumption);
+      Assert.Contains("7 == |s|", counterExamples[1].Assumption);
+      Assert.Contains("'a' == s[2]", counterExamples[1].Assumption);
+      Assert.Contains("'b' == s[3]", counterExamples[1].Assumption);
+      Assert.Contains("'a' == sSub[0]", counterExamples[1].Assumption);
+      Assert.Contains("'b' == sSub[1]", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -977,20 +909,16 @@ method a(s:seq<char>) requires |s| == 5 {
     public async Task SequenceDrop(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
       var source = @"
-      method a(s:seq<char>) requires |s| == 5 {
+      method a(s:seq<char>) requires s == ['a', 'b', 'c', 'd', 'e'] {
         var sSub:seq<char> := s[2..];
-        assert sSub[0] != 'a' || sSub[1] != 'b' || sSub[2] != 'c';
+        assert false;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SequenceDrop.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(2, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("sSub:seq<char>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("s:seq<char>"));
-      Assert.Equal("['a', 'b', 'c']", counterExamples[1].Variables["sSub:seq<char>"]);
-      StringAssert.Matches(counterExamples[0].Variables["s:seq<char>"], new Regex("\\(Length := 5,.*\\[2\\] := 'a', \\[3\\] := 'b', \\[4\\] := 'c'.*"));
+      Assert.Contains("['c', 'd', 'e'] == sSub", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -1002,16 +930,14 @@ method a(s:seq<char>) requires |s| == 5 {
         var sSub:seq<char> := s[..3];
         assert sSub[0] != 'a' || sSub[1] != 'b' || sSub[2] != 'c';
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SequenceTake.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(2, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("sSub:seq<char>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("s:seq<char>"));
-      Assert.Equal("['a', 'b', 'c']", counterExamples[1].Variables["sSub:seq<char>"]);
-      StringAssert.Matches(counterExamples[0].Variables["s:seq<char>"], new Regex("\\(Length := 5,.*\\[0\\] := 'a', \\[1\\] := 'b', \\[2\\] := 'c'.*"));
+      Assert.Contains("'a' == s[0]", counterExamples[0].Assumption);
+      Assert.Contains("'b' == s[1]", counterExamples[0].Assumption);
+      Assert.Contains("'c' == s[2]", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -1023,7 +949,7 @@ method test(m:set<int>) {
         var m := {6};
         assert 6 !in m;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "VariableNameShadowing.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
@@ -1039,14 +965,13 @@ method test() {
         var m := map[3 := false];
         assert m[3];
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MapsCreation.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(1, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("m:map<int, bool>"));
-      StringAssert.Matches(counterExamples[1].Variables["m:map<int, bool>"], new Regex("map\\[.*3 := false.*"));
+      Assert.Contains("3 in m", counterExamples[1].Assumption);
+      Assert.Contains("false == m[3]", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -1056,38 +981,66 @@ public async Task MapsEmpty(Action<DafnyOptions> optionSettings) {
       var source = @"
       method test() {
         var m : map<int,int> := map[];
-        assert 3 in m;
+        assert false;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MapsEmpty.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(1, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("m:map<int, int>"));
-      Assert.Equal("map[]", counterExamples[1].Variables["m:map<int, int>"]);
+      Assert.Matches("(map\\[\\] == m|0 == \\|m\\|)", counterExamples[1].Assumption);
     }
 
-    [Theory]
+    [Theory(Skip = "This test should be re-enabled once we support traits")]
     [MemberData(nameof(OptionSettings))]
     public async Task TraitType(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
       var source = @"
       module M {
-        trait C {
-          predicate Valid() {false}
+        trait T {
+          function Value():int reads this
+        }
+        class C extends T {
+            var value:int
+            function Value():int 
+                reads this
+            { value }
+        }
+        method test(t1:T, t2:T) {
+          assert t1.Value() == t2.Value();
+        }
+      }".TrimStart();
+      var documentItem = CreateTestDocument(source, "TraitType.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
+        OrderBy(counterexample => counterexample.Position).ToArray();
+      Assert.Single(counterExamples);
+      Assert.Fail("This test needs to be updated once we support traits");
+    }
+
+    [Theory]
+    [MemberData(nameof(OptionSettings))]
+    public async Task ClassTypeWithPredicate(Action<DafnyOptions> optionSettings) {
+      await SetUpOptions(optionSettings);
+      var source = @"
+      module M {
+        class C {
+          predicate Valid()
+          function Identity(i:int):int
+          function Sum(a:int, b:int):int
         }
         method test(c:C) {
-          assert c.Valid();
+          assert !c.Valid() || c.Identity(1) != 1 || c.Sum(1, 2) != 3;
         }
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "TraitType.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Single(counterExamples[0].Variables);
-      Assert.True(counterExamples[0].Variables.ContainsKey("c:M.C"));
+      Assert.Contains("1 == c.Identity(1)", counterExamples[0].Assumption);
+      Assert.Contains("3 == c.Sum(1, 2)", counterExamples[0].Assumption);
+      Assert.Contains("true == c.Valid()", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -1102,11 +1055,11 @@ method test() {
           assert x == 2.4;
         }
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ArrowType.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
-      Assert.True(counterExamples[^1].Variables.ContainsKey("c:(int, bool) ~> real"));
+      Assert.Equal(4, counterExamples.Count());
     }
 
     [Theory]
@@ -1118,13 +1071,14 @@ method test() {
         var s : set<map<int,int>> := {map[3:=5]};
         assert |s| == 0;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MapAsTypeArgument.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(2, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("s:set<map<int, int>>"));
+      Assert.Matches("boundVar[0-9]+: map<int, int>", counterExamples[1].Assumption);
+      Assert.Matches("boundVar[0-9]+ in s", counterExamples[1].Assumption);
+      Assert.Matches("5 == boundVar[0-9]+\\[3\\]", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -1134,19 +1088,17 @@ public async Task DatatypeTypeAsTypeArgument(Action<DafnyOptions> optionSettings
       var source = @"
       module M {
         datatype C = A | B
-        method test() {
-          var s : set<C> := {A};
+        method test(s:set<C>) {
           assert |s| == 0;
         }
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DatatypeTypeAsTypeArgument.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
-      Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(2, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("s:set<M.C>"));
-      Assert.Contains(counterExamples[1].Variables.Keys, key => key.EndsWith("M.C"));
+      Assert.Single(counterExamples);
+      Assert.Contains("exists boundVar0: M.C ::", counterExamples[0].Assumption);
+      Assert.Contains("boundVar0 in s", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -1158,15 +1110,14 @@ method test() {
         var s : set<int> := {};
         assert false;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SetsEmpty.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(1, counterExamples[1].Variables.Count);
-      // Cannot infer the type when Arguments polymorphic encoding is used
-      Assert.True(counterExamples[1].Variables.ContainsKey("s:set<?>"));
-      Assert.Equal("{}", counterExamples[1].Variables["s:set<?>"]);
+      // the assertion below ensures Dafny does not emit a type constraint if it cannot figure out the variable's type
+      Assert.DoesNotContain("?", counterExamples[1].Assumption);
+      Assert.Matches("({} == s|0 == \\|s\\|)", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -1174,27 +1125,21 @@ method test() {
     public async Task MapsUpdate(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
       var source = @"
-      method test(value:int) {
+      method test(value:int) requires value != 3 {
         var m := map[3 := -1];
-        var b := m[3] == -1;
         m := m[3 := value];
-        assert b && m[3] <= 0;
+        assert m[3] <= 0;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MapsUpdate.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
-      Assert.Equal(4, counterExamples.Length);
-      Assert.Equal(2, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("m:map<int, int>"));
-      StringAssert.Matches(counterExamples[1].Variables["m:map<int, int>"], new Regex("map\\[.*3 := -1.*"));
-      Assert.Equal(3, counterExamples[3].Variables.Count);
-      Assert.True(counterExamples[3].Variables.ContainsKey("m:map<int, int>"));
-      Assert.True(counterExamples[3].Variables.ContainsKey("value:int"));
-      Assert.True(counterExamples[3].Variables.ContainsKey("b:bool"));
-      Assert.Equal("true", counterExamples[3].Variables["b:bool"]);
-      StringAssert.Matches(counterExamples[3].Variables["value:int"], new Regex("[1-9][0-9]*"));
-      StringAssert.Matches(counterExamples[3].Variables["m:map<int, int>"], new Regex("map\\[.*3 := [1-9].*"));
+      Assert.Equal(3, counterExamples.Length);
+      Assert.Contains("-1 == m[3]", counterExamples[1].Assumption);
+      Assert.Matches("[1-9][0-9]* == m\\[3\\]", counterExamples[2].Assumption);
+      Assert.Matches("[1-9][0-9]* == value", counterExamples[2].Assumption);
+      Assert.DoesNotContain("m[3] == -1", counterExamples[2].Assumption);
+      Assert.DoesNotContain("-1 == m[3]", counterExamples[2].Assumption);
     }
 
     [Theory]
@@ -1202,49 +1147,66 @@ method test(value:int) {
     public async Task MapsUpdateStoredInANewVariable(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
       var source = @"
-      method T_map1(m:map<int,int>, key:int, val:int)
-        requires key in m.Keys
+      method T_map1(m:map<int,int>)
       {
-        var m' := m[key := val - 1];
-        m' := m'[key := val];
-        assert m'.Values == m.Values - {m[key]} + {val};
+        var m' := m[4 := 5];
+        m' := m'[4 := 6];
+        assert m'.Values == m.Values - {m[4]} + {6};
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MapsUpdateStoredInANewVariable.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
-      Assert.Equal(3, counterExamples.Length);
-      Assert.Equal(4, counterExamples[2].Variables.Count);
-      Assert.True(counterExamples[2].Variables.ContainsKey("m:map<int, int>"));
-      Assert.True(counterExamples[2].Variables.ContainsKey("m':map<int, int>"));
-      Assert.True(counterExamples[2].Variables.ContainsKey("val:int"));
-      Assert.True(counterExamples[2].Variables.ContainsKey("key:int"));
-      var key = counterExamples[2].Variables["key:int"];
-      var val = counterExamples[2].Variables["val:int"];
-      StringAssert.Matches(counterExamples[2].Variables["m':map<int, int>"], new Regex("map\\[.*" + key + " := " + val + ".*"));
+      Assert.Contains("6 == m'[4]", counterExamples.Last().Assumption);
+      Assert.DoesNotContain("5 == m'[4]", counterExamples.Last().Assumption);
     }
 
     [Theory]
     [MemberData(nameof(OptionSettings))]
-    public async Task MapsBuildRecursive(Action<DafnyOptions> optionSettings) {
+    public async Task MapsBuildRecursiveSameValue(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
       var source = @"
       method T_map2()
       {
-        var m := map[5 := 39];
-        m := m[5 := 38];
-        m := m[5 := 37];
+        var m := map[5 := 9];
+        m := m[5 := 99];
+        m := m[5 := 999];
         m := m[5 := 36];
         assert 5 !in m;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MapsBuildRecursive.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(5, counterExamples.Length);
-      Assert.Equal(1, counterExamples[4].Variables.Count);
-      Assert.True(counterExamples[4].Variables.ContainsKey("m:map<int, int>"));
-      StringAssert.Matches(counterExamples[4].Variables["m:map<int, int>"], new Regex("map\\[.*5 := 36.*"));
+      Assert.Contains("5 in m", counterExamples[4].Assumption);
+      Assert.Contains("36 == m[5]", counterExamples[4].Assumption);
+      Assert.DoesNotContain("9", counterExamples[4].Assumption);
+    }
+
+    [Theory]
+    [MemberData(nameof(OptionSettings))]
+    public async Task MapsBuildRecursive(Action<DafnyOptions> optionSettings) {
+      await SetUpOptions(optionSettings);
+      var source = @"
+      method T_map2()
+      {
+        var m := map[1 := 9];
+        m := m[2 := 99];
+        m := m[3 := 999];
+        assert false;
+      }".TrimStart();
+      var documentItem = CreateTestDocument(source, "MapsBuildRecursive.dfy");
+      await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+      var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
+        OrderBy(counterexample => counterexample.Position).ToArray();
+      Assert.Equal(4, counterExamples.Length);
+      Assert.Contains("1 in m", counterExamples[3].Assumption);
+      Assert.Contains("2 in m", counterExamples[3].Assumption);
+      Assert.Contains("3 in m", counterExamples[3].Assumption);
+      Assert.Contains("9 == m[1]", counterExamples[3].Assumption);
+      Assert.Contains("99 == m[2]", counterExamples[3].Assumption);
+      Assert.Contains("999 == m[3]", counterExamples[3].Assumption);
     }
 
     [Theory]
@@ -1258,22 +1220,13 @@ method T_map0(m:map<int,int>, key:int, val:int)
         var m' := m[key := val];
         assert m.Values + {val} == m'.Values;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MapsValuesUpdate.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(4, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("m:map<int, int>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("m':map<int, int>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("val:int"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("key:int"));
-      var key = counterExamples[1].Variables["key:int"];
-      var val = counterExamples[1].Variables["val:int"];
-      var mapRegex = new Regex("map\\[.*" + key + " := " + val + ".*");
-      Assert.True(mapRegex.IsMatch(counterExamples[1].Variables["m':map<int, int>"]) ||
-                    mapRegex.IsMatch(counterExamples[1].Variables["m:map<int, int>"]));
-
+      // The precise counterexample that Dafny returns in this case is ambiguous, so there are no further assertions.
+      // Keeping this test case because it used to trigger an infinite loop.
     }
 
     [Theory]
@@ -1285,16 +1238,13 @@ method test(m:map<int,char>) {
         var keys := m.Keys;
         assert (25 !in keys);
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MapsKeys.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(2, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("m:map<int, char>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("keys:set<int>"));
-      StringAssert.Matches(counterExamples[1].Variables["m:map<int, char>"], new Regex("map\\[.*25 := .*"));
-      StringAssert.Matches(counterExamples[1].Variables["keys:set<int>"], new Regex("\\{.*25 := true.*"));
+      Assert.Contains("25 in m", counterExamples[1].Assumption);
+      Assert.Matches("(keys == m.Keys|m.Keys == keys)", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -1306,16 +1256,14 @@ method test(m:map<int,char>) {
         var values := m.Values;
         assert ('c' !in values);
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MapsValues.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Equal(2, counterExamples.Length);
-      Assert.Equal(2, counterExamples[1].Variables.Count);
-      Assert.True(counterExamples[1].Variables.ContainsKey("m:map<int, char>"));
-      Assert.True(counterExamples[1].Variables.ContainsKey("values:set<char>"));
-      StringAssert.Matches(counterExamples[1].Variables["m:map<int, char>"], new Regex("map\\[.* := 'c'.*"));
-      StringAssert.Matches(counterExamples[1].Variables["values:set<char>"], new Regex("\\{.*'c' := true.*"));
+      Assert.Equal(2, counterExamples.Length);
+      Assert.Matches("('c' in values|'c' in m.Values)", counterExamples[1].Assumption);
+      Assert.Matches("(values == m.Values|m.Values == values)", counterExamples[1].Assumption);
     }
 
     [Theory]
@@ -1329,14 +1277,12 @@ public async Task MapsOfBitVectors(Action<DafnyOptions> optionSettings) {
       method test(m:map<bv2,bv3>) {
         assert |m| == 0;
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "MapsOfBitVectors.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("m:map<bv2, bv3>"));
-      StringAssert.Matches(counterExamples[0].Variables["m:map<bv2, bv3>"], new Regex("map\\[.*[0-9]+ := [0-9]+.*"));
+      Assert.Matches("[0-9]+ in m", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -1354,14 +1300,12 @@ method test() {
             }
          }
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "ModuleRenaming.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(1, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("this:Mo_dule_.Module2_.Cla__ss"));
-      Assert.Equal("(i := 5)", counterExamples[0].Variables["this:Mo_dule_.Module2_.Cla__ss"]);
+      Assert.Matches("5 == this.i", counterExamples[0].Assumption);
     }
 
     [Theory]
@@ -1376,15 +1320,17 @@ public async Task UnboundedIntegers(Action<DafnyOptions> optionSettings) {
       function plus(a: nat64, b: nat64): nat64 {
         a + b
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "UnboundedIntegers.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.True(counterExamples[0].Variables.ContainsKey("a:int"));
-      Assert.True(counterExamples[0].Variables.ContainsKey("b:int"));
-      var a = long.Parse(counterExamples[0].Variables["a:int"]);
-      var b = long.Parse(counterExamples[0].Variables["b:int"]);
+      var aRegex = new Regex("([0-9]+) == a");
+      var bRegex = new Regex("([0-9]+) == b");
+      Assert.Matches(aRegex, counterExamples[0].Assumption);
+      Assert.Matches(bRegex, counterExamples[0].Assumption);
+      var a = long.Parse(aRegex.Match(counterExamples[0].Assumption).Groups[1].Value);
+      var b = long.Parse(bRegex.Match(counterExamples[0].Assumption).Groups[1].Value);
       Assert.True(a + b < a || a + b < b);
     }
 
@@ -1397,20 +1343,20 @@ module M {
         datatype D = C(i:int) {
           predicate p() {true}
         }
-
-        method test(d: D) {
+      }
+      method test(d: M.D) {
           if (d.p()) {
-            assert d.i != 123;
+              assert d.i != 123;
           }
-        }
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "DatatypeWithPredicate.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.True(counterExamples[0].Variables.ContainsKey("d:M.D"));
-      Assert.Equal("C(i := 123)", counterExamples[0].Variables["d:M.D"]);
+      Assert.Contains("M.D.C(123) == d", counterExamples.First().Assumption);
+      Assert.Contains("M.D.C(123).p.requires()", counterExamples.First().Assumption);
+      Assert.Contains("true == M.D.C(123).p()", counterExamples.First().Assumption);
     }
 
     /** Makes sure the counterexample lists the base type of a variable */
@@ -1423,13 +1369,11 @@ public async Task SubsetType(Action<DafnyOptions> optionSettings) {
       "method a(s:String) {" +
       "  assert s != \"aws\";" +
       "}".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "SubsetType.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.True(counterExamples[0].Variables.ContainsKey("s:seq<char>"));
-      Assert.Equal("['a', 'w', 's']", counterExamples[0].Variables["s:seq<char>"]);
     }
 
     /// <summary>
@@ -1451,15 +1395,14 @@ method test(c: C?) {
           assert c == null || c.c1 != c.c2 || c.c1 != '\U{1023}';
         }
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "EqualFields.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.True(counterExamples[0].Variables.ContainsKey("c:M.C?"));
-      Assert.True(counterExamples[0].Variables["c:M.C?"] is
-        "(c1 := '\\u1023', c2 := '\\u1023')" or
-        "(c2 := '\\u1023', c1 := '\\u1023')");
+      Assert.Contains("c != null", counterExamples[0].Assumption);
+      Assert.Contains("'\\U{1023}' == c.c1", counterExamples[0].Assumption);
+      Assert.Contains("'\\U{1023}' == c.c2", counterExamples[0].Assumption);
     }
 
     /// <summary>
@@ -1473,14 +1416,13 @@ public async Task NonIntegerSeqIndices(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
       string fp = Path.Combine(Directory.GetCurrentDirectory(), "Various", "TestFiles", "3048.dfy");
       var source = await File.ReadAllTextAsync(fp, CancellationToken);
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "NonIntegerSeqIndices.dfy");
 
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-
       /* First, ensure we can correctly extract counterexamples without crashing... */
       var nonIntegralIndexedSeqs = (await RequestCounterExamples(documentItem.Uri))
-        .SelectMany(cet => cet.Variables.ToList())
-        /* Then, extract the number of non-integral indexed sequences from the repro case... */
+        .Select(cet => cet.Assumption)
+        // Then, extract the number of non-integral indexed sequences from the repro case...
         .Count(IsNegativeIndexedSeq);
 
       // With more recent Z3 versions (at least 4.11+, but maybe going back farther), this situation doesn't seem
@@ -1494,24 +1436,12 @@ public async Task NonIntegerSeqIndices(Action<DafnyOptions> optionSettings) {
     }
 
     /* Helper for the NonIntegerSeqIndices test. */
-    private static bool IsNegativeIndexedSeq(KeyValuePair<string, string> kvp) {
+    private static bool IsNegativeIndexedSeq(string assumption) {
       var r = new Regex(@"\[\(- \d+\)\]");
-      return kvp.Key.Contains("seq<_module.uint8>") && r.IsMatch(kvp.Value);
-    }
-
-    [Fact]
-    public void TestIsNegativeIndexedSeq() {
-      Assert.False(
-        IsNegativeIndexedSeq(new KeyValuePair<string, string>("uint8", "42")));
-      Assert.False(
-        IsNegativeIndexedSeq(new KeyValuePair<string, string>("seq<_module.uint8>", "(Length := 42, [0] := 42)")));
-      Assert.True(
-        IsNegativeIndexedSeq(new KeyValuePair<string, string>("seq<_module.uint8>", "(Length := 9899, [(- 1)] := 42)")));
-      Assert.True(
-        IsNegativeIndexedSeq(new KeyValuePair<string, string>("seq<seq<_module.uint8>>", "(Length := 1123, [(- 12345)] := @12)")));
+      return r.IsMatch(assumption);
     }
 
-    [Theory]
+    [Theory(Skip = "This test should be re-enabled once it is OK to use fully-qualified names everywhere")]
     [MemberData(nameof(OptionSettings))]
     public async Task TypePolymorphism(Action<DafnyOptions> optionSettings) {
       await SetUpOptions(optionSettings);
@@ -1521,15 +1451,12 @@ class C<T> {
           function Equal<T> (a:T, b:T):bool { assert a != b; true }
         }
       }".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "TypePolymorphism.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       var counterExamples = (await RequestCounterExamples(documentItem.Uri)).
         OrderBy(counterexample => counterexample.Position).ToArray();
       Assert.Single(counterExamples);
-      Assert.Equal(3, counterExamples[0].Variables.Count);
-      Assert.True(counterExamples[0].Variables.ContainsKey("a:M.C.Equal$T"));
-      Assert.True(counterExamples[0].Variables.ContainsKey("b:M.C.Equal$T"));
-      Assert.True(counterExamples[0].Variables.ContainsKey("this:M.C<M.C$T>"));
+      Assert.Fail("This test needs to be updated so that types in the counterexample can be properly resolved.");
     }
 
     /// <summary>
@@ -1551,9 +1478,9 @@ modifies this {
         }
       }
       ".TrimStart();
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "GetDafnyTypeInfiniteRecursion.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-      (await RequestCounterExamples(documentItem.Uri)).ToList(); ;
+      (await RequestCounterExamples(documentItem.Uri)).ToList();
     }
 
     public CounterExampleTest(ITestOutputHelper output) : base(output) {
diff --git a/Source/DafnyLanguageServer.Test/Various/DiagnosticMigrationTest.cs b/Source/DafnyLanguageServer.Test/Various/DiagnosticMigrationTest.cs
index ee01ecefaa3..c91063b2fac 100644
--- a/Source/DafnyLanguageServer.Test/Various/DiagnosticMigrationTest.cs
+++ b/Source/DafnyLanguageServer.Test/Various/DiagnosticMigrationTest.cs
@@ -18,19 +18,19 @@ public class DiagnosticMigrationTest : ClientBasedLanguageServerTest {
 
   [Fact]
   public async Task ResolutionDiagnosticsContainPreviousVerificationResultsWhenCodeIsInsertedAfter() {
-    var documentItem = await CreateAndOpenTestDocument(FastToFailVerification, "untitled:Untitled-1");
-    var verificationDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var documentItem = await CreateOpenAndWaitForResolve(FastToFailVerification, "untitled:Untitled-1");
+    var verificationDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Single(verificationDiagnostics);
     ApplyChange(ref documentItem, new Range(0, 47, 0, 47), "\n\n" + NeverVerifies);
-    var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-    Assert.Equal(CompilationAfterResolution.OutdatedPrefix + verificationDiagnostics[0].Message, resolutionDiagnostics[0].Message);
+    var resolutionDiagnostics = await GetNextDiagnostics(documentItem);
+    Assert.Equal(IdeState.OutdatedPrefix + verificationDiagnostics[0].Message, resolutionDiagnostics[0].Message);
   }
 
   [Fact]
   public async Task ResolutionDiagnosticsContainPreviousVerificationResultsWhenCodeIsInsertedBefore() {
-    var documentItem = CreateTestDocument(FastToFailVerification);
+    var documentItem = CreateTestDocument(FastToFailVerification, "ResolutionDiagnosticsContainPreviousVerificationResultsWhenCodeIsInsertedBefore.dfy");
     client.OpenDocument(documentItem);
-    var verificationDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var verificationDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Single(verificationDiagnostics);
     ApplyChange(ref documentItem, new Range(0, 0, 0, 0), NeverVerifies + "\n\n");
     var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
@@ -45,7 +45,7 @@ public async Task ResolutionDiagnosticsContainPreviousVerificationResultsWhenCod
   public async Task ResolutionDiagnosticsAreRemovedWhenRangeIsDeleted() {
     var documentItem = CreateTestDocument(FastToFailVerification + "\n" + FastToPassVerification);
     client.OpenDocument(documentItem);
-    var verificationDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var verificationDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Single(verificationDiagnostics);
     ApplyChange(ref documentItem, new Range(0, 0, 1, 0), "");
     var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
@@ -61,7 +61,7 @@ public async Task ResolutionDiagnosticsAreKeptWhenNonEdgeCrossingChangesAreMade(
     return;
   }");
     client.OpenDocument(documentItem);
-    var verificationDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var verificationDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Single(verificationDiagnostics);
 
     client.DidChangeTextDocument(new DidChangeTextDocumentParams {
@@ -99,9 +99,9 @@ public async Task ResolutionDiagnosticsAreKeptWhenNonEdgeCrossingChangesAreMade(
     var parseDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
     var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
     Assert.Equal(verificationDiagnostics.Length, resolutionDiagnostics.Length);
-    Assert.Equal(CompilationAfterResolution.OutdatedPrefix + verificationDiagnostics[0].Message, resolutionDiagnostics[0].Message);
+    Assert.Equal(IdeState.OutdatedPrefix + verificationDiagnostics[0].Message, resolutionDiagnostics[0].Message);
     Assert.Equal(verificationDiagnostics[0].RelatedInformation, resolutionDiagnostics[0].RelatedInformation);
-    Assert.Equal(new Range(4, 7, 4, 13), resolutionDiagnostics[0].Range);
+    Assert.Equal(new Range(4, 7, 4, 14), resolutionDiagnostics[0].Range);
   }
 
   [Fact]
@@ -113,7 +113,7 @@ public async Task PassingANullChangeRangeClearsDiagnostics() {
     Assert.Single(resolutionDiagnostics);
 
     ApplyChange(ref documentItem, null, "method u() ensures true { var x: bool := true; }");
-    var verificationDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var verificationDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Empty(verificationDiagnostics);
 
     ApplyChange(ref documentItem, new Range(0, 42, 0, 46), "1");
@@ -130,17 +130,17 @@ public async Task VerificationDiagnosticsCanBeMigratedAcrossMultipleResolutions(
     return;
   }");
     client.OpenDocument(documentItem);
-    var verificationDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var verificationDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Single(verificationDiagnostics);
 
     ApplyChange(ref documentItem, new Range(0, 7, 0, 7), "{:neverVerify}");
-    var resolutionDiagnostics1 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-    Assert.Equal(CompilationAfterResolution.OutdatedPrefix + verificationDiagnostics[0].Message, resolutionDiagnostics1[0].Message);
+    var resolutionDiagnostics1 = await GetNextDiagnostics(documentItem);
+    Assert.Equal(IdeState.OutdatedPrefix + verificationDiagnostics[0].Message, resolutionDiagnostics1[0].Message);
     ApplyChange(ref documentItem, new Range(3, 9, 3, 10), "2");
 
     // Check that no other resolution diagnostics came in by fixing verification and getting new verification diagnostics.
     ApplyChange(ref documentItem, new Range(0, 7, 0, 21), "");
-    var verificationDiagnostics2 = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
+    var verificationDiagnostics2 = await GetLastDiagnostics(documentItem);
     Assert.Empty(verificationDiagnostics2);
   }
 
@@ -153,14 +153,14 @@ public async Task VerificationDiagnosticsDoNotShowUpTwice() {
     return;
   }");
     client.OpenDocument(documentItem);
-    var verificationDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var verificationDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Single(verificationDiagnostics);
 
     ApplyChange(ref documentItem, new Range(3, 9, 3, 10), "3");
 
-    var resolutionDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken, documentItem);
-    Assert.Equal(CompilationAfterResolution.OutdatedPrefix + verificationDiagnostics[0].Message, resolutionDiagnostics[0].Message);
-    var verificationDiagnostics2 = await GetLastDiagnostics(documentItem, CancellationToken);
+    var resolutionDiagnostics = await GetNextDiagnostics(documentItem);
+    Assert.Equal(IdeState.OutdatedPrefix + verificationDiagnostics[0].Message, resolutionDiagnostics[0].Message);
+    var verificationDiagnostics2 = await GetLastDiagnostics(documentItem);
     Assert.Equal(verificationDiagnostics[0].Message, verificationDiagnostics2[0].Message);
     await AssertNoDiagnosticsAreComing(CancellationToken);
   }
diff --git a/Source/DafnyLanguageServer.Test/Various/ExceptionTests.cs b/Source/DafnyLanguageServer.Test/Various/ExceptionTests.cs
index fdd7ca53703..f4fd8aca6be 100644
--- a/Source/DafnyLanguageServer.Test/Various/ExceptionTests.cs
+++ b/Source/DafnyLanguageServer.Test/Various/ExceptionTests.cs
@@ -1,21 +1,19 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Microsoft.Boogie;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using Microsoft.Dafny.LanguageServer.Language;
 using Microsoft.Dafny.LanguageServer.Workspace;
-using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Server;
 using Xunit;
 using Xunit.Abstractions;
-using LanguageServerExtensions = Microsoft.Dafny.LanguageServer.Workspace.LanguageServerExtensions;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Various;
@@ -27,8 +25,9 @@ public class ExceptionTests : ClientBasedLanguageServerTest {
 
   protected override void ServerOptionsAction(LanguageServerOptions serverOptions) {
     serverOptions.Services
+      .AddSingleton<TextDocumentLoader, TextDocumentLoader>()
       .AddSingleton<ITextDocumentLoader>(serviceProvider => new CrashingLoader(this,
-        LanguageServerExtensions.CreateTextDocumentLoader(serviceProvider)))
+        serviceProvider.GetRequiredService<TextDocumentLoader>()))
       .AddSingleton<IProgramVerifier>(serviceProvider => new CrashingVerifier(this,
         new DafnyProgramVerifier(serviceProvider.GetRequiredService<ILogger<DafnyProgramVerifier>>())
     ));
@@ -39,7 +38,7 @@ public async Task LoadCrashOnOpenRecovery() {
     var source = @"method Foo() { assert true; }";
 
     CrashOnLoad = true;
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "LoadCrashOnOpenRecovery.dfy");
     client.OpenDocument(documentItem);
     var crashDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
     Assert.Single(crashDiagnostics);
@@ -47,7 +46,7 @@ public async Task LoadCrashOnOpenRecovery() {
     Assert.True(crashDiagnostics[0].Message.Contains("internal error"), crashDiagnostics[0].Message);
     CrashOnLoad = false;
     ApplyChange(ref documentItem, new Range(0, 0, 0, 0), " ");
-    var recoveredDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var recoveredDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Empty(recoveredDiagnostics);
   }
 
@@ -55,7 +54,7 @@ public async Task LoadCrashOnOpenRecovery() {
   public async Task LoadCrashOnChangeRecover() {
     var source = @"method Foo() { assert true; }";
 
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "LoadCrashOnChangeRecover.dfy");
     client.OpenDocument(documentItem);
     CrashOnLoad = true;
     ApplyChange(ref documentItem, new Range(0, 0, 0, 0), " ");
@@ -64,7 +63,7 @@ public async Task LoadCrashOnChangeRecover() {
     Assert.True(crashDiagnostics[0].Message.Contains("internal error"), crashDiagnostics[0].Message);
     CrashOnLoad = false;
     ApplyChange(ref documentItem, new Range(0, 0, 0, 0), " ");
-    var recoveredDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var recoveredDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Empty(recoveredDiagnostics);
   }
 
@@ -73,14 +72,14 @@ public async Task PrepareVerificationCrashRecover() {
     var source = @"method Foo() { assert false; }";
 
     CrashOnPrepareVerification = true;
-    var documentItem = CreateTestDocument(source);
-    await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+    var documentItem = CreateTestDocument(source, "PrepareVerificationCrashRecover.dfy");
+    client.OpenDocument(documentItem);
     var translationCrashDiagnostics = await diagnosticsReceiver.AwaitNextDiagnosticsAsync(CancellationToken);
     Assert.Single(translationCrashDiagnostics);
     Assert.True(translationCrashDiagnostics[0].Message.Contains("internal error"), translationCrashDiagnostics[0].Message);
     CrashOnPrepareVerification = false;
     ApplyChange(ref documentItem, new Range(0, 0, 0, 0), " ");
-    var recoveredDiagnostics = await GetLastDiagnostics(documentItem, CancellationToken);
+    var recoveredDiagnostics = await GetLastDiagnostics(documentItem);
     Assert.Single(recoveredDiagnostics);
     Assert.True(recoveredDiagnostics[0].Message.Contains("not be proved"), recoveredDiagnostics[0].Message);
   }
@@ -94,40 +93,41 @@ public CrashingVerifier(ExceptionTests tests, IProgramVerifier verifier) {
       this.verifier = verifier;
     }
 
-    public Task<IReadOnlyList<IImplementationTask>> GetVerificationTasksAsync(ExecutionEngine engine,
-      CompilationAfterResolution compilation, ModuleDefinition moduleDefinition, CancellationToken cancellationToken) {
+    public Task<IReadOnlyList<IVerificationTask>> GetVerificationTasksAsync(ExecutionEngine engine,
+      ResolutionResult resolution, ModuleDefinition moduleDefinition, CancellationToken cancellationToken) {
 
       if (tests.CrashOnPrepareVerification) {
-        throw new Exception("testing crash");
+        throw new TestException("testing crash");
       }
-      return verifier.GetVerificationTasksAsync(engine, compilation, moduleDefinition, cancellationToken);
+      return verifier.GetVerificationTasksAsync(engine, resolution, moduleDefinition, cancellationToken);
+    }
+  }
+
+  class TestException : Exception {
+    public TestException([CanBeNull] string message) : base(message) {
     }
   }
 
   class CrashingLoader : ITextDocumentLoader {
     private readonly ExceptionTests tests;
-    private readonly ITextDocumentLoader loader;
+    private readonly TextDocumentLoader loader;
 
-    public CrashingLoader(ExceptionTests tests, ITextDocumentLoader loader) {
+    public CrashingLoader(ExceptionTests tests, TextDocumentLoader loader) {
       this.tests = tests;
       this.loader = loader;
     }
 
-    public IdeState CreateUnloaded(Compilation compilation) {
-      return loader.CreateUnloaded(compilation);
-    }
-
-    public Task<CompilationAfterParsing> ParseAsync(DafnyOptions options, Compilation compilation,
-      IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees, CancellationToken cancellationToken) {
-      return loader.ParseAsync(options, compilation, ImmutableDictionary<Uri, VerificationTree>.Empty, cancellationToken);
+    public Task<ProgramParseResult> ParseAsync(Compilation compilation, CancellationToken cancellationToken) {
+      return loader.ParseAsync(compilation, cancellationToken);
     }
 
-    public Task<CompilationAfterResolution> ResolveAsync(DafnyOptions options, CompilationAfterParsing compilation,
-      IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees, CancellationToken cancellationToken) {
+    public Task<ResolutionResult> ResolveAsync(Compilation compilation,
+      Program program,
+      CancellationToken cancellationToken) {
       if (tests.CrashOnLoad) {
         throw new IOException("testing crash");
       }
-      return loader.ResolveAsync(options, compilation, migratedVerificationTrees, cancellationToken);
+      return loader.ResolveAsync(compilation, program, cancellationToken);
     }
   }
 
diff --git a/Source/DafnyLanguageServer.Test/Various/PluginsHandlerTest.cs b/Source/DafnyLanguageServer.Test/Various/PluginsHandlerTest.cs
new file mode 100644
index 00000000000..0c7db1102d2
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Various/PluginsHandlerTest.cs
@@ -0,0 +1,30 @@
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
+using Xunit.Abstractions;
+using Xunit;
+using System.Threading;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Various;
+
+public class PluginsHandlerTest : PluginsTestBase {
+
+  protected override string LibraryName =>
+    "PluginsHandlerTest";
+
+  protected override string[] CommandLineArgument =>
+    new[] { $"{LibraryPath}" };
+
+  [Fact]
+  public async Task EnsureWithPluginHandlersWorks() {
+    var documentItem = CreateTestDocument(@"
+method firstMethod() {
+}");
+    var cancellationToken = new CancellationToken();
+    await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
+    var requestResult = await client.SendRequest("dafny/request/dummy").Returning<string>(cancellationToken);
+    Assert.Equal("dummy", requestResult);
+  }
+
+  public PluginsHandlerTest(ITestOutputHelper output) : base(output) {
+  }
+}
diff --git a/Source/DafnyLanguageServer.Test/Various/PluginsTestBase.cs b/Source/DafnyLanguageServer.Test/Various/PluginsTestBase.cs
index ece6f55460c..96e8e678295 100644
--- a/Source/DafnyLanguageServer.Test/Various/PluginsTestBase.cs
+++ b/Source/DafnyLanguageServer.Test/Various/PluginsTestBase.cs
@@ -38,13 +38,15 @@ private static string GetLibrary(string assemblyName) {
       "DafnyCore",
       "System",
       "netstandard",
+      "OmniSharp.Extensions.JsonRpc",
       "OmniSharp.Extensions.LanguageServer",
       "OmniSharp.Extensions.LanguageProtocol",
       "System.Console",
       "DafnyLanguageServer",
       "System.Runtime",
       "Boogie.Core",
-      "System.Collections"
+      "System.Collections",
+      "MediatR"
     };
     compilation = compilation.AddReferences(standardLibraries.Select(fileName =>
         MetadataReference.CreateFromFile(Assembly.Load((string)fileName).Location)))
@@ -53,7 +55,7 @@ private static string GetLibrary(string assemblyName) {
       .WithOptions(
         new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
       );
-    var syntaxTree = CSharpSyntaxTree.ParseText(code);
+    var syntaxTree = CSharpSyntaxTree.ParseText(code, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp9));
     compilation = compilation.AddSyntaxTrees(syntaxTree);
     var assemblyPath = $"{temp}.dll";
     var result = compilation.Emit(assemblyPath);
@@ -69,7 +71,7 @@ private static string GetLibrary(string assemblyName) {
   protected override Task SetUp(Action<DafnyOptions> modifyOptions) {
     LibraryPath = GetLibrary(LibraryName);
     void ModifyOptions(DafnyOptions options) {
-      options.Set(CommonOptionBag.Plugin, CommandLineArgument.ToList());
+      options.Set(CommonOptionBag.PluginOption, CommandLineArgument.ToList());
       modifyOptions?.Invoke(options);
     }
     return base.SetUp(ModifyOptions);
diff --git a/Source/DafnyLanguageServer.Test/Various/PluginsTestWithTranslationError.cs b/Source/DafnyLanguageServer.Test/Various/PluginsTestWithTranslationError.cs
index 029d0350299..9f0d41a13c6 100644
--- a/Source/DafnyLanguageServer.Test/Various/PluginsTestWithTranslationError.cs
+++ b/Source/DafnyLanguageServer.Test/Various/PluginsTestWithTranslationError.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using System.Threading;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Xunit;
 using Xunit.Abstractions;
 using XunitAssertMessages;
@@ -22,11 +23,7 @@ public async Task EnsureTranslationErrorsAreReportedEvenWithoutResolutionErrors(
     // This code will run with the plugin from PluginsAdvancedTest, but that plugin won't throw an exception on the code below.
     var documentItem = CreateTestDocument("function test(): nat { -1 }");// No resolution error
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    var resolutionReport = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-    Assert.Equal(documentItem.Uri, resolutionReport.Uri);
-    var verificationReport = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-    Assert.Equal(documentItem.Uri, verificationReport.Uri);
-    var diagnostics = verificationReport.Diagnostics.ToArray();
+    var diagnostics = await GetLastDiagnostics(documentItem);
     AssertM.Equal(2, diagnostics.Length, LibraryPath + " did not return two errors.");
     Assert.Equal("Translation error that should appear in the code", diagnostics[0].Message);
   }
diff --git a/Source/DafnyLanguageServer.Test/Various/PluginsTestWithVerification.cs b/Source/DafnyLanguageServer.Test/Various/PluginsTestWithVerification.cs
index b6560c3a1e3..497552a0d26 100644
--- a/Source/DafnyLanguageServer.Test/Various/PluginsTestWithVerification.cs
+++ b/Source/DafnyLanguageServer.Test/Various/PluginsTestWithVerification.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using System.Threading;
 using Microsoft.Dafny.LanguageServer.IntegrationTest.Extensions;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Xunit;
 using Xunit.Abstractions;
 using XunitAssertMessages;
@@ -22,16 +23,11 @@ public async Task EnsureItIsPossibleToLoadAPluginAndContinueVerification() {
     // This code will run with the plugin from PluginsAdvancedTest, but that plugin won't throw an exception on the code below.
     var documentItem = CreateTestDocument("function test(): nat { -1 }");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
-    var resolutionReport = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-    Assert.Equal(documentItem.Uri, resolutionReport.Uri);
-    var verificationReport = await diagnosticsReceiver.AwaitNextNotificationAsync(CancellationToken);
-    Assert.Equal(documentItem.Uri, verificationReport.Uri);
-    var diagnostics = verificationReport.Diagnostics.ToArray();
+    var diagnostics = await GetLastDiagnostics(documentItem);
     AssertM.Equal(2, diagnostics.Length, LibraryPath + " did not raise an error.");
     Assert.Equal("Plugin Error that does not prevent verification", diagnostics[0].Message);
-    Assert.Equal(new Range((0, 0), (0, 8)), diagnostics[0].Range);
     Assert.Equal("value does not satisfy the subset constraints of 'nat'", diagnostics[1].Message);
-    Assert.Equal(new Range((0, 23), (0, 24)), diagnostics[1].Range);
+    Assert.Equal(new Range((0, 23), (0, 25)), diagnostics[1].Range);
   }
 
   public PluginsTestWithVerification(ITestOutputHelper output) : base(output) {
diff --git a/Source/DafnyLanguageServer.Test/Various/ResourceUsageTest.cs b/Source/DafnyLanguageServer.Test/Various/ResourceUsageTest.cs
index b91e02ae970..1611f9484cd 100644
--- a/Source/DafnyLanguageServer.Test/Various/ResourceUsageTest.cs
+++ b/Source/DafnyLanguageServer.Test/Various/ResourceUsageTest.cs
@@ -20,14 +20,14 @@ method Foo()
 }";
     string solverProcessName = $"z3-{DafnyOptions.DefaultZ3Version}";
     var processes1 = Process.GetProcessesByName(solverProcessName);
-    var documentItem = CreateTestDocument(source);
+    var documentItem = CreateTestDocument(source, "SolverProcessCountDoesNotIncreaseOnEachVerification.dfy");
     await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
 
-    await GetLastDiagnostics(documentItem, CancellationToken);
+    await GetLastDiagnostics(documentItem);
     var processes2 = Process.GetProcessesByName(solverProcessName);
     Assert.Equal(processes1.Length, processes2.Length - 1);
     ApplyChange(ref documentItem, new Range(0, 0, 0, 0), "\n");
-    await GetLastDiagnostics(documentItem, CancellationToken);
+    await GetLastDiagnostics(documentItem);
     var processes3 = Process.GetProcessesByName(solverProcessName);
     Assert.Equal(processes2.Length, processes3.Length);
   }
diff --git a/Source/DafnyLanguageServer.Test/Various/SlowVerifier.cs b/Source/DafnyLanguageServer.Test/Various/SlowVerifier.cs
index 2852c250d7a..12b0c0ea69e 100644
--- a/Source/DafnyLanguageServer.Test/Various/SlowVerifier.cs
+++ b/Source/DafnyLanguageServer.Test/Various/SlowVerifier.cs
@@ -6,8 +6,8 @@
 using System.Threading.Tasks;
 using Microsoft.Boogie;
 using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Dafny.LanguageServer.Workspace;
 using Microsoft.Extensions.Logging;
+using VC;
 
 namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Various;
 
@@ -21,14 +21,14 @@ public SlowVerifier(ILogger<DafnyProgramVerifier> logger) {
 
   private readonly DafnyProgramVerifier verifier;
 
-  public async Task<IReadOnlyList<IImplementationTask>> GetVerificationTasksAsync(ExecutionEngine engine,
-    CompilationAfterResolution compilation, ModuleDefinition moduleDefinition, CancellationToken cancellationToken) {
-    var program = compilation.Program;
+  public async Task<IReadOnlyList<IVerificationTask>> GetVerificationTasksAsync(ExecutionEngine engine,
+    ResolutionResult resolution, ModuleDefinition moduleDefinition, CancellationToken cancellationToken) {
+    var program = resolution.ResolvedProgram;
     var attributes = program.Modules().SelectMany(m => {
       return m.TopLevelDecls.OfType<TopLevelDeclWithMembers>().SelectMany(d => d.Members.Select(member => member.Attributes));
     }).ToList();
 
-    var tasks = await verifier.GetVerificationTasksAsync(engine, compilation, moduleDefinition, cancellationToken);
+    var tasks = await verifier.GetVerificationTasksAsync(engine, resolution, moduleDefinition, cancellationToken);
     if (attributes.Any(a => Attributes.Contains(a, "neverVerify"))) {
       tasks = tasks.Select(t => new NeverVerifiesImplementationTask(t)).ToList();
     }
@@ -36,18 +36,24 @@ public async Task<IReadOnlyList<IImplementationTask>> GetVerificationTasksAsync(
     return tasks;
   }
 
-  class NeverVerifiesImplementationTask : IImplementationTask {
-    private readonly IImplementationTask original;
+  class NeverVerifiesImplementationTask : IVerificationTask {
+    private readonly IVerificationTask original;
     private readonly Subject<IVerificationStatus> source;
 
-    public NeverVerifiesImplementationTask(IImplementationTask original) {
+    public NeverVerifiesImplementationTask(IVerificationTask original) {
       this.original = original;
       source = new();
     }
 
+    public IVerificationTask FromSeed(int newSeed) {
+      return this;
+    }
+
     public IVerificationStatus CacheStatus => new Stale();
-    public ProcessedProgram ProcessedProgram => original.ProcessedProgram;
-    public Implementation Implementation => original.Implementation;
+    public ManualSplit Split => original.Split;
+    public Boogie.IToken ScopeToken => original.ScopeToken;
+    public string ScopeId => original.ScopeId;
+    public Boogie.IToken Token => original.Token;
 
     public IObservable<IVerificationStatus> TryRun() {
       return source;
diff --git a/Source/DafnyLanguageServer.Test/Various/StabilityTest.cs b/Source/DafnyLanguageServer.Test/Various/StabilityTest.cs
index 1f8f28c0412..c0de56e3bf6 100644
--- a/Source/DafnyLanguageServer.Test/Various/StabilityTest.cs
+++ b/Source/DafnyLanguageServer.Test/Various/StabilityTest.cs
@@ -54,7 +54,7 @@ public async Task StrongNestingDoesNotCauseStackOverlfow() {
 method NestedExpression() {
   assert var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; var three := 3; true;
 }";
-      var documentItem = CreateTestDocument(source);
+      var documentItem = CreateTestDocument(source, "StrongNestingDoesNotCauseStackOverlfow.dfy");
       await client.OpenDocumentAndWaitAsync(documentItem, CancellationToken);
       Assert.NotNull(await Projects.GetResolvedDocumentAsyncNormalizeUri(documentItem.Uri));
     }
diff --git a/Source/DafnyLanguageServer.Test/Various/StandaloneLanguageServerBinaryTest.cs b/Source/DafnyLanguageServer.Test/Various/StandaloneLanguageServerBinaryTest.cs
deleted file mode 100644
index 5f17bede1a7..00000000000
--- a/Source/DafnyLanguageServer.Test/Various/StandaloneLanguageServerBinaryTest.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp;
-using System.Collections.Generic;
-using System.IO.Pipelines;
-using System.Linq;
-using System.Reactive.Concurrency;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using Microsoft.CodeAnalysis;
-using Microsoft.Extensions.Logging.Abstractions;
-using OmniSharp.Extensions.JsonRpc;
-using OmniSharp.Extensions.JsonRpc.Client;
-using OmniSharp.Extensions.JsonRpc.Serialization;
-using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using Xunit;
-
-namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Various {
-
-  [Collection("Sequential Collection")] // Let slow tests run sequentially
-  public class StandaloneLanguageServerBinaryTest {
-
-    [Fact]
-    public async Task InitialisationWorks() {
-
-      var process = StartLanguageServer();
-      var initializeMessage = await GetLspInitializeMessage(process.Id);
-      await process.StandardInput.WriteAsync(initializeMessage);
-
-      var initializedResponseFirstLine = await process.StandardOutput.ReadLineAsync();
-      Assert.False(string.IsNullOrEmpty(initializedResponseFirstLine));
-      process.Kill();
-      await process.WaitForExitAsync();
-    }
-
-    private Process StartLanguageServer() {
-      var serverBinary = Path.Join(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "DafnyLanguageServer.dll");
-
-      var processInfo = new ProcessStartInfo("dotnet") {
-        RedirectStandardOutput = true,
-        RedirectStandardError = true,
-        RedirectStandardInput = true,
-        UseShellExecute = false,
-        ArgumentList = { serverBinary }
-      };
-
-      return Process.Start(processInfo)!;
-    }
-
-    [Fact]
-    public async Task LanguageServerStaysAliveIfParentDiesButNoParentIdWasProvided() {
-      var process = await StartLanguageServerRunnerProcess();
-
-      var languageServerProcessId = await process.StandardOutput.ReadLineAsync();
-      Assert.NotNull(languageServerProcessId);
-
-      await Task.Delay(1000); // Give the process some time to die
-      var initializeMessage = await GetLspInitializeMessage(null);
-      await process.StandardInput.WriteAsync(initializeMessage);
-
-      var initializedResponseFirstLine = await process.StandardOutput.ReadLineAsync();
-      Assert.False(string.IsNullOrEmpty(initializedResponseFirstLine));
-
-      await process.WaitForExitAsync();
-
-      await Task.Delay(100); // Give the process some time to die
-
-      Assert.False(string.IsNullOrEmpty(initializedResponseFirstLine));
-      try {
-        var languageServer = Process.GetProcessById(int.Parse(languageServerProcessId));
-        languageServer.Kill();
-      } catch (ArgumentException) {
-        Assert.Fail("Language server should not have killed itself if it doesn't know the parent.");
-      }
-    }
-
-    [Fact(Timeout = 10_000)]
-    public async Task LanguageServerShutsDownIfParentDies() {
-      var process = await StartLanguageServerRunnerProcess();
-
-      var languageServerProcessId = await process.StandardOutput.ReadLineAsync();
-
-      var initializeMessage = await GetLspInitializeMessage(process.Id);
-      await process.StandardInput.WriteAsync(initializeMessage);
-
-      var initializedResponseFirstLine = await process.StandardOutput.ReadLineAsync();
-      Assert.False(string.IsNullOrEmpty(initializedResponseFirstLine));
-
-      var error = await process.StandardError.ReadToEndAsync();
-      var didExit = process.WaitForExit(-1);
-      Assert.True(didExit);
-      Assert.NotNull(languageServerProcessId);
-      Assert.True(string.IsNullOrEmpty(error), error);
-
-      // Wait for the language server to kill itself by waiting until it closes the output stream.
-      await process.StandardOutput.ReadToEndAsync();
-
-      for (int attempts = 0; attempts < 500; attempts++) {
-        // Give the language server time to kill itself
-        await Task.Delay(10);
-
-        try {
-          Process.GetProcessById(int.Parse(languageServerProcessId));
-        } catch {
-          return;
-        }
-      }
-
-      var languageServer = Process.GetProcessById(int.Parse(languageServerProcessId));
-      languageServer.Kill();
-      Assert.Fail("Language server should have killed itself if the parent is gone.");
-    }
-
-    private static async Task<Process> StartLanguageServerRunnerProcess() {
-      var languageServerBinary = Path.Join(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "DafnyLanguageServer");
-      var languageServerRunnerPath = await CreateDotNetDllThatStartsGivenFilepath(languageServerBinary.Replace(@"\", @"\\"));
-
-      var processInfo = new ProcessStartInfo("dotnet", languageServerRunnerPath) {
-        RedirectStandardOutput = true,
-        RedirectStandardError = true,
-        RedirectStandardInput = true,
-        UseShellExecute = false,
-      };
-      return Process.Start(processInfo)!;
-    }
-
-    class AlwaysOutputFilter : IOutputFilter {
-      public bool ShouldOutput(object value) => true;
-    }
-
-    private static async Task<string> GetLspInitializeMessage(int? processId) {
-      var buffer = new MemoryStream();
-      OutputHandler outputHandler = new OutputHandler(PipeWriter.Create(buffer), new JsonRpcSerializer(),
-        new List<IOutputFilter> { new AlwaysOutputFilter() },
-        TaskPoolScheduler.Default, new NullLogger<OutputHandler>());
-      outputHandler.Send(new OutgoingRequest {
-        Id = 1,
-        Method = "initialize",
-        Params = new InitializeParams {
-          ProcessId = processId,
-          ClientInfo = new ClientInfo(),
-          Capabilities = new ClientCapabilities(),
-        }
-      });
-      await outputHandler.StopAsync();
-      return Encoding.ASCII.GetString(buffer.ToArray());
-    }
-
-    /// <summary>
-    /// This method creates a binary and returns the path to that binary.
-    /// Running the binary mimics the situation in which an IDE starts the Dafny language server and then dies.
-    /// 
-    /// The reason we create this binary at runtime instead of compile time is to prevent having to add
-    /// another .NET project to the Dafny solution, which incurs a build time overhead.
-    /// The downside if this choice is that we have to define the source code of our binary in a string literal,
-    /// which makes it harder to develop.
-    /// </summary>
-    private static async Task<string> CreateDotNetDllThatStartsGivenFilepath(string filePathToStart) {
-      var code = @$"using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
-
-public class ShortLivedProcessStarter {{
-  public static async Task<int> Main(string[] args) {{
-    var processInfo = new ProcessStartInfo(""{filePathToStart}"") {{
-      // Prevents keeping stdio open after the outer process closes. 
-      RedirectStandardOutput = true,
-      RedirectStandardError = true,
-      UseShellExecute = false
-    }};
-    using var process = Process.Start(processInfo)!;
-    await Console.Out.WriteLineAsync(process.Id.ToString());
-    var firstLine = await process.StandardOutput.ReadLineAsync();
-    await Console.Out.WriteLineAsync(firstLine);
-    return 0;
-  }}
-}}";
-      var temp = Path.GetTempFileName();
-      var compilation = CSharpCompilation.Create("tempAssembly");
-      var standardLibraries = new List<string>()
-      {
-        "System.Runtime",
-        "System.Console",
-        "System.Diagnostics.Process",
-        "System.ComponentModel.Primitives"
-      };
-      compilation = compilation.AddReferences(standardLibraries.Select(fileName =>
-            MetadataReference.CreateFromFile(Assembly.Load(fileName).Location)))
-        .AddReferences(
-            MetadataReference.CreateFromFile(typeof(object).GetTypeInfo().Assembly.Location),
-            MetadataReference.CreateFromFile(Assembly.Load("mscorlib").Location))
-        .WithOptions(new CSharpCompilationOptions(OutputKind.ConsoleApplication));
-      var syntaxTree = CSharpSyntaxTree.ParseText(code);
-      compilation = compilation.AddSyntaxTrees(syntaxTree);
-      var assemblyPath = $"{temp}.dll";
-      var result = compilation.Emit(assemblyPath);
-
-      var configuration = JsonSerializer.Serialize(
-        new {
-          runtimeOptions = new {
-            tfm = "net6.0",
-            framework = new {
-              name = "Microsoft.NETCore.App",
-              version = "6.0.0",
-              rollForward = "LatestMinor"
-            }
-          }
-        }, new JsonSerializerOptions() { WriteIndented = true });
-      await File.WriteAllTextAsync(temp + ".runtimeconfig.json", configuration + Environment.NewLine);
-
-      Assert.True(result.Success, string.Join("\n", result.Diagnostics.Select(d => d.ToString())));
-      return assemblyPath;
-    }
-  }
-}
diff --git a/Source/DafnyLanguageServer.Test/Various/StandardLibraryTest.cs b/Source/DafnyLanguageServer.Test/Various/StandardLibraryTest.cs
new file mode 100644
index 00000000000..908625e98aa
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/Various/StandardLibraryTest.cs
@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Dafny.LanguageServer.IntegrationTest.Various;
+
+public class StandardLibraryTest : ClientBasedLanguageServerTest {
+  [Fact]
+  public async Task CanUseWrappers() {
+    var source = @"
+import opened Std.Wrappers
+
+const triggerSemicolonWarning := 3;
+
+method Foo() returns (s: Option<int>) { 
+  return Some(3); 
+}".TrimStart();
+
+    var projectSource = @"
+[options]
+warn-deprecation = true
+standard-libraries = true";
+
+    var withoutStandardLibraries = CreateAndOpenTestDocument(source);
+    var diagnostics1 = await GetLastDiagnostics(withoutStandardLibraries, DiagnosticSeverity.Error);
+    Assert.Single(diagnostics1);
+
+    var directory = Path.GetTempFileName();
+    CreateAndOpenTestDocument(projectSource, Path.Combine(directory, DafnyProject.FileName));
+    var document = CreateAndOpenTestDocument(source, Path.Combine(directory, "document.dfy"));
+    var diagnostics2 = await GetLastDiagnostics(document);
+    Assert.Single(diagnostics2);
+    Assert.Equal(DiagnosticSeverity.Warning, diagnostics2[0].Severity);
+  }
+
+  [Fact]
+  public async Task GotoDefinition() {
+    var source = @"
+import opened Std.Wrappers
+
+method Foo() returns (s: ><Option<int>) { 
+  return Some(3); 
+}".TrimStart();
+
+    var projectSource = @"
+[options]
+standard-libraries = true";
+
+    var directory = GetFreshTempPath();
+    Directory.CreateDirectory(directory);
+    await File.WriteAllTextAsync(Path.Combine(directory, DafnyProject.FileName), projectSource);
+
+    MarkupTestFile.GetPositionsAndNamedRanges(source, out var cleanSource,
+      out var positions, out var ranges);
+
+    var filePath = Path.Combine(directory, "StandardLibraryGotoDefinition.dfy");
+    var documentItem = CreateAndOpenTestDocument(cleanSource, filePath);
+    await AssertNoDiagnosticsAreComing(CancellationToken);
+    var result = await RequestDefinition(documentItem, positions[0]);
+    Assert.Equal(new Uri("dafny:DafnyStandardLibraries.dfy"), result.Single().Location.Uri);
+    Directory.Delete(directory, true);
+  }
+
+  public StandardLibraryTest(ITestOutputHelper output, LogLevel dafnyLogLevel = LogLevel.Information) : base(output, dafnyLogLevel) {
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/_plugins/PluginsAdvancedTest.cs b/Source/DafnyLanguageServer.Test/_plugins/PluginsAdvancedTest.cs
index 60bcfd9c59e..cd39dc9c9e1 100644
--- a/Source/DafnyLanguageServer.Test/_plugins/PluginsAdvancedTest.cs
+++ b/Source/DafnyLanguageServer.Test/_plugins/PluginsAdvancedTest.cs
@@ -58,8 +58,8 @@ public override void PostResolve(Program program) {
                   if (!tested) {
                     var forceMessage = configuration.ForceName ? $" named {methodExtern.Name}_test" : "";
                     var token = configuration.ForceName && candidate != null
-                      ? new NestedToken(methodExtern.tok, candidate.tok, "You might want to just rename this method")
-                      : methodExtern.tok;
+                      ? new NestedOrigin(methodExtern.Center, candidate.Center, "You might want to just rename this method")
+                      : (IOrigin)methodExtern.Center;
                     Reporter.Error(MessageSource.Resolver, token,
                       $"Please declare a method {{:test}}{forceMessage} that will call {methodExtern.Name}{configuration.PluginUser}");
                   }
diff --git a/Source/DafnyLanguageServer.Test/_plugins/PluginsDafnyCodeActionTest.cs b/Source/DafnyLanguageServer.Test/_plugins/PluginsDafnyCodeActionTest.cs
index 7567f992d54..0da87a8f36a 100644
--- a/Source/DafnyLanguageServer.Test/_plugins/PluginsDafnyCodeActionTest.cs
+++ b/Source/DafnyLanguageServer.Test/_plugins/PluginsDafnyCodeActionTest.cs
@@ -1,6 +1,5 @@
 using Microsoft.Dafny;
 using Microsoft.Dafny.LanguageServer.Plugins;
-using Microsoft.Boogie;
 using System.Collections.Generic;
 using Microsoft.Dafny.LanguageServer.Language;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
@@ -17,10 +16,10 @@ public override DafnyCodeActionProvider[] GetDafnyCodeActionProviders() {
 
   public class DummyDafnyCodeActionProvider : DafnyCodeActionProvider {
     public override IEnumerable<DafnyCodeAction> GetDafnyCodeActions(IDafnyCodeActionInput input, Range selection) {
-      var token = input.Program.GetFirstTopLevelToken();
+      var token = ((Program)input.Program).GetStartOfFirstFileToken();
       return new DafnyCodeAction[] {
         new InstantDafnyCodeAction("Insert file header", new DafnyCodeActionEdit[] {
-          new DafnyCodeActionEdit(new RangeToken(token, token).ToDafnyRange(), "/*First comment*/")
+          new DafnyCodeActionEdit(new SourceOrigin(token, token).ToDafnyRange(), "/*First comment*/")
         })
       };
     }
diff --git a/Source/DafnyLanguageServer.Test/_plugins/PluginsHandlerTest.cs b/Source/DafnyLanguageServer.Test/_plugins/PluginsHandlerTest.cs
new file mode 100644
index 00000000000..ba8e20e8774
--- /dev/null
+++ b/Source/DafnyLanguageServer.Test/_plugins/PluginsHandlerTest.cs
@@ -0,0 +1,26 @@
+using OmniSharp.Extensions.LanguageServer.Server;
+using MediatR;
+using OmniSharp.Extensions.JsonRpc;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PluginsHandlerTest {
+  /// <summary>
+  ///  Small plugin that adds a request to the language server, which simply returns a dummy string
+  /// </summary>
+  public class TestConfiguration : Microsoft.Dafny.LanguageServer.Plugins.PluginConfiguration {
+    public override LanguageServerOptions WithPluginHandlers(LanguageServerOptions options) {
+      return options.WithHandler<DummyHandler>();
+    }
+  }
+
+  [Parallel]
+  [Method("dafny/request/dummy", Direction.ClientToServer)]
+  public record DummyParams : IRequest<string>;
+
+  public class DummyHandler : IJsonRpcRequestHandler<DummyParams, string> {
+    public async Task<string> Handle(DummyParams request, CancellationToken cancellationToken) {
+      return "dummy";
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer.Test/_plugins/PluginsTest.cs b/Source/DafnyLanguageServer.Test/_plugins/PluginsTest.cs
index 6e651b8380a..50e7fdf9dc1 100644
--- a/Source/DafnyLanguageServer.Test/_plugins/PluginsTest.cs
+++ b/Source/DafnyLanguageServer.Test/_plugins/PluginsTest.cs
@@ -22,7 +22,7 @@ public ErrorRewriter(ErrorReporter reporter, TestConfiguration configuration) :
     }
 
     public override void PostResolve(Program program) {
-      Reporter.Error(MessageSource.Resolver, program.GetFirstTopLevelToken(), "Impossible to continue " + configuration.Argument);
+      Reporter.Error(MessageSource.Resolver, program.GetStartOfFirstFileToken(), "Impossible to continue " + configuration.Argument);
     }
   }
 
diff --git a/Source/DafnyLanguageServer.Test/_plugins/PluginsTestTranslationError.cs b/Source/DafnyLanguageServer.Test/_plugins/PluginsTestTranslationError.cs
index da111bd8b53..1eab8a0ef99 100644
--- a/Source/DafnyLanguageServer.Test/_plugins/PluginsTestTranslationError.cs
+++ b/Source/DafnyLanguageServer.Test/_plugins/PluginsTestTranslationError.cs
@@ -15,7 +15,7 @@ public TranslationErrorRewriter(ErrorReporter reporter) : base(reporter) {
     }
 
     public override void PreVerify(ModuleDefinition module) {
-      Reporter.Error(MessageSource.Translator, module.Tok,
+      Reporter.Error(MessageSource.Translator, module.Origin,
         "Translation error that should appear in the code");
     }
   }
diff --git a/Source/DafnyLanguageServer.Test/_plugins/PluginsTestVerification.cs b/Source/DafnyLanguageServer.Test/_plugins/PluginsTestVerification.cs
index 246f3b92629..02157940431 100644
--- a/Source/DafnyLanguageServer.Test/_plugins/PluginsTestVerification.cs
+++ b/Source/DafnyLanguageServer.Test/_plugins/PluginsTestVerification.cs
@@ -14,8 +14,8 @@ public class ErrorRewriter : Rewriter {
     public ErrorRewriter(ErrorReporter reporter) : base(reporter) {
     }
 
-    public override void PostResolve(Program program) {
-      Reporter.Error(MessageSource.Compiler, program.GetFirstTopLevelToken(),
+    public override void PreVerify(ModuleDefinition module) {
+      Reporter.Error(MessageSource.Compiler, Token.NoToken,
         "Plugin Error that does not prevent verification");
     }
   }
diff --git a/Source/DafnyLanguageServer/Caching/PruneIfNotUsedSinceLastPruneCache.cs b/Source/DafnyLanguageServer/Caching/PruneIfNotUsedSinceLastPruneCache.cs
index a90940af640..5b439bd7b7e 100644
--- a/Source/DafnyLanguageServer/Caching/PruneIfNotUsedSinceLastPruneCache.cs
+++ b/Source/DafnyLanguageServer/Caching/PruneIfNotUsedSinceLastPruneCache.cs
@@ -3,13 +3,20 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.Workspace;
 
-namespace Microsoft.Dafny; 
+namespace Microsoft.Dafny;
+
+public record PruneResult<T>(T Result, int Pruned, int Hits, int Total);
 
 public class PruneIfNotUsedSinceLastPruneCache<TKey, TValue>
   where TValue : class
   where TKey : notnull {
+  private SemaphoreSlim semaphoreSlim = new(1);
+
+
   class Item {
     public Item(TValue value) {
       Value = value;
@@ -29,7 +36,22 @@ public PruneIfNotUsedSinceLastPruneCache(IEqualityComparer<TKey> comparer) {
     items = new(comparer);
   }
 
-  public int Prune() {
+  public async Task<PruneResult<T>> UseAndPrune<T>(Func<Task<T>> use, CancellationToken cancellationToken) {
+    await semaphoreSlim.WaitAsync(cancellationToken);
+    try {
+      var before = Count;
+      var result = await use();
+      var pruned = Prune();
+      var hits = before - pruned;
+
+      return new PruneResult<T>(result, pruned, hits, Count);
+    }
+    finally {
+      semaphoreSlim.Release();
+    }
+  }
+
+  private int Prune() {
     var keys = items.Keys.ToList();
     var removedCount = 0;
     foreach (var key in keys) {
diff --git a/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModel.cs b/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModel.cs
deleted file mode 100644
index 0cb7a6cb420..00000000000
--- a/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModel.cs
+++ /dev/null
@@ -1,851 +0,0 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
-#nullable disable
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Numerics;
-using System.Text.RegularExpressions;
-using Microsoft.Boogie;
-
-namespace Microsoft.Dafny.LanguageServer.CounterExampleGeneration {
-
-  /// <summary>
-  /// A wrapper around Boogie's Model class that allows extracting
-  /// types and values of Elements representing Dafny variables. The three core
-  /// methods are: GetDafnyType, CanonicalName, and GetExpansion
-  /// </summary>
-  public class DafnyModel {
-    private readonly DafnyOptions options;
-    public readonly Model Model;
-    public readonly List<DafnyModelState> States = new();
-    public static readonly UserDefinedType UnknownType =
-      new(new Token(), "?", null);
-    private readonly ModelFuncWrapper fSetSelect, fSeqLength, fSeqIndex, fBox,
-      fDim, fIndexField, fMultiIndexField, fDtype, fCharToInt, fTag, fBv,
-      fNull, fSetUnion, fSetIntersection, fSetDifference, fSetUnionOne,
-      fSetEmpty, fSeqEmpty, fSeqBuild, fSeqAppend, fSeqDrop, fSeqTake,
-      fSeqUpdate, fSeqCreate, fU2Real, fU2Bool, fU2Int,
-      fMapDomain, fMapElements, fMapBuild, fIs, fIsBox, fUnbox;
-    private readonly Dictionary<Model.Element, Model.FuncTuple> datatypeValues = new();
-
-    // maps a numeric type (int, real, bv4, etc.) to the set of integer
-    // values of that type that appear in the model. 
-    private readonly Dictionary<Type, HashSet<int>> reservedNumerals = new();
-    // set of all UTF values for characters that appear in the model
-    private readonly HashSet<int> reservedChars = new();
-    private bool isTrueReserved; // True if "true" appears anywhere in the model
-    // maps an element representing a primitive to its string representation
-    private readonly Dictionary<Model.Element, string> reservedValuesMap = new();
-    // maps width to a unique object representing bitvector type of such width 
-    private readonly Dictionary<int, BitvectorType> bitvectorTypes = new();
-
-    // the model will begin assigning characters starting from this utf value
-    private const int FirstCharacterUtfValue = 65; // 'A'
-    private static readonly Regex UnderscoreRemovalRegex = new("__");
-
-    public DafnyModel(Model model, DafnyOptions options) {
-      Model = model;
-      this.options = options;
-      var tyArgMultiplier = options.TypeEncodingMethod switch {
-        CoreOptions.TypeEncoding.Arguments => 1,
-        _ => 0
-      };
-      fSetSelect = ModelFuncWrapper.MergeFunctions(this, new List<string> { "MapType0Select", "MapType1Select" }, 2);
-      fSeqLength = new ModelFuncWrapper(this, "Seq#Length", 1, tyArgMultiplier);
-      fSeqBuild = new ModelFuncWrapper(this, "Seq#Build", 2, tyArgMultiplier);
-      fSeqAppend = new ModelFuncWrapper(this, "Seq#Append", 2, tyArgMultiplier);
-      fSeqDrop = new ModelFuncWrapper(this, "Seq#Drop", 2, tyArgMultiplier);
-      fSeqTake = new ModelFuncWrapper(this, "Seq#Take", 2, tyArgMultiplier);
-      fSeqIndex = new ModelFuncWrapper(this, "Seq#Index", 2, tyArgMultiplier);
-      fSeqUpdate = new ModelFuncWrapper(this, "Seq#Update", 3, tyArgMultiplier);
-      fSeqCreate = new ModelFuncWrapper(this, "Seq#Create", 4, 0);
-      fSeqEmpty = new ModelFuncWrapper(this, "Seq#Empty", 1, 0);
-      fSetEmpty = new ModelFuncWrapper(this, "Set#Empty", 1, 0);
-      fSetUnion = new ModelFuncWrapper(this, "Set#Union", 2, tyArgMultiplier);
-      fSetUnionOne = new ModelFuncWrapper(this, "Set#UnionOne", 2, tyArgMultiplier);
-      fSetIntersection = new ModelFuncWrapper(this, "Set#Intersection", 2, tyArgMultiplier);
-      fSetDifference = new ModelFuncWrapper(this, "Set#Difference", 2, tyArgMultiplier);
-      fMapDomain = new ModelFuncWrapper(this, "Map#Domain", 1, 2 * tyArgMultiplier);
-      fMapElements = new ModelFuncWrapper(this, "Map#Elements", 1, 2 * tyArgMultiplier);
-      fMapBuild = new ModelFuncWrapper(this, "Map#Build", 3, 2 * tyArgMultiplier);
-      fIs = new ModelFuncWrapper(this, "$Is", 2, tyArgMultiplier);
-      fIsBox = new ModelFuncWrapper(this, "$IsBox", 2, tyArgMultiplier);
-      fBox = new ModelFuncWrapper(this, "$Box", 1, tyArgMultiplier);
-      fDim = new ModelFuncWrapper(this, "FDim", 1, tyArgMultiplier);
-      fIndexField = new ModelFuncWrapper(this, "IndexField", 1, 0);
-      fMultiIndexField = new ModelFuncWrapper(this, "MultiIndexField", 2, 0);
-      fDtype = new ModelFuncWrapper(this, "dtype", 1, 0);
-      fNull = new ModelFuncWrapper(this, "null", 0, 0);
-      fCharToInt = new ModelFuncWrapper(this, "char#ToInt", 1, 0);
-      fU2Real = new ModelFuncWrapper(this, "U_2_real", 1, 0);
-      fU2Bool = new ModelFuncWrapper(this, "U_2_bool", 1, 0);
-      fU2Int = new ModelFuncWrapper(this, "U_2_int", 1, 0);
-      fTag = new ModelFuncWrapper(this, "Tag", 1, 0);
-      fBv = new ModelFuncWrapper(this, "TBitvector", 1, 0);
-      fUnbox = new ModelFuncWrapper(this, "$Unbox", 2, 0);
-      InitDataTypes();
-      RegisterReservedChars();
-      RegisterReservedInts();
-      RegisterReservedBools();
-      RegisterReservedReals();
-      RegisterReservedBitVectors();
-      foreach (var s in model.States) {
-        var sn = new DafnyModelState(this, s);
-        States.Add(sn);
-      }
-    }
-
-    /// <summary>
-    /// Extract and parse the first Dafny model recorded in the model view file.
-    /// </summary>
-    public static DafnyModel ExtractModel(DafnyOptions options, string mv) {
-      const string begin = "*** MODEL";
-      const string end = "*** END_MODEL";
-      int beginIndex = mv.IndexOf(begin, StringComparison.Ordinal);
-      int endIndex = mv.IndexOf(end, StringComparison.Ordinal);
-      var modelString = mv.Substring(beginIndex, endIndex + end.Length - beginIndex);
-      var model = Model.ParseModels(new StringReader(modelString)).First();
-      return new DafnyModel(model, options);
-    }
-
-    /// <summary>
-    /// Collect the array dimensions from the various array.Length functions,
-    /// and collect all known datatype values
-    /// </summary>
-    private void InitDataTypes() {
-      const string datatypeConstructorPrefix = "#";
-      const string reservedVariablePrefix = "##";
-      const string accessorString = ".";
-      foreach (var fn in Model.Functions) {
-        if (fn.Name.StartsWith(datatypeConstructorPrefix) &&
-            !fn.Name.StartsWith(reservedVariablePrefix) &&
-            fn.Name.Contains(accessorString)) {
-          foreach (var tpl in fn.Apps) {
-            var elt = tpl.Result;
-            datatypeValues[elt] = tpl;
-          }
-        }
-      }
-    }
-
-    /// <summary> Register all char values specified by the model </summary>
-    private void RegisterReservedChars() {
-      foreach (var app in fCharToInt.Apps) {
-        if (int.TryParse(((Model.Integer)app.Result).Numeral,
-              out var UTFCode) && UTFCode is <= char.MaxValue and >= 0) {
-          reservedChars.Add(UTFCode);
-        }
-      }
-    }
-
-    /// <summary>
-    /// Return the character representation of a UTF code understood by Dafny
-    /// This is either the character itself, if it is a parsable ASCII,
-    /// Escaped character, for the cases specified in Dafny manual,
-    /// Or escaped UTF code otherwise
-    /// </summary>
-    private string PrettyPrintChar(int UTFCode) {
-      switch (UTFCode) {
-        case 0:
-          return "'\\0'";
-        case 9:
-          return "'\\t'";
-        case 10:
-          return "'\\n'";
-        case 13:
-          return "'\\r'";
-        case 34:
-          return "'\\\"'";
-        case 39:
-          return "'\\\''";
-        case 92:
-          return "'\\\\'";
-        default:
-          if ((UTFCode >= 32) && (UTFCode <= 126)) {
-            return $"'{Convert.ToChar(UTFCode)}'";
-          }
-          return $"'\\u{UTFCode:X4}'";
-      }
-    }
-
-    /// <summary> Registered all int values specified by the model </summary>
-    private void RegisterReservedInts() {
-      reservedNumerals[Type.Int] = new();
-      foreach (var app in fU2Int.Apps) {
-        if (app.Result is Model.Integer integer && int.TryParse(integer.Numeral, out int value)) {
-          reservedNumerals[Type.Int].Add(value);
-        }
-      }
-    }
-
-    /// <summary> Registered all bool values specified by the model </summary>
-    private void RegisterReservedBools() {
-      foreach (var app in fU2Bool.Apps) {
-        isTrueReserved |= ((Model.Boolean)app.Result).Value;
-      }
-    }
-
-    /// <summary> Registered all real values specified by the model </summary>
-    private void RegisterReservedReals() {
-      reservedNumerals[Type.Real] = new();
-      foreach (var app in fU2Real.Apps) {
-        var valueAsString = app.Result.ToString()?.Split(".")[0] ?? "";
-        if ((app.Result is Model.Real) && int.TryParse(valueAsString, out int value)) {
-          reservedNumerals[Type.Real].Add(value);
-        }
-      }
-    }
-
-    /// <summary> Registered all bv values specified by the model </summary>
-    private void RegisterReservedBitVectors() {
-      var bvFuncName = new Regex("^U_2_bv[0-9]+$");
-      foreach (var func in Model.Functions) {
-        if (!bvFuncName.IsMatch(func.Name)) {
-          continue;
-        }
-
-        int width = int.Parse(func.Name[6..]);
-        if (!bitvectorTypes.ContainsKey(width)) {
-          bitvectorTypes[width] = new BitvectorType(options, width);
-        }
-
-        var type = bitvectorTypes[width];
-
-        if (!reservedNumerals.ContainsKey(type)) {
-          reservedNumerals[type] = new();
-        }
-
-        foreach (var app in func.Apps) {
-          if (int.TryParse((app.Result as Model.BitVector).Numeral,
-                out var value)) {
-            reservedNumerals[type].Add(value);
-          }
-        }
-      }
-    }
-
-    /// <summary>
-    /// Return True iff the variable name is referring to a variable that has
-    /// a direct analog in Dafny source (i.e. not $Heap, $_Frame, $nw, etc.)
-    /// </summary>
-    public static bool IsUserVariableName(string name) =>
-      !name.Contains("$") && !name.Contains("##");
-
-    public bool ElementIsNull(Model.Element element) => element == fNull.GetConstant();
-
-    /// <summary>
-    /// Return the name of a 0-arity type function that maps to the element if such
-    /// a function exists and is unique. Return null otherwise.
-    /// If the name is also aliased by a type parameter, return the name of the concrete type. 
-    /// </summary>
-    private static string GetTrueTypeName(Model.Element element) {
-      string name = null;
-      if (element == null) {
-        return null;
-      }
-      foreach (var funcTuple in element.Names) {
-        if (funcTuple.Func.Arity != 0) {
-          continue;
-        }
-        // Special characters below appear in type parameters. This method returns the concrete type if possible
-        if ((name == null) || name.Contains("$") || name.StartsWith("#") || name.Contains("@")) {
-          name = funcTuple.Func.Name;
-        } else if (!funcTuple.Func.Name.Contains("$") && !funcTuple.Func.Name.StartsWith("#") && !funcTuple.Func.Name.Contains("@")) {
-          return null;
-        }
-      }
-      return name;
-    }
-
-    /// <summary> Get the Dafny type of an element </summary>
-    internal Type GetDafnyType(Model.Element element) {
-      switch (element.Kind) {
-        case Model.ElementKind.Boolean:
-          return Type.Bool;
-        case Model.ElementKind.Integer:
-          return Type.Int;
-        case Model.ElementKind.Real:
-          return Type.Real;
-        case Model.ElementKind.BitVector:
-          return new BitvectorType(options, ((Model.BitVector)element).Size);
-        case Model.ElementKind.Uninterpreted:
-          return GetDafnyType(element as Model.Uninterpreted);
-        case Model.ElementKind.DataValue:
-          if (((Model.DatatypeValue)element).ConstructorName is "-" or "/") {
-            return GetDafnyType(
-              ((Model.DatatypeValue)element).Arguments.First());
-          }
-          return UnknownType;
-        default:
-          return UnknownType;
-      }
-    }
-
-    /// <summary>
-    /// Return all elements x that satisfy ($Is element x)
-    /// </summary>
-    private List<Model.Element> GetIsResults(Model.Element element) {
-      List<Model.Element> result = new();
-      foreach (var tuple in fIs.AppsWithArg(0, element)) {
-        if (((Model.Boolean)tuple.Result).Value) {
-          result.Add(tuple.Args[1]);
-        }
-      }
-      return result;
-    }
-
-    /// <summary>
-    /// Get the Dafny type of the value indicated by <param name="element"></param>
-    /// This is in contrast to ReconstructType, which returns the type indicated by the element itself.
-    /// This method tries to extract the base type (so seq<char> instead of string)
-    /// </summary>
-    private Type GetDafnyType(Model.Uninterpreted element) {
-      var finalResult = UnknownType;
-      foreach (var typeElement in GetIsResults(element)) {
-        var reconstructedType = ReconstructType(typeElement);
-        if (reconstructedType is not UserDefinedType userDefinedType) {
-          return reconstructedType;
-        }
-        if (finalResult.Name.EndsWith("?") || finalResult == UnknownType) {
-          finalResult = userDefinedType;
-        }
-      }
-      var seqOperation = fSeqAppend.AppWithResult(element);
-      seqOperation ??= fSeqDrop.AppWithResult(element);
-      seqOperation ??= fSeqTake.AppWithResult(element);
-      seqOperation ??= fSeqUpdate.AppWithResult(element);
-      if (seqOperation != null) {
-        return GetDafnyType(seqOperation.Args[0]);
-      }
-      seqOperation = fSeqBuild.AppWithResult(element);
-      if (seqOperation != null) {
-        return new SeqType(GetDafnyType(Unbox(seqOperation.Args[1])));
-      }
-      seqOperation = fSeqCreate.AppWithResult(element);
-      seqOperation ??= fSeqEmpty.AppWithResult(element);
-      if (seqOperation != null) {
-        return new SeqType(ReconstructType(seqOperation.Args.First()));
-      }
-      var setOperation = fSetUnion.AppWithResult(element);
-      setOperation ??= fSetIntersection.AppWithResult(element);
-      setOperation ??= fSetDifference.AppWithResult(element);
-      if (setOperation != null) {
-        return GetDafnyType(setOperation.Args[0]);
-      }
-      setOperation = fSetUnionOne.AppWithResult(element);
-      if (setOperation != null) {
-        return new SetType(true, GetDafnyType(Unbox(setOperation.Args[1])));
-      }
-      setOperation = fSetEmpty.AppWithResult(element);
-      if (setOperation != null) {
-        var setElement = fSetSelect.AppWithArg(0, element);
-        if (setElement != null) {
-          return new SetType(true, GetDafnyType(setElement.Args[1]));
-        }
-        // not possible to infer the type argument in this case if type encoding is Arguments
-        return new SetType(true, UnknownType);
-      }
-      var mapOperation = fMapBuild.AppWithResult(element);
-      if (mapOperation != null) {
-        return new MapType(true, GetDafnyType(Unbox(mapOperation.Args[1])), GetDafnyType(Unbox(mapOperation.Args[2])));
-      }
-      var unboxedTypes = fIsBox.AppsWithArg(0, element)
-        .Where(tuple => ((Model.Boolean)tuple.Result).Value)
-        .Select(tuple => tuple.Args[1]).ToList();
-      if (unboxedTypes.Count == 1) {
-        return ReconstructType(unboxedTypes[0]);
-      }
-      if (fCharToInt.OptEval(element) != null) {
-        return Type.Char;
-      }
-      if (finalResult != UnknownType) {
-        return finalResult;
-      }
-      var dtypeElement = fDtype.OptEval(element);
-      return dtypeElement != null ? ReconstructType(dtypeElement) : finalResult;
-    }
-
-    /// <summary>
-    /// Reconstruct Dafny type from an element that represents a type in Z3
-    /// </summary>
-    private Type ReconstructType(Model.Element typeElement) {
-      if (typeElement == null) {
-        return UnknownType;
-      }
-      var fullName = GetTrueTypeName(typeElement);
-      if (fullName != null && fullName.Length > 7 && fullName[..7].Equals("Tclass.")) {
-        return new UserDefinedType(new Token(), fullName[7..], null);
-      }
-      switch (fullName) {
-        case "TInt":
-          return Type.Int;
-        case "TBool":
-          return Type.Bool;
-        case "TReal":
-          return Type.Real;
-        case "TChar":
-          return Type.Char;
-      }
-      if (fBv.AppWithResult(typeElement) != null) {
-        return new BitvectorType(options, ((Model.Integer)fBv.AppWithResult(typeElement).Args[0]).AsInt());
-      }
-
-      Type fallBackType = UnknownType; // to be returned in the event all else fails
-      if (fullName != null) { // this means this is a type variable
-        fallBackType = new UserDefinedType(new Token(), fullName, null);
-      }
-      var tagElement = fTag.OptEval(typeElement);
-      if (tagElement == null) {
-        return fallBackType;
-      }
-      var tagName = GetTrueTypeName(tagElement);
-      if (tagName == null || (tagName.Length < 10 && tagName != "TagSeq" &&
-                              tagName != "TagSet" &&
-                              tagName != "TagBitVector" &&
-                              tagName != "TagMap")) {
-        return fallBackType;
-      }
-      var typeArgs = Model.GetFunc("T" + tagName.Substring(3))?.
-        AppWithResult(typeElement)?.
-        Args.Select(ReconstructType).ToList();
-      if (typeArgs == null) {
-        return new UserDefinedType(new Token(), tagName.Substring(9), null);
-      }
-
-      switch (tagName) {
-        case "TagSeq":
-          return new SeqType(typeArgs.First());
-        case "TagMap":
-          return new MapType(true, typeArgs[0], typeArgs[1]);
-        case "TagSet":
-          return new SetType(true, typeArgs.First());
-        default:
-          tagName = tagName.Substring(9);
-          if (tagName.StartsWith("_System.___hFunc") ||
-              tagName.StartsWith("_System.___hTotalFunc") ||
-              tagName.StartsWith("_System.___hPartialFunc")) {
-            return new ArrowType(new Token(), typeArgs.SkipLast(1).ToList(),
-              typeArgs.Last());
-          }
-          return new UserDefinedType(new Token(), tagName, typeArgs);
-      }
-    }
-
-    /// <summary>
-    /// Extract the string representation of the element.
-    /// Return "" if !IsPrimitive(elt, state) unless elt is a datatype,
-    /// in which case return the corresponding constructor name.
-    /// </summary>
-    public string CanonicalName(Model.Element elt, Type type) {
-      if (elt == null || (type is UserDefinedType userDefinedType && userDefinedType.Name == UnknownType.Name)) {
-        return "?";
-      }
-      if (elt == fNull.GetConstant()) {
-        return "null";
-      }
-      if (elt is Model.Integer or Model.Boolean or Model.Real) {
-        return elt.ToString();
-      }
-      if (elt is Model.BitVector vector) {
-        return vector.Numeral;
-      }
-      if (elt.Kind == Model.ElementKind.DataValue) {
-        if (((Model.DatatypeValue)elt).ConstructorName == "-") {
-          return "-" + CanonicalName(((Model.DatatypeValue)elt).Arguments.First(), type);
-        }
-        if (((Model.DatatypeValue)elt).ConstructorName == "/") {
-          return CanonicalName(((Model.DatatypeValue)elt).Arguments.First(), type) +
-                 "/" + CanonicalName(((Model.DatatypeValue)elt).Arguments[1], type);
-        }
-      }
-      if (datatypeValues.TryGetValue(elt, out var fnTuple)) {
-        return fnTuple.Func.Name.Split(".").Last();
-      }
-      switch (type) {
-        case BitvectorType bitvectorType: {
-            int width = bitvectorType.Width;
-            var funcName = "U_2_bv" + width;
-            if (!bitvectorTypes.ContainsKey(width)) {
-              bitvectorTypes[width] = new BitvectorType(options, width);
-              reservedNumerals[bitvectorTypes[width]] = new HashSet<int>();
-            }
-            if (!Model.HasFunc(funcName)) {
-              return GetUnreservedNumericValue(elt, bitvectorTypes[width]);
-            }
-            if (Model.GetFunc(funcName).OptEval(elt) != null) {
-              return (Model.GetFunc(funcName).OptEval(elt) as Model.Number)?.Numeral;
-            }
-            return GetUnreservedNumericValue(elt, bitvectorTypes[width]);
-          }
-        case CharType: {
-            if (fCharToInt.OptEval(elt) != null) {
-              if (int.TryParse(((Model.Integer)fCharToInt.OptEval(elt)).Numeral,
-                    out var UTFCode) && UTFCode is <= char.MaxValue and >= 0) {
-                return PrettyPrintChar(UTFCode);
-              }
-            }
-            return GetUnreservedCharValue(elt);
-          }
-        case RealType when fU2Real.OptEval(elt) != null:
-          return CanonicalName(fU2Real.OptEval(elt), type);
-        case RealType:
-          return GetUnreservedNumericValue(elt, Type.Real);
-        case BoolType when fU2Bool.OptEval(elt) != null:
-          return CanonicalName(fU2Bool.OptEval(elt), type);
-        case BoolType:
-          return GetUnreservedBoolValue(elt);
-        case IntType when fU2Int.OptEval(elt) != null:
-          return CanonicalName(fU2Int.OptEval(elt), type);
-        case IntType:
-          return GetUnreservedNumericValue(elt, Type.Int);
-        default:
-          return "";
-      }
-    }
-
-    /// <summary>
-    /// Find a char value that is different from any other value
-    /// of that type in the entire model. Reserve that value for given element
-    /// </summary>
-    private string GetUnreservedCharValue(Model.Element element) {
-      if (reservedValuesMap.TryGetValue(element, out var reservedValue)) {
-        return reservedValue;
-      }
-      int i = FirstCharacterUtfValue;
-      while (reservedChars.Contains(i)) {
-        i++;
-      }
-      reservedValuesMap[element] = PrettyPrintChar(i);
-      reservedChars.Add(i);
-      return reservedValuesMap[element];
-    }
-
-    /// <summary>
-    /// Find a bool value that is different from any other value
-    /// of that type in the entire model (if possible).
-    /// Reserve that value for given element
-    /// </summary>
-    private string GetUnreservedBoolValue(Model.Element element) {
-      if (reservedValuesMap.TryGetValue(element, out var reservedValue)) {
-        return reservedValue;
-      }
-      if (!isTrueReserved) {
-        isTrueReserved = true;
-        reservedValuesMap[element] = true.ToString().ToLower();
-      } else {
-        reservedValuesMap[element] = false.ToString().ToLower();
-      }
-      return reservedValuesMap[element];
-    }
-
-    /// <summary>
-    /// Find a value of the given numericType that is different from
-    /// any other value of that type in the entire model.
-    /// Reserve that value for given element
-    /// </summary>
-    public string GetUnreservedNumericValue(Model.Element element, Type numericType) {
-      if (reservedValuesMap.TryGetValue(element, out var reservedValue)) {
-        return reservedValue;
-      }
-      int i = 0;
-      while (reservedNumerals[numericType].Contains(i)) {
-        i++;
-      }
-      if (numericType == Type.Real) {
-        reservedValuesMap[element] = i + ".0";
-      } else {
-        reservedValuesMap[element] = i.ToString();
-      }
-      reservedNumerals[numericType].Add(i);
-      return reservedValuesMap[element];
-    }
-
-    /// <summary>
-    /// Perform operations necessary to add a mapping to a map variable,
-    /// return newly created DafnyModelVariable objects
-    /// </summary>
-    private IEnumerable<DafnyModelVariable> AddMappingHelper(DafnyModelState state, MapVariable mapVariable, Model.Element keyElement, Model.Element valueElement, HashSet<Model.Element> keySet) {
-      if (mapVariable == null) {
-        yield break;
-      }
-      var pairId = mapVariable.Children.Count.ToString();
-      var key = DafnyModelVariableFactory.Get(state, keyElement, pairId, mapVariable);
-      if (valueElement != null) {
-        var value = DafnyModelVariableFactory.Get(state, valueElement, pairId, mapVariable);
-        mapVariable.AddMapping(key, value);
-        yield return value;
-      } else {
-        mapVariable.AddMapping(key, null);
-      }
-      keySet.Add(keyElement);
-      yield return key;
-    }
-
-    /// <summary>
-    /// Return a set of variables associated with an element. These could be
-    /// values of fields for objects, values at certain positions for
-    /// sequences, etc.
-    /// </summary>
-    public IEnumerable<DafnyModelVariable> GetExpansion(DafnyModelState state, DafnyModelVariable var) {
-      HashSet<DafnyModelVariable> result = new();
-      if (var.Element.Kind != Model.ElementKind.Uninterpreted) {
-        return result;  // primitive types can't have fields
-      }
-
-      if (datatypeValues.TryGetValue(var.Element, out var fnTuple)) {
-        // Elt is a datatype value
-        var destructors = GetDestructorFunctions(var.Element).OrderBy(f => f.Name).ToList();
-        if (destructors.Count > fnTuple.Args.Length) {
-          // Try to filter out predicate functions
-          // (that follow a format very similar to that of destructor names)
-          destructors = destructors.Where(destructor =>
-              fnTuple.Args.Any(arg => destructor.OptEval(var.Element) == arg))
-            .ToList();
-        }
-        if (destructors.Count == fnTuple.Args.Length) {
-          // we know all destructor names
-          foreach (var func in destructors) {
-            result.Add(DafnyModelVariableFactory.Get(state, Unbox(func.OptEval(var.Element)),
-              UnderscoreRemovalRegex.Replace(func.Name.Split(".").Last(), "_"), var));
-          }
-        } else {
-          // we don't know destructor names, so we use indices instead
-          for (int i = 0; i < fnTuple.Args.Length; i++) {
-            result.Add(DafnyModelVariableFactory.Get(state, Unbox(fnTuple.Args[i]),
-              "[" + i + "]", var));
-          }
-        }
-        return result;
-      }
-
-      switch (var.Type) {
-        case SeqType: {
-            var seqLen = fSeqLength.OptEval(var.Element);
-            if (seqLen != null) {
-              var length = DafnyModelVariableFactory.Get(state, seqLen, "Length", var);
-              result.Add(length);
-              (var as SeqVariable)?.SetLength(length);
-            }
-
-            // Sequences can be constructed with the build operator:
-            List<Model.Element> elements = new();
-
-            var substring = var.Element;
-            while (fSeqBuild.AppWithResult(substring) != null) {
-              elements.Insert(0, Unbox(fSeqBuild.AppWithResult(substring).Args[1]));
-              substring = fSeqBuild.AppWithResult(substring).Args[0];
-            }
-            for (int i = 0; i < elements.Count; i++) {
-              var e = DafnyModelVariableFactory.Get(state, Unbox(elements[i]), "[" + i + "]", var);
-              result.Add(e);
-              (var as SeqVariable)?.AddAtIndex(e, i.ToString());
-            }
-            if (elements.Count > 0) {
-              return result;
-            }
-
-            // Otherwise, sequences can be reconstructed index by index, ensuring indices are in ascending order.
-            // NB: per https://github.com/dafny-lang/dafny/issues/3048 , not all indices may be parsed as a BigInteger,
-            // so ensure we do not try to sort those numerically.
-            var intIndices = new List<(Model.Element, BigInteger)>();
-            var otherIndices = new List<(Model.Element, String)>();
-            foreach (var tpl in fSeqIndex.AppsWithArg(0, var.Element)) {
-              var asString = tpl.Args[1].ToString();
-              if (BigInteger.TryParse(asString, out var bi)) {
-                intIndices.Add((Unbox(tpl.Result), bi));
-              } else {
-                otherIndices.Add((Unbox(tpl.Result), asString));
-              }
-            }
-
-            var sortedIndices = intIndices
-              .OrderBy(p => p.Item2)
-              .Select(p => (p.Item1, p.Item2.ToString()))
-              .Concat(otherIndices);
-
-            foreach (var (res, idx) in sortedIndices) {
-              var e = DafnyModelVariableFactory.Get(state, res, "[" + idx + "]", var);
-              result.Add(e);
-              (var as SeqVariable)?.AddAtIndex(e, idx);
-            }
-
-            return result;
-          }
-        case SetType: {
-            foreach (var tpl in fSetSelect.AppsWithArg(0, var.Element)) {
-              var setElement = tpl.Args[1];
-              var containment = tpl.Result;
-              if (containment.Kind != Model.ElementKind.Boolean) {
-                continue;
-              }
-
-              result.Add(DafnyModelVariableFactory.Get(state, Unbox(setElement),
-                ((Model.Boolean)containment).ToString(), var));
-            }
-            return result;
-          }
-        case MapType: {
-            var mapKeysAdded = new HashSet<Model.Element>(); // prevents mapping a key to multiple values
-            var mapsElementsVisited = new HashSet<Model.Element>(); // prevents infinite recursion
-            var current = var.Element;
-            var mapBuilds = fMapBuild.AppsWithResult(var.Element).ToList();
-            while (mapBuilds.Count != 0) {
-              foreach (var mapBuild in mapBuilds.Where(m => m.Args[0] == current && !mapKeysAdded.Contains(m.Args[1]))) {
-                result.UnionWith(AddMappingHelper(
-                  state,
-                  var as MapVariable,
-                  Unbox(mapBuild.Args[1]),
-                  Unbox(mapBuild.Args[2]),
-                  mapKeysAdded));
-              }
-              mapsElementsVisited.Add(current);
-              var nextMapBuild = mapBuilds.FirstOrDefault(m => !mapsElementsVisited.Contains(m.Args[0]));
-              if (nextMapBuild == null) {
-                break;
-              }
-              current = nextMapBuild.Args[0];
-              mapBuilds = fMapBuild.AppsWithResult(nextMapBuild.Args[0]).Where(m => !mapsElementsVisited.Contains(m.Args[0])).ToList();
-              if (mapKeysAdded.Contains(nextMapBuild.Args[1])) {
-                continue;
-              }
-              result.UnionWith(AddMappingHelper(
-                state,
-                var as MapVariable,
-                Unbox(nextMapBuild.Args[1]),
-                Unbox(nextMapBuild.Args[2]),
-                mapKeysAdded));
-            }
-            var mapDomain = fMapDomain.OptEval(current);
-            var mapElements = fMapElements.OptEval(current);
-            if (mapDomain == null || mapElements == null) {
-              return result;
-            }
-            foreach (var app in fSetSelect.AppsWithArg(0, mapDomain)) {
-              if (!((Model.Boolean)app.Result).Value) {
-                continue;
-              }
-              result.UnionWith(AddMappingHelper(
-                state,
-                var as MapVariable,
-                Unbox(app.Args[1]),
-                Unbox(fSetSelect.OptEval(mapElements, app.Args[1])),
-                mapKeysAdded));
-            }
-            return result;
-          }
-      }
-
-      // Elt is an array or an object:
-      var heap = state.State.TryGet("$Heap");
-      if (heap == null) {
-        return result;
-      }
-      var constantFields = GetDestructorFunctions(var.Element).OrderBy(f => f.Name).ToList();
-      foreach (var field in constantFields) {
-        result.Add(DafnyModelVariableFactory.Get(state, Unbox(field.OptEval(var.Element)),
-          UnderscoreRemovalRegex.Replace(field.Name.Split(".").Last(), "_"), var));
-      }
-      var fields = fSetSelect.AppsWithArgs(0, heap, 1, var.Element);
-      if (fields == null || !fields.Any()) {
-        return result;
-      }
-      foreach (var tpl in fSetSelect.AppsWithArg(0, fields.ToList()[0].Result)) {
-        foreach (var fieldName in GetFieldNames(tpl.Args[1])) {
-          if (fieldName != "alloc") {
-            result.Add(DafnyModelVariableFactory.Get(state, Unbox(tpl.Result), fieldName, var));
-          }
-        }
-      }
-      return result;
-    }
-
-    /// <summary>
-    /// Return all functions mapping an object to a destructor value.
-    /// </summary>
-    private List<Model.Func> GetDestructorFunctions(Model.Element element) {
-      var possibleTypeIdentifiers = GetIsResults(element);
-      if (fDtype.OptEval(element) != null) {
-        possibleTypeIdentifiers.Add(fDtype.OptEval(element));
-      }
-      var possiblyNullableTypes = possibleTypeIdentifiers
-        .Select(isResult => ReconstructType(isResult) as UserDefinedType)
-        .Where(type => type != null && type.Name != UnknownType.Name);
-      var types = possiblyNullableTypes.Select(type => DafnyModelTypeUtils.GetNonNullable(type) as UserDefinedType);
-      List<Model.Func> result = new();
-      var builtInDatatypeDestructor = new Regex("^.*[^_](__)*_q$");
-      foreach (var app in element.References) {
-        if (app.Func.Arity != 1 || app.Args[0] != element ||
-            !types.Any(type => app.Func.Name.StartsWith(type.Name + ".")) ||
-            builtInDatatypeDestructor.IsMatch(app.Func.Name.Split(".").Last())) {
-          continue;
-        }
-        result.Add(app.Func);
-      }
-      return result;
-    }
-
-    private const string PleaseEnableModelCompressFalse =
-      "Please enable /proverOpt:O:model_compress=false (for z3 version < 4.8.7)" +
-      " or /proverOpt:O:model.compact=false (for z3 version >= 4.8.7)," +
-      " otherwise you'll get unexpected values.";
-
-    /// <summary>
-    /// Return the name of the field represented by the given element.
-    /// Special care is required if the element represents an array index
-    /// </summary>
-    private List<string> GetFieldNames(Model.Element elt) {
-      if (elt == null) {
-        return new List<string>();
-      }
-      var dims = fDim.OptEval(elt)?.AsInt();
-      if (dims is null or 0) { // meaning elt is not an array index
-        return elt.Names.Where(tuple =>
-          tuple.Func.Arity == 0 && !tuple.Func.Name.Contains("$"))
-          .Select(tuple => UnderscoreRemovalRegex
-            .Replace(tuple.Func.Name.Split(".").Last(), "_"))
-          .ToList();
-      }
-      // Reaching this code means elt is an index into an array
-      var indices = new Model.Element[(int)dims];
-      for (int i = (int)dims; 0 <= --i;) {
-        ModelFuncWrapper.ModelFuncTupleWrapper dimTuple;
-        if (i == 0) {
-          dimTuple = fIndexField.AppWithResult(elt);
-          if (dimTuple == null) {
-            options.OutputWriter.WriteLine(PleaseEnableModelCompressFalse);
-            continue;
-          }
-          indices[i] = dimTuple.Args[0];
-        } else {
-          dimTuple = fMultiIndexField.AppWithResult(elt);
-          if (dimTuple == null) {
-            options.OutputWriter.WriteLine(PleaseEnableModelCompressFalse);
-            continue;
-          }
-          indices[i] = dimTuple.Args[1];
-          elt = dimTuple.Args[0];
-        }
-      }
-      return new List<string>() {
-        "[" + string.Join(",",
-          indices.ToList().ConvertAll(element => element == null ? "null" : element.ToString())) + "]"
-      };
-    }
-
-    /// <summary> Unboxes an element, if possible </summary>
-    private Model.Element Unbox(Model.Element elt) {
-      if (elt == null) {
-        return null;
-      }
-      var unboxed = fBox.AppWithResult(elt);
-      if (unboxed != null) {
-        return Unbox(unboxed.Args[0]);
-      }
-      unboxed = fUnbox.AppWithArg(1, elt);
-      return unboxed != null ? Unbox(unboxed.Result) : elt;
-    }
-  }
-}
diff --git a/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModelState.cs b/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModelState.cs
deleted file mode 100644
index f7632fb2e2c..00000000000
--- a/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModelState.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Microsoft.Boogie;
-
-namespace Microsoft.Dafny.LanguageServer.CounterExampleGeneration {
-
-  /// <summary>
-  /// Represents a program state in a DafnyModel
-  /// </summary>
-  public class DafnyModelState {
-
-    internal readonly DafnyModel Model;
-    internal readonly Model.CapturedState State;
-    internal int VarIndex; // used to assign unique indices to variables
-    private readonly List<DafnyModelVariable> vars;
-    private readonly List<DafnyModelVariable> boundVars;
-    // varMap prevents the creation of multiple variables for the same element.
-    private readonly Dictionary<Model.Element, DafnyModelVariable> varMap;
-    // varNameCount keeps track of the number of variables with the same name.
-    // Name collision can happen in the presence of an old expression,
-    // for instance, in which case the it is important to distinguish between
-    // two variables that have the same name using an index provided by Boogie
-    private readonly Dictionary<string, int> varNameCount;
-
-    private const string InitialStateName = "<initial>";
-    private static readonly Regex StatePositionRegex = new(
-      @".*\((?<line>\d+),(?<character>\d+)\)",
-      RegexOptions.IgnoreCase | RegexOptions.Singleline
-    );
-
-    internal DafnyModelState(DafnyModel model, Model.CapturedState state) {
-      Model = model;
-      State = state;
-      VarIndex = 0;
-      vars = new();
-      varMap = new();
-      varNameCount = new();
-      boundVars = new(BoundVars());
-      SetupVars();
-    }
-
-    /// <summary>
-    /// Start with the union of vars and boundVars and expand the set by adding 
-    /// variables that represent fields of any object in the original set or
-    /// elements of any sequence in the original set, etc. This is done
-    /// recursively in breadth-first order and only up to a certain maximum
-    /// depth.
-    /// </summary>
-    /// <param name="maxDepth">The maximum depth up to which to expand the
-    /// variable set.</param>
-    /// <returns>Set of variables</returns>
-    public HashSet<DafnyModelVariable> ExpandedVariableSet(int maxDepth) {
-      HashSet<DafnyModelVariable> expandedSet = new();
-      // The following is the queue for elements to be added to the set. The 2nd
-      // element of a tuple is the depth of the variable w.r.t. the original set
-      List<Tuple<DafnyModelVariable, int>> varsToAdd = new();
-      vars.ForEach(variable => varsToAdd.Add(new(variable, 0)));
-      boundVars.ForEach(variable => varsToAdd.Add(new(variable, 0)));
-      while (varsToAdd.Count != 0) {
-        var (next, depth) = varsToAdd[0];
-        varsToAdd.RemoveAt(0);
-        if (expandedSet.Contains(next)) {
-          continue;
-        }
-        if (depth == maxDepth) {
-          break;
-        }
-        expandedSet.Add(next);
-        // fields of primitive types are skipped:
-        foreach (var v in next.GetExpansion().
-            Where(variable => !expandedSet.Contains(variable) && !variable.IsPrimitive)) {
-          varsToAdd.Add(new(v, depth + 1));
-        }
-      }
-      return expandedSet;
-    }
-
-    internal bool ExistsVar(Model.Element element) {
-      return varMap.ContainsKey(element);
-    }
-
-    internal void AddVar(Model.Element element, DafnyModelVariable var) {
-      if (!ExistsVar(element)) {
-        varMap[element] = var;
-      }
-    }
-
-    internal DafnyModelVariable GetVar(Model.Element element) {
-      return varMap[element];
-    }
-
-    internal void AddVarName(string name) {
-      varNameCount[name] = varNameCount.GetValueOrDefault(name, 0) + 1;
-    }
-
-    internal bool VarNameIsShared(string name) {
-      return varNameCount.GetValueOrDefault(name, 0) > 1;
-    }
-
-    public string FullStateName => State.Name;
-
-    private string ShortenedStateName => ShortenName(State.Name, 20);
-
-    public bool IsInitialState => FullStateName.Equals(InitialStateName);
-
-    public int GetLineId() {
-      var match = StatePositionRegex.Match(ShortenedStateName);
-      if (!match.Success) {
-        throw new ArgumentException(
-          $"state does not contain position: {ShortenedStateName}");
-      }
-      return int.Parse(match.Groups["line"].Value);
-    }
-
-    public int GetCharId() {
-      var match = StatePositionRegex.Match(ShortenedStateName);
-      if (!match.Success) {
-        throw new ArgumentException(
-          $"state does not contain position: {ShortenedStateName}");
-      }
-      return int.Parse(match.Groups["character"].Value);
-    }
-
-    /// <summary>
-    /// Initialize the vars list, which stores all variables relevant to
-    /// the counterexample except for the bound variables
-    /// </summary>
-    private void SetupVars() {
-      var names = Enumerable.Empty<string>();
-      if (Model.States.Count > 0) {
-        var prev = Model.States.Last();
-        names = prev.vars.ConvertAll(variable => variable.Name);
-      }
-      names = names.Concat(State.Variables).Distinct();
-      foreach (var v in names) {
-        if (!DafnyModel.IsUserVariableName(v)) {
-          continue;
-        }
-        var val = State.TryGet(v);
-        if (val == null) {
-          continue; // This variable has no value in the model, so ignore it.
-        }
-
-        var vn = DafnyModelVariableFactory.Get(this, val, v, duplicate: true);
-        vars.Add(vn);
-      }
-    }
-
-    /// <summary>
-    /// Return list of bound variables
-    /// </summary>
-    private IEnumerable<DafnyModelVariable> BoundVars() {
-      foreach (var f in Model.Model.Functions) {
-        if (f.Arity != 0) {
-          continue;
-        }
-        int n = f.Name.IndexOf('!');
-        if (n == -1) {
-          continue;
-        }
-        var name = f.Name.Substring(0, n);
-        if (!name.Contains('#') || name.Contains("$")) {
-          continue;
-        }
-
-        yield return DafnyModelVariableFactory.Get(this, f.GetConstant(), name,
-          null, true);
-      }
-    }
-
-    private static string ShortenName(string name, int fnLimit) {
-      var loc = TryParseSourceLocation(name);
-      if (loc != null) {
-        var fn = loc.Filename;
-        int idx = fn.LastIndexOfAny(new[] { '\\', '/' });
-        if (idx > 0) {
-          fn = fn.Substring(idx + 1);
-        }
-        if (fn.Length > fnLimit) {
-          fn = fn.Substring(0, fnLimit) + "..";
-        }
-        var addInfo = loc.AddInfo;
-        if (addInfo != "") {
-          addInfo = ":" + addInfo;
-        }
-        return $"{fn}({loc.Line},{loc.Column}){addInfo}";
-      }
-      return name;
-    }
-
-    /// <summary>
-    /// Parse a string (typically the name of the captured state in Boogie) to
-    /// extract a SourceLocation from it. An example of a string to be parsed:
-    /// @"c:\users\foo\bar.c(12,10) : random string"
-    /// The ": random string" part is optional.
-    /// </summary>
-    private static SourceLocation TryParseSourceLocation(string name) {
-      int par = name.LastIndexOf('(');
-      if (par <= 0) {
-        return null;
-      }
-      var res = new SourceLocation() { Filename = name.Substring(0, par) };
-      var words = name.Substring(par + 1)
-        .Split(',', ')', ':')
-        .Where(x => x != "")
-        .ToArray();
-      if (words.Length < 2) {
-        return null;
-      }
-      if (!int.TryParse(words[0], out res.Line) ||
-          !int.TryParse(words[1], out res.Column)) {
-        return null;
-      }
-      int colon = name.IndexOf(':', par);
-      res.AddInfo = colon > 0 ? name.Substring(colon + 1).Trim() : "";
-      return res;
-    }
-
-    private class SourceLocation {
-      public string Filename;
-      public string AddInfo;
-      public int Line;
-      public int Column;
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModelTypeUtils.cs b/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModelTypeUtils.cs
deleted file mode 100644
index d4cb943d01f..00000000000
--- a/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModelTypeUtils.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
-using System;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace Microsoft.Dafny.LanguageServer.CounterExampleGeneration {
-
-  /// <summary>
-  /// This class stores various transformations that could be useful to perform
-  /// on types extracted from DafnyModel (e.g. to convert Boogie type names
-  /// back to the original Dafny names)
-  /// </summary>
-  public static class DafnyModelTypeUtils {
-
-    private static readonly Regex ModuleSeparatorRegex = new("(?<=[^_](__)*)_m");
-    private static readonly Regex UnderscoreRemovalRegex = new("__");
-    private static readonly Regex TupleRegex = new("_[Ss]ystem\\._?[Tt]uple#?");
-
-    public static Type GetNonNullable(Type type) {
-      if (type is not UserDefinedType userType) {
-        return type;
-      }
-
-      return new UserDefinedType(new Token(),
-        userType.Name.TrimEnd('?'), userType.TypeArgs);
-    }
-
-    public static Type ReplaceTypeVariables(Type type, Type with) {
-      return ReplaceType(type, t => t.Name.Contains('$'), _ => with);
-    }
-
-    /// <summary>
-    /// Recursively replace all types within <param>type</param> that satisfy
-    /// <param>condition</param>
-    /// </summary>
-    public static Type ReplaceType(Type type, Func<UserDefinedType, Boolean> condition,
-      Func<UserDefinedType, Type> replacement) {
-      if ((type is not UserDefinedType userType) || (type is ArrowType) || (type.AsArrowType != null)) {
-        return TransformType(type, t => ReplaceType(t, condition, replacement));
-      }
-      var newType = condition(userType) ? replacement(userType) : type;
-      newType.TypeArgs = newType.TypeArgs.ConvertAll(t =>
-        TransformType(t, t => ReplaceType(t, condition, replacement)));
-      if (newType is not UserDefinedType newUserType) {
-        return newType;
-      }
-      return new UserDefinedType(newUserType.tok, newUserType.Name,
-        newUserType.TypeArgs);
-    }
-
-    public static Type GetInDafnyFormat(Type type) {
-      if ((type is not UserDefinedType userType) || (type is ArrowType) || (type.AsArrowType != null)) {
-        return TransformType(type, GetInDafnyFormat);
-      }
-      // The line below converts "_m" used in boogie to separate modules to ".":
-      var newName = ModuleSeparatorRegex.Replace(userType.Name, ".");
-      // strip everything after @, this is done for type variables:
-      newName = newName.Split("@")[0];
-      // The code below converts every "__" to "_":
-      newName = UnderscoreRemovalRegex.Replace(newName, "_");
-      newName = ConvertTupleName(newName);
-      return new UserDefinedType(new Token(), newName,
-        type.TypeArgs.ConvertAll(t => TransformType(t, GetInDafnyFormat)));
-    }
-
-    public static string ConvertTupleName(string name) {
-      return TupleRegex.Replace(name, "_tuple#");
-    }
-
-    /// <summary>
-    /// Recursively transform all UserDefinedType objects within a given type
-    /// </summary>
-    private static Type TransformType(Type type, Func<UserDefinedType, Type> transform) {
-      if (type is ArrowType || type.AsArrowType != null) {
-        var arrowType = type.AsArrowType;
-        return new ArrowType(new Token(),
-          arrowType.Args.Select(t => TransformType(t, transform)).ToList(),
-          TransformType(arrowType.Result, transform));
-      }
-      switch (type) {
-        case BasicType:
-          return type;
-        case MapType mapType:
-          return new MapType(mapType.Finite,
-            TransformType(mapType.Domain, transform),
-            TransformType(mapType.Range, transform));
-        case SeqType seqType:
-          return new SeqType(TransformType(seqType.Arg, transform));
-        case SetType setType:
-          return new SetType(setType.Finite, TransformType(setType.Arg, transform));
-        case MultiSetType multiSetType:
-          return new MultiSetType(TransformType(multiSetType, transform));
-        case UserDefinedType userDefinedType:
-          return transform(userDefinedType);
-        case InferredTypeProxy inferredTypeProxy:
-          var tmp = new InferredTypeProxy();
-          tmp.T = TransformType(inferredTypeProxy.T, transform);
-          return tmp;
-      }
-      return type;
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModelVariable.cs b/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModelVariable.cs
deleted file mode 100644
index 8a3073a79ca..00000000000
--- a/Source/DafnyLanguageServer/CounterExampleGeneration/DafnyModelVariable.cs
+++ /dev/null
@@ -1,300 +0,0 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Microsoft.Boogie;
-
-namespace Microsoft.Dafny.LanguageServer.CounterExampleGeneration {
-
-  /// <summary>
-  /// A static class for generating instance of DafnyModelvariable and its
-  /// subclasses. The factory chooses which subclass of DafnyModelVariable to
-  /// employ depending on the DafnyModelType` of the `Element` for which the
-  /// variable is generated.
-  /// </summary>
-  public static class DafnyModelVariableFactory {
-
-    /// <summary>
-    /// Create a new variable to be associated with the given model element in
-    /// a given counterexample state or return such a variable if one already
-    /// exists.
-    /// </summary>
-    /// <param name="state"></param>
-    /// <param name="element"></param>
-    /// <param name="name">the name to be assigned to the variable OR,
-    /// if parent != null, the name of the field associated with it. In the later
-    /// case, Name is set to some unique id.</param>
-    /// <param name="parent">if not null, this variable represents the field of
-    /// some parent object</param>
-    /// <param name="duplicate">forces the creation of a new variable even if
-    /// one already exists </param>
-    /// <returns></returns>
-    public static DafnyModelVariable Get(DafnyModelState state,
-      Model.Element element, string name, DafnyModelVariable parent = null,
-      bool duplicate = false) {
-      if (state.ExistsVar(element)) {
-        parent?.AddChild(name, state.GetVar(element));
-        if (!duplicate) {
-          return state.GetVar(element);
-        }
-        return new DuplicateVariable(state, state.GetVar(element), name, parent);
-      }
-
-      return state.Model.GetDafnyType(element) switch {
-        SeqType _ => new SeqVariable(state, element, name, parent),
-        MapType _ => new MapVariable(state, element, name, parent),
-        _ => new DafnyModelVariable(state, element, name, parent)
-      };
-    }
-  }
-
-  /// <summary>
-  /// Represents a variable at a particular state. Note that a variable in Dafny
-  /// source can be represented by multiple DafnyModelVariables, one for each
-  /// DafnyModelState in DafnyModel.
-  /// </summary>
-  public class DafnyModelVariable {
-
-    public readonly string Name; // name given to the variable at creation
-    public readonly Microsoft.Dafny.Type Type; // Dafny type of the variable
-    public readonly Model.Element Element;
-    // Maps a field name, sequence index, or some other identifier to
-    // a list of DafnyModelVariables that represent the corresponding value
-    private readonly Dictionary<string, List<DafnyModelVariable>> children;
-    private readonly DafnyModelState state; // the associated captured state
-    public virtual Dictionary<string, List<DafnyModelVariable>> Children => children;
-
-    internal DafnyModelVariable(DafnyModelState state, Model.Element element,
-      string name, DafnyModelVariable parent) {
-      this.state = state;
-      Element = element;
-      Type = state.Model.GetDafnyType(element);
-      children = new Dictionary<string, List<DafnyModelVariable>>();
-      state.AddVar(element, this);
-      if (parent == null) {
-        Name = name;
-      } else {
-        Name = "@" + state.VarIndex++;
-        parent.AddChild(name, this);
-      }
-      state.AddVarName(ShortName);
-    }
-
-    public virtual IEnumerable<DafnyModelVariable> GetExpansion() {
-      return state.Model.GetExpansion(state, this);
-    }
-
-    public string CanonicalName() {
-      return state.Model.CanonicalName(Element, Type);
-    }
-
-    public virtual string Value {
-      get {
-        var result = state.Model.CanonicalName(Element, Type);
-        if (children.Count == 0) {
-          if (result != "") {
-            return result;
-          }
-          return Type is SetType ? "{}" : "()";
-        }
-
-        List<(string ChildName, string ChildValue)> childList = new();
-        foreach (var childName in children.Keys) {
-          foreach (var child in children[childName]) {
-            if (child.IsPrimitive) {
-              childList.Add(new ValueTuple<string, string>(childName, child.Value));
-            } else {
-              childList.Add(new ValueTuple<string, string>(childName, child.ShortName));
-            }
-          }
-        }
-        string childValues;
-        if (Type is SetType) {
-          childValues = string.Join(", ",
-            childList.ConvertAll(tpl => tpl.Item2 + " := " + tpl.Item1));
-          return result + "{" + childValues + "}";
-        }
-        childValues = string.Join(", ",
-            childList.ConvertAll(tpl => tpl.Item1 + " := " + tpl.Item2));
-        return result + "(" + childValues + ")";
-      }
-    }
-    public bool IsPrimitive => Type is BasicType || state.Model.ElementIsNull(Element);
-
-    public string ShortName {
-      get {
-        var shortName = Regex.Replace(Name, @"#.*$", "");
-        return state.VarNameIsShared(shortName) ? Name : shortName;
-      }
-    }
-
-    internal void AddChild(string name, DafnyModelVariable child) {
-      name = Regex.Replace(name, "^_h", "#");
-      if (!children.ContainsKey(name)) {
-        children[name] = new();
-      }
-      children[name].Add(child);
-    }
-
-    public override int GetHashCode() {
-      return Element.Id.GetHashCode();
-    }
-
-    public override bool Equals(object obj) {
-      if (obj is not DafnyModelVariable other) {
-        return false;
-      }
-
-      return other.Element == Element &&
-             other.state == state &&
-             other.Name == Name;
-    }
-  }
-
-  /// <summary>
-  /// a variable that has a different name but represents the same Element in
-  /// the same DafnyModelState as some other variable.
-  /// </summary>
-  public class DuplicateVariable : DafnyModelVariable {
-
-    public readonly DafnyModelVariable Original;
-
-    internal DuplicateVariable(DafnyModelState state,
-      DafnyModelVariable original, string newName, DafnyModelVariable parent)
-      : base(state, original.Element, newName, parent) {
-      Original = original;
-    }
-
-    public override string Value => Original.ShortName;
-
-    public override Dictionary<string, List<DafnyModelVariable>> Children => Original.Children;
-
-    public override IEnumerable<DafnyModelVariable> GetExpansion() {
-      return Original.GetExpansion();
-    }
-  }
-
-  /// <summary>
-  /// A variable that represents a sequence. 
-  /// </summary>
-  public class SeqVariable : DafnyModelVariable {
-
-    private DafnyModelVariable seqLength;
-    // Dafny integers are unbounded, hence using strings for seq indices:
-    private readonly Dictionary<string, DafnyModelVariable> seqElements;
-
-    internal SeqVariable(DafnyModelState state, Model.Element element,
-      string name, DafnyModelVariable parent)
-      : base(state, element, name, parent) {
-      seqLength = null;
-      seqElements = new Dictionary<string, DafnyModelVariable>();
-    }
-
-    public override string Value {
-      get {
-        var length = GetLength();
-        if (length == -1 || seqElements.Count != length) {
-          return base.Value;
-        }
-        List<string> result = new();
-        for (int i = 0; i < length; i++) {
-          var id = i.ToString();
-          if (!seqElements.ContainsKey(id)) {
-            return base.Value;
-          }
-          result.Add(seqElements[id].IsPrimitive ?
-            seqElements[id].Value :
-            seqElements[id].ShortName);
-        }
-        return "[" + string.Join(", ", result) + "]";
-      }
-    }
-
-    public int GetLength() {
-      if (int.TryParse((seqLength?.Element as Model.Integer)?.Numeral,
-            out var value)) {
-        return value;
-      }
-      // Since the length is not explicitly specified, the index of the last known element should suffice
-      int lastId = 0;
-      foreach (var id in seqElements.Keys) {
-        if (int.TryParse(id, out var idAsInt)) {
-          if (lastId < idAsInt + 1) {
-            lastId = idAsInt + 1;
-          }
-        } else {
-          return -1; // Failed to parse the index, so just say that the length is unknown
-        }
-      }
-      return lastId;
-    }
-
-    public DafnyModelVariable this[int index] => seqElements.GetValueOrDefault(index.ToString(), null);
-
-    public void SetLength(DafnyModelVariable seqLength) {
-      this.seqLength = seqLength;
-    }
-
-    public void AddAtIndex(DafnyModelVariable e, string index) {
-      if (index == null) {
-        return;
-      }
-      seqElements[index] = e;
-    }
-  }
-
-  /// <summary>
-  /// A variable that represents a map.
-  /// </summary>
-  public class MapVariable : DafnyModelVariable {
-
-    public readonly Dictionary<DafnyModelVariable, DafnyModelVariable>
-      Mappings = new();
-
-    internal MapVariable(DafnyModelState state, Model.Element element,
-      string name, DafnyModelVariable parent)
-      : base(state, element, name, parent) { }
-
-    public override string Value {
-      get {
-        if (Mappings.Count == 0) {
-          return "map[]";
-        }
-        // maps a key-value pair to how many times it appears in the map
-        // a key value pair can appear many times in a map due to "?:int" etc.
-        Dictionary<string, int> mapStrings = new();
-        foreach (var key in Mappings.Keys) {
-          var keyString = key.IsPrimitive ? key.Value : key.Name;
-          var valueString = "?";
-          if (Mappings[key] != null) {
-            valueString = Mappings[key].IsPrimitive
-              ? Mappings[key].Value
-              : Mappings[key].Name;
-          }
-          var mapString = keyString + " := " + valueString;
-          mapStrings[mapString] =
-            mapStrings.GetValueOrDefault(mapString, 0) + 1;
-        }
-
-        return "map[" + string.Join(", ", mapStrings.Keys.ToList()
-                 .ConvertAll(keyValuePair =>
-                   mapStrings[keyValuePair] == 1
-                     ? keyValuePair
-                     : keyValuePair + " [+" + (mapStrings[keyValuePair] - 1) +
-                       "]")) +
-               "]";
-      }
-    }
-
-    public void AddMapping(DafnyModelVariable from, DafnyModelVariable to) {
-      if (Mappings.ContainsKey(from)) {
-        return;
-      }
-      Mappings[from] = to;
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/CounterExampleGeneration/README.md b/Source/DafnyLanguageServer/CounterExampleGeneration/README.md
deleted file mode 100644
index 42d4b3d2b86..00000000000
--- a/Source/DafnyLanguageServer/CounterExampleGeneration/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Counterexample Generation
-
-The following is a class-by-class description of the files in this directory intended to help with maintaining and improving the counterexample generation feature of Dafny:
-
-- [DafnyModel](DafnyModel.cs) - a wrapper around Boogie's `Model` class that defines Dafny specific functions and provides functionality for extracting types and values of `Elements` representing Dafny variables. The three core methods are:
-  - `GetDafnyType`, which returns a `DafnyModelType` instance for an arbitrary `Element` in the underlying model
-  - `CanonicalName`, which returns the value of any Element representing a variable of the basic type in Dafny
-  - `GetExpansion`, which computes all the "children" of a particular variable, that is fields for objects, destructor values for datatypes, elements for sequences, etc.
-- [DafnyModelState](DafnyModelState.cs) - Represents a state in a `DafnyModel` and captures the values of all variables at a particular point in the code.
-- [DafnyModelVariable](DafnyModelVariable.cs) - Represents a variable at a particular state. Note that a variable in Dafny source can be represented by multiple `DafnyModelVariables`, one for each `DafnyModelState` in `DafnyModel`. The subclasses of `DafnyModelVariable` are:
-  - `DuplicateVariable` - a variable that has a different name but represents the same `Element` in the same `DafnyModelState` as some other variable.
-  - `MapVariable` - a variable that represents a map. Allows adding mappings to the map and displaying the map using Dafny syntax.
-  - `SeqVariable` - a variable that represents a sequence. Allows displaying the sequence using Dafny syntax.
-- [DafnyModelVariableFactory](DafnyModelVariable.cs) - A static class for generating instance of `DafnyModelvariable` and its subclasses. The factory chooses which subclass of `DafnyModelVariable` to employ depending on the `Microsoft.Dafny.Type` of the `Element` for which the variable is generated.
-- [DafnyModelType](DafnyModelTypeUtils.cs) - Contains a set of utils for manipulating type objects (e.g. reconstructing the original Dafny type name from its Boogie translation: `Mo_dule_.Module2_.Cla__ss` from `Mo__dule___mModule2__.Cla____ss`).
diff --git a/Source/DafnyLanguageServer/DafnyLanguageServer.appsettings.json b/Source/DafnyLanguageServer/DafnyLanguageServer.appsettings.json
index 32c05bc4a0a..2bf081c7555 100644
--- a/Source/DafnyLanguageServer/DafnyLanguageServer.appsettings.json
+++ b/Source/DafnyLanguageServer/DafnyLanguageServer.appsettings.json
@@ -6,7 +6,7 @@
       "Override": {
         "Microsoft.Dafny": "Information"
       }
-    },
+    },  
     "WriteTo": [
       {
         "Name": "Debug",
diff --git a/Source/DafnyLanguageServer/DafnyLanguageServer.cs b/Source/DafnyLanguageServer/DafnyLanguageServer.cs
index 9d9c50304a8..556b3682d23 100644
--- a/Source/DafnyLanguageServer/DafnyLanguageServer.cs
+++ b/Source/DafnyLanguageServer/DafnyLanguageServer.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 using Microsoft.Dafny.LanguageServer.Handlers;
 using Microsoft.Dafny.LanguageServer.Language;
 using Microsoft.Dafny.LanguageServer.Workspace;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
@@ -14,7 +12,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Boogie.SMTLib;
-using Microsoft.Extensions.Options;
 using Action = System.Action;
 
 namespace Microsoft.Dafny.LanguageServer {
@@ -26,7 +23,7 @@ private static string DafnyVersion {
       }
     }
 
-    public static LanguageServerOptions WithDafnyLanguageServer(this LanguageServerOptions options, Action killLanguageServer) {
+    public static LanguageServerOptions WithDafnyLanguageServer(this LanguageServerOptions options, DafnyOptions dafnyOptions, Action killLanguageServer) {
       options.ServerInfo = new ServerInfo {
         Name = "Dafny",
         Version = DafnyVersion
@@ -34,14 +31,14 @@ public static LanguageServerOptions WithDafnyLanguageServer(this LanguageServerO
       return options
         .WithDafnyLanguage()
         .WithDafnyWorkspace()
-        .WithDafnyHandlers()
+        .WithDafnyHandlers(dafnyOptions)
         .OnInitialize((server, @params, token) => InitializeAsync(server, @params, token, killLanguageServer))
         .OnStarted(StartedAsync);
     }
 
     private static Task InitializeAsync(ILanguageServer server, InitializeParams request, CancellationToken cancelRequestToken,
         Action killLanguageServer) {
-      var logger = server.GetRequiredService<ILogger<Server>>();
+      var logger = server.GetRequiredService<ILogger<LanguageServer>>();
 
       KillLanguageServerIfParentDies(logger, request, killLanguageServer);
 
@@ -53,14 +50,18 @@ private static Task InitializeAsync(ILanguageServer server, InitializeParams req
     private static readonly Regex Z3VersionRegex = new Regex(@"Z3 version (?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)");
 
     private static void PublishSolverPath(ILanguageServer server) {
-      var telemetryPublisher = server.GetRequiredService<ITelemetryPublisher>();
+      var telemetryPublisher = server.GetRequiredService<TelemetryPublisherBase>();
       var options = server.GetRequiredService<DafnyOptions>();
       string solverPath;
       try {
         var proverOptions = new SMTLibSolverOptions(options);
         proverOptions.Parse(options.ProverOptions);
+        if (proverOptions.ProverName == "noop") {
+          telemetryPublisher.PublishSolverPath("noop solver");
+          return;
+        }
         solverPath = proverOptions.ExecutablePath();
-        HandleZ3Version(options, telemetryPublisher, proverOptions);
+        HandleZ3Version(telemetryPublisher, solverPath);
       } catch (Exception e) {
         solverPath = $"Error while determining solver path: {e}";
       }
@@ -68,29 +69,20 @@ private static void PublishSolverPath(ILanguageServer server) {
       telemetryPublisher.PublishSolverPath(solverPath);
     }
 
-    private static void HandleZ3Version(DafnyOptions options, ITelemetryPublisher telemetryPublisher, SMTLibSolverOptions proverOptions) {
-      var z3Version = DafnyOptions.GetZ3Version(proverOptions.ProverPath);
-      if (z3Version is null || z3Version < new Version(4, 8, 6)) {
+    private static void HandleZ3Version(TelemetryPublisherBase telemetryPublisher, string solverPath) {
+      var z3Version = DafnyOptions.GetZ3Version(solverPath);
+      if (z3Version is null) {
         return;
       }
 
       telemetryPublisher.PublishZ3Version($"Z3 version {z3Version}");
-
-      var toReplace = "O:model_compress=false";
-      var i = options.ProverOptions.IndexOf(toReplace);
-      if (i == -1) {
-        telemetryPublisher.PublishUnhandledException(new Exception($"Z3 version is > 4.8.6 but I did not find {toReplace} in the prover options:" + string.Join(" ", options.ProverOptions)));
-        return;
-      }
-
-      options.ProverOptions[i] = "O:model.compact=false";
     }
 
     /// <summary>
     /// As part of the LSP spec, a language server must kill itself if its parent process dies
     /// https://github.com/microsoft/language-server-protocol/blob/gh-pages/_specifications/specification-3-16.md?plain=1#L1713
     /// </summary>
-    private static void KillLanguageServerIfParentDies(ILogger<Server> logger, InitializeParams request,
+    private static void KillLanguageServerIfParentDies(ILogger<LanguageServer> logger, InitializeParams request,
         Action killLanguageServer) {
       if (!(request.ProcessId >= 0)) {
         return;
diff --git a/Source/DafnyLanguageServer/DafnyLanguageServer.csproj b/Source/DafnyLanguageServer/DafnyLanguageServer.csproj
index 02bf52639ce..92f1fad7dff 100644
--- a/Source/DafnyLanguageServer/DafnyLanguageServer.csproj
+++ b/Source/DafnyLanguageServer/DafnyLanguageServer.csproj
@@ -1,19 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <RollForward>Major</RollForward>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Nullable>enable</Nullable>
     <RootNamespace>Microsoft.Dafny.LanguageServer</RootNamespace>
     <OutputPath>..\..\Binaries\</OutputPath>
-    <IsPackable>true</IsPackable>
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -27,14 +25,14 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="RangeTree" Version="3.0.1" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
 
     <!-- The following packages are referenced explicitely since Serilog references older versions than required (nuget prevents the downgrade). -->
     <PackageReference Include="System.Collections" Version="4.3.0" />
diff --git a/Source/DafnyLanguageServer/Handlers/Custom/CounterExampleItem.cs b/Source/DafnyLanguageServer/Handlers/Custom/CounterExampleItem.cs
index f50b1932b40..d1aadd9f3bd 100644
--- a/Source/DafnyLanguageServer/Handlers/Custom/CounterExampleItem.cs
+++ b/Source/DafnyLanguageServer/Handlers/Custom/CounterExampleItem.cs
@@ -4,11 +4,12 @@
 namespace Microsoft.Dafny.LanguageServer.Handlers.Custom {
   public class CounterExampleItem {
     public Position Position { get; }
-    public IDictionary<string, string> Variables { get; }
 
-    public CounterExampleItem(Position position, IDictionary<string, string> variables) {
+    public string Assumption { get; }
+
+    public CounterExampleItem(Position position, string assumption) {
       Position = position;
-      Variables = variables;
+      Assumption = assumption;
     }
   }
 }
diff --git a/Source/DafnyLanguageServer/Handlers/Custom/DafnyCounterExampleHandler.cs b/Source/DafnyLanguageServer/Handlers/Custom/DafnyCounterExampleHandler.cs
index ac55cdfadd9..20d70713a81 100644
--- a/Source/DafnyLanguageServer/Handlers/Custom/DafnyCounterExampleHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/Custom/DafnyCounterExampleHandler.cs
@@ -5,21 +5,22 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Dafny.LanguageServer.CounterExampleGeneration;
+using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
 
 namespace Microsoft.Dafny.LanguageServer.Handlers.Custom {
   public class DafnyCounterExampleHandler : ICounterExampleHandler {
     private readonly DafnyOptions options;
     private readonly ILogger logger;
     private readonly IProjectDatabase projects;
-    private readonly ITelemetryPublisher telemetryPublisher;
+    private readonly TelemetryPublisherBase telemetryPublisher;
 
     public DafnyCounterExampleHandler(DafnyOptions options,
       ILogger<DafnyCounterExampleHandler> logger,
       IProjectDatabase projects,
-      ITelemetryPublisher telemetryPublisher) {
+      TelemetryPublisherBase telemetryPublisher) {
       this.logger = logger;
       this.projects = projects;
       this.telemetryPublisher = telemetryPublisher;
@@ -30,10 +31,14 @@ public async Task<CounterExampleList> Handle(CounterExampleParams request, Cance
       try {
         var projectManager = await projects.GetProjectManager(request.TextDocument);
         if (projectManager != null) {
-          await projectManager.VerifyEverythingAsync(request.TextDocument.Uri.ToUri());
+          var uri = request.TextDocument.Uri.ToUri();
+          await projectManager.VerifyEverythingAsync(uri);
 
-          var state = await projectManager.GetIdeStateAfterVerificationAsync();
-          logger.LogDebug("counter-example handler retrieved IDE state");
+          var state = await projectManager.States.
+            Where(s => FinishedVerifyingUri(s, uri)).FirstAsync();
+          logger.LogDebug($"counter-example handler retrieved IDE state, " +
+                          $"canVerify count: {state.CanVerifyStates[uri].Count}, " +
+                          $"counterExample count: {state.Counterexamples.Count}");
           return new CounterExampleLoader(options, logger, state, request.CounterExampleDepth, cancellationToken).GetCounterExamples();
         }
 
@@ -50,6 +55,13 @@ public async Task<CounterExampleList> Handle(CounterExampleParams request, Cance
       }
     }
 
+    private static bool FinishedVerifyingUri(IdeState s, Uri uri) {
+      return s.Status == CompilationStatus.ResolutionSucceeded &&
+             s.CanVerifyStates[uri].Values.All(r =>
+               r.PreparationProgress == VerificationPreparationState.Done &&
+               r.VerificationTasks.Values.All(v => v.Status >= PublishedVerificationStatus.Error));
+    }
+
     private class CounterExampleLoader {
       private readonly DafnyOptions options;
       private readonly ILogger logger;
@@ -67,7 +79,7 @@ public CounterExampleLoader(DafnyOptions options, ILogger logger, IdeState ideSt
 
       public CounterExampleList GetCounterExamples() {
         if (!ideState.Counterexamples.Any()) {
-          logger.LogDebug($"got no counter-examples for compilation {ideState.Compilation}");
+          logger.LogDebug($"got no counter-examples for version {ideState.Version}");
           return new CounterExampleList();
         }
 
@@ -83,7 +95,9 @@ private IEnumerable<DafnyModel> GetLanguageSpecificModels(IReadOnlyList<Countere
       }
 
       private DafnyModel GetLanguageSpecificModel(Model model) {
-        return new(model, options);
+        var dafnyModel = new DafnyModel(model, options);
+        dafnyModel.AssignConcretePrimitiveValues();
+        return dafnyModel;
       }
 
       private IEnumerable<CounterExampleItem> GetCounterExamples(DafnyModel model) {
@@ -92,15 +106,11 @@ private IEnumerable<CounterExampleItem> GetCounterExamples(DafnyModel model) {
           .Select(GetCounterExample);
       }
 
-      private CounterExampleItem GetCounterExample(DafnyModelState state) {
-        HashSet<DafnyModelVariable> vars = state.ExpandedVariableSet(counterExampleDepth);
+      private CounterExampleItem GetCounterExample(PartialState state) {
         return new(
           new Position(state.GetLineId() - 1, state.GetCharId()),
-          vars.WithCancellation(cancellationToken).ToDictionary(
-            variable => variable.ShortName + ":" + DafnyModelTypeUtils.GetInDafnyFormat(variable.Type),
-            variable => variable.Value
-          )
-        );
+           state.AsAssumption().ToString()
+         );
       }
     }
   }
diff --git a/Source/DafnyLanguageServer/Handlers/Custom/VerificationHandler.cs b/Source/DafnyLanguageServer/Handlers/Custom/VerificationHandler.cs
index e5e04599fa8..c633a6a22df 100644
--- a/Source/DafnyLanguageServer/Handlers/Custom/VerificationHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/Custom/VerificationHandler.cs
@@ -31,7 +31,7 @@ public async Task<bool> Handle(VerificationParams request, CancellationToken can
       return false;
     }
 
-    return await projectManager.CompilationManager.VerifySymbol(new FilePosition(request.TextDocument.Uri.ToUri(), request.Position));
+    return await projectManager.Compilation.VerifyLocation(new FilePosition(request.TextDocument.Uri.ToUri(), request.Position));
   }
 
   public async Task<bool> Handle(CancelVerificationParams request, CancellationToken cancellationToken) {
@@ -40,18 +40,7 @@ public async Task<bool> Handle(CancelVerificationParams request, CancellationTok
       return false;
     }
 
-
-    var resolvedCompilation = await projectManager.CompilationManager.ResolvedCompilation;
-    var canVerify = resolvedCompilation.Program.FindNode<ICanVerify>(request.TextDocument.Uri.ToUri(), request.Position.ToDafnyPosition());
-    if (canVerify != null) {
-      var implementations = resolvedCompilation.ImplementationsPerVerifiable.TryGetValue(canVerify, out var implementationsPerName)
-        ? implementationsPerName.Values : Enumerable.Empty<ImplementationView>();
-      foreach (var view in implementations) {
-        view.Task.Cancel();
-      }
-    }
-
-
+    await projectManager.Compilation.Cancel(new FilePosition(request.TextDocument.Uri.ToUri(), request.Position));
     return true;
   }
 }
diff --git a/Source/DafnyLanguageServer/Handlers/DafnyCodeActionHandler.cs b/Source/DafnyLanguageServer/Handlers/DafnyCodeActionHandler.cs
index 1a81e012a54..5e54eceac80 100644
--- a/Source/DafnyLanguageServer/Handlers/DafnyCodeActionHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/DafnyCodeActionHandler.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using Microsoft.Dafny.LanguageServer.Language;
 using Microsoft.Dafny.LanguageServer.Workspace;
@@ -14,7 +13,7 @@
 using Microsoft.Dafny.LanguageServer.Plugins;
 using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
 using Newtonsoft.Json.Linq;
-using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
+using OmniSharp.Extensions.LanguageServer.Protocol;
 
 namespace Microsoft.Dafny.LanguageServer.Handlers;
 
@@ -46,10 +45,11 @@ protected override CodeActionRegistrationOptions CreateRegistrationOptions(CodeA
   /// <summary>
   /// Returns the fixes along with a unique identifier
   /// </summary>
-  private IEnumerable<DafnyCodeActionWithId> GetFixesWithIds(IEnumerable<DafnyCodeActionProvider> fixers, CompilationAfterParsing compilation, CodeActionParams request) {
+  private IEnumerable<DafnyCodeActionWithId> GetFixesWithIds(IEnumerable<DafnyCodeActionProvider> fixers, IdeState state, CodeActionParams request) {
     var id = 0;
+    var uri = request.TextDocument.Uri.ToUri();
     return fixers.SelectMany(fixer => {
-      var fixerInput = new DafnyCodeActionInput(compilation, request.TextDocument.Uri.ToUri());
+      var fixerInput = new DafnyCodeActionInput(state, uri);
       var quickFixes = fixer.GetDafnyCodeActions(fixerInput, request.Range);
       var fixerCodeActions = quickFixes.Select(quickFix =>
         new DafnyCodeActionWithId(quickFix, id++));
@@ -57,23 +57,26 @@ private IEnumerable<DafnyCodeActionWithId> GetFixesWithIds(IEnumerable<DafnyCode
     });
   }
 
-  private readonly ConcurrentDictionary<string, IReadOnlyList<DafnyCodeActionWithId>> documentUriToDafnyCodeActiones = new();
+  private readonly ConcurrentDictionary<string, IReadOnlyList<DafnyCodeActionWithId>> documentUriToDafnyCodeActions = new();
 
   public override async Task<CommandOrCodeActionContainer> Handle(CodeActionParams request, CancellationToken cancellationToken) {
-    var document = await projects.GetLastDocumentAsync(request.TextDocument);
-    if (document == null) {
+    var projectManager = await projects.GetProjectManager(request.TextDocument);
+    if (projectManager == null) {
       logger.LogWarning("dafny code actions requested for unloaded document {DocumentUri}", request.TextDocument.Uri);
       return new CommandOrCodeActionContainer();
     }
-    var quickFixers = GetDafnyCodeActionProviders();
-    var fixesWithId = GetFixesWithIds(quickFixers, document, request).ToArray();
 
-    var documentUri = document.Uri.ToString();
-    documentUriToDafnyCodeActiones.AddOrUpdate(documentUri, _ => fixesWithId, (_, _) => fixesWithId);
+    var uri = request.TextDocument.Uri.ToUri();
+
+    var ideState = await projectManager.GetStateAfterResolutionAsync();
+    var quickFixers = GetDafnyCodeActionProviders();
+    var fixesWithId = GetFixesWithIds(quickFixers, ideState, request).ToArray();
+    var key = uri.ToString();
+    documentUriToDafnyCodeActions.AddOrUpdate(key, _ => fixesWithId, (_, _) => fixesWithId);
     var codeActions = fixesWithId.Select(fixWithId => {
       CommandOrCodeAction t = new CodeAction {
         Title = fixWithId.DafnyCodeAction.Title,
-        Data = new JArray(documentUri, fixWithId.Id),
+        Data = new JArray(key, fixWithId.Id),
         Diagnostics = fixWithId.DafnyCodeAction.Diagnostics,
         Kind = CodeActionKind.QuickFix
       };
@@ -85,9 +88,9 @@ public override async Task<CommandOrCodeActionContainer> Handle(CodeActionParams
 
   private DafnyCodeActionProvider[] GetDafnyCodeActionProviders() {
     return new List<DafnyCodeActionProvider>() {
-      new VerificationDafnyCodeActionProvider()
-    , new ErrorMessageDafnyCodeActionProvider()
-    , new ImplicitFailingAssertionCodeActionProvider(options)
+      new VerificationDafnyCodeActionProvider(logger)
+    , new ErrorMessageDafnyCodeActionProvider(logger)
+    , new ImplicitFailingAssertionCodeActionProvider(logger, options)
     }
     .Concat(
       options.Plugins.SelectMany(plugin =>
@@ -102,7 +105,7 @@ public override Task<CodeAction> Handle(CodeAction request, CancellationToken ca
     }
 
     string? documentUri = command[0]?.Value<string>();
-    if (documentUri == null || !documentUriToDafnyCodeActiones.TryGetValue(documentUri, out var quickFixes)) {
+    if (documentUri == null || !documentUriToDafnyCodeActions.TryGetValue(documentUri, out var quickFixes)) {
       return Task.FromResult(request);
     }
 
@@ -145,15 +148,16 @@ private IEnumerable<TextEdit> GetTextEdits(IEnumerable<DafnyCodeActionEdit> quic
 public class DafnyCodeActionInput : IDafnyCodeActionInput {
   private readonly Uri uri;
 
-  public DafnyCodeActionInput(CompilationAfterParsing compilation, Uri uri) {
+  public DafnyCodeActionInput(IdeState state, Uri uri) {
     this.uri = uri;
-    Compilation = compilation;
+    IdeState = state;
   }
 
-  public string Uri => Compilation.Uri.ToString();
-  public Program Program => Compilation.Program;
-  public CompilationAfterParsing Compilation { get; }
+  public DocumentUri Uri => uri;
+
+  public Node Program => IdeState.Program;
+  public IdeState IdeState { get; }
 
-  public IEnumerable<DafnyDiagnostic> Diagnostics => Compilation.GetDiagnostics(uri);
-  public VerificationTree? VerificationTree => Compilation.GetVerificationTree(uri);
+  public IEnumerable<FileDiagnostic> Diagnostics => IdeState.GetAllDiagnostics();
+  public VerificationTree? VerificationTree => IdeState.VerificationTrees.GetValueOrDefault(uri);
 }
diff --git a/Source/DafnyLanguageServer/Handlers/DafnyCompletionHandler.cs b/Source/DafnyLanguageServer/Handlers/DafnyCompletionHandler.cs
index 10f2fcc5e1e..56080190c1b 100644
--- a/Source/DafnyLanguageServer/Handlers/DafnyCompletionHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/DafnyCompletionHandler.cs
@@ -12,27 +12,30 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
 namespace Microsoft.Dafny.LanguageServer.Handlers {
   public class DafnyCompletionHandler : CompletionHandlerBase {
     private readonly ILogger<DafnyCompletionHandler> logger;
     private readonly IProjectDatabase projects;
+    private readonly LanguageServerFilesystem filesystem;
     private readonly ISymbolGuesser symbolGuesser;
     private DafnyOptions options;
 
     public DafnyCompletionHandler(ILogger<DafnyCompletionHandler> logger, IProjectDatabase projects,
-      ISymbolGuesser symbolGuesser, DafnyOptions options) {
+      ISymbolGuesser symbolGuesser, DafnyOptions options, LanguageServerFilesystem filesystem) {
       this.logger = logger;
       this.projects = projects;
       this.symbolGuesser = symbolGuesser;
       this.options = options;
+      this.filesystem = filesystem;
     }
 
     protected override CompletionRegistrationOptions CreateRegistrationOptions(CompletionCapability capability, ClientCapabilities clientCapabilities) {
       return new CompletionRegistrationOptions {
         DocumentSelector = DocumentSelector.ForLanguage("dafny"),
         ResolveProvider = false,
-        TriggerCharacters = new Container<string>(".")
+        TriggerCharacters = new Container<string>(".", "@")
       };
     }
 
@@ -44,12 +47,12 @@ public override Task<CompletionItem> Handle(CompletionItem request, Cancellation
 
     public override async Task<CompletionList> Handle(CompletionParams request, CancellationToken cancellationToken) {
       logger.LogDebug("Completion params received");
-      var document = await projects.GetResolvedDocumentAsyncNormalizeUri(request.TextDocument);
+      var document = await projects.GetResolvedDocumentAsyncInternal(request.TextDocument);
       if (document == null) {
         logger.LogWarning("location requested for unloaded document {DocumentUri}", request.TextDocument.Uri);
         return new CompletionList();
       }
-      return new CompletionProcessor(symbolGuesser, logger, document, request, cancellationToken, options).Process();
+      return new CompletionProcessor(symbolGuesser, logger, document, request, cancellationToken, options, filesystem).Process();
     }
 
     private class CompletionProcessor {
@@ -59,15 +62,18 @@ private class CompletionProcessor {
       private readonly IdeState state;
       private readonly CompletionParams request;
       private readonly CancellationToken cancellationToken;
+      private readonly LanguageServerFilesystem filesystem;
 
       public CompletionProcessor(ISymbolGuesser symbolGuesser, ILogger<DafnyCompletionHandler> logger, IdeState state,
-        CompletionParams request, CancellationToken cancellationToken, DafnyOptions options) {
+        CompletionParams request, CancellationToken cancellationToken, DafnyOptions options,
+        LanguageServerFilesystem filesystem) {
         this.symbolGuesser = symbolGuesser;
         this.state = state;
         this.request = request;
         this.cancellationToken = cancellationToken;
         this.options = options;
         this.logger = logger;
+        this.filesystem = filesystem;
       }
 
       public CompletionList Process() {
@@ -75,10 +81,14 @@ public CompletionList Process() {
           return CreateDotCompletionList();
         }
 
+        if (IsAtAttribute()) {
+          return CreateAtAttributeCompletionList();
+        }
+
         if (logger.IsEnabled(LogLevel.Trace)) {
-          var program = (Program)state.Program;
+          var program = (Program)state.ResolvedProgram!;
           var writer = new StringWriter();
-          var printer = new Printer(writer, DafnyOptions.Default);
+          var printer = new Printer(writer, state.Input.Options);
           printer.PrintProgram(program, true);
           logger.LogTrace($"Program:\n{writer}");
         }
@@ -86,9 +96,41 @@ public CompletionList Process() {
         return new CompletionList();
       }
 
+      private string GetLastTwoCharactersBeforePositionIncluded(TextBuffer text, DafnyPosition position) {
+        var index = text.ToIndex(position.GetLspPosition());
+        var indexTwoCharactersBefore = Math.Max(0, index - 2);
+        if (index > text.Text.Length) {
+          return "";
+        }
+
+        return text.Text.Substring(indexTwoCharactersBefore, index - indexTwoCharactersBefore);
+      }
+
       private bool IsDotExpression() {
         var node = state.Program.FindNode<INode>(request.TextDocument.Uri.ToUri(), request.Position.ToDafnyPosition());
-        return node?.RangeToken.EndToken.val == ".";
+        return node?.Origin.EndToken.val == ".";
+      }
+
+      private bool IsAtAttribute() {
+        var position = request.Position.ToDafnyPosition();
+        var fileContent = filesystem.GetBuffer(request.TextDocument.Uri.ToUri());
+        if (fileContent == null) {
+          // Impossible case because this only happens if the file is not opened.
+          return false;
+        }
+        var lastTwoChars = GetLastTwoCharactersBeforePositionIncluded(fileContent, position);
+        var isAtAttribute =
+          lastTwoChars == "@" ||
+          lastTwoChars.Length >= 2 && lastTwoChars[1] == '@' && char.IsWhiteSpace(lastTwoChars[0]);
+        return isAtAttribute;
+      }
+
+      private CompletionList CreateAtAttributeCompletionList() {
+        var completionItems =
+          Attributes.BuiltinAtAttributes.Select(b =>
+            CreateCompletionItem(b.Name)
+          ).ToList();
+        return new CompletionList(completionItems);
       }
 
       private CompletionList CreateDotCompletionList() {
@@ -122,6 +164,15 @@ private static bool IsConstructor(ILegacySymbol symbol) {
         return symbol is MethodSymbol method && method.Name == "_ctor";
       }
 
+      private CompletionItem CreateCompletionItem(string attributeName) {
+        return new CompletionItem {
+          Label = attributeName,
+          Kind = CompletionItemKind.Constructor,
+          InsertText = attributeName,
+          Detail = ""
+        };
+      }
+
       private CompletionItem CreateCompletionItem(ILegacySymbol symbol) {
         return new CompletionItem {
           Label = symbol.Name,
diff --git a/Source/DafnyLanguageServer/Handlers/DafnyDocumentSymbolHandler.cs b/Source/DafnyLanguageServer/Handlers/DafnyDocumentSymbolHandler.cs
index dc34b5a19c5..dc4ae7e7ad9 100644
--- a/Source/DafnyLanguageServer/Handlers/DafnyDocumentSymbolHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/DafnyDocumentSymbolHandler.cs
@@ -35,32 +35,40 @@ protected override DocumentSymbolRegistrationOptions CreateRegistrationOptions(D
     }
 
     public override async Task<SymbolInformationOrDocumentSymbolContainer> Handle(DocumentSymbolParams request, CancellationToken cancellationToken) {
-      var state = await projects.GetResolvedDocumentAsyncNormalizeUri(request.TextDocument);
+      var state = await projects.GetParsedDocumentNormalizeUri(request.TextDocument);
       if (state == null) {
         logger.LogWarning("symbols requested for unloaded document {DocumentUri}", request.TextDocument.Uri);
         return EmptySymbols;
       }
 
-      var fileNode = state.Program.FindNodesInUris(request.TextDocument.Uri.ToUri()).OfType<ISymbol>();
-      return fileNode.Select(topLevel => new SymbolInformationOrDocumentSymbol(FromSymbol(topLevel))).ToList();
+      var fileNodes = state.Program.FindNodesInUris(request.TextDocument.Uri.ToUri()).OfType<ISymbol>();
+      return fileNodes.SelectMany(FromSymbol).Select(s => new SymbolInformationOrDocumentSymbol(s)).ToList();
     }
 
-    private DocumentSymbol FromSymbol(ISymbol symbol) {
+    private IEnumerable<DocumentSymbol> FromSymbol(ISymbol symbol) {
       var documentation = (symbol as IHasDocstring)?.GetDocstring(serverOptions) ?? "";
       var children = new List<DocumentSymbol>();
       if (symbol is IHasSymbolChildren hasSymbolChildren) {
         foreach (var child in hasSymbolChildren.ChildSymbols) {
-          var childDocumentSymbol = FromSymbol(child);
-          children.Add(childDocumentSymbol);
+          var childDocumentSymbols = FromSymbol(child);
+          children.AddRange(childDocumentSymbols);
         }
       }
-      return new DocumentSymbol {
-        Children = children,
-        Name = symbol.NameToken.val,
-        Detail = documentation,
-        Range = symbol.RangeToken.ToLspRange(),
-        Kind = (SymbolKind)symbol.Kind,
-        SelectionRange = symbol.NameToken.ToRange().ToLspRange()
+
+      if (!symbol.Kind.HasValue || string.IsNullOrEmpty(symbol.NavigationToken.val)) {
+        return children;
+      }
+
+      var range = symbol.Origin.ToLspRange();
+      return new DocumentSymbol[] {
+        new() {
+          Children = children,
+          Name = symbol.NavigationToken.val,
+          Detail = documentation,
+          Range = range,
+          Kind = symbol.Kind.Value,
+          SelectionRange = symbol.NavigationToken == Token.NoToken ? range : symbol.NavigationToken.ToLspRange()
+        }
       };
     }
   }
diff --git a/Source/DafnyLanguageServer/Handlers/DafnyFormattingHandler.cs b/Source/DafnyLanguageServer/Handlers/DafnyFormattingHandler.cs
index 9750e95cb56..39ca15bdd89 100644
--- a/Source/DafnyLanguageServer/Handlers/DafnyFormattingHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/DafnyFormattingHandler.cs
@@ -30,7 +30,7 @@ protected override DocumentFormattingRegistrationOptions CreateRegistrationOptio
     if (projectManager == null) {
       return null;
     }
-    var edits = await projectManager.CompilationManager.GetTextEditToFormatCode(request.TextDocument.Uri.ToUri());
+    var edits = await projectManager.Compilation.GetTextEditToFormatCode(request.TextDocument.Uri.ToUri());
     return edits;
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Handlers/DafnyHoverHandler.cs b/Source/DafnyLanguageServer/Handlers/DafnyHoverHandler.cs
index 5b51120c2f2..68027538221 100644
--- a/Source/DafnyLanguageServer/Handlers/DafnyHoverHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/DafnyHoverHandler.cs
@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using Microsoft.Dafny.LanguageServer.Language.Symbols;
 using Microsoft.Dafny.LanguageServer.Workspace;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
@@ -12,10 +11,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Dafny.LanguageServer.Util;
 using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
-using EnsuresDescription = Microsoft.Dafny.ProofObligationDescription.EnsuresDescription;
 using RequiresDescription = Microsoft.Dafny.ProofObligationDescription.RequiresDescription;
 
 namespace Microsoft.Dafny.LanguageServer.Handlers {
@@ -23,16 +19,14 @@ public class DafnyHoverHandler : HoverHandlerBase {
     // TODO add the range of the name to the hover.
     private readonly ILogger logger;
     private readonly IProjectDatabase projects;
-    private DafnyOptions options;
 
     private const long RuLimitToBeOverCostly = 10000000;
     private const string OverCostlyMessage =
       " [⚠](https://dafny-lang.github.io/dafny/DafnyRef/DafnyRef#sec-verification-debugging-slow)";
 
-    public DafnyHoverHandler(ILogger<DafnyHoverHandler> logger, IProjectDatabase projects, DafnyOptions options) {
+    public DafnyHoverHandler(ILogger<DafnyHoverHandler> logger, IProjectDatabase projects) {
       this.logger = logger;
       this.projects = projects;
-      this.options = options;
     }
 
     protected override HoverRegistrationOptions CreateRegistrationOptions(HoverCapability capability, ClientCapabilities clientCapabilities) {
@@ -48,6 +42,15 @@ protected override HoverRegistrationOptions CreateRegistrationOptions(HoverCapab
         logger.LogWarning("the document {Document} is not loaded", request.TextDocument);
         return null;
       }
+      if (state.Status == CompilationStatus.ParsingFailed) {
+        return new Hover {
+          Contents = new MarkedStringsOrMarkupContent(new MarkupContent {
+            Kind = MarkupKind.Markdown,
+            Value = "No hover information available due to program error"
+          })
+        };
+      }
+
       var diagnosticHoverContent = GetDiagnosticsHover(state, request.TextDocument.Uri.ToUri(), request.Position, out var areMethodStatistics);
       var (symbol, symbolHoverContent) = GetStaticHoverContent(request, state);
       if (diagnosticHoverContent == null && symbolHoverContent == null) {
@@ -62,25 +65,12 @@ protected override HoverRegistrationOptions CreateRegistrationOptions(HoverCapab
     }
 
     private (ISymbol? symbol, string? symbolHoverContent) GetStaticHoverContent(HoverParams request, IdeState state) {
-      IDeclarationOrUsage? declarationOrUsage =
-        state.Program.FindNode<IDeclarationOrUsage>(request.TextDocument.Uri.ToUri(), request.Position.ToDafnyPosition());
-      ISymbol? symbol;
-
-      if (declarationOrUsage is IHasUsages usage) {
-        symbol = state.SymbolTable.UsageToDeclaration.GetValueOrDefault(usage) as ISymbol;
-      } else {
-        // If we hover over a usage, display the information of the declaration
-        symbol = declarationOrUsage as ISymbol;
-        if (symbol != null && !symbol.NameToken.ToRange().ToLspRange().Contains(request.Position)) {
-          symbol = null;
-        }
-      }
-
+      var symbol = state.SymbolTable.GetDeclarationNode(request.TextDocument.Uri.ToUri(), request.Position) as ISymbol;
       if (symbol == null) {
         logger.LogDebug("no symbol was found at {Position} in {Document}", request.Position, request.TextDocument);
       }
 
-      var symbolHoverContent = symbol != null ? CreateSymbolMarkdown(symbol) : null;
+      var symbolHoverContent = symbol != null ? CreateSymbolMarkdown(state.Input.Options, symbol) : null;
       return (symbol, symbolHoverContent);
     }
 
@@ -94,25 +84,20 @@ public int Compare(AssertionBatchIndex? key1, AssertionBatchIndex? key2) {
 
     private string? GetDiagnosticsHover(IdeState state, Uri uri, Position position, out bool areMethodStatistics) {
       areMethodStatistics = false;
-      var uriDiagnostics = state.GetDiagnostics().GetOrDefault(uri, Enumerable.Empty<Diagnostic>).ToList();
-      foreach (var diagnostic in uriDiagnostics) {
-        if (diagnostic.Range.Contains(position)) {
-          string? detail = ErrorRegistry.GetDetail(diagnostic.Code);
+      foreach (var diagnostic in state.GetAllDiagnostics()) {
+        if (diagnostic.Uri == uri && diagnostic.Diagnostic.Range.Contains(position)) {
+          string? detail = ErrorRegistry.GetDetail(diagnostic.Diagnostic.Code);
           if (detail is not null) {
             return detail;
           }
         }
       }
 
-      return GetVerificationHoverContent(state, uri, position, ref areMethodStatistics, uriDiagnostics);
+      return GetVerificationHoverContent(state, uri, position, ref areMethodStatistics);
     }
 
-    private string? GetVerificationHoverContent(IdeState state, Uri uri, Position position, ref bool areMethodStatistics,
-      List<Diagnostic> uriDiagnostics) {
-      if (uriDiagnostics.Any(diagnostic =>
-            diagnostic.Severity == DiagnosticSeverity.Error && (
-              diagnostic.Source == MessageSource.Parser.ToString() ||
-              diagnostic.Source == MessageSource.Resolver.ToString()))) {
+    private string? GetVerificationHoverContent(IdeState state, Uri uri, Position position, ref bool areMethodStatistics) {
+      if (state.Status != CompilationStatus.ResolutionSucceeded) {
         return null;
       }
 
@@ -134,6 +119,10 @@ public int Compare(AssertionBatchIndex? key1, AssertionBatchIndex? key2) {
             .Select(keyValuePair => keyValuePair.Value)
             .ToList();
 
+        // Put errors in the front. Put assertions with the highest resource count first
+        List<(string content, long resources)> errors = new();
+        List<(string content, long resources)> other = new();
+
         foreach (var assertionBatch in orderedAssertionBatches) {
           if (!assertionBatch.Range.Contains(position)) {
             continue;
@@ -144,18 +133,29 @@ public int Compare(AssertionBatchIndex? key1, AssertionBatchIndex? key2) {
           foreach (var assertionNode in assertions) {
             if (assertionNode.Range.Contains(position) ||
                 assertionNode.ImmediatelyRelatedRanges.Any(range => range.Contains(position))) {
-              if (information != "") {
-                information += "\n\n";
-              }
 
-              information += GetAssertionInformation(state, position, assertionNode, assertionBatch,
-                assertionIndex, assertionBatchCount, node);
+              var whereToAdd = assertionNode.StatusVerification == GutterVerificationStatus.Error ?
+                errors : other;
+              var content = GetAssertionInformation(state, position, assertionNode, assertionBatch,
+                                            assertionIndex, assertionBatchCount, node);
+              var resources = assertionBatch.ResourceCount;
+              whereToAdd.Add((content, resources));
             }
 
             assertionIndex++;
           }
         }
 
+        var biggerResourceCountFirst =
+          Comparer<(string content, long resources)>.Create(
+          (left, right) =>
+            right.resources.CompareTo(left.resources)
+        );
+        errors.Sort(biggerResourceCountFirst);
+        other.Sort(biggerResourceCountFirst);
+        errors.AddRange(other);
+        information = string.Join("\n\n", errors.Select(info => info.content));
+
         if (information != "") {
           return information;
         }
@@ -288,17 +288,19 @@ string MoreInformation(Boogie.IToken? token, bool hoveringPostcondition) {
         string deltaInformation = "";
         while (token != null) {
           var errorToken = token;
-          if (token is NestedToken nestedToken) {
+          if (token is NestedOrigin nestedToken) {
             errorToken = nestedToken.Outer;
             token = nestedToken.Inner;
           } else {
             token = null;
           }
+          var dafnyToken = BoogieGenerator.ToDafnyToken(true, errorToken);
 
           // It's not necessary to restate the postcondition itself if the user is already hovering it
           // however, nested postconditions should be displayed
-          if (errorToken is BoogieRangeToken rangeToken && !hoveringPostcondition) {
-            var originalText = rangeToken.PrintOriginal();
+
+          if (dafnyToken.IncludesRange && !hoveringPostcondition) {
+            var originalText = dafnyToken.PrintOriginal();
             deltaInformation += "  \n" + (token == null ? couldProveOrNotPrefix : "Inside ") + "`" + originalText + "`";
           }
 
@@ -318,7 +320,7 @@ string MoreInformation(Boogie.IToken? token, bool hoveringPostcondition) {
         } else {
           information += GetDescription(returnCounterexample.FailingReturn.Description);
         }
-        information += MoreInformation(returnCounterexample.FailingAssert.tok, currentlyHoveringPostcondition);
+        information += MoreInformation(returnCounterexample.FailingEnsures.tok, currentlyHoveringPostcondition);
       } else if (counterexample is CallCounterexample callCounterexample) {
         if (assertionNode.StatusVerification == GutterVerificationStatus.Error &&
             callCounterexample.FailingRequires.Description.SuccessDescription != "assertion always holds"
@@ -337,7 +339,7 @@ string MoreInformation(Boogie.IToken? token, bool hoveringPostcondition) {
         information += MoreInformation(assertEnsuresCmd.Ensures.tok, currentlyHoveringPostcondition);
       } else {
         information += GetDescription(assertCmd?.Description);
-        if (assertCmd?.tok is NestedToken) {
+        if (assertCmd?.tok is NestedOrigin) {
           information += MoreInformation(assertCmd.tok, currentlyHoveringPostcondition);
         }
       }
@@ -418,7 +420,7 @@ public static string FormatResourceCount(long nodeResourceCount) {
     }
 
     private static string AddAssertionBatchDocumentation(string batchReference) {
-      return $"[{batchReference}](https://dafny-lang.github.io/dafny/DafnyRef/DafnyRef#sec-verification-attributes-on-assert-statements)";
+      return $"[{batchReference}](https://dafny-lang.github.io/dafny/DafnyRef/DafnyRef#sec-assertion-batches)";
     }
 
     private static Hover CreateMarkdownHover(string information) {
@@ -432,7 +434,7 @@ private static Hover CreateMarkdownHover(string information) {
       };
     }
 
-    private string CreateSymbolMarkdown(ISymbol symbol) {
+    private string CreateSymbolMarkdown(DafnyOptions options, ISymbol symbol) {
       var docString = symbol is IHasDocstring nodeWithDocstring ? nodeWithDocstring.GetDocstring(options) : "";
       return (docString + $"\n```dafny\n{symbol.GetDescription(options)}\n```").TrimStart();
     }
diff --git a/Source/DafnyLanguageServer/Handlers/DafnyReferencesHandler.cs b/Source/DafnyLanguageServer/Handlers/DafnyReferencesHandler.cs
index e1043ca2cca..439464ec788 100644
--- a/Source/DafnyLanguageServer/Handlers/DafnyReferencesHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/DafnyReferencesHandler.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.Workspace;
@@ -35,9 +36,15 @@ public override async Task<LocationContainer> Handle(ReferenceParams request, Ca
 
       var requestUri = request.TextDocument.Uri.ToUri();
       var declaration = state.SymbolTable.GetDeclaration(requestUri, request.Position);
-      return declaration == null
-        ? new LocationContainer()
-        : LocationContainer.From(state.SymbolTable.GetUsages(declaration.Uri.ToUri(), declaration.Range.Start));
+      if (declaration == null) {
+        return new LocationContainer();
+      }
+
+      var usages = state.SymbolTable.GetReferences(declaration.Uri.ToUri(), declaration.Range.Start).ToList();
+      if (request.Context.IncludeDeclaration) {
+        usages.Add(declaration);
+      }
+      return LocationContainer.From(usages);
     }
   }
 }
diff --git a/Source/DafnyLanguageServer/Handlers/DafnyRenameHandler.cs b/Source/DafnyLanguageServer/Handlers/DafnyRenameHandler.cs
index 988f2fc7af4..49959112bc7 100644
--- a/Source/DafnyLanguageServer/Handlers/DafnyRenameHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/DafnyRenameHandler.cs
@@ -47,13 +47,17 @@ protected override RenameRegistrationOptions CreateRegistrationOptions(
         return null;
       }
 
-      var node = state.SymbolTable.GetNode(requestUri, request.Position);
-      if (node == null || node.NameToken.val == request.NewName) {
+      var node = state.SymbolTable.GetDeclarationNode(requestUri, request.Position);
+      if (node == null || node.NavigationToken.val == request.NewName) {
         return null;
       }
 
       var declaration = SymbolTable.NodeToLocation(node);
-      var usages = state.SymbolTable.GetUsages(declaration.Uri.ToUri(), declaration.Range.Start);
+      if (declaration == null) {
+        return null;
+      }
+
+      var usages = state.SymbolTable.GetReferences(declaration.Uri.ToUri(), declaration.Range.Start);
       var changes = usages
         .Append(declaration)
         .GroupBy(location => location.Uri)
diff --git a/Source/DafnyLanguageServer/Handlers/DafnySignatureHelpHandler.cs b/Source/DafnyLanguageServer/Handlers/DafnySignatureHelpHandler.cs
index ccb079c95e2..742e271b042 100644
--- a/Source/DafnyLanguageServer/Handlers/DafnySignatureHelpHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/DafnySignatureHelpHandler.cs
@@ -33,12 +33,12 @@ protected override SignatureHelpRegistrationOptions CreateRegistrationOptions(Si
 
     public override async Task<SignatureHelp?> Handle(SignatureHelpParams request, CancellationToken cancellationToken) {
       logger.LogDebug("received signature request for document {DocumentUri}", request.TextDocument.Uri);
-      var document = await projects.GetResolvedDocumentAsyncNormalizeUri(request.TextDocument);
-      if (document == null) {
+      var state = await projects.GetResolvedDocumentAsyncInternal(request.TextDocument);
+      if (state == null) {
         logger.LogWarning("location requested for unloaded document {DocumentUri}", request.TextDocument.Uri);
         return null;
       }
-      return new SignatureHelpProcessor(logger, symbolGuesser, document, request, cancellationToken, options).Process();
+      return new SignatureHelpProcessor(logger, symbolGuesser, state, request, cancellationToken, options).Process();
     }
 
     private class SignatureHelpProcessor {
diff --git a/Source/DafnyLanguageServer/Handlers/DafnyTextDocumentHandler.cs b/Source/DafnyLanguageServer/Handlers/DafnyTextDocumentHandler.cs
index 05455e30be0..c13b9e91a20 100644
--- a/Source/DafnyLanguageServer/Handlers/DafnyTextDocumentHandler.cs
+++ b/Source/DafnyLanguageServer/Handlers/DafnyTextDocumentHandler.cs
@@ -31,16 +31,16 @@ namespace Microsoft.Dafny.LanguageServer.Handlers {
   /// break the background processing if used.
   /// </remarks>
   public class DafnyTextDocumentHandler : TextDocumentSyncHandlerBase {
-    private const string LanguageId = "dafny";
+    private const string DafnyLanguage = "dafny";
 
     private readonly ILogger logger;
     private readonly IProjectDatabase projects;
-    private readonly ITelemetryPublisher telemetryPublisher;
+    private readonly TelemetryPublisherBase telemetryPublisher;
     private readonly INotificationPublisher notificationPublisher;
 
     public DafnyTextDocumentHandler(
       ILogger<DafnyTextDocumentHandler> logger, IProjectDatabase projects,
-      ITelemetryPublisher telemetryPublisher, INotificationPublisher notificationPublisher
+      TelemetryPublisherBase telemetryPublisher, INotificationPublisher notificationPublisher
     ) {
       this.logger = logger;
       this.projects = projects;
@@ -50,21 +50,27 @@ public DafnyTextDocumentHandler(
 
     protected override TextDocumentSyncRegistrationOptions CreateRegistrationOptions(SynchronizationCapability capability, ClientCapabilities clientCapabilities) {
       return new TextDocumentSyncRegistrationOptions {
-        DocumentSelector = DocumentSelector.ForLanguage(LanguageId),
+        DocumentSelector = new DocumentSelector(DocumentFilter.ForLanguage(DafnyLanguage), DocumentFilter.ForPattern("**/*dfyconfig.toml")),
         Change = TextDocumentSyncKind.Incremental
       };
     }
 
     public override TextDocumentAttributes GetTextDocumentAttributes(DocumentUri uri) {
-      return new TextDocumentAttributes(uri, LanguageId);
+      return new TextDocumentAttributes(uri, uri.Path.EndsWith(DafnyProject.FileName) ? "toml" : DafnyLanguage);
     }
 
     public override async Task<Unit> Handle(DidOpenTextDocumentParams notification, CancellationToken cancellationToken) {
       logger.LogDebug("received open notification {DocumentUri}", notification.TextDocument.Uri);
       try {
-        await projects.OpenDocument(new DocumentTextBuffer(notification.TextDocument));
+        await projects.OpenDocument(notification.TextDocument);
+      } catch (InvalidOperationException e) {
+        if (!e.Message.Contains("because it is already open")) {
+          telemetryPublisher.PublishUnhandledException(e);
+        }
+        throw;
       } catch (Exception e) {
         telemetryPublisher.PublishUnhandledException(e);
+        throw;
       }
 
       logger.LogDebug($"Finished opening document {notification.TextDocument.Uri}");
@@ -74,14 +80,14 @@ public override async Task<Unit> Handle(DidOpenTextDocumentParams notification,
     /// <summary>
     /// Can be called in parallel
     /// </summary>
-    public override async Task<Unit> Handle(DidCloseTextDocumentParams notification, CancellationToken cancellationToken) {
+    public override Task<Unit> Handle(DidCloseTextDocumentParams notification, CancellationToken cancellationToken) {
       logger.LogDebug("received close notification {DocumentUri}", notification.TextDocument.Uri);
       try {
-        await projects.CloseDocumentAsync(notification.TextDocument);
+        projects.CloseDocument(notification.TextDocument);
       } catch (Exception e) {
         telemetryPublisher.PublishUnhandledException(e);
       }
-      return Unit.Value;
+      return Task.FromResult(Unit.Value);
     }
 
     public override async Task<Unit> Handle(DidChangeTextDocumentParams notification, CancellationToken cancellationToken) {
diff --git a/Source/DafnyLanguageServer/Handlers/DafnyWorkspaceSymbolHandler.cs b/Source/DafnyLanguageServer/Handlers/DafnyWorkspaceSymbolHandler.cs
new file mode 100644
index 00000000000..c9ccfe26c66
--- /dev/null
+++ b/Source/DafnyLanguageServer/Handlers/DafnyWorkspaceSymbolHandler.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using OmniSharp.Extensions.LanguageServer.Protocol.Workspace;
+
+namespace Microsoft.Dafny.LanguageServer.Handlers {
+  public class DafnyWorkspaceSymbolHandler : WorkspaceSymbolsHandlerBase {
+    private readonly ILogger logger;
+    private readonly IProjectDatabase projects;
+    private readonly DafnyOptions dafnyOptions;
+
+    public DafnyWorkspaceSymbolHandler(ILogger<DafnyWorkspaceSymbolHandler> logger, IProjectDatabase projects, DafnyOptions dafnyOptions) {
+      this.logger = logger;
+      this.projects = projects;
+      this.dafnyOptions = dafnyOptions;
+    }
+
+    protected override WorkspaceSymbolRegistrationOptions CreateRegistrationOptions(WorkspaceSymbolCapability capability,
+      ClientCapabilities clientCapabilities) {
+      return new WorkspaceSymbolRegistrationOptions {
+        WorkDoneProgress = false
+      };
+    }
+
+    public override async Task<Container<SymbolInformation>?> Handle(WorkspaceSymbolParams request, CancellationToken cancellationToken) {
+      var queryText = request.Query.ToLower();
+      var result = new Dictionary<SymbolInformation, int>();
+      foreach (var projectManager in projects.Managers) {
+        cancellationToken.ThrowIfCancellationRequested();
+        var state = await projectManager.GetStateAfterParsingAsync();
+        foreach (var symbol in state.SymbolTable.Symbols) {
+          cancellationToken.ThrowIfCancellationRequested();
+
+          if (!symbol.Kind.HasValue) {
+            logger.LogWarning($"Definition without kind in symbol table: {symbol}");
+            continue;
+          }
+
+          // CreateLocation called below uses the .Uri field of Tokens which
+          // seems to occasionally be null while testing this from VSCode
+          if (symbol.NavigationToken == null || symbol.NavigationToken.Uri == null) {
+            logger.LogWarning($"Definition without name token in symbol table: {symbol}");
+            continue;
+          }
+
+          if (symbol.NavigationToken.val == null) {
+            logger.LogWarning($"Definition without name in symbol table: {symbol}");
+            continue;
+          }
+          if (AutoGeneratedOrigin.Is(symbol.NavigationToken)) {
+            continue;
+          }
+
+          // This matching could be improved by using the qualified name of the symbol here.
+          var name = symbol.NavigationToken.val!;
+          if (name.ToLower().Contains(queryText)) {
+            // The fewer extra characters there are in the string, the
+            // better the match.
+            var matchDistance = name.Length - queryText.Length;
+            result.TryAdd(new SymbolInformation {
+              Name = name,
+              ContainerName = symbol.Kind.ToString(),
+              Kind = symbol.Kind.Value,
+              Location = DiagnosticUtil.CreateLocation(symbol.NavigationToken)
+            }, matchDistance);
+          }
+        }
+      }
+
+      return result.OrderBy(kvPair => kvPair.Value).Select(kvPair => kvPair.Key).ToImmutableList();
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Handlers/LanguageServerExtensions.cs b/Source/DafnyLanguageServer/Handlers/LanguageServerExtensions.cs
index bbb742d8353..b7c9bba9ebd 100644
--- a/Source/DafnyLanguageServer/Handlers/LanguageServerExtensions.cs
+++ b/Source/DafnyLanguageServer/Handlers/LanguageServerExtensions.cs
@@ -1,6 +1,7 @@
 using Microsoft.Dafny.LanguageServer.Handlers.Custom;
-using OmniSharp.Extensions.JsonRpc;
+using Microsoft.Dafny.LanguageServer.Plugins;
 using OmniSharp.Extensions.LanguageServer.Server;
+using Microsoft.Boogie;
 
 namespace Microsoft.Dafny.LanguageServer.Handlers {
   /// <summary>
@@ -12,7 +13,11 @@ public static class LanguageServerExtensions {
     /// </summary>
     /// <param name="options">The language server where the handlers should be registered to.</param>
     /// <returns>The language server enriched with the dafny handlers.</returns>
-    public static LanguageServerOptions WithDafnyHandlers(this LanguageServerOptions options) {
+    public static LanguageServerOptions WithDafnyHandlers(this LanguageServerOptions options, DafnyOptions dafnyOptions) {
+      foreach (var plugin in dafnyOptions.Plugins) {
+        options = plugin is ConfiguredPlugin { Configuration: PluginConfiguration configuration } ?
+          configuration.WithPluginHandlers(options) : options;
+      }
       return options
         .WithHandler<DafnyTextDocumentHandler>()
         .WithHandler<DafnyDocumentSymbolHandler>()
@@ -25,7 +30,8 @@ public static LanguageServerOptions WithDafnyHandlers(this LanguageServerOptions
         .WithHandler<DafnyCounterExampleHandler>()
         .WithHandler<DafnyCodeActionHandler>()
         .WithHandler<DafnyFormattingHandler>()
-        .WithHandler<VerificationHandler>();
+        .WithHandler<VerificationHandler>()
+        .WithHandler<DafnyWorkspaceSymbolHandler>();
     }
   }
 }
diff --git a/Source/DafnyLanguageServer/Language/AssertionBatchCompletedObserver.cs b/Source/DafnyLanguageServer/Language/AssertionBatchCompletedObserver.cs
index 7c0a54bbe1c..9b59bf09a73 100644
--- a/Source/DafnyLanguageServer/Language/AssertionBatchCompletedObserver.cs
+++ b/Source/DafnyLanguageServer/Language/AssertionBatchCompletedObserver.cs
@@ -16,7 +16,7 @@ public OutputLogger(ILogger logger) {
   public void AdvisoryWriteLine(TextWriter writer, string format, params object[] args) {
   }
 
-  public void ReportEndVerifyImplementation(Implementation implementation, VerificationResult result) {
+  public void ReportEndVerifyImplementation(Implementation implementation, ImplementationRunResult result) {
   }
 
   public ExecutionEngineOptions? Options { get; set; }
diff --git a/Source/DafnyLanguageServer/Language/CacheExtensions.cs b/Source/DafnyLanguageServer/Language/CacheExtensions.cs
index 0b50e52047d..7475310fb94 100644
--- a/Source/DafnyLanguageServer/Language/CacheExtensions.cs
+++ b/Source/DafnyLanguageServer/Language/CacheExtensions.cs
@@ -1,26 +1,23 @@
 using System;
 using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Dafny.LanguageServer.Language;
 
 static class CacheExtensions {
-  public static T ProfileAndPruneCache<T, Key, Value>(this PruneIfNotUsedSinceLastPruneCache<Key, Value> cache,
-    Func<T> useCache, ITelemetryPublisher telemetryPublisher, string programName, string activity)
-    where Value : class where Key : notnull {
-    var beforeTotal = cache.Count;
-    var result = useCache();
-    var afterCount = cache.Count;
-    var added = afterCount - beforeTotal;
-    cache.Prune();
-    var hitsOrAdded = cache.Count;
-    var hits = hitsOrAdded - added;
-    telemetryPublisher.PublishTelemetry(ImmutableDictionary<string, object>.Empty.
-      Add("subject", "caching").
-      Add("activity", activity).
-      Add("resource", programName.ToString()).
-      Add("hits", hits).
-      Add("total", hitsOrAdded));
-    return result;
+  public static async Task<T> ProfileAndPruneCache<T, TKey, TValue>(this PruneIfNotUsedSinceLastPruneCache<TKey, TValue> cache,
+    Func<Task<T>> useCache, ILogger logger, TelemetryPublisherBase telemetryPublisher, string programName, string activity,
+    CancellationToken cancellationToken)
+    where TValue : class where TKey : notnull {
+    var result = await cache.UseAndPrune(useCache, cancellationToken);
+    telemetryPublisher.PublishTelemetry(ImmutableDictionary<string, object>.Empty.Add("subject", "caching")
+      .Add("activity", activity).Add("resource", programName).Add("hits", result.Hits).Add("pruned", result.Pruned)
+      .Add("total", result.Total));
+
+    return result.Result;
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Language/CachingParser.cs b/Source/DafnyLanguageServer/Language/CachingParser.cs
index 7322a37d3e6..9973bea5873 100644
--- a/Source/DafnyLanguageServer/Language/CachingParser.cs
+++ b/Source/DafnyLanguageServer/Language/CachingParser.cs
@@ -1,36 +1,45 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.Workspace;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Dafny.LanguageServer.Language;
 
 public class CachingParser : ProgramParser {
-  private readonly PruneIfNotUsedSinceLastPruneCache<byte[], DfyParseResult> parseCache = new(new HashEquality());
-  private readonly ITelemetryPublisher telemetryPublisher;
+  private readonly PruneIfNotUsedSinceLastPruneCache<byte[], DfyParseFileResult> parseCache = new(new HashEquality());
+  private readonly TelemetryPublisherBase telemetryPublisher;
 
   public CachingParser(ILogger<ProgramParser> logger,
     IFileSystem fileSystem,
-    ITelemetryPublisher telemetryPublisher) : base(logger, fileSystem) {
+    TelemetryPublisherBase telemetryPublisher) : base(logger, fileSystem) {
     this.telemetryPublisher = telemetryPublisher;
   }
 
-  public override Program ParseFiles(string programName, IReadOnlyList<DafnyFile> files, ErrorReporter errorReporter,
+  public override Task<ProgramParseResult> ParseFiles(string programName, IReadOnlyList<DafnyFile> files,
+    ErrorReporter errorReporter,
     CancellationToken cancellationToken) {
     return parseCache.ProfileAndPruneCache(() =>
       base.ParseFiles(programName, files, errorReporter, cancellationToken),
-      telemetryPublisher, programName, "parsing");
+      logger, telemetryPublisher, programName, "parsing", cancellationToken);
   }
 
-  protected override DfyParseResult ParseFile(DafnyOptions options, TextReader reader, Uri uri) {
-    var (newReader, hash) = ComputeHashFromReader(uri, reader, HashAlgorithm.Create("SHA256")!);
+  protected override DfyParseFileResult ParseFile(DafnyOptions options, FileSnapshot fileSnapshot,
+    Uri uri, CancellationToken cancellationToken) {
+    using var reader = fileSnapshot.Reader;
+
+    // Add NUL delimiter to avoid collisions (otherwise hash("A" + "BC") == hash("AB" + "C"))
+    var uriBytes = Encoding.UTF8.GetBytes(uri + "\0");
+
+    var (newReader, hash) = ComputeHashFromReader(uriBytes, reader, SHA256.Create()!);
     if (!parseCache.TryGet(hash, out var result)) {
       logger.LogDebug($"Parse cache miss for {uri}");
-      result = base.ParseFile(options, newReader, uri);
+      result = base.ParseFile(options, fileSnapshot with { Reader = newReader }, uri, cancellationToken);
       parseCache.Set(hash, result);
     } else {
       logger.LogDebug($"Parse cache hit for {uri}");
@@ -40,7 +49,8 @@ protected override DfyParseResult ParseFile(DafnyOptions options, TextReader rea
     // We should cache an immutable version of the AST instead: https://github.com/dafny-lang/dafny/issues/4086
     var cloner = new Cloner(true, false);
     var clonedResult = result! with {
-      Module = new FileModuleDefinition(cloner, result.Module)
+      Module = new FileModuleDefinition(cloner, result.Module),
+      Version = fileSnapshot.Version
     };
     return clonedResult;
   }
@@ -49,15 +59,14 @@ protected override DfyParseResult ParseFile(DafnyOptions options, TextReader rea
   /// We read the contents of the reader and store them in memory using chunks
   /// to prevent allocating a large array of memory.
   /// </summary>
-  private static (TextReader reader, byte[] hash) ComputeHashFromReader(Uri uri, TextReader reader, HashAlgorithm hashAlgorithm) {
+  private static (TextReader reader, byte[] hash) ComputeHashFromReader(byte[] startingBytes, TextReader reader, HashAlgorithm hashAlgorithm) {
     var result = new List<char[]>();
     const int chunkSize = 1024;
     hashAlgorithm.Initialize();
     // Add NUL delimiter to avoid collisions (otherwise hash("A" + "BC") == hash("AB" + "C"))
-    var uriBytes = Encoding.UTF8.GetBytes(uri.ToString() + "\0");
 
     // We need to include the uri as part of the hash, because the parsed AST contains tokens that refer to the filename. 
-    hashAlgorithm.TransformBlock(uriBytes, 0, uriBytes.Length, null, 0);
+    hashAlgorithm.TransformBlock(startingBytes, 0, startingBytes.Length, null, 0);
     while (true) {
       var chunk = new char[chunkSize];
       var readCount = reader.ReadBlock(chunk, 0, chunk.Length);
@@ -75,4 +84,4 @@ private static (TextReader reader, byte[] hash) ComputeHashFromReader(Uri uri, T
       result.Add(chunk);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Source/DafnyLanguageServer/Language/CachingResolver.cs b/Source/DafnyLanguageServer/Language/CachingResolver.cs
index 608149ac9ff..1418549d187 100644
--- a/Source/DafnyLanguageServer/Language/CachingResolver.cs
+++ b/Source/DafnyLanguageServer/Language/CachingResolver.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Threading;
+using System.Threading.Tasks;
 using MediatR;
 using Microsoft.Boogie;
 using Microsoft.Dafny.LanguageServer.Workspace;
@@ -15,21 +16,18 @@ public class ResolutionCache {
   public PruneIfNotUsedSinceLastPruneCache<byte[], ModuleResolutionResult> Modules { get; } = new(new HashEquality());
   public SystemModuleManager? Builtins { get; set; }
   public Dictionary<TopLevelDeclWithMembers, Dictionary<string, MemberDecl>>? SystemClassMembers { get; set; }
-
-  public void Prune() {
-    Modules.Prune();
-  }
 }
+
 public class CachingResolver : ProgramResolver {
   private readonly ILogger<CachingResolver> logger;
   private readonly Dictionary<ModuleDecl, byte[]> hashes = new();
   private readonly ResolutionCache cache;
-  private readonly ITelemetryPublisher telemetryPublisher;
+  private readonly TelemetryPublisherBase telemetryPublisher;
 
   public CachingResolver(
     Program program,
     ILogger<CachingResolver> logger,
-    ITelemetryPublisher telemetryPublisher,
+    TelemetryPublisherBase telemetryPublisher,
     ResolutionCache cache)
     : base(program) {
     this.logger = logger;
@@ -37,11 +35,11 @@ public CachingResolver(
     this.telemetryPublisher = telemetryPublisher;
   }
 
-  public override void Resolve(CancellationToken cancellationToken) {
-    cache.Modules.ProfileAndPruneCache(() => {
-      base.Resolve(cancellationToken);
-      return Unit.Value;
-    }, telemetryPublisher, Program.FullName, "resolution");
+  public override Task Resolve(CancellationToken cancellationToken) {
+    return cache.Modules.ProfileAndPruneCache(async () => {
+      await base.Resolve(cancellationToken);
+      return Task.FromResult(Unit.Value);
+    }, logger, telemetryPublisher, Program.FullName, "resolution", cancellationToken);
   }
 
   protected override Dictionary<TopLevelDeclWithMembers, Dictionary<string, MemberDecl>> ResolveSystemModule(Program program) {
@@ -64,8 +62,10 @@ protected override ModuleResolutionResult ResolveModuleDeclaration(CompilationDa
 
     if (!cache.Modules.TryGet(hash, out var result)) {
       logger.LogDebug($"Resolution cache miss for {decl}");
+      var beforeResolution = DateTime.Now;
       result = base.ResolveModuleDeclaration(compilation, decl);
       cache.Modules.Set(hash, result);
+      telemetryPublisher.PublishTime("ModuleResolution", decl.FullName, DateTime.Now - beforeResolution);
     } else {
       logger.LogDebug($"Resolution cache hit for {decl}");
     }
@@ -75,7 +75,7 @@ protected override ModuleResolutionResult ResolveModuleDeclaration(CompilationDa
   private byte[] GetHash(ModuleDecl moduleDeclaration) {
     if (!hashes.TryGetValue(moduleDeclaration, out var result)) {
       var moduleVertex = dependencies.FindVertex(moduleDeclaration);
-      var hashAlgorithm = HashAlgorithm.Create("SHA256")!;
+      var hashAlgorithm = SHA256.Create()!;
       hashAlgorithm.Initialize();
       // We don't want the order of Successors to influence the hash, so we order by the content hash, for which CloneId is currently a proxy
       var orderedSuccessors = moduleVertex.Successors.OrderBy(s => s.N.CloneId);
@@ -98,4 +98,4 @@ private byte[] GetHash(ModuleDecl moduleDeclaration) {
 
     return result;
   }
-}
\ No newline at end of file
+}
diff --git a/Source/DafnyLanguageServer/Language/DafnyLangParser.cs b/Source/DafnyLanguageServer/Language/DafnyLangParser.cs
index d88a29a0d11..5b26a0af34f 100644
--- a/Source/DafnyLanguageServer/Language/DafnyLangParser.cs
+++ b/Source/DafnyLanguageServer/Language/DafnyLangParser.cs
@@ -2,8 +2,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.Language.Symbols;
 using Microsoft.Dafny.LanguageServer.Workspace;
 
 namespace Microsoft.Dafny.LanguageServer.Language {
@@ -18,41 +19,29 @@ namespace Microsoft.Dafny.LanguageServer.Language {
   public sealed class DafnyLangParser : IDafnyParser {
     private readonly DafnyOptions options;
     private readonly IFileSystem fileSystem;
-    private readonly ITelemetryPublisher telemetryPublisher;
+    private readonly TelemetryPublisherBase telemetryPublisher;
     private readonly ILogger<DafnyLangParser> logger;
     private readonly SemaphoreSlim mutex = new(1);
     private readonly ProgramParser programParser;
 
-    public DafnyLangParser(DafnyOptions options, IFileSystem fileSystem, ITelemetryPublisher telemetryPublisher,
+    public DafnyLangParser(DafnyOptions options, IFileSystem fileSystem, TelemetryPublisherBase telemetryPublisher,
       ILogger<DafnyLangParser> logger, ILogger<CachingParser> innerParserLogger) {
       this.options = options;
       this.fileSystem = fileSystem;
       this.telemetryPublisher = telemetryPublisher;
       this.logger = logger;
-      programParser = options.Get(ServerCommand.UseCaching)
+      programParser = options.Get(DafnyLangSymbolResolver.UseCaching)
         ? new CachingParser(innerParserLogger, fileSystem, telemetryPublisher)
         : new ProgramParser(innerParserLogger, fileSystem);
     }
 
-    public Program Parse(Compilation compilation, ErrorReporter reporter, CancellationToken cancellationToken) {
-      mutex.Wait(cancellationToken);
+    public async Task<ProgramParseResult> Parse(Compilation compilation, CancellationToken cancellationToken) {
+      await mutex.WaitAsync(cancellationToken);
 
+      var rootFiles = await compilation.RootFiles;
       var beforeParsing = DateTime.Now;
       try {
-        var rootSourceUris = compilation.RootUris;
-        List<DafnyFile> dafnyFiles = new();
-        foreach (var rootSourceUri in rootSourceUris) {
-          try {
-            dafnyFiles.Add(new DafnyFile(reporter.Options, rootSourceUri, fileSystem.ReadFile(rootSourceUri)));
-            if (logger.IsEnabled(LogLevel.Trace)) {
-              logger.LogTrace($"Parsing file with uri {rootSourceUri} and content\n{fileSystem.ReadFile(rootSourceUri).ReadToEnd()}");
-            }
-          } catch (IOException) {
-            logger.LogError($"Tried to parse file {rootSourceUri} that could not be found");
-          }
-        }
-
-        return programParser.ParseFiles(compilation.Project.ProjectName, dafnyFiles, reporter, cancellationToken);
+        return await programParser.ParseFiles(compilation.Project.ProjectName, rootFiles, compilation.Reporter, cancellationToken);
       }
       finally {
         telemetryPublisher.PublishTime("Parse", compilation.Project.Uri.ToString(), DateTime.Now - beforeParsing);
diff --git a/Source/DafnyLanguageServer/Language/DafnyProgramVerifier.cs b/Source/DafnyLanguageServer/Language/DafnyProgramVerifier.cs
index 8dd4a4e9f4c..4fbd978f122 100644
--- a/Source/DafnyLanguageServer/Language/DafnyProgramVerifier.cs
+++ b/Source/DafnyLanguageServer/Language/DafnyProgramVerifier.cs
@@ -1,13 +1,12 @@
 using Microsoft.Boogie;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using DafnyCore;
 using Microsoft.Dafny.LanguageServer.Workspace;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny.LanguageServer.Language {
   /// <summary>
@@ -27,44 +26,43 @@ public DafnyProgramVerifier(ILogger<DafnyProgramVerifier> logger) {
       this.logger = logger;
     }
 
-    public async Task<IReadOnlyList<IImplementationTask>> GetVerificationTasksAsync(ExecutionEngine engine,
-      CompilationAfterResolution compilation,
+    public async Task<IReadOnlyList<IVerificationTask>> GetVerificationTasksAsync(ExecutionEngine engine,
+      ResolutionResult resolution,
       ModuleDefinition moduleDefinition,
       CancellationToken cancellationToken) {
 
-      var verifiableModules = Translator.VerifiableModules(compilation.Program);
-      if (!verifiableModules.Contains(moduleDefinition)) {
+      if (!BoogieGenerator.ShouldVerifyModule(resolution.ResolvedProgram, moduleDefinition)) {
         throw new Exception("tried to get verification tasks for a module that is not verified");
       }
 
       await mutex.WaitAsync(cancellationToken);
       try {
 
-        var program = compilation.Program;
-        var errorReporter = (DiagnosticErrorReporter)program.Reporter;
+        var program = resolution.ResolvedProgram;
+        var errorReporter = (ObservableErrorReporter)program.Reporter;
 
         cancellationToken.ThrowIfCancellationRequested();
 
         var boogieProgram = await DafnyMain.LargeStackFactory.StartNew(() => {
           Type.ResetScopes();
-          var translatorFlags = new Translator.TranslatorFlags(errorReporter.Options) {
+          var translatorFlags = new BoogieGenerator.TranslatorFlags(errorReporter.Options) {
             InsertChecksums = 0 < engine.Options.VerifySnapshots,
-            ReportRanges = true
+            ReportRanges = program.Options.Get(Snippets.ShowSnippets)
           };
-          var translator = new Translator(errorReporter, translatorFlags);
-          return translator.DoTranslation(compilation.Program, moduleDefinition);
+          var translator = new BoogieGenerator(errorReporter, resolution.ResolvedProgram.ProofDependencyManager, translatorFlags);
+          return translator.DoTranslation(resolution.ResolvedProgram, moduleDefinition);
         }, cancellationToken);
         var suffix = moduleDefinition.SanitizedName;
 
         cancellationToken.ThrowIfCancellationRequested();
 
         if (engine.Options.PrintFile != null) {
-          var moduleCount = Translator.VerifiableModules(program).Count();
+          var moduleCount = BoogieGenerator.VerifiableModules(program).Count();
           var fileName = moduleCount > 1 ? DafnyMain.BoogieProgramSuffix(engine.Options.PrintFile, suffix) : engine.Options.PrintFile;
           ExecutionEngine.PrintBplFile(engine.Options, fileName, boogieProgram, false, false, engine.Options.PrettyPrint);
         }
 
-        return engine.GetImplementationTasks(boogieProgram);
+        return await engine.GetVerificationTasks(boogieProgram, cancellationToken);
       }
       finally {
         mutex.Release();
diff --git a/Source/DafnyLanguageServer/Language/DiagnosticErrorReporter.cs b/Source/DafnyLanguageServer/Language/DiagnosticErrorReporter.cs
deleted file mode 100644
index bb421dcf716..00000000000
--- a/Source/DafnyLanguageServer/Language/DiagnosticErrorReporter.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer.Util;
-using OmniSharp.Extensions.LanguageServer.Protocol;
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using VCGeneration;
-
-namespace Microsoft.Dafny.LanguageServer.Language {
-  public class DiagnosticErrorReporter : ErrorReporter {
-    private const MessageSource VerifierMessageSource = MessageSource.Verifier;
-    private const string RelatedLocationCategory = "Related location";
-    private const string RelatedLocationMessage = RelatedLocationCategory;
-
-    private readonly Uri entryUri;
-    private readonly Dictionary<Uri, List<DafnyDiagnostic>> diagnostics = new();
-    private readonly Dictionary<ErrorLevel, int> counts = new();
-    private readonly Dictionary<ErrorLevel, int> countsNotVerificationOrCompiler = new();
-    private readonly ReaderWriterLockSlim rwLock = new();
-
-    /// <summary>
-    /// Creates a new instance with the given uri of the entry document.
-    /// </summary>
-    /// <param name="entryUri">The entry document's uri.</param>
-    /// <remarks>
-    /// The uri of the entry document is necessary to report general compiler errors as part of this document.
-    /// </remarks>
-    public DiagnosticErrorReporter(DafnyOptions options, Uri entryUri) : base(options) {
-      this.entryUri = entryUri;
-    }
-
-    public IReadOnlyDictionary<Uri, List<DafnyDiagnostic>> AllDiagnosticsCopy => diagnostics.ToImmutableDictionary();
-
-    public IReadOnlyList<DafnyDiagnostic> GetDiagnostics(DocumentUri documentUri) {
-      rwLock.EnterReadLock();
-      try {
-        // Concurrency: Return a copy of the list not to expose a reference to an object that requires synchronization.
-        // LATER: Make the Diagnostic type immutable, since we're not protecting it from concurrent accesses
-        return new List<DafnyDiagnostic>(
-          diagnostics.GetValueOrDefault(documentUri.ToUri()) ??
-          Enumerable.Empty<DafnyDiagnostic>());
-      }
-      finally {
-        rwLock.ExitReadLock();
-      }
-    }
-
-    public void ReportBoogieError(ErrorInformation error) {
-      var relatedInformation = new List<DafnyRelatedInformation>();
-      foreach (var auxiliaryInformation in error.Aux) {
-        if (auxiliaryInformation.Category == RelatedLocationCategory) {
-          relatedInformation.AddRange(CreateDiagnosticRelatedInformationFor(Translator.ToDafnyToken(auxiliaryInformation.Tok), auxiliaryInformation.Msg));
-        } else {
-          // The execution trace is an additional auxiliary which identifies itself with
-          // line=0 and character=0. These positions cause errors when exposing them, Furthermore,
-          // the execution trace message appears to not have any interesting information.
-          if (auxiliaryInformation.Tok.line > 0) {
-            Info(VerifierMessageSource, Translator.ToDafnyToken(auxiliaryInformation.Tok), auxiliaryInformation.Msg);
-          }
-        }
-      }
-
-      if (error.Tok is NestedToken { Inner: var innerToken }) {
-        relatedInformation.AddRange(CreateDiagnosticRelatedInformationFor(innerToken, "Related location"));
-      }
-
-      var dafnyToken = Translator.ToDafnyToken(error.Tok);
-      var uri = GetDocumentUriOrDefault(dafnyToken);
-      var dafnyDiagnostic = new DafnyDiagnostic(null, dafnyToken, error.Msg,
-        VerifierMessageSource, ErrorLevel.Error, relatedInformation);
-      AddDiagnosticForFile(
-        dafnyDiagnostic,
-        VerifierMessageSource,
-        uri
-      );
-    }
-
-    public static readonly string PostConditionFailingMessage = new ProofObligationDescription.EnsuresDescription(null, null).FailureDescription;
-
-    public static string FormatRelated(string related) {
-      return $"could not prove: {related}";
-    }
-
-    private IEnumerable<DafnyRelatedInformation> CreateDiagnosticRelatedInformationFor(IToken token, string message) {
-      var (tokenForMessage, inner) = token is NestedToken nestedToken ? (nestedToken.Outer, nestedToken.Inner) : (token, null);
-      if (tokenForMessage is BoogieRangeToken range) {
-        if (message == PostConditionFailingMessage) {
-          var postcondition = range.PrintOriginal();
-          message = $"this postcondition could not be proved: {postcondition}";
-        } else if (message == "Related location") {
-          message = FormatRelated(range.PrintOriginal());
-        }
-      }
-
-      yield return new DafnyRelatedInformation(token, message);
-      if (inner != null) {
-        foreach (var nestedInformation in CreateDiagnosticRelatedInformationFor(inner, RelatedLocationMessage)) {
-          yield return nestedInformation;
-        }
-      }
-    }
-
-    public override bool Message(MessageSource source, ErrorLevel level, string? errorId, IToken rootTok, string msg) {
-      if (ErrorsOnly && level != ErrorLevel.Error) {
-        return false;
-      }
-      var relatedInformation = new List<DafnyRelatedInformation>();
-      var tok = rootTok;
-      while (tok is NestedToken nestedToken) {
-        tok = nestedToken.Inner;
-        if (!(tok is RangeToken)) {
-          relatedInformation.AddRange(
-            CreateDiagnosticRelatedInformationFor(
-              tok, nestedToken.Message ?? "Related location")
-          );
-          break;
-        }
-      }
-
-      var dafnyDiagnostic = new DafnyDiagnostic(errorId, rootTok, msg, source, level, relatedInformation);
-      AddDiagnosticForFile(dafnyDiagnostic, source, GetDocumentUriOrDefault(rootTok));
-      return true;
-    }
-
-    public override int Count(ErrorLevel level) {
-      rwLock.EnterReadLock();
-      try {
-        return counts.GetValueOrDefault(level, 0);
-      }
-      finally {
-        rwLock.ExitReadLock();
-      }
-    }
-
-    public override int CountExceptVerifierAndCompiler(ErrorLevel level) {
-      rwLock.EnterReadLock();
-      try {
-        return countsNotVerificationOrCompiler.GetValueOrDefault(level, 0);
-      }
-      finally {
-        rwLock.ExitReadLock();
-      }
-    }
-
-    private void AddDiagnosticForFile(DafnyDiagnostic dafnyDiagnostic, MessageSource messageSource, DocumentUri documentUri) {
-      rwLock.EnterWriteLock();
-      try {
-        counts[dafnyDiagnostic.Level] = counts.GetValueOrDefault(dafnyDiagnostic.Level, 0) + 1;
-        if (messageSource != MessageSource.Verifier && messageSource != MessageSource.Compiler) {
-          countsNotVerificationOrCompiler[dafnyDiagnostic.Level] =
-            countsNotVerificationOrCompiler.GetValueOrDefault(dafnyDiagnostic.Level, 0) + 1;
-        }
-        diagnostics.GetOrCreate(documentUri.ToUri(), () => new List<DafnyDiagnostic>()).Add(dafnyDiagnostic);
-      }
-      finally {
-        rwLock.ExitWriteLock();
-      }
-    }
-
-    private DocumentUri GetDocumentUriOrDefault(IToken token) {
-      return token.Filepath == null
-        ? DocumentUri.From(entryUri)
-        : token.GetDocumentUri();
-    }
-  }
-}
diff --git a/Source/DafnyLanguageServer/Language/ErrorMessageDafnyCodeActionProvider.cs b/Source/DafnyLanguageServer/Language/ErrorMessageDafnyCodeActionProvider.cs
index 02f3a06fb99..3aecbd59b9f 100644
--- a/Source/DafnyLanguageServer/Language/ErrorMessageDafnyCodeActionProvider.cs
+++ b/Source/DafnyLanguageServer/Language/ErrorMessageDafnyCodeActionProvider.cs
@@ -1,9 +1,10 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Dafny.LanguageServer.Handlers;
 using Microsoft.Dafny.LanguageServer.Plugins;
+using Microsoft.Dafny.LanguageServer.Util;
 using Microsoft.Dafny.LanguageServer.Workspace;
-using Newtonsoft.Json.Linq;
+using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
@@ -11,16 +12,25 @@ namespace Microsoft.Dafny.LanguageServer;
 public class ErrorMessageDafnyCodeActionProvider : DiagnosticDafnyCodeActionProvider {
 
   protected override IEnumerable<DafnyCodeAction>? GetDafnyCodeActions(IDafnyCodeActionInput input,
-    DafnyDiagnostic diagnostic, Range selection) {
-    var actionSigs = ErrorRegistry.GetAction(diagnostic.ErrorId);
+    Diagnostic diagnostic, Range selection) {
+    if (diagnostic.Code is not { IsString: true }) {
+      return Enumerable.Empty<DafnyCodeAction>();
+    }
+    var actionSigs = ErrorRegistry.GetAction(diagnostic.Code.Value.String);
     var actions = new List<DafnyCodeAction>();
     if (actionSigs != null) {
-      var range = diagnostic.Token.ToRange();
+      var range = FindTokenRangeFromLspRange(input, diagnostic.Range);
+      if (range == null) {
+        return actions;
+      }
       foreach (var sig in actionSigs) {
         var dafnyActions = sig(range);
-        actions.AddRange(dafnyActions.Select(dafnyAction => new InstantDafnyCodeAction(dafnyAction.Title, new[] { diagnostic.ToLspDiagnostic() }, dafnyAction.Edits)));
+        actions.AddRange(dafnyActions.Select(dafnyAction => new InstantDafnyCodeAction(dafnyAction.Title, new[] { diagnostic }, dafnyAction.Edits)));
       }
     }
     return actions;
   }
+
+  public ErrorMessageDafnyCodeActionProvider(ILogger<DafnyCodeActionHandler> logger) : base(logger) {
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Language/GhostStateDiagnosticCollector.cs b/Source/DafnyLanguageServer/Language/GhostStateDiagnosticCollector.cs
index e0ffa4ae9bc..622875697c9 100644
--- a/Source/DafnyLanguageServer/Language/GhostStateDiagnosticCollector.cs
+++ b/Source/DafnyLanguageServer/Language/GhostStateDiagnosticCollector.cs
@@ -5,6 +5,7 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.CommandLine;
 using System.Linq;
 using System.Threading;
 using Microsoft.Extensions.Logging;
@@ -20,22 +21,28 @@ namespace Microsoft.Dafny.LanguageServer.Language {
   /// diagnostics may overlap with each other, creating a large list of hover texts.
   /// </remarks>
   public class GhostStateDiagnosticCollector : IGhostStateDiagnosticCollector {
+
+    public static readonly Option<bool> GhostIndicators = new("--notify-ghostness",
+      @"
+(experimental, API will change)
+Send notifications that indicate which lines are ghost.".TrimStart());
+
     private const string GhostStatementMessage = "Ghost statement";
 
     private readonly DafnyOptions options;
-    private readonly ILogger<GhostStateDiagnosticCollector> logger;
-    public GhostStateDiagnosticCollector(DafnyOptions options, ILogger<GhostStateDiagnosticCollector> logger) {
+    private readonly ILogger logger;
+    public GhostStateDiagnosticCollector(DafnyOptions options, ILogger logger) {
       this.options = options;
       this.logger = logger;
     }
 
     public IReadOnlyDictionary<Uri, IReadOnlyList<Range>> GetGhostStateDiagnostics(
       LegacySignatureAndCompletionTable signatureAndCompletionTable, CancellationToken cancellationToken) {
-      if (!options.Get(ServerCommand.GhostIndicators)) {
+      if (!options.Get(GhostIndicators)) {
         return ImmutableDictionary<Uri, IReadOnlyList<Range>>.Empty;
       }
 
-      if (signatureAndCompletionTable.CompilationUnit.Program.Reporter.HasErrors) {
+      if (signatureAndCompletionTable.CompilationUnit.Program.Reporter.FailCompilation) {
         return ImmutableDictionary<Uri, IReadOnlyList<Range>>.Empty; // TODO improve?
       }
       try {
@@ -59,12 +66,12 @@ public GhostStateSyntaxTreeVisitor(CancellationToken cancellationToken) {
         this.cancellationToken = cancellationToken;
       }
 
-      public override void VisitUnknown(object node, IToken token) { }
+      public override void VisitUnknown(object node, IOrigin token) { }
 
       public override void Visit(Statement statement) {
         cancellationToken.ThrowIfCancellationRequested();
         if (IsGhostStatementToMark(statement)) {
-          var list = GhostDiagnostics.GetOrCreate(statement.Tok.Uri, () => new List<Range>());
+          var list = GhostDiagnostics.GetOrCreate(statement.Origin.Uri, () => new List<Range>());
           list.Add(GetRange(statement));
         } else {
           base.Visit(statement);
@@ -72,38 +79,38 @@ public override void Visit(Statement statement) {
       }
 
       private bool IsGhostStatementToMark(Statement statement) {
-        return statement.IsGhost && statement.Tok.line > 0;
+        return statement.IsGhost && statement.Origin.line > 0;
       }
 
       private static Range GetRange(Statement statement) {
         return statement switch {
-          UpdateStmt updateStatement => GetRange(updateStatement),
-          _ => CreateRange(statement.RangeToken.StartToken, statement.RangeToken.EndToken)
+          AssignStatement updateStatement => GetRange(updateStatement),
+          _ => CreateRange(statement.Origin.StartToken, statement.Origin.EndToken)
         };
       }
 
-      private static Range GetRange(UpdateStmt updateStatement) {
-        IToken startToken;
+      private static Range GetRange(AssignStatement updateStatement) {
+        IOrigin startToken;
         if (updateStatement.Lhss.Count > 0) {
-          startToken = updateStatement.Lhss[0].tok;
+          startToken = updateStatement.Lhss[0].Origin;
         } else if (updateStatement.ResolvedStatements.Count > 0) {
           // This branch handles the case where the UpdateStmt consists of an CallStmt without of left hand side.
           // otherwise, we'd only mark parentheses and the semi-colon of the CallStmt. 
           startToken = GetStartTokenFromResolvedStatement(updateStatement.ResolvedStatements[0]);
         } else {
-          startToken = updateStatement.Tok;
+          startToken = updateStatement.Origin;
         }
-        return CreateRange(startToken, updateStatement.RangeToken.EndToken);
+        return CreateRange(startToken, updateStatement.Origin.EndToken);
       }
 
-      private static IToken GetStartTokenFromResolvedStatement(Statement resolvedStatement) {
+      private static IOrigin GetStartTokenFromResolvedStatement(Statement resolvedStatement) {
         return resolvedStatement switch {
-          CallStmt callStatement => callStatement.MethodSelect.tok,
-          _ => resolvedStatement.Tok
+          CallStmt callStatement => callStatement.MethodSelect.Origin,
+          _ => resolvedStatement.Origin
         };
       }
 
-      private static Range CreateRange(IToken startToken, IToken endToken) {
+      private static Range CreateRange(IOrigin startToken, IOrigin endToken) {
         var endPosition = endToken.GetLspPosition();
         return new Range(
           startToken.GetLspPosition(),
diff --git a/Source/DafnyLanguageServer/Language/IDafnyParser.cs b/Source/DafnyLanguageServer/Language/IDafnyParser.cs
deleted file mode 100644
index 3f4ed95439a..00000000000
--- a/Source/DafnyLanguageServer/Language/IDafnyParser.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using System.Threading;
-using Microsoft.Dafny.LanguageServer.Workspace;
-using OmniSharp.Extensions.LanguageServer.Protocol.Document;
-
-namespace Microsoft.Dafny.LanguageServer.Language {
-  /// <summary>
-  /// Interface exposing parse methods to generate a syntax tree out of an arbitrary dafny source.
-  /// </summary>
-  /// <remarks>
-  /// Any implementation has to guarantee thread-safety of its public members.
-  /// </remarks>
-  public interface IDafnyParser {
-    Program Parse(Compilation compilation, ErrorReporter reporter,
-      CancellationToken cancellationToken);
-  }
-}
diff --git a/Source/DafnyLanguageServer/Language/IProgramVerifier.cs b/Source/DafnyLanguageServer/Language/IProgramVerifier.cs
deleted file mode 100644
index 173f0e650a3..00000000000
--- a/Source/DafnyLanguageServer/Language/IProgramVerifier.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer.Workspace;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using VC;
-
-namespace Microsoft.Dafny.LanguageServer.Language {
-  public record AssertionBatchResult(Implementation Implementation, VCResult Result);
-
-  public record ProgramVerificationTasks(IReadOnlyList<IImplementationTask> Tasks);
-
-  /// <summary>
-  /// Implementations of this interface are responsible to verify the correctness of a program.
-  /// </summary>
-  public interface IProgramVerifier {
-    /// <summary>
-    /// Applies the program verification to the specified dafny program.
-    /// </summary>
-    /// <param name="engine"></param>
-    /// <param name="compilation">The dafny document to verify.</param>
-    /// <param name="moduleDefinition"></param>
-    /// <param name="cancellationToken"></param>
-    /// <param name="progressReporter"></param>
-    /// <returns>The result of the verification run.</returns>
-    /// <exception cref="System.OperationCanceledException">Thrown when the cancellation was requested before completion.</exception>
-    /// <exception cref="System.ObjectDisposedException">Thrown if the cancellation token was disposed before the completion.</exception>
-    Task<IReadOnlyList<IImplementationTask>> GetVerificationTasksAsync(ExecutionEngine engine,
-      CompilationAfterResolution compilation,
-      ModuleDefinition moduleDefinition,
-      CancellationToken cancellationToken);
-  }
-}
diff --git a/Source/DafnyLanguageServer/Language/IVerificationProgressReporter.cs b/Source/DafnyLanguageServer/Language/IVerificationProgressReporter.cs
deleted file mode 100644
index b0f13d032ac..00000000000
--- a/Source/DafnyLanguageServer/Language/IVerificationProgressReporter.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer.Workspace;
-
-namespace Microsoft.Dafny.LanguageServer.Language {
-  /// <summary>
-  /// A callback interface to report verification progress
-  /// </summary>
-  public interface IVerificationProgressReporter {
-    void RecomputeVerificationTrees(CompilationAfterResolution compilation);
-    void ReportRealtimeDiagnostics(CompilationAfterParsing compilation, Uri uri, bool verificationStarted);
-
-    void ReportImplementationsBeforeVerification(CompilationAfterResolution compilation, ICanVerify canVerify, Implementation[] implementations);
-    void ReportVerifyImplementationRunning(CompilationAfterResolution compilation, Implementation implToken);
-    void ReportAssertionBatchResult(CompilationAfterResolution compilation, AssertionBatchResult batchResult);
-    void ReportEndVerifyImplementation(CompilationAfterResolution compilation, Implementation implToken, VerificationResult verificationResult);
-    void SetAllUnvisitedMethodsAsVerified(CompilationAfterResolution compilation, ICanVerify canVerify);
-  }
-}
diff --git a/Source/DafnyLanguageServer/Language/ImplicitFailingAssertionCodeActionProvider.cs b/Source/DafnyLanguageServer/Language/ImplicitFailingAssertionCodeActionProvider.cs
index 7dcbe1d6a90..ca0fd8b2726 100644
--- a/Source/DafnyLanguageServer/Language/ImplicitFailingAssertionCodeActionProvider.cs
+++ b/Source/DafnyLanguageServer/Language/ImplicitFailingAssertionCodeActionProvider.cs
@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
+using Microsoft.Dafny.LanguageServer.Handlers;
 using Microsoft.Dafny.LanguageServer.Plugins;
 using Microsoft.Dafny.LanguageServer.Workspace;
 using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
+using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
@@ -16,14 +18,14 @@ namespace Microsoft.Dafny.LanguageServer.Language;
 /// indicated on the '{' -- meaning there is no explicit return.
 /// </summary>
 class ImplicitFailingAssertionCodeActionProvider : DiagnosticDafnyCodeActionProvider {
-  private DafnyOptions options;
+  private readonly DafnyOptions options;
 
-  public ImplicitFailingAssertionCodeActionProvider(DafnyOptions options) {
+  public ImplicitFailingAssertionCodeActionProvider(ILogger<DafnyCodeActionHandler> logger, DafnyOptions options) : base(logger) {
     this.options = options;
   }
 
   protected static List<INode>? FindInnermostNodeIntersecting(INode node, Range range) {
-    if (node.StartToken.line > 0 && !node.RangeToken.ToLspRange().Intersects(range)) {
+    if (node.StartToken.line > 0 && !node.Origin.ToLspRange().Intersects(range)) {
       return null;
     }
 
@@ -46,7 +48,7 @@ class ExplicitAssertionDafnyCodeAction : DafnyCodeAction {
 
     public ExplicitAssertionDafnyCodeAction(
       DafnyOptions options,
-      Dafny.Program program,
+      Node program,
       Expression failingImplicitAssertion,
       Range selection
       ) : base("Insert explicit failing assertion") {
@@ -70,7 +72,8 @@ public override IEnumerable<DafnyCodeActionEdit> GetEdits() {
         var node = nodesTillFailure[i];
         var nextNode = i < nodesTillFailure.Count - 1 ? nodesTillFailure[i + 1] : null;
         if (node is Statement or LetExpr &&
-            node is not UpdateStmt && nextNode is not VarDeclStmt && nextNode is not AssignSuchThatStmt) {
+            ((node is AssignStatement or AssignSuchThatStmt && nextNode is not VarDeclStmt) ||
+            (node is not AssignStatement && nextNode is not VarDeclStmt && nextNode is not AssignSuchThatStmt))) {
           insertionNode = node;
           break;
         }
@@ -110,8 +113,8 @@ public override IEnumerable<DafnyCodeActionEdit> GetEdits() {
   }
 
   protected override IEnumerable<DafnyCodeAction>? GetDafnyCodeActions(IDafnyCodeActionInput input,
-    DafnyDiagnostic diagnostic, Range selection) {
-    if (input.Program == null || diagnostic.Source != MessageSource.Verifier) {
+    Diagnostic diagnostic, Range selection) {
+    if (input.Program == null || diagnostic.Source != MessageSource.Verifier.ToString()) {
       return null;
     }
 
@@ -121,9 +124,11 @@ public override IEnumerable<DafnyCodeActionEdit> GetEdits() {
           assertTree.Finished &&
             assertTree.Range.Intersects(selection) &&
             assertTree.StatusVerification is GutterVerificationStatus.Error or GutterVerificationStatus.Inconclusive &&
-            assertTree.GetAssertion()?.Description is ProofObligationDescription.ProofObligationDescription description &&
+            assertTree.GetAssertion()?.Description is ProofObligationDescription description &&
             description.GetAssertedExpr(options) is { } assertedExpr) {
-        failingExpressions.Add(assertedExpr);
+        if (description.IsImplicit) {
+          failingExpressions.Add(assertedExpr);
+        }
       }
     });
     if (failingExpressions.Count == 0) {
diff --git a/Source/DafnyLanguageServer/Language/LanguageServerExtensions.cs b/Source/DafnyLanguageServer/Language/LanguageServerExtensions.cs
index 0be23876b54..66de25b4f59 100644
--- a/Source/DafnyLanguageServer/Language/LanguageServerExtensions.cs
+++ b/Source/DafnyLanguageServer/Language/LanguageServerExtensions.cs
@@ -30,26 +30,22 @@ private static IServiceCollection WithDafnyLanguage(this IServiceCollection serv
         .AddSingleton<IDafnyParser>(serviceProvider => new DafnyLangParser(
           serviceProvider.GetRequiredService<DafnyOptions>(),
           serviceProvider.GetRequiredService<IFileSystem>(),
-          serviceProvider.GetRequiredService<ITelemetryPublisher>(),
+          serviceProvider.GetRequiredService<TelemetryPublisherBase>(),
           serviceProvider.GetRequiredService<ILogger<DafnyLangParser>>(),
           serviceProvider.GetRequiredService<ILogger<CachingParser>>()))
         .AddSingleton<ISymbolResolver, DafnyLangSymbolResolver>()
         .AddSingleton<CreateIdeStateObserver>(serviceProvider => compilation =>
           new IdeStateObserver(serviceProvider.GetRequiredService<ILogger<IdeStateObserver>>(),
-            serviceProvider.GetRequiredService<ITelemetryPublisher>(),
+            serviceProvider.GetRequiredService<TelemetryPublisherBase>(),
             serviceProvider.GetRequiredService<INotificationPublisher>(),
-            serviceProvider.GetRequiredService<ITextDocumentLoader>(),
             compilation))
-        .AddSingleton<IVerificationProgressReporter, VerificationProgressReporter>()
         .AddSingleton(CreateVerifier)
-        .AddSingleton<CreateCompilationManager>(serviceProvider => (options, engine, compilation, migratedVerificationTree) => new CompilationManager(
-          serviceProvider.GetRequiredService<ILogger<CompilationManager>>(),
+        .AddSingleton<CreateCompilation>(serviceProvider => (engine, compilation) => new Compilation(
+          serviceProvider.GetRequiredService<ILogger<Compilation>>(),
+          serviceProvider.GetRequiredService<IFileSystem>(),
           serviceProvider.GetRequiredService<ITextDocumentLoader>(),
-          serviceProvider.GetRequiredService<INotificationPublisher>(),
           serviceProvider.GetRequiredService<IProgramVerifier>(),
-          serviceProvider.GetRequiredService<ICompilationStatusNotificationPublisher>(),
-          serviceProvider.GetRequiredService<IVerificationProgressReporter>(),
-          options, engine, compilation, migratedVerificationTree
+          engine, compilation
           ))
         .AddSingleton<ISymbolTableFactory, SymbolTableFactory>()
         .AddSingleton<IGhostStateDiagnosticCollector, GhostStateDiagnosticCollector>();
diff --git a/Source/DafnyLanguageServer/Language/Symbols/CompilationUnit.cs b/Source/DafnyLanguageServer/Language/Symbols/CompilationUnit.cs
index eec0be71104..0992b926deb 100644
--- a/Source/DafnyLanguageServer/Language/Symbols/CompilationUnit.cs
+++ b/Source/DafnyLanguageServer/Language/Symbols/CompilationUnit.cs
@@ -11,7 +11,7 @@ public class CompilationUnit : Symbol {
 
     public bool IsPartOfEntryDocument(Boogie.IToken token) {
       // The token filename happens to be null if it's representing a default module or class.
-      return token.filename == null || (token is IToken dafnyToken && dafnyToken.Uri == EntryDocument);
+      return token.filename == null || (token is IOrigin dafnyToken && dafnyToken.Uri == EntryDocument);
     }
 
     public ISet<ModuleSymbol> Modules { get; } = new HashSet<ModuleSymbol>();
diff --git a/Source/DafnyLanguageServer/Language/Symbols/DafnyLangSymbolResolver.cs b/Source/DafnyLanguageServer/Language/Symbols/DafnyLangSymbolResolver.cs
index 2647b6daad2..6c8e0ab3a98 100644
--- a/Source/DafnyLanguageServer/Language/Symbols/DafnyLangSymbolResolver.cs
+++ b/Source/DafnyLanguageServer/Language/Symbols/DafnyLangSymbolResolver.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Dafny.LanguageServer.Util;
+using System.CommandLine;
 using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Dafny.LanguageServer.Workspace;
 
 namespace Microsoft.Dafny.LanguageServer.Language.Symbols {
@@ -16,344 +14,50 @@ namespace Microsoft.Dafny.LanguageServer.Language.Symbols {
   /// this resolver serializes all invocations.
   /// </remarks>
   public class DafnyLangSymbolResolver : ISymbolResolver {
+
+    public static readonly Option<bool> UseCaching = new("--use-caching", () => true,
+      "Use caching to speed up analysis done by the Dafny IDE after each text edit.") {
+      IsHidden = true
+    };
+
     private readonly ILogger logger;
     private readonly ILogger<CachingResolver> innerLogger;
     private readonly SemaphoreSlim resolverMutex = new(1);
-    private readonly ITelemetryPublisher telemetryPublisher;
+    private readonly TelemetryPublisherBase telemetryPublisher;
 
-    public DafnyLangSymbolResolver(ILogger<DafnyLangSymbolResolver> logger, ILogger<CachingResolver> innerLogger, ITelemetryPublisher telemetryPublisher) {
+    public DafnyLangSymbolResolver(ILogger<DafnyLangSymbolResolver> logger, ILogger<CachingResolver> innerLogger, TelemetryPublisherBase telemetryPublisher) {
       this.logger = logger;
       this.innerLogger = innerLogger;
       this.telemetryPublisher = telemetryPublisher;
     }
 
     private readonly ResolutionCache resolutionCache = new();
-    public CompilationUnit ResolveSymbols(DafnyProject project, Program program, CancellationToken cancellationToken) {
+    public async Task ResolveSymbols(Compilation compilation, Program program, CancellationToken cancellationToken) {
       // TODO The resolution requires mutual exclusion since it sets static variables of classes like Microsoft.Dafny.Type.
       //      Although, the variables are marked "ThreadStatic" - thus it might not be necessary. But there might be
       //      other classes as well.
-      resolverMutex.Wait(cancellationToken);
+      await resolverMutex.WaitAsync(cancellationToken);
       try {
-        RunDafnyResolver(project, program, cancellationToken);
-        // We cannot proceed without a successful resolution. Due to the contracts in dafny-lang, we cannot
-        // access a property without potential contract violations. For example, a variable may have an
-        // unresolved type represented by null. However, the contract prohibits the use of the type property
-        // because it must not be null.
-        if (program.Reporter.HasErrorsUntilResolver) {
-          return new CompilationUnit(project.Uri, program);
-        }
+        await RunDafnyResolver(compilation, program, cancellationToken);
       }
       finally {
         resolverMutex.Release();
       }
-      var beforeLegacyServerResolution = DateTime.Now;
-      var compilationUnit = new SymbolDeclarationResolver(logger, cancellationToken).ProcessProgram(project.Uri, program);
-      telemetryPublisher.PublishTime("LegacyServerResolution", project.Uri.ToString(), DateTime.Now - beforeLegacyServerResolution);
-      return compilationUnit;
     }
 
-    private void RunDafnyResolver(DafnyProject project, Program program, CancellationToken cancellationToken) {
+    private async Task RunDafnyResolver(Compilation compilation, Program program, CancellationToken cancellationToken) {
       var beforeResolution = DateTime.Now;
       try {
-        var resolver = program.Options.Get(ServerCommand.UseCaching)
+        var resolver = program.Options.Get(UseCaching)
           ? new CachingResolver(program, innerLogger, telemetryPublisher, resolutionCache)
           : new ProgramResolver(program);
-        resolver.Resolve(cancellationToken);
-        int resolverErrors = resolver.Reporter.ErrorCountUntilResolver;
-        if (resolverErrors > 0) {
-          logger.LogDebug("encountered {ErrorCount} errors while resolving {DocumentUri}", resolverErrors,
-          project.Uri);
+        await resolver.Resolve(cancellationToken);
+        if (compilation.HasErrors) {
+          logger.LogDebug($"encountered errors while resolving {compilation.Project.Uri}");
         }
       }
       finally {
-        telemetryPublisher.PublishTime("Resolution", project.Uri.ToString(), DateTime.Now - beforeResolution);
-      }
-    }
-
-    private class SymbolDeclarationResolver {
-      private readonly ILogger logger;
-      private readonly CancellationToken cancellationToken;
-
-      public SymbolDeclarationResolver(ILogger logger, CancellationToken cancellationToken) {
-        this.logger = logger;
-        this.cancellationToken = cancellationToken;
-      }
-
-      public CompilationUnit ProcessProgram(Uri entryDocument, Dafny.Program program) {
-        var compilationUnit = new CompilationUnit(entryDocument, program);
-        // program.CompileModules would probably more suitable here, since we want the symbols of the System module as well.
-        // However, it appears that the AST of program.CompileModules does not hold the correct location of the nodes - at least of the declarations.
-        foreach (var module in compilationUnit.Program.Modules()) {
-          cancellationToken.ThrowIfCancellationRequested();
-          compilationUnit.Modules.Add(ProcessModule(compilationUnit, module));
-        }
-        compilationUnit.Modules.Add(ProcessModule(compilationUnit, compilationUnit.Program.SystemModuleManager.SystemModule));
-        return compilationUnit;
-      }
-
-      private ModuleSymbol ProcessModule(Symbol scope, ModuleDefinition moduleDefinition) {
-        var moduleSymbol = new ModuleSymbol(scope, moduleDefinition);
-        foreach (var declaration in moduleDefinition.TopLevelDecls) {
-          cancellationToken.ThrowIfCancellationRequested();
-          var topLevelSymbol = ProcessTopLevelDeclaration(moduleSymbol, declaration);
-          if (topLevelSymbol != null) {
-            moduleSymbol.Declarations.Add(topLevelSymbol);
-          }
-        }
-        return moduleSymbol;
-      }
-
-      private Symbol? ProcessTopLevelDeclaration(ModuleSymbol moduleSymbol, TopLevelDecl topLevelDeclaration) {
-        switch (topLevelDeclaration) {
-          case ClassLikeDecl classDeclaration:
-            return ProcessClass(moduleSymbol, classDeclaration);
-          case DefaultClassDecl defaultClassDecl:
-            return ProcessClass(moduleSymbol, defaultClassDecl);
-          case LiteralModuleDecl literalModuleDeclaration:
-            return ProcessModule(moduleSymbol, literalModuleDeclaration.ModuleDef);
-          case ValuetypeDecl valueTypeDeclaration:
-            return ProcessValueType(moduleSymbol, valueTypeDeclaration);
-          case DatatypeDecl dataTypeDeclaration:
-            return ProcessDataType(moduleSymbol, dataTypeDeclaration);
-          default:
-            logger.LogTrace("encountered unknown top level declaration {Name} of type {Type}", topLevelDeclaration.Name, topLevelDeclaration.GetType());
-            return null;
-        }
-      }
-
-      private ClassSymbol ProcessClass(Symbol scope, TopLevelDeclWithMembers classDeclaration) {
-        var classSymbol = new ClassSymbol(scope, classDeclaration);
-        ProcessAndAddAllMembers(classSymbol, classDeclaration);
-        return classSymbol;
-      }
-
-      private static ValueTypeSymbol ProcessValueType(Symbol scope, ValuetypeDecl valueTypeDecarlation) {
-        return new ValueTypeSymbol(scope, valueTypeDecarlation);
-      }
-
-      private DataTypeSymbol ProcessDataType(Symbol scope, DatatypeDecl dataTypeDeclaration) {
-        var dataTypeSymbol = new DataTypeSymbol(scope, dataTypeDeclaration);
-        ProcessAndAddAllMembers(dataTypeSymbol, dataTypeDeclaration);
-        return dataTypeSymbol;
-      }
-
-      private void ProcessAndAddAllMembers(TypeWithMembersSymbolBase containingType, TopLevelDeclWithMembers declaration) {
-        foreach (var member in declaration.Members) {
-          cancellationToken.ThrowIfCancellationRequested();
-          var memberSymbol = ProcessTypeMember(containingType, member);
-          if (memberSymbol != null) {
-            // TODO When respecting all possible class members, this should never be null.
-            containingType.Members.Add(memberSymbol);
-          }
-        }
-      }
-
-      private Symbol? ProcessTypeMember(Symbol scope, MemberDecl memberDeclaration) {
-        cancellationToken.ThrowIfCancellationRequested();
-        switch (memberDeclaration) {
-          case Function function:
-            return ProcessFunction(scope, function);
-          case Method method:
-            // TODO handle the constructors explicitly? The constructor is a sub-class of Method.
-            return ProcessMethod(scope, method);
-          case Field field:
-            return ProcessField(scope, field);
-          default:
-            // TODO The last missing member is AmbiguousMemberDecl which is created by the resolver.
-            //      When is this class exactly used?
-            logger.LogDebug("encountered unknown member declaration {DeclarationType}", memberDeclaration.GetType());
-            return null;
-        }
-      }
-
-      private FunctionSymbol ProcessFunction(Symbol scope, Function function) {
-        var functionSymbol = new FunctionSymbol(scope, function);
-        foreach (var parameter in function.Formals) {
-          cancellationToken.ThrowIfCancellationRequested();
-          functionSymbol.Parameters.Add(ProcessFormal(scope, parameter));
-        }
-        if (function.Result != null) {
-          functionSymbol.Parameters.Add(ProcessFormal(scope, function.Result));
-        }
-        ScopeSymbol? ExpressionHandler(Expression? expression) =>
-          expression == null
-            ? null
-            : ProcessExpression(new ScopeSymbol(functionSymbol, functionSymbol.Declaration), expression);
-        functionSymbol.Body = ExpressionHandler(function.Body);
-        functionSymbol.Ensures.AddRange(ProcessListAttributedExpressions(function.Ens, ExpressionHandler));
-        functionSymbol.Requires.AddRange(ProcessListAttributedExpressions(function.Req, ExpressionHandler));
-        functionSymbol.Reads.AddRange(ProcessListFramedExpressions(function.Reads, ExpressionHandler));
-        functionSymbol.Decreases.AddRange(ProcessListExpressions(function.Decreases.Expressions, ExpressionHandler));
-        functionSymbol.ByMethodBody = function.ByMethodBody == null ? null : ProcessFunctionByMethodBody(functionSymbol, function.ByMethodBody);
-        return functionSymbol;
-      }
-
-      private IEnumerable<ScopeSymbol> ProcessListAttributedExpressions(
-        IEnumerable<AttributedExpression> list, Func<Expression?, ScopeSymbol?> expressionHandler
-        ) {
-        return list
-          .Select(attributedExpression => expressionHandler(attributedExpression.E))
-          .Where(x => x != null)
-          .Cast<ScopeSymbol>();
-      }
-
-      private IEnumerable<ScopeSymbol> ProcessListFramedExpressions(
-        IEnumerable<FrameExpression> list, Func<Expression?, ScopeSymbol?> expressionHandler
-        ) {
-        return list
-          .Select(frameExpression => expressionHandler(frameExpression.E))
-          .Where(x => x != null)
-          .Cast<ScopeSymbol>();
-      }
-
-      private IEnumerable<ScopeSymbol> ProcessListExpressions<T>(
-        IEnumerable<T> list, Func<T, ScopeSymbol?> expressionHandler
-        ) where T : class {
-        return list
-          .Select(expression => expressionHandler(expression))
-          .Where(x => x != null)
-          .Cast<ScopeSymbol>();
-      }
-
-      private MethodSymbol ProcessMethod(Symbol scope, Method method) {
-        var methodSymbol = new MethodSymbol(scope, method);
-        foreach (var parameter in method.Ins) {
-          cancellationToken.ThrowIfCancellationRequested();
-          methodSymbol.Parameters.Add(ProcessFormal(scope, parameter));
-        }
-        foreach (var result in method.Outs) {
-          cancellationToken.ThrowIfCancellationRequested();
-          methodSymbol.Returns.Add(ProcessFormal(scope, result));
-        }
-        methodSymbol.Block = method.Body == null ? null : ProcessMethodBody(methodSymbol, method.Body);
-        ScopeSymbol? ExpressionHandler(Expression? expression) =>
-          expression == null
-            ? null
-            : ProcessExpression(new ScopeSymbol(methodSymbol, methodSymbol.Declaration), expression);
-        methodSymbol.Ensures.AddRange(ProcessListAttributedExpressions(method.Ens, ExpressionHandler));
-        methodSymbol.Requires.AddRange(ProcessListAttributedExpressions(method.Req, ExpressionHandler));
-        methodSymbol.Modifies.AddRange(ProcessListExpressions(
-          method.Mod.Expressions.Select(frameExpression => frameExpression.E), ExpressionHandler));
-        methodSymbol.Decreases.AddRange(ProcessListExpressions(method.Decreases.Expressions, ExpressionHandler));
-
-        return methodSymbol;
-      }
-
-      private ScopeSymbol ProcessBlockStmt(ScopeSymbol rootBlock, BlockStmt blockStatement) {
-        var localVisitor = new LocalVariableDeclarationVisitor(logger, rootBlock);
-        localVisitor.Resolve(blockStatement);
-        return rootBlock;
-      }
-
-      private ScopeSymbol ProcessFunctionByMethodBody(
-        FunctionSymbol functionSymbol, BlockStmt blockStatement
-      ) {
-        return ProcessBlockStmt(new ScopeSymbol(functionSymbol, blockStatement), blockStatement);
-      }
-
-      private ScopeSymbol ProcessMethodBody(MethodSymbol methodSymbol, BlockStmt blockStatement) {
-        return ProcessBlockStmt(new ScopeSymbol(methodSymbol, blockStatement), blockStatement);
-      }
-
-      private ScopeSymbol ProcessExpression(ScopeSymbol rootBlock, Expression expression) {
-        // The outer function symbol takes ownership of the function already.
-        var localVisitor = new LocalVariableDeclarationVisitor(logger, rootBlock);
-        localVisitor.Resolve(expression);
-        return rootBlock;
-      }
-
-      private static FieldSymbol ProcessField(Symbol scope, Field field) {
-        return new FieldSymbol(scope, field);
-      }
-
-      private static VariableSymbol ProcessFormal(Symbol scope, Formal formal) {
-        return new VariableSymbol(scope, formal);
-      }
-    }
-
-    private class LocalVariableDeclarationVisitor : SyntaxTreeVisitor {
-      private readonly ILogger logger;
-
-      private ScopeSymbol block;
-
-      public LocalVariableDeclarationVisitor(ILogger logger, ScopeSymbol rootBlock) {
-        // TODO support cancellation
-        this.logger = logger;
-        block = rootBlock;
-      }
-
-      public void Resolve(BlockStmt blockStatement) {
-        // The base is directly visited to avoid doubly nesting the root block of the method.
-        base.Visit(blockStatement);
-      }
-
-      public void Resolve(Expression bodyExpression) {
-        // The base is directly visited to avoid doubly nesting the root block of the method.
-        base.Visit(bodyExpression);
-      }
-
-      public override void VisitUnknown(object node, IToken token) {
-        logger.LogTrace("encountered unknown syntax node of type {NodeType} in {Filename}@({Line},{Column})",
-          node.GetType(), token.GetDocumentFileName(), token.line, token.col);
-      }
-
-      public override void Visit(BlockStmt blockStatement) {
-        var oldBlock = block;
-        block = new ScopeSymbol(block, blockStatement);
-        oldBlock.Symbols.Add(block);
-        base.Visit(blockStatement);
-        block = oldBlock;
-      }
-
-      public override void Visit(LocalVariable localVariable) {
-        block.Symbols.Add(new VariableSymbol(block, localVariable));
-      }
-
-      public override void Visit(LambdaExpr lambdaExpression) {
-        ProcessBoundVariableBearingExpression(lambdaExpression, () => base.Visit(lambdaExpression));
-      }
-
-      public override void Visit(ForallExpr forallExpression) {
-        ProcessBoundVariableBearingExpression(forallExpression, () => base.Visit(forallExpression));
-      }
-
-      public override void Visit(ExistsExpr existExpression) {
-        ProcessBoundVariableBearingExpression(existExpression, () => base.Visit(existExpression));
-      }
-
-      public override void Visit(SetComprehension setComprehension) {
-        ProcessBoundVariableBearingExpression(setComprehension, () => base.Visit(setComprehension));
-      }
-
-      public override void Visit(MapComprehension mapComprehension) {
-        ProcessBoundVariableBearingExpression(mapComprehension, () => base.Visit(mapComprehension));
-      }
-
-      public override void Visit(LetExpr letExpression) {
-        ProcessBoundVariableBearingExpression(letExpression, () => base.Visit(letExpression));
-      }
-
-      private void ProcessBoundVariableBearingExpression<TExpr>(
-        TExpr boundVarExpression, System.Action baseVisit
-        ) where TExpr : Expression, IBoundVarsBearingExpression {
-        var oldBlock = block;
-        // To prevent two scope symbols from pointing to the same node,
-        // (this crashes `declarations[nodes]` later on)
-        // we reuse the existing scope symbol if it happens to be a top-level
-        // bounded variable bearing expression that otherwise would create a new scope symbol
-        if (block.Node != boundVarExpression) {
-          block = new ScopeSymbol(block, boundVarExpression);
-          oldBlock.Symbols.Add(block);
-        }
-        foreach (var parameter in boundVarExpression.AllBoundVars) {
-          block.Symbols.Add(ProcessBoundVar(block, parameter));
-        }
-        baseVisit();
-        block = oldBlock;
-      }
-
-      private static VariableSymbol ProcessBoundVar(Symbol scope, BoundVar formal) {
-        return new VariableSymbol(scope, formal);
+        telemetryPublisher.PublishTime("Resolution", compilation.Project.Uri.ToString(), DateTime.Now - beforeResolution);
       }
     }
   }
diff --git a/Source/DafnyLanguageServer/Language/Symbols/DafnyLangTypeResolver.cs b/Source/DafnyLanguageServer/Language/Symbols/DafnyLangTypeResolver.cs
index c7f7fdf20b6..cd5af864265 100644
--- a/Source/DafnyLanguageServer/Language/Symbols/DafnyLangTypeResolver.cs
+++ b/Source/DafnyLanguageServer/Language/Symbols/DafnyLangTypeResolver.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using AstElement = System.Object;
 
 namespace Microsoft.Dafny.LanguageServer.Language.Symbols {
@@ -26,10 +27,22 @@ public bool TryGetTypeSymbol(Type type, [NotNullWhen(true)] out ILegacySymbol? t
       return userDefinedType.ResolvedClass switch {
         NonNullTypeDecl nonNullTypeDeclaration => GetSymbolByDeclaration(nonNullTypeDeclaration.Class),
         IndDatatypeDecl dataTypeDeclaration => GetSymbolByDeclaration(dataTypeDeclaration),
+        TypeSynonymDecl typeSynonymDeclaration => GetTypeSynonymSymbol(userDefinedType, typeSynonymDeclaration),
         _ => null
       };
     }
 
+    private ILegacySymbol? GetTypeSynonymSymbol(UserDefinedType userDefinedType, TypeSynonymDecl typeSynonymDeclaration) {
+      ILegacySymbol? symbol = null;
+      // It would probably be less brittle to reuse Dafny's type resolution logic here
+      var typeSubstitutions = typeSynonymDeclaration.TypeArgs
+        .Zip(userDefinedType.TypeArgs)
+        .ToDictionary(pair => pair.First, pair => pair.Second);
+      var rhsAfterSubstitution = typeSynonymDeclaration.Rhs.Subst(typeSubstitutions);
+      TryGetTypeSymbol(rhsAfterSubstitution, out symbol);
+      return symbol;
+    }
+
     private ILegacySymbol? GetSymbolByDeclaration(AstElement node) {
       if (declarations.TryGetValue(node, out var symbol)) {
         return symbol;
diff --git a/Source/DafnyLanguageServer/Language/Symbols/FunctionSymbol.cs b/Source/DafnyLanguageServer/Language/Symbols/FunctionSymbol.cs
index f0f9f73c5f3..980aaf158d3 100644
--- a/Source/DafnyLanguageServer/Language/Symbols/FunctionSymbol.cs
+++ b/Source/DafnyLanguageServer/Language/Symbols/FunctionSymbol.cs
@@ -32,7 +32,7 @@ public FunctionSymbol(ILegacySymbol? scope, Function function) : base(scope, fun
     }
 
     public string GetDetailText(DafnyOptions options, CancellationToken cancellationToken) {
-      return $"{Declaration.WhatKind} {TypePrefix}{Declaration.Name}({Declaration.Formals.AsCommaSeperatedText()}): {Declaration.ResultType.AsText(options)}";
+      return $"{Declaration.WhatKind} {TypePrefix}{Declaration.Name}({Declaration.Ins.AsCommaSeperatedText()}): {Declaration.ResultType.AsText(options)}";
     }
 
     public override TResult Accept<TResult>(ISymbolVisitor<TResult> visitor) {
diff --git a/Source/DafnyLanguageServer/Language/Symbols/ISymbolResolver.cs b/Source/DafnyLanguageServer/Language/Symbols/ISymbolResolver.cs
deleted file mode 100644
index 1617202a059..00000000000
--- a/Source/DafnyLanguageServer/Language/Symbols/ISymbolResolver.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using System.Threading;
-
-namespace Microsoft.Dafny.LanguageServer.Language.Symbols {
-  public interface ISymbolResolver {
-    CompilationUnit ResolveSymbols(DafnyProject project, Program program, CancellationToken cancellationToken);
-  }
-}
diff --git a/Source/DafnyLanguageServer/Language/Symbols/ISymbolTableFactory.cs b/Source/DafnyLanguageServer/Language/Symbols/ISymbolTableFactory.cs
index e6d3964b258..ba232f19cac 100644
--- a/Source/DafnyLanguageServer/Language/Symbols/ISymbolTableFactory.cs
+++ b/Source/DafnyLanguageServer/Language/Symbols/ISymbolTableFactory.cs
@@ -1,22 +1,12 @@
-using System;
-using System.Threading;
-using Microsoft.Dafny.LanguageServer.Workspace;
+using System.Threading;
 
 namespace Microsoft.Dafny.LanguageServer.Language.Symbols {
   /// <summary>
   /// Factory definition to generate a symbol table out of a given dafny program and compilation unit.
   /// </summary>
   public interface ISymbolTableFactory {
-    /// <summary>
-    /// Initializes a new symbol table with the given compilation unit.
-    /// </summary>
-    /// <param name="program">The parsed dafny program.</param>
-    /// <param name="compilationUnit">The compilation to create the symbol table of.</param>
-    /// <param name="cancellationToken">A token to cancel the update operation before its completion.</param>
-    /// <returns>A symbol table representing the provided compilation unit.</returns>
-    /// <exception cref="System.OperationCanceledException">Thrown when the cancellation was requested before completion.</exception>
-    /// <exception cref="System.ObjectDisposedException">Thrown if the cancellation token was disposed before the completion.</exception>
-    LegacySignatureAndCompletionTable CreateFrom(CompilationUnit compilationUnit, CancellationToken cancellationToken);
-    SymbolTable CreateFrom(Dafny.Program program, Compilation compilation, CancellationToken cancellationToken);
+    LegacySignatureAndCompletionTable CreateFrom(CompilationInput input,
+      ResolutionResult resolutionResult,
+      CancellationToken cancellationToken);
   }
 }
diff --git a/Source/DafnyLanguageServer/Language/Symbols/LegacySignatureAndCompletionTable.cs b/Source/DafnyLanguageServer/Language/Symbols/LegacySignatureAndCompletionTable.cs
index 7edb187493d..4166b0e71fa 100644
--- a/Source/DafnyLanguageServer/Language/Symbols/LegacySignatureAndCompletionTable.cs
+++ b/Source/DafnyLanguageServer/Language/Symbols/LegacySignatureAndCompletionTable.cs
@@ -3,8 +3,10 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.CommandLine;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -16,7 +18,12 @@ namespace Microsoft.Dafny.LanguageServer.Language.Symbols {
   /// Represents the symbol table
   /// </summary>
   public class LegacySignatureAndCompletionTable {
-    private readonly ILogger<LegacySignatureAndCompletionTable> logger;
+
+    public static readonly Option<bool> MigrateSignatureAndCompletionTable = new("--migrate-signature-and-completion-table", () => true) {
+      IsHidden = true
+    };
+
+    private readonly ILogger logger;
 
     // TODO Guard the properties from changes
     public CompilationUnit CompilationUnit { get; }
@@ -54,23 +61,34 @@ public static LegacySignatureAndCompletionTable Empty(DafnyOptions options, Dafn
         symbolsResolved: false);
     }
 
+    private static readonly ConditionalWeakTable<DafnyOptions, SystemModuleManager> systemModuleManagers = new();
+
     public static Program GetEmptyProgram(DafnyOptions options, Uri uri) {
-      var outerModule = new DefaultModuleDefinition(new List<Uri>() { uri });
-      var errorReporter = new DiagnosticErrorReporter(options, uri);
+      var outerModule = new DefaultModuleDefinition();
+      var errorReporter = new ObservableErrorReporter(options, uri);
       var compilation = new CompilationData(errorReporter, new List<Include>(), new List<Uri>(), Sets.Empty<Uri>(),
         Sets.Empty<Uri>());
+
+      SystemModuleManager manager;
+      lock (options) {
+        if (!systemModuleManagers.TryGetValue(options, out manager!)) {
+          manager = new SystemModuleManager(options);
+          systemModuleManagers.Add(options, manager);
+        }
+      }
+
       var emptyProgram = new Program(
                            uri.ToString(),
-        new LiteralModuleDecl(outerModule, null, Guid.NewGuid()),
+        new LiteralModuleDecl(options, outerModule, null, Guid.NewGuid()),
         // BuiltIns cannot be initialized without Type.ResetScopes() before.
-        new SystemModuleManager(options), // TODO creating a BuiltIns is a heavy operation
+        manager,
         errorReporter, compilation
       );
       return emptyProgram;
     }
 
     public LegacySignatureAndCompletionTable(
-        ILogger<LegacySignatureAndCompletionTable> iLogger,
+        ILogger iLogger,
         CompilationUnit compilationUnit,
         IDictionary<AstElement, ILocalizableSymbol> declarations,
         ImmutableDictionary<Uri, IDictionary<ILegacySymbol, SymbolLocation>> locationsPerUri,
diff --git a/Source/DafnyLanguageServer/Language/Symbols/LocalVariableDeclarationVisitor.cs b/Source/DafnyLanguageServer/Language/Symbols/LocalVariableDeclarationVisitor.cs
new file mode 100644
index 00000000000..95436900564
--- /dev/null
+++ b/Source/DafnyLanguageServer/Language/Symbols/LocalVariableDeclarationVisitor.cs
@@ -0,0 +1,90 @@
+using Microsoft.Dafny.LanguageServer.Util;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Dafny.LanguageServer.Language.Symbols;
+
+internal class LocalVariableDeclarationVisitor : SyntaxTreeVisitor {
+  private readonly ILogger logger;
+
+  private ScopeSymbol block;
+
+  public LocalVariableDeclarationVisitor(ILogger logger, ScopeSymbol rootBlock) {
+    // TODO support cancellation
+    this.logger = logger;
+    block = rootBlock;
+  }
+
+  public void Resolve(BlockStmt blockStatement) {
+    // The base is directly visited to avoid doubly nesting the root block of the method.
+    base.Visit(blockStatement);
+  }
+
+  public void Resolve(Expression bodyExpression) {
+    // The base is directly visited to avoid doubly nesting the root block of the method.
+    base.Visit(bodyExpression);
+  }
+
+  public override void VisitUnknown(object node, IOrigin token) {
+    logger.LogTrace("encountered unknown syntax node of type {NodeType} in {Filename}@({Line},{Column})",
+      node.GetType(), token.GetDocumentFileName(), token.line, token.col);
+  }
+
+  public override void Visit(BlockStmt blockStatement) {
+    var oldBlock = block;
+    block = new ScopeSymbol(block, blockStatement);
+    oldBlock.Symbols.Add(block);
+    base.Visit(blockStatement);
+    block = oldBlock;
+  }
+
+  public override void Visit(LocalVariable localVariable) {
+    block.Symbols.Add(new VariableSymbol(block, localVariable));
+  }
+
+  public override void Visit(LambdaExpr lambdaExpression) {
+    ProcessBoundVariableBearingExpression(lambdaExpression, () => base.Visit(lambdaExpression));
+  }
+
+  public override void Visit(ForallExpr forallExpression) {
+    ProcessBoundVariableBearingExpression(forallExpression, () => base.Visit(forallExpression));
+  }
+
+  public override void Visit(ExistsExpr existExpression) {
+    ProcessBoundVariableBearingExpression(existExpression, () => base.Visit(existExpression));
+  }
+
+  public override void Visit(SetComprehension setComprehension) {
+    ProcessBoundVariableBearingExpression(setComprehension, () => base.Visit(setComprehension));
+  }
+
+  public override void Visit(MapComprehension mapComprehension) {
+    ProcessBoundVariableBearingExpression(mapComprehension, () => base.Visit(mapComprehension));
+  }
+
+  public override void Visit(LetExpr letExpression) {
+    ProcessBoundVariableBearingExpression(letExpression, () => base.Visit(letExpression));
+  }
+
+  private void ProcessBoundVariableBearingExpression<TExpr>(
+    TExpr boundVarExpression, System.Action baseVisit
+  ) where TExpr : Expression, IBoundVarsBearingExpression {
+    var oldBlock = block;
+    // To prevent two scope symbols from pointing to the same node,
+    // (this crashes `declarations[nodes]` later on)
+    // we reuse the existing scope symbol if it happens to be a top-level
+    // bounded variable bearing expression that otherwise would create a new scope symbol
+    if (block.Node != boundVarExpression) {
+      block = new ScopeSymbol(block, boundVarExpression);
+      oldBlock.Symbols.Add(block);
+    }
+    foreach (var parameter in boundVarExpression.AllBoundVars) {
+      block.Symbols.Add(ProcessBoundVar(block, parameter));
+    }
+    baseVisit();
+    block = oldBlock;
+  }
+
+  private static VariableSymbol ProcessBoundVar(Symbol scope, BoundVar formal) {
+    return new VariableSymbol(scope, formal);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Language/Symbols/MethodSymbol.cs b/Source/DafnyLanguageServer/Language/Symbols/MethodSymbol.cs
index aa753167d12..5a0b66c17b8 100644
--- a/Source/DafnyLanguageServer/Language/Symbols/MethodSymbol.cs
+++ b/Source/DafnyLanguageServer/Language/Symbols/MethodSymbol.cs
@@ -26,6 +26,7 @@ public class MethodSymbol : MemberSymbol, ILocalizableSymbol {
     public ScopeSymbol? Block { get; set; }
     public List<ScopeSymbol> Ensures { get; } = new();
     public List<ScopeSymbol> Requires { get; } = new();
+    public List<ScopeSymbol> Reads { get; } = new();
     public List<ScopeSymbol> Modifies { get; } = new();
     public List<ScopeSymbol> Decreases { get; } = new();
 
@@ -35,6 +36,7 @@ public class MethodSymbol : MemberSymbol, ILocalizableSymbol {
         .Concat(Returns)
         .Concat(Ensures)
         .Concat(Requires)
+        .Concat(Reads)
         .Concat(Modifies)
         .Concat(Decreases);
 
diff --git a/Source/DafnyLanguageServer/Language/Symbols/ScopeSymbol.cs b/Source/DafnyLanguageServer/Language/Symbols/ScopeSymbol.cs
index 7fde4f4ae07..a2a1ba7afae 100644
--- a/Source/DafnyLanguageServer/Language/Symbols/ScopeSymbol.cs
+++ b/Source/DafnyLanguageServer/Language/Symbols/ScopeSymbol.cs
@@ -5,15 +5,15 @@
 namespace Microsoft.Dafny.LanguageServer.Language.Symbols {
   public class ScopeSymbol : Symbol, ILocalizableSymbol {
     public INode Node { get; }
-    public readonly IToken BodyStartToken;
-    public readonly IToken BodyEndToken;
+    public readonly IOrigin BodyStartToken;
+    public readonly IOrigin BodyEndToken;
     public List<ILegacySymbol> Symbols { get; } = new();
     public override IEnumerable<ILegacySymbol> Children => Symbols;
 
     public ScopeSymbol(ILegacySymbol? scope, INode region) : base(scope, string.Empty) {
       Node = region;
-      BodyStartToken = region.RangeToken.StartToken;
-      BodyEndToken = region.RangeToken.EndToken;
+      BodyStartToken = region.Origin.StartToken;
+      BodyEndToken = region.Origin.EndToken;
     }
 
     public override TResult Accept<TResult>(ISymbolVisitor<TResult> visitor) {
diff --git a/Source/DafnyLanguageServer/Language/Symbols/SymbolDeclarationResolver.cs b/Source/DafnyLanguageServer/Language/Symbols/SymbolDeclarationResolver.cs
new file mode 100644
index 00000000000..9d30f2a370a
--- /dev/null
+++ b/Source/DafnyLanguageServer/Language/Symbols/SymbolDeclarationResolver.cs
@@ -0,0 +1,210 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Dafny.LanguageServer.Language.Symbols;
+
+internal class SymbolDeclarationResolver {
+  private readonly ILogger logger;
+  private readonly CancellationToken cancellationToken;
+
+  public SymbolDeclarationResolver(ILogger logger, CancellationToken cancellationToken) {
+    this.logger = logger;
+    this.cancellationToken = cancellationToken;
+  }
+
+  public CompilationUnit ProcessProgram(Uri entryDocument, Dafny.Program program) {
+    var compilationUnit = new CompilationUnit(entryDocument, program);
+    // program.CompileModules would probably more suitable here, since we want the symbols of the System module as well.
+    // However, it appears that the AST of program.CompileModules does not hold the correct location of the nodes - at least of the declarations.
+    foreach (var module in compilationUnit.Program.Modules()) {
+      cancellationToken.ThrowIfCancellationRequested();
+      compilationUnit.Modules.Add(ProcessModule(compilationUnit, module));
+    }
+    compilationUnit.Modules.Add(ProcessModule(compilationUnit, compilationUnit.Program.SystemModuleManager.SystemModule));
+    return compilationUnit;
+  }
+
+  private ModuleSymbol ProcessModule(Symbol scope, ModuleDefinition moduleDefinition) {
+    var moduleSymbol = new ModuleSymbol(scope, moduleDefinition);
+    foreach (var declaration in moduleDefinition.TopLevelDecls) {
+      cancellationToken.ThrowIfCancellationRequested();
+      var topLevelSymbol = ProcessTopLevelDeclaration(moduleSymbol, declaration);
+      if (topLevelSymbol != null) {
+        moduleSymbol.Declarations.Add(topLevelSymbol);
+      }
+    }
+    return moduleSymbol;
+  }
+
+  private Symbol? ProcessTopLevelDeclaration(ModuleSymbol moduleSymbol, TopLevelDecl topLevelDeclaration) {
+    switch (topLevelDeclaration) {
+      case ClassLikeDecl classDeclaration:
+        return ProcessClass(moduleSymbol, classDeclaration);
+      case DefaultClassDecl defaultClassDecl:
+        return ProcessClass(moduleSymbol, defaultClassDecl);
+      case LiteralModuleDecl literalModuleDeclaration:
+        return ProcessModule(moduleSymbol, literalModuleDeclaration.ModuleDef);
+      case ValuetypeDecl valueTypeDeclaration:
+        return ProcessValueType(moduleSymbol, valueTypeDeclaration);
+      case DatatypeDecl dataTypeDeclaration:
+        return ProcessDataType(moduleSymbol, dataTypeDeclaration);
+      default:
+        logger.LogTrace("encountered unknown top level declaration {Name} of type {Type}", topLevelDeclaration.Name, topLevelDeclaration.GetType());
+        return null;
+    }
+  }
+
+  private ClassSymbol ProcessClass(Symbol scope, TopLevelDeclWithMembers classDeclaration) {
+    var classSymbol = new ClassSymbol(scope, classDeclaration);
+    ProcessAndAddAllMembers(classSymbol, classDeclaration);
+    return classSymbol;
+  }
+
+  private static ValueTypeSymbol ProcessValueType(Symbol scope, ValuetypeDecl valueTypeDecarlation) {
+    return new ValueTypeSymbol(scope, valueTypeDecarlation);
+  }
+
+  private DataTypeSymbol ProcessDataType(Symbol scope, DatatypeDecl dataTypeDeclaration) {
+    var dataTypeSymbol = new DataTypeSymbol(scope, dataTypeDeclaration);
+    ProcessAndAddAllMembers(dataTypeSymbol, dataTypeDeclaration);
+    return dataTypeSymbol;
+  }
+
+  private void ProcessAndAddAllMembers(TypeWithMembersSymbolBase containingType, TopLevelDeclWithMembers declaration) {
+    foreach (var member in declaration.Members) {
+      cancellationToken.ThrowIfCancellationRequested();
+      var memberSymbol = ProcessTypeMember(containingType, member);
+      if (memberSymbol != null) {
+        // TODO When respecting all possible class members, this should never be null.
+        containingType.Members.Add(memberSymbol);
+      }
+    }
+  }
+
+  private Symbol? ProcessTypeMember(Symbol scope, MemberDecl memberDeclaration) {
+    cancellationToken.ThrowIfCancellationRequested();
+    switch (memberDeclaration) {
+      case Function function:
+        return ProcessFunction(scope, function);
+      case Method method:
+        // TODO handle the constructors explicitly? The constructor is a sub-class of Method.
+        return ProcessMethod(scope, method);
+      case Field field:
+        return ProcessField(scope, field);
+      default:
+        // TODO The last missing member is AmbiguousMemberDecl which is created by the resolver.
+        //      When is this class exactly used?
+        logger.LogDebug("encountered unknown member declaration {DeclarationType}", memberDeclaration.GetType());
+        return null;
+    }
+  }
+
+  private FunctionSymbol ProcessFunction(Symbol scope, Function function) {
+    var functionSymbol = new FunctionSymbol(scope, function);
+    foreach (var parameter in function.Ins) {
+      cancellationToken.ThrowIfCancellationRequested();
+      functionSymbol.Parameters.Add(ProcessFormal(scope, parameter));
+    }
+    if (function.Result != null) {
+      functionSymbol.Parameters.Add(ProcessFormal(scope, function.Result));
+    }
+    ScopeSymbol? ExpressionHandler(Expression? expression) =>
+      expression == null
+        ? null
+        : ProcessExpression(new ScopeSymbol(functionSymbol, functionSymbol.Declaration), expression);
+    functionSymbol.Body = ExpressionHandler(function.Body);
+    functionSymbol.Ensures.AddRange(ProcessListAttributedExpressions(function.Ens, ExpressionHandler));
+    functionSymbol.Requires.AddRange(ProcessListAttributedExpressions(function.Req, ExpressionHandler));
+    functionSymbol.Reads.AddRange(ProcessListFramedExpressions(function.Reads.Expressions, ExpressionHandler));
+    functionSymbol.Decreases.AddRange(ProcessListExpressions(function.Decreases.Expressions, ExpressionHandler));
+    functionSymbol.ByMethodBody = function.ByMethodBody == null ? null : ProcessFunctionByMethodBody(functionSymbol, function.ByMethodBody);
+    return functionSymbol;
+  }
+
+  private IEnumerable<ScopeSymbol> ProcessListAttributedExpressions(
+    IEnumerable<AttributedExpression> list, Func<Expression?, ScopeSymbol?> expressionHandler
+  ) {
+    return list
+      .Select(attributedExpression => expressionHandler(attributedExpression.E))
+      .Where(x => x != null)
+      .Cast<ScopeSymbol>();
+  }
+
+  private IEnumerable<ScopeSymbol> ProcessListFramedExpressions(
+    IEnumerable<FrameExpression> list, Func<Expression?, ScopeSymbol?> expressionHandler
+  ) {
+    return list
+      .Select(frameExpression => expressionHandler(frameExpression.E))
+      .Where(x => x != null)
+      .Cast<ScopeSymbol>();
+  }
+
+  private IEnumerable<ScopeSymbol> ProcessListExpressions<T>(
+    IEnumerable<T> list, Func<T, ScopeSymbol?> expressionHandler
+  ) where T : class {
+    return list
+      .Select(expression => expressionHandler(expression))
+      .Where(x => x != null)
+      .Cast<ScopeSymbol>();
+  }
+
+  private MethodSymbol ProcessMethod(Symbol scope, Method method) {
+    var methodSymbol = new MethodSymbol(scope, method);
+    foreach (var parameter in method.Ins) {
+      cancellationToken.ThrowIfCancellationRequested();
+      methodSymbol.Parameters.Add(ProcessFormal(scope, parameter));
+    }
+    foreach (var result in method.Outs) {
+      cancellationToken.ThrowIfCancellationRequested();
+      methodSymbol.Returns.Add(ProcessFormal(scope, result));
+    }
+    methodSymbol.Block = method.Body == null ? null : ProcessMethodBody(methodSymbol, method.Body);
+    ScopeSymbol? ExpressionHandler(Expression? expression) =>
+      expression == null
+        ? null
+        : ProcessExpression(new ScopeSymbol(methodSymbol, methodSymbol.Declaration), expression);
+    methodSymbol.Ensures.AddRange(ProcessListAttributedExpressions(method.Ens, ExpressionHandler));
+    methodSymbol.Requires.AddRange(ProcessListAttributedExpressions(method.Req, ExpressionHandler));
+    methodSymbol.Reads.AddRange(ProcessListExpressions(
+      method.Reads.Expressions.Select(frameExpression => frameExpression.E), ExpressionHandler));
+    methodSymbol.Modifies.AddRange(ProcessListExpressions(
+      method.Mod.Expressions.Select(frameExpression => frameExpression.E), ExpressionHandler));
+    methodSymbol.Decreases.AddRange(ProcessListExpressions(method.Decreases.Expressions, ExpressionHandler));
+
+    return methodSymbol;
+  }
+
+  private ScopeSymbol ProcessBlockStmt(ScopeSymbol rootBlock, BlockStmt blockStatement) {
+    var localVisitor = new LocalVariableDeclarationVisitor(logger, rootBlock);
+    localVisitor.Resolve(blockStatement);
+    return rootBlock;
+  }
+
+  private ScopeSymbol ProcessFunctionByMethodBody(
+    FunctionSymbol functionSymbol, BlockStmt blockStatement
+  ) {
+    return ProcessBlockStmt(new ScopeSymbol(functionSymbol, blockStatement), blockStatement);
+  }
+
+  private ScopeSymbol ProcessMethodBody(MethodSymbol methodSymbol, BlockStmt blockStatement) {
+    return ProcessBlockStmt(new ScopeSymbol(methodSymbol, blockStatement), blockStatement);
+  }
+
+  private ScopeSymbol ProcessExpression(ScopeSymbol rootBlock, Expression expression) {
+    // The outer function symbol takes ownership of the function already.
+    var localVisitor = new LocalVariableDeclarationVisitor(logger, rootBlock);
+    localVisitor.Resolve(expression);
+    return rootBlock;
+  }
+
+  private static FieldSymbol ProcessField(Symbol scope, Field field) {
+    return new FieldSymbol(scope, field);
+  }
+
+  private static VariableSymbol ProcessFormal(Symbol scope, Formal formal) {
+    return new VariableSymbol(scope, formal);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Language/Symbols/SymbolLocation.cs b/Source/DafnyLanguageServer/Language/Symbols/SymbolLocation.cs
index 238cdd221d8..7da148a175b 100644
--- a/Source/DafnyLanguageServer/Language/Symbols/SymbolLocation.cs
+++ b/Source/DafnyLanguageServer/Language/Symbols/SymbolLocation.cs
@@ -1,5 +1,6 @@
-using OmniSharp.Extensions.LanguageServer.Protocol;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using System;
+using OmniSharp.Extensions.LanguageServer.Protocol;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
 namespace Microsoft.Dafny.LanguageServer.Language.Symbols {
   /// <summary>
@@ -9,7 +10,7 @@ public class SymbolLocation {
     /// <summary>
     /// Gets the document uri of the containing file.
     /// </summary>
-    public DocumentUri Uri { get; }
+    public Uri Uri { get; }
 
     /// <summary>
     /// Gets the range of the symbol's name.
@@ -22,7 +23,7 @@ public class SymbolLocation {
     /// </summary>
     public Range Declaration { get; }
 
-    public SymbolLocation(DocumentUri uri, Range name, Range declaration) {
+    public SymbolLocation(Uri uri, Range name, Range declaration) {
       Uri = uri;
       Name = name;
       Declaration = declaration;
diff --git a/Source/DafnyLanguageServer/Language/Symbols/SymbolTableFactory.cs b/Source/DafnyLanguageServer/Language/Symbols/SymbolTableFactory.cs
index 45442f6584a..3e7cade4516 100644
--- a/Source/DafnyLanguageServer/Language/Symbols/SymbolTableFactory.cs
+++ b/Source/DafnyLanguageServer/Language/Symbols/SymbolTableFactory.cs
@@ -16,20 +16,25 @@
 namespace Microsoft.Dafny.LanguageServer.Language.Symbols {
   public class SymbolTableFactory : ISymbolTableFactory {
     private readonly ILogger logger;
-    private readonly ILogger<LegacySignatureAndCompletionTable> loggerSymbolTable;
 
-    public SymbolTableFactory(ILogger<SymbolTableFactory> logger, ILogger<LegacySignatureAndCompletionTable> loggerSymbolTable) {
+    public SymbolTableFactory(ILogger logger) {
       this.logger = logger;
-      this.loggerSymbolTable = loggerSymbolTable;
     }
 
 
-    public LegacySignatureAndCompletionTable CreateFrom(CompilationUnit compilationUnit, CancellationToken cancellationToken) {
-      var program = compilationUnit.Program;
+    public LegacySignatureAndCompletionTable CreateFrom(CompilationInput input,
+      ResolutionResult resolutionResult,
+      CancellationToken cancellationToken) {
+
+      var compilationUnit = resolutionResult.HasErrors
+        ? new CompilationUnit(input.Project.Uri, resolutionResult.ResolvedProgram)
+        : new SymbolDeclarationResolver(logger, cancellationToken).ProcessProgram(input.Project.Uri, resolutionResult.ResolvedProgram);
+
+      var program = resolutionResult.ResolvedProgram;
       var declarations = CreateDeclarationDictionary(compilationUnit, cancellationToken);
       var designatorVisitor = new DesignatorVisitor(logger, compilationUnit, declarations, compilationUnit, cancellationToken);
       var declarationLocationVisitor = new SymbolDeclarationLocationVisitor(cancellationToken);
-      var symbolsResolved = !program.Reporter.HasErrorsUntilResolver;
+      var symbolsResolved = !resolutionResult.HasErrors;
       if (symbolsResolved) {
         designatorVisitor.Visit(program);
         declarationLocationVisitor.Visit(compilationUnit);
@@ -42,7 +47,7 @@ public LegacySignatureAndCompletionTable CreateFrom(CompilationUnit compilationU
         logger.LogDebug("cannot create symbol table from a program with errors");
       }
       return new LegacySignatureAndCompletionTable(
-        loggerSymbolTable,
+        logger,
         compilationUnit,
         declarations,
         declarationLocationVisitor.Locations,
@@ -51,16 +56,6 @@ public LegacySignatureAndCompletionTable CreateFrom(CompilationUnit compilationU
       );
     }
 
-    public SymbolTable CreateFrom(Program program, Compilation compilation, CancellationToken cancellationToken) {
-      var visited = program.Visit(a => true, b => { });
-
-      var usages = visited.OfType<IHasUsages>().Where(v => !AutoGeneratedToken.Is(v.NameToken))
-        .SelectMany(r => r.GetResolvedDeclarations().Select(declaration =>
-          ((IDeclarationOrUsage)r, declaration))).ToList();
-
-      return new SymbolTable(usages);
-    }
-
     private static IDictionary<AstElement, ILocalizableSymbol> CreateDeclarationDictionary(CompilationUnit compilationUnit, CancellationToken cancellationToken) {
       var declarations = new Dictionary<AstElement, ILocalizableSymbol>();
       foreach (var symbol in compilationUnit.GetAllDescendantsAndSelf()) {
@@ -88,7 +83,7 @@ private class DesignatorVisitor : SyntaxTreeVisitor {
         = ImmutableDictionary<Uri, IIntervalTree<Position, ILocalizableSymbol>>.Empty;
 
       public DesignatorVisitor(
-          ILogger logger, CompilationUnit compilationUnit, IDictionary<AstElement, ILocalizableSymbol> declarations, ILegacySymbol rootScope, CancellationToken cancellationToken) {
+        ILogger logger, CompilationUnit compilationUnit, IDictionary<AstElement, ILocalizableSymbol> declarations, ILegacySymbol rootScope, CancellationToken cancellationToken) {
         this.logger = logger;
         this.compilationUnit = compilationUnit;
         this.declarations = declarations;
@@ -97,14 +92,14 @@ public DesignatorVisitor(
         this.cancellationToken = cancellationToken;
       }
 
-      public override void VisitUnknown(object node, IToken token) {
+      public override void VisitUnknown(object node, IOrigin token) {
         logger.LogDebug("encountered unknown syntax node of type {NodeType} in {Filename}@({Line},{Column})",
           node.GetType(), token.GetDocumentFileName(), token.line, token.col);
       }
 
       public override void Visit(ModuleDefinition moduleDefinition) {
         cancellationToken.ThrowIfCancellationRequested();
-        ProcessNestedScope(moduleDefinition, moduleDefinition.tok, () => base.Visit(moduleDefinition));
+        ProcessNestedScope(moduleDefinition, moduleDefinition.Origin, () => base.Visit(moduleDefinition));
       }
 
       public override void Visit(TopLevelDeclWithMembers classDeclaration) {
@@ -120,12 +115,12 @@ private void VisitTopLevelDeclarationWithMembers(TopLevelDeclWithMembers declara
         foreach (var parentTrait in declaration.ParentTraits) {
           RegisterTypeDesignator(currentScope, parentTrait);
         }
-        ProcessNestedScope(declaration, declaration.tok, visit);
+        ProcessNestedScope(declaration, declaration.Origin, visit);
       }
 
       public override void Visit(Method method) {
         cancellationToken.ThrowIfCancellationRequested();
-        ProcessNestedScope(method, method.tok, () => base.Visit(method));
+        ProcessNestedScope(method, method.Origin, () => base.Visit(method));
       }
 
       public override void Visit(Function function) {
@@ -133,33 +128,33 @@ public override void Visit(Function function) {
         if (function.Result == null) {
           RegisterTypeDesignator(currentScope, function.ResultType);
         }
-        ProcessNestedScope(function, function.tok, () => base.Visit(function));
+        ProcessNestedScope(function, function.Origin, () => base.Visit(function));
       }
 
       public override void Visit(LambdaExpr lambdaExpression) {
         cancellationToken.ThrowIfCancellationRequested();
-        ProcessNestedScope(lambdaExpression, lambdaExpression.tok, () => base.Visit(lambdaExpression));
+        ProcessNestedScope(lambdaExpression, lambdaExpression.Origin, () => base.Visit(lambdaExpression));
       }
       public override void Visit(ForallExpr forallExpression) {
         cancellationToken.ThrowIfCancellationRequested();
-        ProcessNestedScope(forallExpression, forallExpression.tok, () => base.Visit(forallExpression));
+        ProcessNestedScope(forallExpression, forallExpression.Origin, () => base.Visit(forallExpression));
       }
       public override void Visit(ExistsExpr existsExpression) {
         cancellationToken.ThrowIfCancellationRequested();
-        ProcessNestedScope(existsExpression, existsExpression.tok, () => base.Visit(existsExpression));
+        ProcessNestedScope(existsExpression, existsExpression.Origin, () => base.Visit(existsExpression));
       }
       public override void Visit(SetComprehension setComprehension) {
         cancellationToken.ThrowIfCancellationRequested();
-        ProcessNestedScope(setComprehension, setComprehension.tok, () => base.Visit(setComprehension));
+        ProcessNestedScope(setComprehension, setComprehension.Origin, () => base.Visit(setComprehension));
       }
       public override void Visit(MapComprehension mapComprehension) {
         cancellationToken.ThrowIfCancellationRequested();
-        ProcessNestedScope(mapComprehension, mapComprehension.tok, () => base.Visit(mapComprehension));
+        ProcessNestedScope(mapComprehension, mapComprehension.Origin, () => base.Visit(mapComprehension));
       }
 
       public override void Visit(LetExpr letExpression) {
         cancellationToken.ThrowIfCancellationRequested();
-        ProcessNestedScope(letExpression, letExpression.tok, () => base.Visit(letExpression));
+        ProcessNestedScope(letExpression, letExpression.Origin, () => base.Visit(letExpression));
       }
 
       public override void Visit(Field field) {
@@ -170,34 +165,34 @@ public override void Visit(Field field) {
 
       public override void Visit(Formal formal) {
         cancellationToken.ThrowIfCancellationRequested();
-        RegisterDesignator(currentScope, formal, formal.tok, formal.Name);
+        RegisterDesignator(currentScope, formal, formal.Origin, formal.Name);
         RegisterTypeDesignator(currentScope, formal.Type);
         base.Visit(formal);
       }
 
       public override void Visit(NonglobalVariable variable) {
         cancellationToken.ThrowIfCancellationRequested();
-        RegisterDesignator(currentScope, variable, variable.tok, variable.Name);
+        RegisterDesignator(currentScope, variable, variable.Origin, variable.Name);
         RegisterTypeDesignator(currentScope, variable.Type);
         base.Visit(variable);
       }
 
       public override void Visit(BlockStmt blockStatement) {
         cancellationToken.ThrowIfCancellationRequested();
-        ProcessNestedScope(blockStatement, blockStatement.Tok, () => base.Visit(blockStatement));
+        ProcessNestedScope(blockStatement, blockStatement.Origin, () => base.Visit(blockStatement));
       }
 
       public override void Visit(ExprDotName expressionDotName) {
         cancellationToken.ThrowIfCancellationRequested();
         base.Visit(expressionDotName);
         if (typeResolver.TryGetTypeSymbol(expressionDotName.Lhs, out var leftHandSideType)) {
-          RegisterDesignator(leftHandSideType, expressionDotName, expressionDotName.tok, expressionDotName.SuffixName);
+          RegisterDesignator(leftHandSideType, expressionDotName, expressionDotName.Center, expressionDotName.SuffixName);
         }
       }
 
       public override void Visit(NameSegment nameSegment) {
         cancellationToken.ThrowIfCancellationRequested();
-        RegisterDesignator(currentScope, nameSegment, nameSegment.tok, nameSegment.Name);
+        RegisterDesignator(currentScope, nameSegment, nameSegment.Origin, nameSegment.Name);
       }
 
       public override void Visit(TypeRhs typeRhs) {
@@ -208,12 +203,12 @@ public override void Visit(TypeRhs typeRhs) {
 
       public override void Visit(FrameExpression frameExpression) {
         cancellationToken.ThrowIfCancellationRequested();
-        RegisterDesignator(currentScope, frameExpression, frameExpression.tok, frameExpression.FieldName);
+        RegisterDesignator(currentScope, frameExpression, frameExpression.Origin, frameExpression.FieldName);
       }
 
       public override void Visit(IdentifierExpr identifierExpression) {
         cancellationToken.ThrowIfCancellationRequested();
-        RegisterDesignator(currentScope, identifierExpression, identifierExpression.tok, identifierExpression.Name);
+        RegisterDesignator(currentScope, identifierExpression, identifierExpression.Origin, identifierExpression.Name);
         base.Visit(identifierExpression);
       }
 
@@ -230,14 +225,14 @@ private void RegisterTypeDesignator(ILegacySymbol scope, Type type) {
         //      The "typeRhs" only points to the "new" keyword with its token.
         //      Find an alternative to get the type designator without requiring the resolver.
         if (type is UserDefinedType userDefinedType) {
-          RegisterDesignator(scope, type, userDefinedType.NamePath.tok, userDefinedType.Name);
+          RegisterDesignator(scope, type, userDefinedType.NamePath.Origin, userDefinedType.Name);
         }
       }
 
       private void RegisterDesignator(ILegacySymbol scope, AstElement node, Boogie.IToken token, string identifier) {
         var symbol = GetSymbolDeclarationByName(scope, identifier);
         if (symbol != null) {
-          if (token == Token.NoToken) {
+          if (ReferenceEquals(token, Token.NoToken)) {
             return;
           }
           // Many resolutions for automatically generated nodes (e.g. Decreases, Update when initializating a variable
@@ -246,7 +241,7 @@ private void RegisterDesignator(ILegacySymbol scope, AstElement node, Boogie.ITo
           // abstract syntax tree). We just ignore such duplicates until more information is availabe in the AST.
           var range = token.GetLspRange();
 
-          var dafnyToken = (IToken)token;
+          var dafnyToken = (IOrigin)token;
           var symbolLookupForUri =
             SymbolLookup.GetValueOrDefault(dafnyToken.Uri) ?? new IntervalTree<Position, ILocalizableSymbol>();
           SymbolLookup = SymbolLookup.SetItem(dafnyToken.Uri, symbolLookupForUri);
@@ -315,10 +310,10 @@ public Unit Visit(ModuleSymbol moduleSymbol) {
         cancellationToken.ThrowIfCancellationRequested();
         RegisterLocation(
           moduleSymbol,
-          moduleSymbol.Declaration.tok,
-          moduleSymbol.Declaration.tok.GetLspRange(),
-          moduleSymbol.Declaration.RangeToken.ToLspRange()
-          );
+          moduleSymbol.Declaration.Origin,
+          moduleSymbol.Declaration.NavigationToken.GetLspRange(),
+          moduleSymbol.Declaration.Origin.ToLspRange()
+        );
         VisitChildren(moduleSymbol);
         return Unit.Value;
       }
@@ -335,9 +330,9 @@ private Unit VisitTypeSymbol<TNode>(TypeWithMembersSymbolBase<TNode> typeSymbol)
         cancellationToken.ThrowIfCancellationRequested();
         RegisterLocation(
           typeSymbol,
-          typeSymbol.Declaration.tok,
-          typeSymbol.Declaration.tok.GetLspRange(),
-          new Range(typeSymbol.Declaration.RangeToken.StartToken.GetLspPosition(), typeSymbol.Declaration.RangeToken.EndToken.GetLspPosition())
+          typeSymbol.Declaration.Origin,
+          typeSymbol.Declaration.NavigationToken.GetLspRange(),
+          new Range(typeSymbol.Declaration.Origin.StartToken.GetLspPosition(), typeSymbol.Declaration.Origin.EndToken.GetLspPosition())
         );
         VisitChildren(typeSymbol);
         return Unit.Value;
@@ -347,9 +342,9 @@ public Unit Visit(ValueTypeSymbol valueTypeSymbol) {
         cancellationToken.ThrowIfCancellationRequested();
         RegisterLocation(
           valueTypeSymbol,
-          valueTypeSymbol.Declaration.tok,
-          valueTypeSymbol.Declaration.tok.GetLspRange(),
-          new Range(valueTypeSymbol.Declaration.RangeToken.StartToken.GetLspPosition(), valueTypeSymbol.Declaration.RangeToken.EndToken.GetLspPosition())
+          valueTypeSymbol.Declaration.Origin,
+          valueTypeSymbol.Declaration.NavigationToken.GetLspRange(),
+          new Range(valueTypeSymbol.Declaration.Origin.StartToken.GetLspPosition(), valueTypeSymbol.Declaration.Origin.EndToken.GetLspPosition())
         );
         VisitChildren(valueTypeSymbol);
         return Unit.Value;
@@ -359,10 +354,10 @@ public Unit Visit(FieldSymbol fieldSymbol) {
         cancellationToken.ThrowIfCancellationRequested();
         RegisterLocation(
           fieldSymbol,
-          fieldSymbol.Declaration.tok,
-          fieldSymbol.Declaration.tok.GetLspRange(),
+          fieldSymbol.Declaration.Origin,
+          fieldSymbol.Declaration.NavigationToken.GetLspRange(),
           // BodyEndToken always returns Token.NoToken
-          fieldSymbol.Declaration.tok.GetLspRange()
+          fieldSymbol.Declaration.Origin.GetLspRange()
         );
         VisitChildren(fieldSymbol);
         return Unit.Value;
@@ -372,8 +367,8 @@ public Unit Visit(FunctionSymbol functionSymbol) {
         cancellationToken.ThrowIfCancellationRequested();
         RegisterLocation(
           functionSymbol,
-          functionSymbol.Declaration.tok,
-          functionSymbol.Declaration.tok.GetLspRange(),
+          functionSymbol.Declaration.Origin,
+          functionSymbol.Declaration.NavigationToken.GetLspRange(),
           GetDeclarationRange(functionSymbol.Declaration)
         );
         VisitChildren(functionSymbol);
@@ -384,8 +379,8 @@ public Unit Visit(MethodSymbol methodSymbol) {
         cancellationToken.ThrowIfCancellationRequested();
         RegisterLocation(
           methodSymbol,
-          methodSymbol.Declaration.tok,
-          methodSymbol.Declaration.tok.GetLspRange(),
+          methodSymbol.Declaration.Origin,
+          methodSymbol.Declaration.NavigationToken.GetLspRange(),
           GetDeclarationRange(methodSymbol.Declaration)
         );
         VisitChildren(methodSymbol);
@@ -393,18 +388,18 @@ public Unit Visit(MethodSymbol methodSymbol) {
       }
 
       private static Range GetDeclarationRange(Declaration declaration) {
-        return declaration.RangeToken == RangeToken.NoToken
-          ? declaration.tok.GetLspRange()
-          : new Range(declaration.RangeToken.StartToken.GetLspPosition(), declaration.RangeToken.EndToken.GetLspPosition());
+        return declaration.Origin == SourceOrigin.NoToken
+          ? declaration.Origin.GetLspRange()
+          : new Range(declaration.Origin.StartToken.GetLspPosition(), declaration.Origin.EndToken.GetLspPosition());
       }
 
       public Unit Visit(VariableSymbol variableSymbol) {
         cancellationToken.ThrowIfCancellationRequested();
         RegisterLocation(
           variableSymbol,
-          variableSymbol.Declaration.Tok,
-          variableSymbol.Declaration.Tok.GetLspRange(),
-          variableSymbol.Declaration.Tok.GetLspRange()
+          variableSymbol.Declaration.Origin,
+          variableSymbol.Declaration.NavigationToken.GetLspRange(),
+          variableSymbol.Declaration.Origin.GetLspRange()
         );
         VisitChildren(variableSymbol);
         return Unit.Value;
@@ -429,15 +424,15 @@ private void VisitChildren(ILegacySymbol symbol) {
         }
       }
 
-      private void RegisterLocation(ILegacySymbol symbol, IToken token, Range name, Range declaration) {
+      private void RegisterLocation(ILegacySymbol symbol, IOrigin token, Range name, Range declaration) {
         if (token.Filepath != null) {
           // The filename is null if we have a default or System based symbol. This is also reflected by the ranges being usually -1.
           var locationsForUri =
             Locations.GetValueOrDefault(token.Uri) ?? new Dictionary<ILegacySymbol, SymbolLocation>();
           Locations = Locations.SetItem(token.Uri, locationsForUri);
-          locationsForUri.Add(symbol, new SymbolLocation(token.GetDocumentUri(), name, declaration));
+          locationsForUri.Add(symbol, new SymbolLocation(token.Uri, name, declaration));
         }
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Language/SyntaxTreeVisitor.cs b/Source/DafnyLanguageServer/Language/SyntaxTreeVisitor.cs
index 80de4da72d0..c61a513f06e 100644
--- a/Source/DafnyLanguageServer/Language/SyntaxTreeVisitor.cs
+++ b/Source/DafnyLanguageServer/Language/SyntaxTreeVisitor.cs
@@ -1,4 +1,6 @@
-namespace Microsoft.Dafny.LanguageServer.Language {
+using Microsoft.Boogie;
+
+namespace Microsoft.Dafny.LanguageServer.Language {
   /// <summary>
   /// Base syntax tree visitor implementation that visits all nodes,
   /// except auto-generated expressions and attributes.
@@ -12,7 +14,7 @@ public abstract class SyntaxTreeVisitor {
     /// </summary>
     /// <param name="node">The unknown node that is being visited.</param>
     /// <param name="token">The token associated with the unknown node.</param>
-    public abstract void VisitUnknown(object node, IToken token);
+    public abstract void VisitUnknown(object node, IOrigin token);
 
     public virtual void Visit(Program program) {
       foreach (var module in program.Modules()) {
@@ -46,7 +48,7 @@ public virtual void Visit(TopLevelDecl topLevelDeclaration) {
         case NewtypeDecl newTypeDeclaration:
         case TypeSynonymDecl typeSynonymDeclaration:
         default:
-          VisitUnknown(topLevelDeclaration, topLevelDeclaration.tok);
+          VisitUnknown(topLevelDeclaration, topLevelDeclaration.Origin);
           break;
       }
     }
@@ -75,7 +77,7 @@ public virtual void Visit(MemberDecl memberDeclaration) {
           Visit(method);
           break;
         default:
-          VisitUnknown(memberDeclaration, memberDeclaration.tok);
+          VisitUnknown(memberDeclaration, memberDeclaration.Origin);
           break;
       }
     }
@@ -104,6 +106,7 @@ public virtual void Visit(Method method) {
         Visit(ensurement);
       }
       Visit(method.Decreases);
+      Visit(method.Reads);
       Visit(method.Mod);
       VisitNullableBlock(method.Body);
     }
@@ -119,15 +122,13 @@ public virtual void Visit(Function function) {
       foreach (var typeArgument in function.TypeArgs) {
         Visit(typeArgument);
       }
-      foreach (var formal in function.Formals) {
+      foreach (var formal in function.Ins) {
         Visit(formal);
       }
       if (function.Result != null) {
         Visit(function.Result);
       }
-      foreach (var read in function.Reads) {
-        Visit(read);
-      }
+      Visit(function.Reads);
       foreach (var requirement in function.Req) {
         Visit(requirement);
       }
@@ -184,7 +185,7 @@ public virtual void Visit(Statement statement) {
         case VarDeclStmt variableDeclarationStatement:
           Visit(variableDeclarationStatement);
           break;
-        case UpdateStmt updateStatement:
+        case AssignStatement updateStatement:
           Visit(updateStatement);
           break;
         case AssertStmt assertStatement:
@@ -209,7 +210,7 @@ public virtual void Visit(Statement statement) {
           Visit(printStatement);
           break;
         default:
-          VisitUnknown(statement, statement.Tok);
+          VisitUnknown(statement, statement.Origin);
           break;
       }
     }
@@ -234,7 +235,7 @@ public virtual void Visit(AssignmentRhs assignmentRhs) {
           Visit(typeRhs);
           break;
         default:
-          VisitUnknown(assignmentRhs, assignmentRhs.Tok);
+          VisitUnknown(assignmentRhs, assignmentRhs.Origin);
           break;
       }
     }
@@ -328,12 +329,12 @@ public virtual void Visit(VarDeclStmt variableDeclarationStatement) {
       foreach (var localVariable in variableDeclarationStatement.Locals) {
         Visit(localVariable);
       }
-      if (variableDeclarationStatement.Update != null) {
-        Visit(variableDeclarationStatement.Update);
+      if (variableDeclarationStatement.Assign != null) {
+        Visit(variableDeclarationStatement.Assign);
       }
     }
 
-    public virtual void Visit(UpdateStmt updateStatement) {
+    public virtual void Visit(AssignStatement updateStatement) {
       VisitNullableAttributes(updateStatement.Attributes);
       foreach (var leftHandSide in updateStatement.Lhss) {
         Visit(leftHandSide);
@@ -346,7 +347,6 @@ public virtual void Visit(UpdateStmt updateStatement) {
     public virtual void Visit(AssertStmt assertStatement) {
       VisitNullableAttributes(assertStatement.Attributes);
       Visit(assertStatement.Expr);
-      VisitNullableStatement(assertStatement.Proof);
     }
 
     public virtual void Visit(ReturnStmt returnStatement) {
@@ -495,9 +495,12 @@ public virtual void Visit(Expression? expression) {
         case LetExpr letExpression:
           Visit(letExpression);
           break;
+        case DecreasesToExpr decreasesToExpr:
+          Visit(decreasesToExpr);
+          break;
         default:
           if (expression != null) {
-            VisitUnknown(expression, expression.tok);
+            VisitUnknown(expression, expression.Origin);
           }
 
           break;
@@ -699,8 +702,13 @@ public virtual void Visit(LetExpr letExpression) {
       foreach (var rhs in letExpression.RHSs) {
         VisitNullableExpression(rhs);
       }
+
       VisitNullableAttributes(letExpression.Attributes);
       Visit(letExpression.Body);
     }
+
+    public virtual void Visit(DecreasesToExpr decreasesToExpr) {
+      decreasesToExpr.SubExpressions.ForEach(Visit);
+    }
   }
 }
diff --git a/Source/DafnyLanguageServer/Language/VerificationDafnyCodeActionProvider.cs b/Source/DafnyLanguageServer/Language/VerificationDafnyCodeActionProvider.cs
index 0ec5829ec40..28487245780 100644
--- a/Source/DafnyLanguageServer/Language/VerificationDafnyCodeActionProvider.cs
+++ b/Source/DafnyLanguageServer/Language/VerificationDafnyCodeActionProvider.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Dafny.LanguageServer.Handlers;
 using Microsoft.Dafny.LanguageServer.Plugins;
 using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
@@ -15,9 +17,9 @@ namespace Microsoft.Dafny.LanguageServer.Language;
 /// </summary>
 class VerificationDafnyCodeActionProvider : DiagnosticDafnyCodeActionProvider {
   protected override IEnumerable<DafnyCodeAction>? GetDafnyCodeActions(IDafnyCodeActionInput input,
-    DafnyDiagnostic diagnostic, Range selection) {
-    var uri = new Uri(input.Uri);
-    if (diagnostic.Source != MessageSource.Verifier) {
+    Diagnostic diagnostic, Range selection) {
+    var uri = input.Uri;
+    if (diagnostic.Source != MessageSource.Verifier.ToString()) {
       return null;
     }
 
@@ -25,14 +27,17 @@ class VerificationDafnyCodeActionProvider : DiagnosticDafnyCodeActionProvider {
       return null;
     }
 
-    if (relatedInformation.Token.Uri != uri) {
+    if (relatedInformation.Location.Uri != uri) {
       return null;
     }
 
-    var range = relatedInformation.Token.ToRange();
+    var range = FindTokenRangeFromLspRange(input, relatedInformation.Location.Range);
+    if (range == null) {
+      return null;
+    }
     var expression = range.PrintOriginal();
     var statement = $"assert {expression};";
-    var edit = DafnyCodeActionHelpers.InsertAtEndOfBlock(input, diagnostic.Token.GetLspPosition(), statement);
+    var edit = DafnyCodeActionHelpers.InsertAtEndOfBlock(input, diagnostic.Range.Start, statement);
     if (edit == null) {
       return null;
     }
@@ -40,10 +45,13 @@ class VerificationDafnyCodeActionProvider : DiagnosticDafnyCodeActionProvider {
     return new DafnyCodeAction[] {
       new InstantDafnyCodeAction(
         "Assert postcondition at return location where it fails",
-        new List<Diagnostic>(){diagnostic.ToLspDiagnostic()},
+        new List<Diagnostic>(){diagnostic},
         new[] { edit }
       )
     };
 
   }
+
+  public VerificationDafnyCodeActionProvider(ILogger<DafnyCodeActionHandler> logger) : base(logger) {
+  }
 }
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/LanguageServer.cs b/Source/DafnyLanguageServer/LanguageServer.cs
new file mode 100644
index 00000000000..703fbc13e58
--- /dev/null
+++ b/Source/DafnyLanguageServer/LanguageServer.cs
@@ -0,0 +1,127 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Server;
+using Serilog;
+using System;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using DafnyCore;
+using Microsoft.Dafny.LanguageServer.Language;
+using Microsoft.Dafny.LanguageServer.Language.Symbols;
+using Microsoft.Dafny.LanguageServer.Workspace;
+using Microsoft.Extensions.DependencyInjection;
+using OmniSharpLanguageServer = OmniSharp.Extensions.LanguageServer.Server.LanguageServer;
+
+namespace Microsoft.Dafny.LanguageServer {
+  public class LanguageServer {
+
+    public static IEnumerable<Option> Options => new Option[] {
+        BoogieOptionBag.NoVerify,
+        ProjectManager.Verification,
+        GhostStateDiagnosticCollector.GhostIndicators,
+        GutterIconAndHoverVerificationDetailsManager.LineVerificationStatus,
+        VerifySnapshots,
+        DafnyLangSymbolResolver.UseCaching,
+        ProjectManager.UpdateThrottling,
+        CachingProjectFileOpener.ProjectFileCacheExpiry,
+        DeveloperOptionBag.SplitPrint,
+        DeveloperOptionBag.PassivePrint,
+        DeveloperOptionBag.BoogiePrint,
+        InternalDocstringRewritersPluginConfiguration.UseJavadocLikeDocstringRewriterOption,
+        LegacySignatureAndCompletionTable.MigrateSignatureAndCompletionTable
+      }.Concat(DafnyCommands.VerificationOptions).
+      Concat(DafnyCommands.ResolverOptions);
+
+    public static readonly Option<uint> VerifySnapshots = new("--cache-verification", @"
+(experimental)
+0 - do not use any verification result caching (default)
+1 - use the basic verification result caching
+2 - use the more advanced verification result caching
+3 - use the more advanced caching and report errors according
+  to the new source locations for errors and their
+  related locations
+".TrimStart()) {
+      ArgumentHelpName = "level"
+    };
+
+    public static void ConfigureDafnyOptionsForServer(DafnyOptions dafnyOptions) {
+      dafnyOptions.Set(Snippets.ShowSnippets, true);
+    }
+
+    public static async Task Start(DafnyOptions dafnyOptions) {
+      var configuration = CreateConfiguration();
+      InitializeLogger(dafnyOptions, configuration);
+
+      dafnyOptions = new DafnyOptions(dafnyOptions, true);
+      try {
+        Action? shutdownServer = null;
+        var server = await OmniSharpLanguageServer.From(
+          options => options.WithServices(s => s.AddSingleton(dafnyOptions))
+            .WithInput(Console.OpenStandardInput())
+            .WithOutput(Console.OpenStandardOutput())
+            .ConfigureConfiguration(builder => builder.AddConfiguration(configuration))
+            .ConfigureLogging(SetupLogging)
+            .WithUnhandledExceptionHandler(LogException)
+            // ReSharper disable once AccessToModifiedClosure
+            .WithDafnyLanguageServer(dafnyOptions, () => shutdownServer!())
+        );
+        // Prevent any other parts of the language server to actually write to standard output.
+        await using var logWriter = new LogWriter();
+        Console.SetOut(logWriter);
+        shutdownServer = () => server.ForcefulShutdown();
+        await server.WaitForExit;
+      }
+      finally {
+        await Log.CloseAndFlushAsync();
+      }
+    }
+
+    private static IConfiguration CreateConfiguration() {
+      return new ConfigurationBuilder()
+        .AddJsonFile("DafnyLanguageServer.appsettings.json", optional: true)
+        .Build();
+    }
+
+    private static void InitializeLogger(DafnyOptions options, IConfiguration configuration) {
+      // The environment variable is used so a log file can be explicitly created in the application dir.
+      var logLevel = options.Get(CommonOptionBag.LogLevelOption);
+      var logLocation = options.Get(CommonOptionBag.LogLocation) ?? Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+      Environment.SetEnvironmentVariable("DAFNYLS_APP_DIR", logLocation);
+      LoggerConfiguration config = new LoggerConfiguration()
+        .ReadFrom.Configuration(configuration)
+        .MinimumLevel.Override("Microsoft.Dafny", logLevel);
+      if (logLocation != null) {
+        var logFile = Path.Combine(logLocation,
+          "DafnyLanguageServerLog" + DateTime.Now.ToString().Replace("/", "_").Replace("\\", "_") + ".txt");
+        config = config.WriteTo.File(logFile);
+      }
+      Log.Logger = config.CreateLogger();
+    }
+
+    private static void LogException(Exception exception) {
+      Log.Logger.Error(exception, "captured unhandled exception");
+    }
+
+    private static void SetupLogging(ILoggingBuilder builder) {
+      builder
+        .ClearProviders()
+        .AddSerilog(Log.Logger);
+    }
+
+    private class LogWriter : TextWriter {
+      public override void Write(char value) {
+        Log.Logger.Verbose("Unexpected console output: {value}", value);
+      }
+
+      public override void Write(string? value) {
+        Log.Logger.Verbose("Unexpected console output: {value}", value);
+      }
+
+      public override Encoding Encoding { get; } = Encoding.ASCII;
+    }
+  }
+}
diff --git a/Source/DafnyLanguageServer/MarkupTestFile.cs b/Source/DafnyLanguageServer/MarkupTestFile.cs
index a423e68c9f6..6ad103b1706 100644
--- a/Source/DafnyLanguageServer/MarkupTestFile.cs
+++ b/Source/DafnyLanguageServer/MarkupTestFile.cs
@@ -9,10 +9,8 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using System.Security.Policy;
 using System.Text;
 using System.Text.RegularExpressions;
-using Microsoft.CodeAnalysis.Text;
 using Microsoft.Dafny.LanguageServer.Workspace;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
@@ -114,7 +112,7 @@ private static void PopSpan(
         int finalIndex) {
       var (matchIndex, name) = spanStartStack.Pop();
 
-      var span = TextSpan.FromBounds(matchIndex, finalIndex);
+      var span = new TextSpan(matchIndex, finalIndex - matchIndex);
       spans.Add(new AnnotatedSpan(name, span));
     }
 
@@ -197,6 +195,10 @@ public static void GetPositionAndRanges(string input, out string output, out Pos
     // }
   }
 
+  public record TextSpan(int Start, int Length) {
+    public int End => Start + Length;
+  }
+
   public record AnnotatedSpan(string Annotation, TextSpan Span);
   public record AnnotatedRange(string Annotation, Range Range);
 }
diff --git a/Source/DafnyLanguageServer/Plugins/DafnyCodeActionHelpers.cs b/Source/DafnyLanguageServer/Plugins/DafnyCodeActionHelpers.cs
index 75cf8388846..12f1a2c42d0 100644
--- a/Source/DafnyLanguageServer/Plugins/DafnyCodeActionHelpers.cs
+++ b/Source/DafnyLanguageServer/Plugins/DafnyCodeActionHelpers.cs
@@ -37,7 +37,7 @@ public static class DafnyCodeActionHelpers {
   /// <param name="endToken">The position of the closing brace</param>
   /// <param name="text">The document text</param>
   /// <returns>(extra indentation for a statement, current indentation)</returns>
-  public static (string, string) GetIndentationBefore(IToken endToken, int startLine, int startCol) {
+  public static (string, string) GetIndentationBefore(IOrigin endToken, int startLine, int startCol) {
     var indentation = 0;
     var indentationBrace = endToken.col - 1;
     var firstNewline = true;
@@ -110,17 +110,17 @@ public static (string, string) GetIndentationBefore(IToken endToken, int startLi
   /// <param name="input"></param>
   /// <param name="openingBracePosition"></param>
   /// <returns></returns>
-  private static (RangeToken? beforeEndBrace, string indentationExtra, string indentationUntilBrace)
+  private static (SourceOrigin? beforeEndBrace, string indentationExtra, string indentationUntilBrace)
       GetInformationToInsertAtEndOfBlock(IDafnyCodeActionInput input, Position openingBracePosition) {
 
     var (line, col) = openingBracePosition.ToTokenLineAndCol();
-    var endToken = GetMatchingEndToken(input.Program!, input.Uri, line, col);
+    var endToken = GetMatchingEndToken(input.Program!, input.Uri.ToUri(), line, col);
     if (endToken == null) {
       return (null, "", "");
     }
 
     var (extraIndentation, indentationUntilBrace) = GetIndentationBefore(endToken, line, col);
-    var beforeClosingBrace = new RangeToken(endToken, null);
+    var beforeClosingBrace = new SourceOrigin(endToken, null);
     return (beforeClosingBrace, extraIndentation, indentationUntilBrace);
   }
 
@@ -133,22 +133,22 @@ private static (RangeToken? beforeEndBrace, string indentationExtra, string inde
   /// <param name="line">The line of the opening brace</param>
   /// <param name="col">The column of the opening brace</param>
   /// <returns>The token of a matching closing brace, typically the `ÈndTok` of a BlockStmt</returns>
-  private static IToken? GetMatchingEndToken(Dafny.Program program, string documentUri, int line, int col) {
+  private static Token? GetMatchingEndToken(Node program, Uri documentUri, int line, int col) {
     // Look in methods for BlockStmt with the IToken as opening brace
     // Return the EndTok of them.
-    IToken? tokenFound = null;
+    Token? tokenFound = null;
     program.Visit((INode n) => {
       if (tokenFound != null) {
         return false;
       }
 
       if (n.StartToken.line != 0 &&
-          (n.StartToken.Uri.ToString() != documentUri
+          (n.StartToken.Uri != documentUri
            || n.StartToken.line > line || line > n.EndToken.line)) {
         return false; // Outside of the current scope
       }
 
-      if (n is Method method && method.tok.Uri == new Uri(documentUri) && method.Body != null &&
+      if (n is Method method && method.Origin.Uri == documentUri && method.Body != null &&
           method.StartToken.line <= line && line <= method.EndToken.line &&
           GetMatchingEndToken(line, col, method.Body) is { } token) {
         tokenFound = token;
@@ -167,11 +167,11 @@ private static (RangeToken? beforeEndBrace, string indentationExtra, string inde
   /// returns the closing brace token, else null.
   /// Visit substatements recursively
   /// </summary>
-  private static IToken? GetMatchingEndToken(int line, int col, Statement stmt) {
+  private static Token? GetMatchingEndToken(int line, int col, Statement stmt) {
     // Look in methods for BlockStmt with the IToken as opening brace
     // Return the EndTok of them.
-    if (stmt is BlockStmt blockStmt && blockStmt.Tok.line == line && blockStmt.Tok.col == col) {
-      return blockStmt.RangeToken.EndToken;
+    if (stmt is BlockStmt blockStmt && blockStmt.Origin.line == line && blockStmt.Origin.col == col) {
+      return blockStmt.Origin.EndToken;
     }
 
     foreach (var subStmt in stmt.SubStatements) {
diff --git a/Source/DafnyLanguageServer/Plugins/DafnyCodeActionProvider.cs b/Source/DafnyLanguageServer/Plugins/DafnyCodeActionProvider.cs
index 7690043e007..2160c09437d 100644
--- a/Source/DafnyLanguageServer/Plugins/DafnyCodeActionProvider.cs
+++ b/Source/DafnyLanguageServer/Plugins/DafnyCodeActionProvider.cs
@@ -1,5 +1,9 @@
 using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Dafny.LanguageServer.Handlers;
 using Microsoft.Dafny.LanguageServer.Language;
+using Microsoft.Dafny.LanguageServer.Util;
+using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
@@ -30,11 +34,11 @@ public abstract class DafnyCodeActionProvider {
 
   // When building DafnyCodeActionEdit (what DafnyCodeAction return),
   // use this to create ranges suitable for insertion
-  protected static RangeToken InsertBefore(IToken tok) {
-    return new RangeToken(tok, null);
+  protected static SourceOrigin InsertBefore(Token tok) {
+    return new SourceOrigin(tok, null);
   }
-  protected static RangeToken InsertAfter(IToken tok) {
-    return new RangeToken(new Token(tok.line, tok.col + tok.val.Length) {
+  protected static SourceOrigin InsertAfter(IOrigin tok) {
+    return new SourceOrigin(new Token(tok.line, tok.col + tok.val.Length) {
       pos = tok.pos + tok.val.Length,
     }, null);
   }
@@ -45,18 +49,25 @@ protected static RangeToken InsertAfter(IToken tok) {
 /// that are being touched by the selection
 /// </summary>
 public abstract class DiagnosticDafnyCodeActionProvider : DafnyCodeActionProvider {
+  private ILogger<DafnyCodeActionHandler> logger;
+
+  protected DiagnosticDafnyCodeActionProvider(ILogger<DafnyCodeActionHandler> logger) {
+    this.logger = logger;
+  }
+
   public override IEnumerable<DafnyCodeAction> GetDafnyCodeActions(IDafnyCodeActionInput input, Range selection) {
     if (input.Program == null) {
       return System.Array.Empty<DafnyCodeAction>();
     }
     var diagnostics = input.Diagnostics;
     var result = new List<DafnyCodeAction>();
-    foreach (var diagnostic in diagnostics) {
-      var range = diagnostic.Token.GetLspRange();
+    var uri = input.Uri.ToUri();
+    foreach (var diagnostic in diagnostics.Where(d => d.Uri == uri)) {
+      var range = diagnostic.Diagnostic.Range;
       var linesOverlap = range.Start.Line <= selection.Start.Line
                          && selection.Start.Line <= range.End.Line;
       if (linesOverlap) {
-        var moreDafnyCodeActions = GetDafnyCodeActions(input, diagnostic, selection);
+        var moreDafnyCodeActions = GetDafnyCodeActions(input, diagnostic.Diagnostic, selection);
         if (moreDafnyCodeActions != null) {
           result.AddRange(moreDafnyCodeActions);
         }
@@ -73,5 +84,25 @@ public override IEnumerable<DafnyCodeAction> GetDafnyCodeActions(IDafnyCodeActio
   /// <param name="dafnyDiagnostic"></param>
   /// <param name="selection">Where the user's caret is</param>
   protected abstract IEnumerable<DafnyCodeAction>? GetDafnyCodeActions(IDafnyCodeActionInput input,
-    DafnyDiagnostic diagnostic, Range selection);
+    Diagnostic diagnostic, Range selection);
+
+  public SourceOrigin? FindTokenRangeFromLspRange(IDafnyCodeActionInput input, Range range) {
+    var start = range.Start;
+    var startNode = input.Program.FindNode<Node>(input.Uri.ToUri(), start.ToDafnyPosition());
+    if (startNode == null) {
+      // A program should have FileModuleDefinition nodes whose ranges span the entire contents of files,
+      // But currently those nodes are missing
+      return null;
+    }
+
+    var startToken = startNode.CoveredTokens.FirstOrDefault(t => t.line - 1 == start.Line && t.col - 1 == start.Character);
+    if (startToken == null) {
+      logger.LogError($"Could not find starting token for position {start} in node {startNode}");
+      return null;
+    }
+    var end = range.End;
+    var endNode = input.Program.FindNode<Node>(input.Uri.ToUri(), end.ToDafnyPosition());
+    var endToken = endNode.CoveredTokens.FirstOrDefault(t => t.line - 1 == end.Line && t.col - 1 + t.val.Length == end.Character);
+    return new SourceOrigin(startToken, endToken);
+  }
 }
diff --git a/Source/DafnyLanguageServer/Plugins/IDafnyCodeActionInput.cs b/Source/DafnyLanguageServer/Plugins/IDafnyCodeActionInput.cs
index 36f60d485ff..9a2b9bb9e8f 100644
--- a/Source/DafnyLanguageServer/Plugins/IDafnyCodeActionInput.cs
+++ b/Source/DafnyLanguageServer/Plugins/IDafnyCodeActionInput.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
+using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace Microsoft.Dafny.LanguageServer.Plugins;
@@ -8,8 +9,8 @@ public interface IDafnyCodeActionInput {
   /// <summary>
   /// The URI of the document being considered
   /// </summary>
-  string Uri { get; }
-  Program? Program { get; }
-  IEnumerable<DafnyDiagnostic> Diagnostics { get; }
+  DocumentUri Uri { get; }
+  Node? Program { get; }
+  IEnumerable<FileDiagnostic> Diagnostics { get; }
   VerificationTree? VerificationTree { get; }
 }
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Plugins/PluginConfiguration.cs b/Source/DafnyLanguageServer/Plugins/PluginConfiguration.cs
index 7dd8c9e5851..fade531101c 100644
--- a/Source/DafnyLanguageServer/Plugins/PluginConfiguration.cs
+++ b/Source/DafnyLanguageServer/Plugins/PluginConfiguration.cs
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 using System;
+using OmniSharp.Extensions.LanguageServer.Server;
 
 namespace Microsoft.Dafny.LanguageServer.Plugins;
 
@@ -21,4 +22,12 @@ public abstract class PluginConfiguration : Dafny.Plugins.PluginConfiguration {
   public virtual DafnyCodeActionProvider[] GetDafnyCodeActionProviders() {
     return Array.Empty<DafnyCodeActionProvider>();
   }
+
+  /// <summary>
+  /// Override this method to provide additional language server handlers
+  /// </summary>
+  /// <returns>The provided LanguageServerOptions with the additional handlers applied</returns>
+  public virtual LanguageServerOptions WithPluginHandlers(LanguageServerOptions options) {
+    return options;
+  }
 }
diff --git a/Source/DafnyLanguageServer/Server.cs b/Source/DafnyLanguageServer/Server.cs
deleted file mode 100644
index 66edbdf784b..00000000000
--- a/Source/DafnyLanguageServer/Server.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.LanguageServer.Server;
-using Serilog;
-using System;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using OmniSharpLanguageServer = OmniSharp.Extensions.LanguageServer.Server.LanguageServer;
-
-namespace Microsoft.Dafny.LanguageServer {
-  public class Server {
-
-    public static async Task Start(DafnyOptions dafnyOptions) {
-      var configuration = CreateConfiguration();
-      InitializeLogger(configuration);
-      try {
-        Action? shutdownServer = null;
-        var server = await OmniSharpLanguageServer.From(
-          options => options.WithServices(s => s.AddSingleton(dafnyOptions))
-            .WithInput(Console.OpenStandardInput())
-            .WithOutput(Console.OpenStandardOutput())
-            .ConfigureConfiguration(builder => builder.AddConfiguration(configuration))
-            .ConfigureLogging(SetupLogging)
-            .WithUnhandledExceptionHandler(LogException)
-            // ReSharper disable once AccessToModifiedClosure
-            .WithDafnyLanguageServer(() => shutdownServer!())
-        );
-        // Prevent any other parts of the language server to actually write to standard output.
-        await using var logWriter = new LogWriter();
-        Console.SetOut(logWriter);
-        shutdownServer = () => server.ForcefulShutdown();
-        await server.WaitForExit;
-      }
-      finally {
-        Log.CloseAndFlush();
-      }
-    }
-
-    private static IConfiguration CreateConfiguration() {
-      return new ConfigurationBuilder()
-        .AddJsonFile("DafnyLanguageServer.appsettings.json", optional: true)
-        .Build();
-    }
-
-    private static void InitializeLogger(IConfiguration configuration) {
-      // The environment variable is used so a log file can be explicitly created in the application dir.
-      Environment.SetEnvironmentVariable("DAFNYLS_APP_DIR", Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
-      Log.Logger = new LoggerConfiguration()
-        .ReadFrom.Configuration(configuration)
-        .CreateLogger();
-    }
-
-    private static void LogException(Exception exception) {
-      Log.Logger.Error(exception, "captured unhandled exception");
-    }
-
-    private static void SetupLogging(ILoggingBuilder builder) {
-      builder
-        .ClearProviders()
-        .AddSerilog(Log.Logger);
-    }
-
-    private class LogWriter : TextWriter {
-      public override void Write(char value) {
-        Log.Logger.Verbose("Unexpected console output: {value}", value);
-      }
-
-      public override void Write(string? value) {
-        Log.Logger.Verbose("Unexpected console output: {value}", value);
-      }
-
-      public override Encoding Encoding { get; } = Encoding.ASCII;
-    }
-  }
-}
diff --git a/Source/DafnyLanguageServer/ServerCommand.cs b/Source/DafnyLanguageServer/ServerCommand.cs
deleted file mode 100644
index 22e78ff0708..00000000000
--- a/Source/DafnyLanguageServer/ServerCommand.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System.Collections.Generic;
-using System.CommandLine;
-using System.CommandLine.Invocation;
-using DafnyCore;
-using Microsoft.Dafny.LanguageServer.Workspace;
-
-namespace Microsoft.Dafny.LanguageServer;
-
-public class ServerCommand : ICommandSpec {
-  public static readonly ServerCommand Instance = new();
-
-  private ServerCommand() {
-  }
-
-  static ServerCommand() {
-    DafnyOptions.RegisterLegacyBinding(VerifySnapshots, (options, u) => options.VerifySnapshots = (int)u);
-
-    DooFile.RegisterNoChecksNeeded(
-      ProjectMode,
-      Verification,
-      GhostIndicators,
-      LineVerificationStatus,
-      VerifySnapshots,
-      UseCaching
-    );
-  }
-
-  public static readonly Option<bool> UseCaching = new("--use-caching", () => true,
-    "Use caching to speed up analysis done by the Dafny IDE after each text edit.") {
-    IsHidden = true
-  };
-
-  public static readonly Option<bool> GhostIndicators = new("--notify-ghostness",
-    @"
-(experimental, API will change)
-Send notifications that indicate which lines are ghost.".TrimStart());
-
-  public static readonly Option<VerifyOnMode> Verification = new("--verify-on", () => VerifyOnMode.Change, @"
-(experimental)
-Determine when to automatically verify the program. Choose from: Never, OnChange (verify everything in a file when changing the file), OnChangeProject or OnSave.".TrimStart()) {
-    ArgumentHelpName = "event"
-  };
-
-  public static readonly Option<bool> LineVerificationStatus = new("--notify-line-verification-status", @"
-(experimental, API will change)
-Send notifications about the verification status of each line in the program.
-".TrimStart());
-
-  public static readonly Option<bool> ProjectMode = new("--project-mode", () => false,
-    "New mode with working with project files. Will become the default") {
-    IsHidden = true
-  };
-
-  public static readonly Option<uint> VerifySnapshots = new("--cache-verification", @"
-(experimental)
-0 - do not use any verification result caching (default)
-1 - use the basic verification result caching
-2 - use the more advanced verification result caching
-3 - use the more advanced caching and report errors according
-  to the new source locations for errors and their
-  related locations
-".TrimStart()) {
-    ArgumentHelpName = "level"
-  };
-
-  public IEnumerable<Option> Options => new Option[] {
-    ProjectMode,
-    BoogieOptionBag.NoVerify,
-    Verification,
-    GhostIndicators,
-    LineVerificationStatus,
-    VerifySnapshots,
-    UseCaching,
-    DeveloperOptionBag.BoogiePrint,
-    CommonOptionBag.EnforceDeterminism,
-    CommonOptionBag.UseJavadocLikeDocstringRewriterOption
-  }.Concat(ICommandSpec.VerificationOptions).
-    Concat(ICommandSpec.ResolverOptions);
-
-  public Command Create() {
-    return new Command("server", "Start the Dafny language server");
-  }
-
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    ConfigureDafnyOptionsForServer(dafnyOptions);
-  }
-
-  public static void ConfigureDafnyOptionsForServer(DafnyOptions dafnyOptions) {
-    dafnyOptions.RunLanguageServer = true;
-    dafnyOptions.Set(DafnyConsolePrinter.ShowSnippets, true);
-
-    dafnyOptions.PrintIncludesMode = DafnyOptions.IncludesModes.None;
-
-    // TODO This may be subject to change. See Microsoft.Boogie.Counterexample
-    //      A dash means write to the textwriter instead of a file.
-    // https://github.com/boogie-org/boogie/blob/b03dd2e4d5170757006eef94cbb07739ba50dddb/Source/VCGeneration/Couterexample.cs#L217
-    dafnyOptions.ModelViewFile = "-";
-
-    dafnyOptions.ProverOptions.AddRange(new List<string>()
-    {
-      "O:model_compress=false", // Replaced by "O:model.compact=false" if z3's version is > 4.8.6
-      "O:model.completion=true",
-      "O:model_evaluator.completion=true"
-    });
-  }
-}
diff --git a/Source/DafnyLanguageServer/StandaloneServerCli.cs b/Source/DafnyLanguageServer/StandaloneServerCli.cs
deleted file mode 100644
index d93a5ed1678..00000000000
--- a/Source/DafnyLanguageServer/StandaloneServerCli.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.LanguageServer.Server;
-using Serilog;
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Dafny.LanguageServer.Workspace;
-using Microsoft.Extensions.DependencyInjection;
-using OmniSharpLanguageServer = OmniSharp.Extensions.LanguageServer.Server.LanguageServer;
-
-namespace Microsoft.Dafny.LanguageServer {
-  public class ServerProgram {
-    public static async Task Main(string[] args) {
-      var dafnyOptions = GetOptionsFromArgs(Console.Out, Console.In, args);
-
-      await Server.Start(dafnyOptions);
-    }
-
-    public static DafnyOptions GetOptionsFromArgs(TextWriter outWriter, TextReader input, string[] args) {
-      var configuration = CreateConfiguration(args);
-
-      var dafnyOptions = DafnyOptions.Create(outWriter, input);
-
-      var verifierOptions = new VerifierOptions();
-      configuration.Bind(VerifierOptions.Section, verifierOptions);
-      dafnyOptions.Set(ServerCommand.LineVerificationStatus, verifierOptions.GutterStatus);
-      dafnyOptions.Set(BoogieOptionBag.VerificationTimeLimit, verifierOptions.TimeLimit);
-      dafnyOptions.Set(BoogieOptionBag.Cores, verifierOptions.VcsCores);
-      dafnyOptions.Set(ServerCommand.VerifySnapshots, verifierOptions.VerifySnapshots);
-
-      var ghostOptions = new GhostOptions();
-      configuration.Bind(GhostOptions.Section, ghostOptions);
-      dafnyOptions.Set(ServerCommand.GhostIndicators, ghostOptions.MarkStatements);
-
-      var documentOptions = new DocumentOptions();
-      configuration.Bind(DocumentOptions.Section, documentOptions);
-      var mode = documentOptions.Verify switch {
-        AutoVerification.Never => VerifyOnMode.Never,
-        AutoVerification.OnChange => VerifyOnMode.Change,
-        AutoVerification.OnSave => VerifyOnMode.Save,
-        _ => throw new ArgumentOutOfRangeException()
-      };
-      dafnyOptions.Set(ServerCommand.Verification, mode);
-
-      var pluginOptions = new DafnyPluginsOptions();
-      configuration.Bind(DafnyPluginsOptions.Section, pluginOptions);
-      dafnyOptions.Set(CommonOptionBag.Plugin, pluginOptions.Plugins.ToList());
-      return dafnyOptions;
-    }
-
-    private static IConfiguration CreateConfiguration(string[] args) {
-      return new ConfigurationBuilder()
-        .AddCommandLine(args)
-        .Build();
-    }
-  }
-}
diff --git a/Source/DafnyLanguageServer/Util/PathExtensions.cs b/Source/DafnyLanguageServer/Util/PathExtensions.cs
index ea0609397a4..ce6275b84bb 100644
--- a/Source/DafnyLanguageServer/Util/PathExtensions.cs
+++ b/Source/DafnyLanguageServer/Util/PathExtensions.cs
@@ -16,7 +16,7 @@ public static class PathExtensions {
     /// </summary>
     /// <param name="compilation">The document to get the file path of.</param>
     /// <returns>The file path.</returns>
-    public static string GetFilePath(this Compilation compilation) {
+    public static string GetFilePath(this CompilationInput compilation) {
       return GetFilePath(compilation.Uri);
     }
 
@@ -52,11 +52,11 @@ public static bool IsEntryDocument(this Dafny.Program program, DocumentUri docum
     /// <param name="token">The token to get the boogie token from.</param>
     /// <returns>The uri of the document where the token is located.</returns>
     public static DocumentUri GetDocumentUri(this Boogie.IToken token) {
-      while (token is RefinementToken refinementToken) {
+      while (token is RefinementOrigin refinementToken) {
         token = refinementToken.WrappedToken;
       }
 
-      return DocumentUri.From(((IToken)token).Uri);
+      return DocumentUri.From(((IOrigin)token).Uri);
     }
 
     /// <summary>
diff --git a/Source/DafnyLanguageServer/Util/PositionExtensions.cs b/Source/DafnyLanguageServer/Util/PositionExtensions.cs
deleted file mode 100644
index 7580181849d..00000000000
--- a/Source/DafnyLanguageServer/Util/PositionExtensions.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Microsoft.Dafny.LanguageServer.Language;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-
-namespace Microsoft.Dafny.LanguageServer.Util; 
-
-public static class PositionExtensions {
-  public static DafnyPosition ToDafnyPosition(this IToken token) {
-    return new DafnyPosition(token.line + BoogieExtensions.LineOffset, token.col + BoogieExtensions.ColumnOffset);
-  }
-  public static DafnyPosition ToDafnyPosition(this Position position) {
-    return new DafnyPosition(position.Line, position.Character);
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/CachingProjectFileOpener.cs b/Source/DafnyLanguageServer/Workspace/CachingProjectFileOpener.cs
new file mode 100644
index 00000000000..5045053dd33
--- /dev/null
+++ b/Source/DafnyLanguageServer/Workspace/CachingProjectFileOpener.cs
@@ -0,0 +1,45 @@
+using System;
+using System.CommandLine;
+using System.Runtime.Caching;
+using System.Threading.Tasks;
+using DafnyCore;
+using Microsoft.Dafny;
+
+public class CachingProjectFileOpener : ProjectFileOpener {
+  public const int DefaultProjectFileCacheExpiryTime = 100;
+  private readonly object nullRepresentative = new(); // Needed because you can't store null in the MemoryCache, but that's a value we want to cache.
+  private readonly DafnyOptions serverOptions;
+  private readonly MemoryCache projectFilePerFolderCache = new("projectFiles");
+
+
+  static CachingProjectFileOpener() {
+    OptionRegistry.RegisterOption(ProjectFileCacheExpiry, OptionScope.Cli);
+  }
+
+  public CachingProjectFileOpener(IFileSystem fileSystem, DafnyOptions serverOptions, IOrigin origin) : base(fileSystem, origin) {
+    this.serverOptions = serverOptions;
+  }
+
+  public static readonly Option<int> ProjectFileCacheExpiry = new("--project-file-cache-expiry", () => DefaultProjectFileCacheExpiryTime,
+    @"How many milliseconds the server will cache project file contents".TrimStart()) {
+    IsHidden = true
+  };
+
+  protected override async Task<DafnyProject?> OpenProjectInFolder(string folderPath) {
+    var cacheExpiry = serverOptions.Get(ProjectFileCacheExpiry);
+    if (cacheExpiry == 0) {
+      return await base.OpenProjectInFolder(folderPath);
+    }
+
+    var cachedResult = projectFilePerFolderCache.Get(folderPath);
+    if (cachedResult != null) {
+      return cachedResult == nullRepresentative ? null : ((DafnyProject?)cachedResult)?.Clone();
+    }
+
+    var result = await base.OpenProjectInFolder(folderPath);
+    projectFilePerFolderCache.Set(new CacheItem(folderPath, (object?)result ?? nullRepresentative), new CacheItemPolicy {
+      AbsoluteExpiration = new DateTimeOffset(DateTime.Now.Add(TimeSpan.FromMilliseconds(cacheExpiry)))
+    });
+    return result?.Clone();
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/CompilationManager.cs b/Source/DafnyLanguageServer/Workspace/CompilationManager.cs
deleted file mode 100644
index 38c08591dd6..00000000000
--- a/Source/DafnyLanguageServer/Workspace/CompilationManager.cs
+++ /dev/null
@@ -1,474 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Dafny.LanguageServer.Util;
-using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
-using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using VC;
-using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace;
-
-public delegate CompilationManager CreateCompilationManager(
-  DafnyOptions options,
-  ExecutionEngine boogieEngine,
-  Compilation compilation,
-  IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees);
-
-/// <summary>
-/// The compilation of a single document version.
-/// The document will be parsed, resolved, translated to Boogie and verified.
-///
-/// Compilation may be configured to pause after translation,
-/// requiring a call to CompilationManager.Verify for the document to be verified.
-///
-/// Compilation is agnostic to document updates, it does not handle the migration of old document state.
-/// </summary>
-public class CompilationManager {
-
-  private readonly ILogger logger;
-  private readonly ITextDocumentLoader documentLoader;
-  private readonly ICompilationStatusNotificationPublisher statusPublisher;
-  private readonly INotificationPublisher notificationPublisher;
-  private readonly IProgramVerifier verifier;
-  private readonly IVerificationProgressReporter verificationProgressReporter;
-
-  // TODO CompilationManager shouldn't be aware of migration
-  private readonly IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees;
-
-  private TaskCompletionSource started = new();
-  private readonly IScheduler verificationUpdateScheduler = new EventLoopScheduler();
-  private readonly CancellationTokenSource cancellationSource;
-
-  private TaskCompletionSource verificationCompleted = new();
-  private readonly DafnyOptions options;
-  private readonly Compilation startingCompilation;
-  private readonly ExecutionEngine boogieEngine;
-
-  private readonly Subject<Compilation> compilationUpdates = new();
-  public IObservable<Compilation> CompilationUpdates => compilationUpdates;
-
-  public Task<CompilationAfterParsing> ParsedCompilation { get; }
-  public Task<CompilationAfterResolution> ResolvedCompilation { get; }
-
-  public CompilationManager(
-    ILogger<CompilationManager> logger,
-    ITextDocumentLoader documentLoader,
-    INotificationPublisher notificationPublisher,
-    IProgramVerifier verifier,
-    ICompilationStatusNotificationPublisher statusPublisher,
-    IVerificationProgressReporter verificationProgressReporter,
-    DafnyOptions options,
-    ExecutionEngine boogieEngine,
-    Compilation compilation,
-    IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees
-    ) {
-    this.options = options;
-    startingCompilation = compilation;
-    this.boogieEngine = boogieEngine;
-    this.migratedVerificationTrees = migratedVerificationTrees;
-
-    this.documentLoader = documentLoader;
-    this.logger = logger;
-    this.notificationPublisher = notificationPublisher;
-    this.verifier = verifier;
-    this.statusPublisher = statusPublisher;
-    this.verificationProgressReporter = verificationProgressReporter;
-    cancellationSource = new();
-    cancellationSource.Token.Register(() => started.TrySetCanceled(cancellationSource.Token));
-
-    MarkVerificationFinished();
-
-    ParsedCompilation = ParseAsync();
-    ResolvedCompilation = ResolveAsync();
-  }
-
-  public void Start() {
-    started.TrySetResult();
-  }
-
-  private async Task<CompilationAfterParsing> ParseAsync() {
-    try {
-      await started.Task;
-      var parsedCompilation = await documentLoader.ParseAsync(options, startingCompilation, migratedVerificationTrees, cancellationSource.Token);
-      foreach (var root in parsedCompilation.RootUris) {
-        verificationProgressReporter.ReportRealtimeDiagnostics(parsedCompilation, root, false);
-      }
-      compilationUpdates.OnNext(parsedCompilation);
-      logger.LogDebug($"Passed parsedCompilation to documentUpdates.OnNext, resolving ParsedCompilation task for version {parsedCompilation.Version}.");
-      return parsedCompilation;
-
-    } catch (Exception e) {
-      compilationUpdates.OnError(e);
-      throw;
-    }
-  }
-
-  private async Task<CompilationAfterResolution> ResolveAsync() {
-    try {
-      var parsedCompilation = await ParsedCompilation;
-      var resolvedCompilation = await documentLoader.ResolveAsync(options, parsedCompilation, migratedVerificationTrees, cancellationSource.Token);
-
-      if (!resolvedCompilation.Program.Reporter.HasErrors) {
-        verificationProgressReporter.RecomputeVerificationTrees(resolvedCompilation);
-        foreach (var root in resolvedCompilation.RootUris) {
-          verificationProgressReporter.ReportRealtimeDiagnostics(resolvedCompilation, root, true);
-        }
-      }
-
-      compilationUpdates.OnNext(resolvedCompilation);
-      logger.LogDebug($"Passed resolvedCompilation to documentUpdates.OnNext, resolving ResolvedCompilation task for version {resolvedCompilation.Version}.");
-      return resolvedCompilation;
-
-    } catch (Exception e) {
-      compilationUpdates.OnError(e);
-      throw;
-    }
-  }
-
-  private static string GetImplementationName(Implementation implementation) {
-    var prefix = implementation.Name.Split(Translator.NameSeparator)[0];
-
-    // Refining declarations get the token of what they're refining, so to distinguish them we need to
-    // add the refining module name to the prefix.
-    if (implementation.tok is RefinementToken refinementToken) {
-      prefix += "." + refinementToken.InheritingModule.Name;
-    }
-
-    return prefix;
-  }
-
-  private int runningVerificationJobs;
-
-  public async Task<bool> VerifySymbol(FilePosition verifiableLocation, bool actuallyVerifyTasks = true) {
-    cancellationSource.Token.ThrowIfCancellationRequested();
-
-    var compilation = await ResolvedCompilation;
-    var verifiable = compilation.Program.FindNode<ICanVerify>(verifiableLocation.Uri, verifiableLocation.Position.ToDafnyPosition());
-    if (verifiable == null) {
-      return false;
-    }
-
-    if (compilation.ResolutionDiagnostics.Values.SelectMany(x => x).Any(d =>
-          d.Level == ErrorLevel.Error &&
-          d.Source != MessageSource.Compiler &&
-          d.Source != MessageSource.Verifier)) {
-      throw new TaskCanceledException();
-    }
-
-    var containingModule = verifiable.ContainingModule;
-
-    IncrementJobs();
-
-    IReadOnlyDictionary<FilePosition, IReadOnlyList<IImplementationTask>> tasksForModule;
-    try {
-      tasksForModule = await compilation.TranslatedModules.GetOrAdd(containingModule, async m => {
-        _ = statusPublisher.SendStatusNotification(compilation, CompilationStatus.PreparingVerification);
-        var result = await verifier.GetVerificationTasksAsync(boogieEngine, compilation, containingModule,
-          cancellationSource.Token);
-        compilation.ResolutionDiagnostics = ((DiagnosticErrorReporter)compilation.Program.Reporter).AllDiagnosticsCopy;
-        compilationUpdates.OnNext(compilation);
-        foreach (var task in result) {
-          cancellationSource.Token.Register(task.Cancel);
-        }
-
-        return result.GroupBy(t => ((IToken)t.Implementation.tok).GetFilePosition()).ToDictionary(
-          g => g.Key,
-          g => (IReadOnlyList<IImplementationTask>)g.ToList());
-      });
-    } catch (Exception e) {
-      verificationCompleted.TrySetException(e);
-      compilationUpdates.OnError(e);
-      throw;
-    }
-
-    var updated = false;
-    var implementations = compilation.ImplementationsPerVerifiable.GetOrAdd(verifiable, _ => {
-      var tasksForVerifiable =
-        tasksForModule.GetValueOrDefault(verifiable.NameToken.GetFilePosition()) ?? new List<IImplementationTask>(0);
-
-      verificationProgressReporter.ReportImplementationsBeforeVerification(compilation,
-        verifiable, tasksForVerifiable.Select(t => t.Implementation).ToArray());
-
-      verificationProgressReporter.ReportRealtimeDiagnostics(compilation, verifiable.Tok.Uri, true);
-
-      updated = true;
-      return tasksForVerifiable.ToDictionary(
-        t => GetImplementationName(t.Implementation),
-        t => new ImplementationView(t, PublishedVerificationStatus.Stale, Array.Empty<DafnyDiagnostic>()));
-    });
-    if (updated) {
-      compilationUpdates.OnNext(compilation);
-    }
-
-    if (actuallyVerifyTasks) {
-
-      var tasks = implementations.Values.Select(t => t.Task).ToList();
-
-      foreach (var task in tasks) {
-        var statusUpdates = task.TryRun();
-        if (statusUpdates == null) {
-          if (task.CacheStatus is Completed completedCache) {
-            foreach (var result in completedCache.Result.VCResults) {
-              verificationProgressReporter.ReportVerifyImplementationRunning(compilation, task.Implementation);
-              verificationProgressReporter.ReportAssertionBatchResult(compilation,
-                new AssertionBatchResult(task.Implementation, result));
-            }
-
-            verificationProgressReporter.ReportEndVerifyImplementation(compilation, task.Implementation,
-              completedCache.Result);
-          }
-
-          StatusUpdateHandlerFinally();
-          return false;
-        }
-
-        var incrementedJobs = Interlocked.Increment(ref runningVerificationJobs);
-        logger.LogDebug($"Incremented jobs for task, remaining jobs {incrementedJobs}, {compilation.Uri} version {compilation.Version}");
-
-        statusUpdates.ObserveOn(verificationUpdateScheduler).Subscribe(
-          update => {
-            try {
-              HandleStatusUpdate(compilation, verifiable, task, update);
-            } catch (Exception e) {
-              logger.LogError(e, "Caught exception in statusUpdates OnNext.");
-            }
-          },
-          e => {
-            if (e is not OperationCanceledException) {
-              logger.LogError(e, $"Caught error in statusUpdates observable.");
-            }
-
-            StatusUpdateHandlerFinally();
-          },
-          StatusUpdateHandlerFinally
-        );
-      }
-
-      void StatusUpdateHandlerFinally() {
-        try {
-          var remainingJobs = Interlocked.Decrement(ref runningVerificationJobs);
-          logger.LogDebug(
-            $"StatusUpdateHandlerFinally called, remaining jobs {remainingJobs}, {compilation.Uri} version {compilation.Version}, " +
-            $"startingCompilation.version {startingCompilation.Version}.");
-          if (remainingJobs == 0) {
-            FinishedNotifications(compilation, verifiable);
-          }
-        } catch (Exception e) {
-          logger.LogCritical(e, "Caught exception while handling finally code of statusUpdates handler.");
-        }
-      }
-    }
-
-    DecrementJobs();
-    return true;
-  }
-
-  public void IncrementJobs() {
-    MarkVerificationStarted();
-    var verifyTaskIncrementedJobs = Interlocked.Increment(ref runningVerificationJobs);
-    logger.LogDebug($"Incremented jobs for verifyTask, remaining jobs {verifyTaskIncrementedJobs}, {startingCompilation.Uri} version {startingCompilation.Version}");
-  }
-
-  public void DecrementJobs() {
-    var remainingJobs = Interlocked.Decrement(ref runningVerificationJobs);
-    logger.LogDebug($"Decremented jobs, remaining jobs {remainingJobs}, {startingCompilation.Uri} version {startingCompilation.Version}");
-    if (remainingJobs == 0) {
-      logger.LogDebug($"Calling MarkVerificationFinished because there are no remaining verification jobs for {startingCompilation.Uri}, version {startingCompilation.Version}.");
-      MarkVerificationFinished();
-    }
-  }
-
-  private void FinishedNotifications(CompilationAfterResolution compilation, ICanVerify canVerify) {
-    if (ReportGutterStatus) {
-      if (!cancellationSource.IsCancellationRequested) {
-        // All unvisited trees need to set them as "verified"
-        verificationProgressReporter.SetAllUnvisitedMethodsAsVerified(compilation, canVerify);
-      }
-
-      verificationProgressReporter.ReportRealtimeDiagnostics(compilation, canVerify.Tok.Uri, true);
-    }
-
-    MarkVerificationFinished();
-  }
-
-  private void HandleStatusUpdate(CompilationAfterResolution compilation, ICanVerify verifiable, IImplementationTask implementationTask, IVerificationStatus boogieStatus) {
-    var status = StatusFromBoogieStatus(boogieStatus);
-
-    var tokenString = implementationTask.Implementation.tok.TokenToString(options);
-    var implementations = compilation.ImplementationsPerVerifiable[verifiable];
-
-    var implementationName = GetImplementationName(implementationTask.Implementation);
-    logger.LogDebug($"Received status {boogieStatus} for {tokenString}, version {compilation.Version}");
-    if (boogieStatus is Running) {
-      verificationProgressReporter.ReportVerifyImplementationRunning(compilation, implementationTask.Implementation);
-    }
-
-    DafnyDiagnostic[] newDiagnostics;
-    if (boogieStatus is BatchCompleted batchCompleted) {
-      verificationProgressReporter.ReportAssertionBatchResult(compilation,
-        new AssertionBatchResult(implementationTask.Implementation, batchCompleted.VcResult));
-
-      foreach (var counterExample in batchCompleted.VcResult.counterExamples) {
-        compilation.Counterexamples.Add(counterExample);
-      }
-
-      newDiagnostics = GetDiagnosticsFromResult(compilation, implementationTask, batchCompleted.VcResult).ToArray();
-    } else {
-      newDiagnostics = Array.Empty<DafnyDiagnostic>();
-    }
-
-    var view = implementations.TryGetValue(implementationName, out var taskAndView)
-      ? taskAndView
-      : new ImplementationView(implementationTask, status, Array.Empty<DafnyDiagnostic>());
-    implementations[implementationName] = view with { Status = status, Diagnostics = view.Diagnostics.Concat(newDiagnostics).ToArray() };
-
-    if (boogieStatus is Completed completed) {
-      var verificationResult = completed.Result;
-      // Sometimes, the boogie status is set as Completed
-      // but the assertion batches were not reported yet.
-      // because they are on a different thread.
-      // This loop will ensure that every vc result has been dealt with
-      // before we report that the verification of the implementation is finished 
-      foreach (var result in completed.Result.VCResults) {
-        logger.LogDebug($"Possibly duplicate reporting assertion batch {result.vcNum} as completed in {tokenString}, version {compilation.Version}");
-        verificationProgressReporter.ReportAssertionBatchResult(compilation,
-          new AssertionBatchResult(implementationTask.Implementation, result));
-      }
-      verificationProgressReporter.ReportEndVerifyImplementation(compilation, implementationTask.Implementation, verificationResult);
-    }
-    compilationUpdates.OnNext(compilation);
-  }
-
-  private bool ReportGutterStatus => options.Get(ServerCommand.LineVerificationStatus);
-
-  private List<DafnyDiagnostic> GetDiagnosticsFromResult(CompilationAfterResolution compilation, IImplementationTask task, VCResult result) {
-    var errorReporter = new DiagnosticErrorReporter(options, compilation.Uri.ToUri());
-    var outcome = GetOutcome(result.outcome);
-    foreach (var counterExample in result.counterExamples) {
-      errorReporter.ReportBoogieError(counterExample.CreateErrorInformation(outcome, options.ForceBplErrors));
-    }
-
-    var implementation = task.Implementation;
-    boogieEngine.ReportOutcome(null, outcome, outcomeError => errorReporter.ReportBoogieError(outcomeError),
-      implementation.VerboseName, implementation.tok, null, TextWriter.Null,
-      implementation.GetTimeLimit(options), result.counterExamples);
-
-    var diagnostics = errorReporter.AllDiagnosticsCopy.Values.SelectMany(x => x);
-    return diagnostics.OrderBy(d => d.Token.GetLspPosition()).ToList();
-  }
-
-  private ConditionGeneration.Outcome GetOutcome(ProverInterface.Outcome outcome) {
-    switch (outcome) {
-      case ProverInterface.Outcome.Valid:
-        return ConditionGeneration.Outcome.Correct;
-      case ProverInterface.Outcome.Invalid:
-        return ConditionGeneration.Outcome.Errors;
-      case ProverInterface.Outcome.TimeOut:
-        return ConditionGeneration.Outcome.TimedOut;
-      case ProverInterface.Outcome.OutOfMemory:
-        return ConditionGeneration.Outcome.OutOfMemory;
-      case ProverInterface.Outcome.OutOfResource:
-        return ConditionGeneration.Outcome.OutOfResource;
-      case ProverInterface.Outcome.Undetermined:
-        return ConditionGeneration.Outcome.Inconclusive;
-      case ProverInterface.Outcome.Bounded:
-        return ConditionGeneration.Outcome.ReachedBound;
-      default:
-        throw new ArgumentOutOfRangeException(nameof(outcome), outcome, null);
-    }
-  }
-
-  private static PublishedVerificationStatus StatusFromBoogieStatus(IVerificationStatus verificationStatus) {
-    switch (verificationStatus) {
-      case Stale:
-        return PublishedVerificationStatus.Stale;
-      case Queued:
-        return PublishedVerificationStatus.Queued;
-      case Running:
-      case BatchCompleted:
-        return PublishedVerificationStatus.Running;
-      case Completed completed:
-        return completed.Result.Outcome == ConditionGeneration.Outcome.Correct
-          ? PublishedVerificationStatus.Correct
-          : PublishedVerificationStatus.Error;
-      default:
-        throw new ArgumentOutOfRangeException();
-    }
-  }
-
-  public void CancelPendingUpdates() {
-    cancellationSource.Cancel();
-  }
-
-  private void MarkVerificationStarted() {
-    logger.LogDebug($"MarkVerificationStarted called for {startingCompilation.Uri} version {startingCompilation.Version}");
-    if (verificationCompleted.Task.IsCompleted) {
-      verificationCompleted = new TaskCompletionSource();
-    }
-  }
-
-  private void MarkVerificationFinished() {
-    logger.LogDebug($"MarkVerificationFinished called for {startingCompilation.Uri} version {startingCompilation.Version}");
-    verificationCompleted.TrySetResult();
-  }
-
-  public Task<CompilationAfterParsing> LastDocument {
-    get {
-      logger.LogDebug($"LastDocument {startingCompilation.Uri} will return document version {startingCompilation.Version}");
-      return ResolvedCompilation.ContinueWith(
-        t => {
-          if (t.IsCompletedSuccessfully) {
-#pragma warning disable VSTHRD103
-            return verificationCompleted.Task.ContinueWith(
-              verificationCompletedTask => {
-                logger.LogDebug(
-                  $"LastDocument returning translated compilation {startingCompilation.Uri} with status {verificationCompletedTask.Status}");
-                return Task.FromResult<CompilationAfterParsing>(t.Result);
-              }, TaskScheduler.Current).Unwrap();
-#pragma warning restore VSTHRD103
-          }
-
-          return ParsedCompilation;
-        }, TaskScheduler.Current).Unwrap();
-    }
-  }
-
-  public async Task<TextEditContainer?> GetTextEditToFormatCode(Uri uri) {
-    // TODO https://github.com/dafny-lang/dafny/issues/3416
-    var parsedDocument = await ParsedCompilation;
-    if (parsedDocument.GetDiagnostics(uri).Any(diagnostic =>
-          diagnostic.Level == ErrorLevel.Error &&
-          diagnostic.Source == MessageSource.Parser
-        )) {
-      return null;
-    }
-
-    var firstToken = parsedDocument.Program.GetFirstTopLevelToken();
-    if (firstToken == null) {
-      return null;
-    }
-    var result = Formatting.__default.ReindentProgramFromFirstToken(firstToken,
-      IndentationFormatter.ForProgram(parsedDocument.Program));
-
-    var lastToken = firstToken;
-    while (lastToken.Next != null) {
-      lastToken = lastToken.Next;
-    }
-    // TODO: https://github.com/dafny-lang/dafny/issues/3415
-    return new TextEditContainer(new TextEdit[] {
-      // TODO end position doesn't take into account trailing trivia
-      new() {NewText = result, Range = new Range(new Position(0,0), lastToken.GetLspPosition())}
-    });
-
-  }
-}
diff --git a/Source/DafnyLanguageServer/Workspace/CompilationStatusNotificationPublisher.cs b/Source/DafnyLanguageServer/Workspace/CompilationStatusNotificationPublisher.cs
deleted file mode 100644
index aa04ac65a8f..00000000000
--- a/Source/DafnyLanguageServer/Workspace/CompilationStatusNotificationPublisher.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
-using OmniSharp.Extensions.LanguageServer.Protocol.Server;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace {
-  public class CompilationStatusNotificationPublisher : ICompilationStatusNotificationPublisher {
-    private readonly ITextDocumentLanguageServer languageServer;
-    private readonly IProjectDatabase projectDatabase;
-
-    public CompilationStatusNotificationPublisher(ITextDocumentLanguageServer languageServer, IProjectDatabase projectDatabase) {
-      this.languageServer = languageServer;
-      this.projectDatabase = projectDatabase;
-    }
-
-    public async Task SendStatusNotification(Compilation compilation, CompilationStatus status,
-      string? message = null) {
-      foreach (var uri in compilation.RootUris) {
-        var uriProject = await projectDatabase.GetProject(uri);
-        var ownedUri = uriProject.Equals(compilation.Project);
-        if (ownedUri) {
-          languageServer.SendNotification(new CompilationStatusParams {
-            Uri = uri,
-            Version = compilation.Version,
-            Status = status,
-            Message = message
-          });
-        }
-      }
-    }
-  }
-}
diff --git a/Source/DafnyLanguageServer/Workspace/DocumentTextBuffer.cs b/Source/DafnyLanguageServer/Workspace/DocumentTextBuffer.cs
deleted file mode 100644
index c28f12da43b..00000000000
--- a/Source/DafnyLanguageServer/Workspace/DocumentTextBuffer.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.IO;
-using System.Net.Mime;
-using OmniSharp.Extensions.LanguageServer.Protocol;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace;
-
-public class DocumentTextBuffer {
-  public TextDocumentItem TextDocumentItem { get; }
-  public TextBuffer Buffer { get; }
-  public DocumentTextBuffer(TextDocumentItem documentItem) {
-    TextDocumentItem = documentItem;
-    Buffer = new TextBuffer(documentItem.Text);
-  }
-
-  public DocumentTextBuffer(TextDocumentItem documentItem, TextBuffer buffer) {
-    TextDocumentItem = documentItem;
-    Buffer = buffer;
-  }
-
-  public Range Range => new Range(0, 0, NumberOfLines, 0);
-
-  public Position FromIndex(int index) {
-    return Buffer.FromIndex(index);
-  }
-
-  public int ToIndex(Position position) {
-    return Buffer.ToIndex(position);
-  }
-
-  public string Extract(Range range) {
-    return Buffer.Extract(range);
-  }
-
-  public static implicit operator TextDocumentItem(DocumentTextBuffer buffer) => buffer.TextDocumentItem;
-  public string Text => TextDocumentItem.Text;
-  public DocumentUri Uri => TextDocumentItem.Uri;
-  public int? Version => TextDocumentItem.Version;
-
-  public int NumberOfLines => Buffer.Lines.Count;
-  public TextReader Content => new StringReader(Text);
-}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/Documents/Compilation.cs b/Source/DafnyLanguageServer/Workspace/Documents/Compilation.cs
deleted file mode 100644
index 97ecc0eb365..00000000000
--- a/Source/DafnyLanguageServer/Workspace/Documents/Compilation.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using OmniSharp.Extensions.LanguageServer.Protocol;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Dynamic;
-using System.Linq;
-using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer.Language.Symbols;
-using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
-using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace {
-
-
-  /// <summary>
-  /// Internal representation of a specific version of a Dafny document.
-  ///
-  /// Only one instance should exist of a specific version.
-  /// Asynchronous compilation tasks use this instance to synchronise on.
-  ///
-  /// When verification starts, no new instances of Compilation will be created for this version.
-  /// There can be different verification threads that update the state of this object.
-  /// </summary>
-  public class Compilation {
-    public IReadOnlyList<Uri> RootUris { get; }
-    public int Version { get; }
-    public DafnyProject Project { get; }
-    public DocumentUri Uri => Project.Uri;
-
-    public Compilation(int version, DafnyProject project, IReadOnlyList<Uri> rootUris) {
-      this.RootUris = rootUris;
-      Version = version;
-      Project = project;
-    }
-
-    public virtual IEnumerable<DafnyDiagnostic> GetDiagnostics(Uri uri) => Enumerable.Empty<DafnyDiagnostic>();
-
-    public IdeState InitialIdeState(Compilation initialCompilation, DafnyOptions options) {
-      var program = new EmptyNode();
-      return ToIdeState(new IdeState(initialCompilation.Version, initialCompilation, program,
-        ImmutableDictionary<Uri, IReadOnlyList<Diagnostic>>.Empty,
-        SymbolTable.Empty(), LegacySignatureAndCompletionTable.Empty(options, initialCompilation.Project), new(),
-        Array.Empty<Counterexample>(),
-        ImmutableDictionary<Uri, IReadOnlyList<Range>>.Empty,
-        initialCompilation.RootUris.ToDictionary(uri => uri, uri => (VerificationTree)new DocumentVerificationTree(program, uri))
-      ));
-    }
-
-    /// <summary>
-    /// Collects information to present to the IDE
-    /// </summary>
-    public virtual IdeState ToIdeState(IdeState previousState) {
-      return previousState with {
-        Compilation = this
-      };
-    }
-  }
-
-  public record ImplementationView(IImplementationTask Task, PublishedVerificationStatus Status,
-    IReadOnlyList<DafnyDiagnostic> Diagnostics);
-
-  public record BufferLine(int LineNumber, int StartIndex, int EndIndex);
-}
diff --git a/Source/DafnyLanguageServer/Workspace/Documents/CompilationAfterParsing.cs b/Source/DafnyLanguageServer/Workspace/Documents/CompilationAfterParsing.cs
deleted file mode 100644
index 8ddddbcb47f..00000000000
--- a/Source/DafnyLanguageServer/Workspace/Documents/CompilationAfterParsing.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
-using OmniSharp.Extensions.LanguageServer.Protocol;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace;
-
-public class CompilationAfterParsing : Compilation {
-  public IReadOnlyDictionary<Uri, List<DafnyDiagnostic>> ResolutionDiagnostics { get; set; }
-  public Dictionary<Uri, VerificationTree> VerificationTrees { get; }
-
-  public CompilationAfterParsing(Compilation compilation,
-    Program program,
-    IReadOnlyDictionary<Uri, List<DafnyDiagnostic>> diagnostics,
-    Dictionary<Uri, VerificationTree> verificationTrees)
-    : base(compilation.Version, compilation.Project, compilation.RootUris) {
-    ResolutionDiagnostics = diagnostics;
-    VerificationTrees = verificationTrees;
-    Program = program;
-  }
-
-  public Program Program { get; }
-
-  public override IEnumerable<DafnyDiagnostic> GetDiagnostics(Uri uri) {
-    return ResolutionDiagnostics.GetOrDefault(uri, Enumerable.Empty<DafnyDiagnostic>);
-  }
-
-
-  public override IdeState ToIdeState(IdeState previousState) {
-    var baseResult = base.ToIdeState(previousState);
-    return baseResult with {
-      Program = Program,
-      ResolutionDiagnostics = ResolutionDiagnostics.ToDictionary(
-        kv => kv.Key,
-        kv => (IReadOnlyList<Diagnostic>)kv.Value.Select(d => d.ToLspDiagnostic()).ToList()),
-      VerificationTrees = VerificationTrees
-    };
-  }
-
-  public VerificationTree GetVerificationTree(Uri uri) {
-    return VerificationTrees[uri];
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/Documents/CompilationAfterResolution.cs b/Source/DafnyLanguageServer/Workspace/Documents/CompilationAfterResolution.cs
deleted file mode 100644
index e9a09946593..00000000000
--- a/Source/DafnyLanguageServer/Workspace/Documents/CompilationAfterResolution.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Dafny.LanguageServer.Language.Symbols;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace;
-
-public class CompilationAfterResolution : CompilationAfterParsing {
-
-  public CompilationAfterResolution(CompilationAfterParsing compilationAfterParsing,
-    IReadOnlyDictionary<Uri, List<DafnyDiagnostic>> diagnostics,
-    SymbolTable? symbolTable,
-    LegacySignatureAndCompletionTable signatureAndCompletionTable,
-    IReadOnlyDictionary<Uri, IReadOnlyList<Range>> ghostDiagnostics,
-    IReadOnlyList<ICanVerify> verifiables,
-    ConcurrentDictionary<ModuleDefinition, Task<IReadOnlyDictionary<FilePosition, IReadOnlyList<IImplementationTask>>>> translatedModules,
-    List<Counterexample> counterexamples
-    ) :
-    base(compilationAfterParsing, compilationAfterParsing.Program, diagnostics, compilationAfterParsing.VerificationTrees) {
-    SymbolTable = symbolTable;
-    SignatureAndCompletionTable = signatureAndCompletionTable;
-    GhostDiagnostics = ghostDiagnostics;
-    Verifiables = verifiables;
-    TranslatedModules = translatedModules;
-    Counterexamples = counterexamples;
-  }
-  public List<Counterexample> Counterexamples { get; set; }
-  public SymbolTable? SymbolTable { get; }
-  public LegacySignatureAndCompletionTable SignatureAndCompletionTable { get; }
-  public IReadOnlyDictionary<Uri, IReadOnlyList<Range>> GhostDiagnostics { get; }
-  public IReadOnlyList<ICanVerify> Verifiables { get; }
-  public ConcurrentDictionary<ICanVerify, Dictionary<string, ImplementationView>> ImplementationsPerVerifiable { get; } = new();
-  /// <summary>
-  /// FilePosition is required because the default module lives in multiple files
-  /// </summary>
-  public ConcurrentDictionary<ModuleDefinition, Task<IReadOnlyDictionary<FilePosition, IReadOnlyList<IImplementationTask>>>> TranslatedModules { get; }
-
-  public override IEnumerable<DafnyDiagnostic> GetDiagnostics(Uri uri) {
-    var implementationsForUri = ImplementationsPerVerifiable.
-      Where(kv => kv.Key.Tok.Uri == uri).
-      Select(kv => kv.Value).ToList();
-    var verificationDiagnostics = implementationsForUri.SelectMany(view =>
-      view.Values.SelectMany(v => v.Diagnostics) ?? Enumerable.Empty<DafnyDiagnostic>());
-    return base.GetDiagnostics(uri).Concat(verificationDiagnostics);
-  }
-
-  public const string OutdatedPrefix = "Outdated: ";
-  private IEnumerable<Diagnostic> MarkDiagnosticsAsOutdated(IEnumerable<Diagnostic> diagnostics) {
-    return diagnostics.Select(diagnostic => diagnostic with {
-      Severity = diagnostic.Severity == DiagnosticSeverity.Error ? DiagnosticSeverity.Warning : diagnostic.Severity,
-      Message = diagnostic.Message.StartsWith(OutdatedPrefix)
-        ? diagnostic.Message
-        : OutdatedPrefix + diagnostic.Message
-    });
-  }
-
-  IdeVerificationResult MergeResults(IEnumerable<IdeVerificationResult> results) {
-    return results.Aggregate((a, b) => new IdeVerificationResult(
-      a.WasTranslated || b.WasTranslated,
-      a.Implementations.ToImmutableDictionary().Merge(b.Implementations,
-        (a, b) => new IdeImplementationView(
-          a.Range,
-          Combine(a.Status, b.Status),
-          a.Diagnostics.Concat(b.Diagnostics).ToList()))));
-  }
-
-  public override IdeState ToIdeState(IdeState previousState) {
-
-    IdeVerificationResult MergeVerifiable(ICanVerify canVerify) {
-      var location = canVerify.NameToken.GetLocation();
-      var previousForCanVerify = previousState.VerificationResults.GetValueOrDefault(location) ?? new(false, ImmutableDictionary<string, IdeImplementationView>.Empty);
-      if (!ImplementationsPerVerifiable.TryGetValue(canVerify, out var implementationsPerName)) {
-        return previousForCanVerify with {
-          Implementations = previousForCanVerify.Implementations.ToDictionary(kv => kv.Key, kv => kv.Value with {
-            Status = PublishedVerificationStatus.Stale,
-            Diagnostics = MarkDiagnosticsAsOutdated(kv.Value.Diagnostics).ToList()
-          })
-        };
-      }
-
-      var implementations = implementationsPerName.ToDictionary(kv => kv.Key, kv => {
-        var implementationView = kv.Value;
-        var diagnostics = implementationView.Diagnostics.Select(d => d.ToLspDiagnostic());
-        if (implementationView.Status < PublishedVerificationStatus.Error) {
-          var previousDiagnostics = previousForCanVerify.Implementations.GetValueOrDefault(kv.Key)?.Diagnostics;
-          if (previousDiagnostics != null) {
-            diagnostics = MarkDiagnosticsAsOutdated(previousDiagnostics);
-          }
-        }
-
-        return new IdeImplementationView(implementationView.Task.Implementation.tok.GetLspRange(true),
-          implementationView.Status, diagnostics.ToList());
-      });
-      return new IdeVerificationResult(true, implementations);
-
-    }
-
-    var result = base.ToIdeState(previousState) with {
-      SymbolTable = SymbolTable ?? previousState.SymbolTable,
-      SignatureAndCompletionTable = SignatureAndCompletionTable.Resolved ? SignatureAndCompletionTable : previousState.SignatureAndCompletionTable,
-      GhostRanges = GhostDiagnostics,
-      Counterexamples = new List<Counterexample>(Counterexamples),
-      VerificationTrees = VerificationTrees.ToDictionary(kv => kv.Key, kv => kv.Value.GetCopyForNotification()),
-      VerificationResults = Verifiables.GroupBy(l => l.NameToken.GetLocation()).ToDictionary(k => k.Key,
-        k => MergeResults(k.Select(MergeVerifiable)))
-    };
-    return result;
-  }
-
-  static PublishedVerificationStatus Combine(PublishedVerificationStatus first, PublishedVerificationStatus second) {
-    return new[] { first, second }.Min();
-  }
-}
diff --git a/Source/DafnyLanguageServer/Workspace/FileVerificationStatus.cs b/Source/DafnyLanguageServer/Workspace/FileVerificationStatus.cs
index cf0b07e0779..c48cceed267 100644
--- a/Source/DafnyLanguageServer/Workspace/FileVerificationStatus.cs
+++ b/Source/DafnyLanguageServer/Workspace/FileVerificationStatus.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using MediatR;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
@@ -9,10 +10,30 @@ namespace Microsoft.Dafny.LanguageServer.Workspace;
 
 public record FileVerificationStatus(
   DocumentUri Uri,
-  int Version,
+  int? Version,
   IReadOnlyList<NamedVerifiableStatus> NamedVerifiables) : IRequest {
   public override string ToString() {
-    return $"{nameof(NamedVerifiables)}: {string.Join(", ", NamedVerifiables)}";
+    return $"SymbolStatus, {nameof(Uri)}: {Uri}, {nameof(Version)}: {Version}, {nameof(NamedVerifiables)}: {string.Join(", ", NamedVerifiables)}";
+  }
+
+  static FileVerificationStatus() {
+    StringifyUtil.AddGlobalOverride<FileVerificationStatus>((status, writer) => writer.Write(status.ToString()));
+  }
+
+  public virtual bool Equals(FileVerificationStatus? other) {
+    if (ReferenceEquals(null, other)) {
+      return false;
+    }
+
+    if (ReferenceEquals(this, other)) {
+      return true;
+    }
+
+    return NamedVerifiables.SequenceEqual(other.NamedVerifiables);
+  }
+
+  public override int GetHashCode() {
+    return 0;
   }
 }
 
diff --git a/Source/DafnyLanguageServer/Workspace/GutterIconAndHoverVerificationDetailsManager.cs b/Source/DafnyLanguageServer/Workspace/GutterIconAndHoverVerificationDetailsManager.cs
new file mode 100644
index 00000000000..13c2a78c299
--- /dev/null
+++ b/Source/DafnyLanguageServer/Workspace/GutterIconAndHoverVerificationDetailsManager.cs
@@ -0,0 +1,449 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.CommandLine;
+using System.Linq;
+using Microsoft.Boogie;
+using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using VC;
+
+namespace Microsoft.Dafny.LanguageServer.Workspace;
+
+public class GutterIconAndHoverVerificationDetailsManager {
+
+  public static readonly Option<bool> LineVerificationStatus = new("--notify-line-verification-status", @"
+(experimental, API will change)
+Send notifications about the verification status of each line in the program.
+".TrimStart());
+
+  private readonly ILogger logger;
+
+  public GutterIconAndHoverVerificationDetailsManager(ILogger logger) {
+    this.logger = logger;
+  }
+
+  public static DocumentVerificationTree UpdateTree(DafnyOptions options, Program program, DocumentVerificationTree rootVerificationTree) {
+    var previousTrees = rootVerificationTree.Children;
+
+    ConcurrentBag<VerificationTree> result = new();
+
+    HashSet<Position> recordedPositions = new HashSet<Position>();
+
+    void AddAndPossiblyMigrateVerificationTree(VerificationTree verificationTree) {
+      var position = verificationTree.Position;
+      var previousTree = previousTrees.FirstOrDefault(
+        oldNode => oldNode != null && oldNode.Position == position,
+        null);
+      if (previousTree != null) {
+        previousTree.SetObsolete();
+        verificationTree.StatusVerification = previousTree.StatusVerification;
+        verificationTree.StatusCurrent = CurrentStatus.Obsolete;
+        verificationTree.Children = previousTree.Children;
+      }
+
+      // Prevent duplicating trees, e.g. reveal lemmas that have the same position as the function.
+      if (!recordedPositions.Contains(verificationTree.Position)) {
+        result.Add(verificationTree);
+        recordedPositions.Add(verificationTree.Position);
+      }
+    }
+
+    foreach (var module in program.Modules()) {
+      foreach (var topLevelDecl in module.TopLevelDecls) {
+        if (topLevelDecl is DatatypeDecl datatypeDecl) {
+          foreach (DatatypeCtor ctor in datatypeDecl.Ctors) {
+            var aFormalHasADefaultValue = ctor.Destructors.SelectMany(
+              destructor => destructor.CorrespondingFormals).Any(
+              formal => formal.DefaultValue != null);
+            if (aFormalHasADefaultValue) {
+              var verificationTreeRange = ctor.StartToken.GetLspRange(ctor.EndToken);
+              var verificationTree = new TopLevelDeclMemberVerificationTree(
+                "datatype",
+                ctor.Name,
+                ctor.GetCompileName(options),
+                ctor.Origin.Filepath,
+                ctor.Origin.Uri,
+                verificationTreeRange,
+                ctor.Origin.GetLspPosition(),
+                Attributes.Contains(ctor.Attributes, "only")
+                );
+              AddAndPossiblyMigrateVerificationTree(verificationTree);
+            }
+          }
+        }
+
+        if (topLevelDecl is TopLevelDeclWithMembers topLevelDeclWithMembers) {
+          foreach (var member in topLevelDeclWithMembers.Members) {
+            var memberWasNotIncluded = member.Origin.Uri != rootVerificationTree.Uri;
+            if (memberWasNotIncluded) {
+              continue;
+            }
+
+            if (member is ConstantField constantField) {
+              if (constantField.Rhs == null) {
+                continue; // Nothing to verify
+              }
+
+              var verificationTreeRange = member.StartToken.GetLspRange(member.EndToken);
+              var verificationTree = new TopLevelDeclMemberVerificationTree(
+                "constant",
+                member.Name,
+                member.GetCompileName(options),
+                member.Origin.Filepath,
+                member.Origin.Uri,
+                verificationTreeRange,
+                member.Origin.GetLspPosition(),
+                Attributes.Contains(member.Attributes, "only"));
+              AddAndPossiblyMigrateVerificationTree(verificationTree);
+            } else if (member is Method or Function) {
+              var verificationTreeRange = member.StartToken.GetLspRange(member.EndToken);
+              var verificationTree = new TopLevelDeclMemberVerificationTree(
+                (member is Method ? "method" : "function"),
+                member.Name,
+                member.GetCompileName(options),
+                member.Origin.Filepath,
+                member.Origin.Uri,
+                verificationTreeRange,
+                member.NavigationToken.GetLspPosition(),
+                Attributes.Contains(member.Attributes, "only"));
+              AddAndPossiblyMigrateVerificationTree(verificationTree);
+              if (member is Function { ByMethodBody: { } } function) {
+                var verificationTreeRangeByMethod = function.ByMethodBody.Origin.ToLspRange();
+                var verificationTreeByMethod = new TopLevelDeclMemberVerificationTree(
+                  "by method part of function",
+                  member.Name,
+                  member.GetCompileName(options) + "_by_method",
+                  member.Origin.Filepath,
+                  member.Origin.Uri,
+                  verificationTreeRangeByMethod,
+                  function.ByMethodTok.GetLspPosition(),
+                  Attributes.Contains(member.Attributes, "only"));
+                AddAndPossiblyMigrateVerificationTree(verificationTreeByMethod);
+              }
+            }
+          }
+        }
+
+        if (topLevelDecl is SubsetTypeDecl subsetTypeDecl) {
+          if (subsetTypeDecl.Origin.Uri != rootVerificationTree.Uri) {
+            continue;
+          }
+
+          var verificationTreeRange = subsetTypeDecl.StartToken.GetLspRange(subsetTypeDecl.EndToken);
+          var verificationTree = new TopLevelDeclMemberVerificationTree(
+            $"subset type",
+            subsetTypeDecl.Name,
+            subsetTypeDecl.GetCompileName(options),
+            subsetTypeDecl.Origin.Filepath,
+            subsetTypeDecl.Origin.Uri,
+            verificationTreeRange,
+            subsetTypeDecl.Origin.GetLspPosition(),
+            Attributes.Contains(subsetTypeDecl.Attributes, "only"));
+          AddAndPossiblyMigrateVerificationTree(verificationTree);
+        }
+      }
+    }
+
+    return new DocumentVerificationTree(program, rootVerificationTree.Uri) {
+      Children = result
+    };
+  }
+
+  /// <summary>
+  /// On receiving all implementations that are going to be verified, assign each implementation
+  /// to its original method tree.
+  /// Also set the implementation priority depending on the last edited methods 
+  /// </summary>
+  public virtual void ReportImplementationsBeforeVerification(IdeState state, ICanVerify canVerify, Implementation[] implementations) {
+    var uri = canVerify.Origin.Uri;
+    var tree = state.VerificationTrees.GetValueOrDefault(uri) ?? new DocumentVerificationTree(state.Program, uri);
+
+    if (logger.IsEnabled(LogLevel.Debug)) {
+      logger.LogDebug($"ReportImplementationsBeforeVerification for ${state.Uri}, version {state.Version}, implementations: " +
+                      $"{string.Join(", ", implementations.Select(i => i.Name))}");
+    }
+
+    // We migrate existing implementations to the new provided ones if they exist.
+    // (same child number, same file and same position)
+    var canVerifyNode = tree.Children.OfType<TopLevelDeclMemberVerificationTree>()
+      .FirstOrDefault(t => t.Position == canVerify.Origin.GetLspPosition());
+    if (canVerifyNode == null) {
+      return;
+    }
+
+
+    canVerifyNode.ResetNewChildren();
+
+    foreach (var implementation in implementations) {
+
+      var targetMethodNode = GetTargetMethodTree(tree, implementation, out var oldImplementationNode, true);
+      if (targetMethodNode == null) {
+        NoMethodNodeAtLogging(tree, "ReportImplementationsBeforeVerification", state, implementation);
+        continue;
+      }
+
+      var newDisplayName = targetMethodNode.DisplayName + " #" + (targetMethodNode.Children.Count + 1) + ":" +
+                           implementation.Name;
+      var newImplementationNode = new ImplementationVerificationTree(
+        newDisplayName,
+        implementation.VerboseName,
+        implementation.Name,
+        targetMethodNode.Filename,
+        targetMethodNode.Uri,
+        targetMethodNode.Range,
+        targetMethodNode.Position
+      ).WithImplementation(implementation);
+      if (oldImplementationNode != null) {
+        newImplementationNode.Children = oldImplementationNode.Children;
+      }
+
+      targetMethodNode.AddNewChild(newImplementationNode);
+    }
+
+    var newChildren = canVerifyNode.NewChildren;
+    canVerifyNode.SaveNewChildren();
+    if (!canVerifyNode.Children.Any()) {
+      canVerifyNode.Start();
+      canVerifyNode.Stop();
+      canVerifyNode.StatusCurrent = CurrentStatus.Current;
+      canVerifyNode.StatusVerification = GutterVerificationStatus.Verified;
+    }
+
+    canVerifyNode.PropagateChildrenErrorsUp();
+    canVerifyNode.RecomputeAssertionBatchNodeDiagnostics();
+  }
+
+  /// <summary>
+  /// Called when the verifier starts verifying an implementation
+  /// </summary>
+  public void ReportVerifyImplementationRunning(IdeState state, Implementation implementation) {
+    var uri = ((IOrigin)implementation.tok).Uri;
+    var tree = state.VerificationTrees[uri];
+
+    lock (LockProcessing) {
+      var targetMethodNode = GetTargetMethodTree(tree, implementation, out var implementationNode);
+      if (targetMethodNode == null) {
+        NoMethodNodeAtLogging(tree, "ReportVerifyImplementationRunning", state, implementation);
+      } else {
+        if (!targetMethodNode.Started) {
+          // The same method could be started multiple times for each implementation
+          targetMethodNode.Start();
+        }
+
+        if (implementationNode == null) {
+          logger.LogError($"No implementation at {implementation.tok}");
+        } else {
+          implementationNode.Start();
+        }
+
+        targetMethodNode.PropagateChildrenErrorsUp();
+      }
+    }
+  }
+
+  /// <summary>
+  /// Called when the verifier finished to visit an implementation
+  /// </summary>
+  public void ReportEndVerifyImplementation(IdeState state, Implementation implementation,
+    int implementationResourceCount,
+    VcOutcome implementationOutcome) {
+
+    var uri = ((IOrigin)implementation.tok).Uri;
+    var tree = state.VerificationTrees[uri];
+
+    var targetMethodNode = GetTargetMethodTree(tree, implementation, out var implementationNode);
+    if (targetMethodNode == null) {
+      NoMethodNodeAtLogging(tree, "ReportEndVerifyImplementation", state, implementation);
+    } else if (implementationNode == null) {
+      logger.LogError($"No implementation node at {implementation.tok.filename}:{implementation.tok.line}:{implementation.tok.col}");
+    } else {
+      lock (LockProcessing) {
+        implementationNode.Stop();
+        implementationNode.ResourceCount = implementationResourceCount;
+        targetMethodNode.ResourceCount += implementationResourceCount;
+        var finalOutcome = implementationOutcome switch {
+          VcOutcome.Correct => GutterVerificationStatus.Verified,
+          _ => GutterVerificationStatus.Error
+        };
+
+        implementationNode.StatusVerification = finalOutcome;
+        // Will be only executed by the last instance.
+        if (!targetMethodNode.Children.All(child => child.Finished)) {
+          targetMethodNode.StatusVerification = implementationOutcome switch {
+            VcOutcome.Correct => targetMethodNode.StatusVerification,
+            _ => GutterVerificationStatus.Error
+          };
+        } else {
+          targetMethodNode.Stop();
+          // Later, will be overriden by individual outcomes
+          targetMethodNode.StatusVerification = finalOutcome;
+        }
+
+        targetMethodNode.PropagateChildrenErrorsUp();
+        targetMethodNode.RecomputeAssertionBatchNodeDiagnostics();
+      }
+    }
+  }
+
+  private void NoMethodNodeAtLogging(VerificationTree tree, string methodName, IdeState state, Implementation implementation) {
+    var position = implementation.tok.GetLspPosition();
+    var availableMethodNodes = string.Join(",", tree!.Children.Select(vt =>
+      $"{vt.Kind} {vt.DisplayName} at {vt.Filename}:{vt.Position.Line}"));
+    logger.LogDebug(
+      $"No method found in {methodName}, in document {state.Uri} and filename {tree.Filename}, " +
+      $"no method node at {implementation.tok.filename}:{position.Line}:{position.Character}.\n" +
+      $"Available nodes: " + availableMethodNodes);
+  }
+
+  /// <summary>
+  /// Called when a split is finished to be verified
+  /// </summary>
+  public void ReportAssertionBatchResult(IdeState ideState, AssertionBatchResult batchResult) {
+    var uri = ((IOrigin)batchResult.Implementation.tok).Uri;
+    var tree = ideState.VerificationTrees[uri];
+
+    lock (LockProcessing) {
+      var implementation = batchResult.Implementation;
+      var result = batchResult.Result;
+      // While there is no error, just add successful nodes.
+      var targetMethodNode = GetTargetMethodTree(tree, implementation, out var implementationNode);
+      if (targetMethodNode == null) {
+        NoMethodNodeAtLogging(tree, "ReportAssertionBatchResult", ideState, implementation);
+      } else if (implementationNode == null) {
+        logger.LogError($"No implementation node at {implementation.tok.filename}:{implementation.tok.line}:{implementation.tok.col}");
+      } else {
+        var wasAlreadyProcessed = implementationNode.NewChildren.Any(assertNode =>
+          assertNode is AssertionVerificationTree assertionNode
+          && assertionNode.AssertionBatchNum == result.VcNum);
+        if (wasAlreadyProcessed) {
+          return;
+        }
+
+        result.ComputePerAssertOutcomes(out var perAssertOutcome, out var perAssertCounterExample);
+
+        var assertionBatchTime = (int)result.RunTime.TotalMilliseconds;
+        var assertionBatchResourceCount = result.ResourceCount;
+        implementationNode.AddAssertionBatchMetrics(result.VcNum, assertionBatchTime, assertionBatchResourceCount, result.CoveredElements.ToList());
+
+        // Attaches the trace
+        void AddChildOutcome(Counterexample? counterexample, AssertCmd assertCmd, IOrigin token,
+          GutterVerificationStatus status, IOrigin? secondaryToken, string? assertDisplay = "",
+          string assertIdentifier = "") {
+          if (token.Filepath != implementationNode.Filename) {
+            return;
+          }
+
+          var outcomePosition = token.GetLspPosition();
+          var secondaryOutcomePosition = secondaryToken?.GetLspPosition();
+
+          var childrenCount = implementationNode.GetNewChildrenCount();
+          assertDisplay = assertDisplay != "" ? " " + assertDisplay : "";
+          assertIdentifier = assertIdentifier != "" ? "_" + assertIdentifier : "";
+
+          var outcomeRange = token.GetLspRange();
+          var nodeDiagnostic = new AssertionVerificationTree(
+            $"{targetMethodNode.DisplayName}{assertDisplay} #{childrenCount}",
+            $"{targetMethodNode.Identifier}_{childrenCount}{assertIdentifier}",
+            token.Filepath,
+            token.Uri,
+            secondaryOutcomePosition,
+            outcomeRange
+          ) {
+            StatusVerification = status,
+            StatusCurrent = CurrentStatus.Current,
+            AssertionBatchNum = result.VcNum,
+            Started = true,
+            Finished = true
+          }.WithDuration(implementationNode.StartTime, assertionBatchTime)
+            .WithAssertionAndCounterExample(assertCmd, counterexample);
+          // Add this diagnostics as the new one to display once the implementation is fully verified
+          implementationNode.AddNewChild(nodeDiagnostic);
+          // Update any previous pending "verifying" diagnostic as well so that they are updated in real-time
+          var previousChild = implementationNode.Children.OfType<AssertionVerificationTree>()
+            .FirstOrDefault(child =>
+              child != null && child.Position == outcomePosition && (
+                secondaryOutcomePosition == child.SecondaryPosition), null);
+          if (previousChild != null) {
+            // Temporary update of children.
+            implementationNode.Children = new ConcurrentBag<VerificationTree>(implementationNode.Children.Where(child => child != previousChild)) {
+              previousChild with {
+                StatusCurrent = CurrentStatus.Current,
+                StatusVerification = status
+              }
+            };
+          } else {
+            implementationNode.Children.Add(nodeDiagnostic);
+          }
+        }
+
+        foreach (var (assertCmd, outcome) in perAssertOutcome) {
+          var status = GetNodeStatus(outcome);
+          perAssertCounterExample.TryGetValue(assertCmd, out var counterexample);
+          IOrigin? secondaryToken = BoogieGenerator.ToDafnyToken(true, counterexample is ReturnCounterexample returnCounterexample ? returnCounterexample.FailingReturn.tok :
+            counterexample is CallCounterexample callCounterexample ? callCounterexample.FailingRequires.tok :
+            null);
+          if (assertCmd is AssertEnsuresCmd assertEnsuresCmd) {
+            AddChildOutcome(counterexample, assertCmd, BoogieGenerator.ToDafnyToken(true, assertEnsuresCmd.Ensures.tok), status, secondaryToken, " ensures", "_ensures");
+          } else if (assertCmd is AssertRequiresCmd assertRequiresCmd) {
+            AddChildOutcome(counterexample, assertCmd, BoogieGenerator.ToDafnyToken(true, assertRequiresCmd.Call.tok), status, secondaryToken, assertDisplay: "Call", assertIdentifier: "call");
+          } else {
+            AddChildOutcome(counterexample, assertCmd, BoogieGenerator.ToDafnyToken(true, assertCmd.tok), status, secondaryToken, assertDisplay: "Assertion", assertIdentifier: "assert");
+          }
+        }
+        targetMethodNode.PropagateChildrenErrorsUp();
+        targetMethodNode.RecomputeAssertionBatchNodeDiagnostics();
+      }
+    }
+  }
+
+  /// <summary>
+  /// Given an implementation, returns the top-level verification tree.
+  /// </summary>
+  /// <param name="implementation">The implementation</param>
+  /// <param name="implementationTree">Returns the tree of the implementation child of the returned top-level verification tree</param>
+  /// <param name="nameBased">Whether it should try to locate the implementation using the name rather than the position. Used to relocate previous diagnostics.</param>
+  /// <returns>The top-level verification tree</returns>
+  private TopLevelDeclMemberVerificationTree? GetTargetMethodTree(VerificationTree tree,
+    Implementation implementation, out ImplementationVerificationTree? implementationTree, bool nameBased = false) {
+    var targetMethodNode = tree.Children.OfType<TopLevelDeclMemberVerificationTree>().FirstOrDefault(
+      node => node?.Position == implementation.tok.GetLspPosition() &&
+              node?.Uri == ((IOrigin)implementation.tok).Uri
+      , null);
+    if (nameBased) {
+      implementationTree = targetMethodNode?.Children.OfType<ImplementationVerificationTree>().FirstOrDefault(
+        node => {
+          var nodeImpl = node?.GetImplementation();
+          return nodeImpl?.Name == implementation.Name;
+        }, null);
+    } else {
+      implementationTree = targetMethodNode?.Children.OfType<ImplementationVerificationTree>().FirstOrDefault(
+        node => node?.GetImplementation() == implementation, null);
+    }
+
+    return targetMethodNode;
+  }
+
+  /// <summary>
+  /// An object to lock so that the updating of the verification trees is always not concurrent
+  /// </summary>
+  private readonly object LockProcessing = new();
+
+  /// <summary>
+  /// Converts a ProverInterface.Outcome to a VerificationStatus
+  /// </summary>
+  /// <param name="outcome">The outcome set by the split result</param>
+  /// <returns>The matching verification status</returns>
+  private static GutterVerificationStatus GetNodeStatus(SolverOutcome outcome) {
+    return outcome switch {
+      SolverOutcome.Valid => GutterVerificationStatus.Verified,
+      SolverOutcome.Invalid => GutterVerificationStatus.Error,
+      SolverOutcome.Undetermined => GutterVerificationStatus.Inconclusive,
+      SolverOutcome.TimeOut => GutterVerificationStatus.Error,
+      SolverOutcome.OutOfMemory => GutterVerificationStatus.Error,
+      SolverOutcome.OutOfResource => GutterVerificationStatus.Error,
+      SolverOutcome.Bounded => GutterVerificationStatus.Error,
+      _ => GutterVerificationStatus.Error
+    };
+  }
+}
diff --git a/Source/DafnyLanguageServer/Workspace/ICompilationStatusNotificationPublisher.cs b/Source/DafnyLanguageServer/Workspace/ICompilationStatusNotificationPublisher.cs
deleted file mode 100644
index 817cc3a192b..00000000000
--- a/Source/DafnyLanguageServer/Workspace/ICompilationStatusNotificationPublisher.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
-using OmniSharp.Extensions.LanguageServer.Protocol.Document;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace {
-  /// <summary>
-  /// Implementations of this interface are responsible to publish the compilation
-  /// status of a <see cref="Compilation"/> to the LSP client.
-  /// </summary>
-  public interface ICompilationStatusNotificationPublisher {
-    Task SendStatusNotification(Compilation compilation, CompilationStatus status, string? message = null);
-  }
-}
diff --git a/Source/DafnyLanguageServer/Workspace/INotificationPublisher.cs b/Source/DafnyLanguageServer/Workspace/INotificationPublisher.cs
index 1f3593e08be..3f53ea76e0c 100644
--- a/Source/DafnyLanguageServer/Workspace/INotificationPublisher.cs
+++ b/Source/DafnyLanguageServer/Workspace/INotificationPublisher.cs
@@ -4,18 +4,12 @@
 namespace Microsoft.Dafny.LanguageServer.Workspace {
   /// <summary>
   /// Implementations of this interface are responsible to publish the diagnostics
-  /// of a <see cref="Compilation"/> to the LSP client.
+  /// of a <see cref="CompilationInput"/> to the LSP client.
   /// </summary>
   public interface INotificationPublisher {
     /// <summary>
     /// Publishes the diagnostics of the specified dafny document to the connected LSP client.
     /// </summary>
-    /// <param name="state">The document whose diagnostics should be published.</param>
-    Task PublishNotifications(IdeState previousState, IdeState state);
-
-    /// <summary>
-    /// Publishes the more precise real-time verification diagnostics to the connected LSP client
-    /// </summary>
-    void PublishGutterIcons(Uri uri, IdeState state, bool verificationStarted);
+    void PublishNotifications(IdeState previousState, IdeState state);
   }
 }
diff --git a/Source/DafnyLanguageServer/Workspace/IProjectDatabase.cs b/Source/DafnyLanguageServer/Workspace/IProjectDatabase.cs
index 4703ea68ff9..ec6bdc110c8 100644
--- a/Source/DafnyLanguageServer/Workspace/IProjectDatabase.cs
+++ b/Source/DafnyLanguageServer/Workspace/IProjectDatabase.cs
@@ -18,7 +18,7 @@ public interface IProjectDatabase : IDisposable {
     /// The task represents any outstanding work of the document. It should be awaited to ensure
     /// that no processing occurs after the document is closed.
     /// </remarks>
-    Task CloseDocumentAsync(TextDocumentIdentifier documentId);
+    void CloseDocument(TextDocumentIdentifier documentId);
 
     /// <summary>
     /// Loads (or updates if newer) the specified document into the database.
@@ -41,6 +41,8 @@ public interface IProjectDatabase : IDisposable {
     /// <exception cref="ArgumentException">Thrown if the specified document does not exist.</exception>
     Task SaveDocument(TextDocumentIdentifier documentId);
 
+    Task<IdeState?> GetParsedDocumentNormalizeUri(TextDocumentIdentifier documentId);
+
     /// <summary>
     /// Tries to resolve a document with the specified identifier.
     /// </summary>
@@ -49,13 +51,6 @@ public interface IProjectDatabase : IDisposable {
     Task<IdeState?> GetResolvedDocumentAsyncNormalizeUri(TextDocumentIdentifier documentId);
     internal Task<IdeState?> GetResolvedDocumentAsyncInternal(TextDocumentIdentifier documentId);
 
-    /// <summary>
-    /// Tries to resolve a verified document with the specified identifier.
-    /// </summary>
-    /// <param name="documentId">The ID of the document to resolve.</param>
-    /// <returns>An instance of the managed document, <c>null</c> if the specified document was not found.</returns>
-    Task<CompilationAfterParsing?> GetLastDocumentAsync(TextDocumentIdentifier documentId);
-
     Task<ProjectManager?> GetProjectManager(TextDocumentIdentifier documentId);
 
     IEnumerable<ProjectManager> Managers { get; }
diff --git a/Source/DafnyLanguageServer/Workspace/ITelemetryPublisher.cs b/Source/DafnyLanguageServer/Workspace/ITelemetryPublisher.cs
deleted file mode 100644
index c19721e0471..00000000000
--- a/Source/DafnyLanguageServer/Workspace/ITelemetryPublisher.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace {
-  /// <summary>
-  /// Implementations of this interface are responsible to publish telemetry events
-  /// of a <see cref="Compilation"/> to the LSP client.
-  /// </summary>
-  public interface ITelemetryPublisher {
-    protected enum TelemetryEventKind {
-      UpdateComplete,
-      UnhandledException,
-      SolverPath,
-      Z3Version,
-      Time
-    }
-
-    protected void PublishTelemetry(TelemetryEventKind kind, object? payload) {
-      PublishTelemetry(ImmutableDictionary.Create<string, object>().Add("kind", kind).Add("payload", payload!));
-    }
-
-    public void PublishTelemetry(ImmutableDictionary<string, object> data);
-
-    /// <summary>
-    /// Signal the completion of a document update.
-    /// </summary>
-    public void PublishUpdateComplete() {
-      PublishTelemetry(TelemetryEventKind.UpdateComplete, null);
-    }
-
-    /// <summary>
-    /// Signal an unhandled error.
-    /// </summary>
-    public void PublishUnhandledException(Exception e);
-
-    public void PublishSolverPath(string solverPath) {
-      PublishTelemetry(TelemetryEventKind.SolverPath, solverPath);
-    }
-
-    public void PublishCount(string activity, string resource, TimeSpan span) {
-      PublishTelemetry(TelemetryEventKind.Time, ImmutableDictionary.Create<string, object>().
-        Add("activity", activity).Add("resource", resource).Add("time", span.TotalMilliseconds));
-    }
-
-    public void PublishTime(string activity, string resource, TimeSpan span) {
-      PublishTelemetry(TelemetryEventKind.Time, ImmutableDictionary.Create<string, object>().
-        Add("activity", activity).Add("resource", resource).Add("time", span.TotalMilliseconds));
-    }
-
-    public void PublishZ3Version(string z3Version) {
-      PublishTelemetry(TelemetryEventKind.Z3Version, z3Version);
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/ITextDocumentLoader.cs b/Source/DafnyLanguageServer/Workspace/ITextDocumentLoader.cs
deleted file mode 100644
index efa5c29dd79..00000000000
--- a/Source/DafnyLanguageServer/Workspace/ITextDocumentLoader.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace {
-  /// <summary>
-  /// Implementations are responsible to load a specified language server document and generate
-  /// a dafny document out of it.
-  /// </summary>
-  public interface ITextDocumentLoader {
-    /// <summary>
-    /// Creates a dafny document from the given text document without loading it.
-    /// </summary>
-    /// <param name="compilation"></param>
-    /// <returns>The unloaded dafny document.</returns>
-    /// <exception cref="System.OperationCanceledException">Thrown when the cancellation was requested before completion.</exception>
-    /// <exception cref="System.ObjectDisposedException">Thrown if the cancellation token was disposed before the completion.</exception>
-    IdeState CreateUnloaded(Compilation compilation);
-
-    Task<CompilationAfterParsing> ParseAsync(DafnyOptions options, Compilation compilation,
-      IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees, CancellationToken cancellationToken);
-
-    Task<CompilationAfterResolution> ResolveAsync(DafnyOptions options, CompilationAfterParsing compilation,
-      IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees,
-      CancellationToken cancellationToken);
-  }
-}
diff --git a/Source/DafnyLanguageServer/Workspace/IdeState.cs b/Source/DafnyLanguageServer/Workspace/IdeState.cs
index 16f044d03a6..d777dbc4263 100644
--- a/Source/DafnyLanguageServer/Workspace/IdeState.cs
+++ b/Source/DafnyLanguageServer/Workspace/IdeState.cs
@@ -2,82 +2,549 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Boogie;
 using Microsoft.Dafny.LanguageServer.Language;
 using Microsoft.Dafny.LanguageServer.Language.Symbols;
+using Microsoft.Dafny.LanguageServer.Workspace.ChangeProcessors;
 using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
-using OmniSharp.Extensions.LanguageServer.Protocol;
+using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
 namespace Microsoft.Dafny.LanguageServer.Workspace;
 
+public record IdeVerificationTaskState(Range Range, PublishedVerificationStatus Status,
+  IReadOnlyList<Diagnostic> Diagnostics, bool HitErrorLimit, IVerificationTask Task, IVerificationStatus RawStatus);
 
-public record IdeImplementationView(Range Range, PublishedVerificationStatus Status,
+public enum VerificationPreparationState { NotStarted, InProgress, Done }
+public record IdeCanVerifyState(VerificationPreparationState PreparationProgress,
+  ImmutableDictionary<string, IdeVerificationTaskState> VerificationTasks,
   IReadOnlyList<Diagnostic> Diagnostics);
 
-public record IdeVerificationResult(bool WasTranslated, IReadOnlyDictionary<string, IdeImplementationView> Implementations);
+
 
 /// <summary>
 /// Contains information from the latest document, and from older documents if some information is missing,
 /// to provide the IDE with as much information as possible.
 /// </summary>
 public record IdeState(
-  int Version,
-  Compilation Compilation,
+  ISet<Uri> OwnedUris,
+  IReadOnlyDictionary<Uri, int> VersionedFiles,
+  CompilationInput Input,
+  CompilationStatus Status,
   Node Program,
-  IReadOnlyDictionary<Uri, IReadOnlyList<Diagnostic>> ResolutionDiagnostics,
+  ImmutableList<FileDiagnostic> PreviousFastDiagnostics,
+  ImmutableList<FileDiagnostic> CurrentFastDiagnostics,
+  Node? ResolvedProgram,
   SymbolTable SymbolTable,
   LegacySignatureAndCompletionTable SignatureAndCompletionTable,
-  Dictionary<Location, IdeVerificationResult> VerificationResults,
+  ImmutableDictionary<Uri, ImmutableDictionary<Range, IdeCanVerifyState>> CanVerifyStates,
   IReadOnlyList<Counterexample> Counterexamples,
   IReadOnlyDictionary<Uri, IReadOnlyList<Range>> GhostRanges,
-  IReadOnlyDictionary<Uri, VerificationTree> VerificationTrees
+  ImmutableDictionary<Uri, DocumentVerificationTree> VerificationTrees
 ) {
 
-  public ImmutableDictionary<Uri, IReadOnlyList<Diagnostic>> GetDiagnostics() {
-    var resolutionDiagnostics = ResolutionDiagnostics.ToImmutableDictionary();
-    var verificationDiagnostics = VerificationResults.GroupBy(kv => kv.Key.Uri).Select(kv =>
-      new KeyValuePair<Uri, IReadOnlyList<Diagnostic>>(kv.Key.ToUri(), kv.SelectMany(x => x.Value.Implementations.Values.SelectMany(v => v.Diagnostics)).ToList()));
-    return resolutionDiagnostics.Merge(verificationDiagnostics, Lists.Concat);
-  }
-}
-
-public static class Util {
-  public static Diagnostic ToLspDiagnostic(this DafnyDiagnostic dafnyDiagnostic) {
-    return new Diagnostic {
-      Code = dafnyDiagnostic.ErrorId,
-      Severity = ToSeverity(dafnyDiagnostic.Level),
-      Message = dafnyDiagnostic.Message,
-      Range = dafnyDiagnostic.Token.GetLspRange(),
-      Source = dafnyDiagnostic.Source.ToString(),
-      RelatedInformation = dafnyDiagnostic.RelatedInformation.Select(r =>
-        new DiagnosticRelatedInformation {
-          Location = CreateLocation(r.Token),
-          Message = r.Message
-        }).ToList(),
-      CodeDescription = dafnyDiagnostic.ErrorId == null
-        ? null
-        : new CodeDescription { Href = new Uri("https://dafny.org/dafny/HowToFAQ/Errors#" + dafnyDiagnostic.ErrorId) },
+  public ImmutableList<FileDiagnostic> FastDiagnostics => Status is CompilationStatus.Parsing or CompilationStatus.ResolutionStarted
+    ? PreviousFastDiagnostics
+    : CurrentFastDiagnostics;
+
+  public Uri Uri => Input.Uri.ToUri();
+  public int Version => Input.Version;
+
+  public static IEnumerable<Diagnostic> MarkDiagnosticsAsOutdated(IEnumerable<Diagnostic> diagnostics) {
+    return diagnostics.Select(diagnostic => diagnostic with {
+      Severity = diagnostic.Severity == DiagnosticSeverity.Error ? DiagnosticSeverity.Warning : diagnostic.Severity,
+      Message = diagnostic.Message.StartsWith(OutdatedPrefix)
+        ? diagnostic.Message
+        : OutdatedPrefix + diagnostic.Message
+    });
+  }
+
+  public static IdeState InitialIdeState(CompilationInput input) {
+    var program = new EmptyNode();
+    return new IdeState(ImmutableHashSet<Uri>.Empty,
+      ImmutableDictionary<Uri, int>.Empty,
+      input,
+      CompilationStatus.Parsing,
+      program,
+      ImmutableList<FileDiagnostic>.Empty,
+      ImmutableList<FileDiagnostic>.Empty,
+      program,
+      SymbolTable.Empty(),
+      LegacySignatureAndCompletionTable.Empty(input.Options, input.Project), ImmutableDictionary<Uri, ImmutableDictionary<Range, IdeCanVerifyState>>.Empty,
+      Array.Empty<Counterexample>(),
+      ImmutableDictionary<Uri, IReadOnlyList<Range>>.Empty,
+      ImmutableDictionary<Uri, DocumentVerificationTree>.Empty
+    );
+  }
+
+  public const string OutdatedPrefix = "Outdated: ";
+
+  public IdeState Migrate(DafnyOptions options, IMigrator migrator, int newVersion, bool clientSide) {
+    var migratedVerificationTrees = VerificationTrees.ToImmutableDictionary(
+      kv => kv.Key, kv =>
+        (DocumentVerificationTree)migrator.RelocateVerificationTree(kv.Value));
+
+    var verificationResults = clientSide
+      ? CanVerifyStates
+      : MigrateImplementationViews(migrator, CanVerifyStates);
+
+    return this with {
+      Input = Input with {
+        Version = newVersion
+      },
+      PreviousFastDiagnostics = CurrentFastDiagnostics,
+      CurrentFastDiagnostics = ImmutableList<FileDiagnostic>.Empty,
+      Status = CompilationStatus.Parsing,
+      CanVerifyStates = verificationResults,
+      SignatureAndCompletionTable = options.Get(LegacySignatureAndCompletionTable.MigrateSignatureAndCompletionTable)
+        ? migrator.MigrateSymbolTable(SignatureAndCompletionTable) : LegacySignatureAndCompletionTable.Empty(options, Input.Project),
+      VerificationTrees = migratedVerificationTrees
+    };
+  }
+
+  private ImmutableDictionary<Uri, ImmutableDictionary<Range, IdeCanVerifyState>> MigrateImplementationViews(
+    IMigrator migrator,
+    ImmutableDictionary<Uri, ImmutableDictionary<Range, IdeCanVerifyState>> oldVerificationDiagnostics) {
+    var uri = migrator.MigratedUri;
+    var previous = oldVerificationDiagnostics.GetValueOrDefault(uri);
+    if (previous == null) {
+      return oldVerificationDiagnostics;
+    }
+    var result = ImmutableDictionary<Range, IdeCanVerifyState>.Empty;
+    foreach (var entry in previous) {
+      var newOuterRange = migrator.MigrateRange(entry.Key);
+      if (newOuterRange == null) {
+        continue;
+      }
+
+      var newValue = ImmutableDictionary<string, IdeVerificationTaskState>.Empty;
+      foreach (var innerEntry in entry.Value.VerificationTasks) {
+        var newInnerRange = migrator.MigrateRange(innerEntry.Value.Range);
+        if (newInnerRange != null) {
+          newValue = newValue.Add(innerEntry.Key, innerEntry.Value with {
+            Range = newInnerRange,
+            Diagnostics = migrator.MigrateDiagnostics(innerEntry.Value.Diagnostics)
+          });
+        }
+      }
+
+      result = result.Add(newOuterRange, entry.Value with { VerificationTasks = newValue });
+    }
+
+    return oldVerificationDiagnostics.SetItem(uri, result);
+  }
+
+  public IReadOnlyDictionary<Range, IdeCanVerifyState> GetVerificationResults(Uri uri) {
+    return CanVerifyStates.GetValueOrDefault(uri) ??
+      ((IReadOnlyDictionary<Range, IdeCanVerifyState>)ImmutableDictionary<Range, IdeCanVerifyState>.Empty);
+  }
+
+  public IEnumerable<FileDiagnostic> GetAllDiagnostics() {
+    var verificationDiagnostics = CanVerifyStates.SelectMany(s =>
+      s.Value.Values.SelectMany(cvs =>
+        cvs.VerificationTasks.SelectMany(t => t.Value.Diagnostics.Select(d => new FileDiagnostic(s.Key, d))).
+          Concat(cvs.Diagnostics.Select(d => new FileDiagnostic(s.Key, d)))));
+    return FastDiagnostics.Concat(verificationDiagnostics).Concat(GetErrorLimitDiagnostics());
+  }
+
+  private IEnumerable<FileDiagnostic> GetErrorLimitDiagnostics() {
+    var anyVerificationHitErrorLimit = CanVerifyStates.Values.SelectMany(x => x.Values)
+      .SelectMany(s => s.VerificationTasks.Select(t => t.Value.HitErrorLimit)).Any(x => x);
+    IEnumerable<FileDiagnostic> result;
+    if (anyVerificationHitErrorLimit) {
+      var diagnostic = new Diagnostic() {
+        Severity = DiagnosticSeverity.Warning,
+        Code = new DiagnosticCode("errorLimitHit"),
+        Message =
+          "Verification hit error limit so not all errors may be shown. Configure this limit using --error-limit",
+        Range = Input.Project.StartingToken.GetLspRange(),
+        Source = MessageSource.Verifier.ToString()
+      };
+      result = new[] { new FileDiagnostic(Input.Project.Uri, diagnostic) };
+    } else {
+      result = Enumerable.Empty<FileDiagnostic>();
+    }
+
+    return result;
+  }
+
+  public async Task<IdeState> UpdateState(DafnyOptions options,
+    ILogger logger,
+    TelemetryPublisherBase telemetryPublisher,
+    IProjectDatabase projectDatabase, ICompilationEvent e) {
+    switch (e) {
+      case DeterminedRootFiles determinedRootFiles:
+        return await HandleDeterminedRootFiles(options, logger, projectDatabase, determinedRootFiles);
+      case BoogieUpdate boogieUpdate:
+        return HandleBoogieUpdate(options, logger, boogieUpdate);
+      case CanVerifyPartsIdentified canVerifyPartsIdentified:
+        return HandleCanVerifyPartsUpdated(logger, canVerifyPartsIdentified);
+      case FinishedParsing finishedParsing:
+        return HandleFinishedParsing(finishedParsing);
+      case FinishedResolution finishedResolution:
+        return HandleFinishedResolution(options, logger, telemetryPublisher, finishedResolution);
+      case InternalCompilationException internalCompilationException:
+        return HandleInternalCompilationException(internalCompilationException);
+      case BoogieException boogieException:
+        return HandleBoogieException(boogieException);
+      case NewDiagnostic newDiagnostic:
+        return HandleNewDiagnostic(newDiagnostic);
+      case ScheduledVerification scheduledVerification:
+        return HandleScheduledVerification(scheduledVerification);
+      default:
+        throw new ArgumentOutOfRangeException(nameof(e));
+    }
+  }
+
+  private async Task<IdeState> HandleDeterminedRootFiles(DafnyOptions options, ILogger logger,
+    IProjectDatabase projectDatabase, DeterminedRootFiles determinedRootFiles) {
+
+    var errors = CurrentFastDiagnostics.Where(d => d.Diagnostic.Severity == DiagnosticSeverity.Error);
+    var status = errors.Any() ? CompilationStatus.ParsingFailed : Status;
+
+    var ownedUris = new HashSet<Uri>();
+    foreach (var file in determinedRootFiles.Roots) {
+      var uriProject = await projectDatabase.GetProject(file.Uri);
+      logger.LogDebug($"HandleDeterminedRootFiles found project for {file.Uri} to be {uriProject.Uri}");
+      var ownedUri = uriProject.Equals(determinedRootFiles.Project);
+      if (ownedUri) {
+        ownedUris.Add(file.Uri);
+      }
+    }
+    ownedUris.Add(determinedRootFiles.Project.Uri);
+
+    var versionedFiles = ImmutableDictionary<Uri, int>.Empty;
+    if (determinedRootFiles.Project.Version != null) {
+      versionedFiles = versionedFiles.Add(determinedRootFiles.Project.Uri, determinedRootFiles.Project.Version.Value);
+    }
+    return this with {
+      OwnedUris = ownedUris,
+      VersionedFiles = versionedFiles,
+      Status = status,
+      VerificationTrees = determinedRootFiles.Roots.ToImmutableDictionary(
+        file => file.Uri,
+        file => VerificationTrees.GetValueOrDefault(file.Uri) ??
+                new DocumentVerificationTree(Program, file.Uri))
+    };
+  }
+
+  private IdeState HandleScheduledVerification(ScheduledVerification scheduledVerification) {
+    var previousState = this;
+
+    var uri = scheduledVerification.CanVerify.NavigationToken.Uri;
+    var range = scheduledVerification.CanVerify.NavigationToken.GetLspRange();
+    var previousVerificationResult = previousState.CanVerifyStates[uri][range];
+    var previousImplementations = previousVerificationResult.VerificationTasks;
+    var preparationProgress = new[]
+      { previousVerificationResult.PreparationProgress, VerificationPreparationState.InProgress }.Max();
+    var verificationResult = new IdeCanVerifyState(PreparationProgress: preparationProgress,
+      VerificationTasks: previousImplementations.ToImmutableDictionary(kv => kv.Key, kv => kv.Value with {
+        Status = PublishedVerificationStatus.Stale,
+        Diagnostics = MarkDiagnosticsAsOutdated(kv.Value.Diagnostics).ToList()
+      }), previousVerificationResult.Diagnostics);
+    return previousState with {
+      CanVerifyStates = previousState.CanVerifyStates.SetItem(uri,
+        previousState.CanVerifyStates[uri].SetItem(range, verificationResult))
+    };
+  }
+
+  private IdeState HandleNewDiagnostic(NewDiagnostic newDiagnostic) {
+    return this with {
+      CurrentFastDiagnostics = CurrentFastDiagnostics.Add(new FileDiagnostic(newDiagnostic.Uri, newDiagnostic.Diagnostic.ToLspDiagnostic()))
+    };
+  }
+
+  private IdeState HandleInternalCompilationException(InternalCompilationException internalCompilationException) {
+    var previousState = this;
+    var internalErrorDiagnostic = new Diagnostic {
+      Message =
+        "Dafny encountered an internal error. Please report it at <https://github.com/dafny-lang/dafny/issues>.\n" +
+        internalCompilationException.Exception,
+      Severity = DiagnosticSeverity.Error,
+      Range = new Range(0, 0, 0, 1)
+    };
+
+    return previousState with {
+      Status = CompilationStatus.InternalException,
+      CurrentFastDiagnostics = CurrentFastDiagnostics.Add(new FileDiagnostic(previousState.Input.Uri.ToUri(), internalErrorDiagnostic)),
+    };
+  }
+
+  private IdeState HandleFinishedResolution(DafnyOptions options,
+    ILogger logger,
+    TelemetryPublisherBase telemetryPublisher,
+    FinishedResolution finishedResolution) {
+    var previousState = this;
+    var errors = CurrentFastDiagnostics.Where(d =>
+      d.Diagnostic.Severity == DiagnosticSeverity.Error && d.Diagnostic.Source != MessageSource.Compiler.ToString()).ToList();
+    var status = errors.Any() ? CompilationStatus.ResolutionFailed : CompilationStatus.ResolutionSucceeded;
+
+    var cancellationToken = CancellationToken.None; // TODO ?
+    SymbolTable? symbolTable = null;
+    try {
+      symbolTable = SymbolTable.CreateFrom(logger, finishedResolution.Result.ResolvedProgram, cancellationToken);
+    } catch (Exception e) {
+      logger.LogError(e, "failed to create symbol table");
+    }
+
+    var beforeLegacyServerResolution = DateTime.Now;
+    var legacySignatureAndCompletionTable = new SymbolTableFactory(logger).CreateFrom(Input,
+      finishedResolution.Result, cancellationToken);
+    telemetryPublisher.PublishTime("LegacyServerResolution", options.DafnyProject.Uri.ToString(), DateTime.Now - beforeLegacyServerResolution);
+
+    IReadOnlyDictionary<Uri, IReadOnlyList<Range>> ghostRanges = new GhostStateDiagnosticCollector(options, logger).
+      GetGhostStateDiagnostics(legacySignatureAndCompletionTable, cancellationToken);
+
+    var trees = previousState.VerificationTrees;
+    if (status == CompilationStatus.ResolutionSucceeded) {
+      foreach (var uri in trees.Keys) {
+        trees = trees.SetItem(uri,
+          GutterIconAndHoverVerificationDetailsManager.UpdateTree(options, finishedResolution.Result.ResolvedProgram,
+            previousState.VerificationTrees[uri]));
+      }
+    }
+
+    var verificationResults = finishedResolution.Result.CanVerifies == null
+      ? previousState.CanVerifyStates
+      : finishedResolution.Result.CanVerifies.GroupBy(l => l.NavigationToken.Uri).ToImmutableDictionary(k => k.Key,
+        k => k.GroupBy<ICanVerify, Range>(l => l.NavigationToken.GetLspRange()).ToImmutableDictionary(
+          l => l.Key,
+          l => MergeResults(l.Select(canVerify => MergeVerifiable(previousState, canVerify)))));
+    var signatureAndCompletionTable = legacySignatureAndCompletionTable.Resolved
+      ? legacySignatureAndCompletionTable
+      : previousState.SignatureAndCompletionTable;
+
+    return previousState with {
+      Status = status,
+      Counterexamples = Array.Empty<Counterexample>(),
+      ResolvedProgram = finishedResolution.Result.ResolvedProgram,
+      SymbolTable = symbolTable ?? previousState.SymbolTable,
+      SignatureAndCompletionTable = signatureAndCompletionTable,
+      GhostRanges = ghostRanges,
+      CanVerifyStates = verificationResults,
+      VerificationTrees = trees
+    };
+  }
+
+  private static IdeCanVerifyState MergeResults(IEnumerable<IdeCanVerifyState> results) {
+    return results.Aggregate((a, b) => new IdeCanVerifyState(
+      MergeStates(a.PreparationProgress, b.PreparationProgress),
+      a.VerificationTasks.ToImmutableDictionary().Merge(b.VerificationTasks,
+        (aView, bView) => aView /* Merge should not occur */),
+      a.Diagnostics.Concat(b.Diagnostics)));
+  }
+
+  private static VerificationPreparationState MergeStates(VerificationPreparationState a, VerificationPreparationState b) {
+    return new[] { a, b }.Max();
+  }
+
+  private static PublishedVerificationStatus Combine(PublishedVerificationStatus first, PublishedVerificationStatus second) {
+    return new[] { first, second }.Min();
+  }
+
+  private static IdeCanVerifyState MergeVerifiable(IdeState previousState, ICanVerify canVerify) {
+    var range = canVerify.NavigationToken.GetLspRange();
+    var previousIdeCanVerifyState = previousState.GetVerificationResults(canVerify.NavigationToken.Uri).GetValueOrDefault(range);
+    var previousImplementations =
+      previousIdeCanVerifyState?.VerificationTasks ??
+      ImmutableDictionary<string, IdeVerificationTaskState>.Empty;
+    return new IdeCanVerifyState(PreparationProgress: VerificationPreparationState.NotStarted,
+      VerificationTasks: previousImplementations.ToImmutableDictionary(kv => kv.Key, kv => kv.Value with {
+        Status = PublishedVerificationStatus.Stale,
+        Diagnostics = MarkDiagnosticsAsOutdated(kv.Value.Diagnostics).ToList()
+      }), previousIdeCanVerifyState?.Diagnostics ?? new List<Diagnostic>());
+  }
+
+  private IdeState HandleFinishedParsing(FinishedParsing finishedParsing) {
+    var previousState = this;
+    var trees = previousState.VerificationTrees;
+    foreach (var uri in trees.Keys) {
+      trees = trees.SetItem(uri,
+        new DocumentVerificationTree(finishedParsing.ParseResult.Program, uri) {
+          Children = trees[uri].Children
+        });
+    }
+
+    var errors = CurrentFastDiagnostics.Where(d => d.Diagnostic.Severity == DiagnosticSeverity.Error);
+    var status = errors.Any() ? CompilationStatus.ParsingFailed : CompilationStatus.ResolutionStarted;
+
+    foreach (var entry in previousState.VersionedFiles) {
+      finishedParsing.ParseResult.VersionedFiles.Add(entry.Key, entry.Value);
+    }
+    return previousState with {
+      VersionedFiles = finishedParsing.ParseResult.VersionedFiles,
+      Program = finishedParsing.ParseResult.Program,
+      Status = status,
+      VerificationTrees = trees
     };
   }
 
-  private static Location CreateLocation(IToken token) {
-    var uri = DocumentUri.Parse(token.Uri.AbsoluteUri);
-    return new Location {
-      Range = token.GetLspRange(),
-      // During parsing, we store absolute paths to make reconstructing the Uri easier
-      // https://github.com/dafny-lang/dafny/blob/06b498ee73c74660c61042bb752207df13930376/Source/DafnyLanguageServer/Language/DafnyLangParser.cs#L59 
-      Uri = uri
+  private IdeState HandleCanVerifyPartsUpdated(ILogger logger, CanVerifyPartsIdentified canVerifyPartsIdentified) {
+    var previousState = this;
+    var implementations = canVerifyPartsIdentified.Parts.Select(t => t.Split.Implementation).Distinct();
+    var gutterIconManager = new GutterIconAndHoverVerificationDetailsManager(logger);
+
+    var uri = canVerifyPartsIdentified.CanVerify.Origin.Uri;
+    gutterIconManager.ReportImplementationsBeforeVerification(previousState,
+      canVerifyPartsIdentified.CanVerify, implementations.ToArray());
+
+    var range = canVerifyPartsIdentified.CanVerify.NavigationToken.GetLspRange();
+    var previousImplementations = previousState.CanVerifyStates[uri][range].VerificationTasks;
+    var verificationResult = new IdeCanVerifyState(PreparationProgress: VerificationPreparationState.Done,
+      VerificationTasks: canVerifyPartsIdentified.Parts.ToImmutableDictionary(Compilation.GetTaskName,
+        k => {
+          var previous = previousImplementations.GetValueOrDefault(Compilation.GetTaskName(k));
+          return new IdeVerificationTaskState(range, PublishedVerificationStatus.Queued,
+            previous?.Diagnostics ?? Array.Empty<Diagnostic>(),
+            previous?.HitErrorLimit ?? false, k, new Stale());
+        }), new List<Diagnostic>());
+    return previousState with {
+      CanVerifyStates = previousState.CanVerifyStates.SetItem(uri,
+        previousState.CanVerifyStates[uri].SetItem(range, verificationResult))
     };
   }
 
-  private static DiagnosticSeverity ToSeverity(ErrorLevel level) {
-    return level switch {
-      ErrorLevel.Error => DiagnosticSeverity.Error,
-      ErrorLevel.Warning => DiagnosticSeverity.Warning,
-      ErrorLevel.Info => DiagnosticSeverity.Hint,
-      _ => throw new ArgumentException($"unknown error level {level}", nameof(level))
+  private IdeState HandleBoogieException(BoogieException boogieException) {
+    var previousState = this;
+
+    var name = Compilation.GetTaskName(boogieException.Task);
+    var uri = boogieException.CanVerify.Origin.Uri;
+    var range = boogieException.CanVerify.NavigationToken.GetLspRange();
+
+    var previousVerificationResult = previousState.CanVerifyStates[uri][range];
+    var previousImplementations = previousVerificationResult.VerificationTasks;
+    var previousView = previousImplementations.GetValueOrDefault(name);
+    var diagnostics = previousView?.Diagnostics ?? Array.Empty<Diagnostic>();
+    var hitErrorLimit = previousView?.HitErrorLimit ?? false;
+
+    var internalErrorDiagnostic = new Diagnostic {
+      Message = boogieException.Exception.Message,
+      Severity = DiagnosticSeverity.Error,
+      Range = range
     };
+    diagnostics = diagnostics.Concat(new[] { internalErrorDiagnostic }).ToList();
+
+    var view = new IdeVerificationTaskState(range, PublishedVerificationStatus.Error, diagnostics.ToList(), hitErrorLimit, boogieException.Task, new Stale());
+
+    return previousState with {
+      CanVerifyStates = previousState.CanVerifyStates.SetItem(uri,
+        previousState.CanVerifyStates[uri].SetItem(range, previousVerificationResult with {
+          VerificationTasks = previousVerificationResult.VerificationTasks.SetItem(name, view)
+        }))
+    };
+  }
+
+  private IdeState HandleBoogieUpdate(DafnyOptions options, ILogger logger, BoogieUpdate boogieUpdate) {
+    var previousState = this;
+
+    var name = Compilation.GetTaskName(boogieUpdate.VerificationTask);
+    var status = StatusFromBoogieStatus(boogieUpdate.BoogieStatus);
+    var uri = boogieUpdate.CanVerify.Origin.Uri;
+    var range = boogieUpdate.CanVerify.NavigationToken.GetLspRange();
+
+    var previousVerificationResult = previousState.CanVerifyStates[uri][range];
+    var previousImplementations = previousVerificationResult.VerificationTasks;
+    var previousView = previousImplementations.GetValueOrDefault(name);
+    var counterExamples = previousState.Counterexamples;
+    bool hitErrorLimit = previousView?.HitErrorLimit ?? false;
+    IVerificationStatus rawStatus = boogieUpdate.BoogieStatus;
+    var diagnostics = previousView?.Diagnostics ?? Array.Empty<Diagnostic>();
+    if (boogieUpdate.BoogieStatus is Running) {
+      diagnostics = Array.Empty<Diagnostic>();
+      hitErrorLimit = false;
+    }
+
+    if (boogieUpdate.BoogieStatus is Completed completed) {
+      // WarnContradictoryAssumptions should be computable after completing a single assertion batch.
+      // And we should do this because it allows this warning to be shown when doing --filter-position on a single assertion
+      // https://github.com/dafny-lang/dafny/issues/5039 
+
+      counterExamples = counterExamples.Concat(completed.Result.CounterExamples);
+      hitErrorLimit |= completed.Result.MaxCounterExamples == completed.Result.CounterExamples.Count;
+      var newDiagnostics =
+        Compilation.GetDiagnosticsFromResult(options, previousState.Uri, boogieUpdate.CanVerify,
+          boogieUpdate.VerificationTask, completed.Result);
+      diagnostics = newDiagnostics.Select(d => d.ToLspDiagnostic()).ToList();
+      logger.LogTrace(
+        $"Completed received for {previousState.Input} and found #{diagnostics.Count} diagnostics and #{completed.Result.CounterExamples.Count} counterexamples.");
+    }
+
+    var newCanVerifyDiagnostics = new List<Diagnostic>();
+    var taskState = new IdeVerificationTaskState(range, status, diagnostics.ToList(),
+      hitErrorLimit, boogieUpdate.VerificationTask, rawStatus);
+    var newTaskStates = previousVerificationResult.VerificationTasks.SetItem(name, taskState);
+
+    var scopeGroup = newTaskStates.Values.Where(s => s.Task.ScopeId == boogieUpdate.VerificationTask.ScopeId).ToList();
+    var allTasksAreCompleted = scopeGroup.All(s => s.Status >= PublishedVerificationStatus.Error);
+    if (allTasksAreCompleted) {
+
+      var errorReporter = new ObservableErrorReporter(options, uri);
+      List<DafnyDiagnostic> verificationCoverageDiagnostics = new();
+      errorReporter.Updates.Subscribe(d => verificationCoverageDiagnostics.Add(d.Diagnostic));
+
+      ProofDependencyWarnings.ReportSuspiciousDependencies(options,
+        scopeGroup.Select(s => new VerificationTaskResult(s.Task, ((Completed)s.RawStatus).Result)),
+        errorReporter, boogieUpdate.ProofDependencyManager);
+
+      newCanVerifyDiagnostics = previousVerificationResult.Diagnostics.Concat(verificationCoverageDiagnostics.Select(d => d.ToLspDiagnostic())).ToList();
+    }
+
+    UpdateGutterIconTrees(logger, boogieUpdate, scopeGroup);
+
+    return previousState with {
+      Counterexamples = counterExamples,
+      CanVerifyStates = previousState.CanVerifyStates.SetItem(uri,
+        previousState.CanVerifyStates[uri].SetItem(range, previousVerificationResult with {
+          VerificationTasks = newTaskStates,
+          Diagnostics = newCanVerifyDiagnostics
+        }))
+    };
+  }
+
+  private void UpdateGutterIconTrees(ILogger logger, BoogieUpdate boogieUpdate, IReadOnlyList<IdeVerificationTaskState> scopeGroup) {
+    var gutterIconManager = new GutterIconAndHoverVerificationDetailsManager(logger);
+    if (boogieUpdate.BoogieStatus is Running && scopeGroup.Count(e => e.Status == PublishedVerificationStatus.Running) == 1) {
+      gutterIconManager.ReportVerifyImplementationRunning(this, boogieUpdate.VerificationTask.Split.Implementation);
+    }
+
+    if (boogieUpdate.BoogieStatus is Completed completed) {
+      gutterIconManager.ReportAssertionBatchResult(this,
+        new AssertionBatchResult(boogieUpdate.VerificationTask.Split.Implementation, completed.Result));
+    }
+
+    if (scopeGroup.All(e => e.Status >= PublishedVerificationStatus.Error)) {
+      var results = scopeGroup.Select(e => e.RawStatus).OfType<Completed>().Select(c => c.Result).ToList();
+
+      foreach (var result in results) {
+        logger.LogDebug(
+          $"Possibly duplicate reporting assertion batch {result.VcNum}, version {Version}");
+        gutterIconManager.ReportAssertionBatchResult(this,
+          new AssertionBatchResult(boogieUpdate.VerificationTask.Split.Implementation, result));
+      }
+
+      var resourceCount = results.Sum(e => e.ResourceCount);
+      var outcome = results.Select(e => Compilation.GetOutcome(e.Outcome)).Max();
+      gutterIconManager.ReportEndVerifyImplementation(this, boogieUpdate.VerificationTask.Split.Implementation, resourceCount, outcome);
+    }
+  }
+
+  private static PublishedVerificationStatus StatusFromBoogieStatus(IVerificationStatus verificationStatus) {
+    switch (verificationStatus) {
+      case Stale:
+        return PublishedVerificationStatus.Stale;
+      case Queued:
+        return PublishedVerificationStatus.Queued;
+      case Running:
+        return PublishedVerificationStatus.Running;
+      case Completed completed:
+        return completed.Result.Outcome == SolverOutcome.Valid
+          ? PublishedVerificationStatus.Correct
+          : PublishedVerificationStatus.Error;
+      default:
+        throw new ArgumentOutOfRangeException();
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/IdeStateObserver.cs b/Source/DafnyLanguageServer/Workspace/IdeStateObserver.cs
index cca01c24f37..7fddffdc555 100644
--- a/Source/DafnyLanguageServer/Workspace/IdeStateObserver.cs
+++ b/Source/DafnyLanguageServer/Workspace/IdeStateObserver.cs
@@ -2,9 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
-using System.Threading;
-using Microsoft.Boogie;
+using System.Reactive;
 using Microsoft.Dafny.LanguageServer.Workspace.ChangeProcessors;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
@@ -12,62 +10,42 @@
 
 namespace Microsoft.Dafny.LanguageServer.Workspace;
 
-public delegate IdeStateObserver CreateIdeStateObserver(Compilation compilation);
+public delegate IdeStateObserver CreateIdeStateObserver(IdeState initialState);
 
-public class IdeStateObserver : IObserver<IdeState> {
+public class IdeStateObserver : IObserver<IdeState> { // Inheriting from ObserverBase prevents this observer from recovering after a problem
   private readonly ILogger logger;
-  private readonly ITelemetryPublisher telemetryPublisher;
+  private readonly TelemetryPublisherBase telemetryPublisher;
   private readonly INotificationPublisher notificationPublisher;
-  private readonly ITextDocumentLoader loader;
-  private readonly Compilation compilation;
 
   private readonly object lastPublishedStateLock = new();
+  private readonly IdeState initialState;
 
   public IdeState LastPublishedState { get; private set; }
 
   public IdeStateObserver(ILogger logger,
-    ITelemetryPublisher telemetryPublisher,
+    TelemetryPublisherBase telemetryPublisher,
     INotificationPublisher notificationPublisher,
-    ITextDocumentLoader loader,
-    Compilation compilation) {
-    LastPublishedState = loader.CreateUnloaded(compilation);
+    IdeState initialState) {
+    this.initialState = initialState;
+    LastPublishedState = initialState;
     this.logger = logger;
     this.telemetryPublisher = telemetryPublisher;
     this.notificationPublisher = notificationPublisher;
-    this.loader = loader;
-    this.compilation = compilation;
   }
 
-  public void OnCompleted() {
-    var initialCompilation = new Compilation(LastPublishedState.Version + 1, LastPublishedState.Compilation.Project, compilation.RootUris);
-    var ideState = loader.CreateUnloaded(initialCompilation);
-#pragma warning disable VSTHRD002
-    notificationPublisher.PublishNotifications(LastPublishedState, ideState).Wait();
-#pragma warning restore VSTHRD002
+  public void Clear() {
+    var ideState = initialState with {
+      Input = initialState.Input with { Version = LastPublishedState.Version + 1 },
+      OwnedUris = LastPublishedState.OwnedUris
+    };
+    notificationPublisher.PublishNotifications(LastPublishedState, ideState);
     telemetryPublisher.PublishUpdateComplete();
   }
 
-  public void OnError(Exception exception) {
-    if (exception is OperationCanceledException) {
-      logger.LogDebug("document processing cancelled.");
-      return;
-    }
-
-    var internalErrorDiagnostic = new Diagnostic {
-      Message =
-        "Dafny encountered an internal error. Please report it at <https://github.com/dafny-lang/dafny/issues>.\n" +
-        exception,
-      Severity = DiagnosticSeverity.Error,
-      Range = new Range(0, 0, 0, 1)
-    };
-    var documentToPublish = LastPublishedState with {
-      ResolutionDiagnostics = ImmutableDictionary<Uri, IReadOnlyList<Diagnostic>>.Empty.Add(compilation.Project.Uri, new[] { internalErrorDiagnostic })
-    };
-
-    OnNext(documentToPublish);
+  public void OnCompleted() {
+  }
 
-    logger.LogError(exception, "error while handling document event");
-    telemetryPublisher.PublishUnhandledException(exception);
+  public void OnError(Exception exception) {
   }
 
   public void OnNext(IdeState snapshot) {
@@ -76,55 +54,16 @@ public void OnNext(IdeState snapshot) {
         return;
       }
 
-      // To prevent older updates from being sent after newer ones, we can only run one PublishNotifications at a time.
-      // So we wait for it here to finish, and the lock in this method prevents more than one from running at a time.
-#pragma warning disable VSTHRD002
-      notificationPublisher.PublishNotifications(LastPublishedState, snapshot).Wait();
-#pragma warning restore VSTHRD002
+      notificationPublisher.PublishNotifications(LastPublishedState, snapshot);
       LastPublishedState = snapshot;
-      logger.LogDebug($"Updated LastPublishedState to version {snapshot.Version}, uri {compilation.Uri}");
+      logger.LogDebug($"Updated LastPublishedState to version {snapshot.Version}, uri {initialState.Input.Uri.ToUri()}");
     }
   }
 
-  public void Migrate(Migrator migrator, int version) {
+  public void Migrate(DafnyOptions options, IMigrator migrator, int version) {
     lock (lastPublishedStateLock) {
-      var migratedVerificationTrees = LastPublishedState.VerificationTrees.ToDictionary(
-        kv => kv.Key, kv =>
-          migrator.RelocateVerificationTree(kv.Value));
-      LastPublishedState = LastPublishedState with {
-        Version = version,
-        VerificationResults = MigrateImplementationViews(migrator, LastPublishedState.VerificationResults),
-        SignatureAndCompletionTable = migrator.MigrateSymbolTable(LastPublishedState.SignatureAndCompletionTable),
-        VerificationTrees = migratedVerificationTrees
-      };
-      logger.LogDebug($"Migrated LastPublishedState to version {version}, uri {compilation.Uri}");
-    }
-  }
-
-  private Dictionary<Location, IdeVerificationResult> MigrateImplementationViews(Migrator migrator,
-      Dictionary<Location, IdeVerificationResult> oldVerificationDiagnostics) {
-    var result = new Dictionary<Location, IdeVerificationResult>();
-    foreach (var entry in oldVerificationDiagnostics) {
-      var newOuterRange = migrator.MigrateRange(entry.Key.Range);
-      if (newOuterRange == null) {
-        continue;
-      }
-
-      var newValue = new Dictionary<string, IdeImplementationView>();
-      foreach (var innerEntry in entry.Value.Implementations) {
-        var newInnerRange = migrator.MigrateRange(innerEntry.Value.Range);
-        if (newInnerRange != null) {
-          newValue.Add(innerEntry.Key, innerEntry.Value with {
-            Range = newInnerRange,
-            Diagnostics = migrator.MigrateDiagnostics(innerEntry.Value.Diagnostics)
-          });
-        }
-      }
-      result.Add(new Location() {
-        Uri = entry.Key.Uri,
-        Range = newOuterRange
-      }, entry.Value with { Implementations = newValue });
+      LastPublishedState = LastPublishedState.Migrate(options, migrator, version, true);
+      logger.LogDebug($"Migrated LastPublishedState to version {version}, uri {initialState.Input.Uri.ToUri()}");
     }
-    return result;
   }
 }
diff --git a/Source/DafnyLanguageServer/Workspace/LanguageServerExtensions.cs b/Source/DafnyLanguageServer/Workspace/LanguageServerExtensions.cs
index a3d054c5681..7472eab2880 100644
--- a/Source/DafnyLanguageServer/Workspace/LanguageServerExtensions.cs
+++ b/Source/DafnyLanguageServer/Workspace/LanguageServerExtensions.cs
@@ -1,12 +1,9 @@
 using Microsoft.Dafny.LanguageServer.Language;
 using Microsoft.Dafny.LanguageServer.Language.Symbols;
 using Microsoft.Dafny.LanguageServer.Workspace.ChangeProcessors;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Server;
-using System;
-using Microsoft.Extensions.Options;
 
 namespace Microsoft.Dafny.LanguageServer.Workspace {
   /// <summary>
@@ -26,46 +23,35 @@ public static LanguageServerOptions WithDafnyWorkspace(this LanguageServerOption
     private static IServiceCollection WithDafnyWorkspace(this IServiceCollection services) {
       return services
         .AddSingleton<IProjectDatabase, ProjectManagerDatabase>()
-        .AddSingleton<CreateProjectManager>(provider => (boogieEngine, documentIdentifier) => new ProjectManager(
+        .AddSingleton<CreateProjectManager>(provider => (scheduler, cache, documentIdentifier) => new ProjectManager(
           provider.GetRequiredService<DafnyOptions>(),
           provider.GetRequiredService<ILogger<ProjectManager>>(),
           provider.GetRequiredService<CreateMigrator>(),
           provider.GetRequiredService<IFileSystem>(),
-          provider.GetRequiredService<INotificationPublisher>(),
-          provider.GetRequiredService<IVerificationProgressReporter>(),
-          provider.GetRequiredService<CreateCompilationManager>(),
+          provider.GetRequiredService<TelemetryPublisherBase>(),
+          provider.GetRequiredService<IProjectDatabase>(),
+          provider.GetRequiredService<CreateCompilation>(),
           provider.GetRequiredService<CreateIdeStateObserver>(),
-          boogieEngine,
+          scheduler,
+          cache,
           documentIdentifier))
         .AddSingleton<IFileSystem, LanguageServerFilesystem>()
         .AddSingleton<IDafnyParser>(serviceProvider => {
           var options = serviceProvider.GetRequiredService<DafnyOptions>();
           return new DafnyLangParser(options,
             serviceProvider.GetRequiredService<IFileSystem>(),
-            serviceProvider.GetRequiredService<ITelemetryPublisher>(),
+            serviceProvider.GetRequiredService<TelemetryPublisherBase>(),
             serviceProvider.GetRequiredService<ILogger<DafnyLangParser>>(),
             serviceProvider.GetRequiredService<ILogger<CachingParser>>());
         })
-        .AddSingleton<ITextDocumentLoader>(CreateTextDocumentLoader)
+        .AddSingleton<ITextDocumentLoader, TextDocumentLoader>()
         .AddSingleton<INotificationPublisher, NotificationPublisher>()
         .AddSingleton<CreateMigrator>(provider => (changes, cancellationToken) => new Migrator(
           provider.GetRequiredService<ILogger<Migrator>>(),
           provider.GetRequiredService<ILogger<LegacySignatureAndCompletionTable>>(),
           changes, cancellationToken))
         .AddSingleton<ISymbolGuesser, SymbolGuesser>()
-        .AddSingleton<ICompilationStatusNotificationPublisher, CompilationStatusNotificationPublisher>()
-        .AddSingleton<ITelemetryPublisher, TelemetryPublisher>();
-    }
-
-    public static TextDocumentLoader CreateTextDocumentLoader(IServiceProvider services) {
-      return TextDocumentLoader.Create(
-        services.GetRequiredService<IDafnyParser>(),
-        services.GetRequiredService<ISymbolResolver>(),
-        services.GetRequiredService<ISymbolTableFactory>(),
-        services.GetRequiredService<IGhostStateDiagnosticCollector>(),
-        services.GetRequiredService<ICompilationStatusNotificationPublisher>(),
-        services.GetRequiredService<ILogger<ITextDocumentLoader>>()
-      );
+        .AddSingleton<TelemetryPublisherBase, LspTelemetryPublisher>();
     }
   }
 }
diff --git a/Source/DafnyLanguageServer/Workspace/LanguageServerFilesystem.cs b/Source/DafnyLanguageServer/Workspace/LanguageServerFilesystem.cs
index 366a810f823..06fef1a3f1d 100644
--- a/Source/DafnyLanguageServer/Workspace/LanguageServerFilesystem.cs
+++ b/Source/DafnyLanguageServer/Workspace/LanguageServerFilesystem.cs
@@ -18,9 +18,9 @@ public LanguageServerFilesystem(ILogger<LanguageServerFilesystem> logger) {
 
   private class Entry {
     public TextBuffer Buffer { get; set; }
-    public int Version { get; set; }
+    public int? Version { get; set; }
 
-    public Entry(TextBuffer buffer, int version) {
+    public Entry(TextBuffer buffer, int? version) {
       Buffer = buffer;
       Version = version;
     }
@@ -38,17 +38,18 @@ public bool OpenDocument(TextDocumentItem document) {
     string existingText = "";
     try {
       if (OnDiskFileSystem.Instance.Exists(uri)) {
-        existingText = OnDiskFileSystem.Instance.ReadFile(uri).ReadToEnd();
+        using var fileStream = OnDiskFileSystem.Instance.ReadFile(uri).Reader;
+        existingText = fileStream.ReadToEnd();
       }
     } catch (IOException) {
       // If we don't manage to detect whether this document already existed ond disc,
       // that only triggers a performance penalty
     }
-    openFiles[uri] = new Entry(new TextBuffer(document.Text), document.Version!.Value);
+    openFiles[uri] = new Entry(new TextBuffer(document.Text), document.Version);
     return existingText != document.Text;
   }
 
-  public void UpdateDocument(DidChangeTextDocumentParams documentChange) {
+  public bool UpdateDocument(DidChangeTextDocumentParams documentChange) {
     var uri = documentChange.TextDocument.Uri.ToUri();
     if (!openFiles.TryGetValue(uri, out var entry)) {
       throw new InvalidOperationException("Cannot update file that has not been opened");
@@ -56,10 +57,13 @@ public void UpdateDocument(DidChangeTextDocumentParams documentChange) {
 
     var buffer = entry.Buffer;
     var mergedBuffer = buffer;
-    foreach (var change in documentChange.ContentChanges) {
-      mergedBuffer = mergedBuffer.ApplyTextChange(change);
+    try {
+      foreach (var change in documentChange.ContentChanges) {
+        mergedBuffer = mergedBuffer.ApplyTextChange(change);
+      }
+    } catch (ArgumentOutOfRangeException) {
+      return false;
     }
-    entry.Buffer = mergedBuffer;
 
     // According to the LSP specification, document versions should increase monotonically but may be non-consecutive.
     // See: https://github.com/microsoft/language-server-protocol/blob/gh-pages/_specifications/specification-3-16.md?plain=1#L1195
@@ -71,8 +75,10 @@ public void UpdateDocument(DidChangeTextDocumentParams documentChange) {
         $"the updates of document {documentUri} are out-of-order: {oldVer} -> {newVersion}");
     }
 
-    entry.Version = newVersion!.Value;
-
+    // We assume no concurrent mutating calls to IFileSysten, in particular to OpenDocument and UpdateDocument
+    // Otherwise we'd have to lock around these calls.
+    openFiles[uri] = new Entry(mergedBuffer, newVersion!.Value);
+    return true;
   }
 
   public void CloseDocument(TextDocumentIdentifier document) {
@@ -84,9 +90,17 @@ public void CloseDocument(TextDocumentIdentifier document) {
     }
   }
 
-  public TextReader ReadFile(Uri uri) {
+  public TextBuffer? GetBuffer(Uri uri) {
+    if (openFiles.TryGetValue(uri, out var entry)) {
+      return entry.Buffer;
+    }
+
+    return null;
+  }
+
+  public FileSnapshot ReadFile(Uri uri) {
     if (openFiles.TryGetValue(uri, out var entry)) {
-      return new StringReader(entry.Buffer.Text);
+      return new FileSnapshot(new StringReader(entry.Buffer.Text), entry.Version);
     }
 
     return OnDiskFileSystem.Instance.ReadFile(uri);
@@ -102,17 +116,4 @@ public DirectoryInfoBase GetDirectoryInfoBase(string root) {
 
     return new CombinedDirectoryInfo(new[] { inMemory, OnDiskFileSystem.Instance.GetDirectoryInfoBase(root) });
   }
-
-  /// <summary>
-  /// Return the version of a particular file.
-  /// When the client sends file updates, it includes a new version for this file, which we store and return here.
-  /// File version are important to the client because it can use them to do client side migration of positions.
-  /// </summary>
-  public int? GetVersion(Uri uri) {
-    if (openFiles.TryGetValue(uri, out var file)) {
-      return file.Version;
-    }
-
-    return null;
-  }
 }
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/LspTelemetryPublisher.cs b/Source/DafnyLanguageServer/Workspace/LspTelemetryPublisher.cs
new file mode 100644
index 00000000000..99ee42fdddc
--- /dev/null
+++ b/Source/DafnyLanguageServer/Workspace/LspTelemetryPublisher.cs
@@ -0,0 +1,23 @@
+using System;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using OmniSharp.Extensions.LanguageServer.Protocol.Server;
+using System.Collections.Immutable;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Window;
+
+namespace Microsoft.Dafny.LanguageServer.Workspace {
+  public class LspTelemetryPublisher : TelemetryPublisherBase {
+    private readonly ILanguageServerFacade languageServer;
+
+    public LspTelemetryPublisher(ILanguageServerFacade languageServer, ILogger<LspTelemetryPublisher> logger)
+      : base(logger) {
+      this.languageServer = languageServer;
+    }
+
+    public override void PublishTelemetry(ImmutableDictionary<string, object> data) {
+      languageServer.Window.SendTelemetryEvent(new TelemetryEventParams {
+        ExtensionData = data
+      });
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/Migrator.cs b/Source/DafnyLanguageServer/Workspace/Migrator.cs
index 0d5c3101f04..e7bb3600990 100644
--- a/Source/DafnyLanguageServer/Workspace/Migrator.cs
+++ b/Source/DafnyLanguageServer/Workspace/Migrator.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -8,13 +10,45 @@
 using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
 namespace Microsoft.Dafny.LanguageServer.Workspace.ChangeProcessors;
 
 public delegate Migrator CreateMigrator(DidChangeTextDocumentParams changeParams, CancellationToken cancellationToken);
 
-public class Migrator {
+public interface IMigrator {
+  VerificationTree RelocateVerificationTree(VerificationTree tree);
+  Uri MigratedUri { get; }
+  Range? MigrateRange(Range range, bool isFullRange = false);
+  IReadOnlyList<Diagnostic> MigrateDiagnostics(IReadOnlyList<Diagnostic> diagnostics);
+  LegacySignatureAndCompletionTable MigrateSymbolTable(LegacySignatureAndCompletionTable table);
+}
+
+class NoopMigrator : IMigrator {
+  public NoopMigrator(Uri migratedUri) {
+    MigratedUri = migratedUri;
+  }
+
+  public VerificationTree RelocateVerificationTree(VerificationTree tree) {
+    return tree;
+  }
 
+  public Uri MigratedUri { get; }
+  public Range MigrateRange(Range range, bool isFullRange = false) {
+    return range;
+  }
+
+  public IReadOnlyList<Diagnostic> MigrateDiagnostics(IReadOnlyList<Diagnostic> diagnostics) {
+    return diagnostics;
+  }
+
+  public LegacySignatureAndCompletionTable MigrateSymbolTable(LegacySignatureAndCompletionTable table) {
+    return table;
+  }
+}
+
+
+public class Migrator : IMigrator {
   private readonly ILogger<Migrator> logger;
   private readonly DidChangeTextDocumentParams changeParams;
   private readonly CancellationToken cancellationToken;
@@ -22,6 +56,8 @@ public class Migrator {
 
   private readonly Dictionary<TextDocumentContentChangeEvent, Position> getPositionAtEndOfAppliedChangeCache = new();
 
+  public Uri MigratedUri => changeParams.TextDocument.Uri.ToUri();
+
   public Migrator(
     ILogger<Migrator> logger,
     ILogger<LegacySignatureAndCompletionTable> loggerSymbolTable,
@@ -286,7 +322,7 @@ private IDictionary<ILegacySymbol, SymbolLocation> ApplyDeclarationsChange(
     var migratedDeclarations = new Dictionary<ILegacySymbol, SymbolLocation>();
     foreach (var (symbol, location) in previousDeclarations) {
       cancellationToken.ThrowIfCancellationRequested();
-      if (location.Uri != changeParams.TextDocument.Uri.ToUri()) {
+      if (location.Uri != changeParams.TextDocument.Uri) {
         migratedDeclarations.Add(symbol, location);
         continue;
       }
@@ -338,7 +374,7 @@ public VerificationTree RelocateVerificationTree(VerificationTree originalVerifi
     var migratedChildren = MigrateVerificationTrees(originalVerificationTree.Children);
     var migratedRange = MigrateRange(originalVerificationTree.Range, true);
     return originalVerificationTree with {
-      Children = migratedChildren.ToList(),
+      Children = new ConcurrentBag<VerificationTree>(migratedChildren),
       Range = migratedRange!,
       StatusCurrent = CurrentStatus.Obsolete
     };
@@ -359,7 +395,7 @@ private IEnumerable<VerificationTree> MigrateVerificationTrees(IEnumerable<Verif
       }
       var newNodeDiagnostic = verificationTree with {
         Range = newRange,
-        Children = MigrateVerificationTrees(verificationTree.Children, change).ToList(),
+        Children = new ConcurrentBag<VerificationTree>(MigrateVerificationTrees(verificationTree.Children, change)),
         StatusVerification = verificationTree.StatusVerification,
         StatusCurrent = CurrentStatus.Obsolete,
         Finished = false,
diff --git a/Source/DafnyLanguageServer/Workspace/NotificationPublisher.cs b/Source/DafnyLanguageServer/Workspace/NotificationPublisher.cs
index 9d894d58f77..bed60ecf377 100644
--- a/Source/DafnyLanguageServer/Workspace/NotificationPublisher.cs
+++ b/Source/DafnyLanguageServer/Workspace/NotificationPublisher.cs
@@ -1,14 +1,16 @@
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
 using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 using System.Linq;
-using System.Threading.Tasks;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol;
+using System.Collections.Immutable;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
 namespace Microsoft.Dafny.LanguageServer.Workspace {
@@ -16,85 +18,145 @@ public class NotificationPublisher : INotificationPublisher {
     private readonly ILogger<NotificationPublisher> logger;
     private readonly LanguageServerFilesystem filesystem;
     private readonly ILanguageServerFacade languageServer;
-    private readonly IProjectDatabase projectManagerDatabase;
     private readonly DafnyOptions options;
 
-    public NotificationPublisher(ILogger<NotificationPublisher> logger, ILanguageServerFacade languageServer,
-      IProjectDatabase projectManagerDatabase,
+    public NotificationPublisher(
+      ILogger<NotificationPublisher> logger,
+      ILanguageServerFacade languageServer,
       DafnyOptions options, LanguageServerFilesystem filesystem) {
       this.logger = logger;
       this.languageServer = languageServer;
-      this.projectManagerDatabase = projectManagerDatabase;
       this.options = options;
       this.filesystem = filesystem;
     }
 
-    public async Task PublishNotifications(IdeState previousState, IdeState state) {
+    public void PublishNotifications(IdeState previousState, IdeState state) {
       if (state.Version < previousState.Version) {
         return;
       }
 
-      PublishVerificationStatus(previousState, state);
+      var diagnosticsPerFile = state.GetAllDiagnostics().GroupBy(d => d.Uri).ToImmutableDictionary(
+        g => g.Key,
+        g => g.Select(d => d.Diagnostic).ToImmutableList());
+
+      PublishDiagnostics(state, diagnosticsPerFile);
+      PublishProgress(previousState, state);
       PublishGhostness(previousState, state);
-      await PublishDiagnostics(state);
+      foreach (var uri in state.OwnedUris) {
+        PublishGutterIcons(uri, state, diagnosticsPerFile);
+      }
     }
 
-    private void PublishVerificationStatus(IdeState previousState, IdeState state) {
-      var currentPerFile = GetFileVerificationStatus(state);
-      var previousPerFile = GetFileVerificationStatus(previousState);
+    private void PublishProgress(IdeState previousState, IdeState state) {
+      // Some global progress values, such as ResolutionSucceeded, will trigger the symbol progress to be displayed.
+      // To ensure that the displayed progress is always up-to-date,
+      // we must publish symbol progress before publishing the global one.
 
-      foreach (var (uri, current) in currentPerFile) {
-        if (previousPerFile.TryGetValue(uri, out var previous)) {
-          if (previous.NamedVerifiables.SequenceEqual(current.NamedVerifiables)) {
-            continue;
-          }
+      // Better would be to have a single notification API with the schema { globalProgress, symbolProgress }
+      // so this problem can not occur, although that would require the "symbolProgress" part to be able to contain a
+      // "no-update" value to prevent having to send many duplicate symbolProgress updates.
+
+      PublishSymbolProgress(previousState, state);
+      PublishGlobalProgress(previousState, state);
+    }
+
+    private void PublishSymbolProgress(IdeState previousState, IdeState state) {
+      foreach (var uri in state.OwnedUris.Concat(previousState.OwnedUris).Distinct()) {
+        var previous = GetFileVerificationStatus(previousState, uri);
+        var current = GetFileVerificationStatus(state, uri);
+
+        if (Equals(current, previous)) {
+          continue;
         }
+
+        logger.LogTrace($"Publishing symbol status {current.Stringify()}");
         languageServer.TextDocument.SendNotification(DafnyRequestNames.VerificationSymbolStatus, current);
       }
     }
 
-    private static IDictionary<Uri, FileVerificationStatus> GetFileVerificationStatus(IdeState state) {
-      return state.VerificationResults.GroupBy(kv => kv.Key.Uri).
-        ToDictionary(kv => kv.Key.ToUri(), kvs =>
-        new FileVerificationStatus(kvs.Key, state.Compilation.Version,
-          kvs.Select(kv => GetNamedVerifiableStatuses(kv.Key, kv.Value)).
-            OrderBy(s => s.NameRange.Start).ToList()));
+    private void PublishGlobalProgress(IdeState previousState, IdeState state) {
+      foreach (var uri in state.OwnedUris) {
+
+        var current = state.Status;
+        var previous = previousState.Status;
+
+        if (Equals(current, previous)) {
+          continue;
+        }
+
+        languageServer.SendNotification(new CompilationStatusParams {
+          Uri = uri,
+          Version = GetFileVersion(state, uri),
+          Status = current,
+          Message = null
+        });
+      }
     }
 
-    private static NamedVerifiableStatus GetNamedVerifiableStatuses(Location canVerify, IdeVerificationResult result) {
-      var status = result.WasTranslated
-        ? result.Implementations.Any()
-          ? result.Implementations.Values.Select(v => v.Status).Aggregate(Combine)
-          : PublishedVerificationStatus.Correct
-        : PublishedVerificationStatus.Stale;
+    private static int? GetFileVersion(IdeState state, Uri uri) {
+      int? version = null;
+      if (state.VersionedFiles.TryGetValue(uri, out var file)) {
+        version = file;
+      }
 
-      return new(canVerify.Range, status);
+      return version;
     }
 
-    static PublishedVerificationStatus Combine(PublishedVerificationStatus first, PublishedVerificationStatus second) {
-      return new[] { first, second }.Min();
+    private FileVerificationStatus GetFileVerificationStatus(IdeState state, Uri uri) {
+      var verificationResults = state.GetVerificationResults(uri);
+      return new FileVerificationStatus(uri, GetFileVersion(state, uri),
+        verificationResults.Select(kv => GetNamedVerifiableStatuses(kv.Key, kv.Value)).
+            OrderBy(s => s.NameRange.Start).ToList());
+    }
+
+    private static NamedVerifiableStatus GetNamedVerifiableStatuses(Range canVerify, IdeCanVerifyState result) {
+      const PublishedVerificationStatus nothingToVerifyStatus = PublishedVerificationStatus.Correct;
+      var status = result.PreparationProgress switch {
+        VerificationPreparationState.NotStarted => PublishedVerificationStatus.Stale,
+        VerificationPreparationState.InProgress => PublishedVerificationStatus.Queued,
+        VerificationPreparationState.Done =>
+          result.VerificationTasks.Values.Any()
+            ? result.VerificationTasks.Values.Select(v => v.Status).Aggregate(Combine)
+            : nothingToVerifyStatus,
+        _ => throw new ArgumentOutOfRangeException()
+      };
+
+      return new(canVerify, status);
     }
 
-    private readonly Dictionary<Uri, IList<Diagnostic>> publishedDiagnostics = new();
+    public static PublishedVerificationStatus Combine(PublishedVerificationStatus first, PublishedVerificationStatus second) {
+      var max = new[] { first, second }.Max();
+      var min = new[] { first, second }.Min();
+
+      if (max >= PublishedVerificationStatus.Error) {
+        if (min == PublishedVerificationStatus.Queued) {
+          // If one task is completed, we do not allowed queued as a status.
+          return PublishedVerificationStatus.Running;
+        }
+
+        return min;
+      } else {
+        return max;
+      }
+    }
 
-    private async Task PublishDiagnostics(IdeState state) {
-      var currentDiagnostics = state.GetDiagnostics();
+    private readonly ConcurrentDictionary<Uri, IList<Diagnostic>> publishedDiagnostics = new();
 
+    private void PublishDiagnostics(IdeState state, ImmutableDictionary<Uri, ImmutableList<Diagnostic>> diagnosticsPerFile) {
       // All root uris are added because we may have to publish empty diagnostics for owned uris.
-      var sources = currentDiagnostics.Keys.Concat(state.Compilation.RootUris).Distinct();
+      var sources = diagnosticsPerFile.Keys.Concat(state.OwnedUris).Distinct();
 
       var projectDiagnostics = new List<Diagnostic>();
       foreach (var uri in sources) {
-        var current = currentDiagnostics.GetOrDefault(uri, Enumerable.Empty<Diagnostic>).ToArray();
-        var uriProject = await projectManagerDatabase.GetProject(uri);
-        var ownedUri = uriProject.Equals(state.Compilation.Project);
+        var current = diagnosticsPerFile.GetValueOrDefault(uri) ?? ImmutableList<Diagnostic>.Empty;
+        var ownedUri = state.OwnedUris.Contains(uri);
         if (ownedUri) {
-          if (uri == state.Compilation.Project.Uri) {
+          if (uri == state.Input.Project.Uri) {
             // Delay publication of project diagnostics,
             // since it also serves as a bucket for diagnostics from unowned files
             projectDiagnostics.AddRange(current);
           } else {
-            PublishForUri(uri, currentDiagnostics.GetOrDefault(uri, Enumerable.Empty<Diagnostic>).ToArray());
+            PublishForUri(uri, current.ToArray());
           }
         } else {
           var errors = current.Where(d => d.Severity == DiagnosticSeverity.Error).ToList();
@@ -104,28 +166,30 @@ private async Task PublishDiagnostics(IdeState state) {
 
           projectDiagnostics.Add(new Diagnostic {
             Range = new Range(0, 0, 0, 1),
-            Message = $"the referenced file {uri.LocalPath} contains error(s) but is not owned by this project. The first error is:\n{errors.First().Message}",
+            Message = $"the file {uri.LocalPath} contains error(s) when used by this project, but is part of a different project. The first error is:\n{errors.First().Message}",
             Severity = DiagnosticSeverity.Error,
             Source = MessageSource.Parser.ToString()
           });
         }
       }
 
-      PublishForUri(state.Compilation.Project.Uri, projectDiagnostics.ToArray());
+      PublishForUri(state.Input.Project.Uri, projectDiagnostics.ToArray());
 
       void PublishForUri(Uri publishUri, Diagnostic[] diagnostics) {
+        var sortedDiagnostics = diagnostics.OrderBy(d => d.Range.Start).ThenBy(d => d.Range.End).ToList();
         var previous = publishedDiagnostics.GetOrDefault(publishUri, Enumerable.Empty<Diagnostic>);
-        if (!previous.SequenceEqual(diagnostics, new DiagnosticComparer())) {
-          if (diagnostics.Any()) {
-            publishedDiagnostics[publishUri] = diagnostics;
+        if (!previous.SequenceEqual(sortedDiagnostics, new DiagnosticComparer())) {
+          if (sortedDiagnostics.Any()) {
+            publishedDiagnostics[publishUri] = sortedDiagnostics;
           } else {
             // Prevent memory leaks by cleaning up previous state when it's the IDE's initial state.
-            publishedDiagnostics.Remove(publishUri);
+            publishedDiagnostics.TryRemove(publishUri, out _);
           }
 
+          logger.LogTrace($"Publish diagnostics called for URI {publishUri}");
           languageServer.TextDocument.PublishDiagnostics(new PublishDiagnosticsParams {
             Uri = publishUri,
-            Version = filesystem.GetVersion(publishUri) ?? 0,
+            Version = GetFileVersion(state, publishUri),
             Diagnostics = diagnostics,
           });
         }
@@ -134,39 +198,60 @@ void PublishForUri(Uri publishUri, Diagnostic[] diagnostics) {
 
 
     private readonly Dictionary<Uri, VerificationStatusGutter> previouslyPublishedIcons = new();
-    public void PublishGutterIcons(Uri uri, IdeState state, bool verificationStarted) {
-      if (!options.Get(ServerCommand.LineVerificationStatus)) {
+
+    private void PublishGutterIcons(Uri uri, IdeState state,
+      ImmutableDictionary<Uri, ImmutableList<Diagnostic>> diagnosticsPerFile) {
+      if (!options.Get(GutterIconAndHoverVerificationDetailsManager.LineVerificationStatus)) {
         return;
       }
 
-      var errors = state.ResolutionDiagnostics.GetOrDefault(uri, Enumerable.Empty<Diagnostic>).
-        Where(x => x.Severity == DiagnosticSeverity.Error).ToList();
-      var tree = state.VerificationTrees[uri];
-
-      var linesCount = tree.Range.End.Line + 1;
-      var fileVersion = filesystem.GetVersion(uri) ?? 0;
-      var verificationStatusGutter = VerificationStatusGutter.ComputeFrom(
-        DocumentUri.From(uri),
-        fileVersion,
-        tree.Children,
-        errors,
-        linesCount,
-        verificationStarted
-      );
-      if (logger.IsEnabled(LogLevel.Trace)) {
-        var icons = string.Join(' ', verificationStatusGutter.PerLineStatus.Select(s => LineVerificationStatusToString[s]));
-        logger.LogDebug($"Sending gutter icons for compilation {state.Compilation.Project.Uri}, comp version {state.Version}, file version {fileVersion}" +
-                        $"icons: {icons}\n" +
-                        $"stacktrace:\n{Environment.StackTrace}");
-      };
+      if (state.Status == CompilationStatus.Parsing) {
+        return;
+      }
 
+      try {
 
-      lock (previouslyPublishedIcons) {
-        var previous = previouslyPublishedIcons.GetValueOrDefault(uri);
-        if (previous == null || !previous.PerLineStatus.SequenceEqual(verificationStatusGutter.PerLineStatus)) {
-          previouslyPublishedIcons[uri] = verificationStatusGutter;
-          languageServer.TextDocument.SendNotification(verificationStatusGutter);
+        bool verificationStarted = state.Status == CompilationStatus.ResolutionSucceeded;
+
+        var errors = diagnosticsPerFile.GetOrDefault(uri, Enumerable.Empty<Diagnostic>).Where(x =>
+          x.Severity == DiagnosticSeverity.Error && x.Source != MessageSource.Verifier.ToString()).ToList();
+        var tree = state.VerificationTrees.GetValueOrDefault(uri);
+        if (tree == null) {
+          return;
+        }
+
+        var linesCount = tree.Range.End.Line + 1;
+        var fileVersion = GetFileVersion(state, uri);
+        if (linesCount == 0) {
+          return;
+        }
+
+        var verificationStatusGutter = VerificationStatusGutter.ComputeFrom(
+          DocumentUri.From(uri),
+          fileVersion,
+          tree.Children.ToList(),
+          errors,
+          linesCount,
+          verificationStarted
+        );
+        if (logger.IsEnabled(LogLevel.Trace)) {
+          var icons = string.Join(' ',
+            verificationStatusGutter.PerLineStatus.Select(s => LineVerificationStatusToString[s]));
+          logger.LogDebug(
+            $"Sending gutter icons for compilation {state.Input.Project.Uri}, comp version {state.Version}, file version {fileVersion}" +
+            $"icons: {icons}\n" +
+            $"stacktrace:\n{Environment.StackTrace}");
         }
+
+        lock (previouslyPublishedIcons) {
+          var previous = previouslyPublishedIcons.GetValueOrDefault(uri);
+          if (previous == null || !previous.PerLineStatus.SequenceEqual(verificationStatusGutter.PerLineStatus)) {
+            previouslyPublishedIcons[uri] = verificationStatusGutter;
+            languageServer.TextDocument.SendNotification(verificationStatusGutter);
+          }
+        }
+      } catch (Exception e) {
+        logger.LogError(e, "Exception while publishing gutter icons");
       }
     }
 
@@ -186,18 +271,20 @@ public void PublishGutterIcons(Uri uri, IdeState state, bool verificationStarted
       { LineVerificationStatus.AssertionVerifiedInErrorContextObsolete, "[o]" },
       { LineVerificationStatus.AssertionVerifiedInErrorContextVerifying, "[Q]" },
       { LineVerificationStatus.AssertionVerifiedInErrorContext, "[O]" },
-      { LineVerificationStatus.ResolutionError, @"/!\" }
+      { LineVerificationStatus.ResolutionError, @"/!\" },
+      { LineVerificationStatus.Skipped, @" ? " }
     };
 
     private void PublishGhostness(IdeState previousState, IdeState state) {
 
       var newParams = state.GhostRanges;
       var previousParams = previousState.GhostRanges;
-      foreach (var (uri, current) in newParams) {
-        if (previousParams.TryGetValue(uri, out var previous)) {
-          if (previous.SequenceEqual(current)) {
-            continue;
-          }
+      var uris = previousParams.Keys.Concat(newParams.Keys);
+      foreach (var uri in uris) {
+        var previous = previousParams.GetValueOrDefault(uri) ?? Enumerable.Empty<Range>().ToList();
+        var current = newParams.GetValueOrDefault(uri) ?? Enumerable.Empty<Range>().ToList();
+        if (previous.SequenceEqual(current)) {
+          continue;
         }
         languageServer.TextDocument.SendNotification(new GhostDiagnosticsParams {
           Uri = uri,
diff --git a/Source/DafnyLanguageServer/Workspace/Notifications/CompilationStatus.cs b/Source/DafnyLanguageServer/Workspace/Notifications/CompilationStatus.cs
index 7fa121992a9..930cb6bc9b9 100644
--- a/Source/DafnyLanguageServer/Workspace/Notifications/CompilationStatus.cs
+++ b/Source/DafnyLanguageServer/Workspace/Notifications/CompilationStatus.cs
@@ -8,10 +8,10 @@ namespace Microsoft.Dafny.LanguageServer.Workspace.Notifications {
   [JsonConverter(typeof(StringEnumConverter))]
   public enum CompilationStatus {
     Parsing,
+    InternalException,
     ParsingFailed,
     ResolutionStarted,
     ResolutionFailed,
-    CompilationSucceeded, // When resolution has succeeded
-    PreparingVerification,
+    ResolutionSucceeded
   }
 }
diff --git a/Source/DafnyLanguageServer/Workspace/Notifications/CompilationStatusParams.cs b/Source/DafnyLanguageServer/Workspace/Notifications/CompilationStatusParams.cs
index 94d45846fcf..61b96562826 100644
--- a/Source/DafnyLanguageServer/Workspace/Notifications/CompilationStatusParams.cs
+++ b/Source/DafnyLanguageServer/Workspace/Notifications/CompilationStatusParams.cs
@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.Dafny.LanguageServer.IntegrationTest.Util;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 
diff --git a/Source/DafnyLanguageServer/Workspace/Notifications/VerificationDiagnosticsParams.cs b/Source/DafnyLanguageServer/Workspace/Notifications/VerificationDiagnosticsParams.cs
index b1cece67695..84eb4ab5358 100644
--- a/Source/DafnyLanguageServer/Workspace/Notifications/VerificationDiagnosticsParams.cs
+++ b/Source/DafnyLanguageServer/Workspace/Notifications/VerificationDiagnosticsParams.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection.Metadata;
+using DafnyCore.Verifier;
 using MediatR;
 using Microsoft.Boogie;
 using Microsoft.Dafny.LanguageServer.Language;
@@ -28,7 +30,7 @@ LineVerificationStatus[] PerLineStatus
 
     public static VerificationStatusGutter ComputeFrom(
         DocumentUri uri,
-        int version,
+        int? version,
         ICollection<VerificationTree> verificationTrees,
         Container<Diagnostic> resolutionErrors,
         int linesCount,
@@ -53,9 +55,16 @@ public static LineVerificationStatus[] RenderPerLineDiagnostics(
         return result;
       }
 
+      var oneMemberHasOnly =
+        verificationTrees.Any(tree => tree is TopLevelDeclMemberVerificationTree { MarkedAsOnly: true });
+
       // Render verification tree content into lines.
       foreach (var verificationTree in verificationTrees) {
         if (verificationTree.Uri == uri) {
+          if (oneMemberHasOnly && verificationTree is TopLevelDeclMemberVerificationTree { MarkedAsOnly: false }) {
+            verificationTree.StatusCurrent = CurrentStatus.Current;
+            verificationTree.StatusVerification = GutterVerificationStatus.Skipped;
+          }
           verificationTree.RenderInto(result);
         }
       }
@@ -96,6 +105,7 @@ public static LineVerificationStatus[] RenderPerLineDiagnostics(
   public enum GutterVerificationStatus {
     Nothing = 0,
     Verified = 200,
+    Skipped = 250,
     Inconclusive = 270,
     Error = 400
   }
@@ -118,6 +128,7 @@ public enum LineVerificationStatus {
     VerifiedVerifying = 202,
     // Also applicable for empty spaces if they are not surrounded by errors.
     Verified = 200,
+    Skipped = 250,
     // For trees containing children with errors (e.g. functions, methods, fields, subset types)
     ErrorContextObsolete = 301,
     ErrorContextVerifying = 302,
@@ -189,11 +200,11 @@ Position Position
     // Resources allocated at the end of the computation.
     public long ResourceCount { get; set; } = 0;
 
-
+    public List<TrackedNodeComponent> CoveredIds { get; set; } = new();
 
     // Sub-diagnostics if any
-    public List<VerificationTree> Children { get; set; } = new();
-    public List<VerificationTree> NewChildren { get; set; } = new();
+    public ConcurrentBag<VerificationTree> Children { get; set; } = new();
+    public ConcurrentBag<VerificationTree> NewChildren { get; set; } = new();
 
     public void Visit(Action<VerificationTree> action) {
       action(this);
@@ -278,6 +289,7 @@ public static LineVerificationStatus RenderLineVerificationStatus(
       bool isFinalError, bool contextHasErrors, bool contextIsPending,
       CurrentStatus currentStatus, GutterVerificationStatus verificationStatus) {
       LineVerificationStatus simpleStatus = verificationStatus switch {
+        GutterVerificationStatus.Skipped => LineVerificationStatus.Skipped, // Always current
         GutterVerificationStatus.Nothing => LineVerificationStatus.Nothing,
         // let's be careful to no display "Verified" for a range if the context does not have errors and is pending
         // because there might be other errors on the same range.
@@ -299,7 +311,9 @@ public static LineVerificationStatus RenderLineVerificationStatus(
             : LineVerificationStatus.ErrorContext,
         _ => throw new ArgumentOutOfRangeException()
       };
-      return (LineVerificationStatus)((int)simpleStatus + (int)currentStatus);
+      return
+        simpleStatus == LineVerificationStatus.Skipped ? simpleStatus :
+          (LineVerificationStatus)((int)simpleStatus + (int)currentStatus);
     }
 
     protected virtual bool IsFinalError => false;
@@ -339,24 +353,9 @@ public virtual void RenderInto(LineVerificationStatus[] perLineDiagnostics, bool
       }
     }
 
-    // If the verification never starts on this node, it means there is nothing to verify about it.
-    // Returns true if a status was updated
-    public bool SetVerifiedIfPending() {
-      if (StatusCurrent == CurrentStatus.Obsolete) {
-        StatusCurrent = CurrentStatus.Current;
-        StatusVerification = GutterVerificationStatus.Verified;
-        foreach (var child in Children) {
-          child.SetVerifiedIfPending();
-        }
-        return true;
-      }
-
-      return false;
-    }
-
     public virtual VerificationTree GetCopyForNotification() {
       return this with {
-        Children = Children.Select(child => child.GetCopyForNotification()).ToList()
+        Children = new ConcurrentBag<VerificationTree>(Children.Select(child => child.GetCopyForNotification()))
       };
     }
   }
@@ -368,9 +367,9 @@ public record DocumentVerificationTree(
 
     private static Range ComputeRange(INode node, Uri uri) {
       if (node is not Program program) {
-        return new Range(0, 0, 0, 0);
+        return new Range(0, 0, -1, 0);
       }
-      var end = program.Files.FirstOrDefault(f => f.RangeToken.Uri == uri)?.EndToken ?? Token.NoToken;
+      var end = program.Files.FirstOrDefault(f => f.Origin.Uri == uri)?.EndToken ?? Token.NoToken;
       while (end.Next != null) {
         end = end.Next;
       }
@@ -393,7 +392,8 @@ public record TopLevelDeclMemberVerificationTree(
     Uri Uri,
     // The range of this node.
     Range Range,
-    Position Position
+    Position Position,
+    bool MarkedAsOnly
   ) : VerificationTree(Kind, DisplayName, Identifier, Filename, Uri, Range, Position) {
     // Recomputed from the children which are ImplementationVerificationTree
     public ImmutableDictionary<AssertionBatchIndex, AssertionBatchVerificationTree> AssertionBatches { get; private set; } =
@@ -401,7 +401,7 @@ Position Position
 
     public override VerificationTree GetCopyForNotification() {
       return this with {
-        Children = Children.Select(child => child.GetCopyForNotification()).ToList(),
+        Children = new ConcurrentBag<VerificationTree>(Children.Select(child => child.GetCopyForNotification())),
         AssertionBatches = AssertionBatches
           .Select(keyValuePair =>
             (keyValuePair.Key, (AssertionBatchVerificationTree)keyValuePair.Value.GetCopyForNotification()))
@@ -415,12 +415,13 @@ public void RecomputeAssertionBatchNodeDiagnostics() {
       foreach (var implementationNode in Children.OfType<ImplementationVerificationTree>()) {
         implementationNumber++;
         foreach (var vcNum in implementationNode.AssertionBatchMetrics.Keys.OrderBy(x => x)) {
-          var children = implementationNode.Children.OfType<AssertionVerificationTree>().Where(
-            assertionNode => assertionNode.AssertionBatchNum == vcNum).Cast<VerificationTree>().ToList();
+          var children = new ConcurrentBag<VerificationTree>(implementationNode.Children.OfType<AssertionVerificationTree>().Where(
+            assertionNode => assertionNode.AssertionBatchNum == vcNum));
           var minPosition = children.Count > 0 ? children.MinBy(child => child.Position)!.Range.Start : Range.Start;
           var maxPosition = children.Count > 0 ? children.MaxBy(child => child.Range.End)!.Range.End : Range.Start;
           result[new AssertionBatchIndex(implementationNumber, vcNum)] = new AssertionBatchVerificationTree(
             $"Assertion batch #{result.Count + 1}",
+            implementationNode.VerboseName,
             $"assertion-batch-{implementationNumber}-{vcNum}",
             Filename,
             Uri,
@@ -428,6 +429,7 @@ public void RecomputeAssertionBatchNodeDiagnostics() {
           ) {
             Children = children,
             ResourceCount = implementationNode.AssertionBatchMetrics[vcNum].ResourceCount,
+            CoveredIds = implementationNode.AssertionBatchMetrics[vcNum].CoveredIds,
             RelativeNumber = result.Count + 1,
           }.WithDuration(implementationNode.StartTime, implementationNode.AssertionBatchMetrics[vcNum].Time);
         }
@@ -456,6 +458,7 @@ public void RecomputeAssertionBatchNodeDiagnostics() {
   // Invariant: There is at least 1 child for every assertion batch
   public record AssertionBatchVerificationTree(
     string DisplayName,
+    string VerboseName,
     // Used to re-trigger the verification of some diagnostics.
     string Identifier,
     string Filename,
@@ -474,7 +477,7 @@ public AssertionBatchVerificationTree WithDuration(DateTime parentStartTime, int
     }
     public override VerificationTree GetCopyForNotification() {
       return this with {
-        Children = Children.Select(child => child.GetCopyForNotification()).ToList()
+        Children = new ConcurrentBag<VerificationTree>(Children.Select(child => child.GetCopyForNotification()))
       };
     }
 
@@ -483,11 +486,13 @@ public override VerificationTree GetCopyForNotification() {
 
   public record AssertionBatchMetrics(
     int Time,
-    int ResourceCount
+    int ResourceCount,
+    List<TrackedNodeComponent> CoveredIds
   );
 
   public record ImplementationVerificationTree(
     string DisplayName,
+    string VerboseName,
     // Used to re-trigger the verification of some diagnostics.
     string Identifier,
     string Filename,
@@ -506,15 +511,15 @@ Position Position
 
     public override VerificationTree GetCopyForNotification() {
       return this with {
-        Children = Children.Select(child => child.GetCopyForNotification()).ToList(),
+        Children = new ConcurrentBag<VerificationTree>(Children.Select(child => child.GetCopyForNotification())),
         AssertionBatchMetrics = new Dictionary<int, AssertionBatchMetrics>(AssertionBatchMetrics).ToImmutableDictionary()
       };
     }
 
     private Implementation? implementation = null;
 
-    public void AddAssertionBatchMetrics(int vcNum, int milliseconds, int resourceCount) {
-      NewAssertionBatchMetrics[vcNum] = new AssertionBatchMetrics(milliseconds, resourceCount);
+    public void AddAssertionBatchMetrics(int vcNum, int milliseconds, int resourceCount, List<TrackedNodeComponent> coveredIds) {
+      NewAssertionBatchMetrics[vcNum] = new AssertionBatchMetrics(milliseconds, resourceCount, coveredIds);
     }
 
     public override bool Start() {
@@ -593,7 +598,7 @@ private AssertionVerificationTree WithImmediatelyRelatedChanges() {
 
       var tok = assertion.tok;
       var result = new List<Range>();
-      while (tok is NestedToken nestedToken) {
+      while (tok is NestedOrigin nestedToken) {
         tok = nestedToken.Inner;
         if (tok.filename == assertion.tok.filename) {
           result.Add(tok.GetLspRange());
@@ -603,7 +608,7 @@ private AssertionVerificationTree WithImmediatelyRelatedChanges() {
       if (counterExample is ReturnCounterexample returnCounterexample) {
         tok = returnCounterexample.FailingReturn.tok;
         if (tok.filename == assertion.tok.filename) {
-          result.Add(returnCounterexample.FailingReturn.tok.GetLspRange());
+          result.Add(BoogieGenerator.ToDafnyToken(true, returnCounterexample.FailingReturn.tok).StartToken.GetLspRange());
         }
       }
 
diff --git a/Source/DafnyLanguageServer/Workspace/ProjectManager.cs b/Source/DafnyLanguageServer/Workspace/ProjectManager.cs
index 9f2e39308c7..d850f1ccd66 100644
--- a/Source/DafnyLanguageServer/Workspace/ProjectManager.cs
+++ b/Source/DafnyLanguageServer/Workspace/ProjectManager.cs
@@ -1,11 +1,15 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.Immutable;
+using System.CommandLine;
 using System.IO;
 using System.Linq;
 using System.Numerics;
+using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using System.Reactive.Threading.Tasks;
 using System.Threading;
 using System.Threading.Tasks;
 using IntervalTree;
@@ -15,30 +19,51 @@
 using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Location = OmniSharp.Extensions.LanguageServer.Protocol.Models.Location;
 
 namespace Microsoft.Dafny.LanguageServer.Workspace;
 
 public delegate ProjectManager CreateProjectManager(
-  ExecutionEngine boogieEngine,
+  TaskScheduler scheduler,
+  VerificationResultCache verificationCache,
   DafnyProject project);
 
-public record FilePosition(Uri Uri, Position Position);
 
 /// <summary>
 /// Handles operation on a single document.
 /// Handles migration of previously published document state
 /// </summary>
-public class ProjectManager : IDisposable {
+public class ProjectManager {
+
+  public const int DefaultThrottleTime = 100;
+  public static readonly Option<int> UpdateThrottling = new("--update-throttling", () => DefaultThrottleTime,
+    @"How many milliseconds the server will wait before sending new document updates to the client. Higher values reduce bandwidth at the cost of responsiveness".TrimStart()) {
+    IsHidden = true
+  };
+
+  public static readonly Option<VerifyOnMode> Verification = new("--verify-on", () => VerifyOnMode.Change, @"
+(experimental)
+Determine when to automatically verify the program. Choose from: Never, OnChange (verify everything in a file when changing the file), OnChangeProject or OnSave.".TrimStart()) {
+    ArgumentHelpName = "event"
+  };
+
+  public static readonly Option<bool> ReuseSolvers = new("--reuse-solvers",
+    @"(experimental) Reuse solver for different verification of different document versions. Reduces verification latency but may reduce reliability of verification.".TrimStart()) {
+    ArgumentHelpName = "event"
+  };
+
   private readonly CreateMigrator createMigrator;
   public DafnyProject Project { get; }
 
   private readonly IdeStateObserver observer;
-  public CompilationManager CompilationManager { get; private set; }
+  public Compilation Compilation { get; private set; }
   private IDisposable observerSubscription;
-  private readonly INotificationPublisher notificationPublisher;
-  private readonly IVerificationProgressReporter verificationProgressReporter;
+  private readonly EventLoopScheduler ideStateUpdateScheduler = new();
   private readonly ILogger<ProjectManager> logger;
 
+  private readonly VerificationResultCache cache;
+  private readonly TaskScheduler scheduler;
+
   /// <summary>
   /// The version of this project.
   /// Is incremented when any file in the project is updated.
@@ -47,75 +72,119 @@ public class ProjectManager : IDisposable {
   /// </summary>
   private int version;
 
-  private int openFileCount;
+  private ConcurrentDictionary<Uri, int> openFiles = new();
 
-  private VerifyOnMode AutomaticVerificationMode => options.Get(ServerCommand.Verification);
+  private VerifyOnMode AutomaticVerificationMode => options.Get(Verification);
 
-  private bool VerifyOnSave => options.Get(ServerCommand.Verification) == VerifyOnMode.Save;
-  public List<FilePosition> ChangedVerifiables { get; set; } = new();
+  private bool VerifyOnSave => options.Get(Verification) == VerifyOnMode.Save;
   public List<Location> RecentChanges { get; set; } = new();
 
   private readonly DafnyOptions options;
   private readonly DafnyOptions serverOptions;
-  private readonly CreateCompilationManager createCompilationManager;
-  private readonly ExecutionEngine boogieEngine;
+  private readonly CreateCompilation createCompilation;
+  private ExecutionEngine? boogieEngine;
   private readonly IFileSystem fileSystem;
+  private readonly TelemetryPublisherBase telemetryPublisher;
+  private readonly IProjectDatabase projectDatabase;
+  private IdeState latestIdeState;
+  private ReplaySubject<IdeState> states = new(1);
+  public IObservable<IdeState> States => states;
 
   public ProjectManager(
     DafnyOptions serverOptions,
     ILogger<ProjectManager> logger,
     CreateMigrator createMigrator,
     IFileSystem fileSystem,
-    INotificationPublisher notificationPublisher,
-    IVerificationProgressReporter verificationProgressReporter,
-    CreateCompilationManager createCompilationManager,
+    TelemetryPublisherBase telemetryPublisher,
+    IProjectDatabase projectDatabase,
+    CreateCompilation createCompilation,
     CreateIdeStateObserver createIdeStateObserver,
-    ExecutionEngine boogieEngine,
+    TaskScheduler scheduler,
+    VerificationResultCache cache,
     DafnyProject project) {
     Project = project;
-    this.verificationProgressReporter = verificationProgressReporter;
-    this.notificationPublisher = notificationPublisher;
+    this.telemetryPublisher = telemetryPublisher;
+    this.projectDatabase = projectDatabase;
     this.serverOptions = serverOptions;
     this.fileSystem = fileSystem;
-    this.createCompilationManager = createCompilationManager;
+    this.createCompilation = createCompilation;
     this.createMigrator = createMigrator;
     this.logger = logger;
-    this.boogieEngine = boogieEngine;
 
     options = DetermineProjectOptions(project, serverOptions);
     options.Printer = new OutputLogger(logger);
+    this.cache = cache;
+    this.scheduler = scheduler;
+    var compilationInput = new CompilationInput(options, version, Project);
+    var initialIdeState = IdeState.InitialIdeState(compilationInput);
+    latestIdeState = initialIdeState;
 
-    var initialCompilation = CreateInitialCompilation();
-    observer = createIdeStateObserver(initialCompilation);
-    CompilationManager = createCompilationManager(
-        options, boogieEngine, initialCompilation, ImmutableDictionary<Uri, VerificationTree>.Empty
-    );
+    observer = createIdeStateObserver(initialIdeState);
+    Compilation = this.createCompilation(GetBoogie(), compilationInput);
 
     observerSubscription = Disposable.Empty;
   }
 
-  private Compilation CreateInitialCompilation() {
-    var rootUris = Project.GetRootSourceUris(fileSystem).Concat(options.CliRootSourceUris).ToList();
-    return new Compilation(version, Project, rootUris);
-  }
-
   private const int MaxRememberedChanges = 100;
-  private const int MaxRememberedChangedVerifiables = 5;
 
   public void UpdateDocument(DidChangeTextDocumentParams documentChange) {
-    var changeProcessor = createMigrator(documentChange, CancellationToken.None);
-    observer.Migrate(changeProcessor, version + 1);
-    var lastPublishedState = observer.LastPublishedState;
-    var migratedVerificationTrees = lastPublishedState.VerificationTrees;
+    StartNewCompilation(documentChange.TextDocument.Uri.ToUri(), documentChange);
+  }
+
+  private void StartNewCompilation(Uri triggeringFile, DidChangeTextDocumentParams? changes) {
+    observerSubscription.Dispose();
+    version += 1;
+
+    var input = new CompilationInput(options, version, Project);
+    IMigrator migrator = changes == null ? new NoopMigrator(triggeringFile) : createMigrator(changes, CancellationToken.None);
+    // If we migrate the observer before accessing latestIdeState, we can be sure it's migrated before it receives new events.
+    observer.Migrate(options, migrator, version);
+    latestIdeState = latestIdeState.Migrate(options, migrator, version, false);
+
+    Compilation.Dispose();
+    Compilation = createCompilation(GetBoogie(), input);
+    var migratedUpdates = GetStates(Compilation);
+    states = new ReplaySubject<IdeState>(1);
+    var statesSubscription = observerSubscription =
+      migratedUpdates.Do(s => latestIdeState = s).Subscribe(states);
+
+    var throttleTime = options.Get(UpdateThrottling);
+    var throttledUpdates = throttleTime == 0 ? States : States.Sample(TimeSpan.FromMilliseconds(throttleTime));
+
+    var throttledSubscription = throttledUpdates.Subscribe(observer);
+    observerSubscription = new CompositeDisposable(statesSubscription, throttledSubscription);
+
+    Compilation.Start();
+
+    if (changes != null) {
+      UpdateRecentChanges(changes, migrator);
+    }
+    TriggerVerificationForFile(triggeringFile);
+  }
 
+  private ExecutionEngine GetBoogie() {
+    if (options.Get(ReuseSolvers)) {
+      boogieEngine ??= new ExecutionEngine(options, cache, scheduler);
+    } else {
+      boogieEngine?.Dispose();
+      boogieEngine = new ExecutionEngine(options, cache, scheduler);
+    }
+    return boogieEngine;
+  }
+
+  private void UpdateRecentChanges(DidChangeTextDocumentParams changes, IMigrator? migrator) {
     lock (RecentChanges) {
-      var newChanges = documentChange.ContentChanges.Where(c => c.Range != null).
+      var newChanges = changes.ContentChanges.Where(c => c.Range != null).
         Select(contentChange => new Location {
           Range = contentChange.Range!,
-          Uri = documentChange.TextDocument.Uri
+          Uri = changes.TextDocument.Uri
         });
       var migratedChanges = RecentChanges.Select(location => {
-        var newRange = changeProcessor.MigrateRange(location.Range);
+        if (location.Uri != changes.TextDocument.Uri) {
+          return location;
+        }
+
+        var newRange = migrator!.MigrateRange(location.Range);
         if (newRange == null) {
           return null;
         }
@@ -126,34 +195,38 @@ public void UpdateDocument(DidChangeTextDocumentParams documentChange) {
       }).Where(r => r != null);
       RecentChanges = newChanges.Concat(migratedChanges).Take(MaxRememberedChanges).ToList()!;
     }
-
-    StartNewCompilation(migratedVerificationTrees, lastPublishedState);
-    TriggerVerificationForFile(documentChange.TextDocument.Uri.ToUri());
   }
 
-  private void StartNewCompilation(IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees,
-    IdeState lastPublishedState) {
-    version++;
-    logger.LogDebug("Clearing result for workCompletedForCurrentVersion");
+  private IObservable<IdeState> GetStates(Compilation compilation) {
+    var initialState = latestIdeState;
+    var previousIdeState = initialState with {
+      Input = compilation.Input,
+    };
 
-    CompilationManager.CancelPendingUpdates();
-    CompilationManager = createCompilationManager(
-      options,
-      boogieEngine,
-      CreateInitialCompilation(),
-      migratedVerificationTrees);
+    return compilation.Updates.ObserveOn(ideStateUpdateScheduler).Select(ev => Update(ev));
 
-    observerSubscription.Dispose();
-    var migratedUpdates = CompilationManager.CompilationUpdates.Select(document =>
-      document.ToIdeState(lastPublishedState));
-    observerSubscription = migratedUpdates.Subscribe(observer);
+    IdeState Update(ICompilationEvent ev) {
+      if (ev is InternalCompilationException compilationException) {
+        logger.LogError(compilationException.Exception, "error while handling document event");
+        telemetryPublisher.PublishUnhandledException(compilationException.Exception);
+      }
 
-    CompilationManager.Start();
+      try {
+#pragma warning disable VSTHRD002
+        previousIdeState = previousIdeState.UpdateState(options, logger, telemetryPublisher, projectDatabase, ev).Result;
+#pragma warning restore VSTHRD002
+        return previousIdeState;
+      } catch (Exception e) {
+        logger.LogError(e, "error while updating IDE state");
+        telemetryPublisher.PublishUnhandledException(e);
+        throw;
+      }
+    }
   }
 
-  public void TriggerVerificationForFile(Uri triggeringFile) {
+  private void TriggerVerificationForFile(Uri triggeringFile) {
     if (AutomaticVerificationMode is VerifyOnMode.Change or VerifyOnMode.ChangeProject) {
-      var _ = VerifyEverythingAsync(AutomaticVerificationMode == VerifyOnMode.Change ? triggeringFile : null);
+      _ = VerifyEverythingAsync(AutomaticVerificationMode == VerifyOnMode.Change ? triggeringFile : null);
     } else {
       logger.LogDebug("Setting result for workCompletedForCurrentVersion");
     }
@@ -162,14 +235,21 @@ public void TriggerVerificationForFile(Uri triggeringFile) {
   private static DafnyOptions DetermineProjectOptions(DafnyProject projectOptions, DafnyOptions serverOptions) {
     var result = new DafnyOptions(serverOptions);
 
-    foreach (var option in ServerCommand.Instance.Options) {
-      var hasProjectFileValue = projectOptions.TryGetValue(option, TextWriter.Null, out var projectFileValue);
+    foreach (var option in LanguageServer.Options) {
+      var hasProjectFileValue = projectOptions.TryGetValue(option, out var projectFileValue);
       if (hasProjectFileValue) {
         result.Options.OptionArguments[option] = projectFileValue;
         result.ApplyBinding(option);
       }
     }
 
+    if (result.SolverIdentifier == "Z3") {
+      result.SolverVersion = null;
+    }
+
+    result.DafnyProject = projectOptions;
+    result.ApplyDefaultOptionsWithoutSettingsDefault();
+
     return result;
   }
 
@@ -184,135 +264,97 @@ public void Save(TextDocumentIdentifier documentId) {
   /// Needs to be thread-safe
   /// </summary>
   /// <returns></returns>
-  public bool CloseDocument(out Task close) {
-    if (Interlocked.Decrement(ref openFileCount) == 0) {
-      close = CloseAsync();
+  public bool CloseDocument(Uri uri) {
+    if (openFiles.TryRemove(uri, out _) && openFiles.IsEmpty) {
+      CloseAsync();
       return true;
     }
 
-    close = Task.CompletedTask;
     return false;
   }
 
-  public async Task CloseAsync() {
-    CompilationManager.CancelPendingUpdates();
+  public void CloseAsync() {
+    Compilation.Dispose();
     try {
-      await CompilationManager.LastDocument;
-      observer.OnCompleted();
+      observer.Clear();
     } catch (OperationCanceledException) {
     }
+    Dispose();
   }
 
-  public async Task<CompilationAfterParsing> GetLastDocumentAsync() {
-    logger.LogDebug($"GetLastDocumentAsync passed ProjectManager check for {Project.Uri}");
-    return await CompilationManager.LastDocument;
+  public Task<IdeState> GetStateAfterParsingAsync() {
+    return States.Where(s => s.Status > CompilationStatus.Parsing).FirstAsync().ToTask();
   }
 
-  public async Task<IdeState> GetSnapshotAfterParsingAsync() {
-    try {
-      var parsedCompilation = await CompilationManager.ParsedCompilation;
-      logger.LogDebug($"GetSnapshotAfterParsingAsync returns compilation version {parsedCompilation.Version}");
-    } catch (OperationCanceledException) {
-      logger.LogDebug($"GetSnapshotAfterResolutionAsync caught OperationCanceledException for parsed compilation {Project.Uri}");
-    }
-
-    logger.LogDebug($"GetSnapshotAfterParsingAsync returns state version {observer.LastPublishedState.Version}");
-    return observer.LastPublishedState;
+  public Task<IdeState> GetStateAfterResolutionAsync() {
+    return States.Where(s => s.Status is CompilationStatus.ParsingFailed or > CompilationStatus.ResolutionStarted).FirstAsync().ToTask();
   }
 
-  public async Task<IdeState> GetStateAfterResolutionAsync() {
-    try {
-      var resolvedCompilation = await CompilationManager.ResolvedCompilation;
-      logger.LogDebug($"GetStateAfterResolutionAsync returns compilation version {resolvedCompilation.Version}");
-    } catch (OperationCanceledException) {
-      logger.LogDebug($"GetSnapshotAfterResolutionAsync caught OperationCanceledException for resolved compilation {Project.Uri}");
-      return await GetSnapshotAfterParsingAsync();
-    }
-
-    logger.LogDebug($"GetStateAfterResolutionAsync returns state version {observer.LastPublishedState.Version}");
-    return observer.LastPublishedState;
-  }
-
-  public async Task<IdeState> GetIdeStateAfterVerificationAsync() {
-    try {
-      await GetLastDocumentAsync();
-    } catch (OperationCanceledException) {
-    }
-
-    return observer.LastPublishedState;
-  }
-
-
   /// <summary>
   /// This property and related code will be removed once we replace server gutter icons with client side computed gutter icons
   /// </summary>
   public static bool GutterIconTesting = false;
 
   public async Task VerifyEverythingAsync(Uri? uri) {
-    var compilationManager = CompilationManager;
-    try {
-      compilationManager.IncrementJobs();
-      var resolvedCompilation = await compilationManager.ResolvedCompilation;
-
-      var verifiables = resolvedCompilation.Verifiables.ToList();
-      if (uri != null) {
-        verifiables = verifiables.Where(d => d.Tok.Uri == uri).ToList();
-      }
-
-      lock (RecentChanges) {
-        var freshlyChangedVerifiables = GetChangedVerifiablesFromRanges(resolvedCompilation, RecentChanges);
-        ChangedVerifiables = freshlyChangedVerifiables.Concat(ChangedVerifiables).Distinct()
-          .Take(MaxRememberedChangedVerifiables).ToList();
-        RecentChanges = new List<Location>();
-      }
+    var compilation = Compilation;
+    var resolution = await compilation.Resolution;
+    var canVerifies = resolution?.CanVerifies?.ToList();
+    if (canVerifies == null) {
+      return;
+    }
 
-      int GetPriorityAttribute(ISymbol symbol) {
-        if (symbol is IAttributeBearingDeclaration hasAttributes &&
-            hasAttributes.HasUserAttribute("priority", out var attribute) &&
-            attribute.Args.Count >= 1 && attribute.Args[0] is LiteralExpr { Value: BigInteger priority }) {
-          return (int)priority;
-        }
-        return 0;
-      }
+    if (uri != null) {
+      canVerifies = canVerifies.Where(d => d.Origin.Uri == uri).ToList();
+    }
 
-      int TopToBottomPriority(ISymbol symbol) {
-        return symbol.Tok.pos;
-      }
-      var implementationOrder = ChangedVerifiables.Select((v, i) => (v, i)).ToDictionary(k => k.v, k => k.i);
-      var orderedVerifiables = verifiables.OrderByDescending(GetPriorityAttribute).CreateOrderedEnumerable(
-        t => implementationOrder.GetOrDefault(t.Tok.GetFilePosition(), () => int.MaxValue),
-        null, false).CreateOrderedEnumerable(TopToBottomPriority, null, false).ToList();
-      logger.LogDebug($"Ordered verifiables: {string.Join(", ", orderedVerifiables.Select(v => v.NameToken.val))}");
-
-      var orderedVerifiableLocations = orderedVerifiables.Select(v => v.NameToken.GetFilePosition()).ToList();
-      if (GutterIconTesting) {
-        foreach (var canVerify in orderedVerifiableLocations) {
-          await compilationManager.VerifySymbol(canVerify, false);
-        }
+    List<FilePosition> changedVerifiables;
+    lock (RecentChanges) {
+      changedVerifiables = GetChangedVerifiablesFromRanges(canVerifies, RecentChanges).ToList();
+    }
 
-        logger.LogDebug($"Finished translation in VerifyEverything for {Project.Uri}");
+    int GetPriorityAttribute(ISymbol symbol) {
+      if (symbol is IAttributeBearingDeclaration hasAttributes &&
+          hasAttributes.HasUserAttribute("priority", out var attribute) &&
+          attribute.Args.Count >= 1 && attribute.Args[0] is LiteralExpr { Value: BigInteger priority }) {
+        return (int)priority;
       }
+      return 0;
+    }
 
+    int TopToBottomPriority(ISymbol symbol) {
+      return symbol.Origin.pos;
+    }
+    var implementationOrder = changedVerifiables.Select((v, i) => (v, i)).ToDictionary(k => k.v, k => k.i);
+    var orderedVerifiables = canVerifies
+      .OrderByDescending(GetPriorityAttribute)
+      .ThenBy(t => implementationOrder.GetOrDefault(t.Origin.GetFilePosition(), () => int.MaxValue))
+      .ThenBy(TopToBottomPriority).ToList();
+    logger.LogDebug($"Ordered verifiables: {string.Join(", ", orderedVerifiables.Select(v => v.NavigationToken.val))}");
+
+    var orderedVerifiableLocations = orderedVerifiables.Select(v => v.NavigationToken.GetFilePosition()).ToList();
+    if (GutterIconTesting) {
       foreach (var canVerify in orderedVerifiableLocations) {
-        // Wait for each task to try and run, so the order is respected.
-        await compilationManager.VerifySymbol(canVerify);
+        await compilation.VerifyLocation(canVerify, onlyPrepareVerificationForGutterTests: true);
       }
+
+      logger.LogDebug($"Finished translation in VerifyEverything for {Project.Uri}");
     }
-    finally {
-      logger.LogDebug("Setting result for workCompletedForCurrentVersion");
-      compilationManager.DecrementJobs();
+
+    foreach (var canVerify in orderedVerifiableLocations) {
+      // Wait for each task to try and run, so the order is respected.
+      await compilation.VerifyLocation(canVerify);
     }
   }
 
-  private IEnumerable<FilePosition> GetChangedVerifiablesFromRanges(CompilationAfterResolution translated, IEnumerable<Location> changedRanges) {
+  private static IEnumerable<FilePosition> GetChangedVerifiablesFromRanges(IReadOnlyList<ICanVerify> verifiables, IEnumerable<Location> changedRanges) {
     IntervalTree<Position, Position> GetTree(Uri uri) {
       var intervalTree = new IntervalTree<Position, Position>();
-      foreach (var canVerify in translated.Verifiables) {
-        if (canVerify.Tok.Uri == uri) {
+      foreach (var canVerify in verifiables) {
+        if (canVerify.Origin.Uri == uri) {
           intervalTree.Add(
-            canVerify.RangeToken.StartToken.GetLspPosition(),
-            canVerify.RangeToken.EndToken.GetLspPosition(true),
-            canVerify.NameToken.GetLspPosition());
+            canVerify.Origin.StartToken.GetLspPosition(),
+            canVerify.Origin.EndToken.GetLspPosition(true),
+            canVerify.NavigationToken.GetLspPosition());
         }
       }
       return intervalTree;
@@ -321,23 +363,28 @@ IntervalTree<Position, Position> GetTree(Uri uri) {
     Dictionary<Uri, IntervalTree<Position, Position>> trees = new();
 
     return changedRanges.SelectMany(changeRange => {
-      var tree = trees.GetOrCreate(changeRange.Uri.ToUri(), () => GetTree(changeRange.Uri.ToUri()));
-      return tree.Query(changeRange.Range.Start, changeRange.Range.End).Select(position => new FilePosition(changeRange.Uri.ToUri(), position));
-    });
+      var uri = changeRange.Uri.ToUri();
+      var tree = trees.GetOrCreate(uri, () => GetTree(uri));
+      return tree.Query(changeRange.Range.Start, changeRange.Range.End).Select(position => new FilePosition(uri, position));
+    }).Distinct();
   }
 
   public void OpenDocument(Uri uri, bool triggerCompilation) {
-    Interlocked.Increment(ref openFileCount);
-    var lastPublishedState = observer.LastPublishedState;
-    var migratedVerificationTrees = lastPublishedState.VerificationTrees;
+    openFiles.TryAdd(uri, 1);
 
     if (triggerCompilation) {
-      StartNewCompilation(migratedVerificationTrees, lastPublishedState);
-      TriggerVerificationForFile(uri);
+      StartNewCompilation(uri, null);
     }
   }
 
+  public bool IsDisposed { get; private set; }
+
   public void Dispose() {
-    CompilationManager.CancelPendingUpdates();
+    IsDisposed = true;
+    boogieEngine?.Dispose();
+    Compilation.Dispose();
+    observerSubscription.Dispose();
+    // Dispose the update scheduler after the observer subscription, to prevent accessing a disposed object.
+    ideStateUpdateScheduler.Dispose();
   }
 }
diff --git a/Source/DafnyLanguageServer/Workspace/ProjectManagerDatabase.cs b/Source/DafnyLanguageServer/Workspace/ProjectManagerDatabase.cs
index 9f6768659c2..a9b5a296a65 100644
--- a/Source/DafnyLanguageServer/Workspace/ProjectManagerDatabase.cs
+++ b/Source/DafnyLanguageServer/Workspace/ProjectManagerDatabase.cs
@@ -2,31 +2,35 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Runtime.Caching;
 using System.Threading.Tasks;
+using DafnyCore;
 using Microsoft.Boogie;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol;
+using Token = Microsoft.Boogie.Token;
 
 namespace Microsoft.Dafny.LanguageServer.Workspace {
   /// <summary>
   /// Contains a collection of ProjectManagers
   /// </summary>
   public class ProjectManagerDatabase : IProjectDatabase {
-    private object myLock = new();
-    public const int ProjectFileCacheExpiryTime = 100;
+
+    private readonly object myLock = new();
 
     private readonly CreateProjectManager createProjectManager;
     private readonly ILogger<ProjectManagerDatabase> logger;
-    private readonly ExecutionEngine boogieEngine;
 
     private readonly Dictionary<Uri, ProjectManager> managersByProject = new();
     private readonly Dictionary<Uri, ProjectManager> managersBySourceFile = new();
     private readonly LanguageServerFilesystem fileSystem;
     private readonly VerificationResultCache verificationCache = new();
-    private readonly MemoryCache projectFilePerFolderCache = new("projectFiles");
-    private readonly object nullRepresentative = new(); // Needed because you can't store null in the MemoryCache, but that's a value we want to cache.
+    private readonly TaskScheduler scheduler;
     private readonly DafnyOptions serverOptions;
+    private CachingProjectFileOpener projectFileOpener;
+
+    private const int stackSize = 10 * 1024 * 1024;
 
     public ProjectManagerDatabase(
       LanguageServerFilesystem fileSystem,
@@ -37,7 +41,8 @@ public ProjectManagerDatabase(
       this.logger = logger;
       this.fileSystem = fileSystem;
       this.serverOptions = serverOptions;
-      boogieEngine = new ExecutionEngine(serverOptions, verificationCache);
+      this.scheduler = CustomStackSizePoolTaskScheduler.Create(stackSize, serverOptions.VcsCores);
+      projectFileOpener = new CachingProjectFileOpener(fileSystem, serverOptions, Token.Ide);
     }
 
     public async Task OpenDocument(TextDocumentItem document) {
@@ -47,7 +52,10 @@ public async Task OpenDocument(TextDocumentItem document) {
     }
 
     public async Task UpdateDocument(DidChangeTextDocumentParams documentChange) {
-      fileSystem.UpdateDocument(documentChange);
+      var success = fileSystem.UpdateDocument(documentChange);
+      if (!success) {
+        throw new ArgumentException("the document change ranges did not match ranges inside the documents");
+      }
       var documentUri = documentChange.TextDocument.Uri;
       var manager = await GetProjectManager(documentUri, false);
       if (manager == null) {
@@ -66,54 +74,52 @@ public async Task SaveDocument(TextDocumentIdentifier documentId) {
       manager.Save(documentId);
     }
 
-    public async Task CloseDocumentAsync(TextDocumentIdentifier documentId) {
+    public void CloseDocument(TextDocumentIdentifier documentId) {
       fileSystem.CloseDocument(documentId);
 
-      Task close;
       lock (myLock) {
         if (!managersBySourceFile.Remove(documentId.Uri.ToUri(), out var manager)) {
           return;
         }
 
-        if (manager.CloseDocument(out close)) {
+        if (manager.CloseDocument(documentId.Uri.ToUri())) {
           managersByProject.Remove(manager.Project.Uri, out _);
         }
       }
-      await close;
     }
 
-    public Task<IdeState?> GetResolvedDocumentAsyncNormalizeUri(TextDocumentIdentifier documentId) {
+    public async Task<IdeState?> GetParsedDocumentNormalizeUri(TextDocumentIdentifier documentId) {
       // Resolves drive letter capitalisation issues in Windows that occur when this method is called
       // from an in-process client without serializing documentId
       var normalizedUri = DocumentUri.From(documentId.Uri.ToString());
       documentId = documentId with {
         Uri = normalizedUri
       };
-      return GetResolvedDocumentAsyncInternal(documentId);
-    }
-
-    public async Task<IdeState?> GetResolvedDocumentAsyncInternal(TextDocumentIdentifier documentId) {
       var manager = await GetProjectManager(documentId, false);
       if (manager != null) {
-        return await manager.GetStateAfterResolutionAsync();
+        return await manager.GetStateAfterParsingAsync();
       }
 
       return null;
     }
 
-    public async Task<CompilationAfterParsing?> GetLastDocumentAsync(TextDocumentIdentifier documentId) {
+    public Task<IdeState?> GetResolvedDocumentAsyncNormalizeUri(TextDocumentIdentifier documentId) {
       // Resolves drive letter capitalisation issues in Windows that occur when this method is called
       // from an in-process client without serializing documentId
       var normalizedUri = DocumentUri.From(documentId.Uri.ToString());
       documentId = documentId with {
         Uri = normalizedUri
       };
+      return GetResolvedDocumentAsyncInternal(documentId);
+    }
+
+    public async Task<IdeState?> GetResolvedDocumentAsyncInternal(TextDocumentIdentifier documentId) {
       var manager = await GetProjectManager(documentId, false);
+      logger.LogDebug($"project manager found for {documentId.Uri}");
       if (manager != null) {
-        return await manager.GetLastDocumentAsync();
+        return await manager.GetStateAfterResolutionAsync();
       }
 
-      logger.LogDebug($"GetLastDocumentAsync returned null for {documentId.Uri}");
       return null;
     }
 
@@ -122,119 +128,91 @@ public async Task CloseDocumentAsync(TextDocumentIdentifier documentId) {
     }
 
     private async Task<ProjectManager?> GetProjectManager(TextDocumentIdentifier documentId, bool createOnDemand, bool changedOnOpen = false) {
-      if (!fileSystem.Exists(documentId.Uri.ToUri())) {
+      var uri = documentId.Uri.ToUri();
+      if (!fileSystem.Exists(uri)) {
         return null;
       }
 
-      var project = await GetProject(documentId.Uri.ToUri());
+      var project = await GetProject(uri);
 
       lock (myLock) {
-        var projectManagerForFile = managersBySourceFile.GetValueOrDefault(documentId.Uri.ToUri());
+        var projectManagerForFile = managersBySourceFile.GetValueOrDefault(uri);
+
+        if (projectManagerForFile is { IsDisposed: true }) {
+          // Defensive coding
+          logger.LogError("Found disposed project manager through managersBySourceFile.");
+          projectManagerForFile = null;
+        }
 
+        bool triggerCompilation = false;
         if (projectManagerForFile != null) {
+
           var filesProjectHasChanged = !projectManagerForFile.Project.Equals(project);
           if (filesProjectHasChanged) {
-            var projectFileHasChanged = projectManagerForFile.Project.Uri == project.Uri;
-            if (projectFileHasChanged) {
-              var _ = projectManagerForFile.CloseAsync();
-            } else {
-              projectManagerForFile.CloseDocument(out _);
+            logger.LogDebug($"Migrating file {uri} from project {projectManagerForFile.Project.Uri} to project {project.Uri}");
+
+            var projectFileContentHasChanged = projectManagerForFile.Project.Uri == project.Uri;
+            if (projectFileContentHasChanged) {
+              managersByProject.Remove(project.Uri);
+            }
+            var previousProjectHasNoDocuments = projectManagerForFile.CloseDocument(projectManagerForFile.Project.Uri);
+            if (previousProjectHasNoDocuments) {
+              // Enable garbage collection
+              managersByProject.Remove(projectManagerForFile.Project.Uri);
             }
 
-            projectManagerForFile = createProjectManager(boogieEngine, project);
-            projectManagerForFile.OpenDocument(documentId.Uri.ToUri(), true);
+            projectManagerForFile = managersByProject.GetValueOrDefault(project.Uri) ??
+                                    createProjectManager(scheduler, verificationCache, project);
+            projectManagerForFile.OpenDocument(uri, true);
+            triggerCompilation = true;
           }
         } else {
           var managerForProject = managersByProject.GetValueOrDefault(project.Uri);
+          if (managerForProject is { IsDisposed: true }) {
+            // Defensive coding
+            logger.LogError("Found disposed project manager through managersByProject.");
+            managerForProject = null;
+          }
+
           if (managerForProject != null) {
             projectManagerForFile = managerForProject;
-            if (changedOnOpen) {
-              projectManagerForFile.UpdateDocument(new DidChangeTextDocumentParams {
-                ContentChanges = Array.Empty<TextDocumentContentChangeEvent>(),
-                TextDocument = new OptionalVersionedTextDocumentIdentifier {
-                  Uri = documentId.Uri
-                }
-              });
-            }
+            triggerCompilation = changedOnOpen;
           } else {
             if (createOnDemand) {
-              projectManagerForFile = createProjectManager(boogieEngine, project);
-              projectManagerForFile.OpenDocument(documentId.Uri.ToUri(), true);
+              projectManagerForFile = createProjectManager(scheduler, verificationCache, project);
+              triggerCompilation = true;
             } else {
               return null;
             }
           }
         }
 
-        managersBySourceFile[documentId.Uri.ToUri()] = projectManagerForFile;
+        managersBySourceFile[uri] = projectManagerForFile;
         managersByProject[project.Uri] = projectManagerForFile;
+        projectManagerForFile.OpenDocument(uri, triggerCompilation);
         return projectManagerForFile;
       }
     }
 
     public async Task<DafnyProject> GetProject(Uri uri) {
-      return (await FindProjectFile(uri)) ?? ImplicitProject(uri);
+      return await projectFileOpener.TryFindProject(uri) ?? ImplicitProject(uri);
     }
 
     public static DafnyProject ImplicitProject(Uri uri) {
-      var implicitProject = new DafnyProject {
-        Includes = new[] { uri.LocalPath },
-        Uri = uri
-      };
+      var implicitProject = new DafnyProject(
+        null,
+        uri, null,
+        new[] { uri.LocalPath }.ToHashSet(),
+        new HashSet<string>(),
+        new Dictionary<string, object>());
       return implicitProject;
     }
 
-    private async Task<DafnyProject?> FindProjectFile(Uri sourceUri) {
-      DafnyProject? projectFile = null;
-
-      var folder = Path.GetDirectoryName(sourceUri.LocalPath);
-      while (!string.IsNullOrEmpty(folder) && projectFile == null) {
-        projectFile = await OpenProjectInFolder(folder);
-
-        if (projectFile != null && projectFile.Uri != sourceUri && projectFile.ContainsSourceFile(sourceUri) == false) {
-          projectFile = null;
-        }
-
-        folder = Path.GetDirectoryName(folder);
-      }
-
-      if (projectFile != null && projectFile.Uri != sourceUri && !serverOptions.Get(ServerCommand.ProjectMode)) {
-        logger.LogDebug("Project file at {} will be ignored because project mode is disabled", projectFile.Uri);
-        projectFile.Uri = sourceUri;
-        projectFile.Includes = new[] { sourceUri.LocalPath };
-      }
-
-      return projectFile;
-    }
-
-    private async Task<DafnyProject?> OpenProjectInFolder(string folderPath) {
-      var cachedResult = projectFilePerFolderCache.Get(folderPath);
-      if (cachedResult != null) {
-        return cachedResult == nullRepresentative ? null : ((DafnyProject?)cachedResult)?.Clone();
-      }
-
-      var result = await OpenProjectInFolderUncached(folderPath);
-      projectFilePerFolderCache.Set(new CacheItem(folderPath, (object?)result ?? nullRepresentative), new CacheItemPolicy {
-        AbsoluteExpiration = new DateTimeOffset(DateTime.Now.Add(TimeSpan.FromMilliseconds(ProjectFileCacheExpiryTime)))
-      });
-      return result?.Clone();
-    }
-
-    private Task<DafnyProject?> OpenProjectInFolderUncached(string folderPath) {
-      var configFileUri = new Uri(Path.Combine(folderPath, DafnyProject.FileName));
-      if (!fileSystem.Exists(configFileUri)) {
-        return Task.FromResult<DafnyProject?>(null);
-      }
-
-      return DafnyProject.Open(fileSystem, configFileUri, TextWriter.Null, TextWriter.Null);
-    }
-
     public IEnumerable<ProjectManager> Managers => managersByProject.Values;
     public void Dispose() {
-      boogieEngine.Dispose();
       foreach (var manager in Managers) {
         manager.Dispose();
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/SymbolTable.cs b/Source/DafnyLanguageServer/Workspace/SymbolTable.cs
index 1166fd00ef5..2dd4351abd2 100644
--- a/Source/DafnyLanguageServer/Workspace/SymbolTable.cs
+++ b/Source/DafnyLanguageServer/Workspace/SymbolTable.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Threading;
 using IntervalTree;
-using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer.Language;
+using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
@@ -13,80 +13,142 @@ namespace Microsoft.Dafny.LanguageServer.Workspace;
 
 public class SymbolTable {
 
+  public static SymbolTable CreateFrom(ILogger logger, Program program, CancellationToken cancellationToken) {
+    var visited = program.Visit(a => true, b => { });
+
+    var references = visited.OfType<IHasReferences>()
+      .SelectMany(r => {
+        var usages = r.GetReferences();
+        if (usages == null) {
+          logger.LogError($"Value of type {r.GetType()} returned a null for ${nameof(IHasReferences.GetReferences)}");
+          usages = Array.Empty<Reference>();
+        }
+        return usages.Where(d => !AutoGeneratedOrigin.Is(d.Referer) && d.Referred != null);
+      }).ToList();
+
+    var definitions = visited.OfType<IHasNavigationToken>();
+
+    return new SymbolTable(references, definitions.ToList());
+  }
+
   public static SymbolTable Empty() {
     return new SymbolTable();
   }
 
   private SymbolTable() {
-    DeclarationToUsages = ImmutableDictionary<IDeclarationOrUsage, ISet<IDeclarationOrUsage>>.Empty;
-    UsageToDeclaration = ImmutableDictionary<IDeclarationOrUsage, IDeclarationOrUsage>.Empty;
+    NodeToReferences = ImmutableDictionary<IOrigin, ISet<IOrigin>>.Empty;
+    ReferenceToNode = ImmutableDictionary<IOrigin, IHasNavigationToken>.Empty;
+    Symbols = ImmutableList<ISymbol>.Empty;
+    Declarations = ImmutableDictionary<IOrigin, ISymbol>.Empty;
   }
 
-  public SymbolTable(IReadOnlyList<(IDeclarationOrUsage usage, IDeclarationOrUsage declaration)> usages) {
-    var safeUsages1 = usages.Where(k => k.usage.NameToken.Uri != null).ToImmutableList();
-    var safeUsages = usages.Where(k => k.usage.NameToken.Uri != null && k.declaration.NameToken.Uri != null).ToImmutableList();
+  private SymbolTable(IReadOnlyList<Reference> references, IReadOnlyList<IHasNavigationToken> hasNavigationTokens) {
+    var safeReferences = references.Where(k => k.Referer.Uri != null).ToImmutableList();
 
-    var usageDeclarations = safeUsages1.Select(k => KeyValuePair.Create(k.usage, k.declaration));
-    var selfDeclarations = safeUsages1.Select(k => KeyValuePair.Create(k.declaration, k.declaration));
-    UsageToDeclaration = usageDeclarations.Concat(selfDeclarations).DistinctBy(pair => pair.Key).ToImmutableDictionary();
+    var referencesAsKeyValuePairs = safeReferences.Select(k => KeyValuePair.Create(k.Referer, k.Referred));
+    ReferenceToNode = referencesAsKeyValuePairs.DistinctBy(pair => pair.Key).ToImmutableDictionary();
 
-    DeclarationToUsages = safeUsages1.GroupBy(u => u.declaration).ToImmutableDictionary(
+    NodeToReferences = safeReferences.GroupBy(u => u.Referred.NavigationToken).ToImmutableDictionary(
       g => g.Key,
-      g => (ISet<IDeclarationOrUsage>)g.Select(k => k.usage).ToHashSet());
+      g => (ISet<IOrigin>)g.Select(k => k.Referer).ToHashSet());
+
+    Declarations = hasNavigationTokens.OfType<ISymbol>().Where(h => h.NavigationToken.IsValid && !AutoGeneratedOrigin.Is(h.Origin)
+        && (h is not AliasModuleDecl alias /* see AliasModuleDecl.NavigationToken for explanation */ || alias.HasAlias)).
+      DistinctBy(h => h.NavigationToken).
+      ToImmutableDictionary(h => h.NavigationToken, h => h);
+
+    var relevantDafnySymbolKinds = new HashSet<SymbolKind> {
+      SymbolKind.Function,
+      SymbolKind.Class,
+      SymbolKind.Enum,
+      SymbolKind.Method,
+      SymbolKind.EnumMember,
+      SymbolKind.Struct,
+      SymbolKind.Interface,
+      SymbolKind.Namespace,
+    };
+    // Since these definitions are checked for whether they
+    // contain substrings when answering workspace/resolve queries,
+    // performance can be improved by storing their names in a
+    // data structure that makes this operation cheaper, such as
+    // a suffix tree.
+    Symbols = hasNavigationTokens.OfType<ISymbol>().
+      Where(symbol => symbol.Kind.HasValue && relevantDafnySymbolKinds.Contains(symbol.Kind.Value)).
+      ToImmutableList();
 
-    var symbols = safeUsages.Select(u => u.declaration).
-      Concat(safeUsages.Select(u => u.usage)).
-      Where(s => !AutoGeneratedToken.Is(s.NameToken));
-    var symbolsByFile = symbols.GroupBy(s => s.NameToken.Uri);
+    var symbols = hasNavigationTokens.Select(h => h.NavigationToken)
+      .Concat(safeReferences.Select(r => r.Referer))
+      .Concat(safeReferences.Select(r => r.Referred.NavigationToken))
+      .Where(s => !AutoGeneratedOrigin.Is(s)).Distinct();
+    var symbolsByFile = symbols.GroupBy(s => s.Uri);
     foreach (var symbolsForFile in symbolsByFile) {
-      var nodePositions = new IntervalTree<Position, IDeclarationOrUsage>();
-      this.nodePositions.Add(symbolsForFile.Key, nodePositions);
+      if (symbolsForFile.Key == null) {
+        continue;
+      }
+      var nodePositionsForFile = new IntervalTree<Position, IOrigin>();
+      navigationRanges.Add(symbolsForFile.Key, nodePositionsForFile);
       foreach (var symbolForFile in symbolsForFile) {
-        var range = symbolForFile.NameToken.GetLspRange();
-        nodePositions.Add(range.Start, range.End, symbolForFile);
+        var range = symbolForFile.GetLspRange();
+        nodePositionsForFile.Add(range.Start, range.End, symbolForFile);
       }
     }
   }
 
-  private readonly Dictionary<Uri, IIntervalTree<Position, IDeclarationOrUsage>> nodePositions = new();
+  private readonly Dictionary<Uri, IIntervalTree<Position, IOrigin>> navigationRanges = new();
 
   /// <summary>
   /// Maps each symbol declaration to itself, and each symbol usage to the symbol's declaration.
   /// </summary>
-  public ImmutableDictionary<IDeclarationOrUsage, IDeclarationOrUsage> UsageToDeclaration { get; }
+  public ImmutableDictionary<IOrigin, IHasNavigationToken> ReferenceToNode { get; }
+  public ImmutableDictionary<IOrigin, ISymbol> Declarations { get; }
 
   /// <summary>
   /// Maps each symbol declaration to usages of the symbol, not including the declaration itself.
   /// </summary>
-  private ImmutableDictionary<IDeclarationOrUsage, ISet<IDeclarationOrUsage>> DeclarationToUsages { get; }
+  public ImmutableDictionary<IOrigin, ISet<IOrigin>> NodeToReferences { get; }
+
+  /// <summary>
+  ///  A list of all definitions, such as methods, classes, functions, etc., used for workspace-wide symbol
+  /// lookup.
+  /// </summary>
+  public ImmutableList<ISymbol> Symbols { get; }
 
-  public ISet<Location> GetUsages(Uri uri, Position position) {
-    if (nodePositions.TryGetValue(uri, out var forFile)) {
-      return forFile.Query(position).
-        SelectMany(node => DeclarationToUsages.GetOrDefault(node, () => (ISet<IDeclarationOrUsage>)new HashSet<IDeclarationOrUsage>())).
-        Select(u => new Location { Uri = u.NameToken.Filepath, Range = u.NameToken.GetLspRange() }).ToHashSet();
+  public IEnumerable<Location> GetReferences(Uri uri, Position position) {
+    if (navigationRanges.TryGetValue(uri, out var rangesForFile)) {
+      return rangesForFile.Query(position).
+        SelectMany(node => NodeToReferences.GetOrDefault(node, () => (ISet<IOrigin>)new HashSet<IOrigin>())).
+        Select(u => new Location { Uri = u.Filepath, Range = u.GetLspRange() }).Distinct();
     }
-    return Sets.Empty<Location>();
+    return Enumerable.Empty<Location>();
   }
 
   public Location? GetDeclaration(Uri uri, Position position) {
-    var node = GetNode(uri, position);
+    var node = GetDeclarationNode(uri, position);
     return node == null ? null : NodeToLocation(node);
   }
 
-  internal static Location NodeToLocation(IDeclarationOrUsage node) {
+  internal static Location? NodeToLocation(IHasNavigationToken node) {
+    var origin = node.NavigationToken;
+    if (origin.Uri == null) {
+      return null;
+    }
     return new Location {
-      Uri = DocumentUri.From(node.NameToken.Uri),
-      Range = node.NameToken.GetLspRange()
+      Uri = DocumentUri.From(origin.Uri),
+      Range = origin.GetLspRange()
     };
   }
 
-  public IDeclarationOrUsage? GetNode(Uri uri, Position position) {
-    if (!nodePositions.TryGetValue(uri, out var forFile)) {
+  public IHasNavigationToken? GetDeclarationNode(Uri uri, Position position) {
+    if (!navigationRanges.TryGetValue(uri, out var forFile)) {
       return null;
     }
-    return forFile.Query(position)
-      .Select(node => UsageToDeclaration.GetOrDefault(node, () => (IDeclarationOrUsage?)null))
+
+    var character = new Range(position, new Position(position.Line, position.Character + 1));
+    var options = forFile.Query(position)
+      .Where(n => n.ToLspRange().Contains(character)).OrderBy(o => o.Length);
+    return options
+      .Select(node => Declarations.TryGetValue(node, out var declaration)
+        ? declaration : ReferenceToNode.GetValueOrDefault(node))
       .FirstOrDefault(x => x != null);
   }
 }
diff --git a/Source/DafnyLanguageServer/Workspace/TelemetryPublisher.cs b/Source/DafnyLanguageServer/Workspace/TelemetryPublisher.cs
deleted file mode 100644
index 90b033df955..00000000000
--- a/Source/DafnyLanguageServer/Workspace/TelemetryPublisher.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using OmniSharp.Extensions.LanguageServer.Protocol.Server;
-using System.Collections.Immutable;
-using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.LanguageServer.Protocol.Window;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace {
-  public class TelemetryPublisher : ITelemetryPublisher {
-    private readonly ILanguageServerFacade languageServer;
-    private readonly ILogger<TelemetryPublisher> logger;
-
-    public TelemetryPublisher(ILanguageServerFacade languageServer, ILogger<TelemetryPublisher> logger) {
-      this.languageServer = languageServer;
-      this.logger = logger;
-    }
-
-    public void PublishUnhandledException(Exception e) {
-      logger.LogError(e, "exception occurred");
-      PublishTelemetry(ImmutableDictionary.Create<string, object>().
-          Add("kind", ITelemetryPublisher.TelemetryEventKind.UnhandledException).
-          Add("payload", e.ToString()));
-    }
-
-    public void PublishTelemetry(ImmutableDictionary<string, object> data) {
-      languageServer.Window.SendTelemetryEvent(new TelemetryEventParams {
-        ExtensionData = data
-      });
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/TelemetryPublisherBase.cs b/Source/DafnyLanguageServer/Workspace/TelemetryPublisherBase.cs
new file mode 100644
index 00000000000..223465f7b89
--- /dev/null
+++ b/Source/DafnyLanguageServer/Workspace/TelemetryPublisherBase.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Immutable;
+using Microsoft.Dafny.LanguageServer.Language;
+using Microsoft.Extensions.Logging;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+
+namespace Microsoft.Dafny.LanguageServer.Workspace {
+  /// <summary>
+  /// Implementations of this interface are responsible to publish telemetry events
+  /// of a <see cref="CompilationInput"/> to the LSP client.
+  /// </summary>
+  public abstract class TelemetryPublisherBase {
+    protected ILogger<TelemetryPublisherBase> logger;
+
+    public enum TelemetryEventKind {
+      UpdateComplete,
+      UnhandledException,
+      SolverPath,
+      Z3Version,
+      Time
+    }
+
+    protected TelemetryPublisherBase(ILogger<TelemetryPublisherBase> logger) {
+      this.logger = logger;
+    }
+
+    protected void PublishTelemetry(TelemetryEventKind kind, object? payload) {
+      PublishTelemetry(ImmutableDictionary.Create<string, object>().Add("kind", kind).Add("payload", payload!));
+    }
+
+    public abstract void PublishTelemetry(ImmutableDictionary<string, object> data);
+
+    /// <summary>
+    /// Signal the completion of a document update.
+    /// </summary>
+    public void PublishUpdateComplete() {
+      PublishTelemetry(TelemetryEventKind.UpdateComplete, null);
+    }
+
+    public void PublishUnhandledException(Exception e) {
+      logger.LogError(e, "exception occurred");
+      PublishTelemetry(ImmutableDictionary.Create<string, object>().
+        Add("kind", TelemetryEventKind.UnhandledException).
+        Add("payload", e.ToString()));
+    }
+
+    public void PublishSolverPath(string solverPath) {
+      PublishTelemetry(TelemetryEventKind.SolverPath, solverPath);
+    }
+
+    public void PublishCount(string activity, string resource, TimeSpan span) {
+      PublishTelemetry(TelemetryEventKind.Time, ImmutableDictionary.Create<string, object>().
+        Add("activity", activity).Add("resource", resource).Add("time", span.TotalMilliseconds));
+    }
+
+    public void PublishTime(string activity, string resource, TimeSpan span) {
+      PublishTelemetry(TelemetryEventKind.Time, ImmutableDictionary.Create<string, object>().
+        Add("activity", activity).Add("resource", resource).Add("time", span.TotalMilliseconds));
+    }
+
+    public void PublishZ3Version(string z3Version) {
+      PublishTelemetry(TelemetryEventKind.Z3Version, z3Version);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyLanguageServer/Workspace/TextBuffer.cs b/Source/DafnyLanguageServer/Workspace/TextBuffer.cs
index 72b040ad22c..642a27afa23 100644
--- a/Source/DafnyLanguageServer/Workspace/TextBuffer.cs
+++ b/Source/DafnyLanguageServer/Workspace/TextBuffer.cs
@@ -57,7 +57,15 @@ public Position FromIndex(int index) {
   }
 
   private BufferLine IndexToLine(int index) {
-    return indexToLineTree.Query(index).Single();
+    try {
+      return indexToLineTree.Query(index).Single();
+    } catch (InvalidOperationException) {
+      try {// Just in case we are on Windows and we happen to query an index between "\r" and "\n"
+        return indexToLineTree.Query(index - 1).Single();
+      } catch (InvalidOperationException) {
+        throw new ArgumentException($"index {index} is outside of the text buffer");
+      }
+    }
   }
 
   public int ToIndex(Position position) {
diff --git a/Source/DafnyLanguageServer/Workspace/TextDocumentLoader.cs b/Source/DafnyLanguageServer/Workspace/TextDocumentLoader.cs
deleted file mode 100644
index bd3f3982ae1..00000000000
--- a/Source/DafnyLanguageServer/Workspace/TextDocumentLoader.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Dafny.LanguageServer.Language.Symbols;
-using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Boogie;
-using Microsoft.Extensions.Logging;
-using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace {
-  /// <summary>
-  /// Text document loader implementation that offloads the whole load procedure on one dedicated
-  /// thread with a stack size of 256MB. Since only one thread is used, document loading is implicitely synchronized.
-  /// The verification runs on the calling thread.
-  /// </summary>
-  /// <remarks>
-  /// The increased stack size is necessary to solve the issue https://github.com/dafny-lang/dafny/issues/1447.
-  /// </remarks>
-  public class TextDocumentLoader : ITextDocumentLoader {
-    private readonly ILogger<ITextDocumentLoader> documentLoader;
-    private readonly IDafnyParser parser;
-    private readonly ISymbolResolver symbolResolver;
-    private readonly ISymbolTableFactory symbolTableFactory;
-    private readonly IGhostStateDiagnosticCollector ghostStateDiagnosticCollector;
-    protected readonly ICompilationStatusNotificationPublisher statusPublisher;
-
-    protected TextDocumentLoader(
-      ILogger<ITextDocumentLoader> documentLoader,
-      IDafnyParser parser,
-      ISymbolResolver symbolResolver,
-      ISymbolTableFactory symbolTableFactory,
-      IGhostStateDiagnosticCollector ghostStateDiagnosticCollector,
-      ICompilationStatusNotificationPublisher statusPublisher) {
-      this.documentLoader = documentLoader;
-      this.parser = parser;
-      this.symbolResolver = symbolResolver;
-      this.symbolTableFactory = symbolTableFactory;
-      this.ghostStateDiagnosticCollector = ghostStateDiagnosticCollector;
-      this.statusPublisher = statusPublisher;
-    }
-
-    public static TextDocumentLoader Create(
-      IDafnyParser parser,
-      ISymbolResolver symbolResolver,
-      ISymbolTableFactory symbolTableFactory,
-      IGhostStateDiagnosticCollector ghostStateDiagnosticCollector,
-      ICompilationStatusNotificationPublisher statusPublisher,
-      ILogger<ITextDocumentLoader> logger
-      ) {
-      return new TextDocumentLoader(logger, parser, symbolResolver, symbolTableFactory, ghostStateDiagnosticCollector, statusPublisher);
-    }
-
-    public IdeState CreateUnloaded(Compilation compilation) {
-      return CreateDocumentWithEmptySymbolTable(compilation, ImmutableDictionary<Uri, IReadOnlyList<Diagnostic>>.Empty);
-    }
-
-    public async Task<CompilationAfterParsing> ParseAsync(DafnyOptions options, Compilation compilation,
-      IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees, CancellationToken cancellationToken) {
-#pragma warning disable CS1998
-      return await await DafnyMain.LargeStackFactory.StartNew(
-        async () => ParseInternal(options, compilation, migratedVerificationTrees, cancellationToken), cancellationToken
-#pragma warning restore CS1998
-      );
-    }
-
-    private CompilationAfterParsing ParseInternal(DafnyOptions options, Compilation compilation,
-      IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees,
-      CancellationToken cancellationToken) {
-      var project = compilation.Project;
-      var errorReporter = new DiagnosticErrorReporter(options, project.Uri);
-      _ = statusPublisher.SendStatusNotification(compilation, CompilationStatus.Parsing);
-      var program = parser.Parse(compilation, errorReporter, cancellationToken);
-      var compilationAfterParsing = new CompilationAfterParsing(compilation, program, errorReporter.AllDiagnosticsCopy,
-        compilation.RootUris.ToDictionary(uri => uri,
-          uri => migratedVerificationTrees.GetValueOrDefault(uri) ?? new DocumentVerificationTree(program, uri)));
-      if (errorReporter.HasErrors) {
-        _ = statusPublisher.SendStatusNotification(compilation, CompilationStatus.ParsingFailed);
-        return compilationAfterParsing;
-      }
-
-      return compilationAfterParsing;
-    }
-
-    public async Task<CompilationAfterResolution> ResolveAsync(DafnyOptions options,
-      CompilationAfterParsing compilation,
-      IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees,
-      CancellationToken cancellationToken) {
-#pragma warning disable CS1998
-      return await await DafnyMain.LargeStackFactory.StartNew(
-        async () => ResolveInternal(compilation, migratedVerificationTrees, cancellationToken), cancellationToken
-#pragma warning restore CS1998
-        );
-    }
-
-    private CompilationAfterResolution ResolveInternal(CompilationAfterParsing compilation,
-      IReadOnlyDictionary<Uri, VerificationTree> migratedVerificationTrees, CancellationToken cancellationToken) {
-
-      var program = compilation.Program;
-      var errorReporter = (DiagnosticErrorReporter)program.Reporter;
-      if (errorReporter.HasErrors) {
-        throw new TaskCanceledException();
-      }
-
-      var project = compilation.Project;
-
-      _ = statusPublisher.SendStatusNotification(compilation, CompilationStatus.ResolutionStarted);
-      var compilationUnit = symbolResolver.ResolveSymbols(project, program, cancellationToken);
-      var legacySymbolTable = symbolTableFactory.CreateFrom(compilationUnit, cancellationToken);
-
-      var newSymbolTable = errorReporter.HasErrors
-        ? null
-        : symbolTableFactory.CreateFrom(program, compilation, cancellationToken);
-      if (errorReporter.HasErrors) {
-        _ = statusPublisher.SendStatusNotification(compilation, CompilationStatus.ResolutionFailed);
-      } else {
-        _ = statusPublisher.SendStatusNotification(compilation, CompilationStatus.CompilationSucceeded);
-      }
-
-      var ghostDiagnostics = ghostStateDiagnosticCollector.GetGhostStateDiagnostics(legacySymbolTable, cancellationToken);
-
-      List<ICanVerify> verifiables;
-      if (errorReporter.HasErrorsUntilResolver) {
-        verifiables = new();
-      } else {
-        var symbols = SymbolExtensions.GetSymbolDescendants(program.DefaultModule);
-        verifiables = symbols.OfType<ICanVerify>().Where(v => !AutoGeneratedToken.Is(v.RangeToken) &&
-                                                              v.ContainingModule.ShouldVerify(program.Compilation) &&
-                                                              v.ShouldVerify(program.Compilation) &&
-                                                              v.ShouldVerify).ToList();
-      }
-
-      return new CompilationAfterResolution(compilation,
-        errorReporter.AllDiagnosticsCopy,
-        newSymbolTable,
-        legacySymbolTable,
-        ghostDiagnostics,
-        verifiables,
-        new(),
-        new()
-      );
-    }
-
-    private IdeState CreateDocumentWithEmptySymbolTable(Compilation compilation,
-      IReadOnlyDictionary<Uri, IReadOnlyList<Diagnostic>> resolutionDiagnostics) {
-      var dafnyOptions = DafnyOptions.Default;
-      var program = new EmptyNode();
-      return new IdeState(
-        compilation.Version,
-        compilation,
-        program,
-        resolutionDiagnostics,
-        SymbolTable.Empty(),
-        LegacySignatureAndCompletionTable.Empty(dafnyOptions, compilation.Project),
-        new(),
-        Array.Empty<Counterexample>(),
-        ImmutableDictionary<Uri, IReadOnlyList<Range>>.Empty,
-      ImmutableDictionary<Uri, VerificationTree>.Empty
-      );
-    }
-  }
-}
diff --git a/Source/DafnyLanguageServer/Workspace/VerificationProgressReporter.cs b/Source/DafnyLanguageServer/Workspace/VerificationProgressReporter.cs
deleted file mode 100644
index c9d0968d440..00000000000
--- a/Source/DafnyLanguageServer/Workspace/VerificationProgressReporter.cs
+++ /dev/null
@@ -1,467 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Boogie;
-using Microsoft.Dafny.LanguageServer.Language;
-using Microsoft.Dafny.LanguageServer.Workspace.Notifications;
-using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
-using VC;
-using VerificationResult = Microsoft.Boogie.VerificationResult;
-
-namespace Microsoft.Dafny.LanguageServer.Workspace;
-
-public class VerificationProgressReporter : IVerificationProgressReporter {
-  private readonly DafnyOptions options;
-  private readonly ILogger<VerificationProgressReporter> logger;
-  private readonly INotificationPublisher notificationPublisher;
-
-  public VerificationProgressReporter(ILogger<VerificationProgressReporter> logger,
-    INotificationPublisher notificationPublisher,
-    DafnyOptions options) {
-    this.logger = logger;
-    this.notificationPublisher = notificationPublisher;
-    this.options = options;
-  }
-
-  /// <summary>
-  /// Fills up the document with empty verification diagnostics, one for each top-level declarations
-  /// Possibly migrates previous diagnostics
-  /// </summary>
-  public void RecomputeVerificationTrees(CompilationAfterResolution compilation) {
-    foreach (var tree in compilation.VerificationTrees.Values) {
-      UpdateTree(options, compilation, tree);
-    }
-  }
-
-  public static void UpdateTree(DafnyOptions options, CompilationAfterParsing parsedCompilation, VerificationTree rootVerificationTree) {
-    var previousTrees = rootVerificationTree.Children;
-
-    List<VerificationTree> result = new List<VerificationTree>();
-
-    HashSet<Position> recordedPositions = new HashSet<Position>();
-
-    void AddAndPossiblyMigrateVerificationTree(VerificationTree verificationTree) {
-      var position = verificationTree.Position;
-      var previousTree = previousTrees.FirstOrDefault(
-        oldNode => oldNode != null && oldNode.Position == position,
-        null);
-      if (previousTree != null) {
-        previousTree.SetObsolete();
-        verificationTree.StatusVerification = previousTree.StatusVerification;
-        verificationTree.StatusCurrent = CurrentStatus.Obsolete;
-        verificationTree.Children = previousTree.Children;
-      }
-
-      // Prevent duplicating trees, e.g. reveal lemmas that have the same position as the function.
-      if (!recordedPositions.Contains(verificationTree.Position)) {
-        result.Add(verificationTree);
-        recordedPositions.Add(verificationTree.Position);
-      }
-    }
-
-    foreach (var module in parsedCompilation.Program.Modules()) {
-      foreach (var topLevelDecl in module.TopLevelDecls) {
-        if (topLevelDecl is DatatypeDecl datatypeDecl) {
-          foreach (DatatypeCtor ctor in datatypeDecl.Ctors) {
-            var aFormalHasADefaultValue = ctor.Destructors.SelectMany(
-              destructor => destructor.CorrespondingFormals).Any(
-              formal => formal.DefaultValue != null);
-            if (aFormalHasADefaultValue) {
-              var verificationTreeRange = ctor.StartToken.GetLspRange(ctor.EndToken);
-              var verificationTree = new TopLevelDeclMemberVerificationTree(
-                "datatype",
-                ctor.Name,
-                ctor.GetCompileName(options),
-                ctor.tok.Filepath,
-                ctor.Tok.Uri,
-                verificationTreeRange,
-                ctor.tok.GetLspPosition());
-              AddAndPossiblyMigrateVerificationTree(verificationTree);
-            }
-          }
-        }
-
-        if (topLevelDecl is TopLevelDeclWithMembers topLevelDeclWithMembers) {
-          foreach (var member in topLevelDeclWithMembers.Members) {
-            var memberWasNotIncluded = member.tok.Uri != rootVerificationTree.Uri;
-            if (memberWasNotIncluded) {
-              continue;
-            }
-
-            if (member is Field) {
-              var constantHasNoBody = member.RangeToken.EndToken.line == 0;
-              if (constantHasNoBody) {
-                continue; // Nothing to verify
-              }
-
-              var verificationTreeRange = member.StartToken.GetLspRange(member.EndToken);
-              var verificationTree = new TopLevelDeclMemberVerificationTree(
-                "constant",
-                member.Name,
-                member.GetCompileName(options),
-                member.tok.Filepath,
-                member.Tok.Uri,
-                verificationTreeRange,
-                member.tok.GetLspPosition());
-              AddAndPossiblyMigrateVerificationTree(verificationTree);
-            } else if (member is Method or Function) {
-              var verificationTreeRange = member.StartToken.GetLspRange(member.EndToken);
-              var verificationTree = new TopLevelDeclMemberVerificationTree(
-                (member is Method ? "method" : "function"),
-                member.Name,
-                member.GetCompileName(options),
-                member.tok.Filepath,
-                member.Tok.Uri,
-                verificationTreeRange,
-                member.tok.GetLspPosition());
-              AddAndPossiblyMigrateVerificationTree(verificationTree);
-              if (member is Function { ByMethodBody: { } } function) {
-                var verificationTreeRangeByMethod = function.ByMethodBody.RangeToken.ToLspRange();
-                var verificationTreeByMethod = new TopLevelDeclMemberVerificationTree(
-                  "by method part of function",
-                  member.Name,
-                  member.GetCompileName(options) + "_by_method",
-                  member.tok.Filepath,
-                  member.Tok.Uri,
-                  verificationTreeRangeByMethod,
-                  function.ByMethodTok.GetLspPosition());
-                AddAndPossiblyMigrateVerificationTree(verificationTreeByMethod);
-              }
-            }
-          }
-        }
-
-        if (topLevelDecl is SubsetTypeDecl subsetTypeDecl) {
-          if (subsetTypeDecl.tok.Uri != rootVerificationTree.Uri) {
-            continue;
-          }
-
-          var verificationTreeRange = subsetTypeDecl.StartToken.GetLspRange(subsetTypeDecl.EndToken);
-          var verificationTree = new TopLevelDeclMemberVerificationTree(
-            $"subset type",
-            subsetTypeDecl.Name,
-            subsetTypeDecl.GetCompileName(options),
-            subsetTypeDecl.tok.Filepath,
-            subsetTypeDecl.Tok.Uri,
-            verificationTreeRange,
-            subsetTypeDecl.tok.GetLspPosition());
-          AddAndPossiblyMigrateVerificationTree(verificationTree);
-        }
-      }
-    }
-
-    rootVerificationTree.Children = result;
-  }
-
-  /// <summary>
-  /// On receiving all implementations that are going to be verified, assign each implementation
-  /// to its original method tree.
-  /// Also set the implementation priority depending on the last edited methods 
-  /// </summary>
-  public virtual void ReportImplementationsBeforeVerification(CompilationAfterResolution compilation, ICanVerify canVerify, Implementation[] implementations) {
-    var uri = canVerify.Tok.Uri;
-    var tree = compilation.VerificationTrees[uri];
-
-    if (logger.IsEnabled(LogLevel.Debug)) {
-      logger.LogDebug($"ReportImplementationsBeforeVerification for ${compilation.Project.Uri}, version {compilation.Version}, implementations: " +
-                      $"{string.Join(", ", implementations.Select(i => i.Name))}");
-    }
-
-    // We migrate existing implementations to the new provided ones if they exist.
-    // (same child number, same file and same position)
-    var canVerifyNode = tree.Children.OfType<TopLevelDeclMemberVerificationTree>()
-      .FirstOrDefault(t => t.Position == canVerify.Tok.GetLspPosition());
-    if (canVerifyNode == null) {
-      return;
-    }
-
-
-    canVerifyNode.ResetNewChildren();
-
-    foreach (var implementation in implementations) {
-
-      var targetMethodNode = GetTargetMethodTree(tree, implementation, out var oldImplementationNode, true);
-      if (targetMethodNode == null) {
-        NoMethodNodeAtLogging(tree, "ReportImplementationsBeforeVerification", compilation, implementation);
-        continue;
-      }
-
-      var newDisplayName = targetMethodNode.DisplayName + " #" + (targetMethodNode.Children.Count + 1) + ":" +
-                           implementation.Name;
-      var newImplementationNode = new ImplementationVerificationTree(
-        newDisplayName,
-        implementation.Name,
-        targetMethodNode.Filename,
-        targetMethodNode.Uri,
-        targetMethodNode.Range,
-        targetMethodNode.Position
-      ).WithImplementation(implementation);
-      if (oldImplementationNode != null) {
-        newImplementationNode.Children = oldImplementationNode.Children;
-      }
-
-      targetMethodNode?.AddNewChild(newImplementationNode);
-    }
-
-    canVerifyNode.SaveNewChildren();
-    if (!canVerifyNode.Children.Any()) {
-      canVerifyNode.Start();
-      canVerifyNode.Stop();
-      canVerifyNode.StatusCurrent = CurrentStatus.Current;
-      canVerifyNode.StatusVerification = GutterVerificationStatus.Verified;
-    }
-
-    canVerifyNode.PropagateChildrenErrorsUp();
-    canVerifyNode.RecomputeAssertionBatchNodeDiagnostics();
-  }
-
-  /// <summary>
-  /// Triggers sending of the current verification diagnostics to the client
-  /// </summary>
-  public void ReportRealtimeDiagnostics(CompilationAfterParsing compilation, Uri uri, bool verificationStarted) {
-    lock (LockProcessing) {
-      notificationPublisher.PublishGutterIcons(uri, compilation.InitialIdeState(compilation, options), verificationStarted);
-    }
-  }
-
-  /// <summary>
-  /// Called when the verifier starts verifying an implementation
-  /// </summary>
-  public void ReportVerifyImplementationRunning(CompilationAfterResolution compilation, Implementation implementation) {
-    var uri = ((IToken)implementation.tok).Uri;
-    var tree = compilation.VerificationTrees[uri];
-
-    lock (LockProcessing) {
-      var targetMethodNode = GetTargetMethodTree(tree, implementation, out var implementationNode);
-      if (targetMethodNode == null) {
-        NoMethodNodeAtLogging(tree, "ReportVerifyImplementationRunning", compilation, implementation);
-      } else {
-        if (!targetMethodNode.Started) {
-          // The same method could be started multiple times for each implementation
-          targetMethodNode.Start();
-        }
-
-        if (implementationNode == null) {
-          logger.LogError($"No implementation at {implementation.tok}");
-        } else {
-          implementationNode.Start();
-        }
-
-        targetMethodNode.PropagateChildrenErrorsUp();
-        ReportRealtimeDiagnostics(compilation, uri, true);
-      }
-    }
-  }
-
-  /// <summary>
-  /// Called when the verifier finished to visit an implementation
-  /// </summary>
-  public void ReportEndVerifyImplementation(CompilationAfterResolution compilation, Implementation implementation, VerificationResult verificationResult) {
-
-    var uri = ((IToken)implementation.tok).Uri;
-    var tree = compilation.VerificationTrees[uri];
-
-    var targetMethodNode = GetTargetMethodTree(tree, implementation, out var implementationNode);
-    if (targetMethodNode == null) {
-      NoMethodNodeAtLogging(tree, "ReportEndVerifyImplementation", compilation, implementation);
-    } else if (implementationNode == null) {
-      logger.LogError($"No implementation node at {implementation.tok.filename}:{implementation.tok.line}:{implementation.tok.col}");
-    } else {
-      lock (LockProcessing) {
-        implementationNode.Stop();
-        implementationNode.ResourceCount = verificationResult.ResourceCount;
-        targetMethodNode.ResourceCount += verificationResult.ResourceCount;
-        var finalOutcome = verificationResult.Outcome switch {
-          ConditionGeneration.Outcome.Correct => GutterVerificationStatus.Verified,
-          _ => GutterVerificationStatus.Error
-        };
-
-        implementationNode.StatusVerification = finalOutcome;
-        // Will be only executed by the last instance.
-        if (!targetMethodNode.Children.All(child => child.Finished)) {
-          targetMethodNode.StatusVerification = verificationResult.Outcome switch {
-            ConditionGeneration.Outcome.Correct => targetMethodNode.StatusVerification,
-            _ => GutterVerificationStatus.Error
-          };
-        } else {
-          targetMethodNode.Stop();
-          // Later, will be overriden by individual outcomes
-          targetMethodNode.StatusVerification = finalOutcome;
-        }
-
-        targetMethodNode.PropagateChildrenErrorsUp();
-        targetMethodNode.RecomputeAssertionBatchNodeDiagnostics();
-        ReportRealtimeDiagnostics(compilation, uri, true);
-      }
-    }
-  }
-
-  private void NoMethodNodeAtLogging(VerificationTree tree, string methodName, CompilationAfterResolution compilation, Implementation implementation) {
-    var position = implementation.tok.GetLspPosition();
-    var availableMethodNodes = string.Join(",", tree!.Children.Select(vt =>
-      $"{vt.Kind} {vt.DisplayName} at {vt.Filename}:{vt.Position.Line}"));
-    logger.LogDebug(
-      $"No method found in {methodName}, in document {compilation.Uri} and filename {tree.Filename}, " +
-      $"no method node at {implementation.tok.filename}:{position.Line}:{position.Character}.\n" +
-      $"Available nodes: " + availableMethodNodes);
-  }
-
-  /// <summary>
-  /// Called when a split is finished to be verified
-  /// </summary>
-  public void ReportAssertionBatchResult(CompilationAfterResolution compilation, AssertionBatchResult batchResult) {
-    var uri = ((IToken)batchResult.Implementation.tok).Uri;
-    var tree = compilation.VerificationTrees[uri];
-
-    lock (LockProcessing) {
-      var implementation = batchResult.Implementation;
-      var result = batchResult.Result;
-      // While there is no error, just add successful nodes.
-      var targetMethodNode = GetTargetMethodTree(tree, implementation, out var implementationNode);
-      if (targetMethodNode == null) {
-        NoMethodNodeAtLogging(tree, "ReportAssertionBatchResult", compilation, implementation);
-      } else if (implementationNode == null) {
-        logger.LogError($"No implementation node at {implementation.tok.filename}:{implementation.tok.line}:{implementation.tok.col}");
-      } else {
-        var wasAlreadyProcessed = implementationNode.NewChildren.Any(assertNode =>
-          assertNode is AssertionVerificationTree assertionNode
-          && assertionNode.AssertionBatchNum == result.vcNum);
-        if (wasAlreadyProcessed) {
-          return;
-        }
-
-        result.ComputePerAssertOutcomes(out var perAssertOutcome, out var perAssertCounterExample);
-
-        var assertionBatchTime = (int)result.runTime.TotalMilliseconds;
-        var assertionBatchResourceCount = result.resourceCount;
-        implementationNode.AddAssertionBatchMetrics(result.vcNum, assertionBatchTime, assertionBatchResourceCount);
-
-        // Attaches the trace
-        void AddChildOutcome(Counterexample? counterexample, AssertCmd assertCmd, IToken token,
-          GutterVerificationStatus status, IToken? secondaryToken, string? assertDisplay = "",
-          string assertIdentifier = "") {
-          if (token.Filepath != implementationNode.Filename) {
-            return;
-          }
-
-          var outcomePosition = token.GetLspPosition();
-          var secondaryOutcomePosition = secondaryToken?.GetLspPosition();
-
-          var childrenCount = implementationNode.GetNewChildrenCount();
-          assertDisplay = assertDisplay != "" ? " " + assertDisplay : "";
-          assertIdentifier = assertIdentifier != "" ? "_" + assertIdentifier : "";
-
-          var outcomeRange = token.GetLspRange();
-          var nodeDiagnostic = new AssertionVerificationTree(
-            $"{targetMethodNode.DisplayName}{assertDisplay} #{childrenCount}",
-            $"{targetMethodNode.Identifier}_{childrenCount}{assertIdentifier}",
-            token.Filepath,
-            token.Uri,
-            secondaryOutcomePosition,
-            outcomeRange
-          ) {
-            StatusVerification = status,
-            StatusCurrent = CurrentStatus.Current,
-            AssertionBatchNum = result.vcNum,
-            Started = true,
-            Finished = true
-          }.WithDuration(implementationNode.StartTime, assertionBatchTime)
-            .WithAssertionAndCounterExample(assertCmd, counterexample);
-          // Add this diagnostics as the new one to display once the implementation is fully verified
-          implementationNode.AddNewChild(nodeDiagnostic);
-          // Update any previous pending "verifying" diagnostic as well so that they are updated in real-time
-          var previousChild = implementationNode.Children.OfType<AssertionVerificationTree>()
-            .FirstOrDefault(child =>
-              child != null && child.Position == outcomePosition && (
-                secondaryOutcomePosition == child.SecondaryPosition), null);
-          if (previousChild != null) {
-            // Temporary update of children.
-            implementationNode.Children.Remove(previousChild);
-            implementationNode.Children.Add(previousChild with {
-              StatusCurrent = CurrentStatus.Current,
-              StatusVerification = status
-            });
-          } else {
-            implementationNode.Children.Add(nodeDiagnostic);
-          }
-        }
-
-        foreach (var (assertCmd, outcome) in perAssertOutcome) {
-          var status = GetNodeStatus(outcome);
-          perAssertCounterExample.TryGetValue(assertCmd, out var counterexample);
-          IToken? secondaryToken = Translator.ToDafnyToken(counterexample is ReturnCounterexample returnCounterexample ? returnCounterexample.FailingReturn.tok :
-            counterexample is CallCounterexample callCounterexample ? callCounterexample.FailingRequires.tok :
-            null);
-          if (assertCmd is AssertEnsuresCmd assertEnsuresCmd) {
-            AddChildOutcome(counterexample, assertCmd, Translator.ToDafnyToken(assertEnsuresCmd.Ensures.tok), status, secondaryToken, " ensures", "_ensures");
-          } else if (assertCmd is AssertRequiresCmd assertRequiresCmd) {
-            AddChildOutcome(counterexample, assertCmd, Translator.ToDafnyToken(assertRequiresCmd.Call.tok), status, secondaryToken, assertDisplay: "Call", assertIdentifier: "call");
-          } else {
-            AddChildOutcome(counterexample, assertCmd, Translator.ToDafnyToken(assertCmd.tok), status, secondaryToken, assertDisplay: "Assertion", assertIdentifier: "assert");
-          }
-        }
-        targetMethodNode.PropagateChildrenErrorsUp();
-        targetMethodNode.RecomputeAssertionBatchNodeDiagnostics();
-        ReportRealtimeDiagnostics(compilation, uri, true);
-      }
-    }
-  }
-
-  public void SetAllUnvisitedMethodsAsVerified(CompilationAfterResolution compilation, ICanVerify canVerify) {
-    var tree = compilation.VerificationTrees[canVerify.Tok.Uri];
-    var verifyTree = tree.Children.First(f => f.Position == canVerify.Tok.GetLspPosition());
-    verifyTree.SetVerifiedIfPending();
-  }
-
-
-  /// <summary>
-  /// Given an implementation, returns the top-level verification tree.
-  /// </summary>
-  /// <param name="implementation">The implementation</param>
-  /// <param name="implementationTree">Returns the tree of the implementation child of the returned top-level verification tree</param>
-  /// <param name="nameBased">Whether it should try to locate the implementation using the name rather than the position. Used to relocate previous diagnostics.</param>
-  /// <returns>The top-level verification tree</returns>
-  private TopLevelDeclMemberVerificationTree? GetTargetMethodTree(VerificationTree tree,
-    Implementation implementation, out ImplementationVerificationTree? implementationTree, bool nameBased = false) {
-    var targetMethodNode = tree.Children.OfType<TopLevelDeclMemberVerificationTree>().FirstOrDefault(
-      node => node?.Position == implementation.tok.GetLspPosition() &&
-              node?.Uri == ((IToken)implementation.tok).Uri
-      , null);
-    if (nameBased) {
-      implementationTree = targetMethodNode?.Children.OfType<ImplementationVerificationTree>().FirstOrDefault(
-        node => {
-          var nodeImpl = node?.GetImplementation();
-          return nodeImpl?.Name == implementation.Name;
-        }, null);
-    } else {
-      implementationTree = targetMethodNode?.Children.OfType<ImplementationVerificationTree>().FirstOrDefault(
-        node => node?.GetImplementation() == implementation, null);
-    }
-
-    return targetMethodNode;
-  }
-
-  /// <summary>
-  /// An object to lock so that the updating of the verification trees is always not concurrent
-  /// </summary>
-  private readonly object LockProcessing = new();
-
-  /// <summary>
-  /// Converts a ProverInterface.Outcome to a VerificationStatus
-  /// </summary>
-  /// <param name="outcome">The outcome set by the split result</param>
-  /// <returns>The matching verification status</returns>
-  private static GutterVerificationStatus GetNodeStatus(ProverInterface.Outcome outcome) {
-    return outcome switch {
-      ProverInterface.Outcome.Valid => GutterVerificationStatus.Verified,
-      ProverInterface.Outcome.Invalid => GutterVerificationStatus.Error,
-      ProverInterface.Outcome.Undetermined => GutterVerificationStatus.Inconclusive,
-      ProverInterface.Outcome.TimeOut => GutterVerificationStatus.Error,
-      ProverInterface.Outcome.OutOfMemory => GutterVerificationStatus.Error,
-      ProverInterface.Outcome.OutOfResource => GutterVerificationStatus.Error,
-      ProverInterface.Outcome.Bounded => GutterVerificationStatus.Error,
-      _ => GutterVerificationStatus.Error
-    };
-  }
-}
diff --git a/Source/DafnyPipeline.Test/DafnyPipeline.Test.csproj b/Source/DafnyPipeline.Test/DafnyPipeline.Test.csproj
index 7d2c524f988..34ec4c877a0 100644
--- a/Source/DafnyPipeline.Test/DafnyPipeline.Test.csproj
+++ b/Source/DafnyPipeline.Test/DafnyPipeline.Test.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -12,8 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
     <PackageReference Include="DiffPlex" Version="1.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -26,6 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\DafnyCore.Test\DafnyCore.Test.csproj" />
     <ProjectReference Include="..\DafnyDriver\DafnyDriver.csproj" />
   </ItemGroup>
 
@@ -33,14 +34,17 @@
     <Content Include="..\..\Binaries\z3\**\*.*" LinkBase="z3">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\Test\dafny0\warnings-as-errors.dfy">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
 	  <Compile Remove="_plugins/**" />
 	  <Content Remove="_plugins/**" />
 	  <EmbeddedResource Include="_plugins/**" />
     <None Remove="_plugins\**" />
+    <None Update="expectedProverLog.smt2">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="testFile2.dfy">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
 	</ItemGroup>
 </Project>
diff --git a/Source/DafnyPipeline.Test/DocstringTest.cs b/Source/DafnyPipeline.Test/DocstringTest.cs
index 6067370e304..c1391b6e070 100644
--- a/Source/DafnyPipeline.Test/DocstringTest.cs
+++ b/Source/DafnyPipeline.Test/DocstringTest.cs
@@ -1,12 +1,14 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using DafnyCore.Test;
 using DafnyTestGeneration;
-using Bpl = Microsoft.Boogie;
-using BplParser = Microsoft.Boogie.Parser;
 using Microsoft.Dafny;
+using Nerdbank.Streams;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -36,8 +38,355 @@ public DocstringTest(ITestOutputHelper output) {
     private Newlines currentNewlines;
 
     [Fact]
-    void DocstringWorksForPredicates() {
-      DocstringWorksFor(@"
+    public async Task DocStringForAbstractTypeDecl() {
+      var programString = @"
+// Not docstring
+type AB(==) // [START Docstring0 END Docstring0]
+// Not docstring
+
+// Not docstring
+type AC // [START Docstring1
+// END Docstring1]
+{
+}
+
+/** [START Docstring2 END Docstring2] */
+type AD
+// Not docstring
+
+// Just a comment because not using the adequate syntax
+type NoDocstring3
+// Not docstring
+
+// Not docstring
+type AF { } // [START Docstring4 END Docstring4]
+// Not docstring
+";
+      await TestAllDocstrings(programString);
+    }
+
+    [Fact]
+    public async Task DocStringForClassLikeDecl() {
+      var programString = @"
+// Not docstring
+class A { } // [START Docstring0 END Docstring0]
+// Not docstring
+
+// Not docstring
+class AC // [START Docstring1
+// END Docstring1]
+{
+}
+
+/** [START Docstring2 END Docstring2] */
+trait AT {} 
+// Just a comment
+
+/** [START Docstring3 END Docstring3] */
+trait AT {} // Not a docstring because the syntax above looks more like a docstring
+// Just a comment
+
+// Not docstring
+class AC2 extends AT // [START Docstring4
+// END Docstring4]
+{
+}
+
+// No docstring
+class NoDocstring5 {}
+// No docstring
+
+/** [START Docstring6 END Docstring6] */
+class AD  {}
+// Not docstring
+";
+      await TestAllDocstrings(programString);
+    }
+
+    [Fact]
+    public async Task DocStringForDatatypeDecl() {
+      var programString = @"
+/** [START Docstring0 END Docstring0] */
+datatype X = FirstCtor() // [START Docstring1 END Docstring1]
+// No docstring
+
+/* No docstring */
+datatype Y // [START Docstring2
+// END Docstring2]
+= 
+/** [START Docstring3 END Docstring3] */
+SecondCtor()
+";
+      await TestAllDocstrings(programString);
+    }
+
+    [Fact]
+    public async Task DocStringForConstVar() {
+      var programString = @"
+class NoDocstring0 {
+  const NoDocstring1: int
+  /** [START Docstring2 END Docstring2] */
+  const a2: int
+  const a3: int /** [START Docstring3 END Docstring3] */
+  const a4: int := 5 /** [START Docstring4 END Docstring4] */
+  const a5: int
+    // [START Docstring5
+    // END Docstring5]
+  := 5
+
+  var NoDocstring6: int
+  /** [START Docstring7 END Docstring7] */
+  var a7: int
+  var a8: int // [START Docstring8 END Docstring8]
+}
+";
+      await TestAllDocstrings(programString);
+    }
+
+    [Fact]
+    public async Task DocStringForFunctions() {
+      var programString = @"
+class NoDocstring0 {
+  /** [START Docstring1 END Docstring1] */
+  function Test1(): int
+  function Test2(): int // [START Docstring2 END Docstring2]
+  /** [START Docstring3 END Docstring3] */
+  function Test3(): int { 1 } // Not docstring
+  function Test4(): int { 2 } // [START Docstring4 END Docstring4]
+  /* Not docstring */
+  function Test5(): int // [START Docstring5
+    // END Docstring5]
+  {
+    1
+  }
+
+  /** [START Docstring6 END Docstring6] */
+  function Test6(): (r: int)
+  function Test7(): (r: int) // [START Docstring7 END Docstring7]
+  /** [START Docstring8 END Docstring8] */
+  function Test8(): (r: int) { 1 } // Not docstring
+  function Test9(): (r: int) { 2 } // [START Docstring9 END Docstring9]
+  /* Not docstring */
+  function Test10(): (r: int) // [START Docstring10
+    // END Docstring10]
+  {
+    1
+  }
+}
+";
+      await TestAllDocstrings(programString);
+    }
+
+    [Fact]
+    public async Task DocStringForMethods() {
+      var programString = @"
+class NoDocstring0 {
+  /** [START Docstring1 END Docstring1] */
+  method Test1()
+  method Test2() // [START Docstring2 END Docstring2]
+  /** [START Docstring3 END Docstring3] */
+  method Test3() {} // Not docstring
+  method Test4() { } // [START Docstring4 END Docstring4]
+  /* Just a comment */
+  method Test5() // [START Docstring5
+    // END Docstring5]
+  {
+  }
+
+  /** [START Docstring6 END Docstring6] */
+  method Test6() returns (r: int)
+  method Test7() returns (r: int) // [START Docstring7 END Docstring7]
+  /** [START Docstring8 END Docstring8] */
+  method Test8() returns (r: int) { } // Not docstring
+  method Test9() returns (r: int) { } // [START Docstring9 END Docstring9]
+  /* Not docstring */
+  method Test10() returns (r: int) // [START Docstring10
+    // END Docstring10]
+  {
+  }
+}
+";
+      await TestAllDocstrings(programString);
+    }
+
+    [Fact]
+    public async Task DocStringForIterators() {
+      var programString = @"
+/** [START Docstring0 END Docstring0] */
+iterator Gen(start: int) yields (x: int) // Just a comment
+  yield ensures true
+{}
+
+/* Just a comment */
+iterator Gen(start: int) yields (x: int) //  [START Docstring1 END Docstring1]
+  yield ensures true
+{}
+
+/* Just a comment */
+iterator Gen(start: int) yields (x: int)
+  yield ensures true
+{} //  [START Docstring2 END Docstring2]
+// Just a comment
+";
+      await TestAllDocstrings(programString);
+    }
+
+    [Fact]
+    public async Task DocStringForModules() {
+      var programString = @"
+/** [START Docstring0 END Docstring0] */
+module Module0 {
+  // No docstring for this module
+  module NoDocstring1 {}
+  module Module2 {} // [START Docstring2 END Docstring2]
+  /** [START Docstring3 END Docstring3] */
+  module Module3 {} // Not docstring
+
+  module Test4 refines Else // [START Docstring4
+  // END Docstring4]
+  {
+  }
+}
+";
+      await TestAllDocstrings(programString);
+    }
+
+    [Fact]
+    public async Task DocStringForExportSets() {
+      var programString = @"
+module NoDocstring0 {
+  /** [START Docstring1 END Docstring1] */
+  export provides A, B, C
+
+  // Just a comment
+  export
+    // [START Docstring2 END Docstring2]
+    provides D, E, F
+
+  // Just a comment
+  export All
+    // [START Docstring3 END Docstring3]
+    provides D, E
+
+  // Just a comment
+  export AllBis
+    provides D, E // [START Docstring4 END Docstring4]
+  // Just a comment
+}";
+      await TestAllDocstrings(programString);
+    }
+
+    [Fact]
+    public async Task DocStringForNewtypes() {
+      var programString = @"
+/** [START Docstring0 END Docstring0] */
+newtype Int0 = x: int | true // Not docstring
+
+newtype Int1 = x: int | true { predicate NoDocstring2() { x == 0 } } // [START Docstring1 END Docstring1]
+
+/** [START Docstring3 END Docstring3] */
+newtype Int3 = x: int | true { predicate NoDocstring4() { x == 0 } } // Not docstring
+
+/* Not docstring */
+newtype Int5
+  // [START Docstring5
+  // END Docstring5]
+= x: int | true // Not docstring
+
+newtype Int6 = x: int | true witness 0 // [START Docstring6 END Docstring6]
+";
+      await TestAllDocstrings(programString);
+    }
+
+    [Fact]
+    public async Task DocStringForSynonymTypes() {
+      var programString = @"
+/** [START Docstring0 END Docstring0] */
+type Int0 = x: int | true // Not docstring
+
+type Int1 = x: int | true witness 0 // [START Docstring1 END Docstring1]
+
+/** [START Docstring2 END Docstring2] */
+type Int2 = x: int | true // Not docstring
+
+/* Not docstring */
+type Int3
+  // [START Docstring3
+  // END Docstring3]
+= x: int | true // Not docstring
+";
+      await TestAllDocstrings(programString);
+    }
+
+    private async Task TestAllDocstrings(string programString) {
+      var options = DafnyOptions.CreateUsingOldParser(new BufferTextWriter());
+      foreach (Newlines newLinesType in Enum.GetValues(typeof(Newlines))) {
+        currentNewlines = newLinesType;
+        programString = AdjustNewlines(programString);
+
+        var reporter = new BatchErrorReporter(options);
+        var dafnyProgram = await Utils.Parse(reporter, programString, false);
+        if (reporter.ErrorCount != 0) {
+          throw new Exception(reporter.AllMessagesByLevel[ErrorLevel.Error][0].ToString());
+        }
+        Assert.Equal(0, reporter.ErrorCount);
+        var topLevelDecls = dafnyProgram.DefaultModuleDef.TopLevelDecls.ToList();
+        var hasDocString = topLevelDecls.OfType<IHasDocstring>().SelectMany(i => {
+          var result = new List<IHasDocstring> { i };
+          if (i is DatatypeDecl d) {
+            foreach (var ctor in d.Ctors) {
+              result.Add(ctor);
+            }
+          }
+
+          if (i is TopLevelDeclWithMembers memberContainer) {
+            foreach (var member in memberContainer.Members) {
+              if (member is IHasDocstring hasDocstring) {
+                result.Add(hasDocstring);
+              }
+            }
+          }
+
+          if (i is LiteralModuleDecl modDecl) {
+            foreach (var innerDecl in modDecl.ModuleDef.TopLevelDecls) {
+              if (innerDecl is IHasDocstring hasDocstring) {
+                result.Add(hasDocstring);
+              }
+            }
+          }
+
+          return result;
+        }).ToList();
+        var matches = new Regex($@"Docstring(\d+)").Matches(programString);
+        var highestDocstringIndex = 0;
+        for (var i = 0; i < matches.Count; i++) {
+          var match = matches[i];
+          var index = int.Parse(match.Groups[1].Value);
+          if (index > highestDocstringIndex) {
+            highestDocstringIndex = index;
+          }
+        }
+
+        Assert.Equal(hasDocString.Count - 1, highestDocstringIndex);
+        for (var i = 0; i < hasDocString.Count; i++) {
+          var iHasDocString = hasDocString[i];
+          var triviaWithDocstring = AdjustNewlines(iHasDocString.GetTriviaContainingDocstring() ?? "");
+          if (!(new Regex($@"\[START Docstring{i}[\s\S]*END Docstring{i}\]")).IsMatch(triviaWithDocstring)) {
+            if (iHasDocString is Declaration decl && decl.Name.Contains("NoDocstring")) {
+              // OK
+            } else {
+              Assert.True(false, $"\"[START Docstring{i}...END Docstring{i}]\" not found in {triviaWithDocstring}");
+            }
+          } else {
+            Assert.Equal(triviaWithDocstring.Trim(), triviaWithDocstring);
+          }
+        }
+      }
+    }
+
+    [Fact]
+    async Task DocstringWorksForPredicates() {
+      await DocstringWorksFor(@"
 predicate p1()
   // Always true. Every time.
   ensures p1() == true
@@ -58,8 +407,8 @@ predicate p3(): (y: bool)
       });
     }
     [Fact]
-    public void DocstringWorksForFunctions() {
-      DocstringWorksFor(@"
+    public async Task DocstringWorksForFunctions() {
+      await DocstringWorksFor(@"
 function Test1(i: int): int
   // Test1 computes an int
   // It takes an int and adds 1 to it
@@ -71,8 +420,8 @@ function Test2(i: int): int
 { i + 2 }
 // Trailing comment
 
-// Test3 computes an int
-// It takes an int and adds 3 to it
+/** Test3 computes an int
+  * It takes an int and adds 3 to it */
 ghost function Test3(i: int): int
 { i + 3 }
 
@@ -87,8 +436,8 @@ function Test5(i: int): int
    * It takes an int and adds 5 to it */
 { i + 5 }
 
-function Test6(i: int): int
-/** Test6 computes an int
+function Test6(i: int): int /**
+  * Test6 computes an int
   * It takes an int and adds 6 to it */
 
 function Test7(i: int): (j: int)
@@ -98,7 +447,7 @@ It takes an int and adds 7 to it */
 
 function Test8(i: int): int
   /* Test8 computes an int
-     It takes an int and adds 8 to it */
+   * It takes an int and adds 8 to it */
 { i + 8 }
 
 function Test9(i: int): int /*
@@ -108,7 +457,7 @@ It takes an int and adds 9 to it */
 
 function Test10(i: int): int
   /* Test10 computes an int
-      It takes an int and adds 10 to it */
+    *  It takes an int and adds 10 to it */
 { i + 10 }
 
 function Test11(i: int): int
@@ -126,8 +475,8 @@ function Test11(i: int): int
     }
 
     [Fact]
-    public void DocstringWorksForPredicate() {
-      DocstringWorksFor(@"
+    public async Task DocstringWorksForPredicate() {
+      await DocstringWorksFor(@"
 class X {
   static predicate Test1(i: int)
     // Test1 checks if an int
@@ -135,8 +484,8 @@ static predicate Test1(i: int)
   { i == 1 }
   // Unrelated trailing comment
   
-  // Test2 checks if an int
-  // is equal to 2
+  /** Test2 checks if an int
+    * is equal to 2 */
   static predicate Test2(i: int)
   { i == 2 }
 }
@@ -146,8 +495,8 @@ static predicate Test2(i: int)
     }
 
     [Fact]
-    public void DocstringWorksForMethodsAndLemmas() {
-      DocstringWorksFor(@"
+    public async Task DocstringWorksForMethodsAndLemmas() {
+      await DocstringWorksFor(@"
 /** ComputeThing prints something to the screen */
 method ComputeThing(i: int) returns (j: int)
 { print i; }
@@ -160,8 +509,8 @@ lemma ComputeThing2(i: int) returns (j: int)
 { print i; }
 
 // Unattached comment
-method ComputeThing3(i: int) returns (j: int)
-  // ComputeThing3 prints something to the screen
+method ComputeThing3(i: int) returns (j: int) /*
+  ComputeThing3 prints something to the screen */
 
 // Unattached comment
 method ComputeThing4(i: int)
@@ -175,18 +524,16 @@ method ComputeThing4(i: int)
       });
     }
     [Fact]
-    public void DocstringWorksForConst() {
-      DocstringWorksFor(@"
+    public async Task DocstringWorksForConst() {
+      await DocstringWorksFor(@"
 class X {
-  const x2 := 29
-  // The biggest prime number less than 30
+  const x2 := 29 // The biggest prime number less than 30
 
   /** The biggest prime number less than 20 */
   const x1 := 19
 
   // Unrelated todo 
-  const x3 := 37
-  // The biggest prime number less than 40
+  const x3 := 37 // The biggest prime number less than 40
 }
 ", new List<(string nodeTokenValue, string? expectedDocstring)> {
         ("x1", "The biggest prime number less than 20"),
@@ -195,27 +542,25 @@ class X {
     }
 
     [Fact]
-    public void DocstringWorksForSubsetType() {
-      DocstringWorksFor(@"
-type Odd = x: int | x % 2 == 1 witness 1
-// Type of numbers that are not divisible by 2 
+    public async Task DocstringWorksForSubsetType() {
+      await DocstringWorksFor(@"
+type Odd = x: int | x % 2 == 1 witness 1 // Type of numbers that are not divisible by 2 
 
 /** Type of numbers divisible by 2 */
 type Even = x: int | x % 2 == 1 witness 1
 
 // Unrelated comment
-type Weird = x: int | x % 2 == x % 3 witness 0
-// Type of numbers whose remainder modulo 2 or 3 is the same
+type Weird = x: int | x % 2 == x % 3 witness 0 // Type of numbers whose remainder modulo 2 or 3 is the same
 
 // Unattached comment
-newtype Digit = x: int | 0 <= x < 10
-// A single digit
+newtype Digit = x: int | 0 <= x < 10 // A single digit
 
 /** A hex digit */
 newtype HexDigit = x: int | 0 <= x < 16
 
-newtype BinDigit = x: int | 0 <= x < 2 witness 1
-// A binary digit
+newtype BinDigit
+  // A binary digit
+  = x: int | 0 <= x < 2 witness 1
 {
   function flip(): BinDigit {
     1 - this
@@ -223,13 +568,10 @@ function flip(): BinDigit {
 }
 
 // Unrelated comment
-type Weird = x: int | x % 2 == x % 3 witness 0
-// Type of numbers whose remainder modulo 2 or 3 is the same
-
+type Weird = x: int | x % 2 == x % 3 witness 0 // Type of numbers whose remainder modulo 2 or 3 is the same
 
 // Unattached comment
-type ZeroOrMore = nat
-// ZeroOrMore is the same as nat
+type ZeroOrMore = nat // ZeroOrMore is the same as nat
 
 /** ZeroOrMore2 is the same as nat */ 
 type ZeroOrMore2 = nat
@@ -259,17 +601,15 @@ type AbstractType2
     }
 
     [Fact]
-    public void DocstringWorksForDatatypes() {
-      DocstringWorksFor(@"
+    public async Task DocstringWorksForDatatypes() {
+      await DocstringWorksFor(@"
 // Unrelated comment
-datatype State =
+datatype State
   // A typical log message from a process monitoring
+  = // Unrelated comment
+    Begin(time: int) // The beginning of the process
   | // Unrelated comment
-    Begin(time: int)
-    // The beginning of the process
-  | // Unrelated comment
-    End(time: int)
-    // The end of the process
+    End(time: int) // The end of the process
 
 /** Another typical log message from a process monitoring */
 datatype State2 =
@@ -292,8 +632,8 @@ public void DocstringWorksForDatatypes() {
 
 
     [Fact]
-    public void DocstringWorksForClassAndTraits() {
-      DocstringWorksFor(@"
+    public async Task DocstringWorksForClassAndTraits() {
+      await DocstringWorksFor(@"
 trait X
 // A typical base class
 {}
@@ -326,8 +666,8 @@ class A2 extends T
 
 
     [Fact]
-    public void DocstringWorksForExport() {
-      DocstringWorksFor(@"
+    public async Task DocstringWorksForExport() {
+      await DocstringWorksFor(@"
 module Test {
   /** You only get the signatures of f and g */
   export hidden provides f
@@ -358,8 +698,8 @@ function f(): int {
     }
 
     [Fact]
-    public void DocstringWorksForModules() {
-      DocstringWorksFor(@"
+    public async Task DocstringWorksForModules() {
+      await DocstringWorksFor(@"
 // Unattached comment
 module A
   // A is the most interesting module
@@ -382,8 +722,8 @@ abstract module C
     }
 
     [Fact]
-    public void DocstringWorksForIterators() {
-      DocstringWorksFor(@"
+    public async Task DocstringWorksForIterators() {
+      await DocstringWorksFor(@"
 /** Iter is interesting */
 iterator Iter(x: int) yields (y: int)
   requires A: 0 <= x
@@ -419,14 +759,14 @@ iterator Iter2(x: int) yields (y: int)
       }
     }
 
-    protected void DocstringWorksFor(string source, string nodeTokenValue, string? expectedDocstring) {
-      DocstringWorksFor(source, new List<(string nodeTokenValue, string? expectedDocstring)>() {
+    protected Task DocstringWorksFor(string source, string nodeTokenValue, string? expectedDocstring) {
+      return DocstringWorksFor(source, new List<(string nodeTokenValue, string? expectedDocstring)>() {
         (nodeTokenValue, expectedDocstring)
       });
     }
 
-    protected void DocstringWorksFor(string source, List<(string nodeTokenValue, string? expectedDocstring)> tests) {
-      var options = DafnyOptions.Create(new WriterFromOutputHelper(output));
+    protected async Task DocstringWorksFor(string source, List<(string nodeTokenValue, string? expectedDocstring)> tests) {
+      var options = DafnyOptions.CreateUsingOldParser((TextWriter)new WriterFromOutputHelper(output));
       var newlineTypes = Enum.GetValues(typeof(Newlines));
       foreach (Newlines newLinesType in newlineTypes) {
         currentNewlines = newLinesType;
@@ -434,15 +774,15 @@ protected void DocstringWorksFor(string source, List<(string nodeTokenValue, str
         // and then recompute it. The result should be the same string.
         var programString = AdjustNewlines(source);
 
-        var dafnyProgram = Utils.Parse(options, programString, false);
-        BatchErrorReporter reporter = (BatchErrorReporter)dafnyProgram.Reporter;
-        if (reporter.ErrorCount > 0) {
+        var reporter = new BatchErrorReporter(options);
+        var dafnyProgram = await Utils.Parse(reporter, programString, false);
+        if (reporter.HasErrors) {
           var error = reporter.AllMessagesByLevel[ErrorLevel.Error][0];
           Assert.False(true, $"{error.Message}: line {error.Token.line} col {error.Token.col}");
         }
 
         foreach (var (nodeTokenValue, expectedDocstring) in tests) {
-          var targetNode = FindNode(dafnyProgram, node => node.Tok.val == nodeTokenValue);
+          var targetNode = FindNode(dafnyProgram, node => node.Origin.val == nodeTokenValue);
           if (targetNode == null) {
             Assert.NotNull(targetNode);
           }
diff --git a/Source/DafnyPipeline.Test/FormatterBaseTest.cs b/Source/DafnyPipeline.Test/FormatterBaseTest.cs
index f8bb5395f57..b79a9e8f936 100644
--- a/Source/DafnyPipeline.Test/FormatterBaseTest.cs
+++ b/Source/DafnyPipeline.Test/FormatterBaseTest.cs
@@ -4,6 +4,8 @@
 using System.Collections.Immutable;
 using System.IO;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using DafnyCore.Test;
 using DafnyTestGeneration;
 using Bpl = Microsoft.Boogie;
 using BplParser = Microsoft.Boogie.Parser;
@@ -41,9 +43,9 @@ enum Newlines {
 
     private Newlines currentNewlines;
 
-    protected void FormatterWorksFor(string testCase, string? expectedProgramString = null, bool expectNoToken = false,
+    protected async Task FormatterWorksFor(string testCase, string? expectedProgramString = null, bool expectNoToken = false,
       bool reduceBlockiness = true) {
-      var options = DafnyOptions.Create(output);
+      var options = DafnyOptions.CreateUsingOldParser(output);
       options.DisallowIncludes = true;
       var newlineTypes = Enum.GetValues(typeof(Newlines));
       foreach (Newlines newLinesType in newlineTypes) {
@@ -60,25 +62,26 @@ protected void FormatterWorksFor(string testCase, string? expectedProgramString
         var reporter = new BatchErrorReporter(options);
         Microsoft.Dafny.Type.ResetScopes();
 
-        var dafnyProgram = new ProgramParser().Parse(programNotIndented, uri, reporter);
+        var parseResult = await new ProgramParser().Parse(programNotIndented, uri, reporter);
+        var dafnyProgram = parseResult.Program;
 
-        if (reporter.ErrorCount > 0) {
+        if (reporter.HasErrors) {
           var error = reporter.AllMessagesByLevel[ErrorLevel.Error][0];
           Assert.False(true, $"{error.Message}: line {error.Token.line} col {error.Token.col}");
         }
 
-        var firstToken = dafnyProgram.GetFirstTopLevelToken();
+        var firstToken = dafnyProgram.GetFirstTokenForUri(uri);
         if (firstToken == null && !expectNoToken) {
           Assert.False(true, "Did not find a first token");
         }
 
         var reprinted = firstToken != null && firstToken.line > 0
           ? Formatting.__default.ReindentProgramFromFirstToken(firstToken,
-            IndentationFormatter.ForProgram(dafnyProgram, reduceBlockiness))
+            IndentationFormatter.ForProgram(dafnyProgram, firstToken.Uri, reduceBlockiness))
           : programString;
-        EnsureEveryTokenIsOwned(programNotIndented, dafnyProgram);
+        EnsureEveryTokenIsOwned(uri, programNotIndented, dafnyProgram);
         if (expectedProgram != reprinted) {
-          Console.Out.WriteLine("Formatting after parsing generates an error:");
+          await Console.Out.WriteLineAsync("Formatting after parsing generates an error:");
           Assert.Equal(expectedProgram, reprinted);
         }
 
@@ -99,23 +102,22 @@ protected void FormatterWorksFor(string testCase, string? expectedProgramString
         });
         var reprintedCloned = firstToken != null && firstToken.line > 0
           ? Formatting.__default.ReindentProgramFromFirstToken(firstToken,
-            IndentationFormatter.ForProgram(dafnyProgram, reduceBlockiness))
+            IndentationFormatter.ForProgram(dafnyProgram, firstToken.Uri, reduceBlockiness))
           : programString;
-        EnsureEveryTokenIsOwned(programNotIndented, dafnyProgram);
+        EnsureEveryTokenIsOwned(uri, programNotIndented, dafnyProgram);
         if (expectedProgram != reprintedCloned) {
-          Console.Out.WriteLine("Formatting after parsing + cloning generates an error:");
+          await Console.Out.WriteLineAsync("Formatting after parsing + cloning generates an error:");
           Assert.Equal(expectedProgram, reprinted);
         }
 
-
         // Formatting should work after resolution as well.
         DafnyMain.Resolve(dafnyProgram);
         reprinted = firstToken != null && firstToken.line > 0
           ? Formatting.__default.ReindentProgramFromFirstToken(firstToken,
-            IndentationFormatter.ForProgram(dafnyProgram, reduceBlockiness))
+            IndentationFormatter.ForProgram(dafnyProgram, firstToken.Uri, reduceBlockiness))
           : programString;
         if (expectedProgram != reprinted) {
-          options.ErrorWriter.WriteLine("Formatting after resolution generates an error:");
+          await options.ErrorWriter.WriteLineAsync("Formatting after resolution generates an error:");
           Assert.Equal(expectedProgram, reprinted);
         }
 
@@ -124,14 +126,13 @@ protected void FormatterWorksFor(string testCase, string? expectedProgramString
         // Verify that the formatting is stable.
         Microsoft.Dafny.Type.ResetScopes();
         var newReporter = new BatchErrorReporter(options);
-        dafnyProgram = new ProgramParser().Parse(reprinted, uri, newReporter);
-        ;
+        dafnyProgram = (await new ProgramParser().Parse(reprinted, uri, newReporter)).Program;
 
         Assert.Equal(initErrorCount, reporter.ErrorCount + newReporter.ErrorCount);
-        firstToken = dafnyProgram.GetFirstTopLevelToken();
+        firstToken = dafnyProgram.GetFirstTokenForUri(uri);
         var reprinted2 = firstToken != null && firstToken.line > 0
           ? Formatting.__default.ReindentProgramFromFirstToken(firstToken,
-            IndentationFormatter.ForProgram(dafnyProgram, reduceBlockiness))
+            IndentationFormatter.ForProgram(dafnyProgram, firstToken.Uri, reduceBlockiness))
           : reprinted;
         if (reprinted != reprinted2) {
           Console.Write("Double formatting is not stable:\n");
@@ -141,8 +142,8 @@ protected void FormatterWorksFor(string testCase, string? expectedProgramString
       }
     }
 
-    private void EnsureEveryTokenIsOwned(string programNotIndented, Program dafnyProgram) {
-      var firstToken = dafnyProgram.GetFirstTopLevelToken();
+    private void EnsureEveryTokenIsOwned(Uri uri, string programNotIndented, Program dafnyProgram) {
+      var firstToken = dafnyProgram.GetFirstTokenForUri(uri);
       if (firstToken == null) {
         return;
       }
@@ -161,7 +162,7 @@ private void EnsureEveryTokenIsOwned(string programNotIndented, Program dafnyPro
       ReportNotOwnedToken(programNotIndented, notOwnedToken, posToOwnerNode);
     }
 
-    private static void ReportNotOwnedToken(string programNotIndented, IToken notOwnedToken,
+    private static void ReportNotOwnedToken(string programNotIndented, IOrigin notOwnedToken,
       Dictionary<int, List<INode>> posToOwnerNode) {
       var nextOwnedToken = notOwnedToken.Next;
       while (nextOwnedToken != null && !posToOwnerNode.ContainsKey(nextOwnedToken.pos)) {
@@ -182,8 +183,8 @@ private static void ReportNotOwnedToken(string programNotIndented, IToken notOwn
       );
     }
 
-    private static IToken? GetFirstNotOwnedToken(IToken firstToken, HashSet<int> tokensWithoutOwner) {
-      IToken? notOwnedToken = firstToken;
+    private static IOrigin? GetFirstNotOwnedToken(IOrigin firstToken, HashSet<int> tokensWithoutOwner) {
+      IOrigin? notOwnedToken = firstToken;
       while (notOwnedToken != null && !tokensWithoutOwner.Contains(notOwnedToken.pos)) {
         notOwnedToken = notOwnedToken.Next;
       }
@@ -191,7 +192,7 @@ private static void ReportNotOwnedToken(string programNotIndented, IToken notOwn
       return notOwnedToken;
     }
 
-    private static HashSet<int> CollectTokensWithoutOwner(Program dafnyProgram, IToken firstToken,
+    private static HashSet<int> CollectTokensWithoutOwner(Program dafnyProgram, IOrigin firstToken,
       out Dictionary<int, List<INode>> posToOwnerNode) {
       HashSet<int> tokensWithoutOwner = new HashSet<int>();
       var posToOwnerNodeInner = new Dictionary<int, List<INode>>();
diff --git a/Source/DafnyPipeline.Test/FormatterComprehensions.cs b/Source/DafnyPipeline.Test/FormatterComprehensions.cs
index 1795182fad9..de40d1e6636 100644
--- a/Source/DafnyPipeline.Test/FormatterComprehensions.cs
+++ b/Source/DafnyPipeline.Test/FormatterComprehensions.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +8,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForComprehensions")]
 public class FormatterForComprehensions : FormatterBaseTest {
   [Fact]
-  public void FormatWorksForMatchExpression() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForMatchExpression() {
+    await FormatterWorksFor(@"
 predicate bad(e:Maybe)
 {
   forall i :: 0 <= i < 1 ==>
@@ -27,8 +28,8 @@ predicate bad2(e:Maybe)
   }
 
   [Fact]
-  public void FormatWorksForComprehensions() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForComprehensions() {
+    await FormatterWorksFor(@"
 method comprehensions() {
   c := imap i: int |
     i % 9 == 0
@@ -71,7 +72,7 @@ method comprehensions() {
     :=  17;
 }
 ");
-    FormatterWorksFor(@"
+    await FormatterWorksFor(@"
 method comprehensions() {
   var a := imap
              t: int ::  t % 3
@@ -107,8 +108,8 @@ method comprehensions() {
   }
 
   [Fact]
-  public void FormatterWorksForVarsAndGhostVarsAndUnchanged() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForVarsAndGhostVarsAndUnchanged() {
+    await FormatterWorksFor(@"
 twostate predicate BadVariations(c: Twostate, d: Twostate, e: Twostate, f: Twostate)
 {
   && unchanged(
@@ -145,8 +146,8 @@ function Fu(): int
   }
 
   [Fact]
-  public void FormatterWorksForLinearFunctionBody() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForLinearFunctionBody() {
+    await FormatterWorksFor(@"
 function test(): int {
   :- Need(u);
   :- Need(u);
@@ -158,8 +159,8 @@ function test(): int {
   }
 
   [Fact]
-  public void FormatterWorksForComparisons() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForComparisons() {
+    await FormatterWorksFor(@"
 function f(x: int): (y: int)
   ensures x
        == y
@@ -179,8 +180,8 @@ ensures x
 ");
   }
   [Fact]
-  public void FormatterWorksForForallExpressions() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForForallExpressions() {
+    await FormatterWorksFor(@"
 predicate GoodIdentifier(s: string) {
   && s != []
   && (|| 'a' <= s[0] <= 'z'
@@ -199,8 +200,8 @@ predicate BadIdentifier(s: string) {
   }
 
   [Fact]
-  public void FormatterWorksForSetComprehension() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForSetComprehension() {
+    await FormatterWorksFor(@"
 function test(): int {
   | set i: nat
     | i < 10
diff --git a/Source/DafnyPipeline.Test/FormatterForApplySuffixRelated.cs b/Source/DafnyPipeline.Test/FormatterForApplySuffixRelated.cs
index dc47cd7e198..9f622d6d704 100644
--- a/Source/DafnyPipeline.Test/FormatterForApplySuffixRelated.cs
+++ b/Source/DafnyPipeline.Test/FormatterForApplySuffixRelated.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +8,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForApplySuffixRelated")]
 public class FormatterForApplySuffixRelated : FormatterBaseTest {
   [Fact]
-  public void FormatterWorksForArguments() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForArguments() {
+    await FormatterWorksFor(@"
 method Test()
 {
   me(func(arg(5,
diff --git a/Source/DafnyPipeline.Test/FormatterForAssignments.cs b/Source/DafnyPipeline.Test/FormatterForAssignments.cs
index 25b53785b59..2af2a7388a8 100644
--- a/Source/DafnyPipeline.Test/FormatterForAssignments.cs
+++ b/Source/DafnyPipeline.Test/FormatterForAssignments.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +8,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForAssignments")]
 public class FormatterForAssignments : FormatterBaseTest {
   [Fact]
-  public void FormatterWorksForAssignments() {
-    FormatterWorksFor(@"method test() {
+  public async Task FormatterWorksForAssignments() {
+    await FormatterWorksFor(@"method test() {
   var
     x
     :=
@@ -29,8 +30,8 @@ public void FormatterWorksForAssignments() {
 }");
   }
   [Fact]
-  public void FormatterWorksForVarAssignments() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForVarAssignments() {
+    await FormatterWorksFor(@"
 method Test() {
   var y,
       z
@@ -79,8 +80,8 @@ var y
   }
 
   [Fact]
-  public void FormatterWorksForObjectCreation() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForObjectCreation() {
+    await FormatterWorksFor(@"
 method Test() {
   g := new ClassName.ConstructorName(
     argument1b,
@@ -148,8 +149,8 @@ method Test() {
 ", reduceBlockiness: true);
   }
   [Fact]
-  public void FormatterWorksForObjectCreationBlockly() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForObjectCreationBlockly() {
+    await FormatterWorksFor(@"
 method Test() {
   :- Module.Need(
        arg3,
diff --git a/Source/DafnyPipeline.Test/FormatterForAtAttributes.cs b/Source/DafnyPipeline.Test/FormatterForAtAttributes.cs
new file mode 100644
index 00000000000..f1e92adf17b
--- /dev/null
+++ b/Source/DafnyPipeline.Test/FormatterForAtAttributes.cs
@@ -0,0 +1,71 @@
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace DafnyPipeline.Test;
+
+[Collection("Singleton Test Collection - FormatterForTopLevelDeclarations")]
+public class FormatterForAtAttributes : FormatterBaseTest {
+  [Fact]
+  public async Task FormatterWorksForMemberDeclAtAttributes() {
+    await FormatterWorksFor(@"
+module Enclosing {
+  @ResourceLimit(""1500e3"")
+  @IsolateAssertions
+  lemma ReplaceDotsInvertible(i: string)
+
+  @IsolateAssertions
+  @Compile(true)
+  type X = Int
+
+  @IsolateAssertions
+  @Compile(true)
+  type Xsub = x: Int | x != 0
+
+  @IsolateAssertions
+  @Compile(true)
+  type AbstractType
+
+  @IsolateAssertions
+  @Compile(true)
+  datatype Y = YCons()
+
+  @IsolateAssertions
+  @Compile(true)
+  codatatype Y = YCons()
+
+  @Compile(false)
+  @Compile(true)
+  module SubModule {
+  }
+
+  @Compile(false)
+  @Compile(true)
+  const Two := 2
+
+  class Test {
+    @ResourceLimit(""2500e3"")
+    @IsolateAssertions
+    lemma ReplaceDotsInvertible(i: string)
+
+    @ResourceLimit(""3500e3"")
+    @IsolateAssertions
+    function OtherFunction(i: string): string
+
+    @ResourceLimit(""4500e3"")
+    @IsolateAssertions
+    static
+    lemma ReplaceDotsInvertible(i: string)
+
+    @Compile(false)
+    @Compile(true)
+    const Two := 2
+  }
+}
+", null, true);
+  }
+
+  public FormatterForAtAttributes([NotNull] ITestOutputHelper output) : base(output) {
+  }
+}
diff --git a/Source/DafnyPipeline.Test/FormatterForCalcStmt.cs b/Source/DafnyPipeline.Test/FormatterForCalcStmt.cs
index 16b74ec76d4..ab14147daca 100644
--- a/Source/DafnyPipeline.Test/FormatterForCalcStmt.cs
+++ b/Source/DafnyPipeline.Test/FormatterForCalcStmt.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +8,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForCalcStmt")]
 public class FormatterForCalcStmt : FormatterBaseTest {
   [Fact]
-  public void FormatterWorksForHintsInCalcStatements() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForHintsInCalcStatements() {
+    await FormatterWorksFor(@"
 class Test {
   ghost constructor CalcInInitializationPhase() {
     var c0 := new Cell; // fine here
diff --git a/Source/DafnyPipeline.Test/FormatterForComments.cs b/Source/DafnyPipeline.Test/FormatterForComments.cs
index b346ba1ba4d..f63c1d5a4fc 100644
--- a/Source/DafnyPipeline.Test/FormatterForComments.cs
+++ b/Source/DafnyPipeline.Test/FormatterForComments.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +8,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForComments")]
 public class FormatterForComments : FormatterBaseTest {
   [Fact]
-  public void FormatterWorksForCommentsHoldingTogether() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForCommentsHoldingTogether() {
+    await FormatterWorksFor(@"
    const x := 2;     /* start of comment
   These words aligned:  start */
 
@@ -18,7 +19,7 @@ public void FormatterWorksForCommentsHoldingTogether() {
 
 const y := 3;");
 
-    FormatterWorksFor(@"
+    await FormatterWorksFor(@"
 const x := 4;
     /* start of comment
   end of comment
@@ -30,7 +31,7 @@ end of comment
 should stay aligned*/
 const y := 5;");
 
-    FormatterWorksFor(@"
+    await FormatterWorksFor(@"
 const x := 6;
 
     /* start of comment
@@ -47,8 +48,8 @@ should stay aligned*/
 
 
   [Fact]
-  public void FormatterWorksForMultilineCommentsStartingWithRowOfStars() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForMultilineCommentsStartingWithRowOfStars() {
+    await FormatterWorksFor(@"
 /***********
  * These are test cases for monotonicity of the the _k parameter.  However, monotonicity
  * does not appear to be useful in the test suite, and it is possible that the axioms
@@ -60,7 +61,7 @@ function test(): int
   }
 
   [Fact]
-  public void FormatterWorksForConsecutiveComments() {
+  public async Task FormatterWorksForConsecutiveComments() {
     var testCase = @"
 abstract module M0 {
   /******* State *******/
@@ -90,18 +91,18 @@ function build(prog: Program, st: State, useCache: bool): Tuple<Expression, Stat
   }
 }
 ";
-    FormatterWorksFor(testCase, testCase);
+    await FormatterWorksFor(testCase, testCase);
   }
 
   [Fact]
-  public void FormatterWorksForCommentsOfCases() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForCommentsOfCases() {
+    await FormatterWorksFor(@"
 datatype Dt =
   | Int(int)
   // | ISet(iset<Dt>) //  This definition is not allowed because Dt appears in a non-strict/lax position
   // | IMap0(imap<Dt,int>) //  This definition is not allowed because Dt appears in a non-strict/lax position
   | IMap1(imap<int,Dt>)
-  // | Last case commented out
+// | Last case commented out
 
 method M4() {
   if {
@@ -113,8 +114,8 @@ method M4() {
 }");
   }
   [Fact]
-  public void FormatterWorksForAdvancedClosures() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForAdvancedClosures() {
+    await FormatterWorksFor(@"
 method LRead() {
   var o : object?;
   var f : Ref<() ~> bool>;
@@ -169,8 +170,8 @@ decreases t0
   }
 
   [Fact]
-  public void FormatterWorksForCommentAfterSubsetType() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForCommentAfterSubsetType() {
+    await FormatterWorksFor(@"
 module R1 refines Q {
   type G = real  // specify G
   // now, it is known how to initialize
@@ -178,7 +179,7 @@ module R1 refines Q {
   }
 
   [Fact]
-  public void FormatterWorksForLongCommentsDocument() {
+  public async Task FormatterWorksForLongCommentsDocument() {
     var testCase = @"
 module R {
   /* Simple comment
@@ -205,11 +206,11 @@ import opened LibA
   function g(): int { 4 }
 }
 ";
-    FormatterWorksFor(testCase, testCase);
+    await FormatterWorksFor(testCase, testCase);
   }
   [Fact]
-  public void FormatterWorksForTutorialStyle() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForTutorialStyle() {
+    await FormatterWorksFor(@"
 /// Tutorial style
 
 abstract module C {
@@ -225,11 +226,11 @@ abstract module C {
 ");
   }
   [Fact]
-  public void FormatterWorksForAlignedSingleLineTrailingComments() {
+  public async Task FormatterWorksForAlignedSingleLineTrailingComments() {
     var before = @"
 module RefinedF refines BaseF {
-  function f(): bool { false } // OK. Local f preferred over imported f
-                               // even if imported into refinement parent
+  function f(): bool { false } /* OK. Local f preferred over imported f
+                                  even if imported into refinement parent */
   lemma A() {
   forall u: int {  // regression: the inferred ensures clause used to have
                    // a problem with static const fields
@@ -245,11 +246,11 @@ method DeclWithHavoc()
 }";
     var after = @"
 module RefinedF refines BaseF {
-  function f(): bool { false } // OK. Local f preferred over imported f
-                               // even if imported into refinement parent
+  function f(): bool { false } /* OK. Local f preferred over imported f
+                                  even if imported into refinement parent */
   lemma A() {
     forall u: int {  // regression: the inferred ensures clause used to have
-                     // a problem with static const fields
+      // a problem with static const fields
       B(u);
     }
   }
@@ -260,12 +261,12 @@ method DeclWithHavoc()
     // This comment should be on its own line
   }
 }";
-    FormatterWorksFor(before, after);
+    await FormatterWorksFor(before, after);
   }
 
   [Fact]
-  public void FormatterWorksForUtf8InComment() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForUtf8InComment() {
+    await FormatterWorksFor(@"
 //  x ∈ a[..3] Dafny won’t prove, Wüstholz would, Mikaël doesn’t voilà Great job 
 const x: int
 ");
diff --git a/Source/DafnyPipeline.Test/FormatterForDatatypeDeclarationTest.cs b/Source/DafnyPipeline.Test/FormatterForDatatypeDeclarationTest.cs
index aa9ca091f33..d84848aad7c 100644
--- a/Source/DafnyPipeline.Test/FormatterForDatatypeDeclarationTest.cs
+++ b/Source/DafnyPipeline.Test/FormatterForDatatypeDeclarationTest.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,15 +8,15 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForDatatypeDeclaration")]
 public class FormatterForDatatypeDeclarationTest : FormatterBaseTest {
   [Fact]
-  public void FormatterWorksForFinalSpaceAfterDatatype() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForFinalSpaceAfterDatatype() {
+    await FormatterWorksFor(@"
 datatype Maybe<T> = None | Some(get: T)
 ");
   }
 
   [Fact]
-  public void FormatWorksForDataTypes() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForDataTypes() {
+    await FormatterWorksFor(@"
 include ""test1""
 include
   ""test2""
@@ -28,11 +29,11 @@ public void FormatWorksForDataTypes() {
 
 datatype Color2
   =   Red
-      // Comment1
+      // Comment not docstring
   |   Green   |
-      // Comment2
+      // Comment not docstring
       Blue
-      // Blue docstring
+// Not blue docstring
 
 // Comment here
 datatype T =
@@ -66,8 +67,8 @@ datatype Color2
   }
 
   [Fact]
-  public void FormatterWorksForUniversalPatternShiftDatatypeParens() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForUniversalPatternShiftDatatypeParens() {
+    await FormatterWorksFor(@"
 newtype b17 = x | 0 <= x < (10 as bv8 << -1) as int
 newtype b18 = x | 0 <= x < (10 as bv8 >> -1) as int
 
@@ -84,8 +85,8 @@ method UniversalPattern() {
   }
 
   [Fact]
-  public void FormatterWorksForIteratorsAfterDatatypes() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForIteratorsAfterDatatypes() {
+    await FormatterWorksFor(@"
 datatype MG5 =  MG5(ghost x: int, y: int := FG(x), ghost z: int := FC(x), w: int := FC(x)) // error: call to FC passes in a ghost expression
 iterator        MG6(      x: int, y: int := FG(x), ghost z: int := FC(x), w: int := FC(x))
 iterator        MG7(ghost x: int, y: int := FG(x), ghost z: int := FC(x), w: int := FC(x)) // error: call to FC passes in a ghost expression
@@ -99,8 +100,8 @@ yield requires true
 
 
   [Fact]
-  public void FormatterWorksForDatatypeWithVerticalBarAfterwardsOrOneLine() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForDatatypeWithVerticalBarAfterwardsOrOneLine() {
+    await FormatterWorksFor(@"
 datatype Single =
   SingleWithArguments(a: int)
 
@@ -117,8 +118,8 @@ public void FormatterWorksForDatatypeWithVerticalBarAfterwardsOrOneLine() {
   }
 
   [Fact]
-  public void FormatterWorksForDoublecomment() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForDoublecomment() {
+    await FormatterWorksFor(@"
 datatype Test =
   | Zero
     /* Zero */
@@ -127,18 +128,18 @@ public void FormatterWorksForDoublecomment() {
   | MOne /* -1 */
     // Minus one
   | Both /* 2 */
-    /* Two */
+/* Two */
 ");
   }
   [Fact]
-  public void FormatterWorksForSingleDatatypeConstructor() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForSingleDatatypeConstructor() {
+    await FormatterWorksFor(@"
 datatype C = C(
   arg1: int,
   arg2: int
 )
 ", reduceBlockiness: true);
-    FormatterWorksFor(@"
+    await FormatterWorksFor(@"
 datatype C = C(
                arg1: int,
                arg2: int
diff --git a/Source/DafnyPipeline.Test/FormatterForExpressions.cs b/Source/DafnyPipeline.Test/FormatterForExpressions.cs
index 380062015cc..438c47572df 100644
--- a/Source/DafnyPipeline.Test/FormatterForExpressions.cs
+++ b/Source/DafnyPipeline.Test/FormatterForExpressions.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +8,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForExpressions")]
 public class FormatterForExpressions : FormatterBaseTest {
   [Fact]
-  public void FormatterWorksForFunctionsIfExprAndMatchCases() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForFunctionsIfExprAndMatchCases() {
+    await FormatterWorksFor(@"
 function Zipper2<T>(a: List<T>, b: List<T>)
   : List<T>
   decreases /* max(a,b) */ if a < b then b else a,
@@ -51,8 +52,8 @@ match x
   }
 
   [Fact]
-  public void FormatterWorksForCaseComments() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForCaseComments() {
+    await FormatterWorksFor(@"
 predicate SmallOdd(i: int) {
   match i
   // Case small odd
@@ -85,8 +86,8 @@ match i
   }
 
   [Fact]
-  public void FormatterWorksForMatchStatementsAndExpressions() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForMatchStatementsAndExpressions() {
+    await FormatterWorksFor(@"
 method Test(z: int) {
   match
     z {
@@ -139,8 +140,8 @@ match z {
   }
 
   [Fact]
-  public void FormatWorksForChainedImplications() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForChainedImplications() {
+    await FormatterWorksFor(@"
 method Test() {
   assert (1 ==>
             2 ==> 
@@ -158,8 +159,8 @@ method Test() {
   }
 
   [Fact]
-  public void FormatWorksForFirstNestedElephantAssignments() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForFirstNestedElephantAssignments() {
+    await FormatterWorksFor(@"
 function TestExpressionParsing(b: bool, n: nat, o1: NatOutcome, o2: NatOutcome): NatOutcome {
   var expr1: nat :- (var x := if b then o1 else o2; x);
   var use_expr1: nat := expr1;
@@ -171,7 +172,7 @@ function TestExpressionParsing(b: bool, n: nat, o1: NatOutcome, o2: NatOutcome):
   }
 
   [Fact]
-  public void FormatterWorksForNestedIfElse() {
+  public async Task FormatterWorksForNestedIfElse() {
     var testCase = @"
 function test(): int {
   if a then
@@ -182,12 +183,12 @@ function test(): int {
     e
 }
 ";
-    FormatterWorksFor(testCase, testCase);
+    await FormatterWorksFor(testCase, testCase);
   }
 
   [Fact]
-  public void FormatterWorksForNestedConstructors() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForNestedConstructors() {
+    await FormatterWorksFor(@"
 function test(): int {
   assert X;
   Some(Result(
@@ -198,8 +199,8 @@ function test(): int {
 ");
   }
   [Fact]
-  public void FormatterWorksForEqualPlus() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForEqualPlus() {
+    await FormatterWorksFor(@"
 function test(a: int, b: int, c: int): int 
   requires a == b + d + e +
                 f + g + h
@@ -208,8 +209,8 @@ function test(a: int, b: int, c: int): int
   }
 
   [Fact]
-  public void FormatterWorksForCommentBeforeElse() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForCommentBeforeElse() {
+    await FormatterWorksFor(@"
 function test(i: int): int {
   if true then
     Class.StaticMethod(argument)
@@ -221,8 +222,8 @@ function test(i: int): int {
   }
 
   [Fact]
-  public void FormatterWorksForElseWithComplexContent() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForElseWithComplexContent() {
+    await FormatterWorksFor(@"
 function Test(value: string): bool {
   if value == """" then Constructor(arg)
   else if value == ""1"" then Constructor1(arg)
@@ -235,8 +236,8 @@ function Test(value: string): bool {
   }
 
   [Fact]
-  public void FormatterWorksForAlignedOrVar() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForAlignedOrVar() {
+    await FormatterWorksFor(@"
 predicate IsBinary(s: seq<int>) {
   forall i | 0 <= i < |s| ::
     || s[i] == 0
@@ -245,8 +246,8 @@ predicate IsBinary(s: seq<int>) {
   }
 
   [Fact]
-  public void FormatterWorksForAlignedAmpVar() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForAlignedAmpVar() {
+    await FormatterWorksFor(@"
 method Test()
   ensures
     && P()
@@ -268,8 +269,8 @@ match A
   }
 
   [Fact]
-  public void FormatterWorksForEqualityOnItsOwnLine() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForEqualityOnItsOwnLine() {
+    await FormatterWorksFor(@"
 function Test(): int {
   if A then
     assert C(a1, b1, c1)
@@ -296,8 +297,8 @@ assert A
   }
 
   [Fact]
-  public void FormatterWorksForMatchInMap() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForMatchInMap() {
+    await FormatterWorksFor(@"
 method AlignMapComplex(a: int) returns (r: map<string, string>) {
   return ComputeMap(map[
                       ""a"" := Compute(
@@ -310,8 +311,8 @@ match a {
   }
 
   [Fact]
-  public void FormatterWorksForSeqSetMapDisplay() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForSeqSetMapDisplay() {
+    await FormatterWorksFor(@"
 function AlignSeq(): seq<seq<int>> {
   [ [ 1, 2, 3 ],
     [ 4,
@@ -344,8 +345,8 @@ function AlignSet(): set<int> {
 
 
   [Fact]
-  public void FormatterWorksForChainingEquality() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForChainingEquality() {
+    await FormatterWorksFor(@"
 
 lemma SeventeenIsNotEven()
   ensures !Even(N(17))
@@ -365,7 +366,7 @@ assert Even(N(17))
 ");
   }
   [Fact]
-  public void FormatterWorksForAligningThenAndElseIfAligned() {
+  public async Task FormatterWorksForAligningThenAndElseIfAligned() {
     var testCase = @"
 predicate Valid()
 {
@@ -376,7 +377,7 @@ predicate Valid()
                                   else data[start..] + data[..start+len-N]
 }
 ";
-    FormatterWorksFor(testCase, testCase);
+    await FormatterWorksFor(testCase, testCase);
   }
 
   public FormatterForExpressions([NotNull] ITestOutputHelper output) : base(output) {
diff --git a/Source/DafnyPipeline.Test/FormatterForMembers.cs b/Source/DafnyPipeline.Test/FormatterForMembers.cs
index 7caa40515a3..aa11489c488 100644
--- a/Source/DafnyPipeline.Test/FormatterForMembers.cs
+++ b/Source/DafnyPipeline.Test/FormatterForMembers.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +8,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForMembers")]
 public class FormatterForMembers : FormatterBaseTest {
   [Fact]
-  public void FormatterWorksForMethodsInModule() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForMethodsInModule() {
+    await FormatterWorksFor(@"
 import opened Test
 module Test {
   method f1<T, U>(a: T, b: U)
@@ -141,8 +142,8 @@ least lemma l2<T>[nat
   }
 
   [Fact]
-  public void FormatWorksForFunctionMethods() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForFunctionMethods() {
+    await FormatterWorksFor(@"
 function Test(): int {
   1
 } by method {
@@ -154,8 +155,8 @@ assert IsScriptForward(edits[..0], |s|) by {
   }
 
   [Fact]
-  public void FormatWorksForFunctionByMethods() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForFunctionByMethods() {
+    await FormatterWorksFor(@"
 function Fib(i: nat): nat {
   1
 } by method {
@@ -171,8 +172,8 @@ function Fib(i: nat): nat {
   }
 
   [Fact]
-  public void FormatWorksConstant() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksConstant() {
+    await FormatterWorksFor(@"
 class T {
   const x
     : int
@@ -183,8 +184,8 @@ const x
 }");
   }
   [Fact]
-  public void FormatterWorksForConstants() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForConstants() {
+    await FormatterWorksFor(@"
 const c :=
   1111111111111111111111111111111111111111
 const ASSIGNED_PLANES := [
@@ -206,8 +207,8 @@ public void FormatterWorksForConstants() {
   }
 
   [Fact]
-  public void FormatterWorksForExtremePredicates() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForExtremePredicates() {
+    await FormatterWorksFor(@"
 lemma Lemma(k: ORDINAL, r: real)
   requires E.P(r)
   requires E.P#[k](r)
@@ -215,8 +216,8 @@ requires E.P(r)
   }
 
   [Fact]
-  public void FormatterWorksForSmokeTest() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForSmokeTest() {
+    await FormatterWorksFor(@"
 include ""../libraries/src/Wrappers.dfy""
 import opened Wrappers
 
diff --git a/Source/DafnyPipeline.Test/FormatterForSpecifications.cs b/Source/DafnyPipeline.Test/FormatterForSpecifications.cs
index 91037888f1a..26cf459e5d4 100644
--- a/Source/DafnyPipeline.Test/FormatterForSpecifications.cs
+++ b/Source/DafnyPipeline.Test/FormatterForSpecifications.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +8,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForSpecifications")]
 public class FormatterForSpecifications : FormatterBaseTest {
   [Fact]
-  public void FormatterWorksForModifyStatements() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForModifyStatements() {
+    await FormatterWorksFor(@"
 method Test() {
   modify x {
     x := 2;
@@ -32,8 +33,8 @@ modify x {
   }
 
   [Fact]
-  public void FormatterWorksForDecreasesInvariantComments() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForDecreasesInvariantComments() {
+    await FormatterWorksFor(@"
 method Test() {
   while X
     decreases true || false
@@ -47,8 +48,8 @@ invariant true || false
   }
 
   [Fact]
-  public void FormatterWorksForAssertAssumeExpectPrintReveal() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForAssertAssumeExpectPrintReveal() {
+    await FormatterWorksFor(@"
 method Test(z: int) {
   assert z == 1;
   assert z == 1
@@ -100,8 +101,8 @@ reveal  P3()
   }
 
   [Fact]
-  public void FormatterWorksForCommentsAndAlignmentAmpStatements() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForCommentsAndAlignmentAmpStatements() {
+    await FormatterWorksFor(@"
 module Test {
   /** A comment
     * Followed by newline
@@ -217,8 +218,8 @@ invariant true
   }
 
   [Fact]
-  public void FormatterWorksForMethodBeforeAClass() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForMethodBeforeAClass() {
+    await FormatterWorksFor(@"
 method Test()
   ensures true || false
   // comment should be between ensures and not attached to true/false
diff --git a/Source/DafnyPipeline.Test/FormatterForStatements.cs b/Source/DafnyPipeline.Test/FormatterForStatements.cs
index c04ea0500d8..d34ce8f5f48 100644
--- a/Source/DafnyPipeline.Test/FormatterForStatements.cs
+++ b/Source/DafnyPipeline.Test/FormatterForStatements.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +8,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForStatements")]
 public class FormatterForStatements : FormatterBaseTest {
   [Fact]
-  public void FormatterWorksForWhileTests() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForWhileTests() {
+    await FormatterWorksFor(@"
 method Test() {
   rs.Close();
   ghost var qc := q.contents;
@@ -56,8 +57,8 @@ invariant q !in wr.footprint
   }
 
   [Fact]
-  public void FormatterWorksForAlternatives() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForAlternatives() {
+    await FormatterWorksFor(@"
 method AlternativeStmt() {
   if
   {
@@ -65,14 +66,14 @@ method AlternativeStmt() {
       print ""odd"";
     case x % 2 == 0 =>
       print ""even"";
-      // That's the last case
+    // That's the last case
   }
   if
   case x % 2 == 1 =>
     print ""odd1"";
   case x % 2 == 0 =>
     print ""even1"";
-    // That's the last case
+  // That's the last case
 }
 
 method AlternativeLoopStmt() {
@@ -83,7 +84,7 @@ method AlternativeLoopStmt() {
       print ""odd2"";
     case x % 2 == 0 =>
       print ""even2"";
-      // That's the last case
+    // That's the last case
   }
   while
     invariant x >= 0
@@ -91,14 +92,14 @@ method AlternativeLoopStmt() {
     print ""odd3"";
   case x % 2 == 0 =>
     print ""even3"";
-    // That's the last case
+  // That's the last case
 }
 ");
   }
 
   [Fact]
-  public void FormatterWorksForElephantOperatorWithoutLHS() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForElephantOperatorWithoutLHS() {
+    await FormatterWorksFor(@"
 method {:test} PassingTestUsingNoLHSAssignOrHalt() {
   :- // Comment 
     expect FailUnless(true);
@@ -108,8 +109,8 @@ public void FormatterWorksForElephantOperatorWithoutLHS() {
   }
 
   [Fact]
-  public void FormatterWorksForPrintStmt() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForPrintStmt() {
+    await FormatterWorksFor(@"
 // Sanity check
 method Main() {
   print FunctionMethodSyntax.CompiledFunction()
@@ -127,8 +128,8 @@ print FunctionMethodSyntax.CompiledFunction()
   }
 
   [Fact]
-  public void FormatterWorksForIfCaseReturn() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForIfCaseReturn() {
+    await FormatterWorksFor(@"
 method Test() {
   if
   case true =>
@@ -142,8 +143,8 @@ method Test() {
 
 
   [Fact]
-  public void FormatterWorksForElephantOperatorInMatch() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForElephantOperatorInMatch() {
+    await FormatterWorksFor(@"
 method execute_external_method(n:nat, m:nat) returns (r:Status)
 {
   match n { // match statement is essential to reproduce the bug
@@ -163,8 +164,8 @@ match m {
   }
 
   [Fact]
-  public void FormatterWorksForBraceAfterArrowAndSimilar() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForBraceAfterArrowAndSimilar() {
+    await FormatterWorksFor(@"
 function Test(): int {
   match s
   case None => (
@@ -184,6 +185,9 @@ match s {
     }
     case 2
       =>
+      var b := 3 by {
+        LemmaCall();
+      }
     case 3 => {
     }
   }
@@ -192,8 +196,8 @@ match s {
   }
 
   [Fact]
-  public void FormatterWorksForLabelsBeforeIf() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForLabelsBeforeIf() {
+    await FormatterWorksFor(@"
 
 method TheBreaker_AllGood(M: int, N: int, O: int)
 {
@@ -208,8 +212,8 @@ method TheBreaker_AllGood(M: int, N: int, O: int)
   }
 
   [Fact]
-  public void FormatterWorksForSkeletonStatement() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForSkeletonStatement() {
+    await FormatterWorksFor(@"
 module ModifyStmtBreak1 refines ModifyStmtBreak0 {
   method W... {
     while true
@@ -232,8 +236,34 @@ modify ... {
   }
 
   [Fact]
-  public void FormatterWorksForDividedBlockStmt() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForReveal() {
+    await FormatterWorksFor(@"
+method Foo() {
+  var x := 3 by {
+    reveal p.q;
+  }
+  x := 4 by {
+    reveal p.q;
+  }
+  match foo {
+    case Some(x) => {
+      reveal x.y;
+      a := b(
+        c,
+        d 
+      );
+    }
+    case None => {
+      a := e;
+    }
+  }
+}
+");
+  }
+
+  [Fact]
+  public async Task FormatterWorksForDividedBlockStmt() {
+    await FormatterWorksFor(@"
 class X {
   constructor Init(x: nat)
   {
@@ -246,8 +276,8 @@ constructor Init(x: nat)
   }
 
   [Fact]
-  public void FormatterWorksForControlFlow() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForControlFlow() {
+    await FormatterWorksFor(@"
 method ControlFlowTest() {
   while
     decreases O - k;
@@ -264,8 +294,8 @@ method ControlFlowTest() {
 ");
   }
   [Fact]
-  public void FormatterWorksForIfInLemma() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForIfInLemma() {
+    await FormatterWorksFor(@"
 lemma AlltokenSpec(i: int)
   requires Valid()
   decreases |allTokens|
@@ -281,8 +311,8 @@ requires Valid()
   }
 
   [Fact]
-  public void FormatterWorksForParticularCase() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForParticularCase() {
+    await FormatterWorksFor(@"
 module Test {
   lemma ProveMeThis(i: nat)
   {
@@ -312,8 +342,8 @@ lemma ProveMeThis(i: nat)
 ");
   }
   [Fact]
-  public void FormatterWorksForUsualMatchCasePatterns() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForUsualMatchCasePatterns() {
+    await FormatterWorksFor(@"
 method test() {
   match x {
     case 1 => Bring(
@@ -337,7 +367,7 @@ [ 1
   };
 }
 ", reduceBlockiness: true);
-    FormatterWorksFor(@"
+    await FormatterWorksFor(@"
 method test() {
   var longName := match x {
                     case 1 => World(
@@ -359,7 +389,7 @@ [ 1
 ", reduceBlockiness: false);
   }
   [Fact]
-  public void FormatterWorksForLabels() {
+  public async Task FormatterWorksForLabels() {
     var test = @"
 method BreakLabels(s: seq<int>)
   requires |s| == 1000
@@ -432,7 +462,7 @@ method Test() {
   }
 }
 ";
-    FormatterWorksFor(test, test);
+    await FormatterWorksFor(test, test);
   }
 
   public FormatterForStatements([NotNull] ITestOutputHelper output) : base(output) {
diff --git a/Source/DafnyPipeline.Test/FormatterForTopLevelDeclarations.cs b/Source/DafnyPipeline.Test/FormatterForTopLevelDeclarations.cs
index d5429cfed98..4b7ab482c7b 100644
--- a/Source/DafnyPipeline.Test/FormatterForTopLevelDeclarations.cs
+++ b/Source/DafnyPipeline.Test/FormatterForTopLevelDeclarations.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +8,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForTopLevelDeclarations")]
 public class FormatterForTopLevelDeclarations : FormatterBaseTest {
   [Fact]
-  public void FormatterWorksForEmptyDocument() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForEmptyDocument() {
+    await FormatterWorksFor(@"
 /*
 module S0 refines R {
   // This module defines a local g().  It takes precedence over the g() that
@@ -23,8 +24,8 @@ function g(): int { 2 }
   }
 
   [Fact]
-  public void FormatWorksForSingleInclude() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForSingleInclude() {
+    await FormatterWorksFor(@"
 // RUN
 
 include ""git-issue48-include.dfyi""
@@ -32,18 +33,40 @@ public void FormatWorksForSingleInclude() {
 ");
   }
   [Fact]
-  public void FormatterWorksForMultipleModules() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForMultipleModules() {
+    await FormatterWorksFor(@"
+/* Comment about module */
+@Compile(
+  false
+)
+@Options(
+  ""-functionSyntax:4""
+)
 module Outer.A {
   import B
   import C
   const a := B.b + C.c
+  @Compile(false)
+  module Inner {
+  }
+  @Compile(false)
+  class Test {
+  }
+  @Compile(false)
+  trait TestTrait {
+  }
+
+  @Compile(false)
+  datatype TestDatatype = TestDatatype
+
+  @Compile(false)
+  type T = TestDatatype
 }");
   }
 
   [Fact]
-  public void FormatterWorksForIteratorRequiresComment() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForIteratorRequiresComment() {
+    await FormatterWorksFor(@"
 iterator Iter(x: int) yields (y: int)
   requires A: 0 <= x
   // yield requires B: 0 <= y  // not allowed; won't parse
@@ -53,8 +76,8 @@ iterator Iter(x: int) yields (y: int)
   }
 
   [Fact]
-  public void FormatWorksForTypes() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForTypes() {
+    await FormatterWorksFor(@"
 type NoWitness_EffectlessArrow<!A(!new), B> = f: A ~> B  // error: cannot find witness
   | forall a :: f.reads(a) == {}
  
@@ -82,8 +105,8 @@ witness 2
   }
 
   [Fact]
-  public void FormatWorksForNewTypes() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForNewTypes() {
+    await FormatterWorksFor(@"
 newtype X
   = i : int
   | || i == 2
@@ -104,8 +127,11 @@ newtype Y
   }
 
   [Fact]
-  public void FormatWorksForModules() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForModules() {
+    await FormatterWorksFor(@"
+include ""test.dfy""
+
+@Compile(true)
 module AM { class A {}
             class B {} }
 
@@ -144,7 +170,7 @@ export X
              L4
     provides L5
            , L6
-             // Comment
+    // Comment
     provides
       L7, L8
     provides
@@ -161,7 +187,7 @@ extends A1
             M4
     reveals M5
           , M6
-            // Comment
+    // Comment
     reveals
       M7, M8
     reveals
@@ -183,8 +209,8 @@ function X(): int
   }
 
   [Fact]
-  public void FormatWorksForSimpleIterator() {
-    FormatterWorksFor(@"
+  public async Task FormatWorksForSimpleIterator() {
+    await FormatterWorksFor(@"
 iterator Gen(start: int) yields (x: int)
   yield ensures |xs| <= 10 && x == start + |xs| - 1
 {
@@ -198,8 +224,8 @@ iterator Gen(start: int) yields (x: int)
 ");
   }
   [Fact]
-  public void FormatterWorksForModules() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForModules() {
+    await FormatterWorksFor(@"
 module Tests {
 class C {
   function F(c: C, d: D): bool { true }
@@ -217,8 +243,8 @@ method M(x: int)
   }
 
   [Fact]
-  public void FormatterWorksForClassExtend() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForClassExtend() {
+    await FormatterWorksFor(@"
 class A
   extends B<
     C<
@@ -254,8 +280,8 @@ class W extends  AA2,
 ");
   }
   [Fact]
-  public void FormatterWorksForAbstractModuleDecl() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForAbstractModuleDecl() {
+    await FormatterWorksFor(@"
 abstract module C {
   export Body provides AF reveals g
  
@@ -264,8 +290,8 @@ export Body provides AF reveals g
 ");
   }
   [Fact]
-  public void FormatterWorksForNewtypeWithMember() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForNewtypeWithMember() {
+    await FormatterWorksFor(@"
 newtype Even = x : int | x % 2 == 0
 {
   method {:timeLimitMultiplier 4} NewtypeTest(y:int) {
@@ -283,8 +309,8 @@ type Opaque<
   }
 
   [Fact]
-  public void FormatterWorksForCppExample() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForCppExample() {
+    await FormatterWorksFor(@"
 // RUN: %dafny /compile:3 /spillTargetCode:2 /compileTarget:cpp ExternDefs.h ""%s"" > ""%t""
 // RUN: %diff ""%s.expect"" ""%t""
 
@@ -338,8 +364,8 @@ method Main() {
   }
 
   [Fact]
-  public void FormatterWorksForRefinedMethod() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForRefinedMethod() {
+    await FormatterWorksFor(@"
 method M... 
 {
   if ... {}
diff --git a/Source/DafnyPipeline.Test/FormatterIssues.cs b/Source/DafnyPipeline.Test/FormatterIssues.cs
index 7cfd8e3a5f8..64d61409885 100644
--- a/Source/DafnyPipeline.Test/FormatterIssues.cs
+++ b/Source/DafnyPipeline.Test/FormatterIssues.cs
@@ -1,4 +1,7 @@
-using JetBrains.Annotations;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +10,8 @@ namespace DafnyPipeline.Test;
 [Collection("Singleton Test Collection - FormatterForTopLevelDeclarations")]
 public class FormatterIssues : FormatterBaseTest {
   [Fact]
-  public void GitIssue4269FormatLemmaIde() {
-    FormatterWorksFor(@"
+  public async Task GitIssue4269FormatLemmaIde() {
+    await FormatterWorksFor(@"
 module Foo {
   lemma Bar(t: string)
   {
@@ -19,8 +22,8 @@ lemma Bar(t: string)
   }
 
   [Fact]
-  public void GitIssue4269BFormatMapIde() {
-    FormatterWorksFor(@"
+  public async Task GitIssue4269BFormatMapIde() {
+    await FormatterWorksFor(@"
 module Foo {
   method Bar(
     a: map<string, string>,
@@ -32,8 +35,8 @@ method Bar(
   }
 
   [Fact]
-  public void GitIssue3912FormatterCollectionArrow() {
-    FormatterWorksFor(@"
+  public async Task GitIssue3912FormatterCollectionArrow() {
+    await FormatterWorksFor(@"
 const i :=
   a in
     B + // Previously it was not indented
@@ -46,8 +49,8 @@ b in
   }
 
   [Fact]
-  public void GitIssue3912FormatterCollectionArrowA() {
-    FormatterWorksFor(@"
+  public async Task GitIssue3912FormatterCollectionArrowA() {
+    await FormatterWorksFor(@"
 const newline :=
   set
     i <-
@@ -73,8 +76,8 @@ set i <-
   }
 
   [Fact]
-  public void GitIssue3912FormatterCollectionArrowB() {
-    FormatterWorksFor(@"
+  public async Task GitIssue3912FormatterCollectionArrowB() {
+    await FormatterWorksFor(@"
 const newlineOp :=
   set
     i
@@ -92,8 +95,8 @@ public void GitIssue3912FormatterCollectionArrowB() {
   }
 
   [Fact]
-  public void GitIssue3912FormatterCollectionArrowC() {
-    FormatterWorksFor(@"
+  public async Task GitIssue3912FormatterCollectionArrowC() {
+    await FormatterWorksFor(@"
 const sameLineOp :=
   set i
     <-
@@ -109,8 +112,8 @@ set i
   }
 
   [Fact]
-  public void GitIssue3960FormattingIssueForallStatements() {
-    FormatterWorksFor(@"
+  public async Task GitIssue3960FormattingIssueForallStatements() {
+    await FormatterWorksFor(@"
 lemma Lemma()
 {
   forall pd0: int
@@ -124,8 +127,8 @@ ensures true {
   }
 
   [Fact]
-  public void GitIssue3944FormatterArgumentsDefaultValue() {
-    FormatterWorksFor(@"
+  public async Task GitIssue3944FormatterArgumentsDefaultValue() {
+    await FormatterWorksFor(@"
 function Example(
   newNames : map<string, string> := map[],
   a: int
@@ -137,8 +140,8 @@ function Example(
   }
 
   [Fact]
-  public void GitIssue3790DafnyFormatterProducesIncorrectIndentation() {
-    FormatterWorksFor(@"
+  public async Task GitIssue3790DafnyFormatterProducesIncorrectIndentation() {
+    await FormatterWorksFor(@"
 lemma Try(i: int)
 {
   match i {
@@ -150,8 +153,8 @@ match i {
   }
 
   [Fact]
-  public void FormatterWorksForEmptyDocument() {
-    FormatterWorksFor(@"
+  public async Task FormatterWorksForEmptyDocument() {
+    await FormatterWorksFor(@"
 ", null, true);
   }
 
diff --git a/Source/DafnyPipeline.Test/ImplicitAssertionTest.cs b/Source/DafnyPipeline.Test/ImplicitAssertionTest.cs
index 8ee481c8475..77fda90c97b 100644
--- a/Source/DafnyPipeline.Test/ImplicitAssertionTest.cs
+++ b/Source/DafnyPipeline.Test/ImplicitAssertionTest.cs
@@ -2,20 +2,18 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using Bpl = Microsoft.Boogie;
 using Xunit;
 using Microsoft.Dafny;
-using Microsoft.Dafny.ProofObligationDescription;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 
 namespace DafnyPipeline.Test;
 
 [Collection("Dafny implicit assertion test")]
 public class ImplicitAssertionTest {
   [Fact]
-  public void GitIssue4016ExplicitAssertionPrintNested() {
-    ShouldHaveImplicitCode(@"
+  public async Task GitIssue4016ExplicitAssertionPrintNested() {
+    await ShouldHaveImplicitCode(@"
 datatype D = C(value: int) | N
 
 function Test(e: D, inputs: map<int, int>): bool {
@@ -28,8 +26,8 @@ match e
   }
 
   [Fact]
-  public void DivisionByZero() {
-    ShouldHaveImplicitCode(@"
+  public async Task DivisionByZero() {
+    await ShouldHaveImplicitCode(@"
 method Test(x: int, y: int) returns (z: int) {
   z := 2 / (x + y); // Here
 }
@@ -37,8 +35,8 @@ method Test(x: int, y: int) returns (z: int) {
   }
 
   [Fact]
-  public void CompilableAssignSuchThat() {
-    ShouldHaveImplicitCode(@"
+  public async Task CompilableAssignSuchThat() {
+    await ShouldHaveImplicitCode(@"
 predicate P(x: int, c: int)
  
 function Test(x: int, z: int): int
@@ -51,8 +49,8 @@ requires P(x, z) && x <= z
   }
 
   [Fact]
-  public void AssignmentSuchThatShouldExist() {
-    ShouldHaveImplicitCode(@"
+  public async Task AssignmentSuchThatShouldExist() {
+    await ShouldHaveImplicitCode(@"
 predicate P(x: int)
  
 lemma PUnique(a: int)
@@ -68,8 +66,8 @@ function Test(x: int): int
   }
 
   [Fact]
-  public void SeqIndexOutOfRange() {
-    ShouldHaveImplicitCode(@"
+  public async Task SeqIndexOutOfRange() {
+    await ShouldHaveImplicitCode(@"
 method Test(a: int -> seq<int>, i: int) {
   var b := a(2)[i + 3]; // Here
 }
@@ -77,8 +75,8 @@ method Test(a: int -> seq<int>, i: int) {
   }
 
   [Fact]
-  public void SeqIndexOutOfRangeUpdate() {
-    ShouldHaveImplicitCode(@"
+  public async Task SeqIndexOutOfRangeUpdate() {
+    await ShouldHaveImplicitCode(@"
 method Test(a: int -> seq<int>, i: int) {
   var b := a(2)[i + 3 := 1]; // Here
 }
@@ -86,8 +84,8 @@ method Test(a: int -> seq<int>, i: int) {
   }
 
   [Fact]
-  public void SeqSliceLowerOutOfRange() {
-    ShouldHaveImplicitCode(@"
+  public async Task SeqSliceLowerOutOfRange() {
+    await ShouldHaveImplicitCode(@"
 method Test(a: int -> seq<int>, i: int) {
   var b := a(2)[i + 3..]; // Here
 }
@@ -95,8 +93,8 @@ method Test(a: int -> seq<int>, i: int) {
   }
 
   [Fact]
-  public void SeqUpperOutOfRange() {
-    ShouldHaveImplicitCode(@"
+  public async Task SeqUpperOutOfRange() {
+    await ShouldHaveImplicitCode(@"
 method Test(a: int -> seq<int>, i: int, j: int) {
   var b := a(2)[j..i + 3]; // Here
 }
@@ -104,8 +102,8 @@ method Test(a: int -> seq<int>, i: int, j: int) {
   }
 
   [Fact]
-  public void ArrayIndexOutOfRange() {
-    ShouldHaveImplicitCode(@"
+  public async Task ArrayIndexOutOfRange() {
+    await ShouldHaveImplicitCode(@"
 method Test(a: int -> array<int>, i: int) {
   var b := a(2)[i + 3]; // Here
 }
@@ -113,8 +111,8 @@ method Test(a: int -> array<int>, i: int) {
   }
 
   [Fact]
-  public void ArrayIndex0OutOfRange() {
-    ShouldHaveImplicitCode(@"
+  public async Task ArrayIndex0OutOfRange() {
+    await ShouldHaveImplicitCode(@"
 method Test(a: int -> array2<int>, i: int) {
   var b := a(2)[i + 3, i + 4]; // Here
 }
@@ -122,8 +120,8 @@ method Test(a: int -> array2<int>, i: int) {
   }
 
   [Fact]
-  public void ArrayIndex1OutOfRange() {
-    ShouldHaveImplicitCode(@"
+  public async Task ArrayIndex1OutOfRange() {
+    await ShouldHaveImplicitCode(@"
 method Test(a: int -> array2<int>, i: int) {
   var b := a(2)[i + 3, i + 4]; // Here
 }
@@ -131,8 +129,8 @@ method Test(a: int -> array2<int>, i: int) {
   }
 
   [Fact]
-  public void ElementNotInDomain() {
-    ShouldHaveImplicitCode(@"
+  public async Task ElementNotInDomain() {
+    await ShouldHaveImplicitCode(@"
 method Test(m: map<int, int>, x: int) {
   var b := m[x + 2]; // Here
 }
@@ -141,7 +139,7 @@ method Test(m: map<int, int>, x: int) {
   /** Look at the line containing "// Here", and for every assertion there,
   look if they contain an implicit assertion that, if printed,
   would generate the string "expected" */
-  private void ShouldHaveImplicitCode(string program, string expected, DafnyOptions options = null) {
+  private async Task ShouldHaveImplicitCode(string program, string expected, DafnyOptions options = null) {
     if (program.IndexOf("// Here", StringComparison.Ordinal) == -1) {
       Assert.Fail("Test is missing // Here");
     }
@@ -150,25 +148,26 @@ private void ShouldHaveImplicitCode(string program, string expected, DafnyOption
     options = options ?? new DafnyOptions(TextReader.Null, TextWriter.Null, TextWriter.Null);
     var uri = new Uri("virtual:///virtual");
     BatchErrorReporter reporter = new BatchErrorReporter(options);
-    var dafnyProgram = new ProgramParser().Parse(program, uri, reporter);
-    if (reporter.ErrorCount > 0) {
+    var parseResult = await new ProgramParser().Parse(program, uri, reporter);
+    var dafnyProgram = parseResult.Program;
+    if (reporter.HasErrors) {
       var error = reporter.AllMessagesByLevel[ErrorLevel.Error][0];
       Assert.False(true, $"{error.Message}: line {error.Token.line} col {error.Token.col}");
     }
     DafnyMain.Resolve(dafnyProgram);
-    if (reporter.ErrorCount > 0) {
+    if (reporter.HasErrors) {
       var error = reporter.AllMessagesByLevel[ErrorLevel.Error][0];
       Assert.False(true, $"{error.Message}: line {error.Token.line} col {error.Token.col}");
     }
 
-    var boogiePrograms = DafnyDriver.Translate(options, dafnyProgram).ToList();
+    var boogiePrograms = SynchronousCliCompilation.Translate(options, dafnyProgram).ToList();
     Assert.Single(boogiePrograms);
     var boogieProgram = boogiePrograms[0].Item2;
     var encountered = new List<string>();
     var found = false;
     foreach (var implementation in boogieProgram.Implementations) {
       foreach (var block in implementation.Blocks) {
-        foreach (var cmd in block.cmds) {
+        foreach (var cmd in block.Cmds) {
           if (cmd is Bpl.AssertCmd { tok: { line: var line } } assertCmd && line == expectedLine) {
             if (assertCmd.Description is ProofObligationDescription description) {
               var assertedExpr = description.GetAssertedExpr(options);
diff --git a/Source/DafnyPipeline.Test/InterMethodVerificationStability.cs b/Source/DafnyPipeline.Test/InterMethodVerificationStability.cs
index 0298cee3ede..1af428485c3 100644
--- a/Source/DafnyPipeline.Test/InterMethodVerificationStability.cs
+++ b/Source/DafnyPipeline.Test/InterMethodVerificationStability.cs
@@ -131,8 +131,8 @@ modify heap {
 +         assume k#0_0 < x#0;
 -         x#1_0 := LitInt(0);
 +         a#1_0 := LitInt(0);
--         assume !(exists eg$y#1: int :: eg$y#1 < x#0);
-+         assume !(exists eg$k#1: int :: eg$k#1 < x#0);
+-         assume {:id ""id2""} !(exists eg$y#1: int :: eg$y#1 < x#0);
++         assume {:id ""id2""} !(exists eg$k#1: int :: eg$k#1 < x#0);
 -         y#2_0 := LitInt(0);
 +         b#2_0 := LitInt(0);
 -         x#3_0 := LitInt(2);
@@ -191,7 +191,7 @@ public InterMethodVerificationStability(ITestOutputHelper output) {
     }
 
     private static string DafnyProjectFile => Path.Combine(dafnyDirectory, "Source", "Dafny", "Dafny.csproj");
-    private static string DefaultDafnyArgs => $"run --no-build --project {DafnyProjectFile} -- -useBaseNameForFileName -compileVerbose:0 /errorTrace:0";
+    private static string DefaultDafnyArgs => $"run --no-build --project \"{DafnyProjectFile}\" -- -useBaseNameForFileName -compileVerbose:0 /errorTrace:0";
 
     string GetBoogie(string dafnyProgram, string optionalFileName = null) {
       string fileName = optionalFileName ?? Path.GetTempFileName() + ".dfy";
diff --git a/Source/DafnyPipeline.Test/IntraMethodVerificationStability.cs b/Source/DafnyPipeline.Test/IntraMethodVerificationStability.cs
index 3d5fd272f72..7e4066fd740 100644
--- a/Source/DafnyPipeline.Test/IntraMethodVerificationStability.cs
+++ b/Source/DafnyPipeline.Test/IntraMethodVerificationStability.cs
@@ -1,13 +1,16 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using DafnyCore.Test;
 using DafnyTestGeneration;
 using Microsoft.Boogie;
 using Microsoft.Dafny;
 using Xunit;
 using Xunit.Abstractions;
 using BoogieProgram = Microsoft.Boogie.Program;
+using Token = Microsoft.Boogie.Token;
 
 namespace DafnyPipeline.Test {
   // Main.Resolve has static shared state (TypeConstraint.ErrorsToBeReported for example)
@@ -147,15 +150,16 @@ public IntraMethodVerificationStability(ITestOutputHelper testOutputHelper) {
     }
 
     [Fact]
-    public void NoUniqueLinesWhenConcatenatingUnrelatedPrograms() {
-      var options = DafnyOptions.Create(new WriterFromOutputHelper(testOutputHelper));
-
-      var regularBoogie = GetBoogie(options, originalProgram).ToList();
-      var renamedBoogie = GetBoogie(options, renamedProgram).ToList();
-      var regularBoogieText = GetBoogieText(options, regularBoogie);
-      var renamedBoogieText = GetBoogieText(options, renamedBoogie);
+    public async Task NoUniqueLinesWhenConcatenatingUnrelatedPrograms() {
+      var options = DafnyOptions.CreateUsingOldParser((TextWriter)new WriterFromOutputHelper(testOutputHelper));
+      Regex idAttributeRegex = new Regex("{:id \".*\"}");
+
+      var regularBoogie = await GetBoogie(options, originalProgram);
+      var renamedBoogie = await GetBoogie(options, renamedProgram);
+      var regularBoogieText = idAttributeRegex.Replace(GetBoogieText(options, regularBoogie), "");
+      var renamedBoogieText = idAttributeRegex.Replace(GetBoogieText(options, renamedBoogie), "");
       var separate = UniqueNonCommentLines(regularBoogieText + renamedBoogieText);
-      var combinedBoogie = GetBoogieText(options, GetBoogie(options, originalProgram + renamedProgram));
+      var combinedBoogie = idAttributeRegex.Replace(GetBoogieText(options, await GetBoogie(options, originalProgram + renamedProgram)), "");
       var together = UniqueNonCommentLines(combinedBoogie);
 
       var uniqueLines = separate.Union(together).Except(separate.Intersect(together)).ToList();
@@ -164,32 +168,32 @@ public void NoUniqueLinesWhenConcatenatingUnrelatedPrograms() {
 
     [Fact]
     public async Task EqualProverLogWhenReorderingProgram() {
-      var options = DafnyOptions.Create(new WriterFromOutputHelper(testOutputHelper));
+      var options = DafnyOptions.CreateUsingOldParser((TextWriter)new WriterFromOutputHelper(testOutputHelper));
       options.ProcsToCheck.Add("SomeMethod*");
 
-      var reorderedProverLog = await GetProverLogForProgramAsync(options, GetBoogie(options, reorderedProgram));
-      var regularProverLog = await GetProverLogForProgramAsync(options, GetBoogie(options, originalProgram));
+      var reorderedProverLog = await GetProverLogForProgramAsync(options, await GetBoogie(options, reorderedProgram));
+      var regularProverLog = await GetProverLogForProgramAsync(options, await GetBoogie(options, originalProgram));
       Assert.Equal(regularProverLog, reorderedProverLog);
     }
 
     [Fact]
     public async Task EqualProverLogWhenRenamingProgram() {
-      var options = DafnyOptions.Create(new WriterFromOutputHelper(testOutputHelper));
+      var options = DafnyOptions.CreateUsingOldParser((TextWriter)new WriterFromOutputHelper(testOutputHelper));
       options.ProcsToCheck.Add("*SomeMethod*");
 
-      var renamedProverLog = await GetProverLogForProgramAsync(options, GetBoogie(options, renamedProgram));
-      var regularProverLog = await GetProverLogForProgramAsync(options, GetBoogie(options, originalProgram));
+      var renamedProverLog = await GetProverLogForProgramAsync(options, await GetBoogie(options, renamedProgram));
+      var regularProverLog = await GetProverLogForProgramAsync(options, await GetBoogie(options, originalProgram));
       Assert.Equal(regularProverLog, renamedProverLog);
     }
 
     [Fact]
     public async Task EqualProverLogWhenAddingUnrelatedProgram() {
 
-      var options = DafnyOptions.Create(new WriterFromOutputHelper(testOutputHelper));
+      var options = DafnyOptions.CreateUsingOldParser((TextWriter)new WriterFromOutputHelper(testOutputHelper));
       options.ProcsToCheck.Add("*SomeMethod *");
 
-      var renamedProverLog = await GetProverLogForProgramAsync(options, GetBoogie(options, renamedProgram + originalProgram));
-      var regularProverLog = await GetProverLogForProgramAsync(options, GetBoogie(options, originalProgram));
+      var renamedProverLog = await GetProverLogForProgramAsync(options, await GetBoogie(options, renamedProgram + originalProgram));
+      var regularProverLog = await GetProverLogForProgramAsync(options, await GetBoogie(options, originalProgram));
       Assert.Equal(regularProverLog, renamedProverLog);
     }
 
@@ -206,15 +210,18 @@ private async IAsyncEnumerable<string> GetProverLogsForProgramAsync(DafnyOptions
       var temp1 = directory + "/proverLog";
       testOutputHelper.WriteLine("proverLog: " + temp1);
       options.ProverLogFilePath = temp1;
+      options.ProcessSolverOptions(new ErrorReporterSink(options), Microsoft.Dafny.Token.NoToken);
       using (var engine = ExecutionEngine.CreateWithoutSharedCache(options)) {
         foreach (var boogieProgram in boogiePrograms) {
-          var (outcome, _) = await DafnyMain.BoogieOnce(options, options.OutputWriter, engine, "", "", boogieProgram, "programId");
+          var (outcome, _) = await DafnyMain.BoogieOnce(new ErrorReporterSink(options),
+            options, options.OutputWriter, engine, "", "", boogieProgram, "programId");
           testOutputHelper.WriteLine("outcome: " + outcome);
         }
       }
       foreach (var proverFile in Directory.GetFiles(directory)) {
         yield return await File.ReadAllTextAsync(proverFile);
       }
+      Directory.Delete(directory, true);
     }
 
     ISet<string> UniqueNonCommentLines(string input) {
@@ -232,13 +239,13 @@ string GetBoogieText(CoreOptions options, IEnumerable<BoogieProgram> boogieProgr
       return string.Join('\n', boogieProgram.Select(x => PrintBoogie(options, x)));
     }
 
-    IEnumerable<BoogieProgram> GetBoogie(DafnyOptions options, string dafnyProgramText) {
-      var dafnyProgram = Utils.Parse(options, dafnyProgramText, false);
-      BatchErrorReporter reporter = (BatchErrorReporter)dafnyProgram.Reporter;
+    async Task<IReadOnlyList<BoogieProgram>> GetBoogie(DafnyOptions options, string dafnyProgramText) {
+      var reporter = new BatchErrorReporter(options);
+      var dafnyProgram = await Utils.Parse(reporter, dafnyProgramText, false);
       Assert.NotNull(dafnyProgram);
       DafnyMain.Resolve(dafnyProgram);
       Assert.Equal(0, reporter.ErrorCount);
-      return Translator.Translate(dafnyProgram, reporter).Select(t => t.Item2).ToList();
+      return BoogieGenerator.Translate(dafnyProgram, reporter).Select(t => t.Item2).ToList();
     }
   }
 }
diff --git a/Source/DafnyPipeline.Test/Issue1355.cs b/Source/DafnyPipeline.Test/Issue1355.cs
index 8ac93cd5c8e..cbdcc292d67 100644
--- a/Source/DafnyPipeline.Test/Issue1355.cs
+++ b/Source/DafnyPipeline.Test/Issue1355.cs
@@ -1,4 +1,6 @@
 using System.IO;
+using System.Threading.Tasks;
+using DafnyCore.Test;
 using DafnyTestGeneration;
 using Bpl = Microsoft.Boogie;
 using BplParser = Microsoft.Boogie.Parser;
@@ -18,14 +20,14 @@ public Issue1355(ITestOutputHelper output) {
     }
 
     [Fact]
-    public void Test() {
-      var options = DafnyOptions.Create(output);
+    public async Task Test() {
+      var options = DafnyOptions.CreateUsingOldParser(output);
       options.DafnyPrelude = "../../../../../Binaries/DafnyPrelude.bpl";
 
       var programString = @"trait Trait<A, B> { }";
-      var dafnyProgram = Utils.Parse(options, programString, false);
+      var dafnyProgram = await Utils.Parse(new BatchErrorReporter(options), programString, false);
       DafnyMain.Resolve(dafnyProgram);
-      foreach (var prog in Translator.Translate(dafnyProgram, dafnyProgram.Reporter)) {
+      foreach (var prog in BoogieGenerator.Translate(dafnyProgram, dafnyProgram.Reporter)) {
         var writer = new StringWriter();
         var tokenWriter = new Bpl.TokenTextWriter("virtual", writer, true, options);
         prog.Item2.Emit(tokenWriter);
diff --git a/Source/DafnyPipeline.Test/PluginsTest.cs b/Source/DafnyPipeline.Test/PluginsTest.cs
index 7cfa42bbe93..a509509a3ed 100644
--- a/Source/DafnyPipeline.Test/PluginsTest.cs
+++ b/Source/DafnyPipeline.Test/PluginsTest.cs
@@ -2,6 +2,8 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
+using DafnyCore.Test;
 using DafnyTestGeneration;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -54,15 +56,15 @@ private string GetLibrary(string name) {
   }
 
   [Fact]
-  public void EnsurePluginIsExecuted() {
+  public async Task EnsurePluginIsExecuted() {
     var library = GetLibrary("rewriterPreventingVerificationWithArgument");
 
-    var options = DafnyOptions.Create(output);
+    var options = DafnyOptions.CreateUsingOldParser(output);
     options.Plugins.Add(AssemblyPlugin.Load(library, new string[] { "because whatever" }));
 
     var programString = "function test(): int { 1 }";
-    var dafnyProgram = Utils.Parse(options, programString, false);
-    BatchErrorReporter reporter = (BatchErrorReporter)dafnyProgram.Reporter;
+    var reporter = new BatchErrorReporter(options);
+    var dafnyProgram = await Utils.Parse(reporter, programString, false);
     DafnyMain.Resolve(dafnyProgram);
 
     Assert.Equal(1, reporter.Count(ErrorLevel.Error));
@@ -70,30 +72,30 @@ public void EnsurePluginIsExecuted() {
   }
 
   [Fact]
-  public void EnsurePluginIsExecutedEvenWithoutConfiguration() {
+  public async Task EnsurePluginIsExecutedEvenWithoutConfiguration() {
     var library = GetLibrary("rewriterPreventingVerification");
 
-    var options = DafnyOptions.Create(output);
+    var options = DafnyOptions.CreateUsingOldParser(output);
     options.Plugins.Add(AssemblyPlugin.Load(library, new string[] { "ignored arguments" }));
 
     var programString = "function test(): int { 1 }";
-    var dafnyProgram = Utils.Parse(options, programString, false);
-    BatchErrorReporter reporter = (BatchErrorReporter)dafnyProgram.Reporter;
+    var reporter = new BatchErrorReporter(options);
+    var dafnyProgram = await Utils.Parse(reporter, programString, false);
     DafnyMain.Resolve(dafnyProgram);
     Assert.Equal(1, reporter.ErrorCount);
     Assert.Equal("Impossible to continue", reporter.AllMessagesByLevel[ErrorLevel.Error][0].Message);
   }
 
   [Fact]
-  public void EnsurePluginIsExecutedAndAllowsVerification() {
+  public async Task EnsurePluginIsExecutedAndAllowsVerification() {
     var library = GetLibrary("rewriterAllowingVerification");
 
-    var options = DafnyOptions.Create(output);
+    var options = DafnyOptions.CreateUsingOldParser(output);
     options.Plugins.Add(AssemblyPlugin.Load(library, new string[] { "ignored arguments" }));
 
     var programString = "function test(): int { 1 }";
-    var dafnyProgram = Utils.Parse(options, programString, false);
-    BatchErrorReporter reporter = (BatchErrorReporter)dafnyProgram.Reporter;
+    var reporter = new BatchErrorReporter(options);
+    var dafnyProgram = await Utils.Parse(reporter, programString, false);
     DafnyMain.Resolve(dafnyProgram);
     Assert.Equal(0, reporter.ErrorCountUntilResolver);
     Assert.Equal(1, reporter.ErrorCount);
diff --git a/Source/DafnyPipeline.Test/ProverLogStability.cs b/Source/DafnyPipeline.Test/ProverLogStability.cs
new file mode 100644
index 00000000000..18b4e529a75
--- /dev/null
+++ b/Source/DafnyPipeline.Test/ProverLogStability.cs
@@ -0,0 +1,164 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using DafnyCore.Test;
+using DafnyTestGeneration;
+using Microsoft.Boogie;
+using Microsoft.Dafny;
+using Xunit;
+using Xunit.Abstractions;
+using BoogieProgram = Microsoft.Boogie.Program;
+
+namespace DafnyPipeline.Test {
+  // Main.Resolve has static shared state (TypeConstraint.ErrorsToBeReported for example)
+  // so we can't execute tests that use it in parallel.
+  [Collection("Singleton Test Collection - Resolution")]
+  public class ProverLogStabilityTest {
+
+    private readonly ITestOutputHelper testOutputHelper;
+
+    // All types of top level declarations.
+    readonly string originalProgram = @"
+module SomeModule {
+
+  module NestedModule {
+    class C {
+      var f: int
+      constructor ()
+    }
+  }
+
+  method m() ensures false {
+    var x: NestedModule.C;
+    x := new NestedModule.C();
+    x.f := 4;
+  }
+}
+
+import opened SomeModule
+
+type FooSynonym<T> = FooClass
+
+class FooClass {
+  var f: int
+  var c: NestedModule.C
+ 
+  constructor ()
+}
+
+datatype Friends = Agnes | Agatha | Jermaine
+
+function SomeFunc(funcFormal: int, foo: FooClass): nat 
+  reads foo, foo.c 
+  ensures SomeFunc(funcFormal, foo) == foo.c.f
+{ 
+  3
+}
+
+method SomeMethod(methodFormal: int) returns (result: bool)
+  requires methodFormal == 2
+  ensures result == (methodFormal == 2) 
+  // ensures forall x :: x == methodFormal
+{
+  m();
+  var lambdaExpr := x => x + 1;
+  var c := new FooClass();
+  result := methodFormal == SomeFunc(42, c);
+}
+
+datatype ImapSimulator_<!A, B> = ImapSimulator(
+  input: iset<A>,
+  apply: A --> B)
+{
+  ghost predicate Valid() {
+    forall i <- input :: apply.requires(i)
+  }
+}
+
+type ImapSimulator<!A, B> =
+  X: ImapSimulator_<A, B> |
+  X.Valid() witness ImapSimulator(iset{}, (x: A) requires false => match() {})
+";
+
+    public ProverLogStabilityTest(ITestOutputHelper testOutputHelper) {
+      this.testOutputHelper = testOutputHelper;
+    }
+
+    private static bool updateProverLog = false; // Should always be false in committed code
+
+    /// <summary>
+    /// This test is meant to detect _any_ changes in Dafny's verification behavior.
+    /// Dafny's verification is powered by an SMT solver. For difficult inputs, such solvers may change their behavior,
+    /// both in performance and outcome, even when tiny non-semantic changes such as changes in variable names,
+    /// are made in the input.
+    ///
+    /// To detect whether it is possible that the verification of Dafny proofs has changed,
+    /// this test compares the input Dafny sends to the SMT solver against what it was sending previously.
+    ///
+    /// If this test fails, that means a change was made to Dafny that changes the SMT input it sends.
+    /// If this was intentional, you should update this test's expect file with the new SMT input.
+    /// To do so, set the static field above "updateProverLog" to true, run this test, set the flag back to false, and
+    /// run the test again to verify it works.
+    /// The git history of updates to this test allows us to easily see when Dafny's verification has changed.
+    ///
+    /// If you make a change to Dafny verification and this test does not fail, then likely the Dafny code in the test
+    /// does not sufficiently cover the language to detect your change. In that case, please update the test so it does.
+    /// 
+    /// Note that this test does not detect changes in DafnyPrelude.bpl
+    /// 
+    /// </summary>
+    [Fact]
+    public async Task ProverLogRegression() {
+      var options = DafnyOptions.CreateUsingOldParser(new WriterFromOutputHelper(testOutputHelper));
+
+      var filePath = Path.Combine(Directory.GetCurrentDirectory(), "expectedProverLog.smt2");
+      var expectation = await File.ReadAllTextAsync(filePath);
+      expectation = expectation.Replace("\r", "");
+      var regularProverLog = await GetProverLogForProgramAsync(options, await GetBoogie(options, originalProgram));
+      regularProverLog = regularProverLog.Replace("\r", "");
+      if (updateProverLog) {
+        var path = Path.GetFullPath(filePath).Replace("bin" + Path.DirectorySeparatorChar + "Debug" + Path.DirectorySeparatorChar + "net8.0" + Path.DirectorySeparatorChar, "");
+        await File.WriteAllTextAsync(path, regularProverLog);
+        await Console.Out.WriteLineAsync("Updated prover log file at " + path);
+      } else {
+        Assert.Equal(expectation, regularProverLog);
+      }
+    }
+
+    private async Task<string> GetProverLogForProgramAsync(DafnyOptions options, IEnumerable<Microsoft.Boogie.Program> boogiePrograms) {
+      var logs = await GetProverLogsForProgramAsync(options, boogiePrograms).ToListAsync();
+      Assert.Single(logs);
+      return logs[0];
+    }
+
+    private async IAsyncEnumerable<string> GetProverLogsForProgramAsync(DafnyOptions options,
+      IEnumerable<BoogieProgram> boogiePrograms) {
+      string directory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+      Directory.CreateDirectory(directory);
+      var temp1 = directory + "/proverLog";
+      options.ProverLogFilePath = temp1;
+      options.ProcessSolverOptions(new ErrorReporterSink(options), Microsoft.Dafny.Token.NoToken);
+      using (var engine = ExecutionEngine.CreateWithoutSharedCache(options)) {
+        foreach (var boogieProgram in boogiePrograms) {
+          var (outcome, _) = await DafnyMain.BoogieOnce(new ErrorReporterSink(options),
+            options, options.OutputWriter, engine, "", "", boogieProgram, "programId");
+        }
+      }
+      foreach (var proverFile in Directory.GetFiles(directory)) {
+        yield return await File.ReadAllTextAsync(proverFile);
+      }
+      Directory.Delete(directory, true);
+    }
+
+    async Task<IReadOnlyList<BoogieProgram>> GetBoogie(DafnyOptions options, string dafnyProgramText) {
+      var reporter = new BatchErrorReporter(options);
+      var dafnyProgram = await Utils.Parse(reporter, dafnyProgramText, false);
+      Assert.NotNull(dafnyProgram);
+      DafnyMain.Resolve(dafnyProgram);
+      Assert.Equal(0, reporter.ErrorCount);
+      return BoogieGenerator.Translate(dafnyProgram, reporter).Select(t => t.Item2).ToList();
+    }
+  }
+}
diff --git a/Source/DafnyPipeline.Test/RelativePaths.cs b/Source/DafnyPipeline.Test/RelativePaths.cs
index 4d71cc07d1d..93137346320 100644
--- a/Source/DafnyPipeline.Test/RelativePaths.cs
+++ b/Source/DafnyPipeline.Test/RelativePaths.cs
@@ -1,4 +1,6 @@
 using System.IO;
+using System.Threading.Tasks;
+using DafnyCore.Test;
 using Microsoft.Dafny;
 using Xunit;
 using Xunit.Abstractions;
@@ -14,9 +16,9 @@ public RelativePaths(ITestOutputHelper output) {
     }
 
     [Fact]
-    public void Test() {
-      Assert.Equal(0, DafnyDriver.MainWithWriters(output, output,
-        TextReader.Null, new[] { "/spillTargetCode:3", "warnings-as-errors.dfy" }));
+    public async Task Test() {
+      Assert.Equal(0, await DafnyBackwardsCompatibleCli.MainWithWriters(output, output,
+        TextReader.Null, new[] { "/spillTargetCode:3", "testFile2.dfy" }));
     }
 
     [Fact]
diff --git a/Source/DafnyPipeline.Test/TranslatorTest.cs b/Source/DafnyPipeline.Test/TranslatorTest.cs
index db22b3ad29d..bb55852ab6c 100644
--- a/Source/DafnyPipeline.Test/TranslatorTest.cs
+++ b/Source/DafnyPipeline.Test/TranslatorTest.cs
@@ -1,13 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.Collections.Generic;
 using Bpl = Microsoft.Boogie;
 using Xunit;
 using Microsoft.Dafny;
-using Microsoft.Dafny.ProofObligationDescription;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 
 namespace DafnyPipeline.Test;
 
@@ -15,8 +9,8 @@ namespace DafnyPipeline.Test;
 public class TranslatorTest {
 
   private void Expect(Bpl.Expr expr, bool isAlwaysTrue, bool isAlwaysFalse) {
-    Assert.Equal(isAlwaysTrue, Translator.IsExprAlways(expr, true));
-    Assert.Equal(isAlwaysFalse, Translator.IsExprAlways(expr, false));
+    Assert.Equal(isAlwaysTrue, BoogieGenerator.IsExprAlways(expr, true));
+    Assert.Equal(isAlwaysFalse, BoogieGenerator.IsExprAlways(expr, false));
   }
 
   [Fact]
diff --git a/Source/DafnyPipeline.Test/Trivia.cs b/Source/DafnyPipeline.Test/Trivia.cs
index be312c3e598..0585a21ef1f 100644
--- a/Source/DafnyPipeline.Test/Trivia.cs
+++ b/Source/DafnyPipeline.Test/Trivia.cs
@@ -3,6 +3,8 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using DafnyCore.Test;
 using DafnyTestGeneration;
 using Bpl = Microsoft.Boogie;
 using BplParser = Microsoft.Boogie.Parser;
@@ -25,8 +27,8 @@ enum Newlines { LF, CR, CRLF };
     private Newlines currentNewlines;
 
     [Fact]
-    public void TriviaSplitWorksOnLinuxMacAndWindows() {
-      var options = DafnyOptions.Create(output);
+    public async Task TriviaSplitWorksOnLinuxMacAndWindows() {
+      var options = DafnyOptions.CreateUsingOldParser(output);
       foreach (Newlines newLinesType in Enum.GetValues(typeof(Newlines))) {
         currentNewlines = newLinesType;
         var programString = @"
@@ -40,33 +42,28 @@ trait Trait1 { }
 // Just a comment
 trait Trait2 extends Trait1
 // Trait docstring
-{ }
-// This is attached to trait2
-// This is also attached to trait2
+{ } /*
+This is attached to trait2
+This is also attached to trait2 */
 
 // This is attached to n
-type n = x: int | x % 2 == 0
-// This is attached to n as well
+type n = x: int | x % 2 == 0 // This docstring is attached to n
 
 // Just a comment
 class Class1 extends Trait1
 // Class docstring
-{ }
-// This is attached to the class
+{ } // This is attached to the class
 
 // Comment attached to c
-const c := 2;
-// Docstring attached to c
+const c := 2 // Docstring attached to c
 
 // This is attached to f
-function f(): int
-// This is f docstring
+function f(): int // This is f docstring
 ensures true
 { 1 }
 
 /** This is the docstring */
-function g(): int
-// This is not the docstring
+function g(): int // This is not the docstring
 ensures true
 { 1 }
 
@@ -78,8 +75,8 @@ ensures true
 ";
         programString = AdjustNewlines(programString);
 
-        var dafnyProgram = Utils.Parse(options, programString, false);
-        var reporter = dafnyProgram.Reporter;
+        var reporter = new BatchErrorReporter(options);
+        var dafnyProgram = await Utils.Parse(reporter, programString, false);
         Assert.Equal(0, reporter.ErrorCount);
         var topLevelDecls = dafnyProgram.DefaultModuleDef.TopLevelDecls.ToList();
         Assert.Equal(6, topLevelDecls.Count());
@@ -100,15 +97,15 @@ ensures true
         Assert.NotNull(trait1.StartToken.Next);
         Assert.Equal("Trait1", trait1.StartToken.Next.val);
 
-        AssertTrivia(moduleTest, "\n// Comment ∈ before\n", " // Module docstring\n");
-        AssertTrivia(trait1, "/** Trait docstring */\n", " ");
-        AssertTrivia(trait2, "// Just a comment\n", "\n// Trait docstring\n");
-        AssertTrivia(subsetType, "// This is attached to n\n", "\n// This is attached to n as well\n\n");
-        AssertTrivia(class1, "// Just a comment\n", "\n// Class docstring\n");
-        AssertTrivia(c, "// Comment attached to c\n", "\n// Docstring attached to c\n\n");
-        AssertTrivia(f, "// This is attached to f\n", "\n// This is f docstring\n");
-        AssertTrivia(g, "/** This is the docstring */\n", "\n// This is not the docstring\n");
-        AssertTrivia(m, "// Just a regular comment\n", "\n// This is the docstring\n");
+        AssertTrivia(moduleTest, "\n// Comment ∈ before\n", "// Module docstring");
+        AssertTrivia(trait1, "\n/** Trait docstring */\n", "/** Trait docstring */");
+        AssertTrivia(trait2, "\n// Just a comment\n", "// Trait docstring");
+        AssertTrivia(subsetType, "\n\n// This is attached to n\n", "// This docstring is attached to n");
+        AssertTrivia(class1, "\n// Just a comment\n", "// Class docstring");
+        AssertTrivia(c, "\n// Comment attached to c\n", "// Docstring attached to c");
+        AssertTrivia(f, "\n// This is attached to f\n", "// This is f docstring");
+        AssertTrivia(g, "\n/** This is the docstring */\n", "/** This is the docstring */");
+        AssertTrivia(m, "\n// Just a regular comment\n", "// This is the docstring");
 
         TestTokens(dafnyProgram);
       }
@@ -118,7 +115,7 @@ ensures true
     // and that every token from start to end of every program child
     // is owned by a node.
     private void TestTokens(Node program) {
-      var allTokens = new HashSet<IToken>();
+      var allTokens = new HashSet<IOrigin>();
 
       void Traverse(INode node) {
         foreach (var ownedToken in node.OwnedTokens) {
@@ -157,14 +154,13 @@ private string AdjustNewlines(string programString) {
       };
     }
 
-    private void AssertTrivia(TopLevelDecl topLevelDecl, string triviaBefore, string triviaDoc) {
+    private void AssertTrivia(Node topLevelDecl, string triviaBefore, string triviaDoc) {
       Assert.Equal(AdjustNewlines(triviaBefore), topLevelDecl.StartToken.LeadingTrivia);
-      Assert.Equal(AdjustNewlines(triviaDoc), topLevelDecl.TokenWithTrailingDocString.TrailingTrivia);
-    }
-
-    private void AssertTrivia(MemberDecl topLevelDecl, string triviaBefore, string triviaDoc) {
-      Assert.Equal(AdjustNewlines(triviaBefore), topLevelDecl.StartToken.LeadingTrivia);
-      Assert.Equal(AdjustNewlines(triviaDoc), topLevelDecl.TokenWithTrailingDocString.TrailingTrivia);
+      if (topLevelDecl is IHasDocstring hasDocstring) {
+        Assert.Equal(AdjustNewlines(triviaDoc), hasDocstring.GetTriviaContainingDocstring());
+      } else {
+        Assert.True(false);
+      }
     }
   }
 }
diff --git a/Source/DafnyPipeline.Test/WriterFromOutputHelper.cs b/Source/DafnyPipeline.Test/WriterFromOutputHelper.cs
deleted file mode 100644
index c8159df29ef..00000000000
--- a/Source/DafnyPipeline.Test/WriterFromOutputHelper.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-#nullable enable
-using System.IO;
-using System.Text;
-using Xunit.Abstractions;
-
-public class WriterFromOutputHelper : TextWriter {
-  private readonly ITestOutputHelper output;
-  private bool failed = false;
-
-  public WriterFromOutputHelper(ITestOutputHelper output) {
-    this.output = output;
-  }
-
-  public override void Write(char value) {
-    if (!failed) {
-      failed = true;
-      WriteLine("Error: tried to write a single character, which WriterFromOutputHelper does not support.");
-    }
-  }
-
-  public override Encoding Encoding => Encoding.Default;
-
-  public override void WriteLine(string? value) {
-    output.WriteLine(value);
-  }
-
-  public override void WriteLine(string format, params object?[] arg) {
-    output.WriteLine(format, arg);
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyPipeline.Test/_plugins/rewriterAllowingVerification.cs b/Source/DafnyPipeline.Test/_plugins/rewriterAllowingVerification.cs
index ec02578b6ab..8b03e6f4233 100644
--- a/Source/DafnyPipeline.Test/_plugins/rewriterAllowingVerification.cs
+++ b/Source/DafnyPipeline.Test/_plugins/rewriterAllowingVerification.cs
@@ -5,6 +5,6 @@ public class RewriterAllowingVerification : Rewriter {
   public RewriterAllowingVerification(ErrorReporter reporter) : base(reporter) { }
 
   public override void PostResolve(Program program) {
-    Reporter.Error(MessageSource.Compiler, program.GetFirstTopLevelToken(), "Verification may proceed");
+    Reporter.Error(MessageSource.Compiler, program.GetStartOfFirstFileToken(), "Verification may proceed");
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyPipeline.Test/_plugins/rewriterPreventingVerification.cs b/Source/DafnyPipeline.Test/_plugins/rewriterPreventingVerification.cs
index 5e90e01f1ce..732e4bed834 100644
--- a/Source/DafnyPipeline.Test/_plugins/rewriterPreventingVerification.cs
+++ b/Source/DafnyPipeline.Test/_plugins/rewriterPreventingVerification.cs
@@ -5,6 +5,6 @@ public class RewriterPreventingVerification : Rewriter {
   public RewriterPreventingVerification(ErrorReporter reporter) : base(reporter) { }
 
   public override void PostResolve(ModuleDefinition moduleDefinition) {
-    Reporter.Error(MessageSource.Resolver, moduleDefinition.tok, "Impossible to continue");
+    Reporter.Error(MessageSource.Resolver, moduleDefinition.Origin, "Impossible to continue");
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyPipeline.Test/_plugins/rewriterPreventingVerificationWithArgument.cs b/Source/DafnyPipeline.Test/_plugins/rewriterPreventingVerificationWithArgument.cs
index 5526ebce156..cf778c86d5a 100644
--- a/Source/DafnyPipeline.Test/_plugins/rewriterPreventingVerificationWithArgument.cs
+++ b/Source/DafnyPipeline.Test/_plugins/rewriterPreventingVerificationWithArgument.cs
@@ -19,6 +19,6 @@ public RewriterPreventingVerificationWithArgument(ErrorReporter reporter, TestCo
   }
 
   public override void PostResolve(ModuleDefinition moduleDefinition) {
-    Reporter.Error(MessageSource.Resolver, moduleDefinition.tok, "Impossible to continue " + configuration.Argument);
+    Reporter.Error(MessageSource.Resolver, moduleDefinition.Origin, "Impossible to continue " + configuration.Argument);
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyPipeline.Test/coverlet.runsettings b/Source/DafnyPipeline.Test/coverlet.runsettings
new file mode 100644
index 00000000000..11c8afc63f8
--- /dev/null
+++ b/Source/DafnyPipeline.Test/coverlet.runsettings
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat Code Coverage">
+        <Configuration>
+          <Exclude>[*]DAST.*,[*]DCOMP.*</Exclude>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
diff --git a/Source/DafnyPipeline.Test/expectedProverLog.smt2 b/Source/DafnyPipeline.Test/expectedProverLog.smt2
new file mode 100644
index 00000000000..b855c64809d
--- /dev/null
+++ b/Source/DafnyPipeline.Test/expectedProverLog.smt2
@@ -0,0 +1,1932 @@
+(set-option :print-success false)
+(set-info :smt-lib-version 2.6)
+(set-option :auto_config false)
+(set-option :type_check true)
+(set-option :smt.qi.eager_threshold 100)
+(set-option :smt.delay_units true)
+(set-option :model_evaluator.completion true)
+(set-option :model.completion true)
+(set-option :model.compact false)
+(set-option :smt.case_split 3)
+(set-option :smt.mbqi false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+(set-option :smt.arith.solver 2)
+; done setting options
+
+
+(set-info :category "industrial")
+(declare-sort |T@U| 0)
+(declare-sort |T@T| 0)
+(declare-fun real_pow (Real Real) Real)
+(declare-fun UOrdering2 (|T@U| |T@U|) Bool)
+(declare-fun UOrdering3 (|T@T| |T@U| |T@U|) Bool)
+(declare-fun tickleBool (Bool) Bool)
+(assert (and (tickleBool true) (tickleBool false)))
+(declare-fun $generated () T@U)
+(declare-fun $generated@@0 () T@U)
+(declare-fun $generated@@1 () T@U)
+(declare-fun $generated@@2 () T@U)
+(declare-fun $generated@@3 () T@U)
+(declare-fun $generated@@4 () T@U)
+(declare-fun $generated@@5 () T@U)
+(declare-fun $generated@@6 () T@U)
+(declare-fun $generated@@7 () T@U)
+(declare-fun $generated@@8 (T@T) Int)
+(declare-fun $generated@@9 () T@T)
+(declare-fun $generated@@10 () T@T)
+(declare-fun $generated@@11 () T@T)
+(declare-fun $generated@@12 (Bool) T@U)
+(declare-fun $generated@@13 (T@U) Bool)
+(declare-fun $generated@@14 (Int) T@U)
+(declare-fun $generated@@15 (T@U) Int)
+(declare-fun $generated@@16 (Real) T@U)
+(declare-fun $generated@@17 (T@U) Real)
+(declare-fun $generated@@24 (T@U) Int)
+(declare-fun $generated@@25 (T@U) T@U)
+(declare-fun $generated@@26 (T@U) T@U)
+(declare-fun $generated@@27 (T@T T@U T@U) Bool)
+(declare-fun $generated@@28 () T@T)
+(declare-fun $generated@@29 () T@U)
+(declare-fun $generated@@30 () T@U)
+(declare-fun $generated@@31 (T@U) T@U)
+(declare-fun $generated@@33 (T@T T@U T@U T@U) Bool)
+(declare-fun $generated@@34 () T@U)
+(declare-fun $generated@@37 () T@U)
+(declare-fun $generated@@38 (T@U T@U) T@U)
+(declare-fun $generated@@39 (T@U) Bool)
+(declare-fun $generated@@40 (T@T T@U) T@U)
+(declare-fun $generated@@41 (T@T T@T T@U T@U) T@U)
+(declare-fun $generated@@42 () T@T)
+(declare-fun $generated@@43 () T@T)
+(declare-fun $generated@@44 (T@T T@T) T@T)
+(declare-fun $generated@@45 (T@T T@T T@U T@U T@U) T@U)
+(declare-fun $generated@@46 (T@T) T@T)
+(declare-fun $generated@@47 (T@T) T@T)
+(declare-fun $generated@@67 (T@U T@U) Bool)
+(declare-fun $generated@@71 (Int) Int)
+(declare-fun $generated@@73 (T@T T@U) T@U)
+(declare-fun $generated@@76 (T@T T@U) T@U)
+(declare-fun $generated@@79 (T@U) Bool)
+(declare-fun $generated@@91 (T@U) T@U)
+(declare-fun $generated@@98 (T@T T@T T@T T@U T@U T@U) T@U)
+(declare-fun $generated@@99 (T@U T@U T@U Bool) T@U)
+(declare-fun $generated@@100 (T@T T@T T@T T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@136 (T@U) T@U)
+(assert  (and (and (and (and (and (and (and (and (= ($generated@@8 $generated@@9) 0) (= ($generated@@8 $generated@@10) 1)) (= ($generated@@8 $generated@@11) 2)) (forall (($generated@@18 Bool) ) (! (= ($generated@@13 ($generated@@12 $generated@@18)) $generated@@18)
+ :pattern ( ($generated@@12 $generated@@18))
+))) (forall (($generated@@19 T@U) ) (! (= ($generated@@12 ($generated@@13 $generated@@19)) $generated@@19)
+ :pattern ( ($generated@@13 $generated@@19))
+))) (forall (($generated@@20 Int) ) (! (= ($generated@@15 ($generated@@14 $generated@@20)) $generated@@20)
+ :pattern ( ($generated@@14 $generated@@20))
+))) (forall (($generated@@21 T@U) ) (! (= ($generated@@14 ($generated@@15 $generated@@21)) $generated@@21)
+ :pattern ( ($generated@@15 $generated@@21))
+))) (forall (($generated@@22 Real) ) (! (= ($generated@@17 ($generated@@16 $generated@@22)) $generated@@22)
+ :pattern ( ($generated@@16 $generated@@22))
+))) (forall (($generated@@23 T@U) ) (! (= ($generated@@16 ($generated@@17 $generated@@23)) $generated@@23)
+ :pattern ( ($generated@@17 $generated@@23))
+))))
+(assert (distinct $generated $generated@@0 $generated@@1 $generated@@2 $generated@@3 $generated@@4 $generated@@5 $generated@@6 $generated@@7)
+)
+(assert (= ($generated@@24 $generated@@1) 0))
+(assert (= ($generated@@25 $generated) $generated@@0))
+(assert (= ($generated@@26 $generated@@1) $generated@@2))
+(assert (= ($generated@@8 $generated@@28) 3))
+(assert (forall (($generated@@32 T@U) ) (! (= ($generated@@27 $generated@@28 $generated@@32 $generated@@29)  (or (= $generated@@32 $generated@@30) (= ($generated@@31 $generated@@32) $generated@@29)))
+ :pattern ( ($generated@@27 $generated@@28 $generated@@32 $generated@@29))
+)))
+(assert (forall (($generated@@35 T@U) ($generated@@36 T@U) ) (! (= ($generated@@33 $generated@@28 $generated@@35 $generated@@34 $generated@@36) ($generated@@33 $generated@@28 $generated@@35 $generated@@29 $generated@@36))
+ :pattern ( ($generated@@33 $generated@@28 $generated@@35 $generated@@34 $generated@@36))
+)))
+(assert (= ($generated@@24 $generated@@37) 0))
+(assert (= ($generated@@38 $generated@@4 $generated@@7) $generated@@37))
+(assert  (not ($generated@@39 $generated@@37)))
+(assert  (and (and (and (and (and (and (forall (($generated@@48 T@T) ($generated@@49 T@T) ($generated@@50 T@U) ($generated@@51 T@U) ($generated@@52 T@U) ) (! (= ($generated@@41 $generated@@48 $generated@@49 ($generated@@45 $generated@@48 $generated@@49 $generated@@51 $generated@@52 $generated@@50) $generated@@52) $generated@@50)
+ :weight 0
+)) (forall (($generated@@53 T@T) ($generated@@54 T@T) ($generated@@55 T@U) ($generated@@56 T@U) ($generated@@57 T@U) ($generated@@58 T@U) ) (!  (or (= $generated@@57 $generated@@58) (= ($generated@@41 $generated@@53 $generated@@54 ($generated@@45 $generated@@53 $generated@@54 $generated@@56 $generated@@57 $generated@@55) $generated@@58) ($generated@@41 $generated@@53 $generated@@54 $generated@@56 $generated@@58)))
+ :weight 0
+))) (= ($generated@@8 $generated@@42) 4)) (= ($generated@@8 $generated@@43) 5)) (forall (($generated@@59 T@T) ($generated@@60 T@T) ) (= ($generated@@8 ($generated@@44 $generated@@59 $generated@@60)) 6))) (forall (($generated@@61 T@T) ($generated@@62 T@T) ) (! (= ($generated@@46 ($generated@@44 $generated@@61 $generated@@62)) $generated@@61)
+ :pattern ( ($generated@@44 $generated@@61 $generated@@62))
+))) (forall (($generated@@63 T@T) ($generated@@64 T@T) ) (! (= ($generated@@47 ($generated@@44 $generated@@63 $generated@@64)) $generated@@64)
+ :pattern ( ($generated@@44 $generated@@63 $generated@@64))
+))))
+(assert (forall (($generated@@65 T@U) ($generated@@66 T@U) ) (! (= ($generated@@33 $generated@@28 $generated@@65 $generated@@29 $generated@@66)  (or (= $generated@@65 $generated@@30) ($generated@@13 ($generated@@40 $generated@@9 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@66 $generated@@65) $generated@@1)))))
+ :pattern ( ($generated@@33 $generated@@28 $generated@@65 $generated@@29 $generated@@66))
+)))
+(assert (forall (($generated@@68 T@U) ($generated@@69 T@U) ) (!  (=> ($generated@@67 $generated@@68 $generated@@69) (forall (($generated@@70 T@U) ) (!  (=> ($generated@@13 ($generated@@40 $generated@@9 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@68 $generated@@70) $generated@@1))) ($generated@@13 ($generated@@40 $generated@@9 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@69 $generated@@70) $generated@@1))))
+ :pattern ( ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@69 $generated@@70) $generated@@1))
+)))
+ :pattern ( ($generated@@67 $generated@@68 $generated@@69))
+)))
+(assert (forall (($generated@@72 Int) ) (! (= ($generated@@71 $generated@@72) $generated@@72)
+ :pattern ( ($generated@@71 $generated@@72))
+)))
+(assert (forall (($generated@@74 T@U) ($generated@@75 T@T) ) (! (= ($generated@@73 $generated@@75 $generated@@74) $generated@@74)
+ :pattern ( ($generated@@73 $generated@@75 $generated@@74))
+)))
+(assert (forall (($generated@@77 T@U) ($generated@@78 T@T) ) (! (= ($generated@@76 $generated@@78 ($generated@@40 $generated@@78 $generated@@77)) $generated@@77)
+ :pattern ( ($generated@@40 $generated@@78 $generated@@77))
+)))
+(assert ($generated@@39 $generated@@1))
+(assert (forall (($generated@@80 T@U) ($generated@@81 T@U) ) (!  (=> (and (and ($generated@@79 $generated@@80) (and (or (not (= $generated@@81 $generated@@30)) (not true)) (= ($generated@@31 $generated@@81) $generated@@29))) ($generated@@13 ($generated@@40 $generated@@9 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@80 $generated@@81) $generated@@1)))) ($generated@@33 $generated@@10 ($generated@@40 $generated@@10 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@80 $generated@@81) $generated@@37)) $generated $generated@@80))
+ :pattern ( ($generated@@40 $generated@@10 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@80 $generated@@81) $generated@@37)))
+)))
+(assert (forall (($generated@@82 T@U) ($generated@@83 T@U) ($generated@@84 T@U) ($generated@@85 T@U) ($generated@@86 T@T) ) (!  (=> ($generated@@67 $generated@@82 $generated@@83) (=> ($generated@@33 $generated@@86 $generated@@84 $generated@@85 $generated@@82) ($generated@@33 $generated@@86 $generated@@84 $generated@@85 $generated@@83)))
+ :pattern ( ($generated@@67 $generated@@82 $generated@@83) ($generated@@33 $generated@@86 $generated@@84 $generated@@85 $generated@@82))
+)))
+(assert (forall (($generated@@87 T@U) ) (! (= ($generated@@27 $generated@@28 $generated@@87 $generated@@34)  (and ($generated@@27 $generated@@28 $generated@@87 $generated@@29) (or (not (= $generated@@87 $generated@@30)) (not true))))
+ :pattern ( ($generated@@27 $generated@@28 $generated@@87 $generated@@34))
+ :pattern ( ($generated@@27 $generated@@28 $generated@@87 $generated@@29))
+)))
+(assert (forall (($generated@@88 T@U) ($generated@@89 T@U) ($generated@@90 T@U) ) (!  (=> (or (not (= $generated@@88 $generated@@90)) (not true)) (=> (and ($generated@@67 $generated@@88 $generated@@89) ($generated@@67 $generated@@89 $generated@@90)) ($generated@@67 $generated@@88 $generated@@90)))
+ :pattern ( ($generated@@67 $generated@@88 $generated@@89) ($generated@@67 $generated@@89 $generated@@90))
+)))
+(assert (forall (($generated@@92 T@U) ($generated@@93 T@U) ) (!  (and (= ($generated@@91 ($generated@@38 $generated@@92 $generated@@93)) $generated@@92) (= ($generated@@26 ($generated@@38 $generated@@92 $generated@@93)) $generated@@93))
+ :pattern ( ($generated@@38 $generated@@92 $generated@@93))
+)))
+(assert (forall (($generated@@94 T@U) ($generated@@95 T@T) ) (! (= ($generated@@40 $generated@@95 ($generated@@76 $generated@@95 $generated@@94)) $generated@@94)
+ :pattern ( ($generated@@76 $generated@@95 $generated@@94))
+)))
+(assert (forall (($generated@@96 T@U) ($generated@@97 T@U) ) (!  (=> (and ($generated@@79 $generated@@96) (and (or (not (= $generated@@97 $generated@@30)) (not true)) (= ($generated@@31 $generated@@97) $generated@@29))) ($generated@@27 $generated@@10 ($generated@@40 $generated@@10 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@96 $generated@@97) $generated@@37)) $generated))
+ :pattern ( ($generated@@40 $generated@@10 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@96 $generated@@97) $generated@@37)))
+)))
+(assert  (and (forall (($generated@@101 T@T) ($generated@@102 T@T) ($generated@@103 T@T) ($generated@@104 T@U) ($generated@@105 T@U) ($generated@@106 T@U) ($generated@@107 T@U) ) (! (= ($generated@@98 $generated@@101 $generated@@102 $generated@@103 ($generated@@100 $generated@@101 $generated@@102 $generated@@103 $generated@@105 $generated@@106 $generated@@107 $generated@@104) $generated@@106 $generated@@107) $generated@@104)
+ :weight 0
+)) (and (forall (($generated@@108 T@T) ($generated@@109 T@T) ($generated@@110 T@T) ($generated@@111 T@U) ($generated@@112 T@U) ($generated@@113 T@U) ($generated@@114 T@U) ($generated@@115 T@U) ($generated@@116 T@U) ) (!  (or (= $generated@@113 $generated@@115) (= ($generated@@98 $generated@@108 $generated@@109 $generated@@110 ($generated@@100 $generated@@108 $generated@@109 $generated@@110 $generated@@112 $generated@@113 $generated@@114 $generated@@111) $generated@@115 $generated@@116) ($generated@@98 $generated@@108 $generated@@109 $generated@@110 $generated@@112 $generated@@115 $generated@@116)))
+ :weight 0
+)) (forall (($generated@@117 T@T) ($generated@@118 T@T) ($generated@@119 T@T) ($generated@@120 T@U) ($generated@@121 T@U) ($generated@@122 T@U) ($generated@@123 T@U) ($generated@@124 T@U) ($generated@@125 T@U) ) (!  (or (= $generated@@123 $generated@@125) (= ($generated@@98 $generated@@117 $generated@@118 $generated@@119 ($generated@@100 $generated@@117 $generated@@118 $generated@@119 $generated@@121 $generated@@122 $generated@@123 $generated@@120) $generated@@124 $generated@@125) ($generated@@98 $generated@@117 $generated@@118 $generated@@119 $generated@@121 $generated@@124 $generated@@125)))
+ :weight 0
+)))))
+(assert (forall (($generated@@126 T@U) ($generated@@127 T@U) ($generated@@128 T@U) ($generated@@129 Bool) ($generated@@130 T@U) ($generated@@131 T@U) ) (! (= ($generated@@13 ($generated@@98 $generated@@28 $generated@@42 $generated@@9 ($generated@@99 $generated@@126 $generated@@127 $generated@@128 $generated@@129) $generated@@130 $generated@@131))  (=> (and (or (not (= $generated@@130 $generated@@126)) (not true)) ($generated@@13 ($generated@@40 $generated@@9 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@127 $generated@@130) $generated@@128)))) $generated@@129))
+ :pattern ( ($generated@@98 $generated@@28 $generated@@42 $generated@@9 ($generated@@99 $generated@@126 $generated@@127 $generated@@128 $generated@@129) $generated@@130 $generated@@131))
+)))
+(assert (forall (($generated@@132 T@U) ($generated@@133 T@U) ($generated@@134 T@U) ($generated@@135 T@U) ) (!  (=> ($generated@@79 ($generated@@45 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@132 $generated@@133 ($generated@@45 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@132 $generated@@133) $generated@@134 $generated@@135))) ($generated@@67 $generated@@132 ($generated@@45 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@132 $generated@@133 ($generated@@45 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@132 $generated@@133) $generated@@134 $generated@@135))))
+ :pattern ( ($generated@@45 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@132 $generated@@133 ($generated@@45 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@132 $generated@@133) $generated@@134 $generated@@135)))
+)))
+(assert (= ($generated@@25 $generated@@34) $generated@@3))
+(assert (= ($generated@@136 $generated@@34) $generated@@6))
+(assert (= ($generated@@25 $generated@@29) $generated@@5))
+(assert (= ($generated@@136 $generated@@29) $generated@@6))
+(assert (forall (($generated@@137 Int) ) (! (= ($generated@@76 $generated@@10 ($generated@@14 ($generated@@71 $generated@@137))) ($generated@@73 $generated@@43 ($generated@@76 $generated@@10 ($generated@@14 $generated@@137))))
+ :pattern ( ($generated@@76 $generated@@10 ($generated@@14 ($generated@@71 $generated@@137))))
+)))
+(assert (forall (($generated@@138 T@U) ($generated@@139 T@T) ) (! (= ($generated@@76 $generated@@139 ($generated@@73 $generated@@139 $generated@@138)) ($generated@@73 $generated@@43 ($generated@@76 $generated@@139 $generated@@138)))
+ :pattern ( ($generated@@76 $generated@@139 ($generated@@73 $generated@@139 $generated@@138)))
+)))
+(assert (forall (($generated@@140 T@U) ($generated@@141 T@U) ) (! ($generated@@33 $generated@@10 $generated@@141 $generated $generated@@140)
+ :pattern ( ($generated@@33 $generated@@10 $generated@@141 $generated $generated@@140))
+)))
+(assert (forall (($generated@@142 T@U) ) (! ($generated@@27 $generated@@10 $generated@@142 $generated)
+ :pattern ( ($generated@@27 $generated@@10 $generated@@142 $generated))
+)))
+(push 1)
+(declare-fun ControlFlow (Int Int) Int)
+(declare-fun $generated@@143 () T@U)
+(declare-fun $generated@@144 () T@U)
+(declare-fun $generated@@145 () Bool)
+(declare-fun $generated@@146 () T@U)
+(declare-fun $generated@@147 () T@U)
+(declare-fun $generated@@148 () T@U)
+(declare-fun $generated@@149 (T@U) Bool)
+(declare-fun $generated@@150 () T@U)
+(declare-fun $generated@@151 () Int)
+(declare-fun $generated@@152 () T@U)
+(declare-fun $generated@@153 () T@U)
+(set-option :timeout 0)
+(set-option :rlimit 0)
+(set-option :auto_config false)
+(set-option :type_check true)
+(set-option :smt.qi.eager_threshold 100)
+(set-option :smt.delay_units true)
+(set-option :model_evaluator.completion true)
+(set-option :model.completion true)
+(set-option :model.compact false)
+(set-option :smt.case_split 3)
+(set-option :smt.mbqi false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+(set-option :smt.arith.solver 2)
+(assert (not
+ (=> (= (ControlFlow 0 0) 6) (let (($generated@@154  (=> (and (= $generated@@143 ($generated@@99 $generated@@30 $generated@@144 $generated@@1 false)) (=> $generated@@145 (and ($generated@@27 $generated@@28 $generated@@146 $generated@@34) ($generated@@33 $generated@@28 $generated@@146 $generated@@34 $generated@@144)))) (=> (and (and (or (not (= $generated@@147 $generated@@30)) (not true)) (and ($generated@@27 $generated@@28 $generated@@147 $generated@@34) ($generated@@33 $generated@@28 $generated@@147 $generated@@34 $generated@@144))) (and ($generated@@79 $generated@@148) ($generated@@149 $generated@@148))) (=> (and (and (and (or (not (= $generated@@150 $generated@@30)) (not true)) (and ($generated@@27 $generated@@28 $generated@@150 $generated@@34) ($generated@@33 $generated@@28 $generated@@150 $generated@@34 $generated@@148))) (not ($generated@@13 ($generated@@40 $generated@@9 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@144 $generated@@150) $generated@@1))))) (and (forall (($generated@@155 T@U) ) (!  (=> (and (or (not (= $generated@@155 $generated@@30)) (not true)) ($generated@@13 ($generated@@40 $generated@@9 ($generated@@41 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@144 $generated@@155) $generated@@1)))) (= ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@148 $generated@@155) ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@144 $generated@@155)))
+ :pattern ( ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@148 $generated@@155))
+)) ($generated@@67 $generated@@144 $generated@@148))) (and (=> (= (ControlFlow 0 2) (- 0 5)) true) (and (=> (= (ControlFlow 0 2) (- 0 4)) (or (not (= $generated@@150 $generated@@30)) (not true))) (=> (or (not (= $generated@@150 $generated@@30)) (not true)) (and (=> (= (ControlFlow 0 2) (- 0 3)) ($generated@@13 ($generated@@98 $generated@@28 $generated@@42 $generated@@9 $generated@@143 $generated@@150 $generated@@37))) (=> ($generated@@13 ($generated@@98 $generated@@28 $generated@@42 $generated@@9 $generated@@143 $generated@@150 $generated@@37)) (=> (and (and (= $generated@@151 ($generated@@71 4)) (= $generated@@152 ($generated@@45 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@148 $generated@@150 ($generated@@45 $generated@@42 $generated@@43 ($generated@@41 $generated@@28 ($generated@@44 $generated@@42 $generated@@43) $generated@@148 $generated@@150) $generated@@37 ($generated@@76 $generated@@10 ($generated@@14 $generated@@151)))))) (and ($generated@@79 $generated@@152) (= (ControlFlow 0 2) (- 0 1)))) ($generated@@13 ($generated@@73 $generated@@9 ($generated@@12 false))))))))))))))
+(let (($generated@@156  (=> (and ($generated@@79 $generated@@144) ($generated@@149 $generated@@144)) (=> (and (and (=> $generated@@145 (and ($generated@@27 $generated@@28 $generated@@153 $generated@@34) ($generated@@33 $generated@@28 $generated@@153 $generated@@34 $generated@@144))) true) (= (ControlFlow 0 6) 2)) $generated@@154))))
+$generated@@156)))
+))
+(check-sat)
+(get-info :reason-unknown)
+(get-info :rlimit)
+(assert (not (= (ControlFlow 0 2) (- 1))))
+(check-sat)
+(get-info :rlimit)
+(pop 1)
+; Invalid
+(reset)
+(set-option :rlimit 0)
+; did a full reset
+(reset)
+(set-option :print-success false)
+(set-info :smt-lib-version 2.6)
+(set-option :auto_config false)
+(set-option :type_check true)
+(set-option :smt.qi.eager_threshold 100)
+(set-option :smt.delay_units true)
+(set-option :model_evaluator.completion true)
+(set-option :model.completion true)
+(set-option :model.compact false)
+(set-option :smt.case_split 3)
+(set-option :smt.mbqi false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+(set-option :smt.arith.solver 2)
+; done setting options
+
+
+(set-info :category "industrial")
+(declare-sort |T@U| 0)
+(declare-sort |T@T| 0)
+(declare-fun real_pow (Real Real) Real)
+(declare-fun UOrdering2 (|T@U| |T@U|) Bool)
+(declare-fun UOrdering3 (|T@T| |T@U| |T@U|) Bool)
+(declare-fun tickleBool (Bool) Bool)
+(assert (and (tickleBool true) (tickleBool false)))
+(declare-fun $generated () T@U)
+(declare-fun $generated@@0 () T@U)
+(declare-fun $generated@@1 () T@U)
+(declare-fun $generated@@2 () T@U)
+(declare-fun $generated@@3 () T@U)
+(declare-fun $generated@@4 () T@U)
+(declare-fun $generated@@5 () T@U)
+(declare-fun $generated@@6 () T@U)
+(declare-fun $generated@@7 () T@U)
+(declare-fun $generated@@8 () T@U)
+(declare-fun $generated@@9 () T@U)
+(declare-fun $generated@@10 () T@U)
+(declare-fun $generated@@11 () T@U)
+(declare-fun $generated@@12 () T@U)
+(declare-fun $generated@@13 () T@U)
+(declare-fun $generated@@14 () T@U)
+(declare-fun $generated@@15 (T@T) Int)
+(declare-fun $generated@@16 () T@T)
+(declare-fun $generated@@17 () T@T)
+(declare-fun $generated@@18 () T@T)
+(declare-fun $generated@@19 (Bool) T@U)
+(declare-fun $generated@@20 (T@U) Bool)
+(declare-fun $generated@@21 (Int) T@U)
+(declare-fun $generated@@22 (T@U) Int)
+(declare-fun $generated@@23 (Real) T@U)
+(declare-fun $generated@@24 (T@U) Real)
+(declare-fun $generated@@31 (T@U) Int)
+(declare-fun $generated@@32 (T@U) T@U)
+(declare-fun $generated@@33 (T@U) T@U)
+(declare-fun $generated@@34 (T@U T@U) T@U)
+(declare-fun $generated@@35 (T@U T@U) Bool)
+(declare-fun $generated@@41 (T@T T@U T@U T@U) Bool)
+(declare-fun $generated@@42 () T@U)
+(declare-fun $generated@@48 () T@U)
+(declare-fun $generated@@50 (T@T T@U T@U) Bool)
+(declare-fun $generated@@51 () T@T)
+(declare-fun $generated@@52 () T@U)
+(declare-fun $generated@@53 () T@U)
+(declare-fun $generated@@54 (T@U) T@U)
+(declare-fun $generated@@56 () T@U)
+(declare-fun $generated@@58 () T@U)
+(declare-fun $generated@@61 () T@U)
+(declare-fun $generated@@64 () T@U)
+(declare-fun $generated@@65 (T@U T@U) T@U)
+(declare-fun $generated@@66 (T@U) Bool)
+(declare-fun $generated@@67 () T@U)
+(declare-fun $generated@@68 (T@T T@U) T@U)
+(declare-fun $generated@@69 (T@T T@T T@U T@U) T@U)
+(declare-fun $generated@@70 () T@T)
+(declare-fun $generated@@71 () T@T)
+(declare-fun $generated@@72 (T@T T@T) T@T)
+(declare-fun $generated@@73 (T@T T@T T@U T@U T@U) T@U)
+(declare-fun $generated@@74 (T@T) T@T)
+(declare-fun $generated@@75 (T@T) T@T)
+(declare-fun $generated@@97 (Int) Int)
+(declare-fun $generated@@99 (T@T T@U) T@U)
+(declare-fun $generated@@102 (T@U T@U) Bool)
+(declare-fun $generated@@106 (T@T T@U) T@U)
+(declare-fun $generated@@110 (T@U) Bool)
+(declare-fun $generated@@119 (T@U Int T@U) Int)
+(declare-fun $generated@@120 (T@U Int T@U) Bool)
+(declare-fun $generated@@124 (T@U T@U) Bool)
+(declare-fun $generated@@127 (T@U) T@U)
+(declare-fun $generated@@134 (T@U) T@U)
+(declare-fun $generated@@138 (T@T T@T T@T T@U T@U T@U) T@U)
+(declare-fun $generated@@139 (T@U T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@140 (T@T T@T T@T T@U T@U T@U T@U) T@U)
+(assert  (and (and (and (and (and (and (and (and (= ($generated@@15 $generated@@16) 0) (= ($generated@@15 $generated@@17) 1)) (= ($generated@@15 $generated@@18) 2)) (forall (($generated@@25 Bool) ) (! (= ($generated@@20 ($generated@@19 $generated@@25)) $generated@@25)
+ :pattern ( ($generated@@19 $generated@@25))
+))) (forall (($generated@@26 T@U) ) (! (= ($generated@@19 ($generated@@20 $generated@@26)) $generated@@26)
+ :pattern ( ($generated@@20 $generated@@26))
+))) (forall (($generated@@27 Int) ) (! (= ($generated@@22 ($generated@@21 $generated@@27)) $generated@@27)
+ :pattern ( ($generated@@21 $generated@@27))
+))) (forall (($generated@@28 T@U) ) (! (= ($generated@@21 ($generated@@22 $generated@@28)) $generated@@28)
+ :pattern ( ($generated@@22 $generated@@28))
+))) (forall (($generated@@29 Real) ) (! (= ($generated@@24 ($generated@@23 $generated@@29)) $generated@@29)
+ :pattern ( ($generated@@23 $generated@@29))
+))) (forall (($generated@@30 T@U) ) (! (= ($generated@@23 ($generated@@24 $generated@@30)) $generated@@30)
+ :pattern ( ($generated@@24 $generated@@30))
+))))
+(assert (distinct $generated $generated@@0 $generated@@1 $generated@@2 $generated@@3 $generated@@4 $generated@@5 $generated@@6 $generated@@7 $generated@@8 $generated@@9 $generated@@10 $generated@@11 $generated@@12 $generated@@13 $generated@@14)
+)
+(assert (= ($generated@@31 $generated@@1) 0))
+(assert (= ($generated@@32 $generated) $generated@@0))
+(assert (= ($generated@@33 $generated@@1) $generated@@2))
+(assert (forall (($generated@@36 T@U) ($generated@@37 T@U) ) (! ($generated@@35 ($generated@@34 $generated@@36 $generated@@37) $generated@@37)
+ :pattern ( ($generated@@34 $generated@@36 $generated@@37))
+)))
+(assert (forall (($generated@@38 T@U) ($generated@@39 T@U) ($generated@@40 T@U) ) (!  (=> ($generated@@35 $generated@@38 $generated@@40) ($generated@@35 ($generated@@34 $generated@@38 $generated@@39) $generated@@40))
+ :pattern ( ($generated@@34 $generated@@38 $generated@@39) ($generated@@35 $generated@@38 $generated@@40))
+)))
+(assert (forall (($generated@@43 T@U) ($generated@@44 T@U) ) (! ($generated@@41 $generated@@17 $generated@@43 $generated@@42 $generated@@44)
+ :pattern ( ($generated@@41 $generated@@17 $generated@@43 $generated@@42 $generated@@44))
+)))
+(assert (forall (($generated@@45 T@U) ($generated@@46 T@U) ($generated@@47 T@U) ) (! (= ($generated@@35 ($generated@@34 $generated@@45 $generated@@46) $generated@@47)  (or (= $generated@@47 $generated@@46) ($generated@@35 $generated@@45 $generated@@47)))
+ :pattern ( ($generated@@35 ($generated@@34 $generated@@45 $generated@@46) $generated@@47))
+)))
+(assert (forall (($generated@@49 T@U) ) (!  (not ($generated@@35 $generated@@48 $generated@@49))
+ :pattern ( ($generated@@35 $generated@@48 $generated@@49))
+)))
+(assert (= ($generated@@15 $generated@@51) 3))
+(assert (forall (($generated@@55 T@U) ) (! (= ($generated@@50 $generated@@51 $generated@@55 $generated@@52)  (or (= $generated@@55 $generated@@53) (= ($generated@@54 $generated@@55) $generated@@52)))
+ :pattern ( ($generated@@50 $generated@@51 $generated@@55 $generated@@52))
+)))
+(assert (forall (($generated@@57 T@U) ) (! (= ($generated@@50 $generated@@51 $generated@@57 $generated@@56)  (or (= $generated@@57 $generated@@53) (= ($generated@@54 $generated@@57) $generated@@56)))
+ :pattern ( ($generated@@50 $generated@@51 $generated@@57 $generated@@56))
+)))
+(assert (forall (($generated@@59 T@U) ($generated@@60 T@U) ) (! (= ($generated@@41 $generated@@51 $generated@@59 $generated@@58 $generated@@60) ($generated@@41 $generated@@51 $generated@@59 $generated@@52 $generated@@60))
+ :pattern ( ($generated@@41 $generated@@51 $generated@@59 $generated@@58 $generated@@60))
+)))
+(assert (forall (($generated@@62 T@U) ($generated@@63 T@U) ) (! (= ($generated@@41 $generated@@51 $generated@@62 $generated@@61 $generated@@63) ($generated@@41 $generated@@51 $generated@@62 $generated@@56 $generated@@63))
+ :pattern ( ($generated@@41 $generated@@51 $generated@@62 $generated@@61 $generated@@63))
+)))
+(assert (= ($generated@@31 $generated@@64) 0))
+(assert (= ($generated@@65 $generated@@5 $generated@@13) $generated@@64))
+(assert  (not ($generated@@66 $generated@@64)))
+(assert (= ($generated@@31 $generated@@67) 0))
+(assert (= ($generated@@65 $generated@@8 $generated@@14) $generated@@67))
+(assert  (not ($generated@@66 $generated@@67)))
+(assert  (and (and (and (and (and (and (forall (($generated@@76 T@T) ($generated@@77 T@T) ($generated@@78 T@U) ($generated@@79 T@U) ($generated@@80 T@U) ) (! (= ($generated@@69 $generated@@76 $generated@@77 ($generated@@73 $generated@@76 $generated@@77 $generated@@79 $generated@@80 $generated@@78) $generated@@80) $generated@@78)
+ :weight 0
+)) (forall (($generated@@81 T@T) ($generated@@82 T@T) ($generated@@83 T@U) ($generated@@84 T@U) ($generated@@85 T@U) ($generated@@86 T@U) ) (!  (or (= $generated@@85 $generated@@86) (= ($generated@@69 $generated@@81 $generated@@82 ($generated@@73 $generated@@81 $generated@@82 $generated@@84 $generated@@85 $generated@@83) $generated@@86) ($generated@@69 $generated@@81 $generated@@82 $generated@@84 $generated@@86)))
+ :weight 0
+))) (= ($generated@@15 $generated@@70) 4)) (= ($generated@@15 $generated@@71) 5)) (forall (($generated@@87 T@T) ($generated@@88 T@T) ) (= ($generated@@15 ($generated@@72 $generated@@87 $generated@@88)) 6))) (forall (($generated@@89 T@T) ($generated@@90 T@T) ) (! (= ($generated@@74 ($generated@@72 $generated@@89 $generated@@90)) $generated@@89)
+ :pattern ( ($generated@@72 $generated@@89 $generated@@90))
+))) (forall (($generated@@91 T@T) ($generated@@92 T@T) ) (! (= ($generated@@75 ($generated@@72 $generated@@91 $generated@@92)) $generated@@92)
+ :pattern ( ($generated@@72 $generated@@91 $generated@@92))
+))))
+(assert (forall (($generated@@93 T@U) ($generated@@94 T@U) ) (! (= ($generated@@41 $generated@@51 $generated@@93 $generated@@52 $generated@@94)  (or (= $generated@@93 $generated@@53) ($generated@@20 ($generated@@68 $generated@@16 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@94 $generated@@93) $generated@@1)))))
+ :pattern ( ($generated@@41 $generated@@51 $generated@@93 $generated@@52 $generated@@94))
+)))
+(assert (forall (($generated@@95 T@U) ($generated@@96 T@U) ) (! (= ($generated@@41 $generated@@51 $generated@@95 $generated@@56 $generated@@96)  (or (= $generated@@95 $generated@@53) ($generated@@20 ($generated@@68 $generated@@16 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@96 $generated@@95) $generated@@1)))))
+ :pattern ( ($generated@@41 $generated@@51 $generated@@95 $generated@@56 $generated@@96))
+)))
+(assert (forall (($generated@@98 Int) ) (! (= ($generated@@97 $generated@@98) $generated@@98)
+ :pattern ( ($generated@@97 $generated@@98))
+)))
+(assert (forall (($generated@@100 T@U) ($generated@@101 T@T) ) (! (= ($generated@@99 $generated@@101 $generated@@100) $generated@@100)
+ :pattern ( ($generated@@99 $generated@@101 $generated@@100))
+)))
+(assert (forall (($generated@@103 T@U) ($generated@@104 T@U) ) (! (= ($generated@@102 $generated@@103 $generated@@104) (forall (($generated@@105 T@U) ) (!  (=> ($generated@@35 $generated@@103 $generated@@105) ($generated@@35 $generated@@104 $generated@@105))
+ :pattern ( ($generated@@35 $generated@@103 $generated@@105))
+ :pattern ( ($generated@@35 $generated@@104 $generated@@105))
+)))
+ :pattern ( ($generated@@102 $generated@@103 $generated@@104))
+)))
+(assert (forall (($generated@@107 T@U) ($generated@@108 T@T) ) (! (= ($generated@@106 $generated@@108 ($generated@@68 $generated@@108 $generated@@107)) $generated@@107)
+ :pattern ( ($generated@@68 $generated@@108 $generated@@107))
+)))
+(assert (forall (($generated@@109 T@U) ) (! (= ($generated@@50 $generated@@17 $generated@@109 $generated@@42) (<= ($generated@@97 0) ($generated@@22 $generated@@109)))
+ :pattern ( ($generated@@50 $generated@@17 $generated@@109 $generated@@42))
+)))
+(assert ($generated@@66 $generated@@1))
+(assert (forall (($generated@@111 T@U) ($generated@@112 T@U) ) (!  (=> (and (and ($generated@@110 $generated@@111) (and (or (not (= $generated@@112 $generated@@53)) (not true)) (= ($generated@@54 $generated@@112) $generated@@56))) ($generated@@20 ($generated@@68 $generated@@16 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@111 $generated@@112) $generated@@1)))) ($generated@@41 $generated@@17 ($generated@@68 $generated@@17 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@111 $generated@@112) $generated@@67)) $generated $generated@@111))
+ :pattern ( ($generated@@68 $generated@@17 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@111 $generated@@112) $generated@@67)))
+)))
+(assert (forall (($generated@@113 T@U) ($generated@@114 T@U) ) (!  (=> (and ($generated@@110 $generated@@113) (and (or (not (= $generated@@114 $generated@@53)) (not true)) (= ($generated@@54 $generated@@114) $generated@@52))) ($generated@@50 $generated@@51 ($generated@@68 $generated@@51 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@113 $generated@@114) $generated@@64)) $generated@@61))
+ :pattern ( ($generated@@68 $generated@@51 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@113 $generated@@114) $generated@@64)))
+)))
+(assert (forall (($generated@@115 T@U) ) (! (= ($generated@@50 $generated@@51 $generated@@115 $generated@@58)  (and ($generated@@50 $generated@@51 $generated@@115 $generated@@52) (or (not (= $generated@@115 $generated@@53)) (not true))))
+ :pattern ( ($generated@@50 $generated@@51 $generated@@115 $generated@@58))
+ :pattern ( ($generated@@50 $generated@@51 $generated@@115 $generated@@52))
+)))
+(assert (forall (($generated@@116 T@U) ) (! (= ($generated@@50 $generated@@51 $generated@@116 $generated@@61)  (and ($generated@@50 $generated@@51 $generated@@116 $generated@@56) (or (not (= $generated@@116 $generated@@53)) (not true))))
+ :pattern ( ($generated@@50 $generated@@51 $generated@@116 $generated@@61))
+ :pattern ( ($generated@@50 $generated@@51 $generated@@116 $generated@@56))
+)))
+(assert (forall (($generated@@117 T@U) ($generated@@118 T@U) ) (!  (=> (and (and ($generated@@110 $generated@@117) (and (or (not (= $generated@@118 $generated@@53)) (not true)) (= ($generated@@54 $generated@@118) $generated@@52))) ($generated@@20 ($generated@@68 $generated@@16 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@117 $generated@@118) $generated@@1)))) ($generated@@41 $generated@@51 ($generated@@68 $generated@@51 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@117 $generated@@118) $generated@@64)) $generated@@61 $generated@@117))
+ :pattern ( ($generated@@68 $generated@@51 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@117 $generated@@118) $generated@@64)))
+)))
+(assert (forall (($generated@@121 T@U) ($generated@@122 Int) ($generated@@123 T@U) ) (!  (=> ($generated@@120 $generated@@121 $generated@@122 $generated@@123) (= ($generated@@119 $generated@@121 $generated@@122 $generated@@123) ($generated@@97 3)))
+ :pattern ( ($generated@@119 $generated@@121 $generated@@122 $generated@@123) ($generated@@110 $generated@@121))
+)))
+(assert (forall (($generated@@125 T@U) ($generated@@126 T@U) ) (!  (=> ($generated@@124 $generated@@125 $generated@@126) (= $generated@@125 $generated@@126))
+ :pattern ( ($generated@@124 $generated@@125 $generated@@126))
+)))
+(assert (forall (($generated@@128 T@U) ($generated@@129 T@U) ) (!  (and (= ($generated@@127 ($generated@@65 $generated@@128 $generated@@129)) $generated@@128) (= ($generated@@33 ($generated@@65 $generated@@128 $generated@@129)) $generated@@129))
+ :pattern ( ($generated@@65 $generated@@128 $generated@@129))
+)))
+(assert (forall (($generated@@130 T@U) ($generated@@131 T@T) ) (! (= ($generated@@68 $generated@@131 ($generated@@106 $generated@@131 $generated@@130)) $generated@@130)
+ :pattern ( ($generated@@106 $generated@@131 $generated@@130))
+)))
+(assert (forall (($generated@@132 T@U) ($generated@@133 T@U) ) (!  (=> (and ($generated@@110 $generated@@132) (and (or (not (= $generated@@133 $generated@@53)) (not true)) (= ($generated@@54 $generated@@133) $generated@@56))) ($generated@@50 $generated@@17 ($generated@@68 $generated@@17 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@132 $generated@@133) $generated@@67)) $generated))
+ :pattern ( ($generated@@68 $generated@@17 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@132 $generated@@133) $generated@@67)))
+)))
+(assert (= ($generated@@32 $generated@@42) $generated@@3))
+(assert (= ($generated@@134 $generated@@42) $generated@@10))
+(assert (= ($generated@@32 $generated@@58) $generated@@4))
+(assert (= ($generated@@134 $generated@@58) $generated@@11))
+(assert (= ($generated@@32 $generated@@52) $generated@@6))
+(assert (= ($generated@@134 $generated@@52) $generated@@11))
+(assert (= ($generated@@32 $generated@@61) $generated@@7))
+(assert (= ($generated@@134 $generated@@61) $generated@@12))
+(assert (= ($generated@@32 $generated@@56) $generated@@9))
+(assert (= ($generated@@134 $generated@@56) $generated@@12))
+(assert (forall (($generated@@135 T@U) ($generated@@136 Int) ($generated@@137 T@U) ) (!  (=> ($generated@@120 $generated@@135 $generated@@136 $generated@@137) (and (and ($generated@@120 $generated@@135 $generated@@136 $generated@@137) (= ($generated@@119 $generated@@135 $generated@@136 $generated@@137) ($generated@@22 ($generated@@68 $generated@@17 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@135 ($generated@@68 $generated@@51 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@135 $generated@@137) $generated@@64))) $generated@@67))))) (<= ($generated@@97 0) ($generated@@119 $generated@@135 $generated@@136 $generated@@137))))
+ :pattern ( ($generated@@119 $generated@@135 $generated@@136 $generated@@137))
+)))
+(assert  (and (forall (($generated@@141 T@T) ($generated@@142 T@T) ($generated@@143 T@T) ($generated@@144 T@U) ($generated@@145 T@U) ($generated@@146 T@U) ($generated@@147 T@U) ) (! (= ($generated@@138 $generated@@141 $generated@@142 $generated@@143 ($generated@@140 $generated@@141 $generated@@142 $generated@@143 $generated@@145 $generated@@146 $generated@@147 $generated@@144) $generated@@146 $generated@@147) $generated@@144)
+ :weight 0
+)) (and (forall (($generated@@148 T@T) ($generated@@149 T@T) ($generated@@150 T@T) ($generated@@151 T@U) ($generated@@152 T@U) ($generated@@153 T@U) ($generated@@154 T@U) ($generated@@155 T@U) ($generated@@156 T@U) ) (!  (or (= $generated@@153 $generated@@155) (= ($generated@@138 $generated@@148 $generated@@149 $generated@@150 ($generated@@140 $generated@@148 $generated@@149 $generated@@150 $generated@@152 $generated@@153 $generated@@154 $generated@@151) $generated@@155 $generated@@156) ($generated@@138 $generated@@148 $generated@@149 $generated@@150 $generated@@152 $generated@@155 $generated@@156)))
+ :weight 0
+)) (forall (($generated@@157 T@T) ($generated@@158 T@T) ($generated@@159 T@T) ($generated@@160 T@U) ($generated@@161 T@U) ($generated@@162 T@U) ($generated@@163 T@U) ($generated@@164 T@U) ($generated@@165 T@U) ) (!  (or (= $generated@@163 $generated@@165) (= ($generated@@138 $generated@@157 $generated@@158 $generated@@159 ($generated@@140 $generated@@157 $generated@@158 $generated@@159 $generated@@161 $generated@@162 $generated@@163 $generated@@160) $generated@@164 $generated@@165) ($generated@@138 $generated@@157 $generated@@158 $generated@@159 $generated@@161 $generated@@164 $generated@@165)))
+ :weight 0
+)))))
+(assert (forall (($generated@@166 T@U) ($generated@@167 T@U) ($generated@@168 T@U) ($generated@@169 T@U) ($generated@@170 T@U) ($generated@@171 T@U) ($generated@@172 T@U) ) (! (= ($generated@@20 ($generated@@138 $generated@@51 $generated@@70 $generated@@16 ($generated@@139 $generated@@166 $generated@@167 $generated@@168 $generated@@169 $generated@@170) $generated@@171 $generated@@172))  (=> (and (or (not (= $generated@@171 $generated@@166)) (not true)) ($generated@@20 ($generated@@68 $generated@@16 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@167 $generated@@171) $generated@@168)))) (or (= $generated@@171 $generated@@169) (= $generated@@171 $generated@@170))))
+ :pattern ( ($generated@@138 $generated@@51 $generated@@70 $generated@@16 ($generated@@139 $generated@@166 $generated@@167 $generated@@168 $generated@@169 $generated@@170) $generated@@171 $generated@@172))
+)))
+(assert (forall (($generated@@173 T@U) ($generated@@174 T@U) ) (! (= ($generated@@124 $generated@@173 $generated@@174) (forall (($generated@@175 T@U) ) (! (= ($generated@@35 $generated@@173 $generated@@175) ($generated@@35 $generated@@174 $generated@@175))
+ :pattern ( ($generated@@35 $generated@@173 $generated@@175))
+ :pattern ( ($generated@@35 $generated@@174 $generated@@175))
+)))
+ :pattern ( ($generated@@124 $generated@@173 $generated@@174))
+)))
+(assert (forall (($generated@@176 Int) ) (! (= ($generated@@106 $generated@@17 ($generated@@21 ($generated@@97 $generated@@176))) ($generated@@99 $generated@@71 ($generated@@106 $generated@@17 ($generated@@21 $generated@@176))))
+ :pattern ( ($generated@@106 $generated@@17 ($generated@@21 ($generated@@97 $generated@@176))))
+)))
+(assert (forall (($generated@@177 T@U) ($generated@@178 T@T) ) (! (= ($generated@@106 $generated@@178 ($generated@@99 $generated@@178 $generated@@177)) ($generated@@99 $generated@@71 ($generated@@106 $generated@@178 $generated@@177)))
+ :pattern ( ($generated@@106 $generated@@178 ($generated@@99 $generated@@178 $generated@@177)))
+)))
+(assert (forall (($generated@@179 T@U) ($generated@@180 T@U) ) (! ($generated@@41 $generated@@17 $generated@@180 $generated $generated@@179)
+ :pattern ( ($generated@@41 $generated@@17 $generated@@180 $generated $generated@@179))
+)))
+(assert (forall (($generated@@181 T@U) ) (! ($generated@@50 $generated@@17 $generated@@181 $generated)
+ :pattern ( ($generated@@50 $generated@@17 $generated@@181 $generated))
+)))
+(push 1)
+(declare-fun ControlFlow (Int Int) Int)
+(declare-fun $generated@@182 () Int)
+(declare-fun $generated@@183 () T@U)
+(declare-fun $generated@@184 () T@U)
+(declare-fun $generated@@185 () T@U)
+(declare-fun $generated@@186 () Bool)
+(declare-fun $generated@@187 (T@U) Bool)
+(set-option :timeout 0)
+(set-option :rlimit 0)
+(set-option :auto_config false)
+(set-option :type_check true)
+(set-option :smt.qi.eager_threshold 100)
+(set-option :smt.delay_units true)
+(set-option :model_evaluator.completion true)
+(set-option :model.completion true)
+(set-option :model.compact false)
+(set-option :smt.case_split 3)
+(set-option :smt.mbqi false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+(set-option :smt.arith.solver 2)
+(assert (not
+ (=> (= (ControlFlow 0 0) 14) (let (($generated@@188  (=> (and (or (and (= $generated@@182 $generated@@182) (= $generated@@183 $generated@@183)) ($generated@@120 $generated@@184 $generated@@182 $generated@@183)) (= (ControlFlow 0 7) (- 0 6))) (= ($generated@@119 $generated@@184 $generated@@182 $generated@@183) ($generated@@22 ($generated@@68 $generated@@17 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 ($generated@@68 $generated@@51 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64))) $generated@@67)))))))
+(let (($generated@@189  (and (=> (= (ControlFlow 0 8) (- 0 9)) ($generated@@50 $generated@@17 ($generated@@21 ($generated@@97 3)) $generated@@42)) (=> ($generated@@50 $generated@@17 ($generated@@21 ($generated@@97 3)) $generated@@42) (=> (= ($generated@@119 $generated@@184 $generated@@182 $generated@@183) ($generated@@97 3)) (=> (and ($generated@@50 $generated@@17 ($generated@@21 ($generated@@119 $generated@@184 $generated@@182 $generated@@183)) $generated@@42) (= (ControlFlow 0 8) 7)) $generated@@188))))))
+(let (($generated@@190  (=> (<= ($generated@@97 0) ($generated@@119 $generated@@184 $generated@@182 $generated@@183)) (=> (and ($generated@@41 $generated@@17 ($generated@@21 $generated@@182) $generated $generated@@184) ($generated@@41 $generated@@51 $generated@@183 $generated@@58 $generated@@184)) (and (=> (= (ControlFlow 0 2) (- 0 5)) (or (or (<= 0 $generated@@182) (and ($generated@@102 ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64))) (not ($generated@@102 ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)))))) (= $generated@@182 $generated@@182))) (=> (or (or (<= 0 $generated@@182) (and ($generated@@102 ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64))) (not ($generated@@102 ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)))))) (= $generated@@182 $generated@@182)) (and (=> (= (ControlFlow 0 2) (- 0 4)) (or (and (= $generated@@182 $generated@@182) (= $generated@@183 $generated@@183)) (or (and ($generated@@102 ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64))) (not ($generated@@102 ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64))))) (and ($generated@@124 ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64))) (or (< $generated@@182 $generated@@182) (and (= $generated@@182 $generated@@182) (and (= $generated@@183 $generated@@53) (or (not (= $generated@@183 $generated@@53)) (not true))))))))) (=> (or (and (= $generated@@182 $generated@@182) (= $generated@@183 $generated@@183)) (or (and ($generated@@102 ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64))) (not ($generated@@102 ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64))))) (and ($generated@@124 ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) ($generated@@34 ($generated@@34 $generated@@48 ($generated@@106 $generated@@51 $generated@@183)) ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64))) (or (< $generated@@182 $generated@@182) (and (= $generated@@182 $generated@@182) (and (= $generated@@183 $generated@@53) (or (not (= $generated@@183 $generated@@53)) (not true)))))))) (=> (or (and (= $generated@@182 $generated@@182) (= $generated@@183 $generated@@183)) ($generated@@120 $generated@@184 $generated@@182 $generated@@183)) (and (=> (= (ControlFlow 0 2) (- 0 3)) (or (not (= $generated@@183 $generated@@53)) (not true))) (=> (or (not (= $generated@@183 $generated@@53)) (not true)) (=> (= (ControlFlow 0 2) (- 0 1)) (or (not (= ($generated@@68 $generated@@51 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)) $generated@@53)) (not true))))))))))))))
+(let (($generated@@191  (=> (= $generated@@185 ($generated@@139 $generated@@53 $generated@@184 $generated@@1 $generated@@183 ($generated@@68 $generated@@51 ($generated@@69 $generated@@70 $generated@@71 ($generated@@69 $generated@@51 ($generated@@72 $generated@@70 $generated@@71) $generated@@184 $generated@@183) $generated@@64)))) (and (=> (= (ControlFlow 0 10) (- 0 13)) (or (not (= $generated@@183 $generated@@53)) (not true))) (=> (or (not (= $generated@@183 $generated@@53)) (not true)) (=> (= $generated@@186 ($generated@@20 ($generated@@138 $generated@@51 $generated@@70 $generated@@16 $generated@@185 $generated@@183 $generated@@64))) (and (=> (= (ControlFlow 0 10) (- 0 12)) $generated@@186) (=> $generated@@186 (and (=> (= (ControlFlow 0 10) (- 0 11)) (or (not (= $generated@@183 $generated@@53)) (not true))) (=> (or (not (= $generated@@183 $generated@@53)) (not true)) (and (=> (= (ControlFlow 0 10) 2) $generated@@190) (=> (= (ControlFlow 0 10) 8) $generated@@189))))))))))))
+(let (($generated@@192  (=> (and (and ($generated@@110 $generated@@184) ($generated@@187 $generated@@184)) (and ($generated@@50 $generated@@51 $generated@@183 $generated@@58) (= (ControlFlow 0 14) 10))) $generated@@191)))
+$generated@@192))))))
+))
+(check-sat)
+(get-info :reason-unknown)
+(get-info :rlimit)
+(assert (not (= (ControlFlow 0 7) (- 6))))
+(check-sat)
+(get-info :rlimit)
+(pop 1)
+; Invalid
+(reset)
+(set-option :rlimit 0)
+; did a full reset
+(reset)
+(set-option :print-success false)
+(set-info :smt-lib-version 2.6)
+(set-option :auto_config false)
+(set-option :type_check true)
+(set-option :smt.qi.eager_threshold 100)
+(set-option :smt.delay_units true)
+(set-option :model_evaluator.completion true)
+(set-option :model.completion true)
+(set-option :model.compact false)
+(set-option :smt.case_split 3)
+(set-option :smt.mbqi false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+(set-option :smt.arith.solver 2)
+; done setting options
+
+
+(set-info :category "industrial")
+(declare-sort |T@U| 0)
+(declare-sort |T@T| 0)
+(declare-fun real_pow (Real Real) Real)
+(declare-fun UOrdering2 (|T@U| |T@U|) Bool)
+(declare-fun UOrdering3 (|T@T| |T@U| |T@U|) Bool)
+(declare-fun tickleBool (Bool) Bool)
+(assert (and (tickleBool true) (tickleBool false)))
+(declare-fun $generated () T@U)
+(declare-fun $generated@@0 () T@U)
+(declare-fun $generated@@1 () T@U)
+(declare-fun $generated@@2 () T@U)
+(declare-fun $generated@@3 () T@U)
+(declare-fun $generated@@4 () T@U)
+(declare-fun $generated@@5 () T@U)
+(declare-fun $generated@@6 () T@U)
+(declare-fun $generated@@7 () T@U)
+(declare-fun $generated@@8 () T@U)
+(declare-fun $generated@@9 () T@U)
+(declare-fun $generated@@10 () T@U)
+(declare-fun $generated@@11 () T@U)
+(declare-fun $generated@@12 () T@U)
+(declare-fun $generated@@13 () T@U)
+(declare-fun $generated@@14 () T@U)
+(declare-fun $generated@@15 () T@U)
+(declare-fun $generated@@16 () T@U)
+(declare-fun $generated@@17 () T@U)
+(declare-fun $generated@@18 () T@U)
+(declare-fun $generated@@19 () T@U)
+(declare-fun $generated@@20 () T@U)
+(declare-fun $generated@@21 () T@U)
+(declare-fun $generated@@22 () T@U)
+(declare-fun $generated@@23 (T@T) Int)
+(declare-fun $generated@@24 () T@T)
+(declare-fun $generated@@25 () T@T)
+(declare-fun $generated@@26 () T@T)
+(declare-fun $generated@@27 (Bool) T@U)
+(declare-fun $generated@@28 (T@U) Bool)
+(declare-fun $generated@@29 (Int) T@U)
+(declare-fun $generated@@30 (T@U) Int)
+(declare-fun $generated@@31 (Real) T@U)
+(declare-fun $generated@@32 (T@U) Real)
+(declare-fun $generated@@39 (T@U) Int)
+(declare-fun $generated@@40 (T@U) T@U)
+(declare-fun $generated@@41 (T@U) T@U)
+(declare-fun $generated@@42 (T@T T@U T@U) Bool)
+(declare-fun $generated@@43 () T@T)
+(declare-fun $generated@@44 (T@U T@U) T@U)
+(declare-fun $generated@@45 (T@U T@U) T@U)
+(declare-fun $generated@@46 (T@U T@U) Bool)
+(declare-fun $generated@@47 (T@U T@U T@U T@U T@U) Bool)
+(declare-fun $generated@@48 () T@U)
+(declare-fun $generated@@54 (T@U T@U) Bool)
+(declare-fun $generated@@55 (T@U T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@56 (T@U T@U T@U) T@U)
+(declare-fun $generated@@57 (T@T T@T T@T T@U T@U T@U) T@U)
+(declare-fun $generated@@58 (T@T T@T) T@T)
+(declare-fun $generated@@59 () T@T)
+(declare-fun $generated@@60 () T@T)
+(declare-fun $generated@@61 () T@T)
+(declare-fun $generated@@62 () T@T)
+(declare-fun $generated@@63 (T@T T@T T@T T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@64 (T@T T@T T@U T@U) T@U)
+(declare-fun $generated@@65 (T@T T@T T@U T@U T@U) T@U)
+(declare-fun $generated@@66 (T@T) T@T)
+(declare-fun $generated@@67 (T@T) T@T)
+(declare-fun $generated@@118 (T@U) T@U)
+(declare-fun $generated@@122 () T@U)
+(declare-fun $generated@@124 () T@U)
+(declare-fun $generated@@125 () T@U)
+(declare-fun $generated@@126 (T@U) T@U)
+(declare-fun $generated@@128 () T@U)
+(declare-fun $generated@@130 (T@U T@U) T@U)
+(declare-fun $generated@@138 (T@T T@U T@U T@U) Bool)
+(declare-fun $generated@@139 () T@U)
+(declare-fun $generated@@140 () T@U)
+(declare-fun $generated@@143 () T@U)
+(declare-fun $generated@@146 () T@U)
+(declare-fun $generated@@149 () T@U)
+(declare-fun $generated@@150 (T@U T@U) T@U)
+(declare-fun $generated@@151 (T@U) Bool)
+(declare-fun $generated@@152 () T@U)
+(declare-fun $generated@@153 (T@U) Bool)
+(declare-fun $generated@@154 (T@U T@U) Bool)
+(declare-fun $generated@@155 (T@U Int T@U) Int)
+(declare-fun $generated@@156 (T@U) Bool)
+(declare-fun $generated@@157 (T@U Int T@U) Bool)
+(declare-fun $generated@@158 (T@T T@U) T@U)
+(declare-fun $generated@@174 (Int) Int)
+(declare-fun $generated@@176 (T@T T@U) T@U)
+(declare-fun $generated@@179 (T@U T@U) Bool)
+(declare-fun $generated@@185 (T@T T@U) T@U)
+(declare-fun $generated@@188 (Int) T@U)
+(declare-fun $generated@@208 (T@U) T@U)
+(declare-fun $generated@@212 (T@T T@U T@U) T@U)
+(declare-fun $generated@@213 () T@T)
+(declare-fun $generated@@219 (T@U T@U T@U) Bool)
+(declare-fun $generated@@249 (T@U T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@273 (T@U) T@U)
+(declare-fun $generated@@310 (Bool) T@U)
+(declare-fun $generated@@313 (T@U) T@U)
+(declare-fun $generated@@326 (T@U) T@U)
+(declare-fun $generated@@344 (T@U) T@U)
+(declare-fun $generated@@347 (T@U) T@U)
+(declare-fun $generated@@350 (T@U) T@U)
+(declare-fun $generated@@353 (T@U) T@U)
+(declare-fun $generated@@356 (T@U) T@U)
+(declare-fun $generated@@359 (T@U) T@U)
+(declare-fun $generated@@363 (T@U) T@U)
+(declare-fun $generated@@374 (T@U) T@U)
+(declare-fun $generated@@393 (T@U T@U T@U Bool) T@U)
+(declare-fun $generated@@400 (T@U) T@U)
+(declare-fun $generated@@426 (T@U) T@U)
+(assert  (and (and (and (and (and (and (and (and (= ($generated@@23 $generated@@24) 0) (= ($generated@@23 $generated@@25) 1)) (= ($generated@@23 $generated@@26) 2)) (forall (($generated@@33 Bool) ) (! (= ($generated@@28 ($generated@@27 $generated@@33)) $generated@@33)
+ :pattern ( ($generated@@27 $generated@@33))
+))) (forall (($generated@@34 T@U) ) (! (= ($generated@@27 ($generated@@28 $generated@@34)) $generated@@34)
+ :pattern ( ($generated@@28 $generated@@34))
+))) (forall (($generated@@35 Int) ) (! (= ($generated@@30 ($generated@@29 $generated@@35)) $generated@@35)
+ :pattern ( ($generated@@29 $generated@@35))
+))) (forall (($generated@@36 T@U) ) (! (= ($generated@@29 ($generated@@30 $generated@@36)) $generated@@36)
+ :pattern ( ($generated@@30 $generated@@36))
+))) (forall (($generated@@37 Real) ) (! (= ($generated@@32 ($generated@@31 $generated@@37)) $generated@@37)
+ :pattern ( ($generated@@31 $generated@@37))
+))) (forall (($generated@@38 T@U) ) (! (= ($generated@@31 ($generated@@32 $generated@@38)) $generated@@38)
+ :pattern ( ($generated@@32 $generated@@38))
+))))
+(assert (distinct $generated $generated@@0 $generated@@1 $generated@@2 $generated@@3 $generated@@4 $generated@@5 $generated@@6 $generated@@7 $generated@@8 $generated@@9 $generated@@10 $generated@@11 $generated@@12 $generated@@13 $generated@@14 $generated@@15 $generated@@16 $generated@@17 $generated@@18 $generated@@19 $generated@@20 $generated@@21 $generated@@22)
+)
+(assert (= ($generated@@39 $generated@@2) 0))
+(assert (= ($generated@@40 $generated) $generated@@0))
+(assert (= ($generated@@41 $generated@@2) $generated@@3))
+(assert (= ($generated@@23 $generated@@43) 3))
+(assert (forall (($generated@@49 T@U) ($generated@@50 T@U) ($generated@@51 T@U) ) (!  (=> (and ($generated@@42 $generated@@43 $generated@@51 ($generated@@45 $generated@@49 $generated@@50)) (=> (forall (($generated@@52 T@U) )  (=> ($generated@@46 $generated@@52 $generated@@49) true)) (forall (($generated@@53 T@U) )  (=> ($generated@@46 $generated@@53 $generated@@49) ($generated@@47 $generated@@49 $generated@@50 $generated@@48 $generated@@51 $generated@@53))))) ($generated@@42 $generated@@43 $generated@@51 ($generated@@44 $generated@@49 $generated@@50)))
+ :pattern ( ($generated@@42 $generated@@43 $generated@@51 ($generated@@44 $generated@@49 $generated@@50)))
+)))
+(assert  (and (and (and (and (and (and (and (and (and (and (forall (($generated@@68 T@T) ($generated@@69 T@T) ($generated@@70 T@T) ($generated@@71 T@U) ($generated@@72 T@U) ($generated@@73 T@U) ($generated@@74 T@U) ) (! (= ($generated@@57 $generated@@68 $generated@@69 $generated@@70 ($generated@@63 $generated@@68 $generated@@69 $generated@@70 $generated@@72 $generated@@73 $generated@@74 $generated@@71) $generated@@73 $generated@@74) $generated@@71)
+ :weight 0
+)) (and (forall (($generated@@75 T@T) ($generated@@76 T@T) ($generated@@77 T@T) ($generated@@78 T@U) ($generated@@79 T@U) ($generated@@80 T@U) ($generated@@81 T@U) ($generated@@82 T@U) ($generated@@83 T@U) ) (!  (or (= $generated@@80 $generated@@82) (= ($generated@@57 $generated@@75 $generated@@76 $generated@@77 ($generated@@63 $generated@@75 $generated@@76 $generated@@77 $generated@@79 $generated@@80 $generated@@81 $generated@@78) $generated@@82 $generated@@83) ($generated@@57 $generated@@75 $generated@@76 $generated@@77 $generated@@79 $generated@@82 $generated@@83)))
+ :weight 0
+)) (forall (($generated@@84 T@T) ($generated@@85 T@T) ($generated@@86 T@T) ($generated@@87 T@U) ($generated@@88 T@U) ($generated@@89 T@U) ($generated@@90 T@U) ($generated@@91 T@U) ($generated@@92 T@U) ) (!  (or (= $generated@@90 $generated@@92) (= ($generated@@57 $generated@@84 $generated@@85 $generated@@86 ($generated@@63 $generated@@84 $generated@@85 $generated@@86 $generated@@88 $generated@@89 $generated@@90 $generated@@87) $generated@@91 $generated@@92) ($generated@@57 $generated@@84 $generated@@85 $generated@@86 $generated@@88 $generated@@91 $generated@@92)))
+ :weight 0
+)))) (forall (($generated@@93 T@T) ($generated@@94 T@T) ($generated@@95 T@U) ($generated@@96 T@U) ($generated@@97 T@U) ) (! (= ($generated@@64 $generated@@93 $generated@@94 ($generated@@65 $generated@@93 $generated@@94 $generated@@96 $generated@@97 $generated@@95) $generated@@97) $generated@@95)
+ :weight 0
+))) (forall (($generated@@98 T@T) ($generated@@99 T@T) ($generated@@100 T@U) ($generated@@101 T@U) ($generated@@102 T@U) ($generated@@103 T@U) ) (!  (or (= $generated@@102 $generated@@103) (= ($generated@@64 $generated@@98 $generated@@99 ($generated@@65 $generated@@98 $generated@@99 $generated@@101 $generated@@102 $generated@@100) $generated@@103) ($generated@@64 $generated@@98 $generated@@99 $generated@@101 $generated@@103)))
+ :weight 0
+))) (forall (($generated@@104 T@T) ($generated@@105 T@T) ) (= ($generated@@23 ($generated@@58 $generated@@104 $generated@@105)) 4))) (forall (($generated@@106 T@T) ($generated@@107 T@T) ) (! (= ($generated@@66 ($generated@@58 $generated@@106 $generated@@107)) $generated@@106)
+ :pattern ( ($generated@@58 $generated@@106 $generated@@107))
+))) (forall (($generated@@108 T@T) ($generated@@109 T@T) ) (! (= ($generated@@67 ($generated@@58 $generated@@108 $generated@@109)) $generated@@109)
+ :pattern ( ($generated@@58 $generated@@108 $generated@@109))
+))) (= ($generated@@23 $generated@@59) 5)) (= ($generated@@23 $generated@@60) 6)) (= ($generated@@23 $generated@@61) 7)) (= ($generated@@23 $generated@@62) 8)))
+(assert (forall (($generated@@110 T@U) ($generated@@111 T@U) ($generated@@112 T@U) ($generated@@113 T@U) ($generated@@114 T@U) ($generated@@115 T@U) ($generated@@116 T@U) ($generated@@117 T@U) ) (! (= ($generated@@54 ($generated@@55 $generated@@110 $generated@@111 $generated@@112 ($generated@@56 $generated@@113 $generated@@114 $generated@@115) $generated@@116) $generated@@117) ($generated@@54 ($generated@@57 ($generated@@58 $generated@@59 ($generated@@58 $generated@@60 $generated@@61)) $generated@@61 $generated@@62 $generated@@115 $generated@@112 $generated@@116) $generated@@117))
+ :pattern ( ($generated@@54 ($generated@@55 $generated@@110 $generated@@111 $generated@@112 ($generated@@56 $generated@@113 $generated@@114 $generated@@115) $generated@@116) $generated@@117))
+)))
+(assert (forall (($generated@@119 T@U) ($generated@@120 T@U) ($generated@@121 T@U) ) (! (= ($generated@@28 ($generated@@57 ($generated@@58 $generated@@59 ($generated@@58 $generated@@60 $generated@@61)) $generated@@61 $generated@@24 ($generated@@118 $generated@@119) $generated@@120 $generated@@121)) ($generated@@46 $generated@@121 $generated@@119))
+ :pattern ( ($generated@@57 ($generated@@58 $generated@@59 ($generated@@58 $generated@@60 $generated@@61)) $generated@@61 $generated@@24 ($generated@@118 $generated@@119) $generated@@120 $generated@@121))
+)))
+(assert (forall (($generated@@123 T@U) ) (!  (not ($generated@@54 $generated@@122 $generated@@123))
+ :pattern ( ($generated@@54 $generated@@122 $generated@@123))
+)))
+(assert (forall (($generated@@127 T@U) ) (! (= ($generated@@42 $generated@@59 $generated@@127 $generated@@124)  (or (= $generated@@127 $generated@@125) (= ($generated@@126 $generated@@127) $generated@@124)))
+ :pattern ( ($generated@@42 $generated@@59 $generated@@127 $generated@@124))
+)))
+(assert (forall (($generated@@129 T@U) ) (! (= ($generated@@42 $generated@@59 $generated@@129 $generated@@128)  (or (= $generated@@129 $generated@@125) (= ($generated@@126 $generated@@129) $generated@@128)))
+ :pattern ( ($generated@@42 $generated@@59 $generated@@129 $generated@@128))
+)))
+(assert (forall (($generated@@131 T@U) ($generated@@132 T@U) ($generated@@133 T@U) ($generated@@134 T@U) ($generated@@135 T@U) ) (!  (=> (and (and ($generated@@42 $generated@@43 $generated@@131 ($generated@@130 $generated@@132 $generated@@133)) (forall (($generated@@136 T@U) ) (!  (=> ($generated@@46 $generated@@136 $generated@@134) ($generated@@46 $generated@@136 $generated@@132))
+ :pattern ( ($generated@@46 $generated@@136 $generated@@134))
+ :pattern ( ($generated@@46 $generated@@136 $generated@@132))
+))) (forall (($generated@@137 T@U) ) (!  (=> ($generated@@46 $generated@@137 $generated@@133) ($generated@@46 $generated@@137 $generated@@135))
+ :pattern ( ($generated@@46 $generated@@137 $generated@@133))
+ :pattern ( ($generated@@46 $generated@@137 $generated@@135))
+))) ($generated@@42 $generated@@43 $generated@@131 ($generated@@130 $generated@@134 $generated@@135)))
+ :pattern ( ($generated@@42 $generated@@43 $generated@@131 ($generated@@130 $generated@@132 $generated@@133)) ($generated@@42 $generated@@43 $generated@@131 ($generated@@130 $generated@@134 $generated@@135)))
+)))
+(assert (forall (($generated@@141 T@U) ($generated@@142 T@U) ) (! (= ($generated@@138 $generated@@59 $generated@@141 $generated@@139 $generated@@142) ($generated@@138 $generated@@59 $generated@@141 $generated@@140 $generated@@142))
+ :pattern ( ($generated@@138 $generated@@59 $generated@@141 $generated@@139 $generated@@142))
+)))
+(assert (forall (($generated@@144 T@U) ($generated@@145 T@U) ) (! (= ($generated@@138 $generated@@59 $generated@@144 $generated@@143 $generated@@145) ($generated@@138 $generated@@59 $generated@@144 $generated@@124 $generated@@145))
+ :pattern ( ($generated@@138 $generated@@59 $generated@@144 $generated@@143 $generated@@145))
+)))
+(assert (forall (($generated@@147 T@U) ($generated@@148 T@U) ) (! (= ($generated@@138 $generated@@59 $generated@@147 $generated@@146 $generated@@148) ($generated@@138 $generated@@59 $generated@@147 $generated@@128 $generated@@148))
+ :pattern ( ($generated@@138 $generated@@59 $generated@@147 $generated@@146 $generated@@148))
+)))
+(assert (= ($generated@@39 $generated@@149) 0))
+(assert (= ($generated@@150 $generated@@10 $generated@@21) $generated@@149))
+(assert  (not ($generated@@151 $generated@@149)))
+(assert (= ($generated@@39 $generated@@152) 0))
+(assert (= ($generated@@150 $generated@@13 $generated@@22) $generated@@152))
+(assert  (not ($generated@@151 $generated@@152)))
+(assert (forall (($generated@@159 T@U) ($generated@@160 T@U) ($generated@@161 Int) ($generated@@162 T@U) ) (!  (=> (and (and (and ($generated@@156 $generated@@159) ($generated@@156 $generated@@160)) (or (or ($generated@@157 $generated@@159 $generated@@161 $generated@@162) ($generated@@42 $generated@@59 $generated@@162 $generated@@143)) (or ($generated@@157 $generated@@160 $generated@@161 $generated@@162) ($generated@@42 $generated@@59 $generated@@162 $generated@@143)))) (and ($generated@@153 $generated@@159) ($generated@@154 $generated@@159 $generated@@160))) (=> (forall (($generated@@163 T@U) ($generated@@164 T@U) )  (=> (and (or (not (= $generated@@163 $generated@@125)) (not true)) (or (= $generated@@163 $generated@@162) (= $generated@@163 ($generated@@158 $generated@@59 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@159 $generated@@162) $generated@@149))))) (= ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@159 $generated@@163) $generated@@164) ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@160 $generated@@163) $generated@@164)))) (and (= ($generated@@155 $generated@@159 $generated@@161 $generated@@162) ($generated@@155 $generated@@160 $generated@@161 $generated@@162)) (= ($generated@@157 $generated@@159 $generated@@161 $generated@@162) ($generated@@157 $generated@@160 $generated@@161 $generated@@162)))))
+ :pattern ( ($generated@@153 $generated@@159) ($generated@@154 $generated@@159 $generated@@160) ($generated@@155 $generated@@160 $generated@@161 $generated@@162))
+)))
+(assert (forall (($generated@@165 T@U) ($generated@@166 T@U) ) (! (= ($generated@@138 $generated@@59 $generated@@165 $generated@@140 $generated@@166)  (or (= $generated@@165 $generated@@125) ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@166 $generated@@165) $generated@@2)))))
+ :pattern ( ($generated@@138 $generated@@59 $generated@@165 $generated@@140 $generated@@166))
+)))
+(assert (forall (($generated@@167 T@U) ($generated@@168 T@U) ) (! (= ($generated@@138 $generated@@59 $generated@@167 $generated@@124 $generated@@168)  (or (= $generated@@167 $generated@@125) ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@168 $generated@@167) $generated@@2)))))
+ :pattern ( ($generated@@138 $generated@@59 $generated@@167 $generated@@124 $generated@@168))
+)))
+(assert (forall (($generated@@169 T@U) ($generated@@170 T@U) ) (! (= ($generated@@138 $generated@@59 $generated@@169 $generated@@128 $generated@@170)  (or (= $generated@@169 $generated@@125) ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@170 $generated@@169) $generated@@2)))))
+ :pattern ( ($generated@@138 $generated@@59 $generated@@169 $generated@@128 $generated@@170))
+)))
+(assert (forall (($generated@@171 T@U) ($generated@@172 T@U) ) (!  (=> ($generated@@154 $generated@@171 $generated@@172) (forall (($generated@@173 T@U) ) (!  (=> ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@171 $generated@@173) $generated@@2))) ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@172 $generated@@173) $generated@@2))))
+ :pattern ( ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@172 $generated@@173) $generated@@2))
+)))
+ :pattern ( ($generated@@154 $generated@@171 $generated@@172))
+)))
+(assert (forall (($generated@@175 Int) ) (! (= ($generated@@174 $generated@@175) $generated@@175)
+ :pattern ( ($generated@@174 $generated@@175))
+)))
+(assert (forall (($generated@@177 T@U) ($generated@@178 T@T) ) (! (= ($generated@@176 $generated@@178 $generated@@177) $generated@@177)
+ :pattern ( ($generated@@176 $generated@@178 $generated@@177))
+)))
+(assert (forall (($generated@@180 T@U) ($generated@@181 T@U) ($generated@@182 T@U) ($generated@@183 T@U) ($generated@@184 T@U) ) (!  (=> (and ($generated@@156 $generated@@182) (and ($generated@@46 $generated@@184 $generated@@180) ($generated@@42 $generated@@43 $generated@@183 ($generated@@130 $generated@@180 $generated@@181)))) (= ($generated@@179 ($generated@@55 $generated@@180 $generated@@181 $generated@@48 $generated@@183 $generated@@184) $generated@@122) ($generated@@179 ($generated@@55 $generated@@180 $generated@@181 $generated@@182 $generated@@183 $generated@@184) $generated@@122)))
+ :pattern ( ($generated@@55 $generated@@180 $generated@@181 $generated@@48 $generated@@183 $generated@@184) ($generated@@156 $generated@@182))
+ :pattern ( ($generated@@55 $generated@@180 $generated@@181 $generated@@182 $generated@@183 $generated@@184))
+)))
+(assert (forall (($generated@@186 T@U) ($generated@@187 T@T) ) (! (= ($generated@@185 $generated@@187 ($generated@@158 $generated@@187 $generated@@186)) $generated@@186)
+ :pattern ( ($generated@@158 $generated@@187 $generated@@186))
+)))
+(assert (forall (($generated@@189 Int) ($generated@@190 T@U) ($generated@@191 T@U) ) (! (= ($generated@@57 ($generated@@58 $generated@@59 ($generated@@58 $generated@@60 $generated@@61)) $generated@@61 $generated@@61 ($generated@@188 $generated@@189) $generated@@190 $generated@@191) ($generated@@185 $generated@@25 ($generated@@29 (+ ($generated@@30 ($generated@@158 $generated@@25 $generated@@191)) $generated@@189))))
+ :pattern ( ($generated@@57 ($generated@@58 $generated@@59 ($generated@@58 $generated@@60 $generated@@61)) $generated@@61 $generated@@61 ($generated@@188 $generated@@189) $generated@@190 $generated@@191))
+)))
+(assert (forall (($generated@@192 T@U) ($generated@@193 T@U) ($generated@@194 T@U) ($generated@@195 T@U) ($generated@@196 T@U) ($generated@@197 T@U) ) (!  (=> (and (and (and ($generated@@154 $generated@@194 $generated@@195) (and ($generated@@156 $generated@@194) ($generated@@156 $generated@@195))) (and ($generated@@46 $generated@@197 $generated@@192) ($generated@@42 $generated@@43 $generated@@196 ($generated@@130 $generated@@192 $generated@@193)))) (forall (($generated@@198 T@U) ($generated@@199 T@U) )  (=> (and (or (not (= $generated@@198 $generated@@125)) (not true)) ($generated@@54 ($generated@@55 $generated@@192 $generated@@193 $generated@@194 $generated@@196 $generated@@197) ($generated@@185 $generated@@59 $generated@@198))) (= ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@194 $generated@@198) $generated@@199) ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@195 $generated@@198) $generated@@199))))) (= ($generated@@47 $generated@@192 $generated@@193 $generated@@194 $generated@@196 $generated@@197) ($generated@@47 $generated@@192 $generated@@193 $generated@@195 $generated@@196 $generated@@197)))
+ :pattern ( ($generated@@154 $generated@@194 $generated@@195) ($generated@@47 $generated@@192 $generated@@193 $generated@@195 $generated@@196 $generated@@197))
+)))
+(assert (forall (($generated@@200 T@U) ($generated@@201 T@U) ($generated@@202 T@U) ($generated@@203 T@U) ($generated@@204 T@U) ($generated@@205 T@U) ) (!  (=> (and (and (and ($generated@@154 $generated@@202 $generated@@203) (and ($generated@@156 $generated@@202) ($generated@@156 $generated@@203))) (and ($generated@@46 $generated@@205 $generated@@200) ($generated@@42 $generated@@43 $generated@@204 ($generated@@130 $generated@@200 $generated@@201)))) (forall (($generated@@206 T@U) ($generated@@207 T@U) )  (=> (and (or (not (= $generated@@206 $generated@@125)) (not true)) ($generated@@54 ($generated@@55 $generated@@200 $generated@@201 $generated@@203 $generated@@204 $generated@@205) ($generated@@185 $generated@@59 $generated@@206))) (= ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@202 $generated@@206) $generated@@207) ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@203 $generated@@206) $generated@@207))))) (= ($generated@@47 $generated@@200 $generated@@201 $generated@@202 $generated@@204 $generated@@205) ($generated@@47 $generated@@200 $generated@@201 $generated@@203 $generated@@204 $generated@@205)))
+ :pattern ( ($generated@@154 $generated@@202 $generated@@203) ($generated@@47 $generated@@200 $generated@@201 $generated@@203 $generated@@204 $generated@@205))
+)))
+(assert (forall (($generated@@209 T@U) ($generated@@210 T@U) ) (! (= ($generated@@42 $generated@@62 $generated@@209 ($generated@@208 $generated@@210)) (forall (($generated@@211 T@U) ) (!  (=> ($generated@@54 $generated@@209 $generated@@211) ($generated@@46 $generated@@211 $generated@@210))
+ :pattern ( ($generated@@54 $generated@@209 $generated@@211))
+)))
+ :pattern ( ($generated@@42 $generated@@62 $generated@@209 ($generated@@208 $generated@@210)))
+)))
+(assert (= ($generated@@23 $generated@@213) 9))
+(assert (forall (($generated@@214 T@U) ($generated@@215 T@U) ($generated@@216 T@T) ) (! (= ($generated@@212 $generated@@216 $generated@@214 $generated@@215) ($generated@@64 $generated@@213 $generated@@216 $generated@@214 $generated@@215))
+ :pattern ( ($generated@@212 $generated@@216 $generated@@214 $generated@@215))
+)))
+(assert ($generated@@151 $generated@@2))
+(assert ($generated@@156 $generated@@48))
+(assert (forall (($generated@@217 T@U) ($generated@@218 T@U) ) (!  (=> (and (and ($generated@@156 $generated@@217) (and (or (not (= $generated@@218 $generated@@125)) (not true)) (= ($generated@@126 $generated@@218) $generated@@128))) ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@217 $generated@@218) $generated@@2)))) ($generated@@138 $generated@@25 ($generated@@158 $generated@@25 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@217 $generated@@218) $generated@@152)) $generated $generated@@217))
+ :pattern ( ($generated@@158 $generated@@25 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@217 $generated@@218) $generated@@152)))
+)))
+(assert (forall (($generated@@220 T@U) ($generated@@221 T@U) ($generated@@222 T@U) ($generated@@223 T@T) ) (! (= ($generated@@219 ($generated@@185 $generated@@223 $generated@@220) $generated@@221 $generated@@222) ($generated@@138 $generated@@223 $generated@@220 $generated@@221 $generated@@222))
+ :pattern ( ($generated@@219 ($generated@@185 $generated@@223 $generated@@220) $generated@@221 $generated@@222))
+)))
+(assert (forall (($generated@@224 T@U) ($generated@@225 T@U) ($generated@@226 T@U) ($generated@@227 T@U) ) (!  (=> ($generated@@154 $generated@@224 $generated@@225) (=> ($generated@@219 $generated@@226 $generated@@227 $generated@@224) ($generated@@219 $generated@@226 $generated@@227 $generated@@225)))
+ :pattern ( ($generated@@154 $generated@@224 $generated@@225) ($generated@@219 $generated@@226 $generated@@227 $generated@@224))
+)))
+(assert (forall (($generated@@228 T@U) ($generated@@229 T@U) ($generated@@230 T@U) ($generated@@231 T@U) ($generated@@232 T@T) ) (!  (=> ($generated@@154 $generated@@228 $generated@@229) (=> ($generated@@138 $generated@@232 $generated@@230 $generated@@231 $generated@@228) ($generated@@138 $generated@@232 $generated@@230 $generated@@231 $generated@@229)))
+ :pattern ( ($generated@@154 $generated@@228 $generated@@229) ($generated@@138 $generated@@232 $generated@@230 $generated@@231 $generated@@228))
+)))
+(assert (forall (($generated@@233 T@U) ($generated@@234 T@U) ($generated@@235 T@U) ($generated@@236 T@U) ($generated@@237 T@U) ($generated@@238 T@U) ) (!  (=> (and (and (and ($generated@@154 $generated@@235 $generated@@236) (and ($generated@@156 $generated@@235) ($generated@@156 $generated@@236))) (and ($generated@@46 $generated@@238 $generated@@233) ($generated@@42 $generated@@43 $generated@@237 ($generated@@130 $generated@@233 $generated@@234)))) (forall (($generated@@239 T@U) ($generated@@240 T@U) )  (=> (and (or (not (= $generated@@239 $generated@@125)) (not true)) ($generated@@54 ($generated@@55 $generated@@233 $generated@@234 $generated@@235 $generated@@237 $generated@@238) ($generated@@185 $generated@@59 $generated@@239))) (= ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@235 $generated@@239) $generated@@240) ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@236 $generated@@239) $generated@@240))))) (= ($generated@@55 $generated@@233 $generated@@234 $generated@@235 $generated@@237 $generated@@238) ($generated@@55 $generated@@233 $generated@@234 $generated@@236 $generated@@237 $generated@@238)))
+ :pattern ( ($generated@@154 $generated@@235 $generated@@236) ($generated@@55 $generated@@233 $generated@@234 $generated@@236 $generated@@237 $generated@@238))
+)))
+(assert (forall (($generated@@241 T@U) ($generated@@242 T@U) ($generated@@243 T@U) ($generated@@244 T@U) ($generated@@245 T@U) ($generated@@246 T@U) ) (!  (=> (and (and (and ($generated@@154 $generated@@243 $generated@@244) (and ($generated@@156 $generated@@243) ($generated@@156 $generated@@244))) (and ($generated@@46 $generated@@246 $generated@@241) ($generated@@42 $generated@@43 $generated@@245 ($generated@@130 $generated@@241 $generated@@242)))) (forall (($generated@@247 T@U) ($generated@@248 T@U) )  (=> (and (or (not (= $generated@@247 $generated@@125)) (not true)) ($generated@@54 ($generated@@55 $generated@@241 $generated@@242 $generated@@244 $generated@@245 $generated@@246) ($generated@@185 $generated@@59 $generated@@247))) (= ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@243 $generated@@247) $generated@@248) ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@244 $generated@@247) $generated@@248))))) (= ($generated@@55 $generated@@241 $generated@@242 $generated@@243 $generated@@245 $generated@@246) ($generated@@55 $generated@@241 $generated@@242 $generated@@244 $generated@@245 $generated@@246)))
+ :pattern ( ($generated@@154 $generated@@243 $generated@@244) ($generated@@55 $generated@@241 $generated@@242 $generated@@244 $generated@@245 $generated@@246))
+)))
+(assert (forall (($generated@@250 T@U) ($generated@@251 T@U) ($generated@@252 T@U) ($generated@@253 T@U) ($generated@@254 T@U) ($generated@@255 T@U) ) (!  (=> (and (and (and ($generated@@154 $generated@@252 $generated@@253) (and ($generated@@156 $generated@@252) ($generated@@156 $generated@@253))) (and ($generated@@46 $generated@@255 $generated@@250) ($generated@@42 $generated@@43 $generated@@254 ($generated@@130 $generated@@250 $generated@@251)))) (forall (($generated@@256 T@U) ($generated@@257 T@U) )  (=> (and (or (not (= $generated@@256 $generated@@125)) (not true)) ($generated@@54 ($generated@@55 $generated@@250 $generated@@251 $generated@@252 $generated@@254 $generated@@255) ($generated@@185 $generated@@59 $generated@@256))) (= ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@252 $generated@@256) $generated@@257) ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@253 $generated@@256) $generated@@257))))) (= ($generated@@249 $generated@@250 $generated@@251 $generated@@252 $generated@@254 $generated@@255) ($generated@@249 $generated@@250 $generated@@251 $generated@@253 $generated@@254 $generated@@255)))
+ :pattern ( ($generated@@154 $generated@@252 $generated@@253) ($generated@@249 $generated@@250 $generated@@251 $generated@@253 $generated@@254 $generated@@255))
+)))
+(assert (forall (($generated@@258 T@U) ($generated@@259 T@U) ($generated@@260 T@U) ($generated@@261 T@U) ($generated@@262 T@U) ($generated@@263 T@U) ) (!  (=> (and (and (and ($generated@@154 $generated@@260 $generated@@261) (and ($generated@@156 $generated@@260) ($generated@@156 $generated@@261))) (and ($generated@@46 $generated@@263 $generated@@258) ($generated@@42 $generated@@43 $generated@@262 ($generated@@130 $generated@@258 $generated@@259)))) (forall (($generated@@264 T@U) ($generated@@265 T@U) )  (=> (and (or (not (= $generated@@264 $generated@@125)) (not true)) ($generated@@54 ($generated@@55 $generated@@258 $generated@@259 $generated@@261 $generated@@262 $generated@@263) ($generated@@185 $generated@@59 $generated@@264))) (= ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@260 $generated@@264) $generated@@265) ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@261 $generated@@264) $generated@@265))))) (= ($generated@@249 $generated@@258 $generated@@259 $generated@@260 $generated@@262 $generated@@263) ($generated@@249 $generated@@258 $generated@@259 $generated@@261 $generated@@262 $generated@@263)))
+ :pattern ( ($generated@@154 $generated@@260 $generated@@261) ($generated@@249 $generated@@258 $generated@@259 $generated@@261 $generated@@262 $generated@@263))
+)))
+(assert (forall (($generated@@266 T@U) ($generated@@267 T@U) ) (!  (=> (and ($generated@@156 $generated@@266) (and (or (not (= $generated@@267 $generated@@125)) (not true)) (= ($generated@@126 $generated@@267) $generated@@124))) ($generated@@42 $generated@@59 ($generated@@158 $generated@@59 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@266 $generated@@267) $generated@@149)) $generated@@146))
+ :pattern ( ($generated@@158 $generated@@59 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@266 $generated@@267) $generated@@149)))
+)))
+(assert (forall (($generated@@268 T@U) ($generated@@269 T@U) ($generated@@270 T@U) ) (!  (=> ($generated@@42 $generated@@43 $generated@@270 ($generated@@44 $generated@@268 $generated@@269)) (and ($generated@@42 $generated@@43 $generated@@270 ($generated@@45 $generated@@268 $generated@@269)) (and (forall (($generated@@271 T@U) )  (=> ($generated@@46 $generated@@271 $generated@@268) true)) (forall (($generated@@272 T@U) )  (=> ($generated@@46 $generated@@272 $generated@@268) ($generated@@47 $generated@@268 $generated@@269 $generated@@48 $generated@@270 $generated@@272))))))
+ :pattern ( ($generated@@42 $generated@@43 $generated@@270 ($generated@@44 $generated@@268 $generated@@269)))
+)))
+(assert (forall (($generated@@274 T@U) ($generated@@275 T@U) ) (! (= ($generated@@54 ($generated@@273 $generated@@274) $generated@@275) ($generated@@28 ($generated@@64 $generated@@59 $generated@@24 $generated@@274 ($generated@@158 $generated@@59 $generated@@275))))
+ :pattern ( ($generated@@54 ($generated@@273 $generated@@274) $generated@@275))
+)))
+(assert (forall (($generated@@276 T@U) ($generated@@277 T@U) ($generated@@278 T@U) ($generated@@279 T@U) ) (! (= ($generated@@138 $generated@@43 $generated@@278 ($generated@@45 $generated@@276 $generated@@277) $generated@@279) ($generated@@138 $generated@@43 $generated@@278 ($generated@@130 $generated@@276 $generated@@277) $generated@@279))
+ :pattern ( ($generated@@138 $generated@@43 $generated@@278 ($generated@@45 $generated@@276 $generated@@277) $generated@@279))
+)))
+(assert (forall (($generated@@280 T@U) ($generated@@281 T@U) ($generated@@282 T@U) ($generated@@283 T@U) ) (! (= ($generated@@138 $generated@@43 $generated@@282 ($generated@@44 $generated@@280 $generated@@281) $generated@@283) ($generated@@138 $generated@@43 $generated@@282 ($generated@@45 $generated@@280 $generated@@281) $generated@@283))
+ :pattern ( ($generated@@138 $generated@@43 $generated@@282 ($generated@@44 $generated@@280 $generated@@281) $generated@@283))
+)))
+(assert (forall (($generated@@284 T@U) ($generated@@285 T@U) ($generated@@286 T@U) ($generated@@287 T@U) ($generated@@288 T@U) ($generated@@289 T@U) ($generated@@290 T@U) ) (! (= ($generated@@249 $generated@@284 $generated@@285 $generated@@286 ($generated@@56 $generated@@287 $generated@@288 $generated@@289) $generated@@290) ($generated@@57 ($generated@@58 $generated@@59 ($generated@@58 $generated@@60 $generated@@61)) $generated@@61 $generated@@61 $generated@@287 $generated@@286 $generated@@290))
+ :pattern ( ($generated@@249 $generated@@284 $generated@@285 $generated@@286 ($generated@@56 $generated@@287 $generated@@288 $generated@@289) $generated@@290))
+)))
+(assert (forall (($generated@@291 T@U) ) (!  (=> ($generated@@46 $generated@@291 $generated@@140) (and (= ($generated@@185 $generated@@59 ($generated@@158 $generated@@59 $generated@@291)) $generated@@291) ($generated@@42 $generated@@59 ($generated@@158 $generated@@59 $generated@@291) $generated@@140)))
+ :pattern ( ($generated@@46 $generated@@291 $generated@@140))
+)))
+(assert (forall (($generated@@292 T@U) ) (!  (=> ($generated@@46 $generated@@292 $generated@@139) (and (= ($generated@@185 $generated@@59 ($generated@@158 $generated@@59 $generated@@292)) $generated@@292) ($generated@@42 $generated@@59 ($generated@@158 $generated@@59 $generated@@292) $generated@@139)))
+ :pattern ( ($generated@@46 $generated@@292 $generated@@139))
+)))
+(assert (forall (($generated@@293 T@U) ) (!  (=> ($generated@@46 $generated@@293 $generated@@143) (and (= ($generated@@185 $generated@@59 ($generated@@158 $generated@@59 $generated@@293)) $generated@@293) ($generated@@42 $generated@@59 ($generated@@158 $generated@@59 $generated@@293) $generated@@143)))
+ :pattern ( ($generated@@46 $generated@@293 $generated@@143))
+)))
+(assert (forall (($generated@@294 T@U) ) (!  (=> ($generated@@46 $generated@@294 $generated@@124) (and (= ($generated@@185 $generated@@59 ($generated@@158 $generated@@59 $generated@@294)) $generated@@294) ($generated@@42 $generated@@59 ($generated@@158 $generated@@59 $generated@@294) $generated@@124)))
+ :pattern ( ($generated@@46 $generated@@294 $generated@@124))
+)))
+(assert (forall (($generated@@295 T@U) ) (!  (=> ($generated@@46 $generated@@295 $generated@@146) (and (= ($generated@@185 $generated@@59 ($generated@@158 $generated@@59 $generated@@295)) $generated@@295) ($generated@@42 $generated@@59 ($generated@@158 $generated@@59 $generated@@295) $generated@@146)))
+ :pattern ( ($generated@@46 $generated@@295 $generated@@146))
+)))
+(assert (forall (($generated@@296 T@U) ) (!  (=> ($generated@@46 $generated@@296 $generated@@128) (and (= ($generated@@185 $generated@@59 ($generated@@158 $generated@@59 $generated@@296)) $generated@@296) ($generated@@42 $generated@@59 ($generated@@158 $generated@@59 $generated@@296) $generated@@128)))
+ :pattern ( ($generated@@46 $generated@@296 $generated@@128))
+)))
+(assert (forall (($generated@@297 T@U) ) (! (= ($generated@@42 $generated@@59 $generated@@297 $generated@@139)  (and ($generated@@42 $generated@@59 $generated@@297 $generated@@140) (or (not (= $generated@@297 $generated@@125)) (not true))))
+ :pattern ( ($generated@@42 $generated@@59 $generated@@297 $generated@@139))
+ :pattern ( ($generated@@42 $generated@@59 $generated@@297 $generated@@140))
+)))
+(assert (forall (($generated@@298 T@U) ) (! (= ($generated@@42 $generated@@59 $generated@@298 $generated@@143)  (and ($generated@@42 $generated@@59 $generated@@298 $generated@@124) (or (not (= $generated@@298 $generated@@125)) (not true))))
+ :pattern ( ($generated@@42 $generated@@59 $generated@@298 $generated@@143))
+ :pattern ( ($generated@@42 $generated@@59 $generated@@298 $generated@@124))
+)))
+(assert (forall (($generated@@299 T@U) ) (! (= ($generated@@42 $generated@@59 $generated@@299 $generated@@146)  (and ($generated@@42 $generated@@59 $generated@@299 $generated@@128) (or (not (= $generated@@299 $generated@@125)) (not true))))
+ :pattern ( ($generated@@42 $generated@@59 $generated@@299 $generated@@146))
+ :pattern ( ($generated@@42 $generated@@59 $generated@@299 $generated@@128))
+)))
+(assert (forall (($generated@@300 T@U) ($generated@@301 T@U) ) (!  (=> (and (and ($generated@@156 $generated@@300) (and (or (not (= $generated@@301 $generated@@125)) (not true)) (= ($generated@@126 $generated@@301) $generated@@124))) ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@300 $generated@@301) $generated@@2)))) ($generated@@138 $generated@@59 ($generated@@158 $generated@@59 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@300 $generated@@301) $generated@@149)) $generated@@146 $generated@@300))
+ :pattern ( ($generated@@158 $generated@@59 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@300 $generated@@301) $generated@@149)))
+)))
+(assert (forall (($generated@@302 T@U) ($generated@@303 T@U) ($generated@@304 T@U) ($generated@@305 T@U) ) (!  (=> (and ($generated@@156 $generated@@305) ($generated@@138 $generated@@43 $generated@@302 ($generated@@130 $generated@@303 $generated@@304) $generated@@305)) (forall (($generated@@306 T@U) ) (!  (=> (and ($generated@@219 $generated@@306 $generated@@303 $generated@@305) ($generated@@47 $generated@@303 $generated@@304 $generated@@305 $generated@@302 $generated@@306)) ($generated@@219 ($generated@@249 $generated@@303 $generated@@304 $generated@@305 $generated@@302 $generated@@306) $generated@@304 $generated@@305))
+ :pattern ( ($generated@@249 $generated@@303 $generated@@304 $generated@@305 $generated@@302 $generated@@306))
+)))
+ :pattern ( ($generated@@138 $generated@@43 $generated@@302 ($generated@@130 $generated@@303 $generated@@304) $generated@@305))
+)))
+(assert (forall (($generated@@307 T@U) ($generated@@308 Int) ($generated@@309 T@U) ) (!  (=> ($generated@@157 $generated@@307 $generated@@308 $generated@@309) (= ($generated@@155 $generated@@307 $generated@@308 $generated@@309) ($generated@@174 3)))
+ :pattern ( ($generated@@155 $generated@@307 $generated@@308 $generated@@309) ($generated@@156 $generated@@307))
+)))
+(assert (forall (($generated@@311 Bool) ($generated@@312 T@U) ) (! (= ($generated@@28 ($generated@@64 $generated@@59 $generated@@24 ($generated@@310 $generated@@311) $generated@@312)) $generated@@311)
+ :pattern ( ($generated@@64 $generated@@59 $generated@@24 ($generated@@310 $generated@@311) $generated@@312))
+)))
+(assert (forall (($generated@@314 T@U) ($generated@@315 T@U) ) (! (= ($generated@@64 $generated@@213 $generated@@43 ($generated@@313 $generated@@314) $generated@@315) $generated@@314)
+ :pattern ( ($generated@@64 $generated@@213 $generated@@43 ($generated@@313 $generated@@314) $generated@@315))
+)))
+(assert (forall (($generated@@316 T@U) ($generated@@317 T@U) ) (!  (=> ($generated@@179 $generated@@316 $generated@@317) (= $generated@@316 $generated@@317))
+ :pattern ( ($generated@@179 $generated@@316 $generated@@317))
+)))
+(assert (forall (($generated@@318 T@U) ($generated@@319 T@U) ($generated@@320 T@U) ) (!  (=> (or (not (= $generated@@318 $generated@@320)) (not true)) (=> (and ($generated@@154 $generated@@318 $generated@@319) ($generated@@154 $generated@@319 $generated@@320)) ($generated@@154 $generated@@318 $generated@@320)))
+ :pattern ( ($generated@@154 $generated@@318 $generated@@319) ($generated@@154 $generated@@319 $generated@@320))
+)))
+(assert (forall (($generated@@321 T@U) ($generated@@322 T@U) ($generated@@323 T@U) ) (! (= ($generated@@42 $generated@@43 $generated@@321 ($generated@@130 $generated@@322 $generated@@323)) (forall (($generated@@324 T@U) ($generated@@325 T@U) ) (!  (=> (and (and ($generated@@156 $generated@@324) ($generated@@46 $generated@@325 $generated@@322)) ($generated@@47 $generated@@322 $generated@@323 $generated@@324 $generated@@321 $generated@@325)) ($generated@@46 ($generated@@249 $generated@@322 $generated@@323 $generated@@324 $generated@@321 $generated@@325) $generated@@323))
+ :pattern ( ($generated@@249 $generated@@322 $generated@@323 $generated@@324 $generated@@321 $generated@@325))
+)))
+ :pattern ( ($generated@@42 $generated@@43 $generated@@321 ($generated@@130 $generated@@322 $generated@@323)))
+)))
+(assert (forall (($generated@@327 T@U) ($generated@@328 T@U) ) (!  (and (= ($generated@@326 ($generated@@150 $generated@@327 $generated@@328)) $generated@@327) (= ($generated@@41 ($generated@@150 $generated@@327 $generated@@328)) $generated@@328))
+ :pattern ( ($generated@@150 $generated@@327 $generated@@328))
+)))
+(assert (forall (($generated@@329 T@U) ) (!  (=> ($generated@@46 $generated@@329 $generated) (and (= ($generated@@185 $generated@@25 ($generated@@158 $generated@@25 $generated@@329)) $generated@@329) ($generated@@42 $generated@@25 ($generated@@158 $generated@@25 $generated@@329) $generated)))
+ :pattern ( ($generated@@46 $generated@@329 $generated))
+)))
+(assert (forall (($generated@@330 T@U) ($generated@@331 T@U) ($generated@@332 T@T) ) (! (= ($generated@@46 ($generated@@185 $generated@@332 $generated@@330) $generated@@331) ($generated@@42 $generated@@332 $generated@@330 $generated@@331))
+ :pattern ( ($generated@@46 ($generated@@185 $generated@@332 $generated@@330) $generated@@331))
+)))
+(assert (forall (($generated@@333 T@U) ($generated@@334 T@U) ($generated@@335 T@U) ($generated@@336 T@U) ($generated@@337 T@U) ($generated@@338 T@U) ($generated@@339 T@U) ) (!  (=> ($generated@@28 ($generated@@57 ($generated@@58 $generated@@59 ($generated@@58 $generated@@60 $generated@@61)) $generated@@61 $generated@@24 $generated@@337 $generated@@335 $generated@@339)) ($generated@@47 $generated@@333 $generated@@334 $generated@@335 ($generated@@56 $generated@@336 $generated@@337 $generated@@338) $generated@@339))
+ :pattern ( ($generated@@47 $generated@@333 $generated@@334 $generated@@335 ($generated@@56 $generated@@336 $generated@@337 $generated@@338) $generated@@339))
+)))
+(assert (forall (($generated@@340 T@U) ($generated@@341 T@U) ($generated@@342 T@U) ) (! (= ($generated@@138 $generated@@62 $generated@@340 ($generated@@208 $generated@@341) $generated@@342) (forall (($generated@@343 T@U) ) (!  (=> ($generated@@54 $generated@@340 $generated@@343) ($generated@@219 $generated@@343 $generated@@341 $generated@@342))
+ :pattern ( ($generated@@54 $generated@@340 $generated@@343))
+)))
+ :pattern ( ($generated@@138 $generated@@62 $generated@@340 ($generated@@208 $generated@@341) $generated@@342))
+)))
+(assert (forall (($generated@@345 T@U) ($generated@@346 T@U) ) (! (= ($generated@@344 ($generated@@130 $generated@@345 $generated@@346)) $generated@@345)
+ :pattern ( ($generated@@130 $generated@@345 $generated@@346))
+)))
+(assert (forall (($generated@@348 T@U) ($generated@@349 T@U) ) (! (= ($generated@@347 ($generated@@130 $generated@@348 $generated@@349)) $generated@@349)
+ :pattern ( ($generated@@130 $generated@@348 $generated@@349))
+)))
+(assert (forall (($generated@@351 T@U) ($generated@@352 T@U) ) (! (= ($generated@@350 ($generated@@45 $generated@@351 $generated@@352)) $generated@@351)
+ :pattern ( ($generated@@45 $generated@@351 $generated@@352))
+)))
+(assert (forall (($generated@@354 T@U) ($generated@@355 T@U) ) (! (= ($generated@@353 ($generated@@45 $generated@@354 $generated@@355)) $generated@@355)
+ :pattern ( ($generated@@45 $generated@@354 $generated@@355))
+)))
+(assert (forall (($generated@@357 T@U) ($generated@@358 T@U) ) (! (= ($generated@@356 ($generated@@44 $generated@@357 $generated@@358)) $generated@@357)
+ :pattern ( ($generated@@44 $generated@@357 $generated@@358))
+)))
+(assert (forall (($generated@@360 T@U) ($generated@@361 T@U) ) (! (= ($generated@@359 ($generated@@44 $generated@@360 $generated@@361)) $generated@@361)
+ :pattern ( ($generated@@44 $generated@@360 $generated@@361))
+)))
+(assert (forall (($generated@@362 T@U) ) (! ($generated@@42 $generated@@59 $generated@@362 $generated@@140)
+ :pattern ( ($generated@@42 $generated@@59 $generated@@362 $generated@@140))
+)))
+(assert (forall (($generated@@364 T@U) ) (! (= ($generated@@363 ($generated@@208 $generated@@364)) $generated@@364)
+ :pattern ( ($generated@@208 $generated@@364))
+)))
+(assert (forall (($generated@@365 T@U) ) (! (= ($generated@@40 ($generated@@208 $generated@@365)) $generated@@1)
+ :pattern ( ($generated@@208 $generated@@365))
+)))
+(assert (forall (($generated@@366 T@U) ($generated@@367 T@T) ) (! (= ($generated@@158 $generated@@367 ($generated@@185 $generated@@367 $generated@@366)) $generated@@366)
+ :pattern ( ($generated@@185 $generated@@367 $generated@@366))
+)))
+(assert (forall (($generated@@368 T@U) ($generated@@369 T@U) ) (!  (=> (and ($generated@@156 $generated@@368) (and (or (not (= $generated@@369 $generated@@125)) (not true)) (= ($generated@@126 $generated@@369) $generated@@128))) ($generated@@42 $generated@@25 ($generated@@158 $generated@@25 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@368 $generated@@369) $generated@@152)) $generated))
+ :pattern ( ($generated@@158 $generated@@25 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@368 $generated@@369) $generated@@152)))
+)))
+(assert (forall (($generated@@370 T@U) ($generated@@371 T@U) ($generated@@372 T@U) ) (! (= ($generated@@42 $generated@@43 $generated@@372 ($generated@@45 $generated@@370 $generated@@371))  (and ($generated@@42 $generated@@43 $generated@@372 ($generated@@130 $generated@@370 $generated@@371)) (forall (($generated@@373 T@U) )  (=> ($generated@@46 $generated@@373 $generated@@370) ($generated@@179 ($generated@@55 $generated@@370 $generated@@371 $generated@@48 $generated@@372 $generated@@373) $generated@@122)))))
+ :pattern ( ($generated@@42 $generated@@43 $generated@@372 ($generated@@45 $generated@@370 $generated@@371)))
+)))
+(assert (forall (($generated@@375 T@U) ($generated@@376 T@U) ($generated@@377 T@T) ) (! (= ($generated@@212 $generated@@377 $generated@@375 ($generated@@374 $generated@@376)) ($generated@@212 $generated@@377 $generated@@375 $generated@@376))
+ :pattern ( ($generated@@212 $generated@@377 $generated@@375 ($generated@@374 $generated@@376)))
+)))
+(assert (forall (($generated@@378 T@U) ($generated@@379 T@U) ($generated@@380 T@U) ($generated@@381 T@U) ) (!  (=> ($generated@@156 $generated@@381) (= ($generated@@138 $generated@@43 $generated@@378 ($generated@@130 $generated@@379 $generated@@380) $generated@@381) (forall (($generated@@382 T@U) ) (!  (=> (and (and ($generated@@46 $generated@@382 $generated@@379) ($generated@@219 $generated@@382 $generated@@379 $generated@@381)) ($generated@@47 $generated@@379 $generated@@380 $generated@@381 $generated@@378 $generated@@382)) (forall (($generated@@383 T@U) ) (!  (=> (and (or (not (= $generated@@383 $generated@@125)) (not true)) ($generated@@54 ($generated@@55 $generated@@379 $generated@@380 $generated@@381 $generated@@378 $generated@@382) ($generated@@185 $generated@@59 $generated@@383))) ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@381 $generated@@383) $generated@@2))))
+ :pattern ( ($generated@@54 ($generated@@55 $generated@@379 $generated@@380 $generated@@381 $generated@@378 $generated@@382) ($generated@@185 $generated@@59 $generated@@383)))
+)))
+ :pattern ( ($generated@@249 $generated@@379 $generated@@380 $generated@@381 $generated@@378 $generated@@382))
+ :pattern ( ($generated@@55 $generated@@379 $generated@@380 $generated@@381 $generated@@378 $generated@@382))
+))))
+ :pattern ( ($generated@@138 $generated@@43 $generated@@378 ($generated@@130 $generated@@379 $generated@@380) $generated@@381))
+)))
+(assert (forall (($generated@@384 T@U) ($generated@@385 T@U) ($generated@@386 T@U) ) (!  (=> ($generated@@46 $generated@@386 ($generated@@130 $generated@@384 $generated@@385)) (and (= ($generated@@185 $generated@@43 ($generated@@158 $generated@@43 $generated@@386)) $generated@@386) ($generated@@42 $generated@@43 ($generated@@158 $generated@@43 $generated@@386) ($generated@@130 $generated@@384 $generated@@385))))
+ :pattern ( ($generated@@46 $generated@@386 ($generated@@130 $generated@@384 $generated@@385)))
+)))
+(assert (forall (($generated@@387 T@U) ($generated@@388 T@U) ($generated@@389 T@U) ) (!  (=> ($generated@@46 $generated@@389 ($generated@@45 $generated@@387 $generated@@388)) (and (= ($generated@@185 $generated@@43 ($generated@@158 $generated@@43 $generated@@389)) $generated@@389) ($generated@@42 $generated@@43 ($generated@@158 $generated@@43 $generated@@389) ($generated@@45 $generated@@387 $generated@@388))))
+ :pattern ( ($generated@@46 $generated@@389 ($generated@@45 $generated@@387 $generated@@388)))
+)))
+(assert (forall (($generated@@390 T@U) ($generated@@391 T@U) ($generated@@392 T@U) ) (!  (=> ($generated@@46 $generated@@392 ($generated@@44 $generated@@390 $generated@@391)) (and (= ($generated@@185 $generated@@43 ($generated@@158 $generated@@43 $generated@@392)) $generated@@392) ($generated@@42 $generated@@43 ($generated@@158 $generated@@43 $generated@@392) ($generated@@44 $generated@@390 $generated@@391))))
+ :pattern ( ($generated@@46 $generated@@392 ($generated@@44 $generated@@390 $generated@@391)))
+)))
+(assert (forall (($generated@@394 T@U) ($generated@@395 T@U) ($generated@@396 T@U) ($generated@@397 Bool) ($generated@@398 T@U) ($generated@@399 T@U) ) (! (= ($generated@@28 ($generated@@57 $generated@@59 $generated@@60 $generated@@24 ($generated@@393 $generated@@394 $generated@@395 $generated@@396 $generated@@397) $generated@@398 $generated@@399))  (=> (and (or (not (= $generated@@398 $generated@@394)) (not true)) ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@395 $generated@@398) $generated@@396)))) $generated@@397))
+ :pattern ( ($generated@@57 $generated@@59 $generated@@60 $generated@@24 ($generated@@393 $generated@@394 $generated@@395 $generated@@396 $generated@@397) $generated@@398 $generated@@399))
+)))
+(assert (forall (($generated@@401 T@U) ($generated@@402 T@U) ) (!  (and (= ($generated@@40 ($generated@@130 $generated@@401 $generated@@402)) $generated@@6) (= ($generated@@400 ($generated@@130 $generated@@401 $generated@@402)) $generated@@16))
+ :pattern ( ($generated@@130 $generated@@401 $generated@@402))
+)))
+(assert (forall (($generated@@403 T@U) ($generated@@404 T@U) ) (!  (and (= ($generated@@40 ($generated@@45 $generated@@403 $generated@@404)) $generated@@7) (= ($generated@@400 ($generated@@45 $generated@@403 $generated@@404)) $generated@@17))
+ :pattern ( ($generated@@45 $generated@@403 $generated@@404))
+)))
+(assert (forall (($generated@@405 T@U) ($generated@@406 T@U) ) (!  (and (= ($generated@@40 ($generated@@44 $generated@@405 $generated@@406)) $generated@@8) (= ($generated@@400 ($generated@@44 $generated@@405 $generated@@406)) $generated@@18))
+ :pattern ( ($generated@@44 $generated@@405 $generated@@406))
+)))
+(assert (forall (($generated@@407 T@U) ($generated@@408 T@U) ($generated@@409 T@U) ($generated@@410 T@U) ($generated@@411 T@U) ) (!  (=> (and (and ($generated@@156 $generated@@409) (and ($generated@@46 $generated@@411 $generated@@407) ($generated@@42 $generated@@43 $generated@@410 ($generated@@130 $generated@@407 $generated@@408)))) ($generated@@179 ($generated@@55 $generated@@407 $generated@@408 $generated@@48 $generated@@410 $generated@@411) $generated@@122)) (= ($generated@@47 $generated@@407 $generated@@408 $generated@@48 $generated@@410 $generated@@411) ($generated@@47 $generated@@407 $generated@@408 $generated@@409 $generated@@410 $generated@@411)))
+ :pattern ( ($generated@@47 $generated@@407 $generated@@408 $generated@@48 $generated@@410 $generated@@411) ($generated@@156 $generated@@409))
+ :pattern ( ($generated@@47 $generated@@407 $generated@@408 $generated@@409 $generated@@410 $generated@@411))
+)))
+(assert (forall (($generated@@412 T@U) ($generated@@413 T@U) ) (!  (=> ($generated@@46 $generated@@412 ($generated@@208 $generated@@413)) (and (= ($generated@@185 $generated@@62 ($generated@@158 $generated@@62 $generated@@412)) $generated@@412) ($generated@@42 $generated@@62 ($generated@@158 $generated@@62 $generated@@412) ($generated@@208 $generated@@413))))
+ :pattern ( ($generated@@46 $generated@@412 ($generated@@208 $generated@@413)))
+)))
+(assert (= ($generated@@40 $generated@@140) $generated@@4))
+(assert (= ($generated@@400 $generated@@140) $generated@@15))
+(assert (= ($generated@@40 $generated@@139) $generated@@5))
+(assert (= ($generated@@400 $generated@@139) $generated@@15))
+(assert (= ($generated@@40 $generated@@143) $generated@@9))
+(assert (= ($generated@@400 $generated@@143) $generated@@19))
+(assert (= ($generated@@40 $generated@@124) $generated@@11))
+(assert (= ($generated@@400 $generated@@124) $generated@@19))
+(assert (= ($generated@@40 $generated@@146) $generated@@12))
+(assert (= ($generated@@400 $generated@@146) $generated@@20))
+(assert (= ($generated@@40 $generated@@128) $generated@@14))
+(assert (= ($generated@@400 $generated@@128) $generated@@20))
+(assert (forall (($generated@@414 T@U) ) (! ($generated@@42 $generated@@62 ($generated@@273 $generated@@414) ($generated@@208 $generated@@140))
+ :pattern ( ($generated@@273 $generated@@414))
+)))
+(assert (forall (($generated@@415 T@U) ($generated@@416 Int) ($generated@@417 T@U) ) (!  (=> ($generated@@157 $generated@@415 $generated@@416 $generated@@417) (and (and ($generated@@157 $generated@@415 $generated@@416 $generated@@417) (= ($generated@@155 $generated@@415 $generated@@416 $generated@@417) ($generated@@30 ($generated@@158 $generated@@25 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@415 ($generated@@158 $generated@@59 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@415 $generated@@417) $generated@@149))) $generated@@152))))) (<= ($generated@@174 0) ($generated@@155 $generated@@415 $generated@@416 $generated@@417))))
+ :pattern ( ($generated@@155 $generated@@415 $generated@@416 $generated@@417))
+)))
+(assert (forall (($generated@@418 T@U) ($generated@@419 T@U) ) (! (= ($generated@@179 $generated@@418 $generated@@419) (forall (($generated@@420 T@U) ) (! (= ($generated@@54 $generated@@418 $generated@@420) ($generated@@54 $generated@@419 $generated@@420))
+ :pattern ( ($generated@@54 $generated@@418 $generated@@420))
+ :pattern ( ($generated@@54 $generated@@419 $generated@@420))
+)))
+ :pattern ( ($generated@@179 $generated@@418 $generated@@419))
+)))
+(assert (forall (($generated@@421 Int) ) (! (= ($generated@@185 $generated@@25 ($generated@@29 ($generated@@174 $generated@@421))) ($generated@@176 $generated@@61 ($generated@@185 $generated@@25 ($generated@@29 $generated@@421))))
+ :pattern ( ($generated@@185 $generated@@25 ($generated@@29 ($generated@@174 $generated@@421))))
+)))
+(assert (forall (($generated@@422 T@U) ($generated@@423 T@T) ) (! (= ($generated@@185 $generated@@423 ($generated@@176 $generated@@423 $generated@@422)) ($generated@@176 $generated@@61 ($generated@@185 $generated@@423 $generated@@422)))
+ :pattern ( ($generated@@185 $generated@@423 ($generated@@176 $generated@@423 $generated@@422)))
+)))
+(assert (forall (($generated@@424 T@U) ($generated@@425 T@U) ) (! ($generated@@138 $generated@@25 $generated@@425 $generated $generated@@424)
+ :pattern ( ($generated@@138 $generated@@25 $generated@@425 $generated $generated@@424))
+)))
+(assert (forall (($generated@@427 T@U) ($generated@@428 T@U) ($generated@@429 T@U) ) (! (= ($generated@@57 ($generated@@58 $generated@@59 ($generated@@58 $generated@@60 $generated@@61)) $generated@@61 $generated@@62 ($generated@@426 $generated@@427) $generated@@428 $generated@@429) $generated@@427)
+ :pattern ( ($generated@@57 ($generated@@58 $generated@@59 ($generated@@58 $generated@@60 $generated@@61)) $generated@@61 $generated@@62 ($generated@@426 $generated@@427) $generated@@428 $generated@@429))
+)))
+(assert (forall (($generated@@430 T@U) ) (! ($generated@@42 $generated@@25 $generated@@430 $generated)
+ :pattern ( ($generated@@42 $generated@@25 $generated@@430 $generated))
+)))
+(push 1)
+(declare-fun ControlFlow (Int Int) Int)
+(declare-fun $generated@@431 () T@U)
+(declare-fun $generated@@432 () T@U)
+(declare-fun $generated@@433 () Bool)
+(declare-fun $generated@@434 () Int)
+(declare-fun $generated@@435 () T@U)
+(declare-fun $generated@@436 () T@U)
+(declare-fun $generated@@437 () T@U)
+(declare-fun $generated@@438 () T@U)
+(declare-fun $generated@@439 () T@U)
+(declare-fun $generated@@440 () T@U)
+(declare-fun $generated@@441 () Int)
+(declare-fun $generated@@442 () Bool)
+(declare-fun $generated@@443 () T@U)
+(declare-fun $generated@@444 () T@U)
+(declare-fun $generated@@445 () Bool)
+(declare-fun $generated@@446 () T@U)
+(set-option :timeout 0)
+(set-option :rlimit 0)
+(set-option :auto_config false)
+(set-option :type_check true)
+(set-option :smt.qi.eager_threshold 100)
+(set-option :smt.delay_units true)
+(set-option :model_evaluator.completion true)
+(set-option :model.completion true)
+(set-option :model.compact false)
+(set-option :smt.case_split 3)
+(set-option :smt.mbqi false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+(set-option :smt.arith.solver 2)
+(assert (not
+ (=> (= (ControlFlow 0 0) 9) (let (($generated@@447 true))
+(let (($generated@@448 true))
+(let (($generated@@449  (=> (and ($generated@@156 $generated@@431) (or (= $generated@@432 $generated@@431) ($generated@@154 $generated@@432 $generated@@431))) (and (=> (= (ControlFlow 0 7) 5) $generated@@448) (=> (= (ControlFlow 0 7) 6) $generated@@447)))))
+(let (($generated@@450  (=> (= (ControlFlow 0 2) (- 0 1)) (= $generated@@433 (= $generated@@434 ($generated@@174 2))))))
+(let (($generated@@451  (=> (= $generated@@435 ($generated@@176 $generated@@43 ($generated@@212 $generated@@43 ($generated@@313 ($generated@@56 ($generated@@188 1) ($generated@@118 $generated) ($generated@@426 ($generated@@273 ($generated@@310 false))))) ($generated@@374 $generated@@436)))) (=> (and (and (or (not (= $generated@@437 $generated@@125)) (not true)) (and ($generated@@42 $generated@@59 $generated@@437 $generated@@143) ($generated@@138 $generated@@59 $generated@@437 $generated@@143 $generated@@438))) (and ($generated@@156 $generated@@439) ($generated@@153 $generated@@439))) (=> (and (and (and (or (not (= $generated@@440 $generated@@125)) (not true)) (and ($generated@@42 $generated@@59 $generated@@440 $generated@@143) ($generated@@138 $generated@@59 $generated@@440 $generated@@143 $generated@@439))) (not ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@432 $generated@@440) $generated@@2))))) (and (and (forall (($generated@@452 T@U) ) (!  (=> (and (or (not (= $generated@@452 $generated@@125)) (not true)) ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@432 $generated@@452) $generated@@2)))) (= ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@439 $generated@@452) ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@432 $generated@@452)))
+ :pattern ( ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@439 $generated@@452))
+)) ($generated@@154 $generated@@432 $generated@@439)) (and (= $generated@@441 ($generated@@174 42)) ($generated@@138 $generated@@25 ($generated@@29 $generated@@441) $generated $generated@@439)))) (and (=> (= (ControlFlow 0 3) (- 0 4)) true) (=> (and ($generated@@138 $generated@@59 $generated@@440 $generated@@143 $generated@@439) ($generated@@157 $generated@@439 ($generated@@174 42) $generated@@440)) (=> (and (and ($generated@@157 $generated@@439 ($generated@@174 42) $generated@@440) (= $generated@@442 (= $generated@@434 ($generated@@155 $generated@@439 ($generated@@174 42) $generated@@440)))) (and (= $generated@@433 $generated@@442) (= (ControlFlow 0 3) 2))) $generated@@450))))))))
+(let (($generated@@453  (=> (= $generated@@443 ($generated@@393 $generated@@125 $generated@@438 $generated@@2 false)) (=> (and (and (and ($generated@@156 $generated@@432) ($generated@@153 $generated@@432)) ($generated@@28 ($generated@@176 $generated@@24 ($generated@@27 false)))) (and (forall (($generated@@454 T@U) ) (!  (=> (and (or (not (= $generated@@454 $generated@@125)) (not true)) ($generated@@28 ($generated@@158 $generated@@24 ($generated@@64 $generated@@60 $generated@@61 ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@438 $generated@@454) $generated@@2)))) (= ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@432 $generated@@454) ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@438 $generated@@454)))
+ :pattern ( ($generated@@64 $generated@@59 ($generated@@58 $generated@@60 $generated@@61) $generated@@432 $generated@@454))
+)) ($generated@@154 $generated@@438 $generated@@432))) (and (=> (= (ControlFlow 0 8) 7) $generated@@449) (=> (= (ControlFlow 0 8) 3) $generated@@451))))))
+(let (($generated@@455  (=> (and ($generated@@156 $generated@@438) ($generated@@153 $generated@@438)) (=> (and (and (and ($generated@@42 $generated@@43 $generated@@444 ($generated@@44 $generated $generated)) ($generated@@138 $generated@@43 $generated@@444 ($generated@@44 $generated $generated) $generated@@438)) true) (and (and (=> $generated@@445 (and ($generated@@42 $generated@@59 $generated@@446 $generated@@143) ($generated@@138 $generated@@59 $generated@@446 $generated@@143 $generated@@438))) true) (and (= $generated@@434 ($generated@@174 2)) (= (ControlFlow 0 9) 8)))) $generated@@453))))
+$generated@@455))))))))
+))
+(check-sat)
+(get-info :rlimit)
+(pop 1)
+; Valid
+(reset)
+(set-option :rlimit 0)
+; did a full reset
+(reset)
+(set-option :print-success false)
+(set-info :smt-lib-version 2.6)
+(set-option :auto_config false)
+(set-option :type_check true)
+(set-option :smt.qi.eager_threshold 100)
+(set-option :smt.delay_units true)
+(set-option :model_evaluator.completion true)
+(set-option :model.completion true)
+(set-option :model.compact false)
+(set-option :smt.case_split 3)
+(set-option :smt.mbqi false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+(set-option :smt.arith.solver 2)
+; done setting options
+
+
+(set-info :category "industrial")
+(declare-sort |T@U| 0)
+(declare-sort |T@T| 0)
+(declare-fun real_pow (Real Real) Real)
+(declare-fun UOrdering2 (|T@U| |T@U|) Bool)
+(declare-fun UOrdering3 (|T@T| |T@U| |T@U|) Bool)
+(declare-fun tickleBool (Bool) Bool)
+(assert (and (tickleBool true) (tickleBool false)))
+(declare-fun $generated () T@U)
+(declare-fun $generated@@0 () T@U)
+(declare-fun $generated@@1 () T@U)
+(declare-fun $generated@@2 () T@U)
+(declare-fun $generated@@3 () T@U)
+(declare-fun $generated@@4 () T@U)
+(declare-fun $generated@@5 () T@U)
+(declare-fun $generated@@6 () T@U)
+(declare-fun $generated@@7 () T@U)
+(declare-fun $generated@@8 () T@U)
+(declare-fun $generated@@9 () T@U)
+(declare-fun $generated@@10 (T@T) Int)
+(declare-fun $generated@@11 () T@T)
+(declare-fun $generated@@12 () T@T)
+(declare-fun $generated@@13 () T@T)
+(declare-fun $generated@@14 (Bool) T@U)
+(declare-fun $generated@@15 (T@U) Bool)
+(declare-fun $generated@@16 (Int) T@U)
+(declare-fun $generated@@17 (T@U) Int)
+(declare-fun $generated@@18 (Real) T@U)
+(declare-fun $generated@@19 (T@U) Real)
+(declare-fun $generated@@26 (T@U T@U T@U) Bool)
+(declare-fun $generated@@27 (T@U T@U T@U) Bool)
+(declare-fun $generated@@28 (T@U T@U T@U T@U T@U) Bool)
+(declare-fun $generated@@29 () T@U)
+(declare-fun $generated@@30 (T@U) T@U)
+(declare-fun $generated@@31 (T@T T@T T@U T@U) T@U)
+(declare-fun $generated@@32 () T@T)
+(declare-fun $generated@@33 (T@U) T@U)
+(declare-fun $generated@@34 (T@U T@U) Bool)
+(declare-fun $generated@@35 (T@U) Bool)
+(declare-fun $generated@@36 (T@T T@T T@U T@U T@U) T@U)
+(declare-fun $generated@@53 (T@U) T@U)
+(declare-fun $generated@@54 (T@T T@U T@U) Bool)
+(declare-fun $generated@@55 () T@T)
+(declare-fun $generated@@56 (T@U T@U) T@U)
+(declare-fun $generated@@60 (T@U T@U) Bool)
+(declare-fun $generated@@61 () T@U)
+(declare-fun $generated@@63 () T@T)
+(declare-fun $generated@@64 (T@U T@U) T@U)
+(declare-fun $generated@@72 (T@T T@U T@U T@U) Bool)
+(declare-fun $generated@@73 (T@U T@U) T@U)
+(declare-fun $generated@@74 (T@U) Bool)
+(declare-fun $generated@@79 (T@T T@T) T@T)
+(declare-fun $generated@@80 (T@U) T@U)
+(declare-fun $generated@@81 (T@T) T@T)
+(declare-fun $generated@@82 (T@T) T@T)
+(declare-fun $generated@@92 (T@U T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@93 (T@U T@U) Bool)
+(declare-fun $generated@@99 (T@U T@U) T@U)
+(declare-fun $generated@@104 (T@U) T@U)
+(declare-fun $generated@@106 (T@T T@U) T@U)
+(declare-fun $generated@@107 (T@T T@U) T@U)
+(declare-fun $generated@@118 (T@U T@U T@U) Bool)
+(declare-fun $generated@@127 (T@U T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@148 (T@U) T@U)
+(declare-fun $generated@@151 (T@U) T@U)
+(declare-fun $generated@@154 (T@U) T@U)
+(declare-fun $generated@@157 (T@U) T@U)
+(declare-fun $generated@@162 (T@U) T@U)
+(declare-fun $generated@@165 (T@U) T@U)
+(declare-fun $generated@@172 (T@U) T@U)
+(declare-fun $generated@@177 (T@U) Int)
+(declare-fun $generated@@185 () T@T)
+(declare-fun $generated@@186 () T@U)
+(declare-fun $generated@@187 () T@T)
+(declare-fun $generated@@203 (T@T T@T T@T T@U T@U T@U) T@U)
+(declare-fun $generated@@204 (T@U T@U T@U Bool) T@U)
+(declare-fun $generated@@205 (T@T T@T T@T T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@237 (T@U) T@U)
+(assert  (and (and (and (and (and (and (and (and (= ($generated@@10 $generated@@11) 0) (= ($generated@@10 $generated@@12) 1)) (= ($generated@@10 $generated@@13) 2)) (forall (($generated@@20 Bool) ) (! (= ($generated@@15 ($generated@@14 $generated@@20)) $generated@@20)
+ :pattern ( ($generated@@14 $generated@@20))
+))) (forall (($generated@@21 T@U) ) (! (= ($generated@@14 ($generated@@15 $generated@@21)) $generated@@21)
+ :pattern ( ($generated@@15 $generated@@21))
+))) (forall (($generated@@22 Int) ) (! (= ($generated@@17 ($generated@@16 $generated@@22)) $generated@@22)
+ :pattern ( ($generated@@16 $generated@@22))
+))) (forall (($generated@@23 T@U) ) (! (= ($generated@@16 ($generated@@17 $generated@@23)) $generated@@23)
+ :pattern ( ($generated@@17 $generated@@23))
+))) (forall (($generated@@24 Real) ) (! (= ($generated@@19 ($generated@@18 $generated@@24)) $generated@@24)
+ :pattern ( ($generated@@18 $generated@@24))
+))) (forall (($generated@@25 T@U) ) (! (= ($generated@@18 ($generated@@19 $generated@@25)) $generated@@25)
+ :pattern ( ($generated@@19 $generated@@25))
+))))
+(assert (distinct $generated $generated@@0 $generated@@1 $generated@@2 $generated@@3 $generated@@4 $generated@@5 $generated@@6 $generated@@7 $generated@@8 $generated@@9)
+)
+(assert  (and (and (forall (($generated@@37 T@T) ($generated@@38 T@T) ($generated@@39 T@U) ($generated@@40 T@U) ($generated@@41 T@U) ) (! (= ($generated@@31 $generated@@37 $generated@@38 ($generated@@36 $generated@@37 $generated@@38 $generated@@40 $generated@@41 $generated@@39) $generated@@41) $generated@@39)
+ :weight 0
+)) (forall (($generated@@42 T@T) ($generated@@43 T@T) ($generated@@44 T@U) ($generated@@45 T@U) ($generated@@46 T@U) ($generated@@47 T@U) ) (!  (or (= $generated@@46 $generated@@47) (= ($generated@@31 $generated@@42 $generated@@43 ($generated@@36 $generated@@42 $generated@@43 $generated@@45 $generated@@46 $generated@@44) $generated@@47) ($generated@@31 $generated@@42 $generated@@43 $generated@@45 $generated@@47)))
+ :weight 0
+))) (= ($generated@@10 $generated@@32) 3)))
+(assert (forall (($generated@@48 T@U) ($generated@@49 T@U) ($generated@@50 T@U) ) (!  (=> ($generated@@27 $generated@@48 $generated@@49 $generated@@50) (and (forall (($generated@@51 T@U) ) (!  (=> ($generated@@34 $generated@@51 $generated@@48) (and ($generated@@35 $generated@@50) (=> ($generated@@15 ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@50) $generated@@51)) (and ($generated@@35 $generated@@50) true))))
+ :pattern ( ($generated@@28 $generated@@48 $generated@@49 $generated@@29 ($generated@@30 $generated@@50) $generated@@51))
+ :pattern ( ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@50) $generated@@51))
+)) (= ($generated@@26 $generated@@48 $generated@@49 $generated@@50) (forall (($generated@@52 T@U) ) (!  (=> (and ($generated@@34 $generated@@52 $generated@@48) ($generated@@15 ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@50) $generated@@52))) ($generated@@28 $generated@@48 $generated@@49 $generated@@29 ($generated@@30 $generated@@50) $generated@@52))
+ :pattern ( ($generated@@28 $generated@@48 $generated@@49 $generated@@29 ($generated@@30 $generated@@50) $generated@@52))
+ :pattern ( ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@50) $generated@@52))
+)))))
+ :pattern ( ($generated@@26 $generated@@48 $generated@@49 $generated@@50))
+)))
+(assert (= ($generated@@53 $generated) $generated@@0))
+(assert (= ($generated@@10 $generated@@55) 4))
+(assert (forall (($generated@@57 T@U) ($generated@@58 T@U) ($generated@@59 T@U) ) (!  (=> ($generated@@54 $generated@@55 $generated@@59 ($generated@@56 $generated@@57 $generated@@58)) ($generated@@35 $generated@@59))
+ :pattern ( ($generated@@35 $generated@@59) ($generated@@54 $generated@@55 $generated@@59 ($generated@@56 $generated@@57 $generated@@58)))
+)))
+(assert (forall (($generated@@62 T@U) ) (!  (not ($generated@@60 $generated@@61 $generated@@62))
+ :pattern ( ($generated@@60 $generated@@61 $generated@@62))
+)))
+(assert (= ($generated@@10 $generated@@63) 5))
+(assert (forall (($generated@@65 T@U) ($generated@@66 T@U) ($generated@@67 T@U) ($generated@@68 T@U) ($generated@@69 T@U) ) (!  (=> (and (and ($generated@@54 $generated@@63 $generated@@65 ($generated@@64 $generated@@66 $generated@@67)) (forall (($generated@@70 T@U) ) (!  (=> ($generated@@34 $generated@@70 $generated@@68) ($generated@@34 $generated@@70 $generated@@66))
+ :pattern ( ($generated@@34 $generated@@70 $generated@@68))
+ :pattern ( ($generated@@34 $generated@@70 $generated@@66))
+))) (forall (($generated@@71 T@U) ) (!  (=> ($generated@@34 $generated@@71 $generated@@67) ($generated@@34 $generated@@71 $generated@@69))
+ :pattern ( ($generated@@34 $generated@@71 $generated@@67))
+ :pattern ( ($generated@@34 $generated@@71 $generated@@69))
+))) ($generated@@54 $generated@@63 $generated@@65 ($generated@@64 $generated@@68 $generated@@69)))
+ :pattern ( ($generated@@54 $generated@@63 $generated@@65 ($generated@@64 $generated@@66 $generated@@67)) ($generated@@54 $generated@@63 $generated@@65 ($generated@@64 $generated@@68 $generated@@69)))
+)))
+(assert (forall (($generated@@75 T@U) ($generated@@76 T@U) ($generated@@77 T@U) ($generated@@78 T@U) ) (!  (=> (and ($generated@@74 $generated@@78) (and ($generated@@35 $generated@@75) ($generated@@72 $generated@@55 $generated@@75 ($generated@@56 $generated@@76 $generated@@77) $generated@@78))) ($generated@@72 $generated@@63 ($generated@@30 $generated@@75) ($generated@@73 $generated@@76 $generated@@77) $generated@@78))
+ :pattern ( ($generated@@72 $generated@@63 ($generated@@30 $generated@@75) ($generated@@73 $generated@@76 $generated@@77) $generated@@78))
+)))
+(assert  (and (and (forall (($generated@@83 T@T) ($generated@@84 T@T) ) (= ($generated@@10 ($generated@@79 $generated@@83 $generated@@84)) 6)) (forall (($generated@@85 T@T) ($generated@@86 T@T) ) (! (= ($generated@@81 ($generated@@79 $generated@@85 $generated@@86)) $generated@@85)
+ :pattern ( ($generated@@79 $generated@@85 $generated@@86))
+))) (forall (($generated@@87 T@T) ($generated@@88 T@T) ) (! (= ($generated@@82 ($generated@@79 $generated@@87 $generated@@88)) $generated@@88)
+ :pattern ( ($generated@@79 $generated@@87 $generated@@88))
+))))
+(assert (forall (($generated@@89 T@U) ($generated@@90 T@U) ) (! (= ($generated@@54 ($generated@@79 $generated@@32 $generated@@11) $generated@@89 ($generated@@80 $generated@@90)) (forall (($generated@@91 T@U) ) (!  (=> ($generated@@15 ($generated@@31 $generated@@32 $generated@@11 $generated@@89 $generated@@91)) ($generated@@34 $generated@@91 $generated@@90))
+ :pattern ( ($generated@@31 $generated@@32 $generated@@11 $generated@@89 $generated@@91))
+)))
+ :pattern ( ($generated@@54 ($generated@@79 $generated@@32 $generated@@11) $generated@@89 ($generated@@80 $generated@@90)))
+)))
+(assert (forall (($generated@@94 T@U) ($generated@@95 T@U) ($generated@@96 T@U) ($generated@@97 T@U) ($generated@@98 T@U) ) (!  (=> (and ($generated@@74 $generated@@96) (and ($generated@@34 $generated@@98 $generated@@94) ($generated@@54 $generated@@63 $generated@@97 ($generated@@64 $generated@@94 $generated@@95)))) (= ($generated@@93 ($generated@@92 $generated@@94 $generated@@95 $generated@@29 $generated@@97 $generated@@98) $generated@@61) ($generated@@93 ($generated@@92 $generated@@94 $generated@@95 $generated@@96 $generated@@97 $generated@@98) $generated@@61)))
+ :pattern ( ($generated@@92 $generated@@94 $generated@@95 $generated@@29 $generated@@97 $generated@@98) ($generated@@74 $generated@@96))
+ :pattern ( ($generated@@92 $generated@@94 $generated@@95 $generated@@96 $generated@@97 $generated@@98))
+)))
+(assert (forall (($generated@@100 T@U) ($generated@@101 T@U) ($generated@@102 T@U) ($generated@@103 T@U) ) (! (= ($generated@@54 $generated@@55 ($generated@@99 $generated@@102 $generated@@103) ($generated@@56 $generated@@100 $generated@@101))  (and ($generated@@54 ($generated@@79 $generated@@32 $generated@@11) $generated@@102 ($generated@@80 $generated@@100)) ($generated@@54 $generated@@63 $generated@@103 ($generated@@73 $generated@@100 $generated@@101))))
+ :pattern ( ($generated@@54 $generated@@55 ($generated@@99 $generated@@102 $generated@@103) ($generated@@56 $generated@@100 $generated@@101)))
+)))
+(assert (forall (($generated@@105 T@U) ) (! (= ($generated@@35 $generated@@105) (= ($generated@@104 $generated@@105) $generated@@5))
+ :pattern ( ($generated@@35 $generated@@105))
+)))
+(assert (forall (($generated@@108 T@U) ($generated@@109 T@T) ) (! (= ($generated@@107 $generated@@109 ($generated@@106 $generated@@109 $generated@@108)) $generated@@108)
+ :pattern ( ($generated@@106 $generated@@109 $generated@@108))
+)))
+(assert (forall (($generated@@110 T@U) ) (!  (=> ($generated@@35 $generated@@110) (exists (($generated@@111 T@U) ($generated@@112 T@U) ) (= $generated@@110 ($generated@@99 $generated@@111 $generated@@112))))
+ :pattern ( ($generated@@35 $generated@@110))
+)))
+(assert (forall (($generated@@113 T@U) ($generated@@114 T@U) ($generated@@115 T@U) ($generated@@116 T@U) ($generated@@117 T@U) ) (!  (=> ($generated@@74 $generated@@117) (= ($generated@@72 $generated@@55 ($generated@@99 $generated@@115 $generated@@116) ($generated@@56 $generated@@113 $generated@@114) $generated@@117)  (and ($generated@@72 ($generated@@79 $generated@@32 $generated@@11) $generated@@115 ($generated@@80 $generated@@113) $generated@@117) ($generated@@72 $generated@@63 $generated@@116 ($generated@@73 $generated@@113 $generated@@114) $generated@@117))))
+ :pattern ( ($generated@@72 $generated@@55 ($generated@@99 $generated@@115 $generated@@116) ($generated@@56 $generated@@113 $generated@@114) $generated@@117))
+)))
+(assert ($generated@@74 $generated@@29))
+(assert (forall (($generated@@119 T@U) ($generated@@120 T@U) ($generated@@121 T@U) ($generated@@122 T@T) ) (! (= ($generated@@118 ($generated@@107 $generated@@122 $generated@@119) $generated@@120 $generated@@121) ($generated@@72 $generated@@122 $generated@@119 $generated@@120 $generated@@121))
+ :pattern ( ($generated@@118 ($generated@@107 $generated@@122 $generated@@119) $generated@@120 $generated@@121))
+)))
+(assert (forall (($generated@@123 T@U) ($generated@@124 T@U) ($generated@@125 T@U) ($generated@@126 T@U) ) (! (= ($generated@@72 $generated@@63 $generated@@125 ($generated@@73 $generated@@123 $generated@@124) $generated@@126) ($generated@@72 $generated@@63 $generated@@125 ($generated@@64 $generated@@123 $generated@@124) $generated@@126))
+ :pattern ( ($generated@@72 $generated@@63 $generated@@125 ($generated@@73 $generated@@123 $generated@@124) $generated@@126))
+)))
+(assert (forall (($generated@@128 T@U) ($generated@@129 T@U) ($generated@@130 T@U) ($generated@@131 T@U) ) (!  (=> (and ($generated@@74 $generated@@131) ($generated@@72 $generated@@63 $generated@@128 ($generated@@64 $generated@@129 $generated@@130) $generated@@131)) (forall (($generated@@132 T@U) ) (!  (=> (and ($generated@@118 $generated@@132 $generated@@129 $generated@@131) ($generated@@28 $generated@@129 $generated@@130 $generated@@131 $generated@@128 $generated@@132)) ($generated@@118 ($generated@@127 $generated@@129 $generated@@130 $generated@@131 $generated@@128 $generated@@132) $generated@@130 $generated@@131))
+ :pattern ( ($generated@@127 $generated@@129 $generated@@130 $generated@@131 $generated@@128 $generated@@132))
+)))
+ :pattern ( ($generated@@72 $generated@@63 $generated@@128 ($generated@@64 $generated@@129 $generated@@130) $generated@@131))
+)))
+(assert (forall (($generated@@133 T@U) ($generated@@134 T@U) ($generated@@135 T@U) ) (! (= ($generated@@72 ($generated@@79 $generated@@32 $generated@@11) $generated@@133 ($generated@@80 $generated@@134) $generated@@135) (forall (($generated@@136 T@U) ) (!  (=> ($generated@@15 ($generated@@31 $generated@@32 $generated@@11 $generated@@133 $generated@@136)) ($generated@@118 $generated@@136 $generated@@134 $generated@@135))
+ :pattern ( ($generated@@31 $generated@@32 $generated@@11 $generated@@133 $generated@@136))
+)))
+ :pattern ( ($generated@@72 ($generated@@79 $generated@@32 $generated@@11) $generated@@133 ($generated@@80 $generated@@134) $generated@@135))
+)))
+(assert (forall (($generated@@137 T@U) ($generated@@138 T@U) ) (!  (=> ($generated@@93 $generated@@137 $generated@@138) (= $generated@@137 $generated@@138))
+ :pattern ( ($generated@@93 $generated@@137 $generated@@138))
+)))
+(assert (forall (($generated@@139 T@U) ($generated@@140 T@U) ($generated@@141 T@U) ) (! (= ($generated@@54 $generated@@63 $generated@@139 ($generated@@64 $generated@@140 $generated@@141)) (forall (($generated@@142 T@U) ($generated@@143 T@U) ) (!  (=> (and (and ($generated@@74 $generated@@142) ($generated@@34 $generated@@143 $generated@@140)) ($generated@@28 $generated@@140 $generated@@141 $generated@@142 $generated@@139 $generated@@143)) ($generated@@34 ($generated@@127 $generated@@140 $generated@@141 $generated@@142 $generated@@139 $generated@@143) $generated@@141))
+ :pattern ( ($generated@@127 $generated@@140 $generated@@141 $generated@@142 $generated@@139 $generated@@143))
+)))
+ :pattern ( ($generated@@54 $generated@@63 $generated@@139 ($generated@@64 $generated@@140 $generated@@141)))
+)))
+(assert (forall (($generated@@144 T@U) ) (!  (=> ($generated@@34 $generated@@144 $generated) (and (= ($generated@@107 $generated@@11 ($generated@@106 $generated@@11 $generated@@144)) $generated@@144) ($generated@@54 $generated@@11 ($generated@@106 $generated@@11 $generated@@144) $generated)))
+ :pattern ( ($generated@@34 $generated@@144 $generated))
+)))
+(assert (forall (($generated@@145 T@U) ($generated@@146 T@U) ($generated@@147 T@T) ) (! (= ($generated@@34 ($generated@@107 $generated@@147 $generated@@145) $generated@@146) ($generated@@54 $generated@@147 $generated@@145 $generated@@146))
+ :pattern ( ($generated@@34 ($generated@@107 $generated@@147 $generated@@145) $generated@@146))
+)))
+(assert (forall (($generated@@149 T@U) ($generated@@150 T@U) ) (! (= ($generated@@148 ($generated@@64 $generated@@149 $generated@@150)) $generated@@149)
+ :pattern ( ($generated@@64 $generated@@149 $generated@@150))
+)))
+(assert (forall (($generated@@152 T@U) ($generated@@153 T@U) ) (! (= ($generated@@151 ($generated@@64 $generated@@152 $generated@@153)) $generated@@153)
+ :pattern ( ($generated@@64 $generated@@152 $generated@@153))
+)))
+(assert (forall (($generated@@155 T@U) ($generated@@156 T@U) ) (! (= ($generated@@154 ($generated@@73 $generated@@155 $generated@@156)) $generated@@155)
+ :pattern ( ($generated@@73 $generated@@155 $generated@@156))
+)))
+(assert (forall (($generated@@158 T@U) ($generated@@159 T@U) ) (! (= ($generated@@157 ($generated@@73 $generated@@158 $generated@@159)) $generated@@159)
+ :pattern ( ($generated@@73 $generated@@158 $generated@@159))
+)))
+(assert (forall (($generated@@160 T@U) ($generated@@161 T@U) ) (! (= ($generated@@104 ($generated@@99 $generated@@160 $generated@@161)) $generated@@5)
+ :pattern ( ($generated@@99 $generated@@160 $generated@@161))
+)))
+(assert (forall (($generated@@163 T@U) ($generated@@164 T@U) ) (! (= ($generated@@162 ($generated@@56 $generated@@163 $generated@@164)) $generated@@163)
+ :pattern ( ($generated@@56 $generated@@163 $generated@@164))
+)))
+(assert (forall (($generated@@166 T@U) ($generated@@167 T@U) ) (! (= ($generated@@165 ($generated@@56 $generated@@166 $generated@@167)) $generated@@167)
+ :pattern ( ($generated@@56 $generated@@166 $generated@@167))
+)))
+(assert (forall (($generated@@168 T@U) ($generated@@169 T@U) ) (! (= ($generated@@33 ($generated@@99 $generated@@168 $generated@@169)) $generated@@168)
+ :pattern ( ($generated@@99 $generated@@168 $generated@@169))
+)))
+(assert (forall (($generated@@170 T@U) ($generated@@171 T@U) ) (! (= ($generated@@30 ($generated@@99 $generated@@170 $generated@@171)) $generated@@171)
+ :pattern ( ($generated@@99 $generated@@170 $generated@@171))
+)))
+(assert (forall (($generated@@173 T@U) ) (! (= ($generated@@172 ($generated@@80 $generated@@173)) $generated@@173)
+ :pattern ( ($generated@@80 $generated@@173))
+)))
+(assert (forall (($generated@@174 T@U) ) (! (= ($generated@@53 ($generated@@80 $generated@@174)) $generated@@1)
+ :pattern ( ($generated@@80 $generated@@174))
+)))
+(assert (forall (($generated@@175 T@U) ($generated@@176 T@T) ) (! (= ($generated@@106 $generated@@176 ($generated@@107 $generated@@176 $generated@@175)) $generated@@175)
+ :pattern ( ($generated@@107 $generated@@176 $generated@@175))
+)))
+(assert (forall (($generated@@178 T@U) ($generated@@179 T@U) ($generated@@180 T@U) ) (!  (=> ($generated@@15 ($generated@@31 $generated@@32 $generated@@11 $generated@@178 ($generated@@107 $generated@@55 $generated@@180))) (< ($generated@@177 $generated@@180) ($generated@@177 ($generated@@99 $generated@@178 $generated@@179))))
+ :pattern ( ($generated@@31 $generated@@32 $generated@@11 $generated@@178 ($generated@@107 $generated@@55 $generated@@180)) ($generated@@99 $generated@@178 $generated@@179))
+)))
+(assert (forall (($generated@@181 T@U) ($generated@@182 T@U) ($generated@@183 T@U) ) (! (= ($generated@@54 $generated@@63 $generated@@183 ($generated@@73 $generated@@181 $generated@@182))  (and ($generated@@54 $generated@@63 $generated@@183 ($generated@@64 $generated@@181 $generated@@182)) (forall (($generated@@184 T@U) )  (=> ($generated@@34 $generated@@184 $generated@@181) ($generated@@93 ($generated@@92 $generated@@181 $generated@@182 $generated@@29 $generated@@183 $generated@@184) $generated@@61)))))
+ :pattern ( ($generated@@54 $generated@@63 $generated@@183 ($generated@@73 $generated@@181 $generated@@182)))
+)))
+(assert  (and (= ($generated@@10 $generated@@185) 7) (= ($generated@@10 $generated@@187) 8)))
+(assert (forall (($generated@@188 T@U) ($generated@@189 T@U) ($generated@@190 T@U) ($generated@@191 T@U) ) (!  (=> ($generated@@74 $generated@@191) (= ($generated@@72 $generated@@63 $generated@@188 ($generated@@64 $generated@@189 $generated@@190) $generated@@191) (forall (($generated@@192 T@U) ) (!  (=> (and (and ($generated@@34 $generated@@192 $generated@@189) ($generated@@118 $generated@@192 $generated@@189 $generated@@191)) ($generated@@28 $generated@@189 $generated@@190 $generated@@191 $generated@@188 $generated@@192)) (forall (($generated@@193 T@U) ) (!  (=> (and (or (not (= $generated@@193 $generated@@186)) (not true)) ($generated@@60 ($generated@@92 $generated@@189 $generated@@190 $generated@@191 $generated@@188 $generated@@192) ($generated@@107 $generated@@185 $generated@@193))) ($generated@@15 ($generated@@106 $generated@@11 ($generated@@31 $generated@@187 $generated@@32 ($generated@@31 $generated@@185 ($generated@@79 $generated@@187 $generated@@32) $generated@@191 $generated@@193) $generated@@2))))
+ :pattern ( ($generated@@60 ($generated@@92 $generated@@189 $generated@@190 $generated@@191 $generated@@188 $generated@@192) ($generated@@107 $generated@@185 $generated@@193)))
+)))
+ :pattern ( ($generated@@127 $generated@@189 $generated@@190 $generated@@191 $generated@@188 $generated@@192))
+ :pattern ( ($generated@@92 $generated@@189 $generated@@190 $generated@@191 $generated@@188 $generated@@192))
+))))
+ :pattern ( ($generated@@72 $generated@@63 $generated@@188 ($generated@@64 $generated@@189 $generated@@190) $generated@@191))
+)))
+(assert (forall (($generated@@194 T@U) ($generated@@195 T@U) ($generated@@196 T@U) ) (!  (=> ($generated@@34 $generated@@196 ($generated@@64 $generated@@194 $generated@@195)) (and (= ($generated@@107 $generated@@63 ($generated@@106 $generated@@63 $generated@@196)) $generated@@196) ($generated@@54 $generated@@63 ($generated@@106 $generated@@63 $generated@@196) ($generated@@64 $generated@@194 $generated@@195))))
+ :pattern ( ($generated@@34 $generated@@196 ($generated@@64 $generated@@194 $generated@@195)))
+)))
+(assert (forall (($generated@@197 T@U) ($generated@@198 T@U) ($generated@@199 T@U) ) (!  (=> ($generated@@34 $generated@@199 ($generated@@73 $generated@@197 $generated@@198)) (and (= ($generated@@107 $generated@@63 ($generated@@106 $generated@@63 $generated@@199)) $generated@@199) ($generated@@54 $generated@@63 ($generated@@106 $generated@@63 $generated@@199) ($generated@@73 $generated@@197 $generated@@198))))
+ :pattern ( ($generated@@34 $generated@@199 ($generated@@73 $generated@@197 $generated@@198)))
+)))
+(assert (forall (($generated@@200 T@U) ($generated@@201 T@U) ($generated@@202 T@U) ) (!  (=> ($generated@@34 $generated@@202 ($generated@@56 $generated@@200 $generated@@201)) (and (= ($generated@@107 $generated@@55 ($generated@@106 $generated@@55 $generated@@202)) $generated@@202) ($generated@@54 $generated@@55 ($generated@@106 $generated@@55 $generated@@202) ($generated@@56 $generated@@200 $generated@@201))))
+ :pattern ( ($generated@@34 $generated@@202 ($generated@@56 $generated@@200 $generated@@201)))
+)))
+(assert  (and (forall (($generated@@206 T@T) ($generated@@207 T@T) ($generated@@208 T@T) ($generated@@209 T@U) ($generated@@210 T@U) ($generated@@211 T@U) ($generated@@212 T@U) ) (! (= ($generated@@203 $generated@@206 $generated@@207 $generated@@208 ($generated@@205 $generated@@206 $generated@@207 $generated@@208 $generated@@210 $generated@@211 $generated@@212 $generated@@209) $generated@@211 $generated@@212) $generated@@209)
+ :weight 0
+)) (and (forall (($generated@@213 T@T) ($generated@@214 T@T) ($generated@@215 T@T) ($generated@@216 T@U) ($generated@@217 T@U) ($generated@@218 T@U) ($generated@@219 T@U) ($generated@@220 T@U) ($generated@@221 T@U) ) (!  (or (= $generated@@218 $generated@@220) (= ($generated@@203 $generated@@213 $generated@@214 $generated@@215 ($generated@@205 $generated@@213 $generated@@214 $generated@@215 $generated@@217 $generated@@218 $generated@@219 $generated@@216) $generated@@220 $generated@@221) ($generated@@203 $generated@@213 $generated@@214 $generated@@215 $generated@@217 $generated@@220 $generated@@221)))
+ :weight 0
+)) (forall (($generated@@222 T@T) ($generated@@223 T@T) ($generated@@224 T@T) ($generated@@225 T@U) ($generated@@226 T@U) ($generated@@227 T@U) ($generated@@228 T@U) ($generated@@229 T@U) ($generated@@230 T@U) ) (!  (or (= $generated@@228 $generated@@230) (= ($generated@@203 $generated@@222 $generated@@223 $generated@@224 ($generated@@205 $generated@@222 $generated@@223 $generated@@224 $generated@@226 $generated@@227 $generated@@228 $generated@@225) $generated@@229 $generated@@230) ($generated@@203 $generated@@222 $generated@@223 $generated@@224 $generated@@226 $generated@@229 $generated@@230)))
+ :weight 0
+)))))
+(assert (forall (($generated@@231 T@U) ($generated@@232 T@U) ($generated@@233 T@U) ($generated@@234 Bool) ($generated@@235 T@U) ($generated@@236 T@U) ) (! (= ($generated@@15 ($generated@@203 $generated@@185 $generated@@187 $generated@@11 ($generated@@204 $generated@@231 $generated@@232 $generated@@233 $generated@@234) $generated@@235 $generated@@236))  (=> (and (or (not (= $generated@@235 $generated@@231)) (not true)) ($generated@@15 ($generated@@106 $generated@@11 ($generated@@31 $generated@@187 $generated@@32 ($generated@@31 $generated@@185 ($generated@@79 $generated@@187 $generated@@32) $generated@@232 $generated@@235) $generated@@233)))) $generated@@234))
+ :pattern ( ($generated@@203 $generated@@185 $generated@@187 $generated@@11 ($generated@@204 $generated@@231 $generated@@232 $generated@@233 $generated@@234) $generated@@235 $generated@@236))
+)))
+(assert (forall (($generated@@238 T@U) ($generated@@239 T@U) ) (!  (and (= ($generated@@53 ($generated@@64 $generated@@238 $generated@@239)) $generated@@3) (= ($generated@@237 ($generated@@64 $generated@@238 $generated@@239)) $generated@@7))
+ :pattern ( ($generated@@64 $generated@@238 $generated@@239))
+)))
+(assert (forall (($generated@@240 T@U) ($generated@@241 T@U) ) (!  (and (= ($generated@@53 ($generated@@73 $generated@@240 $generated@@241)) $generated@@4) (= ($generated@@237 ($generated@@73 $generated@@240 $generated@@241)) $generated@@8))
+ :pattern ( ($generated@@73 $generated@@240 $generated@@241))
+)))
+(assert (forall (($generated@@242 T@U) ($generated@@243 T@U) ) (!  (and (= ($generated@@53 ($generated@@56 $generated@@242 $generated@@243)) $generated@@6) (= ($generated@@237 ($generated@@56 $generated@@242 $generated@@243)) $generated@@9))
+ :pattern ( ($generated@@56 $generated@@242 $generated@@243))
+)))
+(assert (forall (($generated@@244 T@U) ($generated@@245 T@U) ($generated@@246 T@U) ($generated@@247 T@U) ($generated@@248 T@U) ) (!  (=> (and (and ($generated@@74 $generated@@246) (and ($generated@@34 $generated@@248 $generated@@244) ($generated@@54 $generated@@63 $generated@@247 ($generated@@64 $generated@@244 $generated@@245)))) ($generated@@93 ($generated@@92 $generated@@244 $generated@@245 $generated@@29 $generated@@247 $generated@@248) $generated@@61)) (= ($generated@@28 $generated@@244 $generated@@245 $generated@@29 $generated@@247 $generated@@248) ($generated@@28 $generated@@244 $generated@@245 $generated@@246 $generated@@247 $generated@@248)))
+ :pattern ( ($generated@@28 $generated@@244 $generated@@245 $generated@@29 $generated@@247 $generated@@248) ($generated@@74 $generated@@246))
+ :pattern ( ($generated@@28 $generated@@244 $generated@@245 $generated@@246 $generated@@247 $generated@@248))
+)))
+(assert (forall (($generated@@249 T@U) ($generated@@250 T@U) ) (!  (=> ($generated@@34 $generated@@249 ($generated@@80 $generated@@250)) (and (= ($generated@@107 ($generated@@79 $generated@@32 $generated@@11) ($generated@@106 ($generated@@79 $generated@@32 $generated@@11) $generated@@249)) $generated@@249) ($generated@@54 ($generated@@79 $generated@@32 $generated@@11) ($generated@@106 ($generated@@79 $generated@@32 $generated@@11) $generated@@249) ($generated@@80 $generated@@250))))
+ :pattern ( ($generated@@34 $generated@@249 ($generated@@80 $generated@@250)))
+)))
+(assert (forall (($generated@@251 T@U) ($generated@@252 T@U) ) (! (= ($generated@@93 $generated@@251 $generated@@252) (forall (($generated@@253 T@U) ) (! (= ($generated@@60 $generated@@251 $generated@@253) ($generated@@60 $generated@@252 $generated@@253))
+ :pattern ( ($generated@@60 $generated@@251 $generated@@253))
+ :pattern ( ($generated@@60 $generated@@252 $generated@@253))
+)))
+ :pattern ( ($generated@@93 $generated@@251 $generated@@252))
+)))
+(assert (forall (($generated@@254 T@U) ($generated@@255 T@U) ($generated@@256 T@U) ) (!  (=> (and ($generated@@74 $generated@@256) (and ($generated@@35 $generated@@254) (exists (($generated@@257 T@U) ) (! ($generated@@72 $generated@@55 $generated@@254 ($generated@@56 $generated@@255 $generated@@257) $generated@@256)
+ :pattern ( ($generated@@72 $generated@@55 $generated@@254 ($generated@@56 $generated@@255 $generated@@257) $generated@@256))
+)))) ($generated@@72 ($generated@@79 $generated@@32 $generated@@11) ($generated@@33 $generated@@254) ($generated@@80 $generated@@255) $generated@@256))
+ :pattern ( ($generated@@72 ($generated@@79 $generated@@32 $generated@@11) ($generated@@33 $generated@@254) ($generated@@80 $generated@@255) $generated@@256))
+)))
+(assert (forall (($generated@@258 T@U) ($generated@@259 T@U) ) (! ($generated@@72 $generated@@11 $generated@@259 $generated $generated@@258)
+ :pattern ( ($generated@@72 $generated@@11 $generated@@259 $generated $generated@@258))
+)))
+(assert (forall (($generated@@260 T@U) ) (! ($generated@@54 $generated@@11 $generated@@260 $generated)
+ :pattern ( ($generated@@54 $generated@@11 $generated@@260 $generated))
+)))
+(push 1)
+(declare-fun ControlFlow (Int Int) Int)
+(declare-fun $generated@@261 () T@U)
+(declare-fun $generated@@262 () T@U)
+(declare-fun $generated@@263 () T@U)
+(declare-fun $generated@@264 () T@U)
+(declare-fun $generated@@265 () Bool)
+(declare-fun $generated@@266 () T@U)
+(declare-fun $generated@@267 () Bool)
+(declare-fun $generated@@268 () T@U)
+(declare-fun $generated@@269 (T@U) Bool)
+(set-option :timeout 0)
+(set-option :rlimit 0)
+(set-option :auto_config false)
+(set-option :type_check true)
+(set-option :smt.qi.eager_threshold 100)
+(set-option :smt.delay_units true)
+(set-option :model_evaluator.completion true)
+(set-option :model.completion true)
+(set-option :model.compact false)
+(set-option :smt.case_split 3)
+(set-option :smt.mbqi false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+(set-option :smt.arith.solver 2)
+(assert (not
+ (=> (= (ControlFlow 0 0) 9) (let (($generated@@270  (=> (forall (($generated@@271 T@U) ) (!  (=> ($generated@@34 $generated@@271 $generated@@261) (and ($generated@@35 $generated@@264) (=> ($generated@@15 ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@264) $generated@@271)) (and ($generated@@35 $generated@@264) true))))
+ :pattern ( ($generated@@28 $generated@@261 $generated@@262 $generated@@263 ($generated@@30 $generated@@264) $generated@@271))
+ :pattern ( ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@264) $generated@@271))
+)) (=> (and (and (forall (($generated@@272 T@U) ) (!  (=> ($generated@@34 $generated@@272 $generated@@261) (and ($generated@@35 $generated@@264) (=> ($generated@@15 ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@264) $generated@@272)) (and ($generated@@35 $generated@@264) true))))
+ :pattern ( ($generated@@28 $generated@@261 $generated@@262 $generated@@263 ($generated@@30 $generated@@264) $generated@@272))
+ :pattern ( ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@264) $generated@@272))
+)) (= ($generated@@26 $generated@@261 $generated@@262 $generated@@264) (forall (($generated@@273 T@U) ) (!  (=> (and ($generated@@34 $generated@@273 $generated@@261) ($generated@@15 ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@264) $generated@@273))) ($generated@@28 $generated@@261 $generated@@262 $generated@@263 ($generated@@30 $generated@@264) $generated@@273))
+ :pattern ( ($generated@@28 $generated@@261 $generated@@262 $generated@@263 ($generated@@30 $generated@@264) $generated@@273))
+ :pattern ( ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@264) $generated@@273))
+)))) (and ($generated@@54 $generated@@11 ($generated@@14 ($generated@@26 $generated@@261 $generated@@262 $generated@@264)) $generated) (= (ControlFlow 0 3) (- 0 2)))) $generated@@265))))
+(let (($generated@@274  (=> (not ($generated@@15 ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@264) $generated@@266))) (=> (and (= $generated@@265 true) (= (ControlFlow 0 6) 3)) $generated@@270))))
+(let (($generated@@275  (=> ($generated@@15 ($generated@@31 $generated@@32 $generated@@11 ($generated@@33 $generated@@264) $generated@@266)) (=> (and (and ($generated@@35 $generated@@264) ($generated@@35 $generated@@264)) (and ($generated@@118 ($generated@@107 $generated@@63 ($generated@@30 $generated@@264)) ($generated@@64 $generated@@261 $generated@@262) $generated@@263) ($generated@@118 $generated@@266 $generated@@261 $generated@@263))) (=> (and (and (and ($generated@@35 $generated@@264) true) (= $generated@@267 (forall (($generated@@276 T@U) ($generated@@277 T@U) )  (=> (and (and (or (not (= $generated@@276 $generated@@186)) (not true)) ($generated@@15 ($generated@@106 $generated@@11 ($generated@@31 $generated@@187 $generated@@32 ($generated@@31 $generated@@185 ($generated@@79 $generated@@187 $generated@@32) $generated@@263 $generated@@276) $generated@@2)))) ($generated@@60 ($generated@@92 $generated@@261 $generated@@262 $generated@@263 ($generated@@30 $generated@@264) $generated@@266) ($generated@@107 $generated@@185 $generated@@276))) ($generated@@15 ($generated@@203 $generated@@185 $generated@@187 $generated@@11 $generated@@268 $generated@@276 $generated@@277)))))) (and (= $generated@@265 $generated@@267) (= (ControlFlow 0 5) 3))) $generated@@270)))))
+(let (($generated@@278  (=> (and (and ($generated@@34 $generated@@266 $generated@@261) ($generated@@118 $generated@@266 $generated@@261 $generated@@263)) (and ($generated@@35 $generated@@264) ($generated@@35 $generated@@264))) (and (=> (= (ControlFlow 0 7) 5) $generated@@275) (=> (= (ControlFlow 0 7) 6) $generated@@274)))))
+(let (($generated@@279  (=> (not (and ($generated@@34 $generated@@266 $generated@@261) ($generated@@118 $generated@@266 $generated@@261 $generated@@263))) (=> (and (= $generated@@265 true) (= (ControlFlow 0 4) 3)) $generated@@270))))
+(let (($generated@@280 true))
+(let (($generated@@281  (=> (= $generated@@268 ($generated@@204 $generated@@186 $generated@@263 $generated@@2 false)) (and (and (=> (= (ControlFlow 0 8) 1) $generated@@280) (=> (= (ControlFlow 0 8) 7) $generated@@278)) (=> (= (ControlFlow 0 8) 4) $generated@@279)))))
+(let (($generated@@282  (=> (and ($generated@@74 $generated@@263) ($generated@@269 $generated@@263)) (=> (and (and ($generated@@54 $generated@@55 $generated@@264 ($generated@@56 $generated@@261 $generated@@262)) ($generated@@72 $generated@@55 $generated@@264 ($generated@@56 $generated@@261 $generated@@262) $generated@@263)) (= (ControlFlow 0 9) 8)) $generated@@281))))
+$generated@@282)))))))))
+))
+(check-sat)
+(get-info :rlimit)
+(pop 1)
+; Valid
+(reset)
+(set-option :rlimit 0)
+; did a full reset
+(reset)
+(set-option :print-success false)
+(set-info :smt-lib-version 2.6)
+(set-option :auto_config false)
+(set-option :type_check true)
+(set-option :smt.qi.eager_threshold 100)
+(set-option :smt.delay_units true)
+(set-option :model_evaluator.completion true)
+(set-option :model.completion true)
+(set-option :model.compact false)
+(set-option :smt.case_split 3)
+(set-option :smt.mbqi false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+(set-option :smt.arith.solver 2)
+; done setting options
+
+
+(set-info :category "industrial")
+(declare-sort |T@U| 0)
+(declare-sort |T@T| 0)
+(declare-fun real_pow (Real Real) Real)
+(declare-fun UOrdering2 (|T@U| |T@U|) Bool)
+(declare-fun UOrdering3 (|T@T| |T@U| |T@U|) Bool)
+(declare-fun tickleBool (Bool) Bool)
+(assert (and (tickleBool true) (tickleBool false)))
+(declare-fun $generated () T@U)
+(declare-fun $generated@@0 () T@U)
+(declare-fun $generated@@1 () T@U)
+(declare-fun $generated@@2 () T@U)
+(declare-fun $generated@@3 () T@U)
+(declare-fun $generated@@4 () T@U)
+(declare-fun $generated@@5 () T@U)
+(declare-fun $generated@@6 () T@U)
+(declare-fun $generated@@7 () T@U)
+(declare-fun $generated@@8 () T@U)
+(declare-fun $generated@@9 () T@U)
+(declare-fun $generated@@10 () T@U)
+(declare-fun $generated@@11 () T@U)
+(declare-fun $generated@@12 () T@U)
+(declare-fun $generated@@13 () T@U)
+(declare-fun $generated@@14 () T@U)
+(declare-fun $generated@@15 (T@T) Int)
+(declare-fun $generated@@16 () T@T)
+(declare-fun $generated@@17 () T@T)
+(declare-fun $generated@@18 () T@T)
+(declare-fun $generated@@19 (Bool) T@U)
+(declare-fun $generated@@20 (T@U) Bool)
+(declare-fun $generated@@21 (Int) T@U)
+(declare-fun $generated@@22 (T@U) Int)
+(declare-fun $generated@@23 (Real) T@U)
+(declare-fun $generated@@24 (T@U) Real)
+(declare-fun $generated@@31 (T@U T@U T@U) Bool)
+(declare-fun $generated@@32 (T@U T@U T@U) Bool)
+(declare-fun $generated@@33 (T@U T@U T@U T@U T@U) Bool)
+(declare-fun $generated@@34 () T@U)
+(declare-fun $generated@@35 (T@U) T@U)
+(declare-fun $generated@@36 (T@T T@T T@U T@U) T@U)
+(declare-fun $generated@@37 () T@T)
+(declare-fun $generated@@38 (T@U) T@U)
+(declare-fun $generated@@39 (T@U T@U) Bool)
+(declare-fun $generated@@40 (T@U) Bool)
+(declare-fun $generated@@41 (T@T T@T T@U T@U T@U) T@U)
+(declare-fun $generated@@58 (T@U T@U) Bool)
+(declare-fun $generated@@59 (T@U T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@60 (T@U T@U T@U) T@U)
+(declare-fun $generated@@61 (T@T T@T T@T T@U T@U T@U) T@U)
+(declare-fun $generated@@62 (T@T T@T) T@T)
+(declare-fun $generated@@63 () T@T)
+(declare-fun $generated@@64 () T@T)
+(declare-fun $generated@@65 () T@T)
+(declare-fun $generated@@66 (T@T T@T T@T T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@67 (T@T) T@T)
+(declare-fun $generated@@68 (T@T) T@T)
+(declare-fun $generated@@108 (T@T T@U T@U) Bool)
+(declare-fun $generated@@109 () T@T)
+(declare-fun $generated@@110 (T@U T@U) T@U)
+(declare-fun $generated@@114 () T@U)
+(declare-fun $generated@@116 (T@U) T@U)
+(declare-fun $generated@@117 () T@U)
+(declare-fun $generated@@118 () T@T)
+(declare-fun $generated@@119 (T@U T@U) T@U)
+(declare-fun $generated@@127 (T@T T@U T@U T@U) Bool)
+(declare-fun $generated@@128 () T@U)
+(declare-fun $generated@@129 () T@U)
+(declare-fun $generated@@132 () T@U)
+(declare-fun $generated@@133 () T@U)
+(declare-fun $generated@@134 (T@T T@U) T@U)
+(declare-fun $generated@@137 (T@U T@U) T@U)
+(declare-fun $generated@@138 (T@U) Bool)
+(declare-fun $generated@@143 (T@U T@U) Bool)
+(declare-fun $generated@@147 (T@U) T@U)
+(declare-fun $generated@@151 (T@T T@U) T@U)
+(declare-fun $generated@@154 (T@U T@U) Bool)
+(declare-fun $generated@@160 (T@U T@U) T@U)
+(declare-fun $generated@@166 (T@T T@U) T@U)
+(declare-fun $generated@@188 (T@U) T@U)
+(declare-fun $generated@@192 (T@T T@U T@U) T@U)
+(declare-fun $generated@@193 () T@T)
+(declare-fun $generated@@202 (T@U T@U T@U) Bool)
+(declare-fun $generated@@237 (T@U T@U T@U T@U T@U) T@U)
+(declare-fun $generated@@254 (T@U) T@U)
+(declare-fun $generated@@277 (Bool) T@U)
+(declare-fun $generated@@280 (T@U) T@U)
+(declare-fun $generated@@311 (T@U) T@U)
+(declare-fun $generated@@314 (T@U) T@U)
+(declare-fun $generated@@317 (T@U) T@U)
+(declare-fun $generated@@320 (T@U) T@U)
+(declare-fun $generated@@325 (T@U) T@U)
+(declare-fun $generated@@328 (T@U) T@U)
+(declare-fun $generated@@336 (T@U) T@U)
+(declare-fun $generated@@338 (T@U) T@U)
+(declare-fun $generated@@340 (T@U) T@U)
+(declare-fun $generated@@345 (T@U) Int)
+(declare-fun $generated@@353 (T@U) T@U)
+(declare-fun $generated@@372 () T@U)
+(declare-fun $generated@@374 (T@U T@U T@U Bool) T@U)
+(declare-fun $generated@@381 (T@U) T@U)
+(declare-fun $generated@@411 (T@U) T@U)
+(declare-fun $generated@@415 (T@U) T@U)
+(declare-fun $generated@@419 (T@U Bool) T@U)
+(assert  (and (and (and (and (and (and (and (and (= ($generated@@15 $generated@@16) 0) (= ($generated@@15 $generated@@17) 1)) (= ($generated@@15 $generated@@18) 2)) (forall (($generated@@25 Bool) ) (! (= ($generated@@20 ($generated@@19 $generated@@25)) $generated@@25)
+ :pattern ( ($generated@@19 $generated@@25))
+))) (forall (($generated@@26 T@U) ) (! (= ($generated@@19 ($generated@@20 $generated@@26)) $generated@@26)
+ :pattern ( ($generated@@20 $generated@@26))
+))) (forall (($generated@@27 Int) ) (! (= ($generated@@22 ($generated@@21 $generated@@27)) $generated@@27)
+ :pattern ( ($generated@@21 $generated@@27))
+))) (forall (($generated@@28 T@U) ) (! (= ($generated@@21 ($generated@@22 $generated@@28)) $generated@@28)
+ :pattern ( ($generated@@22 $generated@@28))
+))) (forall (($generated@@29 Real) ) (! (= ($generated@@24 ($generated@@23 $generated@@29)) $generated@@29)
+ :pattern ( ($generated@@23 $generated@@29))
+))) (forall (($generated@@30 T@U) ) (! (= ($generated@@23 ($generated@@24 $generated@@30)) $generated@@30)
+ :pattern ( ($generated@@24 $generated@@30))
+))))
+(assert (distinct $generated $generated@@0 $generated@@1 $generated@@2 $generated@@3 $generated@@4 $generated@@5 $generated@@6 $generated@@7 $generated@@8 $generated@@9 $generated@@10 $generated@@11 $generated@@12 $generated@@13 $generated@@14)
+)
+(assert  (and (and (forall (($generated@@42 T@T) ($generated@@43 T@T) ($generated@@44 T@U) ($generated@@45 T@U) ($generated@@46 T@U) ) (! (= ($generated@@36 $generated@@42 $generated@@43 ($generated@@41 $generated@@42 $generated@@43 $generated@@45 $generated@@46 $generated@@44) $generated@@46) $generated@@44)
+ :weight 0
+)) (forall (($generated@@47 T@T) ($generated@@48 T@T) ($generated@@49 T@U) ($generated@@50 T@U) ($generated@@51 T@U) ($generated@@52 T@U) ) (!  (or (= $generated@@51 $generated@@52) (= ($generated@@36 $generated@@47 $generated@@48 ($generated@@41 $generated@@47 $generated@@48 $generated@@50 $generated@@51 $generated@@49) $generated@@52) ($generated@@36 $generated@@47 $generated@@48 $generated@@50 $generated@@52)))
+ :weight 0
+))) (= ($generated@@15 $generated@@37) 3)))
+(assert (forall (($generated@@53 T@U) ($generated@@54 T@U) ($generated@@55 T@U) ) (!  (=> ($generated@@32 $generated@@53 $generated@@54 $generated@@55) (and (forall (($generated@@56 T@U) ) (!  (=> ($generated@@39 $generated@@56 $generated@@53) (and ($generated@@40 $generated@@55) (=> ($generated@@20 ($generated@@36 $generated@@37 $generated@@16 ($generated@@38 $generated@@55) $generated@@56)) (and ($generated@@40 $generated@@55) true))))
+ :pattern ( ($generated@@33 $generated@@53 $generated@@54 $generated@@34 ($generated@@35 $generated@@55) $generated@@56))
+ :pattern ( ($generated@@36 $generated@@37 $generated@@16 ($generated@@38 $generated@@55) $generated@@56))
+)) (= ($generated@@31 $generated@@53 $generated@@54 $generated@@55) (forall (($generated@@57 T@U) ) (!  (=> (and ($generated@@39 $generated@@57 $generated@@53) ($generated@@20 ($generated@@36 $generated@@37 $generated@@16 ($generated@@38 $generated@@55) $generated@@57))) ($generated@@33 $generated@@53 $generated@@54 $generated@@34 ($generated@@35 $generated@@55) $generated@@57))
+ :pattern ( ($generated@@33 $generated@@53 $generated@@54 $generated@@34 ($generated@@35 $generated@@55) $generated@@57))
+ :pattern ( ($generated@@36 $generated@@37 $generated@@16 ($generated@@38 $generated@@55) $generated@@57))
+)))))
+ :pattern ( ($generated@@31 $generated@@53 $generated@@54 $generated@@55))
+)))
+(assert  (and (and (and (and (and (and (and (forall (($generated@@69 T@T) ($generated@@70 T@T) ($generated@@71 T@T) ($generated@@72 T@U) ($generated@@73 T@U) ($generated@@74 T@U) ($generated@@75 T@U) ) (! (= ($generated@@61 $generated@@69 $generated@@70 $generated@@71 ($generated@@66 $generated@@69 $generated@@70 $generated@@71 $generated@@73 $generated@@74 $generated@@75 $generated@@72) $generated@@74 $generated@@75) $generated@@72)
+ :weight 0
+)) (and (forall (($generated@@76 T@T) ($generated@@77 T@T) ($generated@@78 T@T) ($generated@@79 T@U) ($generated@@80 T@U) ($generated@@81 T@U) ($generated@@82 T@U) ($generated@@83 T@U) ($generated@@84 T@U) ) (!  (or (= $generated@@81 $generated@@83) (= ($generated@@61 $generated@@76 $generated@@77 $generated@@78 ($generated@@66 $generated@@76 $generated@@77 $generated@@78 $generated@@80 $generated@@81 $generated@@82 $generated@@79) $generated@@83 $generated@@84) ($generated@@61 $generated@@76 $generated@@77 $generated@@78 $generated@@80 $generated@@83 $generated@@84)))
+ :weight 0
+)) (forall (($generated@@85 T@T) ($generated@@86 T@T) ($generated@@87 T@T) ($generated@@88 T@U) ($generated@@89 T@U) ($generated@@90 T@U) ($generated@@91 T@U) ($generated@@92 T@U) ($generated@@93 T@U) ) (!  (or (= $generated@@91 $generated@@93) (= ($generated@@61 $generated@@85 $generated@@86 $generated@@87 ($generated@@66 $generated@@85 $generated@@86 $generated@@87 $generated@@89 $generated@@90 $generated@@91 $generated@@88) $generated@@92 $generated@@93) ($generated@@61 $generated@@85 $generated@@86 $generated@@87 $generated@@89 $generated@@92 $generated@@93)))
+ :weight 0
+)))) (forall (($generated@@94 T@T) ($generated@@95 T@T) ) (= ($generated@@15 ($generated@@62 $generated@@94 $generated@@95)) 4))) (forall (($generated@@96 T@T) ($generated@@97 T@T) ) (! (= ($generated@@67 ($generated@@62 $generated@@96 $generated@@97)) $generated@@96)
+ :pattern ( ($generated@@62 $generated@@96 $generated@@97))
+))) (forall (($generated@@98 T@T) ($generated@@99 T@T) ) (! (= ($generated@@68 ($generated@@62 $generated@@98 $generated@@99)) $generated@@99)
+ :pattern ( ($generated@@62 $generated@@98 $generated@@99))
+))) (= ($generated@@15 $generated@@63) 5)) (= ($generated@@15 $generated@@64) 6)) (= ($generated@@15 $generated@@65) 7)))
+(assert (forall (($generated@@100 T@U) ($generated@@101 T@U) ($generated@@102 T@U) ($generated@@103 T@U) ($generated@@104 T@U) ($generated@@105 T@U) ($generated@@106 T@U) ($generated@@107 T@U) ) (! (= ($generated@@58 ($generated@@59 $generated@@100 $generated@@101 $generated@@102 ($generated@@60 $generated@@103 $generated@@104 $generated@@105) $generated@@106) $generated@@107) ($generated@@58 ($generated@@61 ($generated@@62 $generated@@63 ($generated@@62 $generated@@64 $generated@@37)) $generated@@37 $generated@@65 $generated@@105 $generated@@102 $generated@@106) $generated@@107))
+ :pattern ( ($generated@@58 ($generated@@59 $generated@@100 $generated@@101 $generated@@102 ($generated@@60 $generated@@103 $generated@@104 $generated@@105) $generated@@106) $generated@@107))
+)))
+(assert (= ($generated@@15 $generated@@109) 8))
+(assert (forall (($generated@@111 T@U) ($generated@@112 T@U) ($generated@@113 T@U) ) (!  (=> ($generated@@108 $generated@@109 $generated@@113 ($generated@@110 $generated@@111 $generated@@112)) ($generated@@40 $generated@@113))
+ :pattern ( ($generated@@40 $generated@@113) ($generated@@108 $generated@@109 $generated@@113 ($generated@@110 $generated@@111 $generated@@112)))
+)))
+(assert (forall (($generated@@115 T@U) ) (!  (not ($generated@@58 $generated@@114 $generated@@115))
+ :pattern ( ($generated@@58 $generated@@114 $generated@@115))
+)))
+(assert (= ($generated@@116 $generated@@117) $generated@@6))
+(assert (= ($generated@@15 $generated@@118) 9))
+(assert (forall (($generated@@120 T@U) ($generated@@121 T@U) ($generated@@122 T@U) ($generated@@123 T@U) ($generated@@124 T@U) ) (!  (=> (and (and ($generated@@108 $generated@@118 $generated@@120 ($generated@@119 $generated@@121 $generated@@122)) (forall (($generated@@125 T@U) ) (!  (=> ($generated@@39 $generated@@125 $generated@@123) ($generated@@39 $generated@@125 $generated@@121))
+ :pattern ( ($generated@@39 $generated@@125 $generated@@123))
+ :pattern ( ($generated@@39 $generated@@125 $generated@@121))
+))) (forall (($generated@@126 T@U) ) (!  (=> ($generated@@39 $generated@@126 $generated@@122) ($generated@@39 $generated@@126 $generated@@124))
+ :pattern ( ($generated@@39 $generated@@126 $generated@@122))
+ :pattern ( ($generated@@39 $generated@@126 $generated@@124))
+))) ($generated@@108 $generated@@118 $generated@@120 ($generated@@119 $generated@@123 $generated@@124)))
+ :pattern ( ($generated@@108 $generated@@118 $generated@@120 ($generated@@119 $generated@@121 $generated@@122)) ($generated@@108 $generated@@118 $generated@@120 ($generated@@119 $generated@@123 $generated@@124)))
+)))
+(assert (forall (($generated@@130 T@U) ($generated@@131 T@U) ) (! (= ($generated@@127 $generated@@63 $generated@@130 $generated@@128 $generated@@131) ($generated@@127 $generated@@63 $generated@@130 $generated@@129 $generated@@131))
+ :pattern ( ($generated@@127 $generated@@63 $generated@@130 $generated@@128 $generated@@131))
+)))
+(assert ($generated@@108 $generated@@109 $generated@@117 $generated@@132))
+(assert (forall (($generated@@135 T@U) ($generated@@136 T@U) ) (! (= ($generated@@127 $generated@@63 $generated@@135 $generated@@129 $generated@@136)  (or (= $generated@@135 $generated@@133) ($generated@@20 ($generated@@134 $generated@@16 ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@136 $generated@@135) $generated@@1)))))
+ :pattern ( ($generated@@127 $generated@@63 $generated@@135 $generated@@129 $generated@@136))
+)))
+(assert (forall (($generated@@139 T@U) ($generated@@140 T@U) ($generated@@141 T@U) ($generated@@142 T@U) ) (!  (=> (and ($generated@@138 $generated@@142) (and ($generated@@40 $generated@@139) ($generated@@127 $generated@@109 $generated@@139 ($generated@@110 $generated@@140 $generated@@141) $generated@@142))) ($generated@@127 $generated@@118 ($generated@@35 $generated@@139) ($generated@@137 $generated@@140 $generated@@141) $generated@@142))
+ :pattern ( ($generated@@127 $generated@@118 ($generated@@35 $generated@@139) ($generated@@137 $generated@@140 $generated@@141) $generated@@142))
+)))
+(assert (forall (($generated@@144 T@U) ($generated@@145 T@U) ) (!  (=> ($generated@@143 $generated@@144 $generated@@145) (forall (($generated@@146 T@U) ) (!  (=> ($generated@@20 ($generated@@134 $generated@@16 ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@144 $generated@@146) $generated@@1))) ($generated@@20 ($generated@@134 $generated@@16 ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@145 $generated@@146) $generated@@1))))
+ :pattern ( ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@145 $generated@@146) $generated@@1))
+)))
+ :pattern ( ($generated@@143 $generated@@144 $generated@@145))
+)))
+(assert (forall (($generated@@148 T@U) ($generated@@149 T@U) ) (! (= ($generated@@108 ($generated@@62 $generated@@37 $generated@@16) $generated@@148 ($generated@@147 $generated@@149)) (forall (($generated@@150 T@U) ) (!  (=> ($generated@@20 ($generated@@36 $generated@@37 $generated@@16 $generated@@148 $generated@@150)) ($generated@@39 $generated@@150 $generated@@149))
+ :pattern ( ($generated@@36 $generated@@37 $generated@@16 $generated@@148 $generated@@150))
+)))
+ :pattern ( ($generated@@108 ($generated@@62 $generated@@37 $generated@@16) $generated@@148 ($generated@@147 $generated@@149)))
+)))
+(assert (forall (($generated@@152 T@U) ($generated@@153 T@T) ) (! (= ($generated@@151 $generated@@153 $generated@@152) $generated@@152)
+ :pattern ( ($generated@@151 $generated@@153 $generated@@152))
+)))
+(assert (forall (($generated@@155 T@U) ($generated@@156 T@U) ($generated@@157 T@U) ($generated@@158 T@U) ($generated@@159 T@U) ) (!  (=> (and ($generated@@138 $generated@@157) (and ($generated@@39 $generated@@159 $generated@@155) ($generated@@108 $generated@@118 $generated@@158 ($generated@@119 $generated@@155 $generated@@156)))) (= ($generated@@154 ($generated@@59 $generated@@155 $generated@@156 $generated@@34 $generated@@158 $generated@@159) $generated@@114) ($generated@@154 ($generated@@59 $generated@@155 $generated@@156 $generated@@157 $generated@@158 $generated@@159) $generated@@114)))
+ :pattern ( ($generated@@59 $generated@@155 $generated@@156 $generated@@34 $generated@@158 $generated@@159) ($generated@@138 $generated@@157))
+ :pattern ( ($generated@@59 $generated@@155 $generated@@156 $generated@@157 $generated@@158 $generated@@159))
+)))
+(assert (forall (($generated@@161 T@U) ($generated@@162 T@U) ($generated@@163 T@U) ($generated@@164 T@U) ) (! (= ($generated@@108 $generated@@109 ($generated@@160 $generated@@163 $generated@@164) ($generated@@110 $generated@@161 $generated@@162))  (and ($generated@@108 ($generated@@62 $generated@@37 $generated@@16) $generated@@163 ($generated@@147 $generated@@161)) ($generated@@108 $generated@@118 $generated@@164 ($generated@@137 $generated@@161 $generated@@162))))
+ :pattern ( ($generated@@108 $generated@@109 ($generated@@160 $generated@@163 $generated@@164) ($generated@@110 $generated@@161 $generated@@162)))
+)))
+(assert (forall (($generated@@165 T@U) ) (! (= ($generated@@40 $generated@@165) (= ($generated@@116 $generated@@165) $generated@@8))
+ :pattern ( ($generated@@40 $generated@@165))
+)))
+(assert (forall (($generated@@167 T@U) ($generated@@168 T@T) ) (! (= ($generated@@166 $generated@@168 ($generated@@134 $generated@@168 $generated@@167)) $generated@@167)
+ :pattern ( ($generated@@134 $generated@@168 $generated@@167))
+)))
+(assert (forall (($generated@@169 T@U) ) (!  (=> ($generated@@40 $generated@@169) (exists (($generated@@170 T@U) ($generated@@171 T@U) ) (= $generated@@169 ($generated@@160 $generated@@170 $generated@@171))))
+ :pattern ( ($generated@@40 $generated@@169))
+)))
+(assert (forall (($generated@@172 T@U) ($generated@@173 T@U) ($generated@@174 T@U) ($generated@@175 T@U) ($generated@@176 T@U) ($generated@@177 T@U) ) (!  (=> (and (and (and ($generated@@143 $generated@@174 $generated@@175) (and ($generated@@138 $generated@@174) ($generated@@138 $generated@@175))) (and ($generated@@39 $generated@@177 $generated@@172) ($generated@@108 $generated@@118 $generated@@176 ($generated@@119 $generated@@172 $generated@@173)))) (forall (($generated@@178 T@U) ($generated@@179 T@U) )  (=> (and (or (not (= $generated@@178 $generated@@133)) (not true)) ($generated@@58 ($generated@@59 $generated@@172 $generated@@173 $generated@@174 $generated@@176 $generated@@177) ($generated@@166 $generated@@63 $generated@@178))) (= ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@174 $generated@@178) $generated@@179) ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@175 $generated@@178) $generated@@179))))) (= ($generated@@33 $generated@@172 $generated@@173 $generated@@174 $generated@@176 $generated@@177) ($generated@@33 $generated@@172 $generated@@173 $generated@@175 $generated@@176 $generated@@177)))
+ :pattern ( ($generated@@143 $generated@@174 $generated@@175) ($generated@@33 $generated@@172 $generated@@173 $generated@@175 $generated@@176 $generated@@177))
+)))
+(assert (forall (($generated@@180 T@U) ($generated@@181 T@U) ($generated@@182 T@U) ($generated@@183 T@U) ($generated@@184 T@U) ($generated@@185 T@U) ) (!  (=> (and (and (and ($generated@@143 $generated@@182 $generated@@183) (and ($generated@@138 $generated@@182) ($generated@@138 $generated@@183))) (and ($generated@@39 $generated@@185 $generated@@180) ($generated@@108 $generated@@118 $generated@@184 ($generated@@119 $generated@@180 $generated@@181)))) (forall (($generated@@186 T@U) ($generated@@187 T@U) )  (=> (and (or (not (= $generated@@186 $generated@@133)) (not true)) ($generated@@58 ($generated@@59 $generated@@180 $generated@@181 $generated@@183 $generated@@184 $generated@@185) ($generated@@166 $generated@@63 $generated@@186))) (= ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@182 $generated@@186) $generated@@187) ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@183 $generated@@186) $generated@@187))))) (= ($generated@@33 $generated@@180 $generated@@181 $generated@@182 $generated@@184 $generated@@185) ($generated@@33 $generated@@180 $generated@@181 $generated@@183 $generated@@184 $generated@@185)))
+ :pattern ( ($generated@@143 $generated@@182 $generated@@183) ($generated@@33 $generated@@180 $generated@@181 $generated@@183 $generated@@184 $generated@@185))
+)))
+(assert (forall (($generated@@189 T@U) ($generated@@190 T@U) ) (! (= ($generated@@108 $generated@@65 $generated@@189 ($generated@@188 $generated@@190)) (forall (($generated@@191 T@U) ) (!  (=> ($generated@@58 $generated@@189 $generated@@191) ($generated@@39 $generated@@191 $generated@@190))
+ :pattern ( ($generated@@58 $generated@@189 $generated@@191))
+)))
+ :pattern ( ($generated@@108 $generated@@65 $generated@@189 ($generated@@188 $generated@@190)))
+)))
+(assert (= ($generated@@15 $generated@@193) 10))
+(assert (forall (($generated@@194 T@U) ($generated@@195 T@U) ($generated@@196 T@T) ) (! (= ($generated@@192 $generated@@196 $generated@@194 $generated@@195) ($generated@@36 $generated@@193 $generated@@196 $generated@@194 $generated@@195))
+ :pattern ( ($generated@@192 $generated@@196 $generated@@194 $generated@@195))
+)))
+(assert (forall (($generated@@197 T@U) ($generated@@198 T@U) ($generated@@199 T@U) ($generated@@200 T@U) ($generated@@201 T@U) ) (!  (=> ($generated@@138 $generated@@201) (= ($generated@@127 $generated@@109 ($generated@@160 $generated@@199 $generated@@200) ($generated@@110 $generated@@197 $generated@@198) $generated@@201)  (and ($generated@@127 ($generated@@62 $generated@@37 $generated@@16) $generated@@199 ($generated@@147 $generated@@197) $generated@@201) ($generated@@127 $generated@@118 $generated@@200 ($generated@@137 $generated@@197 $generated@@198) $generated@@201))))
+ :pattern ( ($generated@@127 $generated@@109 ($generated@@160 $generated@@199 $generated@@200) ($generated@@110 $generated@@197 $generated@@198) $generated@@201))
+)))
+(assert ($generated@@138 $generated@@34))
+(assert (forall (($generated@@203 T@U) ($generated@@204 T@U) ($generated@@205 T@U) ($generated@@206 T@T) ) (! (= ($generated@@202 ($generated@@166 $generated@@206 $generated@@203) $generated@@204 $generated@@205) ($generated@@127 $generated@@206 $generated@@203 $generated@@204 $generated@@205))
+ :pattern ( ($generated@@202 ($generated@@166 $generated@@206 $generated@@203) $generated@@204 $generated@@205))
+)))
+(assert (forall (($generated@@207 T@U) ($generated@@208 T@U) ($generated@@209 T@U) ($generated@@210 T@U) ) (!  (=> ($generated@@143 $generated@@207 $generated@@208) (=> ($generated@@202 $generated@@209 $generated@@210 $generated@@207) ($generated@@202 $generated@@209 $generated@@210 $generated@@208)))
+ :pattern ( ($generated@@143 $generated@@207 $generated@@208) ($generated@@202 $generated@@209 $generated@@210 $generated@@207))
+)))
+(assert (forall (($generated@@211 T@U) ($generated@@212 T@U) ($generated@@213 T@U) ($generated@@214 T@U) ($generated@@215 T@T) ) (!  (=> ($generated@@143 $generated@@211 $generated@@212) (=> ($generated@@127 $generated@@215 $generated@@213 $generated@@214 $generated@@211) ($generated@@127 $generated@@215 $generated@@213 $generated@@214 $generated@@212)))
+ :pattern ( ($generated@@143 $generated@@211 $generated@@212) ($generated@@127 $generated@@215 $generated@@213 $generated@@214 $generated@@211))
+)))
+(assert (forall (($generated@@216 T@U) ($generated@@217 T@U) ($generated@@218 T@U) ) (!  (=> ($generated@@32 $generated@@216 $generated@@217 ($generated@@151 $generated@@109 $generated@@218)) (and (forall (($generated@@219 T@U) ) (!  (=> ($generated@@39 $generated@@219 $generated@@216) (and ($generated@@40 ($generated@@151 $generated@@109 $generated@@218)) (=> ($generated@@20 ($generated@@36 $generated@@37 $generated@@16 ($generated@@151 ($generated@@62 $generated@@37 $generated@@16) ($generated@@38 ($generated@@151 $generated@@109 $generated@@218))) $generated@@219)) (and ($generated@@40 ($generated@@151 $generated@@109 $generated@@218)) true))))
+ :pattern ( ($generated@@33 $generated@@216 $generated@@217 $generated@@34 ($generated@@35 $generated@@218) $generated@@219))
+ :pattern ( ($generated@@36 $generated@@37 $generated@@16 ($generated@@38 $generated@@218) $generated@@219))
+)) (= ($generated@@31 $generated@@216 $generated@@217 ($generated@@151 $generated@@109 $generated@@218)) (forall (($generated@@220 T@U) ) (!  (=> (and ($generated@@39 $generated@@220 $generated@@216) ($generated@@20 ($generated@@36 $generated@@37 $generated@@16 ($generated@@151 ($generated@@62 $generated@@37 $generated@@16) ($generated@@38 ($generated@@151 $generated@@109 $generated@@218))) $generated@@220))) ($generated@@33 $generated@@216 $generated@@217 $generated@@34 ($generated@@151 $generated@@118 ($generated@@35 ($generated@@151 $generated@@109 $generated@@218))) $generated@@220))
+ :pattern ( ($generated@@33 $generated@@216 $generated@@217 $generated@@34 ($generated@@35 $generated@@218) $generated@@220))
+ :pattern ( ($generated@@36 $generated@@37 $generated@@16 ($generated@@38 $generated@@218) $generated@@220))
+)))))
+ :weight 3
+ :pattern ( ($generated@@31 $generated@@216 $generated@@217 ($generated@@151 $generated@@109 $generated@@218)))
+)))
+(assert (forall (($generated@@221 T@U) ($generated@@222 T@U) ($generated@@223 T@U) ($generated@@224 T@U) ($generated@@225 T@U) ($generated@@226 T@U) ) (!  (=> (and (and (and ($generated@@143 $generated@@223 $generated@@224) (and ($generated@@138 $generated@@223) ($generated@@138 $generated@@224))) (and ($generated@@39 $generated@@226 $generated@@221) ($generated@@108 $generated@@118 $generated@@225 ($generated@@119 $generated@@221 $generated@@222)))) (forall (($generated@@227 T@U) ($generated@@228 T@U) )  (=> (and (or (not (= $generated@@227 $generated@@133)) (not true)) ($generated@@58 ($generated@@59 $generated@@221 $generated@@222 $generated@@223 $generated@@225 $generated@@226) ($generated@@166 $generated@@63 $generated@@227))) (= ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@223 $generated@@227) $generated@@228) ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@224 $generated@@227) $generated@@228))))) (= ($generated@@59 $generated@@221 $generated@@222 $generated@@223 $generated@@225 $generated@@226) ($generated@@59 $generated@@221 $generated@@222 $generated@@224 $generated@@225 $generated@@226)))
+ :pattern ( ($generated@@143 $generated@@223 $generated@@224) ($generated@@59 $generated@@221 $generated@@222 $generated@@224 $generated@@225 $generated@@226))
+)))
+(assert (forall (($generated@@229 T@U) ($generated@@230 T@U) ($generated@@231 T@U) ($generated@@232 T@U) ($generated@@233 T@U) ($generated@@234 T@U) ) (!  (=> (and (and (and ($generated@@143 $generated@@231 $generated@@232) (and ($generated@@138 $generated@@231) ($generated@@138 $generated@@232))) (and ($generated@@39 $generated@@234 $generated@@229) ($generated@@108 $generated@@118 $generated@@233 ($generated@@119 $generated@@229 $generated@@230)))) (forall (($generated@@235 T@U) ($generated@@236 T@U) )  (=> (and (or (not (= $generated@@235 $generated@@133)) (not true)) ($generated@@58 ($generated@@59 $generated@@229 $generated@@230 $generated@@232 $generated@@233 $generated@@234) ($generated@@166 $generated@@63 $generated@@235))) (= ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@231 $generated@@235) $generated@@236) ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@232 $generated@@235) $generated@@236))))) (= ($generated@@59 $generated@@229 $generated@@230 $generated@@231 $generated@@233 $generated@@234) ($generated@@59 $generated@@229 $generated@@230 $generated@@232 $generated@@233 $generated@@234)))
+ :pattern ( ($generated@@143 $generated@@231 $generated@@232) ($generated@@59 $generated@@229 $generated@@230 $generated@@232 $generated@@233 $generated@@234))
+)))
+(assert (forall (($generated@@238 T@U) ($generated@@239 T@U) ($generated@@240 T@U) ($generated@@241 T@U) ($generated@@242 T@U) ($generated@@243 T@U) ) (!  (=> (and (and (and ($generated@@143 $generated@@240 $generated@@241) (and ($generated@@138 $generated@@240) ($generated@@138 $generated@@241))) (and ($generated@@39 $generated@@243 $generated@@238) ($generated@@108 $generated@@118 $generated@@242 ($generated@@119 $generated@@238 $generated@@239)))) (forall (($generated@@244 T@U) ($generated@@245 T@U) )  (=> (and (or (not (= $generated@@244 $generated@@133)) (not true)) ($generated@@58 ($generated@@59 $generated@@238 $generated@@239 $generated@@240 $generated@@242 $generated@@243) ($generated@@166 $generated@@63 $generated@@244))) (= ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@240 $generated@@244) $generated@@245) ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@241 $generated@@244) $generated@@245))))) (= ($generated@@237 $generated@@238 $generated@@239 $generated@@240 $generated@@242 $generated@@243) ($generated@@237 $generated@@238 $generated@@239 $generated@@241 $generated@@242 $generated@@243)))
+ :pattern ( ($generated@@143 $generated@@240 $generated@@241) ($generated@@237 $generated@@238 $generated@@239 $generated@@241 $generated@@242 $generated@@243))
+)))
+(assert (forall (($generated@@246 T@U) ($generated@@247 T@U) ($generated@@248 T@U) ($generated@@249 T@U) ($generated@@250 T@U) ($generated@@251 T@U) ) (!  (=> (and (and (and ($generated@@143 $generated@@248 $generated@@249) (and ($generated@@138 $generated@@248) ($generated@@138 $generated@@249))) (and ($generated@@39 $generated@@251 $generated@@246) ($generated@@108 $generated@@118 $generated@@250 ($generated@@119 $generated@@246 $generated@@247)))) (forall (($generated@@252 T@U) ($generated@@253 T@U) )  (=> (and (or (not (= $generated@@252 $generated@@133)) (not true)) ($generated@@58 ($generated@@59 $generated@@246 $generated@@247 $generated@@249 $generated@@250 $generated@@251) ($generated@@166 $generated@@63 $generated@@252))) (= ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@248 $generated@@252) $generated@@253) ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@249 $generated@@252) $generated@@253))))) (= ($generated@@237 $generated@@246 $generated@@247 $generated@@248 $generated@@250 $generated@@251) ($generated@@237 $generated@@246 $generated@@247 $generated@@249 $generated@@250 $generated@@251)))
+ :pattern ( ($generated@@143 $generated@@248 $generated@@249) ($generated@@237 $generated@@246 $generated@@247 $generated@@249 $generated@@250 $generated@@251))
+)))
+(assert (forall (($generated@@255 T@U) ($generated@@256 T@U) ) (! (= ($generated@@58 ($generated@@254 $generated@@255) $generated@@256) ($generated@@20 ($generated@@36 $generated@@63 $generated@@16 $generated@@255 ($generated@@134 $generated@@63 $generated@@256))))
+ :pattern ( ($generated@@58 ($generated@@254 $generated@@255) $generated@@256))
+)))
+(assert (forall (($generated@@257 T@U) ($generated@@258 T@U) ($generated@@259 T@U) ($generated@@260 T@U) ) (! (= ($generated@@127 $generated@@118 $generated@@259 ($generated@@137 $generated@@257 $generated@@258) $generated@@260) ($generated@@127 $generated@@118 $generated@@259 ($generated@@119 $generated@@257 $generated@@258) $generated@@260))
+ :pattern ( ($generated@@127 $generated@@118 $generated@@259 ($generated@@137 $generated@@257 $generated@@258) $generated@@260))
+)))
+(assert (forall (($generated@@261 T@U) ($generated@@262 T@U) ($generated@@263 T@U) ($generated@@264 T@U) ($generated@@265 T@U) ($generated@@266 T@U) ($generated@@267 T@U) ) (! (= ($generated@@237 $generated@@261 $generated@@262 $generated@@263 ($generated@@60 $generated@@264 $generated@@265 $generated@@266) $generated@@267) ($generated@@61 ($generated@@62 $generated@@63 ($generated@@62 $generated@@64 $generated@@37)) $generated@@37 $generated@@37 $generated@@264 $generated@@263 $generated@@267))
+ :pattern ( ($generated@@237 $generated@@261 $generated@@262 $generated@@263 ($generated@@60 $generated@@264 $generated@@265 $generated@@266) $generated@@267))
+)))
+(assert (forall (($generated@@268 T@U) ) (!  (=> ($generated@@39 $generated@@268 $generated@@129) (and (= ($generated@@166 $generated@@63 ($generated@@134 $generated@@63 $generated@@268)) $generated@@268) ($generated@@108 $generated@@63 ($generated@@134 $generated@@63 $generated@@268) $generated@@129)))
+ :pattern ( ($generated@@39 $generated@@268 $generated@@129))
+)))
+(assert (forall (($generated@@269 T@U) ) (!  (=> ($generated@@39 $generated@@269 $generated@@128) (and (= ($generated@@166 $generated@@63 ($generated@@134 $generated@@63 $generated@@269)) $generated@@269) ($generated@@108 $generated@@63 ($generated@@134 $generated@@63 $generated@@269) $generated@@128)))
+ :pattern ( ($generated@@39 $generated@@269 $generated@@128))
+)))
+(assert (forall (($generated@@270 T@U) ) (!  (=> ($generated@@39 $generated@@270 $generated@@132) (and (= ($generated@@166 $generated@@109 ($generated@@134 $generated@@109 $generated@@270)) $generated@@270) ($generated@@108 $generated@@109 ($generated@@134 $generated@@109 $generated@@270) $generated@@132)))
+ :pattern ( ($generated@@39 $generated@@270 $generated@@132))
+)))
+(assert (forall (($generated@@271 T@U) ) (! (= ($generated@@108 $generated@@63 $generated@@271 $generated@@128)  (and ($generated@@108 $generated@@63 $generated@@271 $generated@@129) (or (not (= $generated@@271 $generated@@133)) (not true))))
+ :pattern ( ($generated@@108 $generated@@63 $generated@@271 $generated@@128))
+ :pattern ( ($generated@@108 $generated@@63 $generated@@271 $generated@@129))
+)))
+(assert (forall (($generated@@272 T@U) ($generated@@273 T@U) ($generated@@274 T@U) ($generated@@275 T@U) ) (!  (=> (and ($generated@@138 $generated@@275) ($generated@@127 $generated@@118 $generated@@272 ($generated@@119 $generated@@273 $generated@@274) $generated@@275)) (forall (($generated@@276 T@U) ) (!  (=> (and ($generated@@202 $generated@@276 $generated@@273 $generated@@275) ($generated@@33 $generated@@273 $generated@@274 $generated@@275 $generated@@272 $generated@@276)) ($generated@@202 ($generated@@237 $generated@@273 $generated@@274 $generated@@275 $generated@@272 $generated@@276) $generated@@274 $generated@@275))
+ :pattern ( ($generated@@237 $generated@@273 $generated@@274 $generated@@275 $generated@@272 $generated@@276))
+)))
+ :pattern ( ($generated@@127 $generated@@118 $generated@@272 ($generated@@119 $generated@@273 $generated@@274) $generated@@275))
+)))
+(assert (forall (($generated@@278 Bool) ($generated@@279 T@U) ) (! (= ($generated@@20 ($generated@@36 $generated@@63 $generated@@16 ($generated@@277 $generated@@278) $generated@@279)) $generated@@278)
+ :pattern ( ($generated@@36 $generated@@63 $generated@@16 ($generated@@277 $generated@@278) $generated@@279))
+)))
+(assert (forall (($generated@@281 T@U) ($generated@@282 T@U) ) (! (= ($generated@@36 $generated@@193 $generated@@118 ($generated@@280 $generated@@281) $generated@@282) $generated@@281)
+ :pattern ( ($generated@@36 $generated@@193 $generated@@118 ($generated@@280 $generated@@281) $generated@@282))
+)))
+(assert (forall (($generated@@283 T@U) ($generated@@284 T@U) ($generated@@285 T@U) ) (! (= ($generated@@127 ($generated@@62 $generated@@37 $generated@@16) $generated@@283 ($generated@@147 $generated@@284) $generated@@285) (forall (($generated@@286 T@U) ) (!  (=> ($generated@@20 ($generated@@36 $generated@@37 $generated@@16 $generated@@283 $generated@@286)) ($generated@@202 $generated@@286 $generated@@284 $generated@@285))
+ :pattern ( ($generated@@36 $generated@@37 $generated@@16 $generated@@283 $generated@@286))
+)))
+ :pattern ( ($generated@@127 ($generated@@62 $generated@@37 $generated@@16) $generated@@283 ($generated@@147 $generated@@284) $generated@@285))
+)))
+(assert (forall (($generated@@287 T@U) ($generated@@288 T@U) ) (!  (=> ($generated@@154 $generated@@287 $generated@@288) (= $generated@@287 $generated@@288))
+ :pattern ( ($generated@@154 $generated@@287 $generated@@288))
+)))
+(assert (forall (($generated@@289 T@U) ($generated@@290 T@U) ($generated@@291 T@U) ) (!  (=> (or (not (= $generated@@289 $generated@@291)) (not true)) (=> (and ($generated@@143 $generated@@289 $generated@@290) ($generated@@143 $generated@@290 $generated@@291)) ($generated@@143 $generated@@289 $generated@@291)))
+ :pattern ( ($generated@@143 $generated@@289 $generated@@290) ($generated@@143 $generated@@290 $generated@@291))
+)))
+(assert (forall (($generated@@292 T@U) ($generated@@293 T@U) ($generated@@294 T@U) ) (! (= ($generated@@108 $generated@@118 $generated@@292 ($generated@@119 $generated@@293 $generated@@294)) (forall (($generated@@295 T@U) ($generated@@296 T@U) ) (!  (=> (and (and ($generated@@138 $generated@@295) ($generated@@39 $generated@@296 $generated@@293)) ($generated@@33 $generated@@293 $generated@@294 $generated@@295 $generated@@292 $generated@@296)) ($generated@@39 ($generated@@237 $generated@@293 $generated@@294 $generated@@295 $generated@@292 $generated@@296) $generated@@294))
+ :pattern ( ($generated@@237 $generated@@293 $generated@@294 $generated@@295 $generated@@292 $generated@@296))
+)))
+ :pattern ( ($generated@@108 $generated@@118 $generated@@292 ($generated@@119 $generated@@293 $generated@@294)))
+)))
+(assert (forall (($generated@@297 T@U) ($generated@@298 T@U) ($generated@@299 T@T) ) (! (= ($generated@@39 ($generated@@166 $generated@@299 $generated@@297) $generated@@298) ($generated@@108 $generated@@299 $generated@@297 $generated@@298))
+ :pattern ( ($generated@@39 ($generated@@166 $generated@@299 $generated@@297) $generated@@298))
+)))
+(assert (forall (($generated@@300 T@U) ($generated@@301 T@U) ($generated@@302 T@U) ($generated@@303 T@U) ($generated@@304 T@U) ($generated@@305 T@U) ($generated@@306 T@U) ) (!  (=> ($generated@@20 ($generated@@61 ($generated@@62 $generated@@63 ($generated@@62 $generated@@64 $generated@@37)) $generated@@37 $generated@@16 $generated@@304 $generated@@302 $generated@@306)) ($generated@@33 $generated@@300 $generated@@301 $generated@@302 ($generated@@60 $generated@@303 $generated@@304 $generated@@305) $generated@@306))
+ :pattern ( ($generated@@33 $generated@@300 $generated@@301 $generated@@302 ($generated@@60 $generated@@303 $generated@@304 $generated@@305) $generated@@306))
+)))
+(assert (forall (($generated@@307 T@U) ($generated@@308 T@U) ($generated@@309 T@U) ) (! (= ($generated@@127 $generated@@65 $generated@@307 ($generated@@188 $generated@@308) $generated@@309) (forall (($generated@@310 T@U) ) (!  (=> ($generated@@58 $generated@@307 $generated@@310) ($generated@@202 $generated@@310 $generated@@308 $generated@@309))
+ :pattern ( ($generated@@58 $generated@@307 $generated@@310))
+)))
+ :pattern ( ($generated@@127 $generated@@65 $generated@@307 ($generated@@188 $generated@@308) $generated@@309))
+)))
+(assert (forall (($generated@@312 T@U) ($generated@@313 T@U) ) (! (= ($generated@@311 ($generated@@119 $generated@@312 $generated@@313)) $generated@@312)
+ :pattern ( ($generated@@119 $generated@@312 $generated@@313))
+)))
+(assert (forall (($generated@@315 T@U) ($generated@@316 T@U) ) (! (= ($generated@@314 ($generated@@119 $generated@@315 $generated@@316)) $generated@@316)
+ :pattern ( ($generated@@119 $generated@@315 $generated@@316))
+)))
+(assert (forall (($generated@@318 T@U) ($generated@@319 T@U) ) (! (= ($generated@@317 ($generated@@137 $generated@@318 $generated@@319)) $generated@@318)
+ :pattern ( ($generated@@137 $generated@@318 $generated@@319))
+)))
+(assert (forall (($generated@@321 T@U) ($generated@@322 T@U) ) (! (= ($generated@@320 ($generated@@137 $generated@@321 $generated@@322)) $generated@@322)
+ :pattern ( ($generated@@137 $generated@@321 $generated@@322))
+)))
+(assert (forall (($generated@@323 T@U) ($generated@@324 T@U) ) (! (= ($generated@@116 ($generated@@160 $generated@@323 $generated@@324)) $generated@@8)
+ :pattern ( ($generated@@160 $generated@@323 $generated@@324))
+)))
+(assert (forall (($generated@@326 T@U) ($generated@@327 T@U) ) (! (= ($generated@@325 ($generated@@110 $generated@@326 $generated@@327)) $generated@@326)
+ :pattern ( ($generated@@110 $generated@@326 $generated@@327))
+)))
+(assert (forall (($generated@@329 T@U) ($generated@@330 T@U) ) (! (= ($generated@@328 ($generated@@110 $generated@@329 $generated@@330)) $generated@@330)
+ :pattern ( ($generated@@110 $generated@@329 $generated@@330))
+)))
+(assert (forall (($generated@@331 T@U) ($generated@@332 T@U) ) (! (= ($generated@@38 ($generated@@160 $generated@@331 $generated@@332)) $generated@@331)
+ :pattern ( ($generated@@160 $generated@@331 $generated@@332))
+)))
+(assert (forall (($generated@@333 T@U) ($generated@@334 T@U) ) (! (= ($generated@@35 ($generated@@160 $generated@@333 $generated@@334)) $generated@@334)
+ :pattern ( ($generated@@160 $generated@@333 $generated@@334))
+)))
+(assert (forall (($generated@@335 T@U) ) (! ($generated@@108 $generated@@63 $generated@@335 $generated@@129)
+ :pattern ( ($generated@@108 $generated@@63 $generated@@335 $generated@@129))
+)))
+(assert (forall (($generated@@337 T@U) ) (! (= ($generated@@336 ($generated@@188 $generated@@337)) $generated@@337)
+ :pattern ( ($generated@@188 $generated@@337))
+)))
+(assert (forall (($generated@@339 T@U) ) (! (= ($generated@@338 ($generated@@188 $generated@@339)) $generated)
+ :pattern ( ($generated@@188 $generated@@339))
+)))
+(assert (forall (($generated@@341 T@U) ) (! (= ($generated@@340 ($generated@@147 $generated@@341)) $generated@@341)
+ :pattern ( ($generated@@147 $generated@@341))
+)))
+(assert (forall (($generated@@342 T@U) ) (! (= ($generated@@338 ($generated@@147 $generated@@342)) $generated@@0)
+ :pattern ( ($generated@@147 $generated@@342))
+)))
+(assert (forall (($generated@@343 T@U) ($generated@@344 T@T) ) (! (= ($generated@@134 $generated@@344 ($generated@@166 $generated@@344 $generated@@343)) $generated@@343)
+ :pattern ( ($generated@@166 $generated@@344 $generated@@343))
+)))
+(assert (forall (($generated@@346 T@U) ($generated@@347 T@U) ($generated@@348 T@U) ) (!  (=> ($generated@@20 ($generated@@36 $generated@@37 $generated@@16 $generated@@346 ($generated@@166 $generated@@109 $generated@@348))) (< ($generated@@345 $generated@@348) ($generated@@345 ($generated@@160 $generated@@346 $generated@@347))))
+ :pattern ( ($generated@@36 $generated@@37 $generated@@16 $generated@@346 ($generated@@166 $generated@@109 $generated@@348)) ($generated@@160 $generated@@346 $generated@@347))
+)))
+(assert (forall (($generated@@349 T@U) ($generated@@350 T@U) ($generated@@351 T@U) ) (! (= ($generated@@108 $generated@@118 $generated@@351 ($generated@@137 $generated@@349 $generated@@350))  (and ($generated@@108 $generated@@118 $generated@@351 ($generated@@119 $generated@@349 $generated@@350)) (forall (($generated@@352 T@U) )  (=> ($generated@@39 $generated@@352 $generated@@349) ($generated@@154 ($generated@@59 $generated@@349 $generated@@350 $generated@@34 $generated@@351 $generated@@352) $generated@@114)))))
+ :pattern ( ($generated@@108 $generated@@118 $generated@@351 ($generated@@137 $generated@@349 $generated@@350)))
+)))
+(assert (forall (($generated@@354 T@U) ($generated@@355 T@U) ($generated@@356 T@T) ) (! (= ($generated@@192 $generated@@356 $generated@@354 ($generated@@353 $generated@@355)) ($generated@@192 $generated@@356 $generated@@354 $generated@@355))
+ :pattern ( ($generated@@192 $generated@@356 $generated@@354 ($generated@@353 $generated@@355)))
+)))
+(assert (forall (($generated@@357 T@U) ($generated@@358 T@U) ($generated@@359 T@U) ($generated@@360 T@U) ) (!  (=> ($generated@@138 $generated@@360) (= ($generated@@127 $generated@@118 $generated@@357 ($generated@@119 $generated@@358 $generated@@359) $generated@@360) (forall (($generated@@361 T@U) ) (!  (=> (and (and ($generated@@39 $generated@@361 $generated@@358) ($generated@@202 $generated@@361 $generated@@358 $generated@@360)) ($generated@@33 $generated@@358 $generated@@359 $generated@@360 $generated@@357 $generated@@361)) (forall (($generated@@362 T@U) ) (!  (=> (and (or (not (= $generated@@362 $generated@@133)) (not true)) ($generated@@58 ($generated@@59 $generated@@358 $generated@@359 $generated@@360 $generated@@357 $generated@@361) ($generated@@166 $generated@@63 $generated@@362))) ($generated@@20 ($generated@@134 $generated@@16 ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@360 $generated@@362) $generated@@1))))
+ :pattern ( ($generated@@58 ($generated@@59 $generated@@358 $generated@@359 $generated@@360 $generated@@357 $generated@@361) ($generated@@166 $generated@@63 $generated@@362)))
+)))
+ :pattern ( ($generated@@237 $generated@@358 $generated@@359 $generated@@360 $generated@@357 $generated@@361))
+ :pattern ( ($generated@@59 $generated@@358 $generated@@359 $generated@@360 $generated@@357 $generated@@361))
+))))
+ :pattern ( ($generated@@127 $generated@@118 $generated@@357 ($generated@@119 $generated@@358 $generated@@359) $generated@@360))
+)))
+(assert (forall (($generated@@363 T@U) ($generated@@364 T@U) ($generated@@365 T@U) ) (!  (=> ($generated@@39 $generated@@365 ($generated@@119 $generated@@363 $generated@@364)) (and (= ($generated@@166 $generated@@118 ($generated@@134 $generated@@118 $generated@@365)) $generated@@365) ($generated@@108 $generated@@118 ($generated@@134 $generated@@118 $generated@@365) ($generated@@119 $generated@@363 $generated@@364))))
+ :pattern ( ($generated@@39 $generated@@365 ($generated@@119 $generated@@363 $generated@@364)))
+)))
+(assert (forall (($generated@@366 T@U) ($generated@@367 T@U) ($generated@@368 T@U) ) (!  (=> ($generated@@39 $generated@@368 ($generated@@137 $generated@@366 $generated@@367)) (and (= ($generated@@166 $generated@@118 ($generated@@134 $generated@@118 $generated@@368)) $generated@@368) ($generated@@108 $generated@@118 ($generated@@134 $generated@@118 $generated@@368) ($generated@@137 $generated@@366 $generated@@367))))
+ :pattern ( ($generated@@39 $generated@@368 ($generated@@137 $generated@@366 $generated@@367)))
+)))
+(assert (forall (($generated@@369 T@U) ($generated@@370 T@U) ($generated@@371 T@U) ) (!  (=> ($generated@@39 $generated@@371 ($generated@@110 $generated@@369 $generated@@370)) (and (= ($generated@@166 $generated@@109 ($generated@@134 $generated@@109 $generated@@371)) $generated@@371) ($generated@@108 $generated@@109 ($generated@@134 $generated@@109 $generated@@371) ($generated@@110 $generated@@369 $generated@@370))))
+ :pattern ( ($generated@@39 $generated@@371 ($generated@@110 $generated@@369 $generated@@370)))
+)))
+(assert (forall (($generated@@373 T@U) ) (!  (not ($generated@@20 ($generated@@36 $generated@@37 $generated@@16 $generated@@372 $generated@@373)))
+ :pattern ( ($generated@@36 $generated@@37 $generated@@16 $generated@@372 $generated@@373))
+)))
+(assert (forall (($generated@@375 T@U) ($generated@@376 T@U) ($generated@@377 T@U) ($generated@@378 Bool) ($generated@@379 T@U) ($generated@@380 T@U) ) (! (= ($generated@@20 ($generated@@61 $generated@@63 $generated@@64 $generated@@16 ($generated@@374 $generated@@375 $generated@@376 $generated@@377 $generated@@378) $generated@@379 $generated@@380))  (=> (and (or (not (= $generated@@379 $generated@@375)) (not true)) ($generated@@20 ($generated@@134 $generated@@16 ($generated@@36 $generated@@64 $generated@@37 ($generated@@36 $generated@@63 ($generated@@62 $generated@@64 $generated@@37) $generated@@376 $generated@@379) $generated@@377)))) $generated@@378))
+ :pattern ( ($generated@@61 $generated@@63 $generated@@64 $generated@@16 ($generated@@374 $generated@@375 $generated@@376 $generated@@377 $generated@@378) $generated@@379 $generated@@380))
+)))
+(assert (forall (($generated@@382 T@U) ($generated@@383 T@U) ) (!  (and (= ($generated@@338 ($generated@@119 $generated@@382 $generated@@383)) $generated@@4) (= ($generated@@381 ($generated@@119 $generated@@382 $generated@@383)) $generated@@11))
+ :pattern ( ($generated@@119 $generated@@382 $generated@@383))
+)))
+(assert (forall (($generated@@384 T@U) ($generated@@385 T@U) ) (!  (and (= ($generated@@338 ($generated@@137 $generated@@384 $generated@@385)) $generated@@5) (= ($generated@@381 ($generated@@137 $generated@@384 $generated@@385)) $generated@@12))
+ :pattern ( ($generated@@137 $generated@@384 $generated@@385))
+)))
+(assert (forall (($generated@@386 T@U) ($generated@@387 T@U) ) (!  (and (= ($generated@@338 ($generated@@110 $generated@@386 $generated@@387)) $generated@@9) (= ($generated@@381 ($generated@@110 $generated@@386 $generated@@387)) $generated@@14))
+ :pattern ( ($generated@@110 $generated@@386 $generated@@387))
+)))
+(assert (forall (($generated@@388 T@U) ($generated@@389 T@U) ($generated@@390 T@U) ($generated@@391 T@U) ($generated@@392 T@U) ) (!  (=> (and (and ($generated@@138 $generated@@390) (and ($generated@@39 $generated@@392 $generated@@388) ($generated@@108 $generated@@118 $generated@@391 ($generated@@119 $generated@@388 $generated@@389)))) ($generated@@154 ($generated@@59 $generated@@388 $generated@@389 $generated@@34 $generated@@391 $generated@@392) $generated@@114)) (= ($generated@@33 $generated@@388 $generated@@389 $generated@@34 $generated@@391 $generated@@392) ($generated@@33 $generated@@388 $generated@@389 $generated@@390 $generated@@391 $generated@@392)))
+ :pattern ( ($generated@@33 $generated@@388 $generated@@389 $generated@@34 $generated@@391 $generated@@392) ($generated@@138 $generated@@390))
+ :pattern ( ($generated@@33 $generated@@388 $generated@@389 $generated@@390 $generated@@391 $generated@@392))
+)))
+(assert (forall (($generated@@393 T@U) ($generated@@394 T@U) ) (!  (=> ($generated@@39 $generated@@393 ($generated@@188 $generated@@394)) (and (= ($generated@@166 $generated@@65 ($generated@@134 $generated@@65 $generated@@393)) $generated@@393) ($generated@@108 $generated@@65 ($generated@@134 $generated@@65 $generated@@393) ($generated@@188 $generated@@394))))
+ :pattern ( ($generated@@39 $generated@@393 ($generated@@188 $generated@@394)))
+)))
+(assert (forall (($generated@@395 T@U) ($generated@@396 T@U) ) (!  (=> ($generated@@39 $generated@@395 ($generated@@147 $generated@@396)) (and (= ($generated@@166 ($generated@@62 $generated@@37 $generated@@16) ($generated@@134 ($generated@@62 $generated@@37 $generated@@16) $generated@@395)) $generated@@395) ($generated@@108 ($generated@@62 $generated@@37 $generated@@16) ($generated@@134 ($generated@@62 $generated@@37 $generated@@16) $generated@@395) ($generated@@147 $generated@@396))))
+ :pattern ( ($generated@@39 $generated@@395 ($generated@@147 $generated@@396)))
+)))
+(assert (forall (($generated@@397 T@U) ($generated@@398 T@U) ) (!  (=> (and ($generated@@138 $generated@@398) ($generated@@108 $generated@@109 $generated@@397 $generated@@132)) ($generated@@127 $generated@@109 $generated@@397 $generated@@132 $generated@@398))
+ :pattern ( ($generated@@127 $generated@@109 $generated@@397 $generated@@132 $generated@@398))
+)))
+(assert (= ($generated@@338 $generated@@129) $generated@@2))
+(assert (= ($generated@@381 $generated@@129) $generated@@10))
+(assert (= ($generated@@338 $generated@@128) $generated@@3))
+(assert (= ($generated@@381 $generated@@128) $generated@@10))
+(assert (= ($generated@@338 $generated@@132) $generated@@7))
+(assert (= ($generated@@381 $generated@@132) $generated@@13))
+(assert (= $generated@@117 ($generated@@151 $generated@@109 $generated@@117)))
+(assert (forall (($generated@@399 T@U) ) (! ($generated@@108 $generated@@65 ($generated@@254 $generated@@399) ($generated@@188 $generated@@129))
+ :pattern ( ($generated@@254 $generated@@399))
+)))
+(assert (forall (($generated@@400 T@U) ($generated@@401 T@U) ) (! (= ($generated@@154 $generated@@400 $generated@@401) (forall (($generated@@402 T@U) ) (! (= ($generated@@58 $generated@@400 $generated@@402) ($generated@@58 $generated@@401 $generated@@402))
+ :pattern ( ($generated@@58 $generated@@400 $generated@@402))
+ :pattern ( ($generated@@58 $generated@@401 $generated@@402))
+)))
+ :pattern ( ($generated@@154 $generated@@400 $generated@@401))
+)))
+(assert (forall (($generated@@403 T@U) ($generated@@404 T@U) ) (! (= ($generated@@160 ($generated@@151 ($generated@@62 $generated@@37 $generated@@16) $generated@@403) ($generated@@151 $generated@@118 $generated@@404)) ($generated@@151 $generated@@109 ($generated@@160 $generated@@403 $generated@@404)))
+ :pattern ( ($generated@@160 ($generated@@151 ($generated@@62 $generated@@37 $generated@@16) $generated@@403) ($generated@@151 $generated@@118 $generated@@404)))
+)))
+(assert (forall (($generated@@405 T@U) ($generated@@406 T@T) ) (! (= ($generated@@166 $generated@@406 ($generated@@151 $generated@@406 $generated@@405)) ($generated@@151 $generated@@37 ($generated@@166 $generated@@406 $generated@@405)))
+ :pattern ( ($generated@@166 $generated@@406 ($generated@@151 $generated@@406 $generated@@405)))
+)))
+(assert (forall (($generated@@407 T@U) ($generated@@408 T@U) ($generated@@409 T@U) ) (!  (=> (and ($generated@@138 $generated@@409) (and ($generated@@40 $generated@@407) (exists (($generated@@410 T@U) ) (! ($generated@@127 $generated@@109 $generated@@407 ($generated@@110 $generated@@408 $generated@@410) $generated@@409)
+ :pattern ( ($generated@@127 $generated@@109 $generated@@407 ($generated@@110 $generated@@408 $generated@@410) $generated@@409))
+)))) ($generated@@127 ($generated@@62 $generated@@37 $generated@@16) ($generated@@38 $generated@@407) ($generated@@147 $generated@@408) $generated@@409))
+ :pattern ( ($generated@@127 ($generated@@62 $generated@@37 $generated@@16) ($generated@@38 $generated@@407) ($generated@@147 $generated@@408) $generated@@409))
+)))
+(assert (forall (($generated@@412 T@U) ($generated@@413 T@U) ($generated@@414 T@U) ) (! (= ($generated@@61 ($generated@@62 $generated@@63 ($generated@@62 $generated@@64 $generated@@37)) $generated@@37 $generated@@65 ($generated@@411 $generated@@412) $generated@@413 $generated@@414) $generated@@412)
+ :pattern ( ($generated@@61 ($generated@@62 $generated@@63 ($generated@@62 $generated@@64 $generated@@37)) $generated@@37 $generated@@65 ($generated@@411 $generated@@412) $generated@@413 $generated@@414))
+)))
+(assert (forall (($generated@@416 T@U) ($generated@@417 T@U) ($generated@@418 T@U) ) (! (= ($generated@@61 ($generated@@62 $generated@@63 ($generated@@62 $generated@@64 $generated@@37)) $generated@@37 $generated@@37 ($generated@@415 $generated@@416) $generated@@417 $generated@@418) $generated@@416)
+ :pattern ( ($generated@@61 ($generated@@62 $generated@@63 ($generated@@62 $generated@@64 $generated@@37)) $generated@@37 $generated@@37 ($generated@@415 $generated@@416) $generated@@417 $generated@@418))
+)))
+(assert (forall (($generated@@420 T@U) ($generated@@421 Bool) ($generated@@422 T@U) ($generated@@423 T@U) ) (! (= ($generated@@20 ($generated@@61 ($generated@@62 $generated@@63 ($generated@@62 $generated@@64 $generated@@37)) $generated@@37 $generated@@16 ($generated@@419 $generated@@420 $generated@@421) $generated@@422 $generated@@423))  (and ($generated@@39 $generated@@423 $generated@@420) $generated@@421))
+ :pattern ( ($generated@@61 ($generated@@62 $generated@@63 ($generated@@62 $generated@@64 $generated@@37)) $generated@@37 $generated@@16 ($generated@@419 $generated@@420 $generated@@421) $generated@@422 $generated@@423))
+)))
+(push 1)
+(declare-fun ControlFlow (Int Int) Int)
+(declare-fun $generated@@424 () T@U)
+(declare-fun $generated@@425 () T@U)
+(declare-fun $generated@@426 () T@U)
+(declare-fun $generated@@427 () T@U)
+(declare-fun $generated@@428 () T@U)
+(declare-fun $generated@@429 () T@U)
+(declare-fun $generated@@430 () T@U)
+(declare-fun $generated@@431 () T@U)
+(declare-fun $generated@@432 () T@U)
+(declare-fun $generated@@433 (T@U) Bool)
+(set-option :timeout 0)
+(set-option :rlimit 0)
+(set-option :auto_config false)
+(set-option :type_check true)
+(set-option :smt.qi.eager_threshold 100)
+(set-option :smt.delay_units true)
+(set-option :model_evaluator.completion true)
+(set-option :model.completion true)
+(set-option :model.compact false)
+(set-option :smt.case_split 3)
+(set-option :smt.mbqi false)
+(set-option :model.v2 true)
+(set-option :pp.bv_literals false)
+(set-option :smt.arith.solver 2)
+(assert (not
+ (=> (= (ControlFlow 0 0) 14) (let (($generated@@434 true))
+(let (($generated@@435  (=> (and (= ($generated@@151 $generated@@109 $generated@@117) $generated@@117) (= (ControlFlow 0 8) (- 0 7))) false)))
+(let (($generated@@436  (=> ($generated@@20 ($generated@@151 $generated@@16 ($generated@@19 false))) (and (=> (= (ControlFlow 0 10) 8) $generated@@435) (=> (= (ControlFlow 0 10) 9) $generated@@434)))))
+(let (($generated@@437 true))
+(let (($generated@@438  (=> (and (not ($generated@@20 ($generated@@151 $generated@@16 ($generated@@19 false)))) (= (ControlFlow 0 6) 4)) $generated@@437)))
+(let (($generated@@439  (=> (and (and ($generated@@39 $generated@@424 $generated@@425) ($generated@@202 $generated@@424 $generated@@425 $generated@@426)) (= $generated@@427 ($generated@@374 $generated@@133 $generated@@426 $generated@@1 false))) (and (=> (= (ControlFlow 0 11) 10) $generated@@436) (=> (= (ControlFlow 0 11) 6) $generated@@438)))))
+(let (($generated@@440  (=> (and (not (and ($generated@@39 $generated@@424 $generated@@425) ($generated@@202 $generated@@424 $generated@@425 $generated@@426))) (= (ControlFlow 0 5) 4)) $generated@@437)))
+(let (($generated@@441  (=> (and ($generated@@138 $generated@@426) (or (= $generated@@428 $generated@@426) ($generated@@143 $generated@@428 $generated@@426))) (and (=> (= (ControlFlow 0 12) 11) $generated@@439) (=> (= (ControlFlow 0 12) 5) $generated@@440)))))
+(let (($generated@@442  (=> (and (and ($generated@@32 $generated@@425 $generated@@429 ($generated@@151 $generated@@109 ($generated@@160 ($generated@@151 ($generated@@62 $generated@@37 $generated@@16) $generated@@372) ($generated@@151 $generated@@118 ($generated@@192 $generated@@118 ($generated@@280 ($generated@@60 ($generated@@415 $generated@@430) ($generated@@419 $generated@@425 ($generated@@20 ($generated@@151 $generated@@16 ($generated@@19 false)))) ($generated@@411 ($generated@@254 ($generated@@277 false))))) ($generated@@353 $generated@@431)))))) (= (ControlFlow 0 3) (- 0 2))) ($generated@@32 $generated@@425 $generated@@429 ($generated@@151 $generated@@109 ($generated@@160 ($generated@@151 ($generated@@62 $generated@@37 $generated@@16) $generated@@372) ($generated@@151 $generated@@118 ($generated@@192 $generated@@118 ($generated@@280 ($generated@@60 ($generated@@415 $generated@@430) ($generated@@419 $generated@@425 ($generated@@20 ($generated@@151 $generated@@16 ($generated@@19 false)))) ($generated@@411 ($generated@@254 ($generated@@277 false))))) ($generated@@353 $generated@@431))))))) ($generated@@20 ($generated@@151 $generated@@16 ($generated@@19 ($generated@@31 $generated@@425 $generated@@429 ($generated@@151 $generated@@109 ($generated@@160 ($generated@@151 ($generated@@62 $generated@@37 $generated@@16) $generated@@372) ($generated@@151 $generated@@118 ($generated@@192 $generated@@118 ($generated@@280 ($generated@@60 ($generated@@415 $generated@@430) ($generated@@419 $generated@@425 ($generated@@20 ($generated@@151 $generated@@16 ($generated@@19 false)))) ($generated@@411 ($generated@@254 ($generated@@277 false))))) ($generated@@353 $generated@@431))))))))))))
+(let (($generated@@443 true))
+(let (($generated@@444  (=> (= $generated@@432 ($generated@@374 $generated@@133 $generated@@428 $generated@@1 false)) (and (and (=> (= (ControlFlow 0 13) 1) $generated@@443) (=> (= (ControlFlow 0 13) 12) $generated@@441)) (=> (= (ControlFlow 0 13) 3) $generated@@442)))))
+(let (($generated@@445  (=> (and (and ($generated@@138 $generated@@428) ($generated@@433 $generated@@428)) (= (ControlFlow 0 14) 13)) $generated@@444)))
+$generated@@445)))))))))))))
+))
+(check-sat)
+(get-info :rlimit)
+(pop 1)
+; Valid
diff --git a/Source/DafnyPipeline.Test/testFile2.dfy b/Source/DafnyPipeline.Test/testFile2.dfy
new file mode 100644
index 00000000000..f18ad3297f5
--- /dev/null
+++ b/Source/DafnyPipeline.Test/testFile2.dfy
@@ -0,0 +1,3 @@
+method f(x: int) {
+  var x := 0;
+}
\ No newline at end of file
diff --git a/Source/DafnyPipeline/DafnyPipeline.csproj b/Source/DafnyPipeline/DafnyPipeline.csproj
index 057caf38818..559c7781cb2 100644
--- a/Source/DafnyPipeline/DafnyPipeline.csproj
+++ b/Source/DafnyPipeline/DafnyPipeline.csproj
@@ -7,11 +7,11 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\..\Binaries\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <TargetFramework>net6.0</TargetFramework>
+    <RollForward>Major</RollForward>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
@@ -32,39 +32,97 @@
   we may be able to get away with only embedding these files inside this assembly.
   -->
   <ItemGroup>
-    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeJava\src\main\**\*.java">
+    <EmbeddedResource Include="..\DafnyStandardLibraries\binaries\DafnyStandardLibraries-notarget.doo">
+      <LogicalName>DafnyStandardLibraries-notarget.doo</LogicalName>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntime.cs">
-      <LogicalName>DafnyRuntime.cs</LogicalName>
+    <EmbeddedResource Include="..\DafnyStandardLibraries\binaries\DafnyStandardLibraries-java.doo">
+      <LogicalName>DafnyStandardLibraries-java.doo</LogicalName>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeGo\DafnyRuntime.go">
-      <LogicalName>DafnyRuntime.go</LogicalName>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <EmbeddedResource Include="..\DafnyStandardLibraries\binaries\DafnyStandardLibraries-cs.doo">
+      <LogicalName>DafnyStandardLibraries-cs.doo</LogicalName>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeGo\DafnyRuntimeFromDafny.go">
-      <LogicalName>DafnyRuntimeFromDafny.go</LogicalName>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <EmbeddedResource Include="..\DafnyStandardLibraries\binaries\DafnyStandardLibraries-js.doo">
+      <LogicalName>DafnyStandardLibraries-js.doo</LogicalName>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntime.h">
-      <LogicalName>DafnyRuntime.h</LogicalName>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <EmbeddedResource Include="..\DafnyStandardLibraries\binaries\DafnyStandardLibraries-go.doo">
+      <LogicalName>DafnyStandardLibraries-go.doo</LogicalName>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyStandardLibraries\binaries\DafnyStandardLibraries-py.doo">
+      <LogicalName>DafnyStandardLibraries-py.doo</LogicalName>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyStandardLibraries\src\**\*.cs">
+      <LinkBase>DafnyStandardLibraries_cs</LinkBase>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyStandardLibraries\src\**\*.java">
+      <LinkBase>DafnyStandardLibraries_java</LinkBase>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyStandardLibraries\src\**\*.js">
+      <LinkBase>DafnyStandardLibraries_js</LinkBase>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyStandardLibraries\src\**\*.go">
+      <LinkBase>DafnyStandardLibraries_go</LinkBase>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyStandardLibraries\src\**\*.py">
+      <LinkBase>DafnyStandardLibraries_py</LinkBase>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeJava\build\libs\DafnyRuntime-4.2.0.jar">
+
+    <EmbeddedResource Include="..\DafnyStandardLibraries\binaries\DafnyStandardLibraries.doo">
+      <LogicalName>DafnyStandardLibraries.doo</LogicalName>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeJava\src\main\java\**\*.java">
+      <LinkBase>DafnyRuntimeJava</LinkBase>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeJava\src\main\dafny-generated\**\*.java">
+      <LinkBase>DafnyRuntimeJava</LinkBase>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeJava\build\libs\DafnyRuntime-4.9.2.jar">
       <LogicalName>DafnyRuntime.jar</LogicalName>
       <Link>DafnyRuntime.jar</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntime.js">
-      <LogicalName>DafnyRuntime.js</LogicalName>
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntime.cs">
+      <LinkBase>DafnyRuntimeCsharp</LinkBase>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeSystemModule.cs">
+      <LinkBase>DafnyRuntimeCsharp</LinkBase>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeGo\**\*.go" Exclude="..\DafnyRuntime\DafnyRuntimeGo\**\*_test.go">
+      <LinkBase>DafnyRuntimeGo</LinkBase>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeCpp\**\*.h">
+      <LinkBase>DafnyRuntimeCpp</LinkBase>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeCpp\**\*.cpp">
+      <LinkBase>DafnyRuntimeCpp</LinkBase>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeJs\**\*.js">
+      <LinkBase>DafnyRuntimeJs</LinkBase>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntime.py">
-      <LogicalName>DafnyRuntime.py</LogicalName>
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimePython\**\*.py">
+      <LinkBase>DafnyRuntimePython</LinkBase>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeRust\**" LinkBase="DafnyRuntimeRust">
+    <EmbeddedResource Include="..\DafnyRuntime\DafnyRuntimeRust\**" Exclude="..\DafnyRuntime\DafnyRuntimeRust\.gitignore" LinkBase="DafnyRuntimeRust">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
     <EmbeddedResource Remove="..\DafnyRuntime\DafnyRuntimeRust\target\**"/>
diff --git a/Source/DafnyRuntime.Tests/CsRuntimeTest.cs b/Source/DafnyRuntime.Tests/CsRuntimeTest.cs
new file mode 100644
index 00000000000..001d5ed93e1
--- /dev/null
+++ b/Source/DafnyRuntime.Tests/CsRuntimeTest.cs
@@ -0,0 +1,551 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Numerics;
+using System.Threading;
+using Xunit;
+using Dafny;
+
+namespace DafnyRuntime.Tests;
+
+public class RuntimeTest {
+  [Fact]
+  public void TestConcatSequence() {
+    var c = new ConcatSequence<int>(Sequence<int>.FromElements(1, 2), Sequence<int>.FromElements(3, 4));
+    var x = c.ImmutableElements;
+    c.ComputeElements(); // For coverage
+    var left = new ConcatSequence<int>(Sequence<int>.FromElements(1), Sequence<int>.FromElements(2));
+    var tree = new ConcatSequence<int>(left, Sequence<int>.FromElements(3, 4));
+    left.left = null; // For coverage, we simulate multithreading
+    Thread t = new Thread(delegate () {
+      left.right = null;
+      Thread.Sleep(100); // Ensure ComputeElements() does not work immediately
+      left.elmts = new List<int>() { 1, 2 }.ToImmutableArray();
+    });
+    t.Start();
+    var result = tree.ComputeElements(); // Without the thread, will loop forever
+    Assert.Equal(Sequence<int>.FromArray(result.ToArray()), Sequence<int>.FromArray(x.ToArray()));
+  }
+
+  class Dummy { }
+
+  [Fact]
+  public void TestSetAndCoverage() {
+    var x = Set<Dummy?>.FromCollectionPlusOne(new List<Dummy?>() { new Dummy(), null }, new Dummy());
+    var y = Set<Dummy?>.FromCollectionPlusOne(new List<Dummy?>() { new Dummy(), new Dummy() }, new Dummy());
+    var z = Set<Dummy?>.FromCollectionPlusOne(new List<Dummy?>() { new Dummy(), new Dummy() }, null);
+    Assert.Equal(3, x.Count);
+    Assert.Equal(3, y.Count);
+    Assert.Equal(3, z.Count);
+    Assert.Equal(3, x.LongCount);
+    Assert.Equal(3, y.LongCount);
+    Assert.Equal(3, z.LongCount);
+    Assert.Equal(8, x.AllSubsets.ToList().Count);
+    Assert.Equal(8, y.AllSubsets.ToList().Count);
+    Assert.Equal(8, z.AllSubsets.ToList().Count);
+    Dafny.ISet<Dummy?>? n = null;
+    Assert.False(x.Equals(n));
+    object? nObject = null;
+    Assert.False(x.Equals(nObject));
+    Assert.False(x.EqualsAux(n));
+    Assert.NotEqual(0, x.GetHashCode());
+  }
+
+  [Fact]
+  public void TestMapAndCoverage() {
+    Map<Dummy?, Dummy?>? n = null;
+    var x = Map<Dummy?, Dummy?>.FromElements(
+      new Pair<Dummy, Dummy>(new Dummy(), new Dummy()),
+      new Pair<Dummy?, Dummy>(null, new Dummy()),
+      new Pair<Dummy, Dummy?>(new Dummy(), null));
+
+    var nn = Map<Dummy?, Dummy?>.FromElements(
+      new Pair<Dummy, Dummy>(new Dummy(), new Dummy()));
+    Assert.Equal(3, x.Count);
+    Assert.Equal(3, x.LongCount);
+    Assert.Equal(1, nn.Count);
+    Assert.Equal(1, nn.LongCount);
+    Assert.False(nn.Equals(n));
+
+    var oo = Map<object?, object?>.FromElements(
+      new Pair<Dummy, Dummy>(new Dummy(), new Dummy()),
+      new Pair<Dummy?, Dummy>(null, new Dummy()),
+      new Pair<Dummy, Dummy?>(new Dummy(), null));
+    Assert.True(oo.EqualsObjObj(oo));
+    // TBC
+  }
+
+  [Fact]
+  public void TestHaltException() {
+    var x = new HaltException("Test failed");
+    Assert.Equal("Test failed", x.Message);
+  }
+
+  [Fact]
+  public void RuneTest() {
+    Assert.Throws<ArgumentException>(() => new Rune(0xD801));
+    Assert.Throws<ArgumentException>(() => new Rune(0x11_0000));
+    Assert.False(new Rune(65).Equals(null));
+    Assert.True(new Rune(65).Equals(new Rune(65)));
+    Assert.Equal(-1, new Rune(65).CompareTo(new Rune(66)));
+    Assert.Equal(0, new Rune(65).CompareTo(new Rune(65)));
+    Assert.Equal(1, new Rune(65).CompareTo(new Rune(64)));
+    IComparable c = new Rune(65);
+    Assert.Equal(1, c.CompareTo(null));
+    Assert.Equal(0, c.CompareTo(new Rune(65)));
+    Assert.Throws<ArgumentException>(() => c.CompareTo("abc"));
+    var input = "\uD800"; // High surrogate but no low surrogate afterward
+    Assert.Throws<IndexOutOfRangeException>(() => Rune.Enumerate(input).ToList());
+    input = "\uDC00"; // Low surrogate
+    Assert.Throws<ArgumentException>(() => Rune.Enumerate(input).ToList());
+    input = "\uD800\uD800"; // High surrogate twice
+    Assert.Throws<ArgumentException>(() => Rune.Enumerate(input).ToList());
+  }
+
+  // The code below was partially generated by ChatGPT and reviewed manually. To regenerate this code, provide ChatGPT or any performant LLM with the first three tests and ask to generate the remaining.
+  [Fact]
+  public void DowncastClone0() {
+    Func<int> originalFunc = () => 42;
+    var clonedFunc = originalFunc.DowncastClone(i => i.ToString());
+    Assert.Equal("42", clonedFunc());
+  }
+
+  [Fact]
+  public void DowncastClone1() {
+    Func<int, double> originalFunc = x => x * 2.5;
+    var clonedFunc = originalFunc.DowncastClone<int, double, string, string>(int.Parse, d => d.ToString("F2"));
+    Assert.Equal("5.00", clonedFunc("2"));
+  }
+
+  [Fact]
+  public void DowncastClone2() {
+    Func<int, int, int> originalFunc = (x, y) => x + y;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, string, string, string>(int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("7", clonedFunc("3", "4"));
+  }
+
+  [Fact]
+  public void DowncastClone3() {
+    Func<int, int, int, int> originalFunc = (x, y, z) => x + y + z;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, string, string, string, string>(int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("10", clonedFunc("2", "3", "5"));
+  }
+
+  [Fact]
+  public void DowncastClone4() {
+    Func<int, int, int, int, int> originalFunc = (a, b, c, d) => a + b + c + d;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("10", clonedFunc("1", "2", "3", "4"));
+  }
+
+  [Fact]
+  public void DowncastClone5() {
+    Func<int, int, int, int, int, int> originalFunc = (a, b, c, d, e) => a + b + c + d + e;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("15", clonedFunc("1", "2", "3", "4", "5"));
+  }
+
+  [Fact]
+  public void DowncastClone6() {
+    Func<int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f) => a + b + c + d + e + f;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, string, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("21", clonedFunc("1", "2", "3", "4", "5", "6"));
+  }
+
+  [Fact]
+  public void DowncastClone7() {
+    Func<int, int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f, g) => a + b + c + d + e + f + g;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, int, string, string, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("28", clonedFunc("1", "2", "3", "4", "5", "6", "7"));
+  }
+
+  [Fact]
+  public void DowncastClone8() {
+    Func<int, int, int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f, g, h) => a + b + c + d + e + f + g + h;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, int, int, string, string, string, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("36", clonedFunc("1", "2", "3", "4", "5", "6", "7", "8"));
+  }
+
+  [Fact]
+  public void DowncastClone9() {
+    Func<int, int, int, int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f, g, h, i) => a + b + c + d + e + f + g + h + i;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, int, int, int, string, string, string, string, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("45", clonedFunc("1", "2", "3", "4", "5", "6", "7", "8", "9"));
+  }
+
+  [Fact]
+  public void DowncastClone10() {
+    Func<int, int, int, int, int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f, g, h, i, j) => a + b + c + d + e + f + g + h + i + j;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, int, int, int, int, string, string, string, string, string, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("55", clonedFunc("1", "2", "3", "4", "5", "6", "7", "8", "9", "10"));
+  }
+
+  [Fact]
+  public void DowncastClone11() {
+    Func<int, int, int, int, int, int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f, g, h, i, j, k) => a + b + c + d + e + f + g + h + i + j + k;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, int, int, int, int, int, string, string, string, string, string, string, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("66", clonedFunc("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"));
+  }
+
+  [Fact]
+  public void DowncastClone12() {
+    Func<int, int, int, int, int, int, int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f, g, h, i, j, k, l) => a + b + c + d + e + f + g + h + i + j + k + l;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, int, int, int, int, int, int, string, string, string, string, string, string, string, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("78", clonedFunc("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"));
+  }
+
+  [Fact]
+  public void DowncastClone13() {
+    Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f, g, h, i, j, k, l, m) => a + b + c + d + e + f + g + h + i + j + k + l + m;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, int, int, int, int, int, int, int, string, string, string, string, string, string, string, string, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("91", clonedFunc("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"));
+  }
+
+  [Fact]
+  public void DowncastClone14() {
+    Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f, g, h, i, j, k, l, m, n) => a + b + c + d + e + f + g + h + i + j + k + l + m + n;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("105", clonedFunc("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14"));
+  }
+
+  [Fact]
+  public void DowncastClone15() {
+    Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) => a + b + c + d + e + f + g + h + i + j + k + l + m + n + o;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string>(int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, sum => sum.ToString());
+    Assert.Equal("120", clonedFunc("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15"));
+  }
+
+  [Fact]
+  public void DowncastClone16() {
+    Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int> originalFunc = (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) => a + b + c + d + e + f + g + h + i + j + k + l + m + n + o + p;
+    var clonedFunc = originalFunc.DowncastClone<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string>(
+        int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse,
+        int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse, int.Parse,
+        sum => sum.ToString()
+    );
+    Assert.Equal("136", clonedFunc("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"));
+  }
+
+
+  // The code was partially generated by ChatGPT and reviewed manually. To regenerate this code, provide ChatGPT or any performant LLM with the first three tests and ask to generate the remaining
+  [Fact]
+  public void InitNewArray1Test() {
+    var a = ArrayHelpers.InitNewArray1('a',
+      new BigInteger(2));
+    Assert.Equal(2, a.Length);
+    Assert.Equal('a', a[0]);
+    Assert.Equal('a', a[1]);
+  }
+
+  [Fact]
+  public void InitNewArray2Test() {
+    var a = ArrayHelpers.InitNewArray2('a',
+      new BigInteger(1),
+      new BigInteger(2));
+    for (var i = 0; i < 2; i++) {
+      Assert.Equal(i == 1 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0]);
+    Assert.Equal('a', a[0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray3Test() {
+    var a = ArrayHelpers.InitNewArray3('a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2));
+    for (var i = 0; i < 3; i++) {
+      Assert.Equal(i == 2 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray4Test() {
+    var a = ArrayHelpers.InitNewArray4(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 4; i++) {
+      Assert.Equal(i == 3 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray5Test() {
+    var a = ArrayHelpers.InitNewArray5(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 5; i++) {
+      Assert.Equal(i == 4 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray6Test() {
+    var a = ArrayHelpers.InitNewArray6(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 6; i++) {
+      Assert.Equal(i == 5 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray7Test() {
+    var a = ArrayHelpers.InitNewArray7(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 7; i++) {
+      Assert.Equal(i == 6 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray8Test() {
+    var a = ArrayHelpers.InitNewArray8(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 8; i++) {
+      Assert.Equal(i == 7 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray9Test() {
+    var a = ArrayHelpers.InitNewArray9(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 9; i++) {
+      Assert.Equal(i == 8 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray10Test() {
+    var a = ArrayHelpers.InitNewArray10(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 10; i++) {
+      Assert.Equal(i == 9 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray11Test() {
+    var a = ArrayHelpers.InitNewArray11(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 11; i++) {
+      Assert.Equal(i == 10 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray12Test() {
+    var a = ArrayHelpers.InitNewArray12(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 12; i++) {
+      Assert.Equal(i == 11 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray13Test() {
+    var a = ArrayHelpers.InitNewArray13(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 13; i++) {
+      Assert.Equal(i == 12 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray14Test() {
+    var a = ArrayHelpers.InitNewArray14(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 14; i++) {
+      Assert.Equal(i == 13 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray15Test() {
+    var a = ArrayHelpers.InitNewArray15(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 15; i++) {
+      Assert.Equal(i == 14 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+  }
+
+  [Fact]
+  public void InitNewArray16Test() {
+    var a = ArrayHelpers.InitNewArray16(
+      'a',
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(1),
+      new BigInteger(2)
+    );
+    for (var i = 0; i < 16; i++) {
+      Assert.Equal(i == 15 ? 2 : 1, a.GetLength(i));
+    }
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    Assert.Equal('a', a[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyRuntime.Tests/DafnyRuntime.Tests.csproj b/Source/DafnyRuntime.Tests/DafnyRuntime.Tests.csproj
index f90c85ef0bf..bc05a98a47d 100644
--- a/Source/DafnyRuntime.Tests/DafnyRuntime.Tests.csproj
+++ b/Source/DafnyRuntime.Tests/DafnyRuntime.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
diff --git a/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/.gitignore b/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/.gitignore
new file mode 100644
index 00000000000..2f7896d1d13
--- /dev/null
+++ b/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/Cargo.lock b/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/Cargo.lock
new file mode 100644
index 00000000000..c1b0654506e
--- /dev/null
+++ b/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/Cargo.lock
@@ -0,0 +1,133 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "DafnyRuntimeRustTest"
+version = "0.1.0"
+dependencies = [
+ "dafny_runtime",
+]
+
+[[package]]
+name = "as-any"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a30a44e99a1c83ccb2a6298c563c888952a1c9134953db26876528f84c93a"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "dafny_runtime"
+version = "0.1.0"
+dependencies = [
+ "as-any",
+ "itertools",
+ "num",
+ "once_cell",
+ "paste",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
diff --git a/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/Cargo.toml b/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/Cargo.toml
new file mode 100644
index 00000000000..f8825f708b1
--- /dev/null
+++ b/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "DafnyRuntimeRustTest"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+dafny_runtime = {path= "../../DafnyRuntime/DafnyRuntimeRust"}
\ No newline at end of file
diff --git a/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/src/main.rs b/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/src/main.rs
new file mode 100644
index 00000000000..87396df3fcf
--- /dev/null
+++ b/Source/DafnyRuntime.Tests/DafnyRuntimeRustTest/src/main.rs
@@ -0,0 +1,39 @@
+use dafny_runtime::{Upcast, UpcastObject};
+
+
+
+struct SmokeStruct {
+    pub i: i32,
+}
+pub struct OtherSmokeStruct(pub i32);
+
+impl UpcastObject<dyn ::std::any::Any> for SmokeStruct {
+    dafny_runtime::UpcastObjectFn!(dyn ::std::any::Any);
+}
+impl Upcast<dyn ::std::any::Any> for SmokeStruct {
+    dafny_runtime::UpcastFn!(dyn ::std::any::Any);
+}
+
+#[test]
+fn smoke_test() {
+    let mut x = ::dafny_runtime::dafny_runtime_conversions::object::boxed_struct_to_dafny_class(Box::new(SmokeStruct{i: 3}));
+    assert_eq!(::dafny_runtime::refcount!(x), 1);
+    let y = ::dafny_runtime::cast_any_object!(x);
+    assert_eq!(::dafny_runtime::refcount!(x), 2);
+    assert!(::dafny_runtime::is_object!(y, SmokeStruct));
+    assert!(!::dafny_runtime::is_object!(y, OtherSmokeStruct));
+    assert_eq!(::dafny_runtime::rd!(x).i, 3);
+    x = ::dafny_runtime::cast_object!(y, SmokeStruct);
+    assert_eq!(::dafny_runtime::rd!(x).i, 3);
+    let mut x = ::dafny_runtime::dafny_runtime_conversions::ptr::boxed_struct_to_dafny_class(Box::new(SmokeStruct{i: 3}));
+    let y = ::dafny_runtime::cast_any!(x);
+    assert!(::dafny_runtime::is!(y, SmokeStruct));
+    assert!(!::dafny_runtime::is!(y, OtherSmokeStruct));
+    assert_eq!(::dafny_runtime::read!(x).i, 3);
+    x = ::dafny_runtime::cast!(y, SmokeStruct);
+    assert_eq!(::dafny_runtime::read!(x).i, 3);
+    let z = ::dafny_runtime::truncate!(::dafny_runtime::int!(3), usize);
+    let a = ::dafny_runtime::array!(1, 2, 3);
+    assert_eq!(z, 3);
+    assert_eq!(::dafny_runtime::read!(a)[2], 3);
+}
diff --git a/Source/DafnyRuntime.Tests/TupleTest.cs b/Source/DafnyRuntime.Tests/TupleTest.cs
new file mode 100644
index 00000000000..8373de145fc
--- /dev/null
+++ b/Source/DafnyRuntime.Tests/TupleTest.cs
@@ -0,0 +1,824 @@
+using System;
+using Xunit;
+using Dafny;
+
+namespace DafnyRuntime.Tests {
+  public class TupleTests {
+
+    public Func<int, string> C = (int i) => i.ToString();
+    public Func<int, int> I = (int i) => i;
+    public Dafny.TypeDescriptor<int> D = new Dafny.TypeDescriptor<int>(0);
+
+    // The code below was partially generated by ChatGPT and reviewed manually. To regenerate this code, provide ChatGPT or any performant LLM with the first three tests and ask to generate the remaining.
+    [Fact]
+    public void TestTuple0() {
+      var t = new _System.Tuple0();
+      Assert.False(t.Equals(null));
+      Assert.True(t.Equals(new _System.Tuple0()));
+      Assert.Equal(t, t.DowncastClone());
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("()", t.ToString());
+      Assert.Equal(t, _System.Tuple0.Default());
+      Assert.Equal(t, _System.Tuple0.create____hMake0());
+      Assert.Equal(_System.Tuple0.create(), _System.Tuple0._TypeDescriptor().Default());
+    }
+
+    [Fact]
+    public void TestTuple1() {
+      var t = new _System.Tuple1<int>(0);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 1; i++) {
+        Assert.Equal(i == 1, t.Equals(
+          new _System.Tuple1<int>(
+            i <= 0 ? 1 : 0)));
+      }
+
+      Assert.Equal(new _System.Tuple1<string>("0"), t.DowncastClone(C));
+      Assert.Equal(t, t.DowncastClone(I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0)", t.ToString());
+      Assert.Equal(t, _System.Tuple1<int>.Default(0));
+      Assert.Equal(t, _System.Tuple1<int>.create____hMake1(0));
+      Assert.Equal(_System.Tuple1<int>.create(0), _System.Tuple1<int>._TypeDescriptor(D).Default());
+      Assert.Equal(0, t.dtor__0);
+    }
+
+    [Fact]
+    public void TestTuple2() {
+      var t = new _System.Tuple2<int, int>(0, 1);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 2; i++) {
+        Assert.Equal(i == 2, t.Equals(
+          new _System.Tuple2<int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1)));
+      }
+
+      Assert.Equal(new _System.Tuple2<string, string>("0", "1"), t.DowncastClone(C, C));
+      Assert.Equal(t, t.DowncastClone(I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1)", t.ToString());
+      Assert.Equal(t, _System.Tuple2<int, int>.Default(0, 1));
+      Assert.Equal(t, _System.Tuple2<int, int>.create____hMake2(0, 1));
+      Assert.Equal(_System.Tuple2<int, int>.create(0, 0), _System.Tuple2<int, int>._TypeDescriptor(D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+    }
+
+    // I am grateful for LLMs to generate all these tests.
+    [Fact]
+    public void TestTuple3() {
+      var t = new _System.Tuple3<int, int, int>(0, 1, 2);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 3; i++) {
+        Assert.Equal(i == 3, t.Equals(
+          new _System.Tuple3<int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2)));
+      }
+
+      Assert.Equal(new _System.Tuple3<string, string, string>("0", "1", "2"), t.DowncastClone(C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2)", t.ToString());
+      Assert.Equal(t, _System.Tuple3<int, int, int>.Default(0, 1, 2));
+      Assert.Equal(t, _System.Tuple3<int, int, int>.create____hMake3(0, 1, 2));
+      Assert.Equal(_System.Tuple3<int, int, int>.create(0, 0, 0),
+        _System.Tuple3<int, int, int>._TypeDescriptor(D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+    }
+
+    [Fact]
+    public void TestTuple4() {
+      var t = new _System.Tuple4<int, int, int, int>(0, 1, 2, 3);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 4; i++) {
+        Assert.Equal(i == 4, t.Equals(
+          new _System.Tuple4<int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3)));
+      }
+
+      Assert.Equal(new _System.Tuple4<string, string, string, string>("0", "1", "2", "3"), t.DowncastClone(C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3)", t.ToString());
+      Assert.Equal(t, _System.Tuple4<int, int, int, int>.Default(0, 1, 2, 3));
+      Assert.Equal(t, _System.Tuple4<int, int, int, int>.create____hMake4(0, 1, 2, 3));
+      Assert.Equal(_System.Tuple4<int, int, int, int>.create(0, 0, 0, 0),
+        _System.Tuple4<int, int, int, int>._TypeDescriptor(D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+    }
+
+    [Fact]
+    public void TestTuple5() {
+      var t = new _System.Tuple5<int, int, int, int, int>(0, 1, 2, 3, 4);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 5; i++) {
+        Assert.Equal(i == 5, t.Equals(
+          new _System.Tuple5<int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4)));
+      }
+
+      Assert.Equal(new _System.Tuple5<string, string, string, string, string>("0", "1", "2", "3", "4"), t.DowncastClone(C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4)", t.ToString());
+      Assert.Equal(t, _System.Tuple5<int, int, int, int, int>.Default(0, 1, 2, 3, 4));
+      Assert.Equal(t, _System.Tuple5<int, int, int, int, int>.create____hMake5(0, 1, 2, 3, 4));
+      Assert.Equal(_System.Tuple5<int, int, int, int, int>.create(0, 0, 0, 0, 0),
+        _System.Tuple5<int, int, int, int, int>._TypeDescriptor(D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+    }
+
+    [Fact]
+    public void TestTuple6() {
+      var t = new _System.Tuple6<int, int, int, int, int, int>(0, 1, 2, 3, 4, 5);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 6; i++) {
+        Assert.Equal(i == 6, t.Equals(
+          new _System.Tuple6<int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5)));
+      }
+
+      Assert.Equal(new _System.Tuple6<string, string, string, string, string, string>("0", "1", "2", "3", "4", "5"), t.DowncastClone(C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5)", t.ToString());
+      Assert.Equal(t, _System.Tuple6<int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5));
+      Assert.Equal(t, _System.Tuple6<int, int, int, int, int, int>.create____hMake6(0, 1, 2, 3, 4, 5));
+      Assert.Equal(_System.Tuple6<int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0),
+        _System.Tuple6<int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+    }
+
+    [Fact]
+    public void TestTuple7() {
+      var t = new _System.Tuple7<int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 7; i++) {
+        Assert.Equal(i == 7, t.Equals(
+          new _System.Tuple7<int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6)));
+      }
+
+      Assert.Equal(new _System.Tuple7<string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6"), t.DowncastClone(C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6)", t.ToString());
+      Assert.Equal(t, _System.Tuple7<int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6));
+      Assert.Equal(t, _System.Tuple7<int, int, int, int, int, int, int>.create____hMake7(0, 1, 2, 3, 4, 5, 6));
+      Assert.Equal(_System.Tuple7<int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0),
+        _System.Tuple7<int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+    }
+
+    [Fact]
+    public void TestTuple8() {
+      var t = new _System.Tuple8<int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 8; i++) {
+        Assert.Equal(i == 8, t.Equals(
+          new _System.Tuple8<int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7)));
+      }
+
+      Assert.Equal(new _System.Tuple8<string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7"), t.DowncastClone(C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7)", t.ToString());
+      Assert.Equal(t, _System.Tuple8<int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7));
+      Assert.Equal(t, _System.Tuple8<int, int, int, int, int, int, int, int>.create____hMake8(0, 1, 2, 3, 4, 5, 6, 7));
+      Assert.Equal(_System.Tuple8<int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple8<int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+    }
+
+    [Fact]
+    public void TestTuple9() {
+      var t = new _System.Tuple9<int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 9; i++) {
+        Assert.Equal(i == 9, t.Equals(
+          new _System.Tuple9<int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8)));
+      }
+
+      Assert.Equal(new _System.Tuple9<string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8"), t.DowncastClone(C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8)", t.ToString());
+      Assert.Equal(t, _System.Tuple9<int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8));
+      Assert.Equal(t, _System.Tuple9<int, int, int, int, int, int, int, int, int>.create____hMake9(0, 1, 2, 3, 4, 5, 6, 7, 8));
+      Assert.Equal(_System.Tuple9<int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple9<int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+    }
+
+    [Fact]
+    public void TestTuple10() {
+      var t = new _System.Tuple10<int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 10; i++) {
+        Assert.Equal(i == 10, t.Equals(
+          new _System.Tuple10<int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9)));
+      }
+
+      Assert.Equal(new _System.Tuple10<string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)", t.ToString());
+      Assert.Equal(t, _System.Tuple10<int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9));
+      Assert.Equal(t, _System.Tuple10<int, int, int, int, int, int, int, int, int, int>.create____hMake10(0, 1, 2, 3, 4, 5, 6, 7, 8, 9));
+      Assert.Equal(_System.Tuple10<int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple10<int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+    }
+
+    [Fact]
+    public void TestTuple11() {
+      var t = new _System.Tuple11<int, int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 11; i++) {
+        Assert.Equal(i == 11, t.Equals(
+          new _System.Tuple11<int, int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9,
+            i <= 10 ? 11 : 10)));
+      }
+
+      Assert.Equal(new _System.Tuple11<string, string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)", t.ToString());
+      Assert.Equal(t, _System.Tuple11<int, int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
+      Assert.Equal(t, _System.Tuple11<int, int, int, int, int, int, int, int, int, int, int>.create____hMake11(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
+      Assert.Equal(_System.Tuple11<int, int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple11<int, int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+      Assert.Equal(10, t.dtor__10);
+    }
+
+    [Fact]
+    public void TestTuple12() {
+      var t = new _System.Tuple12<int, int, int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 12; i++) {
+        Assert.Equal(i == 12, t.Equals(
+          new _System.Tuple12<int, int, int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9,
+            i <= 10 ? 11 : 10,
+            i <= 11 ? 12 : 11)));
+      }
+
+      Assert.Equal(new _System.Tuple12<string, string, string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)", t.ToString());
+      Assert.Equal(t, _System.Tuple12<int, int, int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11));
+      Assert.Equal(t, _System.Tuple12<int, int, int, int, int, int, int, int, int, int, int, int>.create____hMake12(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11));
+      Assert.Equal(_System.Tuple12<int, int, int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple12<int, int, int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+      Assert.Equal(10, t.dtor__10);
+      Assert.Equal(11, t.dtor__11);
+    }
+
+    [Fact]
+    public void TestTuple13() {
+      var t = new _System.Tuple13<int, int, int, int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 13; i++) {
+        Assert.Equal(i == 13, t.Equals(
+          new _System.Tuple13<int, int, int, int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9,
+            i <= 10 ? 11 : 10,
+            i <= 11 ? 12 : 11,
+            i <= 12 ? 13 : 12)));
+      }
+      Assert.Equal(new _System.Tuple13<string, string, string, string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12)", t.ToString());
+      Assert.Equal(t, _System.Tuple13<int, int, int, int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12));
+      Assert.Equal(t, _System.Tuple13<int, int, int, int, int, int, int, int, int, int, int, int, int>.create____hMake13(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12));
+      Assert.Equal(_System.Tuple13<int, int, int, int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple13<int, int, int, int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+      Assert.Equal(10, t.dtor__10);
+      Assert.Equal(11, t.dtor__11);
+      Assert.Equal(12, t.dtor__12);
+    }
+
+    [Fact]
+    public void TestTuple14() {
+      var t = new _System.Tuple14<int, int, int, int, int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 14; i++) {
+        Assert.Equal(i == 14, t.Equals(
+          new _System.Tuple14<int, int, int, int, int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9,
+            i <= 10 ? 11 : 10,
+            i <= 11 ? 12 : 11,
+            i <= 12 ? 13 : 12,
+            i <= 13 ? 14 : 13)));
+      }
+
+      Assert.Equal(new _System.Tuple14<string, string, string, string, string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13)", t.ToString());
+      Assert.Equal(t, _System.Tuple14<int, int, int, int, int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13));
+      Assert.Equal(t, _System.Tuple14<int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create____hMake14(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13));
+      Assert.Equal(_System.Tuple14<int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple14<int, int, int, int, int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+      Assert.Equal(10, t.dtor__10);
+      Assert.Equal(11, t.dtor__11);
+      Assert.Equal(12, t.dtor__12);
+      Assert.Equal(13, t.dtor__13);
+    }
+
+    [Fact]
+    public void TestTuple15() {
+      var t = new _System.Tuple15<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 15; i++) {
+        Assert.Equal(i == 15, t.Equals(
+          new _System.Tuple15<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9,
+            i <= 10 ? 11 : 10,
+            i <= 11 ? 12 : 11,
+            i <= 12 ? 13 : 12,
+            i <= 13 ? 14 : 13,
+            i <= 14 ? 15 : 14)));
+      }
+
+      Assert.Equal(new _System.Tuple15<string, string, string, string, string, string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)", t.ToString());
+      Assert.Equal(t, _System.Tuple15<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14));
+      Assert.Equal(t, _System.Tuple15<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create____hMake15(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14));
+      Assert.Equal(_System.Tuple15<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple15<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+      Assert.Equal(10, t.dtor__10);
+      Assert.Equal(11, t.dtor__11);
+      Assert.Equal(12, t.dtor__12);
+      Assert.Equal(13, t.dtor__13);
+      Assert.Equal(14, t.dtor__14);
+    }
+    [Fact]
+    public void TestTuple16() {
+      var t = new _System.Tuple16<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 16; i++) {
+        Assert.Equal(i == 16, t.Equals(
+          new _System.Tuple16<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9,
+            i <= 10 ? 11 : 10,
+            i <= 11 ? 12 : 11,
+            i <= 12 ? 13 : 12,
+            i <= 13 ? 14 : 13,
+            i <= 14 ? 15 : 14,
+            i <= 15 ? 16 : 15)));
+      }
+
+      Assert.Equal(new _System.Tuple16<string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)", t.ToString());
+      Assert.Equal(t, _System.Tuple16<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15));
+      Assert.Equal(t, _System.Tuple16<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create____hMake16(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15));
+      Assert.Equal(_System.Tuple16<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple16<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+      Assert.Equal(10, t.dtor__10);
+      Assert.Equal(11, t.dtor__11);
+      Assert.Equal(12, t.dtor__12);
+      Assert.Equal(13, t.dtor__13);
+      Assert.Equal(14, t.dtor__14);
+      Assert.Equal(15, t.dtor__15);
+    }
+
+    [Fact]
+    public void TestTuple17() {
+      var t = new _System.Tuple17<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 17; i++) {
+        Assert.Equal(i == 17, t.Equals(
+          new _System.Tuple17<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9,
+            i <= 10 ? 11 : 10,
+            i <= 11 ? 12 : 11,
+            i <= 12 ? 13 : 12,
+            i <= 13 ? 14 : 13,
+            i <= 14 ? 15 : 14,
+            i <= 15 ? 16 : 15,
+            i <= 16 ? 17 : 16)));
+      }
+
+      Assert.Equal(new _System.Tuple17<string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)", t.ToString());
+      Assert.Equal(t, _System.Tuple17<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16));
+      Assert.Equal(t, _System.Tuple17<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create____hMake17(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16));
+      Assert.Equal(_System.Tuple17<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple17<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+      Assert.Equal(10, t.dtor__10);
+      Assert.Equal(11, t.dtor__11);
+      Assert.Equal(12, t.dtor__12);
+      Assert.Equal(13, t.dtor__13);
+      Assert.Equal(14, t.dtor__14);
+      Assert.Equal(15, t.dtor__15);
+      Assert.Equal(16, t.dtor__16);
+    }
+
+    [Fact]
+    public void TestTuple18() {
+      var t = new _System.Tuple18<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 18; i++) {
+        Assert.Equal(i == 18, t.Equals(
+          new _System.Tuple18<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9,
+            i <= 10 ? 11 : 10,
+            i <= 11 ? 12 : 11,
+            i <= 12 ? 13 : 12,
+            i <= 13 ? 14 : 13,
+            i <= 14 ? 15 : 14,
+            i <= 15 ? 16 : 15,
+            i <= 16 ? 17 : 16,
+            i <= 17 ? 18 : 17)));
+      }
+
+      Assert.Equal(new _System.Tuple18<string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17)", t.ToString());
+      Assert.Equal(t, _System.Tuple18<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17));
+      Assert.Equal(t, _System.Tuple18<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create____hMake18(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17));
+      Assert.Equal(_System.Tuple18<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple18<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+      Assert.Equal(10, t.dtor__10);
+      Assert.Equal(11, t.dtor__11);
+      Assert.Equal(12, t.dtor__12);
+      Assert.Equal(13, t.dtor__13);
+      Assert.Equal(14, t.dtor__14);
+      Assert.Equal(15, t.dtor__15);
+      Assert.Equal(16, t.dtor__16);
+      Assert.Equal(17, t.dtor__17);
+    }
+
+    [Fact]
+    public void TestTuple19() {
+      var t = new _System.Tuple19<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 19; i++) {
+        Assert.Equal(i == 19, t.Equals(
+          new _System.Tuple19<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9,
+            i <= 10 ? 11 : 10,
+            i <= 11 ? 12 : 11,
+            i <= 12 ? 13 : 12,
+            i <= 13 ? 14 : 13,
+            i <= 14 ? 15 : 14,
+            i <= 15 ? 16 : 15,
+            i <= 16 ? 17 : 16,
+            i <= 17 ? 18 : 17,
+            i <= 18 ? 19 : 18)));
+      }
+
+      Assert.Equal(new _System.Tuple19<string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18)", t.ToString());
+      Assert.Equal(t, _System.Tuple19<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18));
+      Assert.Equal(t, _System.Tuple19<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create____hMake19(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18));
+      Assert.Equal(_System.Tuple19<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple19<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+      Assert.Equal(10, t.dtor__10);
+      Assert.Equal(11, t.dtor__11);
+      Assert.Equal(12, t.dtor__12);
+      Assert.Equal(13, t.dtor__13);
+      Assert.Equal(14, t.dtor__14);
+      Assert.Equal(15, t.dtor__15);
+      Assert.Equal(16, t.dtor__16);
+      Assert.Equal(17, t.dtor__17);
+      Assert.Equal(18, t.dtor__18);
+    }
+
+    [Fact]
+    public void TestTuple20() {
+      var t = new _System.Tuple20<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19);
+      Assert.False(t.Equals(null));
+      for (var i = 0; i <= 20; i++) {
+        Assert.Equal(i == 20, t.Equals(
+          new _System.Tuple20<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(
+            i <= 0 ? 1 : 0,
+            i <= 1 ? 2 : 1,
+            i <= 2 ? 3 : 2,
+            i <= 3 ? 4 : 3,
+            i <= 4 ? 5 : 4,
+            i <= 5 ? 6 : 5,
+            i <= 6 ? 7 : 6,
+            i <= 7 ? 8 : 7,
+            i <= 8 ? 9 : 8,
+            i <= 9 ? 10 : 9,
+            i <= 10 ? 11 : 10,
+            i <= 11 ? 12 : 11,
+            i <= 12 ? 13 : 12,
+            i <= 13 ? 14 : 13,
+            i <= 14 ? 15 : 14,
+            i <= 15 ? 16 : 15,
+            i <= 16 ? 17 : 16,
+            i <= 17 ? 18 : 17,
+            i <= 18 ? 19 : 18,
+            i <= 19 ? 20 : 19)));
+      }
+
+      Assert.Equal(new _System.Tuple20<string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string, string>("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19"), t.DowncastClone(C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C));
+      Assert.Equal(t, t.DowncastClone(I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I));
+      Assert.NotEqual(0, t.GetHashCode());
+      Assert.Equal("(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19)", t.ToString());
+      Assert.Equal(t, _System.Tuple20<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.Default(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19));
+      Assert.Equal(t, _System.Tuple20<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create____hMake20(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19));
+      Assert.Equal(_System.Tuple20<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>.create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+          _System.Tuple20<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>._TypeDescriptor(D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D, D).Default());
+      Assert.Equal(0, t.dtor__0);
+      Assert.Equal(1, t.dtor__1);
+      Assert.Equal(2, t.dtor__2);
+      Assert.Equal(3, t.dtor__3);
+      Assert.Equal(4, t.dtor__4);
+      Assert.Equal(5, t.dtor__5);
+      Assert.Equal(6, t.dtor__6);
+      Assert.Equal(7, t.dtor__7);
+      Assert.Equal(8, t.dtor__8);
+      Assert.Equal(9, t.dtor__9);
+      Assert.Equal(10, t.dtor__10);
+      Assert.Equal(11, t.dtor__11);
+      Assert.Equal(12, t.dtor__12);
+      Assert.Equal(13, t.dtor__13);
+      Assert.Equal(14, t.dtor__14);
+      Assert.Equal(15, t.dtor__15);
+      Assert.Equal(16, t.dtor__16);
+      Assert.Equal(17, t.dtor__17);
+      Assert.Equal(18, t.dtor__18);
+      Assert.Equal(19, t.dtor__19);
+    }
+
+  }
+}
diff --git a/Source/DafnyRuntime.Tests/coverlet.runsettings b/Source/DafnyRuntime.Tests/coverlet.runsettings
new file mode 100644
index 00000000000..11c8afc63f8
--- /dev/null
+++ b/Source/DafnyRuntime.Tests/coverlet.runsettings
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat Code Coverage">
+        <Configuration>
+          <Exclude>[*]DAST.*,[*]DCOMP.*</Exclude>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
diff --git a/Source/DafnyRuntime/AssemblyInfo.cs b/Source/DafnyRuntime/AssemblyInfo.cs
new file mode 100644
index 00000000000..0a7798c9929
--- /dev/null
+++ b/Source/DafnyRuntime/AssemblyInfo.cs
@@ -0,0 +1,2 @@
+using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("DafnyRuntime.Tests")]
\ No newline at end of file
diff --git a/Source/DafnyRuntime/DafnyRuntime.cs b/Source/DafnyRuntime/DafnyRuntime.cs
index c4ad7ccd81b..a8023c7886f 100755
--- a/Source/DafnyRuntime/DafnyRuntime.cs
+++ b/Source/DafnyRuntime/DafnyRuntime.cs
@@ -5,6 +5,11 @@
 //
 //-----------------------------------------------------------------------------
 
+// When --include-runtime is true, this file is directly prepended
+// to the output program. We have to avoid these using directives in that case
+// since they can only appear before any other declarations.
+// The DafnyRuntime.csproj file is the only place that ISDAFNYRUNTIMELIB is defined,
+// so these are only active when building the C# DafnyRuntime.dll library.
 #if ISDAFNYRUNTIMELIB
 using System; // for Func
 using System.Numerics;
@@ -43,6 +48,10 @@ public Rune(uint value) {
       _value = value;
     }
 
+    public static bool IsRune(BigInteger i) {
+      return (0 <= i && i < 0xD800) || (0xE000 <= i && i < 0x11_0000);
+    }
+
     public int Value => (int)_value;
 
     public bool Equals(Rune other) => this == other;
@@ -538,7 +547,9 @@ public override string ToString() {
       return s + "}";
     }
     public static bool IsProperSubsetOf(IMultiSet<T> th, IMultiSet<T> other) {
-      return th.Count < other.Count && IsSubsetOf(th, other);
+      // Be sure to use ElementCount to avoid casting into 32 bits
+      // integers that could lead to overflows (see https://github.com/dafny-lang/dafny/issues/5554)
+      return th.ElementCount < other.ElementCount && IsSubsetOf(th, other);
     }
     public static bool IsSubsetOf(IMultiSet<T> th, IMultiSet<T> other) {
       var a = FromIMultiSet(th);
@@ -1271,8 +1282,8 @@ public override int Count {
   internal class ConcatSequence<T> : Sequence<T> {
     // INVARIANT: Either left != null, right != null, and elmts's underlying array == null or
     // left == null, right == null, and elmts's underlying array != null
-    private volatile ISequence<T> left, right;
-    private ImmutableArray<T> elmts;
+    internal volatile ISequence<T> left, right;
+    internal ImmutableArray<T> elmts;
     private readonly int count;
 
     internal ConcatSequence(ISequence<T> left, ISequence<T> right) {
@@ -1302,7 +1313,7 @@ public override int Count {
       }
     }
 
-    private ImmutableArray<T> ComputeElements() {
+    internal ImmutableArray<T> ComputeElements() {
       // Traverse the tree formed by all descendants which are ConcatSequences
       var ansBuilder = ImmutableArray.CreateBuilder<T>(count);
       var toVisit = new Stack<ISequence<T>>();
@@ -1651,17 +1662,17 @@ public static Rune SubtractRunes(Rune left, Rune right) {
     }
 
     public static uint Bv32ShiftLeft(uint a, int amount) {
-      return amount == 32 ? 0 : a << amount;
+      return 32 <= amount ? 0 : a << amount;
     }
     public static ulong Bv64ShiftLeft(ulong a, int amount) {
-      return amount == 64 ? 0 : a << amount;
+      return 64 <= amount ? 0 : a << amount;
     }
 
     public static uint Bv32ShiftRight(uint a, int amount) {
-      return amount == 32 ? 0 : a >> amount;
+      return 32 <= amount ? 0 : a >> amount;
     }
     public static ulong Bv64ShiftRight(ulong a, int amount) {
-      return amount == 64 ? 0 : a >> amount;
+      return 64 <= amount ? 0 : a >> amount;
     }
   }
 
@@ -1840,6 +1851,12 @@ public BigInteger ToBigInteger() {
         return (num - den + 1) / den;
       }
     }
+
+    public bool IsInteger() {
+      var floored = new BigRational(this.ToBigInteger(), BigInteger.One);
+      return this == floored;
+    }
+
     /// <summary>
     /// Returns values such that aa/dd == a and bb/dd == b.
     /// </summary>
@@ -1944,3049 +1961,3 @@ public HaltException(object message) : base(message.ToString()) {
     }
   }
 }
-
-namespace @_System {
-
-  public interface _ITuple0 {
-    _ITuple0 DowncastClone();
-  }
-  public class Tuple0 : _ITuple0 {
-    public Tuple0() {
-    }
-    public _ITuple0 DowncastClone() {
-      if (this is _ITuple0 dt) { return dt; }
-      return new Tuple0();
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple0;
-      return oth != null;
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += ")";
-      return s;
-    }
-    private static readonly _ITuple0 theDefault = create();
-    public static _ITuple0 Default() {
-      return theDefault;
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple0> _TypeDescriptor() {
-      return new Dafny.TypeDescriptor<_System._ITuple0>(_System.Tuple0.Default());
-    }
-    public static _ITuple0 create() {
-      return new Tuple0();
-    }
-  }
-
-  public interface _ITuple1<out T1> {
-    T1 dtor__0 { get; }
-    _ITuple1<__T1> DowncastClone<__T1>(Func<T1, __T1> converter0);
-  }
-  public class Tuple1<T1> : _ITuple1<T1> {
-    public readonly T1 _0;
-    public Tuple1(T1 _0) {
-      this._0 = _0;
-    }
-    public _ITuple1<__T1> DowncastClone<__T1>(Func<T1, __T1> converter0) {
-      if (this is _ITuple1<__T1> dt) { return dt; }
-      return new Tuple1<__T1>(converter0(_0));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple1<T1>;
-      return oth != null && object.Equals(this._0, oth._0);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ")";
-      return s;
-    }
-    public static _ITuple1<T1> Default(T1 _default_T1) {
-      return create(_default_T1);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple1<T1>> _TypeDescriptor(Dafny.TypeDescriptor<T1> _td_T1) {
-      return new Dafny.TypeDescriptor<_System._ITuple1<T1>>(_System.Tuple1<T1>.Default(_td_T1.Default()));
-    }
-    public static _ITuple1<T1> create(T1 _0) {
-      return new Tuple1<T1>(_0);
-    }
-    public T1 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-  }
-
-  public interface _ITuple2<out T0, out T1> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-  }
-
-  public class Tuple2<T0, T1> : _ITuple2<T0, T1> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public Tuple2(T0 _0, T1 _1) {
-      this._0 = _0;
-      this._1 = _1;
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple2<T0, T1>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ")";
-      return s;
-    }
-    public static _ITuple2<T0, T1> Default(T0 _default_T0, T1 _default_T1) {
-      return create(_default_T0, _default_T1);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple2<T0, T1>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1) {
-      return new Dafny.TypeDescriptor<_System._ITuple2<T0, T1>>(_System.Tuple2<T0, T1>.Default(_td_T0.Default(), _td_T1.Default()));
-    }
-    public static _ITuple2<T0, T1> create(T0 _0, T1 _1) {
-      return new Tuple2<T0, T1>(_0, _1);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-  }
-
-  public interface _ITuple3<out T0, out T1, out T2> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    _ITuple3<__T0, __T1, __T2> DowncastClone<__T0, __T1, __T2>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2);
-  }
-  public class Tuple3<T0, T1, T2> : _ITuple3<T0, T1, T2> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public Tuple3(T0 _0, T1 _1, T2 _2) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-    }
-    public _ITuple3<__T0, __T1, __T2> DowncastClone<__T0, __T1, __T2>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2) {
-      if (this is _ITuple3<__T0, __T1, __T2> dt) { return dt; }
-      return new Tuple3<__T0, __T1, __T2>(converter0(_0), converter1(_1), converter2(_2));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple3<T0, T1, T2>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ")";
-      return s;
-    }
-    public static _ITuple3<T0, T1, T2> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2) {
-      return create(_default_T0, _default_T1, _default_T2);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple3<T0, T1, T2>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2) {
-      return new Dafny.TypeDescriptor<_System._ITuple3<T0, T1, T2>>(_System.Tuple3<T0, T1, T2>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default()));
-    }
-    public static _ITuple3<T0, T1, T2> create(T0 _0, T1 _1, T2 _2) {
-      return new Tuple3<T0, T1, T2>(_0, _1, _2);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-  }
-
-  public interface _ITuple4<out T0, out T1, out T2, out T3> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    _ITuple4<__T0, __T1, __T2, __T3> DowncastClone<__T0, __T1, __T2, __T3>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3);
-  }
-  public class Tuple4<T0, T1, T2, T3> : _ITuple4<T0, T1, T2, T3> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public Tuple4(T0 _0, T1 _1, T2 _2, T3 _3) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-    }
-    public _ITuple4<__T0, __T1, __T2, __T3> DowncastClone<__T0, __T1, __T2, __T3>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3) {
-      if (this is _ITuple4<__T0, __T1, __T2, __T3> dt) { return dt; }
-      return new Tuple4<__T0, __T1, __T2, __T3>(converter0(_0), converter1(_1), converter2(_2), converter3(_3));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple4<T0, T1, T2, T3>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ")";
-      return s;
-    }
-    public static _ITuple4<T0, T1, T2, T3> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple4<T0, T1, T2, T3>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3) {
-      return new Dafny.TypeDescriptor<_System._ITuple4<T0, T1, T2, T3>>(_System.Tuple4<T0, T1, T2, T3>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default()));
-    }
-    public static _ITuple4<T0, T1, T2, T3> create(T0 _0, T1 _1, T2 _2, T3 _3) {
-      return new Tuple4<T0, T1, T2, T3>(_0, _1, _2, _3);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-  }
-
-  public interface _ITuple5<out T0, out T1, out T2, out T3, out T4> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    _ITuple5<__T0, __T1, __T2, __T3, __T4> DowncastClone<__T0, __T1, __T2, __T3, __T4>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4);
-  }
-  public class Tuple5<T0, T1, T2, T3, T4> : _ITuple5<T0, T1, T2, T3, T4> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public Tuple5(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-    }
-    public _ITuple5<__T0, __T1, __T2, __T3, __T4> DowncastClone<__T0, __T1, __T2, __T3, __T4>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4) {
-      if (this is _ITuple5<__T0, __T1, __T2, __T3, __T4> dt) { return dt; }
-      return new Tuple5<__T0, __T1, __T2, __T3, __T4>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple5<T0, T1, T2, T3, T4>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ")";
-      return s;
-    }
-    public static _ITuple5<T0, T1, T2, T3, T4> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple5<T0, T1, T2, T3, T4>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4) {
-      return new Dafny.TypeDescriptor<_System._ITuple5<T0, T1, T2, T3, T4>>(_System.Tuple5<T0, T1, T2, T3, T4>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default()));
-    }
-    public static _ITuple5<T0, T1, T2, T3, T4> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4) {
-      return new Tuple5<T0, T1, T2, T3, T4>(_0, _1, _2, _3, _4);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-  }
-
-  public interface _ITuple6<out T0, out T1, out T2, out T3, out T4, out T5> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    _ITuple6<__T0, __T1, __T2, __T3, __T4, __T5> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5);
-  }
-  public class Tuple6<T0, T1, T2, T3, T4, T5> : _ITuple6<T0, T1, T2, T3, T4, T5> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public Tuple6(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-    }
-    public _ITuple6<__T0, __T1, __T2, __T3, __T4, __T5> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5) {
-      if (this is _ITuple6<__T0, __T1, __T2, __T3, __T4, __T5> dt) { return dt; }
-      return new Tuple6<__T0, __T1, __T2, __T3, __T4, __T5>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple6<T0, T1, T2, T3, T4, T5>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ")";
-      return s;
-    }
-    public static _ITuple6<T0, T1, T2, T3, T4, T5> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple6<T0, T1, T2, T3, T4, T5>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5) {
-      return new Dafny.TypeDescriptor<_System._ITuple6<T0, T1, T2, T3, T4, T5>>(_System.Tuple6<T0, T1, T2, T3, T4, T5>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default()));
-    }
-    public static _ITuple6<T0, T1, T2, T3, T4, T5> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5) {
-      return new Tuple6<T0, T1, T2, T3, T4, T5>(_0, _1, _2, _3, _4, _5);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-  }
-
-  public interface _ITuple7<out T0, out T1, out T2, out T3, out T4, out T5, out T6> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    _ITuple7<__T0, __T1, __T2, __T3, __T4, __T5, __T6> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6);
-  }
-  public class Tuple7<T0, T1, T2, T3, T4, T5, T6> : _ITuple7<T0, T1, T2, T3, T4, T5, T6> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public Tuple7(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-    }
-    public _ITuple7<__T0, __T1, __T2, __T3, __T4, __T5, __T6> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6) {
-      if (this is _ITuple7<__T0, __T1, __T2, __T3, __T4, __T5, __T6> dt) { return dt; }
-      return new Tuple7<__T0, __T1, __T2, __T3, __T4, __T5, __T6>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple7<T0, T1, T2, T3, T4, T5, T6>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ")";
-      return s;
-    }
-    public static _ITuple7<T0, T1, T2, T3, T4, T5, T6> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple7<T0, T1, T2, T3, T4, T5, T6>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6) {
-      return new Dafny.TypeDescriptor<_System._ITuple7<T0, T1, T2, T3, T4, T5, T6>>(_System.Tuple7<T0, T1, T2, T3, T4, T5, T6>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default()));
-    }
-    public static _ITuple7<T0, T1, T2, T3, T4, T5, T6> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6) {
-      return new Tuple7<T0, T1, T2, T3, T4, T5, T6>(_0, _1, _2, _3, _4, _5, _6);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-  }
-
-  public interface _ITuple8<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    _ITuple8<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7);
-  }
-  public class Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> : _ITuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public Tuple8(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-    }
-    public _ITuple8<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7) {
-      if (this is _ITuple8<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7> dt) { return dt; }
-      return new Tuple8<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple8<T0, T1, T2, T3, T4, T5, T6, T7>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ")";
-      return s;
-    }
-    public static _ITuple8<T0, T1, T2, T3, T4, T5, T6, T7> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple8<T0, T1, T2, T3, T4, T5, T6, T7>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7) {
-      return new Dafny.TypeDescriptor<_System._ITuple8<T0, T1, T2, T3, T4, T5, T6, T7>>(_System.Tuple8<T0, T1, T2, T3, T4, T5, T6, T7>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default()));
-    }
-    public static _ITuple8<T0, T1, T2, T3, T4, T5, T6, T7> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7) {
-      return new Tuple8<T0, T1, T2, T3, T4, T5, T6, T7>(_0, _1, _2, _3, _4, _5, _6, _7);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-  }
-
-  public interface _ITuple9<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    _ITuple9<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8);
-  }
-  public class Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> : _ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public Tuple9(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-    }
-    public _ITuple9<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8) {
-      if (this is _ITuple9<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8> dt) { return dt; }
-      return new Tuple9<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ")";
-      return s;
-    }
-    public static _ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8) {
-      return new Dafny.TypeDescriptor<_System._ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>>(_System.Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default()));
-    }
-    public static _ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8) {
-      return new Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>(_0, _1, _2, _3, _4, _5, _6, _7, _8);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-  }
-
-  public interface _ITuple10<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    _ITuple10<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9);
-  }
-  public class Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> : _ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public Tuple10(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-    }
-    public _ITuple10<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9) {
-      if (this is _ITuple10<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9> dt) { return dt; }
-      return new Tuple10<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ")";
-      return s;
-    }
-    public static _ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9) {
-      return new Dafny.TypeDescriptor<_System._ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>>(_System.Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default()));
-    }
-    public static _ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9) {
-      return new Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-  }
-
-  public interface _ITuple11<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    T10 dtor__10 { get; }
-    _ITuple11<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10);
-  }
-  public class Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> : _ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public readonly T10 _10;
-    public Tuple11(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-      this._10 = _10;
-    }
-    public _ITuple11<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10) {
-      if (this is _ITuple11<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10> dt) { return dt; }
-      return new Tuple11<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9), converter10(_10));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9) && object.Equals(this._10, oth._10);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._10));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._10);
-      s += ")";
-      return s;
-    }
-    public static _ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10) {
-      return new Dafny.TypeDescriptor<_System._ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>>(_System.Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default()));
-    }
-    public static _ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10) {
-      return new Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-    public T10 dtor__10 {
-      get {
-        return this._10;
-      }
-    }
-  }
-
-  public interface _ITuple12<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    T10 dtor__10 { get; }
-    T11 dtor__11 { get; }
-    _ITuple12<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11);
-  }
-  public class Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> : _ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public readonly T10 _10;
-    public readonly T11 _11;
-    public Tuple12(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-      this._10 = _10;
-      this._11 = _11;
-    }
-    public _ITuple12<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11) {
-      if (this is _ITuple12<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11> dt) { return dt; }
-      return new Tuple12<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9), converter10(_10), converter11(_11));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9) && object.Equals(this._10, oth._10) && object.Equals(this._11, oth._11);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._10));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._11));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._10);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._11);
-      s += ")";
-      return s;
-    }
-    public static _ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11) {
-      return new Dafny.TypeDescriptor<_System._ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>>(_System.Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default()));
-    }
-    public static _ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11) {
-      return new Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-    public T10 dtor__10 {
-      get {
-        return this._10;
-      }
-    }
-    public T11 dtor__11 {
-      get {
-        return this._11;
-      }
-    }
-  }
-
-  public interface _ITuple13<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    T10 dtor__10 { get; }
-    T11 dtor__11 { get; }
-    T12 dtor__12 { get; }
-    _ITuple13<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12);
-  }
-  public class Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> : _ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public readonly T10 _10;
-    public readonly T11 _11;
-    public readonly T12 _12;
-    public Tuple13(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-      this._10 = _10;
-      this._11 = _11;
-      this._12 = _12;
-    }
-    public _ITuple13<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12) {
-      if (this is _ITuple13<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12> dt) { return dt; }
-      return new Tuple13<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9), converter10(_10), converter11(_11), converter12(_12));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9) && object.Equals(this._10, oth._10) && object.Equals(this._11, oth._11) && object.Equals(this._12, oth._12);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._10));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._11));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._12));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._10);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._11);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._12);
-      s += ")";
-      return s;
-    }
-    public static _ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12) {
-      return new Dafny.TypeDescriptor<_System._ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>>(_System.Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default()));
-    }
-    public static _ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12) {
-      return new Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-    public T10 dtor__10 {
-      get {
-        return this._10;
-      }
-    }
-    public T11 dtor__11 {
-      get {
-        return this._11;
-      }
-    }
-    public T12 dtor__12 {
-      get {
-        return this._12;
-      }
-    }
-  }
-
-  public interface _ITuple14<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    T10 dtor__10 { get; }
-    T11 dtor__11 { get; }
-    T12 dtor__12 { get; }
-    T13 dtor__13 { get; }
-    _ITuple14<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13);
-  }
-  public class Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> : _ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public readonly T10 _10;
-    public readonly T11 _11;
-    public readonly T12 _12;
-    public readonly T13 _13;
-    public Tuple14(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-      this._10 = _10;
-      this._11 = _11;
-      this._12 = _12;
-      this._13 = _13;
-    }
-    public _ITuple14<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13) {
-      if (this is _ITuple14<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13> dt) { return dt; }
-      return new Tuple14<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9), converter10(_10), converter11(_11), converter12(_12), converter13(_13));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9) && object.Equals(this._10, oth._10) && object.Equals(this._11, oth._11) && object.Equals(this._12, oth._12) && object.Equals(this._13, oth._13);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._10));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._11));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._12));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._13));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._10);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._11);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._12);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._13);
-      s += ")";
-      return s;
-    }
-    public static _ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13) {
-      return new Dafny.TypeDescriptor<_System._ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>>(_System.Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default()));
-    }
-    public static _ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13) {
-      return new Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-    public T10 dtor__10 {
-      get {
-        return this._10;
-      }
-    }
-    public T11 dtor__11 {
-      get {
-        return this._11;
-      }
-    }
-    public T12 dtor__12 {
-      get {
-        return this._12;
-      }
-    }
-    public T13 dtor__13 {
-      get {
-        return this._13;
-      }
-    }
-  }
-
-  public interface _ITuple15<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    T10 dtor__10 { get; }
-    T11 dtor__11 { get; }
-    T12 dtor__12 { get; }
-    T13 dtor__13 { get; }
-    T14 dtor__14 { get; }
-    _ITuple15<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14);
-  }
-  public class Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> : _ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public readonly T10 _10;
-    public readonly T11 _11;
-    public readonly T12 _12;
-    public readonly T13 _13;
-    public readonly T14 _14;
-    public Tuple15(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-      this._10 = _10;
-      this._11 = _11;
-      this._12 = _12;
-      this._13 = _13;
-      this._14 = _14;
-    }
-    public _ITuple15<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14) {
-      if (this is _ITuple15<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14> dt) { return dt; }
-      return new Tuple15<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9), converter10(_10), converter11(_11), converter12(_12), converter13(_13), converter14(_14));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9) && object.Equals(this._10, oth._10) && object.Equals(this._11, oth._11) && object.Equals(this._12, oth._12) && object.Equals(this._13, oth._13) && object.Equals(this._14, oth._14);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._10));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._11));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._12));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._13));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._14));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._10);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._11);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._12);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._13);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._14);
-      s += ")";
-      return s;
-    }
-    public static _ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14) {
-      return new Dafny.TypeDescriptor<_System._ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>>(_System.Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default()));
-    }
-    public static _ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14) {
-      return new Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-    public T10 dtor__10 {
-      get {
-        return this._10;
-      }
-    }
-    public T11 dtor__11 {
-      get {
-        return this._11;
-      }
-    }
-    public T12 dtor__12 {
-      get {
-        return this._12;
-      }
-    }
-    public T13 dtor__13 {
-      get {
-        return this._13;
-      }
-    }
-    public T14 dtor__14 {
-      get {
-        return this._14;
-      }
-    }
-  }
-
-  public interface _ITuple16<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    T10 dtor__10 { get; }
-    T11 dtor__11 { get; }
-    T12 dtor__12 { get; }
-    T13 dtor__13 { get; }
-    T14 dtor__14 { get; }
-    T15 dtor__15 { get; }
-    _ITuple16<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15);
-  }
-  public class Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> : _ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public readonly T10 _10;
-    public readonly T11 _11;
-    public readonly T12 _12;
-    public readonly T13 _13;
-    public readonly T14 _14;
-    public readonly T15 _15;
-    public Tuple16(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-      this._10 = _10;
-      this._11 = _11;
-      this._12 = _12;
-      this._13 = _13;
-      this._14 = _14;
-      this._15 = _15;
-    }
-    public _ITuple16<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15) {
-      if (this is _ITuple16<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15> dt) { return dt; }
-      return new Tuple16<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9), converter10(_10), converter11(_11), converter12(_12), converter13(_13), converter14(_14), converter15(_15));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9) && object.Equals(this._10, oth._10) && object.Equals(this._11, oth._11) && object.Equals(this._12, oth._12) && object.Equals(this._13, oth._13) && object.Equals(this._14, oth._14) && object.Equals(this._15, oth._15);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._10));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._11));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._12));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._13));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._14));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._15));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._10);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._11);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._12);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._13);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._14);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._15);
-      s += ")";
-      return s;
-    }
-    public static _ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14, T15 _default_T15) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14, _default_T15);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14, Dafny.TypeDescriptor<T15> _td_T15) {
-      return new Dafny.TypeDescriptor<_System._ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>>(_System.Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default(), _td_T15.Default()));
-    }
-    public static _ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15) {
-      return new Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-    public T10 dtor__10 {
-      get {
-        return this._10;
-      }
-    }
-    public T11 dtor__11 {
-      get {
-        return this._11;
-      }
-    }
-    public T12 dtor__12 {
-      get {
-        return this._12;
-      }
-    }
-    public T13 dtor__13 {
-      get {
-        return this._13;
-      }
-    }
-    public T14 dtor__14 {
-      get {
-        return this._14;
-      }
-    }
-    public T15 dtor__15 {
-      get {
-        return this._15;
-      }
-    }
-  }
-
-  public interface _ITuple17<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    T10 dtor__10 { get; }
-    T11 dtor__11 { get; }
-    T12 dtor__12 { get; }
-    T13 dtor__13 { get; }
-    T14 dtor__14 { get; }
-    T15 dtor__15 { get; }
-    T16 dtor__16 { get; }
-    _ITuple17<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16);
-  }
-  public class Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> : _ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public readonly T10 _10;
-    public readonly T11 _11;
-    public readonly T12 _12;
-    public readonly T13 _13;
-    public readonly T14 _14;
-    public readonly T15 _15;
-    public readonly T16 _16;
-    public Tuple17(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-      this._10 = _10;
-      this._11 = _11;
-      this._12 = _12;
-      this._13 = _13;
-      this._14 = _14;
-      this._15 = _15;
-      this._16 = _16;
-    }
-    public _ITuple17<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16) {
-      if (this is _ITuple17<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16> dt) { return dt; }
-      return new Tuple17<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9), converter10(_10), converter11(_11), converter12(_12), converter13(_13), converter14(_14), converter15(_15), converter16(_16));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9) && object.Equals(this._10, oth._10) && object.Equals(this._11, oth._11) && object.Equals(this._12, oth._12) && object.Equals(this._13, oth._13) && object.Equals(this._14, oth._14) && object.Equals(this._15, oth._15) && object.Equals(this._16, oth._16);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._10));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._11));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._12));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._13));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._14));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._15));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._16));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._10);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._11);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._12);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._13);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._14);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._15);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._16);
-      s += ")";
-      return s;
-    }
-    public static _ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14, T15 _default_T15, T16 _default_T16) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14, _default_T15, _default_T16);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14, Dafny.TypeDescriptor<T15> _td_T15, Dafny.TypeDescriptor<T16> _td_T16) {
-      return new Dafny.TypeDescriptor<_System._ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>(_System.Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default(), _td_T15.Default(), _td_T16.Default()));
-    }
-    public static _ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16) {
-      return new Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-    public T10 dtor__10 {
-      get {
-        return this._10;
-      }
-    }
-    public T11 dtor__11 {
-      get {
-        return this._11;
-      }
-    }
-    public T12 dtor__12 {
-      get {
-        return this._12;
-      }
-    }
-    public T13 dtor__13 {
-      get {
-        return this._13;
-      }
-    }
-    public T14 dtor__14 {
-      get {
-        return this._14;
-      }
-    }
-    public T15 dtor__15 {
-      get {
-        return this._15;
-      }
-    }
-    public T16 dtor__16 {
-      get {
-        return this._16;
-      }
-    }
-  }
-
-  public interface _ITuple18<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    T10 dtor__10 { get; }
-    T11 dtor__11 { get; }
-    T12 dtor__12 { get; }
-    T13 dtor__13 { get; }
-    T14 dtor__14 { get; }
-    T15 dtor__15 { get; }
-    T16 dtor__16 { get; }
-    T17 dtor__17 { get; }
-    _ITuple18<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17);
-  }
-  public class Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> : _ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public readonly T10 _10;
-    public readonly T11 _11;
-    public readonly T12 _12;
-    public readonly T13 _13;
-    public readonly T14 _14;
-    public readonly T15 _15;
-    public readonly T16 _16;
-    public readonly T17 _17;
-    public Tuple18(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-      this._10 = _10;
-      this._11 = _11;
-      this._12 = _12;
-      this._13 = _13;
-      this._14 = _14;
-      this._15 = _15;
-      this._16 = _16;
-      this._17 = _17;
-    }
-    public _ITuple18<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17) {
-      if (this is _ITuple18<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17> dt) { return dt; }
-      return new Tuple18<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9), converter10(_10), converter11(_11), converter12(_12), converter13(_13), converter14(_14), converter15(_15), converter16(_16), converter17(_17));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9) && object.Equals(this._10, oth._10) && object.Equals(this._11, oth._11) && object.Equals(this._12, oth._12) && object.Equals(this._13, oth._13) && object.Equals(this._14, oth._14) && object.Equals(this._15, oth._15) && object.Equals(this._16, oth._16) && object.Equals(this._17, oth._17);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._10));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._11));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._12));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._13));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._14));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._15));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._16));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._17));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._10);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._11);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._12);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._13);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._14);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._15);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._16);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._17);
-      s += ")";
-      return s;
-    }
-    public static _ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14, T15 _default_T15, T16 _default_T16, T17 _default_T17) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14, _default_T15, _default_T16, _default_T17);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14, Dafny.TypeDescriptor<T15> _td_T15, Dafny.TypeDescriptor<T16> _td_T16, Dafny.TypeDescriptor<T17> _td_T17) {
-      return new Dafny.TypeDescriptor<_System._ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>>(_System.Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default(), _td_T15.Default(), _td_T16.Default(), _td_T17.Default()));
-    }
-    public static _ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17) {
-      return new Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-    public T10 dtor__10 {
-      get {
-        return this._10;
-      }
-    }
-    public T11 dtor__11 {
-      get {
-        return this._11;
-      }
-    }
-    public T12 dtor__12 {
-      get {
-        return this._12;
-      }
-    }
-    public T13 dtor__13 {
-      get {
-        return this._13;
-      }
-    }
-    public T14 dtor__14 {
-      get {
-        return this._14;
-      }
-    }
-    public T15 dtor__15 {
-      get {
-        return this._15;
-      }
-    }
-    public T16 dtor__16 {
-      get {
-        return this._16;
-      }
-    }
-    public T17 dtor__17 {
-      get {
-        return this._17;
-      }
-    }
-  }
-
-  public interface _ITuple19<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17, out T18> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    T10 dtor__10 { get; }
-    T11 dtor__11 { get; }
-    T12 dtor__12 { get; }
-    T13 dtor__13 { get; }
-    T14 dtor__14 { get; }
-    T15 dtor__15 { get; }
-    T16 dtor__16 { get; }
-    T17 dtor__17 { get; }
-    T18 dtor__18 { get; }
-    _ITuple19<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17, Func<T18, __T18> converter18);
-  }
-  public class Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> : _ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public readonly T10 _10;
-    public readonly T11 _11;
-    public readonly T12 _12;
-    public readonly T13 _13;
-    public readonly T14 _14;
-    public readonly T15 _15;
-    public readonly T16 _16;
-    public readonly T17 _17;
-    public readonly T18 _18;
-    public Tuple19(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17, T18 _18) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-      this._10 = _10;
-      this._11 = _11;
-      this._12 = _12;
-      this._13 = _13;
-      this._14 = _14;
-      this._15 = _15;
-      this._16 = _16;
-      this._17 = _17;
-      this._18 = _18;
-    }
-    public _ITuple19<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17, Func<T18, __T18> converter18) {
-      if (this is _ITuple19<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18> dt) { return dt; }
-      return new Tuple19<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9), converter10(_10), converter11(_11), converter12(_12), converter13(_13), converter14(_14), converter15(_15), converter16(_16), converter17(_17), converter18(_18));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9) && object.Equals(this._10, oth._10) && object.Equals(this._11, oth._11) && object.Equals(this._12, oth._12) && object.Equals(this._13, oth._13) && object.Equals(this._14, oth._14) && object.Equals(this._15, oth._15) && object.Equals(this._16, oth._16) && object.Equals(this._17, oth._17) && object.Equals(this._18, oth._18);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._10));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._11));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._12));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._13));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._14));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._15));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._16));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._17));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._18));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._10);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._11);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._12);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._13);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._14);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._15);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._16);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._17);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._18);
-      s += ")";
-      return s;
-    }
-    public static _ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14, T15 _default_T15, T16 _default_T16, T17 _default_T17, T18 _default_T18) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14, _default_T15, _default_T16, _default_T17, _default_T18);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14, Dafny.TypeDescriptor<T15> _td_T15, Dafny.TypeDescriptor<T16> _td_T16, Dafny.TypeDescriptor<T17> _td_T17, Dafny.TypeDescriptor<T18> _td_T18) {
-      return new Dafny.TypeDescriptor<_System._ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>>(_System.Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default(), _td_T15.Default(), _td_T16.Default(), _td_T17.Default(), _td_T18.Default()));
-    }
-    public static _ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17, T18 _18) {
-      return new Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-    public T10 dtor__10 {
-      get {
-        return this._10;
-      }
-    }
-    public T11 dtor__11 {
-      get {
-        return this._11;
-      }
-    }
-    public T12 dtor__12 {
-      get {
-        return this._12;
-      }
-    }
-    public T13 dtor__13 {
-      get {
-        return this._13;
-      }
-    }
-    public T14 dtor__14 {
-      get {
-        return this._14;
-      }
-    }
-    public T15 dtor__15 {
-      get {
-        return this._15;
-      }
-    }
-    public T16 dtor__16 {
-      get {
-        return this._16;
-      }
-    }
-    public T17 dtor__17 {
-      get {
-        return this._17;
-      }
-    }
-    public T18 dtor__18 {
-      get {
-        return this._18;
-      }
-    }
-  }
-
-  public interface _ITuple20<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17, out T18, out T19> {
-    T0 dtor__0 { get; }
-    T1 dtor__1 { get; }
-    T2 dtor__2 { get; }
-    T3 dtor__3 { get; }
-    T4 dtor__4 { get; }
-    T5 dtor__5 { get; }
-    T6 dtor__6 { get; }
-    T7 dtor__7 { get; }
-    T8 dtor__8 { get; }
-    T9 dtor__9 { get; }
-    T10 dtor__10 { get; }
-    T11 dtor__11 { get; }
-    T12 dtor__12 { get; }
-    T13 dtor__13 { get; }
-    T14 dtor__14 { get; }
-    T15 dtor__15 { get; }
-    T16 dtor__16 { get; }
-    T17 dtor__17 { get; }
-    T18 dtor__18 { get; }
-    T19 dtor__19 { get; }
-    _ITuple20<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17, Func<T18, __T18> converter18, Func<T19, __T19> converter19);
-  }
-  public class Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> : _ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
-    public readonly T0 _0;
-    public readonly T1 _1;
-    public readonly T2 _2;
-    public readonly T3 _3;
-    public readonly T4 _4;
-    public readonly T5 _5;
-    public readonly T6 _6;
-    public readonly T7 _7;
-    public readonly T8 _8;
-    public readonly T9 _9;
-    public readonly T10 _10;
-    public readonly T11 _11;
-    public readonly T12 _12;
-    public readonly T13 _13;
-    public readonly T14 _14;
-    public readonly T15 _15;
-    public readonly T16 _16;
-    public readonly T17 _17;
-    public readonly T18 _18;
-    public readonly T19 _19;
-    public Tuple20(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17, T18 _18, T19 _19) {
-      this._0 = _0;
-      this._1 = _1;
-      this._2 = _2;
-      this._3 = _3;
-      this._4 = _4;
-      this._5 = _5;
-      this._6 = _6;
-      this._7 = _7;
-      this._8 = _8;
-      this._9 = _9;
-      this._10 = _10;
-      this._11 = _11;
-      this._12 = _12;
-      this._13 = _13;
-      this._14 = _14;
-      this._15 = _15;
-      this._16 = _16;
-      this._17 = _17;
-      this._18 = _18;
-      this._19 = _19;
-    }
-    public _ITuple20<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17, Func<T18, __T18> converter18, Func<T19, __T19> converter19) {
-      if (this is _ITuple20<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19> dt) { return dt; }
-      return new Tuple20<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19>(converter0(_0), converter1(_1), converter2(_2), converter3(_3), converter4(_4), converter5(_5), converter6(_6), converter7(_7), converter8(_8), converter9(_9), converter10(_10), converter11(_11), converter12(_12), converter13(_13), converter14(_14), converter15(_15), converter16(_16), converter17(_17), converter18(_18), converter19(_19));
-    }
-    public override bool Equals(object other) {
-      var oth = other as _System.Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>;
-      return oth != null && object.Equals(this._0, oth._0) && object.Equals(this._1, oth._1) && object.Equals(this._2, oth._2) && object.Equals(this._3, oth._3) && object.Equals(this._4, oth._4) && object.Equals(this._5, oth._5) && object.Equals(this._6, oth._6) && object.Equals(this._7, oth._7) && object.Equals(this._8, oth._8) && object.Equals(this._9, oth._9) && object.Equals(this._10, oth._10) && object.Equals(this._11, oth._11) && object.Equals(this._12, oth._12) && object.Equals(this._13, oth._13) && object.Equals(this._14, oth._14) && object.Equals(this._15, oth._15) && object.Equals(this._16, oth._16) && object.Equals(this._17, oth._17) && object.Equals(this._18, oth._18) && object.Equals(this._19, oth._19);
-    }
-    public override int GetHashCode() {
-      ulong hash = 5381;
-      hash = ((hash << 5) + hash) + 0;
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._0));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._1));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._2));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._3));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._4));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._5));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._6));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._7));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._8));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._9));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._10));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._11));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._12));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._13));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._14));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._15));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._16));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._17));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._18));
-      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this._19));
-      return (int)hash;
-    }
-    public override string ToString() {
-      string s = "";
-      s += "(";
-      s += Dafny.Helpers.ToString(this._0);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._1);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._2);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._3);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._4);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._5);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._6);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._7);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._8);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._9);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._10);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._11);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._12);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._13);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._14);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._15);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._16);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._17);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._18);
-      s += ", ";
-      s += Dafny.Helpers.ToString(this._19);
-      s += ")";
-      return s;
-    }
-    public static _ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14, T15 _default_T15, T16 _default_T16, T17 _default_T17, T18 _default_T18, T19 _default_T19) {
-      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14, _default_T15, _default_T16, _default_T17, _default_T18, _default_T19);
-    }
-    public static Dafny.TypeDescriptor<_System._ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14, Dafny.TypeDescriptor<T15> _td_T15, Dafny.TypeDescriptor<T16> _td_T16, Dafny.TypeDescriptor<T17> _td_T17, Dafny.TypeDescriptor<T18> _td_T18, Dafny.TypeDescriptor<T19> _td_T19) {
-      return new Dafny.TypeDescriptor<_System._ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>>(_System.Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default(), _td_T15.Default(), _td_T16.Default(), _td_T17.Default(), _td_T18.Default(), _td_T19.Default()));
-    }
-    public static _ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17, T18 _18, T19 _19) {
-      return new Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19);
-    }
-    public T0 dtor__0 {
-      get {
-        return this._0;
-      }
-    }
-    public T1 dtor__1 {
-      get {
-        return this._1;
-      }
-    }
-    public T2 dtor__2 {
-      get {
-        return this._2;
-      }
-    }
-    public T3 dtor__3 {
-      get {
-        return this._3;
-      }
-    }
-    public T4 dtor__4 {
-      get {
-        return this._4;
-      }
-    }
-    public T5 dtor__5 {
-      get {
-        return this._5;
-      }
-    }
-    public T6 dtor__6 {
-      get {
-        return this._6;
-      }
-    }
-    public T7 dtor__7 {
-      get {
-        return this._7;
-      }
-    }
-    public T8 dtor__8 {
-      get {
-        return this._8;
-      }
-    }
-    public T9 dtor__9 {
-      get {
-        return this._9;
-      }
-    }
-    public T10 dtor__10 {
-      get {
-        return this._10;
-      }
-    }
-    public T11 dtor__11 {
-      get {
-        return this._11;
-      }
-    }
-    public T12 dtor__12 {
-      get {
-        return this._12;
-      }
-    }
-    public T13 dtor__13 {
-      get {
-        return this._13;
-      }
-    }
-    public T14 dtor__14 {
-      get {
-        return this._14;
-      }
-    }
-    public T15 dtor__15 {
-      get {
-        return this._15;
-      }
-    }
-    public T16 dtor__16 {
-      get {
-        return this._16;
-      }
-    }
-    public T17 dtor__17 {
-      get {
-        return this._17;
-      }
-    }
-    public T18 dtor__18 {
-      get {
-        return this._18;
-      }
-    }
-    public T19 dtor__19 {
-      get {
-        return this._19;
-      }
-    }
-  }
-} // end of namespace _System
diff --git a/Source/DafnyRuntime/DafnyRuntime.csproj b/Source/DafnyRuntime/DafnyRuntime.csproj
index b00ccc2c988..8cfbf6fab40 100644
--- a/Source/DafnyRuntime/DafnyRuntime.csproj
+++ b/Source/DafnyRuntime/DafnyRuntime.csproj
@@ -6,6 +6,7 @@
       <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
       <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
       <DefineConstants>TRACE;ISDAFNYRUNTIMELIB</DefineConstants>
+      <TargetFramework></TargetFramework>
       <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
       <OutputPath>..\..\Binaries\</OutputPath>
       <LangVersion>7.3</LangVersion>
@@ -24,9 +25,29 @@
 
   <ItemGroup>
     <Folder Include="DafnyRuntimeJava\build\libs" />
+  </ItemGroup>
+   <ItemGroup>
+    <InternalsVisibleTo Include="$(MSBuildProjectName).Tests" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Update="DafnyRuntimeGo-gomod\dafny\dafny.go">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="DafnyRuntimeGo-gomod\dafny\dafny_test.go">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="DafnyRuntimeGo-gomod\dafny\dafnyFromDafny.go">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="DafnyRuntimeGo-gomod\System_\System_.go">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="DafnyRuntimeGo-gomod\go.mod">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <PropertyGroup>
-    <DafnyRuntimeJar>DafnyRuntimeJava/build/libs/DafnyRuntime-4.2.0.jar</DafnyRuntimeJar>
+    <DafnyRuntimeJar>DafnyRuntimeJava/build/libs/DafnyRuntime-4.9.2.jar</DafnyRuntimeJar>
   </PropertyGroup>
   <Target Name="BuildDafnyRuntimeJar" AfterTargets="ResolveReferences" BeforeTargets="CoreCompile" Inputs="$(MSBuildProjectFile);@(DafnyRuntimeJavaInputFile)" Outputs="$(DafnyRuntimeJar)">
     
diff --git a/Source/DafnyRuntime/DafnyRuntime.py b/Source/DafnyRuntime/DafnyRuntime.py
deleted file mode 100644
index 3ebf903903c..00000000000
--- a/Source/DafnyRuntime/DafnyRuntime.py
+++ /dev/null
@@ -1,477 +0,0 @@
-"""Runtime enabling Dafny language features."""
-import builtins
-from dataclasses import dataclass
-from contextlib import contextmanager
-from fractions import Fraction
-from collections import Counter
-from collections.abc import Iterable
-from functools import reduce
-from types import GeneratorType, FunctionType
-from itertools import chain, combinations, count
-
-class classproperty(property):
-    def __get__(self, instance, owner):
-        return classmethod(self.fget).__get__(None, owner)()
-
-def print(value):
-    builtins.print(value, end="")
-
-# Dafny strings are currently sequences of UTF-16 code units.
-# To make a best effort attempt at printing the right characters we attempt to decode,
-# but have to allow for invalid sequences.
-def string_from_utf_16(utf_16_code_units):
-    return b''.join(ord(c).to_bytes(2, 'little') for c in utf_16_code_units).decode("utf-16-le", errors = 'replace')
-
-def string_of(value) -> str:
-    if hasattr(value, '__dafnystr__'):
-        return value.__dafnystr__()
-    elif value is None:
-        return "null"
-    elif isinstance(value, bool):
-        return "true" if value else "false"
-    elif isinstance(value, str):
-        # This is only for Dafny char values.
-        # Dafny strings are represented as Seq's of individual char values,
-        # and Seq defines __dafnystr__.
-        return string_from_utf_16(value)
-    elif isinstance(value, tuple):
-        return '(' + ', '.join(map(string_of, value)) + ')'
-    elif isinstance(value, FunctionType):
-        return "Function"
-    else:
-        return str(value)
-
-@dataclass
-class Break(Exception):
-    target: str
-
-@dataclass
-class Continue(Exception):
-    target: str
-
-class TailCall(Exception):
-    pass
-
-@contextmanager
-def label(name: str = None):
-    try:
-        yield
-    except Break as g:
-        if g.target != name:
-            raise g
-    except TailCall as g:
-        if name is not None:
-            raise g
-
-@contextmanager
-def c_label(name: str = None):
-    try:
-        yield
-    except Continue as g:
-        if g.target != name:
-            raise g
-
-class CodePoint(str):
-
-    escapes = {
-      '\n' : "\\n",
-      '\r' : "\\r",
-      '\t' : "\\t",
-      '\0' : "\\0",
-      '\'' : "\\'",
-      '\"' : "\\\"",
-      '\\' : "\\\\",
-    }
-
-    def __escaped__(self):
-        return self.escapes.get(self, self)
-
-    def __dafnystr__(self):
-        return f"'{self.__escaped__()}'"
-
-    def __add__(self, other):
-        return CodePoint(plus_char(self, other))
-
-    def __sub__(self, other):
-        return CodePoint(minus_char(self, other))
-
-class Seq(tuple):
-    def __init__(self, __iterable = None, isStr = False):
-        '''
-        isStr defines whether this value should be tracked at runtime as a string (a.k.a. seq<char>)
-        It accepts three different values:
-         - True: this value is definitely a string, mark it as such
-         - False: this value might be a string, apply heuristics to make a best guess
-         - None: don't apply heuristics, don't mark it as a string
-
-        None is used when --unicode-char is true, to ensure consistent printing of strings
-        across backends without depending on any runtime tracking.
-        See docs/Compilation/StringsAndChars.md.
-        '''
-
-        if __iterable is None:
-            __iterable = []
-        if isStr is None:
-            self.isStr = None
-        else:
-            self.isStr = isStr \
-                        or isinstance(__iterable, str) \
-                        or (isinstance(__iterable, Seq) and __iterable.isStr) \
-                        or (not isinstance(__iterable, GeneratorType)
-                            and all(isinstance(e, str) and len(e) == 1 for e in __iterable)
-                            and len(__iterable) > 0)
-
-    @property
-    def Elements(self):
-        return self
-
-    @property
-    def UniqueElements(self):
-        return frozenset(self)
-
-    def VerbatimString(self, asliteral):
-        if asliteral:
-            return f"\"{''.join(map(lambda c: c.__escaped__(), self))}\""
-        else:
-            return ''.join(self)
-
-    def __dafnystr__(self) -> str:
-        if self.isStr:
-            # This should never be true when using --unicode-char,
-            # so it is safe to assume we are a sequence of UTF-16 code units.
-            return string_from_utf_16(self)
-        return '[' + ', '.join(map(string_of, self)) + ']'
-
-    def __add__(self, other):
-        return Seq(super().__add__(other), isStr=self.isStr and other.isStr)
-
-    def __getitem__(self, key):
-        if isinstance(key, slice):
-            indices = range(*key.indices(len(self)))
-            return Seq((self[i] for i in indices), isStr=self.isStr)
-        return super().__getitem__(key)
-
-    def set(self, key, value):
-        l = list(self)
-        l[key] = value
-        return Seq(l, isStr=self.isStr)
-
-    def __hash__(self) -> int:
-        return hash(tuple(self))
-
-    def __lt__(self, other):
-        return len(self) < len(other) and self == other[:len(self)]
-
-    def __le__(self, other):
-        return len(self) <= len(other) and self == other[:len(self)]
-
-# Convenience for translation when --unicode-char is enabled
-def SeqWithoutIsStrInference(__iterable = None):
-    return Seq(__iterable, isStr = None)
-
-class Array:
-    def __init__(self, initValue, *dims):
-        def create_structure(initValue, *dims):
-            return [initValue if len(dims) <= 1 else create_structure(initValue, *dims[1:]) for _ in range(dims[0])]
-        self.dims = list(dims)
-        self.arr = create_structure(initValue, *dims)
-
-    def __dafnystr__(self) -> str:
-        return f'array{self.dims}'
-
-    def __str__(self):
-        return self.__dafnystr__()
-
-    def length(self, i):
-        return self.dims[i] if i < len(self.dims) else None
-
-    def __len__(self):
-        return self.length(0)
-
-    def __getitem__(self, key):
-        if not isinstance(key, Iterable):
-            return self.arr[key]
-        arr = self.arr
-        for i in key:
-            arr = arr[i]
-        return arr
-
-    def __setitem__(self, key, value):
-        if not isinstance(key, Iterable):
-            self.arr[key] = value
-            return
-        arr = self.arr
-        for i in range(len(key)-1):
-            arr = arr[key[i]]
-        arr[key[-1]] = value
-
-class Set(frozenset):
-    @property
-    def Elements(self):
-        return self
-
-    @property
-    def AllSubsets(self):
-        # https://docs.python.org/3/library/itertools.html#itertools-recipes
-        s = list(self)
-        return map(Set, chain.from_iterable(combinations(s, r) for r in range(len(s)+1)))
-
-    def __dafnystr__(self) -> str:
-        return '{' + ', '.join(map(string_of, self)) + '}'
-
-    def union(self, other):
-        return Set(super().union(self, other))
-
-    def intersection(self, other):
-        return Set(super().intersection(other))
-
-    def ispropersubset(self, other):
-        return self.issubset(other) and self != other
-
-    def __or__(self, other):
-        return self.union(other)
-
-    def __sub__(self, other):
-        return Set(super().__sub__(other))
-
-class MultiSet(Counter):
-    def __dafnystr__(self) -> str:
-        return 'multiset{' + ', '.join(map(string_of, self.elements())) + '}'
-
-    @property
-    def cardinality(self):
-        return reduce(lambda acc, key: acc + self[key], self, 0)
-
-    def union(self, other):
-        return MultiSet(self + other)
-
-    def __or__(self, other):
-        return self.union(other)
-
-    def intersection(self, other):
-        return MultiSet(self & other)
-
-    def __sub__(self, other):
-        return MultiSet(super().__sub__(other))
-
-    @property
-    def keys(self):
-        return Set(key for key in self if self[key] > 0)
-
-    @property
-    def Elements(self):
-        return self.elements()
-
-    @property
-    def UniqueElements(self):
-        return self.keys
-
-    def isdisjoint(self, other):
-        return frozenset(self.keys).isdisjoint(frozenset(other.keys))
-
-    def issubset(self, other):
-        return all(self[key] <= other[key] for key in frozenset(self).union(frozenset(other)))
-
-    def ispropersubset(self, other):
-        return self.issubset(other) and self.cardinality < other.cardinality
-
-    def set(self, key, value):
-        set = Counter(self)
-        set[key] = value
-        return MultiSet(set)
-
-    def __hash__(self):
-        return hash(frozenset(self.keys))
-
-    def __eq__(self, other):
-        return all(self[key] == other[key] for key in self.keys | other.keys)
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __setattr__(self, key, value):
-        raise TypeError("'Map' object is immutable")
-
-    def __contains__(self, item):
-        return self[item] > 0
-
-class Map(dict):
-    def __dafnystr__(self) -> str:
-        return 'map[' + ', '.join(map(lambda i: f'{string_of(i[0])} := {string_of(i[1])}', self.items)) + ']'
-
-    @property
-    def Elements(self):
-        return self
-
-    @property
-    def keys(self):
-        return Set(super().keys())
-
-    @property
-    def values(self):
-        return Set(super().values())
-
-    @property
-    def items(self):
-        return Set(super().items())
-
-    def set(self, key, value):
-        map = dict(self)
-        map[key] = value
-        return Map(map)
-
-    def __sub__(self, other):
-        map = dict(self)
-        for key in list(other):
-            map.pop(key, None)
-        return Map(map)
-
-    def __or__(self, other):
-        map = dict(self)
-        for k, v in other.items:
-            map[k] = v
-        return Map(map)
-
-    def __hash__(self):
-        return hash(frozenset(self))
-
-    def __setattr__(self, key, value):
-        raise TypeError("'Map' object is immutable")
-
-class BigOrdinal:
-    @staticmethod
-    def is_limit(ord):
-        return ord == 0
-
-    @staticmethod
-    def is_succ(ord):
-        return 0 < ord
-
-    @staticmethod
-    def offset(ord):
-        return ord
-
-    @staticmethod
-    def is_nat(ord):
-        # at run time, every ORDINAL is a natural number
-        return True
-
-class BigRational(Fraction):
-    def __dafnystr__(self):
-        if self.denominator == 1:
-            return f"{self.numerator}.0"
-        correction = self.divides_a_power_of_10(self.denominator)
-        if correction is None:
-            return f"({self.numerator}.0 / {self.denominator}.0)"
-        compensation, shift = correction
-        if self.numerator < 0:
-            sign, digits = "-", str(-self.numerator*compensation)
-        else:
-            sign, digits = "", str(self.numerator*compensation)
-        if shift < len(digits):
-            n = len(digits) - shift
-            return f"{sign}{digits[:n]}.{digits[n:]}"
-        return f"{sign}0.{'0' * (shift - len(digits))}{digits}"
-
-    @staticmethod
-    def isolate_factor(f, x):
-        y = 0
-        while x > 1 and x % f == 0:
-            y += 1
-            x //= f
-        return x, y
-
-    @staticmethod
-    def divides_a_power_of_10(x):
-        rem, expA = BigRational.isolate_factor(10, x)
-        if rem % 5 == 0 or rem % 2 == 0 or rem == 1:
-            major, minor = (5, 2) if rem % 5 == 0 else (2, 5)
-            rem, expB = BigRational.isolate_factor(major, rem)
-            return (minor**expB, expA+expB) if rem == 1 else None
-        return None
-
-    def __add__(self, other):
-        return BigRational(super().__add__(other))
-
-    def __sub__(self, other):
-        return BigRational(super().__sub__(other))
-
-    def __mul__(self, other):
-        return BigRational(super().__mul__(other))
-
-    def __truediv__(self, other):
-        return BigRational(super().__truediv__(other))
-
-def plus_char(a, b):
-    return chr(ord(a) + ord(b))
-
-def minus_char(a, b):
-    return chr(ord(a) - ord(b))
-
-def euclidian_division(a, b):
-    if 0 <= a:
-        if 0 <= b:
-            return a // b
-        else:
-            return -(a // (-b))
-    else:
-        if 0 <= b:
-            return -((-a-1) // b) - 1
-        else:
-            return (-a-1) // (-b) + 1
-
-def euclidian_modulus(a, b):
-    bp = abs(b)
-    if 0 <= a:
-        return a % bp
-    c = (-a) % bp
-    return c if c == 0 else bp - c
-
-@dataclass
-class HaltException(Exception):
-    message: str
-
-def quantifier(vals, frall, pred):
-    for u in vals:
-        if pred(u) != frall:
-            return not frall
-    return frall
-
-def AllBooleans():
-    return [False, True]
-
-def AllChars():
-    return (chr(i) for i in range(0x10000))
-
-def AllUnicodeChars():
-    return chain((CodePoint(chr(i)) for i in range(0xD800)), 
-                 (CodePoint(chr(i)) for i in range(0xE000, 0x11_0000)))
-
-def AllIntegers():
-    return (i//2 if i % 2 == 0 else -i//2 for i in count(0))
-
-def IntegerRange(lo, hi):
-    if lo is None:
-        return count(hi-1, -1)
-    if hi is None:
-        return count(lo)
-    return range(lo, hi)
-
-class Doubler:
-    def __init__(self, start):
-        self.start = start
-
-    def __iter__(self):
-        i = self.start
-        while True:
-            yield i
-            i *= 2
-
-class defaults:
-    bool = staticmethod(lambda: False)
-    char = staticmethod(lambda: 'D')
-    codepoint = staticmethod(lambda: CodePoint(defaults.char()))
-    int = staticmethod(lambda: 0)
-    real = staticmethod(BigRational)
-    pointer = staticmethod(lambda: None)
-    tuple = staticmethod(lambda *args: lambda: tuple(a() for a in args))
diff --git a/Source/DafnyRuntime/DafnyRuntime.h b/Source/DafnyRuntime/DafnyRuntimeCpp/DafnyRuntime.h
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntime.h
rename to Source/DafnyRuntime/DafnyRuntimeCpp/DafnyRuntime.h
diff --git a/Source/DafnyRuntime/DafnyRuntimeDafny/Makefile b/Source/DafnyRuntime/DafnyRuntimeDafny/Makefile
index 7b8e8122903..b710ef73162 100644
--- a/Source/DafnyRuntime/DafnyRuntimeDafny/Makefile
+++ b/Source/DafnyRuntime/DafnyRuntimeDafny/Makefile
@@ -6,7 +6,9 @@ SOURCE_DIR=.
 SOURCES=$(shell find $(SOURCE_DIR) -name '*.dfy')
 
 GENERATED_CODE_GO_SOURCE=src/dafnyRuntimeGo-go/src/dafny/dafny.go
-GENERATED_CODE_GO_TARGET=../DafnyRuntimeGo/DafnyRuntimeFromDafny.go
+GENERATED_CODE_GO_TARGET=../DafnyRuntimeGo/dafny/dafnyFromDafny.go
+
+all: test check-format
 
 verify:
 	$(DAFNY) verify $(SOURCES)
diff --git a/Source/DafnyRuntime/DafnyRuntimeDafny/src/dafnyRuntime.dfy b/Source/DafnyRuntime/DafnyRuntimeDafny/src/dafnyRuntime.dfy
index bab3320ce21..626efd4a111 100644
--- a/Source/DafnyRuntime/DafnyRuntimeDafny/src/dafnyRuntime.dfy
+++ b/Source/DafnyRuntime/DafnyRuntimeDafny/src/dafnyRuntime.dfy
@@ -52,14 +52,14 @@ abstract module {:options "/functionSyntax:4"} Dafny {
 
   // The limit has to be at least a little higher than zero
   // for basic logic to be valid.
-  const MIN_SIZE_T_LIMIT: nat := 128
+  ghost const MIN_SIZE_T_LIMIT: nat := 128
 
   // Ensures a minimum for SIZE_T_LIMIT.
   // Refining modules must provide a body - an empty body is enough,
   // but only works if SIZE_T_LIMIT is defined legally.
-  lemma EnsureSizeTLimitAboveMinimum() ensures MIN_SIZE_T_LIMIT <= SIZE_T_LIMIT
+  lemma {:axiom} EnsureSizeTLimitAboveMinimum() ensures MIN_SIZE_T_LIMIT <= SIZE_T_LIMIT
 
-  newtype size_t = x: nat | x < SIZE_T_LIMIT witness (EnsureSizeTLimitAboveMinimum(); 0)
+  newtype size_t = x: int | 0 <= x < SIZE_T_LIMIT witness (EnsureSizeTLimitAboveMinimum(); 0)
 
   const SIZE_T_MAX: size_t := (EnsureSizeTLimitAboveMinimum(); (SIZE_T_LIMIT - 1) as size_t)
   const ZERO_SIZE: size_t := (EnsureSizeTLimitAboveMinimum(); 0 as size_t)
@@ -154,18 +154,18 @@ abstract module {:options "/functionSyntax:4"} Dafny {
       ensures |ret.values| as size_t == size
       ensures forall i | 0 <= i < size :: ret.values[i] == values[i].value
 
-    static method {:extern} Make<T>(length: size_t) returns (ret: NativeArray<T>)
+    static method {:axiom} {:extern} Make<T>(length: size_t) returns (ret: NativeArray<T>)
       ensures ret.Valid()
       ensures fresh(ret.Repr)
       ensures ret.Length() == length
 
-    static method {:extern} MakeWithInit<T>(length: size_t, initFn: size_t -> T) returns (ret: NativeArray<T>)
+    static method {:axiom} {:extern} MakeWithInit<T>(length: size_t, initFn: size_t -> T) returns (ret: NativeArray<T>)
       ensures ret.Valid()
       ensures fresh(ret.Repr)
       ensures ret.Length() == length
       ensures ret.values == seq(length, ((i: nat) requires 0 <= i < length as nat => Set(initFn(i as size_t))))
 
-    static method {:extern} Copy<T>(other: ImmutableArray<T>) returns (ret: NativeArray<T>)
+    static method {:axiom} {:extern} Copy<T>(other: ImmutableArray<T>) returns (ret: NativeArray<T>)
       ensures ret.Valid()
       ensures fresh(ret.Repr)
       ensures ret.values == other.CellValues()
@@ -222,9 +222,9 @@ abstract module {:options "/functionSyntax:4"} Dafny {
       && storage.Repr <= Repr
       && this !in storage.Repr
       && storage.Valid()
-         // TODO: This is equivalent to the above four clauses
-         // but I believe it doesn't get unrolled enough.
-         // && ValidComponent(storage)
+      // TODO: This is equivalent to the above four clauses
+      // but I believe it doesn't get unrolled enough.
+      // && ValidComponent(storage)
       && 0 <= size <= storage.Length()
       && forall i | 0 <= i < size :: storage.values[i].Set?
     }
@@ -362,12 +362,12 @@ abstract module {:options "/functionSyntax:4"} Dafny {
 
     ghost predicate Valid()
 
-    static method {:extern} Make(ghost inv: T -> bool, t: T) returns (ret: AtomicBox<T>)
+    static method {:axiom} {:extern} Make(ghost inv: T -> bool, t: T) returns (ret: AtomicBox<T>)
       requires inv(t)
       ensures ret.Valid()
       ensures ret.inv == inv
 
-    method {:extern} Get() returns (t: T)
+    method {:axiom} {:extern} Get() returns (t: T)
       requires Valid()
       ensures inv(t)
 
@@ -487,7 +487,7 @@ abstract module {:options "/functionSyntax:4"} Dafny {
     // targets, too) relies on the method being an instance method, there's a mismatch.
     // Thus, for now, the best way to proceed seems to be to include the additional type
     // parameter X here.
-    function {:extern} UniqueElements<X(==)>(ghost f: T -> X): set<X>
+    function {:axiom} {:extern} UniqueElements<X(==)>(ghost f: T -> X): set<X>
       requires Valid() /* AND X==T AND f is the identity function, see above */
       ensures UniqueElements(f) == set t | t in Value() :: f(t)
 
@@ -746,7 +746,7 @@ abstract module {:options "/functionSyntax:4"} Dafny {
     }
   }
 
-  method {:tailrecursion} {:vcs_split_on_every_assert} AppendOptimized<T>(builder: Vector<T>, e: Sequence<T>, stack: Vector<Sequence<T>>)
+  method {:tailrecursion} {:isolate_assertions} AppendOptimized<T>(builder: Vector<T>, e: Sequence<T>, stack: Vector<Sequence<T>>)
     requires e.Valid()
     requires builder.Valid()
     requires stack.Valid()
diff --git a/Source/DafnyRuntime/DafnyRuntimeDafny/test/dafnyRuntimeFeasibility.dfy b/Source/DafnyRuntime/DafnyRuntimeDafny/test/dafnyRuntimeFeasibility.dfy
index 9aa10177bd8..7ec05003dea 100644
--- a/Source/DafnyRuntime/DafnyRuntimeDafny/test/dafnyRuntimeFeasibility.dfy
+++ b/Source/DafnyRuntime/DafnyRuntimeDafny/test/dafnyRuntimeFeasibility.dfy
@@ -193,14 +193,14 @@ module {:options "/functionSyntax:4"} FeasibilityImplementation refines Dafny {
       this.value := value;
     }
 
-    method {:extern} Get() returns (t: T)
+    method {:axiom} Get() returns (t: T) // Axiom is needed because this incorrectly inherits {:extern}
       requires Valid()
       ensures inv(t)
     {
       return value;
     }
 
-    method {:extern} Put(t: T)
+    method {:axiom} Put(t: T) // Axiom is needed because this incorrectly inherits {:extern}
       requires Valid()
       requires inv(t)
     {
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo-gomod/Makefile b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/Makefile
new file mode 100644
index 00000000000..ffd599fd40c
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/Makefile
@@ -0,0 +1,20 @@
+
+# Invoking the CLI this way just to stay platform-independent
+DAFNY = dotnet run --project ../../Dafny --no-build --
+
+GENERATED_SYSTEM_MODULE_SOURCE=../obj/systemModulePopulator-go/System_/System_.go
+GENERATED_SYSTEM_MODULE_TARGET=System_/System_.go
+
+all: check-system-module test
+
+test:
+	cd dafny &&	GO111MODULE=auto go test
+
+build-system-module:
+	$(DAFNY) translate go --go-module-name System --no-verify --allow-warnings --use-basename-for-filename --system-module:OmitAllOtherModules ../systemModulePopulator.dfy --output:../obj/systemModulePopulator
+
+check-system-module: build-system-module
+	diff $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
+
+update-system-module: build-system-module
+	cp $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo-gomod/README.md b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/README.md
new file mode 100644
index 00000000000..c7d3a5f15b4
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/README.md
@@ -0,0 +1,9 @@
+# DafnyRuntimeGo-gomod
+
+This directory holds the DafnyRuntimeGo library code compatible with Go modules. We need this apart from the regular
+`DafnyRuntimeGo` because the compiler supports generating code in both formats - GoPath and GoModule. In long term, this
+should be published as an independent Go module: https://github.com/dafny-lang/dafny/issues/494 .
+
+This has been checked in to provide the library for testing and can serve as source-of-truth for publishing the final
+GoModule. And once compiler has deprecated the support for GoPath, we should remove the existing `DafnyRuntimeGo` and
+drop the `-gomod` from this directory to make it the sole runtime for Go.
\ No newline at end of file
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo-gomod/System_/System_.go b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/System_/System_.go
new file mode 100644
index 00000000000..26534ed77c4
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/System_/System_.go
@@ -0,0 +1,56 @@
+// Package _System
+// Dafny module _System compiled into Go
+
+package _System
+
+import (
+	os "os"
+
+	_dafny "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny"
+)
+
+var _ = os.Args
+var _ _dafny.Dummy__
+
+type Dummy__ struct{}
+
+// Definition of class Nat
+type Nat struct {
+}
+
+func New_Nat_() *Nat {
+	_this := Nat{}
+
+	return &_this
+}
+
+type CompanionStruct_Nat_ struct {
+}
+
+var Companion_Nat_ = CompanionStruct_Nat_{}
+
+func (*Nat) String() string {
+	return "_System.Nat"
+}
+
+// End of class Nat
+
+func Type_Nat_() _dafny.TypeDescriptor {
+	return type_Nat_{}
+}
+
+type type_Nat_ struct {
+}
+
+func (_this type_Nat_) Default() interface{} {
+	return _dafny.Zero
+}
+
+func (_this type_Nat_) String() string {
+	return "_System.Nat"
+}
+func (_this *CompanionStruct_Nat_) Is_(__source _dafny.Int) bool {
+	var _0_x _dafny.Int = (__source)
+	_ = _0_x
+	return (_0_x).Sign() != -1
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo-gomod/dafny/dafny.go b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/dafny/dafny.go
new file mode 100644
index 00000000000..3aa9f1459f5
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/dafny/dafny.go
@@ -0,0 +1,3176 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+
+package dafny
+
+import (
+	"fmt"
+	big "math/big"
+	"os"
+	refl "reflect"
+	"runtime"
+	"unicode/utf8"
+)
+
+func FromMainArguments(args []string) Sequence {
+	var size = len(args)
+	var dafnyArgs []interface{} = make([]interface{}, size)
+	for i, item := range args {
+		dafnyArgs[i] = SeqOfString(item)
+	}
+	return SeqOf(dafnyArgs...)
+}
+
+func UnicodeFromMainArguments(args []string) Sequence {
+	var size = len(args)
+	var dafnyArgs []interface{} = make([]interface{}, size)
+	for i, item := range args {
+		dafnyArgs[i] = UnicodeSeqOfUtf8Bytes(item)
+	}
+	return SeqOf(dafnyArgs...)
+}
+
+/******************************************************************************
+ * Generic values
+ ******************************************************************************/
+
+// An EqualsGeneric can be compared to any other object.  This method should
+// *only* return true when the other value is of the same type.
+type EqualsGeneric interface {
+	EqualsGeneric(other interface{}) bool
+}
+
+// AreEqual compares two values for equality in a generic way.  Besides the
+// refl.DeepEqual logic (to which this method defers as a last resort), the
+// values are handled intelligently if their type is refl.Value or any type that
+// implements the EqualsGeneric interface.
+func AreEqual(x, y interface{}) bool {
+	if IsDafnyNull(x) {
+		return IsDafnyNull(y)
+	}
+	if IsDafnyNull(y) {
+		return false
+	}
+	switch x := x.(type) {
+	case refl.Value:
+		{
+			y, ok := y.(refl.Value)
+			return ok && x.CanInterface() && y.CanInterface() &&
+				AreEqual(x.Interface(), y.Interface())
+		}
+	case EqualsGeneric:
+		return x.EqualsGeneric(y)
+	default:
+		return refl.DeepEqual(x, y)
+	}
+}
+
+func IsDafnyNull(x interface{}) bool {
+	if x == nil {
+		return true
+	}
+	v := refl.ValueOf(x)
+	if v.Kind() == refl.Ptr {
+		return v.IsNil()
+	}
+	return false
+}
+
+func isNil(v refl.Value) bool {
+	switch v.Kind() {
+	case refl.Chan, refl.Func, refl.Map, refl.Ptr, refl.Slice:
+		return v.IsNil()
+	case refl.Interface:
+		return v.IsNil() || v.Elem().IsNil()
+	default:
+		return false
+	}
+}
+
+// String formats the given value using fmt.Sprint, unless it's nil, in which
+// case it formats it as "null" to conform to other languages' output.
+func String(x interface{}) string {
+	if x == nil {
+		return "null"
+	}
+	v := refl.ValueOf(x)
+	if isNil(v) {
+		return "null"
+	}
+	if v.Kind() == refl.Func {
+		return v.Type().String()
+	}
+	return fmt.Sprint(x)
+}
+
+// Print prints the given value using fmt.Print, formatted using String.
+func Print(x interface{}) {
+	fmt.Print(String(x))
+}
+
+// SetFinalizer is a re-export of runtime.SetFinalizer.  Included here so that
+// only this module needs to be imported by every Dafny module.
+func SetFinalizer(x interface{}, f interface{}) {
+	runtime.SetFinalizer(x, f)
+}
+
+/******************************************************************************
+ * Run-time type descriptors (RTDs)
+ ******************************************************************************/
+
+// A TypeDescriptor has the ability to produce a default value for an associated type.
+type TypeDescriptor interface {
+	Default() interface{}
+}
+
+func CreateStandardTypeDescriptor(value interface{}) TypeDescriptor {
+	return standardTypeDescriptor{value}
+}
+
+type standardTypeDescriptor struct {
+	defaultValue interface{}
+}
+
+func (rtd standardTypeDescriptor) Default() interface{} {
+	return rtd.defaultValue
+}
+
+// IntType is the RTD for int
+var IntType = CreateStandardTypeDescriptor(Zero)
+
+// BoolType is the RTD of bool
+var BoolType = CreateStandardTypeDescriptor(false)
+
+// CharType is the RTD of char
+var CharType = CreateStandardTypeDescriptor(Char('D')) // See CharType.DefaultValue in Dafny source code
+
+// CodePointType is the RTD of char
+var CodePointType = CreateStandardTypeDescriptor(CodePoint('D')) // See CharType.DefaultValue in Dafny source code
+
+// RealType is the RTD for real
+var RealType = CreateStandardTypeDescriptor(ZeroReal)
+
+// Int64Type is the RTD of int64.
+var Int64Type = CreateStandardTypeDescriptor(int64(0))
+
+// PossiblyNullType is the RTD of any possibly null reference type
+var PossiblyNullType = CreateStandardTypeDescriptor((*interface{})(nil))
+
+// Uint8Type is the RTD of uint8
+var Uint8Type = CreateStandardTypeDescriptor(uint8(0))
+
+// Uint16Type is the RTD of uint16
+var Uint16Type = CreateStandardTypeDescriptor(uint16(0))
+
+// Uint32Type is the RTD of uint32
+var Uint32Type = CreateStandardTypeDescriptor(uint32(0))
+
+// Uint64Type is the RTD of uint64
+var Uint64Type = CreateStandardTypeDescriptor(uint64(0))
+
+// SetType is the RTD for sets
+var SetType = CreateStandardTypeDescriptor(EmptySet)
+
+// MultiSetType is the RTD for multisets
+var MultiSetType = CreateStandardTypeDescriptor(EmptyMultiSet)
+
+// SeqType is the RTD for sequences
+var SeqType = CreateStandardTypeDescriptor(EmptySeq)
+
+// MapType is the RTD for maps
+var MapType = CreateStandardTypeDescriptor(EmptyMap)
+
+/******************************************************************************
+ * Trait parent information
+ ******************************************************************************/
+
+// Every class gets compiled to have a ParentTraits_ method, which returns the
+// list of Dafny parent traits (including transitive parent traits). This is
+// used to determine, at run time, if a given object satisfies a particular trait.
+// While it is unusual that this information is needed, it is needed in a situation
+// like
+//   var s: set<UberTrait> := ...
+//   // the following line requires run-time check that t (of type UberTrait) is a Trait
+//   var ts := set t: Trait | t in s;
+// A more straightforward situation is the expression
+//   x is Trait
+
+type TraitID struct {
+	dummy byte
+}
+
+type TraitOffspring interface {
+	ParentTraits_() []*TraitID
+}
+
+func InstanceOfTrait(obj TraitOffspring, trait *TraitID) bool {
+	for _, parent := range obj.ParentTraits_() {
+		if parent == trait {
+			return true
+		}
+	}
+	return false
+}
+
+// Use this method to test if an object "p" has a given class type (denoted by the
+// type of "q"). More generally, this method returns true if p and q are of the
+// same type. It is assumed that neither "p" nor "q" denotes a Dafny "null" value.
+
+func InstanceOf(p interface{}, q interface{}) bool {
+	return refl.TypeOf(p) == refl.TypeOf(q)
+}
+
+/******************************************************************************
+ * Object
+ ******************************************************************************/
+
+type Object struct {
+	dummy byte
+}
+
+func New_Object() *Object {
+	_this := Object{}
+	return &_this
+}
+
+func (_this *Object) Equals(other *Object) bool {
+	return _this == other
+}
+
+func (_this *Object) EqualsGeneric(x interface{}) bool {
+	other, ok := x.(*Object)
+	return ok && _this.Equals(other)
+}
+
+func (*Object) String() string {
+	return "object"
+}
+
+func (_this *Object) ParentTraits_() []*TraitID {
+	return [](*TraitID){}
+}
+
+var _ TraitOffspring = &Object{}
+
+/******************************************************************************
+ * Characters
+ ******************************************************************************/
+
+// A Char is a rune in a wrapper so that we can detect it and treat it
+// distinctly from int32.
+type Char rune
+
+func (char Char) String() string {
+	return fmt.Sprintf("%c", rune(char))
+}
+
+// AllChars returns an iterator that returns all 16-bit characters.
+func AllChars() Iterator {
+	c := int32(0)
+	return func() (interface{}, bool) {
+		if c >= 0x10000 {
+			return -1, false
+		} else {
+			ans := Char(c)
+			c++
+			return ans, true
+		}
+	}
+}
+
+type CodePoint rune
+
+func (cp CodePoint) Escape() string {
+	switch rune(cp) {
+	case '\n':
+		return "\\n"
+	case '\r':
+		return "\\r"
+	case '\t':
+		return "\\t"
+	case '\x00':
+		return "\\0"
+	case '\'':
+		return "\\'"
+	case '"':
+		return "\\\""
+	case '\\':
+		return "\\\\"
+	default:
+		return fmt.Sprintf("%c", rune(cp))
+	}
+}
+
+func (cp CodePoint) String() string {
+	return fmt.Sprintf("'%s'", cp.Escape())
+}
+
+// AllUnicodeChars returns an iterator that returns all Unicode scalar values.
+func AllUnicodeChars() Iterator {
+	c := int32(0)
+	return func() (interface{}, bool) {
+		if c >= 0x11_0000 {
+			return -1, false
+		} else {
+			if c == 0xD800 {
+				// Skip over the surrogates
+				c = 0xE000
+			}
+			ans := CodePoint(c)
+			c++
+			return ans, true
+		}
+	}
+}
+
+/******************************************************************************
+ * Slices
+ ******************************************************************************/
+
+func sliceEquals(s1, s2 []interface{}) bool {
+	return len(s1) == len(s2) && sliceIsPrefixAfterLengthCheck(s1, s2)
+}
+
+func sliceIsPrefixOf(s1, s2 []interface{}) bool {
+	return len(s1) <= len(s2) && sliceIsPrefixAfterLengthCheck(s1, s2)
+}
+
+func sliceIsProperPrefixOf(s1, s2 []interface{}) bool {
+	return len(s1) < len(s2) && sliceIsPrefixAfterLengthCheck(s1, s2)
+}
+
+func sliceIsPrefixAfterLengthCheck(s1, s2 []interface{}) bool {
+	for i, v := range s1 {
+		if !(AreEqual(v, s2[i])) {
+			return false
+		}
+	}
+	return true
+}
+
+func sliceContains(s []interface{}, value interface{}) bool {
+	for _, v := range s {
+		if AreEqual(v, value) {
+			return true
+		}
+	}
+	return false
+}
+
+// Iterator returns an iterator over the sequence.
+func sliceIterator(s []interface{}) Iterator {
+	i := 0
+	n := len(s)
+	return func() (interface{}, bool) {
+		if i >= n {
+			return nil, false
+		}
+		ans := s[i]
+		i++
+		return ans, true
+	}
+}
+
+func stringOfElements(iter interface{}) string {
+	str := ""
+	sep := ""
+	for i := Iterate(iter); ; {
+		v, ok := i()
+		if !ok {
+			break
+		}
+
+		str += sep
+		str += String(v)
+		sep = ", "
+	}
+	return str
+}
+
+/******************************************************************************
+ * Iteration
+ ******************************************************************************/
+
+// An Iterator is a function that can be called multiple times to get successive
+// values, until the second value returned is false.
+type Iterator = func() (interface{}, bool)
+
+// An Iterable can produce an iterator, which we represent as a function which
+// can be called to get successive values.
+type Iterable interface {
+	Iterator() Iterator
+}
+
+// Iterate gets an iterator from a value that is either an iterator or an
+// iterable.
+func Iterate(over interface{}) Iterator {
+	switch over := over.(type) {
+	case Iterator:
+		return over
+	case Iterable:
+		return over.Iterator()
+	default:
+		if refl.TypeOf(over).Kind() != refl.Slice {
+			panic(fmt.Errorf("Not iterable: %v", over))
+		} else {
+			return anySliceIterator(over)
+		}
+	}
+}
+
+func anySliceIterator(slice interface{}) Iterator {
+	val := refl.ValueOf(slice)
+	n := val.Len()
+	i := 0
+	return func() (interface{}, bool) {
+		if i >= n {
+			return nil, false
+		} else {
+			ans := val.Index(i).Interface()
+			i++
+			return ans, true
+		}
+	}
+}
+
+// Quantifier calculates whether a predicate holds either for all values yielded
+// by an iterator or for at least one.
+func Quantifier(iter interface{}, isForAll bool, pred interface{}) bool {
+	predVal := refl.ValueOf(pred)
+
+	for i := Iterate(iter); ; {
+		v, ok := i()
+		if !ok {
+			return isForAll
+		}
+		if predVal.Call([]refl.Value{refl.ValueOf(v)})[0].Interface() != isForAll {
+			return !isForAll
+		}
+	}
+}
+
+// SingleValue produces an iterator that yields only a single value.
+func SingleValue(value interface{}) Iterator {
+	done := false
+	return func() (interface{}, bool) {
+		if done {
+			return nil, false
+		} else {
+			done = true
+			return value, true
+		}
+	}
+}
+
+// AllBooleans returns an iterator that returns false, then returns true.
+func AllBooleans() Iterator {
+	phase := 0
+	return func() (interface{}, bool) {
+		switch phase {
+		case 0:
+			phase = 1
+			return false, true
+		case 1:
+			phase = 2
+			return true, true
+		default:
+			return false, false
+		}
+	}
+}
+
+/******************************************************************************
+ * Sequences
+ ******************************************************************************/
+
+// The sequence type is now defined in dafnyRuntime.dfy instead.
+// These declarations are just filling in the gaps to make sure
+// Dafny.Sequence is a well-behaved Dafny value in this runtime.
+
+// EmptySeq is the empty sequence.
+var EmptySeq = SeqOf()
+
+// Create a sequence from a length and an element initializer
+// This still exists because it's technically difficult
+// for the compiler to coerce the init function to a
+// func (uint32) interface{}.
+func SeqCreate(n uint32, init func(Int) interface{}) Sequence {
+	return Companion_Sequence_.Create(n, func(index uint32) interface{} {
+		return init(IntOfUint32(index))
+	})
+}
+
+func SeqFromArray(contents []interface{}, isString bool) Sequence {
+	arr := GoNativeArray{
+		contents: contents,
+	}
+	result := New_ArraySequence_()
+	result.Ctor__(arr, isString)
+	return result
+}
+
+// SeqOf returns a sequence containing the given values.
+func SeqOf(values ...interface{}) Sequence {
+	// Making a defensive copy here because variadic functions can get hinky
+	// if someone says SeqOf(slice...) and then mutates slice.
+	arr := make([]interface{}, len(values))
+	copy(arr, values)
+	return SeqFromArray(arr, false)
+}
+
+// SeqOfChars returns a sequence containing the given character values.
+func SeqOfChars(values ...Char) Sequence {
+	arr := make([]interface{}, len(values))
+	for i, v := range values {
+		arr[i] = v
+	}
+	return SeqFromArray(arr, true)
+}
+
+func SeqOfBytes(values []byte) Sequence {
+	arr := make([]interface{}, len(values))
+	for i, v := range values {
+		arr[i] = v
+	}
+	return SeqFromArray(arr, false)
+}
+
+// SeqOfString converts the given string into a sequence of characters.
+// The given string must contain only ASCII characters!
+func SeqOfString(str string) Sequence {
+	// Need to make sure the elements of the array are Chars
+	arr := make([]interface{}, len(str))
+	for i, v := range str {
+		arr[i] = Char(v)
+	}
+	return SeqFromArray(arr, true)
+}
+
+func UnicodeSeqOfUtf8Bytes(str string) Sequence {
+	// Need to make sure the elements of the array are CodePoints
+	arr := make([]interface{}, utf8.RuneCountInString(str))
+	i := 0
+	for _, v := range str {
+		arr[i] = CodePoint(v)
+		i++
+	}
+	return SeqFromArray(arr, false)
+}
+
+// Iterator returns an iterator over the sequence.
+// This could be implemented more efficiently
+// in the source Dafny code in the future,
+// by traversing the Sequence node structure rather than
+// forcing the lazy evaluation,
+// but will involve defining an Iterator trait of some kind.
+func SequenceIterator(seq Sequence) Iterator {
+	var i uint32 = 0
+	n := seq.Cardinality()
+	return func() (interface{}, bool) {
+		if i >= n {
+			return nil, false
+		}
+		ans := seq.Select(i)
+		i++
+		return ans, true
+	}
+}
+
+// Unfortunately when we want to provide a single common definition
+// for a trait function, we have to take care of the indirection
+// from the concrete structs to the trait implementation ourselves.
+// Ideally there would be a way of telling Dafny
+// an {:extern} trait method will be specifically implemented at the trait level
+// so the compiler could do this for us.
+func (seq *ArraySequence) Iterator() Iterator {
+	return SequenceIterator(seq)
+}
+func (seq *ConcatSequence) Iterator() Iterator {
+	return SequenceIterator(seq)
+}
+func (seq *LazySequence) Iterator() Iterator {
+	return SequenceIterator(seq)
+}
+
+// UniqueElements returns the set of elements in the sequence.
+// This should be in Dafny eventually but for now it's much more efficient
+// and convenient here.
+func (seq *ArraySequence) UniqueElements() Set {
+	return NewBuilderOf(seq).ToSet()
+}
+func (seq *ConcatSequence) UniqueElements() Set {
+	return NewBuilderOf(seq).ToSet()
+}
+func (seq *LazySequence) UniqueElements() Set {
+	return NewBuilderOf(seq).ToSet()
+}
+
+func SequenceString(seq Sequence) string {
+	if seq.IsString() {
+		s := ""
+		// FIXME: Note this doesn't produce the right string in UTF-8,
+		// since it converts surrogates independently.
+		for i := Iterate(seq); ; {
+			c, ok := i()
+			if !ok {
+				break
+			}
+			s += c.(Char).String()
+		}
+		return s
+	} else {
+		return "[" + stringOfElements(seq) + "]"
+	}
+}
+func (seq *ArraySequence) String() string {
+	return SequenceString(seq)
+}
+func (seq *ConcatSequence) String() string {
+	return SequenceString(seq)
+}
+func (seq *LazySequence) String() string {
+	return SequenceString(seq)
+}
+
+func SequenceVerbatimString(seq Sequence, asLiteral bool) string {
+	s := ""
+	if asLiteral {
+		s += "\""
+	}
+	for i := Iterate(seq); ; {
+		c, ok := i()
+		if !ok {
+			break
+		}
+
+		if asLiteral {
+			s += c.(CodePoint).Escape()
+		} else {
+			s += fmt.Sprintf("%c", c.(CodePoint))
+		}
+	}
+	if asLiteral {
+		s += "\""
+	}
+	return s
+}
+func (seq *ArraySequence) VerbatimString(asLiteral bool) string {
+	return SequenceVerbatimString(seq, asLiteral)
+}
+func (seq *ConcatSequence) VerbatimString(asLiteral bool) string {
+	return SequenceVerbatimString(seq, asLiteral)
+}
+func (seq *LazySequence) VerbatimString(asLiteral bool) string {
+	return SequenceVerbatimString(seq, asLiteral)
+}
+
+func (seq *ArraySequence) Equals(other Sequence) bool {
+	return Companion_Sequence_.Equal(seq, other)
+}
+func (seq *ConcatSequence) Equals(other Sequence) bool {
+	return Companion_Sequence_.Equal(seq, other)
+}
+func (seq *LazySequence) Equals(other Sequence) bool {
+	return Companion_Sequence_.Equal(seq, other)
+}
+
+func (seq *ArraySequence) EqualsGeneric(x interface{}) bool {
+	other, ok := x.(Sequence)
+	return ok && Companion_Sequence_.Equal(seq, other)
+}
+func (seq *ConcatSequence) EqualsGeneric(x interface{}) bool {
+	other, ok := x.(Sequence)
+	return ok && Companion_Sequence_.Equal(seq, other)
+}
+func (seq *LazySequence) EqualsGeneric(x interface{}) bool {
+	other, ok := x.(Sequence)
+	return ok && Companion_Sequence_.Equal(seq, other)
+}
+
+func (seq *ArraySequence) ToByteArray() []byte {
+	return ToByteArray(seq)
+}
+func (seq *ConcatSequence) ToByteArray() []byte {
+	return ToByteArray(seq)
+}
+func (seq *LazySequence) ToByteArray() []byte {
+	return ToByteArray(seq)
+}
+
+func ToByteArray(x Sequence) []byte {
+	nativeArray := x.ToArray().(GoNativeArray)
+	arr := make([]byte, len(nativeArray.contents))
+	for i, v := range nativeArray.contents {
+		arr[i] = v.(byte)
+	}
+	return arr
+}
+
+/******************************************************************************
+ * Arrays
+ ******************************************************************************/
+
+// A GoNativeArray is a single dimensional Go slice,
+// wrapped up for the benefit of dafnyRuntime.dfy.
+// We should refactor to wrap an Array interface as defined below
+// to get the same optimization benefits for sequences of bytes and chars/CodePoints.
+type GoNativeArray struct {
+	contents []interface{}
+}
+
+func (CompanionStruct_NativeArray_) Make(length uint32) NativeArray {
+	contents := make([]interface{}, length)
+	return GoNativeArray{
+		contents: contents,
+	}
+}
+
+func (CompanionStruct_NativeArray_) MakeWithInit(length uint32, init func(uint32) interface{}) NativeArray {
+	contents := make([]interface{}, length)
+	for i := uint32(0); i < length; i++ {
+		contents[i] = init(i)
+	}
+	return GoNativeArray{
+		contents: contents,
+	}
+}
+
+func (CompanionStruct_NativeArray_) Copy(other ImmutableArray) NativeArray {
+	otherArray := other.(GoNativeArray)
+	contents := make([]interface{}, otherArray.Length())
+	copy(contents, otherArray.contents)
+	return GoNativeArray{
+		contents: contents,
+	}
+}
+
+func (array GoNativeArray) Length() uint32 {
+	return uint32(len(array.contents))
+}
+
+func (array GoNativeArray) Select(i uint32) interface{} {
+	return array.contents[i]
+}
+
+func (array GoNativeArray) Update(i uint32, t interface{}) {
+	array.contents[i] = t
+}
+
+func (array GoNativeArray) UpdateSubarray(i uint32, other ImmutableArray) {
+	otherArray := other.(GoNativeArray)
+	copy(array.contents[i:(i+otherArray.Length())], otherArray.contents)
+}
+
+func (array GoNativeArray) Freeze(size uint32) ImmutableArray {
+	return array.Subarray(0, size)
+}
+
+func (array GoNativeArray) Subarray(lo uint32, hi uint32) ImmutableArray {
+	return GoNativeArray{
+		contents: array.contents[lo:hi],
+	}
+}
+
+func (array GoNativeArray) String() string {
+	return "dafny.GoNativeArray"
+}
+
+// Array is the general interface for arrays. Conceptually, it contains some
+// underlying storage (a slice) of elements, together with a record of the length
+// of each dimension. Thus, this general interface supports 1- and multi-dimensional
+// Dafny arrays.
+//
+// All array indices are given as the Go type "int". This is what the Dafny implementation
+// refers to as "target-language array-index type". However, the dimension lengths
+// are given as "big.Int".
+
+type Array interface {
+	dimensionCount() int
+	dimensionLength(dim int) int
+	ArrayGet1(index int) interface{}
+	ArraySet1(value interface{}, index int)
+	anySlice(lo, hi Int) []interface{}
+	// specializations
+	ArrayGet1Byte(index int) byte
+	ArraySet1Byte(value byte, index int)
+	ArrayGet1Char(index int) Char
+	ArraySet1Char(value Char, index int)
+	ArrayGet1CodePoint(index int) CodePoint
+	ArraySet1CodePoint(value CodePoint, index int)
+}
+
+/***** newArray *****/
+
+// Multiply the numbers in "dims" and return the product as an "int".
+// If the product doesn't fit in an "int", panic with the message that the
+// array-size limit has been exceeded.
+// It is expected that len(dims) is at least 1 and that each number in
+// dims is non-negative.
+func computeTotalArrayLength(dims ...Int) int {
+	product := dims[0]
+	for i := 1; i < len(dims); i++ {
+		product = product.Times(dims[i])
+	}
+	if IntOf(0x8000_0000).Cmp(product) <= 0 {
+		panic(fmt.Sprintf("array size exceeds memory limit: %v", String(product)))
+	}
+	totalLength := product.Int()
+	return totalLength
+}
+
+// NewArrayFromExample returns a new Array.
+// If "init" is non-nil, it is used to initialize all elements of the array.
+// "example" is used only to figure out the right kind of Array to return.
+// If "init" is non-nil, the types of "example" and "init" must agree.
+// All numbers in "dims" are expected to be non-negative and "len(dims)" is
+// expected to be at least 1 (this is not checked). The function checks that
+// the product of the numbers in "dims" lies within the limit of what array
+// lengths are supported; the code will panic if the limit is exceeded.
+func NewArrayFromExample(example interface{}, init interface{}, dims ...Int) Array {
+	numberOfDimensions := len(dims)
+	intDims := make([]int, len(dims))
+	totalLength := computeTotalArrayLength(dims...)
+	// If the previous line does not panic, then the .Int() conversions in
+	// the following loop will succeed.
+	for d := 0; d < numberOfDimensions; d++ {
+		intDims[d] = dims[d].Int()
+	}
+
+	if totalLength == 0 {
+		return newZeroLengthArray(intDims)
+	}
+
+	// Inspect the type of "example" to consider Array specialization
+	if _, ok := example.(byte); ok {
+		arr := make([]byte, totalLength)
+		if init != nil {
+			x := init.(byte)
+			for i := range arr {
+				arr[i] = x
+			}
+		}
+		return &arrayForByte{
+			contents: arr,
+			dims:     intDims,
+		}
+	}
+	if _, ok := example.(Char); ok {
+		arr := make([]Char, totalLength)
+		if init != nil {
+			x := init.(Char)
+			for i := range arr {
+				arr[i] = x
+			}
+		}
+		return &arrayForChar{
+			contents: arr,
+			dims:     intDims,
+		}
+	}
+	if _, ok := example.(CodePoint); ok {
+		arr := make([]CodePoint, totalLength)
+		if init != nil {
+			x := init.(CodePoint)
+			for i := range arr {
+				arr[i] = x
+			}
+		}
+		return &arrayForCodePoint{
+			contents: arr,
+			dims:     intDims,
+		}
+	}
+
+	// Use the default representation
+	arr := make([]interface{}, totalLength)
+	if init != nil {
+		for i := range arr {
+			arr[i] = init
+		}
+	}
+	return &arrayStruct{
+		contents: arr,
+		dims:     intDims,
+	}
+}
+
+func newZeroLengthArray(intDims []int) Array {
+	// Use the default representation
+	return &arrayStruct{
+		contents: nil,
+		dims:     intDims,
+	}
+}
+
+// newArrayWithValues returns a new one-dimensional Array with the given initial
+// values. It is only used internally, by *Builder.ToArray().
+func newArrayWithValues(values ...interface{}) Array {
+	totalLength := len(values)
+	intDims := []int{totalLength}
+	if totalLength == 0 {
+		return newZeroLengthArray(intDims)
+	}
+
+	// Inspect the type of "values[0]" to consider Array specialization
+	if _, ok := values[0].(byte); ok {
+		arr := make([]byte, totalLength)
+		for i := range arr {
+			arr[i] = values[i].(byte)
+		}
+		return &arrayForByte{
+			contents: arr,
+			dims:     intDims,
+		}
+	}
+	if _, ok := values[0].(Char); ok {
+		arr := make([]Char, totalLength)
+		for i := range arr {
+			arr[i] = values[i].(Char)
+		}
+		return &arrayForChar{
+			contents: arr,
+			dims:     intDims,
+		}
+	}
+
+	// Use the default representation
+	arr := make([]interface{}, totalLength)
+	copy(arr, values)
+	return &arrayStruct{
+		contents: arr,
+		dims:     intDims,
+	}
+}
+
+// NewArrayWithValue returns a new Array full of the given initial value.
+func NewArrayWithValue(init interface{}, dims ...Int) Array {
+	return NewArrayFromExample(init, init, dims...)
+}
+
+// NewArray returns a new Array full of the default value of the given type.
+func NewArray(dims ...Int) Array {
+	return NewArrayFromExample(nil, nil, dims...)
+}
+
+/***** arrayStruct is default implementation of the Array interface. *****/
+
+type arrayStruct struct {
+	contents []interface{} // stored as a flat one-dimensional slice
+	dims     []int
+}
+
+func (_this arrayStruct) dimensionCount() int {
+	return len(_this.dims)
+}
+
+func (_this arrayStruct) dimensionLength(dim int) int {
+	return _this.dims[dim]
+}
+
+func (_this arrayStruct) ArrayGet1(index int) interface{} {
+	return _this.contents[index]
+}
+
+func (_this arrayStruct) ArraySet1(value interface{}, index int) {
+	_this.contents[index] = value
+}
+
+func (_this arrayStruct) ArrayGet1Byte(index int) byte {
+	panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) ArraySet1Byte(value byte, index int) {
+	panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) ArrayGet1Char(index int) Char {
+	panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) ArraySet1Char(value Char, index int) {
+	panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) ArrayGet1CodePoint(index int) CodePoint {
+	panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) ArraySet1CodePoint(value CodePoint, index int) {
+	panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) anySlice(lo, hi Int) []interface{} {
+	if lo.IsNilInt() && hi.IsNilInt() {
+		return _this.contents
+	}
+	if lo.IsNilInt() {
+		return _this.contents[:hi.Int()]
+	}
+	if hi.IsNilInt() {
+		return _this.contents[lo.Int():]
+	}
+	return _this.contents[lo.Int():hi.Int()]
+}
+
+// arrayStruct implements the EqualsGeneric interface.
+func (_this arrayStruct) EqualsGeneric(other interface{}) bool {
+	otherArray, ok := other.(*arrayStruct)
+	if !ok {
+		return false
+	}
+	// In the next line, we're sure to compare the references, not the addresses of the arrayStruct's.
+	return &_this.dims[0] == &otherArray.dims[0]
+}
+
+/***** arrayForByte is the Array interface specialized for byte. *****/
+
+type arrayForByte struct {
+	contents []byte // stored as a flat one-dimensional slice
+	dims     []int
+}
+
+func (_this arrayForByte) dimensionCount() int {
+	return len(_this.dims)
+}
+
+func (_this arrayForByte) dimensionLength(dim int) int {
+	return _this.dims[dim]
+}
+
+func (_this arrayForByte) ArrayGet1(index int) interface{} {
+	return _this.contents[index]
+}
+
+func (_this arrayForByte) ArraySet1(value interface{}, index int) {
+	_this.contents[index] = value.(byte)
+}
+
+func (_this arrayForByte) ArrayGet1Byte(index int) byte {
+	return _this.contents[index]
+}
+
+func (_this arrayForByte) ArraySet1Byte(value byte, index int) {
+	_this.contents[index] = value
+}
+
+func (_this arrayForByte) ArrayGet1Char(index int) Char {
+	panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForByte) ArraySet1Char(value Char, index int) {
+	panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForByte) ArrayGet1CodePoint(index int) CodePoint {
+	panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForByte) ArraySet1CodePoint(value CodePoint, index int) {
+	panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForByte) anySlice(lo, hi Int) []interface{} {
+	if lo.IsNilInt() {
+		lo = Zero
+	}
+	if hi.IsNilInt() {
+		hi = IntOf(len(_this.contents))
+	}
+	iLo := lo.Int()
+	iHi := hi.Int()
+	anyArray := make([]interface{}, iHi-iLo)
+	for i := iLo; i < iHi; i++ {
+		anyArray[i] = _this.contents[i]
+	}
+	return anyArray
+}
+
+// arrayForByte implements the EqualsGeneric interface.
+func (_this arrayForByte) EqualsGeneric(other interface{}) bool {
+	otherArray, ok := other.(*arrayForByte)
+	if !ok {
+		return false
+	}
+	return &_this.dims[0] == &otherArray.dims[0]
+}
+
+/***** arrayForChar is the Array interface specialized for Char. *****/
+
+type arrayForChar struct {
+	contents []Char // stored as a flat one-dimensional slice
+	dims     []int
+}
+
+func (_this arrayForChar) dimensionCount() int {
+	return len(_this.dims)
+}
+
+func (_this arrayForChar) dimensionLength(dim int) int {
+	return _this.dims[dim]
+}
+
+func (_this arrayForChar) ArrayGet1(index int) interface{} {
+	return _this.contents[index]
+}
+
+func (_this arrayForChar) ArraySet1(value interface{}, index int) {
+	_this.contents[index] = value.(Char)
+}
+
+func (_this arrayForChar) ArrayGet1Byte(index int) byte {
+	panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForChar) ArraySet1Byte(value byte, index int) {
+	panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForChar) ArrayGet1Char(index int) Char {
+	return _this.contents[index]
+}
+
+func (_this arrayForChar) ArraySet1Char(value Char, index int) {
+	_this.contents[index] = value
+}
+
+func (_this arrayForChar) ArrayGet1CodePoint(index int) CodePoint {
+	panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForChar) ArraySet1CodePoint(value CodePoint, index int) {
+	panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForChar) anySlice(lo, hi Int) []interface{} {
+	if lo.IsNilInt() {
+		lo = Zero
+	}
+	if hi.IsNilInt() {
+		hi = IntOf(len(_this.contents))
+	}
+	iLo := lo.Int()
+	iHi := hi.Int()
+	anyArray := make([]interface{}, iHi-iLo)
+	for i := iLo; i < iHi; i++ {
+		anyArray[i] = _this.contents[i]
+	}
+	return anyArray
+}
+
+// arrayForChar implements the EqualsGeneric interface.
+func (_this arrayForChar) EqualsGeneric(other interface{}) bool {
+	otherArray, ok := other.(*arrayForChar)
+	if !ok {
+		return false
+	}
+	return &_this.dims[0] == &otherArray.dims[0]
+}
+
+/***** arrayForCodePoint is the Array interface specialized for CodePoint. *****/
+
+type arrayForCodePoint struct {
+	contents []CodePoint // stored as a flat one-dimensional slice
+	dims     []int
+}
+
+func (_this arrayForCodePoint) dimensionCount() int {
+	return len(_this.dims)
+}
+
+func (_this arrayForCodePoint) dimensionLength(dim int) int {
+	return _this.dims[dim]
+}
+
+func (_this arrayForCodePoint) ArrayGet1(index int) interface{} {
+	return _this.contents[index]
+}
+
+func (_this arrayForCodePoint) ArraySet1(value interface{}, index int) {
+	_this.contents[index] = value.(CodePoint)
+}
+
+func (_this arrayForCodePoint) ArrayGet1Byte(index int) byte {
+	panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForCodePoint) ArraySet1Byte(value byte, index int) {
+	panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForCodePoint) ArrayGet1Char(index int) Char {
+	panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForCodePoint) ArraySet1Char(value Char, index int) {
+	panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForCodePoint) ArrayGet1CodePoint(index int) CodePoint {
+	return _this.contents[index]
+}
+
+func (_this arrayForCodePoint) ArraySet1CodePoint(value CodePoint, index int) {
+	_this.contents[index] = value
+}
+
+func (_this arrayForCodePoint) anySlice(lo, hi Int) []interface{} {
+	if lo.IsNilInt() {
+		lo = Zero
+	}
+	if hi.IsNilInt() {
+		hi = IntOf(len(_this.contents))
+	}
+	iLo := lo.Int()
+	iHi := hi.Int()
+	anyArray := make([]interface{}, iHi-iLo)
+	for i := iLo; i < iHi; i++ {
+		anyArray[i] = _this.contents[i]
+	}
+	return anyArray
+}
+
+// arrayForCodePoint implements the EqualsGeneric interface.
+func (_this arrayForCodePoint) EqualsGeneric(other interface{}) bool {
+	otherArray, ok := other.(*arrayForCodePoint)
+	if !ok {
+		return false
+	}
+	return &_this.dims[0] == &otherArray.dims[0]
+}
+
+/***** other Array methods *****/
+
+// EmptyArray is an empty one-dimensional array.
+var EmptyArray = NewArray(Zero)
+
+func ArrayCastTo(x interface{}) Array {
+	var t Array
+	t, _ = x.(Array)
+	return t
+}
+
+// ArrayLen returns the length of the array in the given dimension.
+func ArrayLen(array Array, dim int) Int {
+	return IntOf(ArrayLenInt(array, dim))
+}
+
+// ArrayLenInt returns the length of the array in the given dimension, as an int.
+func ArrayLenInt(array Array, dim int) int {
+	return array.dimensionLength(dim)
+}
+
+func computeArrayIndex(array Array, ixs ...int) int {
+	dimensionCount := array.dimensionCount()
+	if len(ixs) != dimensionCount {
+		panic(fmt.Sprintf("Expected %d indices but got %d", dimensionCount, len(ixs)))
+	}
+	i := 0
+	size := 1
+	for d := dimensionCount - 1; d >= 0; d-- {
+		i += size * ixs[d]
+		size *= array.dimensionLength(d)
+	}
+	return i
+}
+
+func ArrayGet(array Array, ixs ...int) interface{} {
+	index := computeArrayIndex(array, ixs...)
+	return array.ArrayGet1(index)
+}
+
+func ArraySet(array Array, value interface{}, ixs ...int) {
+	index := computeArrayIndex(array, ixs...)
+	array.ArraySet1(value, index)
+}
+
+// RangeToSeq converts the selected portion of the array to a sequence.
+func ArrayRangeToSeq(array Array, lo, hi Int) Sequence {
+	if array.dimensionCount() != 1 {
+		panic("Can't take a slice of a multidimensional array")
+	}
+	isString := false
+	if array.dimensionLength(0) > 0 {
+		_, isString = array.ArrayGet1(0).(Char)
+	}
+
+	anySlice := array.anySlice(lo, hi)
+	seq := SeqOf(anySlice...)
+	seq.IsString_set_(isString)
+	return seq
+}
+
+/******************************************************************************
+ * Tuples
+ ******************************************************************************/
+
+// A Tuple is a one-dimensional heterogeneous array.
+type Tuple struct {
+	contents []interface{}
+}
+
+// TupleOf creates a tuple with the given values.
+func TupleOf(values ...interface{}) Tuple {
+	arr := make([]interface{}, len(values))
+	copy(arr, values)
+	return Tuple{arr}
+}
+
+// Equals returns whether two tuples have the same values.
+func (tuple Tuple) Equals(other Tuple) bool {
+	return sliceEquals(tuple.contents, other.contents)
+}
+
+// Tuple implements the EqualsGeneric interface.
+func (tuple Tuple) EqualsGeneric(other interface{}) bool {
+	tuple2, ok := other.(Tuple)
+	return ok && tuple.Equals(tuple2)
+}
+
+func (tuple Tuple) String() string {
+	return "(" + stringOfElements(tuple.contents) + ")"
+}
+
+// Index looks up the address of the ith element of the tuple.
+func (tuple Tuple) Index(i Int) *interface{} {
+	return tuple.IndexInt(i.Int())
+}
+
+// IndexInt looks up the address of the ith element of the tuple.
+func (tuple Tuple) IndexInt(i int) *interface{} {
+	return &tuple.contents[i]
+}
+
+// TupleType returns the type of a tuple with given element types.
+func TupleType(tys ...TypeDescriptor) TypeDescriptor {
+	arr := make([]TypeDescriptor, len(tys))
+	copy(arr, tys)
+	return tupleType{arr}
+}
+
+type tupleType struct {
+	eltTys []TypeDescriptor
+}
+
+func (tt tupleType) Default() interface{} {
+	values := make([]interface{}, len(tt.eltTys))
+	for i, ty := range tt.eltTys {
+		values[i] = ty.Default()
+	}
+	return TupleOf(values...)
+}
+
+func (tt tupleType) String() string {
+	s := "("
+	sep := ""
+	for _, ty := range tt.eltTys {
+		s += sep + String(ty)
+		sep = ", "
+	}
+	s += ")"
+	return s
+}
+
+/******************************************************************************
+ * Collection building
+ ******************************************************************************/
+
+// A Builder holds values as they're imperatively accumulated in order to build
+// an Array, Set, or MultiSet.
+type Builder []interface{}
+
+// NewBuilder creates a new Builder.
+func NewBuilder() *Builder {
+	return new(Builder)
+}
+
+// NewBuilder creates a new Builder.
+func NewBuilderOf(iter interface{}) *Builder {
+	b := NewBuilder()
+	for i := Iterate(iter); ; {
+		v, ok := i()
+		if !ok {
+			break
+		}
+		b.Add(v)
+	}
+	return b
+}
+
+// Add adds a new value to a Builder.
+func (builder *Builder) Add(value interface{}) {
+	*builder = append(*builder, value)
+}
+
+// ToArray creates an Array with the accumulated values.
+func (builder *Builder) ToArray() Array {
+	return newArrayWithValues(*builder...)
+}
+
+// ToSet creates a Set with the accumulated values.
+func (builder *Builder) ToSet() Set {
+	return SetOf(*builder...)
+}
+
+// ToMultiset creates a MultiSet with the accumulated values.
+func (builder *Builder) ToMultiSet() MultiSet {
+	return MultiSetOf(*builder...)
+}
+
+// Iterator iterates over the accumulated values.
+func (builder *Builder) Iterator() Iterator {
+	return sliceIterator(*builder)
+}
+
+/******************************************************************************
+ * Sets
+ ******************************************************************************/
+
+// A Set is a sequence without duplicates.
+type Set struct {
+	contents []interface{}
+}
+
+// EmptySet is the empty set.
+var EmptySet = SetOf()
+
+// SetOf creates a set with the given values.
+func SetOf(values ...interface{}) Set {
+	uniq := make([]interface{}, 0, len(values))
+NEXT_INPUT:
+	for _, v := range values {
+		for _, u := range uniq {
+			if AreEqual(u, v) {
+				continue NEXT_INPUT
+			}
+		}
+		uniq = append(uniq, v)
+	}
+	return Set{uniq}
+}
+
+// Cardinality returns the cardinality (size) of the set.
+func (set Set) Cardinality() Int {
+	return IntOf(set.CardinalityInt())
+}
+
+// CardinalityInt returns the cardinality (size) of the set as an int.
+func (set Set) CardinalityInt() int {
+	return len(set.contents)
+}
+
+// Contains returns whether the given value is an element of the set.
+func (set Set) Contains(value interface{}) bool {
+	return sliceContains(set.contents, value)
+}
+
+// Iterator returns an iterator over the elements of the set.
+func (set Set) Iterator() Iterator {
+	return sliceIterator(set.contents)
+}
+
+// Union makes a set containing each element contained by either input set.
+func (set Set) Union(set2 Set) Set {
+	if set.CardinalityInt() == 0 {
+		return set2
+	}
+	if set2.CardinalityInt() == 0 {
+		return set
+	}
+
+	n := set.CardinalityInt()
+	uniq := make([]interface{}, n)
+	copy(uniq, set.contents)
+NEXT_INPUT:
+	for _, v := range set2.contents {
+		for _, u := range uniq {
+			if AreEqual(u, v) {
+				continue NEXT_INPUT
+			}
+		}
+		uniq = append(uniq, v)
+	}
+
+	return Set{uniq}
+}
+
+// Intersection makes a set containing each element contained by both input
+// sets.
+func (set Set) Intersection(set2 Set) Set {
+	if set.CardinalityInt() == 0 || set2.CardinalityInt() == 0 {
+		return EmptySet
+	}
+
+	uniq := make([]interface{}, 0)
+	for _, v := range set.contents {
+		if set2.Contains(v) {
+			uniq = append(uniq, v)
+		}
+	}
+
+	return Set{uniq}
+}
+
+// Difference makes a set containing each element contained by set but not
+// by set2.
+func (set Set) Difference(set2 Set) Set {
+	if set.CardinalityInt() == 0 || set2.CardinalityInt() == 0 {
+		return set
+	}
+
+	elts := make([]interface{}, 0, max(0, set.CardinalityInt()-set2.CardinalityInt()))
+	for _, v := range set.contents {
+		if !set2.Contains(v) {
+			elts = append(elts, v)
+		}
+	}
+
+	return Set{elts}
+}
+
+// IsDisjointFrom returns true if the sets have no elements in common.
+func (set Set) IsDisjointFrom(set2 Set) bool {
+	if set.CardinalityInt() == 0 || set2.CardinalityInt() == 0 {
+		return true
+	}
+
+	for _, v := range set.contents {
+		if sliceContains(set2.contents, v) {
+			return false
+		}
+	}
+
+	return true
+}
+
+// Equals tests whether the sets contain the same elements.
+func (set Set) Equals(set2 Set) bool {
+	return set.CardinalityInt() == set2.CardinalityInt() &&
+		set.isSubsetAfterCardinalityCheck(set2)
+}
+
+// Set implements the EqualsGeneric interface.
+func (set Set) EqualsGeneric(other interface{}) bool {
+	set2, ok := other.(Set)
+	return ok && set.Equals(set2)
+}
+
+// IsSubsetOf returns true if each element in this set is also in the other.
+func (set Set) IsSubsetOf(set2 Set) bool {
+	return set.CardinalityInt() <= set2.CardinalityInt() &&
+		set.isSubsetAfterCardinalityCheck(set2)
+}
+
+// IsProperSubsetOf returns true if each element in this set is also in the
+// other, and moreover the sets aren't equal.
+func (set Set) IsProperSubsetOf(set2 Set) bool {
+	return set.CardinalityInt() < set2.CardinalityInt() &&
+		set.isSubsetAfterCardinalityCheck(set2)
+}
+
+func (set Set) isSubsetAfterCardinalityCheck(set2 Set) bool {
+	for _, v := range set.contents {
+		if !sliceContains(set2.contents, v) {
+			return false
+		}
+	}
+	return true
+}
+
+// Elements returns the set of elements (i.e. the set itself).
+func (set Set) Elements() Set {
+	return set
+}
+
+// AllSubsets returns an iterator over all subsets of the given set.
+func (set Set) AllSubsets() Iterator {
+	// Use a big integer to range from 0 to 2^n
+	r := new(big.Int)
+	limit := new(big.Int).Lsh(One.impl, uint(set.CardinalityInt()))
+	return func() (interface{}, bool) {
+		if r.Cmp(limit) == 0 {
+			return Set{}, false
+		} else {
+			values := make([]interface{}, 0, len(set.contents))
+			i := 0
+			s := new(big.Int).Set(r)
+			mod := new(big.Int)
+			for s.Cmp(Zero.impl) > 0 {
+				if mod.Mod(s, Two.impl).Cmp(Zero.impl) != 0 {
+					values = append(values, set.contents[i])
+				}
+				s.Div(s, Two.impl)
+				i++
+			}
+			r.Add(r, One.impl)
+
+			// Annoyingly, the other implementations reverse the order of the
+			// elements, so we have to as well
+			return Set{reverse(values)}, true
+		}
+	}
+}
+
+func reverse(values []interface{}) []interface{} {
+	ans := make([]interface{}, len(values))
+	n := len(values)
+	for i, v := range values {
+		ans[n-1-i] = v
+	}
+	return ans
+}
+
+func (set Set) String() string {
+	return "{" + stringOfElements(set.contents) + "}"
+}
+
+/******************************************************************************
+ * Multisets
+ ******************************************************************************/
+
+// A MultiSet is an unordered sequence of elements with possible duplication.
+type MultiSet struct {
+	elts []msetElt
+}
+
+type msetElt struct {
+	value interface{}
+	count Int
+}
+
+// EmptyMultiSet is the empty multiset.
+var EmptyMultiSet = MultiSetOf()
+
+// MultiSetOf creates a MultiSet with the given elements.
+func MultiSetOf(values ...interface{}) MultiSet {
+	elts := make([]msetElt, 0, len(values))
+NEXT_INPUT:
+	for _, v := range values {
+		for i, u := range elts {
+			if AreEqual(u.value, v) {
+				elts[i] = msetElt{value: u.value, count: u.count.Plus(One)}
+				continue NEXT_INPUT
+			}
+		}
+		elts = append(elts, msetElt{value: v, count: One})
+	}
+	return MultiSet{elts}
+}
+
+// MultiSetFromSeq creates a MultiSet from the elements in the given sequence.
+func MultiSetFromSeq(seq Sequence) MultiSet {
+	return NewBuilderOf(seq).ToMultiSet()
+}
+
+// MultiSetFromSet creates a MultiSet from the elements in the given set.
+func MultiSetFromSet(set Set) MultiSet {
+	elts := make([]msetElt, len(set.contents))
+	for i, v := range set.contents {
+		// No need to check whether it's already there because Set elements are
+		// assumed to be unique
+		elts[i] = msetElt{v, One}
+	}
+	return MultiSet{elts}
+}
+
+func (mset MultiSet) clone() MultiSet {
+	elts := make([]msetElt, len(mset.elts))
+	copy(elts, mset.elts)
+	return MultiSet{elts}
+}
+
+func (mset MultiSet) findIndex(value interface{}) (int, bool) {
+	for i, e := range mset.elts {
+		if AreEqual(e.value, value) {
+			return i, true
+		}
+	}
+	return -1, false
+}
+
+// Update changes the cardinality of the given value in the multiset, returning
+// a new multiset unless the cardinality did not actually change.
+func (mset MultiSet) Update(value interface{}, n Int) MultiSet {
+	i, found := mset.findIndex(value)
+	if found {
+		if mset.elts[i].count == n {
+			return mset
+		} else {
+			ans := mset.clone()
+			ans.elts[i] = msetElt{value, n}
+			return ans
+		}
+	} else if n.Cmp(Zero) == 0 {
+		return mset
+	} else {
+		return MultiSet{append(mset.clone().elts, msetElt{value, n})}
+	}
+}
+
+// Cardinality returns the number of elements in the multiset (counting
+// repetitions).
+func (mset MultiSet) Cardinality() Int {
+	n := new(big.Int)
+	for _, e := range mset.elts {
+		n.Add(n, e.count.impl)
+	}
+	return intOf(n)
+}
+
+// CardinalityInt returns the number of elements in the multiset (counting
+// repetitions) as an int.
+func (mset MultiSet) CardinalityInt() int {
+	n := 0
+	for _, e := range mset.elts {
+		n += e.count.Int()
+	}
+	return n
+}
+
+// Index returns the ith element of the multiset, which is arbitrary except that
+// it is different from the jth element when i /= j.  (Repetitions are ignored.)
+func (mset MultiSet) Index(i Int) interface{} {
+	return mset.elts[i.Int()]
+}
+
+// Iterator returns an iterator over the multiset (including repetitions).
+func (mset MultiSet) Iterator() Iterator {
+	i := 0
+	n := new(big.Int)
+	return func() (interface{}, bool) {
+		for {
+			if i >= len(mset.elts) {
+				return nil, false
+			}
+			if n.Cmp(mset.elts[i].count.impl) >= 0 {
+				n.SetInt64(0)
+				i++
+			} else {
+				break
+			}
+		}
+
+		ans := mset.elts[i].value
+		n.Add(n, One.impl)
+		return ans, true
+	}
+}
+
+// Contains returns whether the multiset contains the given element (at least
+// once).
+func (mset MultiSet) Contains(value interface{}) bool {
+	return mset.Multiplicity(value).Cmp(Zero) > 0
+}
+
+// Multiplicity returns the number of times a given element occurs in the
+// multiset.
+func (mset MultiSet) Multiplicity(value interface{}) Int {
+	i, found := mset.findIndex(value)
+	if found {
+		return mset.elts[i].count
+	} else {
+		return Zero
+	}
+}
+
+// Elements returns an iterator that yields each element in the multiset, as
+// many times as it appears.
+func (mset MultiSet) Elements() func() (interface{}, bool) {
+	i := 0
+	n := new(big.Int)
+	return func() (interface{}, bool) {
+		for {
+			if i >= len(mset.elts) {
+				return nil, false
+			}
+			if n.Cmp(mset.elts[i].count.impl) == 0 {
+				i++
+				n.SetInt64(0)
+			} else {
+				break
+			}
+		}
+		n.Add(n, One.impl)
+		return mset.elts[i].value, true
+	}
+}
+
+// UniqueElements returns an iterator that yields each element in the multiset
+// once.
+func (mset MultiSet) UniqueElements() func() (interface{}, bool) {
+	i := 0
+	return func() (interface{}, bool) {
+		if i >= len(mset.elts) {
+			return nil, false
+		} else {
+			i++
+			return mset.elts[i-1].value, true
+		}
+	}
+}
+
+// Union returns a multiset including each element of either set.  Each value's
+// multiplicity will be the sum of its multiplicities in the original multisets.
+func (mset MultiSet) Union(mset2 MultiSet) MultiSet {
+	if len(mset.elts) == 0 {
+		return mset2
+	}
+	if len(mset2.elts) == 0 {
+		return mset
+	}
+
+	elts := make([]msetElt, 0, len(mset.elts)+len(mset2.elts))
+	for _, e := range mset.elts {
+		if e.count.Cmp(Zero) == 0 {
+			// e.value in mset2 will be added in the next separate for loop
+			continue
+		}
+		m := mset2.Multiplicity(e.value)
+		elts = append(elts, msetElt{e.value, e.count.Plus(m)})
+	}
+	for _, e := range mset2.elts {
+		if !mset.Contains(e.value) {
+			elts = append(elts, e)
+		}
+	}
+
+	return MultiSet{elts}
+}
+
+// Intersection returns a multiset including those elements which occur in both
+// sets.  Each value's multiplicity will be the minimum of its multiplicities
+// in the original multisets.
+func (mset MultiSet) Intersection(mset2 MultiSet) MultiSet {
+	if len(mset.elts) == 0 || len(mset2.elts) == 0 {
+		return EmptyMultiSet
+	}
+
+	elts := make([]msetElt, 0)
+	for _, e := range mset.elts {
+		m := mset2.Multiplicity(e.value)
+		if m.Cmp(Zero) != 0 {
+			elts = append(elts, msetElt{e.value, e.count.Min(m)})
+		}
+	}
+
+	return MultiSet{elts}
+}
+
+// Difference returns a multiset including those elements which occur in the
+// first argument but not the second.  Each value's multiplicity will be its
+// multiplicity in mset minus its multiplicity in mset2.
+func (mset MultiSet) Difference(mset2 MultiSet) MultiSet {
+	if len(mset.elts) == 0 || len(mset2.elts) == 0 {
+		return mset
+	}
+
+	elts := make([]msetElt, 0, max(0, len(mset.elts)-len(mset2.elts)))
+	for _, e := range mset.elts {
+		d := e.count.Minus(mset2.Multiplicity(e.value))
+		if d.Cmp(Zero) > 0 {
+			elts = append(elts, msetElt{e.value, d})
+		}
+	}
+
+	return MultiSet{elts}
+}
+
+// IsDisjointFrom returns whether two multisets contain no elements in common.
+func (mset MultiSet) IsDisjointFrom(mset2 MultiSet) bool {
+	if len(mset.elts) == 0 || len(mset2.elts) == 0 {
+		return true
+	}
+
+	for _, e := range mset.elts {
+		if (e.count.Cmp(Zero) != 0) && mset2.Contains(e.value) {
+			return false
+		}
+	}
+
+	return true
+}
+
+// Equals returns whether two multisets have the same values with the same
+// multiplicities.
+func (mset MultiSet) Equals(mset2 MultiSet) bool {
+	for _, e := range mset.elts {
+		m := mset2.Multiplicity(e.value)
+		if e.count.Cmp(m) != 0 {
+			return false
+		}
+	}
+	return mset.CardinalityInt() == mset2.CardinalityInt()
+}
+
+// MultiSet implements the EqualsGeneric interface.
+func (mset MultiSet) EqualsGeneric(other interface{}) bool {
+	mset2, ok := other.(MultiSet)
+	return ok && mset.Equals(mset2)
+}
+
+// IsSubsetOf returns whether one multiset has a subset of the elements of the
+// other, with lesser or equal multiplicities.
+func (mset MultiSet) IsSubsetOf(mset2 MultiSet) bool {
+	for _, e := range mset.elts {
+		m := mset2.Multiplicity(e.value)
+		if e.count.Cmp(m) > 0 {
+			return false
+		}
+	}
+	return true
+}
+
+// IsProperSubsetOf returns whether one multiset has a proper subset of the
+// elements of the other, with strictly lesser multiplicities.
+func (mset MultiSet) IsProperSubsetOf(mset2 MultiSet) bool {
+	return mset.IsSubsetOf(mset2) && mset.CardinalityInt() < mset2.CardinalityInt()
+}
+
+func (mset MultiSet) String() string {
+	s := "multiset{"
+	sep := ""
+	i := new(big.Int)
+	for _, e := range mset.elts {
+		for i.SetInt64(0); i.Cmp(e.count.impl) < 0; i.Add(i, One.impl) {
+			s += sep + String(e.value)
+			sep = ", "
+		}
+	}
+	s += "}"
+	return s
+}
+
+/******************************************************************************
+ * Maps
+ ******************************************************************************/
+
+// A Map is an association between keys and values.
+type Map struct {
+	elts []mapElt
+}
+
+type mapElt struct {
+	key, value interface{}
+}
+
+// A MapBuilder creates a new Map by accumulating elements imperatively.
+type MapBuilder []mapElt
+
+// NewMapBuilder creates a new map builder.
+func NewMapBuilder() *MapBuilder {
+	return new(MapBuilder)
+}
+
+// Add adds a key and value to the map being built, used by map comprehension
+func (mb *MapBuilder) Add(k, v interface{}) *MapBuilder {
+	*mb = append(*mb, mapElt{k, v})
+	return mb
+}
+
+// ToMap gets the map out of the map builder.
+func (mb *MapBuilder) ToMap() Map {
+	return Map{*mb}
+}
+
+// EmptyMap is the empty map.
+var EmptyMap = NewMapBuilder().ToMap()
+
+func (m Map) clone() Map {
+	elts := make([]mapElt, len(m.elts))
+	copy(elts, m.elts)
+	return Map{elts}
+}
+
+func (m Map) findIndex(key interface{}) (int, bool) {
+	for i, e := range m.elts {
+		if AreEqual(e.key, key) {
+			return i, true
+		}
+	}
+	return -1, false
+}
+
+// Cardinality finds the number of elements in the map.
+func (m Map) Cardinality() Int {
+	return IntOf(m.CardinalityInt())
+}
+
+// CardinalityInt finds the number of elements in the map as an int.
+func (m Map) CardinalityInt() int {
+	return len(m.elts)
+}
+
+// Find finds the given key in the map, returning it and a success flag.
+func (m Map) Find(key interface{}) (interface{}, bool) {
+	i, found := m.findIndex(key)
+	if found {
+		return m.elts[i].value, true
+	} else {
+		return nil, false
+	}
+}
+
+// Get finds the given key in the map, returning it or nil.
+func (m Map) Get(key interface{}) interface{} {
+	v, _ := m.Find(key)
+	return v
+}
+
+// Contains returns whether the given key is in the map.
+func (m Map) Contains(key interface{}) bool {
+	_, found := m.findIndex(key)
+	return found
+}
+
+// Update returns a new Map which associates the given key and value.
+func (m Map) Update(key, value interface{}) Map {
+	ans := m.clone()
+	i, found := ans.findIndex(key)
+	if found {
+		ans.elts[i] = mapElt{key, value}
+	} else {
+		ans.elts = append(ans.elts, mapElt{key, value})
+	}
+	return ans
+}
+
+// Similar to Update, but make the modification in-place.
+// Meant to be used in the map constructor.
+func (m Map) UpdateUnsafe(key, value interface{}) Map {
+	ans := m
+	i, found := ans.findIndex(key)
+	if found {
+		ans.elts[i] = mapElt{key, value}
+	} else {
+		ans.elts = append(ans.elts, mapElt{key, value})
+	}
+	return ans
+}
+
+func (a Map) Merge(b Map) Map {
+	if a.CardinalityInt() == 0 {
+		return b
+	}
+	if b.CardinalityInt() == 0 {
+		return a
+	}
+
+	m := make([]mapElt, len(b.elts), len(a.elts)+len(b.elts))
+	copy(m, b.elts)
+	for _, e := range a.elts {
+		_, found := b.findIndex(e.key)
+		if !found {
+			m = append(m, e)
+		}
+	}
+	return Map{m}
+}
+
+func (a Map) Subtract(keys Set) Map {
+	if a.CardinalityInt() == 0 || keys.CardinalityInt() == 0 {
+		return a
+	}
+
+	mb := NewMapBuilder()
+	for _, e := range a.elts {
+		if !keys.Contains(e.key) {
+			*mb = append(*mb, e)
+		}
+	}
+	return mb.ToMap()
+}
+
+// Equals returns whether each map associates the same keys to the same values.
+func (m Map) Equals(m2 Map) bool {
+	if len(m.elts) != len(m2.elts) {
+		return false
+	}
+	for _, e := range m.elts {
+		i, found := m2.findIndex(e.key)
+		if !found || !AreEqual(e.value, m2.elts[i].value) {
+			return false
+		}
+	}
+	return true
+}
+
+// Map implements the EqualsGeneric interface.
+func (m Map) EqualsGeneric(other interface{}) bool {
+	m2, ok := other.(Map)
+	return ok && m.Equals(m2)
+}
+
+// Keys returns the set of keys in the map.
+func (m Map) Keys() Set {
+	b := NewBuilder()
+	for _, e := range m.elts {
+		b.Add(e.key)
+	}
+	return b.ToSet()
+}
+
+// Values returns the set of values in the map.
+func (m Map) Values() Set {
+	b := NewBuilder()
+	for _, e := range m.elts {
+		b.Add(e.value)
+	}
+	return b.ToSet()
+}
+
+// Items returns the set of items in the map as a Set of Tuples.
+func (m Map) Items() Set {
+	b := NewBuilder()
+	for _, e := range m.elts {
+		b.Add(TupleOf(e.key, e.value))
+	}
+	return b.ToSet()
+}
+
+func (m Map) String() string {
+	s := "map["
+	for i, e := range m.elts {
+		if i > 0 {
+			s += ", "
+		}
+		s += fmt.Sprintf("%s := %s", String(e.key), String(e.value))
+	}
+	s += "]"
+	return s
+}
+
+/******************************************************************************
+ * Integers
+ ******************************************************************************/
+
+// An Int is an immutable big integer.
+type Int struct {
+	impl *big.Int
+	// debug string
+} // Careful not to mutate!
+
+// A BV is an immutable big bitvector (presumed to be non-negative).
+type BV = Int
+
+func intOf(i *big.Int) Int {
+	return Int{
+		impl: i,
+		// debug: i.String(),
+	}
+}
+
+// IntOf turns the given int into an Int.  Common values are cached.  This is
+// simply a shorter form of IntOfInt.
+func IntOf(i int) Int {
+	return IntOfInt(i)
+}
+
+// IntOfInt turns the given int into an Int.  Common values are cached.
+func IntOfInt(i int) Int {
+	return IntOfInt64(int64(i))
+}
+
+// IntOfInt8 turns the given int8 into an Int.  Common values are cached.
+func IntOfInt8(i int8) Int {
+	return IntOfInt64(int64(i))
+}
+
+// IntOfInt16 turns the given int16 into an Int.  Common values are cached.
+func IntOfInt16(i int16) Int {
+	return IntOfInt64(int64(i))
+}
+
+// IntOfInt32 turns the given int32 into an Int.  Common values are cached.
+func IntOfInt32(i int32) Int {
+	return IntOfInt64(int64(i))
+}
+
+// IntOfInt64 turns the given int64 into an Int.  Common values are cached.
+func IntOfInt64(i int64) Int {
+	switch i {
+	case -1:
+		return NegativeOne
+	case 0:
+		return Zero
+	case 1:
+		return One
+	case 2:
+		return Two
+	case 5:
+		return Five
+	case 10:
+		return Ten
+	default:
+		return intOf(big.NewInt(i))
+	}
+}
+
+// IntOfUint turns the given uint into an Int.  Common values are cached.
+func IntOfUint(i uint) Int {
+	return IntOfUint64(uint64(i))
+}
+
+// IntOfUint8 turns the given uint8 into an Int.  Common values are cached.
+func IntOfUint8(i uint8) Int {
+	return IntOfUint64(uint64(i))
+}
+
+// IntOfUint16 turns the given uint16 into an Int.  Common values are cached.
+func IntOfUint16(i uint16) Int {
+	return IntOfUint64(uint64(i))
+}
+
+// IntOfUint32 turns the given uint32 into an Int.  Common values are cached.
+func IntOfUint32(i uint32) Int {
+	return IntOfUint64(uint64(i))
+}
+
+// IntOfUint64 turns the given uint64 into an Int.  Common values are cached.
+func IntOfUint64(i uint64) Int {
+	switch i {
+	case 0:
+		return Zero
+	case 1:
+		return One
+	case 2:
+		return Two
+	case 5:
+		return Five
+	case 10:
+		return Ten
+	default:
+		return intOf(new(big.Int).SetUint64(i))
+	}
+}
+
+// IntOfString parses the given string as an Int, panicking on failure.
+func IntOfString(s string) Int {
+	switch s {
+	case "-1":
+		return NegativeOne
+	case "0":
+		return Zero
+	case "1":
+		return One
+	case "2":
+		return Two
+	case "5":
+		return Five
+	case "10":
+		return Ten
+	default:
+		i, ok := new(big.Int).SetString(s, 0)
+		if !ok {
+			panic("Unable to parse string as int: " + s)
+		} else {
+			return intOf(i)
+		}
+	}
+}
+
+// IntOfAny converts from many different things to Int.  Note that
+// switch-on-type does a linear search, so this can be slow for less common
+// cases.
+func IntOfAny(x interface{}) Int {
+	switch x := x.(type) {
+	// Try and put the most common cases earliest.
+	case Int:
+		return x
+	case int:
+		return IntOfInt(x)
+	case string:
+		return IntOfString(x)
+	case uint:
+		return IntOfUint(x)
+	case Char:
+		return IntOfInt32(rune(x))
+	case int32:
+		return IntOfInt32(x)
+	case int64:
+		return IntOfInt64(x)
+	case uint32:
+		return IntOfUint32(x)
+	case uint64:
+		return IntOfUint64(x)
+	case int8:
+		return IntOfInt8(x)
+	case uint8:
+		return IntOfUint8(x)
+	case int16:
+		return IntOfInt16(x)
+	case uint16:
+		return IntOfUint16(x)
+	default:
+		panic(fmt.Errorf("unexpected type for IntToAny: %v", refl.TypeOf(x)))
+	}
+}
+
+// Int converts back into an int.  If the result is not within int range,
+// the value is undefined.
+func (i Int) Int() int {
+	return int(i.impl.Int64())
+}
+
+// Int8 converts back into an int8.  If the result is not within int8 range,
+// the value is undefined.
+func (i Int) Int8() int8 {
+	return int8(i.impl.Int64())
+}
+
+// Int16 converts back into an int16.  If the result is not within int16 range,
+// the value is undefined.
+func (i Int) Int16() int16 {
+	return int16(i.impl.Int64())
+}
+
+// Int32 converts back into an int32.  If the result is not within int32 range,
+// the value is undefined.
+func (i Int) Int32() int32 {
+	return int32(i.impl.Int64())
+}
+
+// Int64 converts back to an int64.  If the result is not within int64 range,
+// the value is undefined.
+func (i Int) Int64() int64 {
+	return i.impl.Int64()
+}
+
+// Uint converts back to a uint.  If the result is not within uint range, the
+// value is undefined.
+func (i Int) Uint() uint {
+	return uint(i.impl.Uint64())
+}
+
+// Uint8 converts back to a uint8.  If the result is not within uint8 range, the
+// value is undefined.
+func (i Int) Uint8() uint8 {
+	return uint8(i.impl.Uint64())
+}
+
+// Uint16 converts back to a uint16.  If the result is not within uint16 range,
+// the value is undefined.
+func (i Int) Uint16() uint16 {
+	return uint16(i.impl.Uint64())
+}
+
+// Uint32 converts back to a uint32.  If the result is not within uint32 range,
+// the value is undefined.
+func (i Int) Uint32() uint32 {
+	return uint32(i.impl.Uint64())
+}
+
+// Uint64 converts back to a uint64.  If the result is not within uint64 range,
+// the value is undefined.
+func (i Int) Uint64() uint64 {
+	return i.impl.Uint64()
+}
+
+func (i Int) String() string {
+	return i.impl.String()
+}
+
+// NegativeOne is the constant -1.
+var NegativeOne = intOf(big.NewInt(-1))
+
+// Zero is the constant 0.
+var Zero = intOf(big.NewInt(0))
+
+// One is the constant 1.
+var One = intOf(big.NewInt(1))
+
+// Two is the constant 2.
+var Two = intOf(big.NewInt(2))
+
+// Five is the constant 5.
+var Five = intOf(big.NewInt(5))
+
+// Ten is the constant 10.
+var Ten = intOf(big.NewInt(10))
+
+// NilInt is a missing int value.
+var NilInt = intOf(nil)
+
+// IsNilInt returns whether this Int is actually a missing value.
+func (i Int) IsNilInt() bool {
+	return i.impl == nil
+}
+
+func (i Int) binOp(j Int, f func(*big.Int, *big.Int, *big.Int) *big.Int) Int {
+	return intOf(f(new(big.Int), i.impl, j.impl))
+}
+
+// Plus adds two Ints.
+func (i Int) Plus(j Int) Int {
+	return i.binOp(j, (*big.Int).Add)
+}
+
+// Minus subtracts one Int from another.
+func (i Int) Minus(j Int) Int {
+	return i.binOp(j, (*big.Int).Sub)
+}
+
+// Times multiplies two Ints.
+func (i Int) Times(j Int) Int {
+	return i.binOp(j, (*big.Int).Mul)
+}
+
+// DivBy divides one Int by another.  (So named to distinguish from
+// big.Int.Div(), which is an in-place operation.)
+func (i Int) DivBy(j Int) Int {
+	return i.binOp(j, (*big.Int).Div)
+}
+
+// Modulo takes the remainder when dividing one Int by another.  (So named to
+// distinguish from big.Int.Mod(), which performs the operation in place.)
+func (i Int) Modulo(j Int) Int {
+	return i.binOp(j, (*big.Int).Mod)
+}
+
+// Negated negates an Int.
+func (i Int) Negated() Int {
+	return intOf(new(big.Int).Neg(i.impl))
+}
+
+// Lsh performs a left shift.
+func (i Int) Lsh(j Int) Int {
+	return intOf(new(big.Int).Lsh(i.impl, uint(j.Uint64())))
+}
+
+// Rsh performs a right shift.
+func (i Int) Rsh(j Int) Int {
+	return intOf(new(big.Int).Rsh(i.impl, uint(j.Uint64())))
+}
+
+// Lrot performs a left rotate on a BV with width w.
+func (i BV) Lrot(j Int, w uint) BV {
+	// (i <<< j) == ((i << j) % 2^w) | (i >> (w-j))
+
+	ju := uint(j.Uint64())
+	l := new(big.Int).Lsh(i.impl, ju)
+	modulus := new(big.Int).Lsh(One.impl, w)
+	l.Mod(l, modulus)
+	r := modulus.Rsh(i.impl, w-ju) // reuse memory from modulus
+	return intOf(l.Or(l, r))
+}
+
+// Rrot performs a right rotate on a BV with width w.
+func (i BV) Rrot(j BV, w uint) BV {
+	// (i >>> j) == ((i << (w-j)) % 2^w) | (i >> j)
+
+	ju := uint(j.Uint64())
+	l := new(big.Int).Lsh(i.impl, w-ju)
+	modulus := new(big.Int).Lsh(One.impl, w)
+	l.Mod(l, modulus)
+	r := modulus.Rsh(i.impl, ju) // reuse memory from modulus
+	return intOf(l.Or(l, r))
+}
+
+// Cmp compares two Ints, returning -1 for less, 0 for equal, or 1 for greater.
+func (i Int) Cmp(j Int) int {
+	return i.impl.Cmp(j.impl)
+}
+
+// Sign returns the sign of an Int, returning -1 for negative, 0 for zero, or
+// 1 for positive.
+func (i Int) Sign() int {
+	return i.impl.Sign()
+}
+
+// EqualsGeneric compares an int to another value.
+func (i Int) EqualsGeneric(other interface{}) bool {
+	j, ok := other.(Int)
+	return ok && i.Cmp(j) == 0
+}
+
+// Min returns the minimum of two integers.
+func (i Int) Min(j Int) Int {
+	if i.Cmp(j) <= 0 {
+		return i
+	} else {
+		return j
+	}
+}
+
+// Max returns the maximum of two integers.
+func (i Int) Max(j Int) Int {
+	if i.Cmp(j) >= 0 {
+		return i
+	} else {
+		return j
+	}
+}
+
+// And performs bitwise AND.
+func (i Int) And(j Int) Int {
+	return i.binOp(j, (*big.Int).And)
+}
+
+// Or performs bitwise OR.
+func (i Int) Or(j Int) Int {
+	return i.binOp(j, (*big.Int).Or)
+}
+
+// Xor performs bitwise XOR.
+func (i Int) Xor(j Int) Int {
+	return i.binOp(j, (*big.Int).Xor)
+}
+
+// Not performs bitwise NOT.
+func (i Int) Not() Int {
+	return intOf(new(big.Int).Not(i.impl))
+}
+
+func (i Int) isPowerOf10() (bool, int) {
+	if i.Cmp(Zero) != 1 {
+		return false, -1
+	}
+	n := 0
+	j := i
+	for {
+		if j.Cmp(One) == 0 {
+			return true, n
+		} else if j.Modulo(Ten).Cmp(Zero) != 0 {
+			return false, -1
+		} else {
+			j = j.DivBy(Ten)
+			n++
+		}
+	}
+}
+
+func (i Int) dividesAPowerOf10() (yes bool, factor Int, log10 int) {
+	if i.Cmp(Zero) != 1 {
+		return false, Zero, -1
+		// okay, so technically you could multiply by a
+		// negative number, but that's not useful to
+		// Real.String().
+	}
+	n := 0
+	j := i
+	fact := One
+	for {
+		if j.Cmp(One) == 0 {
+			return true, One, n
+		} else if j.Modulo(Ten).Cmp(Zero) != 0 {
+			if j.Modulo(Five).Cmp(Zero) == 0 {
+				for {
+					fact = fact.Times(Two)
+					j = j.DivBy(Five)
+					n++
+					if j.Cmp(One) == 0 {
+						return true, fact, n
+					} else if j.Modulo(Five).Cmp(Zero) != 0 {
+						return false, NegativeOne, -1
+					}
+				}
+			} else if j.Modulo(Two).Cmp(Zero) == 0 {
+				for {
+					fact = fact.Times(Five)
+					j = j.DivBy(Two)
+					n++
+					if j.Cmp(One) == 0 {
+						return true, fact, n
+					} else if j.Modulo(Two).Cmp(Zero) != 0 {
+						return false, NegativeOne, -1
+					}
+				}
+			} else {
+				return false, NegativeOne, -1
+			}
+		} else {
+			j = j.DivBy(Ten)
+			n++
+		}
+	}
+}
+
+// IntegerRange returns an iterator over the integers from lo up to (but not
+// including) hi.
+func IntegerRange(lo, hi Int) Iterator {
+	if lo.impl != nil {
+		i := lo
+		return func() (interface{}, bool) {
+			if hi.impl != nil && i.Cmp(hi) >= 0 {
+				return nil, false
+			} else {
+				ans := i
+				i = i.Plus(One)
+				return ans, true
+			}
+		}
+	} else if hi.impl != nil {
+		i := hi
+		return func() (interface{}, bool) {
+			ans := i
+			i = i.Minus(One)
+			return ans, true
+		}
+	} else {
+		return AllIntegers()
+	}
+}
+
+// AllIntegers returns an iterator over all integers, starting at zero and
+// alternating between positive and negative.
+func AllIntegers() Iterator {
+	type phase int
+	const (
+		zeroPhase int = iota
+		posPhase
+		negPhase
+	)
+
+	i := Zero
+	p := zeroPhase
+
+	return func() (interface{}, bool) {
+		switch p {
+		case zeroPhase:
+			i = One
+			p = posPhase
+			return Zero, true
+		case posPhase:
+			p = negPhase
+			return i, true
+		case negPhase:
+			ans := i.Negated()
+			i = i.Plus(One)
+			p = posPhase
+			return ans, true
+		default:
+			panic("unknown phase")
+		}
+	}
+}
+
+/******************************************************************************
+ * Ordinals
+ ******************************************************************************/
+
+// An Ord is an immutable big integer (presumed to be non-negative).
+type Ord = Int
+
+// IsLimitOrd returns true for a limit ordinal.
+func (ord Ord) IsLimitOrd() bool {
+	return ord.Cmp(Zero) == 0
+}
+
+// IsSuccOrd returns true for a successor ordinal.
+func (ord Ord) IsSuccOrd() bool {
+	return ord.Cmp(Zero) > 0
+}
+
+// OrdOffset returns the ordinal as an Int.
+func (ord Ord) OrdOffset() Int {
+	return ord
+}
+
+// IsNatOrd returns true if the ordinal represents a natural number.
+func (Ord) IsNatOrd() bool {
+	return true // at run time, every ORDINAL is a natural number
+}
+
+/******************************************************************************
+ * Reals
+ ******************************************************************************/
+
+// A Real is an arbitrary-precision real number, represented as a ratio of
+// arbitrary-precision integers.
+type Real struct {
+	impl *big.Rat
+	// debug string
+}
+
+func realOf(r *big.Rat) Real {
+	return Real{
+		impl: r,
+		// debug: r.String()
+	}
+}
+
+// RealOf converts a float64 into a Real.  Common values are cached.
+func RealOf(f float64) Real {
+	if f == 0.0 {
+		return ZeroReal
+	}
+	return realOf(new(big.Rat).SetFloat64(f))
+}
+
+// RealOfFrac makes a Real of the ratio of two Ints.
+func RealOfFrac(num, denom Int) Real {
+	if num.Cmp(Zero) == 0 {
+		return ZeroReal
+	}
+	return realOf(new(big.Rat).SetFrac(num.impl, denom.impl))
+}
+
+// ZeroReal is the Real value zero.
+var ZeroReal = realOf(new(big.Rat))
+
+// NilReal is a missing Real value.
+var NilReal = realOf(nil)
+
+// IsNilReal returns whether this is actually a missing value.
+func (x Real) IsNilReal() bool {
+	return x.impl == nil
+}
+
+// RealOfString parses the given string in base 10 and panics if this is not
+// possible.
+func RealOfString(s string) Real {
+	x, ok := new(big.Rat).SetString(s)
+	if !ok {
+		panic("Can't parse generated string as ratio: \"" + s + "\"")
+	}
+	if x.Cmp(ZeroReal.impl) == 0 {
+		return ZeroReal
+	}
+	return realOf(x)
+}
+
+// Int converts the given real to an integer, rounding toward negative numbers.
+// (That is, returns floor(x).)
+func (x Real) Int() Int {
+	if x.Cmp(ZeroReal) == 0 || x.Denom().Cmp(One) == 0 {
+		return x.Num()
+	} else if x.Num().Cmp(Zero) > 0 {
+		return intOf(new(big.Int).Div(x.impl.Num(), x.impl.Denom()))
+	} else {
+		a := new(big.Int).Sub(x.impl.Num(), x.impl.Denom())
+		a.Add(a, One.impl)
+		return intOf(a.Quo(a, x.impl.Denom())) // note: *truncated* division
+	}
+}
+
+// Num returns the given Real's numerator as an Int
+func (x Real) Num() Int {
+	return intOf(x.impl.Num())
+}
+
+// Denom returns the given Real's denominator as an Int
+func (x Real) Denom() Int {
+	return intOf(x.impl.Denom())
+}
+
+func (x Real) String() string {
+	if x.Num().Cmp(Zero) == 0 || x.Denom().Cmp(One) == 0 {
+		return x.Num().String() + ".0"
+	}
+	divsPow10, fact, log10 := x.Denom().dividesAPowerOf10()
+	if divsPow10 {
+		num := x.Num().Times(fact)
+		var sign, digits string
+		if x.Cmp(ZeroReal) < 0 {
+			sign, digits = "-", num.Negated().String()
+		} else {
+			sign, digits = "", num.String()
+		}
+		if log10 < len(digits) {
+			n := len(digits) - log10
+			return sign + digits[0:n] + "." + digits[n:]
+		} else {
+			s := sign + "0."
+			for i := 0; i < log10-len(digits); i++ {
+				s = s + "0"
+			}
+			return s + digits
+		}
+	} else {
+		return "(" + x.Num().String() + ".0 / " + x.Denom().String() + ".0)"
+	}
+}
+
+func (x Real) isPowerOf10() (bool, int) {
+	if x.Num().Cmp(Zero) != 1 {
+		return false, -1
+	} else if x.Num().Cmp(One) == 1 {
+		b, i := x.Denom().isPowerOf10()
+		return b, -i
+	} else if x.Denom().Cmp(One) != 1 {
+		return false, -1
+	} else {
+		return x.Num().isPowerOf10()
+	}
+}
+
+// binOp lifts a binary operation on *big.Rat to one on Reals.  The second
+// argument is intended to be of the form (*big.Rat).Op.
+func (x Real) binOp(y Real, f func(*big.Rat, *big.Rat, *big.Rat) *big.Rat) Real {
+	return realOf(f(new(big.Rat), x.impl, y.impl))
+}
+
+// Plus adds two Reals.
+func (x Real) Plus(y Real) Real {
+	return x.binOp(y, (*big.Rat).Add)
+}
+
+// Minus subtracts one Real from another.
+func (x Real) Minus(y Real) Real {
+	return x.binOp(y, (*big.Rat).Sub)
+}
+
+// Times multiplies two Reals.
+func (x Real) Times(y Real) Real {
+	return x.binOp(y, (*big.Rat).Mul)
+}
+
+// DivBy divides one Real by another.
+func (x Real) DivBy(y Real) Real {
+	return x.binOp(y, (*big.Rat).Quo)
+}
+
+// Cmp compares one Real to another, returning -1 for less, 0 for equal, or 1
+// for greater.
+func (x Real) Cmp(y Real) int {
+	return x.impl.Cmp(y.impl)
+}
+
+// Sign returns the sign of a Real, returning -1 for negative, 0 for zero, or
+// 1 for positive.
+func (x Real) Sign() int {
+	return x.impl.Sign()
+}
+
+// EqualsGeneric compares an int to another value.
+func (x Real) EqualsGeneric(other interface{}) bool {
+	y, ok := other.(Real)
+	return ok && x.Cmp(y) == 0
+}
+
+// Min returns the minimum of two reals.
+func (x Real) Min(y Real) Real {
+	if x.Cmp(y) <= 0 {
+		return x
+	} else {
+		return y
+	}
+}
+
+// Max returns the maximum of two reals.
+func (x Real) Max(y Real) Real {
+	if x.Cmp(y) >= 0 {
+		return x
+	} else {
+		return y
+	}
+}
+
+/******************************************************************************
+ * Native math
+ ******************************************************************************/
+
+// DivInt does Euclidean division on the given ints
+func DivInt(x int, y int) int {
+	if x >= 0 {
+		if y >= 0 {
+			return x / y
+		} else {
+			return -(x / -y)
+		}
+	} else {
+		if y >= 0 {
+			return -((-x - 1) / y) - 1
+		} else {
+			return ((-x - 1) / (-y)) + 1
+		}
+	}
+}
+
+// DivInt8 does Euclidean divison on the given int8s
+func DivInt8(x int8, y int8) int8 {
+	if x >= 0 {
+		if y >= 0 {
+			return x / y
+		} else {
+			return -(x / -y)
+		}
+	} else {
+		if y >= 0 {
+			return -((-x - 1) / y) - 1
+		} else {
+			return ((-x - 1) / (-y)) + 1
+		}
+	}
+}
+
+// DivInt16 does Euclidean divison on the given int16s
+func DivInt16(x int16, y int16) int16 {
+	if x >= 0 {
+		if y >= 0 {
+			return x / y
+		} else {
+			return -(x / -y)
+		}
+	} else {
+		if y >= 0 {
+			return -((-x - 1) / y) - 1
+		} else {
+			return ((-x - 1) / (-y)) + 1
+		}
+	}
+}
+
+// DivInt32 does Euclidean divison on the given int32s
+func DivInt32(x int32, y int32) int32 {
+	if x >= 0 {
+		if y >= 0 {
+			return x / y
+		} else {
+			return -(x / -y)
+		}
+	} else {
+		if y >= 0 {
+			return -((-x - 1) / y) - 1
+		} else {
+			return ((-x - 1) / (-y)) + 1
+		}
+	}
+}
+
+// DivInt64 does Euclidean divison on the given int64s
+func DivInt64(x int64, y int64) int64 {
+	if x >= 0 {
+		if y >= 0 {
+			return x / y
+		} else {
+			return -(x / -y)
+		}
+	} else {
+		if y >= 0 {
+			return -((-x - 1) / y) - 1
+		} else {
+			return ((-x - 1) / (-y)) + 1
+		}
+	}
+}
+
+// DivFloat32 does Euclidean division on the given float32s
+func DivFloat32(x float32, y float32) float32 {
+	if x >= 0 {
+		if y >= 0 {
+			return x / y
+		} else {
+			return -(x / -y)
+		}
+	} else {
+		if y >= 0 {
+			return -((-x - 1) / y) - 1
+		} else {
+			return ((-x - 1) / (-y)) + 1
+		}
+	}
+}
+
+// DivFloat64 does Euclidean division on the given float64s
+func DivFloat64(x float64, y float64) float64 {
+	if x >= 0 {
+		if y >= 0 {
+			return x / y
+		} else {
+			return -(x / -y)
+		}
+	} else {
+		if y >= 0 {
+			return -((-x - 1) / y) - 1
+		} else {
+			return ((-x - 1) / (-y)) + 1
+		}
+	}
+}
+
+// LrotUint performs left rotation on the low w bits of an int
+func LrotUint(x uint, n Int, w uint) uint {
+	y := n.Uint()
+	return ((x << y) % (1 << w)) | (x >> (w - y))
+}
+
+// LrotUint8 performs left rotation on the low w bits of an int8
+func LrotUint8(x uint8, n Int, w uint) uint8 {
+	y := n.Uint()
+	return ((x << y) % (1 << w)) | (x >> (w - y))
+}
+
+// LrotUint16 performs left rotation on the low w bits of an int16
+func LrotUint16(x uint16, n Int, w uint) uint16 {
+	y := n.Uint()
+	return ((x << y) % (1 << w)) | (x >> (w - y))
+}
+
+// LrotUint32 performs left rotation on the low w bits of an int32
+func LrotUint32(x uint32, n Int, w uint) uint32 {
+	y := n.Uint()
+	return ((x << y) % (1 << w)) | (x >> (w - y))
+}
+
+// LrotUint64 performs left rotation on the low w bits of an int64
+func LrotUint64(x uint64, n Int, w uint) uint64 {
+	y := n.Uint()
+	return ((x << y) % (1 << w)) | (x >> (w - y))
+}
+
+// ModInt finds Euclidean remainder of the given ints
+func ModInt(x int, y int) int {
+	if y < 0 {
+		y = -y
+	}
+	if x >= 0 {
+		return x % y
+	} else {
+		z := (-x) % y
+		if z == 0 {
+			return 0
+		} else {
+			return y - z
+		}
+	}
+}
+
+// ModInt8 finds Euclidean remainder of the given int8s
+func ModInt8(x int8, y int8) int8 {
+	if y < 0 {
+		y = -y
+	}
+	if x >= 0 {
+		return x % y
+	} else {
+		z := (-x) % y
+		if z == 0 {
+			return 0
+		} else {
+			return y - z
+		}
+	}
+}
+
+// ModInt16 finds Euclidean remainder of the given int16s
+func ModInt16(x int16, y int16) int16 {
+	if y < 0 {
+		y = -y
+	}
+	if x >= 0 {
+		return x % y
+	} else {
+		z := (-x) % y
+		if z == 0 {
+			return 0
+		} else {
+			return y - z
+		}
+	}
+}
+
+// ModInt32 finds Euclidean remainder of the given int32s
+func ModInt32(x int32, y int32) int32 {
+	if y < 0 {
+		y = -y
+	}
+	if x >= 0 {
+		return x % y
+	} else {
+		z := (-x) % y
+		if z == 0 {
+			return 0
+		} else {
+			return y - z
+		}
+	}
+}
+
+// ModInt64 finds Euclidean remainder of the given int64s
+func ModInt64(x int64, y int64) int64 {
+	if y < 0 {
+		y = -y
+	}
+	if x >= 0 {
+		return x % y
+	} else {
+		z := (-x) % y
+		if z == 0 {
+			return 0
+		} else {
+			return y - z
+		}
+	}
+}
+
+// RrotUint performs right rotation on the low w bits of an int
+func RrotUint(x uint, n Int, w uint) uint {
+	y := n.Uint()
+	return (x >> y) | ((x << (w - y)) % (1 << w))
+}
+
+// RrotUint8 performs right rotation on the low w bits of an int8
+func RrotUint8(x uint8, n Int, w uint) uint8 {
+	y := n.Uint()
+	return (x >> y) | ((x << (w - y)) % (1 << w))
+}
+
+// RrotUint16 performs right rotation on the low w bits of an int16
+func RrotUint16(x uint16, n Int, w uint) uint16 {
+	y := n.Uint()
+	return (x >> y) | ((x << (w - y)) % (1 << w))
+}
+
+// RrotUint32 performs right rotation on the low w bits of an int32
+func RrotUint32(x uint32, n Int, w uint) uint32 {
+	y := n.Uint()
+	return (x >> y) | ((x << (w - y)) % (1 << w))
+}
+
+// RrotUint64 performs right rotation on the low w bits of an int64
+func RrotUint64(x uint64, n Int, w uint) uint64 {
+	y := n.Uint()
+	return (x >> y) | ((x << (w - y)) % (1 << w))
+}
+
+/******************************************************************************
+ * Utility functions
+ ******************************************************************************/
+
+func min(n, m int) int {
+	if n <= m {
+		return n
+	} else {
+		return m
+	}
+}
+
+func max(n, m int) int {
+	if n >= m {
+		return n
+	} else {
+		return m
+	}
+}
+
+func CatchHalt() {
+	if r := recover(); r != nil {
+		fmt.Println("[Program halted]", r)
+		os.Exit(1)
+	}
+}
+
+type GoAtomicBox struct {
+	value interface{}
+}
+
+func (box *GoAtomicBox) Get() interface{} {
+	return box.value
+}
+
+func (box *GoAtomicBox) Put(value interface{}) {
+	box.value = value
+}
+
+func (box *GoAtomicBox) String() string {
+	return "dafny.GoAtomicBox"
+}
+
+func (CompanionStruct_AtomicBox_) Make(value interface{}) AtomicBox {
+	return &GoAtomicBox{
+		value: value,
+	}
+}
+
+func (CompanionStruct_Helpers_) DafnyValueToDafnyString(value interface{}) Sequence {
+	return SeqOfString(String(value))
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo-gomod/dafny/dafnyFromDafny.go b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/dafny/dafnyFromDafny.go
new file mode 100644
index 00000000000..9b2237d782a
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/dafny/dafnyFromDafny.go
@@ -0,0 +1,1305 @@
+// Package dafny
+// Dafny module dafny compiled into Go
+
+package dafny
+
+type Dummy__ struct{}
+
+// Definition of class Default__
+type Default__ struct {
+	dummy byte
+}
+
+func New_Default___() *Default__ {
+	_this := Default__{}
+
+	return &_this
+}
+
+type CompanionStruct_Default___ struct {
+}
+
+var Companion_Default___ = CompanionStruct_Default___{}
+
+func (_this *Default__) Equals(other *Default__) bool {
+	return _this == other
+}
+
+func (_this *Default__) EqualsGeneric(x interface{}) bool {
+	other, ok := x.(*Default__)
+	return ok && _this.Equals(other)
+}
+
+func (*Default__) String() string {
+	return "dafny.Default__"
+}
+func (_this *Default__) ParentTraits_() []*TraitID {
+	return [](*TraitID){}
+}
+
+var _ TraitOffspring = &Default__{}
+
+func (_static *CompanionStruct_Default___) SizeAdditionInRange(a uint32, b uint32) bool {
+	var _hresult bool = false
+	_ = _hresult
+	_hresult = (a) <= ((Companion_Default___.SIZE__T__MAX()) - (func() uint32 { return (b) })())
+	return _hresult
+	return _hresult
+}
+func (_static *CompanionStruct_Default___) AppendRecursive(builder *Vector, e Sequence) {
+	if func(_is_0 Sequence) bool {
+		return InstanceOf(_is_0, (*ConcatSequence)(nil))
+	}(e) {
+		var _0_concat *ConcatSequence
+		_ = _0_concat
+		_0_concat = e.(*ConcatSequence)
+		Companion_Default___.AppendRecursive(builder, (_0_concat).Left())
+		Companion_Default___.AppendRecursive(builder, (_0_concat).Right())
+	} else if func(_is_1 Sequence) bool {
+		return InstanceOf(_is_1, (*LazySequence)(nil))
+	}(e) {
+		var _1_lazy *LazySequence
+		_ = _1_lazy
+		_1_lazy = e.(*LazySequence)
+		var _2_boxed Sequence
+		_ = _2_boxed
+		var _out0 interface{}
+		_ = _out0
+		_out0 = ((_1_lazy).Box()).Get()
+		_2_boxed = Companion_Sequence_.CastTo_(_out0)
+		Companion_Default___.AppendRecursive(builder, _2_boxed)
+	} else {
+		var _3_a ImmutableArray
+		_ = _3_a
+		var _out1 ImmutableArray
+		_ = _out1
+		_out1 = (e).ToArray()
+		_3_a = _out1
+		(builder).Append(_3_a)
+	}
+}
+func (_static *CompanionStruct_Default___) AppendOptimized(builder *Vector, e Sequence, stack *Vector) {
+	goto TAIL_CALL_START
+TAIL_CALL_START:
+	if func(_is_2 Sequence) bool {
+		return InstanceOf(_is_2, (*ConcatSequence)(nil))
+	}(e) {
+		var _4_concat *ConcatSequence
+		_ = _4_concat
+		_4_concat = e.(*ConcatSequence)
+		if !(Companion_Default___.SizeAdditionInRange(stack.Size, Companion_Default___.ONE__SIZE())) {
+			panic("dafnyRuntime.dfy[DafnyGo](766,6): " + (SeqOfString("expectation violation")).String())
+		}
+		(stack).AddLast((_4_concat).Right())
+		{
+			var _in0 *Vector = builder
+			_ = _in0
+			var _in1 Sequence = (_4_concat).Left()
+			_ = _in1
+			var _in2 *Vector = stack
+			_ = _in2
+			builder = _in0
+			e = _in1
+			stack = _in2
+			goto TAIL_CALL_START
+			goto L0_0
+		}
+	L0_0:
+	} else if func(_is_3 Sequence) bool {
+		return InstanceOf(_is_3, (*LazySequence)(nil))
+	}(e) {
+		var _5_lazy *LazySequence
+		_ = _5_lazy
+		_5_lazy = e.(*LazySequence)
+		var _6_boxed Sequence
+		_ = _6_boxed
+		var _out2 interface{}
+		_ = _out2
+		_out2 = ((_5_lazy).Box()).Get()
+		_6_boxed = Companion_Sequence_.CastTo_(_out2)
+		var _in3 *Vector = builder
+		_ = _in3
+		var _in4 Sequence = _6_boxed
+		_ = _in4
+		var _in5 *Vector = stack
+		_ = _in5
+		builder = _in3
+		e = _in4
+		stack = _in5
+		goto TAIL_CALL_START
+	} else if func(_is_4 Sequence) bool {
+		return InstanceOf(_is_4, (*ArraySequence)(nil))
+	}(e) {
+		var _7_a *ArraySequence
+		_ = _7_a
+		_7_a = e.(*ArraySequence)
+		(builder).Append((_7_a).Values())
+		if (uint32(0)) < (stack.Size) {
+			var _8_next Sequence
+			_ = _8_next
+			var _out3 interface{}
+			_ = _out3
+			_out3 = (stack).RemoveLast()
+			_8_next = Companion_Sequence_.CastTo_(_out3)
+			{
+				var _in6 *Vector = builder
+				_ = _in6
+				var _in7 Sequence = _8_next
+				_ = _in7
+				var _in8 *Vector = stack
+				_ = _in8
+				builder = _in6
+				e = _in7
+				stack = _in8
+				goto TAIL_CALL_START
+				goto L1_1_0_0_0
+			}
+		L1_1_0_0_0:
+		}
+	} else {
+		if !(false) {
+			panic("dafnyRuntime.dfy[DafnyGo](789,6): " + (SeqOfString("Unsupported Sequence implementation")).String())
+		}
+	}
+}
+func (_static *CompanionStruct_Default___) MIN__SIZE__T__LIMIT() Int {
+	return IntOfInt64(128)
+}
+func (_static *CompanionStruct_Default___) SIZE__T__LIMIT() Int {
+	return IntOfInt64(2147483648)
+}
+func (_static *CompanionStruct_Default___) SIZE__T__MAX() uint32 {
+	return ((Companion_Default___.SIZE__T__LIMIT()).Minus(One)).Uint32()
+}
+func (_static *CompanionStruct_Default___) ZERO__SIZE() uint32 {
+	return uint32(0)
+}
+func (_static *CompanionStruct_Default___) ONE__SIZE() uint32 {
+	return uint32(1)
+}
+func (_static *CompanionStruct_Default___) TWO__SIZE() uint32 {
+	return uint32(2)
+}
+func (_static *CompanionStruct_Default___) TEN__SIZE() uint32 {
+	return uint32(10)
+}
+
+// End of class Default__
+
+// Definition of trait Sequence
+type Sequence interface {
+	String() string
+	Equals(other Sequence) bool
+	EqualsGeneric(x interface{}) bool
+	VerbatimString(isLiteral bool) string
+	SetString() Sequence
+	IsString() bool
+	IsString_set_(value bool)
+	Cardinality() uint32
+	Select(index uint32) interface{}
+	Drop(lo uint32) Sequence
+	Take(hi uint32) Sequence
+	Subsequence(lo uint32, hi uint32) Sequence
+	ToArray() ImmutableArray
+	Elements() Sequence
+	UniqueElements() Set
+}
+
+func (_static *CompanionStruct_Sequence_) SetString(_this Sequence) Sequence {
+	{
+		var ret Sequence = (Sequence)(nil)
+		_ = ret
+		(_this).IsString_set_(true)
+		ret = _this
+		return ret
+		return ret
+	}
+}
+func (_static *CompanionStruct_Sequence_) Select(_this Sequence, index uint32) interface{} {
+	{
+		var ret interface{} = (interface{})(nil)
+		_ = ret
+		var _9_a ImmutableArray
+		_ = _9_a
+		var _out4 ImmutableArray
+		_ = _out4
+		_out4 = (_this).ToArray()
+		_9_a = _out4
+		ret = (_9_a).Select(index)
+		return ret
+		return ret
+	}
+}
+func (_static *CompanionStruct_Sequence_) Drop(_this Sequence, lo uint32) Sequence {
+	{
+		var ret Sequence = (Sequence)(nil)
+		_ = ret
+		var _out5 Sequence
+		_ = _out5
+		_out5 = (_this).Subsequence(lo, (_this).Cardinality())
+		ret = _out5
+		return ret
+	}
+}
+func (_static *CompanionStruct_Sequence_) Take(_this Sequence, hi uint32) Sequence {
+	{
+		var ret Sequence = (Sequence)(nil)
+		_ = ret
+		var _out6 Sequence
+		_ = _out6
+		_out6 = (_this).Subsequence(uint32(0), hi)
+		ret = _out6
+		return ret
+	}
+}
+func (_static *CompanionStruct_Sequence_) Subsequence(_this Sequence, lo uint32, hi uint32) Sequence {
+	{
+		var ret Sequence = (Sequence)(nil)
+		_ = ret
+		var _10_a ImmutableArray
+		_ = _10_a
+		var _out7 ImmutableArray
+		_ = _out7
+		_out7 = (_this).ToArray()
+		_10_a = _out7
+		var _11_subarray ImmutableArray
+		_ = _11_subarray
+		var _out8 ImmutableArray
+		_ = _out8
+		_out8 = (_10_a).Subarray(lo, hi)
+		_11_subarray = _out8
+		var _nw0 *ArraySequence = New_ArraySequence_()
+		_ = _nw0
+		_nw0.Ctor__(_11_subarray, false)
+		ret = _nw0
+		return ret
+	}
+}
+func (_static *CompanionStruct_Sequence_) Elements(_this Sequence) Sequence {
+	{
+		return _this
+	}
+}
+func (_static *CompanionStruct_Sequence_) Create(cardinality uint32, initFn func(uint32) interface{}) Sequence {
+	var ret Sequence = (Sequence)(nil)
+	_ = ret
+	var _12_a NativeArray
+	_ = _12_a
+	var _out9 NativeArray
+	_ = _out9
+	_out9 = Companion_NativeArray_.MakeWithInit(cardinality, func(coer0 func(uint32) interface{}) func(uint32) interface{} {
+		return func(arg0 uint32) interface{} {
+			return coer0(arg0)
+		}
+	}(initFn))
+	_12_a = _out9
+	var _13_frozen ImmutableArray
+	_ = _13_frozen
+	var _out10 ImmutableArray
+	_ = _out10
+	_out10 = (_12_a).Freeze(cardinality)
+	_13_frozen = _out10
+	var _nw1 *ArraySequence = New_ArraySequence_()
+	_ = _nw1
+	_nw1.Ctor__(_13_frozen, false)
+	ret = _nw1
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) EqualUpTo(left Sequence, right Sequence, index uint32) bool {
+	var ret bool = false
+	_ = ret
+	var _hi0 uint32 = index
+	_ = _hi0
+	for _14_i := uint32(0); _14_i < _hi0; _14_i++ {
+		var _15_leftElement interface{}
+		_ = _15_leftElement
+		var _out11 interface{}
+		_ = _out11
+		_out11 = (left).Select(_14_i)
+		_15_leftElement = _out11
+		var _16_rightElement interface{}
+		_ = _16_rightElement
+		var _out12 interface{}
+		_ = _out12
+		_out12 = (right).Select(_14_i)
+		_16_rightElement = _out12
+		if !AreEqual(_15_leftElement, _16_rightElement) {
+			ret = false
+			return ret
+		}
+	}
+	ret = true
+	return ret
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) Equal(left Sequence, right Sequence) bool {
+	var ret bool = false
+	_ = ret
+	if ((left).Cardinality()) != ((right).Cardinality()) /* dircomp */ {
+		ret = false
+		return ret
+	}
+	var _out13 bool
+	_ = _out13
+	_out13 = Companion_Sequence_.EqualUpTo(left, right, (left).Cardinality())
+	ret = _out13
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) IsPrefixOf(left Sequence, right Sequence) bool {
+	var ret bool = false
+	_ = ret
+	if ((right).Cardinality()) < ((left).Cardinality()) {
+		ret = false
+		return ret
+	}
+	var _out14 bool
+	_ = _out14
+	_out14 = Companion_Sequence_.EqualUpTo(left, right, (left).Cardinality())
+	ret = _out14
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) IsProperPrefixOf(left Sequence, right Sequence) bool {
+	var ret bool = false
+	_ = ret
+	if ((right).Cardinality()) <= ((left).Cardinality()) {
+		ret = false
+		return ret
+	}
+	var _out15 bool
+	_ = _out15
+	_out15 = Companion_Sequence_.EqualUpTo(left, right, (left).Cardinality())
+	ret = _out15
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) Contains(s Sequence, t interface{}) bool {
+	var _hresult bool = false
+	_ = _hresult
+	var _hi1 uint32 = (s).Cardinality()
+	_ = _hi1
+	for _17_i := Companion_Default___.ZERO__SIZE(); _17_i < _hi1; _17_i++ {
+		var _18_element interface{}
+		_ = _18_element
+		var _out16 interface{}
+		_ = _out16
+		_out16 = (s).Select(_17_i)
+		_18_element = _out16
+		if AreEqual(_18_element, t) {
+			_hresult = true
+			return _hresult
+		}
+	}
+	_hresult = false
+	return _hresult
+	return _hresult
+}
+func (_static *CompanionStruct_Sequence_) Update(s Sequence, i uint32, t interface{}) Sequence {
+	var ret Sequence = (Sequence)(nil)
+	_ = ret
+	var _19_a ImmutableArray
+	_ = _19_a
+	var _out17 ImmutableArray
+	_ = _out17
+	_out17 = (s).ToArray()
+	_19_a = _out17
+	var _20_newValue NativeArray
+	_ = _20_newValue
+	var _out18 NativeArray
+	_ = _out18
+	_out18 = Companion_NativeArray_.Copy(_19_a)
+	_20_newValue = _out18
+	(_20_newValue).Update(i, t)
+	var _21_newValueFrozen ImmutableArray
+	_ = _21_newValueFrozen
+	var _out19 ImmutableArray
+	_ = _out19
+	_out19 = (_20_newValue).Freeze((_20_newValue).Length())
+	_21_newValueFrozen = _out19
+	var _nw2 *ArraySequence = New_ArraySequence_()
+	_ = _nw2
+	_nw2.Ctor__(_21_newValueFrozen, false)
+	ret = _nw2
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) Concatenate(left Sequence, right Sequence) Sequence {
+	var ret Sequence = (Sequence)(nil)
+	_ = ret
+	if !(Companion_Default___.SizeAdditionInRange((left).Cardinality(), (right).Cardinality())) {
+		panic("dafnyRuntime.dfy[DafnyGo](594,6): " + (Companion_Sequence_.Concatenate(Companion_Sequence_.Concatenate(SeqOfString("Concatenation result cardinality would be larger than the maximum ("), Companion_Helpers_.DafnyValueToDafnyString(Companion_Default___.SIZE__T__MAX())), SeqOfString(")"))).String())
+	}
+	var _22_left_k Sequence
+	_ = _22_left_k
+	_22_left_k = left
+	if func(_is_5 Sequence) bool {
+		return InstanceOf(_is_5, (*LazySequence)(nil))
+	}(left) {
+		var _23_lazyLeft *LazySequence
+		_ = _23_lazyLeft
+		_23_lazyLeft = left.(*LazySequence)
+		var _out20 interface{}
+		_ = _out20
+		_out20 = ((_23_lazyLeft).Box()).Get()
+		_22_left_k = Companion_Sequence_.CastTo_(_out20)
+	}
+	var _24_right_k Sequence
+	_ = _24_right_k
+	_24_right_k = right
+	if func(_is_6 Sequence) bool {
+		return InstanceOf(_is_6, (*LazySequence)(nil))
+	}(right) {
+		var _25_lazyRight *LazySequence
+		_ = _25_lazyRight
+		_25_lazyRight = right.(*LazySequence)
+		var _out21 interface{}
+		_ = _out21
+		_out21 = ((_25_lazyRight).Box()).Get()
+		_24_right_k = Companion_Sequence_.CastTo_(_out21)
+	}
+	var _26_c *ConcatSequence
+	_ = _26_c
+	var _nw3 *ConcatSequence = New_ConcatSequence_()
+	_ = _nw3
+	_nw3.Ctor__(_22_left_k, _24_right_k)
+	_26_c = _nw3
+	var _nw4 *LazySequence = New_LazySequence_()
+	_ = _nw4
+	_nw4.Ctor__(_26_c)
+	ret = _nw4
+	return ret
+}
+
+type CompanionStruct_Sequence_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_Sequence_ = CompanionStruct_Sequence_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_Sequence_) CastTo_(x interface{}) Sequence {
+	var t Sequence
+	t, _ = x.(Sequence)
+	return t
+}
+
+// End of trait Sequence
+
+// Definition of trait Validatable
+type Validatable interface {
+	String() string
+}
+type CompanionStruct_Validatable_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_Validatable_ = CompanionStruct_Validatable_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_Validatable_) CastTo_(x interface{}) Validatable {
+	var t Validatable
+	t, _ = x.(Validatable)
+	return t
+}
+
+// End of trait Validatable
+
+// Definition of class Size__t
+type Size__t struct {
+}
+
+func New_Size__t_() *Size__t {
+	_this := Size__t{}
+
+	return &_this
+}
+
+type CompanionStruct_Size__t_ struct {
+}
+
+var Companion_Size__t_ = CompanionStruct_Size__t_{}
+
+func (*Size__t) String() string {
+	return "dafny.Size__t"
+}
+func (_this *Size__t) ParentTraits_() []*TraitID {
+	return [](*TraitID){}
+}
+
+var _ TraitOffspring = &Size__t{}
+
+func (_this *CompanionStruct_Size__t_) IntegerRange(lo Int, hi Int) Iterator {
+	iter := IntegerRange(lo, hi)
+	return func() (interface{}, bool) {
+		next, ok := iter()
+		if !ok {
+			return uint32(0), false
+		}
+		return next.(Int).Uint32(), true
+	}
+}
+func (_this *CompanionStruct_Size__t_) Witness() uint32 {
+	return (Zero).Uint32()
+}
+
+// End of class Size__t
+
+func Type_Size__t_() TypeDescriptor {
+	return type_Size__t_{}
+}
+
+type type_Size__t_ struct {
+}
+
+func (_this type_Size__t_) Default() interface{} {
+	return Companion_Size__t_.Witness()
+}
+
+func (_this type_Size__t_) String() string {
+	return "dafny.Size__t"
+}
+
+// Definition of trait NativeArray
+type NativeArray interface {
+	String() string
+	Length() uint32
+	Select(i uint32) interface{}
+	Update(i uint32, t interface{})
+	UpdateSubarray(start uint32, other ImmutableArray)
+	Freeze(size uint32) ImmutableArray
+}
+type CompanionStruct_NativeArray_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_NativeArray_ = CompanionStruct_NativeArray_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_NativeArray_) CastTo_(x interface{}) NativeArray {
+	var t NativeArray
+	t, _ = x.(NativeArray)
+	return t
+}
+
+// End of trait NativeArray
+
+// Definition of datatype ArrayCell
+type ArrayCell struct {
+	Data_ArrayCell_
+}
+
+func (_this ArrayCell) Get_() Data_ArrayCell_ {
+	return _this.Data_ArrayCell_
+}
+
+type Data_ArrayCell_ interface {
+	isArrayCell()
+}
+
+type CompanionStruct_ArrayCell_ struct {
+}
+
+var Companion_ArrayCell_ = CompanionStruct_ArrayCell_{}
+
+type ArrayCell_Set struct {
+	Value interface{}
+}
+
+func (ArrayCell_Set) isArrayCell() {}
+
+func (CompanionStruct_ArrayCell_) Create_Set_(Value interface{}) ArrayCell {
+	return ArrayCell{ArrayCell_Set{Value}}
+}
+
+func (_this ArrayCell) Is_Set() bool {
+	_, ok := _this.Get_().(ArrayCell_Set)
+	return ok
+}
+
+type ArrayCell_Unset struct {
+}
+
+func (ArrayCell_Unset) isArrayCell() {}
+
+func (CompanionStruct_ArrayCell_) Create_Unset_() ArrayCell {
+	return ArrayCell{ArrayCell_Unset{}}
+}
+
+func (_this ArrayCell) Is_Unset() bool {
+	_, ok := _this.Get_().(ArrayCell_Unset)
+	return ok
+}
+
+func (CompanionStruct_ArrayCell_) Default() ArrayCell {
+	return Companion_ArrayCell_.Create_Unset_()
+}
+
+func (_this ArrayCell) Dtor_value() interface{} {
+	return _this.Get_().(ArrayCell_Set).Value
+}
+
+func (_this ArrayCell) String() string {
+	switch data := _this.Get_().(type) {
+	case nil:
+		return "null"
+	case ArrayCell_Set:
+		{
+			return "DafnyGo.ArrayCell.Set" + "(" + String(data.Value) + ")"
+		}
+	case ArrayCell_Unset:
+		{
+			return "DafnyGo.ArrayCell.Unset"
+		}
+	default:
+		{
+			return "<unexpected>"
+		}
+	}
+}
+
+func (_this ArrayCell) Equals(other ArrayCell) bool {
+	switch data1 := _this.Get_().(type) {
+	case ArrayCell_Set:
+		{
+			data2, ok := other.Get_().(ArrayCell_Set)
+			return ok && AreEqual(data1.Value, data2.Value)
+		}
+	case ArrayCell_Unset:
+		{
+			_, ok := other.Get_().(ArrayCell_Unset)
+			return ok
+		}
+	default:
+		{
+			return false // unexpected
+		}
+	}
+}
+
+func (_this ArrayCell) EqualsGeneric(other interface{}) bool {
+	typed, ok := other.(ArrayCell)
+	return ok && _this.Equals(typed)
+}
+
+func Type_ArrayCell_() TypeDescriptor {
+	return type_ArrayCell_{}
+}
+
+type type_ArrayCell_ struct {
+}
+
+func (_this type_ArrayCell_) Default() interface{} {
+	return Companion_ArrayCell_.Default()
+}
+
+func (_this type_ArrayCell_) String() string {
+	return "dafny.ArrayCell"
+}
+func (_this ArrayCell) ParentTraits_() []*TraitID {
+	return [](*TraitID){}
+}
+
+var _ TraitOffspring = ArrayCell{}
+
+// End of datatype ArrayCell
+
+// Definition of trait ImmutableArray
+type ImmutableArray interface {
+	String() string
+	Length() uint32
+	Select(index uint32) interface{}
+	Subarray(lo uint32, hi uint32) ImmutableArray
+}
+type CompanionStruct_ImmutableArray_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_ImmutableArray_ = CompanionStruct_ImmutableArray_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_ImmutableArray_) CastTo_(x interface{}) ImmutableArray {
+	var t ImmutableArray
+	t, _ = x.(ImmutableArray)
+	return t
+}
+
+// End of trait ImmutableArray
+
+// Definition of class Vector
+type Vector struct {
+	Storage NativeArray
+	Size    uint32
+}
+
+func New_Vector_() *Vector {
+	_this := Vector{}
+
+	_this.Storage = (NativeArray)(nil)
+	_this.Size = Companion_Size__t_.Witness()
+	return &_this
+}
+
+type CompanionStruct_Vector_ struct {
+}
+
+var Companion_Vector_ = CompanionStruct_Vector_{}
+
+func (_this *Vector) Equals(other *Vector) bool {
+	return _this == other
+}
+
+func (_this *Vector) EqualsGeneric(x interface{}) bool {
+	other, ok := x.(*Vector)
+	return ok && _this.Equals(other)
+}
+
+func (*Vector) String() string {
+	return "dafny.Vector"
+}
+
+func Type_Vector_(Type_T_ TypeDescriptor) TypeDescriptor {
+	return type_Vector_{Type_T_}
+}
+
+type type_Vector_ struct {
+	Type_T_ TypeDescriptor
+}
+
+func (_this type_Vector_) Default() interface{} {
+	return (*Vector)(nil)
+}
+
+func (_this type_Vector_) String() string {
+	return "dafny.Vector"
+}
+func (_this *Vector) ParentTraits_() []*TraitID {
+	return [](*TraitID){Companion_Validatable_.TraitID_}
+}
+
+var _ Validatable = &Vector{}
+var _ TraitOffspring = &Vector{}
+
+func (_this *Vector) Ctor__(length uint32) {
+	{
+		var _27_storage NativeArray
+		_ = _27_storage
+		var _out22 NativeArray
+		_ = _out22
+		_out22 = Companion_NativeArray_.Make(length)
+		_27_storage = _out22
+		(_this).Storage = _27_storage
+		(_this).Size = uint32(0)
+	}
+}
+func (_this *Vector) Select(index uint32) interface{} {
+	{
+		return (_this.Storage).Select(index)
+	}
+}
+func (_this *Vector) Last() interface{} {
+	{
+		return (_this.Storage).Select((_this.Size) - (func() uint32 { return (uint32(1)) })())
+	}
+}
+func (_this *Vector) AddLast(t interface{}) {
+	{
+		(_this).EnsureCapacity((_this.Size) + (Companion_Default___.ONE__SIZE()))
+		(_this.Storage).Update(_this.Size, t)
+		(_this).Size = (_this.Size) + (uint32(1))
+	}
+}
+func (_this *Vector) Max(a uint32, b uint32) uint32 {
+	{
+		if (a) < (b) {
+			return b
+		} else {
+			return a
+		}
+	}
+}
+func (_this *Vector) EnsureCapacity(newMinCapacity uint32) {
+	{
+		if ((_this.Storage).Length()) >= (newMinCapacity) {
+			return
+		}
+		var _28_newCapacity uint32
+		_ = _28_newCapacity
+		_28_newCapacity = newMinCapacity
+		if ((_this.Storage).Length()) <= ((Companion_Default___.SIZE__T__MAX()) / (Companion_Default___.TWO__SIZE())) {
+			_28_newCapacity = (_this).Max(_28_newCapacity, ((_this.Storage).Length())*(Companion_Default___.TWO__SIZE()))
+		}
+		var _29_newStorage NativeArray
+		_ = _29_newStorage
+		var _out23 NativeArray
+		_ = _out23
+		_out23 = Companion_NativeArray_.Make(_28_newCapacity)
+		_29_newStorage = _out23
+		var _30_values ImmutableArray
+		_ = _30_values
+		var _out24 ImmutableArray
+		_ = _out24
+		_out24 = (_this.Storage).Freeze(_this.Size)
+		_30_values = _out24
+		(_29_newStorage).UpdateSubarray(uint32(0), _30_values)
+		(_this).Storage = _29_newStorage
+	}
+}
+func (_this *Vector) RemoveLast() interface{} {
+	{
+		var t interface{} = (interface{})(nil)
+		_ = t
+		t = (_this.Storage).Select((_this.Size) - (func() uint32 { return (uint32(1)) })())
+		(_this).Size = (_this.Size) - (func() uint32 { return (uint32(1)) })()
+		return t
+	}
+}
+func (_this *Vector) Append(other ImmutableArray) {
+	{
+		var _31_newSize uint32
+		_ = _31_newSize
+		_31_newSize = (_this.Size) + ((other).Length())
+		(_this).EnsureCapacity(_31_newSize)
+		(_this.Storage).UpdateSubarray(_this.Size, other)
+		(_this).Size = (_this.Size) + ((other).Length())
+	}
+}
+func (_this *Vector) Freeze() ImmutableArray {
+	{
+		var ret ImmutableArray = (ImmutableArray)(nil)
+		_ = ret
+		var _out25 ImmutableArray
+		_ = _out25
+		_out25 = (_this.Storage).Freeze(_this.Size)
+		ret = _out25
+		return ret
+	}
+}
+
+// End of class Vector
+
+// Definition of trait AtomicBox
+type AtomicBox interface {
+	String() string
+	Get() interface{}
+	Put(t interface{})
+}
+type CompanionStruct_AtomicBox_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_AtomicBox_ = CompanionStruct_AtomicBox_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_AtomicBox_) CastTo_(x interface{}) AtomicBox {
+	var t AtomicBox
+	t, _ = x.(AtomicBox)
+	return t
+}
+
+// End of trait AtomicBox
+
+// Definition of class ArraySequence
+type ArraySequence struct {
+	_isString bool
+	_values   ImmutableArray
+}
+
+func New_ArraySequence_() *ArraySequence {
+	_this := ArraySequence{}
+
+	_this._isString = false
+	_this._values = (ImmutableArray)(nil)
+	return &_this
+}
+
+type CompanionStruct_ArraySequence_ struct {
+}
+
+var Companion_ArraySequence_ = CompanionStruct_ArraySequence_{}
+
+func Type_ArraySequence_(Type_T_ TypeDescriptor) TypeDescriptor {
+	return type_ArraySequence_{Type_T_}
+}
+
+type type_ArraySequence_ struct {
+	Type_T_ TypeDescriptor
+}
+
+func (_this type_ArraySequence_) Default() interface{} {
+	return (*ArraySequence)(nil)
+}
+
+func (_this type_ArraySequence_) String() string {
+	return "dafny.ArraySequence"
+}
+func (_this *ArraySequence) ParentTraits_() []*TraitID {
+	return [](*TraitID){Companion_Sequence_.TraitID_}
+}
+
+var _ Sequence = &ArraySequence{}
+var _ TraitOffspring = &ArraySequence{}
+
+func (_this *ArraySequence) SetString() Sequence {
+	var _out26 Sequence
+	_ = _out26
+	_out26 = Companion_Sequence_.SetString(_this)
+	return _out26
+}
+func (_this *ArraySequence) IsString() bool {
+	return _this._isString
+}
+func (_this *ArraySequence) IsString_set_(value bool) {
+	_this._isString = value
+}
+func (_this *ArraySequence) Select(index uint32) interface{} {
+	var _out27 interface{}
+	_ = _out27
+	_out27 = Companion_Sequence_.Select(_this, index)
+	return _out27
+}
+func (_this *ArraySequence) Drop(lo uint32) Sequence {
+	var _out28 Sequence
+	_ = _out28
+	_out28 = Companion_Sequence_.Drop(_this, lo)
+	return _out28
+}
+func (_this *ArraySequence) Take(hi uint32) Sequence {
+	var _out29 Sequence
+	_ = _out29
+	_out29 = Companion_Sequence_.Take(_this, hi)
+	return _out29
+}
+func (_this *ArraySequence) Subsequence(lo uint32, hi uint32) Sequence {
+	var _out30 Sequence
+	_ = _out30
+	_out30 = Companion_Sequence_.Subsequence(_this, lo, hi)
+	return _out30
+}
+func (_this *ArraySequence) Elements() Sequence {
+	return Companion_Sequence_.Elements(_this)
+}
+func (_this *ArraySequence) Ctor__(value ImmutableArray, isString bool) {
+	{
+		(_this)._values = value
+		(_this)._isString = isString
+	}
+}
+func (_this *ArraySequence) Cardinality() uint32 {
+	{
+		return ((_this).Values()).Length()
+	}
+}
+func (_this *ArraySequence) ToArray() ImmutableArray {
+	{
+		var ret ImmutableArray = (ImmutableArray)(nil)
+		_ = ret
+		ret = (_this).Values()
+		return ret
+		return ret
+	}
+}
+func (_this *ArraySequence) Values() ImmutableArray {
+	{
+		return _this._values
+	}
+}
+
+// End of class ArraySequence
+
+// Definition of class ConcatSequence
+type ConcatSequence struct {
+	_isString bool
+	_left     Sequence
+	_right    Sequence
+	_length   uint32
+}
+
+func New_ConcatSequence_() *ConcatSequence {
+	_this := ConcatSequence{}
+
+	_this._isString = false
+	_this._left = (Sequence)(nil)
+	_this._right = (Sequence)(nil)
+	_this._length = Companion_Size__t_.Witness()
+	return &_this
+}
+
+type CompanionStruct_ConcatSequence_ struct {
+}
+
+var Companion_ConcatSequence_ = CompanionStruct_ConcatSequence_{}
+
+func Type_ConcatSequence_(Type_T_ TypeDescriptor) TypeDescriptor {
+	return type_ConcatSequence_{Type_T_}
+}
+
+type type_ConcatSequence_ struct {
+	Type_T_ TypeDescriptor
+}
+
+func (_this type_ConcatSequence_) Default() interface{} {
+	return (*ConcatSequence)(nil)
+}
+
+func (_this type_ConcatSequence_) String() string {
+	return "dafny.ConcatSequence"
+}
+func (_this *ConcatSequence) ParentTraits_() []*TraitID {
+	return [](*TraitID){Companion_Sequence_.TraitID_}
+}
+
+var _ Sequence = &ConcatSequence{}
+var _ TraitOffspring = &ConcatSequence{}
+
+func (_this *ConcatSequence) SetString() Sequence {
+	var _out31 Sequence
+	_ = _out31
+	_out31 = Companion_Sequence_.SetString(_this)
+	return _out31
+}
+func (_this *ConcatSequence) IsString() bool {
+	return _this._isString
+}
+func (_this *ConcatSequence) IsString_set_(value bool) {
+	_this._isString = value
+}
+func (_this *ConcatSequence) Select(index uint32) interface{} {
+	var _out32 interface{}
+	_ = _out32
+	_out32 = Companion_Sequence_.Select(_this, index)
+	return _out32
+}
+func (_this *ConcatSequence) Drop(lo uint32) Sequence {
+	var _out33 Sequence
+	_ = _out33
+	_out33 = Companion_Sequence_.Drop(_this, lo)
+	return _out33
+}
+func (_this *ConcatSequence) Take(hi uint32) Sequence {
+	var _out34 Sequence
+	_ = _out34
+	_out34 = Companion_Sequence_.Take(_this, hi)
+	return _out34
+}
+func (_this *ConcatSequence) Subsequence(lo uint32, hi uint32) Sequence {
+	var _out35 Sequence
+	_ = _out35
+	_out35 = Companion_Sequence_.Subsequence(_this, lo, hi)
+	return _out35
+}
+func (_this *ConcatSequence) Elements() Sequence {
+	return Companion_Sequence_.Elements(_this)
+}
+func (_this *ConcatSequence) Ctor__(left Sequence, right Sequence) {
+	{
+		(_this)._left = left
+		(_this)._right = right
+		(_this)._length = ((left).Cardinality()) + ((right).Cardinality())
+		(_this)._isString = (left.IsString()) || (right.IsString())
+	}
+}
+func (_this *ConcatSequence) Cardinality() uint32 {
+	{
+		return (_this).Length()
+	}
+}
+func (_this *ConcatSequence) ToArray() ImmutableArray {
+	{
+		var ret ImmutableArray = (ImmutableArray)(nil)
+		_ = ret
+		var _32_builder *Vector
+		_ = _32_builder
+		var _nw5 *Vector = New_Vector_()
+		_ = _nw5
+		_nw5.Ctor__((_this).Length())
+		_32_builder = _nw5
+		var _33_stack *Vector
+		_ = _33_stack
+		var _nw6 *Vector = New_Vector_()
+		_ = _nw6
+		_nw6.Ctor__(Companion_Default___.TEN__SIZE())
+		_33_stack = _nw6
+		Companion_Default___.AppendOptimized(_32_builder, _this, _33_stack)
+		var _out36 ImmutableArray
+		_ = _out36
+		_out36 = (_32_builder).Freeze()
+		ret = _out36
+		return ret
+	}
+}
+func (_this *ConcatSequence) Left() Sequence {
+	{
+		return _this._left
+	}
+}
+func (_this *ConcatSequence) Right() Sequence {
+	{
+		return _this._right
+	}
+}
+func (_this *ConcatSequence) Length() uint32 {
+	{
+		return _this._length
+	}
+}
+
+// End of class ConcatSequence
+
+// Definition of class LazySequence
+type LazySequence struct {
+	_isString bool
+	_length   uint32
+	_box      AtomicBox
+}
+
+func New_LazySequence_() *LazySequence {
+	_this := LazySequence{}
+
+	_this._isString = false
+	_this._length = Companion_Size__t_.Witness()
+	_this._box = (AtomicBox)(nil)
+	return &_this
+}
+
+type CompanionStruct_LazySequence_ struct {
+}
+
+var Companion_LazySequence_ = CompanionStruct_LazySequence_{}
+
+func Type_LazySequence_(Type_T_ TypeDescriptor) TypeDescriptor {
+	return type_LazySequence_{Type_T_}
+}
+
+type type_LazySequence_ struct {
+	Type_T_ TypeDescriptor
+}
+
+func (_this type_LazySequence_) Default() interface{} {
+	return (*LazySequence)(nil)
+}
+
+func (_this type_LazySequence_) String() string {
+	return "dafny.LazySequence"
+}
+func (_this *LazySequence) ParentTraits_() []*TraitID {
+	return [](*TraitID){Companion_Sequence_.TraitID_}
+}
+
+var _ Sequence = &LazySequence{}
+var _ TraitOffspring = &LazySequence{}
+
+func (_this *LazySequence) SetString() Sequence {
+	var _out37 Sequence
+	_ = _out37
+	_out37 = Companion_Sequence_.SetString(_this)
+	return _out37
+}
+func (_this *LazySequence) IsString() bool {
+	return _this._isString
+}
+func (_this *LazySequence) IsString_set_(value bool) {
+	_this._isString = value
+}
+func (_this *LazySequence) Select(index uint32) interface{} {
+	var _out38 interface{}
+	_ = _out38
+	_out38 = Companion_Sequence_.Select(_this, index)
+	return _out38
+}
+func (_this *LazySequence) Drop(lo uint32) Sequence {
+	var _out39 Sequence
+	_ = _out39
+	_out39 = Companion_Sequence_.Drop(_this, lo)
+	return _out39
+}
+func (_this *LazySequence) Take(hi uint32) Sequence {
+	var _out40 Sequence
+	_ = _out40
+	_out40 = Companion_Sequence_.Take(_this, hi)
+	return _out40
+}
+func (_this *LazySequence) Subsequence(lo uint32, hi uint32) Sequence {
+	var _out41 Sequence
+	_ = _out41
+	_out41 = Companion_Sequence_.Subsequence(_this, lo, hi)
+	return _out41
+}
+func (_this *LazySequence) Elements() Sequence {
+	return Companion_Sequence_.Elements(_this)
+}
+func (_this *LazySequence) Ctor__(wrapped Sequence) {
+	{
+		var _34_box AtomicBox
+		_ = _34_box
+		var _out42 AtomicBox
+		_ = _out42
+		_out42 = Companion_AtomicBox_.Make(wrapped)
+		_34_box = _out42
+		(_this)._box = _34_box
+		(_this)._length = (wrapped).Cardinality()
+		(_this)._isString = wrapped.IsString()
+	}
+}
+func (_this *LazySequence) Cardinality() uint32 {
+	{
+		return (_this).Length()
+	}
+}
+func (_this *LazySequence) ToArray() ImmutableArray {
+	{
+		var ret ImmutableArray = (ImmutableArray)(nil)
+		_ = ret
+		var _35_expr Sequence
+		_ = _35_expr
+		var _out43 interface{}
+		_ = _out43
+		_out43 = ((_this).Box()).Get()
+		_35_expr = Companion_Sequence_.CastTo_(_out43)
+		var _out44 ImmutableArray
+		_ = _out44
+		_out44 = (_35_expr).ToArray()
+		ret = _out44
+		var _36_arraySeq *ArraySequence
+		_ = _36_arraySeq
+		var _nw7 *ArraySequence = New_ArraySequence_()
+		_ = _nw7
+		_nw7.Ctor__(ret, false)
+		_36_arraySeq = _nw7
+		((_this).Box()).Put(_36_arraySeq)
+		return ret
+	}
+}
+func (_this *LazySequence) Length() uint32 {
+	{
+		return _this._length
+	}
+}
+func (_this *LazySequence) Box() AtomicBox {
+	{
+		return _this._box
+	}
+}
+
+// End of class LazySequence
+
+// Definition of trait Helpers
+type Helpers interface {
+	String() string
+}
+type CompanionStruct_Helpers_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_Helpers_ = CompanionStruct_Helpers_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_Helpers_) CastTo_(x interface{}) Helpers {
+	var t Helpers
+	t, _ = x.(Helpers)
+	return t
+}
+
+// End of trait Helpers
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo-gomod/dafny/dafny_test.go b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/dafny/dafny_test.go
new file mode 100644
index 00000000000..d2d73049353
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/dafny/dafny_test.go
@@ -0,0 +1,45 @@
+package dafny
+
+import "testing"
+
+// These tests are currently just useful sanity checks on the interface
+// between the manually-written and Dafny-generated Go code,
+// but could easily be expanded to include more unit tests in the future.
+
+func TestArraySequence(t *testing.T) {
+	arrSeq := MakeArraySequence()
+	AssertImplementsSequence(arrSeq, t)
+}
+
+func MakeArraySequence() Sequence {
+	arr := GoNativeArray{}
+	arrSeq := New_ArraySequence_()
+	arrSeq.Ctor__(arr, false)
+	return arrSeq
+}
+
+func TestConcatSequence(t *testing.T) {
+	left := MakeArraySequence()
+	right := MakeArraySequence()
+
+	concatSeq := New_ConcatSequence_()
+	concatSeq.Ctor__(left, right)
+
+	AssertImplementsSequence(concatSeq, t)
+}
+
+func TestLazySequence(t *testing.T) {
+	arrSeq := MakeArraySequence()
+
+	lazySeq := New_LazySequence_()
+	lazySeq.Ctor__(arrSeq)
+
+	AssertImplementsSequence(lazySeq, t)
+}
+
+func AssertImplementsSequence(s interface{}, t *testing.T) {
+	_, ok := s.(Sequence)
+	if !ok {
+		t.Errorf("Expected %v to implement the Sequence interface", s)
+	}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo-gomod/go.mod b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/go.mod
new file mode 100644
index 00000000000..113f3e90309
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeGo-gomod/go.mod
@@ -0,0 +1,3 @@
+module github.com/dafny-lang/DafnyRuntimeGo/v4
+
+go 1.21
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo/DafnyRuntime.go b/Source/DafnyRuntime/DafnyRuntimeGo/DafnyRuntime.go
deleted file mode 100644
index f5288328cda..00000000000
--- a/Source/DafnyRuntime/DafnyRuntimeGo/DafnyRuntime.go
+++ /dev/null
@@ -1,3129 +0,0 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
-package dafny
-
-import (
-  "fmt"
-  big "math/big"
-  refl "reflect"
-  "runtime"
-  "unicode/utf8"
-  "os"
-)
-
-func FromMainArguments(args []string) Sequence {
-  var size = len(args)
-  var dafnyArgs []interface{} = make([]interface{}, size)
-  for i, item := range args {
-    dafnyArgs[i] = SeqOfString(item)
-  }
-  return SeqOf(dafnyArgs...)
-}
-
-func UnicodeFromMainArguments(args []string) Sequence {
-  var size = len(args)
-  var dafnyArgs []interface{} = make([]interface{}, size)
-  for i, item := range args {
-    dafnyArgs[i] = UnicodeSeqOfUtf8Bytes(item)
-  }
-  return SeqOf(dafnyArgs...)
-}
-
-/******************************************************************************
- * Generic values
- ******************************************************************************/
-
-// An EqualsGeneric can be compared to any other object.  This method should
-// *only* return true when the other value is of the same type.
-type EqualsGeneric interface {
-  EqualsGeneric(other interface{}) bool
-}
-
-// AreEqual compares two values for equality in a generic way.  Besides the
-// refl.DeepEqual logic (to which this method defers as a last resort), the
-// values are handled intelligently if their type is refl.Value or any type that
-// implements the EqualsGeneric interface.
-func AreEqual(x, y interface{}) bool {
-  if IsDafnyNull(x) {
-    return IsDafnyNull(y)
-  }
-  if IsDafnyNull(y) {
-    return false
-  }
-  switch x := x.(type) {
-  case refl.Value:
-    {
-      y, ok := y.(refl.Value)
-      return ok && x.CanInterface() && y.CanInterface() &&
-        AreEqual(x.Interface(), y.Interface())
-    }
-  case EqualsGeneric:
-    return x.EqualsGeneric(y)
-  default:
-    return refl.DeepEqual(x, y)
-  }
-}
-
-func IsDafnyNull(x interface{}) bool {
-  if x == nil {
-    return true
-  }
-  v := refl.ValueOf(x)
-  if v.Kind() == refl.Ptr {
-    return v.IsNil()
-  }
-  return false
-}
-
-func isNil(v refl.Value) bool {
-  switch v.Kind() {
-  case refl.Chan, refl.Func, refl.Map, refl.Ptr, refl.Slice:
-    return v.IsNil()
-  case refl.Interface:
-    return v.IsNil() || v.Elem().IsNil()
-  default:
-    return false
-  }
-}
-
-// String formats the given value using fmt.Sprint, unless it's nil, in which
-// case it formats it as "null" to conform to other languages' output.
-func String(x interface{}) string {
-  if x == nil {
-    return "null"
-  }
-  v := refl.ValueOf(x)
-  if isNil(v) {
-    return "null"
-  }
-  if v.Kind() == refl.Func {
-    return v.Type().String()
-  }
-  return fmt.Sprint(x)
-}
-
-// Print prints the given value using fmt.Print, formatted using String.
-func Print(x interface{}) {
-  fmt.Print(String(x))
-}
-
-// SetFinalizer is a re-export of runtime.SetFinalizer.  Included here so that
-// only this module needs to be imported by every Dafny module.
-func SetFinalizer(x interface{}, f interface{}) {
-  runtime.SetFinalizer(x, f)
-}
-
-/******************************************************************************
- * Run-time type descriptors (RTDs)
- ******************************************************************************/
-
-// A TypeDescriptor has the ability to produce a default value for an associated type.
-type TypeDescriptor interface {
-  Default() interface{}
-}
-
-func CreateStandardTypeDescriptor(value interface{}) TypeDescriptor {
-  return standardTypeDescriptor{value}
-}
-
-type standardTypeDescriptor struct {
-  defaultValue interface{}
-}
-
-func (rtd standardTypeDescriptor) Default() interface{} {
-  return rtd.defaultValue
-}
-
-// IntType is the RTD for int
-var IntType = CreateStandardTypeDescriptor(Zero)
-
-// BoolType is the RTD of bool
-var BoolType = CreateStandardTypeDescriptor(false)
-
-// CharType is the RTD of char
-var CharType = CreateStandardTypeDescriptor(Char('D')) // See CharType.DefaultValue in Dafny source code
-
-// CodePointType is the RTD of char
-var CodePointType = CreateStandardTypeDescriptor(CodePoint('D'))  // See CharType.DefaultValue in Dafny source code
-
-// RealType is the RTD for real
-var RealType = CreateStandardTypeDescriptor(ZeroReal)
-
-// Int64Type is the RTD of int64.
-var Int64Type = CreateStandardTypeDescriptor(int64(0))
-
-// PossiblyNullType is the RTD of any possibly null reference type
-var PossiblyNullType = CreateStandardTypeDescriptor((*interface{})(nil))
-
-// Uint8Type is the RTD of uint8
-var Uint8Type = CreateStandardTypeDescriptor(uint8(0))
-
-// Uint16Type is the RTD of uint16
-var Uint16Type = CreateStandardTypeDescriptor(uint16(0))
-
-// Uint32Type is the RTD of uint32
-var Uint32Type = CreateStandardTypeDescriptor(uint32(0))
-
-// Uint64Type is the RTD of uint64
-var Uint64Type = CreateStandardTypeDescriptor(uint64(0))
-
-// SetType is the RTD for sets
-var SetType = CreateStandardTypeDescriptor(EmptySet)
-
-// MultiSetType is the RTD for multisets
-var MultiSetType = CreateStandardTypeDescriptor(EmptyMultiSet)
-
-// SeqType is the RTD for sequences
-var SeqType = CreateStandardTypeDescriptor(EmptySeq)
-
-// MapType is the RTD for maps
-var MapType = CreateStandardTypeDescriptor(EmptyMap)
-
-/******************************************************************************
- * Trait parent information
- ******************************************************************************/
-
-// Every class gets compiled to have a ParentTraits_ method, which returns the
-// list of Dafny parent traits (including transitive parent traits). This is
-// used to determine, at run time, if a given object satisfies a particular trait.
-// While it is unusual that this information is needed, it is needed in a situation
-// like
-//   var s: set<UberTrait> := ...
-//   // the following line requires run-time check that t (of type UberTrait) is a Trait
-//   var ts := set t: Trait | t in s;
-// A more straightforward situation is the expression
-//   x is Trait
-
-type TraitID struct {
-  dummy byte
-}
-
-type TraitOffspring interface {
-  ParentTraits_() []*TraitID
-}
-
-func InstanceOfTrait(obj TraitOffspring, trait *TraitID) bool {
-  for _, parent := range obj.ParentTraits_() {
-    if parent == trait {
-      return true
-    }
-  }
-  return false
-}
-
-// Use this method to test if an object "p" has a given class type (denoted by the
-// type of "q"). More generally, this method returns true if p and q are of the
-// same type. It is assumed that neither "p" nor "q" denotes a Dafny "null" value.
-
-func InstanceOf(p interface{}, q interface{}) bool {
-  return refl.TypeOf(p) == refl.TypeOf(q)
-}
-
-/******************************************************************************
- * Object
- ******************************************************************************/
-
-type Object struct {
-  dummy byte
-}
-
-func New_Object() *Object {
-  _this := Object{}
-  return &_this
-}
-
-func (_this *Object) Equals(other *Object) bool {
-  return _this == other
-}
-
-func (_this *Object) EqualsGeneric(x interface{}) bool {
-  other, ok := x.(*Object)
-  return ok && _this.Equals(other)
-}
-
-func (*Object) String() string {
-  return "object"
-}
-
-func (_this *Object) ParentTraits_() []*TraitID {
-  return [](*TraitID){}
-}
-
-var _ TraitOffspring = &Object{}
-
-/******************************************************************************
- * Characters
- ******************************************************************************/
-
-// A Char is a rune in a wrapper so that we can detect it and treat it
-// distinctly from int32.
-type Char rune
-
-func (char Char) String() string {
-  return fmt.Sprintf("%c", rune(char))
-}
-
-// AllChars returns an iterator that returns all 16-bit characters.
-func AllChars() Iterator {
-  c := int32(0)
-  return func() (interface{}, bool) {
-    if c >= 0x10000 {
-      return -1, false
-    } else {
-      ans := Char(c)
-      c++
-      return ans, true
-    }
-  }
-}
-
-type CodePoint rune
-
-func (cp CodePoint) Escape() string {
-  switch (rune(cp)) {
-    case '\n': return "\\n";
-    case '\r': return "\\r";
-    case '\t': return "\\t";
-    case '\x00': return "\\0";
-    case '\'': return "\\'";
-    case '"': return "\\\"";
-    case '\\': return "\\\\";
-    default: return fmt.Sprintf("%c", rune(cp))
-  }
-}
-
-func (cp CodePoint) String() string {
-  return fmt.Sprintf("'%s'", cp.Escape())
-}
-
-
-
-// AllUnicodeChars returns an iterator that returns all Unicode scalar values.
-func AllUnicodeChars() Iterator {
-  c := int32(0)
-  return func() (interface{}, bool) {
-    if c >= 0x11_0000 {
-      return -1, false
-    } else {
-      if (c == 0xD800) {
-        // Skip over the surrogates
-        c = 0xE000
-      }
-      ans := CodePoint(c)
-      c++
-      return ans, true
-    }
-  }
-}
-
-/******************************************************************************
- * Slices
- ******************************************************************************/
-
-func sliceEquals(s1, s2 []interface{}) bool {
-  return len(s1) == len(s2) && sliceIsPrefixAfterLengthCheck(s1, s2)
-}
-
-func sliceIsPrefixOf(s1, s2 []interface{}) bool {
-  return len(s1) <= len(s2) && sliceIsPrefixAfterLengthCheck(s1, s2)
-}
-
-func sliceIsProperPrefixOf(s1, s2 []interface{}) bool {
-  return len(s1) < len(s2) && sliceIsPrefixAfterLengthCheck(s1, s2)
-}
-
-func sliceIsPrefixAfterLengthCheck(s1, s2 []interface{}) bool {
-  for i, v := range s1 {
-    if !(AreEqual(v, s2[i])) {
-      return false
-    }
-  }
-  return true
-}
-
-func sliceContains(s []interface{}, value interface{}) bool {
-  for _, v := range s {
-    if AreEqual(v, value) {
-      return true
-    }
-  }
-  return false
-}
-
-// Iterator returns an iterator over the sequence.
-func sliceIterator(s []interface{}) Iterator {
-  i := 0
-  n := len(s)
-  return func() (interface{}, bool) {
-    if i >= n {
-      return nil, false
-    }
-    ans := s[i]
-    i++
-    return ans, true
-  }
-}
-
-func stringOfElements(iter interface{}) string {
-  str := ""
-  sep := ""
-  for i := Iterate(iter); ; {
-    v, ok := i()
-    if !ok {
-      break
-    }
-
-    str += sep
-    str += String(v)
-    sep = ", "
-  }
-  return str
-}
-
-/******************************************************************************
- * Iteration
- ******************************************************************************/
-
-// An Iterator is a function that can be called multiple times to get successive
-// values, until the second value returned is false.
-type Iterator = func() (interface{}, bool)
-
-// An Iterable can produce an iterator, which we represent as a function which
-// can be called to get successive values.
-type Iterable interface {
-  Iterator() Iterator
-}
-
-// Iterate gets an iterator from a value that is either an iterator or an
-// iterable.
-func Iterate(over interface{}) Iterator {
-  switch over := over.(type) {
-  case Iterator:
-    return over
-  case Iterable:
-    return over.Iterator()
-  default:
-    if refl.TypeOf(over).Kind() != refl.Slice {
-      panic(fmt.Errorf("Not iterable: %v", over))
-    } else {
-      return anySliceIterator(over)
-    }
-  }
-}
-
-func anySliceIterator(slice interface{}) Iterator {
-  val := refl.ValueOf(slice)
-  n := val.Len()
-  i := 0
-  return func() (interface{}, bool) {
-    if i >= n {
-      return nil, false
-    } else {
-      ans := val.Index(i).Interface()
-      i++
-      return ans, true
-    }
-  }
-}
-
-// Quantifier calculates whether a predicate holds either for all values yielded
-// by an iterator or for at least one.
-func Quantifier(iter interface{}, isForAll bool, pred interface{}) bool {
-  predVal := refl.ValueOf(pred)
-
-  for i := Iterate(iter); ; {
-    v, ok := i()
-    if !ok {
-      return isForAll
-    }
-    if predVal.Call([]refl.Value{refl.ValueOf(v)})[0].Interface() != isForAll {
-      return !isForAll
-    }
-  }
-}
-
-// SingleValue produces an iterator that yields only a single value.
-func SingleValue(value interface{}) Iterator {
-  done := false
-  return func() (interface{}, bool) {
-    if done {
-      return nil, false
-    } else {
-      done = true
-      return value, true
-    }
-  }
-}
-
-// AllBooleans returns an iterator that returns false, then returns true.
-func AllBooleans() Iterator {
-  phase := 0
-  return func() (interface{}, bool) {
-    switch phase {
-    case 0:
-      phase = 1
-      return false, true
-    case 1:
-      phase = 2
-      return true, true
-    default:
-      return false, false
-    }
-  }
-}
-
-/******************************************************************************
- * Sequences
- ******************************************************************************/
-
-// The sequence type is now defined in dafnyRuntime.dfy instead.
-// These declarations are just filling in the gaps to make sure
-// Dafny.Sequence is a well-behaved Dafny value in this runtime.
-
-// EmptySeq is the empty sequence.
-var EmptySeq = SeqOf()
-
-// Create a sequence from a length and an element initializer
-// This still exists because it's technically difficult
-// for the compiler to coerce the init function to a
-// func (uint32) interface{}.
-func SeqCreate(n uint32, init func (Int) interface{}) Sequence {
-  return Companion_Sequence_.Create(n, func (index uint32) interface{} { 
-    return init(IntOfUint32(index))
-  })
-}
-
-func SeqFromArray(contents []interface{}, isString bool) Sequence {
-  arr := GoNativeArray{
-    contents: contents,
-  }
-  result := New_ArraySequence_()
-  result.Ctor__(arr, isString)
-  return result
-}
-
-// SeqOf returns a sequence containing the given values.
-func SeqOf(values ...interface{}) Sequence {
-  // Making a defensive copy here because variadic functions can get hinky
-  // if someone says SeqOf(slice...) and then mutates slice.
-  arr := make([]interface{}, len(values))
-  copy(arr, values)
-  return SeqFromArray(arr, false)
-}
-
-// SeqOfChars returns a sequence containing the given character values.
-func SeqOfChars(values ...Char) Sequence {
-  arr := make([]interface{}, len(values))
-  for i, v := range values {
-    arr[i] = v
-  }
-  return SeqFromArray(arr, true)
-}
-
-// SeqOfString converts the given string into a sequence of characters.
-// The given string must contain only ASCII characters!
-func SeqOfString(str string) Sequence {
-  // Need to make sure the elements of the array are Chars
-  arr := make([]interface{}, len(str))
-  for i, v := range str {
-    arr[i] = Char(v)
-  }
-  return SeqFromArray(arr, true)
-}
-
-func UnicodeSeqOfUtf8Bytes(str string) Sequence {
-  // Need to make sure the elements of the array are CodePoints
-  arr := make([]interface{}, utf8.RuneCountInString(str))
-  i := 0
-  for _, v := range str {
-    arr[i] = CodePoint(v)
-    i++
-  }
-  return SeqFromArray(arr, false)
-}
-
-// Iterator returns an iterator over the sequence.
-// This could be implemented more efficiently
-// in the source Dafny code in the future,
-// by traversing the Sequence node structure rather than
-// forcing the lazy evaluation,
-// but will involve defining an Iterator trait of some kind.
-func SequenceIterator(seq Sequence) Iterator {
-  var i uint32 = 0
-  n := seq.Cardinality()
-  return func() (interface{}, bool) {
-    if i >= n {
-      return nil, false
-    }
-    ans := seq.Select(i)
-    i++
-    return ans, true
-  }
-}
-// Unfortunately when we want to provide a single common definition
-// for a trait function, we have to take care of the indirection
-// from the concrete structs to the trait implementation ourselves.
-// Ideally there would be a way of telling Dafny
-// an {:extern} trait method will be specifically implemented at the trait level
-// so the compiler could do this for us.
-func (seq *ArraySequence) Iterator() Iterator {
-  return SequenceIterator(seq)
-}
-func (seq *ConcatSequence) Iterator() Iterator {
-  return SequenceIterator(seq)
-}
-func (seq *LazySequence) Iterator() Iterator {
-  return SequenceIterator(seq)
-}
-
-// UniqueElements returns the set of elements in the sequence.
-// This should be in Dafny eventually but for now it's much more efficient
-// and convenient here.
-func (seq *ArraySequence) UniqueElements() Set {
-  return NewBuilderOf(seq).ToSet()
-}
-func (seq *ConcatSequence) UniqueElements() Set {
-  return NewBuilderOf(seq).ToSet()
-}
-func (seq *LazySequence) UniqueElements() Set {
-  return NewBuilderOf(seq).ToSet()
-}
-
-func SequenceString(seq Sequence) string {
-  if seq.IsString() {
-    s := ""
-    // FIXME: Note this doesn't produce the right string in UTF-8,
-    // since it converts surrogates independently.
-    for i := Iterate(seq); ; {
-      c, ok := i()
-      if !ok {
-        break
-      }
-      s += c.(Char).String()
-    }
-    return s
-  } else {
-    return "[" + stringOfElements(seq) + "]"
-  }
-}
-func (seq *ArraySequence) String() string {
-  return SequenceString(seq)
-}
-func (seq *ConcatSequence) String() string {
-  return SequenceString(seq)
-}
-func (seq *LazySequence) String() string {
-  return SequenceString(seq)
-}
-
-func SequenceVerbatimString(seq Sequence, asLiteral bool) string {
-  s := ""
-  if asLiteral {
-    s += "\""
-  }
-  for i := Iterate(seq); ; {
-    c, ok := i()
-    if !ok {
-      break
-    }
-
-    if asLiteral {
-      s += c.(CodePoint).Escape()
-    } else {
-      s += fmt.Sprintf("%c", c.(CodePoint))
-    }
-  }
-  if asLiteral {
-    s += "\""
-  }
-  return s
-}
-func (seq *ArraySequence) VerbatimString(asLiteral bool) string {
-  return SequenceVerbatimString(seq, asLiteral)
-}
-func (seq *ConcatSequence) VerbatimString(asLiteral bool) string {
-  return SequenceVerbatimString(seq, asLiteral)
-}
-func (seq *LazySequence) VerbatimString(asLiteral bool) string {
-  return SequenceVerbatimString(seq, asLiteral)
-}
-
-func (seq *ArraySequence) Equals(other Sequence) bool {
-  return Companion_Sequence_.Equal(seq, other)
-}
-func (seq *ConcatSequence) Equals(other Sequence) bool {
-  return Companion_Sequence_.Equal(seq, other)
-}
-func (seq *LazySequence) Equals(other Sequence) bool {
-  return Companion_Sequence_.Equal(seq, other)
-}
-
-func (seq *ArraySequence) EqualsGeneric(x interface{}) bool {
-  other, ok := x.(Sequence)
-  return ok && Companion_Sequence_.Equal(seq, other)
-}
-func (seq *ConcatSequence) EqualsGeneric(x interface{}) bool {
-  other, ok := x.(Sequence)
-  return ok && Companion_Sequence_.Equal(seq, other)
-}
-func (seq *LazySequence) EqualsGeneric(x interface{}) bool {
-  other, ok := x.(Sequence)
-  return ok && Companion_Sequence_.Equal(seq, other)
-}
-
-/******************************************************************************
- * Arrays
- ******************************************************************************/
-
-// A GoNativeArray is a single dimensional Go slice,
-// wrapped up for the benefit of dafnyRuntime.dfy.
-// We should refactor to wrap an Array interface as defined below
-// to get the same optimization benefits for sequences of bytes and chars/CodePoints.
-type GoNativeArray struct {
-  contents []interface{}
-}
-
-func (CompanionStruct_NativeArray_) Make(length uint32) NativeArray {
-  contents := make([]interface{}, length)
-  return GoNativeArray{
-    contents: contents,
-  }
-}
-
-func (CompanionStruct_NativeArray_) MakeWithInit(length uint32, init func(uint32) (interface{})) NativeArray {
-  contents := make([]interface{}, length)
-  for i := uint32(0); i < length; i++ {
-    contents[i] = init(i)
-  }
-  return GoNativeArray{
-    contents: contents,
-  }
-}
-
-func (CompanionStruct_NativeArray_) Copy(other ImmutableArray) NativeArray {
-  otherArray := other.(GoNativeArray)
-  contents := make([]interface{}, otherArray.Length())
-  copy(contents, otherArray.contents)
-  return GoNativeArray{
-    contents: contents,
-  }
-}
-
-func (array GoNativeArray) Length() uint32 {
-  return uint32(len(array.contents))
-}
-
-func (array GoNativeArray) Select(i uint32) interface{} {
-  return array.contents[i]
-}
-
-func (array GoNativeArray) Update(i uint32, t interface{}) {
-  array.contents[i] = t
-}
-
-func (array GoNativeArray) UpdateSubarray(i uint32, other ImmutableArray) {
-  otherArray := other.(GoNativeArray)
-  copy(array.contents[i:(i + otherArray.Length())], otherArray.contents)
-}
-
-func (array GoNativeArray) Freeze(size uint32) ImmutableArray {
-  return array.Subarray(0, size)
-}
-
-func (array GoNativeArray) Subarray(lo uint32, hi uint32) ImmutableArray {
-  return GoNativeArray{
-    contents: array.contents[lo:hi],
-  }
-}
-
-func (array GoNativeArray) String() string {
-  return "dafny.GoNativeArray"
-}
-
-// Array is the general interface for arrays. Conceptually, it contains some
-// underlying storage (a slice) of elements, together with a record of the length
-// of each dimension. Thus, this general interface supports 1- and multi-dimensional
-// Dafny arrays.
-//
-// All array indices are given as the Go type "int". This is what the Dafny implementation
-// refers to as "target-language array-index type". However, the dimension lengths
-// are given as "big.Int".
-
-type Array interface {
-  dimensionCount() int
-  dimensionLength(dim int) int
-  ArrayGet1(index int) interface{}
-  ArraySet1(value interface{}, index int)
-  anySlice(lo, hi Int) []interface{}
-  // specializations
-  ArrayGet1Byte(index int) byte
-  ArraySet1Byte(value byte, index int)
-  ArrayGet1Char(index int) Char
-  ArraySet1Char(value Char, index int)
-  ArrayGet1CodePoint(index int) CodePoint
-  ArraySet1CodePoint(value CodePoint, index int)
-}
-
-/***** newArray *****/
-
-// Multiply the numbers in "dims" and return the product as an "int".
-// If the produce doesn't fit in an "int", panic with the message that the
-// array-size limit has been exceeded.
-// It is expected that len(dims) is at least 1 and that each number in
-// dims is non-negative.
-func computeTotalArrayLength(dims ...Int) int {
-  product := dims[0]
-  for i := 1; i < len(dims); i++ {
-    product = product.Times(dims[i])
-  }
-  if IntOf(0x8000_0000).Cmp(product) <= 0 {
-    panic(fmt.Sprintf("array size exceeds memory limit: %v", String(product)))
-  }
-  totalLength := product.Int()
-  return totalLength
-}
-
-// NewArrayFromExample returns a new Array.
-// If "init" is non-nil, it is used to initialize all elements of the array.
-// "example" is used only to figure out the right kind of Array to return.
-// If "init" is non-nil, the types of "example" and "init" must agree.
-// All numbers in "dims" are expected to be non-negative and "len(dims)" is
-// expected to be at least 1 (this is not checked). The function checks that
-// the product of the numbers in "dims" lies within the limit of what array
-// lengths are supported; the code will panic if the limit is exceeded.
-func NewArrayFromExample(example interface{}, init interface{}, dims ...Int) Array {
-  numberOfDimensions := len(dims)
-  intDims := make([]int, len(dims))
-  totalLength := computeTotalArrayLength(dims...)
-  // If the previous line does not panic, then the .Int() conversions in
-  // the following loop will succeed.
-  for d := 0; d < numberOfDimensions; d++ {
-    intDims[d] = dims[d].Int()
-  }
-
-  if totalLength == 0 {
-    return newZeroLengthArray(intDims)
-  }
-
-  // Inspect the type of "example" to consider Array specialization
-  if _, ok := example.(byte); ok {
-    arr := make([]byte, totalLength)
-    if init != nil {
-      x := init.(byte)
-      for i := range arr {
-        arr[i] = x
-      }
-    }
-    return &arrayForByte{
-      contents: arr,
-      dims:     intDims,
-    }
-  }
-  if _, ok := example.(Char); ok {
-    arr := make([]Char, totalLength)
-    if init != nil {
-      x := init.(Char)
-      for i := range arr {
-        arr[i] = x
-      }
-    }
-    return &arrayForChar{
-      contents: arr,
-      dims:     intDims,
-    }
-  }
-  if _, ok := example.(CodePoint); ok {
-    arr := make([]CodePoint, totalLength)
-    if init != nil {
-      x := init.(CodePoint)
-      for i := range arr {
-        arr[i] = x
-      }
-    }
-    return &arrayForCodePoint{
-      contents: arr,
-      dims:     intDims,
-    }
-  }
-
-  // Use the default representation
-  arr := make([]interface{}, totalLength)
-  if init != nil {
-    for i := range arr {
-      arr[i] = init
-    }
-  }
-  return &arrayStruct{
-    contents: arr,
-    dims:     intDims,
-  }
-}
-
-func newZeroLengthArray(intDims []int) Array {
-  // Use the default representation
-  return &arrayStruct{
-    contents: nil,
-    dims:     intDims,
-  }
-}
-
-// newArrayWithValues returns a new one-dimensional Array with the given initial
-// values. It is only used internally, by *Builder.ToArray().
-func newArrayWithValues(values ...interface{}) Array {
-  totalLength := len(values)
-  intDims := []int{totalLength}
-  if totalLength == 0 {
-    return newZeroLengthArray(intDims)
-  }
-
-  // Inspect the type of "values[0]" to consider Array specialization
-  if _, ok := values[0].(byte); ok {
-    arr := make([]byte, totalLength)
-    for i := range arr {
-      arr[i] = values[i].(byte)
-    }
-    return &arrayForByte{
-      contents: arr,
-      dims:     intDims,
-    }
-  }
-  if _, ok := values[0].(Char); ok {
-    arr := make([]Char, totalLength)
-    for i := range arr {
-      arr[i] = values[i].(Char)
-    }
-    return &arrayForChar{
-      contents: arr,
-      dims:     intDims,
-    }
-  }
-
-  // Use the default representation
-  arr := make([]interface{}, totalLength)
-  copy(arr, values)
-  return &arrayStruct{
-    contents: arr,
-    dims:     intDims,
-  }
-}
-
-// NewArrayWithValue returns a new Array full of the given initial value.
-func NewArrayWithValue(init interface{}, dims ...Int) Array {
-  return NewArrayFromExample(init, init, dims...)
-}
-
-// NewArray returns a new Array full of the default value of the given type.
-func NewArray(dims ...Int) Array {
-  return NewArrayFromExample(nil, nil, dims...)
-}
-
-/***** arrayStruct is default implementation of the Array interface. *****/
-
-type arrayStruct struct {
-  contents []interface{} // stored as a flat one-dimensional slice
-  dims     []int
-}
-
-func (_this arrayStruct) dimensionCount() int {
-  return len(_this.dims)
-}
-
-func (_this arrayStruct) dimensionLength(dim int) int {
-  return _this.dims[dim]
-}
-
-func (_this arrayStruct) ArrayGet1(index int) interface{} {
-  return _this.contents[index]
-}
-
-func (_this arrayStruct) ArraySet1(value interface{}, index int) {
-  _this.contents[index] = value
-}
-
-func (_this arrayStruct) ArrayGet1Byte(index int) byte {
-  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
-}
-
-func (_this arrayStruct) ArraySet1Byte(value byte, index int) {
-  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
-}
-
-func (_this arrayStruct) ArrayGet1Char(index int) Char {
-  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
-}
-
-func (_this arrayStruct) ArraySet1Char(value Char, index int) {
-  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
-}
-
-func (_this arrayStruct) ArrayGet1CodePoint(index int) CodePoint {
-  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
-}
-
-func (_this arrayStruct) ArraySet1CodePoint(value CodePoint, index int) {
-  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
-}
-
-func (_this arrayStruct) anySlice(lo, hi Int) []interface{} {
-  if lo.IsNilInt() && hi.IsNilInt() {
-    return _this.contents
-  }
-  if lo.IsNilInt() {
-    return _this.contents[:hi.Int()]
-  }
-  if hi.IsNilInt() {
-    return _this.contents[lo.Int():]
-  }
-  return _this.contents[lo.Int():hi.Int()]
-}
-
-// arrayStruct implements the EqualsGeneric interface.
-func (_this arrayStruct) EqualsGeneric(other interface{}) bool {
-  otherArray, ok := other.(*arrayStruct)
-  if !ok {
-    return false
-  }
-  // In the next line, we're sure to compare the references, not the addresses of the arrayStruct's.
-  return &_this.dims[0] == &otherArray.dims[0]
-}
-
-/***** arrayForByte is the Array interface specialized for byte. *****/
-
-type arrayForByte struct {
-  contents []byte // stored as a flat one-dimensional slice
-  dims     []int
-}
-
-func (_this arrayForByte) dimensionCount() int {
-  return len(_this.dims)
-}
-
-func (_this arrayForByte) dimensionLength(dim int) int {
-  return _this.dims[dim]
-}
-
-func (_this arrayForByte) ArrayGet1(index int) interface{} {
-  return _this.contents[index]
-}
-
-func (_this arrayForByte) ArraySet1(value interface{}, index int) {
-  _this.contents[index] = value.(byte)
-}
-
-func (_this arrayForByte) ArrayGet1Byte(index int) byte {
-  return _this.contents[index]
-}
-
-func (_this arrayForByte) ArraySet1Byte(value byte, index int) {
-  _this.contents[index] = value
-}
-
-func (_this arrayForByte) ArrayGet1Char(index int) Char {
-  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForByte) ArraySet1Char(value Char, index int) {
-  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForByte) ArrayGet1CodePoint(index int) CodePoint {
-  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForByte) ArraySet1CodePoint(value CodePoint, index int) {
-  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForByte) anySlice(lo, hi Int) []interface{} {
-  if lo.IsNilInt() {
-    lo = Zero
-  }
-  if hi.IsNilInt() {
-    hi = IntOf(len(_this.contents))
-  }
-  iLo := lo.Int()
-  iHi := hi.Int()
-  anyArray := make([]interface{}, iHi - iLo)
-  for i := iLo; i < iHi; i++ {
-    anyArray[i] = _this.contents[i]
-  }
-  return anyArray
-}
-
-// arrayForByte implements the EqualsGeneric interface.
-func (_this arrayForByte) EqualsGeneric(other interface{}) bool {
-  otherArray, ok := other.(*arrayForByte)
-  if !ok {
-    return false
-  }
-  return &_this.dims[0] == &otherArray.dims[0]
-}
-
-/***** arrayForChar is the Array interface specialized for Char. *****/
-
-type arrayForChar struct {
-  contents []Char // stored as a flat one-dimensional slice
-  dims     []int
-}
-
-func (_this arrayForChar) dimensionCount() int {
-  return len(_this.dims)
-}
-
-func (_this arrayForChar) dimensionLength(dim int) int {
-  return _this.dims[dim]
-}
-
-func (_this arrayForChar) ArrayGet1(index int) interface{} {
-  return _this.contents[index]
-}
-
-func (_this arrayForChar) ArraySet1(value interface{}, index int) {
-  _this.contents[index] = value.(Char)
-}
-
-func (_this arrayForChar) ArrayGet1Byte(index int) byte {
-  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForChar) ArraySet1Byte(value byte, index int) {
-  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForChar) ArrayGet1Char(index int) Char {
-  return _this.contents[index]
-}
-
-func (_this arrayForChar) ArraySet1Char(value Char, index int) {
-  _this.contents[index] = value
-}
-
-func (_this arrayForChar) ArrayGet1CodePoint(index int) CodePoint {
-  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForChar) ArraySet1CodePoint(value CodePoint, index int) {
-  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForChar) anySlice(lo, hi Int) []interface{} {
-  if lo.IsNilInt() {
-    lo = Zero
-  }
-  if hi.IsNilInt() {
-    hi = IntOf(len(_this.contents))
-  }
-  iLo := lo.Int()
-  iHi := hi.Int()
-  anyArray := make([]interface{}, iHi - iLo)
-  for i := iLo; i < iHi; i++ {
-    anyArray[i] = _this.contents[i]
-  }
-  return anyArray
-}
-
-// arrayForChar implements the EqualsGeneric interface.
-func (_this arrayForChar) EqualsGeneric(other interface{}) bool {
-  otherArray, ok := other.(*arrayForChar)
-  if !ok {
-    return false
-  }
-  return &_this.dims[0] == &otherArray.dims[0]
-}
-
-/***** arrayForCodePoint is the Array interface specialized for CodePoint. *****/
-
-type arrayForCodePoint struct {
-  contents []CodePoint // stored as a flat one-dimensional slice
-  dims     []int
-}
-
-func (_this arrayForCodePoint) dimensionCount() int {
-  return len(_this.dims)
-}
-
-func (_this arrayForCodePoint) dimensionLength(dim int) int {
-  return _this.dims[dim]
-}
-
-func (_this arrayForCodePoint) ArrayGet1(index int) interface{} {
-  return _this.contents[index]
-}
-
-func (_this arrayForCodePoint) ArraySet1(value interface{}, index int) {
-  _this.contents[index] = value.(CodePoint)
-}
-
-func (_this arrayForCodePoint) ArrayGet1Byte(index int) byte {
-  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForCodePoint) ArraySet1Byte(value byte, index int) {
-  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForCodePoint) ArrayGet1Char(index int) Char {
-  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForCodePoint) ArraySet1Char(value Char, index int) {
-  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
-}
-
-func (_this arrayForCodePoint) ArrayGet1CodePoint(index int) CodePoint {
-  return _this.contents[index]
-}
-
-func (_this arrayForCodePoint) ArraySet1CodePoint(value CodePoint, index int) {
-  _this.contents[index] = value
-}
-
-func (_this arrayForCodePoint) anySlice(lo, hi Int) []interface{} {
-  if lo.IsNilInt() {
-    lo = Zero
-  }
-  if hi.IsNilInt() {
-    hi = IntOf(len(_this.contents))
-  }
-  iLo := lo.Int()
-  iHi := hi.Int()
-  anyArray := make([]interface{}, iHi - iLo)
-  for i := iLo; i < iHi; i++ {
-    anyArray[i] = _this.contents[i]
-  }
-  return anyArray
-}
-
-// arrayForCodePoint implements the EqualsGeneric interface.
-func (_this arrayForCodePoint) EqualsGeneric(other interface{}) bool {
-  otherArray, ok := other.(*arrayForCodePoint)
-  if !ok {
-    return false
-  }
-  return &_this.dims[0] == &otherArray.dims[0]
-}
-
-/***** other Array methods *****/
-
-// EmptyArray is an empty one-dimensional array.
-var EmptyArray = NewArray(Zero)
-
-func ArrayCastTo(x interface{}) Array {
-  var t Array
-  t, _ = x.(Array)
-  return t
-}
-
-// ArrayLen returns the length of the array in the given dimension.
-func ArrayLen(array Array, dim int) Int {
-  return IntOf(ArrayLenInt(array, dim))
-}
-
-// ArrayLenInt returns the length of the array in the given dimension, as an int.
-func ArrayLenInt(array Array, dim int) int {
-  return array.dimensionLength(dim)
-}
-
-func computeArrayIndex(array Array, ixs ...int) int {
-  dimensionCount := array.dimensionCount()
-  if len(ixs) != dimensionCount {
-    panic(fmt.Sprintf("Expected %d indices but got %d", dimensionCount, len(ixs)))
-  }
-  i := 0
-  size := 1
-  for d := dimensionCount - 1; d >= 0; d-- {
-    i += size * ixs[d]
-    size *= array.dimensionLength(d)
-  }
-  return i
-}
-
-func ArrayGet(array Array, ixs ...int) interface{} {
-  index := computeArrayIndex(array, ixs...)
-  return array.ArrayGet1(index)
-}
-
-func ArraySet(array Array, value interface{}, ixs ...int) {
-  index := computeArrayIndex(array, ixs...)
-  array.ArraySet1(value, index)
-}
-
-// RangeToSeq converts the selected portion of the array to a sequence.
-func ArrayRangeToSeq(array Array, lo, hi Int) Sequence {
-  if array.dimensionCount() != 1 {
-    panic("Can't take a slice of a multidimensional array")
-  }
-  isString := false;
-  if array.dimensionLength(0) > 0 {
-    _, isString = array.ArrayGet1(0).(Char)
-  }
-
-  anySlice := array.anySlice(lo, hi)
-  seq := SeqOf(anySlice...)
-  seq.IsString_set_(isString)
-  return seq
-}
-
-/******************************************************************************
- * Tuples
- ******************************************************************************/
-
-// A Tuple is a one-dimensional heterogeneous array.
-type Tuple struct {
-  contents []interface{}
-}
-
-// TupleOf creates a tuple with the given values.
-func TupleOf(values ...interface{}) Tuple {
-  arr := make([]interface{}, len(values))
-  copy(arr, values)
-  return Tuple{arr}
-}
-
-// Equals returns whether two tuples have the same values.
-func (tuple Tuple) Equals(other Tuple) bool {
-  return sliceEquals(tuple.contents, other.contents)
-}
-
-// Tuple implements the EqualsGeneric interface.
-func (tuple Tuple) EqualsGeneric(other interface{}) bool {
-  tuple2, ok := other.(Tuple)
-  return ok && tuple.Equals(tuple2)
-}
-
-func (tuple Tuple) String() string {
-  return "(" + stringOfElements(tuple.contents) + ")"
-}
-
-// Index looks up the address of the ith element of the tuple.
-func (tuple Tuple) Index(i Int) *interface{} {
-  return tuple.IndexInt(i.Int())
-}
-
-// IndexInt looks up the address of the ith element of the tuple.
-func (tuple Tuple) IndexInt(i int) *interface{} {
-  return &tuple.contents[i]
-}
-
-// TupleType returns the type of a tuple with given element types.
-func TupleType(tys ...TypeDescriptor) TypeDescriptor {
-  arr := make([]TypeDescriptor, len(tys))
-  copy(arr, tys)
-  return tupleType{arr}
-}
-
-type tupleType struct {
-  eltTys []TypeDescriptor
-}
-
-func (tt tupleType) Default() interface{} {
-  values := make([]interface{}, len(tt.eltTys))
-  for i, ty := range tt.eltTys {
-    values[i] = ty.Default()
-  }
-  return TupleOf(values...)
-}
-
-func (tt tupleType) String() string {
-  s := "("
-  sep := ""
-  for _, ty := range tt.eltTys {
-    s += sep + String(ty)
-    sep = ", "
-  }
-  s += ")"
-  return s
-}
-
-/******************************************************************************
- * Collection building
- ******************************************************************************/
-
-// A Builder holds values as they're imperatively accumulated in order to build
-// an Array, Set, or MultiSet.
-type Builder []interface{}
-
-// NewBuilder creates a new Builder.
-func NewBuilder() *Builder {
-  return new(Builder)
-}
-
-// NewBuilder creates a new Builder.
-func NewBuilderOf(iter interface{}) *Builder {
-  b := NewBuilder()
-  for i := Iterate(iter); ; {
-    v, ok := i()
-    if !ok {
-      break
-    }
-    b.Add(v)
-  }
-  return b
-}
-
-// Add adds a new value to a Builder.
-func (builder *Builder) Add(value interface{}) {
-  *builder = append(*builder, value)
-}
-
-// ToArray creates an Array with the accumulated values.
-func (builder *Builder) ToArray() Array {
-  return newArrayWithValues(*builder...)
-}
-
-// ToSet creates a Set with the accumulated values.
-func (builder *Builder) ToSet() Set {
-  return SetOf(*builder...)
-}
-
-// ToMultiset creates a MultiSet with the accumulated values.
-func (builder *Builder) ToMultiSet() MultiSet {
-  return MultiSetOf(*builder...)
-}
-
-// Iterator iterates over the accumulated values.
-func (builder *Builder) Iterator() Iterator {
-  return sliceIterator(*builder)
-}
-
-/******************************************************************************
- * Sets
- ******************************************************************************/
-
-// A Set is a sequence without duplicates.
-type Set struct {
-  contents []interface{}
-}
-
-// EmptySet is the empty set.
-var EmptySet = SetOf()
-
-// SetOf creates a set with the given values.
-func SetOf(values ...interface{}) Set {
-  uniq := make([]interface{}, 0, len(values))
-NEXT_INPUT:
-  for _, v := range values {
-    for _, u := range uniq {
-      if AreEqual(u, v) {
-        continue NEXT_INPUT
-      }
-    }
-    uniq = append(uniq, v)
-  }
-  return Set{uniq}
-}
-
-// Cardinality returns the cardinality (size) of the set.
-func (set Set) Cardinality() Int {
-  return IntOf(set.CardinalityInt())
-}
-
-// CardinalityInt returns the cardinality (size) of the set as an int.
-func (set Set) CardinalityInt() int {
-  return len(set.contents)
-}
-
-// Contains returns whether the given value is an element of the set.
-func (set Set) Contains(value interface{}) bool {
-  return sliceContains(set.contents, value)
-}
-
-// Iterator returns an iterator over the elements of the set.
-func (set Set) Iterator() Iterator {
-  return sliceIterator(set.contents)
-}
-
-// Union makes a set containing each element contained by either input set.
-func (set Set) Union(set2 Set) Set {
-  if set.CardinalityInt() == 0 {
-    return set2
-  }
-  if set2.CardinalityInt() == 0 {
-    return set
-  }
-
-  n := set.CardinalityInt()
-  uniq := make([]interface{}, n)
-  copy(uniq, set.contents)
-NEXT_INPUT:
-  for _, v := range set2.contents {
-    for _, u := range uniq {
-      if AreEqual(u, v) {
-        continue NEXT_INPUT
-      }
-    }
-    uniq = append(uniq, v)
-  }
-
-  return Set{uniq}
-}
-
-// Intersection makes a set containing each element contained by both input
-// sets.
-func (set Set) Intersection(set2 Set) Set {
-  if set.CardinalityInt() == 0 || set2.CardinalityInt() == 0 {
-    return EmptySet
-  }
-
-  uniq := make([]interface{}, 0)
-  for _, v := range set.contents {
-    if set2.Contains(v) {
-      uniq = append(uniq, v)
-    }
-  }
-
-  return Set{uniq}
-}
-
-// Difference makes a set containing each element contained by set but not
-// by set2.
-func (set Set) Difference(set2 Set) Set {
-  if set.CardinalityInt() == 0 || set2.CardinalityInt() == 0 {
-    return set
-  }
-
-  elts := make([]interface{}, 0, max(0, set.CardinalityInt()-set2.CardinalityInt()))
-  for _, v := range set.contents {
-    if !set2.Contains(v) {
-      elts = append(elts, v)
-    }
-  }
-
-  return Set{elts}
-}
-
-// IsDisjointFrom returns true if the sets have no elements in common.
-func (set Set) IsDisjointFrom(set2 Set) bool {
-  if set.CardinalityInt() == 0 || set2.CardinalityInt() == 0 {
-    return true
-  }
-
-  for _, v := range set.contents {
-    if sliceContains(set2.contents, v) {
-      return false
-    }
-  }
-
-  return true
-}
-
-// Equals tests whether the sets contain the same elements.
-func (set Set) Equals(set2 Set) bool {
-  return set.CardinalityInt() == set2.CardinalityInt() &&
-    set.isSubsetAfterCardinalityCheck(set2)
-}
-
-// Set implements the EqualsGeneric interface.
-func (set Set) EqualsGeneric(other interface{}) bool {
-  set2, ok := other.(Set)
-  return ok && set.Equals(set2)
-}
-
-// IsSubsetOf returns true if each element in this set is also in the other.
-func (set Set) IsSubsetOf(set2 Set) bool {
-  return set.CardinalityInt() <= set2.CardinalityInt() &&
-    set.isSubsetAfterCardinalityCheck(set2)
-}
-
-// IsProperSubsetOf returns true if each element in this set is also in the
-// other, and moreover the sets aren't equal.
-func (set Set) IsProperSubsetOf(set2 Set) bool {
-  return set.CardinalityInt() < set2.CardinalityInt() &&
-    set.isSubsetAfterCardinalityCheck(set2)
-}
-
-func (set Set) isSubsetAfterCardinalityCheck(set2 Set) bool {
-  for _, v := range set.contents {
-    if !sliceContains(set2.contents, v) {
-      return false
-    }
-  }
-  return true
-}
-
-// Elements returns the set of elements (i.e. the set itself).
-func (set Set) Elements() Set {
-  return set
-}
-
-// AllSubsets returns an iterator over all subsets of the given set.
-func (set Set) AllSubsets() Iterator {
-  // Use a big integer to range from 0 to 2^n
-  r := new(big.Int)
-  limit := new(big.Int).Lsh(One.impl, uint(set.CardinalityInt()))
-  return func() (interface{}, bool) {
-    if r.Cmp(limit) == 0 {
-      return Set{}, false
-    } else {
-      values := make([]interface{}, 0, len(set.contents))
-      i := 0
-      s := new(big.Int).Set(r)
-      mod := new(big.Int)
-      for s.Cmp(Zero.impl) > 0 {
-        if mod.Mod(s, Two.impl).Cmp(Zero.impl) != 0 {
-          values = append(values, set.contents[i])
-        }
-        s.Div(s, Two.impl)
-        i++
-      }
-      r.Add(r, One.impl)
-
-      // Annoyingly, the other implementations reverse the order of the
-      // elements, so we have to as well
-      return Set{reverse(values)}, true
-    }
-  }
-}
-
-func reverse(values []interface{}) []interface{} {
-  ans := make([]interface{}, len(values))
-  n := len(values)
-  for i, v := range values {
-    ans[n-1-i] = v
-  }
-  return ans
-}
-
-func (set Set) String() string {
-  return "{" + stringOfElements(set.contents) + "}"
-}
-
-/******************************************************************************
- * Multisets
- ******************************************************************************/
-
-// A MultiSet is an unordered sequence of elements with possible duplication.
-type MultiSet struct {
-  elts []msetElt
-}
-
-type msetElt struct {
-  value interface{}
-  count Int
-}
-
-// EmptyMultiSet is the empty multiset.
-var EmptyMultiSet = MultiSetOf()
-
-// MultiSetOf creates a MultiSet with the given elements.
-func MultiSetOf(values ...interface{}) MultiSet {
-  elts := make([]msetElt, 0, len(values))
-NEXT_INPUT:
-  for _, v := range values {
-    for i, u := range elts {
-      if AreEqual(u.value, v) {
-        elts[i] = msetElt{value: u.value, count: u.count.Plus(One)}
-        continue NEXT_INPUT
-      }
-    }
-    elts = append(elts, msetElt{value: v, count: One})
-  }
-  return MultiSet{elts}
-}
-
-// MultiSetFromSeq creates a MultiSet from the elements in the given sequence.
-func MultiSetFromSeq(seq Sequence) MultiSet {
-  return NewBuilderOf(seq).ToMultiSet()
-}
-
-// MultiSetFromSet creates a MultiSet from the elements in the given set.
-func MultiSetFromSet(set Set) MultiSet {
-  elts := make([]msetElt, len(set.contents))
-  for i, v := range set.contents {
-    // No need to check whether it's already there because Set elements are
-    // assumed to be unique
-    elts[i] = msetElt{v, One}
-  }
-  return MultiSet{elts}
-}
-
-func (mset MultiSet) clone() MultiSet {
-  elts := make([]msetElt, len(mset.elts))
-  copy(elts, mset.elts)
-  return MultiSet{elts}
-}
-
-func (mset MultiSet) findIndex(value interface{}) (int, bool) {
-  for i, e := range mset.elts {
-    if AreEqual(e.value, value) {
-      return i, true
-    }
-  }
-  return -1, false
-}
-
-// Update changes the cardinality of the given value in the multiset, returning
-// a new multiset unless the cardinality did not actually change.
-func (mset MultiSet) Update(value interface{}, n Int) MultiSet {
-  i, found := mset.findIndex(value)
-  if found {
-    if mset.elts[i].count == n {
-      return mset
-    } else {
-      ans := mset.clone()
-      ans.elts[i] = msetElt{value, n}
-      return ans
-    }
-  } else if n.Cmp(Zero) == 0 {
-    return mset
-  } else {
-    return MultiSet{append(mset.clone().elts, msetElt{value, n})}
-  }
-}
-
-// Cardinality returns the number of elements in the multiset (counting
-// repetitions).
-func (mset MultiSet) Cardinality() Int {
-  n := new(big.Int)
-  for _, e := range mset.elts {
-    n.Add(n, e.count.impl)
-  }
-  return intOf(n)
-}
-
-// CardinalityInt returns the number of elements in the multiset (counting
-// repetitions) as an int.
-func (mset MultiSet) CardinalityInt() int {
-  n := 0
-  for _, e := range mset.elts {
-    n += e.count.Int()
-  }
-  return n
-}
-
-// Index returns the ith element of the multiset, which is arbitrary except that
-// it is different from the jth element when i /= j.  (Repetitions are ignored.)
-func (mset MultiSet) Index(i Int) interface{} {
-  return mset.elts[i.Int()]
-}
-
-// Iterator returns an iterator over the multiset (including repetitions).
-func (mset MultiSet) Iterator() Iterator {
-  i := 0
-  n := new(big.Int)
-  return func() (interface{}, bool) {
-    for {
-      if i >= len(mset.elts) {
-        return nil, false
-      }
-      if n.Cmp(mset.elts[i].count.impl) >= 0 {
-        n.SetInt64(0)
-        i++
-      } else {
-        break
-      }
-    }
-
-    ans := mset.elts[i].value
-    n.Add(n, One.impl)
-    return ans, true
-  }
-}
-
-// Contains returns whether the multiset contains the given element (at least
-// once).
-func (mset MultiSet) Contains(value interface{}) bool {
-  return mset.Multiplicity(value).Cmp(Zero) > 0
-}
-
-// Multiplicity returns the number of times a given element occurs in the
-// multiset.
-func (mset MultiSet) Multiplicity(value interface{}) Int {
-  i, found := mset.findIndex(value)
-  if found {
-    return mset.elts[i].count
-  } else {
-    return Zero
-  }
-}
-
-// Elements returns an iterator that yields each element in the multiset, as
-// many times as it appears.
-func (mset MultiSet) Elements() func() (interface{}, bool) {
-  i := 0
-  n := new(big.Int)
-  return func() (interface{}, bool) {
-    for {
-      if i >= len(mset.elts) {
-        return nil, false
-      }
-      if n.Cmp(mset.elts[i].count.impl) == 0 {
-        i++
-        n.SetInt64(0)
-      } else {
-        break
-      }
-    }
-    n.Add(n, One.impl)
-    return mset.elts[i].value, true
-  }
-}
-
-// UniqueElements returns an iterator that yields each element in the multiset
-// once.
-func (mset MultiSet) UniqueElements() func() (interface{}, bool) {
-  i := 0
-  return func() (interface{}, bool) {
-    if i >= len(mset.elts) {
-      return nil, false
-    } else {
-      i++
-      return mset.elts[i-1].value, true
-    }
-  }
-}
-
-// Union returns a multiset including each element of either set.  Each value's
-// multiplicity will be the sum of its multiplicities in the original multisets.
-func (mset MultiSet) Union(mset2 MultiSet) MultiSet {
-  if len(mset.elts) == 0 {
-    return mset2
-  }
-  if len(mset2.elts) == 0 {
-    return mset
-  }
-
-  elts := make([]msetElt, 0, len(mset.elts)+len(mset2.elts))
-  for _, e := range mset.elts {
-    if e.count.Cmp(Zero) == 0 {
-      // e.value in mset2 will be added in the next separate for loop
-      continue
-    }
-    m := mset2.Multiplicity(e.value)
-    elts = append(elts, msetElt{e.value, e.count.Plus(m)})
-  }
-  for _, e := range mset2.elts {
-    if !mset.Contains(e.value) {
-      elts = append(elts, e)
-    }
-  }
-
-  return MultiSet{elts}
-}
-
-// Intersection returns a multiset including those elements which occur in both
-// sets.  Each value's multiplicity will be the minimum of its multiplicities
-// in the original multisets.
-func (mset MultiSet) Intersection(mset2 MultiSet) MultiSet {
-  if len(mset.elts) == 0 || len(mset2.elts) == 0 {
-    return EmptyMultiSet
-  }
-
-  elts := make([]msetElt, 0)
-  for _, e := range mset.elts {
-    m := mset2.Multiplicity(e.value)
-    if m.Cmp(Zero) != 0 {
-      elts = append(elts, msetElt{e.value, e.count.Min(m)})
-    }
-  }
-
-  return MultiSet{elts}
-}
-
-// Difference returns a multiset including those elements which occur in the
-// first argument but not the second.  Each value's multiplicity will be its
-// multiplicity in mset minus its multiplicity in mset2.
-func (mset MultiSet) Difference(mset2 MultiSet) MultiSet {
-  if len(mset.elts) == 0 || len(mset2.elts) == 0 {
-    return mset
-  }
-
-  elts := make([]msetElt, 0, max(0, len(mset.elts)-len(mset2.elts)))
-  for _, e := range mset.elts {
-    d := e.count.Minus(mset2.Multiplicity(e.value))
-    if d.Cmp(Zero) > 0 {
-      elts = append(elts, msetElt{e.value, d})
-    }
-  }
-
-  return MultiSet{elts}
-}
-
-// IsDisjointFrom returns whether two multisets contain no elements in common.
-func (mset MultiSet) IsDisjointFrom(mset2 MultiSet) bool {
-  if len(mset.elts) == 0 || len(mset2.elts) == 0 {
-    return true
-  }
-
-  for _, e := range mset.elts {
-    if (e.count.Cmp(Zero) != 0) && mset2.Contains(e.value) {
-      return false
-    }
-  }
-
-  return true
-}
-
-// Equals returns whether two multisets have the same values with the same
-// multiplicities.
-func (mset MultiSet) Equals(mset2 MultiSet) bool {
-  for _, e := range mset.elts {
-    m := mset2.Multiplicity(e.value)
-    if e.count.Cmp(m) != 0 {
-      return false
-    }
-  }
-  return mset.CardinalityInt() == mset2.CardinalityInt()
-}
-
-// MultiSet implements the EqualsGeneric interface.
-func (mset MultiSet) EqualsGeneric(other interface{}) bool {
-  mset2, ok := other.(MultiSet)
-  return ok && mset.Equals(mset2)
-}
-
-// IsSubsetOf returns whether one multiset has a subset of the elements of the
-// other, with lesser or equal multiplicities.
-func (mset MultiSet) IsSubsetOf(mset2 MultiSet) bool {
-  for _, e := range mset.elts {
-    m := mset2.Multiplicity(e.value)
-    if e.count.Cmp(m) > 0 {
-      return false
-    }
-  }
-  return true
-}
-
-// IsProperSubsetOf returns whether one multiset has a proper subset of the
-// elements of the other, with strictly lesser multiplicities.
-func (mset MultiSet) IsProperSubsetOf(mset2 MultiSet) bool {
-  return mset.IsSubsetOf(mset2) && mset.CardinalityInt() < mset2.CardinalityInt()
-}
-
-func (mset MultiSet) String() string {
-  s := "multiset{"
-  sep := ""
-  i := new(big.Int)
-  for _, e := range mset.elts {
-    for i.SetInt64(0); i.Cmp(e.count.impl) < 0; i.Add(i, One.impl) {
-      s += sep + String(e.value)
-      sep = ", "
-    }
-  }
-  s += "}"
-  return s
-}
-
-/******************************************************************************
- * Maps
- ******************************************************************************/
-
-// A Map is an association between keys and values.
-type Map struct {
-  elts []mapElt
-}
-
-type mapElt struct {
-  key, value interface{}
-}
-
-// A MapBuilder creates a new Map by accumulating elements imperatively.
-type MapBuilder []mapElt
-
-// NewMapBuilder creates a new map builder.
-func NewMapBuilder() *MapBuilder {
-  return new(MapBuilder)
-}
-
-// Add adds a key and value to the map being built.
-func (mb *MapBuilder) Add(k, v interface{}) *MapBuilder {
-  *mb = append(*mb, mapElt{k, v})
-  return mb
-}
-
-// ToMap gets the map out of the map builder.
-func (mb *MapBuilder) ToMap() Map {
-  return Map{*mb}
-}
-
-// EmptyMap is the empty map.
-var EmptyMap = NewMapBuilder().ToMap()
-
-func (m Map) clone() Map {
-  elts := make([]mapElt, len(m.elts))
-  copy(elts, m.elts)
-  return Map{elts}
-}
-
-func (m Map) findIndex(key interface{}) (int, bool) {
-  for i, e := range m.elts {
-    if AreEqual(e.key, key) {
-      return i, true
-    }
-  }
-  return -1, false
-}
-
-// Cardinality finds the number of elements in the map.
-func (m Map) Cardinality() Int {
-  return IntOf(m.CardinalityInt())
-}
-
-// CardinalityInt finds the number of elements in the map as an int.
-func (m Map) CardinalityInt() int {
-  return len(m.elts)
-}
-
-// Find finds the given key in the map, returning it and a success flag.
-func (m Map) Find(key interface{}) (interface{}, bool) {
-  i, found := m.findIndex(key)
-  if found {
-    return m.elts[i].value, true
-  } else {
-    return nil, false
-  }
-}
-
-// Get finds the given key in the map, returning it or nil.
-func (m Map) Get(key interface{}) interface{} {
-  v, _ := m.Find(key)
-  return v
-}
-
-// Contains returns whether the given key is in the map.
-func (m Map) Contains(key interface{}) bool {
-  _, found := m.findIndex(key)
-  return found
-}
-
-// Update returns a new Map which associates the given key and value.
-func (m Map) Update(key, value interface{}) Map {
-  ans := m.clone()
-  i, found := ans.findIndex(key)
-  if found {
-    ans.elts[i] = mapElt{key, value}
-  } else {
-    ans.elts = append(ans.elts, mapElt{key, value})
-  }
-  return ans
-}
-
-func (a Map) Merge(b Map) Map {
-  if a.CardinalityInt() == 0 {
-    return b
-  }
-  if b.CardinalityInt() == 0 {
-    return a
-  }
-
-  m := make([]mapElt, len(b.elts), len(a.elts) + len(b.elts))
-  copy(m, b.elts)
-  for _, e := range a.elts {
-    _, found := b.findIndex(e.key)
-    if !found {
-      m = append(m, e)
-    }
-  }
-  return Map{m}
-}
-
-func (a Map) Subtract(keys Set) Map {
-  if a.CardinalityInt() == 0 || keys.CardinalityInt() == 0 {
-    return a
-  }
-
-  mb := NewMapBuilder()
-  for _, e := range a.elts {
-    if !keys.Contains(e.key) {
-      *mb = append(*mb, e)
-    }
-  }
-  return mb.ToMap()
-}
-
-// Equals returns whether each map associates the same keys to the same values.
-func (m Map) Equals(m2 Map) bool {
-  if len(m.elts) != len(m2.elts) {
-    return false
-  }
-  for _, e := range m.elts {
-    i, found := m2.findIndex(e.key)
-    if !found || !AreEqual(e.value, m2.elts[i].value) {
-      return false
-    }
-  }
-  return true
-}
-
-// Map implements the EqualsGeneric interface.
-func (m Map) EqualsGeneric(other interface{}) bool {
-  m2, ok := other.(Map)
-  return ok && m.Equals(m2)
-}
-
-// Keys returns the set of keys in the map.
-func (m Map) Keys() Set {
-  b := NewBuilder()
-  for _, e := range m.elts {
-    b.Add(e.key)
-  }
-  return b.ToSet()
-}
-
-// Values returns the set of values in the map.
-func (m Map) Values() Set {
-  b := NewBuilder()
-  for _, e := range m.elts {
-    b.Add(e.value)
-  }
-  return b.ToSet()
-}
-
-// Items returns the set of items in the map as a Set of Tuples.
-func (m Map) Items() Set {
-  b := NewBuilder()
-  for _, e := range m.elts {
-    b.Add(TupleOf(e.key, e.value))
-  }
-  return b.ToSet()
-}
-
-func (m Map) String() string {
-  s := "map["
-  for i, e := range m.elts {
-    if i > 0 {
-      s += ", "
-    }
-    s += fmt.Sprintf("%s := %s", String(e.key), String(e.value))
-  }
-  s += "]"
-  return s
-}
-
-/******************************************************************************
- * Integers
- ******************************************************************************/
-
-// An Int is an immutable big integer.
-type Int struct {
-  impl *big.Int
-  // debug string
-} // Careful not to mutate!
-
-// A BV is an immutable big bitvector (presumed to be non-negative).
-type BV = Int
-
-func intOf(i *big.Int) Int {
-  return Int{
-    impl: i,
-    // debug: i.String(),
-  }
-}
-
-// IntOf turns the given int into an Int.  Common values are cached.  This is
-// simply a shorter form of IntOfInt.
-func IntOf(i int) Int {
-  return IntOfInt(i)
-}
-
-// IntOfInt turns the given int into an Int.  Common values are cached.
-func IntOfInt(i int) Int {
-  return IntOfInt64(int64(i))
-}
-
-// IntOfInt8 turns the given int8 into an Int.  Common values are cached.
-func IntOfInt8(i int8) Int {
-  return IntOfInt64(int64(i))
-}
-
-// IntOfInt16 turns the given int16 into an Int.  Common values are cached.
-func IntOfInt16(i int16) Int {
-  return IntOfInt64(int64(i))
-}
-
-// IntOfInt32 turns the given int32 into an Int.  Common values are cached.
-func IntOfInt32(i int32) Int {
-  return IntOfInt64(int64(i))
-}
-
-// IntOfInt64 turns the given int64 into an Int.  Common values are cached.
-func IntOfInt64(i int64) Int {
-  switch i {
-  case -1:
-    return NegativeOne
-  case 0:
-    return Zero
-  case 1:
-    return One
-  case 2:
-    return Two
-  case 5:
-    return Five
-  case 10:
-    return Ten
-  default:
-    return intOf(big.NewInt(i))
-  }
-}
-
-// IntOfUint turns the given uint into an Int.  Common values are cached.
-func IntOfUint(i uint) Int {
-  return IntOfUint64(uint64(i))
-}
-
-// IntOfUint8 turns the given uint8 into an Int.  Common values are cached.
-func IntOfUint8(i uint8) Int {
-  return IntOfUint64(uint64(i))
-}
-
-// IntOfUint16 turns the given uint16 into an Int.  Common values are cached.
-func IntOfUint16(i uint16) Int {
-  return IntOfUint64(uint64(i))
-}
-
-// IntOfUint32 turns the given uint32 into an Int.  Common values are cached.
-func IntOfUint32(i uint32) Int {
-  return IntOfUint64(uint64(i))
-}
-
-// IntOfUint64 turns the given uint64 into an Int.  Common values are cached.
-func IntOfUint64(i uint64) Int {
-  switch i {
-  case 0:
-    return Zero
-  case 1:
-    return One
-  case 2:
-    return Two
-  case 5:
-    return Five
-  case 10:
-    return Ten
-  default:
-    return intOf(new(big.Int).SetUint64(i))
-  }
-}
-
-// IntOfString parses the given string as an Int, panicking on failure.
-func IntOfString(s string) Int {
-  switch s {
-  case "-1":
-    return NegativeOne
-  case "0":
-    return Zero
-  case "1":
-    return One
-  case "2":
-    return Two
-  case "5":
-    return Five
-  case "10":
-    return Ten
-  default:
-    i, ok := new(big.Int).SetString(s, 0)
-    if !ok {
-      panic("Unable to parse string as int: " + s)
-    } else {
-      return intOf(i)
-    }
-  }
-}
-
-// IntOfAny converts from many different things to Int.  Note that
-// switch-on-type does a linear search, so this can be slow for less common
-// cases.
-func IntOfAny(x interface{}) Int {
-  switch x := x.(type) {
-  // Try and put the most common cases earliest.
-  case Int:
-    return x
-  case int:
-    return IntOfInt(x)
-  case string:
-    return IntOfString(x)
-  case uint:
-    return IntOfUint(x)
-  case Char:
-    return IntOfInt32(rune(x))
-  case int32:
-    return IntOfInt32(x)
-  case int64:
-    return IntOfInt64(x)
-  case uint32:
-    return IntOfUint32(x)
-  case uint64:
-    return IntOfUint64(x)
-  case int8:
-    return IntOfInt8(x)
-  case uint8:
-    return IntOfUint8(x)
-  case int16:
-    return IntOfInt16(x)
-  case uint16:
-    return IntOfUint16(x)
-  default:
-    panic(fmt.Errorf("unexpected type for IntToAny: %v", refl.TypeOf(x)))
-  }
-}
-
-// Int converts back into an int.  If the result is not within int range,
-// the value is undefined.
-func (i Int) Int() int {
-  return int(i.impl.Int64())
-}
-
-// Int8 converts back into an int8.  If the result is not within int8 range,
-// the value is undefined.
-func (i Int) Int8() int8 {
-  return int8(i.impl.Int64())
-}
-
-// Int16 converts back into an int16.  If the result is not within int16 range,
-// the value is undefined.
-func (i Int) Int16() int16 {
-  return int16(i.impl.Int64())
-}
-
-// Int32 converts back into an int32.  If the result is not within int32 range,
-// the value is undefined.
-func (i Int) Int32() int32 {
-  return int32(i.impl.Int64())
-}
-
-// Int64 converts back to an int64.  If the result is not within int64 range,
-// the value is undefined.
-func (i Int) Int64() int64 {
-  return i.impl.Int64()
-}
-
-// Uint converts back to a uint.  If the result is not within uint range, the
-// value is undefined.
-func (i Int) Uint() uint {
-  return uint(i.impl.Uint64())
-}
-
-// Uint8 converts back to a uint8.  If the result is not within uint8 range, the
-// value is undefined.
-func (i Int) Uint8() uint8 {
-  return uint8(i.impl.Uint64())
-}
-
-// Uint16 converts back to a uint16.  If the result is not within uint16 range,
-// the value is undefined.
-func (i Int) Uint16() uint16 {
-  return uint16(i.impl.Uint64())
-}
-
-// Uint32 converts back to a uint32.  If the result is not within uint32 range,
-// the value is undefined.
-func (i Int) Uint32() uint32 {
-  return uint32(i.impl.Uint64())
-}
-
-// Uint64 converts back to a uint64.  If the result is not within uint64 range,
-// the value is undefined.
-func (i Int) Uint64() uint64 {
-  return i.impl.Uint64()
-}
-
-func (i Int) String() string {
-  return i.impl.String()
-}
-
-// NegativeOne is the constant -1.
-var NegativeOne = intOf(big.NewInt(-1))
-
-// Zero is the constant 0.
-var Zero = intOf(big.NewInt(0))
-
-// One is the constant 1.
-var One = intOf(big.NewInt(1))
-
-// Two is the constant 2.
-var Two = intOf(big.NewInt(2))
-
-// Five is the constant 5.
-var Five = intOf(big.NewInt(5))
-
-// Ten is the constant 10.
-var Ten = intOf(big.NewInt(10))
-
-// NilInt is a missing int value.
-var NilInt = intOf(nil)
-
-// IsNilInt returns whether this Int is actually a missing value.
-func (i Int) IsNilInt() bool {
-  return i.impl == nil
-}
-
-func (i Int) binOp(j Int, f func(*big.Int, *big.Int, *big.Int) *big.Int) Int {
-  return intOf(f(new(big.Int), i.impl, j.impl))
-}
-
-// Plus adds two Ints.
-func (i Int) Plus(j Int) Int {
-  return i.binOp(j, (*big.Int).Add)
-}
-
-// Minus subtracts one Int from another.
-func (i Int) Minus(j Int) Int {
-  return i.binOp(j, (*big.Int).Sub)
-}
-
-// Times multiplies two Ints.
-func (i Int) Times(j Int) Int {
-  return i.binOp(j, (*big.Int).Mul)
-}
-
-// DivBy divides one Int by another.  (So named to distinguish from
-// big.Int.Div(), which is an in-place operation.)
-func (i Int) DivBy(j Int) Int {
-  return i.binOp(j, (*big.Int).Div)
-}
-
-// Modulo takes the remainder when dividing one Int by another.  (So named to
-// distinguish from big.Int.Mod(), which performs the operation in place.)
-func (i Int) Modulo(j Int) Int {
-  return i.binOp(j, (*big.Int).Mod)
-}
-
-// Negated negates an Int.
-func (i Int) Negated() Int {
-  return intOf(new(big.Int).Neg(i.impl))
-}
-
-// Lsh performs a left shift.
-func (i Int) Lsh(j Int) Int {
-  return intOf(new(big.Int).Lsh(i.impl, uint(j.Uint64())))
-}
-
-// Rsh performs a right shift.
-func (i Int) Rsh(j Int) Int {
-  return intOf(new(big.Int).Rsh(i.impl, uint(j.Uint64())))
-}
-
-// Lrot performs a left rotate on a BV with width w.
-func (i BV) Lrot(j Int, w uint) BV {
-  // (i <<< j) == ((i << j) % 2^w) | (i >> (w-j))
-
-  ju := uint(j.Uint64())
-  l := new(big.Int).Lsh(i.impl, ju)
-  modulus := new(big.Int).Lsh(One.impl, w)
-  l.Mod(l, modulus)
-  r := modulus.Rsh(i.impl, w-ju) // reuse memory from modulus
-  return intOf(l.Or(l, r))
-}
-
-// Rrot performs a right rotate on a BV with width w.
-func (i BV) Rrot(j BV, w uint) BV {
-  // (i >>> j) == ((i << (w-j)) % 2^w) | (i >> j)
-
-  ju := uint(j.Uint64())
-  l := new(big.Int).Lsh(i.impl, w-ju)
-  modulus := new(big.Int).Lsh(One.impl, w)
-  l.Mod(l, modulus)
-  r := modulus.Rsh(i.impl, ju) // reuse memory from modulus
-  return intOf(l.Or(l, r))
-}
-
-// Cmp compares two Ints, returning -1 for less, 0 for equal, or 1 for greater.
-func (i Int) Cmp(j Int) int {
-  return i.impl.Cmp(j.impl)
-}
-
-// Sign returns the sign of an Int, returning -1 for negative, 0 for zero, or
-// 1 for positive.
-func (i Int) Sign() int {
-  return i.impl.Sign()
-}
-
-// EqualsGeneric compares an int to another value.
-func (i Int) EqualsGeneric(other interface{}) bool {
-  j, ok := other.(Int)
-  return ok && i.Cmp(j) == 0
-}
-
-// Min returns the minimum of two integers.
-func (i Int) Min(j Int) Int {
-  if i.Cmp(j) <= 0 {
-    return i
-  } else {
-    return j
-  }
-}
-
-// Max returns the maximum of two integers.
-func (i Int) Max(j Int) Int {
-  if i.Cmp(j) >= 0 {
-    return i
-  } else {
-    return j
-  }
-}
-
-// And performs bitwise AND.
-func (i Int) And(j Int) Int {
-  return i.binOp(j, (*big.Int).And)
-}
-
-// Or performs bitwise OR.
-func (i Int) Or(j Int) Int {
-  return i.binOp(j, (*big.Int).Or)
-}
-
-// Xor performs bitwise XOR.
-func (i Int) Xor(j Int) Int {
-  return i.binOp(j, (*big.Int).Xor)
-}
-
-// Not performs bitwise NOT.
-func (i Int) Not() Int {
-  return intOf(new(big.Int).Not(i.impl))
-}
-
-func (i Int) isPowerOf10() (bool, int) {
-  if i.Cmp(Zero) != 1 {
-    return false, -1
-  }
-  n := 0
-  j := i
-  for {
-    if j.Cmp(One) == 0 {
-      return true, n
-    } else if j.Modulo(Ten).Cmp(Zero) != 0 {
-      return false, -1
-    } else {
-      j = j.DivBy(Ten)
-      n++
-    }
-  }
-}
-
-func (i Int) dividesAPowerOf10() (yes bool, factor Int, log10 int) {
-  if i.Cmp(Zero) != 1 {
-    return false, Zero, -1
-    // okay, so technically you could multiply by a
-    // negative number, but that's not useful to
-    // Real.String().
-  }
-  n := 0
-  j := i
-  fact := One
-  for {
-    if j.Cmp(One) == 0 {
-      return true, One, n
-    } else if j.Modulo(Ten).Cmp(Zero) != 0 {
-      if j.Modulo(Five).Cmp(Zero) == 0 {
-        for {
-          fact = fact.Times(Two)
-          j = j.DivBy(Five)
-          n++
-          if j.Cmp(One) == 0 {
-            return true, fact, n
-          } else if j.Modulo(Five).Cmp(Zero) != 0 {
-            return false, NegativeOne, -1
-          }
-        }
-      } else if j.Modulo(Two).Cmp(Zero) == 0 {
-        for {
-          fact = fact.Times(Five)
-          j = j.DivBy(Two)
-          n++
-          if j.Cmp(One) == 0 {
-            return true, fact, n
-          } else if j.Modulo(Two).Cmp(Zero) != 0 {
-            return false, NegativeOne, -1
-          }
-        }
-      } else {
-        return false, NegativeOne, -1
-      }
-    } else {
-      j = j.DivBy(Ten)
-      n++
-    }
-  }
-}
-
-// IntegerRange returns an iterator over the integers from lo up to (but not
-// including) hi.
-func IntegerRange(lo, hi Int) Iterator {
-  if lo.impl != nil {
-    i := lo
-    return func() (interface{}, bool) {
-      if hi.impl != nil && i.Cmp(hi) >= 0 {
-        return nil, false
-      } else {
-        ans := i
-        i = i.Plus(One)
-        return ans, true
-      }
-    }
-  } else if hi.impl != nil {
-    i := hi
-    return func() (interface{}, bool) {
-      ans := i
-      i = i.Minus(One)
-      return ans, true
-    }
-  } else {
-    return AllIntegers()
-  }
-}
-
-// AllIntegers returns an iterator over all integers, starting at zero and
-// alternating between positive and negative.
-func AllIntegers() Iterator {
-  type phase int
-  const (
-    zeroPhase int = iota
-    posPhase
-    negPhase
-  )
-
-  i := Zero
-  p := zeroPhase
-
-  return func() (interface{}, bool) {
-    switch p {
-    case zeroPhase:
-      i = One
-      p = posPhase
-      return Zero, true
-    case posPhase:
-      p = negPhase
-      return i, true
-    case negPhase:
-      ans := i.Negated()
-      i = i.Plus(One)
-      p = posPhase
-      return ans, true
-    default:
-      panic("unknown phase")
-    }
-  }
-}
-
-/******************************************************************************
- * Ordinals
- ******************************************************************************/
-
-// An Ord is an immutable big integer (presumed to be non-negative).
-type Ord = Int
-
-// IsLimitOrd returns true for a limit ordinal.
-func (ord Ord) IsLimitOrd() bool {
-  return ord.Cmp(Zero) == 0
-}
-
-// IsSuccOrd returns true for a successor ordinal.
-func (ord Ord) IsSuccOrd() bool {
-  return ord.Cmp(Zero) > 0
-}
-
-// OrdOffset returns the ordinal as an Int.
-func (ord Ord) OrdOffset() Int {
-  return ord
-}
-
-// IsNatOrd returns true if the ordinal represents a natural number.
-func (Ord) IsNatOrd() bool {
-  return true // at run time, every ORDINAL is a natural number
-}
-
-/******************************************************************************
- * Reals
- ******************************************************************************/
-
-// A Real is an arbitrary-precision real number, represented as a ratio of
-// arbitrary-precision integers.
-type Real struct {
-  impl *big.Rat
-  // debug string
-}
-
-func realOf(r *big.Rat) Real {
-  return Real{
-    impl: r,
-    // debug: r.String()
-  }
-}
-
-// RealOf converts a float64 into a Real.  Common values are cached.
-func RealOf(f float64) Real {
-  if f == 0.0 {
-    return ZeroReal
-  }
-  return realOf(new(big.Rat).SetFloat64(f))
-}
-
-// RealOfFrac makes a Real of the ratio of two Ints.
-func RealOfFrac(num, denom Int) Real {
-  if num.Cmp(Zero) == 0 {
-    return ZeroReal
-  }
-  return realOf(new(big.Rat).SetFrac(num.impl, denom.impl))
-}
-
-// ZeroReal is the Real value zero.
-var ZeroReal = realOf(new(big.Rat))
-
-// NilReal is a missing Real value.
-var NilReal = realOf(nil)
-
-// IsNilReal returns whether this is actually a missing value.
-func (x Real) IsNilReal() bool {
-  return x.impl == nil
-}
-
-// RealOfString parses the given string in base 10 and panics if this is not
-// possible.
-func RealOfString(s string) Real {
-  x, ok := new(big.Rat).SetString(s)
-  if !ok {
-    panic("Can't parse generated string as ratio: \"" + s + "\"")
-  }
-  if x.Cmp(ZeroReal.impl) == 0 {
-    return ZeroReal
-  }
-  return realOf(x)
-}
-
-// Int converts the given real to an integer, rounding toward negative numbers.
-// (That is, returns floor(x).)
-func (x Real) Int() Int {
-  if x.Cmp(ZeroReal) == 0 || x.Denom().Cmp(One) == 0 {
-    return x.Num()
-  } else if x.Num().Cmp(Zero) > 0 {
-    return intOf(new(big.Int).Div(x.impl.Num(), x.impl.Denom()))
-  } else {
-    a := new(big.Int).Sub(x.impl.Num(), x.impl.Denom())
-    a.Add(a, One.impl)
-    return intOf(a.Quo(a, x.impl.Denom())) // note: *truncated* division
-  }
-}
-
-// Num returns the given Real's numerator as an Int
-func (x Real) Num() Int {
-  return intOf(x.impl.Num())
-}
-
-// Denom returns the given Real's denominator as an Int
-func (x Real) Denom() Int {
-  return intOf(x.impl.Denom())
-}
-
-func (x Real) String() string {
-  if x.Num().Cmp(Zero) == 0 || x.Denom().Cmp(One) == 0 {
-    return x.Num().String() + ".0"
-  }
-  divsPow10, fact, log10 := x.Denom().dividesAPowerOf10()
-  if divsPow10 {
-    num := x.Num().Times(fact)
-    var sign, digits string
-    if x.Cmp(ZeroReal) < 0 {
-      sign, digits = "-", num.Negated().String()
-    } else {
-      sign, digits = "", num.String()
-    }
-    if log10 < len(digits) {
-      n := len(digits) - log10
-      return sign + digits[0:n] + "." + digits[n:]
-    } else {
-      s := sign + "0."
-      for i := 0; i < log10-len(digits); i++ {
-        s = s + "0"
-      }
-      return s + digits
-    }
-  } else {
-    return "(" + x.Num().String() + ".0 / " + x.Denom().String() + ".0)"
-  }
-}
-
-func (x Real) isPowerOf10() (bool, int) {
-  if x.Num().Cmp(Zero) != 1 {
-    return false, -1
-  } else if x.Num().Cmp(One) == 1 {
-    b, i := x.Denom().isPowerOf10()
-    return b, -i
-  } else if x.Denom().Cmp(One) != 1 {
-    return false, -1
-  } else {
-    return x.Num().isPowerOf10()
-  }
-}
-
-// binOp lifts a binary operation on *big.Rat to one on Reals.  The second
-// argument is intended to be of the form (*big.Rat).Op.
-func (x Real) binOp(y Real, f func(*big.Rat, *big.Rat, *big.Rat) *big.Rat) Real {
-  return realOf(f(new(big.Rat), x.impl, y.impl))
-}
-
-// Plus adds two Reals.
-func (x Real) Plus(y Real) Real {
-  return x.binOp(y, (*big.Rat).Add)
-}
-
-// Minus subtracts one Real from another.
-func (x Real) Minus(y Real) Real {
-  return x.binOp(y, (*big.Rat).Sub)
-}
-
-// Times multiplies two Reals.
-func (x Real) Times(y Real) Real {
-  return x.binOp(y, (*big.Rat).Mul)
-}
-
-// DivBy divides one Real by another.
-func (x Real) DivBy(y Real) Real {
-  return x.binOp(y, (*big.Rat).Quo)
-}
-
-// Cmp compares one Real to another, returning -1 for less, 0 for equal, or 1
-// for greater.
-func (x Real) Cmp(y Real) int {
-  return x.impl.Cmp(y.impl)
-}
-
-// Sign returns the sign of a Real, returning -1 for negative, 0 for zero, or
-// 1 for positive.
-func (x Real) Sign() int {
-  return x.impl.Sign()
-}
-
-// EqualsGeneric compares an int to another value.
-func (x Real) EqualsGeneric(other interface{}) bool {
-  y, ok := other.(Real)
-  return ok && x.Cmp(y) == 0
-}
-
-// Min returns the minimum of two reals.
-func (x Real) Min(y Real) Real {
-  if x.Cmp(y) <= 0 {
-    return x
-  } else {
-    return y
-  }
-}
-
-// Max returns the maximum of two reals.
-func (x Real) Max(y Real) Real {
-  if x.Cmp(y) >= 0 {
-    return x
-  } else {
-    return y
-  }
-}
-
-/******************************************************************************
- * Native math
- ******************************************************************************/
-
-// DivInt does Euclidean division on the given ints
-func DivInt(x int, y int) int {
-  if x >= 0 {
-    if y >= 0 {
-      return x / y
-    } else {
-      return -(x / -y)
-    }
-  } else {
-    if y >= 0 {
-      return -((-x - 1) / y) - 1
-    } else {
-      return ((-x - 1) / (-y)) + 1
-    }
-  }
-}
-
-// DivInt8 does Euclidean divison on the given int8s
-func DivInt8(x int8, y int8) int8 {
-  if x >= 0 {
-    if y >= 0 {
-      return x / y
-    } else {
-      return -(x / -y)
-    }
-  } else {
-    if y >= 0 {
-      return -((-x - 1) / y) - 1
-    } else {
-      return ((-x - 1) / (-y)) + 1
-    }
-  }
-}
-
-// DivInt16 does Euclidean divison on the given int16s
-func DivInt16(x int16, y int16) int16 {
-  if x >= 0 {
-    if y >= 0 {
-      return x / y
-    } else {
-      return -(x / -y)
-    }
-  } else {
-    if y >= 0 {
-      return -((-x - 1) / y) - 1
-    } else {
-      return ((-x - 1) / (-y)) + 1
-    }
-  }
-}
-
-// DivInt32 does Euclidean divison on the given int32s
-func DivInt32(x int32, y int32) int32 {
-  if x >= 0 {
-    if y >= 0 {
-      return x / y
-    } else {
-      return -(x / -y)
-    }
-  } else {
-    if y >= 0 {
-      return -((-x - 1) / y) - 1
-    } else {
-      return ((-x - 1) / (-y)) + 1
-    }
-  }
-}
-
-// DivInt64 does Euclidean divison on the given int64s
-func DivInt64(x int64, y int64) int64 {
-  if x >= 0 {
-    if y >= 0 {
-      return x / y
-    } else {
-      return -(x / -y)
-    }
-  } else {
-    if y >= 0 {
-      return -((-x - 1) / y) - 1
-    } else {
-      return ((-x - 1) / (-y)) + 1
-    }
-  }
-}
-
-// DivFloat32 does Euclidean division on the given float32s
-func DivFloat32(x float32, y float32) float32 {
-  if x >= 0 {
-    if y >= 0 {
-      return x / y
-    } else {
-      return -(x / -y)
-    }
-  } else {
-    if y >= 0 {
-      return -((-x - 1) / y) - 1
-    } else {
-      return ((-x - 1) / (-y)) + 1
-    }
-  }
-}
-
-// DivFloat64 does Euclidean division on the given float64s
-func DivFloat64(x float64, y float64) float64 {
-  if x >= 0 {
-    if y >= 0 {
-      return x / y
-    } else {
-      return -(x / -y)
-    }
-  } else {
-    if y >= 0 {
-      return -((-x - 1) / y) - 1
-    } else {
-      return ((-x - 1) / (-y)) + 1
-    }
-  }
-}
-
-// LrotUint performs left rotation on the low w bits of an int
-func LrotUint(x uint, n Int, w uint) uint {
-  y := n.Uint()
-  return ((x << y) % (1 << w)) | (x >> (w - y))
-}
-
-// LrotUint8 performs left rotation on the low w bits of an int8
-func LrotUint8(x uint8, n Int, w uint) uint8 {
-  y := n.Uint()
-  return ((x << y) % (1 << w)) | (x >> (w - y))
-}
-
-// LrotUint16 performs left rotation on the low w bits of an int16
-func LrotUint16(x uint16, n Int, w uint) uint16 {
-  y := n.Uint()
-  return ((x << y) % (1 << w)) | (x >> (w - y))
-}
-
-// LrotUint32 performs left rotation on the low w bits of an int32
-func LrotUint32(x uint32, n Int, w uint) uint32 {
-  y := n.Uint()
-  return ((x << y) % (1 << w)) | (x >> (w - y))
-}
-
-// LrotUint64 performs left rotation on the low w bits of an int64
-func LrotUint64(x uint64, n Int, w uint) uint64 {
-  y := n.Uint()
-  return ((x << y) % (1 << w)) | (x >> (w - y))
-}
-
-// ModInt finds Euclidean remainder of the given ints
-func ModInt(x int, y int) int {
-  if y < 0 {
-    y = -y
-  }
-  if x >= 0 {
-    return x % y
-  } else {
-    z := (-x) % y
-    if z == 0 {
-      return 0
-    } else {
-      return y - z
-    }
-  }
-}
-
-// ModInt8 finds Euclidean remainder of the given int8s
-func ModInt8(x int8, y int8) int8 {
-  if y < 0 {
-    y = -y
-  }
-  if x >= 0 {
-    return x % y
-  } else {
-    z := (-x) % y
-    if z == 0 {
-      return 0
-    } else {
-      return y - z
-    }
-  }
-}
-
-// ModInt16 finds Euclidean remainder of the given int16s
-func ModInt16(x int16, y int16) int16 {
-  if y < 0 {
-    y = -y
-  }
-  if x >= 0 {
-    return x % y
-  } else {
-    z := (-x) % y
-    if z == 0 {
-      return 0
-    } else {
-      return y - z
-    }
-  }
-}
-
-// ModInt32 finds Euclidean remainder of the given int32s
-func ModInt32(x int32, y int32) int32 {
-  if y < 0 {
-    y = -y
-  }
-  if x >= 0 {
-    return x % y
-  } else {
-    z := (-x) % y
-    if z == 0 {
-      return 0
-    } else {
-      return y - z
-    }
-  }
-}
-
-// ModInt64 finds Euclidean remainder of the given int64s
-func ModInt64(x int64, y int64) int64 {
-  if y < 0 {
-    y = -y
-  }
-  if x >= 0 {
-    return x % y
-  } else {
-    z := (-x) % y
-    if z == 0 {
-      return 0
-    } else {
-      return y - z
-    }
-  }
-}
-
-// RrotUint performs right rotation on the low w bits of an int
-func RrotUint(x uint, n Int, w uint) uint {
-  y := n.Uint()
-  return (x >> y) | ((x << (w - y)) % (1 << w))
-}
-
-// RrotUint8 performs right rotation on the low w bits of an int8
-func RrotUint8(x uint8, n Int, w uint) uint8 {
-  y := n.Uint()
-  return (x >> y) | ((x << (w - y)) % (1 << w))
-}
-
-// RrotUint16 performs right rotation on the low w bits of an int16
-func RrotUint16(x uint16, n Int, w uint) uint16 {
-  y := n.Uint()
-  return (x >> y) | ((x << (w - y)) % (1 << w))
-}
-
-// RrotUint32 performs right rotation on the low w bits of an int32
-func RrotUint32(x uint32, n Int, w uint) uint32 {
-  y := n.Uint()
-  return (x >> y) | ((x << (w - y)) % (1 << w))
-}
-
-// RrotUint64 performs right rotation on the low w bits of an int64
-func RrotUint64(x uint64, n Int, w uint) uint64 {
-  y := n.Uint()
-  return (x >> y) | ((x << (w - y)) % (1 << w))
-}
-
-/******************************************************************************
- * Utility functions
- ******************************************************************************/
-
-func min(n, m int) int {
-  if n <= m {
-    return n
-  } else {
-    return m
-  }
-}
-
-func max(n, m int) int {
-  if n >= m {
-    return n
-  } else {
-    return m
-  }
-}
-
-func CatchHalt() {
-  if r := recover(); r != nil {
-    fmt.Println("[Program halted]", r)
-    os.Exit(1)
-  }
-}
-
-type GoAtomicBox struct {
-  value interface{}
-}
-
-func (box GoAtomicBox) Get() interface{} {
-  return box.value
-}
-
-func (box GoAtomicBox) Put(value interface{}) {
-  box.value = value
-}
-
-func (box GoAtomicBox) String() string {
-  return "dafny.GoAtomicBox"
-}
-
-func (CompanionStruct_AtomicBox_) Make(value interface{}) AtomicBox {
-  return GoAtomicBox{
-    value: value,
-  }
-}
-
-func (CompanionStruct_Helpers_) DafnyValueToDafnyString(value interface{}) Sequence {
-  return SeqOfString(String(value))
-}
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo/DafnyRuntimeFromDafny.go b/Source/DafnyRuntime/DafnyRuntimeGo/DafnyRuntimeFromDafny.go
deleted file mode 100644
index e29beee5a84..00000000000
--- a/Source/DafnyRuntime/DafnyRuntimeGo/DafnyRuntimeFromDafny.go
+++ /dev/null
@@ -1,1270 +0,0 @@
-// Package dafny
-// Dafny module dafny compiled into Go
-
-package dafny
-
-import (
-)
-
-type Dummy__ struct{}
-
-
-// Definition of class Default__
-type Default__ struct {
-  dummy byte
-}
-
-func New_Default___() *Default__ {
-  _this := Default__{}
-
-  return &_this
-}
-
-type CompanionStruct_Default___ struct {
-}
-var Companion_Default___ = CompanionStruct_Default___ {
-}
-
-func (_this *Default__) Equals(other *Default__) bool {
-  return _this == other
-}
-
-func (_this *Default__) EqualsGeneric(x interface{}) bool {
-  other, ok := x.(*Default__)
-  return ok && _this.Equals(other)
-}
-
-func (*Default__) String() string {
-  return "dafny.Default__"
-}
-func (_this *Default__) ParentTraits_() []*TraitID {
-  return [](*TraitID){};
-}
-var _ TraitOffspring = &Default__{}
-
-func (_static *CompanionStruct_Default___) SizeAdditionInRange(a uint32, b uint32) bool {
-  var _hresult bool = false
-  _ = _hresult
-  _hresult = (a) <= ((Companion_Default___.SIZE__T__MAX()) - (func () uint32 { return  (b) })())
-  return _hresult
-  return _hresult
-}
-func (_static *CompanionStruct_Default___) AppendRecursive(builder *Vector, e Sequence) {
-  if (func (_is_0 Sequence) bool {
-    return InstanceOf(_is_0, (*ConcatSequence)(nil))
-  }(e)) {
-    var _0_concat *ConcatSequence
-    _ = _0_concat
-    _0_concat = e.(*ConcatSequence)
-    Companion_Default___.AppendRecursive(builder, (_0_concat).Left())
-    Companion_Default___.AppendRecursive(builder, (_0_concat).Right())
-  } else if (func (_is_1 Sequence) bool {
-    return InstanceOf(_is_1, (*LazySequence)(nil))
-  }(e)) {
-    var _1_lazy *LazySequence
-    _ = _1_lazy
-    _1_lazy = e.(*LazySequence)
-    var _2_boxed Sequence
-    _ = _2_boxed
-    var _out0 interface{}
-    _ = _out0
-    _out0 = ((_1_lazy).Box()).Get()
-    _2_boxed = Companion_Sequence_.CastTo_(_out0)
-    Companion_Default___.AppendRecursive(builder, _2_boxed)
-  } else {
-    var _3_a ImmutableArray
-    _ = _3_a
-    var _out1 ImmutableArray
-    _ = _out1
-    _out1 = (e).ToArray()
-    _3_a = _out1
-    (builder).Append(_3_a)
-  }
-}
-func (_static *CompanionStruct_Default___) AppendOptimized(builder *Vector, e Sequence, stack *Vector) {
-  goto TAIL_CALL_START
-  TAIL_CALL_START:
-  if (func (_is_2 Sequence) bool {
-    return InstanceOf(_is_2, (*ConcatSequence)(nil))
-  }(e)) {
-    var _4_concat *ConcatSequence
-    _ = _4_concat
-    _4_concat = e.(*ConcatSequence)
-    if (!(Companion_Default___.SizeAdditionInRange(stack.Size, Companion_Default___.ONE__SIZE()))) {
-      panic("dafnyRuntime.dfy[DafnyGo](766,6): " + (SeqOfString("expectation violation")).String())
-    }
-    (stack).AddLast((_4_concat).Right())
-    {
-      var _in0 *Vector = builder
-      _ = _in0
-      var _in1 Sequence = (_4_concat).Left()
-      _ = _in1
-      var _in2 *Vector = stack
-      _ = _in2
-      builder = _in0
-      e = _in1
-      stack = _in2
-      goto TAIL_CALL_START
-      goto L0_0;
-    }
-  L0_0:
-  } else if (func (_is_3 Sequence) bool {
-    return InstanceOf(_is_3, (*LazySequence)(nil))
-  }(e)) {
-    var _5_lazy *LazySequence
-    _ = _5_lazy
-    _5_lazy = e.(*LazySequence)
-    var _6_boxed Sequence
-    _ = _6_boxed
-    var _out2 interface{}
-    _ = _out2
-    _out2 = ((_5_lazy).Box()).Get()
-    _6_boxed = Companion_Sequence_.CastTo_(_out2)
-    var _in3 *Vector = builder
-    _ = _in3
-    var _in4 Sequence = _6_boxed
-    _ = _in4
-    var _in5 *Vector = stack
-    _ = _in5
-    builder = _in3
-    e = _in4
-    stack = _in5
-    goto TAIL_CALL_START
-  } else if (func (_is_4 Sequence) bool {
-    return InstanceOf(_is_4, (*ArraySequence)(nil))
-  }(e)) {
-    var _7_a *ArraySequence
-    _ = _7_a
-    _7_a = e.(*ArraySequence)
-    (builder).Append((_7_a).Values())
-    if ((uint32(0)) < (stack.Size)) {
-      var _8_next Sequence
-      _ = _8_next
-      var _out3 interface{}
-      _ = _out3
-      _out3 = (stack).RemoveLast()
-      _8_next = Companion_Sequence_.CastTo_(_out3)
-      {
-        var _in6 *Vector = builder
-        _ = _in6
-        var _in7 Sequence = _8_next
-        _ = _in7
-        var _in8 *Vector = stack
-        _ = _in8
-        builder = _in6
-        e = _in7
-        stack = _in8
-        goto TAIL_CALL_START
-        goto L1_1_0_0_0;
-      }
-    L1_1_0_0_0:
-    }
-  } else {
-    if (!(false)) {
-      panic("dafnyRuntime.dfy[DafnyGo](789,6): " + (SeqOfString("Unsupported Sequence implementation")).String())
-    }
-  }
-}
-func (_static *CompanionStruct_Default___) MIN__SIZE__T__LIMIT() Int {
-  return IntOfInt64(128)
-}
-func (_static *CompanionStruct_Default___) SIZE__T__LIMIT() Int {
-  return IntOfInt64(2147483648)
-}
-func (_static *CompanionStruct_Default___) SIZE__T__MAX() uint32 {
-  return ((Companion_Default___.SIZE__T__LIMIT()).Minus(One)).Uint32()
-}
-func (_static *CompanionStruct_Default___) ZERO__SIZE() uint32 {
-  return uint32(0)
-}
-func (_static *CompanionStruct_Default___) ONE__SIZE() uint32 {
-  return uint32(1)
-}
-func (_static *CompanionStruct_Default___) TWO__SIZE() uint32 {
-  return uint32(2)
-}
-func (_static *CompanionStruct_Default___) TEN__SIZE() uint32 {
-  return uint32(10)
-}
-// End of class Default__
-
-// Definition of trait Sequence
-type Sequence interface {
-  String() string
-  Equals(other Sequence) bool
-  EqualsGeneric(x interface{}) bool
-  VerbatimString(isLiteral bool) string
-  SetString() Sequence
-  IsString() bool
-  IsString_set_(value bool)
-  Cardinality() uint32
-  Select(index uint32) interface{}
-  Drop(lo uint32) Sequence
-  Take(hi uint32) Sequence
-  Subsequence(lo uint32, hi uint32) Sequence
-  ToArray() ImmutableArray
-  Elements() Sequence
-  UniqueElements() Set
-}
-func (_static *CompanionStruct_Sequence_) SetString(_this Sequence) Sequence {
-  {
-    var ret Sequence = (Sequence)(nil)
-    _ = ret
-    (_this).IsString_set_(true);
-    ret = _this
-    return ret
-    return ret
-  }
-}
-func (_static *CompanionStruct_Sequence_) Select(_this Sequence, index uint32) interface{} {
-  {
-    var ret interface{} = (interface{})(nil)
-    _ = ret
-    var _9_a ImmutableArray
-    _ = _9_a
-    var _out4 ImmutableArray
-    _ = _out4
-    _out4 = (_this).ToArray()
-    _9_a = _out4
-    ret = (_9_a).Select(index)
-    return ret
-    return ret
-  }
-}
-func (_static *CompanionStruct_Sequence_) Drop(_this Sequence, lo uint32) Sequence {
-  {
-    var ret Sequence = (Sequence)(nil)
-    _ = ret
-    var _out5 Sequence
-    _ = _out5
-    _out5 = (_this).Subsequence(lo, (_this).Cardinality())
-    ret = _out5
-    return ret
-  }
-}
-func (_static *CompanionStruct_Sequence_) Take(_this Sequence, hi uint32) Sequence {
-  {
-    var ret Sequence = (Sequence)(nil)
-    _ = ret
-    var _out6 Sequence
-    _ = _out6
-    _out6 = (_this).Subsequence(uint32(0), hi)
-    ret = _out6
-    return ret
-  }
-}
-func (_static *CompanionStruct_Sequence_) Subsequence(_this Sequence, lo uint32, hi uint32) Sequence {
-  {
-    var ret Sequence = (Sequence)(nil)
-    _ = ret
-    var _10_a ImmutableArray
-    _ = _10_a
-    var _out7 ImmutableArray
-    _ = _out7
-    _out7 = (_this).ToArray()
-    _10_a = _out7
-    var _11_subarray ImmutableArray
-    _ = _11_subarray
-    var _out8 ImmutableArray
-    _ = _out8
-    _out8 = (_10_a).Subarray(lo, hi)
-    _11_subarray = _out8
-    var _nw0 *ArraySequence = New_ArraySequence_()
-    _ = _nw0
-    _nw0.Ctor__(_11_subarray, false)
-    ret = _nw0
-    return ret
-  }
-}
-func (_static *CompanionStruct_Sequence_) Elements(_this Sequence) Sequence {
-  {
-    return _this
-  }
-}
-func (_static *CompanionStruct_Sequence_) Create(cardinality uint32, initFn func (uint32) interface{}) Sequence {
-  var ret Sequence = (Sequence)(nil)
-  _ = ret
-  var _12_a NativeArray
-  _ = _12_a
-  var _out9 NativeArray
-  _ = _out9
-  _out9 = Companion_NativeArray_.MakeWithInit(cardinality, func (coer0 func (uint32) interface{}) func (uint32) interface{} {
-    return func (arg0 uint32) interface{} {
-      return coer0(arg0)
-    }
-  }(initFn))
-  _12_a = _out9
-  var _13_frozen ImmutableArray
-  _ = _13_frozen
-  var _out10 ImmutableArray
-  _ = _out10
-  _out10 = (_12_a).Freeze(cardinality)
-  _13_frozen = _out10
-  var _nw1 *ArraySequence = New_ArraySequence_()
-  _ = _nw1
-  _nw1.Ctor__(_13_frozen, false)
-  ret = _nw1
-  return ret
-}
-func (_static *CompanionStruct_Sequence_) EqualUpTo(left Sequence, right Sequence, index uint32) bool {
-  var ret bool = false
-  _ = ret
-  var _hi0 uint32 = index
-  _ = _hi0
-  for _14_i := uint32(0); _14_i < _hi0; _14_i++ {
-    var _15_leftElement interface{}
-    _ = _15_leftElement
-    var _out11 interface{}
-    _ = _out11
-    _out11 = (left).Select(_14_i)
-    _15_leftElement = _out11
-    var _16_rightElement interface{}
-    _ = _16_rightElement
-    var _out12 interface{}
-    _ = _out12
-    _out12 = (right).Select(_14_i)
-    _16_rightElement = _out12
-    if (!AreEqual(_15_leftElement, _16_rightElement)) {
-      ret = false
-      return ret
-    }
-  }
-  ret = true
-  return ret
-  return ret
-}
-func (_static *CompanionStruct_Sequence_) Equal(left Sequence, right Sequence) bool {
-  var ret bool = false
-  _ = ret
-  if (((left).Cardinality()) != ((right).Cardinality())/* dircomp */) {
-    ret = false
-    return ret
-  }
-  var _out13 bool
-  _ = _out13
-  _out13 = Companion_Sequence_.EqualUpTo(left, right, (left).Cardinality())
-  ret = _out13
-  return ret
-}
-func (_static *CompanionStruct_Sequence_) IsPrefixOf(left Sequence, right Sequence) bool {
-  var ret bool = false
-  _ = ret
-  if (((right).Cardinality()) < ((left).Cardinality())) {
-    ret = false
-    return ret
-  }
-  var _out14 bool
-  _ = _out14
-  _out14 = Companion_Sequence_.EqualUpTo(left, right, (left).Cardinality())
-  ret = _out14
-  return ret
-}
-func (_static *CompanionStruct_Sequence_) IsProperPrefixOf(left Sequence, right Sequence) bool {
-  var ret bool = false
-  _ = ret
-  if (((right).Cardinality()) <= ((left).Cardinality())) {
-    ret = false
-    return ret
-  }
-  var _out15 bool
-  _ = _out15
-  _out15 = Companion_Sequence_.EqualUpTo(left, right, (left).Cardinality())
-  ret = _out15
-  return ret
-}
-func (_static *CompanionStruct_Sequence_) Contains(s Sequence, t interface{}) bool {
-  var _hresult bool = false
-  _ = _hresult
-  var _hi1 uint32 = (s).Cardinality()
-  _ = _hi1
-  for _17_i := Companion_Default___.ZERO__SIZE(); _17_i < _hi1; _17_i++ {
-    var _18_element interface{}
-    _ = _18_element
-    var _out16 interface{}
-    _ = _out16
-    _out16 = (s).Select(_17_i)
-    _18_element = _out16
-    if (AreEqual(_18_element, t)) {
-      _hresult = true
-      return _hresult
-    }
-  }
-  _hresult = false
-  return _hresult
-  return _hresult
-}
-func (_static *CompanionStruct_Sequence_) Update(s Sequence, i uint32, t interface{}) Sequence {
-  var ret Sequence = (Sequence)(nil)
-  _ = ret
-  var _19_a ImmutableArray
-  _ = _19_a
-  var _out17 ImmutableArray
-  _ = _out17
-  _out17 = (s).ToArray()
-  _19_a = _out17
-  var _20_newValue NativeArray
-  _ = _20_newValue
-  var _out18 NativeArray
-  _ = _out18
-  _out18 = Companion_NativeArray_.Copy(_19_a)
-  _20_newValue = _out18
-  (_20_newValue).Update(i, t)
-  var _21_newValueFrozen ImmutableArray
-  _ = _21_newValueFrozen
-  var _out19 ImmutableArray
-  _ = _out19
-  _out19 = (_20_newValue).Freeze((_20_newValue).Length())
-  _21_newValueFrozen = _out19
-  var _nw2 *ArraySequence = New_ArraySequence_()
-  _ = _nw2
-  _nw2.Ctor__(_21_newValueFrozen, false)
-  ret = _nw2
-  return ret
-}
-func (_static *CompanionStruct_Sequence_) Concatenate(left Sequence, right Sequence) Sequence {
-  var ret Sequence = (Sequence)(nil)
-  _ = ret
-  if (!(Companion_Default___.SizeAdditionInRange((left).Cardinality(), (right).Cardinality()))) {
-    panic("dafnyRuntime.dfy[DafnyGo](594,6): " + (Companion_Sequence_.Concatenate(Companion_Sequence_.Concatenate(SeqOfString("Concatenation result cardinality would be larger than the maximum ("), Companion_Helpers_.DafnyValueToDafnyString(Companion_Default___.SIZE__T__MAX())), SeqOfString(")"))).String())
-  }
-  var _22_left_k Sequence
-  _ = _22_left_k
-  _22_left_k = left
-  if (func (_is_5 Sequence) bool {
-    return InstanceOf(_is_5, (*LazySequence)(nil))
-  }(left)) {
-    var _23_lazyLeft *LazySequence
-    _ = _23_lazyLeft
-    _23_lazyLeft = left.(*LazySequence)
-    var _out20 interface{}
-    _ = _out20
-    _out20 = ((_23_lazyLeft).Box()).Get()
-    _22_left_k = Companion_Sequence_.CastTo_(_out20)
-  }
-  var _24_right_k Sequence
-  _ = _24_right_k
-  _24_right_k = right
-  if (func (_is_6 Sequence) bool {
-    return InstanceOf(_is_6, (*LazySequence)(nil))
-  }(right)) {
-    var _25_lazyRight *LazySequence
-    _ = _25_lazyRight
-    _25_lazyRight = right.(*LazySequence)
-    var _out21 interface{}
-    _ = _out21
-    _out21 = ((_25_lazyRight).Box()).Get()
-    _24_right_k = Companion_Sequence_.CastTo_(_out21)
-  }
-  var _26_c *ConcatSequence
-  _ = _26_c
-  var _nw3 *ConcatSequence = New_ConcatSequence_()
-  _ = _nw3
-  _nw3.Ctor__(_22_left_k, _24_right_k)
-  _26_c = _nw3
-  var _nw4 *LazySequence = New_LazySequence_()
-  _ = _nw4
-  _nw4.Ctor__(_26_c)
-  ret = _nw4
-  return ret
-}
-type CompanionStruct_Sequence_ struct {
-  TraitID_ *TraitID
-}
-var Companion_Sequence_ = CompanionStruct_Sequence_ {
-  TraitID_: &TraitID{},
-}
-func (CompanionStruct_Sequence_) CastTo_(x interface{}) Sequence {
-  var t Sequence
-  t, _ = x.(Sequence)
-  return t
-}
-// End of trait Sequence
-
-// Definition of trait Validatable
-type Validatable interface {
-  String() string
-}
-type CompanionStruct_Validatable_ struct {
-  TraitID_ *TraitID
-}
-var Companion_Validatable_ = CompanionStruct_Validatable_ {
-  TraitID_: &TraitID{},
-}
-func (CompanionStruct_Validatable_) CastTo_(x interface{}) Validatable {
-  var t Validatable
-  t, _ = x.(Validatable)
-  return t
-}
-// End of trait Validatable
-
-// Definition of class Size__t
-type Size__t struct {
-}
-
-func New_Size__t_() *Size__t {
-  _this := Size__t{}
-
-  return &_this
-}
-
-type CompanionStruct_Size__t_ struct {
-}
-var Companion_Size__t_ = CompanionStruct_Size__t_ {
-}
-
-func (*Size__t) String() string {
-  return "dafny.Size__t"
-}
-func (_this *Size__t) ParentTraits_() []*TraitID {
-  return [](*TraitID){};
-}
-var _ TraitOffspring = &Size__t{}
-
-func (_this *CompanionStruct_Size__t_) IntegerRange(lo Int, hi Int) Iterator {
-  iter := IntegerRange(lo, hi)
-  return func() (interface{}, bool) {
-    next, ok := iter()
-    if !ok { return uint32(0), false }
-    return next.(Int).Uint32(), true
-  }
-}
-func (_this *CompanionStruct_Size__t_) Witness() uint32 {
-  return (Zero).Uint32()
-}
-// End of class Size__t
-
-func Type_Size__t_() TypeDescriptor {
-  return type_Size__t_{}
-}
-
-type type_Size__t_ struct {
-}
-
-func (_this type_Size__t_) Default() interface{} {
-  return Companion_Size__t_.Witness()
-}
-
-func (_this type_Size__t_) String() string {
-  return "dafny.Size__t"
-}
-
-// Definition of trait NativeArray
-type NativeArray interface {
-  String() string
-  Length() uint32
-  Select(i uint32) interface{}
-  Update(i uint32, t interface{})
-  UpdateSubarray(start uint32, other ImmutableArray)
-  Freeze(size uint32) ImmutableArray
-}
-type CompanionStruct_NativeArray_ struct {
-  TraitID_ *TraitID
-}
-var Companion_NativeArray_ = CompanionStruct_NativeArray_ {
-  TraitID_: &TraitID{},
-}
-func (CompanionStruct_NativeArray_) CastTo_(x interface{}) NativeArray {
-  var t NativeArray
-  t, _ = x.(NativeArray)
-  return t
-}
-// End of trait NativeArray
-
-// Definition of datatype ArrayCell
-type ArrayCell struct {
-  Data_ArrayCell_
-}
-
-func (_this ArrayCell) Get_() Data_ArrayCell_ {
-  return _this.Data_ArrayCell_
-}
-
-type Data_ArrayCell_ interface {
-  isArrayCell()
-}
-
-type CompanionStruct_ArrayCell_ struct {
-}
-var Companion_ArrayCell_ = CompanionStruct_ArrayCell_ {
-}
-
-type ArrayCell_Set struct {
-  Value interface{}
-}
-
-func (ArrayCell_Set) isArrayCell() {}
-
-func (CompanionStruct_ArrayCell_) Create_Set_(Value interface{}) ArrayCell {
-  return ArrayCell{ArrayCell_Set{Value}}
-}
-
-func (_this ArrayCell) Is_Set() bool {
-  _, ok := _this.Get_().(ArrayCell_Set)
-  return ok
-}
-
-type ArrayCell_Unset struct {
-}
-
-func (ArrayCell_Unset) isArrayCell() {}
-
-func (CompanionStruct_ArrayCell_) Create_Unset_() ArrayCell {
-  return ArrayCell{ArrayCell_Unset{}}
-}
-
-func (_this ArrayCell) Is_Unset() bool {
-  _, ok := _this.Get_().(ArrayCell_Unset)
-  return ok
-}
-
-func (CompanionStruct_ArrayCell_) Default() ArrayCell {
-  return Companion_ArrayCell_.Create_Unset_()
-}
-
-func (_this ArrayCell) Dtor_value() interface{} {
-  return _this.Get_().(ArrayCell_Set).Value
-}
-
-func (_this ArrayCell) String() string {
-  switch data := _this.Get_().(type) {
-    case nil: return "null"
-    case ArrayCell_Set: {
-      return "DafnyGo.ArrayCell.Set" + "(" + String(data.Value) + ")"
-    }
-    case ArrayCell_Unset: {
-      return "DafnyGo.ArrayCell.Unset"
-    }
-    default: {
-      return "<unexpected>"
-    }
-  }
-}
-
-func (_this ArrayCell) Equals(other ArrayCell) bool {
-  switch data1 := _this.Get_().(type) {
-    case ArrayCell_Set: {
-      data2, ok := other.Get_().(ArrayCell_Set)
-      return ok && AreEqual(data1.Value, data2.Value)
-    }
-    case ArrayCell_Unset: {
-      _, ok := other.Get_().(ArrayCell_Unset)
-      return ok
-    }
-    default: {
-      return false; // unexpected
-    }
-  }
-}
-
-func (_this ArrayCell) EqualsGeneric(other interface{}) bool {
-  typed, ok := other.(ArrayCell)
-  return ok && _this.Equals(typed)
-}
-
-func Type_ArrayCell_() TypeDescriptor {
-  return type_ArrayCell_{}
-}
-
-type type_ArrayCell_ struct {
-}
-
-func (_this type_ArrayCell_) Default() interface{} {
-  return Companion_ArrayCell_.Default();
-}
-
-func (_this type_ArrayCell_) String() string {
-  return "dafny.ArrayCell"
-}
-func (_this ArrayCell) ParentTraits_() []*TraitID {
-  return [](*TraitID){};
-}
-var _ TraitOffspring = ArrayCell{}
-
-// End of datatype ArrayCell
-
-// Definition of trait ImmutableArray
-type ImmutableArray interface {
-  String() string
-  Length() uint32
-  Select(index uint32) interface{}
-  Subarray(lo uint32, hi uint32) ImmutableArray
-}
-type CompanionStruct_ImmutableArray_ struct {
-  TraitID_ *TraitID
-}
-var Companion_ImmutableArray_ = CompanionStruct_ImmutableArray_ {
-  TraitID_: &TraitID{},
-}
-func (CompanionStruct_ImmutableArray_) CastTo_(x interface{}) ImmutableArray {
-  var t ImmutableArray
-  t, _ = x.(ImmutableArray)
-  return t
-}
-// End of trait ImmutableArray
-
-// Definition of class Vector
-type Vector struct {
-  Storage NativeArray
-  Size uint32
-}
-
-func New_Vector_() *Vector {
-  _this := Vector{}
-
-  _this.Storage = (NativeArray)(nil)
-  _this.Size = Companion_Size__t_.Witness()
-  return &_this
-}
-
-type CompanionStruct_Vector_ struct {
-}
-var Companion_Vector_ = CompanionStruct_Vector_ {
-}
-
-func (_this *Vector) Equals(other *Vector) bool {
-  return _this == other
-}
-
-func (_this *Vector) EqualsGeneric(x interface{}) bool {
-  other, ok := x.(*Vector)
-  return ok && _this.Equals(other)
-}
-
-func (*Vector) String() string {
-  return "dafny.Vector"
-}
-
-func Type_Vector_(Type_T_ TypeDescriptor) TypeDescriptor {
-  return type_Vector_{Type_T_}
-}
-
-type type_Vector_ struct {
-  Type_T_ TypeDescriptor
-}
-
-func (_this type_Vector_) Default() interface{} {
-  return (*Vector)(nil)
-}
-
-func (_this type_Vector_) String() string {
-  return "dafny.Vector"
-}
-func (_this *Vector) ParentTraits_() []*TraitID {
-  return [](*TraitID){Companion_Validatable_.TraitID_};
-}
-var _ Validatable = &Vector{}
-var _ TraitOffspring = &Vector{}
-
-func (_this *Vector) Ctor__(length uint32) {
-  {
-    var _27_storage NativeArray
-    _ = _27_storage
-    var _out22 NativeArray
-    _ = _out22
-    _out22 = Companion_NativeArray_.Make(length)
-    _27_storage = _out22
-    (_this).Storage = _27_storage
-    (_this).Size = uint32(0)
-  }
-}
-func (_this *Vector) Select(index uint32) interface{} {
-  {
-    return (_this.Storage).Select(index)
-  }
-}
-func (_this *Vector) Last() interface{} {
-  {
-    return (_this.Storage).Select((_this.Size) - (func () uint32 { return  (uint32(1)) })())
-  }
-}
-func (_this *Vector) AddLast(t interface{}) {
-  {
-    (_this).EnsureCapacity((_this.Size) + (Companion_Default___.ONE__SIZE()))
-    (_this.Storage).Update(_this.Size, t)
-    (_this).Size = (_this.Size) + (uint32(1))
-  }
-}
-func (_this *Vector) Max(a uint32, b uint32) uint32 {
-  {
-    if ((a) < (b)) {
-      return b
-    } else {
-      return a
-    }
-  }
-}
-func (_this *Vector) EnsureCapacity(newMinCapacity uint32) {
-  {
-    if (((_this.Storage).Length()) >= (newMinCapacity)) {
-      return
-    }
-    var _28_newCapacity uint32
-    _ = _28_newCapacity
-    _28_newCapacity = newMinCapacity
-    if (((_this.Storage).Length()) <= ((Companion_Default___.SIZE__T__MAX()) / (Companion_Default___.TWO__SIZE()))) {
-      _28_newCapacity = (_this).Max(_28_newCapacity, ((_this.Storage).Length()) * (Companion_Default___.TWO__SIZE()))
-    }
-    var _29_newStorage NativeArray
-    _ = _29_newStorage
-    var _out23 NativeArray
-    _ = _out23
-    _out23 = Companion_NativeArray_.Make(_28_newCapacity)
-    _29_newStorage = _out23
-    var _30_values ImmutableArray
-    _ = _30_values
-    var _out24 ImmutableArray
-    _ = _out24
-    _out24 = (_this.Storage).Freeze(_this.Size)
-    _30_values = _out24
-    (_29_newStorage).UpdateSubarray(uint32(0), _30_values)
-    (_this).Storage = _29_newStorage
-  }
-}
-func (_this *Vector) RemoveLast() interface{} {
-  {
-    var t interface{} = (interface{})(nil)
-    _ = t
-    t = (_this.Storage).Select((_this.Size) - (func () uint32 { return  (uint32(1)) })())
-    (_this).Size = (_this.Size) - (func () uint32 { return  (uint32(1)) })()
-    return t
-  }
-}
-func (_this *Vector) Append(other ImmutableArray) {
-  {
-    var _31_newSize uint32
-    _ = _31_newSize
-    _31_newSize = (_this.Size) + ((other).Length())
-    (_this).EnsureCapacity(_31_newSize)
-    (_this.Storage).UpdateSubarray(_this.Size, other)
-    (_this).Size = (_this.Size) + ((other).Length())
-  }
-}
-func (_this *Vector) Freeze() ImmutableArray {
-  {
-    var ret ImmutableArray = (ImmutableArray)(nil)
-    _ = ret
-    var _out25 ImmutableArray
-    _ = _out25
-    _out25 = (_this.Storage).Freeze(_this.Size)
-    ret = _out25
-    return ret
-  }
-}
-// End of class Vector
-
-// Definition of trait AtomicBox
-type AtomicBox interface {
-  String() string
-  Get() interface{}
-  Put(t interface{})
-}
-type CompanionStruct_AtomicBox_ struct {
-  TraitID_ *TraitID
-}
-var Companion_AtomicBox_ = CompanionStruct_AtomicBox_ {
-  TraitID_: &TraitID{},
-}
-func (CompanionStruct_AtomicBox_) CastTo_(x interface{}) AtomicBox {
-  var t AtomicBox
-  t, _ = x.(AtomicBox)
-  return t
-}
-// End of trait AtomicBox
-
-// Definition of class ArraySequence
-type ArraySequence struct {
-  _isString bool
-  _values ImmutableArray
-}
-
-func New_ArraySequence_() *ArraySequence {
-  _this := ArraySequence{}
-
-  _this._isString = false
-  _this._values = (ImmutableArray)(nil)
-  return &_this
-}
-
-type CompanionStruct_ArraySequence_ struct {
-}
-var Companion_ArraySequence_ = CompanionStruct_ArraySequence_ {
-}
-
-
-func Type_ArraySequence_(Type_T_ TypeDescriptor) TypeDescriptor {
-  return type_ArraySequence_{Type_T_}
-}
-
-type type_ArraySequence_ struct {
-  Type_T_ TypeDescriptor
-}
-
-func (_this type_ArraySequence_) Default() interface{} {
-  return (*ArraySequence)(nil)
-}
-
-func (_this type_ArraySequence_) String() string {
-  return "dafny.ArraySequence"
-}
-func (_this *ArraySequence) ParentTraits_() []*TraitID {
-  return [](*TraitID){Companion_Sequence_.TraitID_};
-}
-var _ Sequence = &ArraySequence{}
-var _ TraitOffspring = &ArraySequence{}
-
-func (_this *ArraySequence) SetString() Sequence {
-  var _out26 Sequence
-  _ = _out26
-  _out26 = Companion_Sequence_.SetString(_this)
-  return _out26
-}
-func (_this *ArraySequence) IsString() bool {
-  return _this._isString
-}
-func (_this *ArraySequence) IsString_set_(value bool) {
-  _this._isString = value
-}
-func (_this *ArraySequence) Select(index uint32) interface{} {
-  var _out27 interface{}
-  _ = _out27
-  _out27 = Companion_Sequence_.Select(_this, index)
-  return _out27
-}
-func (_this *ArraySequence) Drop(lo uint32) Sequence {
-  var _out28 Sequence
-  _ = _out28
-  _out28 = Companion_Sequence_.Drop(_this, lo)
-  return _out28
-}
-func (_this *ArraySequence) Take(hi uint32) Sequence {
-  var _out29 Sequence
-  _ = _out29
-  _out29 = Companion_Sequence_.Take(_this, hi)
-  return _out29
-}
-func (_this *ArraySequence) Subsequence(lo uint32, hi uint32) Sequence {
-  var _out30 Sequence
-  _ = _out30
-  _out30 = Companion_Sequence_.Subsequence(_this, lo, hi)
-  return _out30
-}
-func (_this *ArraySequence) Elements() Sequence {
-  return Companion_Sequence_.Elements(_this)
-}
-func (_this *ArraySequence) Ctor__(value ImmutableArray, isString bool) {
-  {
-    (_this)._values = value
-    (_this)._isString = isString
-  }
-}
-func (_this *ArraySequence) Cardinality() uint32 {
-  {
-    return ((_this).Values()).Length()
-  }
-}
-func (_this *ArraySequence) ToArray() ImmutableArray {
-  {
-    var ret ImmutableArray = (ImmutableArray)(nil)
-    _ = ret
-    ret = (_this).Values()
-    return ret
-    return ret
-  }
-}
-func (_this *ArraySequence) Values() ImmutableArray {
-  {
-    return _this._values
-  }
-}
-// End of class ArraySequence
-
-// Definition of class ConcatSequence
-type ConcatSequence struct {
-  _isString bool
-  _left Sequence
-  _right Sequence
-  _length uint32
-}
-
-func New_ConcatSequence_() *ConcatSequence {
-  _this := ConcatSequence{}
-
-  _this._isString = false
-  _this._left = (Sequence)(nil)
-  _this._right = (Sequence)(nil)
-  _this._length = Companion_Size__t_.Witness()
-  return &_this
-}
-
-type CompanionStruct_ConcatSequence_ struct {
-}
-var Companion_ConcatSequence_ = CompanionStruct_ConcatSequence_ {
-}
-
-
-func Type_ConcatSequence_(Type_T_ TypeDescriptor) TypeDescriptor {
-  return type_ConcatSequence_{Type_T_}
-}
-
-type type_ConcatSequence_ struct {
-  Type_T_ TypeDescriptor
-}
-
-func (_this type_ConcatSequence_) Default() interface{} {
-  return (*ConcatSequence)(nil)
-}
-
-func (_this type_ConcatSequence_) String() string {
-  return "dafny.ConcatSequence"
-}
-func (_this *ConcatSequence) ParentTraits_() []*TraitID {
-  return [](*TraitID){Companion_Sequence_.TraitID_};
-}
-var _ Sequence = &ConcatSequence{}
-var _ TraitOffspring = &ConcatSequence{}
-
-func (_this *ConcatSequence) SetString() Sequence {
-  var _out31 Sequence
-  _ = _out31
-  _out31 = Companion_Sequence_.SetString(_this)
-  return _out31
-}
-func (_this *ConcatSequence) IsString() bool {
-  return _this._isString
-}
-func (_this *ConcatSequence) IsString_set_(value bool) {
-  _this._isString = value
-}
-func (_this *ConcatSequence) Select(index uint32) interface{} {
-  var _out32 interface{}
-  _ = _out32
-  _out32 = Companion_Sequence_.Select(_this, index)
-  return _out32
-}
-func (_this *ConcatSequence) Drop(lo uint32) Sequence {
-  var _out33 Sequence
-  _ = _out33
-  _out33 = Companion_Sequence_.Drop(_this, lo)
-  return _out33
-}
-func (_this *ConcatSequence) Take(hi uint32) Sequence {
-  var _out34 Sequence
-  _ = _out34
-  _out34 = Companion_Sequence_.Take(_this, hi)
-  return _out34
-}
-func (_this *ConcatSequence) Subsequence(lo uint32, hi uint32) Sequence {
-  var _out35 Sequence
-  _ = _out35
-  _out35 = Companion_Sequence_.Subsequence(_this, lo, hi)
-  return _out35
-}
-func (_this *ConcatSequence) Elements() Sequence {
-  return Companion_Sequence_.Elements(_this)
-}
-func (_this *ConcatSequence) Ctor__(left Sequence, right Sequence) {
-  {
-    (_this)._left = left
-    (_this)._right = right
-    (_this)._length = ((left).Cardinality()) + ((right).Cardinality())
-    (_this)._isString = (left.IsString()) || (right.IsString())
-  }
-}
-func (_this *ConcatSequence) Cardinality() uint32 {
-  {
-    return (_this).Length()
-  }
-}
-func (_this *ConcatSequence) ToArray() ImmutableArray {
-  {
-    var ret ImmutableArray = (ImmutableArray)(nil)
-    _ = ret
-    var _32_builder *Vector
-    _ = _32_builder
-    var _nw5 *Vector = New_Vector_()
-    _ = _nw5
-    _nw5.Ctor__((_this).Length())
-    _32_builder = _nw5
-    var _33_stack *Vector
-    _ = _33_stack
-    var _nw6 *Vector = New_Vector_()
-    _ = _nw6
-    _nw6.Ctor__(Companion_Default___.TEN__SIZE())
-    _33_stack = _nw6
-    Companion_Default___.AppendOptimized(_32_builder, _this, _33_stack)
-    var _out36 ImmutableArray
-    _ = _out36
-    _out36 = (_32_builder).Freeze()
-    ret = _out36
-    return ret
-  }
-}
-func (_this *ConcatSequence) Left() Sequence {
-  {
-    return _this._left
-  }
-}
-func (_this *ConcatSequence) Right() Sequence {
-  {
-    return _this._right
-  }
-}
-func (_this *ConcatSequence) Length() uint32 {
-  {
-    return _this._length
-  }
-}
-// End of class ConcatSequence
-
-// Definition of class LazySequence
-type LazySequence struct {
-  _isString bool
-  _length uint32
-  _box AtomicBox
-}
-
-func New_LazySequence_() *LazySequence {
-  _this := LazySequence{}
-
-  _this._isString = false
-  _this._length = Companion_Size__t_.Witness()
-  _this._box = (AtomicBox)(nil)
-  return &_this
-}
-
-type CompanionStruct_LazySequence_ struct {
-}
-var Companion_LazySequence_ = CompanionStruct_LazySequence_ {
-}
-
-
-func Type_LazySequence_(Type_T_ TypeDescriptor) TypeDescriptor {
-  return type_LazySequence_{Type_T_}
-}
-
-type type_LazySequence_ struct {
-  Type_T_ TypeDescriptor
-}
-
-func (_this type_LazySequence_) Default() interface{} {
-  return (*LazySequence)(nil)
-}
-
-func (_this type_LazySequence_) String() string {
-  return "dafny.LazySequence"
-}
-func (_this *LazySequence) ParentTraits_() []*TraitID {
-  return [](*TraitID){Companion_Sequence_.TraitID_};
-}
-var _ Sequence = &LazySequence{}
-var _ TraitOffspring = &LazySequence{}
-
-func (_this *LazySequence) SetString() Sequence {
-  var _out37 Sequence
-  _ = _out37
-  _out37 = Companion_Sequence_.SetString(_this)
-  return _out37
-}
-func (_this *LazySequence) IsString() bool {
-  return _this._isString
-}
-func (_this *LazySequence) IsString_set_(value bool) {
-  _this._isString = value
-}
-func (_this *LazySequence) Select(index uint32) interface{} {
-  var _out38 interface{}
-  _ = _out38
-  _out38 = Companion_Sequence_.Select(_this, index)
-  return _out38
-}
-func (_this *LazySequence) Drop(lo uint32) Sequence {
-  var _out39 Sequence
-  _ = _out39
-  _out39 = Companion_Sequence_.Drop(_this, lo)
-  return _out39
-}
-func (_this *LazySequence) Take(hi uint32) Sequence {
-  var _out40 Sequence
-  _ = _out40
-  _out40 = Companion_Sequence_.Take(_this, hi)
-  return _out40
-}
-func (_this *LazySequence) Subsequence(lo uint32, hi uint32) Sequence {
-  var _out41 Sequence
-  _ = _out41
-  _out41 = Companion_Sequence_.Subsequence(_this, lo, hi)
-  return _out41
-}
-func (_this *LazySequence) Elements() Sequence {
-  return Companion_Sequence_.Elements(_this)
-}
-func (_this *LazySequence) Ctor__(wrapped Sequence) {
-  {
-    var _34_box AtomicBox
-    _ = _34_box
-    var _out42 AtomicBox
-    _ = _out42
-    _out42 = Companion_AtomicBox_.Make(wrapped)
-    _34_box = _out42
-    (_this)._box = _34_box
-    (_this)._length = (wrapped).Cardinality()
-    (_this)._isString = wrapped.IsString()
-  }
-}
-func (_this *LazySequence) Cardinality() uint32 {
-  {
-    return (_this).Length()
-  }
-}
-func (_this *LazySequence) ToArray() ImmutableArray {
-  {
-    var ret ImmutableArray = (ImmutableArray)(nil)
-    _ = ret
-    var _35_expr Sequence
-    _ = _35_expr
-    var _out43 interface{}
-    _ = _out43
-    _out43 = ((_this).Box()).Get()
-    _35_expr = Companion_Sequence_.CastTo_(_out43)
-    var _out44 ImmutableArray
-    _ = _out44
-    _out44 = (_35_expr).ToArray()
-    ret = _out44
-    var _36_arraySeq *ArraySequence
-    _ = _36_arraySeq
-    var _nw7 *ArraySequence = New_ArraySequence_()
-    _ = _nw7
-    _nw7.Ctor__(ret, false)
-    _36_arraySeq = _nw7
-    ((_this).Box()).Put(_36_arraySeq)
-    return ret
-  }
-}
-func (_this *LazySequence) Length() uint32 {
-  {
-    return _this._length
-  }
-}
-func (_this *LazySequence) Box() AtomicBox {
-  {
-    return _this._box
-  }
-}
-// End of class LazySequence
-
-// Definition of trait Helpers
-type Helpers interface {
-  String() string
-}
-type CompanionStruct_Helpers_ struct {
-  TraitID_ *TraitID
-}
-var Companion_Helpers_ = CompanionStruct_Helpers_ {
-  TraitID_: &TraitID{},
-}
-func (CompanionStruct_Helpers_) CastTo_(x interface{}) Helpers {
-  var t Helpers
-  t, _ = x.(Helpers)
-  return t
-}
-// End of trait Helpers
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo/Makefile b/Source/DafnyRuntime/DafnyRuntimeGo/Makefile
index 16ef3d33ba5..2965c62acc0 100644
--- a/Source/DafnyRuntime/DafnyRuntimeGo/Makefile
+++ b/Source/DafnyRuntime/DafnyRuntimeGo/Makefile
@@ -1,2 +1,20 @@
+
+# Invoking the CLI this way just to stay platform-independent
+DAFNY = dotnet run --project ../../Dafny --no-build --
+
+GENERATED_SYSTEM_MODULE_SOURCE=../obj/systemModulePopulator-go/src/System_/System_.go
+GENERATED_SYSTEM_MODULE_TARGET=System_/System_.go
+
+all: check-system-module test
+
 test:
-	GO111MODULE=auto go test
+	cd dafny &&	GO111MODULE=auto go test
+
+build-system-module:
+	$(DAFNY) translate go --no-verify --use-basename-for-filename --system-module:OmitAllOtherModules ../systemModulePopulator.dfy --output:../obj/systemModulePopulator
+
+check-system-module: build-system-module
+	diff $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
+
+update-system-module: build-system-module
+	cp $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo/System_/System_.go b/Source/DafnyRuntime/DafnyRuntimeGo/System_/System_.go
new file mode 100644
index 00000000000..c71236b7b50
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeGo/System_/System_.go
@@ -0,0 +1,55 @@
+// Package _System
+// Dafny module _System compiled into Go
+
+package _System
+
+import (
+	_dafny "dafny"
+	os "os"
+)
+
+var _ = os.Args
+var _ _dafny.Dummy__
+
+type Dummy__ struct{}
+
+// Definition of class Nat
+type Nat struct {
+}
+
+func New_Nat_() *Nat {
+	_this := Nat{}
+
+	return &_this
+}
+
+type CompanionStruct_Nat_ struct {
+}
+
+var Companion_Nat_ = CompanionStruct_Nat_{}
+
+func (*Nat) String() string {
+	return "_System.Nat"
+}
+
+// End of class Nat
+
+func Type_Nat_() _dafny.TypeDescriptor {
+	return type_Nat_{}
+}
+
+type type_Nat_ struct {
+}
+
+func (_this type_Nat_) Default() interface{} {
+	return _dafny.Zero
+}
+
+func (_this type_Nat_) String() string {
+	return "_System.Nat"
+}
+func (_this *CompanionStruct_Nat_) Is_(__source _dafny.Int) bool {
+	var _0_x _dafny.Int = (__source)
+	_ = _0_x
+	return (_0_x).Sign() != -1
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo/dafny/dafny.go b/Source/DafnyRuntime/DafnyRuntimeGo/dafny/dafny.go
new file mode 100644
index 00000000000..9a38db0f59f
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeGo/dafny/dafny.go
@@ -0,0 +1,3177 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+
+package dafny
+
+import (
+  "fmt"
+  big "math/big"
+  refl "reflect"
+  "runtime"
+  "unicode/utf8"
+  "os"
+)
+
+func FromMainArguments(args []string) Sequence {
+  var size = len(args)
+  var dafnyArgs []interface{} = make([]interface{}, size)
+  for i, item := range args {
+    dafnyArgs[i] = SeqOfString(item)
+  }
+  return SeqOf(dafnyArgs...)
+}
+
+func UnicodeFromMainArguments(args []string) Sequence {
+  var size = len(args)
+  var dafnyArgs []interface{} = make([]interface{}, size)
+  for i, item := range args {
+    dafnyArgs[i] = UnicodeSeqOfUtf8Bytes(item)
+  }
+  return SeqOf(dafnyArgs...)
+}
+
+/******************************************************************************
+ * Generic values
+ ******************************************************************************/
+
+// An EqualsGeneric can be compared to any other object.  This method should
+// *only* return true when the other value is of the same type.
+type EqualsGeneric interface {
+  EqualsGeneric(other interface{}) bool
+}
+
+// AreEqual compares two values for equality in a generic way.  Besides the
+// refl.DeepEqual logic (to which this method defers as a last resort), the
+// values are handled intelligently if their type is refl.Value or any type that
+// implements the EqualsGeneric interface.
+func AreEqual(x, y interface{}) bool {
+  if IsDafnyNull(x) {
+    return IsDafnyNull(y)
+  }
+  if IsDafnyNull(y) {
+    return false
+  }
+  switch x := x.(type) {
+  case refl.Value:
+    {
+      y, ok := y.(refl.Value)
+      return ok && x.CanInterface() && y.CanInterface() &&
+        AreEqual(x.Interface(), y.Interface())
+    }
+  case EqualsGeneric:
+    return x.EqualsGeneric(y)
+  default:
+    return refl.DeepEqual(x, y)
+  }
+}
+
+func IsDafnyNull(x interface{}) bool {
+  if x == nil {
+    return true
+  }
+  v := refl.ValueOf(x)
+  if v.Kind() == refl.Ptr {
+    return v.IsNil()
+  }
+  return false
+}
+
+func isNil(v refl.Value) bool {
+  switch v.Kind() {
+  case refl.Chan, refl.Func, refl.Map, refl.Ptr, refl.Slice:
+    return v.IsNil()
+  case refl.Interface:
+    return v.IsNil() || v.Elem().IsNil()
+  default:
+    return false
+  }
+}
+
+// String formats the given value using fmt.Sprint, unless it's nil, in which
+// case it formats it as "null" to conform to other languages' output.
+func String(x interface{}) string {
+  if x == nil {
+    return "null"
+  }
+  v := refl.ValueOf(x)
+  if isNil(v) {
+    return "null"
+  }
+  if v.Kind() == refl.Func {
+    return v.Type().String()
+  }
+  return fmt.Sprint(x)
+}
+
+// Print prints the given value using fmt.Print, formatted using String.
+func Print(x interface{}) {
+  fmt.Print(String(x))
+}
+
+// SetFinalizer is a re-export of runtime.SetFinalizer.  Included here so that
+// only this module needs to be imported by every Dafny module.
+func SetFinalizer(x interface{}, f interface{}) {
+  runtime.SetFinalizer(x, f)
+}
+
+/******************************************************************************
+ * Run-time type descriptors (RTDs)
+ ******************************************************************************/
+
+// A TypeDescriptor has the ability to produce a default value for an associated type.
+type TypeDescriptor interface {
+  Default() interface{}
+}
+
+func CreateStandardTypeDescriptor(value interface{}) TypeDescriptor {
+  return standardTypeDescriptor{value}
+}
+
+type standardTypeDescriptor struct {
+  defaultValue interface{}
+}
+
+func (rtd standardTypeDescriptor) Default() interface{} {
+  return rtd.defaultValue
+}
+
+// IntType is the RTD for int
+var IntType = CreateStandardTypeDescriptor(Zero)
+
+// BoolType is the RTD of bool
+var BoolType = CreateStandardTypeDescriptor(false)
+
+// CharType is the RTD of char
+var CharType = CreateStandardTypeDescriptor(Char('D')) // See CharType.DefaultValue in Dafny source code
+
+// CodePointType is the RTD of char
+var CodePointType = CreateStandardTypeDescriptor(CodePoint('D'))  // See CharType.DefaultValue in Dafny source code
+
+// RealType is the RTD for real
+var RealType = CreateStandardTypeDescriptor(ZeroReal)
+
+// Int64Type is the RTD of int64.
+var Int64Type = CreateStandardTypeDescriptor(int64(0))
+
+// PossiblyNullType is the RTD of any possibly null reference type
+var PossiblyNullType = CreateStandardTypeDescriptor((*interface{})(nil))
+
+// Uint8Type is the RTD of uint8
+var Uint8Type = CreateStandardTypeDescriptor(uint8(0))
+
+// Uint16Type is the RTD of uint16
+var Uint16Type = CreateStandardTypeDescriptor(uint16(0))
+
+// Uint32Type is the RTD of uint32
+var Uint32Type = CreateStandardTypeDescriptor(uint32(0))
+
+// Uint64Type is the RTD of uint64
+var Uint64Type = CreateStandardTypeDescriptor(uint64(0))
+
+// SetType is the RTD for sets
+var SetType = CreateStandardTypeDescriptor(EmptySet)
+
+// MultiSetType is the RTD for multisets
+var MultiSetType = CreateStandardTypeDescriptor(EmptyMultiSet)
+
+// SeqType is the RTD for sequences
+var SeqType = CreateStandardTypeDescriptor(EmptySeq)
+
+// MapType is the RTD for maps
+var MapType = CreateStandardTypeDescriptor(EmptyMap)
+
+/******************************************************************************
+ * Trait parent information
+ ******************************************************************************/
+
+// Every class gets compiled to have a ParentTraits_ method, which returns the
+// list of Dafny parent traits (including transitive parent traits). This is
+// used to determine, at run time, if a given object satisfies a particular trait.
+// While it is unusual that this information is needed, it is needed in a situation
+// like
+//   var s: set<UberTrait> := ...
+//   // the following line requires run-time check that t (of type UberTrait) is a Trait
+//   var ts := set t: Trait | t in s;
+// A more straightforward situation is the expression
+//   x is Trait
+
+type TraitID struct {
+  dummy byte
+}
+
+type TraitOffspring interface {
+  ParentTraits_() []*TraitID
+}
+
+func InstanceOfTrait(obj TraitOffspring, trait *TraitID) bool {
+  for _, parent := range obj.ParentTraits_() {
+    if parent == trait {
+      return true
+    }
+  }
+  return false
+}
+
+// Use this method to test if an object "p" has a given class type (denoted by the
+// type of "q"). More generally, this method returns true if p and q are of the
+// same type. It is assumed that neither "p" nor "q" denotes a Dafny "null" value.
+
+func InstanceOf(p interface{}, q interface{}) bool {
+  return refl.TypeOf(p) == refl.TypeOf(q)
+}
+
+/******************************************************************************
+ * Object
+ ******************************************************************************/
+
+type Object struct {
+  dummy byte
+}
+
+func New_Object() *Object {
+  _this := Object{}
+  return &_this
+}
+
+func (_this *Object) Equals(other *Object) bool {
+  return _this == other
+}
+
+func (_this *Object) EqualsGeneric(x interface{}) bool {
+  other, ok := x.(*Object)
+  return ok && _this.Equals(other)
+}
+
+func (*Object) String() string {
+  return "object"
+}
+
+func (_this *Object) ParentTraits_() []*TraitID {
+  return [](*TraitID){}
+}
+
+var _ TraitOffspring = &Object{}
+
+/******************************************************************************
+ * Characters
+ ******************************************************************************/
+
+// A Char is a rune in a wrapper so that we can detect it and treat it
+// distinctly from int32.
+type Char rune
+
+func (char Char) String() string {
+  return fmt.Sprintf("%c", rune(char))
+}
+
+// AllChars returns an iterator that returns all 16-bit characters.
+func AllChars() Iterator {
+  c := int32(0)
+  return func() (interface{}, bool) {
+    if c >= 0x10000 {
+      return -1, false
+    } else {
+      ans := Char(c)
+      c++
+      return ans, true
+    }
+  }
+}
+
+type CodePoint rune
+
+func (cp CodePoint) Escape() string {
+  switch (rune(cp)) {
+    case '\n': return "\\n";
+    case '\r': return "\\r";
+    case '\t': return "\\t";
+    case '\x00': return "\\0";
+    case '\'': return "\\'";
+    case '"': return "\\\"";
+    case '\\': return "\\\\";
+    default: return fmt.Sprintf("%c", rune(cp))
+  }
+}
+
+func (cp CodePoint) String() string {
+  return fmt.Sprintf("'%s'", cp.Escape())
+}
+
+func IsCodePoint(i Int) bool {
+  return (
+    (i.Sign() != -1 && i.Cmp(IntOfInt32(0xD800)) < 0) ||
+    (IntOfInt32(0xE000).Cmp(i) <= 0 && i.Cmp(IntOfInt32(0x11_0000)) < 0))
+}
+
+// AllUnicodeChars returns an iterator that returns all Unicode scalar values.
+func AllUnicodeChars() Iterator {
+  c := int32(0)
+  return func() (interface{}, bool) {
+    if c >= 0x11_0000 {
+      return -1, false
+    } else {
+      if (c == 0xD800) {
+        // Skip over the surrogates
+        c = 0xE000
+      }
+      ans := CodePoint(c)
+      c++
+      return ans, true
+    }
+  }
+}
+
+/******************************************************************************
+ * Slices
+ ******************************************************************************/
+
+func sliceEquals(s1, s2 []interface{}) bool {
+  return len(s1) == len(s2) && sliceIsPrefixAfterLengthCheck(s1, s2)
+}
+
+func sliceIsPrefixOf(s1, s2 []interface{}) bool {
+  return len(s1) <= len(s2) && sliceIsPrefixAfterLengthCheck(s1, s2)
+}
+
+func sliceIsProperPrefixOf(s1, s2 []interface{}) bool {
+  return len(s1) < len(s2) && sliceIsPrefixAfterLengthCheck(s1, s2)
+}
+
+func sliceIsPrefixAfterLengthCheck(s1, s2 []interface{}) bool {
+  for i, v := range s1 {
+    if !(AreEqual(v, s2[i])) {
+      return false
+    }
+  }
+  return true
+}
+
+func sliceContains(s []interface{}, value interface{}) bool {
+  for _, v := range s {
+    if AreEqual(v, value) {
+      return true
+    }
+  }
+  return false
+}
+
+// Iterator returns an iterator over the sequence.
+func sliceIterator(s []interface{}) Iterator {
+  i := 0
+  n := len(s)
+  return func() (interface{}, bool) {
+    if i >= n {
+      return nil, false
+    }
+    ans := s[i]
+    i++
+    return ans, true
+  }
+}
+
+func stringOfElements(iter interface{}) string {
+  str := ""
+  sep := ""
+  for i := Iterate(iter); ; {
+    v, ok := i()
+    if !ok {
+      break
+    }
+
+    str += sep
+    str += String(v)
+    sep = ", "
+  }
+  return str
+}
+
+/******************************************************************************
+ * Iteration
+ ******************************************************************************/
+
+// An Iterator is a function that can be called multiple times to get successive
+// values, until the second value returned is false.
+type Iterator = func() (interface{}, bool)
+
+// An Iterable can produce an iterator, which we represent as a function which
+// can be called to get successive values.
+type Iterable interface {
+  Iterator() Iterator
+}
+
+// Iterate gets an iterator from a value that is either an iterator or an
+// iterable.
+func Iterate(over interface{}) Iterator {
+  switch over := over.(type) {
+  case Iterator:
+    return over
+  case Iterable:
+    return over.Iterator()
+  default:
+    if refl.TypeOf(over).Kind() != refl.Slice {
+      panic(fmt.Errorf("Not iterable: %v", over))
+    } else {
+      return anySliceIterator(over)
+    }
+  }
+}
+
+func anySliceIterator(slice interface{}) Iterator {
+  val := refl.ValueOf(slice)
+  n := val.Len()
+  i := 0
+  return func() (interface{}, bool) {
+    if i >= n {
+      return nil, false
+    } else {
+      ans := val.Index(i).Interface()
+      i++
+      return ans, true
+    }
+  }
+}
+
+// Quantifier calculates whether a predicate holds either for all values yielded
+// by an iterator or for at least one.
+func Quantifier(iter interface{}, isForAll bool, pred interface{}) bool {
+  predVal := refl.ValueOf(pred)
+
+  for i := Iterate(iter); ; {
+    v, ok := i()
+    if !ok {
+      return isForAll
+    }
+    if predVal.Call([]refl.Value{refl.ValueOf(v)})[0].Interface() != isForAll {
+      return !isForAll
+    }
+  }
+}
+
+// SingleValue produces an iterator that yields only a single value.
+func SingleValue(value interface{}) Iterator {
+  done := false
+  return func() (interface{}, bool) {
+    if done {
+      return nil, false
+    } else {
+      done = true
+      return value, true
+    }
+  }
+}
+
+// AllBooleans returns an iterator that returns false, then returns true.
+func AllBooleans() Iterator {
+  phase := 0
+  return func() (interface{}, bool) {
+    switch phase {
+    case 0:
+      phase = 1
+      return false, true
+    case 1:
+      phase = 2
+      return true, true
+    default:
+      return false, false
+    }
+  }
+}
+
+/******************************************************************************
+ * Sequences
+ ******************************************************************************/
+
+// The sequence type is now defined in dafnyRuntime.dfy instead.
+// These declarations are just filling in the gaps to make sure
+// Dafny.Sequence is a well-behaved Dafny value in this runtime.
+
+// EmptySeq is the empty sequence.
+var EmptySeq = SeqOf()
+
+// Create a sequence from a length and an element initializer
+// This still exists because it's technically difficult
+// for the compiler to coerce the init function to a
+// func (uint32) interface{}.
+func SeqCreate(n uint32, init func (Int) interface{}) Sequence {
+  return Companion_Sequence_.Create(n, func (index uint32) interface{} { 
+    return init(IntOfUint32(index))
+  })
+}
+
+func SeqFromArray(contents []interface{}, isString bool) Sequence {
+  arr := GoNativeArray{
+    contents: contents,
+  }
+  result := New_ArraySequence_()
+  result.Ctor__(arr, isString)
+  return result
+}
+
+// SeqOf returns a sequence containing the given values.
+func SeqOf(values ...interface{}) Sequence {
+  // Making a defensive copy here because variadic functions can get hinky
+  // if someone says SeqOf(slice...) and then mutates slice.
+  arr := make([]interface{}, len(values))
+  copy(arr, values)
+  return SeqFromArray(arr, false)
+}
+
+// SeqOfChars returns a sequence containing the given character values.
+func SeqOfChars(values ...Char) Sequence {
+  arr := make([]interface{}, len(values))
+  for i, v := range values {
+    arr[i] = v
+  }
+  return SeqFromArray(arr, true)
+}
+
+func SeqOfBytes(values []byte) Sequence {
+  arr := make([]interface{}, len(values))
+  for i, v := range values {
+    arr[i] = v
+  }
+  return SeqFromArray(arr, false)
+}
+
+// SeqOfString converts the given string into a sequence of characters.
+// The given string must contain only ASCII characters!
+func SeqOfString(str string) Sequence {
+  // Need to make sure the elements of the array are Chars
+  arr := make([]interface{}, len(str))
+  for i, v := range str {
+    arr[i] = Char(v)
+  }
+  return SeqFromArray(arr, true)
+}
+
+func UnicodeSeqOfUtf8Bytes(str string) Sequence {
+  // Need to make sure the elements of the array are CodePoints
+  arr := make([]interface{}, utf8.RuneCountInString(str))
+  i := 0
+  for _, v := range str {
+    arr[i] = CodePoint(v)
+    i++
+  }
+  return SeqFromArray(arr, false)
+}
+
+// Iterator returns an iterator over the sequence.
+// This could be implemented more efficiently
+// in the source Dafny code in the future,
+// by traversing the Sequence node structure rather than
+// forcing the lazy evaluation,
+// but will involve defining an Iterator trait of some kind.
+func SequenceIterator(seq Sequence) Iterator {
+  var i uint32 = 0
+  n := seq.Cardinality()
+  return func() (interface{}, bool) {
+    if i >= n {
+      return nil, false
+    }
+    ans := seq.Select(i)
+    i++
+    return ans, true
+  }
+}
+// Unfortunately when we want to provide a single common definition
+// for a trait function, we have to take care of the indirection
+// from the concrete structs to the trait implementation ourselves.
+// Ideally there would be a way of telling Dafny
+// an {:extern} trait method will be specifically implemented at the trait level
+// so the compiler could do this for us.
+func (seq *ArraySequence) Iterator() Iterator {
+  return SequenceIterator(seq)
+}
+func (seq *ConcatSequence) Iterator() Iterator {
+  return SequenceIterator(seq)
+}
+func (seq *LazySequence) Iterator() Iterator {
+  return SequenceIterator(seq)
+}
+
+// UniqueElements returns the set of elements in the sequence.
+// This should be in Dafny eventually but for now it's much more efficient
+// and convenient here.
+func (seq *ArraySequence) UniqueElements() Set {
+  return NewBuilderOf(seq).ToSet()
+}
+func (seq *ConcatSequence) UniqueElements() Set {
+  return NewBuilderOf(seq).ToSet()
+}
+func (seq *LazySequence) UniqueElements() Set {
+  return NewBuilderOf(seq).ToSet()
+}
+
+func SequenceString(seq Sequence) string {
+  if seq.IsString() {
+    s := ""
+    // FIXME: Note this doesn't produce the right string in UTF-8,
+    // since it converts surrogates independently.
+    for i := Iterate(seq); ; {
+      c, ok := i()
+      if !ok {
+        break
+      }
+      s += c.(Char).String()
+    }
+    return s
+  } else {
+    return "[" + stringOfElements(seq) + "]"
+  }
+}
+func (seq *ArraySequence) String() string {
+  return SequenceString(seq)
+}
+func (seq *ConcatSequence) String() string {
+  return SequenceString(seq)
+}
+func (seq *LazySequence) String() string {
+  return SequenceString(seq)
+}
+
+func SequenceVerbatimString(seq Sequence, asLiteral bool) string {
+  s := ""
+  if asLiteral {
+    s += "\""
+  }
+  for i := Iterate(seq); ; {
+    c, ok := i()
+    if !ok {
+      break
+    }
+
+    if asLiteral {
+      s += c.(CodePoint).Escape()
+    } else {
+      s += fmt.Sprintf("%c", c.(CodePoint))
+    }
+  }
+  if asLiteral {
+    s += "\""
+  }
+  return s
+}
+func (seq *ArraySequence) VerbatimString(asLiteral bool) string {
+  return SequenceVerbatimString(seq, asLiteral)
+}
+func (seq *ConcatSequence) VerbatimString(asLiteral bool) string {
+  return SequenceVerbatimString(seq, asLiteral)
+}
+func (seq *LazySequence) VerbatimString(asLiteral bool) string {
+  return SequenceVerbatimString(seq, asLiteral)
+}
+
+func (seq *ArraySequence) Equals(other Sequence) bool {
+  return Companion_Sequence_.Equal(seq, other)
+}
+func (seq *ConcatSequence) Equals(other Sequence) bool {
+  return Companion_Sequence_.Equal(seq, other)
+}
+func (seq *LazySequence) Equals(other Sequence) bool {
+  return Companion_Sequence_.Equal(seq, other)
+}
+
+func (seq *ArraySequence) EqualsGeneric(x interface{}) bool {
+  other, ok := x.(Sequence)
+  return ok && Companion_Sequence_.Equal(seq, other)
+}
+func (seq *ConcatSequence) EqualsGeneric(x interface{}) bool {
+  other, ok := x.(Sequence)
+  return ok && Companion_Sequence_.Equal(seq, other)
+}
+func (seq *LazySequence) EqualsGeneric(x interface{}) bool {
+  other, ok := x.(Sequence)
+  return ok && Companion_Sequence_.Equal(seq, other)
+}
+
+func (seq *ArraySequence) ToByteArray() []byte {
+  return ToByteArray(seq)
+}
+func (seq *ConcatSequence) ToByteArray() []byte {
+  return ToByteArray(seq)
+}
+func (seq *LazySequence) ToByteArray() []byte {
+  return ToByteArray(seq)
+}
+
+func ToByteArray(x Sequence) []byte {
+  nativeArray := x.ToArray().(GoNativeArray)
+  arr := make([]byte, len(nativeArray.contents))
+  for i, v := range nativeArray.contents {
+    arr[i] = v.(byte)
+  }
+  return arr
+}
+
+/******************************************************************************
+ * Arrays
+ ******************************************************************************/
+
+// A GoNativeArray is a single dimensional Go slice,
+// wrapped up for the benefit of dafnyRuntime.dfy.
+// We should refactor to wrap an Array interface as defined below
+// to get the same optimization benefits for sequences of bytes and chars/CodePoints.
+type GoNativeArray struct {
+  contents []interface{}
+}
+
+func (CompanionStruct_NativeArray_) Make(length uint32) NativeArray {
+  contents := make([]interface{}, length)
+  return GoNativeArray{
+    contents: contents,
+  }
+}
+
+func (CompanionStruct_NativeArray_) MakeWithInit(length uint32, init func(uint32) (interface{})) NativeArray {
+  contents := make([]interface{}, length)
+  for i := uint32(0); i < length; i++ {
+    contents[i] = init(i)
+  }
+  return GoNativeArray{
+    contents: contents,
+  }
+}
+
+func (CompanionStruct_NativeArray_) Copy(other ImmutableArray) NativeArray {
+  otherArray := other.(GoNativeArray)
+  contents := make([]interface{}, otherArray.Length())
+  copy(contents, otherArray.contents)
+  return GoNativeArray{
+    contents: contents,
+  }
+}
+
+func (array GoNativeArray) Length() uint32 {
+  return uint32(len(array.contents))
+}
+
+func (array GoNativeArray) Select(i uint32) interface{} {
+  return array.contents[i]
+}
+
+func (array GoNativeArray) Update(i uint32, t interface{}) {
+  array.contents[i] = t
+}
+
+func (array GoNativeArray) UpdateSubarray(i uint32, other ImmutableArray) {
+  otherArray := other.(GoNativeArray)
+  copy(array.contents[i:(i + otherArray.Length())], otherArray.contents)
+}
+
+func (array GoNativeArray) Freeze(size uint32) ImmutableArray {
+  return array.Subarray(0, size)
+}
+
+func (array GoNativeArray) Subarray(lo uint32, hi uint32) ImmutableArray {
+  return GoNativeArray{
+    contents: array.contents[lo:hi],
+  }
+}
+
+func (array GoNativeArray) String() string {
+  return "dafny.GoNativeArray"
+}
+
+// Array is the general interface for arrays. Conceptually, it contains some
+// underlying storage (a slice) of elements, together with a record of the length
+// of each dimension. Thus, this general interface supports 1- and multi-dimensional
+// Dafny arrays.
+//
+// All array indices are given as the Go type "int". This is what the Dafny implementation
+// refers to as "target-language array-index type". However, the dimension lengths
+// are given as "big.Int".
+
+type Array interface {
+  dimensionCount() int
+  dimensionLength(dim int) int
+  ArrayGet1(index int) interface{}
+  ArraySet1(value interface{}, index int)
+  anySlice(lo, hi Int) []interface{}
+  // specializations
+  ArrayGet1Byte(index int) byte
+  ArraySet1Byte(value byte, index int)
+  ArrayGet1Char(index int) Char
+  ArraySet1Char(value Char, index int)
+  ArrayGet1CodePoint(index int) CodePoint
+  ArraySet1CodePoint(value CodePoint, index int)
+}
+
+/***** newArray *****/
+
+// Multiply the numbers in "dims" and return the product as an "int".
+// If the product doesn't fit in an "int", panic with the message that the
+// array-size limit has been exceeded.
+// It is expected that len(dims) is at least 1 and that each number in
+// dims is non-negative.
+func computeTotalArrayLength(dims ...Int) int {
+  product := dims[0]
+  for i := 1; i < len(dims); i++ {
+    product = product.Times(dims[i])
+  }
+  if IntOf(0x8000_0000).Cmp(product) <= 0 {
+    panic(fmt.Sprintf("array size exceeds memory limit: %v", String(product)))
+  }
+  totalLength := product.Int()
+  return totalLength
+}
+
+// NewArrayFromExample returns a new Array.
+// If "init" is non-nil, it is used to initialize all elements of the array.
+// "example" is used only to figure out the right kind of Array to return.
+// If "init" is non-nil, the types of "example" and "init" must agree.
+// All numbers in "dims" are expected to be non-negative and "len(dims)" is
+// expected to be at least 1 (this is not checked). The function checks that
+// the product of the numbers in "dims" lies within the limit of what array
+// lengths are supported; the code will panic if the limit is exceeded.
+func NewArrayFromExample(example interface{}, init interface{}, dims ...Int) Array {
+  numberOfDimensions := len(dims)
+  intDims := make([]int, len(dims))
+  totalLength := computeTotalArrayLength(dims...)
+  // If the previous line does not panic, then the .Int() conversions in
+  // the following loop will succeed.
+  for d := 0; d < numberOfDimensions; d++ {
+    intDims[d] = dims[d].Int()
+  }
+
+  if totalLength == 0 {
+    return newZeroLengthArray(intDims)
+  }
+
+  // Inspect the type of "example" to consider Array specialization
+  if _, ok := example.(byte); ok {
+    arr := make([]byte, totalLength)
+    if init != nil {
+      x := init.(byte)
+      for i := range arr {
+        arr[i] = x
+      }
+    }
+    return &arrayForByte{
+      contents: arr,
+      dims:     intDims,
+    }
+  }
+  if _, ok := example.(Char); ok {
+    arr := make([]Char, totalLength)
+    if init != nil {
+      x := init.(Char)
+      for i := range arr {
+        arr[i] = x
+      }
+    }
+    return &arrayForChar{
+      contents: arr,
+      dims:     intDims,
+    }
+  }
+  if _, ok := example.(CodePoint); ok {
+    arr := make([]CodePoint, totalLength)
+    if init != nil {
+      x := init.(CodePoint)
+      for i := range arr {
+        arr[i] = x
+      }
+    }
+    return &arrayForCodePoint{
+      contents: arr,
+      dims:     intDims,
+    }
+  }
+
+  // Use the default representation
+  arr := make([]interface{}, totalLength)
+  if init != nil {
+    for i := range arr {
+      arr[i] = init
+    }
+  }
+  return &arrayStruct{
+    contents: arr,
+    dims:     intDims,
+  }
+}
+
+func newZeroLengthArray(intDims []int) Array {
+  // Use the default representation
+  return &arrayStruct{
+    contents: nil,
+    dims:     intDims,
+  }
+}
+
+// newArrayWithValues returns a new one-dimensional Array with the given initial
+// values. It is only used internally, by *Builder.ToArray().
+func newArrayWithValues(values ...interface{}) Array {
+  totalLength := len(values)
+  intDims := []int{totalLength}
+  if totalLength == 0 {
+    return newZeroLengthArray(intDims)
+  }
+
+  // Inspect the type of "values[0]" to consider Array specialization
+  if _, ok := values[0].(byte); ok {
+    arr := make([]byte, totalLength)
+    for i := range arr {
+      arr[i] = values[i].(byte)
+    }
+    return &arrayForByte{
+      contents: arr,
+      dims:     intDims,
+    }
+  }
+  if _, ok := values[0].(Char); ok {
+    arr := make([]Char, totalLength)
+    for i := range arr {
+      arr[i] = values[i].(Char)
+    }
+    return &arrayForChar{
+      contents: arr,
+      dims:     intDims,
+    }
+  }
+
+  // Use the default representation
+  arr := make([]interface{}, totalLength)
+  copy(arr, values)
+  return &arrayStruct{
+    contents: arr,
+    dims:     intDims,
+  }
+}
+
+// NewArrayWithValue returns a new Array full of the given initial value.
+func NewArrayWithValue(init interface{}, dims ...Int) Array {
+  return NewArrayFromExample(init, init, dims...)
+}
+
+// NewArray returns a new Array full of the default value of the given type.
+func NewArray(dims ...Int) Array {
+  return NewArrayFromExample(nil, nil, dims...)
+}
+
+/***** arrayStruct is default implementation of the Array interface. *****/
+
+type arrayStruct struct {
+  contents []interface{} // stored as a flat one-dimensional slice
+  dims     []int
+}
+
+func (_this arrayStruct) dimensionCount() int {
+  return len(_this.dims)
+}
+
+func (_this arrayStruct) dimensionLength(dim int) int {
+  return _this.dims[dim]
+}
+
+func (_this arrayStruct) ArrayGet1(index int) interface{} {
+  return _this.contents[index]
+}
+
+func (_this arrayStruct) ArraySet1(value interface{}, index int) {
+  _this.contents[index] = value
+}
+
+func (_this arrayStruct) ArrayGet1Byte(index int) byte {
+  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) ArraySet1Byte(value byte, index int) {
+  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) ArrayGet1Char(index int) Char {
+  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) ArraySet1Char(value Char, index int) {
+  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) ArrayGet1CodePoint(index int) CodePoint {
+  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) ArraySet1CodePoint(value CodePoint, index int) {
+  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayStruct) anySlice(lo, hi Int) []interface{} {
+  if lo.IsNilInt() && hi.IsNilInt() {
+    return _this.contents
+  }
+  if lo.IsNilInt() {
+    return _this.contents[:hi.Int()]
+  }
+  if hi.IsNilInt() {
+    return _this.contents[lo.Int():]
+  }
+  return _this.contents[lo.Int():hi.Int()]
+}
+
+// arrayStruct implements the EqualsGeneric interface.
+func (_this arrayStruct) EqualsGeneric(other interface{}) bool {
+  otherArray, ok := other.(*arrayStruct)
+  if !ok {
+    return false
+  }
+  // In the next line, we're sure to compare the references, not the addresses of the arrayStruct's.
+  return &_this.dims[0] == &otherArray.dims[0]
+}
+
+/***** arrayForByte is the Array interface specialized for byte. *****/
+
+type arrayForByte struct {
+  contents []byte // stored as a flat one-dimensional slice
+  dims     []int
+}
+
+func (_this arrayForByte) dimensionCount() int {
+  return len(_this.dims)
+}
+
+func (_this arrayForByte) dimensionLength(dim int) int {
+  return _this.dims[dim]
+}
+
+func (_this arrayForByte) ArrayGet1(index int) interface{} {
+  return _this.contents[index]
+}
+
+func (_this arrayForByte) ArraySet1(value interface{}, index int) {
+  _this.contents[index] = value.(byte)
+}
+
+func (_this arrayForByte) ArrayGet1Byte(index int) byte {
+  return _this.contents[index]
+}
+
+func (_this arrayForByte) ArraySet1Byte(value byte, index int) {
+  _this.contents[index] = value
+}
+
+func (_this arrayForByte) ArrayGet1Char(index int) Char {
+  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForByte) ArraySet1Char(value Char, index int) {
+  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForByte) ArrayGet1CodePoint(index int) CodePoint {
+  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForByte) ArraySet1CodePoint(value CodePoint, index int) {
+  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForByte) anySlice(lo, hi Int) []interface{} {
+  if lo.IsNilInt() {
+    lo = Zero
+  }
+  if hi.IsNilInt() {
+    hi = IntOf(len(_this.contents))
+  }
+  iLo := lo.Int()
+  iHi := hi.Int()
+  anyArray := make([]interface{}, iHi - iLo)
+  for i := iLo; i < iHi; i++ {
+    anyArray[i] = _this.contents[i]
+  }
+  return anyArray
+}
+
+// arrayForByte implements the EqualsGeneric interface.
+func (_this arrayForByte) EqualsGeneric(other interface{}) bool {
+  otherArray, ok := other.(*arrayForByte)
+  if !ok {
+    return false
+  }
+  return &_this.dims[0] == &otherArray.dims[0]
+}
+
+/***** arrayForChar is the Array interface specialized for Char. *****/
+
+type arrayForChar struct {
+  contents []Char // stored as a flat one-dimensional slice
+  dims     []int
+}
+
+func (_this arrayForChar) dimensionCount() int {
+  return len(_this.dims)
+}
+
+func (_this arrayForChar) dimensionLength(dim int) int {
+  return _this.dims[dim]
+}
+
+func (_this arrayForChar) ArrayGet1(index int) interface{} {
+  return _this.contents[index]
+}
+
+func (_this arrayForChar) ArraySet1(value interface{}, index int) {
+  _this.contents[index] = value.(Char)
+}
+
+func (_this arrayForChar) ArrayGet1Byte(index int) byte {
+  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForChar) ArraySet1Byte(value byte, index int) {
+  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForChar) ArrayGet1Char(index int) Char {
+  return _this.contents[index]
+}
+
+func (_this arrayForChar) ArraySet1Char(value Char, index int) {
+  _this.contents[index] = value
+}
+
+func (_this arrayForChar) ArrayGet1CodePoint(index int) CodePoint {
+  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForChar) ArraySet1CodePoint(value CodePoint, index int) {
+  panic("Expected specialized array type that contains code points, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForChar) anySlice(lo, hi Int) []interface{} {
+  if lo.IsNilInt() {
+    lo = Zero
+  }
+  if hi.IsNilInt() {
+    hi = IntOf(len(_this.contents))
+  }
+  iLo := lo.Int()
+  iHi := hi.Int()
+  anyArray := make([]interface{}, iHi - iLo)
+  for i := iLo; i < iHi; i++ {
+    anyArray[i] = _this.contents[i]
+  }
+  return anyArray
+}
+
+// arrayForChar implements the EqualsGeneric interface.
+func (_this arrayForChar) EqualsGeneric(other interface{}) bool {
+  otherArray, ok := other.(*arrayForChar)
+  if !ok {
+    return false
+  }
+  return &_this.dims[0] == &otherArray.dims[0]
+}
+
+/***** arrayForCodePoint is the Array interface specialized for CodePoint. *****/
+
+type arrayForCodePoint struct {
+  contents []CodePoint // stored as a flat one-dimensional slice
+  dims     []int
+}
+
+func (_this arrayForCodePoint) dimensionCount() int {
+  return len(_this.dims)
+}
+
+func (_this arrayForCodePoint) dimensionLength(dim int) int {
+  return _this.dims[dim]
+}
+
+func (_this arrayForCodePoint) ArrayGet1(index int) interface{} {
+  return _this.contents[index]
+}
+
+func (_this arrayForCodePoint) ArraySet1(value interface{}, index int) {
+  _this.contents[index] = value.(CodePoint)
+}
+
+func (_this arrayForCodePoint) ArrayGet1Byte(index int) byte {
+  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForCodePoint) ArraySet1Byte(value byte, index int) {
+  panic("Expected specialized array type that contains bytes, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForCodePoint) ArrayGet1Char(index int) Char {
+  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForCodePoint) ArraySet1Char(value Char, index int) {
+  panic("Expected specialized array type that contains characters, but found general-purpose array of interface{}")
+}
+
+func (_this arrayForCodePoint) ArrayGet1CodePoint(index int) CodePoint {
+  return _this.contents[index]
+}
+
+func (_this arrayForCodePoint) ArraySet1CodePoint(value CodePoint, index int) {
+  _this.contents[index] = value
+}
+
+func (_this arrayForCodePoint) anySlice(lo, hi Int) []interface{} {
+  if lo.IsNilInt() {
+    lo = Zero
+  }
+  if hi.IsNilInt() {
+    hi = IntOf(len(_this.contents))
+  }
+  iLo := lo.Int()
+  iHi := hi.Int()
+  anyArray := make([]interface{}, iHi - iLo)
+  for i := iLo; i < iHi; i++ {
+    anyArray[i] = _this.contents[i]
+  }
+  return anyArray
+}
+
+// arrayForCodePoint implements the EqualsGeneric interface.
+func (_this arrayForCodePoint) EqualsGeneric(other interface{}) bool {
+  otherArray, ok := other.(*arrayForCodePoint)
+  if !ok {
+    return false
+  }
+  return &_this.dims[0] == &otherArray.dims[0]
+}
+
+/***** other Array methods *****/
+
+// EmptyArray is an empty one-dimensional array.
+var EmptyArray = NewArray(Zero)
+
+func ArrayCastTo(x interface{}) Array {
+  var t Array
+  t, _ = x.(Array)
+  return t
+}
+
+// ArrayLen returns the length of the array in the given dimension.
+func ArrayLen(array Array, dim int) Int {
+  return IntOf(ArrayLenInt(array, dim))
+}
+
+// ArrayLenInt returns the length of the array in the given dimension, as an int.
+func ArrayLenInt(array Array, dim int) int {
+  return array.dimensionLength(dim)
+}
+
+func computeArrayIndex(array Array, ixs ...int) int {
+  dimensionCount := array.dimensionCount()
+  if len(ixs) != dimensionCount {
+    panic(fmt.Sprintf("Expected %d indices but got %d", dimensionCount, len(ixs)))
+  }
+  i := 0
+  size := 1
+  for d := dimensionCount - 1; d >= 0; d-- {
+    i += size * ixs[d]
+    size *= array.dimensionLength(d)
+  }
+  return i
+}
+
+func ArrayGet(array Array, ixs ...int) interface{} {
+  index := computeArrayIndex(array, ixs...)
+  return array.ArrayGet1(index)
+}
+
+func ArraySet(array Array, value interface{}, ixs ...int) {
+  index := computeArrayIndex(array, ixs...)
+  array.ArraySet1(value, index)
+}
+
+// RangeToSeq converts the selected portion of the array to a sequence.
+func ArrayRangeToSeq(array Array, lo, hi Int) Sequence {
+  if array.dimensionCount() != 1 {
+    panic("Can't take a slice of a multidimensional array")
+  }
+  isString := false;
+  if array.dimensionLength(0) > 0 {
+    _, isString = array.ArrayGet1(0).(Char)
+  }
+
+  anySlice := array.anySlice(lo, hi)
+  seq := SeqOf(anySlice...)
+  seq.IsString_set_(isString)
+  return seq
+}
+
+/******************************************************************************
+ * Tuples
+ ******************************************************************************/
+
+// A Tuple is a one-dimensional heterogeneous array.
+type Tuple struct {
+  contents []interface{}
+}
+
+// TupleOf creates a tuple with the given values.
+func TupleOf(values ...interface{}) Tuple {
+  arr := make([]interface{}, len(values))
+  copy(arr, values)
+  return Tuple{arr}
+}
+
+// Equals returns whether two tuples have the same values.
+func (tuple Tuple) Equals(other Tuple) bool {
+  return sliceEquals(tuple.contents, other.contents)
+}
+
+// Tuple implements the EqualsGeneric interface.
+func (tuple Tuple) EqualsGeneric(other interface{}) bool {
+  tuple2, ok := other.(Tuple)
+  return ok && tuple.Equals(tuple2)
+}
+
+func (tuple Tuple) String() string {
+  return "(" + stringOfElements(tuple.contents) + ")"
+}
+
+// Index looks up the address of the ith element of the tuple.
+func (tuple Tuple) Index(i Int) *interface{} {
+  return tuple.IndexInt(i.Int())
+}
+
+// IndexInt looks up the address of the ith element of the tuple.
+func (tuple Tuple) IndexInt(i int) *interface{} {
+  return &tuple.contents[i]
+}
+
+// TupleType returns the type of a tuple with given element types.
+func TupleType(tys ...TypeDescriptor) TypeDescriptor {
+  arr := make([]TypeDescriptor, len(tys))
+  copy(arr, tys)
+  return tupleType{arr}
+}
+
+type tupleType struct {
+  eltTys []TypeDescriptor
+}
+
+func (tt tupleType) Default() interface{} {
+  values := make([]interface{}, len(tt.eltTys))
+  for i, ty := range tt.eltTys {
+    values[i] = ty.Default()
+  }
+  return TupleOf(values...)
+}
+
+func (tt tupleType) String() string {
+  s := "("
+  sep := ""
+  for _, ty := range tt.eltTys {
+    s += sep + String(ty)
+    sep = ", "
+  }
+  s += ")"
+  return s
+}
+
+/******************************************************************************
+ * Collection building
+ ******************************************************************************/
+
+// A Builder holds values as they're imperatively accumulated in order to build
+// an Array, Set, or MultiSet.
+type Builder []interface{}
+
+// NewBuilder creates a new Builder.
+func NewBuilder() *Builder {
+  return new(Builder)
+}
+
+// NewBuilder creates a new Builder.
+func NewBuilderOf(iter interface{}) *Builder {
+  b := NewBuilder()
+  for i := Iterate(iter); ; {
+    v, ok := i()
+    if !ok {
+      break
+    }
+    b.Add(v)
+  }
+  return b
+}
+
+// Add adds a new value to a Builder.
+func (builder *Builder) Add(value interface{}) {
+  *builder = append(*builder, value)
+}
+
+// ToArray creates an Array with the accumulated values.
+func (builder *Builder) ToArray() Array {
+  return newArrayWithValues(*builder...)
+}
+
+// ToSet creates a Set with the accumulated values.
+func (builder *Builder) ToSet() Set {
+  return SetOf(*builder...)
+}
+
+// ToMultiset creates a MultiSet with the accumulated values.
+func (builder *Builder) ToMultiSet() MultiSet {
+  return MultiSetOf(*builder...)
+}
+
+// Iterator iterates over the accumulated values.
+func (builder *Builder) Iterator() Iterator {
+  return sliceIterator(*builder)
+}
+
+/******************************************************************************
+ * Sets
+ ******************************************************************************/
+
+// A Set is a sequence without duplicates.
+type Set struct {
+  contents []interface{}
+}
+
+// EmptySet is the empty set.
+var EmptySet = SetOf()
+
+// SetOf creates a set with the given values.
+func SetOf(values ...interface{}) Set {
+  uniq := make([]interface{}, 0, len(values))
+NEXT_INPUT:
+  for _, v := range values {
+    for _, u := range uniq {
+      if AreEqual(u, v) {
+        continue NEXT_INPUT
+      }
+    }
+    uniq = append(uniq, v)
+  }
+  return Set{uniq}
+}
+
+// Cardinality returns the cardinality (size) of the set.
+func (set Set) Cardinality() Int {
+  return IntOf(set.CardinalityInt())
+}
+
+// CardinalityInt returns the cardinality (size) of the set as an int.
+func (set Set) CardinalityInt() int {
+  return len(set.contents)
+}
+
+// Contains returns whether the given value is an element of the set.
+func (set Set) Contains(value interface{}) bool {
+  return sliceContains(set.contents, value)
+}
+
+// Iterator returns an iterator over the elements of the set.
+func (set Set) Iterator() Iterator {
+  return sliceIterator(set.contents)
+}
+
+// Union makes a set containing each element contained by either input set.
+func (set Set) Union(set2 Set) Set {
+  if set.CardinalityInt() == 0 {
+    return set2
+  }
+  if set2.CardinalityInt() == 0 {
+    return set
+  }
+
+  n := set.CardinalityInt()
+  uniq := make([]interface{}, n)
+  copy(uniq, set.contents)
+NEXT_INPUT:
+  for _, v := range set2.contents {
+    for _, u := range uniq {
+      if AreEqual(u, v) {
+        continue NEXT_INPUT
+      }
+    }
+    uniq = append(uniq, v)
+  }
+
+  return Set{uniq}
+}
+
+// Intersection makes a set containing each element contained by both input
+// sets.
+func (set Set) Intersection(set2 Set) Set {
+  if set.CardinalityInt() == 0 || set2.CardinalityInt() == 0 {
+    return EmptySet
+  }
+
+  uniq := make([]interface{}, 0)
+  for _, v := range set.contents {
+    if set2.Contains(v) {
+      uniq = append(uniq, v)
+    }
+  }
+
+  return Set{uniq}
+}
+
+// Difference makes a set containing each element contained by set but not
+// by set2.
+func (set Set) Difference(set2 Set) Set {
+  if set.CardinalityInt() == 0 || set2.CardinalityInt() == 0 {
+    return set
+  }
+
+  elts := make([]interface{}, 0, max(0, set.CardinalityInt()-set2.CardinalityInt()))
+  for _, v := range set.contents {
+    if !set2.Contains(v) {
+      elts = append(elts, v)
+    }
+  }
+
+  return Set{elts}
+}
+
+// IsDisjointFrom returns true if the sets have no elements in common.
+func (set Set) IsDisjointFrom(set2 Set) bool {
+  if set.CardinalityInt() == 0 || set2.CardinalityInt() == 0 {
+    return true
+  }
+
+  for _, v := range set.contents {
+    if sliceContains(set2.contents, v) {
+      return false
+    }
+  }
+
+  return true
+}
+
+// Equals tests whether the sets contain the same elements.
+func (set Set) Equals(set2 Set) bool {
+  return set.CardinalityInt() == set2.CardinalityInt() &&
+    set.isSubsetAfterCardinalityCheck(set2)
+}
+
+// Set implements the EqualsGeneric interface.
+func (set Set) EqualsGeneric(other interface{}) bool {
+  set2, ok := other.(Set)
+  return ok && set.Equals(set2)
+}
+
+// IsSubsetOf returns true if each element in this set is also in the other.
+func (set Set) IsSubsetOf(set2 Set) bool {
+  return set.CardinalityInt() <= set2.CardinalityInt() &&
+    set.isSubsetAfterCardinalityCheck(set2)
+}
+
+// IsProperSubsetOf returns true if each element in this set is also in the
+// other, and moreover the sets aren't equal.
+func (set Set) IsProperSubsetOf(set2 Set) bool {
+  return set.CardinalityInt() < set2.CardinalityInt() &&
+    set.isSubsetAfterCardinalityCheck(set2)
+}
+
+func (set Set) isSubsetAfterCardinalityCheck(set2 Set) bool {
+  for _, v := range set.contents {
+    if !sliceContains(set2.contents, v) {
+      return false
+    }
+  }
+  return true
+}
+
+// Elements returns the set of elements (i.e. the set itself).
+func (set Set) Elements() Set {
+  return set
+}
+
+// AllSubsets returns an iterator over all subsets of the given set.
+func (set Set) AllSubsets() Iterator {
+  // Use a big integer to range from 0 to 2^n
+  r := new(big.Int)
+  limit := new(big.Int).Lsh(One.impl, uint(set.CardinalityInt()))
+  return func() (interface{}, bool) {
+    if r.Cmp(limit) == 0 {
+      return Set{}, false
+    } else {
+      values := make([]interface{}, 0, len(set.contents))
+      i := 0
+      s := new(big.Int).Set(r)
+      mod := new(big.Int)
+      for s.Cmp(Zero.impl) > 0 {
+        if mod.Mod(s, Two.impl).Cmp(Zero.impl) != 0 {
+          values = append(values, set.contents[i])
+        }
+        s.Div(s, Two.impl)
+        i++
+      }
+      r.Add(r, One.impl)
+
+      // Annoyingly, the other implementations reverse the order of the
+      // elements, so we have to as well
+      return Set{reverse(values)}, true
+    }
+  }
+}
+
+func reverse(values []interface{}) []interface{} {
+  ans := make([]interface{}, len(values))
+  n := len(values)
+  for i, v := range values {
+    ans[n-1-i] = v
+  }
+  return ans
+}
+
+func (set Set) String() string {
+  return "{" + stringOfElements(set.contents) + "}"
+}
+
+/******************************************************************************
+ * Multisets
+ ******************************************************************************/
+
+// A MultiSet is an unordered sequence of elements with possible duplication.
+type MultiSet struct {
+  elts []msetElt
+}
+
+type msetElt struct {
+  value interface{}
+  count Int
+}
+
+// EmptyMultiSet is the empty multiset.
+var EmptyMultiSet = MultiSetOf()
+
+// MultiSetOf creates a MultiSet with the given elements.
+func MultiSetOf(values ...interface{}) MultiSet {
+  elts := make([]msetElt, 0, len(values))
+NEXT_INPUT:
+  for _, v := range values {
+    for i, u := range elts {
+      if AreEqual(u.value, v) {
+        elts[i] = msetElt{value: u.value, count: u.count.Plus(One)}
+        continue NEXT_INPUT
+      }
+    }
+    elts = append(elts, msetElt{value: v, count: One})
+  }
+  return MultiSet{elts}
+}
+
+// MultiSetFromSeq creates a MultiSet from the elements in the given sequence.
+func MultiSetFromSeq(seq Sequence) MultiSet {
+  return NewBuilderOf(seq).ToMultiSet()
+}
+
+// MultiSetFromSet creates a MultiSet from the elements in the given set.
+func MultiSetFromSet(set Set) MultiSet {
+  elts := make([]msetElt, len(set.contents))
+  for i, v := range set.contents {
+    // No need to check whether it's already there because Set elements are
+    // assumed to be unique
+    elts[i] = msetElt{v, One}
+  }
+  return MultiSet{elts}
+}
+
+func (mset MultiSet) clone() MultiSet {
+  elts := make([]msetElt, len(mset.elts))
+  copy(elts, mset.elts)
+  return MultiSet{elts}
+}
+
+func (mset MultiSet) findIndex(value interface{}) (int, bool) {
+  for i, e := range mset.elts {
+    if AreEqual(e.value, value) {
+      return i, true
+    }
+  }
+  return -1, false
+}
+
+// Update changes the cardinality of the given value in the multiset, returning
+// a new multiset unless the cardinality did not actually change.
+func (mset MultiSet) Update(value interface{}, n Int) MultiSet {
+  i, found := mset.findIndex(value)
+  if found {
+    if mset.elts[i].count == n {
+      return mset
+    } else {
+      ans := mset.clone()
+      ans.elts[i] = msetElt{value, n}
+      return ans
+    }
+  } else if n.Cmp(Zero) == 0 {
+    return mset
+  } else {
+    return MultiSet{append(mset.clone().elts, msetElt{value, n})}
+  }
+}
+
+// Cardinality returns the number of elements in the multiset (counting
+// repetitions).
+func (mset MultiSet) Cardinality() Int {
+  n := new(big.Int)
+  for _, e := range mset.elts {
+    n.Add(n, e.count.impl)
+  }
+  return intOf(n)
+}
+
+// CardinalityInt returns the number of elements in the multiset (counting
+// repetitions) as an int.
+func (mset MultiSet) CardinalityInt() int {
+  n := 0
+  for _, e := range mset.elts {
+    n += e.count.Int()
+  }
+  return n
+}
+
+// Index returns the ith element of the multiset, which is arbitrary except that
+// it is different from the jth element when i /= j.  (Repetitions are ignored.)
+func (mset MultiSet) Index(i Int) interface{} {
+  return mset.elts[i.Int()]
+}
+
+// Iterator returns an iterator over the multiset (including repetitions).
+func (mset MultiSet) Iterator() Iterator {
+  i := 0
+  n := new(big.Int)
+  return func() (interface{}, bool) {
+    for {
+      if i >= len(mset.elts) {
+        return nil, false
+      }
+      if n.Cmp(mset.elts[i].count.impl) >= 0 {
+        n.SetInt64(0)
+        i++
+      } else {
+        break
+      }
+    }
+
+    ans := mset.elts[i].value
+    n.Add(n, One.impl)
+    return ans, true
+  }
+}
+
+// Contains returns whether the multiset contains the given element (at least
+// once).
+func (mset MultiSet) Contains(value interface{}) bool {
+  return mset.Multiplicity(value).Cmp(Zero) > 0
+}
+
+// Multiplicity returns the number of times a given element occurs in the
+// multiset.
+func (mset MultiSet) Multiplicity(value interface{}) Int {
+  i, found := mset.findIndex(value)
+  if found {
+    return mset.elts[i].count
+  } else {
+    return Zero
+  }
+}
+
+// Elements returns an iterator that yields each element in the multiset, as
+// many times as it appears.
+func (mset MultiSet) Elements() func() (interface{}, bool) {
+  i := 0
+  n := new(big.Int)
+  return func() (interface{}, bool) {
+    for {
+      if i >= len(mset.elts) {
+        return nil, false
+      }
+      if n.Cmp(mset.elts[i].count.impl) == 0 {
+        i++
+        n.SetInt64(0)
+      } else {
+        break
+      }
+    }
+    n.Add(n, One.impl)
+    return mset.elts[i].value, true
+  }
+}
+
+// UniqueElements returns an iterator that yields each element in the multiset
+// once.
+func (mset MultiSet) UniqueElements() func() (interface{}, bool) {
+  i := 0
+  return func() (interface{}, bool) {
+    if i >= len(mset.elts) {
+      return nil, false
+    } else {
+      i++
+      return mset.elts[i-1].value, true
+    }
+  }
+}
+
+// Union returns a multiset including each element of either set.  Each value's
+// multiplicity will be the sum of its multiplicities in the original multisets.
+func (mset MultiSet) Union(mset2 MultiSet) MultiSet {
+  if len(mset.elts) == 0 {
+    return mset2
+  }
+  if len(mset2.elts) == 0 {
+    return mset
+  }
+
+  elts := make([]msetElt, 0, len(mset.elts)+len(mset2.elts))
+  for _, e := range mset.elts {
+    if e.count.Cmp(Zero) == 0 {
+      // e.value in mset2 will be added in the next separate for loop
+      continue
+    }
+    m := mset2.Multiplicity(e.value)
+    elts = append(elts, msetElt{e.value, e.count.Plus(m)})
+  }
+  for _, e := range mset2.elts {
+    if !mset.Contains(e.value) {
+      elts = append(elts, e)
+    }
+  }
+
+  return MultiSet{elts}
+}
+
+// Intersection returns a multiset including those elements which occur in both
+// sets.  Each value's multiplicity will be the minimum of its multiplicities
+// in the original multisets.
+func (mset MultiSet) Intersection(mset2 MultiSet) MultiSet {
+  if len(mset.elts) == 0 || len(mset2.elts) == 0 {
+    return EmptyMultiSet
+  }
+
+  elts := make([]msetElt, 0)
+  for _, e := range mset.elts {
+    m := mset2.Multiplicity(e.value)
+    if m.Cmp(Zero) != 0 {
+      elts = append(elts, msetElt{e.value, e.count.Min(m)})
+    }
+  }
+
+  return MultiSet{elts}
+}
+
+// Difference returns a multiset including those elements which occur in the
+// first argument but not the second.  Each value's multiplicity will be its
+// multiplicity in mset minus its multiplicity in mset2.
+func (mset MultiSet) Difference(mset2 MultiSet) MultiSet {
+  if len(mset.elts) == 0 || len(mset2.elts) == 0 {
+    return mset
+  }
+
+  elts := make([]msetElt, 0, max(0, len(mset.elts)-len(mset2.elts)))
+  for _, e := range mset.elts {
+    d := e.count.Minus(mset2.Multiplicity(e.value))
+    if d.Cmp(Zero) > 0 {
+      elts = append(elts, msetElt{e.value, d})
+    }
+  }
+
+  return MultiSet{elts}
+}
+
+// IsDisjointFrom returns whether two multisets contain no elements in common.
+func (mset MultiSet) IsDisjointFrom(mset2 MultiSet) bool {
+  if len(mset.elts) == 0 || len(mset2.elts) == 0 {
+    return true
+  }
+
+  for _, e := range mset.elts {
+    if (e.count.Cmp(Zero) != 0) && mset2.Contains(e.value) {
+      return false
+    }
+  }
+
+  return true
+}
+
+// Equals returns whether two multisets have the same values with the same
+// multiplicities.
+func (mset MultiSet) Equals(mset2 MultiSet) bool {
+  for _, e := range mset.elts {
+    m := mset2.Multiplicity(e.value)
+    if e.count.Cmp(m) != 0 {
+      return false
+    }
+  }
+  return mset.CardinalityInt() == mset2.CardinalityInt()
+}
+
+// MultiSet implements the EqualsGeneric interface.
+func (mset MultiSet) EqualsGeneric(other interface{}) bool {
+  mset2, ok := other.(MultiSet)
+  return ok && mset.Equals(mset2)
+}
+
+// IsSubsetOf returns whether one multiset has a subset of the elements of the
+// other, with lesser or equal multiplicities.
+func (mset MultiSet) IsSubsetOf(mset2 MultiSet) bool {
+  for _, e := range mset.elts {
+    m := mset2.Multiplicity(e.value)
+    if e.count.Cmp(m) > 0 {
+      return false
+    }
+  }
+  return true
+}
+
+// IsProperSubsetOf returns whether one multiset has a proper subset of the
+// elements of the other, with strictly lesser multiplicities.
+func (mset MultiSet) IsProperSubsetOf(mset2 MultiSet) bool {
+  return mset.IsSubsetOf(mset2) && mset.CardinalityInt() < mset2.CardinalityInt()
+}
+
+func (mset MultiSet) String() string {
+  s := "multiset{"
+  sep := ""
+  i := new(big.Int)
+  for _, e := range mset.elts {
+    for i.SetInt64(0); i.Cmp(e.count.impl) < 0; i.Add(i, One.impl) {
+      s += sep + String(e.value)
+      sep = ", "
+    }
+  }
+  s += "}"
+  return s
+}
+
+/******************************************************************************
+ * Maps
+ ******************************************************************************/
+
+// A Map is an association between keys and values.
+type Map struct {
+  elts []mapElt
+}
+
+type mapElt struct {
+  key, value interface{}
+}
+
+// A MapBuilder creates a new Map by accumulating elements imperatively.
+type MapBuilder []mapElt
+
+// NewMapBuilder creates a new map builder.
+func NewMapBuilder() *MapBuilder {
+  return new(MapBuilder)
+}
+
+// Add adds a key and value to the map being built, used by map comprehension
+func (mb *MapBuilder) Add(k, v interface{}) *MapBuilder {
+  *mb = append(*mb, mapElt{k, v})
+  return mb
+}
+
+// ToMap gets the map out of the map builder.
+func (mb *MapBuilder) ToMap() Map {
+  return Map{*mb}
+}
+
+// EmptyMap is the empty map.
+var EmptyMap = NewMapBuilder().ToMap()
+
+func (m Map) clone() Map {
+  elts := make([]mapElt, len(m.elts))
+  copy(elts, m.elts)
+  return Map{elts}
+}
+
+func (m Map) findIndex(key interface{}) (int, bool) {
+  for i, e := range m.elts {
+    if AreEqual(e.key, key) {
+      return i, true
+    }
+  }
+  return -1, false
+}
+
+// Cardinality finds the number of elements in the map.
+func (m Map) Cardinality() Int {
+  return IntOf(m.CardinalityInt())
+}
+
+// CardinalityInt finds the number of elements in the map as an int.
+func (m Map) CardinalityInt() int {
+  return len(m.elts)
+}
+
+// Find finds the given key in the map, returning it and a success flag.
+func (m Map) Find(key interface{}) (interface{}, bool) {
+  i, found := m.findIndex(key)
+  if found {
+    return m.elts[i].value, true
+  } else {
+    return nil, false
+  }
+}
+
+// Get finds the given key in the map, returning it or nil.
+func (m Map) Get(key interface{}) interface{} {
+  v, _ := m.Find(key)
+  return v
+}
+
+// Contains returns whether the given key is in the map.
+func (m Map) Contains(key interface{}) bool {
+  _, found := m.findIndex(key)
+  return found
+}
+
+// Update returns a new Map which associates the given key and value.
+func (m Map) Update(key, value interface{}) Map {
+  ans := m.clone()
+  i, found := ans.findIndex(key)
+  if found {
+    ans.elts[i] = mapElt{key, value}
+  } else {
+    ans.elts = append(ans.elts, mapElt{key, value})
+  }
+  return ans
+}
+
+// Similar to Update, but make the modification in-place.
+// Meant to be used in the map constructor.
+func (m Map) UpdateUnsafe(key, value interface{}) Map {
+  ans := m
+  i, found := ans.findIndex(key)
+  if found {
+    ans.elts[i] = mapElt{key, value}
+  } else {
+    ans.elts = append(ans.elts, mapElt{key, value})
+  }
+  return ans
+}
+
+func (a Map) Merge(b Map) Map {
+  if a.CardinalityInt() == 0 {
+    return b
+  }
+  if b.CardinalityInt() == 0 {
+    return a
+  }
+
+  m := make([]mapElt, len(b.elts), len(a.elts) + len(b.elts))
+  copy(m, b.elts)
+  for _, e := range a.elts {
+    _, found := b.findIndex(e.key)
+    if !found {
+      m = append(m, e)
+    }
+  }
+  return Map{m}
+}
+
+func (a Map) Subtract(keys Set) Map {
+  if a.CardinalityInt() == 0 || keys.CardinalityInt() == 0 {
+    return a
+  }
+
+  mb := NewMapBuilder()
+  for _, e := range a.elts {
+    if !keys.Contains(e.key) {
+      *mb = append(*mb, e)
+    }
+  }
+  return mb.ToMap()
+}
+
+// Equals returns whether each map associates the same keys to the same values.
+func (m Map) Equals(m2 Map) bool {
+  if len(m.elts) != len(m2.elts) {
+    return false
+  }
+  for _, e := range m.elts {
+    i, found := m2.findIndex(e.key)
+    if !found || !AreEqual(e.value, m2.elts[i].value) {
+      return false
+    }
+  }
+  return true
+}
+
+// Map implements the EqualsGeneric interface.
+func (m Map) EqualsGeneric(other interface{}) bool {
+  m2, ok := other.(Map)
+  return ok && m.Equals(m2)
+}
+
+// Keys returns the set of keys in the map.
+func (m Map) Keys() Set {
+  b := NewBuilder()
+  for _, e := range m.elts {
+    b.Add(e.key)
+  }
+  return b.ToSet()
+}
+
+// Values returns the set of values in the map.
+func (m Map) Values() Set {
+  b := NewBuilder()
+  for _, e := range m.elts {
+    b.Add(e.value)
+  }
+  return b.ToSet()
+}
+
+// Items returns the set of items in the map as a Set of Tuples.
+func (m Map) Items() Set {
+  b := NewBuilder()
+  for _, e := range m.elts {
+    b.Add(TupleOf(e.key, e.value))
+  }
+  return b.ToSet()
+}
+
+func (m Map) String() string {
+  s := "map["
+  for i, e := range m.elts {
+    if i > 0 {
+      s += ", "
+    }
+    s += fmt.Sprintf("%s := %s", String(e.key), String(e.value))
+  }
+  s += "]"
+  return s
+}
+
+/******************************************************************************
+ * Integers
+ ******************************************************************************/
+
+// An Int is an immutable big integer.
+type Int struct {
+  impl *big.Int
+  // debug string
+} // Careful not to mutate!
+
+// A BV is an immutable big bitvector (presumed to be non-negative).
+type BV = Int
+
+func intOf(i *big.Int) Int {
+  return Int{
+    impl: i,
+    // debug: i.String(),
+  }
+}
+
+// IntOf turns the given int into an Int.  Common values are cached.  This is
+// simply a shorter form of IntOfInt.
+func IntOf(i int) Int {
+  return IntOfInt(i)
+}
+
+// IntOfInt turns the given int into an Int.  Common values are cached.
+func IntOfInt(i int) Int {
+  return IntOfInt64(int64(i))
+}
+
+// IntOfInt8 turns the given int8 into an Int.  Common values are cached.
+func IntOfInt8(i int8) Int {
+  return IntOfInt64(int64(i))
+}
+
+// IntOfInt16 turns the given int16 into an Int.  Common values are cached.
+func IntOfInt16(i int16) Int {
+  return IntOfInt64(int64(i))
+}
+
+// IntOfInt32 turns the given int32 into an Int.  Common values are cached.
+func IntOfInt32(i int32) Int {
+  return IntOfInt64(int64(i))
+}
+
+// IntOfInt64 turns the given int64 into an Int.  Common values are cached.
+func IntOfInt64(i int64) Int {
+  switch i {
+  case -1:
+    return NegativeOne
+  case 0:
+    return Zero
+  case 1:
+    return One
+  case 2:
+    return Two
+  case 5:
+    return Five
+  case 10:
+    return Ten
+  default:
+    return intOf(big.NewInt(i))
+  }
+}
+
+// IntOfUint turns the given uint into an Int.  Common values are cached.
+func IntOfUint(i uint) Int {
+  return IntOfUint64(uint64(i))
+}
+
+// IntOfUint8 turns the given uint8 into an Int.  Common values are cached.
+func IntOfUint8(i uint8) Int {
+  return IntOfUint64(uint64(i))
+}
+
+// IntOfUint16 turns the given uint16 into an Int.  Common values are cached.
+func IntOfUint16(i uint16) Int {
+  return IntOfUint64(uint64(i))
+}
+
+// IntOfUint32 turns the given uint32 into an Int.  Common values are cached.
+func IntOfUint32(i uint32) Int {
+  return IntOfUint64(uint64(i))
+}
+
+// IntOfUint64 turns the given uint64 into an Int.  Common values are cached.
+func IntOfUint64(i uint64) Int {
+  switch i {
+  case 0:
+    return Zero
+  case 1:
+    return One
+  case 2:
+    return Two
+  case 5:
+    return Five
+  case 10:
+    return Ten
+  default:
+    return intOf(new(big.Int).SetUint64(i))
+  }
+}
+
+// IntOfString parses the given string as an Int, panicking on failure.
+func IntOfString(s string) Int {
+  switch s {
+  case "-1":
+    return NegativeOne
+  case "0":
+    return Zero
+  case "1":
+    return One
+  case "2":
+    return Two
+  case "5":
+    return Five
+  case "10":
+    return Ten
+  default:
+    i, ok := new(big.Int).SetString(s, 0)
+    if !ok {
+      panic("Unable to parse string as int: " + s)
+    } else {
+      return intOf(i)
+    }
+  }
+}
+
+// IntOfAny converts from many different things to Int.  Note that
+// switch-on-type does a linear search, so this can be slow for less common
+// cases.
+func IntOfAny(x interface{}) Int {
+  switch x := x.(type) {
+  // Try and put the most common cases earliest.
+  case Int:
+    return x
+  case int:
+    return IntOfInt(x)
+  case string:
+    return IntOfString(x)
+  case uint:
+    return IntOfUint(x)
+  case Char:
+    return IntOfInt32(rune(x))
+  case int32:
+    return IntOfInt32(x)
+  case int64:
+    return IntOfInt64(x)
+  case uint32:
+    return IntOfUint32(x)
+  case uint64:
+    return IntOfUint64(x)
+  case int8:
+    return IntOfInt8(x)
+  case uint8:
+    return IntOfUint8(x)
+  case int16:
+    return IntOfInt16(x)
+  case uint16:
+    return IntOfUint16(x)
+  default:
+    panic(fmt.Errorf("unexpected type for IntToAny: %v", refl.TypeOf(x)))
+  }
+}
+
+// Int converts back into an int.  If the result is not within int range,
+// the value is undefined.
+func (i Int) Int() int {
+  return int(i.impl.Int64())
+}
+
+// Int8 converts back into an int8.  If the result is not within int8 range,
+// the value is undefined.
+func (i Int) Int8() int8 {
+  return int8(i.impl.Int64())
+}
+
+// Int16 converts back into an int16.  If the result is not within int16 range,
+// the value is undefined.
+func (i Int) Int16() int16 {
+  return int16(i.impl.Int64())
+}
+
+// Int32 converts back into an int32.  If the result is not within int32 range,
+// the value is undefined.
+func (i Int) Int32() int32 {
+  return int32(i.impl.Int64())
+}
+
+// Int64 converts back to an int64.  If the result is not within int64 range,
+// the value is undefined.
+func (i Int) Int64() int64 {
+  return i.impl.Int64()
+}
+
+// Uint converts back to a uint.  If the result is not within uint range, the
+// value is undefined.
+func (i Int) Uint() uint {
+  return uint(i.impl.Uint64())
+}
+
+// Uint8 converts back to a uint8.  If the result is not within uint8 range, the
+// value is undefined.
+func (i Int) Uint8() uint8 {
+  return uint8(i.impl.Uint64())
+}
+
+// Uint16 converts back to a uint16.  If the result is not within uint16 range,
+// the value is undefined.
+func (i Int) Uint16() uint16 {
+  return uint16(i.impl.Uint64())
+}
+
+// Uint32 converts back to a uint32.  If the result is not within uint32 range,
+// the value is undefined.
+func (i Int) Uint32() uint32 {
+  return uint32(i.impl.Uint64())
+}
+
+// Uint64 converts back to a uint64.  If the result is not within uint64 range,
+// the value is undefined.
+func (i Int) Uint64() uint64 {
+  return i.impl.Uint64()
+}
+
+func (i Int) String() string {
+  return i.impl.String()
+}
+
+// NegativeOne is the constant -1.
+var NegativeOne = intOf(big.NewInt(-1))
+
+// Zero is the constant 0.
+var Zero = intOf(big.NewInt(0))
+
+// One is the constant 1.
+var One = intOf(big.NewInt(1))
+
+// Two is the constant 2.
+var Two = intOf(big.NewInt(2))
+
+// Five is the constant 5.
+var Five = intOf(big.NewInt(5))
+
+// Ten is the constant 10.
+var Ten = intOf(big.NewInt(10))
+
+// NilInt is a missing int value.
+var NilInt = intOf(nil)
+
+// IsNilInt returns whether this Int is actually a missing value.
+func (i Int) IsNilInt() bool {
+  return i.impl == nil
+}
+
+func (i Int) binOp(j Int, f func(*big.Int, *big.Int, *big.Int) *big.Int) Int {
+  return intOf(f(new(big.Int), i.impl, j.impl))
+}
+
+// Plus adds two Ints.
+func (i Int) Plus(j Int) Int {
+  return i.binOp(j, (*big.Int).Add)
+}
+
+// Minus subtracts one Int from another.
+func (i Int) Minus(j Int) Int {
+  return i.binOp(j, (*big.Int).Sub)
+}
+
+// Times multiplies two Ints.
+func (i Int) Times(j Int) Int {
+  return i.binOp(j, (*big.Int).Mul)
+}
+
+// DivBy divides one Int by another.  (So named to distinguish from
+// big.Int.Div(), which is an in-place operation.)
+func (i Int) DivBy(j Int) Int {
+  return i.binOp(j, (*big.Int).Div)
+}
+
+// Modulo takes the remainder when dividing one Int by another.  (So named to
+// distinguish from big.Int.Mod(), which performs the operation in place.)
+func (i Int) Modulo(j Int) Int {
+  return i.binOp(j, (*big.Int).Mod)
+}
+
+// Negated negates an Int.
+func (i Int) Negated() Int {
+  return intOf(new(big.Int).Neg(i.impl))
+}
+
+// Lsh performs a left shift.
+func (i Int) Lsh(j Int) Int {
+  return intOf(new(big.Int).Lsh(i.impl, uint(j.Uint64())))
+}
+
+// Rsh performs a right shift.
+func (i Int) Rsh(j Int) Int {
+  return intOf(new(big.Int).Rsh(i.impl, uint(j.Uint64())))
+}
+
+// Lrot performs a left rotate on a BV with width w.
+func (i BV) Lrot(j Int, w uint) BV {
+  // (i <<< j) == ((i << j) % 2^w) | (i >> (w-j))
+
+  ju := uint(j.Uint64())
+  l := new(big.Int).Lsh(i.impl, ju)
+  modulus := new(big.Int).Lsh(One.impl, w)
+  l.Mod(l, modulus)
+  r := modulus.Rsh(i.impl, w-ju) // reuse memory from modulus
+  return intOf(l.Or(l, r))
+}
+
+// Rrot performs a right rotate on a BV with width w.
+func (i BV) Rrot(j BV, w uint) BV {
+  // (i >>> j) == ((i << (w-j)) % 2^w) | (i >> j)
+
+  ju := uint(j.Uint64())
+  l := new(big.Int).Lsh(i.impl, w-ju)
+  modulus := new(big.Int).Lsh(One.impl, w)
+  l.Mod(l, modulus)
+  r := modulus.Rsh(i.impl, ju) // reuse memory from modulus
+  return intOf(l.Or(l, r))
+}
+
+// Cmp compares two Ints, returning -1 for less, 0 for equal, or 1 for greater.
+func (i Int) Cmp(j Int) int {
+  return i.impl.Cmp(j.impl)
+}
+
+// Sign returns the sign of an Int, returning -1 for negative, 0 for zero, or
+// 1 for positive.
+func (i Int) Sign() int {
+  return i.impl.Sign()
+}
+
+// EqualsGeneric compares an int to another value.
+func (i Int) EqualsGeneric(other interface{}) bool {
+  j, ok := other.(Int)
+  return ok && i.Cmp(j) == 0
+}
+
+// Min returns the minimum of two integers.
+func (i Int) Min(j Int) Int {
+  if i.Cmp(j) <= 0 {
+    return i
+  } else {
+    return j
+  }
+}
+
+// Max returns the maximum of two integers.
+func (i Int) Max(j Int) Int {
+  if i.Cmp(j) >= 0 {
+    return i
+  } else {
+    return j
+  }
+}
+
+// And performs bitwise AND.
+func (i Int) And(j Int) Int {
+  return i.binOp(j, (*big.Int).And)
+}
+
+// Or performs bitwise OR.
+func (i Int) Or(j Int) Int {
+  return i.binOp(j, (*big.Int).Or)
+}
+
+// Xor performs bitwise XOR.
+func (i Int) Xor(j Int) Int {
+  return i.binOp(j, (*big.Int).Xor)
+}
+
+// Not performs bitwise NOT.
+func (i Int) Not() Int {
+  return intOf(new(big.Int).Not(i.impl))
+}
+
+func (i Int) isPowerOf10() (bool, int) {
+  if i.Cmp(Zero) != 1 {
+    return false, -1
+  }
+  n := 0
+  j := i
+  for {
+    if j.Cmp(One) == 0 {
+      return true, n
+    } else if j.Modulo(Ten).Cmp(Zero) != 0 {
+      return false, -1
+    } else {
+      j = j.DivBy(Ten)
+      n++
+    }
+  }
+}
+
+func (i Int) dividesAPowerOf10() (yes bool, factor Int, log10 int) {
+  if i.Cmp(Zero) != 1 {
+    return false, Zero, -1
+    // okay, so technically you could multiply by a
+    // negative number, but that's not useful to
+    // Real.String().
+  }
+  n := 0
+  j := i
+  fact := One
+  for {
+    if j.Cmp(One) == 0 {
+      return true, One, n
+    } else if j.Modulo(Ten).Cmp(Zero) != 0 {
+      if j.Modulo(Five).Cmp(Zero) == 0 {
+        for {
+          fact = fact.Times(Two)
+          j = j.DivBy(Five)
+          n++
+          if j.Cmp(One) == 0 {
+            return true, fact, n
+          } else if j.Modulo(Five).Cmp(Zero) != 0 {
+            return false, NegativeOne, -1
+          }
+        }
+      } else if j.Modulo(Two).Cmp(Zero) == 0 {
+        for {
+          fact = fact.Times(Five)
+          j = j.DivBy(Two)
+          n++
+          if j.Cmp(One) == 0 {
+            return true, fact, n
+          } else if j.Modulo(Two).Cmp(Zero) != 0 {
+            return false, NegativeOne, -1
+          }
+        }
+      } else {
+        return false, NegativeOne, -1
+      }
+    } else {
+      j = j.DivBy(Ten)
+      n++
+    }
+  }
+}
+
+// IntegerRange returns an iterator over the integers from lo up to (but not
+// including) hi.
+func IntegerRange(lo, hi Int) Iterator {
+  if lo.impl != nil {
+    i := lo
+    return func() (interface{}, bool) {
+      if hi.impl != nil && i.Cmp(hi) >= 0 {
+        return nil, false
+      } else {
+        ans := i
+        i = i.Plus(One)
+        return ans, true
+      }
+    }
+  } else if hi.impl != nil {
+    i := hi
+    return func() (interface{}, bool) {
+      ans := i
+      i = i.Minus(One)
+      return ans, true
+    }
+  } else {
+    return AllIntegers()
+  }
+}
+
+// AllIntegers returns an iterator over all integers, starting at zero and
+// alternating between positive and negative.
+func AllIntegers() Iterator {
+  type phase int
+  const (
+    zeroPhase int = iota
+    posPhase
+    negPhase
+  )
+
+  i := Zero
+  p := zeroPhase
+
+  return func() (interface{}, bool) {
+    switch p {
+    case zeroPhase:
+      i = One
+      p = posPhase
+      return Zero, true
+    case posPhase:
+      p = negPhase
+      return i, true
+    case negPhase:
+      ans := i.Negated()
+      i = i.Plus(One)
+      p = posPhase
+      return ans, true
+    default:
+      panic("unknown phase")
+    }
+  }
+}
+
+/******************************************************************************
+ * Ordinals
+ ******************************************************************************/
+
+// An Ord is an immutable big integer (presumed to be non-negative).
+type Ord = Int
+
+// IsLimitOrd returns true for a limit ordinal.
+func (ord Ord) IsLimitOrd() bool {
+  return ord.Cmp(Zero) == 0
+}
+
+// IsSuccOrd returns true for a successor ordinal.
+func (ord Ord) IsSuccOrd() bool {
+  return ord.Cmp(Zero) > 0
+}
+
+// OrdOffset returns the ordinal as an Int.
+func (ord Ord) OrdOffset() Int {
+  return ord
+}
+
+// IsNatOrd returns true if the ordinal represents a natural number.
+func (Ord) IsNatOrd() bool {
+  return true // at run time, every ORDINAL is a natural number
+}
+
+/******************************************************************************
+ * Reals
+ ******************************************************************************/
+
+// A Real is an arbitrary-precision real number, represented as a ratio of
+// arbitrary-precision integers.
+type Real struct {
+  impl *big.Rat
+  // debug string
+}
+
+func realOf(r *big.Rat) Real {
+  return Real{
+    impl: r,
+    // debug: r.String()
+  }
+}
+
+// RealOf converts a float64 into a Real.  Common values are cached.
+func RealOf(f float64) Real {
+  if f == 0.0 {
+    return ZeroReal
+  }
+  return realOf(new(big.Rat).SetFloat64(f))
+}
+
+// RealOfFrac makes a Real of the ratio of two Ints.
+func RealOfFrac(num, denom Int) Real {
+  if num.Cmp(Zero) == 0 {
+    return ZeroReal
+  }
+  return realOf(new(big.Rat).SetFrac(num.impl, denom.impl))
+}
+
+// ZeroReal is the Real value zero.
+var ZeroReal = realOf(new(big.Rat))
+
+// NilReal is a missing Real value.
+var NilReal = realOf(nil)
+
+// IsNilReal returns whether this is actually a missing value.
+func (x Real) IsNilReal() bool {
+  return x.impl == nil
+}
+
+// RealOfString parses the given string in base 10 and panics if this is not
+// possible.
+func RealOfString(s string) Real {
+  x, ok := new(big.Rat).SetString(s)
+  if !ok {
+    panic("Can't parse generated string as ratio: \"" + s + "\"")
+  }
+  if x.Cmp(ZeroReal.impl) == 0 {
+    return ZeroReal
+  }
+  return realOf(x)
+}
+
+// Int converts the given real to an integer, rounding toward negative numbers.
+// (That is, returns floor(x).)
+func (x Real) Int() Int {
+  if x.Cmp(ZeroReal) == 0 || x.Denom().Cmp(One) == 0 {
+    return x.Num()
+  } else if x.Num().Cmp(Zero) > 0 {
+    return intOf(new(big.Int).Div(x.impl.Num(), x.impl.Denom()))
+  } else {
+    a := new(big.Int).Sub(x.impl.Num(), x.impl.Denom())
+    a.Add(a, One.impl)
+    return intOf(a.Quo(a, x.impl.Denom())) // note: *truncated* division
+  }
+}
+
+func (x Real) IsInteger() bool {
+  return RealOfFrac(x.Int(), One).Cmp(x) == 0
+}
+
+// Num returns the given Real's numerator as an Int
+func (x Real) Num() Int {
+  return intOf(x.impl.Num())
+}
+
+// Denom returns the given Real's denominator as an Int
+func (x Real) Denom() Int {
+  return intOf(x.impl.Denom())
+}
+
+func (x Real) String() string {
+  if x.Num().Cmp(Zero) == 0 || x.Denom().Cmp(One) == 0 {
+    return x.Num().String() + ".0"
+  }
+  divsPow10, fact, log10 := x.Denom().dividesAPowerOf10()
+  if divsPow10 {
+    num := x.Num().Times(fact)
+    var sign, digits string
+    if x.Cmp(ZeroReal) < 0 {
+      sign, digits = "-", num.Negated().String()
+    } else {
+      sign, digits = "", num.String()
+    }
+    if log10 < len(digits) {
+      n := len(digits) - log10
+      return sign + digits[0:n] + "." + digits[n:]
+    } else {
+      s := sign + "0."
+      for i := 0; i < log10-len(digits); i++ {
+        s = s + "0"
+      }
+      return s + digits
+    }
+  } else {
+    return "(" + x.Num().String() + ".0 / " + x.Denom().String() + ".0)"
+  }
+}
+
+func (x Real) isPowerOf10() (bool, int) {
+  if x.Num().Cmp(Zero) != 1 {
+    return false, -1
+  } else if x.Num().Cmp(One) == 1 {
+    b, i := x.Denom().isPowerOf10()
+    return b, -i
+  } else if x.Denom().Cmp(One) != 1 {
+    return false, -1
+  } else {
+    return x.Num().isPowerOf10()
+  }
+}
+
+// binOp lifts a binary operation on *big.Rat to one on Reals.  The second
+// argument is intended to be of the form (*big.Rat).Op.
+func (x Real) binOp(y Real, f func(*big.Rat, *big.Rat, *big.Rat) *big.Rat) Real {
+  return realOf(f(new(big.Rat), x.impl, y.impl))
+}
+
+// Plus adds two Reals.
+func (x Real) Plus(y Real) Real {
+  return x.binOp(y, (*big.Rat).Add)
+}
+
+// Minus subtracts one Real from another.
+func (x Real) Minus(y Real) Real {
+  return x.binOp(y, (*big.Rat).Sub)
+}
+
+// Times multiplies two Reals.
+func (x Real) Times(y Real) Real {
+  return x.binOp(y, (*big.Rat).Mul)
+}
+
+// DivBy divides one Real by another.
+func (x Real) DivBy(y Real) Real {
+  return x.binOp(y, (*big.Rat).Quo)
+}
+
+// Cmp compares one Real to another, returning -1 for less, 0 for equal, or 1
+// for greater.
+func (x Real) Cmp(y Real) int {
+  return x.impl.Cmp(y.impl)
+}
+
+// Sign returns the sign of a Real, returning -1 for negative, 0 for zero, or
+// 1 for positive.
+func (x Real) Sign() int {
+  return x.impl.Sign()
+}
+
+// EqualsGeneric compares an int to another value.
+func (x Real) EqualsGeneric(other interface{}) bool {
+  y, ok := other.(Real)
+  return ok && x.Cmp(y) == 0
+}
+
+// Min returns the minimum of two reals.
+func (x Real) Min(y Real) Real {
+  if x.Cmp(y) <= 0 {
+    return x
+  } else {
+    return y
+  }
+}
+
+// Max returns the maximum of two reals.
+func (x Real) Max(y Real) Real {
+  if x.Cmp(y) >= 0 {
+    return x
+  } else {
+    return y
+  }
+}
+
+/******************************************************************************
+ * Native math
+ ******************************************************************************/
+
+// DivInt does Euclidean division on the given ints
+func DivInt(x int, y int) int {
+  if x >= 0 {
+    if y >= 0 {
+      return x / y
+    } else {
+      return -(x / -y)
+    }
+  } else {
+    if y >= 0 {
+      return -((-x - 1) / y) - 1
+    } else {
+      return ((-x - 1) / (-y)) + 1
+    }
+  }
+}
+
+// DivInt8 does Euclidean divison on the given int8s
+func DivInt8(x int8, y int8) int8 {
+  if x >= 0 {
+    if y >= 0 {
+      return x / y
+    } else {
+      return -(x / -y)
+    }
+  } else {
+    if y >= 0 {
+      return -((-x - 1) / y) - 1
+    } else {
+      return ((-x - 1) / (-y)) + 1
+    }
+  }
+}
+
+// DivInt16 does Euclidean divison on the given int16s
+func DivInt16(x int16, y int16) int16 {
+  if x >= 0 {
+    if y >= 0 {
+      return x / y
+    } else {
+      return -(x / -y)
+    }
+  } else {
+    if y >= 0 {
+      return -((-x - 1) / y) - 1
+    } else {
+      return ((-x - 1) / (-y)) + 1
+    }
+  }
+}
+
+// DivInt32 does Euclidean divison on the given int32s
+func DivInt32(x int32, y int32) int32 {
+  if x >= 0 {
+    if y >= 0 {
+      return x / y
+    } else {
+      return -(x / -y)
+    }
+  } else {
+    if y >= 0 {
+      return -((-x - 1) / y) - 1
+    } else {
+      return ((-x - 1) / (-y)) + 1
+    }
+  }
+}
+
+// DivInt64 does Euclidean divison on the given int64s
+func DivInt64(x int64, y int64) int64 {
+  if x >= 0 {
+    if y >= 0 {
+      return x / y
+    } else {
+      return -(x / -y)
+    }
+  } else {
+    if y >= 0 {
+      return -((-x - 1) / y) - 1
+    } else {
+      return ((-x - 1) / (-y)) + 1
+    }
+  }
+}
+
+// DivFloat32 does Euclidean division on the given float32s
+func DivFloat32(x float32, y float32) float32 {
+  if x >= 0 {
+    if y >= 0 {
+      return x / y
+    } else {
+      return -(x / -y)
+    }
+  } else {
+    if y >= 0 {
+      return -((-x - 1) / y) - 1
+    } else {
+      return ((-x - 1) / (-y)) + 1
+    }
+  }
+}
+
+// DivFloat64 does Euclidean division on the given float64s
+func DivFloat64(x float64, y float64) float64 {
+  if x >= 0 {
+    if y >= 0 {
+      return x / y
+    } else {
+      return -(x / -y)
+    }
+  } else {
+    if y >= 0 {
+      return -((-x - 1) / y) - 1
+    } else {
+      return ((-x - 1) / (-y)) + 1
+    }
+  }
+}
+
+// LrotUint performs left rotation on the low w bits of an int
+func LrotUint(x uint, n Int, w uint) uint {
+  y := n.Uint()
+  return ((x << y) % (1 << w)) | (x >> (w - y))
+}
+
+// LrotUint8 performs left rotation on the low w bits of an int8
+func LrotUint8(x uint8, n Int, w uint) uint8 {
+  y := n.Uint()
+  return ((x << y) % (1 << w)) | (x >> (w - y))
+}
+
+// LrotUint16 performs left rotation on the low w bits of an int16
+func LrotUint16(x uint16, n Int, w uint) uint16 {
+  y := n.Uint()
+  return ((x << y) % (1 << w)) | (x >> (w - y))
+}
+
+// LrotUint32 performs left rotation on the low w bits of an int32
+func LrotUint32(x uint32, n Int, w uint) uint32 {
+  y := n.Uint()
+  return ((x << y) % (1 << w)) | (x >> (w - y))
+}
+
+// LrotUint64 performs left rotation on the low w bits of an int64
+func LrotUint64(x uint64, n Int, w uint) uint64 {
+  y := n.Uint()
+  return ((x << y) % (1 << w)) | (x >> (w - y))
+}
+
+// ModInt finds Euclidean remainder of the given ints
+func ModInt(x int, y int) int {
+  if y < 0 {
+    y = -y
+  }
+  if x >= 0 {
+    return x % y
+  } else {
+    z := (-x) % y
+    if z == 0 {
+      return 0
+    } else {
+      return y - z
+    }
+  }
+}
+
+// ModInt8 finds Euclidean remainder of the given int8s
+func ModInt8(x int8, y int8) int8 {
+  if y < 0 {
+    y = -y
+  }
+  if x >= 0 {
+    return x % y
+  } else {
+    z := (-x) % y
+    if z == 0 {
+      return 0
+    } else {
+      return y - z
+    }
+  }
+}
+
+// ModInt16 finds Euclidean remainder of the given int16s
+func ModInt16(x int16, y int16) int16 {
+  if y < 0 {
+    y = -y
+  }
+  if x >= 0 {
+    return x % y
+  } else {
+    z := (-x) % y
+    if z == 0 {
+      return 0
+    } else {
+      return y - z
+    }
+  }
+}
+
+// ModInt32 finds Euclidean remainder of the given int32s
+func ModInt32(x int32, y int32) int32 {
+  if y < 0 {
+    y = -y
+  }
+  if x >= 0 {
+    return x % y
+  } else {
+    z := (-x) % y
+    if z == 0 {
+      return 0
+    } else {
+      return y - z
+    }
+  }
+}
+
+// ModInt64 finds Euclidean remainder of the given int64s
+func ModInt64(x int64, y int64) int64 {
+  if y < 0 {
+    y = -y
+  }
+  if x >= 0 {
+    return x % y
+  } else {
+    z := (-x) % y
+    if z == 0 {
+      return 0
+    } else {
+      return y - z
+    }
+  }
+}
+
+// RrotUint performs right rotation on the low w bits of an int
+func RrotUint(x uint, n Int, w uint) uint {
+  y := n.Uint()
+  return (x >> y) | ((x << (w - y)) % (1 << w))
+}
+
+// RrotUint8 performs right rotation on the low w bits of an int8
+func RrotUint8(x uint8, n Int, w uint) uint8 {
+  y := n.Uint()
+  return (x >> y) | ((x << (w - y)) % (1 << w))
+}
+
+// RrotUint16 performs right rotation on the low w bits of an int16
+func RrotUint16(x uint16, n Int, w uint) uint16 {
+  y := n.Uint()
+  return (x >> y) | ((x << (w - y)) % (1 << w))
+}
+
+// RrotUint32 performs right rotation on the low w bits of an int32
+func RrotUint32(x uint32, n Int, w uint) uint32 {
+  y := n.Uint()
+  return (x >> y) | ((x << (w - y)) % (1 << w))
+}
+
+// RrotUint64 performs right rotation on the low w bits of an int64
+func RrotUint64(x uint64, n Int, w uint) uint64 {
+  y := n.Uint()
+  return (x >> y) | ((x << (w - y)) % (1 << w))
+}
+
+/******************************************************************************
+ * Utility functions
+ ******************************************************************************/
+
+func min(n, m int) int {
+  if n <= m {
+    return n
+  } else {
+    return m
+  }
+}
+
+func max(n, m int) int {
+  if n >= m {
+    return n
+  } else {
+    return m
+  }
+}
+
+func CatchHalt() {
+  if r := recover(); r != nil {
+    fmt.Println("[Program halted]", r)
+    os.Exit(1)
+  }
+}
+
+type GoAtomicBox struct {
+  value interface{}
+}
+
+func (box *GoAtomicBox) Get() interface{} {
+  return box.value
+}
+
+func (box *GoAtomicBox) Put(value interface{}) {
+  box.value = value
+}
+
+func (box *GoAtomicBox) String() string {
+  return "dafny.GoAtomicBox"
+}
+
+func (CompanionStruct_AtomicBox_) Make(value interface{}) AtomicBox {
+  return &GoAtomicBox{
+    value: value,
+  }
+}
+
+func (CompanionStruct_Helpers_) DafnyValueToDafnyString(value interface{}) Sequence {
+  return SeqOfString(String(value))
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo/dafny/dafnyFromDafny.go b/Source/DafnyRuntime/DafnyRuntimeGo/dafny/dafnyFromDafny.go
new file mode 100644
index 00000000000..cd434586dda
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeGo/dafny/dafnyFromDafny.go
@@ -0,0 +1,1307 @@
+// Package dafny
+// Dafny module dafny compiled into Go
+
+package dafny
+
+type Dummy__ struct{}
+
+// Definition of class Default__
+type Default__ struct {
+	dummy byte
+}
+
+func New_Default___() *Default__ {
+	_this := Default__{}
+
+	return &_this
+}
+
+type CompanionStruct_Default___ struct {
+}
+
+var Companion_Default___ = CompanionStruct_Default___{}
+
+func (_this *Default__) Equals(other *Default__) bool {
+	return _this == other
+}
+
+func (_this *Default__) EqualsGeneric(x interface{}) bool {
+	other, ok := x.(*Default__)
+	return ok && _this.Equals(other)
+}
+
+func (*Default__) String() string {
+	return "dafny.Default__"
+}
+func (_this *Default__) ParentTraits_() []*TraitID {
+	return [](*TraitID){}
+}
+
+var _ TraitOffspring = &Default__{}
+
+func (_static *CompanionStruct_Default___) SizeAdditionInRange(a uint32, b uint32) bool {
+	var _hresult bool = false
+	_ = _hresult
+	_hresult = (a) <= ((Companion_Default___.SIZE__T__MAX()) - (func() uint32 { return (b) })())
+	return _hresult
+	return _hresult
+}
+func (_static *CompanionStruct_Default___) AppendRecursive(builder *Vector, e Sequence) {
+	if func(_is_0 Sequence) bool {
+		return InstanceOf(_is_0, (*ConcatSequence)(nil))
+	}(e) {
+		var _0_concat *ConcatSequence
+		_ = _0_concat
+		_0_concat = e.(*ConcatSequence)
+		Companion_Default___.AppendRecursive(builder, (_0_concat).Left())
+		Companion_Default___.AppendRecursive(builder, (_0_concat).Right())
+	} else if func(_is_1 Sequence) bool {
+		return InstanceOf(_is_1, (*LazySequence)(nil))
+	}(e) {
+		var _1_lazy *LazySequence
+		_ = _1_lazy
+		_1_lazy = e.(*LazySequence)
+		var _2_boxed Sequence
+		_ = _2_boxed
+		var _out0 interface{}
+		_ = _out0
+		_out0 = ((_1_lazy).Box()).Get()
+		_2_boxed = Companion_Sequence_.CastTo_(Companion_Sequence_.CastTo_(_out0))
+		Companion_Default___.AppendRecursive(builder, _2_boxed)
+	} else {
+		var _3_a ImmutableArray
+		_ = _3_a
+		var _out1 ImmutableArray
+		_ = _out1
+		_out1 = Companion_ImmutableArray_.CastTo_((e).ToArray())
+		_3_a = Companion_ImmutableArray_.CastTo_(_out1)
+		(builder).Append(_3_a)
+	}
+}
+func (_static *CompanionStruct_Default___) AppendOptimized(builder *Vector, e Sequence, stack *Vector) {
+	goto TAIL_CALL_START
+TAIL_CALL_START:
+	if func(_is_2 Sequence) bool {
+		return InstanceOf(_is_2, (*ConcatSequence)(nil))
+	}(e) {
+		var _0_concat *ConcatSequence
+		_ = _0_concat
+		_0_concat = e.(*ConcatSequence)
+		if !(Companion_Default___.SizeAdditionInRange(stack.Size, Companion_Default___.ONE__SIZE())) {
+			panic("dafnyRuntime.dfy[DafnyGo](766,6): " + (SeqOfString("expectation violation")).String())
+		}
+		(stack).AddLast((_0_concat).Right())
+		{
+			var _in0 *Vector = builder
+			_ = _in0
+			var _in1 Sequence = (_0_concat).Left()
+			_ = _in1
+			var _in2 *Vector = stack
+			_ = _in2
+			builder = _in0
+			e = _in1
+			stack = _in2
+			goto TAIL_CALL_START
+			goto L0_0
+		}
+	L0_0:
+	} else if func(_is_3 Sequence) bool {
+		return InstanceOf(_is_3, (*LazySequence)(nil))
+	}(e) {
+		var _1_lazy *LazySequence
+		_ = _1_lazy
+		_1_lazy = e.(*LazySequence)
+		var _2_boxed Sequence
+		_ = _2_boxed
+		var _out0 interface{}
+		_ = _out0
+		_out0 = ((_1_lazy).Box()).Get()
+		_2_boxed = Companion_Sequence_.CastTo_(Companion_Sequence_.CastTo_(_out0))
+		var _in3 *Vector = builder
+		_ = _in3
+		var _in4 Sequence = _2_boxed
+		_ = _in4
+		var _in5 *Vector = stack
+		_ = _in5
+		builder = _in3
+		e = _in4
+		stack = _in5
+		goto TAIL_CALL_START
+	} else if func(_is_4 Sequence) bool {
+		return InstanceOf(_is_4, (*ArraySequence)(nil))
+	}(e) {
+		var _3_a *ArraySequence
+		_ = _3_a
+		_3_a = e.(*ArraySequence)
+		(builder).Append((_3_a).Values())
+		if (uint32(0)) < (stack.Size) {
+			var _4_next Sequence
+			_ = _4_next
+			var _out1 interface{}
+			_ = _out1
+			_out1 = (stack).RemoveLast()
+			_4_next = Companion_Sequence_.CastTo_(Companion_Sequence_.CastTo_(_out1))
+			{
+				var _in6 *Vector = builder
+				_ = _in6
+				var _in7 Sequence = _4_next
+				_ = _in7
+				var _in8 *Vector = stack
+				_ = _in8
+				builder = _in6
+				e = _in7
+				stack = _in8
+				goto TAIL_CALL_START
+				goto L1_1_0_0_0
+			}
+		L1_1_0_0_0:
+		}
+	} else {
+		if !(false) {
+			panic("dafnyRuntime.dfy[DafnyGo](789,6): " + (SeqOfString("Unsupported Sequence implementation")).String())
+		}
+	}
+}
+func (_static *CompanionStruct_Default___) SIZE__T__LIMIT() Int {
+	return IntOfInt64(2147483648)
+}
+func (_static *CompanionStruct_Default___) SIZE__T__MAX() uint32 {
+	return ((Companion_Default___.SIZE__T__LIMIT()).Minus(One)).Uint32()
+}
+func (_static *CompanionStruct_Default___) ZERO__SIZE() uint32 {
+	return uint32(0)
+}
+func (_static *CompanionStruct_Default___) ONE__SIZE() uint32 {
+	return uint32(1)
+}
+func (_static *CompanionStruct_Default___) TWO__SIZE() uint32 {
+	return uint32(2)
+}
+func (_static *CompanionStruct_Default___) TEN__SIZE() uint32 {
+	return uint32(10)
+}
+
+// End of class Default__
+
+// Definition of trait Sequence
+type Sequence interface {
+	String() string
+	Equals(other Sequence) bool
+	EqualsGeneric(x interface{}) bool
+	VerbatimString(isLiteral bool) string
+	SetString() Sequence
+	IsString() bool
+	IsString_set_(value bool)
+	Cardinality() uint32
+	Select(index uint32) interface{}
+	Drop(lo uint32) Sequence
+	Take(hi uint32) Sequence
+	Subsequence(lo uint32, hi uint32) Sequence
+	ToArray() ImmutableArray
+	Elements() Sequence
+	UniqueElements() Set
+}
+
+func (_static *CompanionStruct_Sequence_) SetString(_this Sequence) Sequence {
+	{
+		var ret Sequence = (Sequence)(nil)
+		_ = ret
+		(_this).IsString_set_(true)
+		ret = _this
+		return ret
+		return ret
+	}
+}
+func (_static *CompanionStruct_Sequence_) Select(_this Sequence, index uint32) interface{} {
+	{
+		var ret interface{} = (interface{})(nil)
+		_ = ret
+		var _0_a ImmutableArray
+		_ = _0_a
+		var _out0 ImmutableArray
+		_ = _out0
+		_out0 = (_this).ToArray()
+		_0_a = _out0
+		ret = (_0_a).Select(index)
+		return ret
+		return ret
+	}
+}
+func (_static *CompanionStruct_Sequence_) Drop(_this Sequence, lo uint32) Sequence {
+	{
+		var ret Sequence = (Sequence)(nil)
+		_ = ret
+		var _out0 Sequence
+		_ = _out0
+		_out0 = (_this).Subsequence(lo, (_this).Cardinality())
+		ret = _out0
+		return ret
+	}
+}
+func (_static *CompanionStruct_Sequence_) Take(_this Sequence, hi uint32) Sequence {
+	{
+		var ret Sequence = (Sequence)(nil)
+		_ = ret
+		var _out0 Sequence
+		_ = _out0
+		_out0 = (_this).Subsequence(uint32(0), hi)
+		ret = _out0
+		return ret
+	}
+}
+func (_static *CompanionStruct_Sequence_) Subsequence(_this Sequence, lo uint32, hi uint32) Sequence {
+	{
+		var ret Sequence = (Sequence)(nil)
+		_ = ret
+		var _0_a ImmutableArray
+		_ = _0_a
+		var _out0 ImmutableArray
+		_ = _out0
+		_out0 = (_this).ToArray()
+		_0_a = _out0
+		var _1_subarray ImmutableArray
+		_ = _1_subarray
+		var _out1 ImmutableArray
+		_ = _out1
+		_out1 = Companion_ImmutableArray_.CastTo_((_0_a).Subarray(lo, hi))
+		_1_subarray = Companion_ImmutableArray_.CastTo_(_out1)
+		var _nw0 *ArraySequence = New_ArraySequence_()
+		_ = _nw0
+		_nw0.Ctor__(_1_subarray, false)
+		ret = _nw0
+		return ret
+	}
+}
+func (_static *CompanionStruct_Sequence_) Elements(_this Sequence) Sequence {
+	{
+		return _this
+	}
+}
+func (_static *CompanionStruct_Sequence_) Create(cardinality uint32, initFn func(uint32) interface{}) Sequence {
+	var ret Sequence = (Sequence)(nil)
+	_ = ret
+	var _0_a NativeArray
+	_ = _0_a
+	var _out0 NativeArray
+	_ = _out0
+	_out0 = Companion_NativeArray_.CastTo_(Companion_NativeArray_.MakeWithInit(cardinality, func(coer0 func(uint32) interface{}) func(uint32) interface{} {
+		return func(arg0 uint32) interface{} {
+			return coer0(arg0)
+		}
+	}(initFn)))
+	_0_a = Companion_NativeArray_.CastTo_(_out0)
+	var _1_frozen ImmutableArray
+	_ = _1_frozen
+	var _out1 ImmutableArray
+	_ = _out1
+	_out1 = Companion_ImmutableArray_.CastTo_((_0_a).Freeze(cardinality))
+	_1_frozen = Companion_ImmutableArray_.CastTo_(_out1)
+	var _nw0 *ArraySequence = New_ArraySequence_()
+	_ = _nw0
+	_nw0.Ctor__(_1_frozen, false)
+	ret = _nw0
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) EqualUpTo(left Sequence, right Sequence, index uint32) bool {
+	var ret bool = false
+	_ = ret
+	var _hi0 uint32 = index
+	_ = _hi0
+	for _0_i := uint32(0); _0_i < _hi0; _0_i++ {
+		var _1_leftElement interface{}
+		_ = _1_leftElement
+		var _out0 interface{}
+		_ = _out0
+		_out0 = (left).Select(_0_i)
+		_1_leftElement = _out0
+		var _2_rightElement interface{}
+		_ = _2_rightElement
+		var _out1 interface{}
+		_ = _out1
+		_out1 = (right).Select(_0_i)
+		_2_rightElement = _out1
+		if !AreEqual(_1_leftElement, _2_rightElement) {
+			ret = false
+			return ret
+		}
+	}
+	ret = true
+	return ret
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) Equal(left Sequence, right Sequence) bool {
+	var ret bool = false
+	_ = ret
+	if ((left).Cardinality()) != ((right).Cardinality()) /* dircomp */ {
+		ret = false
+		return ret
+	}
+	var _out0 bool
+	_ = _out0
+	_out0 = Companion_Sequence_.EqualUpTo(left, right, (left).Cardinality())
+	ret = _out0
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) IsPrefixOf(left Sequence, right Sequence) bool {
+	var ret bool = false
+	_ = ret
+	if ((right).Cardinality()) < ((left).Cardinality()) {
+		ret = false
+		return ret
+	}
+	var _out0 bool
+	_ = _out0
+	_out0 = Companion_Sequence_.EqualUpTo(left, right, (left).Cardinality())
+	ret = _out0
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) IsProperPrefixOf(left Sequence, right Sequence) bool {
+	var ret bool = false
+	_ = ret
+	if ((right).Cardinality()) <= ((left).Cardinality()) {
+		ret = false
+		return ret
+	}
+	var _out0 bool
+	_ = _out0
+	_out0 = Companion_Sequence_.EqualUpTo(left, right, (left).Cardinality())
+	ret = _out0
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) Contains(s Sequence, t interface{}) bool {
+	var _hresult bool = false
+	_ = _hresult
+	var _hi0 uint32 = (s).Cardinality()
+	_ = _hi0
+	for _0_i := Companion_Default___.ZERO__SIZE(); _0_i < _hi0; _0_i++ {
+		var _1_element interface{}
+		_ = _1_element
+		var _out0 interface{}
+		_ = _out0
+		_out0 = (s).Select(_0_i)
+		_1_element = _out0
+		if AreEqual(_1_element, t) {
+			_hresult = true
+			return _hresult
+		}
+	}
+	_hresult = false
+	return _hresult
+	return _hresult
+}
+func (_static *CompanionStruct_Sequence_) Update(s Sequence, i uint32, t interface{}) Sequence {
+	var ret Sequence = (Sequence)(nil)
+	_ = ret
+	var _0_a ImmutableArray
+	_ = _0_a
+	var _out0 ImmutableArray
+	_ = _out0
+	_out0 = Companion_ImmutableArray_.CastTo_((s).ToArray())
+	_0_a = Companion_ImmutableArray_.CastTo_(_out0)
+	var _1_newValue NativeArray
+	_ = _1_newValue
+	var _out1 NativeArray
+	_ = _out1
+	_out1 = Companion_NativeArray_.CastTo_(Companion_NativeArray_.Copy(_0_a))
+	_1_newValue = Companion_NativeArray_.CastTo_(_out1)
+	(_1_newValue).Update(i, t)
+	var _2_newValueFrozen ImmutableArray
+	_ = _2_newValueFrozen
+	var _out2 ImmutableArray
+	_ = _out2
+	_out2 = Companion_ImmutableArray_.CastTo_((_1_newValue).Freeze((_1_newValue).Length()))
+	_2_newValueFrozen = Companion_ImmutableArray_.CastTo_(_out2)
+	var _nw0 *ArraySequence = New_ArraySequence_()
+	_ = _nw0
+	_nw0.Ctor__(_2_newValueFrozen, false)
+	ret = _nw0
+	return ret
+}
+func (_static *CompanionStruct_Sequence_) Concatenate(left Sequence, right Sequence) Sequence {
+	var ret Sequence = (Sequence)(nil)
+	_ = ret
+	if !(Companion_Default___.SizeAdditionInRange((left).Cardinality(), (right).Cardinality())) {
+		panic("dafnyRuntime.dfy[DafnyGo](594,6): " + (Companion_Sequence_.Concatenate(Companion_Sequence_.Concatenate(SeqOfString("Concatenation result cardinality would be larger than the maximum ("), Companion_Helpers_.DafnyValueToDafnyString(Companion_Default___.SIZE__T__MAX())), SeqOfString(")"))).String())
+	}
+	var _0_left_k Sequence
+	_ = _0_left_k
+	_0_left_k = left
+	if func(_is_5 Sequence) bool {
+		return InstanceOf(_is_5, (*LazySequence)(nil))
+	}(left) {
+		var _1_lazyLeft *LazySequence
+		_ = _1_lazyLeft
+		_1_lazyLeft = left.(*LazySequence)
+		var _out0 interface{}
+		_ = _out0
+		_out0 = ((_1_lazyLeft).Box()).Get()
+		_0_left_k = Companion_Sequence_.CastTo_(Companion_Sequence_.CastTo_(_out0))
+	}
+	var _2_right_k Sequence
+	_ = _2_right_k
+	_2_right_k = right
+	if func(_is_6 Sequence) bool {
+		return InstanceOf(_is_6, (*LazySequence)(nil))
+	}(right) {
+		var _3_lazyRight *LazySequence
+		_ = _3_lazyRight
+		_3_lazyRight = right.(*LazySequence)
+		var _out1 interface{}
+		_ = _out1
+		_out1 = ((_3_lazyRight).Box()).Get()
+		_2_right_k = Companion_Sequence_.CastTo_(Companion_Sequence_.CastTo_(_out1))
+	}
+	var _4_c *ConcatSequence
+	_ = _4_c
+	var _nw0 *ConcatSequence = New_ConcatSequence_()
+	_ = _nw0
+	_nw0.Ctor__(_0_left_k, _2_right_k)
+	_4_c = _nw0
+	var _nw1 *LazySequence = New_LazySequence_()
+	_ = _nw1
+	_nw1.Ctor__(_4_c)
+	ret = _nw1
+	return ret
+}
+
+type CompanionStruct_Sequence_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_Sequence_ = CompanionStruct_Sequence_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_Sequence_) CastTo_(x interface{}) Sequence {
+	var t Sequence
+	t, _ = x.(Sequence)
+	return t
+}
+
+// End of trait Sequence
+
+// Definition of trait Validatable
+type Validatable interface {
+	String() string
+}
+type CompanionStruct_Validatable_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_Validatable_ = CompanionStruct_Validatable_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_Validatable_) CastTo_(x interface{}) Validatable {
+	var t Validatable
+	t, _ = x.(Validatable)
+	return t
+}
+
+// End of trait Validatable
+
+// Definition of class Size__t
+type Size__t struct {
+}
+
+func New_Size__t_() *Size__t {
+	_this := Size__t{}
+
+	return &_this
+}
+
+type CompanionStruct_Size__t_ struct {
+}
+
+var Companion_Size__t_ = CompanionStruct_Size__t_{}
+
+func (*Size__t) String() string {
+	return "dafny.Size__t"
+}
+func (_this *Size__t) ParentTraits_() []*TraitID {
+	return [](*TraitID){}
+}
+
+var _ TraitOffspring = &Size__t{}
+
+func (_this *CompanionStruct_Size__t_) IntegerRange(lo Int, hi Int) Iterator {
+	iter := IntegerRange(lo, hi)
+	return func() (interface{}, bool) {
+		next, ok := iter()
+		if !ok {
+			return uint32(0), false
+		}
+		return next.(Int).Uint32(), true
+	}
+}
+func (_this *CompanionStruct_Size__t_) Witness() uint32 {
+	return (Zero).Uint32()
+}
+
+// End of class Size__t
+
+func Type_Size__t_() TypeDescriptor {
+	return type_Size__t_{}
+}
+
+type type_Size__t_ struct {
+}
+
+func (_this type_Size__t_) Default() interface{} {
+	return Companion_Size__t_.Witness()
+}
+
+func (_this type_Size__t_) String() string {
+	return "dafny.Size__t"
+}
+func (_this *CompanionStruct_Size__t_) Is_(__source uint32) bool {
+	var _0_x Int = IntOfUint32(__source)
+	_ = _0_x
+	return ((_0_x).Sign() != -1) && ((_0_x).Cmp(Companion_Default___.SIZE__T__LIMIT()) < 0)
+}
+
+// Definition of trait NativeArray
+type NativeArray interface {
+	String() string
+	Length() uint32
+	Select(i uint32) interface{}
+	Update(i uint32, t interface{})
+	UpdateSubarray(start uint32, other ImmutableArray)
+	Freeze(size uint32) ImmutableArray
+}
+type CompanionStruct_NativeArray_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_NativeArray_ = CompanionStruct_NativeArray_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_NativeArray_) CastTo_(x interface{}) NativeArray {
+	var t NativeArray
+	t, _ = x.(NativeArray)
+	return t
+}
+
+// End of trait NativeArray
+
+// Definition of datatype ArrayCell
+type ArrayCell struct {
+	Data_ArrayCell_
+}
+
+func (_this ArrayCell) Get_() Data_ArrayCell_ {
+	return _this.Data_ArrayCell_
+}
+
+type Data_ArrayCell_ interface {
+	isArrayCell()
+}
+
+type CompanionStruct_ArrayCell_ struct {
+}
+
+var Companion_ArrayCell_ = CompanionStruct_ArrayCell_{}
+
+type ArrayCell_Set struct {
+	Value interface{}
+}
+
+func (ArrayCell_Set) isArrayCell() {}
+
+func (CompanionStruct_ArrayCell_) Create_Set_(Value interface{}) ArrayCell {
+	return ArrayCell{ArrayCell_Set{Value}}
+}
+
+func (_this ArrayCell) Is_Set() bool {
+	_, ok := _this.Get_().(ArrayCell_Set)
+	return ok
+}
+
+type ArrayCell_Unset struct {
+}
+
+func (ArrayCell_Unset) isArrayCell() {}
+
+func (CompanionStruct_ArrayCell_) Create_Unset_() ArrayCell {
+	return ArrayCell{ArrayCell_Unset{}}
+}
+
+func (_this ArrayCell) Is_Unset() bool {
+	_, ok := _this.Get_().(ArrayCell_Unset)
+	return ok
+}
+
+func (CompanionStruct_ArrayCell_) Default() ArrayCell {
+	return Companion_ArrayCell_.Create_Unset_()
+}
+
+func (_this ArrayCell) Dtor_value() interface{} {
+	return _this.Get_().(ArrayCell_Set).Value
+}
+
+func (_this ArrayCell) String() string {
+	switch data := _this.Get_().(type) {
+	case nil:
+		return "null"
+	case ArrayCell_Set:
+		{
+			return "DafnyGo.ArrayCell.Set" + "(" + String(data.Value) + ")"
+		}
+	case ArrayCell_Unset:
+		{
+			return "DafnyGo.ArrayCell.Unset"
+		}
+	default:
+		{
+			return "<unexpected>"
+		}
+	}
+}
+
+func (_this ArrayCell) Equals(other ArrayCell) bool {
+	switch data1 := _this.Get_().(type) {
+	case ArrayCell_Set:
+		{
+			data2, ok := other.Get_().(ArrayCell_Set)
+			return ok && AreEqual(data1.Value, data2.Value)
+		}
+	case ArrayCell_Unset:
+		{
+			_, ok := other.Get_().(ArrayCell_Unset)
+			return ok
+		}
+	default:
+		{
+			return false // unexpected
+		}
+	}
+}
+
+func (_this ArrayCell) EqualsGeneric(other interface{}) bool {
+	typed, ok := other.(ArrayCell)
+	return ok && _this.Equals(typed)
+}
+
+func Type_ArrayCell_() TypeDescriptor {
+	return type_ArrayCell_{}
+}
+
+type type_ArrayCell_ struct {
+}
+
+func (_this type_ArrayCell_) Default() interface{} {
+	return Companion_ArrayCell_.Default()
+}
+
+func (_this type_ArrayCell_) String() string {
+	return "dafny.ArrayCell"
+}
+func (_this ArrayCell) ParentTraits_() []*TraitID {
+	return [](*TraitID){}
+}
+
+var _ TraitOffspring = ArrayCell{}
+
+// End of datatype ArrayCell
+
+// Definition of trait ImmutableArray
+type ImmutableArray interface {
+	String() string
+	Length() uint32
+	Select(index uint32) interface{}
+	Subarray(lo uint32, hi uint32) ImmutableArray
+}
+type CompanionStruct_ImmutableArray_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_ImmutableArray_ = CompanionStruct_ImmutableArray_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_ImmutableArray_) CastTo_(x interface{}) ImmutableArray {
+	var t ImmutableArray
+	t, _ = x.(ImmutableArray)
+	return t
+}
+
+// End of trait ImmutableArray
+
+// Definition of class Vector
+type Vector struct {
+	Storage NativeArray
+	Size    uint32
+}
+
+func New_Vector_() *Vector {
+	_this := Vector{}
+
+	_this.Storage = (NativeArray)(nil)
+	_this.Size = Companion_Size__t_.Witness()
+	return &_this
+}
+
+type CompanionStruct_Vector_ struct {
+}
+
+var Companion_Vector_ = CompanionStruct_Vector_{}
+
+func (_this *Vector) Equals(other *Vector) bool {
+	return _this == other
+}
+
+func (_this *Vector) EqualsGeneric(x interface{}) bool {
+	other, ok := x.(*Vector)
+	return ok && _this.Equals(other)
+}
+
+func (*Vector) String() string {
+	return "dafny.Vector"
+}
+
+func Type_Vector_(Type_T_ TypeDescriptor) TypeDescriptor {
+	return type_Vector_{Type_T_}
+}
+
+type type_Vector_ struct {
+	Type_T_ TypeDescriptor
+}
+
+func (_this type_Vector_) Default() interface{} {
+	return (*Vector)(nil)
+}
+
+func (_this type_Vector_) String() string {
+	return "dafny.Vector"
+}
+func (_this *Vector) ParentTraits_() []*TraitID {
+	return [](*TraitID){Companion_Validatable_.TraitID_}
+}
+
+var _ Validatable = &Vector{}
+var _ TraitOffspring = &Vector{}
+
+func (_this *Vector) Ctor__(length uint32) {
+	{
+		var _0_storage NativeArray
+		_ = _0_storage
+		var _out0 NativeArray
+		_ = _out0
+		_out0 = Companion_NativeArray_.CastTo_(Companion_NativeArray_.Make(length))
+		_0_storage = Companion_NativeArray_.CastTo_(_out0)
+		(_this).Storage = _0_storage
+		(_this).Size = uint32(0)
+	}
+}
+func (_this *Vector) Select(index uint32) interface{} {
+	{
+		return (_this.Storage).Select(index)
+	}
+}
+func (_this *Vector) Last() interface{} {
+	{
+		return (_this.Storage).Select((_this.Size) - (func() uint32 { return (uint32(1)) })())
+	}
+}
+func (_this *Vector) AddLast(t interface{}) {
+	{
+		(_this).EnsureCapacity((_this.Size) + (Companion_Default___.ONE__SIZE()))
+		(_this.Storage).Update(_this.Size, t)
+		(_this).Size = (_this.Size) + (uint32(1))
+	}
+}
+func (_this *Vector) Max(a uint32, b uint32) uint32 {
+	{
+		if (a) < (b) {
+			return b
+		} else {
+			return a
+		}
+	}
+}
+func (_this *Vector) EnsureCapacity(newMinCapacity uint32) {
+	{
+		if ((_this.Storage).Length()) >= (newMinCapacity) {
+			return
+		}
+		var _0_newCapacity uint32
+		_ = _0_newCapacity
+		_0_newCapacity = newMinCapacity
+		if ((_this.Storage).Length()) <= ((Companion_Default___.SIZE__T__MAX()) / (Companion_Default___.TWO__SIZE())) {
+			_0_newCapacity = (_this).Max(_0_newCapacity, ((_this.Storage).Length())*(Companion_Default___.TWO__SIZE()))
+		}
+		var _1_newStorage NativeArray
+		_ = _1_newStorage
+		var _out0 NativeArray
+		_ = _out0
+		_out0 = Companion_NativeArray_.CastTo_(Companion_NativeArray_.Make(_0_newCapacity))
+		_1_newStorage = Companion_NativeArray_.CastTo_(_out0)
+		var _2_values ImmutableArray
+		_ = _2_values
+		var _out1 ImmutableArray
+		_ = _out1
+		_out1 = Companion_ImmutableArray_.CastTo_((_this.Storage).Freeze(_this.Size))
+		_2_values = Companion_ImmutableArray_.CastTo_(_out1)
+		(_1_newStorage).UpdateSubarray(uint32(0), _2_values)
+		(_this).Storage = _1_newStorage
+	}
+}
+func (_this *Vector) RemoveLast() interface{} {
+	{
+		var t interface{} = (interface{})(nil)
+		_ = t
+		t = (_this.Storage).Select((_this.Size) - (func() uint32 { return (uint32(1)) })())
+		(_this).Size = (_this.Size) - (func() uint32 { return (uint32(1)) })()
+		return t
+	}
+}
+func (_this *Vector) Append(other ImmutableArray) {
+	{
+		var _0_newSize uint32
+		_ = _0_newSize
+		_0_newSize = (_this.Size) + ((other).Length())
+		(_this).EnsureCapacity(_0_newSize)
+		(_this.Storage).UpdateSubarray(_this.Size, other)
+		(_this).Size = (_this.Size) + ((other).Length())
+	}
+}
+func (_this *Vector) Freeze() ImmutableArray {
+	{
+		var ret ImmutableArray = (ImmutableArray)(nil)
+		_ = ret
+		var _out0 ImmutableArray
+		_ = _out0
+		_out0 = Companion_ImmutableArray_.CastTo_((_this.Storage).Freeze(_this.Size))
+		ret = Companion_ImmutableArray_.CastTo_(_out0)
+		return ret
+	}
+}
+
+// End of class Vector
+
+// Definition of trait AtomicBox
+type AtomicBox interface {
+	String() string
+	Get() interface{}
+	Put(t interface{})
+}
+type CompanionStruct_AtomicBox_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_AtomicBox_ = CompanionStruct_AtomicBox_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_AtomicBox_) CastTo_(x interface{}) AtomicBox {
+	var t AtomicBox
+	t, _ = x.(AtomicBox)
+	return t
+}
+
+// End of trait AtomicBox
+
+// Definition of class ArraySequence
+type ArraySequence struct {
+	_isString bool
+	_values   ImmutableArray
+}
+
+func New_ArraySequence_() *ArraySequence {
+	_this := ArraySequence{}
+
+	_this._isString = false
+	_this._values = (ImmutableArray)(nil)
+	return &_this
+}
+
+type CompanionStruct_ArraySequence_ struct {
+}
+
+var Companion_ArraySequence_ = CompanionStruct_ArraySequence_{}
+
+func Type_ArraySequence_(Type_T_ TypeDescriptor) TypeDescriptor {
+	return type_ArraySequence_{Type_T_}
+}
+
+type type_ArraySequence_ struct {
+	Type_T_ TypeDescriptor
+}
+
+func (_this type_ArraySequence_) Default() interface{} {
+	return (*ArraySequence)(nil)
+}
+
+func (_this type_ArraySequence_) String() string {
+	return "dafny.ArraySequence"
+}
+func (_this *ArraySequence) ParentTraits_() []*TraitID {
+	return [](*TraitID){Companion_Sequence_.TraitID_}
+}
+
+var _ Sequence = &ArraySequence{}
+var _ TraitOffspring = &ArraySequence{}
+
+func (_this *ArraySequence) Drop(lo uint32) Sequence {
+	var _out1 Sequence
+	_ = _out1
+	_out1 = Companion_Sequence_.Drop(_this, lo)
+	return _out1
+}
+func (_this *ArraySequence) Elements() Sequence {
+	return Companion_Sequence_.Elements(_this)
+}
+func (_this *ArraySequence) IsString() bool {
+	return _this._isString
+}
+func (_this *ArraySequence) IsString_set_(value bool) {
+	_this._isString = value
+}
+func (_this *ArraySequence) Select(index uint32) interface{} {
+	var _out1 interface{}
+	_ = _out1
+	_out1 = Companion_Sequence_.Select(_this, index)
+	return _out1
+}
+func (_this *ArraySequence) SetString() Sequence {
+	var _out0 Sequence
+	_ = _out0
+	_out0 = Companion_Sequence_.SetString(_this)
+	return _out0
+}
+func (_this *ArraySequence) Subsequence(lo uint32, hi uint32) Sequence {
+	var _out2 Sequence
+	_ = _out2
+	_out2 = Companion_Sequence_.Subsequence(_this, lo, hi)
+	return _out2
+}
+func (_this *ArraySequence) Take(hi uint32) Sequence {
+	var _out1 Sequence
+	_ = _out1
+	_out1 = Companion_Sequence_.Take(_this, hi)
+	return _out1
+}
+func (_this *ArraySequence) Ctor__(value ImmutableArray, isString bool) {
+	{
+		(_this)._values = value
+		(_this)._isString = isString
+	}
+}
+func (_this *ArraySequence) Cardinality() uint32 {
+	{
+		return ((_this).Values()).Length()
+	}
+}
+func (_this *ArraySequence) ToArray() ImmutableArray {
+	{
+		var ret ImmutableArray = (ImmutableArray)(nil)
+		_ = ret
+		ret = (_this).Values()
+		return ret
+		return ret
+	}
+}
+func (_this *ArraySequence) Values() ImmutableArray {
+	{
+		return _this._values
+	}
+}
+
+// End of class ArraySequence
+
+// Definition of class ConcatSequence
+type ConcatSequence struct {
+	_isString bool
+	_left     Sequence
+	_right    Sequence
+	_length   uint32
+}
+
+func New_ConcatSequence_() *ConcatSequence {
+	_this := ConcatSequence{}
+
+	_this._isString = false
+	_this._left = (Sequence)(nil)
+	_this._right = (Sequence)(nil)
+	_this._length = Companion_Size__t_.Witness()
+	return &_this
+}
+
+type CompanionStruct_ConcatSequence_ struct {
+}
+
+var Companion_ConcatSequence_ = CompanionStruct_ConcatSequence_{}
+
+func Type_ConcatSequence_(Type_T_ TypeDescriptor) TypeDescriptor {
+	return type_ConcatSequence_{Type_T_}
+}
+
+type type_ConcatSequence_ struct {
+	Type_T_ TypeDescriptor
+}
+
+func (_this type_ConcatSequence_) Default() interface{} {
+	return (*ConcatSequence)(nil)
+}
+
+func (_this type_ConcatSequence_) String() string {
+	return "dafny.ConcatSequence"
+}
+func (_this *ConcatSequence) ParentTraits_() []*TraitID {
+	return [](*TraitID){Companion_Sequence_.TraitID_}
+}
+
+var _ Sequence = &ConcatSequence{}
+var _ TraitOffspring = &ConcatSequence{}
+
+func (_this *ConcatSequence) Drop(lo uint32) Sequence {
+	var _out2 Sequence
+	_ = _out2
+	_out2 = Companion_Sequence_.Drop(_this, lo)
+	return _out2
+}
+func (_this *ConcatSequence) Elements() Sequence {
+	return Companion_Sequence_.Elements(_this)
+}
+func (_this *ConcatSequence) IsString() bool {
+	return _this._isString
+}
+func (_this *ConcatSequence) IsString_set_(value bool) {
+	_this._isString = value
+}
+func (_this *ConcatSequence) Select(index uint32) interface{} {
+	var _out2 interface{}
+	_ = _out2
+	_out2 = Companion_Sequence_.Select(_this, index)
+	return _out2
+}
+func (_this *ConcatSequence) SetString() Sequence {
+	var _out1 Sequence
+	_ = _out1
+	_out1 = Companion_Sequence_.SetString(_this)
+	return _out1
+}
+func (_this *ConcatSequence) Subsequence(lo uint32, hi uint32) Sequence {
+	var _out3 Sequence
+	_ = _out3
+	_out3 = Companion_Sequence_.Subsequence(_this, lo, hi)
+	return _out3
+}
+func (_this *ConcatSequence) Take(hi uint32) Sequence {
+	var _out2 Sequence
+	_ = _out2
+	_out2 = Companion_Sequence_.Take(_this, hi)
+	return _out2
+}
+func (_this *ConcatSequence) Ctor__(left Sequence, right Sequence) {
+	{
+		(_this)._left = left
+		(_this)._right = right
+		(_this)._length = ((left).Cardinality()) + ((right).Cardinality())
+		(_this)._isString = (left.IsString()) || (right.IsString())
+	}
+}
+func (_this *ConcatSequence) Cardinality() uint32 {
+	{
+		return (_this).Length()
+	}
+}
+func (_this *ConcatSequence) ToArray() ImmutableArray {
+	{
+		var ret ImmutableArray = (ImmutableArray)(nil)
+		_ = ret
+		var _0_builder *Vector
+		_ = _0_builder
+		var _nw0 *Vector = New_Vector_()
+		_ = _nw0
+		_nw0.Ctor__((_this).Length())
+		_0_builder = _nw0
+		var _1_stack *Vector
+		_ = _1_stack
+		var _nw1 *Vector = New_Vector_()
+		_ = _nw1
+		_nw1.Ctor__(Companion_Default___.TEN__SIZE())
+		_1_stack = _nw1
+		Companion_Default___.AppendOptimized(_0_builder, _this, _1_stack)
+		var _out0 ImmutableArray
+		_ = _out0
+		_out0 = Companion_ImmutableArray_.CastTo_((_0_builder).Freeze())
+		ret = Companion_ImmutableArray_.CastTo_(_out0)
+		return ret
+	}
+}
+func (_this *ConcatSequence) Left() Sequence {
+	{
+		return _this._left
+	}
+}
+func (_this *ConcatSequence) Right() Sequence {
+	{
+		return _this._right
+	}
+}
+func (_this *ConcatSequence) Length() uint32 {
+	{
+		return _this._length
+	}
+}
+
+// End of class ConcatSequence
+
+// Definition of class LazySequence
+type LazySequence struct {
+	_isString bool
+	_length   uint32
+	_box      AtomicBox
+}
+
+func New_LazySequence_() *LazySequence {
+	_this := LazySequence{}
+
+	_this._isString = false
+	_this._length = Companion_Size__t_.Witness()
+	_this._box = (AtomicBox)(nil)
+	return &_this
+}
+
+type CompanionStruct_LazySequence_ struct {
+}
+
+var Companion_LazySequence_ = CompanionStruct_LazySequence_{}
+
+func Type_LazySequence_(Type_T_ TypeDescriptor) TypeDescriptor {
+	return type_LazySequence_{Type_T_}
+}
+
+type type_LazySequence_ struct {
+	Type_T_ TypeDescriptor
+}
+
+func (_this type_LazySequence_) Default() interface{} {
+	return (*LazySequence)(nil)
+}
+
+func (_this type_LazySequence_) String() string {
+	return "dafny.LazySequence"
+}
+func (_this *LazySequence) ParentTraits_() []*TraitID {
+	return [](*TraitID){Companion_Sequence_.TraitID_}
+}
+
+var _ Sequence = &LazySequence{}
+var _ TraitOffspring = &LazySequence{}
+
+func (_this *LazySequence) Drop(lo uint32) Sequence {
+	var _out3 Sequence
+	_ = _out3
+	_out3 = Companion_Sequence_.Drop(_this, lo)
+	return _out3
+}
+func (_this *LazySequence) Elements() Sequence {
+	return Companion_Sequence_.Elements(_this)
+}
+func (_this *LazySequence) IsString() bool {
+	return _this._isString
+}
+func (_this *LazySequence) IsString_set_(value bool) {
+	_this._isString = value
+}
+func (_this *LazySequence) Select(index uint32) interface{} {
+	var _out3 interface{}
+	_ = _out3
+	_out3 = Companion_Sequence_.Select(_this, index)
+	return _out3
+}
+func (_this *LazySequence) SetString() Sequence {
+	var _out2 Sequence
+	_ = _out2
+	_out2 = Companion_Sequence_.SetString(_this)
+	return _out2
+}
+func (_this *LazySequence) Subsequence(lo uint32, hi uint32) Sequence {
+	var _out4 Sequence
+	_ = _out4
+	_out4 = Companion_Sequence_.Subsequence(_this, lo, hi)
+	return _out4
+}
+func (_this *LazySequence) Take(hi uint32) Sequence {
+	var _out3 Sequence
+	_ = _out3
+	_out3 = Companion_Sequence_.Take(_this, hi)
+	return _out3
+}
+func (_this *LazySequence) Ctor__(wrapped Sequence) {
+	{
+		var _0_box AtomicBox
+		_ = _0_box
+		var _out0 AtomicBox
+		_ = _out0
+		_out0 = Companion_AtomicBox_.CastTo_(Companion_AtomicBox_.Make(wrapped))
+		_0_box = Companion_AtomicBox_.CastTo_(_out0)
+		(_this)._box = _0_box
+		(_this)._length = (wrapped).Cardinality()
+		(_this)._isString = wrapped.IsString()
+	}
+}
+func (_this *LazySequence) Cardinality() uint32 {
+	{
+		return (_this).Length()
+	}
+}
+func (_this *LazySequence) ToArray() ImmutableArray {
+	{
+		var ret ImmutableArray = (ImmutableArray)(nil)
+		_ = ret
+		var _0_expr Sequence
+		_ = _0_expr
+		var _out0 interface{}
+		_ = _out0
+		_out0 = ((_this).Box()).Get()
+		_0_expr = Companion_Sequence_.CastTo_(Companion_Sequence_.CastTo_(_out0))
+		var _out1 ImmutableArray
+		_ = _out1
+		_out1 = Companion_ImmutableArray_.CastTo_((_0_expr).ToArray())
+		ret = Companion_ImmutableArray_.CastTo_(_out1)
+		var _1_arraySeq *ArraySequence
+		_ = _1_arraySeq
+		var _nw0 *ArraySequence = New_ArraySequence_()
+		_ = _nw0
+		_nw0.Ctor__(ret, false)
+		_1_arraySeq = _nw0
+		((_this).Box()).Put(_1_arraySeq)
+		return ret
+	}
+}
+func (_this *LazySequence) Length() uint32 {
+	{
+		return _this._length
+	}
+}
+func (_this *LazySequence) Box() AtomicBox {
+	{
+		return _this._box
+	}
+}
+
+// End of class LazySequence
+
+// Definition of trait Helpers
+type Helpers interface {
+	String() string
+}
+type CompanionStruct_Helpers_ struct {
+	TraitID_ *TraitID
+}
+
+var Companion_Helpers_ = CompanionStruct_Helpers_{
+	TraitID_: &TraitID{},
+}
+
+func (CompanionStruct_Helpers_) CastTo_(x interface{}) Helpers {
+	var t Helpers
+	t, _ = x.(Helpers)
+	return t
+}
+
+// End of trait Helpers
diff --git a/Source/DafnyRuntime/DafnyRuntimeGo/DafnyRuntime_test.go b/Source/DafnyRuntime/DafnyRuntimeGo/dafny/dafny_test.go
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeGo/DafnyRuntime_test.go
rename to Source/DafnyRuntime/DafnyRuntimeGo/dafny/dafny_test.go
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/Makefile b/Source/DafnyRuntime/DafnyRuntimeJava/Makefile
new file mode 100644
index 00000000000..4bd3c3b50fb
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/Makefile
@@ -0,0 +1,28 @@
+
+# Invoking the CLI this way just to stay platform-independent
+DAFNY = dotnet run --project ../../Dafny --no-build --
+
+GENERATED_SYSTEM_MODULE_SOURCE=../obj/systemModulePopulator-java/_System
+GENERATED_SYSTEM_MODULE_TARGET=src/main/dafny-generated/_System
+
+GENERATED_DAFNY_MODULE_SOURCE=../obj/systemModulePopulator-java/dafny
+GENERATED_DAFNY_MODULE_TARGET=src/main/dafny-generated/dafny
+
+all: check-system-module test
+
+test:
+	./gradlew test
+
+# TODO: Add --optimize-erasable-datatype-wrapper:false elsewhere too
+build-system-module:
+	$(DAFNY) translate java --no-verify --use-basename-for-filename --optimize-erasable-datatype-wrapper:false --system-module:OmitAllOtherModules ../systemModulePopulator.dfy --output:../obj/systemModulePopulator
+
+check-system-module: build-system-module
+	diff $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
+	diff $(GENERATED_DAFNY_MODULE_SOURCE) $(GENERATED_DAFNY_MODULE_TARGET)
+
+update-system-module: build-system-module
+	rm -rf $(GENERATED_SYSTEM_MODULE_TARGET)
+	cp -r $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
+	rm -rf $(GENERATED_DAFNY_MODULE_TARGET)
+	cp -r $(GENERATED_DAFNY_MODULE_SOURCE) $(GENERATED_DAFNY_MODULE_TARGET)
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/build.gradle b/Source/DafnyRuntime/DafnyRuntimeJava/build.gradle
index 4c57fe06cc5..0a9ef6cd115 100644
--- a/Source/DafnyRuntime/DafnyRuntimeJava/build.gradle
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'signing'
-    id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
+    id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
 }
 
 repositories {
@@ -17,7 +17,7 @@ dependencies {
 }
 
 group = 'org.dafny'
-version = '4.2.0'
+version = '4.9.2'
 sourceCompatibility = '1.8'
 
 java {
@@ -25,6 +25,10 @@ java {
     withSourcesJar()
 }
 
+sourceSets["main"].java {
+    srcDir("src/main/dafny-generated")
+}
+
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
     options.compilerArgs += ['-Xlint:unchecked']
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/gradle/wrapper/gradle-wrapper.jar b/Source/DafnyRuntime/DafnyRuntimeJava/gradle/wrapper/gradle-wrapper.jar
index c1962a79e29..2c3521197d7 100644
Binary files a/Source/DafnyRuntime/DafnyRuntimeJava/gradle/wrapper/gradle-wrapper.jar and b/Source/DafnyRuntime/DafnyRuntimeJava/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/gradle/wrapper/gradle-wrapper.properties b/Source/DafnyRuntime/DafnyRuntimeJava/gradle/wrapper/gradle-wrapper.properties
index 37aef8d3f0c..09523c0e549 100644
--- a/Source/DafnyRuntime/DafnyRuntimeJava/gradle/wrapper/gradle-wrapper.properties
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/gradlew b/Source/DafnyRuntime/DafnyRuntimeJava/gradlew
index a9fe6045e20..6e00a06d420 100755
--- a/Source/DafnyRuntime/DafnyRuntimeJava/gradlew
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +134,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/gradlew.bat b/Source/DafnyRuntime/DafnyRuntimeJava/gradlew.bat
index 230c6176a5d..3935562c938 100644
--- a/Source/DafnyRuntime/DafnyRuntimeJava/gradlew.bat
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/_System/nat.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/_System/nat.java
new file mode 100644
index 00000000000..77f213909c0
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/_System/nat.java
@@ -0,0 +1,17 @@
+// Class nat
+// Dafny class nat compiled into Java
+package _System;
+
+@SuppressWarnings({"unchecked", "deprecation"})
+public class nat {
+  public nat() {
+  }
+  public static boolean _Is(java.math.BigInteger __source) {
+    java.math.BigInteger _0_x = __source;
+    return (_0_x).signum() != -1;
+  }
+  private static final dafny.TypeDescriptor<java.math.BigInteger> _TYPE = dafny.TypeDescriptor.<java.math.BigInteger>referenceWithInitializer(java.math.BigInteger.class, () -> java.math.BigInteger.ZERO);
+  public static dafny.TypeDescriptor<java.math.BigInteger> _typeDescriptor() {
+    return (dafny.TypeDescriptor<java.math.BigInteger>) (dafny.TypeDescriptor<?>) _TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array1.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array1.java
new file mode 100644
index 00000000000..bfcc00bb830
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array1.java
@@ -0,0 +1,32 @@
+package dafny;
+
+public final class Array1<T> {
+  public final Object elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public Array1(dafny.TypeDescriptor<T> elmtType, int dim0, Object elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.elmts = elmts;
+  }
+  public T get(int i0) {
+    return elmtType.getArrayElement(elmts, i0);
+  }
+  public void set(int i0, T value) {
+    elmtType.setArrayElement(elmts, i0, value);
+  }
+  public void fill(T z) {
+    elmtType.fillArray(elmts, z);
+  }
+  public Array1 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array1<?>> TYPE = (dafny.TypeDescriptor<Array1<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array1.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array1<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array1<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array10.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array10.java
new file mode 100644
index 00000000000..cb371089fdf
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array10.java
@@ -0,0 +1,68 @@
+package dafny;
+
+public final class Array10<T> {
+  public final Object[][][][][][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public final int dim6;
+  public final int dim7;
+  public final int dim8;
+  public final int dim9;
+  public Array10(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, int dim6, int dim7, int dim8, int dim9, Object[][][][][][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.dim6 = dim6;
+    this.dim7 = dim7;
+    this.dim8 = dim8;
+    this.dim9 = dim9;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8], i9);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8], i9, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              for(int i5 = 0; i5 < dim5; i5++) {
+                for(int i6 = 0; i6 < dim6; i6++) {
+                  for(int i7 = 0; i7 < dim7; i7++) {
+                    for(int i8 = 0; i8 < dim8; i8++) {
+                      elmtType.fillArray(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8], z);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array10 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array10<?>> TYPE = (dafny.TypeDescriptor<Array10<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array10.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array10<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array10<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array11.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array11.java
new file mode 100644
index 00000000000..bc6b6f34db5
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array11.java
@@ -0,0 +1,72 @@
+package dafny;
+
+public final class Array11<T> {
+  public final Object[][][][][][][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public final int dim6;
+  public final int dim7;
+  public final int dim8;
+  public final int dim9;
+  public final int dim10;
+  public Array11(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, int dim6, int dim7, int dim8, int dim9, int dim10, Object[][][][][][][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.dim6 = dim6;
+    this.dim7 = dim7;
+    this.dim8 = dim8;
+    this.dim9 = dim9;
+    this.dim10 = dim10;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9], i10);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9], i10, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              for(int i5 = 0; i5 < dim5; i5++) {
+                for(int i6 = 0; i6 < dim6; i6++) {
+                  for(int i7 = 0; i7 < dim7; i7++) {
+                    for(int i8 = 0; i8 < dim8; i8++) {
+                      for(int i9 = 0; i9 < dim9; i9++) {
+                        elmtType.fillArray(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9], z);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array11 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array11<?>> TYPE = (dafny.TypeDescriptor<Array11<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array11.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array11<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array11<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array12.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array12.java
new file mode 100644
index 00000000000..b5fa24f6b7d
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array12.java
@@ -0,0 +1,76 @@
+package dafny;
+
+public final class Array12<T> {
+  public final Object[][][][][][][][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public final int dim6;
+  public final int dim7;
+  public final int dim8;
+  public final int dim9;
+  public final int dim10;
+  public final int dim11;
+  public Array12(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, int dim6, int dim7, int dim8, int dim9, int dim10, int dim11, Object[][][][][][][][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.dim6 = dim6;
+    this.dim7 = dim7;
+    this.dim8 = dim8;
+    this.dim9 = dim9;
+    this.dim10 = dim10;
+    this.dim11 = dim11;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10], i11);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10], i11, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              for(int i5 = 0; i5 < dim5; i5++) {
+                for(int i6 = 0; i6 < dim6; i6++) {
+                  for(int i7 = 0; i7 < dim7; i7++) {
+                    for(int i8 = 0; i8 < dim8; i8++) {
+                      for(int i9 = 0; i9 < dim9; i9++) {
+                        for(int i10 = 0; i10 < dim10; i10++) {
+                          elmtType.fillArray(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10], z);
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array12 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array12<?>> TYPE = (dafny.TypeDescriptor<Array12<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array12.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array12<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array12<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array13.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array13.java
new file mode 100644
index 00000000000..c7cff6e11f1
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array13.java
@@ -0,0 +1,80 @@
+package dafny;
+
+public final class Array13<T> {
+  public final Object[][][][][][][][][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public final int dim6;
+  public final int dim7;
+  public final int dim8;
+  public final int dim9;
+  public final int dim10;
+  public final int dim11;
+  public final int dim12;
+  public Array13(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, int dim6, int dim7, int dim8, int dim9, int dim10, int dim11, int dim12, Object[][][][][][][][][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.dim6 = dim6;
+    this.dim7 = dim7;
+    this.dim8 = dim8;
+    this.dim9 = dim9;
+    this.dim10 = dim10;
+    this.dim11 = dim11;
+    this.dim12 = dim12;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11], i12);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11], i12, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              for(int i5 = 0; i5 < dim5; i5++) {
+                for(int i6 = 0; i6 < dim6; i6++) {
+                  for(int i7 = 0; i7 < dim7; i7++) {
+                    for(int i8 = 0; i8 < dim8; i8++) {
+                      for(int i9 = 0; i9 < dim9; i9++) {
+                        for(int i10 = 0; i10 < dim10; i10++) {
+                          for(int i11 = 0; i11 < dim11; i11++) {
+                            elmtType.fillArray(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11], z);
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array13 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array13<?>> TYPE = (dafny.TypeDescriptor<Array13<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array13.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array13<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array13<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array14.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array14.java
new file mode 100644
index 00000000000..91bdb5d9ac3
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array14.java
@@ -0,0 +1,84 @@
+package dafny;
+
+public final class Array14<T> {
+  public final Object[][][][][][][][][][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public final int dim6;
+  public final int dim7;
+  public final int dim8;
+  public final int dim9;
+  public final int dim10;
+  public final int dim11;
+  public final int dim12;
+  public final int dim13;
+  public Array14(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, int dim6, int dim7, int dim8, int dim9, int dim10, int dim11, int dim12, int dim13, Object[][][][][][][][][][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.dim6 = dim6;
+    this.dim7 = dim7;
+    this.dim8 = dim8;
+    this.dim9 = dim9;
+    this.dim10 = dim10;
+    this.dim11 = dim11;
+    this.dim12 = dim12;
+    this.dim13 = dim13;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11][i12], i13);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11][i12], i13, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              for(int i5 = 0; i5 < dim5; i5++) {
+                for(int i6 = 0; i6 < dim6; i6++) {
+                  for(int i7 = 0; i7 < dim7; i7++) {
+                    for(int i8 = 0; i8 < dim8; i8++) {
+                      for(int i9 = 0; i9 < dim9; i9++) {
+                        for(int i10 = 0; i10 < dim10; i10++) {
+                          for(int i11 = 0; i11 < dim11; i11++) {
+                            for(int i12 = 0; i12 < dim12; i12++) {
+                              elmtType.fillArray(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11][i12], z);
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array14 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array14<?>> TYPE = (dafny.TypeDescriptor<Array14<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array14.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array14<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array14<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array15.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array15.java
new file mode 100644
index 00000000000..4f992cfad6d
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array15.java
@@ -0,0 +1,88 @@
+package dafny;
+
+public final class Array15<T> {
+  public final Object[][][][][][][][][][][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public final int dim6;
+  public final int dim7;
+  public final int dim8;
+  public final int dim9;
+  public final int dim10;
+  public final int dim11;
+  public final int dim12;
+  public final int dim13;
+  public final int dim14;
+  public Array15(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, int dim6, int dim7, int dim8, int dim9, int dim10, int dim11, int dim12, int dim13, int dim14, Object[][][][][][][][][][][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.dim6 = dim6;
+    this.dim7 = dim7;
+    this.dim8 = dim8;
+    this.dim9 = dim9;
+    this.dim10 = dim10;
+    this.dim11 = dim11;
+    this.dim12 = dim12;
+    this.dim13 = dim13;
+    this.dim14 = dim14;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11][i12][i13], i14);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11][i12][i13], i14, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              for(int i5 = 0; i5 < dim5; i5++) {
+                for(int i6 = 0; i6 < dim6; i6++) {
+                  for(int i7 = 0; i7 < dim7; i7++) {
+                    for(int i8 = 0; i8 < dim8; i8++) {
+                      for(int i9 = 0; i9 < dim9; i9++) {
+                        for(int i10 = 0; i10 < dim10; i10++) {
+                          for(int i11 = 0; i11 < dim11; i11++) {
+                            for(int i12 = 0; i12 < dim12; i12++) {
+                              for(int i13 = 0; i13 < dim13; i13++) {
+                                elmtType.fillArray(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11][i12][i13], z);
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array15 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array15<?>> TYPE = (dafny.TypeDescriptor<Array15<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array15.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array15<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array15<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array16.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array16.java
new file mode 100644
index 00000000000..9c99c4573b7
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array16.java
@@ -0,0 +1,92 @@
+package dafny;
+
+public final class Array16<T> {
+  public final Object[][][][][][][][][][][][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public final int dim6;
+  public final int dim7;
+  public final int dim8;
+  public final int dim9;
+  public final int dim10;
+  public final int dim11;
+  public final int dim12;
+  public final int dim13;
+  public final int dim14;
+  public final int dim15;
+  public Array16(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, int dim6, int dim7, int dim8, int dim9, int dim10, int dim11, int dim12, int dim13, int dim14, int dim15, Object[][][][][][][][][][][][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.dim6 = dim6;
+    this.dim7 = dim7;
+    this.dim8 = dim8;
+    this.dim9 = dim9;
+    this.dim10 = dim10;
+    this.dim11 = dim11;
+    this.dim12 = dim12;
+    this.dim13 = dim13;
+    this.dim14 = dim14;
+    this.dim15 = dim15;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, int i15) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11][i12][i13][i14], i15);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14, int i15, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11][i12][i13][i14], i15, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              for(int i5 = 0; i5 < dim5; i5++) {
+                for(int i6 = 0; i6 < dim6; i6++) {
+                  for(int i7 = 0; i7 < dim7; i7++) {
+                    for(int i8 = 0; i8 < dim8; i8++) {
+                      for(int i9 = 0; i9 < dim9; i9++) {
+                        for(int i10 = 0; i10 < dim10; i10++) {
+                          for(int i11 = 0; i11 < dim11; i11++) {
+                            for(int i12 = 0; i12 < dim12; i12++) {
+                              for(int i13 = 0; i13 < dim13; i13++) {
+                                for(int i14 = 0; i14 < dim14; i14++) {
+                                  elmtType.fillArray(elmts[i0][i1][i2][i3][i4][i5][i6][i7][i8][i9][i10][i11][i12][i13][i14], z);
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array16 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array16<?>> TYPE = (dafny.TypeDescriptor<Array16<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array16.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array16<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array16<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array2.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array2.java
new file mode 100644
index 00000000000..839a934aa40
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array2.java
@@ -0,0 +1,36 @@
+package dafny;
+
+public final class Array2<T> {
+  public final Object[] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public Array2(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, Object[] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1) {
+    return elmtType.getArrayElement(elmts[i0], i1);
+  }
+  public void set(int i0, int i1, T value) {
+    elmtType.setArrayElement(elmts[i0], i1, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      elmtType.fillArray(elmts[i0], z);
+    }
+  }
+  public Array2 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array2<?>> TYPE = (dafny.TypeDescriptor<Array2<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array2.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array2<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array2<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array3.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array3.java
new file mode 100644
index 00000000000..a37bdbf77b8
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array3.java
@@ -0,0 +1,40 @@
+package dafny;
+
+public final class Array3<T> {
+  public final Object[][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public Array3(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, Object[][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2) {
+    return elmtType.getArrayElement(elmts[i0][i1], i2);
+  }
+  public void set(int i0, int i1, int i2, T value) {
+    elmtType.setArrayElement(elmts[i0][i1], i2, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        elmtType.fillArray(elmts[i0][i1], z);
+      }
+    }
+  }
+  public Array3 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array3<?>> TYPE = (dafny.TypeDescriptor<Array3<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array3.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array3<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array3<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array4.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array4.java
new file mode 100644
index 00000000000..6dd42f967c2
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array4.java
@@ -0,0 +1,44 @@
+package dafny;
+
+public final class Array4<T> {
+  public final Object[][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public Array4(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, Object[][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2], i3);
+  }
+  public void set(int i0, int i1, int i2, int i3, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2], i3, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          elmtType.fillArray(elmts[i0][i1][i2], z);
+        }
+      }
+    }
+  }
+  public Array4 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array4<?>> TYPE = (dafny.TypeDescriptor<Array4<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array4.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array4<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array4<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array5.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array5.java
new file mode 100644
index 00000000000..b8b833a6419
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array5.java
@@ -0,0 +1,48 @@
+package dafny;
+
+public final class Array5<T> {
+  public final Object[][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public Array5(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, Object[][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3], i4);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3], i4, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            elmtType.fillArray(elmts[i0][i1][i2][i3], z);
+          }
+        }
+      }
+    }
+  }
+  public Array5 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array5<?>> TYPE = (dafny.TypeDescriptor<Array5<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array5.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array5<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array5<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array6.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array6.java
new file mode 100644
index 00000000000..f3bb5d83601
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array6.java
@@ -0,0 +1,52 @@
+package dafny;
+
+public final class Array6<T> {
+  public final Object[][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public Array6(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, Object[][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4], i5);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4], i5, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              elmtType.fillArray(elmts[i0][i1][i2][i3][i4], z);
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array6 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array6<?>> TYPE = (dafny.TypeDescriptor<Array6<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array6.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array6<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array6<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array7.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array7.java
new file mode 100644
index 00000000000..a369d43773e
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array7.java
@@ -0,0 +1,56 @@
+package dafny;
+
+public final class Array7<T> {
+  public final Object[][][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public final int dim6;
+  public Array7(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, int dim6, Object[][][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.dim6 = dim6;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5, int i6) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4][i5], i6);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, int i6, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4][i5], i6, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              for(int i5 = 0; i5 < dim5; i5++) {
+                elmtType.fillArray(elmts[i0][i1][i2][i3][i4][i5], z);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array7 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array7<?>> TYPE = (dafny.TypeDescriptor<Array7<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array7.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array7<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array7<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array8.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array8.java
new file mode 100644
index 00000000000..bc18db7499a
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array8.java
@@ -0,0 +1,60 @@
+package dafny;
+
+public final class Array8<T> {
+  public final Object[][][][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public final int dim6;
+  public final int dim7;
+  public Array8(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, int dim6, int dim7, Object[][][][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.dim6 = dim6;
+    this.dim7 = dim7;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6], i7);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6], i7, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              for(int i5 = 0; i5 < dim5; i5++) {
+                for(int i6 = 0; i6 < dim6; i6++) {
+                  elmtType.fillArray(elmts[i0][i1][i2][i3][i4][i5][i6], z);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array8 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array8<?>> TYPE = (dafny.TypeDescriptor<Array8<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array8.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array8<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array8<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array9.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array9.java
new file mode 100644
index 00000000000..194305bc88b
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Array9.java
@@ -0,0 +1,64 @@
+package dafny;
+
+public final class Array9<T> {
+  public final Object[][][][][][][][] elmts;
+  private final dafny.TypeDescriptor<T> elmtType;
+  public final int dim0;
+  public final int dim1;
+  public final int dim2;
+  public final int dim3;
+  public final int dim4;
+  public final int dim5;
+  public final int dim6;
+  public final int dim7;
+  public final int dim8;
+  public Array9(dafny.TypeDescriptor<T> elmtType, int dim0, int dim1, int dim2, int dim3, int dim4, int dim5, int dim6, int dim7, int dim8, Object[][][][][][][][] elmts) {
+    assert elmts.getClass().isArray();
+    this.elmtType = elmtType;
+    this.dim0 = dim0;
+    this.dim1 = dim1;
+    this.dim2 = dim2;
+    this.dim3 = dim3;
+    this.dim4 = dim4;
+    this.dim5 = dim5;
+    this.dim6 = dim6;
+    this.dim7 = dim7;
+    this.dim8 = dim8;
+    this.elmts = elmts;
+  }
+  public T get(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8) {
+    return elmtType.getArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7], i8);
+  }
+  public void set(int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, T value) {
+    elmtType.setArrayElement(elmts[i0][i1][i2][i3][i4][i5][i6][i7], i8, value);
+  }
+  public void fill(T z) {
+    for(int i0 = 0; i0 < dim0; i0++) {
+      for(int i1 = 0; i1 < dim1; i1++) {
+        for(int i2 = 0; i2 < dim2; i2++) {
+          for(int i3 = 0; i3 < dim3; i3++) {
+            for(int i4 = 0; i4 < dim4; i4++) {
+              for(int i5 = 0; i5 < dim5; i5++) {
+                for(int i6 = 0; i6 < dim6; i6++) {
+                  for(int i7 = 0; i7 < dim7; i7++) {
+                    elmtType.fillArray(elmts[i0][i1][i2][i3][i4][i5][i6][i7], z);
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  public Array9 fillThenReturn(T z) {
+    fill(z);
+    return this;
+  }
+  @SuppressWarnings({"unchecked", "deprecation"})
+  private static final dafny.TypeDescriptor<Array9<?>> TYPE = (dafny.TypeDescriptor<Array9<?>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Array9.class);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T> dafny.TypeDescriptor<Array9<T>> _typeDescriptor() {
+    return (dafny.TypeDescriptor<Array9<T>>) (dafny.TypeDescriptor<?>) TYPE;
+  }
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function0.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function0.java
new file mode 100644
index 00000000000..b932791a604
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function0.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function0<T0> {
+  public T0 apply();
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0> dafny.TypeDescriptor<Function0<T0>> _typeDescriptor(dafny.TypeDescriptor<T0> t0) {
+    return (dafny.TypeDescriptor<Function0<T0>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function0.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function1.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function1.java
new file mode 100644
index 00000000000..99c1b8e45e4
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function1.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function1<T0, T1> {
+  public T1 apply(T0 t0);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1> dafny.TypeDescriptor<Function1<T0, T1>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1) {
+    return (dafny.TypeDescriptor<Function1<T0, T1>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function1.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function10.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function10.java
new file mode 100644
index 00000000000..5a94c7f4aaf
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function10.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+  public T10 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> dafny.TypeDescriptor<Function10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6, dafny.TypeDescriptor<T7> t7, dafny.TypeDescriptor<T8> t8, dafny.TypeDescriptor<T9> t9, dafny.TypeDescriptor<T10> t10) {
+    return (dafny.TypeDescriptor<Function10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function10.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function11.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function11.java
new file mode 100644
index 00000000000..e8421709afe
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function11.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+  public T11 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> dafny.TypeDescriptor<Function11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6, dafny.TypeDescriptor<T7> t7, dafny.TypeDescriptor<T8> t8, dafny.TypeDescriptor<T9> t9, dafny.TypeDescriptor<T10> t10, dafny.TypeDescriptor<T11> t11) {
+    return (dafny.TypeDescriptor<Function11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function11.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function12.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function12.java
new file mode 100644
index 00000000000..c465356ea8a
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function12.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+  public T12 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> dafny.TypeDescriptor<Function12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6, dafny.TypeDescriptor<T7> t7, dafny.TypeDescriptor<T8> t8, dafny.TypeDescriptor<T9> t9, dafny.TypeDescriptor<T10> t10, dafny.TypeDescriptor<T11> t11, dafny.TypeDescriptor<T12> t12) {
+    return (dafny.TypeDescriptor<Function12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function12.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function13.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function13.java
new file mode 100644
index 00000000000..c2397148161
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function13.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+  public T13 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> dafny.TypeDescriptor<Function13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6, dafny.TypeDescriptor<T7> t7, dafny.TypeDescriptor<T8> t8, dafny.TypeDescriptor<T9> t9, dafny.TypeDescriptor<T10> t10, dafny.TypeDescriptor<T11> t11, dafny.TypeDescriptor<T12> t12, dafny.TypeDescriptor<T13> t13) {
+    return (dafny.TypeDescriptor<Function13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function13.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function14.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function14.java
new file mode 100644
index 00000000000..a4a23131c3a
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function14.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+  public T14 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> dafny.TypeDescriptor<Function14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6, dafny.TypeDescriptor<T7> t7, dafny.TypeDescriptor<T8> t8, dafny.TypeDescriptor<T9> t9, dafny.TypeDescriptor<T10> t10, dafny.TypeDescriptor<T11> t11, dafny.TypeDescriptor<T12> t12, dafny.TypeDescriptor<T13> t13, dafny.TypeDescriptor<T14> t14) {
+    return (dafny.TypeDescriptor<Function14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function14.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function15.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function15.java
new file mode 100644
index 00000000000..b5ee2ae15f5
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function15.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+  public T15 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> dafny.TypeDescriptor<Function15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6, dafny.TypeDescriptor<T7> t7, dafny.TypeDescriptor<T8> t8, dafny.TypeDescriptor<T9> t9, dafny.TypeDescriptor<T10> t10, dafny.TypeDescriptor<T11> t11, dafny.TypeDescriptor<T12> t12, dafny.TypeDescriptor<T13> t13, dafny.TypeDescriptor<T14> t14, dafny.TypeDescriptor<T15> t15) {
+    return (dafny.TypeDescriptor<Function15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function15.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function16.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function16.java
new file mode 100644
index 00000000000..801249c5f71
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function16.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+  public T16 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> dafny.TypeDescriptor<Function16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6, dafny.TypeDescriptor<T7> t7, dafny.TypeDescriptor<T8> t8, dafny.TypeDescriptor<T9> t9, dafny.TypeDescriptor<T10> t10, dafny.TypeDescriptor<T11> t11, dafny.TypeDescriptor<T12> t12, dafny.TypeDescriptor<T13> t13, dafny.TypeDescriptor<T14> t14, dafny.TypeDescriptor<T15> t15, dafny.TypeDescriptor<T16> t16) {
+    return (dafny.TypeDescriptor<Function16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function16.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function2.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function2.java
new file mode 100644
index 00000000000..6bbbe8ddcc3
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function2.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function2<T0, T1, T2> {
+  public T2 apply(T0 t0, T1 t1);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2> dafny.TypeDescriptor<Function2<T0, T1, T2>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2) {
+    return (dafny.TypeDescriptor<Function2<T0, T1, T2>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function2.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function3.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function3.java
new file mode 100644
index 00000000000..636fdac5e22
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function3.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function3<T0, T1, T2, T3> {
+  public T3 apply(T0 t0, T1 t1, T2 t2);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3> dafny.TypeDescriptor<Function3<T0, T1, T2, T3>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3) {
+    return (dafny.TypeDescriptor<Function3<T0, T1, T2, T3>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function3.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function4.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function4.java
new file mode 100644
index 00000000000..e21cfbf9f95
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function4.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function4<T0, T1, T2, T3, T4> {
+  public T4 apply(T0 t0, T1 t1, T2 t2, T3 t3);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4> dafny.TypeDescriptor<Function4<T0, T1, T2, T3, T4>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4) {
+    return (dafny.TypeDescriptor<Function4<T0, T1, T2, T3, T4>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function4.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function5.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function5.java
new file mode 100644
index 00000000000..16d22535ba8
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function5.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function5<T0, T1, T2, T3, T4, T5> {
+  public T5 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5> dafny.TypeDescriptor<Function5<T0, T1, T2, T3, T4, T5>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5) {
+    return (dafny.TypeDescriptor<Function5<T0, T1, T2, T3, T4, T5>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function5.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function6.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function6.java
new file mode 100644
index 00000000000..fccc77fdbaf
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function6.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function6<T0, T1, T2, T3, T4, T5, T6> {
+  public T6 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6> dafny.TypeDescriptor<Function6<T0, T1, T2, T3, T4, T5, T6>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6) {
+    return (dafny.TypeDescriptor<Function6<T0, T1, T2, T3, T4, T5, T6>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function6.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function7.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function7.java
new file mode 100644
index 00000000000..05a2707dcf4
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function7.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function7<T0, T1, T2, T3, T4, T5, T6, T7> {
+  public T7 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6, T7> dafny.TypeDescriptor<Function7<T0, T1, T2, T3, T4, T5, T6, T7>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6, dafny.TypeDescriptor<T7> t7) {
+    return (dafny.TypeDescriptor<Function7<T0, T1, T2, T3, T4, T5, T6, T7>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function7.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function8.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function8.java
new file mode 100644
index 00000000000..401137fdda2
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function8.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function8<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+  public T8 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6, T7, T8> dafny.TypeDescriptor<Function8<T0, T1, T2, T3, T4, T5, T6, T7, T8>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6, dafny.TypeDescriptor<T7> t7, dafny.TypeDescriptor<T8> t8) {
+    return (dafny.TypeDescriptor<Function8<T0, T1, T2, T3, T4, T5, T6, T7, T8>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function8.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function9.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function9.java
new file mode 100644
index 00000000000..d11edbadb72
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Function9.java
@@ -0,0 +1,9 @@
+package dafny;
+
+@FunctionalInterface
+public interface Function9<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+  public T9 apply(T0 t0, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8);
+  @SuppressWarnings({"unchecked", "deprecation"})
+  public static <T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> dafny.TypeDescriptor<Function9<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>> _typeDescriptor(dafny.TypeDescriptor<T0> t0, dafny.TypeDescriptor<T1> t1, dafny.TypeDescriptor<T2> t2, dafny.TypeDescriptor<T3> t3, dafny.TypeDescriptor<T4> t4, dafny.TypeDescriptor<T5> t5, dafny.TypeDescriptor<T6> t6, dafny.TypeDescriptor<T7> t7, dafny.TypeDescriptor<T8> t8, dafny.TypeDescriptor<T9> t9) {
+    return (dafny.TypeDescriptor<Function9<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>>) (dafny.TypeDescriptor<?>) dafny.TypeDescriptor.reference(Function9.class);}
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple0.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple0.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple0.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple0.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple1.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple1.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple1.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple1.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple10.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple10.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple10.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple10.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple11.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple11.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple11.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple11.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple12.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple12.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple12.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple12.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple13.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple13.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple13.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple13.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple14.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple14.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple14.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple14.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple15.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple15.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple15.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple15.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple16.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple16.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple16.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple16.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple17.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple17.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple17.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple17.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple18.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple18.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple18.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple18.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple19.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple19.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple19.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple19.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple2.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple2.java
similarity index 95%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple2.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple2.java
index 9df62d26374..2c0db5ab5ca 100644
--- a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple2.java
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple2.java
@@ -1,6 +1,3 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
 package dafny;
 
 @SuppressWarnings({"unchecked", "deprecation"})
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple20.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple20.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple20.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple20.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple3.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple3.java
similarity index 96%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple3.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple3.java
index 911a43a2f41..73951a83114 100644
--- a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple3.java
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple3.java
@@ -1,6 +1,3 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
 package dafny;
 
 @SuppressWarnings({"unchecked", "deprecation"})
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple4.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple4.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple4.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple4.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple5.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple5.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple5.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple5.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple6.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple6.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple6.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple6.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple7.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple7.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple7.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple7.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple8.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple8.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple8.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple8.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple9.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple9.java
similarity index 100%
rename from Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Tuple9.java
rename to Source/DafnyRuntime/DafnyRuntimeJava/src/main/dafny-generated/dafny/Tuple9.java
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/BigRational.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/BigRational.java
index cdf0e091084..79af8aa29e2 100644
--- a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/BigRational.java
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/BigRational.java
@@ -132,6 +132,11 @@ public BigInteger ToBigInteger() {
         }
     }
 
+    public boolean isInteger() {
+      BigRational floored = new BigRational(this.ToBigInteger(), BigInteger.ONE);
+      return this.equals(floored);
+    }
+
     // In order to compare, add, and subtract fractions, they must have the same denominator. This computes the
     // common denominator of the fractions, and returns a tuple containing:
     // aa: the numerator for a when multiplied by the common denominator
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/CodePoint.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/CodePoint.java
index 71f38eef4f5..fa24e688f61 100644
--- a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/CodePoint.java
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/CodePoint.java
@@ -1,5 +1,7 @@
 package dafny;
 
+import java.math.BigInteger;
+
 /**
  * An int wrapper type just like java.lang.Integer,
  * but used as a more type-safe reference to a Unicode scalar value
@@ -39,6 +41,12 @@ private CodePoint(int value) {
         this.value = value;
     }
 
+     public static boolean isCodePoint(BigInteger i) {
+        return
+            (i.signum() != -1 && i.compareTo(BigInteger.valueOf(0xD800)) < 0) ||
+            (i.compareTo(BigInteger.valueOf(0xE000)) >= 0 && i.compareTo(BigInteger.valueOf(0x11_0000)) < 0);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == null || !(obj instanceof CodePoint)) {
@@ -65,4 +73,4 @@ public int value() {
     public String toString() {
         return Helpers.ToCharLiteral(value);
     }
-}
\ No newline at end of file
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Helpers.java b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Helpers.java
index 9e78dc8c177..a7642664e66 100644
--- a/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Helpers.java
+++ b/Source/DafnyRuntime/DafnyRuntimeJava/src/main/java/dafny/Helpers.java
@@ -275,6 +275,11 @@ public static BigInteger unsignedToBigInteger(int i){
     public static BigInteger unsignedToBigInteger(long l){
         return unsignedToBigInteger_h(BigInteger.valueOf(l), ULONG_LIMIT);
     }
+    
+    // Alias maintained only for backwards compatability
+    public static BigInteger unsignedLongToBigInteger(long l) {
+        return unsignedToBigInteger(l);
+    }
 
     public static byte divideUnsignedByte(byte a, byte b) {
         return (byte)Integer.divideUnsigned(((int)a) & 0xFF, ((int)b) & 0xFF);
diff --git a/Source/DafnyRuntime/DafnyRuntime.js b/Source/DafnyRuntime/DafnyRuntimeJs/DafnyRuntime.js
similarity index 98%
rename from Source/DafnyRuntime/DafnyRuntime.js
rename to Source/DafnyRuntime/DafnyRuntimeJs/DafnyRuntime.js
index 44bff912f28..c1aa5d54f0e 100644
--- a/Source/DafnyRuntime/DafnyRuntime.js
+++ b/Source/DafnyRuntime/DafnyRuntimeJs/DafnyRuntime.js
@@ -488,6 +488,11 @@ let _dafny = (function() {
     toString() {
       return "'" + $module.escapeCharacter(this) + "'";
     }
+    static isCodePoint(i) {
+      return (
+        (_dafny.ZERO.isLessThanOrEqualTo(i) && i.isLessThan(new BigNumber(0xD800))) ||
+        (new BigNumber(0xE000).isLessThanOrEqualTo(i) && i.isLessThan(new BigNumber(0x11_0000))))
+    }
   }
   $module.Seq = class Seq extends Array {
     constructor(...elems) {
@@ -636,6 +641,13 @@ let _dafny = (function() {
     }
     update(k, v) {
       let m = this.slice();
+      m.updateUnsafe(k, v);
+      return m;
+    }
+    // Similar to update, but make the modification in-place.
+    // Meant to be used in the map constructor.
+    updateUnsafe(k, v) {
+      let m = this;
       let i = m.findIndex(k);
       m[i] = [k, v];
       return m;
@@ -812,7 +824,7 @@ let _dafny = (function() {
       } else {
         return undefined;
       }
-}
+    }
     toBigNumber() {
       if (this.num.isZero() || this.den.isEqualTo(1)) {
         return this.num;
@@ -822,6 +834,9 @@ let _dafny = (function() {
         return this.num.minus(this.den).plus(1).dividedToIntegerBy(this.den);
       }
     }
+    isInteger() {
+      return this.equals(new _dafny.BigRational(this.toBigNumber(), _dafny.ONE));
+    }
     // Returns values such that aa/dd == a and bb/dd == b.
     normalize(b) {
       let a = this;
diff --git a/Source/DafnyRuntime/DafnyRuntimeJs/DafnyRuntimeSystemModule.js b/Source/DafnyRuntime/DafnyRuntimeJs/DafnyRuntimeSystemModule.js
new file mode 100644
index 00000000000..69c51e90a86
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJs/DafnyRuntimeSystemModule.js
@@ -0,0 +1,18 @@
+// Dafny program systemModulePopulator.dfy compiled into JavaScript
+let _System = (function() {
+  let $module = {};
+
+  $module.nat = class nat {
+    constructor () {
+    }
+    static get Default() {
+      return _dafny.ZERO;
+    }
+    static _Is(__source) {
+      let _0_x = (__source);
+      return (_dafny.ZERO).isLessThanOrEqualTo(_0_x);
+    }
+  };
+
+  return $module;
+})(); // end of module _System
diff --git a/Source/DafnyRuntime/DafnyRuntimeJs/Makefile b/Source/DafnyRuntime/DafnyRuntimeJs/Makefile
new file mode 100644
index 00000000000..4728cbd2a47
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeJs/Makefile
@@ -0,0 +1,17 @@
+
+# Invoking the CLI this way just to stay platform-independent
+DAFNY = dotnet run --project ../../Dafny --no-build --
+
+GENERATED_SYSTEM_MODULE_SOURCE=../obj/systemModulePopulator.js
+GENERATED_SYSTEM_MODULE_TARGET=DafnyRuntimeSystemModule.js
+
+all: check-system-module
+
+build-system-module:
+	$(DAFNY) translate js --no-verify --use-basename-for-filename --system-module:OmitAllOtherModules ../systemModulePopulator.dfy --output:../obj/systemModulePopulator
+
+check-system-module: build-system-module
+	diff $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
+
+update-system-module: build-system-module
+	cp $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
diff --git a/Source/DafnyRuntime/DafnyRuntimePython/.gitignore b/Source/DafnyRuntime/DafnyRuntimePython/.gitignore
new file mode 100644
index 00000000000..219db0e8069
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimePython/.gitignore
@@ -0,0 +1,30 @@
+### from https://github.com/github/gitignore/blob/main/Python.gitignore
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# Environments
+.env
+venv/
diff --git a/Source/DafnyRuntime/DafnyRuntimePython/BUILDING.md b/Source/DafnyRuntime/DafnyRuntimePython/BUILDING.md
new file mode 100644
index 00000000000..4213a37604a
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimePython/BUILDING.md
@@ -0,0 +1,62 @@
+# Building the DafnyRuntimePython
+
+## Prerequisites
+
+- the `dotnet` CLI, to build Dafny
+- Python, to build and upload the package
+- [TestPyPI credentials](https://packaging.python.org/en/latest/guides/using-testpypi/), if you will upload to TestPyPI
+- PyPI credentials, if you will upload to PyPI
+
+## Steps
+
+1. Ensure that the `System_` module is up-to-date:
+
+```bash
+# Ensure that the Dafny build is up-to-date,
+# as it will be used to compile the System_ module.
+$ dotnet build --project ../../Dafny
+
+# Compile the System_ runtime module.
+$ make update-system-module
+```
+
+2. Build the distribution package:
+
+```bash
+# Set up the build tooling
+$ make setup-venv
+
+# Remove old build artifacts
+$ make clean-package
+
+# Build the distribution package
+$ make build-package
+```
+
+3. Check that the distribution package looks right locally and on TestPyPI,
+   as (production) PyPI does not allow overwriting uploaded packages:
+
+```bash
+# List the distribution package's files, and check that:
+#  1. the version number is correct
+#  2. the `System_/__init__.py` file exists
+#  3. the `dafny/__init__.py` file exists
+$ tar tf dist/dafnyruntimepython-X.Y.Z.tar.gz
+
+# Upload to TestPyPI, and check that it appears correct at
+# <https://test.pypi.org/project/DafnyRuntimePython/>.
+$ make upload-package-testpypi
+```
+
+4. Upload to PyPI:
+
+```bash
+$ make upload-package-pypi
+```
+
+You can view the uploaded package at <https://pypi.org/project/DafnyRuntimePython/>.
+
+## More info
+
+The packaging process is described in
+<https://packaging.python.org/en/latest/tutorials/packaging-projects/>
diff --git a/Source/DafnyRuntime/DafnyRuntimePython/Makefile b/Source/DafnyRuntime/DafnyRuntimePython/Makefile
new file mode 100644
index 00000000000..481014c451b
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimePython/Makefile
@@ -0,0 +1,42 @@
+
+# Invoking the CLI this way just to stay platform-independent
+DAFNY = dotnet run --project ../../Dafny --no-build --
+
+GENERATED_SYSTEM_MODULE_SOURCE=../obj/systemModulePopulator-py/System_.py
+GENERATED_SYSTEM_MODULE_TARGET=System_/__init__.py
+
+# Use a virtual environment in order to avoid polluting the system installation,
+# dependency conflicts, etc.
+VIRTUALENV = venv
+ifeq ($(OS),Windows_NT)
+	VIRTUALENV_PYTHON = $(VIRTUALENV)/Scripts/python.exe
+else
+	VIRTUALENV_PYTHON = $(VIRTUALENV)/bin/python
+endif
+
+all: check-system-module
+
+build-system-module:
+	$(DAFNY) translate py --no-verify --use-basename-for-filename --system-module:OmitAllOtherModules ../systemModulePopulator.dfy --output:../obj/systemModulePopulator
+
+check-system-module: build-system-module
+	diff $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
+
+update-system-module: build-system-module
+	cp $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
+
+setup-venv:
+	python -m venv --clear $(VIRTUALENV)
+	$(VIRTUALENV_PYTHON) -m pip install --upgrade build twine
+
+clean-package:
+	rm -rf dist/ *.egg-info/
+
+build-package:
+	$(VIRTUALENV_PYTHON) -m build
+
+upload-package-testpypi:
+	$(VIRTUALENV_PYTHON) -m twine upload --repository testpypi dist/*
+
+upload-package-pypi:
+	$(VIRTUALENV_PYTHON) -m twine upload dist/*
diff --git a/Source/DafnyRuntime/DafnyRuntimePython/System_/__init__.py b/Source/DafnyRuntime/DafnyRuntimePython/System_/__init__.py
new file mode 100644
index 00000000000..d70b9c8c45c
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimePython/System_/__init__.py
@@ -0,0 +1,20 @@
+import sys
+from typing import Callable, Any, TypeVar, NamedTuple
+from math import floor
+from itertools import count
+
+import _dafny as _dafny
+
+# Module: System_
+
+class nat:
+    def  __init__(self):
+        pass
+
+    @staticmethod
+    def default():
+        return int(0)
+    def _Is(source__):
+        d_0_x_: int = source__
+        return (0) <= (d_0_x_)
+
diff --git a/Source/DafnyRuntime/DafnyRuntimePython/_dafny/__init__.py b/Source/DafnyRuntime/DafnyRuntimePython/_dafny/__init__.py
new file mode 100644
index 00000000000..2be15c586ab
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimePython/_dafny/__init__.py
@@ -0,0 +1,516 @@
+"""Runtime enabling Dafny language features."""
+import builtins
+from dataclasses import dataclass
+from contextlib import contextmanager
+from fractions import Fraction
+from collections import Counter, deque
+from collections.abc import Iterable
+from functools import reduce
+from types import GeneratorType, FunctionType
+from math import floor
+from itertools import chain, combinations, count
+
+class classproperty(property):
+    def __get__(self, instance, owner):
+        return classmethod(self.fget).__get__(None, owner)()
+
+def print(value):
+    builtins.print(value, end="")
+
+# Dafny strings are currently sequences of UTF-16 code units.
+# To make a best effort attempt at printing the right characters we attempt to decode,
+# but have to allow for invalid sequences.
+def string_from_utf_16(utf_16_code_units):
+    return b''.join(ord(c).to_bytes(2, 'little') for c in utf_16_code_units).decode("utf-16-le", errors = 'replace')
+
+def string_of(value) -> str:
+    if hasattr(value, '__dafnystr__'):
+        return value.__dafnystr__()
+    elif value is None:
+        return "null"
+    elif isinstance(value, bool):
+        return "true" if value else "false"
+    elif isinstance(value, str):
+        # This is only for Dafny char values.
+        # Dafny strings are represented as Seq's of individual char values,
+        # and Seq defines __dafnystr__.
+        return string_from_utf_16(value)
+    elif isinstance(value, tuple):
+        return '(' + ', '.join(map(string_of, value)) + ')'
+    elif isinstance(value, FunctionType):
+        return "Function"
+    else:
+        return str(value)
+
+@dataclass
+class Break(Exception):
+    target: str
+
+@dataclass
+class Continue(Exception):
+    target: str
+
+class TailCall(Exception):
+    pass
+
+@contextmanager
+def label(name: str = None):
+    try:
+        yield
+    except Break as g:
+        if g.target != name:
+            raise g
+    except TailCall as g:
+        if name is not None:
+            raise g
+
+@contextmanager
+def c_label(name: str = None):
+    try:
+        yield
+    except Continue as g:
+        if g.target != name:
+            raise g
+
+class CodePoint(str):
+
+    escapes = {
+      '\n' : "\\n",
+      '\r' : "\\r",
+      '\t' : "\\t",
+      '\0' : "\\0",
+      '\'' : "\\'",
+      '\"' : "\\\"",
+      '\\' : "\\\\",
+    }
+
+    def __escaped__(self):
+        return self.escapes.get(self, self)
+
+    def __dafnystr__(self):
+        return f"'{self.__escaped__()}'"
+
+    def __add__(self, other):
+        return CodePoint(plus_char(self, other))
+
+    def __sub__(self, other):
+        return CodePoint(minus_char(self, other))
+
+    @staticmethod
+    def is_code_point(i):
+        return (0 <= i and i < 0xD800) or (0xE000 <= i and i < 0x11_0000)
+
+class Concat:
+    def __init__(self, l, r):
+        self.l = l
+        self.r = r
+        self.len = len(l) + len(r)
+
+    def __len__(self):
+        return self.len
+
+    def flatten(self):
+        l = []
+        q = deque([self])
+        while q:
+            e = q.pop()
+            if isinstance(e, list):
+                l += e
+            elif isinstance(e, Concat):
+                q.append(e.r)
+                q.append(e.l)
+        return l
+
+class Seq:
+    def __init__(self, iterable = None, isStr = False):
+        '''
+        isStr defines whether this value should be tracked at runtime as a string (a.k.a. seq<char>)
+        It accepts three different values:
+         - True: this value is definitely a string, mark it as such
+         - False: this value might be a string, apply heuristics to make a best guess
+         - None: don't apply heuristics, don't mark it as a string
+
+        None is used when --unicode-char is true, to ensure consistent printing of strings
+        across backends without depending on any runtime tracking.
+        See docs/Compilation/StringsAndChars.md.
+        '''
+
+        self.elems = iterable if isinstance(iterable, Concat) else (list(iterable) if iterable is not None else [])
+        self.len = len(self.elems)
+        if isStr is None:
+            self.isStr = None
+        else:
+            self.isStr = isStr \
+                        or isinstance(iterable, str) \
+                        or (isinstance(iterable, Seq) and iterable.isStr)
+            # delay expensive computation
+            if not self.isStr and isinstance(iterable, Concat):
+                self.isStr = 0
+
+    @property
+    def Elements(self):
+        if isinstance(self.elems, Concat):
+            self.elems = self.elems.flatten()
+        return self.elems
+
+    @property
+    def UniqueElements(self):
+        return frozenset(self.Elements)
+
+    def VerbatimString(self, asliteral):
+        if asliteral:
+            return f"\"{''.join(map(lambda c: c.__escaped__(), self.Elements))}\""
+        else:
+            return ''.join(self)
+
+    def __dafnystr__(self) -> str:
+        if self.isStr == 0:
+            self.isStr = len(self) > 0 and all(isinstance(e, str) and len(e) == 1 for e in self.Elements)
+        if self.isStr:
+            # This should never be true when using --unicode-char,
+            # so it is safe to assume we are a sequence of UTF-16 code units.
+            return string_from_utf_16(self.Elements)
+        return '[' + ', '.join(map(string_of, self.Elements)) + ']'
+
+    def __add__(self, other):
+        return Seq(Concat(self.elems, other.elems), isStr=self.isStr and other.isStr)
+
+    def __getitem__(self, key):
+        if isinstance(key, slice):
+            indices = range(*key.indices(len(self)))
+            return Seq((self.Elements[i] for i in indices), isStr=self.isStr)
+        return self.Elements.__getitem__(key)
+
+    def set(self, key, value):
+        l = list(self.Elements)
+        l[key] = value
+        return Seq(l, isStr=self.isStr)
+
+    def __len__(self):
+        return self.len
+
+    def __hash__(self) -> int:
+        return hash(tuple(self.Elements))
+
+    def __eq__(self, other: object) -> bool:
+        return self.Elements == other.Elements
+
+    def __lt__(self, other):
+        return len(self) < len(other) and self == other[:len(self)]
+
+    def __le__(self, other):
+        return len(self) <= len(other) and self == other[:len(self)]
+
+# Convenience for translation when --unicode-char is enabled
+def SeqWithoutIsStrInference(__iterable = None):
+    return Seq(__iterable, isStr = None)
+
+class Array:
+    def __init__(self, initValue, *dims):
+        def create_structure(initValue, *dims):
+            return [initValue if len(dims) <= 1 else create_structure(initValue, *dims[1:]) for _ in range(dims[0])]
+        self.dims = list(dims)
+        self.arr = create_structure(initValue, *dims)
+
+    def __dafnystr__(self) -> str:
+        return f'array{self.dims}'
+
+    def __str__(self):
+        return self.__dafnystr__()
+
+    def length(self, i):
+        return self.dims[i] if i < len(self.dims) else None
+
+    def __len__(self):
+        return self.length(0)
+
+    def __getitem__(self, key):
+        if not isinstance(key, Iterable):
+            return self.arr[key]
+        arr = self.arr
+        for i in key:
+            arr = arr[i]
+        return arr
+
+    def __setitem__(self, key, value):
+        if not isinstance(key, Iterable):
+            self.arr[key] = value
+            return
+        arr = self.arr
+        for i in range(len(key)-1):
+            arr = arr[key[i]]
+        arr[key[-1]] = value
+
+class Set(frozenset):
+    @property
+    def Elements(self):
+        return self
+
+    @property
+    def AllSubsets(self):
+        # https://docs.python.org/3/library/itertools.html#itertools-recipes
+        s = list(self)
+        return map(Set, chain.from_iterable(combinations(s, r) for r in range(len(s)+1)))
+
+    def __dafnystr__(self) -> str:
+        return '{' + ', '.join(map(string_of, self)) + '}'
+
+    def union(self, other):
+        return Set(super().union(self, other))
+
+    def intersection(self, other):
+        return Set(super().intersection(other))
+
+    def ispropersubset(self, other):
+        return self.issubset(other) and self != other
+
+    def __or__(self, other):
+        return self.union(other)
+
+    def __sub__(self, other):
+        return Set(super().__sub__(other))
+
+class MultiSet(Counter):
+    def __dafnystr__(self) -> str:
+        return 'multiset{' + ', '.join(map(string_of, self.elements())) + '}'
+
+    @property
+    def cardinality(self):
+        return reduce(lambda acc, key: acc + self[key], self, 0)
+
+    def union(self, other):
+        return MultiSet(self + other)
+
+    def __or__(self, other):
+        return self.union(other)
+
+    def intersection(self, other):
+        return MultiSet(self & other)
+
+    def __sub__(self, other):
+        return MultiSet(super().__sub__(other))
+
+    @property
+    def keys(self):
+        return Set(key for key in self if self[key] > 0)
+
+    @property
+    def Elements(self):
+        return self.elements()
+
+    @property
+    def UniqueElements(self):
+        return self.keys
+
+    def isdisjoint(self, other):
+        return frozenset(self.keys).isdisjoint(frozenset(other.keys))
+
+    def issubset(self, other):
+        return all(self[key] <= other[key] for key in frozenset(self).union(frozenset(other)))
+
+    def ispropersubset(self, other):
+        return self.issubset(other) and self.cardinality < other.cardinality
+
+    def set(self, key, value):
+        set = Counter(self)
+        set[key] = value
+        return MultiSet(set)
+
+    def __hash__(self):
+        return hash(frozenset(self.keys))
+
+    def __eq__(self, other):
+        return all(self[key] == other[key] for key in self.keys | other.keys)
+
+    def __ne__(self, other):
+        return not (self == other)
+
+    def __setattr__(self, key, value):
+        raise TypeError("'Map' object is immutable")
+
+    def __contains__(self, item):
+        return self[item] > 0
+
+class Map(dict):
+    def __dafnystr__(self) -> str:
+        return 'map[' + ', '.join(map(lambda i: f'{string_of(i[0])} := {string_of(i[1])}', self.items)) + ']'
+
+    @property
+    def Elements(self):
+        return self
+
+    @property
+    def keys(self):
+        return Set(super().keys())
+
+    @property
+    def values(self):
+        return Set(super().values())
+
+    @property
+    def items(self):
+        return Set(super().items())
+
+    def set(self, key, value):
+        map = dict(self)
+        map[key] = value
+        return Map(map)
+
+    def __sub__(self, other):
+        map = dict(self)
+        for key in list(other):
+            map.pop(key, None)
+        return Map(map)
+
+    def __or__(self, other):
+        map = dict(self)
+        for k, v in other.items:
+            map[k] = v
+        return Map(map)
+
+    def __hash__(self):
+        return hash(frozenset(self))
+
+    def __setattr__(self, key, value):
+        raise TypeError("'Map' object is immutable")
+
+class BigOrdinal:
+    @staticmethod
+    def is_limit(ord):
+        return ord == 0
+
+    @staticmethod
+    def is_succ(ord):
+        return 0 < ord
+
+    @staticmethod
+    def offset(ord):
+        return ord
+
+    @staticmethod
+    def is_nat(ord):
+        # at run time, every ORDINAL is a natural number
+        return True
+
+class BigRational(Fraction):
+    def __dafnystr__(self):
+        if self.denominator == 1:
+            return f"{self.numerator}.0"
+        correction = self.divides_a_power_of_10(self.denominator)
+        if correction is None:
+            return f"({self.numerator}.0 / {self.denominator}.0)"
+        compensation, shift = correction
+        if self.numerator < 0:
+            sign, digits = "-", str(-self.numerator*compensation)
+        else:
+            sign, digits = "", str(self.numerator*compensation)
+        if shift < len(digits):
+            n = len(digits) - shift
+            return f"{sign}{digits[:n]}.{digits[n:]}"
+        return f"{sign}0.{'0' * (shift - len(digits))}{digits}"
+
+    @staticmethod
+    def isolate_factor(f, x):
+        y = 0
+        while x > 1 and x % f == 0:
+            y += 1
+            x //= f
+        return x, y
+
+    def is_integer(self):
+        return BigRational(floor(self), 1) == self
+
+    @staticmethod
+    def divides_a_power_of_10(x):
+        rem, expA = BigRational.isolate_factor(10, x)
+        if rem % 5 == 0 or rem % 2 == 0 or rem == 1:
+            major, minor = (5, 2) if rem % 5 == 0 else (2, 5)
+            rem, expB = BigRational.isolate_factor(major, rem)
+            return (minor**expB, expA+expB) if rem == 1 else None
+        return None
+
+    def __add__(self, other):
+        return BigRational(super().__add__(other))
+
+    def __sub__(self, other):
+        return BigRational(super().__sub__(other))
+
+    def __mul__(self, other):
+        return BigRational(super().__mul__(other))
+
+    def __truediv__(self, other):
+        return BigRational(super().__truediv__(other))
+
+def plus_char(a, b):
+    return chr(ord(a) + ord(b))
+
+def minus_char(a, b):
+    return chr(ord(a) - ord(b))
+
+def euclidian_division(a, b):
+    if 0 <= a:
+        if 0 <= b:
+            return a // b
+        else:
+            return -(a // (-b))
+    else:
+        if 0 <= b:
+            return -((-a-1) // b) - 1
+        else:
+            return (-a-1) // (-b) + 1
+
+def euclidian_modulus(a, b):
+    bp = abs(b)
+    if 0 <= a:
+        return a % bp
+    c = (-a) % bp
+    return c if c == 0 else bp - c
+
+@dataclass
+class HaltException(Exception):
+    message: str
+
+def quantifier(vals, frall, pred):
+    for u in vals:
+        if pred(u) != frall:
+            return not frall
+    return frall
+
+def AllBooleans():
+    return [False, True]
+
+def AllChars():
+    return (chr(i) for i in range(0x10000))
+
+def AllUnicodeChars():
+    return chain((CodePoint(chr(i)) for i in range(0xD800)), 
+                 (CodePoint(chr(i)) for i in range(0xE000, 0x11_0000)))
+
+def AllIntegers():
+    return (i//2 if i % 2 == 0 else -i//2 for i in count(0))
+
+def IntegerRange(lo, hi):
+    if lo is None:
+        return count(hi-1, -1)
+    if hi is None:
+        return count(lo)
+    return range(lo, hi)
+
+class Doubler:
+    def __init__(self, start):
+        self.start = start
+
+    def __iter__(self):
+        i = self.start
+        while True:
+            yield i
+            i *= 2
+
+class defaults:
+    bool = staticmethod(lambda: False)
+    char = staticmethod(lambda: 'D')
+    codepoint = staticmethod(lambda: CodePoint(defaults.char()))
+    int = staticmethod(lambda: 0)
+    real = staticmethod(BigRational)
+    pointer = staticmethod(lambda: None)
+    tuple = staticmethod(lambda *args: lambda: tuple(a() for a in args))
diff --git a/Source/DafnyRuntime/DafnyRuntimePython/pyproject.toml b/Source/DafnyRuntime/DafnyRuntimePython/pyproject.toml
new file mode 100644
index 00000000000..429d9bd960c
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimePython/pyproject.toml
@@ -0,0 +1,24 @@
+[project]
+name = "DafnyRuntimePython"
+version = "4.9.2"
+authors = [
+  { name = "The Dafny core team", email = "core-team@dafny.org" },
+]
+description = "Dafny runtime for Python"
+requires-python = ">=3.8"
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "License :: OSI Approved :: MIT License",
+  "Operating System :: OS Independent",
+]
+
+[project.urls]
+Homepage = "https://github.com/dafny-lang/dafny"
+Issues = "https://github.com/dafny-lang/dafny/issues"
+
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+packages = ["_dafny", "System_"]
diff --git a/Source/DafnyRuntime/DafnyRuntimeRust/Cargo.lock b/Source/DafnyRuntime/DafnyRuntimeRust/Cargo.lock
index fbfd5a28610..12934c463b1 100644
--- a/Source/DafnyRuntime/DafnyRuntimeRust/Cargo.lock
+++ b/Source/DafnyRuntime/DafnyRuntimeRust/Cargo.lock
@@ -2,22 +2,114 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
 [[package]]
 name = "dafny_runtime"
 version = "0.1.0"
 dependencies = [
+ "itertools",
+ "num",
  "once_cell",
- "paste",
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.18.0"
+name = "either"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
-name = "paste"
-version = "1.0.14"
+name = "itertools"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "num"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
diff --git a/Source/DafnyRuntime/DafnyRuntimeRust/Cargo.toml b/Source/DafnyRuntime/DafnyRuntimeRust/Cargo.toml
index 784934a9430..d5244c747a8 100644
--- a/Source/DafnyRuntime/DafnyRuntimeRust/Cargo.toml
+++ b/Source/DafnyRuntime/DafnyRuntimeRust/Cargo.toml
@@ -5,4 +5,5 @@ edition = "2021"
 
 [dependencies]
 once_cell = "1.18.0"
-paste = "1.0"
+num = "0.4"
+itertools = "0.11.0"
diff --git a/Source/DafnyRuntime/DafnyRuntimeRust/Makefile b/Source/DafnyRuntime/DafnyRuntimeRust/Makefile
new file mode 100644
index 00000000000..f3b72d92998
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeRust/Makefile
@@ -0,0 +1,22 @@
+
+# Invoking the CLI this way just to stay platform-independent
+DAFNY = dotnet run --project ../../Dafny --no-build --
+
+GENERATED_SYSTEM_MODULE_SOURCE=../obj/systemModulePopulator-rust/src/systemModulePopulator.rs
+GENERATED_SYSTEM_MODULE_TARGET=src/system/mod.rs
+
+all: check-system-module test
+
+build-system-module:
+	$(DAFNY) translate rs --no-verify --use-basename-for-filename --optimize-erasable-datatype-wrapper:false --system-module:OmitAllOtherModules ../systemModulePopulator.dfy --output:../obj/systemModulePopulator
+	python -c "import sys; data = sys.stdin.read(); sys.stdout.write(data.replace('::dafny_runtime', 'crate'))" < $(GENERATED_SYSTEM_MODULE_SOURCE) > $(GENERATED_SYSTEM_MODULE_SOURCE).tmp && mv $(GENERATED_SYSTEM_MODULE_SOURCE).tmp $(GENERATED_SYSTEM_MODULE_SOURCE)
+
+check-system-module: build-system-module
+	diff $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
+
+update-system-module: build-system-module
+	cp $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
+
+test:
+	cargo test
+	(cd ../../DafnyRuntime.Tests/DafnyRuntimeRustTest; cargo test)
\ No newline at end of file
diff --git a/Source/DafnyRuntime/DafnyRuntimeRust/src/lib.rs b/Source/DafnyRuntime/DafnyRuntimeRust/src/lib.rs
index 47235bdca79..5e7e3a67e82 100644
--- a/Source/DafnyRuntime/DafnyRuntimeRust/src/lib.rs
+++ b/Source/DafnyRuntime/DafnyRuntimeRust/src/lib.rs
@@ -1,400 +1,4071 @@
-use std::{fmt::{Display, Formatter}, rc::Rc, ops::Deref};
+#[cfg(test)]
+mod tests;
+
+mod system;
+pub use mem::MaybeUninit;
+use num::{bigint::ParseBigIntError, Integer, Num, One, Signed};
 pub use once_cell::unsync::Lazy;
+use std::{
+    any::Any,
+    borrow::Borrow,
+    boxed::Box,
+    cell::{RefCell, UnsafeCell},
+    clone::Clone,
+    cmp::Ordering,
+    collections::{HashMap, HashSet},
+    convert::From,
+    fmt::{Debug, Display, Formatter},
+    hash::{Hash, Hasher},
+    ptr::NonNull,
+    mem,
+    ops::{Add, Deref, Div, Fn, Mul, Neg, Rem, Sub},
+    rc::{Rc, Weak},
+    vec::Vec,
+};
+
+pub use system::*;
+
+pub use itertools;
+pub use num::bigint::BigInt;
+pub use num::rational::BigRational;
+pub use num::FromPrimitive;
+pub use num::NumCast;
+pub use num::ToPrimitive;
+pub use num::Zero;
+pub use std::convert::Into;
+
+// An atomic box is just a RefCell in Rust
+pub type SizeT = usize;
+
+pub trait DafnyType: Clone + DafnyPrint + 'static {}
+
+impl<T> DafnyType for T where T: Clone + DafnyPrint + 'static {}
+pub trait DafnyTypeEq: DafnyType + Hash + Eq {}
+
+impl<T> DafnyTypeEq for T where T: DafnyType + Hash + Eq {}
+
+// Dafny's type (0) compiles to NontrivialDefault to prevent subset types from being considered as Default if their witness is nonzero
+pub trait NontrivialDefault {
+    fn nontrivial_default() -> Self;
+}
 
-pub struct LazyFieldWrapper<A>(pub Lazy<A, Box<dyn 'static + FnOnce() -> A>>);
+pub mod dafny_runtime_conversions {
+    use crate::DafnyType;
+    use crate::DafnyTypeEq;
+    pub type DafnyInt = crate::DafnyInt;
+    pub type DafnySequence<T> = crate::Sequence<T>;
+    pub type DafnyMap<K, V> = crate::Map<K, V>;
+    pub type DafnySet<T> = crate::Set<T>;
+    pub type DafnyMultiset<T> = crate::Multiset<T>;
+    pub type DafnyBool = bool;
+    pub type DafnyChar = crate::DafnyChar;
+    pub type DafnyCharUTF16 = crate::DafnyCharUTF16;
+
+    use num::BigInt;
+    use num::ToPrimitive;
+
+    use std::collections::HashMap;
+    use std::collections::HashSet;
+    use std::hash::Hash;
+    use std::rc::Rc;
+
+    pub mod object {
+        pub type DafnyClass<T> = crate::Object<T>;
+        pub type DafnyArray<T> = crate::Object<[T]>;
+        pub type DafnyArray2<T> = crate::Object<crate::Array2<T>>;
+        pub type DafnyArray3<T> = crate::Object<crate::Array3<T>>;
+        // Conversion to and from Dafny reference-counted classes. All these methods take ownership of the class.
+        pub fn dafny_class_to_struct<T: Clone>(ptr: DafnyClass<T>) -> T {
+            let t: &T = crate::rd!(ptr);
+            t.clone()
+        }
+        pub fn dafny_class_to_boxed_struct<T: Clone>(ptr: DafnyClass<T>) -> Box<T> {
+            Box::new(dafny_class_to_struct(ptr))
+        }
+        pub unsafe fn dafny_class_to_rc_struct<T: Clone + ?Sized>(ptr: DafnyClass<T>) -> ::std::rc::Rc<T> {
+            crate::rcmut::to_rc(ptr.0.unwrap())
+        }
+        pub fn struct_to_dafny_class<T>(t: T) -> DafnyClass<T> {
+            crate::Object::new(t)
+        }
+        pub fn boxed_struct_to_dafny_class<T>(t: Box<T>) -> DafnyClass<T> {
+            struct_to_dafny_class(*t)
+        }
+        pub unsafe fn rc_struct_to_dafny_class<T: ?Sized>(t: ::std::rc::Rc<T>) -> DafnyClass<T> {
+            crate::Object::from_rc(t)
+        }
+        // Conversions to and from Dafny arrays. They all take ownership
+        pub unsafe fn dafny_array_to_vec<T: Clone>(ptr: DafnyArray<T>) -> Vec<T> {
+            ptr.as_ref().to_vec()
+        }
+        pub fn vec_to_dafny_array<T: Clone>(array: Vec<T>) -> DafnyArray<T> {
+            // SAFETY: We own the array
+            unsafe {
+              crate::Object::from_rc(::std::rc::Rc::from(array.into_boxed_slice()))
+            }
+        }
+        pub unsafe fn dafny_array2_to_vec<T: Clone>(ptr: DafnyArray2<T>) -> Vec<Vec<T>> {
+            crate::rd!(ptr).to_vec()
+        }
+    }
 
-impl <A: PartialEq> PartialEq for LazyFieldWrapper<A> {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.deref() == other.0.deref()
+    pub mod ptr {
+        pub type DafnyClass<T> = crate::Ptr<T>;
+        pub type DafnyArray<T> = crate::Ptr<[T]>;
+        pub type DafnyArray2<T> = crate::Ptr<crate::Array2<T>>;
+        pub type DafnyArray3<T> = crate::Ptr<crate::Array3<T>>;
+        // Conversion to and from Dafny reference-counted classes. All these methods take ownership of the class.
+        pub unsafe fn dafny_class_to_struct<T: Clone>(ptr: DafnyClass<T>) -> T {
+            *dafny_class_to_boxed_struct(ptr)
+        }
+        pub unsafe fn dafny_class_to_boxed_struct<T: Clone>(ptr: DafnyClass<T>) -> Box<T> {
+            Box::from_raw(crate::Ptr::into_raw(ptr))
+        }
+        pub fn struct_to_dafny_class<T>(t: T) -> DafnyClass<T> {
+            boxed_struct_to_dafny_class(Box::new(t))
+        }
+        pub fn boxed_struct_to_dafny_class<T>(t: Box<T>) -> DafnyClass<T> {
+            crate::Ptr::from_raw_nonnull(Box::into_raw(t))
+        }
+        // Conversions to and from Dafny arrays. They all take ownership
+        pub unsafe fn dafny_array_to_vec<T: Clone>(ptr: DafnyArray<T>) -> Vec<T> {
+            ptr.as_ref().to_vec()
+        }
+        pub fn vec_to_dafny_array<T: Clone>(array: Vec<T>) -> DafnyArray<T> {
+            crate::Ptr::from_box(array.into_boxed_slice())
+        }
+        pub unsafe fn dafny_array2_to_vec<T: Clone>(ptr: DafnyArray2<T>) -> Vec<Vec<T>> {
+            Box::from_raw(crate::Ptr::into_raw(ptr)).to_vec()
+        }
+    }
+
+    pub fn dafny_int_to_bigint(i: &DafnyInt) -> BigInt {
+        i.data.as_ref().clone()
+    }
+    pub fn bigint_to_dafny_int(i: &BigInt) -> DafnyInt {
+        DafnyInt {
+            data: Rc::new(i.clone()),
+        }
+    }
+
+    pub fn dafny_sequence_to_vec<T, X>(s: &DafnySequence<T>, elem_converter: fn(&T) -> X) -> Vec<X>
+    where
+        T: DafnyType,
+    {
+        let mut array: Vec<T> = Vec::with_capacity(s.cardinality_usize());
+        DafnySequence::<T>::append_recursive(&mut array, s);
+        array.iter().map(|x| elem_converter(x)).collect()
+    }
+
+    // Used for external conversions
+    pub fn vec_to_dafny_sequence<T, X>(
+        array: &Vec<X>,
+        elem_converter: fn(&X) -> T,
+    ) -> DafnySequence<T>
+    where
+        T: DafnyType,
+    {
+        let mut result: Vec<T> = Vec::with_capacity(array.len());
+        for elem in array.iter() {
+            result.push(elem_converter(elem));
+        }
+        DafnySequence::<T>::from_array_owned(result)
+    }
+
+    pub fn dafny_map_to_hashmap<K, V, K2, V2>(
+        m: &DafnyMap<K, V>,
+        converter_k: fn(&K) -> K2,
+        converter_v: fn(&V) -> V2,
+    ) -> HashMap<K2, V2>
+    where
+        K: DafnyTypeEq,
+        V: DafnyTypeEq,
+        K2: Eq + Hash,
+        V2: Clone,
+    {
+        m.to_hashmap_owned(converter_k, converter_v)
+    }
+
+    pub fn hashmap_to_dafny_map<K2, V2, K, V>(
+        map: &HashMap<K2, V2>,
+        converter_k: fn(&K2) -> K,
+        converter_v: fn(&V2) -> V,
+    ) -> DafnyMap<K, V>
+    where
+        K: DafnyTypeEq,
+        V: DafnyTypeEq,
+        K2: Eq + Hash,
+        V2: Clone,
+    {
+        DafnyMap::<K, V>::from_hashmap(map, converter_k, converter_v)
+    }
+
+    // --unicode-char:true
+    pub mod unicode_chars_true {
+        use crate::Sequence;
+
+        type DafnyChar = crate::DafnyChar;
+        type DafnyString = Sequence<DafnyChar>;
+
+        pub fn string_to_dafny_string(s: &str) -> DafnyString {
+            Sequence::from_array_owned(s.chars().map(|v| crate::DafnyChar(v)).collect())
+        }
+        pub fn dafny_string_to_string(s: &DafnyString) -> String {
+            let characters = s.to_array();
+            characters.iter().map(|v| v.0).collect::<String>()
+        }
+    }
+
+    // --unicode-char:false
+    pub mod unicode_chars_false {
+        use crate::Sequence;
+
+        type DafnyCharUTF16 = crate::DafnyCharUTF16;
+        type DafnyString = Sequence<DafnyCharUTF16>;
+
+        pub fn string_to_dafny_string(s: &str) -> DafnyString {
+            Sequence::from_array_owned(s.encode_utf16().map(|v| crate::DafnyCharUTF16(v)).collect())
+        }
+        pub fn dafny_string_to_string(s: &DafnyString) -> String {
+            let characters = s
+                .to_array()
+                .as_ref()
+                .iter()
+                .map(|v| v.0)
+                .collect::<Vec<_>>();
+            String::from_utf16_lossy(&characters)
+        }
+    }
+
+    pub fn set_to_dafny_set<U, T: DafnyTypeEq>(
+        set: &HashSet<U>,
+        converter: fn(&U) -> T,
+    ) -> DafnySet<T> {
+        DafnySet::from_iterator(set.iter().map(converter))
+    }
+    pub fn dafny_set_to_set<T, U>(set: &DafnySet<T>, converter: fn(&T) -> U) -> HashSet<U>
+    where
+        T: DafnyTypeEq,
+        U: Clone + Eq + Hash,
+    {
+        let mut result: HashSet<U> = HashSet::new();
+        for s in set.data.iter() {
+            result.insert(converter(s));
+        }
+        result
+    }
+
+    pub fn dafny_multiset_to_owned_vec<T, U>(
+        ms: &DafnyMultiset<T>,
+        converter: fn(&T) -> U,
+    ) -> Vec<U>
+    where
+        T: DafnyTypeEq,
+        U: Clone + Eq,
+    {
+        let mut result: Vec<U> = Vec::new();
+        for s in ms.data.iter() {
+            // Push T as many times as its size
+            for _ in 0..s.1.data.to_usize().unwrap() {
+                result.push(converter(&s.0));
+            }
+        }
+        result
+    }
+
+    pub fn vec_to_dafny_multiset<T, U>(vec: &Vec<U>, converter: fn(&U) -> T) -> DafnyMultiset<T>
+    where
+        T: DafnyTypeEq,
+        U: Clone + Eq + Hash,
+    {
+        DafnyMultiset::from_iterator(vec.into_iter().map(|u: &U| converter(u)))
+    }
+}
+
+pub trait DafnyUsize {
+    fn into_usize(self) -> usize;
+}
+
+// **************
+// Dafny integers
+// **************
+
+// Zero-cost abstraction over a Rc<BigInt>
+#[derive(Clone)]
+pub struct DafnyInt {
+    data: Rc<BigInt>,
+}
+
+impl DafnyInt {
+    pub fn new(data: Rc<BigInt>) -> DafnyInt {
+        DafnyInt { data }
+    }
+    pub fn as_usize(&self) -> usize {
+        self.to_usize().unwrap()
+    }
+}
+
+impl DafnyUsize for DafnyInt {
+    fn into_usize(self) -> usize {
+        self.as_usize()
+    }
+}
+
+impl AsRef<BigInt> for DafnyInt {
+    fn as_ref(&self) -> &BigInt {
+        &self.data
+    }
+}
+
+// truncate_u(x, u64)
+// = <DafnyInt as ToPrimitive>::to_u128(&x).unwrap() as u64;
+#[macro_export]
+macro_rules! truncate {
+    ($x:expr, $t:ty) => {
+        <$crate::DafnyInt as ::std::convert::Into<$t>>::into($x)
+    };
+}
+
+impl Into<u8> for DafnyInt {
+    fn into(self) -> u8 {
+        self.data.to_u8().unwrap()
+    }
+}
+impl Into<u16> for DafnyInt {
+    fn into(self) -> u16 {
+        self.data.to_u16().unwrap()
+    }
+}
+impl Into<u32> for DafnyInt {
+    fn into(self) -> u32 {
+        self.data.to_u32().unwrap()
+    }
+}
+impl Into<u64> for DafnyInt {
+    fn into(self) -> u64 {
+        self.data.to_u64().unwrap()
+    }
+}
+impl Into<u128> for DafnyInt {
+    fn into(self) -> u128 {
+        self.data.to_u128().unwrap()
+    }
+}
+impl Into<i8> for DafnyInt {
+    fn into(self) -> i8 {
+        self.data.to_i8().unwrap()
+    }
+}
+impl Into<i16> for DafnyInt {
+    fn into(self) -> i16 {
+        self.data.to_i16().unwrap()
+    }
+}
+impl Into<i32> for DafnyInt {
+    fn into(self) -> i32 {
+        self.data.to_i32().unwrap()
+    }
+}
+impl Into<i64> for DafnyInt {
+    fn into(self) -> i64 {
+        self.data.to_i64().unwrap()
+    }
+}
+impl Into<i128> for DafnyInt {
+    fn into(self) -> i128 {
+        self.data.to_i128().unwrap()
+    }
+}
+impl Into<usize> for DafnyInt {
+    fn into(self) -> usize {
+        self.data.to_usize().unwrap()
+    }
+}
+
+impl ToPrimitive for DafnyInt {
+    fn to_i64(&self) -> Option<i64> {
+        self.data.to_i64()
+    }
+
+    fn to_u64(&self) -> Option<u64> {
+        self.data.to_u64()
+    }
+
+    // Override of functions
+    fn to_u128(&self) -> Option<u128> {
+        self.data.to_u128()
+    }
+
+    fn to_i128(&self) -> Option<i128> {
+        self.data.to_i128()
+    }
+}
+
+impl Default for DafnyInt {
+    fn default() -> Self {
+        DafnyInt::new(Rc::new(BigInt::zero()))
+    }
+}
+
+impl NontrivialDefault for DafnyInt {
+    fn nontrivial_default() -> Self {
+        Self::default()
+    }
+}
+
+impl PartialEq<DafnyInt> for DafnyInt {
+    fn eq(&self, other: &DafnyInt) -> bool {
+        self.data.eq(&other.data)
+    }
+}
+impl Eq for DafnyInt {}
+impl Hash for DafnyInt {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.data.hash(state);
+    }
+}
+
+impl DafnyPrint for DafnyInt {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        write!(f, "{}", self.data)
+    }
+}
+
+impl ::std::fmt::Debug for DafnyInt {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.data)
+    }
+}
+
+impl Add<DafnyInt> for DafnyInt {
+    type Output = DafnyInt;
+
+    fn add(self, rhs: DafnyInt) -> Self::Output {
+        DafnyInt {
+            data: Rc::new(self.data.as_ref() + rhs.data.as_ref()),
+        }
+    }
+}
+
+impl Mul<DafnyInt> for DafnyInt {
+    type Output = DafnyInt;
+
+    fn mul(self, rhs: DafnyInt) -> Self::Output {
+        DafnyInt {
+            data: Rc::new(self.data.as_ref() * rhs.data.as_ref()),
+        }
+    }
+}
+
+impl Div<DafnyInt> for DafnyInt {
+    type Output = DafnyInt;
+
+    fn div(self, rhs: DafnyInt) -> Self::Output {
+        DafnyInt {
+            data: Rc::new(self.data.as_ref() / rhs.data.as_ref()),
+        }
+    }
+}
+
+impl Sub<DafnyInt> for DafnyInt {
+    type Output = DafnyInt;
+
+    fn sub(self, rhs: DafnyInt) -> Self::Output {
+        DafnyInt {
+            data: Rc::new(self.data.as_ref() - rhs.data.as_ref()),
+        }
+    }
+}
+impl Rem<DafnyInt> for DafnyInt {
+    type Output = DafnyInt;
+
+    fn rem(self, rhs: DafnyInt) -> Self::Output {
+        DafnyInt {
+            data: Rc::new(self.data.as_ref() % rhs.data.as_ref()),
+        }
+    }
+}
+impl Neg for DafnyInt {
+    type Output = DafnyInt;
+
+    #[inline]
+    fn neg(self) -> Self::Output {
+        DafnyInt {
+            data: Rc::new(-self.data.as_ref()),
+        }
+    }
+}
+impl Zero for DafnyInt {
+    #[inline]
+    fn zero() -> Self {
+        DafnyInt {
+            data: Rc::new(BigInt::zero()),
+        }
+    }
+    #[inline]
+    fn is_zero(&self) -> bool {
+        self.data.is_zero()
+    }
+}
+impl One for DafnyInt {
+    #[inline]
+    fn one() -> Self {
+        DafnyInt {
+            data: Rc::new(BigInt::one()),
+        }
+    }
+}
+impl Num for DafnyInt {
+    type FromStrRadixErr = ParseBigIntError;
+
+    #[inline]
+    fn from_str_radix(s: &str, radix: u32) -> Result<Self, Self::FromStrRadixErr> {
+        Ok(DafnyInt {
+            data: Rc::new(BigInt::from_str_radix(s, radix)?),
+        })
+    }
+}
+impl Ord for DafnyInt {
+    #[inline]
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.data.cmp(&other.data)
+    }
+}
+impl Signed for DafnyInt {
+    #[inline]
+    fn abs(&self) -> Self {
+        DafnyInt {
+            data: Rc::new(self.data.as_ref().abs()),
+        }
+    }
+
+    #[inline]
+    fn abs_sub(&self, other: &Self) -> Self {
+        DafnyInt {
+            data: Rc::new(self.data.as_ref().abs_sub(other.data.as_ref())),
+        }
+    }
+
+    #[inline]
+    fn signum(&self) -> Self {
+        DafnyInt {
+            data: Rc::new(self.data.as_ref().signum()),
+        }
+    }
+
+    #[inline]
+    fn is_positive(&self) -> bool {
+        self.data.as_ref().is_positive()
+    }
+
+    #[inline]
+    fn is_negative(&self) -> bool {
+        self.data.as_ref().is_negative()
+    }
+}
+
+// Comparison
+impl PartialOrd<DafnyInt> for DafnyInt {
+    #[inline]
+    fn partial_cmp(&self, other: &DafnyInt) -> Option<Ordering> {
+        self.data.partial_cmp(&other.data)
+    }
+}
+
+impl DafnyInt {
+    #[inline]
+    pub fn parse_bytes(number: &[u8], radix: u32) -> DafnyInt {
+        DafnyInt {
+            data: ::std::rc::Rc::new(BigInt::parse_bytes(number, radix).unwrap()),
+        }
+    }
+    pub fn from_usize(usize: usize) -> DafnyInt {
+        DafnyInt {
+            data: Rc::new(BigInt::from(usize)),
+        }
+    }
+    pub fn from_i32(i: i32) -> DafnyInt {
+        DafnyInt {
+            data: Rc::new(BigInt::from(i)),
+        }
+    }
+}
+
+macro_rules! impl_dafnyint_from {
+    () => {};
+    ($type:ident) => {
+        impl ::std::convert::From<$type> for $crate::DafnyInt {
+            fn from(n: $type) -> Self {
+                $crate::DafnyInt {
+                    data: ::std::rc::Rc::new(n.into()),
+                }
+            }
+        }
+        impl $crate::DafnyUsize for $type {
+            fn into_usize(self) -> usize {
+                self as usize
+            }
+        }
+    };
+}
+
+impl_dafnyint_from! { u8 }
+impl_dafnyint_from! { u16 }
+impl_dafnyint_from! { u32 }
+impl_dafnyint_from! { u64 }
+impl_dafnyint_from! { u128 }
+impl_dafnyint_from! { i8 }
+impl_dafnyint_from! { i16 }
+impl_dafnyint_from! { i32 }
+impl_dafnyint_from! { i64 }
+impl_dafnyint_from! { i128 }
+impl_dafnyint_from! { usize }
+
+impl<'a> From<&'a [u8]> for DafnyInt {
+    fn from(number: &[u8]) -> Self {
+        DafnyInt::parse_bytes(number, 10)
+    }
+}
+
+// Now the same but for &[u8, N] for any kind of such references
+impl<'a, const N: usize> From<&'a [u8; N]> for DafnyInt {
+    fn from(number: &[u8; N]) -> Self {
+        DafnyInt::parse_bytes(number, 10)
+    }
+}
+
+impl From<char> for DafnyInt {
+    fn from(c: char) -> Self {
+        let cu32: u32 = c.into();
+        int!(cu32)
+    }
+}
+
+impl From<DafnyChar> for DafnyInt {
+    fn from(c: DafnyChar) -> Self {
+        int!(c.0)
+    }
+}
+
+impl From<DafnyCharUTF16> for DafnyInt {
+    fn from(c: DafnyCharUTF16) -> Self {
+        int!(c.0)
+    }
+}
+
+// **************
+// Immutable sequences
+// **************
+
+impl<T: DafnyTypeEq> Eq for Sequence<T> {}
+
+impl<T: DafnyType> Add<&Sequence<T>> for &Sequence<T> {
+    type Output = Sequence<T>;
+
+    fn add(self, rhs: &Sequence<T>) -> Self::Output {
+        Sequence::new_concat_sequence(self, rhs)
+    }
+}
+
+impl<T: DafnyType + Hash> Hash for Sequence<T> {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.cardinality_usize().hash(state);
+        let array = self.to_array();
+        // Iterate over the elements
+        for elt in array.iter() {
+            elt.hash(state);
+        }
+    }
+}
+
+// Clone can be derived automatically
+#[derive(Clone)]
+pub enum Sequence<T>
+where
+    T: DafnyType,
+{
+    ArraySequence {
+        // Values could be a native array because we will know statically that all
+        // accesses are in bounds when using this data structure
+        values: Rc<Vec<T>>,
+    },
+    ConcatSequence {
+        left: Rc<UnsafeCell<Sequence<T>>>,
+        right: Rc<UnsafeCell<Sequence<T>>>,
+        length: SizeT,
+        boxed: Rc<RefCell<Option<Rc<Vec<T>>>>>,
+    },
+}
+
+impl<T> Sequence<T>
+where
+    T: DafnyType,
+{
+    pub fn from_array(values: Ptr<[T]>) -> Sequence<T> {
+        let mut v = vec![];
+        v.extend_from_slice(read!(values));
+        Sequence::ArraySequence {
+            values: Rc::new(v),
+        }
+    }
+    pub fn from_array_object(values: &Object<[T]>) -> Sequence<T> {
+        let mut v = vec![];
+        v.extend_from_slice(rd!(values));
+        Sequence::ArraySequence {
+            values: Rc::new(v),
+        }
+    }
+    pub fn from_array_slice(values: Ptr<[T]>, start: &DafnyInt, end: &DafnyInt) -> Sequence<T> {
+        let mut v = vec![];
+        v.extend_from_slice(&read!(values)[start.to_usize().unwrap()..end.to_usize().unwrap()]);
+        Sequence::ArraySequence {
+            values: Rc::new(v),
+        }
+    }
+    pub fn from_array_slice_object(values: &Object<[T]>, start: &DafnyInt, end: &DafnyInt) -> Sequence<T> {
+        let mut v = vec![];
+        v.extend_from_slice(&rd!(values)[start.to_usize().unwrap()..end.to_usize().unwrap()]);
+        Sequence::ArraySequence {
+            values: Rc::new(v),
+        }
+    }
+    pub fn from_array_take(values: Ptr<[T]>, n: &DafnyInt) -> Sequence<T> {
+        let mut v = vec![];
+        v.extend_from_slice(&read!(values)[..n.to_usize().unwrap()]);
+        Sequence::ArraySequence {
+            values: Rc::new(v),
+        }
+    }
+    pub fn from_array_take_object(values: &Object<[T]>, n: &DafnyInt) -> Sequence<T> {
+        let mut v = vec![];
+        v.extend_from_slice(&rd!(values)[..n.to_usize().unwrap()]);
+        Sequence::ArraySequence {
+            values: Rc::new(v),
+        }
+    }
+    pub fn from_array_drop(values: Ptr<[T]>, n: &DafnyInt) -> Sequence<T> {
+        let mut v = vec![];
+        v.extend_from_slice(&read!(values)[n.to_usize().unwrap()..]);
+        Sequence::ArraySequence {
+            values: Rc::new(v),
+        }
+    }
+    pub fn from_array_drop_object(values: &Object<[T]>, n: &DafnyInt) -> Sequence<T> {
+        let mut v = vec![];
+        v.extend_from_slice(&rd!(values)[n.to_usize().unwrap()..]);
+        Sequence::ArraySequence {
+            values: Rc::new(v),
+        }
+    }
+    pub fn from_array_owned(values: Vec<T>) -> Sequence<T> {
+        Sequence::ArraySequence {
+            values: Rc::new(values),
+        }
+    }
+    pub fn new_concat_sequence(left: &Sequence<T>, right: &Sequence<T>) -> Sequence<T> {
+        Sequence::ConcatSequence {
+            left: Rc::new(UnsafeCell::new(left.clone())),
+            right: Rc::new(UnsafeCell::new(right.clone())),
+            length: left.cardinality_usize() + right.cardinality_usize(),
+            boxed: Rc::new(RefCell::new(None)),
+        }
+    }
+    pub fn to_array(&self) -> Rc<Vec<T>> {
+        // Let's convert the if then else below to a proper match statement
+        match self {
+            Sequence::ArraySequence { values, .. } =>
+            // The length of the elements
+            {
+                Rc::clone(values)
+            }
+            Sequence::ConcatSequence {
+                length,
+                boxed,
+                left,
+                right,
+            } => {
+                let into_boxed = boxed.as_ref().clone();
+                let into_boxed_borrowed = into_boxed.borrow();
+                let borrowed: Option<&Rc<Vec<T>>> = into_boxed_borrowed.as_ref();
+                if let Some(cache) = borrowed.as_ref() {
+                    return Rc::clone(cache);
+                }
+                // Let's create an array of size length and fill it up recursively
+                // We don't materialize nested arrays because most of the time they are forgotten
+                let mut array: Vec<T> = Vec::with_capacity(*length);
+                Sequence::<T>::append_recursive(&mut array, self);
+                let result = Rc::new(array);
+                let mut cache = boxed.borrow_mut();
+                let mutable_left: *mut Sequence<T> = left.get();
+                let mutable_right: *mut Sequence<T> = right.get();
+                // safety: Once the array is computed, left and right won't ever be read again.
+                unsafe { *mutable_left = seq!() };
+                unsafe { *mutable_right = seq!() };
+                *cache = Some(result.clone());
+                result
+            }
+        }
+    }
+
+    pub fn append_recursive(array: &mut Vec<T>, this: &Sequence<T>) {
+        match this {
+            Sequence::ArraySequence { values, .. } =>
+            // The length of the elements
+            {
+                for value in values.iter() {
+                    array.push(value.clone());
+                }
+            }
+            Sequence::ConcatSequence {
+                boxed, left, right, ..
+            } =>
+            // Let's create an array of size length and fill it up recursively
+            {
+                let into_boxed = boxed.as_ref().clone();
+                let into_boxed_borrowed = into_boxed.borrow();
+                let borrowed: Option<&Rc<Vec<T>>> = into_boxed_borrowed.as_ref();
+                if let Some(values) = borrowed.as_ref() {
+                    for value in values.iter() {
+                        array.push(value.clone());
+                    }
+                    return;
+                }
+                // safety: When a concat is initialized, the left and right are well defined
+                Sequence::<T>::append_recursive(array, unsafe { &mut *left.get() });
+                Sequence::<T>::append_recursive(array, unsafe { &mut *right.get() });
+            }
+        }
+    }
+    /// Returns the cardinality of this [`Sequence<T>`].
+    // The cardinality returns the length of the sequence
+    pub fn cardinality_usize(&self) -> SizeT {
+        match self {
+            Sequence::ArraySequence { values, .. } =>
+            // The length of the elements
+            {
+                values.len()
+            }
+            Sequence::ConcatSequence { length, .. } => *length,
+        }
+    }
+    pub fn cardinality(&self) -> DafnyInt {
+        DafnyInt::from_usize(self.cardinality_usize())
+    }
+    pub fn get_usize(&self, index: SizeT) -> T {
+        let array = self.to_array();
+        array[index].clone()
+    }
+
+    pub fn slice(&self, start: &DafnyInt, end: &DafnyInt) -> Sequence<T> {
+        let start_index = start.data.as_ref().to_usize().unwrap();
+        let end_index = end.data.as_ref().to_usize().unwrap();
+        let new_data = Sequence::from_array_owned(self.to_array()[start_index..end_index].to_vec());
+        new_data
+    }
+    pub fn take(&self, end: &DafnyInt) -> Sequence<T> {
+        let end_index = end.data.as_ref().to_usize().unwrap();
+        let new_data = Sequence::from_array_owned(self.to_array()[..end_index].to_vec());
+        new_data
+    }
+    pub fn drop(&self, start: &DafnyInt) -> Sequence<T> {
+        let start_index = start.data.as_ref().to_usize().unwrap();
+        let new_data = Sequence::from_array_owned(self.to_array()[start_index..].to_vec());
+        new_data
+    }
+
+    pub fn update_index(&self, index: &DafnyInt, value: &T) -> Self {
+        let mut result = self.to_array().as_ref().clone();
+        result[index.data.to_usize().unwrap()] = value.clone();
+        Sequence::from_array_owned(result)
+    }
+
+    pub fn concat(&self, other: &Sequence<T>) -> Sequence<T> {
+        Sequence::new_concat_sequence(self, other)
+    }
+
+    pub fn get(&self, index: &DafnyInt) -> T {
+        self.get_usize(index.data.to_usize().unwrap())
+    }
+    pub fn iter(&self) -> SequenceIter<T> {
+        SequenceIter {
+            array: self.to_array(),
+            index: 0,
+        }
+    }
+}
+
+pub struct SequenceIter<T: Clone> {
+    array: Rc<Vec<T>>,
+    index: SizeT,
+}
+impl<T: Clone> Iterator for SequenceIter<T> {
+    type Item = T;
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.index < self.array.len() {
+            let result = self.array[self.index].clone();
+            self.index += 1;
+            Some(result)
+        } else {
+            None
+        }
+    }
+}
+
+impl<T: DafnyType> Default for Sequence<T> {
+    fn default() -> Self {
+        Sequence::from_array_owned(vec![])
+    }
+}
+impl<T: DafnyType> NontrivialDefault for Sequence<T> {
+    fn nontrivial_default() -> Self {
+        Self::default()
+    }
+}
+
+impl<T: DafnyTypeEq> Sequence<T> {
+    pub fn as_dafny_multiset(&self) -> Multiset<T> {
+        Multiset::from_array(&self.to_array())
+    }
+}
+
+// Makes it possible to write iterator.collect::<Sequence<T>> and obtain a sequence
+impl<T: DafnyType> FromIterator<T> for Sequence<T> {
+    fn from_iter<I: IntoIterator<Item = T>>(iter: I) -> Self {
+        Sequence::from_array_owned(iter.into_iter().collect())
+    }
+}
+
+impl<T: DafnyTypeEq> Sequence<T> {
+    pub fn contains(&self, value: &T) -> bool {
+        self.to_array().contains(value)
+    }
+}
+impl<T> PartialEq<Sequence<T>> for Sequence<T>
+where
+    T: DafnyType + PartialEq<T>,
+{
+    fn eq(&self, other: &Sequence<T>) -> bool {
+        // Iterate through both elements and verify that they are equal
+        let values: Rc<Vec<T>> = self.to_array();
+        if other.cardinality_usize() != values.len() {
+            return false;
+        }
+        let mut i: usize = 0;
+        for value in values.iter() {
+            if value != &other.get_usize(i) {
+                return false;
+            }
+            i += 1;
+        }
+        true
+    }
+}
+
+impl<T: DafnyTypeEq> PartialOrd for Sequence<T> {
+    fn partial_cmp(&self, other: &Sequence<T>) -> Option<Ordering> {
+        // Comparison is only prefix-based
+        match self.cardinality_usize().cmp(&other.cardinality_usize()) {
+            Ordering::Equal => {
+                if self == other {
+                    Some(Ordering::Equal)
+                } else {
+                    None
+                }
+            }
+            Ordering::Less => {
+                for i in 0..self.cardinality_usize() {
+                    if self.get_usize(i) != other.get_usize(i) {
+                        return None;
+                    }
+                }
+                Some(Ordering::Less)
+            }
+            Ordering::Greater => {
+                for i in 0..other.cardinality_usize() {
+                    if self.get_usize(i) != other.get_usize(i) {
+                        return None;
+                    }
+                }
+                Some(Ordering::Greater)
+            }
+        }
+    }
+}
+
+impl<V: DafnyType> DafnyPrint for Sequence<V> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        if !V::is_char() {
+            write!(f, "[")?;
+        }
+        let mut first = true;
+        for value in self.to_array().iter() {
+            if !first && !V::is_char() {
+                write!(f, ", ")?;
+            }
+            first = false;
+            value.fmt_print(f, true)?;
+        }
+        if !V::is_char() {
+            write!(f, "]")
+        } else {
+            write!(f, "")
+        }
+    }
+}
+
+impl<V: DafnyType> Debug for Sequence<V> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.fmt_print(f, false)
+    }
+}
+
+// **************
+// Immutable maps
+// **************
+
+#[derive(Clone)]
+pub struct Map<K, V>
+where
+    K: DafnyTypeEq,
+    V: DafnyType,
+{
+    data: Rc<HashMap<K, V>>,
+}
+
+impl<K: DafnyTypeEq, V: DafnyType> Default for Map<K, V> {
+    fn default() -> Self {
+        Map {
+            data: Rc::new(HashMap::new()),
+        }
+    }
+}
+
+impl<K: DafnyTypeEq, V: DafnyType> NontrivialDefault for Map<K, V> {
+    fn nontrivial_default() -> Self {
+        Self::default()
+    }
+}
+
+impl<K: DafnyTypeEq, V: DafnyType> Hash for Map<K, V> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.data.len().hash(state); // Worst performance for things that are not hashable like maps
+    }
+}
+
+impl<K, V> PartialEq<Map<K, V>> for Map<K, V>
+where
+    K: DafnyTypeEq,
+    V: DafnyTypeEq,
+{
+    fn eq(&self, other: &Map<K, V>) -> bool {
+        if self.data.len() != other.data.len() {
+            return false;
+        }
+        for (k, v) in self.data.iter() {
+            if other.data.get(k) != Some(v) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+
+impl<K: DafnyTypeEq, V: DafnyTypeEq> Eq for Map<K, V> {}
+
+impl<K: DafnyTypeEq, V: DafnyType> Map<K, V> {
+    pub fn new_empty() -> Map<K, V> {
+        Map {
+            data: Rc::new(HashMap::new()),
+        }
+    }
+    pub fn from_array(values: &Vec<(K, V)>) -> Map<K, V> {
+        Self::from_iterator(values.iter().map(|(k, v)| (k.clone(), v.clone())))
+    }
+    pub fn from_iterator<I>(data: I) -> Map<K, V>
+    where
+        I: Iterator<Item = (K, V)>,
+    {
+        let mut result: HashMap<K, V> = HashMap::new();
+        for (k, v) in data {
+            result.insert(k, v);
+        }
+        Self::from_hashmap_owned(result)
+    }
+    pub fn from_hashmap_owned(values: HashMap<K, V>) -> Map<K, V> {
+        Map {
+            data: Rc::new(values),
+        }
+    }
+    pub fn to_hashmap_owned<K2, V2>(
+        &self,
+        converter_k: fn(&K) -> K2,
+        converter_v: fn(&V) -> V2,
+    ) -> HashMap<K2, V2>
+    where
+        K2: Eq + std::hash::Hash,
+        V2: Clone,
+    {
+        let mut result: HashMap<K2, V2> = HashMap::new();
+        for (k, v) in self.data.iter() {
+            result.insert(converter_k(k), converter_v(v));
+        }
+        result
+    }
+    pub fn cardinality_usize(&self) -> usize {
+        self.data.len()
+    }
+    pub fn cardinality(&self) -> DafnyInt {
+        DafnyInt::from_usize(self.cardinality_usize())
+    }
+    pub fn contains(&self, key: &K) -> bool {
+        self.data.contains_key(key)
+    }
+    pub fn get_or_none(&self, key: &K) -> Option<V> {
+        self.data.get(key).cloned()
+    }
+    // Dafny will normally guarantee that the key exists.
+    pub fn get(&self, key: &K) -> V {
+        self.data[key].clone()
+    }
+    pub fn merge(&self, other: &Map<K, V>) -> Map<K, V> {
+        if other.cardinality_usize() == 0 {
+            return self.clone();
+        }
+        if self.cardinality_usize() == 0 {
+            return other.clone();
+        }
+        let mut new_data = (*other.data).clone();
+        // Overriding self's keys with other's keys if there are some.
+        for (k, v) in self.data.iter() {
+            if !other.contains(k) {
+                new_data.insert(k.clone(), v.clone());
+            }
+        }
+        Self::from_hashmap_owned(new_data)
+    }
+    pub fn subtract(&self, keys: &Set<K>) -> Self {
+        if keys.cardinality_usize() == 0 {
+            return self.clone();
+        }
+        let mut result: HashMap<K, V> = HashMap::new();
+        for (k, v) in self.data.iter() {
+            if !keys.contains(k) {
+                result.insert(k.clone(), v.clone());
+            }
+        }
+        Self::from_hashmap_owned(result)
+    }
+
+    pub fn from_hashmap<K2, V2>(
+        map: &HashMap<K2, V2>,
+        converter_k: fn(&K2) -> K,
+        converter_v: fn(&V2) -> V,
+    ) -> Map<K, V>
+    where
+        K: DafnyTypeEq,
+        V: DafnyTypeEq,
+        K2: Eq + Hash,
+        V2: Clone,
+    {
+        let mut result: HashMap<K, V> = HashMap::new();
+        for (k, v) in map.iter() {
+            result.insert(converter_k(k), converter_v(v));
+        }
+        Map {
+            data: Rc::new(result),
+        }
+    }
+    pub fn keys(&self) -> Set<K> {
+        let mut result: HashSet<K> = HashSet::new();
+        for (k, _) in self.data.iter() {
+            result.insert(k.clone());
+        }
+        Set::from_hashset_owned(result)
+    }
+
+    pub fn update_index(&self, index: &K, value: &V) -> Self {
+        let mut result = self.data.as_ref().clone();
+        result.insert(index.clone(), value.clone());
+        Map::from_hashmap_owned(result)
+    }
+
+    pub fn update_index_owned(&self, index: K, value: V) -> Self {
+        let mut result = self.data.as_ref().clone();
+        result.insert(index, value);
+        Map::from_hashmap_owned(result)
+    }
+
+    pub fn iter_raw(&self) -> std::collections::hash_map::Iter<'_, K, V> {
+        self.data.iter()
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = K> + '_ {
+        self.data.iter().map(|(k, _v)| k).cloned()
+    }
+}
+
+
+impl<K: DafnyTypeEq, V: DafnyTypeEq> Map<K, V> {
+    pub fn values(&self) -> Set<V> {
+        let mut result: Vec<V> = Vec::new();
+        for (_, v) in self.data.iter() {
+            result.push(v.clone());
+        }
+        Set::from_array(&result)
+    }
+    pub fn items(&self) -> Set<(K, V)> {
+        let mut result: Vec<(K, V)> = Vec::new();
+        for (k, v) in self.data.iter() {
+            result.push((k.clone(), v.clone()));
+        }
+        Set::from_array(&result)
+    }
+}
+
+impl<K: DafnyTypeEq> Map<K, DafnyInt> {
+    pub fn as_dafny_multiset(&self) -> Multiset<K> {
+        Multiset::from_hashmap(&self.data)
+    }
+}
+
+pub struct MapBuilder<K, V>
+where
+    K: Clone + Eq + std::hash::Hash,
+    V: Clone,
+{
+    data: HashMap<K, V>,
+}
+
+impl<K, V> MapBuilder<K, V>
+where
+    K: DafnyTypeEq,
+    V: DafnyType,
+{
+    pub fn new() -> MapBuilder<K, V> {
+        MapBuilder {
+            data: HashMap::new(),
+        }
+    }
+    pub fn add(&mut self, key: &K, value: &V) {
+        // Dafny will prove that overriding has the same value anyway
+        self.data.insert(key.clone(), value.clone());
+    }
+    pub fn build(self) -> Map<K, V> {
+        Map::from_hashmap_owned(self.data)
+    }
+}
+
+impl<K, V> DafnyPrint for Map<K, V>
+where
+    K: DafnyTypeEq,
+    V: DafnyType,
+{
+    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result {
+        f.write_str("map[")?;
+        let mut first = true;
+        for (k, v) in self.data.iter() {
+            if !first {
+                f.write_str(", ")?;
+            }
+            first = false;
+            k.fmt_print(f, in_seq)?;
+            f.write_str(" := ")?;
+            v.fmt_print(f, in_seq)?;
+        }
+        f.write_str("]")
+    }
+}
+
+impl<K, V> Debug for Map<K, V>
+where
+    K: DafnyTypeEq,
+    V: DafnyTypeEq,
+{
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.fmt_print(f, false)
+    }
+}
+
+// **************
+// Immutable sets
+// **************
+
+#[derive(Clone)]
+pub struct Set<V: DafnyTypeEq> {
+    data: Rc<HashSet<V>>,
+}
+
+// Since there is no canonical way to iterate over a set to compute the hash.
+impl<T: DafnyTypeEq> ::std::hash::Hash for Set<T> {
+    fn hash<_H: ::std::hash::Hasher>(&self, _state: &mut _H) {
+        self.cardinality_usize().hash(_state)
+    }
+}
+
+impl<T: DafnyTypeEq> Eq for Set<T> {}
+
+impl<T> Default for Set<T>
+where
+    T: DafnyTypeEq,
+{
+    fn default() -> Self {
+        Self::new_empty()
+    }
+}
+impl<T: DafnyTypeEq> NontrivialDefault for Set<T> {
+    fn nontrivial_default() -> Self {
+        Self::default()
+    }
+}
+
+impl<V> PartialEq<Set<V>> for Set<V>
+where
+    V: DafnyTypeEq,
+{
+    fn eq(&self, other: &Set<V>) -> bool {
+        // 1. Same cardinality
+        // 2. All the elements of self are in the other
+        if self.cardinality_usize() != other.cardinality_usize() {
+            false
+        } else {
+            for value in self.data.iter() {
+                if !other.contains(value) {
+                    return false;
+                }
+            }
+            for value in other.data.iter() {
+                if !self.contains(value) {
+                    return false;
+                }
+            }
+            true
+        }
+    }
+}
+
+impl<T: DafnyTypeEq> PartialOrd for Set<T> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        // Partial ordering is inclusion
+        if self.cardinality_usize() <= other.cardinality_usize() {
+            for value in self.data.iter() {
+                if !other.contains(value) {
+                    return None;
+                }
+            }
+            if self.cardinality_usize() == other.cardinality_usize() {
+                Some(Ordering::Equal)
+            } else {
+                Some(Ordering::Less)
+            }
+        } else {
+            for value in other.data.iter() {
+                if !self.contains(value) {
+                    return None;
+                }
+            }
+            Some(Ordering::Greater)
+        }
+    }
+}
+
+impl<V: DafnyTypeEq> Set<V> {
+    pub fn new_empty() -> Set<V> {
+        Self::from_hashset_owned(HashSet::new())
+    }
+    pub fn from_array(array: &Vec<V>) -> Set<V> {
+        Self::from_iterator(array.iter().map(|v| v.clone()))
+    }
+    pub fn from_iterator<I>(data: I) -> Set<V>
+    where
+        I: Iterator<Item = V>,
+    {
+        let mut set: HashSet<V> = HashSet::new();
+        for value in data {
+            set.insert(value);
+        }
+        Self::from_hashset_owned(set)
+    }
+    pub fn from_sequence(data: &Rc<Sequence<V>>) -> Set<V> {
+        Self::from_array(data.to_array().borrow())
+    }
+    pub fn from_hashset_owned(hashset: HashSet<V>) -> Set<V> {
+        Set {
+            data: Rc::new(hashset),
+        }
+    }
+    pub fn cardinality_usize(&self) -> usize {
+        self.data.len()
+    }
+    pub fn cardinality(&self) -> DafnyInt {
+        DafnyInt::from_usize(self.data.len())
+    }
+    pub fn contains(&self, value: &V) -> bool {
+        self.data.contains(value)
+    }
+    pub fn merge(self: &Self, other: &Set<V>) -> Set<V> {
+        if self.cardinality_usize() == 0 {
+            return other.clone();
+        }
+        if other.cardinality_usize() == 0 {
+            return self.clone();
+        }
+        let mut result = self.data.as_ref().clone();
+        // iterate over the other, add only not contained elements
+        for value in other.data.iter() {
+            if !result.contains(value) {
+                result.insert(value.clone());
+            }
+        }
+        Set::from_hashset_owned(result)
+    }
+
+    pub fn intersect(self: &Self, other: &Set<V>) -> Set<V> {
+        if self.cardinality_usize() == 0 {
+            return self.clone();
+        }
+        if other.cardinality_usize() == 0 {
+            return other.clone();
+        }
+        // Start with an empty vec with capacity the smallest of both sets
+        let mut result = HashSet::new();
+
+        // iterate over the other, take only elements in common
+        for value in self.data.iter() {
+            if other.data.contains(value) {
+                result.insert(value.clone());
+            }
+        }
+        Set::from_hashset_owned(result)
+    }
+
+    pub fn subtract(&self, other: &Set<V>) -> Set<V> {
+        if self.cardinality_usize() == 0 {
+            return self.clone();
+        }
+        if other.cardinality_usize() == 0 {
+            return self.clone();
+        }
+        // Start with a vec the size of the first one
+        let mut result = HashSet::new();
+
+        // iterate over the other, take only elements not in second
+        for value in self.data.iter() {
+            if !other.contains(value) {
+                result.insert(value.clone());
+            }
+        }
+        Set::from_hashset_owned(result)
+    }
+
+    pub fn disjoint(&self, other: &Set<V>) -> bool {
+        if self.cardinality_usize() == 0 {
+            return true;
+        }
+        if other.cardinality_usize() == 0 {
+            return true;
+        }
+        if other.data.len() < self.data.len() {
+            // iterate over the other, take only elements not in self
+            for value in other.data.iter() {
+                if self.contains(value) {
+                    return false;
+                }
+            }
+        } else {
+            // iterate over the self, take only elements not in other
+            for value in self.data.iter() {
+                if other.contains(value) {
+                    return false;
+                }
+            }
+        }
+        true
+    }
+
+    pub fn equals(&self, other: &Set<V>) -> bool {
+        if self.cardinality_usize() != other.cardinality_usize() {
+            return false;
+        }
+        // iterate over the other, take only elements not in second
+        for value in other.data.iter() {
+            if !self.contains(value) {
+                return false;
+            }
+        }
+        true
+    }
+
+    pub fn elements(self: &Self) -> Set<V> {
+        self.clone()
+    }
+
+    pub fn as_dafny_multiset(&self) -> Multiset<V> {
+        Multiset::from_set(self)
+    }
+
+    pub fn iter(&self) -> std::collections::hash_set::Iter<'_, V> {
+        self.data.iter()
+    }
+
+    pub fn peek(&self) -> V {
+        self.data.iter().next().unwrap().clone()
+    }
+}
+
+pub struct SetBuilder<T>
+where
+    T: Clone + Eq + std::hash::Hash,
+{
+    data: HashMap<T, bool>,
+}
+
+impl<T: DafnyTypeEq> SetBuilder<T> {
+    pub fn new() -> SetBuilder<T> {
+        SetBuilder {
+            data: HashMap::new(),
+        }
+    }
+    pub fn add(&mut self, value: &T) {
+        // Dafny will prove that overriding has the same value anyway
+        self.data.insert(value.clone(), true);
+    }
+    pub fn build(self) -> Set<T> {
+        // Iterate over all the key values of the hashmap and add them to an array
+        let mut result: Vec<T> = Vec::new();
+        for (k, _v) in self.data.iter() {
+            result.push(k.clone());
+        }
+
+        Set::from_array(&result)
+    }
+}
+
+impl<V: DafnyTypeEq> DafnyPrint for Set<V> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result {
+        f.write_str("{")?;
+        let mut first = true;
+        for value in self.data.iter() {
+            if !first {
+                f.write_str(", ")?;
+            }
+            first = false;
+            value.fmt_print(f, in_seq)?;
+        }
+        f.write_str("}")
+    }
+}
+
+impl<V> Debug for Set<V>
+where
+    V: DafnyTypeEq,
+{
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.fmt_print(f, false)
+    }
+}
+
+// *******************
+// Immutable multisets
+// *******************
+
+#[derive(Clone)]
+pub struct Multiset<V: DafnyTypeEq> {
+    pub data: HashMap<V, DafnyInt>,
+    pub size: DafnyInt,
+}
+
+impl<V: DafnyTypeEq> Multiset<V> {
+    pub fn new_empty() -> Multiset<V> {
+        Self::from_array(&vec![])
+    }
+    pub fn get_total(map: &HashMap<V, DafnyInt>) -> DafnyInt {
+        let mut total = DafnyInt::zero();
+        for (_, v) in map.iter() {
+            total = total + v.clone();
+        }
+        total
+    }
+    pub fn from_hashmap_owned(map: HashMap<V, DafnyInt>) -> Multiset<V> {
+        Multiset {
+            size: Self::get_total(&map),
+            data: map,
+        }
+    }
+    pub fn from_hashmap(map: &HashMap<V, DafnyInt>) -> Multiset<V> {
+        Self::from_hashmap_owned(map.clone())
+    }
+    pub fn from_array(data: &Vec<V>) -> Multiset<V> {
+        Self::from_iterator(data.iter().map(|x| x.clone()))
+    }
+    pub fn from_iterator<I>(data: I) -> Multiset<V>
+    where
+        I: Iterator<Item = V>,
+    {
+        let mut hashmap: HashMap<V, DafnyInt> = HashMap::new();
+        let mut total: DafnyInt = DafnyInt::zero();
+        for value in data {
+            let count = hashmap.entry(value.clone()).or_insert(DafnyInt::zero());
+            *count = count.clone() + DafnyInt::one();
+            total = total + DafnyInt::one();
+        }
+        Multiset {
+            data: hashmap,
+            size: total,
+        }
+    }
+    pub fn from_set(set: &Set<V>) -> Multiset<V> {
+        Self::from_iterator(set.data.iter().map(|v| v.clone()))
+    }
+
+    pub fn cardinality_usize(&self) -> SizeT {
+        self.size.data.to_usize().unwrap()
+    }
+    pub fn cardinality(&self) -> DafnyInt {
+        self.size.clone()
+    }
+    pub fn contains(&self, value: &V) -> bool {
+        self.data.contains_key(value) && self.data.get(value).unwrap() > &DafnyInt::zero()
+    }
+    pub fn get(&self, value: &V) -> DafnyInt {
+        if self.data.contains_key(value) {
+            self.data.get(value).unwrap().clone()
+        } else {
+            DafnyInt::zero()
+        }
+    }
+    pub fn update_count(&self, value: &V, new_count: &DafnyInt) -> Multiset<V> {
+        let mut result = self.clone();
+        let old_count = self.get(value);
+        if new_count == &DafnyInt::zero() {
+            result.data.remove(value);
+        } else {
+            result.data.insert(value.clone(), new_count.clone());
+        }
+        result.size = self.size.clone() + new_count.clone() - old_count;
+        result
+    }
+    pub fn merge(&self, other: &Multiset<V>) -> Multiset<V> {
+        if other.size.is_zero() {
+            return self.clone();
+        }
+        if self.size.is_zero() {
+            return other.clone();
+        }
+        let mut result = self.data.clone();
+        for (k, v) in other.data.iter() {
+            let old_count = self.get(k);
+            let new_count = old_count.clone() + v.clone();
+            result.insert(k.clone(), new_count);
+        }
+        Multiset {
+            data: result,
+            size: self.size.clone() + other.size.clone(),
+        }
+    }
+    pub fn intersect(&self, other: &Multiset<V>) -> Multiset<V> {
+        if other.size.is_zero() {
+            return other.clone();
+        }
+        if self.size.is_zero() {
+            return self.clone();
+        }
+        let mut result = HashMap::<V, DafnyInt>::new();
+        let mut total = DafnyInt::zero();
+        for (k, other_count) in other.data.iter() {
+            let self_count = self.get(k);
+            let resulting_count = if self_count < *other_count {
+                self_count
+            } else {
+                other_count.clone()
+            };
+            if resulting_count.is_positive() {
+                result.insert(k.clone(), resulting_count.clone());
+                total = total + resulting_count;
+            }
+        }
+        Multiset {
+            data: result,
+            size: total,
+        }
+    }
+    pub fn subtract(&self, other: &Multiset<V>) -> Multiset<V> {
+        if other.size.is_zero() {
+            return self.clone();
+        }
+        if self.size.is_zero() {
+            return self.clone();
+        }
+        let mut result = self.data.clone();
+        let mut total = self.size.clone();
+        for (k, v) in other.data.iter() {
+            let old_count = self.get(k);
+            let new_count = old_count.clone() - v.clone();
+            if !new_count.is_positive() {
+                total = total - old_count.clone();
+                result.remove(k);
+            } else {
+                total = total - v.clone();
+                result.insert(k.clone(), new_count);
+            }
+        }
+        Multiset {
+            data: result,
+            size: total,
+        }
+    }
+    pub fn disjoint(&self, other: &Multiset<V>) -> bool {
+        for value in other.data.keys() {
+            if self.contains(value) {
+                return false;
+            }
+        }
+        true
+    }
+
+    pub fn as_dafny_multiset(&self) -> Multiset<V> {
+        self.clone()
+    }
+
+    pub fn peek(&self) -> V {
+        self.data.iter().next().unwrap().0.clone()
+    }
+
+    pub fn iter_raw(&self) -> std::collections::hash_map::Iter<'_, V, DafnyInt> {
+        self.data.iter()
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = V> + '_ {
+        self.data.iter().flat_map(
+            |(k, &ref v)|
+            ::std::iter::repeat(k).take(v.clone().as_usize())).cloned()
+    }
+}
+
+impl<T> Default for Multiset<T>
+where
+    T: DafnyTypeEq,
+{
+    fn default() -> Self {
+        Self::new_empty()
+    }
+}
+impl<T: DafnyTypeEq> NontrivialDefault for Multiset<T> {
+    fn nontrivial_default() -> Self {
+        Self::default()
+    }
+}
+
+impl<V: DafnyTypeEq> PartialOrd<Multiset<V>> for Multiset<V> {
+    fn partial_cmp(&self, other: &Multiset<V>) -> Option<Ordering> {
+        match self.cardinality().cmp(&other.cardinality()) {
+            Ordering::Less => {
+                for value in self.data.keys() {
+                    if !other.contains(value) || self.get(value) > other.get(value) {
+                        return None;
+                    }
+                }
+                Some(Ordering::Less)
+            }
+            Ordering::Equal => {
+                for value in self.data.keys() {
+                    if self.get(value) != other.get(value) {
+                        return None;
+                    }
+                }
+                Some(Ordering::Equal)
+            }
+            Ordering::Greater => {
+                for value in other.data.keys() {
+                    if !self.contains(value) || self.get(value) < other.get(value) {
+                        return None;
+                    }
+                }
+                Some(Ordering::Greater)
+            }
+        }
+    }
+}
+
+impl<V: DafnyTypeEq> DafnyPrint for Multiset<V> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result {
+        f.write_str("multiset{")?;
+        let mut first = true;
+        for value in self.data.iter() {
+            for _count in 0..value.1.data.to_usize().unwrap() {
+                if !first {
+                    f.write_str(", ")?;
+                }
+                first = false;
+                value.0.fmt_print(f, in_seq)?;
+            }
+        }
+        f.write_str("}")
+    }
+}
+
+impl<V> Debug for Multiset<V>
+where
+    V: DafnyTypeEq,
+{
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.fmt_print(f, false)
+    }
+}
+
+impl<V: DafnyTypeEq> PartialEq<Multiset<V>> for Multiset<V> {
+    fn eq(&self, other: &Multiset<V>) -> bool {
+        if self.cardinality() != other.cardinality() {
+            return false;
+        }
+        // iterate over the other, take only elements not in second
+        for value in other.data.iter() {
+            if !self.contains(value.0) || self.get(value.0) != *value.1 {
+                return false;
+            }
+        }
+        true
+    }
+}
+impl<V: DafnyTypeEq> Eq for Multiset<V> {}
+impl<V: DafnyTypeEq> Hash for Multiset<V> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.cardinality().hash(state);
+    }
+}
+
+pub fn dafny_rational_to_int(r: &BigRational) -> BigInt {
+    euclidian_division(r.numer().clone(), r.denom().clone())
+}
+
+pub fn nullable_referential_equality<T: ?Sized>(left: Option<Rc<T>>, right: Option<Rc<T>>) -> bool {
+    match (left, right) {
+        (Some(l), Some(r)) => Rc::ptr_eq(&l, &r),
+        (None, None) => true,
+        _ => false,
+    }
+}
+
+pub fn euclidian_division<A: Signed + Zero + One + Clone + PartialEq>(a: A, b: A) -> A {
+    if !a.is_negative() {
+        if !b.is_negative() {
+            a / b
+        } else {
+            -(a / -b)
+        }
+    } else {
+        if !b.is_negative() {
+            -((-(a + One::one())) / b) - One::one()
+        } else {
+            (-(a + One::one())) / (-b) + One::one()
+        }
+    }
+}
+
+pub fn euclidian_modulo<A: Signed + Zero + One + Clone + PartialEq>(a: A, b: A) -> A {
+    if !a.is_negative() {
+        if !b.is_negative() {
+            a % b
+        } else {
+            a % -b
+        }
+    } else {
+        let bp = b.abs();
+        let c = (-a) % bp.clone();
+        if c == Zero::zero() {
+            Zero::zero()
+        } else {
+            bp - c
+        }
+    }
+}
+
+pub struct IntegerRange<A: Add<Output = A> + One + Ord + Clone> {
+    hi: A,
+    current: A,
+}
+
+impl<A: Add<Output = A> + One + Ord + Clone> Iterator for IntegerRange<A> {
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.current < self.hi {
+            let result = self.current.clone();
+            self.current = self.current.clone() + One::one();
+            Some(result)
+        } else {
+            None
+        }
+    }
+}
+
+pub fn integer_range<A: Add<Output = A> + One + Ord + Clone>(
+    low: A,
+    hi: A,
+) -> impl Iterator<Item = A> {
+    IntegerRange { hi, current: low }
+}
+
+pub struct IntegerRangeDown<A: Sub<Output = A> + One + Ord + Clone> {
+    current: A,
+    low: A,
+}
+
+impl<A: Sub<Output = A> + One + Ord + Clone> Iterator for IntegerRangeDown<A> {
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.current > self.low {
+            self.current = self.current.clone() - One::one();
+            Some(self.current.clone())
+        } else {
+            None
+        }
+    }
+}
+
+pub fn integer_range_down<A: Sub<Output = A> + One + Ord + Clone>(
+    hi: A,
+    low: A,
+) -> impl Iterator<Item = A> {
+    IntegerRangeDown { current: hi, low }
+}
+
+// Unbounded versions
+
+pub struct IntegerRangeUnbounded<A: Add<Output = A> + One + Clone> {
+    current: A,
+}
+impl<A: Add<Output = A> + One + Clone> Iterator for IntegerRangeUnbounded<A> {
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let result = self.current.clone();
+        self.current = self.current.clone() + One::one();
+        Some(result)
+    }
+}
+pub fn integer_range_unbounded<A: Add<Output = A> + One + Clone>(
+    low: A,
+) -> impl Iterator<Item = A> {
+    IntegerRangeUnbounded { current: low }
+}
+
+pub struct IntegerRangeDownUnbounded<A: Sub<Output = A> + One + Clone> {
+    current: A,
+}
+
+impl<A: Sub<Output = A> + One + Clone> Iterator for IntegerRangeDownUnbounded<A> {
+    type Item = A;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.current = self.current.clone() - One::one();
+        Some(self.current.clone())
+    }
+}
+
+pub fn integer_range_down_unbounded<A: Sub<Output = A> + One + Clone>(
+    hi: A,
+) -> impl Iterator<Item = A> {
+    IntegerRangeDownUnbounded { current: hi }
+}
+
+pub struct LazyFieldWrapper<A>(pub Lazy<A, Box<dyn 'static + FnOnce() -> A>>);
+
+impl<A: PartialEq> PartialEq for LazyFieldWrapper<A> {
+    fn eq(&self, other: &Self) -> bool {
+        self.0.deref() == other.0.deref()
+    }
+}
+
+impl<A: Default + 'static> Default for LazyFieldWrapper<A> {
+    fn default() -> Self {
+        Self(Lazy::new(Box::new(A::default)))
+    }
+}
+
+impl<A: DafnyPrint> DafnyPrint for LazyFieldWrapper<A> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result {
+        self.0.deref().fmt_print(f, in_seq)
+    }
+}
+
+// Convert the DafnyPrint above into a macro so that we can create it for functions of any input arity
+macro_rules! dafny_print_function {
+    ($($n:tt)*) => {
+        impl <B, $($n),*> $crate::DafnyPrint for ::std::rc::Rc<dyn ::std::ops::Fn($($n),*) -> B> {
+            fn fmt_print(&self, f: &mut ::std::fmt::Formatter<'_>, _in_seq: bool) -> ::std::fmt::Result {
+                write!(f, "<function>")
+            }
+        }
+    }
+}
+// Now create a loop like impl_tuple_print_loop so that we can create functions up to size 32
+macro_rules! dafny_print_function_loop {
+    ($first:ident $($rest:ident)*) => {
+        dafny_print_function_loop! { $($rest)* }
+        dafny_print_function! { $first $($rest)* }
+    };
+    () => {
+    }
+}
+// Emit functions till 32 parameters
+dafny_print_function_loop! { A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11 A12 A13 A14 A15 A16
+A17 A18 A19 A20 A21 A22 A23 A24 A25 A26 A27 A28 A29 A30 A31 A32 }
+
+pub struct FunctionWrapper<A: ?Sized>(pub A);
+impl<A> DafnyPrint for FunctionWrapper<A> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        write!(f, "<function>")
+    }
+}
+
+impl<A: Clone> Clone for FunctionWrapper<A> {
+    fn clone(&self) -> Self {
+        Self(self.0.clone())
+    }
+}
+
+impl<A: ?Sized> PartialEq for FunctionWrapper<Rc<A>> {
+    fn eq(&self, other: &Self) -> bool {
+        Rc::ptr_eq(&self.0, &other.0)
+    }
+}
+
+pub struct DafnyPrintWrapper<T>(pub T);
+impl<T: DafnyPrint> Display for DafnyPrintWrapper<&T> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt_print(f, false)
+    }
+}
+
+// from gazebo
+#[inline]
+pub unsafe fn transmute_unchecked<A, B>(x: A) -> B {
+    assert_eq!(std::mem::size_of::<A>(), std::mem::size_of::<B>());
+    debug_assert_eq!(0, (&x as *const A).align_offset(std::mem::align_of::<B>()));
+    let b = std::ptr::read(&x as *const A as *const B);
+    std::mem::forget(x);
+    b
+}
+
+pub trait DafnyPrint {
+    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result;
+
+    // Vec<char> gets special treatment so we carry that information here
+    #[inline]
+    fn is_char() -> bool {
+        false
+    }
+}
+
+impl<T> DafnyPrint for *const T {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        write!(f, "<{} object>", std::any::type_name::<T>())
+    }
+}
+
+macro_rules! impl_print_display {
+    ($name:ty) => {
+        impl $crate::DafnyPrint for $name {
+            fn fmt_print(&self, f: &mut ::std::fmt::Formatter<'_>, _in_seq: bool) -> ::std::fmt::Result {
+                ::std::fmt::Display::fmt(&self, f)
+            }
+        }
+    };
+}
+
+impl_print_display! { String }
+impl_print_display! { bool }
+impl_print_display! { u8 }
+impl_print_display! { u16 }
+impl_print_display! { u32 }
+impl_print_display! { u64 }
+impl_print_display! { u128 }
+impl_print_display! { i8 }
+impl_print_display! { i16 }
+impl_print_display! { i32 }
+impl_print_display! { i64 }
+impl_print_display! { i128 }
+impl_print_display! { usize }
+
+impl DafnyPrint for f32 {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        write!(f, "{:.1}", self)
+    }
+}
+
+impl DafnyPrint for f64 {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        write!(f, "{:.1}", self)
+    }
+}
+
+impl DafnyPrint for () {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        write!(f, "()")
+    }
+}
+
+#[derive(Clone, Copy)]
+pub struct DafnyCharUTF16(pub u16);
+pub type DafnyStringUTF16 = Sequence<DafnyCharUTF16>;
+
+impl Default for DafnyCharUTF16 {
+    fn default() -> Self {
+        Self('a' as u16)
+    }
+}
+
+impl DafnyPrint for DafnyCharUTF16 {
+    #[inline]
+    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result {
+        let real_char = char::decode_utf16(vec![self.clone()].iter().map(|v| v.0))
+            .map(|r| r.map_err(|e| e.unpaired_surrogate()))
+            .collect::<Vec<_>>()[0];
+        let rendered_char = match real_char {
+            Ok(c) => c,
+            Err(e) => {
+                return write!(f, "Invalid UTF-16 code point: {}", e);
+            }
+        };
+
+        if in_seq {
+            write!(f, "{}", rendered_char)
+        } else {
+            write!(f, "'{}'", rendered_char)
+        }
+    }
+
+    #[inline]
+    fn is_char() -> bool {
+        true
+    }
+}
+
+impl Debug for DafnyCharUTF16 {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.fmt_print(f, false)
+    }
+}
+
+impl PartialEq<DafnyCharUTF16> for DafnyCharUTF16 {
+    fn eq(&self, other: &DafnyCharUTF16) -> bool {
+        self.0 == other.0
+    }
+}
+impl Eq for DafnyCharUTF16 {}
+impl Hash for DafnyCharUTF16 {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.0.hash(state)
+    }
+}
+
+impl PartialOrd<DafnyCharUTF16> for DafnyCharUTF16 {
+    fn partial_cmp(&self, other: &DafnyCharUTF16) -> Option<Ordering> {
+        (self.0).partial_cmp(&other.0)
+    }
+}
+
+impl Add<DafnyCharUTF16> for DafnyCharUTF16 {
+    type Output = DafnyCharUTF16;
+
+    fn add(self, rhs: DafnyCharUTF16) -> Self::Output {
+        DafnyCharUTF16(self.0 + rhs.0)
+    }
+}
+
+impl Sub<DafnyCharUTF16> for DafnyCharUTF16 {
+    type Output = DafnyCharUTF16;
+
+    fn sub(self, rhs: DafnyCharUTF16) -> Self::Output {
+        DafnyCharUTF16(self.0 - rhs.0)
+    }
+}
+
+#[derive(Clone, Copy)]
+pub struct DafnyChar(pub char);
+pub type DafnyString = Sequence<DafnyChar>;
+
+impl Default for DafnyChar {
+    fn default() -> Self {
+        Self('a')
+    }
+}
+
+impl DafnyPrint for DafnyChar {
+    #[inline]
+    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result {
+        if in_seq {
+            write!(f, "{}", self.0)
+        } else {
+            write!(f, "'{}'", self.0)
+        }
+    }
+
+    #[inline]
+    fn is_char() -> bool {
+        true
+    }
+}
+
+impl Debug for DafnyChar {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        self.fmt_print(f, false)
+    }
+}
+
+impl PartialEq<DafnyChar> for DafnyChar {
+    fn eq(&self, other: &DafnyChar) -> bool {
+        self.0 == other.0
+    }
+}
+
+impl PartialOrd<DafnyChar> for DafnyChar {
+    fn partial_cmp(&self, other: &DafnyChar) -> Option<Ordering> {
+        (self.0 as u32).partial_cmp(&(other.0 as u32))
+    }
+}
+impl Eq for DafnyChar {}
+impl Hash for DafnyChar {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.0.hash(state)
+    }
+}
+
+impl Add<DafnyChar> for DafnyChar {
+    type Output = DafnyChar;
+
+    fn add(self, rhs: DafnyChar) -> Self::Output {
+        DafnyChar(unsafe { char::from_u32_unchecked(self.0 as u32 + rhs.0 as u32) })
+    }
+}
+
+impl Sub<DafnyChar> for DafnyChar {
+    type Output = DafnyChar;
+
+    fn sub(self, rhs: DafnyChar) -> Self::Output {
+        DafnyChar(unsafe { char::from_u32_unchecked(self.0 as u32 - rhs.0 as u32) })
+    }
+}
+
+impl<T: DafnyPrint> DafnyPrint for Option<T> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        match self {
+            Some(x) => x.fmt_print(f, false),
+            None => write!(f, "null"),
+        }
+    }
+}
+
+impl DafnyPrint for BigInt {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        write!(f, "{}", self)
+    }
+}
+
+fn divides_a_power_of_10(mut i: BigInt) -> (bool, BigInt, usize) {
+    let one: BigInt = One::one();
+
+    let mut factor = one.clone();
+    let mut log10 = 0;
+
+    let zero = Zero::zero();
+    let ten = BigInt::from_i32(10).unwrap();
+
+    if i <= zero {
+        return (false, factor, log10);
+    }
+
+    while i.is_multiple_of(&ten) {
+        i /= BigInt::from_i32(10).unwrap();
+        log10 += 1;
+    }
+
+    let two = BigInt::from_i32(2).unwrap();
+    let five = BigInt::from_i32(5).unwrap();
+
+    while i.is_multiple_of(&five) {
+        i /= &five;
+        factor *= &two;
+        log10 += 1;
+    }
+
+    while i.is_multiple_of(&two) {
+        i /= &two;
+        factor *= &two;
+        log10 += 1;
+    }
+
+    (i == one, factor, log10)
+}
+
+impl DafnyPrint for BigRational {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        if self.denom() == &One::one() || self.numer() == &Zero::zero() {
+            write!(f, "{}.0", self.numer())
+        } else {
+            let (divides, factor, log10) = divides_a_power_of_10(self.denom().clone());
+            if divides {
+                let mut num = self.numer().clone();
+                num *= factor;
+
+                if num.is_negative() {
+                    write!(f, "-")?;
+                    num = -num;
+                }
+
+                let digits = num.to_string();
+
+                if log10 < digits.len() {
+                    let digit_count = digits.len() - log10;
+                    write!(f, "{}", &digits[..digit_count])?;
+                    write!(f, ".")?;
+                    write!(f, "{}", &digits[digit_count..])
+                } else {
+                    let z = log10 - digits.len();
+                    write!(f, "0.")?;
+                    for _ in 0..z {
+                        write!(f, "0")?;
+                    }
+                    write!(f, "{}", digits)
+                }
+            } else {
+                write!(f, "({}.0 / {}.0)", self.numer(), self.denom())
+            }
+        }
+    }
+}
+
+impl<T: DafnyPrint> DafnyPrint for Rc<T> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result {
+        self.as_ref().fmt_print(f, in_seq)
+    }
+}
+
+impl<T: DafnyPrint> DafnyPrint for Vec<T> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        if !T::is_char() {
+            write!(f, "[")?;
+        }
+
+        for (i, item) in self.iter().enumerate() {
+            if !T::is_char() {
+                if i > 0 {
+                    write!(f, ", ")?;
+                }
+
+                item.fmt_print(f, false)?;
+            } else {
+                item.fmt_print(f, true)?;
+            }
+        }
+
+        if !T::is_char() {
+            write!(f, "]")
+        } else {
+            Ok(())
+        }
+    }
+}
+
+impl<T: DafnyPrint> DafnyPrint for RefCell<T> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        self.borrow().fmt_print(f, _in_seq)
+    }
+}
+
+impl<T: DafnyPrint> DafnyPrint for HashSet<T> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        write!(f, "{{")?;
+
+        let mut i = 0;
+
+        for item in self.iter() {
+            if i > 0 {
+                write!(f, ", ")?;
+            }
+
+            item.fmt_print(f, false)?;
+
+            i += 1;
+        }
+
+        write!(f, "}}")
+    }
+}
+
+pub fn char_lt(left: char, right: char) -> bool {
+    let left_code = left as u32;
+    let right_code = right as u32;
+
+    left_code < right_code
+}
+
+pub fn string_of(s: &str) -> DafnyString {
+    s.chars()
+        .map(|v| DafnyChar(v))
+        .collect::<Sequence<DafnyChar>>()
+}
+
+pub fn string_utf16_of(s: &str) -> DafnyStringUTF16 {
+    Sequence::from_array_owned(s.encode_utf16().map(|v| DafnyCharUTF16(v)).collect())
+}
+
+macro_rules! impl_tuple_print {
+    ($($items:ident)*) => {
+        impl <$($items,)*> $crate::DafnyPrint for ($($items,)*)
+        where
+            $($items: $crate::DafnyPrint,)*
+        {
+            #[allow(unused_assignments)]
+            fn fmt_print(&self, f: &mut ::std::fmt::Formatter<'_>, _in_seq: bool) -> ::std::fmt::Result {
+                #[allow(non_snake_case)]
+                let ($($items,)*) = self;
+
+                write!(f, "(")?;
+
+                let mut i = 0;
+
+                $(
+                    if (i > 0) {
+                        write!(f, ", ")?;
+                    }
+
+                    $items.fmt_print(f, false)?;
+
+                    i += 1;
+                )*
+
+                write!(f, ")")
+            }
+        }
+    };
+}
+
+macro_rules! impl_tuple_print_loop {
+    () => {};
+    ($first:ident $($rest:ident)*) => {
+        impl_tuple_print_loop! { $($rest)* }
+        impl_tuple_print! { $first $($rest)* }
+    };
+}
+
+// 32 elements ought to be enough for everyone
+impl_tuple_print_loop! {
+    A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10
+    A11 A12 A13 A14 A15 A16 A17 A18 A19 A20
+    A21 A22 A23 A24 A25 A26 A27 A28 A29 A30
+    A31
+}
+
+// seq!(1, 2, 3) is rewritten to Sequence::from_array_owned(vec!(1, 2, 3))
+#[macro_export]
+macro_rules! seq {
+    ($($x:expr),*) => {
+        $crate::Sequence::from_array_owned(vec![$($x), *])
+    }
+}
+
+#[macro_export]
+macro_rules! set {
+    ($($x:expr), *) => {
+        {
+            // No warning about this variable not needing to be mut in the case of an empty set
+            #[allow(unused_mut)]
+            let mut temp_hash = ::std::collections::HashSet::new();
+            $(
+                temp_hash.insert($x);
+            )*
+            $crate::Set::from_hashset_owned(temp_hash)
+        }
+    }
+}
+
+#[macro_export]
+macro_rules! multiset {
+    ($($x:expr), *) => {
+        {
+            #[allow(unused_mut)]
+            let mut temp_hash = ::std::collections::HashMap::new();
+            #[allow(unused_mut)]
+            let mut total_size: usize = 0;
+            $( {
+                #[allow(unused_mut)]
+                let mut entry = temp_hash.entry($x).or_insert($crate::DafnyInt::from(0));
+                *entry = (*entry).clone() + $crate::DafnyInt::from(1);
+                total_size += 1;
+              }
+            )*
+            $crate::Multiset {
+                data: temp_hash,
+                size: $crate::DafnyInt::from(total_size),
+            }
+        }
+    }
+}
+
+// we enable the syntax map![k1 => v1, k2 => v2]
+#[macro_export]
+macro_rules! map {
+    ($($k:expr => $v:expr), *) => {
+        {
+            #[allow(unused_mut)]
+            let mut temp_hash = ::std::collections::HashMap::new();
+            $(
+                temp_hash.insert($k.clone(), $v.clone());
+            )*
+            $crate::Map::from_hashmap_owned(temp_hash)
+        }
+    }
+}
+
+#[macro_export]
+macro_rules! int {
+    ($x:expr) => {
+        $crate::DafnyInt::from($x)
+    };
+}
+
+//////////
+// Arrays
+//////////
+
+macro_rules! ARRAY_GETTER_LENGTH0 {
+    () => {
+        #[inline]
+        pub fn length0(&self) -> $crate::DafnyInt {
+            $crate::DafnyInt::from(self.length0_usize())
+        }
+        #[inline]
+        pub fn length0_usize(&self) -> usize {
+            self.data.len()
+        }
+    }
+}
+macro_rules! ARRAY_GETTER_LENGTH {
+    ($field: ident, $field_usize: ident) => {
+        #[inline]
+        pub fn $field(&self) -> $crate::DafnyInt {
+            $crate::DafnyInt::from(self.$field_usize())
+        }
+        #[inline]
+        pub fn $field_usize(&self) -> usize {
+            self.$field
+        }
+    }
+}
+
+// An 1-dimensional Dafny array is a zero-cost abstraction over a pointer on a native array
+#[macro_export]
+macro_rules! array {
+    ($($x:expr), *) => {
+        $crate::array::from_native(::std::boxed::Box::new([$($x), *]))
+    }
+}
+
+macro_rules! ARRAY_INIT {
+    {$length: ident, $inner: expr} => {
+        $crate::array::initialize_box_usize($length, {
+            ::std::rc::Rc::new(move |_| { $inner })
+        })
+    }
+}
+
+macro_rules! ARRAY_INIT_INNER {
+    ($length: ident) => {
+        $crate::array::placebos_box_usize::<T>($length)
+    }
+}
+
+// ARRAY_DATA_TYPE(length0, length1, length2) will return
+// Box<[Box<[Box<[T]>]>]>
+macro_rules! ARRAY_DATA_TYPE {
+    ($length:ident) => {
+        ::std::boxed::Box<[T]>
+    };
+    ($length:ident, $($rest_length:ident),+) => {
+        ::std::boxed::Box<[ARRAY_DATA_TYPE!($($rest_length),+)]>
+    };
+}
+
+// Macro to generate generalizations of the function placebos_usize to higher-dimensions arrays
+
+#[macro_export]
+macro_rules! INIT_ARRAY_DATA {
+    // Handle the innermost array initialization
+    ($ArrayType:ident, $last_length:ident) => {
+        ARRAY_INIT_INNER!($last_length)
+    };
+    // Handle recursive array initialization for multiple dimensions
+    ($ArrayType:ident, $first_length:ident, $($rest_length:ident),+) => {
+        ARRAY_INIT!($first_length, INIT_ARRAY_DATA!($ArrayType, $($rest_length),+))
+    };
+}
+
+macro_rules! ARRAY_METHODS {
+    // Accepts any number of length identifiers
+    ($ArrayType:ident, $length0: ident, $($length:ident),+) => {
+        pub fn placebos_box_usize(
+            $length0: usize,
+            $($length: usize),+
+        ) -> ::std::boxed::Box<$ArrayType<$crate::MaybeUninit<T>>> {
+            ::std::boxed::Box::new($ArrayType {
+                $($length: $length),+,
+                data: INIT_ARRAY_DATA!($ArrayType, $length0, $($length),+),
+            })
+        }
+
+        pub fn placebos_usize(
+            $length0: usize,
+            $($length: usize),+
+        ) -> $crate::Ptr<$ArrayType<$crate::MaybeUninit<T>>> {
+            $crate::Ptr::from_box(Self::placebos_box_usize(
+                $length0,
+                $($length),+
+            ))
+        }
+
+        pub fn placebos_usize_object(
+            $length0: usize,
+            $($length: usize),+
+        ) -> $crate::Object<$ArrayType<$crate::MaybeUninit<T>>> {
+            // SAFETY: We know the object is owned and never referred to by anything else
+            $crate::Object::new($ArrayType {
+                $($length: $length),+,
+                data: INIT_ARRAY_DATA!($ArrayType, $length0, $($length),+),
+            })
+        }
+
+        pub fn placebos(
+            $length0: &$crate::DafnyInt,
+            $($length: &$crate::DafnyInt),+
+        ) -> $crate::Ptr<$ArrayType<$crate::MaybeUninit<T>>> {
+            Self::placebos_usize(
+                $length0.as_usize(),
+                $($length.as_usize()),+
+            )
+        }
+
+        // Once all the elements have been initialized, transform the signature of the pointer
+        pub fn construct(p: $crate::Ptr<$ArrayType<$crate::MaybeUninit<T>>>) -> $crate::Ptr<$ArrayType<T>> {
+            unsafe { std::mem::transmute(p) }
+        }
+        // Once all the elements have been initialized, transform the signature of the pointer
+        pub fn construct_object(p: $crate::Object<$ArrayType<$crate::MaybeUninit<T>>>) -> $crate::Object<$ArrayType<T>> {
+            unsafe { std::mem::transmute(p) }
+        }
+    };
+}
+
+
+macro_rules! ARRAY_STRUCT {
+    ($ArrayType:ident, $length0: ident, $($length:ident),+) => {
+        pub struct $ArrayType<T> {
+            $($length: usize),+,
+            pub data: ARRAY_DATA_TYPE!($length0, $($length),+),
+        }
+    }
+}
+
+macro_rules! ARRAY_TO_VEC_LOOP {
+    (@inner $self: ident, $tmp: ident, $data: expr) => {
+        $tmp.push($data.clone());
+    };
+    (@for $self: ident, $tmp: ident, $data: expr, $length_usize: ident $(, $rest_length_usize: ident)*) => {
+        for i in 0..$self.$length_usize() {
+            ARRAY_TO_VEC_LOOP!(@inner $self, $tmp, $data[i] $(, $rest_length_usize)*);
+        }
+    };
+    (@inner $self: ident, $outerTmp: ident, $data: expr $(, $rest_length_usize: ident)*) => {
+        {
+            let mut tmp = ::std::vec::Vec::new();
+            ARRAY_TO_VEC_LOOP!(@for $self, tmp, $data $(, $rest_length_usize)*);
+            $outerTmp.push(tmp);
+        }
+    };
+
+    ($self: ident, $data: expr $(, $rest_length_usize: ident)*) => {
+        {
+            let mut tmp = ::std::vec::Vec::new();
+            ARRAY_TO_VEC_LOOP!(@for $self, tmp, $data $(, $rest_length_usize)*);
+            tmp
+        }
+    };
+}
+
+macro_rules! ARRAY_TO_VEC_TYPE {
+    ($length0: ident) => {
+        ::std::vec::Vec<T>
+    };
+    ($length0: ident $(, $res_length: ident)*) => {
+        ::std::vec::Vec<ARRAY_TO_VEC_TYPE!($($res_length), *)>
+    }
+}
+
+macro_rules! ARRAY_TO_VEC {
+    ($length0_usize: ident $(, $res_length_usize: ident)*) => {
+        pub fn to_vec(&self) -> ARRAY_TO_VEC_TYPE!($length0_usize, $($res_length_usize),*) {
+            ARRAY_TO_VEC_LOOP!(self, self.data, $length0_usize, $($res_length_usize),*)
+        }
+    }
+}
+
+macro_rules! ARRAY_LENGTHS {
+    () => {
+
+    };
+    (($length0: ident, $length0_usize: ident) $(, $rest: tt)*) => {
+        ARRAY_GETTER_LENGTH0!();
+        ARRAY_LENGTHS!($(, $rest)*);
+    };
+    (, ($length: ident, $length_usize: ident) $(, $rest: tt)*) => {
+        ARRAY_GETTER_LENGTH!($length, $length_usize);
+        ARRAY_LENGTHS!($(, $rest)*);
+    }
+}
+
+macro_rules! ARRAY_METHODS_WRAPPER {
+    ($ArrayType:ident, $(($length:ident, $length_usize: ident)), +) => {
+        ARRAY_METHODS!($ArrayType, $($length), +);
+    }
+}
+
+macro_rules! ARRAY_TO_VEC_WRAPPER {
+    ($(($length:ident, $length_usize: ident)), +) => {
+        ARRAY_TO_VEC!($($length_usize), +);
+    }
+}
+
+macro_rules! ARRAY_STRUCT_WRAPPER {
+    ($ArrayType:ident, $(($length:ident, $length_usize: ident)), +) => {
+        ARRAY_STRUCT!($ArrayType, $($length), +);
+    }
+}
+
+macro_rules! ARRAY_DEF {
+    ($ArrayType:ident, $(($length:ident, $length_usize: ident)), +) => {
+        ARRAY_STRUCT_WRAPPER!($ArrayType, $(($length, $length_usize)), +);
+        impl<T> $ArrayType<T> {
+            ARRAY_LENGTHS!{
+                $(($length, $length_usize)), +
+            }
+            ARRAY_METHODS_WRAPPER!{$ArrayType,
+                $(($length, $length_usize)), +
+            }
+        }
+        impl<T: ::std::clone::Clone> $ArrayType<T> {
+            ARRAY_TO_VEC_WRAPPER!{
+                $(($length, $length_usize)), +
+            }
+        }
+    }
+}
+
+// Array2 to Array16
+
+ARRAY_DEF!{Array2,
+    (length0, length0_usize),
+    (length1, length1_usize)
+}
+
+ARRAY_DEF!{Array3,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize)
+}
+
+ARRAY_DEF!{Array4,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize)
+}
+
+ARRAY_DEF!{Array5,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize)
+}
+
+ARRAY_DEF!{Array6,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize)
+}
+
+ARRAY_DEF!{Array7,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize),
+    (length6, length6_usize)
+}
+
+ARRAY_DEF!{Array8,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize),
+    (length6, length6_usize),
+    (length7, length7_usize)
+}
+
+ARRAY_DEF!{Array9,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize),
+    (length6, length6_usize),
+    (length7, length7_usize),
+    (length8, length8_usize)
+}
+
+ARRAY_DEF!{Array10,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize),
+    (length6, length6_usize),
+    (length7, length7_usize),
+    (length8, length8_usize),
+    (length9, length9_usize)
+}
+
+ARRAY_DEF!{Array11,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize),
+    (length6, length6_usize),
+    (length7, length7_usize),
+    (length8, length8_usize),
+    (length9, length9_usize),
+    (length10, length10_usize)
+}
+
+ARRAY_DEF!{Array12,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize),
+    (length6, length6_usize),
+    (length7, length7_usize),
+    (length8, length8_usize),
+    (length9, length9_usize),
+    (length10, length10_usize),
+    (length11, length11_usize)
+}
+
+ARRAY_DEF!{Array13,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize),
+    (length6, length6_usize),
+    (length7, length7_usize),
+    (length8, length8_usize),
+    (length9, length9_usize),
+    (length10, length10_usize),
+    (length11, length11_usize),
+    (length12, length12_usize)
+}
+
+ARRAY_DEF!{Array14,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize),
+    (length6, length6_usize),
+    (length7, length7_usize),
+    (length8, length8_usize),
+    (length9, length9_usize),
+    (length10, length10_usize),
+    (length11, length11_usize),
+    (length12, length12_usize),
+    (length13, length13_usize)
+}
+
+ARRAY_DEF!{Array15,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize),
+    (length6, length6_usize),
+    (length7, length7_usize),
+    (length8, length8_usize),
+    (length9, length9_usize),
+    (length10, length10_usize),
+    (length11, length11_usize),
+    (length12, length12_usize),
+    (length13, length13_usize),
+    (length14, length14_usize)
+}
+
+ARRAY_DEF!{Array16,
+    (length0, length0_usize),
+    (length1, length1_usize),
+    (length2, length2_usize),
+    (length3, length3_usize),
+    (length4, length4_usize),
+    (length5, length5_usize),
+    (length6, length6_usize),
+    (length7, length7_usize),
+    (length8, length8_usize),
+    (length9, length9_usize),
+    (length10, length10_usize),
+    (length11, length11_usize),
+    (length12, length12_usize),
+    (length13, length13_usize),
+    (length14, length14_usize),
+    (length15, length15_usize)
+}
+
+pub mod array {
+    use super::DafnyInt;
+    use num::ToPrimitive;
+    use std::mem::MaybeUninit;
+    use std::{boxed::Box, rc::Rc, vec::Vec};
+    use super::Ptr;
+
+    #[inline]
+    pub fn from_native<T>(v: Box<[T]>) -> Ptr<[T]> {
+        Ptr::from_box(v)
+    }
+    #[inline]
+    pub fn from_vec<T>(v: Vec<T>) -> Ptr<[T]> {
+        from_native(v.into_boxed_slice())
+    }
+    pub fn to_vec<T>(v: Ptr<[T]>) -> Vec<T> {
+        unsafe { Box::<[T]>::from_raw(v.into_raw()) }.into_vec()
+    }
+    pub fn initialize_usize<T>(n: usize, initializer: Rc<dyn Fn(usize) -> T>) -> Ptr<[T]> {
+        let mut v = Vec::with_capacity(n);
+        for i in 0..n {
+            v.push(initializer(i));
+        }
+        from_vec(v)
+    }
+
+    pub fn placebos<T>(n: &DafnyInt) -> Ptr<[MaybeUninit<T>]> {
+        placebos_usize(n.as_usize())
+    }
+    pub fn placebos_usize<T>(n: usize) -> Ptr<[MaybeUninit<T>]> {
+        Ptr::from_box(placebos_box_usize(n))
+    }
+    pub fn placebos_usize_object<T>(n: usize) -> super::Object<[MaybeUninit<T>]> {
+        super::rcmut::array_object_from_box(placebos_box_usize(n))
+    }
+    // Once all the elements have been initialized, transform the signature of the pointer
+    pub fn construct<T>(p: Ptr<[MaybeUninit<T>]>) -> Ptr<[T]> {
+        unsafe { std::mem::transmute(p) }
+    }
+    pub fn construct_object<T>(p: super::Object<[MaybeUninit<T>]>) -> super::Object<[T]> {
+        unsafe { std::mem::transmute(p) }
+    }
+
+    pub fn placebos_box<T>(n: &DafnyInt) -> Box<[MaybeUninit<T>]> {
+        placebos_box_usize(n.to_usize().unwrap())
+    }
+    pub fn placebos_box_usize<T>(n_usize: usize) -> Box<[MaybeUninit<T>]> {
+        // This code is optimized to take a constant time. See:
+        // https://users.rust-lang.org/t/allocate-a-boxed-array-of-maybeuninit/110169/7
+        std::iter::repeat_with(MaybeUninit::uninit)
+            .take(n_usize)
+            .collect()
+    }
+
+    pub fn initialize<T>(n: &DafnyInt, initializer: Rc<dyn Fn(&DafnyInt) -> T>) -> Ptr<[T]> {
+        super::Ptr::from_box(initialize_box(n, initializer))
+    }
+
+    pub fn initialize_box<T>(n: &DafnyInt, initializer: Rc<dyn Fn(&DafnyInt) -> T>) -> Box<[T]> {
+        initialize_box_usize(n.to_usize().unwrap(), initializer)
+    }
+    pub fn initialize_box_usize<T>(
+        n_usize: usize,
+        initializer: Rc<dyn Fn(&DafnyInt) -> T>,
+    ) -> Box<[T]> {
+        let mut v = Vec::with_capacity(n_usize);
+        for i in 0..n_usize {
+            v.push(initializer(&int!(i)));
+        }
+        v.into_boxed_slice()
+    }
+
+    #[inline]
+    pub fn length_usize<T>(this: Ptr<[T]>) -> usize {
+        // safety: Dafny won't call this function unless it can guarantee the array is still allocated
+        super::read!(this).len()
+    }
+    #[inline]
+    pub fn length<T>(this: Ptr<[T]>) -> DafnyInt {
+        int!(length_usize(this))
+    }
+    #[inline]
+    pub fn get_usize<T: Clone>(this: Ptr<[T]>, i: usize) -> T {
+        // safety: Dafny won't call this function unless it can guarantee the array is still allocated
+        this.as_ref()[i].clone()
+    }
+    #[inline]
+    pub fn get<T: Clone>(this: Ptr<[T]>, i: &DafnyInt) -> T {
+        get_usize(this, i.to_usize().unwrap())
+    }
+    #[inline]
+    pub fn update_usize<T>(this: Ptr<[T]>, i: usize, val: T) {
+        // safety: Dafny won't call this function unless it can guarantee the array is still allocated
+        crate::modify!(this)[i] = val;
+    }
+    #[inline]
+    pub fn update<T>(this: Ptr<[T]>, i: &DafnyInt, val: T) {
+        update_usize(this, i.to_usize().unwrap(), val);
+    }
+}
+
+///////////////////
+// Class helpers //
+///////////////////
+pub fn allocate<T>() -> Ptr<T> {
+    let this_ptr = Box::into_raw(Box::new(MaybeUninit::uninit())) as *mut MaybeUninit<T> as *mut T;
+    Ptr::from_raw_nonnull(this_ptr)
+}
+// Generic function to safely deallocate a raw pointer
+#[inline]
+pub fn deallocate<T: ?Sized>(pointer: Ptr<T>) {
+    // safety: Dafny won't call this function unless it can guarantee the object is still allocated
+    unsafe {
+        // Takes ownership of the reference,
+        // so that it's deallocated at the end of the method
+        let _ = Box::from_raw(pointer.into_raw());
+    }
+}
+
+pub struct ExactPool<T: Clone> {
+    current: T,
+    yielded: bool,
+}
+
+// Implement iterator for an exact pool, yielding
+impl<T: Clone> Iterator for ExactPool<T> {
+    type Item = T;
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.yielded {
+            None
+        } else {
+            self.yielded = true;
+            Some(self.current.clone())
+        }
+    }
+}
+pub fn exact_range<T: Clone>(value: T) -> ExactPool<T> {
+    ExactPool {
+        current: value,
+        yielded: false,
+    }
+}
+
+// Any Dafny trait must require classes extending it to have a method "as_any_mut"
+// that can convert the reference from that trait to a reference of Any
+
+// 'is' is meant to be used on references only, to check if a trait reference is a class reference
+#[macro_export]
+macro_rules! is {
+    ($raw:expr, $id:ty) => {
+        $crate::modify!($crate::cast_any!($raw))
+            .downcast_mut::<$id>()
+            .is_some()
+    };
+}
+
+#[macro_export]
+macro_rules! is_object {
+    ($raw:expr, $id:ty) => {
+        $crate::md!($crate::cast_any_object!($raw))
+            .downcast_mut::<$id>()
+            .is_some()
+    };
+}
+
+// cast_any is meant to be used on references only, to convert any references (classes or traits)*
+// to an Any reference trait
+#[macro_export]
+macro_rules! cast_any {
+    ($raw:expr) => {
+        $crate::Upcast::<dyn ::std::any::Any>::upcast($crate::read!($raw))
+    };
+}
+// cast_any_object is meant to be used on references only, to convert any references (classes or traits)*
+// to an Any reference trait
+#[macro_export]
+macro_rules! cast_any_object {
+    ($obj:expr) => {
+        $crate::UpcastObject::<dyn ::std::any::Any>::upcast($crate::md!($obj))
+    };
+}
+
+
+// When initializing an uninitialized field for the first time,
+// we ensure we don't drop the previous content
+// This is problematic if the same field is overwritten multiple times
+/// In that case, prefer to use update_uninit
+#[macro_export]
+macro_rules! update_field_nodrop {
+    ($ptr:expr, $field:ident, $value:expr) => {
+        $crate::update_nodrop!($crate::modify!($ptr).$field, $value)
+    };
+}
+
+// Same as update_field_nodrop but for mutable fields
+#[macro_export]
+macro_rules! update_field_mut_nodrop {
+    ($ptr:expr, $field:ident, $value:expr) => {
+        let lhs = $ptr;
+        let value = $value;
+        unsafe { $crate::read!(lhs).$field.get().write(value) }
+    };
+}
+
+// When initializing an uninitialized field for the first time,
+// we ensure we don't drop the previous content
+#[macro_export]
+macro_rules! update_nodrop {
+    ($ptr:expr, $value:expr) => {
+        // safety: Dafny won't call this function unless it can guarantee the value at the address was not
+        // yet initialized, so that not dropping it won't create a memory leak
+        unsafe { ::std::ptr::addr_of_mut!($ptr).write($value) }
+    }
+}
+
+// Given a class or array pointer, transforms it to a mutable reference
+#[macro_export]
+macro_rules! modify {
+    ($ptr:expr) => {
+        {
+            #[allow(unused_unsafe)]
+            let tmp = unsafe {&mut *(::std::cell::UnsafeCell::raw_get($ptr.0.unwrap_unchecked().as_ptr()))};
+            tmp
+        }
+    }
+}
+
+// Given a class or array pointer, transforms it to a read-only reference
+#[macro_export]
+macro_rules! read {
+    ($ptr:expr) => {
+        {
+            #[allow(unused_unsafe)]
+            let tmp = unsafe {&*(::std::cell::UnsafeCell::raw_get($ptr.0.unwrap_unchecked().as_ptr()))};
+            tmp
+        }
+    }
+}
+
+// If the field is guaranteed to be assigned only once, update_field_nodrop is sufficient
+#[macro_export]
+macro_rules! update_field_uninit {
+    ($t:expr, $field:ident, $field_assigned:expr, $value:expr) => {{
+        let computed_value = $value;
+        #[allow(unused_assignments)]
+        if $field_assigned {
+            $crate::modify!($t).$field = computed_value;
+        } else {
+            $crate::update_field_nodrop!($t, $field, computed_value);
+            $field_assigned = true;
+        }
+    }};
+}
+
+// Same as update_field_uninit but for mutable fields
+#[macro_export]
+macro_rules! update_field_mut_uninit {
+    ($t:expr, $field:ident, $field_assigned:expr, $value:expr) => {{
+        let computed_value = $value;
+        #[allow(unused_assignments)]
+        if $field_assigned {
+            $crate::modify_field!($crate::read!($t).$field, computed_value);
+        } else {
+            $crate::update_field_mut_nodrop!($t, $field, computed_value);
+            $field_assigned = true;
+        }
+    }};
+}
+
+// Macro to call at the end of the first new; constructor when not every field is guaranteed to be assigned.
+#[macro_export]
+macro_rules! update_field_if_uninit {
+    ($t:expr, $field:ident, $field_assigned:expr, $value:expr) => {{
+        let computed_value = $value;
+        if !$field_assigned {
+            $crate::update_field_nodrop!($t, $field, computed_value);
+            $field_assigned = true;
+        }
+    }};
+}
+
+// Same as update_field_if_uninit but for mutable fields
+#[macro_export]
+macro_rules! update_field_mut_if_uninit {
+    ($t:expr, $field:ident, $field_assigned:expr, $value:expr) => {{
+        let computed_value = $value;
+        if !$field_assigned {
+            $crate::update_field_mut_nodrop!($t, $field, computed_value);
+            $field_assigned = true;
+        }
+    }};
+}
+
+/////////////////
+// Raw pointers (require wrapping because of equality)
+/////////////////
+
+// This Ptr has the same run-time space as *mut
+pub struct Ptr<T: ?Sized>(pub Option<NonNull<UnsafeCell<T>>>);
+
+impl <T: ?Sized> Ptr<T> {
+    pub fn null() -> Self {
+        Ptr(None)
+    }
+    pub fn is_null(&self) -> bool {
+        self.0.is_none()
+    }
+    #[inline]
+    pub fn from_raw_nonnull(t: *mut T) -> Ptr<T> {
+        unsafe { Ptr(Some(::std::mem::transmute::<NonNull<T>, NonNull<UnsafeCell<T>>>(NonNull::new_unchecked(t)))) }
+    }
+    pub fn from_box(t: Box<T>) -> Ptr<T> {
+        Self::from_raw_nonnull(Box::into_raw(t))
+    }
+    pub fn into_raw(self) -> *mut T {
+        if self.is_null() {
+            panic!("Cannot turn a null pointer into a raw pointer");
+        }
+        let nonnull = unsafe { self.0.unwrap_unchecked() };
+        unsafe { ::std::mem::transmute::<_, *mut T>(nonnull.as_ptr()) }
+    }
+}
+
+impl <T: ?Sized + 'static + Upcast<dyn Any>> Ptr<T> {
+    pub fn is_instance_of<U: 'static>(self) -> bool {
+        if self.is_null() {
+            false
+        } else {
+            read!(Upcast::<dyn Any>::upcast(read!(self)))
+                .downcast_ref::<U>()
+                .is_some()
+        }
+    }
+}
+
+impl<T> NontrivialDefault for Ptr<T> {
+    fn nontrivial_default() -> Self {
+        // Create a null pointer
+        Self::null()
+    }
+}
+
+impl <T> Ptr<T> {
+    pub fn new(val: T) -> Ptr<T> {
+        Self::from_box(Box::new(val))
+    }
+}
+
+
+impl<T: ?Sized> Eq for Ptr<T> {}
+
+impl<T: ?Sized> Clone for Ptr<T> {
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl <T: ?Sized> Copy for Ptr<T> { }
+
+impl <T: ?Sized>Default for Ptr<T> {
+    fn default() -> Self {
+        Ptr::null()
+    }
+}
+
+impl<T: ?Sized> Debug for Ptr<T> {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        self.fmt_print(f, false)
+    }
+}
+impl <T: ?Sized> DafnyPrint for Ptr<T> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        write!(f, "<object>")
+    }
+}
+
+
+impl <T: ?Sized, U: ?Sized> PartialEq<Ptr<U>> for Ptr<T> {
+    fn eq(&self, other: &Ptr<U>) -> bool {
+        if !self.is_null() {
+            if !other.is_null() {
+                // To compare addresses, we need to ensure we only compare thin pointers
+                // https://users.rust-lang.org/t/comparing-addresses-between-fat-and-thin-pointers/89008
+                ::std::ptr::eq(
+                    self.clone().into_raw() as *const (), 
+                 other.clone().into_raw() as *const ())
+            } else {
+                false
+            }
+        } else if !other.is_null() {
+            false
+        } else {
+            true
+        }
+    }
+}
+
+impl <T: ?Sized> std::hash::Hash for Ptr<T> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        if !self.is_null() {
+            (read!(self.clone()) as *const T as *const ()).hash(state);
+        } else {
+            0.hash(state);
+        }
+    }
+}
+
+impl <T: ?Sized> AsMut<T> for Ptr<T> {
+    fn as_mut(&mut self) -> &mut T {
+        modify!(self.clone())
+    }
+}
+impl <T: ?Sized> AsRef<T> for Ptr<T> {
+    fn as_ref(&self) -> &T {
+        read!(self.clone())
+    }
+}
+
+impl <T: ?Sized> Ptr<T> {
+    // Never use on local values, only on &self types previously called on Ptr types.
+    pub fn from_ref(r: &T) -> Ptr<T> {
+        Ptr(unsafe {::std::mem::transmute::<_, Option<NonNull<UnsafeCell<T>>>>(r as *const T)})
+    }
+}
+// cast is meant to be used on references only, to downcast a trait reference to a class reference
+#[macro_export]
+macro_rules! cast {
+    ($raw:expr, $id:ty) => {
+        {
+            #[allow(unused_unsafe)]
+            let tmp =
+                unsafe {
+                    let expr = $raw;
+                    let res: $crate::Ptr<$id> =
+                        if expr.is_null() {
+                            $crate::Ptr::null()
+                        } else {
+                            $crate::Ptr::from_raw_nonnull(expr.into_raw() as *mut $id)
+                        };
+                    res
+                };
+            tmp
+        }
+    };
+    
+}
+
+/////////////////
+// Reference-counted classes mode
+/////////////////
+
+pub struct Object<T: ?Sized>(pub Option<rcmut::RcMut<T>>);
+
+impl <T: ?Sized> Object<T> {
+    // For safety, it requires the Rc to have been created with Rc::new()
+    pub unsafe fn from_rc(rc: Rc<T>) -> Object<T> {
+        Object(Some(rcmut::from_rc(rc)))
+    }
+    pub fn null() -> Object<T> {
+        Object(None)
+    }
+    pub fn is_null(&self) -> bool {
+        self.0.is_none()
+    }
+}
+impl <T: ?Sized + 'static + UpcastObject<dyn Any>> Object<T> {
+    pub fn is_instance_of<U: 'static>(self) -> bool {
+    // safety: Dafny won't call this function unless it can guarantee the object is still allocated
+        rd!(UpcastObject::<dyn Any>::upcast(rd!(self)))
+            .downcast_ref::<U>()
+            .is_some()
+    }
+}
+impl <T> Object<T> {
+    pub fn new(val: T) -> Object<T> {
+        Object(Some(rcmut::new(val)))
+    }
+}
+impl<T: ?Sized> Eq for Object<T> {}
+
+impl<T: ?Sized> Clone for Object<T> {
+    fn clone(&self) -> Self {
+        Object(self.0.clone())
+    }
+}
+
+impl <T: ?Sized>Default for Object<T> {
+    fn default() -> Self {
+        Object(None)
+    }
+}
+
+impl<T: ?Sized + UpcastObject<dyn Any>> Debug for Object<T> {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        self.fmt_print(f, false)
+    }
+}
+impl <T: ?Sized + UpcastObject<dyn Any>> DafnyPrint for Object<T> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        let obj_any = UpcastObject::<dyn Any>::upcast(self.as_ref());
+        let option_string = obj_any.as_ref().downcast_ref::<String>();
+        match option_string {
+            Some(s) => write!(f, "{}", s),
+            None => write!(f, "<object>"),
+        }
+    }
+}
+
+impl <T: DafnyType> DafnyPrint for Object<[T]> {
+    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+        write!(f, "<object>")
+    }
+}
+
+impl UpcastObject<dyn Any> for String {
+    fn upcast(&self) -> Object<dyn Any> {
+        // SAFETY: RC was just created
+        unsafe { Object::from_rc(Rc::new(self.clone()) as Rc<dyn Any>) }
+    }
+}
+
+impl <T: ?Sized, U: ?Sized> PartialEq<Object<U>> for Object<T> {
+    fn eq(&self, other: &Object<U>) -> bool {
+        if let Some(p) = &self.0 {
+            if let Some(q) = &other.0 {
+                // To compare addresses, we need to ensure we only compare thin pointers
+                // https://users.rust-lang.org/t/comparing-addresses-between-fat-and-thin-pointers/89008
+                ::std::ptr::eq(p.as_ref().get() as *const (), q.as_ref().get() as *const ())
+            } else {
+                false
+            }
+        } else if let Some(_q) = &other.0 {
+            false
+        } else {
+            true
+        }
     }
 }
 
-impl <A: Default + 'static> Default for LazyFieldWrapper<A> {
-    fn default() -> Self {
-        Self(Lazy::new(Box::new(A::default)))
+impl <T: ?Sized> std::hash::Hash for Object<T> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        if let Some(p) = &self.0 {
+            (p.as_ref().get() as *const ()).hash(state);
+        } else {
+            0.hash(state);
+        }
     }
 }
 
-impl <A: DafnyPrint> DafnyPrint for LazyFieldWrapper<A> {
-    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result {
-        self.0.deref().fmt_print(f, in_seq)
+impl <T: ?Sized> AsMut<T> for Object<T> {
+    fn as_mut(&mut self) -> &mut T {
+        unsafe { &mut *(&self.0).as_ref().unwrap_unchecked().as_ref().get() }
+    }
+}
+impl <T: ?Sized> AsRef<T> for Object<T> {
+    fn as_ref(&self) -> &T {
+        unsafe { &*(&self.0).as_ref().unwrap_unchecked().as_ref().get() }
     }
 }
 
-pub struct FunctionWrapper<A: ?Sized>(pub A);
-impl <A> DafnyPrint for FunctionWrapper<A> {
-    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
-        write!(f, "<function>")
+// Never inline because, when compiling with cargo --release, sometimes it gets rid of this statement
+#[inline(never)]
+fn increment_strong_count<T: ?Sized>(data: *const T) {
+    // SAFETY: This method is called only on values that were constructed from an Rc
+    unsafe {
+        // Black box avoids the compiler wrongly inferring that increment strong count does nothing since the data it was applied to can be traced to be borrowed
+       ::std::hint::black_box(Rc::increment_strong_count(data));
     }
 }
 
-impl <A: Clone> Clone for FunctionWrapper<A> {
-    fn clone(&self) -> Self {
-        Self(self.0.clone())
+impl <T: ?Sized> Object<T> {
+    // SAFETY: This function needs to be called from a reference obtained by calling read!(o) on an object
+    // We never inline this function, otherwise the compiler might figure out a way to remove the increment_strong_count
+    #[inline(never)]
+    pub fn from_ref(r: &T) -> Object<T> {
+        let pt = r as *const T as *const UnsafeCell<T>;
+        // SAFETY: Not guaranteed unfortunately. But looking at the sources of from_raw as of today 10/24/2024
+        // it will will correctly rebuilt the Rc
+        let rebuilt = ::std::hint::black_box(unsafe { Rc::from_raw(pt) });
+        let previous_strong_count = ::std::hint::black_box(Rc::strong_count(&rebuilt));
+        ::std::hint::black_box(crate::increment_strong_count(pt));
+        let new_strong_count = ::std::hint::black_box(Rc::strong_count(&rebuilt));
+        assert_eq!(new_strong_count, previous_strong_count + 1); // Will panic if not
+        Object(Some(rebuilt))
     }
 }
 
-impl <A> DafnyErasable for FunctionWrapper<A> {
-    type Erased = FunctionWrapper<A>;
+#[macro_export]
+macro_rules! cast_object {
+    ($raw:expr, $id:ty) => {
+        unsafe {
+            let res: $crate::Object<$id> = 
+            $crate::Object(Some(::std::rc::Rc::from_raw(
+                ::std::rc::Rc::into_raw($raw.0.unwrap()) as _)));
+            res
+        }
+    };
+}
 
-    fn erase(&self) -> &Self::Erased {
-        self
-    }
+// Returns an object whose fields are yet initialized. Only use update_field_uninit_object  and update_field_if_uninit_object to initialize fields.
+pub fn allocate_object<T>() -> Object<T> {
+    unsafe { mem::transmute(object::new::<MaybeUninit<T>>(MaybeUninit::uninit())) }
+}
 
-    fn erase_owned(self) -> Self::Erased {
-        self
-    }
+pub struct AllocationTracker {
+    allocations: Vec<Weak<dyn Any>>
 }
 
-impl <A> DafnyUnerasable<FunctionWrapper<A>> for FunctionWrapper<A> {
-    fn unerase(v: &FunctionWrapper<A>) -> &Self {
-        v
-    }
+pub fn allocate_object_track<T: 'static>(allocation_tracker: &mut AllocationTracker) -> Object<T> {
+    let res = allocate_object::<T>();
+    allocation_tracker.allocations.push(Rc::<UnsafeCell<T>>::downgrade(&res.0.clone().unwrap()));
+    res
+}
 
-    fn unerase_owned(v: FunctionWrapper<A>) -> Self {
-        v
-    }
+// Equivalent of update_field_nodrop but for rcmut
+#[macro_export]
+macro_rules! update_field_nodrop_object {
+    ($ptr:expr, $field: ident, $value:expr) => {
+        $crate::update_nodrop_object!(($crate::rcmut::borrow_mut(&mut $ptr.0.clone().unwrap())).$field, $value)
+    };
 }
 
-pub struct DafnyPrintWrapper<T>(pub T);
-impl <T: DafnyPrint> Display for DafnyPrintWrapper<&T> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt_print(f, false)
-    }
+// Same but for mutable fields
+#[macro_export]
+macro_rules! update_field_mut_nodrop_object {
+    ($ptr:expr, $field: ident, $value:expr) => {
+        unsafe { ($crate::rcmut::borrow_mut(&mut $ptr.0.clone().unwrap())).$field.get().write($value) }
+    };
+}
+
+// Equivalent of update_nodrop but for rcmut
+#[macro_export]
+macro_rules! update_nodrop_object {
+    ($ptr:expr, $value:expr) => {
+        unsafe { ::std::ptr::addr_of_mut!($ptr).write($value) }
+    };
 }
 
-pub trait DafnyErasable: DafnyUnerasable<Self::Erased> {
-    type Erased;
+// Equivalent of update_field_if_uninit but for rcmut
+#[macro_export]
+macro_rules! update_field_if_uninit_object {
+    ($t:expr, $field:ident, $field_assigned:expr, $value:expr) => {{
+        #[allow(unused_assignments)]
+        if !$field_assigned {
+            let computed_value = $value;
+            $crate::update_field_nodrop_object!($t, $field, computed_value);
+            $field_assigned = true;
+        }
+    }};
+}
 
-    fn erase(&self) -> &Self::Erased;
-    fn erase_owned(self) -> Self::Erased;
+// Same for mutable fields
+#[macro_export]
+macro_rules! update_field_mut_if_uninit_object {
+    ($t:expr, $field:ident, $field_assigned:expr, $value:expr) => {{
+        #[allow(unused_assignments)]
+        if !$field_assigned {
+            let computed_value = $value;
+            $crate::update_field_mut_nodrop_object!($t, $field, computed_value);
+            $field_assigned = true;
+        }
+    }};
 }
 
-pub trait DafnyUnerasable<T: ?Sized> {
-    fn unerase(v: &T) -> &Self;
-    fn unerase_owned(v: T) -> Self;
+// Equivalent of update_field_uninit but for rcmut
+#[macro_export]
+macro_rules! update_field_uninit_object {
+    ($t:expr, $field:ident, $field_assigned:expr, $value:expr) => {{
+        let computed_value = $value;
+        #[allow(unused_assignments)]
+        if $field_assigned {
+            $crate::md!($t).$field = computed_value;
+        } else {
+            $crate::update_field_nodrop_object!($t, $field, computed_value);
+            $field_assigned = true;
+        }
+    }};
 }
 
-impl <T> DafnyErasable for Rc<T> {
-    type Erased = Rc<T>;
+// Same but for mutable fields
+#[macro_export]
+macro_rules! update_field_mut_uninit_object {
+    ($t:expr, $field:ident, $field_assigned:expr, $value:expr) => {{
+        let computed_value = $value;
+        #[allow(unused_assignments)]
+        if $field_assigned {
+            $crate::modify_field!($crate::rd!($t).$field, computed_value);
+        } else {
+            $crate::update_field_mut_nodrop_object!($t, $field, computed_value);
+            $field_assigned = true;
+        }
+    }};
+}
 
-    #[inline]
-    fn erase(&self) -> &Self::Erased {
-        self
-    }
 
-    #[inline]
-    fn erase_owned(self) -> Self::Erased {
-        self
-    }
+// Equivalent of modify but for rcmut
+#[macro_export]
+macro_rules! md {
+    ($x:expr) => {
+        $x.clone().as_mut()
+    };
 }
 
-impl <T> DafnyUnerasable<Rc<T>> for Rc<T> {
-    #[inline]
-    fn unerase(v: &Rc<T>) -> &Self {
-        v
-    }
+// Equivalent of read but for rcmut
+#[macro_export]
+macro_rules! rd {
+    ($x:expr) => {
+        $x.as_ref()
+    };
+}
 
-    #[inline]
-    fn unerase_owned(v: Rc<T>) -> Self {
-        v
-    }
+// To use when modifying a mutable field that is wrapped with UnsafeCell
+#[macro_export]
+macro_rules! modify_field {
+    ($pointer:expr, $rhs:expr) => {
+        {
+            let lhs = $pointer.get();
+            let rhs = $rhs;
+            unsafe {*lhs = rhs}
+        }
+    };
+}
+
+// To use when reading a mutable field that is wrapped with UnsafeCell
+#[macro_export]
+macro_rules! read_field {
+    ($pointer:expr) => {
+      {
+        let lhs = $pointer.get();
+        unsafe {(*lhs).clone()}
+      }
+    };
 }
 
-impl <T> DafnyErasable for Vec<T> {
-    type Erased = Vec<T>;
+pub type Field<T> = UnsafeCell<T>;
+pub fn new_field<T>(t: T) -> Field<T> {
+    UnsafeCell::new(t)
+}
 
-    #[inline]
-    fn erase(&self) -> &Self::Erased {
-        self
-    }
+// Count the number of references to the given object
+#[macro_export]
+macro_rules! refcount {
+    ($x:expr) => {
+        ::std::rc::Rc::strong_count(unsafe { $crate::rcmut::as_rc($x.0.as_ref().unwrap()) })
+    };
+}
 
+pub mod object {
+    use std::any::Any;
+
+    pub fn new<T>(val: T) -> crate::Object<T> {
+        crate::Object(Some(crate::rcmut::new(val)))
+    }
+    pub fn downcast<T: 'static>(_self: crate::Object<dyn Any>) -> crate::Object<T> {
+        unsafe {
+          crate::Object(Some(crate::rcmut::downcast::<T>(_self.0.unwrap()).unwrap())) // Use unwrap_unchecked?
+        }
+    }
     #[inline]
-    fn erase_owned(self) -> Self::Erased {
-        self
+    pub fn is<T: 'static + ::std::any::Any>(_self: crate::Object<dyn Any>) -> bool {
+        is_object!(_self, T)
     }
 }
 
-impl <T> DafnyUnerasable<Vec<T>> for Vec<T> {
-    #[inline]
-    fn unerase(v: &Vec<T>) -> &Self {
-        v
+// Inspired from https://crates.io/crates/rcmut
+pub mod rcmut {
+    use std::cell::UnsafeCell;
+    use std::mem::{self, MaybeUninit};
+    use std::rc::Rc;
+    use std::sync::Arc;
+
+    pub fn array_object_from_rc<T>(data: Rc<[T]>) -> crate::Object<[T]> {
+        crate::Object(Some(unsafe { crate::rcmut::from_rc(data) }))
     }
+    pub fn array_object_from_box<T>(data: Box<[T]>) -> crate::Object<[T]> {
+        let data: Rc<[T]> = data.into();
+        crate::Object(Some(unsafe { crate::rcmut::from_rc(data) }))
+    }
+    pub struct Array<T> {
+        pub data: Box<[T]>,
+    }
+    impl<T> Array<T> {
+        pub fn new(data: Box<[T]>) -> crate::Object<Array<T>> {
+            crate::Object(Some(crate::rcmut::new(Array { data })))
+        }
 
-    #[inline]
-    fn unerase_owned(v: Vec<T>) -> Self {
-        v
+        pub fn placebos_usize_object(length: usize) -> crate::Object<Array<MaybeUninit<T>>> {
+            let x = crate::array::placebos_box_usize::<T>(length);
+            crate::rcmut::Array::<MaybeUninit<T>>::new(x)
+        }
+    }
+    /// A reference counted smart pointer with unrestricted mutability.
+    pub type RcMut<T> = Rc<UnsafeCell<T>>;
+
+    /// Create a new RcMut for a value.
+    pub fn new<T>(val: T) -> RcMut<T> {
+        Rc::new(UnsafeCell::new(val))
+    }
+    /// Retrieve the inner Rc as a reference.
+    pub unsafe fn from<T>(value: Box<T>) -> RcMut<T> {
+        mem::transmute(Rc::new(*value))
     }
-}
 
-impl <T> DafnyErasable for Box<T> {
-    type Erased = Box<T>;
+    pub unsafe fn from_rc<T: ?Sized>(value: Rc<T>) -> RcMut<T> {
+        mem::transmute(value)
+    }
 
-    #[inline]
-    fn erase(&self) -> &Self::Erased {
-        self
+    pub unsafe fn as_rc<T: ?Sized>(this: &RcMut<T>) -> &Rc<T> {
+        mem::transmute(this)
+    }
+    pub unsafe fn to_rc<T: ?Sized>(this: RcMut<T>) -> Rc<T> {
+        mem::transmute(this)
     }
 
-    #[inline]
-    fn erase_owned(self) -> Self::Erased {
-        self
+    /// Retrieve the inner Rc as a mutable reference.
+    pub unsafe fn as_rc_mut<T: ?Sized>(this: &mut RcMut<T>) -> &mut Rc<T> {
+        mem::transmute(this)
     }
-}
 
-impl <T> DafnyUnerasable<Box<T>> for Box<T> {
+    /// Get a reference to the value.
     #[inline]
-    fn unerase(v: &Box<T>) -> &Self {
-        v
+    pub unsafe fn borrow<T: ?Sized>(this: &RcMut<T>) -> &T {
+        mem::transmute(this.get())
     }
 
+    /// Get a mutable reference to the value.
     #[inline]
-    fn unerase_owned(v: Box<T>) -> Self {
-        v
+    pub unsafe fn borrow_mut<T: ?Sized>(this: &mut RcMut<T>) -> &mut T {
+        mem::transmute(this.get())
     }
-}
 
-macro_rules! impl_already_erased {
-    ($name:ty) => {
-        impl DafnyErasable for $name {
-            type Erased = $name;
+    pub unsafe fn downcast<T: 'static>(this: RcMut<dyn ::std::any::Any>) -> Option<RcMut<T>> {
+        let t: Rc<dyn ::std::any::Any> = to_rc(this);
+        let t: Rc<T> = Rc::downcast::<T>(t).ok()?;
+        mem::transmute(t)
+    }
 
-            #[inline]
-            fn erase(&self) -> &Self::Erased {
-                self
-            }
+    /// A reference counted smart pointer with unrestricted mutability.
+    pub struct ArcMut<T: ?Sized> {
+        inner: Arc<UnsafeCell<T>>,
+    }
 
-            #[inline]
-            fn erase_owned(self) -> Self::Erased {
-                self
+    impl<T: ?Sized> Clone for ArcMut<T> {
+        fn clone(&self) -> ArcMut<T> {
+            ArcMut {
+                inner: self.inner.clone(),
             }
         }
+    }
 
-        impl DafnyUnerasable<$name> for $name {
-            #[inline]
-            fn unerase(v: &$name) -> &Self {
-                v
-            }
-        
-            #[inline]
-            fn unerase_owned(v: $name) -> Self {
-                v
+    impl<T> ArcMut<T> {
+        /// Create a new ArcMut for a value.
+        pub fn new(val: T) -> ArcMut<T> {
+            ArcMut {
+                inner: Arc::new(UnsafeCell::new(val)),
             }
         }
-    };
-}
+    }
 
-impl_already_erased! { String }
-impl_already_erased! { char }
-impl_already_erased! { bool }
-impl_already_erased! { u8 }
-impl_already_erased! { u16 }
-impl_already_erased! { u32 }
-impl_already_erased! { u64 }
-impl_already_erased! { u128 }
-impl_already_erased! { i8 }
-impl_already_erased! { i16 }
-impl_already_erased! { i32 }
-impl_already_erased! { i64 }
-impl_already_erased! { i128 }
-impl_already_erased! { f32 }
-impl_already_erased! { f64 }
-impl_already_erased! { () }
+    impl<T: ?Sized> ArcMut<T> {
+        /// Retrieve the inner Rc as a reference.
+        pub unsafe fn as_arc(&self) -> &Arc<T> {
+            mem::transmute(&self.inner)
+        }
 
-macro_rules! impl_tuple_erased {
-    ($($items:ident)*) => {
-        impl <$($items,)*> DafnyErasable for ($($items,)*)
-        where
-            $($items: DafnyErasable,)*
-        {
-            type Erased = ($($items::Erased,)*);
+        /// Retrieve the inner Rc as a mutable reference.
+        pub unsafe fn as_arc_mut(&mut self) -> &mut Arc<T> {
+            mem::transmute(&mut self.inner)
+        }
 
-            #[inline]
-            fn erase(&self) -> &Self::Erased {
-                unsafe { &*(self as *const Self as *const Self::Erased) }
-            }
+        /// Get a reference to the value.
+        pub unsafe fn borrow(&self) -> &T {
+            mem::transmute(self.inner.get())
+        }
 
-            #[inline]
-            fn erase_owned(self) -> Self::Erased {
-                unsafe { std::mem::transmute_copy(&self) }
-            }
+        /// Get a mutable reference to the value.
+        pub unsafe fn borrow_mut(&mut self) -> &mut T {
+            mem::transmute(self.inner.get())
         }
+    }
+}
 
-        paste::item! {
-            impl <$([<T $items>],)* $($items: DafnyUnerasable<[<T $items>]>,)*> DafnyUnerasable<($([<T $items>],)*)> for ($($items,)*)
-            {
-                #[inline]
-                fn unerase(v: &($([<T $items>],)*)) -> &Self {
-                    unsafe { &*(v as *const ($([<T $items>],)*) as *const Self) }
-                }
+/////////////////
+// Method helpers
+/////////////////
 
-                #[inline]
-                fn unerase_owned(v: ($([<T $items>],)*)) -> Self {
-                    unsafe { std::mem::transmute_copy(&v) }
-                }
-            }
-        }
-    };
+// A MaybePlacebo is a value that is either a placebo or a real value.
+// It is a wrapper around a MaybeUninit<T> value, but knowing whether the value is a placebo or not.
+// That way, when it is dropped, the underlying value is only dropped if it is not a placebo.
+
+#[derive(Clone)]
+pub struct MaybePlacebo<T>(Option<T>);
+impl<T: Clone> MaybePlacebo<T> {
+    #[inline]
+    pub fn read(&self) -> T {
+        // safety: Dafny will guarantee we will never read a placebo value
+        unsafe { self.0.clone().unwrap_unchecked() }
+    }
 }
 
-macro_rules! impl_tuple_erased_loop {
-    () => {};
-    ($first:ident $($rest:ident)*) => {
-        impl_tuple_erased_loop! { $($rest)* }
-        impl_tuple_erased! { $first $($rest)* }
+impl<T> MaybePlacebo<T> {
+    #[inline]
+    pub fn new() -> Self {
+        MaybePlacebo(None)
+    }
+    #[inline]
+    pub fn from(v: T) -> Self {
+        MaybePlacebo(Some(v))
+    }
+}
+
+#[macro_export]
+macro_rules! tuple_extract_index {
+    ($x:expr, $i:expr) => {
+        $x.$i
     };
 }
 
-// 32 elements ought to be enough for everyone
-impl_tuple_erased_loop! {
-    A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10
-    A11 A12 A13 A14 A15 A16 A17 A18 A19 A20
-    A21 A22 A23 A24 A25 A26 A27 A28 A29 A30
-    A31
+// A macro that maps tuple (a, b, c...) to produce (MaybePlacebo::from(a), MaybePlacebo::from(b), MaybePlacebo::from(c))
+// maybe_placebos_from!(expr, 0, 1, 2, 3)
+// = let x = expr;
+//   (MaybePlacebo::from(x.0), MaybePlacebo::from(x.1), MaybePlacebo::from(x.2), MaybePlacebo::from(x.3))
+#[macro_export]
+macro_rules! maybe_placebos_from {
+    ($x:expr, $($i:tt), *) => {
+        {
+            let x = $x;
+            (
+                $( $crate::MaybePlacebo::from(x.$i), )*
+            )
+        }
+    }
 }
 
-pub trait DafnyPrint {
-    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result;
+////////////////
+// Coercion
+////////////////
 
-    // Vec<char> gets special treatment so we carry that information here
-    #[inline]
-    fn is_char() -> bool {
-        false
-    }
+pub fn upcast_object<A: ?Sized, B: ?Sized>() -> Rc<impl Fn(Object<A>) -> Object<B>>
+  where A : UpcastObject<B>
+{
+    Rc::new(|x: Object<A>| x.as_ref().upcast())
 }
 
-macro_rules! impl_print_display {
-    ($name:ty) => {
-        impl DafnyPrint for $name {
-            fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
-                self.fmt(f)
-            }
-        }
-    };
+pub fn upcast<A: ?Sized, B: ?Sized>() -> Rc<impl Fn(Ptr<A>) -> Ptr<B>>
+  where A: Upcast<B>
+{
+    Rc::new(|x: Ptr<A>| read!(x).upcast())
 }
 
-impl_print_display! { String }
-impl_print_display! { &str }
-impl_print_display! { bool }
-impl_print_display! { u8 }
-impl_print_display! { u16 }
-impl_print_display! { u32 }
-impl_print_display! { u64 }
-impl_print_display! { u128 }
-impl_print_display! { i8 }
-impl_print_display! { i16 }
-impl_print_display! { i32 }
-impl_print_display! { i64 }
-impl_print_display! { i128 }
+pub fn upcast_box<A, B: ?Sized>() -> Rc<impl Fn(A) -> Box<B>>
+  where A: UpcastBox<B>
+{
+    Rc::new(|x: A| UpcastBox::upcast(&x))
+}
+pub fn upcast_box_box<A: ?Sized, B: ?Sized>() -> Rc<impl Fn(Box<A>) -> Box<B>>
+  where Box<A>: UpcastBox<B>
+{
+    Rc::new(|x: Box<A>| UpcastBox::upcast(&x))
+}
 
-impl DafnyPrint for f32 {
-    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
-        write!(f, "{:.1}", self)
-    }
+pub fn upcast_id<A>() -> Rc<impl Fn(A) -> A>
+{
+    Rc::new(|x: A| x)
 }
 
-impl DafnyPrint for f64 {
-    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
-        write!(f, "{:.1}", self)
-    }
+pub fn rc_coerce<T: Clone, U: Clone>(f: Rc<impl Fn(T) -> U>) -> Rc<impl Fn(Rc<T>) -> Rc<U>> {
+    Rc::new(move |x: Rc<T>| Rc::new(f.as_ref()(x.as_ref().clone())))
+}
+pub fn box_coerce<T: Clone, U: Clone>(f: Box<impl Fn(T) -> U>) -> Box<impl Fn(Box<T>) -> Box<U>> {
+    Box::new(move |x: Box<T>| Box::new(f.as_ref()(x.as_ref().clone())))
 }
 
-impl DafnyPrint for () {
-    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
-        write!(f, "()")
-    }
+pub fn fn1_coerce<T: Clone + 'static, A: Clone + 'static, R: Clone + 'static>(
+    a_to_r: Rc<impl Fn(A) -> R + 'static>) ->
+  Rc<impl Fn(Rc<dyn Fn(&T) -> A>) -> Rc<dyn Fn(&T) -> R> + 'static> {
+    Rc::new(move |t_to_a: Rc<dyn Fn(&T) -> A>| {
+        let a_to_r = a_to_r.clone();
+        let t_to_a = t_to_a.clone();
+        let r: Rc<dyn Fn(&T) -> R + 'static> = Rc::new(move |t: &T| a_to_r(t_to_a(t)));
+        r
+    })
 }
 
-impl DafnyPrint for char {
-    #[inline]
-    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result {
-        if in_seq {
-            write!(f, "{}", self)
-        } else {
-            write!(f, "'{}'", self)
-        }
+// For pointers
+pub trait Upcast<T: ?Sized> {
+    fn upcast(&self) -> Ptr<T>;
+}
+pub trait UpcastObject<T: ?Sized> {
+    fn upcast(&self) -> Object<T>;
+}
+impl <T: ?Sized> Upcast<T> for T {
+    fn upcast(&self) -> Ptr<T> {
+        Ptr::from_raw_nonnull(self as *const T as *mut T)
     }
-
-    #[inline]
-    fn is_char() -> bool {
-        true
+}
+impl <T: ?Sized> UpcastObject<T> for T {
+    fn upcast(&self) -> Object<T> {
+        Object::from_ref(self)
     }
 }
 
-impl <T: DafnyPrint> DafnyPrint for Rc<T> {
-    fn fmt_print(&self, f: &mut Formatter<'_>, in_seq: bool) -> std::fmt::Result {
-        self.as_ref().fmt_print(f, in_seq)
-    }
+// For general traits
+pub trait UpcastBox<T: ?Sized> {
+    fn upcast(&self) -> Box<T>;
 }
 
-impl <T: DafnyPrint> DafnyPrint for Vec<T> {
-    fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
-        if !T::is_char() {
-            write!(f, "[")?;
-        }
 
-        for (i, item) in self.iter().enumerate() {
-            if !T::is_char() {
-                if i > 0 {
-                    write!(f, ", ")?;
-                }
+#[macro_export]
+macro_rules! Extends {
+    ($traitType: tt) => {
+        $traitType + ::dafny_runtime::Upcast<dyn $traitType>
+    }
+}
 
-                item.fmt_print(f, false)?;
-            } else {
-                item.fmt_print(f, true)?;
-            }
+#[macro_export]
+macro_rules! UpcastFn {
+    ($B:ty) => {
+        fn upcast(&self) -> $crate::Ptr<$B> {
+            $crate::Ptr::from_raw_nonnull(self as *const Self as *mut Self as *mut $B)
         }
+    };
+}
 
-        if !T::is_char() {
-            write!(f, "]")
-        } else {
-            Ok(())
+#[macro_export]
+macro_rules! UpcastObjectFn {
+    ($B:ty) => {
+        fn upcast(&self) -> $crate::Object<$B> {
+            $crate::Object::from_ref(self as &$B)
         }
-    }
+    };
 }
 
-macro_rules! impl_tuple_print {
-    ($($items:ident)*) => {
-        impl <$($items,)*> DafnyPrint for ($($items,)*)
-        where
-            $($items: DafnyPrint,)*
-        {
-            #[allow(unused_assignments)]
-            fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
-                #[allow(non_snake_case)]
-                let ($($items,)*) = self;
-
-                write!(f, "(")?;
+// It works only when there is no type parameters for $A...
+#[macro_export]
+macro_rules! UpcastDef {
+    ($A:ty, $B:ty) => {
+        impl $crate::Upcast<$B> for $A {
+            $crate::UpcastFn!($B);
+        }
+    };
 
-                let mut i = 0;
-                
-                $(
-                    if (i > 0) {
-                        write!(f, ", ")?;
-                    }
+    ($A:ty, $B:ty, $($C: ty),*) => {
+        $crate::UpcastDef!($A, $B);
+        $crate::UpcastDef!($A, $($C),*);
+    }
+}
 
-                    $items.fmt_print(f, false)?;
+#[macro_export]
+macro_rules! UpcastDefObject {
+    ($A:ty, $B:ty) => {
+        impl $crate::UpcastObject<$B> for $A {
+            $crate::UpcastObjectFn!($B);
+        }
+    };
 
-                    i += 1;
-                )*
+    ($A:ty, $B:ty, $($C: ty),*) => {
+        $crate::UpcastDefObject!($A, $B);
+        $crate::UpcastDefObject!($A, $($C),*);
+    }
+}
 
-                write!(f, ")")
+// Coercions for sets
+impl<U: DafnyTypeEq> Set<U>
+{
+    pub fn coerce<V: DafnyTypeEq>(f: Rc<impl Fn(U) -> V>) -> Rc<impl Fn(Set<U>) -> Set<V>> {
+        Rc::new(move |x: Set<U>| {
+            // We need to upcast individual elements
+            let f2 = f.clone();
+            let mut new_set: HashSet<V> = HashSet::<V>::default();
+            for value in x.data.iter() {
+                new_set.insert(f2(value.clone()));
             }
-        }
-    };
+            Set::from_hashset_owned(new_set)
+        })
+    }
 }
 
-macro_rules! impl_tuple_print_loop {
-    () => {};
-    ($first:ident $($rest:ident)*) => {
-        impl_tuple_print_loop! { $($rest)* }
-        impl_tuple_print! { $first $($rest)* }
-    };
+// Coercions for sequences
+impl<U: DafnyType> Sequence<U>
+{
+    pub fn coerce<V: DafnyType>(f: Rc<impl Fn(U) -> V>) -> Rc<impl Fn(Sequence<U>) -> Sequence<V>> {
+        // We need to upcast individual elements
+        Rc::new(move |x: Sequence<U>| {
+            let mut new_seq: Vec<V> = Vec::<V>::default();
+            let f2 = f.clone();
+            for value in x.to_array().iter() {
+                new_seq.push(f2(value.clone()));
+            }
+            Sequence::from_array_owned(new_seq)
+        })
+    }
 }
 
-// 32 elements ought to be enough for everyone
-impl_tuple_print_loop! {
-    A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10
-    A11 A12 A13 A14 A15 A16 A17 A18 A19 A20
-    A21 A22 A23 A24 A25 A26 A27 A28 A29 A30
-    A31
+// Coercions for multisets
+impl<U: DafnyTypeEq> Multiset<U>
+{
+    pub fn coerce<V: DafnyTypeEq>(f: Rc<impl Fn(U) -> V>) -> Rc<impl Fn(Multiset<U>) -> Multiset<V>> {
+        // We need to upcast individual elements
+        Rc::new(move |x: Multiset<U>| {
+                let f2 = f.clone();
+            // We need to upcast individual elements
+            let mut new_multiset: HashMap<V, DafnyInt> = HashMap::<V, DafnyInt>::default();
+            for (value, count) in x.data.into_iter() {
+                new_multiset.insert(f2(value), count.clone());
+            }
+            Multiset::from_hashmap_owned(new_multiset)
+        })
+    }
 }
+
+// Coercions for Maps
+impl<K: DafnyTypeEq, U: DafnyTypeEq> Map<K, U>
+{
+    pub fn coerce<V: DafnyTypeEq>(f: Rc<impl Fn(U) -> V>) -> Rc<impl Fn(Map<K, U>) -> Map<K, V>> {
+        // We need to upcast individual elements
+        Rc::new(move |x: Map<K, U>| {
+            let f2 = f.clone();
+            let mut new_map: HashMap<K, V> = HashMap::<K, V>::default();
+            for (key, value) in x.data.iter() {
+                new_map.insert(key.clone(), f2(value.clone()));
+            }
+            Map::from_hashmap_owned(new_map)
+        })
+    }
+}
\ No newline at end of file
diff --git a/Source/DafnyRuntime/DafnyRuntimeRust/src/system/mod.rs b/Source/DafnyRuntime/DafnyRuntimeRust/src/system/mod.rs
new file mode 100644
index 00000000000..06f3f45176b
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeRust/src/system/mod.rs
@@ -0,0 +1,4003 @@
+#![allow(warnings, unconditional_panic)]
+#![allow(nonstandard_style)]
+#![cfg_attr(any(), rustfmt::skip)]
+
+pub mod _System {
+    pub use crate::DafnyInt;
+    pub use crate::DafnyType;
+    pub use ::std::fmt::Debug;
+    pub use ::std::fmt::Formatter;
+    pub use ::std::fmt::Result;
+    pub use crate::DafnyPrint;
+    pub use ::std::rc::Rc;
+    pub use ::std::cmp::Eq;
+    pub use ::std::hash::Hash;
+    pub use ::std::hash::Hasher;
+    pub use ::std::default::Default;
+    pub use ::std::convert::AsRef;
+    pub use crate::SequenceIter;
+    pub use crate::seq;
+
+    pub type nat = DafnyInt;
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple2<T0: DafnyType, T1: DafnyType> {
+        _T2 {
+            _0: T0,
+            _1: T1
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType> Tuple2<T0, T1> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple2::_T2{_0, _1, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple2::_T2{_0, _1, } => _1,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType> Debug
+        for Tuple2<T0, T1> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType> DafnyPrint
+        for Tuple2<T0, T1> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple2::_T2{_0, _1, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType> Tuple2<T0, T1> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple2<T0, T1>) -> Tuple2<__T0, __T1>> {
+            Rc::new(move |this: Self| -> Tuple2<__T0, __T1>{
+                    match this {
+                        Tuple2::_T2{_0, _1, } => {
+                            Tuple2::_T2 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq> Eq
+        for Tuple2<T0, T1> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash> Hash
+        for Tuple2<T0, T1> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple2::_T2{_0, _1, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default> Default
+        for Tuple2<T0, T1> {
+        fn default() -> Tuple2<T0, T1> {
+            Tuple2::_T2 {
+                _0: Default::default(),
+                _1: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType> AsRef<Tuple2<T0, T1>>
+        for Tuple2<T0, T1> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple0 {
+        _T0 {}
+    }
+
+    impl Tuple0 {}
+
+    impl Debug
+        for Tuple0 {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl DafnyPrint
+        for Tuple0 {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple0::_T0{} => {
+                    write!(_formatter, "")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl Tuple0 {
+        /// Enumerates all possible values of Tuple0
+        pub fn _AllSingletonConstructors() -> SequenceIter<Rc<Tuple0>> {
+            seq![Rc::new(Tuple0::_T0 {})].iter()
+        }
+    }
+
+    impl Eq
+        for Tuple0 {}
+
+    impl Hash
+        for Tuple0 {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple0::_T0{} => {
+                    
+                },
+            }
+        }
+    }
+
+    impl Default
+        for Tuple0 {
+        fn default() -> Tuple0 {
+            Tuple0::_T0 {}
+        }
+    }
+
+    impl AsRef<Tuple0>
+        for Tuple0 {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple1<T0: DafnyType> {
+        _T1 {
+            _0: T0
+        }
+    }
+
+    impl<T0: DafnyType> Tuple1<T0> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple1::_T1{_0, } => _0,
+            }
+        }
+    }
+
+    impl<T0: DafnyType> Debug
+        for Tuple1<T0> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType> DafnyPrint
+        for Tuple1<T0> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple1::_T1{_0, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType> Tuple1<T0> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple1<T0>) -> Tuple1<__T0>> {
+            Rc::new(move |this: Self| -> Tuple1<__T0>{
+                    match this {
+                        Tuple1::_T1{_0, } => {
+                            Tuple1::_T1 {
+                                _0: f_0.clone()(_0)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq> Eq
+        for Tuple1<T0> {}
+
+    impl<T0: DafnyType + Hash> Hash
+        for Tuple1<T0> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple1::_T1{_0, } => {
+                    Hash::hash(_0, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default> Default
+        for Tuple1<T0> {
+        fn default() -> Tuple1<T0> {
+            Tuple1::_T1 {
+                _0: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType> AsRef<Tuple1<T0>>
+        for Tuple1<T0> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple3<T0: DafnyType, T1: DafnyType, T2: DafnyType> {
+        _T3 {
+            _0: T0,
+            _1: T1,
+            _2: T2
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType> Tuple3<T0, T1, T2> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple3::_T3{_0, _1, _2, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple3::_T3{_0, _1, _2, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple3::_T3{_0, _1, _2, } => _2,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType> Debug
+        for Tuple3<T0, T1, T2> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType> DafnyPrint
+        for Tuple3<T0, T1, T2> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple3::_T3{_0, _1, _2, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType> Tuple3<T0, T1, T2> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple3<T0, T1, T2>) -> Tuple3<__T0, __T1, __T2>> {
+            Rc::new(move |this: Self| -> Tuple3<__T0, __T1, __T2>{
+                    match this {
+                        Tuple3::_T3{_0, _1, _2, } => {
+                            Tuple3::_T3 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq> Eq
+        for Tuple3<T0, T1, T2> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash> Hash
+        for Tuple3<T0, T1, T2> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple3::_T3{_0, _1, _2, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default> Default
+        for Tuple3<T0, T1, T2> {
+        fn default() -> Tuple3<T0, T1, T2> {
+            Tuple3::_T3 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType> AsRef<Tuple3<T0, T1, T2>>
+        for Tuple3<T0, T1, T2> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple4<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType> {
+        _T4 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType> Tuple4<T0, T1, T2, T3> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple4::_T4{_0, _1, _2, _3, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple4::_T4{_0, _1, _2, _3, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple4::_T4{_0, _1, _2, _3, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple4::_T4{_0, _1, _2, _3, } => _3,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType> Debug
+        for Tuple4<T0, T1, T2, T3> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType> DafnyPrint
+        for Tuple4<T0, T1, T2, T3> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple4::_T4{_0, _1, _2, _3, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType> Tuple4<T0, T1, T2, T3> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple4<T0, T1, T2, T3>) -> Tuple4<__T0, __T1, __T2, __T3>> {
+            Rc::new(move |this: Self| -> Tuple4<__T0, __T1, __T2, __T3>{
+                    match this {
+                        Tuple4::_T4{_0, _1, _2, _3, } => {
+                            Tuple4::_T4 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq> Eq
+        for Tuple4<T0, T1, T2, T3> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash> Hash
+        for Tuple4<T0, T1, T2, T3> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple4::_T4{_0, _1, _2, _3, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default> Default
+        for Tuple4<T0, T1, T2, T3> {
+        fn default() -> Tuple4<T0, T1, T2, T3> {
+            Tuple4::_T4 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType> AsRef<Tuple4<T0, T1, T2, T3>>
+        for Tuple4<T0, T1, T2, T3> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple5<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType> {
+        _T5 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType> Tuple5<T0, T1, T2, T3, T4> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple5::_T5{_0, _1, _2, _3, _4, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple5::_T5{_0, _1, _2, _3, _4, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple5::_T5{_0, _1, _2, _3, _4, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple5::_T5{_0, _1, _2, _3, _4, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple5::_T5{_0, _1, _2, _3, _4, } => _4,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType> Debug
+        for Tuple5<T0, T1, T2, T3, T4> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType> DafnyPrint
+        for Tuple5<T0, T1, T2, T3, T4> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple5::_T5{_0, _1, _2, _3, _4, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType> Tuple5<T0, T1, T2, T3, T4> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple5<T0, T1, T2, T3, T4>) -> Tuple5<__T0, __T1, __T2, __T3, __T4>> {
+            Rc::new(move |this: Self| -> Tuple5<__T0, __T1, __T2, __T3, __T4>{
+                    match this {
+                        Tuple5::_T5{_0, _1, _2, _3, _4, } => {
+                            Tuple5::_T5 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq> Eq
+        for Tuple5<T0, T1, T2, T3, T4> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash> Hash
+        for Tuple5<T0, T1, T2, T3, T4> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple5::_T5{_0, _1, _2, _3, _4, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default> Default
+        for Tuple5<T0, T1, T2, T3, T4> {
+        fn default() -> Tuple5<T0, T1, T2, T3, T4> {
+            Tuple5::_T5 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType> AsRef<Tuple5<T0, T1, T2, T3, T4>>
+        for Tuple5<T0, T1, T2, T3, T4> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple6<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType> {
+        _T6 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType> Tuple6<T0, T1, T2, T3, T4, T5> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple6::_T6{_0, _1, _2, _3, _4, _5, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple6::_T6{_0, _1, _2, _3, _4, _5, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple6::_T6{_0, _1, _2, _3, _4, _5, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple6::_T6{_0, _1, _2, _3, _4, _5, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple6::_T6{_0, _1, _2, _3, _4, _5, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple6::_T6{_0, _1, _2, _3, _4, _5, } => _5,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType> Debug
+        for Tuple6<T0, T1, T2, T3, T4, T5> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType> DafnyPrint
+        for Tuple6<T0, T1, T2, T3, T4, T5> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple6::_T6{_0, _1, _2, _3, _4, _5, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType> Tuple6<T0, T1, T2, T3, T4, T5> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple6<T0, T1, T2, T3, T4, T5>) -> Tuple6<__T0, __T1, __T2, __T3, __T4, __T5>> {
+            Rc::new(move |this: Self| -> Tuple6<__T0, __T1, __T2, __T3, __T4, __T5>{
+                    match this {
+                        Tuple6::_T6{_0, _1, _2, _3, _4, _5, } => {
+                            Tuple6::_T6 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq> Eq
+        for Tuple6<T0, T1, T2, T3, T4, T5> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash> Hash
+        for Tuple6<T0, T1, T2, T3, T4, T5> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple6::_T6{_0, _1, _2, _3, _4, _5, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default> Default
+        for Tuple6<T0, T1, T2, T3, T4, T5> {
+        fn default() -> Tuple6<T0, T1, T2, T3, T4, T5> {
+            Tuple6::_T6 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType> AsRef<Tuple6<T0, T1, T2, T3, T4, T5>>
+        for Tuple6<T0, T1, T2, T3, T4, T5> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple7<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType> {
+        _T7 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType> Tuple7<T0, T1, T2, T3, T4, T5, T6> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple7::_T7{_0, _1, _2, _3, _4, _5, _6, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple7::_T7{_0, _1, _2, _3, _4, _5, _6, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple7::_T7{_0, _1, _2, _3, _4, _5, _6, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple7::_T7{_0, _1, _2, _3, _4, _5, _6, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple7::_T7{_0, _1, _2, _3, _4, _5, _6, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple7::_T7{_0, _1, _2, _3, _4, _5, _6, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple7::_T7{_0, _1, _2, _3, _4, _5, _6, } => _6,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType> Debug
+        for Tuple7<T0, T1, T2, T3, T4, T5, T6> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType> DafnyPrint
+        for Tuple7<T0, T1, T2, T3, T4, T5, T6> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple7::_T7{_0, _1, _2, _3, _4, _5, _6, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType> Tuple7<T0, T1, T2, T3, T4, T5, T6> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple7<T0, T1, T2, T3, T4, T5, T6>) -> Tuple7<__T0, __T1, __T2, __T3, __T4, __T5, __T6>> {
+            Rc::new(move |this: Self| -> Tuple7<__T0, __T1, __T2, __T3, __T4, __T5, __T6>{
+                    match this {
+                        Tuple7::_T7{_0, _1, _2, _3, _4, _5, _6, } => {
+                            Tuple7::_T7 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq> Eq
+        for Tuple7<T0, T1, T2, T3, T4, T5, T6> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash> Hash
+        for Tuple7<T0, T1, T2, T3, T4, T5, T6> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple7::_T7{_0, _1, _2, _3, _4, _5, _6, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default> Default
+        for Tuple7<T0, T1, T2, T3, T4, T5, T6> {
+        fn default() -> Tuple7<T0, T1, T2, T3, T4, T5, T6> {
+            Tuple7::_T7 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType> AsRef<Tuple7<T0, T1, T2, T3, T4, T5, T6>>
+        for Tuple7<T0, T1, T2, T3, T4, T5, T6> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple8<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType> {
+        _T8 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType> Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => _7,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType> Debug
+        for Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType> DafnyPrint
+        for Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType> Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple8<T0, T1, T2, T3, T4, T5, T6, T7>) -> Tuple8<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7>> {
+            Rc::new(move |this: Self| -> Tuple8<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7>{
+                    match this {
+                        Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => {
+                            Tuple8::_T8 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq> Eq
+        for Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash> Hash
+        for Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple8::_T8{_0, _1, _2, _3, _4, _5, _6, _7, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default> Default
+        for Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
+        fn default() -> Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
+            Tuple8::_T8 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType> AsRef<Tuple8<T0, T1, T2, T3, T4, T5, T6, T7>>
+        for Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple9<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType> {
+        _T9 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType> Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => _8,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType> Debug
+        for Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType> DafnyPrint
+        for Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType> Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>) -> Tuple9<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8>> {
+            Rc::new(move |this: Self| -> Tuple9<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8>{
+                    match this {
+                        Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => {
+                            Tuple9::_T9 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq> Eq
+        for Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash> Hash
+        for Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple9::_T9{_0, _1, _2, _3, _4, _5, _6, _7, _8, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default> Default
+        for Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+        fn default() -> Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+            Tuple9::_T9 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType> AsRef<Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>>
+        for Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple10<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType> {
+        _T10 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType> Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => _9,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType> Debug
+        for Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType> DafnyPrint
+        for Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType> Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>) -> Tuple10<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9>> {
+            Rc::new(move |this: Self| -> Tuple10<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9>{
+                    match this {
+                        Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => {
+                            Tuple10::_T10 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq> Eq
+        for Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash> Hash
+        for Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple10::_T10{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default> Default
+        for Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+        fn default() -> Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+            Tuple10::_T10 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType> AsRef<Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>>
+        for Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple11<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType> {
+        _T11 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9,
+            _10: T10
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType> Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _9,
+            }
+        }
+        /// Returns a borrow of the field _10
+        pub fn _10(&self) -> &T10 {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => _10,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType> Debug
+        for Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType> DafnyPrint
+        for Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_10, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType> Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType, __T10: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>, f_10: Rc<impl ::std::ops::Fn(T10) -> __T10 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>) -> Tuple11<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10>> {
+            Rc::new(move |this: Self| -> Tuple11<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10>{
+                    match this {
+                        Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => {
+                            Tuple11::_T11 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9),
+                                _10: f_10.clone()(_10)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq, T10: DafnyType + Eq> Eq
+        for Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash, T10: DafnyType + Hash> Hash
+        for Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple11::_T11{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state);
+                    Hash::hash(_10, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default, T10: DafnyType + Default> Default
+        for Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+        fn default() -> Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+            Tuple11::_T11 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default(),
+                _10: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType> AsRef<Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>>
+        for Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple12<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType> {
+        _T12 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9,
+            _10: T10,
+            _11: T11
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType> Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _9,
+            }
+        }
+        /// Returns a borrow of the field _10
+        pub fn _10(&self) -> &T10 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _10,
+            }
+        }
+        /// Returns a borrow of the field _11
+        pub fn _11(&self) -> &T11 {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => _11,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType> Debug
+        for Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType> DafnyPrint
+        for Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_10, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_11, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType> Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType, __T10: DafnyType, __T11: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>, f_10: Rc<impl ::std::ops::Fn(T10) -> __T10 + 'static>, f_11: Rc<impl ::std::ops::Fn(T11) -> __T11 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>) -> Tuple12<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11>> {
+            Rc::new(move |this: Self| -> Tuple12<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11>{
+                    match this {
+                        Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => {
+                            Tuple12::_T12 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9),
+                                _10: f_10.clone()(_10),
+                                _11: f_11.clone()(_11)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq, T10: DafnyType + Eq, T11: DafnyType + Eq> Eq
+        for Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash, T10: DafnyType + Hash, T11: DafnyType + Hash> Hash
+        for Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple12::_T12{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state);
+                    Hash::hash(_10, _state);
+                    Hash::hash(_11, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default, T10: DafnyType + Default, T11: DafnyType + Default> Default
+        for Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+        fn default() -> Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+            Tuple12::_T12 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default(),
+                _10: Default::default(),
+                _11: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType> AsRef<Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>>
+        for Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple13<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType> {
+        _T13 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9,
+            _10: T10,
+            _11: T11,
+            _12: T12
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType> Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _9,
+            }
+        }
+        /// Returns a borrow of the field _10
+        pub fn _10(&self) -> &T10 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _10,
+            }
+        }
+        /// Returns a borrow of the field _11
+        pub fn _11(&self) -> &T11 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _11,
+            }
+        }
+        /// Returns a borrow of the field _12
+        pub fn _12(&self) -> &T12 {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => _12,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType> Debug
+        for Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType> DafnyPrint
+        for Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_10, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_11, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_12, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType> Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType, __T10: DafnyType, __T11: DafnyType, __T12: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>, f_10: Rc<impl ::std::ops::Fn(T10) -> __T10 + 'static>, f_11: Rc<impl ::std::ops::Fn(T11) -> __T11 + 'static>, f_12: Rc<impl ::std::ops::Fn(T12) -> __T12 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>) -> Tuple13<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12>> {
+            Rc::new(move |this: Self| -> Tuple13<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12>{
+                    match this {
+                        Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => {
+                            Tuple13::_T13 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9),
+                                _10: f_10.clone()(_10),
+                                _11: f_11.clone()(_11),
+                                _12: f_12.clone()(_12)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq, T10: DafnyType + Eq, T11: DafnyType + Eq, T12: DafnyType + Eq> Eq
+        for Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash, T10: DafnyType + Hash, T11: DafnyType + Hash, T12: DafnyType + Hash> Hash
+        for Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple13::_T13{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state);
+                    Hash::hash(_10, _state);
+                    Hash::hash(_11, _state);
+                    Hash::hash(_12, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default, T10: DafnyType + Default, T11: DafnyType + Default, T12: DafnyType + Default> Default
+        for Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+        fn default() -> Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+            Tuple13::_T13 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default(),
+                _10: Default::default(),
+                _11: Default::default(),
+                _12: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType> AsRef<Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>>
+        for Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple14<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType> {
+        _T14 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9,
+            _10: T10,
+            _11: T11,
+            _12: T12,
+            _13: T13
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType> Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _9,
+            }
+        }
+        /// Returns a borrow of the field _10
+        pub fn _10(&self) -> &T10 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _10,
+            }
+        }
+        /// Returns a borrow of the field _11
+        pub fn _11(&self) -> &T11 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _11,
+            }
+        }
+        /// Returns a borrow of the field _12
+        pub fn _12(&self) -> &T12 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _12,
+            }
+        }
+        /// Returns a borrow of the field _13
+        pub fn _13(&self) -> &T13 {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => _13,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType> Debug
+        for Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType> DafnyPrint
+        for Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_10, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_11, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_12, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_13, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType> Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType, __T10: DafnyType, __T11: DafnyType, __T12: DafnyType, __T13: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>, f_10: Rc<impl ::std::ops::Fn(T10) -> __T10 + 'static>, f_11: Rc<impl ::std::ops::Fn(T11) -> __T11 + 'static>, f_12: Rc<impl ::std::ops::Fn(T12) -> __T12 + 'static>, f_13: Rc<impl ::std::ops::Fn(T13) -> __T13 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>) -> Tuple14<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13>> {
+            Rc::new(move |this: Self| -> Tuple14<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13>{
+                    match this {
+                        Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => {
+                            Tuple14::_T14 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9),
+                                _10: f_10.clone()(_10),
+                                _11: f_11.clone()(_11),
+                                _12: f_12.clone()(_12),
+                                _13: f_13.clone()(_13)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq, T10: DafnyType + Eq, T11: DafnyType + Eq, T12: DafnyType + Eq, T13: DafnyType + Eq> Eq
+        for Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash, T10: DafnyType + Hash, T11: DafnyType + Hash, T12: DafnyType + Hash, T13: DafnyType + Hash> Hash
+        for Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple14::_T14{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state);
+                    Hash::hash(_10, _state);
+                    Hash::hash(_11, _state);
+                    Hash::hash(_12, _state);
+                    Hash::hash(_13, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default, T10: DafnyType + Default, T11: DafnyType + Default, T12: DafnyType + Default, T13: DafnyType + Default> Default
+        for Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+        fn default() -> Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+            Tuple14::_T14 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default(),
+                _10: Default::default(),
+                _11: Default::default(),
+                _12: Default::default(),
+                _13: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType> AsRef<Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>>
+        for Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple15<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType> {
+        _T15 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9,
+            _10: T10,
+            _11: T11,
+            _12: T12,
+            _13: T13,
+            _14: T14
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType> Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _9,
+            }
+        }
+        /// Returns a borrow of the field _10
+        pub fn _10(&self) -> &T10 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _10,
+            }
+        }
+        /// Returns a borrow of the field _11
+        pub fn _11(&self) -> &T11 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _11,
+            }
+        }
+        /// Returns a borrow of the field _12
+        pub fn _12(&self) -> &T12 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _12,
+            }
+        }
+        /// Returns a borrow of the field _13
+        pub fn _13(&self) -> &T13 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _13,
+            }
+        }
+        /// Returns a borrow of the field _14
+        pub fn _14(&self) -> &T14 {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => _14,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType> Debug
+        for Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType> DafnyPrint
+        for Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_10, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_11, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_12, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_13, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_14, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType> Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType, __T10: DafnyType, __T11: DafnyType, __T12: DafnyType, __T13: DafnyType, __T14: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>, f_10: Rc<impl ::std::ops::Fn(T10) -> __T10 + 'static>, f_11: Rc<impl ::std::ops::Fn(T11) -> __T11 + 'static>, f_12: Rc<impl ::std::ops::Fn(T12) -> __T12 + 'static>, f_13: Rc<impl ::std::ops::Fn(T13) -> __T13 + 'static>, f_14: Rc<impl ::std::ops::Fn(T14) -> __T14 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>) -> Tuple15<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14>> {
+            Rc::new(move |this: Self| -> Tuple15<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14>{
+                    match this {
+                        Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => {
+                            Tuple15::_T15 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9),
+                                _10: f_10.clone()(_10),
+                                _11: f_11.clone()(_11),
+                                _12: f_12.clone()(_12),
+                                _13: f_13.clone()(_13),
+                                _14: f_14.clone()(_14)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq, T10: DafnyType + Eq, T11: DafnyType + Eq, T12: DafnyType + Eq, T13: DafnyType + Eq, T14: DafnyType + Eq> Eq
+        for Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash, T10: DafnyType + Hash, T11: DafnyType + Hash, T12: DafnyType + Hash, T13: DafnyType + Hash, T14: DafnyType + Hash> Hash
+        for Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple15::_T15{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state);
+                    Hash::hash(_10, _state);
+                    Hash::hash(_11, _state);
+                    Hash::hash(_12, _state);
+                    Hash::hash(_13, _state);
+                    Hash::hash(_14, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default, T10: DafnyType + Default, T11: DafnyType + Default, T12: DafnyType + Default, T13: DafnyType + Default, T14: DafnyType + Default> Default
+        for Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+        fn default() -> Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+            Tuple15::_T15 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default(),
+                _10: Default::default(),
+                _11: Default::default(),
+                _12: Default::default(),
+                _13: Default::default(),
+                _14: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType> AsRef<Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>>
+        for Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple16<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType> {
+        _T16 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9,
+            _10: T10,
+            _11: T11,
+            _12: T12,
+            _13: T13,
+            _14: T14,
+            _15: T15
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType> Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _9,
+            }
+        }
+        /// Returns a borrow of the field _10
+        pub fn _10(&self) -> &T10 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _10,
+            }
+        }
+        /// Returns a borrow of the field _11
+        pub fn _11(&self) -> &T11 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _11,
+            }
+        }
+        /// Returns a borrow of the field _12
+        pub fn _12(&self) -> &T12 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _12,
+            }
+        }
+        /// Returns a borrow of the field _13
+        pub fn _13(&self) -> &T13 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _13,
+            }
+        }
+        /// Returns a borrow of the field _14
+        pub fn _14(&self) -> &T14 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _14,
+            }
+        }
+        /// Returns a borrow of the field _15
+        pub fn _15(&self) -> &T15 {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => _15,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType> Debug
+        for Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType> DafnyPrint
+        for Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_10, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_11, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_12, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_13, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_14, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_15, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType> Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType, __T10: DafnyType, __T11: DafnyType, __T12: DafnyType, __T13: DafnyType, __T14: DafnyType, __T15: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>, f_10: Rc<impl ::std::ops::Fn(T10) -> __T10 + 'static>, f_11: Rc<impl ::std::ops::Fn(T11) -> __T11 + 'static>, f_12: Rc<impl ::std::ops::Fn(T12) -> __T12 + 'static>, f_13: Rc<impl ::std::ops::Fn(T13) -> __T13 + 'static>, f_14: Rc<impl ::std::ops::Fn(T14) -> __T14 + 'static>, f_15: Rc<impl ::std::ops::Fn(T15) -> __T15 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>) -> Tuple16<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15>> {
+            Rc::new(move |this: Self| -> Tuple16<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15>{
+                    match this {
+                        Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => {
+                            Tuple16::_T16 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9),
+                                _10: f_10.clone()(_10),
+                                _11: f_11.clone()(_11),
+                                _12: f_12.clone()(_12),
+                                _13: f_13.clone()(_13),
+                                _14: f_14.clone()(_14),
+                                _15: f_15.clone()(_15)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq, T10: DafnyType + Eq, T11: DafnyType + Eq, T12: DafnyType + Eq, T13: DafnyType + Eq, T14: DafnyType + Eq, T15: DafnyType + Eq> Eq
+        for Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash, T10: DafnyType + Hash, T11: DafnyType + Hash, T12: DafnyType + Hash, T13: DafnyType + Hash, T14: DafnyType + Hash, T15: DafnyType + Hash> Hash
+        for Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple16::_T16{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state);
+                    Hash::hash(_10, _state);
+                    Hash::hash(_11, _state);
+                    Hash::hash(_12, _state);
+                    Hash::hash(_13, _state);
+                    Hash::hash(_14, _state);
+                    Hash::hash(_15, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default, T10: DafnyType + Default, T11: DafnyType + Default, T12: DafnyType + Default, T13: DafnyType + Default, T14: DafnyType + Default, T15: DafnyType + Default> Default
+        for Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+        fn default() -> Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+            Tuple16::_T16 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default(),
+                _10: Default::default(),
+                _11: Default::default(),
+                _12: Default::default(),
+                _13: Default::default(),
+                _14: Default::default(),
+                _15: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType> AsRef<Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>>
+        for Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple17<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType> {
+        _T17 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9,
+            _10: T10,
+            _11: T11,
+            _12: T12,
+            _13: T13,
+            _14: T14,
+            _15: T15,
+            _16: T16
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType> Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _9,
+            }
+        }
+        /// Returns a borrow of the field _10
+        pub fn _10(&self) -> &T10 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _10,
+            }
+        }
+        /// Returns a borrow of the field _11
+        pub fn _11(&self) -> &T11 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _11,
+            }
+        }
+        /// Returns a borrow of the field _12
+        pub fn _12(&self) -> &T12 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _12,
+            }
+        }
+        /// Returns a borrow of the field _13
+        pub fn _13(&self) -> &T13 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _13,
+            }
+        }
+        /// Returns a borrow of the field _14
+        pub fn _14(&self) -> &T14 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _14,
+            }
+        }
+        /// Returns a borrow of the field _15
+        pub fn _15(&self) -> &T15 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _15,
+            }
+        }
+        /// Returns a borrow of the field _16
+        pub fn _16(&self) -> &T16 {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => _16,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType> Debug
+        for Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType> DafnyPrint
+        for Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_10, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_11, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_12, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_13, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_14, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_15, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_16, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType> Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType, __T10: DafnyType, __T11: DafnyType, __T12: DafnyType, __T13: DafnyType, __T14: DafnyType, __T15: DafnyType, __T16: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>, f_10: Rc<impl ::std::ops::Fn(T10) -> __T10 + 'static>, f_11: Rc<impl ::std::ops::Fn(T11) -> __T11 + 'static>, f_12: Rc<impl ::std::ops::Fn(T12) -> __T12 + 'static>, f_13: Rc<impl ::std::ops::Fn(T13) -> __T13 + 'static>, f_14: Rc<impl ::std::ops::Fn(T14) -> __T14 + 'static>, f_15: Rc<impl ::std::ops::Fn(T15) -> __T15 + 'static>, f_16: Rc<impl ::std::ops::Fn(T16) -> __T16 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>) -> Tuple17<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16>> {
+            Rc::new(move |this: Self| -> Tuple17<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16>{
+                    match this {
+                        Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => {
+                            Tuple17::_T17 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9),
+                                _10: f_10.clone()(_10),
+                                _11: f_11.clone()(_11),
+                                _12: f_12.clone()(_12),
+                                _13: f_13.clone()(_13),
+                                _14: f_14.clone()(_14),
+                                _15: f_15.clone()(_15),
+                                _16: f_16.clone()(_16)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq, T10: DafnyType + Eq, T11: DafnyType + Eq, T12: DafnyType + Eq, T13: DafnyType + Eq, T14: DafnyType + Eq, T15: DafnyType + Eq, T16: DafnyType + Eq> Eq
+        for Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash, T10: DafnyType + Hash, T11: DafnyType + Hash, T12: DafnyType + Hash, T13: DafnyType + Hash, T14: DafnyType + Hash, T15: DafnyType + Hash, T16: DafnyType + Hash> Hash
+        for Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple17::_T17{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state);
+                    Hash::hash(_10, _state);
+                    Hash::hash(_11, _state);
+                    Hash::hash(_12, _state);
+                    Hash::hash(_13, _state);
+                    Hash::hash(_14, _state);
+                    Hash::hash(_15, _state);
+                    Hash::hash(_16, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default, T10: DafnyType + Default, T11: DafnyType + Default, T12: DafnyType + Default, T13: DafnyType + Default, T14: DafnyType + Default, T15: DafnyType + Default, T16: DafnyType + Default> Default
+        for Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+        fn default() -> Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+            Tuple17::_T17 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default(),
+                _10: Default::default(),
+                _11: Default::default(),
+                _12: Default::default(),
+                _13: Default::default(),
+                _14: Default::default(),
+                _15: Default::default(),
+                _16: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType> AsRef<Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>
+        for Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple18<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType> {
+        _T18 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9,
+            _10: T10,
+            _11: T11,
+            _12: T12,
+            _13: T13,
+            _14: T14,
+            _15: T15,
+            _16: T16,
+            _17: T17
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType> Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _9,
+            }
+        }
+        /// Returns a borrow of the field _10
+        pub fn _10(&self) -> &T10 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _10,
+            }
+        }
+        /// Returns a borrow of the field _11
+        pub fn _11(&self) -> &T11 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _11,
+            }
+        }
+        /// Returns a borrow of the field _12
+        pub fn _12(&self) -> &T12 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _12,
+            }
+        }
+        /// Returns a borrow of the field _13
+        pub fn _13(&self) -> &T13 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _13,
+            }
+        }
+        /// Returns a borrow of the field _14
+        pub fn _14(&self) -> &T14 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _14,
+            }
+        }
+        /// Returns a borrow of the field _15
+        pub fn _15(&self) -> &T15 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _15,
+            }
+        }
+        /// Returns a borrow of the field _16
+        pub fn _16(&self) -> &T16 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _16,
+            }
+        }
+        /// Returns a borrow of the field _17
+        pub fn _17(&self) -> &T17 {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => _17,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType> Debug
+        for Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType> DafnyPrint
+        for Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_10, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_11, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_12, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_13, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_14, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_15, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_16, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_17, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType> Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType, __T10: DafnyType, __T11: DafnyType, __T12: DafnyType, __T13: DafnyType, __T14: DafnyType, __T15: DafnyType, __T16: DafnyType, __T17: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>, f_10: Rc<impl ::std::ops::Fn(T10) -> __T10 + 'static>, f_11: Rc<impl ::std::ops::Fn(T11) -> __T11 + 'static>, f_12: Rc<impl ::std::ops::Fn(T12) -> __T12 + 'static>, f_13: Rc<impl ::std::ops::Fn(T13) -> __T13 + 'static>, f_14: Rc<impl ::std::ops::Fn(T14) -> __T14 + 'static>, f_15: Rc<impl ::std::ops::Fn(T15) -> __T15 + 'static>, f_16: Rc<impl ::std::ops::Fn(T16) -> __T16 + 'static>, f_17: Rc<impl ::std::ops::Fn(T17) -> __T17 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>) -> Tuple18<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17>> {
+            Rc::new(move |this: Self| -> Tuple18<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17>{
+                    match this {
+                        Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => {
+                            Tuple18::_T18 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9),
+                                _10: f_10.clone()(_10),
+                                _11: f_11.clone()(_11),
+                                _12: f_12.clone()(_12),
+                                _13: f_13.clone()(_13),
+                                _14: f_14.clone()(_14),
+                                _15: f_15.clone()(_15),
+                                _16: f_16.clone()(_16),
+                                _17: f_17.clone()(_17)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq, T10: DafnyType + Eq, T11: DafnyType + Eq, T12: DafnyType + Eq, T13: DafnyType + Eq, T14: DafnyType + Eq, T15: DafnyType + Eq, T16: DafnyType + Eq, T17: DafnyType + Eq> Eq
+        for Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash, T10: DafnyType + Hash, T11: DafnyType + Hash, T12: DafnyType + Hash, T13: DafnyType + Hash, T14: DafnyType + Hash, T15: DafnyType + Hash, T16: DafnyType + Hash, T17: DafnyType + Hash> Hash
+        for Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple18::_T18{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state);
+                    Hash::hash(_10, _state);
+                    Hash::hash(_11, _state);
+                    Hash::hash(_12, _state);
+                    Hash::hash(_13, _state);
+                    Hash::hash(_14, _state);
+                    Hash::hash(_15, _state);
+                    Hash::hash(_16, _state);
+                    Hash::hash(_17, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default, T10: DafnyType + Default, T11: DafnyType + Default, T12: DafnyType + Default, T13: DafnyType + Default, T14: DafnyType + Default, T15: DafnyType + Default, T16: DafnyType + Default, T17: DafnyType + Default> Default
+        for Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
+        fn default() -> Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
+            Tuple18::_T18 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default(),
+                _10: Default::default(),
+                _11: Default::default(),
+                _12: Default::default(),
+                _13: Default::default(),
+                _14: Default::default(),
+                _15: Default::default(),
+                _16: Default::default(),
+                _17: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType> AsRef<Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>>
+        for Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple19<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType> {
+        _T19 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9,
+            _10: T10,
+            _11: T11,
+            _12: T12,
+            _13: T13,
+            _14: T14,
+            _15: T15,
+            _16: T16,
+            _17: T17,
+            _18: T18
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType> Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _9,
+            }
+        }
+        /// Returns a borrow of the field _10
+        pub fn _10(&self) -> &T10 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _10,
+            }
+        }
+        /// Returns a borrow of the field _11
+        pub fn _11(&self) -> &T11 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _11,
+            }
+        }
+        /// Returns a borrow of the field _12
+        pub fn _12(&self) -> &T12 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _12,
+            }
+        }
+        /// Returns a borrow of the field _13
+        pub fn _13(&self) -> &T13 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _13,
+            }
+        }
+        /// Returns a borrow of the field _14
+        pub fn _14(&self) -> &T14 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _14,
+            }
+        }
+        /// Returns a borrow of the field _15
+        pub fn _15(&self) -> &T15 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _15,
+            }
+        }
+        /// Returns a borrow of the field _16
+        pub fn _16(&self) -> &T16 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _16,
+            }
+        }
+        /// Returns a borrow of the field _17
+        pub fn _17(&self) -> &T17 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _17,
+            }
+        }
+        /// Returns a borrow of the field _18
+        pub fn _18(&self) -> &T18 {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => _18,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType> Debug
+        for Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType> DafnyPrint
+        for Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_10, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_11, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_12, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_13, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_14, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_15, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_16, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_17, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_18, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType> Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType, __T10: DafnyType, __T11: DafnyType, __T12: DafnyType, __T13: DafnyType, __T14: DafnyType, __T15: DafnyType, __T16: DafnyType, __T17: DafnyType, __T18: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>, f_10: Rc<impl ::std::ops::Fn(T10) -> __T10 + 'static>, f_11: Rc<impl ::std::ops::Fn(T11) -> __T11 + 'static>, f_12: Rc<impl ::std::ops::Fn(T12) -> __T12 + 'static>, f_13: Rc<impl ::std::ops::Fn(T13) -> __T13 + 'static>, f_14: Rc<impl ::std::ops::Fn(T14) -> __T14 + 'static>, f_15: Rc<impl ::std::ops::Fn(T15) -> __T15 + 'static>, f_16: Rc<impl ::std::ops::Fn(T16) -> __T16 + 'static>, f_17: Rc<impl ::std::ops::Fn(T17) -> __T17 + 'static>, f_18: Rc<impl ::std::ops::Fn(T18) -> __T18 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>) -> Tuple19<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18>> {
+            Rc::new(move |this: Self| -> Tuple19<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18>{
+                    match this {
+                        Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => {
+                            Tuple19::_T19 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9),
+                                _10: f_10.clone()(_10),
+                                _11: f_11.clone()(_11),
+                                _12: f_12.clone()(_12),
+                                _13: f_13.clone()(_13),
+                                _14: f_14.clone()(_14),
+                                _15: f_15.clone()(_15),
+                                _16: f_16.clone()(_16),
+                                _17: f_17.clone()(_17),
+                                _18: f_18.clone()(_18)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq, T10: DafnyType + Eq, T11: DafnyType + Eq, T12: DafnyType + Eq, T13: DafnyType + Eq, T14: DafnyType + Eq, T15: DafnyType + Eq, T16: DafnyType + Eq, T17: DafnyType + Eq, T18: DafnyType + Eq> Eq
+        for Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash, T10: DafnyType + Hash, T11: DafnyType + Hash, T12: DafnyType + Hash, T13: DafnyType + Hash, T14: DafnyType + Hash, T15: DafnyType + Hash, T16: DafnyType + Hash, T17: DafnyType + Hash, T18: DafnyType + Hash> Hash
+        for Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple19::_T19{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state);
+                    Hash::hash(_10, _state);
+                    Hash::hash(_11, _state);
+                    Hash::hash(_12, _state);
+                    Hash::hash(_13, _state);
+                    Hash::hash(_14, _state);
+                    Hash::hash(_15, _state);
+                    Hash::hash(_16, _state);
+                    Hash::hash(_17, _state);
+                    Hash::hash(_18, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default, T10: DafnyType + Default, T11: DafnyType + Default, T12: DafnyType + Default, T13: DafnyType + Default, T14: DafnyType + Default, T15: DafnyType + Default, T16: DafnyType + Default, T17: DafnyType + Default, T18: DafnyType + Default> Default
+        for Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
+        fn default() -> Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
+            Tuple19::_T19 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default(),
+                _10: Default::default(),
+                _11: Default::default(),
+                _12: Default::default(),
+                _13: Default::default(),
+                _14: Default::default(),
+                _15: Default::default(),
+                _16: Default::default(),
+                _17: Default::default(),
+                _18: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType> AsRef<Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>>
+        for Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+
+    #[derive(PartialEq, Clone)]
+    pub enum Tuple20<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType, T19: DafnyType> {
+        _T20 {
+            _0: T0,
+            _1: T1,
+            _2: T2,
+            _3: T3,
+            _4: T4,
+            _5: T5,
+            _6: T6,
+            _7: T7,
+            _8: T8,
+            _9: T9,
+            _10: T10,
+            _11: T11,
+            _12: T12,
+            _13: T13,
+            _14: T14,
+            _15: T15,
+            _16: T16,
+            _17: T17,
+            _18: T18,
+            _19: T19
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType, T19: DafnyType> Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
+        /// Returns a borrow of the field _0
+        pub fn _0(&self) -> &T0 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _0,
+            }
+        }
+        /// Returns a borrow of the field _1
+        pub fn _1(&self) -> &T1 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _1,
+            }
+        }
+        /// Returns a borrow of the field _2
+        pub fn _2(&self) -> &T2 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _2,
+            }
+        }
+        /// Returns a borrow of the field _3
+        pub fn _3(&self) -> &T3 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _3,
+            }
+        }
+        /// Returns a borrow of the field _4
+        pub fn _4(&self) -> &T4 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _4,
+            }
+        }
+        /// Returns a borrow of the field _5
+        pub fn _5(&self) -> &T5 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _5,
+            }
+        }
+        /// Returns a borrow of the field _6
+        pub fn _6(&self) -> &T6 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _6,
+            }
+        }
+        /// Returns a borrow of the field _7
+        pub fn _7(&self) -> &T7 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _7,
+            }
+        }
+        /// Returns a borrow of the field _8
+        pub fn _8(&self) -> &T8 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _8,
+            }
+        }
+        /// Returns a borrow of the field _9
+        pub fn _9(&self) -> &T9 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _9,
+            }
+        }
+        /// Returns a borrow of the field _10
+        pub fn _10(&self) -> &T10 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _10,
+            }
+        }
+        /// Returns a borrow of the field _11
+        pub fn _11(&self) -> &T11 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _11,
+            }
+        }
+        /// Returns a borrow of the field _12
+        pub fn _12(&self) -> &T12 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _12,
+            }
+        }
+        /// Returns a borrow of the field _13
+        pub fn _13(&self) -> &T13 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _13,
+            }
+        }
+        /// Returns a borrow of the field _14
+        pub fn _14(&self) -> &T14 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _14,
+            }
+        }
+        /// Returns a borrow of the field _15
+        pub fn _15(&self) -> &T15 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _15,
+            }
+        }
+        /// Returns a borrow of the field _16
+        pub fn _16(&self) -> &T16 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _16,
+            }
+        }
+        /// Returns a borrow of the field _17
+        pub fn _17(&self) -> &T17 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _17,
+            }
+        }
+        /// Returns a borrow of the field _18
+        pub fn _18(&self) -> &T18 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _18,
+            }
+        }
+        /// Returns a borrow of the field _19
+        pub fn _19(&self) -> &T19 {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => _19,
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType, T19: DafnyType> Debug
+        for Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
+        fn fmt(&self, f: &mut Formatter) -> Result {
+            DafnyPrint::fmt_print(self, f, true)
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType, T19: DafnyType> DafnyPrint
+        for Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
+        fn fmt_print(&self, _formatter: &mut Formatter, _in_seq: bool) -> std::fmt::Result {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => {
+                    write!(_formatter, "(")?;
+                    DafnyPrint::fmt_print(_0, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_1, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_2, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_3, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_4, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_5, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_6, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_7, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_8, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_9, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_10, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_11, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_12, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_13, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_14, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_15, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_16, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_17, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_18, _formatter, false)?;
+                    write!(_formatter, ", ")?;
+                    DafnyPrint::fmt_print(_19, _formatter, false)?;
+                    write!(_formatter, ")")?;
+                    Ok(())
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType, T19: DafnyType> Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
+        /// Given type parameter conversions, returns a lambda to convert this structure
+        pub fn coerce<__T0: DafnyType, __T1: DafnyType, __T2: DafnyType, __T3: DafnyType, __T4: DafnyType, __T5: DafnyType, __T6: DafnyType, __T7: DafnyType, __T8: DafnyType, __T9: DafnyType, __T10: DafnyType, __T11: DafnyType, __T12: DafnyType, __T13: DafnyType, __T14: DafnyType, __T15: DafnyType, __T16: DafnyType, __T17: DafnyType, __T18: DafnyType, __T19: DafnyType>(f_0: Rc<impl ::std::ops::Fn(T0) -> __T0 + 'static>, f_1: Rc<impl ::std::ops::Fn(T1) -> __T1 + 'static>, f_2: Rc<impl ::std::ops::Fn(T2) -> __T2 + 'static>, f_3: Rc<impl ::std::ops::Fn(T3) -> __T3 + 'static>, f_4: Rc<impl ::std::ops::Fn(T4) -> __T4 + 'static>, f_5: Rc<impl ::std::ops::Fn(T5) -> __T5 + 'static>, f_6: Rc<impl ::std::ops::Fn(T6) -> __T6 + 'static>, f_7: Rc<impl ::std::ops::Fn(T7) -> __T7 + 'static>, f_8: Rc<impl ::std::ops::Fn(T8) -> __T8 + 'static>, f_9: Rc<impl ::std::ops::Fn(T9) -> __T9 + 'static>, f_10: Rc<impl ::std::ops::Fn(T10) -> __T10 + 'static>, f_11: Rc<impl ::std::ops::Fn(T11) -> __T11 + 'static>, f_12: Rc<impl ::std::ops::Fn(T12) -> __T12 + 'static>, f_13: Rc<impl ::std::ops::Fn(T13) -> __T13 + 'static>, f_14: Rc<impl ::std::ops::Fn(T14) -> __T14 + 'static>, f_15: Rc<impl ::std::ops::Fn(T15) -> __T15 + 'static>, f_16: Rc<impl ::std::ops::Fn(T16) -> __T16 + 'static>, f_17: Rc<impl ::std::ops::Fn(T17) -> __T17 + 'static>, f_18: Rc<impl ::std::ops::Fn(T18) -> __T18 + 'static>, f_19: Rc<impl ::std::ops::Fn(T19) -> __T19 + 'static>) -> Rc<impl ::std::ops::Fn(Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>) -> Tuple20<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19>> {
+            Rc::new(move |this: Self| -> Tuple20<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19>{
+                    match this {
+                        Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => {
+                            Tuple20::_T20 {
+                                _0: f_0.clone()(_0),
+                                _1: f_1.clone()(_1),
+                                _2: f_2.clone()(_2),
+                                _3: f_3.clone()(_3),
+                                _4: f_4.clone()(_4),
+                                _5: f_5.clone()(_5),
+                                _6: f_6.clone()(_6),
+                                _7: f_7.clone()(_7),
+                                _8: f_8.clone()(_8),
+                                _9: f_9.clone()(_9),
+                                _10: f_10.clone()(_10),
+                                _11: f_11.clone()(_11),
+                                _12: f_12.clone()(_12),
+                                _13: f_13.clone()(_13),
+                                _14: f_14.clone()(_14),
+                                _15: f_15.clone()(_15),
+                                _16: f_16.clone()(_16),
+                                _17: f_17.clone()(_17),
+                                _18: f_18.clone()(_18),
+                                _19: f_19.clone()(_19)
+                            }
+                        },
+                    }
+                })
+        }
+    }
+
+    impl<T0: DafnyType + Eq, T1: DafnyType + Eq, T2: DafnyType + Eq, T3: DafnyType + Eq, T4: DafnyType + Eq, T5: DafnyType + Eq, T6: DafnyType + Eq, T7: DafnyType + Eq, T8: DafnyType + Eq, T9: DafnyType + Eq, T10: DafnyType + Eq, T11: DafnyType + Eq, T12: DafnyType + Eq, T13: DafnyType + Eq, T14: DafnyType + Eq, T15: DafnyType + Eq, T16: DafnyType + Eq, T17: DafnyType + Eq, T18: DafnyType + Eq, T19: DafnyType + Eq> Eq
+        for Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {}
+
+    impl<T0: DafnyType + Hash, T1: DafnyType + Hash, T2: DafnyType + Hash, T3: DafnyType + Hash, T4: DafnyType + Hash, T5: DafnyType + Hash, T6: DafnyType + Hash, T7: DafnyType + Hash, T8: DafnyType + Hash, T9: DafnyType + Hash, T10: DafnyType + Hash, T11: DafnyType + Hash, T12: DafnyType + Hash, T13: DafnyType + Hash, T14: DafnyType + Hash, T15: DafnyType + Hash, T16: DafnyType + Hash, T17: DafnyType + Hash, T18: DafnyType + Hash, T19: DafnyType + Hash> Hash
+        for Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
+        fn hash<_H: Hasher>(&self, _state: &mut _H) {
+            match self {
+                Tuple20::_T20{_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, } => {
+                    Hash::hash(_0, _state);
+                    Hash::hash(_1, _state);
+                    Hash::hash(_2, _state);
+                    Hash::hash(_3, _state);
+                    Hash::hash(_4, _state);
+                    Hash::hash(_5, _state);
+                    Hash::hash(_6, _state);
+                    Hash::hash(_7, _state);
+                    Hash::hash(_8, _state);
+                    Hash::hash(_9, _state);
+                    Hash::hash(_10, _state);
+                    Hash::hash(_11, _state);
+                    Hash::hash(_12, _state);
+                    Hash::hash(_13, _state);
+                    Hash::hash(_14, _state);
+                    Hash::hash(_15, _state);
+                    Hash::hash(_16, _state);
+                    Hash::hash(_17, _state);
+                    Hash::hash(_18, _state);
+                    Hash::hash(_19, _state)
+                },
+            }
+        }
+    }
+
+    impl<T0: DafnyType + Default, T1: DafnyType + Default, T2: DafnyType + Default, T3: DafnyType + Default, T4: DafnyType + Default, T5: DafnyType + Default, T6: DafnyType + Default, T7: DafnyType + Default, T8: DafnyType + Default, T9: DafnyType + Default, T10: DafnyType + Default, T11: DafnyType + Default, T12: DafnyType + Default, T13: DafnyType + Default, T14: DafnyType + Default, T15: DafnyType + Default, T16: DafnyType + Default, T17: DafnyType + Default, T18: DafnyType + Default, T19: DafnyType + Default> Default
+        for Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
+        fn default() -> Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
+            Tuple20::_T20 {
+                _0: Default::default(),
+                _1: Default::default(),
+                _2: Default::default(),
+                _3: Default::default(),
+                _4: Default::default(),
+                _5: Default::default(),
+                _6: Default::default(),
+                _7: Default::default(),
+                _8: Default::default(),
+                _9: Default::default(),
+                _10: Default::default(),
+                _11: Default::default(),
+                _12: Default::default(),
+                _13: Default::default(),
+                _14: Default::default(),
+                _15: Default::default(),
+                _16: Default::default(),
+                _17: Default::default(),
+                _18: Default::default(),
+                _19: Default::default()
+            }
+        }
+    }
+
+    impl<T0: DafnyType, T1: DafnyType, T2: DafnyType, T3: DafnyType, T4: DafnyType, T5: DafnyType, T6: DafnyType, T7: DafnyType, T8: DafnyType, T9: DafnyType, T10: DafnyType, T11: DafnyType, T12: DafnyType, T13: DafnyType, T14: DafnyType, T15: DafnyType, T16: DafnyType, T17: DafnyType, T18: DafnyType, T19: DafnyType> AsRef<Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>>
+        for Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
+        fn as_ref(&self) -> &Self {
+            self
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/DafnyRuntime/DafnyRuntimeRust/src/tests/mod.rs b/Source/DafnyRuntime/DafnyRuntimeRust/src/tests/mod.rs
new file mode 100644
index 00000000000..f3ce7796c7f
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeRust/src/tests/mod.rs
@@ -0,0 +1,1044 @@
+#![allow(nonstandard_style)]
+
+// Test module
+#[cfg(test)]
+mod tests {
+    use crate::*;
+
+    #[test]
+    fn test_int() {
+        let x = int!(37);
+        assert_eq!(x.to_u8().unwrap(), truncate!(x.clone(), u8));
+        assert_eq!(x.to_u16().unwrap(), truncate!(x.clone(), u16));
+        assert_eq!(x.to_u32().unwrap(), truncate!(x.clone(), u32));
+        assert_eq!(x.to_u64().unwrap(), truncate!(x.clone(), u64));
+        assert_eq!(x.to_u128().unwrap(), truncate!(x.clone(), u128));
+        assert_eq!(x.to_i8().unwrap(), truncate!(x.clone(), i8));
+        assert_eq!(x.to_i16().unwrap(), truncate!(x.clone(), i16));
+        assert_eq!(x.to_i32().unwrap(), truncate!(x.clone(), i32));
+        assert_eq!(x.to_i64().unwrap(), truncate!(x.clone(), i64));
+        assert_eq!(x.to_i128().unwrap(), truncate!(x.clone(), i128));
+    }
+
+    #[test]
+    fn test_sequence() {
+        let values = vec![1, 2, 3];
+        let seq = Sequence::<i32>::from_array_owned(values.clone());
+        assert_eq!(seq.cardinality_usize(), 3);
+        assert_eq!(seq.to_array(), values.into());
+
+        // Create a concat array, wrap it into a lazy one, get the i-th element,
+        // and verify that this operation flattened the array
+        let left = Sequence::<i32>::from_array_owned(vec![1, 2, 3]);
+        let right = Sequence::<i32>::from_array_owned(vec![4, 5, 6]);
+        let concat = Sequence::<i32>::new_concat_sequence(&left, &right);
+
+        assert_eq!(concat.cardinality_usize(), 6);
+        match &concat {
+            Sequence::ConcatSequence {
+                boxed,
+                length,
+                left,
+                ..
+            } => {
+                assert_eq!(*length, 6);
+                assert_eq!(unsafe { &*left.get() }.cardinality_usize(), 3);
+                // Test that boxed is None
+                assert!(boxed.as_ref().clone().borrow().as_ref().is_none());
+            }
+            _ => panic!("This should never happen"),
+        }
+        let value = concat.get_usize(0);
+        assert_eq!(value, 1);
+        match &concat {
+            crate::Sequence::ConcatSequence { boxed, .. } => {
+                assert_eq!(
+                    *boxed.as_ref().clone().borrow().as_ref().unwrap().as_ref(),
+                    vec![1, 2, 3, 4, 5, 6]
+                );
+            }
+            _ => panic!("This should never happen"),
+        }
+    }
+
+    #[test]
+    fn test_dafny_int() {
+        assert_eq!(int!(0).to_usize(), Some(0));
+        assert_eq!(int!(42).to_usize(), Some(42));
+    }
+
+    #[test]
+    fn test_dafny_sequence_print() {
+        let hello: DafnyString = seq![
+            DafnyChar('H'),
+            DafnyChar('e'),
+            DafnyChar('l'),
+            DafnyChar('l'),
+            DafnyChar('o')
+        ];
+        assert_eq!(DafnyPrintWrapper(&hello).to_string(), "Hello");
+        let hello: DafnyStringUTF16 = seq![
+            DafnyCharUTF16(0x0048),
+            DafnyCharUTF16(0x0065),
+            DafnyCharUTF16(0x006c),
+            DafnyCharUTF16(0x006c),
+            DafnyCharUTF16(0x006f)
+        ];
+        assert_eq!(DafnyPrintWrapper(&hello).to_string(), "Hello");
+        assert_eq!(DafnyPrintWrapper(&string_of("Hello")).to_string(), "Hello");
+        let hello = seq![1, 2, 3];
+        assert_eq!(DafnyPrintWrapper(&hello).to_string(), "[1, 2, 3]");
+    }
+    #[test]
+    fn test_dafny_sequence() {
+        let s = seq![55, 56, 57];
+        assert_eq!(seq![55, 56] != s, true);
+        assert_eq!(s.cardinality_usize(), 3);
+        assert_eq!(s.cardinality(), int!(3));
+        assert_eq!(s.get(&int!(1)), 56);
+        assert_eq!(s.slice(&int!(1), &int!(2)), seq![56]);
+        assert_eq!(s.take(&int!(2)), seq![55, 56]);
+        assert_eq!(s.drop(&int!(1)), seq![56, 57]);
+        assert_eq!(s.update_index(&int!(1), &8), seq![55, 8, 57]);
+        assert_eq!(s.concat(&seq![58, 59]), seq!(55, 56, 57, 58, 59));
+    }
+
+    #[test]
+    fn test_dafny_set() {
+        let s = set! {55, 56, 57, 56, 58};
+        let t = set! {59, 58, 57};
+        assert_eq!(s.cardinality_usize(), 4);
+        assert_eq!(s.cardinality(), int!(4));
+        assert_eq!(s.contains(&55), true);
+        assert_eq!(s.contains(&54), false);
+        assert_eq!(s.merge(&set! {}), s);
+        assert_eq!(set! {}.merge(&s), s);
+        assert_eq!(s.merge(&t), set! {59, 58, 57, 56, 55});
+        assert_eq!(s.intersect(&t), set! {57, 58});
+        assert_eq!(s.subtract(&set! {}), s);
+        assert_eq!(set! {}.subtract(&s), set! {});
+        let smt = s.subtract(&t);
+        assert_eq!(smt, set! {55, 56});
+        assert_eq!(t.subtract(&s), set! {59});
+        assert_eq!(s.disjoint(&set! {}), true);
+        assert_eq!(set! {}.disjoint(&s), true);
+        assert_eq!(s.disjoint(&t), false);
+        assert_eq!(t.disjoint(&s), false);
+        assert_eq!(smt.disjoint(&t), true);
+        assert_eq!(t.disjoint(&smt), true);
+        assert_eq!(s.elements(), s);
+        assert_eq!(
+            s.as_dafny_multiset(),
+            Multiset::from_array(&vec!(55, 56, 57, 58))
+        );
+    }
+
+    #[test]
+    fn test_dafny_multisubset() {
+        let s = multiset! {55, 56, 57, 58, 59};
+        let t = multiset! {55, 56, 57, 58};
+        assert!(t < s);
+        assert!(t <= s);
+        assert!(s > t);
+        assert!(s >= t);
+        assert!(s != t);
+        assert!(t != s);
+
+        assert!(!(t > s));
+        assert!(!(t >= s));
+        assert!(!(s < t));
+        assert!(!(s <= t));
+        assert!(!(s == t));
+        assert!(!(t == s));
+
+        let s = multiset! {55, 56, 57, 58, 58};
+        let t = multiset! {55, 56, 57, 58};
+        assert!(t < s);
+        assert!(t <= s);
+        assert!(s > t);
+        assert!(s >= t);
+        assert!(s != t);
+        assert!(t != s);
+
+        assert!(!(t > s));
+        assert!(!(t >= s));
+        assert!(!(s < t));
+        assert!(!(s <= t));
+        assert!(!(s == t));
+        assert!(!(t == s));
+
+        let s = multiset! {55, 56, 57, 58, 59};
+        let t = multiset! {55, 56, 57, 58, 59};
+        assert!(t <= s);
+        assert!(s <= t);
+        assert!(s >= t);
+        assert!(t >= s);
+        assert!(s == t);
+        assert!(t == s);
+
+        assert!(!(t < s));
+        assert!(!(t > s));
+        assert!(!(s > t));
+        assert!(!(s < t));
+        assert!(!(s != t));
+        assert!(!(t != s));
+
+        let s = multiset! {55, 56, 57, 58, 59};
+        let t = multiset! {55, 56, 57, 58, 58};
+        assert!(s != t);
+        assert!(t != s);
+
+        assert!(!(t < s));
+        assert!(!(t <= s));
+        assert!(!(t > s));
+        assert!(!(t >= s));
+        assert!(!(s < t));
+        assert!(!(s <= t));
+        assert!(!(s > t));
+        assert!(!(s >= t));
+        assert!(!(s == t));
+        assert!(!(t == s));
+    }
+
+    #[test]
+    fn test_dafny_multiset() {
+        let s = multiset! {55, 56, 57, 56, 58};
+        let t = multiset! {59, 58, 57, 56};
+        assert_eq!(s.cardinality_usize(), 5);
+        assert_eq!(s.cardinality(), int!(5));
+        assert_eq!(s.contains(&55), true);
+        assert_eq!(s.contains(&54), false);
+        assert_eq!(s.get(&54), int!(0));
+        assert_eq!(s.get(&55), int!(1));
+        assert_eq!(s.get(&56), int!(2));
+        assert_eq!(s.get(&57), int!(1));
+        assert_eq!(s.merge(&multiset! {}), s);
+        assert_eq!(multiset! {}.merge(&s), s);
+        let merged = multiset! {59, 58, 58, 57, 57, 56, 56, 56, 55};
+        assert_eq!(s.merge(&t), merged);
+        assert_eq!(merged.cardinality_usize(), 9);
+        assert_eq!(s.intersect(&t), multiset! {57, 58, 56});
+        assert_eq!(s.subtract(&multiset! {}), s);
+        assert_eq!(multiset! {}.subtract(&s), multiset! {});
+        let smt = s.subtract(&t);
+        assert_eq!(smt, multiset! {55, 56});
+        let tms = t.subtract(&s);
+        assert_eq!(tms, multiset! {59});
+        assert_eq!(s.disjoint(&multiset! {}), true);
+        assert_eq!(multiset! {}.disjoint(&s), true);
+        assert_eq!(s.disjoint(&t), false);
+        assert_eq!(t.disjoint(&s), false);
+        assert_eq!(smt.disjoint(&t), false);
+        assert_eq!(t.disjoint(&smt), false);
+        assert_eq!(tms.disjoint(&s), true);
+        assert_eq!(s.disjoint(&tms), true);
+        assert_eq!(s.as_dafny_multiset(), s);
+    }
+
+    #[test]
+    fn test_dafny_map() {
+        let m_empty: Map<i32, i32> = map![];
+        let m_3 = map![1 => 2, 3 => 6, 5 => 10];
+        let k_3 = set! {1, 3, 5};
+        let v_3 = set! {2, 6, 10};
+        assert_eq!(m_empty.cardinality_usize(), 0);
+        assert_eq!(m_empty.cardinality(), int!(0));
+        assert_eq!(m_3.cardinality_usize(), 3);
+        assert_eq!(m_3.cardinality(), int!(3));
+        assert_eq!(m_3.contains(&1), true);
+        assert_eq!(m_3.contains(&0), false);
+        assert_eq!(m_3.keys(), k_3);
+        assert_eq!(m_3.values(), v_3);
+        assert_eq!(m_3.get(&1), 2);
+        assert_eq!(m_3.get_or_none(&1), Some(2));
+        assert_eq!(m_3.get_or_none(&0), None);
+        let mut m_4 = m_3.update_index(&0, &2);
+        assert_eq!(m_3.contains(&0), false);
+        assert_eq!(m_4.contains(&0), true);
+        m_4 = m_4.update_index_owned(0, 7);
+        assert_eq!(m_4.contains(&0), true);
+
+        assert_eq!(m_4.get(&0), 7);
+        assert_eq!(m_4.cardinality_usize(), 4);
+        assert_eq!(m_4.merge(&map![]), m_4);
+        assert_eq!(map![].merge(&m_4), m_4);
+        let m_5 = m_4.merge(&map![3 => 9, 6 => 12]);
+        assert_eq!(m_5.cardinality_usize(), 5);
+        println!("m_4 is {:?}", m_4);
+        assert_eq!(m_4.get(&3), 6);
+        assert_eq!(m_5.get(&3), 9);
+        assert_eq!(m_5.subtract(&set! {}), m_5);
+        let m_4b = m_5.subtract(&set! {3});
+        assert_eq!(m_4b.cardinality_usize(), 4);
+        assert_eq!(m_4b.contains(&3), false)
+    }
+
+    #[test]
+    fn test_dafny_array() {
+        let a = array![1, 2, 3];
+        assert_eq!(crate::array::length_usize(a), 3);
+        assert_eq!(crate::array::length(a), int!(3));
+        assert_eq!(array::get_usize(a, 0), 1);
+        assert_eq!(array::get_usize(a, 1), 2);
+        assert_eq!(array::get_usize(a, 2), 3);
+        array::update_usize(a, 0, 4);
+        array::update_usize(a, 1, 5);
+        array::update_usize(a, 2, 6);
+        assert_eq!(array::get_usize(a, 0), 4);
+        assert_eq!(array::get_usize(a, 1), 5);
+        assert_eq!(array::get_usize(a, 2), 6);
+        deallocate(a);
+    }
+
+    #[test]
+    fn test_dafny_array_init() {
+        // test from_vec, and initialize
+        let mut v = Vec::new();
+        v.push(1);
+        v.push(2);
+        v.push(3);
+        let a = array::from_vec(v);
+        assert_eq!(array::length_usize(a), 3);
+        assert_eq!(array::get_usize(a, 0), 1);
+        let v2 = array::initialize_usize(3, Rc::new(|i| i + 1));
+        assert_eq!(array::length_usize(v2), 3);
+        assert_eq!(array::get_usize(v2, 0), 1);
+        assert_eq!(array::get_usize(v2, 1), 2);
+        assert_eq!(array::get_usize(v2, 2), 3);
+        array::update_usize(v2, 1, 10);
+        assert_eq!(array::get_usize(v2, 1), 10);
+
+
+        let v3 = array::initialize(&int!(3), Rc::new(|i| i.clone() + int!(1)));
+        assert_eq!(array::length_usize(v3), 3);
+        assert_eq!(array::get_usize(v3, 0), int!(1));
+        assert_eq!(array::get_usize(v3, 1), int!(2));
+        assert_eq!(array::get_usize(v3, 2), int!(3));
+        array::update(v3, &int!(1), int!(10));
+        assert_eq!(array::get_usize(v3, 1), int!(10));
+
+        deallocate(a);
+        deallocate(v2);
+        deallocate(v3);
+    }
+
+    #[test]
+    fn test_array2() {
+        let p = Array2::<DafnyInt>::placebos(&int!(3), &int!(4));
+        for i in 0..3 {
+            for j in 0..4 {
+                modify!(p).data[i][j] = MaybeUninit::new(int!(i + j));
+            }
+        }
+        let p = Array2::construct(p);
+        assert_eq!(read!(p).length0_usize(), 3);
+        assert_eq!(read!(p).length1_usize(), 4);
+        let v = read!(p).to_vec();
+        assert_eq!(v.len(), 3);
+        assert_eq!(v, vec![
+            vec![int!(0), int!(1), int!(2), int!(3)],
+              vec![int!(1), int!(2), int!(3), int!(4)],
+              vec![int!(2), int!(3), int!(4), int!(5)]]);
+
+        deallocate(p);
+        // Allocate an array whose first dimension is zero
+        let p = Array2::<DafnyInt>::placebos(&int!(0), &int!(4));
+        let p = Array2::construct(p);
+        assert_eq!(read!(p).length0_usize(), 0);
+        assert_eq!(read!(p).length1_usize(), 4);
+        deallocate(p);
+    }
+
+    #[test]
+    fn test_array3() {
+        let a = Array3::<DafnyInt>::placebos(&int!(3), &int!(2), &int!(4));
+        for i in 0..3 {
+            for j in 0..2 {
+                for k in 0..4 {
+                    modify!(a).data[i][j][k] = MaybeUninit::new(DafnyInt::from(i * j + k));
+                }
+            }
+        }
+        let a = Array3::construct(a);
+        assert_eq!(read!(a).length0(), int!(3));
+        assert_eq!(read!(a).length1(), int!(2));
+        assert_eq!(read!(a).length2(), int!(4));
+        let v = read!(a).to_vec();
+        assert_eq!(v.len(), 3);
+        for i in 0..3 {
+            for j in 0..2 {
+                for k in 0..4 {
+                    assert_eq!(read!(a).data[i][j][k], DafnyInt::from(i * j + k));
+                    assert_eq!(v[i][j][k], DafnyInt::from(i * j + k));
+                }
+            }
+        }
+        deallocate(a);
+        // Even if the first two dimensions are zero, the third dimension should not be zero
+        let a = Array3::<DafnyInt>::placebos(&int!(0), &int!(0), &int!(4));
+        let a = Array3::construct(a);
+        assert_eq!(read!(a).length0(), int!(0));
+        assert_eq!(read!(a).length1(), int!(0));
+        assert_eq!(read!(a).length2(), int!(4));
+        deallocate(a);
+    }
+
+    struct ClassWrapper<T> {
+        /*var*/ t: Field<T>,
+        /*var*/ x: Field<crate::DafnyInt>,
+        /*const*/ next: Ptr<ClassWrapper<T>>,
+        /*const*/ constant: crate::DafnyInt,
+    }
+    impl<T: Clone> ClassWrapper<T> {
+        fn constant_plus_x(&self) -> crate::DafnyInt {
+            self.constant.clone() + read_field!(self.x)
+        }
+        fn increment_x(&mut self) {
+            modify_field!(self.x, read_field!(self.x) + int!(1));
+        }
+    }
+
+    impl<T: Clone + Display> ClassWrapper<T> {
+        fn constructor(t: T) -> Ptr<ClassWrapper<T>> {
+            let this = crate::allocate::<ClassWrapper<T>>();
+            update_field_mut_nodrop!(this, t, t);
+            update_field_nodrop!(this, next, this);
+            // If x is assigned twice, we need to keep track of whether it's assigned
+            // like in methods.
+            let mut x_assigned = false;
+            update_field_mut_uninit!(this, x, x_assigned, int!(2));
+            update_field_mut_uninit!(this, x, x_assigned, int!(1));
+            // If we can prove that x is assigned, we can even write this
+            modify_field!(read!(this).x,int!(0));
+            update_field_nodrop!(this, constant, int!(42));
+            update_field_mut_if_uninit!(this, x, x_assigned, int!(0));
+            assert_eq!(x_assigned, true);
+            let mut next_assigned = true;
+            update_field_if_uninit!(this, next, next_assigned, this);
+            assert_eq!(next_assigned, true);
+            this
+        }
+
+        fn constructor_object(t: T) -> Object<ClassWrapper<T>> {
+            let mut this = crate::allocate_object::<ClassWrapper<T>>();
+            update_field_mut_nodrop_object!(this, t, t);
+            update_field_nodrop_object!(this, next, Ptr::from_raw_nonnull(this.as_mut()));
+            // If x is assigned twice, we need to keep track of whether it's assigned
+            // like in methods.
+            let mut x_assigned = false;
+            update_field_mut_uninit_object!(this, x, x_assigned, int!(2));
+            update_field_mut_uninit_object!(this, x, x_assigned, int!(1));
+            // If we can prove that x is assigned, we can even write this
+            modify_field!(rd!(this).x,int!(0));
+            update_field_nodrop_object!(this, constant, int!(42));
+            update_field_mut_if_uninit_object!(this, x, x_assigned, int!(0));
+            assert_eq!(x_assigned, true);
+            let mut next_assigned = true;
+            update_field_if_uninit_object!(this, next, next_assigned, Ptr::from_raw_nonnull(this.as_mut()));
+            assert_eq!(next_assigned, true);
+            this
+        }
+    }
+
+    impl <T: DafnyType> Upcast<dyn Any> for ClassWrapper<T> {
+        UpcastFn!(dyn Any);
+    }
+    impl <T: DafnyType> UpcastObject<dyn Any> for ClassWrapper<T> {
+        UpcastObjectFn!(dyn Any);
+    }
+
+    #[test]
+    #[allow(unused_unsafe)]
+    fn test_class_wrapper() {
+        let c: Ptr<ClassWrapper<i32>> = ClassWrapper::constructor(53);
+        assert_eq!(read!(c).constant, int!(42));
+        assert_eq!(read_field!(read!(c).t), 53);
+        assert_eq!(read_field!(read!(c).x), int!(0));
+        assert_eq!(read_field!(read!(read!(c).next).t), 53);
+        assert_eq!(read!(c).constant_plus_x(), int!(42));
+        modify!(c).increment_x();
+        assert_eq!(read!(c).constant_plus_x(), int!(43));
+        modify_field!(read!(c).x,int!(40));
+        assert_eq!(read!(c).constant_plus_x(), int!(82));
+        modify_field!(read!(c).t,54);
+        assert_eq!(read_field!(read!(c).t), 54);
+        let x_copy = read_field!(read!(c).x);
+        assert_eq!(Rc::strong_count(&x_copy.data), 2);
+        deallocate(c);
+        assert_eq!(Rc::strong_count(&x_copy.data), 1);
+    }
+
+
+    #[test]
+    #[allow(unused_unsafe)]
+    fn test_class_wrapper_object() {
+        let c: Object<ClassWrapper<i32>> = ClassWrapper::constructor_object(53);
+        assert_eq!(rd!(c).constant, int!(42));
+        assert_eq!(read_field!(rd!(c).t), 53);
+        assert_eq!(read_field!(rd!(c).x), int!(0));
+        assert_eq!(read_field!(rd!(rd!(c).next).t), 53);
+        assert_eq!(rd!(c).constant_plus_x(), int!(42));
+        md!(c).increment_x();
+        assert_eq!(rd!(c).constant_plus_x(), int!(43));
+        if true {
+          modify_field!(rd!(c).x,int!(40))
+        }
+        assert_eq!(rd!(c).constant_plus_x(), int!(82));
+        modify_field!(rd!(c).t,54);
+        assert_eq!(read_field!(rd!(c).t), 54);
+    }
+
+    // Requires test1 || test2
+    // We will not do that as it enables the compiler to assume that t contains a valid Rc<i32> when it does not.
+    // Prefer MaybePlacebo
+    fn assign_lazy_in_method(test1: bool, test2: bool) -> Rc<i32> {
+        let mut t = MaybePlacebo::<Rc<i32>>::new();
+        if test1 {
+            t = MaybePlacebo::from(Rc::new(5 as i32));
+        }
+        if test2 {
+            t = MaybePlacebo::from(Rc::new(
+                7 as i32 + if test1 { *MaybePlacebo::read(&t) } else { 0 },
+            ));
+        }
+        println!("{}", MaybePlacebo::read(&t));
+        MaybePlacebo::read(&t)
+    }
+
+    #[test]
+    fn assign_lazy_in_method_test() {
+        let mut t = assign_lazy_in_method(true, false);
+        assert_eq!(*t, 5);
+        t = assign_lazy_in_method(false, true);
+        assert_eq!(*t, 7);
+        t = assign_lazy_in_method(true, true);
+        assert_eq!(*t, 12);
+    }
+
+    fn override_placebo<T: Clone>(o: T, do_override: bool) {
+        let mut _x: MaybePlacebo<T> = MaybePlacebo::<T>::new();
+        if do_override {
+            _x = MaybePlacebo::from(o.clone());
+        }
+    }
+
+    #[test]
+    fn test_placebo() {
+        override_placebo::<Rc<BigInt>>(Rc::new(BigInt::from(1)), false);
+        override_placebo::<Rc<BigInt>>(Rc::new(BigInt::from(1)), true);
+        override_placebo::<DafnyInt>(int!(1), false);
+        override_placebo::<DafnyInt>(int!(1), true);
+        let _x: MaybePlacebo<Ptr<ClassWrapper<DafnyInt>>> =
+            MaybePlacebo::<Ptr<ClassWrapper<DafnyInt>>>::new();
+        //let mut f: Rc<dyn Fn(Class) -> Class> = <Rc<dyn Fn(Class) -> Class> as Placebo>::new();
+    }
+
+    #[test]
+    fn test_maybe_placebos_from() {
+        let x = (1, 2, 3, 4);
+        let (a, b, c, d) = maybe_placebos_from!(x, 0, 1, 2, 3);
+        assert_eq!(a.read(), 1);
+        assert_eq!(b.read(), 2);
+        assert_eq!(c.read(), 3);
+        assert_eq!(d.read(), 4);
+    }
+
+    #[test]
+    fn test_coercion_immutable() {
+        let o = ClassWrapper::<i32>::constructor(1);
+        let a: Ptr<dyn Any> = Upcast::<dyn Any>::upcast(read!(o));
+        assert_eq!(cast!(a, ClassWrapper<i32>), o);
+        let seq_o = seq![o];
+        let seq_a = Sequence::<Ptr<ClassWrapper<i32>>>::coerce(upcast::<ClassWrapper<i32>, dyn Any>())(seq_o);
+        assert_eq!(cast!(seq_a.get_usize(0), ClassWrapper<i32>), o);
+        let set_o = set! {o};
+        let set_a = Set::<Ptr<ClassWrapper<i32>>>::coerce(upcast::<ClassWrapper<i32>, dyn Any>())(set_o);
+        assert_eq!(cast!(set_a.peek(), ClassWrapper<i32>), o);
+        let multiset_o = multiset! {o, o};
+        let multiset_a = Multiset::<Ptr<ClassWrapper<i32>>>::coerce(upcast::<ClassWrapper<i32>, dyn Any>())(multiset_o);
+        assert_eq!(cast!(multiset_a.peek(), ClassWrapper<i32>), o);
+        let map_o = map![1 => o, 2 => o];
+        let map_a = Map::<i32, Ptr<ClassWrapper<i32>>>::coerce(upcast::<ClassWrapper<i32>, dyn Any>())(map_o);
+        assert_eq!(cast!(map_a.get(&1), ClassWrapper<i32>), o);
+        deallocate(o);
+    }
+
+    #[test]
+    fn test_defaults() {
+        let set_i32 = <Set<i32> as Default>::default();
+        let seq_i32 = <Sequence<i32> as Default>::default();
+        let map_i32 = <Map<i32, i32> as Default>::default();
+        let multiset_i32 = <Multiset<i32> as Default>::default();
+        assert_eq!(set_i32.cardinality_usize(), 0);
+        assert_eq!(seq_i32.cardinality_usize(), 0);
+        assert_eq!(map_i32.cardinality_usize(), 0);
+        assert_eq!(multiset_i32.cardinality_usize(), 0);
+    }
+
+    #[test]
+    fn test_nontrivial_defaults() {
+        let set_i32 = <Set<i32> as NontrivialDefault>::nontrivial_default();
+        let seq_i32 = <Sequence<i32> as NontrivialDefault>::nontrivial_default();
+        let map_i32 = <Map<i32, i32> as NontrivialDefault>::nontrivial_default();
+        let multiset_i32 = <Multiset<i32> as NontrivialDefault>::nontrivial_default();
+        assert_eq!(set_i32.cardinality_usize(), 0);
+        assert_eq!(seq_i32.cardinality_usize(), 0);
+        assert_eq!(map_i32.cardinality_usize(), 0);
+        assert_eq!(multiset_i32.cardinality_usize(), 0);
+        let ptr_i32 = <Ptr<i32> as NontrivialDefault>::nontrivial_default();
+        assert_eq!(ptr_i32, Ptr::<i32>::null());
+    }
+
+    #[test]
+    fn test_function_wrappers() {
+        let f: Rc<dyn Fn(i32) -> i32> = Rc::new(|i: i32| i + 1);
+        let g = f.clone();
+        let _h = seq![g];
+    }
+
+    #[test]
+    fn test_forall_exists() {
+        assert!(integer_range(int!(0), int!(10))
+            .all(Rc::new(|i: DafnyInt| i.clone() < int!(10)).as_ref()));
+        assert!(!integer_range(int!(0), int!(11))
+            .all(Rc::new(|i: DafnyInt| i.clone() < int!(10)).as_ref()));
+        assert!(!integer_range(int!(0), int!(10))
+            .any(Rc::new(|i: DafnyInt| i.clone() >= int!(10)).as_ref()));
+        assert!(integer_range(int!(0), int!(11))
+            .any(Rc::new(|i: DafnyInt| i.clone() >= int!(10)).as_ref()));
+
+        assert!(integer_range(int!(0), int!(10)).all(
+            Rc::new(|i: DafnyInt| !(i.clone() % int!(4) == int!(0))
+                || i.clone() < int!(10) && i.clone() % int!(2) == int!(0))
+            .as_ref()
+        ));
+        assert!(integer_range(int!(0), int!(11)).all(
+            Rc::new(|i: DafnyInt| !(i.clone() % int!(4) == int!(0))
+                || i.clone() < int!(10) && i.clone() % int!(2) == int!(0))
+            .as_ref()
+        ));
+        assert!(!integer_range(int!(0), int!(10)).any(
+            Rc::new(|i: DafnyInt| i.clone() % int!(4) == int!(0)
+                && i.clone() >= int!(10)
+                && i.clone() % int!(2) == int!(0))
+            .as_ref()
+        ));
+        assert!(!integer_range(int!(0), int!(11)).any(
+            Rc::new(|i: DafnyInt| i.clone() % int!(4) == int!(0)
+                && i.clone() >= int!(10)
+                && i.clone() % int!(2) == int!(0))
+            .as_ref()
+        ));
+
+        assert!(exact_range(10).all(Rc::new(|i: i32| i == 10).as_ref()));
+        assert!(exact_range(10).any(Rc::new(|i: i32| i == 10).as_ref()));
+        assert!(!exact_range(10).all(Rc::new(|i: i32| i != 10).as_ref()));
+        assert!(!exact_range(10).any(Rc::new(|i: i32| i != 10).as_ref()));
+
+        assert!(seq![1, 3, 5, 7]
+            .iter()
+            .all(Rc::new(|i: u32| i % 2 == 1).as_ref()));
+        assert!(!seq![1, 3, 5, 7]
+            .iter()
+            .any(Rc::new(|i: u32| i % 2 == 0).as_ref()));
+        assert!(!seq![1, 3, 5, 7, 8]
+            .iter()
+            .all(Rc::new(|i: u32| i % 2 == 1).as_ref()));
+        assert!(seq![1, 3, 5, 7, 8]
+            .iter()
+            .any(Rc::new(|i: u32| i % 2 == 0).as_ref()));
+
+        assert!(set! {1, 3, 5, 7}
+            .iter()
+            .cloned()
+            .all(Rc::new(|i: u32| i % 2 == 1).as_ref()));
+        assert!(!set! {1, 3, 5, 7}
+            .iter()
+            .cloned()
+            .any(Rc::new(|i: u32| i % 2 == 0).as_ref()));
+        assert!(!set! {1, 3, 5, 7, 8}
+            .iter()
+            .cloned()
+            .all(Rc::new(|i: u32| i % 2 == 1).as_ref()));
+        assert!(set! {1, 3, 5, 7, 8}
+            .iter()
+            .cloned()
+            .any(Rc::new(|i: u32| i % 2 == 0).as_ref()));
+
+        for i in set! {1, 3, 5, 7}.iter() {
+            println!("{}", i);
+        }
+
+        assert!(multiset! {1, 1, 5, 7}
+            .iter()
+            .all(Rc::new(|i: u32| i % 2 == 1).as_ref()));
+        assert!(!multiset! {1, 1, 5, 7}
+            .iter()
+            .any(Rc::new(|i: u32| i % 2 == 0).as_ref()));
+        assert!(!multiset! {1, 1, 5, 7, 8}
+            .iter()
+            .all(Rc::new(|i: u32| i % 2 == 1).as_ref()));
+        assert!(multiset! {1, 1, 5, 7, 8}
+            .iter()
+            .any(Rc::new(|i: u32| i % 2 == 0).as_ref()));
+        let count = Rc::new(RefCell::new(0));
+        let count_inner = count.clone();
+        multiset!{1, 1, 5, 7, 8}
+            .iter().for_each(move |_i: u32| {
+                let c: i32 = *count_inner.as_ref().borrow();
+                *count_inner.borrow_mut() = c + 1;
+             });
+        assert_eq!(*count.as_ref().borrow(), 5);
+
+        let m = map![1 => 4, 3 => 6, 5 => 8];
+        let m2 = m.clone();
+        let m3 = m.clone();
+        assert!(m
+            .clone()
+            .iter()
+            .all(Rc::new(move |i: u32| i + 3 == m2.get(&i)).as_ref()));
+        assert!(!m
+            .iter()
+            .any(Rc::new(move |i: u32| i + 2 == m3.get(&i)).as_ref()));
+        let m = map![1 => 4, 3 => 7, 5 => 7];
+        let m2 = m.clone();
+        let m3 = m.clone();
+        assert!(!m
+            .clone()
+            .iter()
+            .all(Rc::new(move |i: u32| i + 3 == m2.get(&i)).as_ref()));
+        assert!(m
+            .iter()
+            .any(Rc::new(move |i: u32| i + 2 == m3.get(&i)).as_ref()));
+    }
+
+    #[test]
+    fn test_for_loops() {
+        let mut sum: i32 = 0;
+        for i in integer_range(1, 11) {
+            sum += i;
+        }
+        assert_eq!(sum, 55);
+
+        let mut sum: i32 = 0;
+        for i in integer_range_down(11, 1) {
+            sum += i;
+        }
+        assert_eq!(sum, 55);
+
+        let mut sum: i32 = 0;
+        for i in integer_range_unbounded(1) {
+            sum += i;
+            if i == 10 {
+                break;
+            }
+        }
+        assert_eq!(sum, 55);
+
+        let mut sum: i32 = 0;
+        for i in integer_range_down_unbounded(11) {
+            sum += i;
+            if i == 1 {
+                break;
+            }
+        }
+        assert_eq!(sum, 55);
+    }
+
+    trait SuperTrait: Upcast<dyn Any> + UpcastObject<dyn Any> {
+    }
+
+    trait NodeRcMutTrait: SuperTrait + Upcast<dyn SuperTrait> + UpcastObject<dyn SuperTrait>{
+    }
+
+    pub struct NodeRcMut {
+        val: DafnyInt,
+        next: Object<NodeRcMut>,
+    }
+    impl NodeRcMut {
+        fn _ctor(this: Object<NodeRcMut>, val: DafnyInt) {
+            let mut val_assign = false;
+            let mut next_assign = false;
+            update_field_uninit_object!(this.clone(), val, val_assign, val);
+            update_field_if_uninit_object!(this.clone(), next, next_assign, Object(None));
+        }
+    }
+    impl SuperTrait for NodeRcMut {}
+    impl UpcastObject<dyn Any> for NodeRcMut {
+        UpcastObjectFn!(dyn Any);
+    }
+    impl Upcast<dyn Any> for NodeRcMut {
+        UpcastFn!(dyn Any);
+    }
+    impl UpcastObject<dyn NodeRcMutTrait> for NodeRcMut {
+        UpcastObjectFn!(dyn NodeRcMutTrait);
+    }
+    impl Upcast<dyn NodeRcMutTrait> for NodeRcMut {
+        UpcastFn!(dyn NodeRcMutTrait);
+    }
+    impl UpcastObject<dyn SuperTrait> for NodeRcMut {
+        UpcastObjectFn!(dyn SuperTrait);
+    }
+    impl Upcast<dyn SuperTrait> for NodeRcMut {
+        UpcastFn!(dyn SuperTrait);
+    }
+    impl NodeRcMutTrait for NodeRcMut {}
+
+    #[test]
+    fn test_object() {
+        let mut x: Object<NodeRcMut> = allocate_object::<NodeRcMut>();
+        NodeRcMut::_ctor(x.clone(), int!(42));
+        assert_eq!(refcount!(x), 1);
+        assert_eq!(x.as_ref().val, int!(42));
+        x.as_mut().next = x.clone();
+        assert_eq!(refcount!(x), 2);
+        assert_eq!(x.as_ref().next.as_ref().val, int!(42));
+        md!(rd!(x).next).next = Object(None);
+        assert_eq!(refcount!(x), 1);
+        let y: Object<dyn Any> = upcast_object::<_, _>()(x.clone());
+        assert_eq!(refcount!(x), 2);
+        let z: Object<dyn NodeRcMutTrait> = upcast_object::<_, _>()(x.clone());
+        assert_eq!(refcount!(x), 3);
+        let a2: Object<NodeRcMut> = cast_object!(y.clone(), NodeRcMut);
+        assert_eq!(refcount!(x), 4);
+        assert_eq!(rd!(a2).val, int!(42));
+        let a3: Object<NodeRcMut> = cast_object!(z.clone(), NodeRcMut);
+        assert_eq!(refcount!(x), 5);
+        assert_eq!(rd!(a3).val, int!(42));
+
+        // Other way to create objects
+        let direct: Object<NodeRcMut> = Object::<NodeRcMut>::new(NodeRcMut {val: int!(1), next: Object::<NodeRcMut>::null()});
+        assert_eq!(rd!(direct).val, int!(1));
+        let tail: Object<NodeRcMut> = Object::<NodeRcMut>::null();
+        assert_eq!(tail, rd!(direct).next);
+        assert!(tail.is_null());
+        assert!(!direct.is_null());
+        
+        let a: Object<[i32]> = rcmut::array_object_from_rc(Rc::new([42, 43, 44]));
+        assert_eq!(rd!(a).len(), 3);
+        assert_eq!(rd!(a)[0], 42);
+        assert_eq!(rd!(a)[1], 43);
+        assert_eq!(rd!(a)[2], 44);
+        let b: Object<[i32]> = a.clone();
+        md!(b)[0] = 45;
+        assert_eq!(rd!(a)[0], 45);
+
+        let previous_count = refcount!(x);
+        {
+            let z = Object::<NodeRcMut>::from_ref(x.as_ref());
+            assert_eq!(refcount!(z), previous_count + 1);
+            assert_eq!(refcount!(x), previous_count + 1);
+        }
+        assert_eq!(refcount!(x), previous_count);
+
+        let objects: Set<Object<dyn ::std::any::Any>> = crate::set!{y.clone(), cast_any_object!(x.clone())};
+        assert_eq!(objects.cardinality_usize(), 1);
+        test_dafny_type(a.clone());
+    }
+
+    pub struct NodeRawMut {
+        val: DafnyInt,
+        next: Ptr<NodeRawMut>,
+    }
+    impl NodeRawMut {
+        fn _ctor(this: Ptr<NodeRawMut>, val: DafnyInt) {
+            let mut val_assign = false;
+            update_field_uninit!(this, val, val_assign, val);
+        }
+    }
+    impl NodeRcMutTrait for NodeRawMut {}
+    UpcastDefObject!(NodeRawMut, dyn NodeRcMutTrait, dyn SuperTrait, dyn Any);
+    UpcastDef!(NodeRawMut, dyn NodeRcMutTrait, dyn SuperTrait, dyn Any);
+
+    impl SuperTrait for NodeRawMut {}
+
+    #[test]
+    fn test_rawmut() {
+        let x: Ptr<NodeRawMut> = allocate::<NodeRawMut>();
+        NodeRawMut::_ctor(x.clone(), int!(42));
+        assert_eq!(read!(x.clone()).val, int!(42));
+        modify!(x.clone()).next = x.clone();
+        assert_eq!(read!(read!(x.clone()).next.clone()).val, int!(42));
+        modify!(read!(x.clone()).next.clone()).next = Ptr::null();
+        let y: Ptr<dyn Any> = upcast::<_, _>()(x);
+        assert!(y.is_instance_of::<NodeRawMut>());
+        assert!(!y.is_instance_of::<NodeRcMut>());
+        let z: Ptr<dyn NodeRcMutTrait> = upcast::<_, _>()(x);
+        let _a2: Ptr<NodeRawMut> = cast!(y, NodeRawMut);
+        let _a3: Ptr<NodeRawMut> = cast!(z, NodeRawMut);
+        deallocate(x);
+
+        let a = array::from_native(Box::new([42, 43, 44]));
+        assert_eq!(read!(a.clone()).len(), 3);
+        assert_eq!(read!(a.clone())[0], 42);
+        assert_eq!(read!(a.clone())[1], 43);
+        assert_eq!(read!(a.clone())[2], 44);
+        let b = a.clone();
+        modify!(b.clone())[0] = 45;
+        assert_eq!(read!(a.clone())[0], 45);
+
+        deallocate(a);
+    }
+
+    // Conversion of any usize-compatible value into usize
+    #[test]
+    fn test_usize() {
+        let a: u128 = 1;
+        let b: i8 = 1;
+        let u: usize = 1;
+        assert_eq!(DafnyUsize::into_usize(int!(a)), u);
+        assert_eq!(DafnyUsize::into_usize(a), u);
+        assert_eq!(DafnyUsize::into_usize(b), u);
+        assert_eq!(DafnyUsize::into_usize(int!(b)), u);
+    }
+
+    // Tests that we can compose Dafny types, like a sequence of maps
+    fn _test<X: DafnyTypeEq, Y: DafnyType>(_input: Sequence<Map<X, Y>>) {
+    }
+    // Tests that the input type is a DafnyType
+    fn test_dafny_type<X: DafnyType>(_input: X) {
+    }
+
+    #[derive(Clone)]
+    pub struct InternalOpaqueError {
+        pub message: String,
+    }
+
+    crate::UpcastDefObject!(InternalOpaqueError, dyn Any);
+
+    #[test]
+    fn test_native_string_upcast() {
+        let s = InternalOpaqueError { message: "Hello, World!".to_string() };
+        let o: Object<InternalOpaqueError> = Object::new(s);
+        let n: Object<dyn ::std::any::Any> = upcast_object::<InternalOpaqueError, dyn ::std::any::Any>()(o);
+        let x = cast_object!(n, InternalOpaqueError);
+        let s2 = crate::dafny_runtime_conversions::object::dafny_class_to_struct(x);
+        assert_eq!(s2.message, "Hello, World!");
+    }
+
+    #[test]
+    fn test_native_string_upcast_raw() {
+        let message = "Hello, World!".to_string();
+        let object = Object::new(message.clone());
+        let object_any: Object<dyn Any> = UpcastObject::<dyn Any>::upcast(object.as_ref());
+        let resulting_message = format!("{:?}", object_any);
+        assert_eq!(resulting_message, message);
+    }
+
+    // Every general trait must declare how to clone a Box<dyn .> of itself
+    trait GeneralTraitSuper<T> {
+        fn _clone(&self) -> Box<dyn GeneralTraitSuper<T>>;
+        fn _is_GeneralTrait(&self) -> bool;
+        fn _as_GeneralTrait(&self) -> Box<dyn GeneralTrait>;
+        fn _is_Datatype(&self) -> bool;
+        fn _as_Datatype(&self) -> ADatatype;
+    }
+    impl <T> Clone for Box<dyn GeneralTraitSuper<T>> {
+        fn clone(&self) -> Self {
+            GeneralTraitSuper::_clone(self.as_ref())
+        }
+    }
+    impl <T> DafnyPrint for Box<dyn GeneralTraitSuper<T>> {
+        fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+            write!(f, "GeneralTraitSuper")
+        }
+    }
+    // Traits extending other traits also implement a direct way to upcast their Box<dyn .> of themselves
+    trait GeneralTrait: GeneralTraitSuper<i32> + UpcastBox<dyn GeneralTraitSuper<i32>> {
+        fn _clone(&self) -> Box<dyn GeneralTrait>;
+    }
+    impl UpcastBox<dyn GeneralTraitSuper<i32>> for Box<dyn GeneralTrait> {
+        fn upcast(&self) -> ::std::boxed::Box<dyn crate::tests::tests::GeneralTraitSuper<i32>> {
+            crate::tests::tests::GeneralTraitSuper::<i32>::_clone(self.as_ref())
+        }
+    }
+    impl Clone for Box<dyn GeneralTrait> {
+        fn clone(&self) -> Self {
+            GeneralTrait::_clone(self.as_ref())
+        }
+    }
+    impl DafnyPrint for Box<dyn GeneralTrait> {
+        fn fmt_print(&self, f: &mut Formatter<'_>, _in_seq: bool) -> std::fmt::Result {
+            write!(f, "GeneralTrait")
+        }
+    }
+
+    #[derive(Clone, PartialEq, Debug)]
+    struct ADatatype{i: i32}
+    impl GeneralTrait for ADatatype {
+        fn _clone(&self) -> Box<dyn GeneralTrait> {
+            Box::new(self.clone()) as Box<dyn GeneralTrait>
+        }
+    }
+    impl GeneralTraitSuper<i32> for ADatatype {
+        fn _clone(&self) -> Box<dyn GeneralTraitSuper<i32>> {
+            Box::new(self.clone())
+        }
+        
+        fn _is_GeneralTrait(&self) -> bool {
+            true
+        }
+        
+        fn _as_GeneralTrait(&self) -> Box<dyn GeneralTrait> {
+            GeneralTrait::_clone(self)
+        }
+        
+        fn _is_Datatype(&self) -> bool {
+            true
+        }
+        
+        fn _as_Datatype(&self) -> ADatatype {
+            self.clone()
+        }
+    }
+    impl UpcastBox<dyn GeneralTrait> for ADatatype {
+        fn upcast(&self) -> ::std::boxed::Box<dyn GeneralTrait> {
+            GeneralTrait::_clone(self)
+        }
+    }
+    impl UpcastBox<dyn GeneralTraitSuper<i32>> for ADatatype {
+        fn upcast(&self) -> ::std::boxed::Box<dyn GeneralTraitSuper<i32>> {
+            GeneralTraitSuper::<i32>::_clone(self)
+        }
+    }
+    #[test]
+    fn test_general_traits() {
+        let x = ADatatype{i: 3};
+        let gt = upcast_box::<ADatatype, dyn GeneralTrait>()(x.clone());
+        let gts = upcast_box::<ADatatype, dyn GeneralTraitSuper<i32>>()(x.clone());
+        let gtgts = upcast_box_box::<dyn GeneralTrait, dyn GeneralTraitSuper<i32>>()(gt.clone());
+        assert!(gt._is_Datatype());
+        assert!(gts._is_Datatype());
+        assert!(gtgts._is_Datatype());
+        assert!(gts._is_GeneralTrait());
+        assert!(gtgts._is_GeneralTrait());
+        assert_eq!(gt._as_Datatype(), x);
+        assert_eq!(gts._as_Datatype(), x);
+        assert_eq!(gtgts._as_Datatype(), x);
+        let gtsgt = gts._as_GeneralTrait();
+        let gtgtsgt = gtgts._as_GeneralTrait();
+        assert!(gtsgt._is_Datatype());
+        assert!(gtgtsgt._is_Datatype());
+        assert_eq!(gtsgt._as_Datatype(), x);
+        assert_eq!(gtsgt._as_Datatype(), x);
+    }
+
+    #[test]
+    fn test_chars_copy() {
+        let c = DafnyChar('a');
+        let c2 = c;
+        let c3 = c;
+        assert_eq!(c3, c2);
+        let c = DafnyCharUTF16(213);
+        let c2 = c;
+        let c3 = c;
+        assert_eq!(c3, c2);
+    }
+    /*impl GeneralTrait for Rc<ADatatype> {
+        fn _clone(&self) -> Box<dyn GeneralTrait> {
+            Box::new(self.as_ref().clone())
+        }
+    }*/
+
+
+}
diff --git a/Source/DafnyRuntime/DafnyRuntimeSystemModule.cs b/Source/DafnyRuntime/DafnyRuntimeSystemModule.cs
new file mode 100644
index 00000000000..d0e8ea5dea7
--- /dev/null
+++ b/Source/DafnyRuntime/DafnyRuntimeSystemModule.cs
@@ -0,0 +1,3686 @@
+// Dafny program systemModulePopulator.dfy compiled into C#
+// To recompile, you will need the libraries
+//     System.Runtime.Numerics.dll System.Collections.Immutable.dll
+// but the 'dotnet' tool in .NET should pick those up automatically.
+// Optionally, you may want to include compiler switches like
+//     /debug /nowarn:162,164,168,183,219,436,1717,1718
+
+#if ISDAFNYRUNTIMELIB
+using System;
+using System.Numerics;
+using System.Collections;
+#endif
+#if ISDAFNYRUNTIMELIB
+namespace Dafny {
+  internal class ArrayHelpers {
+    public static T[] InitNewArray1<T>(T z, BigInteger size0) {
+      int s0 = (int)size0;
+      T[] a = new T[s0];
+      for (int i0 = 0; i0 < s0; i0++) {
+        a[i0] = z;
+      }
+      return a;
+    }
+    public static T[,] InitNewArray2<T>(T z, BigInteger size0, BigInteger size1) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      T[,] a = new T[s0,s1];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          a[i0,i1] = z;
+        }
+      }
+      return a;
+    }
+    public static T[,,] InitNewArray3<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      T[,,] a = new T[s0,s1,s2];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            a[i0,i1,i2] = z;
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,] InitNewArray4<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      T[,,,] a = new T[s0,s1,s2,s3];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              a[i0,i1,i2,i3] = z;
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,] InitNewArray5<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      T[,,,,] a = new T[s0,s1,s2,s3,s4];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                a[i0,i1,i2,i3,i4] = z;
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,] InitNewArray6<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      T[,,,,,] a = new T[s0,s1,s2,s3,s4,s5];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  a[i0,i1,i2,i3,i4,i5] = z;
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,,] InitNewArray7<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5, BigInteger size6) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      int s6 = (int)size6;
+      T[,,,,,,] a = new T[s0,s1,s2,s3,s4,s5,s6];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  for (int i6 = 0; i6 < s6; i6++) {
+                    a[i0,i1,i2,i3,i4,i5,i6] = z;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,,,] InitNewArray8<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5, BigInteger size6, BigInteger size7) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      int s6 = (int)size6;
+      int s7 = (int)size7;
+      T[,,,,,,,] a = new T[s0,s1,s2,s3,s4,s5,s6,s7];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  for (int i6 = 0; i6 < s6; i6++) {
+                    for (int i7 = 0; i7 < s7; i7++) {
+                      a[i0,i1,i2,i3,i4,i5,i6,i7] = z;
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,,,,] InitNewArray9<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5, BigInteger size6, BigInteger size7, BigInteger size8) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      int s6 = (int)size6;
+      int s7 = (int)size7;
+      int s8 = (int)size8;
+      T[,,,,,,,,] a = new T[s0,s1,s2,s3,s4,s5,s6,s7,s8];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  for (int i6 = 0; i6 < s6; i6++) {
+                    for (int i7 = 0; i7 < s7; i7++) {
+                      for (int i8 = 0; i8 < s8; i8++) {
+                        a[i0,i1,i2,i3,i4,i5,i6,i7,i8] = z;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,,,,,] InitNewArray10<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5, BigInteger size6, BigInteger size7, BigInteger size8, BigInteger size9) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      int s6 = (int)size6;
+      int s7 = (int)size7;
+      int s8 = (int)size8;
+      int s9 = (int)size9;
+      T[,,,,,,,,,] a = new T[s0,s1,s2,s3,s4,s5,s6,s7,s8,s9];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  for (int i6 = 0; i6 < s6; i6++) {
+                    for (int i7 = 0; i7 < s7; i7++) {
+                      for (int i8 = 0; i8 < s8; i8++) {
+                        for (int i9 = 0; i9 < s9; i9++) {
+                          a[i0,i1,i2,i3,i4,i5,i6,i7,i8,i9] = z;
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,,,,,,] InitNewArray11<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5, BigInteger size6, BigInteger size7, BigInteger size8, BigInteger size9, BigInteger size10) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      int s6 = (int)size6;
+      int s7 = (int)size7;
+      int s8 = (int)size8;
+      int s9 = (int)size9;
+      int s10 = (int)size10;
+      T[,,,,,,,,,,] a = new T[s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  for (int i6 = 0; i6 < s6; i6++) {
+                    for (int i7 = 0; i7 < s7; i7++) {
+                      for (int i8 = 0; i8 < s8; i8++) {
+                        for (int i9 = 0; i9 < s9; i9++) {
+                          for (int i10 = 0; i10 < s10; i10++) {
+                            a[i0,i1,i2,i3,i4,i5,i6,i7,i8,i9,i10] = z;
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,,,,,,,] InitNewArray12<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5, BigInteger size6, BigInteger size7, BigInteger size8, BigInteger size9, BigInteger size10, BigInteger size11) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      int s6 = (int)size6;
+      int s7 = (int)size7;
+      int s8 = (int)size8;
+      int s9 = (int)size9;
+      int s10 = (int)size10;
+      int s11 = (int)size11;
+      T[,,,,,,,,,,,] a = new T[s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  for (int i6 = 0; i6 < s6; i6++) {
+                    for (int i7 = 0; i7 < s7; i7++) {
+                      for (int i8 = 0; i8 < s8; i8++) {
+                        for (int i9 = 0; i9 < s9; i9++) {
+                          for (int i10 = 0; i10 < s10; i10++) {
+                            for (int i11 = 0; i11 < s11; i11++) {
+                              a[i0,i1,i2,i3,i4,i5,i6,i7,i8,i9,i10,i11] = z;
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,,,,,,,,] InitNewArray13<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5, BigInteger size6, BigInteger size7, BigInteger size8, BigInteger size9, BigInteger size10, BigInteger size11, BigInteger size12) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      int s6 = (int)size6;
+      int s7 = (int)size7;
+      int s8 = (int)size8;
+      int s9 = (int)size9;
+      int s10 = (int)size10;
+      int s11 = (int)size11;
+      int s12 = (int)size12;
+      T[,,,,,,,,,,,,] a = new T[s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  for (int i6 = 0; i6 < s6; i6++) {
+                    for (int i7 = 0; i7 < s7; i7++) {
+                      for (int i8 = 0; i8 < s8; i8++) {
+                        for (int i9 = 0; i9 < s9; i9++) {
+                          for (int i10 = 0; i10 < s10; i10++) {
+                            for (int i11 = 0; i11 < s11; i11++) {
+                              for (int i12 = 0; i12 < s12; i12++) {
+                                a[i0,i1,i2,i3,i4,i5,i6,i7,i8,i9,i10,i11,i12] = z;
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,,,,,,,,,] InitNewArray14<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5, BigInteger size6, BigInteger size7, BigInteger size8, BigInteger size9, BigInteger size10, BigInteger size11, BigInteger size12, BigInteger size13) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      int s6 = (int)size6;
+      int s7 = (int)size7;
+      int s8 = (int)size8;
+      int s9 = (int)size9;
+      int s10 = (int)size10;
+      int s11 = (int)size11;
+      int s12 = (int)size12;
+      int s13 = (int)size13;
+      T[,,,,,,,,,,,,,] a = new T[s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12,s13];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  for (int i6 = 0; i6 < s6; i6++) {
+                    for (int i7 = 0; i7 < s7; i7++) {
+                      for (int i8 = 0; i8 < s8; i8++) {
+                        for (int i9 = 0; i9 < s9; i9++) {
+                          for (int i10 = 0; i10 < s10; i10++) {
+                            for (int i11 = 0; i11 < s11; i11++) {
+                              for (int i12 = 0; i12 < s12; i12++) {
+                                for (int i13 = 0; i13 < s13; i13++) {
+                                  a[i0,i1,i2,i3,i4,i5,i6,i7,i8,i9,i10,i11,i12,i13] = z;
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,,,,,,,,,,] InitNewArray15<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5, BigInteger size6, BigInteger size7, BigInteger size8, BigInteger size9, BigInteger size10, BigInteger size11, BigInteger size12, BigInteger size13, BigInteger size14) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      int s6 = (int)size6;
+      int s7 = (int)size7;
+      int s8 = (int)size8;
+      int s9 = (int)size9;
+      int s10 = (int)size10;
+      int s11 = (int)size11;
+      int s12 = (int)size12;
+      int s13 = (int)size13;
+      int s14 = (int)size14;
+      T[,,,,,,,,,,,,,,] a = new T[s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12,s13,s14];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  for (int i6 = 0; i6 < s6; i6++) {
+                    for (int i7 = 0; i7 < s7; i7++) {
+                      for (int i8 = 0; i8 < s8; i8++) {
+                        for (int i9 = 0; i9 < s9; i9++) {
+                          for (int i10 = 0; i10 < s10; i10++) {
+                            for (int i11 = 0; i11 < s11; i11++) {
+                              for (int i12 = 0; i12 < s12; i12++) {
+                                for (int i13 = 0; i13 < s13; i13++) {
+                                  for (int i14 = 0; i14 < s14; i14++) {
+                                    a[i0,i1,i2,i3,i4,i5,i6,i7,i8,i9,i10,i11,i12,i13,i14] = z;
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+    public static T[,,,,,,,,,,,,,,,] InitNewArray16<T>(T z, BigInteger size0, BigInteger size1, BigInteger size2, BigInteger size3, BigInteger size4, BigInteger size5, BigInteger size6, BigInteger size7, BigInteger size8, BigInteger size9, BigInteger size10, BigInteger size11, BigInteger size12, BigInteger size13, BigInteger size14, BigInteger size15) {
+      int s0 = (int)size0;
+      int s1 = (int)size1;
+      int s2 = (int)size2;
+      int s3 = (int)size3;
+      int s4 = (int)size4;
+      int s5 = (int)size5;
+      int s6 = (int)size6;
+      int s7 = (int)size7;
+      int s8 = (int)size8;
+      int s9 = (int)size9;
+      int s10 = (int)size10;
+      int s11 = (int)size11;
+      int s12 = (int)size12;
+      int s13 = (int)size13;
+      int s14 = (int)size14;
+      int s15 = (int)size15;
+      T[,,,,,,,,,,,,,,,] a = new T[s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12,s13,s14,s15];
+      for (int i0 = 0; i0 < s0; i0++) {
+        for (int i1 = 0; i1 < s1; i1++) {
+          for (int i2 = 0; i2 < s2; i2++) {
+            for (int i3 = 0; i3 < s3; i3++) {
+              for (int i4 = 0; i4 < s4; i4++) {
+                for (int i5 = 0; i5 < s5; i5++) {
+                  for (int i6 = 0; i6 < s6; i6++) {
+                    for (int i7 = 0; i7 < s7; i7++) {
+                      for (int i8 = 0; i8 < s8; i8++) {
+                        for (int i9 = 0; i9 < s9; i9++) {
+                          for (int i10 = 0; i10 < s10; i10++) {
+                            for (int i11 = 0; i11 < s11; i11++) {
+                              for (int i12 = 0; i12 < s12; i12++) {
+                                for (int i13 = 0; i13 < s13; i13++) {
+                                  for (int i14 = 0; i14 < s14; i14++) {
+                                    for (int i15 = 0; i15 < s15; i15++) {
+                                      a[i0,i1,i2,i3,i4,i5,i6,i7,i8,i9,i10,i11,i12,i13,i14,i15] = z;
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      return a;
+    }
+  }
+} // end of namespace Dafny
+internal static class FuncExtensions {
+  public static Func<U, UResult> DowncastClone<T, TResult, U, UResult>(this Func<T, TResult> F, Func<U, T> ArgConv, Func<TResult, UResult> ResConv) {
+    return arg => ResConv(F(ArgConv(arg)));
+  }
+  public static Func<UResult> DowncastClone<TResult, UResult>(this Func<TResult> F, Func<TResult, UResult> ResConv) {
+    return () => ResConv(F());
+  }
+  public static Func<U1, U2, UResult> DowncastClone<T1, T2, TResult, U1, U2, UResult>(this Func<T1, T2, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2)));
+  }
+  public static Func<U1, U2, U3, UResult> DowncastClone<T1, T2, T3, TResult, U1, U2, U3, UResult>(this Func<T1, T2, T3, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3)));
+  }
+  public static Func<U1, U2, U3, U4, UResult> DowncastClone<T1, T2, T3, T4, TResult, U1, U2, U3, U4, UResult>(this Func<T1, T2, T3, T4, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4)));
+  }
+  public static Func<U1, U2, U3, U4, U5, UResult> DowncastClone<T1, T2, T3, T4, T5, TResult, U1, U2, U3, U4, U5, UResult>(this Func<T1, T2, T3, T4, T5, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, TResult, U1, U2, U3, U4, U5, U6, UResult>(this Func<T1, T2, T3, T4, T5, T6, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, TResult, U1, U2, U3, U4, U5, U6, U7, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, U8, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, T8, TResult, U1, U2, U3, U4, U5, U6, U7, U8, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, T8, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<U8, T8> ArgConv8, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7), ArgConv8(arg8)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, U8, U9, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult, U1, U2, U3, U4, U5, U6, U7, U8, U9, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<U8, T8> ArgConv8, Func<U9, T9> ArgConv9, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7), ArgConv8(arg8), ArgConv9(arg9)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<U8, T8> ArgConv8, Func<U9, T9> ArgConv9, Func<U10, T10> ArgConv10, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7), ArgConv8(arg8), ArgConv9(arg9), ArgConv10(arg10)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<U8, T8> ArgConv8, Func<U9, T9> ArgConv9, Func<U10, T10> ArgConv10, Func<U11, T11> ArgConv11, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7), ArgConv8(arg8), ArgConv9(arg9), ArgConv10(arg10), ArgConv11(arg11)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<U8, T8> ArgConv8, Func<U9, T9> ArgConv9, Func<U10, T10> ArgConv10, Func<U11, T11> ArgConv11, Func<U12, T12> ArgConv12, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7), ArgConv8(arg8), ArgConv9(arg9), ArgConv10(arg10), ArgConv11(arg11), ArgConv12(arg12)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<U8, T8> ArgConv8, Func<U9, T9> ArgConv9, Func<U10, T10> ArgConv10, Func<U11, T11> ArgConv11, Func<U12, T12> ArgConv12, Func<U13, T13> ArgConv13, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7), ArgConv8(arg8), ArgConv9(arg9), ArgConv10(arg10), ArgConv11(arg11), ArgConv12(arg12), ArgConv13(arg13)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<U8, T8> ArgConv8, Func<U9, T9> ArgConv9, Func<U10, T10> ArgConv10, Func<U11, T11> ArgConv11, Func<U12, T12> ArgConv12, Func<U13, T13> ArgConv13, Func<U14, T14> ArgConv14, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7), ArgConv8(arg8), ArgConv9(arg9), ArgConv10(arg10), ArgConv11(arg11), ArgConv12(arg12), ArgConv13(arg13), ArgConv14(arg14)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<U8, T8> ArgConv8, Func<U9, T9> ArgConv9, Func<U10, T10> ArgConv10, Func<U11, T11> ArgConv11, Func<U12, T12> ArgConv12, Func<U13, T13> ArgConv13, Func<U14, T14> ArgConv14, Func<U15, T15> ArgConv15, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7), ArgConv8(arg8), ArgConv9(arg9), ArgConv10(arg10), ArgConv11(arg11), ArgConv12(arg12), ArgConv13(arg13), ArgConv14(arg14), ArgConv15(arg15)));
+  }
+  public static Func<U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, UResult> DowncastClone<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, UResult>(this Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult> F, Func<U1, T1> ArgConv1, Func<U2, T2> ArgConv2, Func<U3, T3> ArgConv3, Func<U4, T4> ArgConv4, Func<U5, T5> ArgConv5, Func<U6, T6> ArgConv6, Func<U7, T7> ArgConv7, Func<U8, T8> ArgConv8, Func<U9, T9> ArgConv9, Func<U10, T10> ArgConv10, Func<U11, T11> ArgConv11, Func<U12, T12> ArgConv12, Func<U13, T13> ArgConv13, Func<U14, T14> ArgConv14, Func<U15, T15> ArgConv15, Func<U16, T16> ArgConv16, Func<TResult, UResult> ResConv) {
+    return (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16) => ResConv(F(ArgConv1(arg1), ArgConv2(arg2), ArgConv3(arg3), ArgConv4(arg4), ArgConv5(arg5), ArgConv6(arg6), ArgConv7(arg7), ArgConv8(arg8), ArgConv9(arg9), ArgConv10(arg10), ArgConv11(arg11), ArgConv12(arg12), ArgConv13(arg13), ArgConv14(arg14), ArgConv15(arg15), ArgConv16(arg16)));
+  }
+}
+// end of class FuncExtensions
+#endif
+namespace _System {
+
+  public partial class nat {
+    private static readonly Dafny.TypeDescriptor<BigInteger> _TYPE = new Dafny.TypeDescriptor<BigInteger>(BigInteger.Zero);
+    public static Dafny.TypeDescriptor<BigInteger> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static bool _Is(BigInteger __source) {
+      BigInteger _0_x = __source;
+      return (_0_x).Sign != -1;
+    }
+  }
+
+  public interface _ITuple2<out T0, out T1> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    _ITuple2<__T0, __T1> DowncastClone<__T0, __T1>(Func<T0, __T0> converter0, Func<T1, __T1> converter1);
+  }
+  public class Tuple2<T0, T1> : _ITuple2<T0, T1> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public Tuple2(T0 _0, T1 _1) {
+      this.__0 = _0;
+      this.__1 = _1;
+    }
+    public _ITuple2<__T0, __T1> DowncastClone<__T0, __T1>(Func<T0, __T0> converter0, Func<T1, __T1> converter1) {
+      if (this is _ITuple2<__T0, __T1> dt) { return dt; }
+      return new Tuple2<__T0, __T1>(converter0(__0), converter1(__1));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple2<T0, T1>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple2<T0, T1> Default(T0 _default_T0, T1 _default_T1) {
+      return create(_default_T0, _default_T1);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple2<T0, T1>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1) {
+      return new Dafny.TypeDescriptor<_System._ITuple2<T0, T1>>(_System.Tuple2<T0, T1>.Default(_td_T0.Default(), _td_T1.Default()));
+    }
+    public static _ITuple2<T0, T1> create(T0 _0, T1 _1) {
+      return new Tuple2<T0, T1>(_0, _1);
+    }
+    public static _ITuple2<T0, T1> create____hMake2(T0 _0, T1 _1) {
+      return create(_0, _1);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+  }
+
+  public interface _ITuple0 {
+    _ITuple0 DowncastClone();
+  }
+  public class Tuple0 : _ITuple0 {
+    public Tuple0() {
+    }
+    public _ITuple0 DowncastClone() {
+      if (this is _ITuple0 dt) { return dt; }
+      return new Tuple0();
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple0;
+      return oth != null;
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      return (int) hash;
+    }
+    public override string ToString() {
+      return "()";
+    }
+    private static readonly _System._ITuple0 theDefault = create();
+    public static _System._ITuple0 Default() {
+      return theDefault;
+    }
+    private static readonly Dafny.TypeDescriptor<_System._ITuple0> _TYPE = new Dafny.TypeDescriptor<_System._ITuple0>(_System.Tuple0.Default());
+    public static Dafny.TypeDescriptor<_System._ITuple0> _TypeDescriptor() {
+      return _TYPE;
+    }
+    public static _ITuple0 create() {
+      return new Tuple0();
+    }
+    public static _ITuple0 create____hMake0() {
+      return create();
+    }
+    public static System.Collections.Generic.IEnumerable<_ITuple0> AllSingletonConstructors {
+      get {
+        yield return Tuple0.create();
+      }
+    }
+  }
+
+  public interface _ITuple1<out T0> {
+    T0 dtor__0 { get; }
+    _ITuple1<__T0> DowncastClone<__T0>(Func<T0, __T0> converter0);
+  }
+  public class Tuple1<T0> : _ITuple1<T0> {
+    public readonly T0 __0;
+    public Tuple1(T0 _0) {
+      this.__0 = _0;
+    }
+    public _ITuple1<__T0> DowncastClone<__T0>(Func<T0, __T0> converter0) {
+      if (this is _ITuple1<__T0> dt) { return dt; }
+      return new Tuple1<__T0>(converter0(__0));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple1<T0>;
+      return oth != null && object.Equals(this.__0, oth.__0);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple1<T0> Default(T0 _default_T0) {
+      return create(_default_T0);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple1<T0>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0) {
+      return new Dafny.TypeDescriptor<_System._ITuple1<T0>>(_System.Tuple1<T0>.Default(_td_T0.Default()));
+    }
+    public static _ITuple1<T0> create(T0 _0) {
+      return new Tuple1<T0>(_0);
+    }
+    public static _ITuple1<T0> create____hMake1(T0 _0) {
+      return create(_0);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+  }
+
+  public interface _ITuple3<out T0, out T1, out T2> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    _ITuple3<__T0, __T1, __T2> DowncastClone<__T0, __T1, __T2>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2);
+  }
+  public class Tuple3<T0, T1, T2> : _ITuple3<T0, T1, T2> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public Tuple3(T0 _0, T1 _1, T2 _2) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+    }
+    public _ITuple3<__T0, __T1, __T2> DowncastClone<__T0, __T1, __T2>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2) {
+      if (this is _ITuple3<__T0, __T1, __T2> dt) { return dt; }
+      return new Tuple3<__T0, __T1, __T2>(converter0(__0), converter1(__1), converter2(__2));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple3<T0, T1, T2>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple3<T0, T1, T2> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2) {
+      return create(_default_T0, _default_T1, _default_T2);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple3<T0, T1, T2>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2) {
+      return new Dafny.TypeDescriptor<_System._ITuple3<T0, T1, T2>>(_System.Tuple3<T0, T1, T2>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default()));
+    }
+    public static _ITuple3<T0, T1, T2> create(T0 _0, T1 _1, T2 _2) {
+      return new Tuple3<T0, T1, T2>(_0, _1, _2);
+    }
+    public static _ITuple3<T0, T1, T2> create____hMake3(T0 _0, T1 _1, T2 _2) {
+      return create(_0, _1, _2);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+  }
+
+  public interface _ITuple4<out T0, out T1, out T2, out T3> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    _ITuple4<__T0, __T1, __T2, __T3> DowncastClone<__T0, __T1, __T2, __T3>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3);
+  }
+  public class Tuple4<T0, T1, T2, T3> : _ITuple4<T0, T1, T2, T3> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public Tuple4(T0 _0, T1 _1, T2 _2, T3 _3) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+    }
+    public _ITuple4<__T0, __T1, __T2, __T3> DowncastClone<__T0, __T1, __T2, __T3>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3) {
+      if (this is _ITuple4<__T0, __T1, __T2, __T3> dt) { return dt; }
+      return new Tuple4<__T0, __T1, __T2, __T3>(converter0(__0), converter1(__1), converter2(__2), converter3(__3));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple4<T0, T1, T2, T3>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple4<T0, T1, T2, T3> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple4<T0, T1, T2, T3>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3) {
+      return new Dafny.TypeDescriptor<_System._ITuple4<T0, T1, T2, T3>>(_System.Tuple4<T0, T1, T2, T3>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default()));
+    }
+    public static _ITuple4<T0, T1, T2, T3> create(T0 _0, T1 _1, T2 _2, T3 _3) {
+      return new Tuple4<T0, T1, T2, T3>(_0, _1, _2, _3);
+    }
+    public static _ITuple4<T0, T1, T2, T3> create____hMake4(T0 _0, T1 _1, T2 _2, T3 _3) {
+      return create(_0, _1, _2, _3);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+  }
+
+  public interface _ITuple5<out T0, out T1, out T2, out T3, out T4> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    _ITuple5<__T0, __T1, __T2, __T3, __T4> DowncastClone<__T0, __T1, __T2, __T3, __T4>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4);
+  }
+  public class Tuple5<T0, T1, T2, T3, T4> : _ITuple5<T0, T1, T2, T3, T4> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public Tuple5(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+    }
+    public _ITuple5<__T0, __T1, __T2, __T3, __T4> DowncastClone<__T0, __T1, __T2, __T3, __T4>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4) {
+      if (this is _ITuple5<__T0, __T1, __T2, __T3, __T4> dt) { return dt; }
+      return new Tuple5<__T0, __T1, __T2, __T3, __T4>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple5<T0, T1, T2, T3, T4>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple5<T0, T1, T2, T3, T4> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple5<T0, T1, T2, T3, T4>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4) {
+      return new Dafny.TypeDescriptor<_System._ITuple5<T0, T1, T2, T3, T4>>(_System.Tuple5<T0, T1, T2, T3, T4>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default()));
+    }
+    public static _ITuple5<T0, T1, T2, T3, T4> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4) {
+      return new Tuple5<T0, T1, T2, T3, T4>(_0, _1, _2, _3, _4);
+    }
+    public static _ITuple5<T0, T1, T2, T3, T4> create____hMake5(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4) {
+      return create(_0, _1, _2, _3, _4);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+  }
+
+  public interface _ITuple6<out T0, out T1, out T2, out T3, out T4, out T5> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    _ITuple6<__T0, __T1, __T2, __T3, __T4, __T5> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5);
+  }
+  public class Tuple6<T0, T1, T2, T3, T4, T5> : _ITuple6<T0, T1, T2, T3, T4, T5> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public Tuple6(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+    }
+    public _ITuple6<__T0, __T1, __T2, __T3, __T4, __T5> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5) {
+      if (this is _ITuple6<__T0, __T1, __T2, __T3, __T4, __T5> dt) { return dt; }
+      return new Tuple6<__T0, __T1, __T2, __T3, __T4, __T5>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple6<T0, T1, T2, T3, T4, T5>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple6<T0, T1, T2, T3, T4, T5> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple6<T0, T1, T2, T3, T4, T5>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5) {
+      return new Dafny.TypeDescriptor<_System._ITuple6<T0, T1, T2, T3, T4, T5>>(_System.Tuple6<T0, T1, T2, T3, T4, T5>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default()));
+    }
+    public static _ITuple6<T0, T1, T2, T3, T4, T5> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5) {
+      return new Tuple6<T0, T1, T2, T3, T4, T5>(_0, _1, _2, _3, _4, _5);
+    }
+    public static _ITuple6<T0, T1, T2, T3, T4, T5> create____hMake6(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5) {
+      return create(_0, _1, _2, _3, _4, _5);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+  }
+
+  public interface _ITuple7<out T0, out T1, out T2, out T3, out T4, out T5, out T6> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    _ITuple7<__T0, __T1, __T2, __T3, __T4, __T5, __T6> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6);
+  }
+  public class Tuple7<T0, T1, T2, T3, T4, T5, T6> : _ITuple7<T0, T1, T2, T3, T4, T5, T6> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public Tuple7(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+    }
+    public _ITuple7<__T0, __T1, __T2, __T3, __T4, __T5, __T6> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6) {
+      if (this is _ITuple7<__T0, __T1, __T2, __T3, __T4, __T5, __T6> dt) { return dt; }
+      return new Tuple7<__T0, __T1, __T2, __T3, __T4, __T5, __T6>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple7<T0, T1, T2, T3, T4, T5, T6>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple7<T0, T1, T2, T3, T4, T5, T6> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple7<T0, T1, T2, T3, T4, T5, T6>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6) {
+      return new Dafny.TypeDescriptor<_System._ITuple7<T0, T1, T2, T3, T4, T5, T6>>(_System.Tuple7<T0, T1, T2, T3, T4, T5, T6>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default()));
+    }
+    public static _ITuple7<T0, T1, T2, T3, T4, T5, T6> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6) {
+      return new Tuple7<T0, T1, T2, T3, T4, T5, T6>(_0, _1, _2, _3, _4, _5, _6);
+    }
+    public static _ITuple7<T0, T1, T2, T3, T4, T5, T6> create____hMake7(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6) {
+      return create(_0, _1, _2, _3, _4, _5, _6);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+  }
+
+  public interface _ITuple8<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    _ITuple8<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7);
+  }
+  public class Tuple8<T0, T1, T2, T3, T4, T5, T6, T7> : _ITuple8<T0, T1, T2, T3, T4, T5, T6, T7> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public Tuple8(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+    }
+    public _ITuple8<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7) {
+      if (this is _ITuple8<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7> dt) { return dt; }
+      return new Tuple8<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple8<T0, T1, T2, T3, T4, T5, T6, T7>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple8<T0, T1, T2, T3, T4, T5, T6, T7> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple8<T0, T1, T2, T3, T4, T5, T6, T7>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7) {
+      return new Dafny.TypeDescriptor<_System._ITuple8<T0, T1, T2, T3, T4, T5, T6, T7>>(_System.Tuple8<T0, T1, T2, T3, T4, T5, T6, T7>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default()));
+    }
+    public static _ITuple8<T0, T1, T2, T3, T4, T5, T6, T7> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7) {
+      return new Tuple8<T0, T1, T2, T3, T4, T5, T6, T7>(_0, _1, _2, _3, _4, _5, _6, _7);
+    }
+    public static _ITuple8<T0, T1, T2, T3, T4, T5, T6, T7> create____hMake8(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+  }
+
+  public interface _ITuple9<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    _ITuple9<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8);
+  }
+  public class Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> : _ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public Tuple9(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+    }
+    public _ITuple9<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8) {
+      if (this is _ITuple9<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8> dt) { return dt; }
+      return new Tuple9<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8) {
+      return new Dafny.TypeDescriptor<_System._ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>>(_System.Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default()));
+    }
+    public static _ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8) {
+      return new Tuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8>(_0, _1, _2, _3, _4, _5, _6, _7, _8);
+    }
+    public static _ITuple9<T0, T1, T2, T3, T4, T5, T6, T7, T8> create____hMake9(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+  }
+
+  public interface _ITuple10<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    _ITuple10<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9);
+  }
+  public class Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> : _ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public Tuple10(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+    }
+    public _ITuple10<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9) {
+      if (this is _ITuple10<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9> dt) { return dt; }
+      return new Tuple10<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9) {
+      return new Dafny.TypeDescriptor<_System._ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>>(_System.Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default()));
+    }
+    public static _ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9) {
+      return new Tuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9);
+    }
+    public static _ITuple10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> create____hMake10(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+  }
+
+  public interface _ITuple11<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    T10 dtor__10 { get; }
+    _ITuple11<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10);
+  }
+  public class Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> : _ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public readonly T10 __10;
+    public Tuple11(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+      this.__10 = _10;
+    }
+    public _ITuple11<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10) {
+      if (this is _ITuple11<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10> dt) { return dt; }
+      return new Tuple11<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9), converter10(__10));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9) && object.Equals(this.__10, oth.__10);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__10));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__10);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10) {
+      return new Dafny.TypeDescriptor<_System._ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>>(_System.Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default()));
+    }
+    public static _ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10) {
+      return new Tuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10);
+    }
+    public static _ITuple11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> create____hMake11(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+    public T10 dtor__10 {
+      get {
+        return this.__10;
+      }
+    }
+  }
+
+  public interface _ITuple12<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    T10 dtor__10 { get; }
+    T11 dtor__11 { get; }
+    _ITuple12<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11);
+  }
+  public class Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> : _ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public readonly T10 __10;
+    public readonly T11 __11;
+    public Tuple12(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+      this.__10 = _10;
+      this.__11 = _11;
+    }
+    public _ITuple12<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11) {
+      if (this is _ITuple12<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11> dt) { return dt; }
+      return new Tuple12<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9), converter10(__10), converter11(__11));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9) && object.Equals(this.__10, oth.__10) && object.Equals(this.__11, oth.__11);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__10));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__11));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__10);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__11);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11) {
+      return new Dafny.TypeDescriptor<_System._ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>>(_System.Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default()));
+    }
+    public static _ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11) {
+      return new Tuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11);
+    }
+    public static _ITuple12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> create____hMake12(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+    public T10 dtor__10 {
+      get {
+        return this.__10;
+      }
+    }
+    public T11 dtor__11 {
+      get {
+        return this.__11;
+      }
+    }
+  }
+
+  public interface _ITuple13<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    T10 dtor__10 { get; }
+    T11 dtor__11 { get; }
+    T12 dtor__12 { get; }
+    _ITuple13<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12);
+  }
+  public class Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> : _ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public readonly T10 __10;
+    public readonly T11 __11;
+    public readonly T12 __12;
+    public Tuple13(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+      this.__10 = _10;
+      this.__11 = _11;
+      this.__12 = _12;
+    }
+    public _ITuple13<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12) {
+      if (this is _ITuple13<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12> dt) { return dt; }
+      return new Tuple13<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9), converter10(__10), converter11(__11), converter12(__12));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9) && object.Equals(this.__10, oth.__10) && object.Equals(this.__11, oth.__11) && object.Equals(this.__12, oth.__12);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__10));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__11));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__12));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__10);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__11);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__12);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12) {
+      return new Dafny.TypeDescriptor<_System._ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>>(_System.Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default()));
+    }
+    public static _ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12) {
+      return new Tuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12);
+    }
+    public static _ITuple13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> create____hMake13(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+    public T10 dtor__10 {
+      get {
+        return this.__10;
+      }
+    }
+    public T11 dtor__11 {
+      get {
+        return this.__11;
+      }
+    }
+    public T12 dtor__12 {
+      get {
+        return this.__12;
+      }
+    }
+  }
+
+  public interface _ITuple14<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    T10 dtor__10 { get; }
+    T11 dtor__11 { get; }
+    T12 dtor__12 { get; }
+    T13 dtor__13 { get; }
+    _ITuple14<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13);
+  }
+  public class Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> : _ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public readonly T10 __10;
+    public readonly T11 __11;
+    public readonly T12 __12;
+    public readonly T13 __13;
+    public Tuple14(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+      this.__10 = _10;
+      this.__11 = _11;
+      this.__12 = _12;
+      this.__13 = _13;
+    }
+    public _ITuple14<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13) {
+      if (this is _ITuple14<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13> dt) { return dt; }
+      return new Tuple14<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9), converter10(__10), converter11(__11), converter12(__12), converter13(__13));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9) && object.Equals(this.__10, oth.__10) && object.Equals(this.__11, oth.__11) && object.Equals(this.__12, oth.__12) && object.Equals(this.__13, oth.__13);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__10));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__11));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__12));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__13));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__10);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__11);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__12);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__13);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13) {
+      return new Dafny.TypeDescriptor<_System._ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>>(_System.Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default()));
+    }
+    public static _ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13) {
+      return new Tuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13);
+    }
+    public static _ITuple14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> create____hMake14(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+    public T10 dtor__10 {
+      get {
+        return this.__10;
+      }
+    }
+    public T11 dtor__11 {
+      get {
+        return this.__11;
+      }
+    }
+    public T12 dtor__12 {
+      get {
+        return this.__12;
+      }
+    }
+    public T13 dtor__13 {
+      get {
+        return this.__13;
+      }
+    }
+  }
+
+  public interface _ITuple15<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    T10 dtor__10 { get; }
+    T11 dtor__11 { get; }
+    T12 dtor__12 { get; }
+    T13 dtor__13 { get; }
+    T14 dtor__14 { get; }
+    _ITuple15<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14);
+  }
+  public class Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> : _ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public readonly T10 __10;
+    public readonly T11 __11;
+    public readonly T12 __12;
+    public readonly T13 __13;
+    public readonly T14 __14;
+    public Tuple15(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+      this.__10 = _10;
+      this.__11 = _11;
+      this.__12 = _12;
+      this.__13 = _13;
+      this.__14 = _14;
+    }
+    public _ITuple15<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14) {
+      if (this is _ITuple15<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14> dt) { return dt; }
+      return new Tuple15<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9), converter10(__10), converter11(__11), converter12(__12), converter13(__13), converter14(__14));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9) && object.Equals(this.__10, oth.__10) && object.Equals(this.__11, oth.__11) && object.Equals(this.__12, oth.__12) && object.Equals(this.__13, oth.__13) && object.Equals(this.__14, oth.__14);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__10));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__11));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__12));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__13));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__14));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__10);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__11);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__12);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__13);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__14);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14) {
+      return new Dafny.TypeDescriptor<_System._ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>>(_System.Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default()));
+    }
+    public static _ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14) {
+      return new Tuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14);
+    }
+    public static _ITuple15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> create____hMake15(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+    public T10 dtor__10 {
+      get {
+        return this.__10;
+      }
+    }
+    public T11 dtor__11 {
+      get {
+        return this.__11;
+      }
+    }
+    public T12 dtor__12 {
+      get {
+        return this.__12;
+      }
+    }
+    public T13 dtor__13 {
+      get {
+        return this.__13;
+      }
+    }
+    public T14 dtor__14 {
+      get {
+        return this.__14;
+      }
+    }
+  }
+
+  public interface _ITuple16<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    T10 dtor__10 { get; }
+    T11 dtor__11 { get; }
+    T12 dtor__12 { get; }
+    T13 dtor__13 { get; }
+    T14 dtor__14 { get; }
+    T15 dtor__15 { get; }
+    _ITuple16<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15);
+  }
+  public class Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> : _ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public readonly T10 __10;
+    public readonly T11 __11;
+    public readonly T12 __12;
+    public readonly T13 __13;
+    public readonly T14 __14;
+    public readonly T15 __15;
+    public Tuple16(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+      this.__10 = _10;
+      this.__11 = _11;
+      this.__12 = _12;
+      this.__13 = _13;
+      this.__14 = _14;
+      this.__15 = _15;
+    }
+    public _ITuple16<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15) {
+      if (this is _ITuple16<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15> dt) { return dt; }
+      return new Tuple16<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9), converter10(__10), converter11(__11), converter12(__12), converter13(__13), converter14(__14), converter15(__15));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9) && object.Equals(this.__10, oth.__10) && object.Equals(this.__11, oth.__11) && object.Equals(this.__12, oth.__12) && object.Equals(this.__13, oth.__13) && object.Equals(this.__14, oth.__14) && object.Equals(this.__15, oth.__15);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__10));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__11));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__12));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__13));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__14));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__15));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__10);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__11);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__12);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__13);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__14);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__15);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14, T15 _default_T15) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14, _default_T15);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14, Dafny.TypeDescriptor<T15> _td_T15) {
+      return new Dafny.TypeDescriptor<_System._ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>>(_System.Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default(), _td_T15.Default()));
+    }
+    public static _ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15) {
+      return new Tuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15);
+    }
+    public static _ITuple16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> create____hMake16(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+    public T10 dtor__10 {
+      get {
+        return this.__10;
+      }
+    }
+    public T11 dtor__11 {
+      get {
+        return this.__11;
+      }
+    }
+    public T12 dtor__12 {
+      get {
+        return this.__12;
+      }
+    }
+    public T13 dtor__13 {
+      get {
+        return this.__13;
+      }
+    }
+    public T14 dtor__14 {
+      get {
+        return this.__14;
+      }
+    }
+    public T15 dtor__15 {
+      get {
+        return this.__15;
+      }
+    }
+  }
+
+  public interface _ITuple17<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    T10 dtor__10 { get; }
+    T11 dtor__11 { get; }
+    T12 dtor__12 { get; }
+    T13 dtor__13 { get; }
+    T14 dtor__14 { get; }
+    T15 dtor__15 { get; }
+    T16 dtor__16 { get; }
+    _ITuple17<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16);
+  }
+  public class Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> : _ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public readonly T10 __10;
+    public readonly T11 __11;
+    public readonly T12 __12;
+    public readonly T13 __13;
+    public readonly T14 __14;
+    public readonly T15 __15;
+    public readonly T16 __16;
+    public Tuple17(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+      this.__10 = _10;
+      this.__11 = _11;
+      this.__12 = _12;
+      this.__13 = _13;
+      this.__14 = _14;
+      this.__15 = _15;
+      this.__16 = _16;
+    }
+    public _ITuple17<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16) {
+      if (this is _ITuple17<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16> dt) { return dt; }
+      return new Tuple17<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9), converter10(__10), converter11(__11), converter12(__12), converter13(__13), converter14(__14), converter15(__15), converter16(__16));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9) && object.Equals(this.__10, oth.__10) && object.Equals(this.__11, oth.__11) && object.Equals(this.__12, oth.__12) && object.Equals(this.__13, oth.__13) && object.Equals(this.__14, oth.__14) && object.Equals(this.__15, oth.__15) && object.Equals(this.__16, oth.__16);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__10));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__11));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__12));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__13));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__14));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__15));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__16));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__10);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__11);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__12);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__13);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__14);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__15);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__16);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14, T15 _default_T15, T16 _default_T16) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14, _default_T15, _default_T16);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14, Dafny.TypeDescriptor<T15> _td_T15, Dafny.TypeDescriptor<T16> _td_T16) {
+      return new Dafny.TypeDescriptor<_System._ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>(_System.Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default(), _td_T15.Default(), _td_T16.Default()));
+    }
+    public static _ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16) {
+      return new Tuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16);
+    }
+    public static _ITuple17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> create____hMake17(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+    public T10 dtor__10 {
+      get {
+        return this.__10;
+      }
+    }
+    public T11 dtor__11 {
+      get {
+        return this.__11;
+      }
+    }
+    public T12 dtor__12 {
+      get {
+        return this.__12;
+      }
+    }
+    public T13 dtor__13 {
+      get {
+        return this.__13;
+      }
+    }
+    public T14 dtor__14 {
+      get {
+        return this.__14;
+      }
+    }
+    public T15 dtor__15 {
+      get {
+        return this.__15;
+      }
+    }
+    public T16 dtor__16 {
+      get {
+        return this.__16;
+      }
+    }
+  }
+
+  public interface _ITuple18<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    T10 dtor__10 { get; }
+    T11 dtor__11 { get; }
+    T12 dtor__12 { get; }
+    T13 dtor__13 { get; }
+    T14 dtor__14 { get; }
+    T15 dtor__15 { get; }
+    T16 dtor__16 { get; }
+    T17 dtor__17 { get; }
+    _ITuple18<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17);
+  }
+  public class Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> : _ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public readonly T10 __10;
+    public readonly T11 __11;
+    public readonly T12 __12;
+    public readonly T13 __13;
+    public readonly T14 __14;
+    public readonly T15 __15;
+    public readonly T16 __16;
+    public readonly T17 __17;
+    public Tuple18(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+      this.__10 = _10;
+      this.__11 = _11;
+      this.__12 = _12;
+      this.__13 = _13;
+      this.__14 = _14;
+      this.__15 = _15;
+      this.__16 = _16;
+      this.__17 = _17;
+    }
+    public _ITuple18<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17) {
+      if (this is _ITuple18<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17> dt) { return dt; }
+      return new Tuple18<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9), converter10(__10), converter11(__11), converter12(__12), converter13(__13), converter14(__14), converter15(__15), converter16(__16), converter17(__17));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9) && object.Equals(this.__10, oth.__10) && object.Equals(this.__11, oth.__11) && object.Equals(this.__12, oth.__12) && object.Equals(this.__13, oth.__13) && object.Equals(this.__14, oth.__14) && object.Equals(this.__15, oth.__15) && object.Equals(this.__16, oth.__16) && object.Equals(this.__17, oth.__17);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__10));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__11));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__12));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__13));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__14));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__15));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__16));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__17));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__10);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__11);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__12);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__13);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__14);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__15);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__16);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__17);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14, T15 _default_T15, T16 _default_T16, T17 _default_T17) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14, _default_T15, _default_T16, _default_T17);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14, Dafny.TypeDescriptor<T15> _td_T15, Dafny.TypeDescriptor<T16> _td_T16, Dafny.TypeDescriptor<T17> _td_T17) {
+      return new Dafny.TypeDescriptor<_System._ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>>(_System.Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default(), _td_T15.Default(), _td_T16.Default(), _td_T17.Default()));
+    }
+    public static _ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17) {
+      return new Tuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17);
+    }
+    public static _ITuple18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> create____hMake18(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+    public T10 dtor__10 {
+      get {
+        return this.__10;
+      }
+    }
+    public T11 dtor__11 {
+      get {
+        return this.__11;
+      }
+    }
+    public T12 dtor__12 {
+      get {
+        return this.__12;
+      }
+    }
+    public T13 dtor__13 {
+      get {
+        return this.__13;
+      }
+    }
+    public T14 dtor__14 {
+      get {
+        return this.__14;
+      }
+    }
+    public T15 dtor__15 {
+      get {
+        return this.__15;
+      }
+    }
+    public T16 dtor__16 {
+      get {
+        return this.__16;
+      }
+    }
+    public T17 dtor__17 {
+      get {
+        return this.__17;
+      }
+    }
+  }
+
+  public interface _ITuple19<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17, out T18> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    T10 dtor__10 { get; }
+    T11 dtor__11 { get; }
+    T12 dtor__12 { get; }
+    T13 dtor__13 { get; }
+    T14 dtor__14 { get; }
+    T15 dtor__15 { get; }
+    T16 dtor__16 { get; }
+    T17 dtor__17 { get; }
+    T18 dtor__18 { get; }
+    _ITuple19<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17, Func<T18, __T18> converter18);
+  }
+  public class Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> : _ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public readonly T10 __10;
+    public readonly T11 __11;
+    public readonly T12 __12;
+    public readonly T13 __13;
+    public readonly T14 __14;
+    public readonly T15 __15;
+    public readonly T16 __16;
+    public readonly T17 __17;
+    public readonly T18 __18;
+    public Tuple19(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17, T18 _18) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+      this.__10 = _10;
+      this.__11 = _11;
+      this.__12 = _12;
+      this.__13 = _13;
+      this.__14 = _14;
+      this.__15 = _15;
+      this.__16 = _16;
+      this.__17 = _17;
+      this.__18 = _18;
+    }
+    public _ITuple19<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17, Func<T18, __T18> converter18) {
+      if (this is _ITuple19<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18> dt) { return dt; }
+      return new Tuple19<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9), converter10(__10), converter11(__11), converter12(__12), converter13(__13), converter14(__14), converter15(__15), converter16(__16), converter17(__17), converter18(__18));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9) && object.Equals(this.__10, oth.__10) && object.Equals(this.__11, oth.__11) && object.Equals(this.__12, oth.__12) && object.Equals(this.__13, oth.__13) && object.Equals(this.__14, oth.__14) && object.Equals(this.__15, oth.__15) && object.Equals(this.__16, oth.__16) && object.Equals(this.__17, oth.__17) && object.Equals(this.__18, oth.__18);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__10));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__11));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__12));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__13));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__14));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__15));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__16));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__17));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__18));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__10);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__11);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__12);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__13);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__14);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__15);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__16);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__17);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__18);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14, T15 _default_T15, T16 _default_T16, T17 _default_T17, T18 _default_T18) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14, _default_T15, _default_T16, _default_T17, _default_T18);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14, Dafny.TypeDescriptor<T15> _td_T15, Dafny.TypeDescriptor<T16> _td_T16, Dafny.TypeDescriptor<T17> _td_T17, Dafny.TypeDescriptor<T18> _td_T18) {
+      return new Dafny.TypeDescriptor<_System._ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>>(_System.Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default(), _td_T15.Default(), _td_T16.Default(), _td_T17.Default(), _td_T18.Default()));
+    }
+    public static _ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17, T18 _18) {
+      return new Tuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18);
+    }
+    public static _ITuple19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> create____hMake19(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17, T18 _18) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+    public T10 dtor__10 {
+      get {
+        return this.__10;
+      }
+    }
+    public T11 dtor__11 {
+      get {
+        return this.__11;
+      }
+    }
+    public T12 dtor__12 {
+      get {
+        return this.__12;
+      }
+    }
+    public T13 dtor__13 {
+      get {
+        return this.__13;
+      }
+    }
+    public T14 dtor__14 {
+      get {
+        return this.__14;
+      }
+    }
+    public T15 dtor__15 {
+      get {
+        return this.__15;
+      }
+    }
+    public T16 dtor__16 {
+      get {
+        return this.__16;
+      }
+    }
+    public T17 dtor__17 {
+      get {
+        return this.__17;
+      }
+    }
+    public T18 dtor__18 {
+      get {
+        return this.__18;
+      }
+    }
+  }
+
+  public interface _ITuple20<out T0, out T1, out T2, out T3, out T4, out T5, out T6, out T7, out T8, out T9, out T10, out T11, out T12, out T13, out T14, out T15, out T16, out T17, out T18, out T19> {
+    T0 dtor__0 { get; }
+    T1 dtor__1 { get; }
+    T2 dtor__2 { get; }
+    T3 dtor__3 { get; }
+    T4 dtor__4 { get; }
+    T5 dtor__5 { get; }
+    T6 dtor__6 { get; }
+    T7 dtor__7 { get; }
+    T8 dtor__8 { get; }
+    T9 dtor__9 { get; }
+    T10 dtor__10 { get; }
+    T11 dtor__11 { get; }
+    T12 dtor__12 { get; }
+    T13 dtor__13 { get; }
+    T14 dtor__14 { get; }
+    T15 dtor__15 { get; }
+    T16 dtor__16 { get; }
+    T17 dtor__17 { get; }
+    T18 dtor__18 { get; }
+    T19 dtor__19 { get; }
+    _ITuple20<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17, Func<T18, __T18> converter18, Func<T19, __T19> converter19);
+  }
+  public class Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> : _ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
+    public readonly T0 __0;
+    public readonly T1 __1;
+    public readonly T2 __2;
+    public readonly T3 __3;
+    public readonly T4 __4;
+    public readonly T5 __5;
+    public readonly T6 __6;
+    public readonly T7 __7;
+    public readonly T8 __8;
+    public readonly T9 __9;
+    public readonly T10 __10;
+    public readonly T11 __11;
+    public readonly T12 __12;
+    public readonly T13 __13;
+    public readonly T14 __14;
+    public readonly T15 __15;
+    public readonly T16 __16;
+    public readonly T17 __17;
+    public readonly T18 __18;
+    public readonly T19 __19;
+    public Tuple20(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17, T18 _18, T19 _19) {
+      this.__0 = _0;
+      this.__1 = _1;
+      this.__2 = _2;
+      this.__3 = _3;
+      this.__4 = _4;
+      this.__5 = _5;
+      this.__6 = _6;
+      this.__7 = _7;
+      this.__8 = _8;
+      this.__9 = _9;
+      this.__10 = _10;
+      this.__11 = _11;
+      this.__12 = _12;
+      this.__13 = _13;
+      this.__14 = _14;
+      this.__15 = _15;
+      this.__16 = _16;
+      this.__17 = _17;
+      this.__18 = _18;
+      this.__19 = _19;
+    }
+    public _ITuple20<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19> DowncastClone<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19>(Func<T0, __T0> converter0, Func<T1, __T1> converter1, Func<T2, __T2> converter2, Func<T3, __T3> converter3, Func<T4, __T4> converter4, Func<T5, __T5> converter5, Func<T6, __T6> converter6, Func<T7, __T7> converter7, Func<T8, __T8> converter8, Func<T9, __T9> converter9, Func<T10, __T10> converter10, Func<T11, __T11> converter11, Func<T12, __T12> converter12, Func<T13, __T13> converter13, Func<T14, __T14> converter14, Func<T15, __T15> converter15, Func<T16, __T16> converter16, Func<T17, __T17> converter17, Func<T18, __T18> converter18, Func<T19, __T19> converter19) {
+      if (this is _ITuple20<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19> dt) { return dt; }
+      return new Tuple20<__T0, __T1, __T2, __T3, __T4, __T5, __T6, __T7, __T8, __T9, __T10, __T11, __T12, __T13, __T14, __T15, __T16, __T17, __T18, __T19>(converter0(__0), converter1(__1), converter2(__2), converter3(__3), converter4(__4), converter5(__5), converter6(__6), converter7(__7), converter8(__8), converter9(__9), converter10(__10), converter11(__11), converter12(__12), converter13(__13), converter14(__14), converter15(__15), converter16(__16), converter17(__17), converter18(__18), converter19(__19));
+    }
+    public override bool Equals(object other) {
+      var oth = other as _System.Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>;
+      return oth != null && object.Equals(this.__0, oth.__0) && object.Equals(this.__1, oth.__1) && object.Equals(this.__2, oth.__2) && object.Equals(this.__3, oth.__3) && object.Equals(this.__4, oth.__4) && object.Equals(this.__5, oth.__5) && object.Equals(this.__6, oth.__6) && object.Equals(this.__7, oth.__7) && object.Equals(this.__8, oth.__8) && object.Equals(this.__9, oth.__9) && object.Equals(this.__10, oth.__10) && object.Equals(this.__11, oth.__11) && object.Equals(this.__12, oth.__12) && object.Equals(this.__13, oth.__13) && object.Equals(this.__14, oth.__14) && object.Equals(this.__15, oth.__15) && object.Equals(this.__16, oth.__16) && object.Equals(this.__17, oth.__17) && object.Equals(this.__18, oth.__18) && object.Equals(this.__19, oth.__19);
+    }
+    public override int GetHashCode() {
+      ulong hash = 5381;
+      hash = ((hash << 5) + hash) + 0;
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__0));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__1));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__2));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__3));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__4));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__5));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__6));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__7));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__8));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__9));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__10));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__11));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__12));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__13));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__14));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__15));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__16));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__17));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__18));
+      hash = ((hash << 5) + hash) + ((ulong)Dafny.Helpers.GetHashCode(this.__19));
+      return (int) hash;
+    }
+    public override string ToString() {
+      string s = "";
+      s += "(";
+      s += Dafny.Helpers.ToString(this.__0);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__1);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__2);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__3);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__4);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__5);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__6);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__7);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__8);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__9);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__10);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__11);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__12);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__13);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__14);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__15);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__16);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__17);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__18);
+      s += ", ";
+      s += Dafny.Helpers.ToString(this.__19);
+      s += ")";
+      return s;
+    }
+    public static _System._ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> Default(T0 _default_T0, T1 _default_T1, T2 _default_T2, T3 _default_T3, T4 _default_T4, T5 _default_T5, T6 _default_T6, T7 _default_T7, T8 _default_T8, T9 _default_T9, T10 _default_T10, T11 _default_T11, T12 _default_T12, T13 _default_T13, T14 _default_T14, T15 _default_T15, T16 _default_T16, T17 _default_T17, T18 _default_T18, T19 _default_T19) {
+      return create(_default_T0, _default_T1, _default_T2, _default_T3, _default_T4, _default_T5, _default_T6, _default_T7, _default_T8, _default_T9, _default_T10, _default_T11, _default_T12, _default_T13, _default_T14, _default_T15, _default_T16, _default_T17, _default_T18, _default_T19);
+    }
+    public static Dafny.TypeDescriptor<_System._ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> _TypeDescriptor(Dafny.TypeDescriptor<T0> _td_T0, Dafny.TypeDescriptor<T1> _td_T1, Dafny.TypeDescriptor<T2> _td_T2, Dafny.TypeDescriptor<T3> _td_T3, Dafny.TypeDescriptor<T4> _td_T4, Dafny.TypeDescriptor<T5> _td_T5, Dafny.TypeDescriptor<T6> _td_T6, Dafny.TypeDescriptor<T7> _td_T7, Dafny.TypeDescriptor<T8> _td_T8, Dafny.TypeDescriptor<T9> _td_T9, Dafny.TypeDescriptor<T10> _td_T10, Dafny.TypeDescriptor<T11> _td_T11, Dafny.TypeDescriptor<T12> _td_T12, Dafny.TypeDescriptor<T13> _td_T13, Dafny.TypeDescriptor<T14> _td_T14, Dafny.TypeDescriptor<T15> _td_T15, Dafny.TypeDescriptor<T16> _td_T16, Dafny.TypeDescriptor<T17> _td_T17, Dafny.TypeDescriptor<T18> _td_T18, Dafny.TypeDescriptor<T19> _td_T19) {
+      return new Dafny.TypeDescriptor<_System._ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>>(_System.Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>.Default(_td_T0.Default(), _td_T1.Default(), _td_T2.Default(), _td_T3.Default(), _td_T4.Default(), _td_T5.Default(), _td_T6.Default(), _td_T7.Default(), _td_T8.Default(), _td_T9.Default(), _td_T10.Default(), _td_T11.Default(), _td_T12.Default(), _td_T13.Default(), _td_T14.Default(), _td_T15.Default(), _td_T16.Default(), _td_T17.Default(), _td_T18.Default(), _td_T19.Default()));
+    }
+    public static _ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> create(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17, T18 _18, T19 _19) {
+      return new Tuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19);
+    }
+    public static _ITuple20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> create____hMake20(T0 _0, T1 _1, T2 _2, T3 _3, T4 _4, T5 _5, T6 _6, T7 _7, T8 _8, T9 _9, T10 _10, T11 _11, T12 _12, T13 _13, T14 _14, T15 _15, T16 _16, T17 _17, T18 _18, T19 _19) {
+      return create(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19);
+    }
+    public T0 dtor__0 {
+      get {
+        return this.__0;
+      }
+    }
+    public T1 dtor__1 {
+      get {
+        return this.__1;
+      }
+    }
+    public T2 dtor__2 {
+      get {
+        return this.__2;
+      }
+    }
+    public T3 dtor__3 {
+      get {
+        return this.__3;
+      }
+    }
+    public T4 dtor__4 {
+      get {
+        return this.__4;
+      }
+    }
+    public T5 dtor__5 {
+      get {
+        return this.__5;
+      }
+    }
+    public T6 dtor__6 {
+      get {
+        return this.__6;
+      }
+    }
+    public T7 dtor__7 {
+      get {
+        return this.__7;
+      }
+    }
+    public T8 dtor__8 {
+      get {
+        return this.__8;
+      }
+    }
+    public T9 dtor__9 {
+      get {
+        return this.__9;
+      }
+    }
+    public T10 dtor__10 {
+      get {
+        return this.__10;
+      }
+    }
+    public T11 dtor__11 {
+      get {
+        return this.__11;
+      }
+    }
+    public T12 dtor__12 {
+      get {
+        return this.__12;
+      }
+    }
+    public T13 dtor__13 {
+      get {
+        return this.__13;
+      }
+    }
+    public T14 dtor__14 {
+      get {
+        return this.__14;
+      }
+    }
+    public T15 dtor__15 {
+      get {
+        return this.__15;
+      }
+    }
+    public T16 dtor__16 {
+      get {
+        return this.__16;
+      }
+    }
+    public T17 dtor__17 {
+      get {
+        return this.__17;
+      }
+    }
+    public T18 dtor__18 {
+      get {
+        return this.__18;
+      }
+    }
+    public T19 dtor__19 {
+      get {
+        return this.__19;
+      }
+    }
+  }
+} // end of namespace _System
diff --git a/Source/DafnyRuntime/Makefile b/Source/DafnyRuntime/Makefile
new file mode 100644
index 00000000000..77543dbab30
--- /dev/null
+++ b/Source/DafnyRuntime/Makefile
@@ -0,0 +1,17 @@
+
+# Invoking the CLI this way just to stay platform-independent
+DAFNY = dotnet run --project ../Dafny --no-build --
+
+GENERATED_SYSTEM_MODULE_SOURCE=obj/systemModulePopulator.cs
+GENERATED_SYSTEM_MODULE_TARGET=DafnyRuntimeSystemModule.cs
+
+all: check-system-module
+
+build-system-module:
+	$(DAFNY) translate cs --no-verify --use-basename-for-filename --optimize-erasable-datatype-wrapper:false --system-module:OmitAllOtherModules systemModulePopulator.dfy --output:obj/systemModulePopulator
+
+check-system-module: build-system-module
+	diff $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
+
+update-system-module: build-system-module
+	cp $(GENERATED_SYSTEM_MODULE_SOURCE) $(GENERATED_SYSTEM_MODULE_TARGET)
diff --git a/Source/DafnyRuntime/systemModulePopulator.dfy b/Source/DafnyRuntime/systemModulePopulator.dfy
new file mode 100644
index 00000000000..0f824898f2d
--- /dev/null
+++ b/Source/DafnyRuntime/systemModulePopulator.dfy
@@ -0,0 +1,67 @@
+
+method HasTuples() {
+  var b := true;
+  var has0 := ();
+  var has1 := (b, ghost b);  // Just (b) is a bool in parentheses instead
+  var has2 := (b,b);
+  var has3 := (b,b,b);
+  var has4 := (b,b,b,b);
+  var has5 := (b,b,b,b,b);
+  var has6 := (b,b,b,b,b,b);
+  var has7 := (b,b,b,b,b,b,b);
+  var has8 := (b,b,b,b,b,b,b,b);
+  var has9 := (b,b,b,b,b,b,b,b,b);
+  var has10 := (b,b,b,b,b,b,b,b,b,b);
+  var has11 := (b,b,b,b,b,b,b,b,b,b,b);
+  var has12 := (b,b,b,b,b,b,b,b,b,b,b,b);
+  var has13 := (b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has14 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has15 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has16 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has17 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has18 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has19 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has20 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+}
+
+method HasArrows() {
+  var has0 := () => 42;
+  var has1 := (x1: bool) => 42;
+  var has2 := (x1: bool, x2: bool) => 42;
+  var has3 := (x1: bool, x2: bool, x3: bool) => 42;
+  var has4 := (x1: bool, x2: bool, x3: bool, x4: bool) => 42;
+  var has5 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool) => 42;
+  var has6 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool) => 42;
+  var has7 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool) => 42;
+  var has8 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool) => 42;
+  var has9 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool) => 42;
+  var has10 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool) => 42;
+  var has11 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool) => 42;
+  var has12 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool) => 42;
+  var has13 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool, x13: bool) => 42;
+  var has14 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool, x13: bool, x14: bool) => 42;
+  var has15 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool, x13: bool, x14: bool, x15: bool) => 42;
+  var has16 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool, x13: bool, x14: bool, x15: bool, x16: bool) => 42;
+}
+
+newtype byte = x: int | 0 <= x < 256
+
+method HasArrays() {
+  var n: byte := 0;
+  var has1 := new bool[n];
+  var has2 := new bool[n,n];
+  var has3 := new bool[n,n,n];
+  var has4 := new bool[n,n,n,n];
+  var has5 := new bool[n,n,n,n,n];
+  var has6 := new bool[n,n,n,n,n,n];
+  var has7 := new bool[n,n,n,n,n,n,n];
+  var has8 := new bool[n,n,n,n,n,n,n,n];
+  var has9 := new bool[n,n,n,n,n,n,n,n,n];
+  var has10 := new bool[n,n,n,n,n,n,n,n,n,n];
+  var has11 := new bool[n,n,n,n,n,n,n,n,n,n,n];
+  var has12 := new bool[n,n,n,n,n,n,n,n,n,n,n,n];
+  var has13 := new bool[n,n,n,n,n,n,n,n,n,n,n,n,n];
+  var has14 := new bool[n,n,n,n,n,n,n,n,n,n,n,n,n,n];
+  var has15 := new bool[n,n,n,n,n,n,n,n,n,n,n,n,n,n,n];
+  var has16 := new bool[n,n,n,n,n,n,n,n,n,n,n,n,n,n,n,n];
+}
\ No newline at end of file
diff --git a/Source/DafnyRuntime/tuplesForDafnyRuntime.dfy b/Source/DafnyRuntime/tuplesForDafnyRuntime.dfy
deleted file mode 100644
index a4cb2ad49ef..00000000000
--- a/Source/DafnyRuntime/tuplesForDafnyRuntime.dfy
+++ /dev/null
@@ -1,23 +0,0 @@
-method HasTuples() {
-  var has0 := ();
-  var has1 := (1);
-  var has2 := (1,2);
-  var has3 := (1,2,3);
-  var has4 := (1,2,3,4);
-  var has5 := (1,2,3,4,5);
-  var has6 := (1,2,3,4,5,6);
-  var has7 := (1,2,3,4,5,6,7);
-  var has8 := (1,2,3,4,5,6,7,8);
-  var has9 := (1,2,3,4,5,6,7,8,9);
-  var has10 := (1,2,3,4,5,6,7,8,9,10);
-  var has11 := (1,2,3,4,5,6,7,8,9,10,11);
-  var has12 := (1,2,3,4,5,6,7,8,9,10,11,12);
-  var has13 := (1,2,3,4,5,6,7,8,9,10,11,12,13);
-  var has14 := (1,2,3,4,5,6,7,8,9,10,11,12,13,14);
-  var has15 := (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15);
-  var has16 := (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16);
-  var has17 := (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17);
-  var has18 := (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18);
-  var has19 := (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19);
-  var has20 := (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
-}
\ No newline at end of file
diff --git a/Source/DafnyServer/CounterExampleProvider.cs b/Source/DafnyServer/CounterExampleProvider.cs
index 614c9aff5d0..9857cf7d4f0 100644
--- a/Source/DafnyServer/CounterExampleProvider.cs
+++ b/Source/DafnyServer/CounterExampleProvider.cs
@@ -9,11 +9,9 @@
 using System.Text.RegularExpressions;
 using Microsoft.Boogie;
 using Microsoft.Dafny;
-using Microsoft.Dafny.LanguageServer.CounterExampleGeneration;
 
 namespace DafnyServer {
   public sealed class CounterExampleProvider {
-    private const int maximumCounterexampleDepth = 5;
     public readonly string ModelBvd;
 
     public CounterExampleProvider() {
@@ -69,14 +67,14 @@ private CounterExample ConvertModels(List<DafnyModel> specificModels) {
           };
           AddLineInformation(counterExampleState, state.FullStateName);
 
-          var vars = state.ExpandedVariableSet(maximumCounterexampleDepth);
+          var vars = state.ExpandedVariableSet();
 
           foreach (var variableNode in vars) {
             counterExampleState.Variables.Add(new CounterExampleVariable {
-              Name = variableNode.ShortName,
-              Value = variableNode.Value,
-              // CanonicalName is same as Value now but keeping this for legacy
-              CanonicalName = variableNode.Value
+              Name = "",
+              Value = variableNode.ToString(),
+              // DatatypeConstructorName is same as Value now but keeping this for legacy
+              CanonicalName = variableNode.ToString()
             });
           }
           var index = counterExample.States.FindIndex(c => c.Column == counterExampleState.Column && c.Line == counterExampleState.Line);
diff --git a/Source/DafnyServer/DafnyHelper.cs b/Source/DafnyServer/DafnyHelper.cs
index 41ef045c000..bd77f44b66b 100644
--- a/Source/DafnyServer/DafnyHelper.cs
+++ b/Source/DafnyServer/DafnyHelper.cs
@@ -3,15 +3,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization.Json;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Boogie;
 using DafnyServer;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 using Bpl = Microsoft.Boogie;
 
 namespace Microsoft.Dafny {
@@ -36,33 +36,37 @@ public DafnyHelper(DafnyOptions options, ExecutionEngine engine, string[] args,
       this.source = source;
     }
 
-    public bool Verify() {
+    public async Task<bool> Verify() {
       ServerUtils.ApplyArgs(args, options);
-      return Parse() && Resolve() && Translate() && Boogie();
+      return await Parse() && Resolve() && Translate() && Boogie();
     }
 
-    private bool Parse() {
+    private async Task<bool> Parse() {
       var uri = new Uri("transcript:///" + fname);
       reporter = new ConsoleErrorReporter(options);
-      var program = new ProgramParser().ParseFiles(fname, new DafnyFile[] { new(reporter.Options, uri, new StringReader(source)) },
+      var fs = new InMemoryFileSystem(ImmutableDictionary<Uri, string>.Empty.Add(uri, source));
+      var file = DafnyFile.HandleDafnyFile(fs, reporter, reporter.Options, uri, Token.NoToken, false);
+      var parseResult = await new ProgramParser().ParseFiles(fname, new[] { file },
         reporter, CancellationToken.None);
 
-      var success = reporter.ErrorCount == 0;
+      var success = !reporter.HasErrors;
       if (success) {
-        dafnyProgram = program;
+        dafnyProgram = parseResult.Program;
       }
       return success;
     }
 
     private bool Resolve() {
       var resolver = new ProgramResolver(dafnyProgram);
-      resolver.Resolve(CancellationToken.None);
+#pragma warning disable VSTHRD002
+      resolver.Resolve(CancellationToken.None).Wait();
+#pragma warning restore VSTHRD002
       return reporter.Count(ErrorLevel.Error) == 0;
     }
 
     private bool Translate() {
-      boogiePrograms = Translator.Translate(dafnyProgram, reporter,
-          new Translator.TranslatorFlags(options) { InsertChecksums = true, UniqueIdPrefix = fname }).ToList(); // FIXME how are translation errors reported?
+      boogiePrograms = BoogieGenerator.Translate(dafnyProgram, reporter,
+          new BoogieGenerator.TranslatorFlags(options) { InsertChecksums = true, UniqueIdPrefix = fname }).ToList(); // FIXME how are translation errors reported?
       return true;
     }
 
@@ -95,32 +99,32 @@ private bool Boogie() {
       return isVerified;
     }
 
-    public void Symbols() {
+    public async Task Symbols() {
       ServerUtils.ApplyArgs(args, options);
-      if (Parse() && Resolve()) {
+      if (await Parse() && Resolve()) {
         var symbolTable = new SuperLegacySymbolTable(dafnyProgram);
         var symbols = symbolTable.CalculateSymbols();
-        Console.WriteLine("SYMBOLS_START " + ConvertToJson(symbols) + " SYMBOLS_END");
+        await options.OutputWriter.WriteLineAsync("SYMBOLS_START " + ConvertToJson(symbols) + " SYMBOLS_END");
       } else {
-        Console.WriteLine("SYMBOLS_START [] SYMBOLS_END");
+        await options.OutputWriter.WriteLineAsync("SYMBOLS_START [] SYMBOLS_END");
       }
     }
 
-    public void CounterExample() {
+    public async Task CounterExample() {
       var listArgs = args.ToList();
       listArgs.Add("/mv:" + counterExampleProvider.ModelBvd);
       ServerUtils.ApplyArgs(listArgs.ToArray(), options);
       try {
-        if (Parse() && Resolve() && Translate()) {
+        if (await Parse() && Resolve() && Translate()) {
           foreach (var boogieProgram in boogiePrograms) {
             RemoveExistingModel();
             BoogieOnce(boogieProgram.Item1, boogieProgram.Item2);
             var model = counterExampleProvider.LoadCounterModel(options);
-            Console.WriteLine("COUNTEREXAMPLE_START " + ConvertToJson(model) + " COUNTEREXAMPLE_END");
+            await options.OutputWriter.WriteLineAsync("COUNTEREXAMPLE_START " + ConvertToJson(model) + " COUNTEREXAMPLE_END");
           }
         }
       } catch (Exception e) {
-        Console.WriteLine("Error collection models: " + e.Message);
+        await options.OutputWriter.WriteLineAsync("Error collection models: " + e.Message);
       }
     }
 
@@ -130,17 +134,16 @@ private void RemoveExistingModel() {
       }
     }
 
-    public void DotGraph() {
+    public async Task DotGraph() {
       ServerUtils.ApplyArgs(args, options);
 
-      if (Parse() && Resolve() && Translate()) {
+      if (await Parse() && Resolve() && Translate()) {
         foreach (var boogieProgram in boogiePrograms) {
           BoogieOnce(boogieProgram.Item1, boogieProgram.Item2);
 
           foreach (var impl in boogieProgram.Item2.Implementations) {
-            using (StreamWriter sw = new StreamWriter(fname + impl.Name + ".dot")) {
-              sw.Write(boogieProgram.Item2.ProcessLoops(engine.Options, impl).ToDot());
-            }
+            await using var sw = new StreamWriter(fname + impl.Name + ".dot");
+            await sw.WriteAsync(boogieProgram.Item2.ProcessLoops(engine.Options, impl).ToDot());
           }
         }
       }
diff --git a/Source/DafnyServer/DafnyServer.csproj b/Source/DafnyServer/DafnyServer.csproj
index 8bc0c543c8e..f9cd46eb532 100644
--- a/Source/DafnyServer/DafnyServer.csproj
+++ b/Source/DafnyServer/DafnyServer.csproj
@@ -5,18 +5,9 @@
       <AssemblyName>DafnyServer</AssemblyName>
       <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
       <DefineConstants>TRACE</DefineConstants>
-      <TargetFramework>net6.0</TargetFramework>
+      <RollForward>Major</RollForward>
       <OutputPath>..\..\Binaries\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-
-  <!-- Working around some stange behavior in dotnet publish: https://github.com/dotnet/sdk/issues/10566 -->
-  <PropertyGroup Condition="$(RUNTIME_IDENTIFIER) != ''">
-    <RuntimeIdentifier>$(RUNTIME_IDENTIFIER)</RuntimeIdentifier>
+      <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Source/DafnyServer/Server.cs b/Source/DafnyServer/Server.cs
index 00aec229b81..6f956ec1c38 100644
--- a/Source/DafnyServer/Server.cs
+++ b/Source/DafnyServer/Server.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Threading.Tasks;
 using DafnyServer;
 using Microsoft.Boogie;
 
@@ -11,12 +12,21 @@ namespace Microsoft.Dafny {
   public class Server : IDisposable {
     private bool running;
     private readonly ExecutionEngine engine;
+    private readonly TextReader input;
+    private readonly TextWriter outputWriter;
 
-    public static void Main(string[] args) {
-      var options = DafnyOptions.Create(Console.Out);
+    public static Task<int> Main(string[] args) {
+      return MainWithWriters(Console.Out, Console.Error, Console.In, args);
+    }
+
+    public static async Task<int> MainWithWriters(TextWriter outputWriter, TextWriter errorWriter, TextReader inputReader, string[] args) {
+      var options = DafnyOptions.CreateUsingOldParser(outputWriter);
+      options.Printer = new DafnyConsolePrinter(options);
+      options.Set(CommonOptionBag.AllowAxioms, true);
+      Console.SetError(outputWriter);
       ServerUtils.ApplyArgs(args, options);
+      options.ProcessSolverOptions(new ErrorReporterSink(options), Token.NoToken);
       var engine = ExecutionEngine.CreateWithoutSharedCache(options);
-      Server server = new Server(engine);
 
       // read the optional flag (only one flag is allowed)
       bool plaintext = false;
@@ -40,27 +50,29 @@ public static void Main(string[] args) {
       }
 
       if (selftest) {
-        VerificationTask.SelfTest(options, engine);
-        return;
+        await VerificationTask.SelfTest(options, engine);
+        return 0;
       }
 
       if (n < args.Length) {
         var inputFilename = args[n];
         if (File.Exists(inputFilename)) {
-          Console.WriteLine("# Reading from {0}", Path.GetFileName(inputFilename));
-          Console.SetIn(new StreamReader(inputFilename, Encoding.UTF8));
+          await outputWriter.WriteLineAsync($"# Reading from {Path.GetFileName(inputFilename)}");
+          inputReader = new StreamReader(inputFilename, Encoding.UTF8);
         } else {
-          Console.WriteLine("Error: file '{0}' does not exist", inputFilename);
+          await outputWriter.WriteLineAsync($"Error: file '{inputFilename}' does not exist");
         }
       }
+      var server = new Server(engine, inputReader, outputWriter);
 
       if (decode) {
         server.Decode();
       } else if (encode) {
         server.Encode();
       } else {
-        server.Loop(options, plaintext);
+        await server.Loop(options, plaintext);
       }
+      return 0;
     }
 
     private void SetupConsole() {
@@ -68,21 +80,22 @@ private void SetupConsole() {
       Console.OutputEncoding = new UTF8Encoding(false, true);
     }
 
-    public Server(ExecutionEngine engine) {
+    public Server(ExecutionEngine engine, TextReader input, TextWriter outputWriter) {
       this.engine = engine;
+      this.input = input;
+      this.outputWriter = outputWriter;
       this.running = true;
       SetupConsole();
     }
 
     bool EndOfPayload(out string line) {
-      line = Console.ReadLine();
+      line = input.ReadLine();
       return line == null || line == Interaction.CLIENT_EOM_TAG;
     }
 
     string ReadPayload(bool inputIsPlaintext) {
       StringBuilder buffer = new StringBuilder();
-      string line = null;
-      while (!EndOfPayload(out line)) {
+      while (!EndOfPayload(out var line)) {
         buffer.Append(line);
         if (inputIsPlaintext) {
           buffer.Append("\n");
@@ -97,16 +110,16 @@ string ReadPayload(bool inputIsPlaintext) {
     /// </summary>
     void Decode() {
       while (true) {
-        var line = Console.ReadLine();
+        var line = input.ReadLine();
         if (line == null) {
           return;
         }
-        Console.WriteLine(line);
+        outputWriter.WriteLine(line);
         if (line != String.Empty && !line.StartsWith("#")) {
           // assume the line to be a command
           var vt = ReadVerificationTask(line == "marshal");
-          Console.WriteLine(vt.ProgramSource);
-          Console.WriteLine(Interaction.CLIENT_EOM_TAG);
+          outputWriter.WriteLine(vt.ProgramSource);
+          outputWriter.WriteLine(Interaction.CLIENT_EOM_TAG);
         }
       }
     }
@@ -117,11 +130,11 @@ void Decode() {
     /// </summary>
     void Encode() {
       while (true) {
-        var line = Console.ReadLine();
+        var line = input.ReadLine();
         if (line == null) {
           return;
         }
-        Console.WriteLine(line);
+        outputWriter.WriteLine(line);
         if (line != String.Empty && !line.StartsWith("#")) {
           // assume the line to be a command
           var vt = ReadVerificationTask(line != "unmarshal");
@@ -130,9 +143,9 @@ void Encode() {
             WriteAcrossLines(b64Repr, 76);
           } else {
             // for unmarshal, pass the line through unchanged
-            Console.WriteLine(vt.ProgramSource);
+            outputWriter.WriteLine(vt.ProgramSource);
           }
-          Console.WriteLine(Interaction.CLIENT_EOM_TAG);
+          outputWriter.WriteLine(Interaction.CLIENT_EOM_TAG);
         }
       }
     }
@@ -144,25 +157,25 @@ void Encode() {
     /// </summary>
     /// <param name="s">assumed not to contain any newline characters</param>
     /// <param name="width">assumed to be positive</param>
-    static void WriteAcrossLines(string s, int width) {
+    void WriteAcrossLines(string s, int width) {
       var len = s.Length;
       for (var n = 0; n < len; n += width) {
         var next = n + width <= len ? s.Substring(n, width) : s.Substring(n);
-        Console.WriteLine(next);
+        outputWriter.WriteLine(next);
       }
     }
 
-    void Loop(DafnyOptions options, bool inputIsPlaintext) {
+    async Task Loop(DafnyOptions options, bool inputIsPlaintext) {
       for (int cycle = 0; running; cycle++) {
-        var line = Console.ReadLine() ?? "quit";
+        var line = await input.ReadLineAsync() ?? "quit";
         if (line != String.Empty && !line.StartsWith("#")) {
           var command = line.Split();
-          Respond(options, command, inputIsPlaintext);
+          await Respond(options, command, inputIsPlaintext);
         }
       }
     }
 
-    void Respond(DafnyOptions options, string[] command, bool inputIsPlaintext) {
+    async Task Respond(DafnyOptions options, string[] command, bool inputIsPlaintext) {
       try {
         if (command.Length == 0) {
           throw new ServerException("Empty command");
@@ -173,19 +186,19 @@ void Respond(DafnyOptions options, string[] command, bool inputIsPlaintext) {
         if (verb == "verify") {
           ServerUtils.checkArgs(command, 0);
           var vt = ReadVerificationTask(inputIsPlaintext);
-          vt.Run(options, engine);
+          await vt.Run(options, engine);
         } else if (verb == "counterexample") {
           ServerUtils.checkArgs(command, 0);
           var vt = ReadVerificationTask(inputIsPlaintext);
-          vt.CounterExample(options, engine);
+          await vt.CounterExample(options, engine);
         } else if (verb == "dotgraph") {
           ServerUtils.checkArgs(command, 0);
           var vt = ReadVerificationTask(inputIsPlaintext);
-          vt.DotGraph(options, engine);
+          await vt.DotGraph(options, engine);
         } else if (verb == "symbols") {
           ServerUtils.checkArgs(command, 0);
           var vt = ReadVerificationTask(inputIsPlaintext);
-          vt.Symbols(options, engine);
+          await vt.Symbols(options, engine);
         } else if (verb == "version") {
           ServerUtils.checkArgs(command, 0);
           var _ = ReadVerificationTask(inputIsPlaintext);
@@ -193,12 +206,12 @@ void Respond(DafnyOptions options, string[] command, bool inputIsPlaintext) {
         } else if (verb == "unmarshal") {
           ServerUtils.checkArgs(command, 0);
           var vt = ReadVerificationTask(false);
-          vt.Unmarshal(command);
+          vt.Unmarshal(outputWriter, command);
           msg = null;
         } else if (verb == "marshal") {
           ServerUtils.checkArgs(command, 0);
           var vt = ReadVerificationTask(true);
-          vt.Marshal(command);
+          vt.Marshal(outputWriter, command);
           msg = null;
         } else if (verb == "quit") {
           ServerUtils.checkArgs(command, 0);
@@ -208,11 +221,11 @@ void Respond(DafnyOptions options, string[] command, bool inputIsPlaintext) {
           throw new ServerException("Unknown verb '{0}'", verb);
         }
 
-        Interaction.EOM(Interaction.SUCCESS, msg);
+        Interaction.Eom(outputWriter, Interaction.SUCCESS, msg);
       } catch (ServerException ex) {
-        Interaction.EOM(Interaction.FAILURE, ex);
+        Interaction.Eom(outputWriter, Interaction.FAILURE, ex);
       } catch (Exception ex) {
-        Interaction.EOM(Interaction.FAILURE, ex, "[FATAL]");
+        Interaction.Eom(outputWriter, Interaction.FAILURE, ex, "[FATAL]");
         running = false;
       }
     }
diff --git a/Source/DafnyServer/SuperLegacySymbolTable.cs b/Source/DafnyServer/SuperLegacySymbolTable.cs
index 7f5ce9ab86b..acec53486a7 100644
--- a/Source/DafnyServer/SuperLegacySymbolTable.cs
+++ b/Source/DafnyServer/SuperLegacySymbolTable.cs
@@ -30,7 +30,7 @@ public List<SymbolInformation> CalculateSymbols() {
 
     private void AddMethods(ModuleDefinition module, List<SymbolInformation> information) {
       foreach (var clbl in ModuleDefinition.AllCallables(module.TopLevelDecls).
-                 Where(e => e != null && !e.Tok.FromIncludeDirective(_dafnyProgram))) {
+                 Where(e => e != null && !e.Origin.FromIncludeDirective(_dafnyProgram))) {
 
         if (clbl is Predicate) {
           var predicate = clbl as Predicate;
@@ -39,7 +39,7 @@ private void AddMethods(ModuleDefinition module, List<SymbolInformation> informa
             Name = predicate.Name,
             ParentClass = predicate.EnclosingClass.Name,
             SymbolType = SymbolInformation.Type.Predicate,
-            StartToken = predicate.tok,
+            StartToken = predicate.Origin,
             EndToken = predicate.EndToken
           };
           information.Add(predicateSymbol);
@@ -51,7 +51,7 @@ private void AddMethods(ModuleDefinition module, List<SymbolInformation> informa
             Name = fn.Name,
             ParentClass = fn.EnclosingClass.Name,
             SymbolType = SymbolInformation.Type.Function,
-            StartToken = fn.tok,
+            StartToken = fn.Origin,
             EndColumn = fn.EndToken.col,
             EndLine = fn.EndToken.line,
             EndPosition = fn.EndToken.pos,
@@ -69,7 +69,7 @@ private void AddMethods(ModuleDefinition module, List<SymbolInformation> informa
             Name = m.Name,
             ParentClass = m.EnclosingClass.Name,
             SymbolType = SymbolInformation.Type.Method,
-            StartToken = m.tok,
+            StartToken = m.Origin,
             Ensures = ParseContracts(m.Ens),
             Requires = ParseContracts(m.Req),
             References =
@@ -87,14 +87,14 @@ private void AddMethods(ModuleDefinition module, List<SymbolInformation> informa
 
     private void AddFields(ModuleDefinition module, List<SymbolInformation> information) {
       foreach (var fs in ModuleDefinition.AllFields(module.TopLevelDecls).
-                 Where(e => e != null && !e.Tok.FromIncludeDirective(_dafnyProgram))) {
+                 Where(e => e != null && !e.Origin.FromIncludeDirective(_dafnyProgram))) {
 
         var fieldSymbol = new SymbolInformation {
           Module = fs.EnclosingClass.EnclosingModuleDefinition.Name,
           Name = fs.Name,
           ParentClass = fs.EnclosingClass.Name,
           SymbolType = SymbolInformation.Type.Field,
-          StartToken = fs.tok,
+          StartToken = fs.Origin,
           References = FindFieldReferencesInternal(fs.Name, fs.EnclosingClass.Name, fs.EnclosingClass.EnclosingModuleDefinition.Name)
         };
         if (fs.Type is UserDefinedType) {
@@ -108,13 +108,13 @@ private void AddFields(ModuleDefinition module, List<SymbolInformation> informat
 
     private void AddClasses(ModuleDefinition module, List<SymbolInformation> information) {
       foreach (var cs in module.TopLevelDecls.Where(t => t is ClassLikeDecl or DefaultClassDecl).
-                 Where(cl => !cl.Tok.FromIncludeDirective(_dafnyProgram))) {
-        if (cs.EnclosingModuleDefinition != null && cs.tok != null) {
+                 Where(cl => !cl.Origin.FromIncludeDirective(_dafnyProgram))) {
+        if (cs.EnclosingModuleDefinition != null && cs.Origin != null) {
           var classSymbol = new SymbolInformation {
             Module = cs.EnclosingModuleDefinition.Name,
             Name = cs.Name,
             SymbolType = SymbolInformation.Type.Class,
-            StartToken = cs.tok,
+            StartToken = cs.Origin,
             EndToken = cs.EndToken
           };
           information.Add(classSymbol);
@@ -138,7 +138,7 @@ private static IEnumerable<SymbolInformation> ResolveLocalDefinitions(IEnumerabl
           var declarations = (VarDeclStmt)statement;
           {
             Type type = null;
-            var rightSide = declarations.Update as UpdateStmt;
+            var rightSide = declarations.Assign as AssignStatement;
             if (rightSide != null) {
               var definition = rightSide.Rhss.First();
               var typeDef = definition as TypeRhs;
@@ -162,8 +162,8 @@ private static IEnumerable<SymbolInformation> ResolveLocalDefinitions(IEnumerabl
             }
           }
         }
-        if (statement is UpdateStmt) {
-          var updateStatement = statement as UpdateStmt;
+        if (statement is AssignStatement) {
+          var updateStatement = statement as AssignStatement;
           var lefts = updateStatement.Lhss;
           foreach (var expression in lefts) {
             if (expression is AutoGhostIdentifierExpr) {
@@ -172,7 +172,7 @@ private static IEnumerable<SymbolInformation> ResolveLocalDefinitions(IEnumerabl
                 Name = autoGhost.Name,
                 ParentClass = autoGhost.Resolved.Type.ToString(),
                 SymbolType = SymbolInformation.Type.Definition,
-                StartToken = updateStatement.Tok,
+                StartToken = updateStatement.Origin,
                 EndToken = updateStatement.EndToken
               });
             }
@@ -191,7 +191,7 @@ private static IEnumerable<SymbolInformation> ResolveCallStatements(IEnumerable<
       foreach (var statement in statements) {
         if (statement is CallStmt) {
           ParseCallStatement(statement, information);
-        } else if (statement is UpdateStmt) {
+        } else if (statement is AssignStatement) {
           ParseUpdateStatement(statement, information);
         }
 
@@ -218,18 +218,16 @@ private static void ParseCallStatement(Statement statement, List<SymbolInformati
           Module = userType.ResolvedClass.EnclosingModuleDefinition.SanitizedName,
           Call = reveiverName + "." + callStmt.MethodSelect.Member,
           SymbolType = SymbolInformation.Type.Call,
-          StartToken = callStmt.MethodSelect.tok
+          StartToken = callStmt.MethodSelect.Origin
         });
       }
     }
 
     private static void ParseUpdateStatement(Statement statement, List<SymbolInformation> information) {
-      var updateStmt = (UpdateStmt)statement;
+      var updateStmt = (AssignStatement)statement;
       var leftSide = updateStmt.Lhss;
       var rightSide = updateStmt.Rhss;
-      var leftSideDots = leftSide.OfType<ExprDotName>();
-      var rightSideDots = rightSide.OfType<ExprDotName>();
-      var allExprDotNames = leftSideDots.Concat(rightSideDots);
+      var allExprDotNames = leftSide.OfType<ExprDotName>();
       foreach (var exprDotName in allExprDotNames) {
         if (!(exprDotName.Lhs.Type is UserDefinedType)) {
           continue;
@@ -244,7 +242,7 @@ private static void ParseUpdateStatement(Statement statement, List<SymbolInforma
           Module = type.ResolvedClass.EnclosingModuleDefinition.SanitizedName,
           Call = designator + "." + exprDotName.SuffixName,
           SymbolType = SymbolInformation.Type.Call,
-          StartToken = exprDotName.tok
+          StartToken = exprDotName.Origin
         });
       }
     }
@@ -255,7 +253,7 @@ private List<ReferenceInformation> FindFieldReferencesInternal(string fieldName,
 
       foreach (var module in _dafnyProgram.Modules()) {
         foreach (var clbl in ModuleDefinition.AllCallables(module.TopLevelDecls).
-                   Where(e => !e.Tok.FromIncludeDirective(_dafnyProgram))) {
+                   Where(e => !e.Origin.FromIncludeDirective(_dafnyProgram))) {
           if (!(clbl is Method)) {
             continue;
           }
@@ -274,7 +272,7 @@ private List<ReferenceInformation> FindMethodReferencesInternal(string methodToF
 
       foreach (var module in _dafnyProgram.Modules()) {
         foreach (var clbl in ModuleDefinition.AllCallables(module.TopLevelDecls).
-                   Where(e => !e.Tok.FromIncludeDirective(_dafnyProgram))) {
+                   Where(e => !e.Origin.FromIncludeDirective(_dafnyProgram))) {
           if (!(clbl is Method)) {
             continue;
           }
@@ -300,16 +298,12 @@ private static ICollection<Expression> GetAllSubExpressions(Expression expressio
     private static IEnumerable<ReferenceInformation> ParseBodyForFieldReferences(IEnumerable<Statement> block, string fieldName, string className, string moduleName) {
       var information = new List<ReferenceInformation>();
       foreach (var statement in block) {
-        if (statement is UpdateStmt) {
-          var updateStmt = (UpdateStmt)statement;
+        if (statement is AssignStatement) {
+          var updateStmt = (AssignStatement)statement;
           var leftSide = updateStmt.Lhss;
           var rightSide = updateStmt.Rhss;
-          var leftSideDots = leftSide.OfType<ExprDotName>();
-          var rightSideDots = rightSide.OfType<ExprDotName>();
-          var exprDotNames = leftSideDots.Concat(rightSideDots);
-          var leftSideNameSegments = leftSide.OfType<NameSegment>();
-          var rightSideNameSegments = rightSide.OfType<NameSegment>();
-          var nameSegments = leftSideNameSegments.Concat(rightSideNameSegments);
+          var exprDotNames = leftSide.OfType<ExprDotName>();
+          var nameSegments = leftSide.OfType<NameSegment>();
           var allRightSideExpressions = rightSide.SelectMany(e => e.SubExpressions.SelectMany(GetAllSubExpressions));
           var allLeftSideExpressions =
               leftSide.SelectMany(e => e.SubExpressions.SelectMany(GetAllSubExpressions));
@@ -324,7 +318,7 @@ private static IEnumerable<ReferenceInformation> ParseBodyForFieldReferences(IEn
                   moduleName == type.ResolvedClass.EnclosingModuleDefinition.SanitizedName) {
                 information.Add(new ReferenceInformation {
                   MethodName = exprDotName.SuffixName,
-                  StartToken = exprDotName.tok,
+                  StartToken = exprDotName.Origin,
                   ReferencedName = exprDotName.SuffixName
 
                 });
@@ -340,7 +334,7 @@ private static IEnumerable<ReferenceInformation> ParseBodyForFieldReferences(IEn
                   moduleName == memberAcc.Member.EnclosingClass.EnclosingModuleDefinition.SanitizedName) {
                 information.Add(new ReferenceInformation {
                   MethodName = memberAcc.MemberName,
-                  StartToken = memberAcc.tok,
+                  StartToken = memberAcc.Origin,
                   ReferencedName = memberAcc.MemberName
                 });
               }
@@ -362,7 +356,7 @@ private List<ReferenceInformation> ParseBodyForMethodReferences(IEnumerable<Stat
           var callStmt = (CallStmt)statement;
           if (callStmt.Method.FullName == methodToFind) {
             information.Add(new ReferenceInformation {
-              StartToken = callStmt.MethodSelect.tok,
+              StartToken = callStmt.MethodSelect.Origin,
               MethodName = currentMethodName,
               ReferencedName = methodToFind.Split('.')[2]
             });
@@ -415,7 +409,7 @@ private string SymbolTypeString {
         set { SymbolType = (Type)Enum.Parse(typeof(Type), value, true); }
       }
 
-      public IToken StartToken {
+      public IOrigin StartToken {
         set {
           Line = value.line;
           Position = value.pos;
@@ -423,7 +417,7 @@ public IToken StartToken {
         }
       }
 
-      public IToken EndToken {
+      public IOrigin EndToken {
         set {
           EndLine = value.line;
           EndPosition = value.pos;
@@ -460,7 +454,7 @@ public class ReferenceInformation {
       [DataMember(Name = "ReferencedName")]
       public string ReferencedName { get; set; }
 
-      public IToken StartToken {
+      public IOrigin StartToken {
         set {
           Line = value.line;
           Position = value.pos;
diff --git a/Source/DafnyServer/Utilities.cs b/Source/DafnyServer/Utilities.cs
index 414f9e04418..e37a67b70ed 100644
--- a/Source/DafnyServer/Utilities.cs
+++ b/Source/DafnyServer/Utilities.cs
@@ -5,9 +5,12 @@
 using System.IO;
 using System.Text;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Json;
+using System.Threading;
+using DafnyCore;
 using Microsoft.Boogie;
 
 namespace Microsoft.Dafny {
@@ -17,20 +20,20 @@ class Interaction {
     internal static string SERVER_EOM_TAG = "[[DAFNY-SERVER: EOM]]";
     internal static string CLIENT_EOM_TAG = "[[DAFNY-CLIENT: EOM]]";
 
-    internal static void EOM(string header, string msg) {
+    internal static void Eom(TextWriter outputWriter, string header, string msg) {
       var trailer = (msg == null) ? "" : "\n";
-      Console.Write("{0}{1}[{2}] {3}\n", msg ?? "", trailer, header, SERVER_EOM_TAG);
-      Console.Out.Flush();
+      outputWriter.Write("{0}{1}[{2}] {3}\n", msg ?? "", trailer, header, SERVER_EOM_TAG);
+      outputWriter.Flush();
     }
 
-    internal static void EOM(string header, Exception ex, string subHeader = "") {
+    internal static void Eom(TextWriter outputWriter, string header, Exception ex, string subHeader = "") {
       var aggregate = ex as AggregateException;
       subHeader = String.IsNullOrEmpty(subHeader) ? "" : subHeader + " ";
 
       if (aggregate == null) {
-        EOM(header, subHeader + ex.Message);
+        Eom(outputWriter, header, subHeader + ex.Message);
       } else {
-        EOM(header, subHeader + String.Join(", ", aggregate.InnerExceptions.Select(e => e.Message)));
+        Eom(outputWriter, header, subHeader + String.Join(", ", aggregate.InnerExceptions.Select(e => e.Message)));
       }
     }
   }
@@ -55,7 +58,7 @@ internal static void ApplyArgs(string[] args, DafnyOptions options) {
         options.VcsCores = Math.Max(1, System.Environment.ProcessorCount / 2); // Don't use too many cores
         options.PrintTooltips = true; // Dump tooltips (ErrorLevel.Info) to stdout
         //options.UnicodeOutput = true; // Use pretty warning signs
-        options.Set(DafnyConsolePrinter.ShowSnippets, false); // Server sometimes has filename == null, which crashes showSnippets
+        options.Set(Snippets.ShowSnippets, false); // Server sometimes has filename == null, which crashes showSnippets
         options.TraceProofObligations = true; // Show which method is being verified, but don't show duration of verification
       } else {
         throw new ServerException("Invalid command line options");
diff --git a/Source/DafnyServer/VerificationTask.cs b/Source/DafnyServer/VerificationTask.cs
index 561118e11ec..e3cfeed4e87 100644
--- a/Source/DafnyServer/VerificationTask.cs
+++ b/Source/DafnyServer/VerificationTask.cs
@@ -6,6 +6,7 @@
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Json;
 using System.Text;
+using System.Threading.Tasks;
 using Microsoft.Boogie;
 
 namespace Microsoft.Dafny {
@@ -45,30 +46,30 @@ internal static VerificationTask ReadTask(string b64Repr) {
       }
     }
 
-    internal static void SelfTest(DafnyOptions options, ExecutionEngine engine) {
+    internal static async Task SelfTest(DafnyOptions options, ExecutionEngine engine) {
       var task = new VerificationTask(new string[] { }, "<none>", "method selftest() { assert true; }", false);
       try {
-        task.Run(options, engine);
-        Interaction.EOM(Interaction.SUCCESS, (string)null);
+        await task.Run(options, engine);
+        Interaction.Eom(options.OutputWriter, Interaction.SUCCESS, (string)null);
       } catch (Exception ex) {
-        Interaction.EOM(Interaction.FAILURE, ex);
+        Interaction.Eom(options.OutputWriter, Interaction.FAILURE, ex);
       }
     }
 
-    internal void Run(DafnyOptions options, ExecutionEngine engine) {
-      new DafnyHelper(options, engine, args, filename, ProgramSource).Verify();
+    internal Task<bool> Run(DafnyOptions options, ExecutionEngine engine) {
+      return new DafnyHelper(options, engine, args, filename, ProgramSource).Verify();
     }
 
-    internal void Symbols(DafnyOptions options, ExecutionEngine engine) {
-      new DafnyHelper(options, engine, args, filename, ProgramSource).Symbols();
+    internal Task Symbols(DafnyOptions options, ExecutionEngine engine) {
+      return new DafnyHelper(options, engine, args, filename, ProgramSource).Symbols();
     }
 
-    public void CounterExample(DafnyOptions options, ExecutionEngine engine) {
-      new DafnyHelper(options, engine, args, filename, ProgramSource).CounterExample();
+    public Task CounterExample(DafnyOptions options, ExecutionEngine engine) {
+      return new DafnyHelper(options, engine, args, filename, ProgramSource).CounterExample();
     }
 
-    public void DotGraph(DafnyOptions options, ExecutionEngine engine) {
-      new DafnyHelper(options, engine, args, filename, ProgramSource).DotGraph();
+    public Task DotGraph(DafnyOptions options, ExecutionEngine engine) {
+      return new DafnyHelper(options, engine, args, filename, ProgramSource).DotGraph();
     }
 
     public string EncodeProgram(out string json) {
@@ -82,26 +83,26 @@ public string EncodeProgram(out string json) {
       return Convert.ToBase64String(Encoding.UTF8.GetBytes(json));
     }
 
-    public void Marshal(string[] command) {
+    public void Marshal(TextWriter outputWriter, string[] command) {
       try {
         var b64Repr = EncodeProgram(out var json);
 
-        Console.WriteLine("# program source");
-        Console.Write(ProgramSource);
-        Console.WriteLine("# JSON encoding");
-        Console.WriteLine(json);
-        Console.WriteLine("# base64 encoding of JSON object");
-        Console.WriteLine(b64Repr);
+        outputWriter.WriteLine("# program source");
+        outputWriter.Write(ProgramSource);
+        outputWriter.WriteLine("# JSON encoding");
+        outputWriter.WriteLine(json);
+        outputWriter.WriteLine("# base64 encoding of JSON object");
+        outputWriter.WriteLine(b64Repr);
       } catch (Exception ex) {
         throw new ServerException("Serialization failed: {0}.", ex.Message);
       }
     }
 
-    public void Unmarshal(string[] command) {
-      Console.WriteLine($"# args: {Util.Comma(args)}");
-      Console.WriteLine($"# filename: {filename}");
-      Console.WriteLine($"# sourceIsFile: {sourceIsFile}");
-      Console.WriteLine(ProgramSource);
+    public void Unmarshal(TextWriter outputWriter, string[] command) {
+      outputWriter.WriteLine($"# args: {Util.Comma(args)}");
+      outputWriter.WriteLine($"# filename: {filename}");
+      outputWriter.WriteLine($"# sourceIsFile: {sourceIsFile}");
+      outputWriter.WriteLine(ProgramSource);
     }
   }
 }
diff --git a/Source/DafnyStandardLibraries/CONTRIBUTING.md b/Source/DafnyStandardLibraries/CONTRIBUTING.md
new file mode 100644
index 00000000000..deb127f3f27
--- /dev/null
+++ b/Source/DafnyStandardLibraries/CONTRIBUTING.md
@@ -0,0 +1,153 @@
+# Guidelines for Contributing to the Dafny Standard Libraries
+
+If you're looking to make a big impact on the Dafny community,
+you've come to the right place.
+Reusable, general-purpose utilities are extremely valuable for any programming language,
+but especially so for Dafny,
+where we can save users the hard work of proving these utilities correct as well.
+
+This document augments the [general guidelines on contributing to Dafny](../../CONTRIBUTING.md).
+The general structure and automation of the surrounding Dafny implementation
+takes care of a lot of the requirements on standard libraries automatically,
+but there are a few additional points to be aware of.
+
+## Standard library standards
+
+This project tries to be an exemplar of Dafny development practices,
+both to ensure a high level of quality of the libraries themselves,
+and for other Dafny projects to imitate.
+It tries to minimize how dependent it is on the mechanisms for ensuring the quality
+of Dafny itself, since these techniques overlap but have different requirements.
+It does not make use of LIT-style integration tests, for example,
+but tries to make use of generally-available Dafny features and tooling instead.
+
+### Examples and tests
+
+Basic examples and/or tests are mandatory, for several reasons:
+
+* Helping to explain the functionality of the library;
+* Helping to ensure the specifications are actually useable,
+  guarding against things like pre-conditions that are difficult or impossible to satisfy; and
+* Ensuring the implementation actually works on all Dafny backends.
+
+The build process uses `dafny test` against each stable Dafny backend, 
+so use `{:test}` and `expect` rather than `print` to check results.
+For some libraries having examples and tests that only use lemmas
+to check things are provable are reasonable,
+and it's fine if `dafny test` only ends up checking that verification succeeds,
+but avoid non-ghost code that cannot be compiled.
+
+To see the runtime coverage of the examples and tests,
+run `make coverage` and then open the 
+`build/testcoverage/<most recent timestamp>/index_tests_actual.html` file.
+
+### Documentation
+
+Make sure there is a top-level `*.md` file for the library,
+even just as a simple landing page,
+linked from the root [README.md](README.md) for this project.
+Having documentation in either separate Markdown files or Dafny docstrings
+is just fine. Do not add docstrings that simply repeat the information
+in the signature of a declaration just for the sake of having a docstring.
+
+The build process for this project uses a [`check-examples`](scripts/check-examples) script
+to automatically test that code snippets are valid.
+Make sure to add the necessary directives such as `<!-- %check-verify -->`!
+Note that this copy of `check-examples` is different from the one in the top-level Scripts directory,
+which generates LIT-style Dafny integration tests instead.
+
+### Style and formatting
+
+As much as possible, follow the [Dafny Style Guide](https://dafny.org/dafny/StyleGuide/Style-Guide).
+The build process applies `dafny format` to all source.
+
+### Packaging
+
+The standard libraries are built together into multiple `DafnyStandardLibraries*.doo` files,
+which are included as embedded resources in `DafnyPipeline.dll`.
+These are then added as additional implicit source files when `--standard-libraries` is switched on.
+Having multiple `.doo` files allows each of them to be verified with different flags,
+such as `--disable-nonlinear-arithmetic`.
+This doesn't affect the end user experience, as Dafny checks that each `.doo` file
+is compatible with the current set of options independently,
+and the source of the definitions doesn't matter to the code consuming them.
+
+Some standard libraries depend on `{:extern}`-ally implemented functionality, such as `FileIO`.
+Because the `{:extern}` attribute needs to be defined differently for different backends,
+the build creates a `DafnyStandardLibraries-<target id>.doo` file
+for each supported target language.
+Each is included only when compiling to that target language, 
+using the `build`, `translate`, `run` or `test` Dafny CLI commands
+(or the equivalent modes of the legacy CLI).
+
+There is also a `DafnyStandardLibraries-notarget.doo` file used when NOT compiling,
+which provides only the bodyless interface declaration.
+Each of the `.doo` files for the target languages
+replace the bodyless declarations with the actual implementations, backed by externs.
+The current approach is sound but will not scale well in the future,
+since it repeatedly verifies the common code that consumes the abstract interface
+for each target language.
+A [pending language enhancement](https://github.com/dafny-lang/dafny/pull/4681) will likely address this point.
+
+All target language files in this project are also embedded in the `DafnyPipeline.dll`.
+When `--standard-libraries` is switched on,
+these source files are automatically emitted when compiling,
+just like the contents of each backend's runtime.
+
+See [Makefile](Makefile) and [src/Std/TargetSpecific/Makefile](src/Std/TargetSpecific/Makefile) for more details.
+
+
+### On brittleness
+
+There are two sides to brittleness relevant to this project:
+
+**Brittleness of the standard libraries**: This project uses the current 
+[best known defense against brittleness](https://dafny.org/dafny/DafnyRef/DafnyRef#sec-brittle-verification):
+enforcing a tight upper-bound on the resources needed to verify each batch of assertions.
+For simplicitly, this project just sets a direct `--resource-limit`,
+rather than relying on the second-pass approach of the `dafny-reportgenerator`.
+This limit is set aggressively low in the hopes that we can maintain it
+even as new libraries are added, which means some existing code
+will need to be refactored somewhat to be added here.
+
+The downside of this approach is that it can be challenging to know when code is actually correct
+but cannot be verified efficiently enough.
+Feel free to temporarily raise this limit when developing libraries,
+but we should be very resistant to raising the limit in the checked in copy.
+
+**Brittleness of code using the standard libraries**: This one is tougher.
+There is tension between two different use cases:
+
+* New users of Dafny get a much better experience with libraries that make heavier use of Dafny's automation:
+  not making most definitions opaque, including useful instrinsic specifications, and so on.
+  This lets folks just starting with Dafny experience the joy of a proven-correct example
+  much quicker, and providing basic utilities like `Option<T>` and `Seq.Filter` that Just Work
+  are a big part of this pleasant and encouraging experience.
+* Mature Dafny projects need to worry about their own brittleness,
+  and would prefer all definitions are opaque and all specifications extrinsic instead.
+
+For now, these libraries are more focused on the first use case,
+but should plan for a smooth migration process to support the second better in the future.
+
+Note the examples also specify a resource limit,
+which is important to help reduce how much brittleness these libraries
+inflict on consumers.
+
+## Importing from dafny-lang/libraries
+
+There are a couple of things to watch out for when importing libraries from the
+[dafny-lang/libraries](https://github.com/dafny-lang/libraries) repository:
+
+* Several libraries have two copies in `dafny-lang/libraries`: one under `src`,
+  and one under `src/dafny`. The latter is a copy refactored to nest all modules under a top-level
+  `Dafny` module to reduce the risk of naming conflicts. This is a great idea,
+  but it turns out that using "Dafny" conflicts with some Dafny runtime symbols,
+  so these libraries use `Std` instead. You will probably find you have to adjust
+  documentation examples accordingly.
+
+  When the latter copy exists, prefer to use it along with its the Markdown documentation,
+  but check that there aren't significant differences between the two versions.
+* `dafny-lang/libraries` relies on LIT for testing, but this project uses mostly `dafny test`.
+  It should be possible to refactor existing example or test files to the latter approach:
+  see [WrappersExamples.dfy](examples/WrappersExamples.dfy) compared to
+  https://github.com/dafny-lang/libraries/blob/master/examples/WrappersExamples.dfy for example.
diff --git a/Source/DafnyStandardLibraries/Makefile b/Source/DafnyStandardLibraries/Makefile
new file mode 100644
index 00000000000..ac2a52d50d7
--- /dev/null
+++ b/Source/DafnyStandardLibraries/Makefile
@@ -0,0 +1,64 @@
+
+# Invoking the CLI this way just to stay platform-independent
+DAFNY = dotnet run --project ../Dafny --no-build --roll-forward LatestMajor --
+
+NO_VERIFY := false # Use make update-binary NO_VERIFY=true to generate the binaries without verification
+DOO_FILE_SOURCE=build/DafnyStandardLibraries.doo
+DOO_FILE_TARGET=binaries/DafnyStandardLibraries.doo
+
+all: check-binary test check-format check-examples
+
+verify:
+	$(DAFNY) verify src/Std/dfyconfig.toml
+	make -C src/Std/TargetSpecific verify-all
+
+build-binary:
+	$(DAFNY) build -t:lib --hidden-no-verify=$(NO_VERIFY) src/Std/dfyconfig.toml --output:${DOO_FILE_SOURCE}
+
+check-binary: build-binary
+	unzip -o ${DOO_FILE_SOURCE} -d build/current
+	unzip -o ${DOO_FILE_TARGET} -d build/previous
+	diff build/previous build/current 
+	make -C src/Std/TargetSpecific check-binary-all
+
+update-binary: build-binary
+	cp ${DOO_FILE_SOURCE} ${DOO_FILE_TARGET}
+	make -C src/Std/TargetSpecific update-binary-all
+# Rebuild Dafny to pick up the new embedded assets
+	dotnet build ../Dafny.sln
+
+# For now we only have examples and no dedicated tests.
+# We will likely want a test directory as well,
+# with deeper coverage of module functionality.
+
+test-cs:
+	$(DAFNY) test -t:cs examples/dfyconfig.toml examples/BoundedInts/NonDefault.cs --output:build/stdlibexamples --coverage-report:build/testcoverage
+
+test-java:
+	$(DAFNY) test -t:java examples/dfyconfig.toml examples/BoundedInts/Externs/NonDefault.java --output:build/stdlibexamples
+
+test-go:
+	$(DAFNY) test -t:go examples/dfyconfig.toml examples/BoundedInts/NonDefault.go --output:build/stdlibexamples
+
+test-py:
+	$(DAFNY) test -t:py examples/dfyconfig.toml examples/BoundedInts/NonDefault.py --output:build/stdlibexamples
+
+test-js:
+	$(DAFNY) test -t:js examples/dfyconfig.toml examples/BoundedInts/NonDefault.js --output:build/stdlibexamples
+
+test: test-cs test-java test-go test-py test-js
+
+# We only generate coverage from the C# tests
+coverage: test-cs
+
+format:
+	$(DAFNY) format .
+
+check-format:
+	$(DAFNY) format . --check
+
+check-examples:
+	cd build && ../scripts/check-examples `find .. -name '*.md'`
+
+clean:
+	rm -rf build
diff --git a/Source/DafnyStandardLibraries/README.md b/Source/DafnyStandardLibraries/README.md
new file mode 100644
index 00000000000..d95a6d4ee07
--- /dev/null
+++ b/Source/DafnyStandardLibraries/README.md
@@ -0,0 +1,73 @@
+# Dafny Standard Libraries
+
+This project contains the source for the standard libraries
+that are packaged together with the Dafny distribution.
+The libraries in this directory are available automatically
+when you provide the `--standard-libraries` option.
+No need to `include` any files! For example:
+
+<!-- %check-verify -->
+```dafny
+module UsesWrappers {
+
+  import opened Std.Wrappers
+
+  function SafeDiv(a: int, b: int): Option<int> {
+    if b == 0 then None else Some(a/b)
+  }
+
+  method Main() {
+    print SafeDiv(4, 2), "\n";
+    print SafeDiv(7, 0), "\n";
+  }
+}
+```
+
+These libraries are verified ahead of time before adding them to the Dafny tooling,
+so switching on this option by itself does not incur any additional verification burden for your Dafny code.
+
+When using this option with commands like `dafny translate`, `dafny build`, or `dafny run`,
+the contents of the standard libraries will be automatically included in the translated source code as well. 
+This causes conflicts when multiple such translated projects are combined. When combining such projects, please ensure that only one of them has `--translate-standard-library` set to true. 
+
+To combine multiple Dafny projects that were separately built, and were  
+
+Some libraries are dependent on target language utilities, such as `FileIO`.
+When `--standard-libraries` is on,
+the translation process will also include some additional supporting target language source files,
+just as the runtime source is emitted unless `--include-runtime` is off.
+These libraries may not be available for all supported languages,
+and are simply not defined when translating to those languages.
+
+Because the standard libraries are already pre-verified, `--standard-libraries` is not compatible with all options,
+since mixing and matching some options that affect verification across different components is not always safe.
+In particular, `--standard-libraries` currently cannot be used together with `--unicode-char:false`.
+
+## Available libraries
+
+The sections below describe how to use each library:
+
+- [Std.Arithmetic](src/Std/Arithmetic/README.md) -- utilities and lemmas related to basic operations, such as multiplication and exponentiation
+- [Std.Base64](src/Std/Base64.md) -- base-64 encoding and decoding
+- [Std.BoundedInts](src/Std/BoundedInts.md) -- definitions of types and constants for fixed-bit-width integers
+- [Std.Collections](src/Std/Collections/Collections.md) -- properties of the built-in collection types (seq, set, iset, map, imap, array)
+- [Std.Concurrent](src/Std/TargetSpecific) -- types for using Dafny in concurrent environments
+- [Std.DynamicArray](src/Std/DynamicArray.dfy) -- an array that can grow and shrink
+- [Std.FileIO](src/Std/TargetSpecific) -- basic file I/O operations
+- [Std.Functions](src/Std/Functions.md) -- properties of functions
+- [Std.JSON](src/Std/JSON/JSON.md) -- JSON serialization and deserialization
+- [Std.Math](src/Std/Math.md) -- common mathematical functions, such as Min and Abs
+- [Std.Relations](src/Std/Relations.md) -- properties of relations
+- [Std.Strings](src/Std/Strings.md) -- utilities for strings, especially converting to and from string representations of common types
+- [Std.Unicode](src/Std/Unicode/Unicode.md) -- implementations of basic algorithms from Unicode 15.0
+- [Std.Wrappers](src/Std/Wrappers.md) -- simple datatypes to support common patterns, such as optional values or the result of operations that can fail
+
+## Backwards compatibility
+
+Because these libraries are packaged together with a specific version of Dafny,
+they are not versioned themselves, and instead are updated to continue to work as Dafny itself changes.
+Intentional breaking changes will be minimized and accompanied by clear and direct migration instructions.
+
+## Contributing to the libraries
+
+See [CONTRIBUTING.md](CONTRIBUTING.md).
diff --git a/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-arithmetic.doo b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-arithmetic.doo
new file mode 100644
index 00000000000..c94fa31eed9
Binary files /dev/null and b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-arithmetic.doo differ
diff --git a/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-cs.doo b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-cs.doo
new file mode 100644
index 00000000000..1598ce4c4e2
Binary files /dev/null and b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-cs.doo differ
diff --git a/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-go.doo b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-go.doo
new file mode 100644
index 00000000000..350a65d0570
Binary files /dev/null and b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-go.doo differ
diff --git a/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-java.doo b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-java.doo
new file mode 100644
index 00000000000..a64d033da4e
Binary files /dev/null and b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-java.doo differ
diff --git a/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-js.doo b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-js.doo
new file mode 100644
index 00000000000..f407326970d
Binary files /dev/null and b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-js.doo differ
diff --git a/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-notarget.doo b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-notarget.doo
new file mode 100644
index 00000000000..0c0eece2130
Binary files /dev/null and b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-notarget.doo differ
diff --git a/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-py.doo b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-py.doo
new file mode 100644
index 00000000000..843b78fbd3a
Binary files /dev/null and b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries-py.doo differ
diff --git a/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries.doo b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries.doo
new file mode 100644
index 00000000000..a934371b210
Binary files /dev/null and b/Source/DafnyStandardLibraries/binaries/DafnyStandardLibraries.doo differ
diff --git a/Source/DafnyStandardLibraries/examples/Arithmetic/ArithmeticExamples.dfy b/Source/DafnyStandardLibraries/examples/Arithmetic/ArithmeticExamples.dfy
new file mode 100644
index 00000000000..ced9928bb33
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/Arithmetic/ArithmeticExamples.dfy
@@ -0,0 +1,90 @@
+module ArithmeticExamples {
+  import opened Std.Arithmetic.Logarithm
+  import opened Std.Arithmetic.Power
+  import opened Std.Arithmetic.Mul
+
+  /* log_b(m * n) = log_b(m) + log_b(n) if m and n are also powers of b */
+  lemma LogProductRule(b: nat, x: nat, y: nat)
+    requires b > 1
+    ensures (
+              LemmaPowPositive(b, x);
+              LemmaPowPositive(b, y);
+              LemmaMulIncreases(Pow(b, x), Pow(b, y));
+              Log(b, Pow(b, x) * Pow(b, y)) == Log(b, Pow(b, x)) + Log(b, Pow(b, y))
+            )
+  {
+    LemmaPowAdds(b, x, y);
+    LemmaLogPow(b, x + y);
+    LemmaLogPow(b, x);
+    LemmaLogPow(b, y);
+  }
+
+  module DecimalLittleEndian refines Std.Arithmetic.LittleEndianNat {
+    function BASE(): nat {
+      10
+    }
+
+    @Test
+    method TestFromNat() {
+      expect FromNat(0) == [];
+      expect FromNat(1) == [1];
+      expect FromNat(3) == [3];
+      expect FromNat(302) == [2, 0, 3];
+    }
+
+    @Test
+    method TestToNatRight() {
+      hide *;
+      reveal BASE;
+      expect ToNatRight([0]) == 0;
+      expect ToNatRight([1]) == 1;
+      expect ToNatRight([3]) == 3;
+      expect ToNatRight([3,0,2]) == 203;
+    }
+
+    @Test
+    @IsolateAssertions
+    method TestSeqExtend() {
+      expect SeqExtend([], 3) == [0, 0, 0];
+      expect SeqExtend([1], 3) == [1, 0, 0];
+      expect SeqExtend([3,0,2], 4) == [3,0,2,0];
+    }
+
+    @Test
+    method TestSeqExtendMultiple() {
+      hide *;
+      reveal BASE;
+      expect SeqExtendMultiple([], 3) == [0, 0, 0];
+      print "length: ", |SeqExtendMultiple([1, 2, 3], 3)|;
+      expect SeqExtendMultiple([1, 2], 3) == [1, 2, 0];
+      expect SeqExtendMultiple([1, 2, 3], 3) == [1, 2, 3, 0, 0, 0];
+      expect SeqExtendMultiple([3, 0, 2, 3], 3) == [3, 0, 2, 3, 0, 0];
+    }
+
+    @Test
+    method TestFromNatWithLen() {
+      reveal Pow();
+      expect FromNatWithLen(100, 4) == [0, 0, 1, 0];
+    }
+
+    @Test
+    method TestSeqZero() {
+      expect SeqZero(3) == [0, 0, 0];
+    }
+
+    @Test
+    method TestSeqAdd() {
+      expect SeqAdd([9,9,9],[9,9,9]) == ([8,9,9], 1);
+      expect SeqAdd([9,9,9],[0,0,0]) == ([9,9,9], 0);
+      expect SeqAdd([4,9,9],[5,0,0]) == ([9,9,9], 0);
+    }
+
+    @Test
+    method TestSeqSub() {
+      expect SeqSub([9,9,9],[0,0,0]) == ([9,9,9], 0);
+      expect SeqSub([9,9,9],[0,0,1]) == ([9,9,8], 0);
+      expect SeqSub([0],[1]) == ([9], 1);
+      expect SeqSub([0,0,0],[1,0,0]) == ([9,9,9], 1);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/Arithmetic/ArithmeticTests.dfy b/Source/DafnyStandardLibraries/examples/Arithmetic/ArithmeticTests.dfy
new file mode 100644
index 00000000000..616efa12539
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/Arithmetic/ArithmeticTests.dfy
@@ -0,0 +1,43 @@
+module ArithmeticTests {
+  import opened Std.Arithmetic.Logarithm
+  import opened Std.Arithmetic.Power
+  import opened Std.Arithmetic.Mul
+  import opened Std.Arithmetic.Power2
+  import opened Std.Arithmetic.MulInternals
+  import opened Std.Arithmetic.ModInternals
+  import opened Std.Arithmetic.DivInternals
+
+  @Test
+  method TestMul() {
+    for i := -10 to 10 {
+      for j := -10 to 10 {
+        expect MulRecursive(i, j) == i * j;
+      }
+    }
+  }
+
+  @Test
+  @IsolateAssertions
+  method TestPowLog() {
+    expect Pow(-4, 0) == 1;
+    expect Pow(-2, 2) == 4;
+    expect Pow(-2, 3) == -8;
+    expect Pow2(3) == 8;
+
+    expect Log(5, 0) == 0;
+    expect Log(2, Pow2(5)) == 5;
+  }
+
+  @Test
+  method TestDiv() {
+    expect DivRecursive(5, 3) == 1;
+    expect DivRecursive(-3, 5) == -1;
+    expect DivRecursive(-3, -5) == 1;
+  }
+
+  @Test
+  method TestMod() {
+    expect ModRecursive(5, 3) == 2;
+    expect ModRecursive(-3, 5) == 2;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/Base64Examples.dfy b/Source/DafnyStandardLibraries/examples/Base64Examples.dfy
new file mode 100644
index 00000000000..1ab519ed9d9
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/Base64Examples.dfy
@@ -0,0 +1,54 @@
+module Base64Examples {
+  import opened Std.Base64
+  import opened Std.BoundedInts
+  import opened Std.Wrappers
+
+  method CheckEncodeDecode(uints: seq<uint8>, bytes: seq<bv8>) {
+    expect Decode(Encode(uints)) == Success(uints);
+    expect DecodeBV(EncodeBV(bytes)) == Success(bytes);
+  }
+
+  @Test
+  method TestRoundTripEmpty() {
+    CheckEncodeDecode([], []);
+  }
+
+  @Test
+  method TestRoundTripOne() {
+    CheckEncodeDecode([0], [0]);
+  }
+
+  @Test
+  method TestRoundTripTwo() {
+    CheckEncodeDecode([1, 2], [3, 4]);
+  }
+
+  @Test
+  method TestRoundTripThree() {
+    CheckEncodeDecode([112, 234], [43, 76]);
+  }
+
+  @Test
+  method TestRoundTripMedium() {
+    var medUints := seq(512, i => (i % 256) as uint8);
+    var medBytes := seq(512, i => (i % 256) as bv8);
+    CheckEncodeDecode(medUints, medBytes);
+  }
+
+  // TODO: even this size is too big to practically test for Go and JS
+  /*
+  @Test
+  method TestRoundTripBig() {
+    // Larger sizes are unfortunately pretty slow. An
+    // optimized implementation seems worthwhile.
+    var bigUints := seq(438530, _ => 76);
+    var bigBytes := seq(438530, _ => 45);
+    CheckEncodeDecode(bigUints, bigBytes);
+  }
+  */
+
+  @Test
+  method TestDecodeFail() {
+    expect Decode("$&^*(_)").Failure?;
+  }
+}
diff --git a/Source/DafnyStandardLibraries/examples/BoundedIntExamples.dfy b/Source/DafnyStandardLibraries/examples/BoundedIntExamples.dfy
new file mode 100644
index 00000000000..c6d3e5625cd
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/BoundedIntExamples.dfy
@@ -0,0 +1,23 @@
+import opened Std.BoundedInts
+
+lemma BoundedIntUser(x: uint32, z: nat16)
+  ensures TWO_TO_THE_15 * 2 == TWO_TO_THE_16
+  ensures 0 <= (x as int) < TWO_TO_THE_32
+{
+  var y: uint64 := x as int as uint64;
+  var int16 := z as int as int16;
+  var uint16 := z as int as uint16;
+}
+
+@Test
+method UseExterns() {
+  var squareOf8 := Externs.NonDefault.SquareNativeInt(8);
+  expect squareOf8 == 64;
+}
+
+module {:extern} {:dummyImportMember "NonDefault", true} Externs {
+  import opened Std.BoundedInts
+  class {:extern} NonDefault {
+    static method {:extern} SquareNativeInt(i: int32) returns (r: int32)
+  }
+}
diff --git a/Source/DafnyStandardLibraries/examples/BoundedInts/Externs/NonDefault.java b/Source/DafnyStandardLibraries/examples/BoundedInts/Externs/NonDefault.java
new file mode 100644
index 00000000000..96dc81fbcf6
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/BoundedInts/Externs/NonDefault.java
@@ -0,0 +1,7 @@
+package Externs;
+
+public class NonDefault {
+  public static int SquareNativeInt(int i) {
+    return i * i;
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.cs b/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.cs
new file mode 100644
index 00000000000..994d9738b95
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.cs
@@ -0,0 +1,7 @@
+namespace Externs {
+  partial class NonDefault {
+    public static int SquareNativeInt(int i) {
+      return i * i;
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.go b/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.go
new file mode 100644
index 00000000000..52a3328c913
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.go
@@ -0,0 +1,8 @@
+package Externs
+
+type NonDefault struct{}
+var Companion_NonDefault_ = NonDefault{}
+
+func (NonDefault) SquareNativeInt(i int32) (int32) {
+  return i * i
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.js b/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.js
new file mode 100644
index 00000000000..2ba407e3872
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.js
@@ -0,0 +1,11 @@
+let Externs = (function() {
+    let $module = {};
+
+    $module.NonDefault = class NonDefault {
+        static SquareNativeInt(i) {
+            return i * i;
+        }
+    };
+    
+    return $module;
+})();
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.py b/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.py
new file mode 100644
index 00000000000..c63c7d36f3e
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/BoundedInts/NonDefault.py
@@ -0,0 +1,6 @@
+# Module: Externs
+
+class NonDefault:
+    @staticmethod
+    def SquareNativeInt(i):
+        return i * i
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/CollectionsExamples.dfy b/Source/DafnyStandardLibraries/examples/CollectionsExamples.dfy
new file mode 100644
index 00000000000..a872250d977
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/CollectionsExamples.dfy
@@ -0,0 +1,236 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+module CollectionsExamples {
+
+  // These examples focus mainly on execution testing coverage,
+  // but they also use AssertAndExpect to prove some of the simpler cases as well.
+  // If and when we have some way of measuring "specification coverage",
+  // this pattern should help with that kind of coverage as well.
+  //
+  // There are lots of small test methods here,
+  // which besides following the general best practice
+  // of testing one or perhaps a couple of related things at once,
+  // helps to keep the verification cost from running away too much.
+
+  module SeqExamples {
+
+    import opened Std.Wrappers
+    import opened Std.Collections.Seq
+    import opened Helpers
+
+    // A sequence that's long enough to be non-trivial
+    // but short enough to support lots of verification of results.
+    const s := [1, 1, 2, 3, 5, 8, 13, 21]
+
+    @Test
+    method TestSequenceBasics() {
+      AssertAndExpect(First(s) == 1);
+      AssertAndExpect(DropFirst(s) == [1, 2, 3, 5, 8, 13, 21]);
+      AssertAndExpect(Last(s) == 21);
+      AssertAndExpect(DropLast(s) == [1, 1, 2, 3, 5, 8, 13]);
+
+      var asArray := ToArray(s);
+      AssertAndExpect(asArray[..] == s);
+      AssertAndExpect(reveal ToSet(); ToSet(s[1..]) == {1, 2, 3, 5, 8, 13, 21});
+    }
+
+    @Test
+    method TestSequenceIndexOf() {
+      hide *;
+      reveal s;
+      AssertAndExpect(IndexOf(s, 5) == 4);
+      expect IndexOf(s, 1) == 0;
+      AssertAndExpect(IndexOfOption(s, 5) == Some(4));
+      AssertAndExpect(IndexOfOption(s, 42) == None);
+      expect IndexByOption(s, x => x % 2 == 0) == Some(2);
+      AssertAndExpect(IndexByOption(s, x => 100 < x) == None);
+    }
+
+    @Test
+    method TestSequenceLastIndexOf() {
+      AssertAndExpect(LastIndexOf(s, 5) == 4);
+      expect LastIndexOf(s, 1) == 1;
+      AssertAndExpect(LastIndexOfOption(s, 5) == Some(4));
+      AssertAndExpect(LastIndexOfOption(s, 42) == None);
+    }
+
+    @Test
+    method TestSequenceAddOrRemove() {
+      expect Insert(s, 42, 1) == [1, 42, 1, 2, 3, 5, 8, 13, 21];
+      expect Remove(s, 5) == [1, 1, 2, 3, 5, 13, 21];
+      expect RemoveValue(s, 5) == [1, 1, 2, 3, 8, 13, 21];
+      expect RemoveValue(s, 42) == [1, 1, 2, 3, 5, 8, 13, 21];
+    }
+
+    @Test
+    method TestRepeat() {
+      AssertAndExpect(Repeat(42, 5) == [42, 42, 42, 42, 42]);
+    }
+
+    @Test
+    method TestReverse() {
+      AssertAndExpect(Reverse(s) == [21, 13, 8, 5, 3, 2, 1, 1]);
+    }
+
+    @Test
+    method TestZipping() {
+      AssertAndExpect(Zip([1, 2, 3], [4, 5, 6]) == [(1, 4), (2, 5), (3, 6)]);
+      AssertAndExpect(Unzip([(1, 4), (2, 5), (3, 6)]) == ([1, 2, 3], [4, 5, 6]));
+    }
+
+    @Test
+    method TestMaxMin() {
+      expect Max(s) == 21;
+      expect Min(s) == 1;
+    }
+
+    @Test
+    method TestFlatten() {
+      AssertAndExpect(Flatten([[1, 1, 2], [3, 5], [], [8, 13, 21]]) == s);
+      AssertAndExpect(FlattenReverse([[1, 1, 2], [3, 5], [], [8, 13, 21]]) == s);
+      AssertAndExpect(Flatten([]) == "");
+      AssertAndExpect(Flatten(["aaa", "bbb", "ccc"]) == "aaabbbccc");
+    }
+
+    @Test
+    method TestJoin() {
+      AssertAndExpect(Join([], ",") == "");
+      AssertAndExpect(Join(["0", "1", "2"], ",") == "0,1,2");
+    }
+
+    @Test
+    method TestSplit() {
+      expect Split("0,1,2", ',') == ["0", "1", "2"];
+      expect Split("0 1  2", ' ') == ["0", "1", "", "2"];
+    }
+
+    @Test
+    method TestMapFilter() {
+      AssertAndExpect(Map(x => x * 2, s) == [2, 2, 4, 6, 10, 16, 26, 42]);
+
+      var failIfThirteen := x => if x != 13 then Success(x + 2) else Failure("I said NOT thirteen");
+      expect MapWithResult(failIfThirteen, [1, 2, 3]) == Success([3, 4, 5]);
+      expect MapWithResult(failIfThirteen, s) == Failure("I said NOT thirteen");
+
+      expect Filter(x => x % 2 == 0, s) == [2, 8];
+    }
+
+    @Test
+    method TestFolding() {
+      expect FoldLeft((x, y) => x + y, 0, s) == 54;
+      expect FoldLeft((x, y) => x + [y], [], s) == s;
+
+      expect FoldRight((x, y) => x + y, s, 0) == 54;
+      expect FoldRight((x, y) => [x] + y, [], s) == s;
+    }
+
+    @Test
+    method TestSetToSeq() {
+      var mySet := {4, 1, 56, -6};
+      var asSeq := SetToSeq(mySet);
+      var backToSet := ToSet(asSeq);
+      expect backToSet == mySet;
+    }
+
+    @Test
+    method TestSorting() {
+      expect MergeSortBy((x, y) => x <= y, Reverse(s)) == s;
+
+      var asSet := ToSet(s);
+      var asSortedSeq := SetToSortedSeq(asSet, (x, y) => x <= y);
+      expect asSortedSeq == [1, 2, 3, 5, 8, 13, 21];
+    }
+  }
+
+  module SetExamples {
+
+    import opened Std.Wrappers
+    import opened Std.Collections.Set
+    import opened Helpers
+
+    @Test
+    method TestSetRange() {
+      expect SetRange(5, 10) == {5, 6, 7, 8, 9};
+      expect SetRangeZeroBound(5) == {0, 1, 2, 3, 4};
+    }
+
+    @Test
+    method TestExtractFromSingleton() {
+      AssertAndExpect(ExtractFromSingleton({42}) == 42);
+    }
+
+    @Test
+    method TestMapFilter() {
+      expect Map(x => x + 2, {1, 2, 3}) == {3, 4, 5};
+      expect Filter(x => x % 2 == 0, {1, 2, 3, 4, 5}) == {2, 4};
+    }
+  }
+
+  module MapsExamples {
+
+    import opened Std.Wrappers
+    import opened Std.Collections.Map
+    import opened Helpers
+
+    const m := map[1 := 10, 2 := 20, 3 := 30]
+
+    @Test
+    method TestBasics() {
+      AssertAndExpect(Get(m, 2) == Some(20));
+      AssertAndExpect(Get(m, 42) == None);
+
+      expect ToImap(m) == imap[1 := 10, 2 := 20, 3 := 30];
+    }
+
+    @Test
+    method TestOperations() {
+      expect Remove(m, 2) == map[1 := 10, 3 := 30];
+      expect RemoveKeys(m, {1, 3}) == map[2 := 20];
+      expect Restrict(m, {1, 3}) == map[1 := 10, 3 := 30];
+      expect Union(m, map[3 := 300, 4 := 400]) == map[1 := 10, 2 := 20, 3 := 300, 4 := 400];
+    }
+  }
+
+  module ImapsExamples {
+
+    import opened Std.Wrappers
+    import opened Std.Collections.Imap
+    import opened Helpers
+
+    const m := imap[1 := 10, 2 := 20, 3 := 30]
+
+    @Test
+    method TestBasics() {
+      AssertAndExpect(Get(m, 2) == Some(20));
+      AssertAndExpect(Get(m, 42) == None);
+    }
+  }
+
+
+  module ArraysExamples {
+
+    import opened Std.Wrappers
+    import opened Std.Relations
+    import opened Std.Collections.Array
+    import opened Helpers
+
+    @Test
+    method TestBinarySearch() {
+      var a := new int[] [1, 1, 2, 3, 5, 8, 13, 21];
+      var lessThan := (x, y) => x < y;
+
+      var r := BinarySearch(a, 8, lessThan);
+      expect r == Some(5);
+
+      r := BinarySearch(a, 0, lessThan);
+      expect r == None;
+
+      r := BinarySearch(a, 22, lessThan);
+      expect r == None;
+    }
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/examples/ConcurrentExamples.dfy b/Source/DafnyStandardLibraries/examples/ConcurrentExamples.dfy
new file mode 100644
index 00000000000..bb50ec4ba6a
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/ConcurrentExamples.dfy
@@ -0,0 +1,267 @@
+module ConcurrentExamples {
+
+  import opened Std.Concurrent
+  import opened Std.Wrappers
+  import opened Std.BoundedInts
+  import opened Helpers
+
+  const p1: nat -> bool := _ => true
+  const p2: (nat, nat) -> bool := (_, _) => true
+  const p3: (char, nat) -> bool := (_, _) => true
+  const p4: (Copy, nat) -> bool := (_, _) => true
+  // const p5: (object?, nat) -> bool := (_, _) => true
+  const p6: (string, nat) -> bool := (_, _) => true
+  const p7: (bytes, nat) -> bool := (_, _) => true
+
+  datatype Copy = A | B
+
+  class Application {
+    const mutex: Lock
+    const box: AtomicBox<nat>
+    const primary: MutableMap<nat, nat>
+    const secondaryA: MutableMap<nat, nat>
+    const secondaryB: MutableMap<nat, nat>
+
+    constructor ()
+      ensures ValidLockState()
+      ensures fresh({mutex, box, primary, secondaryA, secondaryB})
+    {
+      mutex := new Lock();
+      box := new AtomicBox(p1, 0);
+      primary := new MutableMap(p2);
+      secondaryA := new MutableMap(p2);
+      secondaryB := new MutableMap(p2);
+    }
+
+    ghost predicate Valid()
+    {
+      box.inv == p1 && primary.inv == p2 && secondaryA.inv == p2 && secondaryB.inv == p2
+    }
+
+    ghost predicate ValidLockState()
+      reads this.mutex
+    {
+      Valid() && !mutex.isLocked
+    }
+
+    @Concurrent
+    method Write(n: nat)
+      reads {}
+      requires Valid()
+    {
+      box.Put(n);
+    }
+
+    @Concurrent
+    method Commit(slot: nat)
+      reads {}
+      requires Valid()
+      ensures Valid()
+    {
+      var value := box.Get();
+      primary.Put(slot, value);
+    }
+
+    @Concurrent
+    method Propagate(slot: nat)
+      reads {:assume_concurrent} mutex
+      requires ValidLockState()
+      modifies {:assume_concurrent} mutex
+      ensures ValidLockState()
+    {
+      mutex.Lock();
+      var val := primary.Get(slot);
+      if val.Some? {
+        secondaryA.Put(slot, val.value);
+      }
+      val := primary.Get(slot);
+      if val.Some? {
+        secondaryB.Put(slot, val.value);
+      }
+      mutex.Unlock();
+    }
+
+    @Concurrent
+    method Read(copy: Copy, slot: nat) returns (r: Option<nat>)
+      reads {}
+    {
+      match copy
+      case A => r := secondaryA.Get(slot);
+      case B => r := secondaryB.Get(slot);
+    }
+  }
+
+  @Test
+  method TestApplication() {
+    var a := new Application();
+    a.Write(0);
+    a.Commit(0);
+    a.Propagate(0);
+    var r := a.Read(A, 0);
+    expect(r == Some(0));
+  }
+
+  @Test
+  method TestKeys() {
+    var mmap := new MutableMap(p2);
+    var keys := mmap.Keys();
+    expect(keys == {});
+    mmap.Put(0, 0);
+    keys := mmap.Keys();
+    expect(keys == {0});
+  }
+
+  @Test
+  method TestHasKey() {
+    var mmap := new MutableMap(p2);
+    var b := mmap.HasKey(0);
+    expect(!b);
+    mmap.Put(0, 0);
+    b := mmap.HasKey(0);
+    expect(b);
+  }
+
+  @Test
+  method TestValues() {
+    var mmap := new MutableMap(p2);
+    var values := mmap.Values();
+    expect(values == {});
+    mmap.Put(0, 0);
+    values := mmap.Values();
+    expect(values == {0});
+  }
+
+  @Test
+  method TestItems() {
+    var mmap := new MutableMap(p2);
+    var items := mmap.Items();
+    expect(items == {});
+    mmap.Put(0, 0);
+    items := mmap.Items();
+    expect(items == {(0, 0)});
+  }
+
+  @Test
+  method TestPutGet() {
+    var mmap := new MutableMap(p2);
+    mmap.Put(0, 0);
+    var v := mmap.Get(0);
+    expect(v == Some(0));
+  }
+
+  @Test
+  method TestRemove() {
+    var mmap := new MutableMap(p2);
+    mmap.Put(0, 0);
+    var b := mmap.HasKey(0);
+    expect(b);
+    assert mmap.inv(1,1);
+    mmap.Remove(1);
+    b := mmap.HasKey(0);
+    expect(b);
+    mmap.Remove(0);
+    b := mmap.HasKey(0);
+    expect(!b);
+  }
+
+  @Test
+  method TestSize() {
+    var mmap := new MutableMap(p2);
+    var size := mmap.Size();
+    expect(size == 0);
+    mmap.Put(0, 0);
+    size := mmap.Size();
+    expect(size == 1);
+  }
+
+  @Test
+  method TestChar() {
+    var mmap := new MutableMap(p3);
+    var b := mmap.HasKey('A');
+    expect(!b);
+    mmap.Put('A', 0);
+    b := mmap.HasKey('A');
+    expect(b);
+  }
+
+  @Test
+  method TestDt() {
+    var mmap := new MutableMap(p4);
+    var b := mmap.HasKey(A);
+    expect(!b);
+    mmap.Put(A, 0);
+    b := mmap.HasKey(A);
+    expect(b);
+  }
+
+  @Test
+  method TestString() {
+    // Note that using separate string literals
+    // helps make it more likely that we will use distinct values
+    // at runtime, and ensure we get the equality semantics correct
+    // even if we use reference types for strings.
+    var mmap := new MutableMap(p6);
+    var b := mmap.HasKey("Hello world");
+    expect(!b);
+    mmap.Put("Hello world", 0);
+    b := mmap.HasKey("Hello world");
+    expect(b);
+  }
+
+  @Test
+  method TestBytes() {
+    var mmap := new MutableMap(p7);
+    var data: bytes := [0x1, 0x2, 0x3, 0x4];
+    var b := mmap.HasKey(data);
+    expect(!b);
+    mmap.Put(data, 0);
+    var dataCopy: bytes := [0x1, 0x2, 0x3, 0x4];
+    b := mmap.HasKey(dataCopy);
+    expect(b);
+  }
+
+  @Test
+  method TestBytesOptimized() {
+    var mmap := new MutableMap(p7, true);
+    var data: bytes := [0x1, 0x2, 0x3, 0x4];
+    var b := mmap.HasKey(data);
+    expect(!b);
+    var value := mmap.Get(data);
+    expect(value == None);
+
+    mmap.Put(data, 0);
+    var dataCopy: bytes := [0x1, 0x2] + [0x3, 0x4];
+    b := mmap.HasKey(dataCopy);
+    expect(b);
+
+    var data2: bytes := [0x5, 0x6];
+    mmap.Put(data2, 1);
+    value := mmap.Get(data2);
+    expect(value == Some(1));
+
+    var keys := mmap.Keys();
+    expect keys == {data, data2};
+    var values := mmap.Values();
+    expect values == {0, 1};
+    var items := mmap.Items();
+    expect items == {(data, 0), (data2, 1)};
+    var size := mmap.Size();
+    expect size == 2;
+
+    assert p7(data, 0);
+    mmap.Remove(data);
+    items := mmap.Items();
+    expect items == {(data2, 1)};
+  }
+
+  // does not work everywhere
+  // @Test method TestObject() {
+  //   var mmap := new MutableMap(p5);
+  //   var b := mmap.HasKey(null);
+  //   expect(!b);
+  //   mmap.Put(null, 0);
+  //   b := mmap.HasKey(null);
+  //   expect(b);
+  // }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/DynamicArrayExamples.dfy b/Source/DafnyStandardLibraries/examples/DynamicArrayExamples.dfy
new file mode 100644
index 00000000000..fe7f05f66cf
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/DynamicArrayExamples.dfy
@@ -0,0 +1,39 @@
+module DynamicArrayExamples {
+  import opened Std.DynamicArray
+  import opened Std.BoundedInts
+
+  @Test
+  method Ensure() {
+    var arr := new DynamicArray<int>();
+    arr.Ensure(100, 3);
+    for i: int := 0 to 100
+      invariant fresh(arr.Repr)
+      invariant arr.Valid?()
+      invariant arr.size as int == i
+      invariant arr.capacity >= 100
+    {
+      arr.PushFast(i);
+    }
+  }
+
+  @Test
+  method Push_At_Put_PopFast_PushFast() {
+    var arr := new DynamicArray<int>();
+    for i: int := 0 to 1000
+      invariant arr.Valid?()
+      invariant fresh(arr.Repr)
+      invariant arr.size as int == i
+    {
+      arr.Push(i);
+    }
+
+    expect arr.At(30) == 30;
+    arr.Put(30, 31);
+    expect arr.At(30) == 31;
+
+    arr.PopFast();
+    arr.PopFast();
+    arr.PushFast(3);
+    arr.PushFast(4);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/FileIO/ReadBytesFromFile.dfy b/Source/DafnyStandardLibraries/examples/FileIO/ReadBytesFromFile.dfy
new file mode 100644
index 00000000000..ea45b90dcbc
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/FileIO/ReadBytesFromFile.dfy
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+module ReadBytesFromFile {
+  import Std.FileIO
+
+  @Test
+  method Test() {
+    // TODO: extern function for the expected error prefix
+    theMain("examples/FileIO/../FileIO/data.txt", "");
+  }
+
+  method theMain(dataPath: string, expectedErrorPrefix: string) {
+
+      // Happy path: read from the data file, and check that we see the expected content.
+    {
+      var expectedStr := "Hello world\nGoodbye\n";
+      // This conversion is safe only for ASCII values. For Unicode conversions, see the Unicode modules.
+      var expectedBytes := seq(|expectedStr|, i requires 0 <= i < |expectedStr| => expectedStr[i] as int);
+
+      var res := FileIO.ReadBytesFromFile(dataPath);
+      expect res.Success?, "unexpected failure: " + res.error;
+
+      var readBytes := seq(|res.value|, i requires 0 <= i < |res.value| => res.value[i] as int);
+      expect readBytes == expectedBytes, "read unexpected byte sequence";
+    }
+
+      // Failure path: attempting to read from a blank file path should never work.
+    {
+      var res := FileIO.ReadBytesFromFile("");
+      expect res.Failure?, "unexpected success";
+      expect expectedErrorPrefix <= res.error, "unexpected error message: " + res.error;
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/examples/FileIO/WriteBytesToFile.dfy b/Source/DafnyStandardLibraries/examples/FileIO/WriteBytesToFile.dfy
new file mode 100644
index 00000000000..7f0bf61a6ba
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/FileIO/WriteBytesToFile.dfy
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+module WriteBytesToFile {
+  import Std.FileIO
+
+  @Test
+  method Test() {
+    // TODO: extern function for the expected error prefix
+    theMain("build/../build/fileioexamples", "");
+  }
+
+  @ResourceLimit("2e6")
+  method theMain(outputDir: string, expectedErrorPrefix: string) {
+
+      // Happy paths: write files to the output dir. (The %diff LIT commands check that we wrote the correct content.)
+    {
+      // Ideally we would define `str` as a constant and compute `bytes` automatically.
+      // To do so, we would need to convert each `char` in `str` to a `bv8` value, by using `as bv8`.
+      // But that triggers a bug in the Java compiler: <https://github.com/dafny-lang/dafny/issues/2942>.
+      // So for now we settle for manually writing out the desired `bytes`,
+      // and statically verifying that these values match the characters of `str`.
+      ghost var str := "Hello world\nGoodbye\n";
+      var bytes: seq<bv8> := [
+        // "Hello world\n"
+        0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x0a,
+        // "Goodbye\n"
+        0x47, 0x6f, 0x6f, 0x64, 0x62, 0x79, 0x65, 0x0a
+      ];
+      assert forall i | 0 <= i < |bytes| :: bytes[i] as int == str[i] as int;
+
+        // Write directly into the output directory
+      {
+        var res := FileIO.WriteBytesToFile(outputDir + "/output_plain", bytes);
+        expect res.Success?, "unexpected failure writing to output_plain: " + res.error;
+      }
+        // Ensure that nonexistent parent directories are created as necessary
+      {
+        var res := FileIO.WriteBytesToFile(outputDir + "/foo/bar/output_nested", bytes);
+        expect res.Success?, "unexpected failure writing to output_nested: " + res.error;
+      }
+        // Ensure that file paths with .. are handled correctly
+      {
+        var res := FileIO.WriteBytesToFile(outputDir + "/foo/bar/../output_up", bytes);
+        expect res.Success?, "unexpected failure writing to output_up: " + res.error;
+      }
+    }
+
+      // Failure path: attempting to write to a blank file path should never work.
+    {
+      var res := FileIO.WriteBytesToFile("", []);
+      expect res.Failure?, "unexpected success";
+      expect expectedErrorPrefix <= res.error, "unexpected error message: " + res.error;
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/examples/FileIO/data.txt b/Source/DafnyStandardLibraries/examples/FileIO/data.txt
new file mode 100644
index 00000000000..03acd5d37a3
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/FileIO/data.txt
@@ -0,0 +1,2 @@
+Hello world
+Goodbye
diff --git a/Source/DafnyStandardLibraries/examples/FunctionsExamples.dfy b/Source/DafnyStandardLibraries/examples/FunctionsExamples.dfy
new file mode 100644
index 00000000000..29692a15942
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/FunctionsExamples.dfy
@@ -0,0 +1,28 @@
+module FunctionExamples {
+
+  import opened Std.Functions
+
+  const square := (x: int) => x * x
+  lemma TestInjective()
+    ensures Injective<int, int>((x) => x + 2)
+    ensures !Injective<int, int>((x) => x * x)
+  {
+    assert square(-1) == square(1);
+  }
+
+  const subtract := (x: int, y: int) => x - y
+  lemma TestCommutative()
+    ensures Commutative<int, int>((x, y) => x + y)
+    ensures !Commutative<int, int>(subtract)
+  {
+    assert subtract(1,2) != subtract(2,1);
+  }
+
+  lemma TestAssociative()
+    ensures Associative<int>((x, y) => x + y)
+    ensures !Associative<int>(subtract)
+  {
+    assert subtract(1,2) != subtract(2,1);
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/Helpers.dfy b/Source/DafnyStandardLibraries/examples/Helpers.dfy
new file mode 100644
index 00000000000..1ad507cc477
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/Helpers.dfy
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+module Helpers {
+  import opened Std.Wrappers
+  // TODO: consider tweaking /testContracts to support this use case better.
+  method AssertAndExpect(p: bool, maybeMsg: Option<string> := None) requires p {
+    match maybeMsg {
+      case None => {
+        expect p;
+      }
+      case Some(msg) => {
+        expect p, msg;
+      }
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/examples/JSON/JSONExamples.dfy b/Source/DafnyStandardLibraries/examples/JSON/JSONExamples.dfy
new file mode 100644
index 00000000000..4ce316a3810
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/JSON/JSONExamples.dfy
@@ -0,0 +1,280 @@
+/** 
+ This library offers two APIs: a high-level one (giving abstract value trees
+ with no concrete syntactic details) and a low-level one (including all
+ information about blanks, separator positions, character escapes, etc.).
+ */
+
+/** High-level API (JSON values) */
+@Options("-functionSyntax:4")
+module AbstractSyntax {
+  import Std.JSON.API
+  import opened Std.JSON.Values
+  import opened Std.Wrappers
+  import opened Std.Unicode.UnicodeStringsWithUnicodeChar
+
+  /** 
+   The high-level API works with fairly simple datatype values that contain 
+   native Dafny strings. 
+   */
+  @Test
+  @ResourceLimit("100e6")
+  method Test() {
+
+    /**
+     Use `API.Deserialize` to deserialize a byte string.
+     For example, here is how to decode the JSON test `"[true]"`. (We need to
+     convert from Dafny's native strings to byte strings because Dafny does not
+     have syntax for byte strings; in a real application, we would be reading and
+     writing raw bytes directly from disk or from the network instead).
+     */
+    var SIMPLE_JS :- expect ToUTF8Checked("[true]");
+    var SIMPLE_VALUE := Array([Bool(true)]);
+    expect API.Deserialize(SIMPLE_JS) == Success(SIMPLE_VALUE);
+
+    /** 
+     Here is a larger object, written using a verbatim string (with `@"`).
+     In verbatim strings `""` represents a single double-quote character): 
+     */
+    var CITIES_JS :- expect ToUTF8Checked(@"{
+        ""Cities"": [
+          {
+            ""Name"": ""Boston"",
+            ""Founded"": 1630,
+            ""Population"": 689386,
+            ""Area (km2)"": 4584.2
+          }, {
+            ""Name"": ""Rome"",
+            ""Founded"": -753,
+            ""Population"": 2.873e6,
+            ""Area (km2)"": 1285
+          }, {
+            ""Name"": ""Paris"",
+            ""Founded"": null,
+            ""Population"": 2.161e6,
+            ""Area (km2)"": 2383.5
+          }
+        ]
+      }");
+    var CITIES_VALUE :=
+      Object([
+               ("Cities", Array([
+                Object([
+                ("Name", String("Boston")),
+                ("Founded", Number(Int(1630))),
+                ("Population", Number(Int(689386))),
+                ("Area (km2)", Number(Decimal(45842, -1)))
+                ]),
+                Object([
+                ("Name", String("Rome")),
+                ("Founded", Number(Int(-753))),
+                ("Population", Number(Decimal(2873, 3))),
+                ("Area (km2)", Number(Int(1285)))
+                ]),
+                Object([
+                ("Name", String("Paris")),
+                ("Founded", Null),
+                ("Population", Number(Decimal(2161, 3))),
+                ("Area (km2)", Number(Decimal(23835, -1)))
+                ])
+                ]))
+             ]);
+    expect API.Deserialize(CITIES_JS) == Success(CITIES_VALUE);
+
+    /** 
+     Serialization works similarly, with `API.Serialize`. For this first example
+     the generated string matches what we started with exactly:
+     */
+    expect API.Serialize(SIMPLE_VALUE) == Success(SIMPLE_JS);
+
+    /** 
+     For more complex object, the generated layout may not be exactly the same; 
+     note in particular how the representation of numbers and the whitespace have changed.
+    */
+    var EXPECTED :- expect ToUTF8Checked(
+      @"{""Cities"":[{""Name"":""Boston"",""Founded"":1630,""Population"":689386,""Area (km2)"":45842e-1},{""Name"":""Rome"",""Founded"":-753,""Population"":2873e3,""Area (km2)"":1285},{""Name"":""Paris"",""Founded"":null,""Population"":2161e3,""Area (km2)"":23835e-1}]}"
+    );
+    expect API.Serialize(CITIES_VALUE) == Success(EXPECTED);
+
+    /** 
+     Additional methods are defined in `API.dfy` to serialize an object into an
+     existing buffer or into an array. Below is the smaller example as a sanity check:
+     */
+    var CITY_JS :- expect ToUTF8Checked(@"{""Cities"": [{
+      ""Name"": ""Boston"",
+      ""Founded"": 1630,
+      ""Population"": 689386,
+      ""Area (km2)"": 4584.2}]}");
+
+    var CITY_VALUE :=
+      Object([("Cities", Array([
+               Object([
+               ("Name", String("Boston")),
+               ("Founded", Number(Int(1630))),
+               ("Population", Number(Int(689386))),
+               ("Area (km2)", Number(Decimal(45842, -1)))])]))]);
+
+    expect API.Deserialize(CITY_JS) == Success(CITY_VALUE);
+
+    var EXPECTED' :- expect ToUTF8Checked(
+      @"{""Cities"":[{""Name"":""Boston"",""Founded"":1630,""Population"":689386,""Area (km2)"":45842e-1}]}"
+    );
+
+    expect API.Serialize(CITY_VALUE) == Success(EXPECTED');
+  }
+}
+
+/** Low-level API (concrete syntax) */
+
+/** 
+ If you care about low-level performance, or about preserving existing
+ formatting as much as possible, you may prefer to use the lower-level API:
+ */
+@Options("-functionSyntax:4")
+module ConcreteSyntax {
+  import Std.JSON.ZeroCopy.API
+  import opened Std.Unicode.UnicodeStringsWithUnicodeChar
+  import opened Std.JSON.Grammar
+  import opened Std.Wrappers
+  import Std.Collections.Seq
+
+  /** 
+   The low-level API works with ASTs that record all details of formatting and
+   encoding: each node contains pointers to parts of a string, such that
+   concatenating the fields of all nodes reconstructs the serialized value.
+  */
+  @Test
+  @ResourceLimit("100e6")
+  method Test() {
+
+    /** 
+     The low-level API exposes the same functions and methods as the high-level
+     one, but the type that they consume and produce is `Grammar.JSON` (defined
+     in `Grammar.dfy` as a `Grammar.Value` surrounded by optional whitespace)
+     instead of `Values.JSON` (defined in `Values.dfy`). Since `Grammar.JSON` contains
+     all formatting information, re-serializing an object produces the original value:
+     */
+    var CITIES :- expect ToUTF8Checked(@"{
+        ""Cities"": [
+          {
+            ""Name"": ""Boston"",
+            ""Founded"": 1630,
+            ""Population"": 689386,
+            ""Area (km2)"": 4600
+          }, {
+            ""Name"": ""Rome"",
+            ""Founded"": -753,
+            ""Population"": 2.873e6,
+            ""Area (km2)"": 1285
+          }, {
+            ""Name"": ""Paris"",
+            ""Founded"": null,
+            ""Population"": 2.161e6,
+            ""Area (km2)"": 2383.5
+          }
+        ]
+      }");
+
+    var deserialized :- expect API.Deserialize(CITIES);
+    expect API.Serialize(deserialized) == Success(CITIES);
+
+    /** 
+     Since the formatting is preserved, it is also possible to write
+     minimally-invasive transformations over an AST. For example, let's replace
+     `null` in the object above with `"Unknown"`. First, we construct a JSON 
+     value for the string `"Unknown"`; this could be done by hand using 
+     `View.OfBytes()`, but using `API.Deserialize` is even simpler:
+    */
+    var UNKNOWN_JS :- expect ToUTF8Checked(@"""Unknown""");
+    var UNKNOWN :- expect API.Deserialize(UNKNOWN_JS);
+
+    /** 
+     `UNKNOWN` is of type `Grammar.JSON`, which contains optional whitespace and
+     a `Grammar.Value` under the name `UNKNOWN.t`, which we can use in the
+     replacement:
+    */
+    var without_null := deserialized.(t := ReplaceNull(deserialized.t, UNKNOWN.t));
+
+    /** 
+     Then, if we reserialize, we see that all formatting (and, in fact, all of
+     the serialization work) has been reused:
+    */
+    var expected_js :- expect ToUTF8Checked(@"{
+        ""Cities"": [
+          {
+            ""Name"": ""Boston"",
+            ""Founded"": 1630,
+            ""Population"": 689386,
+            ""Area (km2)"": 4600
+          }, {
+            ""Name"": ""Rome"",
+            ""Founded"": -753,
+            ""Population"": 2.873e6,
+            ""Area (km2)"": 1285
+          }, {
+            ""Name"": ""Paris"",
+            ""Founded"": ""Unknown"",
+            ""Population"": 2.161e6,
+            ""Area (km2)"": 2383.5
+          }
+        ]
+      }");
+    var actual_js :- expect API.Serialize(without_null);
+    expect actual_js == expected_js;
+  }
+
+  /** All that remains is to write the recursive traversal: */
+  function ReplaceNull(js: Value, replacement: Value): Value {
+    match js
+    /** Non-recursive cases are untouched: */
+    case Bool(_) => js
+    case String(_) => js
+    case Number(_) => js
+    /** `Null` is replaced with the new `replacement` value: */
+    case Null(_) => replacement
+    /** 
+     … and objects and arrays are traversed recursively (only the data part of is
+     traversed: other fields record information about the formatting of braces,
+     square brackets, and whitespace, and can thus be reused without
+     modifications):
+    */
+    case Object(obj) =>
+      Object(obj.(data := MapSuffixedSequence(obj.data, (s: Suffixed<jKeyValue, jcomma>) requires s in obj.data =>
+                                                s.t.(v := ReplaceNull(s.t.v, replacement)))))
+    case Array(arr) =>
+      Array(arr.(data := MapSuffixedSequence(arr.data, (s: Suffixed<Value, jcomma>) requires s in arr.data =>
+                                               ReplaceNull(s.t, replacement))))
+  }
+
+  /** 
+   Note that well-formedness criteria on the low-level AST are enforced using
+   subset types, which is why we need a bit more work to iterate over the
+   sequences of key-value paris and of values in objects and arrays.
+   Specifically, we need to prove that mapping over these sequences doesn't
+   introduce dangling punctuation (`NoTrailingSuffix`). We package this
+   reasoning into a `MapSuffixedSequence` function:
+  */
+  function MapSuffixedSequence<D, S>(sq: SuffixedSequence<D, S>, fn: Suffixed<D, S> --> D)
+    : SuffixedSequence<D, S>
+    requires forall suffixed | suffixed in sq :: fn.requires(suffixed)
+  {
+    // BUG(https://github.com/dafny-lang/dafny/issues/2184)
+    // BUG(https://github.com/dafny-lang/dafny/issues/2690)
+    var fn' := (sf: Suffixed<D, S>) requires (ghost var in_sq := sf => sf in sq; in_sq(sf)) => sf.(t := fn(sf));
+    Seq.Map(fn', sq)
+  }
+
+  lemma MapSuffixedSequenceNoTrailingSuffix<D, S>(sq: SuffixedSequence<D, S>, fn: Suffixed<D, S> --> D)
+    requires forall suffixed | suffixed in sq :: fn.requires(suffixed)
+    ensures NoTrailingSuffix(MapSuffixedSequence<D, S>(sq, fn))
+  {
+    var sq' := MapSuffixedSequence<D, S>(sq, fn);
+    forall idx | 0 <= idx < |sq'| ensures sq'[idx].suffix.Empty? <==> idx == |sq'| - 1 {
+      calc {
+        sq'[idx].suffix.Empty?;
+        sq[idx].suffix.Empty?;
+        idx == |sq| - 1;
+        idx == |sq'| - 1;
+      }
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/examples/JSON/JSONTests.dfy b/Source/DafnyStandardLibraries/examples/JSON/JSONTests.dfy
new file mode 100644
index 00000000000..c11b5442591
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/JSON/JSONTests.dfy
@@ -0,0 +1,138 @@
+abstract module AbstractWrapper {
+  import Std.Strings
+  import opened Std.BoundedInts
+  import opened Std.Unicode.UnicodeStringsWithUnicodeChar
+  import opened Std.JSON.Errors
+
+  type JSON
+
+  method Deserialize(bs: bytes) returns (js: DeserializationResult<JSON>)
+  method SpecSerialize(js: JSON) returns (bs: SerializationResult<bytes>)
+  method Serialize(js: JSON) returns (bs: SerializationResult<bytes>)
+  method Check(bs: bytes, js: JSON, bs': bytes, sbs': bytes, js': JSON)
+
+  method TestBytestring(bs: bytes, indent: string) {
+    var js  :- expect Deserialize(bs);
+    // print indent, "=> ", js, "\n";
+    var bs'  :- expect Serialize(js);
+    // print indent, "=> ", FromUTF8Checked(bs'), "\n";
+    var sbs' :- expect SpecSerialize(js);
+    // print indent, "=> ", FromUTF8Checked(sbs'), "\n";
+    var js'  :- expect Deserialize(bs');
+    Check(bs, js, bs', sbs', js');
+  }
+
+  method TestString(str: string, indent: string) {
+    var bs :- expect ToUTF8Checked(str);
+    TestBytestring(bs, indent);
+  }
+
+  method TestStrings(vectors: seq<string>) {
+    for i := 0 to |vectors| {
+      var input := vectors[i];
+      var idx := Strings.OfInt(i);
+      var indent := seq(|idx| + 1, _ => ' ');
+      // print "[", idx, "]: ", input, "\n";
+      TestString(input, indent);
+      // print "\n";
+    }
+  }
+}
+
+module ZeroCopyWrapper refines AbstractWrapper {
+  import opened Std.Wrappers
+  import Std.JSON.Grammar
+  import Std.JSON.ZeroCopy.API
+  import Std.JSON.ConcreteSyntax.Spec
+
+  type JSON = Grammar.JSON
+
+  method Deserialize(bs: bytes) returns (js: DeserializationResult<JSON>) {
+    js := API.Deserialize(bs);
+  }
+
+  method Serialize(js: JSON) returns (bs: SerializationResult<bytes>) {
+    // print "Count: ", wr.chain.Count(), "\n";
+    bs := API.Serialize(js);
+  }
+
+  method SpecSerialize(js: JSON) returns (bs: SerializationResult<bytes>) {
+    bs := Success(Spec.JSON(js));
+  }
+
+  method Check(bs: bytes, js: JSON, bs': bytes, sbs': bytes, js': JSON) {
+    expect sbs' == bs' == bs;
+    expect js' == js; // This doesn't hold in general, since the views could be different
+  }
+}
+
+module AbstractSyntaxWrapper refines AbstractWrapper {
+  import opened Std.Wrappers
+  import Std.JSON.Grammar
+  import Std.JSON.API
+  import Std.JSON.Values
+  import Std.JSON.Spec
+
+  type JSON = Values.JSON
+
+  method Deserialize(bs: bytes) returns (js: DeserializationResult<JSON>) {
+    js := API.Deserialize(bs);
+  }
+
+  method Serialize(js: JSON) returns (bs: SerializationResult<bytes>) {
+    bs := API.Serialize(js);
+  }
+
+  method SpecSerialize(js: JSON) returns (bs: SerializationResult<bytes>) {
+    bs := Spec.JSON(js);
+  }
+
+  method Check(bs: bytes, js: JSON, bs': bytes, sbs': bytes, js': JSON) {
+    expect sbs' == bs'; // Serializing changes number representations, escapes, and spacing, so no == bs
+    expect js' == js;
+  }
+}
+
+module MainTests {
+  import ZeroCopyWrapper
+  import AbstractSyntaxWrapper
+  import opened Std.Collections.Seq
+
+  const VECTORS := [
+    "true",
+    "false",
+    "null",
+    "\"\"",
+    "\"string\"",
+    "[\"A\"]",
+    "-123.456e-18",
+    "[]",
+    "[ ]",
+    "[1]",
+    "[1, 2]",
+    "{}",
+    "{ \"a\": 1 }",
+    "{ \"a\": \"b\" }",
+    "{ \"some\" : \"string\", \"and\": [ \"a number\", -123.456e-18 ] }",
+
+    "  true  ",
+    " {  } ",
+    "\"\\t\\r\\n\\f\"",
+    "\"∀ABC // \\u2200ABC\"", // ∀
+    "\"🇫🇷 // \\u1f1eb\\u1f1EBABC\"", // 🇫🇷
+
+    "[true, false , null, { \"some\" : \"string\", \"and\": [ \"a number\", -123.456e-18 ] } ]  ",
+
+    /** 
+     Stress test - this used to cause stack overflow errors because of non-tail-recursive functions.
+     We should have these kinds of tests direclty in the Unicode module too.
+     */
+    "\"" + Seq.Repeat('a', 100) + "\""
+  ]
+
+  @Test
+  method Main() {
+    ZeroCopyWrapper.TestStrings(VECTORS);
+    AbstractSyntaxWrapper.TestStrings(VECTORS);
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/RelationExamples.dfy b/Source/DafnyStandardLibraries/examples/RelationExamples.dfy
new file mode 100644
index 00000000000..4f485f8c547
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/RelationExamples.dfy
@@ -0,0 +1,39 @@
+module RelationExamples {
+
+  import opened Std.Relations
+
+  const partialOrdering := (a: int, b: int) => !(a == 9 && b == 10) && a <= b
+  lemma TestRelationProperties()
+    ensures Reflexive<int>((a,b) => a == b)
+    ensures Irreflexive<int>((a,b) => a != b)
+    ensures Symmetric((a,b) => a && b)
+    ensures Asymmetric<int>((a,b) => a < b)
+    ensures AntiSymmetric<bool>((a,b) => a ==> b)
+    ensures Connected<int>((a,b) => a < b)
+    ensures StronglyConnected<int>((a,b) => a <= b)
+    ensures Transitive<int>((a,b) => a == b)
+    ensures TotalOrdering<int>((a,b) => a <= b)
+    ensures StrictTotalOrdering<int>((a,b) => a < b)
+    ensures !StronglyConnected(partialOrdering)
+    ensures TotalOrdering<int>((a,b) => a <= b)
+    ensures StrictTotalOrdering<int>((a,b) => a < b)
+    ensures EquivalenceRelation((a,b) => a % 2 == b % 2)
+  {
+    assert !partialOrdering(9,10);
+  }
+
+  const lessEqualInt := (a: int, b) => a <= b
+  lemma TestElementProperties()
+    ensures IsLeast(lessEqualInt, 1, { 1, 2 })
+    ensures IsMinimal(lessEqualInt, 1, { 1, 2 })
+  {
+  }
+
+  lemma TestSorting()
+    ensures SortedBy(lessEqualInt, [1, 2, 3])
+    ensures !SortedBy(lessEqualInt, [3, 2, 1])
+  {
+    var ys := [3,2,1];
+    assert ys[0] > ys[1];
+  }
+}
diff --git a/Source/DafnyStandardLibraries/examples/StringsExamples.dfy b/Source/DafnyStandardLibraries/examples/StringsExamples.dfy
new file mode 100644
index 00000000000..bf940ee13b5
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/StringsExamples.dfy
@@ -0,0 +1,65 @@
+module StringsExamples {
+  import opened Std.Strings
+  import opened Std.Wrappers
+
+  @Test
+  method TestOfInt() {
+    expect OfInt(0) == "0";
+    expect OfInt(3) == "3";
+    expect OfInt(302) == "302";
+    expect OfInt(-3) == "-3";
+    expect OfInt(-302) == "-302";
+  }
+
+  @Test
+  method TestToInt() {
+    expect ToInt("0") == 0;
+    expect ToInt("3") == 3;
+    expect ToInt("302") == 302;
+    expect ToInt("-3") == -3;
+    expect ToInt("-302") == -302;
+  }
+
+  @Test
+  method TestOfNat() {
+    expect OfNat(0) == "0";
+    expect OfNat(1) == "1";
+    expect OfNat(3) == "3";
+    expect OfNat(302) == "302";
+    expect OfNat(3123123213102) == "3123123213102";
+  }
+
+  @IsolateAssertions
+  @Test
+  method TestToNat() {
+    expect ToNat("0") == 0;
+    expect ToNat("1") == 1;
+    expect ToNat("3") == 3;
+    expect ToNat("302") == 302;
+    expect ToNat("3123123213102") == 3123123213102;
+  }
+
+  @Test
+  method TestEscapeQuotes() {
+    expect EscapeQuotes("this message has single \' quotes \' ") == "this message has single \\\' quotes \\\' ";
+    expect EscapeQuotes("this message has double \" quotes \" ") == "this message has double \\\" quotes \\\" ";
+  }
+
+  @Test
+  method TestUnescapeQuotes() {
+    expect UnescapeQuotes("this message has single \\\' quotes \\\' ") == Some("this message has single \' quotes \' ");
+    expect UnescapeQuotes("this message has double \\\" quotes \\\" ") == Some("this message has double \" quotes \" ");
+  }
+
+  @Test
+  method TestOfBool() {
+    expect OfBool(true) == "true";
+    expect OfBool(false) == "false";
+  }
+
+  @Test
+  method TestOfChar() {
+    expect OfChar('c') == "c";
+    expect OfChar('f') == "f";
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/UnicodeExamples.dfy b/Source/DafnyStandardLibraries/examples/UnicodeExamples.dfy
new file mode 100644
index 00000000000..eec61f5eb5d
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/UnicodeExamples.dfy
@@ -0,0 +1,210 @@
+
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+module UnicodeExamples {
+  module BaseExamples {
+    import opened Std.Unicode.Base
+    import opened Helpers
+
+    const TEST_ASSIGNED_PLANE_CODE_POINTS: set<CodePoint> := {
+      0x000055,  // Latin capital letter U
+      0x01F11D,  // Parenthesized Latin capital letter N
+      0x02053C,  // CJK unified ideograph 𠔼
+      0x030256,  // CJK unified ideograph 𰉖
+      0x0E004F,  // Tag Latin capital letter O
+      0x0FDDDD,  // arbitrary code point in Private Use Area-A
+      0x10EEEE   // arbitrary code point in Private Use Area-B
+    }
+
+    lemma LemmaAssignedCodePoints()
+      ensures forall p | p in TEST_ASSIGNED_PLANE_CODE_POINTS :: IsInAssignedPlane(p)
+    {
+      reveal IsInAssignedPlane();
+    }
+
+    @Test
+    method TestAssignedCodePoints() {
+      LemmaAssignedCodePoints();
+      AssertAndExpect(forall p | p in TEST_ASSIGNED_PLANE_CODE_POINTS :: IsInAssignedPlane(p));
+    }
+  }
+
+  module Utf8EncodingFormExamples {
+    import opened Std.Unicode.Base
+    import opened Std.Unicode.Utf8EncodingForm
+    import opened Std.Wrappers
+    import opened Helpers
+
+    @Test
+    method TestEmptySequenceIsWellFormed() {
+      expect IsWellFormedCodeUnitSequence([]);
+    }
+
+    const TEST_SCALAR_VALUES: seq<(ScalarValue, WellFormedCodeUnitSeq)> := [
+      // One byte: dollar sign
+      (0x0024, [0x24]),
+      // Two bytes: pound sign
+      (0x00A3, [0xC2, 0xA3]),
+      // Three bytes: euro sign
+      (0x20AC, [0xE2, 0x82, 0xAC]),
+      // Four bytes: money bag emoji
+      (0x1F4B0, [0xF0, 0x9F, 0x92, 0xB0])
+    ]
+
+    @Test
+    method TestEncodeDecodeScalarValue() {
+      for i := 0 to |TEST_SCALAR_VALUES| {
+        var pair := TEST_SCALAR_VALUES[i];
+        AssertAndExpect(EncodeScalarValue(pair.0) == pair.1);
+        AssertAndExpect(DecodeCodeUnitSequence(pair.1) == [pair.0]);
+        AssertAndExpect(DecodeCodeUnitSequenceChecked(pair.1) == Some([pair.0]));
+      }
+    }
+
+    @Test
+    method TestEmptySequenceIsNotMinimalWellFormed() {
+      expect !IsMinimalWellFormedCodeUnitSubsequence([]);
+    }
+
+    @Test
+    method TestMinimalWellFormedCodeUnitSubsequences() {
+      for i := 0 to |TEST_SCALAR_VALUES| {
+        var pair := TEST_SCALAR_VALUES[i];
+        expect IsMinimalWellFormedCodeUnitSubsequence(pair.1);
+      }
+    }
+
+    // Examples taken from description of Table 3-7.
+    const TEST_ILL_FORMED_SEQUENCES: seq<CodeUnitSeq> := [
+      // C0 is not well-formed as a first byte
+      [0xC0, 0xAF],
+      // 9F is not well-formed as a second byte when E0 is a well-formed first byte
+      [0xE0, 0x9F, 0x80]
+    ]
+
+    @Test
+    method TestDecodeIllFormedSequence() {
+      for i := 0 to |TEST_ILL_FORMED_SEQUENCES| {
+        var s := TEST_ILL_FORMED_SEQUENCES[i];
+        AssertAndExpect(DecodeCodeUnitSequenceChecked(s).None?);
+      }
+    }
+  }
+
+  module Utf16EncodingFormExamples {
+    import opened Std.Unicode.Base
+    import opened Std.Unicode.Utf16EncodingForm
+    import opened Std.Wrappers
+    import opened Helpers
+
+    @Test
+    method TestEmptySequenceIsWellFormed() {
+      expect IsWellFormedCodeUnitSequence([]);
+    }
+
+    const TEST_SCALAR_VALUES: seq<(ScalarValue, WellFormedCodeUnitSeq)> := [
+      // One code unit: dollar sign
+      (0x0024, [0x0024]),
+      // Two code units: money bag emoji
+      (0x1F4B0, [0xD83D, 0xDCB0])
+    ]
+
+    @Test
+    method TestEncodeDecodeScalarValue() {
+      for i := 0 to |TEST_SCALAR_VALUES| {
+        var pair := TEST_SCALAR_VALUES[i];
+        AssertAndExpect(EncodeScalarValue(pair.0) == pair.1);
+        AssertAndExpect(DecodeCodeUnitSequence(pair.1) == [pair.0]);
+        AssertAndExpect(DecodeCodeUnitSequenceChecked(pair.1) == Some([pair.0]));
+      }
+    }
+
+    @Test
+    method TestEmptySequenceIsNotMinimalWellFormed() {
+      expect !IsMinimalWellFormedCodeUnitSubsequence([]);
+    }
+
+    @Test
+    method TestMinimalWellFormedCodeUnitSubsequences() {
+      for i := 0 to |TEST_SCALAR_VALUES| {
+        var pair := TEST_SCALAR_VALUES[i];
+        expect IsMinimalWellFormedCodeUnitSubsequence(pair.1);
+      }
+    }
+
+    // Because surrogate code points are not Unicode scalar values, isolated UTF-16 code units in the range
+    // D800_16 .. DFFF_16 are ill-formed. (Section 3.9 D91)
+    const TEST_ILL_FORMED_SEQUENCES: seq<CodeUnitSeq> := [
+      [0xD800],
+      [0xDABC],
+      [0xDFFF]
+    ]
+
+    @Test
+    method TestDecodeIllFormedSequence() {
+      for i := 0 to |TEST_ILL_FORMED_SEQUENCES| {
+        var s := TEST_ILL_FORMED_SEQUENCES[i];
+        AssertAndExpect(DecodeCodeUnitSequenceChecked(s).None?);
+      }
+    }
+  }
+
+  module UnicodeStringsWithUnicodeCharExamples {
+    import opened Std.BoundedInts
+    import opened Std.Unicode.Base
+    import opened Std.Wrappers
+    import opened Helpers
+
+    import UnicodeStrings = Std.Unicode.UnicodeStringsWithUnicodeChar
+
+    const currenciesStr := "\U{24}\U{A3}\U{20AC}\U{1F4B0}"
+    const currenciesUtf8: seq<uint8> := [0x24] + [0xC2, 0xA3] + [0xE2, 0x82, 0xAC] + [0xF0, 0x9F, 0x92, 0xB0]
+    const currenciesUtf16: seq<uint16> := [0x0024] + [0x00A3] + [0x20AC] + [0xD83D, 0xDCB0]
+
+    @Test
+    method TestToUTF8Checked() {
+      expect UnicodeStrings.ToUTF8Checked(currenciesStr) == Some(currenciesUtf8);
+    }
+
+    @Test
+    method TestFromUTF8Checked() {
+      expect UnicodeStrings.FromUTF8Checked(currenciesUtf8) == Some(currenciesStr);
+      expect UnicodeStrings.FromUTF8Checked(currenciesUtf8[2..]) == None;
+    }
+
+    @Test
+    method TestToUTF16() {
+      expect UnicodeStrings.ToUTF16Checked(currenciesStr) == Some(currenciesUtf16);
+    }
+
+    @Test
+    method TestFromUTF16Checked() {
+      expect UnicodeStrings.FromUTF16Checked(currenciesUtf16) == Some(currenciesStr);
+      expect UnicodeStrings.FromUTF16Checked(currenciesUtf16[..|currenciesUtf16| - 1]) == None;
+    }
+
+    @Test
+    method TestASCIIToUnicode() {
+      expect UnicodeStrings.ASCIIToUTF8("foobar") == [0x66, 0x6F, 0x6F, 0x62, 0x61, 0x72];
+      expect UnicodeStrings.ASCIIToUTF16("foobar") == [0x66, 0x6F, 0x6F, 0x62, 0x61, 0x72];
+    }
+  }
+
+  module Utf8EncodingSchemeExamples {
+    import opened Std.Unicode.Base
+    import opened Std.Unicode.Utf8EncodingForm
+    import EncodingScheme = Std.Unicode.Utf8EncodingScheme
+    import opened Std.Wrappers
+    import opened Helpers
+
+    const currenciesUtf8: CodeUnitSeq := [0x24] + [0xC2, 0xA3] + [0xE2, 0x82, 0xAC] + [0xF0, 0x9F, 0x92, 0xB0]
+
+    @Test
+    method TestSerializeDeserialize() {
+      expect EncodingScheme.Deserialize(EncodingScheme.Serialize(currenciesUtf8)) == currenciesUtf8;
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/examples/WrappersExamples.dfy b/Source/DafnyStandardLibraries/examples/WrappersExamples.dfy
new file mode 100644
index 00000000000..100d515e1a0
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/WrappersExamples.dfy
@@ -0,0 +1,277 @@
+import opened Std.Wrappers
+
+// ------ Demo for Option ----------------------------
+// We use Option when we don't need to pass around a reason for the failure,
+// ie when just 'None' is sufficient:
+
+class MyMap<K(==), V> {
+  var m: map<K, V>
+  constructor () {
+    m := map[];
+  }
+  function Get(k: K): Option<V>
+    reads this
+  {
+    if k in m then Some(m[k]) else None()
+  }
+  method Put(k: K, v: V)
+    modifies this
+  {
+    this.m := this.m[k := v];
+  }
+}
+
+@Test
+method TestMyMap() {
+  var m := new MyMap<string, string>();
+  m.Put("message", "Hello");
+  var greeting := Greet(m);
+  expect greeting == "Hello\nError: 'name' was not found\n";
+
+  m.Put("name", "Dafny");
+  greeting := Greet(m);
+  expect greeting == "Hello\nDafny\n";
+}
+
+@Test
+method TestGetGreetingSuccess() {
+  var m := new MyMap<string, string>();
+  m.Put("message", "Hello");
+  m.Put("name", "Dafny");
+  var greeting := GetGreeting(m);
+  expect greeting == Some("Hello Dafny");
+}
+
+@Test
+method TestGetGreetingFailure() {
+  var m := new MyMap<string, string>();
+  var greeting := GetGreeting(m);
+  expect greeting == None;
+}
+
+method Greet(m: MyMap<string, string>) returns (greeting: string) {
+  var o: Option<string> := m.Get("message");
+  if o.Some? {
+    greeting := o.value + "\n";
+  } else {
+    greeting := "oops\n";
+  }
+
+  var r: Result<string, string> := FindName(m);
+  if r.Success? {
+    greeting := greeting + r.value + "\n";
+  } else {
+    greeting := greeting + "Error: " + r.error + "\n";
+  }
+}
+
+// Sometimes we want to go from Option to Result:
+method FindName(m: MyMap<string, string>) returns (res: Result<string, string>) {
+  // Will return a default error message in case of None:
+  res := m.Get("name").ToResult("'name' not found");
+  // We can also match on the option to write a custom error:
+  match m.Get("name")
+  case Some(n) => res := Success(n);
+  case None => res := Failure("'name' was not found");
+}
+
+// Propagating failures using :- statements
+method GetGreeting(m: MyMap<string, string>) returns (res: Option<string>) {
+  var message: string :- m.Get("message");
+  var nameResult := FindName(m);
+  var name :- nameResult.ToOption();
+  res := Some(message + " " + name);
+}
+
+@Test
+method TestOptionUtilities() {
+  var stringNone: Option<string> := None;
+
+  expect Some("thing").GetOr("else") == "thing";
+  expect None.GetOr("else") == "else";
+
+  expect Some("body once told me").ToOutcome("the world is gonna roll me") == Pass;
+  expect stringNone.ToOutcome("the world is gonna roll me") == Fail("the world is gonna roll me");
+
+  var convertor := (x: Option<string>) =>
+      match x
+      case None => Pass
+      case Some(value) => Fail("Not expected: " + value);
+
+  expect Some("thing").Map(convertor) == Fail("Not expected: thing");
+  expect None.Map(convertor) == Pass;
+}
+
+// ------ Demo for Result ----------------------------
+// We use Result when we want to give a reason for the failure:
+
+class MyFilesystem {
+  var files: map<string, string>
+  constructor() {
+    files := map[];
+  }
+
+  // Result<()> is used to return a Result without any data
+  method WriteFile(path: string, contents: string) returns (res: OutcomeResult<string>)
+    modifies this
+  {
+    if path in files {
+      files := files[path := contents];
+      res := Pass'();
+    } else {
+      // The "Result" datatype allows us to give precise error messages
+      // instead of just "None"
+      res := Fail'("File not found, use 'Create' before");
+    }
+  }
+
+  method CreateFile(path: string) returns (res: OutcomeResult<string>)
+    modifies this
+  {
+    if path in files {
+      res := Fail'("File already exists");
+    } else {
+      files := files[path := ""];
+      res := Pass'();
+    }
+  }
+
+  method ReadFile(path: string) returns (res: Result<string, string>) {
+    if path in files {
+      res := Success(files[path]);
+    } else {
+      res := Failure("File not found");
+    }
+  }
+}
+
+// Propagating failures using :- statements
+method CopyFile(fs: MyFilesystem, fromPath: string, toPath: string) returns (res: Result<(), string>)
+  modifies fs
+{
+  var contents :- fs.ReadFile(fromPath);
+  :- fs.CreateFile(toPath);
+  :- fs.WriteFile(toPath, contents);
+  res := Success(());
+}
+
+@Test
+method TestMyFilesystem() {
+  var fs := new MyFilesystem();
+  :- expect fs.CreateFile("test.txt");
+  :- expect fs.WriteFile("test.txt", "Test dummy file");
+  var fileResult :- expect fs.ReadFile("test.txt");
+  expect fileResult == "Test dummy file";
+
+  // Testing error propagation
+  var result := CopyFile(fs, "missing.txt", "newfile.txt");
+  expect result == Failure("File not found");
+}
+
+@Test
+method TestResultUtilities() {
+  var stringSuccess: Result<string, string> := Success("I found my keys!");
+  var stringFailure: Result<string, string> := Failure("I can't find my keys!");
+
+  expect stringSuccess.GetOr("else") == "I found my keys!";
+  expect stringFailure.GetOr("else") == "else";
+
+  expect stringSuccess.ToOutcome() == Pass;
+  expect stringFailure.ToOutcome() == Fail("I can't find my keys!");
+
+  var toErrorOption := (x: Result<string, string>) =>
+      match x
+      case Success(_) => None
+      case Failure(error) => Some(error);
+
+  expect stringSuccess.Map(toErrorOption) == None;
+  expect stringFailure.Map(toErrorOption) == Some("I can't find my keys!");
+
+  var exaggerator := error => "ATTENTION: " + error;
+
+  expect stringSuccess.MapFailure(exaggerator) == stringSuccess;
+  expect stringFailure.MapFailure(exaggerator) == Failure("ATTENTION: I can't find my keys!");
+}
+
+// ------ Demo for Need ----------------------------
+// We use Need when something has to be true but we can't prove it statically
+// This is a very contrived example
+
+method whatIsCharacterFive(fs: MyFilesystem, fromPath: string) returns (res: Result<char, string>)
+  modifies fs
+{
+
+  // Get a string that we can't reason about statically
+  var contents :- fs.ReadFile(fromPath);
+
+  // Dynamically test whether the string is at least 5 characters long, and return a failure if not.
+  // If we pass this line, Dafny can now assume that the string is long enough.
+  :- Need<string>(|contents| >= 5, "File contents not long enough.");
+
+  // Now we can get the character
+  var c := contents[4];
+
+  return Success(c);
+}
+
+// For a method that returns an Outcome, use Outcome.Need
+method whatIsCharacterFive'(fs: MyFilesystem, fromPath: string) returns (res: Outcome<string>)
+  modifies fs
+{
+
+  // Get a string that we can't reason about statically
+  var result := fs.ReadFile(fromPath);
+  :- result.ToOutcome();
+  var contents: string := result.value;
+
+  // Dynamically test whether the string is at least 5 characters long, and return a failure if not.
+  // If we pass this line, Dafny can now assume that the string is long enough.
+  :- Outcome.Need(|contents| >= 5, "File contents not long enough.");
+
+  // Now we can get the character
+  var c := contents[4];
+  // and do other stuff
+
+  return Pass;
+}
+
+@Test
+method TestNeed() {
+  var fs := new MyFilesystem();
+  :- expect fs.CreateFile("test.txt");
+  :- expect fs.WriteFile("test.txt", "12345678910");
+
+  var c :- expect whatIsCharacterFive(fs, "test.txt");
+  :- expect whatIsCharacterFive'(fs, "test.txt");
+
+  :- expect fs.WriteFile("test.txt", "");
+  var result := whatIsCharacterFive(fs, "test.txt");
+  expect result.Failure? && result.error == "File contents not long enough.";
+  var outcome := whatIsCharacterFive'(fs, "test.txt");
+  expect outcome.Fail? && outcome.error == "File contents not long enough.";
+}
+
+@Test
+method TestOutcomeUtilities() {
+  var stringPass: Outcome<string> := Pass;
+  var stringFail: Outcome<string> := Fail("I'm too tired");
+
+  expect stringPass.ToOption(42) == Some(42);
+  expect stringFail.ToOption(42) == None;
+
+  expect stringPass.ToResult(42) == Success(42);
+  expect stringFail.ToResult(42) == Failure("I'm too tired");
+
+  var toErrorOption := (x: Outcome<string>) =>
+      match x
+      case Pass => None
+      case Fail(error) => Some(error);
+
+  expect stringPass.Map(toErrorOption) == None;
+  expect stringFail.Map(toErrorOption) == Some("I'm too tired");
+
+  var exaggerator := error => "ATTENTION: " + error;
+
+  expect stringPass.MapFailure(exaggerator, 42) == Success(42);
+  expect stringFail.MapFailure(exaggerator, 42) == Failure("ATTENTION: I'm too tired");
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/examples/dfyconfig.toml b/Source/DafnyStandardLibraries/examples/dfyconfig.toml
new file mode 100644
index 00000000000..7e673d2ce02
--- /dev/null
+++ b/Source/DafnyStandardLibraries/examples/dfyconfig.toml
@@ -0,0 +1,10 @@
+[options]
+standard-libraries = true
+# This needs to be set because the examples themselves
+# use {:concurrent} and reads clauses on methods,
+# but consumers don't have to have this option set
+# to use the standard libraries in general.
+reads-clauses-on-methods = true
+resource-limit = 1000000
+warn-redundant-assumptions = true
+warn-contradictory-assumptions = true
diff --git a/Source/DafnyStandardLibraries/scripts/check-examples b/Source/DafnyStandardLibraries/scripts/check-examples
new file mode 100755
index 00000000000..55704e82a16
--- /dev/null
+++ b/Source/DafnyStandardLibraries/scripts/check-examples
@@ -0,0 +1,375 @@
+#! /usr/bin/env bash
+
+## This file accepts a couple options (before any files)
+## and then iterates over the remaining command-line arguments as files.
+## The options are
+##    -d <name>  -- here <name> is a default command (see below)
+##    -l <lang>  -- <lang> is the name of a language to use as default
+##                   (a language name as used with ```, e.g.,
+##                   dafny, java, text, cli, ...)
+##    -x <int>   -- <int> is an (non-negative) integer literal giving 
+##                  a default exit code
+##    -m         -- compare against error messages in headings
+## It expects a file to be in github markdown format.
+##
+## It extracts each block of text that is between lines bounded by a pair
+## of lines beginning with ```. The opening ``` is typically follwed
+## immediately (without whitespace) by a language identifier. If no
+## language identifier is present, the default language specified by the -l
+## option is used; if there is no such option, an error is output.
+## The extracted text is placed in a temporary file.
+##
+## If the text blocks are not in matching pairs of ``` markers or if 
+## markers other than 3 backticks are used, the script will fail -- it is
+## not robust against such non-well-formedness.
+## Also, the backticks must start the line without leading whitespace and 
+## the language identifier must follow without whitespace.
+##
+## Each block of extracted text is tested by applying a command.
+## The command is stated by including in the ```dafny line the string
+## <!-- command --> where in that HTML comment string, the 'command' is one
+## of the commands below. If there is no such HTML comment, then the default
+## command given by an option is used; if there is no such option, an error
+## message is issued.
+##
+## In the description of behavior below, if -m has been given as an option
+## then the comparison of the output line containing 'Error' is against the
+## error message as recorded in the '##' heading just before the test
+##
+## Commands (here $F is the name of a file containing the dafny source code
+## under test):
+##   %no-check : do nothing
+##   %check-verify <expect> or
+##   %check-verify-warn : runs the command 
+##              "dafny verify --use-basename-for-filename $F" and checks
+##              (1) if <expect> is absent then the exit code is 0 and
+##                  the output is just a success message
+##              (2) if <expect> is non-empty. then the exit code is 4 and
+##                  the actual output matches the content of the file <expect>
+##                  if the command is %check-verify-warn, the exit code is 0
+##   %check-resolve <expect> : runs the command
+##              "dafny resolve --use-basename-for-filename $F" and checks
+##              (1) if <expect> is absent then the exit code is 0 and
+##                  the output is just a success message
+##              (2) if <expect> is non-empty. then the exit code is 2 and
+##                  the actual output matches the content of the file <expect>
+##   %check-translate <expect> : runs the command
+##              "dafny translate --useBaseNameForFileName --unicode-char=true $F" and checks
+##              (1) if <expect> is absent then the exit code is 0 and
+##                  the output is just a success message
+##              (2) if <expect> is non-empty. then the exit code is r32 and
+##                  the actual output matches the content of the file <expect>
+##   %check-run <expect> : runs the command
+##              "dafny run --use-basename-for-filename $F" and,
+##              if <expect> is present, checks that the output matches the
+##              content of the file names <expect>
+##   %check-error
+##   check
+
+# See also the feature request to make this a proper Dafny ecosystem feature:
+# https://github.com/dafny-lang/dafny/issues/4680
+
+dir=$(dirname "${BASH_SOURCE[0]}")
+
+dafny="$dir/../../../Scripts/dafny"
+
+defaultCommand=
+defaultExit=
+defaultLang=
+useHeadings=0
+defOptions="--function-syntax:4 --use-basename-for-filename"
+legacyOptions="-functionSyntax:4 -useBaseNameForFileName"
+
+while getopts 'md:x:l:' opt; do
+  case "$opt" in
+    "d") defaultCommand="$OPTARG";;
+    "x") defaultExit="$OPTARG";;
+    "l") defaultLang="$OPTARG";;
+    "m") useHeadings=1
+  esac
+done
+shift $(($OPTIND - 1))
+
+## Temporary file
+text=text.dfy
+
+## Tracks if there have been any failures
+ANYFAIL=0
+
+## Loop over all remaining command-line arguments
+for file in $@ ; do
+dir=$(dirname "$file")
+filename=$(basename "$file")
+
+## Whether this file fails
+FAIL=0
+## line number
+n=0
+## if inblock==1 we are in a ```-delimited block
+inblock=0
+
+msg=
+## Read and process each line of the file.  The file is input on stdin 
+## by redirection after the 'done' corresponding to this while-do
+use=
+command=
+expect=
+options=( )
+default=0
+while IFS= read -r line
+do 
+  let n++
+
+  ## For header lines, extract the error message from the header text
+  ## everything but the initial ##[ ]*, the enclosing ** and the appended {#_errorid_}
+  ## The sed commands turn this into a pattern matching regex to match against the output of applying dafny to the example in the text:
+  ## remove the trailing error id if present; remove initial ## **; remove trailing '**'; turn any italicized text, which marks some
+  ## hole in the template to a '.*' matcher.
+  ## May not be robust against parentheses, brackets or other regex-special symbols in the error message -- none of these encountered so far.
+
+  ( echo "$line" | grep -E -e '[#][#] ' > /dev/null ) \
+   && msg=`echo "$line" | sed -E -e 's/ \{#.*\}[ ]*$//' -e 's/^##[ ]*[*]*//' -e 's/[*]*$//' -e 's/\\*/\\\\*/' -e 's/_[a-z]+_/.*/g'`
+
+  ## Check for the test command information
+  echo "$line" | grep '^[ ]*<!-- [ ]*%' > /dev/null
+  if [ "$?" == "0" ]; then 
+      ##echo COMMAND "$line"
+      contents=( `echo "$line" | sed -e 's/[^<]*<!--//' -e 's/-->//'` )
+      echo "$line" | grep -e '%default' > /dev/null
+      if [ "$?" == "0" ]; then 
+        default=1; 
+        echo "$line" | grep -e '%useHeadings' > /dev/null
+        if [ "$?" == "0" ]; then useHeadings=1; fi
+        defaultCommand=${contents[0]}
+        continue
+      fi
+      command=${contents[0]}
+      contents=( ${contents[@]:1} )
+      while [ ${#contents[@]} != "0" ]; do
+        if [ "${contents[0]}" == "%use" ]; then
+          use=${contents[1]}
+          contents=( ${contents[@]:2} )
+        elif [ "${contents[0]}" == "%save" ]; then
+          save=${contents[1]}
+          contents=( ${contents[@]:2} )
+        elif [ "${contents[0]}" == "%options" ]; then
+          contents=${contents[@]:1}
+          options=${contents[@]}
+          contents=()
+        elif [ -z "${contents[0]}" ]; then
+          contents=()
+        else
+          expect=${contents[0]}
+          contents=( ${contents[@]:1} )
+        fi
+      done
+  fi
+  ## Check for the marker
+  echo "$line" | grep -e '^[ ]*[`][`][`]' > /dev/null 
+  if [ "$?" == "0" ]; then
+    if [ "$inblock" == "0" ]; then
+      ## get language
+      lang=`echo "$line" | sed -e 's/^[ ]*\`\`\`[\`]*//' -e 's/[ ]*$//'`
+      if [ -z "$lang" ]; then
+        lang=$defaultLang
+        if [ -z "$lang" ]; then
+          echo NO LANGUAGE LABEL $n "$line"
+          FAIL=1
+        fi
+      fi
+
+      inblock=1
+      rm -f $text
+      touch $text
+    else
+      ## End of backtick block, so check the text
+      if [ -z "$command" -a "$lang" == "dafny" ]; then
+        command="$defaultCommand"
+        if [ -z "$command" ]; then
+          echo "NO COMMAND GIVEN $n $line"
+          FAIL=1
+        fi
+      fi
+      inblock=0
+      if [ -n "$use" ]; then
+        ##echo " " USING $use
+        cat "$use" >> $text
+      fi
+      if [ -n "$save" ]; then
+         cp $text $save
+         save=
+      fi
+      if [ "$lang" == "dafny" -o "$lang" == "cli" ]; then
+        echo TESTING $n $file "$command" $expect
+      fi
+      if [ "$command" == "%no-check" ]; then
+        echo -n ""
+      elif [ "$command" == "%check-verify" -o "$command" == "%check-verify-warn" -o "$command" == "%check-resolve"  -o "$command" == "%check-run" -o "$command" == "%check-translate" -o "$command" == "%check-test" -o "$command" == "%check-resolve-warn"  -o "$command" == "%check-legacy" ]; then
+        capture=1
+        dOptions=$defOptions
+        if [ "$command" == "%check-verify" ]; then
+          ##cat $text
+          com=verify
+          ec=4
+        elif [ "$command" == "%check-verify-warn" ]; then
+          com=verify
+          ec=0
+        elif [ "$command" == "%check-resolve" ]; then
+          com=resolve
+          ec=2
+        elif [ "$command" == "%check-resolve-warn" ]; then
+          com=resolve
+          dOptions="$dOptions --allow-warnings"
+          ec=0
+        elif [ "$command" == "%check-translate" ]; then
+          com=translate
+          ec=3
+        elif [ "$command" == "%check-run" ]; then
+          com=run
+          ec=0
+          if [ "$useHeadings" == "1" ]; then ec=3; fi
+        elif [ "$command" == "%check-test" ]; then
+          com=test
+          ec=2
+          ##if [ "$useHeadings" == "1" ]; then ec=3; fi
+        elif [ "$command" == "%check-legacy" ]; then
+          com=
+          ec=0
+          dOptions=$legacyOptions
+          if [ "$useHeadings" == "1" ]; then ec=3; fi
+          if [ "$defaultCommand" == "%check-resolve" ]; then ec=2 ; fi
+        fi
+        if [ "$lang" != "dafny" ]; then
+          echo EXPECTED A dafny BLOCK, NOT $lang
+          FAIL=1
+        else
+          if [ "$capture" == "2" ]; then
+            "$dafny" $com $dOptions ${options[@]} $text 2> actual > /dev/null
+          elif [ "$com" == "%check-legacy" ]; then
+            "$dafny" $com $dOptions ${options[@]} $text > actual
+          else
+            "$dafny" $com --function-syntax:4 $dOptions ${options[@]} $text --standard-libraries > actual
+          fi
+          actualec=$?
+          if [ "$useHeadings" == "1" ]; then
+            act=`cat actual | grep -E '(Error|Warning)' | sed -e 's/^[^:]*: //'`
+            if [ -n "$msg" ]; then
+              dif=`echo $act | sed -e "s/$msg//g" | sed -e 's/[ ]*//'`
+              if [ -z "$act" ] ; then
+                 echo NO ERROR MESSAGE FOUND
+                 FAIL=1
+              fi
+              if [ -n "$dif" ] ; then
+                 echo NO MATCH 
+                 echo PAT "$msg"
+                 echo ACT "$act"
+                 echo DIF "$dif"
+                 FAIL=1
+              fi
+              msg=
+              if [ "$actualec" != "$ec" ]; then
+                echo EXPECTED EXIT CODE $ec, got "$actualec"
+                FAIL=1
+              fi
+            else 
+              if [ -n "$act" ]; then
+                echo "EXPECTED NO ERROR, got " $act
+                FAIL=1
+              fi
+              if [ "$actualec" != "0" ]; then
+                echo EXPECTED EXIT CODE 0, got $actualec
+                FAIL=1
+              fi
+            fi
+          elif [ -z "$expect" ]; then
+            if [ "$actualec" != "0" ]; then
+              echo "TEST FAILED" $file line $n  $command $expect
+              cat $text
+              cat actual
+              FAIL=1
+            fi
+            # Warnings differ from version to version; "No trigger" is sometimes on a different line
+            if [ `cat actual | grep -v "Warning" | grep -v "No trigger" | wc -l ` != "2" ]; then
+              echo ACTUAL ERROR OUTPUT BUT NONE EXPECTED `cat actual | wc -l `
+              cat actual
+              FAIL=1
+            fi
+          else
+            if [ "$actualec" != "$ec" ]; then
+              echo EXPECTED EXIT CODE $ec, got $actualec
+              FAIL=1
+            fi
+            if [ -e "$dir/$expect" ]; then
+              # Warnings differ from version to version; "No trigger" is sometimes on a different line
+              cat actual | grep -v "Warning" | grep -v "No trigger" | diff - "$dir/$expect"
+              if [ "$?" != "0" ]; then
+                FAIL=1
+                echo Actual output differs from expected
+                echo "TEST FAILED" $file line $n  $command $expect
+                cat $text
+                cat actual
+              fi
+            else
+              echo EXPECT FILE $expect DOES NOT EXIST
+              cat actual
+              FAIL=1
+            fi
+          fi
+        fi
+      elif [ "$command" == "%check-cli" ]; then
+        if [ "$lang" != "bash" ]; then
+          echo EXPECTED A bash BLOCK, NOT $lang
+          FAIL=1
+        else
+          . $text > actual
+          ec=$?
+          if [ "$ec" != "1" ]; then
+             echo EXPECTED EXIT CODE OF 1, GOT $ec
+             FAIL=1
+          else
+            act=`cat actual`
+	    dif=`echo $act | sed -e "s/$msg//"`
+            if [ -n "$dif" ]; then
+              echo ACTUAL OUTPUT DOES NOT MATCH EXPECTED: "$msg" VS "$act"
+              FAIL=1
+            fi
+          fi
+        fi
+      elif [ "$command" == "%check-error" ]; then
+        "$dafny" resolve -useBaseNameForFileName --unicode-char:true $text | head -1 | sed -e 's/[^:]*: //' > actual
+        act=`cat actual`
+	dif=`echo "$act" | sed -e "s/$msg//"`
+        if [ -n "$dif" ] ; then
+           echo NO MATCH "$msg" VS "$act"
+           FAIL=1
+        fi
+        msg=
+      elif [ "$lang" == "dafny" ]; then
+         echo UNKNOWN TEST COMMAND $command
+         FAIL=1
+      fi
+      use=
+      command=
+      expect=
+      options=( )
+    fi
+  elif [ "$inblock" == "1" ]; then
+    ## If in a backtick block, save the text to the temporary file
+    echo "$line" | sed -e 's/^[ ]*\.\.\./   /' >> $text
+  fi
+done < $file
+rm -rf *.tmp $text.*
+
+if [ "$inblock" == "1" ]; then
+  echo UNCLOSED BACKTICK BLOCK
+  FAIL=1
+fi
+
+if [ "$FAIL" == "1" ] ; then 
+  echo Test Failure: $file
+  ANYFAIL=1
+fi
+
+rm -f actual $text *.tmp
+done
+exit $ANYFAIL
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/DivMod.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/DivMod.dfy
new file mode 100644
index 00000000000..d90c351eccb
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/DivMod.dfy
@@ -0,0 +1,1698 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/* Every lemma comes in 2 forms: 'LemmaProperty' and 'LemmaPropertyAuto'. The
+former takes arguments and may be more stable and less reliant on Z3
+heuristics. The latter includes automation and its use requires less effort*/
+
+@DisableNonlinearArithmetic
+module Std.Arithmetic.DivMod {
+
+  import opened DivInternals
+  import DivINL = DivInternalsNonlinear
+  import opened ModInternals
+  import ModINL = ModInternalsNonlinear
+  import opened MulInternals
+  import opened Mul
+  import opened GeneralInternals
+
+  /*****************************************************************************
+   * Division:
+   *****************************************************************************/
+
+  /* the common syntax of division gives the same quotient as performing division through recursion */
+  lemma LemmaDivIsDivRecursive(x: int, d: int)
+    requires 0 < d
+    ensures DivRecursive(x, d) == x / d
+  {
+    LemmaDivInductionAuto(d, x, u => DivRecursive(u, d) == u / d);
+  }
+
+  lemma LemmaDivIsDivRecursiveAuto()
+    ensures forall x: int, d: int {:trigger x / d} :: d > 0 ==> DivRecursive(x, d) == x / d
+  {
+    forall x: int, d: int | d > 0
+      ensures DivRecursive(x, d) == x / d
+    {
+      LemmaDivIsDivRecursive(x, d);
+    }
+  }
+
+  /* the quotient of an integer divided by itself is 1 */
+  lemma LemmaDivBySelf(d: int)
+    requires d != 0
+    ensures d / d == 1
+  {
+    DivINL.LemmaDivBySelf(d);
+  }
+
+  /* zero divided by an integer besides 0 is 0 */
+  lemma LemmaDivOf0(d: int)
+    requires d != 0
+    ensures 0 / d == 0
+  {
+    DivINL.LemmaDivOf0(d);
+  }
+
+  /* ensures the basic propoerties of division: 0 divided by any integer is 0; any integer 
+  divided by 1 is itself; any integer divided by itself is 1 */
+  lemma LemmaDivBasics(x: int)
+    ensures x != 0 ==> 0 / x == 0
+    ensures x / 1 == x
+    ensures x != 0 ==> x / x == 1
+  {
+    if x != 0 {
+      LemmaDivBySelf(x);
+      LemmaDivOf0(x);
+    }
+  }
+
+  lemma LemmaDivBasicsAuto()
+    ensures forall x {:trigger 0 / x} :: x != 0 ==> 0 / x == 0
+    ensures forall x {:trigger x / 1} :: x / 1 == x
+    ensures forall x, y {:trigger x / y} :: x >= 0 && y > 0 ==> x / y >= 0
+    ensures forall x, y {:trigger x / y} :: x >= 0 && y > 0 ==> x / y <= x
+  {
+    forall x: int
+      ensures x != 0 ==> 0 / x == 0
+      ensures x / 1 == x
+    {
+      LemmaDivBasics(x);
+    }
+    forall x: int, y: int | x >= 0 && y > 0
+      ensures 0 <= x / y <= x
+    {
+      LemmaDivPosIsPos(x, y);
+      LemmaDivIsOrderedByDenominator(x, 1, y);
+    }
+  }
+
+  /* if a dividend is a whole number and the divisor is a natural number and their
+  quotient is 0, this implies that the dividend is smaller than the divisor */
+  lemma LemmaSmallDivConverseAuto()
+    ensures forall x, d {:trigger x / d } :: 0 <= x && 0 < d && x / d == 0 ==> x < d
+  {
+    forall x, d | 0 <= x && 0 < d && x / d == 0
+      ensures x < d
+    {
+      LemmaDivInductionAuto(d, x, u => 0 <= u && 0 < d && u / d == 0 ==> u < d);
+    }
+  }
+
+  lemma LemmaDivNonZero(x: int, d: int)
+    requires x >= d > 0
+    ensures x / d > 0
+  {
+    LemmaDivPosIsPosAuto();
+    if x / d == 0 {
+      LemmaSmallDivConverseAuto();
+    }
+  }
+
+  lemma LemmaDivNonZeroAuto()
+    ensures forall x, d {:trigger x / d } | x >= d > 0 :: x / d > 0
+  {
+    forall x, d | x >= d > 0 { LemmaDivNonZero(x, d); }
+  }
+
+  /* given two fractions with the same numerator, the order of numbers is determined by 
+  the denominators. However, if the numerator is 0, the fractions are equal regardless of 
+  the denominators' values */
+  lemma LemmaDivIsOrderedByDenominator(x: int, y: int, z: int)
+    requires 0 <= x
+    requires 1 <= y <= z
+    ensures x / y >= x / z
+    decreases x
+  {
+    LemmaDivIsDivRecursiveAuto();
+    assert forall u: int, d: int {:trigger u / d} {:trigger DivRecursive(u, d)}
+        :: d > 0 ==> DivRecursive(u, d) == u / d;
+
+    if x < z {
+      LemmaDivIsOrdered(0, x, y);
+    } else {
+      LemmaDivIsOrdered(x - z, x - y, y);
+      LemmaDivIsOrderedByDenominator(x - z, y, z);
+    }
+  }
+
+  lemma LemmaDivIsOrderedByDenominatorAuto()
+    ensures forall x: int, y: int, z: int {:trigger x / y, x / z} :: 0 <= x && 1 <= y <= z ==> x / y >= x / z
+  {
+    forall x: int, y: int, z: int | 0 <= x && 1 <= y <= z
+      ensures x / y >= x / z
+    {
+      LemmaDivIsOrderedByDenominator(x, y, z);
+    }
+  }
+
+  /* given two fractions with the same numerator, the order of numbers is strictly determined by 
+  the denominators.*/
+  lemma LemmaDivIsStrictlyOrderedByDenominator(x: int, d: int)
+    requires 0 < x
+    requires 1 < d
+    ensures x / d  < x
+    decreases x
+  {
+    LemmaDivInductionAuto(d, x, u => 0 < u ==> u / d < u);
+  }
+
+  lemma LemmaDivIsStrictlyOrderedByDenominatorAuto()
+    ensures forall x: int, d: int {:trigger x / d} :: 0 < x && 1 < d ==> x / d < x
+  {
+    forall x: int, d: int | 0 < x && 1 < d
+      ensures x / d < x
+    {
+      LemmaDivIsStrictlyOrderedByDenominator(x, d);
+    }
+  }
+
+  /* Rounding is different when multiplying the sum of two integers by a fraction d/d vs. 
+  first multiplying each integer by d/d and then adding the quotients */
+  lemma LemmaDividingSums(a: int, b: int, d: int, R: int)
+    requires 0 < d
+    requires R == a % d + b % d - (a + b) % d
+    ensures d * ((a + b) / d) - R == d * (a / d) + d * (b / d)
+  {
+    calc ==> {
+      a % d + b % d == R + (a + b) % d;
+      (a + b) - (a + b) % d - R == a - (a % d) + b - (b % d);
+      {
+        LemmaFundamentalDivMod(a + b, d);
+        LemmaFundamentalDivMod(a, d);
+        LemmaFundamentalDivMod(b, d);
+      }
+      d * ((a + b) / d) - R == d * (a / d) + d * (b / d);
+    }
+  }
+
+  lemma LemmaDividingSumsAuto()
+    ensures forall a: int, b: int, d: int, R: int {:trigger d * ((a + b) / d) - R, d*(a/d) + d*(b/d)}
+              :: 0 < d &&  R == a%d + b%d - (a+b)%d ==> d*((a+b)/d) - R == d*(a/d) + d*(b/d)
+  {
+    // https://github.com/dafny-lang/dafny/issues/4771
+    forall a: int, b: int, d: int, R: int {:trigger d * ((a + b) / d) - R, d*(a/d) + d*(b/d)} | 0< d &&  R == a%d + b%d - (a+b)%d
+      ensures d*((a+b)/d) - R == d*(a/d) + d*(b/d)
+    {
+      LemmaDividingSums(a, b, d, R);
+    }
+  }
+
+  /* dividing a whole number by a natural number will result in a quotient that is 
+  greater than or equal to 0 */
+  lemma LemmaDivPosIsPos(x: int, d: int)
+    requires 0 <= x
+    requires 0 < d
+    ensures 0 <= x / d
+  {
+    LemmaDivInductionAuto(d, x, u => 0 <= u ==> u / d >= 0);
+  }
+
+  lemma LemmaDivPosIsPosAuto()
+    ensures forall x: int, d: int {:trigger x / d} :: 0 <= x && 0 < d ==> 0 <= x / d
+  {
+    forall x: int, d: int | 0 <= x && 0 < d
+      ensures 0 <= x / d
+    {
+      LemmaDivPosIsPos(x, d);
+    }
+  }
+
+  /* dividing an integer and then adding 1 to the quotient is the same as adding 
+  the divisor and the integer, and then dividing that sum by the divisor */
+  lemma LemmaDivPlusOne(x: int, d: int)
+    requires 0 < d
+    ensures 1 + x / d == (d + x) / d
+  {
+    LemmaDivAuto(d);
+  }
+
+  lemma LemmaDivPlusOneAuto()
+    ensures forall x: int, d: int {:trigger 1 + x / d, (d + x) / d} :: 0 < d ==> 1 + x / d == (d + x) / d
+  {
+    forall x: int, d: int | 0 < d
+      ensures 1 + x / d == (d + x) / d
+    {
+      LemmaDivPlusOne(x, d);
+    }
+  }
+
+  /* dividing an integer and then subtracting 1 from the quotient is the same as subtracting 
+  the divisor from the integer, and then dividing that difference by the divisor */
+  lemma LemmaDivMinusOne(x: int, d: int)
+    requires 0 < d
+    ensures -1 + x / d == (-d + x) / d
+  {
+    LemmaDivAuto(d);
+  }
+
+  lemma LemmaDivMinusOneAuto()
+    ensures forall x: int, d: int {:trigger -1 + x / d, (-d + x) / d} :: 0 < d ==> -1 + x / d == (-d + x) / d
+  {
+    forall x: int, d: int | 0 < d
+      ensures -1 + x / d == (-d + x) / d
+    {
+      LemmaDivMinusOne(x, d);
+    }
+  }
+
+  /* dividing a smaller integer by a larger integer results in a quotient of 0 */
+  lemma LemmaBasicDiv(d: int)
+    requires 0 < d
+    ensures forall x {:trigger x / d} :: 0 <= x < d ==> x / d == 0
+  {
+    LemmaDivAuto(d);
+  }
+
+  lemma LemmaBasicDivAuto()
+    ensures forall x: int, d: int {:trigger x / d} :: 0 <= x < d ==> x / d == 0
+  {
+    forall x: int, d: int | 0 <= x < d
+      ensures x / d == 0
+    {
+      LemmaBasicDiv(d);
+    }
+  }
+
+  /* numerical order is preserved when dividing two seperate integers by a common positive divisor */
+  lemma LemmaDivIsOrdered(x: int, y: int, z: int)
+    requires x <= y
+    requires 0 < z
+    ensures x / z <= y / z
+  {
+    LemmaDivInductionAuto(z, x - y, xy => xy <= 0 ==> (xy + y) / z <= y / z);
+  }
+
+  lemma LemmaDivIsOrderedAuto()
+    ensures forall x: int, y: int, z: int {:trigger x / z, y / z} :: x <= y && 0 < z ==> x / z <= y / z
+  {
+    forall x: int, y: int, z: int | x <= y && 0 < z
+      ensures x / z <= y / z
+    {
+      LemmaDivIsOrdered(x, y, z);
+    }
+  }
+
+  /* dividing an integer by 2 or more results in a quotient that is smaller than the 
+  original dividend */
+  lemma LemmaDivDecreases(x: int, d: int)
+    requires 0 < x
+    requires 1 < d
+    ensures x / d  < x
+  {
+    LemmaDivInductionAuto(d, x, u => 0 < u ==> u / d < u);
+  }
+
+  lemma LemmaDivDecreasesAuto()
+    ensures forall x: int, d: int {:trigger x / d} :: 0 < x && 1 < d ==> x / d < x
+  {
+    forall x: int, d: int | 0 < x && 1 < d
+      ensures x / d < x
+    {
+      LemmaDivDecreases(x, d);
+    }
+  }
+
+  /* dividing an integer by 1 or more results in a quotient that is less than or equal to 
+  the original dividend */
+  lemma LemmaDivNonincreasing(x: int, d: int)
+    requires 0 <= x
+    requires 0 < d
+    ensures x / d  <= x
+  {
+    LemmaDivInductionAuto(d, x, u => 0 <= u ==> u / d <= u);
+  }
+
+  lemma LemmaDivNonincreasingAuto()
+    ensures forall x: int, d: int {:trigger x / d } :: 0 <= x && 0 < d ==> x / d <= x
+  {
+    forall x: int, d: int | 0 <= x && 0 < d
+      ensures x / d <= x
+    {
+      LemmaDivNonincreasing(x, d);
+    }
+  }
+
+  /* a natural number x divided by a larger natural number gives a remainder equal to x */
+  lemma LemmaSmallMod(x: nat, m: nat)
+    requires x < m
+    requires 0 < m
+    ensures x % m == x
+  {
+    ModINL.LemmaSmallMod(x, m);
+  }
+
+  lemma LemmaBreakdown(x: int, y: int, z: int)
+    requires 0 <= x
+    requires 0 < y
+    requires 0 < z
+    ensures 0 < y * z
+    ensures x % (y * z) ==y * ((x / y) % z) + x % y
+  {
+    LemmaMulStrictlyPositiveAuto();
+    LemmaDivPosIsPos(x, y);
+    assert 0 <= x / y;
+
+    calc {
+      (y * (x / y)) % (y * z) + (x % y) % (y * z);
+    <=    { LemmaPartBound1(x, y, z); }
+      y * (z - 1) + (x % y) % (y * z);
+    <    { LemmaPartBound2(x, y, z); }
+      y * (z - 1) + y;
+          { LemmaMulBasicsAuto(); }
+      y * (z - 1) + y * 1;
+          { LemmaMulIsDistributiveAuto(); }
+      y * (z - 1 + 1);
+      y * z;
+    }
+
+    calc {
+      x % (y * z);
+      { LemmaFundamentalDivMod(x,y); }
+      (y * (x / y) + x % y) % (y * z);
+      {
+        LemmaModPropertiesAuto();
+        assert 0 <= x % y;
+        LemmaMulNonnegative(y, x / y);
+        assert (y * (x / y)) % (y * z) + (x % y) % (y * z) < y * z;
+        LemmaModAdds(y * (x / y), x % y, y * z);
+      }
+      (y * (x / y)) % (y * z) + (x % y) % (y * z);
+      {
+        LemmaModPropertiesAuto();
+        LemmaMulIncreases(z, y);
+        LemmaMulIsCommutativeAuto();
+        assert x % y < y <= y * z;
+        LemmaSmallMod(x % y, y * z);
+        assert (x % y) % (y * z) == x % y;
+      }
+      (y * (x / y)) % (y * z) + x % y;
+      { LemmaTruncateMiddle(x / y, y, z); }
+      y * ((x / y) % z) + x % y;
+    }
+  }
+
+  lemma LemmaBreakdownAuto()
+    ensures forall x: int, y: int, z: int {:trigger y * z, x % (y * z), y * ((x / y) % z) + x % y}
+              :: 0 <= x && 0 < y && 0 < z ==> 0 < y * z && x % (y * z) == y * ((x / y) % z) + x % y
+  {
+    forall x: int, y: int, z: int  | 0 <= x && 0 < y && 0 < z
+      ensures 0 < y * z && x % (y * z) == y * ((x / y) % z) + x % y
+    {
+      LemmaBreakdown(x, y, z);
+    }
+  }
+
+  lemma LemmaRemainderUpper(x: int, d: int)
+    requires 0 <= x
+    requires 0 < d
+    ensures x - d < x / d * d
+  {
+    LemmaMulAuto();
+    LemmaDivInductionAuto(d, x, u => 0 <= u ==> u - d < u / d * d);
+  }
+
+  lemma LemmaRemainderUpperAuto()
+    ensures forall x: int, d: int {:trigger x - d, d * d} :: 0 <= x && 0 < d ==> x - d < x / d * d
+  {
+    forall x: int, d: int | 0 <= x && 0 < d
+      ensures x - d < x / d * d
+    {
+      LemmaRemainderUpper(x, d);
+    }
+  }
+
+  lemma LemmaRemainderLower(x: int, d: int)
+    requires 0 <= x
+    requires 0 < d
+    ensures  x >= x / d * d
+  {
+    LemmaMulAuto();
+    LemmaDivInductionAuto(d, x, u => 0 <= u ==> u >= u / d * d);
+  }
+
+  lemma LemmaRemainderLowerAuto()
+    ensures forall x: int, d: int {:trigger x / d * d} :: 0 <= x && 0 < d ==> x >= x / d * d
+  {
+    forall x: int, d: int | 0 <= x && 0 < d
+      ensures x >= x / d * d
+    {
+      LemmaRemainderLower(x, d);
+    }
+  }
+
+  lemma LemmaRemainder(x: int, d: int)
+    requires 0 <= x
+    requires 0 < d
+    ensures  0 <= x - (x / d * d) < d
+  {
+    LemmaMulAuto();
+    LemmaDivInductionAuto(d, x, u => 0 <= u - u / d * d < d);
+  }
+
+  lemma LemmaRemainderAuto()
+    ensures forall x: int, d: int {:trigger x - (x / d * d)} :: 0 <= x && 0 < d ==> 0 <= x - (x / d * d) < d
+  {
+    forall x: int, d: int | 0 <= x && 0 < d
+      ensures 0 <= x - (x / d * d) < d
+    {
+      LemmaRemainder(x, d);
+    }
+  }
+
+  /* describes fundementals of the modulus operator */
+  lemma LemmaFundamentalDivMod(x: int, d: int)
+    requires d != 0
+    ensures x == d * (x / d) + (x % d)
+  {
+    ModINL.LemmaFundamentalDivMod(x, d);
+  }
+
+  lemma LemmaFundamentalDivModAuto()
+    ensures forall x: int, d: int {:trigger d * (x / d) + (x % d)} :: d != 0 ==> x == d * (x / d) + (x % d)
+  {
+    forall x: int, d: int | d != 0
+      ensures x == d * (x / d) + (x % d)
+    {
+      LemmaFundamentalDivMod(x, d);
+    }
+  }
+
+  /* dividing a fraction by a divisor is equivalent to multiplying the fraction's 
+  denominator with the divisor */
+  lemma LemmaDivDenominator(x: int,c: nat,d: nat)
+    requires 0 <= x
+    requires 0 < c
+    requires 0 < d
+    ensures c * d != 0
+    ensures (x / c) / d == x / (c * d)
+  {
+    LemmaMulStrictlyPositiveAuto();
+    var R := x % (c * d);
+    LemmaModPropertiesAuto();
+
+    LemmaDivPosIsPos(R, c);
+    if R / c >= d {
+      LemmaFundamentalDivMod(R, c);
+      LemmaMulInequality(d, R / c, c);
+      LemmaMulIsCommutativeAuto();
+      assert false;
+    }
+    assert R / c < d;
+
+    LemmaMulBasicsAuto();
+    LemmaFundamentalDivModConverse(R / c, d, 0, R / c);
+    assert (R / c) % d == R / c;
+
+    LemmaFundamentalDivMod(R, c);
+    assert c * (R / c) + R % c == R;
+
+    assert c * ((R / c) % d) + R % c == R;
+
+    var k := x / (c * d);
+    LemmaFundamentalDivMod(x, c * d);
+    assert x == (c * d) * (x / (c * d)) + x % (c * d);
+    assert R == x - (c * d) * (x / (c * d));
+    assert R == x - (c * d) * k;
+
+    calc {
+      c * ((x / c) % d) + x % c;
+      { LemmaModMultiplesVanish(-k, x / c, d); LemmaMulIsCommutativeAuto(); }
+      c * ((x / c + (-k) * d) % d) + x % c;
+      { LemmaHoistOverDenominator(x, (-k)*d, c); }
+      c * (((x + (((-k) * d) * c)) / c) % d) + x % c;
+      { LemmaMulIsAssociative(-k, d, c); }
+      c * (((x + ((-k) * (d * c))) / c) % d) + x % c;
+      { LemmaMulUnaryNegation(k, d * c); }
+      c * (((x + (-(k * (d * c)))) / c) % d) + x % c;
+      { LemmaMulIsAssociative(k, d, c); }
+      c * (((x + (-(k * d * c))) / c) % d) + x % c;
+      c * (((x - k * d * c) / c) % d) + x % c;
+      {
+        LemmaMulIsAssociativeAuto();
+        LemmaMulIsCommutativeAuto();
+      }
+      c * ((R / c) % d) + x % c;
+      c * (R / c) + x % c;
+      { LemmaFundamentalDivMod(R, c);
+        assert R == c * (R / c) + R % c;
+        LemmaModMod(x, c, d);
+        assert R % c == x % c;
+      }
+      R;
+      { LemmaModIsModRecursiveAuto(); }
+      R % (c * d);
+      (x - (c * d) * k) % (c * d);
+      { LemmaMulUnaryNegation(c * d, k); }
+      (x + (c * d) * (-k)) % (c * d);
+      { LemmaModMultiplesVanish(-k, x, c * d); }
+      x % (c * d);
+    }
+    calc ==> {
+      c * (x / c) + x % c - R == c * (x / c) - c * ((x / c) % d);
+      { LemmaFundamentalDivMod(x, c); }
+      x - R == c * (x / c) - c * ((x / c) % d);
+    }
+    calc ==> {
+      true;
+      { LemmaFundamentalDivMod(x / c, d); }
+      d * ((x / c) / d) == x / c - ((x / c) % d);
+      c * (d * ((x / c) / d)) == c * (x / c - ((x / c) % d));
+      { LemmaMulIsAssociativeAuto(); }
+      (c * d) * ((x / c) / d) == c * (x / c - ((x / c) % d));
+      { LemmaMulIsDistributiveAuto(); }
+      (c * d) * ((x / c) / d) == c * (x / c) - c * ((x / c) % d);
+      (c * d) * ((x / c) / d) == x - R;
+      { LemmaFundamentalDivMod(x, c * d); }
+      (c * d) * ((x / c) / d) == (c * d) * (x / (c * d)) + x % (c * d) - R;
+      (c * d) * ((x / c) / d) == (c * d) * (x / (c * d));
+      { LemmaMulEqualityConverse(c * d, (x / c) / d, x / (c * d)); }
+      (x / c) / d == x / (c * d);
+    }
+  }
+
+  lemma LemmaDivDenominatorAuto()
+    ensures forall c: nat, d: nat {:trigger c * d} :: 0 < c && 0 < d ==> c * d != 0
+    ensures forall x: int, c: nat, d: nat {:trigger (x / c) / d}
+              :: 0 <= x && 0 < c && 0 < d ==> (x / c) / d == x / (c * d)
+  {
+    LemmaMulNonzeroAuto();
+    forall x: int, c: nat, d: nat | 0 <= x && 0 < c && 0 < d
+      ensures (x / c) / d == x / (c * d)
+    {
+      LemmaDivDenominator(x, c, d);
+    }
+  }
+
+  /* multiplying an integer by a fraction is equivalent to multiplying the integer by the
+  fraction's numerator */
+  lemma LemmaMulHoistInequality(x: int, y: int, z: int)
+    requires 0 <= x
+    requires 0 < z
+    ensures x * (y / z) <= (x * y) / z
+  {
+    calc {
+      (x * y) / z;
+        { LemmaFundamentalDivMod(y, z); }
+      (x * (z * (y / z) + y % z)) / z;
+        { LemmaMulIsDistributiveAuto(); }
+      (x * (z * (y / z)) + x * (y % z)) / z;
+    >=  {
+          LemmaModPropertiesAuto();
+          LemmaMulNonnegative(x, y % z);
+          LemmaDivIsOrdered(x * (z * (y / z)), x * (z * (y / z)) + x * (y % z), z); }
+      (x * (z * (y / z))) / z;
+        { LemmaMulIsAssociativeAuto();
+          LemmaMulIsCommutativeAuto(); }
+      (z * (x * (y / z))) / z;
+        { LemmaDivMultiplesVanish(x * (y / z), z); }
+      x * (y / z);
+    }
+  }
+
+  lemma LemmaMulHoistInequalityAuto()
+    ensures forall x: int, y: int, z: int {:trigger x * (y / z), (x * y) / z}
+              :: 0 <= x && 0 < z ==> x * (y / z) <= (x * y) / z
+  {
+    forall x: int, y: int, z: int | 0 <= x && 0 < z
+      ensures x * (y / z) <= (x * y) / z
+    {
+      LemmaMulHoistInequality(x, y, z);
+    }
+  }
+
+  lemma {:induction false} LemmaIndistinguishableQuotients(a: int, b: int, d: int)
+    requires 0 < d
+    requires 0 <= a - a % d <= b < a + d - a % d
+    ensures a / d == b / d
+  {
+    var f := ab => var u := ab + b; 0 <= u - u % d <= b < u + d - u % d ==> u / d == b / d;
+    assert f(a - b) by {
+      LemmaDivInductionAuto(d, a - b, f);
+    }
+  }
+
+  lemma LemmaIndistinguishableQuotientsAuto()
+    ensures forall a: int, b: int, d: int {:trigger a / d, b / d}
+              :: 0 < d && 0 <= a - a % d <= b < a + d - a % d ==> a / d == b / d
+  {
+    forall a: int, b: int, d: int | 0 < d && 0 <= a - a % d <= b < a + d - a % d
+      ensures a / d == b / d
+    {
+      LemmaIndistinguishableQuotients(a, b, d);
+    }
+  }
+
+  /* common factors from the dividend and divisor of a modulus operation can be factored out */
+  lemma LemmaTruncateMiddle(x: int, b: int, c: int)
+    requires 0 <= x
+    requires 0 < b
+    requires 0 < c
+    ensures 0 < b * c
+    ensures (b * x) % (b * c) == b * (x % c)
+  {
+    LemmaMulStrictlyPositiveAuto();
+    LemmaMulNonnegativeAuto();
+    calc {
+      b * x;
+      { LemmaFundamentalDivMod(b * x, b * c); }
+      (b * c) * ((b * x) / (b * c)) + (b * x) % (b * c);
+      { LemmaDivDenominator(b * x, b, c); }
+      (b * c) * (((b * x) / b) / c) + (b * x) % (b * c);
+      { LemmaMulIsCommutativeAuto(); LemmaDivByMultiple(x, b); }
+      (b * c) * (x / c) + (b * x) % (b * c);
+    }
+    calc ==> {
+      true;
+      { LemmaFundamentalDivMod(x, c); }
+      x == c * (x / c) + x % c;
+      b * x == b * (c * (x / c) + x % c);
+      { LemmaMulIsDistributiveAuto(); }
+      b * x == b * (c * (x / c)) + b * (x % c);
+      { LemmaMulIsAssociativeAuto(); }
+      b * x == (b * c) * (x / c) + b * (x % c);
+    }
+  }
+
+  lemma LemmaTruncateMiddleAuto()
+    ensures forall x: int, b: int, c: int {:trigger b * (x % c)}
+              :: 0 <= x && 0 < b && 0 < c && 0 < b * c ==> (b * x) % (b * c) == b * (x % c)
+  {
+    forall x: int, b: int, c: int | 0 <= x && 0 < b && 0 < c && 0 < b * c
+      ensures (b * x) % (b * c) == b * (x % c)
+    {
+      LemmaTruncateMiddle(x, b, c);
+    }
+  }
+
+  /* multiplying the numerator and denominator by an integer does not change the quotient */
+  lemma LemmaDivMultiplesVanishQuotient(x: int, a: int, d: int)
+    requires 0 < x
+    requires 0 <= a
+    requires 0 < d
+    ensures 0 < x * d
+    ensures a / d == (x * a) / (x * d)
+  {
+    LemmaMulStrictlyPositive(x,d);
+    calc {
+      (x * a) / (x * d);
+      {
+        LemmaMulNonnegative(x, a);
+        LemmaDivDenominator(x * a, x, d); }
+      ((x * a) / x) / d;
+      { LemmaDivMultiplesVanish(a, x); }
+      a / d;
+    }
+  }
+
+  lemma LemmaDivMultiplesVanishQuotientAuto()
+    ensures forall x: int, a: int, d: int {:trigger a / d, x * d, x * a}
+              :: 0 < x && 0 <= a && 0 < d ==> 0 < x * d  &&  a / d == (x * a) / (x * d)
+  {
+    // https://github.com/dafny-lang/dafny/issues/4771
+    forall x: int, a: int, d: int {:trigger x * d, 0 <= a} | 0 < x && 0 <= a && 0 < d
+      ensures 0 < x * d  &&  a / d == (x * a) / (x * d)
+    {
+      LemmaDivMultiplesVanishQuotient(x, a, d);
+    }
+  }
+
+  /* rounds down when adding an integer r to the dividend a that is smaller than the divisor d, and then
+  multiplying by d */
+  lemma LemmaRoundDown(a: int, r: int, d: int)
+    requires 0 < d
+    requires a % d == 0
+    requires 0 <= r < d
+    ensures a == d * ((a + r) / d)
+  {
+    LemmaMulAuto();
+    LemmaDivInductionAuto(d, a, u => u % d == 0 ==> u == d * ((u + r) / d));
+  }
+
+  lemma LemmaRoundDownAuto()
+    ensures forall a: int, r: int, d: int {:trigger d * ((a + r) / d)}
+              :: 0 < d && a % d == 0 && 0 <= r < d ==> a == d * ((a + r) / d)
+  {
+    // https://github.com/dafny-lang/dafny/issues/4771
+    forall a: int, r: int, d: int {:trigger a + r, r < d} {:trigger a + r, 0 < d} {:trigger 0 <= r, a % d} | 0 < d && a % d == 0 && 0 <= r < d
+      ensures a == d * ((a + r) / d)
+    {
+      LemmaRoundDown(a, r, d);
+    }
+  }
+
+  /* this is the same as writing x + (b/d) == x when b is less than d; this is true because (b/d) == 0 */
+  @IsolateAssertions
+  lemma LemmaDivMultiplesVanishFancy(x: int, b: int, d: int)
+    requires 0 < d
+    requires 0 <= b < d
+    ensures (d * x + b) / d == x
+  {
+    assert b/d == 0 by { LemmaDivAuto(d); }
+    var f := u => (d * u + b) / d == u;
+    assert f(0);
+    forall i
+      ensures IsLe(0, i) && f(i) ==> f(i + 1)
+    {
+      if f(i) {
+        var z := ((d * i) + b) % d + d % d;
+        assert 0 <= z < d;
+        assert f (i + 1) by {
+          calc {
+            i + 1;
+            ((d * i) + b)/d + d/d; {
+              assert DivPlus (d, d * i + b, d) by {LemmaDivAuto(d);}
+            }
+            ((d * i) + b + d)/d; {
+              LemmaMulAuto();
+            }
+            (d * (i + 1) + b)/d;
+          }
+        }
+      }
+    }
+    forall i
+      ensures IsLe(i, 0) && f(i) ==> f(i - 1)
+    {
+      if f(i) {
+        var z := ((d * i) + b) % d - d % d;
+        assert 0 <= z < d;
+        assert f (i - 1) by {
+          calc {
+            i - 1;
+            ((d * i) + b)/d - d/d; {
+              assert DivMinus (d, d * i + b, d) by {LemmaDivAuto(d);}
+            }
+            ((d * i) + b - d)/d; {
+              LemmaMulAuto();
+            }
+            (d * (i - 1) + b)/d;
+          }
+        }
+      }
+    }
+    LemmaMulInductionAuto(x, f);
+  }
+
+  lemma LemmaDivMultiplesVanishFancyAuto()
+    ensures forall x: int, b: int, d: int {:trigger (d * x + b) / d}
+              :: 0 < d && 0 <= b < d ==> (d * x + b) / d == x
+  {
+    // https://github.com/dafny-lang/dafny/issues/4771
+    forall x: int, b: int, d: int {:trigger d * x, b < d} {:trigger d * x, 0 <= b} | 0 < d && 0 <= b < d
+      ensures (d * x + b) / d == x
+    {
+      LemmaDivMultiplesVanishFancy(x, b, d);
+    }
+  }
+
+  /* multiplying an integer by a common numerator and denominator results in the original integer */
+  lemma LemmaDivMultiplesVanish(x: int, d: int)
+    requires 0 < d
+    ensures (d * x) / d == x
+  {
+    LemmaDivMultiplesVanishFancy(x, 0, d);
+  }
+
+  lemma LemmaDivMultiplesVanishAuto()
+    ensures forall x: int, d: int {:trigger (d * x) / d} :: 0 < d ==> (d * x) / d == x
+  {
+    forall x: int, d: int | 0 < d
+      ensures (d * x) / d == x
+    {
+      LemmaDivMultiplesVanish(x, d);
+    }
+  }
+
+  /* multiplying a whole number by a common numerator and denominator results in the original integer */
+  lemma LemmaDivByMultiple(b: int, d: int)
+    requires 0 <= b
+    requires 0 < d
+    ensures  (b * d) / d == b
+  {
+    LemmaDivMultiplesVanish(b,d);
+  }
+
+  lemma LemmaDivByMultipleAuto()
+    ensures forall b: int, d: int {:trigger (b * d) / d} :: 0 <= b && 0 < d ==> (b * d) / d == b
+  {
+    forall b: int, d: int | 0 <= b && 0 < d
+      ensures (b * d) / d == b
+    {
+      LemmaDivByMultiple(b, d);
+    }
+  }
+
+  /* a dividend y that is a positive multiple of the divisor z will always yield a greater quotient 
+  than a dividend x that is less than y */
+  lemma LemmaDivByMultipleIsStronglyOrdered(x: int, y: int, m: int, z: int)
+    requires x < y
+    requires y == m * z
+    requires 0 < z
+    ensures  x / z < y / z
+  {
+    LemmaModMultiplesBasic(m, z);
+    LemmaDivInductionAuto(z, y - x, yx => var u := yx + x; x < u && u % z == 0 ==> x / z < u / z);
+  }
+
+  lemma LemmaDivByMultipleIsStronglyOrderedAuto()
+    ensures forall x: int, y: int, m: int, z: int {:trigger x / z, m * z, y / z}
+              :: x < y && y == m * z && 0 < z ==> x / z < y / z
+  {
+    forall x: int, y: int, m: int, z: int | x < y && y == m * z && 0 < z
+      ensures x / z < y / z
+    {
+      LemmaDivByMultipleIsStronglyOrdered(x, y, m, z);
+    }
+  }
+
+  /* if an integer a is less than or equal to the product of two other integers b and c, then the 
+  quotient of a/b will be less than or equal to c */
+  lemma LemmaMultiplyDivideLe(a: int, b: int, c: int)
+    requires 0 < b
+    requires a <= b * c
+    ensures  a / b <= c
+  {
+    LemmaModMultiplesBasic(c, b);
+    LemmaDivInductionAuto(b, b * c - a, i => 0 <= i && (i + a) % b == 0 ==> a / b <= (i + a) / b);
+    LemmaDivMultiplesVanish(c, b);
+  }
+
+  lemma LemmaMultiplyDivideLeAuto()
+    ensures forall a: int, b: int, c: int {:trigger a / b , b * c} :: 0 < b && a <= b * c ==> a / b <= c
+  {
+    forall a: int, b: int, c: int | 0 < b && a <= b * c
+      ensures a / b <= c
+    {
+      LemmaMultiplyDivideLe(a, b, c);
+    }
+  }
+
+  /* if an integer a is less than the product of two other integers b and c, then the quotient 
+  of a/b will be less than c */
+  lemma LemmaMultiplyDivideLt(a: int, b: int, c: int)
+    requires 0 < b
+    requires a < b * c
+    ensures  a / b < c
+  {
+    LemmaModMultiplesBasic(c, b);
+    LemmaDivInductionAuto(b, b * c - a, i => 0 < i && (i + a) % b == 0 ==> a / b < (i + a) / b);
+    LemmaDivMultiplesVanish(c, b);
+  }
+
+  lemma LemmaMultiplyDivideLtAuto()
+    ensures forall a: int, b: int, c: int {:trigger a / b, b * c} :: 0 < b && a < b * c ==> a / b < c
+  {
+    forall a: int, b: int, c: int | 0 < b && a < b * c
+      ensures a / b < c
+    {
+      LemmaMultiplyDivideLt(a, b, c);
+    }
+  }
+
+  /* expresses the equality of giving fractions common denominators and then adding them together */
+  lemma LemmaHoistOverDenominator(x: int, j: int, d: nat)
+    requires 0 < d
+    ensures x / d + j == (x + j * d) / d
+  {
+    LemmaDivAuto(d);
+    LemmaMulInductionAuto(j, u => x / d  + u == (x + u * d) / d);
+  }
+
+  lemma LemmaHoistOverDenominatorAuto()
+    ensures forall x: int, j: int, d: nat {:trigger  x / d + j} :: 0 < d ==> x / d + j == (x + j * d) / d
+  {
+    forall x: int, j: int, d: nat | 0 < d
+      ensures x / d + j == (x + j * d) / d
+    {
+      LemmaHoistOverDenominator(x, j, d);
+    }
+  }
+
+  lemma LemmaPartBound1(a: int, b: int, c: int)
+    requires 0 <= a
+    requires 0 < b
+    requires 0 < c
+    ensures 0 < b * c
+    ensures (b * (a / b) % (b * c)) <= b * (c - 1)
+  {
+    LemmaMulStrictlyPositiveAuto();
+    calc {
+      b * (a / b) % (b * c);
+      { LemmaFundamentalDivMod(b * (a / b), b * c); }
+      b * (a / b) - (b * c) * ((b * (a / b)) / (b * c));
+      { LemmaMulIsAssociativeAuto(); }
+      b * (a / b) - b * (c * ((b * (a / b)) / (b * c)));
+      { LemmaMulIsDistributiveAuto(); }
+      b * ((a / b) - (c * ((b * (a / b)) / (b * c))));
+    }
+
+    calc ==> {
+      true;
+      { LemmaModPropertiesAuto(); }
+      b * (a / b) % (b * c) < b * c;
+      b * ((a / b) - (c * ((b * (a / b)) / (b * c)))) < b * c;
+      { LemmaMulIsCommutativeAuto(); LemmaMulStrictInequalityConverseAuto(); }
+      ((a / b) - (c * ((b * (a / b)) / (b * c)))) < c;
+      ((a / b) - (c * ((b * (a / b)) / (b * c)))) <= c - 1;
+      { LemmaMulIsCommutativeAuto(); LemmaMulInequalityAuto(); }
+      b * ((a / b) - (c * ((b * (a / b)) / (b * c)))) <= b * (c - 1);
+      b * (a / b) % (b * c) <= b * (c - 1);
+    }
+  }
+
+  lemma LemmaPartBound1Auto()
+    ensures forall a: int, b: int, c: int {:trigger b * (a / b) % (b * c)}
+              :: 0 <= a && 0 < b && 0 < c ==> 0 < b * c && (b * (a / b) % (b * c)) <= b * (c - 1)
+  {
+    // https://github.com/dafny-lang/dafny/issues/4771
+    forall a: int, b: int, c: int {:trigger b * c, 0 <= a} | 0 <= a && 0 < b && 0 < c
+      ensures 0 < b * c && (b * (a / b) % (b * c)) <= b * (c - 1)
+    {
+      LemmaPartBound1(a, b, c);
+    }
+  }
+
+
+  /*******************************************************************************
+   * Modulus:
+   *******************************************************************************/
+
+  /* the common syntax of the modulus operation results in the same remainder as recursively
+  calculating the modulus */
+  lemma LemmaModIsModRecursive(x: int, m: int)
+    requires m > 0
+    ensures ModRecursive(x, m) == x % m
+    decreases if x < 0 then -x + m else x
+  {
+    if x < 0 {
+      calc {
+        ModRecursive(x, m);
+        ModRecursive(x + m, m);
+        { LemmaModIsModRecursive(x + m, m); }
+        (x + m) % m;
+        { LemmaAddModNoop(x, m, m); }
+        ((x % m) + (m % m)) % m;
+        { LemmaModBasicsAuto(); }
+        (x % m) % m;
+        { LemmaModBasicsAuto(); }
+        x % m;
+      }
+    } else if x < m {
+      LemmaSmallMod(x, m);
+    } else {
+      calc {
+        ModRecursive(x, m);
+        ModRecursive(x - m, m);
+        { LemmaModIsModRecursive(x - m, m); }
+        (x - m) % m;
+        { LemmaSubModNoop(x, m, m); }
+        ((x % m) - (m % m)) % m;
+        { LemmaModBasicsAuto(); }
+        (x % m) % m;
+        { LemmaModBasicsAuto(); }
+        x % m;
+      }
+    }
+  }
+
+  lemma LemmaModIsModRecursiveAuto()
+    ensures forall x: int, d: int {:trigger x % d}:: d > 0 ==> ModRecursive(x, d) == x % d
+  {
+    forall x: int, d: int | d > 0
+      ensures ModRecursive(x, d) == x % d
+    {
+      LemmaModIsModRecursive(x, d);
+    }
+  }
+
+  /* proves basic properties of the modulus operation: any integer divided by itself does not have a
+  remainder; performing (x % m) % m gives the same result as simply perfoming x % m  */
+  lemma LemmaModBasicsAuto()
+    ensures forall m: int {:trigger m % m} :: m > 0 ==> m % m == 0
+    ensures forall x: int, m: int {:trigger (x % m) % m} :: m > 0 ==> (x % m) % m == x % m
+  {
+    forall m: int | m > 0
+      ensures m % m == 0
+    {
+      LemmaModAuto(m);
+    }
+    forall x: int, m: int | m > 0
+      ensures (x % m) % m == x % m
+    {
+      LemmaModAuto(m);
+    }
+  }
+
+  /* describes the properties of the modulus operation including those described in LemmaModBasicsAuto. 
+  This lemma also states that the remainder of any division will be less than the divisor's value  */
+  lemma LemmaModPropertiesAuto()
+    ensures forall m: int {:trigger m % m} :: m > 0 ==> m % m == 0
+    ensures forall x: int, m: int {:trigger (x % m) % m} :: m > 0 ==> (x % m) % m == x % m
+    ensures forall x: int, m: int {:trigger x % m} :: m > 0 ==> 0 <= x % m < m
+  {
+    LemmaModBasicsAuto();
+
+    forall x: int, m: int | m > 0
+      ensures 0 <= x % m < m
+    {
+      LemmaModAuto(m);
+    }
+  }
+
+  /* the remainder of a natural number x divided by a natural number d will be less
+  than or equal to x */
+  lemma LemmaModDecreases(x: nat, m: nat)
+    requires 0 < m
+    ensures x % m <= x
+  {
+    LemmaModAuto(m);
+  }
+
+  lemma LemmaModDecreasesAuto()
+    ensures forall x: nat, m: nat {:trigger x % m} :: 0 < m ==> x % m <= x
+  {
+    forall x: nat, m: nat | 0 < m
+      ensures x % m <= x
+    {
+      LemmaModDecreases(x, m);
+    }
+  }
+
+  /* if x % y is zero and x is greater than zero, x is greater than y. */
+  lemma LemmaModIsZero(x: nat, m: nat)
+    requires x > 0 && m > 0
+    requires x % m == 0
+    ensures x >= m
+  {
+    if x < m {
+      assert x % m == x by { LemmaSmallMod(x, m); }
+      assert false;
+    }
+  }
+
+  lemma LemmaModIsZeroAuto()
+    ensures forall x: nat, m: nat {:trigger x % m} :: (x > 0 && m > 0
+                                                       && x % m == 0) ==> x >= m
+  {
+    forall x: nat, m: nat | x > 0 && m > 0 && x % m == 0
+      ensures x >= m
+    {
+      LemmaModIsZero(x, m);
+    }
+  }
+
+  /* a dividend that is any multiple of the divisor will result in a remainder of 0 */
+  lemma LemmaModMultiplesBasic(x: int, m: int)
+    requires m > 0
+    ensures (x * m) % m == 0
+  {
+    LemmaModAuto(m);
+    LemmaMulInductionAuto(x, u => (u * m) % m == 0);
+  }
+
+  lemma LemmaModMultiplesBasicAuto()
+    ensures forall x: int, m: int {:trigger (x * m) % m} :: m > 0 ==> (x * m) % m == 0
+  {
+    forall x: int, m: int | m > 0
+      ensures (x * m) % m == 0
+    {
+      LemmaModMultiplesBasic(x, m);
+    }
+  }
+
+  /* the remainder of adding the divisor m to the dividend b will be the same
+  as simply performing b % m */
+  lemma LemmaModAddMultiplesVanish(b: int, m: int)
+    requires 0 < m
+    ensures (m + b) % m == b % m
+  {
+    LemmaModAuto(m);
+  }
+
+  lemma LemmaModAddMultiplesVanishAuto()
+    ensures forall b: int, m: int {:trigger b % m} :: 0 < m ==> (m + b) % m == b % m
+  {
+    forall b: int, m: int | 0 < m
+      ensures (m + b) % m == b % m
+    {
+      LemmaModAddMultiplesVanish(b, m);
+    }
+  }
+
+  /* the remainder of subtracting the divisor m from the dividend b will be the same
+  as simply performing b % m */
+  lemma LemmaModSubMultiplesVanish(b: int, m: int)
+    requires 0 < m
+    ensures (-m + b) % m == b % m
+  {
+    LemmaModAuto(m);
+  }
+
+  lemma LemmaModSubMultiplesVanishAuto()
+    ensures forall b: int, m: int {:trigger b % m} :: 0 < m ==> (-m + b) % m == b % m
+  {
+    forall b: int, m: int | 0 < m
+      ensures (-m + b) % m == b % m
+    {
+      LemmaModSubMultiplesVanish(b, m);
+    }
+  }
+
+  predicate MultiplesVanish(a: int, b: int, m: int)
+    requires 0 < m
+  {
+    (m * a + b) % m == b % m
+  }
+
+  /* the remainder of adding any multiple of the divisor m to the dividend b will be the same
+  as simply performing b % m */
+  lemma LemmaModMultiplesVanish(a: int, b: int, m: int)
+    decreases if a > 0 then a else -a
+    requires 0 < m
+    ensures MultiplesVanish(a, b, m)
+  {
+    LemmaModAuto(m);
+    LemmaMulAuto();
+    assert MultiplesVanish(0, b, m);
+    LemmaMulInductionAuto(a, u => MultiplesVanish(u, b, m));
+  }
+
+  lemma LemmaModMultiplesVanishAuto()
+    ensures forall a: int, b: int, m: int {:trigger (m * a + b) % m} :: 0 < m ==> MultiplesVanish(a, b, m)
+  {
+    forall a: int, b: int, m: int | 0 < m
+      ensures MultiplesVanish(a, b, m)
+    {
+      LemmaModMultiplesVanish(a, b, m);
+    }
+  }
+
+  /* proves equivalent forms of modulus subtraction */
+  lemma LemmaModSubtraction(x: nat, s: nat, d: nat)
+    requires 0 < d
+    requires 0 <= s <= x % d
+    ensures x % d - s % d == (x - s) % d
+  {
+    LemmaModAuto(d);
+  }
+
+  lemma LemmaModSubtractionAuto()
+    ensures forall x: nat, s: nat, d: nat {:trigger (x - s) % d}
+              :: 0 < d && 0 <= s <= x % d ==> x % d - s % d == (x - s) % d
+  {
+    forall x: nat, s: nat, d: nat | 0 < d && 0 <= s <= x % d
+      ensures x % d - s % d == (x - s) % d
+    {
+      LemmaModSubtraction(x, s, d);
+    }
+  }
+
+  /* describes expanded and succinct version of modulus operator in relation to addition (read "ensures") */
+  lemma LemmaAddModNoop(x: int, y: int, m: int)
+    requires 0 < m
+    ensures ((x % m) + (y % m)) % m == (x + y) % m
+  {
+    LemmaModAuto(m);
+  }
+
+  lemma LemmaAddModNoopAuto()
+    ensures forall x: int, y: int, m: int {:trigger (x + y) % m}
+              :: 0 < m ==> ((x % m) + (y % m)) % m == (x + y) % m
+  {
+    forall x: int, y: int, m: int | 0 < m
+      ensures ((x % m) + (y % m)) % m == (x + y) % m
+    {
+      LemmaAddModNoop(x, y, m);
+    }
+  }
+
+  /* describes expanded and succinct version of modulus operator in relation to addition (read "ensures") */
+  lemma LemmaAddModNoopRight(x: int, y: int, m: int)
+    requires 0 < m
+    ensures (x + (y % m)) % m == (x + y) % m
+  {
+    LemmaModAuto(m);
+  }
+
+  lemma LemmaAddModNoopRightAuto()
+    ensures forall x: int, y: int, m: int {:trigger (x + y) % m}
+              :: 0 < m ==> (x + (y % m)) % m == (x + y) % m
+  {
+    // https://github.com/dafny-lang/dafny/issues/4771
+    forall x: int, y: int, m: int {:trigger x + y % m} | 0 < m
+      ensures (x + (y % m)) % m == (x + y) % m
+    {
+      LemmaAddModNoopRight(x, y, m);
+    }
+  }
+
+  /* describes expanded and succinct version of modulus operator in relation to subtraction (read "ensures") */
+  lemma LemmaSubModNoop(x: int, y: int, m: int)
+    requires 0 < m
+    ensures ((x % m) - (y % m)) % m == (x - y) % m
+  {
+    LemmaModAuto(m);
+  }
+
+  lemma LemmaSubModNoopAuto()
+    ensures forall x: int, y: int, m: int {:trigger (x - y) % m}
+              :: 0 < m ==> ((x % m) - (y % m)) % m == (x - y) % m
+  {
+    // https://github.com/dafny-lang/dafny/issues/4771
+    forall x: int, y: int, m: int {:trigger x % m - y % m} | 0 < m
+      ensures ((x % m) - (y % m)) % m == (x - y) % m
+    {
+      LemmaSubModNoop(x, y, m);
+    }
+  }
+
+  /* describes expanded and succinct version of modulus operator in relation to subtraction (read "ensures") */
+  lemma LemmaSubModNoopRight(x: int, y: int, m: int)
+    requires 0 < m
+    ensures (x - (y % m)) % m == (x - y) % m
+  {
+    LemmaModAuto(m);
+  }
+
+  lemma LemmaSubModNoopRightAuto()
+    ensures forall x: int, y: int, m: int {:trigger (x - y) % m}
+              :: 0 < m ==> (x - (y % m)) % m == (x - y) % m
+  {
+    // https://github.com/dafny-lang/dafny/issues/4771
+    forall x: int, y: int, m: int {:trigger x - y % m} | 0 < m
+      ensures (x - (y % m)) % m == (x - y) % m
+    {
+      LemmaSubModNoopRight(x, y, m);
+    }
+  }
+
+  /* proves equivalent forms of modulus addition */
+  lemma LemmaModAdds(a: int, b: int, d: int)
+    requires 0 < d
+    ensures a % d + b % d == (a + b) % d + d * ((a % d + b % d) / d)
+    ensures (a % d + b % d) < d ==> a % d + b % d == (a + b) % d
+  {
+    LemmaMulAuto();
+    LemmaDivAuto(d);
+  }
+
+  lemma LemmaModAddsAuto()
+    ensures forall a: int, b: int, d: int {:trigger (a + b) % d}
+              :: 0 < d ==> && a % d + b % d == (a + b) % d + d * ((a % d + b % d) / d)
+                           && ((a % d + b % d) < d ==> a % d + b % d == (a + b) % d)
+  {
+    forall a: int, b: int, d: int | 0 < d
+      ensures && a % d + b % d == (a + b) % d + d * ((a % d + b % d) / d)
+              && ((a % d + b % d) < d ==> a % d + b % d == (a + b) % d)
+    {
+      LemmaModAdds(a, b, d);
+    }
+  }
+
+  @IsolateAssertions
+  lemma LemmaModNegNeg(x: int, d: int)
+    requires 0 < d
+    ensures x % d == (x * (1 - d)) % d
+  {
+    assert (x - x * d) % d == x % d
+    by {
+      LemmaModAuto(d);
+      var f := i => (x - i * d) % d == x % d;
+      assert  MulAuto() ==> && f(0)
+                            && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && f(i) ==> f(i + 1))
+                            && (forall i {:trigger IsLe(i, 0)} :: IsLe(i, 0) && f(i) ==> f(i - 1));
+      LemmaMulInductionAuto(x, f);
+    }
+    LemmaMulAuto();
+  }
+
+  /* proves the validity of the quotient and remainder */
+  @TimeLimitMultiplier(5)
+  lemma LemmaFundamentalDivModConverse(x: int, d: int, q: int, r: int)
+    requires d != 0
+    requires 0 <= r < d
+    requires x == q * d + r
+    ensures q == x / d
+    ensures r == x % d
+  {
+    LemmaDivAuto(d);
+    LemmaMulInductionAuto(q, u => u == (u * d + r) / d);
+    LemmaMulInductionAuto(q, u => r == (u * d + r) % d);
+  }
+
+  @TimeLimitMultiplier(5)
+  lemma LemmaFundamentalDivModConverseAuto()
+    ensures forall x: int, d: int, q: int, r: int {:trigger q * d + r, x % d}
+              :: d != 0 && 0 <= r < d && x == q * d + r ==> q == x / d && r == x % d
+  {
+    // https://github.com/dafny-lang/dafny/issues/4771
+    forall x: int, d: int, q: int, r: int {:trigger x / d, q * d, r < d} {:trigger x / d, q * d, 0 <= r}
+      | d != 0 && 0 <= r < d && x == q * d + r
+      ensures q == x / d && r == x % d
+    {
+      LemmaFundamentalDivModConverse(x, d, q, r);
+    }
+  }
+
+
+  /* the remainder of any natural number x divided by a positive integer m is always less than m */
+  lemma LemmaModPosBound(x: int, m: int)
+    decreases x
+    requires 0 <= x
+    requires 0 < m
+    ensures  0 <= x % m < m
+  {
+    LemmaModAuto(m);
+  }
+
+  lemma LemmaModPosBoundAuto()
+    ensures forall x: int, m: int {:trigger x % m} :: 0 <= x && 0 < m ==> 0 <= x % m < m
+  {
+    forall x: int, m: int | 0 <= x && 0 < m
+      ensures 0 <= x % m < m
+    {
+      LemmaModPosBound(x, m);
+    }
+  }
+
+  lemma LemmaMulModNoopLeft(x: int, y: int, m: int)
+    requires 0 < m
+    ensures (x % m) * y % m == x * y % m
+  {
+    LemmaModAuto(m);
+    LemmaMulInductionAuto(y, u => (x % m) * u % m == x * u % m);
+  }
+
+  lemma LemmaMulModNoopLeftAuto()
+    ensures forall x: int, y: int, m: int {:trigger x * y % m} :: 0 < m ==> (x % m) * y % m == x * y % m
+  {
+    forall x: int, y: int, m: int | 0 < m
+      ensures (x % m) * y % m == x * y % m
+    {
+      LemmaMulModNoopLeft(x, y, m);
+    }
+  }
+
+  lemma LemmaMulModNoopRight(x: int, y: int, m: int)
+    requires 0 < m
+    ensures x * (y % m) % m == (x * y) % m
+  {
+    LemmaModAuto(m);
+    LemmaMulInductionAuto(x, u => u * (y % m) % m == (u * y) % m);
+  }
+
+  lemma LemmaMulModNoopRightAuto()
+    ensures forall x: int, y: int, m: int {:trigger (x * y) % m}
+              :: 0 < m ==> x * (y % m) % m == (x * y) % m
+  {
+    forall x: int, y: int, m: int | 0 < m
+      ensures x * (y % m) % m == (x * y) % m
+    {
+      LemmaMulModNoopRight(x, y, m);
+    }
+  }
+
+  /* combines previous no-op mod lemmas into a general, overarching lemma */
+  lemma LemmaMulModNoopGeneral(x: int, y: int, m: int)
+    requires 0 < m
+    ensures ((x % m) * y      ) % m == (x * y) % m
+    ensures ( x      * (y % m)) % m == (x * y) % m
+    ensures ((x % m) * (y % m)) % m == (x * y) % m
+  {
+    LemmaModPropertiesAuto();
+    LemmaMulModNoopLeft(x, y, m);
+    LemmaMulModNoopRight(x, y, m);
+    LemmaMulModNoopRight(x % m, y, m);
+  }
+
+  lemma LemmaMulModNoopGeneralAuto()
+    ensures forall x: int, y: int, m: int {:trigger (x * y) % m}
+              :: 0 < m ==> ((x % m) * y) % m == (x * (y % m)) % m == ((x % m) * (y % m)) % m == (x * y) % m
+  {
+    forall x: int, y: int, m: int | 0 < m
+      ensures ((x % m) * y) % m == (x * (y % m)) % m == ((x % m) * (y % m)) % m == (x * y) % m
+    {
+      LemmaMulModNoopGeneral(x, y, m);
+    }
+  }
+
+  lemma LemmaMulModNoop(x: int, y: int, m: int)
+    requires 0 < m
+    ensures (x % m) * (y % m) % m == (x * y) % m
+  {
+    LemmaMulModNoopGeneral(x, y, m);
+  }
+
+  lemma LemmaMulModNoopAuto()
+    ensures forall x: int, y: int, m: int {:trigger (x * y) % m}
+              :: 0 < m ==> (x % m) * (y % m) % m == (x * y) % m
+  {
+    forall x: int, y: int, m: int | 0 < m
+      ensures (x % m) * (y % m) % m == (x * y) % m
+    {
+      LemmaMulModNoop(x, y, m);
+    }
+  }
+
+  /* proves modulus equivalence in two forms */
+  lemma LemmaModEquivalence(x: int, y: int, m: int)
+    requires 0 < m
+    ensures x % m == y % m <==> (x - y) % m == 0
+  {
+    LemmaModAuto(m);
+  }
+
+  lemma LemmaModEquivalenceAuto()
+    ensures forall x: int, y: int, m: int {:trigger  x % m , y % m}
+              :: 0 < m && x % m == y % m <==> 0 < m && (x - y) % m == 0
+  {
+    forall x: int, y: int, m: int | 0 < m
+      ensures x % m == y % m <==> 0 < m && (x - y) % m == 0
+    {
+      LemmaModEquivalence(x, y, m);
+    }
+  }
+
+  /* true if x%n and y%n are equal */
+  ghost predicate IsModEquivalent(x: int, y: int, m: int)
+    requires m > 0
+    ensures x % m == y % m <==> (x - y) % m == 0
+  {
+    LemmaModEquivalence(x, y, m);
+    (x - y) % m == 0 // same as x % n == y % n, but easier to do induction on x - y than x and y separately
+  }
+
+  /* if x % m == y % m, then (x * z) % m == (y * z) % m. */
+  lemma LemmaModMulEquivalent(x: int, y: int, z: int, m: int)
+    requires m > 0
+    requires IsModEquivalent(x, y, m)
+    ensures IsModEquivalent(x * z, y * z, m)
+  {
+    LemmaMulModNoopLeft(x, z, m);
+    LemmaMulModNoopLeft(y, z, m);
+  }
+
+  lemma LemmaModMulEquivalentAuto()
+    ensures forall x: int, y: int, z: int, m: int
+              {:trigger IsModEquivalent(x * z, y * z, m)}
+              :: m > 0 && IsModEquivalent(x, y, m) ==> IsModEquivalent(x * z, y * z, m)
+  {
+    forall x: int, y: int, z: int, m: int | m > 0 && IsModEquivalent(x, y, m)
+      ensures IsModEquivalent(x * z, y * z, m)
+    {
+      LemmaModMulEquivalent(x, y, z, m);
+    }
+  }
+
+  /* the remainder can increase with a larger divisor */
+  lemma LemmaModOrdering(x: int, k: int, d: int)
+    requires 1 < d
+    requires 0 < k
+    ensures 0 < d * k
+    ensures x % d <= x % (d * k)
+  {
+    LemmaMulStrictlyIncreases(d,k);
+    calc {
+      x % d + d * (x / d);
+      { LemmaFundamentalDivMod(x, d); }
+      x;
+      { LemmaFundamentalDivMod(x, d * k); }
+      x % (d * k) + (d * k) * (x / (d * k));
+      { LemmaMulIsAssociativeAuto(); }
+      x % (d * k) + d * (k * (x / (d * k)));
+    }
+    calc {
+      x % d;
+       { LemmaModPropertiesAuto(); }
+      (x % d) % d;
+       { LemmaModMultiplesVanish(x / d  - k * (x / (d * k)), x % d, d); }
+      (x % d + d * (x / d  - k * (x / (d * k)))) % d;
+       { LemmaMulIsDistributiveSubAuto(); }
+      (x % d + d * (x / d) - d * (k * (x / (d * k)))) % d;
+      (x % (d * k)) % d;
+    <= { LemmaModPropertiesAuto();
+         LemmaModDecreases(x % (d * k), d); }
+      x % (d * k);
+    }
+  }
+
+  lemma LemmaModOrderingAuto()
+    ensures forall k: int, d: int {:trigger d * k}
+              :: 1 < d && 0 < k ==> 0 < d * k
+    ensures forall x: int, k: int, d: int {:trigger x % (d * k)}
+              :: 1 < d && 0 < k ==> x % d <= x % (d * k)
+  {
+    forall k: int, d: int {:trigger d * k} | (1 < d && 0 < k)
+      ensures 1 < d && 0 < k ==> 0 < d * k
+    {
+      LemmaMulStrictlyIncreases(d, k);
+    }
+    forall x: int, k: int, d: int {:trigger x % (d * k)} | (1 < d && 0 < k)
+      ensures (1 < d && 0 < k) ==> (x % d <= x % (d * k))
+    {
+      LemmaModOrdering(x, k, d);
+    }
+  }
+
+  lemma LemmaModMod(x: int, a: int, b: int)
+    requires 0 < a
+    requires 0 < b
+    ensures 0 < a * b
+    ensures (x % (a * b)) % a == x % a
+  {
+    LemmaMulStrictlyPositiveAuto();
+    calc {
+      x;
+      { LemmaFundamentalDivMod(x, a * b); }
+      (a * b) * (x / (a * b)) + x % (a * b);
+      { LemmaMulIsAssociativeAuto(); }
+      a * (b * (x / (a * b))) + x % (a * b);
+      { LemmaFundamentalDivMod(x % (a * b), a); }
+      a * (b * (x / (a * b))) + a * (x % (a * b) / a) + (x % (a * b)) % a;
+      { LemmaMulIsDistributiveAuto(); }
+      a * (b * (x / (a * b)) + x % (a * b) / a) + (x % (a * b)) % a;
+    }
+    LemmaModPropertiesAuto();
+    LemmaMulIsCommutativeAuto();
+    LemmaFundamentalDivModConverse(x, a, b * (x / (a * b)) + x % (a * b) / a, (x % (a * b)) % a);
+  }
+
+  lemma LemmaModModAuto()
+    ensures forall a: int, b: int {:trigger a * b}
+              :: 0 < a && 0 < b ==> 0 < a * b
+    ensures forall x: int, a: int, b: int {:trigger (x % (a * b)) % a, x % a}
+              :: 0 < a && 0 < b ==> (x % (a * b)) % a == x % a
+  {
+    forall a: int, b: int {:trigger a * b} | 0 < a && 0 < b
+      ensures 0 < a * b
+    {
+      LemmaMulStrictlyPositiveAuto();
+    }
+    forall x: int, a: int, b: int | 0 < a && 0 < b
+      ensures (x % (a * b)) % a == x % a
+    {
+      LemmaModMod(x, a, b);
+    }
+  }
+
+  lemma LemmaPartBound2(x: int, y: int, z: int)
+    requires 0 <= x
+    requires 0 < y
+    requires 0 < z
+    ensures y * z > 0
+    ensures (x % y) % (y * z) < y
+  {
+    LemmaMulStrictlyPositiveAuto();
+    LemmaModPropertiesAuto();
+    assert x % y < y;
+    LemmaMulIncreasesAuto();
+    LemmaMulIsCommutativeAuto();
+    assert y <= y * z;
+    assert 0 <= x % y < y * z;
+    LemmaModPropertiesAuto();
+    LemmaSmallMod(x % y, y * z);
+    assert (x % y) % (y * z) == x % y;
+  }
+
+  lemma LemmaPartBound2Auto()
+    ensures forall x: int, y: int, z: int {:trigger y * z, x % y}
+              :: 0 <= x && 0 < y && 0 < z ==> y * z > 0 && (x % y) % (y * z) < y
+  {
+    // https://github.com/dafny-lang/dafny/issues/4771
+    forall x: int, y: int, z: int {:trigger y * z, 0 <= x} {:trigger 0 < z, 0 < y, 0 <= x} | 0 <= x && 0 < y && 0 < z
+      ensures y * z > 0 && (x % y) % (y * z) < y
+    {
+      LemmaPartBound2(x, y, z);
+    }
+  }
+
+  /* ensures the validity of an expanded form of the modulus operation,
+   as expressed in the pre and post conditions */
+  lemma LemmaModBreakdown(x: int, y: int, z: int)
+    requires 0 <= x
+    requires 0 < y
+    requires 0 < z
+    ensures y * z > 0
+    ensures x % (y * z) == y * ((x / y) % z) + x % y
+  {
+    LemmaMulStrictlyPositiveAuto();
+    LemmaDivPosIsPos(x, y);
+    assert 0 <= x / y;
+
+    calc {
+      (y * (x / y)) % (y * z) + (x % y) % (y * z);
+    <=    { LemmaPartBound1(x, y, z); }
+      y * (z - 1) + (x % y) % (y * z);
+    <    { LemmaPartBound2(x, y, z); }
+      y * (z - 1) + y;
+          { LemmaMulBasicsAuto(); }
+      y * (z - 1) + y * 1;
+          { LemmaMulIsDistributiveAuto(); }
+      y * (z - 1 + 1);
+      y * z;
+    }
+
+    calc {
+      x % (y * z);
+      { LemmaFundamentalDivMod(x, y); }
+      (y * (x / y) + x%  y) % (y * z);
+      {
+        LemmaModPropertiesAuto();
+        assert 0 <= x % y;
+        LemmaMulNonnegative(y, x / y);
+        assert (y * (x / y)) % (y * z) + (x % y) % (y * z) < y * z;
+        LemmaModAdds(y * (x / y), x % y, y * z);
+      }
+      (y * (x / y)) % (y * z) + (x % y) % (y * z);
+      {
+        LemmaModPropertiesAuto();
+        LemmaMulIncreases(z, y);
+        LemmaMulIsCommutativeAuto();
+        assert x % y < y <= y * z;
+        LemmaSmallMod(x % y, y * z);
+        assert (x % y) % (y * z) == x % y;
+      }
+      (y * (x / y)) % (y * z) + x % y;
+      { LemmaTruncateMiddle(x / y, y, z); }
+      y * ((x / y) % z) + x % y;
+    }
+  }
+
+  lemma LemmaModBreakdownAuto()
+    ensures forall x: int, y: int, z: int {:trigger x % (y * z)}
+              :: 0 <= x && 0 < y && 0 < z ==> y * z > 0 && x % (y * z) == y * ((x / y) % z) + x % y
+  {
+    forall x: int, y: int, z: int | 0 <= x && 0 < y && 0 < z
+      ensures y * z > 0 && x % (y * z) == y * ((x / y) % z) + x % y
+    {
+      LemmaModBreakdown(x, y, z);
+    }
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/DivInternals.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/DivInternals.dfy
new file mode 100644
index 00000000000..d498fa33c4b
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/DivInternals.dfy
@@ -0,0 +1,234 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/* lemmas and functions in this file are used in the proofs in DivMod.dfy 
+
+Specs/implements mathematical div and mod, not the C version.
+(x div n) * n + (x mod n) == x, where 0 <= x mod n < n.
+https://en.wikipedia.org/wiki/Modulo_operation
+
+This may produce "surprising" results for negative values.
+For example, -3 div 5 is -1 and -3 mod 5 is 2.
+Note this is consistent: -3 * -1 + 2 == 5 */
+
+@DisableNonlinearArithmetic
+module Std.Arithmetic.DivInternals {
+
+  import opened GeneralInternals
+  import opened ModInternals
+  import opened ModInternalsNonlinear
+  import opened DivInternalsNonlinear
+  import opened MulInternals
+
+  /* Performs division recursively with positive denominator. */
+  function DivPos(x: int, d: int): int
+    requires d > 0
+    decreases if x < 0 then (d - x) else x
+  {
+    if x < 0 then
+      -1 + DivPos(x + d, d)
+    else if x < d then
+      0
+    else
+      1 + DivPos(x - d, d)
+  }
+
+  /* Performs division recursively. */
+  function DivRecursive(x: int, d: int): int
+    requires d != 0
+  {
+    if d > 0 then
+      DivPos(x, d)
+    else
+      -1 * DivPos(x, -1 * d)
+  }
+
+  /* Proves the basics of the division operation */
+  lemma LemmaDivBasics(n: int)
+    requires n > 0
+    ensures  n / n == -((-n) / n) == 1
+    ensures  forall x:int {:trigger x / n} :: 0 <= x < n <==> x / n == 0
+    ensures  forall x:int {:trigger (x + n) / n} :: (x + n) / n == x / n + 1
+    ensures  forall x:int {:trigger (x - n) / n} :: (x - n) / n == x / n - 1
+  {
+    LemmaModAuto(n);
+    LemmaModBasics(n);
+    LemmaSmallDiv();
+    LemmaDivBySelf(n);
+    forall x: int | x / n == 0
+      ensures 0 <= x < n
+    {
+      LemmaFundamentalDivMod(x, n);
+    }
+  }
+
+  /* Automates the division operator process. Contains the identity property, a
+  fact about when quotients are zero, and facts about adding and subtracting
+  integers over a common denominator. */
+  ghost predicate DivAuto(n: int)
+    requires n > 0
+  {
+    && ModAuto(n)
+    && (n / n == -((-n) / n) == 1)
+    && (forall x: int {:trigger x / n} :: 0 <= x < n <==> x / n == 0)
+    && DivAutoMinus(n)
+    && DivAutoPlus(n)
+  }
+
+  ghost predicate DivAutoPlus(n: int)
+    requires n > 0
+  {
+    forall x: int, y: int {:trigger (x + y) / n} :: DivPlus(n, x, y)
+  }
+
+  ghost predicate DivPlus(n: int, x: int, y: int)
+    requires n > 0
+  {
+    var z := (x % n) + (y % n);
+    (0 <= z < n && (x + y) / n == x / n + y / n) ||
+    (n <= z < n + n && (x + y) / n == x / n + y / n + 1)
+  }
+
+  ghost predicate DivAutoMinus(n: int)
+    requires n > 0
+  {
+    forall x: int, y: int {:trigger (x - y) / n} :: DivMinus(n, x, y)
+  }
+
+  ghost predicate DivMinus(n: int, x: int, y: int)
+    requires n > 0
+  {
+    var z := (x % n) - (y % n);
+    (0 <= z < n && (x - y) / n == x / n - y / n) ||
+    (-n <= z < 0 && (x - y) / n == x / n - y / n - 1)
+  }
+
+  @IsolateAssertions
+  lemma LemmaDivAutoAuxPlus(n: int)
+    requires n > 0 && ModAuto(n)
+    ensures DivAutoPlus(n)
+  {
+    LemmaModAuto(n);
+    LemmaDivBasics(n);
+
+    var f := (x:int, y:int) => DivPlus(n, x, y);
+    forall i, j
+      ensures j >= 0 && f(i, j) ==> f(i, j + n)
+      ensures i < n  && f(i, j) ==> f(i - n, j)
+      ensures j < n  && f(i, j) ==> f(i, j - n)
+      ensures i >= 0 && f(i, j) ==> f(i + n, j)
+      ensures 0 <= i < n && 0 <= j < n ==> f(i, j)
+    {
+      assert ((i + n) + j) / n == ((i + j) + n) / n;
+      assert (i + (j + n)) / n == ((i + j) + n) / n;
+      assert ((i - n) + j) == ((i + j) - n);
+      assert ((i - n) + j) / n == ((i + j) - n) / n;
+      assert (i + (j - n)) / n == ((i + j) - n) / n;
+    }
+    forall x:int, y:int
+      ensures DivPlus(n, x, y)
+    {
+      LemmaModInductionForall2(n, f);
+      assert f(x, y);
+    }
+  }
+
+  @IsolateAssertions
+  lemma LemmaDivAutoAuxMinusHelper(n: int)
+    requires n > 0 && ModAuto(n)
+    ensures forall i, j ::
+              && (j >= 0 && DivMinus(n, i, j) ==> DivMinus(n, i, j + n))
+              && (i < n  && DivMinus(n, i, j) ==> DivMinus(n, i - n, j))
+              && (j < n  && DivMinus(n, i, j) ==> DivMinus(n, i, j - n))
+              && (i >= 0 && DivMinus(n, i, j) ==> DivMinus(n, i + n, j))
+              && (0 <= i < n && 0 <= j < n ==> DivMinus(n, i, j))
+  {
+    LemmaModAuto(n);
+    LemmaDivBasics(n);
+    forall i, j
+      ensures j >= 0 && DivMinus(n, i, j) ==> DivMinus(n, i, j + n)
+      ensures i < n  && DivMinus(n, i, j) ==> DivMinus(n, i - n, j)
+      ensures j < n  && DivMinus(n, i, j) ==> DivMinus(n, i, j - n)
+      ensures i >= 0 && DivMinus(n, i, j) ==> DivMinus(n, i + n, j)
+      ensures 0 <= i < n && 0 <= j < n ==> DivMinus(n, i, j)
+    {
+      assert ((i + n) - j) / n == ((i - j) + n) / n;
+      assert (i - (j - n)) / n == ((i - j) + n) / n;
+      assert ((i - n) - j) / n == ((i - j) - n) / n;
+      assert (i - (j + n)) / n == ((i - j) - n) / n;
+    }
+  }
+
+  lemma LemmaDivAutoAuxMinus(n: int)
+    requires n > 0 && ModAuto(n)
+    ensures DivAutoMinus(n)
+  {
+    LemmaDivAutoAuxMinusHelper(n);
+    var f := (x:int, y:int) => DivMinus(n, x, y);
+    LemmaModInductionForall2(n, f);
+    forall x:int, y:int
+      ensures DivMinus(n, x, y)
+    {
+      assert f(x, y);
+    }
+  }
+
+  lemma LemmaDivAutoAux(n: int)
+    requires n > 0 && ModAuto(n)
+    ensures DivAuto(n)
+  {
+    LemmaDivBasics(n);
+    assert (0 + n) / n == 1;
+    assert (0 - n) / n == -1;
+    LemmaDivAutoAuxPlus(n);
+    LemmaDivAutoAuxMinus(n);
+  }
+
+  /* Ensures that DivAuto is true */
+  lemma LemmaDivAuto(n: int)
+    requires n > 0
+    ensures  DivAuto(n)
+  {
+    LemmaModAuto(n);
+    LemmaDivAutoAux(n);
+  }
+
+  /* Performs auto induction for division */
+  lemma LemmaDivInductionAuto(n: int, x: int, f: int->bool)
+    requires n > 0
+    requires DivAuto(n) ==> && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && i < n ==> f(i))
+                            && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && f(i) ==> f(i + n))
+                            && (forall i {:trigger IsLe(i + 1, n)} :: IsLe(i + 1, n) && f(i) ==> f(i - n))
+    ensures  DivAuto(n)
+    ensures  f(x)
+  {
+    LemmaDivAuto(n);
+    assert forall i :: IsLe(0, i) && i < n ==> f(i);
+    assert forall i {:trigger f(i), f(i + n)} :: IsLe(0, i) && f(i) ==> f(i + n);
+    assert forall i {:trigger f(i), f(i - n)} :: IsLe(i + 1, n) && f(i) ==> f(i - n);
+    LemmaModInductionForall(n, f);
+    assert f(x);
+  }
+
+  /* Performs auto induction on division for all i s.t. f(i) exists */
+  lemma LemmaDivInductionAutoForall(n:int, f:int->bool)
+    requires n > 0
+    requires DivAuto(n) ==> && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && i < n ==> f(i))
+                            && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && f(i) ==> f(i + n))
+                            && (forall i {:trigger IsLe(i + 1, n)} :: IsLe(i + 1, n) && f(i) ==> f(i - n))
+    ensures  DivAuto(n)
+    ensures  forall i {:trigger f(i)} :: f(i)
+  {
+    LemmaDivAuto(n);
+    assert forall i :: IsLe(0, i) && i < n ==> f(i);
+    assert forall i {:trigger f(i), f(i + n)} :: IsLe(0, i) && f(i) ==> f(i + n);
+    assert forall i {:trigger f(i), f(i - n)} :: IsLe(i + 1, n) && f(i) ==> f(i - n);
+    LemmaModInductionForall(n, f);
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/DivInternalsNonlinear.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/DivInternalsNonlinear.dfy
new file mode 100644
index 00000000000..2f1b3b64ca0
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/DivInternalsNonlinear.dfy
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+module {:z3ArithmeticSolver 6} Std.Arithmetic.DivInternalsNonlinear {
+
+  /* WARNING: Think three times before adding to this file, as nonlinear
+  verification is highly unstable! */
+
+  /* zero divided by an integer besides 0 is 0 */
+  lemma LemmaDivOf0(d:int)
+    requires d != 0
+    ensures 0 / d == 0
+  {
+  }
+
+  /* the quotient of an integer divided by itself is 1 */
+  lemma LemmaDivBySelf(d:int)
+    requires d != 0
+    ensures d / d == 1
+  {
+  }
+
+  /* dividing a smaller integer by a larger integer results in a quotient of 0  */
+  lemma LemmaSmallDiv()
+    ensures forall x, d {:trigger x / d} :: 0 <= x < d && d > 0 ==> x / d == 0 {
+  }
+
+  /* the quotient of dividing a positive real number (not 0) by a smaller positive real number
+  will be greater than 1 */
+  lemma LemmaRealDivGt(x:real, y:real)
+    requires x > y
+    requires y > 0.0
+    ensures  x / y > 1 as real {
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/GeneralInternals.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/GeneralInternals.dfy
new file mode 100644
index 00000000000..150307fdee5
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/GeneralInternals.dfy
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+@DisableNonlinearArithmetic
+module Std.Arithmetic.GeneralInternals {
+
+  /* this predicate is primarily used as a trigger */
+  ghost predicate IsLe(x: int, y: int)
+  {
+    x <= y
+  }
+
+  /* aids in the process of induction for modulus */
+  lemma LemmaInductionHelper(n: int, f: int -> bool, x: int)
+    requires n > 0
+    requires forall i :: 0 <= i < n ==> f(i)
+    requires forall i {:trigger f(i), f(i + n)} :: i >= 0 && f(i) ==> f(i + n)
+    requires forall i {:trigger f(i), f(i - n)} :: i < n  && f(i) ==> f(i - n)
+    ensures  f(x)
+    decreases if x >= n then x else -x
+  {
+    if (x >= n)
+    {
+      LemmaInductionHelper(n, f, x - n);
+      assert f((x - n) + n);
+    }
+    else if (x < 0)
+    {
+      LemmaInductionHelper(n, f, x + n);
+      assert f((x + n) - n);
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/ModInternals.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/ModInternals.dfy
new file mode 100644
index 00000000000..d5db3b93ea6
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/ModInternals.dfy
@@ -0,0 +1,419 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/* lemmas and functions in this file are used in the proofs in DivMod.dfy
+
+Specs/implements mathematical div and mod, not the C version.
+(x div n) * n + (x mod n) == x, where 0 <= x mod n < n.
+https://en.wikipedia.org/wiki/Modulo_operation
+
+This may produce "surprising" results for negative values.
+For example, -3 div 5 is -1 and -3 mod 5 is 2.
+Note this is consistent: -3 * -1 + 2 == 5 */
+
+@DisableNonlinearArithmetic
+module Std.Arithmetic.ModInternals {
+
+  import opened GeneralInternals
+  import opened Mul
+  import opened MulInternalsNonlinear
+  import opened MulInternals
+  import opened ModInternalsNonlinear
+  import opened DivInternalsNonlinear
+
+  /* Performs modulus recursively. */
+  function ModRecursive(x: int, d: int): int
+    requires d > 0
+    decreases if x < 0 then (d - x) else x
+  {
+    if x < 0 then
+      ModRecursive(d + x, d)
+    else if x < d then
+      x
+    else
+      ModRecursive(x - d, d)
+  }
+
+  /* performs induction on modulus */
+  lemma LemmaModInductionForall(n: int, f: int -> bool)
+    requires n > 0
+    requires forall i :: 0 <= i < n ==> f(i)
+    requires forall i {:trigger f(i), f(i + n)} :: i >= 0 && f(i) ==> f(i + n)
+    requires forall i {:trigger f(i), f(i - n)} :: i < n  && f(i) ==> f(i - n)
+    ensures  forall i :: f(i)
+  {
+    forall i ensures f(i) { LemmaInductionHelper(n, f, i); }
+  }
+
+  /* given an integer x and divisor n, the remainder of x%n is equivalent to the remainder of (x+m)%n
+  where m is a multiple of n */
+  lemma LemmaModInductionForall2(n: int, f:(int, int)->bool)
+    requires n > 0
+    requires forall i, j :: 0 <= i < n && 0 <= j < n ==> f(i, j)
+    requires forall i, j {:trigger f(i, j), f(i + n, j)} :: i >= 0 && f(i, j) ==> f(i + n, j)
+    requires forall i, j {:trigger f(i, j), f(i, j + n)} :: j >= 0 && f(i, j) ==> f(i, j + n)
+    requires forall i, j {:trigger f(i, j), f(i - n, j)} :: i < n  && f(i, j) ==> f(i - n, j)
+    requires forall i, j {:trigger f(i, j), f(i, j - n)} :: j < n  && f(i, j) ==> f(i, j - n)
+    ensures  forall i, j :: f(i, j)
+  {
+    forall x, y
+      ensures f(x, y)
+    {
+      forall i | 0 <= i < n
+        ensures f(i, y)
+      {
+        var fj := j => f(i, j);
+        LemmaModInductionForall(n, fj);
+        assert fj(y);
+      }
+      var fi := i => f(i, y);
+      LemmaModInductionForall(n, fi);
+      assert fi(x);
+    }
+  }
+
+
+  @IsolateAssertions
+  lemma HelperAddDenom (n : int, x : int)
+    requires n > 0
+    ensures  var zp := (x + n) / n - x / n - 1; 0 == n * zp + ((x + n) % n) - (x % n)
+  {
+    var zp := (x + n) / n - x / n - 1;
+    assert 0 == n * zp + ((x + n) % n) - (x % n) by {
+      assert x == n * (x / n) + (x % n) by {LemmaFundamentalDivMod(x, n);}
+      assert x + n == n * ((x + n)/ n) + ((x + n) % n) by {LemmaFundamentalDivMod(x + n, n);}
+      calc {
+        n;
+        n * ((x + n)/ n) - n * (x / n) + ((x + n) % n) - (x % n); {
+          LemmaMulDistributesSpecific (((x + n)/ n), x/n, n);
+          assert  n * ((x + n)/ n) - n * (x / n) == ((x + n)/ n - x / n) * n;
+        }
+        n * ((x + n)/ n - x / n) + ((x + n) % n) - (x % n);
+        n * (zp + 1) + ((x + n) % n) - (x % n);
+      }
+      calc {
+        0; // subtract the result of the above calc to get 0
+        n * (zp + 1) + ((x + n) % n) - (x % n) - n; {
+          LemmaMulDistributesSpecific (zp, 1, n);
+          assert (zp + 1) * n == n * (zp) + 1 * n;
+        }
+        n * (zp) + n + ((x + n) % n) - (x % n) - n;
+        n * zp + ((x + n) % n) - (x % n);
+      }
+    }
+  }
+
+  @IsolateAssertions
+  lemma HelperSubDenom (n : int, x : int)
+    requires n > 0
+    ensures var zm := (x - n) / n - x / n + 1; 0 == n * zm + ((x - n) % n) - (x % n)
+  {
+    var zm := (x - n) / n - x / n + 1;
+    assert 0 == n * zm + ((x - n) % n) - (x % n) by {
+      assert x == n * (x / n) + (x % n) by {LemmaFundamentalDivMod(x, n);}
+      assert x - n == n * ((x - n)/ n) + ((x - n) % n) by {LemmaFundamentalDivMod(x - n, n);}
+      calc {
+        n;
+        n * (x / n) - n * ((x - n)/ n) + (x % n) - ((x - n) % n); {
+          LemmaMulDistributesSpecific (x / n, (x - n)/ n, n);
+          assert  n * (x / n) - n * ((x - n)/ n) ==  n * (x / n - (x - n)/ n);
+        }
+        n * (x / n - (x - n)/ n) + (x % n) - ((x - n) % n);
+        n * (1 - zm) + (x % n) - ((x - n) % n);
+      }
+      calc {
+        0; // subtract the result of the above calc to get 0
+        n * (1 - zm) + (x % n) - ((x - n) % n) - n; {
+          LemmaMulDistributesSpecific (1, zm, n);
+          assert (1 - zm) * n == 1 * n - zm * n;
+        }
+        n - n * zm + (x % n) - ((x - n) % n) - n;
+        (x % n) - (x - n) % n - n * zm;
+      }
+    }
+  }
+
+
+
+  @IsolateAssertions
+  lemma LemmaDivAddDenominator(n: int, x: int)
+    requires n > 0
+    ensures (x + n) / n == x / n + 1
+  {
+    var zp := (x + n) / n - x / n - 1;
+    assert 0 == n * zp + ((x + n) % n) - (x % n) by { HelperAddDenom(n, x); }
+    assert zp == 0 by {
+      if zp > 0 {
+        LemmaMulInequality(1, zp, n);
+        assert zp == 0;
+      } else if zp < 0 {
+        LemmaMulInequality(zp, -1, n);
+        assert zp == 0;
+      }
+    }
+  }
+
+  @IsolateAssertions
+  lemma LemmaDivSubDenominator(n: int, x: int)
+    requires n > 0
+    ensures (x - n) / n == x / n - 1
+  {
+    LemmaFundamentalDivMod(x, n);
+    LemmaFundamentalDivMod(x - n, n);
+    var zm := (x - n) / n - x / n + 1;
+    assert 0 == n * zm + ((x - n) % n) - (x % n) by { HelperSubDenom (n, x); }
+    assert zm == 0 by {
+      if zm > 0 {
+        LemmaMulInequality(1, zm, n);
+        assert zm == 0;
+      }
+      else if zm < 0 {
+        LemmaMulInequality(zm, -1, n);
+        assert zm == 0;
+      }
+    }
+  }
+
+  @IsolateAssertions
+  lemma LemmaModAddDenominator(n: int, x: int)
+    requires n > 0
+    ensures (x + n) % n == x % n
+  {
+    var zp := (x + n) / n - x / n - 1;
+    assert 0 == n * zp + ((x + n) % n) - (x % n) by { HelperAddDenom(n, x); }
+    if zp > 0 {
+      assert (x + n) % n == x % n by {
+        LemmaMulInequality(1, zp, n);
+      }
+    }
+    if zp < 0 {
+      assert (x + n) % n == x % n by {
+        LemmaMulInequality(zp, -1, n);
+      }
+    }
+  }
+
+  @IsolateAssertions
+  lemma LemmaModSubDenominator(n: int, x: int)
+    requires n > 0
+    ensures (x - n) % n == x % n
+  {
+    LemmaFundamentalDivMod(x, n);
+    LemmaFundamentalDivMod(x - n, n);
+    var zm := (x - n) / n - x / n + 1;
+    assert 0 == n * zm + ((x - n) % n) - (x % n) by { HelperSubDenom(n, x); }
+    if zm > 0 {
+      assert (x - n) % n == x % n by {
+        LemmaMulInequality(1, zm, n);
+      }
+    }
+    if zm < 0 {
+      assert (x - n) % n == x % n by {
+        LemmaMulInequality(zm, -1, n);
+      }
+    }
+  }
+
+  lemma LemmaModBelowDenominator(n: int, x: int)
+    requires n > 0
+    ensures 0 <= x < n <==> x % n == x
+  {
+    forall x: int
+      ensures 0 <= x < n <==> x % n == x
+    {
+      if 0 <= x < n {
+        LemmaSmallMod(x, n);
+      }
+      LemmaModRange(x, n);
+    }
+  }
+
+  /* proves the basics of the modulus operation */
+  lemma LemmaModBasics(n: int)
+    requires n > 0
+    ensures  forall x: int {:trigger (x + n) % n} :: (x + n) % n == x % n
+    ensures  forall x: int {:trigger (x - n) % n} :: (x - n) % n == x % n
+    ensures  forall x: int {:trigger (x + n) / n} :: (x + n) / n == x / n + 1
+    ensures  forall x: int {:trigger (x - n) / n} :: (x - n) / n == x / n - 1
+    ensures  forall x: int {:trigger x % n} :: 0 <= x < n <==> x % n == x
+  {
+    forall x: int
+      ensures (x + n) % n == x % n
+      ensures (x - n) % n == x % n
+      ensures (x + n) / n == x / n + 1
+      ensures (x - n) / n == x / n - 1
+      ensures 0 <= x < n <==> x % n == x
+    {
+      LemmaModBelowDenominator(n, x);
+      LemmaModAddDenominator(n, x);
+      LemmaModSubDenominator(n, x);
+      LemmaDivAddDenominator(n, x);
+      LemmaDivSubDenominator(n, x);
+    }
+  }
+
+  /* proves the quotient remainder theorem */
+  @IsolateAssertions
+  lemma LemmaQuotientAndRemainder(x: int, q: int, r: int, n: int)
+    requires n > 0
+    requires 0 <= r < n
+    requires x == q * n + r
+    ensures  q == x / n
+    ensures  r == x % n
+    decreases if q > 0 then q else -q
+  {
+    LemmaModBasics(n);
+
+    if q > 0 {
+      MulInternalsNonlinear.LemmaMulIsDistributiveAdd(n, q - 1, 1);
+      LemmaMulIsCommutativeAuto();
+      assert q * n + r == (q - 1) * n + n + r;
+      LemmaQuotientAndRemainder(x - n, q - 1, r, n);
+    }
+    else if q < 0 {
+      Mul.LemmaMulIsDistributiveSub(n, q + 1, 1);
+      LemmaMulIsCommutativeAuto();
+      assert q * n + r == (q + 1) * n - n + r;
+      LemmaQuotientAndRemainder(x + n, q + 1, r, n);
+    }
+    else {
+      LemmaSmallDiv();
+      assert r / n == 0;
+    }
+  }
+
+  /* automates the modulus operator process */
+  ghost predicate ModAuto(n: int)
+    requires n > 0
+  {
+    && (n % n == (-n) % n == 0)
+    && (forall x: int {:trigger (x % n) % n} :: (x % n) % n == x % n)
+    && (forall x: int {:trigger x % n} :: 0 <= x < n <==> x % n == x)
+    && ModAutoPlus(n)
+    && ModAutoMinus(n)
+  }
+
+  ghost predicate ModAutoPlus(n: int)
+    requires n > 0
+  {
+    forall x: int, y: int {:trigger (x + y) % n} ::
+      var z := (x % n) + (y % n);
+      || (0 <= z < n     && (x + y) % n == z)
+      || (n <= z < n + n && (x + y) % n == z - n)
+  }
+
+  ghost predicate ModAutoMinus(n: int)
+    requires n > 0
+  {
+    forall x: int, y: int {:trigger (x - y) % n} ::
+      var z := (x % n) - (y % n);
+      || (0 <= z < n && (x - y) % n == z)
+      || (-n <= z < 0 && (x - y) % n == z + n)
+
+  }
+
+  /* ensures that ModAuto is true */
+  lemma LemmaModAuto(n: int)
+    requires n > 0
+    ensures  ModAuto(n)
+  {
+    LemmaModBasics(n);
+
+    LemmaModAutoPlus(n);
+    LemmaModAutoMinus(n);
+  }
+
+  @ResourceLimit("2e6")
+  lemma LemmaModAutoMinus(n: int)
+    requires n > 0
+    ensures ModAutoMinus(n)
+  {
+    LemmaModBasics(n);
+    LemmaMulIsCommutativeAuto();
+    LemmaMulIsDistributiveSubAuto();
+    forall x: int, y: int {:trigger (x - y) % n}
+      ensures var z := (x % n) - (y % n);
+              || (0 <= z < n && (x - y) % n == z)
+              || (-n <= z < 0 && (x - y) % n == z + n)
+    {
+      var xq, xr := x / n, x % n;
+      LemmaFundamentalDivMod(x, n);
+      assert x == xq * n + xr;
+      var yq, yr := y / n, y % n;
+      LemmaFundamentalDivMod(y, n);
+      assert y == yq * n + yr;
+      if xr - yr >= 0 {
+        LemmaQuotientAndRemainder(x - y, xq - yq, xr - yr, n);
+      }
+      else {
+        LemmaQuotientAndRemainder(x - y, xq - yq - 1, xr - yr + n, n);
+      }
+    }
+  }
+
+  lemma LemmaModAutoPlus(n: int)
+    requires n > 0
+    ensures ModAutoPlus(n)
+  {
+    LemmaMulIsCommutativeAuto();
+    LemmaMulIsDistributiveAddAuto();
+    forall x: int, y: int {:trigger (x + y) % n}
+      ensures var z := (x % n) + (y % n);
+              || (0 <= z < n && (x + y) % n == z)
+              || (n <= z < 2 * n && (x + y) % n == z - n)
+    {
+      var xq, xr := x / n, x % n;
+      LemmaFundamentalDivMod(x, n);
+      assert x == xq * n + xr;
+      var yq, yr := y / n, y % n;
+      LemmaFundamentalDivMod(y, n);
+      assert y == yq * n + yr;
+      if xr + yr < n {
+        LemmaQuotientAndRemainder(x + y, xq + yq, xr + yr, n);
+      }
+      else {
+        LemmaQuotientAndRemainder(x + y, xq + yq + 1, xr + yr - n, n);
+      }
+    }
+  }
+
+  /* performs auto induction for modulus */
+  lemma LemmaModInductionAuto(n: int, x: int, f: int -> bool)
+    requires n > 0
+    requires ModAuto(n) ==> && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && i < n ==> f(i))
+                            && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && f(i) ==> f(i + n))
+                            && (forall i {:trigger IsLe(i + 1, n)} :: IsLe(i + 1, n) && f(i) ==> f(i - n))
+    ensures  ModAuto(n)
+    ensures  f(x)
+  {
+    LemmaModAuto(n);
+    assert forall i :: IsLe(0, i) && i < n ==> f(i);
+    assert forall i {:trigger f(i), f(i + n)} :: IsLe(0, i) && f(i) ==> f(i + n);
+    assert forall i {:trigger f(i), f(i - n)} :: IsLe(i + 1, n) && f(i) ==> f(i - n);
+    LemmaModInductionForall(n, f);
+    assert f(x);
+  }
+
+  // not used in other files
+  /* performs auto induction on modulus for all i s.t. f(i) exists */
+  lemma LemmaModInductionAutoForall(n: int, f: int -> bool)
+    requires n > 0
+    requires ModAuto(n) ==> && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && i < n ==> f(i))
+                            && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && f(i) ==> f(i + n))
+                            && (forall i {:trigger IsLe(i + 1, n)} :: IsLe(i + 1, n) && f(i) ==> f(i - n))
+    ensures  ModAuto(n)
+    ensures  forall i {:trigger f(i)} :: f(i)
+  {
+    LemmaModAuto(n);
+    assert forall i :: IsLe(0, i) && i < n ==> f(i);
+    assert forall i {:trigger f(i), f(i + n)} :: IsLe(0, i) && f(i) ==> f(i + n);
+    assert forall i {:trigger f(i), f(i - n)} :: IsLe(i + 1, n) && f(i) ==> f(i - n);
+    LemmaModInductionForall(n, f);
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/ModInternalsNonlinear.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/ModInternalsNonlinear.dfy
new file mode 100644
index 00000000000..da6ef31e2ba
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/ModInternalsNonlinear.dfy
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+module {:z3ArithmeticSolver 6} Std.Arithmetic.ModInternalsNonlinear {
+
+  /* WARNING: Think three times before adding to this file, as nonlinear
+  verification is highly unstable! */
+
+  /* the remainder of 0 divided by an integer is 0 */
+  lemma LemmaModOfZeroIsZero(m:int)
+    requires 0 < m
+    ensures 0 % m == 0
+  {
+  }
+
+  /* describes fundementals of the modulus operator */
+  lemma LemmaFundamentalDivMod(x:int, d:int)
+    requires d != 0
+    ensures x == d * (x / d) + (x % d) {
+  }
+
+
+  /* the remained of 0 divided by any integer is always 0 */
+  lemma Lemma0ModAnything()
+    ensures forall m: int {:trigger 0 % m} :: m > 0 ==> 0 % m == 0 {
+  }
+
+  /* a natural number x divided by a larger natural number gives a remainder equal to x */
+  lemma LemmaSmallMod(x:nat, m:nat)
+    requires x < m
+    requires 0 < m
+    ensures x % m == x {
+  }
+
+  /* the range of the modulus of any integer will be [0, m) where m is the divisor */
+  lemma LemmaModRange(x:int, m:int)
+    requires m > 0
+    ensures 0 <= x % m < m
+  {
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/MulInternals.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/MulInternals.dfy
new file mode 100644
index 00000000000..36ccce723e1
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/MulInternals.dfy
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/* lemmas and functions in this file are used in the proofs in Mul.dfy */
+
+@DisableNonlinearArithmetic
+module Std.Arithmetic.MulInternals {
+
+  import opened GeneralInternals
+  import opened MulInternalsNonlinear
+
+  /* performs multiplication for positive integers using recursive addition */
+  function MulPos(x: int, y: int) : int
+    requires x >= 0
+  {
+    if x == 0 then 0
+    else y + MulPos(x - 1, y)
+  }
+
+  /* performs multiplication for both positive and negative integers */
+  function MulRecursive(x: int, y: int) : int
+  {
+    if x >= 0 then MulPos(x, y)
+    else -1 * MulPos(-1 * x, y)
+  }
+
+  /* performs induction on multiplication */
+  lemma LemmaMulInduction(f: int -> bool)
+    requires f(0)
+    requires forall i {:trigger f(i), f(i + 1)} :: i >= 0 && f(i) ==> f(i + 1)
+    requires forall i {:trigger f(i), f(i - 1)} :: i <= 0 && f(i) ==> f(i - 1)
+    ensures  forall i {:trigger f(i)} :: f(i)
+  {
+    forall i ensures f(i) { LemmaInductionHelper(1, f, i); }
+  }
+
+  /* proves that multiplication is always commutative */
+  lemma LemmaMulCommutes()
+    ensures  forall x:int, y:int {:trigger x * y} :: x * y == y * x
+  {
+    forall x:int, y:int
+      ensures x * y == y * x
+    {
+      LemmaMulInduction(i => x * i == i * x);
+    }
+  }
+
+  /* proves the distributive property of multiplication when multiplying an interger
+  by (x +/- 1) */
+  //rename for both directions ???
+  lemma LemmaMulSuccessor()
+    ensures forall x:int, y:int {:trigger (x + 1) * y} :: (x + 1) * y == x * y + y
+    ensures forall x:int, y:int {:trigger (x - 1) * y} :: (x - 1) * y == x * y - y
+  {
+    LemmaMulCommutes();
+    forall x:int, y:int
+      ensures (x + 1) * y == x * y + y
+      ensures (x - 1) * y == x * y - y
+    {
+      LemmaMulIsDistributiveAdd(y, x, 1);
+      LemmaMulIsDistributiveAdd(y, x, -1);
+    }
+  }
+
+  /* proves the distributive property of multiplication */
+  lemma LemmaMulDistributes()
+    ensures forall x:int, y:int, z:int {:trigger (x + y) * z} :: (x + y) * z == x * z + y * z
+    ensures forall x:int, y:int, z:int {:trigger (x - y) * z} :: (x - y) * z == x * z - y * z
+  {
+    LemmaMulSuccessor();
+    forall x:int, y:int, z:int
+      ensures (x + y) * z == x * z + y * z
+      ensures (x - y) * z == x * z - y * z
+    {
+      var f1 := i => (x + i) * z == x * z + i * z;
+      var f2 := i => (x - i) * z == x * z - i * z;
+      assert forall i {:trigger (x + (i + 1)) * z} :: (x + (i + 1)) * z == ((x + i) + 1) * z == (x + i) * z + z;
+      assert forall i {:trigger (x + (i - 1)) * z} :: (x + (i - 1)) * z == ((x + i) - 1) * z == (x + i) * z - z;
+      assert forall i {:trigger (x - (i + 1)) * z} :: (x - (i + 1)) * z == ((x - i) - 1) * z == (x - i) * z - z;
+      assert forall i {:trigger (x - (i - 1)) * z} :: (x - (i - 1)) * z == ((x - i) + 1) * z == (x - i) * z + z;
+      LemmaMulInduction(f1);
+      LemmaMulInduction(f2);
+      assert f1(y);
+      assert f2(y);
+    }
+  }
+
+  lemma LemmaMulDistributesSpecific(x:int, y:int, z:int)
+    ensures (x + y) * z == x * z + y * z
+    ensures (x - y) * z == x * z - y * z
+  {
+    LemmaMulDistributes();
+  }
+
+  /* groups distributive and associative properties of multiplication */
+  ghost predicate MulAuto()
+  {
+    && (forall x:int, y:int {:trigger x * y} :: x * y == y * x)
+    && (forall x:int, y:int, z:int {:trigger (x + y) * z} :: (x + y) * z == x * z + y * z)
+    && (forall x:int, y:int, z:int {:trigger (x - y) * z} :: (x - y) * z == x * z - y * z)
+  }
+
+  /* proves that MulAuto is valid */
+  lemma LemmaMulAuto()
+    ensures  MulAuto()
+  {
+    LemmaMulCommutes();
+    LemmaMulDistributes();
+  }
+
+  /* performs auto induction for multiplication */
+  lemma LemmaMulInductionAuto(x: int, f: int -> bool)
+    requires MulAuto() ==> f(0)
+                           && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && f(i) ==> f(i + 1))
+                           && (forall i {:trigger IsLe(i, 0)} :: IsLe(i, 0) && f(i) ==> f(i - 1))
+    ensures  MulAuto()
+    ensures  f(x)
+  {
+    LemmaMulCommutes();
+    LemmaMulDistributes();
+    assert forall i {:trigger f(i)} :: IsLe(0, i) && f(i) ==> f(i + 1);
+    assert forall i {:trigger f(i)} :: IsLe(i, 0) && f(i) ==> f(i - 1);
+    LemmaMulInduction(f);
+    assert f(x);
+  }
+
+  /* performs auto induction on multiplication for all i s.t. f(i) exists */
+  lemma LemmaMulInductionAutoForall(f: int -> bool)
+    requires MulAuto() ==> f(0)
+                           && (forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && f(i) ==> f(i + 1))
+                           && (forall i {:trigger IsLe(i, 0)} :: IsLe(i, 0) && f(i) ==> f(i - 1))
+    ensures  MulAuto()
+    ensures  forall i {:trigger f(i)} :: f(i)
+  {
+    LemmaMulCommutes();
+    LemmaMulDistributes();
+    assert forall i {:trigger f(i)} :: IsLe(0, i) && f(i) ==> f(i + 1);
+    assert forall i {:trigger f(i)} :: IsLe(i, 0) && f(i) ==> f(i - 1);
+    LemmaMulInduction(f);
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/MulInternalsNonlinear.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/MulInternalsNonlinear.dfy
new file mode 100644
index 00000000000..93304a2f364
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Internal/MulInternalsNonlinear.dfy
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+module {:z3ArithmeticSolver 6} Std.Arithmetic.MulInternalsNonlinear {
+
+  /* WARNING: Think three times before adding to this file, as nonlinear
+  verification is highly unstable! */
+
+  /* multiplying two positive integers will result in a positive integer */
+  lemma LemmaMulStrictlyPositive(x: int, y: int)
+    ensures (0 < x && 0 < y) ==> (0 < x * y)
+  {}
+
+  /* multiplying two nonzero integers will never result in 0 as the poduct */
+  lemma LemmaMulNonzero(x: int, y: int)
+    ensures x * y != 0 <==> x != 0 && y != 0
+  {}
+
+  /* multiplication is associative */
+  lemma LemmaMulIsAssociative(x: int, y: int, z: int)
+    ensures x * (y * z) == (x * y) * z
+  {}
+
+  /* multiplication is distributive */
+  lemma LemmaMulIsDistributiveAdd(x: int, y: int, z: int)
+    ensures x * (y + z) == x * y + x * z
+  {}
+
+  /* the product of two integers is greater than the value of each individual integer */
+  lemma LemmaMulOrdering(x: int, y: int)
+    requires x != 0
+    requires y != 0
+    requires 0 <= x * y
+    ensures x * y >= x && x * y >= y
+  {}
+
+  /* multiplying by a positive integer preserves inequality */
+  lemma LemmaMulStrictInequality(x: int, y: int, z: int)
+    requires x < y
+    requires z > 0
+    ensures  x * z < y * z
+  {}
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/LittleEndianNat.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/LittleEndianNat.dfy
new file mode 100644
index 00000000000..c3aad8616d4
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/LittleEndianNat.dfy
@@ -0,0 +1,605 @@
+/*******************************************************************************
+ *  Original: Copyright (c) 2020 Secure Foundations Lab
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+Little endian interpretation of a sequence of numbers with a given base. The
+first element of a sequence is the least significant position; the last
+element is the most significant position.
+ */
+@DisableNonlinearArithmetic
+abstract module Std.Arithmetic.LittleEndianNat {
+
+  import opened DivMod
+  import opened Mul
+  import opened Power
+  import opened Collections.Seq
+  import opened Logarithm
+
+  function BASE(): nat
+    ensures BASE() > 1
+
+  type digit = i: nat | 0 <= i < BASE()
+
+  //////////////////////////////////////////////////////////////////////////////
+  //
+  // ToNat definition and lemmas
+  //
+  //////////////////////////////////////////////////////////////////////////////
+
+  /* Converts a sequence to a nat beginning with the least significant position. */
+  function ToNatRight(xs: seq<digit>): nat
+  {
+    if |xs| == 0 then 0
+    else
+      LemmaMulNonnegativeAuto();
+      ToNatRight(DropFirst(xs)) * BASE() + First(xs)
+  }
+
+  /* Converts a sequence to a nat beginning with the most significant position. */
+  function ToNatLeft(xs: seq<digit>): nat
+  {
+    if |xs| == 0 then 0
+    else
+      LemmaPowPositiveAuto();
+      LemmaMulNonnegativeAuto();
+      ToNatLeft(DropLast(xs)) + Last(xs) * Pow(BASE(), |xs| - 1)
+  }
+
+  /* Given the same sequence, ToNatRight and ToNatLeft return the same nat. */
+  @IsolateAssertions
+  lemma LemmaToNatLeftEqToNatRight(xs: seq<digit>)
+    ensures ToNatRight(xs) == ToNatLeft(xs)
+  {
+    if xs == [] {
+    } else {
+      if DropLast(xs) == [] {
+        calc {
+          ToNatLeft(xs);
+          Last(xs) * Pow(BASE(), |xs| - 1);
+          {  }
+          Last(xs);
+          First(xs);
+          { assert ToNatRight(DropFirst(xs)) == 0; }
+          ToNatRight(xs);
+        }
+      } else {
+        calc {
+          ToNatLeft(xs);
+          ToNatLeft(DropLast(xs)) + Last(xs) * Pow(BASE(), |xs| - 1);
+          { LemmaToNatLeftEqToNatRight(DropLast(xs)); }
+          ToNatRight(DropLast(xs)) + Last(xs) * Pow(BASE(), |xs| - 1);
+          ToNatRight(DropFirst(DropLast(xs))) * BASE() + First(xs) + Last(xs)
+          * Pow(BASE(), |xs| - 1);
+          { LemmaToNatLeftEqToNatRight(DropFirst(DropLast(xs))); }
+          ToNatLeft(DropFirst(DropLast(xs))) * BASE() + First(xs) + Last(xs)
+          * Pow(BASE(), |xs| - 1);
+          {
+            assert DropFirst(DropLast(xs)) == DropLast(DropFirst(xs));
+            LemmaMulProperties();
+          }
+          ToNatLeft(DropLast(DropFirst(xs))) * BASE() + First(xs) + Last(xs)
+          * Pow(BASE(), |xs| - 2) * BASE();
+          { LemmaMulIsDistributiveAddOtherWayAuto(); }
+          ToNatLeft(DropFirst(xs)) * BASE() + First(xs);
+          { LemmaToNatLeftEqToNatRight(DropFirst(xs)); }
+          ToNatRight(xs);
+        }
+      }
+    }
+  }
+
+  lemma LemmaToNatLeftEqToNatRightAuto()
+    ensures forall xs: seq<digit> :: ToNatRight(xs) == ToNatLeft(xs)
+  {
+    forall xs: seq<digit>
+      ensures ToNatRight(xs) == ToNatLeft(xs)
+    {
+      LemmaToNatLeftEqToNatRight(xs);
+    }
+  }
+
+  /* The nat representation of a sequence of length 1 is its first (and only)
+  position. */
+  lemma LemmaSeqLen1(xs: seq<digit>)
+    requires |xs| == 1
+    ensures ToNatRight(xs) == First(xs)
+  {
+    assert ToNatRight(DropFirst(xs)) == 0;
+  }
+
+  /* The nat representation of a sequence of length 2 is sum of its first
+  position and the product of its second position and BASE(). */
+  lemma LemmaSeqLen2(xs: seq<digit>)
+    requires |xs| == 2
+    ensures ToNatRight(xs) == First(xs) + xs[1] * BASE()
+  {
+    var xs1 := DropFirst(xs);
+    calc {
+      ToNatRight(xs);
+      ToNatRight(xs1) * BASE() + First(xs);
+      (ToNatRight([]) * BASE() + First(xs1)) * BASE() + First(xs);
+      (0 * BASE() + First(xs1)) * BASE() + First(xs);
+    }
+  }
+
+  /* Appending a zero does not change the nat representation of the sequence. */
+  lemma LemmaSeqAppendZero(xs: seq<digit>)
+    ensures ToNatRight(xs + [0]) == ToNatRight(xs)
+  {
+    LemmaToNatLeftEqToNatRightAuto();
+    calc {
+      ToNatRight(xs + [0]);
+      ToNatLeft(xs + [0]);
+      ToNatLeft(xs) + 0 * Pow(BASE(), |xs|);
+      { LemmaMulBasicsAuto(); }
+      ToNatLeft(xs);
+      ToNatRight(xs);
+    }
+  }
+
+  /* The nat representation of a sequence is bounded by BASE() to the power of
+  the sequence length. */
+  lemma LemmaSeqNatBound(xs: seq<digit>)
+    ensures ToNatRight(xs) < Pow(BASE(), |xs|)
+  {
+    if |xs| == 0 {
+    } else {
+      var len' := |xs| - 1;
+      var pow := Pow(BASE(), len');
+      calc {
+        ToNatRight(xs);
+         { LemmaToNatLeftEqToNatRight(xs); }
+        ToNatLeft(xs);
+         {  }
+        ToNatLeft(DropLast(xs)) + Last(xs) * pow;
+      <  {
+           LemmaToNatLeftEqToNatRight(DropLast(xs));
+           LemmaSeqNatBound(DropLast(xs));
+         }
+        pow + Last(xs) * pow;
+      <= {
+           LemmaPowPositiveAuto();
+           LemmaMulInequalityAuto();
+         }
+        pow + (BASE() - 1) * pow;
+         { LemmaMulIsDistributiveAuto(); }
+        Pow(BASE(), len' + 1);
+      }
+    }
+  }
+
+  /* The nat representation of a sequence can be calculated using the nat
+  representation of its prefix. */
+  @IsolateAssertions
+  lemma LemmaSeqPrefix(xs: seq<digit>, i: nat)
+    requires 0 <= i <= |xs|
+    ensures ToNatRight(xs[..i]) + ToNatRight(xs[i..]) * Pow(BASE(), i) == ToNatRight(xs)
+  {
+    if i == 1 {
+      assert ToNatRight(xs[..1]) == First(xs);
+    } else if i > 1 {
+      calc {
+        ToNatRight(xs[..i]) + ToNatRight(xs[i..]) * Pow(BASE(), i);
+        ToNatRight(DropFirst(xs[..i])) * BASE() + First(xs) + ToNatRight(xs[i..]) * Pow(BASE(), i);
+        {
+          assert DropFirst(xs[..i]) == DropFirst(xs)[..i-1];
+          LemmaMulProperties();
+        }
+        ToNatRight(DropFirst(xs)[..i-1]) * BASE() + First(xs) + (ToNatRight(xs[i..]) * Pow(BASE(), i - 1)) * BASE();
+        { LemmaMulIsDistributiveAddOtherWayAuto(); }
+        (ToNatRight(DropFirst(xs)[..i-1]) + ToNatRight(DropFirst(xs)[i-1..]) * Pow(BASE(), i - 1)) * BASE() + First(xs);
+        { LemmaSeqPrefix(DropFirst(xs), i - 1); }
+        ToNatRight(xs);
+      }
+    }
+  }
+
+  /* If there is an inequality between the most significant positions of two
+  sequences, then there is an inequality between the nat representations of
+  those sequences. Helper lemma for LemmaSeqNeq. */
+  lemma LemmaSeqMswInequality(xs: seq<digit>, ys: seq<digit>)
+    requires |xs| == |ys| > 0
+    requires Last(xs) < Last(ys)
+    ensures ToNatRight(xs) < ToNatRight(ys)
+  {
+    LemmaToNatLeftEqToNatRightAuto();
+    var len' := |xs| - 1;
+    calc {
+      ToNatRight(xs);
+      ToNatLeft(xs);
+    <  { LemmaSeqNatBound(DropLast(xs)); }
+      Pow(BASE(), len') + Last(xs) * Pow(BASE(), len');
+    == { LemmaMulIsDistributiveAuto(); }
+      (1 + Last(xs)) * Pow(BASE(), len');
+    <= { LemmaPowPositiveAuto(); LemmaMulInequalityAuto(); }
+      ToNatLeft(ys);
+      ToNatRight(ys);
+    }
+  }
+
+  /* Two sequences do not have the same nat representations if their prefixes
+  do not have the same nat representations. Helper lemma for LemmaSeqNeq. */
+  @IsolateAssertions
+  lemma LemmaSeqPrefixNeq(xs: seq<digit>, ys: seq<digit>, i: nat)
+    requires 0 <= i <= |xs| == |ys|
+    requires ToNatRight(xs[..i]) != ToNatRight(ys[..i])
+    ensures ToNatRight(xs) != ToNatRight(ys)
+    decreases |xs| - i
+  {
+    if i == |xs| {
+      assert xs[..i] == xs;
+      assert ys[..i] == ys;
+    } else {
+      if xs[i] == ys[i] {
+        assert DropLast(xs[..i+1]) == xs[..i];
+        assert DropLast(ys[..i+1]) == ys[..i];
+
+        LemmaToNatLeftEqToNatRightAuto();
+        assert ToNatRight(xs[..i+1]) == ToNatLeft(xs[..i+1]);
+      } else if xs[i] < ys[i] {
+        LemmaSeqMswInequality(xs[..i+1], ys[..i+1]);
+      } else {
+        LemmaSeqMswInequality(ys[..i+1], xs[..i+1]);
+      }
+      LemmaSeqPrefixNeq(xs, ys, i + 1);
+    }
+  }
+
+  /* If two sequences of the same length are not equal, their nat
+  representations are not equal. */
+  lemma LemmaSeqNeq(xs: seq<digit>, ys: seq<digit>)
+    requires |xs| == |ys|
+    requires xs != ys
+    ensures ToNatRight(xs) != ToNatRight(ys)
+  {
+    ghost var i: nat, n: nat := 0, |xs|;
+
+    while i < n
+      invariant 0 <= i < n
+      invariant xs[..i] == ys[..i]
+    {
+      if xs[i] != ys[i] {
+        break;
+      }
+      i := i + 1;
+    }
+    assert ToNatLeft(xs[..i]) == ToNatLeft(ys[..i]);
+
+    assert xs[..i+1][..i] == xs[..i];
+    assert ys[..i+1][..i] == ys[..i];
+    LemmaPowPositiveAuto();
+    LemmaMulStrictInequalityAuto();
+    assert ToNatLeft(xs[..i+1]) != ToNatLeft(ys[..i+1]);
+    LemmaToNatLeftEqToNatRightAuto();
+
+    LemmaSeqPrefixNeq(xs, ys, i+1);
+  }
+
+  /* If the nat representations of two sequences of the same length are equal
+  to each other, the sequences are the same. */
+  lemma LemmaSeqEq(xs: seq<digit>, ys: seq<digit>)
+    requires |xs| == |ys|
+    requires ToNatRight(xs) == ToNatRight(ys)
+    ensures xs == ys
+  {
+    calc ==> {
+      xs != ys;
+      { LemmaSeqNeq(xs, ys); }
+      ToNatRight(xs) != ToNatRight(ys);
+      false;
+    }
+  }
+
+  /* The nat representation of a sequence and its least significant position are
+  congruent. */
+  @IsolateAssertions
+  lemma LemmaSeqLswModEquivalence(xs: seq<digit>)
+    requires |xs| >= 1
+    ensures IsModEquivalent(ToNatRight(xs), First(xs), BASE())
+  {
+    if |xs| == 1 {
+      LemmaSeqLen1(xs);
+      LemmaModEquivalenceAuto();
+    } else {
+      assert IsModEquivalent(ToNatRight(xs), First(xs), BASE()) by {
+        calc ==> {
+          true;
+          { LemmaModEquivalence(ToNatRight(xs), ToNatRight(DropFirst(xs)) * BASE() + First(xs), BASE()); }
+          IsModEquivalent(ToNatRight(xs), ToNatRight(DropFirst(xs)) * BASE() + First(xs), BASE());
+          { LemmaModMultiplesBasicAuto(); }
+          IsModEquivalent(ToNatRight(xs), First(xs), BASE());
+        }
+      }
+    }
+  }
+
+  //////////////////////////////////////////////////////////////////////////////
+  //
+  // FromNat definition and lemmas
+  //
+  //////////////////////////////////////////////////////////////////////////////
+
+  /* Converts a nat to a sequence. */
+  function FromNat(n: nat): (xs: seq<digit>)
+  {
+    if n == 0 then []
+    else
+      LemmaDivBasicsAuto();
+      LemmaDivDecreasesAuto();
+      [n % BASE()] + FromNat(n / BASE())
+  }
+
+  lemma LemmaFromNatLen2(n: nat)
+    ensures n == 0 ==> |FromNat(n)| == 0
+    ensures n > 0 ==> |FromNat(n)| == Log(BASE(), n) + 1
+  {
+    var digits := FromNat(n);
+    if (n == 0) {
+    } else {
+      assert |digits| == Log(BASE(), n) + 1 by {
+        LemmaDivBasicsAuto();
+        var digits' := FromNat(n / BASE());
+        assert |digits| == |digits'| + 1;
+        if n < BASE() {
+          LemmaLog0(BASE(), n);
+          assert n / BASE() == 0 by { LemmaBasicDiv(BASE()); }
+        } else {
+          LemmaLogS(BASE(), n);
+          assert n / BASE() > 0 by { LemmaDivNonZeroAuto(); }
+        }
+      }
+    }
+  }
+
+  /* Ensures length of the sequence generated by FromNat is less than len.
+  Helper lemma for FromNatWithLen. */
+  lemma LemmaFromNatLen(n: nat, len: nat)
+    requires Pow(BASE(), len) > n
+    ensures |FromNat(n)| <= len
+  {
+    if n == 0 {
+    } else {
+      calc {
+        |FromNat(n)|;
+      == { LemmaDivBasicsAuto(); }
+        1 + |FromNat(n / BASE())|;
+      <= {
+           LemmaMultiplyDivideLtAuto();
+           LemmaDivDecreasesAuto();
+           LemmaFromNatLen(n / BASE(), len - 1);
+         }
+        len;
+      }
+    }
+  }
+
+  /* If we start with a nat, convert it to a sequence, and convert it back, we
+  get the same nat we started with. */
+  lemma LemmaNatSeqNat(n: nat)
+    ensures ToNatRight(FromNat(n)) == n
+    decreases n
+  {
+    if n == 0 {
+    } else {
+      calc {
+        ToNatRight(FromNat(n));
+        { LemmaDivBasicsAuto(); }
+        ToNatRight([n % BASE()] + FromNat(n / BASE()));
+        n % BASE() + ToNatRight(FromNat(n / BASE())) * BASE();
+        {
+          LemmaDivDecreasesAuto();
+          LemmaNatSeqNat(n / BASE());
+        }
+        n % BASE() + n / BASE() * BASE();
+        { LemmaFundamentalDivMod(n, BASE()); }
+        n;
+      }
+    }
+  }
+
+  /* Extends a sequence to a specified length. */
+  opaque function SeqExtend(xs: seq<digit>, n: nat): (ys: seq<digit>)
+    requires |xs| <= n
+    ensures |ys| == n
+    ensures ToNatRight(ys) == ToNatRight(xs)
+    decreases n - |xs|
+  {
+    if |xs| >= n then xs else LemmaSeqAppendZero(xs); SeqExtend(xs + [0], n)
+  }
+
+  /* Extends a sequence to a length that is a multiple of n. */
+  opaque function SeqExtendMultiple(xs: seq<digit>, n: nat): (ys: seq<digit>)
+    requires n > 0
+    ensures |ys| % n == 0
+    ensures ToNatRight(ys) == ToNatRight(xs)
+  {
+    var newLen := |xs| + n - (|xs| % n);
+    LemmaSubModNoopRight(|xs| + n, |xs|, n);
+    LemmaModBasicsAuto();
+    assert newLen % n == 0;
+
+    LemmaSeqNatBound(xs);
+    LemmaPowIncreasesAuto();
+    SeqExtend(xs, newLen)
+  }
+
+  /* Converts a nat to a sequence of a specified length. */
+  function FromNatWithLen(n: nat, len: nat): (xs: seq<digit>)
+    requires Pow(BASE(), len) > n
+    ensures |xs| == len
+    ensures ToNatRight(xs) == n
+  {
+    LemmaFromNatLen(n, len);
+    LemmaNatSeqNat(n);
+    SeqExtend(FromNat(n), len)
+  }
+
+  /* If the nat representation of a sequence is zero, then the sequence is a
+  sequence of zeros. */
+  @ResourceLimit("10e6")
+  lemma LemmaSeqZero(xs: seq<digit>)
+    requires ToNatRight(xs) == 0
+    ensures forall i :: 0 <= i < |xs| ==> xs[i] == 0
+  {
+    if |xs| == 0 {
+    } else {
+      LemmaMulNonnegativeAuto();
+      assert First(xs) == 0;
+
+      LemmaMulNonzeroAuto();
+      LemmaSeqZero(DropFirst(xs));
+    }
+  }
+
+  /* Generates a sequence of zeros of a specified length. */
+  opaque function SeqZero(len: nat): (xs: seq<digit>)
+    ensures |xs| == len
+    ensures forall i :: 0 <= i < |xs| ==> xs[i] == 0
+    ensures ToNatRight(xs) == 0
+  {
+    LemmaPowPositive(BASE(), len);
+    var xs := FromNatWithLen(0, len);
+    LemmaSeqZero(xs);
+    xs
+  }
+
+  /* If we start with a sequence, convert it to a nat, and convert it back to a
+  sequence with the same length as the original sequence, we get the same
+  sequence we started with. */
+  lemma LemmaSeqNatSeq(xs: seq<digit>)
+    ensures Pow(BASE(), |xs|) > ToNatRight(xs)
+    ensures FromNatWithLen(ToNatRight(xs), |xs|) == xs
+  {
+    LemmaSeqNatBound(xs);
+    if |xs| > 0 {
+      calc {
+        FromNatWithLen(ToNatRight(xs), |xs|) != xs;
+        { LemmaSeqNeq(FromNatWithLen(ToNatRight(xs), |xs|), xs); }
+        ToNatRight(FromNatWithLen(ToNatRight(xs), |xs|)) != ToNatRight(xs);
+        ToNatRight(xs) != ToNatRight(xs);
+        false;
+      }
+    }
+  }
+
+  //////////////////////////////////////////////////////////////////////////////
+  //
+  // Addition and subtraction
+  //
+  //////////////////////////////////////////////////////////////////////////////
+
+  /* Adds two sequences. */
+  function SeqAdd(xs: seq<digit>, ys: seq<digit>): (seq<digit>, nat)
+    requires |xs| == |ys|
+    ensures var (zs, cout) := SeqAdd(xs, ys);
+            |zs| == |xs| && 0 <= cout <= 1
+    decreases xs
+  {
+    if |xs| == 0 then ([], 0)
+    else
+      var (zs', cin) := SeqAdd(DropLast(xs), DropLast(ys));
+      var sum: int := Last(xs) + Last(ys) + cin;
+      var (sum_out, cout) := if sum < BASE() then (sum, 0)
+                             else (sum - BASE(), 1);
+      (zs' + [sum_out], cout)
+  }
+
+  /* SeqAdd returns the same value as converting the sequences to nats, then
+  adding them. */
+  @IsolateAssertions
+  lemma LemmaSeqAdd(xs: seq<digit>, ys: seq<digit>, zs: seq<digit>, cout: nat)
+    requires |xs| == |ys|
+    requires SeqAdd(xs, ys) == (zs, cout)
+    ensures ToNatRight(xs) + ToNatRight(ys) == ToNatRight(zs) + cout * Pow(BASE(), |xs|)
+  {
+    if |xs| == 0 {
+    } else {
+      var pow := Pow(BASE(), |xs| - 1);
+      var (zs', cin) := SeqAdd(DropLast(xs), DropLast(ys));
+      var sum: int := Last(xs) + Last(ys) + cin;
+      var z := if sum < BASE() then sum else sum - BASE();
+      assert sum == z + cout * BASE();
+
+      LemmaToNatLeftEqToNatRightAuto();
+      calc {
+        ToNatRight(zs);
+        ToNatLeft(zs);
+        ToNatLeft(zs') + z * pow;
+        { LemmaSeqAdd(DropLast(xs), DropLast(ys), zs', cin); }
+        ToNatLeft(DropLast(xs)) + ToNatLeft(DropLast(ys)) - cin * pow + z * pow;
+        {
+          LemmaMulEquality(sum, z + cout * BASE(), pow);
+          assert sum * pow == (z + cout * BASE()) * pow;
+          LemmaMulIsDistributiveAuto();
+        }
+        ToNatLeft(xs) + ToNatLeft(ys) - cout * BASE() * pow;
+        {
+          LemmaMulIsAssociative(cout, BASE(), pow);
+        }
+        ToNatLeft(xs) + ToNatLeft(ys) - cout * Pow(BASE(), |xs|);
+        ToNatRight(xs) + ToNatRight(ys) - cout * Pow(BASE(), |xs|);
+      }
+    }
+  }
+
+  /* Subtracts two sequences. */
+  function SeqSub(xs: seq<digit>, ys: seq<digit>): (seq<digit>, nat)
+    requires |xs| == |ys|
+    ensures var (zs, cout) := SeqSub(xs, ys);
+            |zs| == |xs| && 0 <= cout <= 1
+    decreases xs
+  {
+    if |xs| == 0 then ([], 0)
+    else
+      var (zs, cin) := SeqSub(DropLast(xs), DropLast(ys));
+      var (diff_out, cout) := if Last(xs) >= Last(ys) + cin
+                              then (Last(xs) - Last(ys) - cin, 0)
+                              else (BASE() + Last(xs) - Last(ys) - cin, 1);
+      (zs + [diff_out], cout)
+  }
+
+  /* SeqSub returns the same value as converting the sequences to nats, then
+  subtracting them. */
+  @IsolateAssertions
+  lemma LemmaSeqSub(xs: seq<digit>, ys: seq<digit>, zs: seq<digit>, cout: nat)
+    requires |xs| == |ys|
+    requires SeqSub(xs, ys) == (zs, cout)
+    ensures ToNatRight(xs) - ToNatRight(ys) + cout * Pow(BASE(), |xs|) == ToNatRight(zs)
+  {
+    if |xs| == 0 {
+    } else {
+      var pow := Pow(BASE(), |xs| - 1);
+      var (zs', cin) := SeqSub(DropLast(xs), DropLast(ys));
+      var z := if Last(xs) >= Last(ys) + cin
+      then Last(xs) - Last(ys) - cin
+      else BASE() + Last(xs) - Last(ys) - cin;
+      assert cout * BASE() + Last(xs) - cin - Last(ys) == z;
+
+      LemmaToNatLeftEqToNatRightAuto();
+      calc {
+        ToNatRight(zs);
+        ToNatLeft(zs);
+        ToNatLeft(zs') + z * pow;
+        { LemmaSeqSub(DropLast(xs), DropLast(ys), zs', cin); }
+        ToNatLeft(DropLast(xs)) - ToNatLeft(DropLast(ys)) + cin * pow + z * pow;
+        {
+          LemmaMulEquality(cout * BASE() + Last(xs) - cin - Last(ys), z, pow);
+          assert pow * (cout * BASE() + Last(xs) - cin - Last(ys)) == pow * z;
+          LemmaMulIsDistributiveAuto();
+        }
+        ToNatLeft(xs) - ToNatLeft(ys) + cout * BASE() * pow;
+        {
+          LemmaMulIsAssociative(cout, BASE(), pow);
+        }
+        ToNatLeft(xs) - ToNatLeft(ys) + cout * Pow(BASE(), |xs|);
+        ToNatRight(xs) - ToNatRight(ys) + cout * Pow(BASE(), |xs|);
+      }
+    }
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Logarithm.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Logarithm.dfy
new file mode 100644
index 00000000000..604623efcc9
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Logarithm.dfy
@@ -0,0 +1,94 @@
+@DisableNonlinearArithmetic
+module Std.Arithmetic.Logarithm {
+  import opened Mul
+  import opened DivMod
+  import opened Power
+
+  function Log(base: nat, pow: nat): nat
+    requires base > 1
+    decreases pow
+  {
+    if pow < base then 0
+    else
+      LemmaDivPosIsPosAuto(); LemmaDivDecreasesAuto();
+      1 + Log(base, pow / base)
+  }
+
+  lemma {:induction false} LemmaLog0(base: nat, pow: nat)
+    requires base > 1
+    requires pow < base
+    ensures Log(base, pow) == 0
+  {
+  }
+
+  lemma {:induction false} LemmaLogS(base: nat, pow: nat)
+    requires base > 1
+    requires pow >= base
+    ensures pow / base >= 0
+    ensures Log(base, pow) == 1 + Log(base, pow / base)
+  {
+    LemmaDivPosIsPosAuto();
+  }
+
+  lemma {:induction false} LemmaLogSAuto()
+    ensures forall base: nat, pow: nat
+              {:trigger Log(base, pow / base)}
+              | && base > 1
+                && pow >= base
+              :: && pow / base >= 0
+                 && Log(base, pow) == 1 + Log(base, pow / base)
+  {
+    forall base: nat, pow: nat | && base > 1 && pow >= base
+      ensures && pow / base >= 0
+              && Log(base, pow) == 1 + Log(base, pow / base)
+    {
+      LemmaLogS(base, pow);
+    }
+  }
+
+  lemma {:induction false} LemmaLogIsOrdered(base: nat, pow: nat, pow': nat)
+    requires base > 1
+    requires pow <= pow'
+    ensures Log(base, pow) <= Log(base, pow')
+    decreases pow
+  {
+    if pow' < base {
+      assert Log(base, pow) == 0 == Log(base, pow');
+    } else if pow < base {
+      assert Log(base, pow) == 0;
+    } else {
+      LemmaDivPosIsPosAuto(); LemmaDivDecreasesAuto(); LemmaDivIsOrderedAuto();
+      LemmaLogIsOrdered(base, pow / base, pow' / base);
+    }
+  }
+
+  lemma {:induction false} LemmaLogPow(base: nat, n: nat)
+    requires base > 1
+    ensures (LemmaPowPositive(base, n); Log(base, Pow(base, n)) == n)
+  {
+    if n == 0 {
+    } else {
+      LemmaPowPositive(base, n);
+      calc {
+        Log(base, Pow(base, n));
+        {  }
+        Log(base, base * Pow(base, n - 1));
+        { LemmaPowPositive(base, n - 1);
+          LemmaMulIncreases(Pow(base, n - 1), base);
+          LemmaMulIsCommutative(Pow(base, n - 1), base);
+          LemmaLogS(base, base * Pow(base, n - 1)); }
+        1 + Log(base, (base * Pow(base, n - 1)) / base);
+        { LemmaDivMultiplesVanish(Pow(base, n - 1), base); }
+        1 + Log(base, Pow(base, n - 1));
+        { LemmaLogPow(base, n - 1); }
+        1 + (n - 1);
+      }
+    }
+  }
+
+  // TODO
+  // lemma {:induction false} Pow_Log(base: nat, pow: nat)
+  //   requires base > 1
+  //   requires pow > 0
+  //   ensures Pow(base, Log(base, pow)) <= pow < Pow(base, Log(base, pow) + 1)
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Mul.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Mul.dfy
new file mode 100644
index 00000000000..08a1c4d3c3f
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Mul.dfy
@@ -0,0 +1,580 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/* Every lemma comes in 2 forms: 'LemmaProperty' and 'LemmaPropertyAuto'. The
+former takes arguments and may be more stable and less reliant on Z3
+heuristics. The latter includes automation and its use requires less effort */
+
+@DisableNonlinearArithmetic
+module Std.Arithmetic.Mul {
+
+  import MulINL = MulInternalsNonlinear
+  import opened MulInternals
+
+  /* the built-in syntax of multiplication results in the same product as multiplication 
+  through recursive addition */
+  lemma LemmaMulIsMulRecursive(x: int, y: int)
+    ensures x * y == MulRecursive(x, y)
+  {
+    if (x >= 0) { LemmaMulIsMulPos(x, y); }
+    if (x <= 0) { LemmaMulIsMulPos(-x, y); }
+    LemmaMulAuto();
+  }
+
+  lemma LemmaMulIsMulRecursiveAuto()
+    ensures forall x: int, y: int :: x * y == MulRecursive(x, y)
+  {
+    forall x: int, y: int
+      ensures x * y == MulRecursive(x, y)
+    {
+      LemmaMulIsMulRecursive(x, y);
+    }
+  }
+
+  /* the built-in syntax of multiplying two positive integers results in the same product as 
+  MulPos, which is achieved by recursive addition */
+  lemma LemmaMulIsMulPos(x: int, y: int)
+    requires x >= 0
+    ensures x * y == MulPos(x, y)
+  {
+    if x == 0 {
+      assert MulPos(x, y) == 0;
+    } else {
+      calc {
+        MulPos(x, y);
+        y + MulPos(x - 1, y);
+        { LemmaMulIsMulPos(x - 1, y); }
+        y + (x - 1) * y;
+        { LemmaMulDistributes(); }
+        x * y;
+      }
+    }
+  }
+
+  /* ensures that the basic properties of multiplication, including the identity and zero properties */
+  lemma LemmaMulBasics(x: int)
+    ensures 0 * x == 0
+    ensures x * 0 == 0
+    ensures 1 * x == x
+    ensures x * 1 == x
+  {
+  }
+
+  lemma LemmaMulBasicsAuto()
+    ensures forall x: int {:trigger 0 * x} :: 0 * x == 0
+    ensures forall x: int {:trigger x * 0} :: x * 0 == 0
+    ensures forall x: int {:trigger 1 * x} :: 1 * x == x
+    ensures forall x: int {:trigger x * 1} :: x * 1 == x
+  {
+  }
+
+  /* multiplying two nonzero integers will never result in 0 as the poduct */
+  lemma LemmaMulNonzero(x: int, y: int)
+    ensures x * y != 0 <==> x != 0 && y != 0
+  {
+    MulINL.LemmaMulNonzero(x, y);
+  }
+
+  /* multiplying any two nonzero integers will never result in 0 as the poduct */
+  lemma LemmaMulNonzeroAuto()
+    ensures forall x: int, y: int {:trigger x * y} :: x * y != 0 <==> x != 0 && y != 0
+  {
+    forall x: int, y: int
+      ensures x * y != 0 <==> x != 0 && y != 0
+    {
+      LemmaMulNonzero(x, y);
+    }
+  }
+
+  /* any integer multiplied by 0 results in a product of 0 */
+  lemma LemmaMulByZeroIsZeroAuto()
+    ensures forall x: int {:trigger 0 * x} {:trigger x * 0} :: x * 0 == 0 * x == 0
+  {
+    forall x: int {:trigger 0 * x} {:trigger x * 0}
+      ensures x * 0 == 0 * x == 0
+    {
+      LemmaMulBasics(x);
+    }
+  }
+
+  /* multiplication is associative */
+  lemma LemmaMulIsAssociative(x: int, y: int, z: int)
+    ensures x * (y * z) == (x * y) * z
+  {
+    MulINL.LemmaMulIsAssociative(x, y, z);
+  }
+
+  /* multiplication is always associative for all integers*/
+  lemma LemmaMulIsAssociativeAuto()
+    ensures forall x: int, y: int, z: int {:trigger x * (y * z)} {:trigger (x * y) * z}
+              :: x * (y * z) == (x * y) * z
+  {
+    forall x: int, y: int, z: int
+      ensures x * (y * z) == (x * y) * z
+    {
+      LemmaMulIsAssociative(x, y, z);
+    }
+  }
+
+  /* multiplication is commutative */
+  lemma LemmaMulIsCommutative(x: int, y: int)
+    ensures x * y == y * x
+  {
+  }
+
+  /* multiplication is always commutative for all integers */
+  lemma LemmaMulIsCommutativeAuto()
+    ensures forall x: int, y: int {:trigger x * y} :: x * y == y * x
+  {
+  }
+
+  /* the product of two integers is greater than the value of each individual integer */
+  lemma LemmaMulOrdering(x: int, y: int)
+    requires x != 0
+    requires y != 0
+    requires 0 <= x * y
+    ensures x * y >= x && x * y >= y
+  {
+    MulINL.LemmaMulOrdering(x, y);
+  }
+
+  /* the product of two positive integers is always greater than the individual value of either 
+  multiplied integer */
+  lemma LemmaMulOrderingAuto()
+    ensures forall x: int, y: int {:trigger x * y} :: (0 != x && 0 != y && x * y >= 0) ==> x * y >= x && x * y >= y
+  {
+    forall x: int, y: int | 0 != x && 0 != y && x * y >= 0
+      ensures x * y >= x && x * y >= y
+    {
+      LemmaMulOrdering(x, y);
+    }
+  }
+
+  lemma LemmaMulEquality(x: int, y: int, z: int)
+    requires x == y
+    ensures x * z == y * z
+  {}
+
+  lemma LemmaMulEqualityAuto()
+    ensures forall x: int, y: int, z: int {:trigger x * z, y * z } :: x == y ==> x * z == y * z
+  {
+    forall x: int, y: int, z: int | x == y
+      ensures x * z == y * z
+    {
+      LemmaMulEquality(x, y, z);
+    }
+  }
+
+  /* two integers that are multiplied by a positive number will maintain their numerical order */
+  lemma LemmaMulInequality(x: int, y: int, z: int)
+    requires x <= y
+    requires z >= 0
+    ensures  x * z <= y * z
+  {
+    LemmaMulInductionAuto(z, u => u >= 0 ==> x * u <= y * u);
+  }
+
+  /* any two integers that are multiplied by a positive number will maintain their numerical order */
+  lemma LemmaMulInequalityAuto()
+    ensures  forall x: int, y: int, z: int {:trigger x * z, y * z} :: x <= y && z >= 0 ==> x * z <= y * z
+  {
+    forall x: int, y: int, z: int | x <= y && z >= 0
+      ensures x * z <= y * z
+    {
+      LemmaMulInequality(x, y, z);
+    }
+  }
+
+  /* multiplying by a positive integer preserves inequality */
+  lemma LemmaMulStrictInequality(x: int, y: int, z: int)
+    requires x < y
+    requires z > 0
+    ensures  x * z < y * z
+  {
+    MulINL.LemmaMulStrictInequality(x, y, z);
+  }
+
+  /* multiplying by a positive integer preserves inequality for all integers*/
+  lemma LemmaMulStrictInequalityAuto()
+    ensures  forall x: int, y: int, z: int {:trigger x * z, y * z} :: x < y && z > 0 ==> x * z < y * z
+  {
+    forall x: int, y: int, z: int | x < y && z > 0
+      ensures x * z < y * z
+    {
+      LemmaMulStrictInequality(x, y, z);
+    }
+  }
+
+  /* the product of two bounded integers is less than or equal to the product of their upper bounds */
+  lemma LemmaMulUpperBound(x: int, XBound: int, y: int, YBound: int)
+    requires x <= XBound
+    requires y <= YBound
+    requires 0 <= x
+    requires 0 <= y
+    ensures x * y <= XBound * YBound
+  {
+    LemmaMulInequality(x, XBound, y);
+    LemmaMulInequality(y, YBound, XBound);
+  }
+
+  lemma LemmaMulUpperBoundAuto()
+    ensures forall x: int, XBound: int, y: int, YBound: int {:trigger x * y, XBound * YBound}
+              :: x <= XBound && y <= YBound && 0 <= x && 0 <= y ==> x * y <= XBound * YBound
+  {
+    forall x: int, XBound: int, y: int, YBound: int | x <= XBound && y <= YBound && 0 <= x && 0 <= y
+      ensures x * y <= XBound * YBound
+    {
+      LemmaMulUpperBound(x, XBound, y, YBound);
+    }
+  }
+
+  /* the product of two strictly upper bounded integers is less than the product of their upper bounds */
+  lemma LemmaMulStrictUpperBound(x: int, XBound: int, y: int, YBound: int)
+    requires x < XBound
+    requires y < YBound
+    requires 0 < x
+    requires 0 < y
+    ensures x * y <= (XBound - 1) * (YBound - 1)
+  {
+    LemmaMulInequality(x, XBound - 1, y);
+    LemmaMulInequality(y, YBound - 1, XBound - 1);
+  }
+
+  lemma LemmaMulStrictUpperBoundAuto()
+    ensures forall x: int, XBound: int, y: int, YBound: int {:trigger x * y, (XBound - 1) * (YBound - 1)}
+              :: x < XBound && y < YBound && 0 < x && 0 < y ==> x * y <= (XBound - 1) * (YBound - 1)
+  {
+    forall x: int, XBound: int, y: int, YBound: int
+      // https://github.com/dafny-lang/dafny/issues/4771
+      {:trigger (XBound - 1) * (YBound - 1), x * y}
+      {:trigger YBound - 1, XBound - 1, 0 < y, 0 < x}
+      {:trigger YBound - 1, 0 < y, x < XBound}
+      {:trigger XBound - 1, 0 < x, y < YBound}
+      {:trigger y < YBound, x < XBound}
+      | x < XBound && y < YBound && 0 < x && 0 < y
+      ensures x * y <= (XBound - 1) * (YBound - 1)
+    {
+      LemmaMulStrictUpperBound(x, XBound, y, YBound);
+    }
+  }
+
+  /* any two integers that are multiplied by a positive number will maintain their numerical order */
+  lemma LemmaMulLeftInequality(x: int, y: int, z: int)
+    requires 0 < x
+    ensures y <= z ==> x * y <= x * z
+    ensures y < z ==> x * y < x * z
+  {
+    LemmaMulInductionAuto(x, u => u > 0 ==> y <= z ==> u * y <= u * z);
+    LemmaMulInductionAuto(x, u => u > 0 ==> y < z ==> u * y < u * z);
+  }
+
+  lemma LemmaMulLeftInequalityAuto()
+    ensures forall x: int, y: int, z: int {:trigger x * y, x * z}
+              :: x > 0 ==> (y <= z ==> x * y <= x * z) && (y < z ==> x * y < x * z)
+  {
+    forall x: int, y: int, z: int | (y <= z || y < z) && 0 < x
+      ensures (y <= z ==> x * y <= x * z) && (y < z ==> x * y < x * z)
+    {
+      LemmaMulLeftInequality(x, y, z);
+    }
+  }
+
+  /* if two seperate integers are each multiplied by a common integer and the products are equal, the 
+    two original integers are equal */
+  lemma LemmaMulEqualityConverse(m: int, x: int, y: int)
+    requires m != 0
+    requires m * x == m * y
+    ensures x == y
+  {
+    LemmaMulInductionAuto(m, u => x > y && 0 < u ==> x * u > y * u);
+    LemmaMulInductionAuto(m, u => x > y && 0 > u ==> x * u < y * u);
+    LemmaMulInductionAuto(m, u => x < y && 0 < u ==> x * u < y * u);
+    LemmaMulInductionAuto(m, u => x < y && 0 > u ==> x * u > y * u);
+  }
+
+  /* if any two seperate integers are each multiplied by a common integer and the products are equal, the 
+  two original integers are equal */
+  lemma LemmaMulEqualityConverseAuto()
+    ensures forall m: int, x: int, y: int {:trigger m * x, m * y} :: (m != 0 && m * x == m * y) ==> x == y
+  {
+    forall m: int, x: int, y: int | m != 0 && m * x == m * y
+      ensures x == y
+    {
+      LemmaMulEqualityConverse(m, x, y);
+    }
+  }
+
+  /* when two integers, x and y, are each multiplied by a positive integer, z, if x <= z then the x*z <= y*z */
+  lemma LemmaMulInequalityConverse(x: int, y: int, z: int)
+    requires x * z <= y * z
+    requires z > 0
+    ensures  x <= y
+  {
+    LemmaMulInductionAuto(z, u => x * u <= y * u && u > 0 ==> x <= y);
+  }
+
+  /* when two integers, x and y, are each multiplied by a positive integer, z, if x <= z then the x*z <= y*z 
+  for all valid values of x, y, and z*/
+  lemma LemmaMulInequalityConverseAuto()
+    ensures  forall x: int, y: int, z: int {:trigger x * z, y * z} :: x * z <= y * z && z > 0 ==> x <= y
+  {
+    forall x: int, y: int, z: int | x * z <= y * z && z > 0
+      ensures x <= y
+    {
+      LemmaMulInequalityConverse(x, y, z);
+    }
+  }
+
+  /* when two integers, x and y, are each multiplied by a positive integer, z, if x < z then the x*z < y*z */
+  lemma LemmaMulStrictInequalityConverse(x: int, y: int, z: int)
+    requires x * z < y * z
+    requires z >= 0
+    ensures  x < y
+  {
+    LemmaMulInductionAuto(z, u => x * u < y * u && u >= 0 ==> x < y);
+  }
+
+  /* when two integers, x and y, are each multiplied by a positive integer, z, if x < z then the x*z < y*z 
+  for all valid values of x, y, and z*/
+  lemma LemmaMulStrictInequalityConverseAuto()
+    ensures  forall x: int, y: int, z: int {:trigger x * z, y * z} :: x * z < y * z && z >= 0 ==> x < y
+  {
+    forall x: int, y: int, z: int | x * z < y * z && z >= 0
+      ensures x < y
+    {
+      LemmaMulStrictInequalityConverse(x, y, z);
+    }
+  }
+
+  /* multiplication is distributive */
+  lemma LemmaMulIsDistributiveAdd(x: int, y: int, z: int)
+    ensures x * (y + z) == x * y + x * z
+  {
+    MulINL.LemmaMulIsDistributiveAdd(x, y, z);
+  }
+
+  /* for all integers, multiplication is distributive with addition in the form x * (y + z) */
+  lemma LemmaMulIsDistributiveAddAuto()
+    ensures forall x: int, y: int, z: int {:trigger x * (y + z)} :: x * (y + z) == x * y + x * z
+  {
+    forall x: int, y: int, z: int
+      ensures x * (y + z) == x * y + x * z
+    {
+      LemmaMulIsDistributiveAdd(x, y, z);
+    }
+  }
+
+  /* for all integers, multiplication is distributive with addition in the form (y + z) * x */
+  lemma LemmaMulIsDistributiveAddOtherWay(x: int, y: int, z: int)
+    ensures (y + z) * x == y * x + z * x
+  {
+    LemmaMulAuto();
+  }
+
+  lemma LemmaMulIsDistributiveAddOtherWayAuto()
+    ensures forall x: int, y: int, z: int {:trigger (y + z) * x} :: (y + z) * x == y * x + z * x
+  {
+    forall x: int, y: int, z: int
+      ensures (y+z) * x == y * x + z * x
+    {
+      LemmaMulIsDistributiveAddOtherWay(x, y, z);
+    }
+  }
+
+  /* multiplication is distributive with subtraction */
+  lemma LemmaMulIsDistributiveSub(x: int, y: int, z: int)
+    ensures x * (y - z) == x * y - x * z
+  {
+    LemmaMulAuto();
+  }
+
+  /* for all integers, multiplication is distributive with subtraction */
+  lemma LemmaMulIsDistributiveSubAuto()
+    ensures forall x: int, y: int, z: int {:trigger x * (y - z)} :: x * (y - z) == x * y - x * z
+  {
+    forall x: int, y: int, z: int
+      ensures x * (y - z) == x * y - x * z
+    {
+      LemmaMulIsDistributiveSub(x, y, z);
+    }
+  }
+
+  /* proves the overall distributive nature of multiplication*/
+  lemma LemmaMulIsDistributive(x: int, y: int, z: int)
+    ensures x * (y + z) == x * y + x * z
+    ensures x * (y - z) == x * y - x * z
+    ensures (y + z) * x == y * x + z * x
+    ensures (y - z) * x == y * x - z * x
+    ensures x * (y + z) == (y + z) * x
+    ensures x * (y - z) == (y - z) * x
+    ensures x * y == y * x
+    ensures x * z == z * x
+  {
+    LemmaMulAuto();
+  }
+
+  /* for all integers, multiplication is distributive */
+  lemma LemmaMulIsDistributiveAuto()
+    ensures forall x: int, y: int, z: int {:trigger x * (y + z)} :: x * (y + z) == x * y + x * z
+    ensures forall x: int, y: int, z: int {:trigger x * (y - z)} :: x * (y - z) == x * y - x * z
+    ensures forall x: int, y: int, z: int {:trigger (y + z) * x} :: (y + z) * x == y * x + z * x
+    ensures forall x: int, y: int, z: int {:trigger (y - z) * x} :: (y - z) * x == y * x - z * x
+  {
+    LemmaMulIsDistributiveAddAuto();
+    LemmaMulIsDistributiveSubAuto();
+    LemmaMulIsCommutativeAuto();
+  }
+
+  /* multiplying two positive integers will result in a positive integer */
+  lemma LemmaMulStrictlyPositive(x: int, y: int)
+    ensures (0 < x && 0 < y) ==> (0 < x * y)
+  {
+    MulINL.LemmaMulStrictlyPositive(x, y);
+  }
+
+  /* multiplying any two positive integers will result in a positive integer */
+  lemma LemmaMulStrictlyPositiveAuto()
+    ensures forall x: int, y: int {:trigger x * y} :: (0 < x && 0 < y) ==> (0 < x * y)
+  {
+    forall x: int, y: int | 0 < x && 0 < y
+      ensures 0 < x * y
+    {
+      LemmaMulStrictlyPositive(x,y);
+    }
+  }
+
+  /* multiplying a positive integer by an integer greater than 1 will result in a product that 
+  is greater than the original integer */
+  lemma LemmaMulStrictlyIncreases(x: int, y: int)
+    requires 1 < x
+    requires 0 < y
+    ensures y < x * y
+  {
+    LemmaMulInductionAuto(x, u => 1 < u ==> y < u * y);
+  }
+
+  /* multiplying any positive integer by any integer greater than 1 will result in a product that 
+  is greater than the original integer */
+  lemma LemmaMulStrictlyIncreasesAuto()
+    ensures forall x: int, y: int {:trigger x * y} :: 1 < x && 0 < y  ==> y < x * y
+  {
+    forall x: int, y: int | 1 < x && 0 < y
+      ensures y < x * y
+    {
+      LemmaMulStrictlyIncreases(x, y);
+    }
+  }
+
+  /* multiplying an integer by a positive integer will result in a product that is greater than or
+  equal to the original integer */
+  lemma LemmaMulIncreases(x: int, y: int)
+    requires 0 < x
+    requires 0 < y
+    ensures y <= x * y
+  {
+    LemmaMulInductionAuto(x, u => 0 < u ==> y <= u * y);
+  }
+
+  /* multiplying any integer by any positive integer will result in a product that is greater than or
+  equal to the original integer */
+  lemma LemmaMulIncreasesAuto()
+    ensures forall x: int, y: int {:trigger x * y} :: (0 < x && 0 < y) ==> (y <= x * y)
+  {
+    forall x: int, y: int | 0 < x && 0 < y
+      ensures y <= x * y
+    {
+      LemmaMulIncreases(x, y);
+    }
+  }
+
+  /* multiplying two positive numbers will result in a positive product */
+  lemma LemmaMulNonnegative(x: int, y: int)
+    requires 0 <= x
+    requires 0 <= y
+    ensures  0 <= x * y
+  {
+    LemmaMulInductionAuto(x, u => 0 <= u ==> 0 <= u * y);
+  }
+
+  /* multiplying any two positive numbers will result in a positive product */
+  lemma LemmaMulNonnegativeAuto()
+    ensures forall x: int, y: int {:trigger x * y} :: 0 <= x && 0 <= y ==> 0 <= x * y
+  {
+    forall x: int, y: int | 0 <= x && 0 <= y
+      ensures 0 <= x * y
+    {
+      LemmaMulNonnegative(x, y);
+    }
+  }
+
+  /* shows the equivalent forms of using the unary negation operator */
+  lemma LemmaMulUnaryNegation(x: int, y: int)
+    ensures (-x) * y == -(x * y) == x * (-y)
+  {
+    LemmaMulInductionAuto(x, u => (-u) * y == -(u * y) == u * (-y));
+  }
+
+  /* shows the equivalent forms of using the unary negation operator for any integers*/
+  lemma LemmaMulUnaryNegationAuto()
+    ensures forall x: int, y: int {:trigger (-x) * y} {:trigger x * (-y)} :: (-x) * y == -(x * y) == x * (-y)
+  {
+    forall x: int, y: int
+      ensures (-x) * y == -(x * y) == x * (-y)
+    {
+      LemmaMulUnaryNegation(x, y);
+    }
+  }
+
+  /* multiplying two negative integers, -x and -y, is equivalent to multiplying x and y */
+  lemma LemmaMulCancelsNegatives(x: int, y: int)
+    ensures x * y == (-x) * (-y)
+  {
+    LemmaMulUnaryNegationAuto();
+  }
+
+  /* multiplying two negative integers, -x and -y, is equivalent to multiplying x and y */
+  lemma LemmaMulCancelsNegativesAuto()
+    ensures forall x: int, y: int {:trigger x * y} :: x * y == (-x) * (-y)
+  {
+    forall x: int, y: int
+      ensures x * y == (-x) * (-y)
+    {
+      LemmaMulCancelsNegatives(x, y);
+    }
+  }
+
+  /* includes all properties of multiplication */
+  lemma LemmaMulProperties()
+    ensures forall x: int, y: int {:trigger x * y} :: x * y == y * x
+    ensures forall x: int {:trigger x * 1}{:trigger 1 * x} :: x * 1 == 1 * x == x
+    ensures forall x: int, y: int, z: int {:trigger x * z, y * z} :: x < y && z > 0 ==> x * z < y * z
+    ensures forall x: int, y: int, z: int {:trigger x * z, y * z} :: x <= y && z >= 0 ==> x * z <= y * z
+    ensures forall x: int, y: int, z: int {:trigger x * (y + z)} :: x * (y + z) == x * y + x * z
+    ensures forall x: int, y: int, z: int {:trigger x * (y - z)} :: x * (y - z) == x * y - x * z
+    ensures forall x: int, y: int, z: int {:trigger (y + z) * x} :: (y + z) * x == y * x + z * x
+    ensures forall x: int, y: int, z: int {:trigger (y - z) * x} :: (y - z) * x == y * x - z * x
+    ensures forall x: int, y: int, z: int {:trigger x * (y * z)}{:trigger (x * y) * z} :: x * (y * z) == (x * y) * z
+    ensures forall x: int, y: int {:trigger x * y} :: x * y != 0 <==> x != 0 && y != 0
+    ensures forall x: int, y: int {:trigger x * y} :: 0 <= x && 0 <= y ==> 0 <= x * y
+    ensures forall x: int, y: int {:trigger x * y} :: 0 < x && 0 < y && 0 <= x * y ==> x <= x * y && y <= x * y
+    ensures forall x: int, y: int {:trigger x * y} :: (1 < x && 0 < y) ==> (y < x * y)
+    ensures forall x: int, y: int {:trigger x * y} :: (0 < x && 0 < y) ==> (y <= x * y)
+    ensures forall x: int, y: int {:trigger x * y} :: (0 < x && 0 < y) ==> (0 < x * y)
+  {
+    LemmaMulStrictInequalityAuto();
+    LemmaMulInequalityAuto();
+    LemmaMulIsDistributiveAuto();
+    LemmaMulIsAssociativeAuto();
+    LemmaMulOrderingAuto();
+    LemmaMulNonzeroAuto();
+    LemmaMulNonnegativeAuto();
+    LemmaMulStrictlyIncreasesAuto();
+    LemmaMulIncreasesAuto();
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Power.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Power.dfy
new file mode 100644
index 00000000000..39f195f39d6
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Power.dfy
@@ -0,0 +1,627 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/* Every lemma comes in 2 forms: 'LemmaProperty' and 'LemmaPropertyAuto'. The
+former takes arguments and may be more stable and less reliant on Z3
+heuristics. The latter includes automation and its use requires less effort */
+
+@DisableNonlinearArithmetic
+module Std.Arithmetic.Power {
+  import opened DivMod
+  import opened GeneralInternals
+  import opened Mul
+  import opened MulInternals
+
+  function Pow(b: int, e: nat): int
+    decreases e
+  {
+    if e == 0 then
+      1
+    else
+      b * Pow(b, e - 1)
+  }
+
+  /* A number raised to the power of 0 equals 1. */
+  lemma LemmaPow0(b: int)
+    ensures Pow(b, 0) == 1
+  {
+  }
+
+  lemma LemmaPow0Auto()
+    ensures forall b: nat {:trigger Pow(b, 0)} :: Pow(b, 0) == 1
+  {
+    forall b: nat {:trigger Pow(b, 0)}
+      ensures Pow(b, 0) == 1
+    {
+      LemmaPow0(b);
+    }
+  }
+
+  /* A number raised to the power of 1 equals the number itself. */
+  lemma LemmaPow1(b: int)
+    ensures Pow(b, 1) == b
+  {
+    calc {
+      Pow(b, 1);
+      {  }
+      b * Pow(b, 0);
+      { LemmaPow0(b); }
+      b * 1;
+      { LemmaMulBasicsAuto(); }
+      b;
+    }
+  }
+
+  lemma LemmaPow1Auto()
+    ensures forall b: nat {:trigger Pow(b, 1)} :: Pow(b, 1) == b
+  {
+    forall b: nat {:trigger Pow(b, 1)}
+      ensures Pow(b, 1) == b
+    {
+      LemmaPow1(b);
+    }
+  }
+
+  /* 0 raised to a positive power equals 0. */
+  lemma Lemma0Pow(e: nat)
+    requires e > 0
+    ensures Pow(0, e) == 0
+  {
+    LemmaMulBasicsAuto();
+    if e != 1 {
+      Lemma0Pow(e - 1);
+    }
+  }
+
+  lemma Lemma0PowAuto()
+    ensures forall e: nat {:trigger Pow(0, e)} :: e > 0 ==> Pow(0, e) == 0
+  {
+    forall e: nat {:trigger Pow(0, e)} | e > 0
+      ensures Pow(0, e) == 0
+    {
+      Lemma0Pow(e);
+    }
+  }
+
+  /* 1 raised to any power equals 1. */
+  lemma Lemma1Pow(e: nat)
+    ensures Pow(1, e) == 1
+  {
+    LemmaMulBasicsAuto();
+    if e != 0 {
+      Lemma1Pow(e - 1);
+    }
+  }
+
+  lemma Lemma1PowAuto()
+    ensures forall e: nat {:trigger Pow(1, e)} :: Pow(1, e) == 1
+  {
+    forall e: nat {:trigger Pow(1, e)}
+      ensures Pow(1, e) == 1
+    {
+      Lemma1Pow(e);
+    }
+  }
+
+  /* Squaring a number is equal to raising it to the power of 2. */
+  lemma LemmaSquareIsPow2(x: nat)
+    ensures Pow(x, 2) == x * x
+  {
+  }
+
+  lemma LemmaSquareIsPow2Auto()
+    ensures forall x: nat {:trigger Pow(x, 2)} :: Pow(x, 2) == x * x
+  {
+    forall x: nat {:trigger Pow(x, 2)}
+      ensures Pow(x, 2) == x * x
+    {}
+  }
+
+  /* A positive number raised to any power is positive. */
+  lemma LemmaPowPositive(b: int, e: nat)
+    requires b > 0
+    ensures 0 < Pow(b, e)
+  {
+    LemmaMulIncreasesAuto();
+    LemmaPow0Auto(); // Base case
+    // Distributes power i + 1 in first inductive step
+    LemmaMulInductionAuto(e, u => 0 <= u ==> 0 < Pow(b, u));
+  }
+
+  lemma LemmaPowPositiveAuto()
+    ensures forall b: int, e: nat {:trigger Pow(b, e)}
+              :: b > 0 ==> 0 < Pow(b, e)
+  {
+    forall b: int, e: nat {:trigger Pow(b, e)} | b > 0
+      ensures 0 < Pow(b, e)
+    {
+      LemmaPowPositive(b, e);
+    }
+  }
+
+  /* Add exponents when multiplying powers with the same base. */
+  lemma LemmaPowAdds(b: int, e1: nat, e2: nat)
+    decreases e1
+    ensures Pow(b, e1 + e2) == Pow(b, e1) * Pow(b, e2)
+  {
+    if e1 == 0 {
+      calc {
+        Pow(b, e1) * Pow(b, e2);
+        { LemmaPow0(b); }
+        1 * Pow(b, e2);
+        { LemmaMulBasicsAuto(); }
+        Pow(b, 0 + e2);
+      }
+    }
+    else {
+      calc {
+        Pow(b, e1) * Pow(b, e2);
+        {  }
+        (b * Pow(b, e1 - 1)) * Pow(b, e2);
+        { LemmaMulIsAssociativeAuto(); }
+        b * (Pow(b, e1 - 1) * Pow(b, e2));
+        { LemmaPowAdds(b, e1 - 1, e2); }
+        b * Pow(b, e1 - 1 + e2);
+        {  }
+        Pow(b, e1 + e2);
+      }
+    }
+  }
+
+  lemma LemmaPowAddsAuto()
+    ensures forall b: int, e1: nat, e2: nat {:trigger Pow(b, e1 + e2)}
+              :: Pow(b, e1 + e2) == Pow(b, e1) * Pow(b, e2)
+  {
+    forall b: int, e1: nat, e2: nat {:trigger Pow(b, e1 + e2)}
+      ensures Pow(b, e1 + e2) == Pow(b, e1) * Pow(b, e2)
+    {
+      LemmaPowAdds(b, e1, e2);
+    }
+  }
+
+  lemma LemmaPowSubAddCancel(b: int, e1: nat, e2: nat)
+    decreases e1
+    requires e1 >= e2
+    ensures Pow(b, e1 - e2) * Pow(b, e2) == Pow(b, e1)
+  {
+    LemmaPowAdds(b, e1 - e2, e2);
+  }
+
+  lemma LemmaPowSubAddCancelAuto()
+    ensures forall b: int, e1: nat, e2: nat {:trigger Pow(b, e1 - e2)} | e1 >= e2
+              :: Pow(b, e1 - e2) * Pow(b, e2) == Pow(b, e1)
+  {
+    forall b: int, e1: nat, e2: nat | e1 >= e2
+    {
+      LemmaPowSubAddCancel(b, e1, e2);
+    }
+  }
+
+  /* Subtract exponents when dividing powers. */
+  lemma LemmaPowSubtracts(b: nat, e1: nat, e2: nat)
+    requires b > 0
+    requires e1 <= e2
+    ensures Pow(b, e1) > 0
+    ensures Pow(b, e2 - e1) == Pow(b, e2) / Pow(b, e1) > 0
+  {
+    LemmaPowPositiveAuto();
+    calc {
+      Pow(b, e2) / Pow(b, e1);
+      { LemmaPowSubAddCancel(b, e2, e1); }
+      Pow(b, e2 - e1) * Pow(b, e1) / Pow(b, e1);
+      { LemmaDivByMultiple(Pow(b, e2 - e1), Pow(b, e1)); }
+      Pow(b, e2 - e1);
+    }
+  }
+
+  lemma LemmaPowSubtractsAuto()
+    ensures forall b: nat, e1: nat :: b > 0 ==> Pow(b, e1) > 0
+    ensures forall b: nat, e1: nat, e2: nat {:trigger Pow(b, e2 - e1)}
+              :: b > 0 && e1 <= e2 ==>
+                   Pow(b, e2 - e1) == Pow(b, e2) / Pow(b, e1) > 0
+  {
+    LemmaPowPositiveAuto();
+    forall b: nat, e1: nat, e2: nat {:trigger Pow(b, e2 - e1)}
+      | b > 0 && e1 <= e2
+      ensures Pow(b, e2 - e1) == Pow(b, e2) / Pow(b, e1) > 0
+    {
+      LemmaPowSubtracts(b, e1, e2);
+    }
+  }
+
+  /* Multiply exponents when finding the power of a power. */
+  lemma LemmaPowMultiplies(a: int, b: nat, c: nat)
+    decreases c
+    ensures 0 <= b * c
+    ensures Pow(Pow(a, b), c) == Pow(a, b * c)
+  {
+    LemmaMulNonnegative(b, c);
+    if c == 0 {
+      LemmaMulBasicsAuto();
+      calc {
+        Pow(a, b * c);
+        { LemmaPow0(a); }
+        1;
+        { LemmaPow0(Pow(a, b)); }
+        Pow(Pow(a, b), c);
+      }
+    }
+    else {
+      calc {
+        b * c - b;
+        { LemmaMulBasicsAuto(); }
+        b * c - b * 1;
+        { LemmaMulIsDistributiveAuto(); }
+        b * (c - 1);
+      }
+      LemmaMulNonnegative(b, c - 1);
+      assert 0 <= b * c - b;
+
+      calc {
+        Pow(a, b * c);
+        Pow(a, b + b * c - b);
+        { LemmaPowAdds(a, b, b * c - b); }
+        Pow(a, b) * Pow(a, b * c - b);
+        Pow(a, b) * Pow(a, b * (c - 1));
+        { LemmaPowMultiplies(a, b, c - 1); }
+        Pow(a, b) * Pow(Pow(a, b), c - 1);
+        {  }
+        Pow(Pow(a, b), c);
+      }
+    }
+  }
+
+  lemma LemmaPowMultipliesAuto()
+    ensures forall b: nat, c: nat {:trigger b * c} :: 0 <= b * c
+    ensures forall a: int, b: nat, c: nat {:trigger Pow(a, b * c)}
+              :: Pow(Pow(a, b), c) == Pow(a, b * c)
+  {
+    LemmaMulNonnegativeAuto();
+    forall a: int, b: nat, c: nat {:trigger Pow(a, b * c)}
+      ensures Pow(Pow(a, b), c) == Pow(a, b * c)
+    {
+      LemmaPowMultiplies(a, b, c);
+    }
+  }
+
+  /* Distribute the power to factors of a product. */
+  lemma LemmaPowDistributes(a: int, b: int, e: nat)
+    decreases e
+    ensures Pow(a * b, e) == Pow(a, e) * Pow(b, e)
+  {
+    LemmaMulBasicsAuto();
+    if e > 0 {
+      calc {
+        Pow(a * b, e);
+        (a * b) * Pow(a * b, e - 1);
+        { LemmaPowDistributes(a, b, e - 1); }
+        (a * b) * (Pow(a, e - 1) * Pow(b, e - 1));
+        { LemmaMulIsAssociativeAuto(); LemmaMulIsCommutativeAuto(); }
+        (a * Pow(a, e - 1)) * (b * Pow(b, e - 1));
+        Pow(a, e) * Pow(b, e);
+      }
+    }
+  }
+
+  lemma LemmaPowDistributesAuto()
+    ensures forall a: int, b: int, e: nat {:trigger Pow(a * b, e)}
+              :: Pow(a * b, e) == Pow(a, e) * Pow(b, e)
+  {
+    forall a: int, b: int, e: nat {:trigger Pow(a * b, e)}
+      ensures Pow(a * b, e) == Pow(a, e) * Pow(b, e)
+    {
+      LemmaPowDistributes(a, b, e);
+    }
+  }
+
+  /* Group properties of powers. */
+  lemma LemmaPowAuto()
+    ensures forall x: int {:trigger Pow(x, 0)} :: Pow(x, 0) == 1
+    ensures forall x: int {:trigger Pow(x, 1)} :: Pow(x, 1) == x
+    ensures forall x: int, y: int {:trigger Pow(x, y)} :: y == 0 ==> Pow(x, y) == 1
+    ensures forall x: int, y: int {:trigger Pow(x, y)} :: y == 1 ==> Pow(x, y) == x
+    ensures forall x: int, y: int {:trigger x * y} :: 0 < x && 0 < y ==> x <= x * y
+    ensures forall x: int, y: int {:trigger x * y} :: 0 < x && 1 < y ==> x < x * y
+    ensures forall x: int, y: nat, z: nat {:trigger Pow(x, y + z)} :: Pow(x, y + z) == Pow(x, y) * Pow(x, z)
+    ensures forall x: int, y: nat, z: nat {:trigger Pow(x, y - z)} :: y >= z ==> Pow(x, y - z) * Pow(x, z) == Pow(x, y)
+    ensures forall x: int, y: int, z: nat {:trigger Pow(x * y, z)} :: Pow(x * y, z) == Pow(x, z) * Pow(y, z)
+  {
+
+    LemmaPow0Auto();
+    LemmaPow1Auto();
+
+    LemmaPowDistributesAuto();
+    LemmaPowAddsAuto();
+    LemmaPowSubAddCancelAuto();
+
+    LemmaMulAuto();
+    LemmaMulIncreasesAuto();
+    LemmaMulStrictlyIncreasesAuto();
+  }
+
+  /* A positive number raised to a power strictly increases as the power
+  strictly increases. */
+  lemma LemmaPowStrictlyIncreases(b: nat, e1: nat, e2: nat)
+    requires 1 < b
+    requires e1 < e2
+    ensures Pow(b, e1) < Pow(b, e2)
+  {
+    LemmaPowAuto();
+    var f := e => 0 < e ==> Pow(b, e1) < Pow(b, e1 + e);
+    forall i {:trigger IsLe(0, i)} | IsLe(0, i) && f(i)
+      ensures f(i + 1)
+    {
+      assert 0 < i ==> Pow(b, e1) < Pow(b, e1 + i);
+      calc {
+         Pow(b, e1 + i);
+      <= { LemmaPowPositive(b, e1 + i);
+           LemmaMulLeftInequality(Pow(b, e1 + i), 1, b); }
+         Pow(b, e1 + i) * b;
+      == { LemmaPow1(b); }
+         Pow(b, e1 + i) * Pow(b, 1);
+      == { LemmaPowAdds(b, e1 + i, 1); }
+         Pow(b, e1 + i + 1);
+      == calc {
+           e1 + i + 1;
+           e1 + (i + 1);
+         }
+         Pow(b, e1 + (i + 1));
+      }
+      assert f(i+1);
+    }
+    LemmaMulInductionAuto(e2 - e1, f);
+    assert Pow(b, e1) < Pow(b, e1 + (e2 - e1)) == Pow(b, e2) by {
+      assert 0 < e2 - e1;
+    }
+  }
+
+  lemma LemmaPowStrictlyIncreasesAuto()
+    ensures forall b: nat, e1: nat, e2: nat {:trigger Pow(b, e1),
+              Pow(b, e2)} :: (1 < b && e1 < e2) ==> Pow(b, e1) < Pow(b, e2)
+  {
+    forall b: nat, e1: nat, e2: nat {:trigger Pow(b, e1), Pow(b, e2)}
+      | 1 < b && e1 < e2
+      ensures Pow(b, e1) < Pow(b, e2)
+    {
+      LemmaPowStrictlyIncreases(b, e1, e2);
+    }
+  }
+
+  /* A positive number raised to a power increases as the power increases. */
+  lemma LemmaPowIncreases(b: nat, e1: nat, e2: nat)
+    requires b > 0
+    requires e1 <= e2
+    ensures Pow(b, e1) <= Pow(b, e2)
+  {
+    var f := e => 0 <= e ==> Pow(b, e1) <= Pow(b, e1 + e);
+    forall i | IsLe(0, i) && f(i)
+      ensures f(i + 1)
+    {
+      calc {
+        Pow(b, e1 + i);
+      <= { LemmaPowPositive(b, e1 + i);
+           LemmaMulLeftInequality(Pow(b, e1 + i), 1, b); }
+        Pow(b, e1 + i) * b;
+      == { LemmaPow1(b); }
+        Pow(b, e1 + i) * Pow(b, 1);
+      == { LemmaPowAdds(b, e1 + i, 1); }
+        Pow(b, e1 + i + 1);
+      }
+    }
+    LemmaMulInductionAuto(e2 - e1, f);
+    assert Pow(b, e1) <= Pow(b, e1 + (e2 - e1)) by {
+      assert 0 <= e2 - e1;
+    }
+  }
+
+  lemma LemmaPowIncreasesAuto()
+    ensures forall b: nat, e1: nat, e2: nat {:trigger Pow(b, e1),
+              Pow(b, e2)} :: (1 < b && e1 <= e2) ==> Pow(b, e1) <= Pow(b, e2)
+  {
+    forall b: nat, e1: nat, e2: nat {:trigger Pow(b, e1), Pow(b, e2)}
+      | 1 < b && e1 <= e2
+      ensures Pow(b, e1) <= Pow(b, e2)
+    {
+      LemmaPowIncreases(b, e1, e2);
+    }
+  }
+
+  /* A power strictly increases as a positive number raised to the power
+  strictly increases. */
+  lemma LemmaPowStrictlyIncreasesConverse(b: nat, e1: nat, e2: nat)
+    requires b > 0
+    requires Pow(b, e1) < Pow(b, e2)
+    ensures e1 < e2
+  {
+    if e1 >= e2 {
+      LemmaPowIncreases(b, e2, e1);
+      assert false;
+    }
+  }
+
+  lemma LemmaPowStrictlyIncreasesConverseAuto()
+    ensures forall b: nat, e1: nat, e2: nat
+              {:trigger Pow(b, e1), Pow(b, e2)}
+              :: b > 0 && Pow(b, e1) < Pow(b, e2) ==> e1 < e2
+  {
+    forall b: nat, e1: nat, e2: nat {:trigger Pow(b, e1), Pow(b, e2)}
+      | b > 0 && Pow(b, e1) < Pow(b, e2)
+      ensures e1 < e2
+    {
+      LemmaPowStrictlyIncreasesConverse(b, e1, e2);
+    }
+  }
+
+  /* A power increases as a positive number raised to the power increases. */
+  lemma LemmaPowIncreasesConverse(b: nat, e1: nat, e2: nat)
+    requires 1 < b
+    requires Pow(b, e1) <= Pow(b, e2)
+    ensures e1 <= e2
+  {
+    if e1 > e2 {
+      LemmaPowStrictlyIncreases(b, e2, e1);
+      assert false;
+    }
+  }
+
+  lemma LemmaPowIncreasesConverseAuto()
+    ensures forall b: nat, e1: nat, e2: nat
+              {:trigger Pow(b, e1), Pow(b, e2)}
+              :: 1 < b && Pow(b, e1) <= Pow(b, e2) ==> e1 <= e2
+  {
+    forall b: nat, e1: nat, e2: nat {:trigger Pow(b, e1), Pow(b, e2)}
+      | 1 < b && Pow(b, e1) <= Pow(b, e2)
+      ensures e1 <= e2
+    {
+      LemmaPowIncreasesConverse(b, e1, e2);
+    }
+  }
+
+  /* (b^xy)^z = (b^x)^yz */
+  lemma LemmaPullOutPows(b: nat, x: nat, y: nat, z: nat)
+    requires b > 0
+    ensures 0 <= x * y
+    ensures 0 <= y * z
+    ensures Pow(Pow(b, x * y), z) == Pow(Pow(b, x), y * z)
+  {
+    LemmaMulNonnegative(x, y);
+    LemmaMulNonnegative(y, z);
+    LemmaPowPositive(b, x);
+    calc {
+      Pow(Pow(b, x * y), z);
+      { LemmaPowMultiplies(b, x, y); }
+      Pow(Pow(Pow(b, x), y), z);
+      { LemmaPowMultiplies(Pow(b, x), y, z); }
+      Pow(Pow(b, x), y * z);
+    }
+  }
+
+  lemma LemmaPullOutPowsAuto()
+    ensures forall y: nat, z: nat {:trigger z * y} :: 0 <= z * y && 0 <= y * z
+    ensures forall b: nat, x: nat, y: nat, z: nat
+              {:trigger Pow(Pow(b, x * y), z)}
+              :: b > 0 ==> Pow(Pow(b, x * y), z) == Pow(Pow(b, x), y * z)
+  {
+    LemmaMulNonnegativeAuto();
+    forall b: nat, x: nat, y: nat, z: nat {:trigger Pow(Pow(b, x * y), z)}
+      | b > 0 ensures Pow(Pow(b, x * y), z) == Pow(Pow(b, x), y * z)
+    {
+      LemmaPullOutPows(b, x, y, z);
+    }
+  }
+
+  /* Inequality due to smaller numerator, same denominator. */
+  lemma LemmaPowDivisionInequality(x: nat, b: nat, e1: nat, e2: nat)
+    requires b > 0
+    requires e2 <= e1
+    requires x < Pow(b, e1)
+    ensures Pow(b, e2) > 0
+    ensures x / Pow(b, e2) < Pow(b, e1 - e2)
+  {
+    LemmaPowPositiveAuto();
+    if (x / Pow(b, e2) >= Pow(b, e1 - e2)) {
+      assert x / Pow(b, e2) >= Pow(b, e1 - e2);
+
+      assert x / Pow(b, e2) * Pow(b, e2) >= Pow(b, e1 - e2) * Pow(b, e2) by
+      { LemmaMulInequality(Pow(b, e1 - e2), x / Pow(b, e2), Pow(b, e2)); }
+
+      assert x - x % Pow(b, e2) >= Pow(b, e1 - e2) * Pow(b, e2) by
+      { LemmaFundamentalDivMod(x, Pow(b, e2));
+        LemmaMulIsCommutativeAuto(); }
+
+      assert x - x % Pow(b, e2) >= Pow(b, e1) by
+      { LemmaPowAdds(b, e1 - e2, e2); }
+
+      assert x >= Pow(b, e1) by
+      { LemmaModPropertiesAuto(); }
+
+      //assert false;
+    }
+  }
+
+  lemma LemmaPowDivisionInequalityAuto()
+    ensures forall b: nat, e2: nat :: b > 0 ==> Pow(b, e2) > 0
+    ensures forall x: nat, b: nat, e1: nat, e2: nat
+              {:trigger x / Pow(b, e2), Pow(b, e1 - e2)}
+              :: b > 0 && e2 <= e1 && x < Pow(b, e1) ==>
+                   x / Pow(b, e2) < Pow(b, e1 - e2)
+  {
+    LemmaPowPositiveAuto();
+    forall x: nat, b: nat, e1: nat, e2: nat
+      {:trigger x / Pow(b, e2), Pow(b, e1 - e2)}
+      | b > 0 && e2 <= e1 && x < Pow(b, e1)
+      ensures x / Pow(b, e2) < Pow(b, e1 - e2)
+    {
+      LemmaPowDivisionInequality(x, b, e1, e2);
+    }
+  }
+
+  /* b^e % b = 0 */
+  lemma {:induction false} LemmaPowMod(b: nat, e: nat)
+    requires b > 0 && e > 0
+    ensures Pow(b, e) % b == 0
+  {
+    calc {
+      Pow(b, e) % b;
+      (b * Pow(b, e - 1)) % b;
+      { LemmaMulIsCommutative(b, Pow(b, e - 1)); }
+      (Pow(b, e - 1) * b) % b;
+      {
+        LemmaPowPositiveAuto();
+        LemmaModMultiplesBasic(Pow(b, e-1) , b);
+      }
+      0;
+    }
+  }
+
+  lemma LemmaPowModAuto()
+    ensures forall b: nat, e: nat {:trigger Pow(b, e)}
+              :: b > 0 && e > 0 ==> Pow(b, e) % b == 0
+  {
+    forall b: nat, e: nat {:trigger Pow(b, e)} | b > 0 && e > 0
+      ensures Pow(b, e) % b == 0
+    {
+      LemmaPowMod(b, e);
+    }
+  }
+
+  /* ((b % e)^e) % m = b^e % m */
+  lemma LemmaPowModNoop(b: int, e: nat, m: int)
+    decreases e
+    requires m > 0
+    ensures Pow(b % m, e) % m == Pow(b, e) % m
+  {
+    LemmaModPropertiesAuto();
+    if e > 0 {
+      calc {
+        Pow(b % m, e) % m;
+        ((b % m) * Pow(b % m, e - 1)) % m;
+        { LemmaMulModNoopGeneral(b, Pow(b % m, e - 1), m); }
+        ((b % m) * (Pow(b % m, e - 1) % m) % m) % m;
+        { LemmaPowModNoop(b, e - 1, m); }
+        ((b % m) * (Pow(b, e - 1) % m) % m) % m;
+        { LemmaMulModNoopGeneral(b, Pow(b, e - 1), m); }
+        (b * (Pow(b, e - 1)) % m) % m;
+        (b * (Pow(b, e - 1))) % m;
+        Pow(b, e) % m;
+      }
+    }
+  }
+
+  lemma LemmaPowModNoopAuto()
+    ensures forall b: nat, e: nat, m: nat {:trigger Pow(b % m, e)}
+              :: m > 0 ==> Pow(b % m, e) % m == Pow(b, e) % m
+  {
+    forall b: nat, e: nat, m: nat {:trigger Pow(b % m, e)}
+      | m > 0 ensures Pow(b % m, e) % m == Pow(b, e) % m
+    {
+      LemmaPowModNoop(b, e, m);
+    }
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/Power2.dfy b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Power2.dfy
new file mode 100644
index 00000000000..0fc47dd4160
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/Power2.dfy
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ *  Original: Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *  
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/* Every lemma comes in 2 forms: 'LemmaProperty' and 'LemmaPropertyAuto'. The
+former takes arguments and may be more stable and less reliant on Z3
+heuristics. The latter includes automation and its use requires less effort */
+
+module {:disableNonlinearArithmetic} Std.Arithmetic.Power2 {
+  import opened GeneralInternals
+  import opened MulInternals
+  import opened Power
+
+  function Pow2(e: nat): nat
+    ensures Pow2(e) > 0
+  {
+    LemmaPowPositive(2, e);
+    Pow(2, e)
+  }
+
+  /* Pow2() is equivalent to Pow() with base 2. */
+  lemma LemmaPow2(e: nat)
+    ensures Pow2(e) == Pow(2, e)
+  {
+
+    if e != 0 {
+      LemmaPow2(e - 1);
+    }
+  }
+
+  lemma LemmaPow2Auto()
+    ensures forall e: nat {:trigger Pow2(e)} :: Pow2(e) == Pow(2, e)
+  {
+
+    forall e: nat {:trigger Pow2(e)}
+      ensures Pow2(e) == Pow(2, e)
+    {
+      LemmaPow2(e);
+    }
+  }
+
+  /* (2^e - 1) / 2 = 2^(e - 1) - 1 */
+  // keep
+  lemma LemmaPow2MaskDiv2(e: nat)
+    requires 0 < e
+    ensures (Pow2(e) - 1) / 2 == Pow2(e - 1) - 1
+  {
+    LemmaPow2Auto();
+    LemmaPowAuto();
+    var f := e => 0 < e ==> (Pow2(e) - 1) / 2 == Pow2(e - 1) - 1;
+    assert forall i {:trigger IsLe(0, i)} :: IsLe(0, i) && f(i) ==> f(i + 1);
+    assert forall i {:trigger IsLe(i, 0)} :: IsLe(i, 0) && f(i) ==> f(i - 1);
+    LemmaMulInductionAuto(e, f);
+  }
+
+  lemma LemmaPow2MaskDiv2Auto()
+    ensures forall e: nat {:trigger Pow2(e)} :: 0 < e ==>
+                                                  (Pow2(e) - 1) / 2 == Pow2(e - 1) - 1
+  {
+    forall e: nat {:trigger Pow2(e)} | 0 < e
+      ensures (Pow2(e) - 1) / 2 == Pow2(e - 1) - 1
+    {
+      LemmaPow2MaskDiv2(e);
+    }
+  }
+
+  lemma Lemma2To64()
+    ensures Pow2(0) == 0x1
+    ensures Pow2(1) == 0x2
+    ensures Pow2(2) == 0x4
+    ensures Pow2(3) == 0x8
+    ensures Pow2(4) == 0x10
+    ensures Pow2(5) == 0x20
+    ensures Pow2(6) == 0x40
+    ensures Pow2(7) == 0x80
+    ensures Pow2(8) == 0x100
+    ensures Pow2(9) == 0x200
+    ensures Pow2(10) == 0x400
+    ensures Pow2(11) == 0x800
+    ensures Pow2(12) == 0x1000
+    ensures Pow2(13) == 0x2000
+    ensures Pow2(14) == 0x4000
+    ensures Pow2(15) == 0x8000
+    ensures Pow2(16) == 0x10000
+    ensures Pow2(17) == 0x20000
+    ensures Pow2(18) == 0x40000
+    ensures Pow2(19) == 0x80000
+    ensures Pow2(20) == 0x100000
+    ensures Pow2(21) == 0x200000
+    ensures Pow2(22) == 0x400000
+    ensures Pow2(23) == 0x800000
+    ensures Pow2(24) == 0x1000000
+    ensures Pow2(25) == 0x2000000
+    ensures Pow2(26) == 0x4000000
+    ensures Pow2(27) == 0x8000000
+    ensures Pow2(28) == 0x10000000
+    ensures Pow2(29) == 0x20000000
+    ensures Pow2(30) == 0x40000000
+    ensures Pow2(31) == 0x80000000
+    ensures Pow2(32) == 0x100000000
+    ensures Pow2(64) == 0x10000000000000000
+  {
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Arithmetic/README.md b/Source/DafnyStandardLibraries/src/Std/Arithmetic/README.md
new file mode 100644
index 00000000000..e287dcbe92a
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Arithmetic/README.md
@@ -0,0 +1,11 @@
+# Overview
+
+Non-linear math is generally undecidable; hence Dafny (and Z3) rely on heuristics to prove such properties.
+While wonderful when they work, these heuristics can lead to brittle proofs.  Hence, in many projects,
+it can be helpful to turn off these heuristics (via Dafny's `--disable-nonlinear-arithmetic` flag) and instead explicitly
+invoke the lemmas in this library.  All files in this portion of the library (except those in `Internals/*Nonlinear.dfy`)
+verify with the said flag, which should keep the library itself stable.
+
+At a high level, each module contains the algebraic properties of a particular non-linear operation as lemmas either with explicit arguments or as quantified statements (marked `*Auto`).
+
+In general, it shouldn't be necessary to directly reference anything in `Internals`.
diff --git a/Source/DafnyStandardLibraries/src/Std/Base64.dfy b/Source/DafnyStandardLibraries/src/Std/Base64.dfy
new file mode 100644
index 00000000000..d006e9d606c
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Base64.dfy
@@ -0,0 +1,1398 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/** An encoder and decoder for the Base64 encoding scheme. */
+module Std.Base64 {
+  import opened Wrappers
+  import opened BoundedInts
+
+  export
+    reveals
+      // Functions mentioned in contracts of functions provided below
+      IsBase64Char,
+      index,
+      CharToIndex,
+      IndexToChar,
+      IsBase64String,
+      IsUnpaddedBase64String,
+      Is1Padding,
+      Is2Padding
+    provides
+      // uint8-based API
+      Encode,
+      Decode,
+      // bv8-based API
+      EncodeBV,
+      DecodeBV,
+      // Lemmas
+      EncodeDecode,
+      DecodeEncode,
+      EncodeDecodeBV,
+      DecodeEncodeBV,
+      // Dependencies
+      BoundedInts,
+      Wrappers
+
+  export Internals
+    reveals *
+
+  // The maximum index for Base64 is less than 64 (0x40)
+  type index = bv6
+
+  predicate IsBase64Char(c: char) {
+    // char values can be compared using standard relational operators
+    // http://leino.science/papers/krml243.html#sec-char
+    c == '+' || c == '/' || '0' <= c <= '9' || 'A' <= c <= 'Z' || 'a' <= c <= 'z'
+  }
+
+  lemma Base64CharIs7Bit(c: char)
+    requires IsBase64Char(c)
+    ensures c < 128 as char
+  {
+  }
+
+  predicate IsUnpaddedBase64String(s: string) {
+    // A Base64 encoded string will use 4 ASCII characters for every 3 bytes of data ==> length is divisible by 4
+    |s| % 4 == 0 && forall k :: k in s ==> IsBase64Char(k)
+  }
+
+  function IndexToChar(i: index): (c: char)
+    ensures IsBase64Char(c)
+  {
+    // Based on the Base64 index table
+    if i == 63 then '/'
+    else if i == 62 then '+'
+    // Dafny 1.9.9 added support for char to int conversion
+    // https://github.com/dafny-lang/dafny/releases/tag/v1.9.9
+    // 0 - 9
+    else if 52 <= i <= 61 then (i - 4) as int as char
+    // a - z
+    else if 26 <= i <= 51 then i as int as char + 71 as char
+    // A - Z
+    else i as int as char + 65 as char
+  }
+
+  lemma IndexToCharIsBase64(i: index)
+    ensures IsBase64Char(IndexToChar(i))
+  {
+  }
+
+  function CharToIndex(c: char): (i: index)
+    // This is actually required for the function to be total,
+    // and that requirement propagates to many places.
+    requires IsBase64Char(c)
+  {
+    // Perform the inverse operations of IndexToChar
+    if c == '/' then 63
+    else if c == '+' then 62
+    else if '0' <= c <= '9' then (c + 4 as char) as int as index
+    else if 'a' <= c <= 'z' then (c - 71 as char) as int as index
+    else (c - 65 as char) as int as index
+  }
+
+  @ResourceLimit("2e6")
+  @IsolateAssertions
+  lemma CharToIndexToChar(c: char)
+    requires IsBase64Char(c)
+    ensures IndexToChar(CharToIndex(c)) == c
+  {
+    // TODO: reduce resource use, brittleness
+    Base64CharIs7Bit(c);
+    if c == '/' {
+      assert IndexToChar(CharToIndex(c)) == c;
+    } else if c == '+' {
+      assert IndexToChar(CharToIndex(c)) == c;
+    } else if '0' <= c <= '9' {
+      assert IndexToChar(CharToIndex(c)) == c;
+    } else if 'a' <= c < 'j' {
+      assert IndexToChar(CharToIndex(c)) == c;
+    } else if 'j' <= c < 'm' {
+      assert IndexToChar(CharToIndex(c)) == c;
+    } else if 'm' <= c <= 'z' {
+      assert IndexToChar(CharToIndex(c)) == c;
+    } else {
+      assert IndexToChar(CharToIndex(c)) == c;
+    }
+  }
+
+  @IsolateAssertions
+  lemma IndexToCharToIndex(i: index)
+    ensures (IndexToCharIsBase64(i); CharToIndex(IndexToChar(i)) == i)
+  {
+    // TODO: reduce resource use, brittleness
+    IndexToCharIsBase64(i);
+    if i == 63 {
+      assert CharToIndex(IndexToChar(i)) == i;
+    } else if i == 62 {
+      assert CharToIndex(IndexToChar(i)) == i;
+    } else if 52 <= i <= 61 {
+      assert CharToIndex(IndexToChar(i)) == i;
+    } else if 26 <= i <= 51 {
+      assert CharToIndex(IndexToChar(i)) == i;
+    } else {
+      assert CharToIndex(IndexToChar(i)) == i;
+    }
+  }
+
+  lemma IndexToCharToIndexAuto()
+    ensures forall x :: (IndexToCharIsBase64(x); CharToIndex(IndexToChar(x)) == x)
+  {
+    forall x: index
+      ensures (IndexToCharIsBase64(x); CharToIndex(IndexToChar(x)) == x)
+    {
+      IndexToCharToIndex(x);
+    }
+  }
+
+  lemma CharToIndexToCharAuto()
+    ensures forall c | IsBase64Char(c) :: IndexToChar(CharToIndex(c)) == c
+  {
+    forall c: char | IsBase64Char(c)
+      ensures IndexToChar(CharToIndex(c)) == c
+    {
+      CharToIndexToChar(c);
+    }
+  }
+
+  function BV24ToSeq(x: bv24): (ret: seq<bv8>)
+    ensures |ret| == 3
+  {
+    var b0 := ((x >> 16) & 0x0000FF) as bv8;
+    var b1 := ((x >>  8) & 0x0000FF) as bv8;
+    var b2 := ((x      ) & 0x0000FF) as bv8;
+    [b0, b1, b2]
+  }
+
+  function SeqToBV24(x: seq<bv8>): (ret: bv24)
+    requires |x| == 3
+  {
+    (x[0] as bv24 << 16) | (x[1] as bv24 << 8) | x[2] as bv24
+  }
+
+  lemma BV24ToSeqToBV24(x: bv24)
+    ensures SeqToBV24(BV24ToSeq(x)) == x
+  {
+  }
+
+  lemma SeqToBV24ToSeq(s: seq<bv8>)
+    requires |s| == 3
+    ensures BV24ToSeq(SeqToBV24(s)) == s
+  {
+  }
+
+  function BV24ToIndexSeq(x: bv24): (ret: seq<index>)
+    ensures |ret| == 4
+  {
+    var b0 := ((x >> 18) & 0x00003F) as index;
+    var b1 := ((x >> 12) & 0x00003F) as index;
+    var b2 := ((x >>  6) & 0x00003F) as index;
+    var b3 := ((x      ) & 0x00003F) as index;
+    [b0, b1, b2, b3]
+  }
+
+  function IndexSeqToBV24(x: seq<index>): (ret: bv24)
+    requires |x| == 4
+  {
+    (x[0] as bv24 << 18) |
+    (x[1] as bv24 << 12) |
+    (x[2] as bv24 <<  6) |
+    (x[3] as bv24      )
+  }
+
+  lemma BV24ToIndexSeqToBV24(x: bv24)
+    ensures IndexSeqToBV24(BV24ToIndexSeq(x)) == x
+  {
+  }
+
+  lemma IndexSeqToBV24ToIndexSeq(s: seq<index>)
+    requires |s| == 4
+    ensures BV24ToIndexSeq(IndexSeqToBV24(s)) == s
+  {
+  }
+
+  function DecodeBlock(s: seq<index>): (ret: seq<bv8>)
+    requires |s| == 4
+    ensures |ret| == 3
+  {
+    BV24ToSeq(IndexSeqToBV24(s))
+  }
+
+  function EncodeBlock(s: seq<bv8>): (ret: seq<index>)
+    requires |s| == 3
+    ensures |ret| == 4
+  {
+    BV24ToIndexSeq(SeqToBV24(s))
+  }
+
+  lemma EncodeDecodeBlock(s: seq<bv8>)
+    requires |s| == 3
+    ensures DecodeBlock(EncodeBlock(s)) == s
+  {
+    var b := SeqToBV24(s);
+    BV24ToIndexSeqToBV24(b);
+    SeqToBV24ToSeq(s);
+  }
+
+  lemma DecodeEncodeBlock(s: seq<index>)
+    requires |s| == 4
+    ensures EncodeBlock(DecodeBlock(s)) == s
+  {
+    var b := IndexSeqToBV24(s);
+    BV24ToSeqToBV24(b);
+    IndexSeqToBV24ToIndexSeq(s);
+  }
+
+  @IsolateAssertions
+  function DecodeRecursively(s: seq<index>): (b: seq<bv8>)
+    requires |s| % 4 == 0
+    decreases |s|
+  {
+    if |s| == 0 then []
+    else DecodeBlock(s[..4]) + DecodeRecursively(s[4..])
+  } by method {
+    var resultLength := |s|/4 * 3;
+    var result := new bv8[resultLength](i => 0);
+    var i := |s|;
+    var j := resultLength;
+
+    while i > 0
+      invariant i % 4 == 0
+      invariant 0 <= i <= |s|
+      invariant i * 3 == j * 4
+      invariant 0 <= j <= resultLength
+      invariant result[j..] == DecodeRecursively(s[i..])
+    {
+      i := i - 4;
+      j := j - 3;
+      var block := DecodeBlock(s[i..i+4]);
+      result[j] := block[0];
+      result[j+1] := block[1];
+      result[j+2] := block[2];
+      //assert result[j+3..] == DecodeRecursively(s[i+4..]);
+      assert s[i..][..4] == s[i..i+4];
+      assert s[i..][4..] == s[i+4..];
+      assert result[j..j+3] == block;
+
+      calc {
+        DecodeBlock(s[i..i+4]) + DecodeRecursively(s[i+4..]);
+        DecodeBlock(s[i..][..4]) + DecodeRecursively(s[i..][4..]);
+        DecodeRecursively(s[i..]);
+      }
+    }
+    b := result[..];
+  }
+
+  lemma DecodeRecursivelyBounds(s: seq<index>)
+    requires |s| % 4 == 0
+    ensures |DecodeRecursively(s)| == |s| / 4 * 3
+    ensures |DecodeRecursively(s)| % 3 == 0
+    ensures |DecodeRecursively(s)| == 0 ==> |s| == 0
+  {
+  }
+
+  lemma DecodeRecursivelyBlock(s: seq<index>)
+    requires |s| % 4 == 0
+    ensures
+      (DecodeRecursivelyBounds(s);
+       var b := DecodeRecursively(s);
+       |b| != 0 ==> EncodeBlock(b[..3]) == s[..4])
+  {
+    DecodeRecursivelyBounds(s);
+    if |s| == 0 {}
+    else {
+      DecodeEncodeBlock(s[..4]);
+    }
+  }
+
+  @IsolateAssertions
+  function EncodeRecursively(b: seq<bv8>): (s: seq<index>)
+    requires |b| % 3 == 0
+  {
+    if |b| == 0 then []
+    else EncodeBlock(b[..3]) + EncodeRecursively(b[3..])
+  } by method {
+    var resultLength := |b|/3 * 4;
+    var result := new index[resultLength](i => 0);
+    var i := |b|;
+    var j := resultLength;
+
+    while i > 0
+      invariant i % 3 == 0
+      invariant 0 <= i <= |b|
+      invariant i * 4 == j * 3
+      invariant 0 <= j <= resultLength
+      invariant result[j..] == EncodeRecursively(b[i..])
+    {
+      i := i - 3;
+      j := j - 4;
+      var block := EncodeBlock(b[i..i+3]);
+      result[j] := block[0];
+      result[j+1] := block[1];
+      result[j+2] := block[2];
+      result[j+3] := block[3];
+      assert b[i..][..3] == b[i..i+3];
+      assert b[i..][3..] == b[i+3..];
+      assert result[j..j+4] == block;
+      calc {
+        EncodeBlock(b[i..i+3]) + EncodeRecursively(b[i+3..]);
+        EncodeBlock(b[i..][..3]) + EncodeRecursively(b[i..][3..]);
+        EncodeRecursively(b[i..]);
+      }
+    }
+    s := result[..];
+  }
+
+  lemma EncodeRecursivelyBounds(b: seq<bv8>)
+    requires |b| % 3 == 0
+    ensures |EncodeRecursively(b)| == |b| / 3 * 4
+    ensures |EncodeRecursively(b)| % 4 == 0
+    ensures |EncodeRecursively(b)| == 0 ==> |b| == 0
+  {
+  }
+
+  lemma EncodeRecursivelyBlock(b: seq<bv8>)
+    requires |b| % 3 == 0
+    ensures (EncodeRecursivelyBounds(b);
+             var s := EncodeRecursively(b);
+             |s| != 0 ==> DecodeBlock(s[..4]) == b[..3])
+  {
+    EncodeRecursivelyBounds(b);
+    if |b| == 0 {}
+    else {
+      EncodeDecodeBlock(b[..3]);
+    }
+  }
+
+  lemma {:isolate_assertions} EncodeDecodeRecursively(b: seq<bv8>)
+    requires |b| % 3 == 0
+    ensures (EncodeRecursivelyBounds(b); DecodeRecursively(EncodeRecursively(b)) == b)
+  {
+    hide *;
+
+    var s := EncodeRecursively(b);
+    EncodeRecursivelyBounds(b);
+    DecodeRecursivelyBounds(s);
+
+    if |b| == 0 {
+    } else {
+      calc {
+        DecodeRecursively(EncodeRecursively(b));
+      ==
+        DecodeRecursively(s);
+      == {
+           assert |s[4..]| % 4 == 0;
+           reveal DecodeRecursively;
+         }
+        DecodeBlock(s[..4]) + DecodeRecursively(s[4..]);
+      == { EncodeRecursivelyBlock(b); }
+        b[..3] + DecodeRecursively(s[4..]);
+      == { reveal EncodeRecursively; }
+        b[..3] + DecodeRecursively(EncodeRecursively(b[3..]));
+      == { EncodeDecodeRecursively(b[3..]); }
+        b[..3] + b[3..];
+      ==
+        b;
+      }
+    }
+  }
+
+  lemma {:isolate_assertions} DecodeEncodeRecursively(s: seq<index>)
+    requires |s| % 4 == 0
+    ensures (DecodeRecursivelyBounds(s); EncodeRecursively(DecodeRecursively(s)) == s)
+  {
+    hide *;
+    var b := DecodeRecursively(s);
+    DecodeRecursivelyBounds(s);
+    EncodeRecursivelyBounds(b);
+    if |s| == 0 {
+    } else {
+      calc {
+        EncodeRecursively(DecodeRecursively(s));
+      ==
+        EncodeRecursively(b);
+      == { reveal EncodeRecursively; assert |b[3..]| % 3 == 0; }
+        EncodeBlock(b[..3]) + EncodeRecursively(b[3..]);
+      == { DecodeRecursivelyBlock(s); }
+        s[..4] + EncodeRecursively(b[3..]);
+      == { reveal DecodeRecursively; }
+        s[..4] + EncodeRecursively(DecodeRecursively(s[4..]));
+      == { DecodeEncodeRecursively(s[4..]); }
+        s[..4] + s[4..];
+      ==
+        s;
+      }
+    }
+  }
+
+  function FromCharsToIndices(s: seq<char>): (b: seq<index>)
+    requires forall k :: k in s ==> IsBase64Char(k)
+    ensures |b| == |s|
+  {
+    seq(|s|, i requires 0 <= i < |s| => CharToIndex(s[i]))
+  }
+
+  function FromIndicesToChars(b: seq<index>): (s: seq<char>)
+    ensures forall k :: k in s ==> IsBase64Char(k)
+    ensures |s| == |b|
+  {
+    seq(|b|, i requires 0 <= i < |b| => IndexToChar(b[i]))
+  }
+
+  lemma FromCharsToIndicesToChars(s: seq<char>)
+    requires forall k :: k in s ==> IsBase64Char(k)
+    ensures FromIndicesToChars(FromCharsToIndices(s)) == s
+  {
+    CharToIndexToCharAuto();
+  }
+
+  lemma FromIndicesToCharsToIndices(b: seq<index>)
+    ensures FromCharsToIndices(FromIndicesToChars(b)) == b
+  {
+    IndexToCharToIndexAuto();
+  }
+
+  function DecodeUnpadded(s: seq<char>): (b: seq<bv8>)
+    requires IsUnpaddedBase64String(s)
+  {
+    DecodeRecursively(FromCharsToIndices(s))
+  }
+
+  lemma DecodeUnpaddedBounds(s: seq<char>)
+    requires IsUnpaddedBase64String(s)
+    ensures |DecodeUnpadded(s)| == |s| / 4 * 3
+    ensures |DecodeUnpadded(s)| % 3 == 0
+  {
+    var indices := FromCharsToIndices(s);
+    assert |indices| == |s|;
+    DecodeRecursivelyBounds(indices);
+  }
+
+  function EncodeUnpadded(b: seq<bv8>): (s: seq<char>)
+    requires |b| % 3 == 0
+  {
+    EncodeDecodeRecursively(b);
+    FromIndicesToChars(EncodeRecursively(b))
+  }
+
+  lemma EncodeUnpaddedNotPadded(b: seq<bv8>)
+    requires |b| % 3 == 0
+    requires b != []
+    ensures (EncodeUnpaddedBounds(b);
+             var s := EncodeUnpadded(b);
+             !Is1Padding(s[(|s| - 4)..]) && !Is2Padding(s[(|s| - 4)..]))
+  {
+    var s := EncodeUnpadded(b);
+    EncodeUnpaddedBounds(b);
+    var suffix := s[(|s| - 4)..];
+    assert forall c :: c in s ==> IsBase64Char(c);
+    assert IsBase64Char(s[|s| - 1]);
+    assert s[|s| - 1] != '=';
+  }
+
+  lemma EncodeUnpaddedBounds(b: seq<bv8>)
+    requires |b| % 3 == 0
+    ensures |EncodeUnpadded(b)| == |b| / 3 * 4
+    ensures |EncodeUnpadded(b)| % 4 == 0
+  {
+    EncodeRecursivelyBounds(b);
+  }
+
+  lemma EncodeUnpaddedBase64(b: seq<bv8>)
+    requires |b| % 3 == 0
+    ensures IsUnpaddedBase64String(EncodeUnpadded(b))
+  {
+    EncodeRecursivelyBounds(b);
+  }
+
+  lemma EncodeDecodeUnpadded(b: seq<bv8>)
+    requires |b| % 3 == 0
+    ensures (EncodeUnpaddedBounds(b); EncodeUnpaddedBase64(b); DecodeUnpadded(EncodeUnpadded(b)) == b)
+  {
+    EncodeUnpaddedBase64(b);
+    calc {
+      DecodeUnpadded(EncodeUnpadded(b));
+    ==
+      DecodeUnpadded(FromIndicesToChars(EncodeRecursively(b)));
+    == {  EncodeRecursivelyBounds(b); }
+      DecodeRecursively(FromCharsToIndices(FromIndicesToChars(EncodeRecursively(b))));
+    == { FromIndicesToCharsToIndices(EncodeRecursively(b)); }
+      DecodeRecursively(EncodeRecursively(b));
+    == { EncodeDecodeRecursively(b); }
+      b;
+    }
+  }
+
+  lemma DecodeEncodeUnpadded(s: seq<char>)
+    requires |s| % 4 == 0
+    requires IsUnpaddedBase64String(s)
+    ensures (DecodeUnpaddedBounds(s); EncodeUnpadded(DecodeUnpadded(s)) == s)
+  {
+    DecodeUnpaddedBounds(s);
+    var fromCharsToIndicesS := FromCharsToIndices(s);
+    calc {
+      EncodeUnpadded(DecodeUnpadded(s));
+    ==
+      EncodeUnpadded(DecodeRecursively(FromCharsToIndices(s)));
+    ==
+      EncodeUnpadded(DecodeRecursively(fromCharsToIndicesS));
+    ==
+      assert |fromCharsToIndicesS| % 4 == 0;
+      FromIndicesToChars(EncodeRecursively(DecodeRecursively(fromCharsToIndicesS)));
+    == { DecodeEncodeRecursively(fromCharsToIndicesS); }
+      FromIndicesToChars(fromCharsToIndicesS);
+    ==
+      FromIndicesToChars(FromCharsToIndices(s));
+    == { FromCharsToIndicesToChars(s); }
+      s;
+    }
+  }
+
+  predicate Is1Padding(s: seq<char>) {
+    |s| == 4 &&
+    IsBase64Char(s[0]) &&
+    IsBase64Char(s[1]) &&
+    IsBase64Char(s[2]) &&
+    // This is a result of the padded 0's in the sextet in the final element before the =
+    CharToIndex(s[2]) & 0x3 == 0 && // Using & instead of % here makes the BV proofs easier
+    s[3] == '='
+  }
+
+  function Decode1Padding(s: seq<char>): (b: seq<bv8>)
+    requires Is1Padding(s)
+    // Padding with 1 = implies the sequence represents 2 bytes
+    ensures |b| == 2
+  {
+    var d := DecodeBlock([CharToIndex(s[0]), CharToIndex(s[1]), CharToIndex(s[2]), 0]);
+    [d[0], d[1]]
+  }
+
+  function Encode1Padding(b: seq<bv8>): (s: seq<char>)
+    requires |b| == 2
+    ensures |s| % 4 == 0
+    ensures |s| == 4
+  {
+    // 0 is used to ensure that the final element doesn't affect the EncodeBlock conversion for b
+    var e := EncodeBlock([b[0], b[1], 0]);
+    IndexToCharIsBase64(e[0]);
+    IndexToCharIsBase64(e[1]);
+    IndexToCharIsBase64(e[2]);
+    [IndexToChar(e[0]), IndexToChar(e[1]), IndexToChar(e[2]), '=']
+  }
+
+  lemma EncodeDecodeBlock1Padding(b: seq<bv8>)
+    requires |b| == 2
+    ensures
+      var e := EncodeBlock([b[0], b[1], 0]);
+      var d := DecodeBlock([e[0], e[1], e[2], 0]);
+      [d[0], d[1]] == b
+  {
+  }
+
+  lemma {:resource_limit 0} Encode1PaddingIs1Padding(b: seq<bv8>)
+    requires |b| == 2
+    ensures Is1Padding(Encode1Padding(b))
+  {
+    hide *;
+
+    var s := Encode1Padding(b);
+    var e := EncodeBlock([b[0], b[1], 0]);
+
+    reveal Encode1Padding; // TODO make by penetrate
+    assert s == [IndexToChar(e[0]), IndexToChar(e[1]), IndexToChar(e[2]), '='] by {
+    }
+    IndexToCharIsBase64(e[0]);
+    IndexToCharIsBase64(e[1]);
+    IndexToCharIsBase64(e[2]);
+
+    // TODO make by penetrate
+    // TODO provide a way to reveal deeply.
+    reveal Encode1Padding, EncodeBlock, IndexToChar, CharToIndex, BV24ToIndexSeq, SeqToBV24;
+    assert CharToIndex(s[2]) & 0x3 == 0 by {
+    }
+
+    assert Is1Padding(s) by {
+      reveal Is1Padding;
+    }
+  }
+
+  lemma EncodeDecode1Padding(b: seq<bv8>)
+    requires |b| == 2
+    ensures (Encode1PaddingIs1Padding(b); Decode1Padding(Encode1Padding(b)) == b)
+  {
+    Encode1PaddingIs1Padding(b);
+    var e := EncodeBlock([b[0], b[1], 0]);
+    var s := [CharToIndex(IndexToChar(e[0])), CharToIndex(IndexToChar(e[1])), CharToIndex(IndexToChar(e[2])), 0];
+    var s' := [e[0], e[1], e[2], 0];
+    var d := DecodeBlock(s);
+    var d' := DecodeBlock(s');
+    calc {
+      Decode1Padding(Encode1Padding(b));
+    ==
+      Decode1Padding([IndexToChar(e[0]), IndexToChar(e[1]), IndexToChar(e[2]), '=']);
+    ==
+      [d[0], d[1]];
+    == { IndexToCharToIndex(e[0]); IndexToCharToIndex(e[1]); IndexToCharToIndex(e[2]); }
+      [d'[0], d'[1]];
+    == { EncodeDecodeBlock1Padding(b); }
+      b;
+    }
+  }
+
+  @IsolateAssertions
+  lemma DecodeEncode1Padding(s: seq<char>)
+    requires Is1Padding(s)
+    ensures Encode1Padding(Decode1Padding(s)) == s
+  {
+    var i := [CharToIndex(s[0]), CharToIndex(s[1]), CharToIndex(s[2]), 0];
+    var d := DecodeBlock(i);
+    var e := EncodeBlock([d[0], d[1], 0]);
+    var d' := [IndexToChar(e[0]), IndexToChar(e[1]), IndexToChar(e[2]), '='];
+    calc {
+      Encode1Padding(Decode1Padding(s));
+    ==
+      Encode1Padding([d[0], d[1]]);
+    ==
+      d';
+    == {
+         // This argument is easiest to make by just automating it
+         // However, the mix between % and & in padding constraints
+         // makes it a little difficult
+         assert d'[0] == IndexToChar(CharToIndex(s[0]));
+         assert d'[1] == IndexToChar(CharToIndex(s[1]));
+         assert d'[2] == IndexToChar(CharToIndex(s[2]));
+       }
+      [IndexToChar(CharToIndex(s[0])), IndexToChar(CharToIndex(s[1])), IndexToChar(CharToIndex(s[2])), '='];
+    == { CharToIndexToChar(s[0]); CharToIndexToChar(s[1]); CharToIndexToChar(s[2]); }
+      s;
+    }
+  }
+
+  predicate Is2Padding(s: seq<char>) {
+    |s| == 4 &&
+    IsBase64Char(s[0]) &&
+    IsBase64Char(s[1]) &&
+    // This is a result of the padded 0's in the sextet in the final element before the two =
+    CharToIndex(s[1]) % 0x10 == 0 &&
+    s[2] == '=' &&
+    s[3] == '='
+  }
+
+  function Decode2Padding(s: seq<char>): (b: seq<bv8>)
+    requires Is2Padding(s)
+    // Padding with 2 = implies the sequence represents 1 byte
+    ensures |b| == 1
+  {
+    var d := DecodeBlock([CharToIndex(s[0]), CharToIndex(s[1]), 0, 0]);
+    [d[0]]
+  }
+
+  function Encode2Padding(b: seq<bv8>): (s: seq<char>)
+    // Padding with 2 = implies the sequence represents 1 bytes
+    requires |b| == 1
+    ensures |s| % 4 == 0
+    ensures |s| == 4
+  {
+    // 0 is used to ensure that the final two elements don't affect the EncodeBlock conversion for b
+    var e := EncodeBlock([b[0], 0, 0]);
+    IndexToCharIsBase64(e[0]);
+    IndexToCharIsBase64(e[1]);
+    [IndexToChar(e[0]), IndexToChar(e[1]), '=', '=']
+  }
+
+  lemma Encode2PaddingIs2Padding(b: seq<bv8>)
+    requires |b| == 1
+    ensures Is2Padding(Encode2Padding(b))
+  {
+  }
+
+  lemma DecodeEncodeBlock2Padding(b: seq<bv8>)
+    requires |b| == 1
+    ensures
+      var e := EncodeBlock([b[0], 0, 0]);
+      var d := DecodeBlock([e[0], e[1], 0, 0]);
+      [d[0]] == b
+  {
+  }
+
+  lemma EncodeDecode2Padding(b: seq<bv8>)
+    requires |b| == 1
+    ensures (Encode2PaddingIs2Padding(b); Decode2Padding(Encode2Padding(b)) == b)
+  {
+    Encode2PaddingIs2Padding(b);
+    var e := EncodeBlock([b[0], 0, 0]);
+    calc {
+      Decode2Padding(Encode2Padding(b));
+    ==
+      Decode2Padding([IndexToChar(e[0]), IndexToChar(e[1]), '=', '=']);
+    ==
+      [DecodeBlock([CharToIndex(IndexToChar(e[0])), CharToIndex(IndexToChar(e[1])), 0, 0])[0]];
+    == { IndexToCharToIndex(e[0]); IndexToCharToIndex(e[1]); }
+      [DecodeBlock([e[0], e[1], 0, 0])[0]];
+    == { DecodeEncodeBlock2Padding(b); }
+      b;
+    }
+  }
+
+  lemma DecodeEncode2Padding(s: seq<char>)
+    requires Is2Padding(s)
+    ensures Encode2Padding(Decode2Padding(s)) == s
+  {
+    var i := [CharToIndex(s[0]), CharToIndex(s[1]), 0, 0];
+    var d := DecodeBlock(i);
+    var e := EncodeBlock([d[0], 0, 0]);
+    var d' := [IndexToChar(e[0]), IndexToChar(e[1]), '=', '='];
+    calc {
+      Encode2Padding(Decode2Padding(s));
+    ==
+      Encode2Padding([d[0]]);
+    ==
+      d';
+    == {
+         // This argument is easiest to make by just automating it
+       }
+      [IndexToChar(CharToIndex(s[0])), IndexToChar(CharToIndex(s[1])), '=', '='];
+    == { CharToIndexToChar(s[0]); CharToIndexToChar(s[1]); }
+      s;
+    }
+  }
+
+  predicate IsBase64String(s: string) {
+    // All Base64 strings are unpadded until the final block of 4 elements, where a padded seq could exist
+    var finalBlockStart := |s| - 4;
+    (|s| % 4 == 0) &&
+    (IsUnpaddedBase64String(s) ||
+     (IsUnpaddedBase64String(s[..finalBlockStart]) && (Is1Padding(s[finalBlockStart..]) || Is2Padding(s[finalBlockStart..]))))
+  }
+
+  function DecodeValid(s: seq<char>): (b: seq<bv8>)
+    requires IsBase64String(s)
+  {
+    if s == [] then [] else
+    var finalBlockStart := |s| - 4;
+    var prefix, suffix := s[..finalBlockStart], s[finalBlockStart..];
+    if Is1Padding(suffix) then
+      DecodeUnpadded(prefix) + Decode1Padding(suffix)
+    else if Is2Padding(suffix) then
+      DecodeUnpadded(prefix) + Decode2Padding(suffix)
+    else
+      DecodeUnpadded(s)
+  }
+
+  lemma AboutDecodeValid(s: seq<char>, b: seq<bv8>)
+    requires IsBase64String(s) && b == DecodeValid(s)
+    ensures 4 <= |s| ==> var finalBlockStart := |s| - 4;
+                         var prefix, suffix := s[..finalBlockStart], s[finalBlockStart..];
+                         && (Is1Padding(suffix) && IsUnpaddedBase64String(prefix) <==> (|b| % 3 == 2 && |b| > 1))
+                         && (Is2Padding(suffix) && IsUnpaddedBase64String(prefix) <==> (|b| % 3 == 1 && |b| > 0))
+                         && (!Is1Padding(suffix) && !Is2Padding(suffix) && IsUnpaddedBase64String(s) <==> (|b| % 3 == 0 && |b| > 1))
+  {
+
+    if 4 <= |s| {
+      var finalBlockStart := |s| - 4;
+      var prefix, suffix := s[..finalBlockStart], s[finalBlockStart..];
+
+      if s == [] {
+      } else if Is1Padding(suffix) {
+        assert !Is2Padding(suffix) by {
+        }
+        var x, y := DecodeUnpadded(prefix), Decode1Padding(suffix);
+        assert b == x + y;
+        assert |x| == |x| / 3 * 3 && |y| == 2 && |b| > 1 by {
+          DecodeUnpaddedBounds(prefix);
+        }
+        Mod3(|x| / 3, |y|, |b|);
+      } else if Is2Padding(suffix) {
+        var x, y := DecodeUnpadded(prefix), Decode2Padding(suffix);
+        assert b == x + y;
+        assert |x| == |x| / 3 * 3 && |y| == 1 && |b| > 0 by {
+          DecodeUnpaddedBounds(prefix);
+        }
+        Mod3(|x| / 3, |y|, |b|);
+      } else {
+        assert b == DecodeUnpadded(s);
+        assert |b| % 3 == 0 && |b| > 1 by {
+          DecodeUnpaddedBounds(s);
+        }
+      }
+    }
+  }
+
+  lemma Mod3(x: nat, k: nat, n: nat)
+    requires k < 3 && n == 3 * x + k
+    ensures n % 3 == k
+  {
+  }
+
+  function DecodeBV(s: seq<char>): (b: Result<seq<bv8>, string>)
+    ensures IsBase64String(s) ==> b.Success? // Hard to use without this
+  {
+    if IsBase64String(s) then Success(DecodeValid(s)) else Failure("The encoding is malformed")
+  }
+
+  lemma DecodeBVFailure(s: seq<char>)
+    ensures !IsBase64String(s) ==> DecodeBV(s).Failure?
+  {
+  }
+
+  ghost predicate StringIs7Bit(s: string) {
+    forall c :: c in s ==> c < 128 as char
+  }
+
+  lemma UnpaddedBase64StringIs7Bit(s: string)
+    requires IsUnpaddedBase64String(s)
+    ensures StringIs7Bit(s)
+  {
+  }
+
+  lemma Is7Bit1Padding(s: string)
+    requires Is1Padding(s)
+    ensures StringIs7Bit(s)
+  {
+  }
+
+  lemma Is7Bit2Padding(s: string)
+    requires Is2Padding(s)
+    ensures StringIs7Bit(s)
+  {
+  }
+
+  function EncodeBV(b: seq<bv8>): (s: seq<char>)
+    // Rather than ensure Decode(s) == Success(b) directly, lemmas are used to verify this property
+  {
+    if |b| % 3 == 0 then
+      EncodeUnpaddedBounds(b);
+      EncodeUnpadded(b)
+    else if |b| % 3 == 1 then
+      assert |b| >= 1;
+      EncodeUnpaddedBounds(b[..(|b| - 1)]);
+      var s1, s2 := EncodeUnpadded(b[..(|b| - 1)]), Encode2Padding(b[(|b| - 1)..]);
+      s1 + s2
+    else
+      assert |b| % 3 == 2;
+      assert |b| >= 2;
+      EncodeUnpaddedBounds(b[..(|b| - 2)]);
+      var s1, s2 := EncodeUnpadded(b[..(|b| - 2)]), Encode1Padding(b[(|b| - 2)..]);
+      s1 + s2
+  }
+
+  lemma EncodeBVIsUnpadded(b: seq<bv8>)
+    requires |b| % 3 == 0
+    ensures EncodeBV(b) == EncodeUnpadded(b)
+  {  }
+
+  lemma EncodeBVIs2Padded(b: seq<bv8>)
+    requires |b| % 3 == 1
+    ensures EncodeBV(b) == EncodeUnpadded(b[..(|b| - 1)]) + Encode2Padding(b[(|b| - 1)..])
+  {  }
+
+  lemma EncodeBVIs1Padded(b: seq<bv8>)
+    requires |b| % 3 == 2
+    ensures EncodeBV(b) == EncodeUnpadded(b[..(|b| - 2)]) + Encode1Padding(b[(|b| - 2)..])
+  {  }
+
+  lemma EncodeBVLengthCongruentToZeroMod4(b: seq<bv8>)
+    ensures |EncodeBV(b)| % 4 == 0
+  {
+    if |b| % 3 == 0 {
+      EncodeUnpaddedBounds(b);
+    } else if |b| % 3 == 1 {
+      EncodeUnpaddedBounds(b[..(|b| - 1)]);
+    } else {
+      EncodeUnpaddedBounds(b[..(|b| - 2)]);
+    }
+  }
+
+  lemma EncodeBVIsBase64(b: seq<bv8>)
+    ensures IsBase64String(EncodeBV(b))
+  {
+    EncodeBVLengthExact(b);
+    if |EncodeBV(b)| < 4 {
+    } else if |b| % 3 == 0 {
+      EncodeUnpaddedBase64(b);
+    } else if |b| % 3 == 1 {
+      var bStart := b[..(|b| - 1)];
+      var bEnd := b[(|b| - 1)..];
+      EncodeUnpaddedBase64(bStart);
+      Encode2PaddingIs2Padding(bEnd);
+    } else {
+      var bStart := b[..(|b| - 2)];
+      var bEnd := b[(|b| - 2)..];
+      EncodeUnpaddedBase64(bStart);
+      Encode1PaddingIs1Padding(bEnd);
+    }
+  }
+
+  lemma EncodeBVLengthExact(b: seq<bv8>)
+    ensures var s := EncodeBV(b);
+            && (|b| % 3 == 0 ==> |s| == |b| / 3 * 4)
+            && (|b| % 3 != 0 ==> |s| == |b| / 3 * 4 + 4)
+  {
+
+    var s := EncodeBV(b);
+    if |b| % 3 == 0 {
+      assert s == EncodeUnpadded(b);
+      EncodeUnpaddedBounds(b);
+      assert |s| == |b| / 3 * 4;
+    } else if |b| % 3 == 1 {
+      EncodeUnpaddedBounds(b[..(|b| - 1)]);
+      assert s == EncodeUnpadded(b[..(|b| - 1)]) + Encode2Padding(b[(|b| - 1)..]);
+      calc {
+        |s|;
+      ==
+        |EncodeUnpadded(b[..(|b| - 1)])| + |Encode2Padding(b[(|b| - 1)..])|;
+      ==  { assert |Encode2Padding(b[(|b| - 1)..])| == 4; }
+        |EncodeUnpadded(b[..(|b| - 1)])| + 4;
+      ==  { assert |EncodeUnpadded(b[..(|b| - 1)])| == |b[..(|b| - 1)]| / 3 * 4; }
+        |b[..(|b| - 1)]| / 3 * 4 + 4;
+      ==  { assert |b[..(|b| - 1)]| == |b| - 1; }
+        (|b| - 1) / 3 * 4 + 4;
+      ==  { assert (|b| - 1) / 3 == |b| / 3; }
+        |b| / 3 * 4 + 4;
+      }
+    } else {
+      EncodeUnpaddedBounds(b[..(|b| - 2)]);
+      assert s == EncodeUnpadded(b[..(|b| - 2)]) + Encode1Padding(b[(|b| - 2)..]);
+      Encode1PaddingIs1Padding(b[(|b| - 2)..]);
+      calc {
+        |s|;
+      ==
+        |EncodeUnpadded(b[..(|b| - 2)])| + |Encode1Padding(b[(|b| - 2)..])|;
+      ==  { assert |Encode1Padding(b[(|b| - 2)..])| == 4; }
+        |EncodeUnpadded(b[..(|b| - 2)])| + 4;
+      ==  { assert |EncodeUnpadded(b[..(|b| - 2)])| == |b[..(|b| - 2)]| / 3 * 4; }
+        |b[..(|b| - 2)]| / 3 * 4 + 4;
+      ==  { assert |b[..(|b| - 2)]| == |b| - 2; }
+        (|b| - 2) / 3 * 4 + 4;
+      ==  { assert (|b| - 2) / 3 == |b| / 3; }
+        |b| / 3 * 4 + 4;
+      }
+    }
+  }
+
+  lemma EncodeBVLengthBound(b: seq<bv8>)
+    ensures var s := EncodeBV(b);
+            |s| <= |b| / 3 * 4 + 4
+  {
+    EncodeBVLengthExact(b);
+  }
+
+  lemma SeqPartsMakeWhole<T>(s: seq<T>, i: nat)
+    requires i <= |s|
+    ensures s[..i] + s[i..] == s
+  {}
+
+  lemma DecodeValidEncodeEmpty(s: seq<char>)
+    requires s == []
+    ensures   EncodeBV(DecodeValid(s)) == s
+  {
+    assert IsBase64String(s) by {   }
+    var b := DecodeValid(s);
+    assert b == [];
+    assert EncodeBV(b) == [] by {
+    }
+  }
+
+  lemma EncodeDecodeValidEmpty(b: seq<bv8>)
+    requires b == []
+    ensures (EncodeBVIsBase64(b); DecodeValid(EncodeBV(b)) == b)
+  {
+    assert EncodeBV(b) == [] by {
+    }
+    EncodeBVIsBase64(b);
+    assert DecodeValid([]) == [] by {
+    }
+  }
+
+  lemma DecodeValidEncodeUnpadded(s: seq<char>)
+    requires IsBase64String(s)
+    requires |s| >= 4
+    requires !Is1Padding(s[(|s| - 4)..])
+    requires !Is2Padding(s[(|s| - 4)..])
+    ensures EncodeBV(DecodeValid(s)) == s
+  {
+    DecodeUnpaddedBounds(s);
+    calc {
+      EncodeBV(DecodeValid(s));
+    ==
+      EncodeBV(DecodeUnpadded(s));
+    ==
+      EncodeUnpadded(DecodeUnpadded(s));
+    == { DecodeEncodeUnpadded(s); }
+      s;
+    }
+  }
+
+  lemma EncodeDecodeValidUnpadded(b: seq<bv8>)
+    requires |b| % 3 == 0
+    requires b != []
+    ensures
+      var s := EncodeBV(b);
+      && IsUnpaddedBase64String(s)
+      && |s| >= 4
+      && !Is1Padding(s[(|s| - 4)..])
+      && !Is2Padding(s[(|s| - 4)..])
+      && s == EncodeUnpadded(b)
+  {
+    EncodeUnpaddedBase64(b);
+    EncodeUnpaddedBounds(b);
+    var s := EncodeBV(b);
+    assert s == EncodeUnpadded(b) by { EncodeBVIsUnpadded(b); }
+    assert !Is1Padding(s[(|s| - 4)..]) by { EncodeUnpaddedNotPadded(b); }
+    assert !Is2Padding(s[(|s| - 4)..]) by { EncodeUnpaddedNotPadded(b); }
+  }
+
+  lemma {:resource_limit "6e6"} EncodeDecodeValid2Padded(b: seq<bv8>)
+    requires |b| % 3 == 1
+    ensures
+      var s := EncodeBV(b);
+      && s == (EncodeUnpadded(b[..(|b| - 1)]) + Encode2Padding(b[(|b| - 1)..]))
+      && Is2Padding(s[(|s| - 4)..])
+  {
+    hide *;
+    reveal EncodeBV;
+
+    EncodeUnpaddedBase64(b[..(|b| - 1)]);
+    EncodeUnpaddedBounds(b[..(|b| - 1)]);
+    var s := EncodeBV(b);
+    Encode2PaddingIs2Padding(b[(|b| - 1)..]);
+    assert Is2Padding(s[(|s| - 4)..]);
+  }
+
+  lemma EncodeDecodeValid1Padded(b: seq<bv8>)
+    requires |b| % 3 == 2
+    ensures
+      var s := EncodeBV(b);
+      && s == (EncodeUnpadded(b[..(|b| - 2)]) + Encode1Padding(b[(|b| - 2)..]))
+      && |s| >= 4
+      && IsUnpaddedBase64String(s[..(|s| - 4)])
+      && Is1Padding(s[(|s| - 4)..])
+  {
+    EncodeUnpaddedBase64(b[..(|b| - 2)]);
+    EncodeUnpaddedBounds(b[..(|b| - 2)]);
+    var s := EncodeBV(b);
+    Encode1PaddingIs1Padding(b[(|b| - 2)..]);
+    assert Is1Padding(s[(|s| - 4)..]);
+  }
+
+
+  lemma DecodeValidUnpaddedPartialFrom1PaddedSeq(s: seq<char>)
+    requires IsBase64String(s)
+    requires |s| >= 4
+    requires Is1Padding(s[(|s| - 4)..])
+    ensures    DecodeValid(s)[..(|DecodeValid(s)| - 2)] == DecodeUnpadded(s[..(|s| - 4)])
+  {
+  }
+
+  lemma DecodeValid1PaddedPartialFrom1PaddedSeq(s: seq<char>)
+    requires IsBase64String(s)
+    requires |s| >= 4
+    requires Is1Padding(s[(|s| - 4)..])
+    ensures  DecodeValid(s)[(|DecodeValid(s)| - 2)..] == Decode1Padding(s[(|s| - 4)..])
+  {
+  }
+
+  lemma DecodeValid1PaddingLengthMod3(s: seq<char>)
+    requires IsBase64String(s)
+    requires |s| >= 4
+    requires Is1Padding(s[(|s| - 4)..])
+    ensures |DecodeValid(s)| % 3 == 2
+  {
+    assert IsUnpaddedBase64String(s[..(|s| - 4)]) by {
+      UnpaddedBase64Prefix(s);
+    }
+    AboutDecodeValid(s, DecodeValid(s));
+  }
+
+  @ResourceLimit("12e6")
+  lemma DecodeValidEncode1Padding(s: seq<char>)
+    requires IsBase64String(s)
+    requires |s| >= 4
+    requires Is1Padding(s[(|s| - 4)..])
+    ensures EncodeBV(DecodeValid(s)) == s
+  {
+    assert |DecodeValid(s)| % 3 == 2 by { DecodeValid1PaddingLengthMod3(s); }
+    calc {
+      EncodeBV(DecodeValid(s));
+    ==
+      EncodeUnpadded(DecodeValid(s)[..(|DecodeValid(s)| - 2)]) + Encode1Padding(DecodeValid(s)[(|DecodeValid(s)| - 2)..]);
+    == { DecodeValidUnpaddedPartialFrom1PaddedSeq(s);   }
+      EncodeUnpadded(DecodeUnpadded(s[..(|s| - 4)])) + Encode1Padding(DecodeValid(s)[(|DecodeValid(s)| - 2)..]);
+    == {  DecodeEncodeUnpadded(s[..(|s| - 4)]); }
+      s[..(|s| - 4)] + Encode1Padding(DecodeValid(s)[(|DecodeValid(s)| - 2)..]);
+    == { DecodeValid1PaddedPartialFrom1PaddedSeq(s); }
+      s[..(|s| - 4)] + Encode1Padding(Decode1Padding(s[(|s| - 4)..]));
+    == { DecodeEncode1Padding(s[(|s| - 4)..]); }
+      s[..(|s| - 4)] + s[(|s| - 4)..];
+    == { SeqPartsMakeWhole(s, (|s| - 4)); }
+      s;
+    }
+  }
+
+  lemma DecodeValidPartialsFrom2PaddedSeq(s: seq<char>)
+    requires IsBase64String(s)
+    requires |s| >= 4
+    requires Is2Padding(s[(|s| - 4)..])
+    ensures
+      (
+        var b := DecodeValid(s);
+        b[..(|b| - 1)] == DecodeUnpadded(s[..(|s| - 4)]) &&
+        b[(|b| - 1)..] == Decode2Padding(s[(|s| - 4)..]))
+  {
+    AboutDecodeValid(s, DecodeValid(s));
+    assert Is2Padding(s[(|s| - 4)..]);
+  }
+
+  lemma DecodeValidPartialsFrom1PaddedSeq(s: seq<char>)
+    requires IsBase64String(s)
+    requires |s| >= 4
+    requires Is1Padding(s[(|s| - 4)..])
+    ensures
+      (
+        var b := DecodeValid(s);
+        b[..(|b| - 2)] == DecodeUnpadded(s[..(|s| - 4)]) &&
+        b[(|b| - 2)..] == Decode1Padding(s[(|s| - 4)..]))
+  {
+    AboutDecodeValid(s, DecodeValid(s));
+  }
+
+  lemma UnpaddedBase64Prefix(s: string)
+    requires IsBase64String(s)
+    requires |s| >= 4
+    ensures IsUnpaddedBase64String(s[..(|s| - 4)])
+  {
+  }
+
+  lemma DecodeValid2PaddingLengthMod3(s: seq<char>)
+    requires IsBase64String(s)
+    requires |s| >= 4
+    requires Is2Padding(s[(|s| - 4)..])
+    ensures |DecodeValid(s)| % 3 == 1
+  {
+    assert IsUnpaddedBase64String(s[..(|s| - 4)]) by {
+      UnpaddedBase64Prefix(s);
+    }
+    AboutDecodeValid(s, DecodeValid(s));
+  }
+
+  lemma DecodeValidEncode2Padding(s: seq<char>)
+    requires IsBase64String(s)
+    requires |s| >= 4
+    requires Is2Padding(s[(|s| - 4)..])
+    ensures EncodeBV(DecodeValid(s)) == s
+  {
+    assert |DecodeValid(s)| % 3 == 1 by { DecodeValid2PaddingLengthMod3(s); }
+    calc {
+      EncodeBV(DecodeValid(s));
+    ==
+      EncodeUnpadded(DecodeValid(s)[..(|DecodeValid(s)| - 1)]) + Encode2Padding(DecodeValid(s)[(|DecodeValid(s)| - 1)..]);
+    == { DecodeValidPartialsFrom2PaddedSeq(s);   }
+      EncodeUnpadded(DecodeUnpadded(s[..(|s| - 4)])) + Encode2Padding(DecodeValid(s)[(|DecodeValid(s)| - 1)..]);
+    == {  DecodeEncodeUnpadded(s[..(|s| - 4)]); }
+      s[..(|s| - 4)] + Encode2Padding(DecodeValid(s)[(|DecodeValid(s)| - 1)..]);
+    == { DecodeValidPartialsFrom2PaddedSeq(s); }
+      s[..(|s| - 4)] + Encode2Padding(Decode2Padding(s[(|s| - 4)..]));
+    == { DecodeEncode2Padding(s[(|s| - 4)..]); }
+      s[..(|s| - 4)] + s[(|s| - 4)..];
+    == { SeqPartsMakeWhole(s, (|s| - 4)); }
+      s;
+    }
+  }
+
+  lemma DecodeValidEncode(s: seq<char>)
+    requires IsBase64String(s)
+    ensures EncodeBV(DecodeValid(s)) == s
+  {
+    if s == [] {
+      calc {
+        EncodeBV(DecodeValid(s));
+      == { DecodeValidEncodeEmpty(s); }
+        s;
+      }
+    } else if |s| >= 4 && Is1Padding(s[(|s| - 4)..]) {
+      calc {
+        EncodeBV(DecodeValid(s));
+      == { DecodeValidEncode1Padding(s); }
+        s;
+      }
+    } else if |s| >= 4 && Is2Padding(s[(|s| - 4)..]) {
+      calc {
+        EncodeBV(DecodeValid(s));
+      == { DecodeValidEncode2Padding(s); }
+        s;
+      }
+    } else {
+      calc {
+        EncodeBV(DecodeValid(s));
+      == { DecodeValidEncodeUnpadded(s); }
+        s;
+      }
+    }
+  }
+
+  lemma EncodeDecodeValid(b: seq<bv8>)
+    ensures (EncodeBVIsBase64(b); DecodeValid(EncodeBV(b)) == b)
+  {
+    hide *;
+    EncodeBVIsBase64(b);
+    var s := EncodeBV(b);
+    if b == [] {
+      calc {
+        DecodeValid(EncodeBV(b));
+      == { EncodeDecodeValidEmpty(b); }
+        b;
+      }
+    } else if |b| % 3 == 0 {
+      calc {
+        DecodeValid(EncodeBV(b));
+      == { EncodeBVIsUnpadded(b); }
+        DecodeValid(EncodeUnpadded(b));
+      == { reveal DecodeValid; EncodeDecodeValidUnpadded(b);  }
+        DecodeUnpadded(EncodeUnpadded(b));
+      == { EncodeDecodeUnpadded(b); }
+        b;
+      }
+    } else if |b| % 3 == 1 {
+      EncodeDecodeValid2Padded(b);
+      var prefix := b[..(|b| - 1)];
+      var suffix := b[(|b| - 1)..];
+      EncodeUnpaddedBase64(prefix);
+
+      calc {
+        DecodeValid(EncodeBV(b));
+      ==
+        DecodeValid(EncodeUnpadded(prefix) + Encode2Padding(suffix));
+      == {  DecodeValidPartialsFrom2PaddedSeq(s); }
+        DecodeUnpadded(EncodeUnpadded(prefix)) + Decode2Padding(Encode2Padding(suffix));
+      == { EncodeDecodeUnpadded(prefix); EncodeDecode2Padding(suffix); }
+        prefix + suffix;
+      ==
+        b;
+      }
+    } else if |b| % 3 == 2 {
+      EncodeDecodeValid1Padded(b);
+      var prefix := b[..(|b| - 2)];
+      var suffix := b[(|b| - 2)..];
+      EncodeUnpaddedBase64(prefix);
+
+      calc {
+        DecodeValid(EncodeBV(b));
+      ==
+        DecodeValid(EncodeUnpadded(prefix) + Encode1Padding(suffix));
+      == {  DecodeValidPartialsFrom1PaddedSeq(s); }
+        DecodeUnpadded(EncodeUnpadded(prefix)) + Decode1Padding(Encode1Padding(suffix));
+      == { EncodeDecodeUnpadded(prefix); EncodeDecode1Padding(suffix); }
+        prefix + suffix;
+      ==
+        b;
+      }
+    }
+  }
+
+  lemma DecodeEncodeBV(s: seq<char>)
+    requires IsBase64String(s)
+    ensures EncodeBV(DecodeBV(s).value) == s
+  {
+    calc {
+      EncodeBV(DecodeBV(s).value);
+    == { DecodeValidEncode(s); }
+      s;
+    }
+  }
+
+  lemma EncodeDecodeBV(b: seq<bv8>)
+    ensures DecodeBV(EncodeBV(b)) == Success(b)
+  {
+    EncodeBVIsBase64(b);
+    calc {
+      DecodeBV(EncodeBV(b));
+    == { assert IsBase64String(EncodeBV(b)); }
+      Success(DecodeValid(EncodeBV(b)));
+    == { EncodeDecodeValid(b); }
+      Success(b);
+    }
+  }
+
+  function UInt8sToBVs(u: seq<uint8>): (r: seq<bv8>)
+    ensures |r| == |u|
+    ensures forall i :: 0 <= i < |u| ==> r[i] == u[i] as bv8
+  {
+    seq(|u|, i requires 0 <= i < |u| => u[i] as bv8)
+  }
+
+  function BVsToUInt8s(b: seq<bv8>): (r: seq<uint8>)
+    ensures |r| == |b|
+    ensures forall i :: 0 <= i < |b| ==> r[i] == b[i] as uint8
+  {
+    seq(|b|, i requires 0 <= i < |b| => b[i] as uint8)
+  }
+
+  @IsolateAssertions
+  @ResourceLimit("1e9")
+  lemma UInt8sToBVsToUInt8s(u: seq<uint8>)
+    ensures BVsToUInt8s(UInt8sToBVs(u)) == u
+  {
+    // TODO: reduce resource use
+    var b := UInt8sToBVs(u);
+    assert |b| == |u|;
+    var u' := BVsToUInt8s(b);
+    assert |u'| == |b|;
+  }
+
+  lemma BVsToUInt8sToBVs(b: seq<bv8>)
+    ensures UInt8sToBVs(BVsToUInt8s(b)) == b
+  {
+    var u := BVsToUInt8s(b);
+    assert |b| == |u|;
+    var b' := UInt8sToBVs(u);
+    assert |b'| == |u|;
+  }
+
+  function Encode(u: seq<uint8>): seq<char> {
+    EncodeBV(UInt8sToBVs(u))
+  }
+
+  function Decode(s: seq<char>): (b: Result<seq<uint8>, string>)
+    ensures IsBase64String(s) ==> b.Success? // Hard to use without this
+  {
+    if IsBase64String(s)
+    then
+      var b := DecodeValid(s);
+      Success(BVsToUInt8s(b))
+    else Failure("The encoding is malformed")
+  }
+
+  lemma EncodeDecode(b: seq<uint8>)
+    ensures Decode(Encode(b)) == Success(b)
+  {
+    var bvs := UInt8sToBVs(b);
+    var s := EncodeBV(bvs);
+    assert Encode(b) == s;
+    assert IsBase64String(s) by { EncodeBVIsBase64(bvs); }
+    var b' := DecodeValid(s);
+    assert b' == bvs by { EncodeDecodeValid(bvs); }
+    var us := BVsToUInt8s(b');
+    assert Decode(s) == Success(us) by {
+    }
+    assert b' == bvs;
+    assert b == us by { UInt8sToBVsToUInt8s(b); }
+  }
+
+  lemma DecodeEncode(s: seq<char>)
+    requires IsBase64String(s)
+    ensures Encode(Decode(s).value) == s
+  {
+    var b := DecodeValid(s);
+    var u := BVsToUInt8s(b);
+    assert Decode(s) == Success(u);
+    var s' := EncodeBV(UInt8sToBVs(u));
+    assert s' == Encode(u);
+    assert UInt8sToBVs(BVsToUInt8s(b)) == b by {
+      BVsToUInt8sToBVs(b);
+    }
+    assert s == s' by {
+      DecodeValidEncode(s);
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Base64.md b/Source/DafnyStandardLibraries/src/Std/Base64.md
new file mode 100644
index 00000000000..71b28d88fd5
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Base64.md
@@ -0,0 +1,7 @@
+# The `Base64` module
+
+The `Std.Base64` module contains an encoder and decoder for Base64, which allows arbitrary byte sequences to be represented in sequences of characters drawn entirely from 7-bit ASCII. This encoder and decoder have two interfaces, one which uses `uint8` to represent arbitrary bytes, and one which uses `bv8`. The encoder and decoder are proved to be inverses of each other, for both interfaces.
+
+The `uint8`-based interface consists of the `Encode` and `Decode` functions along with the `EncodeDecode` and `DecodeEncode` lemmas. The `bv8`-based interface consists of the `EncodeBV` and `DecodeBV` functions along with the `EncodeDecodeBV` and `DecodeEncodeBV` lemmas. The `uint8`-based interface is a wrapper on top of the `bv8`-based interface, because Base64 encoding is more straightforward to specify and verify using bit vectors.
+
+The implementation currently uses a recursive approach with sequence concatenation, which limits its performance on large sequences. A more efficient implementation will be possible without changing the public interface, however.
diff --git a/Source/DafnyStandardLibraries/src/Std/BoundedInts.dfy b/Source/DafnyStandardLibraries/src/Std/BoundedInts.dfy
new file mode 100644
index 00000000000..88aa623d1ef
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/BoundedInts.dfy
@@ -0,0 +1,69 @@
+/** 
+Defines symbolic names for various powers of 2 and newtypes for various common restricted-range int types. 
+*/
+module Std.BoundedInts {
+  const TWO_TO_THE_0:   int := 1
+
+  const TWO_TO_THE_1:   int := 2
+  const TWO_TO_THE_2:   int := 4
+  const TWO_TO_THE_4:   int := 16
+  const TWO_TO_THE_5:   int := 32
+  const TWO_TO_THE_7:   int := 0x80
+  const TWO_TO_THE_8:   int := 0x100
+  const TWO_TO_THE_15:  int := 0x8000
+  const TWO_TO_THE_16:  int := 0x1_0000
+  const TWO_TO_THE_24:  int := 0x100_0000
+  const TWO_TO_THE_31:  int := 0x8000_0000
+  const TWO_TO_THE_32:  int := 0x1_00000000
+  const TWO_TO_THE_40:  int := 0x100_00000000
+  const TWO_TO_THE_48:  int := 0x10000_00000000
+  const TWO_TO_THE_56:  int := 0x1000000_00000000
+  const TWO_TO_THE_63:  int := 0x80000000_00000000
+  const TWO_TO_THE_64:  int := 0x1_00000000_00000000
+  const TWO_TO_THE_127: int := 0x80000000_00000000_00000000_00000000
+  const TWO_TO_THE_128: int := 0x1_00000000_00000000_00000000_00000000
+  const TWO_TO_THE_256: int := 0x1_00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000
+  const TWO_TO_THE_512: int :=
+    0x1_00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000_00000000
+
+  newtype uint8 = x: int   | 0 <= x < TWO_TO_THE_8
+  newtype uint16 = x: int  | 0 <= x < TWO_TO_THE_16
+  newtype uint32 = x: int  | 0 <= x < TWO_TO_THE_32
+  newtype uint64 = x: int  | 0 <= x < TWO_TO_THE_64
+  newtype uint128 = x: int | 0 <= x < TWO_TO_THE_128
+
+  newtype int8 = x: int    | -TWO_TO_THE_7 <= x < TWO_TO_THE_7
+  newtype int16 = x: int   | -TWO_TO_THE_15 <= x < TWO_TO_THE_15
+  newtype int32 = x: int   | -TWO_TO_THE_31 <= x < TWO_TO_THE_31
+  newtype int64 = x: int   | -TWO_TO_THE_63 <= x < TWO_TO_THE_63
+  newtype int128 = x: int  | -TWO_TO_THE_127 <= x < TWO_TO_THE_127
+
+  newtype nat8 = x: int    | 0 <= x < TWO_TO_THE_7
+  newtype nat16 = x: int   | 0 <= x < TWO_TO_THE_15
+  newtype nat32 = x: int   | 0 <= x < TWO_TO_THE_31
+  newtype nat64 = x: int   | 0 <= x < TWO_TO_THE_63
+  newtype nat128 = x: int  | 0 <= x < TWO_TO_THE_127
+
+  const UINT8_MAX:  uint8  := 0xFF
+  const UINT16_MAX: uint16 := 0xFFFF
+  const UINT32_MAX: uint32 := 0xFFFF_FFFF
+  const UINT64_MAX: uint64 := 0xFFFF_FFFF_FFFF_FFFF
+
+  const INT8_MIN:  int8  := -0x80
+  const INT8_MAX:  int8  :=  0x7F
+  const INT16_MIN: int16 := -0x8000
+  const INT16_MAX: int16 :=  0x7FFF
+  const INT32_MIN: int32 := -0x8000_0000
+  const INT32_MAX: int32 :=  0x7FFFFFFF
+  const INT64_MIN: int64 := -0x8000_0000_0000_0000
+  const INT64_MAX: int64 :=  0x7FFFFFFF_FFFFFFFF
+
+  const NAT8_MAX:  nat8  := 0x7F
+  const NAT16_MAX: nat16 := 0x7FFF
+  const NAT32_MAX: nat32 := 0x7FFFFFFF
+  const NAT64_MAX: nat64 := 0x7FFFFFFF_FFFFFFFF
+
+  type byte = uint8
+  type bytes = seq<byte>
+  newtype opt_byte = c: int | -1 <= c < TWO_TO_THE_8
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/BoundedInts.md b/Source/DafnyStandardLibraries/src/Std/BoundedInts.md
new file mode 100644
index 00000000000..8a43e44633e
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/BoundedInts.md
@@ -0,0 +1,51 @@
+
+# The `BoundedInts` module
+
+The `Std.BoundedInts` module contains definitions of types and constants for fixed-bit-width integers.
+
+Dafny itself generally uses and reasons about mathematical, unbounded integers and natural numbers.
+However compiled programs, for efficiency of computation and storage, will generally use fixed-bit-width
+numbers. So Dafny defines them here, for use when needed.
+
+An important implementation point about these type definitions is Dafny can determine which native type
+in the target compiled program best matches the Dafny type. For example, the Dafny type `int16` is
+a signed integer that fits in 16 bits. If a program using this type is compiled to, say Java, then
+variables of this Dafny type will be compiled to Java `short` variables. In some cases there is no
+natural match. For example Java does not have an unsigned 16-bit type while C# and C++ do.
+
+This module defines:
+
+- unsigned types of 8, 16, 32, 64, 128 bit widths (e.g. `uint32`)
+- signed types of 8, 16, 32, 64, 128 bit widths (e.g. `int16`)
+- unsigned types that are subsets of the corresponding signed type (e.g. `nat8` has values from 0 through 127)
+
+The `natN` series of types require some care. A `nat8` for example has non-negative values up through 127,
+that is, just 7-bits worth of values. But it can be directly converted to an `int8` and can be represented by a
+native signed 8-bit integer type.
+
+- if you need a general unsigned 8-bit type, with values running up to 256, use `uint8`
+- if you want natural numbers that interact well with signed numbers and do not mind the restriction in range, use `nat8`
+- if the target platform for compilation does not have native unsigned int types, then use nat types because of the smaller range
+
+In addition, the module defines a number of constants that are powers of two (not all of them, just those that are generally useful).
+They are useful in stating the ranges of fixed-bit-width integers. Examples are `TWO_TO_THE_15`, `TWO_TO_THE_32`.
+
+Here are two example methods. In the first, the module `Std.BoundedInts` is renamed to `BI`, which is then used as the prefix for type and constant names.
+In the second, the module is imported as opened, in which case the type and constant names can be used without qualification.
+<!-- %check-verify -->
+```dafny
+module M {
+  import BI = Std.BoundedInts
+  method m(k: BI.int16) {
+    assert k as int < BI.TWO_TO_THE_15;
+  }
+}
+
+module N {
+  import opened Std.BoundedInts
+
+  method m(k: int16) {
+    assert (k/256) as int < TWO_TO_THE_8;
+  }
+}
+```
diff --git a/Source/DafnyStandardLibraries/src/Std/Collections/Array.dfy b/Source/DafnyStandardLibraries/src/Std/Collections/Array.dfy
new file mode 100644
index 00000000000..0995bf6e159
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Collections/Array.dfy
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+ This module defines useful properties and functions relating to the built-in `array` type.
+ */
+module Std.Collections.Array {
+
+  import opened Wrappers
+  import opened Relations
+  import opened Seq
+
+  method BinarySearch<T(!new)>(a: array<T>, key: T, less: (T, T) -> bool) returns (r: Option<nat>)
+    requires SortedBy((x, y) => less(x, y) || x == y, a[..])
+    requires StrictTotalOrdering(less)
+    ensures r.Some? ==> r.value < a.Length && a[r.value] == key
+    ensures r.None? ==> key !in a[..]
+  {
+    var lo, hi : nat := 0, a.Length;
+    while lo < hi
+      invariant 0 <= lo <= hi <= a.Length
+      invariant key !in a[..lo] && key !in a[hi..]
+      invariant a[..] == old(a[..])
+    {
+      var mid := (lo + hi) / 2;
+
+      if less(key, a[mid]) {
+        hi := mid;
+      } else if less(a[mid], key) {
+        lo:= mid + 1;
+      } else {
+        return Some(mid);
+      }
+    }
+
+    return None;
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Collections/Collections.dfy b/Source/DafnyStandardLibraries/src/Std/Collections/Collections.dfy
new file mode 100644
index 00000000000..94aa29bcc72
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Collections/Collections.dfy
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+ This module contains submodules each defining useful properties and functions
+ relating to the built-in collection types.
+ */
+module Std.Collections {
+  // This module currently contains no definitions,
+  // but is defined so that the module comment appears in generated documentation.
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Collections/Collections.md b/Source/DafnyStandardLibraries/src/Std/Collections/Collections.md
new file mode 100644
index 00000000000..b2025c2b3e8
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Collections/Collections.md
@@ -0,0 +1,27 @@
+# The `Collections` module
+
+This module includes a variety of submodules that define properties of
+various collections:
+
+- Sets: functions and lemmas expressing properties of Dafny's `set<T>` type, such as  properties of subsets, unions, and intersections, filtering of sets using predicates, mapping sets to other sets using functions
+
+- Isets: function and lemmas to manipulate `iset`s
+
+- Seqs: functions and lemmas expressing properties of Dafny's `seq<T>` type,
+such as properties of subsequences, filtering of sequences,
+finding elements (i.e., index-of, last-index-of),
+inserting or removing elements,
+reversing, repeating or combining (zipping or flattening) sequences,
+sorting, and
+conversion to sets.
+
+- Maps: functions and lemmas to manipulate `map`s
+
+- Imaps: functions and lemmas to manipulate `imap`s
+
+- Arrays: manipulations of arrays
+
+<!-- TODO
+- LittleEndianNat: properties of sequences that represent natural numbers expressed as a given base, with the least significant digit at position 0 of the sequence and each element in the range 0 to the base.
+- LittleEndianNatConversions: conversions between two little-endian representations of nats in different bases
+-->
diff --git a/Source/DafnyStandardLibraries/src/Std/Collections/Imap.dfy b/Source/DafnyStandardLibraries/src/Std/Collections/Imap.dfy
new file mode 100644
index 00000000000..72c437d6ef7
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Collections/Imap.dfy
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ *  Original: Copyright 2018-2021 VMware, Inc., Microsoft Inc., Carnegie Mellon University,
+ *  ETH Zurich, and University of Washington
+ *  SPDX-License-Identifier: BSD-2-Clause
+ *
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+ This module defines useful properties and functions relating to the built-in `imap` type.
+ */
+module Std.Collections.Imap {
+
+  import opened Wrappers
+
+  function Get<X, Y>(m: imap<X, Y>, x: X): Option<Y>
+  {
+    if x in m then Some(m[x]) else None
+  }
+
+  /* Remove all key-value pairs corresponding to the iset of keys provided. */
+  opaque ghost function RemoveKeys<X, Y>(m: imap<X, Y>, xs: iset<X>): (m': imap<X, Y>)
+    ensures forall x {:trigger m'[x]} :: x in m && x !in xs ==> x in m' && m'[x] == m[x]
+    ensures forall x {:trigger x in m'} :: x in m' ==> x in m && x !in xs
+    ensures m'.Keys == m.Keys - xs
+  {
+    imap x | x in m && x !in xs :: m[x]
+  }
+
+  /* Remove a key-value pair. Returns unmodified imap if key is not found. */
+  opaque ghost function RemoveKey<X, Y>(m: imap<X, Y>, x: X): (m': imap<X, Y>)
+    ensures m' == RemoveKeys(m, iset{x})
+    ensures forall x' {:trigger m'[x']} :: x' in m' ==> m'[x'] == m[x']
+  {
+    imap i | i in m && i != x :: m[i]
+  }
+
+  /* Keep all key-value pairs corresponding to the iset of keys provided. */
+  opaque ghost function Restrict<X, Y>(m: imap<X, Y>, xs: iset<X>): (m': imap<X, Y>)
+    ensures m' == RemoveKeys(m, m.Keys - xs)
+  {
+    imap x | x in xs && x in m :: m[x]
+  }
+
+  /* True iff x maps to the same value or does not exist in m and m'. */
+  ghost predicate EqualOnKey<X, Y>(m: imap<X, Y>, m': imap<X, Y>, x: X)
+  {
+    (x !in m && x !in m') || (x in m && x in m' && m[x] == m'[x])
+  }
+
+  /* True iff m is a subset of m'. */
+  ghost predicate IsSubset<X, Y>(m: imap<X, Y>, m': imap<X, Y>)
+  {
+    && m.Keys <= m'.Keys
+    && forall x {:trigger EqualOnKey(m, m', x)}{:trigger x in m} :: x in m ==> EqualOnKey(m, m', x)
+  }
+
+  /* Union of two imaps. Does not require disjoint domains; on the intersection,
+  values from the second imap are chosen. */
+  opaque ghost function Union<X, Y>(m: imap<X, Y>, m': imap<X, Y>): (r: imap<X, Y>)
+    ensures r.Keys == m.Keys + m'.Keys
+    ensures forall x {:trigger r[x]} :: x in m' ==> r[x] == m'[x]
+    ensures forall x {:trigger r[x]} :: x in m && x !in m' ==> r[x] == m[x]
+  {
+    m + m'
+  }
+
+  /* True iff an imap is injective. */
+  ghost predicate Injective<X, Y>(m: imap<X, Y>)
+  {
+    forall x, x' {:trigger m[x], m[x']} :: x != x' && x in m && x' in m ==> m[x] != m[x']
+  }
+
+  /* Swaps imap keys and values. Values are not required to be unique; no
+  promises on which key is chosen on the intersection. */
+  ghost function Invert<X, Y>(m: imap<X, Y>): imap<Y, X>
+  {
+    imap y | y in m.Values :: var x :| x in m.Keys && m[x] == y; x
+  }
+
+  /* Inverted maps are injective. */
+  lemma LemmaInvertIsInjective<X, Y>(m: imap<X, Y>)
+    ensures Injective(Invert(m))
+  {
+  }
+
+  /* True iff an imap contains all valid keys. */
+  ghost predicate Total<X(!new), Y>(m: imap<X, Y>)
+  {
+    forall i {:trigger m[i]}{:trigger i in m} :: i in m
+  }
+
+  /* True iff an imap is monotonic. */
+  ghost predicate Monotonic(m: imap<int, int>)
+  {
+    forall x, x' {:trigger m[x], m[x']} :: x in m && x' in m && x <= x' ==> m[x] <= m[x']
+  }
+
+  /* True iff an imap is monotonic. Only considers keys greater than or
+  equal to start. */
+  ghost predicate MonotonicFrom(m: imap<int, int>, start: int)
+  {
+    forall x, x' {:trigger m[x], m[x']} :: x in m && x' in m && start <= x <= x' ==> m[x] <= m[x']
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Collections/Iset.dfy b/Source/DafnyStandardLibraries/src/Std/Collections/Iset.dfy
new file mode 100644
index 00000000000..00776954592
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Collections/Iset.dfy
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ *  Original Copyright under the following:
+ *  Copyright 2018-2021 VMware, Inc., Microsoft Inc., Carnegie Mellon University,
+ *  ETH Zurich, and University of Washington
+ *  SPDX-License-Identifier: BSD-2-Clause
+ *
+ *  Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+ This module defines useful properties and functions relating to the built-in `iset` type.
+ */
+module Std.Collections.Iset {
+
+  import opened Functions
+  import opened Relations
+
+  /* If all elements in iset x are in iset y, x is a subset of y. */
+  lemma LemmaSubset<T>(x: iset<T>, y: iset<T>)
+    requires forall e {:trigger e in y} :: e in x ==> e in y
+    ensures x <= y
+  {
+  }
+
+  /* Map an injective function to each element of an iset. */
+  ghost function Map<X(!new), Y>(xs: iset<X>, f: X-->Y): (ys: iset<Y>)
+    reads f.reads
+    requires forall x {:trigger f.requires(x)} :: f.requires(x)
+    requires Injective(f)
+    ensures forall x {:trigger f(x)} :: x in xs <==> f(x) in ys
+  {
+    var ys := iset x | x in xs :: f(x);
+    ys
+  }
+
+  /* Construct an iset using elements of another set for which a function
+  returns true. */
+  ghost function Filter<X(!new)>(xs: iset<X>, f: X~>bool): (ys: iset<X>)
+    reads set x, o | x in xs && o in f.reads(x) :: o
+    requires forall x {:trigger f.requires(x)} {:trigger x in xs} :: x in xs ==> f.requires(x)
+    ensures forall y {:trigger f(y)}{:trigger y in xs} :: y in ys <==> y in xs && f(y)
+  {
+    var ys := iset x | x in xs && f(x);
+    ys
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Collections/Map.dfy b/Source/DafnyStandardLibraries/src/Std/Collections/Map.dfy
new file mode 100644
index 00000000000..4184f63e6c8
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Collections/Map.dfy
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ *  Original: Copyright 2018-2021 VMware, Inc., Microsoft Inc., Carnegie Mellon University,
+ *  ETH Zurich, and University of Washington
+ *  SPDX-License-Identifier: BSD-2-Clause
+ *
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+ This module defines useful properties and functions relating to the built-in `map` type.
+ */
+module Std.Collections.Map {
+
+  import opened Wrappers
+
+  function Get<X, Y>(m: map<X, Y>, x: X): Option<Y>
+  {
+    if x in m then Some(m[x]) else None
+  }
+
+  function ToImap<X, Y>(m: map<X, Y>): (m': imap<X, Y>)
+    ensures forall x {:trigger m'[x]} :: x in m ==> x in m' && m'[x] == m[x]
+    ensures forall x {:trigger x in m'} :: x in m' ==> x in m
+  {
+    imap x | x in m :: m[x]
+  }
+
+  /* Remove all key-value pairs corresponding to the set of keys provided. */
+  function RemoveKeys<X, Y>(m: map<X, Y>, xs: set<X>): (m': map<X, Y>)
+    ensures forall x {:trigger m'[x]} :: x in m && x !in xs ==> x in m' && m'[x] == m[x]
+    ensures forall x {:trigger x in m'} :: x in m' ==> x in m && x !in xs
+    ensures m'.Keys == m.Keys - xs
+  {
+    m - xs
+  }
+
+  /* Remove a key-value pair. Returns unmodified map if key is not found. */
+  function Remove<X, Y>(m: map<X, Y>, x: X): (m': map<X, Y>)
+    ensures m' == RemoveKeys(m, {x})
+    ensures |m'.Keys| <= |m.Keys|
+    ensures x in m ==> |m'| == |m| - 1
+    ensures x !in m ==> |m'| == |m|
+  {
+    var m' := map x' | x' in m && x' != x :: m[x'];
+    assert m'.Keys == m.Keys - {x};
+    m'
+  }
+
+  /* Keep all key-value pairs corresponding to the set of keys provided. */
+  function Restrict<X, Y>(m: map<X, Y>, xs: set<X>): (m': map<X, Y>)
+    ensures m' == RemoveKeys(m, m.Keys - xs)
+  {
+    map x | x in xs && x in m :: m[x]
+  }
+
+  /* True iff x maps to the same value or does not exist in m and m'. */
+  ghost predicate EqualOnKey<X, Y>(m: map<X, Y>, m': map<X, Y>, x: X)
+  {
+    (x !in m && x !in m') || (x in m && x in m' && m[x] == m'[x])
+  }
+
+  /* True iff m is a subset of m'. */
+  ghost predicate IsSubset<X, Y>(m: map<X, Y>, m': map<X, Y>)
+  {
+    && m.Keys <= m'.Keys
+    && forall x {:trigger EqualOnKey(m, m', x)}{:trigger x in m} :: x in m ==> EqualOnKey(m, m', x)
+  }
+
+  /* Union of two maps. Does not require disjoint domains; on the intersection,
+  values from the second map are chosen. */
+  function Union<X, Y>(m: map<X, Y>, m': map<X, Y>): (r: map<X, Y>)
+    ensures r.Keys == m.Keys + m'.Keys
+    ensures forall x {:trigger r[x]} :: x in m' ==> r[x] == m'[x]
+    ensures forall x {:trigger r[x]} :: x in m && x !in m' ==> r[x] == m[x]
+  {
+    m + m'
+  }
+
+  /* The size of the disjoint union is equal to the sum of individual map
+  sizes. */
+  lemma LemmaDisjointUnionSize<X, Y>(m: map<X, Y>, m': map<X, Y>)
+    requires m.Keys !! m'.Keys
+    ensures |Union(m, m')| == |m| + |m'|
+  {
+    var u := Union(m, m');
+    assert |u.Keys| == |m.Keys| + |m'.Keys|;
+  }
+
+  /* True iff a map is injective. */
+  ghost predicate Injective<X, Y>(m: map<X, Y>)
+  {
+    forall x, x' {:trigger m[x], m[x']} :: x != x' && x in m && x' in m ==> m[x] != m[x']
+  }
+
+  /* Swaps map keys and values. Values are not required to be unique; no
+  promises on which key is chosen on the intersection. */
+  ghost function Invert<X, Y>(m: map<X, Y>): map<Y, X>
+  {
+    map y | y in m.Values :: var x :| x in m.Keys && m[x] == y; x
+  }
+
+  /* Inverted maps are injective. */
+  lemma LemmaInvertIsInjective<X, Y>(m: map<X, Y>)
+    ensures Injective(Invert(m))
+  {
+  }
+
+  /* True iff a map contains all valid keys. */
+  ghost predicate Total<X(!new), Y>(m: map<X, Y>)
+  {
+    forall i {:trigger m[i]}{:trigger i in m} :: i in m
+  }
+
+  /* True iff a map is monotonic. */
+  ghost predicate Monotonic(m: map<int, int>)
+  {
+    forall x, x' {:trigger m[x], m[x']} :: x in m && x' in m && x <= x' ==> m[x] <= m[x']
+  }
+
+  /* True iff a map is monotonic. Only considers keys greater than or
+  equal to start. */
+  ghost predicate MonotonicFrom(m: map<int, int>, start: int)
+  {
+    forall x, x' {:trigger m[x], m[x']} :: x in m && x' in m && start <= x <= x' ==> m[x] <= m[x']
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Collections/Seq.dfy b/Source/DafnyStandardLibraries/src/Std/Collections/Seq.dfy
new file mode 100644
index 00000000000..7db1b6ee82f
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Collections/Seq.dfy
@@ -0,0 +1,1060 @@
+/*******************************************************************************
+ *  Original Copyright under the following:
+ *  Copyright 2018-2021 VMware, Inc., Microsoft Inc., Carnegie Mellon University,
+ *  ETH Zurich, and University of Washington
+ *  SPDX-License-Identifier: BSD-2-Clause
+ *
+ *  Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+ This module defines useful properties and functions relating to the built-in `seq` type.
+ */
+module Std.Collections.Seq {
+
+  import opened Wrappers
+  import opened Relations
+  import Math
+
+  /**********************************************************
+   *
+   *  Manipulating the End of a Sequence
+   *
+   ***********************************************************/
+
+  /* Returns the first element of a non-empty sequence. */
+  function First<T>(xs: seq<T>): T
+    requires |xs| > 0
+  {
+    xs[0]
+  }
+
+  /* Returns the subsequence of a non-empty sequence obtained by
+     dropping the first element. */
+  function DropFirst<T>(xs: seq<T>): seq<T>
+    requires |xs| > 0
+  {
+    xs[1..]
+  }
+
+  /* Returns the last element of a non-empty sequence. */
+  function Last<T>(xs: seq<T>): T
+    requires |xs| > 0
+  {
+    xs[|xs|-1]
+  }
+
+  /* Returns the subsequence of a non-empty sequence obtained by
+     dropping the last element. */
+  function DropLast<T>(xs: seq<T>): seq<T>
+    requires |xs| > 0
+  {
+    xs[..|xs|-1]
+  }
+
+  lemma TakeLess<T>(s: seq<T>, m: nat, n: nat)
+    requires m <= n <= |s|
+    ensures s[..n][..m] == s[..m]
+  {
+  }
+
+  /* The concatenation of two subsequences of a non-empty sequence, the first obtained
+     from dropping the last element, the second consisting only of the last
+     element, is the original sequence. */
+  lemma LemmaLast<T>(xs: seq<T>)
+    requires |xs| > 0
+    ensures DropLast(xs) + [Last(xs)] == xs
+  {
+  }
+
+  /* The last element of two concatenated sequences, the second one being non-empty, will be the
+     last element of the latter sequence. */
+  lemma LemmaAppendLast<T>(xs: seq<T>, ys: seq<T>)
+    requires 0 < |ys|
+    ensures Last(xs + ys) == Last(ys)
+  {
+  }
+
+  /* The concatenation of sequences is associative (three arguments). */
+  lemma LemmaConcatIsAssociative<T>(xs: seq<T>, ys: seq<T>, zs: seq<T>)
+    ensures xs + (ys + zs) == xs + ys + zs == (xs + ys) + zs
+  {
+  }
+
+  /* The concatenation of sequences is associative (four arguments). */
+  lemma LemmaConcatIsAssociative2<T>(a: seq<T>, b: seq<T>, c: seq<T>, d: seq<T>)
+    ensures a + b + c + d == a + (b + c + d)
+  {
+  }
+
+  /* The empty sequence is the right identity of the concatenation operation. */
+  lemma EmptySequenceIsRightIdentity(l: seq)
+    ensures l == l + []
+  {}
+
+  /**********************************************************
+   *
+   *  Manipulating the Content of a Sequence
+   *
+   ***********************************************************/
+
+  /* Is true if the sequence xs is a prefix of the sequence ys. */
+  ghost predicate IsPrefix<T>(xs: seq<T>, ys: seq<T>)
+    ensures IsPrefix(xs, ys) ==> (|xs| <= |ys| && xs == ys[..|xs|])
+  {
+    xs <= ys
+  }
+
+  /* Is true if the sequence xs is a suffix of the sequence ys. */
+  ghost predicate IsSuffix<T>(xs: seq<T>, ys: seq<T>)
+  {
+    && |xs| <= |ys|
+    && xs == ys[|ys|-|xs|..]
+  }
+
+  /* A sequence that is sliced at the pos-th element, concatenated
+     with that same sequence sliced from the pos-th element, is equal to the
+     original unsliced sequence. */
+  lemma LemmaSplitAt<T>(xs: seq<T>, pos: nat)
+    requires pos < |xs|
+    ensures xs[..pos] + xs[pos..] == xs
+  {
+  }
+
+  /* Any element in a slice is included in the original sequence. */
+  lemma LemmaElementFromSlice<T>(xs: seq<T>, xs': seq<T>, a: int, b: int, pos: nat)
+    requires 0 <= a <= pos < b <= |xs|
+    requires xs' == xs[a..b]
+    ensures  pos - a < |xs'|
+    ensures  xs'[pos-a] == xs[pos]
+  {
+  }
+
+  /* A slice (from s2..e2) of a slice (from s1..e1) of a sequence is equal to just a
+     slice (s1+s2..s1+e2) of the original sequence. */
+  lemma LemmaSliceOfSlice<T>(xs: seq<T>, s1: int, e1: int, s2: int, e2: int)
+    requires 0 <= s1 <= e1 <= |xs|
+    requires 0 <= s2 <= e2 <= e1 - s1
+    ensures  xs[s1..e1][s2..e2] == xs[s1+s2..s1+e2]
+  {
+    var r1 := xs[s1..e1];
+    var r2 := r1[s2..e2];
+    var r3 := xs[s1+s2..s1+e2];
+    assert |r2| == |r3|;
+    forall i {:trigger r2[i], r3[i]}| 0 <= i < |r2| ensures r2[i] == r3[i]
+    {
+    }
+  }
+
+  /* Converts a sequence to an array. */
+  method ToArray<T>(xs: seq<T>) returns (a: array<T>)
+    ensures fresh(a)
+    ensures a.Length == |xs|
+    ensures forall i :: 0 <= i < |xs| ==> a[i] == xs[i]
+  {
+    a := new T[|xs|](i requires 0 <= i < |xs| => xs[i]);
+  }
+
+  /* Converts a sequence to a set. */
+  function ToSet<T>(xs: seq<T>): set<T>
+  {
+    set x: T | x in xs
+  }
+
+  /* The cardinality of a set of elements is always less than or
+     equal to that of the full sequence of elements. */
+  lemma LemmaCardinalityOfSet<T>(xs: seq<T>)
+    ensures |ToSet(xs)| <= |xs|
+  {
+    if |xs| == 0 {
+    } else {
+      assert ToSet(xs) == ToSet(DropLast(xs)) + {Last(xs)};
+      LemmaCardinalityOfSet(DropLast(xs));
+    }
+  }
+
+  /* A sequence is of length 0 if and only if its conversion to
+     a set results in the empty set. */
+  lemma LemmaCardinalityOfEmptySetIs0<T>(xs: seq<T>)
+    ensures |ToSet(xs)| == 0 <==> |xs| == 0
+  {
+    if |xs| != 0 {
+      assert xs[0] in ToSet(xs);
+    }
+  }
+
+  /* Is true if there are no duplicate values in the sequence. */
+  ghost predicate HasNoDuplicates<T>(xs: seq<T>)
+  {
+    forall i, j :: 0 <= i < |xs| && 0 <= j < |xs| && i != j ==> xs[i] != xs[j]
+  }
+
+  /* If sequences xs and ys don't have duplicates and there are no
+     elements in common between them, then the concatenated sequence xs + ys
+     will not contain duplicates either. */
+  @TimeLimitMultiplier(3)
+  lemma LemmaNoDuplicatesInConcat<T>(xs: seq<T>, ys: seq<T>)
+    requires HasNoDuplicates(xs)
+    requires HasNoDuplicates(ys)
+    requires multiset(xs) !! multiset(ys)
+    ensures HasNoDuplicates(xs+ys)
+  {
+    var zs := xs + ys;
+    if |zs| > 1 {
+      assert forall i :: 0 <= i < |xs| ==> zs[i] in multiset(xs);
+      assert forall j :: |xs| <= j < |zs| ==> zs[j] in multiset(ys);
+      assert forall i, j :: 0 <= i < |xs| <= j < |zs| ==> zs[i] != zs[j];
+    }
+  }
+
+  /* A sequence with no duplicates converts to a set of the same
+     cardinality. */
+  lemma LemmaCardinalityOfSetNoDuplicates<T>(xs: seq<T>)
+    requires HasNoDuplicates(xs)
+    ensures |ToSet(xs)| == |xs|
+  {
+    if |xs| == 0 {
+    } else {
+      LemmaCardinalityOfSetNoDuplicates(DropLast(xs));
+      assert ToSet(xs) == ToSet(DropLast(xs)) + {Last(xs)};
+    }
+  }
+
+  /* A sequence with cardinality equal to its set has no duplicates. */
+  lemma LemmaNoDuplicatesCardinalityOfSet<T>(xs: seq<T>)
+    requires |ToSet(xs)| == |xs|
+    ensures HasNoDuplicates(xs)
+  {
+    if |xs| == 0 {
+    } else {
+      assert xs == [First(xs)] + DropFirst(xs);
+      assert ToSet(xs) == {First(xs)} + ToSet(DropFirst(xs));
+      if First(xs) in DropFirst(xs) {
+        // If there is a duplicate, then we show that |ToSet(s)| == |s| cannot hold.
+        assert ToSet(xs) == ToSet(DropFirst(xs));
+        LemmaCardinalityOfSet(DropFirst(xs));
+      } else {
+        assert |ToSet(xs)| == 1 + |ToSet(DropFirst(xs))|;
+        LemmaNoDuplicatesCardinalityOfSet(DropFirst(xs));
+      }
+    }
+  }
+
+  /* Given a sequence with no duplicates, each element occurs only
+     once in its conversion to a multiset. */
+  lemma LemmaMultisetHasNoDuplicates<T>(xs: seq<T>)
+    requires HasNoDuplicates(xs)
+    ensures forall x {:trigger multiset(xs)[x]} | x in multiset(xs):: multiset(xs)[x] == 1
+  {
+    if |xs| == 0 {
+    } else {
+      assert xs == DropLast(xs) + [Last(xs)];
+      assert Last(xs) !in DropLast(xs) by {
+      }
+      assert HasNoDuplicates(DropLast(xs)) by {
+      }
+      LemmaMultisetHasNoDuplicates(DropLast(xs));
+    }
+  }
+
+  /* For an element that occurs at least once in a sequence, the index of its
+     first occurrence is returned. */
+  opaque function IndexOf<T(==)>(xs: seq<T>, v: T): (i: nat)
+    requires v in xs
+    ensures i < |xs| && xs[i] == v
+    ensures forall j :: 0 <= j < i ==> xs[j] != v
+  {
+    if xs[0] == v then 0 else 1 + IndexOf(xs[1..], v)
+  }
+
+  /* Returns Some(i), if an element occurs at least once in a sequence, and i is
+     the index of its first occurrence. Otherwise the return is None. */
+  opaque function IndexOfOption<T(==)>(xs: seq<T>, v: T): (o: Option<nat>)
+    ensures if o.Some? then o.value < |xs| && xs[o.value] == v &&
+                            forall j :: 0 <= j < o.value ==> xs[j] != v
+            else v !in xs
+  {
+    IndexByOption(xs, x => x == v)
+  }
+
+  /* Returns Some(i), if an element satisfying p occurs at least once in a sequence, and i is
+    the index of the first such occurrence. Otherwise the return is None. */
+  opaque function IndexByOption<T(==)>(xs: seq<T>, p: T -> bool): (o: Option<nat>)
+    ensures if o.Some? then o.value < |xs| && p(xs[o.value]) &&
+                            forall j :: 0 <= j < o.value ==> !p(xs[j])
+            else forall x <- xs ::!p(x)
+  {
+    if |xs| == 0 then None()
+    else
+    if p(xs[0]) then Some(0)
+    else
+      var o' := IndexByOption(xs[1..], p);
+      if o'.Some? then Some(o'.value + 1) else None()
+  }
+
+  /* For an element that occurs at least once in a sequence, the index of its
+     last occurrence is returned. */
+  opaque function LastIndexOf<T(==)>(xs: seq<T>, v: T): (i: nat)
+    requires v in xs
+    ensures i < |xs| && xs[i] == v
+    ensures forall j :: i < j < |xs| ==> xs[j] != v
+  {
+    if xs[|xs|-1] == v then |xs| - 1 else LastIndexOf(xs[..|xs|-1], v)
+  }
+
+  /* Returns Some(i), if an element occurs at least once in a sequence, and i is
+     the index of its last occurrence. Otherwise the return is None. */
+  opaque function LastIndexOfOption<T(==)>(xs: seq<T>, v: T): (o: Option<nat>)
+    ensures if o.Some? then o.value < |xs| && xs[o.value] == v &&
+                            forall j :: o.value < j < |xs| ==> xs[j] != v
+            else v !in xs
+  {
+    LastIndexByOption(xs, x => x == v)
+  }
+
+  /* Returns Some(i), if an element satisfying p occurs at least once in a sequence, and i is
+     the index of the last such occurrence. Otherwise the return is None. */
+  opaque function LastIndexByOption<T(==)>(xs: seq<T>, p: T -> bool): (o: Option<nat>)
+    ensures if o.Some? then o.value < |xs| && p(xs[o.value]) &&
+                            forall j {:trigger xs[j]} :: o.value < j < |xs| ==> !p(xs[j])
+            else forall x <- xs ::!p(x)
+  {
+    if |xs| == 0 then None()
+    else if p(xs[|xs|-1]) then Some(|xs| - 1) else LastIndexByOption(xs[..|xs|-1], p)
+  }
+
+  /* Returns a sequence without the element at a given position. */
+  opaque function Remove<T>(xs: seq<T>, pos: nat): (ys: seq<T>)
+    requires pos < |xs|
+    ensures |ys| == |xs| - 1
+    ensures forall i {:trigger ys[i], xs[i]} | 0 <= i < pos :: ys[i] == xs[i]
+    ensures forall i {:trigger ys[i]} | pos <= i < |xs| - 1 :: ys[i] == xs[i+1]
+  {
+    xs[..pos] + xs[pos+1..]
+  }
+
+  /* If a given element occurs at least once in a sequence, the sequence without
+     its first occurrence is returned. Otherwise the same sequence is returned. */
+  opaque function RemoveValue<T(==)>(xs: seq<T>, v: T): (ys: seq<T>)
+    ensures v !in xs ==> xs == ys
+    ensures v in xs ==> |multiset(ys)| == |multiset(xs)| - 1
+    ensures v in xs ==> multiset(ys)[v] == multiset(xs)[v] - 1
+    ensures HasNoDuplicates(xs) ==> HasNoDuplicates(ys) && ToSet(ys) == ToSet(xs) - {v}
+  {
+    if v !in xs then xs
+    else
+      var i := IndexOf(xs, v);
+      assert xs == xs[..i] + [v] + xs[i+1..];
+      xs[..i] + xs[i+1..]
+  }
+
+  /* Inserts an element at a given position and returns the resulting (longer) sequence. */
+  opaque function Insert<T>(xs: seq<T>, a: T, pos: nat): seq<T>
+    requires pos <= |xs|
+    ensures |Insert(xs, a, pos)| == |xs| + 1
+    ensures forall i {:trigger Insert(xs, a, pos)[i], xs[i]} :: 0 <= i < pos ==> Insert(xs, a, pos)[i] == xs[i]
+    ensures forall i {:trigger xs[i]} :: pos <= i < |xs| ==> Insert(xs, a, pos)[i+1] == xs[i]
+    ensures Insert(xs, a, pos)[pos] == a
+    ensures multiset(Insert(xs, a, pos)) == multiset(xs) + multiset{a}
+  {
+    assert xs == xs[..pos] + xs[pos..];
+    xs[..pos] + [a] + xs[pos..]
+  }
+
+  /* Returns the sequence that is in reverse order to a given sequence. */
+  opaque function Reverse<T>(xs: seq<T>): (ys: seq<T>)
+    ensures |ys| == |xs|
+    ensures forall i {:trigger ys[i]}{:trigger xs[|xs| - i - 1]} :: 0 <= i < |xs| ==> ys[i] == xs[|xs| - i - 1]
+  {
+    if xs == [] then [] else [xs[|xs|-1]] + Reverse(xs[0 .. |xs|-1])
+  }
+
+  /* Returns a constant sequence of a given length. */
+  opaque function Repeat<T>(v: T, length: nat): (xs: seq<T>)
+    ensures |xs| == length
+    ensures forall i: nat | i < |xs| :: xs[i] == v
+  {
+    if length == 0 then
+      []
+    else
+      [v] + Repeat(v, length - 1)
+  }
+
+  /* Unzips a sequence that contains pairs into two separate sequences. */
+  opaque function Unzip<A, B>(xs: seq<(A, B)>): (seq<A>, seq<B>)
+    ensures |Unzip(xs).0| == |Unzip(xs).1| == |xs|
+    ensures forall i {:trigger Unzip(xs).0[i]} {:trigger Unzip(xs).1[i]}
+              :: 0 <= i < |xs| ==> (Unzip(xs).0[i], Unzip(xs).1[i]) == xs[i]
+  {
+    if |xs| == 0 then ([], [])
+    else
+      var (a, b):= Unzip(DropLast(xs));
+      (a + [Last(xs).0], b + [Last(xs).1])
+  }
+
+  /* Zips two sequences of equal length into one sequence that consists of pairs. */
+  opaque function Zip<A, B>(xs: seq<A>, ys: seq<B>): seq<(A, B)>
+    requires |xs| == |ys|
+    ensures |Zip(xs, ys)| == |xs|
+    ensures forall i {:trigger Zip(xs, ys)[i]} :: 0 <= i < |Zip(xs, ys)| ==> Zip(xs, ys)[i] == (xs[i], ys[i])
+    ensures Unzip(Zip(xs, ys)).0 == xs
+    ensures Unzip(Zip(xs, ys)).1 == ys
+  {
+    if |xs| == 0 then []
+    else Zip(DropLast(xs), DropLast(ys)) + [(Last(xs), Last(ys))]
+  }
+
+  /* Unzipping and zipping a sequence results in the original sequence */
+  lemma LemmaZipOfUnzip<A, B>(xs: seq<(A, B)>)
+    ensures Zip(Unzip(xs).0, Unzip(xs).1) == xs
+  {
+  }
+
+  /* If a predicate is true for every member of a sequence as a collection,
+     it is true at every index of the sequence.
+     Useful for converting quantifiers between the two forms
+     to satisfy a precondition in the latter form. */
+  lemma MembershipImpliesIndexing<T>(p: T -> bool, xs: seq<T>)
+    requires forall t | t in xs :: p(t)
+    ensures forall i | 0 <= i < |xs| :: p(xs[i])
+  {
+  }
+
+  /**********************************************************
+   *
+   *  Extrema in Sequences
+   *
+   ***********************************************************/
+
+  /* Returns the maximum integer value in a non-empty sequence of integers. */
+  opaque function Max(xs: seq<int>): int
+    requires 0 < |xs|
+    ensures forall k :: k in xs ==> Max(xs) >= k
+    ensures Max(xs) in xs
+  {
+    assert xs == [xs[0]] + xs[1..];
+    if |xs| == 1 then xs[0] else Math.Max(xs[0], Max(xs[1..]))
+  }
+
+  /* The maximum of the concatenation of two non-empty sequences is greater than or
+     equal to the maxima of its two non-empty subsequences. */
+  lemma LemmaMaxOfConcat(xs: seq<int>, ys: seq<int>)
+    requires 0 < |xs| && 0 < |ys|
+    ensures Max(xs+ys) >= Max(xs)
+    ensures Max(xs+ys) >= Max(ys)
+    ensures forall i {:trigger i in [Max(xs + ys)]} :: i in xs + ys ==> Max(xs + ys) >= i
+  {
+    reveal Max;
+    if |xs| == 1 {
+    } else {
+      assert xs[1..] + ys == (xs + ys)[1..];
+      LemmaMaxOfConcat(xs[1..], ys);
+    }
+  }
+
+  /* Returns the minimum integer value in a non-empty sequence of integers. */
+  opaque function Min(xs: seq<int>): int
+    requires 0 < |xs|
+    ensures forall k :: k in xs ==> Min(xs) <= k
+    ensures Min(xs) in xs
+  {
+    assert xs == [xs[0]] + xs[1..];
+    if |xs| == 1 then xs[0] else Math.Min(xs[0], Min(xs[1..]))
+  }
+
+  /* The minimum of the concatenation of two non-empty sequences is
+     less than or equal to the minima of its two non-empty subsequences. */
+  lemma LemmaMinOfConcat(xs: seq<int>, ys: seq<int>)
+    requires 0 < |xs| && 0 < |ys|
+    ensures Min(xs+ys) <= Min(xs)
+    ensures Min(xs+ys) <= Min(ys)
+    ensures forall i :: i in xs + ys ==> Min(xs + ys) <= i
+  {
+    reveal Min;
+    if |xs| == 1 {
+    } else {
+      assert xs[1..] + ys == (xs + ys)[1..];
+      LemmaMinOfConcat(xs[1..], ys);
+    }
+  }
+
+  /* The maximum element in a non-empty sequence is greater than or equal to
+     the maxima of its non-empty subsequences. */
+  lemma LemmaSubseqMax(xs: seq<int>, from: nat, to: nat)
+    requires from < to <= |xs|
+    ensures Max(xs[from..to]) <= Max(xs)
+  {
+    var subseq := xs[from..to];
+    var subseqMax := Max(subseq);
+    assert forall x | x in subseq :: x in xs[from..];
+    assert subseqMax in subseq;
+    assert subseqMax in xs;
+  }
+
+  /* The minimum element of a non-empty sequence is less than or equal
+     to the minima of its non-empty subsequences. */
+  lemma LemmaSubseqMin(xs: seq<int>, from: nat, to: nat)
+    requires from < to <= |xs|
+    ensures Min(xs[from..to]) >= Min(xs)
+  {
+    var subseq := xs[from..to];
+    var subseqMin := Min(subseq);
+    assert forall x | x in subseq :: x in xs[from..];
+    assert subseqMin in subseq;
+    assert subseqMin in xs;
+  }
+
+  /**********************************************************
+   *
+   *  Sequences of Sequences
+   *
+   ***********************************************************/
+
+  /* Flattens a sequence of sequences into a single sequence by concatenating
+     subsequences, starting from the first element. */
+  function Flatten<T>(xs: seq<seq<T>>): seq<T>
+    decreases |xs|
+  {
+    if |xs| == 0 then []
+    else xs[0] + Flatten(xs[1..])
+  }
+
+  /* Flattening sequences of sequences is distributive over concatenation. That is, concatenating
+     the flattening of two sequences of sequences is the same as flattening the
+     concatenation of two sequences of sequences. */
+  @IsolateAssertions
+  lemma LemmaFlattenConcat<T>(xs: seq<seq<T>>, ys: seq<seq<T>>)
+    ensures Flatten(xs + ys) == Flatten(xs) + Flatten(ys)
+  {
+    if |xs| == 0 {
+      assert xs + ys == ys;
+    } else {
+      calc == {
+        Flatten(xs + ys);
+        { assert (xs + ys)[0] == xs[0];  assert (xs + ys)[1..] == xs[1..] + ys; }
+        xs[0] + Flatten(xs[1..] + ys);
+        xs[0] + Flatten(xs[1..]) + Flatten(ys);
+        Flatten(xs) + Flatten(ys);
+      }
+    }
+  }
+
+  /* Flattens a sequence of sequences into a single sequence by concatenating
+     subsequences in reverse order, i.e. starting from the last element. */
+  function FlattenReverse<T>(xs: seq<seq<T>>): seq<T>
+    decreases |xs|
+  {
+    if |xs| == 0 then []
+    else FlattenReverse(DropLast(xs)) + Last(xs)
+  }
+
+  /* Flattening sequences of sequences in reverse order is distributive over concatentation.
+     That is, concatenating the flattening of two sequences of sequences in reverse
+     order is the same as flattening the concatenation of two sequences of sequences
+     in reverse order. */
+  lemma LemmaFlattenReverseConcat<T>(xs: seq<seq<T>>, ys: seq<seq<T>>)
+    ensures FlattenReverse(xs + ys) == FlattenReverse(xs) + FlattenReverse(ys)
+  {
+    if |ys| == 0 {
+      assert FlattenReverse(ys) == [];
+      assert xs + ys == xs;
+    } else {
+      calc == {
+        FlattenReverse(xs + ys);
+        { assert Last(xs + ys) == Last(ys);  assert DropLast(xs + ys) == xs + DropLast(ys); }
+        FlattenReverse(xs + DropLast(ys)) + Last(ys);
+        FlattenReverse(xs) + FlattenReverse(DropLast(ys)) + Last(ys);
+        FlattenReverse(xs) + FlattenReverse(ys);
+      }
+    }
+  }
+
+  /* Flattening sequences of sequences in order (starting from the beginning)
+     and in reverse order (starting from the end) results in the same sequence. */
+  lemma LemmaFlattenAndFlattenReverseAreEquivalent<T>(xs: seq<seq<T>>)
+    ensures Flatten(xs) == FlattenReverse(xs)
+  {
+    if |xs| == 0 {
+    } else {
+      calc == {
+        FlattenReverse(xs);
+        FlattenReverse(DropLast(xs)) + Last(xs);
+        { LemmaFlattenAndFlattenReverseAreEquivalent(DropLast(xs)); }
+        Flatten(DropLast(xs)) + Last(xs);
+        Flatten(DropLast(xs)) + Flatten([Last(xs)]);
+        { LemmaFlattenConcat(DropLast(xs), [Last(xs)]);
+          assert xs == DropLast(xs) + [Last(xs)]; }
+        Flatten(xs);
+      }
+    }
+  }
+
+  /* The length of a flattened sequence of sequences xs is greater than or
+     equal to any of the lengths of the elements of xs.  */
+  lemma LemmaFlattenLengthGeSingleElementLength<T>(xs: seq<seq<T>>, i: int)
+    requires 0 <= i < |xs|
+    ensures |FlattenReverse(xs)| >= |xs[i]|
+  {
+    if i < |xs| - 1 {
+      LemmaFlattenLengthGeSingleElementLength(xs[..|xs|-1], i);
+    }
+  }
+
+  /* The length of a flattened sequence of sequences xs is less than or equal
+     to the length of xs multiplied by a number not smaller than the length of the
+     longest sequence in xs. */
+  lemma LemmaFlattenLengthLeMul<T>(xs: seq<seq<T>>, j: int)
+    requires forall i | 0 <= i < |xs| :: |xs[i]| <= j
+    ensures |FlattenReverse(xs)| <= |xs| * j
+  {
+    if |xs| == 0 {
+    } else {
+      LemmaFlattenLengthLeMul(xs[..|xs|-1], j);
+      assert |FlattenReverse(xs[..|xs|-1])| <= (|xs|-1) * j;
+    }
+  }
+
+  /* Join a sequence of sequences using a separator sequence.
+     Particularly useful for strings (since string is just an alias for seq<char>) */
+  function Join<T>(seqs: seq<seq<T>>, separator: seq<T>) : seq<T> {
+    if |seqs| == 0 then []
+    else if |seqs| == 1 then seqs[0]
+    else seqs[0] + separator + Join(seqs[1..], separator)
+  }
+
+  lemma LemmaJoinWithEmptySeparator(seqs: seq<string>)
+    ensures Flatten(seqs) == Join(seqs, [])
+  {}
+
+  @TailRecursion
+  function Split<T(==)>(s: seq<T>, delim: T): (res: seq<seq<T>>)
+    ensures delim !in s ==> res == [s]
+    ensures s == [] ==> res == [[]]
+    ensures 0 < |res|
+    ensures forall i :: 0 <= i < |res| ==> delim !in res[i]
+    ensures Join(res, [delim]) == s
+    decreases |s|
+  {
+    var i := IndexOfOption(s, delim);
+    if i.Some? then [s[..i.value]] + Split(s[(i.value + 1)..], delim) else [s]
+  }
+
+  /* Split on first occurrence of delim, which must exist */
+  @TailRecursion
+  function SplitOnce<T(==)>(s: seq<T>, delim: T): (res : (seq<T>,seq<T>))
+    requires delim in s
+    ensures res.0 + [delim] + res.1 == s
+    ensures !(delim in res.0)
+  {
+    var i := IndexOfOption(s, delim);
+    assert i.Some?;
+    (s[..i.value], s[(i.value + 1)..])
+  }
+
+  // split on first occurrence of delim, return None if delim not present
+  @TailRecursion
+  function SplitOnceOption<T(==)>(s: seq<T>, delim: T): (res : Option<(seq<T>,seq<T>)>)
+    ensures res.Some? ==> res.value.0 + [delim] + res.value.1 == s
+    ensures res.None? ==> !(delim in s)
+    ensures res.Some? ==> !(delim in res.value.0)
+  {
+    var i :- IndexOfOption(s, delim);
+    Some((s[..i], s[(i + 1)..]))
+  }
+
+  @ResourceLimit("1e6")
+  @IsolateAssertions
+  lemma {:induction false} WillSplitOnDelim<T>(s: seq<T>, delim: T, prefix: seq<T>)
+    requires |prefix| < |s|
+    requires forall i :: 0 <= i < |prefix| ==> prefix[i] == s[i]
+    requires delim !in prefix && s[|prefix|] == delim
+    ensures Split(s, delim) == [prefix] + Split(s[|prefix| + 1..], delim)
+  {
+    hide *;
+    calc {
+      Split(s, delim);
+    ==  { reveal Split(); }
+      var i := IndexOfOption(s, delim);
+      if i.Some? then [s[..i.value]] + Split(s[i.value + 1..], delim) else [s];
+    ==  { IndexOfOptionLocatesElem(s, delim, |prefix|); assert IndexOfOption(s, delim).Some?; }
+      [s[..|prefix|]] + Split(s[|prefix| + 1..], delim);
+    ==  { assert s[..|prefix|] == prefix; }
+      [prefix] + Split(s[|prefix| + 1..], delim);
+    }
+  }
+
+  lemma WillNotSplitWithOutDelim<T>(s: seq<T>, delim: T)
+    requires delim !in s
+    ensures Split(s, delim) == [s]
+  {
+    calc {
+      Split(s, delim);
+    ==
+      var i := IndexOfOption(s, delim);
+      if i.Some? then [s[..i.value]] + Split(s[i.value+1..], delim) else [s];
+    ==  { IndexOfOptionLocatesElem(s, delim, |s|); }
+      [s];
+    }
+  }
+
+  lemma IndexOfOptionLocatesElem<T>(s: seq<T>, c: T, elemIndex: nat)
+    requires 0 <= elemIndex <= |s|
+    requires forall i :: 0 <= i < elemIndex ==> s[i] != c
+    requires elemIndex == |s| || s[elemIndex] == c
+    ensures IndexOfOption(s, c) == if elemIndex == |s| then None else Some(elemIndex)
+    decreases elemIndex
+  {}
+
+  /**********************************************************
+   *
+   *  Higher-Order Sequence Functions
+   *
+   ***********************************************************/
+
+  /* Returns the sequence one obtains by applying a function to every element
+     of a sequence. */
+  opaque function Map<T, R>(f: T ~> R, xs: seq<T>): (result: seq<R>)
+    requires forall i :: 0 <= i < |xs| ==> f.requires(xs[i])
+    ensures |result| == |xs|
+    ensures forall i {:trigger result[i]} :: 0 <= i < |xs| ==> result[i] == f(xs[i])
+    reads set i, o | 0 <= i < |xs| && o in f.reads(xs[i]) :: o
+  {
+    if |xs| == 0 then []
+    else [f(xs[0])] + Map(f, xs[1..])
+  }
+
+  function MapPartialFunction<T, R>(f: T --> R, xs: seq<T>): (result: seq<R>)
+    requires forall i :: 0 <= i < |xs| ==> f.requires(xs[i])
+  {
+    Map(f, xs)
+  }
+
+  /* Applies a function to every element of a sequence, returning a Result value (which is a
+     failure-compatible type). Returns either a failure, or, if successful at every element,
+     the transformed sequence.  */
+  opaque function MapWithResult<T, R, E>(f: (T ~> Result<R, E>), xs: seq<T>): (result: Result<seq<R>, E>)
+    requires forall i :: 0 <= i < |xs| ==> f.requires(xs[i])
+    ensures result.Success? ==>
+              && |result.value| == |xs|
+              && (forall i :: 0 <= i < |xs| ==>
+                                && f(xs[i]).Success?
+                                && result.value[i] == f(xs[i]).value)
+    reads set i, o | 0 <= i < |xs| && o in f.reads(xs[i]) :: o
+  {
+    if |xs| == 0 then Success([])
+    else
+      var head :- f(xs[0]);
+      var tail :- MapWithResult(f, xs[1..]);
+      Success([head] + tail)
+  }
+
+  /* Applying a function to a sequence  is distributive over concatenation. That is, concatenating
+     two sequences and then applying Map is the same as applying Map to each sequence separately,
+     and then concatenating the two resulting sequences. */
+  lemma {:induction false} LemmaMapDistributesOverConcat<T,R>(f: (T ~> R), xs: seq<T>, ys: seq<T>)
+    requires X: forall i :: 0 <= i < |xs| ==> f.requires(xs[i])
+    requires Y: forall j :: 0 <= j < |ys| ==> f.requires(ys[j])
+    ensures Map(f, xs + ys) == Map(f, xs) + Map(f, ys)
+  {
+    if |xs| == 0 {
+      assert xs + ys == ys;
+    } else {
+      calc {
+        Map(f, reveal X, Y; xs + ys);
+        { assert (xs + ys)[0] == xs[0]; assert (xs + ys)[1..] == xs[1..] + ys; }
+        Map(f, [xs[0]]) + Map(f, xs[1..] + ys);
+        Map(f, [xs[0]]) + Map(f, reveal X; xs[1..]) + Map(f, reveal Y; ys);
+        {assert [(xs + ys)[0]] + xs[1..] + ys == xs + ys;}
+        Map(f, xs) + Map(f, ys);
+      }
+    }
+  }
+
+  /* Returns the subsequence consisting of those elements of a sequence that satisfy a given
+     predicate. */
+  opaque function Filter<T>(f: (T ~> bool), xs: seq<T>): (result: seq<T>)
+    requires forall i :: 0 <= i < |xs| ==> f.requires(xs[i])
+    ensures |result| <= |xs|
+    ensures forall i: nat :: i < |result| && f.requires(result[i]) ==> f(result[i])
+    reads set i, o | 0 <= i < |xs| && o in f.reads(xs[i]) :: o
+  {
+    if |xs| == 0 then []
+    else (if f(xs[0]) then [xs[0]] else []) + Filter(f, xs[1..])
+  }
+
+  /* Filtering a sequence is distributive over concatenation. That is, concatenating two sequences
+     and then using "Filter" is the same as using "Filter" on each sequence separately, and then
+     concatenating the two resulting sequences. */
+  @IsolateAssertions
+  lemma {:induction false}
+    LemmaFilterDistributesOverConcat<T(!new)>(f: T ~> bool, xs: seq<T>, ys: seq<T>)
+    requires forall i :: 0 <= i < |xs| ==> f.requires(xs[i])
+    requires forall j :: 0 <= j < |ys| ==> f.requires(ys[j])
+    ensures Filter(f, xs + ys) == Filter(f, xs) + Filter(f, ys)
+  {
+    hide *;
+    if |xs| == 0 {
+      assert xs + ys == ys;
+    } else {
+      calc {
+        Filter(f, xs + ys);
+        {
+          reveal Filter;
+          assert (xs + ys)[0] == xs[0]; assert (xs + ys)[1..] == xs[1..] + ys;
+        }
+        Filter(f, [xs[0]]) + Filter(f, xs[1..] + ys);
+        { LemmaFilterDistributesOverConcat(f, xs[1..], ys); }
+        Filter(f, [xs[0]]) + (Filter(f, xs[1..]) + Filter(f, ys));
+        {
+          reveal Filter;
+          assert [(xs + ys)[0]] + (xs[1..] + ys) == xs + ys; }
+        Filter(f, xs) + Filter(f, ys);
+      }
+    }
+  }
+
+  /* Folds a sequence xs from the left (the beginning), by repeatedly acting on the accumulator
+     init via the function f. */
+  function FoldLeft<A, T>(f: (A, T) -> A, init: A, xs: seq<T>): A
+  {
+    if |xs| == 0 then init
+    else FoldLeft(f, f(init, xs[0]), xs[1..])
+  }
+
+  /* Folding to the left is distributive over concatenation. That is, concatenating two
+     sequences and then folding them to the left, is the same as folding to the left the
+     first sequence and using the result to fold to the left the second sequence. */
+  lemma LemmaFoldLeftDistributesOverConcat<A, T>(f: (A, T) -> A, init: A, xs: seq<T>, ys: seq<T>)
+    ensures FoldLeft(f, init, xs + ys) == FoldLeft(f, FoldLeft(f, init, xs), ys)
+  {
+    if |xs| == 0 {
+      assert xs + ys == ys;
+    } else {
+      assert |xs| >= 1;
+      assert ([xs[0]] + xs[1..] + ys)[0] == xs[0];
+      calc {
+        FoldLeft(f, FoldLeft(f, init, xs), ys);
+        FoldLeft(f, FoldLeft(f, f(init, xs[0]), xs[1..]), ys);
+        { LemmaFoldLeftDistributesOverConcat(f, f(init, xs[0]), xs[1..], ys); }
+        FoldLeft(f, f(init, xs[0]), xs[1..] + ys);
+        { assert (xs + ys)[0] == xs[0];
+          assert (xs + ys)[1..] == xs[1..] + ys; }
+        FoldLeft(f, init, xs + ys);
+      }
+    }
+  }
+
+  /* Is true, if inv is an invariant under stp, which is a relational
+     version of the function f passed to fold. */
+  ghost predicate InvFoldLeft<A(!new), B(!new)>(inv: (B, seq<A>) -> bool,
+                                                stp: (B, A, B) -> bool)
+  {
+    forall x: A, xs: seq<A>, b: B, b': B ::
+      inv(b, [x] + xs) && stp(b, x, b') ==> inv(b', xs)
+  }
+
+  /* inv(b, xs) ==> inv(FoldLeft(f, b, xs), []). */
+  lemma LemmaInvFoldLeft<A(!new), B(!new)>(inv: (B, seq<A>) -> bool,
+                                           stp: (B, A, B) -> bool,
+                                           f: (B, A) -> B,
+                                           b: B,
+                                           xs: seq<A>)
+    requires InvFoldLeft(inv, stp)
+    requires forall b, a :: stp(b, a, f(b, a))
+    requires inv(b, xs)
+    ensures inv(FoldLeft(f, b, xs), [])
+  {
+    if xs == [] {
+    } else {
+      assert [xs[0]] + xs[1..] == xs;
+      LemmaInvFoldLeft(inv, stp, f, f(b, xs[0]), xs[1..]);
+    }
+  }
+
+  /* Folds a sequence xs from the right (the end), by acting on the accumulator init via the
+     function f. */
+  function FoldRight<A, T>(f: (T, A) -> A, xs: seq<T>, init: A): A
+  {
+    if |xs| == 0 then init
+    else f(xs[0], FoldRight(f, xs[1..], init))
+  }
+
+  /* Folding to the right is (contravariantly) distributive over concatenation. That is, concatenating
+     two sequences and then folding them to the right, is the same as folding to the right
+     the second sequence and using the result to fold to the right the first sequence. */
+  lemma LemmaFoldRightDistributesOverConcat<A, T>(f: (T, A) -> A, init: A, xs: seq<T>, ys: seq<T>)
+    ensures FoldRight(f, xs + ys, init) == FoldRight(f, xs, FoldRight(f, ys, init))
+  {
+    if |xs| == 0 {
+      assert xs + ys == ys;
+    } else {
+      calc {
+        FoldRight(f, xs, FoldRight(f, ys, init));
+        f(xs[0], FoldRight(f, xs[1..], FoldRight(f, ys, init)));
+        f(xs[0], FoldRight(f, xs[1..] + ys, init));
+        { assert (xs + ys)[0] == xs[0];
+          assert (xs +ys)[1..] == xs[1..] + ys; }
+        FoldRight(f, xs + ys, init);
+      }
+    }
+  }
+
+  /* Is true, if inv is an invariant under stp, which is a relational version
+     of the function f passed to fold. */
+  ghost predicate InvFoldRight<A(!new), B(!new)>(inv: (seq<A>, B) -> bool,
+                                                 stp: (A, B, B) -> bool)
+  {
+    forall x: A, xs: seq<A>, b: B, b': B ::
+      inv(xs, b) && stp(x, b, b') ==> inv(([x] + xs), b')
+  }
+
+  /* inv([], b) ==> inv(xs, FoldRight(f, xs, b)) */
+  lemma LemmaInvFoldRight<A(!new), B(!new)>(inv: (seq<A>, B) -> bool,
+                                            stp: (A, B, B) -> bool,
+                                            f: (A, B) -> B,
+                                            b: B,
+                                            xs: seq<A>)
+    requires InvFoldRight(inv, stp)
+    requires forall a, b :: stp(a, b, f(a, b))
+    requires inv([], b)
+    ensures inv(xs, FoldRight(f, xs, b))
+  {
+    if xs == [] {
+    } else {
+      assert [xs[0]] + xs[1..] == xs;
+    }
+  }
+
+
+  /**********************************************************
+   *
+   *  Sets to Ordered Sequences
+   *
+   ***********************************************************/
+
+  /* Converts a set to a sequence (ghost). */
+  ghost function SetToSeqSpec<T>(s: set<T>): (xs: seq<T>)
+    ensures multiset(s) == multiset(xs)
+  {
+    if s == {} then [] else var x :| x in s; [x] + SetToSeqSpec(s - {x})
+  }
+
+  /* Converts a set to a sequence (compiled). */
+  method SetToSeq<T>(s: set<T>) returns (xs: seq<T>)
+    ensures multiset(s) == multiset(xs)
+  {
+    xs := [];
+    var left: set<T> := s;
+    while left != {}
+      invariant multiset(left) + multiset(xs) == multiset(s)
+    {
+      var x :| x in left;
+      left := left - {x};
+      xs := xs + [x];
+    }
+  }
+
+  /* Proves that any two sequences that are sorted by a total order and that have the same elements are equal. */
+  lemma SortedUnique<T(!new)>(xs: seq<T>, ys: seq<T>, R: (T, T) -> bool)
+    requires SortedBy(R, xs)
+    requires SortedBy(R, ys)
+    requires TotalOrdering(R)
+    requires multiset(xs) == multiset(ys)
+    ensures xs == ys
+  {
+    if xs == [] {
+      assert multiset(xs) == multiset{};
+      assert multiset(ys) == multiset{};
+      assert ys == [];
+    } else {
+      assert xs == [xs[0]] + xs[1..];
+      assert ys == [ys[0]] + ys[1..];
+      assert multiset(xs[1..]) == multiset(xs) - multiset{xs[0]};
+      assert multiset(ys[1..]) == multiset(ys) - multiset{ys[0]};
+      assert multiset(xs[1..]) == multiset(ys[1..]);
+      SortedUnique(xs[1..], ys[1..], R);
+    }
+  }
+
+  /* Converts a set to a sequence that is ordered w.r.t. a given total order (ghost). */
+  ghost function SetToSortedSeqSpec<T(!new)>(s: set<T>, R: (T, T) -> bool): (xs: seq<T>)
+    requires TotalOrdering(R)
+    ensures multiset(s) == multiset(xs)
+    ensures SortedBy(R, xs)
+  {
+    MergeSortBy(R, SetToSeqSpec(s))
+  }
+
+  /* Converts a set to a sequence that is ordered w.r.t. a given total order (compiled). */
+  method SetToSortedSeq<T(!new)>(s: set<T>, R: (T, T) -> bool) returns (xs: seq<T>)
+    requires TotalOrdering(R)
+    ensures multiset(s) == multiset(xs)
+    ensures SortedBy(R, xs)
+  {
+    xs := SetToSeq(s);
+    xs := MergeSortBy(R, xs);
+    SortedUnique(xs, SetToSortedSeqSpec(s, R), R);
+  }
+
+
+  /****************************
+   **  Sorting sequences
+   ***************************** */
+
+  //Splits a sequence in two, sorts the two subsequences (recursively), and merges the two sorted sequences using `MergeSortedWith`
+  function MergeSortBy<T(!new)>(lessThanOrEq: (T, T) -> bool, a: seq<T>): (result :seq<T>)
+    requires TotalOrdering(lessThanOrEq)
+    ensures multiset(a) == multiset(result)
+    ensures SortedBy(lessThanOrEq, result)
+  {
+    if |a| <= 1 then
+      a
+    else
+      var splitIndex := |a| / 2;
+      var left, right := a[..splitIndex], a[splitIndex..];
+
+      assert a == left + right;
+
+      var leftSorted := MergeSortBy(lessThanOrEq, left);
+      var rightSorted := MergeSortBy(lessThanOrEq, right);
+
+      MergeSortedWith(leftSorted, rightSorted, lessThanOrEq)
+  }
+
+  // Helper function for MergeSortBy
+  @TailRecursion
+  function MergeSortedWith<T(!new)>(left: seq<T>, right: seq<T>, lessThanOrEq: (T, T) -> bool) : (result :seq<T>)
+    requires SortedBy(lessThanOrEq, left)
+    requires SortedBy(lessThanOrEq, right)
+    requires TotalOrdering(lessThanOrEq)
+    ensures multiset(left + right) == multiset(result)
+    ensures SortedBy(lessThanOrEq, result)
+  {
+    if |left| == 0 then
+      right
+    else if |right| == 0 then
+      left
+    else if lessThanOrEq(left[0], right[0]) then
+      LemmaNewFirstElementStillSortedBy(left[0], MergeSortedWith(left[1..], right, lessThanOrEq), lessThanOrEq);
+      assert left == [left[0]] + left[1..];
+
+      [left[0]] + MergeSortedWith(left[1..], right, lessThanOrEq)
+
+    else
+      LemmaNewFirstElementStillSortedBy(right[0], MergeSortedWith(left, right[1..], lessThanOrEq), lessThanOrEq);
+      assert right == [right[0]] + right[1..];
+
+      [right[0]] + MergeSortedWith(left, right[1..], lessThanOrEq)
+  }
+
+  lemma LemmaNewFirstElementStillSortedBy<T(!new)>(newFirst: T, s: seq<T>, lessOrEqual: (T, T) -> bool)
+    requires SortedBy(lessOrEqual, s)
+    requires |s| == 0 || lessOrEqual(newFirst, s[0])
+    requires TotalOrdering(lessOrEqual)
+    ensures SortedBy(lessOrEqual, [newFirst] + s)
+  {}
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Collections/Set.dfy b/Source/DafnyStandardLibraries/src/Std/Collections/Set.dfy
new file mode 100644
index 00000000000..9d14de9c880
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Collections/Set.dfy
@@ -0,0 +1,320 @@
+/*******************************************************************************
+ *  Original Copyright under the following:
+ *  Copyright 2018-2021 VMware, Inc., Microsoft Inc., Carnegie Mellon University,
+ *  ETH Zurich, and University of Washington
+ *  SPDX-License-Identifier: BSD-2-Clause
+ *
+ *  Copyright (c) Microsoft Corporation
+ *  SPDX-License-Identifier: MIT
+ *
+ *  Modifications and Extensions: Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+ This module defines useful properties and functions relating to the built-in `set` type.
+ */
+module Std.Collections.Set {
+
+  import opened Functions
+  import opened Relations
+
+  /* If all elements in set x are in set y, x is a subset of y. */
+  lemma LemmaSubset<T>(x: set<T>, y: set<T>)
+    requires forall e {:trigger e in y} :: e in x ==> e in y
+    ensures x <= y
+  {
+  }
+
+  /* If x is a subset of y, then the size of x is less than or equal to the
+  size of y. */
+  lemma LemmaSubsetSize<T>(x: set<T>, y: set<T>)
+    ensures x < y ==> |x| < |y|
+    ensures x <= y ==> |x| <= |y|
+  {
+    if x != {} {
+      var e :| e in x;
+      LemmaSubsetSize(x - {e}, y - {e});
+    }
+  }
+
+  /* If x is a subset of y and the size of x is equal to the size of y, x is
+  equal to y. */
+  lemma LemmaSubsetEquality<T>(x: set<T>, y: set<T>)
+    requires x <= y
+    requires |x| == |y|
+    ensures x == y
+    decreases x, y
+  {
+    if x == {} {
+    } else {
+      var e :| e in x;
+      LemmaSubsetEquality(x - {e}, y - {e});
+    }
+  }
+
+  /* A singleton set has a size of 1. */
+  lemma LemmaSingletonSize<T>(x: set<T>, e: T)
+    requires x == {e}
+    ensures |x| == 1
+  {
+  }
+
+  /* Elements in a singleton set are equal to each other. */
+  lemma LemmaSingletonEquality<T>(x: set<T>, a: T, b: T)
+    requires |x| == 1
+    requires a in x
+    requires b in x
+    ensures a == b
+  {
+    if a != b {
+      assert {a} < x;
+      LemmaSubsetSize({a}, x);
+      assert false;
+    }
+  }
+
+  /* A singleton set has at least one element and any two elements are equal. */
+  ghost predicate IsSingleton<T>(s: set<T>) {
+    && (exists x :: x in s)
+    && (forall x, y | x in s && y in s :: x == y)
+  }
+
+  /* A set has exactly one element, if and only if, it has at least one element and any two elements are equal. */
+  lemma LemmaIsSingleton<T>(s: set<T>)
+    ensures |s| == 1 <==> IsSingleton(s)
+  {
+    if |s| == 1 {
+      forall x, y | x in s && y in s ensures x == y {
+        LemmaSingletonEquality(s, x, y);
+      }
+    }
+    if IsSingleton(s) {
+      var x :| x in s;
+      assert s == {x};
+      assert |s| == 1;
+    }
+  }
+
+  /* Non-deterministically extracts an element from a set that contains at least one element. */
+  ghost function ExtractFromNonEmptySet<T>(s: set<T>): (x: T)
+    requires |s| != 0
+    ensures x in s
+  {
+    var x :| x in s;
+    x
+  }
+
+  /* Deterministically extracts the unique element from a singleton set. In contrast to
+     `ExtractFromNonEmptySet`, this implementation compiles, as the uniqueness of the element
+     being picked can be proven. */
+  function ExtractFromSingleton<T>(s: set<T>): (x: T)
+    requires |s| == 1
+    ensures s == {x}
+  {
+    LemmaIsSingleton(s);
+    var x :| x in s;
+    x
+  }
+
+  /* If an injective function is applied to each element of a set to construct
+  another set, the two sets have the same size.  */
+  lemma LemmaMapSize<X(!new), Y>(xs: set<X>, ys: set<Y>, f: X-->Y)
+    requires forall x {:trigger f.requires(x)} :: f.requires(x)
+    requires Injective(f)
+    requires forall x {:trigger f(x)} :: x in xs <==> f(x) in ys
+    requires forall y {:trigger y in ys} :: y in ys ==> exists x :: x in xs && y == f(x)
+    ensures |xs| == |ys|
+  {
+    if xs != {} {
+      var x :| x in xs;
+      var xs' := xs - {x};
+      var ys' := ys - {f(x)};
+      LemmaMapSize(xs', ys', f);
+    }
+  }
+
+  /* Map an injective function to each element of a set. */
+  opaque function Map<X(!new), Y>(f: X --> Y, xs: set<X>): (ys: set<Y>)
+    reads f.reads
+    requires forall x {:trigger f.requires(x)} :: f.requires(x)
+    requires Injective(f)
+    ensures forall x {:trigger f(x)} :: x in xs <==> f(x) in ys
+    ensures |xs| == |ys|
+  {
+    var ys := set x | x in xs :: f(x);
+    LemmaMapSize(xs, ys, f);
+    ys
+  }
+
+  /* If a set ys is constructed using elements of another set xs for which a
+  function returns true, the size of ys is less than or equal to the size of
+  xs. */
+  lemma LemmaFilterSize<X>(xs: set<X>, ys: set<X>, f: X~>bool)
+    requires forall x {:trigger f.requires(x)}{:trigger x in xs} :: x in xs ==> f.requires(x)
+    requires forall y {:trigger f(y)}{:trigger y in xs} :: y in ys ==> y in xs && f(y)
+    ensures |ys| <= |xs|
+    decreases xs, ys
+  {
+    if ys != {} {
+      var y :| y in ys;
+      var xs' := xs - {y};
+      var ys' := ys - {y};
+      LemmaFilterSize(xs', ys', f);
+    }
+  }
+
+  /* Construct a set using elements of another set for which a function returns
+  true. */
+  opaque function Filter<X(!new)>(f: X ~> bool, xs: set<X>): (ys: set<X>)
+    reads set x, o | x in xs && o in f.reads(x) :: o
+    requires forall x {:trigger f.requires(x)} {:trigger x in xs} :: x in xs ==> f.requires(x)
+    ensures forall y {:trigger f(y)}{:trigger y in xs} :: y in ys <==> y in xs && f(y)
+    ensures |ys| <= |xs|
+  {
+    var ys := set x | x in xs && f(x);
+    LemmaFilterSize(xs, ys, f);
+    ys
+  }
+
+  /* The size of a union of two sets is greater than or equal to the size of
+  either individual set. */
+  lemma LemmaUnionSize<X>(xs: set<X>, ys: set<X>)
+    ensures |xs + ys| >= |xs|
+    ensures |xs + ys| >= |ys|
+  {
+    if ys == {} {
+    } else {
+      var y :| y in ys;
+      if y in xs {
+        var xr := xs - {y};
+        var yr := ys - {y};
+        assert xr + yr == xs + ys - {y};
+        LemmaUnionSize(xr, yr);
+      } else {
+        var yr := ys - {y};
+        assert xs + yr == xs + ys - {y};
+        LemmaUnionSize(xs, yr);
+      }
+    }
+  }
+
+  /* Construct a set with all integers in the range [a, b). */
+  opaque function SetRange(a: int, b: int): (s: set<int>)
+    requires a <= b
+    ensures forall i {:trigger i in s} :: a <= i < b <==> i in s
+    ensures |s| == b - a
+    decreases b - a
+  {
+    if a == b then {} else {a} + SetRange(a + 1, b)
+  }
+
+  /* Construct a set with all integers in the range [0, n). */
+  opaque function SetRangeZeroBound(n: int): (s: set<int>)
+    requires n >= 0
+    ensures forall i {:trigger i in s} :: 0 <= i < n <==> i in s
+    ensures |s| == n
+  {
+    SetRange(0, n)
+  }
+
+  /* If a set solely contains integers in the range [a, b), then its size is
+  bounded by b - a. */
+  lemma LemmaBoundedSetSize(x: set<int>, a: int, b: int)
+    requires forall i {:trigger i in x} :: i in x ==> a <= i < b
+    requires a <= b
+    ensures |x| <= b - a
+  {
+    var range := SetRange(a, b);
+    forall e {:trigger e in range}{:trigger e in x} | e in x
+      ensures e in range
+    {
+    }
+    assert x <= range;
+    LemmaSubsetSize(x, range);
+  }
+
+  /** In a set, a greatest element is necessarily maximal. */
+  lemma LemmaGreatestImpliesMaximal<T(!new)>(R: (T, T) -> bool, max: T, s: set<T>)
+    requires IsGreatest(R, max, s)
+    ensures IsMaximal(R, max, s)
+  {
+  }
+
+  /** In a set, a least element is necessarily minimal. */
+  lemma LemmaLeastImpliesMinimal<T(!new)>(R: (T, T) -> bool, min: T, s: set<T>)
+    requires IsLeast(R, min, s)
+    ensures IsMinimal(R, min, s)
+  {
+  }
+
+  /** In a totally-ordered set, an element is maximal if and only if it is a greatest element. */
+  lemma LemmaMaximalEquivalentGreatest<T(!new)>(R: (T, T) -> bool, max: T, s: set<T>)
+    requires TotalOrdering(R)
+    ensures IsGreatest(R, max, s) <==> IsMaximal(R, max, s)
+  {
+  }
+
+  /** In a totally-ordered set, an element is minimal if and only if it is a least element. */
+  lemma LemmaMinimalEquivalentLeast<T(!new)>(R: (T, T) -> bool, min: T, s: set<T>)
+    requires TotalOrdering(R)
+    ensures IsLeast(R, min, s) <==> IsMinimal(R, min, s)
+  {
+  }
+
+  /** In a partially-ordered set, there exists at most one least element. */
+  lemma LemmaLeastIsUnique<T(!new)>(R: (T, T) -> bool, s: set<T>)
+    requires PartialOrdering(R)
+    ensures forall min, min' | IsLeast(R, min, s) && IsLeast(R, min', s) :: min == min'
+  {}
+
+  /** In a partially-ordered set, there exists at most one greatest element. */
+  lemma LemmaGreatestIsUnique<T(!new)>(R: (T, T) -> bool, s: set<T>)
+    requires PartialOrdering(R)
+    ensures forall max, max' | IsGreatest(R, max, s) && IsGreatest(R, max', s) :: max == max'
+  {}
+
+  /** In a totally-ordered set, there exists at most one minimal element. */
+  lemma LemmaMinimalIsUnique<T(!new)>(R: (T, T) -> bool, s: set<T>)
+    requires TotalOrdering(R)
+    ensures forall min, min' | IsMinimal(R, min, s) && IsMinimal(R, min', s) :: min == min'
+  {}
+
+  /** In a totally-ordered set, there exists at most one maximal element. */
+  lemma LemmaMaximalIsUnique<T(!new)>(R: (T, T) -> bool, s: set<T>)
+    requires TotalOrdering(R)
+    ensures forall max, max' | IsMaximal(R, max, s) && IsMaximal(R, max', s) :: max == max'
+  {}
+
+  /** Any totally-ordered set contains a unique minimal (equivalently, least) element. */
+  lemma LemmaFindUniqueMinimal<T(!new)>(R: (T, T) -> bool, s: set<T>) returns (min: T)
+    requires |s| > 0 && TotalOrdering(R)
+    ensures IsMinimal(R, min, s) && (forall min': T | IsMinimal(R, min', s) :: min == min')
+  {
+    var x :| x in s;
+    if s == {x} {
+      min := x;
+    } else {
+      var min' := LemmaFindUniqueMinimal(R, s - {x});
+      if
+      case R(min', x) => min := min';
+      case R(x, min') => min := x;
+    }
+  }
+
+  /** Any totally ordered set contains a unique maximal (equivalently, greatest) element. */
+  lemma LemmaFindUniqueMaximal<T(!new)>(R: (T, T) -> bool, s: set<T>) returns (max: T)
+    requires |s| > 0 && TotalOrdering(R)
+    ensures IsMaximal(R, max, s) && (forall max': T | IsMaximal(R, max', s) :: max == max')
+  {
+    var x :| x in s;
+    if s == {x} {
+      max := x;
+    } else {
+      var max' := LemmaFindUniqueMaximal(R, s - {x});
+      if
+      case R(max', x) => max := x;
+      case R(x, max') => max := max';
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Concurrent/AtomicBox.java b/Source/DafnyStandardLibraries/src/Std/Concurrent/AtomicBox.java
new file mode 100644
index 00000000000..9284a3ec092
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Concurrent/AtomicBox.java
@@ -0,0 +1,26 @@
+package Std.Concurrent;
+
+import dafny.*;
+
+public class AtomicBox<T> {
+
+    private volatile T val;
+
+    public AtomicBox(T t) {
+    }
+
+    public AtomicBox(dafny.TypeDescriptor td) {
+    }
+    public void __ctor(T t) {
+        val = t;
+    }
+
+    public void Put(T t) {
+        val = t;
+    }
+
+    public T Get() {
+        return val;
+    }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/Concurrent/Concurrent.cs b/Source/DafnyStandardLibraries/src/Std/Concurrent/Concurrent.cs
new file mode 100644
index 00000000000..ecd82cb0ab7
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Concurrent/Concurrent.cs
@@ -0,0 +1,99 @@
+namespace Std.Concurrent {
+    using System.Collections.Concurrent;
+    using Std.Wrappers;
+
+    public class MutableMap<K, V> {
+
+        private ConcurrentDictionary<K, V> map;
+
+        public MutableMap() {
+            map = new ConcurrentDictionary<K, V>();
+        }
+
+        public void __ctor(bool bytesKeys) { }
+
+        public Dafny.ISet<K> Keys() {
+            return Dafny.Set<K>.FromCollection(map.Keys);
+        }
+
+        public bool HasKey(K k) {
+            return map.ContainsKey(k);
+        }
+
+        public Dafny.ISet<V> Values() {
+            return Dafny.Set<V>.FromCollection(map.Values);
+        }
+        public Dafny.ISet<_System._ITuple2<K, V>> Items() {
+            System.Collections.Generic.IEnumerable<_System._ITuple2<K, V>> ToEnumerable(System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<K, V>> enumerator) {
+                while (enumerator.MoveNext())
+                    yield return  _System.Tuple2<K, V>.create(enumerator.Current.Key, enumerator.Current.Value);
+            }
+
+            return Dafny.Set<_System._ITuple2<K, V>>.FromCollection(ToEnumerable(map.GetEnumerator()));
+        }
+
+        public void Put(K k, V v) {
+            map.AddOrUpdate(k, v, ((key, oldValue) => v));
+        }
+
+        public _IOption<V> Get(K k) {
+            V v;
+            if (map.TryGetValue(k, out v)) {
+                return Option<V>.create_Some(v);
+            } else {
+                return Option<V>.create_None();
+            }
+        }
+
+        public void Remove(K k) {
+            map.TryRemove(k, out _);
+        }
+
+        public System.Numerics.BigInteger Size() {
+            return new System.Numerics.BigInteger(map.Count);
+        }
+    }
+
+    public class AtomicBox<T> {
+
+        private T val;
+        private Lock l;
+
+        public AtomicBox() {
+            l = new Lock();
+        }
+
+        public void __ctor(T t) {
+          val = t;
+        }
+
+        public void Put(T t) {
+            l.__Lock();
+            val = t;
+            l.Unlock();
+        }
+
+        public T Get() {
+            l.__Lock();
+            var r = val;
+            l.Unlock();
+            return r;
+        }
+    }
+
+    public class Lock {
+
+        private static System.Threading.Mutex mut = new System.Threading.Mutex();
+
+        public void __ctor() {
+        }
+
+        public void __Lock() {
+            mut.WaitOne();
+        }
+
+        public void Unlock() {
+            mut.ReleaseMutex();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/Concurrent/Lock.java b/Source/DafnyStandardLibraries/src/Std/Concurrent/Lock.java
new file mode 100644
index 00000000000..7b35aa7b14c
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Concurrent/Lock.java
@@ -0,0 +1,18 @@
+package Std.Concurrent;
+
+import java.util.concurrent.locks.ReentrantLock;
+
+public class Lock {
+
+    private final ReentrantLock lock = new ReentrantLock();
+
+    public void __ctor() {}
+
+    public void __Lock() {
+        lock.lock();
+    }
+
+    public void Unlock() {
+        lock.unlock();
+    }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/Concurrent/MutableMap.java b/Source/DafnyStandardLibraries/src/Std/Concurrent/MutableMap.java
new file mode 100644
index 00000000000..09219a84f71
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Concurrent/MutableMap.java
@@ -0,0 +1,63 @@
+package Std.Concurrent;
+
+import dafny.*;
+import Std.Wrappers.*;
+
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Map;
+
+public class MutableMap<K, V> {
+
+    private ConcurrentHashMap<K, V> map;
+    private dafny.TypeDescriptor<V> td_V; 
+
+    public MutableMap(dafny.TypeDescriptor<K> td_K, dafny.TypeDescriptor<V> td_V) {
+        this.td_V = td_V;
+        map = new ConcurrentHashMap<K, V>();
+    }
+    public void __ctor(boolean bytesKeys) { }
+
+    public dafny.DafnySet<K> Keys() {
+        return new dafny.DafnySet<K>(Collections.list(map.keys()));
+    }
+
+    public boolean HasKey(K k) {
+        return map.containsKey(k);
+    }
+
+    public dafny.DafnySet<V> Values() {
+        return new dafny.DafnySet<V>(map.values());
+    }
+
+    public dafny.DafnySet<dafny.Tuple2<K, V>> Items() {
+        Set<Map.Entry<K, V>> set = map.entrySet();
+        Set<dafny.Tuple2<K, V>> tupleSet = new HashSet<dafny.Tuple2<K, V>>();
+        set.forEach(e -> tupleSet.add(dafny.Tuple2.create(e.getKey(), e.getValue())));
+        return new dafny.DafnySet<dafny.Tuple2<K, V>>(tupleSet);
+    }
+
+    public void Put(K k, V v) {
+        map.put(k, v);
+    }
+
+    public Std.Wrappers.Option<V> Get(K k) {
+        V v = map.get(k);
+        if (v == null) {
+            return Std.Wrappers.Option.create_None(td_V);
+        } else {
+            return Std.Wrappers.Option.create_Some(td_V, v);
+        }
+    }
+
+    public void Remove(K k) {
+        map.remove(k);
+    }
+
+    public BigInteger Size() {
+        return BigInteger.valueOf(map.size());
+    }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/DynamicArray.dfy b/Source/DafnyStandardLibraries/src/Std/DynamicArray.dfy
new file mode 100644
index 00000000000..cfbf4983dcc
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/DynamicArray.dfy
@@ -0,0 +1,215 @@
+module Std.DynamicArray {
+  import opened BoundedInts
+  import opened Wrappers
+
+  export
+    reveals DynamicArray
+    provides
+      BoundedInts,
+      DynamicArray.items,
+      DynamicArray.capacity,
+      DynamicArray.Repr,
+      DynamicArray.Valid?,
+      DynamicArray.size,
+      DynamicArray.At,
+      DynamicArray.Put,
+      DynamicArray.Push,
+      DynamicArray.PushFast,
+      DynamicArray.PopFast,
+      DynamicArray.Ensure
+
+  /**
+  The `DynamicArray` module and class define a data structure that has the same performance characteristics of an array, 
+  but additionally allows growing and shrinking the size of the array. The cost of shrinking the array is constant time, 
+  while the cost of growing it by a single element is either constant time or linear in the size of the array. 
+  When growing the array multiple times, the amortized cost of growing the array by one element is constant time.
+
+  The downsize of using a DynamicArray is that it occupies up to twice the amount of memory as its size, 
+  and when elements are removed, its occupied memory does not decrease. 
+  */
+  class DynamicArray<A> {
+    ghost var items: seq<A>
+    ghost var Repr: set<object>
+
+    var size: nat
+    var capacity: nat
+    var data: array<A>
+
+    ghost predicate Valid?()
+      reads this, Repr
+    {
+      && Repr == {this, data}
+      && data.Length == capacity as int
+      && size <= capacity
+      && size as int == |items|
+      && items == data[..size]
+    }
+
+    constructor()
+      ensures size == 0
+      ensures items == []
+      ensures fresh(Repr)
+      ensures capacity == 0
+      ensures Valid?()
+    {
+      items := [];
+      size := 0;
+      capacity := 0;
+      data := new A[0];
+      Repr := {this, data};
+    }
+
+    /**
+    Retrieve the element at index 
+     */
+    function At(index: nat) : (element: A)
+      reads this, Repr
+      requires index < size
+      requires Valid?()
+      ensures element == items[index]
+    {
+      data[index]
+    }
+
+    /**
+    Put element in the array at index 
+     */
+    method Put(index: nat, element: A)
+      requires index < size
+      requires Valid?()
+      modifies Repr, `items
+      ensures Valid?()
+      ensures fresh(Repr - old(Repr))
+      ensures size == old(size)
+      ensures items == old(items)[index := element]
+    {
+      data[index] := element;
+      items := items[index := element];
+    }
+
+    /**
+    Ensure that at least a reserved amount of elements can still be pushed onto the array in constant time
+
+    Returns false only if it was not at all possible to provide the ensurance.
+     */
+    method Ensure(reserved: nat, defaultValue: A)
+      requires Valid?()
+      ensures Valid?()
+      modifies Repr
+      ensures size == old(size)
+      ensures items == old(items)
+      ensures fresh(Repr - old(Repr))
+      ensures reserved <= capacity - size
+    {
+      var newCapacity := capacity;
+      while reserved > newCapacity - size
+        invariant newCapacity >= capacity
+      {
+        newCapacity := DefaultNewCapacity(newCapacity);
+      }
+      if (newCapacity > capacity) {
+        Realloc(defaultValue, newCapacity);
+      }
+    }
+
+    /**
+    Pop an element from the array in constant time
+     */
+    method PopFast()
+      requires Valid?()
+      requires size > 0
+      modifies `size, `items
+      ensures Valid?()
+      ensures size < capacity
+      ensures size == old(size) - 1
+      ensures capacity == old(capacity)
+      ensures items == old(items[..|items| - 1])
+    {
+      size := size - 1;
+      items := items[..|items| - 1];
+    }
+
+    /**
+    Push an element onto the array in constant time
+     */
+    method PushFast(element: A)
+      requires Valid?()
+      requires size < capacity
+      modifies Repr
+      ensures Valid?()
+      ensures fresh(Repr - old(Repr))
+      ensures size == old(size) + 1
+      ensures capacity == old(capacity)
+      ensures items == old(items) + [element]
+    {
+      data[size] := element;
+      size := size + 1;
+      items := items + [element];
+    }
+
+    /**
+    Push an element onto the array in constant time if there is available capacity, 
+    and otherwise in time linear to the current size of the array.
+
+    Returns false only if it was not at all possible to push the element onto the array.
+     */
+    method Push(element: A)
+      requires Valid?()
+      modifies Repr
+      ensures Valid?()
+      ensures fresh(Repr - old(Repr))
+      ensures size == old(size) + 1
+      ensures items == old(items) + [element]
+      ensures capacity >= old(capacity)
+    {
+      if size == capacity {
+        ReallocDefault(element);
+      }
+      PushFast(element);
+    }
+
+    method Realloc(defaultValue: A, newCapacity: nat)
+      requires Valid?()
+      requires newCapacity > capacity
+      modifies `capacity, `data, `Repr, data
+      ensures Valid?()
+      ensures capacity == newCapacity
+      ensures fresh(data)
+    {
+      var oldData, oldCapacity := data, capacity;
+      data, capacity := new A[newCapacity](_ => defaultValue), newCapacity;
+      CopyFrom(oldData, oldCapacity);
+      Repr := {this, data};
+    }
+
+    function DefaultNewCapacity(capacity: nat): nat {
+      if capacity == 0 then 8
+      else 2 * capacity
+    }
+
+    method ReallocDefault(defaultValue: A)
+      requires Valid?()
+      modifies `capacity, `data, `Repr, data
+      ensures Valid?()
+      ensures fresh(data)
+      ensures capacity == old(DefaultNewCapacity(capacity))
+
+    {
+      Realloc(defaultValue, DefaultNewCapacity(capacity));
+    }
+
+    method CopyFrom(newData: array<A>, count: nat)
+      requires count as int <= newData.Length
+      requires count <= capacity
+      requires data.Length == capacity as int
+      modifies data
+      ensures data[..count] == newData[..count]
+      ensures data[count..] == old(data[count..])
+    {
+      forall index | 0 <= index < count
+      {
+        data[index] := newData[index];
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/FileIOInternalExterns/FileIO.cs b/Source/DafnyStandardLibraries/src/Std/FileIOInternalExterns/FileIO.cs
new file mode 100644
index 00000000000..1f420d70faa
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/FileIOInternalExterns/FileIO.cs
@@ -0,0 +1,94 @@
+/*******************************************************************************
+*  Copyright by the contributors to the Dafny Project
+*  SPDX-License-Identifier: MIT
+*******************************************************************************/
+
+namespace Std.FileIOInternalExterns {
+  using System;
+  using System.IO;
+
+  using Dafny;
+
+  public class __default {
+    /// <summary>
+    /// Attempts to read all bytes from the file at the given path, and outputs the following values:
+    /// <list>
+    ///   <item>
+    ///     <term>isError</term>
+    ///     <description>
+    ///       true iff an exception was thrown during path string conversion or when reading the file
+    ///     </description>
+    ///   </item>
+    ///   <item>
+    ///     <term>bytesRead</term>
+    ///     <description>
+    ///       the sequence of bytes read from the file, or an empty sequence if <c>isError</c> is true
+    ///     </description>
+    ///   </item>
+    ///   <item>
+    ///     <term>errorMsg</term>
+    ///     <description>
+    ///       the error message of the thrown exception if <c>isError</c> is true, or an empty sequence otherwise
+    ///     </description>
+    ///   </item>
+    /// </list>
+    ///
+    /// We output these values individually because Result is not defined in the runtime but instead in library code.
+    /// It is the responsibility of library code to construct an equivalent Result value.
+    /// </summary>
+    public static void INTERNAL__ReadBytesFromFile(ISequence<Dafny.Rune> path, out bool isError, out ISequence<byte> bytesRead,
+      out ISequence<Dafny.Rune> errorMsg) {
+      isError = true;
+      bytesRead = Sequence<byte>.Empty;
+      errorMsg = Sequence<Rune>.Empty;
+      try {
+        bytesRead = Helpers.SeqFromArray(File.ReadAllBytes(path?.ToVerbatimString(false)));
+        isError = false;
+      } catch (Exception e) {
+        errorMsg = Sequence<Rune>.UnicodeFromString(e.ToString());
+      }
+    }
+
+    /// <summary>
+    /// Attempts to write all given bytes to the file at the given path, creating nonexistent parent directories as necessary,
+    /// and outputs the following values:
+    /// <list>
+    ///   <item>
+    ///     <term>isError</term>
+    ///     <description>
+    ///       true iff an exception was thrown during path string conversion or when writing to the file
+    ///     </description>
+    ///   </item>
+    ///   <item>
+    ///     <term>errorMsg</term>
+    ///     <description>
+    ///       the error message of the thrown exception if <c>isError</c> is true, or an empty sequence otherwise
+    ///     </description>
+    ///   </item>
+    /// </list>
+    ///
+    /// We output these values individually because Result is not defined in the runtime but instead in library code.
+    /// It is the responsibility of library code to construct an equivalent Result value.
+    /// </summary>
+    public static void INTERNAL__WriteBytesToFile(ISequence<Dafny.Rune> path, ISequence<byte> bytes, out bool isError, out ISequence<Dafny.Rune> errorMsg) {
+      isError = true;
+      errorMsg = Sequence<Rune>.Empty;
+      try {
+        string pathStr = path?.ToVerbatimString(false);
+        CreateParentDirs(pathStr);
+        File.WriteAllBytes(pathStr, bytes.CloneAsArray());
+        isError = false;
+      } catch (Exception e) {
+        errorMsg = Sequence<Rune>.UnicodeFromString(e.ToString());
+      }
+    }
+
+    /// <summary>
+    /// Creates the nonexistent parent directory(-ies) of the given path.
+    /// </summary>
+    private static void CreateParentDirs(string path) {
+      string parentDir = Path.GetDirectoryName(Path.GetFullPath(path));
+      Directory.CreateDirectory(parentDir);
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/FileIOInternalExterns/FileIO.js b/Source/DafnyStandardLibraries/src/Std/FileIOInternalExterns/FileIO.js
new file mode 100644
index 00000000000..188e5e0f701
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/FileIOInternalExterns/FileIO.js
@@ -0,0 +1,71 @@
+/*******************************************************************************
+*  Copyright by the contributors to the Dafny Project
+*  SPDX-License-Identifier: MIT
+*******************************************************************************/
+
+var Std_Concurrent = Std_Concurrent || {};
+var Std_FileIOInternalExterns = Std_FileIOInternalExterns || {};
+Std_FileIOInternalExterns.__default = (function() {
+  const buffer = require("buffer");
+  const fs = require("fs");
+  const nodePath = require("path");
+
+  let $module = {};
+
+  /**
+   * Attempts to read all bytes from the file at the given `path`, and returns an array of the following values:
+   *
+   *   - `isError`: true iff an error was thrown during path string conversion or when reading the file
+   *   - `bytesRead`: the sequence of bytes from the file, or an empty sequence if `isError` is true
+   *   - `errorMsg`: the error message of the thrown error if `isError` is true, or an empty sequence otherwise
+   *
+   * We return these values individually because `Result` is not defined in the runtime but instead in library code.
+   * It is the responsibility of library code to construct an equivalent `Result` value.
+   */
+  $module.INTERNAL__ReadBytesFromFile = function(path) {
+    const emptySeq = _dafny.Seq.of();
+    try {
+      const readOpts = { encoding: null };  // read as buffer, not string
+      const pathStr = path.toVerbatimString(false)
+      const buf = fs.readFileSync(pathStr, readOpts);
+      const readBytes = _dafny.Seq.from(buf.valueOf(), byte => new BigNumber(byte));
+      return [false, readBytes, emptySeq];
+    } catch (e) {
+      const errorMsg = _dafny.Seq.UnicodeFromString(e.stack);
+      return [true, emptySeq, errorMsg];
+    }
+  }
+
+  /**
+   * Attempts to write all given `bytes` to the file at the given `path`, creating nonexistent parent directories as necessary,
+   * and returns an array of the following values:
+   *
+   *   - `isError`: true iff an error was thrown during path string conversion or when writing to the file
+   *   - `errorMsg`: the error message of the thrown error if `isError` is true, or an empty sequence otherwise
+   *
+   * We return these values individually because `Result` is not defined in the runtime but instead in library code.
+   * It is the responsibility of library code to construct an equivalent `Result` value.
+   */
+  $module.INTERNAL__WriteBytesToFile = function(path, bytes) {
+    try {
+      const buf = buffer.Buffer.from(bytes);
+      const pathStr = path.toVerbatimString(false)
+      createParentDirs(pathStr);
+      fs.writeFileSync(pathStr, buf);  // no need to specify encoding because data is a Buffer
+      return [false, _dafny.Seq.of()];
+    } catch (e) {
+      const errorMsg = _dafny.Seq.from(e.stack);
+      return [true, errorMsg];
+    }
+  }
+
+  /**
+   * Creates the nonexistent parent directory(-ies) of the given path.
+   */
+  const createParentDirs = function(path) {
+    const parentDir = nodePath.dirname(nodePath.normalize(path));
+    fs.mkdirSync(parentDir, { recursive: true });
+  };
+
+  return $module;
+})();
diff --git a/Source/DafnyStandardLibraries/src/Std/FileIOInternalExterns/__default.java b/Source/DafnyStandardLibraries/src/Std/FileIOInternalExterns/__default.java
new file mode 100644
index 00000000000..00d5acf12fc
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/FileIOInternalExterns/__default.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+*  Copyright by the contributors to the Dafny Project
+*  SPDX-License-Identifier: MIT
+*******************************************************************************/
+
+package Std.FileIOInternalExterns;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import dafny.CodePoint;
+import dafny.DafnySequence;
+import dafny.Tuple2;
+import dafny.Tuple3;
+import dafny.TypeDescriptor;
+
+public class __default {
+    /**
+     * Attempts to read all bytes from the file at {@code path}, and returns a tuple of the following values:
+     * <dl>
+     *     <dt>{@code isError}</dt>
+     *     <dd>true iff an exception was thrown during path string conversion or when reading the file</dd>
+     *     <dt>{@code bytesRead}</dt>
+     *     <dd>the sequence of bytes read from the file, or an empty sequence if {@code isError} is true</dd>
+     *     <dt>{@code errorMsg}</dt>
+     *     <dd>the error message of the thrown exception if {@code isError} is true, or an empty sequence otherwise</dd>
+     * </dl>
+     * <p>
+     * We return these values individually because {@code Result} is not defined in the runtime but instead in library code.
+     * It is the responsibility of library code to construct an equivalent {@code Result} value.
+     */
+    public static Tuple3<Boolean, DafnySequence<? extends Byte>, DafnySequence<? extends CodePoint>>
+        INTERNAL__ReadBytesFromFile(DafnySequence<? extends CodePoint> path) {
+        try {
+            final Path pathObj = dafnyStringToPath(path);
+            final DafnySequence<Byte> readBytes = DafnySequence.fromBytes(Files.readAllBytes(pathObj));
+            return Tuple3.create(false, readBytes, DafnySequence.empty(TypeDescriptor.UNICODE_CHAR));
+        } catch (Exception ex) {
+            return Tuple3.create(true, DafnySequence.empty(TypeDescriptor.BYTE), stackTraceToDafnyString(ex));
+        }
+    }
+
+    /**
+     * Attempts to write {@code bytes} to the file at {@code path}, creating nonexistent parent directories as necessary,
+     * and returns a tuple of the following values:
+     * <dl>
+     *     <dt>{@code isError}</dt>
+     *     <dd>true iff an exception was thrown during path string conversion or when writing to the file</dd>
+     *     <dt>{@code errorMsg}</dt>
+     *     <dd>the error message of the thrown exception if {@code isError} is true, or an empty sequence otherwise</dd>
+     * </dl>
+     * <p>
+     * We return these values individually because {@code Result} is not defined in the runtime but instead in library code.
+     * It is the responsibility of library code to construct an equivalent {@code Result} value.
+     */
+    public static Tuple2<Boolean, DafnySequence<? extends CodePoint>>
+        INTERNAL__WriteBytesToFile(DafnySequence<? extends CodePoint> path, DafnySequence<? extends Byte> bytes) {
+        try {
+            final Path pathObj = dafnyStringToPath(path);
+            createParentDirs(pathObj);
+
+            // It's safe to cast `bytes` to `DafnySequence<Byte>` since the cast value is immediately consumed
+            @SuppressWarnings("unchecked")
+            final byte[] byteArr = DafnySequence.toByteArray((DafnySequence<Byte>) bytes);
+
+            Files.write(pathObj, byteArr);
+            return Tuple2.create(false, DafnySequence.empty(TypeDescriptor.UNICODE_CHAR));
+        } catch (Exception ex) {
+            return Tuple2.create(true, stackTraceToDafnyString(ex));
+        }
+    }
+
+    /**
+     * Returns a Path constructed from the given Dafny string.
+     */
+    private static final Path dafnyStringToPath(final DafnySequence<? extends CodePoint> path) {
+        return Paths.get(path.verbatimString());
+    }
+
+    /**
+     * Creates the nonexistent parent directory(-ies) of the given path.
+     */
+    private static final void createParentDirs(final Path path) throws IOException {
+        final Path parentDir = path.toAbsolutePath().getParent();
+        if (parentDir == null) {
+            return;
+        }
+        Files.createDirectories(parentDir);
+    }
+
+    private static final DafnySequence<CodePoint> stackTraceToDafnyString(final Throwable t) {
+        final StringWriter stringWriter = new StringWriter();
+        final PrintWriter printWriter = new PrintWriter(stringWriter);
+        t.printStackTrace(printWriter);
+        final String str = stringWriter.toString();
+        return DafnySequence.asUnicodeString(str);
+    }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Functions.dfy b/Source/DafnyStandardLibraries/src/Std/Functions.dfy
new file mode 100644
index 00000000000..ca81854d327
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Functions.dfy
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+/**
+A collection of predicates that establish whether commonly known properties on functions, 
+such as injectivity and commutativity, hold.
+These properties can only be applied to functions on value types.
+*/
+module Std.Functions {
+
+  ghost predicate Injective<X(!new), Y>(f: X --> Y)
+    reads f.reads
+    requires forall x :: f.requires(x)
+  {
+    forall x1, x2 :: f(x1) == f(x2) ==> x1 == x2
+  }
+
+  ghost predicate Commutative<T(!new), U(!new)>(f: (T,T) -> U)
+    reads f.reads
+    requires forall x,y :: f.requires(x,y) && f.requires(y,x)
+  {
+    forall x,y :: f(x,y) == f(y,x)
+  }
+
+  ghost predicate Associative<T(!new)>(f: (T,T) -> T)
+    reads f.reads
+    requires forall x, y, z :: f.requires(x,y) && f.requires(y,z) && f.requires(x,z)
+  {
+    forall x, y, z: T :: f(x,f(y,z)) == f(f(x,y),z)
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/Functions.md b/Source/DafnyStandardLibraries/src/Std/Functions.md
new file mode 100644
index 00000000000..d5c90ef8c9e
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Functions.md
@@ -0,0 +1,3 @@
+# The `Functions` module
+
+The `Functions` module defines properties on functions.
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/API.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/API.dfy
new file mode 100644
index 00000000000..d16a54bcb73
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/API.dfy
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ The high-level API of the JSON library. This version is built on top of the low-level (zero-copy) API.
+ This API is more convenient to use, but it is unverified and less efficient. It produces abstract datatype 
+ value trees that represent strings using Dafny's built-in `string` type.
+ */
+module Std.JSON.API {
+  import Values
+  import Serializer
+  import Deserializer
+  import ZeroCopy = ZeroCopy.API
+  import opened BoundedInts
+  import opened Errors
+
+  /* Serialization (JSON values to utf-8 bytes) */
+  function Serialize(js: Values.JSON) : (bs: SerializationResult<seq<byte>>) {
+    var js :- Serializer.JSON(js);
+    ZeroCopy.Serialize(js)
+  }
+
+  method SerializeAlloc(js: Values.JSON) returns (bs: SerializationResult<array<byte>>) {
+    var js :- Serializer.JSON(js);
+    bs := ZeroCopy.SerializeAlloc(js);
+  }
+
+  method SerializeInto(js: Values.JSON, bs: array<byte>) returns (len: SerializationResult<uint32>)
+    modifies bs
+  {
+    var js :- Serializer.JSON(js);
+    len := ZeroCopy.SerializeInto(js, bs);
+  }
+
+  /* Deserialization (utf-8 bytes to JSON values) */
+  function Deserialize(bs: seq<byte>) : (js: DeserializationResult<Values.JSON>) {
+    var js :- ZeroCopy.Deserialize(bs);
+    Deserializer.JSON(js)
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/ByteStrConversion.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/ByteStrConversion.dfy
new file mode 100644
index 00000000000..887a17e737e
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/ByteStrConversion.dfy
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Derives conversions to and from sequences of bytes.
+ */
+@DisableNonlinearArithmetic
+module Std.JSON.ByteStrConversion refines Strings.ParametricConversion {
+  import opened BoundedInts
+
+  type Char = byte
+
+  const chars := [
+    '0' as byte, '1' as byte, '2' as byte, '3' as byte,
+    '4' as byte, '5' as byte, '6' as byte, '7' as byte,
+    '8' as byte, '9' as byte
+  ]
+
+  const charToDigit := map[
+                         '0' as byte := 0, '1' as byte := 1, '2' as byte := 2, '3' as byte := 3,
+                         '4' as byte := 4, '5' as byte := 5, '6' as byte := 6, '7' as byte := 7,
+                         '8' as byte := 8, '9' as byte := 9
+                       ]
+
+  lemma CharsConsistent()
+    ensures forall c <- chars :: c in charToDigit && chars[charToDigit[c]] == c
+  {}
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/ConcreteSyntax.Spec.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/ConcreteSyntax.Spec.dfy
new file mode 100644
index 00000000000..0de442eadd9
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/ConcreteSyntax.Spec.dfy
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Defines a low-level specification of a JSON serializer.
+ */
+module Std.JSON.ConcreteSyntax.Spec {
+  import Vs = Utils.Views.Core
+  import opened BoundedInts
+  import opened Grammar
+
+  function View(v: Vs.View) : bytes {
+    v.Bytes()
+  }
+
+  function Structural<T>(self: Structural<T>, fT: T -> bytes): bytes {
+    View(self.before) + fT(self.t) + View(self.after)
+  }
+
+  function StructuralView(self: Structural<Vs.View>): bytes {
+    Structural<Vs.View>(self, View)
+  }
+
+  function Maybe<T>(self: Maybe<T>, fT: T -> bytes): (bs: bytes)
+    ensures self.Empty? ==> bs == []
+    ensures self.NonEmpty? ==> bs == fT(self.t)
+  {
+    if self.Empty? then [] else fT(self.t)
+  }
+
+  function ConcatBytes<T>(ts: seq<T>, fT: T --> bytes) : (b: bytes)
+    requires forall d | d in ts :: fT.requires(d)
+    ensures |ts| == 1 ==> b == fT(ts[0])
+  {
+    if |ts| == 0 then []
+    else fT(ts[0]) + ConcatBytes(ts[1..], fT)
+  }
+
+  function Bracketed<D, S>(self: Bracketed<Vs.View, D, S, Vs.View>, fDatum: Suffixed<D, S> --> bytes): bytes
+    requires forall d | d < self :: fDatum.requires(d)
+  {
+    StructuralView(self.l) +
+    ConcatBytes(self.data, fDatum) +
+    StructuralView(self.r)
+  }
+
+  function KeyValue(self: jKeyValue): bytes {
+    String(self.k) + StructuralView(self.colon) + Value(self.v)
+  }
+
+  function Frac(self: jfrac): bytes {
+    View(self.period) + View(self.num)
+  }
+
+  function Exp(self: jexp): bytes {
+    View(self.e) + View(self.sign) + View(self.num)
+  }
+
+  function Number(self: jnumber): bytes {
+    View(self.minus) + View(self.num) + Maybe(self.frac, Frac) + Maybe(self.exp, Exp)
+  }
+
+  function String(self: jstring): bytes {
+    View(self.lq) + View(self.contents) + View(self.rq)
+  }
+
+  function CommaSuffix(c: Maybe<Structural<jcomma>>): bytes {
+    // BUG(https://github.com/dafny-lang/dafny/issues/2179)
+    Maybe<Structural<Vs.View>>(c, StructuralView)
+  }
+
+  function Member(self: jmember) : bytes {
+    KeyValue(self.t) + CommaSuffix(self.suffix)
+  }
+
+  function Item(self: jitem) : bytes {
+    Value(self.t) + CommaSuffix(self.suffix)
+  }
+
+  function Object(obj: jobject) : bytes {
+    Bracketed(obj, (d: jmember) requires d < obj => Member(d))
+  }
+
+  function Array(arr: jarray) : bytes {
+    Bracketed(arr, (d: jitem) requires d < arr => Item(d))
+  }
+
+  function Value(self: Value) : (b: bytes)
+    ensures self.String? ==> b == String(self.str)
+    ensures self.Number? ==> b == Number(self.num)
+    ensures self.Object? ==> b == Object(self.obj)
+    ensures self.Array? ==> b == Array(self.arr)
+  {
+    match self {
+      case Null(n) => View(n)
+      case Bool(b) => View(b)
+      case String(str) => String(str)
+      case Number(num) => Number(num)
+      case Object(obj) => Object(obj)
+      case Array(arr) => Array(arr)
+    }
+  }
+
+  lemma UnfoldValueNumber(v: Value)
+    requires v.Number?
+    ensures Value(v) == Number(v.num)
+  {
+    assert Value(v) == match v { case Number(num) => Number(num) case _ => []};
+  }
+
+  lemma UnfoldValueObject(v: Value)
+    requires v.Object?
+    ensures Value(v) == Object(v.obj)
+  {
+    assert Value(v) == match v { case Object(obj) => Object(obj) case _ => []};
+  }
+
+  lemma UnfoldValueArray(v: Value)
+    requires v.Array?
+    ensures Value(v) == Array(v.arr)
+  {
+    assert Value(v) == match v { case Array(arr) => Array(arr) case _ => []};
+  }
+
+  function JSON(js: JSON) : bytes {
+    Structural(js, Value)
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/ConcreteSyntax.SpecProperties.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/ConcreteSyntax.SpecProperties.dfy
new file mode 100644
index 00000000000..5d287ccd390
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/ConcreteSyntax.SpecProperties.dfy
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Defines a simple functional specification of a JSON serializer.
+ */
+module Std.JSON.ConcreteSyntax.SpecProperties {
+  import Spec
+  import Vs = Utils.Views.Core
+  import opened BoundedInts
+  import opened Grammar
+
+  ghost predicate Bracketed_Morphism_Requires<D, S>(bracketed: Bracketed<Vs.View, D, S, Vs.View>, pd0: Suffixed<D, S> --> bytes, pd1: Suffixed<D, S> --> bytes) {
+    && (forall d | d < bracketed :: pd0.requires(d))
+    && (forall d | d < bracketed :: pd1.requires(d))
+    && (forall d | d < bracketed :: pd0(d) == pd1(d))
+  }
+
+  lemma Bracketed_Morphism<D, S>(bracketed: Bracketed<Vs.View, D, S, Vs.View>, pd0: Suffixed<D, S> --> bytes, pd1: Suffixed<D, S> --> bytes)
+    requires Bracketed_Morphism_Requires(bracketed, pd0, pd1)
+    ensures Spec.Bracketed(bracketed, pd0) == Spec.Bracketed(bracketed, pd1)
+  {
+    calc {
+      Spec.Bracketed(bracketed, pd0);
+      { ConcatBytes_Morphism(bracketed.data, pd0, pd1); }
+      Spec.Bracketed(bracketed, pd1);
+    }
+  }
+
+  lemma {:induction ts} ConcatBytes_Morphism<T>(ts: seq<T>, pt0: T --> bytes, pt1: T --> bytes)
+    requires forall d | d in ts :: pt0.requires(d)
+    requires forall d | d in ts :: pt1.requires(d)
+    requires forall d | d in ts :: pt0(d) == pt1(d)
+    ensures Spec.ConcatBytes(ts, pt0) == Spec.ConcatBytes(ts, pt1)
+  {}
+
+  @ResourceLimit("10e6")
+  lemma {:induction ts0} ConcatBytes_Linear<T>(ts0: seq<T>, ts1: seq<T>, pt: T --> bytes)
+    requires forall d | d in ts0 :: pt.requires(d)
+    requires forall d | d in ts1 :: pt.requires(d)
+    ensures Spec.ConcatBytes(ts0 + ts1, pt) == Spec.ConcatBytes(ts0, pt) + Spec.ConcatBytes(ts1, pt)
+  {
+    if |ts0| == 0 {
+      assert [] + ts1 == ts1;
+    } else {
+      assert ts0 + ts1 == [ts0[0]] + (ts0[1..] + ts1);
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Deserializer.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Deserializer.dfy
new file mode 100644
index 00000000000..af5ee5d77ba
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Deserializer.dfy
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Implements high-level deserialization (utf-8 bytes to JSON values).
+ */
+module Std.JSON.Deserializer {
+  import Values
+  import Spec
+  import ByteStrConversion
+  import opened Collections.Seq
+  import opened Wrappers
+  import opened BoundedInts
+  import opened Arithmetic.Logarithm
+  import opened Arithmetic.Power
+  import opened Strings
+  import opened Unicode.UnicodeStringsWithUnicodeChar
+  import opened Errors
+  import opened DynamicArray
+  import opened Grammar
+  import opened Utils.Views.Core
+
+  function Bool(js: Grammar.jbool): bool {
+    assert js.Bytes() in {Grammar.TRUE, Grammar.FALSE};
+    js.At(0) == 't' as byte
+  }
+
+  function UnsupportedEscape16(code: seq<uint16>): DeserializationError {
+    UnsupportedEscape(FromUTF16Checked(code).GetOr("Couldn't decode UTF-16"))
+  }
+
+  @DisableNonlinearArithmetic
+  module Uint16StrConversion refines Strings.ParametricConversion {
+    import opened BoundedInts
+
+    type Char = uint16
+
+    const chars := [
+      '0' as uint16, '1' as uint16, '2' as uint16, '3' as uint16, '4' as uint16,
+      '5' as uint16, '6' as uint16, '7' as uint16, '8' as uint16, '9' as uint16,
+      'a' as uint16, 'b' as uint16, 'c' as uint16, 'd' as uint16, 'e' as uint16, 'f' as uint16,
+      'A' as uint16, 'B' as uint16, 'C' as uint16, 'D' as uint16, 'E' as uint16, 'F' as uint16
+    ]
+
+    const charToDigit :=
+      map[
+        '0' as uint16 := 0, '1' as uint16 := 1, '2' as uint16 := 2, '3' as uint16 := 3, '4' as uint16 := 4,
+        '5' as uint16 := 5, '6' as uint16 := 6, '7' as uint16 := 7, '8' as uint16 := 8, '9' as uint16 := 9,
+        'a' as uint16 := 0xA, 'b' as uint16 := 0xB, 'c' as uint16 := 0xC, 'd' as uint16 := 0xD, 'e' as uint16 := 0xE, 'f' as uint16 := 0xF,
+        'A' as uint16 := 0xA, 'B' as uint16 := 0xB, 'C' as uint16 := 0xC, 'D' as uint16 := 0xD, 'E' as uint16 := 0xE, 'F' as uint16 := 0xF
+      ]
+
+    // The size of the map makes this impractical to verify easily.
+    @Axiom
+    lemma CharsConsistent()
+      ensures forall c <- chars :: c in charToDigit && chars[charToDigit[c]] == c
+  }
+
+  const HEX_TABLE_16 := Uint16StrConversion.charToDigit
+
+  function ToNat16(str: Uint16StrConversion.String): uint16
+    requires |str| <= 4
+    requires forall c | c in str :: c in HEX_TABLE_16
+  {
+    assume {:axiom} false; // BUG Verification inconclusive
+    Uint16StrConversion.ToNatBound(str);
+    var hd := Uint16StrConversion.ToNat(str);
+    assert hd < 0x1_0000;
+    hd as uint16
+  }
+
+  @TailRecursion
+  @IsolateAssertions
+  function Unescape(str: seq<uint16>, start: nat := 0, prefix: seq<uint16> := []): DeserializationResult<seq<uint16>>
+    decreases |str| - start
+  { // Assumes UTF-16 strings
+    if start >= |str| then Success(prefix)
+    else if str[start] == '\\' as uint16 then
+      if |str| == start + 1 then
+        Failure(EscapeAtEOS)
+      else
+        var c := str[start + 1];
+        if c == 'u' as uint16 then
+          if |str| <= start + 6 then
+            Failure(EscapeAtEOS)
+          else
+            var code := str[start + 2..start + 6];
+            if exists c | c in code :: c !in HEX_TABLE_16 then
+              Failure(UnsupportedEscape16(code))
+            else
+              var hd := ToNat16(code);
+              Unescape(str, start + 6, prefix + [hd])
+        else
+          var unescaped: uint16 := match c
+            case 0x22 => 0x22 as uint16 // \" => quotation mark
+            case 0x5C => 0x5C as uint16 // \\ => reverse solidus
+            case 0x62 => 0x08 as uint16 // \b => backspace
+            case 0x66 => 0x0C as uint16 // \f => form feed
+            case 0x6E => 0x0A as uint16 // \n => line feed
+            case 0x72 => 0x0D as uint16 // \r => carriage return
+            case 0x74 => 0x09 as uint16 // \t => tab
+            case _    => 0 as uint16;
+          if unescaped as int == 0 then
+            Failure(UnsupportedEscape16(str[start..start+2]))
+          else
+            Unescape(str, start + 2, prefix + [unescaped])
+    else
+      Unescape(str, start + 1, prefix + [str[start]])
+  }
+
+  function String(js: Grammar.jstring): DeserializationResult<string> {
+    var asUtf32 :- FromUTF8Checked(js.contents.Bytes()).ToResult(DeserializationError.InvalidUnicode);
+    var asUint16 :- ToUTF16Checked(asUtf32).ToResult(DeserializationError.InvalidUnicode);
+    var unescaped :- Unescape(asUint16);
+    FromUTF16Checked(unescaped).ToResult(DeserializationError.InvalidUnicode)
+  }
+
+  const DIGITS := ByteStrConversion.charToDigit
+
+  const MINUS := '-' as uint8
+
+  function ToInt(sign: jsign, n: jnum): DeserializationResult<int> {
+    var n: int := ByteStrConversion.ToNat(n.Bytes());
+    Success(if sign.Char?('-') then -n else n)
+  }
+
+  function Number(js: Grammar.jnumber): DeserializationResult<Values.Decimal> {
+    var JNumber(minus, num, frac, exp) := js;
+    var n :-
+      ToInt(minus, num);
+    var e10 :- match exp
+      case Empty => Success(0)
+      case NonEmpty(JExp(_, sign, num)) => ToInt(sign, num);
+    match frac
+    case Empty => Success(Values.Decimal(n, e10))
+    case NonEmpty(JFrac(_, num)) =>
+      var pow10 := num.Length() as int;
+      var frac :- ToInt(minus, num);
+      Success(Values.Decimal(n * Pow(10, pow10) + frac, e10 - pow10))
+  }
+
+  function KeyValue(js: Grammar.jKeyValue): DeserializationResult<(string, Values.JSON)> {
+    var k :- String(js.k);
+    var v :- Value(js.v);
+    Success((k, v))
+  }
+
+  function Object(js: Grammar.jobject): DeserializationResult<seq<(string, Values.JSON)>> {
+    Seq.MapWithResult(d requires d in js.data => KeyValue(d.t), js.data)
+  }
+
+  function Array(js: Grammar.jarray): DeserializationResult<seq<Values.JSON>> {
+    Seq.MapWithResult(d requires d in js.data => Value(d.t), js.data)
+  }
+
+  function Value(js: Grammar.Value): DeserializationResult<Values.JSON> {
+    match js
+    case Null(_) => Success(Values.Null())
+    case Bool(b) => Success(Values.Bool(Bool(b)))
+    case String(str) => var s :- String(str); Success(Values.String(s))
+    case Number(dec) => var n :- Number(dec); Success(Values.Number(n))
+    case Object(obj) => var o :- Object(obj); Success(Values.Object(o))
+    case Array(arr) => var a :- Array(arr); Success(Values.Array(a))
+  }
+
+  function JSON(js: Grammar.JSON): DeserializationResult<Values.JSON> {
+    Value(js.t)
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Errors.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Errors.dfy
new file mode 100644
index 00000000000..c19121d4da3
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Errors.dfy
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Defines different types of errors that can occur during serialization and deserialization.
+ */
+module Std.JSON.Errors {
+  import Wrappers
+  import Strings
+  import opened BoundedInts
+
+  datatype DeserializationError =
+    | UnterminatedSequence
+    | UnsupportedEscape(str: string)
+    | EscapeAtEOS
+    | EmptyNumber
+    | ExpectingEOF
+    | IntOverflow
+    | ReachedEOF
+    | ExpectingByte(expected: byte, b: opt_byte)
+    | ExpectingAnyByte(expected_sq: seq<byte>, b: opt_byte)
+    | InvalidUnicode
+  {
+    function ToString() : string {
+      match this
+      case UnterminatedSequence => "Unterminated sequence"
+      case UnsupportedEscape(str) => "Unsupported escape sequence: " + str
+      case EscapeAtEOS => "Escape character at end of string"
+      case EmptyNumber => "Number must contain at least one digit"
+      case ExpectingEOF => "Expecting EOF"
+      case IntOverflow => "Input length does not fit in a 32-bit counter"
+      case ReachedEOF => "Reached EOF"
+      case ExpectingByte(b0, b) =>
+        var c := if b > 0 then "'" + [b as char] + "'" else "EOF";
+        "Expecting '" + [b0 as char] + "', read " + c
+      case ExpectingAnyByte(bs0, b) =>
+        var c := if b > 0 then "'" + [b as char] + "'" else "EOF";
+        var c0s := seq(|bs0|, idx requires 0 <= idx < |bs0| => bs0[idx] as char);
+        "Expecting one of '" + c0s + "', read " + c
+      case InvalidUnicode => "Invalid Unicode sequence"
+    }
+  }
+
+  datatype SerializationError =
+    | OutOfMemory
+    | IntTooLarge(i: int)
+    | StringTooLong(s: string)
+    | InvalidUnicode
+  {
+    function ToString() : string {
+      match this
+      case OutOfMemory => "Out of memory"
+      case IntTooLarge(i: int) => "Integer too large: " + Strings.OfInt(i)
+      case StringTooLong(s: string) => "String too long: " + s
+      case InvalidUnicode => "Invalid Unicode sequence"
+    }
+  }
+
+  type SerializationResult<+T> = Wrappers.Result<T, SerializationError>
+  type DeserializationResult<+T> = Wrappers.Result<T, DeserializationError>
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Grammar.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Grammar.dfy
new file mode 100644
index 00000000000..f99ee3c695c
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Grammar.dfy
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Defines concrete syntax trees that capture details of punctuation and blanks and represent.
+ */
+module Std.JSON.Grammar {
+  import opened BoundedInts
+  import opened Utils.Views.Core
+
+  const EMPTY := View.OfBytes([])
+  const DOUBLEQUOTE := View.OfBytes(['\"' as byte])
+  const PERIOD := View.OfBytes(['.' as byte])
+  const E := View.OfBytes(['e' as byte])
+  const COLON := View.OfBytes([':' as byte])
+  const COMMA := View.OfBytes([',' as byte])
+  const LBRACE := View.OfBytes(['{' as byte])
+  const RBRACE := View.OfBytes(['}' as byte])
+  const LBRACKET := View.OfBytes(['[' as byte])
+  const RBRACKET := View.OfBytes([']' as byte])
+  const MINUS := View.OfBytes(['-' as byte])
+
+  type jchar = v: View | v.Length() == 1 witness View.OfBytes(['b' as byte])
+  type jquote = v: View | v.Char?('\"') witness DOUBLEQUOTE
+  type jperiod = v: View | v.Char?('.') witness PERIOD
+  type je = v: View | v.Char?('e') || v.Char?('E') witness E
+  type jcolon = v: View | v.Char?(':') witness COLON
+  type jcomma = v: View | v.Char?(',') witness COMMA
+  type jlbrace = v: View | v.Char?('{') witness LBRACE
+  type jrbrace = v: View | v.Char?('}') witness RBRACE
+  type jlbracket = v: View | v.Char?('[') witness LBRACKET
+  type jrbracket = v: View | v.Char?(']') witness RBRACKET
+  type jminus = v: View | v.Char?('-') || v.Empty? witness MINUS
+  type jsign = v: View | v.Char?('-') || v.Char?('+') || v.Empty? witness EMPTY
+
+  predicate Blank?(b: byte) { b == 0x20 || b == 0x09 || b == 0x0A || b == 0x0D }
+  ghost predicate Blanks?(v: View) { forall b | b in v.Bytes() :: Blank?(b) }
+  type jblanks = v: View | Blanks?(v) witness View.OfBytes([])
+
+  datatype Structural<+T> =
+    Structural(before: jblanks, t: T, after: jblanks)
+
+  datatype Maybe<+T> = Empty() | NonEmpty(t: T)
+
+  datatype Suffixed<+T, +S> =
+    Suffixed(t: T, suffix: Maybe<Structural<S>>)
+
+  type SuffixedSequence<+D, +S> = s: seq<Suffixed<D, S>> | NoTrailingSuffix(s)
+  ghost predicate NoTrailingSuffix<S, D>(s: seq<Suffixed<D, S>>) {
+    forall idx | 0 <= idx < |s| :: s[idx].suffix.Empty? <==> idx == |s| - 1
+  }
+
+  datatype Bracketed<+L, +D, +S, +R> =
+    Bracketed(l: Structural<L>, data: SuffixedSequence<D, S>, r: Structural<R>)
+
+  const NULL: bytes := ['n' as byte, 'u' as byte, 'l' as byte, 'l' as byte]
+  const TRUE: bytes := ['t' as byte, 'r' as byte, 'u' as byte, 'e' as byte]
+  const FALSE: bytes := ['f' as byte, 'a' as byte, 'l' as byte, 's' as byte, 'e' as byte]
+
+  ghost predicate Null?(v: View) { v.Bytes() == NULL }
+  ghost predicate Bool?(v: View) { v.Bytes() in {TRUE, FALSE} }
+  predicate Digit?(b: byte) { '0' as byte <= b <= '9' as byte }
+  ghost predicate Digits?(v: View) { forall b | b in v.Bytes() :: Digit?(b) }
+  ghost predicate Num?(v: View) { Digits?(v) && !v.Empty? }
+  ghost predicate Int?(v: View) { v.Char?('0') || (Num?(v) && v.At(0) != '0' as byte) }
+
+  type jnull = v: View | Null?(v) witness View.OfBytes(NULL)
+  type jbool = v: View | Bool?(v) witness View.OfBytes(TRUE)
+  type jdigits = v: View | Digits?(v) witness View.OfBytes([])
+  type jnum = v: View | Num?(v) witness View.OfBytes(['0' as byte])
+  type jint = v: View | Int?(v) witness View.OfBytes(['0' as byte])
+  type jstr = v: View | true witness View.OfBytes([]) // TODO: Enforce quoting and escaping
+  datatype jstring = JString(lq: jquote, contents: jstr, rq: jquote)
+  datatype jKeyValue = KeyValue(k: jstring, colon: Structural<jcolon>, v: Value)
+
+  // TODO enforce no leading space before closing bracket to disambiguate WS { WS WS } WS
+  type jobject = Bracketed<jlbrace, jKeyValue, jcomma, jrbrace>
+  type jarray = Bracketed<jlbracket, Value, jcomma, jrbracket>
+  type jmembers = SuffixedSequence<jKeyValue, jcomma>
+  type jmember = Suffixed<jKeyValue, jcomma>
+  type jitems = SuffixedSequence<Value, jcomma>
+  type jitem = Suffixed<Value, jcomma>
+
+  datatype jfrac = JFrac(period: jperiod, num: jnum)
+  datatype jexp = JExp(e: je, sign: jsign, num: jnum)
+  datatype jnumber = JNumber(minus: jminus, num: jnum, frac: Maybe<jfrac>, exp: Maybe<jexp>)
+
+  datatype Value =
+    | Null(n: jnull)
+    | Bool(b: jbool)
+    | String(str: jstring)
+    | Number(num: jnumber)
+    | Object(obj: jobject)
+    | Array(arr: jarray)
+
+  type JSON = Structural<Value>
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/JSON.md b/Source/DafnyStandardLibraries/src/Std/JSON/JSON.md
new file mode 100644
index 00000000000..afb4cb774ef
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/JSON.md
@@ -0,0 +1,111 @@
+# The `JSON` module
+
+JSON serialization and deserialization in Dafny, as described in [RFC 8259](https://datatracker.ietf.org/doc/html/rfc8259).
+
+This library provides two APIs:
+
+- A low-level (zero-copy) API that is efficient, verified (see [What is verified?](#what-is-verified) below for details) and allows incremental changes (re-serialization is much faster for unchanged objects), but is more cumbersome to use. This API operates on concrete syntax trees that capture details of punctuation and blanks and represent strings using unescaped, undecoded utf-8 byte sequences.
+
+- A high-level API built on top of the previous one. This API is more convenient to use, but it is unverified and less efficient. It produces abstract datatype value trees that represent strings using Dafny's built-in `string` type.
+
+Both APIs provides functions for serialization (JSON values to utf-8 bytes) and deserialization (utf-8 bytes to JSON values).
+See the Unicode module if you need to read or produce JSON text in other encodings.
+
+## Library usage
+
+The tutorial in [`JSONExamples.dfy`](../../../examples/JSON/JSONExamples.dfy) shows how to import the library, call the high-level API, and use the low-level API to make localized modifications to a partial parse of a JSON AST. The main entry points are `API.Serialize` (to go from a JSON value to utf-8 bytes), and `API.Deserialize` (for the reverse operation):
+
+<!-- %check-verify -->
+```dafny
+import API = Std.JSON.API
+import opened Std.Unicode.UnicodeStringsWithUnicodeChar
+import opened Std.JSON.Values
+import opened Std.Wrappers
+
+method Test(){
+  var CITY_JS :- expect ToUTF8Checked(@"{""Cities"": [{
+    ""Name"": ""Boston"",
+    ""Founded"": 1630,
+    ""Population"": 689386,
+    ""Area (km2)"": 4584.2}]}");
+
+  var CITY_VALUE := Object([("Cities", Array([
+    Object([
+      ("Name", String("Boston")),
+      ("Founded", Number(Int(1630))),
+      ("Population", Number(Int(689386))),
+      ("Area (km2)", Number(Decimal(45842, -1)))])]))]);
+
+  expect API.Deserialize(CITY_JS) == Success(CITY_VALUE);
+
+  var EXPECTED :- expect ToUTF8Checked(
+    @"{""Cities"":[{""Name"":""Boston"",""Founded"":1630,""Population"":689386,""Area (km2)"":45842e-1}]}"
+  );
+
+  expect API.Serialize(CITY_VALUE) == Success(EXPECTED);
+}
+```
+
+## What is verified?
+
+The low-level (zero-copy) serializer is proven sound and complete against a simple functional specification found in [`ConcreteSyntax.Spec.dfy`](ConcreteSyntax.Spec.dfy). The high-level deserializer is proven sound, but not complete, against that same specification: if a value is deserialized successfully, then re-serializing recovers the original bytestring.
+
+### Useful submodules
+
+Most of the contents of the `Utils/` directory are not specific to JSON. They are not sufficiently documented to be moved to the main library yet, but they provide useful functionality:
+
+- [`Views.dfy`](Utils/Views.dfy) and [`Views.Writers.dfy`](Utils/Views.Writers.dfy) implement slices over byte strings whose bounds are representable as `int32` native integers. Adjacent slices can be merged in time `O(1)` (but see [“Caveats”](#caveats) below). To be part of the main library, it would have to be generalized to slices over any sequences and to indices represented using arbitrary integers (though Dafny does not currently have a way to have modularity over int width).
+
+- [`Cursors.dfy`](Utils/Cursors.dfy) implements slices augmented with an inner pointer tracking a position. Functions are provided to skip over a specific byte or bytes, over bytes matching a given predicate, or over bytes recognized by a given lexer, and ghost functions are provided to express the fact that a cursor was obtained by trimming a prefix of another cursor.  Cursors are used in the implementation of the parser: after skipping over a given construct, a cursor can be split into a view (capturing the part of the string matching the construct) and a new cursor starting at the previous position, with its pointer reset to the beginning of the string. To become part of the main library, cursors would need to be generalized in the same way as views above.
+
+- [`Lexers.dfy`](Utils/Lexers.dfy) contains a state machine that recognizes quoted strings and skips over backslash-escaped quotes.  State-machine-based lexers are used in `Cursors.dfy` to skip over complex constructs (like quoted strings), though in practice the low-level parser uses a custom function-by-method to speed up this specific case.
+
+- [`Parsers.dfy`](Utils/Parsers.dfy) has definitions of well-formedness for parsers (stating that they must consume part of their input).  This file would have to be significantly expanded to create a composable library of parsing combinators to be useful as part of the main library.
+
+## Caveats
+
+- Not all parts of this library are verified. In particular, the high-level API is not verified (the most complex part of it is the string escaping code).
+
+- The optimization used to merge contiguous slices can have poor performance in corner cases. Specifically, the function `Views.Core.Adjacent`, which checks whether two slices can be concatenated efficiently, uses Dafny's value equality, not reference equality, to check whether both slices point into the same string. The value-equality check is `O(1)` when the strings are physically equal, but may take linear time otherwise.
+
+  The worst-case behavior happens when serializing a low-level JSON object in which the `View`s all point to (physically) different strings with equal contents. This cannot happen when modifying the result of a previous parse (in that case, all views will share the same underlying storage, and the comparison will be fast).
+
+  This issue could be fixed by using reference equality, but doing so requires defining an external function to expose (a restricted form of) reference equality on values (exposing reference equality in general on values is not sound). A good description of the relevant technique can be found in chapter 9 of “Verasco: a Formally Verified C Static Analyzer” by Jacques-Henri Jourdan.
+
+### Implementation notes
+
+- The division into a low-level and a high-level API achieves two desirable outcomes:
+
+  - Programs that modify a small part of a JSON object can be implemented much more efficiently that using a traditional JSON AST ↔ bytes API, since unmodified parts of the decoded JSON object can be reserialized very quickly.
+
+  - Specs and proofs for the low-level API are simple because the low-level API captures all encoding details (including the amount of whitespace used), which makes serialization and deserialization uniquely determined. As a result, serialization is really the (left) inverse of deserializations.
+
+- Most of the low-level API uses bounded integers (`int32`), so the library cannot deserialize more than 4GB of JSON text.
+
+- To support in-place updates, the low-level API supports serializing into an existing buffer. Instead of repeatedly checking for overflows, the implementation uses saturating addition and checks for overflow only once, after writing the whole object. This optimization was inspired by Go's error-handling style, described in [Errors are values](https://go.dev/blog/errors-are-values).
+
+- Dafny does not support floating point numbers (and the JSON spec does not mandate a specific precision), so the library uses a pair `(n, e10)` instead representing the number `n * 10^e10`.
+
+- Workarounds for known Dafny bugs are indicated by the keyword [`BUG`](https://github.com/dafny-lang/libraries/search?q=BUG) in the sources.
+
+## TODOs and contribution opportunities
+
+### Verification
+
+The high-level API is unverified. Unlike the low-level API, general JSON serialization and deserialization are not inverses of each other, because deserializing an object and re-serializing it may add or remove whitespace or change the way strings or numbers are represented (e.g. the string `"a"` may be serialized as `"\u0061"` and the number 1 as 1.0e0, 10e-1, etc.). As a result, an executable serializer is not a sufficient specification of the format. Techniques to write specifications and verify serializers and deserializers in such cases are described in e.g. [Narcissus: correct-by-construction derivation of decoders and encoders from binary formats](https://dl.acm.org/doi/abs/10.1145/3341686).
+
+Note that it would be possible (and a great start) to show that the deserializer supports everything that the serializer may produce. This would not require a generalized specification (one that allows variation in serialization choices) of the format.
+
+Beyond this large task, some small lemmas that should hold but were not needed by this codebase are commented out and marked as `// TODO`.
+
+### Performance problems in the high-level API
+
+The high-level API does string encoding and escaping as two separate passes that both construct sequences. Adding `by method` blocks and fusing these two passes would provide significant gains.
+
+### Performance opportunities in the low-level API
+
+The low-level API is written in the pure subset of Dafny. As a result, it creates lots of short-lived records (especially cursors, defined in [`Cursors.dfy`](Utils/Cursors.dfy)). A linear version of Dafny would be able to mutate these structures in place. A traditional reuse analysis (see e.g. Schulte & Grieskamp, “Generating Efficient Portable Code for a Strict Applicative Language”, or any of the OPAL papers) would achieve the same result. Large gains could already be achieved simply by improving the compilation of records in the C# backend (e.g. using structs for small records and removing unnecessary interfaces).
+
+The optimization to merge contiguous string could be made to use physical equality. This would provide little gain in the typical case, but would eliminate the worst-case described in [“Caveats”](#caveats) above.
+
+The low-level serializer does not re-serialize unchanged parts of an AST, but it still re-writes the whole object. This could be eliminated when changes to the object do not change its overall length.
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Serializer.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Serializer.dfy
new file mode 100644
index 00000000000..aa3de51bf9e
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Serializer.dfy
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Implements high-level serialization (JSON values to utf-8 bytes).
+ */
+module Std.JSON.Serializer {
+  import Collections.Seq
+  import Math
+  import Values
+  import Spec
+  import opened Wrappers
+  import opened BoundedInts
+  import opened Strings
+  import opened Errors
+  import opened DynamicArray
+  import opened Grammar
+  import opened Utils.Views.Core
+  import ByteStrConversion
+
+  type Result<+T> = SerializationResult<T>
+  type bytes = seq<uint8>
+  type bytes32 = bs: bytes | |bs| < TWO_TO_THE_32
+  type string32 = s: string | |s| < TWO_TO_THE_32
+
+  function Bool(b: bool): jbool {
+    View.OfBytes(if b then TRUE else FALSE)
+  }
+
+  function CheckLength<T>(s: seq<T>, err: SerializationError): Outcome<SerializationError> {
+    Outcome.Need(|s| < TWO_TO_THE_32, err)
+  }
+
+  function String(str: string): Result<jstring> {
+    var bs :- Spec.EscapeToUTF8(str);
+    var o := CheckLength(bs, StringTooLong(str));
+    if o.Pass? then
+      Success(Grammar.JString(Grammar.DOUBLEQUOTE, View.OfBytes(bs), Grammar.DOUBLEQUOTE))
+    else
+      Failure(o.error)
+  }
+
+  function Sign(n: int): jminus {
+    View.OfBytes(if n < 0 then ['-' as byte] else [])
+  }
+
+  const DIGITS := ByteStrConversion.chars
+  const MINUS := '-' as byte
+
+  function Int'(n: int): (str: bytes)
+    ensures forall c | c in str :: c in DIGITS || c == MINUS
+  {
+    ByteStrConversion.OfInt(n, MINUS)
+  }
+
+  function Int(n: int): Result<View> {
+    var bs := Int'(n);
+    var o := CheckLength(bs, IntTooLarge(n));
+    if o.Pass? then
+      Success(View.OfBytes(bs))
+    else
+      Failure(o.error)
+  }
+
+  @IsolateAssertions
+  @ResourceLimit("1e6")
+  function Number(dec: Values.Decimal): Result<jnumber> {
+    var minus: jminus := Sign(dec.n);
+    var num: jnum :- Int(Math.Abs(dec.n));
+    var frac: Maybe<jfrac> := Empty();
+    var exp: Maybe<jexp> :-
+      if dec.e10 == 0 then
+        Success(Empty())
+      else
+        var e: je := View.OfBytes(['e' as byte]);
+        var sign: jsign := Sign(dec.e10);
+        var num: jnum :- Int(Math.Abs(dec.e10));
+        Success(NonEmpty(JExp(e, sign, num)));
+    Success(JNumber(minus, num, Empty, exp))
+  }
+
+  function MkStructural<T>(v: T): Structural<T> {
+    Structural(EMPTY, v, EMPTY)
+  }
+
+  const COLON: Structural<jcolon> :=
+    MkStructural(Grammar.COLON)
+
+  function KeyValue(kv: (string, Values.JSON)): Result<jKeyValue> {
+    var k :- String(kv.0);
+    var v :- Value(kv.1);
+    Success(Grammar.KeyValue(k, COLON, v))
+  }
+
+  function MkSuffixedSequence<D, S>(ds: seq<D>, suffix: Structural<S>, start: nat := 0)
+    : SuffixedSequence<D, S>
+    decreases |ds| - start
+  {
+    if start >= |ds| then []
+    else if start == |ds| - 1 then [Suffixed(ds[start], Empty)]
+    else [Suffixed(ds[start], NonEmpty(suffix))] + MkSuffixedSequence(ds, suffix, start + 1)
+  }
+
+  const COMMA: Structural<jcomma> :=
+    MkStructural(Grammar.COMMA)
+
+  function Object(obj: seq<(string, Values.JSON)>): Result<jobject> {
+    var items :- Seq.MapWithResult(v requires v in obj => KeyValue(v), obj);
+    Success(Bracketed(MkStructural(LBRACE),
+                      MkSuffixedSequence(items, COMMA),
+                      MkStructural(RBRACE)))
+  }
+
+
+  function Array(arr: seq<Values.JSON>): Result<jarray> {
+    var items :- Seq.MapWithResult(v requires v in arr => Value(v), arr);
+    Success(Bracketed(MkStructural(LBRACKET),
+                      MkSuffixedSequence(items, COMMA),
+                      MkStructural(RBRACKET)))
+  }
+
+  function Value(js: Values.JSON): Result<Grammar.Value> {
+    match js
+    case Null => Success(Grammar.Null(View.OfBytes(NULL)))
+    case Bool(b) => Success(Grammar.Bool(Bool(b)))
+    case String(str) => var s :- String(str); Success(Grammar.String(s))
+    case Number(dec) => var n :- Number(dec); Success(Grammar.Number(n))
+    case Object(obj) => var o :- Object(obj); Success(Grammar.Object(o))
+    case Array(arr) => var a :- Array(arr); Success(Grammar.Array(a))
+  }
+
+  function JSON(js: Values.JSON): Result<Grammar.JSON> {
+    var val :- Value(js);
+    Success(MkStructural(val))
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Spec.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Spec.dfy
new file mode 100644
index 00000000000..9efdfe1a1a2
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Spec.dfy
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Defines a high-level specification of a JSON serializer.
+ */
+module Std.JSON.Spec {
+  import Collections.Seq
+  import opened BoundedInts
+  import opened Strings
+  import opened Values
+  import opened Wrappers
+  import opened Errors
+  import opened Unicode.UnicodeStringsWithUnicodeChar
+  import opened Arithmetic.Logarithm
+
+  type Result<+T> = SerializationResult<T>
+
+  function EscapeUnicode(c: uint16): seq<uint16> {
+    var sStr := Strings.HexConversion.OfNat(c as nat);
+    Seq.MembershipImpliesIndexing(c => 0 <= c as int < 128, sStr);
+    var s := ASCIIToUTF16(sStr);
+    assert |s| <= 4 by {
+      assert c as nat <= 0xFFFF;
+      assert Log(16, c as nat) <= Log(16, 0xFFFF) by {
+        LemmaLogIsOrdered(16, c as nat, 0xFFFF);
+      }
+      assert Log(16, 0xFFFF) == 3;
+    }
+    s + seq(4 - |s|, _ => ' ' as uint16)
+  }
+
+  function Escape(str: seq<uint16>, start: nat := 0): seq<uint16>
+    decreases |str| - start
+  {
+    if start >= |str| then []
+    else
+      (match str[start]
+       case 0x22 => ASCIIToUTF16("\\\"") // quotation mark
+       case 0x5C => ASCIIToUTF16("\\\\") // reverse solidus
+       case 0x08 => ASCIIToUTF16("\\b")  // backspace
+       case 0x0C => ASCIIToUTF16("\\f")  // form feed
+       case 0x0A => ASCIIToUTF16("\\n")  // line feed
+       case 0x0D => ASCIIToUTF16("\\r")  // carriage return
+       case 0x09 => ASCIIToUTF16("\\t")  // tab
+       case c =>
+         if c < 0x001F then ASCIIToUTF16("\\u") + EscapeUnicode(c)
+         else [str[start]])
+      + Escape(str, start + 1)
+  }
+
+  function EscapeToUTF8(str: string, start: nat := 0): Result<bytes> {
+    var utf16 :- ToUTF16Checked(str).ToResult(SerializationError.InvalidUnicode);
+    var escaped := Escape(utf16);
+    var utf32 :- FromUTF16Checked(escaped).ToResult(SerializationError.InvalidUnicode);
+    ToUTF8Checked(utf32).ToResult(SerializationError.InvalidUnicode)
+  }
+
+  // Can fail due to invalid UTF-16 sequences in a string when --unicode-char is off
+  function String(str: string): Result<bytes> {
+    var inBytes :- EscapeToUTF8(str);
+    Success(ASCIIToUTF8("\"") + inBytes + ASCIIToUTF8("\""))
+  }
+
+  lemma OfIntOnlyASCII(n: int)
+    ensures
+      && var s := Strings.OfInt(n);
+      && forall i | 0 <= i < |s| :: 0 <= s[i] as int < 128
+  {
+    var s := Strings.OfInt(n);
+    forall i | 0 <= i < |s| ensures 0 <= s[i] as int < 128 {
+      if i == 0 {
+      } else {
+        var isHexDigit := c => c in Strings.HexConversion.HEX_DIGITS;
+        assert Strings.HexConversion.IsNumberStr(s, '-');
+        assert isHexDigit(s[i]);
+      }
+    }
+  }
+
+  function IntToBytes(n: int): bytes {
+    var s := Strings.OfInt(n);
+    OfIntOnlyASCII(n);
+    ASCIIToUTF8(s)
+  }
+
+  function Number(dec: Decimal): Result<bytes> {
+    Success(IntToBytes(dec.n) +
+            (if dec.e10 == 0 then []
+             else ASCIIToUTF8("e") + IntToBytes(dec.e10)))
+  }
+
+  function KeyValue(kv: (string, JSON)): Result<bytes> {
+    var key :- String(kv.0);
+    var value :- JSON(kv.1);
+    Success(key + ASCIIToUTF8(":") + value)
+  }
+
+  function Join(sep: bytes, items: seq<Result<bytes>>): Result<bytes> {
+    if |items| == 0 then
+      Success([])
+    else
+      var first :- items[0];
+      if |items| == 1 then
+        Success(first)
+      else
+        var rest :- Join(sep, items[1..]);
+        Success(first + sep + rest)
+  }
+
+  function Object(obj: seq<(string, JSON)>): Result<bytes> {
+    var middle :- Join(ASCIIToUTF8(","), seq(|obj|, i requires 0 <= i < |obj| => KeyValue(obj[i])));
+    Success(ASCIIToUTF8("{") + middle + ASCIIToUTF8("}"))
+  }
+
+  function Array(arr: seq<JSON>): Result<bytes> {
+    var middle :- Join(ASCIIToUTF8(","), seq(|arr|, i requires 0 <= i < |arr| => JSON(arr[i])));
+    Success(ASCIIToUTF8("[") + middle + ASCIIToUTF8("]"))
+  }
+
+  function JSON(js: JSON): Result<bytes> {
+    match js
+    case Null => Success(ASCIIToUTF8("null"))
+    case Bool(b) => Success(if b then ASCIIToUTF8("true") else ASCIIToUTF8("false"))
+    case String(str) => String(str)
+    case Number(dec) => Number(dec)
+    case Object(obj) => Object(obj)
+    case Array(arr) => Array(arr)
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Cursors.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Cursors.dfy
new file mode 100644
index 00000000000..29ff2b46444
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Cursors.dfy
@@ -0,0 +1,341 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Implements slices augmented with an inner pointer tracking a position.
+ */
+module Std.JSON.Utils.Cursors {
+  import opened BoundedInts
+  import opened Wrappers
+  import opened Vs = Views.Core
+  import opened Lx = Lexers.Core
+
+  datatype Split<+T> = SP(t: T, cs: FreshCursor) {
+    ghost predicate BytesSplitFrom?(cs0: Cursor, spec: T -> bytes) {
+      cs0.Bytes() == spec(t) + cs.Bytes()
+    }
+
+    ghost predicate SplitFrom?(cs0: Cursor, spec: T -> bytes) {
+      cs.SplitFrom?(cs0) && BytesSplitFrom?(cs0, spec)
+    }
+
+    ghost predicate StrictlySplitFrom?(cs0: Cursor, spec: T -> bytes) {
+      cs.StrictlySplitFrom?(cs0) && BytesSplitFrom?(cs0, spec)
+    }
+  }
+
+  // LATER: Make this a newtype and put members here instead of requiring `Valid?` everywhere
+  type Cursor = ps: Cursor_ | ps.Valid?
+    witness Cursor([], 0, 0, 0)
+  type FreshCursor = ps: Cursor | ps.BOF?
+    witness Cursor([], 0, 0, 0)
+
+  datatype CursorError<+R> =
+    | EOF
+    | ExpectingByte(expected: byte, b: opt_byte)
+    | ExpectingAnyByte(expected_sq: seq<byte>, b: opt_byte)
+    | OtherError(err: R)
+  { // TODO: Include positions in errors
+    function ToString(pr: R -> string) : string {
+      match this
+      case EOF => "Reached EOF"
+      case ExpectingByte(b0, b) =>
+        var c := if b > 0 then "'" + [b as char] + "'" else "EOF";
+        "Expecting '" + [b0 as char] + "', read " + c
+      case ExpectingAnyByte(bs0, b) =>
+        var c := if b > 0 then "'" + [b as char] + "'" else "EOF";
+        var c0s := seq(|bs0|, idx requires 0 <= idx < |bs0| => bs0[idx] as char);
+        "Expecting one of '" + c0s + "', read " + c
+      case OtherError(err) => pr(err)
+    }
+  }
+  type CursorResult<+R> = Result<Cursor, CursorError<R>>
+
+  datatype Cursor_ = Cursor(s: bytes, beg: uint32, point: uint32, end: uint32) {
+    ghost const Valid?: bool :=
+      0 <= beg as int <= point as int <= end as int <= |s| < TWO_TO_THE_32
+
+    const BOF? :=
+      point == beg
+
+    const EOF? :=
+      point == end
+
+    static function OfView(v: View) : FreshCursor {
+      Cursor(v.s, v.beg, v.beg, v.end)
+    }
+
+    static function OfBytes(bs: bytes) : FreshCursor
+      requires |bs| < TWO_TO_THE_32
+    {
+      Cursor(bs, 0, 0, |bs| as uint32)
+    }
+
+    function Bytes() : bytes
+      requires Valid?
+    {
+      s[beg..end]
+    }
+
+    ghost predicate StrictlyAdvancedFrom?(other: Cursor): (b: bool)
+      requires Valid?
+      ensures b ==>
+                SuffixLength() < other.SuffixLength()
+      ensures b ==>
+                beg == other.beg && end == other.end ==>
+                  forall idx | beg <= idx < point :: s[idx] == other.s[idx]
+    {
+      && s == other.s
+      && beg == other.beg
+      && end == other.end
+      && point > other.point
+    }
+
+    ghost predicate AdvancedFrom?(other: Cursor)
+      requires Valid?
+    {
+      || this == other
+      || StrictlyAdvancedFrom?(other)
+    }
+
+    ghost predicate StrictSuffixOf?(other: Cursor)
+      requires Valid?
+      ensures StrictSuffixOf?(other) ==>
+                Length() < other.Length()
+    {
+      && s == other.s
+      && beg > other.beg
+      && end == other.end
+    }
+
+    ghost predicate SuffixOf?(other: Cursor)
+      requires Valid?
+    {
+      || this == other
+      || StrictSuffixOf?(other)
+    }
+
+    ghost predicate StrictlySplitFrom?(other: Cursor)
+      requires Valid?
+    {
+      && BOF?
+      && StrictSuffixOf?(other)
+    }
+
+    ghost predicate SplitFrom?(other: Cursor)
+      requires Valid?
+    {
+      || this == other
+      || StrictlySplitFrom?(other)
+    }
+
+    function Prefix() : View requires Valid? {
+      View(s, beg, point)
+    }
+
+    function Suffix() : Cursor requires Valid? {
+      this.(beg := point)
+    }
+
+    function Split() : (sp: Split<View>) requires Valid?
+      ensures sp.SplitFrom?(this, (v: View) => v.Bytes())
+      ensures beg != point ==> sp.StrictlySplitFrom?(this, (v: View) => v.Bytes())
+      ensures !BOF? ==> (sp.StrictlySplitFrom?(this, (v: View) => v.Bytes()) && sp.cs.StrictSuffixOf?(this))
+      ensures !EOF? <==> !sp.cs.EOF?
+    {
+      SP(this.Prefix(), this.Suffix())
+    }
+
+    function PrefixLength() : uint32 requires Valid? {
+      point - beg
+    }
+
+    function SuffixLength() : uint32 requires Valid? {
+      end - point
+    }
+
+    function Length() : uint32 requires Valid? {
+      end - beg
+    }
+
+    lemma PrefixSuffixLength()
+      requires Valid?
+      ensures Length() == PrefixLength() + SuffixLength()
+    {}
+
+    ghost predicate ValidIndex?(idx: uint32) {
+      beg as int + idx as int < end as int
+    }
+
+    function At(idx: uint32) : byte
+      requires Valid?
+      requires ValidIndex?(idx)
+    {
+      s[beg + idx]
+    }
+
+    ghost predicate ValidSuffixIndex?(idx: uint32) {
+      point as int + idx as int < end as int
+    }
+
+    function SuffixAt(idx: uint32) : byte
+      requires Valid?
+      requires ValidSuffixIndex?(idx)
+    {
+      s[point + idx]
+    }
+
+    function Peek(): (r: opt_byte)
+      requires Valid?
+      ensures r < 0 <==> EOF?
+    {
+      if EOF? then -1
+      else SuffixAt(0) as opt_byte
+    }
+
+    predicate LookingAt(c: char): (b: bool)
+      requires Valid?
+      requires c as int < 256
+      ensures b <==> !EOF? && SuffixAt(0) == c as byte
+    {
+      Peek() == c as opt_byte
+    }
+
+    function Skip(n: uint32): (ps: Cursor)
+      requires Valid?
+      requires point as int + n as int <= end as int
+      ensures n == 0 ==> ps == this
+      ensures n > 0 ==> ps.StrictlyAdvancedFrom?(this)
+    {
+      this.(point := point + n)
+    }
+
+    function Unskip(n: uint32): Cursor
+      requires Valid?
+      requires beg as int <= point as int - n as int
+    {
+      this.(point := point - n)
+    }
+
+    function Get<R>(err: R): (ppr: CursorResult<R>)
+      requires Valid?
+      ensures ppr.Success? ==> ppr.value.StrictlyAdvancedFrom?(this)
+    {
+      if EOF? then Failure(OtherError(err))
+      else Success(Skip(1))
+    }
+
+    function AssertByte<R>(b: byte): (pr: CursorResult<R>)
+      requires Valid?
+      ensures pr.Success? ==> !EOF?
+      ensures pr.Success? ==> s[point] == b
+      ensures pr.Success? ==> pr.value.StrictlyAdvancedFrom?(this)
+    {
+      var nxt := Peek();
+      if nxt == b as opt_byte then Success(Skip(1))
+      else Failure(ExpectingByte(b, nxt))
+    }
+
+    @TailRecursion
+    function AssertBytes<R>(bs: bytes, offset: uint32 := 0): (pr: CursorResult<R>)
+      requires Valid?
+      requires |bs| < TWO_TO_THE_32
+      requires offset <= |bs| as uint32
+      requires forall b | b in bs :: b as int < 256
+      decreases SuffixLength()
+      ensures pr.Success? ==> pr.value.AdvancedFrom?(this)
+      ensures pr.Success? && offset < |bs| as uint32 ==> pr.value.StrictlyAdvancedFrom?(this)
+      ensures pr.Success? ==> s[point..pr.value.point] == bs[offset..]
+    {
+      if offset == |bs| as uint32 then Success(this)
+      else
+        var ps :- AssertByte(bs[offset] as byte);
+        ps.AssertBytes(bs, offset + 1)
+    }
+
+    function AssertChar<R>(c0: char): (pr: CursorResult<R>)
+      requires Valid?
+      requires c0 as int < 256
+      ensures pr.Success? ==> pr.value.StrictlyAdvancedFrom?(this)
+    {
+      AssertByte(c0 as byte)
+    }
+
+    function SkipByte(): (ps: Cursor)
+      requires Valid?
+      decreases SuffixLength()
+      ensures ps.AdvancedFrom?(this)
+      ensures !EOF? ==> ps.StrictlyAdvancedFrom?(this)
+    {
+      if EOF? then this
+      else Skip(1)
+    }
+
+    function SkipIf(p: byte -> bool): (ps: Cursor)
+      requires Valid?
+      decreases SuffixLength()
+      ensures ps.AdvancedFrom?(this)
+      ensures !EOF? && p(SuffixAt(0)) ==> ps.StrictlyAdvancedFrom?(this)
+    {
+      if EOF? || !p(SuffixAt(0)) then this
+      else Skip(1)
+    }
+
+    function SkipWhile(p: byte -> bool): (ps: Cursor)
+      requires Valid?
+      decreases SuffixLength()
+      ensures ps.AdvancedFrom?(this)
+      ensures forall idx | point <= idx < ps.point :: p(ps.s[idx])
+    {
+      if EOF? || !p(SuffixAt(0)) then this
+      else Skip(1).SkipWhile(p)
+    } by method {
+      var point' := this.point;
+      var end := this.end;
+      while point' < end && p(this.s[point'])
+        // BUG(https://github.com/dafny-lang/dafny/issues/4847)
+        invariant var thisAfter := this.(point := point'); thisAfter.Valid?
+        invariant var thisAfter := this.(point := point'); thisAfter.SkipWhile(p) == this.SkipWhile(p)
+      {
+        point' := point' + 1;
+      }
+      return Cursor(this.s, this.beg, point', this.end);
+    }
+
+    function SkipWhileLexer<A, R>(step: Lexer<A, R>, st: A)
+      : (pr: CursorResult<R>)
+      requires Valid?
+      decreases SuffixLength()
+      ensures pr.Success? ==> pr.value.AdvancedFrom?(this)
+    {
+      match step(st, Peek())
+      case Accept => Success(this)
+      case Reject(err) => Failure(OtherError(err))
+      case Partial(st) =>
+        if EOF? then Failure(EOF)
+        else Skip(1).SkipWhileLexer(step, st)
+    } by method {
+      var point' := point;
+      var end := this.end;
+      var st' := st;
+      while true
+        // BUG(https://github.com/dafny-lang/dafny/issues/4847)
+        invariant var thisAfter := this.(point := point'); thisAfter.Valid?
+        invariant var thisAfter := this.(point := point'); thisAfter.SkipWhileLexer(step, st') == this.SkipWhileLexer(step, st)
+        decreases var thisAfter := this.(point := point'); thisAfter.SuffixLength()
+      {
+        var eof := point' == end;
+        var minusone: opt_byte := -1; // BUG(https://github.com/dafny-lang/dafny/issues/2191)
+        var c := if eof then minusone else this.s[point'] as opt_byte;
+        match step(st', c)
+        case Accept => return Success(Cursor(this.s, this.beg, point', this.end));
+        case Reject(err) => return Failure(OtherError(err));
+        case Partial(st'') =>
+          if eof { return Failure(EOF); }
+          else { st' := st''; point' := point' + 1; }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Lexers.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Lexers.dfy
new file mode 100644
index 00000000000..e98ace0a137
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Lexers.dfy
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Contains a state machine that recognizes quoted strings and skips over backslash-escaped quotes.
+ */
+module Std.JSON.Utils.Lexers {
+  module Core {
+    import opened Wrappers
+    import opened BoundedInts
+
+    datatype LexerResult<+T, +R> =
+        // A Lexer may return three results:
+      | Accept // The input is valid.
+      | Reject(err: R) // The input is not valid; `err` says why.
+      | Partial(st: T) // More input is needed to finish lexing.
+
+    type Lexer<!T, +R> = (T, opt_byte) -> LexerResult<T, R>
+  }
+
+  module Strings {
+    import opened Core
+    import opened BoundedInts
+
+    type StringBodyLexerState = /* escaped: */ bool
+    const StringBodyLexerStart: StringBodyLexerState := false
+
+    function StringBody<R>(escaped: StringBodyLexerState, byte: opt_byte)
+      : LexerResult<StringBodyLexerState, R>
+    {
+      if byte == '\\' as opt_byte then Partial(!escaped)
+      else if byte == '\"' as opt_byte && !escaped then Accept
+      else Partial(false)
+    }
+
+    datatype StringLexerState = Start | Body(escaped: bool) | End
+    const StringLexerStart: StringLexerState := Start
+
+    function String(st: StringLexerState, byte: opt_byte)
+      : LexerResult<StringLexerState, string>
+    {
+      match st
+      case Start() =>
+        if byte == '\"' as opt_byte then Partial(Body(false))
+        else Reject("String must start with double quote")
+      case End() =>
+        Accept
+      case Body(escaped) =>
+        if byte == '\\' as opt_byte then Partial(Body(!escaped))
+        else if byte == '\"' as opt_byte && !escaped then Partial(End)
+        else Partial(Body(false))
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Parsers.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Parsers.dfy
new file mode 100644
index 00000000000..01cb4d724a1
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Parsers.dfy
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Contains definitions of well-formedness for parsers (stating that they must consume part of their input). 
+ */
+module Std.JSON.Utils.Parsers {
+  import opened BoundedInts
+  import opened Wrappers
+  import opened Views.Core
+  import opened Cursors
+
+  type SplitResult<+T, +R> = Result<Split<T>, CursorError<R>>
+
+  type Parser<!T, +R> = p: Parser_<T, R> | p.Valid?()
+      // BUG(https://github.com/dafny-lang/dafny/issues/2103)
+    witness ParserWitness<T, R>() // BUG(https://github.com/dafny-lang/dafny/issues/2175)
+  datatype Parser_<!T, +R> = Parser(fn: FreshCursor -> SplitResult<T, R>,
+                                    ghost spec: T -> bytes) {
+    ghost predicate Valid?() {
+      forall cs': FreshCursor :: fn(cs').Success? ==> fn(cs').value.StrictlySplitFrom?(cs', spec)
+    }
+  }
+
+  function ParserWitness<T, R>(): (p: Parser_<T, R>)
+    ensures p.Valid?()
+  {
+    Parser(_ => Failure(EOF), _ => [])
+  }
+
+  // BUG(https://github.com/dafny-lang/dafny/issues/2137): It would be much
+  // nicer if `SubParser` was a special case of `Parser`, but that would require
+  // making `fn` in parser a partial function `-->`.  The problem with that is
+  // that we would then have to restrict the `Valid?` clause of `Parser` on
+  // `fn.requires()`, thus making it unprovable in the `SubParser` case (`fn`
+  // for subparsers is typically a lambda, and the `requires` of lambdas are
+  // essentially uninformative/opaque).
+  datatype SubParser_<!T, +R> = SubParser(
+    ghost cs: Cursor,
+    ghost pre: FreshCursor -> bool,
+    fn: FreshCursor --> SplitResult<T, R>,
+    ghost spec: T -> bytes)
+  {
+    ghost predicate Valid?() {
+      && (forall cs': FreshCursor | pre(cs') :: fn.requires(cs'))
+      && (forall cs': FreshCursor | cs'.StrictlySplitFrom?(cs) :: pre(cs'))
+      && (forall cs': FreshCursor | pre(cs') :: fn(cs').Success? ==> fn(cs').value.StrictlySplitFrom?(cs', spec))
+    }
+  }
+
+  type SubParser<!T, +R> = p: SubParser_<T, R> | p.Valid?()
+    witness SubParserWitness<T, R>() // BUG(https://github.com/dafny-lang/dafny/issues/2175)
+
+  function SubParserWitness<T, R>(): (subp: SubParser_<T, R>)
+    ensures subp.Valid?()
+  {
+    SubParser(Cursor([], 0, 0, 0),
+              (cs: FreshCursor) => false,
+              (cs: FreshCursor) => Failure(EOF),
+              _ => [])
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Views.Writers.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Views.Writers.dfy
new file mode 100644
index 00000000000..95016b1c0cf
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Views.Writers.dfy
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Implements slices (`Chain`s) over byte strings whose bounds are representable as `int32` native integers (`View`s).
+ */
+module Std.JSON.Utils.Views.Writers {
+  import opened BoundedInts
+  import opened Core
+
+  datatype Chain =
+    | Empty
+    | Chain(previous: Chain, v: View)
+  {
+    function Length() : nat {
+      if Empty? then 0
+      else previous.Length() + v.Length() as int
+    }
+
+    function Count() : nat {
+      if Empty? then 0
+      else previous.Count() + 1
+    }
+
+    function Bytes() : (bs: bytes)
+      ensures |bs| == Length()
+    {
+      if Empty? then []
+      else previous.Bytes() + v.Bytes()
+    }
+
+    function Append(v': View): (c: Chain)
+      ensures c.Bytes() == Bytes() + v'.Bytes()
+    {
+      if Chain? && Adjacent(v, v') then
+        Chain(previous, Merge(v, v'))
+      else
+        Chain(this, v')
+    }
+
+    @TailRecursion
+    method CopyTo(dest: array<byte>, end: uint32)
+      requires end as int == Length() <= dest.Length
+      modifies dest
+      ensures dest[..end] == Bytes()
+      ensures dest[end..] == old(dest[end..])
+    {
+      if Chain? {
+        var end := end - v.Length();
+        v.CopyTo(dest, end);
+        previous.CopyTo(dest, end);
+      }
+    }
+  }
+
+  type Writer = w: Writer_ | w.Valid? witness Writer(0, Chain.Empty)
+  datatype Writer_ = Writer(length: uint32, chain: Chain)
+  {
+    static const Empty: Writer := Writer(0, Chain.Empty)
+
+    const Empty? := chain.Empty?
+    const Unsaturated? := length != UINT32_MAX
+
+    ghost function Length() : nat { chain.Length() }
+
+    ghost const Valid? :=
+      length == // length is a saturating counter
+      if chain.Length() >= TWO_TO_THE_32 then UINT32_MAX
+      else chain.Length() as uint32
+
+    function Bytes() : (bs: bytes)
+      ensures |bs| == Length()
+    {
+      chain.Bytes()
+    }
+
+    static function SaturatedAddU32(a: uint32, b: uint32): uint32 {
+      if a <= UINT32_MAX - b then a + b
+      else UINT32_MAX
+    }
+
+    function Append(v': View): (rw: Writer)
+      requires Valid?
+      ensures rw.Unsaturated? <==> v'.Length() < UINT32_MAX - length
+      ensures rw.Bytes() == Bytes() + v'.Bytes()
+    {
+      Writer(SaturatedAddU32(length, v'.Length()),
+             chain.Append(v'))
+    }
+
+    function Then(fn: Writer ~> Writer) : Writer
+      reads fn.reads(this)
+      requires Valid?
+      requires fn.requires(this)
+    {
+      fn(this)
+    }
+
+    @TailRecursion
+    method CopyTo(dest: array<byte>)
+      requires Valid?
+      requires Unsaturated?
+      requires Length() <= dest.Length
+      modifies dest
+      ensures dest[..length] == Bytes()
+      ensures dest[length..] == old(dest[length..])
+    {
+      chain.CopyTo(dest, length);
+    }
+
+    method ToArray() returns (bs: array<byte>)
+      requires Valid?
+      requires Unsaturated?
+      ensures fresh(bs)
+      ensures bs[..] == Bytes()
+    {
+      bs := new byte[length](i => 0);
+      CopyTo(bs);
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Views.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Views.dfy
new file mode 100644
index 00000000000..d324a9dafee
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Utils/Views.dfy
@@ -0,0 +1,127 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Implements byte strings whose bounds are representable as `int32` native integers (`View`s).
+ */
+module Std.JSON.Utils.Views.Core {
+  import opened BoundedInts
+
+  type View = v: View_ | v.Valid? witness View([], 0, 0)
+  datatype View_ = View(s: bytes, beg: uint32, end: uint32) {
+    ghost const Valid?: bool :=
+      0 <= beg as int <= end as int <= |s| < TWO_TO_THE_32
+
+    static const Empty: View :=
+      View([], 0, 0)
+
+    const Empty? :=
+      beg == end
+
+    function Length(): uint32 requires Valid? {
+      end - beg
+    }
+
+    function Bytes(): bytes requires Valid? {
+      s[beg..end]
+    }
+
+    static function OfBytes(bs: bytes) : (v: View)
+      requires |bs| < TWO_TO_THE_32
+      ensures v.Bytes() == bs
+    {
+      View(bs, 0 as uint32, |bs| as uint32)
+    }
+
+    static function OfString(s: string) : bytes
+      requires forall c: char | c in s :: c as int < 256
+    {
+      seq(|s|, i requires 0 <= i < |s| =>
+        assert s[i] in s; s[i] as byte)
+    }
+
+    ghost predicate SliceOf?(v': View) {
+      v'.s == s && v'.beg <= beg && end <= v'.end
+    }
+
+    ghost predicate StrictPrefixOf?(v': View) {
+      v'.s == s && v'.beg == beg && end < v'.end
+    }
+
+    ghost predicate StrictSuffixOf?(v': View) {
+      v'.s == s && v'.beg < beg && end == v'.end
+    }
+
+    predicate Byte?(c: byte)
+      requires Valid?
+    {
+      Bytes() == [c]
+    } by method {
+      return Length() == 1 && At(0) == c;
+    }
+
+    predicate Char?(c: char)
+      requires Valid?
+      requires c as int < 256
+    {
+      Byte?(c as byte)
+    }
+
+    ghost predicate ValidIndex?(idx: uint32) {
+      beg as int + idx as int < end as int
+    }
+
+    function At(idx: uint32) : byte
+      requires Valid?
+      requires ValidIndex?(idx)
+    {
+      s[beg + idx]
+    }
+
+    function Peek(): (r: opt_byte)
+      requires Valid?
+      ensures r < 0 <==> Empty?
+    {
+      if Empty? then -1
+      else At(0) as opt_byte
+    }
+
+    method CopyTo(dest: array<byte>, start: uint32 := 0)
+      requires Valid?
+      requires start as int + Length() as int <= dest.Length
+      requires start as int + Length() as int < TWO_TO_THE_32
+      modifies dest
+      ensures dest[start..start + Length()] == Bytes()
+      ensures dest[start + Length()..] == old(dest[start + Length()..])
+    {
+      for idx := 0 to Length()
+        invariant dest[start..start + idx] == Bytes()[..idx]
+        invariant dest[start + Length()..] == old(dest[start + Length()..])
+      {
+        dest[start + idx] := s[beg + idx];
+      }
+    }
+  }
+
+  predicate Adjacent(lv: View, rv: View) {
+    // Compare endpoints first to short-circuit the potentially-costly string
+    // comparison
+    && lv.end == rv.beg
+    // We would prefer to use reference equality here, but doing so in a sound
+    // way is tricky (see chapter 9 of ‘Verasco: a Formally Verified C Static
+    // Analyzer’ by Jacques-Henri Jourdan for details).  The runtime optimizes
+    // the common case of physical equality and otherwise performs a length
+    // check, so the worst case (checking for adjacency in two slices that have
+    // equal but not physically-equal contents) is hopefully not too common.
+    && lv.s == rv.s
+  }
+
+  function Merge(lv: View, rv: View) : (v: View)
+    requires Adjacent(lv, rv)
+    ensures v.Bytes() == lv.Bytes() + rv.Bytes()
+  {
+    lv.(end := rv.end)
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/Values.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/Values.dfy
new file mode 100644
index 00000000000..d1a2c346bf4
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/Values.dfy
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Defines abstract datatype value trees that represent strings.
+ */
+module Std.JSON.Values {
+  datatype Decimal =
+    Decimal(n: int, e10: int) // (n) * 10^(e10)
+
+  function Int(n: int): Decimal {
+    Decimal(n, 0)
+  }
+
+  datatype JSON =
+    | Null
+    | Bool(b: bool)
+    | String(str: string)
+    | Number(num: Decimal)
+    | Object(obj: seq<(string, JSON)>) // Not a map to preserve order
+    | Array(arr: seq<JSON>)
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/ZeroCopy/API.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/ZeroCopy/API.dfy
new file mode 100644
index 00000000000..541f564c3e7
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/ZeroCopy/API.dfy
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ The low-level (zero-copy) API of the JSON library. This version is efficient, verified and allows incremental
+ changes, but is more cumbersome to use. This API operates on concrete syntax trees that capture details of 
+ punctuation and blanks and represent strings using unescaped, undecoded utf-8 byte sequences.
+ */
+module Std.JSON.ZeroCopy.API {
+  import Grammar
+  import ConcreteSyntax.Spec
+  import Serializer
+  import Deserializer
+  import opened BoundedInts
+  import opened Wrappers
+  import opened Errors
+
+
+  /* Serialization (JSON syntax trees to utf-8 bytes) */
+  function Serialize(js: Grammar.JSON) : (bs: SerializationResult<seq<byte>>)
+    ensures bs == Success(Spec.JSON(js))
+  {
+    Success(Serializer.Text(js).Bytes())
+  }
+
+  method SerializeAlloc(js: Grammar.JSON) returns (bs: SerializationResult<array<byte>>)
+    ensures bs.Success? ==> fresh(bs.value)
+    ensures bs.Success? ==> bs.value[..] == Spec.JSON(js)
+  {
+    bs := Serializer.Serialize(js);
+  }
+
+  method SerializeInto(js: Grammar.JSON, bs: array<byte>) returns (len: SerializationResult<uint32>)
+    modifies bs
+    ensures len.Success? ==> len.value as int <= bs.Length
+    ensures len.Success? ==> bs[..len.value] == Spec.JSON(js)
+    ensures len.Success? ==> bs[len.value..] == old(bs[len.value..])
+    ensures len.Failure? ==> unchanged(bs)
+  {
+    len := Serializer.SerializeTo(js, bs);
+  }
+
+  /* Deserialization (utf-8 bytes to JSON syntax trees) */
+  function Deserialize(bs: seq<byte>) : (js: DeserializationResult<Grammar.JSON>)
+    ensures js.Success? ==> bs == Spec.JSON(js.value)
+  {
+    Deserializer.API.OfBytes(bs)
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/ZeroCopy/Deserializer.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/ZeroCopy/Deserializer.dfy
new file mode 100644
index 00000000000..4a938e5bb95
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/ZeroCopy/Deserializer.dfy
@@ -0,0 +1,1022 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Implements low-level (zero-copy) deserialization (utf-8 bytes to JSON syntax trees).
+ Proves that the deserializer is sound, but not complete w.r.t. the functional specification
+ defined in `ConcreteSyntax.Spec`: if a value is deserialized successfully, then 
+ re-serializing recovers the original bytestring.
+ */
+module Std.JSON.ZeroCopy.Deserializer {
+  module Core {
+    import opened BoundedInts
+    import opened Wrappers
+    import ConcreteSyntax.Spec
+    import Vs = Utils.Views.Core
+    import opened Utils.Cursors
+    import opened Utils.Parsers
+    import opened Grammar
+    import Errors
+    import opened Collections.Seq
+
+
+    type JSONError = Errors.DeserializationError
+    type Error = CursorError<JSONError>
+    type ParseResult<+T> = SplitResult<T, JSONError>
+    type Parser<!T> = Parsers.Parser<T, JSONError>
+    type SubParser<!T> = Parsers.SubParser<T, JSONError>
+
+    // BUG(https://github.com/dafny-lang/dafny/issues/2179)
+    const SpecView := (v: Vs.View) => Spec.View(v)
+
+    function Get(cs: FreshCursor, err: JSONError): (pr: ParseResult<jchar>)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, SpecView)
+    {
+      var cs :- cs.Get(err);
+      Success(cs.Split())
+    }
+
+    @IsolateAssertions
+    @ResourceLimit("1000e6")
+    function WS(cs: FreshCursor): (sp: Split<jblanks>)
+      ensures sp.SplitFrom?(cs, SpecView)
+      ensures sp.cs.SuffixOf?(cs)
+      ensures !cs.BOF? ==> sp.cs.StrictSuffixOf?(cs)
+      ensures cs.EOF? ==> sp.cs.SuffixOf?(cs.Suffix())
+    {
+      cs.SkipWhile(Blank?).Split()
+    } by method {
+      var point' := cs.point;
+      var end := cs.end;
+      while point' < end && Blank?(cs.s[point'])
+        // BUG(https://github.com/dafny-lang/dafny/issues/4847)
+        invariant var csAfter := cs.(point := point'); csAfter.Valid?
+        invariant var csAfter := cs.(point := point'); csAfter.SkipWhile(Blank?) == cs.SkipWhile(Blank?)
+      {
+        point' := point' + 1;
+      }
+      return Cursor(cs.s, cs.beg, point', cs.end).Split();
+    }
+
+    @IsolateAssertions
+    @ResourceLimit("1000e6")
+    function Structural<T>(cs: FreshCursor, parser: Parser<T>)
+      : (pr: ParseResult<Structural<T>>)
+      requires forall cs :: parser.fn.requires(cs)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, st => Spec.Structural(st, parser.spec))
+    {
+      var SP(before, cs) := WS(cs);
+      var SP(val, cs) :- parser.fn(cs);
+      var SP(after, cs) := WS(cs);
+      Success(SP(Grammar.Structural(before, val, after), cs))
+    }
+
+    type jopt = v: Vs.View | v.Length() <= 1 witness Vs.View.OfBytes([])
+
+    @ResourceLimit("100e6")
+    function TryStructural(cs: FreshCursor)
+      : (sp: Split<Structural<jopt>>)
+      ensures sp.SplitFrom?(cs, st => Spec.Structural(st, SpecView))
+    {
+      var SP(before, cs) := WS(cs);
+      var SP(val, cs) := cs.SkipByte().Split();
+      var SP(after, cs) := WS(cs);
+      SP(Grammar.Structural(before, val, after), cs)
+    }
+
+    ghost predicate ValueParserValid(sp: SubParser<Value>) {
+      forall t :: sp.spec(t) == Spec.Value(t)
+    }
+
+    type ValueParser = sp: SubParser<Value> | ValueParserValid(sp) witness *
+  }
+  type Error = Core.Error
+
+  abstract module SequenceParams {
+    import opened BoundedInts
+
+    import opened Grammar
+    import opened Utils.Cursors
+    import opened Core
+
+    const OPEN: byte
+    const CLOSE: byte
+
+    type TElement
+
+    ghost function ElementSpec(t: TElement): bytes
+
+    function Element(cs: FreshCursor, json: ValueParser)
+      : (pr: ParseResult<TElement>)
+      requires cs.StrictlySplitFrom?(json.cs)
+      decreases cs.Length()
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, ElementSpec)
+  }
+
+  abstract module Sequences {
+    import opened Wrappers
+    import opened BoundedInts
+    import opened Params: SequenceParams
+
+    import ConcreteSyntax.SpecProperties
+    import opened Vs = Utils.Views.Core
+    import opened Grammar
+    import opened Utils.Cursors
+    import Utils.Parsers
+    import opened Core
+
+    const SEPARATOR: byte := ',' as byte
+
+    type jopen = v: Vs.View | v.Byte?(OPEN) witness Vs.View.OfBytes([OPEN])
+    type jclose = v: Vs.View | v.Byte?(CLOSE) witness Vs.View.OfBytes([CLOSE])
+    type TBracketed = Bracketed<jopen, TElement, jcomma, jclose>
+    type TSuffixedElement = Suffixed<TElement, jcomma>
+
+    const SpecViewClose: jclose -> bytes := SpecView
+    const SpecViewOpen: jopen -> bytes := SpecView
+
+    ghost function SuffixedElementSpec(e: TSuffixedElement): bytes {
+      ElementSpec(e.t) + Spec.CommaSuffix(e.suffix)
+    }
+
+    ghost function BracketedSpec(ts: TBracketed): bytes {
+      Spec.Bracketed(ts, SuffixedElementSpec)
+    }
+
+    ghost function SuffixedElementsSpec(ts: seq<TSuffixedElement>): bytes {
+      Spec.ConcatBytes(ts, SuffixedElementSpec)
+    }
+
+    function Open(cs: FreshCursor)
+      : (pr: ParseResult<jopen>)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, SpecViewOpen)
+    {
+      var cs :- cs.AssertByte(OPEN);
+      Success(cs.Split())
+    }
+
+    function Close(cs: FreshCursor)
+      : (pr: ParseResult<jclose>)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, SpecViewClose)
+    {
+      var cs :- cs.AssertByte(CLOSE);
+      Success(cs.Split())
+    }
+
+    function BracketedFromParts(ghost cs: Cursor,
+                                open: Split<Structural<jopen>>,
+                                elems: Split<seq<TSuffixedElement>>,
+                                close: Split<Structural<jclose>>)
+      : (sp: Split<TBracketed>)
+      requires Grammar.NoTrailingSuffix(elems.t)
+      requires open.StrictlySplitFrom?(cs, c => Spec.Structural(c, SpecView))
+      requires elems.SplitFrom?(open.cs, SuffixedElementsSpec)
+      requires close.StrictlySplitFrom?(elems.cs, c => Spec.Structural(c, SpecView))
+      ensures sp.StrictlySplitFrom?(cs, BracketedSpec)
+    {
+      var sp := SP(Grammar.Bracketed(open.t, elems.t, close.t), close.cs);
+      calc {
+        cs.Bytes();
+        Spec.Structural(open.t, SpecView) + open.cs.Bytes();
+        { assert open.cs.Bytes() == SuffixedElementsSpec(elems.t) + elems.cs.Bytes(); }
+        Spec.Structural(open.t, SpecView) + (SuffixedElementsSpec(elems.t) + elems.cs.Bytes());
+        { Seq.LemmaConcatIsAssociative(Spec.Structural(open.t, SpecView), SuffixedElementsSpec(elems.t), elems.cs.Bytes()); }
+        Spec.Structural(open.t, SpecView) + SuffixedElementsSpec(elems.t) + elems.cs.Bytes();
+        { assert elems.cs.Bytes() == Spec.Structural(close.t, SpecView) + close.cs.Bytes(); }
+        Spec.Structural(open.t, SpecView) + SuffixedElementsSpec(elems.t) + (Spec.Structural(close.t, SpecView) + close.cs.Bytes());
+        { Seq.LemmaConcatIsAssociative(Spec.Structural(open.t, SpecView) + SuffixedElementsSpec(elems.t), Spec.Structural(close.t, SpecView), close.cs.Bytes()); }
+        Spec.Structural(open.t, SpecView) + SuffixedElementsSpec(elems.t) + Spec.Structural(close.t, SpecView) + close.cs.Bytes();
+        Spec.Bracketed(sp.t, SuffixedElementSpec) + close.cs.Bytes();
+      }
+      assert sp.StrictlySplitFrom?(cs, BracketedSpec);
+      sp
+    }
+
+    function AppendWithSuffix(ghost cs0: FreshCursor,
+                              ghost json: ValueParser,
+                              elems: Split<seq<TSuffixedElement>>,
+                              elem: Split<TElement>,
+                              sep: Split<Structural<jcomma>>)
+      : (elems': Split<seq<TSuffixedElement>>)
+      requires elems.cs.StrictlySplitFrom?(json.cs)
+      requires elems.SplitFrom?(cs0, SuffixedElementsSpec)
+      requires elem.StrictlySplitFrom?(elems.cs, ElementSpec)
+      requires sep.StrictlySplitFrom?(elem.cs, c => Spec.Structural(c, SpecView))
+      requires forall e | e in elems.t :: e.suffix.NonEmpty?
+      ensures elems'.StrictlySplitFrom?(cs0, SuffixedElementsSpec)
+      ensures forall e | e in elems'.t :: e.suffix.NonEmpty?
+      ensures elems'.cs.Length() < elems.cs.Length()
+      ensures elems'.cs.StrictlySplitFrom?(json.cs)
+      ensures elems'.SplitFrom?(cs0, SuffixedElementsSpec)
+    {
+      var suffixed := Suffixed(elem.t, NonEmpty(sep.t));
+      var elems' := SP(elems.t + [suffixed], sep.cs); // DISCUSS: Moving this down doubles the verification time
+
+      assert cs0.Bytes() == SuffixedElementsSpec(elems'.t) + sep.cs.Bytes() by {
+        assert {:focus} cs0.Bytes() == SuffixedElementsSpec(elems.t) + (ElementSpec(suffixed.t) + Spec.CommaSuffix(suffixed.suffix)) + sep.cs.Bytes() by {
+          assert cs0.Bytes() == SuffixedElementsSpec(elems.t) + ElementSpec(suffixed.t) + Spec.CommaSuffix(suffixed.suffix) + sep.cs.Bytes() by {
+            assert cs0.Bytes() == SuffixedElementsSpec(elems.t) + elems.cs.Bytes();
+            assert elems.cs.Bytes() == ElementSpec(suffixed.t) + elem.cs.Bytes();
+            assert elem.cs.Bytes() == Spec.CommaSuffix(suffixed.suffix) + sep.cs.Bytes();
+            Seq.LemmaConcatIsAssociative(SuffixedElementsSpec(elems.t), ElementSpec(suffixed.t), elem.cs.Bytes());
+            Seq.LemmaConcatIsAssociative(SuffixedElementsSpec(elems.t) + ElementSpec(suffixed.t), Spec.CommaSuffix(suffixed.suffix), sep.cs.Bytes());
+          }
+          Seq.LemmaConcatIsAssociative(SuffixedElementsSpec(elems.t), ElementSpec(suffixed.t), Spec.CommaSuffix(suffixed.suffix));
+        }
+        assert SuffixedElementsSpec(elems.t) + (ElementSpec(suffixed.t) + Spec.CommaSuffix(suffixed.suffix)) + sep.cs.Bytes() == SuffixedElementsSpec(elems'.t) + sep.cs.Bytes() by {
+          assert SuffixedElementsSpec(elems.t) + SuffixedElementSpec(suffixed) == SuffixedElementsSpec(elems.t + [suffixed]) by {
+            SpecProperties.ConcatBytes_Linear(elems.t, [suffixed], SuffixedElementSpec);
+            assert Spec.ConcatBytes(elems.t, SuffixedElementSpec) + Spec.ConcatBytes([suffixed], SuffixedElementSpec) ==  Spec.ConcatBytes(elems.t + [suffixed], SuffixedElementSpec);
+          }
+        }
+      }
+      assert elems'.StrictlySplitFrom?(cs0, SuffixedElementsSpec);
+      assert forall e | e in elems'.t :: e.suffix.NonEmpty? by { assert elems'.t == elems.t + [suffixed]; }
+      assert {:split_here} elems'.cs.Length() < elems.cs.Length();
+      assert elems'.SplitFrom?(cs0, SuffixedElementsSpec) by {
+        assert elems'.BytesSplitFrom?(cs0, SuffixedElementsSpec) by {
+          assert elems'.StrictlySplitFrom?(cs0, SuffixedElementsSpec);
+        }
+        assert elems'.cs.SplitFrom?(cs0) by {
+          assert elems'.cs.StrictlySplitFrom?(cs0) by {
+            assert elems'.StrictlySplitFrom?(cs0, SuffixedElementsSpec);
+          }
+        }
+      }
+      elems'
+    }
+
+    @ResourceLimit("10e6")
+    @IsolateAssertions
+    function AppendLast(
+      ghost cs0: FreshCursor,
+      ghost json: ValueParser,
+      elems: Split<seq<TSuffixedElement>>,
+      elem: Split<TElement>,
+      sep: Split<Structural<jclose>>)
+      : (elems': Split<seq<TSuffixedElement>>)
+      requires elems.cs.StrictlySplitFrom?(json.cs)
+      requires elems.SplitFrom?(cs0, SuffixedElementsSpec)
+      requires elem.StrictlySplitFrom?(elems.cs, ElementSpec)
+      requires sep.StrictlySplitFrom?(elem.cs, c => Spec.Structural(c, SpecView))
+      requires forall e | e in elems.t :: e.suffix.NonEmpty?
+      ensures elems'.StrictlySplitFrom?(cs0, SuffixedElementsSpec)
+      ensures NoTrailingSuffix(elems'.t)
+      ensures elems'.cs.Length() < elems.cs.Length()
+      ensures elems'.cs.StrictlySplitFrom?(json.cs)
+      ensures sep.StrictlySplitFrom?(elems'.cs, c => Spec.Structural(c, SpecView))
+    {
+      var suffixed := Suffixed(elem.t, Empty());
+      var elems' := SP(elems.t + [suffixed], elem.cs);
+
+      assert cs0.Bytes() == SuffixedElementsSpec(elems'.t) + elem.cs.Bytes() by {
+        assert cs0.Bytes() == SuffixedElementsSpec(elems.t) + ElementSpec(suffixed.t) + elem.cs.Bytes() by {
+          assert elem.t == suffixed.t;
+        }
+        assert SuffixedElementsSpec(elems.t) + ElementSpec(suffixed.t) + elem.cs.Bytes() == SuffixedElementsSpec(elems'.t) + elem.cs.Bytes() by {
+          assert SuffixedElementsSpec(elems.t) + SuffixedElementSpec(suffixed) == SuffixedElementsSpec(elems.t + [suffixed]) by {
+            SpecProperties.ConcatBytes_Linear(elems.t, [suffixed], SuffixedElementSpec);
+            assert Spec.ConcatBytes(elems.t, SuffixedElementSpec) + Spec.ConcatBytes([suffixed], SuffixedElementSpec) ==  Spec.ConcatBytes(elems.t + [suffixed], SuffixedElementSpec);
+          }
+        }
+      }
+
+      assert elems'.StrictlySplitFrom?(cs0, SuffixedElementsSpec);
+      elems'
+    }
+
+    @ResourceLimit("10e6")
+    @IsolateAssertions
+    lemma AboutTryStructural(cs: FreshCursor)
+      ensures
+        var sp := Core.TryStructural(cs);
+        var s0 := sp.t.t.Peek();
+        && ((!cs.BOF? || !cs.EOF?) && s0 == SEPARATOR as opt_byte ==> var sp: Split<Structural<jcomma>> := sp; sp.cs.StrictSuffixOf?(cs))
+        && (s0 == SEPARATOR as opt_byte ==> var sp: Split<Structural<jcomma>> := sp; sp.SplitFrom?(cs, st => Spec.Structural(st, SpecView)))
+        && ((!cs.BOF? || !cs.EOF?) && s0 == CLOSE as opt_byte ==> var sp: Split<Structural<jclose>> := sp; sp.cs.StrictSuffixOf?(cs))
+        && (s0 == CLOSE as opt_byte ==> var sp: Split<Structural<jclose>> := sp; sp.SplitFrom?(cs, st => Spec.Structural(st, SpecView)))
+    {
+      var sp := Core.TryStructural(cs);
+      var s0 := sp.t.t.Peek();
+      assert (!cs.BOF? || !cs.EOF?) && s0 == SEPARATOR as opt_byte ==> var sp: Split<Structural<jcomma>> := sp; sp.cs.StrictSuffixOf?(cs);
+      assert s0 == SEPARATOR as opt_byte ==> var sp: Split<Structural<jcomma>> := sp; sp.SplitFrom?(cs, st => Spec.Structural(st, SpecView));
+      assert (!cs.BOF? || !cs.EOF?) && s0 == CLOSE as opt_byte ==> var sp: Split<Structural<jclose>> := sp; sp.cs.StrictSuffixOf?(cs);
+      assert s0 == CLOSE as opt_byte ==> var sp: Split<Structural<jclose>> := sp; sp.SplitFrom?(cs, st => Spec.Structural(st, SpecView));
+    }
+
+    @IsolateAssertions
+    lemma AboutLists<T>(xs: seq<T>, i: uint32)
+      requires 0 <= (i as int) < |xs|
+      ensures xs[(i as int)..(i as int)+1] == [xs[i as int]]
+    {}
+
+    // The implementation and proof of this function is more painful than
+    // expected due to the tail recursion.
+    @IsolateAssertions
+    @TailRecursion
+    function Elements(
+      ghost cs0: FreshCursor,
+      json: ValueParser,
+      open: Split<Structural<jopen>>,
+      elems: Split<seq<TSuffixedElement>>
+    ) // DISCUSS: Why is this function reverified once per instantiation of the module?
+      : (pr: ParseResult<TBracketed>)
+      requires open.StrictlySplitFrom?(cs0, c => Spec.Structural(c, SpecView))
+      requires elems.cs.StrictlySplitFrom?(json.cs)
+      requires elems.SplitFrom?(open.cs, SuffixedElementsSpec)
+      requires forall e | e in elems.t :: e.suffix.NonEmpty?
+      decreases elems.cs.Length()
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs0, BracketedSpec)
+    {
+      var elem :- Element(elems.cs, json);
+      if elem.cs.EOF? then
+        Failure(EOF)
+      else
+        AboutTryStructural(elem.cs);
+        var sep := Core.TryStructural(elem.cs);
+        var s0 := sep.t.t.Peek();
+        if s0 == SEPARATOR as opt_byte && sep.t.t.Length() == 1 then
+          assert sep.t.t.Char?(',') by {
+            calc {
+              sep.t.t.Char?(',');
+              sep.t.t.Byte?(',' as byte);
+              sep.t.t.Byte?(SEPARATOR);
+              sep.t.t.Bytes() == [SEPARATOR];
+              sep.t.t.s[(sep.t.t.beg as int)..(sep.t.t.end as int)] == [SEPARATOR];
+              { assert (sep.t.t.beg as int) + 1 == (sep.t.t.end as int) by { assert sep.t.t.Length() == 1; } }
+              sep.t.t.s[(sep.t.t.beg as int)..(sep.t.t.beg as int) + 1] == [SEPARATOR];
+              { assert sep.t.t.s[(sep.t.t.beg as int)..(sep.t.t.beg as int) + 1] == [sep.t.t.s[sep.t.t.beg as int]] by { AboutLists(sep.t.t.s, sep.t.t.beg); } }
+              [sep.t.t.s[sep.t.t.beg as int]] == [SEPARATOR];
+              sep.t.t.s[sep.t.t.beg as int] as opt_byte == SEPARATOR as opt_byte;
+              sep.t.t.At(0) as opt_byte == SEPARATOR as opt_byte;
+              (s0 == SEPARATOR as opt_byte);
+              true;
+            }
+          }
+          var sep: Split<Structural<jcomma>> := sep;
+          assert AppendWithSuffix.requires(open.cs, json, elems, elem, sep) by {
+            assert {:focus} elems.cs.StrictlySplitFrom?(json.cs);
+            assert elems.SplitFrom?(open.cs, SuffixedElementsSpec);
+            assert elem.StrictlySplitFrom?(elems.cs, ElementSpec);
+            assert sep.StrictlySplitFrom?(elem.cs, c => Spec.Structural(c, SpecView)) by {
+              assert sep.BytesSplitFrom?(elem.cs, c => Spec.Structural(c, SpecView)) by {
+                assert sep.SplitFrom?(elem.cs, c => Spec.Structural(c, SpecView));
+              }
+              assert sep.cs.StrictlySplitFrom?(elem.cs) by {
+                assert sep.cs.BOF?;
+                assert sep.cs.StrictSuffixOf?(elem.cs) by {
+                  assert !elem.cs.EOF?;
+                }
+              }
+            }
+            assert forall e | e in elems.t :: e.suffix.NonEmpty?;
+            assert {:split_here} true;
+          }
+          var elems := AppendWithSuffix(open.cs, json, elems, elem, sep);
+          Elements(cs0, json, open, elems)
+        else if s0 == CLOSE as opt_byte && sep.t.t.Length() == 1 then
+          assert sep.t.t.Byte?(CLOSE) by {
+            calc {
+              sep.t.t.Byte?(CLOSE);
+              sep.t.t.Bytes() == [CLOSE];
+              sep.t.t.s[(sep.t.t.beg as int)..(sep.t.t.end as int)] == [CLOSE];
+              { assert (sep.t.t.beg as int) + 1 == (sep.t.t.end as int) by { assert sep.t.t.Length() == 1; } }
+              sep.t.t.s[(sep.t.t.beg as int)..(sep.t.t.beg as int) + 1] == [CLOSE];
+              { assert sep.t.t.s[(sep.t.t.beg as int)..(sep.t.t.beg as int) + 1] == [sep.t.t.s[sep.t.t.beg as int]] by { AboutLists(sep.t.t.s, sep.t.t.beg); } }
+              [sep.t.t.s[sep.t.t.beg as int]] == [CLOSE];
+              sep.t.t.s[sep.t.t.beg as int] as opt_byte == CLOSE as opt_byte;
+              sep.t.t.At(0) as opt_byte == CLOSE as opt_byte;
+              (s0 == CLOSE as opt_byte);
+              true;
+            }
+          }
+          var sep: Split<Structural<jclose>> := sep;
+          assert AppendLast.requires(open.cs, json, elems, elem, sep) by {
+            assert elems.cs.StrictlySplitFrom?(json.cs);
+            assert elems.SplitFrom?(open.cs, SuffixedElementsSpec);
+            assert elem.StrictlySplitFrom?(elems.cs, ElementSpec);
+            assert sep.StrictlySplitFrom?(elem.cs, c => Spec.Structural(c, SpecView)) by {
+              assert sep.BytesSplitFrom?(elem.cs, c => Spec.Structural(c, SpecView)) by {
+                assert sep.SplitFrom?(elem.cs, c => Spec.Structural(c, SpecView));
+              }
+              assert sep.cs.StrictlySplitFrom?(elem.cs) by {
+                assert sep.cs.BOF?;
+                assert sep.cs.StrictSuffixOf?(elem.cs) by {
+                  assert !elem.cs.EOF?;
+                }
+              }
+            }
+            assert forall e | e in elems.t :: e.suffix.NonEmpty?;
+          }
+          var elems' := AppendLast(open.cs, json, elems, elem, sep);
+          assert elems'.SplitFrom?(open.cs, SuffixedElementsSpec) by {
+            assert elems'.StrictlySplitFrom?(open.cs, SuffixedElementsSpec);
+          }
+          var bracketed := BracketedFromParts(cs0, open, elems', sep);
+          assert bracketed.StrictlySplitFrom?(cs0, BracketedSpec);
+          Success(bracketed)
+        else
+          var separator := SEPARATOR;
+          var pr := Failure(ExpectingAnyByte([CLOSE, separator], s0));
+          pr
+    }
+
+    lemma AboutCloseParser()
+      ensures Parsers.Parser(Close, SpecViewClose).Valid?()
+    {
+      assert Parsers.Parser(Close, SpecViewClose).Valid?() by {
+        forall cs': FreshCursor ensures Close(cs').Success? ==> Close(cs').value.StrictlySplitFrom?(cs', SpecViewClose) {
+          if Close(cs').Success? {
+            assert Close(cs').value.StrictlySplitFrom?(cs', SpecViewClose) by {
+              assert Close(cs').Success? ==> Close(cs').value.StrictlySplitFrom?(cs', SpecViewClose);
+            }
+          }
+        }
+      }
+    }
+
+    @IsolateAssertions
+    function Bracketed(cs: FreshCursor, json: ValueParser)
+      : (pr: ParseResult<TBracketed>)
+      requires cs.SplitFrom?(json.cs)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, BracketedSpec)
+    {
+      var open :- Core.Structural<jopen>(cs, Parsers.Parser(Open, SpecViewOpen));
+      assert open.cs.StrictlySplitFrom?(json.cs);
+      var elems := SP([], open.cs);
+      if open.cs.Peek() == CLOSE as opt_byte then
+        var p := Parsers.Parser(Close, SpecViewClose);
+        assert p.Valid?() by {
+          AboutCloseParser();
+        }
+        var close :- Core.Structural<jclose>(open.cs, p);
+        Success(BracketedFromParts(cs, open, elems, close))
+      else
+        Elements(cs, json, open, elems)
+    }
+
+    lemma Valid(x: TBracketed)
+      ensures x.l.t.Byte?(OPEN)
+      ensures x.r.t.Byte?(CLOSE)
+      ensures NoTrailingSuffix(x.data)
+      ensures forall pf | pf in x.data ::
+                pf.suffix.NonEmpty? ==> pf.suffix.t.t.Byte?(SEPARATOR)
+    { // DISCUSS: Why is this lemma needed?  Why does it require a body?
+      var xlt: jopen := x.l.t;
+      var xrt: jclose := x.r.t;
+      forall pf | pf in x.data
+        ensures pf.suffix.NonEmpty? ==> pf.suffix.t.t.Byte?(SEPARATOR)
+      {
+        if pf.suffix.NonEmpty? {
+          var xtt := pf.suffix.t.t;
+        }
+      }
+    }
+  }
+
+  module API {
+    import opened BoundedInts
+    import opened Wrappers
+
+    import opened Vs = Utils.Views.Core
+    import opened Grammar
+    import opened Core
+    import opened Errors
+    import Utils.Cursors
+    import Values
+
+    function LiftCursorError(err: Cursors.CursorError<DeserializationError>): DeserializationError {
+      match err
+      case EOF => ReachedEOF
+      case ExpectingByte(expected, b) => ExpectingByte(expected, b)
+      case ExpectingAnyByte(expected_sq, b) => ExpectingAnyByte(expected_sq, b)
+      case OtherError(err) => err
+    }
+
+    @IsolateAssertions
+    @ResourceLimit("10e6")
+    function JSON(cs: Cursors.FreshCursor) : (pr: DeserializationResult<Cursors.Split<JSON>>)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, Spec.JSON)
+    {
+      Core.Structural(cs, Parsers.Parser(Values.Value, Spec.Value)).MapFailure(LiftCursorError)
+    }
+
+    function Text(v: View) : (jsr: DeserializationResult<JSON>)
+      ensures jsr.Success? ==> v.Bytes() == Spec.JSON(jsr.value)
+    {
+      var SP(text, cs) :- JSON(Cursors.Cursor.OfView(v));
+      assert Cursors.SP(text, cs).BytesSplitFrom?(Cursors.Cursor.OfView(v), Spec.JSON);
+      assert v.Bytes() == Spec.JSON(text) + cs.Bytes();
+      :- Need(cs.EOF?, Errors.ExpectingEOF);
+      assert cs.Bytes() == [];
+      Success(text)
+    }
+
+    function OfBytes(bs: bytes) : (jsr: DeserializationResult<JSON>)
+      ensures jsr.Success? ==> bs == Spec.JSON(jsr.value)
+    {
+      :- Need(|bs| < TWO_TO_THE_32, Errors.IntOverflow);
+      Text(Vs.View.OfBytes(bs))
+    }
+  }
+
+  module Values {
+    import Strings
+    import Numbers
+    import Objects
+    import Arrays
+    import Constants
+    import ConcreteSyntax.SpecProperties
+    import opened BoundedInts
+    import opened Wrappers
+    import opened Grammar
+    import opened Utils.Cursors
+    import opened Core
+
+    @IsolateAssertions
+    function Value(cs: FreshCursor) : (pr: ParseResult<Value>)
+      decreases cs.Length(), 1
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, Spec.Value)
+    {
+      var c := cs.Peek();
+      if c == '{' as opt_byte then
+        var SP(obj, cs') :- Objects.Object(cs, ValueParser(cs));
+        var v := Grammar.Object(obj);
+        var sp := SP(v, cs');
+        assert sp.StrictlySplitFrom?(cs, Spec.Value) by {
+          Spec.UnfoldValueObject(v);
+          assert SP(obj, cs').StrictlySplitFrom?(cs, Spec.Object);
+        }
+        Spec.UnfoldValueObject(v);
+        assert sp.StrictlySplitFrom?(cs, Spec.Value);
+        Success(sp)
+      else if c == '[' as opt_byte then
+        var SP(arr, cs') :- Arrays.Array(cs, ValueParser(cs));
+        var v := Grammar.Array(arr);
+        var sp := SP(v, cs');
+        assert sp.StrictlySplitFrom?(cs, Spec.Value) by {
+          assert SP(arr, cs').StrictlySplitFrom?(cs, Spec.Array);
+          Spec.UnfoldValueArray(v);
+        }
+        assert sp.StrictlySplitFrom?(cs, Spec.Value);
+        Success(sp)
+      else if c == '\"' as opt_byte then
+        var SP(str, cs') :- Strings.String(cs);
+        assert (SP(Grammar.String(str), cs')).StrictlySplitFrom?(cs, Spec.Value) by {
+          calc {
+            (SP(Grammar.String(str), cs')).StrictlySplitFrom?(cs, Spec.Value);
+            cs'.StrictlySplitFrom?(cs) && (SP(Grammar.String(str), cs')).BytesSplitFrom?(cs, Spec.Value);
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == Spec.Value(Grammar.String(str)) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == Spec.String(str) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && SP(str, cs').BytesSplitFrom?(cs, Spec.String);
+            SP(str, cs').StrictlySplitFrom?(cs, Spec.String);
+            true;
+          }
+        }
+        Success(SP(Grammar.String(str), cs'))
+      else if c == 't' as opt_byte then
+        var SP(cst, cs') :- Constants.Constant(cs, TRUE);
+        assert (SP(Grammar.Bool(cst), cs')).StrictlySplitFrom?(cs, Spec.Value) by {
+          var f := _ => TRUE;
+          calc {
+            (SP(Grammar.Bool(cst), cs')).StrictlySplitFrom?(cs, Spec.Value);
+            cs'.StrictlySplitFrom?(cs) && (SP(Grammar.Bool(cst), cs')).BytesSplitFrom?(cs, Spec.Value);
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == Spec.Value(Grammar.Bool(cst)) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == Spec.View(cst) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == cst.Bytes() + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == TRUE + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == f(Grammar.Bool(cst)) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (SP(Grammar.Bool(cst), cs')).BytesSplitFrom?(cs, f);
+            { assert cs'.StrictlySplitFrom?(cs) <==> cs'.SplitFrom?(cs) by { assert cs' != cs; } }
+            cs'.SplitFrom?(cs) && (SP(Grammar.Bool(cst), cs')).BytesSplitFrom?(cs, f);
+            (SP(Grammar.Bool(cst), cs')).SplitFrom?(cs, f);
+            true;
+          }
+        }
+        Success(SP(Grammar.Bool(cst), cs'))
+      else if c == 'f' as opt_byte then
+        var SP(cst, cs') :- Constants.Constant(cs, FALSE);
+        assert (SP(Grammar.Bool(cst), cs')).StrictlySplitFrom?(cs, Spec.Value) by {
+          var f := _ => FALSE;
+          calc {
+            (SP(Grammar.Bool(cst), cs')).StrictlySplitFrom?(cs, Spec.Value);
+            cs'.StrictlySplitFrom?(cs) && (SP(Grammar.Bool(cst), cs')).BytesSplitFrom?(cs, Spec.Value);
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == Spec.Value(Grammar.Bool(cst)) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == Spec.View(cst) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == cst.Bytes() + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == FALSE + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == f(Grammar.Bool(cst)) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (SP(Grammar.Bool(cst), cs')).BytesSplitFrom?(cs, f);
+            { assert cs'.StrictlySplitFrom?(cs) <==> cs'.SplitFrom?(cs) by { assert cs' != cs; } }
+            cs'.SplitFrom?(cs) && (SP(Grammar.Bool(cst), cs')).BytesSplitFrom?(cs, f);
+            (SP(Grammar.Bool(cst), cs')).SplitFrom?(cs, f);
+            true;
+          }
+        }
+        Success(SP(Grammar.Bool(cst), cs'))
+      else if c == 'n' as opt_byte then
+        var SP(cst, cs') :- Constants.Constant(cs, NULL);
+        assert (SP(Grammar.Null(cst), cs')).StrictlySplitFrom?(cs, Spec.Value) by {
+          var f := _ => NULL;
+          calc {
+            (SP(Grammar.Null(cst), cs')).StrictlySplitFrom?(cs, Spec.Value);
+            cs'.StrictlySplitFrom?(cs) && (SP(Grammar.Null(cst), cs')).BytesSplitFrom?(cs, Spec.Value);
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == Spec.Value(Grammar.Null(cst)) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == Spec.View(cst) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == cst.Bytes() + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == NULL + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (cs.Bytes() == f(Grammar.Null(cst)) + cs'.Bytes());
+            cs'.StrictlySplitFrom?(cs) && (SP(Grammar.Null(cst), cs')).BytesSplitFrom?(cs, f);
+            { assert cs'.StrictlySplitFrom?(cs) <==> cs'.SplitFrom?(cs) by { assert cs' != cs; } }
+            cs'.SplitFrom?(cs) && (SP(Grammar.Null(cst), cs')).BytesSplitFrom?(cs, f);
+            (SP(Grammar.Null(cst), cs')).SplitFrom?(cs, f);
+            true;
+          }
+        }
+        Success(SP(Grammar.Null(cst), cs'))
+      else
+        var SP(num, cs') :- Numbers.Number(cs);
+        var v := Grammar.Number(num);
+        var sp := SP(v, cs');
+        assert sp.StrictlySplitFrom?(cs, Spec.Value) by {
+          assert SP(num, cs').StrictlySplitFrom?(cs, Spec.Number);
+          Spec.UnfoldValueNumber(v);
+        }
+        assert sp.StrictlySplitFrom?(cs, Spec.Value);
+        Success(sp)
+    }
+
+    function ValueParser(cs: FreshCursor) : (p: ValueParser)
+      decreases cs.Length(), 0
+      ensures cs.SplitFrom?(p.cs)
+    {
+      var pre := (ps': FreshCursor) => ps'.Length() < cs.Length();
+      var fn := (ps': FreshCursor) requires pre(ps') => Value(ps');
+      Parsers.SubParser(cs, pre, fn, Spec.Value)
+    }
+  }
+
+  module Constants {
+    import opened BoundedInts
+    import opened Wrappers
+    import opened Grammar
+    import opened Core
+    import opened Utils.Cursors
+
+    function Constant(cs: FreshCursor, expected: bytes) : (pr: ParseResult<Vs.View>)
+      requires |expected| < TWO_TO_THE_32
+      ensures pr.Success? ==> pr.value.t.Bytes() == expected
+      ensures pr.Success? ==> pr.value.SplitFrom?(cs, _ => expected)
+    {
+      var cs :- cs.AssertBytes(expected);
+      Success(cs.Split())
+    }
+  }
+
+  module Strings {
+    import opened Wrappers
+    import opened BoundedInts
+    import opened Grammar
+    import opened Utils.Cursors
+    import opened LC = Utils.Lexers.Core
+    import opened Utils.Lexers.Strings
+    import opened Utils.Parsers
+    import opened Core
+
+    function StringBody(cs: Cursor): (pr: CursorResult<JSONError>)
+      ensures pr.Success? ==> pr.value.AdvancedFrom?(cs)
+    {
+      cs.SkipWhileLexer(Strings.StringBody, StringBodyLexerStart)
+    } by method {
+      var escaped := false;
+      for point' := cs.point to cs.end
+        // BUG(https://github.com/dafny-lang/dafny/issues/4847)
+        invariant var csAfter := cs.(point := point'); csAfter.Valid?
+        invariant var csAfter := cs.(point := point'); csAfter.SkipWhileLexer(Strings.StringBody, escaped) == StringBody(cs)
+      {
+        var byte := cs.s[point'];
+        if byte == '\"' as byte && !escaped {
+          return Success(Cursor(cs.s, cs.beg, point', cs.end));
+        } else if byte == '\\' as byte {
+          escaped := !escaped;
+        } else {
+          escaped := false;
+        }
+      }
+      return Failure(EOF);
+    }
+
+    function Quote(cs: FreshCursor) : (pr: ParseResult<jquote>)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, SpecView)
+    {
+      var cs :- cs.AssertChar('\"');
+      Success(cs.Split())
+    }
+
+    @ResourceLimit("10e6")
+    function String(cs: FreshCursor): (pr: ParseResult<jstring>)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, Spec.String)
+    {
+      var origCs := cs;
+      var SP(lq, cs) :- Quote(cs);
+      var contents :- StringBody(cs);
+      var SP(contents, cs) := contents.Split();
+      var SP(rq, cs) :- Quote(cs);
+      var result := SP(Grammar.JString(lq, contents, rq), cs);
+      assert result.StrictlySplitFrom?(origCs, Spec.String);
+      Success(result)
+    }
+  }
+
+  module Numbers {
+    import opened BoundedInts
+    import opened Wrappers
+    import opened Grammar
+    import opened Utils.Cursors
+    import opened Core
+
+    function Digits(cs: FreshCursor) : (sp: Split<jdigits>)
+      ensures sp.SplitFrom?(cs, SpecView)
+    {
+      cs.SkipWhile(Digit?).Split()
+    }
+
+    function NonEmptyDigits(cs: FreshCursor) : (pr: ParseResult<jnum>)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, SpecView)
+    {
+      var sp := Digits(cs);
+      if sp.t.Empty? then
+        Failure(OtherError(Errors.EmptyNumber))
+      else
+        Success(sp)
+    }
+
+    function NonZeroInt(cs: FreshCursor) : (pr: ParseResult<jint>)
+      requires cs.Peek() != '0' as opt_byte
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, SpecView)
+    {
+      NonEmptyDigits(cs)
+    }
+
+    function OptionalMinus(cs: FreshCursor) : (sp: Split<jminus>)
+      ensures sp.SplitFrom?(cs, SpecView)
+    {
+      cs.SkipIf(c => c == '-' as byte).Split()
+    }
+
+    function OptionalSign(cs: FreshCursor) : (sp: Split<jsign>)
+      ensures sp.SplitFrom?(cs, SpecView)
+    {
+      cs.SkipIf(c => c == '-' as byte || c == '+' as byte).Split()
+    }
+
+    function TrimmedInt(cs: FreshCursor) : (pr: ParseResult<jint>)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, SpecView)
+    {
+      var sp := cs.SkipIf(c => c == '0' as byte).Split();
+      if sp.t.Empty? then NonZeroInt(sp.cs)
+      else Success(sp)
+    }
+
+    @IsolateAssertions
+    @ResourceLimit("1e9")
+    function Exp(cs: FreshCursor) : (pr: ParseResult<Maybe<jexp>>)
+      ensures pr.Success? ==> pr.value.SplitFrom?(cs, exp => Spec.Maybe(exp, Spec.Exp))
+    {
+      var SP(e, cs) :=
+        cs.SkipIf(c => c == 'e' as byte || c == 'E' as byte).Split();
+      if e.Empty? then
+        Success(SP(Empty(), cs))
+      else
+        assert e.Char?('e') || e.Char?('E');
+        var SP(sign, cs) := OptionalSign(cs);
+        var SP(num, cs) :- NonEmptyDigits(cs);
+        Success(SP(NonEmpty(JExp(e, sign, num)), cs))
+    }
+
+    function Frac(cs: FreshCursor) : (pr: ParseResult<Maybe<jfrac>>)
+      ensures pr.Success? ==> pr.value.SplitFrom?(cs, frac => Spec.Maybe(frac, Spec.Frac))
+    {
+      var SP(period, cs) :=
+        cs.SkipIf(c => c == '.' as byte).Split();
+      if period.Empty? then
+        Success(SP(Empty(), cs))
+      else
+        assert Digits(cs).t.Empty? ==> NonEmptyDigits(cs).Failure?;
+        var SP(num, cs) :- NonEmptyDigits(cs);
+        Success(SP(NonEmpty(JFrac(period, num)), cs))
+    }
+
+    function NumberFromParts(
+      ghost cs: Cursor,
+      minus: Split<jminus>, num: Split<jint>,
+      frac: Split<Maybe<jfrac>>, exp: Split<Maybe<jexp>>
+    )
+      : (sp: Split<jnumber>)
+      requires minus.SplitFrom?(cs, SpecView)
+      requires num.StrictlySplitFrom?(minus.cs, SpecView)
+      requires frac.SplitFrom?(num.cs, frac => Spec.Maybe(frac, Spec.Frac))
+      requires exp.SplitFrom?(frac.cs, exp => Spec.Maybe(exp, Spec.Exp))
+      ensures sp.StrictlySplitFrom?(cs, Spec.Number)
+    {
+      var sp := SP(Grammar.JNumber(minus.t, num.t, frac.t, exp.t), exp.cs);
+      assert cs.Bytes() == Spec.Number(sp.t) + exp.cs.Bytes() by {
+        assert cs.Bytes() == Spec.View(minus.t) + Spec.View(num.t) + Spec.Maybe(frac.t, Spec.Frac) + Spec.Maybe(exp.t, Spec.Exp) + exp.cs.Bytes() by {
+          assert cs.Bytes() == Spec.View(minus.t) + minus.cs.Bytes();
+          assert minus.cs.Bytes() == Spec.View(num.t) + num.cs.Bytes();
+          assert num.cs.Bytes() == Spec.Maybe(frac.t, Spec.Frac) + frac.cs.Bytes();
+          assert frac.cs.Bytes() == Spec.Maybe(exp.t, Spec.Exp) + exp.cs.Bytes();
+          Seq.LemmaConcatIsAssociative(Spec.View(minus.t), Spec.View(num.t), num.cs.Bytes());
+          Seq.LemmaConcatIsAssociative(Spec.View(minus.t) + Spec.View(num.t), Spec.Maybe(frac.t, Spec.Frac), frac.cs.Bytes());
+          Seq.LemmaConcatIsAssociative(Spec.View(minus.t) + Spec.View(num.t) + Spec.Maybe(frac.t, Spec.Frac), Spec.Maybe(exp.t, Spec.Exp), exp.cs.Bytes());
+        }
+      }
+      assert sp.StrictlySplitFrom?(cs, Spec.Number);
+      sp
+    }
+
+    function Number(cs: FreshCursor) : (pr: ParseResult<jnumber>)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, Spec.Number)
+    {
+      var minus := OptionalMinus(cs);
+      var num :- TrimmedInt(minus.cs);
+      var frac :- Frac(num.cs);
+      var exp :- Exp(frac.cs);
+      Success(NumberFromParts(cs, minus, num, frac, exp))
+    }
+  }
+
+  module ArrayParams refines SequenceParams {
+    import opened Strings
+    import opened Wrappers
+
+    type TElement = Value
+
+    const OPEN := '[' as byte
+    const CLOSE := ']' as byte
+
+    function ElementSpec(t: TElement) : bytes {
+      Spec.Value(t)
+    }
+
+    function Element(cs: FreshCursor, json: ValueParser) : (pr: ParseResult<TElement>)
+    {
+      json.fn(cs)
+    }
+  }
+
+  module Arrays refines Sequences {
+    import opened Params = ArrayParams
+
+    @IsolateAssertions
+    lemma BracketedToArray(arr: jarray)
+      ensures Spec.Bracketed(arr, SuffixedElementSpec) == Spec.Array(arr)
+    {
+      var rItem := (d: jitem) requires d < arr => Spec.Item(d);
+      assert Spec.Bracketed(arr, SuffixedElementSpec) == Spec.Bracketed(arr, rItem) by {
+        assert SpecProperties.Bracketed_Morphism_Requires(arr, SuffixedElementSpec, rItem);
+        SpecProperties.Bracketed_Morphism(arr, SuffixedElementSpec, rItem);
+      }
+      calc {
+        Spec.Bracketed(arr, SuffixedElementSpec);
+        Spec.Bracketed(arr, rItem);
+        Spec.Array(arr);
+      }
+    }
+
+    @IsolateAssertions
+    function Array(cs: FreshCursor, json: ValueParser)
+      : (pr: ParseResult<jarray>)
+      requires cs.SplitFrom?(json.cs)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, Spec.Array)
+    {
+      var sp :- Bracketed(cs, json);
+      assert sp.StrictlySplitFrom?(cs, BracketedSpec);
+      BracketedToArray(sp.t);
+      Success(sp)
+    }
+  }
+
+  module ObjectParams refines SequenceParams {
+    import Strings
+    import opened Wrappers
+
+    type TElement = jKeyValue
+
+    const OPEN := '{' as byte
+    const CLOSE := '}' as byte
+
+    function Colon(cs: FreshCursor) : (pr: ParseResult<jcolon>) // DISCUSS: Why can't I make this opaque?
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, SpecView)
+    {
+      var cs :- cs.AssertChar(':');
+      Success(cs.Split())
+    }
+
+    function KeyValueFromParts(ghost cs: Cursor, k: Split<jstring>,
+                               colon: Split<Structural<jcolon>>, v: Split<Value>)
+      : (sp: Split<jKeyValue>)
+      requires k.StrictlySplitFrom?(cs, Spec.String)
+      requires colon.StrictlySplitFrom?(k.cs, c => Spec.Structural(c, SpecView))
+      requires v.StrictlySplitFrom?(colon.cs, Spec.Value)
+      ensures sp.StrictlySplitFrom?(cs, ElementSpec)
+    {
+      var sp := SP(Grammar.KeyValue(k.t, colon.t, v.t), v.cs);
+      assert cs.Bytes() == Spec.KeyValue(sp.t) + v.cs.Bytes() by {
+        assert cs.Bytes() == Spec.String(k.t) + Spec.Structural(colon.t, SpecView) + Spec.Value(v.t) + v.cs.Bytes() by {
+          assert cs.Bytes() == Spec.String(k.t) + k.cs.Bytes();
+          assert k.cs.Bytes() == Spec.Structural(colon.t, SpecView) + colon.cs.Bytes();
+          assert colon.cs.Bytes() == Spec.Value(v.t) + v.cs.Bytes();
+          Seq.LemmaConcatIsAssociative(Spec.String(k.t), Spec.Structural(colon.t, SpecView), colon.cs.Bytes());
+          Seq.LemmaConcatIsAssociative(Spec.String(k.t) + Spec.Structural(colon.t, SpecView), Spec.Value(v.t), v.cs.Bytes());
+        }
+      }
+      assert sp.StrictlySplitFrom?(cs, ElementSpec);
+      sp
+    }
+
+    function ElementSpec(t: TElement) : bytes {
+      Spec.KeyValue(t)
+    }
+
+    @IsolateAssertions
+    function Element(cs: FreshCursor, json: ValueParser)
+      : (pr: ParseResult<TElement>)
+    {
+      var k :- Strings.String(cs);
+      assert k.cs.StrictlySplitFrom?(json.cs);
+      assert k.StrictlySplitFrom?(cs, Spec.String);
+      var p := Parsers.Parser(Colon, SpecView);
+      assert p.Valid?();
+      var colon :- Core.Structural(k.cs, p);
+      assert colon.StrictlySplitFrom?(k.cs, st => Spec.Structural(st, SpecView));
+      assert colon.cs.StrictlySplitFrom?(json.cs);
+
+      assert json.fn.requires(colon.cs) by {
+        assert json.pre(colon.cs) by {
+          assert colon.cs.StrictlySplitFrom?(json.cs);
+          assert json.Valid?();
+        }
+        assert json.Valid?();
+      }
+
+      var v :- json.fn(colon.cs);
+
+      assert v.StrictlySplitFrom?(colon.cs, Spec.Value) by {
+        assert v.cs.StrictlySplitFrom?(colon.cs) by {
+          assert v.StrictlySplitFrom?(colon.cs, json.spec) by {
+            assert json.Valid?();
+          }
+        }
+        assert v.BytesSplitFrom?(colon.cs, Spec.Value) by {
+          calc {
+            colon.cs.Bytes();
+            { assert v.BytesSplitFrom?(colon.cs, json.spec) by { assert json.Valid?(); } }
+            json.spec(v.t) + v.cs.Bytes();
+            { assert json.spec(v.t) == Spec.Value(v.t) by { assert ValueParserValid(json); } }
+            Spec.Value(v.t) + v.cs.Bytes();
+          }
+        }
+      }
+      var kv := KeyValueFromParts(cs, k, colon, v);
+      Success(kv)
+    }
+  }
+
+  module Objects refines Sequences {
+    import opened Params = ObjectParams
+
+    @IsolateAssertions
+    lemma BracketedToObject(obj: jobject)
+      ensures Spec.Bracketed(obj, SuffixedElementSpec) == Spec.Object(obj)
+    {
+      var rMember := (d: jmember) requires d < obj => Spec.Member(d);
+      assert Spec.Bracketed(obj, SuffixedElementSpec) == Spec.Bracketed(obj, rMember) by {
+        assert Spec.Bracketed(obj, SuffixedElementSpec) == Spec.Bracketed(obj, rMember) by {
+          assert SpecProperties.Bracketed_Morphism_Requires(obj, SuffixedElementSpec, rMember);
+          SpecProperties.Bracketed_Morphism(obj, SuffixedElementSpec, rMember);
+        }
+      }
+      calc {
+        Spec.Bracketed(obj, SuffixedElementSpec);
+        Spec.Bracketed(obj, rMember);
+        Spec.Object(obj);
+      }
+    }
+
+    @IsolateAssertions
+    @ResourceLimit("10e6")
+    function Object(cs: FreshCursor, json: ValueParser)
+      : (pr: ParseResult<jobject>)
+      requires cs.SplitFrom?(json.cs)
+      ensures pr.Success? ==> pr.value.StrictlySplitFrom?(cs, Spec.Object)
+    {
+      var sp :- Bracketed(cs, json);
+      assert sp.StrictlySplitFrom?(cs, BracketedSpec);
+      BracketedToObject(sp.t);
+      Success(sp)
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/JSON/ZeroCopy/Serializer.dfy b/Source/DafnyStandardLibraries/src/Std/JSON/ZeroCopy/Serializer.dfy
new file mode 100644
index 00000000000..8790f3e4063
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/JSON/ZeroCopy/Serializer.dfy
@@ -0,0 +1,568 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/**
+ Implements low-level (zero-copy) serialization (JSON syntax trees to utf-8 bytes).
+ Proves that the serializer is sound and complete w.r.t. the functional specification
+ defined in `ConcreteSyntax.Spec.dfy`.
+ */
+module Std.JSON.ZeroCopy.Serializer {
+  import ConcreteSyntax.Spec
+  import ConcreteSyntax.SpecProperties
+  import opened BoundedInts
+  import opened Wrappers
+  import opened Seq = Collections.Seq
+  import opened Errors
+  import opened Grammar
+  import opened Utils.Views.Writers
+  import opened Vs = Utils.Views.Core
+
+  method Serialize(js: JSON) returns (rbs: SerializationResult<array<byte>>)
+    ensures rbs.Success? ==> fresh(rbs.value)
+    ensures rbs.Success? ==> rbs.value[..] == Spec.JSON(js)
+  {
+    var writer := Text(js);
+    :- Need(writer.Unsaturated?, OutOfMemory);
+    var bs := writer.ToArray();
+    return Success(bs);
+  }
+
+  method SerializeTo(js: JSON, dest: array<byte>) returns (len: SerializationResult<uint32>)
+    modifies dest
+    ensures len.Success? ==> len.value as int <= dest.Length
+    ensures len.Success? ==> dest[..len.value] == Spec.JSON(js)
+    ensures len.Success? ==> dest[len.value..] == old(dest[len.value..])
+    ensures len.Failure? ==> unchanged(dest)
+  {
+    var writer := Text(js);
+    :- Need(writer.Unsaturated?, OutOfMemory);
+    :- Need(writer.length as int <= dest.Length, OutOfMemory);
+    writer.CopyTo(dest);
+    return Success(writer.length);
+  }
+
+  function Text(js: JSON) : (wr: Writer)
+    ensures wr.Bytes() == Spec.JSON(js)
+  {
+    JSON(js)
+  }
+
+  function JSON(js: JSON, writer: Writer := Writer.Empty) : (wr: Writer)
+    ensures wr.Bytes() == writer.Bytes() + Spec.JSON(js)
+  {
+    Seq.LemmaConcatIsAssociative2(writer.Bytes(),js.before.Bytes(), Spec.Value(js.t), js.after.Bytes());
+    writer
+    .Append(js.before)
+    .Then(wr => Value(js.t, wr))
+    .Append(js.after)
+  }
+
+  @IsolateAssertions
+  function Value(v: Grammar.Value, writer: Writer) : (wr: Writer)
+    decreases v, 4
+    ensures wr.Bytes() == writer.Bytes() + Spec.Value(v)
+  {
+    match v
+    case Null(n) =>
+      var wr := writer.Append(n);
+      wr
+    case Bool(b) =>
+      var wr := writer.Append(b);
+      wr
+    case String(str) =>
+      var wr := String(str, writer);
+      calc {
+        wr.Bytes();
+        { assert wr == String(v.str, writer); }
+        writer.Bytes() + Spec.String(v.str);
+        { assert v.String?; assert v.String? ==> Spec.Value(v) == Spec.String(v.str); }
+        writer.Bytes() + Spec.Value(v);
+      }
+      wr
+    case Number(num) =>
+      var wr := Number(num, writer);
+      calc {
+        wr.Bytes();
+        { assert wr == Number(v.num, writer); }
+        writer.Bytes() + Spec.Number(v.num);
+        { assert v.Number?; assert v.Number? ==> Spec.Value(v) == Spec.Number(v.num); }
+        writer.Bytes() + Spec.Value(v);
+      }
+      wr
+    case Object(obj) =>
+      var wr := Object(obj, writer);
+      calc {
+        wr.Bytes();
+        { assert wr == Object(v.obj, writer); }
+        writer.Bytes() + Spec.Object(v.obj);
+        { assert v.Object?; assert v.Object? ==> Spec.Value(v) == Spec.Object(v.obj); }
+        writer.Bytes() + Spec.Value(v);
+      }
+      wr
+    case Array(arr) =>
+      var wr := Array(arr, writer);
+      calc {
+        wr.Bytes();
+        { assert wr == Array(v.arr, writer); }
+        writer.Bytes() + Spec.Array(v.arr);
+        { assert v.Array?; assert v.Array? ==> Spec.Value(v) == Spec.Array(v.arr); }
+        writer.Bytes() + Spec.Value(v);
+      }
+      wr
+  }
+
+  function String(str: jstring, writer: Writer) : (wr: Writer)
+    decreases str, 0
+    ensures wr.Bytes() == writer.Bytes() + Spec.String(str)
+  {
+    hide *;
+    reveal Writer.Append, Spec.String, Spec.View;
+    writer
+    .Append(str.lq)
+    .Append(str.contents)
+    .Append(str.rq)
+  }
+
+  @IsolateAssertions
+  lemma NumberHelper1(num: jnumber, writer: Writer)
+    ensures
+      if num.exp.NonEmpty? then (
+                                  if num.frac.NonEmpty? then
+                                    writer.Append(num.minus).Append(num.num).Append(num.frac.t.period).Append(num.frac.t.num).Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num).Bytes() == writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.frac.t.period.Bytes() + num.frac.t.num.Bytes() + num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes()
+                                  else
+                                    writer.Append(num.minus).Append(num.num).Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num).Bytes() == writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes()
+                                ) else (
+                                         if num.frac.NonEmpty? then
+                                           writer.Append(num.minus).Append(num.num).Append(num.frac.t.period).Append(num.frac.t.num).Bytes() == writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.frac.t.period.Bytes() + num.frac.t.num.Bytes()
+                                         else
+                                           writer.Append(num.minus).Append(num.num).Bytes() == writer.Bytes() + num.minus.Bytes() + num.num.Bytes()
+                                       )
+  {
+    if num.exp.NonEmpty? {
+      if num.frac.NonEmpty? {
+        assert writer.Append(num.minus).Append(num.num).Append(num.frac.t.period).Append(num.frac.t.num).Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num).Bytes() == writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.frac.t.period.Bytes() + num.frac.t.num.Bytes() + num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes();
+      } else {
+        assert writer.Append(num.minus).Append(num.num).Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num).Bytes() == writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes();
+      }
+    } else {
+      if num.frac.NonEmpty? {
+        assert writer.Append(num.minus).Append(num.num).Append(num.frac.t.period).Append(num.frac.t.num).Bytes() == writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.frac.t.period.Bytes() + num.frac.t.num.Bytes();
+      } else {
+        assert writer.Append(num.minus).Append(num.num).Bytes() == writer.Bytes() + num.minus.Bytes() + num.num.Bytes();
+      }
+    }
+  }
+
+  @IsolateAssertions
+  lemma NumberHelper2a(num: jnumber, writer: Writer)
+    ensures Spec.Number(num) == num.minus.Bytes() + num.num.Bytes() + Spec.Maybe(num.frac, Spec.Frac) + Spec.Maybe(num.exp, Spec.Exp)
+  {}
+
+  @IsolateAssertions
+  @ResourceLimit("10e6")
+  lemma NumberHelper2(num: jnumber, writer: Writer)
+    ensures
+      if num.exp.NonEmpty? then (
+                                  if num.frac.NonEmpty? then writer.Bytes() + Spec.Number(num) == writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.frac.t.period.Bytes() + num.frac.t.num.Bytes() + num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes() else writer.Bytes() + Spec.Number(num) == writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes()
+                                ) else (
+                                         if num.frac.NonEmpty? then writer.Bytes() + Spec.Number(num) == writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.frac.t.period.Bytes() + num.frac.t.num.Bytes() else writer.Bytes() + Spec.Number(num) == writer.Bytes() + num.minus.Bytes() + num.num.Bytes()
+                                       )
+  {
+    if num.exp.NonEmpty? {
+      if num.frac.NonEmpty? {
+        calc {
+          writer.Bytes() + Spec.Number(num);
+          { NumberHelper2a(num, writer); }
+          writer.Bytes() + (num.minus.Bytes() + num.num.Bytes() + Spec.Maybe(num.frac, Spec.Frac) + Spec.Maybe(num.exp, Spec.Exp));
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + (Spec.Maybe(num.frac, Spec.Frac) + Spec.Maybe(num.exp, Spec.Exp));
+          { assert Spec.Maybe(num.frac, Spec.Frac) == Spec.Frac(num.frac.t); assert Spec.Maybe(num.exp, Spec.Exp) == Spec.Exp(num.exp.t); }
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + (Spec.Frac(num.frac.t) + Spec.Exp(num.exp.t));
+          { assert Spec.Frac(num.frac.t) == num.frac.t.period.Bytes() + num.frac.t.num.Bytes(); assert Spec.Exp(num.exp.t) == num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes(); }
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + ((num.frac.t.period.Bytes() + num.frac.t.num.Bytes()) + (num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes()));
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.frac.t.period.Bytes() + num.frac.t.num.Bytes() + num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes();
+        }
+      } else {
+        calc {
+          writer.Bytes() + Spec.Number(num);
+          { NumberHelper2a(num, writer); }
+          writer.Bytes() + (num.minus.Bytes() + num.num.Bytes() + Spec.Maybe(num.frac, Spec.Frac) + Spec.Maybe(num.exp, Spec.Exp));
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + (Spec.Maybe(num.frac, Spec.Frac) + Spec.Maybe(num.exp, Spec.Exp));
+          { assert Spec.Maybe(num.frac, Spec.Frac) == []; assert Spec.Maybe(num.exp, Spec.Exp) == Spec.Exp(num.exp.t); }
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + ([] + Spec.Exp(num.exp.t));
+          { assert [] + Spec.Exp(num.exp.t) == Spec.Exp(num.exp.t); }
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + Spec.Exp(num.exp.t);
+          { assert Spec.Exp(num.exp.t) == num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes(); }
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + (num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes());
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes();
+        }
+      }
+    } else {
+      if num.frac.NonEmpty? {
+        calc {
+          writer.Bytes() + Spec.Number(num);
+          { NumberHelper2a(num, writer); }
+          writer.Bytes() + (num.minus.Bytes() + num.num.Bytes() + Spec.Maybe(num.frac, Spec.Frac) + Spec.Maybe(num.exp, Spec.Exp));
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + (Spec.Maybe(num.frac, Spec.Frac) + Spec.Maybe(num.exp, Spec.Exp));
+          { assert Spec.Maybe(num.exp, Spec.Exp) == []; assert Spec.Maybe(num.frac, Spec.Frac) == Spec.Frac(num.frac.t); }
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + (Spec.Frac(num.frac.t) + []);
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + Spec.Frac(num.frac.t);
+          { assert Spec.Frac(num.frac.t) == num.frac.t.period.Bytes() + num.frac.t.num.Bytes(); }
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.frac.t.period.Bytes() + num.frac.t.num.Bytes();
+        }
+      } else {
+        calc {
+          writer.Bytes() + Spec.Number(num);
+          { NumberHelper2a(num, writer); }
+          writer.Bytes() + (num.minus.Bytes() + num.num.Bytes() + Spec.Maybe(num.frac, Spec.Frac) + Spec.Maybe(num.exp, Spec.Exp));
+          { assert Spec.Maybe(num.frac, Spec.Frac) == []; assert Spec.Maybe(num.exp, Spec.Exp) == []; }
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + [] + [];
+          writer.Bytes() + num.minus.Bytes() + num.num.Bytes();
+        }
+      }
+    }
+  }
+
+  @IsolateAssertions
+  function Number(num: jnumber, writer: Writer) : (wr: Writer)
+    decreases num, 0
+    ensures wr.Bytes() == writer.Bytes() + Spec.Number(num)
+  {
+    var wr1 := writer.Append(num.minus).Append(num.num);
+    var wr2 := if num.frac.NonEmpty? then
+                 wr1.Append(num.frac.t.period).Append(num.frac.t.num)
+               else wr1;
+    var wr3 := if num.exp.NonEmpty? then
+                 wr2.Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num)
+               else wr2;
+    var wr := wr3;
+
+    calc {
+      wr.Bytes();
+      { assert wr == wr3; }
+      wr3.Bytes();
+      { assert wr3 == if num.exp.NonEmpty? then wr2.Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num) else wr2; }
+      if num.exp.NonEmpty? then wr2.Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num).Bytes() else wr2.Bytes();
+      { assert wr2 == if num.frac.NonEmpty? then wr1.Append(num.frac.t.period).Append(num.frac.t.num) else wr1; }
+      if num.exp.NonEmpty? then (
+                                  if num.frac.NonEmpty? then wr1.Append(num.frac.t.period).Append(num.frac.t.num).Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num).Bytes() else wr1.Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num).Bytes()
+                                ) else (
+                                         if num.frac.NonEmpty? then wr1.Append(num.frac.t.period).Append(num.frac.t.num).Bytes() else wr1.Bytes()
+                                       );
+      { assert wr1 == writer.Append(num.minus).Append(num.num); }
+      if num.exp.NonEmpty? then (
+                                  if num.frac.NonEmpty? then writer.Append(num.minus).Append(num.num).Append(num.frac.t.period).Append(num.frac.t.num).Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num).Bytes() else writer.Append(num.minus).Append(num.num).Append(num.exp.t.e).Append(num.exp.t.sign).Append(num.exp.t.num).Bytes()
+                                ) else (
+                                         if num.frac.NonEmpty? then writer.Append(num.minus).Append(num.num).Append(num.frac.t.period).Append(num.frac.t.num).Bytes() else writer.Append(num.minus).Append(num.num).Bytes()
+                                       );
+      { NumberHelper1(num, writer); }
+      if num.exp.NonEmpty? then (
+                                  if num.frac.NonEmpty? then writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.frac.t.period.Bytes() + num.frac.t.num.Bytes() + num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes() else writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.exp.t.e.Bytes() + num.exp.t.sign.Bytes() + num.exp.t.num.Bytes()
+                                ) else (
+                                         if num.frac.NonEmpty? then writer.Bytes() + num.minus.Bytes() + num.num.Bytes() + num.frac.t.period.Bytes() + num.frac.t.num.Bytes() else writer.Bytes() + num.minus.Bytes() + num.num.Bytes()
+                                       );
+      { NumberHelper2(num, writer); }
+      if num.exp.NonEmpty? then (
+                                  if num.frac.NonEmpty? then writer.Bytes() + Spec.Number(num) else writer.Bytes() + Spec.Number(num)
+                                ) else (
+                                         if num.frac.NonEmpty? then writer.Bytes() + Spec.Number(num) else writer.Bytes() + Spec.Number(num)
+                                       );
+      writer.Bytes() + Spec.Number(num);
+    }
+    wr
+  }
+
+  // DISCUSS: Can't be opaque, due to the lambda
+  @IsolateAssertions
+  function StructuralView(st: Structural<View>, writer: Writer) : (wr: Writer)
+    ensures wr.Bytes() == writer.Bytes() + Spec.Structural(st, Spec.View)
+  {
+    writer.Append(st.before).Append(st.t).Append(st.after)
+  }
+
+  lemma StructuralViewEns(st: Structural<View>, writer: Writer)
+    ensures StructuralView(st, writer).Bytes() == writer.Bytes() + Spec.Structural(st, Spec.View)
+  {}
+
+  // FIXME refactor below to merge
+  lemma BracketedToObject(obj: jobject)
+    ensures Spec.Bracketed(obj, Spec.Member) == Spec.Object(obj)
+  {
+    var rMember := (d: jmember) requires d < obj => Spec.Member(d);
+    assert Spec.Bracketed(obj, Spec.Member) == Spec.Bracketed(obj, rMember) by {
+      // We call ``ConcatBytes`` with ``Spec.Member``, whereas the spec calls it
+      // with ``(d: jmember) requires d in obj.data => Spec.Member(d)``.  That's
+      // why we need an explicit cast, which is performed by the lemma below.
+      assert SpecProperties.Bracketed_Morphism_Requires(obj, Spec.Member, rMember);
+      SpecProperties.Bracketed_Morphism(obj, Spec.Member, rMember);
+    }
+    calc {
+      Spec.Bracketed(obj, Spec.Member);
+      Spec.Bracketed(obj, rMember);
+      Spec.Object(obj);
+    }
+  }
+
+  function Object(obj: jobject, writer: Writer) : (wr: Writer)
+    decreases obj, 3
+    ensures wr.Bytes() == writer.Bytes() + Spec.Object(obj)
+  {
+    var wr := StructuralView(obj.l, writer);
+    StructuralViewEns(obj.l, writer);
+    var wr := Members(obj, wr);
+    var wr := StructuralView(obj.r, wr);
+    Seq.LemmaConcatIsAssociative2(writer.Bytes(), Spec.Structural<View>(obj.l, Spec.View), Spec.ConcatBytes(obj.data, Spec.Member), Spec.Structural<View>(obj.r, Spec.View));
+
+    assert wr.Bytes() == writer.Bytes() + Spec.Bracketed(obj, Spec.Member) by {
+      hide *;
+    }
+    assert Spec.Bracketed(obj, Spec.Member) == Spec.Object(obj) by { BracketedToObject(obj); }
+    wr
+  }
+
+  lemma BracketedToArray(arr: jarray)
+    ensures Spec.Bracketed(arr, Spec.Item) == Spec.Array(arr)
+  {
+    var rItem := (d: jitem) requires d < arr => Spec.Item(d);
+    assert Spec.Bracketed(arr, Spec.Item) == Spec.Bracketed(arr, rItem) by {
+      assert SpecProperties.Bracketed_Morphism_Requires(arr, Spec.Item, rItem);
+      SpecProperties.Bracketed_Morphism(arr, Spec.Item, rItem);
+    }
+    calc {
+      Spec.Bracketed(arr, Spec.Item);
+      Spec.Bracketed(arr, rItem);
+      Spec.Array(arr);
+    }
+  }
+
+  function Array(arr: jarray, writer: Writer) : (wr: Writer)
+    decreases arr, 3
+    ensures wr.Bytes() == writer.Bytes() + Spec.Array(arr)
+  {
+    var wr := StructuralView(arr.l, writer);
+    StructuralViewEns(arr.l, writer);
+    var wr := Items(arr, wr);
+    var wr := StructuralView(arr.r, wr);
+    Seq.LemmaConcatIsAssociative2(writer.Bytes(), Spec.Structural<View>(arr.l, Spec.View), Spec.ConcatBytes(arr.data, Spec.Item), Spec.Structural<View>(arr.r, Spec.View));
+
+    assert wr.Bytes() == writer.Bytes() + Spec.Bracketed(arr, Spec.Item);
+    assert Spec.Bracketed(arr, Spec.Item) == Spec.Array(arr) by { BracketedToArray(arr); }
+    wr
+  }
+
+  function Members(obj: jobject, writer: Writer) : (wr: Writer)
+    decreases obj, 2
+    ensures wr.Bytes() == writer.Bytes() + Spec.ConcatBytes(obj.data, Spec.Member)
+  {
+    MembersSpec(obj, obj.data, writer)
+  } by method {
+    assume {:axiom} false; // BUG(https://github.com/dafny-lang/dafny/issues/2180)
+    wr := MembersImpl(obj, writer);
+  }
+
+  function Items(arr: jarray, writer: Writer) : (wr: Writer)
+    decreases arr, 2
+    ensures wr.Bytes() == writer.Bytes() + Spec.ConcatBytes(arr.data, Spec.Item)
+  {
+    ItemsSpec(arr, arr.data, writer)
+  } by method {
+    assume {:axiom} false; // BUG(https://github.com/dafny-lang/dafny/issues/2180)
+    wr := ItemsImpl(arr, writer);
+  }
+
+  ghost function MembersSpec(obj: jobject, members: seq<jmember>, writer: Writer) : (wr: Writer)
+    requires forall j | 0 <= j < |members| :: members[j] < obj
+    decreases obj, 1, members
+    ensures wr.Bytes() == writer.Bytes() + Spec.ConcatBytes(members, Spec.Member)
+  { // TR elimination doesn't work for mutually recursive methods, so this
+    // function is only used as a spec for Members.
+    if members == [] then writer
+    else
+      var butLast, last := members[..|members|-1], members[|members|-1];
+      assert members == butLast + [last];
+      var wr := MembersSpec(obj, butLast, writer);
+      var wr := Member(obj, last, wr);
+      assert wr.Bytes() == writer.Bytes() + (Spec.ConcatBytes(butLast, Spec.Member) + Spec.ConcatBytes([last], Spec.Member)) by {
+        Seq.LemmaConcatIsAssociative(writer.Bytes(), Spec.ConcatBytes(butLast, Spec.Member), Spec.ConcatBytes([last], Spec.Member));
+      }
+      SpecProperties.ConcatBytes_Linear(butLast, [last], Spec.Member);
+      wr
+  } // No by method block here, because the loop invariant in the method version
+  // needs to call MembersSpec and the termination checker gets confused by
+  // that.  Instead, see Members above. // DISCUSS
+
+  // DISCUSS: Is there a way to avoid passing the ghost `v` around while
+  // maintaining the termination argument?  Maybe the lambda for elements will be enough?
+  ghost predicate SequenceSpecRequiresHelper<T>(v: Value, items: seq<T>,
+                                                spec: T -> bytes, impl: (Value, T, Writer) --> Writer,
+                                                writer: Writer, item: T, wr: Writer)
+    requires item in items
+  {
+    && impl.requires(v, item, wr)
+    && impl(v, item, wr).Bytes() == wr.Bytes() + spec(item)
+  }
+
+  ghost predicate SequenceSpecRequires<T>(v: Value, items: seq<T>,
+                                          spec: T -> bytes, impl: (Value, T, Writer) --> Writer,
+                                          writer: Writer) {
+    forall item, wr | item in items :: SequenceSpecRequiresHelper(v, items, spec, impl, writer, item, wr)
+  }
+
+
+  @IsolateAssertions
+  ghost function SequenceSpec<T>(v: Value, items: seq<T>,
+                                 spec: T -> bytes, impl: (Value, T, Writer) --> Writer,
+                                 writer: Writer)
+    : (wr: Writer)
+    requires SequenceSpecRequires(v, items, spec, impl, writer)
+    decreases v, 1, items
+    ensures wr.Bytes() == writer.Bytes() + Spec.ConcatBytes(items, spec)
+  { // TR elimination doesn't work for mutually recursive methods, so this
+    // function is only used as a spec for Items.
+    if items == [] then writer
+    else
+      assert SequenceSpecRequires(v, items[..|items|-1], spec, impl, writer) by {
+        assert forall item, wr {:trigger SequenceSpecRequiresHelper(v, items[..|items|-1], spec, impl, writer, item, wr)} | item in items[..|items|-1] :: SequenceSpecRequiresHelper(v, items[..|items|-1], spec, impl, writer, item, wr) by {
+          forall item, wr {:trigger SequenceSpecRequiresHelper(v, items[..|items|-1], spec, impl, writer, item, wr)} | item in items[..|items|-1] ensures SequenceSpecRequiresHelper(v, items[..|items|-1], spec, impl, writer, item, wr) {
+            assert item in items;
+            assert SequenceSpecRequiresHelper(v, items, spec, impl, writer, item, wr);
+          }
+        }
+      }
+      var writer' := SequenceSpec(v, items[..|items|-1], spec, impl, writer);
+      assert impl.requires(v, items[|items|-1], writer') by {
+        assert SequenceSpecRequiresHelper(v, items, spec, impl, writer, items[|items|-1], writer') by {
+          assert SequenceSpecRequires(v, items, spec, impl, writer);
+          assert items[|items|-1] in items;
+        }
+      }
+      var wr := impl(v, items[|items|-1], writer');
+      assert wr.Bytes() == writer.Bytes() + Spec.ConcatBytes(items, spec) by {
+        calc {
+          wr.Bytes();
+          { assert wr == impl(v, items[|items|-1], writer'); }
+          impl(v, items[|items|-1], writer').Bytes();
+          { assert SequenceSpecRequires(v, items, spec, impl, writer); assert items[|items|-1] in items; assert SequenceSpecRequiresHelper(v, items, spec, impl, writer, items[|items|-1], writer'); }
+          writer'.Bytes() + spec(items[|items|-1]);
+          { assert writer' == SequenceSpec(v, items[..|items|-1], spec, impl, writer); }
+          writer.Bytes() + Spec.ConcatBytes(items[..|items|-1], spec) + spec(items[|items|-1]);
+          { assert spec(items[|items|-1]) == Spec.ConcatBytes([items[|items|-1]], spec); }
+          writer.Bytes() + Spec.ConcatBytes(items[..|items|-1], spec) + Spec.ConcatBytes([items[|items|-1]], spec);
+          { SpecProperties.ConcatBytes_Linear(items[..|items|-1], [items[|items|-1]], spec); }
+          writer.Bytes() + Spec.ConcatBytes(items[..|items|-1] + [items[|items|-1]], spec);
+          { assert items == items[..|items|-1] + [items[|items|-1]]; }
+          writer.Bytes() + Spec.ConcatBytes(items, spec);
+        }
+      }
+      wr
+  } // No by method block here, because the loop invariant in the method version
+  // needs to call `SequenceSpec` and the termination checker gets confused by
+  // that.  Instead, see `Sequence`Items above. // DISCUSS
+
+
+  ghost function ItemsSpec(arr: jarray, items: seq<jitem>, writer: Writer) : (wr: Writer)
+    requires forall j | 0 <= j < |items| :: items[j] < arr
+    decreases arr, 1, items
+    ensures wr.Bytes() == writer.Bytes() + Spec.ConcatBytes(items, Spec.Item)
+  { // TR elimination doesn't work for mutually recursive methods, so this
+    // function is only used as a spec for Items.
+    if items == [] then writer
+    else
+      var butLast, last := items[..|items|-1], items[|items|-1];
+      assert items == butLast + [last];
+      var wr := ItemsSpec(arr, butLast, writer);
+      var wr := Item(arr, last, wr);
+      assert wr.Bytes() == writer.Bytes() + (Spec.ConcatBytes(butLast, Spec.Item) + Spec.ConcatBytes([last], Spec.Item)) by {
+        Seq.LemmaConcatIsAssociative(writer.Bytes(), Spec.ConcatBytes(butLast, Spec.Item), Spec.ConcatBytes([last], Spec.Item));
+      }
+      SpecProperties.ConcatBytes_Linear(butLast, [last], Spec.Item);
+      wr
+  } // No by method block here, because the loop invariant in the method version
+  // needs to call ItemsSpec and the termination checker gets confused by
+  // that.  Instead, see Items above. // DISCUSS
+
+  @IsolateAssertions
+  method MembersImpl(obj: jobject, writer: Writer) returns (wr: Writer)
+    decreases obj, 1
+    ensures wr == MembersSpec(obj, obj.data, writer)
+  {
+    wr := writer;
+    var members := obj.data;
+    assert wr == MembersSpec(obj, members[..0], writer);
+    for i := 0 to |members| // FIXME uint32
+      invariant wr == MembersSpec(obj, members[..i], writer)
+    {
+      assert members[..i+1][..i] == members[..i] by {
+        Seq.TakeLess(members, i, i + 1);
+      }
+      wr := Member(obj, members[i], wr);
+    }
+    assert members[..|members|] == members;
+    assert wr == MembersSpec(obj, members, writer);
+  }
+
+  @IsolateAssertions
+  method ItemsImpl(arr: jarray, writer: Writer) returns (wr: Writer)
+    decreases arr, 1
+    ensures wr == ItemsSpec(arr, arr.data, writer)
+  {
+    wr := writer;
+    var items := arr.data;
+    assert wr == ItemsSpec(arr, items[..0], writer);
+    for i := 0 to |items| // FIXME uint32
+      invariant wr == ItemsSpec(arr, items[..i], writer)
+    {
+      assert items[..i+1][..i] == items[..i] by {
+        AboutList(items, i, i+1);
+      }
+      wr := Item(arr, items[i], wr);
+    }
+    assert items[..|items|] == items;
+  }
+
+  lemma AboutList<T>(xs: seq<T>, i: nat, j: nat)
+    requires i < j <= |xs|
+    ensures xs[..j][..i] == xs[..i]
+  {}
+
+  function Member(ghost obj: jobject, m: jmember, writer: Writer) : (wr: Writer)
+    requires m < obj
+    decreases obj, 0
+    ensures wr.Bytes() == writer.Bytes() + Spec.Member(m)
+  {
+    var wr := String(m.t.k, writer);
+    var wr := StructuralView(m.t.colon, wr);
+    var wr := Value(m.t.v, wr);
+    assert wr.Bytes() == writer.Bytes() + (Spec.String(m.t.k) + Spec.Structural<View>(m.t.colon, Spec.View) + Spec.Value(m.t.v)) by {
+      Seq.LemmaConcatIsAssociative2( writer.Bytes(), Spec.String(m.t.k), Spec.Structural<View>(m.t.colon, Spec.View), Spec.Value(m.t.v));
+    }
+    var wr := if m.suffix.Empty? then wr else StructuralView(m.suffix.t, wr);
+    assert wr.Bytes() == writer.Bytes() + Spec.KeyValue(m.t) + Spec.CommaSuffix(m.suffix) by {
+      if m.suffix.Empty? {
+        EmptySequenceIsRightIdentity(Spec.KeyValue(m.t));
+        Seq.LemmaConcatIsAssociative(writer.Bytes(), Spec.KeyValue(m.t), []);
+      }
+      else {
+        assert Spec.StructuralView(m.suffix.t) == Spec.CommaSuffix(m.suffix);
+      }
+    }
+    assert wr.Bytes() == writer.Bytes() + (Spec.KeyValue(m.t) + Spec.CommaSuffix(m.suffix)) by {
+      Seq.LemmaConcatIsAssociative(writer.Bytes(), Spec.KeyValue(m.t), Spec.CommaSuffix(m.suffix));
+    }
+    wr
+  }
+
+  function Item(ghost arr: jarray, m: jitem, writer: Writer) : (wr: Writer)
+    requires m < arr
+    decreases arr, 0
+    ensures wr.Bytes() == writer.Bytes() + Spec.Item(m)
+  {
+    var wr := Value(m.t, writer);
+    var wr := if m.suffix.Empty? then wr else StructuralView(m.suffix.t, wr);
+    assert wr.Bytes() == writer.Bytes() + (Spec.Value(m.t) + Spec.CommaSuffix(m.suffix)) by {
+      Seq.LemmaConcatIsAssociative(writer.Bytes(), Spec.Value(m.t), Spec.CommaSuffix(m.suffix));
+    }
+    wr
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Math.dfy b/Source/DafnyStandardLibraries/src/Std/Math.dfy
new file mode 100644
index 00000000000..e328be4dfdb
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Math.dfy
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/** Defines various integer-math functions */
+module Std.Math {
+
+  /** Minimum of two integers  */
+  function Min(a: int, b: int): int
+  {
+    if a < b
+    then a
+    else b
+  }
+
+  /** Minimum of three integers  */
+  function Min3(a: int, b: int, c: int): int
+  {
+    Min(a, Min(b, c))
+  }
+
+  /** Maximum of two integers  */
+  function Max(a: int, b: int): int
+  {
+    if a < b
+    then b
+    else a
+  }
+
+  /** Maximum of three integers  */
+  function Max3(a: int, b: int, c: int): int
+  {
+    Max(a, Max(b, c))
+  }
+
+  /** Integer absolute value */
+  function Abs(a: int): int
+  {
+    if a < 0
+    then -a
+    else a
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Math.md b/Source/DafnyStandardLibraries/src/Std/Math.md
new file mode 100644
index 00000000000..2e753474232
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Math.md
@@ -0,0 +1,6 @@
+# The `Math` module
+
+The `Math` module defines integer-related math functions (e.g. Min, Max, Abs).
+
+- Integer-related functions over collections of integers (e.g. minimum of a sequence) are
+available in the `Collections` module.
diff --git a/Source/DafnyStandardLibraries/src/Std/Relations.dfy b/Source/DafnyStandardLibraries/src/Std/Relations.dfy
new file mode 100644
index 00000000000..7340bf47838
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Relations.dfy
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+/**
+A collection of predicates that establish whether commonly known properties on relations, 
+such as reflexivity and transitivity, hold for a particular relation. 
+These properties can only be applied to relations that operate on value types, 
+as opposed to relations that operate on sets in general.
+
+Also contains predicates that establish how a value relates to a set,
+such as whether it is the least or minimal element.
+*/
+module Std.Relations {
+
+  ghost predicate Reflexive<T(!new)>(relation: (T, T) -> bool) {
+    forall x :: relation(x, x)
+  }
+
+  ghost predicate Irreflexive<T(!new)>(relation: (T, T) -> bool) {
+    forall x :: !relation(x, x)
+  }
+
+  ghost predicate Symmetric<T(!new)>(relation: (T, T) -> bool) {
+    forall x, y :: relation(x, y) <==> relation(y, x)
+  }
+
+  ghost predicate AntiSymmetric<T(!new)>(relation: (T, T) -> bool) {
+    forall x, y :: relation(x, y) && relation(y, x) ==> x == y
+  }
+
+  ghost predicate Asymmetric<T(!new)>(relation: (T, T) -> bool) {
+    forall x, y :: relation(x, y) ==> !relation(y, x)
+  }
+
+  lemma AsymmetricIsAntiSymmetric<T(!new)>(relation: (T, T) -> bool)
+    ensures Asymmetric(relation) ==> AntiSymmetric(relation)
+  {}
+
+  lemma AsymmetricIsIrreflexive<T(!new)>(relation: (T, T) -> bool)
+    ensures Asymmetric(relation) ==> Irreflexive(relation)
+  {}
+
+  ghost predicate Connected<T(!new)>(relation: (T, T) -> bool) {
+    forall x, y :: x != y ==> relation(x, y) || relation(y, x)
+  }
+
+  ghost predicate StronglyConnected<T(!new)>(relation: (T, T) -> bool) {
+    forall x, y :: relation(x, y) || relation(y, x)
+  }
+
+  ghost predicate Transitive<T(!new)>(relation: (T, T) -> bool) {
+    forall x, y, z :: relation(x, y) && relation(y, z) ==> relation(x, z)
+  }
+
+  ghost predicate TotalOrdering<T(!new)>(relation: (T, T) -> bool) {
+    && Reflexive(relation)
+    && AntiSymmetric(relation)
+    && Transitive(relation)
+    && StronglyConnected(relation)
+  }
+
+  ghost predicate StrictTotalOrdering<T(!new)>(relation: (T, T) -> bool) {
+    && Irreflexive(relation)
+    && AntiSymmetric(relation)
+    && Transitive(relation)
+    && Connected(relation)
+  }
+
+  ghost predicate PreOrdering<T(!new)>(relation: (T, T) -> bool) {
+    && Reflexive(relation)
+    && Transitive(relation)
+  }
+
+  ghost predicate PartialOrdering<T(!new)>(relation: (T, T) -> bool) {
+    && Reflexive(relation)
+    && Transitive(relation)
+    && AntiSymmetric(relation)
+  }
+
+  ghost predicate EquivalenceRelation<T(!new)>(relation: (T, T) -> bool) {
+    && Reflexive(relation)
+    && Symmetric(relation)
+    && Transitive(relation)
+  }
+
+  ghost predicate IsLeast<T>(lessOrEqual: (T, T) -> bool, least: T, s: set<T>) {
+    least in s && forall x | x in s :: lessOrEqual(least, x)
+  }
+
+  ghost predicate IsMinimal<T>(lessOrEqual: (T, T) -> bool, minimal: T, s: set<T>) {
+    minimal in s && forall x | x in s && lessOrEqual(x, minimal) :: lessOrEqual(minimal, x)
+  }
+
+  ghost predicate IsGreatest<T>(lessOrEqual: (T, T) -> bool, greatest: T, s: set<T>) {
+    greatest in s && forall x | x in s :: lessOrEqual(x, greatest)
+  }
+
+  ghost predicate IsMaximal<T>(lessOrEqual: (T, T) -> bool, maximal: T, s: set<T>) {
+    maximal in s && forall x | x in s && lessOrEqual(maximal, x) :: lessOrEqual(x, maximal)
+  }
+
+  ghost predicate SortedBy<T>(lessOrEqual: (T, T) -> bool, xs: seq<T>) {
+    forall i, j | 0 <= i < j < |xs| :: lessOrEqual(xs[i], xs[j])
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Relations.md b/Source/DafnyStandardLibraries/src/Std/Relations.md
new file mode 100644
index 00000000000..041f443639e
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Relations.md
@@ -0,0 +1,38 @@
+# The `Relations` module
+
+The `Relations` module defines a number of properties on relations,
+where the relation is defined by a predicate that takes two values of the same type.
+
+Example properties:
+
+- Reflexive: `R(x,x)` is true
+- Irreflexive: `R(x,x)` is false
+- AntiSymmetric: `R(x,y) && R(y,x) ==> x==y`
+- Transitive : `R(x,y) && R(y,z) ==> R(x,z)`
+- Connected : `x != y ==> R(x,y) || R(y,x)`
+- StronglyConnected : `R(x,y) || R(y,x)`
+- TotalOrdering : Reflexive, AntiSymmetric, Transitive, StronglyConnected (e.g., `<=` on integers)
+- StrictTotalOrdering : Irreflexive, AntiSymmetric, Transitive, Connected (e.g., `<` on integers)
+
+These properties are sometimes required for other functions. For example,
+if one wants to sort a sequence by some relation `R`, one must establish that `R` is a _Total Ordering_
+or a _Strict Total Ordering_.
+In fact, that is part of the precondition of a sorting function.
+
+As a simple example, you might define a predicate like this:
+<!-- %check-resolve %save tmp-intlt.dfy -->
+```dafny
+  const IntLT := ((i: int, j: int) => (i < j))
+```
+
+and then need to prove this lemma to use it in a sorting routine:
+<!-- %check-verify %use tmp-intlt.dfy -->
+```dafny
+  import opened Std.Relations
+  lemma IntLTisStrictTotalOrder()
+    ensures StrictTotalOrdering(IntLT) {}
+```
+
+Fortunately, Dafny proves this without aid.
+
+All these definitions are ghost predicates; they are used as part of proofs rather than in compiled code.
diff --git a/Source/DafnyStandardLibraries/src/Std/Strings.dfy b/Source/DafnyStandardLibraries/src/Std/Strings.dfy
new file mode 100644
index 00000000000..e3dbc79fb02
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Strings.dfy
@@ -0,0 +1,275 @@
+/**
+The Strings module enables converting between numbers such as nat and int, and String
+ */
+@DisableNonlinearArithmetic
+module Std.Strings {
+  import opened Wrappers
+  import opened Arithmetic.Power
+  import opened Arithmetic.Logarithm
+  import Arithmetic
+
+  /**
+  Refine this module to use it.
+  The refinee must define:
+    - the type of character used, Char
+    - a conversion from nat to Char (the chars sequences) and vice versa (charToDigit)
+   */
+  @DisableNonlinearArithmetic
+  abstract module ParametricConversion refines Arithmetic.LittleEndianNat {
+    import opened Wrappers
+
+    type Char(==)
+    type String = seq<Char>
+
+    type CharSeq = chars: seq<Char> | |chars| > 1 witness *
+    // Canoncial digit characters: converting to strings will uses these characters.
+    const chars: CharSeq
+    const base := |chars|
+    // All recognized digit characters: converting from strings will use this map,
+    // which may associate multiple characters with the same digit.
+    const charToDigit: map<Char, digit>
+
+    lemma CharsConsistent()
+      ensures forall c <- chars :: c in charToDigit && chars[charToDigit[c]] == c
+
+    function BASE(): nat {
+      base
+    }
+
+    predicate IsDigitChar(c: Char) {
+      c in charToDigit
+    }
+
+    function OfDigits(digits: seq<digit>) : (str: String)
+      ensures forall c <- str :: c in chars
+      ensures |str| == |digits|
+    {
+      if digits == [] then []
+      else
+        assert digits[0] in digits;
+        assert forall d | d in digits[1..] :: d in digits;
+        OfDigits(digits[1..]) + [chars[digits[0]]]
+    }
+
+    /*
+    Convert a natural number into its String representation
+    */
+    function OfNat(n: nat) : (str: String)
+      ensures |str| == Log(base, n) + 1
+      ensures forall c <- str :: c in chars
+    {
+      if n == 0 then  [chars[0]]
+      else LemmaFromNatLen2(n); OfDigits(FromNat(n))
+    }
+
+    predicate IsNumberStr(str: String, minus: Char) {
+      str != [] ==>
+        && (str[0] == minus || str[0] in charToDigit)
+        && forall c <- str[1..] :: IsDigitChar(c)
+    }
+
+    /*
+    Convert an integer into its String representation, 
+    given a particular minus character.
+    */
+    function OfInt(n: int, minus: Char) : (str: String)
+      ensures IsNumberStr(str, minus)
+    {
+      CharsConsistent();
+      if n >= 0 then OfNat(n)
+      else [minus] + OfNat(-n)
+    }
+
+    /**
+    Convert a String that represents a natural number, back into that number.
+     */
+    @IsolateAssertions
+    function ToNat(str: String) : (n: nat)
+      requires forall c <- str :: IsDigitChar(c)
+    {
+      if str == [] then 0
+      else
+        LemmaMulNonnegativeAuto();
+        var c := str[|str| - 1];
+        assert IsDigitChar(c);
+        ToNat(str[..|str| - 1]) * base + charToDigit[c]
+    }
+
+    lemma {:induction false} ToNatBound(str: String)
+      requires base > 0
+      requires forall c <- str :: IsDigitChar(c)
+      ensures ToNat(str) < Pow(base, |str|)
+    {
+      if str == [] {
+      } else {
+        calc <= {
+          ToNat(str);
+          { assert IsDigitChar(str[|str| - 1]); }
+          ToNat(str[..|str| - 1]) * base + charToDigit[str[|str| - 1]];
+          ToNat(str[..|str| - 1]) * base + (base - 1);
+          { ToNatBound(str[..|str| - 1]);
+            LemmaMulInequalityAuto(); }
+          (Pow(base, |str| - 1) - 1) * base + base - 1;
+          { LemmaMulIsDistributiveAuto(); }
+          Pow(base, |str| - 1) * base - 1;
+          {  LemmaMulIsCommutativeAuto(); }
+          Pow(base, |str|) - 1;
+        }
+      }
+    }
+
+    /**
+    Convert a String that represents a number, back into that number
+     */
+    function ToInt(str: String, minus: Char): (s: int)
+      requires str != [minus]
+      requires IsNumberStr(str, minus)
+    {
+      if [minus] <= str then -(ToNat(str[1..]) as int)
+      else
+        assert str == [] || str == [str[0]] + str[1..];
+        ToNat(str)
+    }
+  }
+
+  abstract module ParametricEscaping {
+    import opened Wrappers
+
+    type Char(==)
+    type String = seq<Char>
+
+    /**
+    Use an escape character to convert a String to its escaped form.
+     */
+    function Escape(str: String, mustEscape: set<Char>, escape: Char): String {
+      if str == [] then str
+      else if str[0] in mustEscape then [escape, str[0]] + Escape(str[1..], mustEscape, escape)
+      else [str[0]] + Escape(str[1..], mustEscape, escape)
+    }
+
+    /**
+    Unescape a String using the given escape character.
+     */
+    function Unescape(str: String, escape: Char): Option<String> {
+      if str == [] then Some(str)
+      else if str[0] == escape then
+        if |str| > 1 then var tl :- Unescape(str[2..], escape); Some([str[1]] + tl)
+        else None
+      else var tl :- Unescape(str[1..], escape); Some([str[0]] + tl)
+    }
+
+    lemma {:induction false} Unescape_Escape(str: String, special: set<Char>, escape: Char)
+      requires escape in special
+      ensures Unescape(Escape(str, special, escape), escape) == Some(str)
+    {
+      if str == [] {
+      } else {
+        assert str == [str[0]] + str[1..];
+        Unescape_Escape(str[1..], special, escape);
+      }
+    }
+  }
+
+  @DisableNonlinearArithmetic
+  module HexConversion refines ParametricConversion {
+    type Char = char
+    const HEX_DIGITS: seq<char> := "0123456789ABCDEF"
+    const chars := HEX_DIGITS
+    const charToDigit :=
+      map[
+        '0' := 0, '1' := 1, '2' := 2, '3' := 3, '4' := 4, '5' := 5, '6' := 6, '7' := 7, '8' := 8, '9' := 9,
+        'a' := 0xA, 'b' := 0xB, 'c' := 0xC, 'd' := 0xD, 'e' := 0xE, 'f' := 0xF,
+        'A' := 0xA, 'B' := 0xB, 'C' := 0xC, 'D' := 0xD, 'E' := 0xE, 'F' := 0xF
+      ]
+    // The size of the map makes this impractical to verify easily.
+    @Axiom
+    lemma CharsConsistent()
+      ensures forall c <- chars :: c in charToDigit && chars[charToDigit[c]] == c
+  }
+
+  @DisableNonlinearArithmetic
+  module DecimalConversion refines ParametricConversion {
+    type Char = char
+    const DIGITS: seq<char> := "0123456789"
+    const chars := DIGITS
+    const charToDigit :=
+      map[
+        '0' := 0, '1' := 1, '2' := 2, '3' := 3, '4' := 4, '5' := 5, '6' := 6, '7' := 7, '8' := 8, '9' := 9
+      ]
+    lemma CharsConsistent()
+      ensures forall c <- chars :: c in charToDigit && chars[charToDigit[c]] == c
+    {}
+  }
+
+  module CharStrEscaping refines ParametricEscaping {
+    type Char = char
+  }
+
+  /*
+  Convert a natural number into its String representation for a decimal number system
+  */
+  function OfNat(n: nat) : (str: string)
+    ensures |str| == Log(DecimalConversion.base, n) + 1
+    ensures forall c | c in str :: c in DecimalConversion.chars
+  {
+    DecimalConversion.OfNat(n)
+  }
+
+  /*
+  Convert an integer into its String representation for a decimal number system
+  */
+  function OfInt(n: int) : (str: string)
+    ensures DecimalConversion.IsNumberStr(str, '-')
+  {
+    DecimalConversion.OfInt(n, '-')
+  }
+
+  /**
+  Given a natural number represented as a decimal number in a String, back into an integer
+   */
+  function ToNat(str: string) : (n: nat)
+    requires forall c <- str :: DecimalConversion.IsDigitChar(c)
+    ensures n < Pow(DecimalConversion.base, |str|)
+  {
+    DecimalConversion.ToNatBound(str);
+    DecimalConversion.ToNat(str)
+  }
+
+  /**
+  Given an integer number represented as a decimal number in a String, back into an integer
+   */
+  function ToInt(str: string) : (n: int)
+    requires str != "-"
+    requires DecimalConversion.IsNumberStr(str, '-')
+  {
+    DecimalConversion.ToInt(str, '-')
+  }
+
+  /**
+  Use an escape character to convert a String to its escaped form.
+    */
+  function EscapeQuotes(str: string): string {
+    CharStrEscaping.Escape(str, {'\"', '\''}, '\\')
+  }
+
+  /**
+  Unescape a String using the given escape character.
+    */
+  function UnescapeQuotes(str: string): Option<string> {
+    CharStrEscaping.Unescape(str, '\\')
+  }
+
+  /**
+  Convert a boolean into its string representation
+   */
+  function OfBool(b: bool) : string {
+    if b then "true" else "false"
+  }
+
+  /**
+  Convert a char into its string representation
+   */
+  function OfChar(c: char) : string {
+    [c]
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Strings.md b/Source/DafnyStandardLibraries/src/Std/Strings.md
new file mode 100644
index 00000000000..3545c1603fa
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Strings.md
@@ -0,0 +1,10 @@
+# The `Strings` module
+
+This module provides several common utilities for manipulating strings,
+in particular converting values of common types such as `bool`, `nat`, and `int`
+to and from their string representations.
+
+Note that since in Dafny `string` is just an alias for `seq<char>`,
+many common string operations are available in the
+[`Collections.Seqs` module](../Collections.md) instead.
+The `Strings` module only provides utilities more specific to sequences of characters.
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-go.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-go.dfy
new file mode 100644
index 00000000000..4e08cfe06c6
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-go.dfy
@@ -0,0 +1,69 @@
+@Compile(false)
+module
+  {:dummyImportMember "Dummy__", true}
+  Std.GoConcurrent replaces Concurrent {
+
+  class {:extern} MutableMap<K(==), V(==)> ... {
+
+    @Axiom
+    constructor {:extern} (ghost inv: (K, V) -> bool, bytesKeys: bool)
+
+    ghost predicate Valid()
+    {
+      true
+    }
+
+    @Axiom
+    method {:extern} Keys() returns (keys: set<K>)
+
+    @Axiom
+    method {:extern} HasKey(k: K) returns (used: bool)
+
+    @Axiom
+    method {:extern} Values() returns (values: set<V>)
+
+    @Axiom
+    method {:extern} Items() returns (items: set<(K,V)>)
+
+    @Axiom
+    method {:extern} Put(k: K, v: V)
+
+    @Axiom
+    method {:extern} Get(k: K) returns (r: Option<V>)
+
+    @Axiom
+    method {:extern} Remove(k: K)
+
+    @Axiom
+    method {:extern} Size() returns (c: nat)
+
+  }
+
+  class {:extern} AtomicBox<T> ... {
+
+    @Axiom
+    constructor {:extern} (ghost inv: T -> bool, t: T)
+
+    ghost predicate Valid() { true }
+
+    @Axiom
+    method {:extern} Get() returns (t: T)
+
+    @Axiom
+    method {:extern} Put(t: T)
+
+  }
+
+  class {:extern} Lock ... {
+
+    @Axiom
+    constructor {:extern} ()
+
+    @Axiom
+    method {:extern} Lock()
+
+    @Axiom
+    method {:extern} Unlock()
+
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-java.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-java.dfy
new file mode 100644
index 00000000000..0dfc1e99921
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-java.dfy
@@ -0,0 +1,66 @@
+module {:extern} Std.JavaConcurrent replaces Concurrent {
+
+  class {:extern} MutableMap<K(==), V(==)> ... {
+
+    @Axiom
+    constructor {:extern} (ghost inv: (K, V) -> bool, bytesKeys: bool)
+
+    ghost predicate Valid()
+    {
+      true
+    }
+
+    @Axiom
+    method {:extern} Keys() returns (keys: set<K>)
+
+    @Axiom
+    method {:extern} HasKey(k: K) returns (used: bool)
+
+    @Axiom
+    method {:extern} Values() returns (values: set<V>)
+
+    @Axiom
+    method {:extern} Items() returns (items: set<(K,V)>)
+
+    @Axiom
+    method {:extern} Put(k: K, v: V)
+
+    @Axiom
+    method {:extern} Get(k: K) returns (r: Option<V>)
+
+    @Axiom
+    method {:extern} Remove(k: K)
+
+    @Axiom
+    method {:extern} Size() returns (c: nat)
+
+  }
+
+  class {:extern "AtomicBox"} AtomicBox<T> ... {
+
+    @Axiom
+    constructor {:extern} (ghost inv: T -> bool, t: T)
+
+    ghost predicate Valid() { true }
+
+    @Axiom
+    method {:extern} Get() returns (t: T)
+
+    @Axiom
+    method {:extern} Put(t: T)
+
+  }
+
+  class {:extern "Lock"} Lock ... {
+
+    @Axiom
+    constructor {:extern} ()
+
+    @Axiom
+    method {:extern} Lock()
+
+    @Axiom
+    method {:extern} Unlock()
+
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-js.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-js.dfy
new file mode 100644
index 00000000000..862c91bbc60
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-js.dfy
@@ -0,0 +1,238 @@
+@Compile(false)
+module Std.JavaScriptConcurrent replaces Concurrent {
+
+  class {:extern} MutableMap<K(==), V(==)> ... {
+
+    @Axiom
+    constructor {:extern} (ghost inv: (K, V) -> bool, bytesKeys: bool)
+
+    ghost predicate Valid()
+    {
+      true
+    }
+
+    @Axiom
+    method {:extern} Keys() returns (keys: set<K>)
+
+    @Axiom
+    method {:extern} HasKey(k: K) returns (used: bool)
+
+    @Axiom
+    method {:extern} Values() returns (values: set<V>)
+
+    @Axiom
+    method {:extern} Items() returns (items: set<(K,V)>)
+
+    @Axiom
+    method {:extern} Put(k: K, v: V)
+
+    @Axiom
+    method {:extern} Get(k: K) returns (r: Option<V>)
+
+    @Axiom
+    method {:extern} Remove(k: K)
+
+    @Axiom
+    method {:extern} Size() returns (c: nat)
+
+  }
+
+  class {:extern} AtomicBox<T> ... {
+
+    @Axiom
+    constructor {:extern} (ghost inv: T -> bool, t: T)
+
+    ghost predicate Valid() { true }
+
+    @Axiom
+    method {:extern} Get() returns (t: T)
+
+    @Axiom
+    method {:extern} Put(t: T)
+
+  }
+
+  class {:extern} Lock ... {
+
+    @Axiom
+    constructor {:extern} ()
+
+    @Axiom
+    method {:extern} Lock()
+
+    @Axiom
+    method {:extern} Unlock()
+
+  }
+}
+
+// Dafny-native implementation, used to generate the extern implementation
+module {:extern "Std_Concurrent"} Std.ConcurrentDafny {
+
+  import opened Wrappers
+
+  class MutableMap<K(==), V(==)> {
+
+    ghost const inv: (K, V) -> bool
+    ghost var knownKeys: set<K>
+    ghost var knownValues: set<V>
+
+    var internal: map<K, V>
+
+    constructor (inv: (K, V) -> bool)
+      ensures Valid()
+      ensures this.inv == inv
+    {
+      internal := map[];
+      this.inv := inv;
+      this.knownKeys := {};
+      this.knownValues := {};
+    }
+
+    ghost predicate Contained()
+      reads this`internal, this`knownKeys, this`knownValues
+    {
+      internal.Keys <= knownKeys && internal.Values <= knownValues
+    }
+
+    ghost predicate Valid()
+      reads this
+    {
+      forall k :: k in internal.Keys ==> inv(k, internal[k]) && Contained()
+    }
+
+    method Keys() returns (keys: set<K>)
+      requires Valid()
+      ensures forall k :: k in keys ==> exists v :: v in knownValues && inv(k,v)
+    {
+      keys := internal.Keys;
+    }
+
+    method HasKey(k: K) returns (used: bool)
+      requires Valid()
+      ensures used ==> exists v :: v in knownValues && inv(k,v)
+    {
+      used := k in internal.Keys;
+    }
+
+    method Values() returns (values: set<V>)
+      requires Valid()
+      ensures forall v :: v in values ==> exists k :: k in knownKeys && inv(k,v)
+    {
+      values := internal.Values;
+    }
+
+    method Items() returns (items: set<(K,V)>)
+      requires Valid()
+      ensures forall t :: t in items ==> inv(t.0, t.1)
+    {
+      items := internal.Items;
+    }
+
+    method Get(k: K) returns (r: Option<V>)
+      requires Valid()
+      ensures r.Some? ==> inv(k, r.value)
+    {
+      r := if k in internal.Keys then Some(internal[k]) else None;
+    }
+
+    method Put(k: K, v: V)
+      requires Valid()
+      requires inv(k, v)
+      modifies this
+      ensures Valid()
+
+    {
+      internal := internal[k := v];
+      knownKeys := knownKeys + {k};
+      knownValues := knownValues + {v};
+    }
+
+    method Remove(k: K)
+      requires Valid()
+      requires exists v :: inv(k,v)
+      modifies this
+      ensures Valid()
+    {
+      // only here to mollify the auditor
+      assert exists v :: inv(k,v);
+
+      internal := internal - {k};
+    }
+
+    method Size() returns (c: nat)
+    {
+      c := |internal|;
+    }
+
+  }
+
+  class AtomicBox<T> {
+
+    ghost const inv: T -> bool
+
+    var boxed: T
+
+    constructor (inv: T -> bool, t: T)
+      requires inv(t)
+      ensures Valid()
+      ensures this.inv == inv
+    {
+      boxed := t;
+      this.inv := inv;
+    }
+
+    ghost predicate Valid()
+      reads this
+    {
+      inv(boxed)
+    }
+
+    method Get() returns (t: T)
+      requires Valid()
+      ensures inv(t)
+    {
+      t := boxed;
+    }
+
+    method Put(t: T)
+      requires inv(t)
+      modifies this
+      ensures Valid()
+    {
+      boxed := t;
+    }
+
+  }
+
+  class Lock {
+
+    ghost var isLocked: bool
+
+    constructor() {
+      isLocked := false;
+    }
+
+    method Lock()
+      requires !isLocked
+      modifies this
+      ensures isLocked
+    {
+      // Written this way so that we don't get a warning about
+      // "requires !isLocked" being an unnecessary precondition.
+      isLocked := !isLocked;
+    }
+
+    method Unlock()
+      requires isLocked
+      modifies this
+      ensures !isLocked
+    {
+      // Written this way so that we don't get a warning about
+      // "requires isLocked" being an unnecessary precondition.
+      isLocked := !isLocked;
+    }
+
+  }
+
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-notarget-cs.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-notarget-cs.dfy
new file mode 100644
index 00000000000..03f35670687
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-notarget-cs.dfy
@@ -0,0 +1,67 @@
+@Compile(false)
+module {:extern} Std.CSharpConcurrent replaces Concurrent {
+
+  class {:extern} MutableMap<K(==), V(==)> ... {
+
+    @Axiom
+    constructor {:extern} (ghost inv: (K, V) -> bool, bytesKeys: bool)
+
+    ghost predicate Valid()
+    {
+      true
+    }
+
+    @Axiom
+    method {:extern} Keys() returns (keys: set<K>)
+
+    @Axiom
+    method {:extern} HasKey(k: K) returns (used: bool)
+
+    @Axiom
+    method {:extern} Values() returns (values: set<V>)
+
+    @Axiom
+    method {:extern} Items() returns (items: set<(K,V)>)
+
+    @Axiom
+    method {:extern} Put(k: K, v: V)
+
+    @Axiom
+    method {:extern} Get(k: K) returns (r: Option<V>)
+
+    @Axiom
+    method {:extern} Remove(k: K)
+
+    @Axiom
+    method {:extern} Size() returns (c: nat)
+
+  }
+
+  class {:extern} AtomicBox<T> ... {
+
+    @Axiom
+    constructor {:extern} (ghost inv: T -> bool, t: T)
+
+    ghost predicate Valid() { true }
+
+    @Axiom
+    method {:extern} Get() returns (t: T)
+
+    @Axiom
+    method {:extern} Put(t: T)
+
+  }
+
+  class {:extern} Lock ... {
+
+    @Axiom
+    constructor {:extern} ()
+
+    @Axiom
+    method {:extern} Lock()
+
+    @Axiom
+    method {:extern} Unlock()
+
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-notarget-java-cs-js-go-py.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-notarget-java-cs-js-go-py.dfy
new file mode 100644
index 00000000000..1a79790b970
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-notarget-java-cs-js-go-py.dfy
@@ -0,0 +1,115 @@
+replaceable module Std.Concurrent {
+
+  import opened Wrappers
+
+  /**
+    * A lock to provide mutual exclusion.
+    *
+    * Note this lock is not reentrant, and its methods have preconditions
+    * to ensure they are called in matching pairs.
+    */
+  class Lock {
+
+    // This is really "thread-local" state.
+    // {:concurrent} will not allow the use of Locks because of it,
+    // but that's a good thing because Locks by themselves cannot make
+    // verification sound under concurrent execution.
+    ghost var isLocked: bool
+
+    constructor()
+      ensures !isLocked
+
+    /**
+      * Acquires the lock.
+      */
+    method Lock()
+      requires !isLocked
+      reads this
+      modifies this
+      ensures isLocked
+
+    /**
+      * Releases the lock.
+      */
+    method Unlock()
+      requires isLocked
+      reads this
+      modifies this
+      ensures !isLocked
+  }
+
+  /**
+    * A mutable wrapper for a single value that is safe to access
+    * by multiple concurrent executions.
+    */
+  class AtomicBox<T> {
+
+    // Invariant on values this box may hold
+    ghost const inv: T -> bool
+
+    constructor (ghost inv: T -> bool, t: T)
+      requires inv(t)
+      ensures this.inv == inv
+
+    method Get() returns (t: T)
+      reads {}
+      ensures inv(t)
+
+    method Put(t: T)
+      reads {}
+      requires inv(t)
+  }
+
+  /**
+    * A mutable wrapper for a map that is safe to access
+    * by multiple concurrent executions.
+    * 
+    * Functionally equivalent to an AtomicBox<map<K, V>>
+    * but will be much more efficient in practice.
+    */
+  class MutableMap<K(==), V(==)> {
+
+    // Invariant on key-value pairs this map may hold
+    ghost const inv: (K, V) -> bool
+
+    // The bytesKeys parameter allows for more efficient implementations.
+    // Currently only has any effect in Go, to enable O(1) lookup instead of O(n).
+    // This MUST NOT be set to true if K is not seq<uint8>,
+    // otherwise the behavior of this map is undefined.
+    constructor (ghost inv: (K, V) -> bool, bytesKeys: bool := false)
+      ensures this.inv == inv
+
+    method Keys() returns (keys: set<K>)
+      reads {}
+      ensures forall k <- keys :: exists v :: inv(k, v)
+
+    method HasKey(k: K) returns (used: bool)
+      reads {}
+      ensures used ==> exists v :: inv(k, v)
+
+    method Values() returns (values: set<V>)
+      reads {}
+      ensures forall v <- values :: exists k :: inv(k,v)
+
+    method Items() returns (items: set<(K,V)>)
+      reads {}
+      ensures forall t <- items :: inv(t.0, t.1)
+
+    method Put(k: K, v: V)
+      reads {}
+      requires inv(k, v)
+
+    method Get(k: K) returns (r: Option<V>)
+      reads {}
+      ensures r.Some? ==> inv(k, r.value)
+
+    method Remove(k: K)
+      reads {}
+      // TODO: this isn't really necessary, if it's not true
+      // then Remove(k) will just never have any effect
+      requires exists v :: inv(k, v)
+
+    method Size() returns (c: nat)
+      reads {}
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-py.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-py.dfy
new file mode 100644
index 00000000000..7590c3119b2
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Concurrent-py.dfy
@@ -0,0 +1,67 @@
+@Compile(false)
+module Std.PythonConcurrent replaces Concurrent {
+
+  class {:extern} MutableMap<K(==), V(==)> ... {
+
+    @Axiom
+    constructor {:extern} (ghost inv: (K, V) -> bool, bytesKeys: bool)
+
+    ghost predicate Valid()
+    {
+      true
+    }
+
+    @Axiom
+    method {:extern} Keys() returns (keys: set<K>)
+
+    @Axiom
+    method {:extern} HasKey(k: K) returns (used: bool)
+
+    @Axiom
+    method {:extern} Values() returns (values: set<V>)
+
+    @Axiom
+    method {:extern} Items() returns (items: set<(K,V)>)
+
+    @Axiom
+    method {:extern} Put(k: K, v: V)
+
+    @Axiom
+    method {:extern} Get(k: K) returns (r: Option<V>)
+
+    @Axiom
+    method {:extern} Remove(k: K)
+
+    @Axiom
+    method {:extern} Size() returns (c: nat)
+
+  }
+
+  class {:extern} AtomicBox<T> ... {
+
+    @Axiom
+    constructor {:extern} (ghost inv: T -> bool, t: T)
+
+    ghost predicate Valid() { true }
+
+    @Axiom
+    method {:extern} Get() returns (t: T)
+
+    @Axiom
+    method {:extern} Put(t: T)
+
+  }
+
+  class {:extern} Lock ... {
+
+    @Axiom
+    constructor {:extern} ()
+
+    @Axiom
+    method {:extern} Lock()
+
+    @Axiom
+    method {:extern} Unlock()
+
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO1InternalExterns-go.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO1InternalExterns-go.dfy
new file mode 100644
index 00000000000..9040764ac91
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO1InternalExterns-go.dfy
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/*
+ * Private API - these should not be used elsewhere
+ */
+@Compile(false)
+module
+  // This attribute isn't strictly necessary because it's possible
+  // to split the implementation of a Dafny module
+  // across multiple Go files under the same path.
+  // But it makes debugging the translated output a little clearer.
+  {:extern}
+  {:dummyImportMember "Dummy__", true}
+  Std.GoFileIOInternalExterns replaces FileIOInternalExterns {
+  method
+    {:extern}
+    INTERNAL_ReadBytesFromFile(path: string)
+    returns (isError: bool, bytesRead: seq<bv8>, errorMsg: string)
+
+  method
+    {:extern}
+    INTERNAL_WriteBytesToFile(path: string, bytes: seq<bv8>)
+    returns (isError: bool, errorMsg: string)
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO2InternalExterns-java-cs-js.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO2InternalExterns-java-cs-js.dfy
new file mode 100644
index 00000000000..ed6d7a8d437
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO2InternalExterns-java-cs-js.dfy
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/*
+ * Private API - these should not be used elsewhere
+ */
+module {:extern} Std.JavaCsJsFileIOInternalExterns replaces FileIOInternalExterns {
+  method {:extern} INTERNAL_ReadBytesFromFile(path: string)
+    returns (isError: bool, bytesRead: seq<bv8>, errorMsg: string)
+
+  method {:extern} INTERNAL_WriteBytesToFile(path: string, bytes: seq<bv8>)
+    returns (isError: bool, errorMsg: string)
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO3InternalExterns-notarget-java-cs-js-go-py.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO3InternalExterns-notarget-java-cs-js-go-py.dfy
new file mode 100644
index 00000000000..264a6c924c2
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO3InternalExterns-notarget-java-cs-js-go-py.dfy
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/*
+ * Private API - these should not be used elsewhere
+ */
+replaceable module Std.FileIOInternalExterns {
+  method
+    INTERNAL_ReadBytesFromFile(path: string)
+    returns (isError: bool, bytesRead: seq<bv8>, errorMsg: string)
+
+  method
+    INTERNAL_WriteBytesToFile(path: string, bytes: seq<bv8>)
+    returns (isError: bool, errorMsg: string)
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO4InternalExterns-py.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO4InternalExterns-py.dfy
new file mode 100644
index 00000000000..42ea696a974
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO4InternalExterns-py.dfy
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/*
+ * Private API - these should not be used elsewhere
+ */
+// @Compile(false) is necessary here since otherwise the translation to Python
+// will create a Std_FileIOInternalExterns.py source file as well,
+// which the embedded version can't easily override.
+@Compile(false)
+module {:extern} Std.PythonFileIOInternalExterns replaces FileIOInternalExterns {
+  method {:extern} INTERNAL_ReadBytesFromFile(path: string)
+    returns (isError: bool, bytesRead: seq<bv8>, errorMsg: string)
+
+  method {:extern} INTERNAL_WriteBytesToFile(path: string, bytes: seq<bv8>)
+    returns (isError: bool, errorMsg: string)
+}
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO5-notarget-java-cs-js-go-py.dfy b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO5-notarget-java-cs-js-go-py.dfy
new file mode 100644
index 00000000000..b6473d8491d
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/FileIO5-notarget-java-cs-js-go-py.dfy
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+  * This module provides basic file I/O operations: reading and writing bytes from/to a file.
+  * The provided API is intentionally limited in scope and will be expanded later.
+  *
+  * Where the API accepts file paths as strings, there are some limitations.
+  * File paths containing only ASCII characters work identically across languages and platforms;
+  * non-ASCII Unicode codepoints may cause different language- or platform-specific behavior.
+  *
+  * File path symbols including . and .. are allowed.
+  */
+module Std.FileIO {
+  import opened Wrappers
+  import FileIOInternalExterns
+
+  export provides ReadBytesFromFile, WriteBytesToFile, Wrappers
+
+  /*
+   * Public API
+   */
+
+  /**
+    * Attempts to read all bytes from the file at the given file path.
+    * If an error occurs, a `Result.Failure` value is returned containing an implementation-specific
+    * error message (which may also contain a stack trace).
+    *
+    * NOTE: See the module description for limitations on the path argument.
+    */
+  method ReadBytesFromFile(path: string) returns (res: Result<seq<bv8>, string>) {
+    var isError, bytesRead, errorMsg := FileIOInternalExterns.INTERNAL_ReadBytesFromFile(path);
+    return if isError then Failure(errorMsg) else Success(bytesRead);
+  }
+
+  /**
+    * Attempts to write the given bytes to the file at the given file path,
+    * creating nonexistent parent directories as necessary.
+    * If an error occurs, a `Result.Failure` value is returned containing an implementation-specific
+    * error message (which may also contain a stack trace).
+    *
+    * NOTE: See the module description for limitations on the path argument.
+    */
+  method WriteBytesToFile(path: string, bytes: seq<bv8>) returns (res: Result<(), string>) {
+    var isError, errorMsg := FileIOInternalExterns.INTERNAL_WriteBytesToFile(path, bytes);
+    return if isError then Failure(errorMsg) else Success(());
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Makefile b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Makefile
new file mode 100644
index 00000000000..eea7d40b13a
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/Makefile
@@ -0,0 +1,47 @@
+
+# This Makefile builds the individual DafnyStandardLibraries-<target>.doo
+# binary files, containing libraries that are defined differently for
+# different target languages.
+# Currently this is only FileIO, but the source file naming pattern
+# used here should work for others as well.
+# DafnyStandardLibraries-notarget is used for non-compiled contexts
+# such as `dafny verify`.
+
+# Invoking the CLI this way just to stay platform-independent
+DAFNY = dotnet run --project ../../../../Dafny --no-build --roll-forward LatestMajor --
+
+NO_VERIFY := false
+DOO_FILE_SOURCE=../../../build/DafnyStandardLibraries-${TARGETLANG}.doo
+DOO_FILE_TARGET=../../../binaries/DafnyStandardLibraries-${TARGETLANG}.doo
+
+verify: build-binary
+verify-all: update-binary-all
+
+build-binary:
+	$(DAFNY) build -t:lib --hidden-no-verify=$(NO_VERIFY) dfyconfig.toml \
+		`find . -name '*-${TARGETLANG}*.dfy' | sort` \
+		--output:${DOO_FILE_SOURCE}
+
+check-binary: build-binary
+	unzip -o ${DOO_FILE_SOURCE} -d ../../../build/current-${TARGETLANG}
+	unzip -o ${DOO_FILE_TARGET} -d ../../../build/rebuilt-${TARGETLANG}
+	diff ../../../build/current-${TARGETLANG} ../../../build/rebuilt-${TARGETLANG}
+
+check-binary-all:
+	make check-binary TARGETLANG=notarget
+	make check-binary TARGETLANG=cs
+	make check-binary TARGETLANG=java
+	make check-binary TARGETLANG=js
+	make check-binary TARGETLANG=go
+	make check-binary TARGETLANG=py
+
+update-binary: build-binary
+	cp ${DOO_FILE_SOURCE} ${DOO_FILE_TARGET}
+
+update-binary-all:
+	make update-binary TARGETLANG=notarget
+	make update-binary TARGETLANG=cs
+	make update-binary TARGETLANG=java
+	make update-binary TARGETLANG=js
+	make update-binary TARGETLANG=go
+	make update-binary TARGETLANG=py
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/README.md b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/README.md
new file mode 100644
index 00000000000..b4349bc604a
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/README.md
@@ -0,0 +1,47 @@
+# Target-specific Libraries
+
+Note that because these modules are implemented with target-language utilities,
+they are only defined for a subset of the Dafny backends:
+currently C#, Java, JavaScript, Go and Python.
+For other backends, the modules are simply not defined,
+so attempting to compile code that uses it will result
+in resolution errors.
+
+## File I/O
+
+The `FileIO` module provides basic file I/O operations.
+Right now, these are limited to reading bytes from a file, and writing bytes to a file.
+The API is intentionally limited in scope and will be expanded later.
+
+The `examples/FileIO` directory contains more detailed examples of how to use the `FileIO` module.
+
+## Concurrent
+
+Dafny has no notion of concurrency, but we supply some tools to support using
+generated code in an concurrent environment. 
+They allow mutable state to be shared between concurrent executions of Dafny code,
+which is particularly useful for caching.
+
+Most of the types in this library do not model their mutable state as part of
+Dafny's model of the heap,
+since Dafny's model currently assumes only sequential access.
+Instead, they model their state as implicit non-determinism.
+In other words, rather than defining a `MutableMap.Get` function that `reads this.Repr`,
+we define a `MutableMap.Get` method with a non-deterministic result.
+This accurately reflects the fact that if one thread `Put`s a value into a `MutableMap`
+and then later tries to `Get` it out again,
+it may not retrieve the same value because of the interference of other threads.
+Therefore all of the interfaces are declared with ONLY methods and no functions,
+since functions must be deterministic based on their parameters and the state of the Dafny heap.
+
+These types should be used with caution,
+as the verifier is only able to ensure that no unprotected Dafny heap state
+is shared between concurrent executions
+(see [the `{:concurrent}` attribute](https://dafny.org/dafny/DafnyRef/DafnyRef#sec-concurrent-attribute)).
+It cannot currently offer any other guarantees related to concurrent execution,
+such as freedom from deadlocks.
+
+## Notes about naming
+
+Currently, replacement modules should appear in files before the files containing modules that include them, [issue tracked here](https://github.com/dafny-lang/dafny/issues/5728).
+Therefore, until that issue is fixed, it might be advisable to add a number in your files to make the order deterministic, as the "find" command might have different outputs based on the OS.
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std/TargetSpecific/dfyconfig.toml b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/dfyconfig.toml
new file mode 100644
index 00000000000..461c37199c3
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/TargetSpecific/dfyconfig.toml
@@ -0,0 +1,21 @@
+
+# The Makefile has its own non-trivial logic for determining which files
+# to include in which mode.
+includes = []
+
+[options]
+# Options that help support more values of consuming context options
+# (mostly turning on any more restrictive verification)
+track-print-effects = true
+enforce-determinism = false
+reads-clauses-on-methods = true
+
+# Options important for sustainable development
+# of the libraries themselves.
+resource-limit = 1000000
+warn-redundant-assumptions = true
+warn-contradictory-assumptions = true
+
+library = [
+  "../../../binaries/DafnyStandardLibraries.doo"
+]
diff --git a/Source/DafnyStandardLibraries/src/Std/Unicode/Unicode.dfy b/Source/DafnyStandardLibraries/src/Std/Unicode/Unicode.dfy
new file mode 100644
index 00000000000..1c3acb2a1b6
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Unicode/Unicode.dfy
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+ This module defines concepts from the core specification
+ of the [Unicode Standard 15.1.0](https://www.unicode.org/versions/Unicode15.1.0/):
+ scalar values, code points, important kinds of code point sequences,
+ Unicode encoding forms and encoding schemes (including UTF-8 and UTF-16),
+ and helpful properties and functions for manipulation and conversion of Unicode strings.
+ */
+module Std.Unicode {
+  // This top-level module contains no definitions.
+  // It exists to enable import between child modules,
+  // and so that its doc comment appears in generated documentation.
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Unicode/Unicode.md b/Source/DafnyStandardLibraries/src/Std/Unicode/Unicode.md
new file mode 100644
index 00000000000..5db7c9c8c5d
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Unicode/Unicode.md
@@ -0,0 +1,12 @@
+# The `Unicode` module
+
+This module defines concepts from the core specification
+of the [Unicode Standard 15.1.0](https://www.unicode.org/versions/Unicode15.1.0/):
+scalar values, code points, important kinds of code point sequences,
+Unicode encoding forms and encoding schemes (including UTF-8 and UTF-16),
+and helpful properties and functions for manipulation and conversion of Unicode strings.
+
+At this time, the module can only be used with `--unicode-char:true`
+(the default value since Dafny 4.0.0).
+In the future, support for `--unicode-char:false` (via module abstraction/refinement)
+will be added.
diff --git a/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeBase.dfy b/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeBase.dfy
new file mode 100644
index 00000000000..af7eedcda7d
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeBase.dfy
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+  * This module implements basic functionality of Unicode 15.1.0.
+  */
+module Std.Unicode.Base {
+  /**
+    * Any value in the Unicode codespace (a range of integers from 0 to 10FFFF_16). (Section 3.4 D9-D10)
+    */
+  type CodePoint = i: bv24 | 0 <= i <= 0x10FFFF
+
+  /**
+    * A Unicode code point in the range U+D800 to U+DBFF. (Section 3.8 D71)
+    */
+  type HighSurrogateCodePoint = p: CodePoint | HIGH_SURROGATE_MIN <= p <= HIGH_SURROGATE_MAX
+    witness HIGH_SURROGATE_MIN
+  const HIGH_SURROGATE_MIN: CodePoint := 0xD800
+  const HIGH_SURROGATE_MAX: CodePoint := 0xDBFF
+
+  /**
+    * A Unicode code point in the range U+DC00 to U+DFFF. (Section 3.8 D73)
+    */
+  type LowSurrogateCodePoint = p: CodePoint | LOW_SURROGATE_MIN <= p <= LOW_SURROGATE_MAX
+    witness LOW_SURROGATE_MIN
+  const LOW_SURROGATE_MIN: CodePoint := 0xDC00
+  const LOW_SURROGATE_MAX: CodePoint := 0xDFFF
+
+  /**
+    * Any Unicode code point except high-surrogate and low-surrogate code points. (Section 3.9 D76)
+    */
+  type ScalarValue = p: CodePoint |
+      && (p < HIGH_SURROGATE_MIN || p > HIGH_SURROGATE_MAX)
+      && (p < LOW_SURROGATE_MIN || p > LOW_SURROGATE_MAX)
+
+  const ASSIGNED_PLANES: set<bv8> := {
+    0,  // Basic Multilingual Plane
+    1,  // Supplementary Multilingual Plane
+    2,  // Supplementary Ideographic Plane
+    3,  // Tertiary Ideographic Plane
+    14, // Supplementary Special Purpose Plane
+    15, // Supplementary Private Use Area A
+    16  // Supplementary Private Use Area B
+  }
+
+  predicate IsInAssignedPlane(i: CodePoint) {
+    var plane := (i >> 16) as bv8;
+    plane in ASSIGNED_PLANES
+  }
+
+  // These are actually supersets of the Unicode planes,
+  // since not all code points in a plane are assigned.
+  //
+  // TODO: check against the list of assigned code points, instead of only checking their plane
+  // (https://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt)
+  type AssignedCodePoint = p: CodePoint | IsInAssignedPlane(p) witness *
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeEncodingForm.dfy b/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeEncodingForm.dfy
new file mode 100644
index 00000000000..eb2a9bbe62a
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeEncodingForm.dfy
@@ -0,0 +1,337 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+  * A Unicode encoding form assigns each Unicode scalar value to a unique code unit sequence.
+  *
+  * A concrete `UnicodeEncodingForm` MUST define the following:
+  *  - The type `CodeUnit`.
+  *  - The predicate `IsMinimalWellFormedCodeUnitSubsequence`, which defines the set of encodings of scalar values,
+  *    known as "minimal well-formed code unit subsequences".
+  *  - The function `SplitPrefixMinimalWellFormedCodeUnitSubsequence`, which defines the algorithm by which to parse
+  *    a minimal well-formed code unit subsequence from the beginning of a code unit sequence.
+  *  - The function `EncodeScalarValue`, which defines the mapping from scalar values to minimal well-formed code unit
+  *    subsequences.
+  *  - The function `DecodeMinimalWellFormedCodeUnitSubsequence`, which defines the mapping from minimal well-formed
+  *    code unit subsequences to scalar values.
+  */
+abstract module Std.Unicode.UnicodeEncodingForm {
+  import opened Wrappers
+
+  import Functions
+  import Collections.Seq
+  import opened Base
+
+  type CodeUnitSeq = seq<CodeUnit>
+  type WellFormedCodeUnitSeq = s: CodeUnitSeq
+    | IsWellFormedCodeUnitSequence(s)
+    witness []
+  type MinimalWellFormedCodeUnitSeq = s: CodeUnitSeq
+    | IsMinimalWellFormedCodeUnitSubsequence(s)
+    witness *
+
+  //
+  // Begin abstract items.
+  //
+
+  /**
+    * A code unit is the minimal bit combination that can represent a unit of encoded text for processing or
+    * interchange. (Section 3.9 D77.)
+    */
+  type CodeUnit
+
+  /**
+    * A well-formed Unicode code unit sequence that maps to a single Unicode scalar value.
+    * (Section 3.9 D85a.)
+    */
+  function IsMinimalWellFormedCodeUnitSubsequence(s: CodeUnitSeq): (b: bool)
+    ensures b ==>
+              && |s| > 0
+              && forall i | 0 < i < |s| :: !IsMinimalWellFormedCodeUnitSubsequence(s[..i])
+    decreases |s|
+
+  /**
+    * Returns the shortest prefix of `s` that is a minimal well-formed code unit subsequence,
+    * or None if there is no such prefix.
+    */
+  function SplitPrefixMinimalWellFormedCodeUnitSubsequence(s: CodeUnitSeq): (maybePrefix: Option<MinimalWellFormedCodeUnitSeq>)
+    ensures |s| == 0 ==> maybePrefix.None?
+    ensures (exists i | 0 < i <= |s| :: IsMinimalWellFormedCodeUnitSubsequence(s[..i])) <==>
+            && maybePrefix.Some?
+    ensures maybePrefix.Some? ==>
+              && var prefix := maybePrefix.Extract();
+              && 0 < |prefix| <= |s|
+              && prefix == s[..|prefix|]
+              && forall i | 0 < i < |prefix| :: !IsMinimalWellFormedCodeUnitSubsequence(s[..i])
+
+  /**
+    * Returns the minimal well-formed code unit subsequence that this encoding form assigns to the given scalar value.
+    * The Unicode standard requires that this is injective.
+    *
+    * TODO: enforce that implementations satisfy Functions.Injective
+    */
+  function EncodeScalarValue(v: ScalarValue): (m: MinimalWellFormedCodeUnitSeq)
+
+  /**
+    * Returns the scalar value that this encoding form assigns to the given minimal well-formed code unit subsequence.
+    */
+  function DecodeMinimalWellFormedCodeUnitSubsequence(m: MinimalWellFormedCodeUnitSeq): (v: ScalarValue)
+    ensures EncodeScalarValue(v) == m
+
+  //
+  // End abstract items.
+  //
+
+  /**
+    * If minimal well-formed code unique subsequences `m1` and `m2` are prefixes of `s`, then they are equal.
+    */
+  lemma LemmaUniquePrefixMinimalWellFormedCodeUnitSeq(
+    s: CodeUnitSeq, m1: MinimalWellFormedCodeUnitSeq, m2: MinimalWellFormedCodeUnitSeq
+  )
+    decreases |s|, |m1|, |m2|
+    requires m1 <= s
+    requires m2 <= s
+    ensures m1 == m2
+  {
+    // Handle only the |m1| <= |m2| case explicitly
+    if |m1| > |m2| {
+      LemmaUniquePrefixMinimalWellFormedCodeUnitSeq(s, m2, m1);
+    } else {
+      assert m1 <= m2;
+      assert m1 == m2 by {
+        if m1 < m2 {
+          assert false by { assert m1 == m2[..|m1|]; }
+        }
+      }
+    }
+  }
+
+  /**
+    * If `ms` is the concatenation of a minimal well-formed code unit subsequence `m` and a code unit sequence `s`,
+    * then the shortest minimal well-formed code unit subsequence prefix of `ms` is simply `m`.
+    */
+  lemma LemmaSplitPrefixMinimalWellFormedCodeUnitSubsequenceInvertsPrepend(m: MinimalWellFormedCodeUnitSeq, s: CodeUnitSeq)
+    ensures SplitPrefixMinimalWellFormedCodeUnitSubsequence(m + s) == Some(m)
+  {
+    var ms := m + s;
+    var maybePrefix := SplitPrefixMinimalWellFormedCodeUnitSubsequence(ms);
+    assert maybePrefix.Some? by { assert IsMinimalWellFormedCodeUnitSubsequence(ms[..|m|]); }
+    var prefix := maybePrefix.Extract();
+
+    assert m <= ms;
+    assert prefix <= ms;
+    LemmaUniquePrefixMinimalWellFormedCodeUnitSeq(ms, m, prefix);
+  }
+
+  /**
+    * Returns the unique partition of the given code unit sequence into minimal well-formed code unit subsequences,
+    * or None if no such partition exists.
+    */
+  function PartitionCodeUnitSequenceChecked(s: CodeUnitSeq): (maybeParts: Option<seq<MinimalWellFormedCodeUnitSeq>>)
+    ensures maybeParts.Some? ==> Seq.Flatten(maybeParts.Extract()) == s
+    decreases |s|
+  {
+    if s == [] then Some([])
+    else
+      var prefix :- SplitPrefixMinimalWellFormedCodeUnitSubsequence(s);
+      // Recursing/iterating on subsequences leads to quadratic running time in most/all Dafny runtimes as of this writing.
+      // This definition (and others in the Unicode modules) emphasizes clarity and correctness,
+      // and while the by-method implementation avoids stack overflows due to non-tail-recursive recursion,
+      // it doesn't yet avoid the subsequences.
+      // The best solution would be to ensure all Dafny runtimes implement subsequences as an O(1)
+      // operation, so this implementation would become linear.
+      var restParts :- PartitionCodeUnitSequenceChecked(s[|prefix|..]);
+      Some([prefix] + restParts)
+  } by method {
+    if s == [] {
+      return Some([]);
+    }
+    var result: seq<MinimalWellFormedCodeUnitSeq> := [];
+    var rest := s;
+    while |rest| > 0
+      invariant PartitionCodeUnitSequenceChecked(s).Some?
+           <==> PartitionCodeUnitSequenceChecked(rest).Some?
+      invariant
+        PartitionCodeUnitSequenceChecked(s).Some? ==>
+          && PartitionCodeUnitSequenceChecked(s).value
+             == result + PartitionCodeUnitSequenceChecked(rest).value
+    {
+      var prefix :- SplitPrefixMinimalWellFormedCodeUnitSubsequence(rest);
+      result := result + [prefix];
+      rest := rest[|prefix|..];
+    }
+    assert result + [] == result;
+    return Some(result);
+  }
+
+  /**
+    * Returns the unique partition of the given well-formed code unit sequence into minimal well-formed code unit
+    * subsequences.
+    */
+  function PartitionCodeUnitSequence(s: WellFormedCodeUnitSeq): (parts: seq<MinimalWellFormedCodeUnitSeq>)
+    ensures Seq.Flatten(parts) == s
+  {
+    PartitionCodeUnitSequenceChecked(s).Extract()
+  }
+
+  /**
+    * The partitioning of a minimal well-formed code unit subsequence is the singleton sequence
+    * containing exactly the minimal well-formed code unit subsequence.
+    */
+  lemma LemmaPartitionMinimalWellFormedCodeUnitSubsequence(m: MinimalWellFormedCodeUnitSeq)
+    ensures PartitionCodeUnitSequenceChecked(m) == Some([m])
+  {
+    LemmaSplitPrefixMinimalWellFormedCodeUnitSubsequenceInvertsPrepend(m, []);
+    calc == {
+      Some(m);
+      SplitPrefixMinimalWellFormedCodeUnitSubsequence(m + []);
+      { assert m + [] == m; }
+      SplitPrefixMinimalWellFormedCodeUnitSubsequence(m);
+    }
+    calc == {
+      PartitionCodeUnitSequenceChecked(m);
+      Some([m] + []);
+      { assert [m] + [] == [m]; }
+      Some([m]);
+    }
+  }
+
+  /**
+    * A code unit sequence is well-formed iff it can be partitioned into a sequence of minimal well-formed code unit subsequences.
+    */
+  function IsWellFormedCodeUnitSequence(s: CodeUnitSeq): (b: bool)
+  {
+    PartitionCodeUnitSequenceChecked(s).Some?
+  }
+
+  /**
+    * A minimal well-formed code unit subsequence is a well-formed code unit sequence.
+    */
+  lemma LemmaMinimalWellFormedCodeUnitSubsequenceIsWellFormedSequence(m: MinimalWellFormedCodeUnitSeq)
+    ensures IsWellFormedCodeUnitSequence(m)
+  {
+    LemmaPartitionMinimalWellFormedCodeUnitSubsequence(m);
+  }
+
+  /**
+    * The concatenation of a minimal well-formed code unit subsequence and a well-formed code unit sequence
+    * is itself a well-formed code unit sequence.
+    */
+  lemma LemmaPrependMinimalWellFormedCodeUnitSubsequence(m: MinimalWellFormedCodeUnitSeq, s: WellFormedCodeUnitSeq)
+    ensures IsWellFormedCodeUnitSequence(m + s)
+  {
+    LemmaPartitionMinimalWellFormedCodeUnitSubsequence(m);
+    LemmaSplitPrefixMinimalWellFormedCodeUnitSubsequenceInvertsPrepend(m, s);
+  }
+
+  /**
+    * The concatenation of minimal well-formed code unit subsequences is itself a well-formed code unit sequence.
+    */
+  lemma LemmaFlattenMinimalWellFormedCodeUnitSubsequences(ms: seq<MinimalWellFormedCodeUnitSeq>)
+    ensures IsWellFormedCodeUnitSequence(Seq.Flatten(ms))
+  {
+    if |ms| == 0 {
+      // assert IsWellFormedCodeUnitSequence(Seq.Flatten(ms));
+    }
+    else {
+      var head := ms[0];
+      var tail := ms[1..];
+      LemmaFlattenMinimalWellFormedCodeUnitSubsequences(tail);
+      var flatTail := Seq.Flatten(tail);
+      LemmaPrependMinimalWellFormedCodeUnitSubsequence(head, flatTail);
+    }
+  }
+
+  /**
+    * The concatenation of well-formed code unit sequences is itself a well-formed code unit sequence.
+    */
+  lemma LemmaConcatWellFormedCodeUnitSubsequences(s: WellFormedCodeUnitSeq, t: WellFormedCodeUnitSeq)
+    ensures IsWellFormedCodeUnitSequence(s + t)
+  {
+    var partsS := PartitionCodeUnitSequence(s);
+    var partsT := PartitionCodeUnitSequence(t);
+    var partsST := partsS + partsT;
+    Seq.LemmaFlattenConcat(partsS, partsT);
+
+    LemmaFlattenMinimalWellFormedCodeUnitSubsequences(partsST);
+  }
+
+  /**
+    * Returns the well-formed Unicode string that is the encoding of the given scalar value sequence.
+    */
+  function EncodeScalarSequence(vs: seq<ScalarValue>): (s: WellFormedCodeUnitSeq)
+  {
+    var ms := Seq.Map(EncodeScalarValue, vs);
+    LemmaFlattenMinimalWellFormedCodeUnitSubsequences(ms);
+    Seq.Flatten(ms)
+  }
+  by method {
+    // Optimize to to avoid allocating the intermediate unflattened sequence.
+    // We can't quite use Seq.FlatMap easily because we need to prove the result
+    // is not just a seq<CodeUnit> but a WellFormedCodeUnitSeqs.
+    // TODO: We can be even more efficient by using a JSON.Utils.Vectors.Vector instead.
+    s := [];
+    ghost var unflattened: seq<MinimalWellFormedCodeUnitSeq> := [];
+    for i := |vs| downto 0
+      invariant unflattened == Seq.MapPartialFunction(EncodeScalarValue, vs[i..])
+      invariant s == Seq.Flatten(unflattened)
+    {
+      var next: MinimalWellFormedCodeUnitSeq := EncodeScalarValue(vs[i]);
+      unflattened := [next] + unflattened;
+      LemmaPrependMinimalWellFormedCodeUnitSubsequence(next, s);
+      s := next + s;
+    }
+  }
+
+  /**
+    * Returns the scalar value sequence encoded by the given well-formed Unicode string.
+    */
+  function DecodeCodeUnitSequence(s: WellFormedCodeUnitSeq): (vs: seq<ScalarValue>)
+    ensures EncodeScalarSequence(vs) == s
+  {
+    var parts := PartitionCodeUnitSequence(s);
+    var vs := Seq.MapPartialFunction(DecodeMinimalWellFormedCodeUnitSubsequence, parts);
+    calc == {
+      s;
+      Seq.Flatten(parts);
+      { assert parts == Seq.MapPartialFunction(EncodeScalarValue, vs); }
+      Seq.Flatten(Seq.MapPartialFunction(EncodeScalarValue, vs));
+      EncodeScalarSequence(vs);
+    }
+    vs
+  }
+
+  /**
+    * Returns the scalar value sequence encoded by the given code unit sequence, or None if the given Unicode string
+    * is not well-formed.
+    */
+  function DecodeCodeUnitSequenceChecked(s: CodeUnitSeq): (maybeVs: Option<seq<ScalarValue>>)
+    ensures IsWellFormedCodeUnitSequence(s) ==>
+              && maybeVs.Some?
+              && maybeVs.Extract() == DecodeCodeUnitSequence(s)
+    ensures !IsWellFormedCodeUnitSequence(s) ==> && maybeVs.None?
+  {
+    // IsWellFormedCodeUnitSequence and DecodeCodeUnitSequence each call PartitionCodeUnitSequence,
+    // so for efficiency we avoid recomputing the partition in the by-method.
+    if IsWellFormedCodeUnitSequence(s) then Some(DecodeCodeUnitSequence(s))
+    else None
+  }
+  by method {
+    var maybeParts := PartitionCodeUnitSequenceChecked(s);
+    if maybeParts.None? {
+      return None;
+    }
+    var parts := maybeParts.value;
+    var vs := Seq.MapPartialFunction(DecodeMinimalWellFormedCodeUnitSubsequence, parts);
+    calc == {
+      s;
+      Seq.Flatten(parts);
+      { assert parts == Seq.MapPartialFunction(EncodeScalarValue, vs); }
+      Seq.Flatten(Seq.MapPartialFunction(EncodeScalarValue, vs));
+      EncodeScalarSequence(vs);
+    }
+    return Some(vs);
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeStrings.dfy b/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeStrings.dfy
new file mode 100644
index 00000000000..510cd597145
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeStrings.dfy
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+  * This abstract module is an interface for converting
+  * between the Dafny `string` type and sequences of UTF-8 and UTF-16
+  * codepoints, where codepoints are represents as bounded ints
+  * (`uint8` and `uint16`).
+  *
+  * Because the `--unicode-char` option changes the meaning
+  * of the `char` type and hence the `string` type,
+  * this module must be implemented differently for each option value.
+  * Currently, the only available implementation is for `--unicode-char:true`,
+  * and the implementation for `--unicode-char false` is upcoming.
+  *
+  * If you also want to maintain code that works for either `--unicode-char` value,
+  * implement your logic in an abstract module that imports this one.
+  * Then define a refining module for each `--unicode-char` value you wish to support,
+  * each of which imports the appropriate implementation of AbstractUnicodeStrings.
+  */
+abstract module Std.Unicode.AbstractUnicodeStrings {
+
+  import Collections.Seq
+
+  import opened Wrappers
+  import opened BoundedInts
+
+  function ToUTF8Checked(s: string): Option<seq<uint8>>
+
+  function ASCIIToUTF8(s: string): seq<uint8>
+    requires forall i | 0 <= i < |s| :: 0 <= s[i] as int < 128
+  {
+    Seq.Map(c requires 0 <= c as int < 128 => c as uint8, s)
+  }
+
+  function FromUTF8Checked(bs: seq<uint8>): Option<string>
+
+  function ToUTF16Checked(s: string): Option<seq<uint16>>
+
+  function ASCIIToUTF16(s: string): seq<uint16>
+    requires forall i | 0 <= i < |s| :: 0 <= s[i] as int < 128
+  {
+    Seq.Map(c requires 0 <= c as int < 128 => c as uint16, s)
+  }
+
+  function FromUTF16Checked(bs: seq<uint16>): Option<string>
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeStringsWithUnicodeChar.dfy b/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeStringsWithUnicodeChar.dfy
new file mode 100644
index 00000000000..fd2e2ff5814
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Unicode/UnicodeStringsWithUnicodeChar.dfy
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+  * A concrete implementation of `AbstractUnicodeStrings` for `--unicode-char:true`,
+  * defining functions for converting between strings and UTF-8/UTF-16.
+  * See the `AbstractUnicodeStrings` module for details.
+  */
+module Std.Unicode.UnicodeStringsWithUnicodeChar refines AbstractUnicodeStrings {
+
+  import Base
+  import Utf8EncodingForm
+  import Utf16EncodingForm
+
+  @IsolateAssertions
+  lemma CharIsUnicodeScalarValue(c: char)
+    ensures
+      && var asBits := c as int as bv24;
+      && asBits <= 0x10_FFFF
+      && (0 <= asBits < Base.HIGH_SURROGATE_MIN || Base.LOW_SURROGATE_MAX < asBits)
+  {
+    assert c as int < 0x11_0000;
+    // This seems to be just too expensive to verify for such a wide bit-vector type,
+    // but is clearly true given the above.
+    assume {:axiom} c as int as bv24 < 0x11_0000 as bv24;
+    var asBits := c as int as bv24;
+    assert asBits < 0x11_0000 as bv24;
+    assert (asBits < Base.HIGH_SURROGATE_MIN || asBits > Base.LOW_SURROGATE_MAX);
+    assert asBits <= 0x10_FFFF;
+  }
+
+  lemma UnicodeScalarValueIsChar(sv: Base.ScalarValue)
+    ensures
+      && var asInt := sv as int;
+      && (0 <= asInt < 0xD800 || 0xE000 <= asInt < 0x11_0000)
+  {
+    var asInt := sv as int;
+    assert (asInt < 0xD800 || asInt > 0xDFFF);
+    assert (asInt < 0xDBFF || asInt > 0xDC00);
+  }
+
+  function CharAsUnicodeScalarValue(c: char): Base.ScalarValue {
+    CharIsUnicodeScalarValue(c);
+    c as int as Base.ScalarValue
+  }
+
+  function CharFromUnicodeScalarValue(sv: Base.ScalarValue): char {
+    UnicodeScalarValueIsChar(sv);
+    // TODO: Can we avoid the extra cast to int?
+    sv as int as char
+  }
+
+  function ToUTF8Checked(s: string): Option<seq<uint8>>
+    ensures ToUTF8Checked(s).Some?
+  {
+    var asCodeUnits := Seq.Map(CharAsUnicodeScalarValue, s);
+    var asUtf8CodeUnits := Utf8EncodingForm.EncodeScalarSequence(asCodeUnits);
+    var asBytes := Seq.Map(cu => cu as uint8, asUtf8CodeUnits);
+    Some(asBytes)
+  }
+
+  function FromUTF8Checked(bs: seq<uint8>): Option<string> {
+    var asCodeUnits := Seq.Map(c => c as Utf8EncodingForm.CodeUnit, bs);
+    var utf32 :- Utf8EncodingForm.DecodeCodeUnitSequenceChecked(asCodeUnits);
+    var asChars := Seq.Map(CharFromUnicodeScalarValue, utf32);
+    Some(asChars)
+  }
+
+  function ToUTF16Checked(s: string): Option<seq<uint16>>
+    ensures ToUTF16Checked(s).Some?
+  {
+    var asCodeUnits := Seq.Map(CharAsUnicodeScalarValue, s);
+    var asUtf16CodeUnits := Utf16EncodingForm.EncodeScalarSequence(asCodeUnits);
+    var asBytes := Seq.Map(cu => cu as uint16, asUtf16CodeUnits);
+    Some(asBytes)
+  }
+
+  function FromUTF16Checked(bs: seq<uint16>): Option<string> {
+    var asCodeUnits := Seq.Map(c => c as Utf16EncodingForm.CodeUnit, bs);
+    var utf32 :- Utf16EncodingForm.DecodeCodeUnitSequenceChecked(asCodeUnits);
+    var asChars := Seq.Map(CharFromUnicodeScalarValue, utf32);
+    Some(asChars)
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Unicode/Utf16EncodingForm.dfy b/Source/DafnyStandardLibraries/src/Std/Unicode/Utf16EncodingForm.dfy
new file mode 100644
index 00000000000..7cbc1bb0683
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Unicode/Utf16EncodingForm.dfy
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+// Definition of the UTF-16 Unicode Encoding Form, as specified in Section 3.9 D91.
+module Std.Unicode.Utf16EncodingForm refines UnicodeEncodingForm {
+  type CodeUnit = bv16
+
+  //
+  // Definitions of well-formedness.
+  //
+
+  function IsMinimalWellFormedCodeUnitSubsequence(s: CodeUnitSeq): (b: bool)
+  {
+    if |s| == 1 then IsWellFormedSingleCodeUnitSequence(s)
+    else if |s| == 2 then (
+                            var b := IsWellFormedDoubleCodeUnitSequence(s);
+                            assert b ==> forall i | 0 < i < |s| :: !IsMinimalWellFormedCodeUnitSubsequence(s[..i]);
+                            b
+                          )
+    else false
+  }
+
+  function IsWellFormedSingleCodeUnitSequence(s: CodeUnitSeq): (b: bool)
+    requires |s| == 1
+  {
+    var firstWord := s[0];
+    || 0x0 <= firstWord <= 0xD7FF
+    || 0xE000 <= firstWord <= 0xFFFF
+  }
+
+  function IsWellFormedDoubleCodeUnitSequence(s: CodeUnitSeq): (b: bool)
+    requires |s| == 2
+    ensures b ==> !IsWellFormedSingleCodeUnitSequence(s[..1])
+  {
+    var firstWord := s[0];
+    var secondWord := s[1];
+    && 0xD800 <= firstWord <= 0xDBFF
+    && 0xDC00 <= secondWord <= 0xDFFF
+  }
+
+  function SplitPrefixMinimalWellFormedCodeUnitSubsequence(s: CodeUnitSeq): (maybePrefix: Option<MinimalWellFormedCodeUnitSeq>)
+    ensures |s| == 0 ==> maybePrefix.None?
+    ensures (exists i | 0 < i <= |s| :: IsMinimalWellFormedCodeUnitSubsequence(s[..i])) <==>
+            && maybePrefix.Some?
+    ensures maybePrefix.Some? ==>
+              && var prefix := maybePrefix.Extract();
+              && 0 < |prefix| <= |s|
+              && prefix == s[..|prefix|]
+              && IsMinimalWellFormedCodeUnitSubsequence(prefix)
+  {
+    if |s| >= 1 && IsWellFormedSingleCodeUnitSequence(s[..1]) then Some(s[..1])
+    else if |s| >= 2 && IsWellFormedDoubleCodeUnitSequence(s[..2]) then Some(s[..2])
+    else None
+  }
+
+  //
+  // Encoding and decoding.
+  // See Table 3-5. UTF-16 Bit Distribution.
+  //
+
+  function EncodeScalarValue(v: ScalarValue): (m: MinimalWellFormedCodeUnitSeq)
+  {
+    if 0x0 <= v <= 0xD7FF || 0xE000 <= v <= 0xFFFF then EncodeScalarValueSingleWord(v)
+    else EncodeScalarValueDoubleWord(v)
+  }
+
+  function EncodeScalarValueSingleWord(v: ScalarValue): (m: MinimalWellFormedCodeUnitSeq)
+    requires
+      || 0x0 <= v <= 0xD7FF
+      || 0xE000 <= v <= 0xFFFF
+    ensures |m| == 1
+    ensures IsWellFormedSingleCodeUnitSequence(m)
+  {
+    var firstWord := v as CodeUnit;
+    [firstWord]
+  }
+
+  function EncodeScalarValueDoubleWord(v: ScalarValue): (m: MinimalWellFormedCodeUnitSeq)
+    requires 0x10000 <= v <= 0x10FFFF
+    ensures |m| == 2
+    ensures IsWellFormedDoubleCodeUnitSequence(m)
+  {
+    // v = 000u uuuu / xxxx xxxx / xxxx xxxx
+    //                 1111 1122   2222 2222
+    var x2 := (v & 0x3FF) as bv10;
+    var x1 := ((v & 0xFC00) >> 10) as bv6;
+    var u := ((v & 0x1F0000) >> 16) as bv5;
+    var w := (u - 1) as bv4;
+    // encoded = 1101 10ww / wwxx xxxx / 1101 11xx / xxxx xxxx
+    //                         11 1111          22   2222 2222
+    var firstWord := 0xD800 | ((w as CodeUnit) << 6) | x1 as CodeUnit;
+    var secondWord := 0xDC00 | x2 as CodeUnit;
+    [firstWord, secondWord]
+  }
+
+  function DecodeMinimalWellFormedCodeUnitSubsequence(m: MinimalWellFormedCodeUnitSeq): (v: ScalarValue)
+  {
+    if |m| == 1 then DecodeMinimalWellFormedCodeUnitSubsequenceSingleWord(m)
+    else assert |m| == 2; DecodeMinimalWellFormedCodeUnitSubsequenceDoubleWord(m)
+  }
+
+  function DecodeMinimalWellFormedCodeUnitSubsequenceSingleWord(m: MinimalWellFormedCodeUnitSeq): (v: ScalarValue)
+    requires |m| == 1
+    ensures
+      || 0x0 <= v <= 0xD7FF
+      || 0xE000 <= v <= 0xFFFF
+    ensures EncodeScalarValueSingleWord(v) == m
+  {
+    var firstWord := m[0];
+    var x := firstWord as bv16;
+    assert EncodeScalarValueSingleWord(x as ScalarValue) == m;
+    x as ScalarValue
+  }
+
+  @ResourceLimit("1200e3")
+  function
+  DecodeMinimalWellFormedCodeUnitSubsequenceDoubleWord(m: MinimalWellFormedCodeUnitSeq): (v: ScalarValue)
+    requires |m| == 2
+    ensures 0x10000 <= v <= 0x10FFFF
+    ensures EncodeScalarValueDoubleWord(v) == m
+  {
+    var firstWord := m[0];
+    var secondWord := m[1];
+    var x2 := (secondWord & 0x3FF) as bv24;
+    var x1 := (firstWord & 0x3F) as bv24;
+    var w := ((firstWord & 0x3C0) >> 6) as bv24;
+    var u := (w + 1) as bv24;
+    var v := (u << 16) | (x1 << 10) | x2 as ScalarValue;
+    assert {:split_here} true;
+    assert EncodeScalarValueDoubleWord(v) == m;
+    v
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Unicode/Utf8EncodingForm.dfy b/Source/DafnyStandardLibraries/src/Std/Unicode/Utf8EncodingForm.dfy
new file mode 100644
index 00000000000..ce5c3d31350
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Unicode/Utf8EncodingForm.dfy
@@ -0,0 +1,257 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+  * The Unicode encoding form that assigns each Unicode scalar value to an unsigned byte sequence of one to four bytes
+  * in length, as specified in Table 3-6 and Table 3-7.
+  */
+module Std.Unicode.Utf8EncodingForm refines UnicodeEncodingForm {
+  type CodeUnit = bv8
+
+  //
+  // Definitions of well-formedness.
+  //
+
+  function IsMinimalWellFormedCodeUnitSubsequence(s: CodeUnitSeq): (b: bool)
+  {
+    if |s| == 1 then (
+                       var b := IsWellFormedSingleCodeUnitSequence(s);
+                       assert b ==> forall i | 0 < i < |s| :: !IsMinimalWellFormedCodeUnitSubsequence(s[..i]);
+                       b
+                     )
+    else if |s| == 2 then (
+                            var b := IsWellFormedDoubleCodeUnitSequence(s);
+                            assert b ==> forall i | 0 < i < |s| :: !IsMinimalWellFormedCodeUnitSubsequence(s[..i]);
+                            b
+                          )
+    else if |s| == 3 then (
+                            var b := IsWellFormedTripleCodeUnitSequence(s);
+                            assert b ==> forall i | 0 < i < |s| :: !IsMinimalWellFormedCodeUnitSubsequence(s[..i]);
+                            b
+                          )
+    else if |s| == 4 then (
+                            var b := IsWellFormedQuadrupleCodeUnitSequence(s);
+                            assert b ==> forall i | 0 < i < |s| :: !IsMinimalWellFormedCodeUnitSubsequence(s[..i]);
+                            b
+                          )
+    else false
+  }
+
+  function IsWellFormedSingleCodeUnitSequence(s: CodeUnitSeq): (b: bool)
+    requires |s| == 1
+  {
+    var firstByte := s[0];
+    && 0x00 <= firstByte <= 0x7F
+  }
+
+  function IsWellFormedDoubleCodeUnitSequence(s: CodeUnitSeq): (b: bool)
+    requires |s| == 2
+    ensures b ==>
+              && !IsWellFormedSingleCodeUnitSequence(s[..1])
+  {
+    var firstByte := s[0];
+    var secondByte := s[1];
+    && 0xC2 <= firstByte <= 0xDF
+    && 0x80 <= secondByte <= 0xBF
+  }
+
+  function IsWellFormedTripleCodeUnitSequence(s: CodeUnitSeq): (b: bool)
+    requires |s| == 3
+    ensures b ==>
+              && !IsWellFormedSingleCodeUnitSequence(s[..1])
+              && !IsWellFormedDoubleCodeUnitSequence(s[..2])
+  {
+    var firstByte := s[0];
+    var secondByte := s[1];
+    var thirdByte := s[2];
+    && (
+         || (firstByte == 0xE0 && 0xA0 <= secondByte <= 0xBF)
+         || (0xE1 <= firstByte <= 0xEC && 0x80 <= secondByte <= 0xBF)
+         || (firstByte == 0xED && 0x80 <= secondByte <= 0x9F)
+         || (0xEE <= firstByte <= 0xEF && 0x80 <= secondByte <= 0xBF)
+       )
+    && 0x80 <= thirdByte <= 0xBF
+  }
+
+  function IsWellFormedQuadrupleCodeUnitSequence(s: CodeUnitSeq): (b: bool)
+    requires |s| == 4
+    ensures b ==>
+              && !IsWellFormedSingleCodeUnitSequence(s[..1])
+              && !IsWellFormedDoubleCodeUnitSequence(s[..2])
+              && !IsWellFormedTripleCodeUnitSequence(s[..3])
+  {
+    var firstByte := s[0];
+    var secondByte := s[1];
+    var thirdByte := s[2];
+    var fourthByte := s[3];
+    && (
+         || (firstByte == 0xF0 && 0x90 <= secondByte <= 0xBF)
+         || (0xF1 <= firstByte <= 0xF3 && 0x80 <= secondByte <= 0xBF)
+         || (firstByte == 0xF4 && 0x80 <= secondByte <= 0x8F)
+       )
+    && 0x80 <= thirdByte <= 0xBF
+    && 0x80 <= fourthByte <= 0xBF
+  }
+
+  function SplitPrefixMinimalWellFormedCodeUnitSubsequence(s: CodeUnitSeq):
+    (maybePrefix: Option<MinimalWellFormedCodeUnitSeq>)
+  {
+    if |s| >= 1 && IsWellFormedSingleCodeUnitSequence(s[..1]) then Some(s[..1])
+    else if |s| >= 2 && IsWellFormedDoubleCodeUnitSequence(s[..2]) then Some(s[..2])
+    else if |s| >= 3 && IsWellFormedTripleCodeUnitSequence(s[..3]) then Some(s[..3])
+    else if |s| >= 4 && IsWellFormedQuadrupleCodeUnitSequence(s[..4]) then Some(s[..4])
+    else None
+  }
+
+  //
+  // Encoding and decoding.
+  // See Table 3-6. UTF-8 Bit Distribution of the Unicode Standard 14.0.
+  //
+
+  function EncodeScalarValue(v: ScalarValue): (m: MinimalWellFormedCodeUnitSeq)
+  {
+    if v <= 0x7F then EncodeScalarValueSingleByte(v)
+    else if v <= 0x7FF then EncodeScalarValueDoubleByte(v)
+    else if v <= 0xFFFF then EncodeScalarValueTripleByte(v)
+    else EncodeScalarValueQuadrupleByte(v)
+  }
+
+  function EncodeScalarValueSingleByte(v: ScalarValue): (m: MinimalWellFormedCodeUnitSeq)
+    requires 0 <= v <= 0x7F
+    ensures |m| == 1
+    ensures IsWellFormedSingleCodeUnitSequence(m)
+  {
+    // v = 0000 0000 / 0xxx xxxx
+    var x := (v & 0x7F) as bv7;
+    // encoded = 0xxx xxxx
+    var firstByte := x as CodeUnit;
+    [firstByte]
+  }
+
+  function EncodeScalarValueDoubleByte(v: ScalarValue): (s: CodeUnitSeq)
+    requires 0x80 <= v <= 0x7FF
+    ensures |s| == 2
+    ensures IsWellFormedDoubleCodeUnitSequence(s)
+  {
+    // v = 0000 0yyy / yyxx xxxx
+    var x := (v & 0x3F) as bv6;
+    var y := ((v & 0x7C0) >> 6) as bv5;
+    // encoded = 110y yyyy / 10xx xxxx
+    var firstByte := 0xC0 | y as CodeUnit;
+    var secondByte := 0x80 | x as CodeUnit;
+    [firstByte, secondByte]
+  }
+
+  function EncodeScalarValueTripleByte(v: ScalarValue): (s: CodeUnitSeq)
+    requires 0x800 <= v <= 0xFFFF
+    ensures |s| == 3
+    ensures IsWellFormedTripleCodeUnitSequence(s)
+  {
+    // v = zzzz yyyy / yyxx xxxx
+    var x := (v & 0x3F) as bv6;
+    var y := ((v & 0xFC0) >> 6) as bv6;
+    var z := ((v & 0xF000) >> 12) as bv4;
+    // encoded = 1110 zzzz / 10yy yyyy / 10xx xxxx
+    var firstByte := 0xE0 | z as CodeUnit;
+    var secondByte := 0x80 | y as CodeUnit;
+    var thirdByte := 0x80 | x as CodeUnit;
+    [firstByte, secondByte, thirdByte]
+  }
+
+  function EncodeScalarValueQuadrupleByte(v: ScalarValue): (s: CodeUnitSeq)
+    requires 0x10000 <= v <= 0x10FFFF
+    ensures |s| == 4
+    ensures IsWellFormedQuadrupleCodeUnitSequence(s)
+  {
+    // v = 000u uuuu / zzzz yyyy / yyxx xxxx
+    //        1 1122
+    assert v <= 0x1FFFFF;
+    var x := (v & 0x3F) as bv6;
+    var y := ((v & 0xFC0) >> 6) as bv6;
+    var z := ((v & 0xF000) >> 12) as bv4;
+    var u2 := ((v & 0x30000) >> 16) as bv2;
+    var u1 := ((v & 0x1C0000) >> 18) as bv3;
+
+    // encoded = 1111 0uuu / 10uu zzzz / 10yy yyyy / 10xx xxxx
+    //                 111     22
+    var firstByte := 0xF0 | u1 as CodeUnit;
+    var secondByte := 0x80 | ((u2 as CodeUnit) << 4) | z as CodeUnit;
+    var thirdByte := 0x80 | y as CodeUnit;
+    var fourthByte := 0x80 | x as CodeUnit;
+    [firstByte, secondByte, thirdByte, fourthByte]
+  }
+
+  function DecodeMinimalWellFormedCodeUnitSubsequence(m: MinimalWellFormedCodeUnitSeq): (v: ScalarValue)
+  {
+    if |m| == 1 then DecodeMinimalWellFormedCodeUnitSubsequenceSingleByte(m)
+    else if |m| == 2 then DecodeMinimalWellFormedCodeUnitSubsequenceDoubleByte(m)
+    else if |m| == 3 then DecodeMinimalWellFormedCodeUnitSubsequenceTripleByte(m)
+    else assert |m| == 4; DecodeMinimalWellFormedCodeUnitSubsequenceQuadrupleByte(m)
+  }
+
+  function DecodeMinimalWellFormedCodeUnitSubsequenceSingleByte(m: MinimalWellFormedCodeUnitSeq): (v: ScalarValue)
+    requires |m| == 1
+    ensures 0 <= v <= 0x7F
+    ensures EncodeScalarValueSingleByte(v) == m
+  {
+    var firstByte := m[0];
+    var x := firstByte as bv7;
+    x as ScalarValue
+  }
+
+  function DecodeMinimalWellFormedCodeUnitSubsequenceDoubleByte(m: MinimalWellFormedCodeUnitSeq): (v: ScalarValue)
+    requires |m| == 2
+    ensures 0x80 <= v <= 0x7FF
+    ensures EncodeScalarValueDoubleByte(v) == m
+  {
+    var firstByte := m[0];
+    var secondByte := m[1];
+    var y := (firstByte & 0x1F) as bv24;
+    var x := (secondByte & 0x3F) as bv24;
+    (y << 6) | x as ScalarValue
+  }
+
+  @ResourceLimit("115e6")
+  function
+  DecodeMinimalWellFormedCodeUnitSubsequenceTripleByte(m: MinimalWellFormedCodeUnitSeq): (v: ScalarValue)
+    requires |m| == 3
+    ensures 0x800 <= v <= 0xFFFF
+    ensures EncodeScalarValueTripleByte(v) == m
+  {
+    var firstByte := m[0];
+    var secondByte := m[1];
+    var thirdByte := m[2];
+    var z := (firstByte & 0xF) as bv24;
+    var y := (secondByte & 0x3F) as bv24;
+    var x := (thirdByte & 0x3F) as bv24;
+    assert {:split_here} true;
+    (z << 12) | (y << 6) | x as ScalarValue
+  }
+
+  @IsolateAssertions
+  function
+  DecodeMinimalWellFormedCodeUnitSubsequenceQuadrupleByte(m: MinimalWellFormedCodeUnitSeq): (v: ScalarValue)
+    requires |m| == 4
+    ensures 0x10000 <= v <= 0x10FFFF
+    ensures EncodeScalarValueQuadrupleByte(v) == m
+  {
+    var firstByte := m[0];
+    var secondByte := m[1];
+    var thirdByte := m[2];
+    var fourthByte := m[3];
+    var u1 := (firstByte & 0x7) as bv24;
+    var u2 := ((secondByte & 0x30) >> 4) as bv24;
+    var z := (secondByte & 0xF) as bv24;
+    var y := (thirdByte & 0x3F) as bv24;
+    var x := (fourthByte & 0x3F) as bv24;
+    assert {:split_here} true;
+    var r := (u1 << 18) | (u2 << 16) | (z << 12) | (y << 6) | x as ScalarValue;
+    assert EncodeScalarValueQuadrupleByte(r)[0] == m[0];
+    assert EncodeScalarValueQuadrupleByte(r)[1] == m[1];
+    assert EncodeScalarValueQuadrupleByte(r)[2] == m[2];
+    assert EncodeScalarValueQuadrupleByte(r)[3] == m[3];
+    r
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Unicode/Utf8EncodingScheme.dfy b/Source/DafnyStandardLibraries/src/Std/Unicode/Utf8EncodingScheme.dfy
new file mode 100644
index 00000000000..8aefcdf37a5
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Unicode/Utf8EncodingScheme.dfy
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/**
+  * The Unicode encoding scheme that serializes a UTF-8 code unit sequence in exactly the same order as the code unit
+  * sequence itself.
+  *
+  * Because the UTF-8 encoding form deals in ordered byte sequences, the UTF-8 encoding scheme is trivial.
+  * The byte ordering is completely defined by the UTF-8 code unit sequence itself.
+  * We implement the encoding scheme here for completeness of the Unicode character encoding model,
+  * and to perform the (trivial) conversion between `uint8`/`byte` and `bv8` values.
+  *
+  * (Section 3.10 D95)
+  *
+  * TODO: this should refine an abstract UnicodeEncodingScheme module
+  * that states lemmas/conditions about Serialize and Deserialize
+  * which refining modules would prove about their own implementations.
+  */
+module Std.Unicode.Utf8EncodingScheme {
+  import opened Wrappers
+
+  import BoundedInts
+  import Collections.Seq
+  import Utf8EncodingForm
+
+  type byte = BoundedInts.uint8
+
+  /**
+    * Returns the byte serialization of the given code unit sequence.
+    */
+  function Serialize(s: Utf8EncodingForm.CodeUnitSeq): (b: seq<byte>)
+  {
+    Seq.Map(c => c as byte, s)
+  }
+
+  /**
+    * Returns the code unit sequence that serializes to the given byte sequence.
+    */
+  function Deserialize(b: seq<byte>): (s: Utf8EncodingForm.CodeUnitSeq)
+  {
+    Seq.Map(b => b as Utf8EncodingForm.CodeUnit, b)
+  }
+
+  /**
+    * Serializing a code unit sequence and then deserializing the result, yields the original code unit sequence.
+    */
+  lemma LemmaSerializeDeserialize(s: Utf8EncodingForm.CodeUnitSeq)
+    ensures Deserialize(Serialize(s)) == s
+  {}
+
+  /**
+    * Deserializing a byte sequence and then serializing the result, yields the original byte sequence.
+    */
+  @ResourceLimit("30e7")
+  lemma LemmaDeserializeSerialize(b: seq<byte>)
+    ensures Serialize(Deserialize(b)) == b
+  {
+    hide *;
+    reveal BoundedInts.TWO_TO_THE_8;
+    calc {
+      Serialize(Deserialize(b));
+    == // Definitions of Serialize, Deserialize
+      { reveal Serialize; reveal Deserialize; }
+      Seq.Map(c => c as byte, Seq.Map(b => b as Utf8EncodingForm.CodeUnit, b));
+    == // Compositionality of Map
+      Seq.Map(b => (b as Utf8EncodingForm.CodeUnit) as byte, b);
+    == // Simplify map
+      Seq.Map(b => b, b);
+    == // Identity function
+      b;
+    }
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Wrappers.dfy b/Source/DafnyStandardLibraries/src/Std/Wrappers.dfy
new file mode 100644
index 00000000000..dbe4fee46d4
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Wrappers.dfy
@@ -0,0 +1,205 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT
+ *******************************************************************************/
+
+/** This module provides various kinds of failure-compatible datatypes, including Option.
+- Option<R> (Some or None) with a type parameter R that is the type of the Some value
+- Outcome<E> (Pass or Fail) with a type parameter E that is the type of a failure value
+- Result<R,E> which has both a value type and a failure type
+All three of these may be used with `:-` as Dafny failure-compatible types
+
+The module also defines two forms of `Need`, that check the truth of a predicate and
+return a failure value if false.
+ */
+module Std.Wrappers {
+
+  /** This datatype is the conventional Some/None datatype that is often used
+      in place of a reference or null.
+   */
+  datatype Option<+T> = None | Some(value: T) {
+
+    /** True if is None */
+    predicate IsFailure() {
+      None?
+    }
+
+    /** Converts a None result to an Option value with a different value type. */
+    function PropagateFailure<U>(): Option<U>
+      requires None?
+    {
+      None
+    }
+
+    /** Returns the value encapsulated in Some */
+    function Extract(): T
+      requires Some?
+    {
+      value
+    }
+
+    /** Returns the value encapsulated in Some or a default value if None */
+    function GetOr(default: T): T {
+      match this
+      case Some(v) => v
+      case None() => default
+    }
+
+    /** Converts the datatype value to a Result value (with the given error value) */
+    function ToResult<E>(error: E): Result<T, E> {
+      match this
+      case Some(v) => Success(v)
+      case None() => Failure(error)
+    }
+
+    /** Converts the datatype value to an Outcome value (with the given error value) */
+    function ToOutcome<E>(error: E): Outcome<E> {
+      match this
+      case Some(v) => Pass
+      case None() => Fail(error)
+    }
+
+    /** Applies the given function to convert the Option to something else  */
+    function Map<FC>(rewrap: Option<T> -> FC): FC
+    {
+      rewrap(this)
+    }
+  }
+
+  /** A Success/Failure failure-compatible datatype that carries either a success value or an error value */
+  datatype Result<+R, +E> = | Success(value: R) | Failure(error: E) {
+
+    /** True if is Failure */
+    predicate IsFailure() {
+      Failure?
+    }
+
+    /** Converts a Failure value to an alternate Result that has a different value type but the same error type */
+    function PropagateFailure<U>(): (r: Result<U, E>)
+      requires Failure?
+    {
+      Failure(this.error)
+    }
+
+    /** Returns the value encapsulated in Success */
+    function Extract(): R
+      requires Success?
+    {
+      value
+    }
+
+    /** Returns the value encapsulated in Success or a default value if Failure */
+    function GetOr(default: R): R
+    {
+      match this
+      case Success(s) => s
+      case Failure(e) => default
+    }
+
+    /** Converts the Result to an Option */
+    function ToOption(): Option<R>
+    {
+      match this
+      case Success(s) => Some(s)
+      case Failure(e) => None()
+    }
+
+    /** Converts the Result to an Outcome */
+    function ToOutcome(): Outcome<E>
+    {
+      match this
+      case Success(s) => Pass
+      case Failure(e) => Fail(e)
+    }
+
+    /** Applies the given function to convert the Result to something else */
+    function Map<FC>(rewrap: Result<R,E> -> FC): FC
+    {
+      rewrap(this)
+    }
+
+    /** Applies the given function to convert the Result to something else with the same Success type */
+    function MapFailure<NewE>(reWrap: E -> NewE): Result<R, NewE>
+    {
+      match this
+      case Success(s) => Success(s)
+      case Failure(e) => Failure(reWrap(e))
+    }
+  }
+
+  /** A Pass/Fail failure-compatible datatype that carries an error value, but is not 'value-carrying' */
+  datatype Outcome<+E> = Pass | Fail(error: E) {
+
+    predicate IsFailure() {
+      Fail?
+    }
+
+
+    function PropagateFailure(): Outcome<E>
+      requires Fail?
+    {
+      this
+    }
+    // Note: no Extract method, intentionally
+
+    /** Converts to an Option */
+    function ToOption<R>(r: R): Option<R>
+    {
+      match this
+      case Pass => Some(r)
+      case Fail(e) => None()
+    }
+
+    /** Converts to a Result */
+    function ToResult<R>(r: R): Result<R,E>
+    {
+      match this
+      case Pass => Success(r)
+      case Fail(e) => Failure(e)
+    }
+
+    /** Applies the given function to convert to something else */
+    function Map<FC>(rewrap: Outcome<E> -> FC): FC
+    {
+      rewrap(this)
+    }
+
+    /** Converts to a Result with a different error type */
+    function MapFailure<T,NewE>(rewrap: E-> NewE, default: T): Result<T, NewE>
+    {
+      match this
+      case Pass => Success(default)
+      case Fail(e) => Failure(rewrap(e))
+    }
+
+    /** A helper function to ensure a requirement is true at runtime,
+       returning an Outcome<>. Example:
+      `:- Need(5 == |mySet|, "The set MUST have 5 elements.")`
+    */
+    static function Need(condition: bool, error: E): (result: Outcome<E>)
+    {
+      if condition then Pass else Fail(error)
+    }
+  }
+
+  // A special case of Outcome that is just used for Need below, and
+  // returns a Result<>
+  datatype OutcomeResult<+E> = Pass' | Fail'(error: E) {
+    predicate IsFailure() {
+      Fail'?
+    }
+    function PropagateFailure<U>(): Result<U,E>
+      requires IsFailure()
+    {
+      Failure(this.error)
+    }
+  }
+
+  /** A helper function to ensure a requirement is true at runtime.
+      Example: `:- Need(5 == |mySet|, "The set MUST have 5 elements.")`
+  */
+  function Need<E>(condition: bool, error: E): (result: OutcomeResult<E>)
+  {
+    if condition then Pass' else Fail'(error)
+  }
+}
diff --git a/Source/DafnyStandardLibraries/src/Std/Wrappers.md b/Source/DafnyStandardLibraries/src/Std/Wrappers.md
new file mode 100644
index 00000000000..ddfe360f815
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/Wrappers.md
@@ -0,0 +1,190 @@
+
+# The `Wrappers` module
+
+The Wrappers module holds some
+simple datatypes to support common patterns, such as optional values or the result of operations that can fail.
+These are particularly useful with Dafny's update-with-failure `:-` operator.
+
+Any user datatype can serve this purpose, as long as it has an `IsFailure?` predicate
+(in which case it is known as a [_failure-compatible_](https://dafny.org/latest/DafnyRef/DafnyRef#sec-failure-compatible-types) type --- an FC-type).
+
+In this library module Dafny defines three such types:
+
+- `Option<R>` - which is either `Some` with a value of type `T` or a `None` with no information
+- `Outcome<E>` - which is either `Pass` with no information or `Fail` with an error value of type `E` (often a `string`)
+- `Result<R,E>` - which is either `Success` with a value of type `R` or `Failure` with error value of type `E`
+
+## Option
+
+Consider this routine that looks for a value in a sequence, beginning at position `k`, returning its index:
+<!-- %check-verify %save tmp-find.dfy -->
+```dafny
+import opened Std.Wrappers
+function Find<T(==)>(s: seq<T>, k: int, value: T): (r: Option<int>)
+  requires 0 <= k <= |s|
+  ensures  r.Some? ==> 0 <= r.Extract() < |s| && s[r.Extract()] == value
+  ensures  r.None? ==> forall i | k <= i < |s| :: s[i] != value
+  decreases |s| - k
+{
+  if k >= |s| then None else if s[k] == value then Some(k) else Find(s, k+1, value)
+}
+```
+
+It could be used in a method like this
+
+<!-- %check-resolve %use tmp-find.dfy -->
+```dafny
+method m(s: seq<int>) returns (r: Option<int>) {
+  var value: int;
+  // do various calculations
+  var index: int :- Find(s, 0, value);
+  // more calculations
+  return Some(value);
+}
+```
+
+You could just capture the result of `Find` using `:=` in a `Option<int>` variable and inspect it. But if the `None` condition is
+generally a rare error, it is easy to forget to always check that each operation was successful. Instead, the `:-` changes the
+control flow so that if a `None` value is returned from `Find`, the method immediately aborts, with the output value (which has
+the `Option<int>` type) getting that returned `None` value. So this operates something like exceptions.
+See the [reference manual](https://dafny.org/latest/DafnyRef/DafnyRef#sec-update-with-failure-statement)
+for more on the similarities and differences with exceptions.
+
+## Outcome
+
+`Outcome` is a variation on these types in which we mostly just care whether the operations succeeded or failed.
+It has no place to carry a value, just information about the error.
+
+This datatype is most useful in conjunction with functions that check conditions at runtime, such as `Need`.
+This function takes a boolean condition and a value `e` of an error type `E` and returns an
+`Outcome<E>` value: `Pass` if the condition is true, `Fail(e)` if it is false.
+It provides a simple runtime check that does not abort the program (like the `expect` statement does);
+rather it propagates the Dafny equivalent of an exception.
+
+<!-- %no-check -->
+```dafny
+:- Need(IsEverythingOK(), "failure in method M");
+```
+
+This datatype is also useful when used with methods with multiple return values.
+Then the first return value can be an `Outcome` to indicate success or failure, with the other outputs returning
+appropriate values in the success situation.
+
+For example, if we have this method
+<!-- %check-resolve %save tmp-matches.dfy -->
+```dafny
+import opened Std.Wrappers
+method FindAllMatches<T(==)>(s: seq<T>, value: T) returns (status: Outcome<string>, matches: seq<int>)
+```
+
+we can call it as
+<!-- %check-resolve %use tmp-matches.dfy -->
+```dafny
+method m(s: seq<int>, value: int) returns (r: Outcome<string>) {
+  var matches :- FindAllMatches(s, value);
+}
+```
+
+Notice that there is no left-hand-side for the first out-parameter. It does not carry a value: if the value is a `Fail`, the control
+flow will abruptly return; if is is a `Pass`, the first out-parameter is then discarded and the second is assigned to the remaining LHS.
+An `Outcome` serves as an automatically-checked error mechanism.
+
+## Result
+
+A `Result` carries both a success value and failure information, with two separate, specifiable types. Its use is then very similar to `Option`.
+
+## Combining different failure-compatible types in expressions
+
+The example given for `Option` above is legal Dafny code because the output of the caller method `m` has the same type
+(`Option<int>`) as the output of the callee function `Find`. But what if it does not? You may be writing code that generally uses, say, `Result`,
+but happens to be using code supplied by someone else that returns an `Outcome`.
+
+When values of these types are used in expressions, the library types offer means to convert among them: each type has instance functions that
+convert to values of the other types. For example, we can rewrite the example above this way:
+
+<!-- %check-verify %save tmp-find.dfy -->
+```dafny
+import opened Std.Wrappers
+
+function Find<T(==)>(s: seq<T>, k: int, value: T): (r: Option<int>)
+  requires 0 <= k <= |s|
+  ensures  r.Some? ==> k <= r.Extract() < |s|
+  ensures  r.Some? ==> s[r.Extract()] == value
+  ensures  r.None? ==> forall i | k <= i < |s| :: s[i] != value
+  decreases |s| - k
+{
+  if k >= |s| then None else if s[k] == value then Some(k) else Find(s, k+1, value)
+}
+
+method m(s: seq<int>) returns (r: Result<int,string>) {
+  var value: int := *;
+  // do various calculations
+  var index: int :- Find(s, 0, value).ToResult("not found");
+  // more calculations
+  return Success(index);
+}
+```
+
+Here we used the `ToResult` function of `Option` to convert the result value to a `Result`. There are similar `ToOutcome` and `ToOption` functions in each type.
+
+But what if we need to convert to some custom FC-type?
+Each datatype comes with a `Map` function, which can be given as an argument a function that converts from
+one FC-type to another. For example, we could rewrite the above as
+
+<!-- %no-check -->
+```dafny
+  var index: int :- Find(s, 0, value).
+     Map((o: Option<int>) => match o case Some(v) => Success(v) 
+                                     case None => Failure("not found") );
+```
+
+An alternative is to write
+<!-- %no-check -->
+```dafny
+  var convert := match o case Some(v) => Success(v)
+                                     case None => Failure("not found") );
+  var index: int :- convert(Find(s, 0, value));
+```
+
+## Combining different failure-compatible types in methods
+
+The conversion functions used in the last section work syntactically because we had boxed values that were returned by expressions (function calls), to which the conversion functions could
+be applied. When a FC-value is returned by a method there is no place to call such a conversion function: the return value of the method must be captured by either `:=` or `:-`.
+So some new syntax will be needed --- what this will be is under design and discussion.
+
+The workaround, however, is straightforward: just capture the results using `:=` and make the conversion directly. Here the is example above restated using a method.
+
+<!-- %check-verify -->
+```dafny
+import opened Std.Wrappers
+
+method Find<T(==)>(s: seq<T>, k: int, value: T) returns (r: Option<int>, v: T)
+  requires 0 <= k <= |s|
+  ensures  r.Some? ==> k <= r.Extract() < |s|
+  ensures  r.Some? ==> s[r.Extract()] == value
+  ensures  r.None? ==> forall i | k <= i < |s| :: s[i] != value
+  decreases |s| - k
+{
+  if k >= |s| {
+    return None, value;
+  } else if s[k] == value {
+    return Some(k), value;
+  } else {
+    r, v := Find(s, k+1, value);
+    return r, v;
+  }
+}
+
+method m(s: seq<int>) returns (r: Result<int,string>) {
+  var value: int := *;
+  // do various calculations
+  var maybeIndex, v := Find(s, 0, value);
+  var index :- maybeIndex.ToResult("not found"); // or f(maybeIndex)
+  // more calculations
+  return Success(index);
+}
+```
+
+Besides the extra writing, the caution for this workaround is the the programmer must remember to catch and convert the error result.
+However, if one just uses `:-` in this case, it will either be OK (because the types match) or it will give a type error (because they don't match).
+So it does not silently do something unexpected.
diff --git a/Source/DafnyStandardLibraries/src/Std/dfyconfig.toml b/Source/DafnyStandardLibraries/src/Std/dfyconfig.toml
new file mode 100644
index 00000000000..9270d335637
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std/dfyconfig.toml
@@ -0,0 +1,18 @@
+excludes = [
+  # Built per-target language instead
+  "**/TargetSpecific/*.dfy"
+]
+
+[options]
+# Options that help support more values of consuming context options
+# (mostly turning on any more restrictive verification)
+track-print-effects = true
+enforce-determinism = false
+reads-clauses-on-methods = true
+
+# Options important for sustainable development
+# of the libraries themselves.
+resource-limit = 1000000
+# These give too many false positives right now, but should be enabled in the future
+warn-redundant-assumptions = false
+warn-contradictory-assumptions = false
diff --git a/Source/DafnyStandardLibraries/src/Std_Concurrent.py b/Source/DafnyStandardLibraries/src/Std_Concurrent.py
new file mode 100644
index 00000000000..91e2f629d55
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std_Concurrent.py
@@ -0,0 +1,102 @@
+import threading
+from typing import Callable, Any, TypeVar, NamedTuple
+from math import floor
+from itertools import count
+
+import _dafny
+import Std_Wrappers
+
+# Module: Std_Concurrent
+
+class MutableMap:
+    def ctor__(self, bytesKeys):
+        pass
+        
+    def __init__(self) -> None:
+        self.map = dict()
+        self.lock = Lock()
+
+    def Keys(self):
+        self.lock.Lock__()
+        s = self.map.keys()
+        self.lock.Unlock()
+        return _dafny.Set(s)
+
+    def HasKey(self, k):
+        self.lock.Lock__()
+        b = k in self.map
+        self.lock.Unlock()
+        return b
+
+    def Values(self):
+        self.lock.Lock__()
+        s = self.map.values()
+        self.lock.Unlock()
+        return _dafny.Set(s)
+
+    def Items(self):
+        self.lock.Lock__()
+        s = self.map.items()
+        self.lock.Unlock()
+        return _dafny.Set(s)
+
+    def Put(self, k, v):
+        self.lock.Lock__()
+        try:
+            self.map[k] = v
+        except Exception as e:
+            self.lock.Unlock()
+            raise e
+        self.lock.Unlock()
+
+    def Get(self, k):
+        self.lock.Lock__()
+        try:
+            v = self.map[k]
+        except KeyError:
+            self.lock.Unlock()
+            return Std_Wrappers.Option_None()
+        except Exception as e:
+            self.lock.Unlock()
+            raise e
+        self.lock.Unlock()
+        return Std_Wrappers.Option_Some(v)
+
+    def Remove(self, k):
+        self.lock.Lock__()
+        self.map.pop(k, None)
+        self.lock.Unlock()
+
+    def Size(self):
+        self.lock.Lock__()
+        l = len(self.map)
+        self.lock.Unlock()
+        return l
+
+
+class AtomicBox:
+    def __init__(self) -> None:
+        pass
+        
+    def ctor__(self, t):
+        self.boxed = t
+        pass
+
+    def Get(self):
+        return self.boxed
+        
+    def Put(self, t):
+        self.boxed = t
+
+class Lock:
+    def ctor__(self):
+        pass
+        
+    def __init__(self) -> None:
+        self.lock = threading.Lock()
+
+    def Lock__(self):
+        self.lock.acquire()
+
+    def Unlock(self):
+        self.lock.release()
diff --git a/Source/DafnyStandardLibraries/src/Std_Concurrent/Std_Concurrent.go b/Source/DafnyStandardLibraries/src/Std_Concurrent/Std_Concurrent.go
new file mode 100644
index 00000000000..b49c885132f
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std_Concurrent/Std_Concurrent.go
@@ -0,0 +1,367 @@
+package Std_Concurrent
+
+import (
+  _dafny "dafny"
+  sync "sync"
+  Std_Wrappers "Std_Wrappers"
+)
+
+type Dummy__ struct{}
+
+// Definition of class MutableMap
+type MutableMap struct {
+  // Default implementation - synchronized Dafny map<K, V>,
+  // which is just a list of key-value pairs
+  // with O(n) lookup.
+  mu sync.Mutex
+  dafnyInternal _dafny.Map
+
+  // Optimized for seq<bytes>
+  // The Dafny byte sequences are converted to Go strings,
+  // which can contain arbitrary bytes,
+  // and are comparable and hence can be used as map keys,
+  // whereas a Go byte array cannot.
+  goInternal sync.Map
+
+  // Switch to control which is active
+  bytesKeys bool
+}
+
+func New_MutableMap_() *MutableMap {
+  return &MutableMap{}
+}
+
+type CompanionStruct_MutableMap_ struct {
+}
+var Companion_MutableMap_ = CompanionStruct_MutableMap_ {
+}
+
+func (_this *MutableMap) Equals(other *MutableMap) bool {
+  return _this == other
+}
+
+func (_this *MutableMap) EqualsGeneric(x interface{}) bool {
+  other, ok := x.(*MutableMap)
+  return ok && _this.Equals(other)
+}
+
+func (*MutableMap) String() string {
+  return "ExternConcurrent.MutableMap"
+}
+
+func Type_MutableMap_(Type_K_ _dafny.TypeDescriptor, Type_V_ _dafny.TypeDescriptor) _dafny.TypeDescriptor {
+  return type_MutableMap_{Type_K_, Type_V_}
+}
+
+type type_MutableMap_ struct {
+  Type_K_ _dafny.TypeDescriptor
+  Type_V_ _dafny.TypeDescriptor
+}
+
+func (_this type_MutableMap_) Default() interface{} {
+  return (*MutableMap)(nil)
+}
+
+func (_this type_MutableMap_) String() string {
+  return "ExternConcurrent.MutableMap"
+}
+func (_this *MutableMap) ParentTraits_() []*_dafny.TraitID {
+  return [](*_dafny.TraitID){};
+}
+var _ _dafny.TraitOffspring = &MutableMap{}
+
+func (_this *MutableMap) Ctor__(bytesKeys bool) {
+  {
+    _this.bytesKeys = bytesKeys
+  }
+}
+
+// Converts a Dafny seq<byte> to a Go string,
+// which can contain artibitrary bytes.
+func dafnyBytesToGoString(b interface{}) string {
+  return string(_dafny.ToByteArray(b.(_dafny.Sequence)))
+}
+
+// Converts a Dafny seq<byte> from a Go string,
+// which can contain artibitrary bytes.
+func dafnyBytesFromGoString(b interface{}) _dafny.Sequence {
+  return _dafny.SeqOfBytes([]byte(b.(string)))
+}
+
+func (_this *MutableMap) Keys() _dafny.Set {
+  {
+    if _this.bytesKeys {
+      keys := make([]interface{}, 0)
+
+      _this.goInternal.Range(func(key, value interface{}) bool {
+        keys = append(keys, dafnyBytesFromGoString(key))
+        return true
+      })
+  
+      return _dafny.SetOf(keys[:]...)
+    } else {
+      _this.mu.Lock()
+      defer _this.mu.Unlock()
+
+      return _this.dafnyInternal.Keys()
+    }
+  }
+}
+func (_this *MutableMap) HasKey(k interface{}) bool {
+  {
+    if _this.bytesKeys {
+      _, ok := _this.goInternal.Load(dafnyBytesToGoString(k))
+      return ok
+    } else {
+      _this.mu.Lock()
+      defer _this.mu.Unlock()
+
+      return _this.dafnyInternal.Contains(k)
+    }
+  }
+}
+func (_this *MutableMap) Values() _dafny.Set {
+  {
+    if _this.bytesKeys {
+      values := make([]interface{}, 0)
+
+      _this.goInternal.Range(func(key, value interface{}) bool {
+        values = append(values, value)
+        return true
+      })
+
+      return _dafny.SetOf(values[:]...)
+    } else {
+      _this.mu.Lock()
+      defer _this.mu.Unlock()
+
+      return _this.dafnyInternal.Values()
+    }
+  }
+}
+func (_this *MutableMap) Items() _dafny.Set {
+  {
+    if _this.bytesKeys {
+      items := make([]interface{}, 0)
+
+      _this.goInternal.Range(func(key, value interface{}) bool {
+        items = append(items, _dafny.TupleOf(dafnyBytesFromGoString(key), value))
+        return true
+      })
+
+      return _dafny.SetOf(items[:]...)
+    } else {
+      _this.mu.Lock()
+      defer _this.mu.Unlock()
+
+      return _this.dafnyInternal.Items()
+    }
+  }
+}
+func (_this *MutableMap) Get(k interface{}) Std_Wrappers.Option {
+  {
+    if _this.bytesKeys {
+      value, ok := _this.goInternal.Load(dafnyBytesToGoString(k))
+      if ok {
+        return Std_Wrappers.Companion_Option_.Create_Some_(value)
+      } else {
+        return Std_Wrappers.Companion_Option_.Create_None_()
+      }
+    } else {
+      _this.mu.Lock()
+      defer _this.mu.Unlock()
+
+      value, ok := _this.dafnyInternal.Find(k)
+      if ok {
+        return Std_Wrappers.Companion_Option_.Create_Some_(value)
+      } else {
+        return Std_Wrappers.Companion_Option_.Create_None_()
+      }
+    }
+  }
+}
+func (_this *MutableMap) Put(k interface{}, v interface{}) {
+  if _this.bytesKeys {
+    _this.goInternal.Store(dafnyBytesToGoString(k), v)
+  } else {
+    _this.mu.Lock()
+    defer _this.mu.Unlock()
+
+    _this.dafnyInternal = _this.dafnyInternal.UpdateUnsafe(k, v)
+  }
+}
+func (_this *MutableMap) Remove(k interface{}) {
+  {
+    if _this.bytesKeys {
+      _this.goInternal.Delete(dafnyBytesToGoString(k))
+    } else {
+      _this.mu.Lock()
+      defer _this.mu.Unlock()
+
+      // This could be special-cased for a single remove to be a bit faster,
+      // but it's still going to be O(n) so likely not worth it.
+      _this.dafnyInternal = _this.dafnyInternal.Subtract(_dafny.SetOf(k))
+    }
+  }
+}
+func (_this *MutableMap) Size() _dafny.Int {
+  {
+    if _this.bytesKeys {
+      var c _dafny.Int = _dafny.Zero
+
+      _this.goInternal.Range(func(key, value interface{}) bool {
+        c = c.Plus(_dafny.One)
+        return true
+      })
+
+      return c
+    } else {
+      _this.mu.Lock()
+      defer _this.mu.Unlock()
+
+      return _this.dafnyInternal.Cardinality()
+    }
+  }
+}
+// End of class MutableMap
+
+// Definition of class AtomicBox
+type AtomicBox struct {
+  mu sync.Mutex
+
+  Boxed interface{}
+}
+
+func New_AtomicBox_() *AtomicBox {
+  _this := AtomicBox{}
+
+  _this.Boxed = (interface{})(nil)
+  return &_this
+}
+
+type CompanionStruct_AtomicBox_ struct {
+}
+var Companion_AtomicBox_ = CompanionStruct_AtomicBox_ {
+}
+
+func (_this *AtomicBox) Equals(other *AtomicBox) bool {
+  return _this == other
+}
+
+func (_this *AtomicBox) EqualsGeneric(x interface{}) bool {
+  other, ok := x.(*AtomicBox)
+  return ok && _this.Equals(other)
+}
+
+func (*AtomicBox) String() string {
+  return "ExternConcurrent.AtomicBox"
+}
+
+func Type_AtomicBox_(Type_T_ _dafny.TypeDescriptor) _dafny.TypeDescriptor {
+  return type_AtomicBox_{Type_T_}
+}
+
+type type_AtomicBox_ struct {
+  Type_T_ _dafny.TypeDescriptor
+}
+
+func (_this type_AtomicBox_) Default() interface{} {
+  return (*AtomicBox)(nil)
+}
+
+func (_this type_AtomicBox_) String() string {
+  return "ExternConcurrent.AtomicBox"
+}
+func (_this *AtomicBox) ParentTraits_() []*_dafny.TraitID {
+  return [](*_dafny.TraitID){};
+}
+var _ _dafny.TraitOffspring = &AtomicBox{}
+
+func (_this *AtomicBox) Ctor__(t interface{}) {
+  {
+    _this.mu.Lock()
+    _this.Boxed = t
+    _this.mu.Unlock()
+  }
+}
+func (_this *AtomicBox) Get() interface{} {
+  {
+    var t interface{} = (interface{})(nil)
+    _this.mu.Lock()
+    t = _this.Boxed
+    _this.mu.Unlock()
+    return t
+  }
+}
+func (_this *AtomicBox) Put(t interface{}) {
+  {
+    _this.mu.Lock()
+    _this.Boxed = t
+    _this.mu.Unlock()
+  }
+}
+// End of class AtomicBox
+
+// Definition of class Lock
+type Lock struct {
+  mu sync.Mutex
+}
+
+func New_Lock_() *Lock {
+  _this := Lock{}
+
+  return &_this
+}
+
+type CompanionStruct_Lock_ struct {
+}
+var Companion_Lock_ = CompanionStruct_Lock_ {
+}
+
+func (_this *Lock) Equals(other *Lock) bool {
+  return _this == other
+}
+
+func (_this *Lock) EqualsGeneric(x interface{}) bool {
+  other, ok := x.(*Lock)
+  return ok && _this.Equals(other)
+}
+
+func (*Lock) String() string {
+  return "ExternConcurrent.Lock"
+}
+
+func Type_Lock_() _dafny.TypeDescriptor {
+  return type_Lock_{}
+}
+
+type type_Lock_ struct {
+}
+
+func (_this type_Lock_) Default() interface{} {
+  return (*Lock)(nil)
+}
+
+func (_this type_Lock_) String() string {
+  return "ExternConcurrent.Lock"
+}
+func (_this *Lock) ParentTraits_() []*_dafny.TraitID {
+  return [](*_dafny.TraitID){};
+}
+var _ _dafny.TraitOffspring = &Lock{}
+
+func (_this *Lock) Ctor__() {
+  {
+  }
+}
+func (_this *Lock) Lock__() {
+  {
+    _this.mu.Lock()
+  }
+}
+func (_this *Lock) Unlock() {
+  {
+    _this.mu.Unlock()
+  }
+}
+// End of class Lock
\ No newline at end of file
diff --git a/Source/DafnyStandardLibraries/src/Std_FileIOInternalExterns.py b/Source/DafnyStandardLibraries/src/Std_FileIOInternalExterns.py
new file mode 100644
index 00000000000..6eec22b6069
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std_FileIOInternalExterns.py
@@ -0,0 +1,38 @@
+# Module: Std_FileIOInternalExterns
+
+import traceback
+import os
+import os.path
+import pathlib
+import _dafny
+
+class default__:
+  @staticmethod
+  def INTERNAL__ReadBytesFromFile(path):
+    path_str = path.VerbatimString(False)
+    try:
+      with open(path_str, mode="rb") as file:
+          contents = file.read()
+          contents_seq = _dafny.Seq(contents)
+          return (False, contents_seq, _dafny.Seq())
+    except:
+      exc_str = traceback.format_exc()
+      exc_seq = _dafny.Seq(exc_str)
+      return (True, _dafny.Seq(), exc_seq)
+  
+  @staticmethod
+  def INTERNAL__WriteBytesToFile(path, contents):
+    path_str = path.VerbatimString(False)
+    contents_bytes = bytes(contents)
+
+    try:
+      pathlib.Path(path_str).parent.mkdir(parents=True, exist_ok=True)
+
+      with open(path_str, mode="wb") as file:
+          contents = file.write(contents_bytes)
+          return (False, _dafny.Seq())
+    except:
+      exc_str = traceback.format_exc()
+      exc_seq = _dafny.Seq(exc_str)
+      return (True, exc_seq)
+
diff --git a/Source/DafnyStandardLibraries/src/Std_FileIOInternalExterns/Std_FileIOInternalExterns.go b/Source/DafnyStandardLibraries/src/Std_FileIOInternalExterns/Std_FileIOInternalExterns.go
new file mode 100644
index 00000000000..67e5cbfcb00
--- /dev/null
+++ b/Source/DafnyStandardLibraries/src/Std_FileIOInternalExterns/Std_FileIOInternalExterns.go
@@ -0,0 +1,41 @@
+package Std_FileIOInternalExterns
+
+import (
+	_dafny "dafny"
+	ioutil "io/ioutil"
+	filepath "path/filepath"
+	"os"
+)
+
+type Dummy__ struct{}
+
+type CompanionStruct_Default___ struct {
+}
+var Companion_Default___ = CompanionStruct_Default___ {
+}
+
+func (_static *CompanionStruct_Default___) INTERNAL__ReadBytesFromFile(path _dafny.Sequence) (isError bool, bytesRead _dafny.Sequence, errorMsg _dafny.Sequence) {
+	p := _dafny.SequenceVerbatimString(path, false)
+	dat, err := ioutil.ReadFile(p)
+	if err != nil {
+		errAsSequence := _dafny.UnicodeSeqOfUtf8Bytes(err.Error())
+		return true, _dafny.EmptySeq, errAsSequence
+	}
+	datAsSequence := _dafny.SeqOfBytes(dat)
+	return false, datAsSequence, _dafny.EmptySeq
+}
+
+func (_static *CompanionStruct_Default___) INTERNAL__WriteBytesToFile(path _dafny.Sequence, bytes _dafny.Sequence) (isError bool, errorMsg _dafny.Sequence) {
+	p := _dafny.SequenceVerbatimString(path, false)
+
+	// Create directories
+	os.MkdirAll(filepath.Dir(p), os.ModePerm)
+
+	bytesArray := _dafny.ToByteArray(bytes)
+	err := ioutil.WriteFile(p, bytesArray, 0644)
+	if err != nil {
+		errAsSequence := _dafny.UnicodeSeqOfUtf8Bytes(err.Error())
+		return true, errAsSequence
+	}
+	return false, _dafny.EmptySeq
+}
\ No newline at end of file
diff --git a/Source/DafnyTestGeneration.Test/BasicTypes.cs b/Source/DafnyTestGeneration.Test/BasicTypes.cs
index a5358746ae0..a7507a3fa83 100644
--- a/Source/DafnyTestGeneration.Test/BasicTypes.cs
+++ b/Source/DafnyTestGeneration.Test/BasicTypes.cs
@@ -7,7 +7,9 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
+using DafnyCore.Test;
 using Microsoft.Dafny;
 using Xunit;
 using Xunit.Abstractions;
@@ -35,8 +37,9 @@ module SimpleTest {
   }
 }
 ".TrimStart();
-      var program = Utils.Parse(GetDafnyOptions(optionSettings, output), source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var options = GetDafnyOptions(optionSettings, output);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(3 <= methods.Count);
       Assert.True(methods.All(m =>
         m.MethodName == "SimpleTest.compareToZero"));
@@ -64,8 +67,9 @@ module SimpleTest {
   }
 }
 ".TrimStart();
-      var program = Utils.Parse(GetDafnyOptions(optionSettings, output), source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var options = GetDafnyOptions(optionSettings, output);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(2 <= methods.Count);
       Assert.True(methods.All(m => m.MethodName == "SimpleTest.checkIfTrue"));
       Assert.True(methods.All(m =>
@@ -99,8 +103,9 @@ module SimpleTest {
   }
 }
 ".TrimStart();
-      var program = Utils.Parse(GetDafnyOptions(optionSettings, output), source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var options = GetDafnyOptions(optionSettings, output);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(7 <= methods.Count);
       Assert.True(
         methods.All(m => m.MethodName == "SimpleTest.compareToZero"));
@@ -133,8 +138,9 @@ module SimpleTest {
   }
 }
 ".TrimStart();
-      var program = Utils.Parse(GetDafnyOptions(optionSettings, output), source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var options = GetDafnyOptions(optionSettings, output);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(3 <= methods.Count);
       Assert.True(
         methods.All(m => m.MethodName == "SimpleTest.compareToBase"));
@@ -165,8 +171,9 @@ module SimpleTest {
   }
 }
 ".TrimStart();
-      var program = Utils.Parse(GetDafnyOptions(optionSettings, output), source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var options = GetDafnyOptions(optionSettings, output);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(3 <= methods.Count);
       Assert.True(methods.All(m => m.MethodName == "SimpleTest.compareToB"));
       Assert.True(methods.All(m =>
@@ -197,8 +204,9 @@ module SimpleTest {
   }
 }
 ".TrimStart();
-      var program = Utils.Parse(GetDafnyOptions(optionSettings, output), source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var options = GetDafnyOptions(optionSettings, output);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(2 <= methods.Count);
       Assert.True(methods.All(m => m.MethodName == "SimpleTest.compareToB"));
       Assert.True(methods.All(m =>
@@ -207,7 +215,7 @@ module SimpleTest {
       Assert.True(methods.All(m => m.ValueCreation.Count == 0));
       Assert.True(methods.Exists(m => m.ArgValues[0] == "'B'"));
       Assert.True(methods.Exists(m =>
-        Regex.IsMatch(m.ArgValues[0], "'[^B]'")));
+        Regex.IsMatch(m.ArgValues[0], "'[^B]+'")));
     }
 
   }
diff --git a/Source/DafnyTestGeneration.Test/Collections.cs b/Source/DafnyTestGeneration.Test/Collections.cs
index 2a02446149e..abc557bbede 100644
--- a/Source/DafnyTestGeneration.Test/Collections.cs
+++ b/Source/DafnyTestGeneration.Test/Collections.cs
@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using DafnyCore.Test;
 using Microsoft.Dafny;
 using Xunit;
 using Xunit.Abstractions;
@@ -34,12 +35,13 @@ module SimpleTest {
     } else if (|tseq| > 0 && tseq[0].1.1 == 'R') {
         return 2;
     }
+    return 3;
   }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(3 <= methods.Count);
       Assert.True(methods.All(m =>
         m.MethodName == "SimpleTest.tuple"));
@@ -81,8 +83,9 @@ module C {
 }
 
 ".TrimStart();
-      var program = Utils.Parse(GetDafnyOptions(optionSettings, output), source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var options = GetDafnyOptions(optionSettings, output);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(3 <= methods.Count);
       Assert.True(methods.All(m =>
         m.MethodName == "C.compareStringLengthToOne"));
diff --git a/Source/DafnyTestGeneration.Test/DafnyTestGeneration.Test.csproj b/Source/DafnyTestGeneration.Test/DafnyTestGeneration.Test.csproj
index bf8594de184..1ec68cb84bd 100644
--- a/Source/DafnyTestGeneration.Test/DafnyTestGeneration.Test.csproj
+++ b/Source/DafnyTestGeneration.Test/DafnyTestGeneration.Test.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.extensibility.core" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
@@ -18,6 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\DafnyCore.Test\DafnyCore.Test.csproj" />
         <ProjectReference Include="..\DafnyRuntime\DafnyRuntime.csproj" />
         <ProjectReference Include="..\DafnyTestGeneration\DafnyTestGeneration.csproj" />
     </ItemGroup>
diff --git a/Source/DafnyTestGeneration.Test/Setup.cs b/Source/DafnyTestGeneration.Test/Setup.cs
index 7d8ccdbbe65..43c5142477a 100644
--- a/Source/DafnyTestGeneration.Test/Setup.cs
+++ b/Source/DafnyTestGeneration.Test/Setup.cs
@@ -4,22 +4,45 @@
 #nullable disable
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Boogie;
 using Microsoft.Dafny;
 using Xunit;
+using Program = Microsoft.Dafny.Program;
+using Token = Microsoft.Dafny.Token;
+
+// These tests are frequently hanging and timing out for reasons unknown.
+// It seems to be much harder to reproduce locally if tests are run sequentially
+// (as they are in debugging mode by default)
+// so as a stop gap we're trying disabling parallel execution
+// in the hopes it at least reduces the frequency of hanging.
+// See https://github.com/dafny-lang/dafny/issues/5488.
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
 
 namespace DafnyTestGeneration.Test {
 
   public class Setup {
+    private readonly CancellationTokenSource cancellationTokenSource = new();
+
+    public Setup() {
+      cancellationTokenSource.CancelAfter(TimeSpan.FromSeconds(50));
+    }
+
+    public CancellationToken CancellationToken => cancellationTokenSource.Token;
+
     protected static DafnyOptions GetDafnyOptions(List<Action<DafnyOptions>> optionSettings, TextWriter writer, params string[] arguments) {
-      var options = DafnyOptions.Create(writer, TextReader.Null, arguments ?? System.Array.Empty<string>());
+      var options = DafnyOptions.CreateUsingOldParser(writer, TextReader.Null, arguments ?? System.Array.Empty<string>());
       options.DefiniteAssignmentLevel = 3;
       options.WarnShadowing = true;
       options.VerifyAllModules = true;
       options.TestGenOptions.SeqLengthLimit = 3;
       options.TestGenOptions.Mode = TestGenerationOptions.Modes.Block;
       options.TestGenOptions.WarnDeadCode = false;
+      options.TestGenOptions.IgnoreWarnings = false;
       options.TimeLimit = 10;
       foreach (var optionSetting in optionSettings) {
         optionSetting(options);
@@ -32,5 +55,16 @@ public static TheoryData<List<Action<DafnyOptions>>> OptionSettings() {
       optionSettings.Add(new() { options => options.TypeEncodingMethod = CoreOptions.TypeEncoding.Predicates });
       return optionSettings;
     }
+
+    /// <summary>
+    /// Parse a string read (from a certain file) to a Dafny Program
+    /// </summary>
+    public Task<Program> /*?*/ Parse(ErrorReporter reporter, string source, bool resolve = true, Uri uri = null) {
+      return Utils.Parse(reporter, source, resolve, uri, cancellationToken: CancellationToken);
+    }
+
+    protected Task<List<TestMethod>> GetTestMethodsForProgram(Program program) {
+      return TestGenerator.GetTestMethodsForProgram(program).ToListAsync(CancellationToken).AsTask().WaitAsync(CancellationToken);
+    }
   }
 }
diff --git a/Source/DafnyTestGeneration.Test/ShortCircuitRemoval.cs b/Source/DafnyTestGeneration.Test/ShortCircuitRemoval.cs
index 3d90ded7477..8362ef5e718 100644
--- a/Source/DafnyTestGeneration.Test/ShortCircuitRemoval.cs
+++ b/Source/DafnyTestGeneration.Test/ShortCircuitRemoval.cs
@@ -7,12 +7,14 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using DafnyCore.Test;
 using DafnyTestGeneration.Inlining;
 using Microsoft.Dafny;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace DafnyTestGeneration.Test; 
+namespace DafnyTestGeneration.Test;
 
 public class ShortCircuitRemoval : Setup {
 
@@ -29,16 +31,16 @@ private static string RemoveSpaces(string input) {
   /// <summary>
   /// Perform shared checks and return the target method for further testing on a case by case basis
   /// </summary>
-  private Method ShortCircuitRemovalTest(string source, string expected, bool isByMethod = true) {
+  private async Task<Method> ShortCircuitRemovalTest(string source, string expected, bool isByMethod = true) {
     // If the following assertion fails, rename the corresponding variables in expected output of each test
     Assert.Equal(RemoveShortCircuitingRewriter.TmpVarPrefix, "#tmp");
     var options = GetDafnyOptions(new List<Action<DafnyOptions>>(), output);
-    var program = Utils.Parse(options, source, false);
+    var program = await Parse(new BatchErrorReporter(options), source, false);
     var success = InliningTranslator.TranslateForFutureInlining(program, options, out var boogieProgram);
     Assert.True(success);
     var method = program.DefaultModuleDef.Children
       .OfType<TopLevelDeclWithMembers>()
-      .Select(classDef => classDef.Members.Where(member => member is Method && Utils.MembersHasAttribute(member, "testEntry")))?
+      .Select(classDef => classDef.Members.Where(member => member is Method && member.HasUserAttribute(TestGenerationOptions.TestEntryAttribute, out var _)))?
       .Where(members => members.Count() != 0).FirstOrDefault()?.First() as Method;
     Assert.NotNull(method);
     Assert.Equal(isByMethod, method.IsByMethod);
@@ -52,18 +54,18 @@ private Method ShortCircuitRemovalTest(string source, string expected, bool isBy
   }
 
   [Fact]
-  public void FunctionToFunctionByMethod() {
+  public async Task FunctionToFunctionByMethod() {
     var source = @"
 function {:testEntry} Identity(i:int):int {
   i
 }
 ".TrimStart();
     var expected = "{ return i; }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void And() {
+  public async Task And() {
     var source = @"
 predicate {:testEntry} And(a:bool, b:bool) {
   a && b
@@ -79,11 +81,11 @@ public void And() {
     #tmp0 := #tmp0; 
   return #tmp0; 
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void Or() {
+  public async Task Or() {
     var source = @"
 predicate {:testEntry} Or(a:bool, b:bool) {
   a || b
@@ -99,11 +101,11 @@ public void Or() {
     #tmp0 := #tmp0; 
   return #tmp0; 
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void Imp() {
+  public async Task Imp() {
     var source = @"
 predicate {:testEntry} Imp(a:bool, b:bool) {
   a ==> b
@@ -120,11 +122,11 @@ public void Imp() {
     #tmp0 := true; 
   return #tmp0; 
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void Exp() {
+  public async Task Exp() {
     var source = @"
 predicate {:testEntry} Exp(a:bool, b:bool) {
   a <== b
@@ -140,11 +142,11 @@ public void Exp() {
     #tmp0 := true; 
   return #tmp0;
  }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void IfThenElse() {
+  public async Task IfThenElse() {
     var source = @"
 function {:testEntry} IfThenElse(a:bool):int {
   if a then 1 else 2
@@ -159,11 +161,11 @@ public void IfThenElse() {
     #tmp0 := 2; 
   return #tmp0; 
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void Let() {
+  public async Task Let() {
     var source = @"
 function {:testEntry} Let(a:bool):int {
   var a:int := 7; a
@@ -178,11 +180,11 @@ public void Let() {
   }
   return #tmp0;
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void NestedLet() {
+  public async Task NestedLet() {
     var source = @"
 function {:testEntry} NestedLet(a:bool):int {
   var a:real := 7.5; var a:int := 4; a
@@ -201,11 +203,11 @@ public void NestedLet() {
     #tmp0 := #tmp1; 
   } 
 return #tmp0; }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void IfInsideLet() {
+  public async Task IfInsideLet() {
     var source = @"
 function {:testEntry} Let(a:bool):int {
   var a := false; if a then 5 else 7
@@ -225,11 +227,11 @@ public void IfInsideLet() {
   } 
   return #tmp0; 
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void InElseBranch() {
+  public async Task InElseBranch() {
     var source = @"
 function {:testEntry} NestedIfTheElse(a:bool, b:bool):int {
   if a then 5 else if b then 3 else 1
@@ -250,11 +252,11 @@ public void InElseBranch() {
   } 
   return #tmp0; 
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void StmtExpression() {
+  public async Task StmtExpression() {
     var source = @"
 function {:testEntry} StmtExpression(a:int):int {
   if (var a := true; a) then 5 else 3
@@ -271,11 +273,11 @@ public void StmtExpression() {
     #tmp0 := 3; 
   return #tmp0; 
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void Match() {
+  public async Task Match() {
     var source = @"
 datatype Option = None | Some
 function {:testEntry} IsNone(o: Option): bool {
@@ -292,11 +294,11 @@ match o
     case {:split false} Some() =>  #tmp0 := false; 
   return #tmp0; 
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void MatchWithDestructors() {
+  public async Task MatchWithDestructors() {
     var source = @"
 datatype Option = None | Some(val:int)
 function {:testEntry} UnBoxOrZero(o: Option): int {
@@ -313,11 +315,11 @@ match o
     case {:split false} Some(r) =>  #tmp0 := r; 
   return #tmp0;
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void FunctionCall() {
+  public async Task FunctionCall() {
     var source = @"
 function {:testEntry} Max(a:int, b:int):int {
   -Min(-a, -b)
@@ -330,11 +332,11 @@ public void FunctionCall() {
   #tmp0 := Min(-a, -b); 
   return -#tmp0; 
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void NestedFunctionCall() {
+  public async Task NestedFunctionCall() {
     var source = @"
 function {:testEntry} Max(a:int, b:int):int {
   Negate(Min(Negate(a), Negate(b)))
@@ -354,11 +356,11 @@ function Negate(a:int):int   { -a }
   #tmp0 := Negate(#tmp1); 
   return #tmp0; 
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void FunctionCallWithShortCircuitingArgs() {
+  public async Task FunctionCallWithShortCircuitingArgs() {
     var source = @"
 function {:testEntry} Arguments(a:bool, b:bool):bool {
   IsTrue(a || b)
@@ -377,11 +379,11 @@ function IsTrue(a:bool):bool { a }
   #tmp0 := IsTrue(#tmp1);
   return #tmp0;
 }";
-    ShortCircuitRemovalTest(source, expected);
+    await ShortCircuitRemovalTest(source, expected);
   }
 
   [Fact]
-  public void Constructor() {
+  public async Task Constructor() {
     var source = @"
 class C {
   var i:int
@@ -408,11 +410,11 @@ class C {
     #tmp1 := 1;
   i := #tmp1;
 }";
-    ShortCircuitRemovalTest(source, expected, isByMethod: false);
+    await ShortCircuitRemovalTest(source, expected, isByMethod: false);
   }
 
   [Fact]
-  public void While() {
+  public async Task While() {
     var source = @"
 method {:testEntry} Sum(n:int) returns (s:int)
   requires n >= 0
@@ -443,11 +445,11 @@ decreases n-i
   } 
   return s;
 }";
-    ShortCircuitRemovalTest(source, expected, false);
+    await ShortCircuitRemovalTest(source, expected, false);
   }
 
   [Fact]
-  public void LetOrFail() {
+  public async Task LetOrFail() {
     var source = @"
 datatype Result<T> = Success(value:T) | Failure {
   predicate IsFailure() {true}
@@ -467,18 +469,18 @@ function PropagateFailure():Result<T> {this}
   }
   return #tmp0;
 }";
-    var resultingMethod = ShortCircuitRemovalTest(source, expected);
+    var resultingMethod = await ShortCircuitRemovalTest(source, expected);
     Assert.True(resultingMethod.Body.Body[1] is BlockStmt);
     var blockStmt = resultingMethod.Body.Body[1] as BlockStmt;
     Assert.True(blockStmt.Body[0] is AssignOrReturnStmt);
     var assignOrReturn = blockStmt.Body[0] as AssignOrReturnStmt; // :- Fail() prior to desugaring
-    Assert.True(assignOrReturn.Children.ToList()[1] is UpdateStmt);
-    var updateStmt = assignOrReturn.Children.ToList()[1] as UpdateStmt; // := Fail(), which is part of desugaring
+    Assert.True(assignOrReturn.Children.ToList()[1] is AssignStatement);
+    var updateStmt = assignOrReturn.Children.ToList()[1] as AssignStatement; // := Fail(), which is part of desugaring
     Assert.Contains(updateStmt.ResolvedStatements, statement => statement is CallStmt); // Fail() is a method call
   }
 
   [Fact]
-  public void LetOrFailWithAssignment() {
+  public async Task LetOrFailWithAssignment() {
     var source = @"
 datatype Result<T> = Success(value:T) | Failure {
   predicate IsFailure() {true}
@@ -499,18 +501,18 @@ function Extract():T requires !IsFailure() {value}
   }
   return #tmp0;
 }";
-    var resultingMethod = ShortCircuitRemovalTest(source, expected);
+    var resultingMethod = await ShortCircuitRemovalTest(source, expected);
     Assert.True(resultingMethod.Body.Body[1] is BlockStmt);
     var blockStmt = resultingMethod.Body.Body[1] as BlockStmt;
     Assert.True(blockStmt.Body[0] is VarDeclStmt);
     var varDeclStmt = blockStmt.Body[0] as VarDeclStmt; // x :- Fail() prior to desugaring
-    Assert.True(varDeclStmt.Update.Children.ToList()[1] is UpdateStmt);
-    var updateStmt = varDeclStmt.Update.Children.ToList()[1] as UpdateStmt; // x := Fail(), which is part of desugaring
+    Assert.True(varDeclStmt.Assign.Children.ToList()[1] is AssignStatement);
+    var updateStmt = varDeclStmt.Assign.Children.ToList()[1] as AssignStatement; // x := Fail(), which is part of desugaring
     Assert.Contains(updateStmt.ResolvedStatements, statement => statement is CallStmt); // Fail() is a method call
   }
 
   [Fact]
-  public void TypeRhs() {
+  public async Task TypeRhs() {
     var source = @"
 class A { 
   constructor () {}
@@ -523,11 +525,11 @@ class A {
 {
   var a := new A();
 }";
-    ShortCircuitRemovalTest(source, expected, false);
+    await ShortCircuitRemovalTest(source, expected, false);
   }
 
   [Fact]
-  public void Print() {
+  public async Task Print() {
     var source = @"
 method {:testEntry} Print(b:bool) {
   print if b then ['a', 'b', 'c'] else [];
@@ -542,11 +544,11 @@ public void Print() {
     #tmp0 := [];
   print #tmp0;
 }";
-    ShortCircuitRemovalTest(source, expected, false);
+    await ShortCircuitRemovalTest(source, expected, false);
   }
 
   [Fact]
-  public void ForLoop() {
+  public async Task ForLoop() {
     var source = @"
 method {:testEntry} Sum(n:int) returns (s:int)
   requires n >= 0
@@ -568,11 +570,11 @@ public void ForLoop() {
   }
   return s;
 }";
-    ShortCircuitRemovalTest(source, expected, false);
+    await ShortCircuitRemovalTest(source, expected, false);
   }
 
   [Fact]
-  public void CallStmt() {
+  public async Task CallStmt() {
     var source = @"
 method callee(a:int) {}
 method {:testEntry} caller() {
@@ -588,11 +590,11 @@ method callee(a:int) {}
     #tmp0 := 1;
   callee(#tmp0);
 }";
-    ShortCircuitRemovalTest(source, expected, false);
+    await ShortCircuitRemovalTest(source, expected, false);
   }
 
   [Fact]
-  public void CallStmtWithUpdate() {
+  public async Task CallStmtWithUpdate() {
     var source = @"
 method callee(a:int) returns (i:int) { return a; }
 method {:testEntry} caller() {
@@ -608,7 +610,7 @@ public void CallStmtWithUpdate() {
     #tmp0 := 1;
   var x := callee(#tmp0);
 }";
-    ShortCircuitRemovalTest(source, expected, false);
+    await ShortCircuitRemovalTest(source, expected, false);
   }
 
 }
diff --git a/Source/DafnyTestGeneration.Test/Various.cs b/Source/DafnyTestGeneration.Test/Various.cs
index 8d6237b43f9..b2b5adf22e2 100644
--- a/Source/DafnyTestGeneration.Test/Various.cs
+++ b/Source/DafnyTestGeneration.Test/Various.cs
@@ -7,7 +7,9 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
+using DafnyCore.Test;
 using Microsoft.Dafny;
 using Xunit;
 using Xunit.Abstractions;
@@ -26,34 +28,32 @@ public Various(ITestOutputHelper output) {
     public async Task NoInlining(List<Action<DafnyOptions>> optionSettings) {
       var source = @"
 module M {
-  class Inlining {
-    method {:testEntry} b (i:int) returns (r:int) {
-      if (i == 0) {
-          return 7;
-      } else {
-          return 81;
-      }
-    }
-    method {:testEntry} a (i:int) returns (r:int) {
-      r := b(i);
+  method {:testEntry} b (i:int) returns (r:int) {
+    if (i == 0) {
+        return 7;
+    } else {
+        return 81;
     }
   }
+  method {:testEntry} a (i:int) returns (r:int) {
+    r := b(i);
+  }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(3 <= methods.Count);
-      Assert.True(2 <= methods.Count(m => m.MethodName == "M.Inlining.b"));
-      Assert.Equal(1, methods.Count(m => m.MethodName == "M.Inlining.a"));
-      Assert.True(methods.All(m => !m.DafnyInfo.IsStatic("M.Inlining.b")));
-      Assert.True(methods.All(m => !m.DafnyInfo.IsStatic("M.Inlining.a")));
-      Assert.True(methods.All(m => m.ArgValues.Count == 2));
-      Assert.True(methods.All(m => m.ValueCreation.Count == 1));
-      Assert.True(methods.Exists(m => m.ArgValues[1] == "0"));
-      Assert.True(methods.Count(m => m.ArgValues[1] != "0") is 1 or 2);
+      Assert.True(2 <= methods.Count(m => m.MethodName == "M.b"));
+      Assert.Equal(1, methods.Count(m => m.MethodName == "M.a"));
+      Assert.True(methods.All(m => m.DafnyInfo.IsStatic("M.b")));
+      Assert.True(methods.All(m => m.DafnyInfo.IsStatic("M.a")));
+      Assert.True(methods.All(m => m.ArgValues.Count == 1));
+      Assert.True(methods.All(m => m.ValueCreation.Count == 0));
+      Assert.True(methods.Exists(m => m.ArgValues[0] == "0"));
+      Assert.True(methods.Count(m => m.ArgValues[0] != "0") is 1 or 2);
       Assert.True(methods.All(m =>
-        Regex.IsMatch(m.ArgValues[1], "-?[0-9]+")));
+        Regex.IsMatch(m.ArgValues[0], "-?[0-9]+")));
     }
 
     [Theory]
@@ -61,31 +61,29 @@ class Inlining {
     public async Task Inlining(List<Action<DafnyOptions>> optionSettings) {
       var source = @"
 module M {
-  class Inlining {
-    method {:testInline 1} b (i:int) returns (r:int) {
-      if (i == 0) {
-          return 7;
-      } else {
-          return 81;
-      }
-    }
-    method {:testEntry} a (i:int) returns (r:int) {
-      r := b(i);
+  method {:testInline} b (i:int) returns (r:int) {
+    if (i == 0) {
+        return 7;
+    } else {
+        return 81;
     }
   }
+  method {:testEntry} a (i:int) returns (r:int) {
+    r := b(i);
+  }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(methods.Count >= 2);
-      Assert.True(methods.All(m => m.MethodName == "M.Inlining.a"));
-      Assert.True(methods.All(m => !m.DafnyInfo.IsStatic("M.Inlining.a")));
-      Assert.True(methods.All(m => m.ArgValues.Count == 2));
-      Assert.True(methods.All(m => m.ValueCreation.Count == 1));
-      Assert.True(methods.Exists(m => m.ArgValues[1] == "0"));
+      Assert.True(methods.All(m => m.MethodName == "M.a"));
+      Assert.True(methods.All(m => m.DafnyInfo.IsStatic("M.a")));
+      Assert.True(methods.All(m => m.ArgValues.Count == 1));
+      Assert.True(methods.All(m => m.ValueCreation.Count == 0));
+      Assert.True(methods.Exists(m => m.ArgValues[0] == "0"));
       Assert.True(methods.Exists(m =>
-        Regex.IsMatch(m.ArgValues[1], "-?[1-9][0-9]*")));
+        Regex.IsMatch(m.ArgValues[0], "-?[1-9][0-9]*")));
     }
 
     [Theory]
@@ -93,22 +91,20 @@ class Inlining {
     public async Task NestedInlining(List<Action<DafnyOptions>> optionSettings) {
       var source = @"
 module M {
-  class Inlining {
-    function {:testInline 1} min (a:int, b:int):int {
-      if a < b then a else b
-    }
-    function {:testInline 1} max (a:int, b:int):int {
-      min(b, a)
-    }
-    method {:testEntry} test (a:int, b:int) returns (r:int) {
-      r := max(a, b);
-    }
+  function {:testInline} min (a:int, b:int):int {
+    if a < b then a else b
+  }
+  function {:testInline} max (a:int, b:int):int {
+    min(b, a)
+  }
+  method {:testEntry} test (a:int, b:int) returns (r:int) {
+    r := max(a, b);
   }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(methods.Count >= 2);
     }
 
@@ -117,22 +113,20 @@ class Inlining {
     public async Task SelectiveInlining(List<Action<DafnyOptions>> optionSettings) {
       var source = @"
 module M {
-  class Inlining {
-    function {:testInline 1} min (a:int, b:int):int {
-      if a < b then a else b
-    }
-    function max (a:int, b:int):int {
-      if a > b then a else b
-    }
-    method {:testEntry} test(a:int, b:int) returns (r:int) {
-      r := max(a, b);
-    }
+  function {:testInline} min (a:int, b:int):int {
+    if a < b then a else b
+  }
+  function max (a:int, b:int):int {
+    if a > b then a else b
+  }
+  method {:testEntry} test(a:int, b:int) returns (r:int) {
+    r := max(a, b);
   }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.Single(methods);
     }
 
@@ -141,19 +135,17 @@ function max (a:int, b:int):int {
     public async Task FunctionCallInAMethodTranslation(List<Action<DafnyOptions>> optionSettings) {
       var source = @"
 module M {
-  class Inlining {
-    function {:testInline 1} max (a:int, b:int):int {
-      if a > b then a else b
-    }
-    method {:testEntry} test(a:int, b:int) returns (r:int) {
-      r := max(a, b);
-    }
+  function {:testInline} max (a:int, b:int):int {
+    if a > b then a else b
+  }
+  method {:testEntry} test(a:int, b:int) returns (r:int) {
+    r := max(a, b);
   }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(2 <= methods.Count);
     }
 
@@ -162,27 +154,25 @@ class Inlining {
     public async Task InliningRecursion(List<Action<DafnyOptions>> optionSettings) {
       var source = @"
 module M {
-  class Inlining {
-    function {:testInline 2} mod3 (n:int):int 
-      requires n >= 0
-      decreases n
-    {
-      if n == 0 then 0 else
-      if n == 1 then 1 else
-      if n == 2 then 2 else
-      mod3(n-3)
-    }
-    method {:testEntry} test(n:int) returns (r:int) 
-      requires n >= 3
-    {
-      r := mod3(n);
-    }
+  function {:testInline 2} mod3 (n:int):int 
+    requires n >= 0
+    decreases n
+  {
+    if n == 0 then 0 else
+    if n == 1 then 1 else
+    if n == 2 then 2 else
+    mod3(n-3)
+  }
+  method {:testEntry} test(n:int) returns (r:int) 
+    requires n >= 3
+  {
+    r := mod3(n);
   }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(methods.Count >= 3);
     }
 
@@ -191,27 +181,25 @@ decreases n
     public async Task InliningNoRecursion(List<Action<DafnyOptions>> optionSettings) {
       var source = @"
 module M {
-  class Inlining {
-    function {:testInline 1} mod3 (n:int):int 
-      requires n >= 0
-      decreases n
-    {
-      if n == 0 then 0 else
-      if n == 1 then 1 else
-      if n == 2 then 2 else
-      mod3(n-3)
-    }
-    method {:testEntry} test(n:int) returns (r:int) 
-      requires n >= 3
-    {
-      r := mod3(n);
-    }
+  function {:testInline} mod3 (n:int):int 
+    requires n >= 0
+    decreases n
+  {
+    if n == 0 then 0 else
+    if n == 1 then 1 else
+    if n == 2 then 2 else
+    mod3(n-3)
+  }
+  method {:testEntry} test(n:int) returns (r:int) 
+    requires n >= 3
+  {
+    r := mod3(n);
   }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(methods.Count < 3);
     }
 
@@ -227,16 +215,16 @@ module Paths {
     divBy3 := ifThenElse(i % 3 == 0, true, false);
     divBy5 := ifThenElse(i % 5 == 0, true, false);
   }
-  predicate {:testInline 1} ifThenElse(condition:bool, thenBranch:bool, elseBranch:bool) {
+  predicate {:testInline} ifThenElse(condition:bool, thenBranch:bool, elseBranch:bool) {
     if condition then thenBranch else elseBranch
   }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
       options.TestGenOptions.Mode =
         TestGenerationOptions.Modes.Path;
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(8 <= methods.Count);
       Assert.True(methods.All(m => m.MethodName == "Paths.eightPaths"));
       Assert.True(methods.All(m => m.DafnyInfo.IsStatic("Paths.eightPaths")));
@@ -268,16 +256,16 @@ module Paths {
     divBy3 := ifThenElse(i % 3 == 0, true, false);
     divBy5 := ifThenElse(i % 5 == 0, true, false);
   }
-  predicate {:testInline 1} ifThenElse(condition:bool, thenBranch:bool, elseBranch:bool) {
+  predicate {:testInline} ifThenElse(condition:bool, thenBranch:bool, elseBranch:bool) {
     if condition then thenBranch else elseBranch
   }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
       options.TestGenOptions.Mode =
-        TestGenerationOptions.Modes.CallGraph;
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+        TestGenerationOptions.Modes.InlinedBlock;
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(methods.Count is >= 2 and <= 6);
       Assert.True(methods.All(m => m.MethodName == "Paths.eightPaths"));
       Assert.True(methods.All(m => m.DafnyInfo.IsStatic("Paths.eightPaths")));
@@ -307,14 +295,14 @@ module Paths {
     divBy3 := ifThenElse(i % 3 == 0, true, false);
     divBy5 := ifThenElse(i % 5 == 0, true, false);
   }
-  predicate {:testInline 1} ifThenElse(condition:bool, thenBranch:bool, elseBranch:bool) {
+  predicate {:testInline} ifThenElse(condition:bool, thenBranch:bool, elseBranch:bool) {
     if condition then thenBranch else elseBranch
   }
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(methods.Count is >= 1 and <= 2);
       Assert.True(methods.All(m => m.MethodName == "Paths.eightPaths"));
       Assert.True(methods.All(m => m.DafnyInfo.IsStatic("Paths.eightPaths")));
@@ -356,8 +344,8 @@ class List {
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(methods.Count >= 5);
       Assert.True(methods.All(m =>
         m.MethodName == "Objects.List.IsACircleOfTwoOrLessNodes"));
@@ -421,8 +409,8 @@ class LoopingList {
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.Single(methods);
     }
 
@@ -446,8 +434,8 @@ class List {
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(3 <= methods.Count);
       Assert.True(methods.All(m =>
         m.MethodName == "DataTypes.List.Depth"));
@@ -483,8 +471,8 @@ class Value<T> {
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.Single(methods);
       var m = methods[0];
       Assert.Equal("Module.ignoreNonNullableObject", m.MethodName);
@@ -510,13 +498,47 @@ requires a > 0
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
       options.TestGenOptions.WarnDeadCode = true;
-      var stats = await Main.GetDeadCodeStatistics(program, new Modifications(options)).ToListAsync();
+      var stats = await TestGenerator.GetDeadCodeStatistics(program, new Modifications(options)).ToListAsync();
       Assert.Contains(stats, s => s.Contains("(6,14) is potentially unreachable."));
       Assert.Equal(1, stats.Count(line => line.Contains("unreachable"))); // second is line with stats
     }
 
+    [Theory]
+    [MemberData(nameof(OptionSettings))]
+    public async Task CoverageReport(List<Action<DafnyOptions>> optionSettings) {
+      var source = @"
+module M {
+  method {:testEntry} m(a:int) returns (b:bool)
+    requires a > 0
+  {                                             // fully covered (method's entry point)
+    b := if IsPositive(a) then true else false; // partially covered because there are two branches
+    if !IsPositive(a) {                         // fully covered
+      b := false;                               // not covered
+    }
+  }                                             // fully covered (method's exit point)
+  predicate {:testInline} IsPositive(n:int) {
+    n > 0                                       // fully covered
+  }
+}
+".TrimStart();
+      var options = GetDafnyOptions(optionSettings, output);
+      options.TestGenOptions.WarnDeadCode = true;
+      options.TestGenOptions.Mode = TestGenerationOptions.Modes.InlinedBlock;
+      var coverageReport = new CoverageReport("", "", "", null);
+      await TestGenerator.GetDeadCodeStatistics(new StringReader(source), null, options, coverageReport).ToListAsync();
+      Assert.NotEmpty(coverageReport.AllFiles());
+      var fileId = coverageReport.AllFiles().First();
+      Assert.Equal(6, coverageReport.CoverageSpansForFile(fileId).Count());
+      Assert.Equal(4, coverageReport.CoverageSpansForFile(fileId).Count(
+        coverageSpan => coverageSpan.Label == CoverageLabel.FullyCovered));
+      Assert.Equal(1, coverageReport.CoverageSpansForFile(fileId).Count(
+        coverageSpan => coverageSpan.Label == CoverageLabel.PartiallyCovered));
+      Assert.Equal(1, coverageReport.CoverageSpansForFile(fileId).Count(
+        coverageSpan => coverageSpan.Label == CoverageLabel.NotCovered));
+    }
+
     [Theory]
     [MemberData(nameof(OptionSettings))]
     public async Task NoDeadCode(List<Action<DafnyOptions>> optionSettings) {
@@ -530,9 +552,9 @@ public async Task NoDeadCode(List<Action<DafnyOptions>> optionSettings) {
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
       options.TestGenOptions.WarnDeadCode = true;
-      var stats = await Main.GetDeadCodeStatistics(program, new Modifications(options)).ToListAsync();
+      var stats = await TestGenerator.GetDeadCodeStatistics(program, new Modifications(options)).ToListAsync();
       Assert.Single(stats); // the only line with stats
     }
 
@@ -552,9 +574,9 @@ module Test {
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
       options.TestGenOptions.SeqLengthLimit = 1;
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(2 <= methods.Count);
       Assert.True(methods.All(m => m.MethodName == "Test.IsEvenLength"));
       Assert.True(methods.All(m => m.DafnyInfo.IsStatic("Test.IsEvenLength")));
@@ -571,7 +593,7 @@ module Test {
     public async Task InlineGhostCode(List<Action<DafnyOptions>> optionSettings) {
       var source = @"
 module Math {
-  lemma {:testInline 1} Max(a:int, b:int) returns (i:int) {
+  lemma {:testInline} Max(a:int, b:int) returns (i:int) {
     return if (a > b) then a else b;
   }
   lemma {:testEntry} Min(a:int, b:int) returns (i:int)  {
@@ -580,8 +602,8 @@ module Math {
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(2 <= methods.Count);
       Assert.True(methods.All(m => m.MethodName == "Math.Min"));
       Assert.True(methods.All(m => m.DafnyInfo.IsStatic("Math.Min")));
@@ -600,7 +622,7 @@ module ShortCircuit {
   function {:testEntry} Or(a:bool):bool {
     a || OnlyFalse(a)
   }
-  function {:testInline 1} OnlyFalse(a:bool):bool
+  function {:testInline} OnlyFalse(a:bool):bool
     requires !a
   {
     false
@@ -608,8 +630,8 @@ module ShortCircuit {
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.True(2 <= methods.Count);
       Assert.True(methods.All(m => m.MethodName == "ShortCircuit.Or"));
       Assert.True(methods.All(m => m.DafnyInfo.IsStatic("ShortCircuit.Or")));
@@ -638,8 +660,8 @@ module C {
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.Equal(3, methods.Count);
       Assert.True(methods.Exists(m => m.MethodName == "A.m" &&
                                         m.DafnyInfo.IsStatic("A.m") &&
@@ -679,8 +701,8 @@ modifies this
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      var methods = await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
       Assert.Single(methods);
       Assert.True(methods.All(m =>
         m.MethodName == "M.Instance.setI"));
@@ -709,8 +731,22 @@ assert true by {
 }
 ".TrimStart();
       var options = GetDafnyOptions(optionSettings, output);
-      var program = Utils.Parse(options, source, false);
-      await Main.GetTestMethodsForProgram(program).ToListAsync();
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      await GetTestMethodsForProgram(program);
+    }
+
+    [Theory]
+    [MemberData(nameof(OptionSettings))]
+    public async Task MethodWithNoVerificationGoal(List<Action<DafnyOptions>> optionSettings) {
+      var source = @"
+module M {
+  method {:testEntry} m(b: bool) {}
+}
+".TrimStart();
+      var options = GetDafnyOptions(optionSettings, output);
+      var program = await Parse(new BatchErrorReporter(options), source, false);
+      var methods = await GetTestMethodsForProgram(program);
+      Assert.Single(methods);
     }
 
   }
diff --git a/Source/DafnyTestGeneration.Test/WarningTests.cs b/Source/DafnyTestGeneration.Test/WarningTests.cs
new file mode 100644
index 00000000000..efbc1dfad1f
--- /dev/null
+++ b/Source/DafnyTestGeneration.Test/WarningTests.cs
@@ -0,0 +1,266 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Microsoft.Dafny;
+using Xunit;
+
+namespace DafnyTestGeneration.Test;
+
+public class WarningTests : Setup {
+
+  private static readonly Regex Errors = new("returned ([0-9]+) error");
+  private static readonly Regex Warnings = new Regex("returned ([0-9]+) warning");
+
+  private static int Count(Regex toCount, string output) {
+    var match = toCount.Match(output);
+    if (match.Success && int.TryParse(match.Groups[1].Value, out var count)) {
+      return count;
+    }
+    return 0;
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task NoTestEntryPoint(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module M {
+  method m (i:int) { }
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.NoTestEntryError, outputString);
+    Assert.Equal(1, Count(Errors, outputString));
+    Assert.Equal(0, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task NoExternalModule(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+method {:testEntry} m (i:int) { }
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.NoExternalModuleError, outputString);
+    Assert.Equal(1, Count(Errors, outputString));
+    Assert.Equal(0, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task InlinedMethodNotReachable(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module A {
+import opened B
+method {:testEntry} a () { }
+}
+module B {
+method {:testInline 1} b() {}
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.InlinedMethodNotReachableWarning, outputString);
+    Assert.Equal(0, Count(Errors, outputString));
+    Assert.Equal(1, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task InlinedMethodReachable(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module A {
+import opened B
+method {:testEntry} a () {b(); }
+}
+module B {
+method {:testInline 1} b() {}
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Equal(0, Count(Errors, outputString));
+    Assert.Equal(0, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task MalformedAttribute(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module A {
+import opened B
+method {:testEntry} a () {b(); }
+}
+module B {
+method {:testInline -1} b() {}
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.MalformedAttributeError, outputString);
+    Assert.Equal(1, Count(Errors, outputString));
+    Assert.Equal(0, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task UnsupportedInputTypeTrait(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module M {
+trait T {}
+method {:testEntry} m (t:T) { }
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.UnsupportedInputTypeError, outputString);
+    Assert.Equal(1, Count(Errors, outputString));
+    Assert.Equal(0, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task UnsupportedInputTypeClass(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module M {
+class C {}
+method {:testEntry} m (c:C) { }
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.NotFullySupportedInputTypeWarning, outputString);
+    Assert.Equal(0, Count(Errors, outputString));
+    Assert.Equal(1, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task UnsupportedInputTypeRecursive(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module M {
+class C {}
+datatype D = A(c:C) | D(d:D)
+method {:testEntry} m (d:D) { }
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.NotFullySupportedInputTypeWarning, outputString);
+    Assert.Equal(0, Count(Errors, outputString));
+    Assert.Equal(1, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task UnsupportedInputTypeRecursive2(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module M {
+class C {}
+method {:testEntry} m (s:seq<C>) { }
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.NotFullySupportedInputTypeWarning, outputString);
+    Assert.Equal(0, Count(Errors, outputString));
+    Assert.Equal(1, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task UnsupportedRecieverType(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module M {
+  class C {
+    method {:testEntry} m () { } // this should raise a warning
+  }
+  datatype D = D {
+    predicate {:testEntry} p () { true } // this should not raise any warnings
+  }
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.NotFullySupportedInputTypeWarning, outputString);
+    Assert.Equal(0, Count(Errors, outputString));
+    Assert.Equal(1, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task SmallTimeLimit(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module M {
+method {:testEntry} {:timeLimit 100} m () { }
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.SmallTimeLimitWarning, outputString);
+    Assert.Equal(0, Count(Errors, outputString));
+    Assert.Equal(1, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task NoWitness(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+module M {
+type why = i:int | i == 9 || i == 3
+method {:testEntry} m (w:why) { }
+}
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains(FirstPass.NoWitnessWarning, outputString);
+    Assert.Equal(0, Count(Errors, outputString));
+    Assert.Equal(1, Count(Warnings, outputString));
+  }
+
+  [Theory]
+  [MemberData(nameof(OptionSettings))]
+  public async Task MalformedInput(List<Action<DafnyOptions>> optionSettings) {
+    var source = new StringReader(@"
+This is an unparsable program
+".TrimStart());
+    var output = new StringBuilder();
+    var options = GetDafnyOptions(optionSettings, new StringWriter(output));
+    await TestGenerator.GetTestClassForProgram(source, null, options).ToListAsync();
+    var outputString = output.ToString();
+    Assert.Contains("Error", outputString);
+  }
+
+}
\ No newline at end of file
diff --git a/Source/DafnyTestGeneration.Test/WriterFromOutputHelper.cs b/Source/DafnyTestGeneration.Test/WriterFromOutputHelper.cs
deleted file mode 100644
index 8448d66eb33..00000000000
--- a/Source/DafnyTestGeneration.Test/WriterFromOutputHelper.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
-#nullable disable
-using System.IO;
-using System.Text;
-using Microsoft.Extensions.Primitives;
-using Xunit.Abstractions;
-
-namespace DafnyTestGeneration.Test;
-
-public class WriterFromOutputHelper : TextWriter {
-  private readonly StringBuilder buffer = new();
-  private readonly ITestOutputHelper output;
-
-  public WriterFromOutputHelper(ITestOutputHelper output) {
-    this.output = output;
-  }
-
-  public override void Write(string value) {
-    if (value != null) {
-      buffer.Append(value);
-    }
-  }
-
-  public override void Write(char value) {
-    buffer.Append(value);
-  }
-
-  public override Encoding Encoding => Encoding.Default;
-
-  public override void WriteLine(string value) {
-    output.WriteLine(buffer + value);
-    buffer.Clear();
-  }
-
-  public override void WriteLine(string format, params object[] arg) {
-    output.WriteLine(buffer + format, arg);
-    buffer.Clear();
-  }
-
-  public override void Flush() {
-    output.WriteLine(buffer.ToString());
-    base.Flush();
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyTestGeneration.Test/coverlet.runsettings b/Source/DafnyTestGeneration.Test/coverlet.runsettings
new file mode 100644
index 00000000000..11c8afc63f8
--- /dev/null
+++ b/Source/DafnyTestGeneration.Test/coverlet.runsettings
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat Code Coverage">
+        <Configuration>
+          <Exclude>[*]DAST.*,[*]DCOMP.*</Exclude>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
diff --git a/Source/DafnyTestGeneration/BlockBasedModifier.cs b/Source/DafnyTestGeneration/BlockBasedModifier.cs
index 0e388ee8a16..5a8f25de252 100644
--- a/Source/DafnyTestGeneration/BlockBasedModifier.cs
+++ b/Source/DafnyTestGeneration/BlockBasedModifier.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Boogie;
 using Microsoft.Dafny;
 using LiteralExpr = Microsoft.Boogie.LiteralExpr;
@@ -27,29 +28,23 @@ public BlockBasedModifier(Modifications modifications) {
     protected override IEnumerable<ProgramModification> GetModifications(Program p) {
       return VisitProgram(p);
     }
-    private ProgramModification/*?*/ VisitBlock(Block node) {
 
+    /// <summary>
+    /// After inlining, several basic blocks might correspond to the same program state, i.e. location in the Dafny code
+    /// This method creates a mapping from such a state to all blocks that represent it
+    /// </summary>
+    private void PopulateStateToBlocksMap(Block block, Dictionary<string, HashSet<Block>> stateToBlocks) {
       if (program == null || implementation == null) {
-        return null;
+        return;
       }
-      var state = Utils.GetBlockId(node, DafnyInfo.Options);
+      var state = Utils.GetBlockId(block, DafnyInfo.Options);
       if (state == null) {
-        return null;
+        return;
       }
-
-      var testEntryNames = Utils.DeclarationHasAttribute(implementation, TestGenerationOptions.TestInlineAttribute)
-        ? TestEntries
-        : new() { implementation.VerboseName };
-      node.cmds.Add(new AssertCmd(new Token(), new LiteralExpr(new Token(), false)));
-      var record = modifications.GetProgramModification(program, implementation,
-        new HashSet<string>() { state },
-          testEntryNames, $"{implementation.VerboseName.Split(" ")[0]} ({state})");
-
-      node.cmds.RemoveAt(node.cmds.Count - 1);
-      if (record.IsCovered(modifications)) {
-        return null;
+      if (!stateToBlocks.ContainsKey(state)) {
+        stateToBlocks[state] = new();
       }
-      return record;
+      stateToBlocks[state].Add(block);
     }
 
     private IEnumerable<ProgramModification> VisitImplementation(
@@ -59,10 +54,35 @@ private IEnumerable<ProgramModification> VisitImplementation(
           !DafnyInfo.IsAccessible(node.VerboseName.Split(" ")[0])) {
         yield break;
       }
-      for (int i = node.Blocks.Count - 1; i >= 0; i--) {
-        var modification = VisitBlock(node.Blocks[i]);
-        if (modification != null) {
-          yield return modification;
+      var testEntryNames = Utils.DeclarationHasAttribute(implementation, TestGenerationOptions.TestInlineAttribute)
+        ? TestEntries
+        : new() { implementation.VerboseName };
+      var blocks = node.Blocks.ToList();
+      blocks.Reverse();
+      var stateToBlocksMap = new Dictionary<string, HashSet<Block>>();
+      foreach (var block in node.Blocks) {
+        PopulateStateToBlocksMap(block, stateToBlocksMap);
+      }
+      foreach (var block in blocks) {
+        var state = Utils.GetBlockId(block, DafnyInfo.Options);
+        if (state == null) {
+          continue;
+        }
+        foreach (var twinBlock in stateToBlocksMap[state]) {
+          twinBlock.Cmds.Add(new AssertCmd(new Token(), new LiteralExpr(new Token(), false)));
+        }
+        var record = modifications.GetProgramModification(program, implementation,
+          Utils.AllBlockIds(block, DafnyInfo.Options).ToHashSet(),
+          testEntryNames, $"{implementation.VerboseName.Split(" ")[0]} ({state})");
+        if (record.IsCovered(modifications)) {
+          foreach (var twinBlock in stateToBlocksMap[state]) {
+            twinBlock.Cmds.RemoveAt(twinBlock.Cmds.Count - 1);
+          }
+          continue;
+        }
+        yield return record;
+        foreach (var twinBlock in stateToBlocksMap[state]) {
+          twinBlock.Cmds.RemoveAt(twinBlock.Cmds.Count - 1);
         }
       }
 
@@ -70,7 +90,8 @@ private IEnumerable<ProgramModification> VisitImplementation(
 
     private IEnumerable<ProgramModification> VisitProgram(Program node) {
       program = node;
-      foreach (var implementation in node.Implementations) {
+      var implementations = node.Implementations.ToList();
+      foreach (var implementation in implementations) {
         foreach (var modification in VisitImplementation(implementation)) {
           yield return modification;
         }
diff --git a/Source/DafnyTestGeneration/CoverageReport/CoverageLabel.cs b/Source/DafnyTestGeneration/CoverageReport/CoverageLabel.cs
deleted file mode 100644
index 5e820a6c70f..00000000000
--- a/Source/DafnyTestGeneration/CoverageReport/CoverageLabel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-#nullable disable
-
-namespace Microsoft.Dafny;
-
-public enum CoverageLabel {
-  FullyCovered,
-  NotCovered,
-  PartiallyCovered
-}
-
-public static class CoverageLabelExtension {
-
-  /// <summary>
-  /// Combine coverage labels. E.g. FullyCovered + NotCovered = PartiallyCovered
-  /// </summary>
-  public static CoverageLabel Combine(CoverageLabel one, CoverageLabel two) {
-    if (one == CoverageLabel.PartiallyCovered || two == CoverageLabel.PartiallyCovered || one != two) {
-      return CoverageLabel.PartiallyCovered;
-    }
-    return one;
-  }
-
-  public static string ToString(CoverageLabel label) {
-    return label switch {
-      CoverageLabel.FullyCovered => "fully covered",
-      CoverageLabel.NotCovered => "not covered",
-      CoverageLabel.PartiallyCovered => "partially covered",
-      _ => ""
-    };
-  }
-
-}
\ No newline at end of file
diff --git a/Source/DafnyTestGeneration/CoverageReport/CoverageReport.cs b/Source/DafnyTestGeneration/CoverageReport/CoverageReport.cs
deleted file mode 100644
index 12dfa5be2f2..00000000000
--- a/Source/DafnyTestGeneration/CoverageReport/CoverageReport.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-#nullable disable
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using System.Threading;
-
-namespace Microsoft.Dafny; 
-
-public class CoverageReport {
-
-  private static int nextUniqueId = 0;
-
-  // INVARIANT: CoverageSpans are sorted within each list by the position of the StartToken
-  private readonly Dictionary<string, List<CoverageSpan>> labelsByFile;
-  public readonly string Name; // the name to assign to this coverage report
-  public readonly string Units; // the units of coverage (plural). This will be written in the coverage report table.
-  private readonly string suffix; // user-provided suffix to add to filenames that are part of this report
-  private readonly int uniqueId = Interlocked.Increment(ref nextUniqueId);
-  public string UniqueSuffix => suffix + (uniqueId == 1 ? "" : ("_" + uniqueId));
-
-
-  /// <summary>
-  /// Generate a new empty coverage report for a given program.
-  /// If not null, scan the <param name="program"></param> for the list of files it consists of and populate the
-  /// labelsByFile dictionary. <param name="name"></param> is the title of the coverage report displayed in HTML files,
-  /// <param name="units"></param> are the units of coverage this report uses (to be displayed in the index HTML file),
-  /// <param name="suffix"></param> is the suffix to add to files that are part of this coverage report. 
-  /// </summary>
-  public CoverageReport(string name, string units, string suffix, Program program) {
-    Name = name;
-    Units = units;
-    this.suffix = suffix;
-    labelsByFile = new();
-    if (program != null) {
-      RegisterFiles(program);
-    }
-  }
-
-  /// <summary>
-  /// Assign a coverage label to the code indicated by the <param name="span"></param> range token.
-  /// If the span intersects with existing coverage information, it will be merged according to
-  /// CoverageLabelExtension.Combine. 
-  /// </summary>
-  public void LabelCode(RangeToken span, CoverageLabel label) {
-    Contract.Assert(labelsByFile.ContainsKey(span.ActualFilename));
-    if (span.StartToken.CompareTo(span.EndToken) == 0) {
-      return;
-    }
-    var labeledFile = labelsByFile[span.ActualFilename];
-    var coverageSpan = new CoverageSpan(span, label);
-    int index = labeledFile.BinarySearch(0, labeledFile.Count, coverageSpan, null);
-    if (index < 0) {
-      labeledFile.Insert(~index, coverageSpan);
-      return;
-    }
-    var overlappingSpan = labeledFile[index];
-    labeledFile.RemoveAt(index);
-    var combinedLabel = CoverageLabelExtension.Combine(label, overlappingSpan.Label);
-    switch (overlappingSpan.Span.EndToken.CompareTo(span.EndToken)) {
-      case 0:
-        labeledFile.Insert(index, new CoverageSpan(span, combinedLabel));
-        break;
-      case > 0:
-        labeledFile.Insert(index, new CoverageSpan(span, combinedLabel));
-        labeledFile.Insert(index + 1, new CoverageSpan(new RangeToken(span.EndToken, overlappingSpan.Span.EndToken), overlappingSpan.Label));
-        break;
-      default:
-        labeledFile.Insert(index, new CoverageSpan(overlappingSpan.Span, combinedLabel));
-        LabelCode(new RangeToken(overlappingSpan.Span.EndToken, span.EndToken), label);
-        break;
-    }
-  }
-
-  public IEnumerable<CoverageSpan> CoverageSpansForFile(string fileName) {
-    return labelsByFile.GetOrDefault(fileName, () => new List<CoverageSpan>());
-  }
-
-  public IEnumerable<string> AllFiles() {
-    return labelsByFile.Keys;
-  }
-
-  public void RegisterFiles(Program program) {
-    RegisterFiles(program.DefaultModuleDef);
-  }
-
-  public void RegisterFile(Uri uri) {
-    labelsByFile[uri.LocalPath] = new List<CoverageSpan>();
-  }
-
-  private void RegisterFiles(Node astNode) {
-    if (astNode.StartToken.ActualFilename != null) {
-      labelsByFile[astNode.StartToken.ActualFilename] = new();
-    }
-    foreach (var declaration in astNode.Children.OfType<LiteralModuleDecl>()) {
-      RegisterFiles(declaration);
-    }
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyTestGeneration/CoverageReport/CoverageSpan.cs b/Source/DafnyTestGeneration/CoverageReport/CoverageSpan.cs
deleted file mode 100644
index 9f07fe48be2..00000000000
--- a/Source/DafnyTestGeneration/CoverageReport/CoverageSpan.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-#nullable disable
-using System;
-using System.Diagnostics.Contracts;
-
-namespace Microsoft.Dafny; 
-
-public class CoverageSpan : IComparable<CoverageSpan> {
-
-  public readonly RangeToken Span;
-  public readonly CoverageLabel Label;
-
-  public CoverageSpan(RangeToken span, CoverageLabel label) {
-    Contract.Assert(span.Uri != null);
-    Contract.Assert(span.StartToken != null);
-    Contract.Assert(span.EndToken != null);
-    Contract.Assert(span.StartToken.CompareTo(span.EndToken) != 0);
-    Span = span;
-    Label = label;
-  }
-
-  public int CompareTo(CoverageSpan other) {
-    return Span.StartToken.CompareTo(other.Span.StartToken);
-  }
-}
\ No newline at end of file
diff --git a/Source/DafnyTestGeneration/DafnyInfo.cs b/Source/DafnyTestGeneration/DafnyInfo.cs
index ead171fd273..f60ac153bdd 100644
--- a/Source/DafnyTestGeneration/DafnyInfo.cs
+++ b/Source/DafnyTestGeneration/DafnyInfo.cs
@@ -31,10 +31,8 @@ public class DafnyInfo {
     // list of top level scopes accessible from the testing module
     private readonly List<VisibilityScope> scopes;
     public bool SetNonZeroExitCode = false;
-    private readonly bool suppressErrorMessages = false;
 
-    public DafnyInfo(Program program, bool suppressErrorMessages = false) {
-      this.suppressErrorMessages = suppressErrorMessages;
+    public DafnyInfo(Program program) {
       Options = program.Options;
       subsetToSuperset["_System.string"] = new(
         new List<TypeParameter>(),
@@ -69,9 +67,7 @@ public IList<Type> GetReturnTypes(string callable) {
           { Utils.UseFullName(functions[callable].ResultType) };
       }
 
-      if (!suppressErrorMessages) {
-        Options.Printer.ErrorWriteLine(Options.ErrorWriter, $"*** Error: Cannot identify callable {callable}");
-      }
+      Options.ErrorWriter.WriteLine($"*** Error: Test Generation failed to identify callable {callable}");
 
       SetNonZeroExitCode = true;
       return new List<Type>();
@@ -85,9 +81,7 @@ public List<TypeParameter> GetTypeArgs(string callable) {
         return functions[callable].TypeArgs;
       }
 
-      if (!suppressErrorMessages) {
-        Options.Printer.ErrorWriteLine(Options.ErrorWriter, $"*** Error: Cannot identify callable {callable}");
-      }
+      Options.ErrorWriter.WriteLine($"*** Error: Test Generation failed to identify callable {callable}");
 
       SetNonZeroExitCode = true;
       return new List<TypeParameter>();
@@ -103,9 +97,7 @@ public List<TypeParameter> GetTypeArgsWithParents(string callable) {
         result.AddRange(functions[callable].TypeArgs);
         clazz = functions[callable].EnclosingClass;
       } else {
-        if (!suppressErrorMessages) {
-          Options.Printer.ErrorWriteLine(Options.ErrorWriter, $"*** Error: Cannot identify callable {callable}");
-        }
+        Options.ErrorWriter.WriteLine($"*** Error: Test Generation failed to identify callable {callable}");
 
         SetNonZeroExitCode = true;
         return result;
@@ -120,13 +112,11 @@ public IList<Type> GetFormalsTypes(string callable) {
           Utils.UseFullName(arg.Type)).ToList(); ;
       }
       if (functions.ContainsKey(callable)) {
-        return functions[callable].Formals.Select(arg =>
+        return functions[callable].Ins.Select(arg =>
           Utils.UseFullName(arg.Type)).ToList(); ;
       }
 
-      if (!suppressErrorMessages) {
-        Options.Printer.ErrorWriteLine(Options.ErrorWriter, $"*** Error: Cannot identify callable {callable}");
-      }
+      Options.ErrorWriter.WriteLine($"*** Error: Test Generation failed to identify callable {callable}");
 
       SetNonZeroExitCode = true;
       return new List<Type>();
@@ -140,9 +130,7 @@ public bool IsStatic(string callable) {
         return functions[callable].IsStatic;
       }
 
-      if (!suppressErrorMessages) {
-        Options.Printer.ErrorWriteLine(Options.ErrorWriter, $"*** Error: Cannot identify callable {callable}");
-      }
+      Options.ErrorWriter.WriteLine($"*** Error: Test Generation failed to identify callable {callable}");
 
       SetNonZeroExitCode = true;
       return true;
@@ -158,41 +146,6 @@ public bool IsGhost(string callable) {
       return true;
     }
 
-    /// <summary>
-    /// Check that function/methods annotated with :testInline use this attribute correctly
-    /// </summary>
-    private void CheckInlineAttributeValue(MemberDecl callable) {
-      Attributes attributes = callable.Attributes;
-      while (attributes != null) {
-        if (attributes.Name == TestGenerationOptions.TestInlineAttribute) {
-          if (attributes.Args.Count != 1) {
-            if (!suppressErrorMessages) {
-              Options.Printer.ErrorWriteLine(Options.ErrorWriter,
-                $"*** Error: :{TestGenerationOptions.TestInlineAttribute} " +
-                $"attribute must be followed by a positive integer to specify " +
-                $"the recursion unrolling limit (one means no unrolling)");
-            }
-
-            SetNonZeroExitCode = true;
-            return;
-          }
-          if (uint.TryParse(attributes.Args.First().ToString(), out uint result) && result > 0) {
-            return;
-          }
-
-          if (!suppressErrorMessages) {
-            Options.Printer.ErrorWriteLine(Options.ErrorWriter,
-              $"*** Error: {TestGenerationOptions.TestInlineAttribute} value " +
-              $"on {callable.FullName} must be a positive integer");
-          }
-
-          SetNonZeroExitCode = true;
-          return;
-        }
-        attributes = attributes.Prev;
-      }
-    }
-
     public bool IsAccessible(string callable) {
       if (methods.ContainsKey(callable)) {
         return scopes.Any(scope => methods[callable].IsVisibleInScope(scope));
@@ -244,8 +197,8 @@ public IEnumerable<Expression> GetEnsures(List<string> ins, List<string> outs, s
           .Where(e => e != null);
       }
       if (functions.ContainsKey(callableName)) {
-        for (int i = 0; i < functions[callableName].Formals.Count; i++) {
-          subst[functions[callableName].Formals[i]] = ins[i];
+        for (int i = 0; i < functions[callableName].Ins.Count; i++) {
+          subst[functions[callableName].Ins[i]] = ins[i];
         }
 
         if (functions[callableName].Result != null) {
@@ -257,9 +210,7 @@ public IEnumerable<Expression> GetEnsures(List<string> ins, List<string> outs, s
           .Where(e => e != null);
       }
 
-      if (!suppressErrorMessages) {
-        Options.Printer.ErrorWriteLine(Options.ErrorWriter, $"*** Error: Cannot identify callable {callableName}");
-      }
+      Options.ErrorWriter.WriteLine($"*** Error: Test Generation failed to identify callable {callableName}");
 
       SetNonZeroExitCode = true;
       return new List<Expression>();
@@ -276,17 +227,15 @@ public IEnumerable<Expression> GetRequires(List<string> ins, string callableName
           .Where(e => e != null);
       }
       if (functions.ContainsKey(callableName)) {
-        for (int i = 0; i < functions[callableName].Formals.Count; i++) {
-          subst[functions[callableName].Formals[i]] = ins[i];
+        for (int i = 0; i < functions[callableName].Ins.Count; i++) {
+          subst[functions[callableName].Ins[i]] = ins[i];
         }
         return functions[callableName].Req.Select(e =>
             new ClonerWithSubstitution(this, subst, receiver).CloneValidOrNull(e.E))
           .Where(e => e != null);
       }
 
-      if (!suppressErrorMessages) {
-        Options.Printer.ErrorWriteLine(Options.ErrorWriter, $"*** Error: Cannot identify callable {callableName}");
-      }
+      Options.ErrorWriter.WriteLine($"*** Error: Test Generation failed to identify callable {callableName}");
 
       SetNonZeroExitCode = true;
       return new List<Expression>();
@@ -305,10 +254,8 @@ public IEnumerable<Expression> GetRequires(List<string> ins, string callableName
 
     public List<(string name, Type type, bool mutable, string/*?*/ defValue)> GetNonGhostFields(UserDefinedType/*?*/ type) {
       if (type == null || !classes.ContainsKey(type.Name)) {
-        if (!suppressErrorMessages) {
-          Options.Printer.ErrorWriteLine(Options.ErrorWriter,
-            $"*** Error: Cannot identify type {type?.Name ?? " (null) "}");
-        }
+        Options.ErrorWriter.WriteLine(
+            $"*** Error: Test Generation failed to identify type {type?.Name ?? " (null) "}");
 
         SetNonZeroExitCode = true;
         return new List<(string name, Type type, bool mutable, string/*?*/ defValue)>();
@@ -339,10 +286,8 @@ public IEnumerable<Expression> GetRequires(List<string> ins, string callableName
 
     public bool IsTrait(UserDefinedType/*?*/ type) {
       if (type == null || !classes.ContainsKey(type.Name)) {
-        if (!suppressErrorMessages) {
-          Options.Printer.ErrorWriteLine(Options.ErrorWriter,
-            $"*** Error: Cannot identify type {type?.Name ?? " (null) "}");
-        }
+        Options.ErrorWriter.WriteLine(
+            $"*** Error: Test Generation failed to identify type {type?.Name ?? " (null) "}");
 
         SetNonZeroExitCode = true;
         return false;
@@ -350,60 +295,6 @@ public bool IsTrait(UserDefinedType/*?*/ type) {
       return classes[type.Name] is TraitDecl;
     }
 
-    public List<Type>/*?*/ GetTypesForTrait(UserDefinedType/*?*/ type) {
-      if (!IsTrait(type) || !classes.ContainsKey(type.Name) || classes[type.Name] is not TraitDecl traitDecl) {
-        return null;
-      }
-      var result = new List<Type>();
-      foreach (var member in traitDecl.Members.Union(traitDecl.InheritedMembers)) {
-        switch (member) {
-          case Function function when !function.IsGhost:
-            var resultType = Utils.CopyWithReplacements(
-              Utils.UseFullName(function.ResultType),
-              traitDecl.TypeArgs.ConvertAll(arg => arg.ToString()),
-              type.TypeArgs); ;
-            if (resultType.ToString() != type.ToString() && !result.Any(type =>
-                  type.ToString() == resultType.ToString()) && !resultType.ToString().Contains("_tuple")) {
-              result.Add(resultType);
-            }
-            break;
-        }
-      }
-      return result;
-    }
-
-    public List<string> GetEnsuresForTrait(UserDefinedType/*?*/ type, string name, Dictionary<string, string> arguments) {
-      var result = new List<string>();
-      var traitDecl = (TraitDecl)classes[type.Name];
-      foreach (var member in traitDecl.Members.Union(traitDecl.InheritedMembers)) {
-        switch (member) {
-          case Function function when !function.IsGhost:
-            var resultType = Utils.CopyWithReplacements(
-              Utils.UseFullName(function.ResultType),
-              traitDecl.TypeArgs.ConvertAll(arg => arg.ToString()),
-              type.TypeArgs);
-            if (resultType.ToString().Contains("_tuple")) {
-              continue;
-            }
-            var inputTypes = function.Formals.ConvertAll(formal =>
-              Utils.CopyWithReplacements(
-                Utils.UseFullName(formal.Type),
-                traitDecl.TypeArgs.ConvertAll(arg => arg.ToString()),
-                type.TypeArgs));
-            var id = 0;
-            var inputIds = function.Formals.ConvertAll(_ => name + "_arg" + id++);
-            var inputs = Enumerable.Zip(inputIds, inputTypes);
-            result.Add($"ensures forall " +
-                       $"{string.Join(",", inputs.Select(formal => formal.First + ":" + formal.Second))} ::" +
-                       $"{name}.{function.Name}" +
-                       $"({string.Join(",", inputIds)}) == " +
-                       $"{arguments[resultType.ToString()]}");
-            break;
-        }
-      }
-      return result;
-    }
-
     public bool IsClassType(UserDefinedType/*?*/ type) {
       if (type == null || !classes.ContainsKey(type.Name)) {
         return false;
@@ -413,10 +304,8 @@ public bool IsClassType(UserDefinedType/*?*/ type) {
 
     public bool IsExtern(UserDefinedType/*?*/ type) {
       if (type == null || !classes.ContainsKey(type.Name)) {
-        if (!suppressErrorMessages) {
-          Options.Printer.ErrorWriteLine(Options.ErrorWriter,
-            $"*** Error: Cannot identify type {type?.Name ?? " (null) "}");
-        }
+        Options.ErrorWriter.WriteLine(
+            $"*** Error: Test Generation failed to identify type {type?.Name ?? " (null) "}");
 
         SetNonZeroExitCode = true;
         return false;
@@ -426,10 +315,8 @@ public bool IsExtern(UserDefinedType/*?*/ type) {
 
     public Constructor/*?*/ GetConstructor(UserDefinedType/*?*/ type) {
       if (type == null || !classes.ContainsKey(type.Name)) {
-        if (!suppressErrorMessages) {
-          Options.Printer.ErrorWriteLine(Options.ErrorWriter,
-            $"*** Error: Cannot identify type {type?.Name ?? " (null) "}");
-        }
+        Options.ErrorWriter.WriteLine(
+            $"*** Error: Test Generation failed to identify type {type?.Name ?? " (null) "}");
 
         SetNonZeroExitCode = true;
         return null;
@@ -475,20 +362,10 @@ private void VisitUserDefinedTypeDeclaration(string newTypeName,
         if (witness != null) {
           info.witnessForType[newTypeName] = witness;
           if (info.Options.Verbose) {
-            info.Options.OutputWriter.WriteLine($"// Values of type {newTypeName} will be " +
+            info.Options.OutputWriter.WriteLine($"// Unconstrained values of type {newTypeName} will be " +
                                    $"assigned the default value of " +
                                    $"{Printer.ExprToString(info.Options, info.witnessForType[newTypeName])}");
           }
-        } else if (info.Options.Verbose) {
-          var message = $@"
-*** Error: Values of type {newTypeName} 
-will be assigned a default value of type {baseType}, 
-which may not match the associated condition, if any".TrimStart();
-          if (!info.suppressErrorMessages) {
-            info.Options.Printer.ErrorWriteLine(info.Options.ErrorWriter, message);
-          }
-
-          info.SetNonZeroExitCode = true;
         }
         info.subsetToSuperset[newTypeName] = (typeArgs,
           Utils.UseFullName(baseType));
@@ -526,7 +403,7 @@ private void Visit(TypeSynonymDeclBase newType) {
       }
 
       private void Visit(LiteralModuleDecl d) {
-        if (d.ModuleDef.IsAbstract) {
+        if (d.ModuleDef.ModuleKind != ModuleKindEnum.Concrete) {
           return;
         }
         if (info.ToImportAs.ContainsValue(d.Name)) {
@@ -554,7 +431,6 @@ private void VisitClass(TopLevelDeclWithMembers d) {
       }
 
       private void Visit(MemberDecl d) {
-        info.CheckInlineAttributeValue(d);
         if (d is Method method) {
           Visit(method);
         } else if (d is Function function) {
@@ -602,11 +478,11 @@ public override Expression CloneExpr(Expression expr) {
           return null;
         }
         switch (expr) {
-          case ImplicitThisExpr_ConstructorCall:
+          case ImplicitThisExprConstructorCall:
             isValidExpression = false;
             return base.CloneExpr(expr);
           case ThisExpr:
-            return new IdentifierExpr(expr.tok, receiver);
+            return new IdentifierExpr(expr.Origin, receiver);
           case AutoGhostIdentifierExpr:
             isValidExpression = false;
             return base.CloneExpr(expr);
@@ -645,7 +521,7 @@ public override Expression CloneExpr(Expression expr) {
               }
               if ((identifierExpr.Var != null) &&
                   subst.ContainsKey(identifierExpr.Var)) {
-                return new IdentifierExpr(expr.tok, subst[identifierExpr.Var]);
+                return new IdentifierExpr(expr.Origin, subst[identifierExpr.Var]);
               }
               return base.CloneExpr(expr);
             }
@@ -656,7 +532,7 @@ public override Expression CloneExpr(Expression expr) {
                 return base.CloneExpr(expr);
               }
               if (memberSelectExpr.Obj is StaticReceiverExpr staticReceiverExpr) {
-                return new IdentifierExpr(expr.tok,
+                return new IdentifierExpr(expr.Origin,
                   ((staticReceiverExpr.Type) as UserDefinedType).ResolvedClass
                   .FullDafnyName + "." + memberSelectExpr.MemberName);
               }
diff --git a/Source/DafnyTestGeneration/DafnyTestGeneration.csproj b/Source/DafnyTestGeneration/DafnyTestGeneration.csproj
index e27b29d6160..f4f2f78ffd1 100644
--- a/Source/DafnyTestGeneration/DafnyTestGeneration.csproj
+++ b/Source/DafnyTestGeneration/DafnyTestGeneration.csproj
@@ -8,13 +8,13 @@
     <OutputPath>..\..\Binaries\</OutputPath>
     <IsPackable>true</IsPackable>
     <DefineConstants>TRACE</DefineConstants>
-    <TargetFramework>net6.0</TargetFramework>
+      <RollForward>Major</RollForward>
     <Nullable>enable</Nullable>
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\DafnyServer\DafnyServer.csproj" />
     <ProjectReference Include="..\DafnyPipeline\DafnyPipeline.csproj" />
   </ItemGroup>
 
diff --git a/Source/DafnyTestGeneration/DeadCodeCommand.cs b/Source/DafnyTestGeneration/DeadCodeCommand.cs
deleted file mode 100644
index 8923c1e7757..00000000000
--- a/Source/DafnyTestGeneration/DeadCodeCommand.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
-#nullable disable
-using System.Collections.Generic;
-using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.Linq;
-using Microsoft.Boogie;
-
-namespace Microsoft.Dafny;
-
-public class DeadCodeCommand : ICommandSpec {
-  public IEnumerable<Option> Options =>
-    new Option[] {
-      GenerateTestsCommand.LoopUnroll,
-      GenerateTestsCommand.SequenceLengthLimit,
-      GenerateTestsCommand.CoverageReport,
-      GenerateTestsCommand.ForcePrune,
-      GenerateTestsCommand.PrintBpl,
-      BoogieOptionBag.SolverLog,
-      BoogieOptionBag.SolverOption,
-      BoogieOptionBag.SolverOptionHelp,
-      BoogieOptionBag.SolverPath,
-      BoogieOptionBag.SolverResourceLimit,
-      BoogieOptionBag.VerificationTimeLimit
-    }.Concat(ICommandSpec.ConsoleOutputOptions).
-      Concat(ICommandSpec.ResolverOptions);
-
-  public Command Create() {
-    var result = new Command("find-dead-code", "(Experimental) Use counterexample generation to warn about potential dead code.");
-    result.AddArgument(ICommandSpec.FilesArgument);
-    return result;
-  }
-
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    GenerateTestsCommand.PostProcess(dafnyOptions, options, context, TestGenerationOptions.Modes.Block);
-    dafnyOptions.TestGenOptions.WarnDeadCode = true;
-  }
-}
diff --git a/Source/DafnyTestGeneration/FirstPass.cs b/Source/DafnyTestGeneration/FirstPass.cs
new file mode 100644
index 00000000000..8e27a6e39fa
--- /dev/null
+++ b/Source/DafnyTestGeneration/FirstPass.cs
@@ -0,0 +1,371 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Dafny;
+using Type = Microsoft.Dafny.Type;
+
+namespace DafnyTestGeneration;
+
+// This AST pass is run before test generation to detect any potential issues and report them to the user
+public class FirstPass {
+  private List<DafnyDiagnostic> diagnostics;
+  private IEnumerable<DafnyDiagnostic> Errors => diagnostics.Where(diagnostic => diagnostic.Level == ErrorLevel.Error);
+  private IEnumerable<DafnyDiagnostic> Warnings => diagnostics.Where(diagnostic => diagnostic.Level == ErrorLevel.Warning);
+  private readonly DafnyOptions options;
+  public bool NonZeroExitCode { get; private set; }
+
+  // Errors always lead to preemptive termination of test generation and cannot be bypassed
+  public const string NoTestEntryError = "NoTestEntryError";
+  public const string NoExternalModuleError = "NoExternalModuleError";
+  public const string MalformedAttributeError = "MalformedAttributeError";
+  public const string UnsupportedInputTypeError = "UnsupportedInputTypeError";
+
+  // Warnings lead to preemptive terminate of test generation unless --ignore-warnings flag is used
+  public const string InlinedMethodNotReachableWarning = "InlinedMethodNotReachableWarning";
+  public const string NotFullySupportedInputTypeWarning = "NotFullySupportedInputTypeWarning";
+  public const string NoWitnessWarning = "NoWitnessWarning";
+  public const string SmallTimeLimitWarning = "SmallTumeLimitWarning";
+
+  // List of all types that have been checked for being supported. Used to prevent infinite recursion
+  private HashSet<Type> typesConsidered = new();
+
+  public FirstPass(DafnyOptions options) {
+    this.options = options;
+  }
+
+  /// <summary>
+  /// Check that test generation will be able to process the program.
+  /// Return false, if test generation should preemptively terminated,
+  /// i.e. if there are any errors or if there are warnings and the --ignore-warnings flag is not used
+  /// </summary>
+  public async Task<bool> IsOk(string source, Uri uri) {
+    var errorReporter = new ConsoleErrorReporter(options);
+    var program = await Utils.Parse(errorReporter, source, true, uri);
+    diagnostics = new();
+    if (errorReporter.FailCompilation) {
+      NonZeroExitCode = true;
+      return false;
+    }
+    typesConsidered = new();
+    CheckIsWrappedInAModule(program);
+    CheckHasTestEntry(program);
+    CheckInlinedDeclarationsAreReachable(program);
+    CheckInlineAttributes(program);
+    CheckInputTypesAreSupported(program);
+    CheckVerificationTimeLimit(program);
+    PrintWarningsAndErrors(errorReporter, program);
+    NonZeroExitCode = Errors.Count() != 0;
+    return !Errors.Any() && (!Warnings.Any() || !options.FailOnWarnings);
+  }
+
+  /// <summary>
+  /// Print all gathered warnings and errors
+  /// </summary>
+  private void PrintWarningsAndErrors(ErrorReporter errorReporter, Program program) {
+    if (Errors.Count() != 0) {
+      errorReporter.Error(MessageSource.TestGeneration, "", program.StartToken,
+        $"Test generation returned {Errors.Count()} errors. Fix them to proceed:");
+      foreach (var error in Errors) {
+        var errorId = error.ErrorId == "none" ? "Error" : error.ErrorId;
+        errorReporter.Error(MessageSource.TestGeneration, errorId, error.Token, error.Message);
+      }
+    }
+    if (Warnings.Count() != 0 && !options.TestGenOptions.IgnoreWarnings) {
+      errorReporter.Warning(MessageSource.TestGeneration, "", program.StartToken,
+        $"Test generation returned {Warnings.Count()} warnings:");
+      foreach (var warning in Warnings) {
+        errorReporter.Warning(MessageSource.TestGeneration, warning.ErrorId, warning.Token, warning.Message);
+      }
+    }
+  }
+
+  /// <summary>
+  /// Emit a warning proposing to raise test generation time limit if
+  /// any of the functions/methods in the program is annotated with a custom {:timeLimit} value higher than the default
+  /// </summary>
+  private bool CheckVerificationTimeLimit(Program program) {
+    uint maxTimeLimit = (options.TimeLimit == 0 ? TestGenerationOptions.DefaultTimeLimit : options.TimeLimit);
+    Declaration callableWithMaxTimeLimit = null;
+    foreach (var declaration in Utils.AllMemberDeclarationsWithAttribute(program.DefaultModule, "timeLimit")) {
+      if (declaration.HasUserAttribute("timeLimit", out var attribute) &&
+          uint.TryParse(attribute.Args.First().ToString(), out uint timeLimit) &&
+          timeLimit > maxTimeLimit) {
+        maxTimeLimit = timeLimit;
+        callableWithMaxTimeLimit = declaration;
+      }
+    }
+    if (callableWithMaxTimeLimit != null) {
+      diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, SmallTimeLimitWarning, callableWithMaxTimeLimit.Origin,
+        $"Method/function {callableWithMaxTimeLimit} is annotated with {{:timeLimit {maxTimeLimit}}} but test " +
+        $"generation is called with --{BoogieOptionBag.VerificationTimeLimit.Name}:{options.TimeLimit}." +
+        $"\nConsider increasing the time limit for test generation",
+        ErrorLevel.Warning, new List<DafnyRelatedInformation>()));
+      return false;
+    }
+    return true;
+  }
+
+  /// <summary>
+  /// Check that function/methods annotated with {:testInline} use this attribute correctly
+  /// </summary>
+  private void CheckInlineAttributes(Program program) {
+    foreach (var toInline in Utils
+               .AllMemberDeclarationsWithAttribute(program.DefaultModule, TestGenerationOptions.TestInlineAttribute)) {
+      toInline.HasUserAttribute(TestGenerationOptions.TestInlineAttribute, out var attribute);
+      if (attribute.Args.Count == 0 ||
+          (attribute.Args.Count == 1 && uint.TryParse(attribute.Args.First().ToString(), out uint result) && result > 0)) {
+        continue;
+      }
+      diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, MalformedAttributeError, toInline.Origin,
+        $"{{:{TestGenerationOptions.TestInlineAttribute}}} attribute on the {toInline.FullDafnyName} method/function " +
+        $"can only take one argument, which must be a positive integer specifying the recursion unrolling limit " +
+        $"(absence of such an argument or 1 means no unrolling)",
+        ErrorLevel.Error, new List<DafnyRelatedInformation>()));
+      return;
+    }
+  }
+
+  /// <summary>
+  /// For each {:testInline}-annotated method or function, make sure it is reachable through the call graph
+  /// from any of the {:testEntry}-annotated methods or function. Return false if this is not the case.
+  /// </summary>
+  private bool CheckInlinedDeclarationsAreReachable(Program program) {
+    // First build a set of all functions/methods reachable from the {:testEntry} annotated declarations:
+    var reachable = Utils
+      .AllMemberDeclarationsWithAttribute(program.DefaultModule, TestGenerationOptions.TestEntryAttribute)
+      .OfType<ICallable>().ToHashSet();
+    var toVisit = reachable.ToList();
+    var callGraphBuilderCLoner = new CallGraphBuilderCloner();
+    while (toVisit.Count != 0) {
+      var next = toVisit[0];
+      toVisit.Remove(next);
+      callGraphBuilderCLoner.VisitCallable(next);
+      foreach (var callee in callGraphBuilderCLoner.Edges.GetValueOrDefault(next, new HashSet<ICallable>())) {
+        if (!reachable.Contains(callee) &&
+            callee is MemberDecl memberDecl &&
+            memberDecl.HasUserAttribute(TestGenerationOptions.TestInlineAttribute, out var _)) {
+          reachable.Add(callee);
+          toVisit.Add(callee);
+        }
+      }
+    }
+    var result = true;
+    foreach (var toInline in Utils
+               .AllMemberDeclarationsWithAttribute(program.DefaultModule, TestGenerationOptions.TestInlineAttribute)
+               .OfType<ICallable>()) {
+      if (reachable.Contains(toInline)) {
+        continue;
+      }
+      string message;
+      if (toInline is Method method) {
+        message = $"Method {method.Name} will not be inlined because it is not reachable from any of the {{:{TestGenerationOptions.TestEntryAttribute}}}-annotated methods or functions";
+      } else if (toInline is Function function) {
+        message = $"Function {function.Name} will not be inlined because it is not reachable from any of the {{:{TestGenerationOptions.TestEntryAttribute}}}-annotated methods or functions";
+      } else {
+        message = $"Found a {{:{TestGenerationOptions.TestInlineAttribute}}}-annotated declaration that is neither a method nor a function";
+      }
+      diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, InlinedMethodNotReachableWarning, toInline.Origin, message,
+        ErrorLevel.Warning, new List<DafnyRelatedInformation>()));
+      result = false;
+    }
+    return result;
+  }
+
+  /// <summary>
+  /// Return true iff the program has no elements that are not wrapped in a module
+  /// (so all elements can be imported provided the export sets allow it)
+  /// </summary>
+  private bool CheckIsWrappedInAModule(Program program) {
+    if (program.DefaultModuleDef.Children.OfType<ClassLikeDecl>().Any() || program.DefaultModuleDef.Children.OfType<DefaultClassDecl>().Any(decl => decl.Children.Any())) {
+      diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, NoExternalModuleError, program.Origin,
+        "Program is not wrapped in a module. Put your code inside \"module M {}\" or equivalent",
+        ErrorLevel.Error, new List<DafnyRelatedInformation>()));
+      return false;
+    }
+    return true;
+  }
+
+  /// <summary>
+  /// For each input parameter of every {:testEntry}-annotated function/method, make sure that
+  /// the type of the parameter is fully supported by test generation. Return false, if this is not the case.
+  /// </summary>
+  private bool CheckInputTypesAreSupported(Program program) {
+    var result = true;
+    foreach (MemberDecl declaration in Utils.AllMemberDeclarationsWithAttribute(program.DefaultModule, TestGenerationOptions.TestEntryAttribute)) {
+      if (declaration.EnclosingClass is TraitDecl or ArrayClassDecl or IteratorDecl) {
+        diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, UnsupportedInputTypeError, declaration.Origin,
+          $"Test Generation does not support trait, array, or iterator types as receivers of " +
+          $"{{:{TestGenerationOptions.TestEntryAttribute}}}-annotated methods.\n" +
+          $"Consider writing a wrapper method that creates a receiver and passes on the arguments to it",
+          ErrorLevel.Warning, new List<DafnyRelatedInformation>()));
+        result = false;
+      } else if (declaration.EnclosingClass is ClassDecl) {
+        diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, NotFullySupportedInputTypeWarning, declaration.Origin,
+          $"Test Generation does not fully support class types as receivers of " +
+          $"{{:{TestGenerationOptions.TestEntryAttribute}}}-annotated methods.\n" +
+          $"Consider writing a wrapper method that creates a receiver and passes on the arguments to it",
+          ErrorLevel.Warning, new List<DafnyRelatedInformation>()));
+        result = false;
+      }
+      if (declaration is Method method) {
+        foreach (var formal in method.Ins) {
+          if (!TypeIsSupported(formal.Type, method.Name)) {
+            result = false; // No short-circuiting here to emit all possible errors/warnings
+          }
+        }
+      } else if (declaration is Function function) {
+        foreach (var formal in function.Ins) {
+          if (!TypeIsSupported(formal.Type, function.Name)) {
+            result = false; // No short-circuiting here to emit all possible errors/warnings
+          }
+        }
+      }
+    }
+    return result;
+  }
+
+  /// <summary>
+  /// Recursively traverse a given type and emit warning/errors if this type cannot be fully reconstructed
+  /// from the counterexample by test generation, i.e. no parameters of the {:testEntry}-annotated method/function
+  /// should have such a type. Return true, if the type is fully supported. 
+  /// </summary>
+  private bool TypeIsSupported(Type type, string testEntry) {
+    if (typesConsidered.Contains(type)) {
+      return true;
+    }
+    typesConsidered.Add(type);
+    var isSupported = false;
+    while (type is InferredTypeProxy inferred) {
+      type = inferred.T;
+    }
+    if (type is UserDefinedType userDefinedType) {
+      var genericMessage =
+        $"Consider modelling values of type {userDefinedType} with a datatype and passing them as input to " +
+        $"{{:{TestGenerationOptions.TestEntryAttribute}}} annotated method/function {testEntry}";
+      if (userDefinedType.IsAbstractType || userDefinedType.IsArrayType || userDefinedType.IsTraitType) {
+        diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, UnsupportedInputTypeError, type.Origin,
+          $"Test Generation does not support abstract types, array types, and trait types as inputs.\n{genericMessage}",
+          ErrorLevel.Error, new List<DafnyRelatedInformation>()));
+      } else if (userDefinedType.IsRefType) {
+        if (userDefinedType.ResolvedClass is ClassDecl classDecl) {
+          foreach (var field in classDecl.Members.Union(classDecl.InheritedMembers).OfType<Field>()) {
+            TypeIsSupported(field.Type, testEntry);
+          }
+        }
+        diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, NotFullySupportedInputTypeWarning, type.Origin,
+          $"Test Generation does not fully support class types as inputs.\n{genericMessage}",
+          ErrorLevel.Warning, new List<DafnyRelatedInformation>()));
+      } else if (userDefinedType.IsArrowType) {
+        diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, NotFullySupportedInputTypeWarning, type.Origin,
+          $"Test Generation does not fully support function types as inputs.\n{genericMessage}",
+          ErrorLevel.Warning, new List<DafnyRelatedInformation>()));
+      } else if (userDefinedType.AsNewtype != null) {
+        if (userDefinedType.AsNewtype.Witness == null) {
+          diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, NoWitnessWarning, type.Origin,
+            $"Cannot find witness for type {userDefinedType}. Please consider adding a witness to the declaration",
+            ErrorLevel.Warning, new List<DafnyRelatedInformation>()));
+        }
+        isSupported = TypeIsSupported(userDefinedType.AsNewtype.BaseType, testEntry);
+      } else if (userDefinedType.AsSubsetType != null) {
+        if (userDefinedType.AsSubsetType.Witness == null) {
+          diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, NoWitnessWarning, type.Origin,
+            $"Cannot find witness for type {userDefinedType}. Please consider adding a witness to the declaration",
+            ErrorLevel.Warning, new List<DafnyRelatedInformation>()));
+        }
+        isSupported = TypeIsSupported(userDefinedType.AsSubsetType.Rhs, testEntry);
+      } else if (userDefinedType.AsTypeSynonym != null) {
+        isSupported = TypeIsSupported(userDefinedType.AsTypeSynonym.Rhs, testEntry);
+      } else if (userDefinedType.IsDatatype) {
+        if (userDefinedType.IsCoDatatype) {
+          diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, NotFullySupportedInputTypeWarning, type.Origin,
+            $"Test Generation has not been properly tested with co-inductive datatypes.\n{genericMessage}",
+            ErrorLevel.Warning, new List<DafnyRelatedInformation>()));
+        } else {
+          isSupported = true;
+        }
+        if (userDefinedType.ResolvedClass is DatatypeDecl datatypeDecl) {
+          foreach (var constructor in datatypeDecl.Ctors) {
+            foreach (var formal in constructor.Children.OfType<Formal>()) {
+              isSupported = TypeIsSupported(formal.Type, testEntry) && isSupported;
+            }
+          }
+        }
+      } else {
+        isSupported = true;
+      }
+    }
+
+    foreach (var arg in type.TypeArgs) {
+      if (!TypeIsSupported(arg, testEntry)) {
+        isSupported = false; // No short-circuiting here to emit all possible errors/warnings
+      }
+    }
+    return isSupported;
+  }
+
+  /// <summary>
+  /// Return true if the program has at least one method/function annotated with {:testEntry}
+  /// </summary>
+  private bool CheckHasTestEntry(Program program) {
+    if (!Utils.ProgramHasAttribute(program, TestGenerationOptions.TestEntryAttribute)) {
+      diagnostics.Add(new DafnyDiagnostic(MessageSource.TestGeneration, NoTestEntryError, program.Origin,
+        $"Cannot find a method or function annotated with {{:{TestGenerationOptions.TestEntryAttribute}}}",
+        ErrorLevel.Error, new List<DafnyRelatedInformation>()));
+      return false;
+    }
+    return true;
+  }
+
+  /// <summary>
+  /// Builds a call graph for the entire program by adding edges to it on each call to VisitCallable
+  /// </summary>
+  private class CallGraphBuilderCloner : Cloner {
+    internal readonly Dictionary<ICallable, HashSet<ICallable>> Edges;
+    private ICallable currentlyVisited; // method/function from which the call is made
+
+    internal CallGraphBuilderCloner() : base(false, true) {
+      Edges = new();
+      currentlyVisited = null;
+    }
+
+    public void VisitCallable(ICallable callable) {
+      currentlyVisited = callable;
+      if (callable is Method method) {
+        base.CloneBlockStmt(method.Body);
+      } else if (callable is Function function) {
+        if (function.ByMethodBody != null) {
+          base.CloneBlockStmt(function.ByMethodBody);
+        } else if (function.Body != null) {
+          base.CloneExpr(function.Body);
+        }
+      }
+      currentlyVisited = null;
+    }
+
+    public override Expression CloneExpr(Expression expr) {
+      if (expr is FunctionCallExpr functionCallExpr) {
+        if (!Edges.ContainsKey(currentlyVisited)) {
+          Edges[currentlyVisited] = new();
+        }
+        Edges[currentlyVisited].Add(functionCallExpr.Function);
+      }
+      return base.CloneExpr(expr);
+    }
+
+    public override Statement CloneStmt(Statement stmt, bool isReference) {
+      if (stmt is CallStmt callStmt) {
+        if (!Edges.ContainsKey(currentlyVisited)) {
+          Edges[currentlyVisited] = new();
+        }
+        Edges[currentlyVisited].Add(callStmt.Method);
+      }
+      return base.CloneStmt(stmt, isReference);
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/DafnyTestGeneration/GenerateTestsCommand.cs b/Source/DafnyTestGeneration/GenerateTestsCommand.cs
deleted file mode 100644
index be80883c148..00000000000
--- a/Source/DafnyTestGeneration/GenerateTestsCommand.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.Linq;
-using DafnyCore;
-using Microsoft.Boogie;
-
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
-#nullable disable
-namespace Microsoft.Dafny;
-
-public class GenerateTestsCommand : ICommandSpec {
-  public IEnumerable<Option> Options =>
-    new Option[] {
-      LoopUnroll,
-      SequenceLengthLimit,
-      BoogieOptionBag.SolverLog,
-      BoogieOptionBag.SolverOption,
-      BoogieOptionBag.SolverOptionHelp,
-      BoogieOptionBag.SolverPath,
-      BoogieOptionBag.SolverPlugin,
-      BoogieOptionBag.SolverResourceLimit,
-      BoogieOptionBag.VerificationTimeLimit,
-      PrintBpl,
-      CoverageReport,
-      ForcePrune
-    }.Concat(ICommandSpec.ConsoleOutputOptions).
-      Concat(ICommandSpec.ResolverOptions);
-
-  private enum Mode {
-    Path,
-    Block,
-    CallGraph
-  }
-
-  /// <summary>
-  /// Return a copy of the given DafnyOption instance that (for the purposes
-  /// of test generation) is identical to the <param name="options"></param>
-  /// parameter in everything except the value of the ProcsToCheck field that
-  /// determines the procedures to be verified and should be set to the value of
-  /// the <param name="proceduresToVerify"></param> parameter.
-  /// </summary>
-  internal static DafnyOptions CopyForProcedure(DafnyOptions options, HashSet<string> proceduresToVerify) {
-    var copy = new DafnyOptions(options);
-    copy.ProcsToCheck = proceduresToVerify.ToList();
-    return copy;
-  }
-
-  private readonly Argument<Mode> modeArgument = new("mode", @"
-Block - Prints block-coverage tests for the given program.
-CallGraph - Prints call-graph-coverage tests for the given program.
-Path - Prints path-coverage tests for the given program.");
-
-  public Command Create() {
-    var result = new Command("generate-tests", "(Experimental) Generate Dafny tests that ensure block or path coverage of a particular Dafny program.");
-    result.AddArgument(modeArgument);
-    result.AddArgument(ICommandSpec.FilesArgument);
-    return result;
-  }
-
-  public void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context) {
-    var mode = context.ParseResult.GetValueForArgument(modeArgument) switch {
-      Mode.Path => TestGenerationOptions.Modes.Path,
-      Mode.Block => TestGenerationOptions.Modes.Block,
-      Mode.CallGraph => TestGenerationOptions.Modes.CallGraph,
-      _ => throw new ArgumentOutOfRangeException()
-    };
-    PostProcess(dafnyOptions, options, context, mode);
-  }
-
-  internal static void PostProcess(DafnyOptions dafnyOptions, Options options, InvocationContext context, TestGenerationOptions.Modes mode) {
-    dafnyOptions.CompilerName = "cs";
-    dafnyOptions.Compile = true;
-    dafnyOptions.RunAfterCompile = false;
-    dafnyOptions.ForceCompile = false;
-    dafnyOptions.DeprecationNoise = 0;
-    dafnyOptions.ForbidNondeterminism = true;
-    dafnyOptions.DefiniteAssignmentLevel = 2;
-    dafnyOptions.UseBaseNameForFileName = false;
-    dafnyOptions.TypeEncodingMethod = CoreOptions.TypeEncoding.Predicates;
-    dafnyOptions.Set(DafnyConsolePrinter.ShowSnippets, false);
-    dafnyOptions.TestGenOptions.Mode = mode;
-  }
-
-  public static readonly Option<uint> SequenceLengthLimit = new("--length-limit",
-    "Add an axiom that sets the length of all sequences to be no greater than <n>. 0 (default) indicates no limit.") {
-  };
-  public static readonly Option<int> LoopUnroll = new("--loop-unroll", () => -1,
-    "Higher values can improve accuracy of the analysis at the cost of taking longer to run.") {
-  };
-  public static readonly Option<string> PrintBpl = new("--print-bpl",
-    "Print the Boogie code used during test generation.") {
-    ArgumentHelpName = "filename"
-  };
-  public static readonly Option<string> CoverageReport = new("--coverage-report",
-    "Emit expected test coverage report to a given directory.") {
-    ArgumentHelpName = "directory"
-  };
-  public static readonly Option<bool> ForcePrune = new("--force-prune",
-    "Enable axiom pruning that Dafny uses to speed up verification. This may negatively affect the quality of tests.") {
-  };
-  static GenerateTestsCommand() {
-    DafnyOptions.RegisterLegacyBinding(LoopUnroll, (options, value) => {
-      options.LoopUnrollCount = value;
-    });
-    DafnyOptions.RegisterLegacyBinding(SequenceLengthLimit, (options, value) => {
-      options.TestGenOptions.SeqLengthLimit = value;
-    });
-    DafnyOptions.RegisterLegacyBinding(PrintBpl, (options, value) => {
-      options.TestGenOptions.PrintBpl = value;
-    });
-    DafnyOptions.RegisterLegacyBinding(CoverageReport, (options, value) => {
-      options.TestGenOptions.CoverageReport = value;
-    });
-    DafnyOptions.RegisterLegacyBinding(ForcePrune, (options, value) => {
-      options.TestGenOptions.ForcePrune = value;
-    });
-
-    DooFile.RegisterNoChecksNeeded(
-      LoopUnroll,
-      SequenceLengthLimit,
-      PrintBpl,
-      CoverageReport,
-      ForcePrune
-    );
-  }
-}
diff --git a/Source/DafnyTestGeneration/Inlining/AddByMethodRewriter.cs b/Source/DafnyTestGeneration/Inlining/AddByMethodRewriter.cs
index efdddb1ff75..9cb48d0f9d4 100644
--- a/Source/DafnyTestGeneration/Inlining/AddByMethodRewriter.cs
+++ b/Source/DafnyTestGeneration/Inlining/AddByMethodRewriter.cs
@@ -29,7 +29,7 @@ internal void PreResolve(Program program) {
 
   private void AddByMethod(TopLevelDecl d) {
     if (d is LiteralModuleDecl moduleDecl) {
-      moduleDecl.ModuleDef.TopLevelDecls.ForEach(AddByMethod);
+      moduleDecl.ModuleDef.Children.OfType<TopLevelDecl>().ForEach(AddByMethod);
     } else if (d is TopLevelDeclWithMembers withMembers) {
       withMembers.Members.OfType<Function>().ForEach(AddByMethod);
     }
@@ -47,9 +47,9 @@ private static Attributes RemoveOpaqueAttr(Attributes attributes, Cloner cloner)
     if (attributes is UserSuppliedAttributes) {
       var usa = (UserSuppliedAttributes)attributes;
       return new UserSuppliedAttributes(
-        cloner.Tok(usa.tok),
-        cloner.Tok(usa.OpenBrace),
-        cloner.Tok(usa.CloseBrace),
+        cloner.Origin(usa.Origin),
+        cloner.Origin(usa.OpenBrace),
+        cloner.Origin(usa.CloseBrace),
         attributes.Args.ConvertAll(cloner.CloneExpr),
         RemoveOpaqueAttr(attributes.Prev, cloner));
     }
@@ -68,11 +68,11 @@ private void AddByMethod(Function func) {
       return;
     }
 
-    var returnStatement = new ReturnStmt(func.Body.RangeToken,
+    var returnStatement = new ReturnStmt(func.Body.Origin,
       new List<AssignmentRhs> { new ExprRhs(new Cloner().CloneExpr(func.Body)) });
     func.ByMethodBody = new BlockStmt(
-      func.Body.RangeToken,
+      func.Body.Origin,
       new List<Statement> { returnStatement });
-    func.ByMethodTok = func.Body.tok;
+    func.ByMethodTok = func.Body.Origin;
   }
 }
\ No newline at end of file
diff --git a/Source/DafnyTestGeneration/Inlining/AddImplementationForCallsRewriter.cs b/Source/DafnyTestGeneration/Inlining/AddImplementationForCallsRewriter.cs
index 7c06530d4ae..f601b316ba8 100644
--- a/Source/DafnyTestGeneration/Inlining/AddImplementationForCallsRewriter.cs
+++ b/Source/DafnyTestGeneration/Inlining/AddImplementationForCallsRewriter.cs
@@ -15,13 +15,12 @@
 namespace DafnyTestGeneration.Inlining;
 
 /// <summary>
-/// Create implementations for all "Call$$" procedures by making them
+/// Create implementations for all "CallPost$$" procedures by making them
 /// call the respective "Impl$$ implementations. This allows to implement
 /// inlining of Dafny methods further down the road.
 /// </summary>
 public class AddImplementationsForCallsRewriter : ReadOnlyVisitor {
 
-  private const string CallPrefix = "Call$$";
   private readonly DafnyOptions options;
   private List<Implementation> implsToAdd = new();
 
@@ -32,7 +31,7 @@ public AddImplementationsForCallsRewriter(DafnyOptions options) {
   }
 
   public override Procedure /*?*/ VisitProcedure(Procedure /*?*/ node) {
-    if (node == null || !node.Name.StartsWith(CallPrefix) ||
+    if (node == null || !node.Name.StartsWith(BoogieGenerator.CallPrefix + BoogieGenerator.NameSeparator) ||
         node.Name.EndsWith(ProgramModifier.CtorPostfix)) {
       return node;
     }
@@ -82,6 +81,19 @@ public AddImplementationsForCallsRewriter(DafnyOptions options) {
     return node;
   }
 
+  public override Implementation VisitImplementation(Implementation node) {
+    this.VisitVariableSeq(node.LocVars);
+    this.VisitBlockList(node.Blocks);
+    if (node.Proc is not null) {
+      // TODO: The overall test generation code should be refactored so that
+      // this case can't occur. The default visitor for Implementation nodes
+      // has an invariant that node.Proc is never null. That invariant did
+      // not lead to an NPE until Boogie 3.0.1, however.
+      node.Proc = (Procedure)node.Proc.StdDispatch((StandardVisitor)this);
+    }
+    return (Implementation)this.VisitDeclWithFormals((DeclWithFormals)node);
+  }
+
   public override Program VisitProgram(Program node) {
     program = node;
     implsToAdd = new();
diff --git a/Source/DafnyTestGeneration/Inlining/FunctionCallToMethodCallRewriter.cs b/Source/DafnyTestGeneration/Inlining/FunctionCallToMethodCallRewriter.cs
index 4c4c62cbc23..405e78a01ba 100644
--- a/Source/DafnyTestGeneration/Inlining/FunctionCallToMethodCallRewriter.cs
+++ b/Source/DafnyTestGeneration/Inlining/FunctionCallToMethodCallRewriter.cs
@@ -11,7 +11,7 @@
 using Program = Microsoft.Dafny.Program;
 
 
-namespace DafnyTestGeneration.Inlining; 
+namespace DafnyTestGeneration.Inlining;
 
 /// <summary>
 /// Change by-method function calls to method calls (after resolution)
@@ -31,7 +31,7 @@ public void PostResolve(Program program) {
 
   private void Visit(TopLevelDecl d) {
     if (d is LiteralModuleDecl moduleDecl) {
-      moduleDecl.ModuleDef.TopLevelDecls.ForEach(Visit);
+      moduleDecl.ModuleDef.Children.OfType<TopLevelDecl>().ForEach(Visit);
     } else if (d is TopLevelDeclWithMembers withMembers) {
       withMembers.Members.Where(shouldProcessPredicate).OfType<Function>().ForEach(Visit);
       withMembers.Members.Where(shouldProcessPredicate).OfType<Method>().ForEach(Visit);
@@ -55,23 +55,23 @@ private void Visit(Method method) {
     }
   }
 
-  public override Statement CloneStmt(Statement stmt) {
-    if (stmt == null || stmt is not UpdateStmt updateStmt) {
-      return base.CloneStmt(stmt);
+  public override Statement CloneStmt(Statement stmt, bool isReference) {
+    if (stmt == null || stmt is not AssignStatement updateStmt) {
+      return base.CloneStmt(stmt, isReference);
     }
-    var clonedUpdate = (UpdateStmt)base.CloneStmt(updateStmt);
+    var clonedUpdate = (AssignStatement)base.CloneStmt(updateStmt, isReference);
     var newResolvedStmts = new List<Statement>();
     foreach (var resolvedStmt in clonedUpdate.ResolvedStatements) {
       if (!resolvedStmt.IsGhost &&
-          resolvedStmt is AssignStmt { Rhs: ExprRhs exprRhs } &&
+          resolvedStmt is SingleAssignStmt { Rhs: ExprRhs exprRhs } &&
           exprRhs.Expr.Resolved is FunctionCallExpr { IsByMethodCall: true } funcCallExpr) {
         var memberSelectExpr = new MemberSelectExpr(
-          funcCallExpr.tok,
+          funcCallExpr.Origin,
           CloneExpr(funcCallExpr.Receiver.Resolved),
-          funcCallExpr.Function.ByMethodDecl.Name);
+          funcCallExpr.Function.ByMethodDecl.NameNode);
         memberSelectExpr.Member = funcCallExpr.Function.ByMethodDecl;
-        memberSelectExpr.TypeApplication_JustMember = funcCallExpr.TypeApplication_JustFunction;
-        newResolvedStmts.Add(new CallStmt(stmt.RangeToken,
+        memberSelectExpr.TypeApplicationJustMember = funcCallExpr.TypeApplication_JustFunction;
+        newResolvedStmts.Add(new CallStmt(stmt.Origin,
           updateStmt.Lhss.Select(lhs => CloneExpr(lhs.Resolved)).ToList(), memberSelectExpr,
           funcCallExpr.Args.ConvertAll(e => CloneExpr(e.Resolved))));
       } else {
diff --git a/Source/DafnyTestGeneration/Inlining/InliningTranslator.cs b/Source/DafnyTestGeneration/Inlining/InliningTranslator.cs
index 50f6654499d..c0a9c33ccd3 100644
--- a/Source/DafnyTestGeneration/Inlining/InliningTranslator.cs
+++ b/Source/DafnyTestGeneration/Inlining/InliningTranslator.cs
@@ -4,15 +4,16 @@
 #nullable disable
 using System.Collections.Generic;
 using System.Threading;
+using Microsoft.Boogie;
 using Microsoft.Dafny;
 using Program = Microsoft.Dafny.Program;
 
-namespace DafnyTestGeneration.Inlining; 
+namespace DafnyTestGeneration.Inlining;
 
 public static class InliningTranslator {
   private static bool ShouldProcessForInlining(MemberDecl memberDecl) {
-    return Utils.MembersHasAttribute(memberDecl, TestGenerationOptions.TestEntryAttribute) ||
-           Utils.MembersHasAttribute(memberDecl, TestGenerationOptions.TestInlineAttribute);
+    return memberDecl.HasUserAttribute(TestGenerationOptions.TestEntryAttribute, out var _) ||
+           memberDecl.HasUserAttribute(TestGenerationOptions.TestInlineAttribute, out var _);
   }
 
   /// <summary>
@@ -26,14 +27,16 @@ public static bool TranslateForFutureInlining(Program dafnyProgram, DafnyOptions
     // Remove short-circuiting expressions from method and byMethod bodies
     new RemoveShortCircuitingRewriter(ShouldProcessForInlining).PreResolve(dafnyProgram);
     // Resolve the program (in particular, resolve all function calls)
-    new ProgramResolver(dafnyProgram).Resolve(CancellationToken.None); // now resolved
+#pragma warning disable VSTHRD002
+    new ProgramResolver(dafnyProgram).Resolve(CancellationToken.None).Wait(); // now resolved
+#pragma warning restore VSTHRD002
     if (dafnyProgram.Reporter.HasErrors) {
       return false;
     }
     // Change by-method function calls to method calls
     new FunctionCallToMethodCallRewriter(ShouldProcessForInlining).PostResolve(dafnyProgram);
     // Separate by-method methods into standalone methods so that translator adds Call$$ procedures for them
-    new SeparateByMethodRewriter(new ConsoleErrorReporter(options), ShouldProcessForInlining).PostResolve(dafnyProgram);
+    new SeparateByMethodRewriter(new ConsoleErrorReporter(options)).PostResolve(dafnyProgram);
     // Translate Dafny to Boogie. 
     var boogiePrograms = Utils.Translate(dafnyProgram);
     if (dafnyProgram.Reporter.HasErrors) {
@@ -43,6 +46,8 @@ public static bool TranslateForFutureInlining(Program dafnyProgram, DafnyOptions
     boogieProgram = MergeBoogiePrograms(boogiePrograms);
     // Finally, create bodies for the Call$$ procedures that call out to Impl$$ procedures
     boogieProgram = new AddImplementationsForCallsRewriter(options).VisitProgram(boogieProgram);
+    // Remove proof dependency ids because they lead to errors when attempting inlining
+    boogieProgram = new ProofDependencyIdRemover().VisitProgram(boogieProgram);
     return true;
   }
 
@@ -75,4 +80,24 @@ private static Microsoft.Boogie.Program MergeBoogiePrograms(IEnumerable<Microsof
     return program;
   }
 
+  private class ProofDependencyIdRemover : StandardVisitor {
+    public override Absy Visit(Absy node) {
+      if (node is ICarriesAttributes carriesAttributes) {
+        carriesAttributes.Attributes = RemoveIdAttribute(carriesAttributes.Attributes, "id");
+      }
+      return base.Visit(node);
+    }
+
+    private QKeyValue RemoveIdAttribute(QKeyValue attributes, string attributeName) {
+      if (attributes == null) {
+        return null;
+      }
+      if (attributes.Key == attributeName) {
+        return RemoveIdAttribute(attributes.Next, attributeName);
+      }
+      attributes.Next = RemoveIdAttribute(attributes.Next, attributeName);
+      return attributes;
+    }
+  }
+
 }
\ No newline at end of file
diff --git a/Source/DafnyTestGeneration/Inlining/RemoveShortCircuitRewriter.cs b/Source/DafnyTestGeneration/Inlining/RemoveShortCircuitRewriter.cs
index bf2576881d3..2d95cfa92b4 100644
--- a/Source/DafnyTestGeneration/Inlining/RemoveShortCircuitRewriter.cs
+++ b/Source/DafnyTestGeneration/Inlining/RemoveShortCircuitRewriter.cs
@@ -9,6 +9,7 @@
 using Microsoft.Dafny;
 using Function = Microsoft.Dafny.Function;
 using IdentifierExpr = Microsoft.Dafny.IdentifierExpr;
+using LambdaExpr = Microsoft.Boogie.LambdaExpr;
 using LetExpr = Microsoft.Dafny.LetExpr;
 using LiteralExpr = Microsoft.Dafny.LiteralExpr;
 using LocalVariable = Microsoft.Dafny.LocalVariable;
@@ -54,7 +55,7 @@ public void PreResolve(Program program) {
 
   private void Visit(TopLevelDecl d) {
     if (d is LiteralModuleDecl moduleDecl) {
-      moduleDecl.ModuleDef.TopLevelDecls.ForEach(Visit);
+      moduleDecl.ModuleDef.Children.OfType<TopLevelDecl>().ForEach(Visit);
     } else if (d is TopLevelDeclWithMembers withMembers) {
       withMembers.Members.Where(shouldProcessPredicate).OfType<Function>().ForEach(Visit);
       withMembers.Members.Where(shouldProcessPredicate).OfType<Method>().ForEach(Visit);
@@ -86,7 +87,7 @@ public override BlockStmt CloneBlockStmt(BlockStmt blockStatement) {
     foreach (var statement in blockStatement.Body) {
       newBody.AddRange(ProcessStmt(statement));
     }
-    return new BlockStmt(blockStatement.RangeToken, newBody);
+    return new BlockStmt(blockStatement.Origin, newBody);
   }
 
   public override DividedBlockStmt CloneDividedBlockStmt(DividedBlockStmt blockStatement) {
@@ -100,12 +101,12 @@ public override DividedBlockStmt CloneDividedBlockStmt(DividedBlockStmt blockSta
       var processed = ProcessStmt(statement);
       newBodyProper.AddRange(processed);
     }
-    return new DividedBlockStmt(blockStatement.RangeToken, newBodyInit, blockStatement.SeparatorTok, newBodyProper);
+    return new DividedBlockStmt(blockStatement.Origin, newBodyInit, blockStatement.SeparatorTok, newBodyProper);
   }
 
   private List<Statement> ProcessStmt(Statement statement) {
     newStmtStack.Add(new List<Statement>());
-    var newStatement = CloneStmt(statement);
+    var newStatement = CloneStmt(statement, false);
     var result = new List<Statement> { newStatement };
     if (newStmtStack.Last().Count == 0) {
       newStmtStack.RemoveAt(newStmtStack.Count - 1);
@@ -116,14 +117,14 @@ private List<Statement> ProcessStmt(Statement statement) {
     return result;
   }
 
-  public override Statement CloneStmt(Statement statement) {
+  public override Statement CloneStmt(Statement statement, bool isReference) {
     if (statement == null) {
       return null;
     }
     switch (statement) {
       case IfStmt ifStatement:
         return CloneIfStmt(ifStatement);
-      case UpdateStmt updateStatement:
+      case AssignStatement updateStatement:
         return CloneUpdateStmt(updateStatement);
       case ReturnStmt returnStatement:
         return CloneReturnStmt(returnStatement);
@@ -141,10 +142,10 @@ public override Statement CloneStmt(Statement statement) {
         return CloneForLoopStmt(forLoopStmt);
       case CallStmt callStmt:
         return CloneCallStmt(callStmt);
-      case PredicateStmt or ForallStmt or RevealStmt: // always ghost
+      case PredicateStmt or ForallStmt or HideRevealStmt: // always ghost?
         return statement;
       default:
-        return base.CloneStmt(statement);
+        return base.CloneStmt(statement, isReference);
     }
   }
 
@@ -198,11 +199,11 @@ private Statement CloneIfStmt(IfStmt ifStatement) {
     if (ifStatement.Els != null) {
       els = ProcessStmtToStmt(ifStatement.Els);
     }
-    return new IfStmt(ifStatement.RangeToken, ifStatement.IsBindingGuard, guard, thn, els, ifStatement.Attributes);
+    return new IfStmt(ifStatement.Origin, ifStatement.IsBindingGuard, guard, thn, els, ifStatement.Attributes);
   }
 
-  private Statement CloneUpdateStmt(UpdateStmt updateStatement) {
-    return new UpdateStmt(updateStatement.RangeToken, CloneExpressionList(updateStatement.Lhss), CloneRhss(updateStatement.Rhss, true));
+  private Statement CloneUpdateStmt(AssignStatement updateStatement) {
+    return new AssignStatement(updateStatement.Origin, CloneExpressionList(updateStatement.Lhss), CloneRhss(updateStatement.Rhss, true));
   }
 
   private Statement CloneAssignOrReturnStmt(AssignOrReturnStmt assignOrReturnStmt) {
@@ -214,16 +215,16 @@ private Statement CloneAssignOrReturnStmt(AssignOrReturnStmt assignOrReturnStmt)
       }
       rhs = new ExprRhs(noCircuits.expr, assignOrReturnStmt.Rhs.Attributes);
     }
-    return new AssignOrReturnStmt(assignOrReturnStmt.RangeToken, CloneExpressionList(assignOrReturnStmt.Lhss), rhs,
+    return new AssignOrReturnStmt(assignOrReturnStmt.Origin, CloneExpressionList(assignOrReturnStmt.Lhss), rhs,
       assignOrReturnStmt.KeywordToken, CloneRhss(assignOrReturnStmt.Rhss, true));
   }
 
   private Statement CloneReturnStmt(ReturnStmt returnStatement) {
-    return new ReturnStmt(returnStatement.RangeToken, CloneRhss(returnStatement.Rhss, false));
+    return new ReturnStmt(returnStatement.Origin, CloneRhss(returnStatement.Rhss, false));
   }
 
   private Statement CloneCallStmt(CallStmt callStmt) {
-    return new CallStmt(callStmt.RangeToken, CloneExpressionList(callStmt.Lhs), callStmt.MethodSelect, CloneExpressionList(callStmt.Args));
+    return new CallStmt(callStmt.Origin, CloneExpressionList(callStmt.Lhs), callStmt.MethodSelect, CloneExpressionList(callStmt.Args));
   }
 
   private Statement CloneNestedMatchStmt(NestedMatchStmt nestedMatchStatement) {
@@ -231,13 +232,13 @@ private Statement CloneNestedMatchStmt(NestedMatchStmt nestedMatchStatement) {
     newStmtStack.Last().AddRange(noCircuits.stmts);
     var newCases = new List<NestedMatchCaseStmt>();
     foreach (var nestedMatchCase in nestedMatchStatement.Cases) {
-      newCases.Add(new NestedMatchCaseStmt(nestedMatchCase.RangeToken, nestedMatchCase.Pat, ProcessStmtList(nestedMatchCase.Body)));
+      newCases.Add(new NestedMatchCaseStmt(nestedMatchCase.Origin, nestedMatchCase.Pat, ProcessStmtList(nestedMatchCase.Body)));
     }
-    return new NestedMatchStmt(nestedMatchStatement.RangeToken, noCircuits.expr, newCases, nestedMatchStatement.UsesOptionalBraces, nestedMatchStatement.Attributes);
+    return new NestedMatchStmt(nestedMatchStatement.Origin, noCircuits.expr, newCases, nestedMatchStatement.UsesOptionalBraces, nestedMatchStatement.Attributes);
   }
 
   private Statement ClonePrintStmt(PrintStmt printStatement) {
-    return new PrintStmt(printStatement.RangeToken, CloneExpressionList(printStatement.Args));
+    return new PrintStmt(printStatement.Origin, CloneExpressionList(printStatement.Args));
   }
 
   private Statement CloneWhileStmt(WhileStmt whileStmt) {
@@ -245,7 +246,7 @@ private Statement CloneWhileStmt(WhileStmt whileStmt) {
     newStmtStack.Last().AddRange(noCircuits.stmts);
     var newBody = CloneBlockStmt(whileStmt.Body);
     newBody.Body.AddRange(ProcessStmtList(noCircuits.stmts.Where(stmt => stmt is not VarDeclStmt).ToList()));
-    return new WhileStmt(whileStmt.RangeToken, noCircuits.expr, whileStmt.Invariants, whileStmt.Decreases, whileStmt.Mod, newBody);
+    return new WhileStmt(whileStmt.Origin, noCircuits.expr, whileStmt.Invariants, whileStmt.Decreases, whileStmt.Mod, newBody);
   }
 
   private Statement CloneForLoopStmt(ForLoopStmt forLoopStmt) {
@@ -254,7 +255,7 @@ private Statement CloneForLoopStmt(ForLoopStmt forLoopStmt) {
     var end = RemoveShortCircuit(forLoopStmt.End, false);
     newStmtStack.Last().AddRange(end.stmts);
     var newBody = CloneBlockStmt(forLoopStmt.Body);
-    return new ForLoopStmt(forLoopStmt.RangeToken, forLoopStmt.LoopIndex, start.expr, end.expr, forLoopStmt.GoingUp,
+    return new ForLoopStmt(forLoopStmt.Origin, forLoopStmt.LoopIndex, start.expr, end.expr, forLoopStmt.GoingUp,
       forLoopStmt.Invariants, forLoopStmt.Decreases, forLoopStmt.Mod, newBody, forLoopStmt.Attributes);
   }
 
@@ -263,7 +264,7 @@ private Statement ProcessStmtToStmt(Statement statement) {
     if (statements.Count == 1) {
       return statements[0];
     }
-    return new BlockStmt(statement.RangeToken, statements);
+    return new BlockStmt(statement.Origin, statements);
   }
 
   private List<Statement> ProcessStmtList(List<Statement> statements) {
@@ -305,24 +306,24 @@ private Expression CreateIf(string tmpVarName, Type typ, Expression initialExpr,
     var identifierExpr = new IdentifierExpr(original.StartToken, tmpVarName);
     typ ??= new InferredTypeProxy();
     var varDecl = new VarDeclStmt(
-        new RangeToken(original.StartToken, original.StartToken),
-        new List<LocalVariable> { new(new RangeToken(original.StartToken, original.StartToken), tmpVarName, typ, false) }, null);
+        new SourceOrigin(original.StartToken, original.StartToken),
+        new List<LocalVariable> { new(new SourceOrigin(original.StartToken, original.StartToken), tmpVarName, typ, false) }, null);
     newStmtStack.Last().Add(varDecl);
     if (initialExpr != null) {
-      var updateStmt = new UpdateStmt(new RangeToken(original.StartToken, original.StartToken), new List<Expression> { identifierExpr },
+      var updateStmt = new AssignStatement(new SourceOrigin(original.StartToken, original.StartToken), new List<Expression> { identifierExpr },
           new List<AssignmentRhs> { new ExprRhs(initialExpr) });
       newStmtStack.Last().Add(updateStmt);
     }
-    var thenStmt = new UpdateStmt(
-      new RangeToken(thenToken, thenToken),
+    var thenStmt = new AssignStatement(
+      thenToken,
       new List<Expression> { identifierExpr },
       new List<AssignmentRhs> { new ExprRhs(thenExpr) });
     var elseStmt = elseExpr != null
-      ? new UpdateStmt(new RangeToken(elseToken, elseToken), new List<Expression> { identifierExpr },
+      ? new AssignStatement(elseToken, new List<Expression> { identifierExpr },
         new List<AssignmentRhs> { new ExprRhs(elseExpr) })
       : null;
-    var ifStmt = new IfStmt(new RangeToken(original.StartToken, original.StartToken), false, testExpr,
-      new BlockStmt(thenStmt.RangeToken, new List<Statement> { thenStmt }), elseStmt);
+    var ifStmt = new IfStmt(original.StartToken, false, testExpr,
+      new BlockStmt(thenStmt.Origin, new List<Statement> { thenStmt }), elseStmt);
     newStmtStack.Last().Add(ifStmt);
     return identifierExpr;
   }
@@ -341,9 +342,9 @@ public override Expression CloneExpr(Expression expr) {
     var tmpVarName = GetNewLocalVariableName();
     var identifierExpr = new IdentifierExpr(expr.StartToken, tmpVarName);
     VarDeclStmt varDecl = new VarDeclStmt(
-      new RangeToken(expr.StartToken, expr.StartToken),
-      new List<LocalVariable> { new(new RangeToken(expr.StartToken, expr.StartToken), tmpVarName, new InferredTypeProxy(), false) }, null);
-    UpdateStmt updateStmt;
+      new SourceOrigin(expr.StartToken, expr.StartToken),
+      new List<LocalVariable> { new(new SourceOrigin(expr.StartToken, expr.StartToken), tmpVarName, new InferredTypeProxy(), false) }, null);
+    AssignStatement assignStatement;
     int i = 0;
 
     switch (expr) {
@@ -356,47 +357,47 @@ public override Expression CloneExpr(Expression expr) {
           new UnaryOpExpr(binaryExpr.E0.StartToken, UnaryOpExpr.Opcode.Not, identifierExpr), binaryExpr.E1, new IdentifierExpr(binaryExpr.E0.EndToken, tmpVarName), binaryExpr);
       case BinaryExpr { Op: BinaryExpr.Opcode.Imp } binaryExpr:
         return CreateIf(tmpVarName, Type.Bool, binaryExpr.E0, identifierExpr, binaryExpr.E1,
-          new LiteralExpr(binaryExpr.E0.EndToken, true), binaryExpr);
+          Expression.CreateBoolLiteral(binaryExpr.E0.EndToken, true), binaryExpr);
       case BinaryExpr { Op: BinaryExpr.Opcode.Exp } binaryExpr:
         return CreateIf(tmpVarName, Type.Bool, binaryExpr.E1, identifierExpr, binaryExpr.E0,
-          new LiteralExpr(binaryExpr.E1.EndToken, true), binaryExpr);
+          Expression.CreateBoolLiteral(binaryExpr.E1.EndToken, true), binaryExpr);
       case StmtExpr stmtExpr:
         newStmtStack.Last().Add(varDecl);
-        updateStmt = new UpdateStmt(stmtExpr.E.RangeToken, new List<Expression> { identifierExpr },
+        assignStatement = new AssignStatement(stmtExpr.E.Origin, new List<Expression> { identifierExpr },
           new List<AssignmentRhs> { new ExprRhs(stmtExpr.E) });
-        var stmtBlockUpdate = new BlockStmt(new RangeToken(stmtExpr.S.StartToken, stmtExpr.E.EndToken), new List<Statement>());
+        var stmtBlockUpdate = new BlockStmt(new SourceOrigin(stmtExpr.S.StartToken, stmtExpr.E.EndToken), new List<Statement>());
         stmtBlockUpdate.Body.Add(stmtExpr.S);
-        stmtBlockUpdate.Body.Add(updateStmt);
+        stmtBlockUpdate.Body.Add(assignStatement);
         newStmtStack.Last().Add(stmtBlockUpdate);
         return identifierExpr;
       case NestedMatchExpr matchExpr:
         newStmtStack.Last().Add(varDecl);
         var caseStmts = new List<NestedMatchCaseStmt>();
         foreach (var c in matchExpr.Cases) {
-          updateStmt = new UpdateStmt(new RangeToken(c.Body.StartToken, c.Body.StartToken), new List<Expression> { identifierExpr },
+          assignStatement = new AssignStatement(new SourceOrigin(c.Body.StartToken, c.Body.StartToken), new List<Expression> { identifierExpr },
             new List<AssignmentRhs> { new ExprRhs(c.Body) });
-          caseStmts.Add(new NestedMatchCaseStmt(new RangeToken(c.StartToken, c.StartToken), c.Pat, new List<Statement> { updateStmt }));
+          caseStmts.Add(new NestedMatchCaseStmt(new SourceOrigin(c.StartToken, c.StartToken), c.Pat, new List<Statement> { assignStatement }));
         }
-        var matchStmt = new NestedMatchStmt(matchExpr.RangeToken, matchExpr.Source, caseStmts, false, matchExpr.Attributes);
+        var matchStmt = new NestedMatchStmt(matchExpr.Origin, matchExpr.Source, caseStmts, false, matchExpr.Attributes);
         newStmtStack.Last().Add(matchStmt);
         return identifierExpr;
       case LetOrFailExpr { Lhs: not null } letOrFailExpr:
         newStmtStack.Last().Add(varDecl);
         var boundIdentifierExpr = new IdentifierExpr(letOrFailExpr.Rhs.StartToken, letOrFailExpr.Lhs.Var.Name);
-        var assignOrReturn = new AssignOrReturnStmt(letOrFailExpr.Rhs.RangeToken, new List<Expression> { boundIdentifierExpr }, new ExprRhs(letOrFailExpr.Rhs), null, new List<AssignmentRhs>());
+        var assignOrReturn = new AssignOrReturnStmt(letOrFailExpr.Rhs.Origin, new List<Expression> { boundIdentifierExpr }, new ExprRhs(letOrFailExpr.Rhs), null, new List<AssignmentRhs>());
         varDecl = new VarDeclStmt(
-          new RangeToken(letOrFailExpr.Lhs.Var.StartToken, letOrFailExpr.Rhs.EndToken),
-          new List<LocalVariable> { new(letOrFailExpr.Lhs.Var.RangeToken, letOrFailExpr.Lhs.Var.Name, new InferredTypeProxy(), false) }, assignOrReturn);
-        updateStmt = new UpdateStmt(letOrFailExpr.Body.RangeToken, new List<Expression> { identifierExpr },
+          new SourceOrigin(letOrFailExpr.Lhs.Var.StartToken, letOrFailExpr.Rhs.EndToken),
+          new List<LocalVariable> { new(letOrFailExpr.Lhs.Var.Origin, letOrFailExpr.Lhs.Var.Name, new InferredTypeProxy(), false) }, assignOrReturn);
+        assignStatement = new AssignStatement(letOrFailExpr.Body.Origin, new List<Expression> { identifierExpr },
           new List<AssignmentRhs> { new ExprRhs(letOrFailExpr.Body) });
-        newStmtStack.Last().Add(new BlockStmt(letOrFailExpr.RangeToken, new List<Statement> { varDecl, updateStmt }));
+        newStmtStack.Last().Add(new BlockStmt(letOrFailExpr.Origin, new List<Statement> { varDecl, assignStatement }));
         return identifierExpr;
       case LetOrFailExpr letOrFailExpr:
         newStmtStack.Last().Add(varDecl);
-        var assignOrReturnNoLhs = new AssignOrReturnStmt(letOrFailExpr.Rhs.RangeToken, new List<Expression>(), new ExprRhs(letOrFailExpr.Rhs), null, new List<AssignmentRhs>());
-        updateStmt = new UpdateStmt(letOrFailExpr.Body.RangeToken, new List<Expression> { identifierExpr },
+        var assignOrReturnNoLhs = new AssignOrReturnStmt(letOrFailExpr.Rhs.Origin, new List<Expression>(), new ExprRhs(letOrFailExpr.Rhs), null, new List<AssignmentRhs>());
+        assignStatement = new AssignStatement(letOrFailExpr.Body.Origin, new List<Expression> { identifierExpr },
           new List<AssignmentRhs> { new ExprRhs(letOrFailExpr.Body) });
-        newStmtStack.Last().Add(new BlockStmt(letOrFailExpr.RangeToken, new List<Statement> { assignOrReturnNoLhs, updateStmt }));
+        newStmtStack.Last().Add(new BlockStmt(letOrFailExpr.Origin, new List<Statement> { assignOrReturnNoLhs, assignStatement }));
         return identifierExpr;
       case LetExpr letExpr:
         if (letExpr.Exact == false || letExpr.BoundVars.Count() != letExpr.RHSs.Count) {
@@ -404,35 +405,38 @@ public override Expression CloneExpr(Expression expr) {
         }
         newStmtStack.Last().Add(varDecl);
         i = 0;
-        var blockUpdate = new BlockStmt(letExpr.RangeToken, new List<Statement>());
+        var blockUpdate = new BlockStmt(letExpr.Origin, new List<Statement>());
         foreach (var boundVar in letExpr.BoundVars) {
           identifierExpr = new IdentifierExpr(letExpr.RHSs[i].StartToken, boundVar.Name);
-          updateStmt = new UpdateStmt(letExpr.RHSs[i].RangeToken, new List<Expression> { identifierExpr },
+          assignStatement = new AssignStatement(letExpr.RHSs[i].Origin, new List<Expression> { identifierExpr },
               new List<AssignmentRhs> { new ExprRhs(letExpr.RHSs[i]) });
           varDecl = new VarDeclStmt(
-            new RangeToken(boundVar.StartToken, letExpr.RHSs[i].EndToken),
-            new List<LocalVariable> { new(boundVar.RangeToken, boundVar.Name, new InferredTypeProxy(), false) }, updateStmt);
+            new SourceOrigin(boundVar.StartToken, letExpr.RHSs[i].EndToken),
+            new List<LocalVariable> { new(boundVar.Origin, boundVar.Name, new InferredTypeProxy(), false) }, assignStatement);
           blockUpdate.Body.Add(varDecl);
           i += 1;
         }
         identifierExpr = new IdentifierExpr(letExpr.Body.StartToken, tmpVarName);
-        updateStmt = new UpdateStmt(letExpr.Body.RangeToken, new List<Expression> { identifierExpr },
+        assignStatement = new AssignStatement(letExpr.Body.Origin, new List<Expression> { identifierExpr },
           new List<AssignmentRhs> { new ExprRhs(letExpr.Body) });
-        blockUpdate.Body.Add(updateStmt);
+        blockUpdate.Body.Add(assignStatement);
         newStmtStack.Last().Add(blockUpdate);
         return identifierExpr;
       case ApplySuffix applySuffix:
         if (wasProcessingRhs) {
           break;
         }
-        updateStmt = new UpdateStmt(applySuffix.RangeToken, new List<Expression> { identifierExpr },
+        assignStatement = new AssignStatement(applySuffix.Origin, new List<Expression> { identifierExpr },
           new List<AssignmentRhs> { new ExprRhs(applySuffix) });
         newStmtStack.Last().Add(varDecl);
-        newStmtStack.Last().Add(updateStmt);
+        newStmtStack.Last().Add(assignStatement);
         return identifierExpr;
     }
     nextVariableId--; // the new variable was not used in the end
     foundShortCircuit = false;
+    if (expr is SetComprehension or Microsoft.Dafny.LambdaExpr) {
+      return expr;
+    }
     return base.CloneExpr(expr);
   }
 
diff --git a/Source/DafnyTestGeneration/Inlining/SeparateByMethodRewriter.cs b/Source/DafnyTestGeneration/Inlining/SeparateByMethodRewriter.cs
index bcbbf63ad93..5b96e19942e 100644
--- a/Source/DafnyTestGeneration/Inlining/SeparateByMethodRewriter.cs
+++ b/Source/DafnyTestGeneration/Inlining/SeparateByMethodRewriter.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 #nullable disable
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Boogie;
@@ -18,12 +17,9 @@ namespace DafnyTestGeneration.Inlining;
 public class SeparateByMethodRewriter : IRewriter {
 
   private readonly List<Method> methodsToAdd = new();
-  // determines whether the given function-by-method should be split into a function and a method
-  private readonly Func<MemberDecl, bool> shouldProcessPredicate;
 
-  protected internal SeparateByMethodRewriter(ErrorReporter reporter, Func<MemberDecl, bool> shouldProcessPredicate) :
+  protected internal SeparateByMethodRewriter(ErrorReporter reporter) :
     base(reporter) {
-    this.shouldProcessPredicate = shouldProcessPredicate;
   }
 
   internal void PostResolve(Program program) {
@@ -32,10 +28,10 @@ internal void PostResolve(Program program) {
 
   private void SeparateByMethod(TopLevelDecl d) {
     if (d is LiteralModuleDecl moduleDecl) {
-      moduleDecl.ModuleDef.TopLevelDecls.ForEach(SeparateByMethod);
+      moduleDecl.ModuleDef.Children.OfType<TopLevelDecl>().ForEach(SeparateByMethod);
     } else if (d is TopLevelDeclWithMembers withMembers) {
       methodsToAdd.Clear();
-      withMembers.Members.Where(shouldProcessPredicate).OfType<Function>().ForEach(SeparateByMethod);
+      withMembers.Members.OfType<Function>().ForEach(SeparateByMethod);
       withMembers.Members.AddRange(methodsToAdd);
     }
   }
diff --git a/Source/DafnyTestGeneration/Main.cs b/Source/DafnyTestGeneration/Main.cs
deleted file mode 100644
index 129c54cc1ca..00000000000
--- a/Source/DafnyTestGeneration/Main.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright by the contributors to the Dafny Project
-// SPDX-License-Identifier: MIT
-
-#nullable disable
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Microsoft.Dafny;
-using Program = Microsoft.Dafny.Program;
-
-namespace DafnyTestGeneration {
-
-  public static class Main {
-
-    public static bool SetNonZeroExitCode = false;
-
-    /// <summary>
-    /// This method returns each capturedState that is unreachable, one by one,
-    /// and then a line with the summary of how many such states there are, etc.
-    /// Note that loop unrolling may cause false positives and the absence of
-    /// loop unrolling may cause false negatives.
-    /// </summary>
-    /// <returns></returns>
-    public static async IAsyncEnumerable<string> GetDeadCodeStatistics(Program program, Modifications cache) {
-
-      program.Reporter.Options.PrintMode = PrintModes.Everything;
-
-      var blocksReached = 0;
-      HashSet<string> allStates = new();
-      HashSet<string> allDeadStates = new();
-
-      // Generate tests based on counterexamples produced from modifications
-      foreach (var modification in GetModifications(cache, program, out _)) {
-        blocksReached++;
-        await modification.GetCounterExampleLog(cache);
-        var deadStates = new HashSet<string>();
-        if (!modification.IsCovered(cache)) {
-          deadStates = modification.CapturedStates;
-        }
-
-        if (deadStates.Count != 0) {
-          foreach (var capturedState in deadStates) {
-            yield return $"Code at {capturedState} is potentially unreachable.";
-          }
-          blocksReached--;
-          allDeadStates.UnionWith(deadStates);
-        }
-
-        foreach (var state in modification.CapturedStates) {
-          if (!allStates.Contains(state)) {
-            yield return $"Code at {state} is reachable.";
-            allStates.Add(state);
-          }
-        }
-      }
-
-      yield return $"Out of {blocksReached} basic blocks " +
-                   $"({allStates.Count} capturedStates), {blocksReached} " +
-                   $"({allStates.Count - allDeadStates.Count}) are reachable. " +
-                   "There might be false negatives if you are not unrolling " +
-                   "loops. False positives are always possible.";
-    }
-
-    public static async IAsyncEnumerable<string> GetDeadCodeStatistics(string sourceFile, DafnyOptions options, CoverageReport report) {
-      options.PrintMode = PrintModes.Everything;
-      var source = await new StreamReader(sourceFile).ReadToEndAsync();
-      var program = Utils.Parse(options, source, false, new Uri(sourceFile));
-      if (program == null) {
-        yield return "Cannot parse program";
-        yield break;
-      }
-      if (Utils.ProgramHasAttribute(program,
-            TestGenerationOptions.TestInlineAttribute)) {
-        options.VerifyAllModules = true;
-      }
-      var cache = new Modifications(program.Options);
-      await foreach (var line in GetDeadCodeStatistics(program, cache)) {
-        yield return line;
-      }
-      PopulateCoverageReport(report, program, cache);
-    }
-
-    private static IEnumerable<ProgramModification> GetModifications(Modifications cache, Program program, out DafnyInfo dafnyInfo) {
-      var options = program.Options;
-      var success = Inlining.InliningTranslator.TranslateForFutureInlining(program, options, out var boogieProgram);
-      dafnyInfo = null;
-      if (!success) {
-        options.Printer.ErrorWriteLine(options.ErrorWriter,
-          $"Error: Failed at resolving or translating the inlined Dafny code.");
-        SetNonZeroExitCode = true;
-        return new List<ProgramModification>();
-      }
-      dafnyInfo = new DafnyInfo(program);
-      SetNonZeroExitCode = dafnyInfo.SetNonZeroExitCode || SetNonZeroExitCode;
-      if (!Utils.ProgramHasAttribute(program,
-            TestGenerationOptions.TestEntryAttribute)) {
-        options.Printer.ErrorWriteLine(options.ErrorWriter,
-          $"Error: Found no methods or functions annotated with {TestGenerationOptions.TestEntryAttribute}. " +
-          $"Please annotate all entry points for testing with this attribute.");
-        SetNonZeroExitCode = true;
-        return new List<ProgramModification>();
-      }
-      // Create modifications of the program with assertions for each block\path
-      ProgramModifier programModifier =
-        options.TestGenOptions.Mode == TestGenerationOptions.Modes.Path
-          ? new PathBasedModifier(cache)
-          : new BlockBasedModifier(cache);
-      return programModifier.GetModifications(boogieProgram, dafnyInfo);
-    }
-
-    private static void PopulateCoverageReport(CoverageReport coverageReport, Program program, Modifications cache) {
-      coverageReport.RegisterFiles(program);
-      var lineRegex = new Regex("^(.*)\\(([0-9]+),[0-9]+\\)");
-      HashSet<string> coveredStates = new(); // set of program states that are expected to be covered by tests
-      foreach (var modification in cache.Values) {
-        foreach (var state in modification.CapturedStates) {
-          if (modification.CounterexampleStatus == ProgramModification.Status.Success) {
-            coveredStates.Add(state);
-          }
-        }
-      }
-      foreach (var modification in cache.Values) {
-        foreach (var state in modification.CapturedStates) {
-          var match = lineRegex.Match(state);
-          if (!match.Success) {
-            continue;
-          }
-          if (!int.TryParse(match.Groups[2].Value, out var lineNumber) || lineNumber == 0) {
-            continue;
-          }
-          lineNumber -= 1; // to zero-based
-          Uri uri;
-          try {
-            uri = new Uri(
-              Path.IsPathRooted(match.Groups[1].Value)
-                ? match.Groups[1].Value
-                : Path.Combine(Directory.GetCurrentDirectory(), match.Groups[1].Value));
-          } catch (ArgumentException) {
-            continue;
-          }
-          var rangeToken = new RangeToken(new Token(lineNumber, 0), new Token(lineNumber + 1, 0));
-          rangeToken.Uri = uri;
-          coverageReport.LabelCode(rangeToken,
-            coveredStates.Contains(state)
-              ? CoverageLabel.FullyCovered
-              : CoverageLabel.NotCovered);
-        }
-      }
-    }
-
-    /// <summary>
-    /// Generate test methods for a certain Dafny program.
-    /// </summary>
-    /// <returns></returns>
-    public static async IAsyncEnumerable<TestMethod> GetTestMethodsForProgram(Program program, Modifications cache = null) {
-
-      var options = program.Options;
-      options.PrintMode = PrintModes.Everything;
-      // Generate tests based on counterexamples produced from modifications
-
-      cache ??= new Modifications(options);
-      foreach (var modification in GetModifications(cache, program, out var dafnyInfo)) {
-
-        var log = await modification.GetCounterExampleLog(cache);
-        if (log == null) {
-          continue;
-        }
-
-        var testMethod = await modification.GetTestMethod(cache, dafnyInfo);
-        if (testMethod == null) {
-          continue;
-        }
-
-        yield return testMethod;
-      }
-    }
-
-    /// <summary>
-    /// Return a Dafny class (list of lines) with tests for the given Dafny file
-    /// </summary>
-    public static async IAsyncEnumerable<string> GetTestClassForProgram(string sourceFile, DafnyOptions options, CoverageReport report) {
-      options.PrintMode = PrintModes.Everything;
-      TestMethod.ClearTypesToSynthesize();
-      var source = await new StreamReader(sourceFile).ReadToEndAsync();
-      var uri = new Uri(sourceFile);
-      var program = Utils.Parse(options, source, true, uri);
-      if (program == null) {
-        yield break;
-      }
-      if (Utils.ProgramHasAttribute(program,
-            TestGenerationOptions.TestInlineAttribute)) {
-        options.VerifyAllModules = true;
-      }
-      // Suppressing error messages which will be printed when dafnyInfo is initialized again in GetModifications
-      var dafnyInfo = new DafnyInfo(program, true);
-      program = Utils.Parse(options, source, false, uri);
-      SetNonZeroExitCode = dafnyInfo.SetNonZeroExitCode || SetNonZeroExitCode;
-      var rawName = Regex.Replace(sourceFile, "[^a-zA-Z0-9_]", "");
-
-      string EscapeDafnyStringLiteral(string str) {
-        return $"\"{str.Replace(@"\", @"\\")}\"";
-      }
-
-      yield return $"include {EscapeDafnyStringLiteral(sourceFile)}";
-      yield return $"module {rawName}UnitTests {{";
-      foreach (var module in dafnyInfo.ToImportAs.Keys) {
-        if (module.Split(".").Last() == dafnyInfo.ToImportAs[module]) {
-          yield return $"import {module}";
-        } else {
-          yield return $"import {dafnyInfo.ToImportAs[module]} = {module}";
-        }
-      }
-
-      var cache = new Modifications(options);
-      var methodsGenerated = 0;
-      await foreach (var method in GetTestMethodsForProgram(program, cache)) {
-        yield return method.ToString();
-        methodsGenerated++;
-      }
-
-      yield return TestMethod.EmitSynthesizeMethods(dafnyInfo);
-      yield return "}";
-
-      PopulateCoverageReport(report, program, cache);
-
-      if (methodsGenerated == 0) {
-        options.Printer.ErrorWriteLine(options.ErrorWriter,
-          "Error: No tests were generated, because no code points could be " +
-          "proven reachable (do you have a false assumption in the program?)");
-        SetNonZeroExitCode = true;
-      }
-    }
-  }
-}
diff --git a/Source/DafnyTestGeneration/PathBasedModifier.cs b/Source/DafnyTestGeneration/PathBasedModifier.cs
index 7c177e54a97..d3fa0881826 100644
--- a/Source/DafnyTestGeneration/PathBasedModifier.cs
+++ b/Source/DafnyTestGeneration/PathBasedModifier.cs
@@ -26,14 +26,15 @@ public class PathBasedModifier : ProgramModifier {
     private const string BlockVarNamePrefix = "block";
     // Dafny will try to generate tests for paths through the program of increasingly greater length,
     // PathLengthStep determines the increments by which Dafny should increase maximum path length in-between attempts
-    private const int PathLengthStep = 5;
+    private const int PathLengthStep = 20;
 
     public PathBasedModifier(Modifications modifications) {
       this.modifications = modifications;
     }
 
     protected override IEnumerable<ProgramModification> GetModifications(Program p) {
-      foreach (var implementation in p.Implementations) {
+      var implementations = p.Implementations.ToList();
+      foreach (var implementation in implementations) {
         if (!ImplementationIsToBeTested(implementation) ||
             !DafnyInfo.IsAccessible(implementation.VerboseName.Split(" ")[0])) {
           continue;
@@ -42,10 +43,12 @@ protected override IEnumerable<ProgramModification> GetModifications(Program p)
         int pathLength = PathLengthStep;
         bool newPathsFound = true;
         // Consider paths of increasing length, pruning out infeasible sub-paths in the process:
+        var blockToVariable = InitBlockVars(implementation);
+        var firstBlock = implementation.Blocks[0]; // 
         while (newPathsFound) {
           List<Path> pathsToConsider = new(); // paths without known unfeasible subpaths
           var totalPaths = 0;
-          foreach (var path in GeneratePaths(implementation, pathLength - PathLengthStep, pathLength)) {
+          foreach (var path in GeneratePaths(implementation, pathLength - PathLengthStep, pathLength, blockToVariable, firstBlock)) {
             totalPaths++;
             var pathId = path.ToString(DafnyInfo.Options);
             if (pathLength <= PathLengthStep || !modifications.Values.Any(modification =>
@@ -65,7 +68,8 @@ protected override IEnumerable<ProgramModification> GetModifications(Program p)
             var testEntryNames = Utils.DeclarationHasAttribute(path.Impl, TestGenerationOptions.TestInlineAttribute)
               ? TestEntries
               : new() { path.Impl.VerboseName };
-            yield return modifications.GetProgramModification(p, path.Impl, new HashSet<string>(), testEntryNames,
+            var programCopy = Utils.DeepCloneResolvedProgram(p, DafnyInfo.Options);
+            yield return modifications.GetProgramModification(programCopy, path.Impl, new HashSet<string>(), testEntryNames,
               path.ToString(DafnyInfo.Options));
             path.NoAssertPath();
           }
@@ -85,12 +89,12 @@ private static Dictionary<Block, Variable> InitBlockVars(Implementation node) {
         // variable declaration:
         var variable = GetNewLocalVariable(node, Type.Bool, varName);
         // set variable to false when visiting a block
-        block.cmds.Insert(0, new AssignCmd(new Token(),
+        block.Cmds.Insert(0, new AssignCmd(new Token(),
           new List<AssignLhs>() { new SimpleAssignLhs(new Token(), new IdentifierExpr(new Token(), variable)) },
           new List<Expr>() { new LiteralExpr(new Token(), false) }));
         blockToVariable[block] = variable;
         // initialization:
-        node.Blocks[0].cmds.Insert(0, new AssignCmd(new Token(),
+        node.Blocks[0].Cmds.Insert(0, new AssignCmd(new Token(),
           new List<AssignLhs>() { new SimpleAssignLhs(new Token(), new IdentifierExpr(new Token(), variable)) },
           new List<Expr>() { new LiteralExpr(new Token(), true) }));
       }
@@ -100,26 +104,25 @@ private static Dictionary<Block, Variable> InitBlockVars(Implementation node) {
     /// <summary>
     /// Iterate over paths through an implementation in a depth-first search fashion
     /// </summary>
-    private IEnumerable<Path> GeneratePaths(Implementation impl, int minPathLength, int maxPathLength) {
+    private IEnumerable<Path> GeneratePaths(Implementation impl, int minPathLength, int maxPathLength, Dictionary<Block, Variable> blockToVariable, Block firstBlock) {
       List<Block> currPath = new(); // list of basic blocks along the current path
       // remember alternative paths that could have been taken at every goto: 
       List<List<Block>> otherGotos = new() { new() };
       // set of boolean variables indicating that blocks in currPath list have been visited:
       HashSet<Variable> currPathVariables = new();
-      var blockToVariable = InitBlockVars(impl);
-      var block = impl.Blocks[0];
+      var block = firstBlock;
       while (block != null) {
         if ((block.TransferCmd is ReturnCmd && currPath.Count >= minPathLength) || currPath.Count == maxPathLength - 1) {
           yield return new Path(impl, currPathVariables.ToList(), new() { block },
             currPath.Append(block).ToList());
         } else {
-          if (currPath.Count != 0 && ((GotoCmd)currPath.Last().TransferCmd).labelTargets.Count != 1) {
+          if (currPath.Count != 0 && ((GotoCmd)currPath.Last().TransferCmd).LabelTargets.Count != 1) {
             currPathVariables.Add(blockToVariable[block]); // only constrain the path if there is more than one goto
           }
           currPath.Add(block);
           otherGotos.Add(new List<Block>());
           var gotoCmd = block.TransferCmd as GotoCmd;
-          foreach (var nextBlock in gotoCmd?.labelTargets ?? new List<Block>()) {
+          foreach (var nextBlock in gotoCmd?.LabelTargets ?? new List<Block>()) {
             if (currPathVariables.Contains(blockToVariable[nextBlock])) { // this prevents cycles
               continue;
             }
@@ -189,7 +192,7 @@ private Expr ConstructDisjunction(List<Expr> clauses) {
       internal void AssertPath() {
         foreach (var returnBlock in returnBlocks) {
           if (path.Count == 0) {
-            returnBlock.cmds.Add(new AssertCmd(new Token(), new LiteralExpr(new Token(), false)));
+            returnBlock.Cmds.Add(new AssertCmd(new Token(), new LiteralExpr(new Token(), false)));
             return;
           }
         }
@@ -198,13 +201,13 @@ internal void AssertPath() {
           ConstructDisjunction(path.Select(variable => new IdentifierExpr(new Token(), variable) as Expr).ToList());
 
         foreach (var returnBlock in returnBlocks) {
-          returnBlock.cmds.Add(new AssertCmd(new Token(), condition));
+          returnBlock.Cmds.Add(new AssertCmd(new Token(), condition));
         }
       }
 
       internal void NoAssertPath() {
         foreach (var returnBlock in returnBlocks) {
-          returnBlock.cmds.RemoveAt(returnBlock.cmds.Count - 1);
+          returnBlock.Cmds.RemoveAt(returnBlock.Cmds.Count - 1);
         }
       }
     }
diff --git a/Source/DafnyTestGeneration/ProgramModification.cs b/Source/DafnyTestGeneration/ProgramModification.cs
index ce26f60f5ea..5bceb6ea98f 100644
--- a/Source/DafnyTestGeneration/ProgramModification.cs
+++ b/Source/DafnyTestGeneration/ProgramModification.cs
@@ -16,6 +16,10 @@
 namespace DafnyTestGeneration {
   public class Modifications {
     private readonly DafnyOptions options;
+    internal HashSet<int> preprocessedPrograms = new();
+    // List of all types for which a {:synthesize} - annotated method is needed
+    // These methods are used to get fresh instances of the corresponding types
+    internal readonly List<UserDefinedType> TypesToSynthesize = new();
     public Modifications(DafnyOptions options) {
       this.options = options;
     }
@@ -31,32 +35,14 @@ public ProgramModification GetProgramModification(Program program,
       return idToModification[uniqueId];
     }
 
-    public ProgramModification GetProgramModification(string uniqueId) {
-      if (!idToModification.ContainsKey(uniqueId)) {
-        return null;
-      }
-      return idToModification[uniqueId];
-    }
-
     public IEnumerable<ProgramModification> Values => idToModification.Values;
 
-    public int NumberOfBlocksCovered(Implementation implementation, bool onlyIfTestsExists = false) {
-      return NumberOfBlocksCovered(implementation.Blocks
-        .Where(block => Utils.GetBlockId(block, options) != null)
-        .Select(block => Utils.GetBlockId(block, options)).ToHashSet(), onlyIfTestsExists);
-    }
-
     public int NumberOfBlocksCovered(HashSet<string> blockIds, bool onlyIfTestsExists = false) {
       var relevantModifications = Values.Where(modification =>
         modification.CounterexampleStatus == ProgramModification.Status.Success && (!onlyIfTestsExists || (modification.TestMethod != null && modification.TestMethod.IsValid)));
       return blockIds.Count(blockId =>
         relevantModifications.Any(mod => mod.CapturedStates.Contains(blockId)));
     }
-
-    internal int ModificationsWithStatus(Implementation implementation, ProgramModification.Status status) =>
-      Values.Where(modification =>
-          modification.Implementation == implementation)
-        .Count(mod => mod.CounterexampleStatus == status);
   }
 
   /// <summary>
@@ -86,7 +72,7 @@ public ProgramModification(DafnyOptions options, Program program, Implementation
       Options = options;
       Implementation = impl;
       CounterexampleStatus = Status.Untested;
-      this.program = Utils.DeepCloneProgram(options, program);
+      this.program = program;
       this.testEntryNames = testEntryNames;
       CapturedStates = capturedStates;
       this.uniqueId = uniqueId;
@@ -98,31 +84,13 @@ public ProgramModification(DafnyOptions options, Program program, Implementation
     /// Setup DafnyOptions to prepare for counterexample extraction
     /// </summary>
     private static void SetupForCounterexamples(DafnyOptions options) {
-      // Figure out the Z3 version in use:
-      var proverOptions = new SMTLibSolverOptions(options);
-      proverOptions.Parse(options.ProverOptions);
-      var z3Version = DafnyOptions.GetZ3Version(proverOptions.ProverPath);
-      // Based on Z3 version, determine the options to use:
-      var optionsToAdd = new List<string>() {
-        "O:model_evaluator.completion=true",
-        "O:model.completion=true"
-      };
-      if (z3Version is null || z3Version < new Version(4, 8, 6)) {
-        optionsToAdd.Add("O:model_compress=false");
-      } else {
-        optionsToAdd.Add("O:model.compact=false");
-      }
-      // (Re)set the options necessary for counterexample extraction:
-      foreach (var option in optionsToAdd) {
-        options.ProverOptions.RemoveAll(o => o.Split("=") == option.Split("="));
-        options.ProverOptions.Add(option);
-      }
       options.NormalizeNames = false;
       options.EmitDebugInformation = true;
       options.ErrorTrace = 1;
       options.EnhancedErrorMessages = 1;
       options.ModelViewFile = "-";
       options.Prune = options.TestGenOptions.ForcePrune;
+      options.PruneInfeasibleEdges = false;  // because same implementation object is reused to generate multiple tests
     }
 
     /// <summary>
@@ -135,13 +103,16 @@ private static void SetupForCounterexamples(DafnyOptions options) {
           (CapturedStates.Count != 0 && IsCovered(cache))) {
         return counterexampleLog;
       }
-      var options = GenerateTestsCommand.CopyForProcedure(Options, testEntryNames);
+      var options = CopyForProcedure(Options, testEntryNames);
       SetupForCounterexamples(options);
       var writer = new StringWriter();
+      if (cache.preprocessedPrograms.Contains(program.UniqueId)) {
+        options.UseAbstractInterpretation = false; // running abs. inter. twice on the same program leads to errors
+      } else {
+        cache.preprocessedPrograms.Add(program.UniqueId);
+      }
       using (var engine = ExecutionEngine.CreateWithoutSharedCache(options)) {
         var guid = Guid.NewGuid().ToString();
-        program.Resolve(options);
-        program.Typecheck(options);
         var result = await Task.WhenAny(engine.InferAndVerify(writer, program,
             new PipelineStatistics(), null,
             _ => { }, guid),
@@ -206,6 +177,19 @@ await options.OutputWriter.WriteLineAsync(
       return counterexampleLog;
     }
 
+    /// <summary>
+    /// Return a copy of the given DafnyOption instance that (for the purposes
+    /// of test generation) is identical to the <param name="options"></param>
+    /// parameter in everything except the value of the ProcsToCheck field that
+    /// determines the procedures to be verified and should be set to the value of
+    /// the <param name="proceduresToVerify"></param> parameter.
+    /// </summary>
+    internal static DafnyOptions CopyForProcedure(DafnyOptions options, HashSet<string> proceduresToVerify) {
+      var copy = new DafnyOptions(options);
+      copy.ProcsToCheck = proceduresToVerify.ToList();
+      return copy;
+    }
+
     public async Task<TestMethod> GetTestMethod(Modifications cache, DafnyInfo dafnyInfo, bool returnNullIfNotUnique = true) {
       if (Options.Verbose) {
         await dafnyInfo.Options.OutputWriter.WriteLineAsync(
@@ -215,7 +199,7 @@ await dafnyInfo.Options.OutputWriter.WriteLineAsync(
       if (log == null) {
         return null;
       }
-      TestMethod = new TestMethod(dafnyInfo, log);
+      TestMethod = new TestMethod(dafnyInfo, log, cache);
       if (!TestMethod.IsValid || !returnNullIfNotUnique) {
         return TestMethod;
       }
diff --git a/Source/DafnyTestGeneration/ProgramModifier.cs b/Source/DafnyTestGeneration/ProgramModifier.cs
index e430bc89586..1d1eeddbe91 100644
--- a/Source/DafnyTestGeneration/ProgramModifier.cs
+++ b/Source/DafnyTestGeneration/ProgramModifier.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Microsoft.BaseTypes;
 using Microsoft.Boogie;
 using Microsoft.Dafny;
 using Token = Microsoft.Dafny.Token;
@@ -38,7 +39,8 @@ public IEnumerable<ProgramModification> GetModifications(
       var options = dafnyInfo.Options;
       BlockCoalescer.CoalesceBlocks(program);
       foreach (var implementation in program.Implementations.Where(i => Utils.DeclarationHasAttribute(i, TestGenerationOptions.TestInlineAttribute))) {
-        var depthExpression = Utils.GetAttributeValue(implementation, TestGenerationOptions.TestInlineAttribute).First();
+        var depthExpression = Utils.GetAttributeValue(implementation, TestGenerationOptions.TestInlineAttribute)
+          .FirstOrDefault(new LiteralExpr(Microsoft.Boogie.Token.NoToken, BigNum.ONE));
         var attribute = new QKeyValue(new Token(), "inline",
           new List<object>() { depthExpression }, null);
         attribute.Next = implementation.Attributes;
@@ -57,9 +59,10 @@ public IEnumerable<ProgramModification> GetModifications(
       }
       program.RemoveTopLevelDeclarations(declaration => declaration is Implementation or Procedure && Utils.DeclarationHasAttribute(declaration, "inline"));
       program = new RemoveChecks(options).VisitProgram(program);
-      if (options.TestGenOptions.Mode is TestGenerationOptions.Modes.CallGraph) {
+      if (options.TestGenOptions.Mode is TestGenerationOptions.Modes.InlinedBlock) {
         program = new AnnotationVisitor(options).VisitProgram(program);
       }
+      program = Utils.DeepCloneResolvedProgram(program, options); // need to make sure the program is resolved and typed
       TestEntries = program.Implementations
         .Where(implementation =>
           Utils.DeclarationHasAttribute(implementation, TestGenerationOptions.TestEntryAttribute) &&
@@ -84,8 +87,8 @@ private static void AddAxioms(DafnyOptions options, Program program) {
       if (options.TestGenOptions.SeqLengthLimit == 0) {
         return;
       }
-      var limit = options.TestGenOptions.SeqLengthLimit;
-      Parser.Parse($"axiom (forall<T> y: Seq T :: " +
+      var limit = (uint)options.TestGenOptions.SeqLengthLimit;
+      Parser.Parse($"axiom (forall y: Seq :: " +
                    $"{{ Seq#Length(y) }} Seq#Length(y) <= {limit});",
         "", out var tmpProgram);
       program.AddTopLevelDeclaration(
@@ -147,17 +150,15 @@ public AnnotationVisitor(DafnyOptions options) {
       }
 
       public override Block VisitBlock(Block node) {
-        var state = Utils.GetBlockId(node, options);
-        if (state == null) { // cannot map back to Dafny source location
-          return base.VisitBlock(node);
-        }
-        var data = new List<object>
-          { "Block", implementation.Name, state };
-        int afterPartition = node.cmds.FindIndex(cmd =>
+        int afterPartition = node.Cmds.FindIndex(cmd =>
           cmd is not AssumeCmd assumeCmd || assumeCmd.Attributes == null || assumeCmd.Attributes.Key != "partition");
         afterPartition = afterPartition > -1 ? afterPartition : 0;
-        node.cmds.Insert(afterPartition, GetAssumePrintCmd(data));
-        return node;
+        foreach (var state in Utils.AllBlockIds(node, options)) {
+          var data = new List<object>
+            { "Block", implementation.Name, state };
+          node.Cmds.Insert(afterPartition, GetAssumePrintCmd(data));
+        }
+        return base.VisitBlock(node);
       }
 
       public override Implementation VisitImplementation(Implementation node) {
@@ -166,12 +167,12 @@ public override Implementation VisitImplementation(Implementation node) {
         var data = new List<object> { "Types" };
         data.AddRange(node.InParams.Select(var =>
           var.TypedIdent.Type.ToString()));
-        node.Blocks[0].cmds.Insert(0, GetAssumePrintCmd(data));
+        node.Blocks[0].Cmds.Insert(0, GetAssumePrintCmd(data));
 
         // record parameter values:
         data = new List<object> { "Impl", node.VerboseName.Split(" ")[0] };
         data.AddRange(node.InParams.Select(var => new IdentifierExpr(new Token(), var)));
-        node.Blocks[0].cmds.Insert(0, GetAssumePrintCmd(data));
+        node.Blocks[0].Cmds.Insert(0, GetAssumePrintCmd(data));
         if (Utils.DeclarationHasAttribute(node, TestGenerationOptions.TestEntryAttribute) || Utils.DeclarationHasAttribute(node, TestGenerationOptions.TestInlineAttribute)) {
           VisitBlockList(node.Blocks);
         }
@@ -196,11 +197,11 @@ public RemoveChecks(DafnyOptions options) {
       }
 
       public override Block VisitBlock(Block node) {
-        var toRemove = node.cmds.OfType<AssertCmd>().ToList();
+        var toRemove = node.Cmds.OfType<AssertCmd>().ToList();
         foreach (var cmd in toRemove) {
           var newCmd = new AssumeCmd(new Token(), cmd.Expr, cmd.Attributes);
-          node.cmds.Insert(node.cmds.IndexOf(cmd), newCmd);
-          node.cmds.Remove(cmd);
+          node.Cmds.Insert(node.Cmds.IndexOf(cmd), newCmd);
+          node.Cmds.Remove(cmd);
         }
         return node;
       }
diff --git a/Source/DafnyTestGeneration/README.md b/Source/DafnyTestGeneration/README.md
deleted file mode 100644
index 80ad0e68768..00000000000
--- a/Source/DafnyTestGeneration/README.md
+++ /dev/null
@@ -1,141 +0,0 @@
-# Test Generation for Dafny
-
-[**Purpose**](#purpose) <br>
-[**General Approach**](#general-approach) <br>
-[**Implementation**](#implementation) <br>
-[**How to Generate and Run Tests?**](#how-to-generate-and-run-tests) <br>
-[**Dead Code Identification Example**](#dead-code-identification-example)
-
-## Purpose
-
-Block- and path-coverage tests of Dafny code can be used to:
-- Identify dead code (see [example](#dead-code-identification-example)).
-- Test the implementation of unverified external methods by increasing one's assurance that compiled tests produce no errors when run.
-- Increase assurance that Dafny and Java (C#, Rust, etc.) implementations of some functionality are equivalent by generating tests in Dafny and comparing the results of running these tests on compiled Dafny and original Java (C#, Rust, etc.).
-
-## General Approach
-
-To generate a test that covers a particular basic block or path, we add an assertion to the target method that is violated in the event that a particular block is visited or a particular path is taken. We then use the counterexample model provided by the prover to extract the inputs to the target method that cause the assertion violation, which gives us the desired test case.
-
-While these manipulations could be done with the Dafny source directly, we instead modify the Boogie translation, since it is much easier to work with basic blocks and paths on this lower level.
-
-We currently provide no oracle against which to compare the result. In the future, it may be possible to generate an oracle directly from the prover model provided that there is no non-determinism in the tested code.
-
-
-## Implementation
-
-- [Main.cs](Main.cs) - contains the two methods that should be used to query Dafny to generate tests.
-- [Utils.cs](Utils.cs) - a small collection of utility methods used elsewhere in the project.
-- [TestMethod.cs](TestMethod.cs) - generates a test that calls the target method with arguments triggering an assertion violation described by Z3's counterexample model. This is where all the interaction with DafnyServer's counterexample extraction code takes place.
-- [ProgramModification.cs](ProgramModification.cs) - represents a modification of the original Boogie program (which is in turn generated in `Main.cs` by translating Dafny input to Boogie). Can be verified and, if verification fails, one can pass the counterexample log as constructor argument to `TestMethod`.
-- [ProgramModifier.cs](ProgramModifier.cs) - an abstract class that contains utilities for annotating Boogie Programs, inlining Dafny methods after they are translated to Boogie, etc. This is all necessary for generating instances of `ProgramModification`
-- [BlockBasedModifier.cs](BlockBasedModifier.cs) and [PathBasedModifier.cs](PathBasedModifier.cs) - subclasses of `ProgramModifier` that generate instances of `ProgramModification` by inserting assertions that fail when a particular block is visited or a particular path is taken, respectively.
-- [DafnyInfo.cs](DafnyInfo.cs) - takes a Dafny Program and extracts certain information about it that is then used in `TestMethod.cs` and `Main.cs`
-
-## How to Generate and Run Tests?
-
-Run `dafny generate-tests` to get the list of all supported options.
-
-To consider a simple example, suppose you have a file called `object.dfy` with the following code:
-```dafny
-module M {
-  class Value {
-    var v:int;
-  }
-  method {:testEntry} compareToZero(v:Value) returns (i:int) {
-    if (v.v == 0) {
-      return 0;
-    } else if (v.v > 0) {
-      return 1;
-    }
-    return -1;
-  }
-}
-```
-The tests can be generated like this:
-
-```dafny generate-tests Block object.dfy```
-
-Dafny will give the following list of tests as output (tabulation added manually):
-```dafny
-include "object.dfy"
-module objectUnitTests {
-  import M
-  method {:test} test0() {
-    var v0 := getFreshMValue();
-    v0.v := -39;
-    var r0 := M.compareToZero(v0);
-  }
-  method {:test} test1() {
-    var v0 := getFreshMValue();
-    v0.v := 39;
-    var r0 := M.compareToZero(v0);
-  }
-  method {:test} test2() {
-    var v0 := getFreshMValue();
-    v0.v := 0;
-    var r0 := M.compareToZero(v0);
-  }
-  method {:synthesize} getFreshMValue() 
-    returns (o:M.Value) 
-    ensures fresh(o)
-}
-```
-
-Saving these tests in a file `test.dfy` and compiling the code to C# using `dafny /compileVerbose:1 /compile:0 /spillTargetCode:3 /noVerify test.dfy` produces a file `test.cs`. 
-
-You can then run `dotnet test YourCSProjectFile.csproj` to execute the tests.
-
-Note that your `.csproj` file must include `xunit` and `Moq` libraries. You can use this template:
-
-```
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Moq" Version="4.16.1" />	   
-  </ItemGroup>		  
-</Project>
-
-```
-
-## Dead Code Identification Example
-
-Suppose you have a file called "Sample.dfy" with the following code:
-
-```dafny
-module M {
-  method m(a:int) returns (b:int)
-    requires a > 0
-  {
-    if (a == 0) {
-      return 0;
-    }
-    return 1;
-  }
-}
-```
-
-Running dead code identification like this:
-
-`dafny find-dead-code Sample.dfy`
-
-Will give the following information:
-
-```
-Code at Sample.dfy(6,14) is potentially unreachable.
-Out of 3 basic blocks (3 capturedStates), 2 (2) are reachable.
-There might be false negatives if you are not unrolling loops.
-False positives are always possible.
-```
diff --git a/Source/DafnyTestGeneration/TestGenerator.cs b/Source/DafnyTestGeneration/TestGenerator.cs
new file mode 100644
index 00000000000..b46d2f32ec1
--- /dev/null
+++ b/Source/DafnyTestGeneration/TestGenerator.cs
@@ -0,0 +1,275 @@
+// Copyright by the contributors to the Dafny Project
+// SPDX-License-Identifier: MIT
+
+#nullable disable
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Microsoft.Dafny;
+using Program = Microsoft.Dafny.Program;
+
+namespace DafnyTestGeneration {
+
+  public static class TestGenerator {
+
+    public static bool SetNonZeroExitCode = false;
+
+    /// <summary>
+    /// This method returns each capturedState that is unreachable, one by one,
+    /// and then a line with the summary of how many such states there are, etc.
+    /// Note that loop unrolling may cause false positives and the absence of
+    /// loop unrolling may cause false negatives.
+    /// </summary>
+    /// <returns></returns>
+    public static async IAsyncEnumerable<string> GetDeadCodeStatistics(Program program, Modifications cache) {
+      lock (program.Options.ProverOptions) {
+        program.Options.ProcessSolverOptions(new ConsoleErrorReporter(program.Options), Token.Cli);
+      }
+      if (program.Options.Printer is NullPrinter) {
+        program.Options.Printer = new DafnyConsolePrinter(program.Options);
+      }
+
+      program.Reporter.Options.PrintMode = PrintModes.Everything;
+
+      HashSet<string> allStates = new();
+      HashSet<string> allDeadStates = new();
+
+      // Generate tests based on counterexamples produced from modifications
+      foreach (var modification in GetModifications(cache, program, out _)) {
+        await modification.GetCounterExampleLog(cache);
+        var deadStates = new HashSet<string>();
+        if (!modification.IsCovered(cache)) {
+          deadStates = modification.CapturedStates;
+        }
+
+        if (deadStates.Count != 0) {
+          foreach (var capturedState in deadStates) {
+            yield return $"Code at {capturedState} is potentially unreachable.";
+          }
+          allDeadStates.UnionWith(deadStates);
+        }
+
+        foreach (var state in modification.CapturedStates) {
+          if (deadStates.Count == 0 && !allStates.Contains(state)) {
+            yield return $"Code at {state} is reachable.";
+          }
+          allStates.Add(state);
+        }
+      }
+
+      yield return $"Out of {allStates.Count} basic blocks, {allStates.Count - allDeadStates.Count} are reachable.";
+    }
+
+    public static async IAsyncEnumerable<string> GetDeadCodeStatistics(TextReader source, Uri uri, DafnyOptions options, CoverageReport report = null) {
+      options.PrintMode = PrintModes.Everything;
+      var code = await source.ReadToEndAsync();
+      var firstPass = new FirstPass(options);
+      if (!(await firstPass.IsOk(code, uri))) {
+        SetNonZeroExitCode = true;
+        yield break;
+      }
+      SetNonZeroExitCode = firstPass.NonZeroExitCode;
+      var program = await Utils.Parse(new BatchErrorReporter(options), code, false, uri);
+      if (report != null) {
+        report.RegisterFiles(program); // do this here prior to modifying the program
+      }
+      var cache = new Modifications(program.Options);
+      await foreach (var line in GetDeadCodeStatistics(program, cache)) {
+        yield return line;
+      }
+      PopulateCoverageReport(report, program, cache);
+    }
+
+    /// <summary>
+    /// Dafny to Boogie translator discards any methods/functions that do not have any verification goals
+    /// By adding a trivial assertions in all {:testEntry}-annotated methods and function we ensure that
+    /// they are not discarded during translation and we can still generate tests for them.
+    /// </summary>
+    private static void AddVerificationGoalsToEntryPoints(Program program) {
+      foreach (var entryPoint in Utils.AllMemberDeclarationsWithAttribute(program.DefaultModule,
+                 TestGenerationOptions.TestEntryAttribute)) {
+        var trivialAssertion = new AssertStmt(entryPoint.Origin,
+          new LiteralExpr(entryPoint.StartToken, true), null, null);
+        if (entryPoint is Method method && method.Body != null && method.Body.Body != null) {
+          method.Body.Body.Insert(0, trivialAssertion);
+        } else if (entryPoint is Function function && function.Body != null) {
+          function.Body = new StmtExpr(entryPoint.StartToken, trivialAssertion, function.Body);
+        }
+      }
+    }
+
+    private static IEnumerable<ProgramModification> GetModifications(Modifications cache, Program program, out DafnyInfo dafnyInfo) {
+      var options = program.Options;
+      AddVerificationGoalsToEntryPoints(program);
+      var success = Inlining.InliningTranslator.TranslateForFutureInlining(program, options, out var boogieProgram);
+      dafnyInfo = null;
+      if (!success) {
+        options.ErrorWriter.WriteLine(
+          $"*** Error: Failed at resolving or translating the inlined Dafny code.");
+        SetNonZeroExitCode = true;
+        return new List<ProgramModification>();
+      }
+      dafnyInfo = new DafnyInfo(program);
+      // Create modifications of the program with assertions for each block\path
+      ProgramModifier programModifier =
+        options.TestGenOptions.Mode == TestGenerationOptions.Modes.Path
+          ? new PathBasedModifier(cache)
+          : new BlockBasedModifier(cache);
+      return programModifier.GetModifications(boogieProgram, dafnyInfo);
+    }
+
+    private static void PopulateCoverageReport(CoverageReport coverageReport, Program program, Modifications cache) {
+      if (coverageReport == null) {
+        return;
+      }
+
+      var lineRegex = new Regex("^(.*)\\(([0-9]+),[0-9]+\\)");
+      HashSet<string> coveredStates = new(); // set of program states that are expected to be covered by tests
+      foreach (var modification in cache.Values) {
+        foreach (var preciseState in modification.CapturedStates) {
+          if (modification.CounterexampleStatus == ProgramModification.Status.Success) {
+            var index = preciseState.LastIndexOf('#');
+            var state = index == -1 ? preciseState : preciseState[..index];
+            coveredStates.Add(state);
+          }
+        }
+      }
+      Dictionary<Uri, Dictionary<int, CoverageLabel>> lineCoverageLabels = new();
+      foreach (var modification in cache.Values) {
+        foreach (var preciseState in modification.CapturedStates) {
+          var index = preciseState.LastIndexOf('#');
+          var state = index == -1 ? preciseState : preciseState[..index];
+          var match = lineRegex.Match(state);
+          if (!match.Success) {
+            continue;
+          }
+          if (!int.TryParse(match.Groups[2].Value, out var lineNumber) || lineNumber == 0) {
+            continue;
+          }
+          Uri uri;
+          try {
+            uri = new Uri(
+              Path.IsPathRooted(match.Groups[1].Value)
+                ? match.Groups[1].Value
+                : Path.Combine(Directory.GetCurrentDirectory(), match.Groups[1].Value));
+          } catch (ArgumentException) {
+            continue;
+          }
+          if (!lineCoverageLabels.ContainsKey(uri)) {
+            lineCoverageLabels[uri] = new Dictionary<int, CoverageLabel>();
+          }
+          var newLabel = coveredStates.Contains(state)
+            ? CoverageLabel.FullyCovered
+            : CoverageLabel.NotCovered;
+          var oldLabel = lineCoverageLabels[uri].GetValueOrDefault(lineNumber, CoverageLabel.None);
+          lineCoverageLabels[uri][lineNumber] = CoverageLabelExtension.Combine(newLabel, oldLabel);
+        }
+      }
+
+      foreach (var uri in lineCoverageLabels.Keys) {
+        foreach (var lineNumber in lineCoverageLabels[uri].Keys) {
+          var rangeToken = new SourceOrigin(
+              new Token(lineNumber, 1) { Uri = uri },
+              new Token(lineNumber + 1, 1));
+          coverageReport.LabelCode(rangeToken,
+            lineCoverageLabels[uri][lineNumber]);
+        }
+      }
+    }
+
+    /// <summary>
+    /// Generate test methods for a certain Dafny program.
+    /// </summary>
+    /// <returns></returns>
+    public static async IAsyncEnumerable<TestMethod> GetTestMethodsForProgram(Program program, Modifications cache = null) {
+      if (program.Options.Printer is NullPrinter) {
+        program.Options.Printer = new DafnyConsolePrinter(program.Options);
+      }
+
+      lock (program.Options.ProverOptions) {
+        program.Options.ProcessSolverOptions(new ConsoleErrorReporter(program.Options), Token.Cli);
+      }
+
+      var options = program.Options;
+      options.PrintMode = PrintModes.Everything;
+      // Generate tests based on counterexamples produced from modifications
+
+      cache ??= new Modifications(options);
+      foreach (var modification in GetModifications(cache, program, out var dafnyInfo)) {
+
+        var log = await modification.GetCounterExampleLog(cache);
+        if (log == null) {
+          continue;
+        }
+
+        var testMethod = await modification.GetTestMethod(cache, dafnyInfo);
+        if (testMethod == null) {
+          continue;
+        }
+
+        yield return testMethod;
+      }
+    }
+
+    /// <summary>
+    /// Return a Dafny class (list of lines) with tests for the given Dafny file
+    /// </summary>
+    public static async IAsyncEnumerable<string> GetTestClassForProgram(TextReader source, Uri uri, DafnyOptions options, CoverageReport report = null) {
+      options.PrintMode = PrintModes.Everything;
+      var code = await source.ReadToEndAsync();
+      var firstPass = new FirstPass(options);
+      if (!(await firstPass.IsOk(code, uri))) {
+        SetNonZeroExitCode = true;
+        yield break;
+      }
+      SetNonZeroExitCode = firstPass.NonZeroExitCode;
+      var program = await Utils.Parse(new BatchErrorReporter(options), code, false, uri);
+      var rawName = Regex.Replace(uri?.AbsolutePath ?? "", "[^a-zA-Z0-9_]", "");
+
+      string EscapeDafnyStringLiteral(string str) {
+        return $"\"{str.Replace(@"\", @"\\")}\"";
+      }
+
+      if (uri != null) {
+        yield return $"include {EscapeDafnyStringLiteral(uri.AbsolutePath)}";
+      }
+
+      yield return $"module {rawName}UnitTests {{";
+
+      var cache = new Modifications(options);
+      var methodsGenerated = 0;
+      DafnyInfo dafnyInfo = null;
+      if (report != null) {
+        report.RegisterFiles(program);
+      }
+      await foreach (var method in GetTestMethodsForProgram(program, cache)) {
+        if (methodsGenerated == 0) {
+          dafnyInfo = new DafnyInfo(program);
+          foreach (var module in dafnyInfo.ToImportAs.Keys) {
+            if (module.Split(".").Last() == dafnyInfo.ToImportAs[module]) {
+              yield return $"import {module}";
+            } else {
+              yield return $"import {dafnyInfo.ToImportAs[module]} = {module}";
+            }
+          }
+        }
+        yield return method.ToString();
+        methodsGenerated++;
+      }
+
+      yield return TestMethod.EmitSynthesizeMethods(dafnyInfo, cache);
+      yield return "}";
+
+      PopulateCoverageReport(report, program, cache);
+
+      if (methodsGenerated == 0) {
+        await options.ErrorWriter.WriteLineAsync(
+          "*** Error: No tests were generated, because no code points could be " +
+          "proven reachable (do you have a false assumption in the program?)");
+        SetNonZeroExitCode = true;
+      }
+    }
+  }
+}
diff --git a/Source/DafnyTestGeneration/TestMethod.cs b/Source/DafnyTestGeneration/TestMethod.cs
index c4a6462bc25..1a804dc3961 100644
--- a/Source/DafnyTestGeneration/TestMethod.cs
+++ b/Source/DafnyTestGeneration/TestMethod.cs
@@ -8,8 +8,8 @@
 using System.Text.RegularExpressions;
 using Microsoft.Boogie;
 using Microsoft.Dafny;
-using Microsoft.Dafny.LanguageServer.CounterExampleGeneration;
 using MapType = Microsoft.Dafny.MapType;
+using Token = Microsoft.Dafny.Token;
 using Type = Microsoft.Dafny.Type;
 
 namespace DafnyTestGeneration {
@@ -21,7 +21,7 @@ public class TestMethod {
 
     // list of values to mock together with their types
     // maps a variable that is mocked to its unique id
-    private readonly Dictionary<DafnyModelVariable, string> mockedVarId = new();
+    private readonly Dictionary<PartialValue, string> mockedVarId = new();
     public readonly List<(string parentId, string fieldName, string childId)> Assignments = new();
     public readonly List<(string id, Type type, string value)> ValueCreation = new();
     // next id to assign to a variable with given name:
@@ -38,9 +38,6 @@ public class TestMethod {
     private readonly Type defaultType = Type.Int;
     // the DafnyModel that describes the inputs to this test method
     private readonly DafnyModel dafnyModel;
-    // List of all types for which a {:synthesize} - annotated method is needed
-    // These methods are used to get fresh instances of the corresponding types
-    private static readonly List<UserDefinedType> TypesToSynthesize = new();
     // is set to true whenever the tool encounters something it does not support
     private readonly List<string> errorMessages = new();
     // records parameters for GetDefaultValue call - this is used to to
@@ -48,25 +45,30 @@ public class TestMethod {
     private List<string> getDefaultValueParams = new();
     // similar to above but for objects
     private readonly HashSet<string> getClassTypeInstanceParams = new();
-    private Dictionary<string, string> defaultValueForType = new();
+    private readonly Modifications cache;
 
-    public TestMethod(DafnyInfo dafnyInfo, string log) {
+    private readonly Dictionary<PartialValue, Expression> constraintContext;
+
+    public TestMethod(DafnyInfo dafnyInfo, string log, Modifications cache) {
       DafnyInfo = dafnyInfo;
+      this.cache = cache;
       var typeNames = ExtractPrintedInfo(log, "Types | ");
       var argumentNames = ExtractPrintedInfo(log, "Impl | ");
       dafnyModel = DafnyModel.ExtractModel(dafnyInfo.Options, log);
+      dafnyModel.AssignConcretePrimitiveValues();
       MethodName = argumentNames.First();
       argumentNames.RemoveAt(0);
       NOfTypeArgs = dafnyInfo.GetTypeArgs(MethodName).Count;
+      constraintContext = new Dictionary<PartialValue, Expression>();
+      foreach (var partialValue in dafnyModel.States.First().KnownVariableNames.Keys) {
+        constraintContext[partialValue] = new Microsoft.Dafny.IdentifierExpr(Token.NoToken, dafnyModel.States.First().KnownVariableNames[partialValue].First());
+        constraintContext[partialValue].Type = partialValue.Type;
+      }
       ArgValues = ExtractInputs(dafnyModel.States.First(), argumentNames, typeNames);
     }
 
     public bool IsValid => errorMessages.Count == 0;
 
-    public static void ClearTypesToSynthesize() {
-      TypesToSynthesize.Clear();
-    }
-
     /// <summary>
     /// Add a tuple to the ValueCreation list with a given type and value.
     /// The name of the variable assigned to the value is chosen so that it is
@@ -98,11 +100,11 @@ private static string GetSynthesizeMethodName(string typ) {
     /// Returns a string that contains all the {:synthesize} annotated methods
     /// necessary to compile the tests
     /// </summary>
-    public static string EmitSynthesizeMethods(DafnyInfo dafnyInfo) {
+    public static string EmitSynthesizeMethods(DafnyInfo dafnyInfo, Modifications cache) {
       var result = "";
       // ensures that duplicate types in TypesToSynthesize are skipped:
       HashSet<string> emittedTypes = new();
-      foreach (var typ in TypesToSynthesize) {
+      foreach (var typ in cache.TypesToSynthesize) {
         var typeString = typ.ToString();
         if (emittedTypes.Contains(typeString)) {
           continue;
@@ -110,19 +112,7 @@ public static string EmitSynthesizeMethods(DafnyInfo dafnyInfo) {
         emittedTypes.Add(typeString);
         var methodName = GetSynthesizeMethodName(typeString);
         var returnName = "o";
-        if (dafnyInfo.IsTrait(typ)) {
-          var types = dafnyInfo.GetTypesForTrait(typ);
-          int id = 0;
-          var typeToNameDict = new Dictionary<string, string>();
-          foreach (var resultTyp in types) {
-            typeToNameDict[resultTyp.ToString()] = "o_res_" + id++;
-          }
-          typeToNameDict[typeString] = "o";
-          result += $"\nmethod {{:synthesize}} {methodName}(" +
-                    $"{string.Join(",", types.ConvertAll(t => $"{typeToNameDict[t.ToString()]}:{t}"))})" +
-                    $"returns ({returnName}:{typeString}) ensures fresh({returnName}) " +
-                    $"{string.Join(" ", dafnyInfo.GetEnsuresForTrait(typ, returnName, typeToNameDict))}";
-        } else {
+        if (!dafnyInfo.IsTrait(typ)) {
           var constFields = dafnyInfo.GetNonGhostFields(typ)
             .Where(field => !field.mutable).ToList();
           while (constFields.Any(field => field.name == returnName)) {
@@ -154,9 +144,17 @@ public static string EmitSynthesizeMethods(DafnyInfo dafnyInfo) {
     /// type alone </param>
     /// <param name="types">the types of the elements</param>
     /// <returns></returns>
-    private List<string> ExtractInputs(DafnyModelState state, IReadOnlyList<string> printOutput, IReadOnlyList<string> types) {
+    private List<string> ExtractInputs(PartialState state, IReadOnlyList<string> printOutput, IReadOnlyList<string> types) {
       var result = new List<string>();
-      var vars = state.ExpandedVariableSet(-1);
+      var vars = state.ExpandedVariableSet();
+      var constraintSet = new List<Constraint>();
+      foreach (var variable in vars) {
+        foreach (var constraint in variable.Constraints) {
+          constraintSet.Add(constraint);
+        }
+      }
+      var constraints = constraintSet.ToList();
+      constraints = Constraint.ResolveAndOrder(constraintContext, constraints, false, false);
       var parameterIndex = DafnyInfo.IsStatic(MethodName) ? -1 : -2;
       for (var i = 0; i < printOutput.Count; i++) {
         if (types[i] == "Ty") {
@@ -173,8 +171,8 @@ private List<string> ExtractInputs(DafnyModelState state, IReadOnlyList<string>
           type = DafnyModelTypeUtils.ReplaceType(type,
             _ => true,
             type => DafnyInfo.GetSupersetType(type) != null && type.Name.StartsWith("_System") ?
-              new UserDefinedType(type.tok, type.Name[8..], type.TypeArgs) :
-              new UserDefinedType(type.tok, type.Name, type.TypeArgs));
+              new UserDefinedType(type.Origin, type.Name[8..], type.TypeArgs) :
+              new UserDefinedType(type.Origin, type.Name, type.TypeArgs));
         } else {
           type = null;
         }
@@ -191,7 +189,7 @@ private List<string> ExtractInputs(DafnyModelState state, IReadOnlyList<string>
           } else {
             baseValue = printOutput[i];
           }
-          result.Add(GetPrimitiveAsType(baseValue, type));
+          result.Add(GetPrimitiveAsType(baseValue, type, type));
           continue;
         }
         foreach (var variable in vars) {
@@ -206,8 +204,8 @@ private List<string> ExtractInputs(DafnyModelState state, IReadOnlyList<string>
     }
 
     // Returns a new value of the defaultType type (set to int by default)
-    private string GetADefaultTypeValue(DafnyModelVariable variable) {
-      return dafnyModel.GetUnreservedNumericValue(variable.Element, Type.Int);
+    private string GetADefaultTypeValue(PartialValue variable) {
+      return "0";
     }
 
     private string GetFunctionOfType(ArrowType type) {
@@ -237,7 +235,7 @@ private Type GetBasicType(Type start, Func<Type, bool> stopCondition) {
     /// Extract the value of a variable. This can have side-effects on
     /// assignments, reservedValues, reservedValuesMap, and objectsToMock.
     /// </summary>
-    private string ExtractVariable(DafnyModelVariable variable, Type/*?*/ asType) {
+    private string ExtractVariable(PartialValue variable, Type/*?*/ asType) {
       if (variable == null) {
         if (asType != null) {
           return GetDefaultValue(asType);
@@ -250,23 +248,19 @@ private string ExtractVariable(DafnyModelVariable variable, Type/*?*/ asType) {
         asType = DafnyModelTypeUtils.ReplaceType(asType,
           type => DafnyInfo.GetSupersetType(type) != null &&
                   type.Name.StartsWith("_System"),
-          type => new UserDefinedType(type.tok, type.Name[8..], type.TypeArgs));
+          type => new UserDefinedType(type.Origin, type.Name[8..], type.TypeArgs));
       }
       if (mockedVarId.ContainsKey(variable)) {
         return mockedVarId[variable];
       }
 
-      if (variable is DuplicateVariable duplicateVariable) {
-        return ExtractVariable(duplicateVariable.Original, asType);
-      }
-
       List<string> elements = new();
       var variableType = DafnyModelTypeUtils.GetInDafnyFormat(
         DafnyModelTypeUtils.ReplaceTypeVariables(variable.Type, defaultType));
       variableType = DafnyModelTypeUtils.ReplaceType(variableType,
         type => DafnyInfo.GetSupersetType(type) != null &&
                 type.Name.StartsWith("_System"),
-        type => new UserDefinedType(type.tok, type.Name[8..], type.TypeArgs));
+        type => new UserDefinedType(type.Origin, type.Name[8..], type.TypeArgs));
       if (variableType.ToString() == defaultType.ToString() &&
           variableType.ToString() != variable.Type.ToString()) {
         return GetADefaultTypeValue(variable);
@@ -277,18 +271,17 @@ private string ExtractVariable(DafnyModelVariable variable, Type/*?*/ asType) {
         case BoolType:
         case CharType:
         case BitvectorType:
-          return GetPrimitiveAsType(variable.Value, asType);
+          return GetPrimitiveAsType(variable.PrimitiveLiteral, variableType, asType);
         case SeqType seqType:
           var asBasicSeqType = GetBasicType(asType, type => type is SeqType) as SeqType;
-          var seqVar = variable as SeqVariable;
-          if (seqVar?.GetLength() == -1) {
+          if (variable?.Cardinality() == -1) {
             if (seqType.Arg is CharType) {
               return "\"\"";
             }
             return AddValue(asType ?? variableType, "[]");
           }
-          for (var i = 0; i < seqVar?.GetLength(); i++) {
-            var element = seqVar?[i];
+          for (var i = 0; i < variable?.Cardinality(); i++) {
+            var element = variable?[i];
             if (element == null) {
               getDefaultValueParams = new();
               elements.Add(GetDefaultValue(seqType.Arg, asBasicSeqType?.TypeArgs?.FirstOrDefault((Type/*?*/)null)));
@@ -320,18 +313,14 @@ private string ExtractVariable(DafnyModelVariable variable, Type/*?*/ asType) {
           return AddValue(asType ?? variableType, $"[{string.Join(", ", elements)}]");
         case SetType:
           var asBasicSetType = GetBasicType(asType, type => type is SetType) as SetType;
-          if (!variable.Children.ContainsKey("true")) {
-            return AddValue(asType ?? variableType, "{}");
-          }
-          foreach (var element in variable.Children["true"]) {
+          foreach (var element in variable.SetElements()) {
             elements.Add(ExtractVariable(element, asBasicSetType?.TypeArgs?.FirstOrDefault((Type/*?*/)null)));
           }
           return AddValue(asType ?? variableType, $"{{{string.Join(", ", elements)}}}");
         case MapType:
           var asBasicMapType = GetBasicType(asType, type => type is MapType) as MapType;
-          var mapVar = variable as MapVariable;
           List<string> mappingStrings = new();
-          foreach (var mapping in mapVar?.Mappings ?? new()) {
+          foreach (var mapping in variable?.Mappings()) {
             var asTypeTypeArgs =
               asBasicMapType?.TypeArgs?.Count == 2 ? asBasicMapType.TypeArgs : null;
             mappingStrings.Add($"{ExtractVariable(mapping.Key, asTypeTypeArgs?[0])} := {ExtractVariable(mapping.Value, asTypeTypeArgs?[1])}");
@@ -339,8 +328,8 @@ private string ExtractVariable(DafnyModelVariable variable, Type/*?*/ asType) {
           return AddValue(asType ?? variableType, $"map[{string.Join(", ", mappingStrings)}]");
         case UserDefinedType tupleType when tupleType.Name.StartsWith("_tuple#"):
           return AddValue(asType ?? variableType, "(" +
-            string.Join(",", variable.Children.Values
-              .Select(v => ExtractVariable(v.First(), null))) + ")");
+            string.Join(",", variable.UnnamedDestructors()
+              .Select(v => ExtractVariable(v, null))) + ")");
         case ArrowType arrowType:
           var asBasicArrowType = GetBasicType(asType, type => type is ArrowType) as ArrowType;
           return GetFunctionOfType(asBasicArrowType ?? arrowType);
@@ -353,7 +342,7 @@ private string ExtractVariable(DafnyModelVariable variable, Type/*?*/ asType) {
         case UserDefinedType arrType when new Regex("^_System.array[0-9]*\\?$").IsMatch(arrType.Name):
           errorMessages.Add($"// Failed because arrays are not yet supported (type {arrType} element {variable.Element})");
           break;
-        case UserDefinedType _ when variable.CanonicalName() == "null":
+        case UserDefinedType _ when variable.PrimitiveLiteral != "":
           return "null";
         case UserDefinedType userDefinedType:
           var basicType = GetBasicType(asType ?? userDefinedType,
@@ -364,28 +353,28 @@ private string ExtractVariable(DafnyModelVariable variable, Type/*?*/ asType) {
             return GetClassTypeInstance(userDefinedType, asType, variable);
           }
 
-          if (variable.CanonicalName() == "") {
+          if (variable.DatatypeConstructorName() == "") {
             getDefaultValueParams = new();
             return GetDefaultValue(userDefinedType, asType);
           }
-          var ctor = DafnyInfo.Datatypes[basicType.Name].Ctors.FirstOrDefault(ctor => ctor.Name == variable.CanonicalName(), null);
+          var ctor = DafnyInfo.Datatypes[basicType.Name].Ctors.FirstOrDefault(ctor => ctor.Name == variable.DatatypeConstructorName(), null);
           if (ctor == null) {
-            errorMessages.Add($"// Failed: Cannot find constructor {variable.CanonicalName()} for datatype {basicType}");
+            errorMessages.Add($"// Failed: Cannot find constructor {variable.DatatypeConstructorName()} for datatype {basicType}");
             return basicType.ToString();
           }
           List<string> fields = new();
           for (int i = 0; i < ctor.Destructors.Count; i++) {
             var fieldName = ctor.Destructors[i].Name;
-            if (!variable.Children.ContainsKey(fieldName)) {
+            if (!variable.Fields().ContainsKey(fieldName)) {
               fieldName = $"[{i}]";
             }
 
-            if (!variable.Children.ContainsKey(fieldName)) {
+            if (!variable.Fields().ContainsKey(fieldName)) {
               errorMessages.Add($"// Failed: Cannot find destructor " +
                                 $"{ctor.Destructors[i].Name} of constructor " +
-                                $"{variable.CanonicalName()} for datatype " +
+                                $"{variable.DatatypeConstructorName()} for datatype " +
                                 $"{basicType}. Available destructors are: " +
-                                string.Join(",", variable.Children.Keys.ToList()));
+                                string.Join(",", variable.Fields().Keys.ToList()));
               return basicType.ToString();
             }
 
@@ -393,18 +382,18 @@ private string ExtractVariable(DafnyModelVariable variable, Type/*?*/ asType) {
               Utils.UseFullName(ctor.Destructors[i].Type),
               ctor.EnclosingDatatype.TypeArgs.ConvertAll(arg => arg.Name), basicType.TypeArgs);
             if (ctor.Destructors[i].Name.StartsWith("#")) {
-              fields.Add(ExtractVariable(variable.Children[fieldName].First(), destructorType));
+              fields.Add(ExtractVariable(variable.Fields()[fieldName], destructorType));
             } else {
               fields.Add(ctor.Destructors[i].Name + ":=" +
-                         ExtractVariable(variable.Children[fieldName].First(), destructorType));
+                         ExtractVariable(variable.Fields()[fieldName], destructorType));
             }
           }
 
           var value = basicType.ToString();
           if (fields.Count == 0) {
-            value += "." + variable.CanonicalName();
+            value += "." + variable.DatatypeConstructorName();
           } else {
-            value += "." + variable.CanonicalName() + "(" +
+            value += "." + variable.DatatypeConstructorName() + "(" +
                      string.Join(",", fields) + ")";
           }
           return AddValue(asType ?? userDefinedType, value);
@@ -413,18 +402,7 @@ private string ExtractVariable(DafnyModelVariable variable, Type/*?*/ asType) {
       return "null";
     }
 
-    private string GetTraitTypeInstance(UserDefinedType type) {
-      var typesToInitialize = DafnyInfo.GetTypesForTrait(type);
-      foreach (var typ in typesToInitialize) {
-        defaultValueForType[typ.ToString()] = GetDefaultValue(typ, typ);
-      }
-      TypesToSynthesize.Add(type);
-      return AddValue(type,
-        $"{GetSynthesizeMethodName(type.ToString())}(" +
-        $"{string.Join(", ", typesToInitialize.ConvertAll(typ => defaultValueForType[typ.ToString()]))})");
-    }
-
-    private string GetClassTypeInstance(UserDefinedType type, Type/*?*/ asType, DafnyModelVariable/*?*/ variable) {
+    private string GetClassTypeInstance(UserDefinedType type, Type/*?*/ asType, PartialValue/*?*/ variable) {
       var asBasicType = GetBasicType(asType, _ => false);
       if ((asBasicType != null) && (asBasicType is not UserDefinedType)) {
         return GetDefaultValue(asType, asType);
@@ -442,12 +420,7 @@ private string GetClassTypeInstance(UserDefinedType type, Type/*?*/ asType, Dafn
       }
       getClassTypeInstanceParams.Add(dafnyType.ToString());
       if (DafnyInfo.IsTrait(dafnyType)) {
-        var tmp = GetTraitTypeInstance(dafnyType);
-        getClassTypeInstanceParams.Remove(dafnyType.ToString());
-        if (variable != null) {
-          mockedVarId[variable] = tmp;
-        }
-        return tmp;
+        return "null";
       }
       if (DafnyInfo.IsExtern(dafnyType)) {
         var ctor = DafnyInfo.GetConstructor(dafnyType);
@@ -473,7 +446,7 @@ private string GetClassTypeInstance(UserDefinedType type, Type/*?*/ asType, Dafn
                  immutableFields) {
           constFieldValues.Add(GetFieldValue(field, variable));
         }
-        TypesToSynthesize.Add(dafnyType);
+        cache.TypesToSynthesize.Add(dafnyType);
         varId = AddValue(dafnyType, $"{GetSynthesizeMethodName(dafnyType.ToString())}({string.Join(", ", constFieldValues)})");
       }
       getClassTypeInstanceParams.Remove(dafnyType.ToString());
@@ -488,13 +461,12 @@ private string GetClassTypeInstance(UserDefinedType type, Type/*?*/ asType, Dafn
       return varId;
     }
 
-    private string GetFieldValue((string name, Type type, bool mutable, string/*?*/ defValue) field, DafnyModelVariable/*?*/ variable) {
+    private string GetFieldValue((string name, Type type, bool mutable, string/*?*/ defValue) field, PartialValue/*?*/ variable) {
       if (field.defValue != null) {
         return field.defValue;
       }
-      if (variable != null && variable.Children.ContainsKey(field.name) &&
-          variable.Children[field.name].Count == 1) {
-        return ExtractVariable(variable.Children[field.name].First(), field.type);
+      if (variable != null && variable.Fields().ContainsKey(field.name)) {
+        return ExtractVariable(variable.Fields()[field.name], field.type);
       }
 
       var previouslyCreated = ValueCreation.FirstOrDefault(obj =>
@@ -506,16 +478,19 @@ private string GetFieldValue((string name, Type type, bool mutable, string/*?*/
       return GetDefaultValue(field.type, field.type);
     }
 
-    private static string GetPrimitiveAsType(string value, Type/*?*/ asType) {
-      if ((asType is null or IntType or RealType or BoolType or CharType
-          or BitvectorType) || value is "[]" or "{}" or "map[]") {
+    private static string GetPrimitiveAsType(string value, Type type, Type/*?*/ asType) {
+      if ((type is null) || (asType is null) || value is "[]" or "{}" or "map[]") {
+        return value;
+      }
+      var typeString = type.ToString();
+      var asTypeString = asType.ToString();
+      if (typeString == asTypeString) {
         return value;
       }
-      var typeString = asType.ToString();
-      if (typeString.StartsWith("_System.")) {
-        typeString = typeString[8..];
+      if (asTypeString.StartsWith("_System.")) {
+        asTypeString = asTypeString[8..];
       }
-      return $"({value} as {typeString})";
+      return $"({value} as {asTypeString})";
     }
 
     /// <summary>
@@ -536,15 +511,15 @@ private string GetDefaultValue(Type type, Type/*?*/ asType = null) {
       }
       switch (type) {
         case IntType:
-          return GetPrimitiveAsType("0", asType);
+          return GetPrimitiveAsType("0", type, asType);
         case RealType:
-          return GetPrimitiveAsType("0.0", asType);
+          return GetPrimitiveAsType("0.0", type, asType);
         case BoolType:
-          return GetPrimitiveAsType("false", asType);
+          return GetPrimitiveAsType("false", type, asType);
         case CharType:
-          return GetPrimitiveAsType("\'a\'", asType);
+          return GetPrimitiveAsType("\'a\'", type, asType);
         case BitvectorType bitvectorType:
-          return GetPrimitiveAsType($"(0 as bv{bitvectorType.Width})", asType);
+          return GetPrimitiveAsType($"(0 as bv{bitvectorType.Width})", type, asType);
         case SeqType seqType:
           return seqType.Arg is CharType ? "\"\"" : AddValue(asType ?? type, "[]");
         case SetType:
@@ -661,7 +636,7 @@ private List<string> TestMethodLines() {
         returnParNames.Add("r" + i);
       }
 
-      lines.Add($"method {{:test}} test{id}() {{");
+      lines.Add($"method {{:test}} Test{id}() {{");
 
       lines.AddRange(TestInputConstructionLines());
 
diff --git a/Source/DafnyTestGeneration/Utils.cs b/Source/DafnyTestGeneration/Utils.cs
index 2f6978bd899..66c8a7bd16d 100644
--- a/Source/DafnyTestGeneration/Utils.cs
+++ b/Source/DafnyTestGeneration/Utils.cs
@@ -4,13 +4,15 @@
 #nullable disable
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Microsoft.Boogie;
 using Microsoft.Dafny;
-using Microsoft.Dafny.LanguageServer.CounterExampleGeneration;
 using Declaration = Microsoft.Boogie.Declaration;
 using Program = Microsoft.Dafny.Program;
 using Token = Microsoft.Dafny.Token;
@@ -25,11 +27,11 @@ public static class Utils {
     /// </summary>
     public static List<Microsoft.Boogie.Program> Translate(Program program) {
       var ret = new List<Microsoft.Boogie.Program> { };
-      var thread = new System.Threading.Thread(
+      var thread = new Thread(
         () => {
           var oldPrintInstrumented = program.Reporter.Options.PrintInstrumented;
           program.Reporter.Options.PrintInstrumented = true;
-          ret = Translator
+          ret = BoogieGenerator
             .Translate(program, program.Reporter)
             .ToList().ConvertAll(tuple => tuple.Item2);
           program.Reporter.Options.PrintInstrumented = oldPrintInstrumented;
@@ -76,24 +78,25 @@ public static Type CopyWithReplacements(Type type, List<string> from, List<Type>
       return DafnyModelTypeUtils.ReplaceType(type, _ => true,
         typ => replacements.TryGetValue(typ.Name, out var replacement) ?
           replacement :
-          new UserDefinedType(typ.tok, typ.Name, typ.TypeArgs));
+          new UserDefinedType(typ.Origin, typ.Name, typ.TypeArgs));
     }
 
     /// <summary>
     /// Parse a string read (from a certain file) to a Dafny Program
     /// </summary>
-    public static Program/*?*/ Parse(DafnyOptions options, string source, bool resolve = true, Uri uri = null) {
-      uri ??= new Uri(Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()));
-      var reporter = new BatchErrorReporter(options);
+    public static async Task<Program> /*?*/ Parse(ErrorReporter reporter, string source, bool resolve = true, Uri uri = null, CancellationToken cancellationToken = default) {
+      uri ??= new Uri(Path.Combine(Path.GetTempPath(), "parseUtils.dfy"));
 
-      var program = new ProgramParser().ParseFiles(uri.LocalPath, new DafnyFile[] { new(reporter.Options, uri, new StringReader(source)) },
-        reporter, CancellationToken.None);
+      var fs = new InMemoryFileSystem(ImmutableDictionary<Uri, string>.Empty.Add(uri, source));
+      var dafnyFile = DafnyFile.HandleDafnyFile(fs, reporter, reporter.Options, uri, Token.NoToken, false);
+      var parseResult = await new ProgramParser().ParseFiles(uri.LocalPath,
+        new[] { dafnyFile }, reporter, cancellationToken);
 
       if (!resolve) {
-        return program;
+        return parseResult.Program;
       }
-      new ProgramResolver(program).Resolve(CancellationToken.None);
-      return program;
+      await new ProgramResolver(parseResult.Program).Resolve(cancellationToken);
+      return parseResult.Program;
     }
 
     /// <summary>
@@ -110,7 +113,7 @@ public static Microsoft.Boogie.Program DeepCloneProgram(DafnyOptions options, Mi
     /// </summary>
     public static Microsoft.Boogie.Program DeepCloneResolvedProgram(Microsoft.Boogie.Program program, DafnyOptions options) {
       program = DeepCloneProgram(options, program);
-      program.Resolve(options);
+      var resolutionErrors = program.Resolve(options);
       program.Typecheck(options);
       return program;
     }
@@ -131,14 +134,25 @@ public static string GetStringRepresentation(DafnyOptions options, Microsoft.Boo
     /// Extract string mapping this basic block to a location in Dafny code.
     /// </summary>
     public static string GetBlockId(Block block, DafnyOptions options) {
-      var state = block.cmds.OfType<AssumeCmd>().FirstOrDefault(
+      return AllBlockIds(block, options).FirstOrDefault((string)null);
+    }
+
+    /// <summary>
+    /// Extract string mapping this basic block to locations in Dafny code.
+    /// </summary>
+    [ItemCanBeNull]
+    public static List<string> AllBlockIds(Block block, DafnyOptions options) {
+      string uniqueId = options.TestGenOptions.Mode != TestGenerationOptions.Modes.Block ? "#" + block.UniqueId : "";
+      var state = block.Cmds.OfType<AssumeCmd>()
+        .Where(
           cmd => cmd.Attributes != null &&
                  cmd.Attributes.Key == "captureState" &&
                  cmd.Attributes.Params != null &&
                  cmd.Attributes.Params.Count() == 1)
-        ?.Attributes.Params[0].ToString();
-      string uniqueId = options.TestGenOptions.Mode != TestGenerationOptions.Modes.Block ? "#" + block.UniqueId : "";
-      return state == null ? null : Regex.Replace(state, @"\s+", "") + uniqueId;
+        .Select(
+          cmd => cmd.Attributes.Params[0].ToString())
+        .Select(cmd => Regex.Replace(cmd, @"\s+", "") + uniqueId);
+      return state.ToList();
     }
 
     public static IList<object> GetAttributeValue(Implementation implementation, string attribute) {
@@ -164,30 +178,24 @@ public static bool DeclarationHasAttribute(Declaration declaration, string attri
     }
 
     public static bool ProgramHasAttribute(Program program, string attribute) {
-      return DeclarationHasAttribute(program.DefaultModule, attribute);
+      return AllMemberDeclarationsWithAttribute(program.DefaultModule, attribute).Count() != 0;
     }
 
-    private static bool DeclarationHasAttribute(TopLevelDecl decl, string attribute) {
+    public static IEnumerable<MemberDecl> AllMemberDeclarationsWithAttribute(TopLevelDecl decl, string attribute) {
+      HashSet<MemberDecl> allInlinedDeclarations = new();
       if (decl is LiteralModuleDecl moduleDecl) {
-        return moduleDecl.ModuleDef.TopLevelDecls
-          .Any(declaration => DeclarationHasAttribute(declaration, attribute));
+        foreach (var child in moduleDecl.ModuleDef.Children.OfType<TopLevelDecl>()) {
+          allInlinedDeclarations.UnionWith(AllMemberDeclarationsWithAttribute(child, attribute));
+        }
       }
       if (decl is TopLevelDeclWithMembers withMembers) {
-        return withMembers.Members
-          .Any(member => MembersHasAttribute(member, attribute));
-      }
-      return false;
-    }
-
-    public static bool MembersHasAttribute(MemberDecl member, string attribute) {
-      var attributes = member.Attributes;
-      while (attributes != null) {
-        if (attributes.Name == attribute) {
-          return true;
+        foreach (var memberDecl in withMembers.Members) {
+          if (memberDecl.HasUserAttribute(attribute, out var _)) {
+            allInlinedDeclarations.Add(memberDecl);
+          }
         }
-        attributes = attributes.Prev;
       }
-      return false;
+      return allInlinedDeclarations;
     }
   }
 }
diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
index fd4a1e1f852..3c096675bb1 100644
--- a/Source/Directory.Build.props
+++ b/Source/Directory.Build.props
@@ -1,7 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>4.2.0</VersionPrefix>
+    <TargetFramework>net8.0</TargetFramework>
+    <VersionPrefix>4.9.2</VersionPrefix>
     <NoWarn>1701;1702;VSTHRD200</NoWarn>
   </PropertyGroup>
  
diff --git a/Source/IntegrationTests/DafnyDriverLitCommand.cs b/Source/IntegrationTests/DafnyDriverLitCommand.cs
new file mode 100644
index 00000000000..e5d60173707
--- /dev/null
+++ b/Source/IntegrationTests/DafnyDriverLitCommand.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using XUnitExtensions.Lit;
+
+namespace IntegrationTests;
+
+delegate Task<int> MainWithWriters(TextWriter outputWriter, TextWriter errorWriter, TextReader inputReader, string[] args);
+class MainWithWritersCommand : ILitCommand {
+  private readonly string name;
+  private readonly MainWithWriters main;
+  public string[] Arguments { get; }
+
+  public MainWithWritersCommand(string name, IEnumerable<string> arguments, MainWithWriters main) {
+    this.name = name;
+    this.main = main;
+    Arguments = arguments.ToArray();
+  }
+
+  public Task<int> Execute(TextReader inputReader, TextWriter outputWriter, TextWriter errorWriter) {
+    return main(outputWriter, errorWriter, inputReader, Arguments);
+  }
+
+  public override string ToString() {
+    return $"{name} {string.Join(" ", Arguments)}";
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/IntegrationTests.csproj b/Source/IntegrationTests/IntegrationTests.csproj
index 593fc17142e..cfb699f0622 100644
--- a/Source/IntegrationTests/IntegrationTests.csproj
+++ b/Source/IntegrationTests/IntegrationTests.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
         <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
         <IsPackable>false</IsPackable>
         <Nullable>enable</Nullable>
+        <DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*.*</DefaultItemExcludes>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
@@ -39,7 +39,7 @@
         <Content Include="..\..\Binaries\z3\**\*.*" LinkBase="z3">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
-        <Content Include="..\..\Test\**\*.*" Exclude="..\..\Test\**\.#*" LinkBase="TestFiles\LitTests\LitTest">
+        <Content Include="TestFiles\LitTests\LitTest\**\*.*" Exclude="TestFiles\LitTests\LitTest\**\.#*">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         <Content Include="..\..\docs\DafnyRef\examples\**\*.*" LinkBase="TestFiles\LitTests\LitTest\refman\examples">
diff --git a/Source/IntegrationTests/LitTests.cs b/Source/IntegrationTests/LitTests.cs
index a4cc0aec6ff..11e8f226edc 100644
--- a/Source/IntegrationTests/LitTests.cs
+++ b/Source/IntegrationTests/LitTests.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using Microsoft.Dafny;
 using TestDafny;
 using Xunit;
@@ -21,10 +22,10 @@ public class LitTests {
     private static readonly bool InvokeMainMethodsDirectly;
 
     private static readonly Assembly DafnyDriverAssembly = typeof(Dafny.Dafny).Assembly;
-    private static readonly Assembly TestDafnyAssembly = typeof(TestDafny.MultiBackendTest).Assembly;
+    private static readonly Assembly TestDafnyAssembly = typeof(MultiBackendTest).Assembly;
     private static readonly Assembly DafnyServerAssembly = typeof(Server).Assembly;
 
-    private static readonly string RepositoryRoot = Path.GetFullPath("../../../../../"); // Up from Source/IntegrationTests/bin/Debug/net6.0/
+    private static readonly string RepositoryRoot = Path.GetFullPath("../../../../../"); // Up from Source/IntegrationTests/bin/Debug/net8.0/
 
     private static readonly string[] DefaultBoogieArguments = new[] {
       "/infer:j",
@@ -54,15 +55,20 @@ IEnumerable<string> AddExtraArgs(IEnumerable<string> args, IEnumerable<string> l
         return (extraDafnyArguments is null ? args : args.Append(extraDafnyArguments)).Concat(local);
       }
 
-      string[] defaultResolveArgs = new[] { "resolve", "--use-basename-for-filename", "--show-snippets:false" };
-      string[] defaultVerifyArgs = new[] { "verify", "--use-basename-for-filename", "--show-snippets:false", "--cores:2", "--verification-time-limit:300" };
-      //string[] defaultTranslateArgs = new[] { "translate", "--use-basename-for-filename", "--cores:2", "--verification-time-limit:300" };
-      string[] defaultBuildArgs = new[] { "build", "--use-basename-for-filename", "--show-snippets:false", "--cores:2", "--verification-time-limit:300" };
-      string[] defaultRunArgs = new[] { "run", "--use-basename-for-filename", "--show-snippets:false", "--cores:2", "--verification-time-limit:300" };
+      // Note we disallow standard libraries by default in tests,
+      // to discourage the language itself from depending on them.
+      // These explicit defaults are here, and should remain here independent of the user-facing defaults.
+      // The metatests/StdLibsOffByDefaultInTests.dfy test directly enforces this.
+
+      string[] defaultResolveArgs = new[] { "resolve", "--use-basename-for-filename", "--show-snippets:false", "--standard-libraries:false" };
+      string[] defaultVerifyArgs = new[] { "verify", "--use-basename-for-filename", "--show-snippets:false", "--standard-libraries:false", "--cores:2", "--verification-time-limit:300", "--resource-limit:50e6" };
+      string[] defaultTranslateArgs = new[] { "--use-basename-for-filename", "--cores:2", "--standard-libraries:false", "--verification-time-limit:300", "--resource-limit:50e6" };
+      string[] defaultBuildArgs = new[] { "build", "--use-basename-for-filename", "--show-snippets:false", "--standard-libraries:false", "--cores:2", "--verification-time-limit:300", "--resource-limit:50e6" };
+      string[] defaultRunArgs = new[] { "run", "--use-basename-for-filename", "--show-snippets:false", "--standard-libraries:false", "--cores:2", "--verification-time-limit:300", "--resource-limit:50e6" };
 
       var substitutions = new Dictionary<string, object> {
         { "%diff", "diff" },
-        { "%trargs", "--use-basename-for-filename --show-snippets:false --cores:2 --verification-time-limit:300" },
+        { "%trargs", "--use-basename-for-filename --show-snippets:false, --standard-libraries:false --cores:2 --verification-time-limit:300 --resource-limit:50e6" },
         { "%binaryDir", "." },
         { "%z3", Path.Join("z3", "bin", $"z3-{DafnyOptions.DefaultZ3Version}") },
         { "%repositoryRoot", RepositoryRoot.Replace(@"\", "/") },
@@ -76,8 +82,17 @@ IEnumerable<string> AddExtraArgs(IEnumerable<string> args, IEnumerable<string> l
           "%resolve", (args, config) =>
             DafnyCommand(AddExtraArgs(defaultResolveArgs, args), config, InvokeMainMethodsDirectly)
         }, {
-          "%translate", (args, config) =>
-            DafnyCommand(AddExtraArgs(new[] { "translate" }, args), config, InvokeMainMethodsDirectly)
+          "%translate", (args, config) => {
+            var totalArgs = args.ToList();
+            if (totalArgs.Any()) {
+              var target = totalArgs.First();
+              totalArgs = new[] { target }.Concat(defaultTranslateArgs).Concat(totalArgs.Skip(1)).ToList();
+            } else {
+              totalArgs = defaultTranslateArgs.ToList();
+            }
+            return DafnyCommand(AddExtraArgs(new[] { "translate" }, totalArgs), config,
+              InvokeMainMethodsDirectly);
+          }
         }, {
           "%verify", (args, config) =>
             DafnyCommand(AddExtraArgs(defaultVerifyArgs, args), config, InvokeMainMethodsDirectly)
@@ -89,18 +104,25 @@ IEnumerable<string> AddExtraArgs(IEnumerable<string> args, IEnumerable<string> l
             DafnyCommand(AddExtraArgs(defaultRunArgs, args), config, InvokeMainMethodsDirectly)
         }, {
           "%dafny", (args, config) =>
-            DafnyCommand(AddExtraArgs(DafnyDriver.DefaultArgumentsForTesting, args), config, InvokeMainMethodsDirectly)
+            DafnyCommand(AddExtraArgs(DafnyCliTests.DefaultArgumentsForTesting, args), config, InvokeMainMethodsDirectly)
         }, {
-          "%testDafnyForEachCompiler", (args, config) =>
-            MainMethodLitCommand.Parse(TestDafnyAssembly, new[] { "for-each-compiler" }.Concat(args), config,
-              InvokeMainMethodsDirectly)
+          "%testDafnyForEachCompiler", (args, config) => {
+            var fullArguments = new[] { "for-each-compiler" }.Concat(args);
+            return MainCommand("testDafnyForEachCompiler", fullArguments,
+              (output, error, input, a) => new MultiBackendTest(input, output, error).Start(a),
+              TestDafnyAssembly,
+              config);
+          }
         }, {
-          "%testDafnyForEachResolver", (args, config) =>
-            MainMethodLitCommand.Parse(TestDafnyAssembly, new[] { "for-each-resolver" }.Concat(args), config,
-              InvokeMainMethodsDirectly)
+          "%testDafnyForEachResolver", (args, config) => {
+            var fullArguments = new[] { "for-each-resolver" }.Concat(args);
+            return MainCommand("testDafnyForEachResolver", fullArguments,
+              (output, error, input, a) => new MultiBackendTest(input, output, error).Start(a),
+              TestDafnyAssembly,
+              config);
+          }
         }, {
-          "%server", (args, config) =>
-            MainMethodLitCommand.Parse(DafnyServerAssembly, args, config, InvokeMainMethodsDirectly)
+          "%server", (args, config) => MainCommand("legacyServer", args, Server.MainWithWriters, DafnyServerAssembly, config)
         }, {
           "%boogie", (args, config) => // TODO
             new DotnetToolCommand("boogie",
@@ -110,6 +132,12 @@ IEnumerable<string> AddExtraArgs(IEnumerable<string> args, IEnumerable<string> l
           "%diff", (args, config) => DiffCommand.Parse(args.ToArray())
         }, {
           "%sed", (args, config) => SedCommand.Parse(args.ToArray())
+        }, {
+          "%mv", (args, config) => MvCommand.Parse(args.ToArray())
+        }, {
+          "%rm", (args, config) => RmCommand.Parse(args.ToArray())
+        }, {
+          "%cp", (args, config) => CpCommand.Parse(args.ToArray())
         }, {
           "%OutputCheck", OutputCheckCommand.Parse
         }
@@ -138,7 +166,7 @@ IEnumerable<string> AddExtraArgs(IEnumerable<string> args, IEnumerable<string> l
         throw new Exception($"Unsupported OS: {RuntimeInformation.OSDescription}");
       }
 
-      substitutions["%args"] = DafnyDriver.NewDefaultArgumentsForTesting;
+      substitutions["%args"] = DafnyCliTests.NewDefaultArgumentsForTesting;
 
       var dafnyReleaseDir = Environment.GetEnvironmentVariable("DAFNY_RELEASE");
       if (dafnyReleaseDir != null) {
@@ -147,13 +175,17 @@ IEnumerable<string> AddExtraArgs(IEnumerable<string> args, IEnumerable<string> l
           new ShellLitCommand(dafnyCliPath, args, config.PassthroughEnvironmentVariables);
         commands["%dafny"] = (args, config) =>
           new ShellLitCommand(dafnyCliPath,
-            AddExtraArgs(DafnyDriver.DefaultArgumentsForTesting, args), config.PassthroughEnvironmentVariables);
-        commands["%testDafnyForEachCompiler"] = (args, config) =>
-          MainMethodLitCommand.Parse(TestDafnyAssembly,
-            new[] { "for-each-compiler", "--dafny", dafnyCliPath }.Concat(args), config, false);
-        commands["%testDafnyForEachResolver"] = (args, config) =>
-          MainMethodLitCommand.Parse(TestDafnyAssembly,
-            new[] { "for-each-resolver", "--dafny", dafnyCliPath }.Concat(args), config, false);
+            AddExtraArgs(DafnyCliTests.DefaultArgumentsForTesting, args), config.PassthroughEnvironmentVariables);
+        commands["%testDafnyForEachCompiler"] = (args, config) => {
+          var shellArguments = new[] { TestDafnyAssembly.Location, "for-each-compiler", "--dafny", dafnyCliPath }
+            .Concat(args);
+          return new ShellLitCommand("dotnet", shellArguments, config.PassthroughEnvironmentVariables); ;
+        };
+        commands["%testDafnyForEachResolver"] = (args, config) => {
+          var shellArguments = new[] { TestDafnyAssembly.Location, "for-each-resolver", "--dafny", dafnyCliPath }
+            .Concat(args);
+          return new ShellLitCommand("dotnet", shellArguments, config.PassthroughEnvironmentVariables);
+        };
         commands["%server"] = (args, config) =>
           new ShellLitCommand(Path.Join(dafnyReleaseDir, "DafnyServer"), args, config.PassthroughEnvironmentVariables);
         commands["%boogie"] = (args, config) =>
@@ -163,14 +195,32 @@ IEnumerable<string> AddExtraArgs(IEnumerable<string> args, IEnumerable<string> l
         substitutions["%z3"] = Path.Join(dafnyReleaseDir, "z3", "bin", $"z3-{DafnyOptions.DefaultZ3Version}");
       }
 
-      Config = new LitTestConfiguration(substitutions, commands, features, DafnyDriver.ReferencedEnvironmentVariables);
+      Config = new LitTestConfiguration(substitutions, commands, features, DafnyCliTests.ReferencedEnvironmentVariables);
+    }
+
+    private static ILitCommand MainCommand(string name, IEnumerable<string> args, MainWithWriters mainWithWriters, Assembly assembly,
+      LitTestConfiguration config) {
+      if (InvokeMainMethodsDirectly) {
+        return new MainWithWritersCommand(name, args, mainWithWriters);
+      }
+
+      var shellArguments = new[] { assembly.Location }.Concat(args);
+      return new ShellLitCommand("dotnet", shellArguments, config.PassthroughEnvironmentVariables);
     }
 
     public static ILitCommand DafnyCommand(IEnumerable<string> arguments, LitTestConfiguration config, bool invokeDirectly) {
-      return invokeDirectly
-        ? new DafnyDriverLitCommand(arguments, config)
-        : new ShellLitCommand("dotnet", new[] { DafnyDriverAssembly.Location }.Concat(arguments),
+      if (invokeDirectly) {
+        return new MainWithWritersCommand("dafny", arguments, DafnyBackwardsCompatibleCli.MainWithWriters);
+      }
+
+      var dafnyReleaseDir = Environment.GetEnvironmentVariable("DAFNY_RELEASE");
+      if (dafnyReleaseDir == null) {
+        return new ShellLitCommand("dotnet", new[] { DafnyDriverAssembly.Location }.Concat(arguments),
           config.PassthroughEnvironmentVariables);
+      }
+
+      var dafnyCliPath = Path.Join(dafnyReleaseDir, "dafny");
+      return new ShellLitCommand(dafnyCliPath, arguments, config.PassthroughEnvironmentVariables);
     }
 
     private readonly ITestOutputHelper output;
@@ -192,7 +242,7 @@ public void LitTest(string path) {
           // not the copy in the output directory of this project.
           var sourcePath = Path.Join(Environment.GetEnvironmentVariable("DAFNY_INTEGRATION_TESTS_ROOT_DIR"), testPath);
           ConvertToMultiBackendTestIfNecessary(sourcePath);
-          return;
+          break;
         case "uniformity-check":
           var testCase = LitTestCase.Read(path, Config);
           if (NeedsConverting(testCase)) {
@@ -224,14 +274,14 @@ private static bool NeedsConverting(LitTestCase testCase) {
           return false;
         }
 
-        if (leafCommand is ShellLitCommand or DafnyDriverLitCommand) {
+        if (leafCommand is ShellLitCommand or MainWithWritersCommand) {
           var arguments = GetDafnyArguments(leafCommand);
           if (arguments != null) {
             if (arguments.Any(arg => allOtherFileExtensions.Any(arg.EndsWith))) {
               return false;
             }
 
-            if (arguments.Any(arg => arg is "/compile:3" or "/compile:4" or "run" or "translate")) {
+            if (arguments.Any(arg => arg is "/compile:3" or "/compile:4" or "run")) {
               return true;
             }
           }
@@ -245,7 +295,7 @@ private static bool IsMultiBackend(LitTestCase testCase) {
       foreach (var command in testCase.Commands) {
         var leafCommand = GetLeafCommand(command);
 
-        if (leafCommand is ShellLitCommand or DafnyDriverLitCommand) {
+        if (leafCommand is ShellLitCommand or MainWithWritersCommand) {
           var arguments = GetDafnyArguments(leafCommand);
           if (arguments != null) {
             if (arguments.Any(arg => arg is "for-each-compiler")) {
@@ -270,10 +320,10 @@ bool IgnoreArgument(string arg, string testFilePath) {
           return true;
         }
 
-        if (DafnyDriver.NewDefaultArgumentsForTesting.Contains(arg)) {
+        if (DafnyCliTests.NewDefaultArgumentsForTesting.Contains(arg)) {
           return true;
         }
-        if (DafnyDriver.DefaultArgumentsForTesting.Contains(arg)) {
+        if (DafnyCliTests.DefaultArgumentsForTesting.Contains(arg)) {
           return true;
         }
 
@@ -308,7 +358,7 @@ bool IgnoreArgument(string arg, string testFilePath) {
       foreach (var command in testCase.Commands) {
         var leafCommand = GetLeafCommand(command);
         switch (leafCommand) {
-          case ShellLitCommand or DafnyDriverLitCommand: {
+          case ShellLitCommand or MainWithWritersCommand: {
               var arguments = GetDafnyArguments(leafCommand);
               if (arguments == null) {
                 throw new ArgumentException();
@@ -421,7 +471,7 @@ bool IgnoreArgument(string arg, string testFilePath) {
           "/optimizeErasableDatatypeWrapper:0" => "--optimize-erasable-datatype-wrapper:false",
           "/verifyAllModules" => "--verify-included-files",
           "/errorLimit:0" => "--error-limit:0",
-          "/deprecation:0" => "--warn-deprecation:false",
+          "/deprecation:0" => "--allow-deprecation",
           _ => extraOption
         });
       }
@@ -478,7 +528,7 @@ private static ILitCommand GetLeafCommand(ILitCommand command) {
           } else {
             return null;
           }
-        case DafnyDriverLitCommand ddlc:
+        case MainWithWritersCommand ddlc:
           return ddlc.Arguments;
         default:
           return null;
@@ -505,53 +555,4 @@ private static ILitCommand GetLeafCommand(ILitCommand command) {
       return "cs";
     }
   }
-
-  class DafnyDriverLitCommand : ILitCommand {
-    public string[] Arguments { get; }
-
-    public DafnyDriverLitCommand(IEnumerable<string> arguments, LitTestConfiguration config) {
-      this.Arguments = arguments.ToArray();
-    }
-
-    public (int, string, string) Execute(TextReader inputReader,
-      TextWriter outputWriter,
-      TextWriter errorWriter) {
-      var exitCode = DafnyDriver.MainWithWriters(outputWriter, errorWriter, inputReader, Arguments);
-      return (exitCode, "", "");
-    }
-
-    public override string ToString() {
-      return $"dafny {string.Join(" ", Arguments)}";
-    }
-  }
-
-  class MultiBackendLitCommand : ILitCommand {
-    private readonly string[] arguments;
-
-    public MultiBackendLitCommand(IEnumerable<string> arguments, LitTestConfiguration config) {
-      this.arguments = arguments.ToArray();
-    }
-
-    public (int, string, string) Execute(TextReader inputReader,
-      TextWriter outputWriter,
-      TextWriter errorWriter) {
-      var exitCode = new MultiBackendTest(inputReader, outputWriter, errorWriter).Start(arguments.Prepend("for-each-compiler"));
-      return (exitCode, "", "");
-    }
-  }
-
-  class MultiResolverLitCommand : ILitCommand {
-    private readonly string[] arguments;
-
-    public MultiResolverLitCommand(IEnumerable<string> arguments, LitTestConfiguration config) {
-      this.arguments = arguments.ToArray();
-    }
-
-    public (int, string, string) Execute(TextReader inputReader,
-      TextWriter outputWriter,
-      TextWriter errorWriter) {
-      var exitCode = new MultiBackendTest(inputReader, outputWriter, errorWriter).Start(arguments.Prepend("for-each-resolver"));
-      return (exitCode, "", "");
-    }
-  }
 }
\ No newline at end of file
diff --git a/Source/IntegrationTests/README.md b/Source/IntegrationTests/README.md
index 65ac0de6e87..b17c76a5b41 100644
--- a/Source/IntegrationTests/README.md
+++ b/Source/IntegrationTests/README.md
@@ -1,4 +1,4 @@
 # IntegrationTests
 
-This .NET test project executes all of the LIT integration tests under the [`Test`](../../Test/) directory
+This .NET test project executes all of the LIT integration tests under the [`LitTest`](TestFiles/LitTests/LitTest) directory
 using the [xUnit-based LIT interpreter](../XUnitExtensions/).
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/.gitignore
new file mode 100644
index 00000000000..6c3987f3443
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/.gitignore
@@ -0,0 +1,45 @@
+**/Output/
+
+# C# output
+**/*.cs
+**/*.dll
+**/*.runtimeconfig.json
+**/*.mdb
+**/*.pdb
+**/bin
+**/obj
+
+# JavaScript output
+**/*.js
+
+# Go output
+**/*-go
+
+# Java output
+**/*-java
+**/*.jar
+
+# C++ output
+**/*.h
+**/*.cpp
+**/*.dSYM
+**/*.exe
+
+# Python output
+**/*-py
+
+# Rust output
+**/*-rust
+
+node_modules/
+package-lock.json
+packages
+
+server/model.bvd
+git-issues/git-issue-622$f/**
+comp/compile1verbose/CompileAndThenRun
+comp/compile1quiet/CompileRunQuietly
+docexamples
+
+**/Build/**
+**/.lit_test_times.txt
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/RunAllTests/RunAllTests.csproj b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/RunAllTests/RunAllTests.csproj
new file mode 100644
index 00000000000..eefc01ebbeb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/RunAllTests/RunAllTests.csproj
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Output/manual/program.cs" />
+  </ItemGroup>
+</Project>
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/RunAllTests/RunAllTestsOption.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/RunAllTests/RunAllTestsOption.dfy
new file mode 100644
index 00000000000..8e02b5f5482
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/RunAllTests/RunAllTestsOption.dfy
@@ -0,0 +1,42 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %translate cs %args %s --include-runtime --include-test-runner --no-verify --output %S/Output/manual/program.cs >> "%t"
+// RUN: ! dotnet run -v q --property WarningLevel=0 --project %S/RunAllTests.csproj >> "%t"
+// RUN: ! %baredafny test %args --no-verify --target:cs "%s" >> "%t"
+// RUN: ! %baredafny test %args --no-verify --target:java "%s" >> "%t"
+// RUN: ! %baredafny test %args --no-verify --target:go "%s" >> "%t"
+// RUN: ! %baredafny test %args --no-verify --target:js "%s" >> "%t"
+// RUN: ! %baredafny test %args --no-verify --target:py "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t" 
+
+include "../../exceptions/VoidOutcomeDt.dfy"
+include "../../exceptions/NatOutcomeDt.dfy"
+
+method {:test} Passing1() {
+  expect 2 == 2;
+}
+
+method {:test} Passing2() {
+  expect 2 + 2 == 4;
+}
+
+method {:test} Failing1() {
+  expect 2 + 2 == 5;
+}
+
+method {:test} Passing3() {
+  expect 2 + 2 == 4;
+}
+
+method {:test} Failing2() {
+  expect 2 + 2 == 5;
+}
+
+module TestModule {
+  method {:test} Passing1() {
+    expect 2 + 2 == 4;
+  }
+}
+
+method {:test} FailingReturnValue() returns (result: VoidOutcome) {
+  return VoidFailure("Whoopsie");
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/RunAllTests/RunAllTestsOption.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/RunAllTests/RunAllTestsOption.dfy.expect
new file mode 100644
index 00000000000..20ae853bf7a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/RunAllTests/RunAllTestsOption.dfy.expect
@@ -0,0 +1,86 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure("Whoopsie")
+[Program halted] RunAllTestsOption.dfy(11,0): Test failures occurred: see above.
+
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure("Whoopsie")
+[Program halted] RunAllTestsOption.dfy(11,0): Test failures occurred: see above.
+
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure("Whoopsie")
+[Program halted] RunAllTestsOption.dfy(11,0): Test failures occurred: see above.
+
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure("Whoopsie")
+[Program halted] RunAllTestsOption.dfy(11,0): Test failures occurred: see above.
+
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure("Whoopsie")
+[Program halted] RunAllTestsOption.dfy(11,0): Test failures occurred: see above.
+
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure("Whoopsie")
+[Program halted] RunAllTestsOption.dfy(11,0): Test failures occurred: see above.
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/TestAttribute/TestAttribute.csproj b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/TestAttribute/TestAttribute.csproj
new file mode 100644
index 00000000000..58a723cd452
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/TestAttribute/TestAttribute.csproj
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+  </ItemGroup>
+</Project>
diff --git a/Test/DafnyTests/TestAttribute.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/TestAttribute/TestAttribute.dfy
similarity index 91%
rename from Test/DafnyTests/TestAttribute.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/TestAttribute/TestAttribute.dfy
index 335438a4627..f59a8cb9872 100644
--- a/Test/DafnyTests/TestAttribute.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/TestAttribute/TestAttribute.dfy
@@ -1,20 +1,20 @@
-// RUN: %exits-with 3 %dafny /compileVerbose:1 /compile:0 /spillTargetCode:3 /noVerify "%s" > "%t"
-// RUN: ! dotnet test -v:q %S 2>> %t
+// RUN: %translate cs --include-runtime --allow-warnings "%s" > "%t"
+// RUN: ! dotnet test -v:q %S/TestAttribute.csproj 2>> %t
 //
 // RUN: %OutputCheck --file-to-check "%t" "%s"
-// CHECK: .*Error: Post-conditions on function Identity might be unsatisfied when synthesizing code for method mockUnsafe.*
-// CHECK: .*Error: Stubbing fields is not recommended \(field value of object e inside method MockField\).*
-// CHECK: .*Error: Stubbing fields is not recommended \(field value of object e inside method ParametrizedMock\).*
-// CHECK: .*_module.__default.FailingTest_CheckForFailureForXunit.*
+// CHECK: .*Warning: Post-conditions on function Identity might be unsatisfied when synthesizing code for method mockUnsafe.*
+// CHECK: .*Warning: Stubbing fields is not recommended \(field value of object e inside method MockField\).*
+// CHECK: .*Warning: Stubbing fields is not recommended \(field value of object e inside method ParametrizedMock\).*
 // CHECK: .*_module.__default.FailingTestUsingMock.*
-// CHECK: .*_module.__default.FailingTestUsingExpectWithMessage.*
-// CHECK: .*_module.__default.FailingTestUsingExpect.*
 // CHECK: .*_module.__default.FailingTestUsingNoLHSAssignOrHalt.*
+// CHECK: .*_module.__default.FailingTestUsingExpectWithMessage.*
+// CHECK: .*_module.__default.FailingTest_CheckForFailureForXunit.*
 // CHECK: .*_module.__default.FailingTestUsingAssignOrHalt.*
+// CHECK: .*_module.__default.FailingTestUsingExpect.*
 // CHECK-NOT: .*PassingTest.*
 
-include "../exceptions/VoidOutcomeDt.dfy"
-include "../exceptions/NatOutcomeDt.dfy"
+include "../../exceptions/VoidOutcomeDt.dfy"
+include "../../exceptions/NatOutcomeDt.dfy"
 
 function SafeDivide(a: nat, b: nat): NatOutcome {
   if b == 0 then
diff --git a/Test/DafnyTests/zeroExitCodeTests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/zeroExitCodeTests.dfy
similarity index 100%
rename from Test/DafnyTests/zeroExitCodeTests.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/DafnyTests/zeroExitCodeTests.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass1.dfy
new file mode 100644
index 00000000000..3643f6bf5a3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass1.dfy
@@ -0,0 +1,30 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class Ref {
+  var inner: Ref
+  constructor()
+}
+
+function myf(o: Ref): ()
+  requires false
+  reads o.inner
+{
+  ()
+}
+
+method Main()
+  ensures false
+{
+  var outer := new Ref();
+
+  var inner1 := new Ref();
+  outer.inner := inner1;
+  var reads1 := myf.reads(outer);  // Error: function precondition could not be proved
+  assert reads1 == {inner1};
+
+  var inner2 := new Ref();
+  outer.inner := inner2;
+  var reads2 := myf.reads(outer);
+  assert reads2 == {inner2};
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass1.dfy.expect
new file mode 100644
index 00000000000..ce97f8cf02f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass1.dfy.expect
@@ -0,0 +1,3 @@
+ReadPreconditionBypass1.dfy(23,25): Error: function precondition could not be proved
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass2.dfy
new file mode 100644
index 00000000000..cac1aec13cf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass2.dfy
@@ -0,0 +1,32 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class Ref {
+  var inner: Ref
+  constructor()
+}
+
+function myf(o: Ref): ()
+  requires false
+  reads o.inner
+{
+  ()
+}
+
+method Main()
+  ensures false
+{
+  var outer := new Ref();
+
+  var hof := myf.reads;
+
+  var inner1 := new Ref();
+  outer.inner := inner1;
+  var reads1 := hof(outer); // Error: function precondition could not be proved
+  assert reads1 == {inner1};
+
+  var inner2 := new Ref();
+  outer.inner := inner2;
+  var reads2 := hof(outer);
+  assert reads2 == {inner2};
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass2.dfy.expect
new file mode 100644
index 00000000000..bdb4453174c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass2.dfy.expect
@@ -0,0 +1,3 @@
+ReadPreconditionBypass2.dfy(25,16): Error: function precondition could not be proved
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass3.dfy
new file mode 100644
index 00000000000..92e5458801e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass3.dfy
@@ -0,0 +1,32 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class Ref {
+  var inner: Ref
+  constructor()
+}
+
+function myf(o: Ref): ()
+  requires false
+  reads o.inner
+{
+  ()
+}
+
+method Main()
+  ensures false
+{
+  var outer := new Ref();
+
+  var myg := myf.requires;
+
+  var inner1 := new Ref();
+  outer.inner := inner1;
+  var reads1 := myg.reads(outer);
+  assert reads1 == {inner1}; // Error: assertion might not hold
+
+  var inner2 := new Ref();
+  outer.inner := inner2;
+  var reads2 := myg.reads(outer);
+  assert reads2 == {inner2}; // Error: assertion might not hold
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass3.dfy.expect
new file mode 100644
index 00000000000..aedeb65e281
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass3.dfy.expect
@@ -0,0 +1,4 @@
+ReadPreconditionBypass3.dfy(26,2): Error: assertion might not hold
+ReadPreconditionBypass3.dfy(31,2): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass4.dfy
new file mode 100644
index 00000000000..61a5804b897
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass4.dfy
@@ -0,0 +1,46 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class Ref {
+  var inner: Ref
+  constructor() {
+    inner := this;
+  }
+}
+
+function myf(o: Ref): ()
+  requires false
+  reads o.inner
+{
+  ()
+}
+
+method M()
+{
+  var outer := new Ref();
+
+  var myg := myf.requires;
+  var myh := myg.requires;
+
+  var inner1 := new Ref();
+  outer.inner := inner1;
+  var reads1 := myg.reads(outer);
+  var reads2 := myh.reads(outer);
+  assert reads1 == reads2;
+  assert reads2 == {inner1}; // Error: assertion might not hold
+  assert false; // we don't know what the reads clause is, because the precondition of myf does not hold.
+}
+
+method M2()
+{
+  var outer := new Ref();
+
+  var myg := myf.requires;
+  var myh := myg.requires;
+
+  var inner2 := new Ref();
+  outer.inner := inner2;
+  var reads2 := myh.reads(outer);
+  assert reads2 == {inner2}; // Error: assertion might not hold
+  assert false; // we don't know what the reads clause is, because the precondition of myf does not hold.
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass4.dfy.expect
new file mode 100644
index 00000000000..5898f59f007
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/HigherOrderIntrinsicSpecification/ReadPreconditionBypass4.dfy.expect
@@ -0,0 +1,4 @@
+ReadPreconditionBypass4.dfy(30,2): Error: assertion might not hold
+ReadPreconditionBypass4.dfy(44,2): Error: assertion might not hold
+
+Dafny program verifier finished with 2 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot1.dfy
new file mode 100644
index 00000000000..f643ce0fd13
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot1.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+class Ref {
+  ghost var hogp: () ~> int
+}
+
+method Main()
+  ensures false
+{
+  var r := new Ref;
+  // error: r.hogp calls itself without decreasing
+  r.hogp := () reads r, r.hogp.reads() => if r.hogp.requires() then 1 + r.hogp() else 0;
+}
\ No newline at end of file
diff --git a/Test/Landin/Knot1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot1.dfy.expect
similarity index 100%
rename from Test/Landin/Knot1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot1.dfy.expect
diff --git a/Test/Landin/Knot10.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot10.dfy
similarity index 80%
rename from Test/Landin/Knot10.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot10.dfy
index fa86b6e6b63..9e63f833a38 100644
--- a/Test/Landin/Knot10.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot10.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 datatype Pack<T> = Pack(ghost c: T)
 
diff --git a/Test/Landin/Knot10.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot10.dfy.expect
similarity index 100%
rename from Test/Landin/Knot10.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot10.dfy.expect
diff --git a/Test/Landin/Knot11.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot11.dfy
similarity index 77%
rename from Test/Landin/Knot11.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot11.dfy
index d1c22198347..228a6212350 100644
--- a/Test/Landin/Knot11.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot11.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 datatype Pack<T> = Pack(ghost c: T)
 
diff --git a/Test/Landin/Knot11.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot11.dfy.expect
similarity index 100%
rename from Test/Landin/Knot11.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot11.dfy.expect
diff --git a/Test/Landin/Knot12.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot12.dfy
similarity index 82%
rename from Test/Landin/Knot12.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot12.dfy
index d32ba0817de..4034981623a 100644
--- a/Test/Landin/Knot12.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot12.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 datatype Pack<T> = Pack(ghost c: T)
 
diff --git a/Test/Landin/Knot12.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot12.dfy.expect
similarity index 100%
rename from Test/Landin/Knot12.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot12.dfy.expect
diff --git a/Test/Landin/Knot13.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot13.dfy
similarity index 79%
rename from Test/Landin/Knot13.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot13.dfy
index 8f1b7fdd82a..b2f26f9ccf6 100644
--- a/Test/Landin/Knot13.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot13.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 class Ref1 {
   ghost var hogp: () ~> int
diff --git a/Test/Landin/Knot13.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot13.dfy.expect
similarity index 100%
rename from Test/Landin/Knot13.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot13.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot14.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot14.dfy
new file mode 100644
index 00000000000..422df0b7e42
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot14.dfy
@@ -0,0 +1,19 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+class Y {
+  const f: Y? -> nat
+  constructor(f: Y? -> nat)
+    ensures this.f == f
+  {
+    this.f := f;
+  }
+}
+
+method Main()
+  ensures false
+{
+  // error: knot.f calls itself without decreasing
+  var knot := new Y((x: Y?) => if x == null then 0 else 1 + x.f(x));
+  var a := knot.f(knot);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot14.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot14.dfy.expect
new file mode 100644
index 00000000000..44b7b125db6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot14.dfy.expect
@@ -0,0 +1,2 @@
+Knot14.dfy(9,11): Error: To prevent the creation of non-terminating functions, storing functions into an object's fields that reads the object is disallowed
+1 resolution/type errors detected in Knot14.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot15.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot15.dfy
new file mode 100644
index 00000000000..c95f21d7f5f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot15.dfy
@@ -0,0 +1,21 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+class Y {
+  const f: YWithConstraint -> nat
+  constructor(f: YWithConstraint -> nat)
+    ensures this.f == f
+  {
+    this.f := f;
+  }
+}
+
+type YWithConstraint = y: Y | true witness *
+
+method Main()
+  ensures false
+{
+  // error: knot.f calls itself without decreasing
+  var knot := new Y((x: YWithConstraint) => 1 + x.f(x));
+  var a := knot.f(knot);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot15.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot15.dfy.expect
new file mode 100644
index 00000000000..c78dd58d9b3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot15.dfy.expect
@@ -0,0 +1,2 @@
+Knot15.dfy(9,11): Error: To prevent the creation of non-terminating functions, storing functions into an object's fields that reads the object is disallowed
+1 resolution/type errors detected in Knot15.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot16.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot16.dfy
new file mode 100644
index 00000000000..304030b1064
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot16.dfy
@@ -0,0 +1,22 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+trait YT {
+  const f: Y -> nat
+}
+
+class Y extends YT {
+  constructor(f: YT -> nat)
+    ensures this.f == f
+  {
+    this.f := f;
+  }
+}
+
+method Main()
+  ensures false
+{
+  // error: knot.f calls itself without decreasing
+  var knot := new Y((x: YT) => if x is Y then 1 + x.f(x as Y) else 0);
+  var a := knot.f(knot);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot16.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot16.dfy.expect
new file mode 100644
index 00000000000..bc9b287f80e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot16.dfy.expect
@@ -0,0 +1,2 @@
+Knot16.dfy(12,11): Error: To prevent the creation of non-terminating functions, storing functions into an object's fields that reads the object is disallowed
+1 resolution/type errors detected in Knot16.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot17.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot17.dfy
new file mode 100644
index 00000000000..2eb6ade2c59
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot17.dfy
@@ -0,0 +1,22 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+trait YT {
+  const f: YT -> nat
+}
+
+class Y extends YT {
+  constructor(f: YT -> nat)
+    ensures this.f == f
+  {
+    this.f := f;
+  }
+}
+
+method Main()
+  ensures false
+{
+  // error: knot.f calls itself without decreasing
+  var knot := new Y((x: YT) => if x is Y then 1 + x.f(x as Y) else 0);
+  var a := knot.f(knot);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot17.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot17.dfy.expect
new file mode 100644
index 00000000000..0bf9e9c9713
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot17.dfy.expect
@@ -0,0 +1,2 @@
+Knot17.dfy(12,11): Error: To prevent the creation of non-terminating functions, storing functions into an object's fields that reads the object is disallowed
+1 resolution/type errors detected in Knot17.dfy
diff --git a/Test/Landin/Knot2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot2.dfy
similarity index 84%
rename from Test/Landin/Knot2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot2.dfy
index 424a585a0a0..619f3bbb1f0 100644
--- a/Test/Landin/Knot2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot2.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 class Ref {
   ghost var hogp: () ~> int
diff --git a/Test/Landin/Knot2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot2.dfy.expect
similarity index 100%
rename from Test/Landin/Knot2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot2.dfy.expect
diff --git a/Test/Landin/Knot3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot3.dfy
similarity index 86%
rename from Test/Landin/Knot3.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot3.dfy
index 615dadcf526..0f1ef1ea507 100644
--- a/Test/Landin/Knot3.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot3.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 class C {
 
diff --git a/Test/Landin/Knot3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot3.dfy.expect
similarity index 100%
rename from Test/Landin/Knot3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot3.dfy.expect
diff --git a/Test/Landin/Knot4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot4.dfy
similarity index 83%
rename from Test/Landin/Knot4.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot4.dfy
index 0578e062c87..6e7c63cb45f 100644
--- a/Test/Landin/Knot4.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot4.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 class Y {
   const f: Y -> nat // Type error here? because since Y can be accessed, -> should be ~>
diff --git a/Test/Landin/Knot4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot4.dfy.expect
similarity index 100%
rename from Test/Landin/Knot4.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot4.dfy.expect
diff --git a/Test/Landin/Knot5.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot5.dfy
similarity index 79%
rename from Test/Landin/Knot5.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot5.dfy
index f0c7e1956a2..13a79dbc0ba 100644
--- a/Test/Landin/Knot5.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot5.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 datatype Pack<T> = Pack(ghost c: T)
 
diff --git a/Test/Landin/Knot5.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot5.dfy.expect
similarity index 100%
rename from Test/Landin/Knot5.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot5.dfy.expect
diff --git a/Test/Landin/Knot6.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot6.dfy
similarity index 90%
rename from Test/Landin/Knot6.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot6.dfy
index bf50f64ad96..713989af059 100644
--- a/Test/Landin/Knot6.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot6.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 class Ref {
   ghost var hogp: () ~> int
diff --git a/Test/Landin/Knot6.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot6.dfy.expect
similarity index 100%
rename from Test/Landin/Knot6.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot6.dfy.expect
diff --git a/Test/Landin/Knot7.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot7.dfy
similarity index 78%
rename from Test/Landin/Knot7.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot7.dfy
index a8859414526..dc992bc630a 100644
--- a/Test/Landin/Knot7.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot7.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 class Ref {
   ghost var hogp: Ref ~> int
diff --git a/Test/Landin/Knot7.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot7.dfy.expect
similarity index 100%
rename from Test/Landin/Knot7.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot7.dfy.expect
diff --git a/Test/Landin/Knot8.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot8.dfy
similarity index 75%
rename from Test/Landin/Knot8.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot8.dfy
index a084e565619..fad44d9d22f 100644
--- a/Test/Landin/Knot8.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot8.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 class Ref<T> {
   ghost var hogp: T
diff --git a/Test/Landin/Knot8.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot8.dfy.expect
similarity index 100%
rename from Test/Landin/Knot8.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot8.dfy.expect
diff --git a/Test/Landin/Knot9.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot9.dfy
similarity index 83%
rename from Test/Landin/Knot9.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot9.dfy
index 68db757c202..95abc73550c 100644
--- a/Test/Landin/Knot9.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot9.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 trait T<U> {
   const f: U -> nat // Type error here? because since Y can be accessed, -> should be ~>
diff --git a/Test/Landin/Knot9.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot9.dfy.expect
similarity index 100%
rename from Test/Landin/Knot9.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/Landin/Knot9.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/README.md b/Source/IntegrationTests/TestFiles/LitTests/LitTest/README.md
new file mode 100644
index 00000000000..be1c7db654c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/README.md
@@ -0,0 +1,128 @@
+# Dafny Integration Tests
+
+The tests in this directory are run using the [IntegrationTests](../Source/IntegrationTests) project,
+which uses the xUnit-based LIT test runner from the [XUnitExtensions](../Source/XUnitExtensions) package 
+rather than the LLVM `lit` CLI.
+
+## Executing Tests from the Command Line
+
+The xUnit LIT test interpreter is run through xUnit `Theory` parameterized tests, and therefore
+hooks into the general-purpose `dotnet test` command:
+
+```
+dotnet test --logger "console;verbosity=normal" Source/IntegrationTests
+```
+
+`-logger "console;verbosity=normal"` is optional, and increases the default logging verbosity so that you can see individual tests as the pass.
+
+The file path of each test file, relative to this directory, is used as the display name of its corresponding test.
+This means you can use the `--filter` option to run a subset of tests, or even a single file:
+
+```
+dotnet test --logger "console;verbosity=normal" Source/IntegrationTests --filter DisplayName~comp/Hello.dfy
+```
+
+[See here](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test) for more information about
+the `dotnet test` command and other supported options.
+
+## Writing tests
+
+Lit tests use a very restricted form of command-line: executables and their arguments, piping,
+`>` and `>>` redirections (for respectively writing and appending stdout to a file) 
+and `2>` and `2>>` redirections (for respectively writing and appending both stdout and stderr to a file).
+
+To work cross-platform, use a number of macros: %verify, %resolve, %build, %run, %translate (with %trargs),
+%exits-with, %diff, %sed and others you can find defined in lit.site.cfg
+
+`Any new macros defined here must also be defied in Source/IntegrationTests/LitTests.cs`
+
+A typical simple test for a single source file that has verification errors is
+```
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+```
+
+There are many examples in the .dfy files under this directory.
+
+If you need an extra dafny file without any verification on it, use the command:
+
+    // RUN: echo 'lit should ignore this file' 
+
+## Uniform backend testing
+
+In order to maximum testing coverage across all supported backends,
+especially as additional backends are added in the future,
+the default command for any test that compiles and/or executes a valid Dafny program should be:
+
+```
+// RUN: %testDafnyForEachCompiler "%s"
+```
+
+This command will run the program with each backend
+and assert that the program output matches the content of `<test file>.expect`.
+See [the TestDafny utility](../../../../TestDafny/README.md) for more details.
+
+Any test that manually compiles and/or executes a program against one or more backends
+will be flagged by CI, and should be fixed by either converting it to use
+`%testDafnyForEachCompiler` or adding a `// NONUNIFORM: <reason>` command
+to flag it as intentionally inconsistent,
+for tests of backend-specific externs for example.
+
+If a platform is not supported, please use the following command:
+
+```
+// UNSUPPORTED: windows, macosx
+```
+
+You can specify one or multiple platforms separated by a comma among `windows`, `posix`, `macosx`
+
+## Executing Tests from JetBrains Rider
+
+You will likely find it more convenient to run tests from an IDE such as
+[JetBrains Rider](https://github.com/dafny-lang/dafny/wiki/JetBrains-Rider-FAQ), with a proper JDK installed like JDK 8.
+
+Assuming you have loaded the `Dafny.sln` solution in Rider, you can execute all the integration tests
+by right-clicking on the `IntegrationTests` package and selecting `Run Unit Tests`.
+
+![Running Integration Tests in Rider](rider-run-unit-tests.png)
+
+You will see a tree of running tests and their results, with lots of options for filtering and summarizing results.
+Note the search window in the top-left, which can be used to filter to tests matching a particular substring.
+
+![Running Integration Tests in Rider](rider-unit-tests-window.png)
+
+Once you have at least started running these tests at least once and this tree has been populated, you can right-click any
+individual test to execute it, or similarly any subset of selected tests. You will often want to start the test suite and then
+immediately cancel it just to populate the tree for this purpose.
+
+## Debugging Tests
+
+The xUnit test runner supports executing commands such as `%dafny` by directly invoking the main entry point
+of the corresponding C# package (i.e. [`DafnyDriver`](../Source/DafnyDriver)), which makes running the debugger against
+a particular test much more convenient. By default this is disabled and the runner creates a separate dafny process
+just as LIT does, however. This is because the main CLI implementation currently has shared static state, which
+causes errors when invoking the CLI in the same process on multiple inputs in sequence, much less in parallel.
+Future changes will address this so that the in-process Main invocation can be used instead, however,
+which will likely improve performance.
+
+To debug a single test, you change the value of the `DAFNY_INTEGRATION_TESTS_IN_PROCESS` environment variable
+to `true` (See https://www.jetbrains.com/help/rider/Reference__Options__Tools__Unit_Testing__Test_Runner.html),
+and then right-click the test you wish to debug and select
+`Debug Selected Unit Tests`. You will see exceptions if the test you are running makes multiple calls to commands like `%dafny`,
+so you may wish to remove the calls you are not interested in first, e.g. if you are debugging an issue with a specific compiler.
+
+## Updating test expect files
+If you set the environment variable `DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE` to `true`, then the `diff` command in tests will not do a comparison but instead overwrite the expected file with the actual contents. This can be useful when you need to update expect files.
+
+## Updating compiler-specific test expect files
+To update compiler-specific error-aware output files for tests running with `%forEachDafnyCompiler`,
+do the following:
+
+1. Set the environment variable `DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE` to `true` (See the Debugging Tests section above on how to set the environment variables)
+2. Set the environment variable `DAFNY_INTEGRATION_TESTS_ROOT_DIR` to the path to the  `dafny\Source\IntegrationTests` folder
+3. To additionally run only the foreach compiler tests, and specifically on one single compiler:
+  * Set the environment variable `DAFNY_INTEGRATION_TESTS_MODE` to `only-multi-backend`
+  * Set the environment variable `DAFNY_INTEGRATION_TESTS_ONLY_COMPILERS` to `rs` for rust for example. It's a comma-separated list of compiler IDs for which the tests should run
+
+With 1. and 2. every time a compiler encounters errors on a `file.dfy`, it will emit a `file.dfy.ID.error.expect` next to that file so that we know what this file is not supported by the compiler.
+Make sure you set `DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE` back to false when you don't need to update these files!
\ No newline at end of file
diff --git a/Test/VSComp2010/Problem1-SumMax.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem1-SumMax.dfy
similarity index 93%
rename from Test/VSComp2010/Problem1-SumMax.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem1-SumMax.dfy
index d4f13f3bd30..21b7ecc97f0 100644
--- a/Test/VSComp2010/Problem1-SumMax.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem1-SumMax.dfy
@@ -1,5 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
 
 // VSComp 2010, problem 1, compute the sum and max of the elements of an array and prove
 // that 'sum <= N * max'.
diff --git a/Test/VSComp2010/Problem1-SumMax.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem1-SumMax.dfy.expect
similarity index 100%
rename from Test/VSComp2010/Problem1-SumMax.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem1-SumMax.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem2-Invert.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem2-Invert.dfy
new file mode 100644
index 00000000000..0400e868a1d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem2-Invert.dfy
@@ -0,0 +1,69 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+// VSComp 2010, problem 2, compute the inverse 'B' of a permutation 'A' and prove that 'B' is
+// indeed an inverse of 'A' (or at least prove that 'B' is injective).
+// Rustan Leino, 31 August 2010.
+//
+// In the version of this program that I wrote during the week of VSTTE 2010, I had
+// used a lemma (stated as a ghost method) that I proved inductively (using a loop and
+// a loop invariant).  Here, I have simplified that version by just including an
+// assertion of the crucial property, which follows from the surjectivity of 'A'.
+//
+// The difficulty in proving this program with an SMT solver stems from the fact that
+// the quantifier that states the surjectivity property has no good matching trigger
+// (because there are no function symbols mentioned in the antecedent of that quantifier,
+// only built-in predicates).  Therefore, I introduced a dummy function 'inImage' and
+// defined it always to equal 'true'.  I can then mention this function in the crucial
+// assertion, which causes the appropriate triggering to take place.
+//
+// A slight annoyance is that the loop's modifications of the heap, which is checked
+// to include only the elements of 'B'.  Since 'A' and 'B' are arrays stored at different
+// locations in the heap, it then follows that the elements of 'A' are not modified.
+// However, the fact that the heap has changed at all makes the symbolic expressions
+// denoting the elements of 'A' look different before and after the heap.  The
+// assertion after the loop (which, like all assertions, is proved) is needed to
+// connect the two.
+
+method M(N: int, A: array<int>, B: array<int>)
+  requires 0 <= N && N == A.Length && N == B.Length && A != B
+  requires forall k :: 0 <= k < N ==> 0 <= A[k] < N
+  requires forall j, k :: 0 <= j < k < N ==> A[j] != A[k] // A is injective
+  requires forall m :: 0 <= m < N && inImage(m) ==> exists k :: 0 <= k < N && A[k] == m // A is surjective
+  modifies B
+  ensures forall k :: 0 <= k < N ==> 0 <= B[k] < N
+  ensures forall k :: 0 <= k < N ==> B[A[k]] == k == A[B[k]] // A and B are each other's inverses
+  ensures forall j, k :: 0 <= j < k < N ==> B[j] != B[k] // (which means that) B is injective
+{
+  for n := 0 to N
+    invariant forall k :: 0 <= k < n ==> B[A[k]] == k
+  {
+    B[A[n]] := n;
+  }
+
+  // it now follows from the surjectivity of A that A is the inverse of B:
+  assert forall j :: 0 <= j < N && inImage(j) ==> 0 <= B[j] < N && A[B[j]] == j;
+}
+
+ghost function inImage(i: int): bool { true }  // this function is used to trigger the surjective quantification
+
+method Main()
+{
+  var a := new int[] [9, 3, 8, 2, 7, 4, 0, 1, 5, 6];
+  var b := new int[10];
+
+  assert forall m :: 0 <= m < 10 && inImage(m) ==> exists k :: 0 <= k < 10 && a[k] == m by {
+    assert a[0] == 9;
+    assert a[1] == 3;
+    assert a[2] == 8;
+    assert a[3] == 2;
+    assert a[4] == 7;
+    assert a[5] == 4;
+    assert a[6] == 0;
+    assert a[7] == 1;
+    assert a[8] == 5;
+    assert a[9] == 6;
+  }
+  M(10, a, b);
+  print "a: ", a[..], "\n";
+  print "b: ", b[..], "\n";
+}
diff --git a/Test/dafny2/COST-verif-comp-2011-2-MaxTree-datatype.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem2-Invert.dfy.expect
similarity index 100%
rename from Test/dafny2/COST-verif-comp-2011-2-MaxTree-datatype.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem2-Invert.dfy.expect
diff --git a/Test/VSComp2010/Problem3-FindZero.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem3-FindZero.dfy
similarity index 97%
rename from Test/VSComp2010/Problem3-FindZero.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem3-FindZero.dfy
index 0b3f3052b7f..a3b537782ca 100644
--- a/Test/VSComp2010/Problem3-FindZero.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem3-FindZero.dfy
@@ -1,5 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
 
 // VSComp 2010, problem 3, find a 0 in a linked list and return how many nodes were skipped
 // until the first 0 (or end-of-list) was found.
diff --git a/Test/VSComp2010/Problem3-FindZero.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem3-FindZero.dfy.expect
similarity index 100%
rename from Test/VSComp2010/Problem3-FindZero.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem3-FindZero.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem4-Queens.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem4-Queens.dfy
new file mode 100644
index 00000000000..9217d7ee9b2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem4-Queens.dfy
@@ -0,0 +1,149 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+// VSComp 2010, problem 4, N queens
+// Rustan Leino, 31 August 2010, updated 24 March 2011.
+//
+// In the version of this program that I wrote during the week of VSTTE 2010, I had
+// an unproved assumption.  In this version, I simply changed the existential quantifier
+// in that assumption to specify a particular witness, which is enough of a hint for
+// Dafny to fully prove the correctness of the program.
+//
+// Oh, I also added some comments in this version of the program.
+//
+// The correctness of this program relies on some properties of Queens boards.  These
+// are stated and proved as lemmas, which here are given in assert statements.
+//
+// The March 2011 update of this program was to make use of Dafny's new heuristics for
+// compiling quantifiers.  This makes it possible to call IsConsistent, whose body uses
+// a universal quantifier, from non-ghost code, which simplifies this program.
+//
+// The October 2023 update of this program uses some features that were added long ago,
+// like a datatype, a "for" loop, the "nat" type, chaining expressions, and if guards
+// without parentheses. It also adds a nicer print method that displays the board.
+
+datatype Option<X> = None | Some(value: X)
+
+// The Search method returns whether or not there exists an N-queens solution for the
+// given N.  If 'success' returns as 'true', 'board' indicates a solution.  If 'success'
+// returns as 'false', no solution exists, as stated in the second postcondition.
+method Search(N: nat) returns (r: Option<seq<int>>)
+  ensures r.Some? ==> var board := r.value;
+    |board| == N && forall p :: 0 <= p < N ==> IsConsistent(board, p)
+  ensures r == None ==>
+    forall B: seq<int> ::
+      |B| == N && (forall i :: 0 <= i < N ==> 0 <= B[i] < N)
+      ==>
+      exists p :: 0 <= p < N && !IsConsistent(B, p)
+{
+  r := SearchAux(N, []);
+}
+
+// Given a board, this function says whether or not the queen placed in column 'pos'
+// is consistent with the queens placed in columns to its left.
+predicate IsConsistent(board: seq<int>, pos: nat) {
+  pos < |board| &&
+  forall q :: 0 <= q < pos ==>
+    board[q] != board[pos] &&
+    board[q] - board[pos] != pos - q &&
+    board[pos] - board[q] != pos - q
+}
+
+// Here comes the method where the real work is being done.  With an ultimate board size of 'N'
+// in mind and given the consistent placement 'boardSoFar' of '|boardSoFar|' columns, this method
+// will search for a solution for the remaining columns.  If 'success' returns as 'true',
+// then 'newBoard' is a consistent placement of 'N' queens.  If 'success' returns as 'false',
+// then there is no way to extend 'boardSoFar' to get a solution for 'N' queens.
+method SearchAux(N: nat, boardSoFar: seq<int>) returns (r: Option<seq<int>>)
+  requires |boardSoFar| <= N
+  // consistent so far:
+  requires forall k :: 0 <= k < |boardSoFar| ==> IsConsistent(boardSoFar, k)
+  ensures r.Some? ==> var newBoard := r.value;
+    |newBoard| == N && forall p :: 0 <= p < N ==> IsConsistent(newBoard, p)
+  ensures r == None ==>
+    forall B: seq<int> ::
+      |B| == N && (forall i :: 0 <= i < N ==> 0 <= B[i] < N) &&
+      boardSoFar <= B
+      ==>
+      exists p :: 0 <= p < N && !IsConsistent(B, p)
+  decreases N - |boardSoFar|
+{
+  var pos := |boardSoFar|;
+  if pos == N {
+    // The given board already has the desired size.
+    return Some(boardSoFar);
+  }
+
+  // Exhaustively try all possibilities for the new column, 'pos'.
+  for n := 0 to N
+    invariant forall B: seq<int> ::
+      // For any board 'B' with 'N' queens, each placed in an existing row
+      |B| == N && (forall i :: 0 <= i < N ==> 0 <= B[i] < N) &&
+      // ... where 'B' is an extension of 'boardSoFar'
+      boardSoFar <= B &&
+      // ... and the first column to extend 'boardSoFar' has a queen in one of
+      // the first 'n' rows
+      0 <= B[pos] < n
+      ==>
+      // ... the board 'B' is not entirely consistent
+      exists p :: 0 <= p < N && !IsConsistent(B, p)
+  {
+    // Let's try to extend the board-so-far with a queen in column 'n':
+    var candidateBoard := boardSoFar + [n];
+    if IsConsistent(candidateBoard, pos) {
+      // The new queen is consistent.  Thus, 'candidateBoard' is consistent in column 'pos'.
+      // The consistency of the queens in columns left of 'pos' follows from the
+      // consistency of those queens in 'boardSoFar' and the fact that 'candidateBoard' is
+      // an extension of 'boardSoFar', as the following lemma tells us:
+      assert forall k ::
+        0 <= k < |boardSoFar| && IsConsistent(boardSoFar, k)
+        ==>
+        IsConsistent(candidateBoard, k);
+
+      // Thus, we meet the precondition of 'SearchAux' on 'candidateBoard', so let's search
+      // for a solution that extends 'candidateBoard'.
+      r := SearchAux(N, candidateBoard);
+      if r.Some? {
+        // The recursive call to 'SearchAux' found consistent positions for all remaining columns
+        return r;
+      }
+      // The recursive call to 'SearchAux' determined that no consistent extensions to 'candidateBoard'
+      // exist.
+    } else {
+      // Since 'n' is not a consistent placement for a queen in column 'pos', there is also
+      // no extension of 'candidateBoard' that would make the entire board consistent.
+      assert forall B: seq<int> ::
+        |B| == N && (forall i :: 0 <= i < N ==> 0 <= B[i] < N) &&
+        candidateBoard <= B
+        ==>
+        !IsConsistent(B, pos);
+    }
+  }
+
+  return None;
+}
+
+method Main() {
+  SearchAndPrint(2);
+  SearchAndPrint(4);
+  SearchAndPrint(9);
+}
+
+method SearchAndPrint(N: nat) {
+  var r := Search(N);
+  print "N=", N, " returns ", r.Some?, "\n";
+  if r.Some? {
+    PrintBoard(r.value);
+  }
+}
+
+method PrintBoard(b: seq<int>) {
+  print "  +" + seq(|b|, _ => '-'), "+\n";
+  for i := 0 to |b| {
+    print "  |";
+    for j := 0 to |b| {
+      print if j == b[i] then "*" else " ";
+    }
+    print "| ", b[i], "\n";
+  }
+  print "  +" + seq(|b|, _ => '-'), "+\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem4-Queens.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem4-Queens.dfy.expect
new file mode 100644
index 00000000000..49bd75f6400
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem4-Queens.dfy.expect
@@ -0,0 +1,20 @@
+N=2 returns false
+N=4 returns true
+  +----+
+  | *  | 1
+  |   *| 3
+  |*   | 0
+  |  * | 2
+  +----+
+N=9 returns true
+  +---------+
+  |*        | 0
+  |  *      | 2
+  |     *   | 5
+  |       * | 7
+  | *       | 1
+  |   *     | 3
+  |        *| 8
+  |      *  | 6
+  |    *    | 4
+  +---------+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem4-Queens.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem4-Queens.dfy.rs.check
new file mode 100644
index 00000000000..c17262a423d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem4-Queens.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>ForLoops</i>.*
\ No newline at end of file
diff --git a/Test/VSComp2010/Problem5-DoubleEndedQueue.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem5-DoubleEndedQueue.dfy
similarity index 94%
rename from Test/VSComp2010/Problem5-DoubleEndedQueue.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem5-DoubleEndedQueue.dfy
index e608c3f5b8e..20316085a91 100644
--- a/Test/VSComp2010/Problem5-DoubleEndedQueue.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem5-DoubleEndedQueue.dfy
@@ -1,5 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
 
 // VSComp 2010, problem 5, double-ended queue.
 // Rustan Leino, 18 August 2010.
@@ -27,7 +26,7 @@ class AmortizedQueue<T(0)> {
     front in Repr && front.Repr <= Repr && front.Valid() &&
     rear in Repr && rear.Repr <= Repr && rear.Valid() &&
     |rear.List| <= |front.List| &&
-    List == front.List + rear.ReverseSeq(rear.List)
+    List == front.List + LinkedList.ReverseSeq(rear.List)
   }
 
   constructor Init()
@@ -42,7 +41,7 @@ class AmortizedQueue<T(0)> {
 
   constructor InitFromPieces(f: LinkedList<T>, r: LinkedList<T>)
     requires f.Valid() && r.Valid()
-    ensures Valid() && List == f.List + r.ReverseSeq(r.List)
+    ensures Valid() && List == f.List + LinkedList.ReverseSeq(r.List)
   {
     if (r.length <= f.length) {
       front := f;
@@ -56,7 +55,7 @@ class AmortizedQueue<T(0)> {
     }
     new;
     Repr := {this} + front.Repr + rear.Repr;
-    List := front.List + rear.ReverseSeq(rear.List);
+    List := front.List + LinkedList.ReverseSeq(rear.List);
   }
 
   method Front() returns (t: T)
diff --git a/Test/VSComp2010/Problem5-DoubleEndedQueue.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem5-DoubleEndedQueue.dfy.expect
similarity index 100%
rename from Test/VSComp2010/Problem5-DoubleEndedQueue.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSComp2010/Problem5-DoubleEndedQueue.dfy.expect
diff --git a/Test/VSI-Benchmarks/b1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b1.dfy
similarity index 94%
rename from Test/VSI-Benchmarks/b1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b1.dfy
index bf6bfca6f0b..3f2279fc203 100644
--- a/Test/VSI-Benchmarks/b1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b1.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Spec# and Boogie and Chalice:  The program will be
 // the same, except that these languages do not check
diff --git a/Test/VSI-Benchmarks/b1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b1.dfy.expect
similarity index 100%
rename from Test/VSI-Benchmarks/b1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b1.dfy.expect
diff --git a/Test/VSI-Benchmarks/b2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b2.dfy
similarity index 95%
rename from Test/VSI-Benchmarks/b2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b2.dfy
index 2beed7dfcbe..45896a64178 100644
--- a/Test/VSI-Benchmarks/b2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b2.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class Benchmark2 {
   method BinarySearch(a: array<int>, key: int) returns (result: int)
diff --git a/Test/VSI-Benchmarks/b2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b2.dfy.expect
similarity index 100%
rename from Test/VSI-Benchmarks/b2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b2.dfy.expect
diff --git a/Test/VSI-Benchmarks/b3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b3.dfy
similarity index 98%
rename from Test/VSI-Benchmarks/b3.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b3.dfy
index 4ac19a398f0..2be6c3372b3 100644
--- a/Test/VSI-Benchmarks/b3.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b3.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // Note:  We used integers instead of a generic Comparable type, because
 // Dafny has no way of saying that the Comparable type's AtMost function
diff --git a/Test/VSI-Benchmarks/b3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b3.dfy.expect
similarity index 100%
rename from Test/VSI-Benchmarks/b3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b3.dfy.expect
diff --git a/Test/VSI-Benchmarks/b4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b4.dfy
similarity index 97%
rename from Test/VSI-Benchmarks/b4.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b4.dfy
index 3886000aae6..82f3a11b505 100644
--- a/Test/VSI-Benchmarks/b4.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b4.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Note: We are using the built-in equality to compare keys.
 //
@@ -136,7 +136,7 @@ class Map<Key(==),Value> {
   }
 
   // Removes key from the domain of M (and does nothing if key wasn't in M to begin with)
-  method {:rlimit 3000} {:vcs_split_on_every_assert} Remove(key: Key)
+  method {:resource_limit "3e6"} {:isolate_assertions} Remove(key: Key)
     requires Valid()
     modifies Repr
     ensures Valid() && fresh(Repr - old(Repr))
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b4.dfy.expect
new file mode 100644
index 00000000000..b94f4205220
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b4.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 72 verified, 0 errors
diff --git a/Test/VSI-Benchmarks/b5.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b5.dfy
similarity index 98%
rename from Test/VSI-Benchmarks/b5.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b5.dfy
index 651c45e4604..0e397a83a80 100644
--- a/Test/VSI-Benchmarks/b5.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b5.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 class Queue<T(0)> {
   var head: Node<T>;
diff --git a/Test/VSI-Benchmarks/b5.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b5.dfy.expect
similarity index 100%
rename from Test/VSI-Benchmarks/b5.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b5.dfy.expect
diff --git a/Test/VSI-Benchmarks/b6.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b6.dfy
similarity index 97%
rename from Test/VSI-Benchmarks/b6.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b6.dfy
index a28352bdccd..476606ab52a 100644
--- a/Test/VSI-Benchmarks/b6.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b6.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class Collection<T> {
   ghost var footprint:set<object>
diff --git a/Test/VSI-Benchmarks/b6.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b6.dfy.expect
similarity index 100%
rename from Test/VSI-Benchmarks/b6.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b6.dfy.expect
diff --git a/Test/VSI-Benchmarks/b7.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b7.dfy
similarity index 97%
rename from Test/VSI-Benchmarks/b7.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b7.dfy
index 4c3d622a978..bba16bc79bd 100644
--- a/Test/VSI-Benchmarks/b7.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b7.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // Edited B6 to include GetChar and PutChar
 
diff --git a/Test/VSI-Benchmarks/b7.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b7.dfy.expect
similarity index 100%
rename from Test/VSI-Benchmarks/b7.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b7.dfy.expect
diff --git a/Test/VSI-Benchmarks/b8.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b8.dfy
similarity index 99%
rename from Test/VSI-Benchmarks/b8.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b8.dfy
index 7f3bbb37264..297e1234026 100644
--- a/Test/VSI-Benchmarks/b8.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b8.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify --relax-definite-assignment --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Benchmark 8
diff --git a/Test/VSI-Benchmarks/b8.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b8.dfy.expect
similarity index 100%
rename from Test/VSI-Benchmarks/b8.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VSI-Benchmarks/b8.dfy.expect
diff --git a/Test/VerifyThis2015/Problem1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem1.dfy
similarity index 97%
rename from Test/VerifyThis2015/Problem1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem1.dfy
index f228c22e233..47d330ab1b8 100644
--- a/Test/VerifyThis2015/Problem1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem1.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // Rustan Leino
 // 12 April 2015
@@ -156,7 +156,7 @@ lemma Prefix<T>(pat: seq<T>, a: seq<T>)
   ensures IsRelaxedPrefixAux(pat, a, 0)
 {
 }
-lemma {:vcs_split_on_every_assert} Same2<T>(pat: seq<T>, a: seq<T>)
+lemma {:isolate_assertions} Same2<T>(pat: seq<T>, a: seq<T>)
   requires IsRelaxedPrefixAux(pat, a, 1)
   ensures IRP_Alt(pat, a)
 {
diff --git a/Test/VerifyThis2015/Problem1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem1.dfy.expect
similarity index 100%
rename from Test/VerifyThis2015/Problem1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem1.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem1.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem1.dfy.rs.check
new file mode 100644
index 00000000000..00ff9dc923b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem1.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type parameter Equality support Required not supported for type parameters</i>.*
\ No newline at end of file
diff --git a/Test/VerifyThis2015/Problem2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem2.dfy
similarity index 99%
rename from Test/VerifyThis2015/Problem2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem2.dfy
index 9b57395e68b..b59d69f7342 100644
--- a/Test/VerifyThis2015/Problem2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem2.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // Rustan Leino
 // 13 April 2015, and many subsequent enhancements and revisions
diff --git a/Test/VerifyThis2015/Problem2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem2.dfy.expect
similarity index 100%
rename from Test/VerifyThis2015/Problem2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem2.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem2.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem2.dfy.rs.check
new file mode 100644
index 00000000000..fbb03b77111
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem2.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.NullReferenceException: Object reference not set to an instance of an object.
\ No newline at end of file
diff --git a/Test/VerifyThis2015/Problem3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem3.dfy
similarity index 98%
rename from Test/VerifyThis2015/Problem3.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem3.dfy
index 1348acf0f4d..6d8057d3160 100644
--- a/Test/VerifyThis2015/Problem3.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem3.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 // Rustan Leino
 // 12 April 2015
 // VerifyThis 2015
diff --git a/Test/VerifyThis2015/Problem3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem3.dfy.expect
similarity index 100%
rename from Test/VerifyThis2015/Problem3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem3.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem3.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem3.dfy.rs.check
new file mode 100644
index 00000000000..4f94dbab1ae
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/VerifyThis2015/Problem3.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0369]: binary operation `!=` cannot be applied to type `Sequence<Rc<Node>>`
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/assume.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/assume.dfy
new file mode 100644
index 00000000000..b269a967583
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/assume.dfy
@@ -0,0 +1,52 @@
+// RUN: ! %testDafnyForEachResolver "%s" -- --allow-axioms=false
+// NONUNIFORM: warning will be the same for all back-end
+// RUN: ! %verify --standard-libraries --allow-axioms:false "%s" &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Foo() {
+ assume false;
+ assume {:axiom} false;
+ 
+ var xs := { 1, 2 };
+ var x :| assume x in xs;
+
+ var ys :- assume Some(3); 
+}
+
+/** This datatype is the conventional Some/None datatype that is often used
+  in place of a reference or null.
+*/
+datatype Option<+T> = None | Some(value: T) {
+
+    /** True if is None */
+    predicate IsFailure() {
+      None?
+    }
+
+    /** Converts a None result to an Option value with a different value type. */
+    function PropagateFailure<U>(): Option<U>
+      requires None?
+    {
+      None
+    }
+
+    /** Returns the value encapsulated in Some */
+    function Extract(): T
+      requires Some?
+    {
+      value
+    }
+
+    /** Returns the value encapsulated in Some or a default value if None */
+    function GetOr(default: T): T {
+      match this
+      case Some(v) => v
+      case None() => default
+    }
+
+    /** Applies the given function to convert the Option to something else  */
+    function Map<FC>(rewrap: Option<T> -> FC): FC
+    {
+      rewrap(this)
+    }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/assume.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/assume.dfy.expect
new file mode 100644
index 00000000000..f144db9d004
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/assume.dfy.expect
@@ -0,0 +1,6 @@
+assume.dfy(7,1): Warning: assume statement has no {:axiom} annotation
+assume.dfy(11,10): Warning: assume keyword in assign-such-that statement has no {:axiom} annotation
+assume.dfy(13,11): Warning: assume keyword in update-with-failure statement has no {:axiom} annotation
+
+Dafny program verifier finished with 2 verified, 0 errors
+Compilation failed because warnings were found and --allow-warnings is false
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/const.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/const.dfy
new file mode 100644
index 00000000000..d032020242a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/const.dfy
@@ -0,0 +1,4 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-axioms=false
+
+type Even = x: int | x % 2 == 0
+opaque const ten: Even := 10
\ No newline at end of file
diff --git a/Test/dafny0/AssumptionVariables1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/const.dfy.expect
similarity index 100%
rename from Test/dafny0/AssumptionVariables1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/const.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/defaultParameterResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/defaultParameterResolution.dfy
new file mode 100644
index 00000000000..350760d2978
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/defaultParameterResolution.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver "%s" --expect-exit-code=2
+
+function SumFromTo(sequence: nat -> real, start: nat := 0, end: nat): real
+
+function PartialSums(sequence: nat -> real): nat -> real {
+  (n: nat) => SumFromTo(sequence, n)
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/defaultParameterResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/defaultParameterResolution.dfy.expect
new file mode 100644
index 00000000000..4391e6e3405
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/defaultParameterResolution.dfy.expect
@@ -0,0 +1,2 @@
+defaultParameterResolution.dfy(6,23): Error: function parameter 'end' at index 2 requires an argument of type nat
+1 resolution/type errors detected in defaultParameterResolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/expression/functionCall.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/expression/functionCall.dfy
new file mode 100644
index 00000000000..9a8fd2fdd15
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/expression/functionCall.dfy
@@ -0,0 +1,12 @@
+// RUN: ! %verify %s &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function Callee(x: nat): nat {
+  x
+}
+
+method Caller(b: bool) {
+  var r := Callee(if b then
+    10 else
+    -10);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/expression/functionCall.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/expression/functionCall.dfy.expect
new file mode 100644
index 00000000000..9acd41004d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/expression/functionCall.dfy.expect
@@ -0,0 +1,3 @@
+functionCall.dfy(11,4): Error: value does not satisfy the subset constraints of 'nat'
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/function.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/function.dfy
new file mode 100644
index 00000000000..be9537f29ec
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/function.dfy
@@ -0,0 +1,21 @@
+// RUN: ! %verify --allow-axioms:false --type-system-refresh "%s" &> "%t"
+// RUN: ! %verify --allow-axioms:false --type-system-refresh "%s" &>> "%t"
+// NONUNIFORM: warning will be the same for all back-end
+// RUN: ! %run --allow-axioms:false "%s" &>> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+
+function Compiled(): int ensures false ensures false
+ghost function Ghost(): int ensures false ensures false
+function {:axiom} Axiom(): int ensures false
+ghost function {:axiom} GhostAxiom(): int ensures false
+function {:extern} Extern(): int ensures false
+ghost function {:extern} GhostExtern(): int ensures false
+function {:axiom} {:extern} AxiomExtern(): int ensures false
+ghost function {:axiom} {:extern} GhostAxiomExtern(): int ensures false
+
+function Fonk(): int ensures {:axiom} false
+
+trait Far {
+  function Foo(): int
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/function.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/function.dfy.expect
new file mode 100644
index 00000000000..b7989de4cc5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/function.dfy.expect
@@ -0,0 +1,30 @@
+function.dfy(8,33): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(8,47): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(9,36): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(9,50): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(12,19): Warning: when a function is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+function.dfy(13,25): Warning: when a function is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+
+Dafny program verifier finished with 9 verified, 0 errors
+Compilation failed because warnings were found and --allow-warnings is false
+function.dfy(8,33): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(8,47): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(9,36): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(9,50): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(12,19): Warning: when a function is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+function.dfy(13,25): Warning: when a function is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+
+Dafny program verifier finished with 9 verified, 0 errors
+Compilation failed because warnings were found and --allow-warnings is false
+function.dfy(8,33): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(8,47): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(9,36): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(9,50): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+function.dfy(12,19): Warning: when a function is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+function.dfy(13,25): Warning: when a function is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+
+Dafny program verifier finished with 9 verified, 0 errors
+function.dfy(8,9): Error: Function _module._default.Compiled has no body so it cannot be compiled
+function.dfy(10,18): Error: Function _module._default.Axiom has no body so it cannot be compiled
+function.dfy(17,9): Error: Function _module._default.Fonk has no body so it cannot be compiled
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/constantWithReveal.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/constantWithReveal.dfy
new file mode 100644
index 00000000000..4d95901ac88
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/constantWithReveal.dfy
@@ -0,0 +1,8 @@
+// RUN: %verify %s &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+opaque function Foo(x: int): int {
+  x
+}
+
+const C := reveal Foo(); Foo(42)
\ No newline at end of file
diff --git a/Test/cli/proverPath.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/constantWithReveal.dfy.expect
similarity index 100%
rename from Test/cli/proverPath.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/constantWithReveal.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/ensuresReporting.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/ensuresReporting.dfy
new file mode 100644
index 00000000000..ef31e255dbb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/ensuresReporting.dfy
@@ -0,0 +1,36 @@
+// RUN: ! %verify %s &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function ElseError(x: int): int
+  ensures ElseError(x) == 0
+{
+  if x == 0 then
+    0 
+  else 
+    1 // error
+}
+function ThenError(x: int): int
+  ensures ThenError(x) == 0
+{
+  if x == 0 then
+    1 // error
+  else 
+    0 
+}
+
+function CaseError(x: int): int
+  ensures CaseError(x) == 1
+{
+  match x {
+    case 0 => 1
+    case 1 => 0 // error
+    case _ => 1 
+  }
+}
+
+function LetError(x: int): int
+  ensures LetError(x) == 1
+{
+  var r := 3;
+  r
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/ensuresReporting.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/ensuresReporting.dfy.expect
new file mode 100644
index 00000000000..8eaf561c25b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/functions/ensuresReporting.dfy.expect
@@ -0,0 +1,10 @@
+ensuresReporting.dfy(10,4): Error: a postcondition could not be proved on this return path
+ensuresReporting.dfy(5,23): Related location: this is the postcondition that could not be proved
+ensuresReporting.dfy(16,4): Error: a postcondition could not be proved on this return path
+ensuresReporting.dfy(13,23): Related location: this is the postcondition that could not be proved
+ensuresReporting.dfy(26,14): Error: a postcondition could not be proved on this return path
+ensuresReporting.dfy(22,23): Related location: this is the postcondition that could not be proved
+ensuresReporting.dfy(35,2): Error: a postcondition could not be proved on this return path
+ensuresReporting.dfy(32,22): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/method.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/method.dfy
new file mode 100644
index 00000000000..a2b47a71c3b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/method.dfy
@@ -0,0 +1,28 @@
+// RUN: %verify --allow-axioms:false --type-system-refresh --allow-warnings "%s" > "%t"
+// RUN: %verify --allow-axioms:false --type-system-refresh --allow-external-contracts --allow-warnings "%s" >> "%t"
+ 
+// NONUNIFORM: warning will be the same for all back-ends
+// RUN: ! %run --allow-axioms:false "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Compiled() ensures false ensures false
+ghost method Ghost() ensures false ensures false
+method {:axiom} Axiom() ensures false
+ghost method {:axiom} GhostAxiom() ensures false
+method {:extern} Extern() ensures false
+ghost method {:extern} GhostExtern() ensures false
+method {:axiom} {:extern} AxiomExtern() ensures false
+ghost method {:axiom} {:extern} GhostAxiomExtern() ensures false
+
+method BodylessLoop() ensures false {
+  while(true) invariant true || false
+}
+
+method {:verify false} Brap() {
+  assert false;
+}
+
+method {:extern} Brrr() ensures false
+method {:extern} Booo() requires false {
+  assert false;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/method.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/method.dfy.expect
new file mode 100644
index 00000000000..614011e79bc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/method.dfy.expect
@@ -0,0 +1,36 @@
+method.dfy(8,26): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(8,40): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(9,29): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(9,43): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(12,17): Warning: when a method is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+method.dfy(13,23): Warning: when a method is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+method.dfy(21,23): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless method together with the {:axiom} attribute instead
+method.dfy(25,17): Warning: when a method is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+method.dfy(26,17): Warning: when a method is exported, meaning it has a body and an {:extern} annotation, Dafny can not guarantee that it is called with arguments that satisfy its preconditions (its requires clauses and inputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'
+method.dfy(18,2): Warning: this loop has no body
+
+Dafny program verifier finished with 2 verified, 0 errors
+method.dfy(8,26): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(8,40): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(9,29): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(9,43): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(21,23): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless method together with the {:axiom} attribute instead
+method.dfy(18,2): Warning: this loop has no body
+
+Dafny program verifier finished with 2 verified, 0 errors
+method.dfy(8,26): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(8,40): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(9,29): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(9,43): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+method.dfy(12,17): Warning: when a method is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+method.dfy(13,23): Warning: when a method is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+method.dfy(21,23): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless method together with the {:axiom} attribute instead
+method.dfy(25,17): Warning: when a method is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+method.dfy(26,17): Warning: when a method is exported, meaning it has a body and an {:extern} annotation, Dafny can not guarantee that it is called with arguments that satisfy its preconditions (its requires clauses and inputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'
+method.dfy(18,2): Warning: this loop has no body
+
+Dafny program verifier finished with 2 verified, 0 errors
+method.dfy(8,7): Error: Method _module._default.Compiled has no body so it cannot be compiled
+method.dfy(10,16): Error: Method _module._default.Axiom has no body so it cannot be compiled
+method.dfy(18,2): Error: a loop without a body cannot be compiled
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/focus.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/focus.dfy
new file mode 100644
index 00000000000..c06332e965a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/focus.dfy
@@ -0,0 +1,44 @@
+// RUN: %verify --type-system-refresh --allow-axioms --isolate-assertions %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+method doFocus1(x: bool) returns (y: int) {
+  y := 1;                     // Batch 1    Batch 2
+  assert y == 1;              // Assertion  --
+  if x {
+    if false {
+      assert y >= 0;          // --         Assertion
+      assert {:focus} y <= 2; // --         Assertion
+      y := 2;
+      assert y == 2;          // --         Assertion
+    }
+  } else {
+    assert y == 1;            // Assertion  --
+  }
+  assert y == 1;              // Assertion  Assertion
+  if !x {
+    assert y >= 1;            // Assertion  Assertion
+  } else {
+    assert y <= 1;            // Assertion  Assertion
+  }
+}
+
+method doFocus2(x: bool) returns (y: int) {
+  y := 1;                     // Batch 1    Batch 2
+  assert y == 1;              // Assertion  --
+  if x {
+    while false {
+      assert y >= 0;          // --         Assertion
+      assert {:focus} y <= 2; // --         Assertion
+      y := 2;
+      assert y == 2;          // --         Assertion
+    }
+  } else {
+    assert y == 1;            // Assertion  --
+  }
+  assert y == 1;              // Assertion  --
+  if !x {
+    assert y >= 1;            // Assertion  --
+  } else {
+    assert y <= 1;            // Assertion  --
+  }
+}
\ No newline at end of file
diff --git a/Test/examples/induction-principle-code/Pure.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/focus.dfy.expect
similarity index 100%
rename from Test/examples/induction-principle-code/Pure.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/focus.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealConstants.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealConstants.dfy
new file mode 100644
index 00000000000..6983c76359a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealConstants.dfy
@@ -0,0 +1,13 @@
+// RUN: ! %verify --type-system-refresh --bprint=%t.bpl --allow-axioms --isolate-assertions %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+const someConst: nat := 10
+
+method Constant() {
+  hide *;
+
+  assert someConst >= 0; // pass because of nat type
+  assert someConst > 8; // error, hidden
+  reveal someConst;
+  assert someConst > 9; // success
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealConstants.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealConstants.dfy.expect
new file mode 100644
index 00000000000..91ab5320f9d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealConstants.dfy.expect
@@ -0,0 +1,3 @@
+revealConstants.dfy(10,2): Error: assertion might not hold
+
+Dafny program verifier finished with 3 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealFunctions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealFunctions.dfy
new file mode 100644
index 00000000000..193481cef30
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealFunctions.dfy
@@ -0,0 +1,143 @@
+// RUN: ! %verify --type-system-refresh --allow-axioms --show-hints --isolate-assertions %s --bprint=%t.bpl > %t
+// RUN: %diff "%s.expect" "%t"
+
+function P(x: int): bool {
+  true
+}
+
+method HideAndRevealHappyFlow() {
+  hide *;
+  
+  if (*) {
+    reveal P;
+    assert P(0);
+  } else {
+    assert P(0); // error
+  }
+  reveal P;
+  if (*) {
+    assert P(1);
+  } else {
+    hide *;
+    assert P(1); // error
+  }
+}
+
+function EnsuresFuncFoo(): bool
+  ensures EnsuresFuncFoo()
+
+method UseEnsuresFuncFoo() {
+  hide *;
+  if (*) {
+    reveal EnsuresFuncFoo;
+    assert EnsuresFuncFoo();
+  } else {
+    assert EnsuresFuncFoo(); // no error. Could be changed in the future
+  }
+}
+
+opaque predicate OpaqueFunc() {
+  true
+}
+
+method OpaqueUser() {
+  hide *;
+  if (*) {
+    reveal OpaqueFunc;
+    assert OpaqueFunc();
+  } else {
+    assert OpaqueFunc(); // error
+  }
+}
+
+// Subset results
+method FunctionSubsetResult() {
+  hide *;
+  var x: nat := Natty();
+  assert x >= 0; // no error
+
+  var y: int := Natty();
+  assert y >= 0; // no error
+}
+
+function Natty(): nat {
+  3
+}
+
+// Reads clause
+class O { var x: int }
+function Obj(o: O): int 
+  ensures Obj(o) > 0
+{
+  3
+}
+
+method ReadsClause() {
+  hide *;
+  var o := new O;
+  var before := Obj(o);
+  o.x := 3;
+  if (*) {
+    assert Obj(o) == before; // passes, because at the moment reads clauses are never hidden
+  } else {
+    assert Obj(o) == before by { // passes
+      reveal Obj;
+    }
+  }
+}
+
+module M1 {
+    ghost function RecFunc(x: nat): nat { 
+        if x == 0 then 0
+        else 1 + RecFunc(x - 1)
+    }
+}
+module M2 {
+    import opened M1
+    lemma Lemma(x: nat) 
+    ensures RecFunc(0) == 0
+    {
+        // Because RecFunc is recursive, it uses the fuel related $LS function, 
+        // this was previously hidden by 'hide *', so that the ensures could not be proven
+        hide *;
+        reveal RecFunc;
+    }
+}
+
+predicate Outer(x: int) {
+  Inner(x)
+}
+
+predicate Inner(x: int) {
+  x > 3
+}
+
+method InnerOuterUser() {
+  hide *;
+  assert Outer(0);
+  assert Outer(1) by {
+    reveal Outer;
+  }
+  assert Outer(2) by {
+    reveal Inner;
+  }
+  assert Outer(3) by {
+    reveal Outer, Inner;
+  }
+}
+
+  
+function HideInFunction(): int 
+  ensures true
+{
+  var x := 3; // Trigger substitute logic 
+  assert P(0) by {
+    hide *;
+  }
+  hide *;
+  assert P(1);
+  reveal P;
+  assert P(2);
+  3
+}
+ 
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealFunctions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealFunctions.dfy.expect
new file mode 100644
index 00000000000..414ff83c4f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealFunctions.dfy.expect
@@ -0,0 +1,25 @@
+revealFunctions.dfy(90,19): Info: auto-accumulator tail recursive
+revealFunctions.dfy(90,19): Info: decreases x
+revealFunctions.dfy(15,4): Info: hidden functions: P
+revealFunctions.dfy(22,4): Info: hidden functions: P
+revealFunctions.dfy(49,4): Info: hidden functions: OpaqueFunc
+revealFunctions.dfy(57,2): Info: hidden functions: Natty
+revealFunctions.dfy(60,2): Info: hidden functions: Natty
+revealFunctions.dfy(79,4): Info: hidden functions: Obj
+revealFunctions.dfy(81,4): Info: hidden functions: Obj
+revealFunctions.dfy(117,2): Info: hidden functions: Outer
+revealFunctions.dfy(118,2): Info: hidden functions: Inner
+revealFunctions.dfy(121,2): Info: hidden functions: Outer
+revealFunctions.dfy(131,10): Info: hidden functions: HideInFunction
+revealFunctions.dfy(134,2): Info: hidden functions: P
+revealFunctions.dfy(138,2): Info: hidden functions: P
+revealFunctions.dfy(15,4): Error: assertion might not hold
+revealFunctions.dfy(22,4): Error: assertion might not hold
+revealFunctions.dfy(49,4): Error: assertion might not hold
+revealFunctions.dfy(117,2): Error: assertion might not hold
+revealFunctions.dfy(118,2): Error: assertion might not hold
+revealFunctions.dfy(121,2): Error: assertion might not hold
+revealFunctions.dfy(134,2): Error: assertion might not hold
+revealFunctions.dfy(138,2): Error: assertion might not hold
+
+Dafny program verifier finished with 25 verified, 8 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInBlock.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInBlock.dfy
new file mode 100644
index 00000000000..a7091e7aeb1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInBlock.dfy
@@ -0,0 +1,106 @@
+// RUN: ! %verify --type-system-refresh --allow-axioms --isolate-assertions %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+function P(x: int): bool {
+  true
+}
+
+function Q(): int 
+  requires P(0) {
+  3
+}
+
+method IfScope() {
+  hide *;
+  if (*) {
+    reveal P;
+  } else {
+    reveal P;
+  }
+  assert P(2); // error, since the previous two reveal statements are out of scope
+}
+
+method MatchStatementScope(x: int) {
+  hide *;
+  match x {
+    case 0 =>
+      reveal P;
+      assert P(0);
+    case _ =>
+      assert P(0); // error
+  }
+  assert P(0); // no error because the previous assertions create an assume
+  assert P(1); // error
+}
+
+method BlockScope() {
+  hide *;
+  {
+    reveal P;
+    assert P(0);
+  }
+  assert P(0); // no error because the previous assertion creates an assume
+  assert P(1); // error
+}
+
+method Forall() {
+  hide *;
+  var aa := new int[3];
+  forall i | 0 <= i < aa.Length
+  {
+    aa[i] := 0;
+    // Somehow the next two lines cause the entire forall to become a ghost context
+    // reveal P;
+    // assert P(0);
+  }
+  assert P(1); // error
+}
+
+method While() {
+  hide *;
+  var x := 3;
+  while(x > 0) {
+    reveal P;
+    assert P(0);
+    x := x - 1;
+  }
+  assert P(1); // error
+}
+
+// If-alternative statement. Does anyone use that?
+method IfAlternative(x: int) {
+  hide *;
+  if {
+    case x == 0 => 
+      reveal P;
+      assert P(0);
+    case x == 1 =>
+      assert P(1); // error
+    case true =>
+  }
+  assert P(2); // error
+}
+
+// Calc statement
+method Calc() {
+  hide *;
+  calc {
+    2;
+    { reveal P; assert P(0); }
+    1 + 1;
+    { assert P(1); } // error
+    1 + 1 + 0;
+  }
+  assert P(2); // error
+}
+
+// Check that we can still call a method hide
+method hide() 
+  decreases *
+{
+  hide();  
+}
+
+opaque function f(): int { 0 }
+
+type T = x: int | true witness (reveal f(); 0)
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInBlock.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInBlock.dfy.expect
new file mode 100644
index 00000000000..2011bb1b901
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInBlock.dfy.expect
@@ -0,0 +1,12 @@
+revealInBlock.dfy(20,2): Error: assertion might not hold
+revealInBlock.dfy(30,6): Error: assertion might not hold
+revealInBlock.dfy(33,2): Error: assertion might not hold
+revealInBlock.dfy(43,2): Error: assertion might not hold
+revealInBlock.dfy(56,2): Error: assertion might not hold
+revealInBlock.dfy(67,2): Error: assertion might not hold
+revealInBlock.dfy(78,6): Error: assertion might not hold
+revealInBlock.dfy(81,2): Error: assertion might not hold
+revealInBlock.dfy(91,6): Error: assertion might not hold
+revealInBlock.dfy(94,2): Error: assertion might not hold
+
+Dafny program verifier finished with 20 verified, 10 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInExpression.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInExpression.dfy
new file mode 100644
index 00000000000..6133be07bdd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInExpression.dfy
@@ -0,0 +1,38 @@
+// RUN: ! %verify --type-system-refresh --allow-axioms --isolate-assertions %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+function P(x: int): bool {
+  true
+}
+
+function Q(x: int): bool 
+  requires P(0) {
+  true
+}
+
+method RevealExpressionScope()
+{
+  hide *;
+  var a := (reveal P; assert P(0); true);
+  assert P(1); // no error, expression leaks.
+  var b := (var x := (reveal P; assert P(2); true); 
+            assert P(3); x); // no error, expression leaks.
+  var c := (var x: bool :| (reveal P; assert P(4); x); 
+            assert P(5); x); // no error, expression leaks.
+  var d := (forall x: int :: reveal P; assert P(x); Q(x)) || 
+           (assert P(7); true); // no error, expression leaks.
+  var e := ((x: bool) => reveal P; assert P(7); x)(true) || 
+           (assert P(8); true); // no error, expression leaks.
+}
+
+function MatchExpressionScope(x: int): int {
+  hide *;
+  var x := match x {
+    case 0 =>
+      reveal P; assert P(0); 1
+    case _ =>
+      assert P(0); 2 // error
+  };
+  assert P(1); // no error, expression leaks.
+  x
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInExpression.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInExpression.dfy.expect
new file mode 100644
index 00000000000..7a691500428
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealInExpression.dfy.expect
@@ -0,0 +1,3 @@
+revealInExpression.dfy(34,6): Error: assertion might not hold
+
+Dafny program verifier finished with 15 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealMethods.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealMethods.dfy
new file mode 100644
index 00000000000..e20f4b29389
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealMethods.dfy
@@ -0,0 +1,17 @@
+// RUN: ! %verify --type-system-refresh --allow-axioms --isolate-assertions %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+method MethodEnsuresAreHidden() {
+  hide Bar;
+  var x := Bar();
+  if (*) {
+    reveal Bar;
+    assert x;
+  } else {
+    assert x; // error
+  }
+  assert x;
+}
+
+method Bar() returns (x: bool) 
+  ensures x
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealMethods.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealMethods.dfy.expect
new file mode 100644
index 00000000000..4311307def5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealMethods.dfy.expect
@@ -0,0 +1,3 @@
+revealMethods.dfy(5,7): Error: only functions and constants can be hidden
+revealMethods.dfy(8,11): Error: only functions and constants can be revealed
+2 resolution/type errors detected in revealMethods.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealQualified.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealQualified.dfy
new file mode 100644
index 00000000000..1a92f15d9e8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealQualified.dfy
@@ -0,0 +1,39 @@
+// RUN: %resolve --type-system-refresh --allow-axioms %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+module Prod {
+  class Foo {
+    function P(x: int): bool {
+      true
+    }
+
+    static function Q(x: int): bool {
+      true
+    }
+  }
+
+  method StaticRevealWorks() {
+    hide *;
+      
+    reveal Foo.P;
+    reveal Foo.Q;
+  }
+
+  method InstanceRevealWorks(foo: Foo) {
+    hide *;
+      
+    reveal foo.P;
+    reveal foo.Q;
+  }
+}
+
+module Cons {
+  import Prod
+
+  method StaticRevealWorks() {
+    hide *;
+      
+    reveal Prod.Foo.P;
+    reveal Prod.Foo.Q;
+  }
+}
diff --git a/Test/cli/projectFile/libraries/usesLibrary.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealQualified.dfy.expect
similarity index 100%
rename from Test/cli/projectFile/libraries/usesLibrary.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealQualified.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealSubsets.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealSubsets.dfy
new file mode 100644
index 00000000000..d35ad436d50
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealSubsets.dfy
@@ -0,0 +1,36 @@
+// RUN: ! %verify --type-system-refresh --allow-axioms --isolate-assertions %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+function P(): nat
+
+method Foo(x: nat) {
+  hide nat;
+  if (*) {
+    assert x > 0; // Fails because nat is hidden
+  } else {
+    reveal nat;
+    assert x > 0; // No error
+  }
+  var y := P();
+  assert y > 0; // Fails because nat is hidden, even though P is revealed
+  
+  var z: int := P();
+  reveal nat;
+  assert z > 0; // Fails because z is an int
+  
+  hide P;
+  var a: nat := P();
+  assert a > 0; // Passes, because nat is revealed, even though P is hidden.
+  
+  var b: nat := *;
+  assert b >= 0; // Passes
+  
+  var c: int := *;
+  if (*) {
+    assert c > 0; // Fails
+  }
+  var d: nat := c by { // New syntax
+    assume c >= 0;
+  }
+  assert d > 0; // Passes
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealSubsets.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealSubsets.dfy.expect
new file mode 100644
index 00000000000..bfbb72865ee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/reveal/revealSubsets.dfy.expect
@@ -0,0 +1,2 @@
+revealSubsets.dfy(7,7): Error: invalid NameSegment
+1 parse errors detected in revealSubsets.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/AssertBy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/AssertBy.dfy
new file mode 100644
index 00000000000..d7f12194342
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/AssertBy.dfy
@@ -0,0 +1,23 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --print:-
+
+
+method M0(x: int, y: int)
+{
+  assert x == 6;  // error
+  assert y == 8;  // error
+}
+
+method M1(x: int, y: int)
+{
+  assert x == 6 by {
+    assume x == 6;  // that was easy
+    assume y == 8;  // hey, why not assume some more while we're at it
+  }
+  assert y == 8;  // error (yes, still -- the previous assumption should not be in effect here)
+}
+
+method WellFormedness(x: int) {
+  assert 3 / x == 1by {
+    assume x == 3;
+  } 
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/AssertBy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/AssertBy.dfy.expect
new file mode 100644
index 00000000000..776641ad0ef
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/AssertBy.dfy.expect
@@ -0,0 +1,28 @@
+// AssertBy.dfy
+
+method M0(x: int, y: int)
+{
+  assert x == 6;
+  assert y == 8;
+}
+
+method M1(x: int, y: int)
+{
+  assert x == 6 by {
+    assume x == 6;
+    assume y == 8;
+  }
+  assert y == 8;
+}
+
+method WellFormedness(x: int)
+{
+  assert 3 / x == 1 by {
+    assume x == 3;
+  }
+}
+AssertBy.dfy(6,2): Error: assertion might not hold
+AssertBy.dfy(7,2): Error: assertion might not hold
+AssertBy.dfy(16,2): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 3 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignOrReturn.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignOrReturn.dfy
new file mode 100644
index 00000000000..a6b739c14e9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignOrReturn.dfy
@@ -0,0 +1,12 @@
+// RUN: %verify %s --standard-libraries=true &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+import opened Std.Wrappers
+
+method ByWellformedness(x: int) returns (r: Option<int>) {
+  var p: int :- Some(3 / x) by {
+    assume {:axiom} x > 0;
+  }
+  var q: int :- None;
+  r := Some(4);
+}
\ No newline at end of file
diff --git a/Test/cli/solverLog.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignOrReturn.dfy.expect
similarity index 100%
rename from Test/cli/solverLog.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignOrReturn.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignSuchThat.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignSuchThat.dfy
new file mode 100644
index 00000000000..109a9cb3b3e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignSuchThat.dfy
@@ -0,0 +1,16 @@
+// RUN: %verify %s &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method ByClause(b: bool) {
+  var r: int :| false by {
+    assume {:axiom} false;
+  }
+}
+
+function F(x: int): int
+method ByClauseSeparateAssignment() {
+  var a;
+  a :| F(a) == 2 by {
+    assume {:axiom} F(10) == 2;
+  }
+}
\ No newline at end of file
diff --git a/Test/dafny0/ModulePrint.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignSuchThat.dfy.expect
similarity index 100%
rename from Test/dafny0/ModulePrint.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignSuchThat.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignment.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignment.dfy
new file mode 100644
index 00000000000..a602eee60fe
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignment.dfy
@@ -0,0 +1,8 @@
+// RUN: %verify %s &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method ByWellformedness(x: int) {
+  var p: int := 3 / x by {
+    assume {:axiom} x > 0;
+  }
+}
\ No newline at end of file
diff --git a/Test/dafny4/Bug100.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignment.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug100.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/assignment.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallBy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallBy.dfy
new file mode 100644
index 00000000000..c35d7cea7d8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallBy.dfy
@@ -0,0 +1,73 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --standard-libraries
+
+import opened Std.Wrappers
+
+opaque predicate P() { true }
+
+lemma ProveP() ensures P() {
+  reveal P();
+}
+
+method NeedsP()
+  requires P()
+{}
+
+method NeedsPAndReturns3() returns (r: int)
+  requires P()
+  ensures r == 3
+{ r := 3; }
+
+method NeedsPAndReturnsNone() returns (r: Option<int>)
+  requires P()
+{ r := None; }
+
+method A() {
+  NeedsP() by { ProveP(); }
+  assert P(); // Should fail
+}
+
+method B() {
+  var v: int;
+  v := NeedsPAndReturns3() by { reveal P(); }
+  assert P(); // Should fail
+}
+
+method C() {
+  assert p: P() by { ProveP(); }
+  var v := NeedsPAndReturns3() by { reveal p; }
+  assert v == 3;  // should pass
+  assert P(); // should fail
+}
+
+method D() returns (r: Option<int>){
+  var v: int;
+  v :- NeedsPAndReturnsNone() by {
+    match false {
+      case true => assert true;
+      case false => ProveP();
+    }
+  }
+  assert P(); // should fail
+  r := None;
+}
+
+method E() returns (r: Option<int>){
+  var v :- NeedsPAndReturnsNone() by { reveal P(); }
+  assert P(); //  should fail
+  r := None;
+}
+
+greatest predicate G(x: int) { x == 0 || G(x-2) }
+
+greatest lemma F(x: int)
+  ensures G(x)
+{
+  F(x-2) by { ProveP(); }
+  assert P(); // should fail
+}
+
+method ArgumentWellformedness(x: int) {
+  F(3 / x) by {
+    assume x > 0;
+  } 
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallBy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallBy.dfy.expect
new file mode 100644
index 00000000000..349dbd35dd9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallBy.dfy.expect
@@ -0,0 +1,8 @@
+CallBy.dfy(26,2): Error: assertion might not hold
+CallBy.dfy(32,2): Error: assertion might not hold
+CallBy.dfy(39,2): Error: assertion might not hold
+CallBy.dfy(50,2): Error: assertion might not hold
+CallBy.dfy(56,2): Error: assertion might not hold
+CallBy.dfy(66,2): Error: assertion might not hold
+
+Dafny program verifier finished with 4 verified, 6 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByHide.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByHide.dfy
new file mode 100644
index 00000000000..68a4d9142c4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByHide.dfy
@@ -0,0 +1,16 @@
+// RUN: ! %verify --type-system-refresh --isolate-assertions %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+predicate P() { true }
+
+method NeedsP()
+  requires P()
+{}
+
+method M()
+  ensures P()
+{
+  hide P;
+  NeedsP() by { reveal P(); }
+  assert P(); // should fail
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByHide.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByHide.dfy.expect
new file mode 100644
index 00000000000..a8180269827
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByHide.dfy.expect
@@ -0,0 +1,3 @@
+CallByHide.dfy(15,2): Error: assertion might not hold
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution0.dfy
new file mode 100644
index 00000000000..b41b04b16ea
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution0.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+method M() {}
+
+method A() {
+  var i: int := 0;
+  M() by {
+    i := 1;
+    return;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution0.dfy.expect
new file mode 100644
index 00000000000..a3fd6773b9d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution0.dfy.expect
@@ -0,0 +1,4 @@
+CallByResolution0.dfy(8,6): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+CallByResolution0.dfy(9,4): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
+CallByResolution0.dfy(8,4): Error: a by block is not allowed to update a variable it doesn't declare
+3 resolution/type errors detected in CallByResolution0.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution1.dfy
new file mode 100644
index 00000000000..334dacf2fa7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution1.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+method M() {}
+
+method B() {
+  var i := 0;
+  while i < 3 {
+    M() by {
+      break;
+    }
+    i := i + 1;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution1.dfy.expect
new file mode 100644
index 00000000000..66d1c739208
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/calls/CallByResolution1.dfy.expect
@@ -0,0 +1,2 @@
+CallByResolution1.dfy(9,6): Error: a non-labeled 'break' statement is allowed only in loops
+1 resolution/type errors detected in CallByResolution1.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/localAssignment.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/localAssignment.dfy
new file mode 100644
index 00000000000..8e344fb85d9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/localAssignment.dfy
@@ -0,0 +1,8 @@
+// RUN: ! %verify %s &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method AssignToNat(b: bool) {
+  var r: nat := if b then
+    10 else
+    -10;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/localAssignment.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/localAssignment.dfy.expect
new file mode 100644
index 00000000000..54f553fdee4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/localAssignment.dfy.expect
@@ -0,0 +1,3 @@
+localAssignment.dfy(7,4): Error: value does not satisfy the subset constraints of 'nat'
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/opaqueBlock.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/opaqueBlock.dfy
new file mode 100644
index 00000000000..8b9e73f15ff
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/opaqueBlock.dfy
@@ -0,0 +1,219 @@
+// RUN: ! %verify --standard-libraries=true %s &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Foo() returns (x: int)
+  ensures x > 4 
+{
+  x := 1;
+  var y := 1;
+  opaque
+    ensures x > 3 
+  {
+    x := x + y;
+    x := x + 2;
+  }
+  assert x == 4; // error
+  x := x + y;
+}
+
+method StructuredCommandsIf(t: bool)
+{
+  var x := 1;
+  opaque 
+  {
+    if (t) {
+      x := x + 2;
+    } 
+  }
+  assert x >= 1; // error
+}
+
+method StructuredCommandsWhile()
+{
+  var x := 1;
+  opaque 
+  {
+    while (x > 0)
+      decreases x 
+    {
+      x := x - 1;
+    } 
+  }
+  assert x >= 1; // error
+}
+
+method BadlyFormedSpec()
+{
+  var x := 1;
+  opaque 
+    ensures 3 / x == 1 // error: possible division by zero
+  {
+    x := 3;
+  }
+  var y;
+  opaque ensures y == y { } // error: y is not assigned
+  y := 1;
+}
+
+class Wrapper {
+ var x: int
+}
+
+method ContainingMethodModifies(wrapper: Wrapper, unchangedWrapper: Wrapper) returns (x: int)
+  modifies wrapper
+  ensures x > 4 
+{
+  wrapper.x := 2;
+  opaque
+    ensures wrapper.x > 3 
+  {
+    wrapper.x := wrapper.x + 2;
+    unchangedWrapper.x := 10; // error
+  }
+  x := wrapper.x + 1;
+}
+
+method ExplicitModifies(wrapper: Wrapper) returns (x: int)
+  modifies wrapper
+  ensures x > 4 
+{
+  wrapper.x := 2;
+  opaque
+    ensures wrapper.x > 3 
+    modifies {}
+  {
+    wrapper.x := wrapper.x + 2; // error
+  }
+  x := wrapper.x + 1;
+}
+
+method ModifiesTooMuch(wrapper: Wrapper, unchangedWrapper: Wrapper)
+  modifies wrapper
+{
+  opaque
+    modifies wrapper, unchangedWrapper // error
+  {
+    unchangedWrapper.x := 10;
+  }
+}
+
+method Nested(w1: Wrapper, w2: Wrapper)
+  modifies w1, w2
+{
+  opaque
+    modifies w1 
+  {
+    opaque modifies w2 // error 
+    {
+      w2.x := 10;
+    }
+  }
+}
+
+method DefiniteAssignment()
+{
+  var x: int; 
+  opaque
+    ensures x == 3
+  {
+    x := 3;
+  } 
+  var target := x;
+  var y: int;
+  opaque
+  {
+    y := 4;
+  }
+  target := y; // error: !assigned(y) 
+  var z: int;
+  opaque 
+    ensures z == z // error !assigned(z)
+  {
+    if (*) {
+      z := 5;
+    }
+  }
+  target := z;
+}
+
+method EnsuresDoesNotHold() {
+  var x: int;
+  opaque 
+    ensures false
+  {
+    x := 3;
+  }
+}
+
+import opened Std.Wrappers
+method Returns(input: Option<int>) returns (r: Option<int>)
+  requires input.Some? ==> input == Some(3)
+{
+  var x: int; 
+  opaque
+    ensures x == 3
+  {
+    x :- input;
+  } 
+  var y: int;
+  opaque
+  {
+    y := 4;
+    return Some(y);
+  }
+  var z: int;
+  opaque
+    ensures z > 5
+  {
+    z :| z > 10;
+  }
+  r := Some(z);
+}
+
+method MultipleAssignment() returns (r: int) {
+  var tuple := (3,2);
+  var x: int;
+  var y: int;  
+  opaque
+    ensures x == 3
+  {
+    x, y := tuple.0, tuple.1;
+  }
+  r := x;
+}
+
+method FlattenedMatch(x: Option<int>, y: Option<int>) {
+   // This match statement must copy some of the case bodies when flattening
+   var z := 3;
+   opaque {
+     match (x, y) {
+       case (Some(a), _) =>
+         var y := a;
+       case (_, Some(b)) =>
+         var z := b;
+       case _ =>
+     }
+   }
+   assert z == 3;
+}
+
+method ModifiesFresh(w: Wrapper)
+{
+  opaque modifies {} 
+  {
+    var wrapper := new Wrapper;
+    wrapper.x := 2;
+    w.x := 3;
+  }
+}
+
+method ImplicitModifiesClause(w: Wrapper)
+  modifies w
+{
+  w.x := 2;
+  opaque
+  {
+    w.x := 3;
+  }
+  assert w.x == 2;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/opaqueBlock.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/opaqueBlock.dfy.expect
new file mode 100644
index 00000000000..c6eaab54b1a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/statement/opaqueBlock.dfy.expect
@@ -0,0 +1,16 @@
+opaqueBlock.dfy(15,2): Error: assertion might not hold
+opaqueBlock.dfy(28,2): Error: assertion might not hold
+opaqueBlock.dfy(42,2): Error: assertion might not hold
+opaqueBlock.dfy(49,14): Error: possible division by zero
+opaqueBlock.dfy(54,17): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
+opaqueBlock.dfy(71,21): Error: assignment might update an object not in the enclosing context's modifies clause
+opaqueBlock.dfy(85,12): Error: assignment might update an object not in the enclosing context's modifies clause
+opaqueBlock.dfy(93,2): Error: opaque block might violate context's modifies clause
+opaqueBlock.dfy(106,4): Error: opaque block might violate context's modifies clause
+opaqueBlock.dfy(127,12): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
+opaqueBlock.dfy(130,17): Error: variable 'z', which is subject to definite-assignment rules, might be uninitialized here
+opaqueBlock.dfy(142,12): Error: ensures might not hold
+opaqueBlock.dfy(206,6): Error: assignment might update an object not in the enclosing context's modifies clause
+opaqueBlock.dfy(218,2): Error: assertion might not hold
+
+Dafny program verifier finished with 3 verified, 14 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/subsetTypes/errorReporting.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/subsetTypes/errorReporting.dfy
new file mode 100644
index 00000000000..c78b69a9aff
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/subsetTypes/errorReporting.dfy
@@ -0,0 +1,6 @@
+// RUN: ! %verify %s &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+type ten = x: int | x == 10 witness if true then
+  11 else
+  10
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/subsetTypes/errorReporting.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/subsetTypes/errorReporting.dfy.expect
new file mode 100644
index 00000000000..c4f213a1fba
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ast/subsetTypes/errorReporting.dfy.expect
@@ -0,0 +1,3 @@
+errorReporting.dfy(5,2): Error: the given witness expression might not satisfy constraint
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-acceptable-builtin.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-acceptable-builtin.dfy
new file mode 100644
index 00000000000..4179a4508c5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-acceptable-builtin.dfy
@@ -0,0 +1,132 @@
+// RUN: %resolve "%s"
+// Attributes on top-level declarations
+
+@AutoContracts
+class A {
+  ghost var Repr: set<object>
+
+  var x: int
+
+  var y: int
+
+  predicate Valid() {
+    true
+  }
+}
+
+@NativeIntOrReal
+newtype ubyte = x : int | 0 <= x < 256
+
+@NativeInt
+newtype ubyte2 = x : int | 0 <= x < 256
+
+@NativeNone
+newtype ubyte3 = x : int | 0 <= x < 256
+
+@NativeUInt8
+newtype ubyte4 = x : int | 0 <= x < 256
+
+@NativeInt8
+newtype ubyte5 = x : int | 0 <= x < 100
+
+@NativeUInt16
+newtype ubyte6 = x : int | 0 <= x < 256
+
+@NativeInt16
+newtype ubyte7 = x : int | 0 <= x < 256
+
+@NativeUInt32
+newtype ubyte8 = x : int | 0 <= x < 256
+
+@NativeInt32
+newtype ubyte9 = x : int | 0 <= x < 256
+
+//@NativeInt53
+//newtype ubyte10 = x : int | 0 <= x < 256
+
+@NativeUInt64
+newtype ubyte11 = x : int | 0 <= x < 256
+
+@NativeInt64
+newtype ubyte12 = x : int | 0 <= x < 256
+
+//@NativeUInt128
+//newtype ubyte13 = x : int | 0 <= x < 256
+
+//@NativeInt128
+//newtype ubyte14 = x : int | 0 <= x < 256
+
+@DisableNonlinearArithmetic
+@Options("--function-syntax:3")
+module SimpleLinearModule {
+}
+
+function f(x:int) : bool
+  requires x > 3
+{
+  x > 7
+}
+
+@AutoRequires
+@AutoRevealDependenciesAll(false)
+@AutoRevealDependenciesAll(true)
+@AutoRevealDependencies(level := 10)
+@Axiom
+@Compile(true)
+@Fuel(low := 1)
+@Fuel(low := 1, high := 2)
+function g(y:int, b:bool) : bool
+{
+  if b then f(y + 2) else f(2*y)
+}
+
+@Concurrent
+method ConcurrentMethod()
+  modifies {}
+{
+}
+
+@IsolateAssertions
+method Test(a: int, b: int, c: int)
+  requires a < b && b < c
+{
+  assert a < c; 
+  assert c > a;
+}
+
+@VerifyOnly
+@Print
+@Priority(2)
+@ResourceLimit("1000")
+@TimeLimit(1000)
+method VerifyThisOnly() {
+  print "hello";
+  assert true;
+}
+
+@TailRecursion
+@Transparent
+@TimeLimitMultiplier(2)
+function Fib(n: nat, a: int, b: int): int {
+  if n == 0 then b
+  else Fib(n - 1, b, a + b)
+}
+
+@Verify
+@Test
+@TestInline
+@TestInline(10)
+@TestEntry
+@VcsMaxCost(10)
+@VcsMaxKeepGoingSplits(10)
+@VcsMaxSplits(10)
+@IsolateAssertions
+method TestItAll() {
+  expect true;
+}
+
+@Synthesize
+@Axiom
+method Synthesizing(x: int) returns (y: int)
+  ensures x == y + 1
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos.dfy
new file mode 100644
index 00000000000..9645be2532d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos.dfy
@@ -0,0 +1,88 @@
+// RUN: %exits-with -any %resolve "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// Attributes on top-level declarations
+
+@AutoContracts   // Can't apply that on functions
+@NativeIntOrReal // Can't apply that on functions
+@NativeInt       // Can't apply that on functions
+@NativeNone      // Can't apply that on functions
+@NativeUInt8     // Can't apply that on functions
+@NativeInt8      // Can't apply that on functions
+@NativeUInt16    // Can't apply that on functions
+@NativeInt16     // Can't apply that on functions
+@NativeUInt32    // Can't apply that on functions
+@NativeInt32     // Can't apply that on functions
+@NativeInt53     // Can't apply that on functions
+@NativeUInt64    // Can't apply that on functions
+@NativeInt64     // Can't apply that on functions
+@NativeUInt128   // Can't apply that on functions
+@NativeInt128    // Can't apply that on functions
+@DisableNonlinearArithmetic // Can't apply that on functions
+function f(x:int) : bool
+  requires x > 3
+{
+  x > 7
+}
+
+@AutoRequires                        // Makes no sense on modules
+@AutoRevealDependenciesAll(false)    // Makes no sense on modules
+@AutoRevealDependenciesAll(true)     // Makes no sense on modules
+@AutoRevealDependencies(level := 10) // Makes no sense on modules
+@Axiom                               // Makes no sense on modules
+@Concurrent                          // Makes no sense on modules
+@TailRecursion                       // Makes no sense on modules
+@VerifyOnly                          // Not supported on modules                      
+@Print                               // Not supported on modules
+@Priority(2)                         // Not supported on modules
+@ResourceLimit(1000)                 // Not supported on modules
+@TimeLimit(1000)                     // Not supported on modules
+@TimeLimitMultiplier(2)              // Not supported on modules
+@Verify                              // Not supported on modules
+@Test                                // Not supported on modules
+@TestInline                          // Not supported on modules
+@TestInline(10)                      // Not supported on modules
+@TestEntry                           // Not supported on modules
+@VcsMaxCost(10)                      // Not supported on modules
+@VcsMaxKeepGoingSplits(10)           // Not supported on modules
+@VcsMaxSplits(10)                    // Not supported on modules
+@IsolateAssertions                   // Not supported on modules
+@Synthesize                          // Not supported on modules
+module Dummy {
+}
+
+@compile("true") // Should be Compile
+@Compile("true") // Should be boolean
+@Compile(true, false) // Should have one argument
+@Compile(true && false)
+@fuel(low := 1, 2) // Should be Fuel
+@Fuel(2, low := 1) // Wrong position of arguments
+function g(y:int, b:bool) : bool
+{
+  if b then f(y + 2) else f(2*y)
+}
+
+@Fuel(1, 2)  // Fuel not supported on datatype
+datatype Useless = Useless
+
+@Fuel(1, 2)  // Fuel not supported on codatatype
+codatatype UselessCodatatype = UselessCodatatype
+
+@Fuel(1, 2) // Fuel not supported on type synonyms
+type NewInt = int
+
+@Fuel(1, 2) // Fuel not supported on subset types
+type NewInt2 = x: int | x >= 0 witness *
+
+@Fuel(1, 2) // Fuel not supported on subset types
+newtype NewInt3 = int
+
+@isolate_assertions // Should be IsolateAssertions 
+@IsolateAssertions("noargument") // Should have no argument.
+// Above is not treated as a @call with label "IsolateAssertion"
+@Transparent // Makes no sense on method
+method Test(a: int, b: int, c: int)
+  requires a < b && b < c
+{
+  assert a < c; 
+  assert c > a;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos.dfy.expect
new file mode 100644
index 00000000000..59735cf6892
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos.dfy.expect
@@ -0,0 +1,55 @@
+at-attributes-typos.dfy(20,0): Error: @DisableNonlinearArithmetic attribute cannot be applied to function
+at-attributes-typos.dfy(19,0): Error: @NativeInt128 attribute cannot be applied to function
+at-attributes-typos.dfy(18,0): Error: @NativeUInt128 attribute cannot be applied to function
+at-attributes-typos.dfy(17,0): Error: @NativeInt64 attribute cannot be applied to function
+at-attributes-typos.dfy(16,0): Error: @NativeUInt64 attribute cannot be applied to function
+at-attributes-typos.dfy(15,0): Error: @NativeInt53 attribute cannot be applied to function
+at-attributes-typos.dfy(14,0): Error: @NativeInt32 attribute cannot be applied to function
+at-attributes-typos.dfy(13,0): Error: @NativeUInt32 attribute cannot be applied to function
+at-attributes-typos.dfy(12,0): Error: @NativeInt16 attribute cannot be applied to function
+at-attributes-typos.dfy(11,0): Error: @NativeUInt16 attribute cannot be applied to function
+at-attributes-typos.dfy(10,0): Error: @NativeInt8 attribute cannot be applied to function
+at-attributes-typos.dfy(9,0): Error: @NativeUInt8 attribute cannot be applied to function
+at-attributes-typos.dfy(8,0): Error: @NativeNone attribute cannot be applied to function
+at-attributes-typos.dfy(7,0): Error: @NativeInt attribute cannot be applied to function
+at-attributes-typos.dfy(6,0): Error: @NativeIntOrReal attribute cannot be applied to function
+at-attributes-typos.dfy(5,0): Error: @AutoContracts attribute cannot be applied to function
+at-attributes-typos.dfy(58,9): Error: the parameter named 'low' is already given positionally
+at-attributes-typos.dfy(56,14): Error: Argument to attribute Compile must be a literal
+at-attributes-typos.dfy(55,0): Error: wrong number of arguments (got 2, but attribute 'Compile' expects at most 1: (0: bool))
+at-attributes-typos.dfy(54,9): Error: incorrect argument type for attribute parameter '0' (expected bool, found string)
+at-attributes-typos.dfy(82,0): Error: @Transparent attribute cannot be applied to method
+at-attributes-typos.dfy(80,0): Error: wrong number of arguments (got 1, but attribute 'IsolateAssertions' expects 0)
+at-attributes-typos.dfy(49,0): Error: @Synthesize attribute cannot be applied to module definition
+at-attributes-typos.dfy(48,0): Error: @IsolateAssertions attribute cannot be applied to module definition
+at-attributes-typos.dfy(47,0): Error: @VcsMaxSplits attribute cannot be applied to module definition
+at-attributes-typos.dfy(46,0): Error: @VcsMaxKeepGoingSplits attribute cannot be applied to module definition
+at-attributes-typos.dfy(45,0): Error: @VcsMaxCost attribute cannot be applied to module definition
+at-attributes-typos.dfy(44,0): Error: @TestEntry attribute cannot be applied to module definition
+at-attributes-typos.dfy(43,0): Error: @TestInline attribute cannot be applied to module definition
+at-attributes-typos.dfy(42,0): Error: @TestInline attribute cannot be applied to module definition
+at-attributes-typos.dfy(41,0): Error: @Test attribute cannot be applied to module definition
+at-attributes-typos.dfy(40,0): Error: @Verify attribute cannot be applied to module definition
+at-attributes-typos.dfy(39,0): Error: @TimeLimitMultiplier attribute cannot be applied to module definition
+at-attributes-typos.dfy(38,0): Error: @TimeLimit attribute cannot be applied to module definition
+at-attributes-typos.dfy(37,0): Error: @ResourceLimit attribute cannot be applied to module definition
+at-attributes-typos.dfy(37,15): Error: incorrect argument type for attribute parameter '0' (expected seq<char>, found int)
+at-attributes-typos.dfy(36,0): Error: @Priority attribute cannot be applied to module definition
+at-attributes-typos.dfy(35,0): Error: @Print attribute cannot be applied to module definition
+at-attributes-typos.dfy(34,0): Error: @VerifyOnly attribute cannot be applied to module definition
+at-attributes-typos.dfy(33,0): Error: @TailRecursion attribute cannot be applied to module definition
+at-attributes-typos.dfy(32,0): Error: @Concurrent attribute cannot be applied to module definition
+at-attributes-typos.dfy(31,0): Error: @Axiom attribute cannot be applied to module definition
+at-attributes-typos.dfy(30,0): Error: @AutoRevealDependencies attribute cannot be applied to module definition
+at-attributes-typos.dfy(29,0): Error: @AutoRevealDependenciesAll attribute cannot be applied to module definition
+at-attributes-typos.dfy(28,0): Error: @AutoRevealDependenciesAll attribute cannot be applied to module definition
+at-attributes-typos.dfy(27,0): Error: @AutoRequires attribute cannot be applied to module definition
+at-attributes-typos.dfy(64,0): Error: @Fuel attribute cannot be applied to datatype
+at-attributes-typos.dfy(67,0): Error: @Fuel attribute cannot be applied to codatatype
+at-attributes-typos.dfy(70,0): Error: @Fuel attribute cannot be applied to type synonym
+at-attributes-typos.dfy(73,0): Error: @Fuel attribute cannot be applied to subset type
+at-attributes-typos.dfy(76,0): Error: @Fuel attribute cannot be applied to newtype
+at-attributes-typos.dfy(57,1): Error: unresolved identifier: fuel
+at-attributes-typos.dfy(53,1): Error: unresolved identifier: compile
+at-attributes-typos.dfy(79,1): Error: unresolved identifier: isolate_assertions
+54 resolution/type errors detected in at-attributes-typos.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos0.dfy
new file mode 100644
index 00000000000..1eeb43fcb1e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos0.dfy
@@ -0,0 +1,11 @@
+// RUN: %exits-with -any %resolve "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// Attributes on top-level declarations
+
+@Option("--function-syntax:3") // Should be Options
+module SimpleLinearModule {
+}
+
+function OtherUnresolvedfunction(): string {
+  3
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos0.dfy.expect
new file mode 100644
index 00000000000..3e99f809de6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/at-attributes/at-attributes-typos0.dfy.expect
@@ -0,0 +1,3 @@
+at-attributes-typos0.dfy(5,1): Error: unresolved identifier: Option
+at-attributes-typos0.dfy(6,7): Error: not resolving module '_module' because there were errors in resolving its nested module 'SimpleLinearModule'
+2 resolution/type errors detected in at-attributes-typos0.dfy
diff --git a/Test/attr-help.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/attr-help.dfy
similarity index 100%
rename from Test/attr-help.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/attr-help.dfy
diff --git a/Test/auditor/IgnoredAssumptions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/IgnoredAssumptions.dfy
similarity index 100%
rename from Test/auditor/IgnoredAssumptions.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/IgnoredAssumptions.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy
new file mode 100644
index 00000000000..5bef4051933
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy
@@ -0,0 +1,178 @@
+// RUN: %baredafny audit --reads-clauses-on-methods --allow-external-contracts --report-file "%t.md" "%s"
+// RUN: %baredafny audit --reads-clauses-on-methods --allow-external-contracts --report-file "%t.md" --compare-report "%s"
+// RUN: %baredafny audit --reads-clauses-on-methods --allow-external-contracts --report-file "%t.html" "%s"
+// RUN: %baredafny audit --reads-clauses-on-methods --allow-external-contracts --report-file "%t-ietf.md" --report-format markdown-ietf "%s"
+// RUN: %baredafny audit --reads-clauses-on-methods --allow-external-contracts --use-basename-for-filename "%s" > "%t"
+// RUN: %diff "%s.md.expect" "%t.md"
+// RUN: %diff "%s-ietf.md.expect" "%t-ietf.md"
+// RUN: %diff "%s.html.expect" "%t.html"
+// RUN: %diff "%s.expect" %t"
+
+include "IgnoredAssumptions.dfy"
+
+// Method or lemma with a failed proof (top priority, but shown only in reports from later versions of the tool)
+method BadMethod(i: nat) returns (res: nat)
+  requires i < 64
+  ensures res == 64 - i
+{
+  return 64 + i;
+}
+
+// Lemma with no body
+lemma MinusBv8NoBody(i: nat, j: nat)
+  requires j <= i < 256
+  ensures (i - j) as bv8 == i as bv8 - j as bv8
+
+// Lemma with an {:axiom} attribute
+lemma {:axiom} LeftShiftBV128(v: bv128, idx: nat)
+  requires idx <= 128
+  ensures v << idx == v << idx as bv8
+
+// Function or method with an {:axiom} attribute or {:verify false} attribute
+
+// Lemma with an assume statement in its body
+lemma MinusBv8Assume(i: nat, j: nat)
+  requires j <= i < 256
+  ensures (i - j) as bv8 == i as bv8 - j as bv8
+{
+  assume (i - j) as bv8 == i as bv8 - j as bv8;
+}
+
+// Method declared {:extern} with an ensures clause and no body
+newtype int32 = x | -0x8000_0000 <= x < 0x8000_0000
+newtype uint8 = x | 0 <= x < 0x100
+
+method {:extern} GenerateBytes(i: int32) returns (res: seq<uint8>)
+    requires i >= 0
+    ensures |res| == i as int
+
+// Method declared {:extern} with an ensures clause and a body
+method {:extern} GenerateBytesWithModel(i: int32) returns (res: seq<uint8>)
+    requires i >= 0
+    ensures |res| == i as int
+{
+  return seq(i, _ => 0 as uint8);
+}
+
+// Compiled method with an assume statement with an {:axiom} attribute in its body
+method GenerateBytesWrapper(i: int32) returns (res: seq<uint8>)
+{
+  assume {:axiom} i >= 0;
+  res := GenerateBytes(i);
+}
+
+// Function or method with no body
+ghost function WhoKnows(x: int): int
+
+// Method declared {:extern} with no body and no ensures clauses
+method {:extern} GenerateBytesNoGuarantee(i: int32) returns (res: seq<uint8>)
+    requires i >= 0
+
+// Extern function with postcondition. Should result in two findings.
+function {:extern} ExternFunction(i: int32): (res: int32)
+  ensures res != i
+
+// Successful proof of a function, method, or lemma (shown only in reports from later versions of the tool)
+method GoodMethod(i: nat) returns (res: nat)
+  requires i < 64
+  ensures res == 64 + i
+{
+  return 64 + i;
+}
+
+method DoesNotTerminate()
+  decreases *
+{
+  DoesNotTerminate();
+}
+
+trait {:termination false} T {
+}
+
+lemma ForallWithoutBody()
+  ensures forall y : int :: y != y
+{
+    forall y : int
+      ensures y != y
+}
+
+method LoopWithoutBody(n: int)
+{
+    var i := 0;
+    while i < n
+      decreases n - i
+    assert true;
+}
+
+abstract module M {
+  method AbstractMethod(x: int) returns (y: int)
+    ensures y > x
+}
+
+opaque function f(): int {
+  0
+}
+
+// A method that's safe for concurrent use because it doesn't touch the
+// heap.
+method {:concurrent} ConcurrentMethod(x: int) returns (r: int) 
+  reads {}
+{
+  return x;
+}
+
+class Box {
+  ghost var value: int
+}
+
+ghost method {:concurrent} AssumedConcurrentMethod(xBox: Box)
+  reads {:assume_concurrent} xBox
+  modifies {:assume_concurrent} xBox
+{
+  xBox.value := xBox.value + 1;
+}
+
+method {:axiom} AxiomWithStuffInIt(x: int) returns (r: int) {
+  assume x > 0;
+  assume {:axiom} x > 10;
+
+  forall y : int
+    ensures y != y
+
+  var i := 0;
+  while i < x
+    decreases x - i
+
+  return x;
+}
+
+method AssertOnly() {
+  assert {:only} true;
+  assert false;
+}
+
+method {:only} MethodOnly() {
+  assert false;
+}
+
+// Externs with {:axiom} (only changes whether the externs are allowed by the library backend)
+
+method {:extern} {:axiom} GenerateBytesWithAxiom(i: int32) returns (res: seq<uint8>)
+    requires i >= 0
+    ensures |res| == i as int
+
+function {:extern} {:axiom} ExternFunctionWithAxiom(i: int32): (res: int32)
+  ensures res != i
+
+module A {
+  trait T {}
+}
+module B {
+  import opened A
+
+  @AssumeCrossModuleTermination
+  class ClassExtendingTraitFromOtherModule extends T {}
+
+  @AssumeCrossModuleTermination
+  trait TraitExtendingTraitFromOtherModule extends T {}
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy-ietf.md.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy-ietf.md.expect
new file mode 100644
index 00000000000..9ee3b2ebdd6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy-ietf.md.expect
@@ -0,0 +1,102 @@
+# Module `B`
+
+## Type `ClassExtendingTraitFromOtherModule`
+
+* Trait method calls may not terminate (uses `@AssumeCrossModuleTermination`). MUST remove `@AssumeCrossModuleTermination` or justify.
+
+## Type `TraitExtendingTraitFromOtherModule`
+
+* Trait method calls may not terminate (uses `@AssumeCrossModuleTermination`). MUST remove `@AssumeCrossModuleTermination` or justify.
+# Default module
+
+## Top level
+
+### Member `MinusBv8NoBody`
+
+* Ghost declaration has no body and has an ensures clause. MUST provide a body or add `{:axiom}`.
+
+### Member `LeftShiftBV128`
+
+* Declaration has explicit `{:axiom}` attribute. SHOULD provide a proof or test.
+
+### Member `MinusBv8Assume`
+
+* Definition has `assume` statement in body. MUST replace with `assert` and prove or add `{:axiom}`.
+
+### Member `GenerateBytes`
+
+* Declaration with `{:extern}` has a ensures clause. MUST test external callee.
+
+* Declaration with `{:extern}` has a requires clause. MUST test any external callers.
+
+### Member `GenerateBytesWithModel`
+
+* Declaration with `{:extern}` has a ensures clause. MUST test external callee.
+
+* Declaration with `{:extern}` has a requires clause. MUST test any external callers.
+
+### Member `GenerateBytesWrapper`
+
+* Definition has `assume {:axiom}` statement in body. SHOULD replace with `assert` and prove.
+
+### Member `GenerateBytesNoGuarantee`
+
+* Declaration with `{:extern}` has a requires clause. MUST test any external callers.
+
+### Member `ExternFunction`
+
+* Function with `{:extern}` attribute. SHOULD use `method` with `modifies {}` instead.
+
+* Declaration with `{:extern}` has a ensures clause. MUST test external callee.
+
+### Member `DoesNotTerminate`
+
+* Method may not terminate (uses `decreases *`). SHOULD provide a valid `decreases` clause.
+
+### Member `ForallWithoutBody`
+
+* Definition contains `forall` statement with no body. MUST provide a body.
+
+### Member `LoopWithoutBody`
+
+* Definition contains loop with no body. MUST provide a body.
+
+### Member `AssumedConcurrentMethod`
+
+* Reads clause has `{:assume_concurrent}` attribute. MUST manually review and test in a concurrent setting.
+
+* Modifies clause has `{:assume_concurrent}` attribute. MUST manually review and test in a concurrent setting.
+
+### Member `AxiomWithStuffInIt`
+
+* Declaration has explicit `{:axiom}` attribute. SHOULD provide a proof or test.
+
+* Definition has `assume` statement in body. MUST replace with `assert` and prove or add `{:axiom}`.
+
+* Definition has `assume {:axiom}` statement in body. SHOULD replace with `assert` and prove.
+
+* Definition contains `forall` statement with no body. MUST provide a body.
+
+* Definition contains loop with no body. MUST provide a body.
+
+### Member `AssertOnly`
+
+* Assertion has explicit temporary `{:only}` attribute. MUST remove the `{:only}` attribute.
+
+### Member `MethodOnly`
+
+* Member has explicit temporary `{:only}` attribute. MUST remove the `{:only}` attribute.
+
+### Member `GenerateBytesWithAxiom`
+
+* Declaration has explicit `{:axiom}` attribute. SHOULD provide a proof or test.
+
+### Member `ExternFunctionWithAxiom`
+
+* Declaration has explicit `{:axiom}` attribute. SHOULD provide a proof or test.
+
+* Function with `{:extern}` attribute. SHOULD use `method` with `modifies {}` instead.
+
+## Type `T`
+
+* Trait method calls may not terminate (uses `{:termination false}`). MUST remove `{:termination false}` or justify.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy.expect
new file mode 100644
index 00000000000..504bd0676df
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy.expect
@@ -0,0 +1,39 @@
+TestAuditor.dfy(24,25): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+TestAuditor.dfy(38,2): Warning: assume statement has no {:axiom} annotation
+TestAuditor.dfy(136,2): Warning: assume statement has no {:axiom} annotation
+TestAuditor.dfy(150,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+TestAuditor.dfy(154,9): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
+TestAuditor.dfy(95,4): Warning: this forall statement has no body
+TestAuditor.dfy(102,4): Warning: this loop has no body (loop frame: i)
+TestAuditor.dfy(139,2): Warning: this forall statement has no body
+TestAuditor.dfy(143,2): Warning: this loop has no body (loop frame: i)
+TestAuditor.dfy(93,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+TestAuditor.dfy(95,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+TestAuditor.dfy(139,2): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+TestAuditor.dfy(174,8): Warning: ClassExtendingTraitFromOtherModule: Trait method calls may not terminate (uses `@AssumeCrossModuleTermination`). Possible mitigation: Remove if possible.
+TestAuditor.dfy(177,8): Warning: TraitExtendingTraitFromOtherModule: Trait method calls may not terminate (uses `@AssumeCrossModuleTermination`). Possible mitigation: Remove if possible.
+TestAuditor.dfy(22,6): Warning: MinusBv8NoBody: Ghost declaration has no body and has an ensures clause. Possible mitigation: Provide a body or add `{:axiom}`.
+TestAuditor.dfy(27,15): Warning: LeftShiftBV128: Declaration has explicit `{:axiom}` attribute. Possible mitigation: Provide a proof or test.
+TestAuditor.dfy(38,2): Warning: MinusBv8Assume: Definition has `assume` statement in body. Possible mitigation: Replace with `assert` and prove or add `{:axiom}`.
+TestAuditor.dfy(45,17): Warning: GenerateBytes: Declaration with `{:extern}` has a ensures clause. Possible mitigation: Test external callee (maybe with `/testContracts`).
+TestAuditor.dfy(45,17): Warning: GenerateBytes: Declaration with `{:extern}` has a requires clause. Possible mitigation: Test any external callers (maybe with `/testContracts`).
+TestAuditor.dfy(50,17): Warning: GenerateBytesWithModel: Declaration with `{:extern}` has a ensures clause. Possible mitigation: Test external callee (maybe with `/testContracts`).
+TestAuditor.dfy(50,17): Warning: GenerateBytesWithModel: Declaration with `{:extern}` has a requires clause. Possible mitigation: Test any external callers (maybe with `/testContracts`).
+TestAuditor.dfy(60,2): Warning: GenerateBytesWrapper: Definition has `assume {:axiom}` statement in body. Possible mitigation: Replace with `assert` and prove.
+TestAuditor.dfy(68,17): Warning: GenerateBytesNoGuarantee: Declaration with `{:extern}` has a requires clause. Possible mitigation: Test any external callers (maybe with `/testContracts`).
+TestAuditor.dfy(72,19): Warning: ExternFunction: Function with `{:extern}` attribute. Possible mitigation: Turn into a `method` with `modifies {}` and test thoroughly for lack of side effects.
+TestAuditor.dfy(72,19): Warning: ExternFunction: Declaration with `{:extern}` has a ensures clause. Possible mitigation: Test external callee (maybe with `/testContracts`).
+TestAuditor.dfy(83,7): Warning: DoesNotTerminate: Method may not terminate (uses `decreases *`). Possible mitigation: Provide a valid `decreases` clause.
+TestAuditor.dfy(95,4): Warning: ForallWithoutBody: Definition contains `forall` statement with no body. Possible mitigation: Provide a body.
+TestAuditor.dfy(102,4): Warning: LoopWithoutBody: Definition contains loop with no body. Possible mitigation: Provide a body.
+TestAuditor.dfy(128,27): Warning: AssumedConcurrentMethod: Reads clause has `{:assume_concurrent}` attribute. Possible mitigation: Manually review and test in a concurrent setting.
+TestAuditor.dfy(128,27): Warning: AssumedConcurrentMethod: Modifies clause has `{:assume_concurrent}` attribute. Possible mitigation: Manually review and test in a concurrent setting.
+TestAuditor.dfy(135,16): Warning: AxiomWithStuffInIt: Declaration has explicit `{:axiom}` attribute. Possible mitigation: Provide a proof or test.
+TestAuditor.dfy(150,2): Warning: AssertOnly: Assertion has explicit temporary `{:only}` attribute. Possible mitigation: Remove the `{:only}` attribute.
+TestAuditor.dfy(154,15): Warning: MethodOnly: Member has explicit temporary `{:only}` attribute. Possible mitigation: Remove the `{:only}` attribute.
+TestAuditor.dfy(160,26): Warning: GenerateBytesWithAxiom: Declaration has explicit `{:axiom}` attribute. Possible mitigation: Provide a proof or test.
+TestAuditor.dfy(164,28): Warning: ExternFunctionWithAxiom: Declaration has explicit `{:axiom}` attribute. Possible mitigation: Provide a proof or test.
+TestAuditor.dfy(89,27): Warning: T: Trait method calls may not terminate (uses `{:termination false}`). Possible mitigation: Remove if possible.
+Dafny auditor completed with 24 findings
+
+Dafny program verifier did not attempt verification
diff --git a/Test/auditor/TestAuditor.dfy.html.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy.html.expect
similarity index 78%
rename from Test/auditor/TestAuditor.dfy.html.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy.html.expect
index 042f1bb1207..879f3ec6f09 100644
--- a/Test/auditor/TestAuditor.dfy.html.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy.html.expect
@@ -33,6 +33,8 @@
 <script src="https://unpkg.com/sorttable@1.0.2/sorttable.js" crossorigin></script>
 <table>
 <tr><th>Name</th><th>Compiled</th><th>Explicit Assumption</th><th>Extern</th><th>Issue</th><th>Mitigation</th></tr>
+<tr><td>B.ClassExtendingTraitFromOtherModule</td><td>True</td><td>False</td><td>False</td><td>Trait method calls may not terminate (uses <code>@AssumeCrossModuleTermination</code>).</td><td>Remove if possible.</td></tr>
+<tr><td>B.TraitExtendingTraitFromOtherModule</td><td>True</td><td>False</td><td>False</td><td>Trait method calls may not terminate (uses <code>@AssumeCrossModuleTermination</code>).</td><td>Remove if possible.</td></tr>
 <tr><td>MinusBv8NoBody</td><td>False</td><td>False</td><td>False</td><td>Ghost declaration has no body and has an ensures clause.</td><td>Provide a body or add <code>{:axiom}</code>.</td></tr>
 <tr><td>LeftShiftBV128</td><td>False</td><td>True</td><td>False</td><td>Declaration has explicit <code>{:axiom}</code> attribute.</td><td>Provide a proof or test.</td></tr>
 <tr><td>MinusBv8Assume</td><td>False</td><td>False</td><td>False</td><td>Definition has <code>assume</code> statement in body.</td><td>Replace with <code>assert</code> and prove or add <code>{:axiom}</code>.</td></tr>
@@ -42,15 +44,18 @@
 <tr><td>GenerateBytesWithModel</td><td>True</td><td>False</td><td>True</td><td>Declaration with <code>{:extern}</code> has a requires clause.</td><td>Test any external callers (maybe with <code>/testContracts</code>).</td></tr>
 <tr><td>GenerateBytesWrapper</td><td>True</td><td>False</td><td>False</td><td>Definition has <code>assume {:axiom}</code> statement in body.</td><td>Replace with <code>assert</code> and prove.</td></tr>
 <tr><td>GenerateBytesNoGuarantee</td><td>True</td><td>False</td><td>True</td><td>Declaration with <code>{:extern}</code> has a requires clause.</td><td>Test any external callers (maybe with <code>/testContracts</code>).</td></tr>
-<tr><td>ExternFunction</td><td>True</td><td>False</td><td>True</td><td>Function with <code>{:extern}</code> attribute.</td><td>Turn into a <code>method</code> with <code>modifies *</code> or test thoroughly for lack of side effects.</td></tr>
+<tr><td>ExternFunction</td><td>True</td><td>False</td><td>True</td><td>Function with <code>{:extern}</code> attribute.</td><td>Turn into a <code>method</code> with <code>modifies {}</code> and test thoroughly for lack of side effects.</td></tr>
 <tr><td>ExternFunction</td><td>True</td><td>False</td><td>True</td><td>Declaration with <code>{:extern}</code> has a ensures clause.</td><td>Test external callee (maybe with <code>/testContracts</code>).</td></tr>
 <tr><td>DoesNotTerminate</td><td>True</td><td>False</td><td>False</td><td>Method may not terminate (uses <code>decreases *</code>).</td><td>Provide a valid <code>decreases</code> clause.</td></tr>
 <tr><td>ForallWithoutBody</td><td>False</td><td>False</td><td>False</td><td>Definition contains <code>forall</code> statement with no body.</td><td>Provide a body.</td></tr>
 <tr><td>LoopWithoutBody</td><td>True</td><td>False</td><td>False</td><td>Definition contains loop with no body.</td><td>Provide a body.</td></tr>
-<tr><td>ConcurrentMethod</td><td>True</td><td>False</td><td>False</td><td>Declaration has <code>{:concurrent}</code> attribute.</td><td>Manually review and test in a concurrent setting.</td></tr>
+<tr><td>AssumedConcurrentMethod</td><td>False</td><td>False</td><td>False</td><td>Reads clause has <code>{:assume_concurrent}</code> attribute.</td><td>Manually review and test in a concurrent setting.</td></tr>
+<tr><td>AssumedConcurrentMethod</td><td>False</td><td>False</td><td>False</td><td>Modifies clause has <code>{:assume_concurrent}</code> attribute.</td><td>Manually review and test in a concurrent setting.</td></tr>
 <tr><td>AxiomWithStuffInIt</td><td>True</td><td>True</td><td>False</td><td>Declaration has explicit <code>{:axiom}</code> attribute.</td><td>Provide a proof or test.</td></tr>
 <tr><td>AssertOnly</td><td>True</td><td>False</td><td>False</td><td>Assertion has explicit temporary <code>{:only}</code> attribute.</td><td>Remove the <code>{:only}</code> attribute.</td></tr>
 <tr><td>MethodOnly</td><td>True</td><td>False</td><td>False</td><td>Member has explicit temporary <code>{:only}</code> attribute.</td><td>Remove the <code>{:only}</code> attribute.</td></tr>
+<tr><td>GenerateBytesWithAxiom</td><td>True</td><td>True</td><td>True</td><td>Declaration has explicit <code>{:axiom}</code> attribute.</td><td>Provide a proof or test.</td></tr>
+<tr><td>ExternFunctionWithAxiom</td><td>True</td><td>True</td><td>True</td><td>Declaration has explicit <code>{:axiom}</code> attribute.</td><td>Provide a proof or test.</td></tr>
 <tr><td>T</td><td>True</td><td>False</td><td>False</td><td>Trait method calls may not terminate (uses <code>{:termination false}</code>).</td><td>Remove if possible.</td></tr>
 </table>
 <script>$( "table" ).last().addClass( "sortable" );</script>
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy.md.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy.md.expect
new file mode 100644
index 00000000000..3aaf017ad4d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/auditor/TestAuditor.dfy.md.expect
@@ -0,0 +1,26 @@
+|Name|Compiled|Explicit Assumption|Extern|Issue|Mitigation|
+|----|--------|-------------------|------|-----|----------|
+| B.ClassExtendingTraitFromOtherModule | True | False | False | Trait method calls may not terminate (uses `@AssumeCrossModuleTermination`). | Remove if possible. |
+| B.TraitExtendingTraitFromOtherModule | True | False | False | Trait method calls may not terminate (uses `@AssumeCrossModuleTermination`). | Remove if possible. |
+| MinusBv8NoBody | False | False | False | Ghost declaration has no body and has an ensures clause. | Provide a body or add `{:axiom}`. |
+| LeftShiftBV128 | False | True | False | Declaration has explicit `{:axiom}` attribute. | Provide a proof or test. |
+| MinusBv8Assume | False | False | False | Definition has `assume` statement in body. | Replace with `assert` and prove or add `{:axiom}`. |
+| GenerateBytes | True | False | True | Declaration with `{:extern}` has a ensures clause. | Test external callee (maybe with `/testContracts`). |
+| GenerateBytes | True | False | True | Declaration with `{:extern}` has a requires clause. | Test any external callers (maybe with `/testContracts`). |
+| GenerateBytesWithModel | True | False | True | Declaration with `{:extern}` has a ensures clause. | Test external callee (maybe with `/testContracts`). |
+| GenerateBytesWithModel | True | False | True | Declaration with `{:extern}` has a requires clause. | Test any external callers (maybe with `/testContracts`). |
+| GenerateBytesWrapper | True | False | False | Definition has `assume {:axiom}` statement in body. | Replace with `assert` and prove. |
+| GenerateBytesNoGuarantee | True | False | True | Declaration with `{:extern}` has a requires clause. | Test any external callers (maybe with `/testContracts`). |
+| ExternFunction | True | False | True | Function with `{:extern}` attribute. | Turn into a `method` with `modifies {}` and test thoroughly for lack of side effects. |
+| ExternFunction | True | False | True | Declaration with `{:extern}` has a ensures clause. | Test external callee (maybe with `/testContracts`). |
+| DoesNotTerminate | True | False | False | Method may not terminate (uses `decreases *`). | Provide a valid `decreases` clause. |
+| ForallWithoutBody | False | False | False | Definition contains `forall` statement with no body. | Provide a body. |
+| LoopWithoutBody | True | False | False | Definition contains loop with no body. | Provide a body. |
+| AssumedConcurrentMethod | False | False | False | Reads clause has `{:assume_concurrent}` attribute. | Manually review and test in a concurrent setting. |
+| AssumedConcurrentMethod | False | False | False | Modifies clause has `{:assume_concurrent}` attribute. | Manually review and test in a concurrent setting. |
+| AxiomWithStuffInIt | True | True | False | Declaration has explicit `{:axiom}` attribute. | Provide a proof or test. |
+| AssertOnly | True | False | False | Assertion has explicit temporary `{:only}` attribute. | Remove the `{:only}` attribute. |
+| MethodOnly | True | False | False | Member has explicit temporary `{:only}` attribute. | Remove the `{:only}` attribute. |
+| GenerateBytesWithAxiom | True | True | True | Declaration has explicit `{:axiom}` attribute. | Provide a proof or test. |
+| ExternFunctionWithAxiom | True | True | True | Declaration has explicit `{:axiom}` attribute. | Provide a proof or test. |
+| T | True | False | False | Trait method calls may not terminate (uses `{:termination false}`). | Remove if possible. |
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/ast.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/ast.dfy
new file mode 100644
index 00000000000..dd45255c6a5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/ast.dfy
@@ -0,0 +1,129 @@
+// RUN: %verify --default-function-opacity autoRevealDependencies "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Utils {
+  function Max(x: int, y: int): int
+  {
+    if x > y then x else y
+  }
+
+  function {:opaque} MaxF<T(!new)>(f: T ~> int, ts: seq<T>, default: int) : (m: int)
+    reads set t, o | t in ts && o in f.reads(t) :: o 
+    requires forall t | t in ts :: f.requires(t)
+    requires forall t | t in ts :: default <= f(t)
+    ensures if ts == [] then m == default else exists t | t in ts :: f(t) == m
+    ensures forall t | t in ts :: f(t) <= m
+    ensures default <= m
+  {
+    if ts == [] then default
+    else
+      Max(f(ts[0]), MaxF(f, ts[1..], default))
+  }
+
+  datatype Result<T> = | Success(value: T) | Failure
+  {
+    predicate IsFailure() {
+      Failure?
+    }
+
+    function PropagateFailure<U>(): Result<U>
+      requires Failure?
+    {
+      Failure
+    }
+
+    function Extract(): T
+      requires Success?
+    {
+      value
+    }
+  }
+
+  datatype Option<T> = Some(value: T) | None
+}
+
+module AST {
+  import opened Utils
+
+  datatype BinOp =
+    | Add
+    | Sub
+    | Mul
+  
+  datatype Expr_Raw =
+    | Var(name: string)
+    | Literal(n: int)
+    | Bind(bvars: seq<string>, bvals: seq<Expr_Raw>, body: Expr_Raw)
+    | Assign(avars: seq<string>, avals: seq<Expr_Raw>)
+    | If(cond: Expr_Raw, thn: Expr_Raw, els: Expr_Raw)
+    | Op(op: BinOp, oe1: Expr_Raw, oe2: Expr_Raw)
+    | Seq(es: seq<Expr_Raw>)
+  {
+    function Depth() : nat
+    {
+      1 + match this {
+        case Var(_) =>
+          0
+        case Literal(lit) =>
+          0
+        case Bind(bvars, bvals, body) =>
+          var m := MaxF(var f := (e: Expr_Raw) requires e in bvals => e.Depth(); f, bvals, 0);
+          Max(m, body.Depth())
+        case Assign(avars, avals) =>
+          MaxF(var f := (e: Expr_Raw) requires e in avals => e.Depth(); f, avals, 0)
+        case If(cond, thn, els) =>
+          Max(cond.Depth(), Max(thn.Depth(), els.Depth()))
+        case Op(op, e1, e2) =>
+          Max(e1.Depth(), e2.Depth())
+        case Seq(es: seq<Expr_Raw>) =>
+          MaxF(var f := (e: Expr_Raw) requires e in es => e.Depth(); f, es, 0)
+      }
+    }
+
+    static predicate All(e: Expr_Raw, p: (Expr_Raw) -> bool)
+    {
+      p(e) &&
+      (match e
+         case Var(name) => true
+         case Literal(n) => true
+         case Bind(bvars, bvals, body) =>
+          && (forall e | e in bvals :: e.All(e, p))
+          && All(body, p)
+         case Assign(avars, avals) =>
+          && forall e | e in avals :: e.All(e, p)
+         case If(cond, thn, els) =>
+          All(cond, p) && All(thn, p) && All(els, p)
+         case Op(op, oe1, oe2) =>
+          All(oe1, p) && All(oe2, p)
+         case Seq(es) =>
+          && forall e | e in es :: e.All(e, p)
+      )
+    }
+
+    static predicate All_Es(es: seq<Expr_Raw>, p: (Expr_Raw) -> bool)
+      // Rem.: we pay attention of not making ``All_Es`` and ``All`` mutually
+      // recursive, otherwise it causes problems in the proofs.
+    {
+      forall e | e in es :: e.All(e, p)
+    }
+
+    static ghost predicate WellFormed_Single(e: Expr_Raw)
+    {
+      match e
+        case Var(name) => true
+        case Literal(n) => true
+        case Bind(bvars, bvals, body) => |bvars| == |bvals|
+        case Assign(avars, avals) => |avars| == |avals|
+        case If(cond, thn, els) => true
+        case Op(op, oe1, oe2) => true
+        case Seq(es) => true
+    }
+
+    ghost predicate WellFormed()
+    {
+      All(this, WellFormed_Single)
+    }
+  }
+
+  type Expr = e:Expr_Raw | e.WellFormed() witness Var("x")
+}
diff --git a/Test/VSComp2010/Problem4-Queens.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/ast.dfy.expect
similarity index 100%
rename from Test/VSComp2010/Problem4-Queens.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/ast.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/complicated.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/complicated.dfy
new file mode 100644
index 00000000000..6a4853b63a8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/complicated.dfy
@@ -0,0 +1,71 @@
+// RUN: %verify --default-function-opacity autoRevealDependencies "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+predicate P(z: int, i: int, j: int, k: int) 
+
+ghost predicate ComplexPredicate3(offset: int, j: int, i: int)
+{
+  && (forall k :: P(1+offset, i, j, k) || P(0, i, j, k))
+  && (forall k :: P(2+offset, i, j, k) || P(1, i, j, k))
+  && (forall k :: P(3+offset, i, j, k) || P(2, i, j, k))
+  && (forall k :: P(4+offset, i, j, k) || P(3, i, j, k))
+  && (forall k :: P(5+offset, i, j, k) || P(4, i, j, k))
+  && (forall k :: P(6+offset, i, j, k) || P(5, i, j, k))
+  && (forall k :: P(7+offset, i, j, k) || P(6, i, j, k))
+  && (forall k :: P(8+offset, i, j, k) || P(7, i, j, k))
+  && (forall k :: P(9+offset, i, j, k) || P(8, i, j, k))
+  && (forall k :: P(0+offset, i, j, k) || P(9, i, j, k))
+}
+
+ghost predicate ComplexPredicate2(offset: int, i: int)
+{
+  && ComplexPredicate3(offset, i, 0)
+  && ComplexPredicate3(offset, i, 1)
+  && ComplexPredicate3(offset, i, 2)
+  && ComplexPredicate3(offset, i, 3)
+  && ComplexPredicate3(offset, i, 4)
+  && ComplexPredicate3(offset, i, 5)
+  && ComplexPredicate3(offset, i, 6)
+  && ComplexPredicate3(offset, i, 7)
+  && ComplexPredicate3(offset, i, 8)
+  && ComplexPredicate3(offset, i, 9)
+}
+
+ghost predicate ComplexPredicate1(offset: int)
+{
+  && ComplexPredicate2(offset, 0)
+  && ComplexPredicate2(offset, 1)
+  && ComplexPredicate2(offset, 2)
+  && ComplexPredicate2(offset, 3)
+  && ComplexPredicate2(offset, 4)
+  && ComplexPredicate2(offset, 5)
+  && ComplexPredicate2(offset, 6)
+  && ComplexPredicate2(offset, 7)
+  && ComplexPredicate2(offset, 8)
+  && ComplexPredicate2(offset, 9)
+}
+
+ghost predicate ComplexPredicate0()
+{
+  && ComplexPredicate1(0)
+  && ComplexPredicate1(1)
+  && ComplexPredicate1(2)
+  && ComplexPredicate1(3)
+  && ComplexPredicate1(4)
+  && ComplexPredicate1(5)
+  && ComplexPredicate1(6)
+  && ComplexPredicate1(7)
+  && ComplexPredicate1(8)
+  && ComplexPredicate1(9)
+}
+
+lemma {:autoRevealDependencies 1} StressForDafny()
+  requires ComplexPredicate0()
+  ensures ComplexPredicate1(0) 
+  && ComplexPredicate1(1)
+  && ComplexPredicate1(2)
+  && ComplexPredicate1(3)
+  && ComplexPredicate1(4)
+  && ComplexPredicate1(5)
+{
+}
\ No newline at end of file
diff --git a/Test/dafny0/ContainerRanks.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/complicated.dfy.expect
similarity index 100%
rename from Test/dafny0/ContainerRanks.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/complicated.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/datatype-reveals.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/datatype-reveals.dfy
new file mode 100644
index 00000000000..111e067058f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/datatype-reveals.dfy
@@ -0,0 +1,5 @@
+// RUN: %verify --default-function-opacity autoRevealDependencies "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function two() : int { 2 }
+datatype t = Nat(val :nat := two())
diff --git a/Test/dafny4/Bug103.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/datatype-reveals.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug103.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/datatype-reveals.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-fail.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-fail.dfy
new file mode 100644
index 00000000000..1f3c6ae9419
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-fail.dfy
@@ -0,0 +1,13 @@
+// RUN: %exits-with 4 %verify --default-function-opacity autoRevealDependencies "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function f() : bool { true }
+function g() : bool { f() }
+function h() : bool { g() }
+function i() : bool { h() }
+
+function {:autoRevealDependencies 3} p() : (r: bool)
+  ensures r
+{ 
+  i() 
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-fail.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-fail.dfy.expect
new file mode 100644
index 00000000000..76bba8c2c45
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-fail.dfy.expect
@@ -0,0 +1,4 @@
+func-depth-fail.dfy(12,3): Error: a postcondition could not be proved on this return path
+func-depth-fail.dfy(10,10): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 3 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-succ.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-succ.dfy
new file mode 100644
index 00000000000..4f26b6ff13b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-succ.dfy
@@ -0,0 +1,13 @@
+// RUN: %verify --default-function-opacity autoRevealDependencies "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function f() : bool { true }
+function g() : bool { f() }
+function h() : bool { g() }
+function i() : bool { h() }
+
+function {:autoRevealDependencies 4} p() : (r: bool)
+  ensures r
+{ 
+  i() 
+}
diff --git a/Test/VSComp2010/Problem2-Invert.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-succ.dfy.expect
similarity index 100%
rename from Test/VSComp2010/Problem2-Invert.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/func-depth-succ.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/power.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/power.dfy
new file mode 100644
index 00000000000..ba1d4904c1f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/power.dfy
@@ -0,0 +1,14 @@
+// RUN: %exits-with 4 %verify --default-function-opacity autoRevealDependencies "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function power(b: int, n: nat): int
+{
+  if (n==0) then 1 else b*power(b, n-1)
+}
+
+method test_power()
+  ensures power(power(2, 2), 2)==16
+{
+  // Enabling following assert makes the test pass
+  //assert power(8, 5) == 32768;
+} 
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/power.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/power.dfy.expect
new file mode 100644
index 00000000000..12cf54363a8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/power.dfy.expect
@@ -0,0 +1,4 @@
+power.dfy(11,0): Error: a postcondition could not be proved on this return path
+power.dfy(10,31): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/subset-types.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/subset-types.dfy
new file mode 100644
index 00000000000..e9d9f1b713c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/subset-types.dfy
@@ -0,0 +1,29 @@
+// RUN: %verify --default-function-opacity autoRevealDependencies "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module M {
+  function one() : (r:int) {
+  
+    1
+  }
+
+  datatype Test = | Int(i:int)
+  {
+    predicate Nat() {
+      match this
+        case Int(i) => i >= 0
+    }
+  }
+
+  type Test_Nat = e:Test | e.Nat() witness Int(0)
+}
+
+module N {
+  import opened M
+
+  function two() : (r: Test_Nat)
+    ensures r.i == 2 
+  {
+    Int( Int(one() + one()).i )
+  }
+}
\ No newline at end of file
diff --git a/Test/dafny0/RlimitMultiplier.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/subset-types.dfy.expect
similarity index 100%
rename from Test/dafny0/RlimitMultiplier.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/subset-types.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/tree-map-simple.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/tree-map-simple.dfy
new file mode 100644
index 00000000000..831d0398eb0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/tree-map-simple.dfy
@@ -0,0 +1,55 @@
+// RUN: %verify --default-function-opacity autoRevealDependencies "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  TestY();
+}
+
+datatype List<A> = Nil | Cons(head: A, tail: List<A>)
+
+datatype Tree<A> = Branch(val: A, trees: List<Tree<A>>)
+
+ghost function ListData(xs: List): set
+  ensures forall x :: x in ListData(xs) ==> x < xs
+{
+  match xs
+  case Nil => {}
+  case Cons(x,xs) => {x} + ListData(xs)
+}
+
+ghost function {:transparent} TreeData(t0: Tree): set
+  ensures forall t :: t in TreeData(t0) ==> t < t0
+{
+  var Branch(x, ts) := t0;
+  {x} + set t, y | t in ListData(ts) && y in TreeData(t) :: y
+}
+
+// ---------- Partial functions ----------
+
+ghost predicate {:transparent} PreY<A,B>(f: A --> B, s: set<A>) {
+  forall x :: x in s ==> f.requires(x)
+}
+
+function MapY<A,B>(xs: List<A>, f: A --> B): List<B>
+  requires PreY(f, ListData(xs))
+  decreases xs
+{
+  match xs
+  case Nil => Nil
+  case Cons(x, xs) => Cons(f(x), MapY(xs, f))
+}
+
+function TreeMapY<A,B>(t0: Tree<A>, f: A --> B): Tree<B>
+  requires PreY(f, TreeData(t0))
+  decreases t0
+{
+  var Branch(x, ts) := t0;
+  Branch(f(x), MapY(ts, t requires t in ListData(ts) && PreY(f, TreeData(t)) => TreeMapY(t, f)))
+}
+
+method TestY() {
+  var f := x requires x != 0 => 100 / x;
+  var t := TreeMapY(Branch(1, Cons(Branch(2, Nil), Nil)), f);
+  assert t == Branch(100, Cons(Branch(50, Nil), Nil));  // proved via Lit axioms
+  print t, "\n";
+}
diff --git a/Test/comp/ExternDLL.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/tree-map-simple.dfy.expect
similarity index 100%
rename from Test/comp/ExternDLL.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/tree-map-simple.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/typecasting.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/typecasting.dfy
new file mode 100644
index 00000000000..e9d9f1b713c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/typecasting.dfy
@@ -0,0 +1,29 @@
+// RUN: %verify --default-function-opacity autoRevealDependencies "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module M {
+  function one() : (r:int) {
+  
+    1
+  }
+
+  datatype Test = | Int(i:int)
+  {
+    predicate Nat() {
+      match this
+        case Int(i) => i >= 0
+    }
+  }
+
+  type Test_Nat = e:Test | e.Nat() witness Int(0)
+}
+
+module N {
+  import opened M
+
+  function two() : (r: Test_Nat)
+    ensures r.i == 2 
+  {
+    Int( Int(one() + one()).i )
+  }
+}
\ No newline at end of file
diff --git a/Test/dafny0/fun-with-slices.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/typecasting.dfy.expect
similarity index 100%
rename from Test/dafny0/fun-with-slices.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/autoRevealDependencies/typecasting.dfy.expect
diff --git a/Test/benchmarks/sequence-race/SequenceRace.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/SequenceRace.dfy
similarity index 96%
rename from Test/benchmarks/sequence-race/SequenceRace.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/SequenceRace.dfy
index 29e449ccce6..48b97c04296 100644
--- a/Test/benchmarks/sequence-race/SequenceRace.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/SequenceRace.dfy
@@ -1,7 +1,7 @@
 // Only because we're calling gradlew rather than gradlew.bat
 // UNSUPPORTED: windows
 
-// Ensure trying to use an unsupported compilation target results in a clean error message.
+// Ensure trying to use an unsupported translation target results in a clean error message.
 // RUN: %exits-with 3 %baredafny translate cs %args "%s" --plugin:DafnyBenchmarkingPlugin.dll > "%t"
 // RUN: %diff "%s.expect" "%t"
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/SequenceRace.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/SequenceRace.dfy.expect
new file mode 100644
index 00000000000..79617618d30
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/SequenceRace.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
+SequenceRace.dfy(35,0): Error: The benchmarking plugin does not support this compilation target: Microsoft.Dafny.Compilers.CsharpCodeGenerator (--target:cs)
+Translation was aborted because errors were found
diff --git a/Test/benchmarks/sequence-race/java/build.gradle.kts b/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/build.gradle.kts
similarity index 100%
rename from Test/benchmarks/sequence-race/java/build.gradle.kts
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/build.gradle.kts
diff --git a/Test/benchmarks/sequence-race/java/gradle/wrapper/gradle-wrapper.jar b/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from Test/benchmarks/sequence-race/java/gradle/wrapper/gradle-wrapper.jar
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/gradle/wrapper/gradle-wrapper.jar
diff --git a/Test/benchmarks/sequence-race/java/gradle/wrapper/gradle-wrapper.properties b/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from Test/benchmarks/sequence-race/java/gradle/wrapper/gradle-wrapper.properties
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/gradle/wrapper/gradle-wrapper.properties
diff --git a/Test/benchmarks/sequence-race/java/gradlew b/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/gradlew
similarity index 100%
rename from Test/benchmarks/sequence-race/java/gradlew
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/gradlew
diff --git a/Test/benchmarks/sequence-race/java/gradlew.bat b/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/gradlew.bat
similarity index 100%
rename from Test/benchmarks/sequence-race/java/gradlew.bat
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/gradlew.bat
diff --git a/Test/benchmarks/sequence-race/java/settings.gradle.kts b/Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/settings.gradle.kts
similarity index 100%
rename from Test/benchmarks/sequence-race/java/settings.gradle.kts
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/benchmarks/sequence-race/java/settings.gradle.kts
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/blogposts/Inputs/TestGenerationShared.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/blogposts/Inputs/TestGenerationShared.dfy
new file mode 100644
index 00000000000..68a35d6eee5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/blogposts/Inputs/TestGenerationShared.dfy
@@ -0,0 +1,27 @@
+module Shared {
+  datatype Color = Black | White
+  datatype PieceKind = Knight(c: Color) | King(c: Color) | Pawn(c: Color)
+  datatype Pos = Pos(row: int, col: int)
+  type ChessPos = pos: Pos | // In this declaration, "|" means "such that" 
+    && 0 <= pos.row < 8
+    && 0 <= pos.col < 8 witness Pos(0, 0) // "witness" proves that the type is nonempty
+  
+  datatype Piece = Piece(kind: PieceKind, at: ChessPos) {
+    predicate Attacks(pos: ChessPos) {
+      && at != pos
+      && match this.kind {
+        case Knight(c) =>
+          || ( && abs(pos.col - at.col) == 2
+               && abs(pos.row - at.row) == 1)
+          || ( && abs(pos.col - at.col) == 1
+               && abs(pos.row - at.row) == 2)
+        case King(c) => abs(pos.col - at.col) < 2 && abs(pos.row - at.row) < 2
+        case Pawn(c) =>
+          && pos.row == at.row + (if c.White? then -1 else 1)
+          && (pos.col == at.col + 1 || pos.col == at.col - 1)
+      }
+    }
+  }
+  function abs(n: int): nat { if n > 0 then n else -n }
+  datatype Board = Board(pieces:seq<Piece>)
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/blogposts/TestGenerationNoInliningEnumerativeDefinitions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/blogposts/TestGenerationNoInliningEnumerativeDefinitions.dfy
new file mode 100644
index 00000000000..cb3e2569af4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/blogposts/TestGenerationNoInliningEnumerativeDefinitions.dfy
@@ -0,0 +1,85 @@
+
+// Generating and Running Block-Based Tests:
+// RUN: %baredafny generate-tests %args Block %S/TestGenerationNoInliningEnumerativeDefinitions.dfy > %t-tests.dfy
+// RUN: %baredafny test %args --target:cs "%t-tests.dfy" > "%t"
+
+// Generating and Running Path-Based Tests:
+// RUN: %baredafny generate-tests %args Path %S/TestGenerationNoInliningEnumerativeDefinitions.dfy > %t-tests.dfy
+// RUN: %baredafny test %args --target:cs "%t-tests.dfy" >> "%t"
+
+// Syntactically, the test method has 4 paths: yes-yes, yes-no, no-yes, no-no. But the no-yes path is
+// not feasible.
+// When aiming for Block test coverage, using tests for the yes-yes and no-no paths is both
+// sufficient and necessary. However, if the verifier happens to explore the yes-no path first, then
+// the test generator will generate 3 tests instead of just 2, which is fine.
+// Also, for both Block and Path test coverage, the order in which the tests are generated depends on what
+// the verifier chooses to do first. Thus, if something changes in the verifier, then the CHECK lines below
+// may need to be permuted.
+// RUN: %OutputCheck --file-to-check "%t" "%s"
+// CHECK: .*Dafny program verifier finished with 2 verified, 0 errors.*
+// CHECK: .*Evaluating the position: checked=no, checkmate=no.*
+// CHECK: .*Evaluating the position: checked=yes, checkmate=yes.*
+// CHECK: .*Dafny program verifier finished with 3 verified, 0 errors.*
+// CHECK: .*Evaluating the position: checked=yes, checkmate=yes.*
+// CHECK: .*Evaluating the position: checked=yes, checkmate=no.*
+// CHECK: .*Evaluating the position: checked=no, checkmate=no.*
+
+include "Inputs/TestGenerationShared.dfy"
+
+module Chess {
+  import opened Shared
+  predicate BoardIsValid(board: Board) { 
+    // We want boards with specific pieces on it:
+    && |board.pieces| == 5
+    && board.pieces[0].kind == King(White) 
+    && board.pieces[1].kind == Knight(Black) && board.pieces[2].kind == Knight(Black)
+    && board.pieces[3].kind == Pawn(Black)   && board.pieces[4].kind == Pawn(Black)
+    // No two pieces on a single square:
+    && board.pieces[0].at != board.pieces[1].at && board.pieces[0].at != board.pieces[2].at && board.pieces[0].at != board.pieces[3].at && board.pieces[0].at != board.pieces[4].at 
+    && board.pieces[1].at != board.pieces[2].at && board.pieces[1].at != board.pieces[3].at && board.pieces[1].at != board.pieces[4].at 
+    && board.pieces[2].at != board.pieces[3].at && board.pieces[2].at != board.pieces[4].at 
+    && board.pieces[3].at != board.pieces[4].at
+  }
+  type ValidBoard = board: Board | BoardIsValid(board) 
+    witness Board([Piece(King(White), Pos(0, 0)), 
+                  Piece(Knight(Black), Pos(0, 1)), Piece(Knight(Black), Pos(0, 2)),
+                  Piece(Pawn(Black), Pos(0, 3)),   Piece(Pawn(Black), Pos(0, 4))])
+  predicate CheckedByPlayer(board: ValidBoard, king: Piece, byPlayer: Color) {
+    || CheckedByPiece(board, king, Knight(byPlayer)) 
+    || CheckedByPiece(board, king, Pawn(byPlayer))
+  }
+  predicate CheckedByPiece(board: ValidBoard, king: Piece, byPiece: PieceKind) {
+    match byPiece {
+      case Knight(Black) => board.pieces[1].Attacks(king.at) || board.pieces[2].Attacks(king.at)
+      case Pawn(Black) => board.pieces[3].Attacks(king.at) || board.pieces[4].Attacks(king.at)
+      case _ => false
+    } 
+  } 
+  predicate CheckmatedByPlayer(board: ValidBoard, king: Piece, byPlayer: Color) {
+    && (king.at.row == 0 || king.at.col == 7 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row - 1, king.at.col + 1)), byPlayer))
+    && (                    king.at.col == 7 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row,     king.at.col + 1)), byPlayer))
+    && (king.at.row == 7 || king.at.col == 7 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row + 1, king.at.col + 1)), byPlayer))
+    && (king.at.row == 0                     || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row - 1, king.at.col)),     byPlayer))   
+    &&                                          CheckedByPlayer(board, king, byPlayer)     
+    && (king.at.row == 7                     || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row + 1, king.at.col)),     byPlayer))
+    && (king.at.row == 0 || king.at.col == 0 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row - 1, king.at.col - 1)), byPlayer))
+    && (                 || king.at.col == 0 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row,     king.at.col - 1)), byPlayer))
+    && (king.at.row == 7 || king.at.col == 0 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row + 1, king.at.col - 1)), byPlayer))
+  }
+
+  // {:testEntry} tells Dafny to use this method as an entry point
+  method {:testEntry} Describe(board: ValidBoard) {
+    var whiteKing := board.pieces[0];
+    print("Evaluating the position: ");
+    if CheckedByPlayer(board, whiteKing, Black) {
+      print("checked=yes, ");
+    } else {
+      print("checked=no, ");
+    }
+    if CheckmatedByPlayer(board, whiteKing, Black) {
+      print("checkmate=yes\n");
+    } else {
+      print("checkmate=no\n"); 
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/blogposts/TestGenerationWithInliningQuantifiedDefinitions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/blogposts/TestGenerationWithInliningQuantifiedDefinitions.dfy
new file mode 100644
index 00000000000..c5935efb182
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/blogposts/TestGenerationWithInliningQuantifiedDefinitions.dfy
@@ -0,0 +1,92 @@
+// Generating and Running Path-Based Tests:
+// RUN: %baredafny generate-tests %args Path %S/TestGenerationWithInliningQuantifiedDefinitions.dfy > %t-tests.dfy
+// RUN: %baredafny test %args --target:cs "%t-tests.dfy" > "%t"
+
+// Syntactically, the test method has 4 paths: yes-yes, yes-no, no-yes, no-no. But the no-yes path is
+// not feasible.
+// For Path test coverage, the order in which the tests are generated depends on what
+// the verifier chooses to do first. Thus, if something changes in the verifier, then the CHECK lines below
+// may need to be permuted.
+// RUN: %OutputCheck --file-to-check "%t" "%s"
+// CHECK: .*Dafny program verifier finished with 4 verified, 0 errors*
+// CHECK: .*Evaluating the position: checked=yes, checkmate=yes, pawn is attacking*
+// CHECK: .*Evaluating the position: checked=yes, checkmate=no, pawn is attacking*
+// CHECK: .*Evaluating the position: checked=no, checkmate=no*
+// CHECK: .*Evaluating the position: checked=yes, checkmate=no, knight is attacking*
+
+include "Inputs/TestGenerationShared.dfy"
+
+module Chess {
+  import opened Shared
+  predicate BoardIsValid(board: Board) { // No two pieces on a single square
+    forall i: nat, j: nat :: 
+      0 <= i < j < |board.pieces| ==> 
+      board.pieces[i].at != board.pieces[j].at
+  }
+  type ValidBoard = board: Board | BoardIsValid(board) witness Board([])
+  predicate {:testInline 1} CheckedByPlayer(board: ValidBoard, king: Piece, byPlayer: Color) {
+    || CheckedByPiece(board, king, Knight(byPlayer)) 
+    || CheckedByPiece(board, king, Pawn(byPlayer))
+  }
+  predicate CheckedByPiece(board: ValidBoard, king: Piece, byPiece: PieceKind) {
+    exists i: int :: (&& 0 <= i < |board.pieces| 
+                      && board.pieces[i].kind == byPiece 
+                      && board.pieces[i].Attacks(king.at))
+  } by method {
+    for i := 0 to |board.pieces| 
+        invariant !CheckedByPiece(Board(board.pieces[..i]), king, byPiece) {
+        if (board.pieces[i].kind == byPiece && 
+            board.pieces[i].Attacks(king.at)) {
+            return true;
+        }
+    }
+    return false;
+  } 
+  predicate BoardPreset(board: Board) {
+    && |board.pieces| == 5
+    && board.pieces[0].kind == King(White) 
+    && board.pieces[1].kind == Knight(Black) && board.pieces[2].kind == Knight(Black)
+    && board.pieces[3].kind == Pawn(Black)   && board.pieces[4].kind == Pawn(Black)
+  }
+  predicate CheckmatedByPlayer(board: ValidBoard, king: Piece, byPlayer: Color) {
+    && (king.at.row == 0 || king.at.col == 7 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row - 1, king.at.col + 1)), byPlayer))
+    && (                    king.at.col == 7 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row,     king.at.col + 1)), byPlayer))
+    && (king.at.row == 7 || king.at.col == 7 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row + 1, king.at.col + 1)), byPlayer))
+    && (king.at.row == 0                     || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row - 1, king.at.col)),     byPlayer))   
+    &&                                          CheckedByPlayer(board, king, byPlayer)     
+    && (king.at.row == 7                     || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row + 1, king.at.col)),     byPlayer))
+    && (king.at.row == 0 || king.at.col == 0 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row - 1, king.at.col - 1)), byPlayer))
+    && (                 || king.at.col == 0 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row,     king.at.col - 1)), byPlayer))
+    && (king.at.row == 7 || king.at.col == 0 || CheckedByPlayer(board, Piece(king.kind, Pos(king.at.row + 1, king.at.col - 1)), byPlayer))
+  }
+
+  // {:testEntry} tells Dafny to use this method as an entry point
+  method {:testEntry} Describe(board: ValidBoard) 
+    requires BoardPreset(board)
+  {
+    var whiteKing := board.pieces[0];
+    print("Evaluating the position: ");
+    if CheckedByPlayer(board, whiteKing, Black) {
+      print("checked=yes, ");
+    } else {
+      print("checked=no, ");
+    }
+    if CheckmatedByPlayer(board, whiteKing, Black) {
+      print("checkmate=yes, ");
+    } else {
+      print("checkmate=no, "); 
+    }
+    Debug(board);
+  }
+
+  method Debug(board: ValidBoard) 
+    requires BoardPreset(board)
+  {
+    var whiteKing := board.pieces[0];
+    if CheckedByPiece(board, whiteKing, Knight(Black)) {
+      print("knight is attacking\n");
+    } else if CheckedByPiece(board, whiteKing, Pawn(Black)) {
+      print("pawn is attacking\n");
+    } 
+  }
+}
diff --git a/Test/c++/ExternDefs.h b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/ExternDefs.h
similarity index 100%
rename from Test/c++/ExternDefs.h
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/ExternDefs.h
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/Makefile b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/Makefile
new file mode 100644
index 00000000000..fe71855f087
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/Makefile
@@ -0,0 +1,37 @@
+
+DAFNYS=$(wildcard *.dfy)
+CPPS=$(subst .dfy,.cpp,$(DAFNYS))
+DOT_H_S=$(subst .dfy,.h,$(DAFNYS))
+EXECS=$(subst .dfy,,$(DAFNYS))
+DAFNY_DIR=../..
+DAFNY=$(DAFNY_DIR)/Binaries/dafny
+DAFNY_RUNTIME_DIR=$(DAFNY_DIR)/Binaries
+DAFNY_RUNTIME_CPP=$(DAFNY_RUNTIME_DIR)/DafnyRuntime.h
+DAFNY_DEPS=$(DAFNY) $(DAFNY_RUNTIME_DIR)/Dafny.exe $(DAFNY_RUNTIME_DIR)/DafnyPipeline.dll $(DAFNY_RUNTIME_CPP)
+TEST_LOG=tests.log
+
+CXXFLAGS += -g -Wall -Wextra -Wpedantic -std=c++17 -I$(DAFNY_RUNTIME_DIR)
+
+.SECONDARY: $(CPPS)
+
+all:$(EXECS)
+
+vars:
+	echo $(DAFNYS)
+	echo $(CPPS)
+	echo $(EXECS)
+
+%.cpp: %.dfy $(DAFNY) $(DAFNY_DEPS)
+	$(DAFNY) /timeLimit:10 /rlimit:200000 /compile:0 /spillTargetCode:3 /compileTarget:cpp ExternDefs.h $<
+
+%.cs: %.dfy $(DAFNY) $(DAFNY_DEPS)
+	$(DAFNY) /noVerify /compile:0 /spillTargetCode:3 /compileTarget:cs $<
+
+$(EXECS): % : %.cpp $(DAFNY_RUNTIME_CPP)
+	$(CXX) $(CXXFLAGS) -o $@ $<
+
+test: $(EXECS)
+	python run_cpp_tests.py $(EXECS)
+
+clean:
+	rm -f *.cpp *cs $(DOT_H_S) $(EXECS) $(TEST_LOG)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/arrays.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/arrays.dfy
new file mode 100644
index 00000000000..75a5dc401c6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/arrays.dfy
@@ -0,0 +1,98 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --allow-deprecation --unicode-char false
+
+newtype uint32 = i:int | 0 <= i < 0x100000000
+
+method returnANullArray() returns (a: array?<uint32>)
+  ensures a == null
+{
+  a := null;
+}
+
+method returnANonNullArray() returns (a: array?<uint32>)
+  ensures a != null
+  ensures a.Length == 5
+{
+  a := new uint32[5];
+  a[0] := 1;
+  a[1] := 2;
+  a[2] := 3;
+  a[3] := 4;
+  a[4] := 5;
+}
+
+method LinearSearch(a: array<uint32>, len:uint32, key: uint32) returns (n: uint32)
+  requires a.Length == len as int
+  ensures 0 <= n <= len
+  ensures n == len || a[n] == key
+{
+  n := 0;
+  while n < len
+    invariant n <= len
+  {
+    if a[n] == key {
+      return;
+    }
+    n := n + 1;
+  }
+}
+
+method PrintArray<A>(a:array?<A>, len:uint32)
+  requires a != null ==> len as int == a.Length
+{
+  if (a == null) {
+    print "It's null\n";
+  } else {
+    var i:uint32 := 0;
+    while i < len {
+      print a[i], " ";
+      i := i + 1;
+    }
+    print "\n";
+  }
+}
+
+datatype ArrayDatatype = AD(ar: array<uint32>)
+
+method Main() {
+  var a := new uint32[23];
+  var i := 0;
+  while i < 23 {
+    a[i] := i;
+    i := i + 1;
+  }
+  PrintArray(a, 23);
+  var n := LinearSearch(a, 23, 17);
+  print n, "\n";
+  var s : seq<uint32> := a[..];
+  print s, "\n";
+  s := a[2..16];
+  print s, "\n";
+  s := a[20..];
+  print s, "\n";
+  s := a[..8];
+  print s, "\n";
+
+  // Conversion to sequence should copy elements (sequences are immutable!)
+  a[0] := 42;
+  print s, "\n";
+
+  PrintArray<uint32>(null, 0);
+
+  print "Null array:\n";
+  var a1 := returnANullArray();
+  PrintArray<uint32>(a1, 5);
+
+  print "Non-Null array:\n";
+  var a2 := returnANonNullArray();
+  PrintArray<uint32>(a2, 5);
+
+  print "Array in datatype:\n";
+  var someAr := new uint32[3];
+  someAr[0] := 1;
+  someAr[1] := 3;
+  someAr[2] := 9;
+  var ad := AD(someAr);
+  PrintArray<uint32>(ad.ar, 3);
+}
+
+
diff --git a/Test/c++/arrays.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/arrays.dfy.expect
similarity index 100%
rename from Test/c++/arrays.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/arrays.dfy.expect
diff --git a/Test/c++/bit-vectors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/bit-vectors.dfy
similarity index 82%
rename from Test/c++/bit-vectors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/bit-vectors.dfy
index d27469e4ca5..8d69b732959 100644
--- a/Test/c++/bit-vectors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/bit-vectors.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
 
 newtype uint64 = i:int | 0 <= i < 0x10000000000000000
 
diff --git a/Test/c++/bit-vectors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/bit-vectors.dfy.expect
similarity index 100%
rename from Test/c++/bit-vectors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/bit-vectors.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/class.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/class.dfy
new file mode 100644
index 00000000000..f188b70fa16
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/class.dfy
@@ -0,0 +1,179 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
+
+newtype uint32 = i:int | 0 <= i < 0x100000000
+
+class MyClass {
+  var a: uint32
+  const b: uint32
+  const c:uint32 := 17
+  static const d: uint32
+  static const e:uint32 := 18
+
+  var ar: array<uint32>
+
+  constructor (x: uint32)
+    requires x < 100
+    ensures this.a < 300
+    ensures this.b < 300
+    ensures fresh(this.ar)
+  {
+    a := 100 + x;
+    b := 200 + x;
+    ar := new uint32[5];
+  }
+
+  function F(): uint32 { 8 }
+  static function G(): uint32 { 9 }
+  method M() returns (r: uint32) { r := 69; }
+  static method N() returns (r: uint32) { return 70; }
+
+  method stuffWithAr()
+    modifies this
+    modifies this.ar
+  {
+    print "stuffWithAr\n";
+    this.ar := new uint32[5];
+    this.ar[0] := 5;
+    print this.ar[0];
+    print "\n";
+  }
+}
+
+method CallEm(c: MyClass, t: MyClass, i: MyClass)
+  requires c.a as int + t.a as int + i.a as int < 1000
+  ensures c.ar == old(c.ar)
+  modifies c, t, i
+{
+  // instance fields
+
+  print c.a, " ", t.a, " ", i.a, " ";
+  c.a := c.a + 3;
+  t.a := t.a + 3;
+  i.a := i.a + 3;
+  print c.a, " ", t.a, " ", i.a, "\n";
+
+  // (instance and static) members via instance
+
+  var u;
+
+  print c.b, " ";
+  print c.c, " ";
+  print c.d, " ";
+  print c.e, " ";
+  print c.F(), " ";
+  print c.G(), " ";
+  u := c.M();
+  print u, " ";
+  u := c.N();
+  print u, "\n";
+
+  print t.b, " ";
+  print t.c, " ";
+  print t.d, " ";
+  print t.e, " ";
+  print t.F(), " ";
+  print t.G(), " ";
+  u := t.M();
+  print u, " ";
+  u := t.N();
+  print u, "\n";
+
+  print i.b, " ";
+  print i.c, " ";
+  print i.d, " ";
+  print i.e, " ";
+  print i.F(), " ";
+  print i.G(), " ";
+  u := i.M();
+  print u, " ";
+  u := i.N();
+  print u, "\n";
+
+  // static members via type name
+
+  print MyClass.d, " ";
+  print MyClass.e, " ";
+  print MyClass.G(), " ";
+  u := MyClass.N();
+  print u, "\n";
+
+  print MyClass.d, " ";
+  print MyClass.e, " ";
+  print MyClass.G(), " ";
+  u := MyClass.N();
+  print u, "\n";
+
+  print MyClass.d, " ";
+  print MyClass.e, " ";
+  print MyClass.G(), " ";
+  u := MyClass.N();
+  print u, "\n";
+}
+
+
+method TestMyClass()
+{
+  var c := new MyClass(3);
+  var t := new MyClass(2);
+  var i := new MyClass(2);
+  print t == t, " ", i == i, " ", i == t, "\n";
+  var t2 : MyClass := t;
+  var t3 : MyClass;
+  t3 := t;
+  CallEm(c, t, i);
+  c.stuffWithAr();
+}
+
+
+class AClass {
+  var x:uint32
+  var y:uint32
+
+  constructor()
+  {
+    x := 0;
+    y := 0;
+  }
+}
+
+method TestEquality() {
+  var a := new AClass();
+  a.x := 25;
+  a.y := 15;
+
+  if a == a {
+    print "EqualityReflexive: This is expected\n";
+  } else {
+    print "EqualityReflexive: This is unexpected\n";
+    assert false;
+  }
+
+  var b := new AClass();
+  b.x := 1;
+  b.y := 2;
+
+  if a == b {
+    print "ClassAndPtrDiffer: This is unexpected\n";
+    assert false;
+  } else {
+    print "ClassAndPtrDiffer: This is expected\n";
+  }
+
+  var c := new AClass();
+  c.x := 25;
+  c.y := 15;
+
+
+  if a == c {
+    print "DeepEquality: This is unexpected\n";
+    assert false;
+  } else {
+    print "DeepEquality: This is expected\n";
+  }
+}
+
+method Main() {
+  TestMyClass();
+  TestEquality();
+}
+
diff --git a/Test/c++/class.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/class.dfy.expect
similarity index 100%
rename from Test/c++/class.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/class.dfy.expect
diff --git a/Test/c++/class.dfy.java.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/class.dfy.java.check
similarity index 100%
rename from Test/c++/class.dfy.java.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/class.dfy.java.check
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/class.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/class.dfy.rs.check
new file mode 100644
index 00000000000..36fc3c768d2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/class.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: arguments to this function are incorrect
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/const.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/const.dfy
new file mode 100644
index 00000000000..48603f6652c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/const.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
+
+module Holder {
+  const x:bool := false
+}
+
+module User {
+  import opened Holder
+
+  method Use() {
+    var b := x;
+  }
+
+  method Main() {
+    Use();
+  }
+}
diff --git a/Test/c++/const.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/const.dfy.expect
similarity index 100%
rename from Test/c++/const.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/const.dfy.expect
diff --git a/Test/c++/const.dfy.java.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/const.dfy.java.check
similarity index 100%
rename from Test/c++/const.dfy.java.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/const.dfy.java.check
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy
new file mode 100644
index 00000000000..0d156ceb301
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy
@@ -0,0 +1,166 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
+
+newtype uint32 = i:int | 0 <= i < 0x100000000
+
+datatype Op =
+  | NoOp
+  | PushOp(ghost id: int)
+
+datatype Example1 = Example1(u:uint32, b:bool)
+datatype Example2 = Ex2a(u:uint32) | Ex2b(b:bool)
+datatype Example3 = Example3(e:Example1)
+datatype Example4 = Ex4a | Ex4b
+datatype Example5<V> = Ex5a(v:V) | Ex5b(b:bool)
+datatype Example6 = Ex6a(u:uint32) | Ex6b(b:bool) | Ex6c(u:uint32, s:seq<bool>)
+type Ex1Sub = d:Example1 | d.u == 0 witness Example1(0, true)
+type Ex2Sub = d:Example2 | d.Ex2a? && d.u == 0 witness Ex2a(0)
+type Ex3Sub = d:Example3 | d.e.b witness Example3(Example1(42, true))
+
+datatype DtPointer = DtPointer(s:seq<uint32>)
+datatype DtPointerHolder = DtPointerHolder(e:DtPointer) | Other(f:bool)
+
+method Matcher(e:Example1) {
+  match e {
+    case Example1(u, b) => print u, b;
+  }
+}
+
+method TupleMatch(e1:Example2, e2:Example2) {
+  match (e1, e2) {
+    case (Ex2a(u1), Ex2a(u2)) => print u1, u2, "\n";
+    case (Ex2b(u1), Ex2a(u2)) => print u1, u2, "\n";
+    case (Ex2a(u1), Ex2b(u2)) => print u1, u2, "\n";
+    case (Ex2b(u1), Ex2b(u2)) => print u1, u2, "\n";
+  }
+}
+
+method Callee(e:Example2) {
+  match e {
+    case Ex2a(u) => print "Case A: ", u, "\n";
+    case Ex2b(b) => print "Case B: ", b, "\n";
+  }
+}
+
+method DtUpdate(e:Example1)
+{
+  var x := e.(u := 0);
+}
+
+method TestDestructor() {
+  var e1 := Example1(22, false);
+  var x := e1.u;
+  if x == 22 {
+    print "This is expected\n";
+  } else {
+    assert false;
+    print "This is unexpected!!!\n";
+  }
+}
+
+datatype Option<V> = None | Some(value:V)
+
+method TestGenericDefault() {
+  var x:Option<Example5<bool>>;
+}
+
+datatype Err<V> = Fail(err:bool) | Ok(value:V)
+
+method matcher(e:Err<uint32>) {
+  match e {
+    case Fail(s) => print s;
+    case Ok(v) => print v;
+  }
+  print "\n";
+}
+
+method GenericTest() {
+  var v:Option<uint32> := Some(32);
+  matcher(Ok(42));
+  matcher(Fail(true));
+  if v.Some? { print "Got some:", v.value, "\n"; }
+}
+
+method Comparison(x0:Example1, x1:Example1, y0:Example4, y1:Example4) {
+  if x0 == x1 {
+    print "Example1s are equal\n";
+  }
+  if x0 != x1 {
+    print "Example1s are not equal\n";
+  }
+  if y0 == y1 {
+    print "Example4s are equal\n";
+  }
+  if y0 != y1 {
+    print "Example4s are not equal\n";
+  }
+}
+
+
+datatype Dup = Dup1(b:bool, x:uint32) | Dup2(x:uint32)
+
+method DupTest(d:Dup)
+{
+  var y := d.x;
+  print y;
+  print "\n";
+}
+
+method DupTestTest()
+{
+  DupTest(Dup1(false, 42));
+  DupTest(Dup2(330));
+}
+
+datatype IntList =
+  | Nil
+  | Cons(hd:uint32, tl:IntList)
+
+method IntListLen(l:IntList) returns (len:uint32)
+{
+  match l {
+    case Nil => len := 0;
+    case Cons(hd, tl) =>
+      var len_rest := IntListLen(tl);
+      if len_rest < 0xFFFFFFFF {
+        len := len_rest + 1;
+      } else {
+        len := len_rest;
+      }
+  }
+}
+
+// Test generic datatype methods
+datatype Foo<A> = Foo(a: A) {
+  static method Alloc(a: A) returns (f: Foo<A>) {
+    f := Foo(a);
+  }
+}
+
+datatype Test<A> = Test(a:A) | Empty
+{
+  static method Alloc() returns (t:Test<A>) {
+    return Empty;
+  }
+
+  static method Invoke() {
+    var a := Alloc();
+  }
+}
+
+method Main() {
+  var e1 := Example1(22, false);
+  var e2 := Ex2a(42);
+  Callee(e2);
+  e2 := Ex2b(true);
+  Callee(e2);
+  TestDestructor();
+  GenericTest();
+  Comparison(Example1(42, true), Example1(42, true), Ex4b, Ex4b);
+  Comparison(Example1(42, false), Example1(42, true), Ex4a, Ex4a);
+  Comparison(Example1(2,  false), Example1(42, false), Ex4a, Ex4b);
+  DupTestTest();
+
+  var len := IntListLen(Cons(15, Cons(18, Cons(330, Nil))));
+  print len, "\n";
+}
+
diff --git a/Test/c++/datatypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy.expect
similarity index 100%
rename from Test/c++/datatypes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy.go.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy.go.check
new file mode 100644
index 00000000000..53cadbc0802
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy.go.check
@@ -0,0 +1,2 @@
+// https://github.com/dafny-lang/dafny/issues/4114
+// CHECK: Err.* is not a type
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy.rs.check
new file mode 100644
index 00000000000..8ecac43e42e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/datatypes.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Static\ methods\ with\ type\ arguments</i>.*
\ No newline at end of file
diff --git a/Test/c++/extern.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/extern.dfy
similarity index 92%
rename from Test/c++/extern.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/extern.dfy
index 5c2d6c17d0d..95f9749c908 100644
--- a/Test/c++/extern.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/extern.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:3 /spillTargetCode:2 /compileTarget:cpp /unicodeChar:0 "%s" ExternDefs.h > "%t"
+// RUN: %run --target cpp --allow-external-contracts --unicode-char false "%s" --input ExternDefs.h > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module {:extern "Extern"} Extern {
diff --git a/Test/c++/extern.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/extern.dfy.expect
similarity index 100%
rename from Test/c++/extern.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/extern.dfy.expect
diff --git a/Test/c++/functions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/functions.dfy
similarity index 86%
rename from Test/c++/functions.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/functions.dfy
index be47392637d..29ea1b37d80 100644
--- a/Test/c++/functions.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/functions.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:3 /spillTargetCode:2 /compileTarget:cpp /unicodeChar:0 "%s" ExternDefs.h > "%t"
+// RUN: %run --target cpp --unicode-char false "%s" --input ExternDefs.h > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module {:extern "Extern"} Extern {
@@ -7,7 +7,7 @@ module {:extern "Extern"} Extern {
   method {:extern "Extern", "Caller"} Caller(inc:uint64-->uint64, x:uint64) returns (y:uint64)
     requires inc.requires(x)
 
-  method {:extern "Extern", "GenericCaller"} GenericCaller<A>(inc:A-->A, x:A) returns (y:A)
+method {:extern "Extern", "GenericCaller"} GenericCaller<A>(inc:A-->A, x:A) returns (y:A)
     requires inc.requires(x)
 
   class {:extern} GenericClass<A>
diff --git a/Test/c++/functions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/functions.dfy.expect
similarity index 100%
rename from Test/c++/functions.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/functions.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/generic.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/generic.dfy
new file mode 100644
index 00000000000..bb8b48dd5f4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/generic.dfy
@@ -0,0 +1,35 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
+
+class Test<T> {
+  var t:T
+
+  constructor (e:T) {
+    t := e;
+  }
+}
+
+class UseTest<T> {
+  constructor () {}
+  method DoSomething(t:Test<T>)
+  {
+    var x:Test<T> := t;
+  }
+}
+
+
+datatype Err<V> = Fail(b:bool) | Ok(value:V)
+method ErrTest() returns (e:Err<bool>)
+{
+  return Fail(false);
+}
+
+method GenericIO<A>(a:A) returns (a':A)
+{
+  a' := a;
+}
+
+method Main() {
+  var t := new Test(true);
+  var u := new UseTest();
+  u.DoSomething(t);
+}
diff --git a/Test/c++/generic.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/generic.dfy.expect
similarity index 100%
rename from Test/c++/generic.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/generic.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/hello.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/hello.dfy
new file mode 100644
index 00000000000..8dcc04d4201
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/hello.dfy
@@ -0,0 +1,5 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
+
+method Main() {
+  print "Hello world\n";
+}
diff --git a/Test/c++/hello.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/hello.dfy.expect
similarity index 100%
rename from Test/c++/hello.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/hello.dfy.expect
diff --git a/Test/c++/ints.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/ints.dfy
similarity index 83%
rename from Test/c++/ints.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/ints.dfy
index 4490a54817a..4a7a9d99c9b 100644
--- a/Test/c++/ints.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/ints.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
 
 newtype sbyte = i:int | -0x80 <= i < 0x80
 newtype byte = i:int | 0 <= i < 0x100
diff --git a/Test/c++/ints.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/ints.dfy.expect
similarity index 100%
rename from Test/c++/ints.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/ints.dfy.expect
diff --git a/Test/c++/maps.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/maps.dfy
similarity index 97%
rename from Test/c++/maps.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/maps.dfy
index b88ebd56ad5..c4547f3c6e4 100644
--- a/Test/c++/maps.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/maps.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
 
 newtype uint32 = i:int | 0 <= i < 0x100000000
 
diff --git a/Test/c++/maps.dfy.cpp.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/maps.dfy.cpp.expect
similarity index 100%
rename from Test/c++/maps.dfy.cpp.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/maps.dfy.cpp.expect
diff --git a/Test/c++/maps.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/maps.dfy.expect
similarity index 100%
rename from Test/c++/maps.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/maps.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/maps.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/maps.dfy.rs.check
new file mode 100644
index 00000000000..f7364f653d9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/maps.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `_V: Hash` is not satisfied
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/recursion.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/recursion.dfy
new file mode 100644
index 00000000000..c26e140f636
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/recursion.dfy
@@ -0,0 +1,37 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
+
+newtype uint32 = i:int | 0 <= i < 0x100000000
+
+method R0(x:bool)
+{
+  if x {
+    print "x\n";
+    R1(false);
+  } else {
+    print "!x\n";
+  }
+}
+
+method R1(y:bool)
+{
+  if y {
+    print "y\n";
+    R0(false);
+  } else {
+    print "!y\n";
+  }
+}
+
+method CallSelf(x:uint32) {
+  if x == 0 {
+    print "Done\n";
+  } else {
+    print x, "\n";
+    CallSelf(x - 1);
+  }
+}
+
+method Main() {
+  R0(true);
+  CallSelf(3);
+}
diff --git a/Test/c++/recursion.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/recursion.dfy.expect
similarity index 100%
rename from Test/c++/recursion.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/recursion.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/returns.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/returns.dfy
new file mode 100644
index 00000000000..f6bde37f163
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/returns.dfy
@@ -0,0 +1,15 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
+
+newtype uint64 = i:int | 0 <= i < 0x10000000000000000
+
+method multi() returns (x:uint64, y:uint64)
+{
+  x := 1;
+  y := 2;
+}
+
+method Main()
+{
+  var x, y := multi();
+  print x, y, "\n";
+}
diff --git a/Test/c++/returns.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/returns.dfy.expect
similarity index 100%
rename from Test/c++/returns.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/returns.dfy.expect
diff --git a/Test/c++/run_cpp_tests.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/run_cpp_tests.py
similarity index 100%
rename from Test/c++/run_cpp_tests.py
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/run_cpp_tests.py
diff --git a/Test/c++/seqs.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/seqs.dfy
similarity index 92%
rename from Test/c++/seqs.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/seqs.dfy
index 903208b07f8..717217bd65b 100644
--- a/Test/c++/seqs.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/seqs.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
 
 newtype uint8 = i:int | 0 <= i < 0x100
 newtype uint32 = i:int | 0 <= i < 0x100000000
diff --git a/Test/c++/seqs.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/seqs.dfy.expect
similarity index 100%
rename from Test/c++/seqs.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/seqs.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/seqs.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/seqs.dfy.rs.check
new file mode 100644
index 00000000000..3d586af71fb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/seqs.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0061]: this function takes 1 argument but 0 arguments were supplied
\ No newline at end of file
diff --git a/Test/c++/sets.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/sets.dfy
similarity index 95%
rename from Test/c++/sets.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/sets.dfy
index 10e2fe0501d..870f83ce329 100644
--- a/Test/c++/sets.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/sets.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
 
 newtype uint32 = i:int | 0 <= i < 0x100000000
 
diff --git a/Test/c++/sets.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/sets.dfy.expect
similarity index 100%
rename from Test/c++/sets.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/sets.dfy.expect
diff --git a/Test/c++/tuple.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/tuple.dfy
similarity index 86%
rename from Test/c++/tuple.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/tuple.dfy
index 45e12e7322e..9f2997cfaa9 100644
--- a/Test/c++/tuple.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/tuple.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:3 /spillTargetCode:2 /compileTarget:cpp /unicodeChar:0 ExternDefs.h "%s" > "%t"
+// RUN: %run --target cpp --unicode-char false --input ExternDefs.h "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 newtype uint32 = i:int | 0 <= i < 0x100000000
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/tuple.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/tuple.dfy.expect
new file mode 100644
index 00000000000..ad056416a8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/tuple.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 7 verified, 0 errors
+1
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/while.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/while.dfy
new file mode 100644
index 00000000000..33a5b36db95
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/while.dfy
@@ -0,0 +1,21 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
+
+newtype uint32 = i:int | 0 <= i < 0x100000000
+
+method Main() {
+  var x:uint32 := 0;
+
+  while (x < 10) {
+    print x, "\n";
+    x := x + 1;
+  }
+
+  print "\n";
+
+  x := 0;
+  while (x < 10) {
+    print x, "\n";
+    if (x == 5) { break; }
+    x := x + 1;
+ }
+}
diff --git a/Test/c++/while.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/while.dfy.expect
similarity index 100%
rename from Test/c++/while.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/while.dfy.expect
diff --git a/Test/c++/while.dfy.java.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/while.dfy.java.check
similarity index 100%
rename from Test/c++/while.dfy.java.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/c++/while.dfy.java.check
diff --git a/Test/clean.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/clean.py
similarity index 100%
rename from Test/clean.py
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/clean.py
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/allow-warnings.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/allow-warnings.dfy
new file mode 100644
index 00000000000..b08f3d08ce3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/allow-warnings.dfy
@@ -0,0 +1,6 @@
+// RUN: %build --warn-shadowing --allow-warnings "%s" > "%t"
+// RUN: %build --warn-shadowing --warn-as-errors=false "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+method f(x: int) {
+  var x := 0;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/allow-warnings.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/allow-warnings.dfy.expect
new file mode 100644
index 00000000000..0b874352a67
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/allow-warnings.dfy.expect
@@ -0,0 +1,6 @@
+allow-warnings.dfy(5,6): Warning: Shadowed local-variable name: x
+
+Dafny program verifier finished with 0 verified, 0 errors
+allow-warnings.dfy(5,6): Warning: Shadowed local-variable name: x
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/cli/badArguments.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/badArguments.dfy
similarity index 100%
rename from Test/cli/badArguments.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/badArguments.dfy
diff --git a/Test/cli/badArguments.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/badArguments.dfy.expect
similarity index 100%
rename from Test/cli/badArguments.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/badArguments.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/badProverPath.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/badProverPath.dfy
new file mode 100644
index 00000000000..d131feb16cf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/badProverPath.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 4 %verify --solver-path=doesNotExist "%s" > "%t"
+// RUN: %exits-with 4 %build --solver-path=doesNotExist "%s" >> "%t"
+// RUN: %OutputCheck --file-to-check "%t" "%s"
+// CHECK: Z3 not found at 
+// CHECK: Z3 not found at 
+method m() {
+  assert 1 + 1 == 2;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/customMain.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/customMain.dfy
new file mode 100644
index 00000000000..456497d074c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/customMain.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachCompiler "%s" -- --main-method:HappyModule.NewMain --spill-translation
+
+method Main() {
+  print "not printed";
+}
+
+module HappyModule {
+  method NewMain() {
+    print "printed";
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/customMain.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/customMain.dfy.expect
new file mode 100644
index 00000000000..f56ec28f2a8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/customMain.dfy.expect
@@ -0,0 +1 @@
+printed
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/defaultTimeLimit.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/defaultTimeLimit.dfy
new file mode 100644
index 00000000000..e91e3331f33
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/defaultTimeLimit.dfy
@@ -0,0 +1,17 @@
+// RUN: ! %baredafny verify --use-basename-for-filename "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Foo() {
+  // Assert something that takes a long time to verify
+  assert Ack(4, 2) == 1;
+}
+
+function Ack(m: nat, n: nat): nat
+{
+  if m == 0 then
+    n + 1
+  else if n == 0 then
+    Ack(m - 1, 1)
+  else
+    Ack(m - 1, Ack(m, n - 1))
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/defaultTimeLimit.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/defaultTimeLimit.dfy.expect
new file mode 100644
index 00000000000..b7677c39850
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/defaultTimeLimit.dfy.expect
@@ -0,0 +1,7 @@
+defaultTimeLimit.dfy(4,7): Error: Verification of 'Foo' timed out after 30 seconds. (the limit can be increased using --verification-time-limit)
+  |
+4 | method Foo() {
+  |        ^^^
+
+
+Dafny program verifier finished with 1 verified, 0 errors, 1 time out
diff --git a/Test/cli/diagnosticsFormats.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/diagnosticsFormats.legacy.dfy
similarity index 100%
rename from Test/cli/diagnosticsFormats.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/diagnosticsFormats.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/diagnosticsFormats.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/diagnosticsFormats.legacy.dfy.expect
new file mode 100644
index 00000000000..9443b02bb2e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/diagnosticsFormats.legacy.dfy.expect
@@ -0,0 +1,24 @@
+diagnosticsFormats.legacy.dfy(15,0): Warning: module-level const declarations are always non-instance, so the 'static' keyword is not allowed here
+diagnosticsFormats.legacy.dfy(16,17): Error: result of operation might violate newtype constraint for 'byte'
+diagnosticsFormats.legacy.dfy(19,16): Error: a precondition for this call could not be proved
+diagnosticsFormats.legacy.dfy(18,35): Related location: this is the precondition that could not be proved
+
+Dafny program verifier finished with 1 verified, 2 errors
+{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":15,"character":0}}},"severity":2,"message":"module-level const declarations are always non-instance, so the \u0027static\u0027 keyword is not allowed here","source":"Parser","relatedInformation":[]}
+{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":16,"character":17},"end":{"line":16,"character":17}}},"severity":1,"message":"Error: result of operation might violate newtype constraint for \u0027byte\u0027","source":"Verifier","relatedInformation":[]}
+{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":19,"character":16},"end":{"line":19,"character":18}}},"severity":1,"message":"Error: a precondition for this call could not be proved","source":"Verifier","relatedInformation":[{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":18,"character":35},"end":{"line":18,"character":35}}},"message":"Related location: this is the precondition that could not be proved"}]}
+
+Dafny program verifier finished with 1 verified, 2 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":15,"character":0}}},"severity":2,"message":"module-level const declarations are always non-instance, so the \u0027static\u0027 keyword is not allowed here","source":"Parser","relatedInformation":[]}
+{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":14,"character":8},"end":{"line":14,"character":33}}},"severity":4,"message":"newtype byte resolves as target-complete {:nativeType \u0022byte\u0022} (detected range: 0 .. 256)","source":"Resolver","relatedInformation":[]}
+{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":16,"character":17},"end":{"line":16,"character":17}}},"severity":1,"message":"Error: result of operation might violate newtype constraint for \u0027byte\u0027","source":"Verifier","relatedInformation":[]}
+{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":19,"character":16},"end":{"line":19,"character":18}}},"severity":1,"message":"Error: a precondition for this call could not be proved","source":"Verifier","relatedInformation":[{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":18,"character":35},"end":{"line":18,"character":35}}},"message":"Related location: this is the precondition that could not be proved"}]}
+
+Dafny program verifier finished with 1 verified, 2 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":15,"character":0}}},"severity":2,"message":"module-level const declarations are always non-instance, so the \u0027static\u0027 keyword is not allowed here","source":"Parser","relatedInformation":[]}
+{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":16,"character":17},"end":{"line":16,"character":17}}},"severity":1,"message":"Error: result of operation might violate newtype constraint for \u0027byte\u0027","source":"Verifier","relatedInformation":[]}
+{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":19,"character":16},"end":{"line":19,"character":18}}},"severity":1,"message":"Error: a precondition for this call could not be proved","source":"Verifier","relatedInformation":[{"location":{"filename":"diagnosticsFormats.legacy.dfy","uri":"file:///diagnosticsFormats.legacy.dfy","range":{"start":{"line":18,"character":35},"end":{"line":18,"character":35}}},"message":"Related location: this is the precondition that could not be proved"}]}
+
+Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Test/cli/errorLimit.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/errorLimit.dfy
similarity index 79%
rename from Test/cli/errorLimit.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/errorLimit.dfy
index 5dbbc12a369..bad26f4d811 100644
--- a/Test/cli/errorLimit.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/errorLimit.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify %args --error-limit=0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --error-limit=0 "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 method m(x: int) {
   if x == 1 {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/errorLimit.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/errorLimit.dfy.expect
new file mode 100644
index 00000000000..1c39627d5e3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/errorLimit.dfy.expect
@@ -0,0 +1,8 @@
+errorLimit.dfy(5,4): Error: assertion might not hold
+errorLimit.dfy(7,4): Error: assertion might not hold
+errorLimit.dfy(9,4): Error: assertion might not hold
+errorLimit.dfy(11,4): Error: assertion might not hold
+errorLimit.dfy(13,4): Error: assertion might not hold
+errorLimit.dfy(15,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 6 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/fileThroughBoogie.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/fileThroughBoogie.dfy
new file mode 100644
index 00000000000..d7a17386eb0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/fileThroughBoogie.dfy
@@ -0,0 +1,4 @@
+// RUN: %verify --boogie "noDashAtStart" %s 2> %t
+// RUN: %diff "%s.expect" "%t"
+
+method Foo() { }
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/fileThroughBoogie.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/fileThroughBoogie.dfy.expect
new file mode 100644
index 00000000000..5f4fc708dc8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/fileThroughBoogie.dfy.expect
@@ -0,0 +1,2 @@
+dafny: Error: Boogie option 'noDashAtStart' must start with - or /
+Use /help for available options
diff --git a/Test/cli/help.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/help.dfy
similarity index 100%
rename from Test/cli/help.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/help.dfy
diff --git a/Test/cli/libraryOption/Inputs/brokenProducer.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/libraryOption/Inputs/brokenProducer.dfy
similarity index 100%
rename from Test/cli/libraryOption/Inputs/brokenProducer.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/libraryOption/Inputs/brokenProducer.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/libraryOption/libraryOption.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/libraryOption/libraryOption.dfy
new file mode 100644
index 00000000000..4edc19530c5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/libraryOption/libraryOption.dfy
@@ -0,0 +1,6 @@
+// RUN: ! %verify --library=%S/Inputs/brokenProducer.dfy "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function Foo(): int {
+  Bar()
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/libraryOption/libraryOption.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/libraryOption/libraryOption.dfy.expect
new file mode 100644
index 00000000000..3b35a7bf7d2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/libraryOption/libraryOption.dfy.expect
@@ -0,0 +1,3 @@
+CLI: Warning: The file 'brokenProducer.dfy' was passed to --library. Verification for that file might have used options incompatible with the current ones, or might have been skipped entirely. Use a .doo file to enable Dafny to check that compatible options were used
+brokenProducer.dfy(1,9): Error: Function body type mismatch (expected int, got bool)
+1 resolution/type errors detected in libraryOption.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/measure-complexity.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/measure-complexity.dfy
new file mode 100644
index 00000000000..4ba89c4c791
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/measure-complexity.dfy
@@ -0,0 +1,20 @@
+// RUN: %exits-with 4 %baredafny measure-complexity --show-snippets false --use-basename-for-filename --isolate-assertions --worst-amount 100 "%s" > %t.raw
+// RUN: %sed 's#\(\d+,\d+\): \d+#<redacted>#g' %t.raw > %t.raw2
+// RUN: %sed 's#are \d+#are <redacted>#g' %t.raw2 > %t
+// RUN: %diff "%s.expect" "%t"
+method Foo() {
+  assert Ack(0,0) == 10;
+  assert Ack(1,3) == 10;
+  assert Ack(3,3) == 10;
+  assert Ack(3,4) == 10;
+}
+
+function Ack(m: nat, n: nat): nat
+{
+  if m == 0 then
+    n + 1
+  else if n == 0 then
+    Ack(m - 1, 1)
+  else
+    Ack(m - 1, Ack(m, n - 1))
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/measure-complexity.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/measure-complexity.dfy.expect
new file mode 100644
index 00000000000..427b48d3a5b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/measure-complexity.dfy.expect
@@ -0,0 +1,30 @@
+Starting verification of iteration 1/1 with seed 0
+measure-complexity.dfy(6,18): Error: assertion might not hold
+The total consumed resources are <redacted>
+The most demanding 100 verification tasks consumed these resources:
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
+measure-complexity.dfy<redacted>
diff --git a/Test/cli/multipleBoogieArguments.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/multipleBoogieArguments.dfy
similarity index 100%
rename from Test/cli/multipleBoogieArguments.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/multipleBoogieArguments.dfy
diff --git a/Test/cli/multipleBoogieArguments.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/multipleBoogieArguments.dfy.expect
similarity index 100%
rename from Test/cli/multipleBoogieArguments.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/multipleBoogieArguments.dfy.expect
diff --git a/Test/cli/projectFile/badTypes/badTypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/badTypes/badTypes.dfy
similarity index 100%
rename from Test/cli/projectFile/badTypes/badTypes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/badTypes/badTypes.dfy
diff --git a/Test/cli/projectFile/badTypes/dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/badTypes/dfyconfig.toml
similarity index 100%
rename from Test/cli/projectFile/badTypes/dfyconfig.toml
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/badTypes/dfyconfig.toml
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/high.dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/high.dfyconfig.toml
new file mode 100644
index 00000000000..6045709227c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/high.dfyconfig.toml
@@ -0,0 +1,6 @@
+base = "./mid.dfyconfig.toml"
+
+includes = ["../included.dfy"]
+
+[options]
+warn-shadowing = true
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/mid.dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/mid.dfyconfig.toml
new file mode 100644
index 00000000000..c1a91005713
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/mid.dfyconfig.toml
@@ -0,0 +1,7 @@
+base = "./nested/low.dfyconfig.toml"
+
+excludes = ["../included.dfy", "./nested/excluded.dfy"]
+
+[options]
+warn-shadowing = false
+allow-warnings=true
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/nested/excluded.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/nested/excluded.dfy
new file mode 100644
index 00000000000..8edb64d5805
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/nested/excluded.dfy
@@ -0,0 +1,2 @@
+// RUN: echo ""
+complete garbage
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/nested/low.dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/nested/low.dfyconfig.toml
new file mode 100644
index 00000000000..581c5868271
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/Input/nested/low.dfyconfig.toml
@@ -0,0 +1,5 @@
+includes = ["../../included.dfy", "./excluded.dfy"]
+
+[options]
+warn-shadowing = true
+show-snippets = false
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/included.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/included.dfy
new file mode 100644
index 00000000000..a195c47596a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/included.dfy
@@ -0,0 +1,9 @@
+// RUN: %resolve %S/Input/high.dfyconfig.toml > %t
+// RUN: %diff "%s.expect" "%t"
+
+method Foo(x: int) {
+  if (x == 0) {
+    var x := 3;
+    print x, "\n";
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/included.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/included.dfy.expect
new file mode 100644
index 00000000000..6c9c4c459b9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/base/included.dfy.expect
@@ -0,0 +1,4 @@
+high.dfyconfig.toml(1,0): Warning: only Dafny project files named dfyconfig.toml are recognised by the Dafny IDE.
+included.dfy(6,8): Warning: Shadowed local-variable name: x
+
+Dafny program verifier did not attempt verification
diff --git a/Test/cli/projectFile/broken/dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/broken/dfyconfig.toml
similarity index 100%
rename from Test/cli/projectFile/broken/dfyconfig.toml
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/broken/dfyconfig.toml
diff --git a/Test/cli/projectFile/broken/invalidOption.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/broken/invalidOption.toml
similarity index 100%
rename from Test/cli/projectFile/broken/invalidOption.toml
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/broken/invalidOption.toml
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/broken/invalidValue.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/broken/invalidValue.toml
new file mode 100644
index 00000000000..ceb2fff6489
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/broken/invalidValue.toml
@@ -0,0 +1,3 @@
+includes = ["../src/input.dfy"]
+[options]
+print-mode = NoIncludes
diff --git a/Test/cli/projectFile/dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/dfyconfig.toml
similarity index 100%
rename from Test/cli/projectFile/dfyconfig.toml
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/dfyconfig.toml
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/high/projectAsLibrary.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/high/projectAsLibrary.dfy
new file mode 100644
index 00000000000..97797bd4793
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/high/projectAsLibrary.dfy
@@ -0,0 +1,15 @@
+// RUN: %resolve --library "%S/../mid/dfyconfig.toml" --library %S/../low/wrappersLib.dfy --allow-warnings --function-syntax 3 %s > "%t"
+// RUN: ! %resolve --library "%S/../mid/dfyconfig.toml" --library %S/../low/wrappersLib.dfy --allow-warnings --function-syntax 3 --unicode-char false %s >> "%t"
+// RUN: %verify --library "%S/../mid/dfyconfig.toml" --library %S/../low/wrappersLib.dfy --dont-verify-dependencies --allow-warnings --function-syntax 3 %s >> "%t"
+// RUN: ! %verify --library "%S/../mid/dfyconfig.toml" --library %S/../low/wrappersLib.dfy --verbose --allow-warnings --function-syntax 3 %s >> "%t"
+// RUN: %verify --library "%S/../safeMid/dfyconfig.toml" --library %S/../low/wrappersLib.dfy --verbose --allow-warnings --function-syntax 3 %s >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module ConsumerConsumer {
+  import opened Consumer
+  import opened Wrappers
+
+  function UsesMaybeInt(): Option<int> {
+    MaybeInt()
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/high/projectAsLibrary.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/high/projectAsLibrary.dfy.expect
new file mode 100644
index 00000000000..0226831390d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/high/projectAsLibrary.dfy.expect
@@ -0,0 +1,24 @@
+
+Dafny program verifier did not attempt verification
+CLI: Error: cannot load dfyconfig.toml: --unicode-char is set locally to False, but the library was built with True
+
+Dafny program verifier finished with 0 verified, 0 errors
+Building dependency dfyconfig.toml
+CLI: Warning: The file 'wrappersLib.dfy' was passed to --library. Verification for that file might have used options incompatible with the current ones, or might have been skipped entirely. Use a .doo file to enable Dafny to check that compatible options were used
+usesLibrary.dfy(12,37): Error: a postcondition could not be proved on this return path
+usesLibrary.dfy(12,31): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 0 verified, 1 error
+CLI: Error: Failed to build dependency dfyconfig.toml
+CLI: Warning: The file 'wrappersLib.dfy' was passed to --library. Verification for that file might have used options incompatible with the current ones, or might have been skipped entirely. Use a .doo file to enable Dafny to check that compatible options were used
+Building dependency dfyconfig.toml
+CLI: Warning: The file 'wrappersLib.dfy' was passed to --library. Verification for that file might have used options incompatible with the current ones, or might have been skipped entirely. Use a .doo file to enable Dafny to check that compatible options were used
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to usesLibrary-lib/usesLibrary.doo
+Additional output written to usesLibrary-lib/manifest.toml
+Additional output written to usesLibrary-lib/program
+Wrote Dafny library to usesLibrary.doo
+CLI: Warning: The file 'wrappersLib.dfy' was passed to --library. Verification for that file might have used options incompatible with the current ones, or might have been skipped entirely. Use a .doo file to enable Dafny to check that compatible options were used
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/cli/projectFile/libraries/wrappersLib.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/low/wrappersLib.dfy
similarity index 100%
rename from Test/cli/projectFile/libraries/wrappersLib.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/low/wrappersLib.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/mid/dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/mid/dfyconfig.toml
new file mode 100644
index 00000000000..a069d5f5691
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/mid/dfyconfig.toml
@@ -0,0 +1,7 @@
+includes = ["usesLibrary.dfy"]
+
+[options]
+library = [
+  "../low/wrappersLib.dfy"
+]
+allow-warnings=true
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/mid/usesLibrary.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/mid/usesLibrary.dfy
new file mode 100644
index 00000000000..314fdabc616
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/mid/usesLibrary.dfy
@@ -0,0 +1,13 @@
+// RUN: %resolve "%S/dfyconfig.toml" --allow-warnings > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Consumer {
+
+  import opened Wrappers
+
+  function MaybeInt(): Option<int> {
+    Some(42)
+  }
+
+  method AssertFalse() ensures false { } 
+}
\ No newline at end of file
diff --git a/Test/cli/projectFile/noOptions/input.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/mid/usesLibrary.dfy.expect
similarity index 100%
rename from Test/cli/projectFile/noOptions/input.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/mid/usesLibrary.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/safeMid/dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/safeMid/dfyconfig.toml
new file mode 100644
index 00000000000..a069d5f5691
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/safeMid/dfyconfig.toml
@@ -0,0 +1,7 @@
+includes = ["usesLibrary.dfy"]
+
+[options]
+library = [
+  "../low/wrappersLib.dfy"
+]
+allow-warnings=true
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/safeMid/usesLibrary.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/safeMid/usesLibrary.dfy
new file mode 100644
index 00000000000..2e14c622981
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/safeMid/usesLibrary.dfy
@@ -0,0 +1,11 @@
+// RUN: %resolve "%S/dfyconfig.toml" --allow-warnings > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Consumer {
+
+  import opened Wrappers
+
+  function MaybeInt(): Option<int> {
+    Some(42)
+  }
+}
\ No newline at end of file
diff --git a/Test/cli/resolve.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/safeMid/usesLibrary.dfy.expect
similarity index 100%
rename from Test/cli/resolve.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/libs/safeMid/usesLibrary.dfy.expect
diff --git a/Test/cli/projectFile/noIncludes/dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noIncludes/dfyconfig.toml
similarity index 100%
rename from Test/cli/projectFile/noIncludes/dfyconfig.toml
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noIncludes/dfyconfig.toml
diff --git a/Test/cli/projectFile/noIncludes/src/input.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noIncludes/src/input.dfy
similarity index 100%
rename from Test/cli/projectFile/noIncludes/src/input.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noIncludes/src/input.dfy
diff --git a/Test/cli/projectFile/noIncludes/src/moreNested/moreInput.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noIncludes/src/moreNested/moreInput.dfy
similarity index 100%
rename from Test/cli/projectFile/noIncludes/src/moreNested/moreInput.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noIncludes/src/moreNested/moreInput.dfy
diff --git a/Test/cli/projectFile/noOptions/dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noOptions/dfyconfig.toml
similarity index 100%
rename from Test/cli/projectFile/noOptions/dfyconfig.toml
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noOptions/dfyconfig.toml
diff --git a/Test/cli/projectFile/noOptions/input.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noOptions/input.dfy
similarity index 100%
rename from Test/cli/projectFile/noOptions/input.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noOptions/input.dfy
diff --git a/Test/git-issues/git-issue-3382.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noOptions/input.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3382.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/noOptions/input.dfy.expect
diff --git a/Test/cli/projectFile/notInput.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/notInput.dfy
similarity index 100%
rename from Test/cli/projectFile/notInput.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/notInput.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFile.dfy
new file mode 100644
index 00000000000..ffd493aaaa8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFile.dfy
@@ -0,0 +1,58 @@
+// Invalid value gives error and stops compilation
+// RUN: echo '1' >> %t
+// RUN: ! %resolve --warn-shadowing=true %S/broken/invalidValue.toml &> "%t"
+// RUN: echo '2' >> %t
+// A project file can specify input files and configure options
+// RUN: ! %resolve "%S/dfyconfig.toml" &>> "%t"
+// RUN: echo '3' >> %t
+// Test using a URL instead of a local file as a project file
+// RUN: ! %resolve "https://github.com/dafny-lang/dafny/blob/master/web.toml" &>> %t
+// RUN: echo '4' >> %t
+
+// Test option override behavior
+// RUN: %resolve "%S/dfyconfig.toml" --warn-shadowing=false &>> "%t"
+// RUN: echo '5' >> %t
+
+// Test option with default override behavior
+// RUN: ! %resolve "%S/dfyconfig.toml" --function-syntax=3 &>> "%t"
+// RUN: echo '6' >> %t
+
+// Multiple project files are not allowed
+// RUN: ! %resolve "%S/dfyconfig.toml" "%S/broken/dfyconfig.toml" &>> %t
+// RUN: echo '7' >> %t
+
+// Project files may not contain unknown properties
+// RUN: ! %resolve "%S/broken/dfyconfig.toml" &>> %t
+// RUN: echo '8' >> %t
+
+// Warn if file contains options that don't exist
+// RUN: ! %resolve "%S/broken/invalidOption.toml" &>> "%t"
+// RUN: echo '9' >> %t
+
+// Project files must be files on disk.
+// RUN: ! %resolve "%S/doesNotExist.toml" &>> %t
+// RUN: echo '10' >> %t
+
+// Project file options must have the right type
+// RUN: ! %resolve "%S/badTypes/dfyconfig.toml" &>> "%t"
+// RUN: echo '11' >> %t
+
+// A project file without includes will take all .dfy files as input
+// RUN: ! %resolve "%S/noIncludes/dfyconfig.toml" &>> "%t"
+
+// RUN: echo '12' >> %t
+// Files included by the project file and on the CLI, duplicate is ignored.
+// RUN: ! %resolve "%S/dfyconfig.toml" "%S/src/input.dfy" &>> "%t"
+
+// RUN: echo '13' >> %t
+// Files excluded by the project file and included on the CLI, are included
+// RUN: ! %resolve "%S/dfyconfig.toml" "%S/src/excluded.dfy" &>> "%t"
+
+// RUN: echo '14' >> %t
+// A project file can be found from an input file
+// RUN: ! %resolve --find-project %S/src/input.dfy &>> "%t"
+
+// RUN: echo '15' >> %t
+// RUN: ! %baredafny format --use-basename-for-filename --check "%S/dfyconfig.toml" &>> "%t"
+
+// RUN: %diff "%s.expect" "%t"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFile.dfy.expect
new file mode 100644
index 00000000000..36b052ea55d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFile.dfy.expect
@@ -0,0 +1,43 @@
+invalidValue.toml(3,13): Error: Unexpected token `NoIncludes` for a value
+invalidValue.toml(1,0): Warning: only Dafny project files named dfyconfig.toml are recognised by the Dafny IDE.
+2
+input.dfy(6,8): Warning: Shadowed local-variable name: x
+Compilation failed because warnings were found and --allow-warnings is false
+3
+Error: file web.toml not found
+4
+
+Dafny program verifier did not attempt verification
+5
+input.dfy(10,0): Error: a function cannot be declared 'ghost' (it is 'ghost' by default when using --function-syntax:3)
+1 parse errors detected in dfyconfig.toml
+6
+Only one project file can be used at a time. Both dfyconfig.toml and dfyconfig.toml were specified
+7
+dfyconfig.toml(1,0): Error: Dafny project files do not have the property includdddes
+8
+Warning: option 'does-not-exist' that was specified in the project file, is not a valid Dafny option.
+invalidOption.toml(1,0): Warning: only Dafny project files named dfyconfig.toml are recognised by the Dafny IDE.
+Compilation failed because warnings were found and --allow-warnings is false
+9
+Error: file doesNotExist.toml not found
+10
+dfyconfig.toml(1,0): Error: could not parse value '3' for option 'warn-shadowing' that has type 'Boolean'
+11
+input.dfy(6,8): Warning: Shadowed local-variable name: x
+moreInput.dfy(6,8): Warning: Shadowed local-variable name: x
+Compilation failed because warnings were found and --allow-warnings is false
+12
+input.dfy(6,8): Warning: Shadowed local-variable name: x
+Compilation failed because warnings were found and --allow-warnings is false
+13
+input.dfy(3,7): Error: Duplicate member name: Foo
+excluded.dfy(6,8): Warning: Shadowed local-variable name: z
+input.dfy(6,8): Warning: Shadowed local-variable name: x
+1 resolution/type errors detected in dfyconfig.toml
+14
+input.dfy(6,8): Warning: Shadowed local-variable name: x
+Compilation failed because warnings were found and --allow-warnings is false
+15
+The file input.dfy needs to be formatted
+Error: 1 file needs formatting.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFileRun.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFileRun.dfy
new file mode 100644
index 00000000000..8dbdf02e2ee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFileRun.dfy
@@ -0,0 +1,5 @@
+// NONUNIFORM: we're not testing the execution behavior
+// Run works with project files
+// RUN: %baredafny run --show-snippets:false --build=Build/temp --warn-shadowing=false --use-basename-for-filename "%S/dfyconfig.toml" > "%t"
+
+// RUN: %diff "%s.expect" "%t"
diff --git a/Test/name with space/run.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFileRun.dfy.expect
similarity index 100%
rename from Test/name with space/run.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/projectFileRun.dfy.expect
diff --git a/Test/cli/projectFile/src/excluded.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/src/excluded.dfy
similarity index 100%
rename from Test/cli/projectFile/src/excluded.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/src/excluded.dfy
diff --git a/Test/cli/projectFile/src/input.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/src/input.dfy
similarity index 75%
rename from Test/cli/projectFile/src/input.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/src/input.dfy
index b490f1a3cd7..86e9270be1a 100644
--- a/Test/cli/projectFile/src/input.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/projectFile/src/input.dfy
@@ -9,4 +9,8 @@ method Foo() {
 
 ghost function Bar(): int {
   3
-} 
\ No newline at end of file
+} 
+
+method Main() {
+  print "hello";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/proverPath.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/proverPath.dfy
new file mode 100644
index 00000000000..65e276023d4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/proverPath.dfy
@@ -0,0 +1,6 @@
+// RUN: %verify --solver-path="%z3" "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// UNSUPPORTED: windows
+method m() {
+  assert 1 + 1 == 2;
+}
diff --git a/Test/dafny4/Bug118.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/proverPath.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug118.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/proverPath.dfy.expect
diff --git a/Test/cli/resolve.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/resolve.dfy
similarity index 100%
rename from Test/cli/resolve.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/resolve.dfy
diff --git a/Test/git-issues/git-issue-3472.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/resolve.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3472.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/resolve.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/runArgument.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/runArgument.dfy
new file mode 100644
index 00000000000..86dcc904753
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/runArgument.dfy
@@ -0,0 +1,20 @@
+// NONUNIFORM: This tests front-end behavior, and is back-end independent.
+// RUN: %run %s blie 2 &> %t
+// RUN: %run %s --blie --2 &>> %t
+// RUN: %run %s -- --bla --2 &>> %t
+// RUN: %diff "%s.expect" "%t"
+
+method Main(args: seq<string>) {
+  if |args| != 3 {
+    print "Expected 3 arguments, got ", |args|;
+  } else {
+    print args[1], " says ";
+    if args[2] == "1" {
+      print "hello\n";
+    } else if args[2] == "2" {
+      print "howdy\n";
+    } else {
+      print args[2],"\n";
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/runArgument.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/runArgument.dfy.expect
new file mode 100644
index 00000000000..57a2f0fd11f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/runArgument.dfy.expect
@@ -0,0 +1,11 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+blie says howdy
+Argument --blie is not a Dafny option so it was interpreted as an argument to the user program, even though it starts with '--'. Move this argument to after a `--` token to silence this message.
+Argument --2 is not a Dafny option so it was interpreted as an argument to the user program, even though it starts with '--'. Move this argument to after a `--` token to silence this message.
+
+Dafny program verifier finished with 1 verified, 0 errors
+--blie says --2
+
+Dafny program verifier finished with 1 verified, 0 errors
+--bla says --2
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/solverLog.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/solverLog.dfy
new file mode 100644
index 00000000000..1a4ac35e924
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/solverLog.dfy
@@ -0,0 +1,7 @@
+// RUN: %verify --solver-log="log.smt2" --resource-limit 10e3 "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %OutputCheck --file-to-check "log.smt2" "%s"
+// CHECK: rlimit 10000\)
+method m() {
+  assert 1 + 1 == 2;
+}
diff --git a/Test/dafny4/Bug124.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/solverLog.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug124.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/solverLog.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/solverOpt.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/solverOpt.dfy
new file mode 100644
index 00000000000..46173c572dc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/solverOpt.dfy
@@ -0,0 +1,12 @@
+// RUN: %exits-with 4 %verify --boogie -trace --solver-option BATCH_MODE=true "%s" > "%t"
+// RUN: %OutputCheck --file-to-check "%t" "%s"
+// CHECK: Running in batch mode.
+method M(x: int) {
+  if x == 1 {
+    assert x != 1;
+  } else if x == 2 {
+    assert x != 2;
+  } else if x == 3 {
+    assert x != 3;
+  }
+}
diff --git a/Test/cli/zeroCores.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/zeroCores.dfy
similarity index 100%
rename from Test/cli/zeroCores.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/zeroCores.dfy
diff --git a/Test/cli/zeroCores.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/zeroCores.dfy.expect
similarity index 100%
rename from Test/cli/zeroCores.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cli/zeroCores.dfy.expect
diff --git a/Test/cloudmake/CloudMake-CachedBuilds.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-CachedBuilds.dfy
similarity index 99%
rename from Test/cloudmake/CloudMake-CachedBuilds.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-CachedBuilds.dfy
index 31878342f89..5511b29226f 100644
--- a/Test/cloudmake/CloudMake-CachedBuilds.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-CachedBuilds.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"
+// RUN: %verify --manual-triggers --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This module proves the correctness of the algorithms.  It leaves a number of things undefined.
@@ -615,7 +615,7 @@ abstract module M0 {
     var _, _ := EvalLemma(expr, st, env, useCache);
   }
 
-  lemma {:induction false} {:timeLimit 30} EvalLemma(expr: Expression, st: State, env: Env, useCache: bool) returns (outExpr: Expression, outSt: State)
+  lemma {:induction false} {:resource_limit "30e6"} EvalLemma(expr: Expression, st: State, env: Env, useCache: bool) returns (outExpr: Expression, outSt: State)
     requires ValidState(st) && ValidEnv(env)
     requires useCache ==> ConsistentCache(st)
     ensures
@@ -959,7 +959,7 @@ abstract module M0 {
     ensures p.fst == pC.fst
     ensures StateCorrespondence(p.snd, pC.snd)
   {
-    assume |args| == Arity(primExec) ==>
+    assume {:axiom} |args| == Arity(primExec) ==>
       ValidArgs(primExec, args, stCombined) == ValidArgs(primExec, args, stCombinedC);  // TODO:  This will require some work!
 
     if |args| == Arity(primExec) && ValidArgs(primExec, args, stCombined) {
@@ -1196,7 +1196,7 @@ abstract module M0 {
       }
     }
   }
-  lemma {:timeLimit 15} StateCorrespondence_Ctor(stOrig: State, st: State, sts: set<State>, stC: State, stsC: set<State>)
+  lemma {:resource_limit "15e6"} StateCorrespondence_Ctor(stOrig: State, st: State, sts: set<State>, stC: State, stsC: set<State>)
     requires ValidState(st) && forall s :: s in sts ==> ValidState(s)
     requires Extends(stOrig, st) && forall s :: s in sts ==> Extends(stOrig, s)
     requires StateCorrespondence(st, stC)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-CachedBuilds.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-CachedBuilds.dfy.expect
new file mode 100644
index 00000000000..a4d7ffedb36
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-CachedBuilds.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 76 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ConsistentBuilds.legacy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ConsistentBuilds.legacy.dfy
new file mode 100644
index 00000000000..e94ea5f4e61
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ConsistentBuilds.legacy.dfy
@@ -0,0 +1,663 @@
+// RUN: %dafny /compile:0 /dprint:"%t.dprint" /autoTriggers:0 /restartProver "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+/******* State *******/
+type State
+
+ghost function GetSt(p: Path, st: State): Artifact
+ghost function SetSt(p: Path, a: Artifact, st: State): State
+
+ghost function DomSt(st: State): set<Path>
+
+ghost function Restrict(paths: set<Path>, st: State): State
+  requires paths <= DomSt(st)
+  ensures
+    var st' := Restrict(paths, st);
+    DomSt(st') == paths && forall p :: p in paths ==> GetSt(p, st) == GetSt(p, st')
+
+ghost function Union(st: State, st': State): State
+  ensures
+    var result := Union(st, st');
+    DomSt(result) == DomSt(st) + DomSt(st') &&
+    forall p :: p in DomSt(result) ==>
+      (p in DomSt(st) ==> GetSt(p, result) == GetSt(p, st)) &&
+      (p in DomSt(st') ==> GetSt(p, result) == GetSt(p, st'))
+
+lemma StateEqualityProperty(st: State, st': State)
+  requires DomSt(st) == DomSt(st')
+  requires forall p :: p in DomSt(st) ==> GetSt(p, st) == GetSt(p, st')
+  ensures st == st'
+
+/******* Cached state *******/
+datatype StateC = S(st: State, c: Cache)
+
+ghost function EmptyCache(): Cache
+  ensures DomC(EmptyCache()) == {}
+
+ghost function GetC(h: HashValue, c: Cache): Triple<Expression, Expression, string>
+ghost function SetC(h: HashValue, cmd: Triple<Expression, Expression, string>, c: Cache): Cache
+  ensures DomC(SetC(h, cmd, c)) == DomC(c) + {h}
+
+ghost function UpdateC(cmd: Expression, deps: Expression, exts: Expression, stC: StateC): StateC
+  requires
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings?
+  ensures
+    var stC' := UpdateC(cmd, deps, exts, stC);
+    var hashValues := set e | e in exts.lit.strs :: Hash(Loc(cmd, deps, e));
+    stC'.st == stC.st &&
+    DomC(stC.c) + hashValues == DomC(stC'.c)
+  decreases exts.lit.strs
+{
+  var strs := exts.lit.strs;
+  if strs == {} then
+    stC
+  else
+    var e := Choose(strs);
+    var c' := SetC(Hash(Loc(cmd, deps, e)), Trio(cmd, deps, e), stC.c);
+    var exts' := exprLiteral(litArrOfStrings(strs - {e}));
+    UpdateC(cmd, deps, exts', S(stC.st, c'))
+}
+
+lemma UpdateCLemma(cmd: Expression, deps: Expression, exts: Expression, stC: StateC)
+  requires
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
+    ConsistentCache(stC) &&
+    forall e :: e in exts.lit.strs ==> Loc(cmd, deps, e) in DomSt(stC.st)
+  ensures
+    var stC' := UpdateC(cmd, deps, exts, stC);
+    ConsistentCache(stC') &&
+    forall e :: e in exts.lit.strs ==> Hash(Loc(cmd, deps, e)) in DomC(stC'.c)
+  decreases exts.lit.strs
+{
+  var strs := exts.lit.strs;
+  var stC' := UpdateC(cmd, deps, exts, stC);
+  if strs == {} {
+  } else {
+    var e := Choose(strs);
+    var c' := SetC(Hash(Loc(cmd, deps, e)), Trio(cmd, deps, e), stC.c);
+    var exts' := exprLiteral(litArrOfStrings(strs - {e}));
+    // note: This assertion is necessary.
+    assert stC' == UpdateC(cmd, deps, exts', S(stC.st, c'));
+    forall cmd', deps', e' | Hash(Loc(cmd', deps', e')) == Hash(Loc(cmd, deps, e)) {
+      HashProperty(cmd', deps', e', cmd, deps, e);
+    }
+  }
+}
+
+ghost function Choose(ss: set<string>): string
+  requires ss != {}
+{
+  var s :| s in ss; s
+}
+
+ghost function DomC(c: Cache): set<HashValue>
+
+ghost function UnionC(stC: StateC, stC': StateC): StateC
+  ensures
+    var result := UnionC(stC, stC');
+    DomSt(result.st) == DomSt(stC.st) + DomSt(stC'.st) &&
+    (forall p :: p in DomSt(result.st) ==>
+      (p in DomSt(stC.st) ==> GetSt(p, result.st) == GetSt(p, stC.st)) &&
+      (p in DomSt(stC'.st) ==> GetSt(p, result.st) == GetSt(p, stC'.st))) &&
+    DomC(result.c) == DomC(stC.c) + DomC(stC'.c) &&
+    (forall h :: h in DomC(result.c) ==>
+      (h in DomC(stC.c) ==> GetC(h, result.c) == GetC(h, stC.c)) &&
+      (h in DomC(stC'.c) ==> GetC(h, result.c) == GetC(h, stC'.c)))
+
+ghost predicate CompatibleC(stsC: set<StateC>)
+{
+  forall stC, stC', p, h ::
+    stC in stsC && stC' in stsC &&
+    p in DomSt(stC.st) && p in DomSt(stC'.st) &&
+    h in DomC(stC.c) && h in DomC(stC'.c) ==>
+      GetSt(p, stC.st) == GetSt(p, stC'.st) && GetC(h, stC.c) == GetC(h, stC'.c)
+}
+
+ghost function CombineC(stsC: set<StateC>): StateC
+  requires stsC != {}
+  ensures
+    var stCombinedC := CombineC(stsC);
+    (forall stC :: stC in stsC ==> DomSt(stC.st) <= DomSt(stCombinedC.st)) &&
+    (forall stC, p :: stC in stsC && p in DomSt(stC.st) ==>
+      GetSt(p, stC.st) == GetSt(p, stCombinedC.st)) &&
+    (forall p :: p in DomSt(stCombinedC.st) ==> exists stC :: stC in stsC && p in DomSt(stC.st)) &&
+    (forall stC :: stC in stsC ==> DomC(stC.c) <= DomC(stCombinedC.c)) &&
+    (forall stC, h :: stC in stsC && h in DomC(stC.c) ==>
+      GetC(h, stC.c) == GetC(h, stCombinedC.c)) &&
+    (forall h :: h in DomC(stCombinedC.c) ==> exists stC :: stC in stsC && h in DomC(stC.c))
+{
+  var stC :| stC in stsC;
+  if stsC == {stC} then
+    stC
+  else
+    UnionC(stC, CombineC(stsC - {stC}))
+}
+
+lemma CombineCLemma(stsC: set<StateC>)
+  requires stsC != {}
+  requires forall stC :: stC in stsC ==> ConsistentCache(stC)
+  ensures
+   var stC' := CombineC(stsC);
+   ConsistentCache(stC')
+{
+}
+
+ghost predicate ConsistentCache(stC: StateC)
+{
+  forall cmd, deps, e :: Hash(Loc(cmd, deps, e)) in DomC(stC.c) ==>
+    Loc(cmd, deps, e) in DomSt(stC.st)
+}
+
+/******* {true} init {consistent_cache} *******/
+ghost function ClearCache(stC: StateC): StateC
+  ensures
+    var stC' := ClearCache(stC);
+    // note: This follows directly from the definition.
+    stC.st == stC'.st && DomC(stC'.c) == {} &&
+    ConsistentCache(stC')
+{
+  S(stC.st, EmptyCache())
+}
+
+/******* Environment *******/
+type Env
+
+ghost function EmptyEnv(): Env
+ghost function GetEnv(id: Identifier, env: Env): Expression
+  ensures Value(GetEnv(id, env))
+ghost function SetEnv(id: Identifier, expr: Expression, env: Env): Env
+  requires Value(expr)
+
+/******* Primitive function 'exec' *******/
+ghost function exec(cmd: Expression, deps: Expression, exts: Expression, st: State): Tuple<Expression, State>
+
+lemma ExecProperty(cmd: Expression, deps: Expression, exts: Expression, st: State)
+  requires
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
+    deps.lit.paths <= DomSt(st) &&
+    Pre(cmd, deps, exts, Restrict(deps.lit.paths, st))
+  ensures
+    var result := exec(cmd, deps, exts, st);
+    var expr', st' := result.fst, result.snd;
+    expr'.exprLiteral? && expr'.lit.litArrOfPaths? &&
+    expr'.lit.paths <= DomSt(st') &&
+    // note: We need this for the precondition of Restrict.
+    DomSt(st) <= DomSt(st') && st == Restrict(DomSt(st), st') &&
+    OneToOne(cmd, deps, exts, expr') &&
+    Post(cmd, deps, exts, Restrict(deps.lit.paths, st')) &&
+    forall p :: p !in DomSt(st) && p in DomSt(st') ==> p.OpaquePath?
+
+ghost predicate Pre(cmd: Expression, deps: Expression, exts: Expression, st: State)
+  requires
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings?
+{
+  forall e :: e in exts.lit.strs ==>
+    Loc(cmd, deps, e) in DomSt(st) ==> GetSt(Loc(cmd, deps, e), st) == Res(cmd, deps, e, st)
+}
+
+ghost predicate Post(cmd: Expression, deps: Expression, exts: Expression, st: State)
+  requires
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings?
+{
+  forall e :: e in exts.lit.strs ==>
+    Loc(cmd, deps, e) in DomSt(st) && GetSt(Loc(cmd, deps, e), st) == Res(cmd, deps, e, st)
+}
+
+ghost function Res(cmd: Expression, deps: Expression, ext: string, st: State): Artifact
+
+ghost predicate OneToOne(cmd: Expression, deps: Expression, exts: Expression, paths: Expression)
+  requires
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
+    paths.exprLiteral? && paths.lit.litArrOfPaths?
+{
+  forall e :: e in exts.lit.strs ==> Loc(cmd, deps, e) in paths.lit.paths
+}
+
+ghost function Loc(cmd: Expression, deps: Expression, ext: string): Path
+
+/******* Primitive function 'execC' *******/
+ghost function execC(cmd: Expression, deps: Expression, exts: Expression, stC: StateC): Tuple<Expression, StateC>
+  requires
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings?
+{
+  if forall e | e in exts.lit.strs :: Hash(Loc(cmd, deps, e)) in DomC(stC.c) then
+    var paths := set e | e in exts.lit.strs :: Loc(cmd, deps, e);
+    var expr' := exprLiteral(litArrOfPaths(paths));
+    Pair(expr', stC)
+  else
+    var result := exec(cmd, deps, exts, stC.st);
+    var expr', st' := result.fst, result.snd;
+    var stC' := UpdateC(cmd, deps, exts, S(st', stC.c));
+    Pair(expr', stC')
+}
+
+lemma ExecCProperty(cmd: Expression, deps: Expression, exts: Expression, stC: StateC)
+  requires
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
+    deps.lit.paths <= DomSt(stC.st) &&
+    PreC(cmd, deps, exts, stC) &&
+    ConsistentCache(stC)
+  ensures
+    var result := execC(cmd, deps, exts, stC);
+    var expr', stC' := result.fst, result.snd;
+    expr'.exprLiteral? && expr'.lit.litArrOfPaths? &&
+    expr'.lit.paths <= DomSt(stC'.st) &&
+    // note: We need this for the precondition of Restrict.
+    DomSt(stC.st) <= DomSt(stC'.st) && stC.st == Restrict(DomSt(stC.st), stC'.st) &&
+    OneToOne(cmd, deps, exts, expr') &&
+    PostC(cmd, deps, exts, stC') &&
+    (forall p :: p !in DomSt(stC.st) && p in DomSt(stC'.st) ==> p.OpaquePath?) &&
+    ConsistentCache(stC')
+{
+  var result := execC(cmd, deps, exts, stC);
+  var expr', stC' := result.fst, result.snd;
+  if forall e | e in exts.lit.strs :: Hash(Loc(cmd, deps, e)) in DomC(stC.c) {
+    StateEqualityProperty(stC.st, Restrict(DomSt(stC.st), stC'.st));
+  } else {
+    ExecProperty(cmd, deps, exts, stC.st);
+    var execResult := exec(cmd, deps, exts, stC.st);
+    var st' := execResult.snd;
+    assert DomSt(stC.st) <= DomSt(st');
+    StateEqualityProperty(stC'.st, st');
+    UpdateCLemma(cmd, deps, exts, S(st', stC.c));
+  }
+}
+
+ghost predicate PreC(cmd: Expression, deps: Expression, exts: Expression, stC: StateC)
+  requires
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
+    // note: We need this for the precondition of Restrict.
+    deps.lit.paths <= DomSt(stC.st)
+{
+  Pre(cmd, deps, exts, Restrict(deps.lit.paths, stC.st)) &&
+  forall e :: e in exts.lit.strs ==> Hash(Loc(cmd, deps, e)) in DomC(stC.c) ==>
+    Loc(cmd, deps, e) in deps.lit.paths
+}
+
+ghost predicate PostC(cmd: Expression, deps: Expression, exts: Expression, stC: StateC)
+  requires
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
+    // note: We need this for the precondition of Restrict.
+    deps.lit.paths <= DomSt(stC.st)
+{
+  Post(cmd, deps, exts, Restrict(deps.lit.paths, stC.st)) &&
+  forall e :: e in exts.lit.strs ==> Hash(Loc(cmd, deps, e)) in DomC(stC.c)
+}
+
+ghost function Hash(p: Path): HashValue
+
+lemma HashProperty(cmd: Expression, deps: Expression, ext: string, cmd': Expression, deps': Expression, ext': string)
+  requires Hash(Loc(cmd, deps, ext)) == Hash(Loc(cmd', deps', ext'))
+  ensures cmd == cmd' && deps == deps' && ext == ext'
+
+/******* Grammar *******/
+datatype Program = Program(stmts: seq<Statement>)
+
+datatype Statement = stmtVariable(id: Identifier, expr: Expression) |
+                     stmtReturn(ret: Expression)
+
+datatype Expression = exprLiteral(lit: Literal) | exprIdentifier(id: Identifier) |
+                      exprIf(cond: Expression, ifTrue: Expression, ifFalse: Expression) |
+                      exprAnd(conj0: Expression, conj1: Expression) |
+                      exprOr(disj0: Expression, disj1: Expression) |
+                      exprInvocation(fun: Expression, args: seq<Expression>) |
+                      exprError(r: Reason)
+
+datatype Literal = litTrue | litFalse | litUndefined | litNull |
+                   litNumber(num: int) | litString(str: string) |
+                   litPrimitive(prim: Primitive) |
+                   litArrOfPaths(paths: set<Path>) |
+                   litArrOfStrings(strs: set<string>) |
+                   litArray(arr: seq<Expression>)
+
+datatype Primitive = primCreatePath | primExec
+
+datatype Reason = rCompatibility | rValidity | rInconsistentCache
+
+datatype Path = OpaquePath(int) | TransparentPath(int)
+type Artifact
+type Identifier
+
+type Cache
+type HashValue
+
+datatype Tuple<A, B> = Pair(fst: A, snd: B)
+datatype Triple<A, B, C> = Trio(fst: A, snd: B, trd: C)
+
+/******* Values *******/
+ghost predicate Value(expr: Expression)
+{
+  expr.exprLiteral?
+}
+
+/******* Semantics *******/
+
+ghost predicate Legal(stmts: seq<Statement>)
+{
+  |stmts| != 0
+}
+
+ghost function Arity(prim: Primitive): nat
+{
+  match prim
+  case primCreatePath => 1
+  case primExec => 3
+}
+
+/******* Function 'buildC' *******/
+ghost function buildC(prog: Program, stC: StateC): Tuple<Expression, StateC>
+  requires Legal(prog.stmts)
+{
+  doC(prog.stmts, stC, EmptyEnv())
+}
+
+/******* Function 'doC' *******/
+ghost function doC(stmts: seq<Statement>, stC: StateC, env: Env): Tuple<Expression, StateC>
+  requires Legal(stmts)
+{
+  var stmt := stmts[0];
+  if stmt.stmtVariable? then
+    var result := evalC(stmt.expr, stC, env);
+    var expr', stC' := result.fst, result.snd;
+    if Value(expr') then
+      var env' := SetEnv(stmt.id, expr', env);
+      if Legal(stmts[1..]) then
+        doC(stmts[1..], stC', env')
+      else
+        Pair(expr', stC')
+    else
+      Pair(exprError(rValidity), stC)
+  // todo(maria): Add the recursive case.
+  else
+    assert stmt.stmtVariable? || stmt.stmtReturn?;
+    evalC(stmt.ret, stC, env)
+}
+
+/******* Function 'evalC' *******/
+ghost function evalC(expr: Expression, stC: StateC, env: Env): Tuple<Expression, StateC>
+  decreases expr
+{
+  if Value(expr) then
+    Pair(expr, stC)
+  // identifier
+  else if expr.exprIdentifier? then
+    Pair(GetEnv(expr.id, env), stC)
+  // if-expression
+  else if expr.exprIf? && expr.cond.exprLiteral? && expr.cond.lit == litTrue then
+    evalC(expr.ifTrue, stC, env)
+  else if expr.exprIf? && expr.cond.exprLiteral? && expr.cond.lit == litFalse then
+    evalC(expr.ifFalse, stC, env)
+  else if expr.exprIf? then
+    var result := evalC(expr.cond, stC, env);
+    var cond', stC' := result.fst, result.snd;
+    if cond'.exprLiteral? && cond'.lit == litTrue then
+      evalC(expr.ifTrue, stC', env)
+    else if cond'.exprLiteral? && cond'.lit == litFalse then
+      evalC(expr.ifFalse, stC', env)
+    else
+      Pair(exprError(rValidity), stC)
+  // and-expression
+  else if expr.exprAnd? then
+    var result := evalC(expr.conj0, stC, env);
+    var conj0', stC' := result.fst, result.snd;
+    if conj0'.exprLiteral? && conj0'.lit == litTrue then
+      evalC(expr.conj1, stC', env)
+    else if conj0'.exprLiteral? && conj0'.lit == litFalse then
+      Pair(exprLiteral(litFalse), stC')
+    else
+      Pair(exprError(rValidity), stC)
+  // or-expression
+  else if expr.exprOr? then
+    var result := evalC(expr.disj0, stC, env);
+    var disj0', stC' := result.fst, result.snd;
+    if disj0'.exprLiteral? && disj0'.lit == litTrue then
+      Pair(exprLiteral(litTrue), stC')
+    else if disj0'.exprLiteral? && disj0'.lit == litFalse then
+      evalC(expr.disj1, stC', env)
+    else
+      Pair(exprError(rValidity), stC)
+  // invocation
+  else if expr.exprInvocation? then
+    var resultFun := evalC(expr.fun, stC, env);
+    var fun', stC' := resultFun.fst, resultFun.snd;
+    var resultArgs := evalArgsC(expr, expr.args, stC, env);
+    var args', stsC' := resultArgs.fst, resultArgs.snd;
+    var stsC'' := {stC'} + stsC';
+    if CompatibleC(stsC'') then
+      var stCombinedC := CombineC(stsC'');
+      // primitive functions
+      if fun'.exprLiteral? && fun'.lit.litPrimitive? then
+        // primitive function 'execC'
+        if fun'.lit.prim.primExec? then
+          if |args'| == Arity(primExec) && ValidArgsC(primExec, args', stCombinedC) then
+            execC(args'[0], args'[1], args'[2], stCombinedC)
+          else
+            if ConsistentCache(stCombinedC) then
+              Pair(exprError(rValidity), stC)
+            else
+              Pair(exprError(rInconsistentCache), stC)
+        else
+        // primitive function 'createPath'
+        // todo(maria): Add primitive function 'createPath'.
+          Pair(exprError(rValidity), stC)
+      // todo(maria): Add non-primitive invocations.
+      else
+        Pair(exprError(rValidity), stC)
+    else
+      Pair(exprError(rCompatibility), stC)
+  // error
+  else
+    Pair(exprError(rValidity), stC)
+}
+
+ghost function evalArgsC(expr: Expression, args: seq<Expression>, stC: StateC, env: Env):
+         Tuple<seq<Expression>, set<StateC>>
+  requires forall arg :: arg in args ==> arg < expr
+  decreases expr, |args| + 1
+
+{
+  evalArgsC'(expr, args, stC, env, [], {})
+}
+
+ghost function evalArgsC'(expr: Expression, args: seq<Expression>, stC: StateC, env: Env,
+                    args': seq<Expression>, stsC': set<StateC>):
+         Tuple<seq<Expression>, set<StateC>>
+  requires forall arg :: arg in args ==> arg < expr
+  decreases expr, |args|
+{
+  if args == [] then
+    Pair(args', stsC')
+  else
+    var arg := args[0];
+    var result := evalC(arg, stC, env);
+    var arg', stC' := result.fst, result.snd;
+    evalArgsC'(expr, args[1..], stC, env, args' + [arg'], stsC' + {stC'})
+}
+
+ghost predicate ValidArgsC(prim: Primitive, args: seq<Expression>, stC: StateC)
+  requires prim.primExec? ==> |args| == 3
+  requires prim.primCreatePath? ==> |args| == 1
+{
+  match prim
+  case primCreatePath => false
+  case primExec =>
+    var cmd, deps, exts := args[0], args[1], args[2];
+    cmd.exprLiteral? && cmd.lit.litString? &&
+    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
+    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
+    deps.lit.paths <= DomSt(stC.st) &&
+    PreC(cmd, deps, exts, stC)
+}
+
+/******* {consistent_cache} buildC {no_bad_cache_error /\ consistent_cache} *******/
+lemma CachedBuildsTheorem(prog: Program, stC: StateC)
+  requires Legal(prog.stmts)
+  requires ConsistentCache(stC)
+  ensures
+    var result := buildC(prog, stC);
+    var expr', stC' := result.fst, result.snd;
+    ConsistentCache(stC') && expr'.exprError? ==>
+    expr'.r != rInconsistentCache
+{
+  BuildCLemma(prog, stC);
+}
+
+lemma BuildCLemma(prog: Program, stC: StateC)
+  requires Legal(prog.stmts)
+  requires ConsistentCache(stC)
+  ensures
+    var result := buildC(prog, stC);
+    var expr', stC' := result.fst, result.snd;
+    ConsistentCache(stC') && (expr'.exprError? ==> expr'.r != rInconsistentCache)
+{
+  DoCLemma(prog.stmts, stC, EmptyEnv());
+}
+
+lemma DoCLemma(stmts: seq<Statement>, stC: StateC, env: Env)
+  requires Legal(stmts)
+  requires ConsistentCache(stC)
+  ensures
+    var result := doC(stmts, stC, env);
+    var expr', stC' := result.fst, result.snd;
+    ConsistentCache(stC') && (expr'.exprError? ==> expr'.r != rInconsistentCache)
+{
+  var stmt := stmts[0];
+  if stmt.stmtVariable? {
+    EvalCLemma(stmt.expr, stC, env);
+    var result := evalC(stmt.expr, stC, env);
+    var expr', stC' := result.fst, result.snd;
+    if Value(expr') {
+      var env' := SetEnv(stmt.id, expr', env);
+      if Legal(stmts[1..]) {
+        DoCLemma(stmts[1..], stC', env');
+      } else { }
+    } else { }
+  // todo(maria): Add the recursive case.
+  } else {
+    assert stmt.stmtVariable? || stmt.stmtReturn?;
+    EvalCLemma(stmt.ret, stC, env);
+  }
+}
+
+lemma {:induction expr} EvalCLemma(expr: Expression, stC: StateC, env: Env)
+  requires ConsistentCache(stC)
+  ensures
+    var result := evalC(expr, stC, env);
+    var expr', stC' := result.fst, result.snd;
+    ConsistentCache(stC') && (expr'.exprError? ==> expr'.r != rInconsistentCache)
+  decreases expr
+{
+  if Value(expr) {
+  } else if expr.exprIdentifier? {
+  } else if expr.exprIf? && expr.cond.exprLiteral? && expr.cond.lit == litTrue {
+  } else if expr.exprIf? && expr.cond.exprLiteral? && expr.cond.lit == litFalse {
+  } else if expr.exprIf? {
+    var result := evalC(expr.cond, stC, env);
+    var cond', stC' := result.fst, result.snd;
+    if cond'.exprLiteral? && cond'.lit == litTrue {
+      EvalCLemma(expr.ifTrue, stC', env);
+    } else if cond'.exprLiteral? && cond'.lit == litFalse {
+      EvalCLemma(expr.ifFalse, stC', env);
+    } else { }
+  } else if expr.exprAnd? {
+    var result := evalC(expr.conj0, stC, env);
+    var conj0', stC' := result.fst, result.snd;
+    if conj0'.exprLiteral? && conj0'.lit == litTrue {
+      EvalCLemma(expr.conj1, stC', env);
+    } else if conj0'.exprLiteral? && conj0'.lit == litFalse {
+    } else { }
+  } else if expr.exprOr? {
+    var result := evalC(expr.disj0, stC, env);
+    var disj0', stC' := result.fst, result.snd;
+    if disj0'.exprLiteral? && disj0'.lit == litTrue {
+    } else if disj0'.exprLiteral? && disj0'.lit == litFalse {
+      EvalCLemma(expr.disj1, stC', env);
+    } else { }
+  } else if expr.exprInvocation? {
+    EvalCLemma(expr.fun, stC, env);
+    var resultFun := evalC(expr.fun, stC, env);
+    var fun', stC' := resultFun.fst, resultFun.snd;
+    EvalArgsCLemma(expr, expr.args, stC, env);
+    var resultArgs := evalArgsC(expr, expr.args, stC, env);
+    var args', stsC' := resultArgs.fst, resultArgs.snd;
+    var stsC'' := {stC'} + stsC';
+    if CompatibleC(stsC'') {
+      CombineCLemma(stsC'');
+      var stCombinedC := CombineC(stsC'');
+      if fun'.exprLiteral? && fun'.lit.litPrimitive? {
+        if fun'.lit.prim.primExec? {
+          if |args'| == Arity(primExec) && ValidArgsC(primExec, args', stCombinedC) {
+            ExecCProperty(args'[0], args'[1], args'[2], stCombinedC);
+            var resultExec := execC(args'[0], args'[1], args'[2], stCombinedC);
+            var stExecC := resultExec.snd;
+            // note: This assertion is necessary.
+            assert DomSt(stC'.st) <= DomSt(stCombinedC.st);
+            forall p | p in DomSt(stCombinedC.st) && p in DomSt(stExecC.st)
+              ensures GetSt(p, stCombinedC.st) == GetSt(p, stExecC.st)
+            {
+              assert DomSt(stCombinedC.st) <= DomSt(stExecC.st);
+              assert stCombinedC.st == Restrict(DomSt(stCombinedC.st), stExecC.st);
+            }
+          } else {
+            if ConsistentCache(stCombinedC) {
+            } else { }
+          }
+        } else { }
+      } else { }
+    } else { }
+  } else { }
+}
+
+lemma EvalArgsCLemma(expr: Expression, args: seq<Expression>, stC: StateC, env: Env)
+  requires ConsistentCache(stC)
+  requires forall arg :: arg in args ==> arg < expr
+  ensures
+    var result := evalArgsC(expr, args, stC, env);
+    var stsC' := result.snd;
+    forall stC' :: stC' in stsC' ==> ConsistentCache(stC')
+  decreases expr, |args| + 1
+
+{
+  EvalArgsC'Lemma(expr, args, stC, env, [], {});
+}
+
+lemma EvalArgsC'Lemma(expr: Expression, args: seq<Expression>, stC: StateC, env: Env,
+                             args': seq<Expression>, stsC': set<StateC>)
+  requires ConsistentCache(stC)
+  requires forall stC' :: stC' in stsC' ==> ConsistentCache(stC')
+  requires forall arg :: arg in args ==> arg < expr
+  ensures
+    var result := evalArgsC'(expr, args, stC, env, args', stsC');
+    var stsC'' := result.snd;
+    forall stC'' :: stC'' in stsC'' ==> ConsistentCache(stC'')
+  decreases expr, |args|
+{
+  if args == [] {
+  } else {
+    var arg := args[0];
+    EvalCLemma(arg, stC, env);
+    var result := evalC(arg, stC, env);
+    var arg', stC' := result.fst, result.snd;
+    EvalArgsC'Lemma(expr, args[1..], stC, env, args' + [arg'], stsC' + {stC'});
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ConsistentBuilds.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ConsistentBuilds.legacy.dfy.expect
new file mode 100644
index 00000000000..1bb49a99b92
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ConsistentBuilds.legacy.dfy.expect
@@ -0,0 +1,3 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 42 verified, 0 errors
diff --git a/Test/cloudmake/CloudMake-ParallelBuilds.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ParallelBuilds.dfy
similarity index 99%
rename from Test/cloudmake/CloudMake-ParallelBuilds.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ParallelBuilds.dfy
index d23fa79c58f..90eb085b47f 100644
--- a/Test/cloudmake/CloudMake-ParallelBuilds.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ParallelBuilds.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"
+// RUN: %verify --relax-definite-assignment --manual-triggers --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This module proves the correctness of the algorithms.  It leaves a number of things undefined.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ParallelBuilds.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ParallelBuilds.dfy.expect
new file mode 100644
index 00000000000..b8e3c6a9885
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/cloudmake/CloudMake-ParallelBuilds.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 66 verified, 0 errors
diff --git a/Test/comp/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/.gitignore
similarity index 100%
rename from Test/comp/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/.gitignore
diff --git a/Test/comp/AllDafny.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AllDafny.java
similarity index 100%
rename from Test/comp/AllDafny.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AllDafny.java
diff --git a/Test/comp/AllExtern.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AllExtern.java
similarity index 100%
rename from Test/comp/AllExtern.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AllExtern.java
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Arrays.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Arrays.dfy
new file mode 100644
index 00000000000..cd35cc00ca0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Arrays.dfy
@@ -0,0 +1,909 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+method LinearSearch(a: array<int>, key: int) returns (n: nat)
+  ensures 0 <= n <= a.Length
+  ensures n == a.Length || a[n] == key
+{
+  n := 0;
+  while n < a.Length
+    invariant n <= a.Length
+  {
+    if a[n] == key {
+      return;
+    }
+    n := n + 1;
+  }
+}
+
+method PrintArray<A>(a: array?<A>) {
+  if (a == null) {
+    print "It's null\n";
+  } else {
+    var i := 0;
+    while i < a.Length {
+      print a[i], " ";
+      i := i + 1;
+    }
+    print "\n";
+  }
+}
+
+method Main() {
+  var a := new int[23];
+  var i := 0;
+  while i < 23 {
+    a[i] := i;
+    i := i + 1;
+  }
+  PrintArray(a);
+  var n := LinearSearch(a, 17);
+  print n, "\n";
+  var s : seq<int> := a[..];
+  print s, "\n";
+  s := a[2..16];
+  print s, "\n";
+  s := a[20..];
+  print s, "\n";
+  s := a[..8];
+  print s, "\n";
+
+  // Conversion to sequence should copy elements (sequences are immutable!)
+  a[0] := 42;
+  print s, "\n";
+
+  InitTests();
+
+  MultipleDimensions();
+
+  PrintArray<int>(null);
+
+  Index();
+  More();
+  MoreWithDefaults();
+
+  Coercions();
+
+  CharValues();
+
+  TypeSynonym.Test();
+
+  MoreArrays.Test();
+  NativeArrays.Test();
+  SimultaneousAssignment.Test();
+  ArrayToSeq.Test();
+
+  ArrayAllocationInitialization.Test();
+  VariationsOnIndexAndDimensionTypes.Test();
+  TypeSpecialization.Test();
+
+  GenericArrayEquality.Test();
+}
+
+type lowercase = ch | 'a' <= ch <= 'z' witness 'd'
+
+method InitTests() {
+  var aa := new lowercase[3];
+  PrintArray(aa);
+  var s := "hello";
+  aa := new lowercase[|s|](i requires 0 <= i < |s| => s[i]);
+  PrintArray(aa);
+}
+
+method MultipleDimensions() {
+  var matrix := new int[2,8];
+  PrintMatrix(matrix);
+  matrix := DiagMatrix(3, 5, 0, 1);
+  PrintMatrix(matrix);
+
+  var cube := new int[3,0,4]((_,_,_) => 16);
+  print "cube dims: ", cube.Length0, " ", cube.Length1, " ", cube.Length2, "\n";
+
+  var jagged := new array<int>[5];
+  var i := 0;
+  while i < 5 {
+    jagged[i] := new int[i];
+    i := i + 1;
+  }
+  PrintArrayArray(jagged);
+}
+
+method DiagMatrix<A>(rows: int, cols: int, zero: A, one: A)
+    returns (a: array2<A>)
+    requires rows >= 0 && cols >= 0
+{
+  return new A[rows, cols]((x,y) => if x==y then one else zero);
+}
+
+method PrintMatrix<A>(m: array2<A>) {
+  var i := 0;
+  while i < m.Length0 {
+    var j := 0;
+    while j < m.Length1 {
+      print m[i,j], " ";
+      j := j + 1;
+    }
+    print "\n";
+    i := i + 1;
+  }
+}
+
+method PrintArrayArray<A>(a: array<array<A>>) {
+  var i := 0;
+  while i < a.Length {
+    print a[i][..], " ";
+    i := i + 1;
+  }
+  print "\n";
+}
+
+type BV10 = x: bv10 | x != 999 witness 8
+type Yes = b | b witness true
+newtype nByte = x | -10 <= x < 100 witness 1
+newtype nShort = x | -10 <= x < 1000 witness 2
+newtype nInt = x | -10 <= x < 1_000_000 witness 3
+newtype nLong = x | -10 <= x < 0x100_0000_0000_0000 witness 4
+newtype ubyte = x | 0 <= x < 256
+
+method Index() {
+  var i: nByte := 0;
+  var j: nLong := 1;
+  var k: BV10 := 2;
+  var l: ubyte := 250;  // we wanna be sure this does become negative when used in Java
+  var m: int := 100;
+
+  var a := new string[300];
+  a[i] := "hi";
+  a[j] := "hello";
+  a[k] := "tjena";
+  a[l] := "hej";
+  a[m] := "hola";
+  print a[i], " ", a[j], " ", a[k], " ", a[l], " ", a[m], "\n";
+
+  var b := new string[20, 300];
+  b[18, i] := "hi";
+  b[18, j] := "hello";
+  b[18, k] := "tjena";
+  b[18, l] := "hej";
+  b[18, m] := "hola";
+  print b[18, i], " ", b[18, j], " ", b[18, k], " ", b[18, l], " ", b[18, m], "\n";
+
+  var s := seq(300, _ => "x");
+  s := s[i := "hi"];
+  s := s[j := "hello"];
+  s := s[k := "tjena"];
+  s := s[l := "hej"];
+  s := s[m := "hola"];
+  print s[i], " ", s[j], " ", s[k], " ", s[l], " ", s[m], "\n";
+}
+
+method More() {
+  var aa := new lowercase[3];
+  forall i | 0 <= i < aa.Length {
+    // aa[i] should not be '\0', but in case erroneous code causes it to get a zero-equivalent
+    // value to be produced, then the following if-then-else will give better test output
+    aa[i] := if aa[i] == '\0' then 'a' else aa[i];  // don't print ugly '\0' characters into test output
+  }
+  PrintArray(aa);
+
+  var s := "hello";
+  aa := new lowercase[|s|](i requires 0 <= i < |s| => s[i]);
+  PrintArray(aa);
+
+  var vv := new BV10[4];
+  PrintArray(vv);
+
+  var yy := new Yes[3];
+  PrintArray(yy);
+
+  var a0 := new nByte[5];
+  PrintArray(a0);
+  var a1 := new nShort[5];
+  PrintArray(a1);
+  var a2 := new nInt[5];
+  PrintArray(a2);
+  var a3 := new nLong[5];
+  PrintArray(a3);
+
+  var kitchenSink: (lowercase, BV10, Yes, nByte, nShort, nInt, nLong) := *;
+  if kitchenSink.0 == '\0' {
+    kitchenSink := kitchenSink.(0 := 'a');  // don't print ugly '\0' characters into test output
+  }
+  print kitchenSink, "\n";  // (d, 8, true, 1, 2, 3, 4)
+}
+
+type xchar = ch | '\0' <= ch <= 'z'
+type xBV10 = x: bv10 | x != 999
+type xYes = b | !b
+newtype xnByte = x | -10 <= x < 100
+newtype xnShort = x | -10 <= x < 1000
+newtype xnInt = x | -10 <= x < 1_000_000
+newtype xnLong = x | -10 <= x < 0x100_0000_0000_0000
+
+method MoreWithDefaults() {
+  var aa := new xchar[3];
+  forall i | 0 <= i < aa.Length {
+    aa[i] := if aa[i] == '\0' then 'a' else aa[i];  // don't print ugly '\0' characters into test output
+  }
+  PrintArray(aa);  // D D D
+
+  var vv := new xBV10[4];
+  PrintArray(vv);
+
+  var yy := new xYes[3];
+  PrintArray(yy);
+
+  var a0 := new xnByte[5];
+  PrintArray(a0);
+  var a1 := new xnShort[5];
+  PrintArray(a1);
+  var a2 := new xnInt[5];
+  PrintArray(a2);
+  var a3 := new xnLong[5];
+  PrintArray(a3);
+
+  var kitchenSink: (xchar, xBV10, xYes, xnByte, xnShort, xnInt, xnLong) := *;
+  if kitchenSink.0 == '\0' {
+    kitchenSink := kitchenSink.(0 := 'a');  // don't print ugly '\0' characters into test output
+  }
+  print kitchenSink, "\n";  // (D, 0, false, 0, 0, 0, 0)
+}
+
+method Coercions() {
+  // fields
+  var cell := new Cell(8 as short);
+  var a := cell.arr;
+  var x := a[0];
+
+  var b := new short[22];
+  var y := b[0];
+
+  print x, " ", y, "\n";  // 8 0
+
+  // different types of arrays, where coercions may not be needed
+  var c := new bool[22];
+  var d := new int[22];
+  var e := new object?[22];
+  var f := new Cell?<real>[22];
+  var c0, d0, e0, f0 := c[0], d[0], e[0], f[0];
+  print c0, " ", d0, " ", e0, " ", f0, "\n";
+
+  // function
+  a := cell.FArray();
+  // method with one out-parameter
+  b := cell.MArray();
+  x, y := a[0], b[0];
+  print x, " ", y, "\n";
+  // method with two out-parameters (which may need different compilation scheme)
+  a, b := cell.MArray2();
+  x, y := a[0], b[0];
+  print x, " ", y, "\n";
+
+  // lambda expression
+  b := (sa => sa)(b);
+  // array element
+  var barray := new array<short>[9](_ => b);
+  x, y := b[0], barray[3][0];
+  print x, " ", y, "\n";
+
+  // multi-dimensional arrays
+  var marray := new array<short>[9, 2]((_, _) => b);
+  x, y := marray[3, 1][0], cell.mat[7, 6];
+  print x, " ", y, "\n";
+}
+
+newtype short = x | -10 <= x < 12_000
+
+class Cell<T> {
+  var arr: array<T>
+  const crr: array<T>
+  var mat: array2<T>
+  constructor (t: T)
+    ensures arr.Length == 15 && arr == crr
+    ensures mat.Length0 == mat.Length1 == 15
+  {
+    arr := new T[15](_ => t);
+    crr := arr;
+    mat := new T[15, 15]((_, _) => t);
+  }
+  function FArray(): array<T>
+    reads this
+  {
+    arr
+  }
+  method MArray() returns (x: array<T>)
+    ensures x == arr
+  {
+    x := arr;
+  }
+  method MArray2() returns (x: array<T>, y: array<T>)
+    ensures x == y == arr
+  {
+    x, y := arr, arr;
+  }
+  method UArray(x: T)
+    modifies arr
+  {
+    if arr.Length > 0 {
+      arr[0] := x;
+    }
+  }
+}
+
+type ychar = ch | '\0' <= ch <= 'z'
+type zchar = ch | '\0' <= ch <= 'z' witness 'r'
+
+method CharValues() {
+  var aa := new char[3];
+  forall i | 0 <= i < aa.Length {
+    aa[i] := if aa[i] == '\0' then 'a' else aa[i];  // don't print ugly '\0' characters into test output
+  }
+  PrintArray(aa);  // D D D
+
+  var bb := new ychar[3];
+  forall i | 0 <= i < bb.Length {
+    bb[i] := if bb[i] == '\0' then 'a' else bb[i];  // don't print ugly '\0' characters into test output
+  }
+  PrintArray(bb);  // D D D
+
+  var cc := new char[3];
+  forall i | 0 <= i < cc.Length {
+    cc[i] := if cc[i] == '\0' then 'a' else cc[i];  // don't print ugly '\0' characters into test output
+  }
+  PrintArray(cc);  // r r r
+
+  var e0: char, e1: ychar, e2: zchar, ee: (char, ychar, zchar) := *, *, *, *;
+  print e0, " ", e1, " ", e2, " ", ee, "\n";  // D D r (D, D, r)
+
+  var mm := new char[3, 3];
+  var mx := new ychar[3, 3];
+  var my := new zchar[3, 3];
+  print mm[1, 2], " ", mx[1, 2], " ", my[1, 2], "\n";  // D D r
+}
+
+module TypeSynonym {
+  export
+    provides Test
+
+  newtype uint8 = i:int | 0 <= i < 0x100
+
+  type buffer<T> = a: array<T> | a.Length < 0x1_0000_0000 witness *
+  type buffer_t = buffer<uint8>
+
+  method BufferTest(b: buffer_t) {
+    var t := b[..];
+    print t, "\n";
+  }
+
+  method Test() {
+    var b := new uint8[] [19, 18, 9, 8];
+    BufferTest(b);
+  }
+}
+
+module MoreArrays {
+  newtype byte = x | 0 <= x < 256
+
+  class MyClass { }
+
+  method Test() {
+    TestEqualityOfSomeNonArraysToo();
+
+    var a := StringToByteArray("hello there");
+    WriteLine(a);
+
+    var b := StringToByteArray("hello there");
+    print a == b; // false
+    CheckEquality(a, b); // false (this once caused the emitted JavaScript to crash, see issue #3207)
+    print a == a; // true
+    CheckEquality(a, a); // true
+    var c: array?<byte> := null;
+    print a == c; // false
+    CheckEquality(a, c); // false
+    print c == a; // false
+    CheckEquality(c, a); // false
+  }
+
+  method TestEqualityOfSomeNonArraysToo() {
+    var bb: byte := 76;
+    CheckEquality(bb, bb); // true
+    CheckEquality(bb, bb + 1); // false
+
+    var cc0 := new MyClass;
+    var cc1 := new MyClass;
+    CheckEquality(cc0, cc0); // true
+    CheckEquality(cc0, cc1); // false
+    CheckEquality(cc0, null); // false
+    CheckEquality(null, cc0); // false
+    CheckEquality(null, null); // true
+
+    var s0 := [20, 10, 20];
+    var s1 := [20, 10, 20];
+    var s2 := [20, 10, 22];
+    CheckEquality(s0, s1); // true
+    CheckEquality(s0, s2); // false
+
+    CheckEquality((true, 100), (true, 100)); // true
+    CheckEquality((true, 100), (false, 100)); // false
+
+    var m0 := map[4 := true, 3 := false];
+    var m1 := map[4 := true][3 := false];
+    var m2 := map[3 := false][4 := true][3 := false][4 := true];
+    var m3 := map[3 := false][4 := false][3 := false][3 := false];
+    CheckEquality(m0, m1); // true
+    CheckEquality(m0, m2); // true
+    CheckEquality(m0, m3); // false
+  }
+
+  method StringToByteArray(s: string) returns (arr: array<byte>) {
+    arr := new [|s|];
+    forall i | 0 <= i < |s| {
+      arr[i] := (var ch := s[i]; if ' ' <= ch <= 'z' then ch else 'X') as byte;
+    }
+  }
+
+  method WriteLine(arr: array<byte>) {
+    for i := 0 to arr.Length {
+      print [arr[i] as char];
+    }
+    print "\n";
+  }
+
+  method CheckEquality<T(==)>(x: T, y: T) {
+    print " ", x == y, "\n";
+  }
+}
+
+module NativeArrays {
+  newtype byte = x | 0 <= x < 256
+  newtype onebyte = x | 0 < x < 256 witness 1
+
+  method Test() {
+    var aa := new byte[3];
+    PrintArray(aa, "uninitialized bytes");
+    aa := new byte[] [7, 8, 9];
+    PrintArray(aa, "bytes from display");
+    aa := new byte[3](i => if 0 <= i < 10 then (20 + i) as byte else 88);
+    PrintArray(aa, "bytes from lambda");
+
+    var bb := new onebyte[3];
+    PrintArray(bb, "uninitialized 1bytes");
+    bb := new onebyte[] [7, 8, 9];
+    PrintArray(bb, "1bytes from display");
+    bb := new onebyte[3](i => if 0 <= i < 10 then (20 + i) as onebyte else 88);
+    PrintArray(bb, "1bytes from lambda");
+
+    TestVariousFlavorsOfIndices();
+  }
+
+  method PrintArray(a: array, title: string) {
+    print title, ": array[";
+    for i := 0 to a.Length {
+      print if i == 0 then "" else ", ", a[i];
+    }
+    print "]\n";
+  }
+
+  method TestVariousFlavorsOfIndices() {
+    var arr := new int[250];
+    var m := new int[20, 30];
+
+    arr[3 as bv19] := 17;
+    arr[4 as bv5] := 19;
+    var iIndex: int, bIndex: byte, bvIndex: bv9 := 3, 4, 5;
+    m[iIndex, bIndex] := arr[iIndex];
+    arr[iIndex] := m[iIndex, bvIndex - 1];
+    assert arr[iIndex] == 17 by {
+       assert true;
+    }
+    print arr[iIndex], " "; // 17
+    m[bIndex, iIndex] := arr[bIndex];
+    arr[bIndex] := m[bvIndex - 1, iIndex];
+    assert arr[bIndex] == 19;
+    print arr[bIndex], " "; // 19
+    m[iIndex, iIndex] := arr[iIndex] + 1;
+    arr[iIndex] := m[iIndex, iIndex];
+    m[bIndex, bIndex] := arr[bIndex] + 1;
+    arr[bIndex] := m[bIndex, bIndex];
+    print arr[iIndex], " ", arr[bIndex], "\n"; // 18 20
+  }
+}
+
+module SimultaneousAssignment {
+  method Test() {
+    var arr := new int[250];
+    var m := new int[20, 30];
+    var arr', m' := arr, m;
+
+    var a, b, c := 18, 28, 38;
+    var arr'' := new int[1];
+    var m'' := new int[1, 1];
+
+    arr, a, arr[a + b], m, arr, c, m[a, b], b, m := arr'', 100, 120, m'', arr'', 300, c, 200, m'';
+
+    print a, " ", b, " ", c, " ", arr'[46], " ", m'[18, 28], "\n"; // 100 120 200 300 38
+  }
+}
+
+module ArrayToSeq {
+  newtype byte = x | 0 <= x < 256
+
+  trait TraitMeRite {
+  }
+
+  class MyClass extends TraitMeRite {
+  }
+
+  method Test() {
+    var arrChar := new [] ['h', 'e', 'l', 'l', 'o'];
+    var arrInt := new int[5](i => i);
+    var arrByte := new byte[5](_ => 2);
+    var c: MyClass := new MyClass;
+    var tr: TraitMeRite := c;
+    var arrClass := new MyClass[] [c, c, c];
+    var arrTrait := new TraitMeRite[] [tr, c, tr];
+
+    var s0 := arrChar[..];
+    var s1 := arrInt[..];
+    var s2 := arrByte[..];
+    var s3 := arrClass[..];
+    var s4 := arrTrait[..];
+
+    expect s0 == "hello";
+    expect arrInt[1..][..2] == arrInt[..3][1..];
+    expect arrInt[1 as byte..][..2] == arrInt[..3 as byte][1..];
+    expect arrInt[1 as byte..3] == arrInt[1..3 as byte];
+    expect arrByte[..0] <= arrByte[5..] <= arrByte[..3] <= s2;
+    expect s3 == s4;
+
+    print s0, " ";
+    print s1, " ";
+    print s2, "\n";
+  }
+}
+
+module {:options "/functionSyntax:4"} ArrayAllocationInitialization {
+  newtype AutoInit = x | 20 <= x < 2_000_000 witness 77
+  newtype NonAutoInit = x | 20 <= x < 2_000_000 witness *
+  newtype byte = x | 0 <= x < 256
+
+  function AutoInitF(i: nat): AutoInit { if 20 <= i < 30 then i as AutoInit else 78 }
+  function NonAutoInitF(i: nat): NonAutoInit { 82 }
+  function ByteF(i: nat): byte { if 20 <= i < 30 then i as byte else 60 }
+  function CharF(i: nat): char { if 20 <= i < 30 then 'a' + (i - 20) as char else 'g' }
+
+  function AutoInitF2(i: nat, j: nat): AutoInit { if i == j then 50 else 78 }
+  function ByteF2(i: nat, j: nat): byte { if i == j then 50 else 60 }
+  function CharF2(i: nat, j: nat): char { if i == j then 'a' else 'g' }
+
+  method Test() {
+    TestAutoInit();
+    TestTypeParameter(AutoInitF);
+
+    TestNonAutoInit();
+
+    TestByte();
+    TestTypeParameter(ByteF);
+
+    TestChar();
+    TestTypeParameter(CharF);
+
+    TestMatrixAutoInit();
+    TestMatrixTypeParameter(AutoInitF2);
+    TestMatrixTypeParameter(ByteF2);
+    TestMatrixTypeParameter(CharF2);
+  }
+
+  method TestAutoInit() {
+    var zero, five := 0, 5;
+    var a: array<AutoInit>;
+    var s := [];
+
+    a := new AutoInit[zero];
+    s := s + a[..];
+    a := new AutoInit[five]; // initialized by the default element
+    s := s + a[..];
+    a := new AutoInit[zero] []; // initialized as given (no elements)
+    s := s + a[..];
+    a := new AutoInit[] []; // initialized as given (no elements)
+    s := s + a[..];
+    a := new AutoInit[five] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
+    s := s + a[..];
+    a := new AutoInit[] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
+    s := s + a[..];
+    a := new AutoInit[zero](AutoInitF);
+    s := s + a[..];
+    a := new AutoInit[five](AutoInitF);
+    s := s + a[..];
+
+    print s, "\n";
+  }
+
+  method TestNonAutoInit() {
+    var zero, five := 0, 5;
+    var a: array<NonAutoInit>;
+    var s := [];
+
+    a := new NonAutoInit[zero];
+    s := s + a[..];
+    // Note, "new NonAutoInit[five]" is not allowed for a non-auto-init type
+    s := s + [99, 99, 99, 99 as NonAutoInit, 99];
+    a := new NonAutoInit[zero] []; // initialized as given (no elements)
+    s := s + a[..];
+    a := new NonAutoInit[] []; // initialized as given (no elements)
+    s := s + a[..];
+    a := new NonAutoInit[five] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
+    s := s + a[..];
+    a := new NonAutoInit[] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
+    s := s + a[..];
+    a := new NonAutoInit[zero](NonAutoInitF);
+    s := s + a[..];
+    a := new NonAutoInit[five](NonAutoInitF);
+    s := s + a[..];
+
+    print s, "\n";
+  }
+
+  method TestByte() {
+    var zero, five := 0, 5;
+    var a: array<byte>;
+    var s := [];
+
+    a := new byte[zero];
+    s := s + a[..];
+    a := new byte[five]; // initialized by the default element
+    s := s + a[..];
+    a := new byte[zero] []; // initialized as given (no elements)
+    s := s + a[..];
+    a := new byte[] []; // initialized as given (no elements)
+    s := s + a[..];
+    a := new byte[five] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
+    s := s + a[..];
+    a := new byte[] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
+    s := s + a[..];
+    a := new byte[zero](ByteF);
+    s := s + a[..];
+    a := new byte[five](ByteF);
+    s := s + a[..];
+
+    print s, "\n";
+  }
+
+  method TestChar() {
+    var zero, five := 0, 5;
+    var a: array<char>;
+    var s := [];
+
+    a := new char[zero];
+    s := s + a[..];
+    a := new char[five]; // initialized by the default element
+    s := s + a[..];
+    a := new char[zero] []; // initialized as given (no elements)
+    s := s + a[..];
+    a := new char[] []; // initialized as given (no elements)
+    s := s + a[..];
+    a := new char[five] ['a', 'b', 'c', 'd', 'e']; // initialized as given (5 elements)
+    s := s + a[..];
+    a := new char[] ['a', 'b', 'c', 'd', 'e']; // initialized as given (5 elements)
+    s := s + a[..];
+    a := new char[zero](CharF);
+    s := s + a[..];
+    a := new char[five](CharF);
+    s := s + a[..];
+
+    print s, "\n";
+  }
+
+  method TestTypeParameter<T(0)>(initF: nat -> T) {
+    var zero, five := 0, 5;
+    var a: array<T>;
+    var s := [];
+
+    a := new T[zero];
+    s := s + a[..];
+    a := new T[five]; // initialized by the default element
+    s := s + a[..];
+    a := new T[zero] []; // initialized as given (no elements)
+    s := s + a[..];
+    a := new T[] []; // initialized as given (no elements)
+    s := s + a[..];
+    a := new T[five] [initF(20), initF(21), initF(22), initF(23), initF(24)]; // initialized as given (5 elements)
+    s := s + a[..];
+    a := new T[] [initF(20), initF(21), initF(22), initF(23), initF(24)]; // initialized as given (5 elements)
+    s := s + a[..];
+    a := new T[zero](initF);
+    s := s + a[..];
+    a := new T[five](initF);
+    s := s + a[..];
+
+    print s, "\n";
+  }
+
+  function MatrixToSequence<T>(m: array2<T>): seq<T>
+    reads m
+  {
+    M2S(m, 0, 0)
+  }
+
+  function M2S<T>(m: array2<T>, i: nat, j: nat): seq<T>
+    requires i <= m.Length0 && j <= m.Length1
+    requires i == m.Length0 ==> j == 0
+    reads m
+    decreases m.Length0 - i, m.Length1 - j
+  {
+    if i == m.Length0 then
+      []
+    else if j == m.Length1 then
+      M2S(m, i + 1, 0)
+    else
+      [m[i, j]] + M2S(m, i, j + 1)
+  }
+
+  method TestMatrixAutoInit() {
+    var zero, two, five := 0, 2, 5;
+    var a: array2<AutoInit>;
+    var s := [];
+
+    a := new AutoInit[zero, zero];
+    s := s + MatrixToSequence(a);
+    a := new AutoInit[zero, five];
+    s := s + MatrixToSequence(a);
+    a := new AutoInit[five, zero];
+    s := s + MatrixToSequence(a);
+    a := new AutoInit[two, five]; // initialized by the default element
+    s := s + MatrixToSequence(a);
+    
+    a := new AutoInit[zero, zero](AutoInitF2);
+    s := s + MatrixToSequence(a);
+    a := new AutoInit[zero, five](AutoInitF2);
+    s := s + MatrixToSequence(a);
+    a := new AutoInit[five, zero](AutoInitF2);
+    s := s + MatrixToSequence(a);
+    a := new AutoInit[two, five](AutoInitF2);
+    s := s + MatrixToSequence(a);
+
+    print s, "\n";
+  }
+
+  method TestMatrixTypeParameter<T(0)>(initF2: (nat, nat) -> T) {
+    var zero, two, five := 0, 2, 5;
+    var a: array2<T>;
+    var s := [];
+
+    a := new T[zero, zero];
+    s := s + MatrixToSequence(a);
+    a := new T[zero, five];
+    s := s + MatrixToSequence(a);
+    a := new T[five, zero];
+    s := s + MatrixToSequence(a);
+    a := new T[two, five]; // initialized by the default element
+    s := s + MatrixToSequence(a);
+
+    a := new T[zero, zero](initF2);
+    s := s + MatrixToSequence(a);
+    a := new T[zero, five](initF2);
+    s := s + MatrixToSequence(a);
+    a := new T[five, zero](initF2);
+    s := s + MatrixToSequence(a);
+    a := new T[two, five](initF2);
+    s := s + MatrixToSequence(a);
+
+    print s, "\n";
+  }
+}
+
+module {:options "/functionSyntax:4"} VariationsOnIndexAndDimensionTypes {
+  newtype byte = x | 0 <= x < 256
+  newtype onebyte = x | 0 < x < 256 witness 1
+  newtype Long = x | -0x8000_0000_0000_0000 < x < 0x8000_0000_0000_0000
+
+  method Test() {
+    TestArray();
+    TestMatrix();
+  }
+
+  method TestArray() {
+    var aa;
+    aa := new byte[3](i => if 0 <= i < 10 then (20 + i) as byte else 88);
+  }
+
+  method TestMatrix() {
+    var a, b, c := 3 as byte, 2, 5 as Long;
+    var m := new byte[a, b, c](F);
+    expect m[0 as byte, 1, 2 as Long]
+         + m[1 as Long, 1 as byte, 2]
+         + m[2, 1 as Long, 2 as byte]
+        == 138;
+  }
+
+  function F(a: nat, b: nat, c: nat): byte {
+    if a == 0 then
+      45
+    else if a == 1 then
+      46
+    else
+      47
+  }
+}
+
+module TypeSpecialization {
+  newtype byte = x | 0 <= x < 256
+
+  method Test() {
+    var a := new int[100];
+    Int(a, a, 50);
+    print a[19], " ", a[20], " ", a[21], "\n";
+
+    var b := new byte[100];
+    Byte(b, b, 50);
+    print b[19], " ", b[20], " ", b[21], "\n";
+
+    var c := new char[100];
+    Char(c, c, 'n');
+    print c[19], " ", c[20], " ", c[21], "\n";
+  }
+
+  method Int<T>(a: array<T>, b: array<int>, t: T)
+    requires a.Length == b.Length == 100
+    modifies a, b
+  {
+    a[20] := t;
+    b[20] := 69;
+    b[21] := 69;
+    a[21] := t;
+  }
+
+  method Byte<T>(a: array<T>, b: array<byte>, t: T)
+    requires a.Length == b.Length == 100
+    modifies a, b
+  {
+    a[20] := t;
+    b[20] := 69;
+    b[21] := 69;
+    a[21] := t;
+  }
+
+  method Char<T>(a: array<T>, b: array<char>, t: T)
+    requires a.Length == b.Length == 100
+    modifies a, b
+  {
+    a[20] := t;
+    b[20] := 'k';
+    b[21] := 'k';
+    a[21] := t;
+  }
+}
+
+module GenericArrayEquality {
+  method Test() {
+    var a := new int[25];
+    var b := new int[25];
+    ArrayCompare(a, b); // false
+    GenericCompare(a, b); // false
+
+    // In Go, an array is stored as a struct that contains a pointer to the actual array elements.
+    // An easy mistake (in the runtime) would be to compare the address of the struct to determine
+    // array equality. The following test checks that it's done properly.
+    b := a;
+    ArrayCompare(a, b); // true
+    GenericCompare(a, b); // true
+
+    b := null;
+    ArrayCompare(a, b); // false
+    GenericCompare(a, b); // false
+    ArrayCompare(b, a); // false
+    GenericCompare(b, a); // false
+
+    a := null;
+    ArrayCompare(a, b); // true
+    GenericCompare(a, b); // true
+  }
+
+  method ArrayCompare<X>(a: array?<X>, b: array?<X>) {
+    print a == b, " ";
+  }
+  
+
+  method GenericCompare<X(==)>(a: X, b: X) {
+    print a == b, "\n";
+  }
+}
diff --git a/Test/unicodechars/comp/Arrays.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Arrays.dfy.expect
similarity index 100%
rename from Test/unicodechars/comp/Arrays.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Arrays.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Arrays.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Arrays.dfy.rs.check
new file mode 100644
index 00000000000..66736e40df8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Arrays.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>MultiSelectLValue</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile-Expanded.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile-Expanded.dfy
new file mode 100644
index 00000000000..b8215cff1e6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile-Expanded.dfy
@@ -0,0 +1,100 @@
+// RUN: %testDafnyForEachCompiler "%s" -- --type-system-refresh=true
+
+method Main() {
+  Is.Test();
+}
+
+module Is {
+  method Test() {
+    FromReal();
+    ToChar();
+    ToBitvector();
+    ToNative();
+  }
+
+  method FromReal() {
+    var r: real;
+    r := 3.14;
+    print r is int, " "; // false
+    print r is bv32, " "; // false
+    print r is bv1, " "; // false
+    print r is ORDINAL, "\n"; // false
+    r := 3.0;
+    print r is int, " "; // true
+    print r is bv32, " "; // true
+    print r is bv1, " "; // false
+    print r is ORDINAL, "\n"; // true
+  }
+
+  method ToChar() {
+    var x: int;
+    var y: bv71;
+    var z: bv16;
+
+    x, y, z := 65, 65, 65;
+    print x is char, " "; // true
+    print y is char, " "; // true
+    print z is char, "\n"; // true
+
+    x, y, z := 0xD912, 0xD912, 0xD912;
+    print x is char, " "; // false
+    print y is char, " "; // false
+    print z is char, "\n"; // false
+
+    x, y := 0x20_0000, 0x20_0000;
+    print x is char, " "; // false
+    print y is char, "\n"; // false
+
+    print 0xD7FF is char, " "; // true
+    print 0xD800 is char, " "; // false
+    print 0xD801 is char, " "; // false
+    print 0xDFFF is char, " "; // false
+    print 0xE000 is char, " "; // true
+    print 0xE001 is char, " "; // true
+    print 0x10_FFFF is char, " "; // true
+    print 0x11_0000 is char, " "; // false
+    print 0x11_0001 is char, "\n"; // false
+  }
+
+  method ToBitvector() {
+    var x: int;
+    x := 0;
+    print x is bv0, " ", x is bv5, " ", x is bv31, " ", x is bv32, " ", x is bv700, "\n"; // true true true true true
+    x := 90;
+    print x is bv0, " ", x is bv5, " ", x is bv31, " ", x is bv32, " ", x is bv700, "\n"; // false false true true true
+    x := -0x8000_0000;
+    print x is bv0, " ", x is bv5, " ", x is bv31, " ", x is bv32, " ", x is bv700, "\n"; // false false false false fals
+    x := 0x8000_0000;
+    print x is bv0, " ", x is bv5, " ", x is bv31, " ", x is bv32, " ", x is bv700, "\n"; // false false false true true
+
+    var y: bv32;
+    y := 0x8000_0000;
+    print y is bv0, " ", y is bv5, " ", y is bv31, " ", y is bv32, " ", y is bv700, "\n"; // false false false true true
+  }
+
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+  newtype uint32 = x: int | 0 <= x < 0x1_0000_0000
+
+  method ToNative() {
+    var x: int;
+    x := 0;
+    print x is int32, " ", x is uint32, " "; // true true
+    x := 90;
+    print x is int32, " ", x is uint32, "\n"; // true true
+    x := -0x8000_0000;
+    print x is int32, " ", x is uint32, " "; // true false
+    x := 0x8000_0000;
+    print x is int32, " ", x is uint32, "\n"; // false true
+
+    var y: bv31;
+    y := 0x7FFF_FFFF;
+    print y is int32, " ", y is uint32, " "; // true true
+    print (y + 1) is int32, " ", (y + 1) is uint32, "\n"; // true true (because y+1 wraps around in bv31)
+
+    var z: bv32;
+    z := 0x7FFF_FFFF;
+    print z is int32, " ", z is uint32, " "; // true true
+    z := 0x8000_0000;
+    print z is int32, " ", z is uint32, "\n"; // false true
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile-Expanded.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile-Expanded.dfy.expect
new file mode 100644
index 00000000000..eef80e9458d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile-Expanded.dfy.expect
@@ -0,0 +1,15 @@
+false false false false
+true true false true
+true true true
+false false false
+false false
+true false false false true true true false false
+true true true true true
+false false true true true
+false false false false false
+false false false true true
+false false false true true
+true true true true
+true false false true
+true true true true
+true true false true
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile-Expanded.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile-Expanded.dfy.rs.check
new file mode 100644
index 00000000000..f84c3397b2f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile-Expanded.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: AsIs-Compile-Expanded.dfy(18,10): Error: Feature not supported for this compilation target: Type test expressions (`x is T`)
\ No newline at end of file
diff --git a/Test/comp/AsIs-Compile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile.dfy
similarity index 95%
rename from Test/comp/AsIs-Compile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile.dfy
index 319847564e2..995610808a0 100644
--- a/Test/comp/AsIs-Compile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile.dfy
@@ -9,8 +9,8 @@ method Main() {
   IsTests();
 }
 
-trait A<X> { }
-trait B<Y0, Y1> { }
+trait A<X> extends object { }
+trait B<Y0, Y1> extends object { }
 trait C<Z> extends B<int, Z> { }
 
 class K<U> extends object, B<int, U> { }
@@ -23,19 +23,19 @@ method AssignBackAndForth<W>(a: A<W>, b: B<int, W>, c: C<W>, k: K<W>, l: L<W>) r
   var o: object?;
 
   o := a;
-  a' := o;
+  a' := o as A<W>;
 
   o := b;
-  b' := o;
+  b' := o as B<int, W>;
 
   o := c;
-  c' := o;
+  c' := o as C<W>;
 
   o := k;
-  k' := o;
+  k' := o as K<W>;
 
   o := l;
-  l' := o;
+  l' := o as L<W>;
 }
 
 method AsBackAndForth<W>(a: A<W>, b: B<int, W>, c: C<W>, k: K<W>, l: L<W>) returns (a': object, b': object, c': object, k': object, l': object)
@@ -91,7 +91,7 @@ method IsTests() {
   // TODO: SubsetConstraints();
 }
 
-trait TraitA<X> { }
+trait TraitA<X> extends object { }
 trait TraitB<X> { }
 
 class ClassP { }
@@ -122,11 +122,11 @@ method TestNullIs<U>(o: object, oo: object?, t: TraitA<U>, tt: TraitA?<U>, q: Cl
   print qq is object, " ", qq is object?, " ", qq is TraitA<U>, " ", qq is TraitA?<U>, " ", qq is ClassQ<U>, " ", qq is ClassQ?<U>, "\n";
 }
 
-trait XA { }
-trait XB { }
+trait XA extends object { }
+trait XB extends object { }
 trait XC extends XA, XB { }
 trait XD extends XC { }
-trait XE { }
+trait XE extends object { }
 class XX extends XD { }
 
 method TestFromTraits0(x: XX?) {
diff --git a/Test/comp/AsIs-Compile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile.dfy.expect
similarity index 100%
rename from Test/comp/AsIs-Compile.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile.dfy.rs.check
new file mode 100644
index 00000000000..96d3f9ff702
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AsIs-Compile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error: prefix `ClassR` is unknown
\ No newline at end of file
diff --git a/Test/comp/AutoInit.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AutoInit.dfy
similarity index 90%
rename from Test/comp/AutoInit.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AutoInit.dfy
index bb941b5c16c..8c6c956a0ce 100644
--- a/Test/comp/AutoInit.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AutoInit.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // This file tests the compilation of some default values. It also includes some
 // regression tests for equality, printing, and tuples.
@@ -62,7 +62,6 @@ method Main() {
   NilRegression.Test();
   DatatypeDefaultValues.Test();
   ImportedTypes.Test();
-  GhostWitness.Test();
   TypeDescriptorInDatatypeValue.Test();
   DatatypeValues.Test();
 }
@@ -286,44 +285,7 @@ module ImportedTypes {
   }
 }
 
-module GhostWitness {
-  type EffectlessArrow<!A(!new), B(00)> = f: A ~> B
-    | forall a :: f.reads(a) == {}
-    ghost witness GhostEffectlessArrowWitness<A, B>
 
-  ghost function GhostEffectlessArrowWitness<A, B(00)>(a: A): B
-  {
-    var b: B :| true; b
-  }
-
-  codatatype Forever = More(Forever)
-
-  class MyClass { }
-
-  ghost predicate Total<A(!new), B>(f: A ~> B)  // (is this (!new) really necessary?)
-    reads f.reads
-  {
-    forall a :: f.reads(a) == {} && f.requires(a)
-  }
-
-  type TotalArrow<!A(!new), B(00)> = f: EffectlessArrow<A, B>
-    | Total(f)
-    ghost witness TotalWitness<A, B>
-
-  ghost function TotalWitness<A, B(00)>(a: A): B
-  {
-    var b: B :| true; b
-  }
-
-  method Test() {
-    var g: EffectlessArrow<int, int>;
-    var f: TotalArrow<int, int>;
-    f := y => y + 2;
-    g := f;
-    var x := g(4) + f(5);
-    print x, "\n";
-  }
-}
 
 module TypeDescriptorInDatatypeValue {
   // auto-init type parameters: A, C
diff --git a/Test/comp/AutoInit.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AutoInit.dfy.expect
similarity index 99%
rename from Test/comp/AutoInit.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AutoInit.dfy.expect
index 20e42312be0..25547c625cb 100644
--- a/Test/comp/AutoInit.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AutoInit.dfy.expect
@@ -34,7 +34,6 @@ Library.Color.Red(0) and Library.Color.Red(0)
 Library.CoColor.Yellow and Library.CoColor.Yellow
 Library.MoColor.MoYellow and Library.MoColor.MoYellow
 0.0 and 0.0
-13
 TypeDescriptorInDatatypeValue.Datatype.Simple('D', 0.0)
 TypeDescriptorInDatatypeValue.Datatype.Simple('D', 0.0)
 'D'
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AutoInit.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AutoInit.dfy.rs.check
new file mode 100644
index 00000000000..e8698a70160
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/AutoInit.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Bitvector\ types</i>.*
\ No newline at end of file
diff --git a/Test/comp/BranchCoverage.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage.dfy
similarity index 100%
rename from Test/comp/BranchCoverage.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage.dfy
diff --git a/Test/comp/BranchCoverage.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage.dfy.expect
similarity index 90%
rename from Test/comp/BranchCoverage.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage.dfy.expect
index 9af29a520c5..9fd2a371b41 100644
--- a/Test/comp/BranchCoverage.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage.dfy.expect
@@ -1,3 +1,4 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 
 Dafny program verifier finished with 6 verified, 0 errors
 0: BranchCoverage.dfy(20,21): entry to method _module._default.NeverCalled
@@ -35,11 +36,11 @@ Dafny program verifier finished with 6 verified, 0 errors
 32: BranchCoverage.dfy(147,4): then branch
 33: BranchCoverage.dfy(147,4): else branch
 34: BranchCoverage.dfy(156,2): entry to function _module._default.Factorial
-35: BranchCoverage.dfy(157,12): then branch
-36: BranchCoverage.dfy(157,12): else branch
+35: BranchCoverage.dfy(157,2): case body
+36: BranchCoverage.dfy(158,2): case body
 37: BranchCoverage.dfy(163,0): entry to method _module._default.ComputeFactorial
-38: BranchCoverage.dfy(166,2): then branch
-39: BranchCoverage.dfy(168,2): else branch
+38: BranchCoverage.dfy(166,2): case body
+39: BranchCoverage.dfy(168,2): case body
 40: BranchCoverage.dfy(174,14): entry to method _module._default.Main
 41: BranchCoverage.dfy(14,17): entry to method _module.MyClass._ctor
 0: 0
@@ -84,6 +85,7 @@ Dafny program verifier finished with 6 verified, 0 errors
 39: 10
 40: 1
 41: 3
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 
 Dafny program verifier finished with 6 verified, 0 errors
 0: BranchCoverage.dfy(20,21): entry to method _module._default.NeverCalled
@@ -121,11 +123,11 @@ Dafny program verifier finished with 6 verified, 0 errors
 32: BranchCoverage.dfy(147,4): then branch
 33: BranchCoverage.dfy(147,4): else branch
 34: BranchCoverage.dfy(156,2): entry to function _module._default.Factorial
-35: BranchCoverage.dfy(157,12): then branch
-36: BranchCoverage.dfy(157,12): else branch
+35: BranchCoverage.dfy(157,2): case body
+36: BranchCoverage.dfy(158,2): case body
 37: BranchCoverage.dfy(163,0): entry to method _module._default.ComputeFactorial
-38: BranchCoverage.dfy(166,2): then branch
-39: BranchCoverage.dfy(168,2): else branch
+38: BranchCoverage.dfy(166,2): case body
+39: BranchCoverage.dfy(168,2): case body
 40: BranchCoverage.dfy(174,14): entry to method _module._default.Main
 41: BranchCoverage.dfy(14,17): entry to method _module.MyClass._ctor
 0: 0
@@ -170,6 +172,7 @@ Dafny program verifier finished with 6 verified, 0 errors
 39: 10
 40: 1
 41: 3
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 
 Dafny program verifier finished with 6 verified, 0 errors
 0: BranchCoverage.dfy(20,21): entry to method _module._default.NeverCalled
@@ -207,11 +210,11 @@ Dafny program verifier finished with 6 verified, 0 errors
 32: BranchCoverage.dfy(147,4): then branch
 33: BranchCoverage.dfy(147,4): else branch
 34: BranchCoverage.dfy(156,2): entry to function _module._default.Factorial
-35: BranchCoverage.dfy(157,12): then branch
-36: BranchCoverage.dfy(157,12): else branch
+35: BranchCoverage.dfy(157,2): case body
+36: BranchCoverage.dfy(158,2): case body
 37: BranchCoverage.dfy(163,0): entry to method _module._default.ComputeFactorial
-38: BranchCoverage.dfy(166,2): then branch
-39: BranchCoverage.dfy(168,2): else branch
+38: BranchCoverage.dfy(166,2): case body
+39: BranchCoverage.dfy(168,2): case body
 40: BranchCoverage.dfy(174,14): entry to method _module._default.Main
 41: BranchCoverage.dfy(14,17): entry to method _module.MyClass._ctor
 0: 0
@@ -256,6 +259,7 @@ Dafny program verifier finished with 6 verified, 0 errors
 39: 10
 40: 1
 41: 3
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 
 Dafny program verifier finished with 6 verified, 0 errors
 0: BranchCoverage.dfy(20,21): entry to method _module._default.NeverCalled
@@ -342,6 +346,7 @@ Dafny program verifier finished with 6 verified, 0 errors
 39: 10
 40: 1
 41: 3
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 
 Dafny program verifier finished with 6 verified, 0 errors
 0: BranchCoverage.dfy(20,21): entry to method _module._default.NeverCalled
@@ -379,11 +384,11 @@ Dafny program verifier finished with 6 verified, 0 errors
 32: BranchCoverage.dfy(147,4): then branch
 33: BranchCoverage.dfy(147,4): else branch
 34: BranchCoverage.dfy(156,2): entry to function _module._default.Factorial
-35: BranchCoverage.dfy(157,12): then branch
-36: BranchCoverage.dfy(157,12): else branch
+35: BranchCoverage.dfy(157,2): case body
+36: BranchCoverage.dfy(158,2): case body
 37: BranchCoverage.dfy(163,0): entry to method _module._default.ComputeFactorial
-38: BranchCoverage.dfy(166,2): then branch
-39: BranchCoverage.dfy(168,2): else branch
+38: BranchCoverage.dfy(166,2): case body
+39: BranchCoverage.dfy(168,2): case body
 40: BranchCoverage.dfy(174,14): entry to method _module._default.Main
 41: BranchCoverage.dfy(14,17): entry to method _module.MyClass._ctor
 0: 0
diff --git a/Test/comp/BranchCoverage.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage.py
similarity index 83%
rename from Test/comp/BranchCoverage.py
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage.py
index e25765016db..61d8b43f052 100644
--- a/Test/comp/BranchCoverage.py
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage.py
@@ -1,7 +1,6 @@
 import sys
 
-assert "DafnyProfiling" == __name__
-DafnyProfiling = sys.modules[__name__]
+# Module: DafnyProfiling
 
 class CodeCoverage:
     tallies = []
diff --git a/Test/comp/BranchCoverage2.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage2.cs
similarity index 100%
rename from Test/comp/BranchCoverage2.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage2.cs
diff --git a/Test/comp/BranchCoverage3.js b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage3.js
similarity index 100%
rename from Test/comp/BranchCoverage3.js
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage3.js
diff --git a/Test/comp/BranchCoverage4.go b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage4.go
similarity index 100%
rename from Test/comp/BranchCoverage4.go
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BranchCoverage4.go
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns.dfy
new file mode 100644
index 00000000000..71c35eb693c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns.dfy
@@ -0,0 +1,78 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+// Essentially a copy of DafnyRuntime/systemModulePopulator.dfy,
+// but here independently as a test that all the implicitly-referenced built-ins
+// are in fact correctly added to the runtimes.
+
+method HasTuples() {
+  var b := true;
+  var has0 := ();
+  var has1 := (b, ghost b);  // Just (1) is an bool in parentheses instead
+  var has2 := (b,b);
+  var has3 := (b,b,b);
+  var has4 := (b,b,b,b);
+  var has5 := (b,b,b,b,b);
+  var has6 := (b,b,b,b,b,b);
+  var has7 := (b,b,b,b,b,b,b);
+  var has8 := (b,b,b,b,b,b,b,b);
+  var has9 := (b,b,b,b,b,b,b,b,b);
+  var has10 := (b,b,b,b,b,b,b,b,b,b);
+  var has11 := (b,b,b,b,b,b,b,b,b,b,b);
+  var has12 := (b,b,b,b,b,b,b,b,b,b,b,b);
+  var has13 := (b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has14 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has15 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has16 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has17 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has18 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has19 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+  var has20 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+}
+
+method HasArrows() {
+  var has0 := () => 42;
+  var has1 := (x1: bool) => 42;
+  var has2 := (x1: bool, x2: bool) => 42;
+  var has3 := (x1: bool, x2: bool, x3: bool) => 42;
+  var has4 := (x1: bool, x2: bool, x3: bool, x4: bool) => 42;
+  var has5 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool) => 42;
+  var has6 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool) => 42;
+  var has7 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool) => 42;
+  var has8 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool) => 42;
+  var has9 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool) => 42;
+  var has10 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool) => 42;
+  var has11 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool) => 42;
+  var has12 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool) => 42;
+  var has13 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool, x13: bool) => 42;
+  var has14 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool, x13: bool, x14: bool) => 42;
+  var has15 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool, x13: bool, x14: bool, x15: bool) => 42;
+  var has16 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool, x13: bool, x14: bool, x15: bool, x16: bool) => 42;
+}
+
+newtype byte = x: int | 0 <= x < 256
+
+method HasArrays() {
+  var n: byte := 0;
+  var has1 := new bool[n];
+  var has2 := new bool[n,n];
+  var has3 := new bool[n,n,n];
+  var has4 := new bool[n,n,n,n];
+  var has5 := new bool[n,n,n,n,n];
+  var has6 := new bool[n,n,n,n,n,n];
+  var has7 := new bool[n,n,n,n,n,n,n];
+  var has8 := new bool[n,n,n,n,n,n,n,n];
+  var has9 := new bool[n,n,n,n,n,n,n,n,n];
+  var has10 := new bool[n,n,n,n,n,n,n,n,n,n];
+  var has11 := new bool[n,n,n,n,n,n,n,n,n,n,n];
+  var has12 := new bool[n,n,n,n,n,n,n,n,n,n,n,n];
+  var has13 := new bool[n,n,n,n,n,n,n,n,n,n,n,n,n];
+  var has14 := new bool[n,n,n,n,n,n,n,n,n,n,n,n,n,n];
+  var has15 := new bool[n,n,n,n,n,n,n,n,n,n,n,n,n,n,n];
+  var has16 := new bool[n,n,n,n,n,n,n,n,n,n,n,n,n,n,n,n];
+}
+
+method Main() {
+  HasTuples();
+  HasArrows();
+  HasArrays();
+}
diff --git a/Source/DafnyCore/AST/DafnyAst.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns.dfy.expect
similarity index 100%
rename from Source/DafnyCore/AST/DafnyAst.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns.dfy.rs.check
new file mode 100644
index 00000000000..0cd4d62f991
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0433]: failed to resolve: unresolved import
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns_Unsupported.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns_Unsupported.dfy
new file mode 100644
index 00000000000..052322d5b0f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns_Unsupported.dfy
@@ -0,0 +1,23 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+method HasTuples() {
+  var b := true;
+  var has21 := (b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b);
+}
+
+method HasArrows() {
+  var has17 := (x1: bool, x2: bool, x3: bool, x4: bool, x5: bool, x6: bool, x7: bool, x8: bool, x9: bool, x10: bool, x11: bool, x12: bool, x13: bool, x14: bool, x15: bool, x16: bool, x17: bool) => 42;
+}
+
+newtype byte = x: int | 0 <= x < 256
+
+method HasArrays() {
+  var n: byte := 0;
+  var has17 := new bool[n,n,n,n,n,n,n,n,n,n,n,n,n,n,n,n,n];
+}
+
+method Main() {
+  HasTuples();
+  HasArrows();
+  HasArrays();
+}
diff --git a/Test/dafny0/ForallCompilationNewSyntax.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns_Unsupported.dfy.expect
similarity index 100%
rename from Test/dafny0/ForallCompilationNewSyntax.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns_Unsupported.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns_Unsupported.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns_Unsupported.dfy.rs.check
new file mode 100644
index 00000000000..442259c6e2a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/BuiltIns_Unsupported.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Array\ of\ dimensions\ greater\ than\ 16</i>.*
\ No newline at end of file
diff --git a/Test/comp/ByMethodCompilation.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ByMethodCompilation.dfy
similarity index 96%
rename from Test/comp/ByMethodCompilation.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ByMethodCompilation.dfy
index 7432f72f7d4..9192fbbdfc3 100644
--- a/Test/comp/ByMethodCompilation.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ByMethodCompilation.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
 
 method Main() {
   var four := Four();
diff --git a/Test/comp/ByMethodCompilation.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ByMethodCompilation.dfy.expect
similarity index 100%
rename from Test/comp/ByMethodCompilation.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ByMethodCompilation.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ByMethodCompilation.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ByMethodCompilation.dfy.rs.check
new file mode 100644
index 00000000000..a9e2dc9c5c0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ByMethodCompilation.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0425]: cannot find value `_hresult` in this scope
\ No newline at end of file
diff --git a/Test/comp/CSharpStyling.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CSharpStyling.dfy
similarity index 91%
rename from Test/comp/CSharpStyling.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CSharpStyling.dfy
index 584eac0b887..a9ec4d41420 100644
--- a/Test/comp/CSharpStyling.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CSharpStyling.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:3 /spillTargetCode:2 /compileTarget:cs "%s" %S/CSharpStyling2.cs > "%t"
+// RUN: %run "%s" --input %S/CSharpStyling2.cs > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Main() {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CSharpStyling.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CSharpStyling.dfy.expect
new file mode 100644
index 00000000000..a62b408f2f4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CSharpStyling.dfy.expect
@@ -0,0 +1,9 @@
+
+Dafny program verifier finished with 3 verified, 0 errors
+50
+2
+3
+12
+12
+5 7
+5 7
diff --git a/Test/comp/CSharpStyling2.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CSharpStyling2.cs
similarity index 100%
rename from Test/comp/CSharpStyling2.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CSharpStyling2.cs
diff --git a/Test/comp/Calls.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Calls.dfy
similarity index 97%
rename from Test/comp/Calls.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Calls.dfy
index c56bc3e5286..a55f93037c4 100644
--- a/Test/comp/Calls.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Calls.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 function F(x: int, y: bool): int {
   x + if y then 2 else 3
diff --git a/Test/comp/Calls.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Calls.dfy.expect
similarity index 100%
rename from Test/comp/Calls.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Calls.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Calls.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Calls.dfy.rs.check
new file mode 100644
index 00000000000..2a0f83900f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Calls.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: (0,-1): Error: Feature not supported for this compilation target: The /runAllTests option
\ No newline at end of file
diff --git a/Test/comp/Class.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Class.dfy
similarity index 99%
rename from Test/comp/Class.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Class.dfy
index 23591e43450..80f7826303c 100644
--- a/Test/comp/Class.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Class.dfy
@@ -17,7 +17,7 @@ class MyClass {
   static method N() returns (r: int) { r := 70; }
 }
 
-trait MyTrait {
+trait MyTrait extends object {
   var a: int
   const b: int
   const c := 17
diff --git a/Test/comp/Class.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Class.dfy.expect
similarity index 100%
rename from Test/comp/Class.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Class.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Class.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Class.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Class.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/comp/CodeCoverage.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CodeCoverage.java
similarity index 100%
rename from Test/comp/CodeCoverage.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CodeCoverage.java
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy
new file mode 100644
index 00000000000..79b6f16b4a9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy
@@ -0,0 +1,593 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
+
+method Main() {
+  Sets();
+  SubSets();
+  MultiSets();
+  Sequences();
+  Strings();
+  Maps();
+  MultiSetForming();
+  TestExplosiveUnion();
+  Regressions.Test();
+}
+
+// -------------------------------------------------------------------------------------------
+
+trait Trait { }
+class Class extends Trait { }
+
+type IntSet = set<int>
+
+method Sets() {
+  var a := {};
+  var b : IntSet := {17, 82, 17, 82};
+  var c := {12, 17};
+  print "Sets: ", a, " ", b, " ", c, "\n";
+  print "  cardinality: ", |a|, " ", |b|, " ", |c|, "\n";
+  print "  union: ", a + b, " ", b + c, "\n";
+  print "  intersection: ", a * b, " ", b * c, "\n";
+  print "  difference: ", a - b, " ", b - c, "\n";
+  print "  disjoint: ", a !! b, " ", b !! c, "\n";
+  print "  subset: ", a <= b, " ", b <= c, " ", c <= c, "\n";
+  print "  proper subset: ", a < b, " ", b < c, " ", c < c, "\n";
+  print "  superset: ", a >= b, " ", b >= a, " ", c >= c, "\n";
+  print "  proper superset: ", a > b, " ", b > a, " ", c > c, "\n";
+  print "  membership: ", 17 in a, " ", 17 in b, " ", 17 in c, "\n";
+
+  var cl := new Class;
+  var tr: Trait := cl;
+  var xtrait: set<Trait> := {cl, tr};
+  var xclass: set<Class> := {cl, cl};
+  print "  eq covariance: ", |xtrait|, " ", xtrait == xclass, " ", xclass == xtrait, "\n";  // 1 true true
+}
+
+// -------------------------------------------------------------------------------------------
+
+abstract module Order {
+  type T(==)
+  method lt(a: T, b: T) returns (r: bool)
+}
+
+module CharOrder refines Order {
+  type T = char
+  method lt(a: T, b: T) returns (r: bool) {
+    r := a < b;
+  }
+}
+
+module CharSetSetOrder refines Order {
+  type T = set<char>
+
+  function Pow2(i: nat) : nat {
+    if i == 0 then 1 else 2 * Pow2(i-1)
+  }
+
+  method SetAsInt(s: set<char>) returns (r: int) {
+    var ss := s;
+    var acc := 0;
+    while ss != {} {
+      var i: char :| i in ss;
+      ss := ss - {i};
+      acc := acc + Pow2(i as nat);
+    }
+    r := acc;
+  }
+
+  method lt(a: T, b: T) returns (r: bool) {
+    var aInt := SetAsInt(a);
+    var bInt := SetAsInt(b);
+    r := |a| < |b| || (|a| == |b| && aInt <= bInt);
+  }
+}
+
+abstract module PrintOrderedSet {
+  import O : Order
+
+  method PrintElem(e: O.T)
+
+  method Minimum(s: set<O.T>) returns (r: O.T)
+    requires |s| > 0
+    ensures r in s
+  {
+    var ss := s;
+    r :| r in ss;
+    ss := ss - {r};
+    while ss != {}
+      invariant ss <= s
+      invariant r in s
+    {
+      var i: O.T :| i in ss;
+      ss := ss - {i};
+      var lt := O.lt(i, r);
+      if lt {
+        r := i;
+      }
+    }
+  }
+
+  method Print(s: set<O.T>) {
+    var ss := s;
+    print "{";
+    var sep := "";
+    while ss != {} {
+      var bottom: O.T := Minimum(ss);
+      ss := ss - {bottom};
+      print sep;
+      PrintElem(bottom);
+      sep := ", ";
+    }
+    print "}";
+  }
+}
+
+module CharSetPrinter refines PrintOrderedSet {
+  import O = CharOrder
+
+  method PrintElem(e: O.T) {
+    print e;
+  }
+}
+
+module CharSetSetPrinter refines PrintOrderedSet {
+  import O = CharSetSetOrder
+  import P = CharSetPrinter
+
+  method PrintElem(e: O.T) {
+    P.Print(e);
+  }
+}
+
+method SubSets() {
+  var s: set<char> := {'a', 'b', 'c', 'd'};
+  var b0 := forall r | r <= s :: |r| == 2;
+  var b1 := exists r | r <= s :: |r| == 2;
+  print b0, " ", b1, "\n";
+  var S := set r | r <= s && P(r);
+  print "|s|=", |s|, " |S|=", |S|, "\n";
+  CharSetSetPrinter.Print(S);
+  print "\n";
+}
+
+predicate P(r: set<char>) { true }
+
+// -------------------------------------------------------------------------------------------
+
+type IntMultiSet = multiset<int>
+
+method MultiSets() {
+  var a := multiset{};
+  var b : IntMultiSet := multiset{17, 82, 17, 82};
+  var c := multiset{12, 17};
+  var d := multiset{12, 12, 17};
+  print "Multisets: ", a, " ", b, " ", c, "\n";
+  print "  cardinality: ", |a|, " ", |b|, " ", |c|, "\n";
+  print "  union: ", a + b, " ", b + c, "\n";
+  print "  intersection: ", a * b, " ", b * c, "\n";
+  print "  difference: ", a - b, " ", b - c, "\n";
+  print "  disjoint: ", a !! b, " ", b !! c, "\n";
+  print "  subset: ", a <= b, " ", b <= c, " ", c <= c, " ", c <= d, "\n";
+  print "  proper subset: ", a < b, " ", b < c, " ", c < c, " ", c < d, "\n";
+  print "  superset: ", a >= b, " ", b >= a, " ", c >= c, "\n";
+  print "  proper superset: ", a > b, " ", b > a, " ", c > c, "\n";
+  print "  membership: ", 17 in a, " ", 17 in b, " ", 17 in c, "\n";
+  print "  update: ", a[17 := 2], " ", b[17 := 2], " ", c[17 := 2], "\n";
+  print "  multiplicity: ", a[17], " ", b[17], " ", c[17], "\n";
+
+  zeroMultiplicity();
+}
+
+method zeroMultiplicity() {
+  var a := multiset{12}[12 := 0];
+  var b := multiset{42};
+  var c := multiset{1, 2}[1 := 0][2 := 0];
+  var d := multiset{12};
+  var e := multiset{null}[null := 0];
+  var f := multiset{null};
+  print "Test zero multiplicity:\n";
+  print "  printing: ", multiset{a, multiset{42}}, " ", a + d, "\n";
+  print "  union: ", |a + d|, " ", |d + a|, " ", |e + f|, " ", |f + e|, "\n";
+  print "  membership: ", 12 in a, " ", null in e, "\n";
+  print "  equality: ", a == b, " ", a == c, " ", e == f, "\n";
+  print "  subset: ", a <= b, " ", a <= c, " ", c <= a, " ", e <= f, " ", f <= e, "\n";
+  print "  strict subset: ", a < b, " ", a < c, " ", c < a, " ", e < f, " ", f < e, "\n";
+  print "  disjoint: ", a !! d, " ", d !! a, " ", e !! f, " ", f !! e, "\n";
+}
+
+// -------------------------------------------------------------------------------------------
+
+type IntSeq = seq<int>
+
+method Sequences() {
+  var a := [];
+  var b : IntSeq := [17, 82, 17, 82];
+  var c := [12, 17];
+  print "Sequences: ", a, " ", b, " ", c, "\n";
+  print "  cardinality: ", |a|, " ", |b|, " ", |c|, "\n";
+  print "  update: ", b[0 := 42], " ", c[0 := 42], "\n";
+  print "  index: ", b[0], " ", c[0], "\n";
+  print "  subsequence ([lo..hi]): ", b[1..3], " ", c[1..2], "\n";
+  print "  subsequence ([lo..]): ", b[1..], " ", c[1..], "\n";
+  print "  subsequence ([..hi]): ", b[..3], c[..1], "\n";
+  print "  subsequence ([..]): ", a[..], " ", b[..], " ", c[..], "\n";
+  print "  concatenation: ", a + b, " ", b + c, "\n";
+  print "  prefix: ", a <= b, " ", b <= c, " ", c <= c, "\n";
+  print "  proper prefix: ", a < b, " ", b < c, " ", c < c, "\n";
+  print "  membership: ", 17 in a, " ", 17 in b, " ", 17 in c, "\n";
+  BoundedIntegerParameters.Test();
+  SeqUpdate();
+  SeqPrefix();
+
+  var cl := new Class;
+  var tr: Trait := cl;
+  var xtrait: seq<Trait> := [cl, tr];
+  var xclass: seq<Class> := [cl, cl];
+  print "  eq covariance: ", xtrait == xclass, " ", xclass == xtrait, "\n";  // true true
+}
+
+method SeqUpdate() {
+  // regression tests
+  var s := "hello";
+  print s, "\n"; // hello
+  var ch: char := 69 as char;
+  s := s[1 := ch];
+  print s, "\n"; // hEllo
+
+  var t := [2, 4, 6, 8, 10];
+  print t, "\n"; // [2, 4, 6, 8, 10];
+  t := t[1 := 0];
+  print t, "\n"; // [2, 0, 6, 8, 10];
+}
+
+datatype Cell = Cell(data: int)
+
+method SeqPrefix() {
+  // regression tests
+  var a, b, c := Cell(8), Cell(10), Cell(8);
+  var sa := [a, a, a, b, a, b, b];
+  var sc := [c, c, c, b, c, b, b];
+  var t := [a, a, a, b, a, b, b, b];
+  print sa == sc, " ", sa != sc, " ", sa == t, "\n"; // true false false
+  print sa <= sc, " ", sc <= sa, " ", t <= sa, " ", sa <= t, "\n"; // true true false true
+  print sa < sc, " ", sc < sa, " ", t < sa, " ", sa < t, "\n"; // false false false true
+}
+
+module BoundedIntegerParameters {
+  newtype short = x | 0 <= x < 0x100
+  newtype tall = x | 0 <= x < 0x1_0000
+  newtype grande = x | 0 <= x < 0x1_0000_0000
+  newtype venti = x | 0 <= x < 0x1_0000_0000_0000_0000
+  newtype little = x | -12 <= x < 12
+  newtype big = x | -12 <= x < 0x1_0000_0000_0000
+
+  method Test() {
+    Seq(5, 5, 5, 5, 5, 5);
+  }
+
+  method Seq(u0: short, u1: tall, u2: grande, u3: venti, s0: little, s1: big)
+    requires u0 as int <= u1 as int <= u2 as int <= u3 as int < 7
+    requires 0 <= s0 as int <= s1 as int < 7
+  {
+    var data := "Bounded";
+
+    print data[..u0], " ";
+    print data[..u1], " ";
+    print data[..u2], " ";
+    print data[..u3], " ";
+    print data[..s0], " ";
+    print data[..s1], "\n";
+
+    print data[u0..], " ";
+    print data[u1..], " ";
+    print data[u2..], " ";
+    print data[u3..], " ";
+    print data[s0..], " ";
+    print data[s1..], "\n";
+
+    print data[u0], " ";
+    print data[u1], " ";
+    print data[u2], " ";
+    print data[u3], " ";
+    print data[s0], " ";
+    print data[s1], "\n";
+  }
+}
+
+// -------------------------------------------------------------------------------------------
+
+method Strings() {
+  var a := "";
+  var b := "uRuR";
+  var c := "gu";
+  print "Strings: ", a, " ", b, " ", c, "\n";
+  print "  cardinality: ", |a|, " ", |b|, " ", |c|, "\n";
+  print "  concatenation: ", a + b, " ", b + c, "\n";
+  print "  prefix: ", a <= b, " ", b <= c, " ", c <= c, "\n";
+  print "  proper prefix: ", a < b, " ", b < c, " ", c < c, "\n";
+  print "  membership: ", 'u' in a, " ", 'u' in b, " ", 'u' in c, "\n";
+
+  var d := ['g', 'u', 'r', 'u'];
+  print "  constructed as sequence: ", d, "\n";
+
+  var x, y := InterplayBetweenSeqCharAndString('d');
+  // TODO: JavaScript and Go currently differ from C# if the following line is
+  // uncommented, as they don't carry enough type information around at run time
+  // to notice that x and y are character sequences (i.e. strings).
+  // print "  separate: ", x, " ", y, "\n";
+  x := "hello-" + x;
+  y := y + "-hello";
+  print "  mix: ", x, " ", y, "\n";
+}
+
+method InterplayBetweenSeqCharAndString<G>(g: G) returns (a: seq<G>, b: seq<G>) {
+  a := [g];
+  b := a + a;
+  b := b + [g];
+}
+
+// -------------------------------------------------------------------------------------------
+
+type IntMap = map<int, int>
+
+datatype Color = Blue | Yellow | Red
+
+method Maps() {
+  var a := map[];
+  var b: IntMap := map[17 := 2, 82 := 2];
+  var c := map[17 := 0, 12 := 26];
+  print "Maps: ", a, " ", b, " ", c, "\n";
+  print "  cardinality: ", |a|, " ", |b|, " ", |c|, "\n";
+  print "  keys: ", a.Keys, " ", b.Keys, " ", c.Keys, "\n";
+  print "  values: ", a.Values, " ", b.Values, " ", c.Values, "\n";
+  print "  items: ", a.Items, " ", b.Items, " ", c.Items, "\n";
+  var a', b', c' := a[17 := 6], b[17 := 6], c[17 := 6];
+  print "  update: ";
+  print a'[17], " (", |a'|, " ", |a|, ") ";
+  print b'[17], " (", |b'|, " ", |b|, " ", b[17], ") ";
+  print c'[17], " (", |c'|, " ", |c|, " ", c[17], ")\n";
+  print "  lookup: ", 17 in a, " ", b[17], " ", c[17], "\n";
+
+  // regression tests: make sure the types of .Keys, .Values, and .Items are correct
+  var m := map[Blue := 30, Yellow := 21];
+  print "m: ", m, "\n";
+  var keys := m.Keys;
+  print "keys: ", keys, "\n";
+  var values := m.Values;
+  print "values: ", values, "\n";
+  var items := m.Items;
+  print "items: ", items, "\n";
+
+  TestMapMergeSubtraction();
+  TestMapMultiOccurrences();
+}
+
+method TestMapMergeSubtraction() {
+  TestMapMerge();
+  TestMapSubtraction();
+  TestNullsAmongKeys();
+  TestNullsAmongValues();
+}
+
+method TestMapMerge() {
+  var a := map["ronald" := 66, "jack" := 70, "bk" := 8];
+  var b := map["wendy" := 52, "bk" := 67];
+  var ages := a + b;
+  assert ages["jack"] == 70;
+  assert ages["bk"] == 67;
+  assert "sanders" !in ages;
+  print |a|, " ", |b|, " ", |ages|, "\n";  // 3 2 4
+  print ages["jack"], " ", ages["wendy"], " ", ages["ronald"], "\n";  // 70 52 66
+  print a["bk"], " ", b["bk"], " ", ages["bk"], "\n";  // 8 67 67
+}
+
+method TestMapSubtraction() {
+  var ages := map["ronald" := 66, "jack" := 70, "bk" := 67, "wendy" := 52];
+  var d := ages - {};
+  var e := ages - {"jack", "sanders"};
+  print |ages|, " ", |d|, " ", |e|, "\n";  // 4 4 3
+  print "ronald" in d, " ", "sanders" in d, " ", "jack" in d, " ", "sibylla" in d, "\n";  // true false true false
+  print "ronald" in e, " ", "sanders" in e, " ", "jack" in e, " ", "sibylla" in e, "\n";  // true false false false
+}
+
+class MyClass {
+  const name: string
+  constructor (name: string) {
+    this.name := name;
+  }
+}
+
+method TestNullsAmongKeys() {
+  var a := new MyClass("ronald");
+  var b := new MyClass("wendy");
+  var c: MyClass? := null;
+  var d := new MyClass("jack");
+  var e := new MyClass("sibylla");
+
+  var m := map[a := 0, b := 1, c := 2, d := 3];
+  var n := map[a := 0, b := 10, c := 20, e := 4];
+  var o := map[b := 199, a := 198];
+
+  var o' := map[b := 199, c := 55, a := 198];
+  var o'' := map[b := 199, c := 56, a := 198];
+  var o3 := map[c := 3, d := 16];
+  var x0, x1, x2 := o == o', o' == o'', o' == o';
+  print x0, " " , x1, " ", x2, "\n";  //  false false true
+
+  var p := m + n;
+  var q := n + o;
+  var r := o + m;
+  var s := o3 + o;
+  var y0, y1, y2, y3 := p == n + m, q == o + n, r == m + o, s == o + o3;
+  print y0, " " , y1, " ", y2, " ", y3, "\n";  // false false false true
+
+  print p[a], " ", p[c], " ", p[e], "\n";  // 0 20 4
+  print q[a], " ", q[c], " ", q[e], "\n";  // 198 20 4
+  print r[a], " ", r[c], " ", e in r, "\n";  // 0 2 false
+
+  p, q, r := GenericMap(m, n, o, a, e);
+  print p[a], " ", p[c], " ", p[e], "\n";  // 0 20 4
+  print q[a], " ", q[c], " ", q[e], "\n";  // 198 20 4
+  print r[a], " ", r[c], " ", e in r, "\n";  // 0 2 false
+}
+
+method GenericMap<K, V>(m: map<K, V>, n: map<K, V>, o: map<K, V>, a: K, b: K)
+    returns (p: map<K, V>, q: map<K, V>, r: map<K, V>)
+  requires a in m.Keys && a in n.Keys
+  requires b !in m.Keys && b !in o.Keys
+  ensures p == m + n && q == n + o && r == o + m
+{
+  p := m + n;
+  q := n + o;
+  r := o + m;
+  print a in m.Keys, " ", a in n.Keys, " ", a in p, " ", b in r, "\n";  // true true true false
+
+  assert p.Keys == m.Keys + n.Keys;
+  assert q.Keys == o.Keys + n.Keys;
+  assert r.Keys == m.Keys + o.Keys;
+}
+
+method TestNullsAmongValues() {
+  var a := new MyClass("ronald");
+  var b := new MyClass("wendy");
+  var d := new MyClass("jack");
+  var e := new MyClass("sibylla");
+
+  var m: map<int, MyClass?> := map[0 := a, 1 := b, 2 := null, 3 := null];
+  var n: map<int, MyClass?> := map[0 := d, 10 := b, 20 := null, 4 := e];
+  var o: map<int, MyClass?> := map[199 := null, 198 := a];
+
+  var o': map<int, MyClass?> := map[199 := b, 55 := null, 198 := a];
+  var o'': map<int, MyClass?> := map[199 := b, 56 := null, 198 := a];
+  var o3: map<int, MyClass?> := map[3 := null, 16 := d];
+  var x0, x1, x2 := o == o', o' == o'', o' == o';
+  print x0, " " , x1, " ", x2, "\n";  //  false false true
+
+  var p := m + n;
+  var q := n + o;
+  var r := o + m;
+  var s := o3 + o;
+  var y0, y1, y2, y3 := p == n + m, q == o + n, r == m + o, s == o + o3;
+  print y0, " " , y1, " ", y2, " ", y3, "\n";  // false true true true
+
+  print p[0].name, " ", p[1].name, " ", p[20], "\n";  // jack wendy null
+  print q[0].name, " ", q[199], " ", q[20], "\n";  // jack null null
+  print r[0].name, " ", r[198].name, " ", 20 in r, "\n";  // ronald ronald false
+
+  p, q, r := GenericMap(m, n, o, 0, 321);
+  print p[0].name, " ", p[1].name, " ", p[20], "\n";  // jack wendy null
+  print q[0].name, " ", q[199], " ", q[20], "\n";  // jack null null
+  print r[0].name, " ", r[198].name, " ", 20 in r, "\n";  // ronald ronald false
+}
+
+method TestMapMultiOccurrences() {
+  var a := map[1 := 1, 1 := 2];
+  assert |a| == 1;
+  // The semantics are the last value wins
+  assert a[1] == 2;
+  print "Map multiple occurrences test", "\n";
+  print "  length: ", |a|, "\n";
+  print "  self-equal: ", a == a, "\n";
+  print "  select: ", a[1], "\n";
+}
+
+// -------------------------------------------------------------------------------------------
+
+method MultiSetForming() {
+  var s := {24, 23, 24};
+  var q := [24, 23, 24];
+  var m := multiset(s);
+  print |m|, ": ", m[2], " ", m[23], " ", m[24], "\n";
+  m := multiset(q);
+  print |m|, ": ", m[2], " ", m[23], " ", m[24], "\n";
+}
+
+// -------------------------------------------------------------------------------------------
+
+method ExplosiveUnion<T(0)>(a: multiset<T>, N: nat) returns (b: multiset<T>)
+  // ensures b == a^N
+{
+  if N == 0 {
+    return multiset{};
+  }
+  var n := 1;
+  b := a;
+  while n < N
+    // invariant b == a^n
+  {
+    b := b + b;  // double the multiplicities of every element in b
+    n := n + 1;
+  }
+}
+
+method TestExplosiveUnion1<T(0)>(a: multiset<T>, N: nat, t: T) {
+  var b := ExplosiveUnion(a, N);
+  print "There are ", b[t], " occurrences of ", t, " in the multiset\n";
+}
+
+method TestExplosiveUnion() {
+  TestExplosiveUnion1(multiset{}, 100, 58);
+  TestExplosiveUnion1(multiset{58}, 30, 58);
+  TestExplosiveUnion1(multiset{58}, 100, 58);  // this requires BigInteger multiplicities in multisets
+  var m: multiset<MyClass?> := multiset{null};
+  TestExplosiveUnion1(m, 100, null);  // also test null, since the C# implementation does something different for null
+}
+
+// -------------------------------------------------------------------------------------------
+
+module Regressions {
+  newtype uint32 = i:int | 0 <= i < 0x1_0000_0000
+
+  method Test() {
+    TestMap();
+    TestSeq();
+    TestMultiset();
+  }
+
+  method TestMap() {
+    print "Map===\n";
+    var s: map<uint32, uint32> := map[1 := 123];
+    var u := s[1 := 40];
+    print "|s|=", |s|, " |u|=", |u|, "\n";  // 1 1
+    print "s[1]=", s[1], " u[1]=", u[1], "\n";  // 123 40
+
+    var S: map<int, uint32> := map[1 := 123];
+    var U := S[1 := 41];
+    print "|S|=", |S|, " |U|=", |U|, "\n";  // 1 1
+    print "S[1]=", S[1], " U[1]=", U[1], "\n";  // 123 41
+  }
+
+  method TestSeq() {
+    print "Seq===\n";
+    var s: seq<uint32> := [14, 123];
+    var u := s[1 := 42];
+    print "|s|=", |s|, " |u|=", |u|, "\n";  // 2 2
+    print s[1], " ", u[1], ", ";  // 123 42
+    print s[1 as int], " ", u[1 as int], ", ";  // 123 42
+    print s[1 as bv3], " ", u[1 as bv3], "\n";  // 123 42
+
+    u := s[1 as uint32 := 43];
+    print "|s|=", |s|, " |u|=", |u|, "\n";  // 2 2
+    print s[1], " ", u[1], ", ";  // 123 43
+    print s[1 as int], " ", u[1 as int], ", ";  // 123 43
+    print s[1 as bv3], " ", u[1 as bv3], "\n";  // 123 43
+
+    u := s[1 as bv3 := 44];
+    print "|s|=", |s|, " |u|=", |u|, "\n";  // 2 2
+    print s[1], " ", u[1], ", ";  // 123 44
+    print s[1 as int], " ", u[1 as int], ", ";  // 123 44
+    print s[1 as bv3], " ", u[1 as bv3], "\n";  // 123 44
+  }
+
+  method TestMultiset() {
+    print "Multiset===\n";
+    var s: multiset<uint32> := multiset{14, 123};
+    var u := s[123 := 3];
+    print "|s|=", |s|, " |u|=", |u|, "\n";  // 2 4
+    print s[123], " ", u[123], "\n";  // 1 3
+
+    u := s[123 := 3 /*as uint32*/];
+    print "|s|=", |s|, " |u|=", |u|, "\n";  // 2 4
+    print s[123], " ", u[123], "\n";  // 1 3
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.expect
new file mode 100644
index 00000000000..a896b0d701f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.expect
@@ -0,0 +1,129 @@
+Sets: {} {17, 82} {12, 17}
+  cardinality: 0 2 2
+  union: {17, 82} {12, 17, 82}
+  intersection: {} {17}
+  difference: {} {82}
+  disjoint: true false
+  subset: true false true
+  proper subset: true false false
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  eq covariance: 1 true true
+false true
+|s|=4 |S|=16
+{{}, {'a'}, {'b'}, {'c'}, {'d'}, {'a', 'b'}, {'a', 'c'}, {'b', 'c'}, {'a', 'd'}, {'b', 'd'}, {'c', 'd'}, {'a', 'b', 'c'}, {'a', 'b', 'd'}, {'a', 'c', 'd'}, {'b', 'c', 'd'}, {'a', 'b', 'c', 'd'}}
+Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
+  cardinality: 0 4 2
+  union: multiset{17, 17, 82, 82} multiset{12, 17, 17, 17, 82, 82}
+  intersection: multiset{} multiset{17}
+  difference: multiset{} multiset{17, 82, 82}
+  disjoint: true false
+  subset: true false true true
+  proper subset: true false false true
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
+  multiplicity: 0 2 1
+Test zero multiplicity:
+  printing: multiset{multiset{}, multiset{42}} multiset{12}
+  union: 1 1 1 1
+  membership: false false
+  equality: false true false
+  subset: true true true true false
+  strict subset: true false false true false
+  disjoint: true true true true
+Sequences: [] [17, 82, 17, 82] [12, 17]
+  cardinality: 0 4 2
+  update: [42, 82, 17, 82] [42, 17]
+  index: 17 12
+  subsequence ([lo..hi]): [82, 17] [17]
+  subsequence ([lo..]): [82, 17, 82] [17]
+  subsequence ([..hi]): [17, 82, 17][12]
+  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
+  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+Bound Bound Bound Bound Bound Bound
+ed ed ed ed ed ed
+'e' 'e' 'e' 'e' 'e' 'e'
+hello
+hEllo
+[2, 4, 6, 8, 10]
+[2, 0, 6, 8, 10]
+true false false
+true true false true
+false false false true
+  eq covariance: true true
+Strings:  uRuR gu
+  cardinality: 0 4 2
+  concatenation: uRuR uRuRgu
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+  constructed as sequence: guru
+  mix: hello-d ddd-hello
+Maps: map[] map[17 := 2, 82 := 2] map[12 := 26, 17 := 0]
+  cardinality: 0 2 2
+  keys: {} {17, 82} {12, 17}
+  values: {} {2} {0, 26}
+  items: {} {(17, 2), (82, 2)} {(12, 26), (17, 0)}
+  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
+  lookup: false 2 0
+m: map[Color.Blue := 30, Color.Yellow := 21]
+keys: {Color.Blue, Color.Yellow}
+values: {21, 30}
+items: {(Color.Blue, 30), (Color.Yellow, 21)}
+3 2 4
+70 52 66
+8 67 67
+4 4 3
+true false true false
+true false false false
+false false true
+false false false true
+0 20 4
+198 20 4
+0 2 false
+true true true false
+0 20 4
+198 20 4
+0 2 false
+false false true
+false true true true
+jack wendy null
+jack null null
+ronald ronald false
+true true true false
+jack wendy null
+jack null null
+ronald ronald false
+Map multiple occurrences test
+  length: 1
+  self-equal: true
+  select: 2
+2: 0 1 1
+3: 0 1 2
+There are 0 occurrences of 58 in the multiset
+There are 536870912 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of null in the multiset
+Map===
+|s|=1 |u|=1
+s[1]=123 u[1]=40
+|S|=1 |U|=1
+S[1]=123 U[1]=41
+Seq===
+|s|=2 |u|=2
+123 42, 123 42, 123 42
+|s|=2 |u|=2
+123 43, 123 43, 123 43
+|s|=2 |u|=2
+123 44, 123 44, 123 44
+Multiset===
+|s|=2 |u|=4
+1 3
+|s|=2 |u|=4
+1 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.go.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.go.expect
new file mode 100644
index 00000000000..7c5ae68b60f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.go.expect
@@ -0,0 +1,129 @@
+Sets: {} {17, 82} {12, 17}
+  cardinality: 0 2 2
+  union: {17, 82} {17, 82, 12}
+  intersection: {} {17}
+  difference: {} {82}
+  disjoint: true false
+  subset: true false true
+  proper subset: true false false
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  eq covariance: 1 true true
+false true
+|s|=4 |S|=16
+{{}, {'a'}, {'b'}, {'c'}, {'d'}, {'a', 'b'}, {'a', 'c'}, {'b', 'c'}, {'a', 'd'}, {'b', 'd'}, {'c', 'd'}, {'a', 'b', 'c'}, {'a', 'b', 'd'}, {'a', 'c', 'd'}, {'b', 'c', 'd'}, {'a', 'b', 'c', 'd'}}
+Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
+  cardinality: 0 4 2
+  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
+  intersection: multiset{} multiset{17}
+  difference: multiset{} multiset{17, 82, 82}
+  disjoint: true false
+  subset: true false true true
+  proper subset: true false false true
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
+  multiplicity: 0 2 1
+Test zero multiplicity:
+  printing: multiset{multiset{}, multiset{42}} multiset{12}
+  union: 1 1 1 1
+  membership: false false
+  equality: false true false
+  subset: true true true true false
+  strict subset: true false false true false
+  disjoint: true true true true
+Sequences: [] [17, 82, 17, 82] [12, 17]
+  cardinality: 0 4 2
+  update: [42, 82, 17, 82] [42, 17]
+  index: 17 12
+  subsequence ([lo..hi]): [82, 17] [17]
+  subsequence ([lo..]): [82, 17, 82] [17]
+  subsequence ([..hi]): [17, 82, 17][12]
+  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
+  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+Bound Bound Bound Bound Bound Bound
+ed ed ed ed ed ed
+'e' 'e' 'e' 'e' 'e' 'e'
+hello
+hEllo
+[2, 4, 6, 8, 10]
+[2, 0, 6, 8, 10]
+true false false
+true true false true
+false false false true
+  eq covariance: true true
+Strings:  uRuR gu
+  cardinality: 0 4 2
+  concatenation: uRuR uRuRgu
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+  constructed as sequence: guru
+  mix: hello-d ddd-hello
+Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
+  cardinality: 0 2 2
+  keys: {} {17, 82} {17, 12}
+  values: {} {2} {0, 26}
+  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
+  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
+  lookup: false 2 0
+m: map[Color.Blue := 30, Color.Yellow := 21]
+keys: {Color.Blue, Color.Yellow}
+values: {30, 21}
+items: {(Color.Blue, 30), (Color.Yellow, 21)}
+3 2 4
+70 52 66
+8 67 67
+4 4 3
+true false true false
+true false false false
+false false true
+false false false true
+0 20 4
+198 20 4
+0 2 false
+true true true false
+0 20 4
+198 20 4
+0 2 false
+false false true
+false true true true
+jack wendy null
+jack null null
+ronald ronald false
+true true true false
+jack wendy null
+jack null null
+ronald ronald false
+Map multiple occurrences test
+  length: 1
+  self-equal: true
+  select: 2
+2: 0 1 1
+3: 0 1 2
+There are 0 occurrences of 58 in the multiset
+There are 536870912 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of null in the multiset
+Map===
+|s|=1 |u|=1
+s[1]=123 u[1]=40
+|S|=1 |U|=1
+S[1]=123 U[1]=41
+Seq===
+|s|=2 |u|=2
+123 42, 123 42, 123 42
+|s|=2 |u|=2
+123 43, 123 43, 123 43
+|s|=2 |u|=2
+123 44, 123 44, 123 44
+Multiset===
+|s|=2 |u|=4
+1 3
+|s|=2 |u|=4
+1 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.java.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.java.expect
new file mode 100644
index 00000000000..7b9a3bf1e51
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.java.expect
@@ -0,0 +1,129 @@
+Sets: {} {17, 82} {17, 12}
+  cardinality: 0 2 2
+  union: {17, 82} {17, 82, 12}
+  intersection: {} {17}
+  difference: {} {82}
+  disjoint: true false
+  subset: true false true
+  proper subset: true false false
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  eq covariance: 1 true true
+false true
+|s|=4 |S|=16
+{{}, {'a'}, {'b'}, {'c'}, {'d'}, {'a', 'b'}, {'a', 'c'}, {'b', 'c'}, {'a', 'd'}, {'b', 'd'}, {'c', 'd'}, {'a', 'b', 'c'}, {'a', 'b', 'd'}, {'a', 'c', 'd'}, {'b', 'c', 'd'}, {'a', 'b', 'c', 'd'}}
+Multisets: multiset{} multiset{17, 17, 82, 82} multiset{17, 12}
+  cardinality: 0 4 2
+  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
+  intersection: multiset{} multiset{17}
+  difference: multiset{} multiset{17, 82, 82}
+  disjoint: true false
+  subset: true false true true
+  proper subset: true false false true
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{17, 17, 12}
+  multiplicity: 0 2 1
+Test zero multiplicity:
+  printing: multiset{multiset{}, multiset{42}} multiset{12}
+  union: 1 1 1 1
+  membership: false false
+  equality: false true false
+  subset: true true true true false
+  strict subset: true false false true false
+  disjoint: true true true true
+Sequences: [] [17, 82, 17, 82] [12, 17]
+  cardinality: 0 4 2
+  update: [42, 82, 17, 82] [42, 17]
+  index: 17 12
+  subsequence ([lo..hi]): [82, 17] [17]
+  subsequence ([lo..]): [82, 17, 82] [17]
+  subsequence ([..hi]): [17, 82, 17][12]
+  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
+  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+Bound Bound Bound Bound Bound Bound
+ed ed ed ed ed ed
+'e' 'e' 'e' 'e' 'e' 'e'
+hello
+hEllo
+[2, 4, 6, 8, 10]
+[2, 0, 6, 8, 10]
+true false false
+true true false true
+false false false true
+  eq covariance: true true
+Strings:  uRuR gu
+  cardinality: 0 4 2
+  concatenation: uRuR uRuRgu
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+  constructed as sequence: guru
+  mix: hello-d ddd-hello
+Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
+  cardinality: 0 2 2
+  keys: {} {17, 82} {17, 12}
+  values: {} {2} {0, 26}
+  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
+  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
+  lookup: false 2 0
+m: map[Color.Yellow := 21, Color.Blue := 30]
+keys: {Color.Yellow, Color.Blue}
+values: {21, 30}
+items: {(Color.Yellow, 21), (Color.Blue, 30)}
+3 2 4
+70 52 66
+8 67 67
+4 4 3
+true false true false
+true false false false
+false false true
+false false false true
+0 20 4
+198 20 4
+0 2 false
+true true true false
+0 20 4
+198 20 4
+0 2 false
+false false true
+false true true true
+jack wendy null
+jack null null
+ronald ronald false
+true true true false
+jack wendy null
+jack null null
+ronald ronald false
+Map multiple occurrences test
+  length: 1
+  self-equal: true
+  select: 2
+2: 0 1 1
+3: 0 1 2
+There are 0 occurrences of 58 in the multiset
+There are 536870912 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of null in the multiset
+Map===
+|s|=1 |u|=1
+s[1]=123 u[1]=40
+|S|=1 |U|=1
+S[1]=123 U[1]=41
+Seq===
+|s|=2 |u|=2
+123 42, 123 42, 123 42
+|s|=2 |u|=2
+123 43, 123 43, 123 43
+|s|=2 |u|=2
+123 44, 123 44, 123 44
+Multiset===
+|s|=2 |u|=4
+1 3
+|s|=2 |u|=4
+1 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.js.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.js.expect
new file mode 100644
index 00000000000..7c5ae68b60f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.js.expect
@@ -0,0 +1,129 @@
+Sets: {} {17, 82} {12, 17}
+  cardinality: 0 2 2
+  union: {17, 82} {17, 82, 12}
+  intersection: {} {17}
+  difference: {} {82}
+  disjoint: true false
+  subset: true false true
+  proper subset: true false false
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  eq covariance: 1 true true
+false true
+|s|=4 |S|=16
+{{}, {'a'}, {'b'}, {'c'}, {'d'}, {'a', 'b'}, {'a', 'c'}, {'b', 'c'}, {'a', 'd'}, {'b', 'd'}, {'c', 'd'}, {'a', 'b', 'c'}, {'a', 'b', 'd'}, {'a', 'c', 'd'}, {'b', 'c', 'd'}, {'a', 'b', 'c', 'd'}}
+Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
+  cardinality: 0 4 2
+  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
+  intersection: multiset{} multiset{17}
+  difference: multiset{} multiset{17, 82, 82}
+  disjoint: true false
+  subset: true false true true
+  proper subset: true false false true
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
+  multiplicity: 0 2 1
+Test zero multiplicity:
+  printing: multiset{multiset{}, multiset{42}} multiset{12}
+  union: 1 1 1 1
+  membership: false false
+  equality: false true false
+  subset: true true true true false
+  strict subset: true false false true false
+  disjoint: true true true true
+Sequences: [] [17, 82, 17, 82] [12, 17]
+  cardinality: 0 4 2
+  update: [42, 82, 17, 82] [42, 17]
+  index: 17 12
+  subsequence ([lo..hi]): [82, 17] [17]
+  subsequence ([lo..]): [82, 17, 82] [17]
+  subsequence ([..hi]): [17, 82, 17][12]
+  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
+  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+Bound Bound Bound Bound Bound Bound
+ed ed ed ed ed ed
+'e' 'e' 'e' 'e' 'e' 'e'
+hello
+hEllo
+[2, 4, 6, 8, 10]
+[2, 0, 6, 8, 10]
+true false false
+true true false true
+false false false true
+  eq covariance: true true
+Strings:  uRuR gu
+  cardinality: 0 4 2
+  concatenation: uRuR uRuRgu
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+  constructed as sequence: guru
+  mix: hello-d ddd-hello
+Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
+  cardinality: 0 2 2
+  keys: {} {17, 82} {17, 12}
+  values: {} {2} {0, 26}
+  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
+  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
+  lookup: false 2 0
+m: map[Color.Blue := 30, Color.Yellow := 21]
+keys: {Color.Blue, Color.Yellow}
+values: {30, 21}
+items: {(Color.Blue, 30), (Color.Yellow, 21)}
+3 2 4
+70 52 66
+8 67 67
+4 4 3
+true false true false
+true false false false
+false false true
+false false false true
+0 20 4
+198 20 4
+0 2 false
+true true true false
+0 20 4
+198 20 4
+0 2 false
+false false true
+false true true true
+jack wendy null
+jack null null
+ronald ronald false
+true true true false
+jack wendy null
+jack null null
+ronald ronald false
+Map multiple occurrences test
+  length: 1
+  self-equal: true
+  select: 2
+2: 0 1 1
+3: 0 1 2
+There are 0 occurrences of 58 in the multiset
+There are 536870912 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of null in the multiset
+Map===
+|s|=1 |u|=1
+s[1]=123 u[1]=40
+|S|=1 |U|=1
+S[1]=123 U[1]=41
+Seq===
+|s|=2 |u|=2
+123 42, 123 42, 123 42
+|s|=2 |u|=2
+123 43, 123 43, 123 43
+|s|=2 |u|=2
+123 44, 123 44, 123 44
+Multiset===
+|s|=2 |u|=4
+1 3
+|s|=2 |u|=4
+1 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.py.expect
new file mode 100644
index 00000000000..b68ff60874b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.py.expect
@@ -0,0 +1,129 @@
+Sets: {} {17, 82} {17, 12}
+  cardinality: 0 2 2
+  union: {17, 82} {17, 82, 12}
+  intersection: {} {17}
+  difference: {} {82}
+  disjoint: true false
+  subset: true false true
+  proper subset: true false false
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  eq covariance: 1 true true
+false true
+|s|=4 |S|=16
+{{}, {'a'}, {'b'}, {'c'}, {'d'}, {'a', 'b'}, {'a', 'c'}, {'b', 'c'}, {'a', 'd'}, {'b', 'd'}, {'c', 'd'}, {'a', 'b', 'c'}, {'a', 'b', 'd'}, {'a', 'c', 'd'}, {'b', 'c', 'd'}, {'a', 'b', 'c', 'd'}}
+Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
+  cardinality: 0 4 2
+  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
+  intersection: multiset{} multiset{17}
+  difference: multiset{} multiset{17, 82, 82}
+  disjoint: true false
+  subset: true false true true
+  proper subset: true false false true
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
+  multiplicity: 0 2 1
+Test zero multiplicity:
+  printing: multiset{multiset{}, multiset{42}} multiset{12}
+  union: 1 1 1 1
+  membership: false false
+  equality: false true false
+  subset: true true true true false
+  strict subset: true false false true false
+  disjoint: true true true true
+Sequences: [] [17, 82, 17, 82] [12, 17]
+  cardinality: 0 4 2
+  update: [42, 82, 17, 82] [42, 17]
+  index: 17 12
+  subsequence ([lo..hi]): [82, 17] [17]
+  subsequence ([lo..]): [82, 17, 82] [17]
+  subsequence ([..hi]): [17, 82, 17][12]
+  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
+  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+Bound Bound Bound Bound Bound Bound
+ed ed ed ed ed ed
+'e' 'e' 'e' 'e' 'e' 'e'
+hello
+hEllo
+[2, 4, 6, 8, 10]
+[2, 0, 6, 8, 10]
+true false false
+true true false true
+false false false true
+  eq covariance: true true
+Strings:  uRuR gu
+  cardinality: 0 4 2
+  concatenation: uRuR uRuRgu
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+  constructed as sequence: guru
+  mix: hello-d ddd-hello
+Maps: map[] map[82 := 2, 17 := 2] map[17 := 0, 12 := 26]
+  cardinality: 0 2 2
+  keys: {} {17, 82} {17, 12}
+  values: {} {2} {0, 26}
+  items: {} {(82, 2), (17, 2)} {(17, 0), (12, 26)}
+  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
+  lookup: false 2 0
+m: map[Color.Blue := 30, Color.Yellow := 21]
+keys: {Color.Blue, Color.Yellow}
+values: {21, 30}
+items: {(Color.Blue, 30), (Color.Yellow, 21)}
+3 2 4
+70 52 66
+8 67 67
+4 4 3
+true false true false
+true false false false
+false false true
+false false false true
+0 20 4
+198 20 4
+0 2 false
+true true true false
+0 20 4
+198 20 4
+0 2 false
+false false true
+false true true true
+jack wendy null
+jack null null
+ronald ronald false
+true true true false
+jack wendy null
+jack null null
+ronald ronald false
+Map multiple occurrences test
+  length: 1
+  self-equal: true
+  select: 2
+2: 0 1 1
+3: 0 1 2
+There are 0 occurrences of 58 in the multiset
+There are 536870912 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of null in the multiset
+Map===
+|s|=1 |u|=1
+s[1]=123 u[1]=40
+|S|=1 |U|=1
+S[1]=123 U[1]=41
+Seq===
+|s|=2 |u|=2
+123 42, 123 42, 123 42
+|s|=2 |u|=2
+123 43, 123 43, 123 43
+|s|=2 |u|=2
+123 44, 123 44, 123 44
+Multiset===
+|s|=2 |u|=4
+1 3
+|s|=2 |u|=4
+1 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.rs.check
new file mode 100644
index 00000000000..3dec7f442bb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Collections.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitIndexCollectionUpdate for multiset<uint32></i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArguments.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArguments.dfy
new file mode 100644
index 00000000000..447f5df8b3a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArguments.dfy
@@ -0,0 +1,43 @@
+// NONUNIFORM: Multiple testing scenarios, highly backend sensitive, testing CLI
+// RUN: %verify "%s" > "%t"
+// RUN: %run --no-verify --target:cs "%s" Csharp 1 >> "%t"
+// RUN: %run --no-verify --target:java "%s" -- Java --heya >> "%t"
+// RUN: %run --no-verify --target:js "%s" -- Javascript 2 >> "%t"
+// RUN: %run --no-verify --target py "%s" Python 1 >> "%t"
+// RUN: %run --no-verify --target go "%s" "Go go" 1 >> "%t"
+// RUN: %build --no-verify --target:cs "%s" --output:%S/Output/CompileWithArgument.dll
+// RUN: dotnet %S/Output/CompileWithArgument.dll "dotnet" "howdy" >> "%t"
+// RUN: dotnet %S/Output/CompileWithArgument.dll "dotnet" "hello" >> "%t"
+// RUN: dotnet %S/Output/CompileWithArgument.dll "dotnet" "aloha" >> "%t"
+// RUN: %build --no-verify --target:js "%s" --output=%s.js
+// RUN: node %s.js "javascript" 2 >> "%t"
+// RUN: node %s.js "javascript" 1 >> "%t"
+// RUN: node %s.js "javascript" "aloha" >> "%t"
+// RUN: %build --no-verify --target:java "%s" --output:"%s.jar" >> "%t"
+// RUN: java -jar "%s.jar" Java 2 >> "%t"
+// RUN: java -jar "%s.jar" Java 1 >> "%t"
+// RUN: java -jar "%s.jar" Java aloha >> "%t"
+// RUN: %build --no-verify --target:py "%s" >> "%t"
+// RUN: python3 %S/CompileWithArguments-py Python 2 >> "%t"
+// RUN: python3 %S/CompileWithArguments-py Python 1 >> "%t"
+// RUN: python3 %S/CompileWithArguments-py Python aloha >> "%t"
+// RUN: %build --no-verify --target:go "%s" >> "%t"
+// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go 2 >> "%t"
+// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go 1 >> "%t"
+// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go aloha >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main(args: seq<string>) {
+  if |args| != 3 {
+    print "Expected 3 arguments, got ", |args|;
+  } else {
+    print args[1], " says ";
+    if args[2] == "1" {
+      print "hello\n";
+    } else if args[2] == "2" {
+      print "howdy\n";
+    } else {
+      print args[2],"\n";
+    }
+  }
+}
diff --git a/Test/unicodechars/comp/CompileWithArguments.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArguments.dfy.expect
similarity index 100%
rename from Test/unicodechars/comp/CompileWithArguments.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArguments.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail.dfy
new file mode 100644
index 00000000000..74341340f90
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail.dfy
@@ -0,0 +1,7 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %exits-with 3 %run --no-verify --target cs "%s" csharp 1 >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main(args: int) {
+  print "ok", args;
+}
diff --git a/Test/comp/CompileWithArgumentsFail.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail.dfy.expect
similarity index 84%
rename from Test/comp/CompileWithArgumentsFail.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail.dfy.expect
index 6626d2e1214..7cca92683a3 100644
--- a/Test/comp/CompileWithArgumentsFail.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail.dfy.expect
@@ -3,3 +3,4 @@ Dafny program verifier finished with 0 verified, 0 errors
 
 Dafny program verifier did not attempt verification
 CompileWithArgumentsFail.dfy(5,7): Error: This method 'Main' is not permitted as a main method (the method's non-ghost argument type should be an seq<string>, got int).
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail2.dfy
new file mode 100644
index 00000000000..5341dfb9005
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail2.dfy
@@ -0,0 +1,7 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %exits-with 3 %run --no-verify --target cs "%s" csharp 1 >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main(args: array<string>, dummy: int) {
+  print "ok", dummy;
+}
diff --git a/Test/comp/CompileWithArgumentsFail2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail2.dfy.expect
similarity index 83%
rename from Test/comp/CompileWithArgumentsFail2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail2.dfy.expect
index 913285c46e2..25c6085739a 100644
--- a/Test/comp/CompileWithArgumentsFail2.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CompileWithArgumentsFail2.dfy.expect
@@ -3,3 +3,4 @@ Dafny program verifier finished with 0 verified, 0 errors
 
 Dafny program verifier did not attempt verification
 CompileWithArgumentsFail2.dfy(5,7): Error: This method 'Main' is not permitted as a main method (the method has two or more non-ghost parameters).
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Comprehensions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Comprehensions.dfy
new file mode 100644
index 00000000000..0cdad5075c1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Comprehensions.dfy
@@ -0,0 +1,594 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
+
+method Main() {
+  AssignSuchThat();
+  LetSuchThat();
+  Quantifier();
+  MapComprehension();
+  TestCollectionEmptiness();
+  OutParamsUnderLambdas();  // white-box testing
+  AltControlFlow();
+  Sequences();
+  SetComprehension();
+  Enumerations();
+  EnumerationsMaybeNull();
+  GoNil();
+  Containment({}, {}, {});
+  TestImplicitTypeTests.Test();
+  ObjectTests.Test();
+  NewtypeRangeRegression.Test();
+  EnumerationRegression.Test();
+}
+
+predicate Thirteen(x: int) { x == 13 }
+predicate Even(y: int) { y % 2 == 1 }
+function FourMore(x: int): int { x + 4 }
+
+method AssignSuchThat() {
+  var x, y;
+  assert Thirteen(13);
+  x, y :| 12 <= x < y && Thirteen(x);
+  print "x=", x, " y=", y, "\n";
+  var b;
+  x, b, y :| 12 <= x < y && Thirteen(x) && b;
+  print "x=", x, " y=", y, " b=", if b then "yes" else "no", "\n";
+}
+
+method LetSuchThat() {
+  assert Thirteen(13);
+  var p := var x, y :| 12 <= x < y < 15 && Thirteen(x); (x, y);
+  assert p == (13, 14);
+  var q := var x, b, y :| 12 <= x < y < 15 && Thirteen(x) && b; (x, y, if b then "yes" else "no");
+  assert q == (13, 14, "yes");
+}
+
+method Quantifier() {
+  // Note, by making *two* assignments to "s" (instead of the obvious one), the direct translation
+  // into Java makes "s" NOT be "effectively final". This means that Java does not allow "s" to be
+  // used in the lambda expression into which the quantifier translates. Compilation into Java
+  // thus needs to capture the value of "s" into another variable, which these tests check on.
+  var s := [0, 1, 1, 2];
+  s := s + [3, 5, 8, 13];
+  print forall x :: x in s ==> x < 20, " ";  // true
+  print forall x :: x in s ==> x < 10, "\n";  // false
+  print exists x :: x in s && x == 3, " ";  // true
+  print exists x :: x in s && x == 4, "\n";  // false
+}
+
+method MapComprehension() {
+  // var m := map x,y | 12 <= x < y < 17 && Thirteen(x) && Even(y) :: x := y;
+  var m := map x | 12 <= x < 15 :: x / 2;
+  print m, "\n";
+  m := map x | 12 <= x < 15 :: FourMore(x) := x;
+  print m, "\n";
+}
+
+method TestCollectionEmptiness() {
+  var a, b, c, d;
+  a, b, c, d := {2, 4}, multiset{4, 4, 1}, [0, 9, 0], map[13 := 26];
+  PrintCollectionEmptiness(a, b, c, d);
+  a, b, c, d := {}, multiset{}, [], map[];
+  PrintCollectionEmptiness(a, b, c, d);
+}
+
+method PrintCollectionEmptiness<X(==)>(a: set<X>, b: multiset<X>, c: seq<X>, d: map<X, int>) {
+  var r0, r1;
+  // set
+  r0 := forall x :: !(x in a);
+  r1 := forall x :: x !in a;
+  expect r0 == r1;
+  print r0, " ";
+  // multiset
+  r0 := forall x :: !(x in b);
+  r1 := forall x :: x !in b;
+  expect r0 == r1;
+  print r0, " ";
+  // seq
+  r0 := forall x :: !(x in c);
+  r1 := forall x :: x !in c;
+  expect r0 == r1;
+  print r0, " ";
+  // map
+  r0 := forall x :: !(x in d);
+  r1 := forall x :: x !in d;
+  expect r0 == r1;
+  print r0, "\n";
+}
+
+
+method OutParamsUnderLambdas() {
+  var x, b := XP();
+  print "XP returned: ", x, " ", b, "\n";
+  var m := XM();
+  print "XM returned: ", m, "\n";
+}
+
+method XP() returns (x: int, b: bool) {
+  var s := {2, 4};
+  b := exists y :: y in s && y < x;
+}
+
+
+method XM() returns (x: int) {
+  var before, after;
+
+  var f := () => x;
+  before := f();
+  x := 2;
+  after := f();
+  print "after: ", f(), " ", "before: ", f(), "\n";
+
+  f := () => x;
+  before := f();
+  x := 16;
+  after := f();
+  print "after: ", f(), " ", "before: ", f(), "\n";
+}
+
+method AltControlFlow() {
+  var s := [2, 29, 34, 35, 36, 59, 104, 106, 107, 107, 108, 2700];
+  var lo, hi, Lo, Hi;
+
+  lo, hi := FindRange(s, 0, 3000);
+  Lo, Hi := FindRange(s, 35, 107);
+  print lo, " ", hi, " ", Lo, " ", Hi, "\n";
+
+  lo, hi := FindRangeIf(s, 0, 3000);
+  Lo, Hi := FindRangeIf(s, 35, 107);
+  print lo, " ", hi, " ", Lo, " ", Hi, "\n";
+
+  lo, hi := FindRangeBindingGuard(s, 0, 3000);
+  Lo, Hi := FindRangeBindingGuard(s, 35, 107);
+  print lo, " ", hi, " ", Lo, " ", Hi, "\n";
+
+  lo, hi := FindRangeBindingGuardAlt(s, 0, 3000);
+  Lo, Hi := FindRangeBindingGuardAlt(s, 35, 107);
+  print lo, " ", hi, " ", Lo, " ", Hi, "\n";
+}
+
+method FindRange(s: seq<int>, from: int, to: int) returns (lo: int, hi: int)
+  requires forall i,j :: 0 <= i < j < |s| ==> s[i] <= s[j]
+  requires from <= to
+  ensures 0 <= lo <= hi <= |s|
+  ensures forall i :: 0 <= i < |s| ==> (from <= s[i] < to <==> lo <= i < hi)
+{
+  lo, hi := 0, |s|;
+  while
+    invariant lo <= hi <= |s|
+    invariant forall i :: 0 <= i < lo ==> s[i] < from
+    invariant forall i :: hi <= i < |s| ==> to <= s[i]
+    decreases hi - lo
+  {
+  case lo < |s| && s[lo] < from =>
+    lo := lo + 1;
+  case 0 < hi && to <= s[hi-1] =>
+    hi := hi - 1;
+  }
+}
+
+method FindRangeIf(s: seq<int>, from: int, to: int) returns (lo: int, hi: int)
+  requires forall i,j :: 0 <= i < j < |s| ==> s[i] <= s[j]
+  requires from <= to
+  ensures 0 <= lo <= hi <= |s|
+  ensures forall i :: 0 <= i < |s| ==> (from <= s[i] < to <==> lo <= i < hi)
+{
+  lo, hi := 0, |s|;
+  while lo < hi
+    invariant lo <= hi <= |s|
+    invariant forall i :: 0 <= i < lo ==> s[i] < from
+    invariant forall i :: hi <= i < |s| ==> to <= s[i]
+    decreases hi - lo
+  {
+    if
+    case s[lo] < from =>
+      lo := lo + 1;
+    case to <= s[hi-1] =>
+      hi := hi - 1;
+    case from <= s[lo] && s[hi-1] < to =>
+      break;
+  }
+}
+
+method FindRangeBindingGuard(s: seq<int>, from: int, to: int) returns (lo: int, hi: int)
+  requires forall i,j :: 0 <= i < j < |s| ==> s[i] <= s[j]
+  requires from <= to
+  ensures 0 <= lo <= hi <= |s|
+  ensures forall i :: 0 <= i < |s| ==> (from <= s[i] < to <==> lo <= i < hi)
+{
+  lo, hi := 0, |s|;
+  while lo < hi
+    invariant lo <= hi <= |s|
+    invariant forall i :: 0 <= i < lo ==> s[i] < from
+    invariant forall i :: hi <= i < |s| ==> to <= s[i]
+    decreases hi - lo
+  {
+    if j :| lo <= j < |s| && s[j] < from {
+      lo := j + 1;
+    } else if j :| 0 <= j < hi && to <= s[j] {
+      hi := j;
+    } else {
+      break;
+    }
+  }
+}
+
+method FindRangeBindingGuardAlt(s: seq<int>, from: int, to: int) returns (lo: int, hi: int)
+  requires forall i,j :: 0 <= i < j < |s| ==> s[i] <= s[j]
+  requires from <= to
+  ensures 0 <= lo <= hi <= |s|
+  ensures forall i :: 0 <= i < |s| ==> (from <= s[i] < to <==> lo <= i < hi)
+{
+  lo, hi := 0, |s|;
+  while lo < hi
+    invariant lo <= hi <= |s|
+    invariant forall i :: 0 <= i < lo ==> s[i] < from
+    invariant forall i :: hi <= i < |s| ==> to <= s[i]
+    decreases hi - lo
+  {
+    if
+    case j :| lo <= j < |s| && s[j] < from =>
+      lo := j + 1;
+    case j :| 0 <= j < hi && to <= s[j] =>
+      hi := j;
+    case forall j :: lo <= j < hi ==> from <= s[j] < to =>
+      break;
+  }
+}
+
+method Sequences() {
+  var four1s := [1, 1, 1, 1];
+  var twelve1s := seq(12, _ => 1);
+  assert twelve1s == four1s + four1s + four1s;
+
+  var squares := seq(8, i => i*i);
+  assert |squares| == 8;
+  assert squares[6] == 36;
+
+  var nats := seq(8, i => i);
+
+  print four1s, "\n";
+  print twelve1s, "\n";
+  print squares, "\n";
+  print nats, "\n";
+}
+
+trait NothingInParticular { }
+class ClassA { }
+class ClassB extends NothingInParticular { }
+
+method SetComprehension() {
+  SetComprehension0();
+  SetComprehension1();
+  SetComprehension2();
+  SetComprehension3();
+}
+
+method SetComprehension0() {
+  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
+  var s := {w, x, y, z};
+  // The following set comprehension picks all elements in s:
+  var all := set o: object | o in s;
+  // The next set comprehension picks out 2 of the elements in s:
+  var aa := set o: ClassA | o in s;
+  // The next set comprehension picks out the other 2 of the elements in s:
+  var bb := set o: ClassB | o in s;
+  // The following picks out the same elements as in bb:
+  var nn := set o: NothingInParticular | o in s;
+
+  print |s|, " ", |all|, " ";           // 4 4
+  print |aa|, " ", |bb|, " ";           // 2 2
+  print |aa * bb|, " ", |aa + bb|, " "; // 0 4
+  print |nn|, " ", bb == nn, "\n";      // 2 true
+}
+
+// SetComprehension1 is like SetComprehension0, but also adds "null" to "s".
+method SetComprehension1() {
+  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
+  var s := {w, x, y, z, null};
+  // The following set comprehension picks all elements in s:
+  var all := set o: object | o in s;
+  // The next set comprehension picks out 2 of the elements in s:
+  var aa := set o: ClassA | o in s;
+  // The next set comprehension picks out the other 2 of the elements in s:
+  var bb := set o: ClassB | o in s;
+  // The following picks out the same elements as in bb:
+  var nn := set o: NothingInParticular | o in s;
+
+  print |s|, " ", |all|, " ";           // 5 4
+  print |aa|, " ", |bb|, " ";           // 2 2
+  print |aa * bb|, " ", |aa + bb|, " "; // 0 4
+  print |nn|, " ", bb == nn, "\n";      // 2 true
+}
+
+// SetComprehension2 is like SetComprehension1, but uses maybe-null types in comprehensions
+method SetComprehension2() {
+  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
+  var s := {w, x, y, z, null};
+  // The following set comprehension picks all elements in s:
+  var all := set o: object? | o in s;
+  // The next set comprehension picks out 2 of the elements in s:
+  var aa := set o: ClassA? | o in s;
+  // The next set comprehension picks out the other 2 of the elements in s:
+  var bb := set o: ClassB? | o in s;
+  // The following picks out the same elements as in bb:
+  var nn := set o: NothingInParticular? | o in s;
+
+  print |s|, " ", |all|, " ";           // 5 5
+  print |aa|, " ", |bb|, " ";           // 3 3
+  print |aa * bb|, " ", |aa + bb|, " "; // 1 5
+  print |nn|, " ", bb == nn, "\n";      // 3 true
+}
+
+datatype Color = Red | Green | Blue
+
+predicate True<G>(g: G) { true }
+
+method SetComprehension3() {
+  var s: set<bool> := {false, true};
+  // The following set comprehension picks all elements in s:
+  var all := set o: bool | o in s;
+  var aa := set o: bool | o in s && !o;
+  var bb := set o: bool | o in s && o;
+
+  print |s|, " ", |all|, " ";           // 2 2
+  print |aa|, " ", |bb|, " ";           // 1 1
+  print |aa * bb|, " ", |aa + bb|, " "; // 0 2
+  print aa == all, " ", aa <= all, "\n"; // false true
+
+  var d := set z: Color | True(z);
+  var e := set z: Color | z in d;
+  print |d|, " ", |e|, "\n"; // 3 3
+}
+
+trait ICell { var data: int }
+class CellA extends ICell { }
+class CellB extends ICell { }
+
+method Enumerations() {
+  var c, d, e := new CellA, new CellA, new CellB;
+  c.data, d.data, e.data := 4, 5, 1;
+  var s: set<ICell?> := {c, d, e, null};
+  print c.data, d.data, e.data, "\n";  // 451
+
+  // non-sequentialized forall statement
+  forall a: CellA | a in s {
+    a.data := c.data + a.data - 2;
+  }
+  print c.data, d.data, e.data, "\n";  // 671
+
+  // sequentialized forall statement
+  forall a: CellA | a in s {
+    a.data := 2;
+  }
+  print c.data, d.data, e.data, "\n";  // 221
+
+  // assign-such-that statement
+  d.data := 9;
+  assert d in s;
+  var u: CellA :| u in s && 7 <= u.data;
+  u.data := 8;
+  print c.data, d.data, e.data, "\n";  // 281
+
+  // set comprehension
+  var r := set a: CellA | a in s && a.data < 6;
+  print |r|, "\n";  // 1
+
+  // map comprehension
+  var m := map a: CellA | a in s && a.data < 6 :: 3;
+  print c in m.Keys, " ", d in m.Keys, " ", |m.Keys|, "\n";  // true false 1
+}
+
+method EnumerationsMaybeNull() {
+  var c, d, e := new CellA, new CellA, new CellB;
+  c.data, d.data, e.data := 4, 5, 1;
+  var s: set<ICell?> := {c, d, e, null};
+  print c.data, d.data, e.data, "\n";  // 451
+
+  // non-sequentialized forall statement
+  forall a: CellA? | a in s {
+    (if a == null then c else a).data := c.data + (if a == null then c else a).data - 2;
+  }
+  print c.data, d.data, e.data, "\n";  // 671
+
+  // sequentialized forall statement
+  forall a: CellA? | a in s {
+    (if a == null then c else a).data := 2;
+  }
+  print c.data, d.data, e.data, "\n";  // 221
+
+  // assign-such-that statement
+  d.data := 9;
+  assert d in s;
+  var u: CellA? :| u in s && u != null && 7 <= u.data;
+  u.data := 8;
+  print c.data, d.data, e.data, "\n";  // 281
+
+  // set comprehension
+  var r := set a: CellA? | a in s && (a == null || a.data < 6);
+  print |r|, "\n";  // 2
+
+  // map comprehension
+  var m := map a: CellA? | a in s && (a == null || a.data < 6) :: 3;
+  print null in m.Keys, " ", c in m.Keys, " ", d in m.Keys, " ", |m.Keys|, "\n";  // true true false 2
+}
+
+method GoNil() {
+  var a, b := new CellA, new CellB;
+  var aa := {a, null};
+  var bb := {b, null};
+  var cc := aa * bb;
+  var dd := aa + bb;
+  print "the intersection is ", cc, "\n";  // {null}
+  print "there are ", |dd|, " elements in the union\n";  // 3
+}
+
+trait SomethingElse { }
+
+method Containment(s: set<CellA>, t: set<ICell>, u: set<SomethingElse>) {
+  // Test that the type parameter emitted by the compiler accommodates that of both
+  // operands of <=.
+  var b0 := s <= t;
+  var b1 := t <= s;
+  var c := t <= u;
+  print b0, " ", b1, " ", c, "\n";  // true true true
+  b0 := s < t;
+  b1 := t < s;
+  c := t < u;
+  print b0, " ", b1, " ", c, "\n";  // false false false
+  b0 := s >= t;
+  b1 := t >= s;
+  c := t >= u;
+  print b0, " ", b1, " ", c, "\n";  // true true true
+  b0 := s > t;
+  b1 := t > s;
+  c := t > u;
+  print b0, " ", b1, " ", c, "\n";  // false false false
+}
+
+module TestImplicitTypeTests {
+  trait A {}
+  trait B extends A {}
+  class C extends B {}
+  class A' extends A {}
+  class B' extends B {}
+
+  method Test() {
+    var o, a, b, c := new object, new A', new B', new C;
+    var r: set<object> := {o, a, b, c};
+    var s: set<A> := set x: A | x in r;
+    var t: set<B> := set x: B | x in s;
+    var u: set<C> := set x: C | x in s;
+    print |r|, " ", |s|, " ", |t|, " ", |u|, "\n"; // 4 3 2 1
+    print r == set x | x in r && x is object, " "; // true
+    print s == set x | x in r && x is A, " "; // true
+    print t == set x | x in r && x is B, " "; // true
+    print u == set x | x in r && x is C, "\n"; // true
+
+    var r': set<object?> := r;
+    var s': set<A?> := s;
+    var t': set<B?> := t;
+    var u': set<C?> := u;
+    print |r'|, " ", |s'|, " ", |t'|, " ", |u'|, "\n"; // 4 3 2 1
+    print r' == set x | x in r && x is object, " "; // true
+    print s' == set x | x in r && x is A, " "; // true
+    print t' == set x | x in r && x is B, " "; // true
+    print u' == set x | x in r && x is C, "\n"; // true
+
+    r', s', t', u' := r' + {null}, s' + {null}, t' + {null}, u' + {null};
+    print r' == set x | x in r && x is object, " "; // false
+    print s' == set x | x in r && x is A, " "; // false
+    print t' == set x | x in r && x is B, " "; // false
+    print u' == set x | x in r && x is C, "\n"; // false
+    print r' == set x | x in r && x is object?, " "; // false
+    print s' == set x | x in r && x is A?, " "; // false
+    print t' == set x | x in r && x is B?, " "; // false
+    print u' == set x | x in r && x is C?, "\n"; // false
+
+    print r == set x | x in r' && x is object, " "; // true
+    print s == set x | x in r' && x is A, " "; // true
+    print t == set x | x in r' && x is B, " "; // true
+    print u == set x | x in r' && x is C, "\n"; // true
+    print r == set x | x in r' && x is object?, " "; // false
+    print s == set x | x in r' && x is A?, " "; // false
+    print t == set x | x in r' && x is B?, " "; // false
+    print u == set x | x in r' && x is C?, "\n"; // false
+    print r == set x | x in r' && x is object? && x != null, " "; // true
+    print s == set x | x in r' && x is A? && x != null, " "; // true
+    print t == set x | x in r' && x is B? && x != null, " "; // true
+    print u == set x | x in r' && x is C? && x != null, "\n"; // true
+  }
+}
+
+module ObjectTests {
+  method Test() {
+    var o, p := new object, new object;
+    print o == p, " ", p == p, "\n"; // false true
+    print GenEqual(o, p), " ", GenEqual(p, p), "\n"; // false true
+    AutoInit<object?>(); // null
+    var o': object?, p': object? := o, p;
+    print GenEqual(o', p'), " ", GenEqual(p', p'), "\n"; // false true
+    o', p' := null, null;
+    print GenEqual(o', p'), " ", GenEqual(p', p'), "\n"; // true true
+  }
+
+  predicate GenEqual<X(==)>(x: X, y: X) {
+    x == y
+  }
+
+  method AutoInit<X(0)>() {
+    var x: X;
+    print x, "\n";
+  }
+}
+
+module NewtypeRangeRegression {
+  newtype MyInt = x | 2 <= x < 5 witness *
+
+  method Test() {
+    var k: MyInt :| k != 2; // this once caused an infinite loop in the target Java code
+    print k, "\n";
+  }
+}
+
+module {:options "--function-syntax:4"} EnumerationRegression {
+  method Test() {
+    // The Java compiler once converted each candidate Long number to a 32-bit int, which meant
+    // that none of them fell into the range mentioned by the set. Thus, it erroneously computed
+    // the empty set. (issue #3204)
+    var s := set l: Long | 0x20_0000_0002 <= l < 0x20_0000_0008 && l.True() && l != 0x20_0000_0006;
+    var s' := ToSeq(s, (x, y) => x < y);
+    print s', "\n";
+
+    var t := set l: AlsoLong | l.True() && l != 0x20_0000_0006;
+    var c := set l | l in s :: Digit(l as int);
+    var u := set l: AlsoLong | l.True() && l != 0x20_0000_0006 :: Digit(l as int);
+    var t' := ToSeq(t, (x, y) => x < y);
+    var c' := ToSeq(c, (x, y) => x < y);
+    var u' := ToSeq(u, (x, y) => x < y);
+    print t', "\n";
+    print c', "\n";
+    print u', "\n";
+  }
+
+  // Another previous problem with the Java compiler was that it generated names that confused
+  // the following "Long" with the built-in "java.lang.Long".
+  newtype Long = x | 0x1F_FFFF_FFF0 <= x < 0x20_0000_0100 witness 0x1F_FFFF_FFF0 {
+    predicate True() { true }
+  }
+
+  newtype AlsoLong = x | 0x20_0000_0002 <= x < 0x20_0000_0008 witness 0x20_0000_0002 {
+    predicate True() { true }
+  }
+
+  function Digit(x: int): char
+    requires 0x20_0000_0000 <= x < 0x20_0000_000a
+  {
+    'a' + (x - 0x20_0000_0000) as char
+  }
+
+  method ToSeq<X>(s: set<X>, below: (X, X) -> bool) returns (r: seq<X>) {
+    r := [];
+    var ss := s;
+    while ss != {} {
+      var x :| x in ss;
+      ss, r := ss - {x}, r + [x];
+    }
+    // sort r
+    ghost var n := |r|;
+    for i := 0 to |r|
+      invariant |r| == n
+    {
+      var y := r[i];
+      for j := i downto 0
+        invariant |r| == n
+      {
+        if below(r[j], r[j + 1]) {
+          break;
+        }
+        // swap elements j and j+1
+        r := r[j := r[j + 1]][j + 1 := r[j]];
+      }
+    }
+  }
+}
diff --git a/Test/comp/Comprehensions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Comprehensions.dfy.expect
similarity index 100%
rename from Test/comp/Comprehensions.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Comprehensions.dfy.expect
diff --git a/Test/comp/Comprehensions.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Comprehensions.dfy.py.expect
similarity index 100%
rename from Test/comp/Comprehensions.dfy.py.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Comprehensions.dfy.py.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Comprehensions.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Comprehensions.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Comprehensions.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ComprehensionsNewSyntax.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ComprehensionsNewSyntax.dfy
new file mode 100644
index 00000000000..d3206c736ce
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ComprehensionsNewSyntax.dfy
@@ -0,0 +1,278 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
+
+method Main() {
+  Quantifier();
+  MapComprehension();
+  OutParamsUnderLambdas();  // white-box testing
+  SetComprehension();
+  Enumerations();
+  EnumerationsMaybeNull();
+  TestImplicitTypeTests.Test();
+}
+
+function FourMore(x: int): int { x + 4 }
+
+method Quantifier() {
+  // Note, by making *two* assignments to "s" (instead of the obvious one), the direct translation
+  // into Java makes "s" NOT be "effectively final". This means that Java does not allow "s" to be
+  // used in the lambda expression into which the quantifier translates. Compilation into Java
+  // thus needs to capture the value of "s" into another variable, which these tests check on.
+  var s := [0, 1, 1, 2];
+  s := s + [3, 5, 8, 13];
+  print forall x <- s :: x < 20, " ";  // true
+  print forall x <- s :: x < 10, "\n";  // false
+  print exists x <- s :: x == 3, " ";  // true
+  print exists x <- s :: x == 4, "\n";  // false
+}
+
+method MapComprehension() {
+  var s := [12, 13, 14];
+  var m := map x <- s :: x / 2;
+  print m, "\n";
+  m := map x <- s :: FourMore(x) := x;
+  print m, "\n";
+}
+
+method OutParamsUnderLambdas() {
+  var x, b := XP();
+  print "XP returned: ", x, " ", b, "\n";
+  var m := XM();
+  print "XM returned: ", m, "\n";
+}
+
+method XP() returns (x: int, b: bool) {
+  var s := {2, 4};
+  b := exists y <- s :: y < x;
+}
+
+
+method XM() returns (x: int) {
+  var before, after;
+
+  var f := () => x;
+  before := f();
+  x := 2;
+  after := f();
+  print "after: ", f(), " ", "before: ", f(), "\n";
+
+  f := () => x;
+  before := f();
+  x := 16;
+  after := f();
+  print "after: ", f(), " ", "before: ", f(), "\n";
+}
+
+trait NothingInParticular { }
+class ClassA { }
+class ClassB extends NothingInParticular { }
+
+method SetComprehension() {
+  SetComprehension0();
+  SetComprehension1();
+  SetComprehension2();
+  SetComprehension3();
+}
+
+method SetComprehension0() {
+  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
+  var s := {w, x, y, z};
+  // The following set comprehension picks all elements in s:
+  var all := set o: object <- s;
+  // The next set comprehension picks out 2 of the elements in s:
+  var aa := set o: ClassA <- s;
+  // The next set comprehension picks out the other 2 of the elements in s:
+  var bb := set o: ClassB <- s;
+  // The following picks out the same elements as in bb:
+  var nn := set o: NothingInParticular <- s;
+
+  print |s|, " ", |all|, " ";           // 4 4
+  print |aa|, " ", |bb|, " ";           // 2 2
+  print |aa * bb|, " ", |aa + bb|, " "; // 0 4
+  print |nn|, " ", bb == nn, "\n";      // 2 true
+}
+
+// SetComprehension1 is like SetComprehension0, but also adds "null" to "s".
+method SetComprehension1() {
+  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
+  var s := {w, x, y, z, null};
+  // The following set comprehension picks all elements in s:
+  var all := set o: object <- s;
+  // The next set comprehension picks out 2 of the elements in s:
+  var aa := set o: ClassA <- s;
+  // The next set comprehension picks out the other 2 of the elements in s:
+  var bb := set o: ClassB <- s;
+  // The following picks out the same elements as in bb:
+  var nn := set o: NothingInParticular <- s;
+
+  print |s|, " ", |all|, " ";           // 5 4
+  print |aa|, " ", |bb|, " ";           // 2 2
+  print |aa * bb|, " ", |aa + bb|, " "; // 0 4
+  print |nn|, " ", bb == nn, "\n";      // 2 true
+}
+
+// SetComprehension2 is like SetComprehension1, but uses maybe-null types in comprehensions
+method SetComprehension2() {
+  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
+  var s := {w, x, y, z, null};
+  // The following set comprehension picks all elements in s:
+  var all := set o: object? <- s;
+  // The next set comprehension picks out 2 of the elements in s:
+  var aa := set o: ClassA? <- s;
+  // The next set comprehension picks out the other 2 of the elements in s:
+  var bb := set o: ClassB? <- s;
+  // The following picks out the same elements as in bb:
+  var nn := set o: NothingInParticular? <- s;
+
+  print |s|, " ", |all|, " ";           // 5 5
+  print |aa|, " ", |bb|, " ";           // 3 3
+  print |aa * bb|, " ", |aa + bb|, " "; // 1 5
+  print |nn|, " ", bb == nn, "\n";      // 3 true
+}
+
+datatype Color = Red | Green | Blue
+
+predicate True<G>(g: G) { true }
+
+method SetComprehension3() {
+  var s: set<bool> := {false, true};
+  // The following set comprehension picks all elements in s:
+  var all := set o: bool <- s;
+  var aa := set o: bool <- s | !o;
+  var bb := set o: bool <- s | o;
+
+  print |s|, " ", |all|, " ";           // 2 2
+  print |aa|, " ", |bb|, " ";           // 1 1
+  print |aa * bb|, " ", |aa + bb|, " "; // 0 2
+  print aa == all, " ", aa <= all, "\n"; // false true
+
+  var d := set z: Color | True(z);
+  var e := set z: Color | z in d;
+  print |d|, " ", |e|, "\n"; // 3 3
+}
+
+trait ICell { var data: int }
+class CellA extends ICell { }
+class CellB extends ICell { }
+
+method Enumerations() {
+  var c, d, e := new CellA, new CellA, new CellB;
+  c.data, d.data, e.data := 4, 5, 1;
+  var s: set<ICell?> := {c, d, e, null};
+  print c.data, d.data, e.data, "\n";  // 451
+
+  // non-sequentialized forall statement
+  forall a: CellA <- s {
+    a.data := c.data + a.data - 2;
+  }
+  print c.data, d.data, e.data, "\n";  // 671
+
+  // sequentialized forall statement
+  forall a: CellA <- s {
+    a.data := 2;
+  }
+  print c.data, d.data, e.data, "\n";  // 221
+
+  // assign-such-that statement
+  d.data := 9;
+  assert d in s;
+  var u: CellA :| u in s && 7 <= u.data;
+  u.data := 8;
+  print c.data, d.data, e.data, "\n";  // 281
+
+  // set comprehension
+  var r := set a: CellA <- s | a.data < 6;
+  print |r|, "\n";  // 1
+
+  // map comprehension
+  var m := map a: CellA <- s | a.data < 6 :: 3;
+  print c in m.Keys, " ", d in m.Keys, " ", |m.Keys|, "\n";  // true false 1
+}
+
+method EnumerationsMaybeNull() {
+  var c, d, e := new CellA, new CellA, new CellB;
+  c.data, d.data, e.data := 4, 5, 1;
+  var s: set<ICell?> := {c, d, e, null};
+  print c.data, d.data, e.data, "\n";  // 451
+
+  // non-sequentialized forall statement
+  forall a: CellA? <- s {
+    (if a == null then c else a).data := c.data + (if a == null then c else a).data - 2;
+  }
+  print c.data, d.data, e.data, "\n";  // 671
+
+  // sequentialized forall statement
+  forall a: CellA? <- s {
+    (if a == null then c else a).data := 2;
+  }
+  print c.data, d.data, e.data, "\n";  // 221
+
+  // assign-such-that statement
+  d.data := 9;
+  assert d in s;
+  var u: CellA? :| u in s && u != null && 7 <= u.data;
+  u.data := 8;
+  print c.data, d.data, e.data, "\n";  // 281
+
+  // set comprehension
+  var r := set a: CellA? <- s | (a == null || a.data < 6);
+  print |r|, "\n";  // 2
+
+  // map comprehension
+  var m := map a: CellA? <- s | (a == null || a.data < 6) :: 3;
+  print null in m.Keys, " ", c in m.Keys, " ", d in m.Keys, " ", |m.Keys|, "\n";  // true true false 2
+}
+
+module TestImplicitTypeTests {
+  trait A {}
+  trait B extends A {}
+  class C extends B {}
+  class A' extends A {}
+  class B' extends B {}
+
+  method Test() {
+    var o, a, b, c := new object, new A', new B', new C;
+    var r: set<object> := {o, a, b, c};
+    var s: set<A> := set x: A <- r;
+    var t: set<B> := set x: B <- s;
+    var u: set<C> := set x: C <- s;
+    print |r|, " ", |s|, " ", |t|, " ", |u|, "\n"; // 4 3 2 1
+    print r == set x <- r | x is object, " "; // true
+    print s == set x <- r | x is A, " "; // true
+    print t == set x <- r | x is B, " "; // true
+    print u == set x <- r | x is C, "\n"; // true
+
+    var r': set<object?> := r;
+    var s': set<A?> := s;
+    var t': set<B?> := t;
+    var u': set<C?> := u;
+    print |r'|, " ", |s'|, " ", |t'|, " ", |u'|, "\n"; // 4 3 2 1
+    print r' == set x <- r | x is object, " "; // true
+    print s' == set x <- r | x is A, " "; // true
+    print t' == set x <- r | x is B, " "; // true
+    print u' == set x <- r | x is C, "\n"; // true
+
+    r', s', t', u' := r' + {null}, s' + {null}, t' + {null}, u' + {null};
+    print r' == set x <- r | x is object, " "; // false
+    print s' == set x <- r | x is A, " "; // false
+    print t' == set x <- r | x is B, " "; // false
+    print u' == set x <- r | x is C, "\n"; // false
+    print r' == set x <- r | x is object?, " "; // false
+    print s' == set x <- r | x is A?, " "; // false
+    print t' == set x <- r | x is B?, " "; // false
+    print u' == set x <- r | x is C?, "\n"; // false
+
+    print r == set x <- r' | x is object, " "; // true
+    print s == set x <- r' | x is A, " "; // true
+    print t == set x <- r' | x is B, " "; // true
+    print u == set x <- r' | x is C, "\n"; // true
+    print r == set x <- r' | x is object?, " "; // false
+    print s == set x <- r' | x is A?, " "; // false
+    print t == set x <- r' | x is B?, " "; // false
+    print u == set x <- r' | x is C?, "\n"; // false
+    print r == set x <- r' | x is object? && x != null, " "; // true
+    print s == set x <- r' | x is A? && x != null, " "; // true
+    print t == set x <- r' | x is B? && x != null, " "; // true
+    print u == set x <- r' | x is C? && x != null, "\n"; // true
+  }
+}
diff --git a/Test/comp/ComprehensionsNewSyntax.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ComprehensionsNewSyntax.dfy.expect
similarity index 100%
rename from Test/comp/ComprehensionsNewSyntax.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ComprehensionsNewSyntax.dfy.expect
diff --git a/Test/comp/ComprehensionsNewSyntax.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ComprehensionsNewSyntax.dfy.py.expect
similarity index 100%
rename from Test/comp/ComprehensionsNewSyntax.dfy.py.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ComprehensionsNewSyntax.dfy.py.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ComprehensionsNewSyntax.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ComprehensionsNewSyntax.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ComprehensionsNewSyntax.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Conversions.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Conversions.java
new file mode 100644
index 00000000000..45c5c97e58d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Conversions.java
@@ -0,0 +1,7 @@
+package Util;
+
+public class Conversions {
+    public static String ToJavaString(dafny.DafnySequence<? extends dafny.CodePoint> s) {
+        return s.verbatimString();
+    }
+}
\ No newline at end of file
diff --git a/Test/comp/CovariantCollections.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CovariantCollections.dfy
similarity index 97%
rename from Test/comp/CovariantCollections.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CovariantCollections.dfy
index 6dd73ee7fea..a0565555b09 100644
--- a/Test/comp/CovariantCollections.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CovariantCollections.dfy
@@ -10,7 +10,7 @@ method Main() {
   CovarianceRegressions.Test();
 }
 
-trait Number {
+trait Number extends object {
   const value: int
   method Print()
 }
@@ -342,7 +342,8 @@ method Downcasts() {
   s, s' := DowncastM2(m);  // cast in, cast out
   s := var v: set<Integer> := m; v;  // regression test -- this once tripped up the compilation to Java, whereas the next line had not
   s' := var u: set<Number> := var v: set<Integer> := m; v; u;
-  var eq := s == m && m == s;
+  var s'' := DowncastFunction(a, b); // regression test -- the same error was later discovered in top-level function bodies
+  var eq := s == m && m == s && s == s'';
   print eq, "\n";  // true
 
   s := FId<Integer>(m);  // cast in
@@ -367,6 +368,12 @@ method Create<T>(a: T, b: T) returns (m: set<T>, n: multiset<T>, o: seq<T>, p: m
   p := map[a := b, b := a];
 }
 
+function DowncastFunction(a: Integer, b: Integer): set<Integer> {
+  var m: set<Number> := {a, b};
+  var v: set<Integer> := m;
+  v
+}
+
 function DowncastF(s: set<Integer>): set<Number> { s }
 method DowncastM(s: set<Integer>) returns (r: set<Number>)
   ensures r == s
@@ -454,7 +461,7 @@ function MapOfSeqOf<T(==), U>(t: T, u: U): map<seq<T>, U> {
 // -------------------- some regression tets --------------------
 
 module CovarianceRegressions {
-  trait Trait { }
+  trait Trait extends object { }
 
   method Test() {
     var a: set<Trait>;
diff --git a/Test/comp/CovariantCollections.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CovariantCollections.dfy.expect
similarity index 100%
rename from Test/comp/CovariantCollections.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CovariantCollections.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CovariantCollections.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CovariantCollections.dfy.rs.check
new file mode 100644
index 00000000000..5dd8bb6a194
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CovariantCollections.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Unsupported:\ DAST_dBinOp_dAnd\ with\ not\ 2\ elements</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CoverageReport.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CoverageReport.dfy
new file mode 100644
index 00000000000..c8f941667b3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CoverageReport.dfy
@@ -0,0 +1,20 @@
+// NONUNIFORM: Out-of-band output (coverage reports) not easily testable via %testDafnyForEachCompiler
+
+// Actual runtime test coverage
+// (See also logger/CoverageReport.dfy for verification coverage and expected coverage of generated tests)
+
+// RUN: rm -rf "%t"/execution_testing
+// RUN: %baredafny run %args -t:cs --no-timestamp-for-coverage-report --coverage-report "%t_coverage_reports/execution_testing" %s
+// RUN: %sed 's/<h1 hidden.*//' "%t_coverage_reports"/execution_testing/BranchCoverage.dfy_tests_actual.html > "%t_coverage_reports"/coverage_tests_actual.html
+// RUN: %diff "%S/CoverageReport.dfy_tests_actual.html.expect" "%t_coverage_reports/coverage_tests_actual.html"
+
+// Manually assert the other backends cleanly report they don't support this feature yet
+// RUN: %exits-with 3 %baredafny run %args -t:java --no-timestamp-for-coverage-report --coverage-report "%t_coverage_reports/execution_testing" %s > "%t"
+// RUN: %exits-with 3 %baredafny run %args -t:js --no-timestamp-for-coverage-report --coverage-report "%t_coverage_reports/execution_testing" %s >> "%t"
+// RUN: %exits-with 3 %baredafny run %args -t:go --no-timestamp-for-coverage-report --coverage-report "%t_coverage_reports/execution_testing" %s >> "%t"
+// RUN: %exits-with 3 %baredafny run %args -t:py --no-timestamp-for-coverage-report --coverage-report "%t_coverage_reports/execution_testing" %s >> "%t"
+// RUN: %exits-with 3 %baredafny run %args -t:cpp --no-timestamp-for-coverage-report --coverage-report "%t_coverage_reports/execution_testing" %s >> "%t"
+// RUN: %exits-with 3 %baredafny run %args -t:rs --no-timestamp-for-coverage-report --coverage-report "%t_coverage_reports/execution_testing" %s >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+include "BranchCoverage.dfy"
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CoverageReport.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CoverageReport.dfy.expect
new file mode 100644
index 00000000000..050212ee153
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CoverageReport.dfy.expect
@@ -0,0 +1,18 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+CoverageReport.dfy(20,0): Error: Feature not supported for this compilation target: Execution coverage report
+
+Dafny program verifier finished with 0 verified, 0 errors
+CoverageReport.dfy(20,0): Error: Feature not supported for this compilation target: Execution coverage report
+
+Dafny program verifier finished with 0 verified, 0 errors
+CoverageReport.dfy(20,0): Error: Feature not supported for this compilation target: Execution coverage report
+
+Dafny program verifier finished with 0 verified, 0 errors
+CoverageReport.dfy(20,0): Error: Feature not supported for this compilation target: Execution coverage report
+
+Dafny program verifier finished with 0 verified, 0 errors
+CoverageReport.dfy(20,0): Error: Feature not supported for this compilation target: Execution coverage report
+
+Dafny program verifier finished with 0 verified, 0 errors
+CoverageReport.dfy(20,0): Error: Feature not supported for this compilation target: Execution coverage report
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CoverageReport.dfy_tests_actual.html.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CoverageReport.dfy_tests_actual.html.expect
new file mode 100644
index 00000000000..6e794a63d7b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/CoverageReport.dfy_tests_actual.html.expect
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html
+        xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+    <link rel="stylesheet" href="./.resources/coverage.css" type="text/css"/>
+    <title>BranchCoverage.dfy, Execution Coverage</title>
+</head>
+<body onload="window['PR_TAB_WIDTH']=4">
+<div class="menu" id="menu">
+    <a href="./index_tests_actual.html">Index</a>
+    
+</div>
+<h1>BranchCoverage.dfy, Execution Coverage</h1>
+
+<pre class="source lang-java linenums">
+<span class="na" id="1:1">// RUN: %dafny /useBaseNameForFileName /compile:3 /coverage:- /spillTargetCode:1 /compileTarget:cs %S/BranchCoverage2.cs "%s" > "%t"
+// RUN: %dafny /useBaseNameForFileName /compile:3 /coverage:- /spillTargetCode:1 /compileTarget:js %S/BranchCoverage3.js "%s" >> "%t"
+// RUN: %dafny /useBaseNameForFileName /compile:3 /coverage:- /spillTargetCode:1 /compileTarget:go %S/BranchCoverage4.go "%s" >> "%t"
+// RUN: %dafny /useBaseNameForFileName /compile:3 /coverage:- /spillTargetCode:1 /compileTarget:java %S/CodeCoverage.java "%s" >> "%t"
+// RUN: %dafny /useBaseNameForFileName /compile:3 /coverage:- /spillTargetCode:1 /compileTarget:py %S/BranchCoverage.py "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// The Main method is at the end of this file, because that makes it easier to maintain
+// this test file when adding more tests.
+
+// ---------- class constructor ----------
+    
+class MyClass {
+</span><span class="fc" id="14:1">  constructor () {  // 3 times
+</span><span class="na" id="15:1">  }
+}
+
+// ---------- routines that are never called ----------
+
+</span><span class="nc" id="20:1">method NeverCalled() {
+</span><span class="na" id="21:1">  // we get here 0 times
+}
+
+function FunctionNeverCalled(): int {
+  // we get here 0 times
+</span><span class="nc" id="26:1">  75
+</span><span class="na" id="27:1">}
+
+// ---------- if ----------
+
+</span><span class="fc" id="31:1">method M(x: int) returns (y: int) {
+</span><span class="na" id="32:1">  // we get here 3 times
+</span><span class="fc" id="33:1">  if x < 10 {
+</span><span class="na" id="34:1">    return x + 20;  // we get here 1 time
+</span><span class="nc" id="35:1">  } else if x < 20 {  // note: the location between th "else" and the "if" does not get recorded
+</span><span class="na" id="36:1">    return x + 20;  // we get here 0 times
+</span><span class="fc" id="37:1">  } else {
+</span><span class="na" id="38:1">    return 100;  // we get here 2 times
+  }
+}
+
+</span><span class="fc" id="42:1">method N(x: int) returns (y: int) {
+</span><span class="na" id="43:1">  // we get here 3 times
+  y := 100;
+</span><span class="fc" id="45:1">  if x < 10 {
+</span><span class="na" id="46:1">    return x + 20;  // we get here 1 time
+</span><span class="pc" id="47:1">  } else if x < 20 {  // note: the location between th "else" and the "if" does not get recorded
+</span><span class="na" id="48:1">    return x + 20;  // we get here 0 times
+  }  // we get to this implicit else 2 times
+}
+
+
+</span><span class="fc" id="53:1">method P(x: int) {
+</span><span class="na" id="54:1">  // we get here 1 time
+  var y := 100;
+</span><span class="pc" id="56:1">  if * {
+</span><span class="na" id="57:1">    // we get here 0 times, because the compiler picks the other branch, which is empty
+    y := y + 2;
+  }  // we get to the implicit else 1 time
+
+</span><span class="fc" id="61:1">  if * {
+</span><span class="na" id="62:1">    // we get here 1 time
+</span><span class="nc" id="63:1">  } else {
+</span><span class="na" id="64:1">    // we get here 0 times, because the compiler picks the other branch, which is empty
+    y := y + 2;
+  }
+
+  // the following if is all ghost, so there are no branch-coverage locations in it
+  if x < 2 {
+  } else if * {
+  }
+
+</span><span class="nc" id="73:1">  if x < 2 {
+</span><span class="na" id="74:1">    // get here 0 times
+</span><span class="pc" id="75:1">  } else if * {
+</span><span class="na" id="76:1">    // we get here 0 times
+    y := y + 1;
+  }  // implicit else: 1 time
+}
+
+// ---------- if case ----------
+
+</span><span class="fc" id="83:1">method Q(x: int) returns (y: int) {
+</span><span class="na" id="84:1">  // we get here 3 times
+
+  // the following statement is all ghost, so there are no coverage locations in it
+  if {
+    case x < 100 =>
+    case x < 1000 =>
+      assert x < 1_000_000;
+    case 50 <= x =>
+  }
+
+  if
+</span><span class="fc" id="95:1">  case x < 100 =>
+</span><span class="na" id="96:1">    // we get here 1 time
+</span><span class="fc" id="97:1">  case x < 1000 =>
+</span><span class="na" id="98:1">    // we get here 1 time, since the compiler lays down the cases in order
+    return 8;
+</span><span class="fc" id="100:1">  case 50 <= x =>
+</span><span class="na" id="101:1">    // we get here 1 time
+}
+
+// ---------- while ----------
+
+</span><span class="fc" id="106:1">method R(x: int) returns (y: int) {
+</span><span class="na" id="107:1">  // we get here 1 time
+  var i: nat := 0;
+</span><span class="fc" id="109:1">  while i < x {
+</span><span class="na" id="110:1">    // we get here 111 times
+    i := i + 1;
+  }
+
+</span><span class="nc" id="114:1">  while * {
+</span><span class="na" id="115:1">    // we get here 0 times
+    break;
+  }
+
+  while
+    decreases i
+  {
+</span><span class="fc" id="122:1">    case i % 2 == 0 =>
+</span><span class="na" id="123:1">      // we get here 56 times
+</span><span class="fc" id="124:1">      if i == 0 {
+</span><span class="na" id="125:1">        // we get here 1 time
+        break;
+      }  // implicit else: 55 times
+      i := i - 1;
+</span><span class="fc" id="129:1">    case i % 4 == 1 =>
+</span><span class="na" id="130:1">      // we get here 28 times
+      i := i - 1;
+</span><span class="fc" id="132:1">    case 0 < i =>
+</span><span class="na" id="133:1">      // we get here 28 times
+      i := i - 1;
+  }
+
+  return 40;
+}
+
+// ---------- top-level if-then-else ----------
+
+function Fib(n: nat): nat {
+  // we get here 465 times
+</span><span class="fc" id="144:1">  if n < 2 then  // then: 233 times
+    n
+</span><span class="na" id="146:1">  else if false then  // then: 0 times (else-if is omitted)
+</span><span class="pc" id="147:1">    8
+</span><span class="na" id="148:1">  else  // else: 232 times
+    Fib(n - 2) + Fib(n - 1)
+}
+
+// ---------- top-level match expression, match statement, and tail recursion ----------
+
+function {:tailrecursion} Factorial(n: nat): nat {
+  // 11 times
+</span><span class="fc" id="156:1">  match n
+  case 0 => 1  // 1 time
+  case _ => n * Factorial(n - 1)  // 10 times
+</span><span class="na" id="159:1">}
+
+method {:tailrecursion} ComputeFactorial(n: nat, acc: nat) returns (f: nat)
+  ensures f == Factorial(n) * acc
+</span><span class="fc" id="163:1">{
+</span><span class="na" id="164:1">  // 11 times
+  match n
+</span><span class="fc" id="166:1">  case 0 =>  // 1 time
+</span><span class="na" id="167:1">    return acc;
+</span><span class="fc" id="168:1">  case _ =>  // 10 times
+</span><span class="na" id="169:1">    f := ComputeFactorial(n - 1, acc * n);
+}
+
+// ---------- Main ----------
+
+</span><span class="fc" id="174:1">method Main() {
+</span><span class="na" id="175:1">  // we get here 1 time
+
+  var mc := new MyClass();
+  mc := new MyClass();
+  mc := new MyClass();
+
+  var y := M(5);
+  y := M(y);
+  y := M(y);
+
+  y := N(5);
+  y := N(y);
+  y := N(y);
+
+  P(5);
+
+  y := Q(50);
+  y := Q(101);
+  y := Q(1010);
+
+  y := R(111);
+
+  y := Fib(12);
+
+  y := Factorial(10);
+  y := ComputeFactorial(10, 1);
+}
+
+</span></pre>
+<div class="footer">
+    <span class="right">
+        Created with 
+        <a href="https://github.com/dafny-lang/dafny">Dafny</a>
+    </span>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/Test/comp/Datatype.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy
similarity index 97%
rename from Test/comp/Datatype.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy
index b59859be88f..6e2b75a6608 100644
--- a/Test/comp/Datatype.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy
@@ -1,5 +1,5 @@
 // NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
 
 datatype List = Nil | Cons(head: int, tail: List)
 
diff --git a/Test/comp/Datatype.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy.expect
similarity index 100%
rename from Test/comp/Datatype.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy.expect
diff --git a/Test/comp/Datatype.dfy.java.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy.java.expect
similarity index 100%
rename from Test/comp/Datatype.dfy.java.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy.java.expect
diff --git a/Test/comp/Datatype.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy.py.expect
similarity index 100%
rename from Test/comp/Datatype.dfy.py.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy.py.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy.rs.check
new file mode 100644
index 00000000000..9be48cfdfeb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Datatype.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitDatatypeBoundedPool</i>.*
\ No newline at end of file
diff --git a/Test/comp/DefaultParameters-Compile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DefaultParameters-Compile.dfy
similarity index 87%
rename from Test/comp/DefaultParameters-Compile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DefaultParameters-Compile.dfy
index cd6ba1163b1..480ab9231df 100644
--- a/Test/comp/DefaultParameters-Compile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DefaultParameters-Compile.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
 
 method M(x: int := 16) {
   print x, "\n";
diff --git a/Test/comp/DefaultParameters-Compile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DefaultParameters-Compile.dfy.expect
similarity index 100%
rename from Test/comp/DefaultParameters-Compile.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DefaultParameters-Compile.dfy.expect
diff --git a/Test/comp/DowncastClone.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DowncastClone.dfy
similarity index 100%
rename from Test/comp/DowncastClone.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DowncastClone.dfy
diff --git a/Test/comp/DowncastClone.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DowncastClone.dfy.expect
similarity index 100%
rename from Test/comp/DowncastClone.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DowncastClone.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DowncastClone.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DowncastClone.dfy.rs.check
new file mode 100644
index 00000000000..690b413b47b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DowncastClone.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Coercion\ from\ ::dafny_runtime::Object<dyn\ super::_module::X>\ to\ ::dafny_runt\.\.\..*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DuplicateArrowNames.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DuplicateArrowNames.dfy
new file mode 100644
index 00000000000..6556eef233f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DuplicateArrowNames.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+// Previously, this would lead to duplicate variable names in Java, C#,
+// and Python.
+method Main() {
+  var f: nat -> nat -> bool;
+  print f(0)(1), "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DuplicateArrowNames.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DuplicateArrowNames.dfy.expect
new file mode 100644
index 00000000000..c508d5366f7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DuplicateArrowNames.dfy.expect
@@ -0,0 +1 @@
+false
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DuplicateArrowNames.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DuplicateArrowNames.dfy.rs.check
new file mode 100644
index 00000000000..34a952a5453
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/DuplicateArrowNames.dfy.rs.check
@@ -0,0 +1,4 @@
+// CHECK-L: thread 'main' panicked at library\core\src\panicking.rs:156:5:
+// CHECK-L: unsafe precondition(s) violated: hint::unreachable_unchecked must never be reached
+// CHECK-L: note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+// CHECK-L: thread caused non-unwinding panic. aborting.
\ No newline at end of file
diff --git a/Test/comp/ErasableTypeWrappers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ErasableTypeWrappers.dfy
similarity index 92%
rename from Test/comp/ErasableTypeWrappers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ErasableTypeWrappers.dfy
index f149482d96e..de79e80473c 100644
--- a/Test/comp/ErasableTypeWrappers.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ErasableTypeWrappers.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false --type-system-refresh=true --general-traits=datatype
 
 datatype SingletonRecord = SingletonRecord(u: int)
 datatype GhostOrNot = ghost Ghost(a: int, b: int) | Compiled(x: int)
@@ -18,6 +18,7 @@ method Main() {
   TestMembers();
   OptimizationChecks.Test();
   PrintRegressionTests.Test();
+  ConditionsThatDisableTheOptimization.Test();
 }
 
 method TestTargetTypesAndConstructors() {
@@ -412,3 +413,33 @@ module PrintRegressionTests {
     print x, "\n";
   }
 }
+
+// --------------------------------------------------------------------------------
+
+module ConditionsThatDisableTheOptimization {
+  trait Trait {
+    function F(): int
+  }
+  datatype WithTrait extends Trait = WithTrait(u: int)
+  {
+    function F(): int { 5 }
+  }
+
+  datatype WithCompiledField = WithCompiledField(u: int)
+  {
+    const n: int := 100
+  }
+
+  datatype WithGhostField = WithGhostField(u: int)
+  {
+    ghost const n: int := 100
+  }
+
+  method Test() {
+    var t0 := WithTrait(40);
+    var t1 := WithCompiledField(41);
+    var t2 := WithGhostField(42);
+    print t0, " ", t0.F(), " ", (t0 as Trait).F(), "\n"; // WithTrait(40) 5 5
+    print t1, " ", t1.n, " ", t2, "\n"; // WithCompiledField(41) 100 42
+  }
+}
diff --git a/Test/comp/ErasableTypeWrappers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ErasableTypeWrappers.dfy.expect
similarity index 77%
rename from Test/comp/ErasableTypeWrappers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ErasableTypeWrappers.dfy.expect
index e9ca5b48732..1466b3dce90 100644
--- a/Test/comp/ErasableTypeWrappers.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ErasableTypeWrappers.dfy.expect
@@ -18,3 +18,5 @@ HasConst.MakeC(4) (4, 4)
 OptimizationChecks.Ints.Ints(5, 7) OptimizationChecks.Ints.Ints(5, 7) OptimizationChecks.Ints.AnotherIntsWrapper(OptimizationChecks.Ints.Ints(5, 7))
 D D
 5 5
+ConditionsThatDisableTheOptimization.WithTrait.WithTrait(40) 5 5
+ConditionsThatDisableTheOptimization.WithCompiledField.WithCompiledField(41) 100 42
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ErasableTypeWrappers.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ErasableTypeWrappers.dfy.rs.check
new file mode 100644
index 00000000000..d831924e7ab
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ErasableTypeWrappers.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error: expected identifier, found `<`
\ No newline at end of file
diff --git a/Test/comp/EuclideanDivision.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/EuclideanDivision.dfy
similarity index 99%
rename from Test/comp/EuclideanDivision.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/EuclideanDivision.dfy
index 1286dcd125b..bd84267ed81 100644
--- a/Test/comp/EuclideanDivision.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/EuclideanDivision.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // Some runtimes (like the one for C#) have three implementations
 // of Euclidean div/mod: one for `int`, one for `long`, and one
diff --git a/Test/comp/EuclideanDivision.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/EuclideanDivision.dfy.expect
similarity index 100%
rename from Test/comp/EuclideanDivision.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/EuclideanDivision.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/EuclideanDivision.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/EuclideanDivision.dfy.rs.check
new file mode 100644
index 00000000000..030d3bbdc4b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/EuclideanDivision.dfy.rs.check
@@ -0,0 +1,2 @@
+// CHECK-L: error[E0308]: mismatched types
+// CHECK: .*expected `I1`, found `DafnyInt`.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern.dfy
new file mode 100644
index 00000000000..6f925a10523
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern.dfy
@@ -0,0 +1,93 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %run --no-verify --target cs "%s" --input %S/Extern2.cs >> "%t"
+// RUN: %run --no-verify --target js "%s" --input %S/Extern3.js >> "%t"
+// RUN: %run --no-verify --target go "%s" --input %S/Extern4.go >> "%t"
+// RUN: %run --no-verify --target java "%s" --input %S/SingletonOptimization.java --input %S/LibClass.java --input %S/OtherClass.java --input %S/AllDafny.java --input %S/Mixed.java --input %S/AllExtern.java >> "%t"
+// RUN: %run --no-verify --target py "%s" --input %S/Extern5.py >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  print "Hello\n";
+  var x, y := Library.LibClass.CallMeInt(30);
+  var z := Library.LibClass.CallMeNative(44, true);
+  var w := Library.LibClass.CallMeInAnotherClass();
+  print x, " ", y, " ", z, " ", w, "\n";
+
+  Library.AllDafny.M();
+  Library.Mixed.M();
+  print Library.Mixed.F(), "\n";
+  var m := new Library.Mixed();
+  m.IM();
+  print m.IF(), "\n";
+  Library.AllExtern.P();
+  assert Library.AllDafny.Seven() == Library.Mixed.Seven() == Library.AllExtern.Seven();
+  var maybeInt := Library.AllExtern.MaybeInt();
+  print maybeInt, "\n";
+  var intPair := Library.AllExtern.IntPair();
+  print intPair, "\n";
+
+  var singleton := Library.SingletonOptimization.SingletonTuple((ghost 10, 2));
+  assert singleton.0 == 3;
+  var noWrapper := Library.SingletonOptimization.NoWrapper(Library.ErasableWrapper(2));
+  assert noWrapper.x == 3;
+  var ghostWrapper := Library.SingletonOptimization.GhostWrapper(Library.Something(2));
+  assert ghostWrapper.x == 3;
+  print singleton.0, " ", noWrapper.x, " ", ghostWrapper.x, "\n"; // 3 3 3
+}
+
+module Wrappers {
+  datatype Option<T> = Some(value: T) | None
+  datatype Pair<A, B> = Pair(first: A, second: B)
+}
+
+module {:extern "Library"} Library {
+  import opened Wrappers
+
+  newtype MyInt = x | -100 <= x < 0x8000_0000
+  
+  class {:extern "LibClass"} LibClass {
+    static method {:extern} CallMeInt(x: int) returns (y: int, z: int)
+    static method {:extern} CallMeNative(x: MyInt, b: bool) returns (y: MyInt)
+    static method {:axiom} {:extern "Library.OtherClass", "CallMe"} CallMeInAnotherClass() returns (w : object)
+  }
+
+  class {:extern} AllDafny {
+    static function Seven(): int { 7 }
+    static method M() { print "AllDafny.M\n"; }
+  }
+  class {:extern} Mixed {
+    constructor() { }
+    static function Seven(): int { 7 }
+    static method M() { print "Extern static method says: "; P(); }
+    static method {:extern} P()
+    method IM() { print "Extern instance method says: "; IP(); }
+    method {:extern} IP()
+    static function F() : int { 1000 + G() }
+    static function {:extern} G() : int
+    function IF() : int { 2000 + IG() }
+    function {:extern} IG() : int
+  }
+  class {:extern} AllExtern {
+    static ghost function Seven(): int { 7 }
+    static method {:extern} P()
+    static function {:extern} MaybeInt(): Option<int>
+    static function {:extern} IntPair(): Pair<int, int>
+  }
+
+  datatype ErasableWrapper = ErasableWrapper(x: MyInt)
+
+  datatype Ghost<X> = ghost Uninitialized | Something(x: X)
+
+  class {:extern} SingletonOptimization {
+    // The in-parameter and out-parameter of these methods are optimized to just an "MyInt"
+    static method {:axiom} {:extern} SingletonTuple(a: (ghost MyInt, MyInt)) returns (b: (MyInt, ghost MyInt, ghost MyInt))
+      requires a.1 < 0x7fff_ffff
+      ensures b.0 == a.1 + 1
+    static method {:axiom} {:extern} NoWrapper(a: ErasableWrapper) returns (b: ErasableWrapper)
+      requires a.x < 0x7fff_ffff
+      ensures b.x == a.x + 1
+    static method {:axiom} {:extern} GhostWrapper(a: Ghost<MyInt>) returns (b: Ghost<MyInt>)
+      requires a.Something? && a.x < 0x7fff_ffff
+      ensures b.Something? && b.x == a.x + 1
+  }
+}
diff --git a/Test/comp/Extern.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern.dfy.expect
similarity index 100%
rename from Test/comp/Extern.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern.dfy.expect
diff --git a/Test/comp/Extern2.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern2.cs
similarity index 100%
rename from Test/comp/Extern2.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern2.cs
diff --git a/Test/comp/Extern3.js b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern3.js
similarity index 100%
rename from Test/comp/Extern3.js
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern3.js
diff --git a/Test/comp/Extern4.go b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern4.go
similarity index 100%
rename from Test/comp/Extern4.go
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern4.go
diff --git a/Test/comp/Extern5.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern5.py
similarity index 92%
rename from Test/comp/Extern5.py
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern5.py
index 4ba82fa2d79..b6a2710748f 100644
--- a/Test/comp/Extern5.py
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Extern5.py
@@ -6,8 +6,7 @@
 import sys, _dafny
 import Wrappers
 
-assert "Library" == __name__
-Library = sys.modules[__name__]
+# Module: Library
 
 class LibClass:
     @staticmethod
@@ -41,7 +40,7 @@ def ctor__(self):
     @staticmethod
     def M():
         _dafny.print(_dafny.string_of(_dafny.Seq("Extern static method says: ")))
-        Library.Mixed.P()
+        Mixed.P()
 
     @staticmethod
     def P():
@@ -56,7 +55,7 @@ def IP(self):
 
     @staticmethod
     def F():
-        return (1000) + (Library.Mixed.G())
+        return (1000) + (Mixed.G())
 
     @staticmethod
     def G():
diff --git a/Test/comp/ExternCopyFromTrait.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCopyFromTrait.dfy
similarity index 96%
rename from Test/comp/ExternCopyFromTrait.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCopyFromTrait.dfy
index aab0976fb4b..c4f2acf0bab 100644
--- a/Test/comp/ExternCopyFromTrait.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCopyFromTrait.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:4 /compileTarget:cs "%s" %S/ExternCopyFromTraitLibrary.cs > "%t"
+// RUN: %run --target cs "%s" --input %S/ExternCopyFromTraitLibrary.cs > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 /// This file tests inheritance of `:extern` annotation in traits.
diff --git a/Test/comp/ExternCopyFromTrait.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCopyFromTrait.dfy.expect
similarity index 100%
rename from Test/comp/ExternCopyFromTrait.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCopyFromTrait.dfy.expect
diff --git a/Test/comp/ExternCopyFromTraitLibrary.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCopyFromTraitLibrary.cs
similarity index 100%
rename from Test/comp/ExternCopyFromTraitLibrary.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCopyFromTraitLibrary.cs
diff --git a/Test/comp/ExternCtors-externs/Class.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Class.java
similarity index 85%
rename from Test/comp/ExternCtors-externs/Class.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Class.java
index 1827be2bfc6..f6549c6aaf0 100644
--- a/Test/comp/ExternCtors-externs/Class.java
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Class.java
@@ -2,7 +2,7 @@
 
 import java.math.BigInteger;
 
-public class Class extends _ExternBase_Class {
+public class Class {
     private final BigInteger n;
 
     public Class(BigInteger n) {
diff --git a/Test/comp/ExternCtors-externs/Library.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Library.cs
similarity index 100%
rename from Test/comp/ExternCtors-externs/Library.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Library.cs
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Library.go b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Library.go
new file mode 100644
index 00000000000..2bcbd00321c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Library.go
@@ -0,0 +1,25 @@
+// FIXME: Test currently fails on Go
+
+package Library
+
+import (
+	"dafny"
+	"fmt"
+)
+
+type Class struct{ n dafny.Int }
+
+func New_Class_(n dafny.Int) *Class {
+	return &Class{n}
+}
+
+func (obj *Class) Get() dafny.Int {
+	return obj.n
+}
+
+type CompanionStruct_Class_ struct{}
+var Companion_Class_ = CompanionStruct_Class_{}
+
+func (CompanionStruct_Class_) SayHi() {
+	fmt.Println("Hello!");
+}
diff --git a/Test/comp/ExternCtors-externs/Library.js b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Library.js
similarity index 100%
rename from Test/comp/ExternCtors-externs/Library.js
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Library.js
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Library.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Library.py
new file mode 100644
index 00000000000..219b6d1836c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors-externs/Library.py
@@ -0,0 +1,19 @@
+import sys
+
+import module_
+import _dafny
+import System_
+
+assert "Library" == __name__
+Library = sys.modules[__name__]
+
+class Class:
+    def __init__(self, n) -> None:
+        self.n = n
+
+    @staticmethod
+    def SayHi():
+        print("Hello!")
+
+    def Get(self):
+        return self.n
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors.dfy
new file mode 100644
index 00000000000..e3cacf6ee6a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors.dfy
@@ -0,0 +1,23 @@
+// RUN: %run --target cs "%s" --input %S/ExternCtors-externs/Library.cs > "%t"
+// RUN: %run --target java "%s" --input %S/ExternCtors-externs/Class.java >> "%t"
+// RUN: %run --target py "%s" --input %S/ExternCtors-externs/Library.py >> "%t"
+// RUN: %run --target go "%s" --input %S/ExternCtors-externs/Library.go >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// FIXME: Extern constructors are currently broken in JavaScript,
+// so that is omitted
+
+method Main() {
+  Library.Class.SayHi();
+  var obj := new Library.Class(42);
+  print "My value is ", obj.Get(), "\n";
+}
+
+module {:extern "Library"} Library {
+  class {:extern} Class {
+    constructor {:extern} (n: int)
+    static method {:extern} SayHi()
+    function {:extern} Get() : int
+  }
+}
+
diff --git a/Test/comp/ExternCtors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors.dfy.expect
similarity index 75%
rename from Test/comp/ExternCtors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors.dfy.expect
index ce258f458fa..ef9433efad1 100644
--- a/Test/comp/ExternCtors.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternCtors.dfy.expect
@@ -10,3 +10,7 @@ My value is 42
 Dafny program verifier finished with 1 verified, 0 errors
 Hello!
 My value is 42
+
+Dafny program verifier finished with 1 verified, 0 errors
+Hello!
+My value is 42
diff --git a/Test/comp/ExternDLL.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDLL.dfy
similarity index 92%
rename from Test/comp/ExternDLL.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDLL.dfy
index 08c53152e67..f7b370db2cd 100644
--- a/Test/comp/ExternDLL.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDLL.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny build --target=cs %args "%s" %S/ExternDLL2.cs %S/ExternHelloLibrary.dll > "%t"
+// RUN: %baredafny build --target=cs %args --allow-external-contracts "%s" %S/ExternDLL2.cs %S/ExternHelloLibrary.dll > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Main() {
diff --git a/Test/dafny0/NoTypeArgs.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDLL.dfy.expect
similarity index 100%
rename from Test/dafny0/NoTypeArgs.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDLL.dfy.expect
diff --git a/Test/comp/ExternDLL2.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDLL2.cs
similarity index 100%
rename from Test/comp/ExternDLL2.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDLL2.cs
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDafnyString.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDafnyString.dfy
new file mode 100644
index 00000000000..feb18533bfa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDafnyString.dfy
@@ -0,0 +1,26 @@
+// RUN: %run --target java "%s" --input %S/Conversions.java --input %S/ExternDafnyString.java > "%t"
+// RUN: %diff "%s.expect" "%t"
+// In this example, the extern method obtains a Java string and returns it as a Dafny string.
+
+class {:extern "java.lang.String"} JavaString {
+  ghost const value: string
+}
+
+method {:extern "dafny.ExternDafnyString", "getStringFromFile"} GetStringFromFile() returns (s: string)
+
+method Main() {
+  var s := GetStringFromFile();
+
+  var previousStart := 0;
+  for i := 0 to |s|
+    invariant previousStart <= i
+  {
+    if s[i] == '/' {
+      print s[previousStart..i], "\n";
+      previousStart := i + 1;
+    }
+  }
+  if previousStart != |s| {
+    print s[previousStart..], "\n";
+  }
+}
diff --git a/Test/comp/ExternDafnyString.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDafnyString.dfy.expect
similarity index 100%
rename from Test/comp/ExternDafnyString.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDafnyString.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDafnyString.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDafnyString.java
new file mode 100644
index 00000000000..eba00949847
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternDafnyString.java
@@ -0,0 +1,10 @@
+package dafny;
+
+public class ExternDafnyString {
+    public static dafny.DafnySequence<? extends CodePoint> getStringFromFile() {
+        // Let's pretend the following is read from a file:
+        String js = "this is some possible / text that / may have come from a file";
+        // Convert this Java string to a Dafny string before returning:
+        return dafny.DafnySequence.asUnicodeString(js);
+    }
+}
\ No newline at end of file
diff --git a/Test/comp/ExternHelloLibrary.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternHelloLibrary.cs
similarity index 100%
rename from Test/comp/ExternHelloLibrary.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternHelloLibrary.cs
diff --git a/Test/comp/ExternHelloLibrary.dll b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternHelloLibrary.dll
similarity index 100%
rename from Test/comp/ExternHelloLibrary.dll
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternHelloLibrary.dll
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternJavaString.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternJavaString.dfy
new file mode 100644
index 00000000000..c12e701c271
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternJavaString.dfy
@@ -0,0 +1,37 @@
+// RUN: %run --target java "%s" --input %S/Conversions.java --input %S/ExternJavaString.java > "%t"
+// RUN: %diff "%s.expect" "%t"
+// In this example, the extern method obtains a Java string and returns it as such.
+// The Dafny code converts that Java string to a Dafny string.
+
+class {:extern "java.lang.String"} JavaString {
+  ghost const value: string
+}
+
+// Note, the following has to be a method, not a function, because the reference it
+// returns is not determined functionally from the input argument.
+method {:axiom} {:extern "Util.Conversions", "ToJavaString"} ToJavaString(s: string) returns (js: JavaString)
+  ensures js.value == s
+
+// The conversion this way can be a function.
+function {:axiom} {:extern "dafny.DafnySequence", "asUnicodeString"} ToDafnyString(js: JavaString): string
+  ensures ToDafnyString(js) == js.value
+
+method {:axiom} {:extern "dafny.ExternJavaString", "getStringFromFile"} GetStringFromFile() returns (js: JavaString)
+
+method Main() {
+  var js := GetStringFromFile();
+  var s := ToDafnyString(js);
+
+  var previousStart := 0;
+  for i := 0 to |s|
+    invariant previousStart <= i
+  {
+    if s[i] == '/' {
+      print s[previousStart..i], "\n";
+      previousStart := i + 1;
+    }
+  }
+  if previousStart != |s| {
+    print s[previousStart..], "\n";
+  }
+}
diff --git a/Test/comp/ExternJavaString.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternJavaString.dfy.expect
similarity index 100%
rename from Test/comp/ExternJavaString.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternJavaString.dfy.expect
diff --git a/Test/comp/ExternJavaString.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternJavaString.java
similarity index 100%
rename from Test/comp/ExternJavaString.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternJavaString.java
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternNestedModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternNestedModule.dfy
new file mode 100644
index 00000000000..ecddd019e0b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternNestedModule.dfy
@@ -0,0 +1,11 @@
+// RUN: %run --target py "%s" --input %S/ExternNestedModule.py > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main(){
+    print Library.THREE, "\n";
+}
+
+module {:extern "Nested.Library"} Library {
+    const THREE := TWO + 1
+    const TWO: int
+}
diff --git a/Test/comp/ExternNestedModule.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternNestedModule.dfy.expect
similarity index 100%
rename from Test/comp/ExternNestedModule.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternNestedModule.dfy.expect
diff --git a/Test/comp/ExternNestedModule.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternNestedModule.py
similarity index 89%
rename from Test/comp/ExternNestedModule.py
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternNestedModule.py
index 2c3b8828f57..26730cf8172 100644
--- a/Test/comp/ExternNestedModule.py
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ExternNestedModule.py
@@ -1,7 +1,7 @@
 import sys
 import _dafny
 
-assert "Nested.Library" == __name__
+# Module: Nested.Library
 
 class default__:
     def  __init__(self):
diff --git a/Test/comp/ForLoops-Compilation.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForLoops-Compilation.dfy
similarity index 98%
rename from Test/comp/ForLoops-Compilation.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForLoops-Compilation.dfy
index b468d21f69f..460a06a8cf0 100644
--- a/Test/comp/ForLoops-Compilation.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForLoops-Compilation.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
 
 method Main() {
   TestM(0, 0);
diff --git a/Test/comp/ForLoops-Compilation.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForLoops-Compilation.dfy.expect
similarity index 100%
rename from Test/comp/ForLoops-Compilation.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForLoops-Compilation.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForLoops-Compilation.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForLoops-Compilation.dfy.rs.check
new file mode 100644
index 00000000000..c17262a423d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForLoops-Compilation.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>ForLoops</i>.*
\ No newline at end of file
diff --git a/Test/comp/Forall.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Forall.dfy
similarity index 95%
rename from Test/comp/Forall.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Forall.dfy
index a8e910ac35b..8c7197ba349 100644
--- a/Test/comp/Forall.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Forall.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 method Main() {
   var arrayTests := new ArrayTests();
@@ -9,6 +9,8 @@ method Main() {
 
   var objectTests := new ObjectTests();
   objectTests.Run();
+
+  ForallWithNewtype.Test();
 }
 
 class ArrayTests {
@@ -346,3 +348,19 @@ class ObjectTests {
     Report(); // [(3, 1.0), (4, 2.0), (5, 3.0)];
   }
 }
+
+module ForallWithNewtype {
+  predicate P(x: int) {
+    x != 11
+  }
+
+  newtype MyInt = x: int | -2 <= x < 16 && P(x)
+
+  method Test() {
+    var a := new int[20];
+    forall i: MyInt | 5 <= i && i as int < a.Length {
+      a[i] := i as int;
+    }
+    print "\n", a[..], "\n"; // [0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 10, 0, 12, 13, 14, 15, 0, 0, 0, 0]
+  }
+}
diff --git a/Test/comp/Forall.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Forall.dfy.expect
similarity index 92%
rename from Test/comp/Forall.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Forall.dfy.expect
index 5b33d939607..af37aadf485 100644
--- a/Test/comp/Forall.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Forall.dfy.expect
@@ -40,3 +40,5 @@ Objects: Functions
 [(2, 1.0), (4, 2.0), (6, 3.0)]
 [(2, 1.0), (3, 2.0), (3, 3.0)]
 [(3, 1.0), (4, 2.0), (5, 3.0)]
+
+[0, 0, 0, 0, 0, 5, 6, 7, 8, 9, 10, 0, 12, 13, 14, 15, 0, 0, 0, 0]
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Forall.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Forall.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Forall.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/comp/ForallNewSyntax.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForallNewSyntax.dfy
similarity index 98%
rename from Test/comp/ForallNewSyntax.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForallNewSyntax.dfy
index 85e609b37b3..3622378c137 100644
--- a/Test/comp/ForallNewSyntax.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForallNewSyntax.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --function-syntax:3 --quantifier-syntax:4 --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --function-syntax:3 --quantifier-syntax:4 --relax-definite-assignment
 
 method Main() {
   var arrayTests := new ArrayTests();
diff --git a/Test/comp/ForallNewSyntax.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForallNewSyntax.dfy.expect
similarity index 100%
rename from Test/comp/ForallNewSyntax.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForallNewSyntax.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForallNewSyntax.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForallNewSyntax.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/ForallNewSyntax.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GeneralNewtypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GeneralNewtypes.dfy
new file mode 100644
index 00000000000..9bd1467a018
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GeneralNewtypes.dfy
@@ -0,0 +1,661 @@
+// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --type-system-refresh=true --general-newtypes=true
+
+method Main() {
+  Numerics.Test();
+  SimpleBoolAndint.Test();
+  TrivialConstraint.Test();
+  BaseTypesThatAreSubsetTypes.Test();
+  TypeDescriptors.Test();
+  PrintChars.Test();
+  Bitvectors.Test();
+  SubsetTypeIsTests.Test();
+  NewtypeIsTests.Test();
+  NewBehaviors.Test();
+  TypeParameters.Test();
+  AutoInit.Test();
+  RefinementB.Test(2.0, 3.0);
+  SimpleNewtypeWitness.Test();
+}
+
+module Numerics {
+  newtype i32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+
+  newtype j32 = i32
+
+  newtype k32 = j: j32 | true
+
+  newtype nn = x: int | 0 <= x
+  newtype byte = n: nn | n < 256
+
+  method Test() {
+    var i: i32 := 100;
+    var j: j32 := 100;
+
+    print i, " ", j, "\n"; // 100 100
+    print i == i, " ", j == j, "\n"; // true true
+    print i == j as i32, " ", i as j32 == j, "\n"; // true true
+    print i as int == j as int, "\n"; // true
+
+    var k: k32 := 99;
+    var n: nn := 99;
+    var b: byte := 99;
+
+    print k, " ", n, " ", b, "\n"; // 99 99
+    print k == k, " ", n == n, " ", b == b, "\n"; // true true true
+    print k == n as k32, " ", n == b as nn, " ", b == k as byte, "\n"; // true true true
+  }
+}
+
+module SimpleBoolAndint {
+  export
+    provides Test
+
+  newtype MyBool = bool
+  newtype MyInt = int
+
+  method M(x: MyBool) returns (y: MyBool)
+  {
+    y := x;
+    var z := x && !x ==> x;
+    assert z;
+  }
+
+  method Test() {
+    var b: MyBool := true;
+    var c := M(b);
+    var d: bool := c as bool;
+    var e := M((2 < 19 < 17 < 19 <==> true as bool) as MyBool);
+    var f := M((2 < 19 < 17 < 19 <==> true) as MyBool);
+    var g := M(2 < 19 < 17 < 19);
+    print b, " ", c, " ", e, " ", f, " ", g, "\n"; // true true false false false
+    TestMore();
+    Operators(true);
+  }
+
+  method TestMore() {
+    var b: bool;
+    var c: MyBool;
+    c := b as MyBool;
+    b := c as bool;
+
+    var x: int;
+    var y: MyInt;
+    y := x as MyInt;
+    x := y as int;
+
+    print b, " ", c, " ", x, " ", y, "\n"; // false false 0 0
+
+    b := x as MyInt == y;
+    c := x == y as int;
+    print b, " ", c, "\n"; // true true
+
+    b := x as MyInt < y;
+    c := x < y as int;
+    print b, " ", c, "\n"; // false false
+  }
+
+  method Operators(b: MyBool) {
+    print b == b && !(b != b) && (b <==> b) && (b ==> b) && (!b ==> b) && (b <== b) && (b <== !b) && (b && b) && (b || b), "\n"; // true
+  }
+}
+
+module TrivialConstraint {
+  export
+    provides Test
+
+  newtype MyBool = b: bool | true
+  newtype MyInt = int
+
+  method M(x: MyBool) returns (y: MyBool)
+  {
+    y := x;
+    var z := x && !x ==> x;
+    assert z;
+  }
+
+  method Test() {
+    var b: MyBool := true;
+    var c := M(b);
+    var d: bool := c as bool;
+    var e := M((2 < 19 < 17 < 19 <==> true as bool) as MyBool);
+    var f := M((2 < 19 < 17 < 19 <==> true) as MyBool);
+    var g := M(2 < 19 < 17 < 19);
+    print b, " ", c, " ", e, " ", f, " ", g, "\n"; // true true false false false
+    TestMore();
+    Operators(true);
+  }
+
+  method TestMore() {
+    var b: bool;
+    var c: MyBool;
+    c := b as MyBool;
+    b := c as bool;
+
+    var x: int;
+    var y: MyInt;
+    y := x as MyInt;
+    x := y as int;
+
+    print b, " ", c, " ", x, " ", y, "\n"; // false false 0 0
+
+    b := x as MyInt == y;
+    c := x == y as int;
+    print b, " ", c, "\n"; // true true
+
+    b := x as MyInt < y;
+    c := x < y as int;
+    print b, " ", c, "\n"; // false false
+  }
+
+  method Operators(b: MyBool) {
+    print b == b && !(b != b) && (b <==> b) && (b ==> b) && (!b ==> b) && (b <== b) && (b <== !b) && (b && b) && (b || b), "\n"; // true
+  }
+}
+
+module BaseTypesThatAreSubsetTypes {
+  type X = x: int | true
+  type Y = y: X | true
+
+  newtype A = a: int | true
+  newtype B = b: A | true
+
+  newtype M = m: X | true
+  newtype N = n: Y | true
+
+  method Test() {
+    var w: int := 99;
+
+    var x: X := 100;
+    var y: Y := 101;
+    
+    var a: A := 102;
+    var b: B := 103;
+
+    var m: M := 104;
+    var n: N := 105;
+
+    print w + x + y + a as int + b as int + m as X + n as X, "\n"; // 714
+  }
+}
+
+module Char {
+  newtype MyChar = char
+  newtype UpperCase = ch | 'A' <= ch <= 'Z' witness 'D'
+
+  method Test() {
+    var c, u, r := Comparisons();
+    print c, " ", u, " ", r, "\n"; // 'e' 'E' true
+    MyString([u, u, u]);
+    MyString("hello");
+    Mix();
+    GoodOl'Char('B');
+  }
+  
+  method Comparisons() returns (c: MyChar, u: UpperCase, r: bool) {
+    c := 'e';
+    u := 'E';
+
+    expect c == c;
+    expect !(u != u);
+
+    r := c < c;
+    expect !r;
+    r := c <= c;
+    expect r;
+    r := c >= c;
+    expect r;
+    r := c > c;
+    expect !r;
+
+    r := u <= u <= u;
+    expect r;
+
+    if c == 'f' && u == 'D' {
+      expect false;
+    }
+  }
+
+  method MyString(s: seq<UpperCase>) {
+    if s != [] {
+      var ch := s[|s| / 2];
+      var charDiff := ch as char - 'A' + 'B';
+      expect ch == 'Z' || (charDiff as UpperCase > ch);
+      expect charDiff as int == ch as char as int + 1;
+      print ch, " ", charDiff, "\n";
+    }
+  }
+
+  newtype MyBool = bool
+  newtype MyInt = int
+
+  method Mix() {
+    var c: MyChar := 'A';
+    var u: UpperCase := 'B';
+    var one: MyInt := 1;
+
+    var b: MyBool := (u as MyChar - c) as char == one as int as char;
+    // Note, in the following line, `[c]` prints as "['A']", not just "A", because the type is not seq<char> but seq<MyChar>
+    print [c], " ", u, " ", one, " ", b, "\n"; // ['A'] 'B' 1 true
+  }
+  
+  method GoodOl'Char(ch: char)
+    requires 'A' <= ch < 'Z'
+  {
+    print ch, " "; // 'B'
+
+    var c0 := ch as char;
+    var c1 := c0 - 'A';
+    var charDiff := c1 + 'B';
+    print charDiff, " "; // 'C'
+
+    var uc := charDiff as char;
+    print uc, " "; // 'C'
+
+    print uc > ch, "\n"; // true
+  }
+}
+
+module TypeDescriptors {
+  newtype UpperCase = ch | 'A' <= ch <= 'Z' witness 'F'
+  newtype MyInt = x: int | true witness 365
+  newtype Word = x: int | -3 <= x < 0x8000_0000 witness 400
+  type SubChar = ch | 'a' <= ch <= 'z' witness 'g'
+
+  method Test() {
+    var d0, y0 := P<char>('a', 'a', 'A', 3, 4, 5, 'b');
+    var d1, y1 := P<UpperCase>('A', 'a', 'A', 3, 4, 5, 'b');
+    var d2, y2 := P<int>(3, 'a', 'A', 3, 4, 5, 'b');
+    var d3, y3 := P<MyInt>(4, 'a', 'A', 3, 4, 5, 'b');
+    var d4, y4 := P<Word>(5, 'a', 'A', 3, 4, 5, 'b');
+    var d5, y5 := P<SubChar>('b', 'a', 'A', 3, 4, 5, 'b');
+
+    print "(";
+    print d0, " ", y0, ") (";
+    print d1, " ", y1, ") (";
+    print d2, " ", y2, ") (";
+    print d3, " ", y3, ") (";
+    print d4, " ", y4, ") (";
+    print d5, " ", y5, ")\n";
+  }
+
+  method P<X(0)>(x: X, ch: char, uc: UpperCase, i: int, m: MyInt, w: Word, s: SubChar) returns (d: X, y: X) {
+    print ch, " ", uc, " ", i, " ", m, " ", w, " ", s, " -- ", x, "\n";
+    d, y := *, x;
+  }
+}
+
+module PrintChars {
+  newtype MyChar = char
+
+  method Test() {
+    var ch: char := 'c';
+    var my: MyChar := 'm';
+
+    print ch, " ", my, "\n"; // 'c' 'm'
+    Print(ch, my);
+  }
+
+  method Print<X, Y>(x: X, y: Y) {
+    print x, " ", y, "\n"; // 'c' 'm'
+  }
+}
+
+module Bitvectors {
+  newtype BV = b: bv5 | b != 23
+  newtype Word = bv32
+  newtype Big = b: bv1024 | true
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+  newtype MyReal = r: real | true
+
+  datatype Color = Blue | Yellow
+  trait RefTrait extends object { }
+  class MyClass extends RefTrait { }
+
+  type Subset = b: bv5 | b != 23
+
+  method Test() {
+    IntermediateExpressions();
+    var _, _ := Operations(7, 0x1234_abcd, -6);
+    Overflows();
+    var _ := Shift(18, 1, 2, 3);
+    var _, _ := Rotate(18, 2, 2, 3);
+    BvZero(0);
+    var _, _, _, _, _, _, _, _, _ := TestsAndConversions();
+
+    var size := Comprehensions({9, 11}, {3}, {200, 190, 191}, {17} + {18});
+    print size, "\n"; // 8
+  }
+
+  method IntermediateExpressions() {
+    var fem: bv5 := 5;
+    var sju: Subset := 4 + 3;
+    var nio: BV := 1 + 8;
+
+    assert fem == 5 && sju == 7 && nio == 9;
+    print fem, sju, nio, "\n"; // 579
+  }
+
+  method Operations(x: BV, y: Word, z: Big) returns (r: bool, s: BV) {
+    // ==
+    r := x == x;
+    r := y == y;
+    r := z == z;
+
+    r := x == 5;
+
+    // + - * / %
+    if x != 0 {
+      s := x + x - x * (x / x - x % x);
+      print s, " ";
+    }
+    if 3 <= x < 8 {
+      s := 12 + x - (x + 19 / 17 - x % 3);
+      print s, " ";
+    }
+    s := 12 + 13 - 14 * (15 + 16 / 17 - 18 % 19);
+    print s, " ";
+
+    // & | ^
+    s := (x & x) | (x ^ x ^ x);
+    print s, " "; // 7
+    s := (12 & 13) | (14 ^ 15 ^ 16);
+    print s, " ";
+
+    // < <= >= >
+    r := (x <= x && x < x) || x >= x || x > x;
+    print r, "\n"; // true
+
+    if !(x as bv5) != 23 {
+      print "one's complement: ", !x, " ", !y, " ", !z, " "; // 24 3989525554 5
+      print !(5 as bv7), " ", !(5 as bv3), " ", !(5 as bv8), "\n"; // 122 2 250
+    }
+    if -(x as bv5) != 23 {
+      print "two's complement: ", -x, " ", -y, " ", -z, " "; // 25 3989525555 6
+      print -(5 as bv7), " ", -(5 as bv3), " ", -(5 as bv8), "\n"; // 123 3 251
+    }
+
+    print "== bv: ", x == x, " ", y == y, " ", (5 as bv5) == (5 as BV) as bv5, " ", (4 as bv325) == (4 as bv325), "\n"; // true true true true
+    print "== int: ", 5 == 5, " ", (5 as int32) == (5 as BV) as int32, " ", (5 as int32) == (5 as int32), "\n"; // true true true
+    print "== real: ", 5.0 == 5.0, " ", (5.0 as MyReal) == (5.0 as MyReal), "\n"; // true true
+    print "!= bv: ", x != x, " ", y != y, " ", (5 as bv5) != (5 as BV) as bv5, " ", (4 as bv325) != (4 as bv325), "\n"; // false false false false
+    print "!= int: ", 5 != 5, " ", (5 as int32) != (5 as BV) as int32, " ", (5 as int32) != (5 as int32), "\n"; // false false false
+    print "!= real: ", 5.0 != 5.0, " ", (5.0 as MyReal) != (5.0 as MyReal), "\n"; // false false
+    print "<= bv: ", x <= x, " ", y <= y, " ", (5 as bv5) <= (5 as BV) as bv5, " ", (4 as bv325) <= (4 as bv325), "\n"; // true true true true
+    print "<= int: ", 5 <= 5, " ", (5 as int32) <= (5 as BV) as int32, " ", (5 as int32) <= (5 as int32), "\n"; // true true true
+    print "<= real: ", 5.0 <= 5.0, " ", (5.0 as MyReal) <= (5.0 as MyReal), "\n"; // true true
+
+    var c0, c1 := new MyClass, new MyClass;
+    var col0, col1, col2 := Blue, Yellow, Yellow;
+    print "== class: ", c0 == c1, " ", c0 == c0, " / "; // false true /
+    print (c0 as RefTrait) == (c1 as RefTrait), " ", (c0 as RefTrait) == (c0 as RefTrait), " / "; // false true /
+    print (c0 as object) == (c1 as object), " ", (c0 as object) == (c0 as object), " ", (c0 as object) != (c0 as object), "\n"; // false true false
+    print "== datatype: ", col0 == col1, " ", col1 == col2, " ", col2 == col2, " ", col1 != col2, "\n"; // false true true false
+  }
+
+  method Overflows()
+  {
+// SOON or never:
+//    print (18 as bv5) + 19, " ", (18 as bv5) - 19, " ", (18 as bv5) * 19, "\n"; // 5 31 22 // TODO: Go complains about the overflow here
+    var x: BV := 18;
+    var x' := x + 1;
+    print x + x', " ", x - x', " ", x * x', "\n"; // 5 31 22
+
+// SOON or never:
+//    print (0x8000_0002 as bv32) + 0x8000_0003, " "; // 5
+//    print (0x8000_0002 as bv32) - 0x8000_0003, " "; // 4294967295
+//    print (0x8000_0002 as bv32) * 0x8000_0003, "\n"; // 2147483654
+    var w: Word := 0x8000_0002;
+    var w' := w + 1;
+    print w + w', " ", w - w', " ", w * w', "\n"; // 5 4294967295 2147483654
+  }
+
+  method Shift(x: BV, y: Word, b: bv32, i: int) returns (s: BV)
+    requires 0 <= y < 5 && 0 <= b < 5 && 0 <= i < 5
+  {
+    var si: bv5 := (18 as bv5) << 1;
+    print si, " "; // 4
+    s := x << y;
+    print s, " "; // 4
+    s := x >> b;
+    print s, " "; // 4
+    s := x << i;
+    print s, "\n"; // 16
+  }
+  
+  method Rotate(x: BV, i: int, b: bv32, j: int32) returns (s: BV, a: bv5)
+    requires 0 <= b < 5 && 0 <= i < 5 && 0 <= j < 5
+  {
+    a := x.RotateLeft(i);
+    print a, " "; // 10
+    
+    a := x.RotateRight(b as int);
+    print a, " "; // 20
+
+    a := x.RotateRight(j as nat);
+    print a, " "; // 10
+    expect a == 10;
+    s := x.RotateRight(j as nat) as BV;
+    print s, "\n"; // 10
+  }
+
+  method BvZero(b: bv0) {
+    var c: bv0 := *;
+
+    print b + c, b - c, b * c, " ", !b, " ", -b, "\n"; // 000 0 0
+    print b == c, " ", b != c, " ", b <= c, " ", b < c, " ", b >= c, " ", b > c, "\n"; // true false true false true false
+    print b & c, b | c, b ^ c, " ", b << c, b << 0, b << 0 as int32, " ", b >> c, b >> 0, b >> 0 as int32, "\n"; // 000 000 000
+    print b.RotateLeft(0), " ", b.RotateRight(0), " -- ", 0 as bv0, b as int, 0 as int32 as bv0, "\n"; // 0 0 -- 000
+  }
+
+  method TestsAndConversions() returns (x: BV, y: Word, z: Big, a: bv5, b: bv32, c: bv1024, i: int, j: int32, r: bool) {
+    x := 10;
+    x := x;
+  
+    r := y is Word;
+
+    x := 10 as BV;
+    x := x as BV;
+    x := (if y < 20 then y else 2) as BV;
+    print x, " "; // 0
+    if a != 23 {
+      x := a as BV;
+    }
+
+    b := 25;
+    x := ((b & 0xF) * 2) as BV;
+    print x, " "; // 18
+    print (x as int as bv5) == x as bv5, "\n"; // true
+
+    if 0 <= i <= j as int < 23 {
+      x := i as BV;
+      x := j as BV;
+    }
+
+    r := 10 is bv5;
+    r := x is bv5;
+    r := y is bv5;
+    r := z is bv5;
+    r := a is bv5;
+    r := b is bv5;
+    r := c is bv5;
+    r := i is bv5;
+    r := j is bv5;
+  }
+
+  newtype Bits = b: bv109 | Predicate(b)
+
+  predicate Predicate(x: bv109) {
+    true
+  }
+
+  method Comprehensions(aa: set<bv7>, bb: set<BV>, cc: set<Word>, dd: set<Bits>) returns (size: nat) {
+    var se0, se1, se2, se3;
+    se0 := set x | x in aa;
+    se1 := set x | x in bb;
+    se2 := set x | x in cc;
+    se3 := set x | x in dd;
+    return |se0| + |se1| + |se2| + |se3|;
+  }
+}
+
+module SubsetTypeIsTests {
+  type BV = b: bv5 | b != 23
+  type Word = bv32
+  type Big = b: bv1024 | true
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+
+  datatype Color = Blue | Yellow
+  trait RefTrait extends object { }
+  class MyClass extends RefTrait { }
+
+  type Subset = b: bv5 | b != 23
+
+  method Test() {
+    TestsAndConversions(0, 0, 0, 0, 0, 0, 0, 0);
+    TestsAndConversions(24, 23, 23, 23, 23, 23, 23, 23);
+    TestsAndConversions(24, 99, 99, 24, 99, 99, 99, 99);
+    print "done\n";
+  }
+
+  method TestsAndConversions(x: BV, y: Word, z: Big, a: bv5, b: bv32, c: bv1024, i: int, j: int32) {
+    print " ", 10 is bv5;
+    print " ", x is bv5;
+    print " ", y is bv5;
+    print " ", z is bv5;
+    print " ", a is bv5;
+    print " ", b is bv5;
+    print " ", c is bv5;
+    print " ", i is bv5;
+    print " ", j is bv5;
+    print "\n";
+  }
+}
+
+
+module NewtypeIsTests {
+  newtype BV = b: bv5 | b != 23
+  newtype Word = bv32
+  newtype Big = b: bv1024 | true
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+
+  datatype Color = Blue | Yellow
+  trait RefTrait extends object { }
+  class MyClass extends RefTrait { }
+
+  type Subset = b: bv5 | b != 23
+
+  method Test() {
+    TestsAndConversions(0, 0, 0, 0, 0, 0, 0, 0);
+    TestsAndConversions(24, 23, 23, 23, 23, 23, 23, 23);
+    TestsAndConversions(24, 99, 99, 24, 99, 99, 99, 99);
+    print "done\n";
+  }
+
+  method TestsAndConversions(x: BV, y: Word, z: Big, a: bv5, b: bv32, c: bv1024, i: int, j: int32) {
+    print " ", 10 is bv5;
+    print " ", x is bv5;
+    print " ", y is bv5;
+    print " ", z is bv5;
+    print " ", a is bv5;
+    print " ", b is bv5;
+    print " ", c is bv5;
+    print " ", i is bv5;
+    print " ", j is bv5;
+    print "\n";
+  }
+}
+
+module NewBehaviors {
+  newtype MyBool = bool
+  newtype Word = bv32
+
+  method Test() {
+    TestIs(false, 0x4_0000_0000);
+  }
+
+  method TestIs(b: bool, x: int)
+    requires !b && 0x1_0000_0000 <= x
+  {
+    var mIs: MyBool := b is MyBool;
+    var mAs: MyBool := b as MyBool;
+    var w0: bool := (x % 1000) is Word;
+    var w1: MyBool := x is Word;
+
+    print mIs, " ", mAs, " ", w0, " ", w1, "\n"; // true false true false
+  }
+}
+
+module TypeParameters {
+  newtype Wrapper<G> = g: G | true witness *
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+
+  method Test() {
+    var b: Wrapper<bool>;
+    b := true ==> false;
+    var i: Wrapper<Wrapper<int>>;
+    i := Wrap3(25) as Wrapper<Wrapper<int>>;
+    var j: Wrapper<Wrapper<Wrapper<int32>>>;
+    j := Wrap3(30);
+    print b, " ", i, " ", j, "\n"; // false 25 30
+
+    print Unwrap3(j) < 2, " "; // false
+    print Unwrap3(j) < 32, " | "; // true |
+    var w: int32 := 299;
+    b := Unwrap3(j) < w;
+    print b, "\n"; // true
+  }
+
+  function Wrap3(x: int32): Wrapper<Wrapper<Wrapper<int32>>> {
+    x as Wrapper<int32> as Wrapper<Wrapper<int32>> as Wrapper<Wrapper<Wrapper<int32>>>
+  }
+
+  function Unwrap3(x: Wrapper<Wrapper<Wrapper<int32>>>): int32 {
+    x as Wrapper<Wrapper<int32>> as Wrapper<int32> as int32
+  }
+}
+
+module AutoInit {
+  newtype A<Unused> = x: int | 5 <= x witness 5
+  newtype B<Unused> = z: real | true
+  newtype Int32<Unused> = x | -0x8000_0000 <= x < 0x8000_0000 witness 7
+
+  newtype pos = x: int | 0 < x witness 19
+
+  method TestOne<X(0)>() {
+    var x: X := *;
+    print x, "\n";
+  }
+
+  method Test() {
+    TestOne<A<pos>>(); // 5
+    TestOne<B<pos>>(); // 0.0
+    TestOne<Int32<pos>>(); // 7
+  }
+}
+
+abstract module RefinementA {
+  type AbstractType
+  newtype NAT = AbstractType witness *
+  newtype NATx = x: AbstractType | true witness *
+
+  method Test(n: NAT, nx: NATx) {
+    print n, " ", nx, "\n";
+  }
+}
+
+module RefinementB refines RefinementA {
+  type AbstractType = real
+}
+
+module SimpleNewtypeWitness {
+  newtype A = x: int | 100 <= x witness 102
+  newtype B = a: A | true witness 103
+  newtype C = A witness 104
+
+  method Test() {
+    var a: A := *;
+    var b: B := *;
+    var c: C := *;
+    print a, " ", b, " ", c, "\n"; // 102 103 104
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GeneralNewtypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GeneralNewtypes.dfy.expect
new file mode 100644
index 00000000000..50bff3e3a2e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GeneralNewtypes.dfy.expect
@@ -0,0 +1,68 @@
+100 100
+true true
+true true
+true
+99 99 99
+true true true
+true true true
+true true false false false
+false false 0 0
+true true
+false false
+true
+true true false false false
+false false 0 0
+true true
+false false
+true
+714
+'a' 'A' 3 4 5 'b' -- 'a'
+'a' 'A' 3 4 5 'b' -- 'A'
+'a' 'A' 3 4 5 'b' -- 3
+'a' 'A' 3 4 5 'b' -- 4
+'a' 'A' 3 4 5 'b' -- 5
+'a' 'A' 3 4 5 'b' -- 'b'
+('D' 'a') ('F' 'A') (0 3) (365 4) (400 5) ('g' 'b')
+'c' 'm'
+'c' 'm'
+579
+7 12 3 7 29 true
+one's complement: 24 3989525554 5 122 2 250
+two's complement: 25 3989525555 6 123 3 251
+== bv: true true true true
+== int: true true true
+== real: true true
+!= bv: false false false false
+!= int: false false false
+!= real: false false
+<= bv: true true true true
+<= int: true true true
+<= real: true true
+== class: false true / false true / false true false
+== datatype: false true true false
+5 31 22
+5 4294967295 2147483654
+4 4 4 16
+10 20 10 10
+000 0 0
+true false true false true false
+000 000 000
+0 0 -- 000
+0 18 true
+8
+ true true true true true true true true true
+ true true true true true true true true true
+ true true false false true false false false false
+done
+ true true true true true true true true true
+ true true true true true true true true true
+ true true false false true false false false false
+done
+true false true false
+false 25 30
+false true | true
+5
+0.0
+7
+2.0 3.0
+102 103 104
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GeneralNewtypes.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GeneralNewtypes.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GeneralNewtypes.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/comp/Ghosts.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Ghosts.dfy
similarity index 93%
rename from Test/comp/Ghosts.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Ghosts.dfy
index 8afe8a36d3f..16d6a77a2cc 100644
--- a/Test/comp/Ghosts.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Ghosts.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
 
 method M1() returns (x: int)
 {
diff --git a/Test/comp/Ghosts.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Ghosts.dfy.expect
similarity index 100%
rename from Test/comp/Ghosts.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Ghosts.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GoEmptyParentModules.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GoEmptyParentModules.dfy
new file mode 100644
index 00000000000..a6eee07def1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/GoEmptyParentModules.dfy
@@ -0,0 +1,10 @@
+// RUN: %baredafny translate go %args %s
+// RUN: %OutputCheck --file-to-check %S/GoEmptyParentModules-go/src/GoEmptyParentModules.go "%s"
+// CHECK-NOT: "A"
+// CHECK-NOT: "A_B"
+
+module A.B.C {
+  method Main() {
+    print "Hi there!\n";
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Hello.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Hello.dfy
new file mode 100644
index 00000000000..9ffef759a57
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Hello.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+method Main() {
+    print "Hello, World! Best, Dafny\n";
+    var x := 14;
+    print "x is ", x, "\n";
+    var y := false;
+    print "y is ", y, "\n";
+}
diff --git a/Test/comp/Hello.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Hello.dfy.expect
similarity index 100%
rename from Test/comp/Hello.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Hello.dfy.expect
diff --git a/Test/comp/Iterators.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Iterators.dfy
similarity index 100%
rename from Test/comp/Iterators.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Iterators.dfy
diff --git a/Test/comp/Iterators.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Iterators.dfy.expect
similarity index 100%
rename from Test/comp/Iterators.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Iterators.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Iterators.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Iterators.dfy.rs.check
new file mode 100644
index 00000000000..5f4be69b267
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Iterators.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Builder not StatementContainer</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/JsModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/JsModule.dfy
new file mode 100644
index 00000000000..5cfa15e4d69
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/JsModule.dfy
@@ -0,0 +1,25 @@
+// NONUNIFORM: Javascript-specific extern test
+// RUN: %run --unicode-char false --target js "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// "url" is a built-in package in node, so it should be accessible to the
+// test suite without further requirements on the setup.
+module {:extern "url", "url"} URL {
+  class Url {
+    var host: string
+    var pathname: string
+    var search: string
+  }
+  // Note that passing a Dafny string directly as a JS string only works in --unicode-char false mode
+  method {:axiom} {:extern "parse"} Parse(address: string, b: bool) returns (u: Url)
+}
+
+method Main() {
+  var address := "http://localhost:8080/default.htm?year=1915&month=august&day=29";
+  var u := URL.Parse(address, true);
+  print "The address ", address, "\n";
+  print "has the following parts:\n";
+  print "host: ", u.host, "\n";
+  print "pathname: ", u.pathname, "\n";
+  print "search: ", u.search, "\n";
+}
diff --git a/Test/comp/JsModule.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/JsModule.dfy.expect
similarity index 100%
rename from Test/comp/JsModule.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/JsModule.dfy.expect
diff --git a/Test/comp/Let.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Let.dfy
similarity index 95%
rename from Test/comp/Let.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Let.dfy
index 2a639009c78..9d2a01a9a8f 100644
--- a/Test/comp/Let.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Let.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
 
 method M() returns (x: int) {
   x := var y := 50; y;  // non-top-level let
diff --git a/Test/comp/Let.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Let.dfy.expect
similarity index 100%
rename from Test/comp/Let.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Let.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Let.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Let.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Let.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/comp/LibClass.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/LibClass.java
similarity index 100%
rename from Test/comp/LibClass.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/LibClass.java
diff --git a/Test/comp/Libraries/Inputs/directLibrary.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/Inputs/directLibrary.dfy
similarity index 100%
rename from Test/comp/Libraries/Inputs/directLibrary.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/Inputs/directLibrary.dfy
diff --git a/Test/comp/Libraries/Inputs/indirectLibrary.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/Inputs/indirectLibrary.dfy
similarity index 100%
rename from Test/comp/Libraries/Inputs/indirectLibrary.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/Inputs/indirectLibrary.dfy
diff --git a/Test/comp/Libraries/Inputs/secondLibrary.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/Inputs/secondLibrary.dfy
similarity index 100%
rename from Test/comp/Libraries/Inputs/secondLibrary.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/Inputs/secondLibrary.dfy
diff --git a/Test/comp/Libraries/consumer.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/consumer.dfy
similarity index 78%
rename from Test/comp/Libraries/consumer.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/consumer.dfy
index efd3484bd6a..8603e432373 100644
--- a/Test/comp/Libraries/consumer.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/consumer.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /library:"%S/Inputs/directLibrary.dfy" /library:"%S/Inputs/secondLibrary.dfy" /compile:0 /spillTargetCode:3 "%s" > "%t"
+// RUN: %translate cs --allow-warnings --library "%S/Inputs/directLibrary.dfy" --library "%S/Inputs/secondLibrary.dfy" "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 // RUN: %OutputCheck "%s" --file-to-check="%S/consumer.cs"
 // CHECK: GloballyUniqueProducer
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/consumer.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/consumer.dfy.expect
new file mode 100644
index 00000000000..6908abf6374
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Libraries/consumer.dfy.expect
@@ -0,0 +1,4 @@
+CLI: Warning: The file 'directLibrary.dfy' was passed to --library. Verification for that file might have used options incompatible with the current ones, or might have been skipped entirely. Use a .doo file to enable Dafny to check that compatible options were used
+CLI: Warning: The file 'secondLibrary.dfy' was passed to --library. Verification for that file might have used options incompatible with the current ones, or might have been skipped entirely. Use a .doo file to enable Dafny to check that compatible options were used
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MainMethod.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MainMethod.dfy
new file mode 100644
index 00000000000..85692695e3a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MainMethod.dfy
@@ -0,0 +1,84 @@
+// NONUNIFORM: multiple testing scenarios (could be split into several uniform tests)
+// RUN: %verify "%s" > "%t"
+
+// RUN: %run --no-verify --main-method Cl.Static   --target cs "%s" >> "%t"
+// RUN: %run --no-verify --main-method Cl.Instance --target cs "%s" >> "%t"
+// RUN: %run --no-verify --main-method Tr.Static   --target cs "%s" >> "%t"
+// RUN: %run --no-verify --main-method Dt.Static   --target cs "%s" >> "%t"
+// RUN: %run --no-verify --main-method Dt.Instance --target cs "%s" >> "%t"
+// RUN: %run --no-verify --main-method Co.Static   --target cs "%s" >> "%t"
+// RUN: %run --no-verify --main-method Co.Instance --target cs "%s" >> "%t"
+// RUN: %run --no-verify --main-method Nt.Static   --target cs "%s" >> "%t"
+// RUN: %run --no-verify --main-method Nt.Instance --target cs "%s" >> "%t"
+
+// RUN: %run --no-verify --main-method Cl.Static   --target js "%s" >> "%t"
+// RUN: %run --no-verify --main-method Cl.Instance --target js "%s" >> "%t"
+// RUN: %run --no-verify --main-method Tr.Static   --target js "%s" >> "%t"
+// RUN: %run --no-verify --main-method Dt.Static   --target js "%s" >> "%t"
+// RUN: %run --no-verify --main-method Dt.Instance --target js "%s" >> "%t"
+// RUN: %run --no-verify --main-method Co.Static   --target js "%s" >> "%t"
+// RUN: %run --no-verify --main-method Co.Instance --target js "%s" >> "%t"
+// RUN: %run --no-verify --main-method Nt.Static   --target js "%s" >> "%t"
+// RUN: %run --no-verify --main-method Nt.Instance --target js "%s" >> "%t"
+
+// RUN: %run --no-verify --main-method Cl.Static   --target go "%s" >> "%t"
+// RUN: %run --no-verify --main-method Cl.Instance --target go "%s" >> "%t"
+// RUN: %run --no-verify --main-method Tr.Static   --target go "%s" >> "%t"
+// RUN: %run --no-verify --main-method Dt.Static   --target go "%s" >> "%t"
+// RUN: %run --no-verify --main-method Dt.Instance --target go "%s" >> "%t"
+// RUN: %run --no-verify --main-method Co.Static   --target go "%s" >> "%t"
+// RUN: %run --no-verify --main-method Co.Instance --target go "%s" >> "%t"
+// RUN: %run --no-verify --main-method Nt.Static   --target go "%s" >> "%t"
+// RUN: %run --no-verify --main-method Nt.Instance --target go "%s" >> "%t"
+
+// RUN: %run --no-verify --main-method Cl.Static   --target java "%s" >> "%t"
+// RUN: %run --no-verify --main-method Cl.Instance --target java "%s" >> "%t"
+// RUN: %run --no-verify --main-method Tr.Static   --target java "%s" >> "%t"
+// RUN: %run --no-verify --main-method Dt.Static   --target java "%s" >> "%t"
+// RUN: %run --no-verify --main-method Dt.Instance --target java "%s" >> "%t"
+// RUN: %run --no-verify --main-method Co.Static   --target java "%s" >> "%t"
+// RUN: %run --no-verify --main-method Co.Instance --target java "%s" >> "%t"
+// RUN: %run --no-verify --main-method Nt.Static   --target java "%s" >> "%t"
+// RUN: %run --no-verify --main-method Nt.Instance --target java "%s" >> "%t"
+
+// RUN: %run --no-verify --main-method Cl.Static   --target py "%s" >> "%t"
+// RUN: %run --no-verify --main-method Cl.Instance --target py "%s" >> "%t"
+// RUN: %run --no-verify --main-method Tr.Static   --target py "%s" >> "%t"
+// RUN: %run --no-verify --main-method Dt.Static   --target py "%s" >> "%t"
+// RUN: %run --no-verify --main-method Dt.Instance --target py "%s" >> "%t"
+// RUN: %run --no-verify --main-method Co.Static   --target py "%s" >> "%t"
+// RUN: %run --no-verify --main-method Co.Instance --target py "%s" >> "%t"
+// RUN: %run --no-verify --main-method Nt.Static   --target py "%s" >> "%t"
+// RUN: %run --no-verify --main-method Nt.Instance --target py "%s" >> "%t"
+
+// RUN: %diff "%s.expect" "%t"
+
+type plural = x | 2 <= x witness 2
+
+class Cl<X(0)> {
+  var p: plural
+  var c: real
+  var x: X
+  static method Static() { print "Cl: static\n"; }
+  method Instance() { print "Cl: ", p, " ", c, " ", x, "\n"; }
+}
+
+trait Tr<X> {
+  static method Static() { print "Tr: static\n"; }
+}
+
+datatype Dt<X> = Dt0(plural, X) | Dt1(real, X) {
+  static method Static() { print "Dt: static\n"; }
+  method Instance() { print "Dt: ", this, "\n"; }
+}
+
+codatatype Co<X> = CoMore(plural, X, Co) {
+  static method Static() { print "Co: static\n"; }
+  method Instance() { print "Co: ", this, "\n"; }
+}
+
+newtype Nt = x | -0x8000_0000 <= x <= 0x8000_0000 {
+  const c: plural
+  static method Static() { print "Nt: static\n"; }
+  method Instance() { print "Nt: ", this, " ", c, "\n"; }
+}
diff --git a/Test/comp/MainMethod.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MainMethod.dfy.expect
similarity index 100%
rename from Test/comp/MainMethod.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MainMethod.dfy.expect
diff --git a/Test/comp/Mixed.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Mixed.java
similarity index 100%
rename from Test/comp/Mixed.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Mixed.java
diff --git a/Test/comp/Module.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Module.dfy
similarity index 75%
rename from Test/comp/Module.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Module.dfy
index cb0c72272f8..145cce55d35 100644
--- a/Test/comp/Module.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Module.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 // Simple sanity test of nested modules
 module Parent {
diff --git a/Test/comp/Module.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Module.dfy.expect
similarity index 100%
rename from Test/comp/Module.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Module.dfy.expect
diff --git a/Test/comp/MoreAutoInit.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MoreAutoInit.dfy
similarity index 99%
rename from Test/comp/MoreAutoInit.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MoreAutoInit.dfy
index c72083f1be5..b708af6f7e2 100644
--- a/Test/comp/MoreAutoInit.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MoreAutoInit.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   Methods.TestStart();
diff --git a/Test/comp/MoreAutoInit.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MoreAutoInit.dfy.expect
similarity index 100%
rename from Test/comp/MoreAutoInit.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MoreAutoInit.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MoreAutoInit.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MoreAutoInit.dfy.rs.check
new file mode 100644
index 00000000000..7ba64d0e832
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/MoreAutoInit.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Coercion</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NativeNumbers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NativeNumbers.dfy
new file mode 100644
index 00000000000..25be5924113
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NativeNumbers.dfy
@@ -0,0 +1,382 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
+// Skip JavaScript because JavaScript doesn't have the same native types
+
+
+method Main() {
+  CastTests();
+  DefaultTests();
+  Int8Test();
+  Int16Test();
+  BvTests();
+  ZeroComparisonTests();
+}
+
+newtype {:nativeType "sbyte"} int8 = x | -0x80 <= x < 0x80
+newtype {:nativeType "short"} int16 = x | -0x8000 <= x < 0x8000
+newtype {:nativeType "int"} int32 = x : int | -0x8000_0000 <= x < 0x8000_0000
+newtype {:nativeType "long"} int64 = x : int | -0x8000_0000 <= x < 0x8000_0000_0000_0000
+
+newtype {:nativeType "byte"} uint8 = x : int | 0 <= x < 0x100
+newtype {:nativeType "ushort"} uint16 = x : int | 0 <= x < 0x10000
+newtype {:nativeType "uint"} uint32 = x : int | 0 <= x < 0x1_0000_0000
+newtype {:nativeType "ulong"} uint64 = x : int | 0 <= x < 0x1_0000_0000_0000_0000
+
+method CastTests() {
+  print "Casting:\n\n";
+
+  print "Small numbers:\n";
+  var i : int := 0;
+  print i as int, " ",
+    i as int8, " ", i as int16, " ", i as int32, " ", i as int64, " ",
+    i as uint8, " ", i as uint16, " ", i as uint32, " ", i as uint64, "\n";
+
+  var i8 : int8 := 1;
+  print i8 as int, " ",
+    i8 as int8, " ", i8 as int16, " ", i8 as int32, " ", i8 as int64, " ",
+    i8 as uint8, " ", i8 as uint16, " ", i8 as uint32, " ", i8 as uint64, "\n";
+
+  var i16 : int16 := 2;
+  print i16 as int, " ",
+    i16 as int8, " ", i16 as int16, " ", i16 as int32, " ", i16 as int64, " ",
+    i16 as uint8, " ", i16 as uint16, " ", i16 as uint32, " ", i16 as uint64, "\n";
+
+  var i32 : int32 := 3;
+  print i32 as int, " ",
+    i32 as int8, " ", i32 as int16, " ", i32 as int32, " ", i32 as int64, " ",
+    i32 as uint8, " ", i32 as uint16, " ", i32 as uint32, " ", i32 as uint64, "\n";
+
+  var i64 : int64 := 4;
+  print i64 as int, " ",
+    i64 as int8, " ", i64 as int16, " ", i64 as int32, " ", i64 as int64, " ",
+    i64 as uint8, " ", i64 as uint16, " ", i64 as uint32, " ", i64 as uint64, "\n";
+
+  var u8 : uint8 := 5;
+  print u8 as int, " ",
+    u8 as int8, " ", u8 as int16, " ", u8 as int32, " ", u8 as int64, " ",
+    u8 as uint8, " ", u8 as uint16, " ", u8 as uint32, " ", u8 as uint64, "\n";
+
+  var u16 : uint16 := 6;
+  print u16 as int, " ",
+    u16 as int8, " ", u16 as int16, " ", u16 as int32, " ", u16 as int64, " ",
+    u16 as uint8, " ", u16 as uint16, " ", u16 as uint32, " ", u16 as uint64, "\n";
+
+  var u32 : uint32 := 7;
+  print u32 as int, " ",
+    u32 as int8, " ", u32 as int16, " ", u32 as int32, " ", u32 as int64, " ",
+    u32 as uint8, " ", u32 as uint16, " ", u32 as uint32, " ", u32 as uint64, "\n";
+
+  var u64 : uint64 := 8;
+  print u64 as int, " ",
+    u64 as int8, " ", u64 as int16, " ", u64 as int32, " ", u64 as int64, " ",
+    u64 as uint8, " ", u64 as uint16, " ", u64 as uint32, " ", u64 as uint64, "\n";
+
+  print "\nLarge unsigned numbers:\n";
+  u8 := 0xff;
+  print u8 as int, " ",
+    u8 as int16, " ", u8 as int32, " ", u8 as int64, " ",
+    u8 as uint8, " ", u8 as uint16, " ", u8 as uint32, " ", u8 as uint64, "\n";
+
+  u16 := 0xffff;
+  print u16 as int, " ",
+    u16 as int32, " ", u16 as int64, " ",
+    u16 as uint16, " ", u16 as uint32, " ", u16 as uint64, "\n";
+
+  u32 := 0xffff_ffff;
+  print u32 as int, " ",
+    u32 as int64, " ",
+    u32 as uint32, " ", u32 as uint64, "\n";
+
+  u64 := 0xffff_ffff_ffff_ffff as uint64; // test explicit conversion of literal
+  print u64 as int, " ",
+    u64 as uint64, "\n";
+
+  print "\nInt to large unsigned:\n";
+  i := 0xff;
+  print i as uint8, " ";
+
+  i := 0xffff;
+  print i as uint16, " ";
+
+  i := 0xffff_ffff;
+  print i as uint32, " ";
+
+  i := 0xffff_ffff_ffff_ffff;
+  print i as uint64, "\n";
+
+  print "\nCast from cardinality operator:\n";
+  var s : set<int> := {};
+  print |s| as int, " ",
+    |s| as int8, " ", |s| as int16, " ", |s| as int32, " ", |s| as int64, " ",
+    |s| as uint8, " ", |s| as uint16, " ", |s| as uint32, " ", |s| as uint64, "\n";
+
+  var m : multiset<int> := multiset{1};
+  print |m| as int, " ",
+    |m| as int8, " ", |m| as int16, " ", |m| as int32, " ", |m| as int64, " ",
+    |m| as uint8, " ", |m| as uint16, " ", |m| as uint32, " ", |m| as uint64, "\n";
+
+  var q : seq<int> := [1,2];
+  print |q| as int, " ",
+    |q| as int8, " ", |q| as int16, " ", |q| as int32, " ", |q| as int64, " ",
+    |q| as uint8, " ", |q| as uint16, " ", |q| as uint32, " ", |q| as uint64, "\n";
+
+  var p : map<int, string> := map[1 := "one", 2 := "two", 3 := "three"];
+  print |p| as int, " ",
+    |p| as int8, " ", |p| as int16, " ", |p| as int32, " ", |p| as int64, " ",
+    |p| as uint8, " ", |p| as uint16, " ", |p| as uint32, " ", |p| as uint64, "\n";
+
+  var a : array<int> := new int[4];
+  print a.Length as int, " ",
+    a.Length as int8, " ", a.Length as int16, " ", a.Length as int32, " ", a.Length as int64, " ",
+    a.Length as uint8, " ", a.Length as uint16, " ", a.Length as uint32, " ", a.Length as uint64, "\n";
+
+  print "\nCharacters:\n";
+  var c : char := 'C';
+  print c, " ", c as int, " ",
+    c as int8, " ", c as int16, " ", c as int32, " ", c as int64, " ",
+    c as uint8, " ", c as uint16, " ", c as uint32, " ", c as uint64, "\n";
+
+  i := 0; c := i as char; i := c as int;
+  i8 := 0x7f; c := i8 as char; i8 := c as int8;
+  u8 := 0xff; c := u8 as char; u8 := c as uint8;
+  i16 := 0x7fff; c := i16 as char; i16 := c as int16;
+  u16 := 0xffff; c := u16 as char; u16 := c as uint16;
+  i32 := 0xffff; c := i32 as char; i32 := c as int32;
+  u32 := 0xffff; c := u32 as char; u32 := c as uint32;
+  i64 := 0xffff; c := i64 as char; i64 := c as int64;
+  u64 := 0xffff; c := u64 as char; u64 := c as uint64;
+  print i, " ", i8, " ", i16, " ", i32, " ", i64, " ",
+    u8, " ", u16, " ", u32, " ", u64, "\n";
+
+  print "\n";
+}
+
+method Gimmie<T(0)>() returns (ans : T) { }
+
+method DefaultTests() {
+  print "Defaults:\n\n";
+
+  var i : int := Gimmie();
+  var i8 : int8 := Gimmie();
+  var i16 : int16 := Gimmie();
+  var i32 : int32 := Gimmie();
+  var i64 : int64 := Gimmie();
+  var u8 : uint8 := Gimmie();
+  var u16 : uint16 := Gimmie();
+  var u32 : uint32 := Gimmie();
+  var u64 : uint64 := Gimmie();
+
+  print i, " ", i8, " ", i16, " ", i32, " ", i64, " ",
+    u8, " ", u16, " ", u32, " ", u64, "\n";
+
+  print "\n";
+}
+
+// test handling of byte/short arithmetic in Java
+method Int8Test() {
+  print "Byte arithmetic:\n\n";
+
+  var a, b := 20, 30;
+  var r0 := MInt8(a, b);
+  var r1 := MInt8(b, a);
+  var r2 := MInt8(-2, b);
+  print a, " ", b, "\n";
+  print r0, " ", r1, " ", r2, "\n";
+
+  print "\n";
+}
+
+method MInt8(m: int8, n: int8) returns (r: int8) {
+  if m < 0 || n < 0 {
+    r := 18;
+  } else if m < n {
+    r := n - m;
+  } else {
+    r := m - n;
+  }
+}
+
+method Int16Test() {
+  print "Short arithmetic:\n\n";
+  var a, b := 20, 30;
+  var r0 := MInt16(a, b);
+  var r1 := MInt16(b, a);
+  var r2 := MInt16(-2, b);
+  print a, " ", b, "\n";
+  print r0, " ", r1, " ", r2, "\n";
+
+  print "\n";
+}
+
+method MInt16(m: int16, n: int16) returns (r: int16) {
+  if m < 0 || n < 0 {
+    r := 18;
+  } else if m < n {
+    r := n - m;
+  } else {
+    r := m - n;
+  }
+}
+
+method BvTests() {
+  // These will also be bytes/shorts in Java
+  print "Bitvectors:\n\n";
+
+  var a: bv8 := 250;
+  a := a / 2; // check that we're using unsigned division
+  a := a * 2;
+  a := a + 6;
+  assert a == 0;
+
+  var b: bv7 := 126;
+  b := b + 5;
+  assert b == 3;
+
+  var c: bv16 := 0xfffa;
+  c := c / 2; // check that we're using unsigned division
+  c := c * 2;
+  c := c + 10;
+  assert c == 4;
+
+  var d: bv15 := 0x7ffb;
+  d := d + 6;
+  assert d == 1;
+
+  print a, " ", b, " ", c, " ", d, "\n";
+
+  print "\n";
+}
+
+// Test zero comparisons in Java
+method ZeroComparisonTests() {
+  print "Comparison to zero:\n\n";
+
+  print "int8:\n";
+  ZCInt8Tests(-42);
+  ZCInt8Tests(0);
+  ZCInt8Tests(23);
+
+  print "int16:\n";
+  ZCInt16Tests(-42);
+  ZCInt16Tests(0);
+  ZCInt16Tests(23);
+
+  print "int32:\n";
+  ZCInt32Tests(-42);
+  ZCInt32Tests(0);
+  ZCInt32Tests(23);
+
+  print "int64:\n";
+  ZCInt64Tests(-42);
+  ZCInt64Tests(0);
+  ZCInt64Tests(23);
+
+  print "uint8:\n";
+  ZCUint8Tests(0);
+  ZCUint8Tests(23);
+
+  print "uint16:\n";
+  ZCUint16Tests(0);
+  ZCUint16Tests(23);
+
+  print "uint32:\n";
+  ZCUint32Tests(0);
+  ZCUint32Tests(23);
+
+  print "uint64:\n";
+  ZCUint64Tests(0);
+  ZCUint64Tests(23);
+
+  print "\n";
+}
+
+function YN(b : bool) : string {
+  if b then "Y" else "N"
+}
+
+method ZCInt8Tests(n : int8) {
+  print n, "\t",
+    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
+    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
+    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
+    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
+    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
+    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
+    "\n";
+}
+
+method ZCInt16Tests(n : int16) {
+  print n, "\t",
+    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
+    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
+    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
+    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
+    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
+    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
+    "\n";
+}
+
+method ZCInt32Tests(n : int32) {
+  print n, "\t",
+    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
+    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
+    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
+    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
+    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
+    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
+    "\n";
+}
+
+method ZCInt64Tests(n : int64) {
+  print n, "\t",
+    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
+    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
+    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
+    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
+    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
+    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
+    "\n";
+}
+
+method ZCUint8Tests(n : uint8) {
+  print n, "\t",
+    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
+    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
+    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
+    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
+    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
+    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
+    "\n";
+}
+
+method ZCUint16Tests(n : uint16) {
+  print n, "\t",
+    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
+    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
+    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
+    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
+    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
+    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
+    "\n";
+}
+
+method ZCUint32Tests(n : uint32) {
+  print n, "\t",
+    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
+    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
+    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
+    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
+    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
+    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
+    "\n";
+}
+
+method ZCUint64Tests(n : uint64) {
+  print n, "\t",
+    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
+    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
+    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
+    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
+    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
+    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
+    "\n";
+}
diff --git a/Test/unicodechars/comp/NativeNumbers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NativeNumbers.dfy.expect
similarity index 100%
rename from Test/unicodechars/comp/NativeNumbers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NativeNumbers.dfy.expect
diff --git a/Test/comp/NativeNumbers.dfy.js.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NativeNumbers.dfy.js.check
similarity index 100%
rename from Test/comp/NativeNumbers.dfy.js.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NativeNumbers.dfy.js.check
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NativeNumbers.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NativeNumbers.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NativeNumbers.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/comp/NestedArrays.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NestedArrays.dfy
similarity index 96%
rename from Test/comp/NestedArrays.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NestedArrays.dfy
index 39d256f4936..d2d0dadf9f5 100644
--- a/Test/comp/NestedArrays.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NestedArrays.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 /* Note, compiling to arrays in Java is difficult. In fact, this is currently
  * broken, see https://github.com/dafny-lang/dafny/issues/3055. Until this gets
diff --git a/Test/comp/NestedArrays.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NestedArrays.dfy.expect
similarity index 100%
rename from Test/comp/NestedArrays.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NestedArrays.dfy.expect
diff --git a/Test/comp/NestedArrays.dfy.java.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NestedArrays.dfy.java.check
similarity index 100%
rename from Test/comp/NestedArrays.dfy.java.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NestedArrays.dfy.java.check
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NestedArrays.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NestedArrays.dfy.rs.check
new file mode 100644
index 00000000000..45a237e6339
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/NestedArrays.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: cannot add `nat` to `BigInt`
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy
new file mode 100644
index 00000000000..e446b5d5f16
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy
@@ -0,0 +1,703 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4174
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+method Main() {
+  Literals();
+  Arithmetic();
+  PrintReals();
+  SimpleReality();
+  BitVectorTests();
+  MoreBvTests();
+  NativeTypeTest();
+  NewTypeTest();
+  OrdinalTests();
+  ZeroComparisonTests();
+  TestConversions();
+  ComparisonRegressions();
+  CastRegressions();
+  EuclideanDivisionRegressions.Test();
+  TypeTests.Test();
+}
+
+method Print(description: string, x: int) {
+  print x;
+  if |description| != 0 {  // string length (that is, sequence length)
+    print " (aka ", description, ")";
+  }
+  print "\n";
+}
+
+method PrintReal(description: string, x: real) {
+  print x;
+  if description != "" {  // string comparison
+    print " (aka ", description, ")";
+  }
+  print "\n";
+}
+
+method PrintSeq(s: seq) {
+  var sep, i := "", 0;
+  while i < |s| {
+    print sep, s[i];
+    sep := " ";
+    i := i + 1;
+  }
+  print "\n";
+}
+
+method Literals() {
+  Print("", 0);
+  Print("", -0);
+  Print("", 3);
+  Print("", -5);
+
+  Print("C# int.MaxValue", 0x7FFF_ffff);  // int.MaxValue
+  Print("2^31", 0x8000_0000);  // int.MaxValue + 1
+  Print("", 0x8000_0001);  // int.MaxValue + 2
+  Print("C# uint.MaxValue", 0xFFFF_FFFF);  // uint.MaxValue
+  Print("2^32", 0x1_0000_0000);  // uint.MaxValue + 1
+
+  Print("JavaScript Number.MAX_SAFE_INTEGER", 0x1F_FFFF_FFFF_FFFF);  // 2^53 -  1
+  Print("2^53", 0x20_0000_0000_0000);  // 2^53
+  Print("JavaScript Number.MIN_SAFE_INTEGER", - 0x1F_FFFF_FFFF_FFFF);  // - (2^53 -  1)
+  Print("", - 0x20_0000_0000_0000);  // - 2^53
+
+  Print("C# long.MaxValue", 0x7FFF_ffff_FFFF_ffff);  // long.MaxValue
+  Print("2^63", 0x8000_0000_0000_0000);  // long.MaxValue + 1
+  Print("", 0x8000_0000_0000_0001);  // long.MaxValue + 2
+  Print("C# ulong.MaxValue", 0xFFFF_FFFF_FFFF_FFFF);  // ulong.MaxValue
+  Print("2^64", 0x1_0000_0000_0000_0000);  // ulong.MaxValue + 1
+
+  Print("2^100", 0x10_0000_0000_0000_0000_0000_0000);  // 2^100
+  Print("M_39", 170_141_183_460_469_231_731_687_303_715_884_105_727);
+
+  PrintReal("", 0.0);
+  PrintReal("", -0.0);
+  PrintReal("", 3.0);
+  PrintReal("", -5.0);
+  PrintReal("", 3.14);
+  PrintReal("", -2.71);
+  PrintReal("a billion", 1_000_000_000.0);
+  PrintReal("G", 0.000_000_000_066_740_8);
+  PrintReal("G", 6.67408 / 100_000_000_000.0);
+  PrintReal("G", 6.67408 * 0.000_000_000_01);
+  PrintReal("1/10 of M_39", 17_014_118_346_046_923_173_168_730_371_588_410_572.7);  // test a large mantissa
+  PrintReal("1/googol", 0.000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_1);
+}
+
+method Arithmetic() {
+  PrintSeq([31 + 4, 31 - 4, 4 - 31]);  // also tests sequence displays
+
+  PrintSeq([31 * 4, 31 * -4]);
+  PrintSeq([-31 * 4, -31 * -4]);
+
+  PrintSeq(['3' + '4', '7' - '4' + 'N', '4' - '3' + '1']);
+
+  DivMod(31, 4);
+  DivMod(-31, 4);
+  DivMod(31, -4);
+  DivMod(-31, -4);
+  DivMod(0, 4);
+  DivMod(0, -4);
+  DivModNative();
+
+  PrintSeq([0.3 - 0.1]);  // should be 0.2, not something like 0.19999999999999998
+  PrintSeq([31.2 + 4.0, 31.2 - 4.0, 4.0 - 31.2]);
+
+  PrintSeq([31.2 * 4.0, 31.2 * -4.0]);
+  PrintSeq([-31.2 * 4.0, -31.2 * -4.0]);
+
+  DivModReal(31.2, 4.0);
+  DivModReal(-31.2, 4.0);
+  DivModReal(31.2, -4.0);
+  DivModReal(-31.2, -4.0);
+}
+
+method DivMod(dividend: int, divisor: int)
+  requires divisor != 0
+{
+  // Dafny uses Euclidean division/modulo, so the remainder is always non-negative
+  var quotient := dividend / divisor;
+  var remainder := dividend % divisor;
+  assert 0 <= remainder;
+  assert quotient * divisor + remainder == dividend;
+  print quotient, " ", remainder, " ", quotient * divisor + remainder, "\n";
+}
+
+newtype uint8 = x | 0 <= x < 0x100
+newtype uint16 = x | 0 <= x < 0x1_0000
+newtype uint32 = x | 0 <= x < 0x1_0000_0000
+newtype uint64 = x | 0 <= x < 0x1_0000_0000_0000_0000
+newtype int8 = x | -0x80 <= x < 0x80
+newtype int16 = x | -0x8000 <= x < 0x8000
+newtype int32 = x | -0x8000_0000 <= x < 0x8000_0000
+newtype int64 = x | -0x8000_0000_0000_0000 <= x < 0x8000_0000_0000_0000
+
+method DivModNative() {
+  // For non-negative operands, Euclidean division and moduus coincide with those of the
+  // target languages. Here, we're testing that no bad conversion happens between large
+  // unsigned integers and the same-bitpattern negative signed integer.
+  print "uint8:  ";
+  TestDivModUint8(0xE7, 23, " ");                                        // (10, 1)
+  TestDivModUint8(0xE7, 0xFF, "\n");                                     // (0, 231)
+  print "uint16: ";
+  TestDivModUint16(0xFFE7, 23, " ");                                     // (2848, 7)
+  TestDivModUint16(0xFFE7, 0xFFFF, "\n");                                // (0, 65511)
+  print "uint32: ";
+  TestDivModUint32(0xFFFF_FFE7, 23, " ");                                // (186_737_707, 10)
+  TestDivModUint32(0xFFFF_FFE7, 0xFFFF_FFFF, "\n");                      // (0, 4_294_967_271)
+  print "uint64: ";
+  TestDivModUint64(0xFFFF_FFFF_FFFF_FFE7, 23, " ");                      // (802_032_351_030_850_069, 4)
+  TestDivModUint64(0xFFFF_FFFF_FFFF_FFE7, 0xFFFF_FFFF_FFFF_FFFF, "\n");  // (0, 18_446_744_073_709_551_591)
+
+  // Compute via defining definitions
+  var i, j := 103, 13;
+  print "via real: ";
+  EuclideanDefinitions(i, j, " ");       // 7:12
+  EuclideanDefinitions(-i, j, " ");      // -8:1
+  EuclideanDefinitions(i, -j, " ");      // -7:12
+  EuclideanDefinitions(-i, -j, "\n");    // 8:1
+
+  // Check with SMT
+  assert i / j == 7       && i % j == 12;       // (7, 12)
+  assert (-i) / j == -8   && (-i) % j == 1;     // (-8, 1)
+  assert i / (-j) == -7   && i % (-j) == 12;    // (-7, 12)
+  assert (-103) / (-j) == 8 && (-i) % (-j) == 1;  // (8, 1)
+  // NOTE: In the previous line, if "-103" is replaced by the equivalent "-i", then Z3 version 4.8.4
+  // complains. In fact, Z3 4.8.4 is then happy to prove "(-i) / (-j) == 7", which is bogus. However,
+  // it seems that this error has been corrected in Z3 4.8.7 (or earlier). Therefore, by just
+  // writing "-103" here, we have a workaround for this test file. Once Dafny switches to a version
+  // of Z3 that is 4.8.7 or newer, then it would be good to switch "-103" back to "-i" here to make
+  // sure that particular Z3 bug has been fixed.
+
+  print "int:      ";
+  TestDivModInt(i, j, " ");                    // (7, 12)
+  TestDivModInt(-i, j, " ");                   // (-8, 1)
+  TestDivModInt(i, -j, " ");                   // (-7, 12)
+  TestDivModInt(-i, -j, " ");                  // (8, 1)
+  TestDivModInt(-108, 9, " ");                 // (-12, 0)
+  TestDivModInt(-108, -9, "\n");               // (12, 0)
+
+  // Test for native integers
+  var i8: int8, j8: int8 := 103, 13;
+  var i16: int16, j16: int16 := 103, 13;
+  var i32: int32, j32: int32 := 103, 13;
+  var i64: int64, j64: int64 := 103, 13;
+  print "int8:     ";
+  TestDivModInt8(i8, j8, " ");                       // (7, 12)
+  TestDivModInt8(-i8, j8, " ");                      // (-8, 1)
+  TestDivModInt8(i8, -j8, " ");                      // (-7, 12)
+  TestDivModInt8(-i8, -j8, " ");                     // (8, 1)
+  TestDivModInt8(-108, 9, " ");                      // (-12, 0)
+  TestDivModInt8(-108, -9, "\n");                    // (12, 0)
+  print "int16:    ";
+  TestDivModInt16(i16, j16, " ");                    // (7, 12)
+  TestDivModInt16(-i16, j16, " ");                   // (-8, 1)
+  TestDivModInt16(i16, -j16, " ");                   // (-7, 12)
+  TestDivModInt16(-i16, -j16, " ");                  // (8, 1)
+  TestDivModInt16(-108, 9, " ");                     // (-12, 0)
+  TestDivModInt16(-108, -9, "\n");                   // (12, 0)
+  print "int32:    ";
+  TestDivModInt32(i32, j32, " ");                    // (7, 12)
+  TestDivModInt32(-i32, j32, " ");                   // (-8, 1)
+  TestDivModInt32(i32, -j32, " ");                   // (-7, 12)
+  TestDivModInt32(-i32, -j32, " ");                  // (8, 1)
+  TestDivModInt32(-108, 9, " ");                     // (-12, 0)
+  TestDivModInt32(-108, -9, "\n");                   // (12, 0)
+  print "int64:    ";
+  TestDivModInt64(i64, j64, " ");                    // (7, 12)
+  TestDivModInt64(-i64, j64, " ");                   // (-8, 1)
+  TestDivModInt64(i64, -j64, " ");                   // (-7, 12)
+  TestDivModInt64(-i64, -j64, " ");                  // (8, 1)
+  TestDivModInt64(-108, 9, " ");                     // (-12, 0)
+  TestDivModInt64(-108, -9, "\n");                   // (12, 0)
+}
+function Sign(n: int): int {
+  if n < 0 then -1 else if n == 0 then 0 else 1
+}
+function Abs(n: int): nat {
+  if n < 0 then -n else n
+}
+method EuclideanDefinitions(i: int, j: int, suffix: string)
+  requires j != 0
+{
+  // For integers i and j, Euclidean division (i/j) and modulus (i%j) are defined as follows:
+  //   i/j    =    Sign(j) * Floor(i // Abs(j))   where "//" denotes real division
+  //   i%j    =    i - |j| * Floor(i // Abs(j))   where "//" denotes real division
+  var div := Sign(j) * (i as real / Abs(j) as real).Floor;
+  var mod := i - Abs(j) * (i as real / Abs(j) as real).Floor;
+  print div, ":", mod, suffix;
+}
+method TestDivModInt(a: int, b: int, suffix: string) requires b != 0 {
+  print a / b, ":", a % b, suffix;
+}
+method TestDivModUint8(a: uint8, b: uint8, suffix: string) requires b != 0 {
+  print a / b, ":", a % b, suffix;
+}
+method TestDivModUint16(a: uint16, b: uint16, suffix: string) requires b != 0 {
+  print a / b, ":", a % b, suffix;
+}
+method TestDivModUint32(a: uint32, b: uint32, suffix: string) requires b != 0 {
+  print a / b, ":", a % b, suffix;
+}
+method TestDivModUint64(a: uint64, b: uint64, suffix: string) requires b != 0 {
+  print a / b, ":", a % b, suffix;
+}
+method TestDivModInt8(a: int8, b: int8, suffix: string) requires b != 0 && -127 <= a {
+  print a / b, ":", a % b, suffix;
+}
+method TestDivModInt16(a: int16, b: int16, suffix: string) requires b != 0 && -0x7FFF <= a {
+  print a / b, ":", a % b, suffix;
+}
+method TestDivModInt32(a: int32, b: int32, suffix: string) requires b != 0 && -0x7FFF_FFFF <= a {
+  print a / b, ":", a % b, suffix;
+}
+method TestDivModInt64(a: int64, b: int64, suffix: string) requires b != 0 && -0x7FFF_FFFF_FFFF_FFFF <= a {
+  print a / b, ":", a % b, suffix;
+}
+
+method DivModReal(dividend: real, divisor: real)
+  requires divisor != 0.0
+{
+  var quotient := dividend / divisor;
+  assert quotient * divisor == dividend;
+  print quotient, " ", quotient * divisor, "\n";
+}
+
+method PrintReals() {
+  // 0
+  P(0.0);
+  P(0.2 + 0.4 - 0.6);
+  var r: real;
+  P(r);
+  print "\n";
+
+  // integer
+  P(120.0);
+  P(000120.0);
+  P(20.0 / 3.0 + 4.0 / 3.0);  // 8.0
+  P(-(20.0 / 3.0 + 4.0 / 3.0));  // -8.0
+  print "\n";
+
+  // decimal digits
+  P(123.4567);
+  P(-123.4567);
+  P(0.1234);
+  P(-0.1234);
+  P(2.0 / 3.0 + 0.4 / 3.0);  // 0.8
+  print "\n";
+  P(0.2);
+  P(0.02);
+  P(0.0_0002);
+  print "\n";
+  P(-0.2);
+  P(-0.02);
+  P(-0.0_0002);
+  print "\n";
+
+  // general
+  P(20.0 / 3.0);
+  P(-20.0 / 3.0);
+  P(20.0 / -3.0);
+  P(-20.0 / -3.0);
+  print "\n";
+}
+
+method P(r: real) {
+  print r, " ";
+}
+
+method SimpleReality() {
+  var r: real;
+  var z := r - r;
+  var s := 0.81;
+  var t := 2.0 * s + z - s;
+  var u := s / t;  // 1.0
+  print r, " ", z, " ", s, " ", t, " ", u, "\n";
+  print s == t, " ", z == u, "\n";
+}
+
+method BitVectorTests() {
+  var a: bv0 := 0;
+  var b: bv1 := 0;
+  var c: bv2 := 2;
+  var d: bv7 := 2;
+  var e: bv8 := 2;
+  var f: bv15 := 2;
+  var g: bv16 := 2;
+  var h: bv53 := 2;
+  var i: bv100 := 2;
+  print a, " ", c, " ", h, " ", i, "\n";
+  a, c, h, i := a + a, c + 1, 3 * h, i * 23;
+  print a, " ", c, " ", h, " ", i, "\n";
+  a, c, h, i := a * a, c * c, h * h, i * i;
+  print a, " ", c, " ", h, " ", i, "\n";
+  a, c, h, i := a - a, c - c, h - h, i - i;
+  print a, " ", c, " ", h, " ", i, "\n";
+
+  NativeBv32();
+  NativeBv53();
+}
+
+method NativeBv32() {
+  var x: bv32 := 0;
+  var y: bv32 := 15;
+  x := x + y + y - x + 1;  // 2*y + 1
+  y := x / y;  // 2
+  x := x - y;  // 29
+  var z: bv32 := 17;
+  z := z % 3;  // 2
+  var w0: bv32 := -13;  // wrap backwards
+  var w1 := w0 + 15;  // wrap forwards
+  print x, " ", y, " ", z, " ", w0, " ", w1, "\n";
+}
+
+method NativeBv53() {
+  var x: bv53 := 0;
+  var y: bv53 := 15;
+  x := x + y + y - x + 1;  // 2*y + 1
+  y := x / y;  // 2
+  x := x - y;  // 29
+  var z: bv53 := 17;
+  z := z % 3;  // 2
+  var w0: bv53 := -13;  // wrap backwards
+  var w1 := w0 + 15;  // wrap forwards
+  print x, " ", y, " ", z, " ", w0, " ", w1, "\n";
+}
+
+type MyBv = x: bv4 | 2 <= x < 10 witness 7
+
+method MoreBvTests() {
+  var u: bv0;
+  var w: bv32;
+  var B: bv100;
+  var m: MyBv;
+  u := 0;
+  w := 0;
+  B := 0;
+  m := 9;
+  u := u + u & u;
+  print u, " ", w, " ", B, " ", m, "\n";
+  u, w, B, m := u | 0, w | 0, B | 0, m | 0;
+  print u, " ", w, " ", B, " ", m, "\n";
+  u, w, B, m := u ^ 0, w ^ 0, B ^ 0, m ^ 0;
+  print u, " ", w, " ", B, " ", m, "\n";
+  u, w, B, m := !u, !w, !B, !m;
+  print u, " ", w, " ", B, " ", m, "\n";
+
+  B := 32;
+  B := B << 2;  // 128
+  B := B >> 4;  // 8
+  m := 2;
+  m := m << 2;  // 8
+  m := m >> 1;  // 4
+  print B, " ", m, "\n";
+
+  B := 32 | 4;
+  B := B.RotateLeft(99);  // 16 | 2
+  var B' := B;
+  B := B.RotateRight(98);  // 64 | 8
+  m := 2;
+  m := m.RotateLeft(2);  // 8
+  m := m.RotateRight(1);  // 4
+  print B', " ", B, " ", m, "\n";  // 18 72 4
+
+  u := u.RotateLeft(0).RotateRight(0);
+  print u, "\n";  // as 0 as ever
+}
+
+newtype {:nativeType "number", "long"} NativeType = x | -100 <= x < 0x10_0000_0000
+
+method NativeTypeTest() {
+  var a, b := 200, 300;
+  var r0 := M(a, b);
+  var r1 := M(b, a);
+  var r2 := M(-2, b);
+  print a, " ", b, "\n";
+  print r0, " ", r1, " ", r2, "\n";
+}
+
+method M(m: NativeType, n: NativeType) returns (r: NativeType) {
+  if m < 0 || n < 0 {
+    r := 18;
+  } else if m < n {
+    r := n - m;
+  } else {
+    r := m - n;
+  }
+}
+
+newtype NewType = x: int | true
+
+method NewTypeTest() {
+  print var n: NewType := (-4) / (-2); n, "\n";
+  print var n: NewType := ( 4) / (-2); n, "\n";
+  print var n: NewType := (-4) / ( 2); n, "\n";
+  print var n: NewType := ( 4) / ( 2); n, "\n";
+}
+
+method OrdinalTests() {
+  PrintOrdinalInfo(0);
+  PrintOrdinalInfo(1);
+  PrintOrdinalInfo(42);
+}
+
+method PrintOrdinalInfo(o : ORDINAL) {
+  print o;
+  print ": IsNat: ", o.IsNat;
+  print ", Offset: ", o.Offset;
+  print ", IsLimit: ", o.IsLimit;
+  print ", IsSucc: ", o.IsSucc, "\n";
+}
+
+method ZeroComparisonTests() {
+  print "int:\n";
+  ZCIntTests(-42);
+  ZCIntTests(0);
+  ZCIntTests(-0);
+  ZCIntTests(23);
+
+  print "NativeType:\n";
+  ZCNativeTypeTests(-42);
+  ZCNativeTypeTests(0);
+  ZCNativeTypeTests(-0);
+  ZCNativeTypeTests(23);
+}
+
+function YN(b : bool) : string {
+  if b then "Y" else "N"
+}
+
+method ZCIntTests(n : int) {
+  print n, "\t",
+    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
+    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
+    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
+    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
+    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
+    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
+    "\n";
+}
+
+method ZCNativeTypeTests(n : NativeType) {
+  print n, "\t",
+    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
+    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
+    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
+    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
+    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
+    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
+    "\n";
+}
+
+method TestConversions() {
+  ConvertFromInt(120);
+  ConvertFromReal(120.0);
+  ConvertFromORDINAL(120);
+  ConvertFromBv(120);
+  ConvertFromUInt32(120);
+  ConvertFromChar('x');
+}
+
+method ConvertFromInt(x: int)
+  requires 0 <= x < 128
+{
+  print x as int, " ", x as real, " ", x as ORDINAL, " ", x as bv7, " ", x as uint32, " ", x as char, "\n";
+}
+
+method ConvertFromReal(x: real)
+  requires x.Floor as real == x
+  requires 0 <= x.Floor < 128
+{
+  print x as int, " ", x as real, " ", x as ORDINAL, " ", x as bv7, " ", x as uint32, " ", x as char, "\n";
+}
+
+method ConvertFromORDINAL(x: ORDINAL)
+  requires 0 <= x < 128
+{
+  // ORDINAL doesn't (currently) support many type conversions
+  print x as int, /** " ", x as real, " ", x as ORDINAL, " ", x as bv7,**/ " ", x as uint32, /** " ", x as char,**/ "\n";
+}
+
+method ConvertFromBv(x: bv7)
+{
+  print x as int, " ", x as real, " ", x as ORDINAL, " ", x as bv7, " ", x as uint32, " ", x as char, "\n";
+}
+
+method ConvertFromUInt32(x: uint32)
+  requires 0 <= x < 128
+{
+  print x as int, " ", x as real, " ", x as ORDINAL, " ", x as bv7, " ", x as uint32, " ", x as char, "\n";
+}
+
+method ConvertFromChar(x: char)
+  requires 0 as char <= x < 128 as char
+{
+  // char doesn't (currently) support many type conversions
+  print x as int, /** " ", x as real, " ", x as ORDINAL, " ", x as bv7,**/ " ", x as uint32, /** " ", x as char,**/ "\n";
+}
+
+newtype MyInt = int
+
+method ComparisonRegressions() {
+  {
+    var xx := 2_000_000_000_000_000_000_000;
+    var yy := 3;
+    print xx < yy, " ", yy < xx, " ", xx <= yy, " ", yy <= xx, "\n"; // false true false true
+    print xx > yy, " ", yy > xx, " ", xx >= yy, " ", yy >= xx, "\n"; // true false true false
+  }
+  {
+    var xx: MyInt := 2_000_000_000_000_000_000_000;
+    var yy: MyInt := 3;
+    // The following was once compiled incorrectly for JavaScript
+    print xx < yy, " ", yy < xx, " ", xx <= yy, " ", yy <= xx, "\n"; // false true false true
+    print xx > yy, " ", yy > xx, " ", xx >= yy, " ", yy >= xx, "\n"; // true false true false
+  }
+}
+
+method CastRegressions() {
+  var i: int := 20;
+  var bt: uint8 := (i + 3) as uint8;
+  var bu := (3 + i) as uint8;
+  var b: bool;
+  var bv: uint8 := if b then 89 else 88;
+  var u: uint32 := if b then 890 else 880;
+  print i, " ", bt, " ", bu, " ", bv, " ", u, "\n";
+}
+
+module EuclideanDivisionRegressions {
+  newtype MyReal = real
+  newtype MyRealWithConstraint = r: real | 0.0 <= r
+  newtype MyInt = int
+  newtype MyIntWithConstraint = i: int | -200 <= i
+
+  newtype byte = x: int | 0 <= x < 256
+  newtype sbyte = x: int | -128 <= x < 128
+
+  newtype uint32 = x: int | 0 <= x < 0x1_0000_0000
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+
+  method Test() {
+    TestDiv();
+    TestWraparound();
+    TestMod();
+  }
+
+  method TestDiv() {
+    // Make sure Euclidean division is used, but not for reals or bitvectors
+
+    var r0: real := 621.0 / 10.0;
+    var r1: MyReal := 622.0 / 10.0;
+    var r2: MyRealWithConstraint := 623.0 / 10.0;
+    print r0, " ", r1, " ", r2, "\n"; // 62.1 62.2 62.3
+
+    var i0: int := 7 / -2;
+    var i1: MyInt := 7 / -2;
+    var i2: MyIntWithConstraint := 7 / -2;
+    print i0, " ", i1, " ", i2, "\n"; // -3 -3 -3
+
+    var b0: byte := 248 / 3;
+    var b1: byte := 100 / 253;
+    var b2: sbyte := -8 / 3;
+    var b3: sbyte := 100 / -3;
+    print b0, " ", b1, " ", b2, " ", b3, "\n"; // 82 0 -3 -33
+
+    // bitvectors give rise to unsigned arithmetic
+    var v0: bv8 := 248 / 3;
+    var v1: bv8 := 100 / 253;
+    var v2: bv8 := -8 / 3;
+    var v3: bv8 := 100 / -3;
+    print v0, " ", v1, " ", v2, " ", v3, "\n"; // 82 0 82 0
+
+    var j0: uint32 := 0x7fff_fff9 / 3;
+    var j1: uint32 := 100 / 0x7fff_fffd;
+    var j2: int32 := -7 / 3;
+    var j3: int32 := 100 / -3;
+    print j0, " ", j1, " ", j2, " ", j3, "\n"; // 715827880 0 -3 -33
+
+    // bitvectors give rise to unsigned arithmetic
+    var w0: bv32 := 0xffff_fff8 / 3;
+    var w1: bv32 := 100 / 0xffff_fffd;
+    var w2: bv32 := -8 / 3;
+    var w3: bv32 := 100 / -3;
+    print w0, " ", w1, " ", w2, " ", w3, "\n"; // 1431655762 0 1431655762 0
+
+    // these bitvectors use BigInteger
+    var h0: bv68 := 0xf_ffff_ffff_ffff_fff8 / 3;
+    var h1: bv68 := 100 / 0xf_ffff_ffff_ffff_fffd;
+    var h2: bv68 := -8 / 3;
+    var h3: bv68 := 100 / -3;
+    print h0, " ", h1, " ", h2, " ", h3, "\n"; // 98382635059784275282 0 98382635059784275282 0
+  }
+
+  method TestWraparound() {
+    var s0: bv3 := 6 + 3;
+    var s1: bv3 := -1;
+    var s2: bv3 := 4 + 5 - 2;
+    var s3: bv7 := 126 + 3;
+    var s4: bv7 := -1;
+    var s5: bv7 := 64 + 65 - 2;
+    print s0, " ", s1, " ", s2, " ", s3, " ", s4, " ", s5, "\n"; // 1 7 7 1 127 127
+  }
+
+  method TestMod() {
+    var m0: int := 100 % -3;
+    var m1: int := -100 % 3;
+    var m2: int := -100 % -2;
+    var m3: int := 100 % 3;
+    print m0, " ", m1, " ", m2, " ", m3, "\n"; // 1 2 0 1
+
+    var n0: MyIntWithConstraint := 100 % -3;
+    var n1: MyIntWithConstraint := -100 % 3;
+    var n2: MyIntWithConstraint := -100 % -2;
+    var n3: MyIntWithConstraint := 100 % 3;
+    print n0, " ", n1, " ", n2, " ", n3, "\n"; // 1 2 0 1
+
+    var p0: int32 := 100 % -3;
+    var p1: int32 := -100 % 3;
+    var p2: int32 := -100 % -2;
+    var p3: int32 := 100 % 3;
+    print p0, " ", p1, " ", p2, " ", p3, "\n"; // 1 2 0 1
+  }
+}
+
+module TypeTests {
+  method Test() {
+    var r := 3.14;
+    var i := 100;
+    var ch := 'c';
+    var ord: ORDINAL := 9876;
+    var b7: bv7 := 77;
+    var b129: bv129 := 129;
+
+    print r as real, " "; // 3.14
+    print i as real, " "; // 100.0
+    print ch as real, " "; // 99.0
+    print ord as real, " "; // 9876.0
+    print b7 as real, " "; // 77.0
+    print b129 as real, "\n"; // 129.0
+
+    var smallCharSet: set<char> := {'7', 'D', 'X', 'd', 'x', '@'};
+    var s := set d: char | d in smallCharSet;
+    print |s|, "\n"; // 6
+
+    var t := set e: MyChar | e in s;
+    print |t|, "\n"; // 2
+
+    var u := set ltl: Little | 3 <= ltl < 35 && ltl % 3 == 1; // {4, 7, 13, 19, 25, 28, 31}
+    print |u|, "\n"; // 7
+  }
+
+  predicate GoodChar(ch: char) { true }
+  type MyChar = chr: char | 'A' <= chr <= 'Z' witness 'B'
+
+  function EmptySequence<Y>(): seq<Y> {
+    []
+  }
+
+  newtype Big = x: int | 0 <= x < 10_000 && x != 22
+  type AnotherInBetween<HH(0), GG> = y: Big | y != 10
+  type SubsetInBetween<G, H(0)> = y: AnotherInBetween<H, G> | y != 34 && |EmptySequence<G>()| == |EmptySequence<H>()|
+  newtype Middle = SubsetInBetween<bool, char>
+  newtype Little = z: Middle | z < 200 && z != 16
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.expect
new file mode 100644
index 00000000000..4c6cf5c8a91
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.expect
@@ -0,0 +1,126 @@
+0
+0
+3
+-5
+2147483647 (aka C# int.MaxValue)
+2147483648 (aka 2^31)
+2147483649
+4294967295 (aka C# uint.MaxValue)
+4294967296 (aka 2^32)
+9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
+9007199254740992 (aka 2^53)
+-9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
+-9007199254740992
+9223372036854775807 (aka C# long.MaxValue)
+9223372036854775808 (aka 2^63)
+9223372036854775809
+18446744073709551615 (aka C# ulong.MaxValue)
+18446744073709551616 (aka 2^64)
+1267650600228229401496703205376 (aka 2^100)
+170141183460469231731687303715884105727 (aka M_39)
+0.0
+0.0
+3.0
+-5.0
+3.14
+-2.71
+1000000000.0 (aka a billion)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
+0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
+35 27 -27
+124 -124
+-124 124
+'g' 'Q' '2'
+7 3 31
+-8 1 -31
+-7 3 31
+8 1 -31
+0 0 0
+0 0 0
+uint8:  10:1 0:231
+uint16: 2848:7 0:65511
+uint32: 186737707:10 0:4294967271
+uint64: 802032351030850069:4 0:18446744073709551591
+via real: 7:12 -8:1 -7:12 8:1
+int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
+int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
+int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+0.2
+35.2 27.2 -27.2
+124.8 -124.8
+-124.8 124.8
+7.800 31.200
+-7.800 -31.200
+-7.800 31.200
+7.800 -31.200
+0.0 0.0 0.0 
+120.0 120.0 (24.0 / 3.0) (-24.0 / 3.0) 
+123.4567 -123.4567 0.1234 -0.1234 (24.0 / 30.0) 
+0.2 0.02 0.00002 
+-0.2 -0.02 -0.00002 
+(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
+0.0 0.0 0.81 0.81 (8100.0 / 8100.0)
+true false
+0 2 2 2
+0 3 6 46
+0 1 36 2116
+0 0 0 0
+29 2 2 4294967283 2
+29 2 2 9007199254740979 2
+0 0 0 9
+0 0 0 9
+0 0 0 9
+0 4294967295 1267650600228229401496703205375 6
+8 4
+18 72 4
+0
+200 300
+100 100 18
+2
+-2
+-2
+2
+0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
+1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
+42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
+int:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+NativeType:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+120 120.0 120 120 120 'x'
+120 120.0 120 120 120 'x'
+120 120
+120 120.0 120 120 120 'x'
+120 120.0 120 120 120 'x'
+120 120
+false true false true
+true false true false
+false true false true
+true false true false
+20 23 23 88 880
+62.1 62.2 62.3
+-3 -3 -3
+82 0 -3 -33
+82 0 82 0
+715827880 0 -3 -33
+1431655762 0 1431655762 0
+98382635059784275282 0 98382635059784275282 0
+1 7 7 1 127 127
+1 2 0 1
+1 2 0 1
+1 2 0 1
+3.14 100.0 99.0 9876.0 77.0 129.0
+6
+2
+7
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.go.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.go.expect
new file mode 100644
index 00000000000..43212d1a81e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.go.expect
@@ -0,0 +1,126 @@
+0
+0
+3
+-5
+2147483647 (aka C# int.MaxValue)
+2147483648 (aka 2^31)
+2147483649
+4294967295 (aka C# uint.MaxValue)
+4294967296 (aka 2^32)
+9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
+9007199254740992 (aka 2^53)
+-9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
+-9007199254740992
+9223372036854775807 (aka C# long.MaxValue)
+9223372036854775808 (aka 2^63)
+9223372036854775809
+18446744073709551615 (aka C# ulong.MaxValue)
+18446744073709551616 (aka 2^64)
+1267650600228229401496703205376 (aka 2^100)
+170141183460469231731687303715884105727 (aka M_39)
+0.0
+0.0
+3.0
+-5.0
+3.14
+-2.71
+1000000000.0 (aka a billion)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
+0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
+35 27 -27
+124 -124
+-124 124
+'g' 'Q' '2'
+7 3 31
+-8 1 -31
+-7 3 31
+8 1 -31
+0 0 0
+0 0 0
+uint8:  10:1 0:231
+uint16: 2848:7 0:65511
+uint32: 186737707:10 0:4294967271
+uint64: 802032351030850069:4 0:18446744073709551591
+via real: 7:12 -8:1 -7:12 8:1
+int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
+int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
+int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+0.2
+35.2 27.2 -27.2
+124.8 -124.8
+-124.8 124.8
+7.8 31.2
+-7.8 -31.2
+-7.8 31.2
+7.8 -31.2
+0.0 0.0 0.0 
+120.0 120.0 8.0 -8.0 
+123.4567 -123.4567 0.1234 -0.1234 0.8 
+0.2 0.02 0.00002 
+-0.2 -0.02 -0.00002 
+(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
+0.0 0.0 0.81 0.81 1.0
+true false
+0 2 2 2
+0 3 6 46
+0 1 36 2116
+0 0 0 0
+29 2 2 4294967283 2
+29 2 2 9007199254740979 2
+0 0 0 9
+0 0 0 9
+0 0 0 9
+0 4294967295 1267650600228229401496703205375 6
+8 4
+18 72 4
+0
+200 300
+100 100 18
+2
+-2
+-2
+2
+0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
+1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
+42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
+int:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+NativeType:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+120 120.0 120 120 120 'x'
+120 120.0 120 120 120 'x'
+120 120
+120 120.0 120 120 120 'x'
+120 120.0 120 120 120 'x'
+120 120
+false true false true
+true false true false
+false true false true
+true false true false
+20 23 23 88 880
+62.1 62.2 62.3
+-3 -3 -3
+82 0 -3 -33
+82 0 82 0
+715827880 0 -3 -33
+1431655762 0 1431655762 0
+98382635059784275282 0 98382635059784275282 0
+1 7 7 1 127 127
+1 2 0 1
+1 2 0 1
+1 2 0 1
+3.14 100.0 99.0 9876.0 77.0 129.0
+6
+2
+7
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.py.expect
new file mode 100644
index 00000000000..43212d1a81e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.py.expect
@@ -0,0 +1,126 @@
+0
+0
+3
+-5
+2147483647 (aka C# int.MaxValue)
+2147483648 (aka 2^31)
+2147483649
+4294967295 (aka C# uint.MaxValue)
+4294967296 (aka 2^32)
+9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
+9007199254740992 (aka 2^53)
+-9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
+-9007199254740992
+9223372036854775807 (aka C# long.MaxValue)
+9223372036854775808 (aka 2^63)
+9223372036854775809
+18446744073709551615 (aka C# ulong.MaxValue)
+18446744073709551616 (aka 2^64)
+1267650600228229401496703205376 (aka 2^100)
+170141183460469231731687303715884105727 (aka M_39)
+0.0
+0.0
+3.0
+-5.0
+3.14
+-2.71
+1000000000.0 (aka a billion)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
+0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
+35 27 -27
+124 -124
+-124 124
+'g' 'Q' '2'
+7 3 31
+-8 1 -31
+-7 3 31
+8 1 -31
+0 0 0
+0 0 0
+uint8:  10:1 0:231
+uint16: 2848:7 0:65511
+uint32: 186737707:10 0:4294967271
+uint64: 802032351030850069:4 0:18446744073709551591
+via real: 7:12 -8:1 -7:12 8:1
+int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
+int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
+int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+0.2
+35.2 27.2 -27.2
+124.8 -124.8
+-124.8 124.8
+7.8 31.2
+-7.8 -31.2
+-7.8 31.2
+7.8 -31.2
+0.0 0.0 0.0 
+120.0 120.0 8.0 -8.0 
+123.4567 -123.4567 0.1234 -0.1234 0.8 
+0.2 0.02 0.00002 
+-0.2 -0.02 -0.00002 
+(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
+0.0 0.0 0.81 0.81 1.0
+true false
+0 2 2 2
+0 3 6 46
+0 1 36 2116
+0 0 0 0
+29 2 2 4294967283 2
+29 2 2 9007199254740979 2
+0 0 0 9
+0 0 0 9
+0 0 0 9
+0 4294967295 1267650600228229401496703205375 6
+8 4
+18 72 4
+0
+200 300
+100 100 18
+2
+-2
+-2
+2
+0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
+1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
+42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
+int:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+NativeType:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+120 120.0 120 120 120 'x'
+120 120.0 120 120 120 'x'
+120 120
+120 120.0 120 120 120 'x'
+120 120.0 120 120 120 'x'
+120 120
+false true false true
+true false true false
+false true false true
+true false true false
+20 23 23 88 880
+62.1 62.2 62.3
+-3 -3 -3
+82 0 -3 -33
+82 0 82 0
+715827880 0 -3 -33
+1431655762 0 1431655762 0
+98382635059784275282 0 98382635059784275282 0
+1 7 7 1 127 127
+1 2 0 1
+1 2 0 1
+1 2 0 1
+3.14 100.0 99.0 9876.0 77.0 129.0
+6
+2
+7
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.rs.check
new file mode 100644
index 00000000000..fbb03b77111
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Numbers.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.NullReferenceException: Object reference not set to an instance of an object.
\ No newline at end of file
diff --git a/Test/comp/OtherClass.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/OtherClass.java
similarity index 100%
rename from Test/comp/OtherClass.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/OtherClass.java
diff --git a/Test/comp/Poly.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Poly.dfy
similarity index 100%
rename from Test/comp/Poly.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Poly.dfy
diff --git a/Test/comp/Poly.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Poly.dfy.expect
similarity index 100%
rename from Test/comp/Poly.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Poly.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Poly.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Poly.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Poly.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Print.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Print.dfy
new file mode 100644
index 00000000000..1eca3be5df8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Print.dfy
@@ -0,0 +1,26 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108 and https://github.com/dafny-lang/dafny/issues/2582
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
+// RUN: %run --no-verify --target cs "%s" >> "%t"
+// RUN: %run --no-verify --target js "%s" >> "%t"
+// RUN: %run --no-verify --target go "%s" >> "%t"
+// RUN: %run --no-verify --target java "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Python salts hashes so they are not deterministic.
+
+method Main() {
+  PrintString();
+}
+
+method PrintString() {
+  print "Strings in collections:\n";
+  print "  ", ["abc", "def"], "\n";
+  print "  ", [["abc", "def"]], "\n";
+  print "  ", {"abc", "def"}, "\n";
+  print "  ", [['a', 'b', 'c'], ['d', 'e', 'f']], "\n";
+  var a : seq<seq<char>> := [[]];
+  print "  ", a, "\n";
+  var b : seq<char>;
+  print "  ", [b], "\n";
+  print "  ", [seq(5, x => 'a')], "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Print.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Print.dfy.expect
new file mode 100644
index 00000000000..d465f809051
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Print.dfy.expect
@@ -0,0 +1,42 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
+
+Dafny program verifier did not attempt verification
+Strings in collections:
+  [['a', 'b', 'c'], ['d', 'e', 'f']]
+  [[['a', 'b', 'c'], ['d', 'e', 'f']]]
+  {['d', 'e', 'f'], ['a', 'b', 'c']}
+  [['a', 'b', 'c'], ['d', 'e', 'f']]
+  [[]]
+  [[]]
+  [['a', 'a', 'a', 'a', 'a']]
+
+Dafny program verifier did not attempt verification
+Strings in collections:
+  [['a', 'b', 'c'], ['d', 'e', 'f']]
+  [[['a', 'b', 'c'], ['d', 'e', 'f']]]
+  {['a', 'b', 'c'], ['d', 'e', 'f']}
+  [['a', 'b', 'c'], ['d', 'e', 'f']]
+  [[]]
+  [[]]
+  [['a', 'a', 'a', 'a', 'a']]
+
+Dafny program verifier did not attempt verification
+Strings in collections:
+  [['a', 'b', 'c'], ['d', 'e', 'f']]
+  [[['a', 'b', 'c'], ['d', 'e', 'f']]]
+  {['a', 'b', 'c'], ['d', 'e', 'f']}
+  [['a', 'b', 'c'], ['d', 'e', 'f']]
+  [[]]
+  [[]]
+  [['a', 'a', 'a', 'a', 'a']]
+
+Dafny program verifier did not attempt verification
+Strings in collections:
+  [['a', 'b', 'c'], ['d', 'e', 'f']]
+  [[['a', 'b', 'c'], ['d', 'e', 'f']]]
+  {['a', 'b', 'c'], ['d', 'e', 'f']}
+  [['a', 'b', 'c'], ['d', 'e', 'f']]
+  [[]]
+  [[]]
+  [['a', 'a', 'a', 'a', 'a']]
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/SequenceConcatOptimization.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/SequenceConcatOptimization.dfy
new file mode 100644
index 00000000000..a8f022b20c9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/SequenceConcatOptimization.dfy
@@ -0,0 +1,31 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %baredafny test --no-verify --target=cs %args   "%s" >> "%t"
+// RUN: %baredafny test --no-verify --target=java %args "%s" >> "%t"
+// RUN: %baredafny test --no-verify --target=go %args   "%s" >> "%t"
+// RUN: %baredafny test --no-verify --target=py %args   "%s" >> "%t"
+
+module SequenceConcatOptimization {
+
+  // A basic performance sanity check for the sequence concatenation
+  // that is now implemented for C#, Java, and Go (with the latter
+  // using a common implementation in Dafny).
+  // In these languages this test completes in a second or so,
+  // but the others take much longer than I was willing to wait.
+  method {:test} SirConcatsALot() {
+    var s: seq<int> := [];
+    var n := 1_000_000;
+
+    for i := 0 to n 
+      invariant |s| == i
+    {
+      s := s + [i];
+    }
+
+    for i := 0 to n
+    {
+      expect s[i] == i;
+    }
+
+    expect |s| == n;
+  }
+}
diff --git a/Test/comp/SingletonOptimization.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/SingletonOptimization.java
similarity index 100%
rename from Test/comp/SingletonOptimization.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/SingletonOptimization.java
diff --git a/Test/comp/StaticMembersOfGenericTypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/StaticMembersOfGenericTypes.dfy
similarity index 100%
rename from Test/comp/StaticMembersOfGenericTypes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/StaticMembersOfGenericTypes.dfy
diff --git a/Test/comp/StaticMembersOfGenericTypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/StaticMembersOfGenericTypes.dfy.expect
similarity index 100%
rename from Test/comp/StaticMembersOfGenericTypes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/StaticMembersOfGenericTypes.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/StaticMembersOfGenericTypes.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/StaticMembersOfGenericTypes.dfy.rs.check
new file mode 100644
index 00000000000..0c4268a75ce
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/StaticMembersOfGenericTypes.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Expected a buffered value to have been populated because rhs != null
\ No newline at end of file
diff --git a/Test/comp/TailRecursion.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TailRecursion.dfy
similarity index 99%
rename from Test/comp/TailRecursion.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TailRecursion.dfy
index b3631d5eccc..4bada106afa 100644
--- a/Test/comp/TailRecursion.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TailRecursion.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   // In the following, 2_000_000 is too large an argument without tail-calls
diff --git a/Test/comp/TailRecursion.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TailRecursion.dfy.expect
similarity index 100%
rename from Test/comp/TailRecursion.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TailRecursion.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TailRecursion.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TailRecursion.dfy.rs.check
new file mode 100644
index 00000000000..d131d585c89
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TailRecursion.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type\ name\ for\ ORDINAL\ \(Microsoft_dDafny_dBigOrdinalType\)</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TupleMaximumSize.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TupleMaximumSize.dfy
new file mode 100644
index 00000000000..febbffbba02
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TupleMaximumSize.dfy
@@ -0,0 +1,6 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+method Main() {
+  var a := (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
+  print a, "\n";
+}
\ No newline at end of file
diff --git a/Test/comp/TupleMaximumSize.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TupleMaximumSize.dfy.expect
similarity index 100%
rename from Test/comp/TupleMaximumSize.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TupleMaximumSize.dfy.expect
diff --git a/Test/comp/TypeDescriptors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeDescriptors.dfy
similarity index 97%
rename from Test/comp/TypeDescriptors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeDescriptors.dfy
index 5bedbb900e4..67b52357b76 100644
--- a/Test/comp/TypeDescriptors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeDescriptors.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Method<G(0)>(s: string, g: G) {
   var zero: G;
diff --git a/Test/comp/TypeDescriptors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeDescriptors.dfy.expect
similarity index 100%
rename from Test/comp/TypeDescriptors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeDescriptors.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeDescriptors.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeDescriptors.dfy.rs.check
new file mode 100644
index 00000000000..d131d585c89
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeDescriptors.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type\ name\ for\ ORDINAL\ \(Microsoft_dDafny_dBigOrdinalType\)</i>.*
\ No newline at end of file
diff --git a/Test/comp/TypeParams.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy
similarity index 100%
rename from Test/comp/TypeParams.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy
diff --git a/Test/comp/TypeParams.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.expect
similarity index 100%
rename from Test/comp/TypeParams.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.expect
diff --git a/Test/comp/TypeParams.dfy.go.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.go.expect
similarity index 100%
rename from Test/comp/TypeParams.dfy.go.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.go.expect
diff --git a/Test/comp/TypeParams.dfy.java.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.java.expect
similarity index 100%
rename from Test/comp/TypeParams.dfy.java.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.java.expect
diff --git a/Test/comp/TypeParams.dfy.js.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.js.expect
similarity index 100%
rename from Test/comp/TypeParams.dfy.js.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.js.expect
diff --git a/Test/comp/TypeParams.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.py.expect
similarity index 100%
rename from Test/comp/TypeParams.dfy.py.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.py.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.rs.check
new file mode 100644
index 00000000000..0c4268a75ce
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/TypeParams.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Expected a buffered value to have been populated because rhs != null
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnicodeStrings.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnicodeStrings.dfy
new file mode 100644
index 00000000000..3a0980ea727
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnicodeStrings.dfy
@@ -0,0 +1,260 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --unicode-char
+
+method AssertAndExpect(p: bool) 
+  requires p
+{
+  expect p;
+}
+
+// Included to test casting between char and all supported native types
+newtype uint8 = x: int | 0 <= x < 0x100 
+newtype uint16 = x: int | 0 <= x < 0x1_0000 
+newtype uint32 = x: int | 0 <= x < 0x1_0000_0000 
+newtype uint64 = x: int | 0 <= x < 0x1_0000_0000_0000_0000 
+newtype int8 = x: int | -0x80 <= x < 0x80
+newtype int16 = x: int | -0x8000 <= x < 0x8000
+newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+newtype int64 = x: int | -0x8000_0000_0000_0000 <= x < 8000_0000_0000_0000
+
+const AllCasesAsCodePoints := [
+  0,        // \0, minimum value
+  0x9,      // \t
+  0xA,      // \n
+  0xD,      // \r
+  0x22,     // \"
+  0x27,     // \'
+  0x44,     // \\
+  0x5c,     // D (because Dafny)
+  0x80,     // First non-ASCII codepoint (and hence first with two bytes in UTF-8)
+  0xFF,     // Last codepoint that could fit into a single byte
+  0x100,    // First codepoint that can't fit into a single byte
+  0xD7FF,   // Last codepoint before the surrogate range
+  0xE000,   // First codepoint after the surrogate range
+  0xFFEE,   // '￮', which is after the surrogate range but a single code unit in UTF-16
+  0x1_0000, // First codepoint beyong the BMP, requiring two UTF-16 code units
+  0x1_D11E, // '𝄞', [0xD834, 0xDD1E] in UTF-16
+            // Included along with ￮ as an evil test case to catch comparing
+            // encoded bytes lexicographically by accident 😈.
+            // UTF-8 seems to have the property that this comparison
+            // is the same, but UTF-16 doesn't.
+  0x1_F680, // Typical non-BMP codepoint (🚀)
+  0x10_FFFF // Maximum value
+]
+
+
+// The primary definition of the character values is casting to characters from integers.
+// This is the simplest and most likely to be correct at runtime, and used as the baseline for comparisons.
+const AllCases := 
+  seq(|AllCasesAsCodePoints|, i requires 0 <= i < |AllCasesAsCodePoints| => AllCasesAsCodePoints[i] as char)
+
+const AlternateForms: seq<seq<char>> := [
+  // As character literals with escapes
+  ['\0', '\t', '\n', '\r', '\"', '\'', '\U{44}', '\\', '\U{80}', '\U{FF}',
+      '\U{100}', '\U{D7FF}', '\U{E000}', '\U{FFEE}', '\U{10000}', '\U{1D11E}', '\U{1F680}', '\U{10FFFF}'],
+  // As verbatim character literals where reasonable, or using a \U escape where not
+  ['\U{0}', '\U{9}', '\U{A}', '\U{D}', '\U{22}', '\U{27}', 'D', '\U{5c}', 
+      '€', 'ÿ', 'Ā', '\U{D7FF}', '\U{E000}', '￮', '𐀀', '𝄞', '🚀', '\U{10FFFF}'],
+  // In a string literal with escapes
+  "\0\t\n\r\"\'\U{44}\\\U{80}\U{FF}\U{100}\U{D7FF}\U{E000}\U{FFEE}\U{10000}\U{1D11E}\U{1F680}\U{10FFFF}",
+  // In a string literal without escapes where reasonable
+  "\U{0}\U{9}\U{A}\U{D}\U{22}\U{27}D\U{5c}€ÿĀ\U{D7FF}\U{E000}￮𐀀𝄞🚀\U{10FFFF}"
+]
+
+method AllCharCasesTest() {
+  // Boy a foreach loop would be really nice right about now... \U{1F604}
+  for caseIndex := 0 to |AllCases| {
+    var thisCase := AllCases[caseIndex];
+    for formIndex := 0 to |AlternateForms| {
+      expect thisCase == AlternateForms[formIndex][caseIndex];
+      expect !(thisCase != AlternateForms[formIndex][caseIndex]);
+      
+      expect AlternateForms[formIndex][caseIndex] == thisCase;
+      expect !(AlternateForms[formIndex][caseIndex] != thisCase);
+
+      CastChar(thisCase);
+    }
+  }
+
+  // Comparisons - taking advantage of the list of cases being in ascending order
+  for i := 0 to |AllCases| {
+    var left := AllCases[i];
+    for j := 0 to |AllCases| {
+      var right := AllCases[j];
+      if i < j {
+        expect left < right;
+        expect left <= right;
+        expect !(left == right);
+        expect left != right;
+        expect !(left > right);
+        expect !(left >= right);
+      } else if i == j {
+        expect !(left < right);
+        expect left <= right;
+        expect left == right;
+        expect !(left != right);
+        expect !(left > right);
+        expect left >= right;
+      } else {
+        expect !(left < right);
+        expect !(left <= right);
+        expect !(left == right);
+        expect left != right;
+        expect left > right;
+        expect left >= right;
+      }
+    }
+  }
+}
+
+// WARNING: Do not do this in real code!
+// It's a great example of what NOT to do when working with Unicode,
+// since the concept of upper/lower case is culture-specific.
+function ToLower(ch: char): char {
+  if 'A' <= ch <= 'Z' then
+    ch - 'A' + 'a'
+  else
+    ch
+}
+
+function MapToLower(s: string): string {
+  if 0 == |s| then
+    []
+  else
+    [ToLower(s[0])] + MapToLower(s[1..])
+}
+
+function MapToInt32(s: string): seq<int32> {
+  if 0 == |s| then
+    []
+  else
+    [s[0] as int32] + MapToInt32(s[1..])
+}
+
+method Main(args: seq<string>) {
+  AllCharCasesTest();
+  CharQuantification();
+  StringPrinting();
+  CharPrinting();
+}
+
+// Not including any non-printable characters in this one
+const stringThatNeedsEscaping := "D\0\r\n\\\"\'\U{1F60E}"
+
+method CharPrinting() {
+  var chars := stringThatNeedsEscaping;
+  for i := 0 to |chars| {
+    print chars[i], "\n";
+  }
+  for i := 0 to |chars| {
+    var r := Print(chars[i]);
+    expect chars[i] == r;
+  }
+}
+
+// Used to ensure characters can be passing in and out of generic code
+// (which is a real challenge in Java for example)
+method Print<T>(t: T) returns (r: T) {
+  print t, "\n";
+  return t;
+}
+
+datatype Option<T> = Some(value: T) | None
+
+datatype StringOption = SomeString(value: string) | NoString
+
+method StringPrinting() {
+  var trickyString := "Dafny is just so \U{1F60E}";
+  print trickyString, "\n";
+
+  var trickyString2 := "Dafny is just so " + [0x1F60E as char];
+  print trickyString2, "\n";
+
+  // Testing that runtimes don't confuse a seq<uint32> for a string
+  // (which would be a problem if we used Int32 in C# instead of Rune, for example)
+  var s := "Ceci n'est pas une string";
+  var notAString := MapToInt32(s);
+  print notAString, "\n";
+
+  // Ensuring character arithmetic can be compiled
+  var sarcastic := "Oh UNicOdE, tHaT's a REaL usEFuL FEaTuRe!";
+  var sincere := MapToLower(sarcastic);
+  print sincere, "\n";
+
+  // Exercising the new rules for how strings are printed,
+  // namely that a string is only printed verbatim if the value
+  // is statically known to be a seq<char>
+
+  var mightBeString := Some(trickyString);
+  print mightBeString, "\n";
+  print mightBeString.value, "\n";
+
+  // Note that the string is printed as a string, but with double quotes and escaping
+  var definitelyString := SomeString(stringThatNeedsEscaping);
+  print definitelyString, "\n";
+
+  var tupleOfString := (stringThatNeedsEscaping, 42);
+  print tupleOfString, "\n";
+}
+
+method CastChar(c: char) {
+  if (c as int < 0x80) {
+    var asInt8 := c as int8;
+    AssertAndExpect(asInt8 as char == c);
+  }
+  if (c as int < 0x100) {
+    var asUint8 := c as uint8;
+    AssertAndExpect(asUint8 as char == c);
+  }
+  if (c as int < 0x8000) {
+    var asInt16 := c as int16;
+    AssertAndExpect(asInt16 as char == c);
+  }
+  if (c as int < 0x1_0000) {
+    var asUint16 := c as uint16;
+    AssertAndExpect(asUint16 as char == c);
+  }
+  var asInt32 := c as int32;
+  AssertAndExpect(asInt32 as char == c);
+  var asInt64 := c as int64;
+  AssertAndExpect(asInt64 as char == c);
+  var asInt := c as int;
+  AssertAndExpect(asInt as char == c);
+  var asReal := c as real;
+  AssertAndExpect(asReal as char == c);
+}
+
+// Testing that the runtime implementation of AllChars() is correct
+method CharQuantification() {
+  ghost var allChars := set c: char {:trigger Identity(c)} | true :: Identity(c);
+  ghost var allCodePoints := (set cp: int {:trigger Identity(cp)} | 0 <= cp < 0xD800 :: Identity(cp as char))
+                     + (set cp: int {:trigger Identity(cp)} | 0xE000 <= cp < 0x11_0000 :: Identity(cp as char));
+  assert forall c: char {:trigger Identity(c)} :: 0 <= Identity(c as int) < 0xD800 || 0xE000 <= Identity(c as int) < 0x11_0000;
+  assert forall c: char :: Identity(c) in allChars;
+  assert allChars == allCodePoints;
+
+  // I'd love to expect allChars == allCodePoints, but that's currently
+  // an O(n^2) operation in some runtimes that don't have hashcode-based
+  // set operations, and n here is over a million. :P
+  // Even just computing allChars at runtime seems to be too slow in Javascript. :(
+  // It seems to be fast enough just to iterate over all characters though.
+  expect forall c: char {:trigger Identity(c)} :: 0 <= c as int < 0xD800 || 0xE000 <= c as int < 0x11_0000;
+}
+
+// Dummy identity function just to enable triggers that Dafny and Boogie are happy with
+function Identity<T>(x: T): T { x }
+
+method CharsAndArrows() {
+  var lambda := (c: char) requires c <= 'Z' => c + 1 as char;
+  var fromLambda := lambda('C');
+  print fromLambda, "\n";
+
+  var funcRef := IncrementChar;
+  var fromFuncRef := funcRef('C');
+  print fromFuncRef, "\n";
+}
+
+function IncrementChar(c: char): char 
+  requires c <= 'Z'
+{
+  c + 1 as char
+}
diff --git a/Test/comp/UnicodeStrings.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnicodeStrings.dfy.expect
similarity index 100%
rename from Test/comp/UnicodeStrings.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnicodeStrings.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnicodeStrings.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnicodeStrings.dfy.rs.check
new file mode 100644
index 00000000000..7d2d31cd8d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnicodeStrings.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Unsupported:\ Cannot\ emit\ literal\ expression\ 0\ outside\ of\ expression\ context:\ Microsoft_dDafny_dCompilers_dBuilderSyntaxTree'1\[Microsoft_dDafny_dCompilers_dStatementContainer]</i>.*
\ No newline at end of file
diff --git a/Test/comp/Uninitialized.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Uninitialized.dfy
similarity index 99%
rename from Test/comp/Uninitialized.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Uninitialized.dfy
index 1b69f1be4ec..db2bb8f886d 100644
--- a/Test/comp/Uninitialized.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Uninitialized.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 module {:options "--function-syntax=4"} Stacks {
   export
diff --git a/Test/comp/Uninitialized.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Uninitialized.dfy.expect
similarity index 100%
rename from Test/comp/Uninitialized.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Uninitialized.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Uninitialized.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Uninitialized.dfy.rs.check
new file mode 100644
index 00000000000..158d9484360
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Uninitialized.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>QuantifierExpr</i>.*
\ No newline at end of file
diff --git a/Test/comp/UnoptimizedErasableTypeWrappers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnoptimizedErasableTypeWrappers.dfy
similarity index 79%
rename from Test/comp/UnoptimizedErasableTypeWrappers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnoptimizedErasableTypeWrappers.dfy
index b7911aed9db..7f1683e8f0a 100644
--- a/Test/comp/UnoptimizedErasableTypeWrappers.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnoptimizedErasableTypeWrappers.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --optimize-erasable-datatype-wrapper:false --relax-definite-assignment --spill-translation
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --optimize-erasable-datatype-wrapper:false --relax-definite-assignment --spill-translation
 
 datatype SingletonRecord = SingletonRecord(u: int)
 datatype WithGhost = WithGhost(u: int, ghost v: int)
diff --git a/Test/comp/UnoptimizedErasableTypeWrappers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnoptimizedErasableTypeWrappers.dfy.expect
similarity index 100%
rename from Test/comp/UnoptimizedErasableTypeWrappers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnoptimizedErasableTypeWrappers.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnoptimizedErasableTypeWrappers.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnoptimizedErasableTypeWrappers.dfy.rs.check
new file mode 100644
index 00000000000..13112028fd1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/UnoptimizedErasableTypeWrappers.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0609]: no field `0` on type `DafnyInt`
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Variance.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Variance.dfy
new file mode 100644
index 00000000000..1b9537a8e4b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Variance.dfy
@@ -0,0 +1,187 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --allow-deprecation
+
+datatype Co<+T> = Co(z: T) {
+    const x: int;
+    const y: seq<T>
+
+    function A(x: T): int { 0 }
+    static function sA(x: T): int { 0 }
+    function gA(ghost x: T): int { 0 }
+    function B(x: seq<T>): int { 0 }
+    function C(x: int): seq<T> { y }
+    function D(x: T): T { x }
+
+    method mA(x: T) returns (r: int) { r := 0; }
+    method mD(x: T) returns (r: T) { r := x; }
+}
+
+datatype Non<T> = Non(T) {
+    const x: int;
+    const y: seq<T>
+
+    function A(x: T): int { 0 }
+    static function sA(x: T): int { 0 }
+    function gA(ghost x: T): int { 0 }
+    function B(x: seq<T>): int { 0 }
+    function C(x: int): seq<T> { y }
+    function D(x: T): T { x }
+
+    method mA(x: T) returns (r: int) { r := 0; }
+    method mD(x: T) returns (r: T) { r := x; }
+}
+
+datatype Cont<-T> = Cont(z: T -> int) {
+    const x: int;
+    const y: seq<T>
+
+    function A(x: T): int { 0 }
+    static function sA(x: T): int { 0 }
+    function gA(ghost x: T): int { 0 }
+    function B(x: seq<T>): int { 0 }
+    function C(x: int): seq<T> { y }
+    function D(x: T): T { x }
+
+    method mA(x: T) returns (r: int) { r := 0; }
+    method mD(x: T) returns (r: T) { r := x; }
+}
+
+codatatype CCo<+T> = CCo(T) {
+    const x: int;
+    const y: seq<T>
+
+    function A(x: T): int { 0 }
+    static function sA(x: T): int { 0 }
+    function gA(ghost x: T): int { 0 }
+    function B(x: seq<T>): int { 0 }
+    function C(x: int): seq<T> { y }
+    function D(x: T): T { x }
+
+    method mA(x: T) returns (r: int) { r := 0; }
+    method mD(x: T) returns (r: T) { r := x; }
+}
+
+codatatype CNon<T> = CNon(z: T) {
+    const x: int;
+    const y: seq<T>
+
+    function A(x: T): int { 0 }
+    static function sA(x: T): int { 0 }
+    function gA(ghost x: T): int { 0 }
+    function B(x: seq<T>): int { 0 }
+    function C(x: int): seq<T> { y }
+    function D(x: T): T { x }
+
+    method mA(x: T) returns (r: int) { r := 0; }
+    method mD(x: T) returns (r: T) { r := x; }
+}
+
+codatatype CCon<-T> = CCon(T -> int) {
+    const x: int;
+    const y: seq<T>
+
+    function A(x: T): int { 0 }
+    static function sA(x: T): int { 0 }
+    function gA(ghost x: T): int { 0 }
+    function B(x: seq<T>): int { 0 }
+    function C(x: int): seq<T> { y }
+    function D(x: T): T { x }
+
+    method mA(x: T) returns (r: int) { r := 0; }
+    method mD(x: T) returns (r: T) { r := x; }
+}
+
+trait X {}
+
+class Int extends X {
+  constructor Int() { }
+}
+
+method Covariant() {
+  var i := new Int.Int();
+  var a: Co<Int> := Co(i);
+  var b: Co<X>; // compilation error (java only): compilation does not support trait types as a type parameter; consider introducing a ghost
+  b := a;
+  print a, " and ", b, "\n";
+
+  var s := Co(false);
+  var t := s.mD(true);
+  var y := s.mA(t);
+  print t, y, s.C(s.x), s.B(s.y), s.A(t), Co.sA(t), s.gA(t), "\n"; 
+}
+
+method Nonvariant() {
+  var i := new Int.Int();
+  var j := new Int.Int();
+  var a: Non<Int> := Non(i);
+  var b: Non<Int>;
+  b := a;
+  print a, " and ", b, "\n";
+  
+  var s := Non(false);
+  var t := s.mD(true);
+  var y := s.mA(t);
+  print t, y, s.C(s.x), s.B(s.y), s.A(t), Non.sA(t), s.gA(t), "\n"; 
+}
+
+method Contravariant() {
+  var i := new Int.Int();
+  var a: Cont<X> := Cont(_ => 0);  // compilation error (java only): compilation does not support trait types as a type parameter; consider introducing a ghost
+  var b: Cont<Int>;
+  b := a;
+  print a.z(i), " and ", b.z(i), "\n";
+
+  var s: Cont<X> := Cont(_ => 1);
+  var t := s.mD(i);
+  var y := s.mA(t);
+  print t, y, s.C(s.x), s.B(s.y), s.A(t), Cont.sA(t), s.gA(t), "\n"; 
+}
+
+method CCovariant() {
+  var i := new Int.Int();
+  var a: CCo<Int> := CCo(i);
+  var b: CCo<X>; // compilation error (java only): compilation does not support trait types as a type parameter; consider introducing a ghost
+  b := a;
+  print a, " and ", b, "\n";
+
+  var s := CCo(false);
+  var t := s.mD(true);
+  var y := s.mA(t);
+  print t, y, s.C(s.x), s.B(s.y), s.A(t), CCo.sA(t), s.gA(t), "\n"; 
+}
+
+method CNonvariant() {
+  var i := new Int.Int();
+  var j := new Int.Int();
+  var a: CNon<Int> := CNon(i);
+  var b: CNon<Int>;
+  b := a;
+  print a, " and ", b, "\n";
+  
+  var s := CNon(false);
+  var t := s.mD(true);
+  var y := s.mA(t);
+  print t, y, s.C(s.x), s.B(s.y), s.A(t), CNon.sA(t), s.gA(t), "\n"; 
+}
+
+method CContravariant() {
+  var a: CCon<X> := CCon(_ => 0); // compilation error (java only): compilation does not support trait types as a type parameter; consider introducing a ghost
+  var b: CCon<Int>;
+  b := a;
+  print a, " and ", b, "\n";
+
+  var s: CCon<X> := CCon(_ => 1);
+  var i := new Int.Int();
+  var t := s.mD(i);
+  var y := s.mA(t);
+  print t, y, s.C(s.x), s.B(s.y), s.A(t), CCon.sA(t), s.gA(t), "\n"; 
+}
+
+method Main(){
+  Covariant();
+  Nonvariant();
+  Contravariant();
+  CCovariant();
+  CNonvariant();
+  CContravariant();
+  print "Done\n";
+}
diff --git a/Test/comp/Variance.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Variance.dfy.expect
similarity index 100%
rename from Test/comp/Variance.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Variance.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Variance.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Variance.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Variance.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Test/comp/Various.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Various.dfy
similarity index 88%
rename from Test/comp/Various.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Various.dfy
index 502801e4c2a..760e87ac39f 100644
--- a/Test/comp/Various.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Various.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Match(tp: (nat, nat)) {
   match tp
diff --git a/Test/comp/Various.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Various.dfy.expect
similarity index 100%
rename from Test/comp/Various.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Various.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Various.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Various.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/Various.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1quiet/CompileRunQuietly.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1quiet/CompileRunQuietly.dfy
new file mode 100644
index 00000000000..ba638344b48
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1quiet/CompileRunQuietly.dfy
@@ -0,0 +1,23 @@
+// RUN: %build --target cs "%s" > "%t"
+// RUN: dotnet %S/CompileRunQuietly.dll >> "%t"
+
+// RUN: %build --target js "%s" >> "%t"
+// RUN: node %S/CompileRunQuietly.js >> "%t"
+
+// RUN: %build --target go "%s" >> "%t"
+// RUN: %S/CompileRunQuietly >> "%t"
+
+// RUN: %build --target java "%s" >> "%t"
+// RUN: java -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/CompileRunQuietly.jar CompileRunQuietly >> "%t"
+
+// RUN: %build --unicode-char false --target cpp "%s" >> "%t"
+// RUN: %S/CompileRunQuietly.exe >> "%t"
+
+// RUN: %build --target py "%s" >> "%t"
+// RUN: python3 %S/CompileRunQuietly-py >> "%t"
+
+ // RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  print "hello, Dafny\n";
+}
diff --git a/Test/comp/compile1quiet/CompileRunQuietly.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1quiet/CompileRunQuietly.dfy.expect
similarity index 100%
rename from Test/comp/compile1quiet/CompileRunQuietly.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1quiet/CompileRunQuietly.dfy.expect
diff --git a/Test/comp/compile1quiet/lit.local.cfg b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1quiet/lit.local.cfg
similarity index 100%
rename from Test/comp/compile1quiet/lit.local.cfg
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1quiet/lit.local.cfg
diff --git a/Test/comp/compile1verbose/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1verbose/.gitignore
similarity index 100%
rename from Test/comp/compile1verbose/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1verbose/.gitignore
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1verbose/CompileAndThenRun.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1verbose/CompileAndThenRun.dfy
new file mode 100644
index 00000000000..408d8ad3f8d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1verbose/CompileAndThenRun.dfy
@@ -0,0 +1,23 @@
+// RUN: %build --verbose --target cs "%s" > "%t"
+// RUN: dotnet %S/CompileAndThenRun.dll >> "%t"
+
+// RUN: %build --verbose --target js "%s" >> "%t"
+// RUN: node %S/CompileAndThenRun.js >> "%t"
+
+// RUN: %build --verbose --target go "%s" >> "%t"
+// RUN: %S/CompileAndThenRun >> "%t"
+
+// RUN: %build --verbose --target java "%s" >> "%t"
+// RUN: java -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/CompileAndThenRun.jar CompileAndThenRun >> "%t"
+
+// RUN: %build --unicode-char false --verbose --target cpp "%s" >> "%t"
+// RUN: %S/CompileAndThenRun.exe >> "%t"
+
+// RUN: %build --verbose --target py "%s" >> "%t"
+// RUN: python3 %S/CompileAndThenRun-py >> "%t"
+
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  print "hello, Dafny\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1verbose/CompileAndThenRun.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1verbose/CompileAndThenRun.dfy.expect
new file mode 100644
index 00000000000..9d23f677a5f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1verbose/CompileAndThenRun.dfy.expect
@@ -0,0 +1,106 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+Compiled assembly into CompileAndThenRun.dll
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to CompileAndThenRun.js
+Additional output written to CompileAndThenRun-js.dtr
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to CompileAndThenRun-go/src/CompileAndThenRun.go
+Additional output written to CompileAndThenRun-go/src/CompileAndThenRun-go.dtr
+Additional output written to CompileAndThenRun-go/src/dafny/dafny.go
+Additional output written to CompileAndThenRun-go/src/dafny/dafnyFromDafny.go
+Additional output written to CompileAndThenRun-go/src/System_/System_.go
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to CompileAndThenRun-java/CompileAndThenRun.java
+Additional output written to CompileAndThenRun-java/CompileAndThenRun-java.dtr
+Additional output written to CompileAndThenRun-java/dafny/Array.java
+Additional output written to CompileAndThenRun-java/dafny/BigOrdinal.java
+Additional output written to CompileAndThenRun-java/dafny/BigRational.java
+Additional output written to CompileAndThenRun-java/dafny/CodePoint.java
+Additional output written to CompileAndThenRun-java/dafny/DafnyEuclidean.java
+Additional output written to CompileAndThenRun-java/dafny/DafnyHaltException.java
+Additional output written to CompileAndThenRun-java/dafny/DafnyMap.java
+Additional output written to CompileAndThenRun-java/dafny/DafnyMultiset.java
+Additional output written to CompileAndThenRun-java/dafny/DafnySequence.java
+Additional output written to CompileAndThenRun-java/dafny/DafnySet.java
+Additional output written to CompileAndThenRun-java/dafny/Helpers.java
+Additional output written to CompileAndThenRun-java/dafny/TypeDescriptor.java
+Additional output written to CompileAndThenRun-java/dafny/Array1.java
+Additional output written to CompileAndThenRun-java/dafny/Array10.java
+Additional output written to CompileAndThenRun-java/dafny/Array11.java
+Additional output written to CompileAndThenRun-java/dafny/Array12.java
+Additional output written to CompileAndThenRun-java/dafny/Array13.java
+Additional output written to CompileAndThenRun-java/dafny/Array14.java
+Additional output written to CompileAndThenRun-java/dafny/Array15.java
+Additional output written to CompileAndThenRun-java/dafny/Array16.java
+Additional output written to CompileAndThenRun-java/dafny/Array2.java
+Additional output written to CompileAndThenRun-java/dafny/Array3.java
+Additional output written to CompileAndThenRun-java/dafny/Array4.java
+Additional output written to CompileAndThenRun-java/dafny/Array5.java
+Additional output written to CompileAndThenRun-java/dafny/Array6.java
+Additional output written to CompileAndThenRun-java/dafny/Array7.java
+Additional output written to CompileAndThenRun-java/dafny/Array8.java
+Additional output written to CompileAndThenRun-java/dafny/Array9.java
+Additional output written to CompileAndThenRun-java/dafny/Function0.java
+Additional output written to CompileAndThenRun-java/dafny/Function1.java
+Additional output written to CompileAndThenRun-java/dafny/Function10.java
+Additional output written to CompileAndThenRun-java/dafny/Function11.java
+Additional output written to CompileAndThenRun-java/dafny/Function12.java
+Additional output written to CompileAndThenRun-java/dafny/Function13.java
+Additional output written to CompileAndThenRun-java/dafny/Function14.java
+Additional output written to CompileAndThenRun-java/dafny/Function15.java
+Additional output written to CompileAndThenRun-java/dafny/Function16.java
+Additional output written to CompileAndThenRun-java/dafny/Function2.java
+Additional output written to CompileAndThenRun-java/dafny/Function3.java
+Additional output written to CompileAndThenRun-java/dafny/Function4.java
+Additional output written to CompileAndThenRun-java/dafny/Function5.java
+Additional output written to CompileAndThenRun-java/dafny/Function6.java
+Additional output written to CompileAndThenRun-java/dafny/Function7.java
+Additional output written to CompileAndThenRun-java/dafny/Function8.java
+Additional output written to CompileAndThenRun-java/dafny/Function9.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple0.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple1.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple10.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple11.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple12.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple13.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple14.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple15.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple16.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple17.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple18.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple19.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple2.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple20.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple3.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple4.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple5.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple6.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple7.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple8.java
+Additional output written to CompileAndThenRun-java/dafny/Tuple9.java
+Additional output written to CompileAndThenRun-java/_System/nat.java
+Additional output written to CompileAndThenRun-java/_System/__default.java
+Wrote executable jar CompileAndThenRun.jar
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to CompileAndThenRun.cpp
+Additional output written to CompileAndThenRun-cpp.dtr
+Additional output written to CompileAndThenRun.h
+Additional output written to DafnyRuntime.h
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to CompileAndThenRun-py/__main__.py
+Additional output written to CompileAndThenRun-py/CompileAndThenRun-py.dtr
+Additional output written to CompileAndThenRun-py/System_/__init__.py
+Additional output written to CompileAndThenRun-py/_dafny/__init__.py
+Additional output written to CompileAndThenRun-py/module_.py
+hello, Dafny
diff --git a/Test/comp/compile1verbose/lit.local.cfg b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1verbose/lit.local.cfg
similarity index 100%
rename from Test/comp/compile1verbose/lit.local.cfg
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile1verbose/lit.local.cfg
diff --git a/Test/comp/compile3/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile3/.gitignore
similarity index 100%
rename from Test/comp/compile3/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile3/.gitignore
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile3/JustRun.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile3/JustRun.dfy
new file mode 100644
index 00000000000..b0413d4c0e3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile3/JustRun.dfy
@@ -0,0 +1,19 @@
+// NONUNIFORM: /compileVerbose:1 output is backend sensitive
+// (although the second set of comamnds could be separated out)
+// RUN: %run --target cs --verbose "%s" > "%t"
+// RUN: %run --target js --verbose "%s" >> "%t"
+// RUN: %run --target go --verbose "%s" >> "%t"
+// RUN: %run --target java --verbose "%s" >> "%t"
+// RUN: %run --target cpp --unicode-char false --verbose "%s" >> "%t"
+// RUN: %run --target py --verbose "%s" >> "%t"
+// RUN: %run --target cs "%s" >> "%t"
+// RUN: %run --target js "%s" >> "%t"
+// RUN: %run --target go "%s" >> "%t"
+// RUN: %run --target java "%s" >> "%t"
+// RUN: %run --target cpp --unicode-char false "%s" >> "%t"
+// RUN: %run --target py "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  print "hello, Dafny\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile3/JustRun.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile3/JustRun.dfy.expect
new file mode 100644
index 00000000000..e78785a18c3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/compile3/JustRun.dfy.expect
@@ -0,0 +1,134 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+Compiled assembly into JustRun.dll
+Running...
+
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Running...
+
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to JustRun-go/src/JustRun.go
+Additional output written to JustRun-go/src/JustRun-go.dtr
+Additional output written to JustRun-go/src/dafny/dafny.go
+Additional output written to JustRun-go/src/dafny/dafnyFromDafny.go
+Additional output written to JustRun-go/src/System_/System_.go
+Running...
+
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to JustRun-java/JustRun.java
+Additional output written to JustRun-java/JustRun-java.dtr
+Additional output written to JustRun-java/dafny/Array.java
+Additional output written to JustRun-java/dafny/BigOrdinal.java
+Additional output written to JustRun-java/dafny/BigRational.java
+Additional output written to JustRun-java/dafny/CodePoint.java
+Additional output written to JustRun-java/dafny/DafnyEuclidean.java
+Additional output written to JustRun-java/dafny/DafnyHaltException.java
+Additional output written to JustRun-java/dafny/DafnyMap.java
+Additional output written to JustRun-java/dafny/DafnyMultiset.java
+Additional output written to JustRun-java/dafny/DafnySequence.java
+Additional output written to JustRun-java/dafny/DafnySet.java
+Additional output written to JustRun-java/dafny/Helpers.java
+Additional output written to JustRun-java/dafny/TypeDescriptor.java
+Additional output written to JustRun-java/dafny/Array1.java
+Additional output written to JustRun-java/dafny/Array10.java
+Additional output written to JustRun-java/dafny/Array11.java
+Additional output written to JustRun-java/dafny/Array12.java
+Additional output written to JustRun-java/dafny/Array13.java
+Additional output written to JustRun-java/dafny/Array14.java
+Additional output written to JustRun-java/dafny/Array15.java
+Additional output written to JustRun-java/dafny/Array16.java
+Additional output written to JustRun-java/dafny/Array2.java
+Additional output written to JustRun-java/dafny/Array3.java
+Additional output written to JustRun-java/dafny/Array4.java
+Additional output written to JustRun-java/dafny/Array5.java
+Additional output written to JustRun-java/dafny/Array6.java
+Additional output written to JustRun-java/dafny/Array7.java
+Additional output written to JustRun-java/dafny/Array8.java
+Additional output written to JustRun-java/dafny/Array9.java
+Additional output written to JustRun-java/dafny/Function0.java
+Additional output written to JustRun-java/dafny/Function1.java
+Additional output written to JustRun-java/dafny/Function10.java
+Additional output written to JustRun-java/dafny/Function11.java
+Additional output written to JustRun-java/dafny/Function12.java
+Additional output written to JustRun-java/dafny/Function13.java
+Additional output written to JustRun-java/dafny/Function14.java
+Additional output written to JustRun-java/dafny/Function15.java
+Additional output written to JustRun-java/dafny/Function16.java
+Additional output written to JustRun-java/dafny/Function2.java
+Additional output written to JustRun-java/dafny/Function3.java
+Additional output written to JustRun-java/dafny/Function4.java
+Additional output written to JustRun-java/dafny/Function5.java
+Additional output written to JustRun-java/dafny/Function6.java
+Additional output written to JustRun-java/dafny/Function7.java
+Additional output written to JustRun-java/dafny/Function8.java
+Additional output written to JustRun-java/dafny/Function9.java
+Additional output written to JustRun-java/dafny/Tuple0.java
+Additional output written to JustRun-java/dafny/Tuple1.java
+Additional output written to JustRun-java/dafny/Tuple10.java
+Additional output written to JustRun-java/dafny/Tuple11.java
+Additional output written to JustRun-java/dafny/Tuple12.java
+Additional output written to JustRun-java/dafny/Tuple13.java
+Additional output written to JustRun-java/dafny/Tuple14.java
+Additional output written to JustRun-java/dafny/Tuple15.java
+Additional output written to JustRun-java/dafny/Tuple16.java
+Additional output written to JustRun-java/dafny/Tuple17.java
+Additional output written to JustRun-java/dafny/Tuple18.java
+Additional output written to JustRun-java/dafny/Tuple19.java
+Additional output written to JustRun-java/dafny/Tuple2.java
+Additional output written to JustRun-java/dafny/Tuple20.java
+Additional output written to JustRun-java/dafny/Tuple3.java
+Additional output written to JustRun-java/dafny/Tuple4.java
+Additional output written to JustRun-java/dafny/Tuple5.java
+Additional output written to JustRun-java/dafny/Tuple6.java
+Additional output written to JustRun-java/dafny/Tuple7.java
+Additional output written to JustRun-java/dafny/Tuple8.java
+Additional output written to JustRun-java/dafny/Tuple9.java
+Additional output written to JustRun-java/_System/nat.java
+Additional output written to JustRun-java/_System/__default.java
+Wrote executable jar JustRun.jar
+Running...
+
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to JustRun.cpp
+Additional output written to JustRun-cpp.dtr
+Additional output written to JustRun.h
+Additional output written to DafnyRuntime.h
+Running...
+
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to JustRun-py/__main__.py
+Additional output written to JustRun-py/JustRun-py.dtr
+Additional output written to JustRun-py/System_/__init__.py
+Additional output written to JustRun-py/_dafny/__init__.py
+Additional output written to JustRun-py/module_.py
+Running...
+
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+hello, Dafny
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/elseWithHavocStatement.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/elseWithHavocStatement.dfy
new file mode 100644
index 00000000000..3a8d1c492e7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/elseWithHavocStatement.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+method Main() {
+    var b: bool :| true; 
+    var r: int;
+    if b {
+      r := 13;
+    } else {
+      r := *;
+    }
+    print r;
+}
\ No newline at end of file
diff --git a/Test/comp/elseWithHavocStatement.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/elseWithHavocStatement.dfy.expect
similarity index 100%
rename from Test/comp/elseWithHavocStatement.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/elseWithHavocStatement.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/externalImportsAndExports/dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/externalImportsAndExports/dfyconfig.toml
new file mode 100644
index 00000000000..2ac09e5ddb3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/externalImportsAndExports/dfyconfig.toml
@@ -0,0 +1,6 @@
+includes = ["./exportedAndTestExternAssumptions.dfy"]
+
+[options]
+test-assumptions="externs"
+allow-axioms=true
+allow-external-contracts=true 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/externalImportsAndExports/exportedAndTestExternAssumptions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/externalImportsAndExports/exportedAndTestExternAssumptions.dfy
new file mode 100644
index 00000000000..d526b0fa034
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/externalImportsAndExports/exportedAndTestExternAssumptions.dfy
@@ -0,0 +1,55 @@
+// This file tests whether it's possible to export Dafny members using {:extern} annotations, AND
+// tests whether 'test-assumptions="externs"' adds dynamic contracts to exported members 
+// RUN: %testDafnyForEachCompiler "%s" --run-fails -- --find-project
+predicate Pre(x: int, y: int) {
+  x > y
+}
+
+class Foo {
+
+  var x: int
+  var y: int
+
+  constructor {:extern} (x: int, y: int) 
+    requires Pre(x, y)
+  {
+      this.x := x; 
+      this.y := y;
+  }
+
+  static method {:extern} Builder(x: int, y: int) returns (r: Foo)
+    requires Pre(x, y)
+  {
+    r := new Foo(x, y);
+  }
+
+  method {:extern} GetX() returns (r: int) {
+    r := x;
+  }
+
+  function {:extern} AddY(r: int): int
+    reads this 
+  {
+    r + y
+  }
+
+  static function {:extern} AddOne(r: int): int {
+    r + 1
+  }
+
+  //static method {:extern} IncorrectEnsuresClause() returns (x: nat)
+  //  ensures x == 3 {
+  //  assume {:axiom} false;
+  //  return 2;
+  //}
+}
+
+method Main() {
+  var foo := Foo.Builder(3, 2);
+  var x := foo.GetX(); 
+  print Foo.AddOne(foo.AddY(x)), "\n";
+
+  assume {:axiom} false;
+  var foo2 := Foo.Builder(2, 3);
+  print "oops";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/externalImportsAndExports/exportedAndTestExternAssumptions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/externalImportsAndExports/exportedAndTestExternAssumptions.dfy.expect
new file mode 100644
index 00000000000..4cc11f87388
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/externalImportsAndExports/exportedAndTestExternAssumptions.dfy.expect
@@ -0,0 +1,2 @@
+6
+[Program halted] exportedAndTestExternAssumptions.dfy(21,16): Runtime failure of requires clause from exportedAndTestExternAssumptions.dfy(21,16)
diff --git a/Test/comp/firstSteps/0_IKnowThisMuchIs.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/0_IKnowThisMuchIs.dfy
similarity index 82%
rename from Test/comp/firstSteps/0_IKnowThisMuchIs.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/0_IKnowThisMuchIs.dfy
index 2cf77360cab..a0913b370bb 100644
--- a/Test/comp/firstSteps/0_IKnowThisMuchIs.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/0_IKnowThisMuchIs.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 //
 // An extremely small program intended to be the first target input for
 // brand new Dafny compilers. Avoids any use of strings (and therefore sequences)
diff --git a/Test/comp/firstSteps/0_IKnowThisMuchIs.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/0_IKnowThisMuchIs.dfy.expect
similarity index 100%
rename from Test/comp/firstSteps/0_IKnowThisMuchIs.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/0_IKnowThisMuchIs.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/1_Calls-F.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/1_Calls-F.dfy
new file mode 100644
index 00000000000..06e4083797e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/1_Calls-F.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+//
+// This fragment of comp/Calls.dfy serves to facilitate incremental compiler development.
+
+function F(x: int, y: bool): int {
+  x + if y then 2 else 3
+}
+
+method Main() {
+  var w;
+  w := F(2, false);
+  print w, "\n";
+}
diff --git a/Test/comp/firstSteps/1_Calls-F.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/1_Calls-F.dfy.expect
similarity index 100%
rename from Test/comp/firstSteps/1_Calls-F.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/1_Calls-F.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/2_Modules.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/2_Modules.dfy
new file mode 100644
index 00000000000..1778c50274c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/2_Modules.dfy
@@ -0,0 +1,19 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+module A {
+  const i: nat := 1
+
+  class X {}
+}
+
+module B {
+  const i: nat := 2
+
+  module X {
+    const i: nat := 3
+  }
+}
+
+method Main(){
+  print A.i, " ", B.i, " ", B.X.i, "\n";
+}
diff --git a/Test/comp/firstSteps/2_Modules.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/2_Modules.dfy.expect
similarity index 100%
rename from Test/comp/firstSteps/2_Modules.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/2_Modules.dfy.expect
diff --git a/Test/comp/firstSteps/3_Calls-As.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/3_Calls-As.dfy
similarity index 88%
rename from Test/comp/firstSteps/3_Calls-As.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/3_Calls-As.dfy
index 38889421865..3e008fe35ca 100644
--- a/Test/comp/firstSteps/3_Calls-As.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/3_Calls-As.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 //
 // This fragment of comp/Calls.dfy serves to facilitate incremental compiler development.
 
diff --git a/Test/comp/firstSteps/3_Calls-As.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/3_Calls-As.dfy.expect
similarity index 100%
rename from Test/comp/firstSteps/3_Calls-As.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/3_Calls-As.dfy.expect
diff --git a/Test/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy
similarity index 90%
rename from Test/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy
index 6a66781ff0d..c7594aba4b7 100644
--- a/Test/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 //
 // This fragment of comp/Calls.dfy serves to facilitate incremental compiler development.
 
diff --git a/Test/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy.expect
similarity index 100%
rename from Test/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy.rs.check
new file mode 100644
index 00000000000..2a0f83900f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/4_Calls-FunctionsValues-Class+NT.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: (0,-1): Error: Feature not supported for this compilation target: The /runAllTests option
\ No newline at end of file
diff --git a/Test/comp/firstSteps/5_Calls-FunctionsValues-Dt.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/5_Calls-FunctionsValues-Dt.dfy
similarity index 86%
rename from Test/comp/firstSteps/5_Calls-FunctionsValues-Dt.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/5_Calls-FunctionsValues-Dt.dfy
index 1175b1eca8f..fb151935e06 100644
--- a/Test/comp/firstSteps/5_Calls-FunctionsValues-Dt.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/5_Calls-FunctionsValues-Dt.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 //
 // This fragment of comp/Calls.dfy serves to facilitate incremental compiler development.
 
diff --git a/Test/comp/firstSteps/5_Calls-FunctionsValues-Dt.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/5_Calls-FunctionsValues-Dt.dfy.expect
similarity index 100%
rename from Test/comp/firstSteps/5_Calls-FunctionsValues-Dt.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/5_Calls-FunctionsValues-Dt.dfy.expect
diff --git a/Test/comp/firstSteps/6_Calls-VariableCapture.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/6_Calls-VariableCapture.dfy
similarity index 96%
rename from Test/comp/firstSteps/6_Calls-VariableCapture.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/6_Calls-VariableCapture.dfy
index 5d970ac4de5..bd2c4b3b0d0 100644
--- a/Test/comp/firstSteps/6_Calls-VariableCapture.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/6_Calls-VariableCapture.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 //
 // This fragment of comp/Calls.dfy serves to facilitate incremental compiler development.
 
diff --git a/Test/comp/firstSteps/6_Calls-VariableCapture.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/6_Calls-VariableCapture.dfy.expect
similarity index 100%
rename from Test/comp/firstSteps/6_Calls-VariableCapture.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/6_Calls-VariableCapture.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/6_Calls-VariableCapture.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/6_Calls-VariableCapture.dfy.rs.check
new file mode 100644
index 00000000000..3af9b33776f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/6_Calls-VariableCapture.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>SubtypeConstraintsInQuantifiers</i>.*
\ No newline at end of file
diff --git a/Test/comp/firstSteps/7_Arrays.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Arrays.dfy
similarity index 94%
rename from Test/comp/firstSteps/7_Arrays.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Arrays.dfy
index d02c942c9bb..101775aff03 100644
--- a/Test/comp/firstSteps/7_Arrays.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Arrays.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 //
 // This fragment of comp/Arrays.dfy serves to facilitate incremental compiler development.
 
diff --git a/Test/comp/firstSteps/7_Arrays.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Arrays.dfy.expect
similarity index 100%
rename from Test/comp/firstSteps/7_Arrays.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Arrays.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Arrays.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Arrays.dfy.rs.check
new file mode 100644
index 00000000000..3d586af71fb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Arrays.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0061]: this function takes 1 argument but 0 arguments were supplied
\ No newline at end of file
diff --git a/Test/comp/firstSteps/7_Dt_Algebraic.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy
similarity index 95%
rename from Test/comp/firstSteps/7_Dt_Algebraic.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy
index 837d0c8de28..c37d2974ec7 100644
--- a/Test/comp/firstSteps/7_Dt_Algebraic.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy
@@ -1,5 +1,5 @@
 // NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 //
 // This fragment of comp/Dt.dfy serves to facilitate incremental compiler development.
 
diff --git a/Test/comp/firstSteps/7_Dt_Algebraic.dfy.cs.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.cs.expect
similarity index 100%
rename from Test/comp/firstSteps/7_Dt_Algebraic.dfy.cs.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.cs.expect
diff --git a/Test/comp/firstSteps/7_Dt_Algebraic.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.expect
similarity index 100%
rename from Test/comp/firstSteps/7_Dt_Algebraic.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.expect
diff --git a/Test/comp/firstSteps/7_Dt_Algebraic.dfy.go.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.go.expect
similarity index 100%
rename from Test/comp/firstSteps/7_Dt_Algebraic.dfy.go.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.go.expect
diff --git a/Test/comp/firstSteps/7_Dt_Algebraic.dfy.java.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.java.expect
similarity index 100%
rename from Test/comp/firstSteps/7_Dt_Algebraic.dfy.java.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.java.expect
diff --git a/Test/comp/firstSteps/7_Dt_Algebraic.dfy.js.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.js.expect
similarity index 100%
rename from Test/comp/firstSteps/7_Dt_Algebraic.dfy.js.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.js.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.rs.check
new file mode 100644
index 00000000000..9be48cfdfeb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/firstSteps/7_Dt_Algebraic.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitDatatypeBoundedPool</i>.*
\ No newline at end of file
diff --git a/Test/comp/lit.local.cfg b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/lit.local.cfg
similarity index 100%
rename from Test/comp/lit.local.cfg
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/lit.local.cfg
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/ManualCompile.csproj b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/ManualCompile.csproj
new file mode 100644
index 00000000000..a269962b552
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/ManualCompile.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/ManualCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/ManualCompile.dfy
new file mode 100644
index 00000000000..7adf33da4c7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/ManualCompile.dfy
@@ -0,0 +1,28 @@
+// NONUNIFORM: Highly target language specific
+
+// RUN: %translate cs --verbose --include-runtime "%s" > "%t"
+// RUN: dotnet build %S/ManualCompile.csproj
+// RUN: dotnet %S/bin/Debug/net8.0/ManualCompile.dll >> "%t"
+
+// RUN: %translate js --verbose --include-runtime "%s" >> "%t"
+// RUN: node %S/ManualCompile.js >> "%t"
+
+// RUN: %translate go --verbose --include-runtime "%s" >> "%t"
+// RUN: env GO111MODULE=auto GOPATH=%S/ManualCompile-go go run %S/ManualCompile-go/src/ManualCompile.go >> "%t"
+
+// RUN: %translate java --verbose --include-runtime "%s" >> "%t"
+// RUN: javac %S/ManualCompile-java/ManualCompile.java %S/ManualCompile-java/**/*.java
+// RUN: java -cp %S/ManualCompile-java ManualCompile >> "%t"
+
+// RUN: %translate cpp --verbose --unicode-char=false --include-runtime "%s" >> "%t"
+// RUN: g++ -g -Wall -Wextra -Wpedantic -Wno-unused-variable -std=c++17 -I %binaryDir -o %S/ManualCompile.exe %S/ManualCompile.cpp
+// RUN: %S/ManualCompile.exe >> "%t"
+
+// RUN: %translate py --verbose "%s" --include-runtime >> "%t"
+// RUN: python3 %S/ManualCompile-py >> "%t"
+
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  print "hello, Dafny\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/ManualCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/ManualCompile.dfy.expect
new file mode 100644
index 00000000000..8edb238e481
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/ManualCompile.dfy.expect
@@ -0,0 +1,106 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to ManualCompile.cs
+Additional output written to ManualCompile-cs.dtr
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to ManualCompile.js
+Additional output written to ManualCompile-js.dtr
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to ManualCompile-go/src/ManualCompile.go
+Additional output written to ManualCompile-go/src/ManualCompile-go.dtr
+Additional output written to ManualCompile-go/src/dafny/dafny.go
+Additional output written to ManualCompile-go/src/dafny/dafnyFromDafny.go
+Additional output written to ManualCompile-go/src/System_/System_.go
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to ManualCompile-java/ManualCompile.java
+Additional output written to ManualCompile-java/ManualCompile-java.dtr
+Additional output written to ManualCompile-java/dafny/Array.java
+Additional output written to ManualCompile-java/dafny/BigOrdinal.java
+Additional output written to ManualCompile-java/dafny/BigRational.java
+Additional output written to ManualCompile-java/dafny/CodePoint.java
+Additional output written to ManualCompile-java/dafny/DafnyEuclidean.java
+Additional output written to ManualCompile-java/dafny/DafnyHaltException.java
+Additional output written to ManualCompile-java/dafny/DafnyMap.java
+Additional output written to ManualCompile-java/dafny/DafnyMultiset.java
+Additional output written to ManualCompile-java/dafny/DafnySequence.java
+Additional output written to ManualCompile-java/dafny/DafnySet.java
+Additional output written to ManualCompile-java/dafny/Helpers.java
+Additional output written to ManualCompile-java/dafny/TypeDescriptor.java
+Additional output written to ManualCompile-java/dafny/Array1.java
+Additional output written to ManualCompile-java/dafny/Array10.java
+Additional output written to ManualCompile-java/dafny/Array11.java
+Additional output written to ManualCompile-java/dafny/Array12.java
+Additional output written to ManualCompile-java/dafny/Array13.java
+Additional output written to ManualCompile-java/dafny/Array14.java
+Additional output written to ManualCompile-java/dafny/Array15.java
+Additional output written to ManualCompile-java/dafny/Array16.java
+Additional output written to ManualCompile-java/dafny/Array2.java
+Additional output written to ManualCompile-java/dafny/Array3.java
+Additional output written to ManualCompile-java/dafny/Array4.java
+Additional output written to ManualCompile-java/dafny/Array5.java
+Additional output written to ManualCompile-java/dafny/Array6.java
+Additional output written to ManualCompile-java/dafny/Array7.java
+Additional output written to ManualCompile-java/dafny/Array8.java
+Additional output written to ManualCompile-java/dafny/Array9.java
+Additional output written to ManualCompile-java/dafny/Function0.java
+Additional output written to ManualCompile-java/dafny/Function1.java
+Additional output written to ManualCompile-java/dafny/Function10.java
+Additional output written to ManualCompile-java/dafny/Function11.java
+Additional output written to ManualCompile-java/dafny/Function12.java
+Additional output written to ManualCompile-java/dafny/Function13.java
+Additional output written to ManualCompile-java/dafny/Function14.java
+Additional output written to ManualCompile-java/dafny/Function15.java
+Additional output written to ManualCompile-java/dafny/Function16.java
+Additional output written to ManualCompile-java/dafny/Function2.java
+Additional output written to ManualCompile-java/dafny/Function3.java
+Additional output written to ManualCompile-java/dafny/Function4.java
+Additional output written to ManualCompile-java/dafny/Function5.java
+Additional output written to ManualCompile-java/dafny/Function6.java
+Additional output written to ManualCompile-java/dafny/Function7.java
+Additional output written to ManualCompile-java/dafny/Function8.java
+Additional output written to ManualCompile-java/dafny/Function9.java
+Additional output written to ManualCompile-java/dafny/Tuple0.java
+Additional output written to ManualCompile-java/dafny/Tuple1.java
+Additional output written to ManualCompile-java/dafny/Tuple10.java
+Additional output written to ManualCompile-java/dafny/Tuple11.java
+Additional output written to ManualCompile-java/dafny/Tuple12.java
+Additional output written to ManualCompile-java/dafny/Tuple13.java
+Additional output written to ManualCompile-java/dafny/Tuple14.java
+Additional output written to ManualCompile-java/dafny/Tuple15.java
+Additional output written to ManualCompile-java/dafny/Tuple16.java
+Additional output written to ManualCompile-java/dafny/Tuple17.java
+Additional output written to ManualCompile-java/dafny/Tuple18.java
+Additional output written to ManualCompile-java/dafny/Tuple19.java
+Additional output written to ManualCompile-java/dafny/Tuple2.java
+Additional output written to ManualCompile-java/dafny/Tuple20.java
+Additional output written to ManualCompile-java/dafny/Tuple3.java
+Additional output written to ManualCompile-java/dafny/Tuple4.java
+Additional output written to ManualCompile-java/dafny/Tuple5.java
+Additional output written to ManualCompile-java/dafny/Tuple6.java
+Additional output written to ManualCompile-java/dafny/Tuple7.java
+Additional output written to ManualCompile-java/dafny/Tuple8.java
+Additional output written to ManualCompile-java/dafny/Tuple9.java
+Additional output written to ManualCompile-java/_System/nat.java
+Additional output written to ManualCompile-java/_System/__default.java
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to ManualCompile.cpp
+Additional output written to ManualCompile-cpp.dtr
+Additional output written to ManualCompile.h
+Additional output written to DafnyRuntime.h
+hello, Dafny
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrote textual form of target program to ManualCompile-py/__main__.py
+Additional output written to ManualCompile-py/ManualCompile-py.dtr
+Additional output written to ManualCompile-py/System_/__init__.py
+Additional output written to ManualCompile-py/_dafny/__init__.py
+Additional output written to ManualCompile-py/module_.py
+hello, Dafny
diff --git a/Test/comp/manualcompile/lit.local.cfg b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/lit.local.cfg
similarity index 100%
rename from Test/comp/manualcompile/lit.local.cfg
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/manualcompile/lit.local.cfg
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/moduleDatatypeNameCollision/moduleDatatypeNameCollision.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/moduleDatatypeNameCollision/moduleDatatypeNameCollision.dfy
new file mode 100644
index 00000000000..d31b83bf113
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/moduleDatatypeNameCollision/moduleDatatypeNameCollision.dfy
@@ -0,0 +1,18 @@
+// NONUNIFORM: this fails on Java
+// RUN: %run --target go %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+module DuplicateName {
+  const x := 3 
+}
+
+module ProblemModule {
+  datatype DuplicateName = DuplicateName
+}
+
+import D = DuplicateName
+
+method Main() {
+  print D.x;
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/moduleDatatypeNameCollision/moduleDatatypeNameCollision.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/moduleDatatypeNameCollision/moduleDatatypeNameCollision.dfy.expect
new file mode 100644
index 00000000000..cbcb1cc5dda
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/moduleDatatypeNameCollision/moduleDatatypeNameCollision.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+3
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/source.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/source.dfy
new file mode 100644
index 00000000000..8ff7493d45d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/source.dfy
@@ -0,0 +1,27 @@
+// RUN: echo 'lit should ignore this file'
+
+
+method Main() {
+  InDefaultModule();
+  var x := new SomeModule.ClassInSomeModule();
+  print x.x;
+}
+
+method InDefaultModule() {
+  var x := 3;
+}
+
+class ClassInDefaultModule { // Extern does not work in JS {:extern "ClassInDefaultModuleCustomName" } 
+  const x: int := 3 
+}
+
+module SomeModule { // Extern does not work in JS  {:extern "SomeModuleCustomName" } 
+  method InSomeModule() {
+    var x := 3;
+  } 
+  class ClassInSomeModule { // Extern does not work in JS {:extern "ClassInSomeModuleCustomName" } 
+    const x := 3
+    
+    constructor() { }
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateCsharp.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateCsharp.dfy
new file mode 100644
index 00000000000..e2fa0cae821
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateCsharp.dfy
@@ -0,0 +1,6 @@
+// RUN: %baredafny translate cs %args %s --outer-module="my.happy" --output=%S/output/translated.cs
+// RUN: %OutputCheck --file-to-check %S/output/translated.cs "%s"
+// CHECK: namespace my\.happy\.SomeModule {
+// CHECK: namespace my\.happy {
+
+include "./source.dfy"
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateGo.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateGo.dfy
new file mode 100644
index 00000000000..45533adc597
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateGo.dfy
@@ -0,0 +1,5 @@
+// RUN: %baredafny translate go %args %s --outer-module="my.happy" --output=%S/output/
+// RUN: %OutputCheck --file-to-check %S/output/-go/src/.go "%s"
+// CHECK: my_happy_SomeModule "my_happy_SomeModule"
+
+include "./source.dfy"
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateJava.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateJava.dfy
new file mode 100644
index 00000000000..53a479bef57
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateJava.dfy
@@ -0,0 +1,5 @@
+// RUN: %baredafny translate java %args %s --outer-module="my.happy" --output=%S/output/myjava
+// RUN: %OutputCheck --file-to-check %S/output/myjava-java/myjava.java "%s"
+// CHECK: my\.happy
+
+include "./source.dfy"
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateJs.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateJs.dfy
new file mode 100644
index 00000000000..c6eec534880
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translateJs.dfy
@@ -0,0 +1,6 @@
+// RUN: %baredafny translate js %args %s --outer-module="my.happy" --output=%S/output/js
+// RUN: %OutputCheck --file-to-check %S/output/js.js "%s"
+// CHECK: let my_happy_SomeModule
+// CHECK: my_happy =
+
+include "./source.dfy"
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translatePy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translatePy.dfy
new file mode 100644
index 00000000000..fbdac523f30
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/outerModules/translatePy.dfy
@@ -0,0 +1,6 @@
+// RUN: %baredafny translate py %args %s --outer-module="my.happy" --output=%S/output/
+// RUN: %OutputCheck --file-to-check %S/output/-py/my_happy.py "%s"
+// We could update PythonCompiler to it puts every module in a separate folder: %OutputCheck --file-to-check %S/output/-py/my/happy.py "%s"
+// CHECK: import my_happy_SomeModule
+
+include "./source.dfy"
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/Interop.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/Interop.cs
new file mode 100644
index 00000000000..a7d7eda5ee6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/Interop.cs
@@ -0,0 +1,20 @@
+
+using System.Numerics;
+
+namespace Interop {
+
+  public static partial class __default {
+    public static BigInteger Int32ToInt(int value) {
+      return new BigInteger(value);
+    }
+    public static Std.Wrappers._IOption<int> IntToInt32(BigInteger value) {
+      if (value > int.MaxValue || value < int.MinValue) {
+        return Std.Wrappers.Option<int>.create_None();
+      }
+      else
+      {
+        return Std.Wrappers.Option<int>.create_Some((int)value);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/Interop/__default.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/Interop/__default.java
new file mode 100644
index 00000000000..0c51ed5cf1a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/Interop/__default.java
@@ -0,0 +1,24 @@
+
+
+
+package Interop;
+
+import java.lang.Integer;
+import java.math.BigInteger;
+import dafny.TypeDescriptor;
+
+public class __default {
+  public static Integer IntegerMaxValue() {
+    return Integer.MAX_VALUE;
+  }
+  public static BigInteger Int32ToInt(Integer value) {
+    return BigInteger.valueOf(value);
+  }
+  public static Std.Wrappers.Option<Integer> IntToInt32(BigInteger value) {
+    try {
+      return Std.Wrappers.Option.create_Some(TypeDescriptor.intWithDefault(0), (Integer)value.intValueExact());
+    } catch(ArithmeticException e) {
+      return Std.Wrappers.Option.create_None(TypeDescriptor.intWithDefault(0));
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/random.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/random.dfy
new file mode 100644
index 00000000000..ba9a46c9755
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/random.dfy
@@ -0,0 +1,5 @@
+
+replaceable module DfyRandom {
+  method GetRandomNat(ceiling: nat) returns (r: nat) 
+    ensures r < ceiling
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/randomCSharp.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/randomCSharp.dfy
new file mode 100644
index 00000000000..8d0e635dd6a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/randomCSharp.dfy
@@ -0,0 +1,46 @@
+
+module RandomCSharp replaces DfyRandom {
+  import opened CSharpSystem
+  import opened Interop
+  
+  method GetRandomNat ... {
+    var random := new Random();
+    
+    var ceilingInt32 := IntToInt32(ceiling).GetOr(Int32.MaxValue);
+    Int32.MaxValueValue();
+    var resultInt32 := random.Next(IntToInt32(0).Extract(), ceilingInt32);
+    var resultInt := Int32ToInt(resultInt32);
+    return resultInt as nat;
+  }
+}
+
+module Interop {
+  import opened CSharpSystem
+  import opened Std.Wrappers
+  
+  function {:axiom} {:extern} IntToInt32(value: int): Option<Int32>
+    ensures var r := IntToInt32(value); 
+      if value <= Int32.MaxValue.value 
+        then r.Some? && r.Extract().value == value
+        else r.None?
+    
+  function {:axiom} {:extern} Int32ToInt(value: Int32): int
+    ensures Int32ToInt(value) == value.value
+}
+
+module {:extern "System"} CSharpSystem {
+  
+  class {:extern "Int32" } Int32 {
+    ghost var value: int
+    static const {:extern} MaxValue: Int32
+    
+    static lemma {:axiom} MaxValueValue() ensures MaxValue.value == 2147483647
+  }
+  
+  class {:extern "Random" } Random {
+    constructor {:extern} ()
+    
+    method {:axiom} {:extern} Next(minValue: Int32, maxValue: Int32) returns (r: Int32)
+      ensures minValue.value <= r.value && r.value < maxValue.value
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/randomJava.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/randomJava.dfy
new file mode 100644
index 00000000000..4416281b10b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/randomJava.dfy
@@ -0,0 +1,58 @@
+
+module RandomJava replaces DfyRandom {
+  import opened Interop
+  import opened JavaLang
+  import opened JavaRest
+  
+  method GetRandomNat ... {
+    var random := new JavaRandom();
+    
+    var ceilingInt32 := IntToInt32(ceiling).GetOr(IntegerMaxValue());
+    assert ceilingInt32.value <= ceiling;
+    var resultInt32 := random.Next(ceilingInt32);
+    var resultInt := Int32ToInt(resultInt32);
+    return resultInt as nat;
+  }
+}
+
+module Interop {
+  import opened JavaLang
+  import opened Std.Wrappers
+  
+  const int32MaxValue := 2147483647
+  
+  function {:axiom} {:extern} IntToInt32(value: int): Option<Integer>
+    ensures var r := IntToInt32(value); 
+      if value <= int32MaxValue 
+        then r.Some? && r.Extract().value == value
+        else r.None?
+    
+  function {:axiom} {:extern} Int32ToInt(value: Integer): int
+    ensures Int32ToInt(value) == value.value
+  
+  function {:axiom} {:extern} IntegerMaxValue(): Integer
+    ensures IntegerMaxValue().value == int32MaxValue
+}
+  
+module {:extern "java.lang"} JavaLang {
+
+  class {:extern "Integer" } Integer {
+    ghost var value: int
+    // Would be nice to have an ensures here that equates it to 2147483647
+    // So we would not need Interop.int32MaxValue
+    // Sadly this maps to MAX_VALUE() (note the incorrect parenthesis)
+    // static const {:extern "MAX_VALUE"} MaxValue: Integer 
+  }
+
+}
+module {:extern "java.util"} JavaRest {
+  import opened JavaLang
+  import opened Interop
+  
+  class {:extern "Random" } JavaRandom {
+    constructor {:extern} ()
+    
+    method {:axiom} {:extern "nextInt"} Next(bound: Integer) returns (r: Integer)
+      ensures 0 <= r.value && r.value < bound.value
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/wrappers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/wrappers.dfy
new file mode 100644
index 00000000000..e328390a1fe
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/Inputs/wrappers.dfy
@@ -0,0 +1,205 @@
+/*******************************************************************************
+ *  Copyright by the contributors to the Dafny Project
+ *  SPDX-License-Identifier: MIT 
+ *******************************************************************************/
+
+/** This module provides various kinds of failure-compatible datatypes, including Option.
+- Option<R> (Some or None) with a type parameter R that is the type of the Some value
+- Outcome<E> (Pass or Fail) with a type parameter E that is the type of a failure value
+- Result<R,E> which has both a value type and a failure type
+All three of these may be used with `:-` as Dafny failure-compatible types
+
+The module also defines two forms of `Need`, that check the truth of a predicate and
+return a failure value if false.
+ */
+module Std.Wrappers {
+
+  /** This datatype is the conventional Some/None datatype that is often used
+      in place of a reference or null.
+   */
+  datatype Option<+T> = None | Some(value: T) {
+
+    /** True if is None */
+    predicate IsFailure() {
+      None?
+    }
+
+    /** Converts a None result to an Option value with a different value type. */
+    function PropagateFailure<U>(): Option<U>
+      requires None?
+    {
+      None
+    }
+
+    /** Returns the value encapsulated in Some */
+    function Extract(): T
+      requires Some?
+    {
+      value
+    }
+
+    /** Returns the value encapsulated in Some or a default value if None */
+    function GetOr(default: T): T {
+      match this
+      case Some(v) => v
+      case None() => default
+    }
+
+    /** Converts the datatype value to a Result value (with the given error value) */
+    function ToResult<E>(error: E): Result<T, E> {
+      match this
+      case Some(v) => Success(v)
+      case None() => Failure(error)
+    }
+
+    /** Converts the datatype value to an Outcome value (with the given error value) */
+    function ToOutcome<E>(error: E): Outcome<E> {
+      match this
+      case Some(v) => Pass
+      case None() => Fail(error)
+    }
+
+    /** Applies the given function to convert the Option to something else  */
+    function Map<FC>(rewrap: Option<T> -> FC): FC
+    {
+      rewrap(this)
+    }
+  }
+
+  /** A Success/Failure failure-compatible datatype that carries either a success value or an error value */
+  datatype Result<+R, +E> = | Success(value: R) | Failure(error: E) {
+
+    /** True if is Failure */
+    predicate IsFailure() {
+      Failure?
+    }
+
+    /** Converts a Failure value to an alternate Result that has a different value type but the same error type */
+    function PropagateFailure<U>(): (r: Result<U, E>)
+      requires Failure?
+    {
+      Failure(this.error)
+    }
+
+    /** Returns the value encapsulated in Success */
+    function Extract(): R
+      requires Success?
+    {
+      value
+    }
+
+    /** Returns the value encapsulated in Success or a default value if Failure */
+    function GetOr(default: R): R
+    {
+      match this
+      case Success(s) => s
+      case Failure(e) => default
+    }
+
+    /** Converts the Result to an Option */
+    function ToOption(): Option<R>
+    {
+      match this
+      case Success(s) => Some(s)
+      case Failure(e) => None()
+    }
+
+    /** Converts the Result to an Outcome */
+    function ToOutcome(): Outcome<E>
+    {
+      match this
+      case Success(s) => Pass
+      case Failure(e) => Fail(e)
+    }
+
+    /** Applies the given function to convert the Result to something else */
+    function Map<FC>(rewrap: Result<R,E> -> FC): FC
+    {
+      rewrap(this)
+    }
+
+    /** Applies the given function to convert the Result to something else with the same Success type */
+    function MapFailure<NewE>(reWrap: E -> NewE): Result<R, NewE>
+    {
+      match this
+      case Success(s) => Success(s)
+      case Failure(e) => Failure(reWrap(e))
+    }
+  }
+
+  /** A Pass/Fail failure-compatible datatype that carries an error value, but is not 'value-carrying' */
+  datatype Outcome<+E> = Pass | Fail(error: E) {
+
+    predicate IsFailure() {
+      Fail?
+    }
+
+
+    function PropagateFailure(): Outcome<E>
+      requires Fail?
+    {
+      this
+    }
+    // Note: no Extract method, intentionally
+
+    /** Converts to an Option */
+    function ToOption<R>(r: R): Option<R>
+    {
+      match this
+      case Pass => Some(r)
+      case Fail(e) => None()
+    }
+
+    /** Converts to a Result */
+    function ToResult<R>(r: R): Result<R,E>
+    {
+      match this
+      case Pass => Success(r)
+      case Fail(e) => Failure(e)
+    }
+
+    /** Applies the given function to convert to something else */
+    function Map<FC>(rewrap: Outcome<E> -> FC): FC
+    {
+      rewrap(this)
+    }
+
+    /** Converts to a Result with a different error type */
+    function MapFailure<T,NewE>(rewrap: E-> NewE, default: T): Result<T, NewE>
+    {
+      match this
+      case Pass => Success(default)
+      case Fail(e) => Failure(rewrap(e))
+    }
+
+    /** A helper function to ensure a requirement is true at runtime,
+       returning an Outcome<>. Example:
+      `:- Need(5 == |mySet|, "The set MUST have 5 elements.")`
+    */
+    static function Need(condition: bool, error: E): (result: Outcome<E>)
+    {
+      if condition then Pass else Fail(error)
+    }
+  }
+
+  // A special case of Outcome that is just used for Need below, and
+  // returns a Result<>
+  datatype OutcomeResult<+E> = Pass' | Fail'(error: E) {
+    predicate IsFailure() {
+      Fail'?
+    }
+    function PropagateFailure<U>(): Result<U,E>
+      requires IsFailure()
+    {
+      Failure(this.error)
+    }
+  }
+
+  /** A helper function to ensure a requirement is true at runtime.
+      Example: `:- Need(5 == |mySet|, "The set MUST have 5 elements.")`
+  */
+  function Need<E>(condition: bool, error: E): (result: OutcomeResult<E>)
+  {
+    if condition then Pass' else Fail'(error)
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/user.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/user.dfy
new file mode 100644
index 00000000000..8db03749686
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/user.dfy
@@ -0,0 +1,19 @@
+// RUN: %build --target=lib --output=%S/Build1/build %S/Inputs/wrappers.dfy %S/Inputs/random.dfy > "%t"
+// RUN: %build --target=cs --output=%S/Build1/build %S/Build1/build.doo %S/Inputs/randomCSharp.dfy  %S/Inputs/Interop.cs >> "%t"
+// RUN: %run %s --input %S/Build1/build.dll --target=cs --build=%S/Build2 --library=%S/Build1/build.doo >> "%t"
+// RUN: %baredafny run %args %s --target=java --build=%S/Build/build --input %S/Inputs/wrappers.dfy --input %S/Inputs/random.dfy --input %S/Inputs/randomJava.dfy --input %S/Inputs/Interop/__default.java >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Test can fail non-deterministically by design, but the chance is ~10^-30
+method Main() {
+  var x := DfyRandom.GetRandomNat(1000000);
+  var y := 0;
+  var i := 5;
+  while(x != y && i != 0)
+    decreases i
+  {
+    y := DfyRandom.GetRandomNat(1000000);
+    i := i - 1;
+  }
+  expect i == 0 || x != y;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/user.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/user.dfy.expect
new file mode 100644
index 00000000000..de552a546bc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/complex/user.dfy.expect
@@ -0,0 +1,8 @@
+
+Dafny program verifier finished with 4 verified, 0 errors
+
+Dafny program verifier finished with 5 verified, 0 errors
+
+Dafny program verifier finished with 1 verified, 0 errors
+
+Dafny program verifier finished with 10 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/externErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/externErrors.dfy
new file mode 100644
index 00000000000..84c649de9a6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/externErrors.dfy
@@ -0,0 +1,30 @@
+// RUN: ! %run %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+replaceable module {:extern "FooNameOverride"} Foo {
+  method {:axiom} {:extern "ZazOverride1"} Zaz() returns (i: int) 
+    ensures i >= 2
+
+  method {:axiom} {:extern "ZapOverride1"} Zap() returns (i: int) 
+    ensures i >= 2
+}
+
+module {:extern "BarNameOverride1"} TwoErrors replaces Foo { 
+  // missing error
+  method {:axiom} {:extern "BarNameOverride2", "ZazOverride2"} Zaz() returns (i: int) 
+    ensures i >= 2
+
+  // missing error
+  method {:axiom} {:extern "ZapOverride2"} Zap() returns (i: int) 
+    ensures i >= 2
+}
+
+replaceable module {:extern "FaaNameOverride"} Faa {
+  method {:axiom} {:extern "ZazOverride1"} Zaz() returns (i: int) 
+    ensures i >= 2
+}
+
+module {:extern} NoErrors replaces Faa { 
+  method {:axiom} {:extern} Zaz() returns (i: int) 
+    ensures i >= 2
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/externErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/externErrors.dfy.expect
new file mode 100644
index 00000000000..3869a2f4ef5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/externErrors.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+externErrors.dfy(12,36): Error: inside a module that replaces another, {:extern} attributes may only be used without arguments
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableExecutionErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableExecutionErrors.dfy
new file mode 100644
index 00000000000..0b78faade28
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableExecutionErrors.dfy
@@ -0,0 +1,12 @@
+// RUN: ! %baredafny run %args "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+replaceable module NeverReplaced {
+  method Foo() returns (i: int) 
+    ensures i >= 2
+}
+
+method Main() {
+  var x := NeverReplaced.Foo();
+  print x, "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableExecutionErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableExecutionErrors.dfy.expect
new file mode 100644
index 00000000000..014c8cc64ac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableExecutionErrors.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+replaceableExecutionErrors.dfy(4,19): Error: when producing executable code, replaceable modules must be replaced somewhere in the program. For example, `module NeverReplacedImpl replaces NeverReplaced { ... }`
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableHappyflow.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableHappyflow.dfy
new file mode 100644
index 00000000000..32d59f2467d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableHappyflow.dfy
@@ -0,0 +1,67 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+replaceable module FooModule {
+  method Foo() returns (i: int) 
+    ensures i >= 2
+}
+
+abstract module SuchAbstract {
+  function OrNot(): int {
+    1
+  }
+}
+
+replaceable module BarModule refines SuchAbstract {
+  method Bar() returns (i: int) 
+    ensures i >= 1
+}
+
+
+replaceable module BazModule replaces BarModule {
+}
+
+module Nesting {
+  module ConcreteFoo replaces FooModule {
+    method Foo() returns (i: int) {
+      return 2;
+    }
+  }
+  
+  module ConcreteBaz replaces BazModule {
+    method Bar() returns (i: int) {
+      return OrNot();
+    }
+  }
+}
+
+method Main() {
+  var x := FooModule.Foo();
+  print x, "\n";
+  var y := BarModule.Bar();
+  print y, "\n";
+  var z := BazModule.Bar();
+  print z, "\n";
+  
+  ConcreteAbstractImports.Prints();
+}
+
+abstract module AbstractImportIsOk {
+  import Abstract1 : FooModule
+  import Abstract2 : Nesting.ConcreteFoo
+  import Abstract3 : FooModule
+}
+
+module ConcreteAbstractImports refines AbstractImportIsOk {
+  import Abtract1 = Nesting.ConcreteFoo
+  import Abtract2 = FooModule
+  import Abtract3 = FooModule
+  
+  method Prints() {
+    var x := Abtract1.Foo();
+    print x, "\n";
+    var y := Abtract2.Foo();
+    print y, "\n";
+    var z := Abtract3.Foo();
+    print z, "\n";
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableHappyflow.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableHappyflow.dfy.expect
new file mode 100644
index 00000000000..29c667a1d63
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableHappyflow.dfy.expect
@@ -0,0 +1,6 @@
+2
+1
+1
+2
+2
+2
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolve1Errors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolve1Errors.dfy
new file mode 100644
index 00000000000..cff7dca512e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolve1Errors.dfy
@@ -0,0 +1,13 @@
+// RUN: ! %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+replaceable module Cycle1 replaces Cycle2 {
+}
+
+replaceable module Cycle2 replaces Cycle1 {
+}
+
+module DanglingReplacer refines DoesNotExist {
+}
+module DanglingReplacer2 replaces DoesNotExist {
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolve1Errors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolve1Errors.dfy.expect
new file mode 100644
index 00000000000..ceec621f289
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolve1Errors.dfy.expect
@@ -0,0 +1,4 @@
+replaceableResolve1Errors.dfy(10,32): Error: module DoesNotExist named as refinement base does not exist
+replaceableResolve1Errors.dfy(12,34): Error: module DoesNotExist named as replacement base does not exist
+replaceableResolve1Errors.dfy(4,19): Error: module definition contains a cycle (note: parent modules implicitly depend on submodules): module Cycle1 -> module Cycle2 -> module Cycle1
+3 resolution/type errors detected in replaceableResolve1Errors.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolveErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolveErrors.dfy
new file mode 100644
index 00000000000..41fa28e025c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolveErrors.dfy
@@ -0,0 +1,33 @@
+// RUN: ! %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+replaceable module FooModule {
+  method Foo() returns (i: int) 
+    ensures i >= 2
+}
+
+module Nesting {
+  module ConcreteFoo replaces FooModule {
+    method Foo() returns (i: int) {
+      return 2;
+    }
+  }
+}
+
+module FooRefiner refines FooModule {
+  method Foo() returns (i: int) {
+    return 3;
+  }
+}
+
+module FooRefiner2 refines FooModule {
+}
+
+method Main() {
+  var x := FooModule.Foo();
+  print x, "\n";
+  var y := FooRefiner.Foo();
+  print y, "\n";
+  var z := FooRefiner2.Foo();
+  print z, "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolveErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolveErrors.dfy.expect
new file mode 100644
index 00000000000..c5be3d3bc2a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/replaceableResolveErrors.dfy.expect
@@ -0,0 +1,4 @@
+replaceableResolveErrors.dfy(17,26): Error: replaceable module cannot be refined
+replaceableResolveErrors.dfy(23,27): Error: replaceable module cannot be refined
+replaceableResolveErrors.dfy(17,7): Error: not resolving module '_module' because there were errors in resolving its nested module 'FooRefiner'
+3 resolution/type errors detected in replaceableResolveErrors.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/resolveManyReplacement.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/resolveManyReplacement.dfy
new file mode 100644
index 00000000000..3c540f63658
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/resolveManyReplacement.dfy
@@ -0,0 +1,16 @@
+// RUN: ! %resolve --allow-axioms %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+// Currently this creates a resolution error.
+replaceable module FooModule {
+  method Foo() returns (i: int) 
+    ensures i >= 2
+}
+
+module Replacement1 replaces FooModule {
+  method Bar() returns (i: int) 
+    ensures i >= 1
+}
+
+module Replacement2 replaces FooModule {
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/resolveManyReplacement.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/resolveManyReplacement.dfy.expect
new file mode 100644
index 00000000000..44051d705a7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/replaceables/resolveManyReplacement.dfy.expect
@@ -0,0 +1,4 @@
+resolveManyReplacement.dfy(10,7): Error: a replaceable module may only be replaced once
+resolveManyReplacement.dfy(15,7): Related location: other replacing module
+resolveManyReplacement.dfy(15,7): Error: modules 'Replacement1' and 'Replacement2' both have CompileName 'FooModule'
+2 resolution/type errors detected in resolveManyReplacement.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/arrays.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/arrays.dfy
new file mode 100644
index 00000000000..5f11c241c18
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/arrays.dfy
@@ -0,0 +1,32 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Origin.Imported {
+  trait {:termination false} SuperTrait {
+    method X()
+  }
+}
+module Importing {
+  import Origin.Imported
+  class TheClass extends Imported.SuperTrait {
+    var x: int
+    constructor() {
+      x := 0;
+    }
+    method X() {
+      print "ok";
+    }
+  }
+}
+
+newtype Index = x: int | 0 <= x < 3
+method Main() {
+  var dummy := new Importing.TheClass();
+  dummy.X();
+  var intWrappers := new Importing.TheClass[3]((i: int) requires 0 <= i < 3 => dummy);
+  var intWrappers2 := new Importing.TheClass[3, 3]((i: int, j: int)
+    reads intWrappers requires 0 <= i < 3 => intWrappers[i]);
+  var index := 1 as Index;
+  expect intWrappers[index] == intWrappers2[1, 1];
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/arrays.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/arrays.dfy.expect
new file mode 100644
index 00000000000..2f22d47cee8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/arrays.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 3 verified, 0 errors
+ok
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/autoinit.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/autoinit.dfy
new file mode 100644
index 00000000000..aae1bce74e3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/autoinit.dfy
@@ -0,0 +1,21 @@
+// NONUNIFORM: Can't create class instances without constructors as Rust does not support Dafny defaults since subset types are erased
+// RUN: %exits-with 3 %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class Test<T(0)> {
+  var x: T
+}
+
+type Positive = x: int | x > 0 witness 1
+
+method Main() {
+  var x: Test := new Test<Positive>;
+  print x.x, "\n";
+  if x.x == 0 {
+    assert false;
+    expect false;
+  }
+  x.x := 2;
+  expect x.x == 2;
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/autoinit.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/autoinit.dfy.expect
new file mode 100644
index 00000000000..37c2ed71ea8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/autoinit.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
+(0,-1): Error: Microsoft.Dafny.UnsupportedInvalidOperationException: Creation of object of type Test<Positive> requires a constructor
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/avoid_soundness_mut.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/avoid_soundness_mut.dfy
new file mode 100644
index 00000000000..2335ca7bd41
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/avoid_soundness_mut.dfy
@@ -0,0 +1,44 @@
+// RUN: %baredafny build -t:rs "%s"
+// RUN: "%S/avoid_soundness_mut-rust/cargo" run --release > "%t"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %baredafny build -t:rs --raw-pointers "%s"
+// RUN: "%S/avoid_soundness_mut-rust/cargo" run --release > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype u8 = x: int | 0 <= x < 256
+
+class X {
+  var x: u8
+  constructor() {
+    x := 0;
+  }
+  
+  method DoBoth(other: X)
+    modifies this, other
+    requires this == other
+  {
+    this.x := 0;
+    other.x := 1;
+    if this.x == 1 {
+      print "Correct\n";
+    } else {
+      assert false;
+      print "Soundness issue\n";
+    }
+  }
+}
+
+method Main() {
+  var c := new X();
+  c.DoBoth(c);
+
+  var other := c;
+  c.x := 0;
+  other.x := 1;
+  if c.x == 1 {
+    print "Correct\n";
+  } else {
+    assert false;
+    print "Soundness issue\n";
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/avoid_soundness_mut.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/avoid_soundness_mut.dfy.expect
new file mode 100644
index 00000000000..09acc484713
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/avoid_soundness_mut.dfy.expect
@@ -0,0 +1,2 @@
+Correct
+Correct
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/borrowing.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/borrowing.dfy
new file mode 100644
index 00000000000..e9759a8df57
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/borrowing.dfy
@@ -0,0 +1,24 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs --emit-uncompilable-code "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype U8 = x: int | 0 <= x <= 255
+
+datatype Test = Test() {
+  predicate At(x: U8) {
+    true
+  }
+}
+
+/* Converts a sequence to a set. */
+function {:opaque} ToSet<T>(xs: seq<T>): set<T>
+{
+  set x: T | x in xs
+}
+
+method Main() {
+  var z := Test().At(0);
+  var x := ["abc", "def", "abc"];
+  var w := ToSet(x);
+  expect |w| == 2;
+}
\ No newline at end of file
diff --git a/Test/dafny1/Cubes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/borrowing.dfy.expect
similarity index 100%
rename from Test/dafny1/Cubes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/borrowing.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/bymethod.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/bymethod.dfy
new file mode 100644
index 00000000000..913b7d42298
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/bymethod.dfy
@@ -0,0 +1,30 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+
+abstract module ReverseHolder {
+  newtype U8 = x: int | 0 <= x < 256
+  type U8Seq = seq<U8>
+  type WellFormedSequence = s: U8Seq | |s| == 0 || |s| != 0 witness []
+
+  function Reverse(vs: seq<U8>): (s: WellFormedSequence) {
+    if |vs| == 0 then [] else
+    Reverse(vs[1..]) + [vs[0]]
+  } by method {
+    s := [];
+    assert vs == vs[0..|vs|];
+    for i := |vs| downto 0
+      invariant s == Reverse(vs[i..])
+    {
+      s := s + [vs[i]];
+    }
+  }
+}
+module Reverser refines ReverseHolder {
+}
+
+method Main() {
+  expect Reverser.Reverse([1, 2]) == [2, 1];
+  print "Everything ok";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/bymethod.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/bymethod.dfy.expect
new file mode 100644
index 00000000000..7420ef1bf1d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/bymethod.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 6 verified, 0 errors
+Everything ok
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargoreleasefailure.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargoreleasefailure.dfy
new file mode 100644
index 00000000000..e247b923cfc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargoreleasefailure.dfy
@@ -0,0 +1,48 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny build --target=rs "%s"
+// If there is no '#[inline(never)]' in front of ::dafny_runtime::increment_strong_count
+// then the release will think it's safe to remove the strong count increment, resulting ins a segfault
+// RUN: "%S/cargoreleasefailure-rust/cargo" run --release
+
+module  TraitModule {
+  trait {:termination false} MyTrait {
+    method DoThing ( input: int ) returns (output: int)
+  }
+}
+
+module ImplModule {
+  import TraitModule
+  class MyImpl extends TraitModule.MyTrait {
+    constructor(){}
+    method DoThing ( input: int ) returns (output: int)
+    {
+      return 1;
+    }
+  }
+}
+
+module WorkModule {
+  import ImplModule
+  import TraitModule
+
+  method DoWork() {
+    var worker := new ImplModule.MyImpl();
+    DoMoreWork(worker, 1);
+    DoMoreWork(worker, 2);
+    DoMoreWork(worker, 3);
+    DoMoreWork(worker, 4);
+    DoMoreWork(worker, 5);
+  }
+
+  method DoMoreWork(client : TraitModule.MyTrait, num : int)
+  {
+    var _ := client.DoThing(num);
+  }
+}
+
+module MainModule {
+  import WorkModule
+  method Main() {
+    WorkModule.DoWork();
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest.dfy
new file mode 100644
index 00000000000..be2eee7921d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest.dfy
@@ -0,0 +1,21 @@
+// NONUNIFORM: Test of cargo test to support Dafny tests
+// RUN: %baredafny build --target=rs "%s" > "%t"
+// RUN: %exits-with 101 "%S/cargotest-rust/cargo" test >> "%t"
+// RUN: %OutputCheck --file-to-check "%t" "%S/cargotest1.check"
+// RUN: %OutputCheck --file-to-check "%t" "%S/cargotest2.check"
+// RUN: %OutputCheck --file-to-check "%t" "%S/cargotest3.check"
+// RUN: %OutputCheck --file-to-check "%S/cargotest-rust/src/cargotest.rs" "%S/cargotestoutput.check"
+
+module {:rust_cfg_test} Tests {
+  method {:test} TestFail1() {
+    expect true == false;
+  }
+
+  method {:test} TestFail2() {
+    expect false == true;
+  }
+
+  method {:test} TestSucceed3() {
+    expect true == true;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest1.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest1.check
new file mode 100644
index 00000000000..d5ad83a98a8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest1.check
@@ -0,0 +1 @@
+// CHECK: test Tests::TestFail1 ... FAILED
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest2.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest2.check
new file mode 100644
index 00000000000..932619e778b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest2.check
@@ -0,0 +1 @@
+// CHECK: test Tests::TestFail2 ... FAILED
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest3.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest3.check
new file mode 100644
index 00000000000..10d9d0f1dc8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotest3.check
@@ -0,0 +1 @@
+// CHECK: test Tests::TestSucceed3 ... ok
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotestoutput.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotestoutput.check
new file mode 100644
index 00000000000..3b60de400f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/cargotestoutput.check
@@ -0,0 +1 @@
+// CHECK-L: #[cfg(test)]
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/classes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/classes.dfy
new file mode 100644
index 00000000000..3bc5b6caeb3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/classes.dfy
@@ -0,0 +1,38 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %baredafny run --target=rs --raw-pointers "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class Y {
+  var c: int
+  ghost var Repr: set<object>
+  const d: int
+  constructor(c: int) ensures this.c == c && d == c {
+    this.c := c;
+    this.d := c;
+    this.Repr := {this};
+  }
+
+  constructor Two() ensures c == 2 == d {
+    this.c := 2;
+    this.d := c;
+    this.Repr := {this};
+  }
+}
+
+datatype FunWrap<!T, +R> = FunWrap(
+  fn: int -> Tuple2<T, R>)
+
+datatype Tuple2<+A, +B> = Tuple2(A, B)
+method Main() {
+  var x := new Y(3);
+  var y := new Y.Two();
+  expect x.c == 3;
+  expect y.c == 2;
+  var z := ([1], [2]);
+  var w := z.0;
+  var fw := FunWrap<Y, Y>.FunWrap((z: int) => Tuple2(x, y));
+  var fx: FunWrap<Y, object> := fw;
+  print "Everything is ok.";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/classes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/classes.dfy.expect
new file mode 100644
index 00000000000..839df7554a0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/classes.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 3 verified, 0 errors
+Everything is ok.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/constants.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/constants.dfy
new file mode 100644
index 00000000000..aa003792960
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/constants.dfy
@@ -0,0 +1,6 @@
+// NONUNIFORM: Tests that references to function constants are eta-expanded with an additional call and type annotations in Rust backend
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+const f: int -> int := x => x
+const g: int -> int := f
diff --git a/Test/comp/Libraries/consumer.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/constants.dfy.expect
similarity index 100%
rename from Test/comp/Libraries/consumer.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/constants.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/continue.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/continue.dfy
new file mode 100644
index 00000000000..f964dbdb778
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/continue.dfy
@@ -0,0 +1,38 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %baredafny run --target=rs --raw-pointers "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  var valuesArray := new int[8](i => i);
+  var values1a := valuesArray[1..];
+  expect values1a == [1, 2, 3, 4, 5, 6, 7];
+  var values1b := valuesArray[..7];
+  expect values1b == [0, 1, 2, 3, 4, 5, 6];
+  var values1c := valuesArray[..];
+  expect values1c == [0, 1, 2, 3, 4, 5, 6, 7];
+  var values1 := valuesArray[1..8];
+  expect values1 == values1a;
+  var values2 := values1[1..];
+  expect values2 == [2, 3, 4, 5, 6, 7];
+  var values3 := values1[..5];
+  expect values3 == [1, 2, 3, 4, 5];
+  var values4 := values1[..];
+  expect values4 == [1, 2, 3, 4, 5, 6, 7];
+  var values := values1[0..6];
+  expect values == [1, 2, 3, 4, 5, 6];
+  var acc := 0;
+  for i := 0 to |values|
+  {
+    if values[i] % 3 == 0 {
+      acc := acc + 3;
+      continue;
+    }
+    if (5 <= values[i]) == true {
+       break;
+    }
+    acc := acc + values[i];
+  }
+  print acc, "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/continue.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/continue.dfy.expect
new file mode 100644
index 00000000000..aef9e05f0b8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/continue.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+10
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/conversions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/conversions.dfy
new file mode 100644
index 00000000000..a655ada01ce
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/conversions.dfy
@@ -0,0 +1,38 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype Uint8 = x: int | 0 <= x < 256
+
+datatype Option<T> = Some(value: T) | None {
+  predicate IsFailure() {
+    None?
+  }
+  function PropagateFailure<U>(): Option<U> {
+    None
+  }
+  function Extract(): T
+    requires !IsFailure() {
+    value
+  }
+  method ExtractMethod() returns (r: T)
+    requires !IsFailure() {
+    return value;
+  }
+}
+
+method TestCompile(input: Option<Uint8>) returns (output: Option<Uint8>) {
+  var middle :- input;
+  var middleMethod := Some(middle).ExtractMethod();
+  return None;
+}
+
+method Main() {
+  var x: Uint8 := 2;
+  // Correct rendering of expressions that can interpret the first '<' as a generic argument
+  var y: bv16 := (x as bv16) << 2;
+  expect y == 8;
+  expect (x as bv16) < 3;
+  expect (x as bv16) <= 3;
+  print "Everything is ok.";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/conversions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/conversions.dfy.expect
new file mode 100644
index 00000000000..ce38ef0ce55
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/conversions.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 5 verified, 0 errors
+Everything is ok.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-impl.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-impl.dfy
new file mode 100644
index 00000000000..643a2592ec0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-impl.dfy
@@ -0,0 +1,12 @@
+// NONUNIFORM: Tests generation of print, and equality in Rust for function / non-(==) type members
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype F = F(i: nat, f: int -> int)
+datatype X<A> = X(x: A)
+
+method Main()
+{
+  print X(3) == X(3), "\n",
+        F(3, x => x), "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-impl.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-impl.dfy.expect
new file mode 100644
index 00000000000..1112fa4d900
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-impl.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+true
+F.F(3, <function>)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-scoping.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-scoping.dfy
new file mode 100644
index 00000000000..4bde1628787
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-scoping.dfy
@@ -0,0 +1,9 @@
+// NONUNIFORM: Tests that datatype members like hash do not shadow those generated by Rust backend
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype Loop = Loop(loop: Loop) | Point() {
+  function hash(): string {
+    "uh-oh!"
+  }
+}
\ No newline at end of file
diff --git a/Test/dafny0/ParserOptions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-scoping.dfy.expect
similarity index 100%
rename from Test/dafny0/ParserOptions.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes-scoping.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes.dfy
new file mode 100644
index 00000000000..ef835701c2e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes.dfy
@@ -0,0 +1,176 @@
+// NONUNIFORM: Demonstration of the use of the external Rust Option<> type
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %baredafny run --target=rs --raw-pointers "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module {:compile false} {:extern "::std::option"} RustStdOption {
+  // Define the Rust option type
+  datatype {:extern "Option"} {:compile false} {:rust_rc false} Option<T> =
+    Some({:extern "0"} {:extern_extract "unwrap"} value: T) | None {
+  }
+}
+
+module RustStdCompare {
+  // Define the Rust option type
+  datatype {:rust_rc false} Option<T> =
+    Some({:extern "0"} {:extern_extract "unwrap"} value: T) | None {
+  }
+}
+
+module DatatypeTests {
+  import opened RustStdOption
+  import RustStdCompare
+
+  newtype u8 = x: int | 0 <= x < 255
+
+  // Raw Rust enum
+  datatype {:rust_rc false} NoArg = OptionA | OptionB | OptionC
+
+  // Raw Rust enum
+  datatype {:rust_rc false} AlmostOption = Nothing | ThereItIs(u: u8) {
+    static function default(): AlmostOption {
+      ThereItIs(0 as u8)
+    }
+  }
+
+  // Raw Rust enum
+  datatype {:rust_rc false} AlmostOptionWrapper = StillNothing | AlmostThere(u: AlmostOption)  
+
+  // Raw Rust enum
+  datatype {:rust_rc false} GenericOption<T> = GenericNothing | GenericSome(value: T)  
+
+  // Putting {:rust_rc false} would create a compilation issue because there should be an indirection
+  datatype Peano = Zero | One(p: Peano)
+
+  // Raw Rust struct
+  datatype {:rust_rc false} Struct = StructConstructor(a: u8, b: bool) {
+    function BTrue(): Struct {
+      if b then this else this.(b := true)
+    }
+  }
+
+  // Raw Rust enum
+  datatype {:rust_rc false} Multiple =
+    | ConstructorA(a: u8)
+    | ConstructorB(b: bool)
+    | ConstructorAB(a: u8, b: bool)
+  {
+    function Gather(other: Multiple): Multiple {
+      match this {
+        case ConstructorAB(a, b) => this
+        case ConstructorA(a) =>
+          if other.ConstructorB? then
+            ConstructorAB(a, other.b)
+          else
+            this
+        case ConstructorB(b) =>
+          if other.ConstructorA? then
+            ConstructorAB(other.a, b)
+          else
+            this
+      }
+    }
+  }
+
+  // Rc-wrapped Rust struct
+  datatype RcStruct = RcStructConstructor(a: u8, b: bool) {
+    function BTrue(): RcStruct {
+      if b then this else this.(b := true)
+    }
+  }
+
+  // Rc-wrapped Rust enum
+  datatype RcMultiple =
+    | RcConstructorA(a: u8)
+    | RcConstructorB(b: bool)
+    | RcConstructorAB(a: u8, b: bool)
+  {
+    function Gather(other: RcMultiple): RcMultiple {
+      if RcConstructorAB? then this
+      else if RcConstructorA? then
+        if other.RcConstructorB? then
+          RcConstructorAB(a, other.b)
+        else
+          this
+      else if RcConstructorB? then
+        if other.RcConstructorA? then
+          RcConstructorAB(other.a, b)
+        else
+          this
+      else
+        this
+    }
+  }
+
+  // Rc-wrapped struct
+  datatype Recursive = Recursive(head: int, tail: Option<Recursive>)
+
+  method PrintOption(o: Option<u8>) {
+    match o {
+      case Some(u) => print u, "\n";
+      case None => print "None\n";
+    }
+  }
+
+  method Main() {
+    var n: NoArg := OptionA;
+    n := OptionB;
+    expect !n.OptionC?;
+
+    var d: AlmostOption := Nothing;
+    d := ThereItIs(4 as u8);
+
+    var p: Peano := Zero;
+    p := One(p);
+    var q: Peano := p;
+    p := One(p);
+    q := One(q);
+    expect p == q;
+
+    var c := ConstructorA(0); // Raw struct creation
+    c := c.(a := 2);  // Since the variable is the same and c owns the value, we can update in place.
+    c := c.Gather(ConstructorA(1)); // Ignored
+    expect c.ConstructorA? && !c.ConstructorB? && !c.ConstructorAB?;
+    expect c.a == 2;
+    c := c.Gather(ConstructorB(true));
+    expect c.ConstructorAB? && !c.ConstructorA? && !c.ConstructorB?;
+    expect c.a == 2 && c.b;
+    var a := StructConstructor(1, false);
+    expect a.BTrue() == StructConstructor(1, true);
+
+    var c2 := RcConstructorA(0); // Raw struct creation
+    c2 := c2.(a := 2);  // Since the variable is the same and c owns the value, we can update in place.
+    c2 := c2.Gather(RcConstructorA(1)); // Ignored
+    expect c2.RcConstructorA? && !c2.RcConstructorB? && !c2.RcConstructorAB?;
+    c2 := c2.Gather(RcConstructorB(true));
+    expect c2.RcConstructorAB? && !c2.RcConstructorA? && !c2.RcConstructorB?;
+    var rc_a := RcStructConstructor(1, false);
+    expect rc_a.BTrue() == RcStructConstructor(1, true);
+
+    var r := Recursive(0, None);
+    r := Recursive(1, Some(r));
+    print r, "\n"; // Recursive(1, Some(Recursive(0, None)))
+    
+    // Interfacing with native types
+    var x := Some(3 as u8);
+    var u := x.value;
+    expect u == 3;
+    match x {
+      case Some(i) =>
+        expect i == 3;
+    }
+    expect x.value == 3;
+    PrintOption(x);
+    PrintOption(None);
+    print x, "\n";
+    var no: Option<u8> := None;
+    print no, "\n";
+
+    var homeMadeOption := RustStdCompare.Some(3);
+    if homeMadeOption.Some? {
+      print homeMadeOption.value, "\n";
+    }
+    homeMadeOption := RustStdCompare.None;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes.dfy.expect
new file mode 100644
index 00000000000..30316b1512f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/datatypes.dfy.expect
@@ -0,0 +1,8 @@
+
+Dafny program verifier finished with 5 verified, 0 errors
+DatatypeTests.Recursive.Recursive(1, DatatypeTests.Recursive.Recursive(0, null))
+3
+None
+3
+null
+3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/docstring.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/docstring.check
new file mode 100644
index 00000000000..c34d07c3e91
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/docstring.check
@@ -0,0 +1,15 @@
+// CHECK: .*/// Docstring for test method.*
+// CHECK: .*/// Multi-line.*
+// CHECK: .*docstring\.dfy\(7,1\).*
+// CHECK: .*/// Docstring for functions.*
+// CHECK: .*/// Docstring for classes 1.*
+// CHECK: .*/// Docstring for datatype.*
+// CHECK: .*/// Docstring for Constructor1.*
+// CHECK: .*/// Docstring for Constructor2.*
+// CHECK: .*/// Enumerates all possible values of TestDatatype.*
+// CHECK: .*/// Docstring for synonym type.*
+// CHECK: .*/// Docstring for module.*
+// CHECK: .*/// Docstring for classes 2.*
+// CHECK: .*/// Allocates an UNINITIALIZED instance. Only the Dafny compiler should use that.*
+// CHECK: .*/// Docstring for predicate.*
+// CHECK: .*/// Docstring for const.*
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/docstring.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/docstring.dfy
new file mode 100644
index 00000000000..507d04e8c14
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/docstring.dfy
@@ -0,0 +1,28 @@
+// NONUNIFORM: Test that the Rust generated code contains docstrings
+// RUN: %baredafny translate rs "%s" > "%t"
+// RUN: %OutputCheck --file-to-check "%S/docstring-rust/src/docstring.rs" "%S/docstring.check"
+
+/** Docstring for test method
+  * Multi-line */
+method TestMethod() { }
+/** Docstring for functions */
+function TestFn(): SynonymType { 1 }
+/** Docstring for classes 1 */
+class TestClass {}
+/** Docstring for datatype */
+datatype TestDatatype =
+  | Constructor1() // Docstring for Constructor1
+  | Constructor2() // Docstring for Constructor2
+
+/** Docstring for synonym type */ 
+type SynonymType = x: int | true
+
+/** Docstring for module */
+module SubModule {
+  /** Docstring for classes 2 */
+  class TestClass {
+    /** Docstring for const */
+    const testConst: bool
+    predicate SingleLineFunction() { true } // Docstring for predicate
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/elephant.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/elephant.dfy
new file mode 100644
index 00000000000..ec117b68b5c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/elephant.dfy
@@ -0,0 +1,35 @@
+// NONUNIFORM: Tests generation of elephant assignment to shadowed variable
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype Option = Some(value: string) | None() {
+  function IsFailure(): bool { None? }
+  function PropagateFailure(): Option
+    requires IsFailure()
+  { None() }
+  function Extract(): string
+    requires !IsFailure()
+  { value }
+}
+
+function Foo(j: int): Option {
+  Some("foo")
+}
+
+method Test1(j: int) returns (o: Option) {
+  var j :- Foo(j);
+  return Some(j);
+}
+
+method Test2(j: int) returns (o: Option) {
+  var s := "";
+  s :- Foo(j);
+  return Some(s);
+}
+
+method Main() {
+  var o := Test1(0);
+  expect o == Some("foo");
+  o := Test2(0);
+  expect o == Some("foo");
+}
\ No newline at end of file
diff --git a/Test/dafny0/AllLiteralsAxiom.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/elephant.dfy.expect
similarity index 100%
rename from Test/dafny0/AllLiteralsAxiom.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/elephant.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses-errors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses-errors.dfy
new file mode 100644
index 00000000000..ebec1203fcf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses-errors.dfy
@@ -0,0 +1,23 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %exits-with 3 %baredafny run --target=rs --input "%S/externalclasses.rs" "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module {:extern} ExternalClassContainer {
+  method {:extern} Test() returns (i: int)
+  trait GetValueHolder {
+    function GetValue(): int
+    function GetValue2(): int
+  }
+
+  class {:extern} ExternalPartialClass extends GetValueHolder {
+    constructor {:extern} ()
+    function {:extern} GetValue(): int // Error
+    function GetValue2(): int {
+      1
+    }
+  }
+}
+
+method Main() {
+  var c := new ExternalClassContainer.ExternalPartialClass();
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses-errors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses-errors.dfy.expect
new file mode 100644
index 00000000000..5a1931fc905
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses-errors.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 3 verified, 0 errors
+(0,-1): Error: Microsoft.Dafny.UnsupportedInvalidOperationException: Error: In the class ExternalClassContainer.ExternalPartialClass, some proper methods of crate::ExternalClassContainer::GetValueHolder are marked {:extern} and some are not. For the Rust compiler, please make all methods (GetValue, GetValue2)  bodiless and mark as {:extern} and implement them in a Rust file, or mark none of them as {:extern} and implement them in Dafny. Alternatively, you can insert an intermediate trait that performs the partial implementation if feasible.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses.dfy
new file mode 100644
index 00000000000..c6d50772615
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses.dfy
@@ -0,0 +1,103 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs --input "%S/externalclasses.rs" "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module {:extern "External.Class.Container"} ExternalClassContainer {
+  class {:extern} ExternalClass {
+    constructor {:extern} (i: int)
+  }
+  method {:extern} Test() returns (i: int)
+  trait GetValueHolder {
+    function GetValue(): int
+  }
+
+  class {:extern} ExternalPartialClass extends GetValueHolder {
+    constructor {:extern} ()
+    function {:extern} GetValue(): int
+    method Print() {
+      print GetValue();
+    }
+  }
+  class {:extern} ExternalPartialClass2 extends GetValueHolder {
+    constructor {:extern} ()
+    function GetValue(): int {
+      2
+    }
+    method Print() {
+      print GetValue();
+    }
+  }
+}
+
+module Dafny.FileIO {
+  method ReadBytesFromFile(path: string) returns (res: string) {
+    res := INTERNAL_ReadBytesFromFile(path);
+    INTERNAL_WriteBytesToFile(path, res);
+  }
+
+  method {:extern "DafnyLibraries.FileIO", "INTERNAL_WriteBytesToFile"}
+  INTERNAL_WriteBytesToFile(path: string, content: string)
+  
+  function {:extern "DafnyLibraries.FileIO", "INTERNAL_ReadBytesFromFile"}
+  INTERNAL_ReadBytesFromFile(path: string): (bytes: string)
+}
+
+module {:extern} ExternButEverythingImplemented {
+  function test(): int { 1 }
+}
+
+module {:extern "ExternWithOnlyAStaticMethodUninmplemented"} ExternWithOnlyAStaticMethodUninmplemented {
+  method {:extern} DoThis(i: int) returns (res: int)
+}
+
+module {:extern "ExternModuleWithOneClassToImport"} ExternModuleWithOneClassToImport {
+  trait {:termination false} TraitDefinedInModule {
+    function Get(): string
+      reads this
+
+    method Put(s: string)
+      modifies this
+      ensures this.Get() == s
+  }
+
+  class {:extern} NonShareableBox extends TraitDefinedInModule {
+    constructor {:extern} {:axiom} ()
+      ensures this.Get() == ""
+
+    function {:extern} Get(): string
+      reads this
+
+    method {:extern} {:axiom} Put(s: string)
+      modifies this
+      ensures this.Get() == s
+
+    function GetOpt(): (o: string)
+      reads this
+    {
+      if Get() == "" then "None" else "Some("+Get()+")"
+    }
+  }
+}
+
+
+method Main() {
+  var i := ExternalClassContainer.Test();
+  expect i == 2;
+  var j := new ExternalClassContainer.ExternalClass(i);
+  var message := Dafny.FileIO.ReadBytesFromFile("hello.dfy");
+  var c := new ExternalClassContainer.ExternalPartialClass();
+  c.Print();
+  var c2 := new ExternalClassContainer.ExternalPartialClass2();
+  c2.Print();
+  expect ExternButEverythingImplemented.test() == 1;
+  var x := ExternWithOnlyAStaticMethodUninmplemented.DoThis(1);
+  expect x == 2;
+  var n: ExternModuleWithOneClassToImport.NonShareableBox := new ExternModuleWithOneClassToImport.NonShareableBox();
+  expect n as object as ExternModuleWithOneClassToImport.NonShareableBox == n;
+  expect n.Get() == "";
+  expect n.GetOpt() == "None";
+  n.Put("x");
+  expect n.Get() == "x";
+  expect n.GetOpt() == "Some(x)";
+  print message;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses.dfy.expect
new file mode 100644
index 00000000000..86c68713487
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 7 verified, 0 errors
+22Everything is ok.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses.rs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses.rs
new file mode 100644
index 00000000000..e061478f099
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/externalclasses.rs
@@ -0,0 +1,107 @@
+#![allow(warnings, unconditional_panic)]
+#![allow(nonstandard_style)]
+
+pub mod External {
+  pub mod Class {
+    pub mod Container {
+      use crate::*;
+
+      pub struct ExternalClass {}
+      impl ExternalClass {
+        pub fn _allocate_object(_cmc: ::dafny_runtime::DafnyInt) -> ::dafny_runtime::Object<Self> {
+          // SAFETY: The Rc has not been shared before
+          unsafe {
+            ::dafny_runtime::Object::from_rc(::std::rc::Rc::new(ExternalClass {}))
+          }
+        }
+      }
+
+      pub struct ExternalPartialClass {}
+      impl ExternalPartialClass {
+        pub fn _allocate_object() -> ::dafny_runtime::Object<Self> {
+          // SAFETY: The Rc has not been shared before
+          unsafe {
+            ::dafny_runtime::Object::from_rc(::std::rc::Rc::new(ExternalPartialClass {}))
+          }
+        }
+      }
+
+      impl crate::External::Class::Container::GetValueHolder
+        for ExternalPartialClass {
+        fn GetValue(&self) -> dafny_runtime::DafnyInt {
+          ::dafny_runtime::int!(2)
+        }
+      }
+
+      impl ::dafny_runtime::UpcastObject<dyn crate::External::Class::Container::GetValueHolder>
+        for ExternalPartialClass {
+        ::dafny_runtime::UpcastObjectFn!(dyn crate::External::Class::Container::GetValueHolder);
+      }
+
+      pub struct ExternalPartialClass2 {}
+      impl ExternalPartialClass2 {
+        pub fn _allocate_object() -> ::dafny_runtime::Object<Self> {
+          // SAFETY: The Rc has not been shared before
+          unsafe {
+            ::dafny_runtime::Object::from_rc(::std::rc::Rc::new(ExternalPartialClass2 {}))
+          }
+        }
+      }
+      pub struct _default {}
+
+      impl _default {
+        pub fn Test() -> ::dafny_runtime::DafnyInt {
+          ::dafny_runtime::int!(2)
+        }
+      }
+    }
+  }
+}
+
+pub mod ExternWithOnlyAStaticMethodUninmplemented {
+  pub struct _default {}
+  
+  impl _default {
+    pub fn DoThis(i: &::dafny_runtime::DafnyInt) -> ::dafny_runtime::DafnyInt {
+      i.clone() + ::dafny_runtime::int!(1)
+    }
+  }
+}
+
+pub mod DafnyLibraries {
+  pub mod FileIO {
+    pub fn INTERNAL_ReadBytesFromFile(path: &::dafny_runtime::DafnyString)
+      -> ::dafny_runtime::DafnyString {
+      return ::dafny_runtime::string_of("Everything is ok.");
+    }
+    
+    pub fn INTERNAL_WriteBytesToFile(path: &::dafny_runtime::DafnyString, content: &::dafny_runtime::DafnyString) {
+      // Nothing to do, we mock writing to a file
+    }
+  }
+}
+
+pub mod ExternModuleWithOneClassToImport {
+  pub struct NonShareableBox {
+    s: ::dafny_runtime::Field<::dafny_runtime::DafnyString>
+  }
+  impl NonShareableBox {
+    pub fn _allocate_object() -> ::dafny_runtime::Object<Self> {
+      // SAFETY: The Rc has not been shared before
+      unsafe {
+        ::dafny_runtime::Object::from_rc(::std::rc::Rc::new(NonShareableBox {
+          s: ::dafny_runtime::Field::new(::dafny_runtime::string_of(""))
+        }))
+      }
+    }
+  }
+  impl crate::ExternModuleWithOneClassToImport::TraitDefinedInModule
+    for NonShareableBox {
+    fn Get(&self) -> ::dafny_runtime::DafnyString {
+      ::dafny_runtime::read_field!(self.s)
+    }
+    fn Put(&self, c: &::dafny_runtime::DafnyString) {
+      ::dafny_runtime::modify_field!(self.s, c.clone());
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/lambda.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/lambda.dfy
new file mode 100644
index 00000000000..48c223f62e6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/lambda.dfy
@@ -0,0 +1,23 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+newtype uint8 = x: int | 0 <= x < 256 
+
+predicate F(f: bool -> bool) { f(false) }
+
+predicate p(b: bool) { !b }
+
+predicate Fn<T>(f: (T, T) -> bool, a: T) { f(a, a) }
+
+predicate X() { F(p) }
+
+predicate X'() { var f := x => !x; F(f) }
+
+predicate F'(f: seq<bool> -> bool) { f([false]) }
+
+predicate p'(b: seq<bool>) { if |b| > 0 then !b[0] else false }
+
+predicate X''() { F'(p') }
+
+method Main() {
+  print Fn((a: uint8, b: uint8) => a == b, 2 as uint8), "\n"; 
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-698.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/lambda.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-698.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/lambda.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/loops.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/loops.dfy
new file mode 100644
index 00000000000..4edda6ead2b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/loops.dfy
@@ -0,0 +1,98 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype u8 = x: int | 0 <= x < 10
+
+method ToSet<T>(s: seq<T>) returns (r: set<T>) {
+  if |s| == 0 {
+    return {};
+  }
+  return {s[0]};
+}
+
+newtype U8 = x: int | 0 <= x <= 255
+type ByteSequence = seq<U8>
+
+datatype Result<T> = Success(value: T) | Failure(msg: string)
+
+const CONST1: string := "1"
+const CONST3: string := "3"
+const CONST5: string := "5"
+const PREFIX: string := "p_"
+
+function PrependPrefix(p: string): string {
+  PREFIX + p
+}
+
+method Main() {
+  var x := map[1 := "hello", 2 := "world"];
+  expect forall k <- x :: |x[k]| == 5;
+  print x[1], " ", x[2], "\n";
+  var z := map k <- x :: (k + 1) := x[k];
+  print z[2], " ", z[3];
+  var t := ToSet([1]);
+  print t;
+
+  var u8toInt := map[1 as u8 := 1, 2 as u8 := 2];
+  var IntToU8 := map k <- u8toInt :: u8toInt[k] := k;
+  var helloWorldAgain := map k <- u8toInt :: x[u8toInt[k]] := Success(k);
+
+  assert {:split_here} true;
+  var successbool := Success(Success(true));
+  expect successbool.value.value == true;
+  var s := map[1 := Success("hello"), 2 := Success("world")];
+  var is_result := forall k, k' | k in s && k' in s:: k != k' ==> s[k].value != s[k'].value;
+  expect is_result;
+
+  var zBefore := map["3" := "5", "5" := "7"];
+  assert {:split_here} true;
+
+  forall k <- zBefore, k' <- zBefore ensures k != k' ==> PrependPrefix(k) != PrependPrefix(k') {
+    if PrependPrefix(k) == PrependPrefix(k') {
+      assert k == PrependPrefix(k)[2..];
+      assert k' == PrependPrefix(k')[2..];
+      assert k == k';
+    }
+  }
+  var zAfter := map[
+      CONST1 := "b",
+      CONST3 := CONST1 + "c",
+      CONST5 := "1"
+    ] + map k <- zBefore :: PrependPrefix(k) := zBefore[k];
+  expect "p_3" in zAfter && zAfter["p_3"] == "5";
+
+  var zeroContainer := new ZeroContainer();
+  zeroContainer.i := 0;
+  expect exists i: int | zeroContainer.i <= i < 10 :: i % 3 == 2;
+  expect forall i: int | 1 <= i <= 10 :: i % 11 != 0;
+  var c := "abcdaa";
+  expect forall ch <- c :: ch !in "e";
+
+  Remap();
+
+  // ExactBoundedPool
+  expect forall i: int | i == 1 :: i % 2 == 1;
+  expect (map i: int | i == 1 :: i % 2 := 2) == map[1 := 2];
+
+  // MultisetBoundedPool
+  expect forall i: int | i in multiset{1, 1, 3} :: i % 2 == 1;
+  expect (map i: int | i in multiset{1, 1, 3} :: i % 2 := 2) == map[1 := 2];
+}
+
+method Remap() {
+  var sResults: map<ByteSequence, Result<(string, string)>> := map[
+    [2 as U8] := Success(("abc", "def")),
+    [3 as U8, 4 as U8] := Success(("abc2", "def2"))
+  ];
+  var remapped := map r | r in sResults.Values :: r.value.0 := r.value.1;
+  expect "abc" in remapped && remapped["abc"] == "def";
+  expect "abc2" in remapped && remapped["abc2"] == "def2";
+}
+
+class ZeroContainer {
+  var i: int
+  constructor() {
+    i := 0;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/loops.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/loops.dfy.expect
new file mode 100644
index 00000000000..565ec0b036a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/loops.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 5 verified, 0 errors
+hello world
+hello world{1}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/mapsubsets.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/mapsubsets.dfy
new file mode 100644
index 00000000000..06db986522e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/mapsubsets.dfy
@@ -0,0 +1,60 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs --unicode-char=false "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function Map<T, U>(m: map<T, U>): map<T, U> {
+  m
+}
+
+datatype Test_ = Test(i: int) {
+  ghost const Valid?: bool := 0 <= i < 4
+
+  predicate Char?(c: char)
+    requires Valid?
+    requires c as int < 256
+  {
+    c < 3 as char
+  }
+}
+
+datatype NeedsTypeParameter_<!T> = NeedsTypeParameter(t: T -> bool)
+
+type NeedsTypeParameter<!T> = x: NeedsTypeParameter_<T> | true witness NeedsTypeParameter((t: T) => false)
+
+type Test = t: Test_ | t.Valid? witness Test(0)
+
+newtype UInt16 = x: int | 0 <= x < 65536
+
+newtype Int16 = x: int | -32768 <= x < 32768
+
+type CodeUnit = bv16
+
+method CharToString(c: char, s: map<char, string>) returns (r: string) {
+  if c in s {
+    return "inside:" + s[c];
+  }
+  return "not inside";
+}
+
+function LastCharToNat(str: string, digits: map<char, nat>) : (n: nat)
+  requires forall c | c in str :: c in digits
+{
+  if str == [] then 0
+  else
+    digits[str[|str| - 1]]
+}
+
+method Main() {
+  var m := Map(map[1 := 2]);
+  var s: set<set<int>> := {{}};
+  expect |s| == 1;
+  var z := (c => c as CodeUnit)('a');
+  var t: Test := Test(2);
+  var x := CharToString('a', map['a' := "hello"]);
+  expect x == "inside:hello";
+  var y := CharToString('z', map['a' := "hello"]);
+  expect y == "not inside";
+  if t.Char?(2 as char) {
+    print "Everything is ok.";
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/mapsubsets.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/mapsubsets.dfy.expect
new file mode 100644
index 00000000000..e13d6aad42b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/mapsubsets.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 8 verified, 0 errors
+Everything is ok.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/methods.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/methods.dfy
new file mode 100644
index 00000000000..816c9ca9f03
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/methods.dfy
@@ -0,0 +1,228 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype NativeNotZero = x: int | 1 <= x < 255 witness 1
+
+// k0 is initialized using var_init!<T>
+// A tracker starts before the second if to determine if k needs to be cleaned up
+method TestResourceCleanup<T(0)>(return_first: bool, update_value: bool, thn: T)
+  requires return_first ==> !update_value
+{
+  var k0: T;
+  if return_first {
+    return; // No assignment, need to forget unconditionally about k0;
+  }
+  if update_value {
+    k0 := thn;
+  }
+  // Need to forget conditionally about k0 using the tracker
+}
+
+
+// j1 and k1 are initialized using var_init!<T>
+// Both j1 and k1 use assign_nodrop! the first time and regular assignment the second time.
+// No cleanup is necessary
+method TakeAssignNoDrop<T>(b: bool, thn: T, els: T) returns (j1: T, k1: T)
+{
+  if b {
+    var x: T;
+    k1 := thn;
+    // Here x must be forgotten
+  } else {
+    var y: T;
+    k1 := els;
+    // Here y must be forgotten
+  }
+  j1 := k1;
+  // Regular assignments
+  k1 := j1;
+  j1 := k1;
+  // No cleanup necessary
+}
+
+// k02 are initialized using var_init!<T>
+// A tracker starts before the second if to determine if k needs to be cleaned up
+method TestResourceCleanupLoop<T>(return_first: bool, update_value: bool, thn: T)
+{
+  var k2: T;
+  var tmp := update_value;
+  while return_first {
+    return; // No assignment, need to forget unconditionally about k2;
+  }
+  while tmp decreases tmp {
+    k2 := thn;
+    tmp := false;
+  }
+  // Need to forget conditionally about k0 using the tracker
+}
+
+
+// k02 are initialized using var_init!<T>
+// A tracker starts before the second if to determine if k needs to be cleaned up
+method TestResourceCleanupLoopComplex<T>(return_first: bool, update_value: bool, thn: T)
+{
+  var k2: T;
+  var tmp := update_value;
+  var i := 1;
+  // The assignment tracker should be emitted before the while statement.
+  while return_first && i >= 0 decreases i {
+    if i == 0 {
+      return; // No assignment, need to forget unconditionally about k0;
+    } else {
+      k2 := thn;
+    }
+    i := i -1;
+  }
+  i := 2;
+  while i >= 0 decreases i {
+    var local_var: T;
+    if i == 1 {
+      local_var := thn;
+    }
+    if(!update_value) { // Here both k2 and local_var must be forgotten
+      return;
+    }
+    k2 := thn;
+    i := i - 1;
+     // local_var should be forgotten if it was never assigned here.
+  }
+  // Need to forget conditionally about k0 using the tracker
+}
+
+
+
+
+// k3 is initialized using 0. We don't care because we won't read this value before it's written to.
+// A tracker starts before the second if to determine if k needs to be cleaned up
+method TestResourceCleanupNative(return_first: bool, update_value: bool, thn: NativeNotZero)
+{
+  var k3: NativeNotZero;
+  if return_first {
+    return; //No need to forget numbers
+  }
+  if update_value {
+    k3 := thn;
+  }
+  // No need to forget conditionally
+}
+
+
+// No tracking, no initialization needed.
+method TakeAssignNoDropNative(b: bool, thn: NativeNotZero, els: NativeNotZero) returns (j4: NativeNotZero)
+{
+  var k4: NativeNotZero;
+  if b {
+    k4 := thn;
+  } else {
+    k4 := els;
+  }
+  j4 := k4;
+  // Regular assignments
+  k4 := j4;
+  j4 := k4;
+  // No cleanup necessary
+}
+
+// k0 are initialized using var_init!<T>
+// A tracker starts before the second if to determine if k needs to be cleaned up
+method TestResourceCleanupLoopNative(return_first: bool, update_value: bool, thn: NativeNotZero)
+{
+  var k5: NativeNotZero;
+  var tmp := update_value;
+  while return_first {
+    return; // No assignment, need to forget unconditionally about k0;
+  }
+  while tmp decreases tmp {
+    k5 := thn;
+    tmp := false;
+  }
+  // Need to forget conditionally about k0 using the tracker
+}
+
+// j1 is a DafnyInt which uses the default value of a .
+method AssignNoDropTwice(x: bool) returns (j6: int)
+{
+  if x {
+    j6 := 3; // Assigned with assign_nodrop!
+    return;  // No need to clean up
+  }
+  j6 := 1; // Assigned with assign_nodrop!
+  // No need to clean up
+}
+
+method AssignNoDropTwiceNative(x: bool) returns (j7: NativeNotZero)
+{
+  if x {
+    j7 := 3; // Assigned with regular assignment
+    return;
+  }
+  j7 := 1;
+}
+
+method InitiateInt(x: bool, y: bool) returns (j8: int)
+  requires x == y
+{
+  var k8: int;
+  // Assignment tracking starts here for k
+  if x {
+    k8 := 3;
+  }
+  // Assignment tracking starts here for j
+  if y {
+    j8 := k8;
+    return;
+  } else {
+    j8 := 3;
+  }
+  // J determined to be deterministically assigned here.
+  // Normal assignment
+  j8 := 1;
+}
+
+method Main() {
+  TestResourceCleanup(true, false, 1);
+  TestResourceCleanup(false, true, 1);
+  TestResourceCleanup(false, false, 1);
+  
+  TestResourceCleanupLoop(true, false, 1);
+  TestResourceCleanupLoop(false, true, 1);
+  TestResourceCleanupLoop(false, false, 1);
+
+  TestResourceCleanupLoopComplex(true, false, 1);
+  TestResourceCleanupLoopComplex(false, true, 1);
+  TestResourceCleanupLoopComplex(false, false, 1);
+  
+  TestResourceCleanupNative(true, false, 1);
+  TestResourceCleanupNative(false, true, 1);
+  TestResourceCleanupNative(false, false, 1);
+  
+  TestResourceCleanupLoopNative(true, false, 1);
+  TestResourceCleanupLoopNative(false, true, 1);
+  TestResourceCleanupLoopNative(false, false, 1);
+
+  var x: int, x2: int := TakeAssignNoDrop(true, 2, 3);
+  expect x == 2 == x2;
+  x, x2 := TakeAssignNoDrop(false, 2, 3);
+  expect x == 3;
+
+  var y: NativeNotZero := TakeAssignNoDropNative(true, 2, 3);
+  expect y == 2;
+  y := TakeAssignNoDropNative(false, 2, 3);
+  expect y == 3;
+
+  x := AssignNoDropTwice(true);
+  expect x == 3;
+  x := AssignNoDropTwice(false);
+  expect x == 1;
+  y := AssignNoDropTwiceNative(true);
+  expect y == 3;
+  y := AssignNoDropTwiceNative(false);
+  expect y == 1;
+
+  x := InitiateInt(true, true);
+  expect x == 3;
+  x := InitiateInt(false, false);
+  expect x == 1;
+  print "Everything ok";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/methods.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/methods.dfy.expect
new file mode 100644
index 00000000000..cf2265d5715
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/methods.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 10 verified, 0 errors
+Everything ok
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/moduleordering.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/moduleordering.dfy
new file mode 100644
index 00000000000..543a05b0e48
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/moduleordering.dfy
@@ -0,0 +1,20 @@
+// NONUNIFORM: Test of the Rust compiler to ensure it emits modules in a deterministic order.
+// RUN: %baredafny translate rs "%s" > "%t"
+// RUN: %OutputCheck --file-to-check "%S/moduleordering-rust/src/moduleordering.rs" "%s"
+// CHECK-L: pub mod A {
+// CHECK-L: pub mod B {
+// CHECK-L: pub mod C {
+// CHECK-L: pub mod D {
+// CHECK-L: pub mod E {
+// CHECK-L: pub mod F {
+// CHECK-L: pub mod G {
+// CHECK-L: pub mod H {
+
+module B { const X := "B" }
+module D { import B const X := B.X }
+module C { import A const X := A.X }
+module E { import C const X := C.X }
+module A { import G const X := G.X }
+module G { const X := "G" }
+module F { const X := "F" }
+module H { const X := "H" }
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nestedmodules.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nestedmodules.check
new file mode 100644
index 00000000000..77dcfa19320
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nestedmodules.check
@@ -0,0 +1 @@
+// CHECK: .*pub mod B \{.*
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nestedmodules.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nestedmodules.dfy
new file mode 100644
index 00000000000..c8284779462
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nestedmodules.dfy
@@ -0,0 +1,36 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// Checks that, despite module B being prefixed with A, there will be a "mod B" somewhere
+// and not an encoding like "mod A_B".
+// This module will automatically be in mod A and referred to as "A::B"
+// RUN: %OutputCheck --file-to-check "%S/nestedmodules-rust/src/nestedmodules.rs" "%S/nestedmodules.check"
+
+module A.B {
+  import opened C
+  method Test() {
+    print "A.B.Test-";
+    Bar();
+  }
+}
+
+module A {
+  import opened B
+  module B.C {
+    method Bar() {
+      print "A.B.C.Bar-";
+    }
+  }
+
+  method Foo() {
+    print "A.Foo-";
+    Test();
+    B.C.Bar();
+  }
+}
+
+method Main() {
+  print "main-";
+  A.Foo();
+  print "end";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nestedmodules.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nestedmodules.dfy.expect
new file mode 100644
index 00000000000..e4a65f263e4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nestedmodules.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 3 verified, 0 errors
+main-A.Foo-A.B.Test-A.B.C.Bar-A.B.C.Bar-end
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtype-set-comp.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtype-set-comp.dfy
new file mode 100644
index 00000000000..fe08c8d50e0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtype-set-comp.dfy
@@ -0,0 +1,16 @@
+// NONUNIFORM: Testing explicit newtype conversion of bounded ranges in Rust backend
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype uint8  = x: int | 0 <= x < 0x100
+newtype uint16 = x: int | 0 <= x < 0x10000
+
+function UInt16ToSeq(x: uint16): seq<uint8> {
+  var b0 := (x / 0x100) as uint8;
+  var b1 := (x % 0x100) as uint8;
+  [b0, b1]
+}
+
+method Main() {
+  var a := set x: uint16 | 0 <= x < 0xFFFF :: UInt16ToSeq(x);
+}
\ No newline at end of file
diff --git a/Test/dafny0/OpaqueTypeWithMembersE.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtype-set-comp.dfy.expect
similarity index 100%
rename from Test/dafny0/OpaqueTypeWithMembersE.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtype-set-comp.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypes.dfy
new file mode 100644
index 00000000000..79f6a2ac4de
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypes.dfy
@@ -0,0 +1,195 @@
+// NONUNIFORM: Test of Rust's ability to support newtypes
+// RUN: %baredafny run -t:rs "%s"
+// RUN: %baredafny run -t:rs --unicode-char=false "%s"
+/// %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+newtype int2 = x: int | -2 <= x < 2
+newtype int16 = x: int | -32768 <= x < 32768
+const INT2_MAX: int2 := 1
+type zero = x: int2 | x == 0 witness 0
+const Zero: zero := 0
+const DChar : char := 68 as char
+type CodeUnit = bv8
+const cu: CodeUnit := 0
+newtype uint8  = x: int | 0 <= x < 0x100
+type byte = uint8
+newtype uint32 = x: int | 0 <= x < 0x1_00000000
+newtype {:nativeType  "ulong"}  NewNat = n:nat | n <= -(1 as bv64) as nat
+
+newtype {:rust_erase false} uint32_noterased = x: int | 0 <= x < 0x1_00000000
+newtype another_int = x: int | true
+
+newtype uint32WithMethods = x: int | 0 <= x < 0x1_00000000 {
+  static const zero: uint32WithMethods := 0 as uint32WithMethods
+  static const one: uint32WithMethods := zero + 1
+  const n: int := this as int
+  static function ctor(x: int): uint32WithMethods {
+    if 0 <= x < 0x1_00000000 then
+      x as uint32WithMethods
+    else
+      zero
+  }
+  function plus(y: uint32WithMethods): uint32WithMethods
+    requires this as int + y as int < 0x1_00000000
+  {
+    this + y
+  }
+  function plus_overflow(y: uint32WithMethods): uint32WithMethods
+  {
+    (this as bv32 + y as bv32) as uint32WithMethods
+  }
+  function minus_overflow(y: uint32WithMethods): uint32WithMethods
+  {
+    (this as bv32 - y as bv32) as uint32WithMethods
+  }
+  function times_overflow(y: uint32WithMethods): uint32WithMethods
+  {
+    (this as bv32 * y as bv32) as uint32WithMethods
+  }
+  function div_overflow(y: uint32WithMethods): uint32WithMethods
+    requires y != 0
+  {
+    (this as bv32 / y as bv32) as uint32WithMethods
+  }
+}
+
+newtype IntWrapper = int {
+  const zero := 0 as IntWrapper
+  const even := (this as int) % 2 == 0
+  function len(): int
+    requires this >= 0
+  {
+    if this == 0 then 0 else
+    1 + (this / 2).len()
+  }
+  method firstTwoBits(maxDepth: uint32WithMethods) returns (output: int) {
+    if this <= 3 || maxDepth == 0 {
+      output := this as int;
+    } else {
+      output := (this / 2).firstTwoBits(maxDepth - 1);
+    }
+  }
+  // non-Copy output values
+  method firstTwoBitsAreThree(maxDepth: uint32WithMethods) returns (output: bool) {
+    if this <= 3 || maxDepth == 0 {
+      output := this == 3;
+    } else {
+      output := (this / 2).firstTwoBitsAreThree(maxDepth - 1);
+    }
+  }
+  function add(other: IntWrapper): IntWrapper {
+    this + other
+  }
+  function DoublePlus(plus: IntWrapper): IntWrapper {
+    this * 2 + plus + plus.zero.AddZero()
+  }
+  function AddZero(): IntWrapper {
+    this
+  }
+
+  function less(other: IntWrapper): bool {
+    this < other
+  }
+}
+
+newtype NestedIntWrapper = IntWrapper {
+  function DoubleMinus(other: NestedIntWrapper): IntWrapper {
+    (this * 47 - other) as IntWrapper
+  }
+}
+
+// Ensuring the uint32 is hashable
+datatype {:rust_rc false} UInt32Pair =
+  UInt32Pair(first: uint32WithMethods, second: uint32WithMethods)
+
+
+type PairIntWrappers = (IntWrapper, IntWrapper)
+datatype {:rust_rc false} PairInts = PairInts(
+    pair: PairIntWrappers 
+) {
+  static function build(i: IntWrapper, j: IntWrapper): PairInts {
+    PairInts((i, j))
+  }
+  function add(other: PairInts): PairInts {
+    PairInts((this.pair.0 + other.pair.0, this.pair.1 + other.pair.1))
+  }
+  
+  function second_(): IntWrapper { pair.1 }
+  const second := second_() 
+}
+
+datatype {:rust_rc false} TwoIntWrappers = TwoIntWrappers(
+    first:IntWrapper,
+    second:IntWrapper
+) {
+    function PairIntsFirstZero():PairInts { PairInts.build(0, second) }
+    const firstZero := PairIntsFirstZero()
+    const secondZero := PairInts.build(first, 0)
+    const underlying := firstZero.add(secondZero)
+    static const origin := TwoIntWrappers(0,0)  
+    const total := first + second
+    
+    function plus(a:TwoIntWrappers):(r:TwoIntWrappers) { 
+        TwoIntWrappers(first.add(a.first), firstZero.add(a.firstZero).second)
+    }
+}
+
+method Main(){
+  print INT2_MAX as int, "\n";
+  print Zero as int16, "\n";
+  print DChar, "\n";
+  print [0, 1, 2][Zero], "\n";
+  print [0, 1, 2][Zero..INT2_MAX], "\n";
+  var f: CodeUnit -> byte := c => c as byte;
+  var arr := new bool[INT2_MAX];
+  print arr.Length, "\n";
+  print DChar as uint32, "\n";
+
+  var three := uint32WithMethods.ctor(3);
+  var six := three.plus(three);
+  var two := uint32WithMethods.ctor(2);
+  var almost_overflow := 0xFFFFFFFF as uint32WithMethods;
+  var almost_overflow2 := 0xFFFFFFFE as uint32WithMethods;
+  
+  // Non erased bounded newtype  <--> non erased unbounded newtype
+  var two_int := two as IntWrapper;
+  var two_back := two_int as uint32WithMethods;
+  expect two == two_back;
+  
+  // Non erased bounded newtype forced  <--> non erased unbounded newtype
+  var two_noterased := two as uint32_noterased;
+  var two_noterased_int := two_noterased as IntWrapper;
+  var two_noterased_int_back := two_noterased_int as uint32_noterased;
+  expect two_noterased == two_noterased_int_back;
+  
+  // erased bounded newtype <--> non erased unbounded newtype
+  var two_uint32 := two as uint32;
+  var two_uint32_int := two_uint32 as IntWrapper;
+  var two_uint32_int_back := two_uint32_int as uint32;
+  expect two_uint32 == two_uint32_int_back;
+
+  // erased bounded newtype <--> erased unbounded newtype
+  var two_uint32_another_int := two_uint32 as another_int;
+  var two_uint32_another_int_back := two_uint32_another_int as uint32;
+  expect two_uint32 == two_uint32_another_int_back;
+  
+  expect two == three.plus_overflow(almost_overflow);
+  expect almost_overflow == two.minus_overflow(three);
+  expect six == three.times_overflow(two);
+  expect 0 as uint32WithMethods == two.div_overflow(three);
+  expect almost_overflow2 == almost_overflow.times_overflow(two);
+  expect (3 as IntWrapper).DoublePlus(1 as IntWrapper) == 7 as IntWrapper;
+  var i := 1;
+  expect !(i as IntWrapper).even;
+  var j := 2;
+  expect (j as IntWrapper).even;
+  expect (i as IntWrapper).less(j as IntWrapper);
+  expect (7 as IntWrapper).len() == 3;
+  expect (8 as IntWrapper).len() == 4;
+  var x := (8 as IntWrapper).firstTwoBits(100);
+  expect x == 2;
+  x := (7 as IntWrapper).firstTwoBits(100);
+  expect x == 3;
+  var bb := 1 as bv8;
+  expect !bb == 254;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypes.dfy.expect
new file mode 100644
index 00000000000..e1ec30b7a61
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypes.dfy.expect
@@ -0,0 +1,7 @@
+1
+0
+'D'
+0
+[0]
+1
+68
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypesrefresh.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypesrefresh.dfy
new file mode 100644
index 00000000000..572d54490b3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypesrefresh.dfy
@@ -0,0 +1,35 @@
+// NONUNIFORM: Test of Rust's ability to support newtypes
+// RUN: %baredafny run -t:rs --type-system-refresh --general-newtypes "%s"
+
+newtype BoolWrapper = bool {
+  const n: int := if this then 1 else 0
+  static function True(): BoolWrapper {
+    true as BoolWrapper
+  }
+  function Or(other: BoolWrapper): BoolWrapper {
+    if n == 1 then True() else other
+  }
+  static const OrFun: (BoolWrapper, BoolWrapper) -> BoolWrapper := 
+    (a, b) => a || b
+
+  static function ApplyFalseTrue(f: (BoolWrapper, BoolWrapper) -> BoolWrapper): BoolWrapper {
+    f(false as BoolWrapper, true as BoolWrapper)
+  }
+  
+  function xor(other: BoolWrapper): BoolWrapper {
+    this != other
+  }
+}
+
+method Main(){
+  expect (true as BoolWrapper).Or(false as BoolWrapper) == (true as BoolWrapper);
+  expect (false as BoolWrapper).Or(false as BoolWrapper) == (false as BoolWrapper);
+  expect (false as BoolWrapper).Or(true as BoolWrapper) == (true as BoolWrapper);
+  expect BoolWrapper.ApplyFalseTrue(BoolWrapper.OrFun) == (true as BoolWrapper);
+  var x := true as BoolWrapper;
+  if !x {
+    expect if !x then false else false;
+  } else if x {
+    expect if x then true else true;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypesrefresh.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypesrefresh.dfy.expect
new file mode 100644
index 00000000000..e1ec30b7a61
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/newtypesrefresh.dfy.expect
@@ -0,0 +1,7 @@
+1
+0
+'D'
+0
+[0]
+1
+68
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nomaybeplacebos.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nomaybeplacebos.check
new file mode 100644
index 00000000000..f0aac04351f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nomaybeplacebos.check
@@ -0,0 +1 @@
+// CHECK-NOT: .*MaybePlacebo.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nomaybeplacebos.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nomaybeplacebos.dfy
new file mode 100644
index 00000000000..c1e2d2101ca
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/nomaybeplacebos.dfy
@@ -0,0 +1,13 @@
+// NONUNIFORM: Test of the output of the Rust translation
+// RUN: %baredafny translate rs "%s" > "%t"
+// RUN: %OutputCheck --file-to-check "%S/nomaybeplacebos-rust/src/nomaybeplacebos.rs" "%S/nomaybeplacebos.check"
+
+
+method Test(i: int) returns (j: int) {
+  j := i;
+}
+
+method Main() {
+  var j := Test(1);
+  var k := Test(j);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/operators.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/operators.dfy
new file mode 100644
index 00000000000..663b59551c4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/operators.dfy
@@ -0,0 +1,318 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+ghost const TWO_TO_THE_8:   int := 0x100
+ghost const TWO_TO_THE_16:  int := 0x10000
+ghost const TWO_TO_THE_32:  int := 0x1_00000000
+ghost const TWO_TO_THE_64:  int := 0x1_00000000_00000000
+ghost const TWO_TO_THE_128:  int := 0x1_00000000_00000000_00000000_00000000
+newtype uint8  = x: int | 0 <= x < TWO_TO_THE_8
+newtype uint16 = x: int | 0 <= x < TWO_TO_THE_16
+newtype uint32 = x: int | 0 <= x < TWO_TO_THE_32
+newtype uint64 = x: int | 0 <= x < TWO_TO_THE_64
+newtype uint128 = x: int | 0 <= x < TWO_TO_THE_128
+
+newtype int8  = x: int  | -0x80 <= x < 0x80
+newtype int16 = x: int  | -0x8000 <= x < 0x8000
+newtype int32 = x: int  | -0x8000_0000 <= x < 0x8000_0000
+newtype int64 = x: int  | -0x8000_0000_0000_0000 <= x < 0x8000_0000_0000_0000
+newtype int128 = x: int  | -0x8000_0000_0000_0000_0000_0000_0000_0000 <= x < 0x8000_0000_0000_0000_0000_0000_0000_0000
+
+method TestU8() {
+  var o8: uint8 := 1 as uint8;
+  var s8: uint8 := 2 as uint8;
+  var w8: uint8 := 5 as uint8;
+  var x8: uint8 := 8 as uint8;
+  var y8: uint8 := 13 as uint8;
+  var z8: uint8 := 21 as uint8;
+  var m8: uint8 := 24 as uint8;
+  var t8: uint8 := 16 as uint8;
+  expect x8 + y8 == z8;
+  expect y8 - x8 == w8;
+  expect x8 as bv8 & y8 as bv8 == x8 as bv8;
+  expect x8 as bv8 | y8 as bv8 == y8 as bv8;
+  expect x8 as bv8 ^ y8 as bv8 == w8 as bv8;
+  expect x8 * 3 == m8;
+  expect x8 as bv8 >> s8 == s8 as bv8;
+  expect x8 as bv8 << o8 == t8 as bv8;
+  print "operators(u8) ";
+}
+method TestI8() {
+  var o8: int8 := 1 as int8;
+  var s8: int8 := 2 as int8;
+  var w8: int8 := 5 as int8;
+  var x8: int8 := 8 as int8;
+  var y8: int8 := 13 as int8;
+  var z8: int8 := 21 as int8;
+  var m8: int8 := 24 as int8;
+  var t8: int8 := 16 as int8;
+  expect x8 + y8 == z8;
+  expect x8 - y8 == -w8;
+  expect x8 * 3 == m8;
+  print "operators(i8) ";
+}
+method TestU16() {
+  var o16: uint16 := 1 as uint16;
+  var s16: uint16 := 2 as uint16;
+  var w16: uint16 := 5 as uint16;
+  var x16: uint16 := 8 as uint16;
+  var y16: uint16 := 13 as uint16;
+  var z16: uint16 := 21 as uint16;
+  var m16: uint16 := 24 as uint16;
+  var t16: uint16 := 16 as uint16;
+  expect x16 + y16 == z16;
+  expect y16 - x16 == w16;
+  expect x16 as bv16 & y16 as bv16 == x16 as bv16;
+  expect x16 as bv16 | y16 as bv16 == y16 as bv16;
+  expect x16 as bv16 ^ y16 as bv16 == w16 as bv16;
+  expect x16 * 3 == m16;
+  expect x16 as bv16 >> s16 as bv16 == s16 as bv16;
+  expect x16 as bv16 << o16 as bv16 == t16 as bv16;
+  print "operators(u16) ";
+}
+
+method TestI16() {
+  var o16: int16 := 1 as int16;
+  var s16: int16 := 2 as int16;
+  var w16: int16 := 5 as int16;
+  var x16: int16 := 8 as int16;
+  var y16: int16 := 13 as int16;
+  var z16: int16 := 21 as int16;
+  var m16: int16 := 24 as int16;
+  var t16: int16 := 16 as int16;
+  expect x16 + y16 == z16;
+  expect x16 - y16 == -w16;
+  expect x16 * 3 == m16;
+  print "operators(i16) ";
+}
+method TestU32() {
+  var o32: uint32 := 1 as uint32;
+  var s32: uint32 := 2 as uint32;
+  var w32: uint32 := 5 as uint32;
+  var x32: uint32 := 8 as uint32;
+  var y32: uint32 := 13 as uint32;
+  var z32: uint32 := 21 as uint32;
+  var m32: uint32 := 24 as uint32;
+  var t32: uint32 := 16 as uint32;
+  expect x32 + y32 == z32;
+  expect y32 - x32 == w32;
+  expect x32 as bv32 & y32 as bv32 == x32 as bv32;
+  expect x32 as bv32 | y32 as bv32 == y32 as bv32;
+  expect x32 as bv32 ^ y32 as bv32 == w32 as bv32;
+  expect x32 * 3 == m32;
+  expect x32 as bv32 >> s32 as bv32 == s32 as bv32;
+  expect x32 as bv32 << o32 as bv32 == t32 as bv32;
+  print "operators(u32) ";
+}
+
+method TestI32() {
+  var o32: int32 := 1 as int32;
+  var s32: int32 := 2 as int32;
+  var w32: int32 := 5 as int32;
+  var x32: int32 := 8 as int32;
+  var y32: int32 := 13 as int32;
+  var z32: int32 := 21 as int32;
+  var m32: int32 := 24 as int32;
+  var t32: int32 := 16 as int32;
+  expect x32 + y32 == z32;
+  expect x32 - y32 == -w32;
+  expect x32 * 3 == m32;
+  print "operators(i32) ";
+}
+method TestU64() {
+  var o64: uint64 := 1 as uint64;
+  var s64: uint64 := 2 as uint64;
+  var w64: uint64 := 5 as uint64;
+  var x64: uint64 := 8 as uint64;
+  var y64: uint64 := 13 as uint64;
+  var z64: uint64 := 21 as uint64;
+  var m64: uint64 := 24 as uint64;
+  var t64: uint64 := 16 as uint64;
+  expect x64 + y64 == z64;
+  expect y64 - x64 == w64;
+  expect x64 as bv64 & y64 as bv64 == x64 as bv64;
+  expect x64 as bv64 | y64 as bv64 == y64 as bv64;
+  expect x64 as bv64 ^ y64 as bv64 == w64 as bv64;
+  expect x64 * 3 == m64;
+  expect x64 as bv64 >> s64 as bv64 == s64 as bv64;
+  expect x64 as bv64 << o64 as bv64 == t64 as bv64;
+  print "operators(u64) ";
+}
+method TestI64() {
+  var o64: int64 := 1 as int64;
+  var s64: int64 := 2 as int64;
+  var w64: int64 := 5 as int64;
+  var x64: int64 := 8 as int64;
+  var y64: int64 := 13 as int64;
+  var z64: int64 := 21 as int64;
+  var m64: int64 := 24 as int64;
+  var t64: int64 := 16 as int64;
+  expect x64 + y64 == z64;
+  expect x64 - y64 == -w64;
+  expect x64 * 3 == m64;
+  print "operators(i64) ";
+}
+method TestU128() {
+  var o128: uint128 := 1 as uint128;
+  var s128: uint128 := 2 as uint128;
+  var w128: uint128 := 5 as uint128;
+  var x128: uint128 := 8 as uint128;
+  var y128: uint128 := 13 as uint128;
+  var z128: uint128 := 21 as uint128;
+  var m128: uint128 := 24 as uint128;
+  var t128: uint128 := 16 as uint128;
+  expect x128 + y128 == z128;
+  expect y128 - x128 == w128;
+  expect x128 as bv128 & y128 as bv128 == x128 as bv128;
+  expect x128 as bv128 | y128 as bv128 == y128 as bv128;
+  expect x128 as bv128 ^ y128 as bv128 == w128 as bv128;
+  expect x128 * 3 == m128;
+  expect x128 as bv128 >> s128 as bv128 == s128 as bv128;
+  expect x128 as bv128 << o128 as bv128 == t128 as bv128;
+  print "operators(u128)\n";
+}
+
+method TestI128() {
+  var o128: int128 := 1 as int128;
+  var s128: int128 := 2 as int128;
+  var w128: int128 := 5 as int128;
+  var x128: int128 := 8 as int128;
+  var y128: int128 := 13 as int128;
+  var z128: int128 := 21 as int128;
+  var m128: int128 := 24 as int128;
+  var t128: int128 := 16 as int128;
+  expect x128 + y128 == z128;
+  expect x128 - y128 == -w128;
+  expect x128 * 3 == m128;
+  print "operators(i128)\n";
+}
+method {:resource_limit "1e6"}  Main() {
+  var t := true;
+  var f := false;
+  expect ((t && f) || f) ==> f;
+  print "&& || ==> ";
+  expect t && f <==> f && t;
+  print "<==> ";
+
+  expect 2 <= 3;
+  expect 2 < 3;
+  expect 3 >= 2;
+  expect 3 > 2;
+  expect 3 != 2;
+  expect 2 == 2;
+  print "<= < >= > != ==\n";
+
+  expect 2 + 2 == 4;
+  expect 2 * 2 == 4;
+  expect 2 - 2 == 0;
+  expect -1 / 2 == -1;
+  expect 5 % 2 == 1;
+  print "+ * - / %\n";
+  TestU8();
+  TestU16();
+  TestU32();
+  TestU64();
+  TestU128();
+  TestI8();
+  TestI16();
+  TestI32();
+  TestI64();
+  TestI128();
+  
+  var a := 'a';
+  var z := 'z';
+  expect a < z;
+  expect z > a;
+  expect a <= a;
+  expect a >= a;
+  expect a != z;
+  expect a == a;
+  expect !(a < a);
+  expect !(z < a);
+  expect !(z <= a);
+  expect !(a >= z);
+  print "char comparison\n";
+  
+  var m := map[1 := 2];
+  expect 1 in m;
+  expect 2 !in m;
+  expect m[1] == 2;
+  print "map contains acccess ";
+  var m2 := m[2 := 4] - {1};
+  expect 1 !in m2;
+  expect 2 in m2;
+  print "update union diff ";
+  var m3 := map k | 2 <= k < 4 :: k := 2*k;
+  expect m3 == map[3 := 6, 2 := 4];
+  expect |m3| == 2;
+  print "comprehension equality cardinality ";
+  
+  expect m3.Keys == {2, 3};
+  expect m3.Values == {4, 6};
+  expect m3.Items == {(2, 4), (3, 6)};
+  print ".Keys .Values .Items\n";
+
+  var st := {1};
+  expect 1 in st;
+  expect 2 !in st;
+  print "set contains ";
+  var t2 := st + {2} - {1};
+  expect 1 !in t2;
+  expect 2 in t2;
+  print "union diff ";
+  var t3 := set k | 2 <= k < 4 :: 2*k;
+  expect t3 == {6, 4};
+  expect |t3| == 2;
+  expect {4, 6} <= t3;
+  expect {4} < t3;
+  expect t3 >= {4, 6};
+  expect t3 > {6};
+  print "comprehension equality cardinality ";
+  expect t2 != t3;
+  expect t2 * t3 == {};
+  expect t2 !! t3;
+  print "inequality and intersection\n";
+  
+  var s1 := seq(2, i => 1 + i);
+  var s2 := s1 + [3];
+  expect s1 <= s2;
+  expect s1 < s2;
+  expect s1 != s2;
+  expect !(s2 <= s1);
+  expect !(s2 < s1);
+  expect s2 != s1;
+  expect !(s1 == s2);
+  print "sequence prefix ";
+  var s3 := if |s2| == 3 then s2[2 := 4] else s2;
+  expect s3[1] == 2;
+  expect s3 == [1, 2, 4];
+  expect |s3| == 3;
+  print "sequence update cardinality ";
+
+  var s4 := if |s3| >= 3 then s3[1..3] else s3;
+  expect s4 == [2, 4];
+  print "sequence slice\n";
+
+  var h := multiset{1, 1, 2};
+  var k := multiset([1, 2]);
+  expect k < h;
+  expect k <= h;
+  expect h > k;
+  expect h >= k;
+  print "multiset comparison ";
+  expect k + h == multiset{1, 1, 1, 2, 2};
+  print "union equality ";
+  expect 1 in h;
+  expect h[1] == 2;
+  expect |h| == 3;
+  print "access and cardinality\n";
+  
+  var seq1: seq<int> := [1, 2, 3, 4];
+  var seq2: int := seq1[0];
+  var seq3: seq<int> := seq1[1..4];
+  var seq4: seq<int> := seq3 + [seq2];
+  expect seq4[0] == 2;
+  expect seq4[3] == 1;
+  expect seq4[0..3] == seq3;
+  print "Sequence index slice comparison";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/operators.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/operators.dfy.expect
new file mode 100644
index 00000000000..8923b8864bd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/operators.dfy.expect
@@ -0,0 +1,12 @@
+
+Dafny program verifier finished with 21 verified, 0 errors
+&& || ==> <==> <= < >= > != ==
++ * - / %
+operators(u8) operators(u16) operators(u32) operators(u64) operators(u128)
+operators(i8) operators(i16) operators(i32) operators(i64) operators(i128)
+char comparison
+map contains acccess update union diff comprehension equality cardinality .Keys .Values .Items
+set contains union diff comprehension equality cardinality inequality and intersection
+sequence prefix sequence update cardinality sequence slice
+multiset comparison union equality access and cardinality
+Sequence index slice comparison
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/reserved-names.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/reserved-names.dfy
new file mode 100644
index 00000000000..e90b5bc69af
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/reserved-names.dfy
@@ -0,0 +1,20 @@
+// NONUNIFORM: Tests output of Rust translation from input Dafny that uses Rust reserved names
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype X =
+| X(fn: int, self: int, Self: int)
+| None(None: int)
+| H(hash: int)
+
+method Main()
+{
+  var f := X(0, 0, 0);
+  var self := 0;
+  var Self := 0;
+  expect None(3).None == 3;
+  var None := 0;
+  expect None == 0;
+  var hash := H(3).hash;
+  expect hash == 3;
+}
\ No newline at end of file
diff --git a/Test/dafny4/Bug128.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/reserved-names.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug128.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/reserved-names.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings-unicode.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings-unicode.check
new file mode 100644
index 00000000000..b0477141512
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings-unicode.check
@@ -0,0 +1,2 @@
+// CHECK: .*DafnyChar\(.*
+// CHECK-NOT: .*DafnyCharUTF16\(.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings-utf16.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings-utf16.check
new file mode 100644
index 00000000000..0c277a4216d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings-utf16.check
@@ -0,0 +1,2 @@
+// CHECK: .*DafnyCharUTF16\(.*
+// CHECK-NOT: .*DafnyChar\(.*
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings.dfy
new file mode 100644
index 00000000000..44b1a168f10
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings.dfy
@@ -0,0 +1,20 @@
+// NONUNIFORM: Test of the output of the Rust translation
+// RUN: %baredafny run --target=rs --unicode-char=true "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %OutputCheck --file-to-check "%S/strings-rust/src/strings.rs" "%S/strings-unicode.check"
+// RUN: %baredafny run --target=rs --unicode-char=false "%s"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %OutputCheck --file-to-check "%S/strings-rust/src/strings.rs" "%S/strings-utf16.check"
+
+newtype uint8 = x: int | 0 <= x < 255
+newtype uint7 = x: int | 0 <= x < 128
+
+method Main() {
+  print 'H', 'e', "llo\n";
+  var x8 := 'H' as uint8;
+  var x7 := x8 as uint7;
+  print x7;
+  var y8 := x7 as uint8;
+  var h := y8 as char;
+  expect h == 'H';
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings.dfy.expect
new file mode 100644
index 00000000000..03d00c0888e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/strings.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 3 verified, 0 errors
+'H''e'llo
+72
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/subsetconstraints.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/subsetconstraints.check
new file mode 100644
index 00000000000..48ed719da2d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/subsetconstraints.check
@@ -0,0 +1,4 @@
+// CHECK: .*AcceptSubsetAndType\(x, y\).*
+// CHECK: .*AcceptSubsetAndType2\(x, y\).*
+// CHECK: .*AcceptSubsetAndType\(x, y1\).*
+// CHECK: .*AcceptSubsetAndType2\(x, y1\).*
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/subsetconstraints.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/subsetconstraints.dfy
new file mode 100644
index 00000000000..cad15372a6b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/subsetconstraints.dfy
@@ -0,0 +1,48 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %OutputCheck --file-to-check "%S/subsetconstraints-rust/src/subsetconstraints.rs" "%S/subsetconstraints.check"
+
+newtype uint8 = x: int | 0 <= x < 256
+
+type ValidSeqUint8 = i: seq<uint8> | SubtypePredicate(i) witness []
+predicate SubtypePredicate(i: seq<uint8>) { true }
+type SeqUint8 = ValidSeqUint8
+type SeqSeqUInt8 = seq<SeqUint8>
+type MoreThanOne = x: uint8 | x > 1 witness 2
+type DummyType<T> = x: T | true witness *
+
+predicate Test(contextKeys: SeqSeqUInt8, result: SeqSeqUInt8) {
+  forall k <- contextKeys :: k in result
+}
+
+method AcceptSubsetAndType(x: MoreThanOne, y: uint8) {
+  AcceptType(x);
+}
+method AcceptType(y: uint8) {
+}
+
+method AcceptSubsetAndType2(x: DummyType<MoreThanOne>, y: uint8) {
+  AcceptType(x);
+}
+class TestOwnershipConstructor {
+  constructor(a: SeqSeqUInt8, b: seq<seq<uint8>>, c: MoreThanOne, d: MoreThanOne) {
+  }
+}
+method Main() {
+  var s := [[1 as uint8]];
+  var sSub: SeqSeqUInt8 := s;
+  expect Test(s, [[1 as uint8], [2 as uint8]]);
+  expect !Test([[1 as uint8], [3 as uint8]], [[1 as uint8], [2 as uint8]]);
+  var col := [-1, 1, 2];
+  expect forall n: nat <- col :: n > 0;
+  var x := 2 as uint8;
+  var y: MoreThanOne := 2;
+  var y1: DummyType<MoreThanOne> := y;
+  AcceptSubsetAndType(x, y); // Note that subset types are reversed
+  AcceptSubsetAndType2(x, y); // Note that subset types are reversed
+  AcceptSubsetAndType(x, y1); // Note that subset types are reversed
+  AcceptSubsetAndType2(x, y1); // Note that subset types are reversed
+  var z := new TestOwnershipConstructor(s, sSub, x, y);
+  print "Everything is ok.";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/subsetconstraints.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/subsetconstraints.dfy.expect
new file mode 100644
index 00000000000..753ce264737
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/subsetconstraints.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 6 verified, 0 errors
+Everything is ok.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/tests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/tests.dfy
new file mode 100644
index 00000000000..e431975b417
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/tests.dfy
@@ -0,0 +1,22 @@
+// NONUNIFORM: Test of the Dafny-to-Rust tests
+// RUN: %baredafny test --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t
+// RUN: %baredafny build --compile-suffix --target=rs "%s" > "%t"
+// RUN: "%S/tests-rust/cargo" run -- Hello > "%t"
+// RUN: %diff "%s.main.expect" "%t"
+
+method {:test} TestIfTestsAreWorking() {
+  expect 1 == 1, "Ok";
+}
+
+module WrappedTests {
+  method {:test} TestIfTestsAreWorking() {
+    expect 1 == 1, "Ok";
+  }
+  method Main(args: seq<string>) {
+    print "Detected main\n";
+    if |args| > 1 {
+      print args[1];
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/tests.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/tests.dfy.expect
new file mode 100644
index 00000000000..7115860dfa1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/tests.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+WrappedTests.TestIfTestsAreWorking: PASSED
+TestIfTestsAreWorking: PASSED
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/tests.dfy.main.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/tests.dfy.main.expect
new file mode 100644
index 00000000000..27a68b1bd3c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/tests.dfy.main.expect
@@ -0,0 +1,2 @@
+Detected main
+Hello
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits-datatypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits-datatypes.dfy
new file mode 100644
index 00000000000..0dace953dd9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits-datatypes.dfy
@@ -0,0 +1,55 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait DatatypeOps<T> {
+  function GetInt(): int
+  function GetBool(): bool {
+    GetInt() % 2 == 0
+  }
+  function ChooseAmong(a: T, b: T): T {
+    if GetBool() then a else b
+  }
+  method ChooseAmongMethod(a: T, b: T) returns (c: T) {
+    if GetBool() {
+      return a;
+    } else {
+      c := b;
+    }
+  }
+}
+
+datatype {:rust_rc false} ADatatype extends DatatypeOps<int> = ADatatype(i: int) {
+  function AsDatatypeOps(): DatatypeOps<int> {
+    this as DatatypeOps<int>
+  }
+  function GetInt(): int { i }
+}
+
+method Main() {
+  var x := ADatatype(2);
+  expect x.GetInt() == 2;
+  expect x.GetBool() == true;
+  expect x.ChooseAmong(8, 9) == 8;
+  var xm := x.ChooseAmongMethod(8, 9);
+  expect xm == 8;
+  var y := ADatatype(3);
+  expect y.GetInt() == 3;
+  expect y.GetBool() == false;
+  expect y.ChooseAmong(8, 9) == 9;
+  var ym := y.ChooseAmongMethod(8, 9);
+  expect ym == 9;
+  var x1 := x.AsDatatypeOps(); // Dynamic dispatch now.
+  expect x1.GetInt() == 2;
+  expect x1.GetBool() == true;
+  expect x1.ChooseAmong(8, 9) == 8;
+  var x1m := x1.ChooseAmongMethod(8, 9);
+  expect x1m == 8;
+  var y1 := y.AsDatatypeOps();
+  expect y1.GetInt() == 3;
+  expect y1.GetBool() == false;
+  expect y1.ChooseAmong(8, 9) == 9;
+  var y1m := y1.ChooseAmongMethod(8, 9);
+  expect y1m == 9;
+  print "Main passed all the tests";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits-datatypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits-datatypes.dfy.expect
new file mode 100644
index 00000000000..f896bad9217
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits-datatypes.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 4 verified, 0 errors
+Main passed all the tests
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits.dfy
new file mode 100644
index 00000000000..bf9fa40f586
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits.dfy
@@ -0,0 +1,253 @@
+// NONUNIFORM: Rust-specific tests
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module InterfaceHolder {
+  trait {:termination false} Interface {
+    method PutCacheEntry'()
+  }
+}
+
+module InterfaceWrapper {
+  import InterfaceHolder
+  class InterfaceExtender extends InterfaceHolder.Interface {
+    constructor () {
+    }
+    method PutCacheEntry'() {
+    }
+  }
+
+  method PutCacheEntry(ex: InterfaceExtender) {
+    ex.PutCacheEntry'();
+  }
+}
+
+module TraitDefinitions {
+  datatype Option<+T> = Some(value: T) | None {
+    function Negate(t: T): Option<T> {
+      match this {
+        case Some(v) => None
+        case None => Some(t)
+      }
+    }
+    predicate IsFailure() {
+      None?
+    }
+    function PropagateFailure<U>(): Option<U> {
+      None
+    }
+    function Extract(): T
+      requires !IsFailure() {
+      value
+    }
+  }
+
+
+  trait NoMemberTrait {}
+  
+  trait NoMemberTrait2 {}
+  trait SuperTrait extends NoMemberTrait, NoMemberTrait2 {
+    method GetC() returns (c: int)
+    method SetC(newC: int)
+      modifies this
+  }
+
+  trait {:termination false} SubTrait<T, I> extends SuperTrait {
+    method GetC() returns (c: int)
+      ensures c >= 0
+
+    method GetCTwicePlusD() returns (c2: int) {
+      var c := GetC();
+      var d := GetD();
+      return c + c + d;
+    }
+    method GetD()  returns (d: int)
+
+    function GetDFunc(): int
+  }
+}
+
+module All {
+  import opened TraitDefinitions
+  
+  class Y<I> extends SubTrait<int, I> {
+    var c: int
+    var z: int
+    const d: int := 2
+    constructor(c: int) {
+      this.c := c;
+    }
+    method AddZ()
+      modifies this
+    {
+      this.Add(this.z);
+    }
+    method Add(extra: int)
+      modifies this
+    {
+      c := c + extra;
+    }
+    method Swap()
+      modifies this
+    {
+      this.c, this.z := this.z, this.c;
+    }
+    method SetC(newC: int)
+      modifies this
+    {
+      c := newC;
+    }
+    method GetC() returns (c: int)
+      ensures c >= 0
+    {
+      return if this.c <= 0 then 37 else this.c;
+    }
+    method GetD() returns (d: int) {
+      return this.d;
+    }
+    method Convert(i: I, i2: I) returns (j: I) {
+      if c == 0 {
+        return i;
+      } else {
+        return i2;
+      }
+    }
+    method ClosureConvert() returns (f: int ~> int)
+      ensures forall i :: f.requires(i) == true && f.reads(i) == {this}
+    {
+      return (i: int) reads this => this.c + this.d + i;
+    }
+
+    function GetDFunc(): int {
+      d
+    }
+  }
+
+  method Test(x: Option<int>) returns (r: Option<bool>) {
+    r := Some(true);
+  }
+
+  method AcceptSubtraitIntInt(t: SubTrait<int, int>) {
+  }
+
+  datatype ObjectContainer = ObjectContainer(y: Y<int>)
+
+  method ParameterBorrows(y: Y<int>, o: ObjectContainer) { // y is borrowed
+    var z: SubTrait<int, int> := y as SubTrait<int, int>;
+    var p: SuperTrait := y;
+    var y2 := o.y; // y2 is owned
+    ConsumeBorrows(y2 as SubTrait<int, int>);
+    ConsumeBorrows(y2 as SubTrait<int, int>);
+  }
+
+  method ConsumeBorrows(y: SubTrait<int, int>) {
+
+  }
+  trait TraitNoArgs {}
+  class ClassNoArgs extends TraitNoArgs {
+    var x: int
+    constructor() {
+      x := 0;
+    }
+  }
+  method ConsumeClassNoArgs(a: ClassNoArgs) {
+  }
+
+  method Main() {
+    var rts := Test(Some(2));
+    expect rts == Some(true);
+
+    var y := new Y<int>(7);
+    var yOwned := y;
+    expect y.GetDFunc() == 2;
+    AcceptSubtraitIntInt(yOwned);
+    AcceptSubtraitIntInt(yOwned);
+    var z: SubTrait<int, int> := yOwned as SubTrait<int, int>;
+    var z2: SubTrait<int, int> := yOwned as SubTrait<int, int>;
+    var w: SuperTrait := z;
+    var w2: SuperTrait := z;
+    var p: SuperTrait := y;
+    /*var zy := z as Y<int>;
+    var wy := w as Y<int>;
+    var pzy := p as SubTrait<int, int> as Y<int>;
+    expect zy == wy == pzy;*/
+    var zc := z.GetC();
+    var wc := w.GetC();
+    var pc := p.GetC();
+    expect 7 == y.c == zc == wc == pc;
+    var zd := z.GetD();
+    var yd := y.GetD();
+    expect yd == zd == 2;
+    var zc2d := z.GetCTwicePlusD();
+    expect zc2d == 16;
+    var yc2d := y.GetCTwicePlusD();
+    expect yc2d == 16;
+    var f := y.Convert(42, 37);
+    expect f == 37;
+    w.SetC(0);
+    f := y.Convert(42, 37);
+    expect f == 42;
+    expect y as object == w as object;
+    expect y as object == p as object;
+    expect yOwned as object == w as object;
+    expect yOwned as object == p as object;
+    var a := new ClassNoArgs();
+    var aOwned := a;
+    var o: TraitNoArgs := a as TraitNoArgs;
+    expect o is ClassNoArgs;
+    ConsumeClassNoArgs(o);
+    ConsumeClassNoArgs(o);
+    var oo: object := o as object;
+    expect oo is ClassNoArgs;
+    ConsumeClassNoArgs(oo as ClassNoArgs);
+    ConsumeClassNoArgs(oo as ClassNoArgs);
+    var objects := {y as object, w as object, p as object};
+    expect |objects| == 1;
+    var q := y as NoMemberTrait;
+    expect y as NoMemberTrait == y;
+    expect y as NoMemberTrait2 == y;
+    expect y as NoMemberTrait as object == y as NoMemberTrait2;
+    var yn := (q as object as Y<int>);
+    expect yn.d == y.d;
+    expect (q as object as Y<int>) == y;
+    var yp: Y?<int> := null;
+    expect yp == null;
+    yp := y;
+    expect yp == y;
+    var ff := y.ClosureConvert();
+    expect ff(1) == 1 + y.c + y.d;
+
+    var seqY := [y];
+    var setY := {y};
+    var mulY := multiset{y};
+    var mapY := map[1 := y];
+
+    var seqYU: seq<SubTrait<int, int>> := seqY;
+    var setYU: set<SubTrait<int, int>> := setY;
+    var mulYU: multiset<SubTrait<int, int>> := mulY;
+    var mapYU: map<int, SubTrait<int, int>> := mapY;
+
+    var seqYS: seq<SuperTrait> := seqY;
+    var setYS: set<SuperTrait> := setY;
+    var mulYS: multiset<SuperTrait> := mulY;
+    var mapYS: map<int, SuperTrait> := mapY;
+
+    var seqYO: seq<object> := seqY;
+    var seaYO: set<object> := setY;
+    var mulYO: multiset<object> := mulY;
+    var mapYO: map<int, object> := mapY;
+
+    var seqYSO: seq<object> := seqYS;
+    var seaYSO: set<object> := setYS;
+    var mulYSO: multiset<object> := mulYS;
+    var mapYSO: map<int, object> := mapYS;
+
+    var optY := Some(y);
+    var optYU: Option<SubTrait<int, int>> := optY;
+    var optYS: Option<SuperTrait> := optY;
+    var optYO: Option<object> := optY;
+    var optYSO: Option<object> := optYS;
+
+    print "Main passed all the tests\n";
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits.dfy.expect
new file mode 100644
index 00000000000..506e5ca1d4c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/traits.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 21 verified, 0 errors
+Main passed all the tests
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/more_dafny.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/more_dafny.dfy
new file mode 100644
index 00000000000..c55fc26cb3f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/more_dafny.dfy
@@ -0,0 +1,24 @@
+// RUN: %baredafny translate rs --rust-module-name additional_module "%S/more_dafny_extern.rs" "%s"
+// RUN: %exits-with -any %rm -f "%S/project_depending_on_dafny/src/additional_module.rs"
+// RUN: %exits-with -any %rm -f "%S/project_depending_on_dafny/src/more_dafny_extern.rs"
+// RUN: %mv "%S/more_dafny-rust/src/more_dafny.rs" "%S/project_depending_on_dafny/src/additional_module.rs"
+// RUN: %mv "%S/more_dafny-rust/src/more_dafny_extern.rs" "%S/project_depending_on_dafny/src/more_dafny_extern.rs"
+// RUN: "%S/project_depending_on_dafny/cargo" run > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module SubModule {
+  function {:axiom} {:extern "extern_dafny", "eight"} Eight(): (r: bv16) ensures r == 8
+
+  function reverse(input: bv16): bv16 {
+    ((input & 0xFF) << Eight()) | ((input & 0xFF00) >> Eight())
+  }
+}
+
+function reverse(input: bv16): (result: bv16) {
+  SubModule.reverse(input)
+}
+
+lemma reverseDoubleIsIdentity(input: bv16)
+  ensures reverse(reverse(input)) == input
+{
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/more_dafny.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/more_dafny.dfy.expect
new file mode 100644
index 00000000000..3617feec37f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/more_dafny.dfy.expect
@@ -0,0 +1,2 @@
+Intermediate result is 2560
+Result should be 10, got 10
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/more_dafny_extern.rs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/more_dafny_extern.rs
new file mode 100644
index 00000000000..59348bf4c2a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/more_dafny_extern.rs
@@ -0,0 +1,5 @@
+pub mod extern_dafny {
+  pub fn eight() -> u16 {
+    8
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/.gitignore
new file mode 100644
index 00000000000..d149df7bd20
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/.gitignore
@@ -0,0 +1,3 @@
+src/additional_module.rs
+src/more_dafny_extern.rs
+target/
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/Cargo.lock b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/Cargo.lock
new file mode 100644
index 00000000000..af315037a76
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ProjectDependingOnDafny"
+version = "0.1.0"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/Cargo.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/Cargo.toml
new file mode 100644
index 00000000000..f7079b63c99
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "ProjectDependingOnDafny"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "projectdependingondafny"
+path = "src/project_depending_on_dafny.rs"
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/src/project_depending_on_dafny.rs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/src/project_depending_on_dafny.rs
new file mode 100644
index 00000000000..ddcab2f93c8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/translate-additional/project_depending_on_dafny/src/project_depending_on_dafny.rs
@@ -0,0 +1,9 @@
+pub mod additional_module;
+pub mod more_dafny_extern;
+
+fn main() {
+  let x = additional_module::_module::_default::reverse(10);
+  println!("Intermediate result is {:?}", x);
+  let y = additional_module::_module::_default::reverse(x);
+  println!("Result should be 10, got {:?}", y);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/type-test.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/type-test.dfy
new file mode 100644
index 00000000000..75ee7a0c39c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/type-test.dfy
@@ -0,0 +1,15 @@
+// NONUNIFORM: Tests that type tests work in the Rust backend
+// RUN: %baredafny run --target=rs "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %baredafny run --target=rs --raw-pointers "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait T { }
+class A extends T { constructor() {} }
+class B extends T { }
+
+method Main() {
+  var v: T := new A();
+  expect !(v is B), "v shouldn't be B";
+  expect v is A, "v should be A";
+}
\ No newline at end of file
diff --git a/Test/dafny4/Bug133.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/type-test.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug133.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/rust/type-test.dfy.expect
diff --git a/Test/comp/separate-compilation/Inputs/producer/TimesTwo.csproj b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/Inputs/producer/TimesTwo.csproj
similarity index 100%
rename from Test/comp/separate-compilation/Inputs/producer/TimesTwo.csproj
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/Inputs/producer/TimesTwo.csproj
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/Inputs/producer/timesTwo.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/Inputs/producer/timesTwo.dfy
new file mode 100644
index 00000000000..49a25dfcb59
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/Inputs/producer/timesTwo.dfy
@@ -0,0 +1,32 @@
+module {:options "--function-syntax:4"} CoolLibraryName {
+
+  // Ensuring this module is not empty,
+  // or else it will be omitted from the translation record.
+  const FOO := 42
+
+  module LibraryModule {
+
+    function TimesTwo(x: nat): nat
+    {
+      x * 2
+    }
+
+    datatype Result<+T, +E> = Success(value: T) | Failure(error: E)
+
+    // Record type
+    datatype Pair<+T, +U> = Pair(first: T, second: U)
+
+    datatype NestedTypeConstructorRecord<+T> = First(value: Pair<T, T>)
+    datatype NestedTypeConstructorClass<+T> = First2(value: Pair<T, T>) | Second2(value: Pair<T, T>)
+
+    datatype NoTypeArgs = Success2 | Failure2
+
+  }
+}
+
+// Ensuring reserved names in some languages are escaped consistently across languages
+module Math {
+  function Add(x: int, y: int): int {
+    x + y
+  }
+}
\ No newline at end of file
diff --git a/Test/comp/separate-compilation/consumer/Consumer.csproj b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/consumer/Consumer.csproj
similarity index 88%
rename from Test/comp/separate-compilation/consumer/Consumer.csproj
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/consumer/Consumer.csproj
index e6bb653223b..b32966d460e 100644
--- a/Test/comp/separate-compilation/consumer/Consumer.csproj
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/consumer/Consumer.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/README.md b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/README.md
new file mode 100644
index 00000000000..49d881508d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/README.md
@@ -0,0 +1,6 @@
+This code was created using Dafny 4.2 in order to capture the existing code that
+`--legacy-data-constructors` needs to still satisfy:
+
+```
+dafny translate java --output=fromDafny42/usesTimesTwo --allow-warnings --library=Inputs/producer/timesTwo.dfy usesTimesTwo.dfy
+```
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/usesTimesTwo-java/ConsumerModule/__default.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/usesTimesTwo-java/ConsumerModule/__default.java
new file mode 100644
index 00000000000..592e3a1aa86
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/usesTimesTwo-java/ConsumerModule/__default.java
@@ -0,0 +1,61 @@
+// Class __default
+// Dafny class __default compiled into Java
+package ConsumerModule;
+
+
+@SuppressWarnings({"unchecked", "deprecation"})
+public class __default {
+  public __default() {
+  }
+  public static void Main(dafny.DafnySequence<? extends dafny.DafnySequence<? extends dafny.CodePoint>> __noArgsParameter)
+  {
+    java.math.BigInteger _0_n = java.math.BigInteger.ZERO;
+    _0_n = java.math.BigInteger.valueOf(21L);
+    java.math.BigInteger _1_TwoN = java.math.BigInteger.ZERO;
+    _1_TwoN = CoolLibraryName_mLibraryModule.__default.TimesTwo(_0_n);
+    System.out.print((dafny.DafnySequence.asUnicodeString("Two times ")).verbatimString());
+    System.out.print(java.lang.String.valueOf(_0_n));
+    System.out.print((dafny.DafnySequence.asUnicodeString(" is ")).verbatimString());
+    System.out.print(java.lang.String.valueOf(_1_TwoN));
+    System.out.print((dafny.DafnySequence.asUnicodeString("\n")).verbatimString());
+    java.math.BigInteger _2_aNat = java.math.BigInteger.ZERO;
+    java.math.BigInteger _out0 = java.math.BigInteger.ZERO;
+    _out0 = __default.PickANat();
+    _2_aNat = _out0;
+  }
+  public static void __Main(dafny.DafnySequence<? extends dafny.DafnySequence<? extends dafny.CodePoint>> args) {
+    __default.Main(args);
+  }
+  public static java.math.BigInteger PickANat()
+  {
+    java.math.BigInteger n = java.math.BigInteger.ZERO;
+    if(true) {
+      java.math.BigInteger _out1 = java.math.BigInteger.ZERO;
+      _out1 = __default.<java.math.BigInteger>PickSomething(_System.nat._typeDescriptor());
+      n = _out1;
+    }
+    return n;
+  }
+  public static <__T> __T PickSomething(dafny.TypeDescriptor<__T> _td___T)
+  {
+    @SuppressWarnings({"unchecked", "deprecation"})
+    __T t = _td___T.defaultValue();
+    if(true) {
+    }
+    return t;
+  }
+  public static void MakeAResult()
+  {
+    CoolLibraryName_mLibraryModule.Result<java.math.BigInteger, dafny.DafnySequence<? extends dafny.CodePoint>> _3_r;
+    _3_r = CoolLibraryName_mLibraryModule.Result.<java.math.BigInteger, dafny.DafnySequence<? extends dafny.CodePoint>>create_Success(java.math.BigInteger.valueOf(42L));
+  }
+  public static void MakeAPair()
+  {
+    CoolLibraryName_mLibraryModule.Pair<java.math.BigInteger, dafny.DafnySequence<? extends dafny.CodePoint>> _4_p;
+    _4_p = CoolLibraryName_mLibraryModule.Pair.<java.math.BigInteger, dafny.DafnySequence<? extends dafny.CodePoint>>create(java.math.BigInteger.ONE, dafny.DafnySequence.asUnicodeString("partridge in a pair tree"));
+  }
+  @Override
+  public java.lang.String toString() {
+    return "ConsumerModule._default";
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/usesTimesTwo-java/_System/nat.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/usesTimesTwo-java/_System/nat.java
new file mode 100644
index 00000000000..3bfb410ceac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/usesTimesTwo-java/_System/nat.java
@@ -0,0 +1,15 @@
+// Class nat
+// Dafny class nat compiled into Java
+package _System;
+
+import ConsumerModule.*;
+
+@SuppressWarnings({"unchecked", "deprecation"})
+public class nat {
+  public nat() {
+  }
+  private static final dafny.TypeDescriptor<java.math.BigInteger> _TYPE = dafny.TypeDescriptor.<java.math.BigInteger>referenceWithInitializer(java.math.BigInteger.class, () -> java.math.BigInteger.ZERO);
+  public static dafny.TypeDescriptor<java.math.BigInteger> _typeDescriptor() {
+    return (dafny.TypeDescriptor<java.math.BigInteger>) (dafny.TypeDescriptor<?>) _TYPE;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/usesTimesTwo-java/usesTimesTwo.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/usesTimesTwo-java/usesTimesTwo.java
new file mode 100644
index 00000000000..c5279fd4bd9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/fromDafny42/usesTimesTwo-java/usesTimesTwo.java
@@ -0,0 +1,13 @@
+// Dafny program the_program compiled into Java
+
+import ConsumerModule.*;
+import _System.*;
+
+
+
+
+public class usesTimesTwo {
+  public static void main(String[] args) {
+    dafny.Helpers.withHaltHandling(() -> { ConsumerModule.__default.__Main(dafny.Helpers.UnicodeFromMainArguments(args)); } );
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/standard-libaries/Inputs/library.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/standard-libaries/Inputs/library.dfy
new file mode 100644
index 00000000000..a7d544a3fcf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/standard-libaries/Inputs/library.dfy
@@ -0,0 +1,8 @@
+module UsesWrappers {
+
+  import opened Std.Wrappers
+
+  function SafeDiv(a: int, b: int): Option<int> {
+    if b == 0 then None else Some(a/b)
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/standard-libaries/user.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/standard-libaries/user.dfy
new file mode 100644
index 00000000000..2ff6794f547
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/standard-libaries/user.dfy
@@ -0,0 +1,17 @@
+// NONUNIFORM: Test is too complex for the uniform back-end testing mechanism
+// RUN: %build --target=lib "%S/Inputs/library.dfy" --standard-libraries=true --output %S/Outputs > %t
+// RUN: %run --standard-libraries=true %s --input "%S/Outputs.doo" >> %t
+//
+// Let's pretend we're vending a Dafny library outside of Dafny, and we want to include the std-lib with the library,
+// since the external user won't include it
+// RUN: %build "%S/Inputs/library.dfy" --standard-libraries=true --output %S/Outputs >> %t
+// RUN: %run --standard-libraries=true %s --library "%S/Outputs.doo" --input "%S/Outputs.dll" --translate-standard-library=false >> %t
+// RUN: %diff "%s.expect" "%t"
+
+import opened UsesWrappers
+
+method Main() {
+  print SafeDiv(4, 2), "\n";
+  print SafeDiv(7, 0), "\n";
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/standard-libaries/user.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/standard-libaries/user.dfy.expect
new file mode 100644
index 00000000000..2e0de0b2144
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/standard-libaries/user.dfy.expect
@@ -0,0 +1,12 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrappers.Option.Some(2)
+Wrappers.Option.None
+
+Dafny program verifier finished with 1 verified, 0 errors
+
+Dafny program verifier finished with 0 verified, 0 errors
+Wrappers.Option.Some(2)
+Wrappers.Option.None
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/DuplicateModules.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/DuplicateModules.dfy
new file mode 100644
index 00000000000..737a7280dd2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/DuplicateModules.dfy
@@ -0,0 +1,13 @@
+// RUN: %baredafny translate cs %args %S/Inputs/Foo.dfy &> %t
+// RUN: %baredafny translate cs %args %S/Inputs/Bar.dfy &>> %t
+
+// Valid
+// RUN: %baredafny translate cs %args %S/Inputs/Foo.dfy --translation-record %S/Inputs/Bar-cs.dtr &>> %t
+
+// Invalid: Foo can't be previously translated and to translate now
+// RUN: %exits-with 3 %baredafny translate cs %args %S/Inputs/Foo.dfy --translation-record %S/Inputs/Foo-cs.dtr &>> %t
+
+// Invalid: Bar can't appear in more than one translation record at the same time
+// RUN: %exits-with 3 %baredafny translate cs %args %S/Inputs/Foo.dfy --translation-record %S/Inputs/Bar-cs.dtr --translation-record %S/Inputs/Bar-cs.dtr &>> %t
+
+// RUN: %diff "%s.expect" "%t"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/DuplicateModules.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/DuplicateModules.dfy.expect
new file mode 100644
index 00000000000..34fc9248a67
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/DuplicateModules.dfy.expect
@@ -0,0 +1,14 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+
+Dafny program verifier finished with 1 verified, 0 errors
+
+Dafny program verifier finished with 1 verified, 0 errors
+
+Dafny program verifier finished with 1 verified, 0 errors
+CLI: Error: cannot load Foo-cs.dtr: it contains translation metadata for the module Parent.Foo, which is in scope for translation in the current program
+Translation was aborted because errors were found
+
+Dafny program verifier finished with 1 verified, 0 errors
+CLI: Error: cannot load Bar-cs.dtr: module Parent.Bar already appears in another translation record
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/DuplicateModules.dtr b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/DuplicateModules.dtr
new file mode 100644
index 00000000000..0c4ae8b41ad
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/DuplicateModules.dtr
@@ -0,0 +1,3 @@
+file_format_version = "1.0"
+dafny_version = "4.9.2.0"
+[options_by_module.Foo]
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/Inputs/Bar.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/Inputs/Bar.dfy
new file mode 100644
index 00000000000..aa63b04504c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/Inputs/Bar.dfy
@@ -0,0 +1,3 @@
+module Parent.Bar {
+  const blah: nat := 42
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/Inputs/Foo.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/Inputs/Foo.dfy
new file mode 100644
index 00000000000..a4c2ed946d0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/Inputs/Foo.dfy
@@ -0,0 +1,3 @@
+module Parent.Foo {
+  const blah: nat := 42
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/InvalidFormat.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/InvalidFormat.dfy
new file mode 100644
index 00000000000..161262c4116
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/InvalidFormat.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 3 %baredafny translate cs %args %s --translation-record %S/NoGood.dtr &> %t
+// RUN: %exits-with 3 %baredafny translate cs %args %s --translation-record %S/WrongDafnyVersion.dtr &>> %t
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/InvalidFormat.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/InvalidFormat.dfy.expect
new file mode 100644
index 00000000000..29d173a1141
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/InvalidFormat.dfy.expect
@@ -0,0 +1,8 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+CLI: Error: malformed dtr file NoGood.dtr
+Translation was aborted because errors were found
+
+Dafny program verifier finished with 0 verified, 0 errors
+CLI: Error: cannot load WrongDafnyVersion.dtr: it was built with Dafny 10.6.0.0, which cannot be used by Dafny 4.9.2.0
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/NoGood.dtr b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/NoGood.dtr
new file mode 100644
index 00000000000..4925891c42b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/NoGood.dtr
@@ -0,0 +1 @@
+Not even close
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/WrongDafnyVersion.dtr b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/WrongDafnyVersion.dtr
new file mode 100644
index 00000000000..c2c53d3def8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/translation-records/WrongDafnyVersion.dtr
@@ -0,0 +1,2 @@
+file_format_version = "1.0"
+dafny_version = "10.6.0.0"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo-oldDafnyCompatability.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo-oldDafnyCompatability.dfy
new file mode 100644
index 00000000000..99ef13d97d4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo-oldDafnyCompatability.dfy
@@ -0,0 +1,20 @@
+// NONUNIFORM: Highly target language specific
+
+// Alternate version of usesTimesTwo.dfy as a regression test for https://github.com/dafny-lang/dafny/issues/5555.
+// Relies on having checked in the compilation of the library using Dafny 4.2.
+
+// Java
+
+// RUN: %baredafny translate java --output=%S/Inputs/producer/timesTwo %S/Inputs/producer/timesTwo.dfy --legacy-data-constructors --legacy-module-names
+// RUN: javac -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/Inputs/producer/timesTwo-java %S/Inputs/producer/timesTwo-java/**/*.java
+
+// Already run using Dafny 4.2: %baredafny translate java --output=%S/fromDafny42/usesTimesTwo --allow-warnings --library=%S/Inputs/producer/timesTwo.dfy %S/usesTimesTwo.dfy
+// RUN: javac -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/Inputs/producer/timesTwo-java%{pathsep}%S/fromDafny42/usesTimesTwo-java %S/fromDafny42/usesTimesTwo-java/**/*.java
+
+// RUN: java -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/Inputs/producer/timesTwo-java%{pathsep}%S/fromDafny42/usesTimesTwo-java usesTimesTwo > "%t"
+
+// (Other languages could be added in the future too.)
+
+// Final output check for all runs
+
+// RUN: %diff "%s.expect" "%t"
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo-oldDafnyCompatability.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo-oldDafnyCompatability.dfy.expect
new file mode 100644
index 00000000000..a54a4dab148
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo-oldDafnyCompatability.dfy.expect
@@ -0,0 +1 @@
+Two times 21 is 42
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo.dfy
new file mode 100644
index 00000000000..eec3e311b9b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo.dfy
@@ -0,0 +1,83 @@
+// NONUNIFORM: Highly target language specific
+
+// C#
+
+// RUN: %baredafny translate cs %args --output=%S/Inputs/producer/timesTwo %S/Inputs/producer/timesTwo.dfy --outer-module TestProducer.DafnyInternal
+// RUN: dotnet build %S/Inputs/producer
+
+// RUN: %baredafny translate cs %args --output=%S/consumer/usesTimesTwo --allow-warnings --library=%S/Inputs/producer/timesTwo.dfy %s --translation-record %S/Inputs/producer/timesTwo-cs.dtr
+
+// RUN: dotnet run --project %S/consumer > "%t"
+
+// Java
+
+// RUN: %baredafny translate java --output=%S/Inputs/producer/timesTwo %S/Inputs/producer/timesTwo.dfy --outer-module testproducer.dafnyinternal --translation-record-output %S/timesTwo-customName.dtr
+// RUN: javac -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/Inputs/producer/timesTwo-java %S/Inputs/producer/timesTwo-java/**/*.java
+
+// RUN: %baredafny translate java --output=%S/consumer/usesTimesTwo --allow-warnings --library=%S/Inputs/producer/timesTwo.dfy %s --translation-record %S/timesTwo-customName.dtr
+// RUN: javac -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/Inputs/producer/timesTwo-java%{pathsep}%S/consumer/usesTimesTwo-java %S/consumer/usesTimesTwo-java/**/*.java
+
+// RUN: java -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/Inputs/producer/timesTwo-java%{pathsep}%S/consumer/usesTimesTwo-java usesTimesTwo >> "%t"
+
+// Python
+
+// TODO: Can we refer to the runtime separately?
+// RUN: %baredafny translate py --output=%S/Inputs/producer/timesTwo %S/Inputs/producer/timesTwo.dfy --include-runtime
+
+// RUN: %baredafny translate py --output=%S/consumer/usesTimesTwo --allow-warnings --library=%S/Inputs/producer/timesTwo.dfy %s
+
+// TODO: Won't work on windows
+// RUN: env PYTHONPATH=%S/Inputs/producer/timesTwo-py python3 %S/consumer/usesTimesTwo-py >> "%t"
+
+// Go
+
+// Must --include-runtime since DafnyRuntime.go isn't usable:
+// https://github.com/dafny-lang/dafny/issues/494
+// RUN: %baredafny translate go --output=%S/Inputs/producer/timesTwo %S/Inputs/producer/timesTwo.dfy --include-runtime
+
+// RUN: %baredafny translate go --output=%S/consumer/usesTimesTwo --allow-warnings --library=%S/Inputs/producer/timesTwo.dfy %s
+
+// RUN: env GO111MODULE=auto GOPATH=%S/Inputs/producer/timesTwo-go%{pathsep}%S/consumer/usesTimesTwo-go go run %S/consumer/usesTimesTwo-go/src/usesTimesTwo.go >> "%t"
+
+// (Javascript doesn't support this yet)
+
+// Final output check for all runs
+
+// RUN: %diff "%s.expect" "%t"
+
+include "Inputs/producer/timesTwo.dfy"
+
+module ConsumerModule {
+
+  import opened CoolLibraryName.LibraryModule
+  import Math
+
+  method Main() {
+    var n := 21;
+    var TwoN := TimesTwo(n);
+    print "Two times ", n, " is ", TwoN, "\n";
+
+    var z := Math.Add(20, 22);
+    print "20 plus 22 is ", z, "\n";
+
+    // Need to actually execute the use of nat's type descriptor
+    // to ensure it works on dynamic language targets.
+    var aNat := PickANat();
+  }
+
+  method PickANat() returns (n: nat) {
+    n := PickSomething();
+  }
+
+  method PickSomething<T(0)>() returns (t: T) {
+    t := *;
+  }
+
+  method MakeAResult() {
+    var r: Result<nat, string> := Success(42);
+  }
+
+  method MakeAPair() {
+    var p: Pair<nat, string> := Pair(1, "partridge in a pair tree");
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo.dfy.expect
new file mode 100644
index 00000000000..c8fa5610280
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/comp/separate-compilation/usesTimesTwo.dfy.expect
@@ -0,0 +1,8 @@
+Two times 21 is 42
+20 plus 22 is 42
+Two times 21 is 42
+20 plus 22 is 42
+Two times 21 is 42
+20 plus 22 is 42
+Two times 21 is 42
+20 plus 22 is 42
diff --git a/Test/concurrency/01-InnerOuter.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/01-InnerOuter.dfy
similarity index 98%
rename from Test/concurrency/01-InnerOuter.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/01-InnerOuter.dfy
index 693ade40f7e..698525e2e64 100644
--- a/Test/concurrency/01-InnerOuter.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/01-InnerOuter.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This program shows how to model an outer type whose invariant refers to the invariant of an inner type.
 
diff --git a/Test/concurrency/01-InnerOuter.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/01-InnerOuter.dfy.expect
similarity index 100%
rename from Test/concurrency/01-InnerOuter.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/01-InnerOuter.dfy.expect
diff --git a/Test/concurrency/02-DoubleRead.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/02-DoubleRead.dfy
similarity index 99%
rename from Test/concurrency/02-DoubleRead.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/02-DoubleRead.dfy
index 5a526fc9a13..53c62c827f2 100644
--- a/Test/concurrency/02-DoubleRead.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/02-DoubleRead.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This program shows how to model a program that reads twice from a shared non-decreasing counter.
 // This encoding requires the user to provide an invariant for each program point.
diff --git a/Test/concurrency/02-DoubleRead.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/02-DoubleRead.dfy.expect
similarity index 100%
rename from Test/concurrency/02-DoubleRead.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/02-DoubleRead.dfy.expect
diff --git a/Test/concurrency/03-SimpleCounter.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/03-SimpleCounter.dfy
similarity index 99%
rename from Test/concurrency/03-SimpleCounter.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/03-SimpleCounter.dfy
index 0fd0bd8a9a7..3b3e3805d9b 100644
--- a/Test/concurrency/03-SimpleCounter.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/03-SimpleCounter.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This program shows how to model a program that reads and modifies a shared non-decreasing counter.
 // This encoding requires the user to provide an invariant for each program point.
diff --git a/Test/concurrency/03-SimpleCounter.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/03-SimpleCounter.dfy.expect
similarity index 100%
rename from Test/concurrency/03-SimpleCounter.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/03-SimpleCounter.dfy.expect
diff --git a/Test/concurrency/04-LeastGreatest.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/04-LeastGreatest.dfy
similarity index 96%
rename from Test/concurrency/04-LeastGreatest.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/04-LeastGreatest.dfy
index e6225be625b..a2b2454d6a6 100644
--- a/Test/concurrency/04-LeastGreatest.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/04-LeastGreatest.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Simple least predicate
 
diff --git a/Test/concurrency/04-LeastGreatest.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/04-LeastGreatest.dfy.expect
similarity index 100%
rename from Test/concurrency/04-LeastGreatest.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/04-LeastGreatest.dfy.expect
diff --git a/Test/concurrency/05-RecInvariantCut.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/05-RecInvariantCut.dfy
similarity index 98%
rename from Test/concurrency/05-RecInvariantCut.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/05-RecInvariantCut.dfy
index 438d4544fd8..a3c33bd7e37 100644
--- a/Test/concurrency/05-RecInvariantCut.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/05-RecInvariantCut.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This program shows how to model two types A and B with mutually recursive invariants.
 
diff --git a/Test/concurrency/05-RecInvariantCut.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/05-RecInvariantCut.dfy.expect
similarity index 100%
rename from Test/concurrency/05-RecInvariantCut.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/05-RecInvariantCut.dfy.expect
diff --git a/Test/concurrency/06-ThreadOwnership.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/06-ThreadOwnership.dfy
similarity index 98%
rename from Test/concurrency/06-ThreadOwnership.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/06-ThreadOwnership.dfy
index 51125941df6..6137755bf13 100644
--- a/Test/concurrency/06-ThreadOwnership.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/06-ThreadOwnership.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This program shows how to encode ownership and the property that objects owned by a thread that doesn't execute don't change.
 
@@ -14,7 +14,7 @@ trait Universe {
   // without having to check the object invariants.
   ghost predicate globalBaseInv() reads this, content {
     && (forall o: Object | o in content :: && o.universe == this && o as object != this)
-    && (forall o: OwnedObject | o in content :: o.owner in content && (!o.closed ==> o.owner is Thread))
+    && (forall o: OwnedObject | o in content :: o.owner in this.content && (!o.closed ==> o.owner is Thread))
   }
 
   // Global 1-state invariant: all objects satisfy their individual invariants.
@@ -75,18 +75,17 @@ trait Object {
   // This should really be a constant, but I don't know how to do that while factoring out join below,
   // because traits can't have constructors.
   const universe: Universe
-  
+
   // Base invariant: we're in the universe, and the universe satisfies its base.
   ghost predicate baseInv() reads * { this in universe.content && universe.globalBaseInv() }
 
   // Join the universe
   ghost method join()
     requires universe.globalBaseInv() && this as object != universe
-    requires this is OwnedObject ==> (
+    requires this is OwnedObject ==>
       var o := this as OwnedObject;
       && o.owner in universe.content
       && (!o.closed ==> o.owner is Thread)
-    )
     modifies universe
     ensures baseInv() && universe.content == old(universe.content) + { this }
     ensures unchanged(universe.content) // This method doesnt modify fields of objects in the universe
@@ -115,7 +114,7 @@ trait Object {
   ghost predicate inv() ensures inv() ==> localInv() reads *
   twostate predicate inv2() ensures inv2() ==> localInv2() reads *
   twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv()
-  
+
   // To prevent a class from extending both OwnedObject and NonOwnedObject
   ghost predicate instanceOfOwnedObject()
 }
@@ -244,7 +243,7 @@ class EmptyType extends OwnedObject {
   twostate predicate userFieldsUnchanged() reads * {
     true
   }
-  
+
   ghost predicate baseUserInv() reads * {
     && true
   }
@@ -323,7 +322,7 @@ class AtomicCounter extends OwnedObject {
     //modifies running
     ensures objectGlobalInv() && universe.globalInv2()
     // The following might not always be needed
-    ensures this.universe == universe && this.owner == running && this.value == initialValue && this.closed == false 
+    ensures this.universe == universe && this.owner == running && this.value == initialValue && this.closed == false
     //ensures running.ownedObjects == old(running.ownedObjects) + { this }
     ensures universe.content == old(universe.content) + { this }
   {
@@ -360,7 +359,7 @@ class DoubleReadMethod extends OwnedObject {
     && old(initial_value) == initial_value
     && old(final_value) == final_value
   }
-  
+
   ghost predicate baseUserInv() reads * {
     && counter in universe.content && counter.universe == universe
   }
@@ -413,7 +412,7 @@ class DoubleReadMethod extends OwnedObject {
     universe.lci(running);
   }
 
-  method Run(ghost running: Thread)
+  method {:resource_limit "1e9"} Run(ghost running: Thread)
     requires this.objectGlobalInv() && running.universe == universe && running.inv()
     requires programCounter == 0 && closed && this.owner == running // Special requirements of Run
     modifies universe, universe.content, this
diff --git a/Test/concurrency/06-ThreadOwnership.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/06-ThreadOwnership.dfy.expect
similarity index 100%
rename from Test/concurrency/06-ThreadOwnership.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/06-ThreadOwnership.dfy.expect
diff --git a/Test/concurrency/07-CounterThreadOwnership.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/07-CounterThreadOwnership.dfy
similarity index 99%
rename from Test/concurrency/07-CounterThreadOwnership.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/07-CounterThreadOwnership.dfy
index 52aaa7d0248..8b2a3f6662f 100644
--- a/Test/concurrency/07-CounterThreadOwnership.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/07-CounterThreadOwnership.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This program shows how to model a program that concurrently increments a counter by a fixed amount.
 // This encoding requires the user to provide an invariant for each program point.
diff --git a/Test/concurrency/07-CounterThreadOwnership.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/07-CounterThreadOwnership.dfy.expect
similarity index 100%
rename from Test/concurrency/07-CounterThreadOwnership.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/07-CounterThreadOwnership.dfy.expect
diff --git a/Test/concurrency/08-CounterNoTermination.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/08-CounterNoTermination.dfy
similarity index 99%
rename from Test/concurrency/08-CounterNoTermination.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/08-CounterNoTermination.dfy
index 4b4c5f03b84..e15772ae83d 100644
--- a/Test/concurrency/08-CounterNoTermination.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/08-CounterNoTermination.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This program shows how to model a program that concurrently increments a counter by a fixed amount.
 // This encoding requires the user to provide an invariant for each program point.
diff --git a/Test/concurrency/08-CounterNoTermination.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/08-CounterNoTermination.dfy.expect
similarity index 100%
rename from Test/concurrency/08-CounterNoTermination.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/08-CounterNoTermination.dfy.expect
diff --git a/Test/concurrency/09-CounterNoStateMachine.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/09-CounterNoStateMachine.dfy
similarity index 99%
rename from Test/concurrency/09-CounterNoStateMachine.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/09-CounterNoStateMachine.dfy
index b19f4f0ca32..f8d015415ab 100644
--- a/Test/concurrency/09-CounterNoStateMachine.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/09-CounterNoStateMachine.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This program shows how to model a program that concurrently increments a counter by a fixed amount.
 //
@@ -690,7 +690,7 @@ class ClaimIncreasingCounterGreaterThanConstant extends OwnedObject {
 //   assert!(i == 10);
 // }
 
-method {:vcs_split_on_every_assert} Incrementer(universe: Universe, running: Thread, counter: IncreasingCounter, remaining: Integer)
+method {:isolate_assertions} Incrementer(universe: Universe, running: Thread, counter: IncreasingCounter, remaining: Integer)
    requires universe.globalInv() && running in universe.content && counter in universe.content && remaining in universe.content
    requires remaining.owner == running && remaining.value == 10 // USER precondition
    modifies universe, universe.content
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/09-CounterNoStateMachine.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/09-CounterNoStateMachine.dfy.expect
new file mode 100644
index 00000000000..a18f6ffc547
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/09-CounterNoStateMachine.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 590 verified, 0 errors
diff --git a/Test/concurrency/10-SequenceInvariant.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/10-SequenceInvariant.dfy
similarity index 99%
rename from Test/concurrency/10-SequenceInvariant.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/10-SequenceInvariant.dfy
index 66e6aa1015a..098d30d3d4b 100644
--- a/Test/concurrency/10-SequenceInvariant.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/10-SequenceInvariant.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This program shows how to model a program that concurrently increments a counter
 // The encoding used using sequential code and claims.
@@ -614,7 +614,7 @@ class ClaimIncreasingCounterGreaterThanConstant extends OwnedObject {
 //   assert!(i == 10);
 // }
 
-method {:vcs_split_on_every_assert} Incrementer(universe: Universe, running: Thread, counter: IncreasingCounter, remaining: Integer)
+method {:isolate_assertions} Incrementer(universe: Universe, running: Thread, counter: IncreasingCounter, remaining: Integer)
    requires universe.globalInv() && running in universe.content && counter in universe.content && remaining in universe.content
    requires remaining.owner == running && remaining.value == 10 // USER precondition
    modifies universe, universe.content
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/10-SequenceInvariant.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/10-SequenceInvariant.dfy.expect
new file mode 100644
index 00000000000..1a4b8ec4f05
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/10-SequenceInvariant.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 486 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/11-MutexGuard2.legacy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/11-MutexGuard2.legacy.dfy
new file mode 100644
index 00000000000..88ba54711bc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/11-MutexGuard2.legacy.dfy
@@ -0,0 +1,725 @@
+// UNSUPPORTED: windows,posix
+// RUN: %dafny /compile:0 /proverOpt:O:smt.qi.eager_threshold=30 /typeEncoding:p "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// This program models the ownership of a Rust-like MutexGuard.
+// To speed up the verification: /vcsLoad:0.5 /proverOpt:O:smt.qi.eager_threshold=30
+
+// A universe of objects playing under LCI rules
+trait Universe {
+  // The set of objects in the universe
+  var content: set<Object>
+
+  // Universe invariant: the universe doesn't contain itself,
+  // and its objects in this universe agree that they are in this universe.
+  // We define this to allow a generic object operation (Object.join below) to add the object to the universe,
+  // without having to check the object invariants.
+  ghost predicate globalBaseInv() reads this, content {
+    && (forall o: Object | o in content :: o.universe == this && o as object != this && o.baseFieldsInv() && o.triggerAxioms())
+  }
+
+  // Global 1-state invariant: all objects satisfy their individual invariants.
+  ghost predicate globalInv() reads * {
+    globalBaseInv() && (forall o: Object | o in content :: o.inv())
+  }
+
+  // Global transitive 2-state invariant: all old objects satisfy their transitive 2-state invariants.
+  twostate predicate globalSequenceInv2() reads * {
+    forall o: Object | o in old(content) :: o in content && o.sequenceInv2()
+  }
+
+  // Global 2-state invariant: all old objects satisfy their 2-state invariants.
+  twostate predicate globalInv2() reads * {
+    forall o: Object | o in old(content) :: o in content && o.inv2()
+  }
+
+  twostate predicate baseLegalTransitionsSequence() reads * {
+    && old(globalBaseInv())
+    && globalBaseInv()
+    // The universe only grows
+    && old(content) <= content
+    // All objects added to the universe weren't allocated in the old state.
+    // This allows to satisfy the modifies clause checks on the caller side in a sequence of methods that might
+    // modify the universe. For example, the `Havoc` and `Interference` methods.
+    // fresh(content - old(content)) // This is slow. Dafny is 20x faster using the following quantifier!
+    && (forall o: Object | o !in old(content) && o in content :: !old(allocated(o)))
+  }
+
+  // This relation describes a sequence of legal transitions, each of which can be performed by a newly created thread
+  // or by one of the threads in the `running` parameter.
+  // This definition is weaker than `legalTransition`, but it's transitive (if it holds for A->B and B->C then it holds also for A->C).
+  // This definition is also monotonic w.r.t. `running`: `legalTransitionsSequence(S)` should imply `legalTransitionsSequence(T)` whenever `S <= T`.
+  // This definition is needed in the definition of the `Interference` and `Havoc` methods, and in the loop invariants of the `Run` methods.
+  twostate predicate legalTransitionsSequence(running: set<Thread>) reads * {
+    && baseLegalTransitionsSequence()
+    // Version numbers only increase
+    // Updated objects must obey their transitive 2-state invariants.
+    && (forall o: Object | o in old(content) && o in content :: unchanged(o) || o.sequenceInv2()) // `o in content` adds a useful trigger
+    // Objects cannot change the nonvolatile fields if they are directly owned by threads that cannot run.
+    // The 2-state invariant of OwnedObject extends this property to objects that are *transitively* owned by the threads.
+    && (forall o: OwnedObject | o in old(content) && old(o.owner) is Thread ::
+      // Threads created during a legalTransitionsSequence are allowed to run
+      old(o.owner) as Thread !in running && old(allocated(o.owner)) ==> old(o.nonvolatileVersion) == o.nonvolatileVersion
+    )
+  }
+
+  twostate predicate legalTransitionsSequenceAnyThread() reads * {
+    legalTransitionsSequence(set t: Thread | t in old(content))
+  }
+
+  // A legal transition is one that starts from a good state, preserves the universe invariant, and meets the legality conditions.
+  // This relation only needs to describe a *single* legal transition, not a sequence. So, it doesn't need to be
+  // transitive and it can be more precise than `legalTransitionsSequence`.
+  twostate predicate legalTransition(running: Thread) reads * {
+    && legalTransitionsSequence({running})
+    && old(globalInv())
+    // The first condition for legality: old objects that change a field must obey their 1- and 2-state invariants.
+    && (forall o: Object | o in old(content) :: unchanged(o) || (o.inv() && o.inv2()))
+    // The second condition for legality: new objects must satisfy their invariants.
+    && (forall o: Object | o in content && o !in old(content) :: o.inv())
+  }
+
+  // Transitive LCI soundness
+  twostate lemma sequenceLci(running: set<Thread>)
+    requires legalTransitionsSequence(running)
+    ensures globalSequenceInv2()
+  {
+    forall o: Object | o in old(content) && o.goodPreAndLegalChangesSequence(running) ensures o.sequenceInv2() { o.sequenceAdmissibility(running); }
+  }
+
+  // LCI soundness: legal transitions are good. This makes use of the admissibility obligations build into Object's.
+  twostate lemma lci(running: Thread)
+    requires legalTransition(running)
+    ensures globalInv() && globalInv2()
+  {
+    forall o: Object | o in old(content) && o.goodPreAndLegalChanges(running) ensures o.inv2() && o.inv() { o.admissibility(running); }
+  }
+
+  method Havoc()
+    requires globalBaseInv()
+    modifies this, this.content
+    ensures globalBaseInv() && baseLegalTransitionsSequence()
+  {
+    // Do nothing. Just havoc stuff on the caller side.
+  }
+
+  // Model the preemption of a given thread. Any other thread will have a chance to execute any number of legal transitions,
+  // modifying (1) volatile fiels of any object and (2) nonvolatile fields of objects that are not transitively owned by
+  // the preempting thread.
+  method Interference(preempting: Thread)
+    requires globalInv() && preempting in content
+    modifies this, this.content
+    ensures globalInv()
+    // Ensure that other threads executed any number of legal transitions.
+    // Ensuring `globalInv2` would be wrong, because it's not guaranteed to be transitive.
+    ensures legalTransitionsSequence(set t: Thread | t in old(content) && t != preempting) && globalSequenceInv2()
+  {
+    // This method could be bodyless. Checking the following implementation is just a consistency check.
+    // The verifier will report errors in case `legalTransitionsSequence` is not transitive.
+    var steps: int :| 0 <= steps;
+    sequenceLci({});
+    while (steps > 0)
+      invariant globalInv() && legalTransitionsSequence(set t: Thread | t in old(content) && t != preempting) && globalSequenceInv2()
+    {
+      // A thread of the environment (if there is any) executes a single legal transition.
+      var envThreads: set<Thread> := set t: Thread | t in content && t != preempting;
+      if (|envThreads| > 0) {
+        ghost var running: Thread :| running in envThreads;
+        label preTransition:
+        assert globalSequenceInv2(); // (1)
+        Havoc();
+        assume legalTransition@preTransition(running);
+        lci@preTransition(running);
+        assert globalSequenceInv2@preTransition(); // (2)
+        // We cannot call a 3-state lemma to apply the transitivity of `forall o: Object ... o.sequenceInv2`, so we have to assume this, checking (1) and (2).
+        assume baseLegalTransitionsSequence() ==> globalSequenceInv2();
+      }
+      steps := steps - 1;
+    }
+  }
+
+  // Consistency check: baseLegalTransitionsSequence should be transitive.
+  method CheckTransitiveBaseLegalTransitionsSequence()
+    requires globalBaseInv()
+    modifies this, content
+    ensures baseLegalTransitionsSequence()
+  {
+    Havoc();
+    Havoc();
+  }
+
+  // Consistency check: legalTransitionsSequence should be transitive.
+  method CheckTransitiveLegalTransitionsSequence(running: set<Thread>)
+    requires globalInv()
+    modifies this, content
+    ensures legalTransitionsSequence(running)
+  {
+    Havoc();
+    assume legalTransitionsSequence(running);
+    sequenceLci(running);
+    assert globalSequenceInv2(); // (1)
+    label mid:
+    Havoc();
+    assume legalTransitionsSequence@mid(running);
+    sequenceLci@mid(running);
+    assert globalSequenceInv2@mid(); // (2)
+    // We cannot call a 3-state lemma to apply the transitivity of `sequenceInv2`, so we have to assume it, checking (1) and (2).
+    assume baseLegalTransitionsSequence() ==> globalSequenceInv2();
+  }
+
+  // Consistency check: legalTransitionsSequence should be monotonic w.r.t. adding elements to `running`.
+  twostate lemma CheckMonotonicLegalTransitionsSequence(running: set<Thread>, moreRunning: set<Thread>)
+    requires running <= moreRunning
+    requires legalTransitionsSequence(running)
+    ensures legalTransitionsSequence(moreRunning)
+  { }
+
+  // method SmokeTestHavoc()
+  //   requires globalInv()
+  //   modifies this, content
+  //   ensures false // Should fail
+  // {
+  //   Havoc();
+  // }
+
+  // method SmokeTestInterference(running: Thread)
+  //   requires globalInv() && running in content
+  //   modifies this, content
+  //   ensures false // Should fail
+  // {
+  //   Interference(running);
+  // }
+}
+
+// A generic object trait
+trait Object {
+  // Universe of which the Object is a member.
+  // This should really be a constant, but I don't know how to do that while factoring out join below,
+  // because traits can't have constructors.
+  const universe: Universe
+
+  // Global base invariant (from o's perspective)
+  ghost predicate objectGlobalBaseInv() reads * { this in universe.content && baseFieldsInv() && universe.globalBaseInv() }
+
+  // Global invariant (from o's perspective) - I am in the universe and the universe is good. (This implies I am good also.)
+  ghost predicate objectGlobalInv() reads * { this in universe.content && universe.globalInv() }
+
+  // Global 2-state invariant (from o's perspective).
+  twostate predicate objectGlobalInv2() requires old(objectGlobalInv()) reads * { objectGlobalBaseInv() && universe.globalInv2() }
+
+  ghost predicate triggerAxioms() reads this ensures triggerAxioms() {
+    assume (this is OwnedObject || this is Thread) && !(this is OwnedObject && this is Thread);
+    && (this is OwnedObject || this is Thread)
+    && !(this is OwnedObject && this is Thread)
+  }
+
+  // Join the universe
+  method join()
+    requires universe.globalBaseInv() && baseFieldsInv() && this as object != universe
+    modifies universe
+    ensures objectGlobalBaseInv() && universe.content == old(universe.content) + { this }
+  {
+    universe.content := universe.content + { this };
+    forall o: Object | o in universe.content ensures o.baseFieldsInv() {
+      o.baseFieldsInvMonotonicity();
+    }
+  }
+
+  // Precondition for the sequence admissibility check.
+  twostate predicate goodPreAndLegalChangesSequence(running: set<Thread>) reads * {
+    && old(this in universe.content)
+    && unchanged(this)
+    && universe.legalTransitionsSequence(running)
+  }
+
+  // Precondition for the admissibility check.
+  // This is broken into a separate predicate because Dafny currently doesn't allow adm.requires() in a 1-state context
+  twostate predicate goodPreAndLegalChanges(running: Thread) reads * {
+    && old(this in universe.content)
+    && unchanged(this)
+    && universe.legalTransition(running)
+  }
+
+  // To be implemented: 1-state invariant, 2-state invariant, admissibility proof...
+  ghost predicate isOwnedObject() // To prevent a class from extending both OwnedObject and Thread
+  ghost predicate baseFieldsInv() reads this, universe // All fields of this object are in the universe
+  twostate lemma baseFieldsInvMonotonicity() requires old(baseFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseFieldsInv()
+  ghost predicate localInv() reads * ensures localInv() ==> objectGlobalBaseInv()
+  twostate predicate localInv2() reads *
+  ghost predicate inv() ensures inv() ==> localInv() reads *
+  twostate predicate sequenceInv2() reads * // This should be transitive. See `CheckSequenceInv2` below.
+  twostate predicate inv2() ensures inv2() ==> localInv2() && sequenceInv2() reads *
+  twostate lemma sequenceAdmissibility(running: set<Thread>) requires goodPreAndLegalChangesSequence(running) ensures sequenceInv2()
+  twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv()
+}
+
+class Thread extends Object {
+  // To prevent a class from extending both OwnedObject and Thread
+  ghost predicate isOwnedObject() { false }
+
+  ghost predicate baseFieldsInv() reads this, universe {
+    true
+  }
+  twostate lemma baseFieldsInvMonotonicity() requires old(baseFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseFieldsInv() {}
+
+  ghost predicate localInv() reads * ensures localInv() ==> objectGlobalBaseInv() {
+    && objectGlobalBaseInv()
+  }
+  ghost predicate inv() reads * ensures inv() ==> localInv() {
+    && localInv()
+  }
+
+  twostate predicate localInv2() reads * {
+    true
+  }
+  twostate predicate sequenceInv2() reads * {
+    true
+  }
+  twostate predicate inv2() reads * ensures inv2() ==> localInv2() && sequenceInv2() {
+    localInv2() && sequenceInv2()
+  }
+
+  twostate lemma sequenceAdmissibility(running: set<Thread>) requires goodPreAndLegalChangesSequence(running) ensures sequenceInv2() {}
+  twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv() {}
+
+  // Check (trivial) transitivity of sequenceInv2()
+  method CheckSequenceInv2()
+    requires objectGlobalInv()
+    modifies universe, universe.content
+    ensures sequenceInv2()
+  {
+    universe.Havoc();
+    assume universe.baseLegalTransitionsSequence() && forall o: Object | o in old(universe.content) :: o.sequenceInv2();
+    label mid:
+    universe.Havoc();
+    assume universe.baseLegalTransitionsSequence@mid() && forall o: Object | o in old@mid(universe.content) :: o.sequenceInv2@mid();
+  }
+
+  // Here we require a thread to create a thread. Programs shold assume that an initial thread exists in the universe.
+  constructor(universe: Universe, ghost running: Thread)
+    requires universe.globalInv() && running in universe.content
+    modifies universe
+    ensures objectGlobalInv() && universe.legalTransition(running)
+  {
+    this.universe := universe;
+    new;
+    join();
+    universe.lci(running);
+  }
+}
+
+trait OwnedObject extends Object {
+  ghost var nonvolatileVersion: int
+  ghost var owner: Object // nonvolatile
+
+  // If true, any thread can take ownership of the object and change its nonvolatile fields.
+  // If false, only the owner can modify the nonvolatile fields.
+  // Intended usage: This should be set to true when a thread wants to let any thread to take ownership of the object.
+  //ghost var stealable: bool // nonvolatile
+
+  // To prevent a class from extending both OwnedObject and Thread
+  ghost predicate isOwnedObject() { true }
+
+  ghost predicate baseFieldsInv() reads this, universe {
+    && owner in universe.content
+    && baseUserFieldsInv()
+  }
+  twostate lemma baseFieldsInvMonotonicity() requires old(baseFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseFieldsInv() {
+    baseUserFieldsInvMonotonicity();
+  }
+
+  twostate predicate unchangedNonvolatileFields() reads this {
+    && old(owner) == owner
+    && unchangedNonvolatileUserFields()
+  }
+
+  ghost predicate localInv() reads * ensures localInv() ==> objectGlobalBaseInv() {
+    && objectGlobalBaseInv()
+    && localUserInv()
+  }
+  ghost predicate inv() reads * ensures inv() ==> localInv() {
+    && localInv()
+    && userInv()
+  }
+
+  twostate predicate localInv2() reads * {
+    && localUserInv2()
+  }
+
+  twostate predicate sequenceInv2() reads * {
+    && old(nonvolatileVersion) <= nonvolatileVersion
+    && (old(nonvolatileVersion) == nonvolatileVersion ==>
+      // Nonvolatile fields are only allowed to change when the nonvolatileVersion changes.
+      // TODO: This could be optimized by making the nonvolatile fields a version of the nonvolatile version number
+      && unchangedNonvolatileFields()
+      // Transitivity: if a nonvolatileVersion doesn't change, the same should apply to all owned objects
+      //&& (forall o: OwnedObject | o in old(universe.content) && old(o.owner) == this :: old(o.nonvolatileVersion) == o.nonvolatileVersion)
+    )
+    // The nonvolatileVersion cannot change if the version of the old owner doesn't change.
+    && (old(owner) is OwnedObject ==>
+      var oldOwner := old(owner) as OwnedObject;
+      !oldOwner.volatileOwns() && old(oldOwner.nonvolatileVersion) == oldOwner.nonvolatileVersion ==> old(nonvolatileVersion) == nonvolatileVersion
+    )
+    // The nonvolatileVersion cannot change if the version of the new owner doesn't change.
+    // Note: this seems fine, but unnecessary.
+    // && (owner is OwnedObject ==>
+    //   var newOwner := owner as OwnedObject;
+    //   old(allocated(newOwner)) && old(newOwner.nonvolatileVersion) == newOwner.nonvolatileVersion ==> old(nonvolatileVersion) == nonvolatileVersion
+    // )
+  }
+
+  twostate predicate inv2() reads * ensures inv2() ==> localInv2() && sequenceInv2() {
+    && localInv2()
+    && sequenceInv2()
+    && userInv2()
+    // When the owner changes, the invariant of the old and new owner must hold.
+    && (old(owner) != owner ==>
+      && old(owner).localInv()
+      && old(owner).localInv2()
+      && owner.localInv()
+      // In case the new owner existed in the old state
+      && (var currOwner := owner; old(allocated(currOwner)) ==> owner.localInv2())
+    )
+  }
+
+  // Check transitivity of sequenceInv2()
+  method CheckSequenceInv2()
+    requires objectGlobalInv()
+    modifies universe, universe.content
+    ensures sequenceInv2()
+  {
+    universe.Havoc();
+    assume universe.baseLegalTransitionsSequence() && forall o: Object | o in old(universe.content) :: o.sequenceInv2();
+    var u1 := unchangedNonvolatileFields(); // (1)
+    label mid:
+    universe.Havoc();
+    assume universe.baseLegalTransitionsSequence@mid() && forall o: Object | o in old@mid(universe.content) :: o.sequenceInv2@mid();
+    var u2 := unchangedNonvolatileFields@mid(); // (2)
+    // We cannot call a 3-state lemma to apply the transitivity of `unchangedNonvolatileFields`, so we have to assume it.
+    assume u1 && u2 ==> unchangedNonvolatileFields();
+  }
+
+  // To be implemented in the class: 1-state invariant, 2-state invariant, admissibility proof...
+  ghost predicate volatileOwns() // If true, the set of owned objects can change without changing the nonvolatileVersion
+  ghost predicate baseUserFieldsInv() reads this, universe
+  twostate lemma baseUserFieldsInvMonotonicity() requires old(baseUserFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseUserFieldsInv()
+  twostate predicate unchangedNonvolatileUserFields() reads this // Checking transitivity is up to the classes that implement this trait.
+  ghost predicate localUserInv() reads *
+  twostate predicate localUserInv2() reads *
+  ghost predicate userInv() reads * ensures userInv() ==> localUserInv()
+  twostate predicate userInv2() reads * ensures userInv2() ==> localUserInv2()
+
+  // Every class should check the transitivity of unchangedNonvolatileFields():
+  // method CheckTransitiveUnchangedNonvolatileFields()
+  //   modifies universe, universe.content
+  //   ensures unchangedNonvolatileFields()
+  // {
+  //   universe.Havoc();
+  //   assume unchangedNonvolatileFields();
+  //   label mid:
+  //   universe.Havoc();
+  //   assume unchangedNonvolatileFields@mid();
+  // }
+}
+
+method BumpVersion(ghost last: int) returns (res: int) ensures res > last
+
+// fn test(m: Arc<Mutex<u32>>) {
+//   let l: MutexGuard<T> = m.lock().unwrap(); // create a guard == acquire mutex
+//   let a: u32 = *l;
+//   let b: u32 = *l;
+//   assert!(a == b); // Ensured
+//   drop(l); // deallocate a guard == release mutex
+// }
+
+// An owned integer type
+class OwnedU32 extends OwnedObject {
+  var value: int // nonvolatile
+
+  ghost predicate volatileOwns() { false }
+  ghost predicate baseUserFieldsInv() reads this, universe { true }
+  twostate lemma baseUserFieldsInvMonotonicity() requires old(baseUserFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseUserFieldsInv() {}
+
+  twostate predicate unchangedNonvolatileUserFields() reads this {
+    && old(value) == value
+  }
+
+  ghost predicate localUserInv() reads * { true }
+  ghost predicate userInv() reads * ensures userInv() ==> localUserInv() { localUserInv() }
+  twostate predicate localUserInv2() reads * { true }
+  twostate predicate userInv2() reads * ensures userInv2() ==> localUserInv2() { localUserInv2() }
+
+  twostate lemma sequenceAdmissibility(running: set<Thread>) requires goodPreAndLegalChangesSequence(running) ensures sequenceInv2() {}
+  twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv() {}
+
+  constructor(universe: Universe, ghost running: Thread, value: int)
+    requires universe.globalInv() && running in universe.content
+    modifies universe
+    ensures objectGlobalInv() && universe.legalTransition(running)
+    ensures this.universe == universe && this.owner == running && this.value == value
+    ensures universe.content == old(universe.content) + { this }
+  {
+    this.universe := universe;
+    this.owner := running;
+    this.value := value;
+    new;
+    join();
+    universe.lci(running);
+  }
+}
+
+class Mutex extends OwnedObject {
+  var data: OwnedU32 // volatile (it was UnsafeCell<u32>)
+  var locked: bool // volatile (it was UnsafeCell<bool>)
+  ghost var guards: set<MutexGuardU32> // volatile
+
+  ghost predicate volatileOwns() { true }
+  ghost predicate baseUserFieldsInv() reads this, universe {
+    && data in universe.content
+    && guards <= universe.content
+  }
+  twostate lemma baseUserFieldsInvMonotonicity() requires old(baseUserFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseUserFieldsInv() {}
+
+  twostate predicate unchangedNonvolatileUserFields() reads this { true }
+
+  ghost predicate localUserInv() reads * {
+    && (locked ==>
+      && data.owner is MutexGuardU32
+      && (data.owner as MutexGuardU32).mutex == this
+      && guards == { data.owner as MutexGuardU32 }
+    )
+    && (!locked ==>
+      && data.owner == this
+      && guards == {}
+    )
+  }
+  ghost predicate userInv() reads * ensures userInv() ==> localUserInv() {
+    && localUserInv()
+    && (forall g: MutexGuardU32 | g in guards :: g.localInv())
+  }
+  twostate predicate localUserInv2() reads * { 
+    && old(data) == data
+  }
+  twostate predicate userInv2() reads * ensures userInv2() ==> localUserInv2() {
+    && localUserInv2()
+    //&& (forall g: MutexGuardU32 | g in old(guards) :: g.localInv2())
+  }
+
+  twostate lemma sequenceAdmissibility(running: set<Thread>) requires goodPreAndLegalChangesSequence(running) ensures sequenceInv2() {}
+  twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv() {
+    assert userInv();
+  }
+
+  constructor(universe: Universe, ghost running: Thread, data: OwnedU32)
+    requires universe.globalInv() && running in universe.content && data in universe.content && data.owner == running
+    modifies universe, data
+    ensures objectGlobalInv() && universe.legalTransition(running)
+    ensures this.universe == universe && this.owner == running && this.data == data && !this.locked
+    ensures universe.content == old(universe.content) + { this }
+  {
+    this.universe := universe;
+    this.owner := running;
+    this.data := data;
+    this.locked := false;
+    this.guards := {};
+    new;
+    join();
+    // Transfer ownership of `this.data` from `running` to `this`.
+    this.data.owner := this;
+    this.data.nonvolatileVersion := BumpVersion(this.data.nonvolatileVersion);
+    universe.lci(running);
+  }
+}
+
+class MutexGuardU32 extends OwnedObject {
+  var mutex: Mutex // nonvolatile
+  ghost var data: OwnedU32 // nonvolatile
+
+  ghost predicate volatileOwns() { false }
+  ghost predicate baseUserFieldsInv() reads this, universe {
+    && mutex in universe.content
+    && data in universe.content
+  }
+  twostate lemma baseUserFieldsInvMonotonicity() requires old(baseUserFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseUserFieldsInv() {}
+
+  twostate predicate unchangedNonvolatileUserFields() reads this {
+    && old(mutex) == mutex
+    && old(data) == data
+  }
+
+  ghost predicate localUserInv() reads * {
+    && mutex.locked
+    && mutex.guards == { this }
+    && mutex.data.owner == this
+    && mutex.data == data
+  }
+  ghost predicate userInv() reads * ensures userInv() ==> localUserInv() {
+    && localUserInv()
+    && mutex.localInv()
+  }
+  twostate predicate localUserInv2() reads * {
+    && old(mutex) == mutex
+  }
+  twostate predicate userInv2() reads * ensures userInv2() ==> localUserInv2() {
+    && localUserInv2()
+    && mutex.localInv2()
+  }
+
+  twostate lemma sequenceAdmissibility(running: set<Thread>) requires goodPreAndLegalChangesSequence(running) ensures sequenceInv2() {}
+  twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv() {}
+
+  constructor(universe: Universe, ghost running: Thread, mutex: Mutex)
+    requires universe.globalInv() && running in universe.content && mutex in universe.content
+    requires !mutex.locked
+    modifies universe, mutex`locked, mutex`guards, mutex.data`owner, mutex.data`nonvolatileVersion
+    ensures objectGlobalInv() && universe.legalTransition(running)
+    ensures this.universe == universe && this.owner == running && this.mutex == mutex && this.data == mutex.data && this.mutex.locked && this.mutex.data.owner == this
+    ensures universe.content == old(universe.content) + { this }
+  {
+    this.universe := universe;
+    this.owner := running;
+    this.mutex := mutex;
+    this.data := mutex.data;
+    new;
+    join();
+    // Acquire the lock
+    this.mutex.locked := true;
+    this.mutex.guards := { this };
+    // Transfer ownership of `this.mutex.data` from `this.mutex` to `this`.
+    this.mutex.data.owner := this;
+    this.mutex.data.nonvolatileVersion := BumpVersion(this.mutex.data.nonvolatileVersion);
+    // We don't need to bump this.mutex.nonvolatileVersion, because it uses volatileOwns.
+    universe.lci(running);
+  }
+}
+
+method Acquire(universe: Universe, running: Thread, mutex: Mutex)
+  returns (guard: MutexGuardU32)
+  requires universe.globalInv() && running in universe.content && mutex in universe.content
+  modifies universe, universe.content
+  decreases *
+  // Instead of `baseLegalTransitionsSequence`, `legalTransitionsSequenceAnyThread` would be more precise and complete.
+  ensures universe.globalInv() && universe.baseLegalTransitionsSequence()
+  ensures guard in universe.content
+  ensures guard.owner == running && guard.mutex == mutex
+{
+  universe.Interference(running);
+  assert {:split_here} true;
+
+  label lci_l11:
+  var wasLocked := mutex.locked;
+  universe.lci@lci_l11(running);
+  assert {:split_here} true;
+
+  // No interference
+
+  label beforeLoop:
+  while (wasLocked)
+    modifies universe, universe.content
+    invariant universe.globalInv() && universe.baseLegalTransitionsSequence@beforeLoop()
+    invariant !wasLocked ==> !mutex.locked
+    decreases * // Nothing guarantees that we'll obtain the lock
+  {
+    universe.Interference(running);
+    assert {:split_here} true;
+
+    label lci_l12:
+    wasLocked := mutex.locked;
+    universe.lci@lci_l12(running);
+    assert {:split_here} true;
+  }
+  assert {:split_here} true;
+
+  // No interference
+
+  label lci_l13:
+  guard := new MutexGuardU32(universe, running, mutex);
+  universe.lci@lci_l13(running);
+  assert {:split_here} true;
+
+  universe.Interference(running);
+  assert {:split_here} true;
+}
+
+// fn set_data(m: Arc<Mutex<u32>>) {
+//   let l: MutexGuard<T> = m.lock().unwrap(); // create a guard == acquire mutex
+//   let a: u32 = *l;
+//   let b: u32 = *l;
+//   assert!(a == b); // Ensured
+//   *l = 42;
+//   drop(l); // deallocate a guard == release mutex
+// }
+
+method {:isolate_assertions} SetData(universe: Universe, running: Thread, mutex: Mutex)
+  requires universe.globalInv() && running in universe.content && mutex in universe.content
+  modifies universe, universe.content
+  decreases *
+  ensures universe.globalInv() && universe.baseLegalTransitionsSequence()
+{
+  universe.Interference(running);
+
+  // A method call is not a single atomic step.
+  var guard := Acquire(universe, running, mutex);
+
+  universe.Interference(running);
+
+  label lci_l14:
+  var a := guard.mutex.data.value;
+  universe.lci@lci_l14(running);
+
+  universe.Interference(running);
+
+  label lci_l15:
+  var b := guard.mutex.data.value;
+  universe.lci@lci_l15(running);
+
+  universe.Interference(running);
+
+  label lci_l16:
+  assert a == b;
+  universe.lci@lci_l16(running);
+
+  universe.Interference(running);
+
+  label lci_l17:
+  guard.mutex.data.value := 42;
+  guard.mutex.data.nonvolatileVersion := BumpVersion(guard.mutex.data.nonvolatileVersion);
+  guard.nonvolatileVersion := BumpVersion(guard.nonvolatileVersion);
+  universe.lci@lci_l17(running);
+
+  universe.Interference(running);
+
+  // TODO: deallocate guard
+}
+
+// fn main() {
+//   let data = 0;
+//   let mutex = MutexGuard::new(data)
+//   client(mutex)
+// }
+
+method Main(universe: Universe, running: Thread)
+  requires universe.globalInv() && running in universe.content // or, universe.content == { running }
+  modifies universe, universe.content
+  decreases *
+  ensures universe.globalInv() && universe.baseLegalTransitionsSequence()
+{
+  universe.Interference(running);
+  assert {:split_here} true;
+
+  label lci_l1:
+  var data := new OwnedU32(universe, running, 0);
+  universe.lci@lci_l1(running);
+  assert {:split_here} true;
+
+  label lci_l2:
+  var mutex := new Mutex(universe, running, data);
+  universe.lci@lci_l2(running);
+  assert {:split_here} true;
+
+  // A method call is not a single atomic step.
+  SetData(universe, running, mutex);
+
+  universe.Interference(running);
+  assert {:split_here} true;
+}
diff --git a/Test/concurrency/11-MutexGuard2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/11-MutexGuard2.legacy.dfy.expect
similarity index 100%
rename from Test/concurrency/11-MutexGuard2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/11-MutexGuard2.legacy.dfy.expect
diff --git a/Test/concurrency/12-MutexLifetime-long.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-long.dfy
similarity index 99%
rename from Test/concurrency/12-MutexLifetime-long.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-long.dfy
index dbe7a040d2e..835335b2cb5 100644
--- a/Test/concurrency/12-MutexLifetime-long.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-long.dfy
@@ -1,5 +1,5 @@
 // UNSUPPORTED: windows,posix
-// RUN: %dafny /compile:0 /proverOpt:O:smt.qi.eager_threshold=30 "%s" > "%t"
+// RUN: %verify --solver-option="O:smt.qi.eager_threshold=30" "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This program models the ownership of a Rust-like MutexGuard using lifetimes to reason about allocation.
diff --git a/Test/concurrency/12-MutexLifetime-long.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-long.dfy.expect
similarity index 100%
rename from Test/concurrency/12-MutexLifetime-long.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-long.dfy.expect
diff --git a/Test/concurrency/12-MutexLifetime-short.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-short.dfy
similarity index 96%
rename from Test/concurrency/12-MutexLifetime-short.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-short.dfy
index b4676610a0f..6a534428f33 100644
--- a/Test/concurrency/12-MutexLifetime-short.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-short.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This program models the ownership of a Rust-like MutexGuard using lifetimes to reason about allocation.
@@ -761,7 +761,7 @@ class Mutex extends OwnedObject {
 
   ghost predicate volatileOwns() { true }
   ghost function objectUserFields(): set<Object> reads this {
-    guards + { data }
+    var r: set<object> := guards + { data }; r
   }
 
   twostate predicate unchangedNonvolatileUserFields() reads this { true }
@@ -846,7 +846,7 @@ class MutexGuardU32 extends OwnedObject {
 
   ghost predicate volatileOwns() { false }
   ghost function objectUserFields(): set<Object> reads this {
-    { mutex, data }
+    { mutex as Object, data as Object }
   }
 
   twostate predicate unchangedNonvolatileUserFields() reads this {
@@ -886,7 +886,7 @@ class MutexGuardU32 extends OwnedObject {
   }
 
   // MutexGuardU32
-  constructor {:vcs_split_on_every_assert} (ghost universe: Universe, ghost running: Thread, ghost scope: Lifetime, mutex: Mutex, ghost mutexScope: Lifetime)
+  constructor {:isolate_assertions} {:resource_limit "1e9"} (ghost universe: Universe, ghost running: Thread, ghost scope: Lifetime, mutex: Mutex, ghost mutexScope: Lifetime)
     requires universe.globalInv() && { running, scope, mutex, mutexScope } <= universe.content
     requires scope.owner == running && mutexScope.owner == running && scope != mutexScope
     requires universe.outlives(mutex.lifetime, mutexScope) && universe.outlives(mutexScope, scope) && scope.unused()
@@ -921,32 +921,52 @@ class MutexGuardU32 extends OwnedObject {
     this.mutex := mutex;
     this.data := mutex.data;
     new;
-    join();
+    hide *;
+    join() by {
+      assert baseFieldsInv() by {
+        reveal baseFieldsInv();
+        assert objectFields() <= universe.content by {
+          reveal objectFields();
+          assert objectUserFields() <= universe.content by {
+            reveal *;
+          }
+        }
+      }
+    }
     lifetime.elements := lifetime.elements + { this };
     // Acquire the lock
     this.mutex.locked := true;
     this.mutex.guards := { this };
     // Transfer ownership of `this.mutex.data` from `this.mutex` to `this`.
-    this.mutex.data.owner := this;
+    this.mutex.data.owner := this by {
+      reveal *;
+    }
     this.mutex.data.nonvolatileVersion := Bump(this.mutex.data.nonvolatileVersion);
     // We don't need to bump this.mutex.nonvolatileVersion, because it uses volatileOwns.
-    universe.FrameOutlives@lci_l2();
-    assert universe.outlives(mutex.lifetime, mutexScope) && universe.outlives(mutexScope, this.lifetime); // needed
-    assert universe.outlives(mutex.lifetime, this.lifetime); // needed
-    assert lifetime.alive(); // helps dafny
-    assert mutex.owner != null; // helps dafny
-    assert this.localUserInv();
-    assert this.userInv();
-    assert this.inv();
-    assert this.mutex.inv();
-    assert this.mutex.data.inv();
-    universe.lci@lci_l2(running);
-    assert {:split_here} true;
+    universe.FrameOutlives@lci_l2() by {
+      reveal *;
+    }
+
+    universe.lci@lci_l2(running) by {
+      reveal *;
+      assert universe.outlives(mutex.lifetime, mutexScope) && universe.outlives(mutexScope, this.lifetime); // needed
+      assert universe.outlives(mutex.lifetime, this.lifetime); // needed
+      assert lifetime.alive(); // helps dafny
+      assert mutex.owner != null; // helps dafny
+      assert this.localUserInv();
+      assert this.userInv();
+      assert this.inv();
+      assert this.mutex.inv();
+      assert this.mutex.data.inv();
+    }
 
     label lci_l3:
     scope.owner := null;
     universe.FrameOutlives@lci_l3();
-    universe.lci@lci_l3(running);
-    assert {:split_here} true;
+    universe.lci@lci_l3(running) by {
+      reveal *;
+    }
+
+    reveal *;
   }
 }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-short.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-short.dfy.expect
new file mode 100644
index 00000000000..7271da1866c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/12-MutexLifetime-short.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 385 verified, 0 errors
diff --git a/Test/concurrency/README.md b/Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/README.md
similarity index 100%
rename from Test/concurrency/README.md
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/concurrency/README.md
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AbstractExtern1.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AbstractExtern1.cs
new file mode 100644
index 00000000000..c6d90d8e167
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AbstractExtern1.cs
@@ -0,0 +1,10 @@
+using System.Numerics;
+
+namespace M {
+
+  public partial class __default {
+    public static BigInteger ExternMethod() {
+      return new BigInteger(5);
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AbstractExtern2.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AbstractExtern2.cs
new file mode 100644
index 00000000000..efd74ded43c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AbstractExtern2.cs
@@ -0,0 +1,10 @@
+using System.Numerics;
+
+namespace M {
+
+  public partial class __default {
+    public static BigInteger ExternMethod() {
+      return new BigInteger(-5);
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AllExterns.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AllExterns.dfy
new file mode 100644
index 00000000000..55faa3168cd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AllExterns.dfy
@@ -0,0 +1,8 @@
+// RUN: ! %baredafny test %args --allow-warnings --test-assumptions=externs %s %s.externs.cs > %t
+// RUN: %diff "%s.expect" "%t"
+// RUN: %OutputCheck --file-to-check "%S/AllExterns.cs" "%s"
+// CHECK: .*Foo____dafny__checked\(x\).*
+// CHECK: .*Foo____dafny__checked\(new BigInteger\(3\)\).*
+// CHECK: .*Bar____dafny__checked\(x\).*
+// CHECK: .*Bar____dafny__checked\(new BigInteger\(3\)\).*
+include "Inputs/CheckExtern.dfy"
diff --git a/Test/contract-wrappers/AllExterns.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AllExterns.dfy.expect
similarity index 91%
rename from Test/contract-wrappers/AllExterns.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AllExterns.dfy.expect
index 347491a3cca..6cd7d8f73f1 100644
--- a/Test/contract-wrappers/AllExterns.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AllExterns.dfy.expect
@@ -1,7 +1,7 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
 CheckExtern.dfy(20,13): Warning: The requires clause at this location cannot be compiled to be tested at runtime because it references ghost state.
 CheckExtern.dfy(22,12): Warning: The ensures clause at this location cannot be compiled to be tested at runtime because it references ghost state.
-
-Dafny program verifier did not attempt verification
 FooTest: FAILED
 	CheckExtern.dfy(3,12): Runtime failure of ensures clause from CheckExtern.dfy(3,12)
 BarTest: FAILED
@@ -13,5 +13,6 @@ GenFunctionTest: FAILED
 GenMethodTest: FAILED
 	CheckExtern.dfy(59,13): Runtime failure of requires clause from CheckExtern.dfy(59,13)
 BazTest: PASSED
+CallFunctionByMethod: PASSED
 [Program halted] AllExterns.dfy(8,0): Test failures occurred: see above.
 
diff --git a/Test/contract-wrappers/AllExterns.dfy.externs.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AllExterns.dfy.externs.cs
similarity index 100%
rename from Test/contract-wrappers/AllExterns.dfy.externs.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/AllExterns.dfy.externs.cs
diff --git a/Test/contract-wrappers/CheckExtern.dfy.externs.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/CheckExtern.dfy.externs.cs
similarity index 100%
rename from Test/contract-wrappers/CheckExtern.dfy.externs.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/CheckExtern.dfy.externs.cs
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/Inputs/CheckExtern.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/Inputs/CheckExtern.dfy
new file mode 100644
index 00000000000..740deb74e59
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/Inputs/CheckExtern.dfy
@@ -0,0 +1,90 @@
+method {:axiom} {:extern} Foo(x: int) returns (y: int)
+  requires 1 < x < 10
+  ensures y >= 10
+
+method FooCaller(x: int) returns (y: int)
+  requires 1 < x < 10
+  ensures y >= 10
+{
+  y := Foo(x);
+}
+
+method {:test} FooTest()
+{
+  var y := Foo(3);
+  expect y == 30;
+}
+
+function {:axiom} {:extern} Bar(x: int, ghost z: int): (y: int)
+  requires 1 < x < 10
+  requires z > x
+  ensures y >= 10
+  ensures y > z
+
+function BarCaller(x: int): (y: int)
+  requires 1 < x < 10
+  ensures y >= 10
+{
+  Bar(x, 20)
+}
+
+method {:test} BarTest()
+{
+  var y := Bar(3, 20);
+  expect y == 30;
+}
+
+function {:axiom} {:extern} FunctionWithUnnamedResult(x: int): int 
+  requires x > 3
+  ensures x > 3
+
+method {:test} FunctionWithUnnamedResultTest()
+{
+  var y1 := FunctionWithUnnamedResult(4);
+  var y2 := FunctionWithUnnamedResult(3); // Fails
+  expect false;
+}
+
+function {:extern} GenFunction<T>(x: int, y: T): T
+  requires x > 3
+
+method {:test} GenFunctionTest()
+{
+  var y1 := GenFunction(4, 10);
+  var y2 := GenFunction(3, 10); // Fails
+  expect false;
+}
+
+method {:extern} GenMethod<T>(x: int, y: T) returns (z: T)
+  requires x > 3
+
+method {:test} GenMethodTest()
+{
+  var y1 := GenMethod(4, 10);
+  var y2 := GenMethod(3, 10); // Fails
+  expect false;
+}
+
+function {:axiom} {:extern} Baz(x: int): (y: int)
+  ensures y == x
+
+method {:test} BazTest()
+{
+  var y := Baz(3);
+  // An extra check just for fun. The auto-generated wrapper should
+  // already ensure that y == 3.
+  expect y != 7;
+}
+
+predicate UnusedTypeParameterForFunctionByMethod<A(0)>() {
+  true
+} by method {
+  var a: A := *;
+  var b: A := a;
+  return true;
+}
+
+method {:test} CallFunctionByMethod() {
+  var t := UnusedTypeParameterForFunctionByMethod<real>();
+  expect t;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/RefineContract.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/RefineContract.dfy
new file mode 100644
index 00000000000..26af314a2b2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/RefineContract.dfy
@@ -0,0 +1,15 @@
+// RUN: %run "%s" --input "%S/AbstractExtern1.cs" --allow-external-contracts --test-assumptions Externs > %t
+// RUN: %exits-with 3 %run "%s" --input "%S/AbstractExtern2.cs" --allow-external-contracts --test-assumptions Externs >> %t
+// RUN: %diff "%s.expect" "%t"
+abstract module A {
+    method {:extern "ExternMethod"} Method() returns (r: int)
+      ensures r > 0
+}
+
+module M refines A {
+}
+
+method Main() {
+  var x := M.Method();
+  print x, "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/RefineContract.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/RefineContract.dfy.expect
new file mode 100644
index 00000000000..8d05a2b29d6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/RefineContract.dfy.expect
@@ -0,0 +1,6 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+5
+
+Dafny program verifier finished with 1 verified, 0 errors
+[Program halted] RefineContract.dfy[M](6,16): Runtime failure of ensures clause from RefineContract.dfy[M](6,16)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/TestedExterns.legacy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/TestedExterns.legacy.dfy
new file mode 100644
index 00000000000..2126c0c1570
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/TestedExterns.legacy.dfy
@@ -0,0 +1,11 @@
+// RUN: ! %dafny /compile:4 /runAllTests:1 /spillTargetCode:3 /testContracts:TestedExterns %s %s.externs.cs > %t
+// RUN: %diff "%s.expect" "%t"
+// RUN: %OutputCheck --file-to-check "%S/TestedExterns.legacy.cs" "%s"
+// CHECK-NOT: .*Foo____dafny__checked\(x\).*
+// CHECK: .*Foo____dafny__checked\(new BigInteger\(3\)\).*
+// CHECK-NOT: .*Bar____dafny__checked\(x\).*
+// CHECK: .*Bar____dafny__checked\(new BigInteger\(3\)\).*
+include "Inputs/CheckExtern.dfy"
+
+method {:axiom} {:extern} NotCalled(x: int) returns (y: int)
+  ensures y != x
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/TestedExterns.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/TestedExterns.legacy.dfy.expect
new file mode 100644
index 00000000000..5370859dfb6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/TestedExterns.legacy.dfy.expect
@@ -0,0 +1,20 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+CheckExtern.dfy(20,13): Warning: The requires clause at this location cannot be compiled to be tested at runtime because it references ghost state.
+CheckExtern.dfy(22,12): Warning: The ensures clause at this location cannot be compiled to be tested at runtime because it references ghost state.
+TestedExterns.legacy.dfy(10,26): Warning: No :test code calls NotCalled
+FooTest: FAILED
+	CheckExtern.dfy(3,12): Runtime failure of ensures clause from CheckExtern.dfy(3,12)
+BarTest: FAILED
+	CheckExtern.dfy(21,12): Runtime failure of ensures clause from CheckExtern.dfy(21,12)
+FunctionWithUnnamedResultTest: FAILED
+	CheckExtern.dfy(38,13): Runtime failure of requires clause from CheckExtern.dfy(38,13)
+GenFunctionTest: FAILED
+	CheckExtern.dfy(49,13): Runtime failure of requires clause from CheckExtern.dfy(49,13)
+GenMethodTest: FAILED
+	CheckExtern.dfy(59,13): Runtime failure of requires clause from CheckExtern.dfy(59,13)
+BazTest: PASSED
+CallFunctionByMethod: PASSED
+[Program halted] TestedExterns.legacy.dfy(8,0): Test failures occurred: see above.
+
diff --git a/Test/contract-wrappers/TestedExterns.dfy.externs.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/TestedExterns.legacy.dfy.externs.cs
similarity index 100%
rename from Test/contract-wrappers/TestedExterns.dfy.externs.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/contract-wrappers/TestedExterns.legacy.dfy.externs.cs
diff --git a/Test/dafny0/AdvancedLHS.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AdvancedLHS.dfy
similarity index 91%
rename from Test/dafny0/AdvancedLHS.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AdvancedLHS.dfy
index 411aaa72672..ecc0c8efb0a 100644
--- a/Test/dafny0/AdvancedLHS.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AdvancedLHS.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var x: C?
diff --git a/Test/dafny0/AdvancedLHS.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AdvancedLHS.dfy.expect
similarity index 100%
rename from Test/dafny0/AdvancedLHS.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AdvancedLHS.dfy.expect
diff --git a/Test/dafny0/AllLiteralsAxiom.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AllLiteralsAxiom.dfy
similarity index 83%
rename from Test/dafny0/AllLiteralsAxiom.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AllLiteralsAxiom.dfy
index 4ea0d1537c9..bec554f8c4e 100644
--- a/Test/dafny0/AllLiteralsAxiom.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AllLiteralsAxiom.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /proverOpt:O:smt.qi.eager_threshold=30 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --solver-option="O:smt.qi.eager_threshold=30" "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module NeedsAllLiteralsAxiom {
diff --git a/Test/dafny1/KatzManna.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AllLiteralsAxiom.dfy.expect
similarity index 100%
rename from Test/dafny1/KatzManna.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AllLiteralsAxiom.dfy.expect
diff --git a/Test/dafny0/AndOrAmbiguity.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AndOrAmbiguity.dfy
similarity index 96%
rename from Test/dafny0/AndOrAmbiguity.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AndOrAmbiguity.dfy
index c480af39ba5..7e932dc2925 100644
--- a/Test/dafny0/AndOrAmbiguity.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AndOrAmbiguity.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 // && and || have the same binding power and do not associate with each other.
 // The same goes for ==> and <==, and for &, |, and ^.
diff --git a/Test/dafny0/AndOrAmbiguity.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AndOrAmbiguity.dfy.expect
similarity index 100%
rename from Test/dafny0/AndOrAmbiguity.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AndOrAmbiguity.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Array.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Array.dfy
new file mode 100644
index 00000000000..fc1504ead03
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Array.dfy
@@ -0,0 +1,362 @@
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-axioms --manual-triggers "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class A {
+  method M() {
+    var y := new A?[100];
+    y[5] := null;
+  }
+
+  method N0() {
+    var a: array<int>;
+    if 5 < a.Length {
+      a[5] := 12;  // error: violates modifies clause
+    }
+  }
+
+  method N1(a: array?<int>)
+    modifies a
+  {
+    var b := a.Length;  // error: a may be null
+  }
+
+  method N2(a: array<int>)
+    modifies a
+  {
+    a[5] := 12;  // error: index may be outside bounds
+  }
+
+  method N3(a: array<int>)
+    requires 5 < a.Length
+    modifies a
+    ensures (forall i :: 0 <= i && i < a.Length ==> a[i] == old(a[i]) || (i == 5 && a[i] == 12))
+  {
+    a[5] := 12;  // all is good
+  }
+
+  var zz0: array<A?>
+  var zz1: array<B?>
+  method O() {
+    var zz2 := new A?[25];
+    assert zz2 != zz0;  // holds because zz2 is newly allocated
+    var o: object? := zz0;
+    assert this != o;  // holds because zz0 has a different type
+
+    if 2 <= zz0.Length && zz0.Length == zz1.Length {
+      o := zz1[1];
+      assert zz0[1] == o ==> o == null;  // holds because zz0 and zz1 have different element types
+    }
+
+    assert zz2[20] == null;  // error: no reason that this must hold
+  }
+
+  var x: array<int>
+  method P0()
+    modifies this
+  {
+    if 100 <= x.Length {
+      x[5] := 12;  // error: violates modifies clause
+    }
+  }
+  method P1()
+    modifies this`x
+  {
+    if 100 <= x.Length {
+      x[5] := 12;  // error: violates modifies clause
+    }
+  }
+  method P2()
+    modifies x
+  {
+    if 100 <= x.Length {
+      x[5] := 12;  // fine
+    }
+  }
+
+  method Q() {
+    var a := new int[5];
+    a[0],a[1],a[2],a[3],a[4] := 0,1,2,3,4;
+
+    assert [1,2,3,4] == a[1..];
+    assert [1,2,3,4] == a[1.. a.Length];
+    assert [1] == a[1..2];
+    assert [0,1] == a[..2];
+    assert [0,1] == a[0..2];
+    assert forall i :: 0 <= i <= a.Length ==> [] == a[i..i];
+    assert [0,1,2,3,4] == a[..];
+    assert forall i :: 0 <= i < a.Length ==> a[i] == i;
+  }
+
+  method ArrayToSequenceTests(a: array<int>, lo: int, hi: int)
+  {
+    if (a.Length == 10) {
+      var s;
+      s := a[2..5];
+      assert |s| == 3;
+      s := a[..5];
+      assert |s| == 5;
+      s := a[2..];
+      assert |s| == 8;
+      s := a[..];
+      assert |s| == 10;
+      s := a[..10] + a[0..];
+    } else {
+      if {
+        case 0 <= lo <= a.Length =>
+          var s := a[lo..] + a[..lo];
+        case 0 <= lo <= a.Length && 0 <= hi <= a.Length =>
+          var s := a[lo..hi];  // error: lo may be greater than hi
+        case true =>
+      }
+    }
+  }
+
+  ghost function BadRangeReads(a: array<int>, all: bool): bool
+  {
+    a.Length == 10 &&
+    if all then
+      a[..] == []  // error: not allowed to read the elements of a
+    else
+      a[2..5] +       // error: not allowed to read the elements of a
+      a[..5] +        // error: not allowed to read the elements of a
+      a[2..] == []    // error: not allowed to read the elements of a
+  }
+  ghost function GoodRangeReads(a: array<int>, all: bool): bool
+    reads a
+  {
+    a.Length == 10 &&
+    if all then
+      a[..] == []  // no prob, since we now have a reads clause
+    else
+      a[2..5] + a[..5] + a[2..] == []  // no prob, since we now have a reads clause
+  }
+  ghost function AnotherGoodRangeReads(a: array<int>, j: int): bool
+  {
+    0 <= j && j <= a.Length &&
+    a[j..j] == []
+  }
+
+  ghost predicate Q0(s: seq<int>)
+  ghost predicate Q1(s: seq<int>)
+  method FrameTest(a: array<int>) returns (b: array<int>)
+    requires Q0(a[..]);
+  {
+    b := CreateArray(a);
+    assert Q0(a[..]);  // this should still be known after the call to CreateArray
+    assert Q1(b[..]);
+  }
+  method CreateArray(a: array<int>) returns (b: array<int>)
+    ensures fresh(b) && Q1(b[..])
+}
+
+class B { }
+
+// -------------------------------
+
+class ArrayTests {
+  ghost function F0(a: array<int>): bool
+  {
+    10 <= a.Length &&
+    a[7] == 13  // error: reads on something outside reads clause
+  }
+
+  var b: array<int>;
+  ghost function F1(): bool
+    reads this
+  {
+    10 <= b.Length &&
+    b[7] == 13  // error: reads on something outside reads clause
+  }
+
+  ghost function F2(a: array<int>): bool
+    reads this, b, a
+  {
+    10 <= a.Length &&
+    a[7] == 13  // good
+    &&
+    10 <= b.Length &&
+    b[7] == 13  // good
+  }
+
+  method M0(a: array<int>)
+    requires 10 <= a.Length
+  {
+    a[7] := 13;  // error: updates location not in modifies clause
+  }
+
+  method M1()
+    requires 10 <= b.Length
+    modifies this
+  {
+    b[7] := 13;  // error: updates location not in modifies clause
+  }
+
+  method M2()
+    modifies this
+  {
+    var bb := new int[75];
+    b := bb;  // fine
+  }
+
+  method M3(a: array<int>)
+    requires 10 <= a.Length
+    requires 10 <= b.Length
+    modifies this, b, a
+  {
+    a[7] := 13;  // good
+    b[7] := 13;  // good
+  }
+}
+
+// -------------------- induction attribute --------------------------------
+
+ghost method Fill_I(s: seq<int>)
+  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
+  ensures forall i,j {:induction i} :: 0 <= i < j < |s| ==> s[i] <= s[j]
+{  // error: cannot prove postcondition
+}
+
+ghost method Fill_J(s: seq<int>)
+  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
+  ensures forall i,j {:induction j} :: 0 <= i < j < |s| ==> s[i] <= s[j]
+{
+}
+
+ghost method Fill_All(s: seq<int>)
+  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
+  ensures forall i,j {:induction i,j} :: 0 <= i < j < |s| ==> s[i] <= s[j]
+{
+}
+
+ghost method Fill_True(s: seq<int>)
+  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
+  ensures forall i,j {:induction} :: 0 <= i < j < |s| ==> s[i] <= s[j]
+{
+}
+
+ghost method Fill_False(s: seq<int>)
+  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
+  ensures forall i,j {:induction false} :: 0 <= i < j < |s| ==> s[i] <= s[j]
+{  // error: cannot prove postcondition
+}
+
+ghost method Fill_None(s: seq<int>)
+  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
+  ensures forall i,j :: 0 <= i < j < |s| ==> s[i] <= s[j]
+{  // error: cannot prove postcondition
+}
+
+// -------------- some regression tests; there was a time when array-element LHSs of calls were not translated correctly
+
+method Test_ArrayElementLhsOfCall(a: array<nat>, i: int, c: Cdefg<nat>) returns (x: int)
+  modifies a, c
+{
+  if 0 <= i < a.Length {
+    a[i] := x;  // error: subrange check is applied and it cannot be verified
+    a[i] := Test_ArrayElementLhsOfCall(a, i-1, c);  // this line used to crash Dafny
+    c.t := x-1;  // error: subrange check is applied and it cannot be verified
+    c.t := Test_ArrayElementLhsOfCall(a, i-1, c);  // this line used to crash Dafny
+    var n: nat;
+    n := Test_ArrayElementLhsOfCall(a, i-1, c);  // error: subrange check is applied and it cannot be verified
+  }
+}
+
+class Cdefg<T> {
+  var t: T
+  constructor (t: T) {
+    this.t := t;
+  }
+}
+
+// ---------- allocation business -----------
+
+class MyClass {
+  ghost var Repr: set<object>
+  ghost predicate Valid()
+    reads this, Repr
+}
+
+method AllocationBusiness0(a: array<MyClass>, j: int)
+  requires 0 <= j < a.Length
+{
+  var c := new MyClass;
+  assert c !in a[j].Repr;  // the proof requires allocation axioms for arrays
+}
+
+method AllocationBusiness1(a: array<MyClass>, j: int)
+  requires 0 <= j < a.Length
+  requires a[j].Valid()
+{
+  var c := new MyClass;
+  assert a[j].Valid();  // the allocation should not have invalidated the validity of a[j]
+}
+
+method AllocationBusiness2(a: array2<MyClass>, i: int, j: int)
+  requires 0 <= i < a.Length0 && 0 <= j < a.Length1
+{
+  var c := new MyClass;
+  assert c !in a[i,j].Repr;  // the proof requires allocation axioms for multi-dim arrays
+}
+
+// ------- a regression test, testing that dtype is set correctly after allocation ------
+
+module DtypeRegression {
+  ghost predicate array_equal(a: array<int>, b: array<int>)
+    reads a, b
+  {
+    a[..] == b[..]
+  }
+
+  method duplicate_array(input: array<int>, len: int) returns (output: array<int>)
+    requires len == input.Length
+    ensures array_equal(input, output)
+  {
+    output := new int[len];
+    var i := 0;
+    while i < len
+      invariant 0 <= i <= len;
+      invariant forall j :: 0 <= j < i ==> output[j] == input[j];
+    {
+      output[i] := input[i];
+      i := i + 1;
+    }
+  }
+}
+
+// ------- :| -------
+
+class AssignSuchThat {
+  var x: int
+
+  method P() {
+    x :| assume x == 10;  // error: P is not allowed to modify "this"
+  }
+
+  method Q0(a: array<int>)
+    requires a.Length == 50
+  {
+    a[22] :| assume a[22] == 12;  // error: Q0 is not allowed to modify "a"
+    assert a[22] == 12;
+  }
+  method Q1(a: array<int>)
+    requires a.Length == 50
+    modifies a
+  {
+    a[22] :| assume a[22] == 12;
+    assert a[22] == 12;
+  }
+  method Q2(a: array<int>)
+    requires a.Length == 50
+    modifies a
+  {
+    a[22] :| assume a[22] == 12;
+    assert a[22] == 0;  // error: a[22] is not 0
+  }
+  method R(that: AssignSuchThat)
+    modifies this, that
+  {
+    this.x, that.x :| assume this.x == 5 && that.x == 5;  // error: duplicate LHSs (no regard to same final values in :| statements)
+  }
+}
+
+// WISH: autoTriggers disabled because of induction
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Array.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Array.dfy.expect
new file mode 100644
index 00000000000..9447b397966
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Array.dfy.expect
@@ -0,0 +1,36 @@
+Array.dfy(142,22): Warning: deprecated style: a semi-colon is not needed here
+Array.dfy(163,19): Warning: deprecated style: a semi-colon is not needed here
+Array.dfy(317,29): Warning: deprecated style: a semi-colon is not needed here
+Array.dfy(318,64): Warning: deprecated style: a semi-colon is not needed here
+Array.dfy(13,7): Error: assignment might update an array element not in the enclosing context's modifies clause
+Array.dfy(20,15): Error: target object might be null
+Array.dfy(26,5): Error: index out of range
+Array.dfy(50,4): Error: assertion might not hold
+Array.dfy(58,7): Error: assignment might update an array element not in the enclosing context's modifies clause
+Array.dfy(65,7): Error: assignment might update an array element not in the enclosing context's modifies clause
+Array.dfy(108,20): Error: upper bound below lower bound or above length of array
+Array.dfy(118,7): Error: insufficient reads clause to read the indicated range of array elements; Consider adding 'reads a' in the enclosing function specification for resolution
+Array.dfy(120,7): Error: insufficient reads clause to read the indicated range of array elements; Consider adding 'reads a' in the enclosing function specification for resolution
+Array.dfy(121,7): Error: insufficient reads clause to read the indicated range of array elements; Consider adding 'reads a' in the enclosing function specification for resolution
+Array.dfy(122,7): Error: insufficient reads clause to read the indicated range of array elements; Consider adding 'reads a' in the enclosing function specification for resolution
+Array.dfy(160,5): Error: insufficient reads clause to read array element; Consider adding 'reads a' in the enclosing function specification for resolution
+Array.dfy(168,5): Error: insufficient reads clause to read array element; Consider adding 'reads b' in the enclosing function specification for resolution
+Array.dfy(184,5): Error: assignment might update an array element not in the enclosing context's modifies clause
+Array.dfy(191,5): Error: assignment might update an array element not in the enclosing context's modifies clause
+Array.dfy(216,0): Error: a postcondition could not be proved on this return path
+Array.dfy(215,10): Related location: this is the postcondition that could not be proved
+Array.dfy(240,0): Error: a postcondition could not be proved on this return path
+Array.dfy(239,10): Related location: this is the postcondition that could not be proved
+Array.dfy(246,0): Error: a postcondition could not be proved on this return path
+Array.dfy(245,10): Related location: this is the postcondition that could not be proved
+Array.dfy(255,12): Error: value does not satisfy the subset constraints of 'nat'
+Array.dfy(256,5): Error: value does not satisfy the subset constraints of 'nat'
+Array.dfy(257,12): Error: value does not satisfy the subset constraints of 'nat'
+Array.dfy(258,6): Error: value does not satisfy the subset constraints of 'nat'
+Array.dfy(260,4): Error: value does not satisfy the subset constraints of 'nat'
+Array.dfy(332,4): Error: assignment might update an object not in the enclosing context's modifies clause
+Array.dfy(338,5): Error: assignment might update an array element not in the enclosing context's modifies clause
+Array.dfy(353,4): Error: assertion might not hold
+Array.dfy(358,17): Error: left-hand sides that.x and this.x might refer to the same location
+
+Dafny program verifier finished with 41 verified, 27 errors
diff --git a/Test/dafny0/ArrayElementInit.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInit.dfy
similarity index 97%
rename from Test/dafny0/ArrayElementInit.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInit.dfy
index b7d37fc63f5..e1b6e8b30f4 100644
--- a/Test/dafny0/ArrayElementInit.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInit.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" /rprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method M0(d: int)
@@ -90,7 +90,7 @@ method Q1<D>(s: D, n: int) returns (a: array<D>)
 
 method QCaller()
 {
-  var s: Six;
+  var s: Six := *;
   var a := Q0(s, 217);
   var b := Q1(s, 2);
 }
diff --git a/Test/dafny0/ArrayElementInit.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInit.dfy.expect
similarity index 91%
rename from Test/dafny0/ArrayElementInit.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInit.dfy.expect
index 993573c2ab0..36555bac90f 100644
--- a/Test/dafny0/ArrayElementInit.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInit.dfy.expect
@@ -1,13 +1,13 @@
 ArrayElementInit.dfy(13,31): Error: possible division by zero
 ArrayElementInit.dfy(19,11): Error: all array indices must be in the domain of the initialization function
 ArrayElementInit.dfy(39,11): Error: all array indices must be in the domain of the initialization function
-ArrayElementInit.dfy(66,22): Error: assertion could not be proved
+ArrayElementInit.dfy(66,2): Error: assertion might not hold
 ArrayElementInit.dfy(86,21): Error: unless an initializer is provided for the array elements, a new array of 'D' must have empty size
 ArrayElementInit.dfy(88,23): Error: unless an initializer is provided for the array elements, a new array of 'D' must have empty size
 ArrayElementInit.dfy(102,24): Error: value does not satisfy the subset constraints of 'nat'
 ArrayElementInit.dfy(110,32): Error: value does not satisfy the subset constraints of 'nat'
 ArrayElementInit.dfy(113,20): Error: given array size must agree with the number of expressions in the initializing display (4)
-ArrayElementInit.dfy(139,14): Error: assertion could not be proved
+ArrayElementInit.dfy(139,2): Error: assertion might not hold
 ArrayElementInit.dfy(144,22): Error: function precondition could not be proved
 ArrayElementInit.dfy(152,21): Error: unless an initializer is provided for the array elements, a new array of 'D' must have empty size
 ArrayElementInit.dfy(154,21): Error: unless an initializer is provided for the array elements, a new array of 'D' must have empty size
diff --git a/Test/dafny0/ArrayElementInitCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitCompile.dfy
similarity index 97%
rename from Test/dafny0/ArrayElementInitCompile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitCompile.dfy
index 3714cf0fe8e..0863d7ff66d 100644
--- a/Test/dafny0/ArrayElementInitCompile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitCompile.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --unicode-char:false
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main()
 {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitCompile.dfy.expect
new file mode 100644
index 00000000000..5de85b55180
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitCompile.dfy.expect
@@ -0,0 +1,16 @@
+67 67 67 67 67 67 67 67 
+0 1 2 3 
+1 2 3 4 
+2 3 4 5 
+3 4 5 6 
+4 5 6 7 
+'O' '.' 'O' '.' 'O' '.' 'O' '.' 'O' '.' 'O' '.' 
+12 12 12 12 12 12 12 12 12 12 12 12 
+'D' 'E'
+'y' 'z'
+4 3
+7
+100 75 98 25 
+
+['l', 'o', 'o', 'k', 's'] ['l', 'i', 'k', 'e'] ['t', 'h', 'i', 's'] ['r', 'o', 'c', 'k', 's'] 
+-2 -1 0 1 2 3 4 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitCompile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitCompile.dfy.rs.check
new file mode 100644
index 00000000000..c17262a423d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitCompile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>ForLoops</i>.*
\ No newline at end of file
diff --git a/Test/dafny0/ArrayElementInitERR.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitERR.dfy
similarity index 97%
rename from Test/dafny0/ArrayElementInitERR.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitERR.dfy
index b7d37fc63f5..e1b6e8b30f4 100644
--- a/Test/dafny0/ArrayElementInitERR.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitERR.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" /rprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method M0(d: int)
@@ -90,7 +90,7 @@ method Q1<D>(s: D, n: int) returns (a: array<D>)
 
 method QCaller()
 {
-  var s: Six;
+  var s: Six := *;
   var a := Q0(s, 217);
   var b := Q1(s, 2);
 }
diff --git a/Test/dafny0/ArrayElementInitERR.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitERR.dfy.expect
similarity index 91%
rename from Test/dafny0/ArrayElementInitERR.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitERR.dfy.expect
index e95a0a6cd74..b2b1216b7bd 100644
--- a/Test/dafny0/ArrayElementInitERR.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitERR.dfy.expect
@@ -1,13 +1,13 @@
 ArrayElementInitERR.dfy(13,31): Error: possible division by zero
 ArrayElementInitERR.dfy(19,11): Error: all array indices must be in the domain of the initialization function
 ArrayElementInitERR.dfy(39,11): Error: all array indices must be in the domain of the initialization function
-ArrayElementInitERR.dfy(66,22): Error: assertion could not be proved
+ArrayElementInitERR.dfy(66,2): Error: assertion might not hold
 ArrayElementInitERR.dfy(86,21): Error: unless an initializer is provided for the array elements, a new array of 'D' must have empty size
 ArrayElementInitERR.dfy(88,23): Error: unless an initializer is provided for the array elements, a new array of 'D' must have empty size
 ArrayElementInitERR.dfy(102,24): Error: value does not satisfy the subset constraints of 'nat'
 ArrayElementInitERR.dfy(110,32): Error: value does not satisfy the subset constraints of 'nat'
 ArrayElementInitERR.dfy(113,20): Error: given array size must agree with the number of expressions in the initializing display (4)
-ArrayElementInitERR.dfy(139,14): Error: assertion could not be proved
+ArrayElementInitERR.dfy(139,2): Error: assertion might not hold
 ArrayElementInitERR.dfy(144,22): Error: function precondition could not be proved
 ArrayElementInitERR.dfy(152,21): Error: unless an initializer is provided for the array elements, a new array of 'D' must have empty size
 ArrayElementInitERR.dfy(154,21): Error: unless an initializer is provided for the array elements, a new array of 'D' must have empty size
diff --git a/Test/dafny0/ArrayElementInitResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitResolution.dfy
similarity index 97%
rename from Test/dafny0/ArrayElementInitResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitResolution.dfy
index 216cd8bae6c..a63923e7ebe 100644
--- a/Test/dafny0/ArrayElementInitResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitResolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" /rprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module AM {
diff --git a/Test/dafny0/ArrayElementInitResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitResolution.dfy.expect
similarity index 100%
rename from Test/dafny0/ArrayElementInitResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ArrayElementInitResolution.dfy.expect
diff --git a/Test/dafny0/AsIs-Resolve.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-Resolve.dfy
similarity index 95%
rename from Test/dafny0/AsIs-Resolve.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-Resolve.dfy
index 0c8053ff9b0..640a59a43f0 100644
--- a/Test/dafny0/AsIs-Resolve.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-Resolve.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Types {
@@ -269,8 +269,8 @@ module IsRuntimeTestable {
     b := d1 is E<X, X>;
     b := d1 is F<X, X>; // error: cannot be tested at run time, so this is a ghost expression
     b := d2 is G<X, X>;
-    b := d2 is H<X, X>; // error: subset types are not tested at run time, so this is a ghost expression
-    b := ti is I<X>; // error: cannot be tested at run time, so this is a ghost expression
+    b := d2 is H<X, X>;
+    b := ti is I<X>; // error: cannot be tested at run time ("I" is not injective), so this is a ghost expression
   }
 
   method Test1(tx: T<real>, ty: T<(int, seq<real>)>, ti: T<int>, d1: D<real>, d2: D<(real, real)>) returns (b: bool) {
@@ -279,8 +279,8 @@ module IsRuntimeTestable {
     b := d1 is E<real, real>;
     b := d1 is F<real, real>; // error: cannot be tested at run time, so this is a ghost expression
     b := d2 is G<real, real>;
-    b := d2 is H<real, real>; // error: subset types are not tested at run time, so this is a ghost expression
-    b := ti is I<real>; // error: cannot be tested at run time, so this is a ghost expression
+    b := d2 is H<real, real>;
+    b := ti is I<real>; // error: cannot be tested at run time ("I" is not injective), so this is a ghost expression
   }
 
   // simple synonym
diff --git a/Test/dafny0/AsIs-Resolve.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-Resolve.dfy.expect
similarity index 83%
rename from Test/dafny0/AsIs-Resolve.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-Resolve.dfy.expect
index 4bf59e2e108..770b8b7113f 100644
--- a/Test/dafny0/AsIs-Resolve.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-Resolve.dfy.expect
@@ -54,10 +54,7 @@ AsIs-Resolve.dfy(212,11): Error: type test for type 'int -> real' must be from a
 AsIs-Resolve.dfy(213,11): Error: type test for type 'int -> Odd' must be from an expression assignable to it (got 'int -> nat') (covariant type parameter 1 would require nat <: Odd)
 AsIs-Resolve.dfy(220,11): Error: type test for type 'int ~> real' must be from an expression assignable to it (got 'int ~> nat') (covariant type parameter 1 would require nat <: real)
 AsIs-Resolve.dfy(185,11): Error: type cast to reference type 'C<(int, real)>' must be from an expression assignable to it (got 'M<string>') (non-variant type parameter would require (int, real) = (string, string)) (covariant type parameter 0 would require string <: int)
-AsIs-Resolve.dfy(185,11): Error: type cast to reference type 'C<(int, real)>' must be from an expression assignable to it (got 'M<string>') (non-variant type parameter would require (int, real) = (string, string)) (covariant type parameter 0 would require int <: string)
-AsIs-Resolve.dfy(196,9): Error: incorrect argument type at index 0 for datatype constructor parameter (expected real, found int)
-AsIs-Resolve.dfy(211,11): Error: type test for type 'real -> nat' must be from an expression assignable to it (got 'int -> nat') (contravariance for type parameter at index 0 expects int <: real)
-AsIs-Resolve.dfy(221,11): Error: type test for type 'real --> nat' must be from an expression assignable to it (got 'int ~> nat') (contravariance for type parameter at index 0 expects int <: real)
+AsIs-Resolve.dfy(196,14): Error: incorrect argument type at index 0 for datatype constructor parameter (expected real, found int)
 AsIs-Resolve.dfy(229,15): Error: type test for type 'object' must be from an expression assignable to it (got 'T')
 AsIs-Resolve.dfy(230,18): Error: type test for type 'array<object>' must be from an expression assignable to it (got 'array<T>') (nonvariance for type parameter expects object = T)
 AsIs-Resolve.dfy(231,18): Error: type test for type 'array<int>' must be from an expression assignable to it (got 'array<T>') (nonvariance for type parameter expects int = T)
@@ -65,18 +62,12 @@ AsIs-Resolve.dfy(232,16): Error: type test for type 'T' must be from an expressi
 AsIs-Resolve.dfy(234,16): Error: type test for type 'object' must be from an expression assignable to it (got 'U')
 AsIs-Resolve.dfy(235,16): Error: type test for type 'object?' must be from an expression assignable to it (got 'U')
 AsIs-Resolve.dfy(238,20): Error: type test for type 'U' must be from an expression assignable to it (got 'object')
-AsIs-Resolve.dfy(230,18): Error: type test for type 'array<object>' must be from an expression assignable to it (got 'array<T>') (non-variant type parameter would require object = T)
-AsIs-Resolve.dfy(231,18): Error: type test for type 'array<int>' must be from an expression assignable to it (got 'array<T>') (non-variant type parameter would require int = T)
 AsIs-Resolve.dfy(247,18): Error: type test for type 'array<TraitX>' must be from an expression assignable to it (got 'array<ClassX>') (nonvariance for type parameter expects TraitX = ClassX)
 AsIs-Resolve.dfy(248,18): Error: type test for type 'array<ClassX>' must be from an expression assignable to it (got 'array<TraitX>') (nonvariance for type parameter expects ClassX = TraitX)
-AsIs-Resolve.dfy(247,18): Error: type test for type 'array<TraitX>' must be from an expression assignable to it (got 'array<ClassX>') (non-variant type parameter would require TraitX = ClassX)
-AsIs-Resolve.dfy(248,18): Error: type test for type 'array<ClassX>' must be from an expression assignable to it (got 'array<TraitX>') (non-variant type parameter would require ClassX = TraitX)
 AsIs-Resolve.dfy(270,12): Error: an expression of type 'D<X>' is not run-time checkable to be a 'F<X, X>'
-AsIs-Resolve.dfy(272,12): Error: an expression of type 'D<(X, X)>' is not run-time checkable to be a 'H<X, X>'
 AsIs-Resolve.dfy(273,12): Error: an expression of type 'T<int>' is not run-time checkable to be a 'I<X>'
 AsIs-Resolve.dfy(280,12): Error: an expression of type 'D<real>' is not run-time checkable to be a 'F<real, real>'
-AsIs-Resolve.dfy(282,12): Error: an expression of type 'D<(real, real)>' is not run-time checkable to be a 'H<real, real>'
 AsIs-Resolve.dfy(283,12): Error: an expression of type 'T<int>' is not run-time checkable to be a 'I<real>'
 AsIs-Resolve.dfy(306,11): Error: an expression of type 'object' is not run-time checkable to be a 'TriviallyObject<real>'
 AsIs-Resolve.dfy(308,21): Error: an expression of type 'object' is not run-time checkable to be a 'TriviallyObject<real>'
-81 resolution/type errors detected in AsIs-Resolve.dfy
+72 resolution/type errors detected in AsIs-Resolve.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-SimplifiedExpanded-Resolve.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-SimplifiedExpanded-Resolve.dfy
new file mode 100644
index 00000000000..86fd6423aa0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-SimplifiedExpanded-Resolve.dfy
@@ -0,0 +1,588 @@
+// RUN: %exits-with 2 %verify --type-system-refresh --general-traits=datatype --general-newtypes "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method IsBasicTypes(a0: bool, a1: char, a2: int, a3: bv7, a4: bv13, a5: ORDINAL, a6: real)
+{
+  if
+  case true =>
+    var _ := a0 is bool;
+    var _ := a0 is char; // error
+    var _ := a0 is int; // error
+    var _ := a0 is bv7; // error
+    var _ := a0 is bv13; // error
+    var _ := a0 is ORDINAL; // error
+    var _ := a0 is real; // error
+  case true =>
+    var _ := a1 is bool; // error
+    var _ := a1 is char;
+    var _ := a1 is int;
+    var _ := a1 is bv7; // error
+    var _ := a1 is bv13; // error
+    var _ := a1 is ORDINAL; // error
+    var _ := a1 is real; // error
+  case true =>
+    var _ := a2 is bool; // error
+    var _ := a2 is char;
+    var _ := a2 is int;
+    var _ := a2 is bv7;
+    var _ := a2 is bv13;
+    var _ := a2 is ORDINAL;
+    var _ := a2 is real;
+  case true =>
+    var _ := a3 is bool; // error
+    var _ := a3 is char; // error
+    var _ := a3 is int;
+    var _ := a3 is bv7;
+    var _ := a3 is bv13;
+    var _ := a3 is ORDINAL; // error
+    var _ := a3 is real; // error
+  case true =>
+    var _ := a4 is bool; // error
+    var _ := a4 is char; // error
+    var _ := a4 is int;
+    var _ := a4 is bv7;
+    var _ := a4 is bv13;
+    var _ := a4 is ORDINAL; // error
+    var _ := a4 is real; // error
+  case true =>
+    var _ := a5 is bool; // error
+    var _ := a5 is char; // error
+    var _ := a5 is int;
+    var _ := a5 is bv7; // error
+    var _ := a5 is bv13; // error
+    var _ := a5 is ORDINAL;
+    var _ := a5 is real; // error
+  case true =>
+    var _ := a6 is bool; // error
+    var _ := a6 is char; // error
+    var _ := a6 is int;
+    var _ := a6 is bv7; // error
+    var _ := a6 is bv13; // error
+    var _ := a6 is ORDINAL; // error
+    var _ := a6 is real;
+}
+
+method AsBasicTypes(a0: bool, a1: char, a2: int, a3: bv7, a4: bv13, a5: ORDINAL, a6: real)
+{
+  if
+  case true =>
+    var _ := a0 as bool;
+    var _ := a0 as char; // error
+    var _ := a0 as int; // error
+    var _ := a0 as bv7; // error
+    var _ := a0 as bv13; // error
+    var _ := a0 as ORDINAL; // error
+    var _ := a0 as real; // error
+  case true =>
+    var _ := a1 as bool; // error
+    var _ := a1 as char;
+    var _ := a1 as int;
+    var _ := a1 as bv7; // error
+    var _ := a1 as bv13; // error
+    var _ := a1 as ORDINAL; // error
+    var _ := a1 as real; // error
+  case true =>
+    var _ := a2 as bool; // error
+    var _ := a2 as char;
+    var _ := a2 as int;
+    var _ := a2 as bv7;
+    var _ := a2 as bv13;
+    var _ := a2 as ORDINAL;
+    var _ := a2 as real;
+  case true =>
+    var _ := a3 as bool; // error
+    var _ := a3 as char; // error
+    var _ := a3 as int;
+    var _ := a3 as bv7;
+    var _ := a3 as bv13;
+    var _ := a3 as ORDINAL; // error
+    var _ := a3 as real; // error
+  case true =>
+    var _ := a4 as bool; // error
+    var _ := a4 as char; // error
+    var _ := a4 as int;
+    var _ := a4 as bv7;
+    var _ := a4 as bv13;
+    var _ := a4 as ORDINAL; // error
+    var _ := a4 as real; // error
+  case true =>
+    var _ := a5 as bool; // error
+    var _ := a5 as char; // error
+    var _ := a5 as int;
+    var _ := a5 as bv7; // error
+    var _ := a5 as bv13; // error
+    var _ := a5 as ORDINAL;
+    var _ := a5 as real; // error
+  case true =>
+    var _ := a6 as bool; // error
+    var _ := a6 as char; // error
+    var _ := a6 as int;
+    var _ := a6 as bv7; // error
+    var _ := a6 as bv13; // error
+    var _ := a6 as ORDINAL; // error
+    var _ := a6 as real;
+}
+
+// SOON: newtype NT<Y> = pair: (Y, int) | 0 <= pair.1 < 8 witness *
+
+type AbstractType<+X, Y, -Z>
+
+trait INT { }
+class NAT extends INT { }
+
+method IsParameterOrAbstract<T, U>(a: AbstractType<INT, INT, INT>, b: AbstractType<NAT, NAT, NAT>, t: T)
+{
+  if
+  case true =>
+    var _ := a is T; // error
+    var _ := a is U; // error
+    var _ := a is int; // error
+    var _ := a is nat; // error
+    var _ := a is AbstractType<NAT, NAT, NAT>; // error
+    var _ := a is AbstractType<NAT, NAT, INT>; // error
+    var _ := a is AbstractType<NAT, INT, NAT>; // error
+    var _ := a is AbstractType<NAT, INT, INT>;
+    var _ := a is AbstractType<INT, NAT, NAT>; // error
+    var _ := a is AbstractType<INT, NAT, INT>; // error
+    var _ := a is AbstractType<INT, INT, NAT>;
+    var _ := a is AbstractType<INT, INT, INT>;
+    var _ := a is (int, int); // error
+    var _ := a is set<int>; // error
+    var _ := a is object; // error
+    var _ := a is array2<int>; // error
+    // SOON: var _ := a is NT<int>; // error
+  case true =>
+    var _ := b is T; // error
+    var _ := b is U; // error
+    var _ := b is int; // error
+    var _ := b is nat; // error
+    var _ := b is AbstractType<NAT, NAT, NAT>;
+    var _ := b is AbstractType<NAT, NAT, INT>;
+    var _ := b is AbstractType<NAT, INT, NAT>; // error
+    var _ := b is AbstractType<NAT, INT, INT>; // error
+    var _ := b is AbstractType<INT, NAT, NAT>;
+    var _ := b is AbstractType<INT, NAT, INT>; // error
+    var _ := b is AbstractType<INT, INT, NAT>; // error
+    var _ := b is AbstractType<INT, INT, INT>; // error
+    var _ := b is (int, int); // error
+    var _ := b is set<int>; // error
+    var _ := b is object; // error
+    var _ := b is array2<int>; // error
+    // SOON: var _ := b is NT<int>; // error
+  case true =>
+    var _ := t is T;
+    var _ := t is U; // error
+    var _ := t is int; // error
+    var _ := t is nat; // error
+    var _ := t is AbstractType<NAT, NAT, NAT>; // error
+    var _ := t is AbstractType<NAT, NAT, INT>; // error
+    var _ := t is AbstractType<NAT, INT, NAT>; // error
+    var _ := t is AbstractType<NAT, INT, INT>; // error
+    var _ := t is AbstractType<INT, NAT, NAT>; // error
+    var _ := t is AbstractType<INT, NAT, INT>; // error
+    var _ := t is AbstractType<INT, INT, NAT>; // error
+    var _ := t is AbstractType<INT, INT, INT>; // error
+    var _ := t is (int, int); // error
+    var _ := t is set<int>; // error
+    var _ := t is object; // error
+    var _ := t is array2<int>; // error
+    // SOON: var _ := t is NT<int>; // error
+}
+
+method AsParameterOrAbstract<T, U>(a: AbstractType<INT, INT, INT>, b: AbstractType<NAT, NAT, NAT>, t: T)
+{
+  if
+  case true =>
+    var _ := a as T; // error
+    var _ := a as U; // error
+    var _ := a as int; // error
+    var _ := a as nat; // error
+    var _ := a as AbstractType<NAT, NAT, NAT>; // error
+    var _ := a as AbstractType<NAT, NAT, INT>; // error
+    var _ := a as AbstractType<NAT, INT, NAT>; // error
+    var _ := a as AbstractType<NAT, INT, INT>;
+    var _ := a as AbstractType<INT, NAT, NAT>; // error
+    var _ := a as AbstractType<INT, NAT, INT>; // error
+    var _ := a as AbstractType<INT, INT, NAT>;
+    var _ := a as AbstractType<INT, INT, INT>;
+    var _ := a as (int, int); // error
+    var _ := a as set<int>; // error
+    var _ := a as object; // error
+    var _ := a as array2<int>; // error
+    // SOON: var _ := a as NT<int>; // error
+  case true =>
+    var _ := b as T; // error
+    var _ := b as U; // error
+    var _ := b as int; // error
+    var _ := b as nat; // error
+    var _ := b as AbstractType<NAT, NAT, NAT>;
+    var _ := b as AbstractType<NAT, NAT, INT>;
+    var _ := b as AbstractType<NAT, INT, NAT>; // error
+    var _ := b as AbstractType<NAT, INT, INT>; // error
+    var _ := b as AbstractType<INT, NAT, NAT>;
+    var _ := b as AbstractType<INT, NAT, INT>; // error
+    var _ := b as AbstractType<INT, INT, NAT>; // error
+    var _ := b as AbstractType<INT, INT, INT>; // error
+    var _ := b as (int, int); // error
+    var _ := b as set<int>; // error
+    var _ := b as object; // error
+    var _ := b as array2<int>; // error
+    // SOON: var _ := b as NT<int>; // error
+  case true =>
+    var _ := t as T;
+    var _ := t as U; // error
+    var _ := t as int; // error
+    var _ := t as nat; // error
+    var _ := t as AbstractType<NAT, NAT, NAT>; // error
+    var _ := t as AbstractType<NAT, NAT, INT>; // error
+    var _ := t as AbstractType<NAT, INT, NAT>; // error
+    var _ := t as AbstractType<NAT, INT, INT>; // error
+    var _ := t as AbstractType<INT, NAT, NAT>; // error
+    var _ := t as AbstractType<INT, NAT, INT>; // error
+    var _ := t as AbstractType<INT, INT, NAT>; // error
+    var _ := t as AbstractType<INT, INT, INT>; // error
+    var _ := t as (int, int); // error
+    var _ := t as set<int>; // error
+    var _ := t as object; // error
+    var _ := t as array2<int>; // error
+    // SOON: var _ := t as NT<int>; // error
+}
+
+method IsCollectionUserDefined(a: set<int>, b: (int, int), c: array2<int>)
+{
+  if
+  case true =>
+    var _ := a is int; // error
+    var _ := a is set<int>;
+    var _ := a is (int, int); // error
+    var _ := a is array2<int>; // error
+    // SOON: var _ := a is NT<real, int>; // error
+    // SOON: var _ := a is NT<int, int>; // error
+  case true =>
+    var _ := b is int; // error
+    var _ := b is set<int>; // error
+    var _ := b is (int, int);
+    var _ := b is array2<int>; // error
+    // SOON: var _ := b is NT<real, int>; // error
+    // SOON: var _ := b is NT<int, int>;
+  case true =>
+    var _ := c is int; // error
+    var _ := c is set<int>; // error
+    var _ := c is (int, int); // error
+    var _ := c is array2<int>;
+    // SOON: var _ := c is NT<real, int>; // error
+    // SOON: var _ := c is NT<int, int>; // error
+}
+
+method AsCollectionUserDefined(a: set<int>, b: (int, int), c: array2<int>)
+{
+  if
+  case true =>
+    var _ := a as int; // error
+    var _ := a as set<int>;
+    var _ := a as (int, int); // error
+    var _ := a as array2<int>; // error
+    // SOON: var _ := a as NT<real, int>; // error
+    // SOON: var _ := a as NT<int, int>; // error
+  case true =>
+    var _ := b as int; // error
+    var _ := b as set<int>; // error
+    var _ := b as (int, int);
+    var _ := b as array2<int>; // error
+    // SOON: var _ := b as NT<real, int>; // error
+    // SOON: var _ := b as NT<int, int>;
+  case true =>
+    var _ := c as int; // error
+    var _ := c as set<int>; // error
+    var _ := c as (int, int); // error
+    var _ := c as array2<int>;
+    // SOON: var _ := c as NT<real, int>; // error
+    // SOON: var _ := c as NT<int, int>; // error
+}
+
+newtype NewInt = int
+newtype NewNewInt = NewInt
+
+// SOON: newtype NewDiagonal<X> = diagonal: (X, X) | true witness *
+// SOON: newtype NewNewDiagonal<X> = diagonal: NewDiagonal<X> | true witness *
+
+method IsNewtype(a: int, b: NewInt, c: NewNewInt /** SOON, x: (int, int), y: NewDiagonal<int>, z: NewNewDiagonal<int> **/)
+{
+  if
+  case true =>
+    var _ := a is bool; // error
+    var _ := a is char;
+    var _ := a is int;
+    var _ := a is NewInt;
+    var _ := a is NewNewInt;
+    // SOON: var _ := a is NewDiagonal<int>; // error
+  case true =>
+    var _ := b is bool; // error
+    var _ := b is char;
+    var _ := b is int;
+    var _ := b is NewInt;
+    var _ := b is NewNewInt;
+    // SOON: var _ := b is NewDiagonal<int>; // error
+  case true =>
+    var _ := c is bool; // error
+    var _ := c is char;
+    var _ := c is int;
+    var _ := c is NewInt;
+    var _ := c is NewNewInt;
+    // SOON: var _ := c is NewDiagonal<int>;
+  /** SOON
+  case true =>
+    var _ := x is int; // error
+    var _ := x is (int, int);
+    var _ := x is NewDiagonal<int>;
+    var _ := x is NewNewDiagonal<int>; // error
+    var _ := x is NewDiagonal<nat>; // error
+  case true =>
+    var _ := y is int; // error
+    var _ := y is (int, int);
+    var _ := y is NewDiagonal<int>;
+    var _ := y is NewNewDiagonal<int>;
+    var _ := y is NewDiagonal<nat>; // error
+  case true =>
+    var _ := z is int; // error
+    var _ := z is (int, int); // error
+    var _ := z is NewDiagonal<int>;
+    var _ := z is NewNewDiagonal<int>;
+    var _ := z is NewDiagonal<nat>; // error
+  **/
+}
+
+method AsNewtype(a: int, b: NewInt, c: NewNewInt /** SOON, x: (int, int), y: NewDiagonal<int>, z: NewNewDiagonal<int> **/)
+{
+  if
+  case true =>
+    var _ := a as bool; // error
+    var _ := a as char;
+    var _ := a as int;
+    var _ := a as NewInt;
+    var _ := a as NewNewInt;
+    // SOON: var _ := a as NewDiagonal<int>; // error
+  case true =>
+    var _ := b as bool; // error
+    var _ := b as char;
+    var _ := b as int;
+    var _ := b as NewInt;
+    var _ := b as NewNewInt;
+    // SOON: var _ := b as NewDiagonal<int>; // error
+  case true =>
+    var _ := c as bool; // error
+    var _ := c as char;
+    var _ := c as int;
+    var _ := c as NewInt;
+    var _ := c as NewNewInt;
+    // SOON: var _ := c as NewDiagonal<int>;
+  /** SOON
+  case true =>
+    var _ := x as int; // error
+    var _ := x as (int, int);
+    var _ := x as NewDiagonal<int>;
+    var _ := x as NewNewDiagonal<int>; // error
+    var _ := x as NewDiagonal<nat>; // error
+  case true =>
+    var _ := y as int; // error
+    var _ := y as (int, int);
+    var _ := y as NewDiagonal<int>;
+    var _ := y as NewNewDiagonal<int>;
+    var _ := y as NewDiagonal<nat>; // error
+  case true =>
+    var _ := z as int; // error
+    var _ := z as (int, int); // error
+    var _ := z as NewDiagonal<int>;
+    var _ := z as NewNewDiagonal<int>;
+    var _ := z as NewDiagonal<nat>; // error
+  **/
+}
+
+trait AAA { }
+trait BBB extends AAA { }
+
+trait CCC extends BBB { }
+datatype DDD extends BBB = DDD
+class EEE extends BBB { }
+
+method IsTrait(a: AAA, b: BBB, c: CCC, d: DDD, e: EEE)
+{
+  if
+  case true =>
+    var _ := a is AAA;
+    var _ := a is BBB;
+    var _ := a is CCC;
+    var _ := a is DDD;
+    var _ := a is EEE;
+  case true =>
+    var _ := b is AAA;
+    var _ := b is BBB;
+    var _ := b is CCC;
+    var _ := b is DDD;
+    var _ := b is EEE;
+  case true =>
+    var _ := c is AAA;
+    var _ := c is BBB;
+    var _ := c is CCC;
+    var _ := c is DDD; // error
+    var _ := c is EEE; // error
+  case true =>
+    var _ := d is AAA;
+    var _ := d is BBB;
+    var _ := d is CCC; // error
+    var _ := d is DDD;
+    var _ := d is EEE; // error
+  case true =>
+    var _ := e is AAA;
+    var _ := e is BBB;
+    var _ := e is CCC; // error
+    var _ := e is DDD; // error
+    var _ := e is EEE;
+}
+
+method AsTrait(a: AAA, b: BBB, c: CCC, d: DDD, e: EEE)
+{
+  if
+  case true =>
+    var _ := a as AAA;
+    var _ := a as BBB;
+    var _ := a as CCC;
+    var _ := a as DDD;
+    var _ := a as EEE;
+  case true =>
+    var _ := b as AAA;
+    var _ := b as BBB;
+    var _ := b as CCC;
+    var _ := b as DDD;
+    var _ := b as EEE;
+  case true =>
+    var _ := c as AAA;
+    var _ := c as BBB;
+    var _ := c as CCC;
+    var _ := c as DDD; // error
+    var _ := c as EEE; // error
+  case true =>
+    var _ := d as AAA;
+    var _ := d as BBB;
+    var _ := d as CCC; // error
+    var _ := d as DDD;
+    var _ := d as EEE; // error
+  case true =>
+    var _ := e as AAA;
+    var _ := e as BBB;
+    var _ := e as CCC; // error
+    var _ := e as DDD; // error
+    var _ := e as EEE;
+}
+
+type Triple<X> = (X, X, X)
+type TA<X> = t: Triple<X> | P(t.0) witness *
+type TB<X> = t: Triple<X> | P(t.1) witness *
+type TBB<X> = t: TB<X> | P(t.2) witness *
+predicate P<X>(x: X)
+
+method IsSubsetType<Y>(t0: (Y, Y, Y), t1: Triple<Y>, ta: TA<Y>, tb: TB<Y>, tbb: TBB<Y>)
+{
+  if
+  case true =>
+    var _ := t0 is (int, int, int); // error
+    var _ := t0 is (Y, Y, Y);
+    var _ := t0 is Triple<Y>;
+    var _ := t0 is TA<Y>;
+    var _ := t0 is TB<Y>;
+    var _ := t0 is TBB<Y>;
+  case true =>
+    var _ := t1 is (int, int, int); // error
+    var _ := t1 is (Y, Y, Y);
+    var _ := t1 is Triple<Y>;
+    var _ := t1 is TA<Y>;
+    var _ := t1 is TB<Y>;
+    var _ := t1 is TBB<Y>;
+  case true =>
+    var _ := ta is (int, int, int); // error
+    var _ := ta is (Y, Y, Y);
+    var _ := ta is Triple<Y>;
+    var _ := ta is TA<Y>;
+    var _ := ta is TB<Y>;
+    var _ := ta is TBB<Y>;
+  case true =>
+    var _ := tb is (int, int, int); // error
+    var _ := tb is (Y, Y, Y);
+    var _ := tb is Triple<Y>;
+    var _ := tb is TA<Y>;
+    var _ := tb is TB<Y>;
+    var _ := tb is TBB<Y>;
+  case true =>
+    var _ := tbb is (int, int, int); // error
+    var _ := tbb is (Y, Y, Y);
+    var _ := tbb is Triple<Y>;
+    var _ := tbb is TA<Y>;
+    var _ := tbb is TB<Y>;
+    var _ := tbb is TBB<Y>;
+}
+
+method AsSubsetType<Y>(t0: (Y, Y, Y), t1: Triple<Y>, ta: TA<Y>, tb: TB<Y>, tbb: TBB<Y>)
+{
+  if
+  case true =>
+    var _ := t0 as (int, int, int); // error
+    var _ := t0 as (Y, Y, Y);
+    var _ := t0 as Triple<Y>;
+    var _ := t0 as TA<Y>;
+    var _ := t0 as TB<Y>;
+    var _ := t0 as TBB<Y>;
+  case true =>
+    var _ := t1 as (int, int, int); // error
+    var _ := t1 as (Y, Y, Y);
+    var _ := t1 as Triple<Y>;
+    var _ := t1 as TA<Y>;
+    var _ := t1 as TB<Y>;
+    var _ := t1 as TBB<Y>;
+  case true =>
+    var _ := ta as (int, int, int); // error
+    var _ := ta as (Y, Y, Y);
+    var _ := ta as Triple<Y>;
+    var _ := ta as TA<Y>;
+    var _ := ta as TB<Y>;
+    var _ := ta as TBB<Y>;
+  case true =>
+    var _ := tb as (int, int, int); // error
+    var _ := tb as (Y, Y, Y);
+    var _ := tb as Triple<Y>;
+    var _ := tb as TA<Y>;
+    var _ := tb as TB<Y>;
+    var _ := tb as TBB<Y>;
+  case true =>
+    var _ := tbb as (int, int, int); // error
+    var _ := tbb as (Y, Y, Y);
+    var _ := tbb as Triple<Y>;
+    var _ := tbb as TA<Y>;
+    var _ := tbb as TB<Y>;
+    var _ := tbb as TBB<Y>;
+}
+
+newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+newtype byte = x: int | 0 <= x < 256
+newtype Bits02 = x: bv8 | x & !5 == 0
+newtype EvenWord = x: bv32 | x % 1 == 0
+
+method CommonSystemsConversions() returns (i: int, n: nat, i32: int32, b: byte, bits: Bits02, e: EvenWord, ch: char)
+{
+  b := bits as byte;
+  i := bits as int;
+  e := (b as int32 + i as int32) as EvenWord;
+  n := bits as nat;
+  i32 := bits as int32;
+
+  i32 := b as int32;
+  b := i32 as byte;
+
+  var u0 := bits as bv8;
+  var u1 := e as bv8;
+  var w := (u0 + u1) as bv16;
+  e := w as EvenWord;
+
+  ch := bits as int as char;
+  i := ch as int;
+  ch := i as char;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-SimplifiedExpanded-Resolve.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-SimplifiedExpanded-Resolve.dfy.expect
new file mode 100644
index 00000000000..d71b817f678
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-SimplifiedExpanded-Resolve.dfy.expect
@@ -0,0 +1,189 @@
+AsIs-SimplifiedExpanded-Resolve.dfy(9,16): Error: type test for type 'char' must be from an expression assignable to it (got 'bool')
+AsIs-SimplifiedExpanded-Resolve.dfy(10,16): Error: type test for type 'int' must be from an expression assignable to it (got 'bool')
+AsIs-SimplifiedExpanded-Resolve.dfy(11,16): Error: type test for type 'bv7' must be from an expression assignable to it (got 'bool')
+AsIs-SimplifiedExpanded-Resolve.dfy(12,16): Error: type test for type 'bv13' must be from an expression assignable to it (got 'bool')
+AsIs-SimplifiedExpanded-Resolve.dfy(13,16): Error: type test for type 'ORDINAL' must be from an expression assignable to it (got 'bool')
+AsIs-SimplifiedExpanded-Resolve.dfy(14,16): Error: type test for type 'real' must be from an expression assignable to it (got 'bool')
+AsIs-SimplifiedExpanded-Resolve.dfy(16,16): Error: type test for type 'bool' must be from an expression assignable to it (got 'char')
+AsIs-SimplifiedExpanded-Resolve.dfy(19,16): Error: type test for type 'bv7' must be from an expression assignable to it (got 'char')
+AsIs-SimplifiedExpanded-Resolve.dfy(20,16): Error: type test for type 'bv13' must be from an expression assignable to it (got 'char')
+AsIs-SimplifiedExpanded-Resolve.dfy(21,16): Error: type test for type 'ORDINAL' must be from an expression assignable to it (got 'char')
+AsIs-SimplifiedExpanded-Resolve.dfy(22,16): Error: type test for type 'real' must be from an expression assignable to it (got 'char')
+AsIs-SimplifiedExpanded-Resolve.dfy(24,16): Error: type test for type 'bool' must be from an expression assignable to it (got 'int')
+AsIs-SimplifiedExpanded-Resolve.dfy(32,16): Error: type test for type 'bool' must be from an expression assignable to it (got 'bv7')
+AsIs-SimplifiedExpanded-Resolve.dfy(33,16): Error: type test for type 'char' must be from an expression assignable to it (got 'bv7')
+AsIs-SimplifiedExpanded-Resolve.dfy(37,16): Error: type test for type 'ORDINAL' must be from an expression assignable to it (got 'bv7')
+AsIs-SimplifiedExpanded-Resolve.dfy(38,16): Error: type test for type 'real' must be from an expression assignable to it (got 'bv7')
+AsIs-SimplifiedExpanded-Resolve.dfy(40,16): Error: type test for type 'bool' must be from an expression assignable to it (got 'bv13')
+AsIs-SimplifiedExpanded-Resolve.dfy(41,16): Error: type test for type 'char' must be from an expression assignable to it (got 'bv13')
+AsIs-SimplifiedExpanded-Resolve.dfy(45,16): Error: type test for type 'ORDINAL' must be from an expression assignable to it (got 'bv13')
+AsIs-SimplifiedExpanded-Resolve.dfy(46,16): Error: type test for type 'real' must be from an expression assignable to it (got 'bv13')
+AsIs-SimplifiedExpanded-Resolve.dfy(48,16): Error: type test for type 'bool' must be from an expression assignable to it (got 'ORDINAL')
+AsIs-SimplifiedExpanded-Resolve.dfy(49,16): Error: type test for type 'char' must be from an expression assignable to it (got 'ORDINAL')
+AsIs-SimplifiedExpanded-Resolve.dfy(51,16): Error: type test for type 'bv7' must be from an expression assignable to it (got 'ORDINAL')
+AsIs-SimplifiedExpanded-Resolve.dfy(52,16): Error: type test for type 'bv13' must be from an expression assignable to it (got 'ORDINAL')
+AsIs-SimplifiedExpanded-Resolve.dfy(54,16): Error: type test for type 'real' must be from an expression assignable to it (got 'ORDINAL')
+AsIs-SimplifiedExpanded-Resolve.dfy(56,16): Error: type test for type 'bool' must be from an expression assignable to it (got 'real')
+AsIs-SimplifiedExpanded-Resolve.dfy(57,16): Error: type test for type 'char' must be from an expression assignable to it (got 'real')
+AsIs-SimplifiedExpanded-Resolve.dfy(59,16): Error: type test for type 'bv7' must be from an expression assignable to it (got 'real')
+AsIs-SimplifiedExpanded-Resolve.dfy(60,16): Error: type test for type 'bv13' must be from an expression assignable to it (got 'real')
+AsIs-SimplifiedExpanded-Resolve.dfy(61,16): Error: type test for type 'ORDINAL' must be from an expression assignable to it (got 'real')
+AsIs-SimplifiedExpanded-Resolve.dfy(70,16): Error: type conversion to a char type is allowed only from numeric and bitvector types, char, and ORDINAL (got bool)
+AsIs-SimplifiedExpanded-Resolve.dfy(71,16): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got bool)
+AsIs-SimplifiedExpanded-Resolve.dfy(72,16): Error: type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got bool)
+AsIs-SimplifiedExpanded-Resolve.dfy(73,16): Error: type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got bool)
+AsIs-SimplifiedExpanded-Resolve.dfy(74,16): Error: type conversion to an ORDINAL type is allowed only from numeric and bitvector types, char, and ORDINAL (got bool)
+AsIs-SimplifiedExpanded-Resolve.dfy(75,16): Error: type conversion to a real-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got bool)
+AsIs-SimplifiedExpanded-Resolve.dfy(77,16): Error: type cast to type 'bool' must be from an expression of a compatible type (got 'char')
+AsIs-SimplifiedExpanded-Resolve.dfy(80,16): Error: type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got char)
+AsIs-SimplifiedExpanded-Resolve.dfy(81,16): Error: type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got char)
+AsIs-SimplifiedExpanded-Resolve.dfy(82,16): Error: type conversion to an ORDINAL type is allowed only from numeric and bitvector types, char, and ORDINAL (got char)
+AsIs-SimplifiedExpanded-Resolve.dfy(83,16): Error: type conversion to a real-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got char)
+AsIs-SimplifiedExpanded-Resolve.dfy(85,16): Error: type cast to type 'bool' must be from an expression of a compatible type (got 'int')
+AsIs-SimplifiedExpanded-Resolve.dfy(93,16): Error: type cast to type 'bool' must be from an expression of a compatible type (got 'bv7')
+AsIs-SimplifiedExpanded-Resolve.dfy(94,16): Error: type conversion to a char type is allowed only from numeric and bitvector types, char, and ORDINAL (got bv7)
+AsIs-SimplifiedExpanded-Resolve.dfy(98,16): Error: type conversion to an ORDINAL type is allowed only from numeric and bitvector types, char, and ORDINAL (got bv7)
+AsIs-SimplifiedExpanded-Resolve.dfy(99,16): Error: type conversion to a real-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got bv7)
+AsIs-SimplifiedExpanded-Resolve.dfy(101,16): Error: type cast to type 'bool' must be from an expression of a compatible type (got 'bv13')
+AsIs-SimplifiedExpanded-Resolve.dfy(102,16): Error: type conversion to a char type is allowed only from numeric and bitvector types, char, and ORDINAL (got bv13)
+AsIs-SimplifiedExpanded-Resolve.dfy(106,16): Error: type conversion to an ORDINAL type is allowed only from numeric and bitvector types, char, and ORDINAL (got bv13)
+AsIs-SimplifiedExpanded-Resolve.dfy(107,16): Error: type conversion to a real-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got bv13)
+AsIs-SimplifiedExpanded-Resolve.dfy(109,16): Error: type cast to type 'bool' must be from an expression of a compatible type (got 'ORDINAL')
+AsIs-SimplifiedExpanded-Resolve.dfy(110,16): Error: type conversion to a char type is allowed only from numeric and bitvector types, char, and ORDINAL (got ORDINAL)
+AsIs-SimplifiedExpanded-Resolve.dfy(112,16): Error: type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got ORDINAL)
+AsIs-SimplifiedExpanded-Resolve.dfy(113,16): Error: type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got ORDINAL)
+AsIs-SimplifiedExpanded-Resolve.dfy(115,16): Error: type conversion to a real-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got ORDINAL)
+AsIs-SimplifiedExpanded-Resolve.dfy(117,16): Error: type cast to type 'bool' must be from an expression of a compatible type (got 'real')
+AsIs-SimplifiedExpanded-Resolve.dfy(118,16): Error: type conversion to a char type is allowed only from numeric and bitvector types, char, and ORDINAL (got real)
+AsIs-SimplifiedExpanded-Resolve.dfy(120,16): Error: type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got real)
+AsIs-SimplifiedExpanded-Resolve.dfy(121,16): Error: type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got real)
+AsIs-SimplifiedExpanded-Resolve.dfy(122,16): Error: type conversion to an ORDINAL type is allowed only from numeric and bitvector types, char, and ORDINAL (got real)
+AsIs-SimplifiedExpanded-Resolve.dfy(137,15): Error: type test for type 'T' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(138,15): Error: type test for type 'U' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(139,15): Error: type test for type 'int' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(140,15): Error: type test for type 'nat' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(141,15): Error: type test for type 'AbstractType<NAT, NAT, NAT>' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(142,15): Error: type test for type 'AbstractType<NAT, NAT, INT>' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(143,15): Error: type test for type 'AbstractType<NAT, INT, NAT>' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(145,15): Error: type test for type 'AbstractType<INT, NAT, NAT>' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(146,15): Error: type test for type 'AbstractType<INT, NAT, INT>' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(149,15): Error: type test for type '(int, int)' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(150,15): Error: type test for type 'set<int>' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(151,15): Error: type test for type 'object' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(152,15): Error: type test for type 'array2<int>' must be from an expression assignable to it (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(155,15): Error: type test for type 'T' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(156,15): Error: type test for type 'U' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(157,15): Error: type test for type 'int' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(158,15): Error: type test for type 'nat' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(161,15): Error: type test for type 'AbstractType<NAT, INT, NAT>' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(162,15): Error: type test for type 'AbstractType<NAT, INT, INT>' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(164,15): Error: type test for type 'AbstractType<INT, NAT, INT>' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(165,15): Error: type test for type 'AbstractType<INT, INT, NAT>' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(166,15): Error: type test for type 'AbstractType<INT, INT, INT>' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(167,15): Error: type test for type '(int, int)' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(168,15): Error: type test for type 'set<int>' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(169,15): Error: type test for type 'object' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(170,15): Error: type test for type 'array2<int>' must be from an expression assignable to it (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(174,15): Error: type test for type 'U' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(175,15): Error: type test for type 'int' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(176,15): Error: type test for type 'nat' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(177,15): Error: type test for type 'AbstractType<NAT, NAT, NAT>' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(178,15): Error: type test for type 'AbstractType<NAT, NAT, INT>' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(179,15): Error: type test for type 'AbstractType<NAT, INT, NAT>' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(180,15): Error: type test for type 'AbstractType<NAT, INT, INT>' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(181,15): Error: type test for type 'AbstractType<INT, NAT, NAT>' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(182,15): Error: type test for type 'AbstractType<INT, NAT, INT>' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(183,15): Error: type test for type 'AbstractType<INT, INT, NAT>' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(184,15): Error: type test for type 'AbstractType<INT, INT, INT>' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(185,15): Error: type test for type '(int, int)' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(186,15): Error: type test for type 'set<int>' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(187,15): Error: type test for type 'object' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(188,15): Error: type test for type 'array2<int>' must be from an expression assignable to it (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(196,15): Error: type cast to type 'T' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(197,15): Error: type cast to type 'U' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(198,15): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got AbstractType<INT, INT, INT>)
+AsIs-SimplifiedExpanded-Resolve.dfy(199,15): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got AbstractType<INT, INT, INT>)
+AsIs-SimplifiedExpanded-Resolve.dfy(200,15): Error: type cast to type 'AbstractType<NAT, NAT, NAT>' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(201,15): Error: type cast to type 'AbstractType<NAT, NAT, INT>' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(202,15): Error: type cast to type 'AbstractType<NAT, INT, NAT>' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(204,15): Error: type cast to type 'AbstractType<INT, NAT, NAT>' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(205,15): Error: type cast to type 'AbstractType<INT, NAT, INT>' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(208,15): Error: type cast to type '(int, int)' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(209,15): Error: type cast to type 'set<int>' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(210,15): Error: type cast to reference type 'object' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(211,15): Error: type cast to reference type 'array2<int>' must be from an expression of a compatible type (got 'AbstractType<INT, INT, INT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(214,15): Error: type cast to type 'T' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(215,15): Error: type cast to type 'U' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(216,15): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got AbstractType<NAT, NAT, NAT>)
+AsIs-SimplifiedExpanded-Resolve.dfy(217,15): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got AbstractType<NAT, NAT, NAT>)
+AsIs-SimplifiedExpanded-Resolve.dfy(220,15): Error: type cast to type 'AbstractType<NAT, INT, NAT>' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(221,15): Error: type cast to type 'AbstractType<NAT, INT, INT>' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(223,15): Error: type cast to type 'AbstractType<INT, NAT, INT>' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(224,15): Error: type cast to type 'AbstractType<INT, INT, NAT>' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(225,15): Error: type cast to type 'AbstractType<INT, INT, INT>' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(226,15): Error: type cast to type '(int, int)' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(227,15): Error: type cast to type 'set<int>' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(228,15): Error: type cast to reference type 'object' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(229,15): Error: type cast to reference type 'array2<int>' must be from an expression of a compatible type (got 'AbstractType<NAT, NAT, NAT>')
+AsIs-SimplifiedExpanded-Resolve.dfy(233,15): Error: type cast to type 'U' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(234,15): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got T)
+AsIs-SimplifiedExpanded-Resolve.dfy(235,15): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got T)
+AsIs-SimplifiedExpanded-Resolve.dfy(236,15): Error: type cast to type 'AbstractType<NAT, NAT, NAT>' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(237,15): Error: type cast to type 'AbstractType<NAT, NAT, INT>' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(238,15): Error: type cast to type 'AbstractType<NAT, INT, NAT>' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(239,15): Error: type cast to type 'AbstractType<NAT, INT, INT>' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(240,15): Error: type cast to type 'AbstractType<INT, NAT, NAT>' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(241,15): Error: type cast to type 'AbstractType<INT, NAT, INT>' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(242,15): Error: type cast to type 'AbstractType<INT, INT, NAT>' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(243,15): Error: type cast to type 'AbstractType<INT, INT, INT>' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(244,15): Error: type cast to type '(int, int)' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(245,15): Error: type cast to type 'set<int>' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(246,15): Error: type cast to reference type 'object' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(247,15): Error: type cast to reference type 'array2<int>' must be from an expression of a compatible type (got 'T')
+AsIs-SimplifiedExpanded-Resolve.dfy(255,15): Error: type test for type 'int' must be from an expression assignable to it (got 'set<int>')
+AsIs-SimplifiedExpanded-Resolve.dfy(257,15): Error: type test for type '(int, int)' must be from an expression assignable to it (got 'set<int>')
+AsIs-SimplifiedExpanded-Resolve.dfy(258,15): Error: type test for type 'array2<int>' must be from an expression assignable to it (got 'set<int>')
+AsIs-SimplifiedExpanded-Resolve.dfy(262,15): Error: type test for type 'int' must be from an expression assignable to it (got '(int, int)')
+AsIs-SimplifiedExpanded-Resolve.dfy(263,15): Error: type test for type 'set<int>' must be from an expression assignable to it (got '(int, int)')
+AsIs-SimplifiedExpanded-Resolve.dfy(265,15): Error: type test for type 'array2<int>' must be from an expression assignable to it (got '(int, int)')
+AsIs-SimplifiedExpanded-Resolve.dfy(269,15): Error: type test for type 'int' must be from an expression assignable to it (got 'array2<int>')
+AsIs-SimplifiedExpanded-Resolve.dfy(270,15): Error: type test for type 'set<int>' must be from an expression assignable to it (got 'array2<int>')
+AsIs-SimplifiedExpanded-Resolve.dfy(271,15): Error: type test for type '(int, int)' must be from an expression assignable to it (got 'array2<int>')
+AsIs-SimplifiedExpanded-Resolve.dfy(281,15): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got set<int>)
+AsIs-SimplifiedExpanded-Resolve.dfy(283,15): Error: type cast to type '(int, int)' must be from an expression of a compatible type (got 'set<int>')
+AsIs-SimplifiedExpanded-Resolve.dfy(284,15): Error: type cast to reference type 'array2<int>' must be from an expression of a compatible type (got 'set<int>')
+AsIs-SimplifiedExpanded-Resolve.dfy(288,15): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got (int, int))
+AsIs-SimplifiedExpanded-Resolve.dfy(289,15): Error: type cast to type 'set<int>' must be from an expression of a compatible type (got '(int, int)')
+AsIs-SimplifiedExpanded-Resolve.dfy(291,15): Error: type cast to reference type 'array2<int>' must be from an expression of a compatible type (got '(int, int)')
+AsIs-SimplifiedExpanded-Resolve.dfy(295,15): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got array2<int>)
+AsIs-SimplifiedExpanded-Resolve.dfy(296,15): Error: type cast to type 'set<int>' must be from an expression of a compatible type (got 'array2<int>')
+AsIs-SimplifiedExpanded-Resolve.dfy(297,15): Error: type cast to type '(int, int)' must be from an expression of a compatible type (got 'array2<int>')
+AsIs-SimplifiedExpanded-Resolve.dfy(313,15): Error: type test for type 'bool' must be from an expression assignable to it (got 'int')
+AsIs-SimplifiedExpanded-Resolve.dfy(320,15): Error: type test for type 'bool' must be from an expression assignable to it (got 'NewInt')
+AsIs-SimplifiedExpanded-Resolve.dfy(327,15): Error: type test for type 'bool' must be from an expression assignable to it (got 'NewNewInt')
+AsIs-SimplifiedExpanded-Resolve.dfy(359,15): Error: type cast to type 'bool' must be from an expression of a compatible type (got 'int')
+AsIs-SimplifiedExpanded-Resolve.dfy(366,15): Error: type cast to type 'bool' must be from an expression of a compatible type (got 'NewInt')
+AsIs-SimplifiedExpanded-Resolve.dfy(373,15): Error: type cast to type 'bool' must be from an expression of a compatible type (got 'NewNewInt')
+AsIs-SimplifiedExpanded-Resolve.dfy(427,15): Error: type test for type 'DDD' must be from an expression assignable to it (got 'CCC')
+AsIs-SimplifiedExpanded-Resolve.dfy(428,15): Error: type test for type 'EEE' must be from an expression assignable to it (got 'CCC')
+AsIs-SimplifiedExpanded-Resolve.dfy(432,15): Error: type test for type 'CCC' must be from an expression assignable to it (got 'DDD')
+AsIs-SimplifiedExpanded-Resolve.dfy(434,15): Error: type test for type 'EEE' must be from an expression assignable to it (got 'DDD')
+AsIs-SimplifiedExpanded-Resolve.dfy(438,15): Error: type test for type 'CCC' must be from an expression assignable to it (got 'EEE')
+AsIs-SimplifiedExpanded-Resolve.dfy(439,15): Error: type test for type 'DDD' must be from an expression assignable to it (got 'EEE')
+AsIs-SimplifiedExpanded-Resolve.dfy(462,15): Error: type cast to type 'DDD' must be from an expression of a compatible type (got 'CCC')
+AsIs-SimplifiedExpanded-Resolve.dfy(463,15): Error: type cast to reference type 'EEE' must be from an expression of a compatible type (got 'CCC')
+AsIs-SimplifiedExpanded-Resolve.dfy(467,15): Error: type cast to trait type 'CCC' must be from an expression of a compatible type (got 'DDD')
+AsIs-SimplifiedExpanded-Resolve.dfy(469,15): Error: type cast to reference type 'EEE' must be from an expression of a compatible type (got 'DDD')
+AsIs-SimplifiedExpanded-Resolve.dfy(473,15): Error: type cast to trait type 'CCC' must be from an expression of a compatible type (got 'EEE')
+AsIs-SimplifiedExpanded-Resolve.dfy(474,15): Error: type cast to type 'DDD' must be from an expression of a compatible type (got 'EEE')
+AsIs-SimplifiedExpanded-Resolve.dfy(488,16): Error: type test for type '(int, int, int)' must be from an expression assignable to it (got '(Y, Y, Y)')
+AsIs-SimplifiedExpanded-Resolve.dfy(495,16): Error: type test for type '(int, int, int)' must be from an expression assignable to it (got 'Triple<Y>')
+AsIs-SimplifiedExpanded-Resolve.dfy(502,16): Error: type test for type '(int, int, int)' must be from an expression assignable to it (got 'TA<Y>')
+AsIs-SimplifiedExpanded-Resolve.dfy(509,16): Error: type test for type '(int, int, int)' must be from an expression assignable to it (got 'TB<Y>')
+AsIs-SimplifiedExpanded-Resolve.dfy(516,17): Error: type test for type '(int, int, int)' must be from an expression assignable to it (got 'TBB<Y>')
+AsIs-SimplifiedExpanded-Resolve.dfy(528,16): Error: type cast to type '(int, int, int)' must be from an expression of a compatible type (got '(Y, Y, Y)')
+AsIs-SimplifiedExpanded-Resolve.dfy(535,16): Error: type cast to type '(int, int, int)' must be from an expression of a compatible type (got 'Triple<Y>')
+AsIs-SimplifiedExpanded-Resolve.dfy(542,16): Error: type cast to type '(int, int, int)' must be from an expression of a compatible type (got 'TA<Y>')
+AsIs-SimplifiedExpanded-Resolve.dfy(549,16): Error: type cast to type '(int, int, int)' must be from an expression of a compatible type (got 'TB<Y>')
+AsIs-SimplifiedExpanded-Resolve.dfy(556,17): Error: type cast to type '(int, int, int)' must be from an expression of a compatible type (got 'TBB<Y>')
+188 resolution/type errors detected in AsIs-SimplifiedExpanded-Resolve.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-UnusedTypeParameters.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-UnusedTypeParameters.dfy
new file mode 100644
index 00000000000..96479ca5f70
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-UnusedTypeParameters.dfy
@@ -0,0 +1,70 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 --refresh-exit-code=4 "%s"
+
+module UnusedTypeParametersOfSubtypeTypes {
+  trait T<X> { }
+  class D<X1> extends T<(int, seq<X1>)> { }
+  type F<X2, Unused> = d: D<X2> | true witness * // the legacy resolver treats F as a reference type, and bogusly wants all parameters to be equal in order to have type compatibility
+
+  method Test<X>(f: F<X, X>, g: F<X, int>) {
+    if * {
+      var h: F<X, X>;
+      h := f;
+      h := g;
+    } else {
+      var h: F<X, int>;
+      h := g;
+      h := f;
+    }
+
+    var s0: seq<F<X, X>> := [f, f, f];
+    var s1: seq<F<X, int>> := [g, g, g];
+    if * {
+      s0 := s1;
+    } else {
+      s1 := s0;
+    }
+  }
+
+  method Test1<X>(f: F<X, X>, g: F<X, int>) {
+    var c0: C<F<X, int>> := new C<F<X, int>>(g);
+    var c1: C<F<X, X>> := new C<F<X, X>>(f);
+
+    // The resolver should treat the following three consistently. That is, it should either disallow all three
+    // or allow all three. (It allows all three.) The verifier should also treat the three consistently (which,
+    // for the way unused type parameters in subset types are currently treated, is to say that all three branches
+    // causes a verification error).
+    if
+    case true =>
+      var b: bool := c1 is C<F<X, int>>;
+      assert b; // error: this may not hold
+    case true =>
+      c0 := c1; // error: RHS value not assignable to LHS
+    case true =>
+      c0 := c1 as C<F<X, int>>; // error: precondition of "as" may not be satisfied
+  }
+
+  method Test2<X>(f: F<X, X>, g: F<X, int>) {
+    var c0: C<F<X, int>> := new C<F<X, int>>(g);
+    var c1: C<F<X, X>> := new C<F<X, X>>(f);
+
+    // The resolver should treat the following three consistently. That is, it should either disallow all three
+    // or allow all three. (It allows all three.) The verifier should also treat the three consistently (which,
+    // for the way unused type parameters in subset types are currently treated, is to say that all three branches
+    // causes a verification error).
+    if
+    case true =>
+      var b: bool := c0 is C<F<X, X>>;
+      assert b; // error: this may not hold
+    case true =>
+      c1 := c0; // error: RHS value not assignable to LHS
+    case true =>
+      c1 := c0 as C<F<X, X>>; // error: precondition of "as" may not be satisfied
+  }
+
+  class C<Y> {
+    var y: Y
+    constructor (y: Y) {
+      this.y := y;
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-UnusedTypeParameters.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-UnusedTypeParameters.dfy.expect
new file mode 100644
index 00000000000..92bf8181aef
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-UnusedTypeParameters.dfy.expect
@@ -0,0 +1,5 @@
+AsIs-UnusedTypeParameters.dfy(38,24): Error: a type test to 'C<F<X, int>>' must be from a compatible type (got 'C<F<X, X>>')
+AsIs-UnusedTypeParameters.dfy(43,15): Error: a type cast to a reference type (C<F<X, int>>) must be from a compatible type (got C<F<X, X>>); this cast could never succeed
+AsIs-UnusedTypeParameters.dfy(56,24): Error: a type test to 'C<F<X, X>>' must be from a compatible type (got 'C<F<X, int>>')
+AsIs-UnusedTypeParameters.dfy(61,15): Error: a type cast to a reference type (C<F<X, X>>) must be from a compatible type (got C<F<X, int>>); this cast could never succeed
+4 resolution/type errors detected in AsIs-UnusedTypeParameters.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-UnusedTypeParameters.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-UnusedTypeParameters.dfy.refresh.expect
new file mode 100644
index 00000000000..f3fae19559e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs-UnusedTypeParameters.dfy.refresh.expect
@@ -0,0 +1,8 @@
+AsIs-UnusedTypeParameters.dfy(39,6): Error: assertion might not hold
+AsIs-UnusedTypeParameters.dfy(41,12): Error: value of expression (of type 'C<F<X, X>>') is not known to be an instance of type 'C<F<X, int>>'
+AsIs-UnusedTypeParameters.dfy(43,15): Error: value of expression (of type 'C<F<X, X>>') is not known to be an instance of type 'C<F<X, int>>'
+AsIs-UnusedTypeParameters.dfy(57,6): Error: assertion might not hold
+AsIs-UnusedTypeParameters.dfy(59,12): Error: value of expression (of type 'C<F<X, int>>') is not known to be an instance of type 'C<F<X, X>>'
+AsIs-UnusedTypeParameters.dfy(61,15): Error: value of expression (of type 'C<F<X, int>>') is not known to be an instance of type 'C<F<X, X>>'
+
+Dafny program verifier finished with 2 verified, 6 errors
diff --git a/Test/dafny0/AsIs.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs.dfy
similarity index 86%
rename from Test/dafny0/AsIs.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs.dfy
index 7c47bfe98ce..37fe92d26ee 100644
--- a/Test/dafny0/AsIs.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 --refresh-exit-code=2 "%s"
+
 
 trait A<X> { }
 trait B<Y0, Y1> { }
@@ -14,19 +14,19 @@ method AssignBackAndForth<W>(a: A<W>, b: B<int, W>, c: C<W>, k: K<W>, l: L<W>) r
   var o: object?;
 
   o := a;
-  a' := o;
+  a' := o; // (type error with resolver refresh; downcast requires explicit cast)
 
   o := b;
-  b' := o;
+  b' := o; // (type error with resolver refresh; downcast requires explicit cast)
 
   o := c;
-  c' := o;
+  c' := o; // (type error with resolver refresh; downcast requires explicit cast)
 
   o := k;
-  k' := o;
+  k' := o; // (type error with resolver refresh; downcast requires explicit cast)
 
   o := l;
-  l' := o;
+  l' := o; // (type error with resolver refresh; downcast requires explicit cast)
 }
 
 method AsBackAndForth<W>(a: A<W>, b: B<int, W>, c: C<W>, k: K<W>, l: L<W>) returns (a': object, b': object, c': object, k': object, l': object)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs.dfy.expect
new file mode 100644
index 00000000000..e15ef09172f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs.dfy.expect
@@ -0,0 +1,13 @@
+AsIs.dfy(60,27): Error: value of expression (of type 'object') is not known to be an instance of type 'K<W>'
+AsIs.dfy(62,15): Error: value of expression (of type 'object') is not known to be an instance of type 'B<real, W>'
+AsIs.dfy(64,15): Error: value of expression (of type 'object') is not known to be an instance of type 'B<W, int>'
+AsIs.dfy(66,25): Error: value of expression (of type 'object') is not known to be an instance of type 'B<int, int>'
+AsIs.dfy(68,15): Error: value of expression (of type 'object') is not known to be an instance of type 'A<W>'
+AsIs.dfy(119,4): Error: assertion might not hold
+AsIs.dfy(123,4): Error: assertion might not hold
+AsIs.dfy(128,4): Error: assertion might not hold
+AsIs.dfy(139,4): Error: assertion might not hold
+AsIs.dfy(143,4): Error: assertion might not hold
+AsIs.dfy(148,4): Error: assertion might not hold
+
+Dafny program verifier finished with 7 verified, 11 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs.dfy.refresh.expect
new file mode 100644
index 00000000000..7963fb1c021
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIs.dfy.refresh.expect
@@ -0,0 +1,6 @@
+AsIs.dfy(17,5): Error: RHS (of type object?) not assignable to LHS (of type A<W>)
+AsIs.dfy(20,5): Error: RHS (of type object?) not assignable to LHS (of type B<int, W>)
+AsIs.dfy(23,5): Error: RHS (of type object?) not assignable to LHS (of type C<W>)
+AsIs.dfy(26,5): Error: RHS (of type object?) not assignable to LHS (of type K<W>)
+AsIs.dfy(29,5): Error: RHS (of type object?) not assignable to LHS (of type L<W>)
+5 resolution/type errors detected in AsIs.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIsAgain.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIsAgain.dfy
new file mode 100644
index 00000000000..97e04d48e9a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIsAgain.dfy
@@ -0,0 +1,149 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+// This file is like AsIs.dfy, but has explicit type casts in AssignBackAndForth, as required by the new type system.
+trait A<X> { }
+trait B<Y0, Y1> { }
+trait C<Z> extends B<int, Z> { }
+
+class K<U> extends object, B<int, U> { }
+class L<V> extends C<V> { }
+
+method AssignBackAndForth<W>(a: A<W>, b: B<int, W>, c: C<W>, k: K<W>, l: L<W>) returns (a': A<W>, b': B<int, W>, c': C<W>, k': K<W>, l': L<W>)
+  ensures a' == a && b' == b && c' == c && k' == k && l' == l
+{
+  var o: object?;
+
+  o := a;
+  a' := o as A;
+
+  o := b;
+  b' := o as B;
+
+  o := c;
+  c' := o as C;
+
+  o := k;
+  k' := o as K;
+
+  o := l;
+  l' := o as L;
+}
+
+method AsBackAndForth<W>(a: A<W>, b: B<int, W>, c: C<W>, k: K<W>, l: L<W>) returns (a': object, b': object, c': object, k': object, l': object)
+  ensures a' == a && b' == b && c' == c && k' == k && l' == l
+{
+  var o: object?;
+
+  o := a;
+  a' := o as A<W>;
+
+  o := b;
+  b' := o as B<int, W>;
+
+  o := c;
+  c' := o as C<W>;
+
+  o := k;
+  k' := o as K<W>;
+
+  o := l;
+  l' := o as L<W>;
+}
+
+method BadCasts<W>(k: K<W>, l: L<W>) {
+  var o: object := k as object;
+  if
+  case true =>
+    var b := k as B<int, W>;
+    var b' := l as B<int, W>;
+    var p := b as object as K<W>;
+    var p' := b' as object as K<W>; // error
+  case true =>
+    var b := o as B<real, W>; // error
+  case true =>
+    var b := o as B<W, int>; // error
+  case true =>
+    var b := k as object as B<int, int>; // error
+  case true =>
+    var b := o as A<W>; // error
+}
+
+method CastsAfterTypeTests<W>(k: K<W>, l: L<W>) {
+  var o: object := k as object;
+  if
+  case l as object is K<W> =>
+    var p' := l as object as K<W>; // this verifies
+    assert false; // and so does this
+  case o is B<real, W> =>
+    var b := o as B<real, W>;
+  case o is B<W, int> =>
+    var b := o as B<W, int>;
+  case k as object is B<int, int> =>
+    var b := k as object as B<int, int>;
+  case o is A<W> =>
+    var b := o as A<W>;
+  case k is K<W> =>
+    assert k == k as K<W>;
+}
+
+trait TraitA<X> { }
+class ClassQ<Y> extends TraitA<Y> { }
+method ParsingSuccessors<U>(t: TraitA<U>) {
+  var b;
+  b := if t is ClassQ<U> then true else false;
+  b := t is ClassQ<U> && t is ClassQ<U>;
+  b := t is ClassQ<U> || t is ClassQ<U>;
+  b := t is ClassQ<U> ==> t is ClassQ<U>;
+  b := t is ClassQ<U> <== t is ClassQ<U>;
+  b := t is ClassQ<U> <==> t is ClassQ<U>;
+  assert b;
+}
+
+class SupersetClass {
+  const n: int
+  constructor (n: int)
+    ensures this.n == n
+  {
+    this.n := n;
+  }
+}
+
+type SubsetClass = s: SupersetClass | s.n == 10 witness *
+
+method SubsetConstraints() {
+  var a: SupersetClass := new SupersetClass(8);
+  var b: SupersetClass := new SupersetClass(10);
+  var aa: SupersetClass?, bb: SupersetClass? := a, b;
+  if
+  case true =>
+    assert a is SubsetClass; // error
+  case true =>
+    assert b is SubsetClass;
+  case true =>
+    assert aa is SubsetClass; // error
+  case true =>
+    assert bb is SubsetClass;
+  case true =>
+    var aa: SupersetClass? := null;
+    assert aa is SubsetClass; // error
+}
+
+type Array = a: array<int> | a.Length == 10 witness *
+
+method SubsetConstraintsArrays() {
+  var arr := new int[8];
+  var brr := new int[10];
+  var aar: array?<int>, bbr: array?<int> := arr, brr;
+  if
+  case true =>
+    assert arr is Array; // error
+  case true =>
+    assert brr is Array;
+  case true =>
+    assert aar is Array; // error
+  case true =>
+    assert bbr is Array;
+  case true =>
+    var xrr: array?<int> := null;
+    assert xrr is Array; // error
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIsAgain.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIsAgain.dfy.expect
new file mode 100644
index 00000000000..191f49efd16
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AsIsAgain.dfy.expect
@@ -0,0 +1,13 @@
+AsIsAgain.dfy(60,27): Error: value of expression (of type 'object') is not known to be an instance of type 'K<W>'
+AsIsAgain.dfy(62,15): Error: value of expression (of type 'object') is not known to be an instance of type 'B<real, W>'
+AsIsAgain.dfy(64,15): Error: value of expression (of type 'object') is not known to be an instance of type 'B<W, int>'
+AsIsAgain.dfy(66,25): Error: value of expression (of type 'object') is not known to be an instance of type 'B<int, int>'
+AsIsAgain.dfy(68,15): Error: value of expression (of type 'object') is not known to be an instance of type 'A<W>'
+AsIsAgain.dfy(119,4): Error: assertion might not hold
+AsIsAgain.dfy(123,4): Error: assertion might not hold
+AsIsAgain.dfy(128,4): Error: assertion might not hold
+AsIsAgain.dfy(139,4): Error: assertion might not hold
+AsIsAgain.dfy(143,4): Error: assertion might not hold
+AsIsAgain.dfy(148,4): Error: assertion might not hold
+
+Dafny program verifier finished with 7 verified, 11 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Assigned.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Assigned.dfy
new file mode 100644
index 00000000000..7d0d575bdf8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Assigned.dfy
@@ -0,0 +1,42 @@
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class C<G>
+{
+  var x: G
+  const y: G
+  
+  constructor Con0(i: int, a: G, b: G)
+  {
+    x := a;
+    y := b;
+    assert assigned(x);
+    assert assigned(y);
+    new;
+    if i > 0 {
+      x := y;
+    }
+  }
+  
+  constructor Con1(i: int, a: G, b: G)
+  {
+    x := a;
+    assert assigned(x);
+    assume {:axiom} assigned(y);
+    new;
+    if i > 0 {
+      x := y;
+    }
+  }
+}
+
+method M0<G>(x: int, a: G, b: G) returns (y: G)
+{
+  if x < 10 {
+    y := a;
+  } else if x < 20 {
+    return b;
+  } else {
+    assume {:axiom} assigned(y);
+  }
+}
diff --git a/Test/dafny2/SegmentSum.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Assigned.dfy.expect
similarity index 100%
rename from Test/dafny2/SegmentSum.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Assigned.dfy.expect
diff --git a/Test/dafny0/AssumptionVariables0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AssumptionVariables0.dfy
similarity index 95%
rename from Test/dafny0/AssumptionVariables0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AssumptionVariables0.dfy
index 7ae4357a814..b6f2d2ea568 100644
--- a/Test/dafny0/AssumptionVariables0.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AssumptionVariables0.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module UsageTests {
diff --git a/Test/dafny0/AssumptionVariables0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AssumptionVariables0.dfy.expect
similarity index 100%
rename from Test/dafny0/AssumptionVariables0.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AssumptionVariables0.dfy.expect
diff --git a/Test/dafny0/AssumptionVariables1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AssumptionVariables1.dfy
similarity index 80%
rename from Test/dafny0/AssumptionVariables1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AssumptionVariables1.dfy
index 178c1d70966..81493451635 100644
--- a/Test/dafny0/AssumptionVariables1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AssumptionVariables1.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args --relax-definite-assignment --boogie=/print:%t.bprint --print="%t.print" "%s" > "%t"
+// RUN: %verify --relax-definite-assignment --boogie=/print:%t.bprint --print="%t.print" "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method test0(x: int)
diff --git a/Test/dafny1/ListCopy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AssumptionVariables1.dfy.expect
similarity index 100%
rename from Test/dafny1/ListCopy.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AssumptionVariables1.dfy.expect
diff --git a/Test/dafny0/AttributeChecks.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AttributeChecks.dfy
similarity index 89%
rename from Test/dafny0/AttributeChecks.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AttributeChecks.dfy
index 3f7f54b9eff..5803b437776 100644
--- a/Test/dafny0/AttributeChecks.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AttributeChecks.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" /dprint:- /compile:0 /env:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --print=- --reads-clauses-on-methods
+
 
 module JustAboutEverything {
   method If(n: int) returns (k: int)
@@ -108,6 +108,7 @@ module JustAboutEverything {
 
   ghost function FAttr(x: int): int
     requires {:myAttr false + 3} true // error: false + 3 is ill-typed
+    reads {:myAttr false + 3} {} // error: false + 3 is ill-typed
     ensures {:myAttr false + 3} true // error: false + 3 is ill-typed
     decreases {:myAttr false + 3} x // error: false + 3 is ill-typed
   {
@@ -116,6 +117,7 @@ module JustAboutEverything {
 
   ghost function GAttr(x: int): int
     requires {:myAttr old(3)} true // error: old is not allowed here
+    reads {:myAttr old(3)} {} // error: old is not allowed here
     ensures {:myAttr old(3)} true // error: old is not allowed here
     decreases {:myAttr old(3)} x // error: old is not allowed here
   {
@@ -124,6 +126,7 @@ module JustAboutEverything {
 
   ghost function HAttr(x: int): (r: int)
     requires {:myAttr x, r} true // error: r is not in scope here
+    reads {:myAttr x, r} {} // error: r is not in scope here
     ensures {:myAttr x, r} true
     decreases {:myAttr x, r} x // error: r is not in scope here
   {
@@ -132,6 +135,7 @@ module JustAboutEverything {
 
   twostate function F2Attr(x: int): int
     requires {:myAttr false + 3} true // error: false + 3 is ill-typed
+    reads {:myAttr false + 3} {} // error: false + 3 is ill-typed
     ensures {:myAttr false + 3} true // error: false + 3 is ill-typed
     decreases {:myAttr false + 3} x // error: false + 3 is ill-typed
   {
@@ -140,6 +144,7 @@ module JustAboutEverything {
 
   twostate function G2Attr(x: int): int
     requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
     ensures {:myAttr old(3)} true
     decreases {:myAttr old(3)} x
   {
@@ -148,6 +153,7 @@ module JustAboutEverything {
 
   twostate function H2Attr(x: int): (r: int)
     requires {:myAttr x, r} true // error: r is not in scope here
+    reads {:myAttr x, r} true // error: r is not in scope here
     ensures {:myAttr x, r} true
     decreases {:myAttr x, r} x // error: r is not in scope here
   {
@@ -156,6 +162,7 @@ module JustAboutEverything {
 
   method MAttr(x: int) returns (y: int)
     requires {:myAttr false + 3} true // error: false + 3 is ill-typed
+    reads {:myAttr false + 3} {} // error: false + 3 is ill-typed
     modifies {:myAttr false + 3} {} // error: false + 3 is ill-typed
     ensures {:myAttr false + 3} true // error: false + 3 is ill-typed
     decreases {:myAttr false + 3} x // error: false + 3 is ill-typed
@@ -164,6 +171,7 @@ module JustAboutEverything {
 
   method NAttr(x: int) returns (y: int)
     requires {:myAttr old(3)} true // error: old is not allowed here
+    reads {:myAttr old(3)} {} // error: old is not allowed here
     modifies {:myAttr old(3)} {} // error: old is not allowed here
     ensures {:myAttr old(3)} true
     decreases {:myAttr old(3)} x // error: old is not allowed here
@@ -172,6 +180,7 @@ module JustAboutEverything {
 
   method OAttr(x: int) returns (y: int)
     requires {:myAttr x, y} true // error: y is not in scope here
+    reads {:myAttr x, y} {} // error: y is not in scope here
     modifies {:myAttr x, y} {} // error: y is not in scope here
     ensures {:myAttr x, y} true
     decreases {:myAttr x, y} x // error: y is not in scope here
@@ -180,7 +189,8 @@ module JustAboutEverything {
 
   twostate lemma M2Attr(x: int) returns (y: int)
     requires {:myAttr false + 3} true // error: false + 3 is ill-typed
-    modifies {:myAttr false + 3} {} // error (x2): false + 3 is ill-typed, and twostate lemma cannot have modifies clause
+    reads {:myAttr false + 3} {} // error: false + 3 is ill-typed
+    modifies {:myAttr false + 3} {} // error: false + 3 is ill-typed
     ensures {:myAttr false + 3} true // error: false + 3 is ill-typed
     decreases {:myAttr false + 3} x // error: false + 3 is ill-typed
   {
@@ -188,7 +198,8 @@ module JustAboutEverything {
 
   twostate lemma N2Attr(x: int) returns (y: int)
     requires {:myAttr old(3)} true
-    modifies {:myAttr old(3)} {} // error (x2): old is not allowed here, and twostate lemma cannot have modifies clause
+    reads {:myAttr old(3)} {} // error: old is not allowed here
+    modifies {:myAttr old(3)} {} // error: old is not allowed here
     ensures {:myAttr old(3)} true
     decreases {:myAttr old(3)} x // error: old is not allowed here
   {
@@ -196,7 +207,8 @@ module JustAboutEverything {
 
   twostate lemma O2Attr(x: int) returns (y: int)
     requires {:myAttr x, y} true // error: y is not in scope here
-    modifies {:myAttr x, y} {} // error (x2): y is not in scope here, and twostate lemma cannot have modifies clause
+    reads {:myAttr x, y} {} // error: y is not in scope here
+    modifies {:myAttr x, y} {} // error: y is not in scope here
     ensures {:myAttr x, y} true
     decreases {:myAttr x, y} x // error: y is not in scope here
   {
@@ -205,6 +217,7 @@ module JustAboutEverything {
   iterator Iter(x: int) yields (y: int)
     requires {:myAttr false + 3} true // error: false + 3 is ill-typed
     yield requires {:myAttr false + 3} true // error: false + 3 is ill-typed
+    reads {:myAttr false + 3} {} // error: false + 3 is ill-typed
     modifies {:myAttr false + 3} {} // error: false + 3 is ill-typed
     yield ensures {:myAttr false + 3} true // error: false + 3 is ill-typed
     ensures {:myAttr false + 3} true // error: false + 3 is ill-typed
@@ -215,6 +228,7 @@ module JustAboutEverything {
   iterator Jter(x: int) yields (y: int)
     requires {:myAttr old(3)} true // error: old is not allowed here
     yield requires {:myAttr old(3)} true // error: old is not allowed here
+    reads {:myAttr old(3)} {} // error: old is not allowed here
     modifies {:myAttr old(3)} {} // error: old is not allowed here
     yield ensures {:myAttr old(3)} true
     ensures {:myAttr old(3)} true
@@ -225,6 +239,7 @@ module JustAboutEverything {
   iterator Kter(x: int) yields (y: int)
     requires {:myAttr x, y, ys} true // error (x2): y and ys are not in scope here
     yield requires {:myAttr x, y, ys} true // these are allowed (but it would be weird for anyone to use y and ys here)
+    reads {:myAttr x, y, ys} {} // error (x2): y and ys are not in scope here
     modifies {:myAttr x, y, ys} {} // error (x2): y and ys are not in scope here
     yield ensures {:myAttr x, y, ys} true
     ensures {:myAttr x, y, ys} true
@@ -494,3 +509,29 @@ module TopLevelAttributesModule {
   module {:myAttr this} Module { // error: "this" is not allowed here
   }
 }
+
+module MethodFrameClausesNotAllowed {
+  lemma Lemma(x: int)
+    reads {} // error: lemma cannot have reads clause
+    modifies {} // error: lemma cannot have modifies clause
+  {
+  }
+
+  twostate lemma TwoStateLemma(x: int)
+    reads {} // error: twostate lemma cannot have reads clause
+    modifies {} // error: twostate lemma cannot have modifies clause
+  {
+  }
+
+  least lemma LeastLemma(x: int)
+    reads {} // error: least lemma cannot have reads clause
+    modifies {} // error: least lemma cannot have modifies clause
+  {
+  }
+
+  greatest lemma GreatestLemma(x: int)
+    reads {} // error: greatest lemma cannot have reads clause
+    modifies {} // error: greatest lemma cannot have modifies clause
+  {
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AttributeChecks.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AttributeChecks.dfy.expect
new file mode 100644
index 00000000000..f621707a483
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AttributeChecks.dfy.expect
@@ -0,0 +1,708 @@
+// AttributeChecks.dfy
+
+
+module JustAboutEverything {
+  method If(n: int) returns (k: int)
+  {
+    var i := 0;
+    if {:split true} i < n {
+      if {:split 1 + 0} true {
+      }
+    } else if {:split false} i > n {
+    } else {:split true} {
+    }
+  }
+
+  method IfAlt(n: int) returns (k: int)
+  {
+    var i := 0;
+    if {:split true}
+    case {:split 1 + true} i < n =>
+      if {:split 1 + k} true {
+      }
+    case {:split false} i > n =>
+      {
+      }
+      return 2;
+  }
+
+  method While(n: int) returns (k: int)
+  {
+    var f: int -> int := x => x;
+    var i := 0;
+    while {:split true} {:split true + k} i < n
+      invariant forall u :: f(u) == u + i
+    {
+    }
+    return 2;
+  }
+
+  method WhileAlt(n: int) returns (k: int)
+  {
+    var i := 0;
+    var f: int -> int := x => x;
+    while {:split}
+      invariant forall u :: f(u) == u + i
+    {
+      case {:split 1 + true} i < n =>
+        {
+        }
+      case {:split false} i > n =>
+        return 2;
+    }
+  }
+
+  method Match(xs: List<int>) returns (r: int)
+  {
+    match {:split 1} xs {
+      case {:split false} Cons(y, z) =>
+        return y;
+      case {:split 1 + false} Nil =>
+        return 0;
+    }
+  }
+
+  function CaseExpr(r: List<int>): List<int>
+  {
+    match r {
+      case Nil =>
+        Nil
+    }
+  }
+
+  method Calc(x: int, y: int)
+  {
+    calc {:split 1} {:split 1 + false} {
+      x + y;
+      {
+        assume x == 0;
+      }
+      y;
+    }
+    assert x == 0;
+  }
+
+  method ForAll(i: int, j: int, arr: array2<int>)
+  {
+    forall i, j {:split 1 + false} {:split i + j} | i in {-3, 4} && j in {1, 2} {
+      arr[i, j] := 0;
+    }
+  }
+
+  method AssertBy(x: int, y: int)
+  {
+    assert {:split false + x} {:split} x == 6 by {
+      assume x == 6;
+      assume y == 8;
+    }
+    assert {:split} y == 8;
+  }
+
+  method For(lo: int, hi: int) returns (k: int)
+    requires lo <= hi
+  {
+    var f: int -> int := x => x;
+    for {:split i} {:split true + k} i := lo to hi
+      invariant forall u :: f(u) == u + i
+    {
+    }
+    return 2;
+  }
+
+  ghost function FAttr(x: int): int
+    requires {:myAttr false + 3} true
+    reads {:myAttr false + 3} {}
+    ensures {:myAttr false + 3} true
+    decreases {:myAttr false + 3} x
+  {
+    10
+  }
+
+  ghost function GAttr(x: int): int
+    requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
+    ensures {:myAttr old(3)} true
+    decreases {:myAttr old(3)} x
+  {
+    10
+  }
+
+  ghost function HAttr(x: int): (r: int)
+    requires {:myAttr x, r} true
+    reads {:myAttr x, r} {}
+    ensures {:myAttr x, r} true
+    decreases {:myAttr x, r} x
+  {
+    10
+  }
+
+  twostate function F2Attr(x: int): int
+    requires {:myAttr false + 3} true
+    reads {:myAttr false + 3} {}
+    ensures {:myAttr false + 3} true
+    decreases {:myAttr false + 3} x
+  {
+    10
+  }
+
+  twostate function G2Attr(x: int): int
+    requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
+    ensures {:myAttr old(3)} true
+    decreases {:myAttr old(3)} x
+  {
+    10
+  }
+
+  twostate function H2Attr(x: int): (r: int)
+    requires {:myAttr x, r} true
+    reads {:myAttr x, r} true
+    ensures {:myAttr x, r} true
+    decreases {:myAttr x, r} x
+  {
+    10
+  }
+
+  method MAttr(x: int) returns (y: int)
+    requires {:myAttr false + 3} true
+    reads {:myAttr false + 3} {}
+    modifies {:myAttr false + 3} {}
+    ensures {:myAttr false + 3} true
+    decreases {:myAttr false + 3} x
+  {
+  }
+
+  method NAttr(x: int) returns (y: int)
+    requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
+    modifies {:myAttr old(3)} {}
+    ensures {:myAttr old(3)} true
+    decreases {:myAttr old(3)} x
+  {
+  }
+
+  method OAttr(x: int) returns (y: int)
+    requires {:myAttr x, y} true
+    reads {:myAttr x, y} {}
+    modifies {:myAttr x, y} {}
+    ensures {:myAttr x, y} true
+    decreases {:myAttr x, y} x
+  {
+  }
+
+  twostate lemma M2Attr(x: int) returns (y: int)
+    requires {:myAttr false + 3} true
+    reads {:myAttr false + 3} {}
+    modifies {:myAttr false + 3} {}
+    ensures {:myAttr false + 3} true
+    decreases {:myAttr false + 3} x
+  {
+  }
+
+  twostate lemma N2Attr(x: int) returns (y: int)
+    requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
+    modifies {:myAttr old(3)} {}
+    ensures {:myAttr old(3)} true
+    decreases {:myAttr old(3)} x
+  {
+  }
+
+  twostate lemma O2Attr(x: int) returns (y: int)
+    requires {:myAttr x, y} true
+    reads {:myAttr x, y} {}
+    modifies {:myAttr x, y} {}
+    ensures {:myAttr x, y} true
+    decreases {:myAttr x, y} x
+  {
+  }
+
+  method ModifyStatement(s: set<object>)
+  {
+    modify {:myAttr false + 3} s;
+  }
+
+  method LocalVariablesAndAssignments(opt: Option<int>, mustHave: MustHave<int>) returns (r: Option<int>)
+  {
+    var {:boolAttr false + 3} a: int, {:boolAttr false + 3} b: int;
+    var x, y := 10 {:boolAttr false + 3}, 20 {:boolAttr false + 3};
+    x, y := 10 {:boolAttr false + 3}, 20 {:boolAttr false + 3};
+    var {:boolAttr false + 3} u0 := If(13);
+    var u1 := If(13) {:boolAttr false + 3};
+    u1 := If(13) {:boolAttr false + 3};
+    var {:boolAttr false + 3} k0: int := *;
+    var k1: int := * {:boolAttr false + 3};
+    k1 := * {:boolAttr false + 3};
+    var {:boolAttr false + 3} c0 := new CClass;
+    var c1 := new CClass {:boolAttr false + 3};
+    c1 := new CClass {:boolAttr false + 3};
+    var {:boolAttr false + 3} d0 := new DClass();
+    var d1 := new DClass() {:boolAttr false + 3};
+    d1 := new DClass() {:boolAttr false + 3};
+    var s := {101};
+    var {:boolAttr false + 3} w0 :| w0 in s;
+    var {:boolAttr false + 3} w1, {:boolAttr false + 3} w2 :| w1 in s && w2 in s;
+    w1, w2 :| assume {:boolAttr false + 3} w1 in s && w2 in s;
+    var {:boolAttr false + 3} f0 :- opt;
+    var {:boolAttr false + 3} f1, {:boolAttr false + 3} f2 :- opt, true;
+    var {:boolAttr false + 3} f3 :- GiveOption();
+    var {:boolAttr false + 3} f4, {:boolAttr false + 3} f5 :- GiveOptions();
+    var g0 :- opt {:boolAttr false + 3};
+    var g1, g2 :- opt {:boolAttr false + 3}, true {:boolAttr false + 3};
+    var g3, g4, g5 :- opt {:boolAttr false + 3}, true {:boolAttr false + 4}, true {:boolAttr false + 5};
+    var g6 :- GiveOption() {:boolAttr false + 3};
+    var g7, g8 :- GiveOptions() {:boolAttr false + 3};
+    :- mustHave {:boolAttr false + 3};
+    :- GiveMustHave() {:boolAttr false + 3};
+    var p0 :- assert {:boolAttr false + 3} opt;
+    var p1 :- assume {:boolAttr false + 3} opt;
+    var p2 :- expect {:boolAttr false + 3} opt;
+    p0 :- assert {:boolAttr false + 3} opt;
+    p1 :- assume {:boolAttr false + 3} opt;
+    p2 :- expect {:boolAttr false + 3} opt;
+    var q0 :- assert {:boolAttr false + 3} GiveOption();
+    var q1 :- assume {:boolAttr false + 3} GiveOption();
+    var q2 :- expect {:boolAttr false + 3} GiveOption();
+    q0 :- assert {:boolAttr false + 3} GiveOption();
+    q1 :- assume {:boolAttr false + 3} GiveOption();
+    q2 :- expect {:boolAttr false + 3} GiveOption();
+    var i := var a, b {:boolAttr false + 3} :| a == 0 && b == 1; 100;
+  }
+
+  ghost function ExtendedPrintExpr(): int
+  {
+    var a, b {:boolAttr false + 3} :| a == 0 && b == 1;
+    100
+  }
+
+  method GiveOption() returns (r: Option<int>)
+
+  method GiveOptions() returns (r: Option<int>, s: int)
+
+  method GiveMustHave() returns (r: MustHave<int>)
+
+  datatype List<T> = Nil | Cons(hd: T, tl: List<T>)
+
+  datatype {:dt 0} {:dt false + 3} Datatype = {:dt k, this} Blue | {:dt 50} Green
+
+  datatype {:dt 0} {:dt false + 3} AnotherDatatype = {:dt 50} Blue | {:dt k, this} Green
+
+  iterator Iter(x: int) yields (y: int)
+    requires {:myAttr false + 3} true
+    reads {:myAttr false + 3} {}
+    modifies {:myAttr false + 3} {}
+    yield requires {:myAttr false + 3} true
+    yield ensures {:myAttr false + 3} true
+    ensures {:myAttr false + 3} true
+    decreases {:myAttr false + 3} x
+  {
+  }
+
+  iterator Jter(x: int) yields (y: int)
+    requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
+    modifies {:myAttr old(3)} {}
+    yield requires {:myAttr old(3)} true
+    yield ensures {:myAttr old(3)} true
+    ensures {:myAttr old(3)} true
+    decreases {:myAttr old(3)} x
+  {
+  }
+
+  iterator Kter(x: int) yields (y: int)
+    requires {:myAttr x, y, ys} true
+    reads {:myAttr x, y, ys} {}
+    modifies {:myAttr x, y, ys} {}
+    yield requires {:myAttr x, y, ys} true
+    yield ensures {:myAttr x, y, ys} true
+    ensures {:myAttr x, y, ys} true
+    decreases {:myAttr x, y, ys} x
+  {
+  }
+
+  class CClass { }
+
+  class DClass {
+    constructor ()
+    {
+    }
+  }
+
+  datatype Option<+T> = None | Some(value: T) {
+    predicate IsFailure()
+    {
+      None?
+    }
+
+    function PropagateFailure<U>(): Option<U>
+      requires None?
+    {
+      None
+    }
+
+    function Extract(): T
+      requires Some?
+    {
+      value
+    }
+  }
+
+  datatype MustHave<+T> = HasIt | DoesNotHave(value: T) {
+    predicate IsFailure()
+    {
+      DoesNotHave?
+    }
+
+    function PropagateFailure(): Option<T>
+      requires DoesNotHave?
+    {
+      None
+    }
+  }
+}
+
+module {:myAttr false + 3} {:myAttr old(3)} {:myAttr k} Modu {
+}
+
+module TwoStateAttributes {
+  class C {
+    var data: int
+
+    ghost function {:myAttr old(data), x, r} F(x: int): (r: int)
+
+    twostate function {:myAttr old(data), x, r} F2(x: int): (r: int)
+
+    lemma {:myAttr old(data), x, y} L(x: int) returns (y: int)
+
+    twostate lemma {:myAttr old(data), x, y} L2(x: int) returns (y: int)
+
+    method {:myAttr old(data), x, y} M(x: int) returns (y: int)
+
+    least predicate {:myAttr old(data), x} LP(x: int)
+
+    least lemma {:myAttr old(data), x} LL(x: int)
+  }
+}
+
+module TopLevelAttributes {
+  iterator {:myAttr x} {:myAttr y} {:myAttr this} {:myAttr ys} {:myAttr old(arr[0])} Iterator(x: int, arr: array<int>) yields (y: int)
+    requires arr.Length != 0
+
+  type {:myAttr this} {:myAttr N} Opaque {
+    const N: int
+  }
+
+  type {:myAttr this} Subset = x: int
+    | true
+
+  type {:myAttr this} Synonym = int
+
+  newtype {:myAttr this} {:myAttr N} Newtype = x: int
+    | true
+  {
+    const N: int
+  }
+
+  trait {:myAttr this} {:myAttr x} Trait {
+    var x: int
+  }
+
+  class {:myAttr this} {:myAttr x} Class {
+    var x: int
+  }
+
+  datatype {:myAttr this} {:myAttr Ctor?} {:myAttr y} {:myAttr N} Datatype = Ctor(y: int) {
+    const N: int
+  }
+
+  codatatype {:myAttr this} {:myAttr Ctor?} {:myAttr y} {:myAttr N} CoDatatype = Ctor(y: int) {
+    const N: int
+  }
+}
+
+module TopLevelAttributesModule {
+
+  module {:myAttr this} Module {
+  }
+}
+
+module MethodFrameClausesNotAllowed {
+  lemma Lemma(x: int)
+    reads {}
+    modifies {}
+  {
+  }
+
+  twostate lemma TwoStateLemma(x: int)
+    reads {}
+    modifies {}
+  {
+  }
+
+  least lemma LeastLemma(x: int)
+    reads {}
+    modifies {}
+  {
+  }
+
+  greatest lemma GreatestLemma(x: int)
+    reads {}
+    modifies {}
+  {
+  }
+}
+AttributeChecks.dfy(19,19): Error: type of left argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(19,19): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(29,37): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(29,37): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(43,21): Error: type of left argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(43,21): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(53,21): Error: type of left argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(53,21): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(68,30): Error: type of left argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(68,30): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(78,27): Error: type of left argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(78,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(85,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(85,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(96,32): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(96,32): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(110,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(111,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(112,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(113,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(110,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(111,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(112,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(113,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(119,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(120,19): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(121,21): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(122,23): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(128,25): Error: unresolved identifier: r
+AttributeChecks.dfy(129,22): Error: unresolved identifier: r
+AttributeChecks.dfy(131,26): Error: unresolved identifier: r
+AttributeChecks.dfy(137,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(138,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(139,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(140,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(137,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(138,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(139,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(140,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(155,25): Error: unresolved identifier: r
+AttributeChecks.dfy(156,22): Error: unresolved identifier: r
+AttributeChecks.dfy(158,26): Error: unresolved identifier: r
+AttributeChecks.dfy(156,25): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got bool)
+AttributeChecks.dfy(164,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(165,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(166,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(168,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(167,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(164,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(165,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(166,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(168,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(167,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(173,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(174,19): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(175,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(177,23): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(182,25): Error: unresolved identifier: y
+AttributeChecks.dfy(183,22): Error: unresolved identifier: y
+AttributeChecks.dfy(184,25): Error: unresolved identifier: y
+AttributeChecks.dfy(186,26): Error: unresolved identifier: y
+AttributeChecks.dfy(191,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(192,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(193,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(195,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(194,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(191,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(192,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(193,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(195,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(194,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(201,19): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(202,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(204,23): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(209,25): Error: unresolved identifier: y
+AttributeChecks.dfy(210,22): Error: unresolved identifier: y
+AttributeChecks.dfy(211,25): Error: unresolved identifier: y
+AttributeChecks.dfy(213,26): Error: unresolved identifier: y
+AttributeChecks.dfy(251,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(251,26): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(257,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(258,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(262,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(263,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(265,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(266,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(269,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(270,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(271,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(274,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(275,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(276,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(279,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(280,42): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(281,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(282,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(283,44): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(284,40): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(288,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(290,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(291,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(295,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(298,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(300,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(301,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(304,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(306,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(307,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(311,35): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(313,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(314,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(316,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(317,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(318,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(320,44): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(321,49): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(323,33): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(324,39): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(327,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(328,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(329,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(330,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(331,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(332,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(335,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(336,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(337,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(338,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(339,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(340,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(344,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(257,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(258,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(262,26): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(263,26): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(265,26): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(266,26): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(269,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(270,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(271,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(274,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(275,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(276,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(279,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(280,42): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(281,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(282,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(283,44): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(284,40): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(288,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(290,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(291,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(295,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(298,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(300,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(301,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(304,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(306,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(307,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(311,35): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(313,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(314,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(316,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(317,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(318,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(320,44): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(321,49): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(323,33): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(324,39): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(327,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(328,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(329,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(330,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(331,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(332,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(335,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(336,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(337,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(338,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(339,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(340,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(344,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(350,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(350,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(104,9): Error: unresolved identifier: k
+AttributeChecks.dfy(104,12): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(103,30): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(103,30): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(107,27): Error: unresolved identifier: k
+AttributeChecks.dfy(107,30): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(106,30): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(106,30): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(224,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(221,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(218,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(219,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(222,33): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(223,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(224,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(221,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(218,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(219,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(222,33): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(223,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(235,23): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(232,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(229,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(230,28): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(246,26): Error: unresolved identifier: y
+AttributeChecks.dfy(246,29): Error: unresolved identifier: ys
+AttributeChecks.dfy(243,25): Error: unresolved identifier: y
+AttributeChecks.dfy(243,28): Error: unresolved identifier: ys
+AttributeChecks.dfy(240,25): Error: unresolved identifier: y
+AttributeChecks.dfy(240,28): Error: unresolved identifier: ys
+AttributeChecks.dfy(395,11): Error: unresolved identifier: k
+AttributeChecks.dfy(394,11): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(393,17): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(393,17): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(404,28): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(408,19): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(412,20): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(414,29): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(416,25): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(429,13): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(428,13): Error: unresolved identifier: ys
+AttributeChecks.dfy(427,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(426,13): Error: unresolved identifier: y
+AttributeChecks.dfy(437,13): Error: unresolved identifier: N
+AttributeChecks.dfy(436,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(445,16): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(449,16): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(455,13): Error: unresolved identifier: N
+AttributeChecks.dfy(454,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(465,13): Error: unresolved identifier: x
+AttributeChecks.dfy(464,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(475,13): Error: unresolved identifier: x
+AttributeChecks.dfy(474,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(487,13): Error: unresolved identifier: N
+AttributeChecks.dfy(486,13): Error: unresolved identifier: y
+AttributeChecks.dfy(485,13): Error: unresolved identifier: Ctor?
+AttributeChecks.dfy(484,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(499,13): Error: unresolved identifier: N
+AttributeChecks.dfy(498,13): Error: unresolved identifier: y
+AttributeChecks.dfy(497,13): Error: unresolved identifier: Ctor?
+AttributeChecks.dfy(496,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(509,18): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(515,10): Error: lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+AttributeChecks.dfy(516,13): Error: lemmas are not allowed to have modifies clauses
+AttributeChecks.dfy(521,10): Error: twostate lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+AttributeChecks.dfy(522,13): Error: twostate lemmas are not allowed to have modifies clauses
+AttributeChecks.dfy(527,10): Error: least lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+AttributeChecks.dfy(528,13): Error: least lemmas are not allowed to have modifies clauses
+AttributeChecks.dfy(533,10): Error: greatest lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+AttributeChecks.dfy(534,13): Error: greatest lemmas are not allowed to have modifies clauses
+254 resolution/type errors detected in AttributeChecks.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AttributeChecks.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AttributeChecks.dfy.refresh.expect
new file mode 100644
index 00000000000..d53ea232024
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AttributeChecks.dfy.refresh.expect
@@ -0,0 +1,700 @@
+// AttributeChecks.dfy
+
+
+module JustAboutEverything {
+  method If(n: int) returns (k: int)
+  {
+    var i := 0;
+    if {:split true} i < n {
+      if {:split 1 + 0} true {
+      }
+    } else if {:split false} i > n {
+    } else {:split true} {
+    }
+  }
+
+  method IfAlt(n: int) returns (k: int)
+  {
+    var i := 0;
+    if {:split true}
+    case {:split 1 + true} i < n =>
+      if {:split 1 + k} true {
+      }
+    case {:split false} i > n =>
+      {
+      }
+      return 2;
+  }
+
+  method While(n: int) returns (k: int)
+  {
+    var f: int -> int := x => x;
+    var i := 0;
+    while {:split true} {:split true + k} i < n
+      invariant forall u :: f(u) == u + i
+    {
+    }
+    return 2;
+  }
+
+  method WhileAlt(n: int) returns (k: int)
+  {
+    var i := 0;
+    var f: int -> int := x => x;
+    while {:split}
+      invariant forall u :: f(u) == u + i
+    {
+      case {:split 1 + true} i < n =>
+        {
+        }
+      case {:split false} i > n =>
+        return 2;
+    }
+  }
+
+  method Match(xs: List<int>) returns (r: int)
+  {
+    match {:split 1} xs {
+      case {:split false} Cons(y, z) =>
+        return y;
+      case {:split 1 + false} Nil =>
+        return 0;
+    }
+  }
+
+  function CaseExpr(r: List<int>): List<int>
+  {
+    match r {
+      case Nil =>
+        Nil
+    }
+  }
+
+  method Calc(x: int, y: int)
+  {
+    calc {:split 1} {:split 1 + false} {
+      x + y;
+      {
+        assume x == 0;
+      }
+      y;
+    }
+    assert x == 0;
+  }
+
+  method ForAll(i: int, j: int, arr: array2<int>)
+  {
+    forall i, j {:split 1 + false} {:split i + j} | i in {-3, 4} && j in {1, 2} {
+      arr[i, j] := 0;
+    }
+  }
+
+  method AssertBy(x: int, y: int)
+  {
+    assert {:split false + x} {:split} x == 6 by {
+      assume x == 6;
+      assume y == 8;
+    }
+    assert {:split} y == 8;
+  }
+
+  method For(lo: int, hi: int) returns (k: int)
+    requires lo <= hi
+  {
+    var f: int -> int := x => x;
+    for {:split i} {:split true + k} i := lo to hi
+      invariant forall u :: f(u) == u + i
+    {
+    }
+    return 2;
+  }
+
+  ghost function FAttr(x: int): int
+    requires {:myAttr false + 3} true
+    reads {:myAttr false + 3} {}
+    ensures {:myAttr false + 3} true
+    decreases {:myAttr false + 3} x
+  {
+    10
+  }
+
+  ghost function GAttr(x: int): int
+    requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
+    ensures {:myAttr old(3)} true
+    decreases {:myAttr old(3)} x
+  {
+    10
+  }
+
+  ghost function HAttr(x: int): (r: int)
+    requires {:myAttr x, r} true
+    reads {:myAttr x, r} {}
+    ensures {:myAttr x, r} true
+    decreases {:myAttr x, r} x
+  {
+    10
+  }
+
+  twostate function F2Attr(x: int): int
+    requires {:myAttr false + 3} true
+    reads {:myAttr false + 3} {}
+    ensures {:myAttr false + 3} true
+    decreases {:myAttr false + 3} x
+  {
+    10
+  }
+
+  twostate function G2Attr(x: int): int
+    requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
+    ensures {:myAttr old(3)} true
+    decreases {:myAttr old(3)} x
+  {
+    10
+  }
+
+  twostate function H2Attr(x: int): (r: int)
+    requires {:myAttr x, r} true
+    reads {:myAttr x, r} true
+    ensures {:myAttr x, r} true
+    decreases {:myAttr x, r} x
+  {
+    10
+  }
+
+  method MAttr(x: int) returns (y: int)
+    requires {:myAttr false + 3} true
+    reads {:myAttr false + 3} {}
+    modifies {:myAttr false + 3} {}
+    ensures {:myAttr false + 3} true
+    decreases {:myAttr false + 3} x
+  {
+  }
+
+  method NAttr(x: int) returns (y: int)
+    requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
+    modifies {:myAttr old(3)} {}
+    ensures {:myAttr old(3)} true
+    decreases {:myAttr old(3)} x
+  {
+  }
+
+  method OAttr(x: int) returns (y: int)
+    requires {:myAttr x, y} true
+    reads {:myAttr x, y} {}
+    modifies {:myAttr x, y} {}
+    ensures {:myAttr x, y} true
+    decreases {:myAttr x, y} x
+  {
+  }
+
+  twostate lemma M2Attr(x: int) returns (y: int)
+    requires {:myAttr false + 3} true
+    reads {:myAttr false + 3} {}
+    modifies {:myAttr false + 3} {}
+    ensures {:myAttr false + 3} true
+    decreases {:myAttr false + 3} x
+  {
+  }
+
+  twostate lemma N2Attr(x: int) returns (y: int)
+    requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
+    modifies {:myAttr old(3)} {}
+    ensures {:myAttr old(3)} true
+    decreases {:myAttr old(3)} x
+  {
+  }
+
+  twostate lemma O2Attr(x: int) returns (y: int)
+    requires {:myAttr x, y} true
+    reads {:myAttr x, y} {}
+    modifies {:myAttr x, y} {}
+    ensures {:myAttr x, y} true
+    decreases {:myAttr x, y} x
+  {
+  }
+
+  method ModifyStatement(s: set<object>)
+  {
+    modify {:myAttr false + 3} s;
+  }
+
+  method LocalVariablesAndAssignments(opt: Option<int>, mustHave: MustHave<int>) returns (r: Option<int>)
+  {
+    var {:boolAttr false + 3} a: int, {:boolAttr false + 3} b: int;
+    var x, y := 10 {:boolAttr false + 3}, 20 {:boolAttr false + 3};
+    x, y := 10 {:boolAttr false + 3}, 20 {:boolAttr false + 3};
+    var {:boolAttr false + 3} u0 := If(13);
+    var u1 := If(13) {:boolAttr false + 3};
+    u1 := If(13) {:boolAttr false + 3};
+    var {:boolAttr false + 3} k0: int := *;
+    var k1: int := * {:boolAttr false + 3};
+    k1 := * {:boolAttr false + 3};
+    var {:boolAttr false + 3} c0 := new CClass;
+    var c1 := new CClass {:boolAttr false + 3};
+    c1 := new CClass {:boolAttr false + 3};
+    var {:boolAttr false + 3} d0 := new DClass();
+    var d1 := new DClass() {:boolAttr false + 3};
+    d1 := new DClass() {:boolAttr false + 3};
+    var s := {101};
+    var {:boolAttr false + 3} w0 :| w0 in s;
+    var {:boolAttr false + 3} w1, {:boolAttr false + 3} w2 :| w1 in s && w2 in s;
+    w1, w2 :| assume {:boolAttr false + 3} w1 in s && w2 in s;
+    var {:boolAttr false + 3} f0 :- opt;
+    var {:boolAttr false + 3} f1, {:boolAttr false + 3} f2 :- opt, true;
+    var {:boolAttr false + 3} f3 :- GiveOption();
+    var {:boolAttr false + 3} f4, {:boolAttr false + 3} f5 :- GiveOptions();
+    var g0 :- opt {:boolAttr false + 3};
+    var g1, g2 :- opt {:boolAttr false + 3}, true {:boolAttr false + 3};
+    var g3, g4, g5 :- opt {:boolAttr false + 3}, true {:boolAttr false + 4}, true {:boolAttr false + 5};
+    var g6 :- GiveOption() {:boolAttr false + 3};
+    var g7, g8 :- GiveOptions() {:boolAttr false + 3};
+    :- mustHave {:boolAttr false + 3};
+    :- GiveMustHave() {:boolAttr false + 3};
+    var p0 :- assert {:boolAttr false + 3} opt;
+    var p1 :- assume {:boolAttr false + 3} opt;
+    var p2 :- expect {:boolAttr false + 3} opt;
+    p0 :- assert {:boolAttr false + 3} opt;
+    p1 :- assume {:boolAttr false + 3} opt;
+    p2 :- expect {:boolAttr false + 3} opt;
+    var q0 :- assert {:boolAttr false + 3} GiveOption();
+    var q1 :- assume {:boolAttr false + 3} GiveOption();
+    var q2 :- expect {:boolAttr false + 3} GiveOption();
+    q0 :- assert {:boolAttr false + 3} GiveOption();
+    q1 :- assume {:boolAttr false + 3} GiveOption();
+    q2 :- expect {:boolAttr false + 3} GiveOption();
+    var i := var a, b {:boolAttr false + 3} :| a == 0 && b == 1; 100;
+  }
+
+  ghost function ExtendedPrintExpr(): int
+  {
+    var a, b {:boolAttr false + 3} :| a == 0 && b == 1;
+    100
+  }
+
+  method GiveOption() returns (r: Option<int>)
+
+  method GiveOptions() returns (r: Option<int>, s: int)
+
+  method GiveMustHave() returns (r: MustHave<int>)
+
+  datatype List<T> = Nil | Cons(hd: T, tl: List<T>)
+
+  datatype {:dt 0} {:dt false + 3} Datatype = {:dt k, this} Blue | {:dt 50} Green
+
+  datatype {:dt 0} {:dt false + 3} AnotherDatatype = {:dt 50} Blue | {:dt k, this} Green
+
+  iterator Iter(x: int) yields (y: int)
+    requires {:myAttr false + 3} true
+    reads {:myAttr false + 3} {}
+    modifies {:myAttr false + 3} {}
+    yield requires {:myAttr false + 3} true
+    yield ensures {:myAttr false + 3} true
+    ensures {:myAttr false + 3} true
+    decreases {:myAttr false + 3} x
+  {
+  }
+
+  iterator Jter(x: int) yields (y: int)
+    requires {:myAttr old(3)} true
+    reads {:myAttr old(3)} {}
+    modifies {:myAttr old(3)} {}
+    yield requires {:myAttr old(3)} true
+    yield ensures {:myAttr old(3)} true
+    ensures {:myAttr old(3)} true
+    decreases {:myAttr old(3)} x
+  {
+  }
+
+  iterator Kter(x: int) yields (y: int)
+    requires {:myAttr x, y, ys} true
+    reads {:myAttr x, y, ys} {}
+    modifies {:myAttr x, y, ys} {}
+    yield requires {:myAttr x, y, ys} true
+    yield ensures {:myAttr x, y, ys} true
+    ensures {:myAttr x, y, ys} true
+    decreases {:myAttr x, y, ys} x
+  {
+  }
+
+  class CClass { }
+
+  class DClass {
+    constructor ()
+    {
+    }
+  }
+
+  datatype Option<+T> = None | Some(value: T) {
+    predicate IsFailure()
+    {
+      None?
+    }
+
+    function PropagateFailure<U>(): Option<U>
+      requires None?
+    {
+      None
+    }
+
+    function Extract(): T
+      requires Some?
+    {
+      value
+    }
+  }
+
+  datatype MustHave<+T> = HasIt | DoesNotHave(value: T) {
+    predicate IsFailure()
+    {
+      DoesNotHave?
+    }
+
+    function PropagateFailure(): Option<T>
+      requires DoesNotHave?
+    {
+      None
+    }
+  }
+}
+
+module {:myAttr false + 3} {:myAttr old(3)} {:myAttr k} Modu {
+}
+
+module TwoStateAttributes {
+  class C {
+    var data: int
+
+    ghost function {:myAttr old(data), x, r} F(x: int): (r: int)
+
+    twostate function {:myAttr old(data), x, r} F2(x: int): (r: int)
+
+    lemma {:myAttr old(data), x, y} L(x: int) returns (y: int)
+
+    twostate lemma {:myAttr old(data), x, y} L2(x: int) returns (y: int)
+
+    method {:myAttr old(data), x, y} M(x: int) returns (y: int)
+
+    least predicate {:myAttr old(data), x} LP(x: int)
+
+    least lemma {:myAttr old(data), x} LL(x: int)
+  }
+}
+
+module TopLevelAttributes {
+  iterator {:myAttr x} {:myAttr y} {:myAttr this} {:myAttr ys} {:myAttr old(arr[0])} Iterator(x: int, arr: array<int>) yields (y: int)
+    requires arr.Length != 0
+
+  type {:myAttr this} {:myAttr N} Opaque {
+    const N: int
+  }
+
+  type {:myAttr this} Subset = x: int
+    | true
+
+  type {:myAttr this} Synonym = int
+
+  newtype {:myAttr this} {:myAttr N} Newtype = x: int
+    | true
+  {
+    const N: int
+  }
+
+  trait {:myAttr this} {:myAttr x} Trait {
+    var x: int
+  }
+
+  class {:myAttr this} {:myAttr x} Class {
+    var x: int
+  }
+
+  datatype {:myAttr this} {:myAttr Ctor?} {:myAttr y} {:myAttr N} Datatype = Ctor(y: int) {
+    const N: int
+  }
+
+  codatatype {:myAttr this} {:myAttr Ctor?} {:myAttr y} {:myAttr N} CoDatatype = Ctor(y: int) {
+    const N: int
+  }
+}
+
+module TopLevelAttributesModule {
+
+  module {:myAttr this} Module {
+  }
+}
+
+module MethodFrameClausesNotAllowed {
+  lemma Lemma(x: int)
+    reads {}
+    modifies {}
+  {
+  }
+
+  twostate lemma TwoStateLemma(x: int)
+    reads {}
+    modifies {}
+  {
+  }
+
+  least lemma LeastLemma(x: int)
+    reads {}
+    modifies {}
+  {
+  }
+
+  greatest lemma GreatestLemma(x: int)
+    reads {}
+    modifies {}
+  {
+  }
+}
+AttributeChecks.dfy(19,19): Error: type of right argument to + (bool) must agree with the result type (int)
+AttributeChecks.dfy(29,32): Error: boolean literal used as if it had type int
+AttributeChecks.dfy(43,21): Error: type of right argument to + (bool) must agree with the result type (int)
+AttributeChecks.dfy(53,21): Error: type of right argument to + (bool) must agree with the result type (int)
+AttributeChecks.dfy(68,30): Error: type of right argument to + (bool) must agree with the result type (int)
+AttributeChecks.dfy(78,27): Error: type of right argument to + (bool) must agree with the result type (int)
+AttributeChecks.dfy(85,19): Error: boolean literal used as if it had type int
+AttributeChecks.dfy(96,27): Error: boolean literal used as if it had type int
+AttributeChecks.dfy(110,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(111,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(112,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(113,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(110,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(111,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(112,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(113,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(119,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(120,19): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(121,21): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(122,23): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(128,25): Error: unresolved identifier: r
+AttributeChecks.dfy(129,22): Error: unresolved identifier: r
+AttributeChecks.dfy(131,26): Error: unresolved identifier: r
+AttributeChecks.dfy(137,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(138,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(139,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(140,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(137,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(138,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(139,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(140,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(155,25): Error: unresolved identifier: r
+AttributeChecks.dfy(156,22): Error: unresolved identifier: r
+AttributeChecks.dfy(158,26): Error: unresolved identifier: r
+AttributeChecks.dfy(156,25): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got bool)
+AttributeChecks.dfy(164,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(165,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(166,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(168,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(167,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(164,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(165,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(166,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(168,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(167,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(173,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(174,19): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(175,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(177,23): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(182,25): Error: unresolved identifier: y
+AttributeChecks.dfy(183,22): Error: unresolved identifier: y
+AttributeChecks.dfy(184,25): Error: unresolved identifier: y
+AttributeChecks.dfy(186,26): Error: unresolved identifier: y
+AttributeChecks.dfy(191,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(192,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(193,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(195,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(194,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(191,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(192,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(193,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(195,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(194,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(201,19): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(202,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(204,23): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(209,25): Error: unresolved identifier: y
+AttributeChecks.dfy(210,22): Error: unresolved identifier: y
+AttributeChecks.dfy(211,25): Error: unresolved identifier: y
+AttributeChecks.dfy(213,26): Error: unresolved identifier: y
+AttributeChecks.dfy(251,26): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(251,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(257,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(258,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(262,26): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(263,26): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(265,26): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(266,26): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(269,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(270,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(271,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(274,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(275,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(276,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(279,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(280,42): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(281,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(282,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(283,44): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(284,40): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(288,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(290,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(291,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(295,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(298,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(300,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(301,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(304,25): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(306,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(307,23): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(311,35): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(313,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(314,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(316,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(317,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(318,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(320,44): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(321,49): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(323,33): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(324,39): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(327,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(328,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(329,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(330,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(331,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(332,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(335,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(336,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(337,38): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(338,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(339,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(340,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(344,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(257,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(258,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(262,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(263,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(265,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(266,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(269,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(270,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(271,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(274,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(275,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(276,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(279,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(280,42): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(281,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(282,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(283,44): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(284,40): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(288,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(290,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(291,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(295,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(298,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(300,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(301,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(304,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(306,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(307,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(311,35): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(313,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(314,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(316,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(317,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(318,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(320,44): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(321,49): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(323,33): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(324,39): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(327,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(328,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(329,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(330,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(331,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(332,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(335,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(336,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(337,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(338,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(339,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(340,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(344,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(350,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(350,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(103,30): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(103,30): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(104,9): Error: unresolved identifier: k
+AttributeChecks.dfy(104,12): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(106,30): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(106,30): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(107,27): Error: unresolved identifier: k
+AttributeChecks.dfy(107,30): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(224,29): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(221,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(218,28): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(219,34): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(222,33): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(223,27): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(224,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(221,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(218,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(219,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(222,33): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(223,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(235,23): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(232,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(229,22): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(230,28): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(246,26): Error: unresolved identifier: y
+AttributeChecks.dfy(246,29): Error: unresolved identifier: ys
+AttributeChecks.dfy(243,25): Error: unresolved identifier: y
+AttributeChecks.dfy(243,28): Error: unresolved identifier: ys
+AttributeChecks.dfy(240,25): Error: unresolved identifier: y
+AttributeChecks.dfy(240,28): Error: unresolved identifier: ys
+AttributeChecks.dfy(395,11): Error: unresolved identifier: k
+AttributeChecks.dfy(394,11): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(393,17): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+AttributeChecks.dfy(393,17): Error: type of right argument to + (int) must agree with the result type (bool)
+AttributeChecks.dfy(404,28): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(408,19): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(412,20): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(414,29): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(416,25): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(429,13): Error: old expressions are not allowed in this context
+AttributeChecks.dfy(428,13): Error: unresolved identifier: ys
+AttributeChecks.dfy(427,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(426,13): Error: unresolved identifier: y
+AttributeChecks.dfy(437,13): Error: unresolved identifier: N
+AttributeChecks.dfy(436,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(445,16): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(449,16): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(455,13): Error: unresolved identifier: N
+AttributeChecks.dfy(454,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(465,13): Error: unresolved identifier: x
+AttributeChecks.dfy(464,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(475,13): Error: unresolved identifier: x
+AttributeChecks.dfy(474,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(487,13): Error: unresolved identifier: N
+AttributeChecks.dfy(486,13): Error: unresolved identifier: y
+AttributeChecks.dfy(485,13): Error: unresolved identifier: Ctor?
+AttributeChecks.dfy(484,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(499,13): Error: unresolved identifier: N
+AttributeChecks.dfy(498,13): Error: unresolved identifier: y
+AttributeChecks.dfy(497,13): Error: unresolved identifier: Ctor?
+AttributeChecks.dfy(496,13): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(509,18): Error: 'this' is not allowed in a 'static' context
+AttributeChecks.dfy(515,10): Error: lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+AttributeChecks.dfy(516,13): Error: lemmas are not allowed to have modifies clauses
+AttributeChecks.dfy(521,10): Error: twostate lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+AttributeChecks.dfy(522,13): Error: twostate lemmas are not allowed to have modifies clauses
+AttributeChecks.dfy(527,10): Error: least lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+AttributeChecks.dfy(528,13): Error: least lemmas are not allowed to have modifies clauses
+AttributeChecks.dfy(533,10): Error: greatest lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+AttributeChecks.dfy(534,13): Error: greatest lemmas are not allowed to have modifies clauses
+246 resolution/type errors detected in AttributeChecks.dfy
diff --git a/Test/dafny0/AutoContracts.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoContracts.dfy
similarity index 94%
rename from Test/dafny0/AutoContracts.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoContracts.dfy
index e08384b3047..e072a06ad7b 100644
--- a/Test/dafny0/AutoContracts.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoContracts.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /env:0 /print:"%t.print" /rprint:- "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --rprint:-
+
 
 module OneModule {
   class {:autocontracts} D { }
diff --git a/Test/dafny0/AutoContracts.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoContracts.dfy.expect
similarity index 88%
rename from Test/dafny0/AutoContracts.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoContracts.dfy.expect
index a8fb4ebef00..1e3fc9f476a 100644
--- a/Test/dafny0/AutoContracts.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoContracts.dfy.expect
@@ -25,7 +25,7 @@ module _System {
   */
 
   class {:compile false} array<arg> {
-    var Length: int  // immutable
+    const Length: int
   }
   /*-- non-null type
   type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
@@ -63,21 +63,23 @@ module _System {
     | f.requires()
     /*special witness*/
 
-  datatype {:compile false} /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
 
   type bool { }
 
+  type char { }
+
   type int { }
 
   type real {
-    var Floor: int  // immutable
+    const Floor: int
   }
 
   type ORDINAL {
-    var IsLimit: bool  // immutable
-    var IsSucc: bool  // immutable
-    var Offset: int  // immutable
-    var IsNat: bool  // immutable
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
   }
 
   type _bv {
@@ -86,19 +88,27 @@ module _System {
     function RotateRight(w: nat): selftype
   }
 
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
   type map<+T, +U> {
-    var Keys: set<T>  // immutable
-    var Values: set<U>  // immutable
-    var Items: set<(T, U)>  // immutable
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
   }
 
   type imap<*T, +U> {
-    var Keys: iset<T>  // immutable
-    var Values: iset<U>  // immutable
-    var Items: iset<(T, U)>  // immutable
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
   }
 
-  datatype {:compile false} /*_tuple#0*/ () = _#Make0
+  datatype /*_tuple#0*/ () = _#Make0
 }
 // bitvector types in use:
 */
@@ -238,13 +248,13 @@ module OneModule {
       data < 20
     }
 
-    lemma /*{:_induction this}*/ L()
+    lemma L()
       requires Valid()
       ensures data < 100
     {
     }
 
-    twostate lemma /*{:_induction this}*/ TL()
+    twostate lemma TL()
       requires old(Valid())
       ensures old(data) <= data
     {
@@ -563,29 +573,24 @@ module N2 refines N1 {
   */
 }
 AutoContracts.dfy(17,4): Error: a postcondition could not be proved on this return path
-AutoContracts.dfy(17,4): Related location: this is the postcondition that could not be proved
-AutoContracts.dfy(12,20): Related location
+AutoContracts.dfy(12,20): Related location: this proposition could not be proved
 AutoContracts.dfy(17,4): Error: a postcondition could not be proved on this return path
-AutoContracts.dfy(17,4): Related location: this is the postcondition that could not be proved
-AutoContracts.dfy(12,20): Related location
+AutoContracts.dfy(12,20): Related location: this proposition could not be proved
 AutoContracts.dfy(17,4): Error: a postcondition could not be proved on this return path
-AutoContracts.dfy(17,4): Related location: this is the postcondition that could not be proved
-AutoContracts.dfy(12,20): Related location
 AutoContracts.dfy(17,4): Error: a postcondition could not be proved on this return path
-AutoContracts.dfy(17,4): Related location: this is the postcondition that could not be proved
+AutoContracts.dfy(12,20): Related location: this proposition could not be proved
 AutoContracts.dfy(17,4): Error: a postcondition could not be proved on this return path
-AutoContracts.dfy(17,4): Related location: this is the postcondition that could not be proved
-AutoContracts.dfy(12,20): Related location
-AutoContracts.dfy(5,25): Related location
+AutoContracts.dfy(12,20): Related location: this proposition could not be proved
+AutoContracts.dfy(5,25): Related location: this proposition could not be proved
 AutoContracts.dfy(50,4): Error: a postcondition could not be proved on this return path
 AutoContracts.dfy(49,24): Related location: this is the postcondition that could not be proved
 AutoContracts.dfy(79,21): Error: a postcondition could not be proved on this return path
 AutoContracts.dfy(60,16): Related location: this is the postcondition that could not be proved
 AutoContracts.dfy(79,21): Error: a postcondition could not be proved on this return path
 AutoContracts.dfy(60,16): Related location: this is the postcondition that could not be proved
-AutoContracts.dfy[N1](65,20): Related location
+AutoContracts.dfy[N1](65,20): Related location: this proposition could not be proved
 AutoContracts.dfy(79,21): Error: a postcondition could not be proved on this return path
 AutoContracts.dfy(60,16): Related location: this is the postcondition that could not be proved
-AutoContracts.dfy[N1](65,20): Related location
+AutoContracts.dfy[N1](65,20): Related location: this proposition could not be proved
 
-Dafny program verifier finished with 37 verified, 9 errors
+Dafny program verifier finished with 36 verified, 9 errors
diff --git a/Test/dafny0/AutoReq.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoReq.dfy
similarity index 97%
rename from Test/dafny0/AutoReq.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoReq.dfy
index 3804e360747..a7adb2c2a35 100644
--- a/Test/dafny0/AutoReq.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoReq.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation
+
 
 ghost function f(x:int) : bool
   requires x > 3;
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoReq.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoReq.dfy.expect
new file mode 100644
index 00000000000..c9c5d88bc16
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/AutoReq.dfy.expect
@@ -0,0 +1,21 @@
+AutoReq.dfy(13,3): Error: function precondition could not be proved
+AutoReq.dfy(5,13): Related location: this proposition could not be proved
+AutoReq.dfy(25,3): Error: function precondition could not be proved
+AutoReq.dfy(5,13): Related location: this proposition could not be proved
+AutoReq.dfy(38,12): Error: function precondition could not be proved
+AutoReq.dfy(5,13): Related location: this proposition could not be proved
+AutoReq.dfy(38,12): Error: assertion might not hold
+AutoReq.dfy(31,13): Related location: this proposition could not be proved
+AutoReq.dfy(7,4): Related location: this proposition could not be proved
+AutoReq.dfy(40,12): Error: function precondition could not be proved
+AutoReq.dfy(5,13): Related location: this proposition could not be proved
+AutoReq.dfy(40,12): Error: assertion might not hold
+AutoReq.dfy(31,27): Related location: this proposition could not be proved
+AutoReq.dfy(7,4): Related location: this proposition could not be proved
+AutoReq.dfy(45,12): Error: assertion might not hold
+AutoReq.dfy(31,13): Related location: this proposition could not be proved
+AutoReq.dfy(7,4): Related location: this proposition could not be proved
+AutoReq.dfy(247,6): Error: function precondition could not be proved
+AutoReq.dfy(239,13): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 30 verified, 8 errors
diff --git a/Test/dafny0/Backticks.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Backticks.dfy
similarity index 88%
rename from Test/dafny0/Backticks.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Backticks.dfy
index 0f1a1e44335..64f127fd8af 100644
--- a/Test/dafny0/Backticks.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Backticks.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var x: int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Backticks.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Backticks.dfy.expect
new file mode 100644
index 00000000000..a88d403b08f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Backticks.dfy.expect
@@ -0,0 +1,4 @@
+Backticks.dfy(38,5): Error: insufficient reads clause to invoke function
+Backticks.dfy(77,7): Error: call might violate context's modifies clause
+
+Dafny program verifier finished with 12 verified, 2 errors
diff --git a/Test/dafny0/BadFunction.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BadFunction.dfy
similarity index 75%
rename from Test/dafny0/BadFunction.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BadFunction.dfy
index 6e44a7c2acb..19d254b3f6d 100644
--- a/Test/dafny0/BadFunction.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BadFunction.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // The following function gives rise to an inconsistent axiom, except
 // for its CanUseFunctionDefs antecedent, which saves the day.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BadFunction.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BadFunction.dfy.expect
new file mode 100644
index 00000000000..779318f5de2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BadFunction.dfy.expect
@@ -0,0 +1,3 @@
+BadFunction.dfy(9,3): Error: decreases clause might not decrease
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/dafny0/Basics.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Basics.dfy
similarity index 99%
rename from Test/dafny0/Basics.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Basics.dfy
index 5cc4d357aa5..c285fccc8a6 100644
--- a/Test/dafny0/Basics.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Basics.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-axioms --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class Global {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Basics.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Basics.dfy.expect
new file mode 100644
index 00000000000..91d277d60ac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Basics.dfy.expect
@@ -0,0 +1,22 @@
+Basics.dfy(13,13): Error: variable 'g', which is subject to definite-assignment rules, might be uninitialized here
+Basics.dfy(45,4): Error: assertion might not hold
+Basics.dfy(69,41): Error: assertion might not hold
+Basics.dfy(93,4): Error: assertion might not hold
+Basics.dfy(99,4): Error: assertion might not hold
+Basics.dfy(112,27): Error: target object might be null
+Basics.dfy(114,13): Error: target object might be null
+Basics.dfy(148,4): Error: assertion might not hold
+Basics.dfy(167,9): Error: when left-hand sides a[b[18]] and a[4] refer to the same location, they must be assigned the same value
+Basics.dfy(183,9): Error: when left-hand sides x.f and y.f refer to the same location, they must be assigned the same value
+Basics.dfy(195,4): Error: assertion might not hold
+Basics.dfy(197,9): Error: assignment might update an object not in the enclosing context's modifies clause
+Basics.dfy(197,9): Error: target object might be null
+Basics.dfy(202,11): Error: left-hand sides m.x and m.x might refer to the same location
+Basics.dfy(213,4): Error: assertion might not hold
+Basics.dfy(273,9): Error: when left-hand sides d.x and c.x refer to the same location, they must be assigned the same value
+Basics.dfy(463,2): Error: assertion might not hold
+Basics.dfy(474,4): Error: assertion might not hold
+Basics.dfy(476,2): Error: assertion might not hold
+Basics.dfy(623,17): Error: result of operation might violate newtype constraint for 'int8'
+
+Dafny program verifier finished with 48 verified, 20 errors
diff --git a/Test/dafny0/BigOrdinals.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BigOrdinals.dfy
similarity index 97%
rename from Test/dafny0/BigOrdinals.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BigOrdinals.dfy
index bac3601071a..37522cb84c4 100644
--- a/Test/dafny0/BigOrdinals.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BigOrdinals.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /rprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method M(o: ORDINAL) returns (p: ORDINAL)
diff --git a/Test/dafny0/BigOrdinals.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BigOrdinals.dfy.expect
similarity index 83%
rename from Test/dafny0/BigOrdinals.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BigOrdinals.dfy.expect
index bc7a0336311..38d1ee5f200 100644
--- a/Test/dafny0/BigOrdinals.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BigOrdinals.dfy.expect
@@ -1,12 +1,12 @@
 BigOrdinals.dfy(18,11): Error: a negative integer cannot be converted to an ORDINAL
 BigOrdinals.dfy(20,11): Error: value to be converted might be bigger than every natural number
-BigOrdinals.dfy(35,13): Error: assertion could not be proved
-BigOrdinals.dfy(53,13): Error: assertion could not be proved
+BigOrdinals.dfy(35,4): Error: assertion might not hold
+BigOrdinals.dfy(53,4): Error: assertion might not hold
 BigOrdinals.dfy(64,15): Error: ORDINAL subtraction might underflow a limit ordinal (that is, RHS might be too large)
 BigOrdinals.dfy(66,15): Error: ORDINAL subtraction might underflow a limit ordinal (that is, RHS might be too large)
 BigOrdinals.dfy(68,15): Error: ORDINAL subtraction might underflow a limit ordinal (that is, RHS might be too large)
 BigOrdinals.dfy(73,15): Error: ORDINAL subtraction might underflow a limit ordinal (that is, RHS might be too large)
-BigOrdinals.dfy(88,13): Error: assertion could not be proved
+BigOrdinals.dfy(88,4): Error: assertion might not hold
 BigOrdinals.dfy(113,9): Error: value does not satisfy the subset constraints of 'ConstrainedOrdinal'
 BigOrdinals.dfy(120,9): Error: value does not satisfy the subset constraints of 'ConstrainedOrdinal'
 
diff --git a/Test/dafny0/BindingGuards.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuards.dfy
similarity index 97%
rename from Test/dafny0/BindingGuards.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuards.dfy
index 5e793c1c776..491bdafdd42 100644
--- a/Test/dafny0/BindingGuards.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuards.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /dprint:- /env:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --relax-definite-assignment --print:-
+
 
 ghost predicate P(n: int)
 {
diff --git a/Test/dafny0/BindingGuards.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuards.dfy.expect
similarity index 96%
rename from Test/dafny0/BindingGuards.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuards.dfy.expect
index 36ac6f92505..9b7274564b2 100644
--- a/Test/dafny0/BindingGuards.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuards.dfy.expect
@@ -304,10 +304,10 @@ method AltSyntax9(x: int, y: int, c: Color)
 datatype Color = Red | Green | Blue
 BindingGuards.dfy(85,10): Error: a postcondition could not be proved on this return path
 BindingGuards.dfy(71,12): Related location: this is the postcondition that could not be proved
-BindingGuards.dfy(134,9): Error: assertion could not be proved
-BindingGuards.dfy(6,8): Related location
-BindingGuards.dfy(139,2): Error: alternative cases fail to cover all possibilties
-BindingGuards.dfy(147,2): Error: alternative cases fail to cover all possibilties
+BindingGuards.dfy(134,10): Error: assertion might not hold
+BindingGuards.dfy(6,8): Related location: this proposition could not be proved
+BindingGuards.dfy(139,2): Error: alternative cases fail to cover all possibilities
+BindingGuards.dfy(147,2): Error: alternative cases fail to cover all possibilities
 BindingGuards.dfy(272,2): Error: missing case in match statement: Blue
 BindingGuards.dfy(272,2): Error: missing case in match statement: Green
 
diff --git a/Test/dafny0/BindingGuardsResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuardsResolution.dfy
similarity index 97%
rename from Test/dafny0/BindingGuardsResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuardsResolution.dfy
index f479e25e3af..c4874846bfd 100644
--- a/Test/dafny0/BindingGuardsResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuardsResolution.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /dprint:- /env:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --print=-
+
 module Tests {
   ghost predicate P(n: int)
 
diff --git a/Test/dafny0/BindingGuardsResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuardsResolution.dfy.expect
similarity index 98%
rename from Test/dafny0/BindingGuardsResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuardsResolution.dfy.expect
index 1891cae0e35..b15b54c7c49 100644
--- a/Test/dafny0/BindingGuardsResolution.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BindingGuardsResolution.dfy.expect
@@ -164,5 +164,5 @@ BindingGuardsResolution.dfy(132,8): Error: assignment to non-ghost variable is n
 BindingGuardsResolution.dfy(140,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
 BindingGuardsResolution.dfy(142,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
 BindingGuardsResolution.dfy(146,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-BindingGuardsResolution.dfy(149,37): Error: a call to a ghost predicate is allowed only in specification contexts (consider declaring the predicate without the 'ghost' keyword)
+BindingGuardsResolution.dfy(149,38): Error: a call to a ghost predicate is allowed only in specification contexts (consider declaring the predicate without the 'ghost' keyword)
 11 resolution/type errors detected in BindingGuardsResolution.dfy
diff --git a/Test/dafny0/BitvectorResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorResolution.dfy
similarity index 97%
rename from Test/dafny0/BitvectorResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorResolution.dfy
index 8cb415b65f7..24cd8f70b82 100644
--- a/Test/dafny0/BitvectorResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorResolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module LiteralSizes {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorResolution.dfy.expect
new file mode 100644
index 00000000000..2866e8a95d2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorResolution.dfy.expect
@@ -0,0 +1,20 @@
+BitvectorResolution.dfy(9,13): Error: literal (5000) is too large for the bitvector type bv1
+BitvectorResolution.dfy(15,9): Error: literal (1) is too large for the bitvector type bv0
+BitvectorResolution.dfy(18,9): Error: literal (4294967296) is too large for the bitvector type bv32
+BitvectorResolution.dfy(24,12): Error: literal (1) is too large for the bitvector type bv0
+BitvectorResolution.dfy(35,6): Error: RHS (of type bv67) not assignable to LHS (of type int)
+BitvectorResolution.dfy(36,6): Error: RHS (of type bv67) not assignable to LHS (of type int)
+BitvectorResolution.dfy(38,6): Error: RHS (of type bv67) not assignable to LHS (of type int)
+BitvectorResolution.dfy(39,6): Error: RHS (of type bv67) not assignable to LHS (of type int)
+BitvectorResolution.dfy(40,15): Error: type of right argument to << (real) must be an integer-numeric or bitvector type
+BitvectorResolution.dfy(41,15): Error: type of right argument to << (SmallReal) must be an integer-numeric or bitvector type
+BitvectorResolution.dfy(42,26): Error: incorrect argument type for function parameter 'w' (expected nat, found real)
+BitvectorResolution.dfy(43,26): Error: incorrect argument type for function parameter 'w' (expected nat, found SmallReal)
+BitvectorResolution.dfy(94,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+BitvectorResolution.dfy(95,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+BitvectorResolution.dfy(96,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+BitvectorResolution.dfy(98,14): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+BitvectorResolution.dfy(99,14): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+BitvectorResolution.dfy(100,14): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+BitvectorResolution.dfy(110,19): Error: the type of this expression is underspecified
+13 resolution/type errors detected in BitvectorResolution.dfy
diff --git a/Test/dafny0/Bitvectors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Bitvectors.dfy
similarity index 98%
rename from Test/dafny0/Bitvectors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Bitvectors.dfy
index 4c8e1094455..c4990f984c1 100644
--- a/Test/dafny0/Bitvectors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Bitvectors.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // Note the difference in Java output is due to
 // https://github.com/dafny-lang/dafny/issues/4152
diff --git a/Test/dafny0/Bitvectors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Bitvectors.dfy.expect
similarity index 100%
rename from Test/dafny0/Bitvectors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Bitvectors.dfy.expect
diff --git a/Test/dafny0/Bitvectors.dfy.java.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Bitvectors.dfy.java.expect
similarity index 100%
rename from Test/dafny0/Bitvectors.dfy.java.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Bitvectors.dfy.java.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Bitvectors.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Bitvectors.dfy.rs.check
new file mode 100644
index 00000000000..34601dcae40
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Bitvectors.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitBitvectorTruncation</i>.*
\ No newline at end of file
diff --git a/Test/dafny0/BitvectorsMore.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorsMore.dfy
similarity index 98%
rename from Test/dafny0/BitvectorsMore.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorsMore.dfy
index 756db638294..d7525f5d284 100644
--- a/Test/dafny0/BitvectorsMore.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorsMore.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /errorLimit:0 /print:"%t.print" /rprint:- /env:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --error-limit=0 --relax-definite-assignment --rprint:-
+
 
 method M() {
   var h: bv8 := 5;
diff --git a/Test/dafny0/BitvectorsMore.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorsMore.dfy.expect
similarity index 94%
rename from Test/dafny0/BitvectorsMore.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorsMore.dfy.expect
index 5196f565d70..3564bde88c2 100644
--- a/Test/dafny0/BitvectorsMore.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorsMore.dfy.expect
@@ -25,7 +25,7 @@ module _System {
   */
 
   class {:compile false} array<arg> {
-    var Length: int  // immutable
+    const Length: int
   }
   /*-- non-null type
   type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
@@ -63,21 +63,23 @@ module _System {
     | f.requires()
     /*special witness*/
 
-  datatype {:compile false} /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
 
   type bool { }
 
+  type char { }
+
   type int { }
 
   type real {
-    var Floor: int  // immutable
+    const Floor: int
   }
 
   type ORDINAL {
-    var IsLimit: bool  // immutable
-    var IsSucc: bool  // immutable
-    var Offset: int  // immutable
-    var IsNat: bool  // immutable
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
   }
 
   type _bv {
@@ -86,19 +88,27 @@ module _System {
     function RotateRight(w: nat): selftype
   }
 
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
   type map<+T, +U> {
-    var Keys: set<T>  // immutable
-    var Values: set<U>  // immutable
-    var Items: set<(T, U)>  // immutable
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
   }
 
   type imap<*T, +U> {
-    var Keys: iset<T>  // immutable
-    var Values: iset<U>  // immutable
-    var Items: iset<(T, U)>  // immutable
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
   }
 
-  datatype {:compile false} /*_tuple#0*/ () = _#Make0
+  datatype /*_tuple#0*/ () = _#Make0
 
   type {:compile false} /*_#Func11*/ (-T0, -T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10) ~> +R {
     ghost function requires(x0: T0, x1: T1, x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10): bool
@@ -480,7 +490,7 @@ BitvectorsMore.dfy(168,33): Error: when converting shift amount to a bit vector,
 BitvectorsMore.dfy(169,33): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv0
 BitvectorsMore.dfy(170,33): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv0
 BitvectorsMore.dfy(171,33): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv0
-BitvectorsMore.dfy(193,26): Error: shift amount must not exceed the width of the result (5)
-BitvectorsMore.dfy(194,26): Error: shift amount must not exceed the width of the result (5)
+BitvectorsMore.dfy(193,36): Error: rotate amount must not exceed the width of the result (5)
+BitvectorsMore.dfy(194,37): Error: rotate amount must not exceed the width of the result (5)
 
 Dafny program verifier finished with 9 verified, 41 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorsMore.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorsMore.dfy.refresh.expect
new file mode 100644
index 00000000000..fd45bb23c41
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BitvectorsMore.dfy.refresh.expect
@@ -0,0 +1,556 @@
+// BitvectorsMore.dfy
+
+/*
+module _System {
+  /* CALL GRAPH for module _System:
+   * SCC at height 1:
+   *   RotateLeft
+   * SCC at height 1:
+   *   RotateRight
+   * SCC at height 0:
+   *   array
+   * SCC at height 0:
+   *   nat
+   * SCC at height 0:
+   *   object
+   */
+  type string(==,0) = seq<char>
+
+  type {:axiom} nat(==,0) = x: int
+    | 0 <= x
+
+  trait {:compile false} object { }
+  /*-- non-null type
+  type {:axiom} object(==) = c: object? | c != null /*special witness*/
+  */
+
+  class {:compile false} array<arg> {
+    const Length: int
+  }
+  /*-- non-null type
+  type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
+  */
+
+  type {:compile false} /*_#Func1*/ -T0 ~> +R {
+    ghost function requires(x0: T0): bool
+      reads reads(x0)
+
+    ghost function reads(x0: T0): set<object?>
+      reads reads(x0)
+  }
+
+  type {:compile false} /*_#PartialFunc1*/ -T0 --> +R = f: T0 ~> R
+    | forall x0: T0 :: f.reads(x0) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc1*/ -T0 -> +R = f: T0 --> R
+    | forall x0: T0 :: f.requires(x0)
+    /*special witness*/
+
+  type {:compile false} /*_#Func0*/ () ~> +R {
+    ghost function requires(): bool
+      reads reads()
+
+    ghost function reads(): set<object?>
+      reads reads()
+  }
+
+  type {:compile false} /*_#PartialFunc0*/ () --> +R = f: () ~> R
+    | f.reads() == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc0*/ () -> +R = f: () --> R
+    | f.requires()
+    /*special witness*/
+
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+
+  type bool { }
+
+  type char { }
+
+  type int { }
+
+  type real {
+    const Floor: int
+  }
+
+  type ORDINAL {
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
+  }
+
+  type _bv {
+    function RotateLeft(w: nat): selftype
+
+    function RotateRight(w: nat): selftype
+  }
+
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
+  type map<+T, +U> {
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
+  }
+
+  type imap<*T, +U> {
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
+  }
+
+  datatype /*_tuple#0*/ () = _#Make0
+
+  type {:compile false} /*_#Func11*/ (-T0, -T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10) ~> +R {
+    ghost function requires(x0: T0, x1: T1, x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10): bool
+      reads reads(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10)
+
+    ghost function reads(x0: T0, x1: T1, x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10): set<object?>
+      reads reads(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10)
+  }
+
+  type {:compile false} /*_#PartialFunc11*/ (-T0, -T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10) --> +R = f: (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) ~> R
+    | forall x0: T0, x1: T1, x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10 :: f.reads(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc11*/ (-T0, -T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10) -> +R = f: (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) --> R
+    | forall x0: T0, x1: T1, x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10 :: f.requires(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10)
+    /*special witness*/
+
+  type bv7 {
+    function RotateLeft(w: nat): bv7
+
+    function RotateRight(w: nat): bv7
+  }
+
+  type bv137 {
+    function RotateLeft(w: nat): bv137
+
+    function RotateRight(w: nat): bv137
+  }
+
+  type bv0 {
+    function RotateLeft(w: nat): bv0
+
+    function RotateRight(w: nat): bv0
+  }
+
+  type bv10 {
+    function RotateLeft(w: nat): bv10
+
+    function RotateRight(w: nat): bv10
+  }
+
+  type bv60 {
+    function RotateLeft(w: nat): bv60
+
+    function RotateRight(w: nat): bv60
+  }
+
+  type bv67 {
+    function RotateLeft(w: nat): bv67
+
+    function RotateRight(w: nat): bv67
+  }
+
+  type bv32 {
+    function RotateLeft(w: nat): bv32
+
+    function RotateRight(w: nat): bv32
+  }
+
+  type bv2 {
+    function RotateLeft(w: nat): bv2
+
+    function RotateRight(w: nat): bv2
+  }
+
+  type bv5 {
+    function RotateLeft(w: nat): bv5
+
+    function RotateRight(w: nat): bv5
+  }
+
+  type bv8 {
+    function RotateLeft(w: nat): bv8
+
+    function RotateRight(w: nat): bv8
+  }
+}
+// bitvector types in use: bv7 bv137 bv0 bv10 bv60 bv67 bv32 bv2 bv5 bv8 bv6 bv3
+*/
+
+/* CALL GRAPH for module _module:
+ * SCC at height 2:
+ *   Shifts0
+ * SCC at height 2:
+ *   Shifts1
+ * SCC at height 2:
+ *   Shifts2
+ * SCC at height 2:
+ *   Shifts3
+ * SCC at height 2:
+ *   Shifts4
+ * SCC at height 2:
+ *   Shifts5
+ * SCC at height 2:
+ *   Shifts6
+ * SCC at height 1:
+ *   PQ
+ * SCC at height 0:
+ *   EvenInt
+ * SCC at height 0:
+ *   Handful
+ * SCC at height 0:
+ *   M
+ * SCC at height 0:
+ *   N0
+ * SCC at height 0:
+ *   N1
+ * SCC at height 0:
+ *   N2
+ * SCC at height 0:
+ *   N3
+ * SCC at height 0:
+ *   N4
+ * SCC at height 0:
+ *   P
+ * SCC at height 0:
+ *   Q
+ * SCC at height 0:
+ *   R
+ * SCC at height 0:
+ *   Rotate
+ * SCC at height 0:
+ *   SmallReal
+ * SCC at height 0:
+ *   TestActualRotate
+ * SCC at height 0:
+ *   TestActualShifting
+ */
+method M()
+{
+  var h: bv8 := 5;
+  var k: bv8 := h * 128 / 128;
+  assert k == 1;
+  h := 3;
+  k := h * 128 / 128;
+  assert k == 1;
+  h := *;
+  k := k / h;
+}
+
+method N0(x: bv7, y: bv7)
+  decreases x, y
+{
+  var z: bv7 := x / y;
+}
+
+method N1(x: bv7, y: bv7)
+  decreases x, y
+{
+  var z: bv7 := x % y;
+}
+
+method N2(x: bv137, y: bv137)
+  decreases x, y
+{
+  var z: bv137 := x / y;
+}
+
+method N3(x: bv0, y: bv0)
+  decreases x, y
+{
+  if * {
+    var z: bv0 := x / y;
+  } else {
+    var z: bv0 := x % y;
+  }
+}
+
+method N4(x: bv0, y: bv0) returns (z: bv0)
+  ensures z == 0
+  decreases x, y
+{
+  if {
+    case true =>
+      z := x + y;
+    case true =>
+      z := x - y;
+    case true =>
+      z := x * y;
+    case true =>
+      z := x & y;
+    case true =>
+      z := x | y;
+    case true =>
+      z := x ^ y;
+    case true =>
+      z := !x;
+    case true =>
+      z := -x;
+    case true =>
+    case true =>
+      assert !(x < y);
+    case true =>
+      assert x <= y;
+    case true =>
+      assert x >= y;
+    case true =>
+      assert !(x > y);
+  }
+}
+
+method P(x: bv0, y: bv0)
+  requires x != y
+  decreases x, y
+{
+  assert false;
+}
+
+method Q(x: bv10, y: bv10)
+  decreases x, y
+{
+  if x < 0 {
+    var z: bv10 := x / y;
+  }
+}
+
+method R(x: bv60, y: bv60)
+  decreases x, y
+{
+  var a0: bool, a1: bool;
+  a0, a1 := x < y, y > x;
+  assert a0 == a1;
+  a0, a1 := x <= y, y >= x;
+  assert a0 == a1;
+}
+
+ghost predicate PQ(x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, bb: bv2, noll: bv0, h: Handful)
+  decreases x, n, r, even, small, b67, w, seven, bb, noll, h
+{
+  x == x &&
+  n == n &&
+  r == r &&
+  even == even &&
+  small == small &&
+  b67 == b67 &&
+  w == w &&
+  seven == seven &&
+  bb == bb &&
+  noll == noll &&
+  h == h
+}
+
+method Shifts0()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, bb: bv2, noll: bv0, h: Handful)
+  ensures PQ(x, n, r, even, small, b67, w, seven, bb, noll, h)
+{
+  if {
+    case x < 20 =>
+      b67 := b67 << x as bv7;
+    case 0 <= x =>
+      b67 := b67 << x as bv7;
+    case 0 <= x < 67 =>
+      b67 := b67 << x as bv7;
+    case true =>
+      b67 := b67 << n as bv7;
+    case true =>
+      b67 := b67 << h as bv7;
+  }
+}
+
+method Shifts1()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, bb: bv2, noll: bv0, h: Handful)
+  ensures PQ(x, n, r, even, small, b67, w, seven, bb, noll, h)
+{
+  if {
+    case even <= 66 =>
+      b67 := b67 << even as bv7;
+    case 0 <= even =>
+      b67 := b67 << even as bv7;
+    case 0 <= even <= 66 =>
+      b67 := b67 << even as bv7;
+  }
+}
+
+method Shifts2()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, bb: bv2, noll: bv0, h: Handful)
+  ensures PQ(x, n, r, even, small, b67, w, seven, bb, noll, h)
+{
+  if {
+    case true =>
+      b67 := b67 << b67 as bv7;
+    case true =>
+      b67 := b67 << w as bv7;
+    case true =>
+      b67 := b67 << (seven / 2) as bv7;
+    case true =>
+      b67 := b67 << bb as bv7;
+    case true =>
+      b67 := b67 << noll as bv7;
+  }
+}
+
+method Shifts3()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, bb: bv2, noll: bv0, h: Handful)
+  ensures PQ(x, n, r, even, small, b67, w, seven, bb, noll, h)
+{
+  if {
+    case true =>
+      w := w << b67 as bv6;
+    case true =>
+      w := w << w as bv6;
+    case true =>
+      w := w << seven as bv6;
+    case true =>
+      w := w << bb as bv6;
+    case true =>
+      w := w << noll as bv6;
+  }
+}
+
+method Shifts4()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, bb: bv2, noll: bv0, h: Handful)
+  ensures PQ(x, n, r, even, small, b67, w, seven, bb, noll, h)
+{
+  if {
+    case true =>
+      seven := seven << b67 as bv3;
+    case true =>
+      seven := seven << w as bv3;
+    case true =>
+      seven := seven << seven as bv3;
+    case true =>
+      seven := seven << bb as bv3;
+    case true =>
+      seven := seven << noll as bv3;
+  }
+}
+
+method Shifts5()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, bb: bv2, noll: bv0, h: Handful)
+  ensures PQ(x, n, r, even, small, b67, w, seven, bb, noll, h)
+{
+  if {
+    case true =>
+      bb := bb << b67 as bv2;
+    case true =>
+      bb := bb << w as bv2;
+    case true =>
+      bb := bb << seven as bv2;
+    case true =>
+      bb := bb << bb as bv2;
+    case true =>
+      bb := bb << noll as bv2;
+  }
+}
+
+method Shifts6()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, bb: bv2, noll: bv0, h: Handful)
+  ensures PQ(x, n, r, even, small, b67, w, seven, bb, noll, h)
+{
+  if {
+    case true =>
+      noll := noll << b67 as bv0;
+    case true =>
+      noll := noll << w as bv0;
+    case true =>
+      noll := noll << seven as bv0;
+    case true =>
+      noll := noll << bb as bv0;
+    case true =>
+      noll := noll << noll as bv0;
+  }
+}
+
+method TestActualShifting()
+{
+  var a: bv67 := 3;
+  assert a << 2 as bv7 == 12;
+  assert a >> 0 as bv7 == 3;
+  assert a >> 1 as bv7 == 1;
+  assert a >> 2 as bv7 == 0;
+  var b: bv5 := 24;
+  assert b << 1 as bv3 == 16;
+  assert b >> 0 as bv3 == 24;
+  assert b >> 1 as bv3 == 12;
+  assert b >> 2 as bv3 == 6;
+}
+
+method Rotate() returns (x: nat, bb: bv5)
+{
+  if {
+    case true =>
+      bb := bb.RotateLeft(x);
+    case true =>
+      bb := bb.RotateRight(x);
+  }
+}
+
+method TestActualRotate()
+{
+  var a: bv5 := 12;
+  assert a == a.RotateLeft(3).RotateRight(3);
+}
+
+newtype EvenInt = x: int
+  | x % 2 == 0
+
+newtype SmallReal = r: real
+  | -4.0 <= r < 300.0
+
+newtype Handful = x: int
+  | 0 <= x < 80
+BitvectorsMore.dfy(13,9): Error: possible division by zero
+BitvectorsMore.dfy(17,13): Error: possible division by zero
+BitvectorsMore.dfy(21,13): Error: possible division by zero
+BitvectorsMore.dfy(25,13): Error: possible division by zero
+BitvectorsMore.dfy(30,15): Error: possible division by zero
+BitvectorsMore.dfy(32,15): Error: possible division by zero
+BitvectorsMore.dfy(104,37): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv7
+BitvectorsMore.dfy(105,35): Error: shift amount must not exceed the width of the result (67)
+BitvectorsMore.dfy(105,38): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv7
+BitvectorsMore.dfy(107,34): Error: shift amount must not exceed the width of the result (67)
+BitvectorsMore.dfy(107,37): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv7
+BitvectorsMore.dfy(108,34): Error: shift amount must not exceed the width of the result (67)
+BitvectorsMore.dfy(115,42): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv7
+BitvectorsMore.dfy(116,39): Error: shift amount must not exceed the width of the result (67)
+BitvectorsMore.dfy(116,42): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv7
+BitvectorsMore.dfy(124,28): Error: shift amount must not exceed the width of the result (67)
+BitvectorsMore.dfy(124,31): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv7
+BitvectorsMore.dfy(125,28): Error: shift amount must not exceed the width of the result (67)
+BitvectorsMore.dfy(125,31): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv7
+BitvectorsMore.dfy(135,24): Error: shift amount must not exceed the width of the result (32)
+BitvectorsMore.dfy(135,27): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv6
+BitvectorsMore.dfy(136,24): Error: shift amount must not exceed the width of the result (32)
+BitvectorsMore.dfy(136,27): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv6
+BitvectorsMore.dfy(137,24): Error: shift amount must not exceed the width of the result (32)
+BitvectorsMore.dfy(137,27): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv6
+BitvectorsMore.dfy(146,35): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv3
+BitvectorsMore.dfy(147,35): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv3
+BitvectorsMore.dfy(148,35): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv3
+BitvectorsMore.dfy(157,26): Error: shift amount must not exceed the width of the result (2)
+BitvectorsMore.dfy(157,29): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv2
+BitvectorsMore.dfy(158,26): Error: shift amount must not exceed the width of the result (2)
+BitvectorsMore.dfy(158,29): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv2
+BitvectorsMore.dfy(159,26): Error: shift amount must not exceed the width of the result (2)
+BitvectorsMore.dfy(159,29): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv2
+BitvectorsMore.dfy(160,26): Error: shift amount must not exceed the width of the result (2)
+BitvectorsMore.dfy(168,33): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv0
+BitvectorsMore.dfy(169,33): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv0
+BitvectorsMore.dfy(170,33): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv0
+BitvectorsMore.dfy(171,33): Error: when converting shift amount to a bit vector, the value to be converted might not fit in bv0
+BitvectorsMore.dfy(193,36): Error: rotate amount must not exceed the width of the result (5)
+BitvectorsMore.dfy(194,37): Error: rotate amount must not exceed the width of the result (5)
+
+Dafny program verifier finished with 9 verified, 41 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismCompilation.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismCompilation.dfy
new file mode 100644
index 00000000000..aba91847aa4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismCompilation.dfy
@@ -0,0 +1,331 @@
+// RUN: %testDafnyForEachCompiler "%s" -- --type-system-refresh=true --general-traits=datatype
+
+method Main() {
+  As.Test();
+  Is.Test();
+  Basic.Test();
+  Bounds.Test();
+  BoundsAndCasts.Test();
+  Conversions.Test();
+  Operators.Test();
+  ReturnExpr.Test();
+}
+
+module As {
+  trait Parent {
+    const k: int
+  }
+  trait Trait extends Parent { }
+  class Class extends Trait {
+    constructor (n: int) {
+      k := n;
+    }
+  }
+
+  method Test() {
+    var c := new Class(14);
+    M(c);
+    var b := N(c);
+    O(c);
+    P(c);
+  }
+  
+  method M<X extends Trait>(x: X) {
+    var a0 := x as X;
+    var a1 := x as Trait;
+    var a2 := x as Parent;
+    print a1.k, " "; // 14
+  }
+
+  method N<X(==) extends Trait>(x: X) returns (b: bool) {
+    var t: Trait := x as Trait;
+    b := x == t as X;
+    print b, " "; // true
+  }
+
+  method O<Z extends object?>(z: Z) {
+    var a := z as object?;
+    print a != null, " "; // true
+  }
+
+  method P<Z extends object>(z: Z) {
+    var a := z as object?;
+    var b := z as object;
+    print b == a != null, "\n"; // true
+  }
+}
+
+module Is {
+  trait Parent {
+    const k: int
+  }
+  trait Trait extends Parent { }
+  class Class extends Trait {
+    constructor (n: int) {
+      k := n;
+    }
+  }
+
+  method Test() {
+    var c := new Class(14);
+    M(c);
+    O(c); // true true
+    O(null); // true false
+    P(c);
+  }
+  
+  method M<X extends Trait>(x: X) {
+    print x is X, " "; // true
+    print x is Trait, " "; // true
+    print x is Parent, " "; // true
+    print (x as Trait) is Class, "\n"; // false
+  }
+
+  method O<Z extends object?>(z: Z) {
+    print z is object?, " ";
+    print z is object, " ";
+  }
+
+  method P<Z extends object>(z: Z) {
+    print z is object?, " "; // true
+    print z is object, "\n"; // true
+  }
+}
+
+module Basic {
+  trait Parent extends object {
+    const k: int
+  }
+  trait Trait extends Parent { }
+  class Class extends Trait {
+    constructor (n: int) {
+      k := n;
+    }
+  }
+
+  method TestMethod<X extends Trait? extends Parent>(x: X) returns (obj: object?)
+    ensures obj != null
+  {
+    var b := x is Trait;
+    assert b;
+    print b, " "; // true
+
+    b := x is Parent;
+    assert b;
+    print b, " "; // true
+
+    var t: Trait := x as Trait;
+    obj := t;
+  }
+
+  method Test() {
+    var c := new Class(18);
+    var obj := TestMethod(c);
+    print obj != null, "\n"; // true
+  }
+}
+
+module Bounds {
+  trait Trait<X> {
+    function Value(): X
+  }
+
+  datatype Dt extends Trait<string> = Dt(s: string)
+  {
+    function Value(): string { s }
+  }
+
+  method MyMethod<Y extends Trait<string>>(y: Y) {
+    var s := (y as Trait<string>).Value();
+    print "(", s, ")\n";
+  }
+
+  class RandomClass<R> extends Trait<R> {
+    const r: R
+    constructor (r: R) {
+      this.r := r;
+    }
+    function Value(): R { r }
+  }
+
+  method Test() {
+    var d := Dt("hello");
+    MyMethod(d);
+
+    var c := new RandomClass("you don't say");
+    MyMethod(c);
+
+    var v := *; // inferred to be of type string (pretty cool, huh!)
+    var i := new RandomClass(v);
+    MyMethod(i);
+  }
+}
+
+module BoundsAndCasts {
+  method Test() {
+    var rx := Record("X thing");
+    var ry := Record("Y thing");
+    var rp := Record("P thing");
+    var d := Dt(rx);
+    d.M(ry, rp);
+    print d.F(ry, rp), "\n";
+    print d.K(rp), "\n";
+  }
+
+  trait Parent { }
+  trait XTrait extends Parent { }
+  trait YTrait extends Parent { }
+
+  datatype Record extends XTrait, YTrait = Record(s: string)
+
+  datatype Dt<X extends XTrait> = Dt(x: X)
+  {
+    method M<Y extends YTrait>(y: Y, p: X) {
+      var parent: Parent;
+
+      parent := x;
+      print parent, "\n";
+      assert parent is XTrait;
+
+      parent := p;
+      assert parent is XTrait;
+      print parent, "\n";
+
+      parent := y;
+      assert parent is YTrait;
+      print parent, "\n";
+    }
+
+    function F<Y extends YTrait>(y: Y, p: X): int {
+      var parentX: Parent := x;
+      assert parentX is XTrait;
+      var parentP: Parent := p;
+      assert parentP is XTrait;
+      var parentY: Parent := y;
+      assert parentY is YTrait;
+      15
+    }
+
+    const K := (p: X) =>
+      var parentX: Parent := x;
+      assert parentX is XTrait;
+      var parentP: Parent := p;
+      assert parentP is XTrait;
+      17
+  }
+}
+
+module Conversions {
+  trait Trait {
+    function F(): int
+  }
+
+  datatype Dt extends Trait = Dt(u: int) {
+    function F(): int {
+      u
+    }
+  }
+
+  datatype Covariant<+X> = Make(value: X)
+
+  method TestCovarianceZ<Z extends Trait>(z: Z) {
+    var h: Covariant<Z> := Covariant<Z>.Make(z);
+
+    var g: Covariant<Trait>;
+    g := h;
+    g := h as Covariant<Trait>;
+    print (z as Trait).F(), " ", g, " ", h, "\n"; // 5 Dt.Dt(5) Dt.Dt(5)
+  }
+
+  method Test() {
+    var d := Dt(5);
+    TestCovarianceZ(d);
+  }
+}
+
+module Operators {
+  trait Trait extends object { }
+
+  method P8<Z extends Trait>(z: Z, t: Trait) returns (s: seq<Trait>) {
+    s := [z];
+    s := [z as Trait, t];
+    s := s[0 := z];
+    s := s[0 := z as Trait];
+    var zt: Trait := s[0];
+  }
+
+  method P9<Z(==) extends Trait>(z: Z, t: Trait) returns (m: map<Trait, Trait>, mi: map<Trait, Trait>) {
+    m := map[z := z];
+    m := m[z as Trait := z as Trait]; // TODO: these casts should not be needed
+    mi := map[z := z];
+    mi := mi[z as Trait := z as Trait]; // TODO: these casts should not be needed
+
+    m := map[z as Trait := t];
+    m := m[z as Trait := t];
+    mi := map[z as Trait := t];
+    mi := mi[z as Trait := t];
+
+    m := map[t := z as Trait];
+    m := m[t := z as Trait];
+    mi := map[t := z as Trait];
+    mi := mi[t := z as Trait];
+
+    var zt: Trait := m[t];
+    zt := mi[t];
+  }
+
+  method P10<Z(==) extends Trait>(z: Z, t: Trait) returns (m: multiset<Trait>) {
+    m := multiset{z, z};
+    m := multiset{z as Trait, t}; // TODO: this cast should not be needed
+    m := m[z as Trait := 13]; // TODO: this cast should not be needed
+
+    var count := m[z];
+    count := m[t];
+  }
+
+  class CC extends Trait { }
+
+  method Test() {
+    var cc := new CC;
+    var _ := P8(cc, cc);
+    var _, _ := P9(cc, cc);
+    var _ := P10(cc, cc);
+    print "done\n";
+  }
+}
+
+module ReturnExpr {
+  trait Trait {}
+
+  function F<X extends Trait>(x: X): Trait {
+    assert x is Trait;
+    x
+  }
+
+  function G<X extends Trait>(x: X): Trait {
+    x as Trait
+  }
+
+  trait ReferenceTrait extends object {}
+
+  function H<X extends ReferenceTrait>(x: X): ReferenceTrait {
+    assert x is ReferenceTrait;
+    x
+  }
+
+  class C extends Trait, ReferenceTrait {
+  }
+
+  method Test() {
+    var c := new C;
+    for i := 0 to 2 {
+      var t: Trait := if i == 0 then F(c) else G(c);
+      assert c == t;
+      var tc: C := t as C;
+      expect c == tc;
+    }
+
+    var h: ReferenceTrait := H(c);
+    expect c == h;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismCompilation.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismCompilation.dfy.expect
new file mode 100644
index 00000000000..0d195fb86e9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismCompilation.dfy.expect
@@ -0,0 +1,14 @@
+14 true true true
+true true true true
+true true true false true true
+true true true
+(hello)
+(you don't say)
+()
+BoundsAndCasts.Record.Record("X thing")
+BoundsAndCasts.Record.Record("P thing")
+BoundsAndCasts.Record.Record("Y thing")
+15
+17
+5 Conversions.Dt.Dt(5) Conversions.Dt.Dt(5)
+done
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismCompilation.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismCompilation.dfy.rs.check
new file mode 100644
index 00000000000..ccd85524941
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismCompilation.dfy.rs.check
@@ -0,0 +1 @@
+// L-CHECK: error: `_` cannot be a raw identifier
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismResolution.dfy
new file mode 100644
index 00000000000..388cba864ef
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismResolution.dfy
@@ -0,0 +1,465 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --general-traits=datatype
+
+module BadTypeNames {
+  datatype DT<W extends Unknown> = Dt(w: W) // error: what is Unknown?
+
+  type Syn<X extends Unknown> = DT<X> // error: what is Unknown?
+
+  class Class<Y extends Unknown> { // error: what is Unknown?
+  }
+
+  trait AnotherTrait<Z extends Unknown> { // error: what is Unknown?
+  }
+
+  type Abstract<V extends Unknown> // error: what is Unknown?
+
+  trait Generic<Q> { }
+
+  codatatype Mutual<A extends Generic<Z>, B extends Generic<A>> = More(Mutual) // error: what is Z?
+
+  function Function<K extends Unknown>(k: K): int { 2 } // error: what is Unknown?
+
+  method Method<L extends Unknown>(l: L) { } // error: what is Unknown?
+
+  least predicate Least<M extends Unknown>(m: M) { true } // error: what is Unknown?
+
+  greatest lemma Greatest<N extends Unknown>(n: N) { } // error: what is Unknown?
+
+  iterator Iter<O extends Unknown>(o: O) { } // error: what is Unknown?
+}
+
+module AsIsResolve0 {
+  trait Trait extends object {
+    const n: int
+  }
+  trait AnotherTrait { }
+
+  method M<X extends Trait>(x: X) returns (b: bool, t: Trait, u: int) {
+    t := x; // (legacy error)
+    b := x is Trait; // (legacy error)
+    b := x is AnotherTrait; // error: AnotherTrait is not compatible with X
+    b := x is object; // (legacy error)
+    t := x as Trait; // (legacy error)
+    u := t.n;
+    assert x == t; // (legacy error)
+  }
+}
+
+module AsIsResolve1 {
+  trait Trait {
+    const n: int
+  }
+
+  method Q<Y(==) extends Trait>(y: Y) returns (t: Trait, u: int) {
+    t := y as Trait; // (legacy error)
+    u := (y as Trait).n; // (legacy error)
+    u := y.n; // error: y needs to be cast to Trait before .n can be accessed
+  }
+
+  method Nullable<Z extends object>(z: Z) returns (b: bool) {
+    var n;
+    n := z;
+    b := (z as object) as object? == null; // (legacy error)
+    n := null; // error: although n is a reference type, there is no type Z?
+  }
+
+  method T<Z extends object?>(z: Z) {
+    var n;
+    n := z;
+    n := null; // error: although n extends object?, Z may have constraints that exclude "null"
+  }
+
+  trait XTrait<X> { }
+
+  method U<T extends XTrait<int>>(t: T) {
+    var a := t as XTrait<int>; // (legacy error)
+    var b := t as XTrait<bool>; // error: non-compatible types
+  }
+}
+  
+module AsIsResolve2 {
+  trait Trait {
+    const n: int
+  }
+
+  method A<X(==) extends Trait>(x: X, t: Trait) returns (b: bool) {
+    b := x is X;
+    b := x is Trait; // (legacy error)
+    b := t is X; // error: not allowed in compiled code
+    b := t is Trait;
+  }
+
+  method B<X(==) extends Trait>(x: X, t: Trait) returns (ghost g: bool, b: bool) {
+    b := x is X;
+    b := x is Trait; // (legacy error)
+    g := t is X; // (legacy error)
+    b := t is Trait;
+  }
+
+  method N<X extends Trait>(x: X) returns (b: bool, t: Trait) {
+    t := x as Trait; // (legacy error)
+    assert x == t; // (legacy error)
+    ghost var gb := t is X; // (legacy error)
+    b := t is X; // error: this is not allowed in compiled code
+  }
+}
+
+module AsIsResolve3 {
+  trait Trait {
+    const n: int
+  }
+
+  method P<Y extends Trait>(y: Y) returns (b: bool, t: Trait) {
+    t := y as Trait; // (legacy error)
+    assert y == t; // (legacy error)
+    b := y == t; // error: we don't know if y supports equality
+  }
+
+  method R<Y(==) extends Trait>(y: Y) returns (b: bool, t: Trait) {
+    t := y as Trait; // (legacy error)
+    b := y == t; // error: Trait not known to support equality
+  }
+
+  method S<Y extends object>(y: Y) returns (b: bool, obj: object) {
+    obj := y as object; // (legacy error)
+    b := y == obj; // error: Y not known to support equality
+  }
+
+  method Finally<Y(==) extends object>(y: Y) returns (b: bool, obj: object) {
+    obj := y as object; // (legacy error)
+    b := y == obj; // both Y and object support equality, so we're good // (legacy error)
+  }
+}
+
+module AsIsResolve4 {
+  trait Trait { }
+  class Class extends Trait { }
+  
+  method M<X extends Trait>(x: X) {
+    var a0 := x as X; // (legacy error)
+    var a1 := x as Trait; // (legacy error)
+    var a2 := x as Class; // error
+    var a3 := x as int; // error
+  }
+}
+
+module BoundMustBeTrait {
+  trait Trait extends object {
+    const n: int
+  }
+
+  datatype Color = Brown | Peach
+  class Class { }
+  type Synonym = Trait
+  type Subset = t: Trait | t.n == 8 witness *
+
+  datatype D0<W extends int> = Make(w: W) // error: bound must be a trait
+  datatype D1<W extends array<Trait>> = Make(w: W) // error: bound must be a trait
+  datatype D2<W extends Color> = Make(w: W) // error: bound must be a trait
+  datatype D3<W extends Class?> = Make(w: W) // error: bound must be a trait
+  datatype D4<W extends Synonym> = Make(w: W)
+  datatype D5<W extends Subset> = Make(w: W)
+  datatype D6<W extends Trait?> = Make(w: W)
+  datatype D7<W extends Trait> = Make(w: W)
+}
+
+module Refinement {
+  module AA {
+    trait Trait { }
+    trait GenericTrait<X> { }
+
+    type SoonSubsetType0<A>
+    type SoonSubsetType1<A>
+    type SoonSubsetType2<A extends Trait>
+
+    type AbstractType0<A>
+    type AbstractType1<A extends Trait>
+    type AbstractType2<A>
+
+    type AbstractType3<A extends Trait extends object>
+    type AbstractType4<A extends Trait extends object>
+    type AbstractType5<A extends Trait extends object>
+    type AbstractType6<A extends Trait extends object>
+
+    type AbstractType7<A extends GenericTrait<B>, B extends GenericTrait<A>>
+
+    type ToBeReplaced0<A extends Trait>
+    type ToBeReplaced1<A extends Trait>
+    type ToBeReplaced2<A extends Trait>
+    type ToBeReplaced3<A extends Trait>
+    type ToBeReplaced4<A extends Trait>
+    type ToBeReplaced5<A extends Trait>
+
+    method M0<A extends Trait>(u: int)
+    method M1<A extends Trait>(u: int)
+  }
+
+  module BB refines AA {
+    type SoonSubsetType0<B> = int // error: name change not allowed
+    type SoonSubsetType1<B extends Trait> = int // error: name change not allowed
+    type SoonSubsetType2<B> = int // error: name change not allowed
+
+    type AbstractType0<A> // error: name change not allowed
+    type AbstractType1<A> // error: type bounds don't match the ones in AA.AbstractType1
+    type AbstractType2<A extends Trait> // error: type bounds don't match the ones in AAAbstractType2
+
+    type AbstractType3<A extends Trait> // error: wrong number of type bounds
+    type AbstractType4<A extends Trait extends object>
+    type AbstractType5<A extends Trait extends Trait> // error: mismatched bound
+    type AbstractType6<A extends object extends Trait> // error (x2): the order has to be the same (because the checking is rather simplistic)
+
+    type AbstractType7<A extends GenericTrait<B>, B extends GenericTrait<A>>
+
+    datatype ToBeReplaced0<A extends Trait> = Record(a: A)
+    datatype ToBeReplaced1<A extends object> = Record(a: A) // error: mismatched bound
+    type ToBeReplaced2<A extends Trait> = int
+    type ToBeReplaced3<A> = int // error: mismatched bound
+    class ToBeReplaced4<A extends Trait> { }
+    class ToBeReplaced5<A extends object> { } // error: mismatched bound
+
+    method M0<A extends object>(u: int) // error: mismatched bound
+    method M1<A extends Trait>(u: int)
+  }
+}
+
+module CheckArguments {
+  trait Trait<X> {
+    function Value(): X
+  }
+
+  datatype Dt extends Trait<string> = Dt(s: string)
+  {
+    function Value(): string { s }
+  }
+
+  class RandomClass<R> extends Trait<R> {
+    const r: R
+    constructor (r: R) {
+      this.r := r;
+    }
+    function Value(): R { r }
+  }
+
+  method MyMethod<Y extends Trait<string>>(y0: Y)
+  function MyFunction<Y extends Trait<string>>(y1: Y): int
+  class MyClass<Y extends Trait<string>> {
+    constructor (y2: Y)
+  }
+
+  method Test() {
+    var m := new RandomClass(3.14);
+    MyMethod(m); // error: type parameter is RandomClass<real>, which is not a Trait<string> as required by type bound
+
+    var n := new RandomClass('x');
+    var _ := MyFunction(n); // error: type parameter is RandomClass<char>, which is not a Trait<string> as required by type bound
+
+    var o := new RandomClass(500);
+    var oo := new MyClass(o); // error: type parameter is RandomClass<int>, which is not a Trait<string> as required by type bound
+  }
+}
+
+module Overrides {
+  trait Base {
+    function F<X extends object>(): int
+    method M<X extends object>()
+  }
+
+  class Class extends Base {
+    function F<X extends object extends object>(): int { 2 } // error: number of bounds is different
+    method M<X extends object?>() { } // error: bound is different
+  }
+
+  type ObjectSynonym = object
+
+  type AbstractType extends Base {
+    function F<Y extends object>(): int { 2 } // error: type parameter has been renamed
+    method M<X extends ObjectSynonym>() { } // the synonym here is okay
+  }
+
+  // ---
+
+  trait GenericBound<Z> { }
+
+  trait Parent {
+    function F<X extends GenericBound<Y>, Y extends GenericBound<X>>(): int
+    method M<X extends GenericBound<Y>, Y extends GenericBound<X>>()
+    greatest lemma L<X extends GenericBound<int>, Y extends IntGenericBound>()
+  }
+
+  type IntGenericBound = GenericBound<int>
+
+  codatatype SomeGood extends Parent = More
+  {
+    function F<X extends GenericBound<Y>, Y extends GenericBound<X>>(): int { 2 }
+    method M<X extends GenericBound<Y>, Y extends GenericBound<int>>() { } // error: bound of Y is different
+    greatest lemma L<X extends IntGenericBound, Y extends GenericBound<int>>() { }
+  }
+
+  datatype CoSomeGood extends Parent = More
+  {
+    function F<Y extends GenericBound<X>, X extends GenericBound<Y>>(): int { 2 } // error (x2): type parameters have been renamed
+    method M<X extends IntGenericBound, Y extends GenericBound<X>>() { } // error: bound is different
+    greatest lemma L<X extends GenericBound<X>, Y extends IntGenericBound>() { } // error: bound is different
+  }
+
+  trait AnotherTrait extends Parent {
+    greatest lemma L<X extends GenericBound<int>, Y extends GenericBound<X>>() { } // error: bound is different
+  }
+}
+
+module VariousBounds {
+  trait Parent { }
+  trait XTrait extends Parent { }
+  trait YTrait extends Parent { }
+
+  datatype Dt<X extends XTrait> = Dt(x: X)
+  {
+    method M<Y extends YTrait>(y: Y) {
+      var parent: Parent;
+      parent := x; // (legacy error)
+      assert parent is XTrait; // (legacy error)
+      parent := y; // (legacy error)
+      assert parent is YTrait; // (legacy error)
+    }
+  }
+}
+
+module MoreRefinement {
+  module AA {
+    trait Trait { }
+    trait G<X> { }
+    trait H<X> { }
+
+    type AbstractType0<A extends G<A>, B>
+    type AbstractType1<A, B extends G<A>>
+    type AbstractType2<A extends G<A>, B extends G<A>>
+    type AbstractType3<A extends G<A>, B extends G<A>>
+
+    function F0<A, B extends G<A>>(): int
+    function F1<A, B extends G<A>>(): int
+    function F2<A, B>(): A
+    function F3<A, B>(a: A): int
+    function F4<A, B>(a: A): A
+
+    method M0<A, B extends G<A>>()
+    method M1<A, B extends G<A>>()
+    method M2<A, B>() returns (a: A)
+    method M3<A, B>(a: A)
+    method M4<A, B>(a: A) returns (r: A)
+  }
+
+  module BB refines AA {
+    type AbstractType0<A extends G<B>, B> // error: the type bounds are not the same
+    type AbstractType1<A, B extends G<B>> // error: the type bounds are not the same
+    type AbstractType2<A extends G<A>, B extends G<A>>
+    type AbstractType3<A extends G<A>, B extends H<A>> // error: the type bounds are not the same
+
+    function F0<A, B extends G<B>>(): int // error: the type bounds are not the same
+    function F1<A, B extends G<A>>(): int
+    function F2<A, B>(): B // error: mismatched result type
+    function F3<A, B>(b: B): int // error: mismatched in-parameter type
+    function F4<A, B>(a: A): A
+
+    method M0<A, B extends G<B>>() // error: the type bounds are not the same
+    method M1<A, B extends G<A>>()
+    method M2<A, B>() returns (b: B) // error: mismatched out-parameter type
+    method M3<A, B>(b: B) // error: mismatched in-parameter type
+    method M4<A, B>(a: A) returns (r: A)
+  }
+}
+
+module RefinementRegressions {
+  module AA {
+    datatype D<X> = D(x: X)
+  }
+
+  module BB refines AA {
+    type X = int
+    datatype D<Y> ... // error: not allowed to rename type parameter
+  }
+
+  abstract module XX {
+    type D<X>
+    class C<X> {
+      var x: X
+      constructor Orig(x: X) {
+        this.x := x;
+      }
+      method Print() {
+        print x, "\n";
+      }
+    }
+
+    method G() returns (r: C<char>) {
+      r := new C<char>.Orig('h'); // error (reported as part of YY): 'h' used when an 'int' is expected (strange error, caused by the renaming error in YY)
+    }
+  }
+
+  module YY refines XX {
+    type D<Z> = X // error: not allowed to rename type parameter
+    type X = int
+    class C<Y> ... { // error: not allowed to rename type parameter
+      var y: Y
+      constructor Alt(y: Y) {
+        this.x := 15;
+        this.y := y;
+      }
+    }
+
+    method Test() {
+      var c := new C<real>.Alt(3.2);
+      var d := new C<real>.Orig(3);
+      c.Print();
+      d.Print();
+    }
+  }
+
+}
+
+module BadBounds {
+  trait GoodTrait { }
+
+  method M<G extends GoodTrait>(g: G) { }
+
+  method MCaller(r: real, n: nat) {
+    M(r); // error: type argument does not satisfy bound GoodTrait
+    M(n); // error: type argument does not satisfy bound GoodTrait
+  }
+
+  trait ReferenceTrait extends object {
+    const u: int
+  }
+
+  type ConstrainedReferenceTrait = r: ReferenceTrait | r.u < 100 witness *
+
+  method P<R extends ReferenceTrait?, S extends ReferenceTrait, T extends ConstrainedReferenceTrait>(r: R, s: S, t: T) { }
+
+  method PCaller(r: ReferenceTrait?, s: ReferenceTrait, t: ConstrainedReferenceTrait) {
+    P(r, s, t);
+    P(t, t, t);
+    P(s, s, s); // error: type argument 2 is not a ConstrainedReferenceTrait
+    P(r, r, t); // error: type argument 1 is not a ReferenceTrait
+    P(r, s, r); // error: type argument 2 is not a ConstrainedReferenceTrait
+
+    P<ReferenceTrait?, ReferenceTrait, ConstrainedReferenceTrait>(r, s, t);
+    P<ReferenceTrait?, ReferenceTrait, ConstrainedReferenceTrait>(t, t, t);
+    // The value parameters passed into the following three calls are incorrect. However, these are checked
+    // by the verifier, so the resolver does not flag these. (See BoundedPolymorphismVerification.dfy.)
+    P<ReferenceTrait?, ReferenceTrait, ConstrainedReferenceTrait>(s, s, s);
+    P<ReferenceTrait?, ReferenceTrait, ConstrainedReferenceTrait>(r, r, t);
+    P<ReferenceTrait?, ReferenceTrait, ConstrainedReferenceTrait>(r, s, r);
+  }
+
+  class E extends GoodTrait { }
+
+  method Q<G extends GoodTrait>(g: G) { }
+
+  method QCaller(e: E, eMaybe: E?) {
+    Q(e);
+    Q(eMaybe); // error: type E? does not satisfy GoodTrait (because an E? may be null)
+    Q<E>(e);
+    Q<E>(eMaybe); // parameter "eMaybe" might not be of the type E, but that's checked by the verifier
+    Q<E?>(e); // error: type E? does not satisfy GoodTrait (because an E? may be null)
+    Q<E?>(eMaybe); // error: type E? does not satisfy GoodTrait (because an E? may be null)
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismResolution.dfy.expect
new file mode 100644
index 00000000000..76243c18260
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismResolution.dfy.expect
@@ -0,0 +1,105 @@
+BoundedPolymorphismResolution.dfy(20,30): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(22,26): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(24,34): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(26,36): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(4,24): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(6,21): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(8,24): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(8,24): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(11,31): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(14,26): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(18,38): Error: Type or type parameter is not declared in this scope: Z (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(28,26): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(28,26): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(38,6): Error: RHS (of type X) not assignable to LHS (of type Trait)
+BoundedPolymorphismResolution.dfy(39,11): Error: type test for type 'Trait' must be from an expression assignable to it (got 'X')
+BoundedPolymorphismResolution.dfy(40,11): Error: type test for type 'AnotherTrait' must be from an expression assignable to it (got 'X')
+BoundedPolymorphismResolution.dfy(41,11): Error: type test for type 'object' must be from an expression assignable to it (got 'X')
+BoundedPolymorphismResolution.dfy(42,11): Error: type cast to reference type 'Trait' must be from an expression assignable to it (got 'X')
+BoundedPolymorphismResolution.dfy(44,13): Error: arguments must have comparable types (got X and Trait)
+BoundedPolymorphismResolution.dfy(56,11): Error: type Y does not have a member n
+BoundedPolymorphismResolution.dfy(54,11): Error: type cast to trait type 'Trait' must be from an expression assignable to it (got 'Y')
+BoundedPolymorphismResolution.dfy(55,12): Error: type cast to trait type 'Trait' must be from an expression assignable to it (got 'Y')
+BoundedPolymorphismResolution.dfy(62,12): Error: type cast to reference type 'object' must be from an expression assignable to it (got 'Z')
+BoundedPolymorphismResolution.dfy(63,9): Error: type of 'null' is a reference type, but it is used as Z
+BoundedPolymorphismResolution.dfy(69,9): Error: type of 'null' is a reference type, but it is used as Z
+BoundedPolymorphismResolution.dfy(75,15): Error: type cast to trait type 'XTrait<int>' must be from an expression assignable to it (got 'T')
+BoundedPolymorphismResolution.dfy(76,15): Error: type cast to trait type 'XTrait<bool>' must be from an expression assignable to it (got 'T')
+BoundedPolymorphismResolution.dfy(87,11): Error: type test for type 'Trait' must be from an expression assignable to it (got 'X')
+BoundedPolymorphismResolution.dfy(88,11): Error: type test for type 'X' must be from an expression assignable to it (got 'Trait')
+BoundedPolymorphismResolution.dfy(94,11): Error: type test for type 'Trait' must be from an expression assignable to it (got 'X')
+BoundedPolymorphismResolution.dfy(95,11): Error: type test for type 'X' must be from an expression assignable to it (got 'Trait')
+BoundedPolymorphismResolution.dfy(100,11): Error: type cast to trait type 'Trait' must be from an expression assignable to it (got 'X')
+BoundedPolymorphismResolution.dfy(101,13): Error: arguments must have comparable types (got X and Trait)
+BoundedPolymorphismResolution.dfy(102,22): Error: type test for type 'X' must be from an expression assignable to it (got 'Trait')
+BoundedPolymorphismResolution.dfy(103,11): Error: type test for type 'X' must be from an expression assignable to it (got 'Trait')
+BoundedPolymorphismResolution.dfy(113,11): Error: type cast to trait type 'Trait' must be from an expression assignable to it (got 'Y')
+BoundedPolymorphismResolution.dfy(114,13): Error: arguments must have comparable types (got Y and Trait)
+BoundedPolymorphismResolution.dfy(115,11): Error: arguments must have comparable types (got Y and Trait)
+BoundedPolymorphismResolution.dfy(119,11): Error: type cast to trait type 'Trait' must be from an expression assignable to it (got 'Y')
+BoundedPolymorphismResolution.dfy(120,11): Error: arguments must have comparable types (got Y and Trait)
+BoundedPolymorphismResolution.dfy(124,13): Error: type cast to reference type 'object' must be from an expression assignable to it (got 'Y')
+BoundedPolymorphismResolution.dfy(125,11): Error: arguments must have comparable types (got Y and object)
+BoundedPolymorphismResolution.dfy(129,13): Error: type cast to reference type 'object' must be from an expression assignable to it (got 'Y')
+BoundedPolymorphismResolution.dfy(130,11): Error: arguments must have comparable types (got Y and object)
+BoundedPolymorphismResolution.dfy(139,16): Error: type conversions are not supported to this type (got X)
+BoundedPolymorphismResolution.dfy(140,16): Error: type cast to trait type 'Trait' must be from an expression assignable to it (got 'X')
+BoundedPolymorphismResolution.dfy(141,16): Error: type cast to reference type 'Class' must be from an expression assignable to it (got 'X')
+BoundedPolymorphismResolution.dfy(142,16): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got X)
+BoundedPolymorphismResolution.dfy(156,11): Error: type bound must be a trait or a subset type based on a trait (got int)
+BoundedPolymorphismResolution.dfy(157,11): Error: type bound must be a trait or a subset type based on a trait (got array<Trait>)
+BoundedPolymorphismResolution.dfy(158,11): Error: type bound must be a trait or a subset type based on a trait (got Color)
+BoundedPolymorphismResolution.dfy(159,11): Error: type bound must be a trait or a subset type based on a trait (got Class?)
+BoundedPolymorphismResolution.dfy(220,14): Error: type bound for type parameter 'A' of method 'M0' is different from the corresponding type bound of the corresponding type parameter of the corresponding method in the module it refines (expected 'Trait', found 'object')
+BoundedPolymorphismResolution.dfy(198,25): Error: type parameters are not allowed to be renamed from the names given in the type in the module being refined (expected 'A', found 'B')
+BoundedPolymorphismResolution.dfy(199,25): Error: type parameters are not allowed to be renamed from the names given in the type in the module being refined (expected 'A', found 'B')
+BoundedPolymorphismResolution.dfy(200,25): Error: type parameters are not allowed to be renamed from the names given in the type in the module being refined (expected 'A', found 'B')
+BoundedPolymorphismResolution.dfy(203,23): Error: type parameter 'A' of abstract type 'AbstractType1' is declared with a different number of type bounds than in the corresponding abstract type in the module it refines (expected 1, found 0)
+BoundedPolymorphismResolution.dfy(204,23): Error: type parameter 'A' of abstract type 'AbstractType2' is declared with a different number of type bounds than in the corresponding abstract type in the module it refines (expected 0, found 1)
+BoundedPolymorphismResolution.dfy(206,23): Error: type parameter 'A' of abstract type 'AbstractType3' is declared with a different number of type bounds than in the corresponding abstract type in the module it refines (expected 2, found 1)
+BoundedPolymorphismResolution.dfy(208,23): Error: type bound for type parameter 'A' of abstract type 'AbstractType5' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'object', found 'Trait')
+BoundedPolymorphismResolution.dfy(209,23): Error: type bound for type parameter 'A' of abstract type 'AbstractType6' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'Trait', found 'object')
+BoundedPolymorphismResolution.dfy(209,23): Error: type bound for type parameter 'A' of abstract type 'AbstractType6' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'object', found 'Trait')
+BoundedPolymorphismResolution.dfy(214,27): Error: type bound for type parameter 'A' of datatype 'ToBeReplaced1' is different from the corresponding type bound of the corresponding type parameter of the corresponding datatype in the module it refines (expected 'Trait', found 'object')
+BoundedPolymorphismResolution.dfy(216,23): Error: type parameter 'A' of type 'ToBeReplaced3' is declared with a different number of type bounds than in the corresponding type in the module it refines (expected 1, found 0)
+BoundedPolymorphismResolution.dfy(218,24): Error: type bound for type parameter 'A' of class 'ToBeReplaced5' is different from the corresponding type bound of the corresponding type parameter of the corresponding class in the module it refines (expected 'Trait', found 'object')
+BoundedPolymorphismResolution.dfy(218,10): Error: type parameter ('A') passed to type 'ToBeReplaced5' must meet type bound 'object' (got 'A')
+BoundedPolymorphismResolution.dfy(251,12): Error: type parameter ('Y') passed to method 'MyMethod' must meet type bound 'Trait<string>' (got 'RandomClass<real>')
+BoundedPolymorphismResolution.dfy(254,23): Error: type parameter ('Y') passed to function 'MyFunction' must meet type bound 'Trait<string>' (got 'RandomClass<char>')
+BoundedPolymorphismResolution.dfy(257,18): Error: type parameter ('Y') passed to type 'MyClass' must meet type bound 'Trait<string>' (got 'RandomClass<int>')
+BoundedPolymorphismResolution.dfy(257,18): Error: type parameter ('Y') passed to type 'MyClass' must meet type bound 'Trait<string>' (got 'RandomClass<int>')
+BoundedPolymorphismResolution.dfy(268,15): Error: type parameter 'X' of function 'F' is declared with a different number of type bounds than in the function it overrides (expected 1, found 2)
+BoundedPolymorphismResolution.dfy(269,13): Error: type bound for type parameter 'X' of method 'M' is different from the corresponding type bound of the corresponding type parameter of the method it overrides (expected 'object', found 'object?')
+BoundedPolymorphismResolution.dfy(275,15): Error: type parameters in this function override are not allowed to be renamed from the names given in the the function it overrides (expected 'X', got 'Y')
+BoundedPolymorphismResolution.dfy(294,40): Error: type bound for type parameter 'Y' of method 'M' is different from the corresponding type bound of the corresponding type parameter of the method it overrides (expected 'GenericBound<X>', found 'GenericBound<int>')
+BoundedPolymorphismResolution.dfy(300,15): Error: type parameters in this function override are not allowed to be renamed from the names given in the the function it overrides (expected 'X', got 'Y')
+BoundedPolymorphismResolution.dfy(300,42): Error: type parameters in this function override are not allowed to be renamed from the names given in the the function it overrides (expected 'Y', got 'X')
+BoundedPolymorphismResolution.dfy(301,13): Error: type bound for type parameter 'X' of method 'M' is different from the corresponding type bound of the corresponding type parameter of the method it overrides (expected 'GenericBound<Y>', found 'GenericBound<int>')
+BoundedPolymorphismResolution.dfy(302,21): Error: type bound for type parameter 'X' of method 'L' is different from the corresponding type bound of the corresponding type parameter of the method it overrides (expected 'GenericBound<int>', found 'GenericBound<X>')
+BoundedPolymorphismResolution.dfy(306,50): Error: type bound for type parameter 'Y' of method 'L' is different from the corresponding type bound of the corresponding type parameter of the method it overrides (expected 'GenericBound<int>', found 'GenericBound<X>')
+BoundedPolymorphismResolution.dfy(319,13): Error: RHS (of type X) not assignable to LHS (of type Parent)
+BoundedPolymorphismResolution.dfy(320,20): Error: type test for type 'XTrait' must be from an expression assignable to it (got 'Parent')
+BoundedPolymorphismResolution.dfy(321,13): Error: RHS (of type Y) not assignable to LHS (of type Parent)
+BoundedPolymorphismResolution.dfy(322,20): Error: type test for type 'YTrait' must be from an expression assignable to it (got 'Parent')
+BoundedPolymorphismResolution.dfy(357,19): Error: type bound for type parameter 'B' of function 'F0' is different from the corresponding type bound of the corresponding type parameter of the corresponding function in the module it refines (expected 'G<A>', found 'G<B>')
+BoundedPolymorphismResolution.dfy(359,13): Error: the result type of function 'F2' (B) differs from the result type of the corresponding function in the module it refines (A)
+BoundedPolymorphismResolution.dfy(360,22): Error: there is a difference in name of parameter 0 ('b' versus 'a') of function F3 compared to corresponding function in the module it refines
+BoundedPolymorphismResolution.dfy(363,17): Error: type bound for type parameter 'B' of method 'M0' is different from the corresponding type bound of the corresponding type parameter of the corresponding method in the module it refines (expected 'G<A>', found 'G<B>')
+BoundedPolymorphismResolution.dfy(365,31): Error: there is a difference in name of out-parameter 0 ('b' versus 'a') of method M2 compared to corresponding method in the module it refines
+BoundedPolymorphismResolution.dfy(366,20): Error: there is a difference in name of in-parameter 0 ('b' versus 'a') of method M3 compared to corresponding method in the module it refines
+BoundedPolymorphismResolution.dfy(352,23): Error: type bound for type parameter 'A' of abstract type 'AbstractType0' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'G<A>', found 'G<B>')
+BoundedPolymorphismResolution.dfy(353,26): Error: type bound for type parameter 'B' of abstract type 'AbstractType1' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'G<A>', found 'G<B>')
+BoundedPolymorphismResolution.dfy(355,39): Error: type bound for type parameter 'B' of abstract type 'AbstractType3' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'G<A>', found 'H<A>')
+BoundedPolymorphismResolution.dfy(378,15): Error: type parameters are not allowed to be renamed from the names given in the datatype in the module being refined (expected 'X', found 'Y')
+BoundedPolymorphismResolution.dfy(399,11): Error: type parameters are not allowed to be renamed from the names given in the type in the module being refined (expected 'X', found 'Z')
+BoundedPolymorphismResolution.dfy(401,12): Error: type parameters are not allowed to be renamed from the names given in the class in the module being refined (expected 'X', found 'Y')
+BoundedPolymorphismResolution.dfy[YY](394,28): Error: incorrect argument type for constructor in-parameter 'x' (expected X, found char)
+BoundedPolymorphismResolution.dfy(425,5): Error: type parameter ('G') passed to method 'M' must meet type bound 'GoodTrait' (got 'real')
+BoundedPolymorphismResolution.dfy(426,5): Error: type parameter ('G') passed to method 'M' must meet type bound 'GoodTrait' (got 'nat')
+BoundedPolymorphismResolution.dfy(440,5): Error: type parameter 2 ('T') passed to method 'P' must meet type bound 'ConstrainedReferenceTrait' (got 'ReferenceTrait')
+BoundedPolymorphismResolution.dfy(441,5): Error: type parameter 1 ('S') passed to method 'P' must meet type bound 'ReferenceTrait' (got 'ReferenceTrait?')
+BoundedPolymorphismResolution.dfy(442,5): Error: type parameter 2 ('T') passed to method 'P' must meet type bound 'ConstrainedReferenceTrait' (got 'ReferenceTrait?')
+BoundedPolymorphismResolution.dfy(459,5): Error: type parameter ('G') passed to method 'Q' must meet type bound 'GoodTrait' (got 'E?')
+BoundedPolymorphismResolution.dfy(462,9): Error: type parameter ('G') passed to method 'Q' must meet type bound 'GoodTrait' (got 'E?')
+BoundedPolymorphismResolution.dfy(463,9): Error: type parameter ('G') passed to method 'Q' must meet type bound 'GoodTrait' (got 'E?')
+104 resolution/type errors detected in BoundedPolymorphismResolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismResolution.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismResolution.dfy.refresh.expect
new file mode 100644
index 00000000000..c349cc75f8f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismResolution.dfy.refresh.expect
@@ -0,0 +1,71 @@
+BoundedPolymorphismResolution.dfy(20,30): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(22,26): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(24,34): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(26,36): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(4,24): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(6,21): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(8,24): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(8,24): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(11,31): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(14,26): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(18,38): Error: Type or type parameter is not declared in this scope: Z (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(28,26): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(28,26): Error: Type or type parameter is not declared in this scope: Unknown (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+BoundedPolymorphismResolution.dfy(40,11): Error: type test for type 'AnotherTrait' must be from an expression assignable to it (got 'X')
+BoundedPolymorphismResolution.dfy(56,11): Error: member 'n' does not exist in type parameter 'Y'
+BoundedPolymorphismResolution.dfy(63,9): Error: type of 'null' is a reference type, but it is used as Z
+BoundedPolymorphismResolution.dfy(69,9): Error: type of 'null' is a reference type, but it is used as Z
+BoundedPolymorphismResolution.dfy(76,15): Error: type cast to trait type 'XTrait<bool>' must be from an expression of a compatible type (got 'T')
+BoundedPolymorphismResolution.dfy(88,11): Error: an expression of type 'Trait' is not run-time checkable to be a 'X'
+BoundedPolymorphismResolution.dfy(103,11): Error: an expression of type 'Trait' is not run-time checkable to be a 'X'
+BoundedPolymorphismResolution.dfy(115,9): Error: == can only be applied to expressions of types that support equality (got Y) (perhaps try declaring type parameter 'Y' on line 112 as 'Y(==)', which says it can only be instantiated with a type that supports equality)
+BoundedPolymorphismResolution.dfy(120,14): Error: == can only be applied to expressions of types that support equality (got Trait)
+BoundedPolymorphismResolution.dfy(125,9): Error: == can only be applied to expressions of types that support equality (got Y) (perhaps try declaring type parameter 'Y' on line 123 as 'Y(==)', which says it can only be instantiated with a type that supports equality)
+BoundedPolymorphismResolution.dfy(141,16): Error: type cast to reference type 'Class' must be from an expression of a compatible type (got 'X')
+BoundedPolymorphismResolution.dfy(142,16): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got X)
+BoundedPolymorphismResolution.dfy(156,11): Error: type bound must be a trait or a subset type based on a trait (got int)
+BoundedPolymorphismResolution.dfy(157,11): Error: type bound must be a trait or a subset type based on a trait (got array<Trait>)
+BoundedPolymorphismResolution.dfy(158,11): Error: type bound must be a trait or a subset type based on a trait (got Color)
+BoundedPolymorphismResolution.dfy(159,11): Error: type bound must be a trait or a subset type based on a trait (got Class?)
+BoundedPolymorphismResolution.dfy(220,14): Error: type bound for type parameter 'A' of method 'M0' is different from the corresponding type bound of the corresponding type parameter of the corresponding method in the module it refines (expected 'Trait', found 'object')
+BoundedPolymorphismResolution.dfy(198,25): Error: type parameters are not allowed to be renamed from the names given in the type in the module being refined (expected 'A', found 'B')
+BoundedPolymorphismResolution.dfy(199,25): Error: type parameters are not allowed to be renamed from the names given in the type in the module being refined (expected 'A', found 'B')
+BoundedPolymorphismResolution.dfy(200,25): Error: type parameters are not allowed to be renamed from the names given in the type in the module being refined (expected 'A', found 'B')
+BoundedPolymorphismResolution.dfy(203,23): Error: type parameter 'A' of abstract type 'AbstractType1' is declared with a different number of type bounds than in the corresponding abstract type in the module it refines (expected 1, found 0)
+BoundedPolymorphismResolution.dfy(204,23): Error: type parameter 'A' of abstract type 'AbstractType2' is declared with a different number of type bounds than in the corresponding abstract type in the module it refines (expected 0, found 1)
+BoundedPolymorphismResolution.dfy(206,23): Error: type parameter 'A' of abstract type 'AbstractType3' is declared with a different number of type bounds than in the corresponding abstract type in the module it refines (expected 2, found 1)
+BoundedPolymorphismResolution.dfy(208,23): Error: type bound for type parameter 'A' of abstract type 'AbstractType5' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'object', found 'Trait')
+BoundedPolymorphismResolution.dfy(209,23): Error: type bound for type parameter 'A' of abstract type 'AbstractType6' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'Trait', found 'object')
+BoundedPolymorphismResolution.dfy(209,23): Error: type bound for type parameter 'A' of abstract type 'AbstractType6' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'object', found 'Trait')
+BoundedPolymorphismResolution.dfy(214,27): Error: type bound for type parameter 'A' of datatype 'ToBeReplaced1' is different from the corresponding type bound of the corresponding type parameter of the corresponding datatype in the module it refines (expected 'Trait', found 'object')
+BoundedPolymorphismResolution.dfy(216,23): Error: type parameter 'A' of type 'ToBeReplaced3' is declared with a different number of type bounds than in the corresponding type in the module it refines (expected 1, found 0)
+BoundedPolymorphismResolution.dfy(218,24): Error: type bound for type parameter 'A' of class 'ToBeReplaced5' is different from the corresponding type bound of the corresponding type parameter of the corresponding class in the module it refines (expected 'Trait', found 'object')
+BoundedPolymorphismResolution.dfy(218,10): Error: type parameter ('A') passed to type 'ToBeReplaced5' must meet type bound 'object' (got 'A')
+BoundedPolymorphismResolution.dfy(251,13): Error: incorrect argument type for method in-parameter 'y0' (expected RandomClass?<string>, found RandomClass?<real>) (non-variant type parameter 'R' would require string = real)
+BoundedPolymorphismResolution.dfy(254,24): Error: incorrect argument type for function parameter 'y1' (expected RandomClass?<string>, found RandomClass?<char>) (non-variant type parameter 'R' would require string = char)
+BoundedPolymorphismResolution.dfy(257,26): Error: incorrect argument type for constructor in-parameter 'y2' (expected RandomClass?<string>, found RandomClass?<int>) (non-variant type parameter 'R' would require string = int)
+BoundedPolymorphismResolution.dfy(268,15): Error: type parameter 'X' of function 'F' is declared with a different number of type bounds than in the function it overrides (expected 1, found 2)
+BoundedPolymorphismResolution.dfy(269,13): Error: type bound for type parameter 'X' of method 'M' is different from the corresponding type bound of the corresponding type parameter of the method it overrides (expected 'object', found 'object?')
+BoundedPolymorphismResolution.dfy(275,15): Error: type parameters in this function override are not allowed to be renamed from the names given in the the function it overrides (expected 'X', got 'Y')
+BoundedPolymorphismResolution.dfy(294,40): Error: type bound for type parameter 'Y' of method 'M' is different from the corresponding type bound of the corresponding type parameter of the method it overrides (expected 'GenericBound<X>', found 'GenericBound<int>')
+BoundedPolymorphismResolution.dfy(300,15): Error: type parameters in this function override are not allowed to be renamed from the names given in the the function it overrides (expected 'X', got 'Y')
+BoundedPolymorphismResolution.dfy(300,42): Error: type parameters in this function override are not allowed to be renamed from the names given in the the function it overrides (expected 'Y', got 'X')
+BoundedPolymorphismResolution.dfy(301,13): Error: type bound for type parameter 'X' of method 'M' is different from the corresponding type bound of the corresponding type parameter of the method it overrides (expected 'GenericBound<Y>', found 'GenericBound<int>')
+BoundedPolymorphismResolution.dfy(302,21): Error: type bound for type parameter 'X' of method 'L' is different from the corresponding type bound of the corresponding type parameter of the method it overrides (expected 'GenericBound<int>', found 'GenericBound<X>')
+BoundedPolymorphismResolution.dfy(306,50): Error: type bound for type parameter 'Y' of method 'L' is different from the corresponding type bound of the corresponding type parameter of the method it overrides (expected 'GenericBound<int>', found 'GenericBound<X>')
+BoundedPolymorphismResolution.dfy(357,19): Error: type bound for type parameter 'B' of function 'F0' is different from the corresponding type bound of the corresponding type parameter of the corresponding function in the module it refines (expected 'G<A>', found 'G<B>')
+BoundedPolymorphismResolution.dfy(359,13): Error: the result type of function 'F2' (B) differs from the result type of the corresponding function in the module it refines (A)
+BoundedPolymorphismResolution.dfy(360,22): Error: there is a difference in name of parameter 0 ('b' versus 'a') of function F3 compared to corresponding function in the module it refines
+BoundedPolymorphismResolution.dfy(363,17): Error: type bound for type parameter 'B' of method 'M0' is different from the corresponding type bound of the corresponding type parameter of the corresponding method in the module it refines (expected 'G<A>', found 'G<B>')
+BoundedPolymorphismResolution.dfy(365,31): Error: there is a difference in name of out-parameter 0 ('b' versus 'a') of method M2 compared to corresponding method in the module it refines
+BoundedPolymorphismResolution.dfy(366,20): Error: there is a difference in name of in-parameter 0 ('b' versus 'a') of method M3 compared to corresponding method in the module it refines
+BoundedPolymorphismResolution.dfy(352,23): Error: type bound for type parameter 'A' of abstract type 'AbstractType0' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'G<A>', found 'G<B>')
+BoundedPolymorphismResolution.dfy(353,26): Error: type bound for type parameter 'B' of abstract type 'AbstractType1' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'G<A>', found 'G<B>')
+BoundedPolymorphismResolution.dfy(355,39): Error: type bound for type parameter 'B' of abstract type 'AbstractType3' is different from the corresponding type bound of the corresponding type parameter of the corresponding abstract type in the module it refines (expected 'G<A>', found 'H<A>')
+BoundedPolymorphismResolution.dfy(378,15): Error: type parameters are not allowed to be renamed from the names given in the datatype in the module being refined (expected 'X', found 'Y')
+BoundedPolymorphismResolution.dfy(399,11): Error: type parameters are not allowed to be renamed from the names given in the type in the module being refined (expected 'X', found 'Z')
+BoundedPolymorphismResolution.dfy(401,12): Error: type parameters are not allowed to be renamed from the names given in the class in the module being refined (expected 'X', found 'Y')
+BoundedPolymorphismResolution.dfy[YY](394,28): Error: character literal used as if it had type int
+BoundedPolymorphismResolution.dfy(425,4): Error: actual type argument 'real' for formal type parameter 'G' must satisfy the type bound 'GoodTrait'
+BoundedPolymorphismResolution.dfy(425,5): Error: actual type argument 'real' for formal type parameter 'G' must satisfy the type bound 'GoodTrait'
+70 resolution/type errors detected in BoundedPolymorphismResolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismVerification.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismVerification.dfy
new file mode 100644
index 00000000000..f2322ccf4f4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismVerification.dfy
@@ -0,0 +1,422 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module As {
+  trait Parent { }
+  trait Trait extends Parent { }
+  trait TheOther extends Parent { }
+
+  method M<X extends Trait>(x: X) {
+    var a0 := x as X;
+    var a1 := x as Trait;
+    var a2 := x as Parent;
+    var a3 := (x as Parent) as TheOther; // error: cannot prove "as TheOther"
+  }
+
+  method N<X(==) extends Trait>(x: X) returns (b: bool) {
+    var t: Trait := x as Trait;
+    if * {
+      b := x == t as X; // fine
+    } else {
+      t := *;
+      b := x == t as X; // error: cannot prove the cast, because not every Trait is an X
+    }
+  }
+
+  method O<Z extends object?>(z: Z) {
+    var a := z as object?;
+    var b := z as object; // error: cannot verify correctness of cast
+  }
+
+  method P<Z extends object>(z: Z) {
+    var a := z as object?;
+    var b := z as object;
+  }
+}
+
+module Is {
+  trait Parent { }
+  trait Trait extends Parent { }
+  trait TheOther extends Parent { }
+
+  method M<X extends Trait>(x: X) {
+    var a0 := x is X;
+    var a1 := x is Trait;
+    var a2 := x is Parent;
+    var a3 := (x as Parent) is TheOther;
+
+    assert a0 && a1 && a2;
+    assert a3; // error: not known if a3 is a TheOther
+  }
+
+  method N<X(==) extends Trait>(x: X) returns (ghost b: bool) {
+    var t: Trait := x as Trait;
+    if * {
+      b := t is X;
+      assert b;
+    } else {
+      t := *;
+      b := t is X;
+      assert b; // error: not every Trait is an X
+    }
+  }
+
+  method O<Z extends object?>(z: Z) {
+    var a := z is object?;
+    assert a;
+    var b := z is object;
+    assert b; // error: assertion not provable
+  }
+
+  method P<Z extends object>(z: Z) {
+    var a := z is object?;
+    var b := z is object;
+    assert a && b;
+  }
+}
+
+module Equality {
+  method Eq<Y(==) extends object>(y: Y) returns (b: bool, obj: object) {
+    obj := y as object;
+    b := y == obj; // both Y and object support equality, so we're good to compare
+    assert b;
+  }
+}
+
+module TypeBoundKnowledge {
+  trait Parent { }
+  trait XTrait extends Parent { }
+  trait YTrait extends Parent { }
+
+  datatype Dt<X extends XTrait> = Dt(x: X)
+  {
+    method M<Y extends YTrait>(y: Y) {
+      var parent: Parent;
+      parent := x;
+      assert parent is XTrait;
+      parent := y;
+      assert parent is YTrait;
+    }
+
+    function F<Y extends YTrait>(y: Y): int {
+      var parentX: Parent := x;
+      assert parentX is XTrait;
+      var parentY: Parent := y;
+      assert parentY is YTrait;
+      15
+    }
+
+    const K := (x: X) =>
+      var parentX: Parent := x;
+      assert parentX is XTrait;
+      17
+
+    method Negative(xtrait: XTrait) {
+      assert xtrait is X; // error
+    }
+  }
+
+  trait Base<X extends XTrait, W extends XTrait> {
+    method M<Y extends YTrait>(z: int, y: Y, x: X, w: W)
+      requires z == 5
+      requires x is Parent && w is XTrait // this is always true
+    twostate function F<Y extends YTrait>(z: int, y: Y, x: X, w: W): int
+      requires z == 5
+  }
+
+  class XClass extends XTrait { }
+
+  class Class<XX extends XTrait> extends Base<XX, XClass> {
+    method M<Y extends YTrait>(z: int, y: Y, x: XX, w: XClass)
+      requires z == if y is YTrait then 5 else 7
+      requires z == if x is XTrait then 5 else 7
+    {
+    }
+    twostate function F<Y extends YTrait>(z: int, y: Y, x: XX, w: XClass): int
+      requires z == if y is YTrait then 5 else 7
+      requires z == if x is XTrait then 5 else 7
+    {
+      17
+    }
+  }
+
+  class Nope<XX extends XTrait> extends Base<XX, XClass> {
+    method M<Y extends YTrait>(z: int, y: Y, x: XX, w: XClass) // error: precondition does not follow from parent trait
+      requires z == if y as Parent is YTrait then 100 else 700
+    {
+    }
+    twostate function F<Y extends YTrait>(z: int, y: Y, x: XX, w: XClass): int // error: precondition does not follow from parent trait
+      requires z == if y as Parent is XTrait then 100 else 700
+    {
+      17
+    }
+  }
+}
+
+module Boxing {
+  trait Trait extends object { }
+  
+  method P<Z extends Trait>(z: Z) {
+    var a := z as Trait?;
+    var b := z as Trait;
+    
+    var obj: object? := z;
+    assert obj is Trait?;
+    assert obj is Trait;
+  }
+
+  method O<Z extends Trait?>(z: Z) {
+    var a := z as Trait?;
+    if z as object? != null {
+      var b0 := z as Trait;
+    }
+    var b1 := z as Trait; // error: since z may be null
+  }
+}
+
+module MoreBoxing {
+  trait Trait extends object { }
+
+  method P0<Z extends Trait>(z: Z) returns (obj: object?) {
+    obj := z;
+    assert true;
+  }
+
+  class Cell { var obj: object? }
+
+  method P1<Z extends Trait>(z: Z) returns (c: Cell) {
+    c := new Cell;
+    c.obj := z;
+    assert true;
+  }
+
+  method P2<Z extends Trait>(z: Z) returns (obj: array<object?>) {
+    obj := new object?[1];
+    obj[0] := z as object?; // TODO: this cast should not be needed
+    assert true;
+  }
+
+  method P3<Z extends Trait>(z: Z) returns (obj: array2<object?>) {
+    obj := new object?[1, 1];
+    obj[0, 0] := z as object?; // TODO: this cast should not be needed
+    assert true;
+  }
+
+  datatype Record = Record(obj: object?)
+
+  method P4<Z extends Trait>(z: Z) returns (r: Record) {
+    r := Record(z);
+    r := r.(obj := z);
+    assert true;
+  }
+
+  method M<Z extends Trait>(obj: object?, z: Z) returns (r: object?) {
+    return z;
+  }
+
+  method P5<Z extends Trait>(z: Z) returns (obj: object?) {
+    obj := M(z, z);
+    assert true;
+  }
+
+  function F(obj: object?): int { 4 }
+
+  method P6<Z extends Trait>(z: Z) returns (u: int) {
+    u := F(z);
+    assert true;
+  }
+
+  method P7<Z extends Trait>(z: Z) returns (u: int) {
+    u := var obj: object? := z;
+      assert obj == null || obj != null;
+      14;
+    assert true;
+  }
+
+  method P8<Z extends Trait>(z: Z, t: Trait) returns (s: seq<Trait>) {
+    s := [z];
+    s := [z as Trait, t]; // TODO: this cast should not be needed
+    s := s[0 := z];
+    assert s[0] == z as Trait;
+    assert z in s;
+    assert !(z !in s);
+    assert true;
+  }
+
+  method P9<Z(==) extends Trait>(z: Z, t: Trait) returns (m: map<Trait, Trait>, mi: map<Trait, Trait>) {
+    m := map[z := z];
+    m := m[z as Trait := z as Trait]; // TODO: these casts should not be needed
+    mi := map[z := z];
+    mi := mi[z as Trait := z as Trait]; // TODO: these casts should not be needed
+
+    m := map[z as Trait := t];
+    m := m[z as Trait := t];
+    mi := map[z as Trait := t];
+    mi := mi[z as Trait := t];
+
+    m := map[t := z as Trait];
+    m := m[t := z as Trait];
+    mi := map[t := z as Trait];
+    mi := mi[t := z as Trait];
+
+    if t == z as Trait {
+      assert z in m;
+      assert !(z !in m);
+      assert z in mi;
+      assert !(z !in mi);
+    }
+  }
+
+  method P10<Z(==) extends Trait>(z: Z, t: Trait) returns (m: multiset<Trait>) {
+    m := multiset{z, z};
+    m := multiset{z as Trait, t}; // TODO: this cast should not be needed
+    m := m[z as Trait := 13]; // TODO: this cast should not be needed
+    assert z in m;
+    assert !(z !in m);
+  }
+
+  method P11<Z(==) extends Trait>(z: Z, t: Trait) returns (s: set<Trait>, si: iset<Trait>) {
+    s := {z};
+    s := {z as Trait, t}; // TODO: this cast should not be needed
+    assert z in s;
+    assert !(z !in s);
+
+    si := iset{z};
+    si := iset{z as Trait, t}; // TODO: this cast should not be needed
+    assert z in si;
+    assert !(z !in si);
+  }
+
+  method P12<Z(==) extends Trait>(z: Z, t: Trait) returns (s: set<Trait>, si: iset<Trait>) {
+    var A := {z};
+    var B := {z as Trait, t};
+    s := set u: Trait | u in A;
+    s := set u: Trait | u in B; // TODO: this cast should not be needed
+    si := iset u: Trait | u in A;
+    si := iset u: Trait | u in B; // TODO: this cast should not be needed
+  }
+
+  method P14<Z(==) extends Trait>(z: Z, t: Trait) {
+    assert allocated(z);
+  }
+
+  method P15<Z(==) extends Trait>(s: set<Z>)
+    modifies s as set<Trait>
+  {
+  }
+
+  function F16<Z(==) extends Trait>(s: set<Z>): int
+    reads s as set<Trait>
+  {
+    10
+  }
+}
+
+module TestThatOverrideCheckHasEnoughInformationAboutTypeBounds {
+  trait TrTrParent { }
+  trait TrTr extends TrTrParent { }
+
+  trait Parent extends object {
+    function F<W extends TrTr>(u: nat, w: W): W
+      requires u % 5 == 0
+      reads this
+      ensures w == w
+
+    method M<W extends TrTr>(u: nat, w: W) returns (wo: W)
+      requires u % 5 == 0
+      modifies this
+      ensures w == wo
+  }
+
+  class Cell extends Parent {
+    var data: int
+
+    function F<W extends TrTr>(u: nat, w: W): W
+      requires u % 5 == 0
+      requires w as TrTrParent is TrTr // the proof that this condition is "true" requires the type-bound axioms
+      reads this
+      ensures w == w
+    {
+      var m := u + data;
+      var o := 2 * if m < 0 then -m else m;
+      w
+    }
+
+    method M<W extends TrTr>(u: nat, w: W) returns (wo: W)
+      requires u % 5 == 0
+      modifies this
+      ensures wo as TrTrParent is TrTr ==> wo == w
+    {
+      return w;
+    }
+  }
+}
+
+module Variance {
+  class Generic<X> { }
+  datatype Covariant<+X> = Make(value: X)
+
+  method TestAutoConversions()
+  {
+    var g: Generic<int> := new Generic<int>;
+    var h: Generic<nat> := new Generic<nat>;
+    if * {
+      g := h; // error: non-compatible types
+    } else {
+      h := g; // error: non-compatible types
+    }
+  }
+
+  method TestExplicitConversions()
+  {
+    var g: Generic<int> := new Generic<int>;
+    var h: Generic<nat> := new Generic<nat>;
+    if * {
+      g := h as Generic<int>; // error: non-compatible types
+    } else {
+      h := g as Generic<nat>; // error: non-compatible types
+    }
+  }
+
+  method TestCovariance() {
+    var g: Covariant<int> := Covariant<int>.Make(5);
+    var h: Covariant<nat> := Covariant<nat>.Make(5);
+    if * {
+      g := h;
+      g := h as Covariant<int>; // (legacy error)
+    } else {
+      h := g;
+      h := g as Covariant<nat>; // (legacy error)
+    }
+  }
+}
+
+module BadBounds {
+  trait ReferenceTrait extends object {
+    const u: int
+  }
+
+  type ConstrainedReferenceTrait = r: ReferenceTrait | r.u < 100 witness *
+
+  method P<R extends ReferenceTrait?, S extends ReferenceTrait, T extends ConstrainedReferenceTrait>(r: R, s: S, t: T) { }
+
+  method PCaller(r: ReferenceTrait?, s: ReferenceTrait, t: ConstrainedReferenceTrait) {
+    P<ReferenceTrait?, ReferenceTrait, ConstrainedReferenceTrait>(r, s, t);
+    P<ReferenceTrait?, ReferenceTrait, ConstrainedReferenceTrait>(t, t, t);
+    // The following errors are ordinary parameter-type-mismatch errors; the explicit type arguments do satisfy their required bounds
+    P<ReferenceTrait?, ReferenceTrait, ConstrainedReferenceTrait>(s, s, s); // error: argument 2 is not a ConstrainedReferenceTrait
+    P<ReferenceTrait?, ReferenceTrait, ConstrainedReferenceTrait>(r, r, t); // error: argument 1 is not a ReferenceTrait
+    P<ReferenceTrait?, ReferenceTrait, ConstrainedReferenceTrait>(r, s, r); // error: argument 2 is not a ConstrainedReferenceTrait
+  }
+
+  trait GoodTrait { }
+
+  class E extends GoodTrait { }
+
+  method Q<G extends GoodTrait>(g: G) { }
+
+  method QCaller(e: E, eMaybe: E?) {
+    Q<E>(e);
+    Q<E>(eMaybe); // error: eMaybe may be null
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismVerification.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismVerification.dfy.expect
new file mode 100644
index 00000000000..e5ae64f36d9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/BoundedPolymorphismVerification.dfy.expect
@@ -0,0 +1,20 @@
+BoundedPolymorphismVerification.dfy(13,28): Error: value of expression (of type 'Parent') is not known to be an instance of type 'TheOther'
+BoundedPolymorphismVerification.dfy(22,18): Error: value of expression (of type 'Trait') is not known to be an instance of type 'X'
+BoundedPolymorphismVerification.dfy(28,15): Error: value of expression (of type 'Z') is not known to be an instance of type 'object'
+BoundedPolymorphismVerification.dfy(49,4): Error: assertion might not hold
+BoundedPolymorphismVerification.dfy(60,6): Error: assertion might not hold
+BoundedPolymorphismVerification.dfy(68,4): Error: assertion might not hold
+BoundedPolymorphismVerification.dfy(115,6): Error: assertion might not hold
+BoundedPolymorphismVerification.dfy(144,11): Error: the method must provide an equal or more permissive precondition than in its parent trait
+BoundedPolymorphismVerification.dfy(148,22): Error: the function must provide an equal or more permissive precondition than in its parent trait
+BoundedPolymorphismVerification.dfy(173,16): Error: value of expression (of type 'Z') is not known to be an instance of type 'Trait'
+BoundedPolymorphismVerification.dfy(364,11): Error: value of expression (of type 'Generic<nat>') is not known to be an instance of type 'Generic<int>'
+BoundedPolymorphismVerification.dfy(366,11): Error: value of expression (of type 'Generic<int>') is not known to be an instance of type 'Generic<nat>'
+BoundedPolymorphismVerification.dfy(375,13): Error: value of expression (of type 'Generic<nat>') is not known to be an instance of type 'Generic<int>'
+BoundedPolymorphismVerification.dfy(377,13): Error: value of expression (of type 'Generic<int>') is not known to be an instance of type 'Generic<nat>'
+BoundedPolymorphismVerification.dfy(407,72): Error: value of expression (of type 'ReferenceTrait') is not known to be an instance of type 'ConstrainedReferenceTrait'
+BoundedPolymorphismVerification.dfy(408,69): Error: value of expression (of type 'ReferenceTrait?') is not known to be an instance of type 'ReferenceTrait', because it might be null
+BoundedPolymorphismVerification.dfy(409,72): Error: value of expression (of type 'ReferenceTrait?') is not known to be an instance of type 'ConstrainedReferenceTrait'
+BoundedPolymorphismVerification.dfy(420,9): Error: value of expression (of type 'E?') is not known to be an instance of type 'E', because it might be null
+
+Dafny program verifier finished with 33 verified, 18 errors
diff --git a/Test/dafny0/ByMethod.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethod.dfy
similarity index 98%
rename from Test/dafny0/ByMethod.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethod.dfy
index 6be13ba2b65..07bff7a5c73 100644
--- a/Test/dafny0/ByMethod.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethod.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module ByMethodVerification {
   function F(x: nat): int {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethod.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethod.dfy.expect
new file mode 100644
index 00000000000..e39c155089c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethod.dfy.expect
@@ -0,0 +1,26 @@
+ByMethod.dfy(38,18): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+ByMethod.dfy(42,4): Error: a postcondition could not be proved on this return path
+ByMethod.dfy(35,4): Related location: this is the postcondition that could not be proved
+ByMethod.dfy(50,4): Error: a postcondition could not be proved on this return path
+ByMethod.dfy(48,13): Related location: this is the postcondition that could not be proved
+ByMethod.dfy(58,4): Error: a postcondition could not be proved on this return path
+ByMethod.dfy(56,13): Related location: this is the postcondition that could not be proved
+ByMethod.dfy(60,4): Error: a postcondition could not be proved on this return path
+ByMethod.dfy(59,4): Related location: this is the postcondition that could not be proved
+ByMethod.dfy(66,12): Error: a postcondition could not be proved on this return path
+ByMethod.dfy(64,27): Related location: this is the postcondition that could not be proved
+ByMethod.dfy(68,4): Error: a postcondition could not be proved on this return path
+ByMethod.dfy(67,4): Related location: this is the postcondition that could not be proved
+ByMethod.dfy(74,12): Error: a postcondition could not be proved on this return path
+ByMethod.dfy(72,27): Related location: this is the postcondition that could not be proved
+ByMethod.dfy(93,13): Error: decreases clause might not decrease
+ByMethod.dfy(102,12): Error: decreases clause might not decrease
+ByMethod.dfy(111,12): Error: decreases clause might not decrease
+ByMethod.dfy(126,10): Error: cannot prove termination; try supplying a decreases clause
+ByMethod.dfy(132,14): Error: cannot prove termination; try supplying a decreases clause
+ByMethod.dfy(148,11): Error: cannot prove termination; try supplying a decreases clause
+ByMethod.dfy(152,14): Error: cannot prove termination; try supplying a decreases clause
+ByMethod.dfy(175,18): Error: decreases clause might not decrease
+
+Dafny program verifier finished with 15 verified, 16 errors
diff --git a/Test/dafny0/ByMethodResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethodResolution.dfy
similarity index 98%
rename from Test/dafny0/ByMethodResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethodResolution.dfy
index 2866fdf475c..bea6843f60f 100644
--- a/Test/dafny0/ByMethodResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethodResolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Resolution {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethodResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethodResolution.dfy.expect
new file mode 100644
index 00000000000..b0220aed8d0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ByMethodResolution.dfy.expect
@@ -0,0 +1,12 @@
+ByMethodResolution.dfy(17,6): Error: number of return parameters does not match declaration (found 2, expected 1)
+ByMethodResolution.dfy(25,4): Error: Method return value mismatch (expected real, got bv9)
+ByMethodResolution.dfy(24,6): Error: RHS (of type int) not assignable to LHS (of type real)
+ByMethodResolution.dfy(63,14): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ByMethodResolution.dfy(64,15): Error: a call to a ghost predicate is allowed only in specification contexts (consider declaring the predicate without the 'ghost' keyword)
+ByMethodResolution.dfy(65,15): Error: a call to a twostate function is allowed only in specification contexts
+ByMethodResolution.dfy(85,9): Error: ghost variables such as k are allowed only in specification contexts. k was inferred to be ghost based on its declaration or initialization.
+ByMethodResolution.dfy(92,14): Error: ghost variables such as a are allowed only in specification contexts. a was inferred to be ghost based on its declaration or initialization.
+ByMethodResolution.dfy(106,5): Error: a recursive call from a least predicate can go only to other least predicates
+ByMethodResolution.dfy(142,7): Error: a recursive call from a least predicate can go only to other least predicates
+ByMethodResolution.dfy(157,7): Error: a recursive call from a least predicate can go only to other least predicates
+11 resolution/type errors detected in ByMethodResolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Calculations.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Calculations.dfy
new file mode 100644
index 00000000000..79ac6cf3da3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Calculations.dfy
@@ -0,0 +1,130 @@
+// RUN: %exits-with 4 %verify --allow-axioms --print "%t.dprint.dfy" "%s" > "%t"
+// RUN: %resolve --allow-axioms "%t.dprint.dfy" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method CalcTest0(s: seq<int>) {
+  calc {
+    s[0]; // error: ill-formed line
+  }
+
+  calc {
+    2;
+    { assert s[0] == 1; } // error: ill-formed hint
+    1 + 1;
+  }
+
+  if (|s| > 0) {
+    calc {
+      s[0]; // OK: well-formed in this context
+      <= { assert s[0] == s[0]; }
+      s[0];
+    }
+  }
+  assume forall x :: x in s ==> x >= 0;
+  calc {
+    0 < |s|;
+  ==>  { assert s[0] in s && s[0] >= 0; }  // OK: well-formed after previous line
+    s[0] >= 0;                // OK: well-formed after previous line
+  <==> { assert s[0] in s && s[0] >= 0; }  // OK: well-formed when the previous line is well-formed
+    s[0] > 0 || s[0] == 0;    // OK: well-formed when the previous line is well-formed
+  }
+
+  calc { // same as the last one, but well-formedness is checked in reverse order
+    s[0] + 1 > 0;
+  <==>
+    s[0] >= 0;
+  <== { assert s[0] >= 0; }
+    0 < |s|;
+  }
+}
+
+method CalcTest1(x: int, y: int) {
+  calc {
+    x + y;
+    { assume x == 0; }
+    y;
+  }
+  assert x == 0; // OK: follows from x + y == y;
+}
+
+method CalcTest2(x: int, y: int) {
+  calc {
+    x + y;
+    { assume x == 0; }
+    y + x;
+  }
+  assert x == 0; // error: even though assumed above, is not exported by the calculation
+}
+
+// calc expression:
+ghost function CalcTest3(s: seq<int>): int {
+  calc < {
+    0;
+    { assume |s| == 5; }
+    |s|;
+  }
+  s[0]
+}
+
+// dangling hints:
+method CalcTest4(s: seq<int>)
+  requires forall n | n in s :: n > 0
+{
+  calc {
+    1 + 1;
+    { assert 1 + 1 == 2; }
+  }
+  calc {
+    2;
+    { assert s[0] > 0; } // error: ill-formed hint
+  }
+  calc {
+    |s| > 0;
+  ==> { assert s[0] in s && s[0] > 0; } // okay
+  }
+
+}
+
+// ------------- tests for the pretty printer -------------
+
+lemma CalcPrinting()
+{
+  calc < {
+    2;
+  <= { SubLemma(); }
+    3;
+    5;
+  < { assert 5 < 6 <= 5+1; SubLemma(); assert 6 < 7; }
+    7;
+    11;
+    { SubLemma(); } // dangling hint
+  }
+  calc < {
+    13;
+  }
+  calc {
+    17;
+  == { SubLemma(); }  // dangling hint, following operator
+  }
+  calc <= {
+    19;
+  <=
+    { SubLemma(); }
+    { assert 19 + 23 == 42; }
+    calc { 811; }
+    { assert 42 < 100; }
+    23;
+    { calc < {
+      71; { assert 71 % 19 != 0; } 73;
+    } }
+    29;
+    calc < {
+      311; 313; 331;
+    }
+    31;
+  }
+  calc {
+  }
+}
+
+lemma SubLemma()
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Calculations.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Calculations.dfy.expect
new file mode 100644
index 00000000000..a9f8d00fd4d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Calculations.dfy.expect
@@ -0,0 +1,10 @@
+Calculations.dfy(7,5): Error: index out of range
+Calculations.dfy(12,6): Error: assertion might not hold
+Calculations.dfy(12,14): Error: index out of range
+Calculations.dfy(56,2): Error: assertion might not hold
+Calculations.dfy(79,6): Error: assertion might not hold
+Calculations.dfy(79,14): Error: index out of range
+
+Dafny program verifier finished with 3 verified, 6 errors
+
+Dafny program verifier did not attempt verification
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CallStmtTests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CallStmtTests.dfy
new file mode 100644
index 00000000000..c733a82312b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CallStmtTests.dfy
@@ -0,0 +1,27 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module M0 {
+  method testing1(t: int)
+ {
+    t := m(); // error: should be checked at the Dafny level, not fall to Boogie.
+  }
+
+  method m() returns (r: int)
+  {
+    return 3;
+  }
+}
+
+module M1 {
+  method testing2()
+  {
+    var v;
+    v := m2(); // error: v needs to be ghost because r is.
+  }
+
+  method m2() returns (ghost r: int)
+  {
+    r := 23;
+  }
+}
diff --git a/Test/dafny0/CallStmtTests.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CallStmtTests.dfy.expect
similarity index 100%
rename from Test/dafny0/CallStmtTests.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CallStmtTests.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CanCall.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CanCall.dfy
new file mode 100644
index 00000000000..3108532004f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CanCall.dfy
@@ -0,0 +1,222 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+module ModifiesCallee {
+  ghost function Wrap(S: set<object>): set<object> {
+    S
+  }
+
+  method DoWrapped(S: set<object>)
+    modifies Wrap(S)
+  {
+    DoOne(S);
+  }
+
+  method DoOne(S: set<object>)
+    modifies S
+  {
+  }
+}
+
+module ModifiesCaller {
+  ghost function Wrap(S: set<object>): set<object> {
+    S
+  }
+
+  method DoWrapped(S: set<object>)
+    modifies Wrap(S)
+  {
+  }
+
+  method DoOne(S: set<object>)
+    modifies S
+  {
+    DoWrapped(S);
+  }
+}
+
+module ArraySeqInit {
+  function F(a: int): int {
+    45
+  }
+
+  method TestArrayF() {
+    var m := new int[3](F);
+    assert m[0] == 45;
+  }
+
+  method TestArrayLambda() {
+    var m := new int[3](_ => 45);
+    assert m[0] == 45;
+  }
+
+  method TestSeqF() {
+    var m := seq(3, F);
+    assert m[0] == 45;
+  }
+
+  method TestSeqLambda() {
+    var m := seq(3, _ => 45);
+    assert m[0] == 45;
+  }
+
+}
+
+module QuantifierBeforeOtherConjunct {
+  datatype List<T> = Nil | Cons(head: T, tail: List)
+
+  function Length(list: List): nat {
+    match list
+    case Nil => 0
+    case Cons(_, tl) => 1 + Length(tl)
+  }
+
+  function Occurrences(x: int, list: List<int>): nat
+  {
+    match list
+    case Nil => 0
+    case Cons(y, tl) => (if x == y then 1 else 0) + Occurrences(x, tl)
+  }
+
+  function Partition(x: int, l: List<int>): (result: (List<int>, List<int>))
+    ensures
+      && (forall y :: Occurrences(y, result.0) == if y <= x then Occurrences(y, l) else 0)
+      && Length(l) == Length(result.0) + Length(result.1)
+
+  lemma CallPartition(x: int, l: List<int>) returns (aaa: List<int>, bbb: List<int>)
+    requires l.Cons? && l.head <= x
+    ensures
+      && (forall y :: Occurrences(y, aaa) == if y <= x then Occurrences(y, l) else 0)
+      && Length(l) == Length(aaa) + Length(bbb)
+  {
+    var (lo, hi) := Partition(x, l.tail);
+    aaa := Cons(l.head, lo);
+    bbb := hi;
+  }
+}
+
+module StaticConstFields {
+  function DoNotCall(): int
+    requires false
+  {
+    DoNotCall() + 1
+  }
+
+  const X := (Test(); DoNotCall())
+
+  lemma Test()
+    ensures false
+  {
+    // If we someone got a DoNotCall#canCall for free, then we'd be able to prove anything,
+    // including the precondition in the following line (which would mean that everything
+    // verifies in this module).
+    var x := DoNotCall(); // error: precondition violation
+  }
+
+  lemma UseX()
+    ensures false
+  {
+    var x := X;
+  }
+}
+
+module InstanceConstFields {
+  class MyClass {
+    constructor ()
+      ensures false
+    { // error: postcondition violation
+    }
+    
+    function DoNotCall(): int
+      requires false
+    {
+      DoNotCall() + 1
+    }
+
+    const X := (Test(); DoNotCall())
+
+    lemma Test()
+      ensures false
+    {
+      // See comment in StaticConstFields.Test() above.
+      var x := DoNotCall(); // error: precondition violation
+    }
+
+    lemma UseX()
+      ensures false
+    {
+      var x := X;
+    }
+  }
+}
+
+module ThemesOnStandardLibraryJSON {
+  const TWO_TO_THE_8:   int := 0x100
+  const TWO_TO_THE_32:  int := 0x1_00000000
+  newtype uint8 = x: int   | 0 <= x < TWO_TO_THE_8
+  newtype uint32 = x: int  | 0 <= x < TWO_TO_THE_32
+  type byte = uint8
+  type bytes = seq<byte>
+
+  type View = v: View_ | v.Valid? witness View([], 0, 0)
+  datatype View_ = View(s: bytes, beg: uint32, end: uint32) {
+    ghost const Valid?: bool :=
+      0 <= beg as int <= end as int <= |s| < TWO_TO_THE_32
+
+    predicate Char?(c: char)
+      requires Valid?
+      requires c as int < 256
+    {
+      Byte?(c as byte)
+    }
+
+     function Bytes(): bytes requires Valid? {
+      s[beg..end]
+    }
+
+    predicate Byte?(c: byte)
+      requires Valid?
+    {
+      Bytes() == [c]
+    }
+
+    static function OfBytes(bs: bytes) : (v: View)
+      requires |bs| < TWO_TO_THE_32
+      ensures v.Bytes() == bs
+    {
+      View(bs, 0 as uint32, |bs| as uint32)
+    }
+
+    static const StaticDoubleQuote := View.OfBytes(['\"' as byte])
+    const InstanceDoubleQuote := View.OfBytes(['\"' as byte])
+    static function FunctionDoubleQuote(): View_ {
+      View.OfBytes(['\"' as byte])
+    }
+  }
+
+  type jquoteStatic = v: View | v.Char?('\"') witness View_.StaticDoubleQuote
+  type jquoteInstance = v: View | v.Char?('\"') witness View([], 0, 0).InstanceDoubleQuote
+  type jquoteFunction = v: View | v.Char?('\"') witness View_.FunctionDoubleQuote()
+
+  datatype jstringStatic = JStringStatic(lq: jquoteStatic)
+  datatype jstringInstance = JStringInstance(lq: jquoteInstance)
+  datatype jstringFunction = JStringFunction(lq: jquoteFunction)
+  datatype jstringDefaultValue = JStringDefaultValue(lq: jquoteStatic := View_.StaticDoubleQuote)
+
+  method TestStatic() {
+    var j := JStringStatic(View_.StaticDoubleQuote);
+  }
+
+  method TestInstance() {
+    var v := View([], 0, 0);
+    var j := JStringInstance(v.InstanceDoubleQuote);
+  }
+
+  method TestFunction() {
+    var j := JStringFunction(View_.FunctionDoubleQuote());
+  }
+
+  method TestDefaultValue() {
+    var j := JStringDefaultValue();
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CanCall.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CanCall.dfy.expect
new file mode 100644
index 00000000000..c18c921d1d7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CanCall.dfy.expect
@@ -0,0 +1,8 @@
+CanCall.dfy(113,22): Error: function precondition could not be proved
+CanCall.dfy(100,13): Related location: this proposition could not be proved
+CanCall.dfy(127,4): Error: a postcondition could not be proved on this return path
+CanCall.dfy(126,14): Related location: this is the postcondition that could not be proved
+CanCall.dfy(142,24): Error: function precondition could not be proved
+CanCall.dfy(131,15): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 34 verified, 3 errors
diff --git a/Test/dafny0/ChainingDisjointTests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ChainingDisjointTests.dfy
similarity index 94%
rename from Test/dafny0/ChainingDisjointTests.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ChainingDisjointTests.dfy
index 3e0909c6088..13f153bc80a 100644
--- a/Test/dafny0/ChainingDisjointTests.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ChainingDisjointTests.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module TestDisjointSets {
   method testing1()
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ChainingDisjointTests.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ChainingDisjointTests.dfy.expect
new file mode 100644
index 00000000000..ee9cf967055
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ChainingDisjointTests.dfy.expect
@@ -0,0 +1,8 @@
+ChainingDisjointTests.dfy(49,2): Error: a postcondition could not be proved on this return path
+ChainingDisjointTests.dfy(48,14): Related location: this is the postcondition that could not be proved
+ChainingDisjointTests.dfy(42,22): Related location: this proposition could not be proved
+ChainingDisjointTests.dfy(58,13): Error: assertion might not hold
+ChainingDisjointTests.dfy(58,18): Error: assertion might not hold
+ChainingDisjointTests.dfy(58,23): Error: assertion might not hold
+
+Dafny program verifier finished with 4 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Char.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Char.dfy
new file mode 100644
index 00000000000..29d2cbcf205
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Char.dfy
@@ -0,0 +1,117 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation
+
+
+class CharChar {
+  var c: char;
+  var d: char;
+
+  method Order()
+    modifies this;
+    ensures c <= d;
+  {
+    if d < c {
+      c, d := d, c;
+    }
+  }
+
+  ghost function Recurse(ch: char): bool
+    reads this;
+  {
+    if c < ch then Recurse(c)
+    else if d < ch then Recurse(d)
+    else ch == ' '
+  }
+
+  ghost function MinChar(s: string): char
+    requires s != "";
+  {
+    var ch := s[0];
+    if |s| == 1 then ch else
+    var m := MinChar(s[1..]);
+    if m < ch then m else ch
+  }
+  lemma MinCharLemma(s: string)
+    requires |s| != 0;
+    ensures forall i :: 0 <= i < |s| ==> MinChar(s) <= s[i];
+  {
+    if 2 <= |s| {
+      var m := MinChar(s[1..]);
+      assert forall i :: 1 <= i < |s| ==> m <= s[1..][i-1] == s[i];
+    }
+  }
+
+  method CharEq(s: string) {
+    if "hello Dafny" <= s {
+      assert s[6] == 'D';
+      assert s[7] == '\U{61}';
+      if * {
+        assert s[9] == '\n';  // error
+      } else if * {
+        assert s[1] < s[2] <= s[3];
+      } else {
+        assert s[0] <= s[5];  // error
+      }
+    }
+  }
+  method CharInbetween(ch: char)
+    requires 'B' < ch;
+  {
+    if ch < 'D' {
+      assert 'C' <= ch <= 'C';
+      assert ch == 'C';
+    } else {
+      assert ch <= 'M';  // error
+    }
+  }
+}
+
+// arithmetic with char's
+
+ghost function toLower(ch: char): char
+{
+  if 'A' <= ch <= 'Z' then
+    ch - 'A' + 'a'
+  else
+    ch
+}
+
+ghost function BadToLower_Overflow(ch: char): char
+{
+  if 'A' <= ch then
+    ch - 'A' + 'a'  // error: possible overflow
+  else
+    ch
+}
+
+ghost function BadToLower_Underflow(ch: char): char
+{
+  if ch <= 'Z' then
+    ch - 'A' + 'a'  // error: possible underflow
+  else
+    ch
+}
+
+ghost function BadToLower_OverflowIntoSurrogateRange(ch: char): char
+{
+  if 'A' <= ch <= '\U{D7FF}' then
+    ch - 'A' + 'a'  // error: possible overflow
+  else
+    ch
+}
+
+ghost function BadToLower_UnderflowIntoSurrogateRange(ch: char): char
+{
+  if '\U{E000}' <= ch <= '\U{1_0000}' then
+    ch - 'A' + 'a'  // error: possible underflow
+  else
+    ch
+}
+
+lemma AboutChar(ch: char, dh: char)
+  requires 'r' < dh < '\U{abcd}'
+  ensures ch == ch + '\0' == ch - '\0'
+  ensures dh - '\U{20}' < dh
+  ensures dh + '\U{20}' > dh
+  ensures '\n' + dh == dh + '\n'
+{
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Char.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Char.dfy.expect
new file mode 100644
index 00000000000..f7a8d982837
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Char.dfy.expect
@@ -0,0 +1,10 @@
+Char.dfy(48,8): Error: assertion might not hold
+Char.dfy(52,8): Error: assertion might not hold
+Char.dfy(63,6): Error: assertion might not hold
+Char.dfy(81,7): Error: char subtraction might underflow
+Char.dfy(81,13): Error: char addition might overflow
+Char.dfy(89,7): Error: char subtraction might underflow
+Char.dfy(97,13): Error: char addition might overflow
+Char.dfy(105,7): Error: char subtraction might underflow
+
+Dafny program verifier finished with 8 verified, 8 errors
diff --git a/Test/dafny0/CharLiteralParseErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CharLiteralParseErrors.dfy
similarity index 75%
rename from Test/dafny0/CharLiteralParseErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CharLiteralParseErrors.dfy
index bf3f99c2cd6..df3b69d349c 100644
--- a/Test/dafny0/CharLiteralParseErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CharLiteralParseErrors.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /unicodeChar:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --unicode-char=false
+
 
 // Ensuring that the special support for surrogate pairs in character literals
 // doesn't allow character literals with multiple Unicode scalar values
diff --git a/Test/dafny0/CharLiteralParseErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CharLiteralParseErrors.dfy.expect
similarity index 100%
rename from Test/dafny0/CharLiteralParseErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CharLiteralParseErrors.dfy.expect
diff --git a/Test/dafny0/CoPrefix.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoPrefix.dfy
similarity index 95%
rename from Test/dafny0/CoPrefix.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoPrefix.dfy
index 4541c0cee12..0175d173ebf 100644
--- a/Test/dafny0/CoPrefix.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoPrefix.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation
+
 
 // ----- Stream
 
@@ -135,7 +135,7 @@ greatest lemma {:induction false} Compare<T>(h: T)
   Compare(Next(h));
   if {
     case true =>
-      assert FF(h).tail == GG(h).tail;  // error: full equality is not known here
+      assert FF(h).tail == GG(h).tail;  // yes, this full equality is a focal predicate, so it's rewritten into ==#[_k - 1]
     case true =>
       assert FF(h) ==#[_k] GG(h);  // yes, this is the postcondition to be proved, and it is known to hold
     case true =>
diff --git a/Test/dafny0/CoPrefix.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoPrefix.dfy.expect
similarity index 78%
rename from Test/dafny0/CoPrefix.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoPrefix.dfy.expect
index 43919965f50..583894b649f 100644
--- a/Test/dafny0/CoPrefix.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoPrefix.dfy.expect
@@ -1,3 +1,12 @@
+CoPrefix.dfy(63,56): Error: decreases clause might not decrease
+CoPrefix.dfy(76,55): Error: cannot prove termination; try supplying a decreases clause
+CoPrefix.dfy(114,0): Error: a postcondition could not be proved on this return path
+CoPrefix.dfy(113,13): Related location: this is the postcondition that could not be proved
+CoPrefix.dfy(101,19): Related location: this proposition could not be proved
+CoPrefix.dfy(142,24): Error: assertion might not hold
+CoPrefix.dfy(117,22): Related location: this proposition could not be proved
+CoPrefix.dfy(151,0): Error: a postcondition could not be proved on this return path
+CoPrefix.dfy(150,10): Related location: this is the postcondition that could not be proved
 CoPrefix.dfy(164,2): Error: a postcondition could not be proved on this return path
 CoPrefix.dfy(163,14): Related location: this is the postcondition that could not be proved
 CoPrefix.dfy(169,2): Error: a postcondition could not be proved on this return path
@@ -6,15 +15,5 @@ CoPrefix.dfy(176,10): Error: cannot prove termination; try supplying a decreases
 CoPrefix.dfy(205,6): Error: the calculation step between the previous line and this line could not be proved
 CoPrefix.dfy(207,6): Error: the calculation step between the previous line and this line could not be proved
 CoPrefix.dfy(220,12): Error: ORDINAL subtraction might underflow a limit ordinal (that is, RHS might be too large)
-CoPrefix.dfy(63,56): Error: decreases clause might not decrease
-CoPrefix.dfy(76,55): Error: cannot prove termination; try supplying a decreases clause
-CoPrefix.dfy(114,0): Error: a postcondition could not be proved on this return path
-CoPrefix.dfy(113,10): Related location: this is the postcondition that could not be proved
-CoPrefix.dfy(101,16): Related location
-CoPrefix.dfy(138,24): Error: assertion could not be proved
-CoPrefix.dfy(142,24): Error: assertion could not be proved
-CoPrefix.dfy(117,22): Related location
-CoPrefix.dfy(151,0): Error: a postcondition could not be proved on this return path
-CoPrefix.dfy(150,10): Related location: this is the postcondition that could not be proved
 
-Dafny program verifier finished with 13 verified, 12 errors
+Dafny program verifier finished with 13 verified, 11 errors
diff --git a/Test/dafny0/CoResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoResolution.dfy
similarity index 98%
rename from Test/dafny0/CoResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoResolution.dfy
index dffde145935..0827a79e560 100644
--- a/Test/dafny0/CoResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoResolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module TestModule {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoResolution.dfy.expect
new file mode 100644
index 00000000000..6f6574afa7d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoResolution.dfy.expect
@@ -0,0 +1,24 @@
+CoResolution.dfy(18,11): Error: member 'Undeclared#' does not exist in class 'TestClass'
+CoResolution.dfy(19,6): Error: unresolved identifier: Undeclared#
+CoResolution.dfy(22,9): Error: unresolved identifier: _k
+CoResolution.dfy(41,8): Error: == can only be applied to expressions of types that support equality (got Stream<_T0>)
+CoResolution.dfy(52,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+CoResolution.dfy(76,33): Error: a greatest predicate is not allowed to declare any ensures clause
+CoResolution.dfy(86,28): Error: a recursive call from a greatest predicate can go only to other greatest predicates
+CoResolution.dfy(90,33): Error: a recursive call from a greatest predicate can go only to other greatest predicates
+CoResolution.dfy(99,5): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
+CoResolution.dfy(113,14): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
+CoResolution.dfy(114,14): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
+CoResolution.dfy(119,24): Error: a recursive call from a greatest predicate can go only to other greatest predicates
+CoResolution.dfy(125,28): Error: a recursive call from a greatest predicate can go only to other greatest predicates
+CoResolution.dfy(133,20): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
+CoResolution.dfy(134,20): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
+CoResolution.dfy(139,26): Error: a recursive call from a greatest predicate can go only to other greatest predicates
+CoResolution.dfy(145,30): Error: a recursive call from a greatest predicate can go only to other greatest predicates
+CoResolution.dfy(153,6): Error: a recursive call from a greatest predicate can go only to other greatest predicates
+CoResolution.dfy(155,6): Error: a recursive call from a greatest predicate can go only to other greatest predicates
+CoResolution.dfy(171,15): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
+CoResolution.dfy(206,13): Error: type parameter '_T0' (inferred to be '?') in the function call to 'A' could not be determined
+CoResolution.dfy(206,13): Error: the type of this expression is underspecified
+CoResolution.dfy(206,20): Error: type parameter '_T0' (inferred to be '?') in the function call to 'S' could not be determined
+23 resolution/type errors detected in CoResolution.dfy
diff --git a/Test/dafny0/Coinductive.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Coinductive.dfy
similarity index 96%
rename from Test/dafny0/Coinductive.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Coinductive.dfy
index e61038bb2a7..7289624e556 100644
--- a/Test/dafny0/Coinductive.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Coinductive.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --allow-deprecation
+
 
 // --------------------------------------------------
 
@@ -10,10 +10,10 @@ module TestInductiveDatatypes
   datatype Record<T> = Ctor(T)
 
   datatype RecInt = Ctor(Record<int>)  // this is fine
-  datatype Rec_Forever = Ctor(Record<Rec_Forever>)  // error
+  datatype Rec_Forever = Ctor(Record<Rec_Forever>)  // warning: no instances
   datatype Rec_Stops = Cons(Record<Rec_Stops>, Rec_Stops) | Nil  // this is okay
 
-  datatype D<T> = Ctor(E<D<T>>)  // error: illegal cycle
+  datatype D<T> = Ctor(E<D<T>>)  // warning: no instances
   datatype E<T> = Ctor(T)
 
   // the following is okay
@@ -35,7 +35,7 @@ module MoreInductive {
 
   datatype M = All(List<M>)
   datatype H<'a> = HH('a, Tree<'a>)
-  datatype K<'a> = KK('a, Tree<K<'a>>)  // error
+  datatype K<'a> = KK('a, Tree<K<'a>>)  // warning: no instances
   datatype L<'a> = LL('a, Tree<List<L<'a>>>)
 }
 
@@ -61,7 +61,7 @@ module TestCoinductiveDatatypes
   datatype FiniteEnough_Class = Ctor(MyClass<FiniteEnough_Class>)
   datatype FiniteEnough_Co = Ctor(LazyRecord<FiniteEnough_Co>)
   datatype FiniteEnough_Dt = Ctor(GenericDt<FiniteEnough_Dt>)  // fine
-  datatype NotFiniteEnough_Dt = Ctor(GenericRecord<NotFiniteEnough_Dt>)  // error
+  datatype NotFiniteEnough_Dt = Ctor(GenericRecord<NotFiniteEnough_Dt>)  // warning: no instances
 
 }
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Coinductive.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Coinductive.dfy.expect
new file mode 100644
index 00000000000..5a82b659a4c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Coinductive.dfy.expect
@@ -0,0 +1,41 @@
+Coinductive.dfy(13,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'Rec_Forever' can be constructed
+Coinductive.dfy(16,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'D' can be constructed
+Coinductive.dfy(38,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'K' can be constructed
+Coinductive.dfy(64,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'NotFiniteEnough_Dt' can be constructed
+Coinductive.dfy(93,11): Error: a greatest predicate can be called recursively only in positive positions
+Coinductive.dfy(94,12): Error: a greatest predicate can be called recursively only in positive positions
+Coinductive.dfy(95,12): Error: a greatest predicate can be called recursively only in positive positions
+Coinductive.dfy(95,25): Error: a greatest predicate can be called recursively only in positive positions
+Coinductive.dfy(101,7): Error: a greatest predicate can be called recursively only in positive positions
+Coinductive.dfy(104,29): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
+Coinductive.dfy(105,30): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
+Coinductive.dfy(106,19): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
+Coinductive.dfy(116,26): Error: a greatest predicate can be called recursively only in positive positions
+Coinductive.dfy(122,17): Error: a greatest predicate can be called recursively only in positive positions
+Coinductive.dfy(123,12): Error: a greatest predicate can be called recursively only in positive positions
+Coinductive.dfy(148,21): Error: a recursive call from a greatest predicate can go only to other greatest predicates
+Coinductive.dfy(204,11): Error: a least predicate can be called recursively only in positive positions
+Coinductive.dfy(205,12): Error: a least predicate can be called recursively only in positive positions
+Coinductive.dfy(206,12): Error: a least predicate can be called recursively only in positive positions
+Coinductive.dfy(206,25): Error: a least predicate can be called recursively only in positive positions
+Coinductive.dfy(219,28): Error: a greatest predicate can be called recursively only in positive positions
+Coinductive.dfy(226,34): Error: a least predicate can be called recursively only in positive positions
+Coinductive.dfy(238,7): Error: a least predicate can be called recursively only in positive positions
+Coinductive.dfy(241,30): Error: a least predicate can be called recursively only in positive positions and cannot sit inside an unbounded universal quantifier
+Coinductive.dfy(242,31): Error: a least predicate can be called recursively only in positive positions and cannot sit inside an unbounded universal quantifier
+Coinductive.dfy(243,19): Error: a least predicate can be called recursively only in positive positions and cannot sit inside an unbounded universal quantifier
+Coinductive.dfy(253,14): Error: a least predicate can be called recursively only in positive positions
+Coinductive.dfy(259,17): Error: a least predicate can be called recursively only in positive positions
+Coinductive.dfy(260,12): Error: a least predicate can be called recursively only in positive positions
+Coinductive.dfy(280,21): Error: a recursive call from a least predicate can go only to other least predicates
+Coinductive.dfy(296,5): Error: this call does not type check, because the context uses a _k parameter of type ORDINAL whereas the callee uses a _k parameter of type nat
+Coinductive.dfy(299,5): Error: this call does not type check, because the context uses a _k parameter of type nat whereas the callee uses a _k parameter of type ORDINAL
+Coinductive.dfy(307,14): Error: this call does not type check, because the context uses a _k parameter of type nat whereas the callee uses a _k parameter of type ORDINAL
+Coinductive.dfy(313,14): Error: this call does not type check, because the context uses a _k parameter of type ORDINAL whereas the callee uses a _k parameter of type nat
+Coinductive.dfy(320,14): Error: incorrect argument type at index 0 for prefix lemma in-parameter (expected nat, found ORDINAL)
+Coinductive.dfy(326,14): Error: incorrect argument type at index 0 for prefix lemma in-parameter (expected ORDINAL, found int)
+Coinductive.dfy(355,29): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
+Coinductive.dfy(355,54): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
+Coinductive.dfy(358,29): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
+Coinductive.dfy(358,56): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
+36 resolution/type errors detected in Coinductive.dfy
diff --git a/Test/dafny0/CoinductiveProofs.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoinductiveProofs.dfy
similarity index 97%
rename from Test/dafny0/CoinductiveProofs.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoinductiveProofs.dfy
index afe6d6ad7b9..6014efe5df7 100644
--- a/Test/dafny0/CoinductiveProofs.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoinductiveProofs.dfy
@@ -1,6 +1,6 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
+// UNSUPPORTED: macosx
+// Unsupported because the resource count is slightly different on macosx
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation --performance-stats=1
 codatatype Stream<T> = Cons(head: T, tail: Stream)
 
 ghost function Upward(n: int): Stream<int>
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoinductiveProofs.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoinductiveProofs.dfy.expect
new file mode 100644
index 00000000000..53fd056694d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CoinductiveProofs.dfy.expect
@@ -0,0 +1,35 @@
+CoinductiveProofs.dfy(30,18): Error: assertion might not hold
+CoinductiveProofs.dfy(15,45): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(13,19): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(44,19): Error: assertion might not hold
+CoinductiveProofs.dfy(48,21): Error: assertion might not hold
+CoinductiveProofs.dfy(13,19): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(78,0): Error: a postcondition could not be proved on this return path
+CoinductiveProofs.dfy(77,11): Related location: this is the postcondition that could not be proved
+CoinductiveProofs.dfy(73,3): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(94,16): Error: assertion might not hold
+CoinductiveProofs.dfy(87,36): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(73,3): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(127,0): Error: a postcondition could not be proved on this return path
+CoinductiveProofs.dfy(126,11): Related location: this is the postcondition that could not be proved
+CoinductiveProofs.dfy(115,3): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(136,16): Error: assertion might not hold
+CoinductiveProofs.dfy(117,36): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(115,3): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(149,17): Error: assertion might not hold
+CoinductiveProofs.dfy(115,3): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(153,19): Error: assertion might not hold
+CoinductiveProofs.dfy(115,3): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(164,0): Error: a postcondition could not be proved on this return path
+CoinductiveProofs.dfy(163,11): Related location: this is the postcondition that could not be proved
+CoinductiveProofs.dfy(159,2): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(203,0): Error: a postcondition could not be proved on this return path
+CoinductiveProofs.dfy(202,21): Related location: this is the postcondition that could not be proved
+CoinductiveProofs.dfy(4,23): Related location: this proposition could not be proved
+CoinductiveProofs.dfy(209,0): Error: a postcondition could not be proved on this return path
+CoinductiveProofs.dfy(208,21): Related location: this is the postcondition that could not be proved
+CoinductiveProofs.dfy(4,23): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 23 verified, 12 errors
+Total resources used is 748143
+Max resources used by VC is 59297
diff --git a/Test/dafny0/Compilation.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Compilation.legacy.dfy
similarity index 100%
rename from Test/dafny0/Compilation.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Compilation.legacy.dfy
diff --git a/Test/dafny0/Compilation.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Compilation.legacy.dfy.expect
similarity index 100%
rename from Test/dafny0/Compilation.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Compilation.legacy.dfy.expect
diff --git a/Test/dafny0/CompilationErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CompilationErrors.dfy
similarity index 80%
rename from Test/dafny0/CompilationErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CompilationErrors.dfy
index a62021e254b..d246666961c 100644
--- a/Test/dafny0/CompilationErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CompilationErrors.dfy
@@ -1,10 +1,10 @@
-// RUN: %exits-with 3 %dafny "%s" > "%t"
+// RUN: %exits-with 3 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
-type MyType  // compile error: abstract type
-iterator Iter()  // compile error: body-less iterator
-ghost method M()  // compile error: body-less ghost method
-method P()  // compile error: body-less method
+type MyType
+iterator Iter() 
+ghost method M() ensures false  // compile error: body-less ghost method
+method P() ensures false  // compile error: body-less method
 class TestClass {
   method Q()
   {
@@ -16,8 +16,8 @@ class TestClass {
   ghost var g: int
 }
 
-ghost function F(): int  // compile error: body-less ghost function
-function H(): int  // compile error: body-less function method
+ghost function F(): int ensures false // compile error: body-less ghost function
+function H(): int ensures false // compile error: body-less function method
 
 lemma Lemma() {
   assume false;  // compile error: assume
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CompilationErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CompilationErrors.dfy.expect
new file mode 100644
index 00000000000..f7fdd8b5b6e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CompilationErrors.dfy.expect
@@ -0,0 +1,26 @@
+CompilationErrors.dfy(6,25): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+CompilationErrors.dfy(7,19): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+CompilationErrors.dfy(19,32): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+CompilationErrors.dfy(20,26): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+CompilationErrors.dfy(23,2): Warning: assume statement has no {:axiom} annotation
+CompilationErrors.dfy(27,2): Warning: assume statement has no {:axiom} annotation
+CompilationErrors.dfy(33,2): Warning: assume statement has no {:axiom} annotation
+CompilationErrors.dfy(43,6): Warning: assume statement has no {:axiom} annotation
+CompilationErrors.dfy(55,11): Warning: assume keyword in update-with-failure statement has no {:axiom} annotation
+CompilationErrors.dfy(60,16): Warning: assume keyword in assign-such-that statement has no {:axiom} annotation
+CompilationErrors.dfy(12,6): Warning: assume statement has no {:axiom} annotation
+CompilationErrors.dfy(71,2): Warning: this loop has no body (loop frame: x)
+CompilationErrors.dfy(73,2): Warning: this loop has no body (loop frame: i, x)
+CompilationErrors.dfy(83,4): Warning: this loop has no body (loop frame: x)
+CompilationErrors.dfy(85,4): Warning: this loop has no body (loop frame: i, x)
+
+Dafny program verifier finished with 7 verified, 0 errors
+CompilationErrors.dfy(7,7): Error: Method _module._default.P has no body so it cannot be compiled
+CompilationErrors.dfy(20,9): Error: Function _module._default.H has no body so it cannot be compiled
+CompilationErrors.dfy(71,2): Error: a loop without a body cannot be compiled
+CompilationErrors.dfy(73,2): Error: a loop without a body cannot be compiled
+CompilationErrors.dfy(83,4): Error: a loop without a body cannot be compiled
+CompilationErrors.dfy(85,4): Error: a loop without a body cannot be compiled
+CompilationErrors.dfy(4,5): Error: Abstract type ('_module.MyType') cannot be compiled; perhaps make it a type synonym or use :extern.
+CompilationErrors.dfy(5,9): Error: iterator _module.Iter has no body
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Comprehensions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Comprehensions.dfy
new file mode 100644
index 00000000000..b005967f6c0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Comprehensions.dfy
@@ -0,0 +1,191 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method M()
+{
+  var numbers := set i | 0 <= i && i < 100;
+  var squares := set i | 0 <= i && i < 100 :: Id(i)*i;  // verifying properties about set comprehensions with a term expression is hard
+
+  assert 12 in numbers;
+  assert Id(5) == 5;
+  assert 25 in squares;
+  assert 200 in numbers;  // error
+}
+
+function Id(x: int): int { x }  // for triggering
+
+datatype D = A | B
+// The following mainly test that set comprehensions can be compiled, but one would
+// have to run the resulting program to check that the compiler is doing the right thing.
+method Main()
+{
+  var q := set i,j | 0 <= i < 10 && 0 <= j < 3 :: i+j;
+  PrintSet(q);
+  q := set b: bool | true :: if b then 3 else 7;
+  var d := set b:D | true;
+  var test := forall d:D {:nowarn} :: d == A || d == B; // Ignoring the warning as we're only compiling here
+  PrintSet(q);
+  var m := set k | k in q :: 2*k;
+  PrintSet(m);
+  PrintSet(set k | k in q && k % 2 == 0);
+  var sq := [30, 40, 20];
+  PrintSet(set k, i | k in sq && 0 <= i < k && i % 7 == 0 :: k + i);
+  var bb := forall k, i {:nowarn} | k in sq && 0 <= i < k && i % 7 == 0 :: k + i == 17; // Ignoring the warning as we're only compiling here
+}
+
+method PrintSet<T>(s: set<T>) {
+  var q := s;
+  while (q != {})
+    decreases q
+  {
+    var x :| x in q;
+    print x, " ";
+    q := q - {x};
+  }
+  print "\n";
+}
+
+// ---------- Regression tests ----------
+
+method SetComprehensionBoxAntecedents()
+{
+  // The first assert below used to not verify, due to a missing $IsBox conjunct in the Boogie lambda
+  // that encodes the set comprehension.
+  var a := set x | x in {0,1,2,3,4,5} && x < 3;
+  var b := {0,1,2};
+
+  if
+  case true =>
+    assert a == b;
+  case true =>
+    assert forall x :: x in a ==> x in b;
+    assert forall x :: x in b ==> x in a;
+  case true =>
+    assert forall x :: x in a <==> x in b;
+}
+
+// ---------- Sequence operations ----------
+
+method Sequences0() {
+  var four1s := [1, 1, 1, 1];
+  var twelve1s := seq(12, _ => 1);
+  assert twelve1s == four1s + four1s + four1s;
+
+  var squares := seq(8, i => i*i);
+  assert |squares| == 8;
+  assert squares[6] == 36;
+  if * {
+    assert squares[7] == 0;  // error
+  }
+
+  var nats := seq(8, i => i);
+}
+
+class SeqOp {
+  var x: real
+
+  function G(i: nat): real
+    reads this
+  {
+    if i < 20 then 2.5 else x
+  }
+  function H(i: nat): real
+    reads if i < 20 then {} else {this}
+  {
+    if i < 20 then 2.5 else x
+  }
+
+  function S0(n: nat): seq<real> {
+    seq(n, G)  // error: S0 reads {this}
+  }
+  function S1(n: nat): seq<real>
+    reads this
+  {
+    seq(n, G)
+  }
+  function S2(n: nat): seq<real> {
+    seq(n, H)  // error: S2 reads {this}
+  }
+  function S3(n: nat): seq<real>
+    reads this
+  {
+    seq(n, H)
+  }
+  function S4(n: nat): seq<real> {
+    seq(n, i => if i < 20 then 2.5 else x)  // error: lambda reads {this}
+  }
+  function S5(n: nat): seq<real> {
+    seq(n, i reads this => if i < 20 then 2.5 else x)  // error: S5 reads {this}
+  }
+  function S6(n: nat): seq<real>
+    reads this
+  {
+    seq(n, i reads this => if i < 20 then 2.5 else x)
+  }
+  function S7(n: nat): seq<real> {
+    seq(n, i requires i < 20 => if i < 20 then 2.5 else x)  // error: S7 violates lambda's precondition
+  }
+
+  function T0(n: nat): seq<real>
+    requires n <= 20
+  {
+    seq(n, G)  // error: T0 reads {this}
+  }
+  function T1(n: nat): seq<real>
+    requires n <= 20
+    reads this
+  {
+    seq(n, G)
+  }
+  function T2(n: nat): seq<real>
+    requires n <= 20
+  {
+    seq(n, H)
+  }
+  function T3(n: nat): seq<real>
+    requires n <= 20
+  {
+    seq(n, i reads this => if i < 20 then 2.5 else x)  // error: T3 reads {this}
+  }
+  function T4(n: nat): seq<real>
+    requires n <= 20
+  {
+    seq(n, i requires i < 20 => if i < 20 then 2.5 else x)
+  }
+  function T5(n: nat): seq<real>
+    requires n <= 20
+  {
+    seq(n, i reads if i < 20 then {} else {this} => if i < 20 then 2.5 else x)
+  }
+
+  function XT0(n: nat): seq<int> {
+    seq<int>(n, _ => 7)
+  }
+  function XT1(n: nat): seq<int> {
+    seq<nat>(n, _ => 7)
+  }
+  function XT2(n: nat): seq<int> {
+    seq<nat>(n, _ => -7)  // error: -7 is not a nat
+  }
+  function XT3(n: nat): seq<nat> {
+    seq(n, _ => -7)  // error: this is not a seq<nat>
+  }
+  function XT4(n: nat): seq<nat> {
+    seq(n, i requires 0 <= i < 3 => 10)  // error: init function doesn't accept all indices
+  }
+  function XT5(n: nat): seq<nat> {
+    seq(n, i requires 0 <= i < n => 10)
+  }
+  function XT6(n: nat): seq<nat> {
+    seq(n, i => if i < n then 10 else -7)  // error: type of lambda is inferred to be int->nat, so the -7 gives an error
+  }
+  function XT7(n: nat): seq<nat> {
+    seq(n, i => var u: int := if i < n then 10 else -7; u)  // fine: lambda has type int->int; use of this lambda always gives a nat
+  }
+  function XT8(n: nat): seq<nat> {
+    seq(n, i => if i < n then -7 else 10)  // error: this can't be assigned to a seq<nat>
+  }
+  function XT9(n: nat): seq<nat> {
+    seq<nat>(n, i => if i < n then -7 else 10)  // error: this can't be assigned to a seq<nat>
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Comprehensions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Comprehensions.dfy.expect
new file mode 100644
index 00000000000..b260be1b8dc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Comprehensions.dfy.expect
@@ -0,0 +1,23 @@
+Comprehensions.dfy(6,17): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Comprehensions.dfy(22,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Comprehensions.dfy(24,7): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Comprehensions.dfy(25,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Comprehensions.dfy(32,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Comprehensions.dfy(54,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Comprehensions.dfy(12,2): Error: assertion might not hold
+Comprehensions.dfy(78,4): Error: assertion might not hold
+Comprehensions.dfy(99,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+Comprehensions.dfy(107,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+Comprehensions.dfy(115,40): Error: insufficient reads clause to read field; Consider extracting x to a local variable before the lambda expression, or adding 'reads this' in the enclosing lambda specification for resolution
+Comprehensions.dfy(118,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+Comprehensions.dfy(126,4): Error: all sequence indices must be in the domain of the initialization function
+Comprehensions.dfy(132,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+Comprehensions.dfy(148,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+Comprehensions.dfy(168,16): Error: value does not satisfy the subset constraints of 'nat'
+Comprehensions.dfy(171,11): Error: value does not satisfy the subset constraints of 'nat'
+Comprehensions.dfy(174,4): Error: all sequence indices must be in the domain of the initialization function
+Comprehensions.dfy(180,38): Error: value does not satisfy the subset constraints of 'nat'
+Comprehensions.dfy(186,30): Error: value does not satisfy the subset constraints of 'nat'
+Comprehensions.dfy(189,16): Error: value does not satisfy the subset constraints of 'nat'
+
+Dafny program verifier finished with 16 verified, 15 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComprehensionsNewSyntax.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComprehensionsNewSyntax.dfy
new file mode 100644
index 00000000000..7b5da3a79bd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComprehensionsNewSyntax.dfy
@@ -0,0 +1,191 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method M()
+{
+  var numbers := set i | 0 <= i && i < 100;
+  var squares := set i | 0 <= i && i < 100 :: Id(i)*i;  // verifying properties about set comprehensions with a term expression is hard
+
+  assert 12 in numbers;
+  assert Id(5) == 5;
+  assert 25 in squares;
+  assert 200 in numbers;  // error
+}
+
+function Id(x: int): int { x }  // for triggering
+
+datatype D = A | B
+// The following mainly test that set comprehensions can be compiled, but one would
+// have to run the resulting program to check that the compiler is doing the right thing.
+method Main()
+{
+  var q := set i,j | 0 <= i < 10 && 0 <= j < 3 :: i+j;
+  PrintSet(q);
+  q := set b: bool :: if b then 3 else 7;
+  var d := set b:D;
+  var test := forall d:D {:nowarn} :: d == A || d == B; // Ignoring the warning as we're only compiling here
+  PrintSet(q);
+  var m := set k <- q :: 2*k;
+  PrintSet(m);
+  PrintSet(set k <- q | k % 2 == 0);
+  var sq := [30, 40, 20];
+  PrintSet(set k <- sq, i | 0 <= i < k && i % 7 == 0 :: k + i);
+  var bb := forall k <- sq, i {:nowarn} | 0 <= i < k && i % 7 == 0 :: k + i == 17; // Ignoring the warning as we're only compiling here
+}
+
+method PrintSet<T>(s: set<T>) {
+  var q := s;
+  while (q != {})
+    decreases q
+  {
+    var x :| x in q;
+    print x, " ";
+    q := q - {x};
+  }
+  print "\n";
+}
+
+// ---------- Regression tests ----------
+
+method SetComprehensionBoxAntecedents()
+{
+  // The first assert below used to not verify, due to a missing $IsBox conjunct in the Boogie lambda
+  // that encodes the set comprehension.
+  var a := set x <- {0,1,2,3,4,5} | x < 3;
+  var b := {0,1,2};
+
+  if
+  case true =>
+    assert a == b;
+  case true =>
+    assert forall x <- a :: x in b;
+    assert forall x <- b :: x in a;
+  case true =>
+    assert forall x :: x in a <==> x in b;
+}
+
+// ---------- Sequence operations ----------
+
+method Sequences0() {
+  var four1s := [1, 1, 1, 1];
+  var twelve1s := seq(12, _ => 1);
+  assert twelve1s == four1s + four1s + four1s;
+
+  var squares := seq(8, i => i*i);
+  assert |squares| == 8;
+  assert squares[6] == 36;
+  if * {
+    assert squares[7] == 0;  // error
+  }
+
+  var nats := seq(8, i => i);
+}
+
+class SeqOp {
+  var x: real
+
+  function G(i: nat): real
+    reads this
+  {
+    if i < 20 then 2.5 else x
+  }
+  function H(i: nat): real
+    reads if i < 20 then {} else {this}
+  {
+    if i < 20 then 2.5 else x
+  }
+
+  function S0(n: nat): seq<real> {
+    seq(n, G)  // error: S0 reads {this}
+  }
+  function S1(n: nat): seq<real>
+    reads this
+  {
+    seq(n, G)
+  }
+  function S2(n: nat): seq<real> {
+    seq(n, H)  // error: S2 reads {this}
+  }
+  function S3(n: nat): seq<real>
+    reads this
+  {
+    seq(n, H)
+  }
+  function S4(n: nat): seq<real> {
+    seq(n, i => if i < 20 then 2.5 else x)  // error: lambda reads {this}
+  }
+  function S5(n: nat): seq<real> {
+    seq(n, i reads this => if i < 20 then 2.5 else x)  // error: S5 reads {this}
+  }
+  function S6(n: nat): seq<real>
+    reads this
+  {
+    seq(n, i reads this => if i < 20 then 2.5 else x)
+  }
+  function S7(n: nat): seq<real> {
+    seq(n, i requires i < 20 => if i < 20 then 2.5 else x)  // error: S7 violates lambda's precondition
+  }
+
+  function T0(n: nat): seq<real>
+    requires n <= 20
+  {
+    seq(n, G)  // error: T0 reads {this}
+  }
+  function T1(n: nat): seq<real>
+    requires n <= 20
+    reads this
+  {
+    seq(n, G)
+  }
+  function T2(n: nat): seq<real>
+    requires n <= 20
+  {
+    seq(n, H)
+  }
+  function T3(n: nat): seq<real>
+    requires n <= 20
+  {
+    seq(n, i reads this => if i < 20 then 2.5 else x)  // error: T3 reads {this}
+  }
+  function T4(n: nat): seq<real>
+    requires n <= 20
+  {
+    seq(n, i requires i < 20 => if i < 20 then 2.5 else x)
+  }
+  function T5(n: nat): seq<real>
+    requires n <= 20
+  {
+    seq(n, i reads if i < 20 then {} else {this} => if i < 20 then 2.5 else x)
+  }
+
+  function XT0(n: nat): seq<int> {
+    seq<int>(n, _ => 7)
+  }
+  function XT1(n: nat): seq<int> {
+    seq<nat>(n, _ => 7)
+  }
+  function XT2(n: nat): seq<int> {
+    seq<nat>(n, _ => -7)  // error: -7 is not a nat
+  }
+  function XT3(n: nat): seq<nat> {
+    seq(n, _ => -7)  // error: this is not a seq<nat>
+  }
+  function XT4(n: nat): seq<nat> {
+    seq(n, i requires 0 <= i < 3 => 10)  // error: init function doesn't accept all indices
+  }
+  function XT5(n: nat): seq<nat> {
+    seq(n, i requires 0 <= i < n => 10)
+  }
+  function XT6(n: nat): seq<nat> {
+    seq(n, i => if i < n then 10 else -7)  // error: type of lambda is inferred to be int->nat, so the -7 gives an error
+  }
+  function XT7(n: nat): seq<nat> {
+    seq(n, i => var u: int := if i < n then 10 else -7; u)  // fine: lambda has type int->int; use of this lambda always gives a nat
+  }
+  function XT8(n: nat): seq<nat> {
+    seq(n, i => if i < n then -7 else 10)  // error: this can't be assigned to a seq<nat>
+  }
+  function XT9(n: nat): seq<nat> {
+    seq<nat>(n, i => if i < n then -7 else 10)  // error: this can't be assigned to a seq<nat>
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComprehensionsNewSyntax.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComprehensionsNewSyntax.dfy.expect
new file mode 100644
index 00000000000..49968542b04
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComprehensionsNewSyntax.dfy.expect
@@ -0,0 +1,23 @@
+ComprehensionsNewSyntax.dfy(6,17): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ComprehensionsNewSyntax.dfy(22,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ComprehensionsNewSyntax.dfy(24,7): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ComprehensionsNewSyntax.dfy(25,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ComprehensionsNewSyntax.dfy(32,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ComprehensionsNewSyntax.dfy(54,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ComprehensionsNewSyntax.dfy(12,2): Error: assertion might not hold
+ComprehensionsNewSyntax.dfy(78,4): Error: assertion might not hold
+ComprehensionsNewSyntax.dfy(99,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+ComprehensionsNewSyntax.dfy(107,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+ComprehensionsNewSyntax.dfy(115,40): Error: insufficient reads clause to read field; Consider extracting x to a local variable before the lambda expression, or adding 'reads this' in the enclosing lambda specification for resolution
+ComprehensionsNewSyntax.dfy(118,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+ComprehensionsNewSyntax.dfy(126,4): Error: all sequence indices must be in the domain of the initialization function
+ComprehensionsNewSyntax.dfy(132,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+ComprehensionsNewSyntax.dfy(148,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+ComprehensionsNewSyntax.dfy(168,16): Error: value does not satisfy the subset constraints of 'nat'
+ComprehensionsNewSyntax.dfy(171,11): Error: value does not satisfy the subset constraints of 'nat'
+ComprehensionsNewSyntax.dfy(174,4): Error: all sequence indices must be in the domain of the initialization function
+ComprehensionsNewSyntax.dfy(180,38): Error: value does not satisfy the subset constraints of 'nat'
+ComprehensionsNewSyntax.dfy(186,30): Error: value does not satisfy the subset constraints of 'nat'
+ComprehensionsNewSyntax.dfy(189,16): Error: value does not satisfy the subset constraints of 'nat'
+
+Dafny program verifier finished with 16 verified, 15 errors
diff --git a/Test/dafny0/Computations.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Computations.dfy
similarity index 97%
rename from Test/dafny0/Computations.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Computations.dfy
index d1727b3dfd0..c2dc3eb2589 100644
--- a/Test/dafny0/Computations.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Computations.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /deprecation:0 /proverOpt:O:smt.qi.eager_threshold=30 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --allow-deprecation --solver-option="O:smt.qi.eager_threshold=30" "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost function fact6(n: nat): nat
diff --git a/Test/dafny0/Computations.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Computations.dfy.expect
similarity index 100%
rename from Test/dafny0/Computations.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Computations.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop.dfy
new file mode 100644
index 00000000000..010b5e214dc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+ghost function KeepDoin'It(x: nat): nat
+  decreases x
+{
+  KeepDoin'It(x + 1)
+}
+
+lemma Test(r: nat)
+{
+  assert KeepDoin'It(20) == r;
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop.dfy.expect
new file mode 100644
index 00000000000..07df1e764c2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop.dfy.expect
@@ -0,0 +1,4 @@
+ComputationsLoop.dfy(7,13): Error: decreases clause might not decrease
+ComputationsLoop.dfy(12,25): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop2.dfy
new file mode 100644
index 00000000000..94a8053b491
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop2.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+ghost function KeepDoin'It(x: nat): nat
+{
+  KeepDoin'ItToo(x + 1)
+}
+
+ghost function KeepDoin'ItToo(x: nat): nat
+{
+  KeepDoin'It(x + 1)
+}
+
+lemma Test(r: nat)
+{
+  assert KeepDoin'It(20) == r;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop2.dfy.expect
new file mode 100644
index 00000000000..1182d1fde00
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsLoop2.dfy.expect
@@ -0,0 +1,5 @@
+ComputationsLoop2.dfy(6,16): Error: cannot prove termination; try supplying a decreases clause
+ComputationsLoop2.dfy(11,13): Error: cannot prove termination; try supplying a decreases clause
+ComputationsLoop2.dfy(16,25): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/dafny0/ComputationsNeg.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsNeg.dfy
similarity index 89%
rename from Test/dafny0/ComputationsNeg.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsNeg.dfy
index 4aca6bb2fb5..12fb3936bf2 100644
--- a/Test/dafny0/ComputationsNeg.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsNeg.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 ghost function bad(n: nat): nat
   decreases n
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsNeg.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsNeg.dfy.expect
new file mode 100644
index 00000000000..bb75ba7257e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ComputationsNeg.dfy.expect
@@ -0,0 +1,10 @@
+ComputationsNeg.dfy(7,5): Error: decreases clause might not decrease
+ComputationsNeg.dfy(11,0): Error: a postcondition could not be proved on this return path
+ComputationsNeg.dfy(10,16): Related location: this is the postcondition that could not be proved
+ComputationsNeg.dfy(23,0): Error: a postcondition could not be proved on this return path
+ComputationsNeg.dfy(22,20): Related location: this is the postcondition that could not be proved
+ComputationsNeg.dfy(19,28): Related location: this proposition could not be proved
+ComputationsNeg.dfy(36,2): Error: assertion might not hold
+ComputationsNeg.dfy(45,2): Error: assertion might not hold
+
+Dafny program verifier finished with 5 verified, 5 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConcurrentAttribute.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConcurrentAttribute.dfy
new file mode 100644
index 00000000000..3f5c0d82f17
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConcurrentAttribute.dfy
@@ -0,0 +1,139 @@
+// RUN: %exits-with 4 %baredafny verify --use-basename-for-filename --show-snippets false --reads-clauses-on-methods "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class Box<T> {
+  var x: T
+
+  constructor(x: T)
+    reads {}
+  {
+    this.x := x;
+  }
+}
+
+class GhostBox<T> {
+  ghost var x: T
+
+  constructor(x: T)
+    reads {}
+  {
+    this.x := x;
+  }
+}
+
+class ConcurrentJournal<T> {
+  ghost var elements: seq<T>
+
+  constructor()
+    ensures elements == []
+  {
+    elements := [];
+  }
+
+  method Add(e: T)
+    reads this
+    modifies this
+    ensures exists others :: elements == old(elements) + [e] + others
+  {
+    elements := elements + [e];
+    assert elements == old(elements) + [e] + [];
+  }
+}
+
+class Concurrent {
+
+  function {:concurrent} GoodFn(b: Box<int>): int {
+    42
+  }
+
+  function {:concurrent} BadFn(b: Box<int>): int  // Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+    reads b
+  {
+    b.x
+  }
+
+  function {:concurrent} WeirdButOkayFn(b: Box<int>): int 
+    reads if false then {b} else {}
+  {
+    42
+  }
+
+  function {:concurrent} SurprisingButAlsoOkayFn(b: Box<int>): int 
+    reads if false then {b} else {}`x
+  {
+    42
+  }
+
+  ghost predicate {:concurrent} ExistsInJournal(p: string -> bool, j: ConcurrentJournal<string>)
+    // {:assume_concurrent} is not supported for functions so it has no effect here
+    reads {:assume_concurrent} j  // Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+  {
+    exists element <- j.elements :: p(element)
+  }
+
+  method {:concurrent} GoodM(b: Box<int>) {
+  }
+
+  method {:concurrent} BadMDefaultReads(b: Box<int>)  // Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+  {
+  }
+
+  method {:concurrent} BadM(b: Box<int>)  // Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+    reads b
+  {
+    var x := b.x;
+  }
+
+  method {:concurrent} WeirdButOkayM(b: Box<int>) 
+    reads if false then {b} else {}
+  {
+  }
+
+  method {:concurrent} AlsoBadM(b: Box<int>)  // Error: modifies clause could not be proved to be empty ({:concurrent} restriction)
+    modifies b
+  {
+    b.x := 42;
+  }
+
+  method {:concurrent} AlsoWeirdButOkayM(b: Box<int>) 
+    modifies if false then {b} else {}
+  {
+  }
+
+  ghost method {:concurrent} OnlyReadsGhostState(b: GhostBox<int>) returns (r: int) 
+    reads b`x  // Error: modifies clause could not be proved to be empty ({:concurrent} restriction)
+  {
+    return b.x;
+  }
+
+  method {:concurrent} OnlyModifiesGhostState(b: GhostBox<int>) 
+    reads {}  // Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+    modifies b`x
+  {
+    b.x := 42;
+  }
+
+  ghost method {:concurrent} ReadAllTheBoxes()
+    reads set b: GhostBox<int> | true  // Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+  {
+  }
+
+  ghost method {:concurrent} ModifyAllTheBoxes()
+    reads {}
+    modifies set b: GhostBox<int> | true  // Error: modifies clause could not be proved to be empty ({:concurrent} restriction)
+  {
+  }
+
+  ghost method {:concurrent} NoneOfTheBoxes() 
+    reads set b: GhostBox<int> | !allocated(b)
+    modifies set b: GhostBox<int> | !allocated(b)
+  {
+  }
+
+  method {:concurrent} AddToJournal(j: ConcurrentJournal<string>)
+    reads {:assume_concurrent} j
+    modifies {:assume_concurrent} j
+  {
+    j.Add("Today I added another test case.");
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConcurrentAttribute.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConcurrentAttribute.dfy.expect
new file mode 100644
index 00000000000..b2ec5da8390
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConcurrentAttribute.dfy.expect
@@ -0,0 +1,17 @@
+ConcurrentAttribute.dfy(117,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ConcurrentAttribute.dfy(123,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ConcurrentAttribute.dfy(128,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ConcurrentAttribute.dfy(129,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ConcurrentAttribute.dfy(49,25): Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+ConcurrentAttribute.dfy(67,32): Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+ConcurrentAttribute.dfy(74,23): Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+ConcurrentAttribute.dfy(77,23): Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+ConcurrentAttribute.dfy(81,23): Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+ConcurrentAttribute.dfy(92,23): Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+ConcurrentAttribute.dfy(98,23): Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+ConcurrentAttribute.dfy(103,29): Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+ConcurrentAttribute.dfy(109,23): Error: modifies clause could not be proved to be empty ({:concurrent} restriction)
+ConcurrentAttribute.dfy(116,29): Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+ConcurrentAttribute.dfy(121,29): Error: modifies clause could not be proved to be empty ({:concurrent} restriction)
+
+Dafny program verifier finished with 15 verified, 11 errors
diff --git a/Test/dafny0/Constant.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Constant.dfy
similarity index 97%
rename from Test/dafny0/Constant.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Constant.dfy
index 1fdeedc3335..557f0bffc13 100644
--- a/Test/dafny0/Constant.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Constant.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 const one:int := 1
 const two:int := one * 2
diff --git a/Test/dafny0/Constant.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Constant.dfy.expect
similarity index 100%
rename from Test/dafny0/Constant.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Constant.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Constant.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Constant.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Constant.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/dafny0/ConstantErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConstantErrors.dfy
similarity index 99%
rename from Test/dafny0/ConstantErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConstantErrors.dfy
index 67d307f56fd..c01c02a1ca0 100644
--- a/Test/dafny0/ConstantErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConstantErrors.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny  /compile:0  "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/dafny0/ConstantErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConstantErrors.dfy.expect
similarity index 95%
rename from Test/dafny0/ConstantErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConstantErrors.dfy.expect
index 7482e2292ef..7fd8fd5b97e 100644
--- a/Test/dafny0/ConstantErrors.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ConstantErrors.dfy.expect
@@ -23,7 +23,7 @@ ConstantErrors.dfy(136,10): Error: recursive constraint dependency involving a n
 ConstantErrors.dfy(146,10): Error: recursive constraint dependency involving a newtype: A -> F -> B -> A
 ConstantErrors.dfy(156,10): Error: recursive constraint dependency involving a newtype: A -> F -> B -> A
 ConstantErrors.dfy(166,10): Error: recursive constraint dependency involving a newtype: A -> F -> B -> C -> A
-ConstantErrors.dfy(181,8): Error: const definition contains a cycle: b -> MakeC -> C -> D -> E -> f -> G -> H -> I -> j -> K -> L -> M -> n -> A -> MakeA -> b
+ConstantErrors.dfy(180,10): Error: recursive constraint dependency involving a newtype: A -> MakeA -> b -> MakeC -> C -> D -> E -> f -> G -> H -> I -> j -> K -> L -> M -> n -> A
 ConstantErrors.dfy(207,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> C -> D -> A
 ConstantErrors.dfy(215,8): Error: static non-ghost const field 'g' of type 'G' (which does not have a default compiled value) must give a defining value
 ConstantErrors.dfy[R0](220,8): Error: static non-ghost const field 'g' of type 'G' (which does not have a default compiled value) must give a defining value
diff --git a/Test/dafny0/ContainerRanks.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ContainerRanks.dfy
similarity index 89%
rename from Test/dafny0/ContainerRanks.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ContainerRanks.dfy
index af0cbebdfa4..9fa157bb992 100644
--- a/Test/dafny0/ContainerRanks.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ContainerRanks.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype Abc = End | Wrapper(seq<Abc>)
 
diff --git a/Test/dafny0/PrefixSyntax.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ContainerRanks.dfy.expect
similarity index 100%
rename from Test/dafny0/PrefixSyntax.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ContainerRanks.dfy.expect
diff --git a/Test/dafny0/ControlStructures.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ControlStructures.dfy
similarity index 99%
rename from Test/dafny0/ControlStructures.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ControlStructures.dfy
index 6eee80132b9..0b62bcb7f1e 100644
--- a/Test/dafny0/ControlStructures.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ControlStructures.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype D = Green | Blue | Red | Purple
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ControlStructures.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ControlStructures.dfy.expect
new file mode 100644
index 00000000000..c77bf7ec954
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ControlStructures.dfy.expect
@@ -0,0 +1,16 @@
+ControlStructures.dfy(8,2): Error: missing case in match statement: Purple
+ControlStructures.dfy(8,2): Error: missing case in match statement: Blue
+ControlStructures.dfy(17,2): Error: missing case in match statement: Purple
+ControlStructures.dfy(46,4): Error: missing case in match statement: Red
+ControlStructures.dfy(54,2): Error: missing case in match expression: Red
+ControlStructures.dfy(75,2): Error: alternative cases fail to cover all possibilities
+ControlStructures.dfy(218,8): Error: assertion might not hold
+ControlStructures.dfy(235,6): Error: assertion might not hold
+ControlStructures.dfy(238,4): Error: assertion might not hold
+ControlStructures.dfy(241,2): Error: assertion might not hold
+ControlStructures.dfy(350,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+ControlStructures.dfy(381,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+ControlStructures.dfy(448,16): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+
+Dafny program verifier finished with 18 verified, 13 errors
diff --git a/Test/dafny0/Corecursion.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Corecursion.dfy
similarity index 97%
rename from Test/dafny0/Corecursion.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Corecursion.dfy
index c4cfe2fffd7..a67a8ae0f41 100644
--- a/Test/dafny0/Corecursion.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Corecursion.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation
+
 
 // --------------------------------------------------
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Corecursion.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Corecursion.dfy.expect
new file mode 100644
index 00000000000..b7b9fadda97
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Corecursion.dfy.expect
@@ -0,0 +1,10 @@
+Corecursion.dfy(17,33): Error: cannot prove termination; try supplying a decreases clause (note that only functions without side effects can be called co-recursively)
+Corecursion.dfy(23,42): Error: cannot prove termination; try supplying a decreases clause (note that only functions without any ensures clause can be called co-recursively)
+Corecursion.dfy(58,11): Error: cannot prove termination; try supplying a decreases clause
+Corecursion.dfy(71,16): Error: cannot prove termination; try supplying a decreases clause (note that calls cannot be co-recursive in this context)
+Corecursion.dfy(93,15): Error: cannot prove termination; try supplying a decreases clause (note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts)
+Corecursion.dfy(103,15): Error: cannot prove termination; try supplying a decreases clause (note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts)
+Corecursion.dfy(148,13): Error: decreases clause might not decrease (note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts)
+Corecursion.dfy(161,13): Error: decreases clause might not decrease (note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts)
+
+Dafny program verifier finished with 14 verified, 8 errors
diff --git a/Test/dafny0/CustomErrorMesage.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CustomErrorMesage.dfy
similarity index 89%
rename from Test/dafny0/CustomErrorMesage.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CustomErrorMesage.dfy
index 77aa5f16f00..5be685f1484 100644
--- a/Test/dafny0/CustomErrorMesage.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CustomErrorMesage.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 method m(x:int)
 {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CustomErrorMesage.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CustomErrorMesage.dfy.expect
new file mode 100644
index 00000000000..c33d4050316
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/CustomErrorMesage.dfy.expect
@@ -0,0 +1,18 @@
+CustomErrorMesage.dfy(6,2): Error: m: x must be positive
+CustomErrorMesage.dfy(10,2): Error: f: x must be positive
+CustomErrorMesage.dfy(15,5): Error: when calling foo, you must supply a positive x
+CustomErrorMesage.dfy(19,71): Related location: this proposition could not be proved
+CustomErrorMesage.dfy(22,2): Error: a postcondition could not be proved on this return path
+CustomErrorMesage.dfy(20,85): Related location: cannot establish that return value of foo is always negative
+CustomErrorMesage.dfy(26,14): Error: a precondition for this call could not be proved
+CustomErrorMesage.dfy(30,71): Related location: when calling bar, you must supply a positive x
+CustomErrorMesage.dfy(32,0): Error: a postcondition could not be proved on this return path
+CustomErrorMesage.dfy(31,85): Related location: cannot establish that return value of bar is always negative
+CustomErrorMesage.dfy(42,63): Error: this loop invariant could not be proved on entry
+ Related message: position variable out of range
+CustomErrorMesage.dfy(42,63): Error: this invariant could not be proved to be maintained by the loop
+ Related message: position variable out of range
+CustomErrorMesage.dfy(43,63): Error: this invariant could not be proved to be maintained by the loop
+ Related message: output array doesn't match input arry
+
+Dafny program verifier finished with 1 verified, 9 errors
diff --git a/Test/dafny0/DTypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DTypes.dfy
similarity index 97%
rename from Test/dafny0/DTypes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DTypes.dfy
index 820fea08ec6..8d5b98aee7e 100644
--- a/Test/dafny0/DTypes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DTypes.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var n: set<Node?>
@@ -175,7 +175,7 @@ abstract module OpaqueTypesWithParameters {
     // However, it is NOT necessarily the case that the type parameters of an opaque
     // type actually make the abstract type different.  For example, see the refinement
     // module CaseInPoint below.
-    ensures a != b  // error
+    ensures a != b as object  // error
   {
   }
 }
diff --git a/Test/dafny0/DTypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DTypes.dfy.expect
similarity index 75%
rename from Test/dafny0/DTypes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DTypes.dfy.expect
index 02c3fd9e8ce..0d32b44bad3 100644
--- a/Test/dafny0/DTypes.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DTypes.dfy.expect
@@ -6,17 +6,17 @@ DTypes.dfy(231,14): Warning: the type of the other operand is a non-null type, s
 DTypes.dfy(232,14): Warning: the type of the other operand is a non-null type, so this comparison with 'null' will always return 'false' (to make it possible for variable 'c' to have the value 'null', declare its type to be 'Cell?<MyClass>')
 DTypes.dfy(233,14): Warning: the type of the other operand is a non-null type, so this comparison with 'null' will always return 'false' (to make it possible for variable 'd' to have the value 'null', declare its type to be 'Cell?<MyClass>')
 DTypes.dfy(64,13): Warning: the type of the other operand is a non-null type, so this comparison with 'null' will always return 'true' (to make it possible for variable 'a' to have the value 'null', declare its type to be 'CP?<int, C>')
+DTypes.dfy(18,4): Error: assertion might not hold
+DTypes.dfy(56,4): Error: assertion might not hold
+DTypes.dfy(121,11): Error: assertion might not hold
+DTypes.dfy(93,29): Related location: this proposition could not be proved
+DTypes.dfy(127,11): Error: assertion might not hold
+DTypes.dfy(93,19): Related location: this proposition could not be proved
+DTypes.dfy(137,20): Error: assertion might not hold
+DTypes.dfy(132,4): Related location: this proposition could not be proved
+DTypes.dfy(93,19): Related location: this proposition could not be proved
+DTypes.dfy(156,4): Error: assertion might not hold
 DTypes.dfy(179,2): Error: a postcondition could not be proved on this return path
 DTypes.dfy(178,14): Related location: this is the postcondition that could not be proved
-DTypes.dfy(18,13): Error: assertion could not be proved
-DTypes.dfy(56,17): Error: assertion could not be proved
-DTypes.dfy(121,11): Error: assertion could not be proved
-DTypes.dfy(93,29): Related location
-DTypes.dfy(127,11): Error: assertion could not be proved
-DTypes.dfy(93,19): Related location
-DTypes.dfy(137,11): Error: assertion could not be proved
-DTypes.dfy(132,4): Related location
-DTypes.dfy(93,19): Related location
-DTypes.dfy(156,11): Error: assertion could not be proved
 
-Dafny program verifier finished with 21 verified, 7 errors
+Dafny program verifier finished with 20 verified, 7 errors
diff --git a/Test/dafny0/DafnyLib-extern.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DafnyLib-extern.cs
similarity index 100%
rename from Test/dafny0/DafnyLib-extern.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DafnyLib-extern.cs
diff --git a/Test/dafny0/DafnyLib.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DafnyLib.dfy
similarity index 100%
rename from Test/dafny0/DafnyLib.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DafnyLib.dfy
diff --git a/Test/dafny0/DafnyLibClient.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DafnyLibClient.dfy
similarity index 100%
rename from Test/dafny0/DafnyLibClient.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DafnyLibClient.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DafnyLibClient.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DafnyLibClient.dfy.expect
new file mode 100644
index 00000000000..96adf7ea9c6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DafnyLibClient.dfy.expect
@@ -0,0 +1,10 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 3 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 1 verified, 0 errors
+hello from the library
+hello extern
+hello from a nested module
+bye
diff --git a/Test/dafny0/DatatypeUpdate.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DatatypeUpdate.dfy
similarity index 96%
rename from Test/dafny0/DatatypeUpdate.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DatatypeUpdate.dfy
index 72902202bf0..071fa9cfd8f 100644
--- a/Test/dafny0/DatatypeUpdate.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DatatypeUpdate.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module NewSyntax {
diff --git a/Test/dafny0/DatatypeUpdate.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DatatypeUpdate.dfy.expect
similarity index 100%
rename from Test/dafny0/DatatypeUpdate.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DatatypeUpdate.dfy.expect
diff --git a/Test/dafny0/DatatypeUpdateResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DatatypeUpdateResolution.dfy
similarity index 96%
rename from Test/dafny0/DatatypeUpdateResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DatatypeUpdateResolution.dfy
index d6e0977b71a..04deee4ba0a 100644
--- a/Test/dafny0/DatatypeUpdateResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DatatypeUpdateResolution.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module MainStuff {
   datatype MyDataType = MyConstructor(myint:int, mybool:bool)
diff --git a/Test/dafny0/DatatypeUpdateResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DatatypeUpdateResolution.dfy.expect
similarity index 100%
rename from Test/dafny0/DatatypeUpdateResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DatatypeUpdateResolution.dfy.expect
diff --git a/Test/dafny0/Datatypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Datatypes.dfy
similarity index 96%
rename from Test/dafny0/Datatypes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Datatypes.dfy
index ab30b28d7d0..eed09adb30c 100644
--- a/Test/dafny0/Datatypes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Datatypes.dfy
@@ -1,13 +1,13 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
-datatype List<T> = Nil | Cons(T, List<T>)
+datatype List<T> = Nil | Cons({:custom 3 } T, {:custom 3 } List<T>)
 
 class Node {
   var data: int
   var next: Node?
 
-  ghost function Repr(list: List<int>): bool
+  ghost function Repr({:custom} list: List<int>): bool
     reads *
     decreases list
   { match list
@@ -24,7 +24,7 @@ class Node {
     next := null;
   }
 
-  method Add(d: int, L: List<int>) returns (r: Node)
+  method Add(d: int, L: List<int>) returns ({:custom} r: Node)
     requires Repr(L)
     ensures r.Repr(Cons(d, L))
   {
@@ -399,7 +399,7 @@ module Exhaustiveness {
     } else if c == B {
     } else if c == C {
     } else {
-      assert false;  // used to fails :(, but now works :)
+      assert false;  // used to fail :(, but now works :)
     }
   }
 
@@ -418,7 +418,7 @@ module Exhaustiveness {
   {
     var c := s[i];
     if c != A && c != B && c != C {
-      assert false;  // used to fails :(, but now works :)
+      assert false;  // used to fail :(, but now works :)
     }
   }
 
diff --git a/Test/dafny0/Datatypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Datatypes.dfy.expect
similarity index 84%
rename from Test/dafny0/Datatypes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Datatypes.dfy.expect
index 875ce12c7ed..7c0f82a843e 100644
--- a/Test/dafny0/Datatypes.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Datatypes.dfy.expect
@@ -1,3 +1,9 @@
+Datatypes.dfy(82,10): Error: assertion might not hold
+Datatypes.dfy(170,6): Error: assertion might not hold
+Datatypes.dfy(172,6): Error: assertion might not hold
+Datatypes.dfy(201,12): Error: destructor 'Car' can only be applied to datatype values constructed by 'XCons'
+Datatypes.dfy(204,16): Error: destructor 'Car' can only be applied to datatype values constructed by 'XCons'
+Datatypes.dfy(225,16): Error: destructor 'c' can only be applied to datatype values constructed by 'T''
 Datatypes.dfy(297,9): Error: a postcondition could not be proved on this return path
 Datatypes.dfy(295,14): Related location: this is the postcondition that could not be proved
 Datatypes.dfy(298,11): Error: missing case in match expression: Appendix(_)
@@ -6,11 +12,5 @@ Datatypes.dfy(349,4): Error: missing case in match expression: Nil
 Datatypes.dfy(356,7): Error: missing case in match expression: Cons(_, _)
 Datatypes.dfy(356,7): Error: missing case in match expression: Nil
 Datatypes.dfy(377,21): Error: RHS is not certain to look like the pattern 'AAA'
-Datatypes.dfy(82,19): Error: assertion could not be proved
-Datatypes.dfy(170,15): Error: assertion could not be proved
-Datatypes.dfy(172,15): Error: assertion could not be proved
-Datatypes.dfy(201,12): Error: destructor 'Car' can only be applied to datatype values constructed by 'XCons'
-Datatypes.dfy(204,16): Error: destructor 'Car' can only be applied to datatype values constructed by 'XCons'
-Datatypes.dfy(225,16): Error: destructor 'c' can only be applied to datatype values constructed by 'T''
 
 Dafny program verifier finished with 28 verified, 13 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo0.dfy
new file mode 100644
index 00000000000..ab7fece6939
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo0.dfy
@@ -0,0 +1,86 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+method GoodInstances(x: int, y: int) {
+  assert true decreases to false;
+  assert 1 decreases to 0;
+  assert x decreases to x - 1;
+  assert (x, y decreases to x, y - 1); // the parentheses here make this into a "decreases to" expression
+  assert y > x ==> (x, (y decreases to x), y - 1) == (x, true, y - 1); // whereas this is a 3-tuple
+
+  var s := {x, y, x*y};
+  var s' := s - {x};
+  assert  (s, s, s decreases to s, s, s') ;
+  assert 0 nonincreases to 0;
+}
+
+method Nested() {
+  assert (true, (true decreases to false)) == (true, true);
+}
+
+method BadInstance1() {
+  assert 0 decreases to 1; // error
+}
+
+method BadInstance2(x: int) {
+  assert x - 1 decreases to x; // error
+}
+
+method BadInstance3(x: int, y: int) {
+  assert (x, y - 1 decreases to x, y); // error
+}
+
+method BadInstance4() {
+  assert 0 nonincreases to 1; // error
+}
+
+method BadInstance5(i: int, b: bool) {
+  assert i decreases to b; // error
+}
+
+method BadInstance6() {
+  assert 0 decreases to false; // error
+}
+
+datatype Color = Red | Green | Blue
+
+method Tuples(x: int) {
+  if
+  case true =>
+    assert (Red, Green) decreases to Red;
+  case true =>
+    assert (Red, Green) decreases to (Red, Green); // error
+  case true =>
+    assert (Red, Green) nonincreases to (Red, Green);
+  case true =>
+    assert (Red, Green) decreases to Blue; // error
+  case true =>
+    assert x decreases to (x - 1, Blue); // error
+  case true =>
+    assert (x decreases to x - 1, Blue);
+}
+
+method Empties() {
+  assert (nonincreases to);
+  assert !(decreases to);
+  assert (decreases to 2); // yes, because \top decreases to 2,\top
+  assert (2 decreases to); // error, because 2,\top does not decreases to \top
+}
+
+method M0(c: bool) returns (b: bool)
+  ensures b
+  decreases c
+{
+  if c {
+    b := M0(false);
+  } else {
+    b := true;
+  }
+}
+
+method M1(c: bool) returns (b: bool)
+  requires !c
+  ensures b decreases to c
+{
+  b := true;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo0.dfy.expect
new file mode 100644
index 00000000000..4956fcdca04
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo0.dfy.expect
@@ -0,0 +1,12 @@
+DecreasesTo0.dfy(22,2): Error: assertion might not hold
+DecreasesTo0.dfy(26,2): Error: assertion might not hold
+DecreasesTo0.dfy(30,2): Error: assertion might not hold
+DecreasesTo0.dfy(34,2): Error: assertion might not hold
+DecreasesTo0.dfy(38,2): Error: assertion might not hold
+DecreasesTo0.dfy(42,2): Error: assertion might not hold
+DecreasesTo0.dfy(52,4): Error: assertion might not hold
+DecreasesTo0.dfy(56,4): Error: assertion might not hold
+DecreasesTo0.dfy(58,4): Error: assertion might not hold
+DecreasesTo0.dfy(67,2): Error: assertion might not hold
+
+Dafny program verifier finished with 4 verified, 10 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo1.dfy
new file mode 100644
index 00000000000..ffc6bf80859
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo1.dfy
@@ -0,0 +1,78 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --show-proof-obligation-expressions 
+
+method GoodInstances(x: int, y: int) {
+  assert (true decreases to false);
+  assert (1 decreases to 0);
+  assert (x decreases to x - 1);
+  assert (x, y decreases to x, y - 1);
+  var s := {x, y, x*y};
+  var s' := s - {x};
+  assert  (s, s, s decreases to s, s, s') ;
+  assert (0 nonincreases to 0);
+}
+
+method Nested() {
+  assert (true, (true decreases to false)) == (true, true);
+}
+
+method BadInstance1() {
+  assert (0 decreases to 1);
+}
+
+method BadInstance2(x: int) {
+  assert (x - 1 decreases to x);
+}
+
+method BadInstance3(x: int, y: int) {
+  assert (x, y - 1 decreases to x, y);
+}
+
+// The following are failures in termination proofs, used to test the
+// assertions printed with `--show-proof-obligation-expressions`
+
+datatype List = Nil | Cons(head: int, tail: List)
+
+function BadUp(m: nat, n: nat): List
+  requires m <= n
+  decreases n + m
+{
+  if m == n then Nil else Cons(m, BadUp(m+1, n))
+}
+
+method BadUpM(m: nat, n: nat) returns (r: List)
+  requires m <= n
+  decreases n + m
+{
+  if m == n {
+    r := Nil;
+  } else {
+    var r' := BadUpM(m+1, n);
+    r := Cons(m, r');
+  }
+}
+
+method BadLoop(x: int, y: int) {
+  var x' := x;
+  var y' := x;
+  while x' + y' > 0
+    decreases x'
+  {
+    if x' > y' {
+      x' := x' - 1;
+    } else {
+      y' := y' - 1;
+    }
+  }
+}
+
+method BadInstance4() {
+  assert (0 nonincreases to 1);
+}
+
+method BadInstance5(i: int, b: bool) {
+  assert (i decreases to b);
+}
+
+method BadInstance6() {
+  assert (0 decreases to false);
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo1.dfy.expect
new file mode 100644
index 00000000000..b9772de2560
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo1.dfy.expect
@@ -0,0 +1,24 @@
+DecreasesTo1.dfy(19,2): Error: assertion might not hold
+ Asserted expression: 0 decreases to 1
+DecreasesTo1.dfy(23,2): Error: assertion might not hold
+ Asserted expression: x - 1 decreases to x
+DecreasesTo1.dfy(27,2): Error: assertion might not hold
+ Asserted expression: (x, y - 1 decreases to x, y)
+DecreasesTo1.dfy(39,39): Error: decreases clause might not decrease
+ Asserted expression: n + m decreases to n + m + 1
+DecreasesTo1.dfy(49,20): Error: decreases clause might not decrease
+ Asserted expression: old(n + m) decreases to n + m + 1
+DecreasesTo1.dfy(57,2): Error: decreases expression might not decrease
+ Asserted expression: old@LoopEntry(prev_x') decreases to x'
+   with the label `LoopEntry` applied to the loop
+   and with the following declarations at the beginning of the loop body:
+     var prev_x': int := x';
+     var prev_y': int := y';
+DecreasesTo1.dfy(69,2): Error: assertion might not hold
+ Asserted expression: 0 nonincreases to 1
+DecreasesTo1.dfy(73,2): Error: assertion might not hold
+ Asserted expression: i decreases to b
+DecreasesTo1.dfy(77,2): Error: assertion might not hold
+ Asserted expression: 0 decreases to false
+
+Dafny program verifier finished with 2 verified, 9 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo2.dfy
new file mode 100644
index 00000000000..2025528a403
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo2.dfy
@@ -0,0 +1,29 @@
+// RUN: %exits-with 2 %resolve "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Parentheses but missing "to"
+
+method BadParse0() {
+  assert (decreases); // parsing error
+}
+
+method BadParse1() {
+  assert (nonincreases); // parsing error
+}
+
+// Arguments and parentheses, but missing "to"
+
+method BadParse2() {
+  assert (10 decreases); // parsing error
+}
+
+method BadParse3() {
+  assert (nonincreases 20); // parsing error
+}
+
+method BadParse4() returns (ghost b: bool) {
+  b := (Lemma(0); true decreases to Lemma(1); false); // parsing error: needs parens around (Lemma(1); false)
+}
+
+lemma Lemma(x: int) {
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo2.dfy.expect
new file mode 100644
index 00000000000..1a59a511bae
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo2.dfy.expect
@@ -0,0 +1,11 @@
+DecreasesTo2.dfy(7,19): Error: ident expected
+DecreasesTo2.dfy(7,10): Error: expected 'to'
+DecreasesTo2.dfy(11,22): Error: ident expected
+DecreasesTo2.dfy(11,10): Error: expected 'to'
+DecreasesTo2.dfy(17,22): Error: ident expected
+DecreasesTo2.dfy(17,13): Error: expected 'to'
+DecreasesTo2.dfy(21,23): Error: ident expected
+DecreasesTo2.dfy(21,10): Error: expected 'to'
+DecreasesTo2.dfy(25,44): Error: closeparen expected
+DecreasesTo2.dfy(25,51): Error: invalid Suffix
+10 parse errors detected in DecreasesTo2.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo3.dfy
new file mode 100644
index 00000000000..c1e85cb7ba2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo3.dfy
@@ -0,0 +1,33 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --show-proof-obligation-expressions
+
+
+method M1() {
+  assert (1 decreases to 0) && (0 decreases to 1); // error: second conjunct doesn't hold
+}
+
+method M2() {
+  assert 0 decreases to 1; // error
+}
+
+method PrettyPrinting0(b: bool) {
+  assert b <==> (0, 1, 2 decreases to (0 nonincreases to 0), b <==> b, 6) <==> b; // error
+}
+
+method PrettyPrinting1(b: bool) {
+  assert b <==> (3 decreases to 2) <==> !b; // error
+}
+
+method PrettyPrinting2(b: bool) {
+  assert b <==> b decreases to var two := 2; two <= two; // error
+}
+
+lemma Lemma() {
+}
+
+method PrettyPrinting3(b: bool) {
+  assert (Lemma(); b) <==> (Lemma(); !b) decreases to (Lemma(); false); // error
+}
+
+method PrettyPrinting4(b: bool) {
+  assert (b decreases to (Lemma(); true), (Lemma(); true)); // error
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo3.dfy.expect
new file mode 100644
index 00000000000..544157aea1b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo3.dfy.expect
@@ -0,0 +1,16 @@
+DecreasesTo3.dfy(5,34): Error: assertion might not hold
+ Asserted expression: (1 decreases to 0) && (0 decreases to 1)
+DecreasesTo3.dfy(9,2): Error: assertion might not hold
+ Asserted expression: 0 decreases to 1
+DecreasesTo3.dfy(13,2): Error: assertion might not hold
+ Asserted expression: b <==> (0, 1, 2 decreases to (0 nonincreases to 0), b <==> b, 6) <==> b
+DecreasesTo3.dfy(17,2): Error: assertion might not hold
+ Asserted expression: b <==> (3 decreases to 2) <==> !b
+DecreasesTo3.dfy(21,2): Error: assertion might not hold
+ Asserted expression: b <==> b decreases to var two: int := 2; two <= two
+DecreasesTo3.dfy(28,2): Error: assertion might not hold
+ Asserted expression: (Lemma(); b) <==> (Lemma(); !b) decreases to (Lemma(); false)
+DecreasesTo3.dfy(32,2): Error: assertion might not hold
+ Asserted expression: (b decreases to (Lemma(); true), (Lemma(); true))
+
+Dafny program verifier finished with 0 verified, 7 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo4.dfy
new file mode 100644
index 00000000000..2011a6b0f2d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo4.dfy
@@ -0,0 +1,26 @@
+// RUN: %exits-with 2 %resolve "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method AttemptAtBinding0(x: int) {
+  assert (x := 1 decreases to x - 1); // parsing error
+}
+
+method AttemptAtBinding1(x: int) {
+  assert (0 := x decreases to x - 1); // parsing error
+}
+
+method AttemptAtBinding2(x: int) {
+  assert (000 := x nonincreases to x - 1); // parsing error
+}
+
+method AttemptAtBinding3(x: int) {
+  assert (ghost y := x decreases to x - 1); // parsing error
+}
+
+method BadUseOfGhost0(x: int) {
+  assert (ghost x decreases to x - 1); // parsing error
+}
+
+method BadUseOfGhost1(x: int) {
+  assert (x + 1, ghost x nonincreases to x - 1); // parsing error
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo4.dfy.expect
new file mode 100644
index 00000000000..79fa740760c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo4.dfy.expect
@@ -0,0 +1,7 @@
+DecreasesTo4.dfy(5,10): Error: bindings are not allowed in `decreases to` expressions.
+DecreasesTo4.dfy(9,10): Error: bindings are not allowed in `decreases to` expressions.
+DecreasesTo4.dfy(13,10): Error: bindings are not allowed in `nonincreases to` expressions.
+DecreasesTo4.dfy(17,16): Error: bindings are not allowed in `decreases to` expressions.
+DecreasesTo4.dfy(21,16): Error: 'ghost' components are not allowed in `decreases to` expressions.
+DecreasesTo4.dfy(25,23): Error: 'ghost' components are not allowed in `nonincreases to` expressions.
+6 parse errors detected in DecreasesTo4.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo5.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo5.dfy
new file mode 100644
index 00000000000..0e8818063a9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo5.dfy
@@ -0,0 +1,18 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+method NonGhost(x: int) {
+  expect x - 1 decreases to x; // error: cannot use ghost expression here
+}
+
+method GhostVariable(x: int) returns (c: bool) {
+  ghost var b := x - 1 decreases to x; // b is inferred to be ghost
+  c := b; // error: cannot assign ghost to non-ghost
+}
+
+/* TODO: this currently crashes the resovler
+method InferredGhost(x: int) returns (c: bool) {
+  var b := x - 1 decreases to x; // b is inferred to be ghost
+  c := b; // error: cannot assign ghost to non-ghost
+}
+*/
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo5.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo5.dfy.expect
new file mode 100644
index 00000000000..996eaf180ee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DecreasesTo5.dfy.expect
@@ -0,0 +1,3 @@
+DecreasesTo5.dfy(5,15): Error: a `decreases to` expression is allowed only in specification and ghost contexts
+DecreasesTo5.dfy(10,7): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
+2 resolution/type errors detected in DecreasesTo5.dfy
diff --git a/Test/dafny0/DefaultParameters.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefaultParameters.dfy
similarity index 99%
rename from Test/dafny0/DefaultParameters.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefaultParameters.dfy
index 34cdac95538..ad5ff33c388 100644
--- a/Test/dafny0/DefaultParameters.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefaultParameters.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module Actuals {
   datatype List<T> = Nil | Cons(T, tail: List<T> := Nil)
@@ -600,4 +600,4 @@ module ExtremeNat {
   lemma TestLeastZero(y: int, z: int, v: int, w: int, a: int, b: int, o: nat) {
     assert Q#[o](b); // error: does not hold for o == 0
   }
-}
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefaultParameters.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefaultParameters.dfy.expect
new file mode 100644
index 00000000000..edd1f6bca0e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefaultParameters.dfy.expect
@@ -0,0 +1,80 @@
+DefaultParameters.dfy(55,24): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(63,42): Error: default value could not be proved to be allocated in the two-state function's previous state
+DefaultParameters.dfy(67,38): Error: default value could not be proved to be allocated in the two-state lemma's previous state
+DefaultParameters.dfy(92,2): Error: a postcondition could not be proved on this return path
+DefaultParameters.dfy(91,16): Related location: this is the postcondition that could not be proved
+DefaultParameters.dfy(102,6): Error: assertion might not hold
+DefaultParameters.dfy(110,6): Error: assertion might not hold
+DefaultParameters.dfy(124,37): Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+DefaultParameters.dfy(131,40): Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+DefaultParameters.dfy(135,49): Error: possible division by zero
+DefaultParameters.dfy(137,43): Error: possible division by zero
+DefaultParameters.dfy(140,34): Error: possible division by zero
+DefaultParameters.dfy(145,17): Error: possible division by zero
+DefaultParameters.dfy(148,38): Error: possible division by zero
+DefaultParameters.dfy(150,33): Error: possible division by zero
+DefaultParameters.dfy(153,24): Error: possible division by zero
+DefaultParameters.dfy(158,15): Error: possible division by zero
+DefaultParameters.dfy(160,43): Error: possible division by zero
+DefaultParameters.dfy(160,43): Error: possible division by zero
+DefaultParameters.dfy(162,38): Error: possible division by zero
+DefaultParameters.dfy(162,38): Error: possible division by zero
+DefaultParameters.dfy(165,29): Error: possible division by zero
+DefaultParameters.dfy(165,29): Error: possible division by zero
+DefaultParameters.dfy(170,15): Error: possible division by zero
+DefaultParameters.dfy(170,15): Error: possible division by zero
+DefaultParameters.dfy(172,45): Error: possible division by zero
+DefaultParameters.dfy(178,41): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(179,33): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(180,35): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(180,35): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(181,40): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(194,40): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(200,42): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(211,63): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(219,30): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(220,30): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(229,9): Error: decreases clause might not decrease
+DefaultParameters.dfy(235,5): Error: decreases clause might not decrease
+DefaultParameters.dfy(235,7): Error: decreases clause might not decrease
+DefaultParameters.dfy(241,5): Error: decreases clause might not decrease
+DefaultParameters.dfy(251,31): Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+DefaultParameters.dfy(258,42): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(267,41): Error: possible division by zero
+DefaultParameters.dfy(320,45): Error: a precondition for this call could not be proved
+DefaultParameters.dfy(319,15): Related location: this is the precondition that could not be proved
+DefaultParameters.dfy(326,36): Error: insufficient reads clause to read array element; Array elements cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+DefaultParameters.dfy(327,54): Error: insufficient reads clause to read array element; Array elements cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+DefaultParameters.dfy(360,38): Error: possible division by zero
+DefaultParameters.dfy(361,40): Error: possible division by zero
+DefaultParameters.dfy(362,32): Error: possible division by zero
+DefaultParameters.dfy(363,37): Error: possible division by zero
+DefaultParameters.dfy(363,37): Error: possible division by zero
+DefaultParameters.dfy(365,38): Error: possible division by zero
+DefaultParameters.dfy(385,35): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(386,37): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(387,29): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(388,34): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(388,34): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(390,35): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(416,28): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(417,30): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(418,30): Error: cannot prove termination; try supplying a decreases clause
+DefaultParameters.dfy(419,21): Error: cannot prove termination; try supplying a decreases clause
+DefaultParameters.dfy(438,28): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(443,28): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(447,5): Error: cannot prove termination; try supplying a decreases clause
+DefaultParameters.dfy(453,32): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(481,32): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
+DefaultParameters.dfy(493,18): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(494,32): Error: value does not satisfy the subset constraints of 'nat'
+DefaultParameters.dfy(500,15): Error: a precondition for this call could not be proved
+DefaultParameters.dfy(503,13): Related location: this is the precondition that could not be proved
+DefaultParameters.dfy(520,38): Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+DefaultParameters.dfy(521,40): Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+DefaultParameters.dfy(524,49): Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+DefaultParameters.dfy(548,38): Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+DefaultParameters.dfy(601,16): Error: assertion might not hold
+DefaultParameters.dfy(582,18): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 72 verified, 74 errors
diff --git a/Test/dafny0/Definedness.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Definedness.dfy
similarity index 98%
rename from Test/dafny0/Definedness.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Definedness.dfy
index d48561fe38e..c0946f6eaec 100644
--- a/Test/dafny0/Definedness.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Definedness.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-deprecation --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // ----------------- wellformed specifications ----------------------
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Definedness.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Definedness.dfy.expect
new file mode 100644
index 00000000000..bd28e97ab5e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Definedness.dfy.expect
@@ -0,0 +1,54 @@
+Definedness.dfy(11,6): Error: possible division by zero
+Definedness.dfy(18,15): Error: possible division by zero
+Definedness.dfy(27,15): Error: target object might be null
+Definedness.dfy(28,20): Error: target object might be null
+Definedness.dfy(29,16): Error: possible division by zero
+Definedness.dfy(36,15): Error: target object might be null
+Definedness.dfy(45,15): Error: target object might be null
+Definedness.dfy(53,17): Error: target object might be null
+Definedness.dfy(54,2): Error: a postcondition could not be proved on this return path
+Definedness.dfy(53,21): Related location: this is the postcondition that could not be proved
+Definedness.dfy(60,17): Error: target object might be null
+Definedness.dfy(61,2): Error: a postcondition could not be proved on this return path
+Definedness.dfy(60,21): Related location: this is the postcondition that could not be proved
+Definedness.dfy(68,2): Error: a postcondition could not be proved on this return path
+Definedness.dfy(67,21): Related location: this is the postcondition that could not be proved
+Definedness.dfy(88,6): Error: target object might be null
+Definedness.dfy(89,5): Error: function precondition could not be proved
+Definedness.dfy(79,15): Related location: this proposition could not be proved
+Definedness.dfy(89,9): Error: assignment might update an object not in the enclosing context's modifies clause
+Definedness.dfy(89,9): Error: target object might be null
+Definedness.dfy(90,10): Error: function precondition could not be proved
+Definedness.dfy(79,15): Related location: this proposition could not be proved
+Definedness.dfy(95,13): Error: possible division by zero
+Definedness.dfy(95,22): Error: possible division by zero
+Definedness.dfy(96,14): Error: possible division by zero
+Definedness.dfy(101,11): Error: possible division by zero
+Definedness.dfy(108,14): Error: possible division by zero
+Definedness.dfy(117,23): Error: function precondition could not be proved
+Definedness.dfy(79,15): Related location: this proposition could not be proved
+Definedness.dfy(123,17): Error: function precondition could not be proved
+Definedness.dfy(79,15): Related location: this proposition could not be proved
+Definedness.dfy(133,17): Error: function precondition could not be proved
+Definedness.dfy(79,15): Related location: this proposition could not be proved
+Definedness.dfy(133,21): Error: this loop invariant could not be proved on entry
+ Related message: loop invariant violation
+Definedness.dfy(134,17): Error: function precondition could not be proved
+Definedness.dfy(79,15): Related location: this proposition could not be proved
+Definedness.dfy(143,14): Error: possible division by zero
+Definedness.dfy(162,14): Error: possible division by zero
+Definedness.dfy(175,27): Error: this loop invariant could not be proved on entry
+ Related message: loop invariant violation
+Definedness.dfy(181,17): Error: function precondition could not be proved
+Definedness.dfy(79,15): Related location: this proposition could not be proved
+Definedness.dfy(196,18): Error: possible division by zero
+Definedness.dfy(196,22): Error: this loop invariant could not be proved on entry
+ Related message: loop invariant violation
+Definedness.dfy(196,27): Error: possible division by zero
+Definedness.dfy(219,2): Error: a postcondition could not be proved on this return path
+Definedness.dfy(217,45): Related location: this is the postcondition that could not be proved
+Definedness.dfy(224,21): Error: target object might be null
+Definedness.dfy(242,2): Error: a postcondition could not be proved on this return path
+Definedness.dfy(240,23): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 9 verified, 37 errors
diff --git a/Test/dafny0/DefiniteAssignment.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefiniteAssignment.dfy
similarity index 97%
rename from Test/dafny0/DefiniteAssignment.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefiniteAssignment.dfy
index 585614ca962..2c3e991aa1f 100644
--- a/Test/dafny0/DefiniteAssignment.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefiniteAssignment.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class MyClass<G(00)> {
@@ -27,8 +27,8 @@ class MyClass<G(00)> {
   }  // error: x was never assigned, neither was oxA or oxB
   constructor C4(g: G)
   {
-    this.y := *;
-    x := y;
+    this.y := *; // note, the type of y is G, so this does not discharge the definite-assignment proof obligation on the next line
+    x := y; // error: y has not been properly assigned
   }
 }
 
@@ -87,7 +87,7 @@ method DontForgetHavoc<G(00)>(a: G, h: int) returns (k: G) {
   if h < 10 {
     k := x;  // fine
   } else if h < 20 {
-    k := y;
+    k := y; // error: y is used but not assigned
   } else {
     z := *;
     return z;  // this is fine, since z was explicitly assigned by the havoc
@@ -145,7 +145,7 @@ method MM<G(00)>(ghost x: int, g: G) returns (vv: G, ww: G)
   vv := v;  // fine
   var w: G := *;
   w := *;
-  ww := w;
+  ww := w; // error: w has not been properly assigned
 }
 
 // ----- iterators ----------------------------
diff --git a/Test/dafny0/DefiniteAssignment.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefiniteAssignment.dfy.expect
similarity index 91%
rename from Test/dafny0/DefiniteAssignment.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefiniteAssignment.dfy.expect
index 14267ee7cdc..8d8d6bbe159 100644
--- a/Test/dafny0/DefiniteAssignment.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DefiniteAssignment.dfy.expect
@@ -1,3 +1,24 @@
+DefiniteAssignment.dfy(11,9): Error: field 'y', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(18,4): Error: field 'y', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+DefiniteAssignment.dfy(23,2): Error: field 'y', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+DefiniteAssignment.dfy(27,2): Error: field 'x', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+DefiniteAssignment.dfy(31,9): Error: field 'y', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(45,0): Error: out-parameter 'y', which is subject to definite-assignment rules, might be uninitialized at this return point
+DefiniteAssignment.dfy(53,9): Error: variable 'z', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(61,15): Error: variable 'j', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(64,4): Error: out-parameter 'y', which is subject to definite-assignment rules, might be uninitialized at this return point
+DefiniteAssignment.dfy(68,0): Error: out-parameter 'z', which is subject to definite-assignment rules, might be uninitialized at this return point
+DefiniteAssignment.dfy(90,9): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(99,5): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+DefiniteAssignment.dfy(99,14): Error: variable 'e1', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(132,7): Error: variable 'b', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(133,0): Error: out-parameter 'g', which is subject to definite-assignment rules, might be uninitialized at this return point
+DefiniteAssignment.dfy(148,8): Error: variable 'w', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(242,12): Error: variable 'a', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(243,12): Error: variable 'b', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(281,13): Error: variable 'f', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(286,13): Error: variable 'f', which is subject to definite-assignment rules, might be uninitialized here
+DefiniteAssignment.dfy(294,13): Error: variable 'f', which is subject to definite-assignment rules, might be uninitialized here
 DefiniteAssignment.dfy(305,13): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
 DefiniteAssignment.dfy(310,13): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
 DefiniteAssignment.dfy(315,6): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
@@ -14,23 +35,5 @@ DefiniteAssignment.dfy(433,11): Error: variable 'g', which is subject to definit
 DefiniteAssignment.dfy(438,13): Error: variable 'g', which is subject to definite-assignment rules, might be uninitialized here
 DefiniteAssignment.dfy(441,2): Error: out-parameter 'r'', which is subject to definite-assignment rules, might be uninitialized at this return point
 DefiniteAssignment.dfy(449,2): Error: out-parameter 'r', which is subject to definite-assignment rules, might be uninitialized at this return point
-DefiniteAssignment.dfy(45,0): Error: out-parameter 'y', which is subject to definite-assignment rules, might be uninitialized at this return point
-DefiniteAssignment.dfy(53,9): Error: variable 'z', which is subject to definite-assignment rules, might be uninitialized here
-DefiniteAssignment.dfy(61,15): Error: variable 'j', which is subject to definite-assignment rules, might be uninitialized here
-DefiniteAssignment.dfy(64,4): Error: out-parameter 'y', which is subject to definite-assignment rules, might be uninitialized at this return point
-DefiniteAssignment.dfy(68,0): Error: out-parameter 'z', which is subject to definite-assignment rules, might be uninitialized at this return point
-DefiniteAssignment.dfy(99,5): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-DefiniteAssignment.dfy(99,14): Error: variable 'e1', which is subject to definite-assignment rules, might be uninitialized here
-DefiniteAssignment.dfy(132,7): Error: variable 'b', which is subject to definite-assignment rules, might be uninitialized here
-DefiniteAssignment.dfy(133,0): Error: out-parameter 'g', which is subject to definite-assignment rules, might be uninitialized at this return point
-DefiniteAssignment.dfy(242,12): Error: variable 'a', which is subject to definite-assignment rules, might be uninitialized here
-DefiniteAssignment.dfy(243,12): Error: variable 'b', which is subject to definite-assignment rules, might be uninitialized here
-DefiniteAssignment.dfy(11,9): Error: field 'y', which is subject to definite-assignment rules, might be uninitialized here
-DefiniteAssignment.dfy(18,4): Error: field 'y', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-DefiniteAssignment.dfy(23,2): Error: field 'y', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-DefiniteAssignment.dfy(27,2): Error: field 'x', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-DefiniteAssignment.dfy(281,13): Error: variable 'f', which is subject to definite-assignment rules, might be uninitialized here
-DefiniteAssignment.dfy(286,13): Error: variable 'f', which is subject to definite-assignment rules, might be uninitialized here
-DefiniteAssignment.dfy(294,13): Error: variable 'f', which is subject to definite-assignment rules, might be uninitialized here
 
-Dafny program verifier finished with 17 verified, 34 errors
+Dafny program verifier finished with 14 verified, 37 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Deprecation.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Deprecation.dfy
new file mode 100644
index 00000000000..9637ae77669
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Deprecation.dfy
@@ -0,0 +1,89 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings --relax-definite-assignment
+
+// This file contains tests for messags about various deprecated features.
+// As those features go away completely, so can the corresponding tests.
+
+method Main() {
+  // Test that we get all the way to compilation, despite the deprecation warnings below
+  print "yet here we are\n";
+}
+
+// ----------
+
+class C {
+  constructor ()
+    modifies this  // deprecation warning: "this" is no longer needed in modifies of a constructor
+  {
+  }
+}
+
+// ----------
+
+inductive predicate InductivePredicate()  // deprecation warning: "inductive predicate" has been renamed to "least predicate"
+{ true }
+
+copredicate CoPredicate()  // deprecation warning: "copredicate" has been renamed to "greatest predicate"
+{ true }
+
+inductive lemma InductiveLemma()  // deprecation warning: "inductive lemma" has been renamed to "least lemma"
+{ }
+
+colemma CoLemma()  // deprecation warning: "colemma" has been renamed to "greatest lemma"
+{ }
+
+// ------- empty forall statement and forall statement with parentheses -----------------------------------------
+
+class EmptyForallStatement {
+  var data: int
+
+  ghost predicate P(x: int)
+
+  lemma EstablishP(x: int)
+    ensures P(x)
+
+  method EmptyForall0()
+    modifies this
+    ensures data == 8
+  {
+    forall () { // warning (x2): forall statement with no bound variables, and forall statement with parentheses
+      this.data := 8;
+    }
+  }
+
+  method EmptyForall1()
+    ensures P(8)
+  {
+    forall { // warning: forall statement with no bound variables
+      EstablishP(8);
+    }
+  }
+
+  method EmptyForall2(s: set<EmptyForallStatement>)
+    ensures forall x :: x in s ==> P(x.data)
+  {
+    forall (x | x in s) { // warning: forall statement with parentheses
+      EstablishP(x.data);
+    }
+  }
+
+  method EmptyForall3(s: set<EmptyForallStatement>)
+    ensures forall x <- s :: P(x.data)
+  {
+    forall (x <- s) // warning: forall statement with parentheses
+      ensures P(x.data)
+    {
+      EstablishP(x.data);
+    }
+  }
+
+  method EmptyForall4()
+  {
+    forall // warning: forall statement with no bound variables
+      ensures exists k :: P(k)
+    {
+      var y := 8;
+      assume P(y);
+    }
+    assert exists k :: P(k); // yes
+  }
+}
diff --git a/Test/dafny0/Deprecation.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Deprecation.dfy.expect
similarity index 100%
rename from Test/dafny0/Deprecation.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Deprecation.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Deprecation.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Deprecation.dfy.verifier.expect
new file mode 100644
index 00000000000..3216510dd40
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Deprecation.dfy.verifier.expect
@@ -0,0 +1,11 @@
+Deprecation.dfy(15,13): Warning: constructors no longer need 'this' to be listed in modifies clauses
+Deprecation.dfy(22,0): Warning: the old keyword phrase 'inductive predicate' has been renamed to 'least predicate'
+Deprecation.dfy(25,0): Warning: the old keyword 'copredicate' has been renamed to the keyword phrase 'greatest predicate'
+Deprecation.dfy(28,0): Warning: the old keyword phrase 'inductive lemma' has been renamed to 'least lemma'
+Deprecation.dfy(31,0): Warning: the old keyword 'colemma' has been renamed to the keyword phrase 'greatest lemma'
+Deprecation.dfy(48,11): Warning: parentheses around the forall-statement bound variables are deprecated and not needed
+Deprecation.dfy(48,4): Warning: a forall statement with no bound variables is deprecated; use an 'assert by' statement instead
+Deprecation.dfy(56,4): Warning: a forall statement with no bound variables is deprecated; use an 'assert by' statement instead
+Deprecation.dfy(64,11): Warning: parentheses around the forall-statement bound variables are deprecated and not needed
+Deprecation.dfy(72,11): Warning: parentheses around the forall-statement bound variables are deprecated and not needed
+Deprecation.dfy(81,4): Warning: a forall statement with no bound variables is deprecated; use an 'assert by' statement instead
diff --git a/Test/dafny0/DeterministicPick.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DeterministicPick.dfy
similarity index 88%
rename from Test/dafny0/DeterministicPick.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DeterministicPick.dfy
index a4fb0816349..bb632da76ff 100644
--- a/Test/dafny0/DeterministicPick.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DeterministicPick.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 abstract module Specification {
   function Pick(s: set<int>): int
diff --git a/Test/dafny0/DeterministicPick.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DeterministicPick.dfy.expect
similarity index 100%
rename from Test/dafny0/DeterministicPick.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DeterministicPick.dfy.expect
diff --git a/Test/dafny0/DiamondImports.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiamondImports.dfy
similarity index 97%
rename from Test/dafny0/DiamondImports.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiamondImports.dfy
index 933de66c146..038ddc1ee2e 100644
--- a/Test/dafny0/DiamondImports.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiamondImports.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" --relax-definite-assignment > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module ImportByName {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiamondImports.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiamondImports.dfy.expect
new file mode 100644
index 00000000000..85198cd6b44
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiamondImports.dfy.expect
@@ -0,0 +1,7 @@
+DiamondImports.dfy(34,6): Error: assertion might not hold
+DiamondImports.dfy(50,6): Error: assertion might not hold
+DiamondImports.dfy(101,6): Error: assertion might not hold
+DiamondImports.dfy(120,6): Error: assertion might not hold
+DiamondImports.dfy(140,6): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 5 errors
diff --git a/Test/dafny0/DirtyLoops.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DirtyLoops.dfy
similarity index 98%
rename from Test/dafny0/DirtyLoops.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DirtyLoops.dfy
index 23c956e7c49..ecb6919530a 100644
--- a/Test/dafny0/DirtyLoops.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DirtyLoops.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /dprint:"%t.dprint.dfy" "%s" > "%t"
-// RUN: %dafny /noVerify "%t.dprint.dfy" >> "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --print:"%t.dprint.dfy" "%s" > "%t"
+// RUN: %resolve "%t.dprint.dfy" --allow-warnings >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // For a body-less loop specification, a local variable or
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DirtyLoops.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DirtyLoops.dfy.expect
new file mode 100644
index 00000000000..867a359933f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DirtyLoops.dfy.expect
@@ -0,0 +1,141 @@
+DirtyLoops.dfy(515,2): Warning: the conclusion of the body of this forall statement will not be known outside the forall statement; consider using an 'ensures' clause
+DirtyLoops.dfy(26,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy(35,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy(46,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy(55,2): Warning: this loop has no body (loop frame: i, s)
+DirtyLoops.dfy(68,2): Warning: this loop has no body (loop frame: i, s, $Heap)
+DirtyLoops.dfy(80,2): Warning: this loop has no body (loop frame: i, s, r)
+DirtyLoops.dfy(88,2): Warning: this loop has no body
+DirtyLoops.dfy(106,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy(118,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy(130,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(145,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(159,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(173,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(189,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(203,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(216,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(229,2): Warning: this loop has no body (loop frame: i, k)
+DirtyLoops.dfy(242,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(251,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy(260,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(268,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(279,2): Warning: this loop has no body (loop frame: i, k)
+DirtyLoops.dfy(293,2): Warning: this loop has no body (loop frame: i, k)
+DirtyLoops.dfy(305,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy(319,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(332,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy(343,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy(354,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy(365,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy(377,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy(388,2): Warning: this loop has no body (loop frame: i, k)
+DirtyLoops.dfy(400,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy(413,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy(497,2): Warning: this forall statement has no body
+DirtyLoops.dfy(504,2): Warning: this forall statement has no body
+DirtyLoops.dfy(512,2): Warning: this forall statement has no body
+DirtyLoops.dfy(515,2): Warning: this forall statement has no body
+DirtyLoops.dfy(531,2): Warning: this loop has no body (loop frame: x)
+DirtyLoops.dfy(427,4): Warning: this loop has no body (loop frame: $Heap)
+DirtyLoops.dfy(436,4): Warning: this loop has no body (loop frame: $Heap)
+DirtyLoops.dfy(452,6): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(468,6): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy(485,6): Warning: this loop has no body (loop frame: j, $Heap)
+DirtyLoops.dfy(515,2): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+DirtyLoops.dfy(30,2): Error: assertion might not hold
+DirtyLoops.dfy(39,2): Error: assertion might not hold
+DirtyLoops.dfy(48,2): Error: assertion might not hold
+DirtyLoops.dfy(57,2): Error: assertion might not hold
+DirtyLoops.dfy(59,2): Error: assertion might not hold
+DirtyLoops.dfy(70,2): Error: assertion might not hold
+DirtyLoops.dfy(72,2): Error: assertion might not hold
+DirtyLoops.dfy(82,2): Error: assertion might not hold
+DirtyLoops.dfy(83,2): Error: assertion might not hold
+DirtyLoops.dfy(90,2): Error: assertion might not hold
+DirtyLoops.dfy(110,2): Error: assertion might not hold
+DirtyLoops.dfy(122,2): Error: assertion might not hold
+DirtyLoops.dfy(136,2): Error: assertion might not hold
+DirtyLoops.dfy(137,2): Error: assertion might not hold
+DirtyLoops.dfy(149,2): Error: assertion might not hold
+DirtyLoops.dfy(151,2): Error: assertion might not hold
+DirtyLoops.dfy(164,2): Error: assertion might not hold
+DirtyLoops.dfy(165,2): Error: assertion might not hold
+DirtyLoops.dfy(180,2): Error: assertion might not hold
+DirtyLoops.dfy(181,2): Error: assertion might not hold
+DirtyLoops.dfy(193,2): Error: assertion might not hold
+DirtyLoops.dfy(195,2): Error: assertion might not hold
+DirtyLoops.dfy(196,2): Error: assertion might not hold
+DirtyLoops.dfy(208,2): Error: assertion might not hold
+DirtyLoops.dfy(221,2): Error: assertion might not hold
+DirtyLoops.dfy(234,2): Error: assertion might not hold
+DirtyLoops.dfy(244,2): Error: assertion might not hold
+DirtyLoops.dfy(253,2): Error: assertion might not hold
+DirtyLoops.dfy(261,2): Error: assertion might not hold
+DirtyLoops.dfy(270,2): Error: assertion might not hold
+DirtyLoops.dfy(285,2): Error: assertion might not hold
+DirtyLoops.dfy(297,2): Error: assertion might not hold
+DirtyLoops.dfy(298,2): Error: assertion might not hold
+DirtyLoops.dfy(308,2): Error: assertion might not hold
+DirtyLoops.dfy(309,2): Error: assertion might not hold
+DirtyLoops.dfy(321,2): Error: assertion might not hold
+DirtyLoops.dfy(356,2): Error: assertion might not hold
+DirtyLoops.dfy(369,2): Error: assertion might not hold
+DirtyLoops.dfy(380,2): Error: assertion might not hold
+DirtyLoops.dfy(401,18): Error: this loop invariant could not be proved on entry
+ Related message: loop invariant violation
+DirtyLoops.dfy(414,16): Error: target object might be null
+DirtyLoops.dfy(452,6): Error: loop modifies clause might violate context's modifies clause
+DirtyLoops.dfy(468,6): Error: loop modifies clause might violate context's modifies clause
+DirtyLoops.dfy(485,6): Error: loop modifies clause might violate context's modifies clause
+DirtyLoops.dfy(506,22): Error: assertion might not hold
+DirtyLoops.dfy(533,2): Error: assertion might not hold
+
+Dafny program verifier finished with 22 verified, 46 errors
+DirtyLoops.dfy.tmp.dprint.dfy(408,2): Warning: the conclusion of the body of this forall statement will not be known outside the forall statement; consider using an 'ensures' clause
+DirtyLoops.dfy.tmp.dprint.dfy(6,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy.tmp.dprint.dfy(16,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy.tmp.dprint.dfy(27,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy.tmp.dprint.dfy(36,2): Warning: this loop has no body (loop frame: i, s)
+DirtyLoops.dfy.tmp.dprint.dfy(50,2): Warning: this loop has no body (loop frame: i, s, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(63,2): Warning: this loop has no body (loop frame: i, s, r)
+DirtyLoops.dfy.tmp.dprint.dfy(72,2): Warning: this loop has no body
+DirtyLoops.dfy.tmp.dprint.dfy(82,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy.tmp.dprint.dfy(94,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy.tmp.dprint.dfy(106,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(121,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(135,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(149,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(165,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(179,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(192,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(205,2): Warning: this loop has no body (loop frame: i, k)
+DirtyLoops.dfy.tmp.dprint.dfy(218,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(227,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy.tmp.dprint.dfy(236,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(244,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(254,2): Warning: this loop has no body (loop frame: i, k)
+DirtyLoops.dfy.tmp.dprint.dfy(267,2): Warning: this loop has no body (loop frame: i, k)
+DirtyLoops.dfy.tmp.dprint.dfy(280,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(294,2): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(307,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy.tmp.dprint.dfy(318,2): Warning: this loop has no body (loop frame: i)
+DirtyLoops.dfy.tmp.dprint.dfy(329,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(340,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(352,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(363,2): Warning: this loop has no body (loop frame: i, k)
+DirtyLoops.dfy.tmp.dprint.dfy(373,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(384,2): Warning: this loop has no body (loop frame: i, k, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(390,2): Warning: this forall statement has no body
+DirtyLoops.dfy.tmp.dprint.dfy(397,2): Warning: this forall statement has no body
+DirtyLoops.dfy.tmp.dprint.dfy(406,2): Warning: this forall statement has no body
+DirtyLoops.dfy.tmp.dprint.dfy(408,2): Warning: this forall statement has no body
+DirtyLoops.dfy.tmp.dprint.dfy(414,2): Warning: this loop has no body (loop frame: x)
+DirtyLoops.dfy.tmp.dprint.dfy(444,4): Warning: this loop has no body (loop frame: $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(453,4): Warning: this loop has no body (loop frame: $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(469,6): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(485,6): Warning: this loop has no body (loop frame: i, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(502,6): Warning: this loop has no body (loop frame: j, $Heap)
+DirtyLoops.dfy.tmp.dprint.dfy(408,2): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier did not attempt verification
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy
new file mode 100644
index 00000000000..c6cf78ca1cd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy
@@ -0,0 +1,123 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings --relax-definite-assignment
+
+newtype NT = x | 0 <= x < 100
+newtype UT = NT
+
+newtype Lower = x | -2 <= x
+newtype Upper = x: Lower | x < 100
+
+newtype Int = int
+
+newtype NR = r | -2.0 <= r <= 5.4
+
+method Main()
+{
+  var n: NT :| true;
+  var t: UT :| true;
+
+  var u: Upper :| true;
+  var l: Lower :| l < 20;
+  var o: Lower :| true;
+
+  var j: Int :| true;
+
+  print n, "\n";
+  print t, "\n";
+  print u, "\n";
+  print l, "\n";
+  print o, "\n";
+
+  var b: bool;
+  b := forall n': NT :: true ==> P(n' as int);
+  b := forall t': UT :: true ==> P(t' as int);
+  b := forall u': Upper :: true ==> P(u' as int);
+  b := forall l': Lower :: l' < 20 ==> P(l' as int);
+  b := forall j': Int :: -3 <= j' < 7 ==> P(j' as int);
+
+  var x0, x1, x2, x3, x4, x5 := OtherEq(false, {}, [], map[198 := 200], multiset{}, iset{}, imap[]);
+  print x0, " ", x1, " ", x2, " ", x3, " ", x4, " ", x5, "\n";
+  x0, x1, x2, x3, x4, x5 := OtherEq(true, {}, [], map[198 := 200], multiset{}, iset{}, imap[]);
+  print x0, " ", x1, " ", x2, " ", x3, " ", x4, " ", x5, "\n";
+
+  EnumerateOverInfiniteCollections();
+  Casts();
+  MakeSureBoundsAreDiscoveredWithoutFirstSimplifyingTheExpression();
+}
+
+predicate P(x: int)
+{
+  x == 157
+}
+
+predicate Q(r: real)
+{
+  r / 2.0 <= r
+}
+
+method OtherEq<U,V(==)>(b: bool, s: set<int>, t: seq<real>, u: map<U,V>, v: multiset<char>, w: iset<bv12>, x: imap<bv28,int>)
+  returns (s': set<int>, t': seq<real>, u': map<U,V>, v': multiset<char>, w': iset<bv12>, x': imap<bv28,int>)
+{
+  if b {
+    s' :| s' == s;
+    t' :| t' == t;
+    u' :| u' == u;
+    v' :| v' == v;
+    w' :| w' == w;
+    x' :| x' == x;
+  } else {
+    s' := var s'' :| s'' == s; s'';
+    t' := var t'' :| t'' == t; t'';
+    u' := var u'' :| u'' == u; u'';
+    v' := var v'' :| v'' == v; v'';
+    w' := var w'' :| w'' == w; w'';
+    x' := var x'' :| x'' == x; x'';
+  }
+}
+
+predicate LessThanFour(x: int) {
+  x < 4
+}
+
+method EnumerateOverInfiniteCollections() {
+  // ===== iset
+  
+  var s := {3, 3, 3, 5};
+
+  // Once, the following RHS caused "u" to be auto-ghost. (Oddly enough, when using the same RHS as a
+  // separate assignment, the RHS was not considered to be ghost. So, we test both here.)
+  var u := iset x | x in s;
+  u := iset x | x in s;
+
+  // Once, the compilation of the following was rejected, because an iset was not considered enumerable. But it is.
+  var y :| y in u && LessThanFour(y); // an iset is enumerable, so it's compilable
+  print y, "\n"; // 3
+
+  // ===== imap
+  
+  var m := map[3 := true, 5 := false];
+
+  // Once, the following RHS caused "u" to be auto-ghost.  (Oddly enough, when using the same RHS as a
+  // separate assignment, the RHS was not considered to be ghost. So, we test both here.)
+  var w := imap x | x in m :: true;
+  w := imap x | x in m :: true;
+
+  // Once, the compilation of the following was rejected, because an imap was not considered enumerable. But it is.
+  var z :| z in w && LessThanFour(z); // an imap is enumerable, so it's compilable
+  print z, "\n"; // 3
+}
+
+method Casts() {
+  // casts around just the variable is fine
+  print forall x :: -12 <= x && (x as int - 2) as int < 0 ==> LessThanFour(x), " "; // true
+  print forall x :: 12 <= x && (x as int - 20) as int < 0 ==> LessThanFour(x), "\n"; // false
+  // casts among subset types are also fine
+  print forall x: int :: 12 <= x && (x as int - 2) as nat < 24 ==> LessThanFour(x), " "; // false
+  print forall x: nat :: 12 <= x && (x as int - 20) as int < 0 ==> LessThanFour(x), "\n"; // false
+  // not a cast, but involving arithmetic expressions
+  print forall x: int :: -100 <= x - 3 < -11 ==> LessThanFour(x as int), "\n"; // true
+}
+
+method MakeSureBoundsAreDiscoveredWithoutFirstSimplifyingTheExpression() {
+  var b := forall n': NT :: true;
+  print b, "\n"; // true
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy.expect
new file mode 100644
index 00000000000..fbe6cd7f164
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy.expect
@@ -0,0 +1,13 @@
+0
+0
+-2
+-2
+-2
+{} [] map[198 := 200] multiset{} {} map[]
+{} [] map[198 := 200] multiset{} {} map[]
+3
+3
+true false
+false false
+true
+true
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy.rs.check
new file mode 100644
index 00000000000..9aef9ec31ec
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Unsupported:\ <i>Cannot\ assign\ null\ value\ to\ variable</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy.verifier.expect
new file mode 100644
index 00000000000..f3b12cb73c8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBounds.dfy.verifier.expect
@@ -0,0 +1,7 @@
+DiscoverBounds.dfy(31,7): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+DiscoverBounds.dfy(32,7): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+DiscoverBounds.dfy(33,7): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+DiscoverBounds.dfy(34,7): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+DiscoverBounds.dfy(35,7): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+DiscoverBounds.dfy(117,8): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+DiscoverBounds.dfy(121,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBoundsErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBoundsErrors.dfy
new file mode 100644
index 00000000000..06e0204bc2d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBoundsErrors.dfy
@@ -0,0 +1,107 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+newtype Lower = x | -2 <= x
+
+newtype NR = r | -2.0 <= r <= 5.4
+
+method Main()
+{
+  var b;
+  b := forall o': Lower :: true ==> P(o' as int);  // error: cannot find finite range
+  b := forall r: real :: 0.0 <= r <= 100.0 ==> Q(r);  // error: cannot find finite range
+  b := forall r': NR :: true ==> Q(r' as real);  // error: cannot find finite range
+}
+
+predicate P(x: int)
+{
+  x == 157
+}
+
+predicate Q(r: real)
+{
+  r / 2.0 <= r
+}
+
+method ForallStmt_Int()
+{
+  var a := new real[8](i => i as real - 4.0);
+  var b := new real[8];
+  var c := new bool[8];
+  forall i | 6 <= 2*(i+3) && i < a.Length {  // error: heuristics too weak to detect this range is compilable
+    b[7-i] := a[i] + 4.0;
+  }
+  forall i | true {  // error: non-compilable range
+    c[if 0 <= i < a.Length then i else 0] :=
+      var j := if 0 <= i < a.Length then i else 0;
+      a[j] < b[j];
+  }
+}
+
+method ForallStmt_Objects(ks: set<K>)
+  requires ks != {}
+  modifies ks
+{
+  print "max: ", Max(ks), "\n";
+  forall k | k in ks {
+    k.u := 57;
+  }
+  print "max: ", Max(ks), "\n";
+
+  var myK := new K;
+  forall k: K | true {  // error: non-compilable range
+    (if k in ks then k else myK).u := 57;
+  }
+}
+
+class K {
+  var u: int
+}
+
+function Max(ks: set<K>): int
+  requires ks != {}
+  reads ks
+{
+  MaxExists(ks);
+  var k :| k in ks && forall m :: m in ks ==> m.u <= k.u;
+  k.u
+}
+
+lemma MaxExists(ks: set<K>)
+  requires ks != {}
+  ensures exists k :: k in ks && forall m :: m in ks ==> m.u <= k.u
+{
+  var k :| k in ks;
+  if m :| m in ks && k.u < m.u {
+    assert |{k,m}| == 2;
+    MaxExists(ks - {k});
+  }
+}
+
+predicate LessThanFour(x: int) {
+  x < 4
+}
+
+ghost function PlusOne(x: int): int {
+  x + 1
+}
+
+method EnumerateOverInfiniteCollections() {
+  var s := {3, 3, 3, 5};
+  var l;
+  // Once, the TermLeft of map comprehensions was not checked for ghost-ness. Thus, the following assignment
+  // had been allowed by the resolver, which caused the compiler to emit malformed target code. (Oddly enough,
+  // when using the same RHS as an initializing assignment, the ghost-ness was detected and caused the variable
+  // to become auto-ghost which means an error is reported about the print statement not being compilable.)
+  l := map x | x in s && LessThanFour(x) :: PlusOne(x) := x;
+  print l, "\n"; // map[3 := 3]
+}
+
+newtype MyInt = x: int | -0x8000_0000 <= x
+
+method Casts() {
+  // casts around just the variable is fine, but around any other expression is more complicated (so we don't handle it, for now)
+  print forall x: MyInt :: -12 <= x && (x as int - 2) as int < 0 ==> LessThanFour(x as int); // error: dunno how to compile
+  print forall x: MyInt :: 12 <= x && (x as int - 20) as int < 0 ==> LessThanFour(x as int); // error: dunno how to compile
+  print forall x: int :: 11 <= x && (x as real - 20.0) as int < 0 ==> LessThanFour(x as int); // error: dunno how to compile
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBoundsErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBoundsErrors.dfy.expect
new file mode 100644
index 00000000000..658736bab52
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DiscoverBoundsErrors.dfy.expect
@@ -0,0 +1,11 @@
+DiscoverBoundsErrors.dfy(11,7): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'o''
+DiscoverBoundsErrors.dfy(12,7): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'r'
+DiscoverBoundsErrors.dfy(13,7): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'r''
+DiscoverBoundsErrors.dfy(31,2): Error: forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
+DiscoverBoundsErrors.dfy(34,2): Error: forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
+DiscoverBoundsErrors.dfy(52,2): Error: forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'k'
+DiscoverBoundsErrors.dfy(96,51): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+DiscoverBoundsErrors.dfy(104,8): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'x'
+DiscoverBoundsErrors.dfy(105,8): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'x'
+DiscoverBoundsErrors.dfy(106,8): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'x'
+10 resolution/type errors detected in DiscoverBoundsErrors.dfy
diff --git a/Test/dafny0/DisplayExpressions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DisplayExpressions.dfy
similarity index 96%
rename from Test/dafny0/DisplayExpressions.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DisplayExpressions.dfy
index 7c17d6e8dc3..b0240d37082 100644
--- a/Test/dafny0/DisplayExpressions.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DisplayExpressions.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module AA {
diff --git a/Test/dafny0/DisplayExpressions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DisplayExpressions.dfy.expect
similarity index 100%
rename from Test/dafny0/DisplayExpressions.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DisplayExpressions.dfy.expect
diff --git a/Test/dafny0/DividedConstructors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DividedConstructors.dfy
similarity index 96%
rename from Test/dafny0/DividedConstructors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DividedConstructors.dfy
index e6f63a35f11..f5e9f6b6ca1 100644
--- a/Test/dafny0/DividedConstructors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DividedConstructors.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --allow-deprecation
 
 method Main() {
   var m := new M0.MyClass.Init(20);
diff --git a/Test/dafny0/DividedConstructors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DividedConstructors.dfy.expect
similarity index 100%
rename from Test/dafny0/DividedConstructors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DividedConstructors.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DividedConstructors.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DividedConstructors.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DividedConstructors.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Test/dafny0/GhostPrint.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DividedConstructors.dfy.verifier.expect
old mode 100755
new mode 100644
similarity index 100%
rename from Test/dafny0/GhostPrint.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/DividedConstructors.dfy.verifier.expect
diff --git a/Test/dafny0/EqualityTypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypes.dfy
similarity index 99%
rename from Test/dafny0/EqualityTypes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypes.dfy
index 4720d5b6425..d590b79cef0 100644
--- a/Test/dafny0/EqualityTypes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypes.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/dafny0/EqualityTypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypes.dfy.expect
similarity index 76%
rename from Test/dafny0/EqualityTypes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypes.dfy.expect
index c4921897c37..2b4c8387ad8 100644
--- a/Test/dafny0/EqualityTypes.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypes.dfy.expect
@@ -1,16 +1,16 @@
-EqualityTypes.dfy(34,13): Error: a type declaration that requires equality support cannot be replaced by a codatatype
-EqualityTypes.dfy(35,11): Error: type 'Y', which does not support equality, is used to refine an abstract type with equality support
+EqualityTypes.dfy(34,13): Error: to be a refinement of abstract type 'C.X' declared with (==), codatatype 'E.X' must support equality
+EqualityTypes.dfy(35,11): Error: to be a refinement of abstract type 'C.Y' declared with (==), datatype 'E.Y' must support equality
 EqualityTypes.dfy(40,11): Error: datatype 'X' is declared with a different number of type parameters (1 instead of 0) than the corresponding datatype in the module it refines
 EqualityTypes.dfy(41,8): Error: class 'Y' is declared with a different number of type parameters (1 instead of 0) than the corresponding class in the module it refines
-EqualityTypes.dfy(45,11): Error: type 'X', which does not support equality, is used to refine an abstract type with equality support
-EqualityTypes.dfy(46,11): Error: type 'Y', which does not support equality, is used to refine an abstract type with equality support
-EqualityTypes.dfy(66,7): Error: == can only be applied to expressions of types that support equality (got Dt<T>)
+EqualityTypes.dfy(45,11): Error: to be a refinement of abstract type 'C.X' declared with (==), datatype 'G.X' must support equality
+EqualityTypes.dfy(46,11): Error: to be a refinement of abstract type 'C.Y' declared with (==), datatype 'G.Y' must support equality
+EqualityTypes.dfy(66,7): Error: == can only be applied to expressions of types that support equality (got Dt<T>) (perhaps try declaring type parameter 'T' on line 65 as 'T(==)', which says it can only be instantiated with a type that supports equality)
 EqualityTypes.dfy(85,9): Error: type parameter (T) passed to method M must support equality (got _T0) (perhaps try declaring type parameter '_T0' on line 81 as '_T0(==)', which says it can only be instantiated with a type that supports equality)
 EqualityTypes.dfy(109,7): Error: == can only be applied to expressions of types that support equality (got D)
 EqualityTypes.dfy(114,13): Error: == can only be applied to expressions of types that support equality (got D)
 EqualityTypes.dfy(118,16): Error: == can only be applied to expressions of types that support equality (got D)
 EqualityTypes.dfy(147,8): Error: set argument type must support equality (got Co)
-EqualityTypes.dfy(149,13): Error: type parameter (Y) passed to function G must support equality (got Co)
+EqualityTypes.dfy(149,14): Error: type parameter (Y) passed to function G must support equality (got Co)
 EqualityTypes.dfy(156,11): Error: set argument type must support equality (got Co)
 EqualityTypes.dfy(173,8): Error: set argument type must support equality (got Dt<Co>)
 EqualityTypes.dfy(176,8): Error: set argument type must support equality (got Left<Co, int>)
@@ -35,7 +35,7 @@ EqualityTypes.dfy(238,24): Error: set argument type must support equality (got C
 EqualityTypes.dfy(239,21): Error: multiset argument type must support equality (got Co)
 EqualityTypes.dfy(241,8): Error: map domain type must support equality (got Co)
 EqualityTypes.dfy(241,14): Error: map domain type must support equality (got Co)
-EqualityTypes.dfy(255,13): Error: type parameter 'T' (inferred to be '?') in the function call to 'UG' could not be determined
+EqualityTypes.dfy(255,15): Error: type parameter 'T' (inferred to be '?') in the function call to 'UG' could not be determined
 EqualityTypes.dfy(256,4): Error: type parameter 'T' (inferred to be '?') to the method 'UP' could not be determined
 EqualityTypes.dfy(259,8): Error: the type of this local variable is underspecified
 EqualityTypes.dfy(261,4): Error: type parameter 'T' (inferred to be 'set<?>') to the method 'Callee' could not be determined
@@ -49,37 +49,37 @@ EqualityTypes.dfy(293,8): Error: map domain type must support equality (got Dt)
 EqualityTypes.dfy(295,8): Error: imap domain type must support equality (got Dt)
 EqualityTypes.dfy(303,8): Error: set argument type must support equality (got Stream<int>)
 EqualityTypes.dfy(305,28): Error: set argument type must support equality (got Stream<int>)
-EqualityTypes.dfy(306,14): Error: set argument type must support equality (got Stream<int>)
+EqualityTypes.dfy(306,33): Error: set argument type must support equality (got Stream<int>)
 EqualityTypes.dfy(309,13): Error: type parameter 0 (V) passed to type AClass must support equality (got Stream<int>)
 EqualityTypes.dfy(312,19): Error: type parameter 0 (V) passed to type AClass must support equality (got Stream<int>)
-EqualityTypes.dfy(313,19): Error: type parameter 1 (X) passed to function H must support equality (got Stream<real>)
+EqualityTypes.dfy(313,39): Error: type parameter 1 (X) passed to function H must support equality (got Stream<real>)
 EqualityTypes.dfy(315,19): Error: type parameter 0 (V) passed to type AClass must support equality (got Stream<int>)
 EqualityTypes.dfy(316,19): Error: type parameter 1 (X) passed to function H must support equality (got Stream<real>)
-EqualityTypes.dfy(319,31): Error: type parameter 1 (X) passed to function H must support equality (got Stream<real>)
+EqualityTypes.dfy(319,51): Error: type parameter 1 (X) passed to function H must support equality (got Stream<real>)
 EqualityTypes.dfy(321,15): Error: type parameter 0 (V) passed to type AClass must support equality (got Stream<real>)
 EqualityTypes.dfy(323,4): Error: type parameter 0 (V) passed to type AClass must support equality (got Stream<int>)
 EqualityTypes.dfy(326,48): Error: type parameter 1 (B) passed to method Q must support equality (got Stream<real>)
 EqualityTypes.dfy(328,4): Error: set argument type must support equality (got Stream<int>)
 EqualityTypes.dfy(329,45): Error: set argument type must support equality (got Stream<real>)
 EqualityTypes.dfy(330,15): Error: set argument type must support equality (got Stream<int>)
-EqualityTypes.dfy(331,31): Error: set argument type must support equality (got Stream<real>)
+EqualityTypes.dfy(331,56): Error: set argument type must support equality (got Stream<real>)
 EqualityTypes.dfy(334,7): Error: == can only be applied to expressions of types that support equality (got seq<int -> int>)
 EqualityTypes.dfy(337,14): Error: in can only be applied to expressions of sequence types that support equality (got seq<int -> int>)
 EqualityTypes.dfy(340,16): Error: in can only be applied to expressions of sequence types that support equality (got seq<int -> int>)
 EqualityTypes.dfy(359,11): Error: type parameter (A) passed to type JustOpaque must support equality (got ABC) (perhaps try declaring abstract type 'ABC' on line 354 as 'ABC(==)', which says it can only be instantiated with a type that supports equality)
 EqualityTypes.dfy(360,11): Error: type parameter (A) passed to type Synonym must support equality (got ABC) (perhaps try declaring abstract type 'ABC' on line 354 as 'ABC(==)', which says it can only be instantiated with a type that supports equality)
 EqualityTypes.dfy(361,11): Error: type parameter (A) passed to type Subset must support equality (got ABC) (perhaps try declaring abstract type 'ABC' on line 354 as 'ABC(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypes.dfy(376,9): Error: == can only be applied to expressions of types that support equality (got List<A>)
-EqualityTypes.dfy(378,9): Error: == can only be applied to expressions of types that support equality (got List<A>)
-EqualityTypes.dfy(381,9): Error: == can only be applied to expressions of types that support equality (got List<A>)
-EqualityTypes.dfy(386,9): Error: == can only be applied to expressions of types that support equality (got (A, List<A>))
+EqualityTypes.dfy(376,9): Error: == can only be applied to expressions of types that support equality (got List<A>) (perhaps try declaring type parameter 'A' on line 373 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypes.dfy(378,9): Error: == can only be applied to expressions of types that support equality (got List<A>) (perhaps try declaring type parameter 'A' on line 373 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypes.dfy(381,9): Error: == can only be applied to expressions of types that support equality (got List<A>) (perhaps try declaring type parameter 'A' on line 373 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypes.dfy(386,9): Error: == can only be applied to expressions of types that support equality (got (A, List<A>)) (perhaps try declaring type parameter 'A' on line 384 as 'A(==)', which says it can only be instantiated with a type that supports equality)
 EqualityTypes.dfy(392,9): Error: == can only be applied to expressions of types that support equality (got GhostRecord)
 EqualityTypes.dfy(397,9): Error: == can only be applied to expressions of types that support equality (got Co<A>)
 EqualityTypes.dfy(412,8): Error: set argument type must support equality (got A) (perhaps try declaring type parameter 'A' on line 410 as 'A(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypes.dfy(416,12): Error: in can only be applied to expressions of sequence types that support equality (got seq<A>)
-EqualityTypes.dfy(419,20): Error: in can only be applied to expressions of sequence types that support equality (got seq<A>)
-EqualityTypes.dfy(423,15): Error: <= can only be applied to expressions of sequence types that support equality (got seq<A>)
-EqualityTypes.dfy(427,8): Error: set argument type must support equality (got (A, B))
+EqualityTypes.dfy(416,12): Error: in can only be applied to expressions of sequence types that support equality (got seq<A>) (perhaps try declaring type parameter 'A' on line 414 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypes.dfy(419,20): Error: in can only be applied to expressions of sequence types that support equality (got seq<A>) (perhaps try declaring type parameter 'A' on line 414 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypes.dfy(423,15): Error: <= can only be applied to expressions of sequence types that support equality (got seq<A>) (perhaps try declaring type parameter 'A' on line 414 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypes.dfy(427,8): Error: set argument type must support equality (got (A, B)) (perhaps try declaring type parameter 'B' on line 425 as 'B(==)', which says it can only be instantiated with a type that supports equality)
 EqualityTypes.dfy(429,8): Error: set argument type must support equality (got B) (perhaps try declaring type parameter 'B' on line 425 as 'B(==)', which says it can only be instantiated with a type that supports equality)
 EqualityTypes.dfy(436,8): Error: map domain type must support equality (got A) (perhaps try declaring type parameter 'A' on line 434 as 'A(==)', which says it can only be instantiated with a type that supports equality)
 84 resolution/type errors detected in EqualityTypes.dfy
diff --git a/Test/dafny0/EqualityTypesCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesCompile.dfy
similarity index 91%
rename from Test/dafny0/EqualityTypesCompile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesCompile.dfy
index a36d1818c1d..154f69e0743 100644
--- a/Test/dafny0/EqualityTypesCompile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesCompile.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype List<A> = Nil | Cons(A, List) | ICons(int, List)
 datatype TwoLists<A> = Two(List, List)
diff --git a/Test/dafny0/EqualityTypesCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesCompile.dfy.expect
similarity index 100%
rename from Test/dafny0/EqualityTypesCompile.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesCompile.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesCompile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesCompile.dfy.rs.check
new file mode 100644
index 00000000000..cf9f9aeeafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesCompile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0369]: binary operation `==` cannot be applied to type `Rc<List<_A>>`
\ No newline at end of file
diff --git a/Test/dafny0/EqualityTypesModuleExports.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesModuleExports.dfy
similarity index 92%
rename from Test/dafny0/EqualityTypesModuleExports.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesModuleExports.dfy
index d895e973635..5caedcc7d38 100644
--- a/Test/dafny0/EqualityTypesModuleExports.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesModuleExports.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /rprint:"%t.rprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This module contains checks that (==) types are inferred and required as they should.
@@ -148,6 +148,15 @@ module BBB {
   type Syn<A> = Dt<A>
   type SubsetCo<A> = co: Co<A> | true  // error: Co and subset type SubsetCo have a mutual dependency
   type Noeq = int -> int
+}
+
+module BBB' {
+  class MyClass<A(==)> { }
+  datatype Dt<A> = Dt(s: set<A>)
+  codatatype Co<A> = Co(s: iset<A>, more: Co<A>)
+  type Syn<A> = Dt<A>
+  type SubsetCo<A> = co: Co<A> | true
+  type Noeq = int -> int
 
   method Test() {
     var a: MyClass<Noeq>;  // error: Noeq does not support equality
@@ -169,6 +178,19 @@ module CCC {
   type Syn<A> = Dt<A>
   type SubsetCo<A> = co: Co<A> | true  // error: Co and subset type SubsetCo have a mutual dependency
   type Noeq = int -> int
+}
+
+module CCC' {
+  export reveals Co, Syn, SubsetCo, Dt
+  export Alt reveals MyClass, Dt, SubsetCo, Co
+  export More reveals Syn provides Dt
+
+  class MyClass<A(==)> { }
+  datatype Dt<A(==)> = Dt(s: set<A>)
+  codatatype Co<A> = Co(s: iset<A>, more: Co<A>)
+  type Syn<A> = Dt<A>
+  type SubsetCo<A> = co: Co<A> | true
+  type Noeq = int -> int
 
   method Test() {
     var a: MyClass<Noeq>;  // error: Noeq does not support equality
@@ -190,6 +212,19 @@ module DDD {
   type Syn<A> = Dt<A>
   type SubsetCo<A> = co: Co<A> | true  // error: Co and subset type SubsetCo have a mutual dependency
   type Noeq = int -> int
+}
+
+module DDD' {
+  export reveals Syn, SubsetCo provides Dt, Co
+  export Alt reveals MyClass, Dt, SubsetCo, Co
+  export More reveals Syn, Dt
+
+  class MyClass<A(==)> { }
+  datatype Dt<A> = Dt(s: set<A>)  // error: A is not inferred to be (==), so set<A> is not allowed
+  codatatype Co<A> = Co(s: iset<A>, more: Co<A>)  // error: A is not inferred to be (==), so iset<A> is not allowed
+  type Syn<A> = Dt<A>
+  type SubsetCo<A> = co: Co<A> | true
+  type Noeq = int -> int
 
   method Test() {
     var a: MyClass<Noeq>;  // error: Noeq does not support equality
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesModuleExports.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesModuleExports.dfy.expect
new file mode 100644
index 00000000000..d26388e10dd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/EqualityTypesModuleExports.dfy.expect
@@ -0,0 +1,63 @@
+EqualityTypesModuleExports.dfy(50,11): Error: type parameter (X) passed to type Dt0 must support equality (got M) (perhaps try declaring type parameter 'M' on line 48 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(51,11): Error: type parameter (Y) passed to type Dt1 must support equality (got M) (perhaps try declaring type parameter 'M' on line 48 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(52,11): Error: type parameter (Z) passed to type Dt2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 48 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(65,11): Error: type parameter 0 (X) passed to type Co0 must support equality (got M) (perhaps try declaring type parameter 'M' on line 63 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(66,11): Error: type parameter 0 (Y) passed to type Co1 must support equality (got M) (perhaps try declaring type parameter 'M' on line 63 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(67,11): Error: type parameter 0 (Z) passed to type Co2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 63 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(99,11): Error: type parameter 0 (B) passed to type Opaque2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(105,12): Error: type parameter 1 (C) passed to type O'Pake2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(110,11): Error: type parameter (A) passed to type Syn2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(115,11): Error: type parameter (A) passed to type Syn5 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(117,11): Error: type parameter 0 (C) passed to type Syn6 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(121,11): Error: type parameter (A) passed to type Subset1 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(123,11): Error: type parameter (A) passed to type Subset2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(133,11): Error: type parameter (A) passed to type Syn5 must support equality (got ListWithALittlExtra<int>)
+EqualityTypesModuleExports.dfy(134,11): Error: type parameter (A) passed to type Syn5 must support equality (got Co2<int, int>)
+EqualityTypesModuleExports.dfy(135,11): Error: type parameter (A) passed to type Syn5 must support equality (got Opaque0) (perhaps try declaring abstract type 'Opaque0' on line 73 as 'Opaque0(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(139,11): Error: type parameter (A) passed to type Syn5 must support equality (got Syn1<int -> int>)
+EqualityTypesModuleExports.dfy(13,8): Error: set argument type must support equality (got Klm) (perhaps try declaring type parameter 'Klm' on line 11 as 'Klm(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(13,23): Error: set argument type must support equality (got Klm) (perhaps try declaring type parameter 'Klm' on line 11 as 'Klm(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(32,18): Error: type parameter (X) passed to function Fib must support equality (got Y) (perhaps try declaring type parameter 'Y' on line 26 as 'Y(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(32,23): Error: set argument type must support equality (got Y) (perhaps try declaring type parameter 'Y' on line 26 as 'Y(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(34,13): Error: set argument type must support equality (got GG) (perhaps try declaring type parameter 'GG' on line 21 as 'GG(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(84,7): Error: type 'Syn4' declared as supporting equality, but the RHS type ((real, A)) might not (perhaps try declaring type parameter 'A' on line 84 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(92,7): Error: type 'Subset4' declared as supporting equality, but the RHS type ((A, int)) might not (perhaps try declaring type parameter 'A' on line 92 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(149,7): Error: recursive constraint dependency involving a subset type: SubsetCo -> Co -> SubsetCo
+EqualityTypesModuleExports.dfy(162,11): Error: type parameter (A) passed to type MyClass must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(163,11): Error: type parameter (A) passed to type Dt must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(164,11): Error: type parameter (A) passed to type Co must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(165,11): Error: type parameter (A) passed to type Syn must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(166,11): Error: type parameter (A) passed to type SubsetCo must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(179,7): Error: recursive constraint dependency involving a subset type: SubsetCo -> Co -> SubsetCo
+EqualityTypesModuleExports.dfy(196,11): Error: type parameter (A) passed to type MyClass must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(197,11): Error: type parameter (A) passed to type Dt must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(198,11): Error: type parameter (A) passed to type Co must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(199,11): Error: type parameter (A) passed to type Syn must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(200,11): Error: type parameter (A) passed to type SubsetCo must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(213,7): Error: recursive constraint dependency involving a subset type: SubsetCo -> Co -> SubsetCo
+EqualityTypesModuleExports.dfy(230,11): Error: type parameter (A) passed to type MyClass must support equality (got Noeq)
+EqualityTypesModuleExports.dfy(223,22): Error: set argument type must support equality (got A) (perhaps try declaring type parameter 'A' on line 223 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(224,24): Error: iset argument type must support equality (got A) (perhaps try declaring type parameter 'A' on line 224 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(249,7): Error: to be a refinement of abstract type 'EEE.Opa' declared with (==), type synonym 'FFF.Opa' must support equality
+EqualityTypesModuleExports.dfy(265,12): Error: type parameter (A) passed to type S must support equality (got GGG.Opa'<int>) (perhaps try declaring abstract type 'Opa'' on line 243 as 'Opa'(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(266,12): Error: type parameter (A) passed to type S must support equality (got GGG.Syn'<int>)
+EqualityTypesModuleExports.dfy(267,12): Error: type parameter (A) passed to type S must support equality (got GGG.Sub'<int>)
+EqualityTypesModuleExports.dfy(284,7): Error: == can only be applied to expressions of types that support equality (got WWW0.XT)
+EqualityTypesModuleExports.dfy(287,7): Error: == can only be applied to expressions of types that support equality (got WWW0.YT)
+EqualityTypesModuleExports.dfy(290,7): Error: == can only be applied to expressions of types that support equality (got WWW0.ZT)
+EqualityTypesModuleExports.dfy(293,7): Error: == can only be applied to expressions of types that support equality (got WWW0.WT)
+EqualityTypesModuleExports.dfy(318,7): Error: type 'A' declared as supporting equality, but the RHS type (QQQ1.Syn<int>) might not
+EqualityTypesModuleExports.dfy(333,7): Error: type 'ExportedType' declared as supporting equality, but the RHS type (PrivateType<A>) might not (perhaps try declaring type parameter 'A' on line 333 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(381,4): Error: == can only be applied to expressions of types that support equality (got List<A>) (perhaps try declaring type parameter 'A' on line 379 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+EqualityTypesModuleExports.dfy(401,9): Warning: this export set is empty (did you perhaps forget the 'provides' or 'reveals' keyword?)
+EqualityTypesModuleExports.dfy(444,7): Error: type 'Synonym' declared as being nonempty, but the RHS type (Empty) may be empty
+EqualityTypesModuleExports.dfy(445,7): Error: type 'AnotherSynonym' declared as being nonempty, but the RHS type (Empty) may be empty
+EqualityTypesModuleExports.dfy(448,7): Error: type 'NESynonym' declared as auto-initialization type, but the RHS type (NonEmpty) does not support auto-initialization
+EqualityTypesModuleExports.dfy(452,7): Error: type 'NoReference' declared as containing no reference types, but the RHS type (C?) may contain reference types
+EqualityTypesModuleExports.dfy(455,7): Error: type 'PipeDreamEquality' declared as supporting equality, but the RHS type (Stream) might not
+EqualityTypesModuleExports.dfy(460,7): Error: type 'Subset' declared as being nonempty, but the RHS type (Empty) may be empty
+EqualityTypesModuleExports.dfy(461,7): Error: type 'AnotherSubset' declared as being nonempty, but the RHS type (Empty) may be empty
+EqualityTypesModuleExports.dfy(464,7): Error: type 'NESynonym' declared as auto-initialization type, but the RHS type (NonEmpty) does not support auto-initialization
+EqualityTypesModuleExports.dfy(468,7): Error: type 'NoReference' declared as containing no reference types, but the RHS type (C?) may contain reference types
+EqualityTypesModuleExports.dfy(471,7): Error: type 'PipeDreamEquality' declared as supporting equality, but the RHS type (Stream) might not
+61 resolution/type errors detected in EqualityTypesModuleExports.dfy
diff --git a/Test/dafny0/ErrorsInRelatedModules.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ErrorsInRelatedModules.dfy
similarity index 98%
rename from Test/dafny0/ErrorsInRelatedModules.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ErrorsInRelatedModules.dfy
index 75f0907ccbc..183a88bae30 100644
--- a/Test/dafny0/ErrorsInRelatedModules.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ErrorsInRelatedModules.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file gives some regression tests, where Dafny once had crashed when an imported module
diff --git a/Test/dafny0/ErrorsInRelatedModules.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ErrorsInRelatedModules.dfy.expect
similarity index 95%
rename from Test/dafny0/ErrorsInRelatedModules.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ErrorsInRelatedModules.dfy.expect
index 63ae582b411..0c27c352632 100644
--- a/Test/dafny0/ErrorsInRelatedModules.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ErrorsInRelatedModules.dfy.expect
@@ -8,6 +8,8 @@ ErrorsInRelatedModules.dfy(65,27): Error: Type or type parameter is not declared
 ErrorsInRelatedModules.dfy(129,17): Error: RHS (of type bool) not assignable to LHS (of type int)
 ErrorsInRelatedModules.dfy(138,17): Error: RHS (of type bool) not assignable to LHS (of type int)
 ErrorsInRelatedModules.dfy(151,8): Error: duplicate name of top-level declaration: EverythingHasTheSameName
+ErrorsInRelatedModules.dfy(150,8): Related location
 ErrorsInRelatedModules.dfy(152,11): Error: duplicate name of top-level declaration: EverythingHasTheSameName
+ErrorsInRelatedModules.dfy(150,8): Related location
 ErrorsInRelatedModules.dfy(151,8): Error: a module that already contains a top-level declaration 'EverythingHasTheSameName?' is not allowed to declare a reference type (class) 'EverythingHasTheSameName'
 12 resolution/type errors detected in ErrorsInRelatedModules.dfy
diff --git a/Test/dafny0/ExternNegative.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExternNegative.dfy
similarity index 81%
rename from Test/dafny0/ExternNegative.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExternNegative.dfy
index 88c751cd189..3c3adea25e5 100644
--- a/Test/dafny0/ExternNegative.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExternNegative.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 module {:extern "Modx"} Mod1
 {
   class {:extern "classx"} Class1
diff --git a/Test/dafny0/ExternNegative.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExternNegative.dfy.expect
similarity index 100%
rename from Test/dafny0/ExternNegative.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExternNegative.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExternNegative2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExternNegative2.dfy
new file mode 100644
index 00000000000..642a04d6cc0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExternNegative2.dfy
@@ -0,0 +1,26 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+module {:extern "Modx"} Mod1
+{
+  class {:extern "classx"} Class1
+  {
+    static ghost function {:axiom} {:extern "Fun1x"} Fun1() : int
+      ensures Fun1() > 0
+    static method {:axiom} {:extern "Method1x"} Method1() returns (x: int)
+      ensures x > 0
+    static ghost function Fun2() : int
+      ensures Fun2() > 0
+    {
+      Fun1()
+    }
+    static method Method2() returns (x: int)
+      ensures x > 0
+    {
+      x := Method1();
+    }
+  }
+}
+// Will give error about duplicate CompileName for module.
+module {:extern "Modx"} Mod2
+{
+}
diff --git a/Test/dafny0/ExternNegative2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExternNegative2.dfy.expect
similarity index 100%
rename from Test/dafny0/ExternNegative2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExternNegative2.dfy.expect
diff --git a/Test/dafny0/ExtremeReads.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExtremeReads.dfy
similarity index 98%
rename from Test/dafny0/ExtremeReads.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExtremeReads.dfy
index ee518e8d850..8579360afa6 100644
--- a/Test/dafny0/ExtremeReads.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExtremeReads.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var data: int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExtremeReads.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExtremeReads.dfy.expect
new file mode 100644
index 00000000000..03925a2d138
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ExtremeReads.dfy.expect
@@ -0,0 +1,36 @@
+ExtremeReads.dfy(47,12): Error: assertion might not hold
+ExtremeReads.dfy(13,21): Related location: this proposition could not be proved
+ExtremeReads.dfy(50,12): Error: assertion might not hold
+ExtremeReads.dfy(13,21): Related location: this proposition could not be proved
+ExtremeReads.dfy(69,12): Error: assertion might not hold
+ExtremeReads.dfy(20,21): Related location: this proposition could not be proved
+ExtremeReads.dfy(83,12): Error: assertion might not hold
+ExtremeReads.dfy(26,3): Related location: this proposition could not be proved
+ExtremeReads.dfy(105,12): Error: assertion might not hold
+ExtremeReads.dfy(89,3): Related location: this proposition could not be proved
+ExtremeReads.dfy(127,16): Error: assertion might not hold
+ExtremeReads.dfy(9,19): Related location: this proposition could not be proved
+ExtremeReads.dfy(127,16): Error: assertion might not hold
+ExtremeReads.dfy(13,21): Related location: this proposition could not be proved
+ExtremeReads.dfy(130,16): Error: assertion might not hold
+ExtremeReads.dfy(9,19): Related location: this proposition could not be proved
+ExtremeReads.dfy(130,16): Error: assertion might not hold
+ExtremeReads.dfy(13,21): Related location: this proposition could not be proved
+ExtremeReads.dfy(149,16): Error: assertion might not hold
+ExtremeReads.dfy(16,19): Related location: this proposition could not be proved
+ExtremeReads.dfy(149,16): Error: assertion might not hold
+ExtremeReads.dfy(20,21): Related location: this proposition could not be proved
+ExtremeReads.dfy(168,16): Error: assertion might not hold
+ExtremeReads.dfy(23,19): Related location: this proposition could not be proved
+ExtremeReads.dfy(168,16): Error: assertion might not hold
+ExtremeReads.dfy(26,3): Related location: this proposition could not be proved
+ExtremeReads.dfy(171,16): Error: assertion might not hold
+ExtremeReads.dfy(23,19): Related location: this proposition could not be proved
+ExtremeReads.dfy(171,16): Error: assertion might not hold
+ExtremeReads.dfy(26,3): Related location: this proposition could not be proved
+ExtremeReads.dfy(181,16): Error: assertion might not hold
+ExtremeReads.dfy(86,16): Related location: this proposition could not be proved
+ExtremeReads.dfy(181,16): Error: assertion might not hold
+ExtremeReads.dfy(89,3): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 10 verified, 17 errors
diff --git a/Test/dafny0/ForLoops-Resolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops-Resolution.dfy
similarity index 98%
rename from Test/dafny0/ForLoops-Resolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops-Resolution.dfy
index 9c198001b2c..de18a83c958 100644
--- a/Test/dafny0/ForLoops-Resolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops-Resolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Tests {
@@ -75,7 +75,7 @@ module Tests {
   method Termination0()
   {
     var s := 0;
-    for i := 0 to * { // error: * is allowed only if method uses "modifies *"
+    for i := 0 to * { // error: * is allowed only if method uses "decreases *"
       s := s + i;
     }
   }
@@ -83,7 +83,7 @@ module Tests {
   method Termination1()
   {
     var s := 0;
-    for i := 0 downto * { // error: * is allowed only if method uses "modifies *"
+    for i := 0 downto * { // error: * is allowed only if method uses "decreases *"
       s := s + i;
     }
   }
@@ -92,7 +92,7 @@ module Tests {
   {
     var s := 0;
     for i := 0 downto *
-      decreases * // error: * is allowed only if method uses "modifies *"
+      decreases * // error: * is allowed only if method uses "decreases *"
     {
       s := s + i;
     }
diff --git a/Test/dafny0/ForLoops-Resolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops-Resolution.dfy.expect
similarity index 94%
rename from Test/dafny0/ForLoops-Resolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops-Resolution.dfy.expect
index 76de5773c2e..2cd1feee1f3 100644
--- a/Test/dafny0/ForLoops-Resolution.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops-Resolution.dfy.expect
@@ -14,9 +14,9 @@ ForLoops-Resolution.dfy(148,8): Error: index variable is expected to be of an in
 ForLoops-Resolution.dfy(153,8): Error: index variable is expected to be of an integer type (got ORDINAL)
 ForLoops-Resolution.dfy(158,8): Error: index variable is expected to be of an integer type (got char)
 ForLoops-Resolution.dfy(167,6): Error: LHS of assignment must denote a mutable variable
-ForLoops-Resolution.dfy(199,4): Warning: note, this loop has no body (loop frame: i)
-ForLoops-Resolution.dfy(204,4): Warning: note, this loop has no body (loop frame: i, y)
-ForLoops-Resolution.dfy(210,4): Warning: note, this loop has no body (loop frame: i, $Heap)
+ForLoops-Resolution.dfy(199,4): Warning: this loop has no body (loop frame: i)
+ForLoops-Resolution.dfy(204,4): Warning: this loop has no body (loop frame: i, y)
+ForLoops-Resolution.dfy(210,4): Warning: this loop has no body (loop frame: i, $Heap)
 ForLoops-Resolution.dfy(243,8): Error: a 'break break' statement is allowed only in contexts with 2 enclosing loops, but the current context only has 1
 ForLoops-Resolution.dfy(256,10): Error: a 'break break break' statement is allowed only in contexts with 3 enclosing loops, but the current context only has 2
 ForLoops-Resolution.dfy(297,16): Error: break label is undefined or not in scope: D
diff --git a/Test/dafny0/ForLoops.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops.dfy
similarity index 99%
rename from Test/dafny0/ForLoops.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops.dfy
index 1a3e48841d6..5cd40cab58b 100644
--- a/Test/dafny0/ForLoops.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 method M0() {
   var limit, j := 100, 0;
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops.dfy.expect
new file mode 100644
index 00000000000..be4f6d62afc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForLoops.dfy.expect
@@ -0,0 +1,33 @@
+ForLoops.dfy(333,2): Warning: this loop has no body (loop frame: i, j)
+ForLoops.dfy(342,2): Warning: this loop has no body (loop frame: i, j)
+ForLoops.dfy(351,2): Warning: this loop has no body (loop frame: i, j)
+ForLoops.dfy(360,2): Warning: this loop has no body (loop frame: i, j)
+ForLoops.dfy(369,2): Warning: this loop has no body (loop frame: i, x)
+ForLoops.dfy(19,4): Error: assertion might not hold
+ForLoops.dfy(24,11): Error: lower bound must not exceed upper bound
+ForLoops.dfy(116,4): Error: assertion might not hold
+ForLoops.dfy(150,17): Error: possible division by zero
+ForLoops.dfy(155,21): Error: lower bound must not exceed upper bound
+ForLoops.dfy(204,6): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'Even'
+ForLoops.dfy(218,6): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NineToFive'
+ForLoops.dfy(225,6): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NineToFive'
+ForLoops.dfy(230,6): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NineToFive'
+ForLoops.dfy(238,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NineToFive'
+ForLoops.dfy(241,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NineToFive'
+ForLoops.dfy(272,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'nat'
+ForLoops.dfy(275,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'nat'
+ForLoops.dfy(287,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NotSeven'
+ForLoops.dfy(290,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NotSeven'
+ForLoops.dfy(298,22): Error: result of operation might violate newtype constraint for 'byte'
+ForLoops.dfy(306,17): Error: result of operation might violate newtype constraint for 'byte'
+ForLoops.dfy(311,16): Error: result of operation might violate newtype constraint for 'byte'
+ForLoops.dfy(344,2): Error: assertion might not hold
+ForLoops.dfy(362,2): Error: assertion might not hold
+ForLoops.dfy(372,2): Error: assertion might not hold
+ForLoops.dfy(415,28): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+ForLoops.dfy(434,26): Error: decreases expression must be bounded below by 0 at end of loop iteration
+ForLoops.dfy(443,18): Error: decreases expression must be bounded below by 0 at end of loop iteration
+ForLoops.dfy(457,2): Error: assertion might not hold
+
+Dafny program verifier finished with 23 verified, 25 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilation.legacy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilation.legacy.dfy
new file mode 100644
index 00000000000..9b692e5af54
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilation.legacy.dfy
@@ -0,0 +1,105 @@
+// NONUNIFORM: New CLI doesn't support /autoTriggers:0
+// RUN: %dafny /compile:3 /autoTriggers:0 "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  var c := new MyClass;
+  c.arr := new int[10,20];
+  c.K0(3, 12);
+  c.K1(3, 12);
+  c.K2(3, 12);
+  c.K3(3, 12);
+  c.K4(12);
+  c.M();
+  c.N();
+  c.P();
+  c.Q();
+}
+
+class MyClass
+{
+  var arr: array2<int>
+
+  method K0(i: int, j: int)
+    requires 0 <= i < arr.Length0 && 0 <= j < arr.Length1
+    modifies arr
+  {
+    forall k | k in {-3, 4} {
+      arr[i,j] := 50;
+    }
+  }
+
+  method K1(i: int, j: int)
+    requires 0 <= i < arr.Length0 && 0 <= j < arr.Length1
+    // note the absence of a modifies clause
+  {
+    forall k: int | k in {} {
+      arr[i,j] := k;  // fine, since control will never reach here
+    }
+  }
+
+  method K2(i: int, j: int)
+    requires 0 <= i < arr.Length0 && 0 <= j < arr.Length1
+    modifies arr
+  {
+    forall k: int | k in {-3, 4} {
+      // The following would have been an error (since this test file tests
+      // compilation, we don't include the test here):
+      // arr[i,j] := k;  // error: k can take on more than one value
+    }
+  }
+
+  method K3(i: int, j: int)
+    requires 0 <= i < arr.Length0 && 0 <= j < arr.Length1
+    modifies arr
+  {
+    forall k: nat | k in {-3, 4} && k <= i {
+      arr[k,j] := 50;  // fine, since k:nat is at least 0
+    }
+  }
+
+  method K4(j: int)
+    requires 0 <= j < arr.Length1
+    modifies arr
+  {
+    forall i, k: nat | 0 <= i < arr.Length0 && k in {-3, 4} {
+      arr[i,j] := k;  // fine, since k can only take on one value
+    }
+  }
+
+  method M()
+  {
+    var ar := new int [3,3];
+    var S: set<int> := {2,0};
+    forall k | k in S {
+      ar[k,1]:= 0;
+    }
+    forall k, j | k in S && j in S {
+      ar[k,j]:= 0;
+    }
+  }
+
+  method N() {
+    var ar := new int[3, 3];
+    ar[2,2] := 0;
+  }
+
+  method P() {
+    var ar := new int[3];
+    var prev := ar[..];
+    var S: set<int> := {};
+    forall k | k in S {
+      ar[k] := 0;
+    }
+    assert ar[..] == prev;
+  }
+
+  method Q() {
+    var ar := new int[3,3];
+    var S: set<int> := {1,2};
+    forall k | k in S {
+      ar[0,0] := 0;
+    }
+    assert ar[0,0] == 0;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilation.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilation.legacy.dfy.expect
new file mode 100644
index 00000000000..78374efda71
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilation.legacy.dfy.expect
@@ -0,0 +1,3 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 14 verified, 0 errors
diff --git a/Test/dafny0/ForallCompilationNewSyntax.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy
similarity index 93%
rename from Test/dafny0/ForallCompilationNewSyntax.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy
index ac354d6338c..df5f1b119e7 100644
--- a/Test/dafny0/ForallCompilationNewSyntax.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --quantifier-syntax:4 --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --quantifier-syntax:4 --relax-definite-assignment --allow-warnings
 
 method Main() {
   var c := new MyClass;
diff --git a/Test/dafny0/SeqFromArray.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy.expect
similarity index 100%
rename from Test/dafny0/SeqFromArray.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy.verifier.expect
new file mode 100644
index 00000000000..9fa737d84b2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallCompilationNewSyntax.dfy.verifier.expect
@@ -0,0 +1,4 @@
+ForallCompilationNewSyntax.dfy(25,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ForallCompilationNewSyntax.dfy(34,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ForallCompilationNewSyntax.dfy(43,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ForallCompilationNewSyntax.dfy(63,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmt.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmt.dfy
new file mode 100644
index 00000000000..4fdf67393f1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmt.dfy
@@ -0,0 +1,304 @@
+// UNSUPPORTED: windows
+// RUN: %exits-with 4 %verify --allow-axioms --manual-triggers "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+class C {
+  var data: int
+  var n: nat
+  var st: set<object>
+
+  lemma CLemma(k: int)
+    requires k != -23
+    ensures data < k  // magic, isn't it (or bogus, some would say)
+}
+
+// This method more or less just tests the syntax, resolution, and basic verification
+method ParallelStatement_Resolve(
+    a: array<int>,
+    spine: set<C>,
+    Repr: set<object>,
+    S: set<int>,
+    clx: C?, cly: C?, clk: int
+  )
+  modifies a, spine
+{
+  forall i | 0 <= i < a.Length && i % 2 == 0 {
+    a[i] := a[(i + 1) % a.Length] + 3;
+  }
+
+  forall o | o in spine {
+    o.st := o.st + Repr;
+  }
+
+  forall x, y | x in S && 0 <= y+x < 100 {
+    Lemma(clx, x, y);  // error: precondition does not hold (clx may be null)
+  }
+
+  forall x, y | x in S && 0 <= y+x < 100 {
+    cly.CLemma(x + y);  // error: receiver might be null
+  }
+
+  forall p | 0 <= p
+    ensures F(p) <= Sum(p) + p - 1  // error (no connection is known between F and Sum)
+  {
+    assert 0 <= G(p);
+    ghost var t;
+    if p % 2 == 0 {
+      assert G(p) == F(p+2);  // error (there's nothing that gives any relation between F and G)
+      t := p+p;
+    } else {
+      assume H(p, 20) < 100;  // don't know how to justify this
+      t := p;
+    }
+    PowerLemma(p, t);
+    t := t + 1;
+    PowerLemma(p, t);
+  }
+}
+
+lemma Lemma(c: C?, x: int, y: int)
+  requires c != null
+  ensures c.data <= x+y
+lemma PowerLemma(x: int, y: int)
+  ensures Pred(x, y)
+
+ghost function F(x: int): int
+ghost function G(x: int): nat
+ghost function H(x: int, y: int): int
+ghost function Sum(x: int): int
+ghost function Pred(x: int, y: int): bool
+
+// ---------------------------------------------------------------------
+
+method M0(S: set<C>)
+  modifies S
+  ensures forall o :: o in S ==> o.data == 85
+  ensures forall o :: o !in S && !fresh(o) ==> o.data == old(o.data)
+{
+  forall s | s in S {
+    s.data := 85;
+  }
+}
+
+method M1(S: set<C>, x: C)
+  requires x in S
+{
+  forall s | s in S
+    ensures s.data < 100
+  {
+    assume s.data == 85;
+  }
+  if * {
+    assert x.data == 85;  // error (cannot be inferred from forall ensures clause)
+  } else {
+    assert x.data < 120;
+  }
+
+  forall s | s in S
+    ensures s.data < 70  // error
+  {
+    assume s.data == 85;
+  }
+}
+
+method M2() returns (a: array<int>)
+  ensures forall i,j :: 0 <= i < a.Length/2 <= j < a.Length ==> a[i] < a[j]
+{
+  a := new int[250];
+  forall i: nat | i < 125 {
+    a[i] := 423;
+  }
+  forall i | 125 <= i < 250 {
+    a[i] := 300 + i;
+  }
+}
+
+method M4(S: set<C>, k: int)
+  modifies S
+{
+  forall s | s in S {
+    s.n := k;  // error: k might be negative
+  }
+}
+
+method M5()
+{
+  if {
+  case true =>
+    forall x | 0 <= x < 100 {
+      PowerLemma(x, x);
+    }
+    assert Pred(34, 34);
+
+  case true =>
+    forall x,y | 0 <= x < 100 && y == x+1 {
+      PowerLemma(x, y);
+    }
+    assert Pred(34, 35);
+
+  case true =>
+    forall x,y | 0 <= x < y < 100 {
+      PowerLemma(x, y);
+    }
+    assert Pred(34, 35);
+
+  case true =>
+    forall x | x in set k | 0 <= k < 100 {
+      PowerLemma(x, x);
+    }
+    assert Pred(34, 34);
+  }
+}
+
+method Main()
+{
+  var a := new int[180];
+  forall i | 0 <= i < 180 {
+    a[i] := 2*i + 100;
+  }
+  var sq := [0, 0, 0, 2, 2, 2, 5, 5, 5];
+  forall i | 0 <= i < |sq| {
+    a[20+i] := sq[i];
+  }
+  forall t | t in sq {
+    a[t] := 1000;
+  }
+  forall t,u | t in sq && t < 4 && 10 <= u < 10+t {
+    a[u] := 6000 + t;
+  }
+  var k := 0;
+  while k < 180 {
+    if k != 0 { print ", "; }
+    print a[k];
+    k := k + 1;
+  }
+  print "\n";
+}
+
+method DuplicateUpdate() {
+  var a := new int[180];
+  var sq := [0, 0, 0, 2, 2, 2, 5, 5, 5];
+  if * {
+    forall t,u | t in sq && 10 <= u < 10+t {
+      a[u] := 6000 + t;  // error: a[10] (and a[11]) are assigned more than once
+    }
+  } else {
+    forall t,u | t in sq && t < 4 && 10 <= u < 10+t {
+      a[u] := 6000 + t;  // with the 't < 4' conjunct in the line above, this is fine
+    }
+  }
+}
+
+lemma DontDoMuch(x: int)
+{
+}
+
+method OmittedRange() {
+  forall x: int { }  // a type is still needed for the bound variable
+  forall x {
+    DontDoMuch(x);
+  }
+}
+
+// ----------------------- two-state postconditions ---------------------------------
+
+class TwoState_C { ghost var data: int }
+
+// It is not possible to achieve this postcondition in a lemma, because lemma
+// contexts are not allowed to allocate state.  Callers of this lemma will know
+// that the postcondition is tantamount to 'false'.
+lemma TwoState0(y: int)
+  ensures exists o: TwoState_C {:nowarn} :: allocated(o) && fresh(o)
+
+method TwoState_Main0() {
+  forall x { TwoState0(x); }
+  assert false;  // no prob, because the postcondition of TwoState0 implies false
+}
+
+method X_Legit(c: TwoState_C)
+  modifies c
+{
+  c.data := c.data + 1;
+  forall x | c.data <= x
+    ensures old(c.data) < x  // note that the 'old' refers to the method's initial state
+  {
+  }
+}
+
+// At first glance, this looks like a version of TwoState_Main0 above, but with an
+// ensures clause.
+// However, there's an important difference in the translation, which is that the
+// occurrence of 'fresh' here refers to the initial state of the TwoStateMain2
+// method, not the beginning of the 'forall' statement.
+method TwoState_Main2()
+{
+  forall x: int
+    ensures exists o: TwoState_C {:nowarn} :: allocated(o) && fresh(o)
+  {
+    TwoState0(x);
+  }
+  assert false;  // fine, for the postcondition of the forall statement implies false
+}
+
+// At first glance, this looks like an inlined version of TwoState_Main0 above.
+// However, there's an important difference in the translation, which is that the
+// occurrence of 'fresh' here refers to the initial state of the TwoState_Main3
+// method, not the beginning of the 'forall' statement.
+// Still, care needs to be taken in the translation to make sure that the forall
+// statement's effect on the heap is not optimized away.
+method TwoState_Main3()
+{
+  forall x: int
+    ensures exists o: TwoState_C {:nowarn} :: allocated(o) && fresh(o)
+  {
+    assume false;  // (there's no other way to achieve this forall-statement postcondition)
+  }
+  assert false;  // it is known that the forall's postcondition is contradictory, so this assert is fine
+}
+
+// ---------------------------------------------------------------------
+// The following is an example that once didn't verify (because the forall statement that
+// induction inserts had caused the $Heap to be advanced, despite the fact that Th is a
+// ghost method).
+
+datatype Nat = Zero | Succ(tail: Nat)
+
+ghost predicate ThProperty(step: nat, t: Nat, r: nat)
+{
+  match t
+  case Zero => true
+  case Succ(o) => step>0 && exists ro:nat, ss | ss == step-1 :: ThProperty(ss, o, ro) //WISH: ss should be autogrnerated. Note that step is not a bound variable.
+}
+
+lemma Th(step: nat, t: Nat, r: nat)
+  requires t.Succ? && ThProperty(step, t, r)
+  // the next line follows from the precondition and the definition of ThProperty
+  ensures exists ro:nat, ss | ss == step-1 :: ThProperty(ss, t.tail, ro) //WISH same as above
+{
+}
+
+// ------------------------------------------------------------------------
+// The following example once included a unsoundness bug in the translation
+
+method BogosityClient()
+  ensures false
+{
+  var c := new C;
+  c.data := 3;
+  Bogus(c);
+}
+
+ghost predicate False(x: int) { false }
+
+method Bogus(c: C)
+  requires c.data == 3
+  modifies c
+  ensures false
+{
+  c.data := 4;
+  forall x | old(c.data) == 4
+    ensures False(x)
+  {
+    // easily provable, because the range of x is empty
+  }
+  assert False(10);  // error: does not follow from the "forall" statement
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmt.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmt.dfy.expect
new file mode 100644
index 00000000000..9e75436b90c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmt.dfy.expect
@@ -0,0 +1,13 @@
+ForallStmt.dfy(33,9): Error: a precondition for this call could not be proved
+ForallStmt.dfy(59,13): Related location: this is the precondition that could not be proved
+ForallStmt.dfy(37,4): Error: target object might be null
+ForallStmt.dfy(41,17): Error: possible violation of postcondition of forall statement
+ForallStmt.dfy(46,6): Error: assertion might not hold
+ForallStmt.dfy(91,4): Error: assertion might not hold
+ForallStmt.dfy(97,19): Error: possible violation of postcondition of forall statement
+ForallStmt.dfy(119,11): Error: value does not satisfy the subset constraints of 'nat'
+ForallStmt.dfy(182,11): Error: left-hand sides for different forall-statement bound variables might refer to the same location (and right-hand sides might not be equivalent)
+ForallStmt.dfy(303,14): Error: assertion might not hold
+ForallStmt.dfy(290,32): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 17 verified, 9 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmtResolveErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmtResolveErrors.dfy
new file mode 100644
index 00000000000..e8c17ac7c7b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmtResolveErrors.dfy
@@ -0,0 +1,291 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module Basics {
+  method M() {
+    var k := 0;
+    forall i | 0 <= i < 20 {
+      k := k + i;  // error: not allowed to assign to local k, since k is not declared inside forall block
+    }
+
+    forall i | 0 <= i < 20
+      ensures true
+    {
+      var x := i;
+      x := x + 1;
+    }
+
+    ghost var y;
+    var z;
+    forall i | 0 <= i
+      ensures true
+    {
+      var x := i;
+      x := x + 1;
+      y := 18;  // error: assigning to a (ghost) variable inside a ghost forall block
+      z := 20;  // error: assigning to a (non-ghost) variable inside a ghost forall block
+    }
+  }
+}
+
+module Misc {
+  class C { }
+
+  method M0(IS: set<int>) {
+    forall i | 0 <= i < 20 {
+      i := i + 1;  // error: not allowed to assign to bound variable
+    }
+
+    forall i | 0 <= i
+      ensures true
+    {
+      ghost var x := i;
+      x := x + 1;  // cool
+    }
+
+    var ca := new C[20];
+    forall i | 0 <= i < 20 {
+      ca[i] := new C;  // error: new allocation not allowed
+    }
+  }
+
+  method M1() {
+    forall i | 0 <= i < 20 {
+      assert i < 100;
+      if i == 17 { break; }  // error: nothing to break out of
+    }
+
+    var m := 0;
+    label OutsideLoop:
+    while m < 20 {
+      forall i | 0 <= i < 20 {
+        if i == 17 { break; }  // error: not allowed to break out of loop that sits outside forall
+        if i == 8 { break break; }  // error: ditto (also: attempt to break too far)
+        if i == 9 { break OutsideLoop; }  // error: ditto
+      }
+      m := m + 1;
+    }
+
+    forall i | 0 <= i < 20 {
+      var j := 0;
+      while j < i {
+        if j == 6 { break; }  // fine
+        if j % 7 == 4 { break break; }  // error: attempt to break out too far
+        if j % 7 == 4 { break OutsideLoop; }  // error: attempt to break to place not in enclosing scope
+        j := j + 1;
+      }
+    }
+
+    label WhileOutsideForall:
+    while true {
+      forall i | 0 <= i < 20 { // "break" doesn't exit "forall" statements, so the enclosing "while" loop doesn't count
+        var j := 0;
+        while j < i {
+          if j == 6 { break; }  // fine
+          if j % 7 == 4 { break break; }  // error: attempt to break out too far
+          if j % 7 == 4 { break WhileOutsideForall; }  // error: attempt to break to place not in enclosing scope
+          j := j + 1;
+        }
+      }
+      break;
+    }
+  }
+}
+
+module AnotherModule {
+  class C {
+    var data: int
+    ghost var gdata: int
+
+    ghost method Init_ModifyNothing() { }
+
+    ghost method Init_ModifyThis()
+      modifies this
+    {
+      data := 6;  // error: assignment to a non-ghost field
+      gdata := 7;
+    }
+
+    ghost method Init_ModifyStuff(c: C)
+      modifies this, c
+    {
+    }
+
+    method NonGhostMethod() {
+      print "hello\n";
+    }
+
+    ghost method GhostMethodWithModifies(x: int)
+      modifies this
+    {
+      gdata := gdata + x;
+    }
+  }
+
+  method TestNew() {
+    forall i | 0 <= i < 20
+      ensures true
+    {
+      var c := new C;  // error: 'new' not allowed in proof context
+      var d := new C.Init_ModifyNothing();  // error (x2): 'new' not allowed in ghost context
+      var e := new C.Init_ModifyThis();  // error (x2): 'new' not allowed in ghost context
+      var f := new C.Init_ModifyStuff(e);  // error (x2): 'new' not allowed in ghost context
+      c.Init_ModifyStuff(d);  // error: not allowed to call method with modifies clause in ghost context
+      c.NonGhostMethod();  // error: only allowed to call ghost methods (because of possible 'print' statements, sigh)
+    }
+  }
+
+  method M2() {
+    var a := new int[100];
+    forall x | 0 <= x < 100
+      ensures true
+    {
+      a[x] :| assume a[x] > 0;  // error: not allowed to update heap location in a proof-forall statement
+    }
+  }
+
+  method M3(c: C) {
+    forall x {
+      c.GhostMethodWithModifies(x);  // error: not allowed to call method with nonempty modifies clause
+    }
+    forall x
+      ensures true
+    {
+      c.GhostMethodWithModifies(x);  // error: not allowed to call method with nonempty modifies clause
+    }
+  }
+
+  method AggregatePrinting() {
+    forall i | 0 <= i < 1000
+      ensures true
+    {
+      print "here we go\n"; // error: cannot print in ghost context
+    }
+  }
+}
+
+module UpdatesInOuterScope {
+  method M() {
+    ghost var x := 0;
+    forall i | 0 <= i < 100
+      ensures true
+    {
+      // AssignStmt
+      x := 10;
+      // AssignSuchThatStmt
+      x :| x == 10;
+      // CallStmt
+      x := P();
+    }
+  }
+
+  method P() returns (x: int)
+}
+
+module MoreReturn {
+  method M() {
+    forall i | 0 <= i < 20
+      ensures true
+    {
+      if i == 8 { return; }  // error: return not allowed inside forall block
+    }
+  }
+}
+
+// ---------- refinement of modify statements
+
+module NoRefinement {
+  class Cell {
+    var data: int
+  }
+
+  method W(c: Cell)
+  {
+    var c := new Cell;
+    var i := 0;
+    label L:
+    while i < 10
+      invariant i == 0 || c.data == 10
+    {
+      modify c {
+        if * {
+          break; // fine
+        } else if * {
+          break L; // fine
+        }
+        c.data := 9;
+      }
+      c.data := 10;
+      i := i + 1;
+    }
+  }
+}
+
+module ModifyStmtBreak0 {
+  class Cell {
+    var data: int
+  }
+
+  method W(c: Cell)
+    modifies c
+    ensures c.data == 10
+  {
+    var i := 0;
+    label L:
+    while i < 10
+      invariant i == 0 || c.data == 10
+    {
+      modify c;
+      c.data := 10;
+      i := i + 1;
+    }
+  }
+}
+
+module ModifyStmtBreak1 refines ModifyStmtBreak0 {
+  method W... {
+    ...;
+    while ... {
+      modify ... {
+        if * {
+          break; // error: a "break" here would cause a problem with the refinement
+        } else {
+          break L; // error: a "break" here would cause a problem with the refinement
+        }
+      }
+      ...;
+    }
+  }
+}
+
+module ModifyStmtBreak1' refines ModifyStmtBreak0 {
+  method W... {
+    ...;
+    while ... {
+      modify c { // note, this is a new "modify" statement, not a refinement of the one above
+        if * {
+          break; // error: this is still not allowed, since it skips the rest of the loop body
+        } else {
+          break L; // error: ditto
+        }
+      }
+      ...; // (the previous "modify c;" statement is included here)
+    }
+  }
+}
+
+module ModifyStmtContinue refines ModifyStmtBreak0 {
+  method W... {
+    ...;
+    while ... {
+      modify ... {
+        if * {
+          continue; // error: a "continue" here would cause a problem with the refinement
+        } else {
+          continue L; // error: a "continue" here would cause a problem with the refinement
+        }
+      }
+      ...;
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmtResolveErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmtResolveErrors.dfy.expect
new file mode 100644
index 00000000000..1362eed332a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForallStmtResolveErrors.dfy.expect
@@ -0,0 +1,55 @@
+ForallStmtResolveErrors.dfy(210,15): Warning: the modify statement with a block statement is deprecated
+ForallStmtResolveErrors.dfy(247,7): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(248,10): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(249,13): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(249,17): Warning: the modify statement with a block statement is deprecated
+ForallStmtResolveErrors.dfy(256,9): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(263,7): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(264,10): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(265,15): Warning: the modify statement with a block statement is deprecated
+ForallStmtResolveErrors.dfy(272,9): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(279,7): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(280,10): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(281,13): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(281,17): Warning: the modify statement with a block statement is deprecated
+ForallStmtResolveErrors.dfy(288,9): Warning: the ... refinement feature in statements is deprecated
+ForallStmtResolveErrors.dfy(26,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ForallStmtResolveErrors.dfy(8,6): Error: a forall statement is not allowed to update a variable it doesn't declare
+ForallStmtResolveErrors.dfy(25,6): Error: a forall statement is not allowed to update a variable it doesn't declare
+ForallStmtResolveErrors.dfy(26,6): Error: a forall statement is not allowed to update a variable it doesn't declare
+ForallStmtResolveErrors.dfy(36,6): Error: LHS of assignment must denote a mutable variable
+ForallStmtResolveErrors.dfy(48,15): Error: new allocation not supported in aggregate assignments
+ForallStmtResolveErrors.dfy(55,19): Error: a non-labeled 'break' statement is allowed only in loops
+ForallStmtResolveErrors.dfy(62,21): Error: a non-labeled 'break' statement is allowed only in loops
+ForallStmtResolveErrors.dfy(63,20): Error: a 'break break' statement is allowed only in loops
+ForallStmtResolveErrors.dfy(64,26): Error: break label is undefined or not in scope: OutsideLoop
+ForallStmtResolveErrors.dfy(73,24): Error: a 'break break' statement is allowed only in contexts with 2 enclosing loops, but the current context only has 1
+ForallStmtResolveErrors.dfy(74,30): Error: break label is undefined or not in scope: OutsideLoop
+ForallStmtResolveErrors.dfy(85,26): Error: a 'break break' statement is allowed only in contexts with 2 enclosing loops, but the current context only has 1
+ForallStmtResolveErrors.dfy(86,32): Error: break label is undefined or not in scope: WhileOutsideForall
+ForallStmtResolveErrors.dfy(129,15): Error: a forall statement is not allowed to use 'new'
+ForallStmtResolveErrors.dfy(130,15): Error: a forall statement is not allowed to use 'new'
+ForallStmtResolveErrors.dfy(130,21): Error: in a forall statement, calls are allowed only to lemmas
+ForallStmtResolveErrors.dfy(131,15): Error: a forall statement is not allowed to use 'new'
+ForallStmtResolveErrors.dfy(131,21): Error: in a forall statement, calls are allowed only to lemmas
+ForallStmtResolveErrors.dfy(132,15): Error: a forall statement is not allowed to use 'new'
+ForallStmtResolveErrors.dfy(132,21): Error: in a forall statement, calls are allowed only to lemmas
+ForallStmtResolveErrors.dfy(133,24): Error: in a forall statement, calls are allowed only to lemmas
+ForallStmtResolveErrors.dfy(134,22): Error: in a forall statement, calls are allowed only to lemmas
+ForallStmtResolveErrors.dfy(143,7): Error: cannot assign to array element in a ghost context
+ForallStmtResolveErrors.dfy(149,31): Error: in a forall statement, calls are allowed only to lemmas
+ForallStmtResolveErrors.dfy(154,31): Error: in a forall statement, calls are allowed only to lemmas
+ForallStmtResolveErrors.dfy(162,6): Error: print statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)
+ForallStmtResolveErrors.dfy(105,11): Error: assignment to non-ghost field is not allowed in this context, because this is a ghost method
+ForallStmtResolveErrors.dfy(178,12): Error: in a forall statement, calls are allowed only to lemmas
+ForallStmtResolveErrors.dfy(174,6): Error: a forall statement is not allowed to update a variable it doesn't declare
+ForallStmtResolveErrors.dfy(176,6): Error: a forall statement is not allowed to update a variable it doesn't declare
+ForallStmtResolveErrors.dfy(178,6): Error: a forall statement is not allowed to update a variable it doesn't declare
+ForallStmtResolveErrors.dfy(190,18): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
+ForallStmtResolveErrors.dfy(251,10): Error: break statement in skeleton is not allowed to break outside the skeleton fragment
+ForallStmtResolveErrors.dfy(253,10): Error: break statement in skeleton is not allowed to break outside the skeleton fragment
+ForallStmtResolveErrors.dfy(267,10): Error: break statement in skeleton is not allowed to break outside the skeleton fragment
+ForallStmtResolveErrors.dfy(269,10): Error: break statement in skeleton is not allowed to break outside the skeleton fragment
+ForallStmtResolveErrors.dfy(283,10): Error: continue statement in skeleton is not allowed to break outside the skeleton fragment
+ForallStmtResolveErrors.dfy(285,10): Error: continue statement in skeleton is not allowed to break outside the skeleton fragment
+39 resolution/type errors detected in ForallStmtResolveErrors.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminism.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminism.dfy
new file mode 100644
index 00000000000..024565ee406
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminism.dfy
@@ -0,0 +1,24 @@
+// RUN: ! %verify --enforce-determinism "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class CK {
+  var x: int
+  var y: int
+  constructor Init() {
+    x := 10;
+  } // definite-assignment rules allow fields to be left unassigned [error: determinism]
+}
+
+method ArrayAllocation(n: nat, p: nat, q: nat)
+{
+  var a := new int[n]; // definite-assignment rules allow array elements to be left unassigned [error: determinism]
+  var m := new bool[p,q]; // definite-assignment rules allow array elements to be left unassigned [error: determinism]
+}
+
+class Cell {
+  var data: int
+
+  constructor () {
+    // .data is auto-initialized here
+  } // [error: determinism]
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminism.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminism.dfy.expect
new file mode 100644
index 00000000000..2cd5cf89b77
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminism.dfy.expect
@@ -0,0 +1,6 @@
+ForbidNondeterminism.dfy(9,2): Error: field 'y', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+ForbidNondeterminism.dfy(14,11): Error: unless an initializer is provided for the array elements, a new array of 'int' must have empty size
+ForbidNondeterminism.dfy(15,11): Error: unless an initializer is provided for the array elements, a new array of 'bool' must have empty size
+ForbidNondeterminism.dfy(23,2): Error: field 'data', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+
+Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminismResolve.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminismResolve.dfy
new file mode 100644
index 00000000000..df1f67bd3d4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminismResolve.dfy
@@ -0,0 +1,149 @@
+// RUN: ! %resolve --enforce-determinism "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class C { // error: constructor-less class not allowed by determinism rules
+  var f: real
+}
+
+predicate P(z: int) { true }
+
+method M(c: C)
+  modifies c
+  decreases *
+{
+  var x := 3;  // fine
+  var y;  // this statement by itself is nondeterministic, but the verifier catches bad uses of "y"
+  y := 4;
+  y := *;  // error: nondeterministic
+  x, y := x, *;  // error: nondeterministic
+  y :| true;  // error: nondeterministic
+  if * {  // error: nondeterministic
+    x := x + 1;
+  }
+  if {  // error: nondeterministic
+    case true =>  x := x + 1;
+    case true =>  x := x + 2;
+  }
+  if c.f < 500.0 {
+    if {  // a one-case if is always deterministic
+      case c.f < 1000.0 => x := x + 1;
+    }
+  }
+  if z :| 10 <= z < 15 && P(z) {  // error: nondeterministic
+    x := z;
+  }
+  while *  // error: nondeterministic
+    decreases *
+  {
+    x := x + 1;
+  }
+  while  // error: nondeterministic
+    decreases if x <= 100 then 100-x else x
+  {
+    case x < 100 => x := x + 1;
+    case 100 < x => x := x - 1;
+  }
+  var a := new int[100](_ => 750);
+  forall i | 0 <= i < a.Length {
+    a[i] := *;  // error: nondeterministic
+  }
+  modify c;  // error: nondeterministic
+  modify c {  // fine (except that a modify statement with a block statement is deprecated)
+  }
+}
+
+method OutputParameters0(x: int) returns (s: int, t: int)
+{
+  return x, x+45;  // yes, this is legal
+}
+
+
+method DeclWithHavoc(yes: bool)
+  requires yes
+{
+  var b: int := *;  // error: assignment is nondeterministic (despite the fact that b is never used)
+  var c: int; // fine, since the declaration alone is not forbidden
+  var d: int;
+  if yes {
+    var e := b; // error: use of b before it has been assigned
+  } else {
+    // the verifier would complain about the next statement, but it knows the statement isn't reachable
+    var e := d;
+  }
+}
+
+iterator IterWeird() yields ()  // no yields parameters, so allowed
+{
+}
+
+iterator Iter() yields (x: int)  // error: not allowed by determinism rules
+{
+}
+
+class C' { // fine, since there are no fields
+}
+
+class C'' { // fine, since the const has a RHS
+  const u := 15
+}
+
+class C''' { // error: constructor-less class not allowed by determinism rules
+  const u: int
+}
+
+class D {
+  var f: real // fine, since the class has a constructor
+  const u: int // fine, since the class has a constructor
+  const w := 15
+
+  constructor D() {
+    f := 0.9;
+    u := 90;
+  }
+}
+
+ghost method M2(c: C)
+  modifies c
+{
+  var x := 3;  // fine
+  var y;  // this statement by itself is nondeterministic, but the verifier catches bad uses of "y"
+  y := 4;
+  y := *;  // error: nondeterministic
+  x, y := x, *;  // error: nondeterministic
+  y :| true;  // error: nondeterministic
+  if * {  // error: nondeterministic
+    x := x + 1;
+  }
+  if {  // error: nondeterministic
+    case true =>  x := x + 1;
+    case true =>  x := x + 2;
+  }
+  if c.f < 500.0 {
+    if {  // a one-case if is always deterministic
+      case c.f < 1000.0 => x := x + 1;
+    }
+  }
+  if z :| 10 <= z < 15 && P(z) {  // error: nondeterministic
+    x := z;
+  }
+  while *  // error: nondeterministic
+    decreases *
+  {
+    x := x + 1;
+  }
+  while  // error: nondeterministic
+    decreases if x <= 100 then 100-x else x
+  {
+    case x < 100 => x := x + 1;
+    case 100 < x => x := x - 1;
+  }
+  var a := new int[100](_ => 750);
+  forall i | 0 <= i < a.Length {
+    a[i] := *;  // error: nondeterministic
+  }
+  modify c;  // error: nondeterministic
+}
+
+trait t { // no error: traits can't have constructors
+  var f: real
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminismResolve.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminismResolve.dfy.expect
new file mode 100644
index 00000000000..0559c3b613f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ForbidNondeterminismResolve.dfy.expect
@@ -0,0 +1,17 @@
+ForbidNondeterminismResolve.dfy(51,11): Warning: the modify statement with a block statement is deprecated
+ForbidNondeterminismResolve.dfy(17,7): Error: nondeterministic assignment forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(18,13): Error: nondeterministic assignment forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(19,4): Error: assign-such-that statement forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(20,2): Error: nondeterministic if statement forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(23,2): Error: case-based if statement forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(32,2): Error: binding if statement forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(35,2): Error: nondeterministic loop forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(40,2): Error: case-based loop forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(48,12): Error: nondeterministic assignment forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(50,2): Error: modify statement without a body forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(64,16): Error: nondeterministic assignment forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(130,14): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+ForbidNondeterminismResolve.dfy(79,9): Error: since yield parameters are initialized arbitrarily, iterators are forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(4,6): Error: since fields are initialized arbitrarily, constructor-less classes are forbidden by the --enforce-determinism option
+ForbidNondeterminismResolve.dfy(90,6): Error: since fields are initialized arbitrarily, constructor-less classes are forbidden by the --enforce-determinism option
+15 resolution/type errors detected in ForbidNondeterminismResolve.dfy
diff --git a/Test/dafny0/Fuel.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Fuel.dfy
similarity index 87%
rename from Test/dafny0/Fuel.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Fuel.dfy
index 50cb0753374..ce78a8795ba 100644
--- a/Test/dafny0/Fuel.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Fuel.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" /autoTriggers:0 /optimizeResolution:0 /errorLimit:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-deprecation --manual-triggers --error-limit 0 "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module TestModule1 {
@@ -9,8 +9,8 @@ module TestModule1 {
     }
 
     method test(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert pos(z) == 0;
         assert pos(-1) == 0;
@@ -46,8 +46,8 @@ module TestModule2 {
     }
 
     method test(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert pos1(z) == 0;
         assert pos1(-1) == 0;
@@ -58,21 +58,21 @@ module TestModule2 {
         assert pos2(-1) == 0;
         assert pos2(y) == 3 + pos2(y - 3);
         assert pos2(y) == 4 + pos2(y - 4);
-
-        if (*) {
+    }
+    method test3(y: int) requires y > 5 {
+        if * {
             assert pos3(y) == 5 + pos3(y - 5);  // Just enough fuel to get here
         } else {
             assert pos3(y) == 6 + pos3(y - 6);  // error: Should fail even with a boost, since boost is too small
         }
-
-        if (*) {
+    }
+    method test4(y: int, z: int) requires y > 5 requires z < 0 {
+        if * {
             assert pos4(z) == 0;    // error: Fuel shouldn't overcome opaque
         } else {
             reveal pos4();
             assert pos4(y) == 5 + pos4(y - 5);  // With reveal, everything should work as above
         }
-
-
     }
 }
 
@@ -86,8 +86,8 @@ module TestModule3 {
     }
 
     method test(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert pos(z) == 0;             // error: Opaque setting hides body
         assert pos(-1) == 0;            // error: Lits also obey opaque now
@@ -105,8 +105,8 @@ module TestModule4 {
 
     // Should pass
     method {:fuel pos,3} test1(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert pos(z) == 0;
         assert pos(-1) == 0;
@@ -114,8 +114,8 @@ module TestModule4 {
     }
 
     method {:fuel pos,0,0} test2(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert pos(z) == 0;               // error: Should fail due to "opaque" fuel setting
         assert pos(-1) == 0;              // error: Should fail due to "opaque" fuel setting.  Even Lits obey opaque
@@ -123,12 +123,12 @@ module TestModule4 {
     }
 
     method test3(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert {:fuel pos,0,0} pos(z) == 0;               // error: fuel can't be decreased
         assert pos(-1) == 0;
-        if (*) {
+        if * {
             assert pos(y) == 3 + pos(y - 3);  // error: Should fail without extra fuel setting
             assert pos(y) == 6 + pos(y - 6);  // error: Should fail even with previous assert turned into assume
         } else {
@@ -138,16 +138,16 @@ module TestModule4 {
     }
 
     method test4(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         forall t:int {:fuel pos,3} | t > 0
-            ensures true;
+            ensures true
         {
             assert pos(y) == 3 + pos(y - 3);    // Expected to pass, due to local fuel boost
         }
 
-        if (*) {
+        if * {
             calc {:fuel pos,3} {
                 pos(y);
                 3 + pos(y - 3);
@@ -172,8 +172,8 @@ module TestModule5 {
                 }
 
                 method test(y:int, z:int)
-                    requires y > 5;
-                    requires z < 0;
+                    requires y > 5
+                    requires z < 0
                 {
                     assert pos(z) == 0;
                     assert pos(-1) == 0;
@@ -182,8 +182,8 @@ module TestModule5 {
             }
 
             method test(y:int, z:int)
-                requires y > 5;
-                requires z < 0;
+                requires y > 5
+                requires z < 0
             {
                 assert TestModule5aiA.pos(z) == 0;
                 assert TestModule5aiA.pos(-1) == 0;
@@ -192,8 +192,8 @@ module TestModule5 {
         }
 
         method test(y:int, z:int)
-            requires y > 5;
-            requires z < 0;
+            requires y > 5
+            requires z < 0
         {
             assert TestModule5ai.TestModule5aiA.pos(z) == 0;
             assert TestModule5ai.TestModule5aiA.pos(-1) == 0;
@@ -211,8 +211,8 @@ module TestModule5 {
                 }
 
                 method test(y:int, z:int)
-                    requires y > 5;
-                    requires z < 0;
+                    requires y > 5
+                    requires z < 0
                 {
                     assert pos(z) == 0;
                     assert pos(-1) == 0;
@@ -232,15 +232,15 @@ module TestModule6 {
     }
 
     ghost function neg(x:int) : int
-        decreases 1 - x;
+        decreases 1 - x
     {
         if x > 0 then 0
         else 1 + neg(x + 1)
     }
 
     method test1(y:int, z:int)
-        requires y > 5;
-        requires z < 5;
+        requires y > 5
+        requires z < 5
     {
         assert pos(y) == 3 + pos(y - 3);    // error: Should fail, due to lack of fuel
 
@@ -248,8 +248,8 @@ module TestModule6 {
     }
 
     method {:fuel pos,3} {:fuel neg,4} test2(y:int, z:int)
-        requires y > 5;
-        requires z < -5;
+        requires y > 5
+        requires z < -5
     {
         assert pos(y) == 3 + pos(y - 3);
 
@@ -266,23 +266,23 @@ module TestModule7 {
     }
 
     ghost function {:fuel 0,0} neg(x:int) : int
-        decreases 1 - x;
+        decreases 1 - x
     {
         if x > 0 then 0
         else 1 + neg(x + 1)
     }
 
     method {:fuel neg,4} {:fuel pos,0,0} test1(y:int, z:int)
-        requires y > 5;
-        requires z < -5;
+        requires y > 5
+        requires z < -5
     {
-        if (*) {
+        if * {
             assert pos(y) == 3 + pos(y - 3);    // error: Method fuel should override function fuel, so this should fail
             assert neg(z) == 3 + neg(z + 3);    // Method fuel should override function fuel, so this succeeds
         }
 
         forall t:int {:fuel pos,3} | t > 0
-            ensures true;
+            ensures true
         {
             assert pos(y) == 3 + pos(y - 3);    // Statement fuel should override method fuel, so this should succeed
         }
@@ -321,15 +321,15 @@ module TestModule8 {
         function CRequest_grammar() : G { GTaggedUnion([ GTuple([EndPoint_grammar(), GUint64, CAppMessage_grammar()]), GUint64]) }
 
         function parse_EndPoint(val:V) : EndPoint
-            requires ValInGrammar(val, EndPoint_grammar());
+            requires ValInGrammar(val, EndPoint_grammar())
 
         type CAppMessage
         function CAppMessage_grammar() : G { GTaggedUnion([GUint64, GUint64, GUint64]) }
         function parse_AppMessage(val:V) : CAppMessage
-            requires ValInGrammar(val, CAppMessage_grammar());
+            requires ValInGrammar(val, CAppMessage_grammar())
 
         function {:fuel ValInGrammar,1} parse_Request1(val:V) : CRequest
-            requires ValInGrammar(val, CRequest_grammar());
+            requires ValInGrammar(val, CRequest_grammar())
         {
             if val.c == 0 then
                 var ep := parse_EndPoint(val.val.t[0]); // With default fuel, error: function precondition (6x), destructor, index
@@ -339,7 +339,7 @@ module TestModule8 {
         }
 
         function parse_Request2(val:V) : CRequest
-            requires ValInGrammar(val, CRequest_grammar());
+            requires ValInGrammar(val, CRequest_grammar())
         {
             if val.c == 0 then
                 var ep := parse_EndPoint(val.val.t[0]);                      // With fuel boosted to 2 this succeeds
@@ -349,7 +349,7 @@ module TestModule8 {
         }
 
         function {:fuel ValInGrammar,3} parse_Request3(val:V) : CRequest
-            requires ValInGrammar(val, CRequest_grammar());
+            requires ValInGrammar(val, CRequest_grammar())
         {
             if val.c == 0 then
                 var ep := parse_EndPoint(val.val.t[0]);
@@ -360,7 +360,7 @@ module TestModule8 {
 
         // With the method, everything succeeds with one less fuel boost (i.e., 2, rather than 3, as in parse_Request3)
         method parse_Request4(val:V) returns (req:CRequest)
-            requires ValInGrammar(val, CRequest_grammar());
+            requires ValInGrammar(val, CRequest_grammar())
         {
             if val.c == 0 {
                 var ep := parse_EndPoint(val.val.t[0]);
@@ -381,8 +381,8 @@ module TestModule9 {
 
     // All should pass.
     method test1(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert abs(z) == -1*z;
         assert abs(y) == y;
@@ -391,8 +391,8 @@ module TestModule9 {
 
     // Method-level fuel override
     method {:fuel abs,0,0} test2(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert abs(z) == -1*z;  // error: Cannot see the body of abs
         assert abs(y) == y;     // error: Cannot see the body of abs
@@ -401,8 +401,8 @@ module TestModule9 {
 
     // Statement-level fuel override
     method test3(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert {:fuel abs,0,0} abs(z) == -1*z;  // error: fuel can't be decreased
         assert abs(y) == y;     // Normal success
@@ -412,8 +412,8 @@ module TestModule9 {
     // Giving more fuel to a non-recursive function won't help,
     // but it shouldn't hurt either.
     method {:fuel abs,5,6} test4(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert abs(z) == -1*z;
         assert abs(y) == y;
@@ -429,8 +429,8 @@ module TestModule10 {
     }
 
     method test1(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert abs(z) == -1*z;  // error: Cannot see the body of abs
         assert abs(y) == y;     // error: Cannot see the body of abs
@@ -451,8 +451,8 @@ module TestModule11 {
     }
 
     method test1(y:int, z:int)
-        requires y > 5;
-        requires z < 0;
+        requires y > 5
+        requires z < 0
     {
         assert abs'(z) == -1*z;  // Annotation on abs' only applies locally, so we see the body of abs
         assert abs'(y) == y;     // Annotation on abs' only applies locally, so we see the body of abs
@@ -474,7 +474,7 @@ module TestModule12 {
 		}
 
 		method {:fuel pos3,2,3} {:fuel pos4,2,3} test (y:int)
-			requires y > 3;
+			requires y > 3
 		{
 				assert pos3(y) == 3 + pos4(y - 3);
 		}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Fuel.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Fuel.dfy.expect
new file mode 100755
index 00000000000..ef4a432d124
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Fuel.dfy.expect
@@ -0,0 +1,67 @@
+Fuel.dfy(17,22): Error: assertion might not hold
+Fuel.dfy(66,27): Error: assertion might not hold
+Fuel.dfy(71,27): Error: assertion might not hold
+Fuel.dfy(92,22): Error: assertion might not hold
+Fuel.dfy(93,23): Error: assertion might not hold
+Fuel.dfy(94,22): Error: assertion might not hold
+Fuel.dfy(129,8): Error: Fuel can only increase within a given scope.
+Fuel.dfy(120,22): Error: assertion might not hold
+Fuel.dfy(121,23): Error: assertion might not hold
+Fuel.dfy(122,22): Error: assertion might not hold
+Fuel.dfy(132,26): Error: assertion might not hold
+Fuel.dfy(133,26): Error: assertion might not hold
+Fuel.dfy(157,22): Error: assertion might not hold
+Fuel.dfy(200,55): Error: assertion might not hold
+Fuel.dfy(245,22): Error: assertion might not hold
+Fuel.dfy(247,22): Error: assertion might not hold
+Fuel.dfy(280,26): Error: assertion might not hold
+Fuel.dfy(335,40): Error: function precondition could not be proved
+Fuel.dfy(324,33): Related location: this proposition could not be proved
+Fuel.dfy(312,43): Related location: this proposition could not be proved
+Fuel.dfy(335,40): Error: function precondition could not be proved
+Fuel.dfy(324,33): Related location: this proposition could not be proved
+Fuel.dfy(312,58): Related location: this proposition could not be proved
+Fuel.dfy(335,40): Error: function precondition could not be proved
+Fuel.dfy(324,33): Related location: this proposition could not be proved
+Fuel.dfy(313,41): Related location: this proposition could not be proved
+Fuel.dfy(335,40): Error: function precondition could not be proved
+Fuel.dfy(324,33): Related location: this proposition could not be proved
+Fuel.dfy(314,46): Related location: this proposition could not be proved
+Fuel.dfy(335,40): Error: function precondition could not be proved
+Fuel.dfy(324,33): Related location: this proposition could not be proved
+Fuel.dfy(314,72): Related location: this proposition could not be proved
+Fuel.dfy(335,40): Error: function precondition could not be proved
+Fuel.dfy(324,33): Related location: this proposition could not be proved
+Fuel.dfy(314,105): Related location: this proposition could not be proved
+Fuel.dfy(335,49): Error: destructor 't' can only be applied to datatype values constructed by 'VTuple'
+Fuel.dfy(335,50): Error: index out of range
+Fuel.dfy(336,38): Error: index out of range
+Fuel.dfy(336,42): Error: destructor 'u' can only be applied to datatype values constructed by 'VUint64'
+Fuel.dfy(336,61): Error: function precondition could not be proved
+Fuel.dfy(329,33): Related location: this proposition could not be proved
+Fuel.dfy(311,43): Related location: this proposition could not be proved
+Fuel.dfy(336,61): Error: function precondition could not be proved
+Fuel.dfy(329,33): Related location: this proposition could not be proved
+Fuel.dfy(312,43): Related location: this proposition could not be proved
+Fuel.dfy(336,61): Error: function precondition could not be proved
+Fuel.dfy(329,33): Related location: this proposition could not be proved
+Fuel.dfy(312,58): Related location: this proposition could not be proved
+Fuel.dfy(336,61): Error: function precondition could not be proved
+Fuel.dfy(329,33): Related location: this proposition could not be proved
+Fuel.dfy(313,41): Related location: this proposition could not be proved
+Fuel.dfy(336,61): Error: function precondition could not be proved
+Fuel.dfy(329,33): Related location: this proposition could not be proved
+Fuel.dfy(314,72): Related location: this proposition could not be proved
+Fuel.dfy(336,61): Error: function precondition could not be proved
+Fuel.dfy(329,33): Related location: this proposition could not be proved
+Fuel.dfy(314,105): Related location: this proposition could not be proved
+Fuel.dfy(336,71): Error: index out of range
+Fuel.dfy(407,8): Error: Fuel can only increase within a given scope.
+Fuel.dfy(397,22): Error: assertion might not hold
+Fuel.dfy(398,22): Error: assertion might not hold
+Fuel.dfy(399,23): Error: assertion might not hold
+Fuel.dfy(435,22): Error: assertion might not hold
+Fuel.dfy(436,22): Error: assertion might not hold
+Fuel.dfy(437,23): Error: assertion might not hold
+
+Dafny program verifier finished with 31 verified, 39 errors
diff --git a/Test/dafny0/FunctionSpecifications.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/FunctionSpecifications.dfy
similarity index 86%
rename from Test/dafny0/FunctionSpecifications.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/FunctionSpecifications.dfy
index 24ffbd0ecd7..e661001140d 100644
--- a/Test/dafny0/FunctionSpecifications.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/FunctionSpecifications.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 ghost function Fib(n: int): int
   requires 0 <= n
@@ -36,9 +36,8 @@ ghost function SumBad(a: List): int
 }
 
 ghost function FibWithExtraPost(n: int): int
-  ensures 2 <= n ==> 0 <= FibWithExtraPost(n-1) // This is fine, because the definition of the function is discovered via canCall
-  ensures 1 <= n ==> 0 <= FibWithExtraPost(n-1) // Error: In the current implementation of Dafny, one needs to actually call the
-                                                 // function in order to benefit from canCall.  This may be improved in the future.
+  ensures 2 <= n ==> 0 <= FibWithExtraPost(n-1) // This tests that Dafny generates the appropriate CanCall
+  ensures 1 <= n ==> 0 <= FibWithExtraPost(n-1) // Same here. (Before CanCalls everywhere, this postcondition was not verified.)
   ensures 0 <= FibWithExtraPost(n)
 {
   if n < 0 then 0 else
@@ -46,12 +45,13 @@ ghost function FibWithExtraPost(n: int): int
   FibWithExtraPost(n-2) + FibWithExtraPost(n-1)
 }
 
+
 ghost function GoodPost(n: int): int
   requires 0 <= n
   ensures 1 <= n ==> GoodPost(n-1) == GoodPost(n-1)
   ensures GoodPost(2*n - n) == GoodPost(2*(n+5) - 10 - n)  // these are legal ways to denote the result value of the function
 {
-  assert 2*n - n == 2*(n+5) - 10 - n;
+  assert n == 2*n - n == 2*(n+5) - 10 - n;
   if n < 2 then n else
   GoodPost(n-2) + GoodPost(n-1)
 }
@@ -91,13 +91,13 @@ ghost method M() {
 
 ghost function IncB(i: nat): nat
 {
-  var n :| n>i; n
+  var n :| n > i; n
 }
 
 ghost function IncC(i: nat): int
   ensures IncC(i)>=0
 {
-  var n :| n>i; n
+  var n :| n > i; n
 }
 
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/FunctionSpecifications.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/FunctionSpecifications.dfy.expect
new file mode 100644
index 00000000000..203a0aa2d9c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/FunctionSpecifications.dfy.expect
@@ -0,0 +1,16 @@
+FunctionSpecifications.dfy(35,59): Error: a postcondition could not be proved on this return path
+FunctionSpecifications.dfy(31,12): Related location: this is the postcondition that could not be proved
+FunctionSpecifications.dfy(61,23): Error: cannot prove termination; try supplying a decreases clause
+FunctionSpecifications.dfy(71,4): Error: a postcondition could not be proved on this return path
+FunctionSpecifications.dfy(69,40): Related location: this is the postcondition that could not be proved
+FunctionSpecifications.dfy(117,2): Error: assertion might not hold
+FunctionSpecifications.dfy(120,2): Error: assertion might not hold
+FunctionSpecifications.dfy(135,26): Error: assertion might not hold
+FunctionSpecifications.dfy(139,26): Error: assertion might not hold
+FunctionSpecifications.dfy(148,4): Error: a postcondition could not be proved on this return path
+FunctionSpecifications.dfy(146,28): Related location: this is the postcondition that could not be proved
+FunctionSpecifications.dfy(155,3): Error: decreases clause might not decrease
+FunctionSpecifications.dfy(162,3): Error: decreases clause might not decrease
+FunctionSpecifications.dfy(167,3): Error: cannot prove termination; try supplying a decreases clause
+
+Dafny program verifier finished with 11 verified, 11 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollections.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollections.dfy
new file mode 100644
index 00000000000..5353b2992e0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollections.dfy
@@ -0,0 +1,513 @@
+// RUN: %testDafnyForEachCompiler "%s" -- --type-system-refresh=true --general-newtypes=true --general-traits=datatype --reads-clauses-on-methods
+
+method Main() {
+  Set.Test();
+  Set.TestSpecialCase();
+  Iset.Test();
+  Frames.CallEm();
+  Decreases.Test();
+  Multiset.Test();
+  Seq.Test();
+  SeqToMultisetConversion.Test();
+  Map.Test();
+  Imap.Test();
+}
+
+module Set {
+  newtype IntSet = s: set<int> | true
+
+  method Test() {
+    var s: IntSet;
+    s := {};
+    print s, " "; // {}
+    s := {6, 19};
+    print |s|, " "; // 2
+    s := set x: int | 6 <= x < 10 && 2 * x < 300;
+    print |s|, " ", 7 in s, " "; // 4 true
+    s := set x: int | 6 <= x < 10 :: 2 * x;
+    print |s|, " ", 7 in s, "\n"; // 4 false
+
+    var bb := [5 in s, 12 in s, 19 !in s];
+
+    var t: IntSet := s;
+
+    s := s + t;
+    s := s - t;
+    s := s * t;
+    var disjoint := s !! t;
+
+    print bb, " ", s, " ", disjoint, "\n"; // [false, true, true] {} true
+
+    var u: set<int>;
+    u := s as set<int>;
+    s := u as IntSet;
+    var b0 := s is set<int>;
+    var b1 := u is IntSet;
+
+    print |s|, " ", |u|, " ", b0, " ", b1, "\n"; // 0 0 true true
+
+    b0 := s <= t;
+    b1 := s < t;
+    var b2 := s > s;
+    var b3 := s >= s;
+    print b0, " ", b1, " ", b2, " ", b3, "\n"; // true true false true
+
+    b0 := s == t;
+    b1 := s != t;
+    print b0, " ", b1, "\n"; // false true
+  }
+
+  method TestSpecialCase() {
+    var dt := Dt;
+    print |dt.FFF(15)|, "\n"; // 15
+  }
+
+  // auto-accumulator tail recursive function in trait (this has a special case in the compiler code)
+  trait Trait {
+    function FFF(n: nat): IntSet {
+      if n == 0 then {} else {n} + FFF(n - 1)
+    }
+  }
+
+  datatype Dt extends Trait = Dt
+}
+
+module Iset {
+  newtype IntIset = s: iset<int> | true
+
+  method Test() {
+    var s: IntIset;
+    s := iset{};
+    print "iset: ", s, " "; // {}
+    s := iset{6, 19};
+    print s - iset{6}, " "; // {19}
+    s := iset x: int | 6 <= x < 10 && 2 * x < 300;
+    s := iset x: int | 6 <= x < 10 :: 2 * x;
+
+    var t: IntIset := s;
+
+    s := s + t;
+    s := s - t;
+    s := s * t;
+    var disjoint := s !! t;
+
+    print s, " ", disjoint, "\n"; // {} true
+
+    var u: iset<int>;
+    u := s as iset<int>;
+    s := u as IntIset;
+    var b0 := s is iset<int>;
+    var b1 := u is IntIset;
+
+    print s, " ", u, " ", b0, " ", b1, "\n"; // {} {} true true
+
+    b0 := s <= t;
+    b1 := s < t;
+    var b2 := s > s;
+    var b3 := s >= s;
+    print b0, " ", b1, " ", b2, " ", b3, "\n"; // true true false true
+
+    b0 := s == t;
+    b1 := s != t;
+    print b0, " ", b1, "\n"; // false true
+  }
+}
+
+module Frames {
+  method CallEm() {
+    var o := new object;
+    label Recently:
+    M({o}, iset{o}, multiset{o, o}, [o, o, o]);
+    var u := F({o}, iset{o}, multiset{o, o}, [o, o, o]);
+    ghost var b := P2@Recently({o}, iset{o}, multiset{o, o}, [o, o, o]);
+  }
+  
+  newtype ObjectSet = s: set<object> | true
+  newtype ObjectISet = ss: iset<object> | true
+  newtype ObjectMultiset = m: multiset<object> | true
+  newtype ObjectSeq = q: seq<object> | true
+
+  function R(x: int): ObjectSet {
+    {}
+  }
+
+  method M(s: ObjectSet, ss: ObjectISet, m: ObjectMultiset, q: ObjectSeq)
+    modifies s
+    modifies ss
+    modifies m
+    modifies q
+    reads s
+    reads ss
+    reads m
+    reads q
+  {
+    assert unchanged(s);
+    assert unchanged(ss);
+    assert unchanged(m);
+    assert unchanged(q);
+    modify s;
+    modify ss;
+    modify m;
+    modify q;
+    for i := 0 to 100
+      modifies s
+      modifies ss
+      modifies m
+      modifies q
+    {
+    }
+    ghost var g: bool;
+    g := fresh(s);
+    g := fresh(ss);
+    g := fresh(q);
+  }
+
+  function F(s: ObjectSet, ss: ObjectISet, m: ObjectMultiset, q: ObjectSeq): int
+    reads s
+    reads ss
+    reads m
+    reads q
+    reads R
+  {
+    6
+  }
+
+  twostate predicate P2(s: ObjectSet, ss: ObjectISet, m: ObjectMultiset, q: ObjectSeq)
+    reads s
+    reads ss
+    reads m
+    reads q
+    reads R
+  {
+    true
+  }
+}
+
+module Decreases {
+  newtype MyInt = int
+  newtype BoundedInt = x: int | 0 <= x < 10_000
+  newtype BoolSet = s: set<bool> | true
+
+  method Test() {
+    A(100);
+    K({true, true});
+  }
+
+  method A(x: int)
+    requires x < 10_000
+    decreases x
+  {
+    if 0 < x {
+      B((x - 1) as MyInt);
+    } else if x == 0 {
+      print "Ends in A\n";
+    }
+  }
+
+  method B(y: MyInt)
+    requires y < 10_000
+    decreases y
+  {
+    if 0 < y {
+      C((y - 1) as BoundedInt);
+    } else if y == 0 {
+      print "Ends in B\n";
+    }
+  }
+
+  method C(z: BoundedInt)
+    decreases z
+  {
+    if 0 < z {
+      A((z - 1) as int);
+    } else if z == 0 {
+      print "Ends in C\n";
+    }
+  }
+
+  method K(s: set<bool>)
+    decreases s
+  {
+    if s == {} {
+      print "K is done\n";
+    } else {
+      L(s as BoolSet);
+    }
+  }
+
+  method L(t: BoolSet)
+    requires t != {}
+    decreases t, 0 as MyInt
+  {
+    var b :| b in t;
+    var t' := t - {b};
+    K(t' as set<bool>);
+  }
+}
+
+module Multiset {
+  newtype IntMultiset = s: multiset<int> | true
+
+  method Test() {
+    var s: IntMultiset;
+    s := multiset{};
+    print s, " "; // multiset{}
+    s := multiset{6, 19, 6};
+    print |s|, " "; // 3
+    print 7 in s, " ", 6 in s, "\n"; // false true
+    print s[6], " ", s[19], " ", s[20], "\n"; // 2 1 0
+    s := s[17 := 3][1800 := 0][6 := 1];
+    print s[6], " ", s[17], " ", s[20], "\n"; // 1 3 0
+
+    var t: IntMultiset := s;
+
+    s := s + t;
+    s := s - t;
+    s := s * t;
+    expect s == t;
+    print |s|, "\n"; // 5
+    s := s - t;
+
+    var disjoint := s !! t;
+    print s, " ", disjoint, "\n"; // multiset{} true
+
+    var u: multiset<int>;
+    u := s as multiset<int>;
+    s := u as IntMultiset;
+    var b0 := s is multiset<int>;
+    var b1 := u is IntMultiset;
+
+    print |s|, " ", |u|, " ", b0, " ", b1, "\n"; // 0 0 true true
+
+    b0 := s <= t;
+    b1 := s < t;
+    var b2 := s > s;
+    var b3 := s >= s;
+    print b0, " ", b1, " ", b2, " ", b3, "\n"; // true true false true
+
+    b0 := s == t;
+    b1 := s != t;
+    print b0, " ", b1, "\n"; // false true
+  }
+}
+
+module Seq {
+  newtype IntSeq = s: seq<int> | true
+
+  method Test() {
+    var s: IntSeq;
+    s := [];
+    print s, " "; // []
+    s := [6, 19, 6];
+    print |s|, " "; // 3
+    print 7 in s, " ", 6 in s, "\n"; // false true
+    print s[0], " ", s[1], " ", s[2], "\n"; // 6 19 6
+    s := s[1 := 3][0 := 0][2 := 1];
+    print s[0], " ", s[1], " ", s[2], "\n"; // 0 3 1
+
+    var t: IntSeq := s;
+
+    s := s + t;
+    print |s|, " ", s, "\n"; // 6 [0, 3, 1, 0, 3, 1]
+
+    var u: seq<int>;
+    u := s as seq<int>;
+    s := u as IntSeq;
+    var b0 := s is seq<int>;
+    var b1 := u is IntSeq;
+
+    print |s|, " ", |u|, " ", |t|, " ", b0, " ", b1, "\n"; // 6 6 3 true true
+
+    b0 := s <= t;
+    b1 := s < t;
+    var b2 := s <= s;
+    var b3 := t < s;
+    print b0, " ", b1, " ", b2, " ", b3, "\n"; // false false true true
+
+    b0 := s == t;
+    b1 := s != t;
+    print b0, " ", b1, "\n"; // false true
+
+    s := seq(4, i => 8 * i + 3);
+    print s, "\n"; // [3, 11, 19, 27]
+
+    SubSequences(s);
+  }
+
+  method SubSequences(s: IntSeq)
+    requires |s| == 4
+  {
+    Print(s[..2], " "); // [3, 11]
+    Print(s[2..], " "); // [19, 27]
+    Print(s[1..3], " "); // [11, 19]
+    Print(s[..], "\n"); // [3, 11, 19, 27]
+
+    var arr := new int[4] [11, 13, 17, 19];
+    Print(arr[..2], " "); // [11, 13]
+    Print(arr[2..], " "); // [17, 19]
+    Print(arr[1..3], " "); // [13, 17]
+    Print(arr[..], "\n"); // [11, 13, 17, 19];
+  }
+
+  method Print(s: IntSeq, suffix: string) {
+    print s, suffix;
+  }
+}
+
+module SeqToMultisetConversion {
+  newtype XSet = s: set<int> | true
+  newtype XSeq = s: seq<int> | true
+  newtype XMultiset = s: multiset<int> | true
+
+  method Test() {
+    TestFromSet();
+    TestFromSeq();
+  }
+
+  method TestFromSet() {
+    var s: set<int>;
+    var s': XSet;
+    var m0: multiset<int>;
+    var m1: multiset<int>;
+    var m0': XMultiset;
+    var m1': XMultiset;
+
+    s := {37, 43, 37, 47};
+    s' := {47, 43, 37};
+
+    m0 := multiset(s);
+    m1 := multiset(s');
+    assert m0 == m1;
+    print m0 == m1, " ", |m0|, "\n"; // true 3
+
+    m0' := multiset(s);
+    m1' := multiset(s');
+    assert m0' == m1';
+    print m0' == m1', " ", |m0'|, "\n"; // true 3
+  }
+
+  method TestFromSeq() {
+    var s: seq<int>;
+    var s': XSeq;
+    var m0: multiset<int>;
+    var m1: multiset<int>;
+    var m0': XMultiset;
+    var m1': XMultiset;
+
+    s := [37, 43, 37, 47];
+    s' := s as XSeq;
+    s' := s'[0 := s'[1]][1 := s'[0]]; // swap elements 0 and 1, just to be a little different
+
+    m0 := multiset(s);
+    m1 := multiset(s');
+    assert m0 == m1;
+    print m0 == m1, " ", |m0|, "\n"; // true 4
+
+    m0' := multiset(s);
+    m1' := multiset(s');
+    assert m0' == m1';
+    print m0' == m1', " ", |m0'|, "\n"; // true 4
+  }
+}
+
+module Map {
+  newtype IntMap = m: map<int, real> | true
+  newtype IntSet = s: set<int> | true
+
+  method Test() {
+    var m: IntMap;
+    m := map[];
+    print m, " "; // map[]
+    m := map[6 := 2.0, 19 := 2.1];
+    var n: IntMap := m;
+    print |m|, " "; // 2
+    print 7 in m, " ", 6 in m, "\n"; // false true
+    print m[6], " ", m[19], "\n"; // 2.0 2.1
+    m := m[17 := 3.0][1800 := 0.0][6 := 1.0];
+    print m[6], " ", m[19], " ", m[17], "\n"; // 1.0 2.1 3.0
+
+    m := m + n;
+    // m is now:  map[6 := 2.0, 17 := 3.0, 19 := 2.1, 1800 := 0.0]
+    print |m|, " ", m[6], "\n"; // 4 2.0
+
+    var sf: set<int> := {3, 4, 5, 17, 20};
+    m := m - sf;
+    var nf: IntSet := {3, 1800, 4, 5};
+    m := m - nf;
+    // m is now:  map[6 := 2.0, 19 := 2.1]
+    print |m|, " ", m[6] + m[19], "\n"; // 2 4.1
+
+    var u: map<int, real>;
+    u := m as map<int, real>;
+    m := u as IntMap;
+    var b0 := m is map<int, real>;
+    var b1 := u is IntMap;
+
+    print |m|, " ", |u|, " ", b0, " ", b1, "\n"; // 2 2 true true
+
+    b0 := m == n;
+    b1 := m != n;
+    print b0, " ", b1, "\n"; // true false
+
+    TestComprehensions();
+  }
+
+  method TestComprehensions() {
+    var m: IntMap := map x: int | 2 <= x < 5 :: (2 * x) as real;
+    var n: IntMap := map x: int | 2 <= x < 5 :: 2 * x := 10.0 - x as real;
+    expect |m| == |n| == 3;
+    print 2 in m, " ", 2 in n, " ", 4 in m, " ", 4 in n, "\n"; // true false true true
+    assert 2 * 3 in n;
+    print m[3], " ", n[6], "\n"; // 6.0 7.0
+  }
+}
+
+module Imap {
+  newtype IntImap = m: imap<int, real> | true
+  newtype IntSet = s: set<int> | true
+
+  method Test() {
+    var m: IntImap;
+    m := imap[];
+    print m, " "; // imap[]
+    m := imap[6 := 2.0, 19 := 2.1];
+    var n: IntImap := m;
+    print 7 in m, " ", 6 in m, "\n"; // false true
+    print m[6], " ", m[19], "\n"; // 2.0 2.1
+    m := m[17 := 3.0][1800 := 0.0][6 := 1.0];
+    print m[6], " ", m[19], " ", m[17], "\n"; // 1.0 2.1 3.0
+
+    m := m + n;
+    // m is now:  imap[6 := 2.0, 17 := 3.0, 19 := 2.1, 1800 := 0.0]
+    print m[6], "\n"; // 2.0
+
+    var sf: set<int> := {3, 4, 5, 17, 20};
+    m := m - sf;
+    var nf: IntSet := {3, 1800, 4, 5};
+    m := m - nf;
+    // m is now:  imap[6 := 2.0, 19 := 2.1]
+    print m[6] + m[19], "\n"; // 4.1
+
+    var u: imap<int, real>;
+    u := m as imap<int, real>;
+    m := u as IntImap;
+    var b0 := m is imap<int, real>;
+    var b1 := u is IntImap;
+
+    print b0, " ", b1, "\n"; // true true
+
+    b0 := m == n;
+    b1 := m != n;
+    print b0, " ", b1, "\n"; // true false
+
+    TestComprehensions();
+  }
+
+  method TestComprehensions() {
+    var m: IntImap := imap x: int | 2 <= x < 5 :: (2 * x) as real;
+    var n: IntImap := imap x: int | 2 <= x < 5 :: 2 * x := 10.0 - x as real;
+    print 2 in m, " ", 2 in n, " ", 4 in m, " ", 4 in n, "\n"; // true false true true
+    assert 2 * 3 in n;
+    print m[3], " ", n[6], "\n"; // 6.0 7.0
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollections.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollections.dfy.expect
new file mode 100644
index 00000000000..5b1d5d665c3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollections.dfy.expect
@@ -0,0 +1,52 @@
+{} 2 4 true 4 false
+[false, true, true] {} true
+0 0 true true
+true true false true
+false true
+15
+iset: {} {19} {} true
+{} {} true true
+true true false true
+false true
+Ends in B
+K is done
+multiset{} 3 false true
+2 1 0
+1 3 0
+5
+multiset{} true
+0 0 true true
+true true false true
+false true
+[] 3 false true
+6 19 6
+0 3 1
+6 [0, 3, 1, 0, 3, 1]
+6 6 3 true true
+false false true true
+false true
+[3, 11, 19, 27]
+[3, 11] [19, 27] [11, 19] [3, 11, 19, 27]
+[11, 13] [17, 19] [13, 17] [11, 13, 17, 19]
+true 3
+true 3
+true 4
+true 4
+map[] 2 false true
+2.0 2.1
+1.0 2.1 3.0
+4 2.0
+2 4.1
+2 2 true true
+true false
+true false true true
+6.0 7.0
+map[] false true
+2.0 2.1
+1.0 2.1 3.0
+2.0
+4.1
+true true
+true false
+true false true true
+6.0 7.0
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollections.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollections.dfy.rs.check
new file mode 100644
index 00000000000..fbb03b77111
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollections.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.NullReferenceException: Object reference not set to an instance of an object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollectionsGeneric.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollectionsGeneric.dfy
new file mode 100644
index 00000000000..e848766ed2e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollectionsGeneric.dfy
@@ -0,0 +1,513 @@
+// RUN: %testDafnyForEachCompiler "%s" -- --type-system-refresh=true --general-newtypes=true --general-traits=datatype --reads-clauses-on-methods
+
+method Main() {
+  Set.Test();
+  Set.TestSpecialCase();
+  Iset.Test();
+  Frames.CallEm();
+  Decreases.Test();
+  Multiset.Test();
+  Seq.Test();
+  SeqToMultisetConversion.Test();
+  Map.Test();
+  Imap.Test();
+}
+
+module Set {
+  newtype IntSet<X> = s: set<X> | true
+
+  method Test() {
+    var s: IntSet<int>;
+    s := {};
+    print s, " "; // {}
+    s := {6, 19};
+    print |s|, " "; // 2
+    s := set x: int | 6 <= x < 10 && 2 * x < 300;
+    print |s|, " ", 7 in s, " "; // 4 true
+    s := set x: int | 6 <= x < 10 :: 2 * x;
+    print |s|, " ", 7 in s, "\n"; // 4 false
+
+    var bb := [5 in s, 12 in s, 19 !in s];
+
+    var t: IntSet := s;
+
+    s := s + t;
+    s := s - t;
+    s := s * t;
+    var disjoint := s !! t;
+
+    print bb, " ", s, " ", disjoint, "\n"; // [false, true, true] {} true
+
+    var u: set<int>;
+    u := s as set<int>;
+    s := u as IntSet;
+    var b0 := s is set<int>;
+    var b1 := u is IntSet<int>;
+
+    print |s|, " ", |u|, " ", b0, " ", b1, "\n"; // 0 0 true true
+
+    b0 := s <= t;
+    b1 := s < t;
+    var b2 := s > s;
+    var b3 := s >= s;
+    print b0, " ", b1, " ", b2, " ", b3, "\n"; // true true false true
+
+    b0 := s == t;
+    b1 := s != t;
+    print b0, " ", b1, "\n"; // false true
+  }
+
+  method TestSpecialCase() {
+    var dt := Dt;
+    print |dt.FFF(15)|, "\n"; // 15
+  }
+
+  // auto-accumulator tail recursive function in trait (this has a special case in the compiler code)
+  trait Trait {
+    function FFF(n: nat): IntSet<int> {
+      if n == 0 then {} else {n} + FFF(n - 1)
+    }
+  }
+
+  datatype Dt extends Trait = Dt
+}
+
+module Iset {
+  newtype IntIset<!X> = s: iset<X> | true
+
+  method Test() {
+    var s: IntIset<int>;
+    s := iset{};
+    print "iset: ", s, " "; // {}
+    s := iset{6, 19};
+    print s - iset{6}, " "; // {19}
+    s := iset x: int | 6 <= x < 10 && 2 * x < 300;
+    s := iset x: int | 6 <= x < 10 :: 2 * x;
+
+    var t: IntIset := s;
+
+    s := s + t;
+    s := s - t;
+    s := s * t;
+    var disjoint := s !! t;
+
+    print s, " ", disjoint, "\n"; // {} true
+
+    var u: iset<int>;
+    u := s as iset<int>;
+    s := u as IntIset;
+    var b0 := s is iset<int>;
+    var b1 := u is IntIset<int>;
+
+    print s, " ", u, " ", b0, " ", b1, "\n"; // {} {} true true
+
+    b0 := s <= t;
+    b1 := s < t;
+    var b2 := s > s;
+    var b3 := s >= s;
+    print b0, " ", b1, " ", b2, " ", b3, "\n"; // true true false true
+
+    b0 := s == t;
+    b1 := s != t;
+    print b0, " ", b1, "\n"; // false true
+  }
+}
+
+module Frames {
+  method CallEm() {
+    var o := new object;
+    label Recently:
+    M({o}, iset{o}, multiset{o, o}, [o, o, o]);
+    var u := F({o}, iset{o}, multiset{o, o}, [o, o, o]);
+    ghost var b := P2@Recently({o}, iset{o}, multiset{o, o}, [o, o, o]);
+  }
+  
+  newtype ObjectSet<X> = s: set<X> | true
+  newtype ObjectISet<!X> = ss: iset<X> | true
+  newtype ObjectMultiset<X> = m: multiset<X> | true
+  newtype ObjectSeq<X> = q: seq<X> | true
+
+  function R(x: int): ObjectSet {
+    {}
+  }
+
+  method M(s: ObjectSet<object>, ss: ObjectISet<object>, m: ObjectMultiset<object>, q: ObjectSeq<object>)
+    modifies s
+    modifies ss
+    modifies m
+    modifies q
+    reads s
+    reads ss
+    reads m
+    reads q
+  {
+    assert unchanged(s);
+    assert unchanged(ss);
+    assert unchanged(m);
+    assert unchanged(q);
+    modify s;
+    modify ss;
+    modify m;
+    modify q;
+    for i := 0 to 100
+      modifies s
+      modifies ss
+      modifies m
+      modifies q
+    {
+    }
+    ghost var g: bool;
+    g := fresh(s);
+    g := fresh(ss);
+    g := fresh(q);
+  }
+
+  function F(s: ObjectSet<object>, ss: ObjectISet<object>, m: ObjectMultiset<object>, q: ObjectSeq<object>): int
+    reads s
+    reads ss
+    reads m
+    reads q
+    reads R
+  {
+    6
+  }
+
+  twostate predicate P2(s: ObjectSet<object>, ss: ObjectISet<object>, m: ObjectMultiset<object>, q: ObjectSeq<object>)
+    reads s
+    reads ss
+    reads m
+    reads q
+    reads R
+  {
+    true
+  }
+}
+
+module Decreases {
+  newtype MyInt = int
+  newtype BoundedInt = x: int | 0 <= x < 10_000
+  newtype BoolSet<X> = s: set<X> | true
+
+  method Test() {
+    A(100);
+    K({true, true});
+  }
+
+  method A(x: int)
+    requires x < 10_000
+    decreases x
+  {
+    if 0 < x {
+      B((x - 1) as MyInt);
+    } else if x == 0 {
+      print "Ends in A\n";
+    }
+  }
+
+  method B(y: MyInt)
+    requires y < 10_000
+    decreases y
+  {
+    if 0 < y {
+      C((y - 1) as BoundedInt);
+    } else if y == 0 {
+      print "Ends in B\n";
+    }
+  }
+
+  method C(z: BoundedInt)
+    decreases z
+  {
+    if 0 < z {
+      A((z - 1) as int);
+    } else if z == 0 {
+      print "Ends in C\n";
+    }
+  }
+
+  method K(s: set<bool>)
+    decreases s
+  {
+    if s == {} {
+      print "K is done\n";
+    } else {
+      L(s as BoolSet);
+    }
+  }
+
+  method L(t: BoolSet<bool>)
+    requires t != {}
+    decreases t, 0 as MyInt
+  {
+    var b :| b in t;
+    var t' := t - {b};
+    K(t' as set<bool>);
+  }
+}
+
+module Multiset {
+  newtype IntMultiset<X> = s: multiset<X> | true
+
+  method Test() {
+    var s: IntMultiset;
+    s := multiset{};
+    print s, " "; // multiset{}
+    s := multiset{6, 19, 6};
+    print |s|, " "; // 3
+    print 7 in s, " ", 6 in s, "\n"; // false true
+    print s[6], " ", s[19], " ", s[20], "\n"; // 2 1 0
+    s := s[17 := 3][1800 := 0][6 := 1];
+    print s[6], " ", s[17], " ", s[20], "\n"; // 1 3 0
+
+    var t: IntMultiset := s;
+
+    s := s + t;
+    s := s - t;
+    s := s * t;
+    expect s == t;
+    print |s|, "\n"; // 5
+    s := s - t;
+
+    var disjoint := s !! t;
+    print s, " ", disjoint, "\n"; // multiset{} true
+
+    var u: multiset<int>;
+    u := s as multiset<int>;
+    s := u as IntMultiset;
+    var b0 := s is multiset<int>;
+    var b1 := u is IntMultiset<int>;
+
+    print |s|, " ", |u|, " ", b0, " ", b1, "\n"; // 0 0 true true
+
+    b0 := s <= t;
+    b1 := s < t;
+    var b2 := s > s;
+    var b3 := s >= s;
+    print b0, " ", b1, " ", b2, " ", b3, "\n"; // true true false true
+
+    b0 := s == t;
+    b1 := s != t;
+    print b0, " ", b1, "\n"; // false true
+  }
+}
+
+module Seq {
+  newtype IntSeq<X> = s: seq<X> | true
+
+  method Test() {
+    var s: IntSeq;
+    s := [];
+    print s, " "; // []
+    s := [6, 19, 6];
+    print |s|, " "; // 3
+    print 7 in s, " ", 6 in s, "\n"; // false true
+    print s[0], " ", s[1], " ", s[2], "\n"; // 6 19 6
+    s := s[1 := 3][0 := 0][2 := 1];
+    print s[0], " ", s[1], " ", s[2], "\n"; // 0 3 1
+
+    var t: IntSeq := s;
+
+    s := s + t;
+    print |s|, " ", s, "\n"; // 6 [0, 3, 1, 0, 3, 1]
+
+    var u: seq<int>;
+    u := s as seq<int>;
+    s := u as IntSeq;
+    var b0 := s is seq<int>;
+    var b1 := u is IntSeq<int>;
+
+    print |s|, " ", |u|, " ", |t|, " ", b0, " ", b1, "\n"; // 6 6 3 true true
+
+    b0 := s <= t;
+    b1 := s < t;
+    var b2 := s <= s;
+    var b3 := t < s;
+    print b0, " ", b1, " ", b2, " ", b3, "\n"; // false false true true
+
+    b0 := s == t;
+    b1 := s != t;
+    print b0, " ", b1, "\n"; // false true
+
+    s := seq(4, i => 8 * i + 3);
+    print s, "\n"; // [3, 11, 19, 27]
+
+    SubSequences(s);
+  }
+
+  method SubSequences(s: IntSeq)
+    requires |s| == 4
+  {
+    Print(s[..2], " "); // [3, 11]
+    Print(s[2..], " "); // [19, 27]
+    Print(s[1..3], " "); // [11, 19]
+    Print(s[..], "\n"); // [3, 11, 19, 27]
+
+    var arr := new int[4] [11, 13, 17, 19];
+    Print(arr[..2], " "); // [11, 13]
+    Print(arr[2..], " "); // [17, 19]
+    Print(arr[1..3], " "); // [13, 17]
+    Print(arr[..], "\n"); // [11, 13, 17, 19];
+  }
+
+  method Print(s: IntSeq, suffix: string) {
+    print s, suffix;
+  }
+}
+
+module SeqToMultisetConversion {
+  newtype XSet<X> = s: set<X> | true
+  newtype XSeq<X> = s: seq<X> | true
+  newtype XMultiset<X> = s: multiset<X> | true
+
+  method Test() {
+    TestFromSet();
+    TestFromSeq();
+  }
+
+  method TestFromSet() {
+    var s: set<int>;
+    var s': XSet;
+    var m0: multiset<int>;
+    var m1: multiset<int>;
+    var m0': XMultiset;
+    var m1': XMultiset;
+
+    s := {37, 43, 37, 47};
+    s' := {47, 43, 37};
+
+    m0 := multiset(s);
+    m1 := multiset(s');
+    assert m0 == m1;
+    print m0 == m1, " ", |m0|, "\n"; // true 3
+
+    m0' := multiset(s);
+    m1' := multiset(s');
+    assert m0' == m1';
+    print m0' == m1', " ", |m0'|, "\n"; // true 3
+  }
+
+  method TestFromSeq() {
+    var s: seq<int>;
+    var s': XSeq;
+    var m0: multiset<int>;
+    var m1: multiset<int>;
+    var m0': XMultiset;
+    var m1': XMultiset;
+
+    s := [37, 43, 37, 47];
+    s' := s as XSeq;
+    s' := s'[0 := s'[1]][1 := s'[0]]; // swap elements 0 and 1, just to be a little different
+
+    m0 := multiset(s);
+    m1 := multiset(s');
+    assert m0 == m1;
+    print m0 == m1, " ", |m0|, "\n"; // true 4
+
+    m0' := multiset(s);
+    m1' := multiset(s');
+    assert m0' == m1';
+    print m0' == m1', " ", |m0'|, "\n"; // true 4
+  }
+}
+
+module Map {
+  newtype IntMap<X, Y> = m: map<X, Y> | true
+  newtype IntSet<X> = s: set<X> | true
+
+  method Test() {
+    var m: IntMap<int, real>;
+    m := map[];
+    print m, " "; // map[]
+    m := map[6 := 2.0, 19 := 2.1];
+    var n: IntMap := m;
+    print |m|, " "; // 2
+    print 7 in m, " ", 6 in m, "\n"; // false true
+    print m[6], " ", m[19], "\n"; // 2.0 2.1
+    m := m[17 := 3.0][1800 := 0.0][6 := 1.0];
+    print m[6], " ", m[19], " ", m[17], "\n"; // 1.0 2.1 3.0
+
+    m := m + n;
+    // m is now:  map[6 := 2.0, 17 := 3.0, 19 := 2.1, 1800 := 0.0]
+    print |m|, " ", m[6], "\n"; // 4 2.0
+
+    var sf: set<int> := {3, 4, 5, 17, 20};
+    m := m - sf;
+    var nf: IntSet := {3, 1800, 4, 5};
+    m := m - nf;
+    // m is now:  map[6 := 2.0, 19 := 2.1]
+    print |m|, " ", m[6] + m[19], "\n"; // 2 4.1
+
+    var u: map<int, real>;
+    u := m as map<int, real>;
+    m := u as IntMap;
+    var b0 := m is map<int, real>;
+    var b1 := u is IntMap<int, real>;
+
+    print |m|, " ", |u|, " ", b0, " ", b1, "\n"; // 2 2 true true
+
+    b0 := m == n;
+    b1 := m != n;
+    print b0, " ", b1, "\n"; // true false
+
+    TestComprehensions();
+  }
+
+  method TestComprehensions() {
+    var m: IntMap := map x: int | 2 <= x < 5 :: (2 * x) as real;
+    var n: IntMap := map x: int | 2 <= x < 5 :: 2 * x := 10.0 - x as real;
+    expect |m| == |n| == 3;
+    print 2 in m, " ", 2 in n, " ", 4 in m, " ", 4 in n, "\n"; // true false true true
+    assert 2 * 3 in n;
+    print m[3], " ", n[6], "\n"; // 6.0 7.0
+  }
+}
+
+module Imap {
+  newtype IntImap<!X, Y> = m: imap<X, Y> | true
+  newtype IntSet<X> = s: set<X> | true
+
+  method Test() {
+    var m: IntImap;
+    m := imap[];
+    print m, " "; // imap[]
+    m := imap[6 := 2.0, 19 := 2.1];
+    var n: IntImap := m;
+    print 7 in m, " ", 6 in m, "\n"; // false true
+    print m[6], " ", m[19], "\n"; // 2.0 2.1
+    m := m[17 := 3.0][1800 := 0.0][6 := 1.0];
+    print m[6], " ", m[19], " ", m[17], "\n"; // 1.0 2.1 3.0
+
+    m := m + n;
+    // m is now:  imap[6 := 2.0, 17 := 3.0, 19 := 2.1, 1800 := 0.0]
+    print m[6], "\n"; // 2.0
+
+    var sf: set<int> := {3, 4, 5, 17, 20};
+    m := m - sf;
+    var nf: IntSet := {3, 1800, 4, 5};
+    m := m - nf;
+    // m is now:  imap[6 := 2.0, 19 := 2.1]
+    print m[6] + m[19], "\n"; // 4.1
+
+    var u: imap<int, real>;
+    u := m as imap<int, real>;
+    m := u as IntImap;
+    var b0 := m is imap<int, real>;
+    var b1 := u is IntImap<int, real>;
+
+    print b0, " ", b1, "\n"; // true true
+
+    b0 := m == n;
+    b1 := m != n;
+    print b0, " ", b1, "\n"; // true false
+
+    TestComprehensions();
+  }
+
+  method TestComprehensions() {
+    var m: IntImap := imap x: int | 2 <= x < 5 :: (2 * x) as real;
+    var n: IntImap := imap x: int | 2 <= x < 5 :: 2 * x := 10.0 - x as real;
+    print 2 in m, " ", 2 in n, " ", 4 in m, " ", 4 in n, "\n"; // true false true true
+    assert 2 * 3 in n;
+    print m[3], " ", n[6], "\n"; // 6.0 7.0
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollectionsGeneric.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollectionsGeneric.dfy.expect
new file mode 100644
index 00000000000..5b1d5d665c3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeCollectionsGeneric.dfy.expect
@@ -0,0 +1,52 @@
+{} 2 4 true 4 false
+[false, true, true] {} true
+0 0 true true
+true true false true
+false true
+15
+iset: {} {19} {} true
+{} {} true true
+true true false true
+false true
+Ends in B
+K is done
+multiset{} 3 false true
+2 1 0
+1 3 0
+5
+multiset{} true
+0 0 true true
+true true false true
+false true
+[] 3 false true
+6 19 6
+0 3 1
+6 [0, 3, 1, 0, 3, 1]
+6 6 3 true true
+false false true true
+false true
+[3, 11, 19, 27]
+[3, 11] [19, 27] [11, 19] [3, 11, 19, 27]
+[11, 13] [17, 19] [13, 17] [11, 13, 17, 19]
+true 3
+true 3
+true 4
+true 4
+map[] 2 false true
+2.0 2.1
+1.0 2.1 3.0
+4 2.0
+2 4.1
+2 2 true true
+true false
+true false true true
+6.0 7.0
+map[] false true
+2.0 2.1
+1.0 2.1 3.0
+2.0
+4.1
+true true
+true false
+true false true true
+6.0 7.0
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeExtends.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeExtends.dfy
new file mode 100644
index 00000000000..eeb6bb3ade1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeExtends.dfy
@@ -0,0 +1,86 @@
+// RUN: %exits-with 2 %verify --type-system-refresh --general-newtypes --general-traits=full "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module DirectParents {
+  trait SupportsAdd {
+    function Add(x: int): int
+  }
+
+  newtype MySet extends SupportsAdd = set<int> {
+    function Add(x: int): int {
+      3 * |this| + 2 * x
+    }
+  }
+
+  newtype AnotherSet = MySet {
+  }
+
+  newtype RepeatExtendsClause extends SupportsAdd = MySet {
+  }
+
+  method Test() {
+    var m: MySet := {3, 9, 2, 3};
+    var s := m.Add(2);
+    assert s == 13;
+    print s, "\n";
+
+    var t: SupportsAdd := m;
+    s := t.Add(2);
+    assert s == 13;
+    print s, "\n";
+
+    var u: AnotherSet := {3, 9, 2, 3};
+    t := u; // error: AnotherSet not (directly) assignable to SupportsAdd
+    t := u as SupportsAdd; // error: AnotherSet not (directly) assignable to SupportsAdd
+    var isIt := u is SupportsAdd; // error: AnotherSet not (directly) assignable to SupportsAdd
+    t := u as MySet; // this is how ya do it
+    s := u.Add(2) + t.Add(2);
+    assert s == 26;
+    print s, "\n";
+
+    var r: RepeatExtendsClause := {3, 9, 2, 3};
+    t := r;
+    assert t == r as SupportsAdd;
+    assert r is SupportsAdd;
+    assert t == r as MySet;
+    assert t is MySet;
+    assert t is RepeatExtendsClause;
+  }
+}
+
+// The following module is analogous to the ExtendsMustBeDirect module in traits/TraitsExtendingTraits.dfy
+module MoreDirectParents {
+  trait HasG {
+    function G(): int
+  }
+
+  newtype A extends HasG = int { // yes, A does extend HasG
+    function G(): int { 2 }
+  }
+
+  newtype B extends HasG = A { // yes, since A extends HasG, so does B
+  }
+
+  newtype C = int { // C quacks like a HasG, but does not declare "extends HasG"
+    function G(): int { 2 }
+  }
+
+  newtype D extends HasG = C { // error: D does not declare G by itself and C is not declared to extend HasG
+  }
+}
+
+module MissingMember {
+  trait SupportsAdd {
+    function Add(x: int): int
+  }
+
+  trait SupportsSubtract {
+    function Subtract(x: int): int
+  }
+
+  newtype YesToAddButNotSubtract extends SupportsAdd, SupportsSubtract = set<int> { // error: type does not implement Subtract
+    function Add(x: int): int {
+      3 * |this| + 2 * x
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeExtends.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeExtends.dfy.expect
new file mode 100644
index 00000000000..8590f124ff4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeExtends.dfy.expect
@@ -0,0 +1,6 @@
+GeneralNewtypeExtends.dfy(33,6): Error: RHS (of type AnotherSet) not assignable to LHS (of type SupportsAdd)
+GeneralNewtypeExtends.dfy(34,11): Error: type cast to trait type 'SupportsAdd' must be from an expression of a compatible type (got 'AnotherSet')
+GeneralNewtypeExtends.dfy(35,18): Error: type test for type 'SupportsAdd' must be from an expression assignable to it (got 'AnotherSet')
+GeneralNewtypeExtends.dfy(68,10): Error: newtype 'D' inherits a member named 'G' from both newtype 'C' and trait 'HasG'
+GeneralNewtypeExtends.dfy(81,10): Error: newtype 'YesToAddButNotSubtract' does not implement trait function 'SupportsSubtract.Subtract'
+5 resolution/type errors detected in GeneralNewtypeExtends.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberCompile.dfy
new file mode 100644
index 00000000000..2547b6f8c7e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberCompile.dfy
@@ -0,0 +1,135 @@
+// RUN: %testDafnyForEachCompiler "%s" -- --type-system-refresh=true --general-newtypes=true
+
+
+method Main() {
+  Members.Test();
+}
+
+module Members {
+  method Test() {
+    TestConst();
+    var b := TestFunction();
+    b.PrintMe();
+    TestBoolBool(true);
+    Int.P(b);
+    (5.98 as Real).M();
+    (2.98 as TooReal).M();
+    (65 as Bv).M();
+    Map.Test();
+  }
+
+  method TestConst() {
+    var b: Bool := true;
+    assert b;
+    assert b.n == 4;
+    print b, " ", b.n, "\n"; // true 4
+  }
+
+  method TestFunction() returns (b: Bool) {
+    b := true;
+    var x := b.F();
+    assert x == 15;
+    assert b.H(300) == 1;
+    print b, " ", x, " ", b.H(300), "\n"; // true 15 1
+  }
+  
+  newtype Bool = bool {
+    const n: int := match this case false => 3 case _ => 4
+    function F(): int {
+      if this then 15 else 8
+    }
+    function H(x: int): int {
+      1
+    }
+    method PrintMe() {
+      print this, " ", F(), " ", n, "\n"; // true 15 4
+    }
+  }
+
+  newtype BoolBool = b: Bool | true {
+    function G(): int {
+      if this then
+        var b: Bool := this as Bool;
+        assert b;
+        if b then
+          var bb := b as bool;
+          assert bb;
+          9
+        else
+          -1 // we never get here
+      else
+        var b: Bool := this as Bool;
+        var bb: bool := this as bool;
+        assert !b;
+        assert !bb;
+        8
+    }
+  }
+
+  method TestBoolBool(bb: BoolBool) {
+    var a := bb.G();
+    assert bb ==> a == 9;
+    assert !bb ==> a == bb.F();
+    var x0 := bb.F();
+    var x1 := (bb as Bool).F();
+    print a, " ", x0, " ", x1, "\n"; // 9 15 15
+  }
+
+  newtype Int = int {
+    static method P<X>(x: X) {
+      print "Int.P: ", x, "\n"; // Int.P true
+    }
+  }
+
+  newtype Real = real {
+    method M() {
+      var a := Floor;
+      var b := this.Floor;
+      var c := (this as real).Floor;
+      var d := RealFloor();
+      assert a == b == c == d;
+      print a, " ", b, " ", c, " ", d, "\n"; // 5 5 5 5
+    }
+
+    function RealFloor(): int {
+      Floor
+    }
+  }
+  
+  newtype TooReal = r: real | 2.7 <= r < 3.14 witness 3.000 {
+    method M() {
+      var a := Floor;
+      var b := this.Floor;
+      var c := (this as real).Floor;
+      assert a == b == c;
+      var d: TooReal := *;
+      print a, " ", b, " ", c, " ", d, "\n"; // 2 2 2 3.0
+    }
+  }
+  
+  newtype Bv = x: bv7 | true {
+    method M()
+      requires this == 65
+    {
+      var a := RotateLeft(2);
+      var b := this.RotateRight(1);
+      var c := (this as bv7).RotateRight(0);
+      print a, " ", b, " ", c, "\n"; // 6 96 65
+    }
+  }
+  
+  newtype Map = map<int, real> {
+    const k: set<int> := Keys
+    method M() returns (s: set<int>) {
+      s := k;
+    }
+
+    static method Test() {
+      var m0: Map := map[18 := 4.0];
+      var m1: Map := map x | 3 <= x < 7 && x % 2 == 0 :: 3 * x := (10 - x) as real; // map[12 := 6.0, 18 := 4.0]
+      var s := m0.M();
+      m1 := m1 - s;
+      print m1, "\n"; // map[12 := 6.0]
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberCompile.dfy.expect
new file mode 100644
index 00000000000..56a79c3a4a2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberCompile.dfy.expect
@@ -0,0 +1,9 @@
+true 4
+true 15 1
+true 15 4
+9 15 15
+Int.P: true
+5 5 5 5
+2 2 2 3.0
+6 96 65
+map[12 := 6.0]
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberCompile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberCompile.dfy.rs.check
new file mode 100644
index 00000000000..2a0f83900f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberCompile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: (0,-1): Error: Feature not supported for this compilation target: The /runAllTests option
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolution.dfy
new file mode 100644
index 00000000000..bf24bce96aa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolution.dfy
@@ -0,0 +1,142 @@
+// RUN: %exits-with 2 %verify --type-system-refresh --general-newtypes "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Fields {
+  newtype Bool = bool {
+    var x: int // error: a newtype is not allowed to have a mutable field
+  }
+}
+
+module Members {
+  method Test() {
+    var b: Bool := true;
+    b.PrintMe(); // true 15 4
+  }
+  
+  newtype Bool = bool {
+    const n: int := match this case false => 3 case _ => 4
+    function F(): int {
+      if this then 15 else 8
+    }
+    function H(x: int): int {
+      1
+    }
+    method PrintMe() {
+      print this, " ", F(), " ", n, "\n";
+    }
+  }
+
+  newtype BoolBool = b: Bool | true {
+    function G(): int {
+      if this then
+        var b: Bool := this as Bool;
+        assert b;
+        if b then
+          var bb := b as bool;
+          assert bb;
+          9
+        else
+          -1 // we never get here
+      else
+        var b: Bool := this as Bool;
+        var bb: bool := this as bool;
+        assert !b;
+        assert !bb;
+        8
+    }
+
+    method PrintMe() { // error: not allowed to redeclare a member called PrintMe
+    }
+
+    function F(x: int): int { // error: not allowed to redeclare a member called F
+      x + 2
+    }
+
+    twostate lemma n() { // error: not allowed to redeclare a member called n
+    }
+  }
+
+  newtype BoolBoolBool = b: BoolBool | b witness true {
+    function H(x: int): int { // error: not allowed to declare a member called H
+      2
+    }
+  }
+
+  newtype Int = int {
+    static method P<X>(x: X) {
+      print "Int.P: ", x, "\n";
+    }
+  }
+  
+  newtype Real = real {
+    const Floor: int := 10 // error: not allowed to redeclare a member called Floor
+    method M() {
+      var a := Floor;
+      var b := this.Floor;
+      var c := (this as real).Floor;
+    }
+  }
+  newtype TooReal = r: real | 2.7 <= r < 3.14 witness 3.000 {
+    method M() {
+      var a := Floor;
+      var b := this.Floor;
+      var c := (this as real).Floor;
+    }
+  }
+  
+  newtype Bv = x: bv7 | x != 31 {
+    method RotateLeft(u: int) // error: not allowed to redeclare a member called RotateLeft
+    method M() {
+      var a := RotateRight(2);
+      var b := this.RotateRight(2);
+      var c := (this as bv7).RotateRight(2);
+    }
+  }
+  
+  newtype Map = map<int, real> {
+    const k: set<int> := Keys
+    method M() returns (s: set<int>) {
+      s := k;
+    }
+
+    predicate Values(r: real) // error: not allowed to redeclare a member named Values
+    predicate Items(r: real) // error: not allowed to redeclare a member named Items
+  }
+  
+  newtype IMap = m: imap<int, real> | 10.0 !in m.Values {
+    predicate Keys(r: real) // error: not allowed to redeclare a member named Keys
+    predicate Values(r: real) // error: not allowed to redeclare a member named Values
+
+    method M() returns (r: iset<(int, real)>) {
+      r := Items;
+      r := this.Items;
+      var th := this;
+      r := th.Items;
+    }
+  }
+
+  type MapSubset<Unused, K> = m: map<K, real> | true
+  newtype NewMapSubset = m: MapSubset<bv18, int> | true {
+    method M() {
+     var s := Keys;
+     var t := this.Keys;
+     assert s == t;
+    }
+  }
+}
+
+module MemberIsNotInBaseType {
+  newtype IntSet = set<int> {
+    static predicate P(x: int) { x != 118 }
+    method M(u: int) {
+      var s := set x | 0 <= x < 200 && P(x);
+      if u in this {
+        assert u in s + this;
+      }
+      var t := s as set<int>;
+      assert P(0);
+      assert s.P(0);
+      assert t.P(0); // error: set<int> does not have a member P
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolution.dfy.expect
new file mode 100644
index 00000000000..6e6a8d9c8fb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolution.dfy.expect
@@ -0,0 +1,13 @@
+GeneralNewtypeMemberResolution.dfy(6,8): Error: mutable fields are allowed only in reference types (consider declaring the field as a 'const')
+GeneralNewtypeMemberResolution.dfy(48,11): Error: method 'PrintMe' is inherited from newtype 'Bool' and is not allowed to be re-declared in newtype 'BoolBool'
+GeneralNewtypeMemberResolution.dfy(51,13): Error: function 'F' is inherited from newtype 'Bool' and is not allowed to be re-declared in newtype 'BoolBool'
+GeneralNewtypeMemberResolution.dfy(55,19): Error: const field 'n' is inherited from newtype 'Bool' and is not allowed to be re-declared in newtype 'BoolBool'
+GeneralNewtypeMemberResolution.dfy(60,13): Error: function 'H' is inherited from newtype 'Bool' and is not allowed to be re-declared in newtype 'BoolBoolBool'
+GeneralNewtypeMemberResolution.dfy(72,10): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'Real'
+GeneralNewtypeMemberResolution.dfy(88,11): Error: function 'RotateLeft' is inherited from type 'bv7' and is not allowed to be re-declared in newtype 'Bv'
+GeneralNewtypeMemberResolution.dfy(102,14): Error: field 'Values' is inherited from type 'map' and is not allowed to be re-declared in newtype 'Map'
+GeneralNewtypeMemberResolution.dfy(103,14): Error: field 'Items' is inherited from type 'map' and is not allowed to be re-declared in newtype 'Map'
+GeneralNewtypeMemberResolution.dfy(107,14): Error: field 'Keys' is inherited from type 'imap' and is not allowed to be re-declared in newtype 'IMap'
+GeneralNewtypeMemberResolution.dfy(108,14): Error: field 'Values' is inherited from type 'imap' and is not allowed to be re-declared in newtype 'IMap'
+GeneralNewtypeMemberResolution.dfy(139,15): Error: member 'P' does not exist in type 'set'
+12 resolution/type errors detected in GeneralNewtypeMemberResolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolutionReal.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolutionReal.dfy
new file mode 100644
index 00000000000..647aaa3172e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolutionReal.dfy
@@ -0,0 +1,79 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --general-traits=full
+
+// The following tests apply only --general-traits=full, since that mode allows a newtype to both
+// be based on `real` and extend traits.
+// Alternatively, if newtypes could have a datatype as the base type, then these tests could be
+// changed (or appended) to use --general-traits=datatype and use a datatype as the newtype base type.
+
+module TwoLevelsOfNewtype {
+  module DuplicateInR0 {
+    newtype R0 = real { const Floor: string } // error: duplicate member
+    newtype R1 = R0
+  }
+  module DuplicateInR1 {
+    newtype R0 = real
+    newtype R1 = R0 { const Floor: string } // error: duplicate member
+  }
+  module DuplicateInR0AndR1 {
+    newtype R0 = real { const Floor: string } // error: duplicate member
+    newtype R1 = R0 { const Floor: string } // error: duplicate member
+  }
+}
+
+module DuplicateFromBaseTypeAndParentType {
+  module DuplicateInheritance {
+    trait Parent { const Floor: string }
+    newtype R0 extends Parent = real // error: duplicate inherited member
+    newtype R1 = R0
+  }
+  module DuplicateInR0 {
+    trait Parent { const Floor: string }
+    newtype R0 extends Parent = real { // error: duplicate inherited member
+      const Floor: string // error: duplicate member
+    }
+    newtype R1 = R0
+  }
+  module DuplicateInR1 {
+    trait Parent { const Floor: string }
+    newtype R0 extends Parent = real // error: duplicate inherited member
+    newtype R1 = R0 { const Floor: string } // error: duplicate member
+  }
+  module DuplicateInR0AndR1 {
+    trait Parent { const Floor: string }
+    newtype R0 extends Parent = real { // error: duplicate inherited member
+      const Floor: string // error: duplicate member
+    }
+    newtype R1 = R0 { const Floor: string } // error: duplicate member
+  }
+}
+
+module DuplicateFromBaseTypeAndGrandParentType {
+  module DuplicateInheritance {
+    trait GrandParent { const Floor: string }
+    trait Parent extends GrandParent { }
+    newtype R0 extends Parent = real // error: duplicate inherited member
+    newtype R1 = R0
+  }
+  module DuplicateInR0 {
+    trait GrandParent { const Floor: string }
+    trait Parent extends GrandParent { }
+    newtype R0 extends Parent = real { // error: duplicate inherited member
+      const Floor: string // error: duplicate member
+    }
+    newtype R1 = R0
+  }
+  module DuplicateInR1 {
+    trait GrandParent { const Floor: string }
+    trait Parent extends GrandParent { }
+    newtype R0 extends Parent = real // error: duplicate inherited member
+    newtype R1 = R0 { const Floor: string } // error: duplicate member
+  }
+  module DuplicateInR0AndR1 {
+    trait GrandParent { const Floor: string }
+    trait Parent extends GrandParent { }
+    newtype R0 extends Parent = real { // error: duplicate inherited member
+      const Floor: string // error: duplicate member
+    }
+    newtype R1 = R0 { const Floor: string } // error: duplicate member
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolutionReal.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolutionReal.dfy.expect
new file mode 100644
index 00000000000..9152df5d0e6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberResolutionReal.dfy.expect
@@ -0,0 +1,21 @@
+GeneralNewtypeMemberResolutionReal.dfy(10,30): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'R0'
+GeneralNewtypeMemberResolutionReal.dfy(15,28): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'R1'
+GeneralNewtypeMemberResolutionReal.dfy(18,30): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'R0'
+GeneralNewtypeMemberResolutionReal.dfy(19,28): Error: const field 'Floor' is inherited from newtype 'R0' and is not allowed to be re-declared in newtype 'R1'
+GeneralNewtypeMemberResolutionReal.dfy(26,12): Error: newtype 'R0' inherits a member named 'Floor' from both type 'real' and trait 'Parent'
+GeneralNewtypeMemberResolutionReal.dfy(31,12): Error: newtype 'R0' inherits a member named 'Floor' from both type 'real' and trait 'Parent'
+GeneralNewtypeMemberResolutionReal.dfy(32,12): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'R0'
+GeneralNewtypeMemberResolutionReal.dfy(38,12): Error: newtype 'R0' inherits a member named 'Floor' from both type 'real' and trait 'Parent'
+GeneralNewtypeMemberResolutionReal.dfy(39,28): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'R1'
+GeneralNewtypeMemberResolutionReal.dfy(43,12): Error: newtype 'R0' inherits a member named 'Floor' from both type 'real' and trait 'Parent'
+GeneralNewtypeMemberResolutionReal.dfy(44,12): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'R0'
+GeneralNewtypeMemberResolutionReal.dfy(46,28): Error: const field 'Floor' is inherited from newtype 'R0' and is not allowed to be re-declared in newtype 'R1'
+GeneralNewtypeMemberResolutionReal.dfy(54,12): Error: newtype 'R0' inherits a member named 'Floor' from both type 'real' and trait 'GrandParent'
+GeneralNewtypeMemberResolutionReal.dfy(60,12): Error: newtype 'R0' inherits a member named 'Floor' from both type 'real' and trait 'GrandParent'
+GeneralNewtypeMemberResolutionReal.dfy(61,12): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'R0'
+GeneralNewtypeMemberResolutionReal.dfy(68,12): Error: newtype 'R0' inherits a member named 'Floor' from both type 'real' and trait 'GrandParent'
+GeneralNewtypeMemberResolutionReal.dfy(69,28): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'R1'
+GeneralNewtypeMemberResolutionReal.dfy(74,12): Error: newtype 'R0' inherits a member named 'Floor' from both type 'real' and trait 'GrandParent'
+GeneralNewtypeMemberResolutionReal.dfy(75,12): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'R0'
+GeneralNewtypeMemberResolutionReal.dfy(77,28): Error: const field 'Floor' is inherited from newtype 'R0' and is not allowed to be re-declared in newtype 'R1'
+20 resolution/type errors detected in GeneralNewtypeMemberResolutionReal.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerify.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerify.dfy
new file mode 100644
index 00000000000..4afd4fd1033
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerify.dfy
@@ -0,0 +1,147 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --general-newtypes "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Members {
+  method Test() {
+    TestConst();
+    TestFunction();
+    TestBoolBool(true);
+  }
+
+  method TestConst() {
+    var b: Bool := true;
+    assert b;
+    assert b.n == 4;
+    b := false;
+    assert b.n == 4; // error
+  }
+
+  method TestFunction() {
+    var b: Bool := true;
+    var x := b.F();
+    assert x == 15;
+    assert b.H(300) == 1;
+  }
+  
+  newtype Bool = bool {
+    const n: int := match this case false => 3 case _ => 4
+    function F(): int {
+      if this then 15 else 8
+    }
+    function H(x: int): int {
+      1
+    }
+    method PrintMe() {
+      print this, " ", F(), " ", n, "\n";
+    }
+  }
+
+  newtype BoolBool = b: Bool | true {
+    function G(): int {
+      if this then
+        var b: Bool := this as Bool;
+        assert b;
+        if b then
+          var bb := b as bool;
+          assert bb;
+          9
+        else
+          -1 // we never get here
+      else
+        var b: Bool := this as Bool;
+        var bb: bool := this as bool;
+        assert !b;
+        assert !bb;
+        8
+    }
+  }
+
+  method TestBoolBool(bb: BoolBool) {
+    var a := bb.G();
+    assert bb ==> a == 9;
+    assert !bb ==> a == bb.F();
+    assert bb.F() == (bb as Bool).F();
+  }
+
+  newtype BoolBoolBool = b: BoolBool | b witness true {
+    lemma YeahItIsTrue()
+      ensures F() == 15
+    {
+    }
+  }
+
+  newtype Int = int {
+    static method P<X>(x: X) {
+      print "Int.P: ", x, "\n";
+    }
+  }
+
+  newtype Real = real {
+    method M() {
+      var a := Floor;
+      var b := this.Floor;
+      var c := (this as real).Floor;
+      assert a == b == c;
+    }
+
+    function RealFloor(): int {
+      Floor
+    }
+
+    method Q()
+      requires 2.3 <= this < 2.9
+    {
+      if
+      case true =>
+        assert this.Floor == 2;
+      case true =>
+        assert this.RealFloor() == 2;
+    }
+  }
+  
+  newtype TooReal = r: real | 2.7 <= r < 3.14 witness 3.000 {
+    method M() {
+      var a := Floor;
+      var b := this.Floor;
+      var c := (this as real).Floor;
+      assert a == b == c;
+    }
+  }
+  
+  newtype Bv = x: bv7 | x != 31 {
+    method M() {
+      var a := RotateRight(2);
+      var b := this.RotateRight(2);
+      var c := (this as bv7).RotateRight(2);
+      assert a == b == c;
+    }
+  }
+  
+  newtype Map = map<int, real> {
+    const k: set<int> := Keys
+    method M() returns (s: set<int>) {
+      s := k;
+    }
+  }
+  
+  newtype IMap = m: imap<int, real> | 10.0 !in m.Values {
+    method M() returns (r: iset<(int, real)>) {
+      r := Items;
+      r := this.Items;
+      var th := this;
+      r := th.Items;
+    }
+  }
+
+  type MapSubset<Unused, K> = m: map<K, real> | true
+  newtype NewMapSubset = m: MapSubset<bv18, int> | true {
+    method M() {
+     var s := Keys;
+     var t := this.Keys;
+     assert s == t;
+     assert this.Keys == (this as MapSubset<bv18, int>).Keys;
+     assert this.Keys == (this as map<int, real>).Keys;
+     assert this is map<int, real>;
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerify.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerify.dfy.expect
new file mode 100644
index 00000000000..911d5cb8961
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerify.dfy.expect
@@ -0,0 +1,3 @@
+GeneralNewtypeMemberVerify.dfy(16,4): Error: assertion might not hold
+
+Dafny program verifier finished with 19 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerifyReal.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerifyReal.dfy
new file mode 100644
index 00000000000..c1a23461885
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerifyReal.dfy
@@ -0,0 +1,40 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --general-traits=full --general-newtypes "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// The following tests apply only --general-traits=full, since that mode allows a newtype to both
+// be based on `real` and extend traits.
+// Alternatively, if newtypes could have a datatype as the base type, then these tests could be
+// changed (or appended) to use --general-traits=datatype and use a datatype as the newtype base type.
+
+trait SupportsAdd {
+  function Add(x: int): int
+}
+
+newtype NonNegativeReal extends SupportsAdd = r: real | 0.0 <= r {
+  function Add(x: int): int {
+    Floor + x
+  }
+}
+
+method Test(n: NonNegativeReal) {
+  var x := n.Floor;
+  var y := n.Add(x);
+  if {
+    case true =>
+      assert y == n.Floor + n.Floor;
+      assert x <= y;
+    case true =>
+      assert 2 * n.Floor == x + y; // error: x + y == 3 * n.Floor
+    case true =>
+  }
+
+  var m: NonNegativeReal;
+  if {
+    case true =>
+      m := (x + y) as real as NonNegativeReal;
+    case true =>
+      m := (y - x) as real as NonNegativeReal;
+    case true =>
+      m := (x - y) as real as NonNegativeReal; // error: x-y may be negative
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerifyReal.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerifyReal.dfy.expect
new file mode 100644
index 00000000000..5d6b552c833
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeMemberVerifyReal.dfy.expect
@@ -0,0 +1,4 @@
+GeneralNewtypeMemberVerifyReal.dfy(27,6): Error: assertion might not hold
+GeneralNewtypeMemberVerifyReal.dfy(38,27): Error: result of operation might violate newtype constraint for 'NonNegativeReal'
+
+Dafny program verifier finished with 2 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeResolution.dfy
new file mode 100644
index 00000000000..b5354f3711d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeResolution.dfy
@@ -0,0 +1,956 @@
+// RUN: %exits-with 2 %build --type-system-refresh --general-traits datatype --general-newtypes false "%s" > "%t"
+// RUN: %exits-with 2 %build --type-system-refresh --general-traits datatype --general-newtypes true "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module VariousBaseTypes {
+  newtype byteA = x | 0 <= x < 256
+
+  newtype byteB = x: int | 0 <= x < 256
+
+  newtype MyInt = int
+
+  // cycle one way
+  newtype A = B
+  newtype B = c: C | true witness *
+  newtype C = d | d < 100
+
+  // cycle the other way
+  newtype Z = d | d < 100
+  newtype Y = c: Z | true witness *
+  newtype X = Y
+
+  newtype MyReal0 = real
+  newtype MyReal1 = r | 0.0 <= r <= 100.0
+  newtype MyReal2 = r: real | 0.0 <= r <= 100.0
+
+  // The following are allowed with /generalNewtypes:1, but errors with /generalNewtypes:0
+
+  newtype NotNumeric0 = bool // error: cannot base newtype on bool
+  newtype NotNumeric1 = b | !b // error: cannot base newtype on bool
+  newtype NotNumeric2 = b: bool | true // error: cannot base newtype on bool
+
+  // The following are always errors (more tests like these in ArrowBaseTypes below)
+
+  newtype MyOrdinal = ORDINAL // error: cannot base newtype on ORDINAL
+
+  trait Trait { }
+  trait ReferenceTrait extends object { }
+  class Cell { }
+
+  newtype MyObject = object // error: cannot base newtype on (reference) trait
+  newtype MyTrait = Trait // error: cannot base newtype on (non-reference) trait
+  newtype MyReferenceTrait = ReferenceTrait // error: cannot base newtype on (reference) trait
+  newtype MyCell? = Cell? // error: cannot base newtype on class
+  newtype MyCell = Cell // error: cannot base newtype on class
+}
+
+module BaseTypesThatAreSubsetTypes {
+  newtype byteB = x: nat | x < 256
+
+  newtype MyNat = nat
+
+  // cycle one way
+  newtype A = B
+  newtype B = c: C | true witness *
+  newtype C = d: nat | d < 100
+
+  // cycle the other way
+  newtype Z = d: nat | d < 100
+  newtype Y = c: Z | true witness *
+  newtype X = Y
+
+  type NonNegReal = r | 0.0 <= r
+  newtype MyReal = NonNegReal
+  newtype MyReal' = r: NonNegReal | r <= 100.0
+
+  // The following are allowed with /generalNewtypes:1, but errors with /generalNewtypes:0
+
+  type True = b | !!b
+  newtype NotNumeric = True // error: cannot base newtype on bool
+  newtype NotNumeric' = b: True | true // error: cannot base newtype on bool
+
+  // The following are always errors
+
+  type NonFiveOrdinal = o: ORDINAL | o != 5
+  newtype MyOrdinal = NonFiveOrdinal // error: cannot base newtype on ORDINAL
+
+  trait Trait { const n: int }
+  type NonFiveTrait = t: Trait | t.n != 5
+  trait ReferenceTrait extends object { const n: int }
+  type NonFiveReferenceTrait = t: ReferenceTrait | t.n != 5
+  class Cell { const n: int }
+  type NonFiveCell? = t: Cell? | t == null || t.n != 5
+  type NonFiveCell = t: Cell | t.n != 5
+
+  newtype MyTrait = NonFiveTrait // error: cannot base newtype on (non-reference) trait
+  newtype MyReferenceTrait = NonFiveReferenceTrait // error: cannot base newtype on (reference) trait
+  newtype MyCell? = NonFiveCell? // error: cannot base newtype on class
+  newtype MyCell = NonFiveCell // error: cannot base newtype on class
+}
+
+module SomeOperators {
+  newtype TrueBool = b | b witness true
+  newtype FalseBool = b | !b
+  codatatype Stream = More(Stream)
+
+  method Comparisons(x: TrueBool, y: FalseBool, z: bool, s: Stream, k: nat, o: ORDINAL) returns (r: TrueBool, r': FalseBool) {
+    r := x == x;
+    r := y == y;
+    r := z == z;
+    r := s ==#[k] s;
+    r := s ==#[o] s;
+    r := k == k;
+    r := o == o;
+
+    r := x <==> x;
+    r := y <==> y; // error: <==> always results in the same type as its operands
+    r := z <==> z; // error: <==> always results in the same type as its operands
+
+    r := x ==> x;
+    r := y ==> y; // error: ==> always results in the same type as its operands
+    r := z ==> z; // error: ==> always results in the same type as its operands
+
+    r := x <== x;
+    r := y <== y; // error: <== always results in the same type as its operands
+    r := z <== z; // error: <== always results in the same type as its operands
+
+    r := x && x;
+    r := y && y; // error: && always results in the same type as its operands
+    r := z && z; // error: && always results in the same type as its operands
+
+    r := x || x;
+    r := y || y; // error: || always results in the same type as its operands
+    r := z || z; // error: || always results in the same type as its operands
+
+    r := k <= k;
+    r := k >= k;
+    r' := k < k;
+    r' := k > k;
+  }
+}
+
+module WhatCanBeCompiled {
+  newtype MyBool = bool
+  newtype AnyBool = b: bool | true
+  newtype TrueBool = b | b
+
+  function Exp(x: int, n: nat): int {
+    if n == 0 then 1 else x * Exp(x, n - 1)
+  }
+  newtype FermatBool = b | b <==>
+    forall x, y, z, n: nat :: 1 <= x && 1 <= y && 1 <= z && Exp(x, n) + Exp(y, n) == Exp(z, n) ==> n <= 2
+    witness *
+
+  ghost predicate G(b: bool) { b }
+  newtype GhostBool = b | G(b)
+
+  newtype OnTopOfGhostBool = g: GhostBool | true witness false
+
+  method AsTest(b: bool) {
+    if
+    case true =>
+      var m: MyBool;
+      m := b as MyBool;
+    case true =>
+      var a: AnyBool;
+      a := b as AnyBool;
+    case true =>
+      var t: TrueBool;
+      t := b as TrueBool;
+    case true =>
+      var f: FermatBool;
+      f := b as FermatBool;
+    case true =>
+      var g: GhostBool;
+      g := b as GhostBool;
+    case true =>
+      var o: OnTopOfGhostBool;
+      o := b as OnTopOfGhostBool;
+  }
+
+  method IsTest(b: bool) returns (r: bool) {
+    if
+    case true =>
+      r := b is MyBool;
+    case true =>
+      r := b is AnyBool;
+    case true =>
+      r := b is TrueBool;
+    case true =>
+      r := b is FermatBool; // error: this type test is ghost
+    case true =>
+      r := b is GhostBool; // error: this type test is ghost
+    case true =>
+      r := b is OnTopOfGhostBool; // error: this type test is ghost
+  }
+}
+
+module DiscoverBounds {
+  newtype TrueAsCanBe = b: bool | b witness true
+
+  method Test(s: set<TrueAsCanBe>) {
+    assert forall x :: x in s ==> x == true;
+  }
+}
+
+module Char {
+  newtype MyChar = char
+  newtype UpperCase = ch | 'A' <= ch <= 'Z' witness 'D'
+
+  method Comparisons() returns (c: MyChar, u: UpperCase, r: bool) {
+    c := 'e';
+    u := 'E';
+
+    r := c == c;
+    r := u != u;
+    r := c == u; // error: types don't match
+
+    r := c < c;
+    r := c <= c;
+    r := c >= c;
+    r := c > c;
+
+    r := u <= u <= u;
+    r := u < c; // error: types don't match
+    r := u <= c; // error: types don't match
+    r := u >= c; // error: types don't match
+    r := u > c; // error: types don't match
+
+    if c == 'f' && u == 'D' {
+      r := true;
+    }
+  }
+
+  method PlusMinus(c: MyChar, u: UpperCase, ch: char) {
+    var d := c - c + c;
+    var v := u - 'A' + 'd';
+
+    var e0 := c + u; // error: types don't match
+    var e1 := ch + c; // error: types don't match
+
+    var d := c as char - c as char + c as char;
+    var A: char := 'A';
+    var v := u - A as UpperCase + 'd' as MyChar as UpperCase;
+
+    var x: int;
+    x := ch as int;
+    x := c as char as int;
+    x := u as char as int;
+    x := c as int; // error: cannot go directly from char-newtype to int
+    x := u as int; // error: cannot go directly from char-newtype to int
+  }
+}
+
+module BitvectorOperators {
+  newtype BV = b: bv17 | b != 123
+  newtype Word = bv32
+  newtype Big = b: bv1024 | true
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+
+  method Comparisons(x: BV, y: Word, z: Big, a: bv17, b: bv32, c: bv1024, i: int, j: int32) returns (r: bool, s: BV) {
+    r := x == x;
+    r := y == y;
+    r := z == z;
+
+    r := x == 5;
+    r := x == y; // error: type mismatch
+    r := x == a; // error: type mismatch
+    r := x == b; // error: type mismatch
+    r := x == i; // error: type mismatch
+    r := x == j; // error: type mismatch
+
+    // + - * / %
+    s := x + x - x * (x + x / x - x % x);
+    s := 12 + x - x * (x + 19 / 17 - x % 3);
+    s := 12 + 13 - 14 * (15 + 16 / 17 - 18 % 19);
+    s := x + y; // error: type mismatch
+    s := x - z; // error: type mismatch
+    s := x * a; // error: type mismatch
+    s := x / b; // error: type mismatch
+    s := x % c; // error: type mismatch
+
+    // & | ^
+    s := (x & x) | (x ^ x ^ x);
+    s := (12 & 13) | (14 ^ 15 ^ 16);
+    s := a & x; // error: type mismatch
+    s := b | x; // error: type mismatch
+    s := z ^ x; // error: type mismatch
+
+    // << >>
+    s := x << x << 3 << y << i << j;
+    s := x >> x >> 3 >> y >> i >> j;
+    s := b << x << 3; // error: RHS type not assignable to LHS
+    s := b >> x >> 3; // error: RHS type not assignable to LHS
+
+    //  .RotateLeft .RotateRight
+    s := x.RotateLeft(3).RotateRight(j); // error: argument type expected to be nat
+    s := x.RotateRight(j); // error: argument type expected to be nat
+    s := x.RotateLeft(3 as int).RotateRight(j as nat);
+    s := b.RotateLeft(x as nat).RotateRight(i as int); // error: RHS type not assignable to LHS type
+
+    // < <= >= >
+    r := (x <= x && x < x) || x >= x || x > x;
+    r := x < a; // error: type mismatch
+    r := x <= b; // error: type mismatch
+    r := x >= c; // error: type mismatch
+    r := x > z; // error: type mismatch
+  }
+
+  method Conversions() returns (x: BV, y: Word, z: Big, a: bv17, b: bv32, c: bv1024, i: int, j: int32, r: bool) {
+    x := 10;
+    x := x;
+    x := y; // error: type mismatch
+    x := z; // error: type mismatch
+    x := a; // error: type mismatch
+    x := b; // error: type mismatch
+    x := c; // error: type mismatch
+    x := i; // error: type mismatch
+    x := j; // error: type mismatch
+  
+    x := 10 as BV; // (the "10" gets type "int" by way of advice)
+    x := x as BV;
+    x := y as BV;
+    x := z as BV;
+    x := a as BV;
+    x := b as BV;
+    x := c as BV;
+    x := i as BV;
+    x := j as BV;
+
+    r := 10 is BV; // (the "10" gets type "int" by way of advice)
+    r := x is BV;
+    r := y is BV;
+    r := z is BV;
+    r := a is BV;
+    r := b is BV;
+    r := c is BV;
+    r := i is BV;
+    r := j is BV;
+
+    r := 10 is bv17; // (the "10" gets type "int" by way of advice)
+    r := x is bv17;
+    r := y is bv17;
+    r := z is bv17;
+    r := a is bv17;
+    r := b is bv17;
+    r := c is bv17;
+    r := i is bv17;
+    r := j is bv17;
+  }
+}
+
+module BitvectorForRuntimeChecks0 {
+  newtype BV = b: bv17 | b != 123
+  newtype Word = bv32
+  newtype Big = b: bv1024 | true
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+
+  method Comparisons(x: BV, y: Word, z: Big, a: bv17, b: bv32, c: bv1024, i: int, j: int32) returns (r: bool, s: BV) {
+    r := x == x;
+    r := y == y;
+    r := z == z;
+
+    r := x == 5;
+
+    // + - * / %
+    s := x + x - x * (x + x / x - x % x);
+    s := 12 + x - x * (x + 19 / 17 - x % 3);
+    s := 12 + 13 - 14 * (15 + 16 / 17 - 18 % 19);
+
+    // & | ^
+    s := (x & x) | (x ^ x ^ x);
+    s := (12 & 13) | (14 ^ 15 ^ 16);
+
+    // << >>
+    s := x << x << 3 << y << i << j;
+    s := x >> x >> 3 >> y >> i >> j;
+
+    //  .RotateLeft .RotateRight
+    s := x.RotateLeft(3) as BV;
+    s := x.RotateRight(j as nat) as BV;
+
+    // < <= >= >
+    r := (x <= x && x < x) || x >= x || x > x;
+  }
+
+  method Conversions() returns (x: BV, y: Word, z: Big, a: bv17, b: bv32, c: bv1024, i: int, j: int32, r: bool) {
+    r := 10 is BV;
+    r := 10 is Word;
+    r := x is Word;
+    r := y is Word;
+
+    r := 10 is bv17;
+    r := x is bv17;
+    r := y is bv17;
+    r := z is bv17;
+    r := a is bv17;
+    r := b is bv17;
+    r := c is bv17;
+    r := i is bv17;
+    r := j is bv17;
+  }
+}
+
+module BitvectorForRuntimeChecks1 {
+  newtype BV = b: bv17 | b != 123
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+
+  method RotateL(x: BV, j: int32) returns (s: BV) {
+    s := x.RotateLeft(3); // error: RotateLeft/RotateRight always return the plain bv type (here, bv17)
+  }
+
+  method RotateR(x: BV, j: int32) returns (s: BV) {
+    s := x.RotateRight(j as nat); // error: RotateLeft/RotateRight always return the plain bv type (here, bv17)
+  }
+}
+
+module BitvectorForRuntimeChecks2 {
+  newtype BV = b: bv17 | b != 123
+  newtype Word = bv32
+
+  newtype GhostBits = b: bv109 | GhostPredicate(b)
+
+  ghost predicate GhostPredicate(x: bv109) {
+    true
+  }
+
+  method Comprehensions(aa: set<bv7>, bb: set<BV>, cc: set<Word>, dd: set<GhostBits>) {
+    var se0, se1, se2, se3;
+    se0 := set x | x in aa;
+    se1 := set x | x in bb;
+    se2 := set x | x in cc;
+    se3 := set x | x in dd; // error: GhostBits is not compilable
+  }
+}
+
+module BitvectorCharConversion {
+  type Char = ch: char | true
+
+  method Test() returns (c: char, d: Char, a: bv5) {
+    if
+    case true =>
+      d := c as Char;
+    case true =>
+      d := a as Char; // error -- this conversion is allowed only under /generalNewtypes:0
+    case true =>
+      d := (a as int) as Char;
+  }
+}
+
+module NativeTypePreference {
+  newtype {:nativeType "int"} RR = x: real | 0.0 <= x <= 3.0 // error: not integer or bitvector type
+//SOON:  newtype {:nativeType "int"} TT = x: (int, int) | x.0 == x.1 // error: not integer or bitvector type
+  newtype {:nativeType "uint"} BB0 = x: bv325 | 0 <= x < 300 // error (with hint): does not fit into bv325
+  newtype {:nativeType "uint"} BB1 = bv325 // error: does not fit into bv325
+
+  newtype {:nativeType "long"} C0 = x: int | 0 <= x < 280 witness 23
+  type C1 = x: C0 | x != 199 witness 24
+  newtype {:nativeType "short"} C2 = C1
+  newtype C3 = x: C2 | x % 2 == 0 witness 28
+  newtype {:nativeType "byte"} C4 = x: C3 | x < 100 witness 30
+
+  newtype {:nativeType "long"} ZZ0 = x: bv0 | true // error (with hint): cannot use native type that admits negative values
+  newtype {:nativeType "ulong"} ZZ1 = x: bv0 | true
+  newtype {:nativeType "number"} ZZ2 = x: bv0 | true // error: cannot use native type that admits negative values
+
+  newtype {:nativeType "short"} WW0 = bv7 // error (with hint): cannot use native type that admits negative values
+  newtype {:nativeType "ushort"} WW1 = bv7
+  newtype {:nativeType "number"} WW2 = x: bv7 | true // error: cannot use native type that admits negative values
+
+  newtype {:nativeType "ulong"} D0 = x: bv13 | 0 <= x < 280 witness 23
+  type D1 = x: D0 | x != 199 witness 24
+  newtype {:nativeType "ushort"} D2 = D1
+  newtype D3 = x: D2 | x % 2 == 0 witness 28
+  // A newtype based on a bitvector is always native-sized according to the bitvector width, regardless of any constraints. Hence,
+  // there is an error reported on the next line.
+  newtype {:nativeType "byte"} D4 = x: D3 | x < 100 witness 30 // error: "byte" cannot be determined to be big enough
+}
+
+module CyclesInFiguringOutWhatIsCompilable {
+  type OnTopOfNat = n: nat | true
+
+  predicate P(x: int) { true }
+  type PUp = x: int | P(x) // compilable, since P is
+  type PPUp = s: set<int> | |set x: PUp | x in s| < 10 // compilable, since PUp is
+
+  type PPDown = s: set<int> | |set x: PDown | x in s| < 10 // compilable, since PDown is
+  type PDown = x: int | P(x) // compilable, since P is
+
+  type PSpiral4 = x: PSpiral3 | true
+  type PSpiral2 = x: PSpiral1 | true
+  type PSpiral0 = x: int | P(x)
+  type PSpiral1 = x: PSpiral0 | true
+  type PSpiral3 = x: PSpiral2 | true
+
+  method AllFine(x: int, s: set<int>) {
+    print x is OnTopOfNat;
+    print x is PUp;
+    print x is PDown;
+    print s is PPUp;
+    print s is PPDown;
+    print x is PSpiral0;
+    print x is PSpiral1;
+    print x is PSpiral2;
+    print x is PSpiral3;
+    print x is PSpiral4;
+  }
+
+
+  ghost predicate Q(x: int) { true }
+  type QUp = x: int | Q(x) // not compilable, since Q isn't
+  type QQUp = s: set<int> | |set x: QUp | x in s| < 10 // not compilable, since QUp isn't
+  type QQDown = s: set<int> | |set x: QDown | x in s| < 10 // not compilable, since QDown isn't
+  type QDown = x: int | Q(x) // not compilable, since Q isn't
+
+  type QSpiral4 = x: QSpiral3 | true
+  type QSpiral2 = x: QSpiral1 | true
+  type QSpiral0 = x: int | Q(x)
+  type QSpiral1 = x: QSpiral0 | true
+  type QSpiral3 = x: QSpiral2 | true
+
+  method Errors(x: int, s: set<int>) {
+    print x is QUp; // error: not compilable
+    print x is QDown; // error: not compilable
+    print s is QQUp; // error: not compilable
+    print s is QQDown; // error: not compilable
+    print x is QSpiral0; // error: not compilable
+    print x is QSpiral1; // error: not compilable
+    print x is QSpiral2; // error: not compilable
+    print x is QSpiral3; // error: not compilable
+    print x is QSpiral4; // error: not compilable
+  }
+}
+
+module ForallStatementRegression {
+  ghost predicate P(x: int) {
+    x != 11
+  }
+
+  newtype MyInt = x: int | -2 <= x < 16 && P(x)
+
+  method Test() {
+    var a := new int[20];
+    forall i: MyInt | 5 <= i && i as int < a.Length { // error: not compilable (since P is ghost)
+      a[i] := i as int;
+    }
+    print a[..], "\n";
+  }
+}
+
+module Collections {
+  newtype IntSet = s: set<int> | true
+
+  method TestSet() {
+    var s: IntSet := {};
+    var u: set<int> := {};
+    u := s; // error: needs "as"
+    s := u; // error: needs "as"
+    u := s as set<int>; // like this!
+    s := u as IntSet; // like this!
+  }
+}
+
+module ArrowBaseTypes {
+  newtype GeneralArrow = f: int ~> real | true // error: cannot base newtype on arrow type
+  newtype PartialArrow = f: (bv8, bv9, char) ~> (ghost int, ghost bv2) | true // error: cannot base newtype on arrow type
+  newtype TotalArrow = f: () -> bool | true // error: cannot base newtype on arrow type
+
+  type ArrowSubsetType = f: (int) --> int | true
+  newtype NewtypeOnArrowSubsetType = g: ArrowSubsetType | true // error: cannot base newtype on any arrow type
+
+  trait Trait { const u: int }
+  type SmallTrait = t: Trait | t.u == 18
+  newtype NewSmallTrait = st: SmallTrait | true // error: cannot base newtype on any kind of trait
+
+  type RestrictedOrdinal = o: ORDINAL | true
+  newtype NewRestrictedOrdinal = st: SmallTrait | true // error: cannot base newtype on any kind of ORDINAL
+}
+
+module SubSequences {
+  newtype MySequence = s: seq<int> | true
+  newtype AnotherSequence = s: seq<int> | true
+
+  method FromSeqToMySequence(s: seq<int>) returns (r: MySequence)
+    requires |s| == 4
+  {
+    r := s[..2]; // error: cannot assign seq to MySequence (without a cast)
+    r := s[2..]; // error: cannot assign seq to MySequence (without a cast)
+    r := s[1..3]; // error: cannot assign seq to MySequence (without a cast)
+    r := s[..]; // error: cannot assign seq to MySequence (without a cast)
+  }
+
+  method FromSeqToMySequenceWithCasts(s: seq<int>) returns (r: MySequence)
+    requires |s| == 4
+  {
+    r := s[..2] as MySequence;
+    r := s[2..] as MySequence;
+    r := s[1..3] as MySequence;
+    r := s[..] as MySequence;
+  }
+
+  method FromAnotherSequenceToMySequence(s: AnotherSequence) returns (r: MySequence)
+    requires |s| == 4
+  {
+    r := s[..2]; // error: cannot assign AnotherSequence to MySequence (without a cast)
+    r := s[2..]; // error: cannot assign AnotherSequence to MySequence (without a cast)
+    r := s[1..3]; // error: cannot assign AnotherSequence to MySequence (without a cast)
+    r := s[..]; // error: cannot assign AnotherSequence to MySequence (without a cast)
+  }
+
+  method FromAnotherSequenceToMySequenceWithCasts(s: AnotherSequence) returns (r: MySequence)
+    requires |s| == 4
+  {
+    r := s[..2] as MySequence;
+    r := s[2..] as MySequence;
+    r := s[1..3] as MySequence;
+    r := s[..] as MySequence;
+  }
+
+  method FromMySequenceToMySequence(s: MySequence) returns (r: MySequence)
+    requires |s| == 4
+  {
+    r := s[..2];
+    r := s[2..];
+    r := s[1..3];
+    r := s[..];
+  }
+
+  method FromMySequenceToSeq(s: MySequence) returns (r: seq<int>)
+    requires |s| == 4
+  {
+    r := s[..2]; // error: cannot assign MySequence to seq (without a cast)
+    r := s[2..]; // error: cannot assign MySequence to seq (without a cast)
+    r := s[1..3]; // error: cannot assign MySequence to seq (without a cast)
+    r := s[..]; // error: cannot assign MySequence to seq (without a cast)
+  }
+
+  method FromMySequenceToSeqWithCasts(s: MySequence) returns (r: seq<int>)
+    requires |s| == 4
+  {
+    r := s[..2] as seq<int>;
+    r := s[2..] as seq<int>;
+    r := s[1..3] as seq<int>;
+    r := s[..] as seq<int>;
+  }
+
+  method FromArrayToMySequence(arr: array<int>) returns (r: MySequence)
+    requires arr.Length == 4
+  {
+    r := arr[..2];
+    r := arr[2..];
+    r := arr[1..3];
+    r := arr[..];
+  }
+}
+
+module TLAStyleOperators {
+  newtype MyBool = bool
+
+  function A(): MyBool {
+    && true
+  }
+
+  function B(b: MyBool): MyBool {
+    && b
+  }
+
+  function C(b: bool): MyBool {
+    && b // error: got bool, expected MyBool
+  }
+
+  function D(x: int): MyBool {
+    && x // error: got int, expected MyBool
+  }
+
+  function E(): MyBool {
+    && true
+    && false
+  }
+
+  function F(b: bool): MyBool {
+    && true
+    && b // error: got bool, expected MyBool
+  }
+
+  predicate P(b: MyBool) {
+    b // error: got bool, expected MyBool
+  }
+
+  predicate Q(b: MyBool) {
+    && b // error: got bool, expected MyBool
+  }
+
+  predicate R(b: MyBool) {
+    && b && b // error: got bool, expected MyBool
+  }
+
+  predicate S(b: MyBool) {
+    && b as bool
+  }
+
+  predicate T(b: MyBool) {
+    && (b as bool) // same as in S
+  }
+
+  predicate U(b: MyBool) {
+    (&& b) as bool
+  }
+}
+
+module TypeParametersForNewtypes {
+  newtype Wrapper<G> = g: G | true witness *  // (error under /generalNewtypes:0)
+
+  method Test0() {
+    var wb: Wrapper;
+    wb := true; // error: cannot assign bool to a Wrapper
+  }
+
+  method Test1(b: bool) {
+    var wb: Wrapper;
+    wb := b; // error: cannot assign bool to a Wrapper
+  }
+
+  method Test2(b: bool) {
+    var wb: Wrapper<bool>;
+    wb := b; // error: cannot assign bool to a Wrapper<bool>
+  }
+
+  method Test3(b: bool) {
+    var wb: Wrapper;
+    wb := b as Wrapper; // error: not enough is known about the target type to determine if this is legal
+  }
+
+  method Test4(b: bool) {
+    var wb: Wrapper<bool>;
+    wb := b as Wrapper;
+  }
+
+  method Test5(b: bool) {
+    var wb: Wrapper;
+    wb := b as Wrapper<bool>;
+  }
+
+  method Test6(b: bool) {
+    var wb: Wrapper<bool>;
+    wb := b as Wrapper<bool>;
+  }
+}
+
+module TypeParametersForSubsetTypes {
+  type Wrapper<G> = g: G | true witness *
+
+  method Test0() {
+    var wb: Wrapper;
+    wb := true;
+  }
+
+  method Test1(b: bool) {
+    var wb: Wrapper;
+    wb := b;
+  }
+
+  method Test2(b: bool) {
+    var wb: Wrapper<bool>;
+    wb := b;
+  }
+
+  method Test3(b: bool) {
+    var wb: Wrapper;
+    wb := b as Wrapper; // error: not enough is known about the target type to determine if this is legal
+  }
+
+  method Test4(b: bool) {
+    var wb: Wrapper<bool>;
+    wb := b as Wrapper;
+  }
+
+  method Test5(b: bool) {
+    var wb: Wrapper;
+    wb := b as Wrapper<bool>;
+  }
+
+  method Test6(b: bool) {
+    var wb: Wrapper<bool>;
+    wb := b as Wrapper<bool>;
+  }
+}
+
+module TypeParametersForTypeSynonyms {
+  type Wrapper<G> = G
+
+  method Test0() {
+    var wb: Wrapper;
+    wb := true;
+  }
+
+  method Test1(b: bool) {
+    var wb: Wrapper;
+    wb := b;
+  }
+
+  method Test2(b: bool) {
+    var wb: Wrapper<bool>;
+    wb := b;
+  }
+
+  method Test3(b: bool) {
+    var wb: Wrapper;
+    wb := b as Wrapper; // error: not enough is known about the target type to determine if this is legal
+  }
+
+  method Test4(b: bool) {
+    var wb: Wrapper<bool>;
+    wb := b as Wrapper;
+  }
+
+  method Test5(b: bool) {
+    var wb: Wrapper;
+    wb := b as Wrapper<bool>;
+  }
+
+  method Test6(b: bool) {
+    var wb: Wrapper<bool>;
+    wb := b as Wrapper<bool>;
+  }
+}
+
+module TypeVarianceIsUsedCorrectly {
+  datatype P0<X> = R(f: int -> X)
+  datatype P1<!X> = R(f: int -> X)
+  datatype P2<+X> = R(f: int -> X)
+  datatype P3<*X> = R(f: int -> X)
+  datatype P4<-X> = R(f: int -> X) // error
+
+  datatype M0<X> = R(f: X -> int) // error
+  datatype M1<!X> = R(f: X -> int)
+  datatype M2<+X> = R(f: X -> int) // error
+  datatype M3<*X> = R(f: X -> int) // error
+  datatype M4<-X> = R(f: X -> int)
+
+  newtype Co0<X> = s: seq<int -> X> | true
+  newtype Co1<!X> = s: seq<int -> X> | true
+  newtype Co2<+X> = s: seq<int -> X> | true
+  newtype Co3<*X> = s: seq<int -> X> | true
+  newtype Co4<-X> = s: seq<int -> X> | true // error: X is not used properly
+
+  newtype Contra0<X> = s: seq<X -> int> | true // error: X is not used properly
+  newtype Contra1<!X> = s: seq<X -> int> | true
+  newtype Contra2<+X> = s: seq<X -> int> | true // error: X is not used properly
+  newtype Contra3<*X> = s: seq<X -> int> | true // error: X is not used properly
+  newtype Contra4<-X> = s: seq<X -> int> | true
+}
+
+module TypeCharacteristicsAreUsedCorrectly {
+  export
+    provides A0, A1, A2, A3, B0, B1, B2, B3
+    provides G0, G1, G2, G3, H0, H1, H2, H3
+
+  type NeedsEq<X(==)>
+  type NeedsAutoInit<X(0)>
+  type NeedsNonempty<X(00)>
+  type NeedsNoReferences<X(!new)>
+
+  newtype A0<Y> = NeedsEq<Y> // error: Y does not support (==)
+  newtype A1<Y> = NeedsAutoInit<Y> // error: Y does not support (0)
+  newtype A2<Y> = NeedsNonempty<Y> // error: Y does not support (00)
+  newtype A3<Y> = NeedsNoReferences<Y> // error: Y does not support (!new)
+
+  newtype B0<Z(==)> = NeedsEq<Z>
+  newtype B1<Z(0)> = NeedsAutoInit<Z>
+  newtype B2<Z(00)> = NeedsNonempty<Z>
+  newtype B3<Z(!new)> = NeedsNoReferences<Z>
+
+  type G0<Y> = NeedsEq<Y> // error: Y does not support (==)
+  type G1<Y> = NeedsAutoInit<Y> // error: Y does not support (0)
+  type G2<Y> = NeedsNonempty<Y> // error: Y does not support (00)
+  type G3<Y> = NeedsNoReferences<Y> // error: Y does not support (!new)
+
+  type H0<Z(==)> = NeedsEq<Z>
+  type H1<Z(0)> = NeedsAutoInit<Z>
+  type H2<Z(00)> = NeedsNonempty<Z>
+  type H3<Z(!new)> = NeedsNoReferences<Z>
+}
+
+module EqualitySupportInference {
+  export
+    reveals *
+
+  type NeedsEq<X(==)>
+
+  type Z0<Y> = NeedsEq<Y> // no problem, because Y is inferred to be (==)
+  newtype A0<Y> = NeedsEq<Y> // no problem, because Y is inferred to be (==)
+}
+
+module RefinementBase {
+  type A<T>
+
+  type N<V, W(0), X(00), Y(==), YY, Z(!new), ZZ>
+  type O<V, W(0), X(00), Y(==), YY, Z(!new), ZZ>
+
+  type V<+A, B, -C>
+  type W<+A, B, -C>
+}
+
+module RefinementSubsetTypes refines RefinementBase {
+  type A<U> = x: int | true // error: type-parameter renaming is not allowed in refinement
+
+  type N<V, W(0), X(00), Y(==), YY, Z(!new), ZZ> = x: int | true
+  type O<
+    V(0), // error: refinement cannot change type characteristics
+    W(00), // error: refinement cannot change type characteristics
+    X, // error: refinement cannot change type characteristics
+    Y, // error: refinement cannot change type characteristics
+    YY(==), // error: refinement cannot change type characteristics
+    Z, // error: refinement cannot change type characteristics
+    ZZ(!new) // error: refinement cannot change type characteristics
+  > = x: int | true
+
+  type V<+A, B, -C> = x: int | true
+  type W<
+    -A, // error: refinement cannot change variance
+    +B, // error: refinement cannot change variance
+    C // error: refinement cannot change variance
+  > = x: int | true
+}
+
+module RefinementNewtypes refines RefinementBase {
+  newtype A<U> = x: int | true // error: type-parameter renaming is not allowed in refinement
+
+  newtype N<V, W(0), X(00), Y(==), YY, Z(!new), ZZ> = x: int | true
+  newtype O<
+    V(0), // error: refinement cannot change type characteristics
+    W(00), // error: refinement cannot change type characteristics
+    X, // error: refinement cannot change type characteristics
+    Y, // error: refinement cannot change type characteristics
+    YY(==), // error: refinement cannot change type characteristics
+    Z, // error: refinement cannot change type characteristics
+    ZZ(!new) // error: refinement cannot change type characteristics
+  > = x: int | true
+
+  newtype V<+A, B, -C> = x: int | true
+  newtype W<
+    -A, // error: refinement cannot change variance
+    +B, // error: refinement cannot change variance
+    C // error: refinement cannot change variance
+  > = x: int | true
+}
+
+module Cycle0 {
+  newtype W<X> = X
+  newtype A = w: W<A> | true // error: cycle: A -> A
+}
+
+module Cycle1 {
+  newtype W<X> = X
+  newtype A = W<A> // error: cycle: A -> A
+}
+
+module Cycle2 {
+  newtype W<X> = X
+  type A = W<A> // error: cycle: A -> A
+}
+
+module Cycle3 {
+  type W<X> = X
+  newtype A = W<A> // error: cycle: A -> A
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeResolution.dfy.expect
new file mode 100644
index 00000000000..da8c7fbe034
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeResolution.dfy.expect
@@ -0,0 +1,365 @@
+GeneralNewtypeResolution.dfy(28,10): Error: a newtype ('NotNumeric0') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(29,10): Error: a newtype ('NotNumeric1') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(30,10): Error: a newtype ('NotNumeric2') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(34,10): Error: a newtype ('MyOrdinal') must be based on some numeric type (got ORDINAL)
+GeneralNewtypeResolution.dfy(40,10): Error: a newtype ('MyObject') must be based on some numeric type (got object)
+GeneralNewtypeResolution.dfy(41,10): Error: a newtype ('MyTrait') must be based on some numeric type (got Trait)
+GeneralNewtypeResolution.dfy(42,10): Error: a newtype ('MyReferenceTrait') must be based on some numeric type (got ReferenceTrait)
+GeneralNewtypeResolution.dfy(43,10): Error: a newtype ('MyCell?') must be based on some numeric type (got Cell?)
+GeneralNewtypeResolution.dfy(44,10): Error: a newtype ('MyCell') must be based on some numeric type (got Cell)
+GeneralNewtypeResolution.dfy(69,10): Error: a newtype ('NotNumeric') must be based on some numeric type (got True)
+GeneralNewtypeResolution.dfy(70,10): Error: a newtype ('NotNumeric'') must be based on some numeric type (got True)
+GeneralNewtypeResolution.dfy(75,10): Error: a newtype ('MyOrdinal') must be based on some numeric type (got NonFiveOrdinal)
+GeneralNewtypeResolution.dfy(85,10): Error: a newtype ('MyTrait') must be based on some numeric type (got NonFiveTrait)
+GeneralNewtypeResolution.dfy(86,10): Error: a newtype ('MyReferenceTrait') must be based on some numeric type (got NonFiveReferenceTrait)
+GeneralNewtypeResolution.dfy(87,10): Error: a newtype ('MyCell?') must be based on some numeric type (got NonFiveCell?)
+GeneralNewtypeResolution.dfy(88,10): Error: a newtype ('MyCell') must be based on some numeric type (got NonFiveCell)
+GeneralNewtypeResolution.dfy(92,10): Error: a newtype ('TrueBool') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(93,10): Error: a newtype ('FalseBool') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(106,6): Error: RHS (of type FalseBool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(107,6): Error: RHS (of type bool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(110,6): Error: RHS (of type FalseBool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(111,6): Error: RHS (of type bool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(114,6): Error: RHS (of type FalseBool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(115,6): Error: RHS (of type bool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(118,6): Error: RHS (of type FalseBool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(119,6): Error: RHS (of type bool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(122,6): Error: RHS (of type FalseBool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(123,6): Error: RHS (of type bool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(133,10): Error: a newtype ('MyBool') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(134,10): Error: a newtype ('AnyBool') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(135,10): Error: a newtype ('TrueBool') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(140,10): Error: a newtype ('FermatBool') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(145,10): Error: a newtype ('GhostBool') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(189,10): Error: a newtype ('TrueAsCanBe') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(197,10): Error: a newtype ('MyChar') must be based on some numeric type (got char)
+GeneralNewtypeResolution.dfy(198,10): Error: a newtype ('UpperCase') must be based on some numeric type (got char)
+GeneralNewtypeResolution.dfy(215,11): Error: arguments to <= must have a common supertype (got UpperCase and MyChar)
+GeneralNewtypeResolution.dfy(216,11): Error: arguments to >= must have a common supertype (got UpperCase and MyChar)
+GeneralNewtypeResolution.dfy(214,11): Error: arguments to < must have a common supertype (got UpperCase and MyChar)
+GeneralNewtypeResolution.dfy(217,11): Error: arguments to > must have a common supertype (got UpperCase and MyChar)
+GeneralNewtypeResolution.dfy(206,11): Error: arguments must have comparable types (got MyChar and UpperCase)
+GeneralNewtypeResolution.dfy(231,8): Error: Duplicate local-variable name: d
+GeneralNewtypeResolution.dfy(233,8): Error: Duplicate local-variable name: v
+GeneralNewtypeResolution.dfy(228,16): Error: type of right argument to + (UpperCase) must agree with the result type (MyChar)
+GeneralNewtypeResolution.dfy(229,17): Error: type of right argument to + (MyChar) must agree with the result type (char)
+GeneralNewtypeResolution.dfy(245,10): Error: a newtype ('BV') must be based on some numeric type (got bv17)
+GeneralNewtypeResolution.dfy(246,10): Error: a newtype ('Word') must be based on some numeric type (got bv32)
+GeneralNewtypeResolution.dfy(247,10): Error: a newtype ('Big') must be based on some numeric type (got bv1024)
+GeneralNewtypeResolution.dfy(266,11): Error: type of right argument to + (Word) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(268,11): Error: type of right argument to * (bv17) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(269,11): Error: type of right argument to / (bv32) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(270,11): Error: type of right argument to % (bv1024) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(275,11): Error: type of right argument to & (BV) must agree with the result type (bv17)
+GeneralNewtypeResolution.dfy(275,6): Error: RHS (of type bv17) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(276,11): Error: type of right argument to | (BV) must agree with the result type (bv32)
+GeneralNewtypeResolution.dfy(276,6): Error: RHS (of type bv32) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(277,11): Error: type of right argument to ^ (BV) must agree with the result type (Big)
+GeneralNewtypeResolution.dfy(277,6): Error: RHS (of type Big) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(282,16): Error: type of left argument to << (bv32) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(283,16): Error: type of left argument to >> (bv32) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(267,11): Error: type of right argument to - (BV) must agree with the result type (Big)
+GeneralNewtypeResolution.dfy(286,11): Error: member 'RotateLeft' does not exist in newtype 'BV'
+GeneralNewtypeResolution.dfy(287,11): Error: member 'RotateRight' does not exist in newtype 'BV'
+GeneralNewtypeResolution.dfy(288,11): Error: member 'RotateLeft' does not exist in newtype 'BV'
+GeneralNewtypeResolution.dfy(289,6): Error: RHS (of type bv32) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(294,11): Error: arguments to <= must have a common supertype (got BV and bv32)
+GeneralNewtypeResolution.dfy(295,11): Error: arguments to >= must have a common supertype (got BV and bv1024)
+GeneralNewtypeResolution.dfy(293,11): Error: arguments to < must have a common supertype (got BV and bv17)
+GeneralNewtypeResolution.dfy(296,11): Error: arguments to > must have a common supertype (got BV and Big)
+GeneralNewtypeResolution.dfy(256,11): Error: arguments must have comparable types (got BV and Word)
+GeneralNewtypeResolution.dfy(257,11): Error: arguments must have comparable types (got BV and bv17)
+GeneralNewtypeResolution.dfy(258,11): Error: arguments must have comparable types (got BV and bv32)
+GeneralNewtypeResolution.dfy(259,11): Error: arguments must have comparable types (got BV and int)
+GeneralNewtypeResolution.dfy(260,11): Error: arguments must have comparable types (got BV and int32)
+GeneralNewtypeResolution.dfy(302,6): Error: RHS (of type Word) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(303,6): Error: RHS (of type Big) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(304,6): Error: RHS (of type bv17) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(305,6): Error: RHS (of type bv32) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(306,6): Error: RHS (of type bv1024) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(307,6): Error: RHS (of type int) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(308,6): Error: RHS (of type int32) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(343,10): Error: a newtype ('BV') must be based on some numeric type (got bv17)
+GeneralNewtypeResolution.dfy(344,10): Error: a newtype ('Word') must be based on some numeric type (got bv32)
+GeneralNewtypeResolution.dfy(345,10): Error: a newtype ('Big') must be based on some numeric type (got bv1024)
+GeneralNewtypeResolution.dfy(369,11): Error: member 'RotateLeft' does not exist in newtype 'BV'
+GeneralNewtypeResolution.dfy(370,11): Error: member 'RotateRight' does not exist in newtype 'BV'
+GeneralNewtypeResolution.dfy(369,25): Error: type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got ?65)
+GeneralNewtypeResolution.dfy(370,33): Error: type conversion to a bitvector-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got ?67)
+GeneralNewtypeResolution.dfy(395,10): Error: a newtype ('BV') must be based on some numeric type (got bv17)
+GeneralNewtypeResolution.dfy(399,11): Error: member 'RotateLeft' does not exist in newtype 'BV'
+GeneralNewtypeResolution.dfy(403,11): Error: member 'RotateRight' does not exist in newtype 'BV'
+GeneralNewtypeResolution.dfy(408,10): Error: a newtype ('BV') must be based on some numeric type (got bv17)
+GeneralNewtypeResolution.dfy(409,10): Error: a newtype ('Word') must be based on some numeric type (got bv32)
+GeneralNewtypeResolution.dfy(411,10): Error: a newtype ('GhostBits') must be based on some numeric type (got bv109)
+GeneralNewtypeResolution.dfy(443,31): Error: a newtype ('BB0') must be based on some numeric type (got bv325)
+GeneralNewtypeResolution.dfy(444,31): Error: a newtype ('BB1') must be based on some numeric type (got bv325)
+GeneralNewtypeResolution.dfy(452,31): Error: a newtype ('ZZ0') must be based on some numeric type (got bv0)
+GeneralNewtypeResolution.dfy(453,32): Error: a newtype ('ZZ1') must be based on some numeric type (got bv0)
+GeneralNewtypeResolution.dfy(454,33): Error: a newtype ('ZZ2') must be based on some numeric type (got bv0)
+GeneralNewtypeResolution.dfy(456,32): Error: a newtype ('WW0') must be based on some numeric type (got bv7)
+GeneralNewtypeResolution.dfy(457,33): Error: a newtype ('WW1') must be based on some numeric type (got bv7)
+GeneralNewtypeResolution.dfy(458,33): Error: a newtype ('WW2') must be based on some numeric type (got bv7)
+GeneralNewtypeResolution.dfy(460,32): Error: a newtype ('D0') must be based on some numeric type (got bv13)
+GeneralNewtypeResolution.dfy(512,12): Error: an expression of type 'int' is not run-time checkable to be a 'QUp'
+GeneralNewtypeResolution.dfy(513,12): Error: an expression of type 'int' is not run-time checkable to be a 'QDown'
+GeneralNewtypeResolution.dfy(514,12): Error: an expression of type 'set<int>' is not run-time checkable to be a 'QQUp'
+GeneralNewtypeResolution.dfy(515,12): Error: an expression of type 'set<int>' is not run-time checkable to be a 'QQDown'
+GeneralNewtypeResolution.dfy(516,12): Error: an expression of type 'int' is not run-time checkable to be a 'QSpiral0'
+GeneralNewtypeResolution.dfy(517,12): Error: an expression of type 'int' is not run-time checkable to be a 'QSpiral1'
+GeneralNewtypeResolution.dfy(518,12): Error: an expression of type 'int' is not run-time checkable to be a 'QSpiral2'
+GeneralNewtypeResolution.dfy(519,12): Error: an expression of type 'int' is not run-time checkable to be a 'QSpiral3'
+GeneralNewtypeResolution.dfy(520,12): Error: an expression of type 'int' is not run-time checkable to be a 'QSpiral4'
+GeneralNewtypeResolution.dfy(533,4): Error: forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
+GeneralNewtypeResolution.dfy(541,10): Error: a newtype ('IntSet') must be based on some numeric type (got set<int>)
+GeneralNewtypeResolution.dfy(546,6): Error: RHS (of type IntSet) not assignable to LHS (of type set<int>)
+GeneralNewtypeResolution.dfy(547,6): Error: RHS (of type set<int>) not assignable to LHS (of type IntSet)
+GeneralNewtypeResolution.dfy(554,10): Error: a newtype ('GeneralArrow') must be based on some numeric type (got int ~> real)
+GeneralNewtypeResolution.dfy(555,10): Error: a newtype ('PartialArrow') must be based on some numeric type (got (bv8, bv9, char) ~> (ghost int, ghost bv2))
+GeneralNewtypeResolution.dfy(556,10): Error: a newtype ('TotalArrow') must be based on some numeric type (got () -> bool)
+GeneralNewtypeResolution.dfy(559,10): Error: a newtype ('NewtypeOnArrowSubsetType') must be based on some numeric type (got ArrowSubsetType)
+GeneralNewtypeResolution.dfy(563,10): Error: a newtype ('NewSmallTrait') must be based on some numeric type (got SmallTrait)
+GeneralNewtypeResolution.dfy(566,10): Error: a newtype ('NewRestrictedOrdinal') must be based on some numeric type (got SmallTrait)
+GeneralNewtypeResolution.dfy(570,10): Error: a newtype ('MySequence') must be based on some numeric type (got seq<int>)
+GeneralNewtypeResolution.dfy(571,10): Error: a newtype ('AnotherSequence') must be based on some numeric type (got seq<int>)
+GeneralNewtypeResolution.dfy(576,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (seq<int>)
+GeneralNewtypeResolution.dfy(577,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (seq<int>)
+GeneralNewtypeResolution.dfy(578,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (seq<int>)
+GeneralNewtypeResolution.dfy(579,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (seq<int>)
+GeneralNewtypeResolution.dfy(594,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (AnotherSequence)
+GeneralNewtypeResolution.dfy(595,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (AnotherSequence)
+GeneralNewtypeResolution.dfy(596,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (AnotherSequence)
+GeneralNewtypeResolution.dfy(597,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (AnotherSequence)
+GeneralNewtypeResolution.dfy(621,10): Error: resulting sequence (seq<?94>) type does not agree with source sequence type (MySequence)
+GeneralNewtypeResolution.dfy(622,10): Error: resulting sequence (seq<?95>) type does not agree with source sequence type (MySequence)
+GeneralNewtypeResolution.dfy(623,10): Error: resulting sequence (seq<?96>) type does not agree with source sequence type (MySequence)
+GeneralNewtypeResolution.dfy(624,10): Error: resulting sequence (seq<?97>) type does not agree with source sequence type (MySequence)
+GeneralNewtypeResolution.dfy(647,10): Error: a newtype ('MyBool') must be based on some numeric type (got bool)
+GeneralNewtypeResolution.dfy(657,11): Error: Function body type mismatch (expected MyBool, got bool)
+GeneralNewtypeResolution.dfy(661,11): Error: Function body type mismatch (expected MyBool, got int)
+GeneralNewtypeResolution.dfy(662,4): Error: boolean literal used as if it had type int
+GeneralNewtypeResolution.dfy(662,4): Error: type of && must be a boolean (got int)
+GeneralNewtypeResolution.dfy(670,11): Error: Function body type mismatch (expected MyBool, got bool)
+GeneralNewtypeResolution.dfy(675,12): Error: Function body type mismatch (expected bool, got MyBool)
+GeneralNewtypeResolution.dfy(679,12): Error: Function body type mismatch (expected bool, got MyBool)
+GeneralNewtypeResolution.dfy(683,12): Error: Function body type mismatch (expected bool, got MyBool)
+GeneralNewtypeResolution.dfy(701,10): Error: a newtype ('Wrapper') must be based on some numeric type (got G)
+GeneralNewtypeResolution.dfy(705,10): Error: boolean literal used as if it had type Wrapper<?0>
+GeneralNewtypeResolution.dfy(710,7): Error: RHS (of type bool) not assignable to LHS (of type Wrapper<?2>)
+GeneralNewtypeResolution.dfy(715,7): Error: RHS (of type bool) not assignable to LHS (of type Wrapper<bool>)
+GeneralNewtypeResolution.dfy(720,12): Error: type conversion target type not determined (got 'Wrapper<?4>')
+GeneralNewtypeResolution.dfy(759,12): Error: type conversion target type not determined (got '?4')
+GeneralNewtypeResolution.dfy(798,12): Error: type conversion target type not determined (got '?4')
+GeneralNewtypeResolution.dfy(830,10): Error: a newtype ('Co0') must be based on some numeric type (got seq<int -> X>)
+GeneralNewtypeResolution.dfy(831,10): Error: a newtype ('Co1') must be based on some numeric type (got seq<int -> X>)
+GeneralNewtypeResolution.dfy(832,10): Error: a newtype ('Co2') must be based on some numeric type (got seq<int -> X>)
+GeneralNewtypeResolution.dfy(833,10): Error: a newtype ('Co3') must be based on some numeric type (got seq<int -> X>)
+GeneralNewtypeResolution.dfy(834,10): Error: a newtype ('Co4') must be based on some numeric type (got seq<int -> X>)
+GeneralNewtypeResolution.dfy(836,10): Error: a newtype ('Contra0') must be based on some numeric type (got seq<X -> int>)
+GeneralNewtypeResolution.dfy(837,10): Error: a newtype ('Contra1') must be based on some numeric type (got seq<X -> int>)
+GeneralNewtypeResolution.dfy(838,10): Error: a newtype ('Contra2') must be based on some numeric type (got seq<X -> int>)
+GeneralNewtypeResolution.dfy(839,10): Error: a newtype ('Contra3') must be based on some numeric type (got seq<X -> int>)
+GeneralNewtypeResolution.dfy(840,10): Error: a newtype ('Contra4') must be based on some numeric type (got seq<X -> int>)
+GeneralNewtypeResolution.dfy(853,10): Error: a newtype ('A0') must be based on some numeric type (got NeedsEq<Y>)
+GeneralNewtypeResolution.dfy(854,10): Error: a newtype ('A1') must be based on some numeric type (got NeedsAutoInit<Y>)
+GeneralNewtypeResolution.dfy(855,10): Error: a newtype ('A2') must be based on some numeric type (got NeedsNonempty<Y>)
+GeneralNewtypeResolution.dfy(856,10): Error: a newtype ('A3') must be based on some numeric type (got NeedsNoReferences<Y>)
+GeneralNewtypeResolution.dfy(858,10): Error: a newtype ('B0') must be based on some numeric type (got NeedsEq<Z>)
+GeneralNewtypeResolution.dfy(859,10): Error: a newtype ('B1') must be based on some numeric type (got NeedsAutoInit<Z>)
+GeneralNewtypeResolution.dfy(860,10): Error: a newtype ('B2') must be based on some numeric type (got NeedsNonempty<Z>)
+GeneralNewtypeResolution.dfy(861,10): Error: a newtype ('B3') must be based on some numeric type (got NeedsNoReferences<Z>)
+GeneralNewtypeResolution.dfy(881,10): Error: a newtype ('A0') must be based on some numeric type (got NeedsEq<Y>)
+GeneralNewtypeResolution.dfy(895,9): Error: type parameters are not allowed to be renamed from the names given in the type in the module being refined (expected 'T', found 'U')
+GeneralNewtypeResolution.dfy(899,4): Error: type parameter 'V' is not allowed to change the requirement of supporting auto-initialization
+GeneralNewtypeResolution.dfy(900,4): Error: type parameter 'W' is not allowed to change the requirement of supporting auto-initialization
+GeneralNewtypeResolution.dfy(901,4): Error: type parameter 'X' is not allowed to change the requirement of being nonempty
+GeneralNewtypeResolution.dfy(902,4): Error: type parameter 'Y' is not allowed to change the requirement of supporting equality
+GeneralNewtypeResolution.dfy(903,4): Error: type parameter 'YY' is not allowed to change the requirement of supporting equality
+GeneralNewtypeResolution.dfy(904,4): Error: type parameter 'Z' is not allowed to change the no-reference-type requirement
+GeneralNewtypeResolution.dfy(905,4): Error: type parameter 'ZZ' is not allowed to change the no-reference-type requirement
+GeneralNewtypeResolution.dfy(910,5): Error: type parameter 'A' is not allowed to change variance (here, from '+' to '-')
+GeneralNewtypeResolution.dfy(911,5): Error: type parameter 'B' is not allowed to change variance (here, from '=' to '+')
+GeneralNewtypeResolution.dfy(912,4): Error: type parameter 'C' is not allowed to change variance (here, from '-' to '=')
+GeneralNewtypeResolution.dfy(917,12): Error: type parameters are not allowed to be renamed from the names given in the newtype in the module being refined (expected 'T', found 'U')
+GeneralNewtypeResolution.dfy(921,4): Error: type parameter 'V' is not allowed to change the requirement of supporting auto-initialization
+GeneralNewtypeResolution.dfy(922,4): Error: type parameter 'W' is not allowed to change the requirement of supporting auto-initialization
+GeneralNewtypeResolution.dfy(923,4): Error: type parameter 'X' is not allowed to change the requirement of being nonempty
+GeneralNewtypeResolution.dfy(924,4): Error: type parameter 'Y' is not allowed to change the requirement of supporting equality
+GeneralNewtypeResolution.dfy(925,4): Error: type parameter 'YY' is not allowed to change the requirement of supporting equality
+GeneralNewtypeResolution.dfy(926,4): Error: type parameter 'Z' is not allowed to change the no-reference-type requirement
+GeneralNewtypeResolution.dfy(927,4): Error: type parameter 'ZZ' is not allowed to change the no-reference-type requirement
+GeneralNewtypeResolution.dfy(932,5): Error: type parameter 'A' is not allowed to change variance (here, from '+' to '-')
+GeneralNewtypeResolution.dfy(933,5): Error: type parameter 'B' is not allowed to change variance (here, from '=' to '+')
+GeneralNewtypeResolution.dfy(934,4): Error: type parameter 'C' is not allowed to change variance (here, from '-' to '=')
+GeneralNewtypeResolution.dfy(940,10): Error: recursive constraint dependency involving a newtype: A -> A
+GeneralNewtypeResolution.dfy(945,10): Error: recursive constraint dependency involving a newtype: A -> A
+GeneralNewtypeResolution.dfy(950,7): Error: type-synonym cycle: A -> A
+GeneralNewtypeResolution.dfy(955,10): Error: recursive constraint dependency involving a newtype: A -> A
+197 resolution/type errors detected in GeneralNewtypeResolution.dfy
+GeneralNewtypeResolution.dfy(34,10): Error: a newtype ('MyOrdinal') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got ORDINAL)
+GeneralNewtypeResolution.dfy(40,10): Error: a newtype ('MyObject') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got object)
+GeneralNewtypeResolution.dfy(41,10): Error: a newtype ('MyTrait') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got Trait)
+GeneralNewtypeResolution.dfy(42,10): Error: a newtype ('MyReferenceTrait') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got ReferenceTrait)
+GeneralNewtypeResolution.dfy(43,10): Error: a newtype ('MyCell?') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got Cell?)
+GeneralNewtypeResolution.dfy(44,10): Error: a newtype ('MyCell') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got Cell)
+GeneralNewtypeResolution.dfy(75,10): Error: a newtype ('MyOrdinal') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got NonFiveOrdinal)
+GeneralNewtypeResolution.dfy(85,10): Error: a newtype ('MyTrait') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got NonFiveTrait)
+GeneralNewtypeResolution.dfy(86,10): Error: a newtype ('MyReferenceTrait') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got NonFiveReferenceTrait)
+GeneralNewtypeResolution.dfy(87,10): Error: a newtype ('MyCell?') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got NonFiveCell?)
+GeneralNewtypeResolution.dfy(88,10): Error: a newtype ('MyCell') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got NonFiveCell)
+GeneralNewtypeResolution.dfy(106,6): Error: RHS (of type FalseBool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(107,6): Error: RHS (of type bool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(110,6): Error: RHS (of type FalseBool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(111,6): Error: RHS (of type bool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(114,6): Error: RHS (of type FalseBool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(115,6): Error: RHS (of type bool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(118,6): Error: RHS (of type FalseBool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(119,6): Error: RHS (of type bool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(122,6): Error: RHS (of type FalseBool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(123,6): Error: RHS (of type bool) not assignable to LHS (of type TrueBool)
+GeneralNewtypeResolution.dfy(180,13): Error: an expression of type 'bool' is not run-time checkable to be a 'FermatBool'
+GeneralNewtypeResolution.dfy(182,13): Error: an expression of type 'bool' is not run-time checkable to be a 'GhostBool'
+GeneralNewtypeResolution.dfy(184,13): Error: an expression of type 'bool' is not run-time checkable to be a 'OnTopOfGhostBool'
+GeneralNewtypeResolution.dfy(215,11): Error: arguments to <= must have a common supertype (got UpperCase and MyChar)
+GeneralNewtypeResolution.dfy(216,11): Error: arguments to >= must have a common supertype (got UpperCase and MyChar)
+GeneralNewtypeResolution.dfy(214,11): Error: arguments to < must have a common supertype (got UpperCase and MyChar)
+GeneralNewtypeResolution.dfy(217,11): Error: arguments to > must have a common supertype (got UpperCase and MyChar)
+GeneralNewtypeResolution.dfy(206,11): Error: arguments must have comparable types (got MyChar and UpperCase)
+GeneralNewtypeResolution.dfy(231,8): Error: Duplicate local-variable name: d
+GeneralNewtypeResolution.dfy(233,8): Error: Duplicate local-variable name: v
+GeneralNewtypeResolution.dfy(228,16): Error: type of right argument to + (UpperCase) must agree with the result type (MyChar)
+GeneralNewtypeResolution.dfy(229,17): Error: type of right argument to + (MyChar) must agree with the result type (char)
+GeneralNewtypeResolution.dfy(239,11): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got MyChar)
+GeneralNewtypeResolution.dfy(240,11): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got UpperCase)
+GeneralNewtypeResolution.dfy(266,11): Error: type of right argument to + (Word) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(268,11): Error: type of right argument to * (bv17) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(269,11): Error: type of right argument to / (bv32) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(270,11): Error: type of right argument to % (bv1024) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(275,11): Error: type of right argument to & (BV) must agree with the result type (bv17)
+GeneralNewtypeResolution.dfy(275,6): Error: RHS (of type bv17) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(276,11): Error: type of right argument to | (BV) must agree with the result type (bv32)
+GeneralNewtypeResolution.dfy(276,6): Error: RHS (of type bv32) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(277,11): Error: type of right argument to ^ (BV) must agree with the result type (Big)
+GeneralNewtypeResolution.dfy(277,6): Error: RHS (of type Big) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(282,16): Error: type of left argument to << (bv32) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(283,16): Error: type of left argument to >> (bv32) must agree with the result type (BV)
+GeneralNewtypeResolution.dfy(267,11): Error: type of right argument to - (BV) must agree with the result type (Big)
+GeneralNewtypeResolution.dfy(286,37): Error: incorrect argument type for function parameter 'w' (expected nat, found int32)
+GeneralNewtypeResolution.dfy(287,23): Error: incorrect argument type for function parameter 'w' (expected nat, found int32)
+GeneralNewtypeResolution.dfy(289,6): Error: RHS (of type bv32) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(294,11): Error: arguments to <= must have a common supertype (got BV and bv32)
+GeneralNewtypeResolution.dfy(295,11): Error: arguments to >= must have a common supertype (got BV and bv1024)
+GeneralNewtypeResolution.dfy(293,11): Error: arguments to < must have a common supertype (got BV and bv17)
+GeneralNewtypeResolution.dfy(296,11): Error: arguments to > must have a common supertype (got BV and Big)
+GeneralNewtypeResolution.dfy(256,11): Error: arguments must have comparable types (got BV and Word)
+GeneralNewtypeResolution.dfy(257,11): Error: arguments must have comparable types (got BV and bv17)
+GeneralNewtypeResolution.dfy(258,11): Error: arguments must have comparable types (got BV and bv32)
+GeneralNewtypeResolution.dfy(259,11): Error: arguments must have comparable types (got BV and int)
+GeneralNewtypeResolution.dfy(260,11): Error: arguments must have comparable types (got BV and int32)
+GeneralNewtypeResolution.dfy(302,6): Error: RHS (of type Word) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(303,6): Error: RHS (of type Big) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(304,6): Error: RHS (of type bv17) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(305,6): Error: RHS (of type bv32) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(306,6): Error: RHS (of type bv1024) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(307,6): Error: RHS (of type int) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(308,6): Error: RHS (of type int32) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(399,6): Error: RHS (of type bv17) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(403,6): Error: RHS (of type bv17) not assignable to LHS (of type BV)
+GeneralNewtypeResolution.dfy(422,15): Error: GhostBits is a newtype and its constraint is not compilable, hence it cannot yet be used as the type of a bound variable in set comprehension.
+GeneralNewtypeResolution.dfy(411,47): Related location: The constraint is not compilable because a call to a ghost predicate is allowed only in specification contexts (consider declaring the predicate without the 'ghost' keyword)
+GeneralNewtypeResolution.dfy(434,13): Error: type conversion to a char type is allowed only from numeric and bitvector types, char, and ORDINAL (got bv5)
+GeneralNewtypeResolution.dfy(441,30): Error: :nativeType can only be used on a newtype based on integers or bitvectors
+GeneralNewtypeResolution.dfy(443,31): Error: The width of bitvector type bv325 cannot fit into native type 'uint'. Note: constraints of bitvector-based newtypes are not considered when determining native types.
+GeneralNewtypeResolution.dfy(444,31): Error: The width of bitvector type bv325 cannot fit into native type 'uint'.
+GeneralNewtypeResolution.dfy(452,31): Error: A newtype based on a bitvector type (bv0) cannot use a native type that admits negative values ('long'). Hint: Try using the unsigned native type 'ulong'.
+GeneralNewtypeResolution.dfy(454,33): Error: A newtype based on a bitvector type (bv0) cannot use a native type that admits negative values ('number').
+GeneralNewtypeResolution.dfy(456,32): Error: A newtype based on a bitvector type (bv7) cannot use a native type that admits negative values ('short'). Hint: Try using the unsigned native type 'ushort'.
+GeneralNewtypeResolution.dfy(458,33): Error: A newtype based on a bitvector type (bv7) cannot use a native type that admits negative values ('number').
+GeneralNewtypeResolution.dfy(466,31): Error: The width of bitvector type bv13 cannot fit into native type 'byte'. Note: constraints of bitvector-based newtypes are not considered when determining native types.
+GeneralNewtypeResolution.dfy(512,12): Error: an expression of type 'int' is not run-time checkable to be a 'QUp'
+GeneralNewtypeResolution.dfy(513,12): Error: an expression of type 'int' is not run-time checkable to be a 'QDown'
+GeneralNewtypeResolution.dfy(514,12): Error: an expression of type 'set<int>' is not run-time checkable to be a 'QQUp'
+GeneralNewtypeResolution.dfy(515,12): Error: an expression of type 'set<int>' is not run-time checkable to be a 'QQDown'
+GeneralNewtypeResolution.dfy(516,12): Error: an expression of type 'int' is not run-time checkable to be a 'QSpiral0'
+GeneralNewtypeResolution.dfy(517,12): Error: an expression of type 'int' is not run-time checkable to be a 'QSpiral1'
+GeneralNewtypeResolution.dfy(518,12): Error: an expression of type 'int' is not run-time checkable to be a 'QSpiral2'
+GeneralNewtypeResolution.dfy(519,12): Error: an expression of type 'int' is not run-time checkable to be a 'QSpiral3'
+GeneralNewtypeResolution.dfy(520,12): Error: an expression of type 'int' is not run-time checkable to be a 'QSpiral4'
+GeneralNewtypeResolution.dfy(533,4): Error: forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
+GeneralNewtypeResolution.dfy(546,6): Error: RHS (of type IntSet) not assignable to LHS (of type set<int>)
+GeneralNewtypeResolution.dfy(547,6): Error: RHS (of type set<int>) not assignable to LHS (of type IntSet)
+GeneralNewtypeResolution.dfy(554,10): Error: a newtype ('GeneralArrow') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got int ~> real)
+GeneralNewtypeResolution.dfy(555,10): Error: a newtype ('PartialArrow') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got (bv8, bv9, char) ~> (ghost int, ghost bv2))
+GeneralNewtypeResolution.dfy(556,10): Error: a newtype ('TotalArrow') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got () -> bool)
+GeneralNewtypeResolution.dfy(559,10): Error: a newtype ('NewtypeOnArrowSubsetType') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got ArrowSubsetType)
+GeneralNewtypeResolution.dfy(563,10): Error: a newtype ('NewSmallTrait') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got SmallTrait)
+GeneralNewtypeResolution.dfy(566,10): Error: a newtype ('NewRestrictedOrdinal') must be based on some non-reference, non-trait, non-arrow, non-ORDINAL, non-datatype type (got SmallTrait)
+GeneralNewtypeResolution.dfy(576,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (seq<int>)
+GeneralNewtypeResolution.dfy(577,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (seq<int>)
+GeneralNewtypeResolution.dfy(578,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (seq<int>)
+GeneralNewtypeResolution.dfy(579,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (seq<int>)
+GeneralNewtypeResolution.dfy(594,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (AnotherSequence)
+GeneralNewtypeResolution.dfy(595,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (AnotherSequence)
+GeneralNewtypeResolution.dfy(596,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (AnotherSequence)
+GeneralNewtypeResolution.dfy(597,10): Error: resulting sequence (MySequence) type does not agree with source sequence type (AnotherSequence)
+GeneralNewtypeResolution.dfy(621,10): Error: resulting sequence (seq<?94>) type does not agree with source sequence type (MySequence)
+GeneralNewtypeResolution.dfy(622,10): Error: resulting sequence (seq<?95>) type does not agree with source sequence type (MySequence)
+GeneralNewtypeResolution.dfy(623,10): Error: resulting sequence (seq<?96>) type does not agree with source sequence type (MySequence)
+GeneralNewtypeResolution.dfy(624,10): Error: resulting sequence (seq<?97>) type does not agree with source sequence type (MySequence)
+GeneralNewtypeResolution.dfy(657,11): Error: Function body type mismatch (expected MyBool, got bool)
+GeneralNewtypeResolution.dfy(661,11): Error: Function body type mismatch (expected MyBool, got int)
+GeneralNewtypeResolution.dfy(662,4): Error: boolean literal used as if it had type int
+GeneralNewtypeResolution.dfy(662,4): Error: type of && must be a boolean (got int)
+GeneralNewtypeResolution.dfy(670,11): Error: Function body type mismatch (expected MyBool, got bool)
+GeneralNewtypeResolution.dfy(675,12): Error: Function body type mismatch (expected bool, got MyBool)
+GeneralNewtypeResolution.dfy(679,12): Error: Function body type mismatch (expected bool, got MyBool)
+GeneralNewtypeResolution.dfy(683,12): Error: Function body type mismatch (expected bool, got MyBool)
+GeneralNewtypeResolution.dfy(705,10): Error: boolean literal used as if it had type Wrapper<?0>
+GeneralNewtypeResolution.dfy(710,7): Error: RHS (of type bool) not assignable to LHS (of type Wrapper<?2>)
+GeneralNewtypeResolution.dfy(715,7): Error: RHS (of type bool) not assignable to LHS (of type Wrapper<bool>)
+GeneralNewtypeResolution.dfy(720,12): Error: type conversion target type not determined (got 'Wrapper<?4>')
+GeneralNewtypeResolution.dfy(759,12): Error: type conversion target type not determined (got '?4')
+GeneralNewtypeResolution.dfy(798,12): Error: type conversion target type not determined (got '?4')
+GeneralNewtypeResolution.dfy(822,32): Error: formal type parameter 'X' is not used according to its variance specification
+GeneralNewtypeResolution.dfy(824,24): Error: formal type parameter 'X' is not used according to its variance specification (it is used left of an arrow) (perhaps try declaring 'X' as '-X' or '!X')
+GeneralNewtypeResolution.dfy(826,25): Error: formal type parameter 'X' is not used according to its variance specification
+GeneralNewtypeResolution.dfy(827,25): Error: formal type parameter 'X' is not used according to its variance specification
+GeneralNewtypeResolution.dfy(834,34): Error: formal type parameter 'X' is not used according to its variance specification
+GeneralNewtypeResolution.dfy(836,30): Error: formal type parameter 'X' is not used according to its variance specification (it is used left of an arrow) (perhaps try declaring 'X' as '-X' or '!X')
+GeneralNewtypeResolution.dfy(838,31): Error: formal type parameter 'X' is not used according to its variance specification
+GeneralNewtypeResolution.dfy(839,31): Error: formal type parameter 'X' is not used according to its variance specification
+GeneralNewtypeResolution.dfy(853,18): Error: type parameter (X) passed to type NeedsEq must support equality (got Y) (perhaps try declaring type parameter 'Y' on line 853 as 'Y(==)', which says it can only be instantiated with a type that supports equality)
+GeneralNewtypeResolution.dfy(854,18): Error: type parameter (X) passed to type NeedsAutoInit must support auto-initialization (got Y) (perhaps try declaring type parameter 'Y' on line 854 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
+GeneralNewtypeResolution.dfy(855,18): Error: type parameter (X) passed to type NeedsNonempty must be nonempty (got Y) (perhaps try declaring type parameter 'Y' on line 855 as 'Y(00)', which says it can only be instantiated with a nonempty type)
+GeneralNewtypeResolution.dfy(856,18): Error: type parameter (X) passed to type NeedsNoReferences must contain no references (got Y) (perhaps try declaring type parameter 'Y' on line 856 as 'Y(!new)', which says it can only be instantiated with a type that contains no references)
+GeneralNewtypeResolution.dfy(863,15): Error: type parameter (X) passed to type NeedsEq must support equality (got Y) (perhaps try declaring type parameter 'Y' on line 863 as 'Y(==)', which says it can only be instantiated with a type that supports equality)
+GeneralNewtypeResolution.dfy(864,15): Error: type parameter (X) passed to type NeedsAutoInit must support auto-initialization (got Y) (perhaps try declaring type parameter 'Y' on line 864 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
+GeneralNewtypeResolution.dfy(865,15): Error: type parameter (X) passed to type NeedsNonempty must be nonempty (got Y) (perhaps try declaring type parameter 'Y' on line 865 as 'Y(00)', which says it can only be instantiated with a nonempty type)
+GeneralNewtypeResolution.dfy(866,15): Error: type parameter (X) passed to type NeedsNoReferences must contain no references (got Y) (perhaps try declaring type parameter 'Y' on line 866 as 'Y(!new)', which says it can only be instantiated with a type that contains no references)
+GeneralNewtypeResolution.dfy(895,9): Error: type parameters are not allowed to be renamed from the names given in the type in the module being refined (expected 'T', found 'U')
+GeneralNewtypeResolution.dfy(899,4): Error: type parameter 'V' is not allowed to change the requirement of supporting auto-initialization
+GeneralNewtypeResolution.dfy(900,4): Error: type parameter 'W' is not allowed to change the requirement of supporting auto-initialization
+GeneralNewtypeResolution.dfy(901,4): Error: type parameter 'X' is not allowed to change the requirement of being nonempty
+GeneralNewtypeResolution.dfy(902,4): Error: type parameter 'Y' is not allowed to change the requirement of supporting equality
+GeneralNewtypeResolution.dfy(903,4): Error: type parameter 'YY' is not allowed to change the requirement of supporting equality
+GeneralNewtypeResolution.dfy(904,4): Error: type parameter 'Z' is not allowed to change the no-reference-type requirement
+GeneralNewtypeResolution.dfy(905,4): Error: type parameter 'ZZ' is not allowed to change the no-reference-type requirement
+GeneralNewtypeResolution.dfy(910,5): Error: type parameter 'A' is not allowed to change variance (here, from '+' to '-')
+GeneralNewtypeResolution.dfy(911,5): Error: type parameter 'B' is not allowed to change variance (here, from '=' to '+')
+GeneralNewtypeResolution.dfy(912,4): Error: type parameter 'C' is not allowed to change variance (here, from '-' to '=')
+GeneralNewtypeResolution.dfy(917,12): Error: type parameters are not allowed to be renamed from the names given in the newtype in the module being refined (expected 'T', found 'U')
+GeneralNewtypeResolution.dfy(921,4): Error: type parameter 'V' is not allowed to change the requirement of supporting auto-initialization
+GeneralNewtypeResolution.dfy(922,4): Error: type parameter 'W' is not allowed to change the requirement of supporting auto-initialization
+GeneralNewtypeResolution.dfy(923,4): Error: type parameter 'X' is not allowed to change the requirement of being nonempty
+GeneralNewtypeResolution.dfy(924,4): Error: type parameter 'Y' is not allowed to change the requirement of supporting equality
+GeneralNewtypeResolution.dfy(925,4): Error: type parameter 'YY' is not allowed to change the requirement of supporting equality
+GeneralNewtypeResolution.dfy(926,4): Error: type parameter 'Z' is not allowed to change the no-reference-type requirement
+GeneralNewtypeResolution.dfy(927,4): Error: type parameter 'ZZ' is not allowed to change the no-reference-type requirement
+GeneralNewtypeResolution.dfy(932,5): Error: type parameter 'A' is not allowed to change variance (here, from '+' to '-')
+GeneralNewtypeResolution.dfy(933,5): Error: type parameter 'B' is not allowed to change variance (here, from '=' to '+')
+GeneralNewtypeResolution.dfy(934,4): Error: type parameter 'C' is not allowed to change variance (here, from '-' to '=')
+GeneralNewtypeResolution.dfy(940,10): Error: recursive constraint dependency involving a newtype: A -> A
+GeneralNewtypeResolution.dfy(945,10): Error: recursive constraint dependency involving a newtype: A -> A
+GeneralNewtypeResolution.dfy(950,7): Error: type-synonym cycle: A -> A
+GeneralNewtypeResolution.dfy(955,10): Error: recursive constraint dependency involving a newtype: A -> A
+165 resolution/type errors detected in GeneralNewtypeResolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeVerify.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeVerify.dfy
new file mode 100644
index 00000000000..38df2d5f333
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeVerify.dfy
@@ -0,0 +1,586 @@
+// RUN: %exits-with 4 %build --type-system-refresh true --general-newtypes true --relax-definite-assignment "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module EmptyBool {
+  newtype MyBool = bool
+  newtype AnyBool = b: bool | true
+  newtype NoBool = b: bool | false witness *
+
+  method M0(a: MyBool, b: AnyBool) {
+    assert false; // error
+  }
+
+  method M1(c: NoBool) {
+    assert false;
+  }
+
+  method Test() {
+    var a: MyBool := true;
+    var b: AnyBool := true;
+    var c: NoBool := true; // error: not a NoBool
+    Recursive(true);
+    NonStop(true);
+  }
+
+  method Recursive(x: AnyBool) {
+    if x {
+      Recursive(!x);
+    }
+  }
+
+  method NonStop(x: AnyBool) {
+    NonStop(!x); // error: termination failure
+  }
+
+  method Stops(x: AnyBool) {
+    if x {
+      Stops(!x);
+    }
+  }
+
+  method AllCases(m: MyBool, a: AnyBool) {
+    if
+    case !m && !a as MyBool =>
+    case !m as AnyBool && a =>
+    case m as bool && !a as bool as AnyBool as bool =>
+    case m as bool as AnyBool && a =>
+  }
+}
+
+module TrueBoolModule {
+  newtype TrueBool = b | b witness true
+
+  method M(x: TrueBool) returns (y: TrueBool)
+  {
+    assert x;
+    y := x;
+    var z := x ==> x;
+    assert z;
+  }
+
+  method Test() {
+    var b: TrueBool := true;
+    var c := M(b);
+    var d: bool := c as bool;
+    var e := M(2 < 19);
+    print b, " ", c, " ", e, "\n"; // true true true
+    Recursive(true);
+  }
+
+  method Literals() {
+    var x: TrueBool;
+    x := true;
+    x := false; // error: false is not a TrueBool
+  }
+
+  method Recursive(x: TrueBool)
+    decreases x
+  {
+    var b := x as bool;
+    if !b {
+      assert false; // we never get here
+      Recursive(false);
+    }
+  }
+
+  method IntermediateExpressions0(x: TrueBool) {
+    while x {
+      break;
+    }
+    while {
+      case false =>
+      case x => break;
+      case true => break;
+    }
+
+    if
+    case true =>
+      var u := x && !x; // error: !x is not a TrueBool
+    case x =>
+      var u := (!(x as bool) || x as bool) as TrueBool;
+  }
+
+  newtype FalseBool = b | !b
+
+  method IntermediateExpressions1(x: TrueBool, y: FalseBool) {
+    if * {
+      var _ := true && (x <==> x);
+    } else if * {
+      var _ := false || (y <==> y); // error: (y <==> y) is not a FalseBool
+    } else if * {
+      var _ := (true && x == x && !(y == y)) || false; // result is a bool, so anything goes
+    } else if * {
+      var a: TrueBool := true && x == x;
+    } else if * {
+      var _ := false || y == y; // result is a bool, so anything goes
+      var z: bool := false || y == y; // result is a bool, so anything goes
+      var b: FalseBool := false || y == y; // error: (y == y) is not a FalseBool
+    } else if * {
+      var a: TrueBool := true && y != y; // error: (y != y) is not a TrueBool
+    } else if * {
+      var b: FalseBool := false || x != x;
+    }
+  }
+
+  method IntermediateExpressions2(x: TrueBool, y: FalseBool) {
+    if * {
+      var _ := x ==> !x; // error: !x is not a TrueBool
+    } else if * {
+      var _ := x <== !x; // error: !x is not a TrueBool
+    } else if * {
+      var _ := y ==> !y; // error: (y ==> !y) is not a FalseBool
+    } else if * {
+      var _ := y <== !y; // error: !y is not a FalseBool
+    }
+  }
+
+  method IntermediateExpressions3(x: TrueBool, y: FalseBool) {
+    if * {
+      var _ := x && x;
+      var _ := x || x;
+      var _ := y && y;
+      var _ := y || y;
+    } else if * {
+      var _ := true && x && x;
+      var _ := false || x || x; // error: false is not a TrueBool
+    } else if * {
+      var _ := y || false || y;
+      var _ := y && y && true;
+      var _ := y || true || y; // error: true is not a FalseBool
+    } else if * {
+      var a0 := if x then x else !x;
+      var a1: FalseBool := if x then y else !y;
+      var a2 := if y then !y else y;
+      var a3 := if y then x else !x; // error: !x is not a TrueBool
+    }
+  }
+
+  codatatype Stream = More(Stream)
+
+  method IntermediateExpressions4(s: Stream, k: nat, o: ORDINAL, i: int) returns (ghost x: TrueBool, ghost y: FalseBool) {
+    if
+    case true =>
+      x := s ==#[k] s;
+    case true =>
+      x := s ==#[o] s;
+    case true =>
+      x := s !=#[k] s; // error: RHS is not a TrueBool
+    case true =>
+      x := s !=#[o] s; // error: RHS is not a TrueBool
+    case true =>
+      y := s ==#[k] s; // error: RHS is not a FalseBool
+    case true =>
+      y := s ==#[o] s; // error: RHS is not a FalseBool
+    case true =>
+      y := s !=#[k] s;
+    case true =>
+      y := s !=#[o] s;
+    case true =>
+      x := s ==#[i] s; // error: i may be negative
+  }
+}
+
+module NewtypesAreDistinctFromBaseType {
+  newtype MyBool = bool
+  newtype AnotherBool = b: MyBool | true
+  type JustASubsetType = b: MyBool | true
+
+  method M(a: array<bool>, b: array<MyBool>, c: array<AnotherBool>, d: array<JustASubsetType>) {
+    assert a != b as object;
+    assert a as object != b;
+
+    assert b != c as object;
+    assert b != d as object;
+    assert c != d as object;
+
+    assert false; // error
+  }
+
+  newtype TrueAsCanBe = b: bool | b witness true
+
+  method P<K>(i: int, a: array<TrueAsCanBe>, s: set<TrueAsCanBe>, k: K, m: map<K, TrueAsCanBe>)
+  {
+    if 0 <= i < a.Length {
+      assert a[i];
+    }
+    assert |s| <= 1 by {
+      assert s <= {true};
+      assert s == {} || s == {true};
+    }
+    if k in m.Keys {
+      assert m[k];
+    }
+  }
+}
+
+module Char {
+  newtype MyChar = char
+  newtype UpperCase = ch | 'A' <= ch <= 'Z' witness 'D'
+
+  method Comparisons() returns (c: MyChar, u: UpperCase, r: bool) {
+    c := 'e';
+    u := 'E';
+
+    assert c == c;
+    assert !(u != u);
+
+    r := c < c;
+    assert !r;
+    r := c <= c;
+    assert r;
+    r := c >= c;
+    assert r;
+    r := c > c;
+    assert !r;
+
+    r := u <= u <= u;
+    assert r;
+
+    if c == 'f' && u == 'D' {
+      assert false;
+    }
+  }
+
+  method MyString(s: seq<UpperCase>) {
+    if s != [] {
+      var ch := s[|s| / 2];
+      var diff := ch - 'A' + 'A'; // error: result of '-' is not an UpperCase
+      var charDiff := ch as char - 'A' + 'B';
+      assert ch == 'Z' || (charDiff as UpperCase > ch);
+      assert charDiff as int == ch as char as int + 1;
+    }
+  }
+}
+
+module Chars {
+  newtype MyChar = ch: char | ch != 'b'
+  newtype Char = char
+
+  type Subset = ch: char | ch != 'b'
+
+  method Conversions() returns (s: Subset, x: MyChar, y: Char, a: char) {
+    if
+    case true =>
+      a := a as char;
+    case true =>
+      a := a as Subset; // error: may violate constraint
+    case true =>
+      x := a as MyChar; // error: may violate constraint
+    case true =>
+      y := a as Char;
+    case true =>
+      x := y as MyChar; // error: may violate constraint
+  }
+
+  type NotRSubset = ch: char | ch != 'r'
+  newtype NotRNewtype = ch: char | ch != 'r'
+
+  method TestCharSubset() returns (ch: char, nr: NotRSubset) {
+    if
+    case true =>
+      ch := nr as char;
+    case true =>
+      nr := ch as NotRSubset; // error: might be 'r'
+    case ch != 'r' =>
+      nr := ch as NotRSubset;
+  }
+  
+  method TestCharNewtype() returns (ch: char, nr: NotRNewtype) {
+    if
+    case true =>
+      ch := nr as char;
+    case true =>
+      nr := ch as NotRNewtype; // error: might be 'r'
+    case ch != 'r' =>
+      nr := ch as NotRNewtype;
+  }
+}
+
+module Bitvectors {
+  newtype BV = b: bv5 | b != 23
+  newtype Word = bv32
+  newtype Big = b: bv1024 | true
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+
+  type Subset = b: bv5 | b != 23
+
+  method IntermediateExpressions() {
+    var fem: bv5 := 5;
+    var sju: Subset := 4 + 3;
+    var nio: BV := 1 + 8;
+
+    assert fem == 5 && sju == 7 && nio == 9;
+
+    assert 25 - 2 - 16 == 7;
+    sju := 25 - 2 - 16; // fine
+    assert 25 - 2 - 14 == 9;
+    nio := 25 - 2 - 14; // error: 25 - 2 violates the newtype constraint
+  }
+
+  method Operations(x: BV, y: Word, z: Big, a: bv5, b: bv32, c: bv1024, i: int, j: int32) returns (r: bool, s: BV) {
+    // ==
+    r := x == x;
+    r := y == y;
+    r := z == z;
+
+    r := x == 5;
+
+    // + - * / %
+    s := x + x - x * (x / x - x % x); // error: division by zero (but, amazingly, no intermediate expression is 23)
+    s := 12 + x - x * (x + 19 / 17 - x % 3); // error (x2): two of the intermediate expressions might be 23
+    s := 12 + 13 - 14 * (15 + 16 / 17 - 18 % 19);
+
+    // & | ^
+    s := (x & x) | (x ^ x ^ x);
+    s := (12 & 13) | (14 ^ 15 ^ 16);
+
+    // < <= >= >
+    r := (x <= x && x < x) || x >= x || x > x;
+    assert r; // since x >= x
+
+    if !(x as bv5) != 23 && -(x as bv5) != 23 {
+      assert !!x == x && !!y == y && z == !!z && !z == !z;
+      assert --x == x && --y == y && z == --z && -z == -z;
+    }
+    assert !(5 as bv7) == 122 && !(5 as bv3) == 2 && !(5 as bv8) == 250;
+    assert -(5 as bv7) == 123 && -(5 as bv3) == 3 && -(5 as bv8) == 251;
+  }
+
+  method Shift(x: BV, y: Word, z: Big, a: bv5, b: bv32, c: bv1024, i: int, j: int32) returns (r: bool, s: BV) {
+    // << >>
+    s := x << y; // error: shift amount might be larger than 5
+    s := x >> b; // error: shift amount might be larger than 5
+    if i < 5 {
+      s := x << i; // error: shift amount might be negative
+    }
+  }
+  
+  method Rotate(x: BV, b: bv32, i: int, j: int32) returns (r: bool, s: BV, a: bv5) {
+    //  .RotateLeft .RotateRight
+    if i < 5 {
+      a := x.RotateLeft(i); // error: argument to RotateLeft might be negative
+    }
+    
+    a := x.RotateRight(b as int); // error: argument to RotateRight might be too big
+
+    if j < 5 {
+      a := x.RotateRight(j as nat); // error: cast to BV might fail
+    }
+
+    if 0 <= j < 5 {
+      s := x.RotateRight(j as nat) as BV; // error: cast to BV might fail
+    }
+  }
+
+  method BvZero(b: bv0) returns (d: bv0) {
+    var c: bv0 := *;
+
+    d := b + c;
+    d := b - c;
+    d := b * c;
+    d := !b;
+    d := -b;
+    assert b == c && !(b != c) && b <= c && b >= c && !(b < c) && !(b > c);
+    d := b & c;
+    d := b | c;
+    d := b ^ c;
+    d := b << c;
+    d := b << 0;
+    d := b << 0 as int32;
+    d := b >> c;
+    d := b >> 0;
+    d := b >> 0 as int32;
+    d := b.RotateLeft(0);
+    d := b.RotateRight(0);
+    d := 0 as bv0;
+    var i := b as int;
+    d := 0 as int32 as bv0;
+  }
+
+  method TestsAndConversions() returns (x: BV, y: Word, z: Big, a: bv5, b: bv32, c: bv1024, i: int, j: int32, r: bool) {
+    x := 10;
+    x := x;
+  
+    r := y is Word;
+
+    if * {
+      x := 10 as BV;
+      x := x as BV;
+      x := (if y < 20 then y else 2) as BV;
+      if a != 23 {
+        x := a as BV;
+      }
+
+      ghost var bx := b & 0xF;
+      assert bx < 16;
+      ghost var bz := bx * 2;
+      assert bz < 32;
+      assert bz % 2 == 0;
+      x := ((b & 0xF) * 2) as BV;
+
+      if 0 <= i <= j as int < 23 {
+        x := i as BV;
+        x := j as BV;
+      }
+
+    } else {
+      r := 10 is bv5;
+      r := x is bv5;
+      r := y is bv5;
+      r := z is bv5;
+      r := a is bv5;
+      r := b is bv5;
+      r := c is bv5;
+      r := i is bv5;
+      r := j is bv5;
+    }
+  }
+
+  newtype GhostBits = b: bv109 | GhostPredicate(b)
+
+  ghost predicate GhostPredicate(x: bv109) {
+    true
+  }
+
+  method Comprehensions(aa: set<bv7>, bb: set<BV>, cc: set<Word>, dd: set<GhostBits>) {
+    var se0, se1, se2;
+    ghost var se3;
+    se0 := set x | x in aa;
+    se1 := set x | x in bb;
+    se2 := set x | x in cc;
+    se3 := set x | x in dd;
+  }
+}
+
+module TypeParametersForNewtype {
+  newtype Wrapper<G> = g: G | true witness *
+  method CallMe<U>(u: Wrapper<U>) returns (v: Wrapper<U>)
+
+  method Test(x: bool) returns (y: Wrapper<bool>) {
+    var b: Wrapper<bool>;
+    b := x as Wrapper<bool>;
+    y := CallMe(b);
+  }
+}
+
+module TypeParametersForSubsetType {
+  type Wrapper<G> = g: G | true witness *
+  method CallMe<U>(u: Wrapper<U>) returns (v: Wrapper<U>)
+
+  method Test(x: bool) returns (y: Wrapper<bool>) {
+    var b: Wrapper<bool>;
+    b := x as Wrapper<bool>;
+    y := CallMe(b);
+  }
+}
+
+module TypeParametersForTypeSynonym {
+  type Wrapper<G> = G
+  method CallMe<U>(u: Wrapper<U>) returns (v: Wrapper<U>)
+
+  method Test(x: bool) returns (y: Wrapper<bool>) {
+    var b: Wrapper<bool>;
+    b := x as Wrapper<bool>;
+    y := CallMe(b);
+  }
+}
+
+module ExpandToTypeParameterWithoutWitness {
+  // The following two lines once had caused a crash in the verifier
+  type A<Y> = y: Y | true // error: 
+  newtype B<Z> = z: Z | true // error: 
+}
+
+module AutoInitValueSubsetType {
+  type Never = x: int | false witness *
+  type Impossible = n: Never | true // error: default witness 0 does not satisfy constraint of base type
+
+  method Test() {
+    var x: Impossible := *;
+    assert false;
+    print 10 / x;
+  }
+}
+
+module AutoInitValueNewtype {
+  newtype Never = x: int | false witness *
+  newtype Impossible = n: Never | true // error: default witness 0 does not satisfy constraint of base type
+
+  method Test() {
+    var x: Impossible := *;
+    assert false;
+    print 10 / x;
+  }
+}
+
+module AutoInitValueNewtypeWithoutVar {
+  newtype Never = x: int | false witness *
+  newtype Impossible = Never // error: default witness 0 does not satisfy constraint of base type
+
+  method Test() {
+    var x: Impossible := *;
+    assert false;
+    print 10 / x;
+  }
+}
+
+module BaseTypeConstraintHelpsWellformednessSubsetType {
+  predicate P(x: NotSeven)
+    requires x != 6
+  {
+    true
+  }
+
+  type NotSeven = x: int | x != 7 witness *
+  type Okay = n: NotSeven | P(if 8 <= n then n else n - 1)
+  type NotWellformed = n: NotSeven | P(n) // error: precondition violation
+}
+
+module BaseTypeConstraintHelpsWellformednessNewtype {
+  predicate P(x: NotSeven)
+    requires x != 6
+  {
+    true
+  }
+
+  newtype NotSeven = x: int | x != 7 witness *
+  newtype Okay = n: NotSeven | P(if 8 <= n then n else n - 1)
+  newtype NotWellformed = n: NotSeven | P(n) // error: precondition violation
+}
+
+module SimpleNewtypeWitness {
+  newtype A = x: int | 100 <= x witness 102
+  newtype B = a: A | true witness 103
+
+  newtype C = A // error: default witness 0 does not satisfy constraint
+  newtype D = A witness 104
+  newtype E = A ghost witness 104
+  newtype F = A witness *
+
+  newtype G = A witness 13 // error: 13 does not satisfy constraint
+  newtype H = A ghost witness 13 // error: 13 does not satisfy constraint
+}
+
+/*
+module RealConversions {
+  method TestRealIsInt0(r: real)
+    requires r.Floor as real == r
+  {
+    if
+    case true =>
+      var _ := r as int;
+    case true =>
+      assert r is int;
+  }
+
+  method TestRealIsInt1(r: real)
+    requires r is int
+  {
+    if
+    case true =>
+      var _ := r as int;
+    case true =>
+      assert r.Floor as real == r;
+  }
+}
+*/
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeVerify.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeVerify.dfy.expect
new file mode 100644
index 00000000000..643fdcb9ea3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GeneralNewtypeVerify.dfy.expect
@@ -0,0 +1,52 @@
+GeneralNewtypeVerify.dfy(10,4): Error: assertion might not hold
+GeneralNewtypeVerify.dfy(20,21): Error: result of operation might violate newtype constraint for 'NoBool'
+GeneralNewtypeVerify.dfy(32,11): Error: cannot prove termination; try supplying a decreases clause
+GeneralNewtypeVerify.dfy(73,9): Error: result of operation might violate newtype constraint for 'TrueBool'
+GeneralNewtypeVerify.dfy(98,20): Error: result of operation might violate newtype constraint for 'TrueBool'
+GeneralNewtypeVerify.dfy(109,27): Error: result of operation might violate newtype constraint for 'FalseBool'
+GeneralNewtypeVerify.dfy(117,37): Error: result of operation might violate newtype constraint for 'FalseBool'
+GeneralNewtypeVerify.dfy(119,35): Error: result of operation might violate newtype constraint for 'TrueBool'
+GeneralNewtypeVerify.dfy(127,21): Error: result of operation might violate newtype constraint for 'TrueBool'
+GeneralNewtypeVerify.dfy(129,21): Error: result of operation might violate newtype constraint for 'TrueBool'
+GeneralNewtypeVerify.dfy(131,17): Error: result of operation might violate newtype constraint for 'FalseBool'
+GeneralNewtypeVerify.dfy(133,21): Error: result of operation might violate newtype constraint for 'FalseBool'
+GeneralNewtypeVerify.dfy(145,15): Error: result of operation might violate newtype constraint for 'TrueBool'
+GeneralNewtypeVerify.dfy(149,20): Error: result of operation might violate newtype constraint for 'FalseBool'
+GeneralNewtypeVerify.dfy(154,33): Error: result of operation might violate newtype constraint for 'TrueBool'
+GeneralNewtypeVerify.dfy(167,13): Error: result of operation might violate newtype constraint for 'TrueBool'
+GeneralNewtypeVerify.dfy(169,13): Error: result of operation might violate newtype constraint for 'TrueBool'
+GeneralNewtypeVerify.dfy(171,13): Error: result of operation might violate newtype constraint for 'FalseBool'
+GeneralNewtypeVerify.dfy(173,13): Error: result of operation might violate newtype constraint for 'FalseBool'
+GeneralNewtypeVerify.dfy(179,13): Error: prefix-equality limit must be at least 0
+GeneralNewtypeVerify.dfy(196,4): Error: assertion might not hold
+GeneralNewtypeVerify.dfy(247,21): Error: result of operation might violate newtype constraint for 'UpperCase'
+GeneralNewtypeVerify.dfy(266,13): Error: result of operation might violate subset type constraint for 'Subset'
+GeneralNewtypeVerify.dfy(268,13): Error: result of operation might violate newtype constraint for 'MyChar'
+GeneralNewtypeVerify.dfy(272,13): Error: result of operation might violate newtype constraint for 'MyChar'
+GeneralNewtypeVerify.dfy(283,15): Error: result of operation might violate subset type constraint for 'NotRSubset'
+GeneralNewtypeVerify.dfy(293,15): Error: result of operation might violate newtype constraint for 'NotRNewtype'
+GeneralNewtypeVerify.dfy(317,14): Error: result of operation might violate newtype constraint for 'BV'
+GeneralNewtypeVerify.dfy(329,24): Error: possible division by zero
+GeneralNewtypeVerify.dfy(330,12): Error: result of operation might violate newtype constraint for 'BV'
+GeneralNewtypeVerify.dfy(330,25): Error: result of operation might violate newtype constraint for 'BV'
+GeneralNewtypeVerify.dfy(351,11): Error: shift amount must not exceed the width of the result (5)
+GeneralNewtypeVerify.dfy(352,11): Error: shift amount must not exceed the width of the result (5)
+GeneralNewtypeVerify.dfy(354,13): Error: shift amount must be non-negative
+GeneralNewtypeVerify.dfy(361,23): Error: rotate amount must be non-negative
+GeneralNewtypeVerify.dfy(364,22): Error: rotate amount must not exceed the width of the result (5)
+GeneralNewtypeVerify.dfy(367,27): Error: result of operation might violate subset type constraint for 'nat'
+GeneralNewtypeVerify.dfy(371,35): Error: result of operation might violate newtype constraint for 'BV'
+GeneralNewtypeVerify.dfy(490,7): Error: cannot find witness that shows type is inhabited; try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+GeneralNewtypeVerify.dfy(491,10): Error: cannot find witness that shows type is inhabited; try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+GeneralNewtypeVerify.dfy(496,7): Error: trying witness 0: result of operation might violate subset type constraint for 'Never'
+GeneralNewtypeVerify.dfy(507,10): Error: trying witness 0: result of operation might violate newtype constraint for 'Never'
+GeneralNewtypeVerify.dfy(518,10): Error: trying witness 0: result of operation might violate newtype constraint for 'Never'
+GeneralNewtypeVerify.dfy(536,38): Error: function precondition could not be proved
+GeneralNewtypeVerify.dfy(529,15): Related location
+GeneralNewtypeVerify.dfy(548,41): Error: function precondition could not be proved
+GeneralNewtypeVerify.dfy(541,15): Related location
+GeneralNewtypeVerify.dfy(555,10): Error: trying witness 0: result of operation might violate newtype constraint for 'A'
+GeneralNewtypeVerify.dfy(560,24): Error: result of operation might violate newtype constraint for 'A'
+GeneralNewtypeVerify.dfy(561,30): Error: result of operation might violate newtype constraint for 'A'
+
+Dafny program verifier finished with 40 verified, 48 errors
diff --git a/Test/dafny0/GhostAllocations-Resolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations-Resolution.dfy
similarity index 99%
rename from Test/dafny0/GhostAllocations-Resolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations-Resolution.dfy
index 63edbcc1321..82f164f6d36 100644
--- a/Test/dafny0/GhostAllocations-Resolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations-Resolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // ------- A constructor-less class can be allocated as either ghost or non-ghost
diff --git a/Test/dafny0/GhostAllocations-Resolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations-Resolution.dfy.expect
similarity index 91%
rename from Test/dafny0/GhostAllocations-Resolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations-Resolution.dfy.expect
index cf476f9a6da..248c5a5b270 100644
--- a/Test/dafny0/GhostAllocations-Resolution.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations-Resolution.dfy.expect
@@ -33,9 +33,9 @@ GhostAllocations-Resolution.dfy(240,6): Error: print statement is not allowed in
 GhostAllocations-Resolution.dfy(248,22): Error: a hint is not allowed to use 'new'
 GhostAllocations-Resolution.dfy(249,22): Error: a hint is not allowed to use 'new'
 GhostAllocations-Resolution.dfy(249,22): Error: in a hint, calls are allowed only to lemmas
-GhostAllocations-Resolution.dfy(254,18): Error: an assert-by body is not allowed to use 'new'
-GhostAllocations-Resolution.dfy(255,18): Error: an assert-by body is not allowed to use 'new'
-GhostAllocations-Resolution.dfy(255,18): Error: in an assert-by body, calls are allowed only to lemmas
+GhostAllocations-Resolution.dfy(254,18): Error: a by block is not allowed to use 'new'
+GhostAllocations-Resolution.dfy(255,18): Error: a by block is not allowed to use 'new'
+GhostAllocations-Resolution.dfy(255,18): Error: in a by block, calls are allowed only to lemmas
 GhostAllocations-Resolution.dfy(285,11): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
 GhostAllocations-Resolution.dfy(274,11): Error: assignment to non-ghost field is not allowed in this context, because this is a ghost method
 GhostAllocations-Resolution.dfy(303,13): Error: a lemma is not allowed to use 'new'
@@ -49,7 +49,7 @@ GhostAllocations-Resolution.dfy(314,13): Error: a lemma is not allowed to use 'n
 GhostAllocations-Resolution.dfy(318,13): Error: a twostate lemma is not allowed to use 'new'
 GhostAllocations-Resolution.dfy(322,13): Error: a greatest lemma is not allowed to use 'new'
 GhostAllocations-Resolution.dfy(349,15): Error: in a statement expression, calls are allowed only to lemmas
-GhostAllocations-Resolution.dfy(361,7): Error: in an assert-by body, calls are allowed only to lemmas
+GhostAllocations-Resolution.dfy(361,7): Error: in a by block, calls are allowed only to lemmas
 GhostAllocations-Resolution.dfy(369,5): Error: in a lemma, calls are allowed only to lemmas
 GhostAllocations-Resolution.dfy(376,11): Error: in a hint, calls are allowed only to lemmas
 GhostAllocations-Resolution.dfy(384,11): Error: in a hint, calls are allowed only to lemmas
@@ -60,12 +60,12 @@ GhostAllocations-Resolution.dfy(406,4): Error: a modify statement is not allowed
 GhostAllocations-Resolution.dfy(407,4): Error: a modify statement is not allowed in a lemma
 GhostAllocations-Resolution.dfy(409,13): Error: a lemma is not allowed to use 'new'
 GhostAllocations-Resolution.dfy(410,6): Error: a lemma is not allowed to make heap updates
-GhostAllocations-Resolution.dfy(416,17): Error: a loop in an assert-by body is not allowed to use 'modifies' clauses
-GhostAllocations-Resolution.dfy(421,17): Error: a loop in an assert-by body is not allowed to use 'modifies' clauses
-GhostAllocations-Resolution.dfy(426,17): Error: a loop in an assert-by body is not allowed to use 'modifies' clauses
-GhostAllocations-Resolution.dfy(430,6): Error: a modify statement is not allowed in an assert-by body
-GhostAllocations-Resolution.dfy(431,6): Error: a modify statement is not allowed in an assert-by body
-GhostAllocations-Resolution.dfy(433,15): Error: an assert-by body is not allowed to use 'new'
+GhostAllocations-Resolution.dfy(416,17): Error: a loop in a by block is not allowed to use 'modifies' clauses
+GhostAllocations-Resolution.dfy(421,17): Error: a loop in a by block is not allowed to use 'modifies' clauses
+GhostAllocations-Resolution.dfy(426,17): Error: a loop in a by block is not allowed to use 'modifies' clauses
+GhostAllocations-Resolution.dfy(430,6): Error: a modify statement is not allowed in a by block
+GhostAllocations-Resolution.dfy(431,6): Error: a modify statement is not allowed in a by block
+GhostAllocations-Resolution.dfy(433,15): Error: a by block is not allowed to use 'new'
 GhostAllocations-Resolution.dfy(485,17): Error: a loop in a forall statement is not allowed to use 'modifies' clauses
 GhostAllocations-Resolution.dfy(490,17): Error: a loop in a forall statement is not allowed to use 'modifies' clauses
 GhostAllocations-Resolution.dfy(495,17): Error: a loop in a forall statement is not allowed to use 'modifies' clauses
@@ -103,11 +103,11 @@ GhostAllocations-Resolution.dfy(600,8): Error: a hint is not allowed to perform
 GhostAllocations-Resolution.dfy(604,13): Error: a hint is not allowed to make heap updates
 GhostAllocations-Resolution.dfy(605,8): Error: a hint is not allowed to perform an aggregate heap update
 GhostAllocations-Resolution.dfy(613,11): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-GhostAllocations-Resolution.dfy(614,6): Error: an assert-by body is not allowed to perform an aggregate heap update
+GhostAllocations-Resolution.dfy(614,6): Error: a by block is not allowed to perform an aggregate heap update
 GhostAllocations-Resolution.dfy(618,16): Error: assignment to non-ghost field is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-GhostAllocations-Resolution.dfy(619,6): Error: an assert-by body is not allowed to perform an aggregate heap update
-GhostAllocations-Resolution.dfy(623,11): Error: an assert-by body is not allowed to make heap updates
-GhostAllocations-Resolution.dfy(624,6): Error: an assert-by body is not allowed to perform an aggregate heap update
+GhostAllocations-Resolution.dfy(619,6): Error: a by block is not allowed to perform an aggregate heap update
+GhostAllocations-Resolution.dfy(623,11): Error: a by block is not allowed to make heap updates
+GhostAllocations-Resolution.dfy(624,6): Error: a by block is not allowed to perform an aggregate heap update
 GhostAllocations-Resolution.dfy(632,11): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
 GhostAllocations-Resolution.dfy(633,6): Error: a forall statement is not allowed to perform an aggregate heap update
 GhostAllocations-Resolution.dfy(637,16): Error: assignment to non-ghost field is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
diff --git a/Test/dafny0/GhostAllocations.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations.dfy
similarity index 97%
rename from Test/dafny0/GhostAllocations.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations.dfy
index 49815e0b623..91b15d9d185 100644
--- a/Test/dafny0/GhostAllocations.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class Cell {
   var data: int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations.dfy.expect
new file mode 100644
index 00000000000..582ee6bc26a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAllocations.dfy.expect
@@ -0,0 +1,18 @@
+GhostAllocations.dfy(88,11): Warning: the modify statement with a block statement is deprecated
+GhostAllocations.dfy(99,13): Warning: the modify statement with a block statement is deprecated
+GhostAllocations.dfy(28,4): Error: assertion might not hold
+GhostAllocations.dfy(31,4): Error: assertion might not hold
+GhostAllocations.dfy(63,2): Error: assertion might not hold
+GhostAllocations.dfy(76,2): Error: assertion might not hold
+GhostAllocations.dfy(82,2): Error: assertion might not hold
+GhostAllocations.dfy(93,2): Error: assertion might not hold
+GhostAllocations.dfy(105,2): Error: assertion might not hold
+GhostAllocations.dfy(138,2): Error: field 'g', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+GhostAllocations.dfy(177,2): Error: field 'h', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+GhostAllocations.dfy(180,2): Error: field 'g', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+GhostAllocations.dfy(180,2): Error: field 'h', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+GhostAllocations.dfy(184,2): Error: field 'h', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+GhostAllocations.dfy(187,2): Error: field 'g', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+GhostAllocations.dfy(187,2): Error: field 'h', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+
+Dafny program verifier finished with 6 verified, 14 errors
diff --git a/Test/dafny0/GhostAutoInit.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAutoInit.dfy
similarity index 99%
rename from Test/dafny0/GhostAutoInit.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAutoInit.dfy
index 6e0fe30f671..fde58e68512 100644
--- a/Test/dafny0/GhostAutoInit.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAutoInit.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module DeclaredTypes {
diff --git a/Test/dafny0/GhostAutoInit.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAutoInit.dfy.expect
similarity index 100%
rename from Test/dafny0/GhostAutoInit.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostAutoInit.dfy.expect
diff --git a/Test/dafny0/GhostDatatypeConstructors-Resolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Resolution.dfy
similarity index 99%
rename from Test/dafny0/GhostDatatypeConstructors-Resolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Resolution.dfy
index 6a3674ae0ee..1ff851749b0 100644
--- a/Test/dafny0/GhostDatatypeConstructors-Resolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Resolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Types {
diff --git a/Test/dafny0/GhostDatatypeConstructors-Resolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Resolution.dfy.expect
similarity index 98%
rename from Test/dafny0/GhostDatatypeConstructors-Resolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Resolution.dfy.expect
index 54a81dca448..5aceb627740 100644
--- a/Test/dafny0/GhostDatatypeConstructors-Resolution.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Resolution.dfy.expect
@@ -6,7 +6,7 @@ GhostDatatypeConstructors-Resolution.dfy(44,12): Error: field 'y' can be used on
 GhostDatatypeConstructors-Resolution.dfy(45,12): Error: field 'w' can be used only in specification contexts
 GhostDatatypeConstructors-Resolution.dfy(46,9): Error: ghost variables such as xy are allowed only in specification contexts. xy was inferred to be ghost based on its declaration or initialization.
 GhostDatatypeConstructors-Resolution.dfy(101,17): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-GhostDatatypeConstructors-Resolution.dfy(218,7): Error: type parameter (T) passed to function Eq must support equality (got XY)
+GhostDatatypeConstructors-Resolution.dfy(218,9): Error: type parameter (T) passed to function Eq must support equality (got XY)
 GhostDatatypeConstructors-Resolution.dfy(234,11): Error: ghost constructor is allowed only in specification contexts
 GhostDatatypeConstructors-Resolution.dfy(248,11): Error: ghost variables such as c are allowed only in specification contexts. c was inferred to be ghost based on its declaration or initialization.
 GhostDatatypeConstructors-Resolution.dfy(258,6): Error: ghost constructor is allowed only in specification contexts
diff --git a/Test/dafny0/GhostDatatypeConstructors-Verification.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Verification.dfy
similarity index 98%
rename from Test/dafny0/GhostDatatypeConstructors-Verification.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Verification.dfy
index a3c34dedfb8..60127cc4bc3 100644
--- a/Test/dafny0/GhostDatatypeConstructors-Verification.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Verification.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Types {
diff --git a/Test/dafny0/GhostDatatypeConstructors-Verification.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Verification.dfy.expect
similarity index 100%
rename from Test/dafny0/GhostDatatypeConstructors-Verification.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostDatatypeConstructors-Verification.dfy.expect
diff --git a/Test/dafny0/GhostGuards.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostGuards.dfy
similarity index 82%
rename from Test/dafny0/GhostGuards.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostGuards.dfy
index cb572a7de2d..790b482a941 100644
--- a/Test/dafny0/GhostGuards.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostGuards.dfy
@@ -1,5 +1,4 @@
-// NONUNIFORM: need to add support for tooltips to the new CLI (if that makes sense)
-// RUN: %dafny /compile:3 /printTooltips /rprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --show-hints --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Dt = Green | Dog
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostGuards.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostGuards.dfy.expect
new file mode 100644
index 00000000000..8bb8a71d69d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostGuards.dfy.expect
@@ -0,0 +1,7 @@
+GhostGuards.dfy(12,9): Info: ghost if
+GhostGuards.dfy(18,2): Info: ghost if
+GhostGuards.dfy(28,2): Info: ghost while
+GhostGuards.dfy(41,2): Info: ghost while
+GhostGuards.dfy(54,2): Info: ghost match
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/dafny0/GhostITECompilation.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy
similarity index 92%
rename from Test/dafny0/GhostITECompilation.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy
index bd7cfa28a95..aa42cd1050c 100644
--- a/Test/dafny0/GhostITECompilation.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --function-syntax:4 --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --function-syntax:4 --relax-definite-assignment --allow-warnings
 
 function F(x: nat, ghost y: nat): nat
 {
diff --git a/Test/dafny0/GhostITECompilation.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy.expect
similarity index 100%
rename from Test/dafny0/GhostITECompilation.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy.verifier.expect
new file mode 100644
index 00000000000..54185781e88
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITECompilation.dfy.verifier.expect
@@ -0,0 +1 @@
+GhostITECompilation.dfy(52,25): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless function together with the {:axiom} attribute instead
diff --git a/Test/dafny0/GhostITEResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITEResolution.dfy
similarity index 97%
rename from Test/dafny0/GhostITEResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITEResolution.dfy
index 5cef0c0aeb3..4990856caf9 100644
--- a/Test/dafny0/GhostITEResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITEResolution.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /functionSyntax:4 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 function E(x: nat, ghost y: nat): nat
 {
diff --git a/Test/dafny0/GhostITEResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITEResolution.dfy.expect
similarity index 100%
rename from Test/dafny0/GhostITEResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostITEResolution.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostPrint.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostPrint.dfy
new file mode 100644
index 00000000000..bcf160c168f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostPrint.dfy
@@ -0,0 +1,12 @@
+// RUN: %resolve --print:"%t.dprint.dfy" "%s"
+// RUN: %resolve "%t.dprint.dfy" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method M() {
+  ghost var h := var ta := F(); 5;
+  var j := ghost var tb := F(); 5;
+  assert h == j;
+}
+
+ghost function F(): int { 5 }
+
diff --git a/Test/git-issues/git-issue-3496.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostPrint.dfy.expect
old mode 100644
new mode 100755
similarity index 100%
rename from Test/git-issues/git-issue-3496.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/GhostPrint.dfy.expect
diff --git a/Test/dafny0/IMaps.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps.dfy
similarity index 95%
rename from Test/dafny0/IMaps.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps.dfy
index 8568c8c78d5..687f8f781c6 100644
--- a/Test/dafny0/IMaps.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation
+
 
 // This method can be used to test compilation.
 ghost method M()
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps.dfy.expect
new file mode 100644
index 00000000000..2b345c100f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps.dfy.expect
@@ -0,0 +1,7 @@
+IMaps.dfy(36,18): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+IMaps.dfy(36,49): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+IMaps.dfy(51,18): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+IMaps.dfy(79,33): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+IMaps.dfy(52,7): Error: element might not be in domain
+
+Dafny program verifier finished with 14 verified, 1 error
diff --git a/Test/dafny0/IMaps2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps2.dfy
similarity index 81%
rename from Test/dafny0/IMaps2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps2.dfy
index fdd78d8f909..cbc15854161 100644
--- a/Test/dafny0/IMaps2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps2.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 ghost function domain<U, V>(m: imap<U,V>): set<U>
    // ensures forall i :: i in domain(m) <==> i in m
diff --git a/Test/dafny0/IMaps2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps2.dfy.expect
similarity index 100%
rename from Test/dafny0/IMaps2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IMaps2.dfy.expect
diff --git a/Test/dafny0/ISets.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ISets.dfy
similarity index 76%
rename from Test/dafny0/ISets.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ISets.dfy
index 7e5dcdefbe9..ccb837a7d66 100644
--- a/Test/dafny0/ISets.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ISets.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost method M()
 {
@@ -35,9 +35,9 @@ ghost method m1() {
  assert s2 - s3 == iset{3}; // set difference
 
  assert (iset x | x in s2 :: x+1) == iset{2,3,4}; // set comprehension
- assert 17 in (iset x: int | true :: x); // set comprehension
+ assert 17 in (iset x: int {:trigger} | true :: x); // set comprehension
 
- assert (imap x: int | true :: x+1)[14] == 15;
+ assert (imap x: int {:trigger} | true :: x+1)[14] == 15;
 }
 
 
diff --git a/Test/dafny1/ListReverse.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ISets.dfy.expect
similarity index 100%
rename from Test/dafny1/ListReverse.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ISets.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ImplicitTypeParamPrint.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ImplicitTypeParamPrint.dfy
new file mode 100644
index 00000000000..7a1fef2df30
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ImplicitTypeParamPrint.dfy
@@ -0,0 +1,41 @@
+// NONUNIFORM: Multiple tests in one, fairly C# specific
+// RUN: %resolve --rprint "%t.dfy" "%s"
+// RUN: %resolve --print-mode Serialization --rprint "%t1.dfy" "%t.dfy"
+// RUN: %run --print-mode Serialization --rprint "%t2.dfy" "%t1.dfy" > "%t"
+// RUN: %diff "%t1.dfy" "%t2.dfy"
+// RUN: %diff "%s.expect" "%t"
+
+datatype List<T> = Nil | Cons(car: T, cdr: List)
+
+function funkyNil(l: List): List
+{
+  match l
+  case Cons(x, y) => funkyNil(y)
+  case Nil => l
+}
+
+method H(a: array, l: List)
+{
+  match l
+  case Cons(x, y) =>
+    if a.Length > 0 && a[0] == x {
+    }
+  case Nil =>
+}
+
+method Main() {
+  var xs := Cons(28, Cons(22, Cons(28, Cons(5, Nil))));
+  var a := new [][60, 60];
+  var nil := funkyNil(xs);
+  H(a, xs);
+  print nil, "\n";
+  print nonExtendedPrintExpr(xs), "\n";
+}
+
+function nonExtendedPrintExpr(l: List): int
+{
+  25 +
+  match l
+  case Cons(x, y) => 10
+  case Nil => 11
+}
diff --git a/Test/dafny0/ImplicitTypeParamPrint.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ImplicitTypeParamPrint.dfy.expect
similarity index 100%
rename from Test/dafny0/ImplicitTypeParamPrint.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ImplicitTypeParamPrint.dfy.expect
diff --git a/Test/dafny0/InSetComprehension.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InSetComprehension.dfy
similarity index 95%
rename from Test/dafny0/InSetComprehension.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InSetComprehension.dfy
index 6c04ec6b9c7..9fe5db38ffa 100644
--- a/Test/dafny0/InSetComprehension.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InSetComprehension.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" --allow-warnings > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 lemma Tests<T>(t: T, uu: seq<T>) returns (z: bool)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InSetComprehension.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InSetComprehension.dfy.expect
new file mode 100644
index 00000000000..071f0763f21
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InSetComprehension.dfy.expect
@@ -0,0 +1,20 @@
+InSetComprehension.dfy(10,17): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+InSetComprehension.dfy(12,17): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+InSetComprehension.dfy(14,16): Info: Selected triggers: {Even(m)}
+InSetComprehension.dfy(16,17): Info: Selected triggers: {u in uu}
+InSetComprehension.dfy(18,17): Info: The attribute {:autotriggers false} may cause brittle verification. It's better to remove this attribute, or as a second option, manually define a trigger using {:trigger}. For more information, see the section quantifier instantiation rules in the reference manual.
+InSetComprehension.dfy(28,16): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+InSetComprehension.dfy(30,16): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+InSetComprehension.dfy(33,16): Info: Selected triggers: {Even(m)}
+InSetComprehension.dfy(37,16): Info: Selected triggers: {u in uu}
+InSetComprehension.dfy(39,16): Info: The attribute {:autotriggers false} may cause brittle verification. It's better to remove this attribute, or as a second option, manually define a trigger using {:trigger}. For more information, see the section quantifier instantiation rules in the reference manual.
+InSetComprehension.dfy(76,13): Info: Selected triggers: {x in si}
+InSetComprehension.dfy(78,13): Info: Selected triggers: {y in ti}
+InSetComprehension.dfy(81,13): Info: Selected triggers: {n in si}
+InSetComprehension.dfy(82,5): Info: Selected triggers: {si[i]}
+InSetComprehension.dfy(53,24): Info: Selected triggers: {x in elems}
+InSetComprehension.dfy(51,25): Info: Selected triggers: {x in elems}
+InSetComprehension.dfy(67,24): Info: Selected triggers: {x in elems}
+InSetComprehension.dfy(65,25): Info: Selected triggers: {x in elems}
+
+Dafny program verifier finished with 8 verified, 0 errors
diff --git a/Test/dafny0/Include.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Include.dfy
similarity index 82%
rename from Test/dafny0/Include.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Include.dfy
index bb890cf0258..8dd2ad148f4 100644
--- a/Test/dafny0/Include.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Include.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
-// RUN: %exits-with 4 %baredafny verify %args --verify-included-files "%s" >> "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %exits-with 4 %verify --verify-included-files "%s" >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 include "Includee.dfy"
diff --git a/Test/dafny0/Include.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Include.dfy.expect
similarity index 78%
rename from Test/dafny0/Include.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Include.dfy.expect
index aaec77291aa..b3877ae649c 100644
--- a/Test/dafny0/Include.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Include.dfy.expect
@@ -1,22 +1,22 @@
 Include.dfy(32,7): Warning: the ... refinement feature in statements is deprecated
-Include.dfy(20,11): Error: a postcondition could not be proved on this return path
+Include.dfy(22,6): Error: a postcondition could not be proved on this return path
 Includee.dfy(17,19): Related location: this is the postcondition that could not be proved
-Includee.dfy[Concrete](22,15): Error: assertion could not be proved
+Includee.dfy[Concrete](22,15): Error: assertion might not hold
 Include.dfy(28,6): Error: a postcondition could not be proved on this return path
 Includee.dfy[Concrete](20,14): Related location: this is the postcondition that could not be proved
 
 Dafny program verifier finished with 1 verified, 3 errors
 Include.dfy(32,7): Warning: the ... refinement feature in statements is deprecated
+Includee.dfy(6,0): Error: a postcondition could not be proved on this return path
+Includee.dfy(5,12): Related location: this is the postcondition that could not be proved
+Includee.dfy(7,0): Error: out-parameter 'y', which is subject to definite-assignment rules, might be uninitialized at this return point
 Includee.dfy(21,2): Error: a postcondition could not be proved on this return path
 Includee.dfy(20,14): Related location: this is the postcondition that could not be proved
-Includee.dfy(24,17): Error: assertion could not be proved
-Include.dfy(20,11): Error: a postcondition could not be proved on this return path
+Includee.dfy(24,4): Error: assertion might not hold
+Include.dfy(22,6): Error: a postcondition could not be proved on this return path
 Includee.dfy(17,19): Related location: this is the postcondition that could not be proved
-Includee.dfy[Concrete](22,15): Error: assertion could not be proved
+Includee.dfy[Concrete](22,15): Error: assertion might not hold
 Include.dfy(28,6): Error: a postcondition could not be proved on this return path
 Includee.dfy[Concrete](20,14): Related location: this is the postcondition that could not be proved
-Includee.dfy(6,0): Error: a postcondition could not be proved on this return path
-Includee.dfy(5,12): Related location: this is the postcondition that could not be proved
-Includee.dfy(7,0): Error: out-parameter 'y', which is subject to definite-assignment rules, might be uninitialized at this return point
 
 Dafny program verifier finished with 2 verified, 7 errors
diff --git a/Test/dafny0/Includee.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Includee.dfy
similarity index 83%
rename from Test/dafny0/Includee.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Includee.dfy
index 709baa035ff..85f3e3a9b79 100644
--- a/Test/dafny0/Includee.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Includee.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method m_unproven(x:int) returns (y:int)
diff --git a/Test/dafny0/Includee.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Includee.dfy.expect
similarity index 87%
rename from Test/dafny0/Includee.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Includee.dfy.expect
index 0477bd8af96..6986a9c9417 100644
--- a/Test/dafny0/Includee.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Includee.dfy.expect
@@ -1,7 +1,7 @@
-Includee.dfy(21,2): Error: a postcondition could not be proved on this return path
-Includee.dfy(20,14): Related location: this is the postcondition that could not be proved
-Includee.dfy(24,17): Error: assertion could not be proved
 Includee.dfy(6,0): Error: a postcondition could not be proved on this return path
 Includee.dfy(5,12): Related location: this is the postcondition that could not be proved
+Includee.dfy(21,2): Error: a postcondition could not be proved on this return path
+Includee.dfy(20,14): Related location: this is the postcondition that could not be proved
+Includee.dfy(24,4): Error: assertion might not hold
 
 Dafny program verifier finished with 1 verified, 3 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IndexIntoUpdate.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IndexIntoUpdate.dfy
new file mode 100644
index 00000000000..5ea9bbc6c18
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IndexIntoUpdate.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+method M()  {
+  var s := [1, 2, 3, 4];
+  assert 3 in s;
+  s := s[0 := 1];
+  if * { assert 3 in s; } // FIXME: This should verify
+  else { assert s[2] == 3; assert 3 in s; }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IndexIntoUpdate.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IndexIntoUpdate.dfy.expect
new file mode 100644
index 00000000000..cddc725af25
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IndexIntoUpdate.dfy.expect
@@ -0,0 +1,3 @@
+IndexIntoUpdate.dfy(7,9): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny0/InductivePredicates.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InductivePredicates.dfy
similarity index 78%
rename from Test/dafny0/InductivePredicates.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InductivePredicates.dfy
index ff4d6626289..b78017eb2b9 100644
--- a/Test/dafny0/InductivePredicates.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InductivePredicates.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 datatype natinf = N(n: nat) | Inf
 
@@ -259,10 +259,37 @@ module SomeCoolDisjunctionTests {
     P(x)
   }
 
-  least lemma L[ORDINAL](x: int)
-    requires P(x) || Q(x)
+  least lemma L[ORDINAL](x: int, b: bool)
+    requires (b && P(x)) || (!b && Q(x))
     ensures false  // fine
   {
+    // The following proof should not be necessary. This lemma used to verify
+    // automatically, but after a change with CanCall, it stopped verifying.
+    // The problem may be due to https://github.com/Z3Prover/z3/issues/7444.
+    // After it is fixed, we should try removing the following lines again.
+
+    // After some more changes to Dafny, this test is failing again. And again,
+    // the problem seems to be due an issue in Z3. Annoyingly, the part Z3
+    // can't figure out is in the _k.IsLimit case, which Dafny fills in automatically
+    // and gives no way for a user to interact with. By introducing an "if" statement
+    //     if (_module.__default.P_h($LS($LS($LZ)), _k#0, x#1)) {
+    //     } else {
+    //       assert _module.__default.Q_h($LS($LS($LZ)), _k#0, x#1);
+    //     }
+    // in Boogie (inside the _k.IsLimit branch), Z3 completes the proof. So, it
+    // seems the boolean that Boogie introduces for the control flow somehow helps.
+    // For this reason, the parameter "b: bool" was introduced above. Apparently,
+    // it is enough to get Z3 in a better mood to complete the proof. Once this has
+    // been fixed in Z3, this boolean parameter should be removed from this test again.
+
+    assert !_k.IsLimit;
+    if b && P#[_k](x) {
+      assert P#[_k](x) == Q#[_k - 1](x);
+      L(x, !b);
+    } else {
+      assert !b && Q#[_k](x);
+      L(x, !b);
+    }
   }
 
   least predicate Pn[nat](x: int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InductivePredicates.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InductivePredicates.dfy.expect
new file mode 100644
index 00000000000..f446ce813f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InductivePredicates.dfy.expect
@@ -0,0 +1,4 @@
+InductivePredicates.dfy(80,2): Error: assertion might not hold
+InductivePredicates.dfy(92,14): Error: assertion might not hold
+
+Dafny program verifier finished with 32 verified, 2 errors
diff --git a/Test/dafny0/InitialValues.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InitialValues.dfy
similarity index 88%
rename from Test/dafny0/InitialValues.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InitialValues.dfy
index 0848d244d71..4a268d8edd6 100644
--- a/Test/dafny0/InitialValues.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InitialValues.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main()
 {
diff --git a/Test/dafny0/InitialValues.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InitialValues.dfy.expect
similarity index 100%
rename from Test/dafny0/InitialValues.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InitialValues.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InitialValues.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InitialValues.dfy.rs.check
new file mode 100644
index 00000000000..e2c2d7720f6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/InitialValues.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: cannot add `Rc<num_rational::Ratio<BigInt>>` to `num_rational::Ratio<BigInt>`
\ No newline at end of file
diff --git a/Test/dafny0/Input/IncludesTuples.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Input/IncludesTuples.dfy
similarity index 78%
rename from Test/dafny0/Input/IncludesTuples.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Input/IncludesTuples.dfy
index 480f19bf3c7..daf58aae43e 100644
--- a/Test/dafny0/Input/IncludesTuples.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Input/IncludesTuples.dfy
@@ -1,6 +1,6 @@
 // RUN: echo Input for Stdin.dfy
 // Note that the current directory for .NET tests is always the output directory
 // for the IntegrationTests project.
-// i.e. something like IntegrationTests/bin/Debug/net6.0
+// i.e. something like IntegrationTests/bin/Debug/net8.0
 
 include "TestFiles/LitTests/LitTest/dafny0/Tuples.dfy"
\ No newline at end of file
diff --git a/Test/dafny0/Inverses.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Inverses.dfy
similarity index 98%
rename from Test/dafny0/Inverses.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Inverses.dfy
index f918569e7d6..463ecdb8b6c 100644
--- a/Test/dafny0/Inverses.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Inverses.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This identity function is used to so that if the occurrence of i below
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Inverses.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Inverses.dfy.expect
new file mode 100644
index 00000000000..ad7225bfbe9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Inverses.dfy.expect
@@ -0,0 +1,8 @@
+Inverses.dfy(68,0): Error: a postcondition could not be proved on this return path
+Inverses.dfy(67,10): Related location: this is the postcondition that could not be proved
+Inverses.dfy(80,0): Error: a postcondition could not be proved on this return path
+Inverses.dfy(79,10): Related location: this is the postcondition that could not be proved
+Inverses.dfy(192,0): Error: a postcondition could not be proved on this return path
+Inverses.dfy(191,15): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 31 verified, 3 errors
diff --git a/Test/dafny0/IteratorResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IteratorResolution.dfy
similarity index 99%
rename from Test/dafny0/IteratorResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IteratorResolution.dfy
index c13e60c392a..2ab2c0d61c8 100644
--- a/Test/dafny0/IteratorResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IteratorResolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module SimplestIter {
diff --git a/Test/dafny0/IteratorResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IteratorResolution.dfy.expect
similarity index 96%
rename from Test/dafny0/IteratorResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IteratorResolution.dfy.expect
index 985ba4bbf12..92422484fdc 100644
--- a/Test/dafny0/IteratorResolution.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/IteratorResolution.dfy.expect
@@ -2,7 +2,7 @@ IteratorResolution.dfy(22,9): Error: LHS of assignment must denote a mutable fie
 IteratorResolution.dfy(24,9): Error: LHS of assignment must denote a mutable field
 IteratorResolution.dfy(64,9): Error: LHS of assignment must denote a mutable field
 IteratorResolution.dfy(69,18): Error: arguments must have comparable types (got _T0 and int)
-IteratorResolution.dfy(84,16): Error: incorrect argument type for constructor in-parameter 't' (expected bool, found int)
+IteratorResolution.dfy(84,36): Error: incorrect argument type for constructor in-parameter 't' (expected bool, found int)
 IteratorResolution.dfy(81,19): Error: RHS (of type bool) not assignable to LHS (of type int)
 IteratorResolution.dfy(129,11): Error: unresolved identifier: _decreases3
 IteratorResolution.dfy(131,4): Error: LHS of assignment must denote a mutable field
@@ -21,8 +21,8 @@ IteratorResolution.dfy(173,40): Error: type parameter 0 (A) passed to constructo
 IteratorResolution.dfy(174,40): Error: type parameter 1 (B) passed to constructor Init must support auto-initialization (got Six)
 IteratorResolution.dfy(179,24): Error: type parameter 0 (A) passed to method MyMethod must support equality (got Stream)
 IteratorResolution.dfy(180,22): Error: type parameter 1 (B) passed to method MyMethod must support auto-initialization (got Six)
-IteratorResolution.dfy(185,13): Error: type parameter 0 (A) passed to function MyFunction must support equality (got Stream)
-IteratorResolution.dfy(186,13): Error: type parameter 1 (B) passed to function MyFunction must support auto-initialization (got Six)
+IteratorResolution.dfy(185,35): Error: type parameter 0 (A) passed to function MyFunction must support equality (got Stream)
+IteratorResolution.dfy(186,33): Error: type parameter 1 (B) passed to function MyFunction must support auto-initialization (got Six)
 IteratorResolution.dfy(213,22): Error: type parameter 0 (A) passed to type MyIter must support equality (got Stream)
 IteratorResolution.dfy(213,22): Error: type parameter 0 (A) passed to type MyIter must support equality (got Stream)
 IteratorResolution.dfy(216,22): Error: type parameter 0 (A) passed to type MyIter must support equality (got Stream)
diff --git a/Test/dafny0/Iterators.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Iterators.dfy
similarity index 99%
rename from Test/dafny0/Iterators.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Iterators.dfy
index 0b15d5e74ea..2aaffa3d952 100644
--- a/Test/dafny0/Iterators.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Iterators.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 iterator MyIter<T(0)>(q: T) yields (x: T, y: T)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Iterators.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Iterators.dfy.expect
new file mode 100644
index 00000000000..77437d7dfe1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Iterators.dfy.expect
@@ -0,0 +1,44 @@
+Iterators.dfy(40,21): Error: a precondition for this call could not be proved
+Iterators.dfy(4,9): Related location: this is the precondition that could not be proved
+Iterators.dfy(89,2): Error: assertion might not hold
+Iterators.dfy(103,2): Error: assertion might not hold
+Iterators.dfy(106,2): Error: assertion might not hold
+Iterators.dfy(119,4): Error: assertion might not hold
+Iterators.dfy(150,4): Error: assertion might not hold
+Iterators.dfy(155,23): Error: a precondition for this call could not be proved
+Iterators.dfy(125,9): Related location: this is the precondition that could not be proved
+Iterators.dfy(177,18): Error: assertion might not hold
+Iterators.dfy(208,6): Error: an assignment to _new is only allowed to shrink the set
+Iterators.dfy(212,6): Error: assertion might not hold
+Iterators.dfy(234,6): Error: assertion might not hold
+Iterators.dfy(413,16): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+Iterators.dfy(414,21): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+Iterators.dfy(415,21): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+Iterators.dfy(436,18): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+Iterators.dfy(437,23): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+Iterators.dfy(438,23): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+Iterators.dfy(459,16): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+Iterators.dfy(460,21): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+Iterators.dfy(461,21): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+Iterators.dfy(470,4): Error: possible violation of yield-ensures condition
+Iterators.dfy(451,21): Related location: this proposition could not be proved
+Iterators.dfy(251,9): Error: decreases clause might not decrease
+Iterators.dfy(274,9): Error: decreases clause might not decrease
+Iterators.dfy(284,31): Error: decreases clause might not decrease
+Iterators.dfy(296,9): Error: cannot prove termination; try supplying a decreases clause
+Iterators.dfy(317,9): Error: cannot prove termination; try supplying a decreases clause
+Iterators.dfy(326,31): Error: cannot prove termination; try supplying a decreases clause
+Iterators.dfy(343,9): Error: decreases clause might not decrease
+Iterators.dfy(353,31): Error: cannot prove termination; try supplying a decreases clause
+Iterators.dfy(370,9): Error: decreases clause might not decrease
+
+Dafny program verifier finished with 35 verified, 30 errors
diff --git a/Test/dafny0/JavaUseRuntimeLib.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JavaUseRuntimeLib.dfy
similarity index 91%
rename from Test/dafny0/JavaUseRuntimeLib.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JavaUseRuntimeLib.dfy
index 244e310be90..bb108d3f9c2 100644
--- a/Test/dafny0/JavaUseRuntimeLib.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JavaUseRuntimeLib.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny "%s" /useRuntimeLib /out:%S/Output/DafnyConsole.jar /compileTarget:java > "%t"
+// RUN: %dafny "%s" /useRuntimeLib /out:%S/Output/DafnyConsole.jar /compileTarget java > "%t"
 // RUN: java -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/Output/DafnyConsole.jar DafnyConsole >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JavaUseRuntimeLib.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JavaUseRuntimeLib.dfy.expect
new file mode 100644
index 00000000000..94c79db5833
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JavaUseRuntimeLib.dfy.expect
@@ -0,0 +1,4 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+bye
diff --git a/Test/dafny0/JustWarnings.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JustWarnings.dfy
similarity index 89%
rename from Test/dafny0/JustWarnings.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JustWarnings.dfy
index a6d4239363e..c3380be4cf1 100644
--- a/Test/dafny0/JustWarnings.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JustWarnings.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachResolver "%s" -- --warn-shadowing
+// RUN: %testDafnyForEachResolver "%s" -- --warn-shadowing --allow-warnings
 
 
 // This file tests the behavior where the Resolver reports some warnings
diff --git a/Test/dafny0/JustWarnings.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JustWarnings.dfy.expect
similarity index 100%
rename from Test/dafny0/JustWarnings.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/JustWarnings.dfy.expect
diff --git a/Test/dafny0/LabeledAsserts.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAsserts.dfy
similarity index 98%
rename from Test/dafny0/LabeledAsserts.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAsserts.dfy
index cc9f45c1310..39a424ce3e8 100644
--- a/Test/dafny0/LabeledAsserts.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAsserts.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class C {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAsserts.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAsserts.dfy.expect
new file mode 100644
index 00000000000..355d863b1b4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAsserts.dfy.expect
@@ -0,0 +1,30 @@
+LabeledAsserts.dfy(63,9): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+LabeledAsserts.dfy(63,30): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+LabeledAsserts.dfy(16,2): Error: assertion might not hold
+LabeledAsserts.dfy(42,2): Error: assertion might not hold
+LabeledAsserts.dfy(43,2): Error: assertion might not hold
+LabeledAsserts.dfy(91,4): Error: assertion might not hold
+LabeledAsserts.dfy(105,4): Error: assertion might not hold
+LabeledAsserts.dfy(107,4): Error: assertion might not hold
+LabeledAsserts.dfy(128,4): Error: assertion might not hold
+LabeledAsserts.dfy(142,6): Error: assertion might not hold
+LabeledAsserts.dfy(146,6): Error: assertion might not hold
+LabeledAsserts.dfy(206,4): Error: assertion might not hold
+LabeledAsserts.dfy(207,4): Error: assertion might not hold
+LabeledAsserts.dfy(211,4): Error: assertion might not hold
+LabeledAsserts.dfy(224,4): Error: assertion might not hold
+LabeledAsserts.dfy(226,4): Error: assertion might not hold
+LabeledAsserts.dfy(232,4): Error: assertion might not hold
+LabeledAsserts.dfy(252,6): Error: the calculation step between the previous line and this line could not be proved
+LabeledAsserts.dfy(265,2): Error: assertion might not hold
+LabeledAsserts.dfy(25,2): Error: assertion might not hold
+LabeledAsserts.dfy(27,2): Error: assertion might not hold
+LabeledAsserts.dfy(28,2): Error: assertion might not hold
+LabeledAsserts.dfy(29,2): Error: assertion might not hold
+LabeledAsserts.dfy(32,2): Error: assertion might not hold
+LabeledAsserts.dfy(162,2): Error: assertion might not hold
+LabeledAsserts.dfy(172,4): Error: assertion might not hold
+LabeledAsserts.dfy(189,6): Error: assertion might not hold
+LabeledAsserts.dfy(193,6): Error: assertion might not hold
+
+Dafny program verifier finished with 11 verified, 26 errors
diff --git a/Test/dafny0/LabeledAssertsResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAssertsResolution.dfy
similarity index 99%
rename from Test/dafny0/LabeledAssertsResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAssertsResolution.dfy
index e20225e520a..a92da5fd06b 100644
--- a/Test/dafny0/LabeledAssertsResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAssertsResolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module ResolutionTests {
diff --git a/Test/dafny0/LabeledAssertsResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAssertsResolution.dfy.expect
similarity index 80%
rename from Test/dafny0/LabeledAssertsResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAssertsResolution.dfy.expect
index 85b8080068a..c9b3e299ee0 100644
--- a/Test/dafny0/LabeledAssertsResolution.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabeledAssertsResolution.dfy.expect
@@ -5,39 +5,39 @@ LabeledAssertsResolution.dfy(26,26): Error: assert label shadows a dominating la
 LabeledAssertsResolution.dfy(28,13): Error: assert label shadows a dominating label
 LabeledAssertsResolution.dfy(34,24): Error: assert label shadows a dominating label
 LabeledAssertsResolution.dfy(73,12): Error: break label is undefined or not in scope: ABC
-LabeledAssertsResolution.dfy(81,17): Error: cannot reveal 'C' because no constant, assert label, or requires label in the current scope is named 'C'
+LabeledAssertsResolution.dfy(81,17): Error: cannot reveal 'C' because no revealable constant, function, assert label, or requires label in the current scope is named 'C'
 LabeledAssertsResolution.dfy(94,17): Error: no label 'XYZ' in scope at this time
-LabeledAssertsResolution.dfy(115,14): Error: cannot reveal 'X' because no constant, assert label, or requires label in the current scope is named 'X'
+LabeledAssertsResolution.dfy(115,14): Error: unresolved identifier: X
 LabeledAssertsResolution.dfy(52,11): Error: assert label shadows a dominating label
 LabeledAssertsResolution.dfy(54,11): Error: assert label shadows a dominating label
-LabeledAssertsResolution.dfy(125,6): Error: an assert-by body is not allowed to update a variable it doesn't declare
+LabeledAssertsResolution.dfy(125,6): Error: a by block is not allowed to update a variable it doesn't declare
 LabeledAssertsResolution.dfy(139,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-LabeledAssertsResolution.dfy(139,6): Error: an assert-by body is not allowed to update a variable it doesn't declare
-LabeledAssertsResolution.dfy(170,16): Error: in an assert-by body, calls are allowed only to lemmas
-LabeledAssertsResolution.dfy(172,10): Error: an assert-by body is not allowed to make heap updates
+LabeledAssertsResolution.dfy(139,6): Error: a by block is not allowed to update a variable it doesn't declare
+LabeledAssertsResolution.dfy(170,16): Error: in a by block, calls are allowed only to lemmas
+LabeledAssertsResolution.dfy(172,10): Error: a by block is not allowed to make heap updates
 LabeledAssertsResolution.dfy(173,13): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
 LabeledAssertsResolution.dfy(174,15): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-LabeledAssertsResolution.dfy(175,8): Error: a modify statement is not allowed in an assert-by body
-LabeledAssertsResolution.dfy(177,8): Error: an assert-by body is not allowed to make heap updates
+LabeledAssertsResolution.dfy(175,8): Error: a modify statement is not allowed in a by block
+LabeledAssertsResolution.dfy(177,8): Error: a by block is not allowed to make heap updates
 LabeledAssertsResolution.dfy(178,11): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
 LabeledAssertsResolution.dfy(179,13): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-LabeledAssertsResolution.dfy(180,6): Error: a modify statement is not allowed in an assert-by body
+LabeledAssertsResolution.dfy(180,6): Error: a modify statement is not allowed in a by block
 LabeledAssertsResolution.dfy(187,12): Error: a hint is not allowed to make heap updates
 LabeledAssertsResolution.dfy(188,15): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
 LabeledAssertsResolution.dfy(189,17): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
 LabeledAssertsResolution.dfy(190,10): Error: a modify statement is not allowed in a hint
 LabeledAssertsResolution.dfy(195,18): Error: in a hint, calls are allowed only to lemmas
-LabeledAssertsResolution.dfy(169,8): Error: an assert-by body is not allowed to update a variable it doesn't declare
-LabeledAssertsResolution.dfy(170,8): Error: an assert-by body is not allowed to update a variable it doesn't declare
-LabeledAssertsResolution.dfy(171,8): Error: an assert-by body is not allowed to update a variable it doesn't declare
+LabeledAssertsResolution.dfy(169,8): Error: a by block is not allowed to update a variable it doesn't declare
+LabeledAssertsResolution.dfy(170,8): Error: a by block is not allowed to update a variable it doesn't declare
+LabeledAssertsResolution.dfy(171,8): Error: a by block is not allowed to update a variable it doesn't declare
 LabeledAssertsResolution.dfy(203,18): Error: a hint is not allowed to update a variable it doesn't declare
 LabeledAssertsResolution.dfy(204,18): Error: a hint is not allowed to update a variable it doesn't declare
-LabeledAssertsResolution.dfy(199,12): Error: an assert-by body is not allowed to update a variable it doesn't declare
-LabeledAssertsResolution.dfy(200,12): Error: an assert-by body is not allowed to update a variable it doesn't declare
+LabeledAssertsResolution.dfy(199,12): Error: a by block is not allowed to update a variable it doesn't declare
+LabeledAssertsResolution.dfy(200,12): Error: a by block is not allowed to update a variable it doesn't declare
 LabeledAssertsResolution.dfy(185,10): Error: a hint is not allowed to update a variable it doesn't declare
 LabeledAssertsResolution.dfy(195,10): Error: a hint is not allowed to update a variable it doesn't declare
-LabeledAssertsResolution.dfy(219,8): Error: an assert-by body is not allowed to update a variable it doesn't declare
-LabeledAssertsResolution.dfy(220,8): Error: an assert-by body is not allowed to update a variable it doesn't declare
+LabeledAssertsResolution.dfy(219,8): Error: a by block is not allowed to update a variable it doesn't declare
+LabeledAssertsResolution.dfy(220,8): Error: a by block is not allowed to update a variable it doesn't declare
 LabeledAssertsResolution.dfy(222,31): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
 LabeledAssertsResolution.dfy(223,43): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
 LabeledAssertsResolution.dfy(232,14): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
diff --git a/Test/dafny0/LabelsOldAt.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabelsOldAt.dfy
similarity index 98%
rename from Test/dafny0/LabelsOldAt.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabelsOldAt.dfy
index 2dd87494e2e..10542eb52b9 100644
--- a/Test/dafny0/LabelsOldAt.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabelsOldAt.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var x: int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabelsOldAt.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabelsOldAt.dfy.expect
new file mode 100644
index 00000000000..7234bcee852
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LabelsOldAt.dfy.expect
@@ -0,0 +1,40 @@
+LabelsOldAt.dfy(429,9): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+LabelsOldAt.dfy(430,9): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+LabelsOldAt.dfy(160,13): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+LabelsOldAt.dfy(34,4): Error: assertion might not hold
+LabelsOldAt.dfy(56,4): Error: assertion might not hold
+LabelsOldAt.dfy(78,6): Error: assertion might not hold
+LabelsOldAt.dfy(110,6): Error: assertion might not hold
+LabelsOldAt.dfy(112,6): Error: assertion might not hold
+LabelsOldAt.dfy(116,6): Error: assertion might not hold
+LabelsOldAt.dfy(118,6): Error: assertion might not hold
+LabelsOldAt.dfy(140,6): Error: assertion might not hold
+LabelsOldAt.dfy(142,6): Error: assertion might not hold
+LabelsOldAt.dfy(164,21): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+LabelsOldAt.dfy(166,27): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+LabelsOldAt.dfy(175,19): Error: array could not be proved to be allocated
+LabelsOldAt.dfy(177,25): Error: array could not be proved to be allocated
+LabelsOldAt.dfy(195,25): Error: object could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(197,31): Error: object could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(207,31): Error: some set element could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(236,14): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+LabelsOldAt.dfy(244,29): Error: object could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(246,29): Error: some set element could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(266,15): Error: object might be null
+LabelsOldAt.dfy(267,15): Error: some set element might be null
+LabelsOldAt.dfy(268,15): Error: some sequence element might be null
+LabelsOldAt.dfy(274,15): Error: object could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(275,15): Error: some set element could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(276,15): Error: some sequence element could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(281,15): Error: object could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(281,15): Error: object might be null
+LabelsOldAt.dfy(286,15): Error: some set element could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(286,15): Error: some set element might be null
+LabelsOldAt.dfy(291,15): Error: some sequence element could not be proved to be allocated in the old-state of the 'unchanged' predicate
+LabelsOldAt.dfy(291,15): Error: some sequence element might be null
+LabelsOldAt.dfy(358,4): Error: assertion might not hold
+LabelsOldAt.dfy(367,4): Error: assertion might not hold
+LabelsOldAt.dfy(376,4): Error: assertion might not hold
+LabelsOldAt.dfy(385,4): Error: assertion might not hold
+
+Dafny program verifier finished with 28 verified, 35 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LegacyConversions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LegacyConversions.dfy
new file mode 100644
index 00000000000..76866f36841
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LegacyConversions.dfy
@@ -0,0 +1,113 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --relax-definite-assignment --general-newtypes=false
+
+module Chars {
+  type MyChar = ch: char | ch != 'b'
+  type Char = char
+
+  type CharSubset = ch: char | ch != 'b'
+
+  method CharConversions() returns (s: CharSubset, x: MyChar, y: Char, a: char) {
+    if
+    case true =>
+      a := a as char;
+    case true =>
+      a := a as CharSubset; // error: may violate constraint
+    case true =>
+      x := a as MyChar; // error: may violate constraint
+    case true =>
+      y := a as Char;
+    case true =>
+      x := y as MyChar; // error: may violate constraint
+  }
+
+  type BV = b: bv6 | b != 23
+  type JustBv6 = b: bv6 | true
+  type Word = bv32
+  type Big = b: bv1024 | true
+  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
+
+  type NotSpace = ch: char | ch != ' '
+
+  method CharBv() returns (ch: char, nr: NotSpace, a: bv6, x: BV, big: Big, i: int) {
+    if
+    case 0 <= i < 100 =>
+      nr := i as NotSpace; // error: might be space
+    case true =>
+      ch := nr as char;
+    case true =>
+      nr := ch as NotSpace; // error: might be space
+    case true =>
+      nr := a as NotSpace; // error: might be space
+    case true =>
+      nr := x as NotSpace; // error: might be space
+  }
+
+  method ConvertBV() returns (s: BV, s': JustBv6, x: BV, y: Word, z: Big, a: bv6, b: bv32, c: bv1024, i: int, j: int32, r: bool) {
+    if
+    case true =>
+      x := y as BV; // error (x2): might be 23 and might be too big
+    case y < 30 =>
+      x := y as BV; // error: might be 23
+    case 30 <= y =>
+      x := y as BV; // error: might be too big
+    case y < 20 =>
+      x := y as BV;
+  }
+  
+  method Conversions0() returns (s: BV, s': JustBv6, x: BV, y: Word, z: Big, a: bv6, b: bv32, c: bv1024, i: int, j: int32, r: bool) {
+    if
+    case true =>
+      a := b as bv6; // error: might be too big
+    case b < 64 =>
+      a := b as bv6;
+    case s' != 23 =>
+      s := s' as BV;
+    case true =>
+      s := y as BV; // error (x2): might be 23 and might be too big
+    case true =>
+      s' := s as JustBv6;
+    case true =>
+      s := s' as BV; // error: might violate constraint
+    case true =>
+      y := x as Word;
+    case true =>
+      b := y as bv32;
+    case true =>
+      y := b as Word;
+  }
+  
+  method Conversions1() returns (s: BV, s': JustBv6, x: BV, y: Word, z: Big, a: bv6, b: bv32, c: bv1024, i: int, j: int32, r: bool) {
+    if
+    case true =>
+      a := b as BV; // error (x2): might not fit and might violate constraint
+    case true =>
+      x := b as BV; // error (x2): might not fit and might violate constraint
+  }
+  
+  method Conversions2() returns (s: BV, s': JustBv6, x: BV, y: Word, z: Big, a: bv6, b: bv32, c: bv1024, i: int, j: int32, r: bool) {
+    if
+    case b != 23 =>
+      a := b as BV; // error: might not fit
+    case b < 64 =>
+      a := b as BV; // error: might violate constraint
+    case 23 != b < 64 =>
+      a := b as BV;
+    case 25 <= b < 50 =>
+      x := b as BV;
+  }
+}
+
+module CharSize {
+  type Big = b: bv1024 | true
+
+  type NotSpace = ch: char | ch != ' '
+  type AnyChar = ch: char | true
+
+  method CharBigBv() returns (big: Big, nr: NotSpace, ac: AnyChar) {
+    if 
+    case true =>
+      nr := big as NotSpace; // error (x2): might be too big and might violate constraint
+    case true =>
+      ac := big as AnyChar; // error: might be too big
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LegacyConversions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LegacyConversions.dfy.expect
new file mode 100644
index 00000000000..fafed635197
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LegacyConversions.dfy.expect
@@ -0,0 +1,26 @@
+LegacyConversions.dfy(14,13): Error: result of operation might violate subset type constraint for 'CharSubset'
+LegacyConversions.dfy(16,13): Error: result of operation might violate subset type constraint for 'MyChar'
+LegacyConversions.dfy(20,13): Error: result of operation might violate subset type constraint for 'MyChar'
+LegacyConversions.dfy(34,14): Error: result of operation might violate subset type constraint for 'NotSpace'
+LegacyConversions.dfy(38,15): Error: result of operation might violate subset type constraint for 'NotSpace'
+LegacyConversions.dfy(40,14): Error: result of operation might violate subset type constraint for 'NotSpace'
+LegacyConversions.dfy(42,14): Error: result of operation might violate subset type constraint for 'NotSpace'
+LegacyConversions.dfy(48,13): Error: result of operation might violate subset type constraint for 'BV'
+LegacyConversions.dfy(48,13): Error: value to be converted might not fit in BV
+LegacyConversions.dfy(50,13): Error: result of operation might violate subset type constraint for 'BV'
+LegacyConversions.dfy(52,13): Error: value to be converted might not fit in BV
+LegacyConversions.dfy(60,13): Error: value to be converted might not fit in bv6
+LegacyConversions.dfy(66,13): Error: result of operation might violate subset type constraint for 'BV'
+LegacyConversions.dfy(66,13): Error: value to be converted might not fit in BV
+LegacyConversions.dfy(70,14): Error: result of operation might violate subset type constraint for 'BV'
+LegacyConversions.dfy(82,13): Error: result of operation might violate subset type constraint for 'BV'
+LegacyConversions.dfy(82,13): Error: value to be converted might not fit in BV
+LegacyConversions.dfy(84,13): Error: result of operation might violate subset type constraint for 'BV'
+LegacyConversions.dfy(84,13): Error: value to be converted might not fit in BV
+LegacyConversions.dfy(90,13): Error: value to be converted might not fit in BV
+LegacyConversions.dfy(92,13): Error: result of operation might violate subset type constraint for 'BV'
+LegacyConversions.dfy(109,16): Error: bit-vector value to be converted might not fit in NotSpace
+LegacyConversions.dfy(109,16): Error: result of operation might violate subset type constraint for 'NotSpace'
+LegacyConversions.dfy(111,16): Error: bit-vector value to be converted might not fit in AnyChar
+
+Dafny program verifier finished with 10 verified, 24 errors
diff --git a/Test/dafny0/LetExpr.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LetExpr.dfy
similarity index 97%
rename from Test/dafny0/LetExpr.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LetExpr.dfy
index 1a5c94b8231..8b3300900aa 100644
--- a/Test/dafny0/LetExpr.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LetExpr.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint.dfy" "%s" > "%t"
-// RUN: %dafny /noVerify /compile:0 /deprecation:0 "%t.dprint.dfy" >> "%t"
+// RUN: %exits-with 4 %verify --allow-deprecation --allow-axioms --relax-definite-assignment --allow-warnings --print "%t.print.dfy" "%s" > "%t"
+// RUN: %resolve --allow-warnings --allow-axioms --allow-deprecation "%t.print.dfy" >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method M0(n: int)
@@ -127,11 +127,11 @@ method Theorem0(n: int)
   }
 }
 
-ghost method Theorem1(n: int)
+lemma Theorem1(n: int)
   requires 1 <= n;
   ensures 1 <= Fib(n);
 {
-  // in a ghost method, the induction tactic takes care of it
+  // in a lemma, the induction tactic takes care of it
 }
 
 ghost function Theorem2(n: int): int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LetExpr.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LetExpr.dfy.expect
new file mode 100644
index 00000000000..af56c5c194e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LetExpr.dfy.expect
@@ -0,0 +1,21 @@
+LetExpr.dfy(45,2): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+LetExpr.dfy(206,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+LetExpr.dfy(9,2): Error: assertion might not hold
+LetExpr.dfy(109,6): Error: assertion might not hold
+LetExpr.dfy(260,18): Error: value does not satisfy the subset constraints of 'nat'
+LetExpr.dfy(263,18): Error: value does not satisfy the subset constraints of 'nat'
+LetExpr.dfy(265,23): Error: value does not satisfy the subset constraints of 'nat'
+LetExpr.dfy(294,13): Error: RHS is not certain to look like the pattern 'Agnes'
+LetExpr.dfy(311,41): Error: value does not satisfy the subset constraints of 'nat'
+LetExpr.dfy(313,2): Error: assertion might not hold
+LetExpr.dfy(323,11): Error: to be compilable, the value of a let-such-that expression must be uniquely determined
+LetExpr.dfy(340,18): Error: value does not satisfy the subset constraints of 'nat'
+LetExpr.dfy(344,13): Error: value does not satisfy the subset constraints of 'nat'
+LetExpr.dfy(390,33): Error: assertion might not hold
+LetExpr.dfy(403,24): Error: assertion might not hold
+
+Dafny program verifier finished with 37 verified, 13 errors
+LetExpr.dfy.tmp.print.dfy(44,2): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+LetExpr.dfy.tmp.print.dfy(279,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier did not attempt verification
diff --git a/Test/dafny0/LhsDuplicates.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LhsDuplicates.dfy
similarity index 95%
rename from Test/dafny0/LhsDuplicates.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LhsDuplicates.dfy
index 4ffc04be616..ce47e9ac501 100644
--- a/Test/dafny0/LhsDuplicates.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LhsDuplicates.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --manual-triggers "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class MyClass<T> {
diff --git a/Test/dafny0/LhsDuplicates.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LhsDuplicates.dfy.expect
similarity index 79%
rename from Test/dafny0/LhsDuplicates.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LhsDuplicates.dfy.expect
index cce3b48be71..2f10a8dcc21 100644
--- a/Test/dafny0/LhsDuplicates.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LhsDuplicates.dfy.expect
@@ -1,5 +1,5 @@
-LhsDuplicates.dfy(21,9): Error: left-hand sides for different forall-statement bound variables might refer to the same location
-LhsDuplicates.dfy(36,11): Error: left-hand sides for different forall-statement bound variables might refer to the same location
+LhsDuplicates.dfy(21,9): Error: left-hand sides for different forall-statement bound variables might refer to the same location (and right-hand sides might not be equivalent)
+LhsDuplicates.dfy(36,11): Error: left-hand sides for different forall-statement bound variables might refer to the same location (and right-hand sides might not be equivalent)
 LhsDuplicates.dfy(42,5): Error: left-hand sides a and a refer to the same location
 LhsDuplicates.dfy(51,11): Error: left-hand sides c0.f and c0.f might refer to the same location
 LhsDuplicates.dfy(60,9): Error: left-hand sides a[i] and a[i] might refer to the same location
diff --git a/Test/dafny0/LiberalEquality.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LiberalEquality.dfy
similarity index 96%
rename from Test/dafny0/LiberalEquality.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LiberalEquality.dfy
index 01da46ef587..1b010eaf231 100644
--- a/Test/dafny0/LiberalEquality.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LiberalEquality.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class Array<T>
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LiberalEquality.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LiberalEquality.dfy.expect
new file mode 100644
index 00000000000..321b6cdf46c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LiberalEquality.dfy.expect
@@ -0,0 +1,19 @@
+LiberalEquality.dfy(22,14): Error: arguments must have comparable types (got T and U)
+LiberalEquality.dfy(23,14): Error: arguments must have comparable types (got U and int)
+LiberalEquality.dfy(31,14): Error: arguments must have comparable types (got array<T> and array3<T>)
+LiberalEquality.dfy(32,14): Error: arguments must have comparable types (got array<int> and array3<int>)
+LiberalEquality.dfy(33,14): Error: arguments must have comparable types (got array<T> and array3<int>)
+LiberalEquality.dfy(34,14): Error: arguments must have comparable types (got array<int> and array3<T>)
+LiberalEquality.dfy(42,14): Error: arguments must have comparable types (got Weird<T, int, V> and Weird<T, bool, V>)
+LiberalEquality.dfy(52,13): Error: arguments must have comparable types (got Weird<T, bool, T> and Weird<T, int, T>)
+LiberalEquality.dfy(61,14): Error: arguments must have comparable types (got array<int> and array<bool>)
+LiberalEquality.dfy(73,13): Error: arguments must have comparable types (got T ~> int and int ~> int)
+LiberalEquality.dfy(74,13): Error: arguments must have comparable types (got int ~> T and int ~> int)
+LiberalEquality.dfy(84,13): Error: arguments must have comparable types (got Syn<int> and Syn<bool>)
+LiberalEquality.dfy(95,13): Error: arguments must have comparable types (got array<List<int>> and array<List<bool>>) (non-variant type parameter would require int = bool)
+LiberalEquality.dfy(97,13): Error: arguments must have comparable types (got array<List<bool>> and array<ListSynonym<T, int>>) (non-variant type parameter would require bool = int)
+LiberalEquality.dfy(99,13): Error: arguments must have comparable types (got array<List<int>> and array<ListSynonym<int, T>>) (non-variant type parameter would require int = T)
+LiberalEquality.dfy(100,13): Error: arguments must have comparable types (got array<List<bool>> and array<ListSynonym<int, T>>) (non-variant type parameter would require bool = T)
+LiberalEquality.dfy(101,13): Error: arguments must have comparable types (got array<ListSynonym<bool, int>> and array<ListSynonym<int, T>>) (non-variant type parameter would require int = T)
+LiberalEquality.dfy(103,13): Error: arguments must have comparable types (got array<List<bool>> and array<ListSynonym<real, Wrapper<int>>>) (non-variant type parameter would require bool = Wrapper<int>)
+18 resolution/type errors detected in LiberalEquality.dfy
diff --git a/Test/dafny0/LitTriggers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LitTriggers.dfy
similarity index 90%
rename from Test/dafny0/LitTriggers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LitTriggers.dfy
index 59e839a7b4a..623aef921bd 100644
--- a/Test/dafny0/LitTriggers.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LitTriggers.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation
+
 
 // Imported from bug 76. LitInt would be triggered on, causing matching failures.
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LitTriggers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LitTriggers.dfy.expect
new file mode 100644
index 00000000000..640bb8f4a52
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LitTriggers.dfy.expect
@@ -0,0 +1,3 @@
+LitTriggers.dfy(56,27): Error: assertion might not hold
+
+Dafny program verifier finished with 5 verified, 1 error
diff --git a/Test/dafny0/LoopModifies.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LoopModifies.dfy
similarity index 97%
rename from Test/dafny0/LoopModifies.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LoopModifies.dfy
index 33903a46487..88433ec3b9e 100644
--- a/Test/dafny0/LoopModifies.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LoopModifies.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation
+
 
 // regular modifies sanity test:
 method Testing1(a: array<int>)
diff --git a/Test/dafny0/LoopModifies.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LoopModifies.dfy.expect
similarity index 100%
rename from Test/dafny0/LoopModifies.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/LoopModifies.dfy.expect
diff --git a/Test/dafny0/MapMergeSubtraction.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MapMergeSubtraction.dfy
similarity index 98%
rename from Test/dafny0/MapMergeSubtraction.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MapMergeSubtraction.dfy
index 07b7a8f1d35..da033795d87 100644
--- a/Test/dafny0/MapMergeSubtraction.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MapMergeSubtraction.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Simple(m: map<int, real>, n: map<int, real>, s: set<int>) returns (r: map<int, real>)
diff --git a/Test/dafny0/MapMergeSubtraction.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MapMergeSubtraction.dfy.expect
similarity index 100%
rename from Test/dafny0/MapMergeSubtraction.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MapMergeSubtraction.dfy.expect
diff --git a/Test/dafny0/Maps.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Maps.dfy
similarity index 99%
rename from Test/dafny0/Maps.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Maps.dfy
index c81b9371f3b..ed17c96d53e 100644
--- a/Test/dafny0/Maps.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Maps.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This method can be used to test compilation.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Maps.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Maps.dfy.expect
new file mode 100644
index 00000000000..c862122da79
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Maps.dfy.expect
@@ -0,0 +1,37 @@
+Maps.dfy(200,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Maps.dfy(78,7): Error: element might not be in domain
+Maps.dfy(128,3): Error: assertion might not hold
+Maps.dfy(220,36): Error: key expressions might be referring to the same value
+Maps.dfy(226,36): Error: key expressions might be referring to the same value
+Maps.dfy(232,37): Error: key expressions might be referring to the same value
+Maps.dfy(234,24): Error: key expressions might be referring to the same value
+Maps.dfy(241,42): Error: function precondition could not be proved
+Maps.dfy(215,13): Related location: this proposition could not be proved
+Maps.dfy(243,37): Error: function precondition could not be proved
+Maps.dfy(215,13): Related location: this proposition could not be proved
+Maps.dfy(243,37): Error: key expressions might be referring to the same value
+Maps.dfy(264,54): Error: assertion might not hold
+Maps.dfy(309,11): Error: index out of range
+Maps.dfy(311,16): Error: value does not satisfy the subset constraints of 'nat'
+Maps.dfy(317,11): Error: value does not satisfy the subset constraints of 'nat'
+Maps.dfy(319,16): Error: new number of occurrences might be negative
+Maps.dfy(328,11): Error: value does not satisfy the subset constraints of 'nat'
+Maps.dfy(330,17): Error: value does not satisfy the subset constraints of 'nat'
+Maps.dfy(339,11): Error: index out of range
+Maps.dfy(341,16): Error: value of expression (of type 'Elem?') is not known to be an instance of type 'Elem', because it might be null
+Maps.dfy(347,11): Error: value of expression (of type 'Elem?') is not known to be an instance of type 'Elem', because it might be null
+Maps.dfy(349,16): Error: new number of occurrences might be negative
+Maps.dfy(358,11): Error: value of expression (of type 'Elem?') is not known to be an instance of type 'Elem', because it might be null
+Maps.dfy(360,16): Error: value of expression (of type 'Elem?') is not known to be an instance of type 'Elem', because it might be null
+Maps.dfy(424,4): Error: assertion might not hold
+Maps.dfy(429,4): Error: assertion might not hold
+Maps.dfy(430,4): Error: assertion might not hold
+Maps.dfy(442,4): Error: assertion might not hold
+Maps.dfy(447,4): Error: assertion might not hold
+Maps.dfy(448,4): Error: assertion might not hold
+Maps.dfy(520,2): Error: assertion might not hold
+Maps.dfy(525,2): Error: assertion might not hold
+Maps.dfy(562,2): Error: decreases expression might not decrease
+Maps.dfy(576,2): Error: decreases expression might not decrease
+
+Dafny program verifier finished with 49 verified, 32 errors
diff --git a/Test/dafny0/MatchBraces.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MatchBraces.dfy
similarity index 96%
rename from Test/dafny0/MatchBraces.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MatchBraces.dfy
index 4ac380f2739..8ea60c1d157 100644
--- a/Test/dafny0/MatchBraces.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MatchBraces.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype Color = Red | Green | Blue
 
diff --git a/Test/dafny0/MatchBraces.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MatchBraces.dfy.expect
similarity index 100%
rename from Test/dafny0/MatchBraces.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MatchBraces.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MatchBraces.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MatchBraces.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MatchBraces.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny0/Matrix-OOB.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Matrix-OOB.dfy
similarity index 81%
rename from Test/dafny0/Matrix-OOB.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Matrix-OOB.dfy
index deb49bb19a8..dcecedd0314 100644
--- a/Test/dafny0/Matrix-OOB.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Matrix-OOB.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %exits-with 4 %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This is a regression test: OOB errors for matrices used to be reported on the
diff --git a/Test/dafny0/Matrix-OOB.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Matrix-OOB.dfy.expect
similarity index 90%
rename from Test/dafny0/Matrix-OOB.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Matrix-OOB.dfy.expect
index 365cd6a0ad5..ec4b5032d95 100644
--- a/Test/dafny0/Matrix-OOB.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Matrix-OOB.dfy.expect
@@ -3,6 +3,5 @@ Matrix-OOB.dfy(11,27): Error: index 0 out of range
 Matrix-OOB.dfy(11,30): Error: index 1 out of range
 Matrix-OOB.dfy(12,0): Error: a postcondition could not be proved on this return path
 Matrix-OOB.dfy(11,10): Related location: this is the postcondition that could not be proved
-Matrix-OOB.dfy(11,33): Related location
 
 Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/dafny0/MiscTypeInferenceTests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MiscTypeInferenceTests.dfy
similarity index 97%
rename from Test/dafny0/MiscTypeInferenceTests.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MiscTypeInferenceTests.dfy
index 0b9b22f2605..1e2ca7fc231 100644
--- a/Test/dafny0/MiscTypeInferenceTests.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MiscTypeInferenceTests.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
+// RUN: %exits-with 4 %build "%s" --relax-definite-assignment --allow-axioms > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // All of the examples in this file should type check (but some produce
diff --git a/Test/dafny0/MiscTypeInferenceTests.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MiscTypeInferenceTests.dfy.expect
similarity index 95%
rename from Test/dafny0/MiscTypeInferenceTests.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MiscTypeInferenceTests.dfy.expect
index 2a9c7501b69..114e4b7438f 100644
--- a/Test/dafny0/MiscTypeInferenceTests.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MiscTypeInferenceTests.dfy.expect
@@ -3,8 +3,8 @@ MiscTypeInferenceTests.dfy(95,16): Warning: the type of the other operand is a s
 MiscTypeInferenceTests.dfy(14,59): Error: value does not satisfy the subset constraints of 'neg'
 MiscTypeInferenceTests.dfy(24,11): Error: value does not satisfy the subset constraints of 'int -> int' (possible cause: it may be partial or have read effects)
 MiscTypeInferenceTests.dfy(27,11): Error: value of expression (of type 'int -> int') is not known to be an instance of type 'int ~> nat'
+MiscTypeInferenceTests.dfy(50,4): Error: assertion might not hold
 MiscTypeInferenceTests.dfy(50,13): Error: function precondition could not be proved
-MiscTypeInferenceTests.dfy(50,16): Error: assertion could not be proved
 MiscTypeInferenceTests.dfy(109,18): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
 MiscTypeInferenceTests.dfy(110,18): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
 MiscTypeInferenceTests.dfy(143,15): Error: value does not satisfy the subset constraints of 'nat'
diff --git a/Test/dafny0/MoForallCompilation.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MoForallCompilation.dfy
similarity index 97%
rename from Test/dafny0/MoForallCompilation.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MoForallCompilation.dfy
index af080853463..da618bc4d78 100644
--- a/Test/dafny0/MoForallCompilation.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MoForallCompilation.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   TestAggregateArrayUpdate();
diff --git a/Test/dafny0/MoForallCompilation.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MoForallCompilation.dfy.expect
similarity index 100%
rename from Test/dafny0/MoForallCompilation.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MoForallCompilation.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MoForallCompilation.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MoForallCompilation.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MoForallCompilation.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/dafny0/ModifyStmt.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModifyStmt.dfy
similarity index 96%
rename from Test/dafny0/ModifyStmt.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModifyStmt.dfy
index 2c593fae513..fe2f13e5b4c 100644
--- a/Test/dafny0/ModifyStmt.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModifyStmt.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class MyClass {
   var x: int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModifyStmt.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModifyStmt.dfy.expect
new file mode 100644
index 00000000000..e90ec9a5eca
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModifyStmt.dfy.expect
@@ -0,0 +1,21 @@
+ModifyStmt.dfy(133,14): Warning: the modify statement with a block statement is deprecated
+ModifyStmt.dfy(140,14): Warning: the modify statement with a block statement is deprecated
+ModifyStmt.dfy(148,16): Warning: the modify statement with a block statement is deprecated
+ModifyStmt.dfy(160,20): Warning: the modify statement with a block statement is deprecated
+ModifyStmt.dfy(158,17): Warning: the modify statement with a block statement is deprecated
+ModifyStmt.dfy(157,21): Warning: the modify statement with a block statement is deprecated
+ModifyStmt.dfy(155,24): Warning: the modify statement with a block statement is deprecated
+ModifyStmt.dfy(178,16): Warning: the modify statement with a block statement is deprecated
+ModifyStmt.dfy(27,4): Error: assertion might not hold
+ModifyStmt.dfy(42,4): Error: modify statement might violate context's modifies clause
+ModifyStmt.dfy(48,4): Error: modify statement might violate context's modifies clause
+ModifyStmt.dfy(61,4): Error: modify statement might violate context's modifies clause
+ModifyStmt.dfy(70,4): Error: assertion might not hold
+ModifyStmt.dfy(89,4): Error: assertion might not hold
+ModifyStmt.dfy(99,4): Error: assertion might not hold
+ModifyStmt.dfy(110,4): Error: assertion might not hold
+ModifyStmt.dfy(122,6): Error: assertion might not hold
+ModifyStmt.dfy(134,6): Error: assignment might update an object not in the enclosing context's modifies clause
+ModifyStmt.dfy(172,4): Error: assertion might not hold
+
+Dafny program verifier finished with 11 verified, 11 errors
diff --git a/Test/dafny0/ModuleExport.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleExport.dfy
similarity index 98%
rename from Test/dafny0/ModuleExport.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleExport.dfy
index 4799d81f669..00ecd51973a 100644
--- a/Test/dafny0/ModuleExport.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleExport.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /env:0 /dprint:"%t.dprint" /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/dafny0/ModuleExport.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleExport.dfy.expect
similarity index 97%
rename from Test/dafny0/ModuleExport.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleExport.dfy.expect
index 1f12667a89f..1e577230612 100644
--- a/Test/dafny0/ModuleExport.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleExport.dfy.expect
@@ -14,6 +14,7 @@ ModuleExport.dfy(136,8): Error: when allocating an object of type 'C', one of it
 ModuleExport.dfy(137,12): Error: when allocating an object of imported type 'D', one of its constructor methods must be called
 ModuleExport.dfy(234,11): Error: Type or type parameter is not declared in this scope: X (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
 ModuleExport.dfy(260,9): Error: duplicate name of top-level declaration: X
+ModuleExport.dfy(262,8): Related location
 ModuleExport.dfy(269,13): Error: no default export set declared in module: ModuleName4
 ModuleExport.dfy(272,25): Error: no export set 'Y' in module 'ModuleName4'
 ModuleExport.dfy(276,9): Error: duplicate name of export set: X
diff --git a/Test/dafny0/ModuleInsertion.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertion.dfy
similarity index 91%
rename from Test/dafny0/ModuleInsertion.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertion.dfy
index 75d77035a38..a0c774722c2 100644
--- a/Test/dafny0/ModuleInsertion.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertion.dfy
@@ -1,6 +1,6 @@
 // NONUNIFORM: Tests printing much more than compilation
-// RUN: %dafny /env:0 /dprint:- /dafnyVerify:0 "%s" > "%t"
-// RUN: %dafny /env:0 /rprint:- /compile:3 "%s" >> "%t"
+// RUN: %build --print:- --no-verify "%s" > "%t"
+// RUN: %run --rprint:- "%s" >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Main() {
diff --git a/Test/dafny0/ModuleInsertion.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertion.dfy.expect
similarity index 91%
rename from Test/dafny0/ModuleInsertion.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertion.dfy.expect
index e607297f288..310845cf75d 100644
--- a/Test/dafny0/ModuleInsertion.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertion.dfy.expect
@@ -104,6 +104,8 @@ module U.V {
 module U.V.W {
   const x1 := 12 * X.x0
 }
+
+Dafny program verifier did not attempt verification
 // ModuleInsertion.dfy
 
 /*
@@ -131,7 +133,7 @@ module _System {
   */
 
   class {:compile false} array<arg> {
-    var Length: int  // immutable
+    const Length: int
   }
   /*-- non-null type
   type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
@@ -169,21 +171,23 @@ module _System {
     | f.requires()
     /*special witness*/
 
-  datatype {:compile false} /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
 
   type bool { }
 
+  type char { }
+
   type int { }
 
   type real {
-    var Floor: int  // immutable
+    const Floor: int
   }
 
   type ORDINAL {
-    var IsLimit: bool  // immutable
-    var IsSucc: bool  // immutable
-    var Offset: int  // immutable
-    var IsNat: bool  // immutable
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
   }
 
   type _bv {
@@ -192,19 +196,27 @@ module _System {
     function RotateRight(w: nat): selftype
   }
 
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
   type map<+T, +U> {
-    var Keys: set<T>  // immutable
-    var Values: set<U>  // immutable
-    var Items: set<(T, U)>  // immutable
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
   }
 
   type imap<*T, +U> {
-    var Keys: iset<T>  // immutable
-    var Values: iset<U>  // immutable
-    var Items: iset<(T, U)>  // immutable
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
   }
 
-  datatype {:compile false} /*_tuple#0*/ () = _#Make0
+  datatype /*_tuple#0*/ () = _#Make0
 }
 // bitvector types in use:
 */
diff --git a/Test/dafny0/ModuleInsertionErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertionErrors.dfy
similarity index 85%
rename from Test/dafny0/ModuleInsertionErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertionErrors.dfy
index 96a87421699..6d8c9c56182 100644
--- a/Test/dafny0/ModuleInsertionErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertionErrors.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module A {
   import B
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertionErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertionErrors.dfy.expect
new file mode 100644
index 00000000000..160273f798e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModuleInsertionErrors.dfy.expect
@@ -0,0 +1,7 @@
+ModuleInsertionErrors.dfy(23,11): Error: Duplicate module name: B
+ModuleInsertionErrors.dfy(21,11): Related location
+ModuleInsertionErrors.dfy(24,11): Error: Duplicate module name: N
+ModuleInsertionErrors.dfy(26,11): Related location
+ModuleInsertionErrors.dfy(30,17): Error: Duplicate module name: O
+ModuleInsertionErrors.dfy(29,17): Related location
+3 resolution/type errors detected in ModuleInsertionErrors.dfy
diff --git a/Test/dafny0/Modules0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules0.dfy
similarity index 98%
rename from Test/dafny0/Modules0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules0.dfy
index ab294fe86bf..a22ddbfbbb0 100644
--- a/Test/dafny0/Modules0.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules0.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // ---------------------- duplicate types within a module
diff --git a/Test/dafny0/Modules0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules0.dfy.expect
similarity index 95%
rename from Test/dafny0/Modules0.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules0.dfy.expect
index 66ad1c0e351..6011e6957e2 100644
--- a/Test/dafny0/Modules0.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules0.dfy.expect
@@ -2,11 +2,17 @@ Modules0.dfy(333,2): Warning: module-level functions are always non-instance, so
 Modules0.dfy(335,2): Warning: module-level methods are always non-instance, so the 'static' keyword is not allowed here
 Modules0.dfy(337,2): Warning: module-level const declarations are always non-instance, so the 'static' keyword is not allowed here
 Modules0.dfy(8,8): Error: duplicate name of top-level declaration: WazzupA
+Modules0.dfy(7,8): Related location
 Modules0.dfy(9,11): Error: duplicate name of top-level declaration: WazzupA
+Modules0.dfy(7,8): Related location
 Modules0.dfy(10,7): Error: duplicate name of top-level declaration: WazzupA
+Modules0.dfy(7,8): Related location
 Modules0.dfy(13,7): Error: duplicate name of top-level declaration: WazzupB
+Modules0.dfy(12,7): Related location
 Modules0.dfy(14,8): Error: duplicate name of top-level declaration: WazzupB
+Modules0.dfy(12,7): Related location
 Modules0.dfy(15,11): Error: duplicate name of top-level declaration: WazzupB
+Modules0.dfy(12,7): Related location
 Modules0.dfy(8,8): Error: a module that already contains a top-level declaration 'WazzupA?' is not allowed to declare a reference type (class) 'WazzupA'
 Modules0.dfy(39,8): Error: class 'X' with fields without known initializers, like 't' of type 'MM.T', must declare a constructor
 Modules0.dfy(56,21): Error: Type or type parameter is not declared in this scope: MyClass1 (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
diff --git a/Test/dafny0/Modules1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules1.dfy
similarity index 97%
rename from Test/dafny0/Modules1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules1.dfy
index 43ceae4f137..c43166ace11 100644
--- a/Test/dafny0/Modules1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules1.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules1.dfy.expect
new file mode 100644
index 00000000000..ff1d560489c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules1.dfy.expect
@@ -0,0 +1,15 @@
+Modules1.dfy(131,14): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+Modules1.dfy(56,8): Error: decreases expression must be bounded below by 0
+Modules1.dfy(54,12): Related location: this proposition could not be proved
+Modules1.dfy(62,8): Error: decreases clause might not decrease
+Modules1.dfy(82,6): Error: assertion might not hold
+Modules1.dfy(95,6): Error: assertion might not hold
+Modules1.dfy(97,6): Error: assertion might not hold
+Modules1.dfy(211,4): Error: assertion might not hold
+Modules1.dfy(212,4): Error: assertion might not hold
+Modules1.dfy(213,4): Error: assertion might not hold
+Modules1.dfy(219,4): Error: assertion might not hold
+Modules1.dfy(220,4): Error: assertion might not hold
+Modules1.dfy(221,4): Error: assertion might not hold
+
+Dafny program verifier finished with 9 verified, 11 errors
diff --git a/Test/dafny0/Modules2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules2.dfy
similarity index 92%
rename from Test/dafny0/Modules2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules2.dfy
index 833971a2e25..50a1e567af2 100644
--- a/Test/dafny0/Modules2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules2.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module A {
   class C {
diff --git a/Test/dafny0/Modules2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules2.dfy.expect
similarity index 100%
rename from Test/dafny0/Modules2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Modules2.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModulesCycle.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModulesCycle.dfy
new file mode 100644
index 00000000000..ed37d67fbb6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModulesCycle.dfy
@@ -0,0 +1,27 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module V {
+  import t = T  // error: T is not visible (and isn't even a module)
+}
+
+module A {
+  import B = C
+}
+
+module C {
+  import D = A
+}
+
+module Kevin {  // error: cyclic import
+  module Joe {
+    module Nick {
+      import Frankie
+    }
+  }
+}
+
+module Frankie {
+  import Kevin
+  const x := 3
+}
diff --git a/Test/dafny0/ModulesCycle.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModulesCycle.dfy.expect
similarity index 89%
rename from Test/dafny0/ModulesCycle.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModulesCycle.dfy.expect
index 9f6d6823f54..cde749c0b3d 100644
--- a/Test/dafny0/ModulesCycle.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ModulesCycle.dfy.expect
@@ -1,4 +1,4 @@
-ModulesCycle.dfy(5,9): Error: module T does not exist
+ModulesCycle.dfy(5,13): Error: module T does not exist
 ModulesCycle.dfy(8,7): Error: module definition contains a cycle (note: parent modules implicitly depend on submodules): module A -> import B -> module C -> import D -> module A
 ModulesCycle.dfy(16,7): Error: module definition contains a cycle (note: parent modules implicitly depend on submodules): module Kevin -> module Joe -> module Nick -> import Frankie -> module Frankie -> import Kevin -> module Kevin
 3 resolution/type errors detected in ModulesCycle.dfy
diff --git a/Test/dafny0/MultiDimArray.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiDimArray.dfy
similarity index 95%
rename from Test/dafny0/MultiDimArray.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiDimArray.dfy
index e43c302d54e..7e78afd4e6d 100644
--- a/Test/dafny0/MultiDimArray.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiDimArray.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 type array1<T> = array<T>  // array1 is not a pre-defined type; so we make it a synonym
 class A {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiDimArray.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiDimArray.dfy.expect
new file mode 100644
index 00000000000..b7190c6d7ba
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiDimArray.dfy.expect
@@ -0,0 +1,4 @@
+MultiDimArray.dfy(53,8): Error: assertion might not hold
+MultiDimArray.dfy(79,8): Error: assertion might not hold
+
+Dafny program verifier finished with 5 verified, 2 errors
diff --git a/Test/dafny0/MultiSets.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiSets.dfy
similarity index 98%
rename from Test/dafny0/MultiSets.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiSets.dfy
index 4a68bbfd8bf..9681da7fcc2 100644
--- a/Test/dafny0/MultiSets.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiSets.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-deprecation --manual-triggers "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method test1()
diff --git a/Test/dafny0/MultiSets.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiSets.dfy.expect
similarity index 80%
rename from Test/dafny0/MultiSets.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiSets.dfy.expect
index bf3f196bd8a..94d3ea8e80c 100644
--- a/Test/dafny0/MultiSets.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/MultiSets.dfy.expect
@@ -1,9 +1,9 @@
-MultiSets.dfy(177,19): Error: new number of occurrences might be negative
-MultiSets.dfy(268,23): Error: assertion could not be proved
-MultiSets.dfy(291,15): Error: assertion could not be proved
 MultiSets.dfy(158,2): Error: a postcondition could not be proved on this return path
 MultiSets.dfy(157,14): Related location: this is the postcondition that could not be proved
 MultiSets.dfy(164,2): Error: a postcondition could not be proved on this return path
 MultiSets.dfy(163,14): Related location: this is the postcondition that could not be proved
+MultiSets.dfy(177,19): Error: new number of occurrences might be negative
+MultiSets.dfy(268,4): Error: assertion might not hold
+MultiSets.dfy(291,6): Error: assertion might not hold
 
 Dafny program verifier finished with 34 verified, 5 errors
diff --git a/Test/dafny0/NameclashesCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy
similarity index 91%
rename from Test/dafny0/NameclashesCompile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy
index 46cae4b2338..95ec09fac89 100644
--- a/Test/dafny0/NameclashesCompile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   var r0, r1;
diff --git a/Test/dafny0/NameclashesCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy.expect
similarity index 100%
rename from Test/dafny0/NameclashesCompile.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy.expect
diff --git a/Test/dafny0/NameclashesCompile.dfy.go.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy.go.check
similarity index 100%
rename from Test/dafny0/NameclashesCompile.dfy.go.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy.go.check
diff --git a/Test/dafny0/NameclashesCompile.dfy.java.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy.java.check
similarity index 100%
rename from Test/dafny0/NameclashesCompile.dfy.java.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy.java.check
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy.rs.check
new file mode 100644
index 00000000000..2a0f83900f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NameclashesCompile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: (0,-1): Error: Feature not supported for this compilation target: The /runAllTests option
\ No newline at end of file
diff --git a/Test/dafny0/NatTypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NatTypes.dfy
similarity index 97%
rename from Test/dafny0/NatTypes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NatTypes.dfy
index 71a6a1cde25..a4b3f232479 100644
--- a/Test/dafny0/NatTypes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NatTypes.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method M(n: nat) {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NatTypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NatTypes.dfy.expect
new file mode 100644
index 00000000000..4dfd23d81ac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NatTypes.dfy.expect
@@ -0,0 +1,15 @@
+NatTypes.dfy(10,4): Error: value does not satisfy the subset constraints of 'nat'
+NatTypes.dfy(35,11): Error: value does not satisfy the subset constraints of 'nat'
+NatTypes.dfy(44,31): Error: value does not satisfy the subset constraints of 'nat'
+NatTypes.dfy(51,6): Error: assertion might not hold
+NatTypes.dfy(54,6): Error: assertion might not hold
+NatTypes.dfy(64,26): Error: value does not satisfy the subset constraints of 'nat'
+NatTypes.dfy(71,6): Error: assertion might not hold
+NatTypes.dfy(74,6): Error: assertion might not hold
+NatTypes.dfy(91,6): Error: assertion might not hold
+NatTypes.dfy(105,6): Error: assertion might not hold
+NatTypes.dfy(141,44): Error: value does not satisfy the subset constraints of 'nat'
+NatTypes.dfy(164,34): Error: value does not satisfy the subset constraints of 'nat'
+NatTypes.dfy(184,16): Error: value does not satisfy the subset constraints of 'nat'
+
+Dafny program verifier finished with 7 verified, 13 errors
diff --git a/Test/dafny0/NativeTypeResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NativeTypeResolution.dfy
similarity index 96%
rename from Test/dafny0/NativeTypeResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NativeTypeResolution.dfy
index 9c5a04bf83a..96601b9d9d3 100644
--- a/Test/dafny0/NativeTypeResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NativeTypeResolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /printTooltips /compileTarget:cs "%s" > "%t"
+// RUN: %exits-with 2 %build --show-hints --target cs "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 newtype V = x | 0 <= x < 200  // byte
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NativeTypeResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NativeTypeResolution.dfy.expect
new file mode 100644
index 00000000000..06da8a11a83
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NativeTypeResolution.dfy.expect
@@ -0,0 +1,23 @@
+NativeTypeResolution.dfy(4,8): Info: newtype V resolves as {:nativeType "byte"} (detected range: 0 .. 200)
+NativeTypeResolution.dfy(5,29): Error: Dafny's heuristics failed to confirm 'byte' to be a compatible native type. Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.
+NativeTypeResolution.dfy(6,35): Error: Dafny's heuristics failed to confirm 'byte' to be a compatible native type. Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.
+NativeTypeResolution.dfy(8,42): Error: Dafny's heuristics failed to confirm 'byte' to be a compatible native type. Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.
+NativeTypeResolution.dfy(10,50): Info: newtype A resolves as {:nativeType "int"} (detected range: 0 .. 256)
+NativeTypeResolution.dfy(11,50): Info: newtype B resolves as target-complete {:nativeType "byte"} (detected range: 0 .. 256)
+NativeTypeResolution.dfy(12,50): Info: newtype C resolves as {:nativeType "int"} (detected range: 0 .. 256)
+NativeTypeResolution.dfy(14,21): Error: :nativeType 'reallylong' not known
+NativeTypeResolution.dfy(15,27): Error: :nativeType 'reallylong' not known
+NativeTypeResolution.dfy(17,31): Error: None of the types given in :nativeType arguments is supported by the current compilation target. Try supplying others.
+NativeTypeResolution.dfy(18,40): Error: None of the types given in :nativeType arguments is supported by the current compilation target. Try supplying others.
+NativeTypeResolution.dfy(21,22): Error: Dafny's heuristics cannot find a compatible native type. Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.
+NativeTypeResolution.dfy(22,22): Info: newtype I resolves as {:nativeType "sbyte"} (detected range: -2 .. 30)
+NativeTypeResolution.dfy(23,27): Error: Dafny's heuristics cannot find a compatible native type. Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.
+NativeTypeResolution.dfy(24,27): Info: newtype K resolves as {:nativeType "sbyte"} (detected range: -2 .. 30)
+NativeTypeResolution.dfy(29,27): Error: unexpected :nativeType argument
+NativeTypeResolution.dfy(30,21): Error: unexpected :nativeType argument
+NativeTypeResolution.dfy(31,28): Error: :nativeType can only be used on a newtype based on integers or bitvectors
+NativeTypeResolution.dfy(33,29): Error: Dafny's heuristics failed to confirm 'long' to be a compatible native type. Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.
+NativeTypeResolution.dfy(34,29): Error: Dafny's heuristics failed to confirm 'long' to be a compatible native type. Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.
+NativeTypeResolution.dfy(38,8): Info: newtype FF resolves as {:nativeType "sbyte"} (detected range: -20 .. 20)
+NativeTypeResolution.dfy(39,29): Error: Dafny's heuristics failed to confirm 'byte' to be a compatible native type. Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.
+15 resolution/type errors detected in NativeTypeResolution.dfy
diff --git a/Test/dafny0/NestedMatch.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedMatch.dfy
similarity index 98%
rename from Test/dafny0/NestedMatch.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedMatch.dfy
index be4f29c08e1..f84963dfaf6 100644
--- a/Test/dafny0/NestedMatch.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedMatch.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module NestedMatch {
diff --git a/Test/dafny0/NestedMatch.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedMatch.dfy.expect
similarity index 100%
rename from Test/dafny0/NestedMatch.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedMatch.dfy.expect
diff --git a/Test/dafny0/NestedPatterns.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatterns.dfy
similarity index 91%
rename from Test/dafny0/NestedPatterns.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatterns.dfy
index f5ee43c06a0..6e014427473 100644
--- a/Test/dafny0/NestedPatterns.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatterns.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code 2 "%s"
+
 
 datatype List<T> = Nil | Cons(head: T, tail: List<T>)
 
@@ -113,3 +113,9 @@ method Tuples2(xs: List, ys: List)
   match (xs, ys, ())
   case (Nil, Nil, ()) =>  // used to crash; now OK with unit matching
 }
+
+datatype Tree = Leaf | Node(Tree, val: int, Tree)
+
+method RegressionTest(t: Tree) {
+  var uu := var Node(nameDoesNotExist(_, xy, xright), _, xRight) := t; 2;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatterns.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatterns.dfy.expect
new file mode 100644
index 00000000000..8db0c270d18
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatterns.dfy.expect
@@ -0,0 +1,6 @@
+NestedPatterns.dfy(75,23): Error: Duplicate parameter name: h
+NestedPatterns.dfy(83,20): Error: Duplicate parameter name: h
+NestedPatterns.dfy(91,23): Error: Duplicate parameter name: e
+NestedPatterns.dfy(107,7): Error: the case pattern is a 2-element tuple, while the match expression is a 3-element tuple
+NestedPatterns.dfy(120,21): Error: constructor nameDoesNotExist does not exist in datatype Tree
+5 resolution/type errors detected in NestedPatterns.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatterns.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatterns.dfy.refresh.expect
new file mode 100644
index 00000000000..cb1b694af37
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatterns.dfy.refresh.expect
@@ -0,0 +1,6 @@
+NestedPatterns.dfy(75,23): Error: Duplicate parameter name: h
+NestedPatterns.dfy(83,20): Error: Duplicate parameter name: h
+NestedPatterns.dfy(91,23): Error: Duplicate parameter name: e
+NestedPatterns.dfy(107,7): Error: tuple type does not match type '(?156, ?157, ?158)'
+NestedPatterns.dfy(120,21): Error: constructor nameDoesNotExist does not exist in datatype Tree
+5 resolution/type errors detected in NestedPatterns.dfy
diff --git a/Test/dafny0/NestedPatternsA.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatternsA.dfy
similarity index 88%
rename from Test/dafny0/NestedPatternsA.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatternsA.dfy
index 810798bb95f..e4cab1b95ea 100644
--- a/Test/dafny0/NestedPatternsA.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatternsA.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 datatype List<T> = Nil | Cons(head: T, tail: List<T>)
 
diff --git a/Test/dafny0/NestedPatternsA.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatternsA.dfy.expect
similarity index 100%
rename from Test/dafny0/NestedPatternsA.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NestedPatternsA.dfy.expect
diff --git a/Test/dafny0/Newtypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Newtypes.dfy
similarity index 94%
rename from Test/dafny0/Newtypes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Newtypes.dfy
index 6a0e8bbc0a4..7252276c91f 100644
--- a/Test/dafny0/Newtypes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Newtypes.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %build "%s" --relax-definite-assignment > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 newtype int32 = int
@@ -88,7 +88,7 @@ module PredicateTests {
   }
 
   method N() {
-    var y: char8;
+    var y: char8 := *;
     if * {
       y := y / 2;
       y := y + 1;
@@ -359,3 +359,16 @@ module SeqTests {
   {
   }
 }
+
+module SimpleNewtypeWitness {
+  newtype A = x: int | 100 <= x witness 102
+  newtype B = a: A | true witness 103
+
+  newtype C = A // error: default witness 0 does not satisfy constraint
+  newtype D = A witness 104
+  newtype E = A ghost witness 104
+  newtype F = A witness *
+
+  newtype G = A witness 13 // error: 13 does not satisfy constraint
+  newtype H = A ghost witness 13 // error: 13 does not satisfy constraint
+}
diff --git a/Test/dafny0/Newtypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Newtypes.dfy.expect
similarity index 77%
rename from Test/dafny0/Newtypes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Newtypes.dfy.expect
index 227ebc833a3..ebbd5134d99 100644
--- a/Test/dafny0/Newtypes.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Newtypes.dfy.expect
@@ -11,5 +11,8 @@ Newtypes.dfy(223,21): Error: new number of occurrences might be negative
 Newtypes.dfy(226,39): Error: result of operation might violate newtype constraint for 'Even'
 Newtypes.dfy(238,18): Error: result of operation might violate newtype constraint for 'N'
 Newtypes.dfy(278,18): Error: result of operation might violate newtype constraint for 'R'
+Newtypes.dfy(367,10): Error: trying witness 0: result of operation might violate newtype constraint for 'A'
+Newtypes.dfy(372,24): Error: result of operation might violate newtype constraint for 'A'
+Newtypes.dfy(373,30): Error: result of operation might violate newtype constraint for 'A'
 
-Dafny program verifier finished with 37 verified, 13 errors
+Dafny program verifier finished with 43 verified, 16 errors
diff --git a/Test/dafny0/NewtypesResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NewtypesResolution.dfy
similarity index 99%
rename from Test/dafny0/NewtypesResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NewtypesResolution.dfy
index 8309e0752b8..50b31b62c90 100644
--- a/Test/dafny0/NewtypesResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NewtypesResolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Cycle {
@@ -475,7 +475,9 @@ module FunctionByMethod {
   } by method {
     return 150;
   }
+}
 
+module FunctionByMethodMore {
   type SW3 = x: int | true witness SWitness3()  // error: recursive dependency
   function SWitness3(): int {
     150
@@ -484,7 +486,6 @@ module FunctionByMethod {
   }
 
   // constants
-
   ghost const c0 := R0()  // error: recursive dependency
   function R0(): int {
     2 + c0
diff --git a/Test/dafny0/NewtypesResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NewtypesResolution.dfy.expect
similarity index 90%
rename from Test/dafny0/NewtypesResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NewtypesResolution.dfy.expect
index b6b469258e6..d23711b6192 100644
--- a/Test/dafny0/NewtypesResolution.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NewtypesResolution.dfy.expect
@@ -21,7 +21,7 @@ NewtypesResolution.dfy(156,9): Error: name of type (B) is used as a variable
 NewtypesResolution.dfy(157,11): Error: name of type (Syn) is used as a variable
 NewtypesResolution.dfy(162,8): Error: member 'U' does not exist in type synonym 'Y'
 NewtypesResolution.dfy(162,9): Error: expected method call, found expression
-NewtypesResolution.dfy(188,56): Error: incorrect argument type at index 0 for datatype constructor parameter (expected int, found bool)
+NewtypesResolution.dfy(188,61): Error: incorrect argument type at index 0 for datatype constructor parameter (expected int, found bool)
 NewtypesResolution.dfy(221,13): Error: arguments to < must have a common supertype (got Even and nat)
 NewtypesResolution.dfy(223,13): Error: arguments to < must have a common supertype (got Even and int)
 NewtypesResolution.dfy(227,13): Error: arguments to < must have a common supertype (got Even and int)
@@ -46,15 +46,14 @@ NewtypesResolution.dfy(350,7): Error: recursive constraint dependency involving
 NewtypesResolution.dfy(360,10): Error: recursive constraint dependency involving a newtype: G4 -> P -> G5 -> G6 -> G0 -> G1 -> G2 -> G3 -> G4
 NewtypesResolution.dfy(371,33): Error: a forall expression involved in a newtype definition is not allowed to depend on the set of allocated references, but values of 'r' (of type 'G5') may contain references (see documentation for 'older' parameters)
 NewtypesResolution.dfy(381,7): Error: recursive constraint dependency involving a subset type: Y -> M -> X -> Y
-NewtypesResolution.dfy(488,14): Error: const definition contains a cycle: c0 -> R0 -> c0
-NewtypesResolution.dfy(495,8): Error: const definition contains a cycle: c1 -> R1 -> R1 -> c1
-NewtypesResolution.dfy(502,8): Error: const definition contains a cycle: c2 -> R2 -> c2
 NewtypesResolution.dfy(400,10): Error: recursive constraint dependency involving a newtype: NT0 -> P0 -> NT0
 NewtypesResolution.dfy(414,7): Error: recursive constraint dependency involving a subset type: ST0 -> Q0 -> ST0
 NewtypesResolution.dfy(430,10): Error: recursive constraint dependency involving a newtype: NW0 -> NWitness0 -> NW0
-NewtypesResolution.dfy(444,10): Error: recursive constraint dependency involving a newtype: NW2 -> NWitness2 -> NWitness2 -> NW2
-NewtypesResolution.dfy(451,10): Error: recursive constraint dependency involving a newtype: NW3 -> NWitness3 -> NW3
+NewtypesResolution.dfy(444,10): Error: recursive constraint dependency involving a newtype: NW2 -> NWitness2 -> NW2
 NewtypesResolution.dfy(458,7): Error: recursive constraint dependency involving a subset type: SW0 -> SWitness0 -> SW0
-NewtypesResolution.dfy(472,7): Error: recursive constraint dependency involving a subset type: SW2 -> SWitness2 -> SWitness2 -> SW2
-NewtypesResolution.dfy(479,7): Error: recursive constraint dependency involving a subset type: SW3 -> SWitness3 -> SW3
-59 resolution/type errors detected in NewtypesResolution.dfy
+NewtypesResolution.dfy(472,7): Error: recursive constraint dependency involving a subset type: SW2 -> SWitness2 -> SW2
+NewtypesResolution.dfy(489,14): Error: const definition contains a cycle: c0 -> R0 -> c0
+NewtypesResolution.dfy(496,8): Error: const definition contains a cycle: c1 -> R1 -> R1 -> c1
+NewtypesResolution.dfy(503,8): Error: const definition contains a cycle: c2 -> R2 -> c2
+NewtypesResolution.dfy(481,7): Error: recursive constraint dependency involving a subset type: SW3 -> SWitness3 -> SW3
+58 resolution/type errors detected in NewtypesResolution.dfy
diff --git a/Test/dafny0/NoMoreAssume2Less2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoMoreAssume2Less2.dfy
similarity index 98%
rename from Test/dafny0/NoMoreAssume2Less2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoMoreAssume2Less2.dfy
index 1402aa09af2..d313dc8ba13 100644
--- a/Test/dafny0/NoMoreAssume2Less2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoMoreAssume2Less2.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // This file tests various ways of writing the equivalent of "assume false;" or "assert false;" inside a loop.
 // It used to be that Dafny's translation of such statements into Boogie could cause Boogie to cut off the
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoMoreAssume2Less2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoMoreAssume2Less2.dfy.expect
new file mode 100644
index 00000000000..5f8198a482b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoMoreAssume2Less2.dfy.expect
@@ -0,0 +1,31 @@
+NoMoreAssume2Less2.dfy(26,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(35,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(44,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(50,4): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(53,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(59,4): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(62,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(68,4): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(72,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(86,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(92,18): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(95,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(104,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(110,16): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(78,26): Related location: this proposition could not be proved
+NoMoreAssume2Less2.dfy(113,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(119,19): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(135,16): Error: this loop invariant could not be proved on entry
+ Related message: loop invariant violation
+NoMoreAssume2Less2.dfy(140,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(146,12): Error: a precondition for this call could not be proved
+NoMoreAssume2Less2.dfy(162,11): Related location: this is the precondition that could not be proved
+NoMoreAssume2Less2.dfy(149,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(158,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(175,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(180,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(186,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(191,2): Error: assertion might not hold
+NoMoreAssume2Less2.dfy(198,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 26 errors
diff --git a/Test/dafny0/NoReferencesVerification.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoReferencesVerification.dfy
similarity index 94%
rename from Test/dafny0/NoReferencesVerification.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoReferencesVerification.dfy
index b94bb9b6da7..c069afd6fc6 100644
--- a/Test/dafny0/NoReferencesVerification.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoReferencesVerification.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Test that it is known that a value of a (!new) type is allocated in every state.
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoReferencesVerification.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoReferencesVerification.dfy.expect
new file mode 100644
index 00000000000..698895dba5b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoReferencesVerification.dfy.expect
@@ -0,0 +1,6 @@
+NoReferencesVerification.dfy(16,2): Error: assertion might not hold
+NoReferencesVerification.dfy(26,4): Error: assertion might not hold
+NoReferencesVerification.dfy(33,4): Error: assertion might not hold
+NoReferencesVerification.dfy(49,2): Error: assertion might not hold
+
+Dafny program verifier finished with 2 verified, 4 errors
diff --git a/Test/dafny0/NoTypeArgs.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoTypeArgs.dfy
similarity index 96%
rename from Test/dafny0/NoTypeArgs.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoTypeArgs.dfy
index ed108f55636..d2a2580d277 100644
--- a/Test/dafny0/NoTypeArgs.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoTypeArgs.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype List<T> = Nil | Cons(hd: T, tl: List)
diff --git a/Test/dafny1/FindZero.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoTypeArgs.dfy.expect
similarity index 100%
rename from Test/dafny1/FindZero.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NoTypeArgs.dfy.expect
diff --git a/Test/dafny0/NonGhostQuantifiers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonGhostQuantifiers.dfy
similarity index 98%
rename from Test/dafny0/NonGhostQuantifiers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonGhostQuantifiers.dfy
index 112ba10b3f7..089e33b0814 100644
--- a/Test/dafny0/NonGhostQuantifiers.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonGhostQuantifiers.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 // This file contains various tests of resolving quantifiers in ghost and non-ghost positions
 module Misc {
diff --git a/Test/dafny0/NonGhostQuantifiers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonGhostQuantifiers.dfy.expect
similarity index 100%
rename from Test/dafny0/NonGhostQuantifiers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonGhostQuantifiers.dfy.expect
diff --git a/Test/dafny0/NonZeroInitialization.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitialization.dfy
similarity index 95%
rename from Test/dafny0/NonZeroInitialization.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitialization.dfy
index ff6361c8150..2dd7714219f 100644
--- a/Test/dafny0/NonZeroInitialization.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitialization.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 type MyInt_Bad = x | 6 <= x witness 5  // error: witness does not satisfy constraint
@@ -22,7 +22,7 @@ ghost predicate Yes(six: NewSix) {
   4 <= six as int
 }
 
-newtype YetAnotherNewSix = NewSix
+newtype YetAnotherNewSix = NewSix witness 80
 
 // Now with some type parameters
 datatype List<G> = Nil | Cons(G, List<G>)
diff --git a/Test/dafny0/NonZeroInitialization.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitialization.dfy.expect
similarity index 93%
rename from Test/dafny0/NonZeroInitialization.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitialization.dfy.expect
index 210c1638fa6..8a6b1dbd89c 100644
--- a/Test/dafny0/NonZeroInitialization.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitialization.dfy.expect
@@ -1,5 +1,3 @@
-NonZeroInitialization.dfy(53,0): Error: out-parameter 'g', which is subject to definite-assignment rules, might be uninitialized at this return point
-NonZeroInitialization.dfy(58,7): Error: unless an initializer is provided for the array elements, a new array of 'Yt<GW>' must have empty size
 NonZeroInitialization.dfy(4,36): Error: the given witness expression might not satisfy constraint
 NonZeroInitialization.dfy(11,5): Error: trying witness 0: result of operation might violate subset type constraint for 'Six'
 NonZeroInitialization.dfy(12,45): Error: result of operation might violate subset type constraint for 'Six'
@@ -9,7 +7,9 @@ NonZeroInitialization.dfy(17,61): Error: result of operation might violate newty
 NonZeroInitialization.dfy(18,46): Error: result of operation might violate newtype constraint for 'NewSix'
 NonZeroInitialization.dfy(19,8): Error: trying witness 0: result of operation might violate newtype constraint for 'NewSix'
 NonZeroInitialization.dfy(37,5): Error: cannot find witness that shows type is inhabited; try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-NonZeroInitialization.dfy(38,70): Error: result of operation might violate subset type constraint for 'ListTwo'
+NonZeroInitialization.dfy(38,66): Error: result of operation might violate subset type constraint for 'ListTwo'
 NonZeroInitialization.dfy(39,5): Error: cannot find witness that shows type is inhabited; try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+NonZeroInitialization.dfy(53,0): Error: out-parameter 'g', which is subject to definite-assignment rules, might be uninitialized at this return point
+NonZeroInitialization.dfy(58,7): Error: unless an initializer is provided for the array elements, a new array of 'Yt<GW>' must have empty size
 
-Dafny program verifier finished with 11 verified, 13 errors
+Dafny program verifier finished with 12 verified, 13 errors
diff --git a/Test/dafny0/NonZeroInitializationCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitializationCompile.dfy
similarity index 97%
rename from Test/dafny0/NonZeroInitializationCompile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitializationCompile.dfy
index 2fedae6d60d..8e0d1dcd3ae 100644
--- a/Test/dafny0/NonZeroInitializationCompile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitializationCompile.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 type MyInt = x | 6 <= x witness 6
 newtype MyNewInt = x | 6 <= x witness 12
diff --git a/Test/dafny0/NonZeroInitializationCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitializationCompile.dfy.expect
similarity index 100%
rename from Test/dafny0/NonZeroInitializationCompile.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitializationCompile.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitializationCompile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitializationCompile.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NonZeroInitializationCompile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/dafny0/NullComparisonWarnings.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NullComparisonWarnings.dfy
similarity index 91%
rename from Test/dafny0/NullComparisonWarnings.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NullComparisonWarnings.dfy
index 35fd5ffb3f4..405e056faf0 100644
--- a/Test/dafny0/NullComparisonWarnings.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NullComparisonWarnings.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings --relax-definite-assignment
 
 method Main() {
   print "despite the warnings, the program still compiles\n";
diff --git a/Test/dafny0/NullComparisonWarnings.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NullComparisonWarnings.dfy.expect
similarity index 100%
rename from Test/dafny0/NullComparisonWarnings.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NullComparisonWarnings.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NullComparisonWarnings.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NullComparisonWarnings.dfy.rs.check
new file mode 100644
index 00000000000..158d9484360
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NullComparisonWarnings.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>QuantifierExpr</i>.*
\ No newline at end of file
diff --git a/Test/dafny0/NullComparisonWarnings.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NullComparisonWarnings.dfy.verifier.expect
similarity index 100%
rename from Test/dafny0/NullComparisonWarnings.dfy.verifier.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/NullComparisonWarnings.dfy.verifier.expect
diff --git a/Test/dafny0/OlderResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderResolution.dfy
similarity index 84%
rename from Test/dafny0/OlderResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderResolution.dfy
index 88ebbf05e42..f51e134b5bb 100644
--- a/Test/dafny0/OlderResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderResolution.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 ghost function F0(older x: int): int // error: only predicates support 'older' parameters
 twostate function F1(older x: int): int // error: only predicates support 'older' parameters
diff --git a/Test/dafny0/OlderResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderResolution.dfy.expect
similarity index 100%
rename from Test/dafny0/OlderResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderResolution.dfy.expect
diff --git a/Test/dafny0/OlderVerification.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderVerification.dfy
similarity index 99%
rename from Test/dafny0/OlderVerification.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderVerification.dfy
index 6de446b8255..748313518e7 100644
--- a/Test/dafny0/OlderVerification.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderVerification.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // ----------------------------------
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderVerification.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderVerification.dfy.expect
new file mode 100644
index 00000000000..038ab364589
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OlderVerification.dfy.expect
@@ -0,0 +1,28 @@
+OlderVerification.dfy(35,2): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(34,16): Related location: the 'older' parameter might be newer than the other parameter when the predicate returns 'true'
+OlderVerification.dfy(43,4): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(42,16): Related location: the 'older' parameter might be newer than the other parameter when the predicate returns 'true'
+OlderVerification.dfy(95,66): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(89,18): Related location: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
+OlderVerification.dfy(145,15): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(141,18): Related location: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
+OlderVerification.dfy(174,66): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(168,18): Related location: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
+OlderVerification.dfy(264,4): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(263,18): Related location: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
+OlderVerification.dfy(268,4): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(267,18): Related location: the 'older' parameter might be newer than the other parameter when the predicate returns 'true'
+OlderVerification.dfy(272,4): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(271,18): Related location: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
+OlderVerification.dfy(276,4): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(275,18): Related location: an 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
+OlderVerification.dfy(280,4): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(279,18): Related location: an 'older' parameter might be newer than the non-'older' parameter when the predicate returns 'true'
+OlderVerification.dfy(284,4): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(283,18): Related location: an 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
+OlderVerification.dfy(289,6): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(288,20): Related location: the 'older' parameter might be newer than the other parameter when the predicate returns 'true'
+OlderVerification.dfy(293,6): Error: a postcondition could not be proved on this return path
+OlderVerification.dfy(292,20): Related location: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
+
+Dafny program verifier finished with 19 verified, 13 errors
diff --git a/Test/dafny0/OnDemandResolutionCycle.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionCycle.dfy
similarity index 84%
rename from Test/dafny0/OnDemandResolutionCycle.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionCycle.dfy
index 819ea43bcc8..f4ce5966dbf 100644
--- a/Test/dafny0/OnDemandResolutionCycle.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionCycle.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /typeSystemRefresh:1 "%s" > "%t"
+// RUN: %exits-with 2 %verify --type-system-refresh "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 type A = x | x == a // error: cycle
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionCycle.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionCycle.dfy.expect
new file mode 100644
index 00000000000..a2dfc65e669
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionCycle.dfy.expect
@@ -0,0 +1,15 @@
+OnDemandResolutionCycle.dfy(5,6): Error: Cyclic dependency among declarations: a -> A -> a
+OnDemandResolutionCycle.dfy(4,15): Error: arguments must have comparable types (got ?1 and ?0)
+OnDemandResolutionCycle.dfy(9,9): Error: Cyclic dependency among declarations: FB -> B -> FB -> b
+OnDemandResolutionCycle.dfy(7,5): Error: Cyclic dependency among declarations: B -> B -> FB -> b
+OnDemandResolutionCycle.dfy(11,6): Error: Cyclic dependency among declarations: c0 -> c1 -> c0
+OnDemandResolutionCycle.dfy(15,6): Error: Cyclic dependency among declarations: d -> D -> d
+OnDemandResolutionCycle.dfy(14,8): Error: base type of newtype 'D' is not fully determined; add an explicit type for bound variable 'x'
+OnDemandResolutionCycle.dfy(14,18): Error: arguments must have comparable types (got ?1 and ?0)
+OnDemandResolutionCycle.dfy(19,9): Error: Cyclic dependency among declarations: FE -> E -> FE -> e
+OnDemandResolutionCycle.dfy(17,8): Error: Cyclic dependency among declarations: E -> E -> FE -> e
+OnDemandResolutionCycle.dfy(22,9): Error: Cyclic dependency among declarations: f -> F -> f
+OnDemandResolutionCycle.dfy(21,8): Error: Cyclic dependency among declarations: F -> F -> f
+OnDemandResolutionCycle.dfy(24,6): Error: Cyclic dependency among declarations: g -> g
+OnDemandResolutionCycle.dfy(15,14): Error: integer literal used as if it had type D
+14 resolution/type errors detected in OnDemandResolutionCycle.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionOrdering.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionOrdering.dfy
new file mode 100644
index 00000000000..54d9f2bd672
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionOrdering.dfy
@@ -0,0 +1,199 @@
+// RUN: %verify --relax-definite-assignment --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Str(s: string) {
+  var t := s;
+}
+
+class Class<XX> {
+}
+
+method MC(c: Class<real>) {
+  var d: Class := c;
+}
+
+type Synonym<A, Unused> = seq<A>
+
+method SM(x: Synonym<int, real>, y: seq<bool>) {
+  var m: seq := y;
+
+  var a := x;
+
+  var b: Synonym<int, bool> := x; // fine
+
+  var k: seq := x;
+  var y: Synonym<int, bv29> := k; // fine
+}
+
+type ParamSub<X> = s | s == CC.GetEmpty<X>()
+
+class CC {
+  static function GetEmpty<Y>(): seq<Y> {
+    []
+  }
+}
+
+method Q0() returns (b: array<ParamSub<real>>, be: ParamSub<real>)
+{
+  if * {
+    b := new ParamSub<real>[20];
+  } else {
+    b := new ParamSub[20];
+  }
+  var a := be;
+  var d: array := b;
+  var c: ParamSub := b[0];
+
+  // For the type in the following RHS, note that type adjustments (currently) flow only from RHSs to LHSs, so it would
+  // not adjust "seq<real>" to "ParamSub<real>". However, the .PrintablePreType of the pre-type is recorded (from the declaration
+  // of parameter "b"), so pre-type inference retains that information. Consequently, the RHS type is inferred as
+  // "ParamSub<real>", so the assignment works out.
+  b := new [20];
+  var arr := new array<seq<int>>;
+  var cc := new CC;
+}
+
+type K0 = y | y == C.F(2) witness *
+type L0 = y | y == C.G(2) witness *
+type M0 = y | y == C.H(2) witness *
+
+class C {
+  static function F(x: nat): nat {
+    var u := x; u
+  }
+  static function G<X>(x: X): X {
+    var u := x; u
+  }
+  static function H<X>(x: X): seq<X> {
+    var u := [x]; u
+  }
+  static function Poly<X>(): seq<X> {
+    []
+  }
+}
+
+type K = y | y == C.F(2) witness *
+type L = y | y == C.G(2) witness *
+type M = y | y == C.H(2) witness *
+
+type MX<X> = y | y == C.Poly<X>() witness *
+
+class PolyClass<Z> {
+  static function StaticPoly<Z>(): seq<Z> {
+    var zs: seq<Z> := [];
+    zs
+  }
+  function InstancePoly<Z>(): seq<Z> {
+    var zs: seq<Z> := [];
+    zs
+  }
+  function InstanceMono(): seq<Z> {
+    var zs: seq<Z> := [];
+    zs
+  }
+}
+
+function FF<Y>(): K
+
+
+method Q1() {
+  var b: array<Six>;
+}
+
+method MM(n: nat, x: int)
+{
+  var r := n + x;
+}
+
+type Opaque
+
+type Six = x | 0 <= x witness 7
+
+type XParamSub<X> = s | s == XGetEmpty<X>()
+
+function XGetEmpty<Y>(): seq<Y> {
+  []
+}
+
+newtype N = x | x == n witness 2
+const n: int := 2
+
+const n' := 2
+
+module VariationOnOrdering0 {
+  type ParamSub<X> = s | s == CC.GetEmpty<X>()
+
+  class CC {
+    static function GetEmpty<Y>(): seq<Y> {
+      []
+    }
+  }
+
+  class QQ {
+    // In this module, Q0 follows ParamSub and GetEmpty
+    method Q0() returns (b: array<ParamSub<real>>)
+    {
+      b := new ParamSub<real>[20];
+    }
+  }
+}
+
+module VariationOnOrdering1 {
+  class QQ {
+    // In this module, Q0 precedes ParamSub and GetEmpty
+    method Q0() returns (b: array<ParamSub<real>>)
+    {
+      b := new ParamSub<real>[20];
+    }
+  }
+
+  type ParamSub<X> = s | s == CC.GetEmpty<X>()
+
+  class CC {
+    static function GetEmpty<Y>(): seq<Y> {
+      []
+    }
+  }
+}
+
+module Ordering0 {
+  class C {
+    // The use of Dt.Make in the next line causes the pre-type of Dt.Make to be computed. This test
+    // makes sure that the pre-type of Dt.Make is not called again while visiting the declaration of Dt.
+    const Y := Make(10)
+  }
+
+  datatype Dt = Make(i: int)
+}
+
+module Ordering1 {
+  // The use of Func in the next line causes the pre-types of the signature of Func to be computed. This test
+  // makes sure that the pre-types of Func are not called again while visiting the declaration of Func.
+  const Y := Func(10)
+
+  function Func(i: int): real
+}
+
+module Ordering2 {
+  class C {
+    // The use of Dt.Make in the next line causes the pre-type of Dt.Make to be computed. This test
+    // makes sure that the pre-type of Dt.Make is not called again while visiting the declaration of Dt.
+    const Y := D.Func(10)
+  }
+
+  class D {
+    static function Func(i: int): real
+  }
+}
+
+module Ordering3 {
+  class C {
+    // The use of D.Lemma in the next line causes the pre-types of the signature of Lemma to be computed. This test
+    // makes sure that the pre-types of Lemma are not called again while visiting the declaration of Lemma.
+    const Y := (D.Lemma(10); 27)
+  }
+
+  class D {
+    static lemma Lemma(i: int)
+  }
+}
diff --git a/Test/dafny1/TerminationDemos.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionOrdering.dfy.expect
similarity index 100%
rename from Test/dafny1/TerminationDemos.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OnDemandResolutionOrdering.dfy.expect
diff --git a/Test/dafny0/OpaqueConstants.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueConstants.dfy
similarity index 97%
rename from Test/dafny0/OpaqueConstants.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueConstants.dfy
index e41f9409401..005addb482c 100644
--- a/Test/dafny0/OpaqueConstants.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueConstants.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Module {
@@ -12,7 +12,7 @@ module Module {
     } else {
       reveal M.Five;
       assert M.Five == 5;
-    }
+    }    
   }
 }
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueConstants.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueConstants.dfy.expect
new file mode 100644
index 00000000000..b28e4b0886c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueConstants.dfy.expect
@@ -0,0 +1,12 @@
+OpaqueConstants.dfy(11,6): Error: assertion might not hold
+OpaqueConstants.dfy(26,6): Error: assertion might not hold
+OpaqueConstants.dfy(56,6): Error: assertion might not hold
+OpaqueConstants.dfy(58,6): Error: assertion might not hold
+OpaqueConstants.dfy(60,6): Error: assertion might not hold
+OpaqueConstants.dfy(73,8): Error: assertion might not hold
+OpaqueConstants.dfy(82,6): Error: assertion might not hold
+OpaqueConstants.dfy(84,6): Error: assertion might not hold
+OpaqueConstants.dfy(86,6): Error: assertion might not hold
+OpaqueConstants.dfy(99,8): Error: assertion might not hold
+
+Dafny program verifier finished with 3 verified, 10 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueFunctions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueFunctions.dfy
new file mode 100644
index 00000000000..4b8b360a2f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueFunctions.dfy
@@ -0,0 +1,370 @@
+// RUN: %exits-with 4 %verify --allow-deprecation --allow-axioms "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module A {
+  export NotSoMuch
+    reveals C, C.RevealedValid
+    provides C.Valid, C.Get, C.M, C.x
+  export More extends NotSoMuch
+    reveals C.Get
+
+  class C {
+    var x: int;
+
+    ghost predicate Valid()
+      reads this
+      ensures Valid() ==> 0 <= x ensures x == 8 ==> Valid()  // holds for 8, does not hold for negative numbers
+
+    ghost predicate RevealedValid()
+      reads this
+      ensures Valid() ==> 0 <= x ensures x == 8 ==> Valid()  // holds for 8, does not hold for negative numbers
+
+    ghost function Get(): int
+      reads this
+    {
+      x
+    }
+
+    constructor ()
+      ensures Valid()
+    {
+      x := 8;
+    }
+
+    method M()
+      requires Valid()
+    {
+      assert Get() == x;
+      assert x == 8;  // error
+    }
+  }
+}
+
+module A' refines A {
+  class C ... {
+    // provide bodies for Valid, RevealedValid, and M
+    ghost predicate Valid...
+    {
+      x == 8
+    }
+    ghost predicate RevealedValid...
+    {
+      x == 8
+    }
+    method N()
+      requires Valid();
+    {
+      assert Get() == x;  // this is known, because the refined body of Get is considered inside A'
+      assert x == 8;
+    }
+  }
+}
+
+abstract module B {
+  import X : A`NotSoMuch
+  method Main() {
+    var c := new X.C();
+    c.M();  // fine
+    c.x := c.x + 1;
+    c.M();  // error, because no body of Valid() is known
+  }
+
+  method L(c: X.C)
+    modifies c;
+  {
+    assert c.Get() == c.x;  // error because Get() is only provided
+    if * {
+      assert c.Valid();  // error, because Valid() may be false (for example, if c.x is negative)
+    } else if * {
+      c.x := 7;
+      assert c.Valid();  // error, because Valid() is not known to hold for x==7
+    } else {
+      c.x := 8;
+      assert c.Valid();  // fine, because the postcondition of Valid() says it holds for x==8
+    }
+  }
+}
+
+abstract module B_direct {
+  import X : A'`NotSoMuch
+  method Main() {
+    var c := new X.C();
+    if * {
+      c.M();  // fine
+      c.x := c.x + 1;  // this may ruin Valid()
+      if * {
+        assert c.Valid();  // error
+      } else {
+        c.M();  // error
+      }
+    } else {
+      assert c.Valid();
+      assert c.x == 8;  // error, because Valid is only provided
+    }
+  }
+
+  method L(c: X.C)
+    modifies c
+  {
+    assert c.Get() == c.x;  // error because Get() is only provided
+    if * {
+      assert c.Valid();  // error, because Valid() is only provided
+    } else if * {
+      c.x := 7;
+      assert c.Valid();  // error, because Valid() is only provided
+    } else {
+      c.x := 8;
+      assert c.Valid();  // fine, because the postcondition of Valid() says it holds for x==8
+    }
+  }
+
+  method K(c: X.C) {
+    if * {
+      assert c.Valid() ==> c.x == 8;  // error, because Valid() is only provided
+    } else {
+      assert c.RevealedValid() ==> c.x == 8;  // good
+    }
+  }
+}
+
+abstract module B_more {
+  import X : A'`More
+  method L(c: X.C)
+    modifies c;
+  {
+    assert c.Get() == c.x;  // yes, this is known, due to using the larger export set of A'
+  }
+}
+
+module B' refines B {
+  import X = A'`NotSoMuch
+  method Main'() {
+    var c := new X.C();
+    c.M();  // fine
+    c.x := c.x + 1;
+    if * {
+      assert c.Valid();  // error, because Valid() is opaque
+    } else {
+      c.M();  // error, because Valid() is opaque
+    }
+  }
+
+  method L'(c: X.C)
+    modifies c
+  {
+    assert c.Get() == c.x;  // error because Get() is only provided
+    if * {
+      assert c.Valid();  // error, because Valid() is only provided
+    } else if * {
+      c.x := 7;
+      assert c.Valid();  // error, because Valid() is only provided
+    } else if * {
+      c.x := 8;
+      assert c.Valid();  // fine, because Valid()'s postcondition says it holds for x==8
+    } else {
+      assert c.Valid() ==> c.x == 8;  // error, because Valid is only provided
+    }
+  }
+}
+
+// ---------------------------------
+
+module OpaqueFunctionsAreNotInlined {
+  ghost predicate {:opaque} F(n: int)
+  {
+    0 <= n < 100
+  }
+
+  method M()
+  {
+    var x := 18;
+    assert F(x);  // error: cannot be determined, since F is opaque
+  }
+
+  method M'()
+  {
+    var x := 18;
+    reveal F();
+    assert F(x);
+  }
+}
+
+// --------------------------------- opaque and refinement
+
+module M0 {
+  ghost function {:opaque} F(): int
+  { 12 }
+}
+
+module M1 refines M0 {
+}
+
+// ---------------------------------- opaque and generics
+
+ghost function {:opaque} id<A>(x: A): A { x }
+
+method id_ok()
+{
+  reveal id();
+  assert id(1) == 1;
+}
+
+method id_fail()
+{
+  assert id(1) == 1;  // error
+}
+
+datatype Box<A> = Bx(A)
+
+ghost function {:opaque} id_box(x: Box): Box { x }
+
+method box_ok()
+{
+  reveal id();
+  assert id(Bx(1)) == Bx(1);
+}
+
+method box_fail()
+{
+  assert id(Bx(1)) == Bx(1);  // error
+}
+
+// ------------------------- opaque and layer quantifiers
+
+module LayerQuantifiers
+{
+  ghost function {:opaque} f(x: nat): bool { if x == 0 then true else f(x-1) }
+
+  method rec_should_ok()
+  {
+    reveal f();
+    assert f(1);
+  }
+
+  method rec_should_fail()
+  {
+    assert f(1);  // error
+  }
+
+  method rec_should_unroll_ok(one : int)
+    requires one == 1
+  {
+    reveal f();
+    // this one should have enough fuel
+    assert f(one + one);
+  }
+
+  method rec_should_unroll_fail(one : int)
+    requires one == 1
+  {
+    reveal f();
+    assert f(one + one + one);  // error: this one does not have enough fuel
+  }
+}
+
+// ------------------------------------- regression test
+
+module Regression
+{
+  datatype List<A> = Nil | Cons(A, tl: List<A>)
+
+  ghost function Empty<A>(): List<A> { Nil }
+
+  ghost function {:opaque} Length<A>(s: List<A>): int
+    ensures 0 <= Length(s)
+  {
+    if s.Cons? then 1 + Length(s.tl) else 0
+  }
+
+  lemma Empty_ToZero<A>()
+    ensures Length<A>(Empty<A>()) == 0;  // this line once caused the verifier to crash
+  {
+    reveal Length();
+  }
+}
+
+// This function used to cause a problem for the old version of opaque,
+// but it's fine with the new fuel-based version
+ghost function {:opaque} zero<A>(): int { 0 }
+
+// ------------------------- opaque for members of non-reference types
+
+module TypeMembers {
+  trait Tr {
+    const fav: bool
+    predicate {:opaque} IsFavorite() {
+      fav
+    }
+    static ghost predicate {:opaque} IsFive(x: int) {
+      x == 5
+    }
+  }
+
+  datatype Color = Carrot | Pumpkin
+  {
+    predicate {:opaque} IsFavorite() {
+      this == Pumpkin
+    }
+    static ghost predicate {:opaque} IsFive(x: int) {
+      x == 5
+    }
+  }
+
+  newtype Small = x | 30 <= x < 40 witness 30
+  {
+    predicate {:opaque} IsFavorite() {
+      this == 34
+    }
+    static ghost predicate {:opaque} IsFive(x: int) {
+      x == 5
+    }
+  }
+
+  method Test(tr: Tr, c: Color, s: Small) {
+    if
+    case tr.IsFavorite() =>
+      assert tr.fav;  // error: this is not known here
+    case c.IsFavorite() =>
+      assert c == Pumpkin;  // error: this is not known here
+    case s.IsFavorite() =>
+      assert s == 34;  // error: this is not known here
+    case tr.IsFavorite() =>
+      reveal tr.IsFavorite();
+      assert tr.fav;
+    case c.IsFavorite() =>
+      reveal c.IsFavorite();
+      assert c == Pumpkin;
+    case s.IsFavorite() =>
+      reveal s.IsFavorite();
+      assert s == 34;
+    case true =>
+      if tr.IsFavorite() && c.IsFavorite() && s.IsFavorite() {
+        reveal tr.IsFavorite(), c.IsFavorite(), s.IsFavorite();
+        assert !tr.fav || c == Carrot || s == 39;  // error: not true
+      }
+  }
+
+  method StaticTest(x: int) {
+    if
+    case Tr.IsFive(x) =>
+      assert x == 5;  // error: this is not known here
+    case Color.IsFive(x) =>
+      assert x == 5;  // error: this is not known here
+    case Small.IsFive(x) =>
+      assert x == 5;  // error: this is not known here
+    case Tr.IsFive(x) =>
+      reveal Tr.IsFive();
+      assert x == 5;
+    case Color.IsFive(x) =>
+      reveal Color.IsFive();
+      assert x == 5;
+    case Small.IsFive(x) =>
+      reveal Small.IsFive();
+      assert x == 5;
+    case true =>
+      if Tr.IsFive(x) && Color.IsFive(x) && Small.IsFive(x) {
+        reveal Tr.IsFive(), Color.IsFive(), Small.IsFive();
+        assert x != 5;  // error: not true
+      }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueFunctions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueFunctions.dfy.expect
new file mode 100644
index 00000000000..438262974a1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueFunctions.dfy.expect
@@ -0,0 +1,36 @@
+OpaqueFunctions.dfy(214,2): Error: assertion might not hold
+OpaqueFunctions.dfy(229,2): Error: assertion might not hold
+OpaqueFunctions.dfy(38,6): Error: assertion might not hold
+OpaqueFunctions.dfy(69,7): Error: a precondition for this call could not be proved
+OpaqueFunctions.dfy(35,20): Related location: this is the precondition that could not be proved
+OpaqueFunctions.dfy(75,4): Error: assertion might not hold
+OpaqueFunctions.dfy(77,6): Error: assertion might not hold
+OpaqueFunctions.dfy(80,6): Error: assertion might not hold
+OpaqueFunctions.dfy(96,8): Error: assertion might not hold
+OpaqueFunctions.dfy(98,11): Error: a precondition for this call could not be proved
+OpaqueFunctions.dfy[A'](35,20): Related location: this is the precondition that could not be proved
+OpaqueFunctions.dfy(102,6): Error: assertion might not hold
+OpaqueFunctions.dfy(109,4): Error: assertion might not hold
+OpaqueFunctions.dfy(111,6): Error: assertion might not hold
+OpaqueFunctions.dfy(114,6): Error: assertion might not hold
+OpaqueFunctions.dfy(123,31): Error: assertion might not hold
+OpaqueFunctions.dfy(146,6): Error: assertion might not hold
+OpaqueFunctions.dfy(148,9): Error: a precondition for this call could not be proved
+OpaqueFunctions.dfy[A'](35,20): Related location: this is the precondition that could not be proved
+OpaqueFunctions.dfy(155,4): Error: assertion might not hold
+OpaqueFunctions.dfy(157,6): Error: assertion might not hold
+OpaqueFunctions.dfy(160,6): Error: assertion might not hold
+OpaqueFunctions.dfy(165,31): Error: assertion might not hold
+OpaqueFunctions.dfy(181,4): Error: assertion might not hold
+OpaqueFunctions.dfy(246,12): Error: assertion might not hold
+OpaqueFunctions.dfy(261,12): Error: assertion might not hold
+OpaqueFunctions.dfy(326,6): Error: assertion might not hold
+OpaqueFunctions.dfy(328,6): Error: assertion might not hold
+OpaqueFunctions.dfy(330,6): Error: assertion might not hold
+OpaqueFunctions.dfy(343,8): Error: assertion might not hold
+OpaqueFunctions.dfy(350,6): Error: assertion might not hold
+OpaqueFunctions.dfy(352,6): Error: assertion might not hold
+OpaqueFunctions.dfy(354,6): Error: assertion might not hold
+OpaqueFunctions.dfy(367,8): Error: assertion might not hold
+
+Dafny program verifier finished with 18 verified, 31 errors
diff --git a/Test/dafny0/OpaqueTypeWithMembers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembers.dfy
similarity index 97%
rename from Test/dafny0/OpaqueTypeWithMembers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembers.dfy
index 7a2f1c6326a..7d3588dc3fc 100644
--- a/Test/dafny0/OpaqueTypeWithMembers.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembers.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 type Opaque {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembers.dfy.expect
new file mode 100644
index 00000000000..31dab81017d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembers.dfy.expect
@@ -0,0 +1,17 @@
+OpaqueTypeWithMembers.dfy(26,13): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+OpaqueTypeWithMembers.dfy(64,13): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+OpaqueTypeWithMembers.dfy(94,13): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+OpaqueTypeWithMembers.dfy(83,42): Error: possible division by zero
+OpaqueTypeWithMembers.dfy(84,51): Error: possible division by zero
+OpaqueTypeWithMembers.dfy(87,9): Error: index out of range
+OpaqueTypeWithMembers.dfy(90,22): Error: index out of range
+OpaqueTypeWithMembers.dfy(93,18): Error: index out of range
+OpaqueTypeWithMembers.dfy(100,8): Error: possible division by zero
+OpaqueTypeWithMembers.dfy(107,17): Error: possible division by zero
+OpaqueTypeWithMembers.dfy(139,22): Error: function precondition could not be proved
+OpaqueTypeWithMembers.dfy(120,13): Related location: this proposition could not be proved
+OpaqueTypeWithMembers.dfy(141,32): Error: function precondition could not be proved
+OpaqueTypeWithMembers.dfy(115,22): Related location: this proposition could not be proved
+OpaqueTypeWithMembers.dfy(113,28): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 17 verified, 9 errors
diff --git a/Test/dafny0/OpaqueTypeWithMembersE.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembersE.dfy
similarity index 87%
rename from Test/dafny0/OpaqueTypeWithMembersE.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembersE.dfy
index 1504d6a4ced..f719f342b03 100644
--- a/Test/dafny0/OpaqueTypeWithMembersE.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembersE.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 type FailureCompatible(0) {
diff --git a/Test/dafny2/COST-verif-comp-2011-3-TwoDuplicates.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembersE.dfy.expect
similarity index 100%
rename from Test/dafny2/COST-verif-comp-2011-3-TwoDuplicates.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/OpaqueTypeWithMembersE.dfy.expect
diff --git a/Test/dafny0/ParameterResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParameterResolution.dfy
similarity index 99%
rename from Test/dafny0/ParameterResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParameterResolution.dfy
index bc07ac66885..39214ccccac 100644
--- a/Test/dafny0/ParameterResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParameterResolution.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" /dprint:"%t.dprint" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --allow-axioms
+
 
 module Actuals {
   function F(x: int, y: int, z: int): int
diff --git a/Test/dafny0/ParameterResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParameterResolution.dfy.expect
similarity index 83%
rename from Test/dafny0/ParameterResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParameterResolution.dfy.expect
index 53497fa7f28..fa181252059 100644
--- a/Test/dafny0/ParameterResolution.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParameterResolution.dfy.expect
@@ -28,15 +28,15 @@ ParameterResolution.dfy(68,30): Error: default-valued expressions are cyclicly d
 ParameterResolution.dfy(68,45): Error: default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion
 ParameterResolution.dfy(73,62): Error: default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion
 ParameterResolution.dfy(74,54): Error: default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion
+ParameterResolution.dfy(99,89): Error: ghost variables such as x are allowed only in specification contexts. x was inferred to be ghost based on its declaration or initialization.
+ParameterResolution.dfy(109,32): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
 ParameterResolution.dfy(79,22): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
-ParameterResolution.dfy(86,52): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-ParameterResolution.dfy(88,58): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ParameterResolution.dfy(86,65): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ParameterResolution.dfy(88,71): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
 ParameterResolution.dfy(95,89): Error: ghost variables such as x are allowed only in specification contexts. x was inferred to be ghost based on its declaration or initialization.
 ParameterResolution.dfy(97,82): Error: ghost variables such as x are allowed only in specification contexts. x was inferred to be ghost based on its declaration or initialization.
-ParameterResolution.dfy(99,89): Error: ghost variables such as x are allowed only in specification contexts. x was inferred to be ghost based on its declaration or initialization.
 ParameterResolution.dfy(101,89): Error: ghost variables such as x are allowed only in specification contexts. x was inferred to be ghost based on its declaration or initialization.
 ParameterResolution.dfy(104,27): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
-ParameterResolution.dfy(109,32): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
 ParameterResolution.dfy(127,14): Error: wrong number of arguments (got 0, but function 'N' expects 1: (x: int))
 ParameterResolution.dfy(133,14): Error: wrong number of arguments (got 0, but function 'O' expects 1: (x: int))
 ParameterResolution.dfy(147,12): Error: wrong number of arguments (got 0, but function 'O' expects 1: (x: int))
@@ -46,12 +46,12 @@ ParameterResolution.dfy(172,14): Error: a refining formal parameter ('x') in a r
 ParameterResolution.dfy(174,12): Error: a refining formal parameter ('x') in a refinement module is not allowed to give a default-value expression
 ParameterResolution.dfy(169,12): Error: wrong number of arguments (got 0, but function 'O' expects 1: (x: int))
 ParameterResolution.dfy[RefinementB](147,12): Error: wrong number of arguments (got 0, but function 'O' expects 1: (x: int))
-ParameterResolution.dfy(193,21): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
-ParameterResolution.dfy(194,13): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
-ParameterResolution.dfy(196,29): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
-ParameterResolution.dfy(197,26): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
-ParameterResolution.dfy(197,26): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
-ParameterResolution.dfy(198,37): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
+ParameterResolution.dfy(193,22): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
+ParameterResolution.dfy(194,14): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
+ParameterResolution.dfy(196,30): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
+ParameterResolution.dfy(197,27): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
+ParameterResolution.dfy(197,27): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
+ParameterResolution.dfy(198,38): Error: type parameter 'X' (inferred to be '?') in the function call to 'F' could not be determined
 ParameterResolution.dfy(211,23): Error: old expressions are not allowed in this context
 ParameterResolution.dfy(213,25): Error: old expressions are not allowed in this context
 ParameterResolution.dfy(216,32): Error: old expressions are not allowed in this context
@@ -90,14 +90,14 @@ ParameterResolution.dfy(351,15): Error: nameonly parameter '900' must be passed
 ParameterResolution.dfy(355,15): Error: the binding named '0900' does not correspond to any formal parameter
 ParameterResolution.dfy(355,9): Error: datatype constructor parameter '900' at index 1 requires an argument of type int
 ParameterResolution.dfy(356,25): Error: the binding named '90_0' does not correspond to any formal parameter
-ParameterResolution.dfy(369,73): Error: this parameter is effectively nameonly (because of the earlier nameonly parameter 'baz'); declare it as nameonly or give it a default-value expression
-ParameterResolution.dfy(370,71): Error: this parameter is effectively nameonly (because of the earlier nameonly parameter 'baz'); declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(369,73): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'baz'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(370,71): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'baz'; declare it as nameonly or give it a default-value expression
 ParameterResolution.dfy(377,9): Error: wrong number of arguments (got 0, but datatype constructor 'Foo' expects at least 1: (bar: string, baz: string, qux: int))
-ParameterResolution.dfy(278,33): Error: this parameter is effectively nameonly (because of the earlier nameonly parameter 'u'); declare it as nameonly or give it a default-value expression
-ParameterResolution.dfy(278,33): Error: this parameter is effectively nameonly (because of the earlier nameonly parameter 'u'); declare it as nameonly or give it a default-value expression
-ParameterResolution.dfy(281,45): Error: this parameter is effectively nameonly (because of the earlier nameonly parameter '1'); declare it as nameonly or give it a default-value expression
-ParameterResolution.dfy(284,27): Error: because of a later nameless parameter, this default value is never used; remove it or name all subsequent parameters
-ParameterResolution.dfy(285,39): Error: this parameter is effectively nameonly (because of the earlier nameonly parameter 'b'); declare it as nameonly or give it a default-value expression
-ParameterResolution.dfy(286,34): Error: this parameter is effectively nameonly (because of the earlier nameonly parameter 'b'); declare it as nameonly or give it a default-value expression
-ParameterResolution.dfy(368,79): Error: this parameter is effectively nameonly (because of the earlier nameonly parameter 'baz'); declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(278,33): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'u'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(278,33): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'u'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(281,45): Error: this parameter has to be nameonly, because of the earlier nameonly parameter '1'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(284,27): Error: because of a later nameless parameter, which is a required parameter, this default value is never used; remove it or name all subsequent parameters
+ParameterResolution.dfy(285,39): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'b'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(286,34): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'b'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(368,79): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'baz'; declare it as nameonly or give it a default-value expression
 102 resolution/type errors detected in ParameterResolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParameterResolution.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParameterResolution.dfy.refresh.expect
new file mode 100644
index 00000000000..e9c3c665ac6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParameterResolution.dfy.refresh.expect
@@ -0,0 +1,103 @@
+ParameterResolution.dfy(17,15): Error: wrong number of arguments (function 'F' expects 3, got 2)
+ParameterResolution.dfy(18,15): Error: wrong number of arguments (function 'F' expects 3, got 4)
+ParameterResolution.dfy(19,27): Error: duplicate binding for parameter name 'y'
+ParameterResolution.dfy(19,15): Error: function parameter 'z' at index 2 requires an argument of type int
+ParameterResolution.dfy(20,19): Error: the parameter named 'x' is already given positionally
+ParameterResolution.dfy(20,15): Error: function parameter 'z' at index 2 requires an argument of type int
+ParameterResolution.dfy(21,27): Error: a positional argument is not allowed to follow named arguments
+ParameterResolution.dfy(21,15): Error: function parameter 'z' at index 2 requires an argument of type int
+ParameterResolution.dfy(27,22): Error: the binding named 'xyz' does not correspond to any formal parameter
+ParameterResolution.dfy(27,15): Error: function parameter 'z' at index 2 requires an argument of type int
+ParameterResolution.dfy(30,14): Error: datatype constructor parameter at index 1 requires an argument of type bool
+ParameterResolution.dfy(31,34): Error: the parameter named 'a' is already given positionally
+ParameterResolution.dfy(31,14): Error: datatype constructor parameter at index 1 requires an argument of type bool
+ParameterResolution.dfy(60,12): Error: default-value expressions for parameters contain a cycle: x -> x
+ParameterResolution.dfy(62,12): Error: default-value expressions for parameters contain a cycle: x -> y -> z -> x
+ParameterResolution.dfy(41,24): Error: boolean literal used as if it had type int
+ParameterResolution.dfy(51,34): Error: 'this' is not allowed in a 'static' context
+ParameterResolution.dfy(52,42): Error: 'this' is not allowed in a 'static' context
+ParameterResolution.dfy(53,31): Error: 'this' is not allowed in a 'static' context
+ParameterResolution.dfy(53,35): Error: 'this' is not allowed in a 'static' context
+ParameterResolution.dfy(53,44): Error: 'this' is not allowed in a 'static' context
+ParameterResolution.dfy(53,48): Error: 'this' is not allowed in a 'static' context
+ParameterResolution.dfy(54,29): Error: 'this' is not allowed in a 'static' context
+ParameterResolution.dfy(58,39): Error: unresolved identifier: b
+ParameterResolution.dfy(66,24): Error: default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion
+ParameterResolution.dfy(68,30): Error: default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion
+ParameterResolution.dfy(68,30): Error: default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion
+ParameterResolution.dfy(68,45): Error: default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion
+ParameterResolution.dfy(73,62): Error: default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion
+ParameterResolution.dfy(74,54): Error: default-valued expressions are cyclicly dependent; this is not allowed, since it would cause infinite expansion
+ParameterResolution.dfy(99,89): Error: ghost variables such as x are allowed only in specification contexts. x was inferred to be ghost based on its declaration or initialization.
+ParameterResolution.dfy(109,32): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ParameterResolution.dfy(79,22): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ParameterResolution.dfy(86,65): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ParameterResolution.dfy(88,71): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ParameterResolution.dfy(95,89): Error: ghost variables such as x are allowed only in specification contexts. x was inferred to be ghost based on its declaration or initialization.
+ParameterResolution.dfy(97,82): Error: ghost variables such as x are allowed only in specification contexts. x was inferred to be ghost based on its declaration or initialization.
+ParameterResolution.dfy(101,89): Error: ghost variables such as x are allowed only in specification contexts. x was inferred to be ghost based on its declaration or initialization.
+ParameterResolution.dfy(104,27): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ParameterResolution.dfy(127,14): Error: wrong number of arguments (function 'N' expects 1, got 0)
+ParameterResolution.dfy(133,14): Error: wrong number of arguments (function 'O' expects 1, got 0)
+ParameterResolution.dfy(147,12): Error: wrong number of arguments (function 'O' expects 1, got 0)
+ParameterResolution.dfy(161,13): Error: a refining formal parameter ('x') in a refinement module is not allowed to give a default-value expression
+ParameterResolution.dfy(163,13): Error: a refining formal parameter ('x') in a refinement module is not allowed to give a default-value expression
+ParameterResolution.dfy(172,14): Error: a refining formal parameter ('x') in a refinement module is not allowed to give a default-value expression
+ParameterResolution.dfy(174,12): Error: a refining formal parameter ('x') in a refinement module is not allowed to give a default-value expression
+ParameterResolution.dfy(169,12): Error: wrong number of arguments (function 'O' expects 1, got 0)
+ParameterResolution.dfy[RefinementB](147,12): Error: wrong number of arguments (function 'O' expects 1, got 0)
+ParameterResolution.dfy(193,22): Error: type parameter 'X' (inferred to be '?0') in the function call to 'F' could not be determined
+ParameterResolution.dfy(194,14): Error: type parameter 'X' (inferred to be '?1') in the function call to 'F' could not be determined
+ParameterResolution.dfy(196,30): Error: type parameter 'X' (inferred to be '?3') in the function call to 'F' could not be determined
+ParameterResolution.dfy(197,27): Error: type parameter 'X' (inferred to be '?4') in the function call to 'F' could not be determined
+ParameterResolution.dfy(197,27): Error: type parameter 'X' (inferred to be '?4') in the function call to 'F' could not be determined
+ParameterResolution.dfy(198,38): Error: type parameter 'X' (inferred to be '?27') in the function call to 'F' could not be determined
+ParameterResolution.dfy(211,23): Error: old expressions are not allowed in this context
+ParameterResolution.dfy(213,25): Error: old expressions are not allowed in this context
+ParameterResolution.dfy(216,32): Error: old expressions are not allowed in this context
+ParameterResolution.dfy(217,33): Error: old expressions are not allowed in this context
+ParameterResolution.dfy(225,14): Error: the name 'Nothing' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Ax.Nothing')
+ParameterResolution.dfy(226,14): Error: the name 'Nothing' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Ax.Nothing')
+ParameterResolution.dfy(227,14): Error: the name 'Nothing' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Ax.Nothing')
+ParameterResolution.dfy(239,17): Error: wrong number of arguments (datatype constructor 'Create' expects at most 1, got 2)
+ParameterResolution.dfy(246,5): Error: method in-parameter 'a' at index 0 requires an argument of type int
+ParameterResolution.dfy(246,5): Error: method in-parameter 'b' at index 1 requires an argument of type int
+ParameterResolution.dfy(247,5): Error: method in-parameter 'a' at index 0 requires an argument of type int
+ParameterResolution.dfy(247,5): Error: method in-parameter 'b' at index 1 requires an argument of type int
+ParameterResolution.dfy(252,21): Error: Duplicate parameter name: x
+ParameterResolution.dfy(259,11): Error: default-value expressions for parameters contain a cycle: x -> x
+ParameterResolution.dfy(260,35): Error: unresolved identifier: _k
+ParameterResolution.dfy(261,26): Error: unresolved identifier: _k
+ParameterResolution.dfy(290,21): Error: nameonly parameter 'c' must be passed using a name binding; it cannot be passed positionally
+ParameterResolution.dfy(297,26): Error: nameonly parameter 'c' must be passed using a name binding; it cannot be passed positionally
+ParameterResolution.dfy(301,34): Error: a positional argument is not allowed to follow named arguments
+ParameterResolution.dfy(305,23): Error: nameonly parameter 'b' must be passed using a name binding; it cannot be passed positionally
+ParameterResolution.dfy(308,28): Error: the binding named 'unknown' does not correspond to any formal parameter
+ParameterResolution.dfy(312,19): Error: a positional argument is not allowed to follow named arguments
+ParameterResolution.dfy(313,11): Error: nameonly parameter 'b' must be passed using a name binding; it cannot be passed positionally
+ParameterResolution.dfy(313,16): Error: the parameter named 'b' is already given positionally
+ParameterResolution.dfy(314,21): Error: duplicate binding for parameter name 'b'
+ParameterResolution.dfy(323,16): Error: nameonly parameter 'b' must be passed using a name binding; it cannot be passed positionally
+ParameterResolution.dfy(328,15): Error: wrong number of arguments (least predicate 'LP' expects at least 2, got 1)
+ParameterResolution.dfy(329,15): Error: least predicate parameter 'b' at index 1 requires an argument of type int
+ParameterResolution.dfy(333,36): Error: the parameter named 'a' is already given positionally
+ParameterResolution.dfy(336,21): Error: nameonly parameter 'u' must be passed using a name binding; it cannot be passed positionally
+ParameterResolution.dfy(337,29): Error: a positional argument is not allowed to follow named arguments
+ParameterResolution.dfy(337,12): Error: constructor in-parameter 'x' at index 1 requires an argument of type int
+ParameterResolution.dfy(340,37): Error: duplicate binding for parameter name 'x'
+ParameterResolution.dfy(343,12): Error: unresolved identifier: a
+ParameterResolution.dfy(351,15): Error: nameonly parameter '900' must be passed using a name binding; it cannot be passed positionally
+ParameterResolution.dfy(355,15): Error: the binding named '0900' does not correspond to any formal parameter
+ParameterResolution.dfy(355,9): Error: datatype constructor parameter '900' at index 1 requires an argument of type int
+ParameterResolution.dfy(356,25): Error: the binding named '90_0' does not correspond to any formal parameter
+ParameterResolution.dfy(369,73): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'baz'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(370,71): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'baz'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(377,9): Error: wrong number of arguments (datatype constructor 'Foo' expects at least 1, got 0)
+ParameterResolution.dfy(278,33): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'u'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(278,33): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'u'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(281,45): Error: this parameter has to be nameonly, because of the earlier nameonly parameter '1'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(284,27): Error: because of a later nameless parameter, which is a required parameter, this default value is never used; remove it or name all subsequent parameters
+ParameterResolution.dfy(285,39): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'b'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(286,34): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'b'; declare it as nameonly or give it a default-value expression
+ParameterResolution.dfy(368,79): Error: this parameter has to be nameonly, because of the earlier nameonly parameter 'baz'; declare it as nameonly or give it a default-value expression
+102 resolution/type errors detected in ParameterResolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParseErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParseErrors.dfy
new file mode 100644
index 00000000000..1f3ebe08358
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParseErrors.dfy
@@ -0,0 +1,298 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --allow-deprecation
+
+
+// ---------------------- chaining operators -----------------------------------
+
+method TestChaining0(j: int, k: int, m: int)
+  requires j != k != m;  // error: cannot have more than one != per chain
+  requires j == k == m;  // dandy
+  requires j < k == m == m+1 != m+2 >= 100;  // error: cannot mix < and >=
+  requires j >= k == m == m-1 != m-2 < 100;  // error: cannot mix >= and <
+{
+}
+
+method TestChaining1<T>(s: set<T>, t: set<T>, u: set<T>, x: T, SuperSet: set<set<T>>)
+  requires s <= t <= u >= s+u;  // error: cannot mix <= and >=
+  ensures s <= u;
+  ensures s !! t !! u; // valid, means pairwise disjoint
+  ensures x in s in SuperSet;  // error: 'in' is not chaining
+  ensures x !in s in SuperSet;  // error: 'in' is not chaining
+  ensures x in s !in SuperSet;  // error: 'in' is not chaining
+  ensures x in s == t;  // error: 'in' is not chaining
+{
+}
+
+method TestChaining2(a: set<int>, b: set<int>, c: set<int>)
+{
+  var x := a !! b !! c;
+  var y := a !! b == c;  // error
+  var z0 := a == (b !! c);
+  var z1 := (a == b) !! c;
+  var z2 := a == b !! c;  // error: == and !! do not chain together (regression test)
+}
+
+// ---------------------- calc statements -----------------------------------
+
+method TestCalc()
+{
+  calc {} // OK, empty calculations are allowed
+  calc {
+	2 + 3; // OK, single-line calculations are allowed
+  }
+  calc {
+	2 + 3;
+	calc {  // OK: a calc statement is allowed as a sub-hint
+		2;
+		1 + 1;
+	}
+	calc {
+		3;
+		1 + 2;
+	}
+	{ assert true; } // OK: multiple subhints are allowed between two lines
+	1 + 1 + 1 + 2;
+	{ assert 1 + 1 + 1 == 3; }
+	{ assert true; }
+	3 + 2;
+  }
+  calc != { // error: != is not allowed as the main operator of a calculation
+	2 + 3;
+	4;
+  }
+  calc { // OK, these operators are compatible
+	2 + 3;
+	> 4;
+	>= 2 + 2;
+  }
+  calc < { // OK, these operators are compatible
+	2 + 3;
+	== 5;
+	<= 3 + 3;
+  }
+  calc < { // error: cannot mix < and >= or >
+	2 + 3;
+	>= 5;
+	> 2 + 2;
+	6;
+  }
+  calc >= { // error: cannot mix >= and <= or !=
+	2 + 3;
+	<= 5;
+	!= 2 + 2;
+	3;
+  }
+  calc { // error: cannot have more than one != per calc
+	2 + 3;
+	!= 4;
+	!= 1 + 2;
+	3;
+  }
+}
+
+// ---------------------- ghost modifier on methods -----------------------------------
+
+ghost method GhM()
+
+ghost lemma GhL()  // error: a lemma is not allowed to be declared "ghost" -- it is already ghost
+
+ghost least lemma GhIL()  // error: a lemma is not allowed to be declared "ghost" -- it is already ghost
+
+ghost greatest lemma GhCL()  // error: a lemma is not allowed to be declared "ghost" -- it is already ghost
+
+ghost twostate lemma GhL2()  // error: a lemma is not allowed to be declared "ghost" -- it is already ghost
+
+class C {
+  constructor Make()
+  ghost method M()
+}
+
+// ---------------------- ghost parameters -----------------------------------
+
+method M(ghost x: int) returns (ghost y: int)  // error: ditto
+
+ghost method GM(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- the method is already ghost
+  returns (ghost y: int)  // error: ditto
+
+lemma L(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a lemma is already ghost
+  returns (ghost y: int)  // error: ditto
+
+least lemma IL(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a lemma is already ghost
+  returns (ghost y: int)  // error: ditto (actually, least lemmas are not allowed out-parameters at all)
+
+greatest lemma CoL(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a lemma is already ghost
+  returns (ghost y: int)  // error: ditto (actually, co-lemmas are not allowed out-parameters at all)
+
+twostate lemma L2(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a lemma is already ghost
+  returns (ghost y: int)  // error: ditto
+
+class C {
+  constructor Make(ghost x: int)
+  method M(ghost x: int) returns (ghost y: int)
+}
+
+ghost function F(ghost x: int): int  // error: formal not allowed to be declared "ghost" here -- a function is already ghost
+function FM(ghost x: int): int
+ghost predicate P(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a predicate is already ghost
+
+least predicate IP(ghost x: int)  // error: formal not allowed to be declared "ghost" here
+                                      // -- a least predicate is already ghost
+greatest predicate CoP(ghost x: int)  // error: formal not allowed to be declared "ghost" here
+                                      // -- a greatest predicate is already ghost
+
+twostate function F2(ghost x: int): int  // error: formal not allowed to be declared "ghost" here -- a function is already ghost
+twostate predicate P2(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a predicate is already ghost
+
+// ------------------------- set and map displays ------------------------------
+method Displays()
+    // all of these should parse, but at one point they did not
+    ensures iset{} == iset{}
+    ensures map[] == map[]
+    ensures imap[] == imap[]
+
+method SetComprehensionParsingRegression0()
+{
+  // these once had crashed the parser
+  var s0 := set x,y;
+  var s1 := set x,y | true;
+}
+
+// ------------------------- type members ------------------------------
+
+datatype Dt<A> = Blue | Bucket(diameter: real) | Business(trendy: bool, a: A)
+{
+  var x: int  // mutable fields not allowed in datatypes, but this is not checked by the parser (any more)
+}
+newtype Pos = x | 0 < x witness 1
+{
+  var x: int  // mutable fields not allowed in newtypes, but this is not checked by the parser (any more)
+}
+type Opaque {
+  var x: int  // mutable field not allowed in opaque type, but this is not checked by the parser (any more)
+}
+
+// ------------------------- nameonly parameters ------------------------------
+
+module NameOnlyParameters {
+  // name-less datatype fields
+  datatype D =
+    | D0(int, nameonly int) // error: nameonly modifier must be followed by parameter name
+    | D1(int, nameonly int, real) // error: nameonly modifier must be followed by parameter name
+    | D2(int, nameonly x: int)
+  // named function results
+  ghost function F(nameonly y: int): int
+  ghost function G(y: int): (nameonly r: int) // error: 'nameonly' unexpected here
+  // out-parameters
+  method M(nameonly x: int) returns (y: int)
+  method N(x: int) returns (nameonly y: int) // error: 'nameonly' not allowed here
+  // yield-parameters
+  iterator Iter0(nameonly x: int) yields (y: int)
+  iterator Iter0(x: int) yields (nameonly y: int) // error: 'nameonly' not allowed here
+}
+
+// ------------------------- parameters of ghost constructors ------------------------------
+
+module GhostConstructors {
+  class Either {
+    constructor A(x: int) {
+    }
+    ghost constructor B(x: int) {
+    }
+    constructor C(ghost x: int) {
+    }
+    ghost constructor D(ghost x: int) { // error: don't use 'ghost' keyword for ghost constructor parameters
+    }
+}
+}
+
+// ------------------------- static keyword ------------------------------
+
+module IllegalStatic {
+  class C {
+    static constructor () // error: constructor cannot be declared 'static'
+  }
+  static method M() // warning: 'static' not allowed here
+  static ghost function F(): int // warning: 'static' not allowed here
+  static lemma F() // warning: 'static' not allowed here
+  static twostate function F2(): int // warning: 'static' not allowed here
+  static least predicate LP() // warning: 'static' not allowed here
+
+  static datatype D = D // error: cannot be 'static'
+  static module M { } // error: cannot be 'static'
+}
+
+// ------------------------- ghost keyword ------------------------------
+
+module IllegalGhost {
+  ghost datatype D = D // error: cannot be 'ghost'
+  ghost module M { } // error: cannot be 'ghost'
+}
+
+// ------------------------- already-ghost functions ------------------------------
+
+module AlreadyGhost {
+  // a twostate function/predicate cannot be used with ...
+  ghost twostate function F(): int { 2 } by method { } // error (x2): ... with "by method" or "ghost"
+  twostate function G(): int { 2 } by method { } // error: ... with "by method"
+  ghost twostate predicate P() { true } by method { } // error (x2): ... with "by method" or "ghost"
+  twostate predicate Q() { true } by method { } // error: ... with "by method"
+
+  // an extreme predicate cannot be used with ...
+  ghost least predicate I() { true } by method { } // error (x2): ... with "by method" or "ghost"
+  ghost greatest predicate J() { true } by method { } // error (x2): ... with "by method" or "ghost"
+
+  // a twostate or extreme predicate is not allowed to be declared with either "by method" or "abstract"
+  abstract twostate function A0(): int { 2 } by method { } // error (x2)
+  abstract twostate predicate A1() { true } by method { } // error (x2)
+  abstract least predicate A2() { true } by method { } // error (x2)
+  abstract greatest predicate A3() { true } by method { } // error (x2)
+}
+
+// ------------------------- 'older' contextual keyword ------------------------------
+
+module Older {
+  ghost function F(older x: X): R
+  ghost predicate P(older older older x: X)
+  least predicate Q(older older older x: X) // error (x3): 'older' is an identifier here
+  method M(older x: X) // error: 'older' is an identifier here
+  ghost function F(): (older r: R) // error: 'older' is an identifier here
+
+  twostate function W(a: A, new older new older b: B, nameonly older nameonly c: C := "hello"): int
+  function C(a: A, ghost older older b: B, nameonly ghost older nameonly ghost c: C := "hello"): int
+  twostate lemma L(nameonly older nameonly c: C := "hello") // error: 'older' is an identifier here
+}
+
+// ---------------------- ghost arguments of arrow types -----------------------------------
+
+module ArrowTypes {
+  const f: (ghost int, int) -> int // error: arrow-type arguments are not allowed to be ghost
+
+  method M() {
+    var g: (real, (ghost int, int), bool) -> int;
+    var h: ((ghost int, int)) -> int;
+    var i: (bool, ghost real, int, ghost bv6) -> ORDINAL; // error (x2): ghost not allowed
+  }
+}
+
+// ---------------------- missing parentheses for `predicate` -----------------------------------
+
+module MissingPredicateParens0 {
+  predicate P<A>
+} // error: expecting open paren
+
+module MissingPredicateParens1 {
+  predicate P<A> { // error: expecting open paren
+    true
+  }
+}
+
+module MissingPredicateParens2 {
+  predicate P<A> { // error: expecting open paren
+    true
+  } by method {
+    return true;
+  }
+}
+
+// ---------------------- invalid newtype definition -----------------------------------
+
+newtype T {} // error: newtype is expected to have an '='
diff --git a/Test/dafny0/ParseErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParseErrors.dfy.expect
similarity index 96%
rename from Test/dafny0/ParseErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParseErrors.dfy.expect
index f0b35782750..26dacfd1124 100644
--- a/Test/dafny0/ParseErrors.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParseErrors.dfy.expect
@@ -79,5 +79,8 @@ ParseErrors.dfy(261,28): Error: formal cannot be declared 'older' in this contex
 ParseErrors.dfy(267,12): Error: arrow-type arguments may not be declared as 'ghost'
 ParseErrors.dfy(272,18): Error: arrow-type arguments may not be declared as 'ghost'
 ParseErrors.dfy(272,35): Error: arrow-type arguments may not be declared as 'ghost'
-ParseErrors.dfy(278,10): Error: invalid NewtypeDecl
-77 parse errors detected in ParseErrors.dfy
+ParseErrors.dfy(280,0): Error: openparen expected
+ParseErrors.dfy(283,17): Error: openparen expected
+ParseErrors.dfy(289,17): Error: openparen expected
+ParseErrors.dfy(298,10): Error: invalid NewtypeDecl
+80 parse errors detected in ParseErrors.dfy
diff --git a/Test/dafny0/ParserOptions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParserOptions.dfy
similarity index 93%
rename from Test/dafny0/ParserOptions.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParserOptions.dfy
index 41b437538a6..3f0a2255914 100644
--- a/Test/dafny0/ParserOptions.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParserOptions.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This module tests support for the `:options` attribute
 
diff --git a/Test/dafny4/Bug104.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParserOptions.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug104.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ParserOptions.dfy.expect
diff --git a/Test/dafny0/PrecedenceLinter.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrecedenceLinter.dfy
similarity index 98%
rename from Test/dafny0/PrecedenceLinter.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrecedenceLinter.dfy
index 77c77435a3a..f267e25eef9 100644
--- a/Test/dafny0/PrecedenceLinter.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrecedenceLinter.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %resolve "%s" --allow-warnings > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost predicate P0(A: bool, B: bool, C: bool) {
@@ -581,3 +581,12 @@ module MatchAcrossMultipleLines {
     }
   }
 }
+
+datatype Result = Success | Failure(s: string)
+  
+function ValidateAction(b: bool): Result
+{
+  if b then Success
+  else Failure(
+      "hello")
+}
\ No newline at end of file
diff --git a/Test/dafny0/PrecedenceLinter.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrecedenceLinter.dfy.expect
similarity index 98%
rename from Test/dafny0/PrecedenceLinter.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrecedenceLinter.dfy.expect
index f782f68b2ff..386a142dc13 100644
--- a/Test/dafny0/PrecedenceLinter.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrecedenceLinter.dfy.expect
@@ -22,4 +22,4 @@ PrecedenceLinter.dfy(463,11): Warning: unusual indentation in else branch of if-
 PrecedenceLinter.dfy(478,17): Warning: unusual indentation in else branch of if-then-else (which ends at line 479, column 9); do you perhaps need parentheses?
 PrecedenceLinter.dfy(480,17): Warning: unusual indentation in else branch of if-then-else (which ends at line 481, column 13); do you perhaps need parentheses?
 
-Dafny program verifier finished with 17 verified, 0 errors
+Dafny program verifier did not attempt verification
diff --git a/Test/dafny0/PredExpr.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PredExpr.dfy
similarity index 93%
rename from Test/dafny0/PredExpr.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PredExpr.dfy
index c86f9fceb22..0d6c693a547 100644
--- a/Test/dafny0/PredExpr.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PredExpr.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 ghost function SimpleAssert(n: int): int
   ensures n < 100
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PredExpr.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PredExpr.dfy.expect
new file mode 100644
index 00000000000..eac7f88f1a0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PredExpr.dfy.expect
@@ -0,0 +1,6 @@
+PredExpr.dfy(7,2): Error: assertion might not hold
+PredExpr.dfy(39,14): Error: value does not satisfy the subset constraints of 'nat'
+PredExpr.dfy(52,7): Error: assertion might not hold
+PredExpr.dfy(77,4): Error: assertion might not hold
+
+Dafny program verifier finished with 6 verified, 4 errors
diff --git a/Test/dafny0/Predicates.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Predicates.dfy
similarity index 94%
rename from Test/dafny0/Predicates.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Predicates.dfy
index a142574e86d..9342196ac69 100644
--- a/Test/dafny0/Predicates.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Predicates.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // ------------------------------------------------
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Predicates.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Predicates.dfy.expect
new file mode 100644
index 00000000000..7dd91a5486b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Predicates.dfy.expect
@@ -0,0 +1,6 @@
+Predicates.dfy(62,4): Error: assertion might not hold
+Predicates.dfy(66,4): Error: assertion might not hold
+Predicates.dfy(105,4): Error: a postcondition could not be proved on this return path
+Predicates.dfy(104,14): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 16 verified, 3 errors
diff --git a/Test/dafny0/PrefixSyntax.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixSyntax.dfy
similarity index 93%
rename from Test/dafny0/PrefixSyntax.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixSyntax.dfy
index b9121c7aee3..85d1974cec8 100644
--- a/Test/dafny0/PrefixSyntax.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixSyntax.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype TextProcessing =
   | TeX    // prefix |
diff --git a/Test/dafny1/BDD.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixSyntax.dfy.expect
similarity index 100%
rename from Test/dafny1/BDD.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixSyntax.dfy.expect
diff --git a/Test/dafny0/PrefixTypeSubst.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixTypeSubst.dfy
similarity index 77%
rename from Test/dafny0/PrefixTypeSubst.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixTypeSubst.dfy
index 6974f3ce0a9..521097d8499 100644
--- a/Test/dafny0/PrefixTypeSubst.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixTypeSubst.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /env:0 /rprint:- "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --rprint:-
+
 
 class MyClass<A,B> {
   greatest predicate P<X,Y>(x: X, y: Y)
@@ -130,3 +130,37 @@ greatest lemma RstRst10<alpha,beta,gamma>[nat]()
 {
   // automatic induction takes care of the proof
 }
+
+// Test that default-value substitutions are printed correct (including the
+// printing of let-such-that expressions after substitution, which once didn't
+// print the substitution).
+module DefaultValueExpressionSubstitution {
+  method Test() {
+    var r := 3 + Fa<real>(7);
+    r := r + Fb<real>();
+    var rs := {2.7};
+    r := r + Fc<real>(rs);
+    r := r + Fd<real>(rs);
+    r := r + Fe<real>(rs);
+  }
+
+  function Fa<X(0)>(n: int, acc: int := n + var x: X :| true; n): int {
+    20
+  }
+
+  function Fb<X(0)>(s: set<X> := {}): int {
+    21
+  }
+
+  function Fc<X(0)>(s: set<X>, b: bool := forall xa: X :: xa in s ==> true): int {
+    22
+  }
+
+  function Fd<X(0)>(s: set<X>, b: bool := exists xe :: xe in s): int {
+    23
+  }
+
+  function Fe<X(0)>(s: set<X>, t: set<X> := var tt: set<X> := s; tt): int {
+    24
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixTypeSubst.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixTypeSubst.dfy.expect
new file mode 100644
index 00000000000..f9c007a32cc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrefixTypeSubst.dfy.expect
@@ -0,0 +1,706 @@
+// PrefixTypeSubst.dfy
+
+/*
+module _System {
+  /* CALL GRAPH for module _System:
+   * SCC at height 1:
+   *   RotateLeft
+   * SCC at height 1:
+   *   RotateRight
+   * SCC at height 0:
+   *   array
+   * SCC at height 0:
+   *   nat
+   * SCC at height 0:
+   *   object
+   */
+  type string(==,0) = seq<char>
+
+  type {:axiom} nat(==,0) = x: int
+    | 0 <= x
+
+  trait {:compile false} object { }
+  /*-- non-null type
+  type {:axiom} object(==) = c: object? | c != null /*special witness*/
+  */
+
+  class {:compile false} array<arg> {
+    const Length: int
+  }
+  /*-- non-null type
+  type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
+  */
+
+  type {:compile false} /*_#Func1*/ -T0 ~> +R {
+    ghost function requires(x0: T0): bool
+      reads reads(x0)
+
+    ghost function reads(x0: T0): set<object?>
+      reads reads(x0)
+  }
+
+  type {:compile false} /*_#PartialFunc1*/ -T0 --> +R = f: T0 ~> R
+    | forall x0: T0 :: f.reads(x0) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc1*/ -T0 -> +R = f: T0 --> R
+    | forall x0: T0 :: f.requires(x0)
+    /*special witness*/
+
+  type {:compile false} /*_#Func0*/ () ~> +R {
+    ghost function requires(): bool
+      reads reads()
+
+    ghost function reads(): set<object?>
+      reads reads()
+  }
+
+  type {:compile false} /*_#PartialFunc0*/ () --> +R = f: () ~> R
+    | f.reads() == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc0*/ () -> +R = f: () --> R
+    | f.requires()
+    /*special witness*/
+
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+
+  type bool { }
+
+  type char { }
+
+  type int { }
+
+  type real {
+    const Floor: int
+  }
+
+  type ORDINAL {
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
+  }
+
+  type _bv {
+    function RotateLeft(w: nat): selftype
+
+    function RotateRight(w: nat): selftype
+  }
+
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
+  type map<+T, +U> {
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
+  }
+
+  type imap<*T, +U> {
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
+  }
+
+  datatype /*_tuple#0*/ () = _#Make0
+
+  type {:compile false} /*_#Func2*/ (-T0, -T1) ~> +R {
+    ghost function requires(x0: T0, x1: T1): bool
+      reads reads(x0, x1)
+
+    ghost function reads(x0: T0, x1: T1): set<object?>
+      reads reads(x0, x1)
+  }
+
+  type {:compile false} /*_#PartialFunc2*/ (-T0, -T1) --> +R = f: (T0, T1) ~> R
+    | forall x0: T0, x1: T1 :: f.reads(x0, x1) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc2*/ (-T0, -T1) -> +R = f: (T0, T1) --> R
+    | forall x0: T0, x1: T1 :: f.requires(x0, x1)
+    /*special witness*/
+
+  type {:compile false} /*_#Func3*/ (-T0, -T1, -T2) ~> +R {
+    ghost function requires(x0: T0, x1: T1, x2: T2): bool
+      reads reads(x0, x1, x2)
+
+    ghost function reads(x0: T0, x1: T1, x2: T2): set<object?>
+      reads reads(x0, x1, x2)
+  }
+
+  type {:compile false} /*_#PartialFunc3*/ (-T0, -T1, -T2) --> +R = f: (T0, T1, T2) ~> R
+    | forall x0: T0, x1: T1, x2: T2 :: f.reads(x0, x1, x2) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc3*/ (-T0, -T1, -T2) -> +R = f: (T0, T1, T2) --> R
+    | forall x0: T0, x1: T1, x2: T2 :: f.requires(x0, x1, x2)
+    /*special witness*/
+}
+// bitvector types in use:
+*/
+
+/* CALL GRAPH for module _module:
+ * SCC at height 4:
+ *   RstRst7#
+ * SCC at height 3:
+ *   MyClass.M#
+ * SCC at height 3:
+ *   RstRst7
+ * SCC at height 2:
+ *   RstRst5#
+ *   RstRst5
+ * SCC at height 2:
+ *   RstRst6#
+ *   RstRst6
+ * SCC at height 2:
+ *   RstRst8#
+ *   RstRst8
+ * SCC at height 2:
+ *   RstRst9#
+ *   RstRst9
+ * SCC at height 2:
+ *   MyClass.L#
+ * SCC at height 2:
+ *   MyClass.M
+ * SCC at height 2:
+ *   N#
+ * SCC at height 2:
+ *   O#
+ * SCC at height 2:
+ *   RstRst0#
+ * SCC at height 2:
+ *   RstRst1#
+ * SCC at height 2:
+ *   RstRst10#
+ * SCC at height 2:
+ *   RstRst2#
+ * SCC at height 2:
+ *   RstRst3#
+ * SCC at height 2:
+ *   RstRst4#
+ * SCC at height 1:
+ *   MyClass.L
+ * SCC at height 1:
+ *   MyClass.P#
+ * SCC at height 1:
+ *   MyClass.R#
+ * SCC at height 1:
+ *   MyClass.RST#
+ * SCC at height 1:
+ *   MyClass.RST_Nat#
+ * SCC at height 1:
+ *   MyClass.S#
+ * SCC at height 1:
+ *   N
+ * SCC at height 1:
+ *   O
+ * SCC at height 1:
+ *   RstRst0
+ * SCC at height 1:
+ *   RstRst1
+ * SCC at height 1:
+ *   RstRst10
+ * SCC at height 1:
+ *   RstRst2
+ * SCC at height 1:
+ *   RstRst3
+ * SCC at height 1:
+ *   RstRst4
+ * SCC at height 0:
+ *   MyClass
+ * SCC at height 0:
+ *   MyClass.P
+ * SCC at height 0:
+ *   MyClass.R
+ * SCC at height 0:
+ *   MyClass.RST
+ * SCC at height 0:
+ *   MyClass.RST_Nat
+ * SCC at height 0:
+ *   MyClass.S
+ */
+greatest lemma N<D0, D1, D2>(o: MyClass<D0, D1>)
+  ensures o.R<D2>()
+{
+  N<D0, D1, D2>(o);
+}
+/***
+lemma {:axiom} /*{:_inductionTrigger o.R#[_k]()}*/ /*{:_induction _k}*/ N#<D0, D1, D2>[_k: ORDINAL](o: MyClass<D0, D1>)
+  ensures o.R#<D2>[_k]()
+  decreases _k, o
+{
+  if 0 < _k.Offset {
+    N#<D0, D1, D2>[_k - 1](o);
+  } else {
+    forall _k': ORDINAL, o: MyClass<D0, D1> /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger o.R#<D2>[_k']()} | _k' < _k
+      ensures o.R#[_k']()
+    {
+      N#[_k'](o)
+    }
+  }
+}
+***/
+
+greatest lemma O<D0, D1, D2>()
+  ensures MyClass<D0, D1>.S<D2>()
+{
+  O<D0, D1, D2>();
+}
+/***
+lemma {:axiom} /*{:_inductionTrigger MyClass<D0, D1>.S#[_k]()}*/ /*{:_induction _k}*/ O#<D0, D1, D2>[_k: ORDINAL]()
+  ensures MyClass<D0, D1>.S#<D2>[_k]()
+  decreases _k
+{
+  if 0 < _k.Offset {
+    O#<D0, D1, D2>[_k - 1]();
+  } else {
+    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<D0, D1>.S#<D2>[_k']()} {:trigger _k' < _k} | _k' < _k
+      ensures MyClass<D0, D1>.S#[_k']()
+    {
+      O#[_k']()
+    }
+  }
+}
+***/
+
+greatest lemma {:induction false} RstRst0<alpha, gamma>()
+  ensures MyClass<alpha, char>.RST<gamma>()
+{
+  RstRst0<int, gamma>();
+}
+/***
+lemma {:induction false} {:axiom} RstRst0#<alpha, gamma>[_k: ORDINAL]()
+  ensures MyClass<alpha, char>.RST#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k.Offset {
+    RstRst0#<int, gamma>[_k - 1]();
+  } else {
+    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, char>.RST#<gamma>[_k']()} {:trigger _k' < _k} | _k' < _k
+      ensures MyClass<alpha, char>.RST#[_k']()
+    {
+      RstRst0#[_k']()
+    }
+  }
+}
+***/
+
+greatest lemma {:induction false} RstRst1<alpha, gamma>()
+  ensures MyClass<alpha, char>.RST<gamma>()
+{
+  RstRst1<int, int>();
+}
+/***
+lemma {:induction false} {:axiom} RstRst1#<alpha, gamma>[_k: ORDINAL]()
+  ensures MyClass<alpha, char>.RST#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k.Offset {
+    RstRst1#<int, int>[_k - 1]();
+  } else {
+    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, char>.RST#<gamma>[_k']()} {:trigger _k' < _k} | _k' < _k
+      ensures MyClass<alpha, char>.RST#[_k']()
+    {
+      RstRst1#[_k']()
+    }
+  }
+}
+***/
+
+greatest lemma {:induction false} RstRst2<alpha, gamma>()
+  ensures MyClass<alpha, char>.RST<gamma>()
+{
+  RstRst2<alpha, gamma>();
+}
+/***
+lemma {:induction false} {:axiom} RstRst2#<alpha, gamma>[_k: ORDINAL]()
+  ensures MyClass<alpha, char>.RST#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k.Offset {
+    RstRst2#<alpha, gamma>[_k - 1]();
+  } else {
+    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, char>.RST#<gamma>[_k']()} {:trigger _k' < _k} | _k' < _k
+      ensures MyClass<alpha, char>.RST#[_k']()
+    {
+      RstRst2#[_k']()
+    }
+  }
+}
+***/
+
+greatest lemma {:induction false} RstRst3<alpha, beta, gamma>()
+  ensures MyClass<alpha, beta>.RST<gamma>()
+{
+  RstRst3<alpha, beta, gamma>();
+}
+/***
+lemma {:induction false} {:axiom} RstRst3#<alpha, beta, gamma>[_k: ORDINAL]()
+  ensures MyClass<alpha, beta>.RST#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k.Offset {
+    RstRst3#<alpha, beta, gamma>[_k - 1]();
+  } else {
+    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, beta>.RST#<gamma>[_k']()} {:trigger _k' < _k} | _k' < _k
+      ensures MyClass<alpha, beta>.RST#[_k']()
+    {
+      RstRst3#[_k']()
+    }
+  }
+}
+***/
+
+greatest lemma {:induction false} RstRst4<alpha, beta, gamma>()
+  ensures MyClass<alpha, beta>.RST<gamma>()
+{
+  RstRst4<beta, alpha, gamma>();
+}
+/***
+lemma {:induction false} {:axiom} RstRst4#<alpha, beta, gamma>[_k: ORDINAL]()
+  ensures MyClass<alpha, beta>.RST#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k.Offset {
+    RstRst4#<beta, alpha, gamma>[_k - 1]();
+  } else {
+    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, beta>.RST#<gamma>[_k']()} {:trigger _k' < _k} | _k' < _k
+      ensures MyClass<alpha, beta>.RST#[_k']()
+    {
+      RstRst4#[_k']()
+    }
+  }
+}
+***/
+
+greatest lemma {:induction false} RstRst5<alpha, gamma>()
+  ensures MyClass<alpha, char>.RST<gamma>()
+{
+  if 2 <= _k.Offset {
+    RstRst5#<alpha, gamma>[_k - 2]();
+  } else {
+    assert _k.Offset == 1;
+  }
+}
+/***
+lemma {:induction false} {:axiom} RstRst5#<alpha, gamma>[_k: ORDINAL]()
+  ensures MyClass<alpha, char>.RST#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k.Offset {
+    if 2 <= _k.Offset {
+      RstRst5#<alpha, gamma>[_k - 2]();
+    } else {
+      assert _k.Offset == 1;
+    }
+  } else {
+    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, char>.RST#<gamma>[_k']()} {:trigger _k' < _k} | _k' < _k
+      ensures MyClass<alpha, char>.RST#[_k']()
+    {
+      RstRst5#[_k']()
+    }
+  }
+}
+***/
+
+greatest lemma {:induction false} RstRst6<alpha, beta, gamma>()
+  ensures MyClass<alpha, beta>.RST<gamma>()
+{
+  if
+  case true =>
+    RstRst6<beta, alpha, gamma>();
+  case 2 <= _k.Offset =>
+    RstRst6#<alpha, beta, gamma>[_k - 2]();
+}
+/***
+lemma {:induction false} {:axiom} RstRst6#<alpha, beta, gamma>[_k: ORDINAL]()
+  ensures MyClass<alpha, beta>.RST#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k.Offset {
+    if
+    case true =>
+      RstRst6#<beta, alpha, gamma>[_k - 1]();
+    case 2 <= _k.Offset =>
+      RstRst6#<alpha, beta, gamma>[_k - 2]();
+  } else {
+    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, beta>.RST#<gamma>[_k']()} {:trigger _k' < _k} | _k' < _k
+      ensures MyClass<alpha, beta>.RST#[_k']()
+    {
+      RstRst6#[_k']()
+    }
+  }
+}
+***/
+
+greatest lemma RstRst7<alpha, beta, gamma>()
+  ensures MyClass<alpha, beta>.RST<gamma>()
+{
+  if _k != 1 && _k.Offset == 1 {
+    RstRst6<beta, alpha, gamma>();
+  } else {
+  }
+}
+/***
+lemma {:axiom} /*{:_inductionTrigger MyClass<alpha, beta>.RST#[_k]()}*/ /*{:_induction _k}*/ RstRst7#<alpha, beta, gamma>[_k: ORDINAL]()
+  ensures MyClass<alpha, beta>.RST#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k.Offset {
+    if _k != 1 && _k.Offset == 1 {
+      RstRst6<beta, alpha, gamma>();
+    } else {
+    }
+  } else {
+    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, beta>.RST#<gamma>[_k']()} {:trigger _k' < _k} | _k' < _k
+      ensures MyClass<alpha, beta>.RST#[_k']()
+    {
+      RstRst7#[_k']()
+    }
+  }
+}
+***/
+
+greatest lemma {:induction false} RstRst8<alpha, gamma>[nat]()
+  ensures MyClass<alpha, char>.RST_Nat<gamma>()
+{
+  if 2 <= _k {
+    RstRst8#<alpha, gamma>[_k - 2]();
+  }
+}
+/***
+lemma {:induction false} {:axiom} RstRst8#<alpha, gamma>[_k: nat]()
+  ensures MyClass<alpha, char>.RST_Nat#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k {
+    if 2 <= _k {
+      RstRst8#<alpha, gamma>[_k - 2]();
+    }
+  }
+}
+***/
+
+greatest lemma {:induction false} RstRst9<alpha, beta, gamma>[nat]()
+  ensures MyClass<alpha, beta>.RST_Nat<gamma>()
+{
+  if 2 <= _k {
+    RstRst9#<alpha, beta, gamma>[_k - 2]();
+  }
+}
+/***
+lemma {:induction false} {:axiom} RstRst9#<alpha, beta, gamma>[_k: nat]()
+  ensures MyClass<alpha, beta>.RST_Nat#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k {
+    if 2 <= _k {
+      RstRst9#<alpha, beta, gamma>[_k - 2]();
+    }
+  }
+}
+***/
+
+greatest lemma RstRst10<alpha, beta, gamma>[nat]()
+  ensures MyClass<alpha, beta>.RST_Nat<gamma>()
+{
+}
+/***
+lemma {:axiom} /*{:_inductionTrigger MyClass<alpha, beta>.RST_Nat#[_k]()}*/ /*{:_induction _k}*/ RstRst10#<alpha, beta, gamma>[_k: nat]()
+  ensures MyClass<alpha, beta>.RST_Nat#<gamma>[_k]()
+  decreases _k
+{
+  if 0 < _k {
+  }
+}
+***/
+
+class MyClass<A, B> {
+  greatest predicate P<X, Y>(x: X, y: Y)
+  {
+    P(x, y)
+  }
+  /*** (note, what is printed here does not show substitutions of calls to prefix predicates)
+  predicate {:axiom} P#<X, Y>[_k: ORDINAL](x: X, y: Y)
+    decreases _k
+  {
+    P(x, y)
+  }
+  ***/
+
+  greatest predicate R<T>()
+  {
+    R<T>()
+  }
+  /*** (note, what is printed here does not show substitutions of calls to prefix predicates)
+  predicate {:axiom} R#<T>[_k: ORDINAL]()
+    decreases _k
+  {
+    R<T>()
+  }
+  ***/
+
+  static greatest predicate S<Q>()
+  {
+    S<Q>()
+  }
+  /*** (note, what is printed here does not show substitutions of calls to prefix predicates)
+  static predicate {:axiom} S#<Q>[_k: ORDINAL]()
+    decreases _k
+  {
+    S<Q>()
+  }
+  ***/
+
+  static greatest predicate RST<QQ>()
+  {
+    MyClass<B, A>.RST<QQ>()
+  }
+  /*** (note, what is printed here does not show substitutions of calls to prefix predicates)
+  static predicate {:axiom} RST#<QQ>[_k: ORDINAL]()
+    decreases _k
+  {
+    MyClass<B, A>.RST<QQ>()
+  }
+  ***/
+
+  static greatest predicate RST_Nat<QQ>[nat]()
+  {
+    MyClass<B, A>.RST_Nat<QQ>()
+  }
+  /*** (note, what is printed here does not show substitutions of calls to prefix predicates)
+  static predicate {:axiom} RST_Nat#<QQ>[_k: nat]()
+    decreases _k
+  {
+    MyClass<B, A>.RST_Nat<QQ>()
+  }
+  ***/
+
+  greatest lemma L<U, V>(u: U, v: V)
+    ensures P(u, v)
+  {
+    L(u, v);
+  }
+  /***
+  lemma {:axiom} /*{:_inductionTrigger P#[_k](u, v)}*/ /*{:_induction _k}*/ L#<U, V>[_k: ORDINAL](u: U, v: V)
+    ensures P#[_k](u, v)
+    decreases _k
+  {
+    if 0 < _k.Offset {
+      L#[_k - 1](u, v);
+    } else {
+      forall _k': ORDINAL, u: U, v: V /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger this.P#<U, V>[_k'](u, v)} | _k' < _k
+        ensures this.P#[_k'](u, v)
+      {
+        L#[_k'](u, v)
+      }
+    }
+  }
+  ***/
+
+  greatest lemma M<W>()
+    ensures R<char>()
+  {
+    M<W>();
+    assert R#<char>[_k - 1]();
+  }
+  /***
+  lemma {:axiom} /*{:_inductionTrigger R#[_k]()}*/ /*{:_induction _k}*/ M#<W>[_k: ORDINAL]()
+    ensures R#<char>[_k]()
+    decreases _k
+  {
+    if 0 < _k.Offset {
+      M#<W>[_k - 1]();
+      assert R#<char>[_k - 1]();
+    } else {
+      forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger this.R#<char>[_k']()} {:trigger _k' < _k} | _k' < _k
+        ensures this.R#[_k']()
+      {
+        M#[_k']()
+      }
+    }
+  }
+  ***/
+}
+/*-- non-null type
+type {:axiom} MyClass(==)<A, B> = c: MyClass?<A, B> | c != null /*special witness*/
+*/
+
+module DefaultValueExpressionSubstitution {
+  /* CALL GRAPH for module DefaultValueExpressionSubstitution:
+   * SCC at height 1:
+   *   Test
+   * SCC at height 0:
+   *   Fa
+   * SCC at height 0:
+   *   Fb
+   * SCC at height 0:
+   *   Fc
+   * SCC at height 0:
+   *   Fd
+   * SCC at height 0:
+   *   Fe
+   */
+  method Test()
+  {
+    var r: int := 3 + Fa<real>(7, 7 + var x: real :| true; 7);
+    r := r + Fb<real>({});
+    var rs: set<real> := {2.7};
+    r := r + Fc<real>(rs, forall xa: real {:trigger xa in rs} :: xa in rs ==> true);
+    r := r + Fd<real>(rs, exists xe: real {:trigger xe in rs} :: xe in rs);
+    r := r + Fe<real>(rs, var tt: set<real> := rs; tt);
+  }
+
+  function Fa<X(0)>(n: int, acc: int := n + var x: X :| true; n): int
+    decreases n, acc
+  {
+    20
+  }
+
+  function Fb<X(==,0)>(s: set<X> := {}): int
+    decreases s
+  {
+    21
+  }
+
+  function Fc<X(==,0)>(s: set<X>, b: bool := forall xa: X :: xa in s ==> true): int
+    decreases s, b
+  {
+    22
+  }
+
+  function Fd<X(==,0)>(s: set<X>, b: bool := exists xe: X :: xe in s): int
+    decreases s, b
+  {
+    23
+  }
+
+  function Fe<X(==,0)>(s: set<X>, t: set<X> := var tt: set<X> := s; tt): int
+    decreases s, t
+  {
+    24
+  }
+}
+PrefixTypeSubst.dfy(52,0): Error: a postcondition could not be proved on this return path
+PrefixTypeSubst.dfy(51,40): Related location: this is the postcondition that could not be proved
+PrefixTypeSubst.dfy(19,24): Related location: this proposition could not be proved
+PrefixTypeSubst.dfy(58,0): Error: a postcondition could not be proved on this return path
+PrefixTypeSubst.dfy(57,40): Related location: this is the postcondition that could not be proved
+PrefixTypeSubst.dfy(19,24): Related location: this proposition could not be proved
+PrefixTypeSubst.dfy(64,0): Error: a postcondition could not be proved on this return path
+PrefixTypeSubst.dfy(63,40): Related location: this is the postcondition that could not be proved
+PrefixTypeSubst.dfy(19,24): Related location: this proposition could not be proved
+PrefixTypeSubst.dfy(70,0): Error: a postcondition could not be proved on this return path
+PrefixTypeSubst.dfy(69,40): Related location: this is the postcondition that could not be proved
+PrefixTypeSubst.dfy(19,24): Related location: this proposition could not be proved
+PrefixTypeSubst.dfy(85,9): Error: a postcondition could not be proved on this return path
+PrefixTypeSubst.dfy(81,40): Related location: this is the postcondition that could not be proved
+PrefixTypeSubst.dfy(19,24): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 12 verified, 5 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrettyPrinting.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrettyPrinting.dfy
new file mode 100644
index 00000000000..143cbc8bbc9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrettyPrinting.dfy
@@ -0,0 +1,249 @@
+// RUN: %exits-with 2 %build --print:- --no-verify "%s" > "%t"
+// RUN: %exits-with 2 %build --print:- --no-verify --type-system-refresh "%s" > "%t.refresh"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %diff "%s.expect" "%t.refresh"
+
+module A {
+  method M()
+}
+
+module B refines A {
+  method M ... {
+    while true
+    while true
+      invariant true
+      invariant true
+    while true
+      decreases 5
+    while true
+      modifies {}
+    while ...
+    while true
+      ...
+    while true {
+      var u := 0;
+    }
+    var x := 10;
+  }
+
+  method P(a: array<int>)
+    modifies a
+  {
+    forall i | 0 <= i < 100 {
+      a[i] := 200;
+    }
+    forall i | 0 <= i < 100
+      ensures true
+    forall i | 0 <= i < 100
+      ensures true
+    {
+    }
+  }
+}
+
+module C {
+  method For() {
+    ghost var (x, y) := (123, 234);
+    var a := new int[100];
+    for i := 0 to 100 {
+      a[i] := i;
+    }
+    for i := 100 downto 0 {
+      a[i] := i;
+    }
+    for i: nat := 0 to 100
+    for i: nat := 100 downto 0
+    for i := 0 to 100
+      invariant a[5] == 5
+      invariant a[12] == 12
+    for i := 100 downto 0
+      invariant a[5] == 5
+    for i := 0 to 100
+      invariant a[5] == 5
+      invariant a[12] == 12
+    {
+    }
+    for i := 100 downto 0
+      invariant a[5] == 5
+    {
+      assert true;
+    }
+    for i := 0 to *
+      decreases 100 - i
+      invariant i <= 100
+    for i := 0 to *
+      decreases *
+    {
+    }
+    var c := new Cell;
+    for i := 0 to 100
+      modifies c
+      modifies {c}, {c}
+    {
+    }
+    for i := 100 downto *
+      modifies c
+      decreases i
+      modifies {c}, {c}
+      invariant -68 <= i <= 68
+      invariant i != 3
+    {
+    }
+  }
+  class Cell { var data: int }
+}
+
+module Ats {
+  class Cell {
+    var data: int
+
+    method M()
+    {
+      label Label:
+      assert old(data) == old@Label(data);
+      assert unchanged(this) && unchanged@Label(this);
+      var c := new Cell;
+      assert fresh(c) && fresh@Label(c);
+    }
+  }
+}
+
+module ByMethod {
+  function F(x: nat): int {
+    x
+  } by method {
+    var j := 0;
+    for _ := 0 to x {
+      j := j - 1;
+    }
+    return -j;
+  }
+}
+
+module GhostConstructors {
+  class C {
+    constructor X()
+    ghost constructor Y()
+  }
+}
+
+module BreakContinue {
+  method M() {
+    label Outer:
+    for i := 0 to 100 {
+    label Inner:
+      for j := 0 to 100 {
+        label X: {
+          label Innerer:
+          for k := 0 to 100 {
+            if
+            case true => break;
+            case true => continue;
+            case true => break break;
+            case true => break continue;
+            case true => break break break;
+            case true => break break continue;
+            case true => break Innerer;
+            case true => break Inner;
+            case true => break Outer;
+            case true => break X;
+            case true => continue Innerer;
+            case true => continue Inner;
+            case true => continue Outer;
+          }
+        }
+      }
+    }
+  }
+}
+
+module New {
+  method M() {
+    var three := 3;
+    var a;
+    a := new int[3] [20, 50, 70];
+    a := new [3] [20, 50, 70];
+    a := new [three] [20, 50, 70];
+    a := new int[] [20, 50, 70];
+    a := new [] [20, 50, 70];
+  }
+}
+
+module BoundedPolymorphism {
+  trait Trait { }
+
+  datatype DT<W extends Trait> = Dt(w: W)
+
+  type Syn<X extends Trait> = DT<X>
+
+  class Class<Y extends Trait> {
+  }
+
+  trait AnotherTrait<Z extends Trait> {
+  }
+
+  type Abstract<V extends Trait extends AnotherTrait<Trait>>
+
+  trait Generic<Q> { }
+
+  codatatype Mutual<A extends Generic<B>, B extends Generic<A>> = More(Mutual)
+
+  function Function<K extends Trait>(k: K): int { 2 }
+
+  method Method<L extends Trait>(l: L) { }
+
+  least predicate Least<M extends Trait>(m: M) { true }
+
+  greatest lemma Greatest<N extends Trait>(n: N) { }
+
+  iterator Iter<O extends Trait>(o: O) { }
+}
+
+module SimpleNewtypeWitness {
+  newtype A = x: int | 100 <= x witness 102
+  newtype B = a: A | true witness 103
+
+  newtype C = A
+  newtype D = A witness 104
+  newtype E = A ghost witness 104
+  newtype F = A witness *
+}
+
+module DecreasesTo {
+  lemma Lemma(x: int) {
+  }
+
+  datatype Record = R
+
+  ghost method ParseAndPrettyPrintTests(b: bool)
+    ensures (Lemma(0); true)
+
+    ensures (if b then Lemma(0); true else Lemma(0); true)
+    ensures if b then Lemma(0); true else (Lemma(0); true)
+
+    ensures (Lemma(0); b <==> b) // Lemma(0) comes before <==> expression
+    ensures (Lemma(0); (b <==> b)) // same as above
+    ensures ((Lemma(0); b) <==> (Lemma(1); b))
+
+    ensures (Lemma(0); true decreases to (Lemma(1); false)) // Lemma(0) comes before the entire decreases-to
+    ensures (Lemma(0); true, Lemma(1); true decreases to (Lemma(2); false)) == (true, true) // Lemma(1) comes before the entire decreases-to
+    ensures (true, Lemma(0); true decreases to (Lemma(1); false)) == (true, true) // Lemma(0) comes before the entire decreases-to
+    ensures (Lemma(0); R, Lemma(0); true) decreases to (Lemma(0); R)
+    ensures (Lemma(0); true) decreases to (Lemma(0); false)
+  {
+    while Lemma(0); false  {
+    }
+    while if b then Lemma(0); false else Lemma(0); false
+    {
+    }
+    while (Lemma(0); false decreases to (Lemma(1); false))
+    {
+    }
+    while (Lemma(0); R, Lemma(0); true) decreases to (Lemma(0); 15)
+    {
+    }
+    while (Lemma(0); true) decreases to (Lemma(0); 15)
+    {
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrettyPrinting.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrettyPrinting.dfy.expect
new file mode 100644
index 00000000000..d32f0a26a53
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrettyPrinting.dfy.expect
@@ -0,0 +1,289 @@
+PrettyPrinting.dfy(20,10): Warning: the ... refinement feature in statements is deprecated
+PrettyPrinting.dfy(22,6): Warning: the ... refinement feature in statements is deprecated
+// PrettyPrinting.dfy
+
+
+module A {
+  method M()
+}
+
+module B refines A {
+  method M ...
+  {
+    while true
+    while true
+      invariant true
+      invariant true
+    while true
+      decreases 5
+    while true
+      modifies {}
+    while ...
+    while true
+      ...;
+    while true {
+      var u := 0;
+    }
+    var x := 10;
+  }
+
+  method P(a: array<int>)
+    modifies a
+  {
+    forall i | 0 <= i < 100 {
+      a[i] := 200;
+    }
+    forall i | 0 <= i < 100
+      ensures true
+    forall i | 0 <= i < 100
+      ensures true
+    {
+    }
+  }
+}
+
+module C {
+  method For()
+  {
+    ghost var (x, y) := (123, 234);
+    var a := new int[100];
+    for i := 0 to 100 {
+      a[i] := i;
+    }
+    for i := 100 downto 0 {
+      a[i] := i;
+    }
+    for i: nat := 0 to 100
+    for i: nat := 100 downto 0
+    for i := 0 to 100
+      invariant a[5] == 5
+      invariant a[12] == 12
+    for i := 100 downto 0
+      invariant a[5] == 5
+    for i := 0 to 100
+      invariant a[5] == 5
+      invariant a[12] == 12
+    {
+    }
+    for i := 100 downto 0
+      invariant a[5] == 5
+    {
+      assert true;
+    }
+    for i := 0 to *
+      invariant i <= 100
+      decreases 100 - i
+    for i := 0 to *
+      decreases *
+    {
+    }
+    var c := new Cell;
+    for i := 0 to 100
+      modifies c, {c}, {c}
+    {
+    }
+    for i := 100 downto *
+      invariant -68 <= i <= 68
+      invariant i != 3
+      decreases i
+      modifies c, {c}, {c}
+    {
+    }
+  }
+
+  class Cell {
+    var data: int
+  }
+}
+
+module Ats {
+  class Cell {
+    var data: int
+
+    method M()
+    {
+      label Label:
+      assert old(data) == old@Label(data);
+      assert unchanged(this) && unchanged@Label(this);
+      var c := new Cell;
+      assert fresh(c) && fresh@Label(c);
+    }
+  }
+}
+
+module ByMethod {
+  function F(x: nat): int
+  {
+    x
+  } by method {
+    var j := 0;
+    for _v0 := 0 to x {
+      j := j - 1;
+    }
+    return -j;
+  }
+}
+
+module GhostConstructors {
+  class C {
+    constructor X()
+
+    ghost constructor Y()
+  }
+}
+
+module BreakContinue {
+  method M()
+  {
+    label Outer:
+    for i := 0 to 100 {
+      label Inner:
+      for j := 0 to 100 {
+        label X:
+        {
+          label Innerer:
+          for k := 0 to 100 {
+            if
+            case true =>
+              break;
+            case true =>
+              continue;
+            case true =>
+              break break;
+            case true =>
+              break continue;
+            case true =>
+              break break break;
+            case true =>
+              break break continue;
+            case true =>
+              break Innerer;
+            case true =>
+              break Inner;
+            case true =>
+              break Outer;
+            case true =>
+              break X;
+            case true =>
+              continue Innerer;
+            case true =>
+              continue Inner;
+            case true =>
+              continue Outer;
+          }
+        }
+      }
+    }
+  }
+}
+
+module New {
+  method M()
+  {
+    var three := 3;
+    var a;
+    a := new int[3] [20, 50, 70];
+    a := new [3] [20, 50, 70];
+    a := new [three] [20, 50, 70];
+    a := new int[] [20, 50, 70];
+    a := new [] [20, 50, 70];
+  }
+}
+
+module BoundedPolymorphism {
+  function Function<K extends Trait>(k: K): int
+  {
+    2
+  }
+
+  method Method<L extends Trait>(l: L)
+  {
+  }
+
+  least predicate Least<M extends Trait>(m: M)
+  {
+    true
+  }
+
+  greatest lemma Greatest<N extends Trait>(n: N)
+  {
+  }
+
+  trait Trait { }
+
+  datatype DT<W extends Trait> = Dt(w: W)
+
+  type Syn<X extends Trait> = DT<X>
+
+  class Class<Y extends Trait> { }
+
+  trait AnotherTrait<Z extends Trait> { }
+
+  type Abstract<V extends Trait extends AnotherTrait<Trait>>
+
+  trait Generic<Q> { }
+
+  codatatype Mutual<A extends Generic<B>, B extends Generic<A>> = More(Mutual)
+
+  iterator Iter<O extends Trait>(o: O)
+  {
+  }
+}
+
+module SimpleNewtypeWitness {
+  newtype A = x: int
+    | 100 <= x
+    witness 102
+
+  newtype B = a: A
+    | true
+    witness 103
+
+  newtype C = A
+
+  newtype D = A
+    witness 104
+
+  newtype E = A
+    ghost witness 104
+
+  newtype F = A
+    witness *
+}
+
+module DecreasesTo {
+  lemma Lemma(x: int)
+  {
+  }
+
+  ghost method ParseAndPrettyPrintTests(b: bool)
+    ensures (Lemma(0); true)
+    ensures if b then Lemma(0); true else (Lemma(0); true)
+    ensures if b then Lemma(0); true else (Lemma(0); true)
+    ensures (Lemma(0); b <==> b)
+    ensures (Lemma(0); b <==> b)
+    ensures (Lemma(0); b) <==> (Lemma(1); b)
+    ensures (Lemma(0); true decreases to (Lemma(1); false))
+    ensures (Lemma(0); true, Lemma(1); true decreases to (Lemma(2); false)) == (true, true)
+    ensures (true, Lemma(0); true decreases to (Lemma(1); false)) == (true, true)
+    ensures (Lemma(0); R, Lemma(0); true) decreases to (Lemma(0); R)
+    ensures (Lemma(0); true) decreases to (Lemma(0); false)
+  {
+    while Lemma(0); false {
+    }
+    while if b then Lemma(0); false else Lemma(0); false {
+    }
+    while Lemma(0); false decreases to (Lemma(1); false) {
+    }
+    while (Lemma(0); R, Lemma(0); true) decreases to (Lemma(0); 15) {
+    }
+    while (Lemma(0); true) decreases to (Lemma(0); 15) {
+    }
+  }
+
+  datatype Record = R
+}
+PrettyPrinting.dfy(20,4): Error: skeleton statements are allowed only in refining methods
+PrettyPrinting.dfy(21,4): Error: skeleton statements are allowed only in refining methods
+PrettyPrinting.dfy(75,16): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+3 resolution/type errors detected in PrettyPrinting.dfy
diff --git a/Test/dafny0/PrintEffects.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintEffects.dfy
similarity index 100%
rename from Test/dafny0/PrintEffects.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintEffects.dfy
diff --git a/Test/dafny0/PrintEffects.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintEffects.dfy.expect
similarity index 100%
rename from Test/dafny0/PrintEffects.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintEffects.dfy.expect
diff --git a/Test/dafny0/PrintEffectsResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintEffectsResolution.dfy
similarity index 90%
rename from Test/dafny0/PrintEffectsResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintEffectsResolution.dfy
index bb014114b8f..283191308eb 100644
--- a/Test/dafny0/PrintEffectsResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintEffectsResolution.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:3 "%s" > "%t"
-// RUN: %exits-with 2 %dafny /compile:3 /trackPrintEffects:1 "%s" >> "%t"
+// RUN: %exits-with 2 %run "%s" > "%t"
+// RUN: %exits-with 2 %run --track-print-effects "%s" >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // The errors in this file are produced regardless of /trackPrintEffects setting.
diff --git a/Test/dafny0/PrintEffectsResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintEffectsResolution.dfy.expect
similarity index 100%
rename from Test/dafny0/PrintEffectsResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintEffectsResolution.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintUTF8.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintUTF8.dfy
new file mode 100644
index 00000000000..51f9b5b5827
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintUTF8.dfy
@@ -0,0 +1,5 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+method Main() {
+  print "Mikaël fixed UTF8\n";
+}
diff --git a/Test/dafny0/PrintUTF8.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintUTF8.dfy.expect
similarity index 100%
rename from Test/dafny0/PrintUTF8.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/PrintUTF8.dfy.expect
diff --git a/Test/dafny0/Protected.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Protected.dfy
similarity index 91%
rename from Test/dafny0/Protected.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Protected.dfy
index 35d0fc0ba9d..5d44f9f41dc 100644
--- a/Test/dafny0/Protected.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Protected.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module Library {
   export
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Protected.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Protected.dfy.expect
new file mode 100644
index 00000000000..16b928f6e56
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Protected.dfy.expect
@@ -0,0 +1,7 @@
+Protected.dfy(21,8): Error: assertion might not hold
+Protected.dfy(35,6): Error: assertion might not hold
+Protected.dfy(39,4): Error: assertion might not hold
+Protected.dfy(52,4): Error: assertion might not hold
+Protected.dfy(59,4): Error: assertion might not hold
+
+Dafny program verifier finished with 3 verified, 5 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ProtectedResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ProtectedResolution.dfy
new file mode 100644
index 00000000000..1224bf97752
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ProtectedResolution.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module M0 {
+  ghost function F(): int { 5 }
+  ghost predicate P() { true }
+}
+module M1 refines M0 {
+  ghost function F... { 7 }  // error: not allowed to change body
+  ghost predicate P... { true }  // error: not allowed to extend body
+}
diff --git a/Test/dafny0/ProtectedResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ProtectedResolution.dfy.expect
similarity index 100%
rename from Test/dafny0/ProtectedResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ProtectedResolution.dfy.expect
diff --git a/Test/dafny0/QuantificationNewSyntax.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntax.dfy
similarity index 90%
rename from Test/dafny0/QuantificationNewSyntax.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntax.dfy
index 76e43114d92..34fa96b2bba 100644
--- a/Test/dafny0/QuantificationNewSyntax.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntax.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module {:options "/quantifierSyntax:4"} NewSyntax {
   method M()
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntax.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntax.dfy.expect
new file mode 100644
index 00000000000..ad5488fa695
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntax.dfy.expect
@@ -0,0 +1,8 @@
+QuantificationNewSyntax.dfy(11,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+QuantificationNewSyntax.dfy(12,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+QuantificationNewSyntax.dfy(11,42): Error: possible division by zero
+QuantificationNewSyntax.dfy(13,37): Error: function precondition could not be proved
+QuantificationNewSyntax.dfy(19,48): Related location: this proposition could not be proved
+QuantificationNewSyntax.dfy(15,54): Error: result of operation might violate subset type constraint for 'nat'
+
+Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/dafny0/QuantificationNewSyntaxParseErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntaxParseErrors.dfy
similarity index 94%
rename from Test/dafny0/QuantificationNewSyntaxParseErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntaxParseErrors.dfy
index 5a0a8002668..f9add3ba725 100644
--- a/Test/dafny0/QuantificationNewSyntaxParseErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntaxParseErrors.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module {:options "--quantifier-syntax=3"} OldSyntax {
   method M()
diff --git a/Test/dafny0/QuantificationNewSyntaxParseErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntaxParseErrors.dfy.expect
similarity index 100%
rename from Test/dafny0/QuantificationNewSyntaxParseErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntaxParseErrors.dfy.expect
diff --git a/Test/dafny0/QuantificationNewSyntaxResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntaxResolution.dfy
similarity index 96%
rename from Test/dafny0/QuantificationNewSyntaxResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntaxResolution.dfy
index 5ef3034b883..bad392cf9fa 100644
--- a/Test/dafny0/QuantificationNewSyntaxResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntaxResolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module {:options "/quantifierSyntax:4"} NewSyntax {
diff --git a/Test/dafny0/QuantificationNewSyntaxResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntaxResolution.dfy.expect
similarity index 100%
rename from Test/dafny0/QuantificationNewSyntaxResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/QuantificationNewSyntaxResolution.dfy.expect
diff --git a/Test/dafny0/RangeCompilation.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RangeCompilation.dfy
similarity index 82%
rename from Test/dafny0/RangeCompilation.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RangeCompilation.dfy
index 3f3e6aed0f8..552f23a76e9 100644
--- a/Test/dafny0/RangeCompilation.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RangeCompilation.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 newtype Byte = x | 0 <= x < 256
 predicate GoodByte(b: Byte) {
diff --git a/Test/dafny0/RangeCompilation.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RangeCompilation.dfy.expect
similarity index 100%
rename from Test/dafny0/RangeCompilation.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RangeCompilation.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RangeCompilation.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RangeCompilation.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RangeCompilation.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny0/RankNeg.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankNeg.dfy
similarity index 83%
rename from Test/dafny0/RankNeg.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankNeg.dfy
index 109a314dcc7..edd89f1df60 100644
--- a/Test/dafny0/RankNeg.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankNeg.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Negative tests
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankNeg.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankNeg.dfy.expect
new file mode 100644
index 00000000000..0c448891373
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankNeg.dfy.expect
@@ -0,0 +1,6 @@
+RankNeg.dfy(10,35): Error: cannot prove termination; try supplying a decreases clause
+RankNeg.dfy(15,37): Error: cannot prove termination; try supplying a decreases clause
+RankNeg.dfy(22,41): Error: cannot prove termination; try supplying a decreases clause
+RankNeg.dfy(32,35): Error: cannot prove termination; try supplying a decreases clause
+
+Dafny program verifier finished with 1 verified, 4 errors
diff --git a/Test/dafny0/RankPos.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankPos.dfy
similarity index 93%
rename from Test/dafny0/RankPos.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankPos.dfy
index f94fb7c9fc5..a362f03219a 100644
--- a/Test/dafny0/RankPos.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankPos.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype list<A> = Nil | Cons(head: A, tail: list<A>)
 datatype d = A | B(ds: list<d>)
diff --git a/Test/dafny0/RankPos.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankPos.dfy.expect
similarity index 100%
rename from Test/dafny0/RankPos.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RankPos.dfy.expect
diff --git a/Test/dafny0/Reads.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Reads.dfy
similarity index 90%
rename from Test/dafny0/Reads.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Reads.dfy
index e6ce5541096..deb52f91536 100644
--- a/Test/dafny0/Reads.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Reads.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation
+
 
 // Checking that the reads clause also is checked over requires
 
@@ -100,7 +100,7 @@ class Cell { var data: int }
 // Test the benefits of the new reads checking for function checking
 
 ghost function ApplyToSet<X>(S: set<X>, f: X ~> X): set<X>
-  requires forall x :: x in S ==> f.reads(x) == {} && f.requires(x)
+  requires forall x :: x in S ==> f.requires(x) && f.reads(x) == {}
 {
   if S == {} then {} else
     var x :| x in S;
@@ -111,11 +111,11 @@ ghost function ApplyToSet_AltSignature0<X>(S: set<X>, f: X ~> X): set<X>
   requires forall x :: x in S ==> f.requires(x) && f.reads(x) == {}
 
 ghost function ApplyToSet_AltSignature1<X>(S: set<X>, f: X ~> X): set<X>
-  requires forall x :: x in S ==> f.reads(x) == {}
   requires forall x :: x in S ==> f.requires(x)
+  requires forall x :: x in S ==> f.reads(x) == {}
 
 ghost function ApplyToSet_AltSignature2<X>(S: set<X>, f: X ~> X): set<X>
-  requires (forall x :: x in S ==> f.reads(x) == {}) ==> forall x :: x in S ==> f.requires(x)
+  requires (forall x :: x in S ==> f.requires(x)) ==> forall x :: x in S ==> f.reads(x) == {}
   // (this precondition would not be good enough to check the body above)
 
 ghost function FunctionInQuantifier0(): int
@@ -125,10 +125,10 @@ ghost function FunctionInQuantifier1(): int
   requires exists f: int ~> int :: f.requires(10) && f(10) == 100  // error: insufficient reads
 
 ghost function FunctionInQuantifier2(): int
-  requires exists f: int ~> int :: f.reads(10) == {} && f.requires(10) && f(10) == 100
+  requires exists f: int ~> int :: f.requires(10) && f.reads(10) == {} && f(10) == 100
   ensures FunctionInQuantifier2() == 100
 {
-  var f: int ~> int :| f.reads(10) == {} && f.requires(10) && f(10) == 100;  // fine :) :)
+  var f: int ~> int :| f.requires(10) && f.reads(10) == {} && f(10) == 100;  // fine :) :)
   f(10)
 }
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Reads.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Reads.dfy.expect
new file mode 100644
index 00000000000..caf65274159
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Reads.dfy.expect
@@ -0,0 +1,14 @@
+Reads.dfy(9,16): Error: insufficient reads clause to read field; Consider adding 'reads c' or 'reads c`u' in the enclosing function specification for resolution
+Reads.dfy(18,29): Error: insufficient reads clause to read field; Consider adding 'reads c' or 'reads c`u' in the enclosing function specification for resolution
+Reads.dfy(28,32): Error: insufficient reads clause to read field; Consider adding 'reads xs[0]' or 'reads xs[0]`u' in the enclosing function specification for resolution
+Reads.dfy(37,29): Error: insufficient reads clause to read field; Consider adding 'reads c' or 'reads c`u' in the enclosing function specification for resolution
+Reads.dfy(56,29): Error: insufficient reads clause to read field; Consider adding 'reads r' or 'reads r`r' in the enclosing function specification for resolution
+Reads.dfy(122,35): Error: function precondition could not be proved
+Reads.dfy(122,35): Error: insufficient reads clause to invoke function
+Reads.dfy(125,45): Error: insufficient reads clause to invoke function
+Reads.dfy(138,10): Error: insufficient reads clause to read field; Consider adding 'reads this' or 'reads this`Repr' in the enclosing predicate specification for resolution
+Reads.dfy(149,25): Error: insufficient reads clause to read field; Consider adding 'reads this' or 'reads this`y' in the enclosing function specification for resolution
+Reads.dfy(157,18): Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+Reads.dfy(159,19): Error: insufficient reads clause to invoke function
+
+Dafny program verifier finished with 19 verified, 12 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-EnabledResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-EnabledResolution.dfy
new file mode 100644
index 00000000000..74fa020a430
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-EnabledResolution.dfy
@@ -0,0 +1,42 @@
+// RUN: %exits-with 2 %verify --reads-clauses-on-methods "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module CContainer {
+  class C {
+    var u : int
+  
+    constructor(u: int) reads {} {
+      this.u := u;
+    }
+  
+    constructor Copy(c: C) reads c {
+      this.u := c.u;
+    }
+  
+    method M() reads {} {}
+  
+    static method TrexsCantSeeIt(c: C) reads c {}
+  
+    ghost method OoooSpooky() reads {} {}
+  
+    lemma Lemma() reads * {}
+  
+    twostate lemma TwostateLemma() reads {} {}
+  
+    greatest lemma BestLemmaEver(c: C) reads c {}
+  
+    least lemma ICanBarelySeeIt(c: C) reads c {}
+  }
+}
+
+abstract module MyAbstractModule {
+  class C { var u : int }
+  method M(c: C) returns (r: int)
+  {}
+}
+
+module MyRefinedModule refines MyAbstractModule {
+  method M(c: C) returns (r: int)
+    reads c // Error: a refining method is not allowed to extend the reads clause
+  {}
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-EnabledResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-EnabledResolution.dfy.expect
new file mode 100644
index 00000000000..5f1be576c35
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-EnabledResolution.dfy.expect
@@ -0,0 +1,6 @@
+ReadsOnMethods-EnabledResolution.dfy(22,24): Error: lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+ReadsOnMethods-EnabledResolution.dfy(24,41): Error: twostate lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+ReadsOnMethods-EnabledResolution.dfy(26,45): Error: greatest lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+ReadsOnMethods-EnabledResolution.dfy(28,44): Error: least lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+ReadsOnMethods-EnabledResolution.dfy(40,10): Error: a refining method is not allowed to extend the reads clause
+5 resolution/type errors detected in ReadsOnMethods-EnabledResolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-Resolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-Resolution.dfy
new file mode 100644
index 00000000000..1dc6bfe4a8d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-Resolution.dfy
@@ -0,0 +1,28 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class C {
+  var u : int
+
+  constructor(u: int) reads {} {
+    this.u := u;
+  }
+
+  constructor Copy(c: C) reads c {
+    this.u := c.u;
+  }
+
+  method M() reads {} {}
+
+  static method TrexsCantSeeIt(c: C) reads c {}
+
+  ghost method OoooSpooky() reads {} {}
+
+  lemma Lemma() reads * {}
+
+  twostate lemma TwostateLemma() reads {} {}
+
+  greatest lemma BestLemmaEver(c: C) reads c {}
+
+  least lemma ICanBarelySeeIt(c: C) reads c {}
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-Resolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-Resolution.dfy.expect
new file mode 100644
index 00000000000..e1ddff87404
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods-Resolution.dfy.expect
@@ -0,0 +1,10 @@
+ReadsOnMethods-Resolution.dfy(7,28): Error: reads clauses on methods are forbidden without the command-line flag `--reads-clauses-on-methods`
+ReadsOnMethods-Resolution.dfy(11,31): Error: reads clauses on methods are forbidden without the command-line flag `--reads-clauses-on-methods`
+ReadsOnMethods-Resolution.dfy(15,19): Error: reads clauses on methods are forbidden without the command-line flag `--reads-clauses-on-methods`
+ReadsOnMethods-Resolution.dfy(17,43): Error: reads clauses on methods are forbidden without the command-line flag `--reads-clauses-on-methods`
+ReadsOnMethods-Resolution.dfy(19,34): Error: reads clauses on methods are forbidden without the command-line flag `--reads-clauses-on-methods`
+ReadsOnMethods-Resolution.dfy(21,22): Error: lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+ReadsOnMethods-Resolution.dfy(23,39): Error: twostate lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+ReadsOnMethods-Resolution.dfy(25,43): Error: greatest lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+ReadsOnMethods-Resolution.dfy(27,42): Error: least lemmas are not allowed to have reads clauses (they are allowed to read all memory locations)
+9 resolution/type errors detected in ReadsOnMethods-Resolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods.dfy
new file mode 100644
index 00000000000..31dec745852
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods.dfy
@@ -0,0 +1,535 @@
+// RUN: %exits-with 4 %verify --reads-clauses-on-methods "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// The first half of this file is a clone of Reads.dfy, 
+// but modified to use methods instead of functions wherever possible,
+// to provide more testing coverage of the newer feature
+// of allowing and enforcing reads clauses on methods as well.
+
+// Checking that the reads clause also is checked over requires
+
+class C { var u : int }
+
+// Unlike functions, the default for methods is * instead of {}
+ghost method yup1(c : C)
+     requires c.u > 0
+{}
+
+ghost method nope1(c : C)
+     requires c.u > 0
+     reads {}
+{}
+
+ghost method ok1(c : C)
+     requires c.u > 0
+     reads c
+{}
+
+ghost method nope2(c : C?)
+     requires c != null && c.u > 0
+     reads if c != null then {} else {c}
+{}
+
+ghost method ok2(c : C?)
+     requires c != null && c.u > 0
+     reads if c != null then {c} else {}
+{}
+
+// Unlike functions, the default for methods is * instead of {}
+ghost method yup3(xs : seq<C>)
+     requires |xs| > 0 && xs[0].u > 0
+{}
+
+ghost method nope3(xs : seq<C>)
+     requires |xs| > 0 && xs[0].u > 0
+     reads {}
+{}
+
+ghost method ok3(xs : seq<C>)
+     requires |xs| > 0 && xs[0].u > 0
+     reads xs
+{}
+
+ghost method nope4(c : C, xs : set<C>)
+     requires c !in xs ==> c.u > 0
+     reads xs
+{}
+
+ghost method ok4(c : C, xs : set<C>)
+     requires c in xs ==> c.u > 0
+     reads xs
+{}
+
+// reads over itself
+
+class R {
+  var r : R
+  constructor () {
+    r := this;
+  }
+}
+
+ghost method nope5(r : R?)
+  reads if r != null then {r.r} else {}
+{}
+
+ghost method ok5(r : R?)
+  reads if r != null then {r, r.r} else {}
+{}
+
+// Reads checking where there are circularities among the expressions
+
+class CircularChecking {
+  ghost var Repr: set<object>
+
+  ghost function F(): int
+    reads this, Repr
+
+  ghost method F'() returns (r: int)
+    reads Repr, this  // this is also fine
+
+  ghost method G0() returns (r: int)
+    reads this
+    requires Repr == {} && F() == 100
+
+  ghost method G1() returns (r: int)
+    reads this
+    requires F() == 100  // fine, since the next line tells us that Repr is empty
+    requires Repr == {}
+
+  ghost method H0(cell: Cell) returns (r: int)
+    reads Repr  // by itself, this reads is not self-framing
+    requires this in Repr  // lo and behold!  So, reads clause is fine after all
+
+  ghost method H1(cell: Cell) returns (r: int)
+    reads this, Repr
+    requires cell in Repr
+    requires cell.data == 10
+
+  ghost method H2(cell: Cell) returns (r: int)
+    reads this, Repr
+    requires cell.data == 10  // this is okay, too, since reads checks are postponed
+    requires cell in Repr
+}
+
+class Cell { var data: int }
+
+// Test the benefits of the new reads checking for function checking
+
+ghost method ApplyToSet<X>(S: set<X>, f: X ~> X) returns (r: set<X>)
+  requires forall x :: x in S ==> f.requires(x) && f.reads(x) == {}
+  reads {}
+{
+  if S == {} {
+    return {};
+  } else {
+    var x :| x in S;
+    var r' := ApplyToSet(S - {x}, f);
+    r := r' + {f(x)};
+  }
+}
+
+ghost method ApplyToSet_AltSignature0<X>(S: set<X>, f: X ~> X) returns (r: set<X>)
+  requires forall x :: x in S ==> f.requires(x) && f.reads(x) == {}
+  reads {}
+
+ghost method ApplyToSet_AltSignature1<X>(S: set<X>, f: X ~> X) returns (r: set<X>)
+  requires forall x :: x in S ==> f.requires(x)
+  requires forall x :: x in S ==> f.reads(x) == {}
+  reads {}
+
+ghost method ApplyToSet_AltSignature2<X>(S: set<X>, f: X ~> X) returns (r: set<X>)
+  requires (forall x :: x in S ==> f.requires(x) && f.reads(x) == {}) ==> forall x :: x in S ==> f.requires(x)
+  // (this precondition would not be good enough to check the body above)
+  reads {}
+
+ghost method FunctionInQuantifier0() returns (r: int)
+  requires exists f: int ~> int :: f(10) == 100  // error (x2): precondition violation and insufficient reads
+  reads {}
+
+ghost method FunctionInQuantifier1() returns (r: int)
+  requires exists f: int ~> int :: f.requires(10) && f(10) == 100  // error: insufficient reads
+  reads {}
+
+ghost method FunctionInQuantifier2() returns (r: int)
+  requires exists f: int ~> int :: f.requires(10) && f.reads(10) == {} && f(10) == 100
+  reads {}
+  ensures r == 100
+{
+  // Unlike the ghost function version, f.reads(10) is flagged because we aren't delaying reads checks on method bodies.
+  // It's still an open question whether we should be though: https://github.com/dafny-lang/dafny/issues/4489.
+  // For now this is at least only a completeness issue.
+  var f: int ~> int :| f.requires(10) && f.reads(10) == {} && f(10) == 100;  // error: insufficient reads
+  return f(10);
+}
+
+class DynamicFramesIdiom {
+  ghost var Repr: set<object>
+  ghost method IllFormed_Valid() returns (r: bool)
+    reads Repr  // error: reads is not self framing (notice the absence of "this")
+    ensures r == (this in Repr)
+  {
+    return this in Repr;  // the post-condition says that the method returns true if "this in Repr", but the
+                          // method can also be invoked in a state where its body will evaluate to false
+  }
+}
+
+class ReadsTestsInsideLetSuchThat {
+  var y: int
+
+  ghost method F() returns (r: int) 
+    reads {}
+  {
+    var yy :| yy == this.y;  // error: F does not have permission to read this.y
+    return yy;
+  }
+}
+
+// ConstInitializers: not applicable
+
+// And now for brand new freshly-baked tests!
+
+// ---------- Basic use cases -----------
+
+class Box<T> {
+  var x: T
+
+  constructor(x: T)
+    reads {}
+  {
+    this.x := x;
+  }
+}
+
+method SetBox(b: Box<int>, i: int) 
+  modifies b
+  reads {}
+{
+  b.x := i;
+}
+
+method SetBoxSpecific(b: Box<int>, i: int) 
+  modifies b`x
+  reads {}
+{
+  b.x := i;
+}
+
+function GetBoxFn(b: Box<int>): int
+  reads b
+{
+  b.x
+}
+
+method GetBoxCorrectReads(b: Box<int>) returns (i: int)
+  reads b
+{
+  i := b.x;
+}
+
+method GetBoxCorrectReadsSpecific(b: Box<int>) returns (i: int)
+  reads b`x
+{
+  i := b.x;
+}
+
+method GetBoxReadsStar(b: Box<int>) returns (i: int)
+  reads *
+{
+  i := b.x;
+}
+
+method GetBoxIncorrectReads(b: Box<int>) returns (i: int)
+  reads {}
+{
+  i := b.x; // Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values or the right-hand side of constants
+}
+
+method GetBoxDefaultReads(b: Box<int>) returns (i: int)
+{
+  i := b.x;
+}
+
+method ReadingAndWritingFreshStateAllowed()
+  reads {}
+{
+  var myBox := new Box(42);
+  var x := GetBoxFn(myBox);
+  SetBox(myBox, 42);
+}
+
+// ---------- More complicated reads clauses -----------
+
+method ApplyLambda<T(!new), R>(f: T ~> R, t: T) returns (r: R) 
+  requires f.requires(t)
+  reads f.reads(t)
+{
+  r := f(t);
+}
+
+class GhostBox {
+  ghost var x: int
+  constructor(x: int) {
+    this.x := x;
+  }
+}
+
+// Unlike functions, method frames can refer to the set of allocated objects.
+ghost method IncrementAllBoxes() 
+  reads set b: GhostBox | true
+  modifies set b: GhostBox | true
+{
+  forall b: GhostBox {
+    b.x := b.x + 1;
+  }
+}
+
+// ---------- Enforcing concurrency safe entry points (examples from the RFC) -----------
+
+datatype Option<T> = Some(value: T) | None
+
+class {:extern} ExternalSequentialMutableMap<K, V> {
+  ghost var state: map<K, V>
+  method {:extern} Put(k: K, v: V)
+    requires k !in state
+    modifies this
+    ensures state == old(state)[k := v]
+  function {:extern} Get(k: K): (v: Option<V>)
+    reads this
+    ensures k in state ==> v == Some(state[k])
+    ensures k !in state ==> v == None
+}
+
+method {:concurrent} MemoizedSquare2(x: int, cache: ExternalSequentialMutableMap<int, int>) returns (xSquared: int)
+  requires forall k | k in cache.state :: cache.state[k] == k * k   // Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values or the right-hand side of constants
+  reads {}
+  ensures xSquared == x * x
+{
+  var cached := cache.Get(x);  // Error: insufficient reads clause to invoke function
+  if cached.Some? {
+    xSquared := cached.value;
+  } else {
+    xSquared := x * x;
+    cache.Put(x, xSquared);    // Error: call might violate context's modifies clause
+                               // Error: insufficient reads clause to call
+  }
+}
+
+class {:extern} ExternalConcurrentMutableMap<K, V> {
+  const inv: (K, V) -> bool
+  method {:extern} Put(k: K, v: V)
+    reads {}
+    requires inv(k, v)
+  method {:extern} Get(k: K) returns (v: Option<V>)
+    reads {}
+    ensures v.Some? ==> inv(k, v.value)
+}
+
+method {:concurrent} MemoizedSquare(x: int, cache: ExternalConcurrentMutableMap<int, int>) returns (xSquared: int)
+  requires cache.inv == ((key, value) => value == key * key)
+  reads {}
+  ensures xSquared == x * x
+{
+  var cached := cache.Get(x);
+  if cached.Some? {
+    xSquared := cached.value;
+  } else {
+    xSquared := x * x;
+    cache.Put(x, xSquared);
+  }
+}
+
+// ---------- Functions-by-method -----------
+
+function GoodDirectFib(n: nat): nat {
+  if n < 2 then n else GoodDirectFib(n - 2) + GoodDirectFib(n - 1)
+} by method {
+  var x, y := 0, 1;
+  for i := 0 to n
+    invariant x == GoodDirectFib(i) && y == GoodDirectFib(i + 1)
+  {
+    x, y := y, x + y;
+  }
+  return x;
+}
+
+function BadFib(n: nat): nat {
+  if n < 2 then n else BadFib(n - 2) + BadFib(n - 1)
+} by method {
+  // Rejected because the default for methods is reads *
+  var r := FibMethod(n); // Error: insufficient reads clause to call
+  return r;
+}
+
+method FibMethod(n: nat) returns (r: nat) 
+  ensures r == BadFib(n)
+{
+  var x, y := 0, 1;
+  for i := 0 to n
+    invariant x == BadFib(i) && y == BadFib(i + 1)
+  {
+    x, y := y, x + y;
+  }
+  return x;
+}
+
+function GoodFib(n: nat): nat {
+  if n < 2 then n else GoodFib(n - 2) + GoodFib(n - 1)
+} by method {
+  var r := FibMethodWithReads(n);
+  return r;
+}
+
+method FibMethodWithReads(n: nat) returns (r: nat) 
+  reads {}
+  ensures r == GoodFib(n)
+{
+  var x, y := 0, 1;
+  for i := 0 to n
+    invariant x == GoodFib(i) && y == GoodFib(i + 1)
+  {
+    x, y := y, x + y;
+  }
+  return x;
+}
+
+// Example of where applying the function reads clause to the by method body
+// catches what would be a concurrency issue.
+function WeirdAlways42(b: Box<int>): int {
+  42
+} by method {
+  var result := 42;
+  result := result + b.x; // Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values or the right-hand side of constants
+  result := result - b.x;
+  return 42;
+}
+
+// ---------- Correctly excluding lvalues from reads checks -----------
+
+method BadMetaBox(b: Box<Box<int>>)
+  reads {}
+  modifies b.x  // Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values or the right-hand side of constants
+{
+  b.x.x := 42;  // Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values or the right-hand side of constants
+}
+
+method GoodMetaBox(b: Box<Box<int>>)
+  reads b
+  modifies b.x
+{
+  b.x.x := 42;
+}
+
+method BadArrayRead(a: array<int>) returns (r: int)
+  requires a.Length > 0
+  reads {}
+{
+  return a[0];  // Error: insufficient reads clause to read array element
+}
+
+method BadArrayRead2(a: array<int>) returns (r: int)
+  requires a.Length > 0
+  reads {}
+  // Showing that modifies does not imply reads - they are independent clauses
+  modifies a
+{
+  return a[0];  // Error: insufficient reads clause to read array element
+}
+
+method GoodArrayRead(a: array<int>) returns (r: int)
+  requires a.Length > 0
+  reads a
+{
+  return a[0];
+}
+
+method GoodArrayWrite(a: array<int>)
+  requires a.Length > 0
+  modifies a
+{
+  a[0] := 42;
+}
+
+method GoodArrayWrite2(a: array<int>)
+  requires a.Length > 0
+  reads {}
+  modifies a
+{
+  a[0] := 42;
+}
+
+// ---------- Correct verification between reads clauses (inheritance, calls, etc.) -----------
+
+trait MyTrait {
+  method M(b: Box<int>) returns (r: int)
+    reads {}
+}
+
+class MyClass extends MyTrait {
+  method M(b: Box<int>) returns (r: int) // Error: method might read an object not in the parent trait context's reads clause
+    reads b
+  {
+    return 42;
+  }
+}
+
+method PretendingNotToRead(b: Box<int>, ghost g: Box<int>) 
+  reads {}
+{
+  var x := VoraciousReader(b);  // Error: insufficient reads clause to call
+}
+method PretendingNotToRead2(b: Box<int>, ghost g: Box<int>) 
+  reads {}
+{
+  var x := WhatsInTheBox(b);  // Error: insufficient reads clause to call
+}
+method ActuallyNotReading(b: Box<int>, ghost g: Box<int>) 
+  reads {}
+{
+  var x := NotAReader(b);
+}
+method PretendingNotToReadButSpooky(b: Box<int>, ghost g: Box<int>) 
+  reads {}
+{
+  var x := TheGhostCanTotallySeeYou(g);  // Error: insufficient reads clause to call
+}
+method InTwoPlacesAtOnce(b: Box<int>) 
+  reads {}
+{
+  assert Unchanged(b);  // Error: insufficient reads clause to call
+}
+method StuckInThePast(b: Box<int>) 
+  reads {}
+{
+  // Doesn't verify, but allowed by reads clause
+  assert Was42(b);   // Error: assertion might not hold
+}
+
+method VoraciousReader(b: Box<int>) returns (r: int) { r := b.x; }
+method WhatsInTheBox(b: Box<int>) returns (r: int) reads b { r := b.x; }
+method NotAReader(b: Box<int>) returns (r: int) reads {} { r := 42; }
+ghost method TheGhostCanTotallySeeYou(b: Box<int>) returns (r: int) reads b { r := b.x; }
+twostate predicate Unchanged(b: Box<int>) reads b {
+  old(b.x) == b.x
+}
+twostate predicate Was42(b: Box<int>) {
+  old(b.x) == 42
+}
+
+// ---------- Restricting other clauses on methods by reads clauses as well -----------
+
+// Testing the reads checks on other clauses
+method OnlySpecReads(b: Box<int>) returns (r: int)
+  requires b.x == 42  // Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values or the right-hand side of constants
+  reads {}
+  ensures r == b.x
+{
+  return 42;
+}
+
+method DefaultValueReads(b: Box<int>, x: int := b.x)  // Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values or the right-hand side of constants
+  returns (r: int)
+  reads {}
+{
+  return x;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods.dfy.expect
new file mode 100644
index 00000000000..5fcfdebf415
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods.dfy.expect
@@ -0,0 +1,39 @@
+ReadsOnMethods.dfy(293,19): Warning: when a method is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+ReadsOnMethods.dfy(297,21): Warning: when a function is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+ReadsOnMethods.dfy(323,19): Warning: when a method is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+ReadsOnMethods.dfy(279,8): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ReadsOnMethods.dfy(280,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+ReadsOnMethods.dfy(19,16): Error: insufficient reads clause to read field; Consider adding 'reads c' or 'reads c`u' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(29,29): Error: insufficient reads clause to read field; Consider adding 'reads c' or 'reads c`u' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(44,32): Error: insufficient reads clause to read field; Consider adding 'reads xs[0]' or 'reads xs[0]`u' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(54,29): Error: insufficient reads clause to read field; Consider adding 'reads c' or 'reads c`u' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(73,29): Error: insufficient reads clause to read field; Consider adding 'reads r' or 'reads r`r' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(147,35): Error: function precondition could not be proved
+ReadsOnMethods.dfy(147,35): Error: insufficient reads clause to invoke function
+ReadsOnMethods.dfy(151,45): Error: insufficient reads clause to invoke function
+ReadsOnMethods.dfy(162,33): Error: insufficient reads clause to invoke function
+ReadsOnMethods.dfy(162,48): Error: insufficient reads clause to invoke function
+ReadsOnMethods.dfy(169,10): Error: insufficient reads clause to read field; Consider adding 'reads this' or 'reads this`Repr' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(172,19): Error: insufficient reads clause to read field; Consider adding 'reads this' or 'reads this`Repr' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(183,25): Error: insufficient reads clause to read field; Consider adding 'reads this' or 'reads this`y' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(245,9): Error: insufficient reads clause to read field; Consider adding 'reads b' or 'reads b`x' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(304,33): Error: insufficient reads clause to read field; Consider adding 'reads cache' or 'reads cache`state' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(308,25): Error: insufficient reads clause to invoke function
+ReadsOnMethods.dfy(313,13): Error: insufficient reads clause to call
+ReadsOnMethods.dfy(360,20): Error: insufficient reads clause to call
+ReadsOnMethods.dfy(402,23): Error: insufficient reads clause to read field; Consider adding 'reads b' or 'reads b`x' in the enclosing function specification for resolution
+ReadsOnMethods.dfy(411,13): Error: insufficient reads clause to read field; Consider adding 'reads b' or 'reads b`x' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(413,4): Error: insufficient reads clause to read field; Consider adding 'reads b' or 'reads b`x' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(427,10): Error: insufficient reads clause to read array element; Consider adding 'reads a' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(436,10): Error: insufficient reads clause to read array element; Consider adding 'reads a' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(469,9): Error: method might read an object not in the parent trait context's reads clause
+ReadsOnMethods.dfy(479,26): Error: insufficient reads clause to call
+ReadsOnMethods.dfy(484,24): Error: insufficient reads clause to call
+ReadsOnMethods.dfy(494,35): Error: insufficient reads clause to call
+ReadsOnMethods.dfy(499,18): Error: insufficient reads clause to invoke function
+ReadsOnMethods.dfy(505,14): Error: assertion might not hold
+ReadsOnMethods.dfy(516,11): Related location: this proposition could not be proved
+ReadsOnMethods.dfy(523,13): Error: insufficient reads clause to read field; Consider adding 'reads b' or 'reads b`x' in the enclosing method specification for resolution
+ReadsOnMethods.dfy(530,50): Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+
+Dafny program verifier finished with 67 verified, 31 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods_Printing.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods_Printing.dfy
new file mode 100644
index 00000000000..5b80aea27e6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods_Printing.dfy
@@ -0,0 +1,19 @@
+// RUN: %resolve --print:- --reads-clauses-on-methods:false "%s" > "%t"
+// RUN: %resolve --print:- --reads-clauses-on-methods:true "%s" >> "%t"
+// RUN: %resolve --rprint:- --reads-clauses-on-methods:false "%s" >> "%t"
+// RUN: %resolve --rprint:- --reads-clauses-on-methods:true "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Confirming that default reads clauses on methods are not explicitly printed.
+// Worth testing because of having to set the default of `reads *` during resolution.
+
+module JustMethods {
+  method SomeMethod(x: int) returns (y: int)
+    requires true
+    modifies {}
+    ensures true
+    decreases x
+  {
+    y := x;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods_Printing.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods_Printing.dfy.expect
new file mode 100644
index 00000000000..81b5d8d7b0d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsOnMethods_Printing.dfy.expect
@@ -0,0 +1,298 @@
+// ReadsOnMethods_Printing.dfy
+
+
+module JustMethods {
+  method SomeMethod(x: int) returns (y: int)
+    requires true
+    modifies {}
+    ensures true
+    decreases x
+  {
+    y := x;
+  }
+}
+
+Dafny program verifier did not attempt verification
+// ReadsOnMethods_Printing.dfy
+
+
+module JustMethods {
+  method SomeMethod(x: int) returns (y: int)
+    requires true
+    modifies {}
+    ensures true
+    decreases x
+  {
+    y := x;
+  }
+}
+
+Dafny program verifier did not attempt verification
+// ReadsOnMethods_Printing.dfy
+
+/*
+module _System {
+  /* CALL GRAPH for module _System:
+   * SCC at height 1:
+   *   RotateLeft
+   * SCC at height 1:
+   *   RotateRight
+   * SCC at height 0:
+   *   array
+   * SCC at height 0:
+   *   nat
+   * SCC at height 0:
+   *   object
+   */
+  type string(==,0) = seq<char>
+
+  type {:axiom} nat(==,0) = x: int
+    | 0 <= x
+
+  trait {:compile false} object { }
+  /*-- non-null type
+  type {:axiom} object(==) = c: object? | c != null /*special witness*/
+  */
+
+  class {:compile false} array<arg> {
+    const Length: int
+  }
+  /*-- non-null type
+  type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
+  */
+
+  type {:compile false} /*_#Func1*/ -T0 ~> +R {
+    ghost function requires(x0: T0): bool
+      reads reads(x0)
+
+    ghost function reads(x0: T0): set<object?>
+      reads reads(x0)
+  }
+
+  type {:compile false} /*_#PartialFunc1*/ -T0 --> +R = f: T0 ~> R
+    | forall x0: T0 :: f.reads(x0) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc1*/ -T0 -> +R = f: T0 --> R
+    | forall x0: T0 :: f.requires(x0)
+    /*special witness*/
+
+  type {:compile false} /*_#Func0*/ () ~> +R {
+    ghost function requires(): bool
+      reads reads()
+
+    ghost function reads(): set<object?>
+      reads reads()
+  }
+
+  type {:compile false} /*_#PartialFunc0*/ () --> +R = f: () ~> R
+    | f.reads() == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc0*/ () -> +R = f: () --> R
+    | f.requires()
+    /*special witness*/
+
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+
+  type bool { }
+
+  type char { }
+
+  type int { }
+
+  type real {
+    const Floor: int
+  }
+
+  type ORDINAL {
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
+  }
+
+  type _bv {
+    function RotateLeft(w: nat): selftype
+
+    function RotateRight(w: nat): selftype
+  }
+
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
+  type map<+T, +U> {
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
+  }
+
+  type imap<*T, +U> {
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
+  }
+
+  datatype /*_tuple#0*/ () = _#Make0
+}
+// bitvector types in use:
+*/
+
+/* CALL GRAPH for module _module:
+ */
+
+module JustMethods {
+  /* CALL GRAPH for module JustMethods:
+   * SCC at height 0:
+   *   SomeMethod
+   */
+  method SomeMethod(x: int) returns (y: int)
+    requires true
+    modifies {}
+    ensures true
+    decreases x
+  {
+    y := x;
+  }
+}
+
+Dafny program verifier did not attempt verification
+// ReadsOnMethods_Printing.dfy
+
+/*
+module _System {
+  /* CALL GRAPH for module _System:
+   * SCC at height 1:
+   *   RotateLeft
+   * SCC at height 1:
+   *   RotateRight
+   * SCC at height 0:
+   *   array
+   * SCC at height 0:
+   *   nat
+   * SCC at height 0:
+   *   object
+   */
+  type string(==,0) = seq<char>
+
+  type {:axiom} nat(==,0) = x: int
+    | 0 <= x
+
+  trait {:compile false} object { }
+  /*-- non-null type
+  type {:axiom} object(==) = c: object? | c != null /*special witness*/
+  */
+
+  class {:compile false} array<arg> {
+    const Length: int
+  }
+  /*-- non-null type
+  type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
+  */
+
+  type {:compile false} /*_#Func1*/ -T0 ~> +R {
+    ghost function requires(x0: T0): bool
+      reads reads(x0)
+
+    ghost function reads(x0: T0): set<object?>
+      reads reads(x0)
+  }
+
+  type {:compile false} /*_#PartialFunc1*/ -T0 --> +R = f: T0 ~> R
+    | forall x0: T0 :: f.reads(x0) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc1*/ -T0 -> +R = f: T0 --> R
+    | forall x0: T0 :: f.requires(x0)
+    /*special witness*/
+
+  type {:compile false} /*_#Func0*/ () ~> +R {
+    ghost function requires(): bool
+      reads reads()
+
+    ghost function reads(): set<object?>
+      reads reads()
+  }
+
+  type {:compile false} /*_#PartialFunc0*/ () --> +R = f: () ~> R
+    | f.reads() == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc0*/ () -> +R = f: () --> R
+    | f.requires()
+    /*special witness*/
+
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+
+  type bool { }
+
+  type char { }
+
+  type int { }
+
+  type real {
+    const Floor: int
+  }
+
+  type ORDINAL {
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
+  }
+
+  type _bv {
+    function RotateLeft(w: nat): selftype
+
+    function RotateRight(w: nat): selftype
+  }
+
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
+  type map<+T, +U> {
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
+  }
+
+  type imap<*T, +U> {
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
+  }
+
+  datatype /*_tuple#0*/ () = _#Make0
+}
+// bitvector types in use:
+*/
+
+/* CALL GRAPH for module _module:
+ */
+
+module JustMethods {
+  /* CALL GRAPH for module JustMethods:
+   * SCC at height 0:
+   *   SomeMethod
+   */
+  method SomeMethod(x: int) returns (y: int)
+    requires true
+    modifies {}
+    ensures true
+    decreases x
+  {
+    y := x;
+  }
+}
+
+Dafny program verifier did not attempt verification
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsVisibility.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsVisibility.dfy
new file mode 100644
index 00000000000..f5bd685e350
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsVisibility.dfy
@@ -0,0 +1,50 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+// Test that the export-provided type `T` is not recognized as a reference type in Client.
+
+module FarAway {
+  export
+    provides T
+    reveals U
+    reveals M
+  export Everything extends FarAway
+    reveals T
+
+  type T(==) = object
+  type U = T
+
+  type M = real -> set<T>
+}
+
+module Client {
+  import FarAway
+
+  function F(t: FarAway.U): int
+    reads t // error: type of t is not known to be allowed in reads claues
+
+  function G(s: set<FarAway.U>): int
+    reads s // error: type of s is not known to be allowed in reads claues
+
+  function H(f: real -> set<FarAway.U>): int
+    reads f // error: type of f is not known to be allowed in reads claues
+
+  function K(m: FarAway.M): int
+    reads m // error: type of m is not known to be allowed in reads claues
+}
+
+module CloseClient {
+  import FarAway`Everything
+
+  function F(t: FarAway.U): int
+    reads t
+
+  function G(s: set<FarAway.U>): int
+    reads s
+
+  function H(f: real -> set<FarAway.U>): int
+    reads f
+
+  function K(m: FarAway.M): int
+    reads m
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsVisibility.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsVisibility.dfy.expect
new file mode 100644
index 00000000000..bb572cdeef6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsVisibility.dfy.expect
@@ -0,0 +1,5 @@
+ReadsVisibility.dfy(24,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got FarAway.U)
+ReadsVisibility.dfy(27,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got set<FarAway.U>)
+ReadsVisibility.dfy(30,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got real -> set<FarAway.U>)
+ReadsVisibility.dfy(33,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got FarAway.M)
+4 resolution/type errors detected in ReadsVisibility.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsVisibility.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsVisibility.dfy.refresh.expect
new file mode 100644
index 00000000000..82526642503
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReadsVisibility.dfy.refresh.expect
@@ -0,0 +1,5 @@
+ReadsVisibility.dfy(24,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got U)
+ReadsVisibility.dfy(27,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got set<U>)
+ReadsVisibility.dfy(30,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got real -> set<U>)
+ReadsVisibility.dfy(33,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got M)
+4 resolution/type errors detected in ReadsVisibility.dfy
diff --git a/Test/dafny0/RealCompare.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealCompare.dfy
similarity index 95%
rename from Test/dafny0/RealCompare.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealCompare.dfy
index 76559da850e..e4f1d01ece7 100644
--- a/Test/dafny0/RealCompare.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealCompare.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method M(x: real)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealCompare.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealCompare.dfy.expect
new file mode 100644
index 00000000000..0d74374902a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealCompare.dfy.expect
@@ -0,0 +1,7 @@
+RealCompare.dfy(35,5): Error: decreases clause might not decrease
+RealCompare.dfy(50,3): Error: decreases expression must be bounded below by 0.0
+RealCompare.dfy(48,12): Related location: this proposition could not be proved
+RealCompare.dfy(141,2): Error: assertion might not hold
+RealCompare.dfy(156,2): Error: assertion might not hold
+
+Dafny program verifier finished with 10 verified, 4 errors
diff --git a/Test/dafny0/RealTypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealTypes.dfy
similarity index 92%
rename from Test/dafny0/RealTypes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealTypes.dfy
index b046fdd6bf9..4bed02c4b52 100644
--- a/Test/dafny0/RealTypes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealTypes.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method R1(ghost x: real, ghost y: real, i: int) {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealTypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealTypes.dfy.expect
new file mode 100644
index 00000000000..bcfb5bbe432
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RealTypes.dfy.expect
@@ -0,0 +1,7 @@
+RealTypes.dfy(12,17): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
+RealTypes.dfy(14,6): Error: assertion might not hold
+RealTypes.dfy(21,2): Error: assertion might not hold
+RealTypes.dfy(21,11): Error: possible division by zero
+RealTypes.dfy(29,2): Error: assertion might not hold
+
+Dafny program verifier finished with 2 verified, 5 errors
diff --git a/Test/dafny0/Refinement.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Refinement.dfy
similarity index 98%
rename from Test/dafny0/Refinement.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Refinement.dfy
index 27c71560cbd..caf44bfd646 100644
--- a/Test/dafny0/Refinement.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Refinement.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/dafny0/Refinement.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Refinement.dfy.expect
similarity index 78%
rename from Test/dafny0/Refinement.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Refinement.dfy.expect
index ed497a9c9a3..f703ec5b4e9 100644
--- a/Test/dafny0/Refinement.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Refinement.dfy.expect
@@ -15,23 +15,23 @@ Refinement.dfy(262,9): Warning: the ... refinement feature in statements is depr
 Refinement.dfy(264,7): Warning: the ... refinement feature in statements is deprecated
 Refinement.dfy(269,7): Warning: the ... refinement feature in statements is deprecated
 Refinement.dfy(276,7): Warning: the ... refinement feature in statements is deprecated
-Refinement.dfy(233,4): Warning: note, this loop has no body (loop frame: i)
+Refinement.dfy(233,4): Warning: this loop has no body (loop frame: i)
 Refinement.dfy(15,4): Error: a postcondition could not be proved on this return path
 Refinement.dfy(14,16): Related location: this is the postcondition that could not be proved
-Refinement.dfy[B](15,4): Error: a postcondition could not be proved on this return path
+Refinement.dfy(15,4): Error: a postcondition could not be proved on this return path
 Refinement.dfy(33,19): Related location: this is the postcondition that could not be proved
-Refinement.dfy(69,15): Error: assertion could not be proved
-Refinement.dfy(80,16): Error: assertion could not be proved
-Refinement.dfy(99,17): Error: a postcondition could not be proved on this return path
+Refinement.dfy(69,6): Error: assertion might not hold
+Refinement.dfy(80,4): Error: assertion might not hold
+Refinement.dfy(100,4): Error: a postcondition could not be proved on this return path
 Refinement.dfy(78,14): Related location: this is the postcondition that could not be proved
 Refinement.dfy(102,2): Error: a postcondition could not be proved on this return path
 Refinement.dfy(83,14): Related location: this is the postcondition that could not be proved
-Refinement.dfy(198,6): Error: assertion could not be proved
-Refinement.dfy[IncorrectConcrete](122,18): Related location
-Refinement.dfy(204,6): Error: assertion could not be proved
-Refinement.dfy[IncorrectConcrete](131,18): Related location
-Refinement.dfy(209,6): Error: assertion could not be proved
-Refinement.dfy[IncorrectConcrete](137,23): Related location
+Refinement.dfy(198,6): Error: assertion might not hold
+Refinement.dfy[IncorrectConcrete](122,18): Related location: this proposition could not be proved
+Refinement.dfy(204,6): Error: assertion might not hold
+Refinement.dfy[IncorrectConcrete](131,18): Related location: this proposition could not be proved
+Refinement.dfy(209,6): Error: assertion might not hold
+Refinement.dfy[IncorrectConcrete](137,23): Related location: this proposition could not be proved
 Refinement.dfy(253,6): Error: a postcondition could not be proved on this return path
 Refinement.dfy[Modify1](223,19): Related location: this is the postcondition that could not be proved
 Refinement.dfy(261,6): Error: a postcondition could not be proved on this return path
diff --git a/Test/dafny0/RefinementErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementErrors.dfy
similarity index 96%
rename from Test/dafny0/RefinementErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementErrors.dfy
index 11a602e71d1..74b1354db4c 100644
--- a/Test/dafny0/RefinementErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementErrors.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --allow-deprecation
+
 
 module A {
   class C {
diff --git a/Test/dafny0/RefinementErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementErrors.dfy.expect
similarity index 99%
rename from Test/dafny0/RefinementErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementErrors.dfy.expect
index c5575cca018..3c5a0e3b6b8 100644
--- a/Test/dafny0/RefinementErrors.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementErrors.dfy.expect
@@ -10,7 +10,6 @@ RefinementErrors.dfy(39,23): Error: the type of parameter 'z' is different from
 RefinementErrors.dfy(40,9): Error: there is a difference in name of parameter 3 ('k' versus 'b') of function F compared to corresponding function in the module it refines
 RefinementErrors.dfy(57,13): Error: a ghost function can be changed into a compiled function in a refining module only if the function has not yet been given a body: G
 RefinementErrors.dfy(94,10): Error: refinement method cannot assign to a field defined in parent module ('a')
-RefinementErrors.dfy(80,6): Warning: /!\ No terms found to trigger on.
 RefinementErrors.dfy(114,7): Error: abstract type 'T' is declared with a different number of type parameters (3 instead of 2) than the corresponding abstract type in the module it refines
 RefinementErrors.dfy(121,11): Error: type parameter 'B' is not allowed to change the requirement of supporting auto-initialization
 RefinementErrors.dfy(121,13): Error: type parameter 'C' is not allowed to change the requirement of being nonempty
diff --git a/Test/dafny0/RefinementModificationChecking.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementModificationChecking.dfy
similarity index 89%
rename from Test/dafny0/RefinementModificationChecking.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementModificationChecking.dfy
index cd5c79bc762..686a68a0dbc 100644
--- a/Test/dafny0/RefinementModificationChecking.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementModificationChecking.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 abstract module R1 {
   class HappyBay {
diff --git a/Test/dafny0/RefinementModificationChecking.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementModificationChecking.dfy.expect
similarity index 100%
rename from Test/dafny0/RefinementModificationChecking.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RefinementModificationChecking.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors0.dfy
new file mode 100644
index 00000000000..27bad58ea51
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors0.dfy
@@ -0,0 +1,543 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module Misc {
+  //Should not verify, as ghost loops should not be allowed to diverge.
+  method GhostDivergentLoop()
+  {
+     var a := new int [2];
+     a[0] := 1;
+     a[1] := -1;
+     ghost var i := 0;
+     while (i < 2)
+        decreases * // error: not allowed on a ghost loop
+        invariant i <= 2
+        invariant (forall j :: 0 <= j && j < i ==> a[j] > 0)
+     {
+       i := 0;
+     }
+     assert a[1] != a[1]; // ...for then this would incorrectly verify
+  }
+
+  method ManyIndices<T>(a: array3<T>, b: array<T>, m: int, n: int)
+  {
+    // the following invalid expressions were once incorrectly resolved:
+    var x := a[m, n];        // error
+    var y := a[m];           // error
+    var z := b[m, n, m, n];  // error
+  }
+
+  method SB(b: array2<int>, s: int) returns (x: int, y: int)
+    requires b != null
+  {
+    while
+    {
+      case b[x,y] == s =>
+    }
+  }
+
+  // -------- name resolution
+
+  class Global {
+    var X: int
+    function F(x: int): int { x }
+    static ghost function G(x: int): int { x }
+    method M(x: int) returns (r: int)
+    {
+      r := x + X;
+    }
+    static method N(x: int) returns (r: int)
+    {
+      r := x + X;  // error: cannot access instance field X from static method
+    }
+  }
+
+  method TestNameResolution0() {
+    var z: int;
+    z := Global.X;  // error: X is an instance field
+    z := F(2);  // error: cannot resolve F
+    z := Global.F(2);  // error: invocation of instance function requires an instance
+    z := G(2);  // error: cannot resolve G
+    z := Global.G(2);
+    z := M(2);  // error: cannot resolve M
+    z := Global.M(2);  // error: call to instance method requires an instance
+    z := N(1);  // error: cannot resolve N
+    z := Global.N(1);
+
+    z := z(5);  // error: using local as if it were a function
+    z := Global.z;  // error: class Global does not have a member z
+
+    var Global: Global;  // a local variable with the name 'Global'
+    z := Global.X;  // this means the instance field X of the object stored in the local variable 'Global'
+    var gg: Global := null;
+    var y := gg.G(5);
+    y := gg.N(5);
+  }
+
+  datatype Abc = Abel | Benny | Cecilia(y: int) | David(x: int) | Eleanor
+  datatype Xyz = Alberta | Benny | Constantine(y: int) | David(x: int)
+  datatype Rst = David(x: int, y: int)
+
+  ghost function Tuv(arg0: Abc, arg1: bool): int { 10 }
+
+  class EE {
+    var Eleanor: bool
+    method TestNameResolution1() {
+      var a0 := Abel;
+      var a1 := Alberta;
+      var b0 := Benny;  // error: there's more than one constructor with the name Benny; needs qualification
+      var b1 := Abc.Benny;
+      var b2 := Xyz.Benny;
+      var Benny := 15;  // introduce a local variable with the name 'Benny'
+      var b3 := Benny;
+      var d0 := David(20);  // error: constructor name David is ambiguous
+      var d1 := David;  // error: constructor name David is ambiguous (never mind that the signature does
+            // not match either of them)
+      var d2 := David(20, 40);  // error: constructor name Davis is ambiguous (never mind that the given
+              // parameters match the signature of only one of those constructors)
+      var d3 := Abc.David(20, 40);  // error: wrong number of parameters
+      var d4 := Rst.David(20, 40);
+      var e := Eleanor;  // this resolves to the field, not the Abc datatype constructor
+      assert Tuv(Abc.Eleanor, e) == 10;
+    }
+  }
+}
+
+// --------------- ghost tests -------------------------------------
+
+module HereAreMoreGhostTests {
+  datatype GhostDt =
+    Nil(ghost extraInfo: int) |
+    Cons(data: int, tail: GhostDt, ghost moreInfo: int)
+
+  class GhostTests {
+    method M(dt: GhostDt) returns (r: int) {
+      ghost var g := 5;
+      r := g;  // error: RHS is ghost, LHS is not
+      r := F(18, g);  // error: RHS is a ghost and will not be available at run time
+      r := G(20, g);  // it's fine to pass a ghost as a parameter to a non-ghost, because
+                      // only the ghost goes away during compilation
+      r := N(22, g);  // ditto
+      r := N(g, 22);  // error: passing in 'g' as non-ghost parameter
+      r := P(24, 22);  // error: 'P' is ghost, but its result is assigned to a non-ghost
+
+      match (dt) {
+        case Nil(gg) =>
+        case Cons(dd, tt, gg) =>
+          r := G(dd, dd);  // fine
+          r := G(dd, gg);  // fine
+
+      }
+      var dd;
+      dd := GhostDt.Nil(g);  // fine
+      dd := GhostDt.Cons(g, dt, 2);  // error: cannot pass 'g' as non-ghost parameter
+      ghost var dtg := GhostDt.Cons(g, dt, 2);  // fine, since result is ghost
+    }
+    ghost function F(x: int, y: int): int {
+      y
+    }
+    function G(x: int, ghost y: int): int {
+      y  // error: cannot return a ghost from a non-ghost function
+    }
+
+
+
+
+
+    method N(x: int, ghost y: int) returns (r: int) {
+      r := x;
+    }
+    ghost method P(x: int, y: int) returns (r: int) {
+      ghost var g := 5;
+      r := y;  // allowed, since the entire method is ghost
+      r := r + g;  // fine, for the same reason
+      r := N(20, 20);  // error: call to non-ghost method from ghost method is not okay
+    }
+    ghost method BreaksAreFineHere(t: int)
+    {
+      var n := 0;
+      ghost var k := 0;
+      while (true)
+        invariant n <= 112
+        decreases 112 - n
+      {
+        label MyStructure: {
+          if (k % 17 == 0) { break MyStructure; }  // this is fine, because it's a ghost method
+          k := k + 1;
+        }
+        label MyOtherStructure:
+        if (k % 17 == 0) {
+          break MyOtherStructure;
+        } else {
+          k := k + 1;
+        }
+
+        if (n == 112) {
+          break;
+        } else if (n == t) {
+          return;
+        }
+        n := n + 1;
+      }
+    }
+    method BreakMayNotBeFineHere(ghost t: int)
+    {
+      var n := 0;
+      ghost var k := 0;
+      var p := 0;
+      while (true)
+        invariant n <= 112
+        decreases 112 - n
+      {
+        label MyStructure: {
+          k := k + 1;
+        }
+        label MyOtherStructure:
+        if (k % 17 == 0) {
+          break MyOtherStructure;  // this break is fine
+        } else {
+          k := k + 1;
+        }
+
+        var dontKnow;
+        if (n == 112) {
+          ghost var m := 0;
+          label LoopLabel0:
+          label LoopLabel1:
+          while (m < 200) {
+            if (m % 103 == 0) {
+              if {
+                case true => break;  // fine, since this breaks out of the enclosing ghost loop
+                case true => break LoopLabel0;  // fine
+                case true => break LoopLabel1;  // fine
+              }
+            } else if (m % 101 == 0) {
+            }
+            m := m + 3;
+          }
+          break;
+        } else if (dontKnow == 708) {
+          var q := 0;
+          while (q < 1) {
+            label IfNest:
+            if (p == 67) {
+              break break;  // fine, since this is not a ghost context
+            }
+            q := q + 1;
+          }
+        } else if (n == t) {
+        }
+        n := n + 1;
+        p := p + 1;
+      }
+    }
+    method BreakMayNotBeFineHere_Ghost(ghost t: int)
+    {
+      var n := 0;
+      ghost var k := 0;
+      var p := 0;
+      while (true)
+        invariant n <= 112
+        decreases 112 - n
+      {
+        label MyStructure: {
+          if (k % 17 == 0) { break MyStructure; }  // error: break from ghost to non-ghost point
+          k := k + 1;
+        }
+        label MyOtherStructure:
+        if (k % 17 == 0) {
+          break MyOtherStructure;  // this break is fine
+        } else {
+          k := k + 1;
+        }
+
+        var dontKnow;
+        if (n == 112) {
+          ghost var m := 0;
+          label LoopLabel0:
+          label LoopLabel1:
+          while (m < 200) {
+            if (m % 103 == 0) {
+              if {
+                case true => break;  // fine, since this breaks out of the enclosing ghost loop
+                case true => break LoopLabel0;  // fine
+                case true => break LoopLabel1;  // fine
+              }
+            } else if (m % 101 == 0) {
+              break break;  // error: break out of non-ghost loop from ghost context
+            }
+            m := m + 3;
+          }
+          break;
+        } else if (dontKnow == 708) {
+          var q := 0;
+          while (q < 1) {
+            label IfNest:
+            if (p == 67) {
+              break break;  // fine, since this is not a ghost context
+            } else if (*) {
+              break break;  // fine, since this is not a ghost context
+            } else if (k == 67) {
+              break break;  // error, because this is a ghost context
+            }
+            q := q + 1;
+          }
+        } else if (n == t) {
+          return;  // error: this is a ghost context trying to return from a non-ghost method
+        }
+        n := n + 1;
+        p := p + 1;
+      }
+    }
+  }
+} // HereAreMoreGhostTests
+
+module MiscMore {
+  method DuplicateLabels(n: int) {
+    var x;
+    if (n < 7) {
+      label DuplicateLabel: x := x + 1;
+    } else {
+      label DuplicateLabel: x := x + 1;
+    }
+    label DuplicateLabel: x := x + 1;
+    label DuplicateLabel': {
+      label AnotherLabel:
+      label DuplicateLabel':  // error: duplicate label (shadowed by enclosing label)
+      label OneMoreTime:
+      x := x + 1;
+    }
+    label DuplicateLabel'':
+    label DuplicateLabel'':  // error: duplicate label (shadowed by enclosing label)
+    x := x + 1;
+    label DuplicateLabel'': x := x + 1;  // error: duplicate label (shadowed by dominating label)
+  }
+
+  // --------------- constructors -------------------------------------
+  // Note, more tests in module ClassConstructorTests below
+
+  class ClassWithConstructor {
+    var y: int
+    method NotTheOne() { }
+    constructor InitA() { }
+    constructor InitB() modifies this { y := 20; }  // error: don't use "this" in modifies of constructor
+  }
+
+  method ConstructorTests()
+  {
+    var c := new ClassWithConstructor.InitB();
+    c.InitB();  // error: not allowed to call constructors except during allocation
+  }
+
+  // ------------------- datatype destructors ---------------------------------------
+
+  datatype DTD_List = DTD_Nil | DTD_Cons(Car: int, Cdr: DTD_List, ghost g: int)
+
+  method DatatypeDestructors(d: DTD_List) {
+    if {
+      case d.DTD_Nil? =>
+        assert d == DTD_Nil;
+      case d.DTD_Cons? =>
+        var hd := d.Car;
+        var tl := d.Cdr;
+        assert hd == d.Cdr;  // type error
+        assert tl == d.Car;  // type error
+        assert d.DTD_Cons? == d.Car;  // type error
+        assert d == DTD_Cons(hd, tl, 5);
+        ghost var g0 := d.g;  // fine
+    }
+  }
+} // MiscMore
+
+// ------------------- print statements ---------------------------------------
+
+module GhostPrintAttempts {
+  method PrintOnlyNonGhosts(a: int, ghost b: int)
+  {
+    print "a: ", a, "\n";
+    print "b: ", b, "\n";  // error: print statement cannot take ghosts
+  }
+}
+
+// ------------------- auto-added type arguments ------------------------------
+
+module MiscEvenMore {
+  class GenericClass<T> { var data: T }
+
+  method MG0(a: GenericClass, b: GenericClass)
+    requires a != null && b != null
+    modifies a
+  {
+    a.data := b.data;  // allowed, since both a and b get the same auto type argument
+  }
+
+  method G_Caller()
+  {
+    var x := new GenericClass;
+    MG0(x, x);  // fine
+    var y := new GenericClass;
+    MG0(x, y);  // also fine (and now y's type argument is constrained to be that of x's)
+    var z := new GenericClass<int>;
+    var w := new GenericClass<bool>;
+    MG0(x, w);  // this has the effect of making x's and y's type GenericClass<bool>
+
+    y.data := z.data;  // error: bool vs int
+    assert x.data == 5;  // error: bool vs int
+  }
+
+  datatype GList<+T> = GNil | GCons(hd: T, tl: GList)
+
+  method MG1(l: GList, n: nat)
+  {
+    if (n != 0) {
+      MG1(l, n-1);
+      MG1(GCons(12, GCons(20, GNil)), n-1);
+    }
+    var t := GCons(100, GNil);  // error: types don't match up (List<_T0> versus List<int>)
+    t := GCons(120, l);  // error: types don't match up (List<_T0> versus List<int>)
+  }
+
+  // ------------------- calc statements ------------------------------
+
+  method TestCalc(m: int, n: int, a: bool, b: bool)
+  {
+    calc {
+      a + b; // error: invalid line
+      n + m;
+    }
+    calc {
+      a && b;
+      n + m; // error: all lines must have the same type
+    }
+    calc ==> {
+      n + m; // error: ==> operator requires boolean lines
+      n + m + 1;
+      n + m + 2;
+    }
+    calc {
+      n + m;
+      n + m + 1;
+      ==> n + m + 2; // error: ==> operator requires boolean lines
+    }
+  }
+} // MiscEvenMore
+
+module MyOwnModule {
+  class SideEffectChecks {
+    ghost var ycalc: int
+
+    ghost method Mod(a: int)
+      modifies this
+      ensures ycalc == a
+    {
+      ycalc := a;
+    }
+
+    ghost method Bad()
+      modifies this
+      ensures 0 == 1
+    {
+      var x: int;
+      calc {
+        0;
+        { Mod(0); }     // error: methods with side-effects are not allowed
+        ycalc;
+        { ycalc := 1; } // error: heap updates are not allowed
+        1;
+        { x := 1; }     // error: updates to locals defined outside of the hint are not allowed
+        x;
+        {
+          var x: int;
+          x := 1;       // this is OK
+        }
+        1;
+      }
+    }
+  }
+}
+
+// ------------------- nameless constructors ------------------------------
+
+module MiscAgain {
+  class Y {
+    var data: int
+    constructor (x: int)
+    {
+      data := x;
+    }
+    constructor (y: bool)  // error: duplicate constructor name
+    {
+    }
+    method Test() {
+      var i := new Y(5);
+      i := new Y(7);
+
+      var s := new Luci.Init(5);
+      s := new Luci.FromArray(null);
+      s := new Luci(false);
+      s := new Luci(true);
+
+      var l := new Lamb;
+      l := new Lamb();  // error: there is no default constructor
+    }
+  }
+
+  class Luci {
+    constructor Init(y: int) { }
+    constructor (nameless: bool) { }
+    constructor FromArray(a: array<int>) { }
+    method M() { }
+  }
+
+  class Lamb {
+    method Jess() { }
+    method Gwen() { }
+  }
+
+  // ------------------- assign-such-that and ghosts ------------------------------
+
+  method AssignSuchThatFromGhost()
+  {
+    var x: int;
+    ghost var g: int;
+
+    x := *;
+    assume x == g;  // this mix of ghosts and non-ghosts is cool (but, of course,
+                    // the compiler will complain)
+
+    x :| assume x == g;  // this is cool, since it's an assume (but, of course, the
+                         // compiler will complain)
+
+    x :| x == 5;
+    g :| g <= g;
+    g :| assume g < g;  // the compiler will complain here, despite the LHS being
+                        // ghost -- and rightly so, since an assume is used
+  }
+}  // MiscAgain
+
+// ----- One more phase of HereAreMoreGhostTests from above
+
+module HereAreMoreGhostTests' {
+  datatype GhostDt =
+    Nil(ghost extraInfo: int) |
+    Cons(data: int, tail: GhostDt, ghost moreInfo: int)
+
+  method M(dt: GhostDt) returns (r: int) {
+    ghost var g := 5;
+    match (dt) {
+      case Nil(gg) =>
+      case Cons(dd, tt, gg) =>
+        r := G(dd, dd);  // fine
+        r := G(dd, gg);  // fine
+        r := G(gg, gg);  // error: cannot pass ghost 'gg' as non-ghost parameter to 'G'
+    }
+  }
+
+  function G(x: int, ghost y: int): int
+
+  function H(dt: GhostDt): int {
+    match dt
+    case Nil(gg) =>  gg  // error: cannot return a ghost from a non-ghost function
+    case Cons(dd, tt, gg) =>  dd + gg  // error: ditto
+  }
+} // HereAreMoreGhostTests'
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors0.dfy.expect
new file mode 100644
index 00000000000..ede36cc876b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors0.dfy.expect
@@ -0,0 +1,70 @@
+ResolutionErrors0.dfy(323,33): Warning: constructors no longer need 'this' to be listed in modifies clauses
+ResolutionErrors0.dfy(13,18): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+ResolutionErrors0.dfy(25,13): Error: array selection requires an array2 (got array3<T>)
+ResolutionErrors0.dfy(27,13): Error: array selection requires an array4 (got array<T>)
+ResolutionErrors0.dfy(26,14): Error: element selection requires a sequence, array, multiset, or map (got array3<T>)
+ResolutionErrors0.dfy(57,16): Error: accessing member 'X' requires an instance expression
+ResolutionErrors0.dfy(58,9): Error: unresolved identifier: F
+ResolutionErrors0.dfy(59,16): Error: accessing member 'F' requires an instance expression
+ResolutionErrors0.dfy(60,9): Error: unresolved identifier: G
+ResolutionErrors0.dfy(62,9): Error: unresolved identifier: M
+ResolutionErrors0.dfy(63,16): Error: accessing member 'M' requires an instance expression
+ResolutionErrors0.dfy(64,9): Error: unresolved identifier: N
+ResolutionErrors0.dfy(67,10): Error: non-function expression (of type int) is called with parameters
+ResolutionErrors0.dfy(68,16): Error: member 'z' does not exist in non-null type 'Global'
+ResolutionErrors0.dfy(51,15): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors0.dfy(88,16): Error: the name 'Benny' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.Benny')
+ResolutionErrors0.dfy(93,16): Error: the name 'David' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.David')
+ResolutionErrors0.dfy(94,16): Error: the name 'David' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.David')
+ResolutionErrors0.dfy(96,16): Error: the name 'David' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.David')
+ResolutionErrors0.dfy(98,20): Error: wrong number of arguments (got 2, but datatype constructor 'David' expects 1: (x: int))
+ResolutionErrors0.dfy(116,11): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(117,12): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors0.dfy(121,13): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(122,12): Error: actual out-parameter is required to be a ghost variable
+ResolutionErrors0.dfy(133,25): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(140,6): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(154,12): Error: only ghost methods can be called from this context
+ResolutionErrors0.dfy(244,29): Error: ghost-context break statement is not allowed to break out of non-ghost structure
+ResolutionErrors0.dfy(267,14): Error: ghost-context break statement is not allowed to break out of non-ghost loop
+ResolutionErrors0.dfy(281,14): Error: ghost-context break statement is not allowed to break out of non-ghost loop
+ResolutionErrors0.dfy(286,10): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
+ResolutionErrors0.dfy(306,12): Error: label shadows an enclosing label
+ResolutionErrors0.dfy(311,10): Error: duplicate label
+ResolutionErrors0.dfy(313,10): Error: label shadows a dominating label
+ResolutionErrors0.dfy(329,11): Error: a constructor is allowed to be called only when an object is being allocated
+ResolutionErrors0.dfy(345,27): Error: arguments must have comparable types (got bool and int)
+ResolutionErrors0.dfy(343,18): Error: arguments must have comparable types (got int and DTD_List)
+ResolutionErrors0.dfy(344,18): Error: arguments must have comparable types (got DTD_List and int)
+ResolutionErrors0.dfy(358,17): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(382,11): Error: incorrect argument type at index 1 for method in-parameter 'b' (expected GenericClass<int>, found GenericClass<bool>) (non-variant type parameter would require int = bool)
+ResolutionErrors0.dfy(396,19): Error: incorrect argument type at index 0 for datatype constructor parameter 'hd' (expected _T0, found int)
+ResolutionErrors0.dfy(397,15): Error: incorrect argument type at index 0 for datatype constructor parameter 'hd' (expected _T0, found int)
+ResolutionErrors0.dfy(406,8): Error: all lines in a calculation must have the same type (got int after bool)
+ResolutionErrors0.dfy(410,8): Error: all lines in a calculation must have the same type (got int after bool)
+ResolutionErrors0.dfy(413,8): Error: first argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(413,8): Error: second argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(414,12): Error: first argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(414,12): Error: second argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(415,12): Error: first argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(415,12): Error: second argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(413,8): Error: first argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(413,8): Error: second argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(419,12): Error: first argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(419,12): Error: second argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(418,8): Error: first argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(418,8): Error: second argument to ==> must be of type bool (instead got int)
+ResolutionErrors0.dfy(405,8): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+ResolutionErrors0.dfy(405,8): Error: arguments must have comparable types (got bool and int)
+ResolutionErrors0.dfy(405,8): Error: arguments must have comparable types (got bool and int)
+ResolutionErrors0.dfy(409,8): Error: arguments must have comparable types (got bool and int)
+ResolutionErrors0.dfy(409,8): Error: arguments must have comparable types (got bool and int)
+ResolutionErrors0.dfy(443,13): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors0.dfy(445,10): Error: a hint is not allowed to make heap updates
+ResolutionErrors0.dfy(447,10): Error: a hint is not allowed to update a variable it doesn't declare
+ResolutionErrors0.dfy(468,4): Error: More than one anonymous constructor
+ResolutionErrors0.dfy(481,15): Error: class Lamb does not have an anonymous constructor
+ResolutionErrors0.dfy(532,15): Error: ghost variables such as gg are allowed only in specification contexts. gg was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(540,21): Error: ghost variables such as gg are allowed only in specification contexts. gg was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(541,35): Error: ghost variables such as gg are allowed only in specification contexts. gg was inferred to be ghost based on its declaration or initialization.
+68 resolution/type errors detected in ResolutionErrors0.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors0.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors0.dfy.refresh.expect
new file mode 100644
index 00000000000..c7fe0d81f57
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors0.dfy.refresh.expect
@@ -0,0 +1,65 @@
+ResolutionErrors0.dfy(323,33): Warning: constructors no longer need 'this' to be listed in modifies clauses
+ResolutionErrors0.dfy(13,18): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+ResolutionErrors0.dfy(25,13): Error: array selection requires an array2?<?38> (got array3<T>)
+ResolutionErrors0.dfy(27,13): Error: array selection requires an array4?<?42> (got array<T>)
+ResolutionErrors0.dfy(26,14): Error: element selection requires a sequence, array, multiset, or map (got array3<T>)
+ResolutionErrors0.dfy(57,16): Error: accessing member 'X' requires an instance expression
+ResolutionErrors0.dfy(58,9): Error: unresolved identifier: F
+ResolutionErrors0.dfy(59,16): Error: accessing member 'F' requires an instance expression
+ResolutionErrors0.dfy(60,9): Error: unresolved identifier: G
+ResolutionErrors0.dfy(62,9): Error: unresolved identifier: M
+ResolutionErrors0.dfy(63,16): Error: accessing member 'M' requires an instance expression
+ResolutionErrors0.dfy(64,9): Error: unresolved identifier: N
+ResolutionErrors0.dfy(67,10): Error: non-function expression (of type int) is called with parameters
+ResolutionErrors0.dfy(68,16): Error: member 'z' does not exist in non-null type 'Global'
+ResolutionErrors0.dfy(51,15): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors0.dfy(88,16): Error: the name 'Benny' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.Benny')
+ResolutionErrors0.dfy(93,16): Error: the name 'David' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.David')
+ResolutionErrors0.dfy(94,16): Error: the name 'David' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.David')
+ResolutionErrors0.dfy(96,16): Error: the name 'David' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.David')
+ResolutionErrors0.dfy(98,20): Error: wrong number of arguments (datatype constructor 'David' expects 1, got 2)
+ResolutionErrors0.dfy(116,11): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(117,12): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors0.dfy(121,13): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(122,12): Error: actual out-parameter is required to be a ghost variable
+ResolutionErrors0.dfy(133,25): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(140,6): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(154,12): Error: only ghost methods can be called from this context
+ResolutionErrors0.dfy(244,29): Error: ghost-context break statement is not allowed to break out of non-ghost structure
+ResolutionErrors0.dfy(267,14): Error: ghost-context break statement is not allowed to break out of non-ghost loop
+ResolutionErrors0.dfy(281,14): Error: ghost-context break statement is not allowed to break out of non-ghost loop
+ResolutionErrors0.dfy(286,10): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
+ResolutionErrors0.dfy(306,12): Error: label shadows an enclosing label
+ResolutionErrors0.dfy(311,10): Error: duplicate label
+ResolutionErrors0.dfy(313,10): Error: label shadows a dominating label
+ResolutionErrors0.dfy(329,11): Error: a constructor is allowed to be called only when an object is being allocated
+ResolutionErrors0.dfy(343,18): Error: arguments must have comparable types (got int and DTD_List)
+ResolutionErrors0.dfy(344,18): Error: arguments must have comparable types (got DTD_List and int)
+ResolutionErrors0.dfy(345,27): Error: arguments must have comparable types (got bool and int)
+ResolutionErrors0.dfy(358,17): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(384,11): Error: RHS (of type int) not assignable to LHS (of type bool)
+ResolutionErrors0.dfy(385,21): Error: integer literal used as if it had type bool
+ResolutionErrors0.dfy(396,19): Error: integer literal used as if it had type _T0
+ResolutionErrors0.dfy(397,15): Error: integer literal used as if it had type _T0
+ResolutionErrors0.dfy(406,8): Error: all lines in a calculation must have the same type (got int after bool)
+ResolutionErrors0.dfy(410,8): Error: all lines in a calculation must have the same type (got int after bool)
+ResolutionErrors0.dfy(405,8): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+ResolutionErrors0.dfy(405,8): Error: arguments must have comparable types (got bool and int)
+ResolutionErrors0.dfy(405,8): Error: arguments must have comparable types (got bool and int)
+ResolutionErrors0.dfy(409,8): Error: arguments must have comparable types (got bool and int)
+ResolutionErrors0.dfy(409,8): Error: arguments must have comparable types (got bool and int)
+ResolutionErrors0.dfy(413,8): Error: type of ==> must be a boolean (got int)
+ResolutionErrors0.dfy(414,12): Error: type of ==> must be a boolean (got int)
+ResolutionErrors0.dfy(415,12): Error: type of ==> must be a boolean (got int)
+ResolutionErrors0.dfy(413,8): Error: type of ==> must be a boolean (got int)
+ResolutionErrors0.dfy(419,12): Error: type of ==> must be a boolean (got int)
+ResolutionErrors0.dfy(418,8): Error: type of ==> must be a boolean (got int)
+ResolutionErrors0.dfy(443,13): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors0.dfy(445,10): Error: a hint is not allowed to make heap updates
+ResolutionErrors0.dfy(447,10): Error: a hint is not allowed to update a variable it doesn't declare
+ResolutionErrors0.dfy(468,4): Error: More than one anonymous constructor
+ResolutionErrors0.dfy(481,15): Error: class 'Lamb' does not have an anonymous constructor
+ResolutionErrors0.dfy(532,15): Error: ghost variables such as gg are allowed only in specification contexts. gg was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(540,21): Error: ghost variables such as gg are allowed only in specification contexts. gg was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors0.dfy(541,35): Error: ghost variables such as gg are allowed only in specification contexts. gg was inferred to be ghost based on its declaration or initialization.
+63 resolution/type errors detected in ResolutionErrors0.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors1.dfy
new file mode 100644
index 00000000000..86d1c05b716
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors1.dfy
@@ -0,0 +1,188 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --allow-axioms
+
+
+// ------------------------ inferred type arguments ----------------------------
+
+// Put the following tests in a separate module, so that the method bodies will
+// be type checked even if there are resolution errors in other modules.
+
+module NoTypeArgs0 {
+  datatype List<+T> = Nil | Cons(T, List)
+  datatype Tree<+A,+B> = Leaf(A, B) | Node(Tree, Tree<B,A>)
+
+  method DoAPrefix0<A, B, C>(xs: List) returns (ys: List<A>)
+  {
+    ys := xs;
+  }
+
+  method DoAPrefix1<A, B, C>(xs: List) returns (ys: List<B>)
+  {
+    ys := xs;  // error: List<B> cannot be assign to a List<A>
+  }
+
+  method DoAPrefix2<A, B, C>(xs: List) returns (ys: List<B>)
+  {
+    ys := xs;  // error: List<B> cannot be assign to a List<A>
+  }
+
+  ghost function FTree0(t: Tree): Tree
+  {
+    match t
+    case Leaf(_,_) => t
+    case Node(x, y) => x
+  }
+
+  ghost function FTree1(t: Tree): Tree
+  {
+    match t
+    case Leaf(_,_) => t
+    case Node(x, y) => y  // error: y does not have the right type
+  }
+
+  ghost function FTree2<A,B,C>(t: Tree): Tree<A,B>
+  {
+    t
+  }
+}
+
+module NoTypeArgs1 {
+  datatype Tree<A,B> = Leaf(A, B) | Node(Tree, Tree<B,A>)
+
+  ghost function FTree3<T>(t: Tree): Tree<T,T>  // error: type of 't' does not have enough type parameters
+  {
+    t
+  }
+}
+
+// ----------- let-such-that expressions ------------------------
+
+module MiscMisc {
+  method LetSuchThat(ghost z: int, n: nat)
+  {
+    var x: int;
+    x := var y :| y < 0; y;  // fine for the resolver (but would give a verification error for not being deterministic)
+
+    x := var w :| w == 2*w; w;  // fine (even for the verifier, this one)
+    x := var w := 2*w; w;  // error: the 'w' in the RHS of the assignment is not in scope
+    ghost var xg := var w :| w == 2*w; w;
+  }
+}
+
+// ------------ quantified variables whose types are not inferred ----------
+
+module NonInferredType {
+  ghost predicate P<T>(x: T)
+
+  method InferredType(x: int)
+  {
+    var t;
+    assume forall z :: P(z) && z == t;
+    assume t == x;  // this statement determines the type of t and z
+  }
+
+  method NonInferredType(x: int)
+  {
+    var t;  // error: the type of t is not determined
+    assume forall z :: P(z) && z == t;  // error: the type of z is not determined
+  }
+}
+
+// ------------ Here are some tests that lemma contexts don't allocate objects -------------
+
+module GhostAllocationTests {
+  class G { }
+  iterator GIter() { }
+  class H { constructor () }
+  lemma GhostNew0()
+    ensures exists o: G :: fresh(o)
+  {
+    var p := new G;  // error: lemma context is not allowed to allocate state
+    p := new G;  // error: ditto
+  }
+
+  method GhostNew1(n: nat, ghost g: int) returns (t: G, z: int)
+  {
+    if n < 0 {
+      z, t := 5, new G;  // fine
+    }
+    if n < g {
+      var tt := new H();  // error: 'new' not allowed in ghost contexts
+    }
+  }
+
+  method GhostNew2(ghost b: bool)
+  {
+    if (b) {
+      var y := new GIter();  // error: 'new' not allowed in ghost contexts (and a non-ghost method is not allowed to be called here either)
+    }
+  }
+}
+module MoreGhostAllocationTests {
+  class G { }
+  method GhostNew3(n: nat) {
+    var g := new G;
+    calc {
+      5;
+      { var y := new G; }  // error: 'new' not allowed in lemma contexts
+      2 + 3;
+    }
+  }
+  ghost method GhostNew4(g: G)
+    modifies g
+  {
+  }
+}
+
+module NewForallAssign {
+  class G { }
+  method NewForallTest(n: nat) {
+    var a := new G[n];
+    forall i | 0 <= i < n {
+      a[i] := new G;  // error: 'new' is currently not supported in forall statements
+  } }
+}
+module NewForallProof {
+  class G { }
+  method NewForallTest(n: nat) { var a := new G[n];
+    forall i | 0 <= i < n ensures true { // this makes the whole 'forall' statement into a ghost statement
+      a[i] := new G;  // error: proof-forall cannot update state (and 'new' not allowed in ghost contexts, but that's checked at a later stage)
+  } }
+}
+
+// ------------------------- underspecified types ------------------------------
+
+module UnderspecifiedTypes {
+  method M(S: set<int>) {
+    var n, p, T0 :| 12 <= n && n in T0 && 10 <= p && p in T0 && T0 <= S && p % 2 != n % 2;
+    var T1 :| 12 in T1 && T1 <= S;
+    var T2 :| T2 <= S && 12 in T2;
+
+    var T3'0: set<int> :| 120 in T3'0;
+    var T3'1: multiset<int> :| 120 in T3'1;
+    var T3'2: map<int,bool> :| 120 in T3'2;
+    var T3'3: seq<int> :| 120 in T3'3;
+    var T3'4: bool :| 120 in T3'4;  // error: second argument to 'in' cannot be bool
+    var T4 :| T4 <= S;
+  }
+}
+
+module UnderspecifiedTypes' {
+  method M() {
+    var T3 :| 120 in T3;  // error: underspecified type
+  }
+}
+
+// ------------------------- lemmas ------------------------------
+
+module MiscLemma {
+  class L { }
+
+  // a lemma is allowed to have out-parameters, but not a modifies clause
+  lemma MyLemma(x: int, l: L) returns (y: int)
+    requires 0 <= x
+    modifies l
+    ensures 0 <= y
+  {
+    y := x;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors1.dfy.expect
new file mode 100644
index 00000000000..387a015543f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors1.dfy.expect
@@ -0,0 +1,21 @@
+ResolutionErrors1.dfy(20,7): Error: RHS (of type List<A>) not assignable to LHS (of type List<B>) (covariant type parameter would require A <: B)
+ResolutionErrors1.dfy(25,7): Error: RHS (of type List<A>) not assignable to LHS (of type List<B>) (covariant type parameter would require A <: B)
+ResolutionErrors1.dfy(39,23): Error: type of case bodies do not agree (found Tree<_T1, _T0>, previous types Tree<_T0, _T1>) (covariant type parameter 0 would require _T1 <: _T0)
+ResolutionErrors1.dfy(51,30): Error: Wrong number of type arguments (0 instead of 2) passed to datatype: Tree
+ResolutionErrors1.dfy(66,20): Error: unresolved identifier: w
+ResolutionErrors1.dfy(85,8): Error: the type of this local variable is underspecified
+ResolutionErrors1.dfy(86,25): Error: the type of this variable is underspecified
+ResolutionErrors1.dfy(86,24): Error: type parameter 'T' (inferred to be '?') in the function call to 'P' could not be determined
+ResolutionErrors1.dfy(86,18): Error: type of bound variable 'z' could not be determined; please specify the type explicitly
+ResolutionErrors1.dfy(99,13): Error: a lemma is not allowed to use 'new'
+ResolutionErrors1.dfy(100,9): Error: a lemma is not allowed to use 'new'
+ResolutionErrors1.dfy(109,16): Error: only ghost methods can be called from this context
+ResolutionErrors1.dfy(116,15): Error: only ghost methods can be called from this context
+ResolutionErrors1.dfy(126,17): Error: a hint is not allowed to use 'new'
+ResolutionErrors1.dfy(141,14): Error: new allocation not supported in aggregate assignments
+ResolutionErrors1.dfy(148,14): Error: a forall statement is not allowed to use 'new'
+ResolutionErrors1.dfy(148,11): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors1.dfy(164,26): Error: second argument to "in" must be a set, multiset, or sequence with elements of type int, or a map with domain int (instead got bool)
+ResolutionErrors1.dfy(171,18): Error: second argument to "in" must be a set, multiset, or sequence with elements of type int, or a map with domain int (instead got ?)
+ResolutionErrors1.dfy(183,13): Error: lemmas are not allowed to have modifies clauses
+20 resolution/type errors detected in ResolutionErrors1.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors1.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors1.dfy.refresh.expect
new file mode 100644
index 00000000000..14a17a6e76d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors1.dfy.refresh.expect
@@ -0,0 +1,19 @@
+ResolutionErrors1.dfy(20,7): Error: RHS (of type List<A>) not assignable to LHS (of type List<B>) (covariant type parameter 'T' would require B :> A)
+ResolutionErrors1.dfy(25,7): Error: RHS (of type List<A>) not assignable to LHS (of type List<B>) (covariant type parameter 'T' would require B :> A)
+ResolutionErrors1.dfy(39,23): Error: type of case bodies do not agree (found Tree<_T1, _T0>, previous types Tree<_T0, _T1>) (covariant type parameter 'A' would require _T0 :> _T1)
+ResolutionErrors1.dfy(39,23): Error: type of case bodies do not agree (found Tree<_T1, _T0>, previous types Tree<_T0, _T1>) (covariant type parameter 'B' would require _T1 :> _T0)
+ResolutionErrors1.dfy(51,30): Error: Wrong number of type arguments (0 instead of 2) passed to datatype: Tree
+ResolutionErrors1.dfy(66,20): Error: unresolved identifier: w
+ResolutionErrors1.dfy(86,33): Error: arguments must have comparable types (got ?8 and ?7)
+ResolutionErrors1.dfy(99,13): Error: a lemma is not allowed to use 'new'
+ResolutionErrors1.dfy(100,9): Error: a lemma is not allowed to use 'new'
+ResolutionErrors1.dfy(109,16): Error: only ghost methods can be called from this context
+ResolutionErrors1.dfy(116,15): Error: only ghost methods can be called from this context
+ResolutionErrors1.dfy(126,17): Error: a hint is not allowed to use 'new'
+ResolutionErrors1.dfy(141,14): Error: new allocation not supported in aggregate assignments
+ResolutionErrors1.dfy(148,14): Error: a forall statement is not allowed to use 'new'
+ResolutionErrors1.dfy(148,11): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors1.dfy(164,26): Error: second argument to 'in' must be a set, a multiset, a sequence with elements of type ?43, or a map with domain ?43 (instead got bool)
+ResolutionErrors1.dfy(171,21): Error: the type of this variable is underspecified
+ResolutionErrors1.dfy(183,13): Error: lemmas are not allowed to have modifies clauses
+18 resolution/type errors detected in ResolutionErrors1.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors2.dfy
new file mode 100644
index 00000000000..205a7387d69
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors2.dfy
@@ -0,0 +1,537 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+// ------------------------- statements in expressions ------------------------------
+
+module StatementsInExpressions {
+  class MyClass {
+    ghost method SideEffect()
+      modifies this
+    {
+    }
+
+    method NonGhostMethod()
+    {
+    }
+
+    ghost function F(): int
+    {
+      calc {
+        6;
+        { assert 6 < 8; }
+        { var x := 8;
+          while x != 0
+            decreases *  // error: cannot use 'decreases *' here
+          {
+            x := x - 1;
+          }
+        }
+        { var x := 8;
+          while x != 0
+          {
+            x := x - 1;
+          }
+        }
+        { var x := 8;
+          while x != 0
+          {
+            x := x - 1;
+          }
+        }
+        6;
+      }
+      5
+    }
+
+    var MyField: int
+    ghost var MyGhostField: int
+
+    method N()
+    {
+      var y :=
+      calc {
+        6;
+        { assert 6 < 8; }
+        { var x := 8;
+          while x != 0
+            decreases *  // error: cannot use 'decreases *' here
+          {
+            x := x - 1;
+          }
+        }
+        { var x := 8;
+          while x != 0
+          {
+            x := x - 1;
+          }
+        }
+        { var x := 8;
+          while x != 0
+          {
+            x := x - 1;
+          }
+        }
+        6;
+      }
+      5;
+    }
+  }
+}
+
+module StmtExprOutParams {
+
+  lemma MyLemma()
+
+  lemma OutParamLemma() returns (y: int)
+
+  ghost function UseLemma(): int
+  {
+    MyLemma();
+    OutParamLemma(); // error: has out-parameters
+    10
+  }
+}
+
+module GhostLetExpr {
+  method M() {
+    ghost var y;
+    var x;
+    var g := G(x, y);
+    ghost var h := ghost var ta := F(); 5;
+    var j; j := var tb := F(); 5;  // fine (tb is ghost, j is not, but RHS body doesn't depend on tb)
+    assert h == j;
+  }
+
+  ghost function F(): int {
+    5
+  }
+
+  function G(x: int, ghost y: int): int {
+    assert y == x;
+    y  // error: not allowed in non-ghost context
+  }
+
+  datatype Dt = MyRecord(a: int, ghost b: int)
+
+  method P(dt: Dt) {
+    match dt {
+      case MyRecord(aa, bb) =>
+        ghost var z := aa + F();
+        ghost var t0 := var y := z; z + 3;
+        ghost var t1 := ghost var y := z + bb; y + z + 3;
+        var t2; t2 := ghost var y := z; y + 3;  // t2 is not ghost - error
+    }
+  }
+
+  function FM(e: bool): int {
+    if e then
+      G(5, F())
+    else
+      var xyz := F();  // fine, because 'xyz' becomes ghost automatically
+      G(5, xyz)
+  }
+}
+
+module ObjectType {
+  type B
+  datatype Dt = Blue | Green
+  codatatype CoDt = Cons(int, CoDt)
+  class MyClass { }
+
+  method M<G>(zz: array<B>, j: int, b: B, co: CoDt, g: G) returns (o: object)
+    requires zz != null && 0 <= j < zz.Length
+  {
+    o := b;  // error
+    o := 17;  // error
+    o := zz[j];  // error
+    o := null;
+    o := zz;
+    o := new MyClass;
+    o := o;
+    o := g;  // error
+    o := Blue;  // error
+    o := co;  // error
+  }
+}
+
+// ------------------ modify statment ---------------------------
+
+module MiscModify {
+  class ModifyStatementClass {
+    var x: int
+    ghost var g: int
+    method M() {
+      modify x;  // error: type error
+    }
+  }
+}
+
+module MiscModifiesGhost {
+  class ModifyStatementClass {
+    var x: int
+    ghost var g: int
+    ghost method G0()
+      modifies `g
+      modifies `x  // error: non-ghost field mentioned in ghost context
+  }
+}
+
+module ModifyStatementClass_More {
+  class C {
+    var x: int
+    ghost var g: int
+
+    ghost method G0()
+      modifies `g
+    {
+      modify `g;
+      modify `x;  // error: non-ghost field mentioned in ghost context
+    }
+
+    method G1()
+      modifies this
+    {
+      modify `x;
+      if g < 100 {
+        // we are now in a ghost context
+        modify `x;  // error: non-ghost field mentioned in ghost context
+      }
+    }
+
+    method G2(y: nat)
+      modifies this
+    {
+      if g < 100 {
+        // we're now in a ghost context
+        var n := 0;
+        while n < y
+          modifies `x  // error: non-ghost field mentioned in ghost context
+        {
+          if * {
+            g := g + 1;  // if we got as far as verification, this would be flagged as an error too
+          }
+          n := n + 1;
+        }
+      }
+      modify `x;  // fine
+
+      ghost var i := 0;
+      while i < y
+        modifies `x  // error: non-ghost field mentioned in ghost context
+      {
+        i := i + 1;
+      }
+    }
+  }
+}
+
+module LhsLvalue {
+  datatype MyRecord = Make(x: int, y: int)
+
+  method MyMethod() returns (w: int)
+
+  method M0() returns (mySeq: seq<int>) {
+    mySeq[0] := 5;  // error: cannot assign to a sequence element
+  }
+
+  method M1() returns (mySeq: seq<int>) {
+    mySeq[0] := MyMethod();  // error: cannot assign to a sequence element
+  }
+
+  method M2() returns (mySeq: seq<int>) {
+    mySeq[0..4] := 5;  // error: cannot assign to a range
+  }
+
+  method M3() returns (mySeq: seq<int>) {
+    mySeq[0..4] := MyMethod();  // error: cannot assign to a range
+  }
+
+  method M()
+  {
+    var mySeq: seq<int>;
+    var a := new int[78];
+    var b := new int[100, 200];
+    var c := new MyRecord[29];
+
+    a[0] := 5;
+    a[0] := MyMethod();
+    b[20, 18] := 5;
+    b[20, 18] := MyMethod();
+    c[25].x := 5;  // error: cannot assign to a destructor
+    c[25].x := MyMethod();  // error: ditto
+    a[0..4] := 5;  // error: cannot assign to a range
+    a[0..4] := MyMethod();  // error: ditto
+  }
+}
+
+// ------------------- dirty loops -------------------
+
+module MiscEtc {
+  method DirtyM(S: set<int>) {
+    forall s | s in S ensures s < 0
+    assert s < 0; // error: s is unresolved
+  }
+
+  // ------------------- tuples -------------------
+
+  method TupleResolution(x: int, y: int, r: real)
+  {
+    var unit: () := ();
+    var expr: int := (x);
+    var pair: (int,int) := (x, x);
+    var triple: (int,int,int) := (y, x, x);
+    var badTriple: (int,real,int) := (y, x, r);  // error: parameters 1 and 2 have the wrong types
+    var quadruple: (int,real,int,real) := (y, r, x);  // error: trying to use a triple as a quadruple
+
+    assert unit == ();
+    assert pair.0 == pair.1;
+    assert triple.2 == x;
+
+    assert triple.2;  // error: 2 has type int, not the expected bool
+    assert triple.3 == pair.x;  // error(s):  3 and x are not destructors
+
+    var k0 := (5, (true, 2, 3.14));
+    var k1 := (((false, 10, 2.7)), 100, 120);
+    if k0.1 == k1.0 {
+      assert false;
+    } else if k0.1.1 < k1.0.1 {
+      assert k1.2 == 120;
+    }
+
+    // int and (int) are the same type (i.e., there are no 1-tuples)
+    var pp: (int) := x;
+    var qq: int := pp;
+  }
+
+  // ------------------- conversions -------------------
+
+  method TypeConversions(m: nat, i: int, r: real) returns (n: nat, j: int, s: real)
+  {
+    n := r as int;
+    j := r as int;
+    s := m as real;  // nat->real is allowed, just like int->real is
+    s := i as real;
+    s := i as real / 2;  // error: division expects two reals
+    s := 15 % s;  // error: modulus is not defined for reals
+
+    s := (2.0 / 1.7) + (r / s) - (--r) * -12.3;
+
+    s := s as real;  // fine (identity transform)
+    j := j as int;  // fine (identity transform)
+    j := n as int;  // fine (identity transform)
+  }
+}
+
+// --- filling in type arguments and checking that there aren't too many ---
+
+module TypeArgumentCount {
+  class C<T> {
+    var f: T
+  }
+
+  method R0(a: array3, c: C)
+
+  method R1()
+  {
+    var a: array3;
+    var c: C;
+  }
+
+  method R2<T>()
+  {
+    var a: array3<T,int>;  // error: too many type arguments
+    var c: C<T,int>;  // error: too many type arguments
+  }
+}
+
+// --- Type synonyms ---
+
+module BadTypeSynonyms {
+  datatype List<T> = Nil | Cons(T, List)
+  type BadSyn0 = List  // error: must have at least one type parameter
+  type BadSyn1 = badName  // error: badName does not denote a type
+  type BadSyn2 = List<X>  // error: X does not denote a type
+  type BadSyn2 = int  // error: repeated name
+}
+
+// --- cycles ---
+
+module CycleError0 {
+  type A = A  // error: cycle: A -> A
+}
+
+module CycleError1 {
+  type A = B  // error: cycle: A -> B -> A
+  type B = A
+}
+
+module CycleError2 {
+  type A = B  // error: cycle: A -> B -> A
+  type B = set<A>
+}
+
+module CycleErrors3 {
+  type A = (B, D<bool>)
+  type B = C
+  class C { // error: since A is not auto-init, class C needs a constructor
+    var a: A  // this is fine
+  }
+  datatype D<X> = Make(A, B, C)  // warning: D<X> is empty
+}
+
+module CycleError4 {
+  type A = B  // error: cycle: A -> B -> A
+  type B = C<A>
+  class C<T> { }
+}
+
+module CycleError5 {
+  type A = B  // error: cycle: A -> B -> A
+  type B = Dt<A>
+  datatype Dt<T> = Make(T)
+}
+
+module CycleError6 {
+  type A = Dt<Dt<A>>  // error: cycle A -> A
+  datatype Dt<T> = Make(T)
+}
+
+// --- attributes in top-level declarations ---
+
+module MiscIterator {
+  iterator {:myAttribute x} Iter() {  // error: x does not refer to anything
+  }
+
+  class {:myAttribute x} C {  // error: x does not refer to anything
+  }
+
+  datatype {:myAttribute x} Dt = Blue  // error: x does not refer to anything
+
+  type {:myAttribute x} Something  // error: x does not refer to anything
+
+  type {:myAttribute x} Synonym = int  // error: x does not refer to anything
+}
+
+module {:myAttribute x} Modulette {  // error: x does not refer to anything
+}
+
+// --- abstract types with type parameters ---
+
+module OpaqueTypes0 {
+  type P<AA>
+  method M<B>(p: P<B>) returns (q: P<B,B>)  // error: wrong param count
+  {
+    q := p;
+  }
+}
+
+module OpaqueTypes1 {
+  type P<A>
+
+  method M0<B>(p: P<B>) returns (q: P<B>)
+  {
+    q := p;
+    var m: P<BX>;  // error: BX undefined
+  }
+
+  method M1<B>(p: P<B>) returns (q: P)  // type parameter of q's type inferred
+  {
+    q := p;
+  }
+
+  method M2(p: P<int>) returns (q: P<bool>)
+  {
+    q := p;  // error: cannot assign P<bool> to P<int>
+  }
+
+  method M3<A,B>(p: P<A>) returns (q: P<B>)
+  {
+    q := p;  // error: cannot assign P<A> to P<B>
+  }
+
+  method M4<A>() returns (p: P<A>, q: P<int>)
+  {
+    q := p;  // error: cannot assign P<A> to P<int>
+    p := q;  // error: cannot assign P<int> to P<A>
+  }
+
+  method EqualityTests<X>(p: P<int>, q: P<bool>, r: P<X>)
+  {
+    assert p != r;  // error: types must be the same in order to do compare
+    assert q != r;  // error: types must be the same in order to do compare
+    assert p != q;  // error: types must be the same in order to do compare
+  }
+}
+
+// ----- new trait -------------------------------------------
+
+module MiscTrait {
+  trait J { }
+  type JJ = J
+  method TraitSynonym()
+  {
+    var x := new JJ;  // error: new cannot be applied to a trait
+  }
+}
+
+// ----- set comprehensions where the term type is finite -----
+
+module ObjectSetComprehensionsNever {
+  // the following set comprehensions are known to be finite
+  ghost function A() : set<object> { set o : object | true :: o }  // error: a function is not allowed to depend on the allocated state
+  function B() : set<object> { set o : object | true :: o }  // error: a function is not allowed to depend on the allocated state
+}
+
+module ObjectSetComprehensionsSometimes {
+  // outside functions, the comprehension is permitted, but it cannot be compiled
+  lemma C() { var x; x := set o : object | true :: o; }
+
+  method D() { var x; x := set o : object | true :: o; }  // error: not (easily) compilable, so this is allowed only in ghost contexts
+}
+
+// ------ regression test for type checking of integer division -----
+
+module MiscTests {
+  method IntegerDivision(s: set<bool>)
+  {
+    var t := s / s;  // error: / cannot be used with sets
+  }
+
+  // ----- decreases * tests ----
+
+  method NonTermination_A()
+  {
+    NonTermination_B();  // error: to call a non-terminating method, the caller must be marked 'decreases *'
+  }
+
+  method NonTermination_B()
+    decreases *
+  {
+    while true
+      decreases *
+    {
+    }
+  }
+
+  method NonTermination_C()
+  {
+    while true
+      decreases *  // error: to use an infinite loop, the enclosing method must be marked 'decreases *'
+    {
+    }
+  }
+
+  method NonTermination_D()
+    decreases *
+  {
+    var n := 0;
+    while n < 100  // note, no 'decreases *' here, even if the nested loop may fail to terminate
+    {
+      while *
+        decreases *
+      {
+      }
+      n := n + 1;
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors2.dfy.expect
new file mode 100644
index 00000000000..acb24b31d16
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors2.dfy.expect
@@ -0,0 +1,72 @@
+ResolutionErrors2.dfy(24,22): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+ResolutionErrors2.dfy(57,22): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+ResolutionErrors2.dfy(90,17): Error: the method returns 1 value but is assigned to 0 variable (all return values must be assigned)
+ResolutionErrors2.dfy(111,4): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors2.dfy(122,40): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors2.dfy(144,6): Error: RHS (of type B) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(146,6): Error: RHS (of type B) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(151,6): Error: RHS (of type G) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(152,6): Error: RHS (of type Dt) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(153,6): Error: RHS (of type CoDt) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(145,6): Error: RHS (of type int) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(164,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int)
+ResolutionErrors2.dfy(175,16): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors2.dfy(188,14): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors2.dfy(197,16): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors2.dfy(208,20): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors2.dfy(220,18): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors2.dfy(234,4): Error: LHS of array assignment must denote an array element (found seq<int>)
+ResolutionErrors2.dfy(238,4): Error: LHS of array assignment must denote an array element (found seq<int>)
+ResolutionErrors2.dfy(242,9): Error: cannot assign to a range of array elements (try the 'forall' statement)
+ResolutionErrors2.dfy(246,9): Error: cannot assign to a range of array elements (try the 'forall' statement)
+ResolutionErrors2.dfy(260,10): Error: LHS of assignment must denote a mutable field
+ResolutionErrors2.dfy(261,10): Error: LHS of assignment must denote a mutable field
+ResolutionErrors2.dfy(262,5): Error: cannot assign to a range of array elements (try the 'forall' statement)
+ResolutionErrors2.dfy(263,5): Error: cannot assign to a range of array elements (try the 'forall' statement)
+ResolutionErrors2.dfy(272,11): Error: unresolved identifier: s
+ResolutionErrors2.dfy(291,18): Error: member '3' does not exist in datatype '_tuple#3'
+ResolutionErrors2.dfy(291,28): Error: member 'x' does not exist in datatype '_tuple#2'
+ResolutionErrors2.dfy(290,18): Error: condition is expected to be of type bool, but is int
+ResolutionErrors2.dfy(284,39): Error: RHS (of type (int, real, int)) not assignable to LHS (of type (int, real, int, real))
+ResolutionErrors2.dfy(283,34): Error: RHS (of type (int, int, real)) not assignable to LHS (of type (int, real, int)) (covariant type parameter 1 would require int <: real)
+ResolutionErrors2.dfy(315,12): Error: type of left argument to % (int) must agree with the result type (real)
+ResolutionErrors2.dfy(315,12): Error: arguments to % must be integer-numeric or bitvector types (got real)
+ResolutionErrors2.dfy(314,19): Error: type of right argument to / (int) must agree with the result type (real)
+ResolutionErrors2.dfy(342,11): Error: Wrong number of type arguments (2 instead of 1) passed to non-null type: array3
+ResolutionErrors2.dfy(343,11): Error: Wrong number of type arguments (2 instead of 1) passed to non-null type: C
+ResolutionErrors2.dfy(354,7): Error: duplicate name of top-level declaration: BadSyn2
+ResolutionErrors2.dfy(353,7): Related location
+ResolutionErrors2.dfy(351,17): Error: Wrong number of type arguments (0 instead of 1) passed to datatype: List
+ResolutionErrors2.dfy(352,17): Error: Type or type parameter is not declared in this scope: badName (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors2.dfy(353,22): Error: Type or type parameter is not declared in this scope: X (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors2.dfy(360,7): Error: type-synonym cycle: A -> A
+ResolutionErrors2.dfy(364,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
+ResolutionErrors2.dfy(369,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
+ResolutionErrors2.dfy(379,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'D' can be constructed
+ResolutionErrors2.dfy(376,8): Error: class 'C' with fields without known initializers, like 'a' of type 'A', must declare a constructor
+ResolutionErrors2.dfy(383,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
+ResolutionErrors2.dfy(389,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
+ResolutionErrors2.dfy(395,7): Error: type-synonym cycle: A -> A
+ResolutionErrors2.dfy(402,25): Error: unresolved identifier: x
+ResolutionErrors2.dfy(405,22): Error: unresolved identifier: x
+ResolutionErrors2.dfy(408,25): Error: unresolved identifier: x
+ResolutionErrors2.dfy(410,21): Error: unresolved identifier: x
+ResolutionErrors2.dfy(412,21): Error: unresolved identifier: x
+ResolutionErrors2.dfy(415,21): Error: unresolved identifier: x
+ResolutionErrors2.dfy(422,35): Error: Wrong number of type arguments (2 instead of 1) passed to abstract type: P
+ResolutionErrors2.dfy(434,13): Error: Type or type parameter is not declared in this scope: BX (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors2.dfy(444,6): Error: RHS (of type P<int>) not assignable to LHS (of type P<bool>) (non-variant type parameter would require bool = int)
+ResolutionErrors2.dfy(449,6): Error: RHS (of type P<A>) not assignable to LHS (of type P<B>) (non-variant type parameter would require B = A)
+ResolutionErrors2.dfy(454,6): Error: RHS (of type P<A>) not assignable to LHS (of type P<int>) (non-variant type parameter would require int = A)
+ResolutionErrors2.dfy(455,6): Error: RHS (of type P<int>) not assignable to LHS (of type P<A>) (non-variant type parameter would require A = int)
+ResolutionErrors2.dfy(460,13): Error: arguments must have comparable types (got P<int> and P<X>)
+ResolutionErrors2.dfy(461,13): Error: arguments must have comparable types (got P<bool> and P<X>)
+ResolutionErrors2.dfy(462,13): Error: arguments must have comparable types (got P<int> and P<bool>)
+ResolutionErrors2.dfy(473,13): Error: new can be applied only to class types (got JJ)
+ResolutionErrors2.dfy(481,37): Error: a set comprehension involved in a function definition is not allowed to depend on the set of allocated references, but values of 'o' (of type 'object') may contain references (see documentation for 'older' parameters)
+ResolutionErrors2.dfy(482,31): Error: a set comprehension involved in a function definition is not allowed to depend on the set of allocated references, but values of 'o' (of type 'object') may contain references (see documentation for 'older' parameters)
+ResolutionErrors2.dfy(489,27): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'o'
+ResolutionErrors2.dfy(497,15): Error: arguments to / must be numeric or bitvector types (got set<bool>)
+ResolutionErrors2.dfy(504,20): Error: a call to a possibly non-terminating method is allowed only if the calling method is also declared (with 'decreases *') to be possibly non-terminating
+ResolutionErrors2.dfy(519,16): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+69 resolution/type errors detected in ResolutionErrors2.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors2.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors2.dfy.refresh.expect
new file mode 100644
index 00000000000..a4397ec7c5e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors2.dfy.refresh.expect
@@ -0,0 +1,81 @@
+ResolutionErrors2.dfy(24,22): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+ResolutionErrors2.dfy(57,22): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+ResolutionErrors2.dfy(90,17): Error: wrong number of method result arguments (got 0, expected 1)
+ResolutionErrors2.dfy(111,4): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors2.dfy(122,40): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors2.dfy(144,6): Error: RHS (of type B) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(151,6): Error: RHS (of type G) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(152,6): Error: RHS (of type Dt) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(153,6): Error: RHS (of type CoDt) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(146,6): Error: RHS (of type B) not assignable to LHS (of type object)
+ResolutionErrors2.dfy(145,9): Error: integer literal used as if it had type object?
+ResolutionErrors2.dfy(164,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int)
+ResolutionErrors2.dfy(175,16): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors2.dfy(188,14): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors2.dfy(197,16): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors2.dfy(208,20): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors2.dfy(220,18): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors2.dfy(234,4): Error: LHS of array assignment must denote an array element (found seq<int>)
+ResolutionErrors2.dfy(238,4): Error: LHS of array assignment must denote an array element (found seq<int>)
+ResolutionErrors2.dfy(242,9): Error: cannot assign to a range of array elements (try the 'forall' statement)
+ResolutionErrors2.dfy(242,4): Error: LHS of array assignment must denote an array element (found seq<int>)
+ResolutionErrors2.dfy(242,19): Error: integer literal used as if it had type seq<int>
+ResolutionErrors2.dfy(246,9): Error: cannot assign to a range of array elements (try the 'forall' statement)
+ResolutionErrors2.dfy(246,4): Error: LHS of array assignment must denote an array element (found seq<int>)
+ResolutionErrors2.dfy(246,9): Error: index-range selection used as if it had type int
+ResolutionErrors2.dfy(246,9): Error: resulting sequence (int) type does not agree with source sequence type (seq<int>)
+ResolutionErrors2.dfy(260,10): Error: LHS of assignment must denote a mutable field
+ResolutionErrors2.dfy(261,10): Error: LHS of assignment must denote a mutable field
+ResolutionErrors2.dfy(262,5): Error: cannot assign to a range of array elements (try the 'forall' statement)
+ResolutionErrors2.dfy(263,5): Error: cannot assign to a range of array elements (try the 'forall' statement)
+ResolutionErrors2.dfy(263,5): Error: index-range selection used as if it had type int
+ResolutionErrors2.dfy(262,12): Error: RHS (of type int) not assignable to LHS (of type seq<int>)
+ResolutionErrors2.dfy(272,11): Error: unresolved identifier: s
+ResolutionErrors2.dfy(284,39): Error: RHS (of type (?17, ?18, ?19)) not assignable to LHS (of type (int, real, int, real))
+ResolutionErrors2.dfy(283,34): Error: RHS (of type (int, int, real)) not assignable to LHS (of type (int, real, int)) (covariant type parameter 'T1' would require real :> int)
+ResolutionErrors2.dfy(283,34): Error: RHS (of type (int, int, real)) not assignable to LHS (of type (int, real, int)) (covariant type parameter 'T2' would require int :> real)
+ResolutionErrors2.dfy(291,18): Error: member '3' does not exist in datatype '_tuple#3'
+ResolutionErrors2.dfy(291,28): Error: member 'x' does not exist in datatype '_tuple#2'
+ResolutionErrors2.dfy(290,18): Error: condition is expected to be of type bool, but is int
+ResolutionErrors2.dfy(291,20): Error: arguments must have comparable types (got ?23 and ?24)
+ResolutionErrors2.dfy(314,21): Error: integer literal used as if it had type real
+ResolutionErrors2.dfy(315,9): Error: integer literal used as if it had type real
+ResolutionErrors2.dfy(315,12): Error: type of % must be integer-numeric or bitvector types (got real)
+ResolutionErrors2.dfy(342,11): Error: Wrong number of type arguments (2 instead of 1) passed to non-null type: array3
+ResolutionErrors2.dfy(343,11): Error: Wrong number of type arguments (2 instead of 1) passed to non-null type: C
+ResolutionErrors2.dfy(354,7): Error: duplicate name of top-level declaration: BadSyn2
+ResolutionErrors2.dfy(353,7): Related location
+ResolutionErrors2.dfy(351,17): Error: Wrong number of type arguments (0 instead of 1) passed to datatype: List
+ResolutionErrors2.dfy(352,17): Error: Type or type parameter is not declared in this scope: badName (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors2.dfy(353,22): Error: Type or type parameter is not declared in this scope: X (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors2.dfy(360,7): Error: type-synonym cycle: A -> A
+ResolutionErrors2.dfy(364,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
+ResolutionErrors2.dfy(369,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
+ResolutionErrors2.dfy(379,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'D' can be constructed
+ResolutionErrors2.dfy(376,8): Error: class 'C' with fields without known initializers, like 'a' of type 'A', must declare a constructor
+ResolutionErrors2.dfy(383,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
+ResolutionErrors2.dfy(389,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
+ResolutionErrors2.dfy(395,7): Error: type-synonym cycle: A -> A
+ResolutionErrors2.dfy(402,25): Error: unresolved identifier: x
+ResolutionErrors2.dfy(405,22): Error: unresolved identifier: x
+ResolutionErrors2.dfy(408,25): Error: unresolved identifier: x
+ResolutionErrors2.dfy(410,21): Error: unresolved identifier: x
+ResolutionErrors2.dfy(412,21): Error: unresolved identifier: x
+ResolutionErrors2.dfy(415,21): Error: unresolved identifier: x
+ResolutionErrors2.dfy(422,35): Error: Wrong number of type arguments (2 instead of 1) passed to abstract type: P
+ResolutionErrors2.dfy(434,13): Error: Type or type parameter is not declared in this scope: BX (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors2.dfy(444,6): Error: RHS (of type P<int>) not assignable to LHS (of type P<bool>) (non-variant type parameter 'A' would require bool = int)
+ResolutionErrors2.dfy(449,6): Error: RHS (of type P<A>) not assignable to LHS (of type P<B>) (non-variant type parameter 'A' would require B = A)
+ResolutionErrors2.dfy(454,6): Error: RHS (of type P<A>) not assignable to LHS (of type P<int>) (non-variant type parameter 'A' would require int = A)
+ResolutionErrors2.dfy(455,6): Error: RHS (of type P<int>) not assignable to LHS (of type P<A>) (non-variant type parameter 'A' would require A = int)
+ResolutionErrors2.dfy(460,13): Error: arguments must have comparable types (got P<int> and P<X>)
+ResolutionErrors2.dfy(461,13): Error: arguments must have comparable types (got P<bool> and P<X>)
+ResolutionErrors2.dfy(462,13): Error: arguments must have comparable types (got P<int> and P<bool>)
+ResolutionErrors2.dfy(473,13): Error: new can be applied only to class types (got JJ)
+ResolutionErrors2.dfy(481,37): Error: a set comprehension involved in a function definition is not allowed to depend on the set of allocated references, but values of 'o' (of type 'object') may contain references (see documentation for 'older' parameters)
+ResolutionErrors2.dfy(482,31): Error: a set comprehension involved in a function definition is not allowed to depend on the set of allocated references, but values of 'o' (of type 'object') may contain references (see documentation for 'older' parameters)
+ResolutionErrors2.dfy(489,27): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'o'
+ResolutionErrors2.dfy(497,15): Error: arguments to / must be numeric or bitvector types (got set<bool>)
+ResolutionErrors2.dfy(504,20): Error: a call to a possibly non-terminating method is allowed only if the calling method is also declared (with 'decreases *') to be possibly non-terminating
+ResolutionErrors2.dfy(519,16): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+78 resolution/type errors detected in ResolutionErrors2.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors3.dfy
new file mode 100644
index 00000000000..beda4a9fcf9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors3.dfy
@@ -0,0 +1,569 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --allow-axioms
+
+
+// ------------ type variables whose values are not inferred ----------
+
+module NonInferredTypeVariables {
+  class C<CT> {
+    var f: CT
+  }
+
+  predicate P<PT>(x: int)
+  {
+    x < 100
+  }
+
+  ghost function Q<QT>(x: int): QT
+  {
+    var qt :| true; qt
+  }
+
+  method M<MT>(n: nat)
+  {
+    var a := new MT[n];
+  }
+
+  method N<NT>(n: nat) returns (x: NT)
+  {
+    var a := new NT[10];
+    x := a[3];
+  }
+
+  method DeterminedClient(n: nat)
+  {
+    ghost var q := Q(n);
+    var x := N(n);
+    var a := new array;
+    var c := new C;
+    var s: set;
+    var ss := new set[15];
+
+    q := 3.14;  // this will determine the type parameter of Q to be 'real'
+    x := 3.14;  // this will determine the type parameter of N to be 'real'
+    if a.Length != 0 {
+      a[0] := 3.14;  // this will determine the type parameter of 'array' to be 'real'
+    }
+    c.f := 3.14;  // this will determine the type parameter of 'C' to be 'real'
+    var containsPi := 3.14 in s;  // this will determine the type parameter of 'set' to be 'real'
+    ss[12] := s;  // this will determine the type parameter of 'array<set< _ >>' to be 'real'
+  }
+
+  method BadClient(n: nat)
+  {
+    var p := P(n);  // error: cannot infer the type argument for P
+    ghost var q := Q(n);  // error: cannot infer the type argument for Q (and thus q's type cannot be determined either)
+    M(n);  // error: cannot infer the type argument for M
+    var x := N(n);  // error: cannot infer the type argument for N (and thus x's type cannot be determined either)
+    var a := new array;  // error: cannot infer the type argument for 'array'
+    var c := new C;  // error: cannot infer the type argument for 'C'
+    var s: set;  // type argument for 'set'
+    var ss := new set[15];  // error: cannot infer the type argument in 'array<set< _ >>'
+    var what;  // error: the type of this local variable in underspecified
+  }
+
+  method MoreBadClient()
+  {
+
+
+
+
+    // In the following, the type of the bound variable is completely determined.
+    var S: set<set<int>>;
+    ghost var d0 := forall s :: s == {7} ==> s != {};
+    var d1 := forall s: set :: s in S ==> s == {};
+    var ggcc0: C;
+    var ggcc1: C;  // error: full type cannot be determined
+    ghost var d2 := forall c: C? :: c != null ==> c.f == 10;
+    ghost var d2' := forall c: C? :: c == ggcc0 && c != null ==> c.f == 10;
+    ghost var d2'' := forall c: C? :: c == ggcc1 && c != null ==> c.f == c.f; // error: here, type of c is not determined
+
+    var d0' := forall s :: s == {7} ==> s != {};
+    var d0'' := forall s :: s <= {7} ==> s == {};
+  }
+}
+
+// -------------- signature completion ------------------
+
+module SignatureCompletion {
+  // datatype signatures do not allow auto-declared type parameters on the LHS
+  datatype Dt = Ctor(X -> Dt)  // error: X is not a declared type
+  datatype Et<Y> = Ctor(X -> Et, Y)  // error: X is not a declared type
+
+
+  method My0<A,B>(s: set, x: A -> B)
+  method My1<A,B>(x: A -> B, s: set)
+  method My2<A,B>(s: set, x: A -> B)
+  method My3<A,B>(x: A -> B, s: set)
+
+  ghost function F0<A,B>(s: set, x: A -> B): int
+  ghost function F1<A,B>(x: A -> B, s: set): int
+  ghost function F2<A,B>(s: set, x: A -> B): int
+  ghost function F3<A,B>(x: A -> B, s: set): int
+}
+
+// -------------- more fields as frame targets --------------------
+
+module FrameTargetFields {
+  class C {
+    var x: int
+    var y: int
+    ghost var z: int
+
+    method M()
+      modifies this
+    {
+      var n := 0;
+      ghost var save := y;
+      while n < x
+        modifies `x
+      {
+        n, x := n + 1, x - 1;
+      }
+      assert y == save;
+    }
+
+    ghost method N()
+      modifies this
+      modifies `y  // resolution error: cannot mention non-ghost here
+      modifies `z  // cool
+    {
+    }
+  }
+}
+
+module FrameTargetFields_More {
+  class C {
+    var x: int
+    var y: int
+    ghost var z: int
+    method P()
+      modifies this
+    {
+      ghost var h := x;
+      while 0 <= h
+        modifies `x  // resolution error: cannot mention non-ghost here
+        modifies `z  // cool
+      {
+        h, z := h - 1, 5 * z;
+      }
+    }
+  }
+}
+
+// ------------------------------------------------------
+
+module AmbiguousModuleReference {
+  module A {
+    module Inner {
+      ghost predicate Q()
+    }
+  }
+
+  module B {
+    module Inner {
+      ghost predicate Q()
+    }
+  }
+
+  module OpenClient {
+    import opened A
+    import opened B
+    lemma M() {
+      var a := A.Inner.Q();  // fine
+      var b := B.Inner.Q();  // fine
+      var p := Inner.Q();  // error: Inner is ambiguous (A.Inner or B.Inner)
+    }
+  }
+}
+
+// --------------------------------------------------
+
+module GhostLet {
+  method M() {
+    var x: int;
+    x := ghost var tmp := 5; tmp;  // error: ghost -> non-ghost
+    x := ghost var tmp := 5; 10;  // fine
+    x := ghost var a0, a1 :| a0 == 0 && a1 == 1; a0 + a1;  // error: ghost -> non-ghost
+    x := ghost var a :| 0 <= a; 10;  // fine
+  }
+}
+
+// ------------------- tuple equality support -------------------
+
+module TupleEqualitySupport {
+  datatype GoodRecord = GoodRecord(set<(int,int)>)
+  datatype BadRecord = BadRecord(set<(int, int->bool)>)  // error: this tuple type does not support equality
+}
+
+// ------------------- non-type variable names -------------------
+
+module NonTypeVariableNames {
+  type X = int
+
+  module Y { }
+
+  method M(m: map<real,string>)
+  {
+    assert X == X;  // error (x2): type name used as variable
+    assert Y == Y;  // error (x2): module name used as variable
+    assert X in m;  // error (x2): type name used as variable
+    assert Y in m;  // error (x2): module name used as variable
+  }
+
+  method N(k: int)
+  {
+    assert k == X;  // error (x2): type name used as variable
+    assert k == Y;  // error (x2): module name used as variable
+    X := k;  // error: type name used as variable
+    Y := k;  // error: module name used as variable
+  }
+}
+
+// ------------------- assign-such-that and let-such-that -------------------
+
+module SuchThat {
+  method M() {
+    var x: int;
+    x :| 5 + 7;  // error: constraint should be boolean
+    x :| x;  // error: constraint should be boolean
+    var y :| 4;  // error: constraint should be boolean
+  }
+  ghost function F(): int {
+    var w :| 6 + 8;  // error: constraint should be boolean
+    w
+  }
+}
+
+// ---------------------- NEW STUFF ----------------------------------------
+
+module GhostTests {
+  class G { }
+
+  method GhostNew3(n: nat)
+  {
+    var g := new G;
+    calc {
+      5;
+      2 + 3;
+      { if n != 0 { GhostNew3(n-1); } }  // error: cannot call non-ghost method in a ghost context
+      1 + 4;
+      { GhostNew4(g); }  // error: cannot call method with nonempty modifies
+      -5 + 10;
+    }
+  }
+
+  ghost method GhostNew4(g: G)
+    modifies g
+  {
+  }
+
+  class MyClass {
+    ghost method SideEffect()
+      modifies this
+    {
+    }
+
+    method NonGhostMethod()
+    {
+    }
+
+    ghost method M()
+      modifies this
+    {
+      calc {
+        5;
+        { SideEffect(); }  // error: cannot call method with side effects
+        5;
+      }
+    }
+
+    ghost function F(): int
+    {
+      calc {
+        6;
+        { assert 6 < 8; }
+        { NonGhostMethod(); }  // error: cannot call non-ghost method
+        { var x := 8;
+          while x != 0
+          {
+            x := x - 1;
+          }
+        }
+        { var x := 8;
+          while x != 0
+          {
+            x := x - 1;
+          }
+        }
+        { MyField := 12; }  // error: cannot assign to a field, and especially not a non-ghost field
+        { MyGhostField := 12; }  // error: cannot assign to any field
+        { SideEffect(); }  // error: cannot call (ghost) method with a modifies clause
+        { var x := 8;
+          while x != 0
+            modifies this  // error: cannot use a modifies clause on a loop inside a hint
+          {
+            x := x - 1;
+          }
+        }
+        6;
+      }
+      5
+    }
+
+    var MyField: int
+    ghost var MyGhostField: int
+
+    method N()
+    {
+      var y :=
+      calc {
+        6;
+        { assert 6 < 8; }
+        { NonGhostMethod(); }  // error: cannot call non-ghost method
+        { var x := 8;
+          while x != 0
+          {
+            x := x - 1;
+          }
+        }
+        { MyField := 12; }  // error: cannot assign to a field, and especially not a non-ghost field
+        { MyGhostField := 12; }  // error: cannot assign to any field
+        { M(); }  // error: cannot call (ghost) method with a modifies clause
+        { var x := 8;
+          while x != 0
+            modifies this  // error: cannot use a modifies clause on a loop inside a hint
+          {
+            x := x - 1;
+          }
+        }
+        { var x := 8;
+          while x != 0
+          {
+            x := x - 1;
+          }
+        }
+        6;
+      }
+      5;
+    }
+  }
+}
+
+module CallsInStmtExpr {
+  class MyClass {
+    lemma MyLemma()
+
+    ghost method MyEffectlessGhostMethod()
+
+    ghost function UseLemma(): int
+    {
+      MyEffectlessGhostMethod(); // error: cannot call ghost methods (only lemmas) from this context
+      MyLemma();
+      10
+    }
+  }
+}
+
+module EvenMoreGhostTests {
+  ghost method NiceTry()
+    ensures false
+  {
+    while (true)
+      decreases *  // error:  not allowed here
+    {
+    }
+  }
+
+  method BreakMayNotBeFineHere()
+  {
+    var n := 0;
+    var p := 0;
+    while (true)
+    {
+      var dontKnow;
+      if (n == 112) {
+      } else if (dontKnow == 708) {
+        while * {
+          label IfNest:
+          if (p == 67) {
+            break break;  // fine, since this is not a ghost context
+          } else if (*) {
+            break break break;  // error: tries to break out of more loop levels than there are
+          }
+        }
+      }
+    }
+  }
+}
+
+module BadGhostTransfer {
+  datatype DTD_List = DTD_Nil | DTD_Cons(Car: int, Cdr: DTD_List, ghost g: int)
+
+  method DatatypeDestructors_Ghost(d: DTD_List) {
+    var g1; g1 := d.g;  // error: cannot use ghost member in non-ghost code
+  }
+
+  method AssignSuchThatFromGhost()
+  {
+    var x: int;
+    ghost var g: int;
+
+    x := g;  // error: ghost cannot flow into non-ghost
+
+    x := *;
+    assume x == g;  // this mix of ghosts and non-ghosts is cool (but, of course,
+                    // the compiler will complain)
+
+    x :| x == g;  // error: left-side has non-ghost, so RHS must be non-ghost as well
+
+    x :| assume x == g;  // this is cool, since it's an assume (but, of course, the
+                         // compiler will complain)
+
+    x :| x == 5;
+    g :| g <= g;
+    g :| assume g < g;  // the compiler will complain here, despite the LHS being
+                        // ghost -- and rightly so, since an assume is used
+  }
+}
+
+module MoreGhostPrintAttempts {
+  method TestCalc_Ghost(m: int, n: int, a: bool, b: bool)
+  {
+    calc {
+      n + m;
+      { print n + m; } // error: non-ghost statements are not allowed in hints
+      m + n;
+    }
+  }
+}
+
+module MoreLetSuchThatExpr {
+  method LetSuchThat_Ghost(ghost z: int, n: nat)
+  {
+    var x; x := var y :| y < z; y;  // error: contraint depend on ghost (z)
+  }
+}
+
+module UnderspecifiedTypedShouldBeResolvedOnlyOnce {
+  method CalcTest0(s: seq<int>) {
+    calc {
+      2;
+      var t :| true; 2;  // error: type of 't' is underspecified
+    }
+  }
+}
+
+module LoopResolutionTests {
+  class C {
+    var x: int
+    ghost var y: int
+  }
+
+  ghost method M(c: C)
+    modifies c
+  {
+    var n := 0;
+    while n < 100
+      modifies c`y
+      modifies c`x  // error: not allowed to mention non-ghost field in modifies clause of ghost loops
+    {
+      c.x := c.x + 1;  // error: assignment to non-ghost field not allowed here
+    }
+  }
+
+  method MM(c: C)
+    modifies c
+  {
+    var n := 0;
+    while
+      invariant n <= 100
+      modifies c  // regression test
+    {
+      case n < 100 =>  n := n + 1;
+    }
+  }
+
+  method MMX(c: C, ghost g: int)
+    modifies c
+  {
+    var n := 0;
+    while
+      invariant n <= 100
+      modifies c`y
+      modifies c`x  // error: not allowed to mention non-ghost field in modifies clause of ghost loops
+    {
+      case n < 100 =>  n := n + 1;  // error: cannot assign to non-ghost in a ghost loop
+      case g < 56 && n != 100 => n := n + 1;  // error: cannot assign to non-ghost in a ghost loop
+    }
+  }
+
+  method MD0(c: C, ghost g: nat)
+    modifies c
+    decreases *
+  {
+    var n := 0;
+    while n + g < 100
+      invariant n <= 100
+      decreases *  // error: disallowed on ghost loops
+    {
+      n := n + 1;  // error: cannot assign to non-ghost in a ghost loop
+    }
+  }
+
+  method MD1(c: C, ghost g: nat)
+    modifies c
+    decreases *
+  {
+    var n := 0;
+    while
+      invariant n <= 100
+      decreases *  // error: disallowed on ghost loops
+    {
+      case n + g < 100 =>  n := n + 1;  // error: cannot assign to non-ghost in a ghost loop
+    }
+  }
+}
+
+module UnderspecifiedTypesInAttributes {
+  function P<T>(x: T): int
+
+  method M() {
+    var {:myattr var u :| true; 6} v: int;  // error: type of u is underspecified
+    var j {:myattr var u :| true; 6} :| 0 <= j < 100;  // error: type of u is underspecified
+
+    var a := new int[100];
+    forall lp {:myattr var u :| true; 6} | 0 <= lp < 100 {  // error: type of u is underspecified
+      a[lp] := 0;
+    }
+
+    modify {:myattr P(10)} {:myattr var u :| true; 6} a;  // error: type of u is underspecified
+
+    calc {:myattr P(10)} {:myattr var u :| true; 6} // error: type of u is underspecified
+    {
+      5;
+    }
+  }
+}
+
+module NonInferredTypeVariables' {
+  class C<CT> {
+    var f: CT
+  }
+
+  method MoreBadClient0()
+  {
+    var b0 := forall s :: s <= {} ==> s == {};  // error: type of s underspecified
+    var b1 := forall s: set :: s <= {} ==> s == {};  // error: type of s underspecified
+  }
+}
+
+module NonInferredTypeVariables'' {
+  class C<CT> {
+    var f: CT
+  }
+
+  method MoreBadClient1()
+  {
+    var b2 := forall c: C? :: c in {null} ==> c == null;  // error: type parameter of c underspecified
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors3.dfy.expect
new file mode 100644
index 00000000000..3637b047d63
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors3.dfy.expect
@@ -0,0 +1,87 @@
+ResolutionErrors3.dfy(53,14): Error: type parameter 'PT' (inferred to be '?') in the function call to 'P' could not be determined
+ResolutionErrors3.dfy(54,14): Error: the type of this variable is underspecified
+ResolutionErrors3.dfy(54,20): Error: type parameter 'QT' (inferred to be '?') in the function call to 'Q' could not be determined
+ResolutionErrors3.dfy(54,20): Error: the type of this expression is underspecified
+ResolutionErrors3.dfy(55,4): Error: type parameter 'MT' (inferred to be '?') to the method 'M' could not be determined
+ResolutionErrors3.dfy(56,8): Error: the type of this variable is underspecified
+ResolutionErrors3.dfy(56,13): Error: type parameter 'NT' (inferred to be '?') to the method 'N' could not be determined
+ResolutionErrors3.dfy(57,8): Error: the type of this variable is underspecified
+ResolutionErrors3.dfy(58,8): Error: the type of this variable is underspecified
+ResolutionErrors3.dfy(59,8): Error: the type of this local variable is underspecified
+ResolutionErrors3.dfy(60,8): Error: the type of this variable is underspecified
+ResolutionErrors3.dfy(61,8): Error: the type of this local variable is underspecified
+ResolutionErrors3.dfy(75,8): Error: the type of this local variable is underspecified
+ResolutionErrors3.dfy(78,29): Error: type of bound variable 'c' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(89,21): Error: Type or type parameter is not declared in this scope: X (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors3.dfy(90,24): Error: Type or type parameter is not declared in this scope: X (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors3.dfy(127,16): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (y)
+ResolutionErrors3.dfy(144,18): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors3.dfy(174,15): Error: The name Inner ambiguously refers to a type in one of the modules A, B (try qualifying the type name with the module name)
+ResolutionErrors3.dfy(184,29): Error: ghost variables such as tmp are allowed only in specification contexts. tmp was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors3.dfy(186,49): Error: ghost variables such as a0 are allowed only in specification contexts. a0 was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors3.dfy(186,54): Error: ghost variables such as a1 are allowed only in specification contexts. a1 was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors3.dfy(195,33): Error: set argument type must support equality (got (int, int -> bool))
+ResolutionErrors3.dfy(207,11): Error: name of type (X) is used as a variable
+ResolutionErrors3.dfy(207,16): Error: name of type (X) is used as a variable
+ResolutionErrors3.dfy(208,11): Error: name of module (Y) is used as a variable
+ResolutionErrors3.dfy(208,16): Error: name of module (Y) is used as a variable
+ResolutionErrors3.dfy(209,11): Error: name of type (X) is used as a variable
+ResolutionErrors3.dfy(210,11): Error: name of module (Y) is used as a variable
+ResolutionErrors3.dfy(215,16): Error: name of type (X) is used as a variable
+ResolutionErrors3.dfy(216,16): Error: name of module (Y) is used as a variable
+ResolutionErrors3.dfy(217,4): Error: name of type (X) is used as a variable
+ResolutionErrors3.dfy(218,4): Error: name of module (Y) is used as a variable
+ResolutionErrors3.dfy(228,9): Error: type of RHS of assign-such-that statement must be boolean (got int)
+ResolutionErrors3.dfy(227,11): Error: type of left argument to + (int) must agree with the result type (bool)
+ResolutionErrors3.dfy(227,11): Error: type of right argument to + (int) must agree with the result type (bool)
+ResolutionErrors3.dfy(227,11): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+ResolutionErrors3.dfy(229,13): Error: type of RHS of assign-such-that statement must be boolean (got int)
+ResolutionErrors3.dfy(232,15): Error: type of left argument to + (int) must agree with the result type (bool)
+ResolutionErrors3.dfy(232,15): Error: type of right argument to + (int) must agree with the result type (bool)
+ResolutionErrors3.dfy(232,15): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+ResolutionErrors3.dfy(248,29): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(250,17): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(275,20): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(285,24): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(298,18): Error: assignment to non-ghost field is not allowed in this context, because this is a ghost function
+ResolutionErrors3.dfy(299,10): Error: a hint is not allowed to make heap updates
+ResolutionErrors3.dfy(300,20): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(303,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
+ResolutionErrors3.dfy(322,24): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(329,18): Error: assignment to non-ghost field is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors3.dfy(330,10): Error: a hint is not allowed to make heap updates
+ResolutionErrors3.dfy(331,11): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(334,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
+ResolutionErrors3.dfy(360,29): Error: in a statement expression, calls are allowed only to lemmas
+ResolutionErrors3.dfy(372,16): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+ResolutionErrors3.dfy(391,12): Error: a 'break break break' statement is allowed only in contexts with 3 enclosing loops, but the current context only has 2
+ResolutionErrors3.dfy(403,20): Error: a ghost field is allowed only in specification contexts
+ResolutionErrors3.dfy(411,9): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors3.dfy(417,4): Error: non-ghost variable cannot be assigned a value that depends on a ghost
+ResolutionErrors3.dfy(434,8): Error: print statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)
+ResolutionErrors3.dfy(443,29): Error: ghost variables such as z are allowed only in specification contexts. z was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors3.dfy(451,10): Error: the type of the bound variable 't' could not be determined
+ResolutionErrors3.dfy(451,10): Error: the type of the bound variable 't' could not be determined
+ResolutionErrors3.dfy(451,10): Error: the type of the bound variable 't' could not be determined
+ResolutionErrors3.dfy(451,10): Error: the type of the bound variable 't' could not be determined
+ResolutionErrors3.dfy(468,15): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors3.dfy(470,10): Error: assignment to non-ghost field is not allowed in this context, because this is a ghost method
+ResolutionErrors3.dfy(493,15): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors3.dfy(495,25): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors3.dfy(496,35): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors3.dfy(505,4): Error: 'decreases *' is not allowed on ghost loops
+ResolutionErrors3.dfy(509,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors3.dfy(518,4): Error: 'decreases *' is not allowed on ghost loops
+ResolutionErrors3.dfy(522,29): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors3.dfy(531,21): Error: the type of the bound variable 'u' could not be determined
+ResolutionErrors3.dfy(532,23): Error: the type of the bound variable 'u' could not be determined
+ResolutionErrors3.dfy(535,27): Error: the type of the bound variable 'u' could not be determined
+ResolutionErrors3.dfy(539,40): Error: the type of the bound variable 'u' could not be determined
+ResolutionErrors3.dfy(541,38): Error: the type of the bound variable 'u' could not be determined
+ResolutionErrors3.dfy(555,26): Error: the type of this variable is underspecified
+ResolutionErrors3.dfy(555,21): Error: type of bound variable 's' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(556,31): Error: the type of this variable is underspecified
+ResolutionErrors3.dfy(556,21): Error: type of bound variable 's' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(567,30): Error: the type of this variable is underspecified
+ResolutionErrors3.dfy(567,21): Error: type of bound variable 'c' could not be determined; please specify the type explicitly
+86 resolution/type errors detected in ResolutionErrors3.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors3.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors3.dfy.refresh.expect
new file mode 100644
index 00000000000..353a3e7b0f5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors3.dfy.refresh.expect
@@ -0,0 +1,90 @@
+ResolutionErrors3.dfy(53,14): Error: type parameter 'PT' (inferred to be '?40') in the function call to 'P' could not be determined
+ResolutionErrors3.dfy(54,14): Error: the type of this variable is underspecified
+ResolutionErrors3.dfy(54,20): Error: type parameter 'QT' (inferred to be '?42') in the function call to 'Q' could not be determined
+ResolutionErrors3.dfy(54,20): Error: the type of this expression is underspecified
+ResolutionErrors3.dfy(55,4): Error: type parameter 'MT' (inferred to be '?44') to the method 'M' could not be determined
+ResolutionErrors3.dfy(56,8): Error: the type of this variable is underspecified
+ResolutionErrors3.dfy(56,13): Error: type parameter 'NT' (inferred to be '?45') to the method 'N' could not be determined
+ResolutionErrors3.dfy(57,8): Error: the type ('array?<?47>') of this variable is underspecified
+ResolutionErrors3.dfy(58,8): Error: the type ('C?<?49>') of this variable is underspecified
+ResolutionErrors3.dfy(59,8): Error: the type ('set<?51>') of this local variable is underspecified
+ResolutionErrors3.dfy(60,8): Error: the type ('array?<set<?53>>') of this variable is underspecified
+ResolutionErrors3.dfy(61,8): Error: the type of this local variable is underspecified
+ResolutionErrors3.dfy(75,8): Error: the type ('C<?99>') of this local variable is underspecified
+ResolutionErrors3.dfy(78,29): Error: type of bound variable 'c' could not be determined ('C?<?99>'); please specify the type explicitly
+ResolutionErrors3.dfy(89,21): Error: Type or type parameter is not declared in this scope: X (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors3.dfy(90,24): Error: Type or type parameter is not declared in this scope: X (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors3.dfy(127,16): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (y)
+ResolutionErrors3.dfy(144,18): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors3.dfy(174,15): Error: The name Inner ambiguously refers to a type in one of the modules A, B (try qualifying the type name with the module name)
+ResolutionErrors3.dfy(184,29): Error: ghost variables such as tmp are allowed only in specification contexts. tmp was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors3.dfy(186,49): Error: ghost variables such as a0 are allowed only in specification contexts. a0 was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors3.dfy(186,54): Error: ghost variables such as a1 are allowed only in specification contexts. a1 was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors3.dfy(195,33): Error: set argument type must support equality (got (int, int -> bool))
+ResolutionErrors3.dfy(207,11): Error: name of type (X) is used as a variable
+ResolutionErrors3.dfy(207,16): Error: name of type (X) is used as a variable
+ResolutionErrors3.dfy(208,11): Error: name of module (Y) is used as a variable
+ResolutionErrors3.dfy(208,16): Error: name of module (Y) is used as a variable
+ResolutionErrors3.dfy(209,11): Error: name of type (X) is used as a variable
+ResolutionErrors3.dfy(210,11): Error: name of module (Y) is used as a variable
+ResolutionErrors3.dfy(207,13): Error: arguments must have comparable types (got ?0 and ?1)
+ResolutionErrors3.dfy(208,13): Error: arguments must have comparable types (got ?3 and ?4)
+ResolutionErrors3.dfy(215,16): Error: name of type (X) is used as a variable
+ResolutionErrors3.dfy(216,16): Error: name of module (Y) is used as a variable
+ResolutionErrors3.dfy(217,4): Error: name of type (X) is used as a variable
+ResolutionErrors3.dfy(218,4): Error: name of module (Y) is used as a variable
+ResolutionErrors3.dfy(227,11): Error: type of left argument to + (int) must agree with the result type (bool)
+ResolutionErrors3.dfy(227,11): Error: type of right argument to + (int) must agree with the result type (bool)
+ResolutionErrors3.dfy(227,11): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+ResolutionErrors3.dfy(228,9): Error: type of RHS of assign-such-that statement must be boolean (got int)
+ResolutionErrors3.dfy(229,13): Error: type of RHS of assign-such-that statement must be boolean (got int)
+ResolutionErrors3.dfy(232,15): Error: type of left argument to + (int) must agree with the result type (bool)
+ResolutionErrors3.dfy(232,15): Error: type of right argument to + (int) must agree with the result type (bool)
+ResolutionErrors3.dfy(232,15): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+ResolutionErrors3.dfy(248,29): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(250,17): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(275,20): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(285,24): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(298,18): Error: assignment to non-ghost field is not allowed in this context, because this is a ghost function
+ResolutionErrors3.dfy(299,10): Error: a hint is not allowed to make heap updates
+ResolutionErrors3.dfy(300,20): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(303,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
+ResolutionErrors3.dfy(322,24): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(329,18): Error: assignment to non-ghost field is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors3.dfy(330,10): Error: a hint is not allowed to make heap updates
+ResolutionErrors3.dfy(331,11): Error: in a hint, calls are allowed only to lemmas
+ResolutionErrors3.dfy(334,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
+ResolutionErrors3.dfy(360,29): Error: in a statement expression, calls are allowed only to lemmas
+ResolutionErrors3.dfy(372,16): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
+ResolutionErrors3.dfy(391,12): Error: a 'break break break' statement is allowed only in contexts with 3 enclosing loops, but the current context only has 2
+ResolutionErrors3.dfy(403,20): Error: a ghost field is allowed only in specification contexts
+ResolutionErrors3.dfy(411,9): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors3.dfy(417,4): Error: non-ghost variable cannot be assigned a value that depends on a ghost
+ResolutionErrors3.dfy(434,8): Error: print statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)
+ResolutionErrors3.dfy(443,29): Error: ghost variables such as z are allowed only in specification contexts. z was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors3.dfy(451,10): Error: type of bound variable 't' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(451,10): Error: type of bound variable 't' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(451,10): Error: type of bound variable 't' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(451,10): Error: type of bound variable 't' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(451,10): Error: type of bound variable 't' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(451,10): Error: type of bound variable 't' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(468,15): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors3.dfy(470,10): Error: assignment to non-ghost field is not allowed in this context, because this is a ghost method
+ResolutionErrors3.dfy(493,15): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
+ResolutionErrors3.dfy(495,25): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors3.dfy(496,35): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors3.dfy(505,4): Error: 'decreases *' is not allowed on ghost loops
+ResolutionErrors3.dfy(509,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors3.dfy(518,4): Error: 'decreases *' is not allowed on ghost loops
+ResolutionErrors3.dfy(522,29): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+ResolutionErrors3.dfy(531,21): Error: type of bound variable 'u' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(532,23): Error: type of bound variable 'u' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(535,27): Error: type of bound variable 'u' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(539,40): Error: type of bound variable 'u' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(541,38): Error: type of bound variable 'u' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(541,38): Error: type of bound variable 'u' could not be determined; please specify the type explicitly
+ResolutionErrors3.dfy(555,40): Error: arguments must have comparable types (got set<?25> and set<?5>)
+ResolutionErrors3.dfy(556,45): Error: arguments must have comparable types (got set<?11> and set<?16>)
+ResolutionErrors3.dfy(567,30): Error: the type ('C?<?0>') of this variable is underspecified
+ResolutionErrors3.dfy(567,21): Error: type of bound variable 'c' could not be determined ('C?<?0>'); please specify the type explicitly
+89 resolution/type errors detected in ResolutionErrors3.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors4.dfy
new file mode 100644
index 00000000000..0bad62d5e36
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors4.dfy
@@ -0,0 +1,334 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+// ------------------- infer array types for Indexable and MultiIndexable XConstraints ----------
+// ------------------- using weaker subtyping constraints                              ----------
+
+module AdvancedIndexableInference {
+  datatype MyRecord = Make(x: int, y: int)
+
+  method M(d: array<MyRecord>, e: seq<MyRecord>)
+    requires d.Length == 100 == |e|
+  {
+    if * {
+      var c := d;
+      var xx := c[25].x;
+    } else if * {
+      var c := d;
+      var xx := c[25..50][10].x; // Unfortunately, this gives an error with the new resolver, because it doesn't see to get the element type of c[25..50]
+                                // The best way to improve this is to make name lookups be GuardedConstraints in the resolver, so this may change in the future.
+    } else if * {
+      var c := e;
+      var xx := c[25].x;
+    } else {
+      var c := e;
+      var xx := c[25..50][10].x;
+    }
+  }
+}
+// --------------------------
+
+module TypeConversions {
+  trait J { }
+  class C extends J { }
+
+  method M() returns (x: int, n: nat, o: object, j: J, c: C) {
+    n := x as nat;  // yes, this is allowed now
+    o := j;
+    j := o;  // OK for type resolution, but must be proved (new resolver: error, because it requires an explicit cast here)
+    j := o as J;  // yes, this is allowed now
+    j := c;
+    c := j;  // OK for type resolution, but must be proved (new resolver: error, because it requires an explicit cast here)
+    c := j as C;  // yes, this is allowed now
+    var oo := o as realint;  // error: there's no such type as "realint" (this once used to crash Dafny)
+  }
+}
+
+// --------------------- regression
+
+module Regression_NewType {
+  class C { }
+  newtype MyInt = x: int | {} == set c: C | c  // this once crashed Dafny
+}
+
+// --------------------- regression
+
+module PrefixGeneratorDuplicates {
+  greatest predicate P()
+  greatest predicate P()  // error: duplicate name (this once crashed Dafny)
+  greatest lemma L()
+  greatest lemma L()  // error: duplicate name (this once crashed Dafny)
+}
+
+// ------------------- unary TLA+ style predicates -------------------
+
+module TLAplusOperators {
+  ghost function BadA(y: int): int  // error: body has wrong return type
+  {
+    && 5 + y  // error: using operator "&&" requires the operand to be boolean
+  }
+
+  ghost function BadB(y: int): bool
+  {
+    && 5 + y  // error: using operator "&&" requires the operand to be boolean
+  }
+
+  ghost function BadC(y: int): int  // error: body has wrong return type
+  {
+    || 5 + y  // error: using operator "||" requires the operand to be boolean
+  }
+
+  ghost function BadD(y: int): bool
+  {
+    || 5 + y  // error: using operator "||" requires the operand to be boolean
+  }
+
+  ghost function BadE(y: int): int  // error: body has wrong return type
+  {
+    && (|| 5 + y)  // error: bad types
+  }
+}
+
+// ------------------------- divided constructors -------------------
+
+module DividedConstructors {
+  class MyClass {
+    var a: nat
+    var b: nat
+    var c: nat
+    var n: MyClass
+    const t := 17
+    static const g := 25
+
+    constructor Init(x: nat)
+    {
+      this.a := this.b;  // this use of "this" in RHS is allowed
+      ((this)).b := 10;
+      n := new MyClass();
+      n.a := 10;  // error: not allowed use of "this" in this way
+      c := a + b;  // error (x2): not allowed "this" in RHS
+      var th := this;  // error: not allowed "this" in RHS
+      Helper();  // error: not allowed to call instance method
+      var mc := new MyClass();
+      StaticHelper(mc);
+      this.StaticHelper(mc);  // error: "this" is benign here; yet, it seems consistent to disallow it
+      StaticHelper(this);  // error: cannot use "this" here
+      P(a);  // error: cannot use "this" here
+      P(g);
+      P(this.g);  // error: "this" is benign here; yet, it seems consistent to disallow it
+      modify this;  // error: cannot use "this" here
+      modify this`c;  // error: cannot use "this" here
+      modify `c;  // error: cannot use (implicit) "this" here
+      new;
+      a := a + b;
+      Helper();
+    }
+
+    method Helper()
+    {
+    }
+
+    static method StaticHelper(mc: MyClass)
+    {
+    }
+
+    static method P(x: nat)
+    {
+    }
+
+    constructor ()
+    {
+      a, c := 0, 0;
+      new;
+    }
+  }
+}
+
+module ConstructorsThisUsage {
+  class C {
+    var x: int
+
+    constructor M()
+      requires this != null  // error: cannot use "this" here
+      modifies this  // error: cannot use "this" here (but we just issue a deprecation warning)
+      decreases this.x  // error: cannot use "this" here
+      ensures this.x == 5
+    {
+      x := 5;
+    }
+  }
+}
+
+module ReturnBeforeNew {
+  class C {
+    var a: int
+    var b: int
+
+    constructor TriesToReturnBeforeNew(xyz: int)
+    {
+      a := 0;
+      if xyz < 100 {
+        return;  // error: "return" is not allowed before "new;"
+      }
+    }
+  }
+}
+
+// ---------------- required auto-initialization -----------------------
+
+module ZI {
+  // the following are different syntactic ways of saying that the type
+  // must support auto-initialization
+  type ZA(0)
+  type ZB(==)(0)
+  type ZC(0)(==)
+  type ZD(==,0)
+  type ZE(0,==)
+  type Y
+
+  method P<G(0)>(x: G)
+
+  method M0<F,G(0)>(a: ZA, b: ZB, c: ZC, d: ZD, e: ZE, f: F, g: G, y: Y)
+  {
+    P(a);
+    P(b);
+    P(c);
+    P(d);
+    P(e);
+    P(f);  // error: type of argument is expected to support auto-initialization
+    P(g);
+    P(y);  // error: type of argument is expected to support auto-initialization
+  }
+
+  datatype List<T> = Nil | Cons(T, List<T>)
+
+  method M1<G,H(0)>(xs: List<G>, ys: List<H>) {
+    P(xs);  // yay, type of argument does support auto-initialization
+    P(ys);  // yay, type of argument does support auto-initialization
+  }
+
+  class Cls {
+    var q: int
+    var rs: List<List<Cls>>
+  }
+  method M2(c: Cls?) {
+    P(c);
+  }
+
+  newtype byte = x: int | 0 <= x < 256  // supports auto-initialization
+  newtype MyInt = int  // supports auto-initialization
+  newtype SixOrMore = x | 6 <= x ghost witness 6
+  newtype AnotherSixOrMore = s: SixOrMore | true ghost witness 6
+  newtype MySixOrMore = x: MyInt | 6 <= x ghost witness 6
+  // The resolver uses the presence/absence of a "witness" clause to figure out if the type
+  // supports auto-initialization.  This can be inaccurate.  If the type does not have a
+  // "witness" clause, some type replacements may slip by the resolver, but will then be
+  // caught by the verifier when the witness test is performed (because the witness test
+  // uses a zero value in the absence of a "witness" clause).
+  // A "ghost witness" clause tells the resolver that the type does not support
+  // auto-initialization, but only ghost auto-initialzation.
+
+  newtype UnclearA = x: int | true ghost witness 0  // actually supports auto-initialization, but has a "ghost witness" clause
+  newtype UnclearB = x | x == 6 && x < 4  // "witness" clause omitted; type does not actually support auto-initialization
+
+  method M3(a: byte, b: MyInt, c: SixOrMore, d: AnotherSixOrMore, e: MySixOrMore,
+            ua: UnclearA, ub: UnclearB) {
+    P(a);
+    P(b);
+    P(c);  // error: type of argument is expected to support auto-initialization
+    P(d);  // error: type of argument is expected to support auto-initialization
+    P(e);  // error: type of argument is expected to support auto-initialization
+    P(ua);  // error: as far as the resolver can tell, type of argument does not support auto-initialization
+    P(ub);  // fine, as far as the resolver can tell (but this would be caught later by the verifier)
+  }
+
+  type Sbyte = x: int | 0 <= x < 256  // supports auto-initialization
+  type SMyInt = int  // supports auto-initialization
+  type SSixOrMore = x | 6 <= x ghost witness 6
+  type SAnotherSixOrMore = s: SSixOrMore | true ghost witness 6
+  type SMySixOrMore = x: SMyInt | 6 <= x ghost witness 6
+  type SUnclearA = x: int | true ghost witness 0  // see note about for UnclearA
+  type SUnclearB = x | 6 <= x  // see note about for UnclearB
+
+  method M4(a: Sbyte, b: SMyInt, c: SSixOrMore, d: SAnotherSixOrMore, e: SMySixOrMore,
+            sua: SUnclearA, sub: SUnclearB) {
+    P<Sbyte>(a);
+    P<SMyInt>(b);
+    P<SSixOrMore>(c);  // error: type of argument is expected to support auto-initialization
+    P<SAnotherSixOrMore>(d);  // error: type of argument is expected to support auto-initialization
+    P<SMySixOrMore>(e);  // error: type of argument is expected to support auto-initialization
+    P<SUnclearA>(sua);  // error: as far as the resolver can tell, type of argument does not support auto-initialization
+    P<SUnclearB>(sub);  // fine, as far as the resolver can tell (but this would be caught later by the verifier)
+  }
+}
+
+abstract module ZI_RefinementAbstract {
+  type A0
+  type A1
+  type A2
+  type A3
+  type B0(0)
+  type B1(0)
+  type B2(0)
+  type B3(0)
+  type C0(00)
+  type C1(00)
+  type C2(00)
+  type C3(00)
+
+  method Delta<Q(0),W,E(0),R>()
+}
+
+module ZI_RefinementConcrete0 refines ZI_RefinementAbstract {
+  newtype Kuusi = x | 6 <= x witness 6  // supports auto-initialization
+  newtype Six = x | 6 <= x ghost witness 6  // does not support auto-initialization
+  newtype Sesis = x | 6 <= x witness *  // possibly empty
+  type A0 = int
+  type A1 = Kuusi
+  type A2 = Six
+  type A3 = Sesis
+  type B0 = int
+  type B1 = Kuusi
+  type B2 = Six  // error: RHS is expected to support auto-initialization
+  type B3 = Sesis  // error: RHS is expected to support auto-initialization
+  type C0 = int
+  type C1 = Kuusi
+  type C2 = Six
+  type C3 = Sesis  // error: RHS is expected to be nonempty
+}
+
+module ZI_ExportSource {
+  export
+    reveals RGB
+    provides XYZ
+  datatype RGB = Red | Green | Blue
+  datatype XYZ = X | Y | Z
+}
+
+module ZI_RefinementConcrete1 refines ZI_RefinementAbstract {
+  import Z = ZI_ExportSource
+
+  method P<G(0)>(g: G)
+  method M(m: Z.RGB, n: Z.XYZ) {
+    P(m);
+    P(n);  // error: Z.XYZ is not known to support auto-initialization
+  }
+
+  method Delta<
+    Q,  // error: not allowed to change auto-initialization setting
+    W,
+    E(0),
+    R(0)>()  // error: not allowed to change auto-initialization setting
+}
+
+module ZI_RefinementConcrete2 refines ZI_RefinementAbstract {
+  type A0
+  type A1(0)
+  type A2(00)
+  type B0      // error (with hint): not allowed to change auto-initialization setting from (0) to nothing
+  type B1(0)
+  type B2(00)  // error (with hint): not allowed to change auto-initialization setting from (0) to (00)
+  type C0      // error (with hint): not allowed to change nonempty setting from (00) to nothing
+  type C1(0)
+  type C2(00)
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors4.dfy.expect
new file mode 100644
index 00000000000..6bb568c272f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors4.dfy.expect
@@ -0,0 +1,48 @@
+ResolutionErrors4.dfy(153,15): Warning: constructors no longer need 'this' to be listed in modifies clauses
+ResolutionErrors4.dfy(43,19): Error: Type or type parameter is not declared in this scope: realint (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors4.dfy(51,44): Error: range of comprehension must be of type bool (instead got C)
+ResolutionErrors4.dfy(58,21): Error: Duplicate member name: P
+ResolutionErrors4.dfy(60,17): Error: Duplicate member name: L
+ResolutionErrors4.dfy(68,4): Error: second argument to && must be of type bool (instead got int)
+ResolutionErrors4.dfy(66,17): Error: Function body type mismatch (expected int, got bool)
+ResolutionErrors4.dfy(73,4): Error: second argument to && must be of type bool (instead got int)
+ResolutionErrors4.dfy(78,4): Error: second argument to || must be of type bool (instead got int)
+ResolutionErrors4.dfy(76,17): Error: Function body type mismatch (expected int, got bool)
+ResolutionErrors4.dfy(83,4): Error: second argument to || must be of type bool (instead got int)
+ResolutionErrors4.dfy(88,8): Error: second argument to || must be of type bool (instead got int)
+ResolutionErrors4.dfy(86,17): Error: Function body type mismatch (expected int, got bool)
+ResolutionErrors4.dfy(108,6): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(109,11): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(109,15): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(110,16): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(111,6): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(114,6): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(115,19): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(116,8): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(118,8): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(119,13): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(120,13): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(121,14): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(152,15): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors4.dfy(154,16): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors4.dfy(171,8): Error: return statement is not allowed before 'new;' in a constructor
+ResolutionErrors4.dfy(198,5): Error: type parameter (G) passed to method P must support auto-initialization (got F) (perhaps try declaring type parameter 'F' on line 191 as 'F(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors4.dfy(200,5): Error: type parameter (G) passed to method P must support auto-initialization (got Y) (perhaps try declaring abstract type 'Y' on line 187 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors4.dfy(238,5): Error: type parameter (G) passed to method P must support auto-initialization (got SixOrMore)
+ResolutionErrors4.dfy(239,5): Error: type parameter (G) passed to method P must support auto-initialization (got AnotherSixOrMore)
+ResolutionErrors4.dfy(240,5): Error: type parameter (G) passed to method P must support auto-initialization (got MySixOrMore)
+ResolutionErrors4.dfy(241,5): Error: type parameter (G) passed to method P must support auto-initialization (got UnclearA)
+ResolutionErrors4.dfy(257,17): Error: type parameter (G) passed to method P must support auto-initialization (got SSixOrMore)
+ResolutionErrors4.dfy(258,24): Error: type parameter (G) passed to method P must support auto-initialization (got SAnotherSixOrMore)
+ResolutionErrors4.dfy(259,19): Error: type parameter (G) passed to method P must support auto-initialization (got SMySixOrMore)
+ResolutionErrors4.dfy(260,16): Error: type parameter (G) passed to method P must support auto-initialization (got SUnclearA)
+ResolutionErrors4.dfy(292,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.B2' declared with (0), type synonym 'ZI_RefinementConcrete0.B2' must support auto-initialization
+ResolutionErrors4.dfy(293,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.B3' declared with (0), type synonym 'ZI_RefinementConcrete0.B3' must support auto-initialization
+ResolutionErrors4.dfy(297,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.C3' declared with (00), type synonym 'ZI_RefinementConcrete0.C3' must be nonempty
+ResolutionErrors4.dfy(318,4): Error: type parameter 'Q' is not allowed to change the requirement of supporting auto-initialization
+ResolutionErrors4.dfy(321,4): Error: type parameter 'R' is not allowed to change the requirement of supporting auto-initialization
+ResolutionErrors4.dfy(314,5): Error: type parameter (G) passed to method P must support auto-initialization (got Z.XYZ)
+ResolutionErrors4.dfy(328,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.B0' declared with (0), abstract type 'ZI_RefinementConcrete2.B0' must support auto-initialization (perhaps try declaring abstract type 'B0' on line 328 as 'B0(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors4.dfy(330,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.B2' declared with (0), abstract type 'ZI_RefinementConcrete2.B2' must support auto-initialization (perhaps try declaring abstract type 'B2' on line 330 as 'B2(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors4.dfy(331,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.C0' declared with (00), abstract type 'ZI_RefinementConcrete2.C0' must be nonempty (perhaps try declaring abstract type 'C0' on line 331 as 'C0(00)', which says it can only be instantiated with a nonempty type)
+46 resolution/type errors detected in ResolutionErrors4.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors4.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors4.dfy.refresh.expect
new file mode 100644
index 00000000000..1a4bdfb913f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors4.dfy.refresh.expect
@@ -0,0 +1,53 @@
+ResolutionErrors4.dfy(153,15): Warning: constructors no longer need 'this' to be listed in modifies clauses
+ResolutionErrors4.dfy(18,30): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors4.dfy(43,19): Error: Type or type parameter is not declared in this scope: realint (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+ResolutionErrors4.dfy(38,6): Error: RHS (of type object) not assignable to LHS (of type J)
+ResolutionErrors4.dfy(41,6): Error: RHS (of type J) not assignable to LHS (of type C)
+ResolutionErrors4.dfy(51,44): Error: range of comprehension must be of type bool (instead got C)
+ResolutionErrors4.dfy(58,21): Error: Duplicate member name: P
+ResolutionErrors4.dfy(60,17): Error: Duplicate member name: L
+ResolutionErrors4.dfy(68,4): Error: boolean literal used as if it had type int
+ResolutionErrors4.dfy(68,4): Error: type of && must be a boolean (got int)
+ResolutionErrors4.dfy(73,4): Error: type of right argument to && (int) must agree with the result type (bool)
+ResolutionErrors4.dfy(78,4): Error: boolean literal used as if it had type int
+ResolutionErrors4.dfy(78,4): Error: type of || must be a boolean (got int)
+ResolutionErrors4.dfy(83,4): Error: type of right argument to || (int) must agree with the result type (bool)
+ResolutionErrors4.dfy(88,4): Error: boolean literal used as if it had type int
+ResolutionErrors4.dfy(88,8): Error: boolean literal used as if it had type int
+ResolutionErrors4.dfy(88,8): Error: type of || must be a boolean (got int)
+ResolutionErrors4.dfy(88,4): Error: type of && must be a boolean (got int)
+ResolutionErrors4.dfy(108,6): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(109,11): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(109,15): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(110,16): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(111,6): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(114,6): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(115,19): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(116,8): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(118,8): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(119,13): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(120,13): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(121,14): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
+ResolutionErrors4.dfy(152,15): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors4.dfy(154,16): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors4.dfy(171,8): Error: return statement is not allowed before 'new;' in a constructor
+ResolutionErrors4.dfy(198,5): Error: type parameter (G) passed to method P must support auto-initialization (got F) (perhaps try declaring type parameter 'F' on line 191 as 'F(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors4.dfy(200,5): Error: type parameter (G) passed to method P must support auto-initialization (got Y) (perhaps try declaring abstract type 'Y' on line 187 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors4.dfy(238,5): Error: type parameter (G) passed to method P must support auto-initialization (got SixOrMore)
+ResolutionErrors4.dfy(239,5): Error: type parameter (G) passed to method P must support auto-initialization (got AnotherSixOrMore)
+ResolutionErrors4.dfy(240,5): Error: type parameter (G) passed to method P must support auto-initialization (got MySixOrMore)
+ResolutionErrors4.dfy(241,5): Error: type parameter (G) passed to method P must support auto-initialization (got UnclearA)
+ResolutionErrors4.dfy(257,17): Error: type parameter (G) passed to method P must support auto-initialization (got SSixOrMore)
+ResolutionErrors4.dfy(258,24): Error: type parameter (G) passed to method P must support auto-initialization (got SAnotherSixOrMore)
+ResolutionErrors4.dfy(259,19): Error: type parameter (G) passed to method P must support auto-initialization (got SMySixOrMore)
+ResolutionErrors4.dfy(260,16): Error: type parameter (G) passed to method P must support auto-initialization (got SUnclearA)
+ResolutionErrors4.dfy(292,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.B2' declared with (0), type synonym 'ZI_RefinementConcrete0.B2' must support auto-initialization
+ResolutionErrors4.dfy(293,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.B3' declared with (0), type synonym 'ZI_RefinementConcrete0.B3' must support auto-initialization
+ResolutionErrors4.dfy(297,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.C3' declared with (00), type synonym 'ZI_RefinementConcrete0.C3' must be nonempty
+ResolutionErrors4.dfy(318,4): Error: type parameter 'Q' is not allowed to change the requirement of supporting auto-initialization
+ResolutionErrors4.dfy(321,4): Error: type parameter 'R' is not allowed to change the requirement of supporting auto-initialization
+ResolutionErrors4.dfy(314,5): Error: type parameter (G) passed to method P must support auto-initialization (got XYZ)
+ResolutionErrors4.dfy(328,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.B0' declared with (0), abstract type 'ZI_RefinementConcrete2.B0' must support auto-initialization (perhaps try declaring abstract type 'B0' on line 328 as 'B0(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors4.dfy(330,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.B2' declared with (0), abstract type 'ZI_RefinementConcrete2.B2' must support auto-initialization (perhaps try declaring abstract type 'B2' on line 330 as 'B2(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors4.dfy(331,7): Error: to be a refinement of abstract type 'ZI_RefinementAbstract.C0' declared with (00), abstract type 'ZI_RefinementConcrete2.C0' must be nonempty (perhaps try declaring abstract type 'C0' on line 331 as 'C0(00)', which says it can only be instantiated with a nonempty type)
+51 resolution/type errors detected in ResolutionErrors4.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors5.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors5.dfy
new file mode 100644
index 00000000000..759ea2d29d4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors5.dfy
@@ -0,0 +1,640 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --allow-axioms
+
+
+// ----- constructor-less classes with need for initialization -----
+
+module ConstructorlessClasses {
+  class C<T(==)> {  // error: must have constructor
+    var x: int
+    var s: string
+    var t: set<T>
+    var u: T
+    const c: T
+  }
+
+  method Test()
+  {
+    var c := new C<set<real>>;
+    print "int: ", c.x, "\n";
+    print "string: ", c.s, "\n";
+    print "set<set<real>>: ", c.t, "\n";
+    print "real: ", c.u, "\n";
+    print "real: ", c.c, "\n";
+  }
+
+  codatatype Co<X> = Suc(Co<seq<X>>)  // does not know a known compilable value
+  codatatype Co2 = CoEnd | CoSuc(Co2)
+
+  trait Trait {
+    var co: Co<int>  // has no known initializer
+  }
+
+  class Class extends Trait {  // error: must have constructor, because of inherited field "co"
+  }
+
+  class CoClass0 {  // error: must have constructor
+    const co: Co<int>
+  }
+
+  class CoClass1 {  // fine
+    const co: Co2 := CoEnd
+  }
+
+  trait CoTrait {
+    const co: Co2 := CoEnd
+  }
+
+  class CoClass2 extends CoTrait {  // fine
+  }
+
+  iterator Iter<T>(u: T) yields (v: T)
+  {
+  }
+}
+
+module GhostWitness {
+  type BadGhost_EffectlessArrow<A,B> = f: A -> B
+    | true
+    witness (GhostEffectlessArrowWitness<A,B>)  // error: a ghost witness must use the keyword "ghost"
+
+  type GoodGhost_EffectlessArrow<A,B> = f: A -> B
+    | true
+    ghost witness (GhostEffectlessArrowWitness<A,B>)
+
+  ghost function GhostEffectlessArrowWitness<A,B>(a: A): B
+  {
+    var b: B :| true; b
+  }
+}
+
+module BigOrdinalRestrictions {  // also see BigOrdinalRestrictionsExtremePred below
+  method Test() {
+    var st: set<ORDINAL>;  // error: cannot use ORDINAL as type argument
+    var p: (int, ORDINAL);  // error: cannot use ORDINAL as type argument
+    var o: ORDINAL;  // okay
+    ghost var f := F(o);  // error: cannot use ORDINAL as type argument
+    f := F'<ORDINAL>();  // error: cannot use ORDINAL as type argument
+    f := F'<(char,ORDINAL)>();  // error: cannot use ORDINAL as type argument
+    var lambda := F'<ORDINAL>;  // error: cannot use ORDINAL as type argument
+    ParameterizedMethod(o);  // error: cannot use ORDINAL as type argument
+    assert forall r: ORDINAL :: P(r);
+    assert forall r: (ORDINAL, int) :: F(r.1) < 8;
+    assert exists x: int, r: ORDINAL, y: char :: P(r) && F(x) == F(y);
+    var s := set r: ORDINAL | r in {};  // error: cannot use ORDINAL as type argument (to set)
+    var s' := set r: ORDINAL | true :: 'G';
+    ghost var m := imap r: ORDINAL :: 10;
+    var sq := [o, o];  // error: cannot use ORDINAL as type argument (to seq)
+    var mp0 := map[o := 'G'];  // error: cannot use ORDINAL as type argument (to map)
+    var mp1 := map['G' := o];  // error: cannot use ORDINAL as type argument (to map)
+    var w := var h: ORDINAL := 100; h + 40;  // okay
+    var w': (int, ORDINAL);  // error: cannot use ORDINAL as type argument
+    var u: ORDINAL :| u == 15;
+    var ti: ORDINAL :| assume true;
+    var u': (ORDINAL, int) :| u' == (15, 15);  // error (x2): ORDINAL cannot be a type argument
+    var ti': (ORDINAL, ORDINAL) :| assume true;  // error (x4): ORDINAL cannot be a type argument
+    var lstLocal := var lst: ORDINAL :| lst == 15; lst;
+    var lstLocal' := var lst: (ORDINAL, int) :| lst == (15, 15); lst.1;  // error: ORDINAL cannot be a type argument
+
+    if yt: ORDINAL :| yt == 16 {
+      ghost var pg := P(yt);
+    }
+
+    if {
+      case zt: ORDINAL :| zt == 180 =>
+        ghost var pg := P(zt);
+    }
+
+    forall om: ORDINAL  // allowed
+      ensures om < om+1
+    {
+    }
+
+    var arr := new int[23];
+    forall om: ORDINAL | om == 11  // allowed
+    {
+      arr[0] := 0;
+    }
+  }
+
+  ghost function F<G>(g: G): int
+  ghost function F'<G>(): int
+  method ParameterizedMethod<G>(g: G)
+  ghost predicate P(g: ORDINAL)
+}
+
+module IteratorDuplicateParameterNames {
+  // each of the following once caused a crash in the resolver
+  iterator MyIterX(u: char) yields (u: char)  // error: duplicate name "u"
+  iterator MyIterY(us: char) yields (u: char)  // error: in-effect-duplicate name "us"
+}
+
+module TernaryTypeCheckinngAndInference {
+  codatatype Stream = Cons(int, Stream)
+
+  method M(k: nat, K: ORDINAL, A: Stream, B: Stream)
+    requires A == B
+  {
+    // all of the following are fine
+    assert A ==#[k] B;
+    assert A ==#[K] B;
+    assert A ==#[3] B;
+    var b;
+    assert A ==#[b] B;
+  }
+}
+
+module DontQualifyWithNonNullTypeWhenYouMeanAClass {
+  module Z {
+    class MyClass {
+      static const g := 100
+    }
+
+    method M0() {
+      var x := MyClass?.g;  // error: use MyClass, not MyClass?
+      assert x == 100;
+    }
+
+    method M1() {
+      var x := MyClass.g;  // that's it!
+      assert x == 100;
+    }
+
+    method P(from: MyClass) returns (to: MyClass?) {
+      to := from;
+    }
+
+    method Q() {
+      var x := MyClass;  // error: type used as variable
+      var y := MyClass?;  // error: type used as variable
+    }
+  }
+
+  module A {
+    class MyClass {
+      static const g := 100
+    }
+  }
+
+  module B {
+    import A
+
+    method M0() {
+      var x := A.MyClass?.g;  // error: use MyClass, not MyClass?
+      assert x == 100;
+    }
+
+    method M1() {
+      var x := A.MyClass.g;  // that's it!
+      assert x == 100;
+    }
+
+    method P(from: A.MyClass) returns (to: A.MyClass?) {
+      to := from;
+    }
+
+    method Q() {
+      var x := A.MyClass;  // error: type used as variable
+      var y := A.MyClass?;  // error: type used as variable
+    }
+  }
+}
+
+module UninterpretedModuleLevelConst {
+  type Six = x | 6 <= x witness 6
+  type Odd = x | x % 2 == 1 ghost witness 7
+  const S: Six  // fine
+  const X: Odd  // error: the type of a non-ghost static const must have a known initializer
+
+  class MyClass { }
+  const Y: MyClass  // error: the type of a non-ghost static const must have a known (non-ghost) initializer
+  ghost const Y': MyClass  // error: the type of a ghost static const must be known to be nonempty
+
+  class AnotherClass {  // fine, the class itself is not required to have a constructor, because the bad fields are static
+    static const k := 18
+    static const W: MyClass  // error: the type of a non-ghost static const must have a known (non-ghost) initializer
+    static const U: Six  // fine, since Six has a non-ghost witness and thus has a known initializer
+    static const O: Odd  // error: the type of a non-ghost static const must have a known initializer
+    const u: Six
+  }
+
+  trait Trait {
+    static const k := 18
+    static const W: MyClass  // error: the type of a non-ghost static const must have a known (non-ghost) initializer
+    static const U: Six  // fine, since Six has a non-ghost witness and thus has a known initializer
+    static const O: Odd  // error: the type of a non-ghost static const must have a known initializer
+  }
+
+  class ClassyTrait extends Trait {  // fine, since the bad fields in Trait are static
+  }
+
+  trait InstanceConst {
+    const w: MyClass
+  }
+
+  class Instance extends InstanceConst {  // error: because of "w", must declare a constructor
+  }
+
+  trait GhostTr {
+    ghost const w: MyClass  // the responsibility to initialize "w" lies with any class that implements "GhostTr"
+  }
+
+  class GhostCl extends GhostTr {  // error: w and z need initialization, so GhostCl must have a constructor
+    ghost const z: MyClass
+  }
+}
+
+module NonThisConstAssignments {
+  const X: int
+
+  class Cla {
+    constructor () {
+      X := 15;  // error: can never assign to static const (this used to crash)
+      Clb.Y := 15;  // error: can never assign to static const (this used to crash)
+    }
+  }
+
+  class Clb {
+    static const Y: int
+
+    constructor () {
+      Y := 15;  // error: cannot ever assign to a static const (this used to crash)
+    }
+  }
+
+  class Clc {
+    const Z: int
+
+    constructor (c: Clc) {
+      c.Z := 15;  // error: can assign to const only for 'this' (this used to crash)
+    }
+  }
+
+  class Cld {
+    const Z: int
+
+    constructor () {
+      Z := 15;
+    }
+  }
+}
+
+module ConstGhostRhs {
+  class S {
+    const m: int := n  // error: use of ghost to assign non-ghost field
+    ghost const n: int
+  }
+
+  const a: int := b  // error: use of ghost to assign non-ghost field
+  ghost const b: int
+
+  class S' {
+    ghost const m': int := n'
+    const n': int
+  }
+
+  ghost const a': int := b'
+  const b': int
+
+}
+
+module Regression15 {
+  predicate F(i: int, j: int) { true }
+  function S(i: int): set<int> { {i} }
+
+  method M0() returns (b: bool) {
+    b := forall i, j | j <= i <= 100 && i <= j < 100 :: true;  // error: this bogus cyclic dependency was once allowed
+  }
+
+  method M4() returns (b: bool) {
+    b := forall i, j :: j <= i < 100 && j in S(i) ==> F(i,j);  // error: this bogus cyclic dependency was once allowed
+  }
+}
+
+module AllocDepend0a {
+  class Class {
+    const z := if {} == set c: Class | true then 5 else 4  // error: condition depends on alloc (also not compilable, but that's not reported in the same pass)
+  }
+
+  const y := if {} == set c: Class | true then 5 else 4  // error: condition depends on alloc (also not compilable, but that's not reported in the same pass)
+
+  newtype byte = x | x < 5 || {} == set c: Class | true  // error: condition not allowed to depend on alloc
+  type small = x | x < 5 || {} == set c: Class | true  // error: condition not allowed to depend on alloc
+}
+
+module AllocDepend0b {
+  class Class { }
+
+  method M() returns (y: int, z: int) {
+    z := if {} == set c: Class | true then 5 else 4; // error: not compilable
+    y := if {} == set c: Class | true then 5 else 4; // error: not compilable
+  }
+}
+
+module AllocDepend1 {
+  class Class { }
+
+  predicate P(x: int) {
+    x < 5 || {} == set c: Class | true  // error: function not allowed to depend on alloc
+  }
+}
+
+module AllocDepend2 {
+  class Klass {
+    const z := if exists k: Klass :: allocated(k) then 3 else 4  // error (x2): condition depends on alloc
+  }
+
+  const y := if exists k: Klass :: allocated(k) then 3 else 4  // error (x2): condition depends on alloc
+
+  newtype byte = x | x < 5 || exists k: Klass :: allocated(k)  // error: condition not allowed to depend on alloc
+  type small = x | x < 5 || exists k: Klass :: allocated(k)  // error: condition not allowed to depend on alloc
+}
+
+module AllocDepend3 {
+  class Klass { }
+
+  predicate P(x: int) {
+    x < 5 || exists k: Klass :: allocated(k)  // error: function not allowed to depend on alloc
+  }
+}
+
+module AllocDepend4 {
+  class Xlass {
+    const z := if var k: Xlass? := null; allocated(k) then 3 else 4  // error (x2): condition depends on alloc
+  }
+
+  const y := if var k: Xlass? := null; allocated(k) then 3 else 4  // error (x2): condition depends on alloc
+
+  newtype byte = x | x < 5 || var k: Xlass? := null; allocated(k)  // error: condition not allowed to depend on alloc
+  type small = x | x < 5 || var k: Xlass? := null; allocated(k)  // error: condition not allowed to depend on alloc
+}
+
+module AllocDepend5 {
+  class Xlass { }
+
+  predicate P(x: int) {
+    x < 5 || var k: Xlass? := null; allocated(k)  // error: function not allowed to depend on alloc
+  }
+}
+
+module AbstemiousCompliance {
+  codatatype EnormousTree<X> = Node(left: EnormousTree, val: X, right: EnormousTree)
+
+  ghost function {:abstemious} Five(): int {
+    5  // error: an abstemious function must return with a co-constructor
+  }
+
+  ghost function {:abstemious} Id(t: EnormousTree): EnormousTree
+  {
+    t  // to be abstemious, a parameter is as good as a co-constructor
+  }
+
+  ghost function {:abstemious} IdGood(t: EnormousTree): EnormousTree
+  {
+    match t
+    case Node(l, x, r) => Node(l, x, r)
+  }
+
+  ghost function {:abstemious} AlsoGood(t: EnormousTree): EnormousTree
+  {
+    Node(t.left, t.val, t.right)
+  }
+
+  ghost function {:abstemious} UniformTree<X>(x: X): EnormousTree<X>
+  {
+    Node(UniformTree(x), x, UniformTree(x))
+  }
+
+  ghost function {:abstemious} AlternatingTree<X>(x: X, y: X): EnormousTree<X>
+  {
+    Node(AlternatingTree(y, x), x, AlternatingTree(y, x))
+  }
+
+  ghost function {:abstemious} AnotherAlternatingTree<X>(x: X, y: X): EnormousTree<X>
+  {
+    var t := Node(AlternatingTree(x, y), y, AlternatingTree(x, y));
+    Node(t, x, t)
+  }
+
+  ghost function {:abstemious} NonObvious<X>(x: X): EnormousTree<X>
+  {
+    AlternatingTree(x, x)  // error: does not return with a co-constructor
+  }
+
+  ghost function {:abstemious} BadDestruct(t: EnormousTree): EnormousTree
+  {
+    Node(t.left, t.val, t.right.right)  // error: cannot destruct t.right
+  }
+
+  ghost function {:abstemious} BadMatch(t: EnormousTree): EnormousTree
+  {
+    match t.right  // error: cannot destruct t.right
+    case Node(a, x, b) =>
+      Node(a, x, b)
+  }
+
+  ghost function {:abstemious} BadEquality(t: EnormousTree, u: EnormousTree, v: EnormousTree): EnormousTree
+  {
+    if t == u then  // error: cannot co-compare
+      Node(t.left, t.val, t.right)
+    else if u != v then  // error: cannot co-compare
+      Node(u.left, u.val, u.right)
+    else
+      Node(v.left, v.val, v.right)
+  }
+
+  ghost function {:abstemious} Select(b: bool, t: EnormousTree, u: EnormousTree): EnormousTree
+  {
+    if b then t else u  // abstemious yes: parameters are as good as a co-constructors
+  }
+
+  ghost function {:abstemious} Select'(b: bool, t: EnormousTree, u: EnormousTree): EnormousTree
+  {
+    if b then
+      Node(t.left, t.val, t.right)  // fine, too
+    else
+      Node(u.left, u.val, u.right)  // fine, too
+  }
+}
+
+module BigOrdinalRestrictionsExtremePred {
+  least predicate Test() {
+    var st: set<ORDINAL> := {};  // error: cannot use ORDINAL as type argument
+    var p: (int, ORDINAL) := (0,0);  // error: cannot use ORDINAL as type argument
+    var o: ORDINAL := 0;  // okay
+    ghost var f := F(o);  // error: cannot use ORDINAL as type argument
+    var f := F'<ORDINAL>();  // error: cannot use ORDINAL as type argument
+    var f := F'<(char,ORDINAL)>();  // error: cannot use ORDINAL as type argument
+    var lambda := F'<ORDINAL>;  // error: cannot use ORDINAL as type argument
+    ParameterizedLemma(o);  // error: cannot use ORDINAL as type argument
+    assert forall r: ORDINAL :: P(r);  // error: cannot quantify over ORDINAL here
+    assert forall r: (ORDINAL, int) :: F(r.1) < 8;  // error: cannot quantify over ORDINAL here
+    assert exists x: int, r: ORDINAL, y: char :: P(r) && F(x) == F(y);  // error: cannot quantify over ORDINAL here
+    var s := set r: ORDINAL | r in {};  // error (x2): cannot use ORDINAL as type argument (to set)
+    var s' := set r: ORDINAL | true :: 'G';  // error: cannot use ORDINAL here
+    ghost var m := imap r: ORDINAL :: 10;  // error (x2): cannot use ORDINAL here
+    var sq := [o, o];  // error: cannot use ORDINAL as type argument (to seq)
+    var mp0 := map[o := 'G'];  // error: cannot use ORDINAL as type argument (to map)
+    var mp1 := map['G' := o];  // error: cannot use ORDINAL as type argument (to map)
+    var w := var h: ORDINAL := 100; h + 40;  // okay
+    var w': (int, ORDINAL) := (8,8);  // error: cannot use ORDINAL as type argument
+    var u: ORDINAL :| u == 15;
+    var ti: ORDINAL :| true;
+    var u': (ORDINAL, int) :| u' == (15, 15);  // error (x2): ORDINAL cannot be a type argument
+    var ti': (ORDINAL, ORDINAL) :| true;  // error (x2): ORDINAL cannot be a type argument
+    var lstLocal := var lst: ORDINAL :| lst == 15; lst;
+    var lstLocal' := var lst: (ORDINAL, int) :| lst == (15, 15); lst.1;  // error: ORDINAL cannot be a type argument
+
+    var gr := if yt: ORDINAL :| yt == 16 then
+      ghost var pg := P(yt); 5
+    else
+      7;
+
+    calc {
+      100;
+    ==  {
+          forall om: ORDINAL  // allowed
+            ensures om < om+1
+          {
+          }
+        }
+      100;
+    }
+
+    true
+  }
+
+  ghost function F<G>(g: G): int
+  ghost function F'<G>(): int
+  lemma ParameterizedLemma<G>(g: G)
+  ghost predicate P(g: ORDINAL)
+}
+
+// ----- label domination -----
+
+module LabelDomination {
+  method DuplicateLabels(n: int) {
+    var x;
+    if (n < 7) {
+      label L: x := x + 1;
+    } else {
+      label L: x := x + 1;
+    }
+    assert old@L(true);  // error: L is not available here
+    label L: x := x + 1;
+    assert old@L(true);
+    label L: x := x + 1;  // error: duplicate label
+    assert old@L(true);
+
+    {
+      label K:
+      x := x + 1;
+    }
+    assert old@K(true);
+    label K:  // error: duplicate label
+    assert old@K(true);
+  }
+
+  datatype Color = A | B | C
+  method Branches(n: int, c: Color) {
+    var x: int;
+    if n < 2 {
+      label X: x := x + 1;
+    } else if n < 4 {
+      label X: x := x + 1;
+    } else {
+      label X: x := x + 1;
+    }
+    if * {
+      label X: x := x + 1;
+    } else {
+      label X: x := x + 1;
+    }
+
+    if {
+      case true =>
+        label X: x := x + 1;
+      case true =>
+        label X: x := x + 1;
+    }
+
+    var i := 0;
+    while i < x {
+      label X: x := x + 1;
+      i := i + 1;
+    }
+
+    i := 0;
+    while {
+      case i < x =>
+        label X: x := x + 1;
+        i := i + 1;
+      case i < x =>
+        label X: x := x + 1;
+        i := i + 1;
+    }
+
+    match c {
+      case A =>
+        label X: x := x + 1;
+      case B =>
+        label X: x := x + 1;
+      case C =>
+        label X: x := x + 1;
+    }
+
+    label X: x := x + 1;  // all okay
+  }
+
+  method A0() {
+    label Q:
+    assert true;
+  }
+
+  method A1() {
+    label Q:
+    assert true;
+  }
+
+  class MyClass {
+    var x: int
+
+    method LabelNotInScope_Old(y: int) {
+      label GoodLabel:
+      if y < 5 {
+        label Treasure:
+        assert true;
+      }
+      assert old(x) == old@Treasure(x);  // error: no label Treasure in scope
+      assert 10 == old@WonderfulLabel(x);  // error: no label WonderfulLabel in scope
+      assert old(x) == old@GoodLabel(x);
+      assert old(x) == old@FutureLabel(x);  // error: no label FutureLabel in scope
+      label FutureLabel: {}
+    }
+
+    method LabelNotInScope_Unchanged(y: int) {
+      label GoodLabel:
+      if y < 5 {
+        label Treasure:
+        assert true;
+      }
+      assert unchanged@Treasure(`x);  // error: no label Treasure in scope
+      assert unchanged@WonderfulLabel(this);  // error: no label WonderfulLabel in scope
+      assert unchanged@GoodLabel(this);
+      assert unchanged@FutureLabel(this);  // error: no label FutureLabel in scope
+      label FutureLabel: {}
+    }
+
+    method LabelNotInScope_Fresh(y: int, c: MyClass) {
+      label GoodLabel:
+      if y < 5 {
+        label Treasure:
+        assert true;
+      }
+      assert fresh@Treasure(c);  // error: no label Treasure in scope
+      assert fresh@WonderfulLabel(c);  // error: no label WonderfulLabel in scope
+      assert fresh@GoodLabel(c);
+      assert fresh@FutureLabel(c);  // error: no label FutureLabel in scope
+      label FutureLabel: {}
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors5.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors5.dfy.expect
new file mode 100644
index 00000000000..9cdb2e42c5f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors5.dfy.expect
@@ -0,0 +1,107 @@
+ResolutionErrors5.dfy(50,33): Error: type of yield-parameter must support auto-initialization (got 'T')
+ResolutionErrors5.dfy(58,13): Error: a ghost function is allowed only in specification contexts
+ResolutionErrors5.dfy(72,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(73,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(75,20): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(76,20): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(77,27): Error: type parameter 'G' (passed in as '(char, ORDINAL)') to function call 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(78,18): Error: type parameter 'G' (passed in as 'ORDINAL') to the function 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(79,4): Error: type parameter 'G' (passed in as 'ORDINAL') to the method 'ParameterizedMethod' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(83,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(85,14): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(86,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(87,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(88,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(90,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(93,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(93,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(94,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(94,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(94,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(94,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(96,25): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(127,36): Error: Name of yield-parameter is used by another member of the iterator: u
+ResolutionErrors5.dfy(128,37): Error: Name of implicit yield-history variable 'u' is already used by another member of the iterator
+ResolutionErrors5.dfy(153,15): Error: To access members of class 'MyClass', write 'MyClass', not 'MyClass?'
+ResolutionErrors5.dfy(167,15): Error: name of type (MyClass) is used as a variable
+ResolutionErrors5.dfy(168,15): Error: name of type (MyClass?) is used as a variable
+ResolutionErrors5.dfy(182,17): Error: To access members of class 'MyClass', write 'MyClass', not 'MyClass?'
+ResolutionErrors5.dfy(196,17): Error: name of type (MyClass) is used as a variable
+ResolutionErrors5.dfy(197,17): Error: name of type (MyClass?) is used as a variable
+ResolutionErrors5.dfy(206,8): Error: static non-ghost const field 'X' of type 'Odd' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(209,8): Error: static non-ghost const field 'Y' of type 'MyClass' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(210,14): Error: static ghost const field 'Y'' of type 'MyClass' (which may be empty) must give a defining value
+ResolutionErrors5.dfy(214,17): Error: static non-ghost const field 'W' of type 'MyClass' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(216,17): Error: static non-ghost const field 'O' of type 'Odd' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(222,17): Error: static non-ghost const field 'W' of type 'MyClass' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(224,17): Error: static non-ghost const field 'O' of type 'Odd' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(234,8): Error: class 'Instance' with fields without known initializers, like 'w' of type 'MyClass', must declare a constructor
+ResolutionErrors5.dfy(241,8): Error: class 'GhostCl' with fields without known initializers, like 'z' of type 'MyClass', must declare a constructor
+ResolutionErrors5.dfy(251,6): Error: LHS of assignment must denote a mutable field
+ResolutionErrors5.dfy(252,10): Error: LHS of assignment must denote a mutable field
+ResolutionErrors5.dfy(260,6): Error: LHS of assignment must denote a mutable field
+ResolutionErrors5.dfy(268,8): Error: LHS of assignment must denote a mutable field of 'this'
+ResolutionErrors5.dfy(287,18): Error: a ghost const field is allowed only in specification contexts
+ResolutionErrors5.dfy(283,20): Error: a ghost const field is allowed only in specification contexts
+ResolutionErrors5.dfy(305,9): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
+ResolutionErrors5.dfy(309,9): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
+ResolutionErrors5.dfy(318,22): Error: a set comprehension involved in a const field definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
+ResolutionErrors5.dfy(315,24): Error: a set comprehension involved in a const field definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
+ResolutionErrors5.dfy(320,36): Error: a set comprehension involved in a newtype definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
+ResolutionErrors5.dfy(321,34): Error: a set comprehension involved in a subset type definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
+ResolutionErrors5.dfy(328,18): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'c'
+ResolutionErrors5.dfy(329,18): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'c'
+ResolutionErrors5.dfy(337,19): Error: a set comprehension involved in a predicate definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
+ResolutionErrors5.dfy(346,35): Error: a const field definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(343,37): Error: a const field definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(348,49): Error: a newtype definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(349,47): Error: a subset type definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(356,32): Error: a predicate definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(365,39): Error: a const field definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(362,41): Error: a const field definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(367,53): Error: a newtype definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(368,51): Error: a subset type definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(375,36): Error: a predicate definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(382,31): Error: the value returned by an abstemious function must come from invoking a co-constructor
+ResolutionErrors5.dfy(418,31): Error: the value returned by an abstemious function must come from invoking a co-constructor
+ResolutionErrors5.dfy(425,32): Error: an abstemious function is allowed to invoke a codatatype destructor only on its parameters
+ResolutionErrors5.dfy(430,12): Error: an abstemious function is allowed to codatatype-match only on its parameters
+ResolutionErrors5.dfy(437,9): Error: an abstemious function is not allowed to check codatatype equality
+ResolutionErrors5.dfy(439,14): Error: an abstemious function is not allowed to check codatatype equality
+ResolutionErrors5.dfy(464,20): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(465,24): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(466,31): Error: type parameter 'G' (passed in as '(char, ORDINAL)') to function call 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(467,18): Error: type parameter 'G' (passed in as 'ORDINAL') to the function 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(468,4): Error: type parameter 'G' (passed in as 'ORDINAL') to the lemma 'ParameterizedLemma' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(469,18): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(470,18): Error: type of bound variable 'r' ('(ORDINAL, int)') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(471,26): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(472,17): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(473,18): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(474,24): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(485,25): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(487,17): Error: type of bound variable 'yt' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(483,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(483,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(482,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(479,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(477,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(476,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(475,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(474,14): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(472,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(462,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(461,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(522,11): Error: no label 'L' in scope at this time
+ResolutionErrors5.dfy(525,10): Error: label shadows a dominating label
+ResolutionErrors5.dfy(533,10): Error: label shadows a dominating label
+ResolutionErrors5.dfy(607,23): Error: no label 'Treasure' in scope at this time
+ResolutionErrors5.dfy(608,19): Error: no label 'WonderfulLabel' in scope at this time
+ResolutionErrors5.dfy(610,23): Error: no label 'FutureLabel' in scope at this time
+ResolutionErrors5.dfy(620,13): Error: no label 'Treasure' in scope at this time
+ResolutionErrors5.dfy(621,13): Error: no label 'WonderfulLabel' in scope at this time
+ResolutionErrors5.dfy(623,13): Error: no label 'FutureLabel' in scope at this time
+ResolutionErrors5.dfy(633,13): Error: no label 'Treasure' in scope at this time
+ResolutionErrors5.dfy(634,13): Error: no label 'WonderfulLabel' in scope at this time
+ResolutionErrors5.dfy(636,13): Error: no label 'FutureLabel' in scope at this time
+106 resolution/type errors detected in ResolutionErrors5.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors5.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors5.dfy.refresh.expect
new file mode 100644
index 00000000000..9953c13159e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors5.dfy.refresh.expect
@@ -0,0 +1,108 @@
+ResolutionErrors5.dfy(50,33): Error: type of yield-parameter must support auto-initialization (got 'T')
+ResolutionErrors5.dfy(58,13): Error: a ghost function is allowed only in specification contexts
+ResolutionErrors5.dfy(72,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(73,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(75,20): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(76,20): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(77,27): Error: type parameter 'G' (passed in as '(char, ORDINAL)') to function call 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(78,18): Error: type parameter 'G' (passed in as 'ORDINAL') to the function 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(79,4): Error: type parameter 'G' (passed in as 'ORDINAL') to the method 'ParameterizedMethod' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(83,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(85,14): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(86,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(87,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(88,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(90,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(93,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(93,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(94,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(94,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(94,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(94,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(96,25): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(127,36): Error: Name of yield-parameter is used by another member of the iterator: u
+ResolutionErrors5.dfy(128,37): Error: Name of implicit yield-history variable 'u' is already used by another member of the iterator
+ResolutionErrors5.dfy(142,13): Error: prefix-equality limit argument must be an ORDINAL or integer expression (got ?5)
+ResolutionErrors5.dfy(153,15): Error: To access members of class 'MyClass', write 'MyClass', not 'MyClass?'
+ResolutionErrors5.dfy(167,15): Error: name of type (MyClass) is used as a variable
+ResolutionErrors5.dfy(168,15): Error: name of type (MyClass?) is used as a variable
+ResolutionErrors5.dfy(182,17): Error: To access members of class 'MyClass', write 'MyClass', not 'MyClass?'
+ResolutionErrors5.dfy(196,17): Error: name of type (MyClass) is used as a variable
+ResolutionErrors5.dfy(197,17): Error: name of type (MyClass?) is used as a variable
+ResolutionErrors5.dfy(206,8): Error: static non-ghost const field 'X' of type 'Odd' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(209,8): Error: static non-ghost const field 'Y' of type 'MyClass' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(210,14): Error: static ghost const field 'Y'' of type 'MyClass' (which may be empty) must give a defining value
+ResolutionErrors5.dfy(214,17): Error: static non-ghost const field 'W' of type 'MyClass' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(216,17): Error: static non-ghost const field 'O' of type 'Odd' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(222,17): Error: static non-ghost const field 'W' of type 'MyClass' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(224,17): Error: static non-ghost const field 'O' of type 'Odd' (which does not have a default compiled value) must give a defining value
+ResolutionErrors5.dfy(234,8): Error: class 'Instance' with fields without known initializers, like 'w' of type 'MyClass', must declare a constructor
+ResolutionErrors5.dfy(241,8): Error: class 'GhostCl' with fields without known initializers, like 'z' of type 'MyClass', must declare a constructor
+ResolutionErrors5.dfy(251,6): Error: LHS of assignment must denote a mutable field
+ResolutionErrors5.dfy(252,10): Error: LHS of assignment must denote a mutable field
+ResolutionErrors5.dfy(260,6): Error: LHS of assignment must denote a mutable field
+ResolutionErrors5.dfy(268,8): Error: LHS of assignment must denote a mutable field of 'this'
+ResolutionErrors5.dfy(287,18): Error: a ghost const field is allowed only in specification contexts
+ResolutionErrors5.dfy(283,20): Error: a ghost const field is allowed only in specification contexts
+ResolutionErrors5.dfy(305,9): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
+ResolutionErrors5.dfy(309,9): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
+ResolutionErrors5.dfy(318,22): Error: a set comprehension involved in a const field definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
+ResolutionErrors5.dfy(315,24): Error: a set comprehension involved in a const field definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
+ResolutionErrors5.dfy(320,36): Error: a set comprehension involved in a newtype definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
+ResolutionErrors5.dfy(321,34): Error: a set comprehension involved in a subset type definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
+ResolutionErrors5.dfy(328,18): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'c'
+ResolutionErrors5.dfy(329,18): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'c'
+ResolutionErrors5.dfy(337,19): Error: a set comprehension involved in a predicate definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
+ResolutionErrors5.dfy(346,35): Error: a const field definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(343,37): Error: a const field definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(348,49): Error: a newtype definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(349,47): Error: a subset type definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(356,32): Error: a predicate definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(365,39): Error: a const field definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(362,41): Error: a const field definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(367,53): Error: a newtype definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(368,51): Error: a subset type definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(375,36): Error: a predicate definition is not allowed to depend on the set of allocated references
+ResolutionErrors5.dfy(382,31): Error: the value returned by an abstemious function must come from invoking a co-constructor
+ResolutionErrors5.dfy(418,31): Error: the value returned by an abstemious function must come from invoking a co-constructor
+ResolutionErrors5.dfy(425,32): Error: an abstemious function is allowed to invoke a codatatype destructor only on its parameters
+ResolutionErrors5.dfy(430,12): Error: an abstemious function is allowed to codatatype-match only on its parameters
+ResolutionErrors5.dfy(437,9): Error: an abstemious function is not allowed to check codatatype equality
+ResolutionErrors5.dfy(439,14): Error: an abstemious function is not allowed to check codatatype equality
+ResolutionErrors5.dfy(464,20): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(465,24): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(466,31): Error: type parameter 'G' (passed in as '(char, ORDINAL)') to function call 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(467,18): Error: type parameter 'G' (passed in as 'ORDINAL') to the function 'F'' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(472,17): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(473,18): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(474,24): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(485,25): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(487,17): Error: type of bound variable 'yt' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(483,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(483,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(482,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(479,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(477,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(476,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(475,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(474,14): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(472,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(471,26): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(470,18): Error: type of bound variable 'r' ('(ORDINAL, int)') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(469,18): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
+ResolutionErrors5.dfy(468,4): Error: type parameter 'G' (passed in as 'ORDINAL') to the lemma 'ParameterizedLemma' is not allowed to use ORDINAL
+ResolutionErrors5.dfy(462,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(461,8): Error: an ORDINAL type is not allowed to be used as a type argument
+ResolutionErrors5.dfy(522,11): Error: no label 'L' in scope at this time
+ResolutionErrors5.dfy(525,10): Error: label shadows a dominating label
+ResolutionErrors5.dfy(533,10): Error: label shadows a dominating label
+ResolutionErrors5.dfy(607,23): Error: no label 'Treasure' in scope at this time
+ResolutionErrors5.dfy(608,19): Error: no label 'WonderfulLabel' in scope at this time
+ResolutionErrors5.dfy(610,23): Error: no label 'FutureLabel' in scope at this time
+ResolutionErrors5.dfy(620,13): Error: no label 'Treasure' in scope at this time
+ResolutionErrors5.dfy(621,13): Error: no label 'WonderfulLabel' in scope at this time
+ResolutionErrors5.dfy(623,13): Error: no label 'FutureLabel' in scope at this time
+ResolutionErrors5.dfy(633,13): Error: no label 'Treasure' in scope at this time
+ResolutionErrors5.dfy(634,13): Error: no label 'WonderfulLabel' in scope at this time
+ResolutionErrors5.dfy(636,13): Error: no label 'FutureLabel' in scope at this time
+107 resolution/type errors detected in ResolutionErrors5.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors6.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors6.dfy
new file mode 100644
index 00000000000..ebed1de2a11
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors6.dfy
@@ -0,0 +1,388 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+// ----- bad use of types without auto-initializers -----
+
+module Initialization {
+  datatype Yt<Y> = MakeYt(x: int, y: Y)
+  type Even = x | x % 2 == 0
+  type Odd = x | x % 2 == 1 witness 17
+  type GW = x | x % 2 == 1 ghost witness 17
+
+  method DefiniteAssignmentViolation() returns (e: Yt<Even>, o: Yt<Odd>, g: Yt<GW>)
+  {
+  }  // no resolution errors (but verification errors, see NonZeroInitialization.dfy)
+
+  method ArrayElementInitViolation() returns (e: array<Yt<Even>>, o: array<Yt<Odd>>, g: array<Yt<GW>>)
+  {
+    e := new Yt<Even>[20];
+    o := new Yt<Odd>[20];
+    g := new Yt<GW>[20];
+  }  // no resolution errors (but verification errors, see NonZeroInitialization.dfy)
+
+  method GimmieOne<G(0)>() returns (g: G)
+  {
+  }
+
+  method TypeParamViolation() returns (e: Yt<Even>, o: Yt<Odd>, g: Yt<GW>)
+  {
+    e := GimmieOne<Yt<Even>>();
+    o := GimmieOne<Yt<Odd>>();
+    g := GimmieOne<Yt<GW>>();  // error: cannot pass Yt<GW> to a (0)-parameter
+  }
+}
+
+// ----------------- regression tests ----------------------------------------------------
+
+module FreshTypeInferenceRegression {
+  class MyClass {
+    method M(N: nat)
+    {
+      var i, os := 0, {};
+      while i < N
+        invariant fresh(os)
+        invariant forall o :: o in os ==> fresh(o.inner)  // error: type of "o" not yet known (this once caused a crash)
+      {
+        var o := new Outer();
+        os, i := os + {o}, i + 1;
+      }
+    }
+  }
+
+  class Outer {
+    const inner: Inner
+
+    constructor ()
+      ensures fresh(inner)
+    {
+      inner := new Inner();
+    }
+  }
+
+  class Inner {
+    constructor ()
+  }
+}
+
+module RegressionTest {
+  class Cache<X> {
+    method Lookup(K: X) returns (V: X)
+    {
+      V := Cache[K];  // error: Cache is not a field but a type
+    }
+  }
+}
+
+module ExistsImpliesWarning {
+  method M(a: array<int>, b: array<int>)
+    requires a.Length == b.Length
+    requires exists i :: 0 <= i < a.Length ==> a[i] == b[i]  // warning
+    requires exists i :: true && (0 <= i < a.Length ==> a[i] == b[i])
+    requires exists i :: (0 <= i < a.Length ==> a[i] == b[i])
+    requires exists i | 0 <= i < a.Length :: true ==> a[i] == b[i]
+    requires exists i | 0 <= i < a.Length :: a[i] == b[i]
+    requires exists i | 0 <= i < a.Length ==> a[i] == b[i] :: true
+    requires exists i :: !(0 <= i < a.Length) || a[i] == b[i]
+    requires exists i :: a[i] == b[i] <== 0 <= i < a.Length  // warning
+    requires exists i :: !(0 <= i < a.Length && a[i] != b[i])
+    requires exists i :: 0 <= i < a.Length && a[i] == b[i]
+    requires exists i :: true ==> (0 <= i < a.Length && a[i] == b[i])  // warning
+  {
+  }
+
+  method N(a: array<int>, b: array<int>)
+    requires a.Length == b.Length
+    requires forall i :: 0 <= i < a.Length ==> a[i] == b[i]
+    requires forall i :: true && (0 <= i < a.Length ==> a[i] == b[i])
+    requires forall i :: (0 <= i < a.Length ==> a[i] == b[i])
+    requires forall i | 0 <= i < a.Length :: true ==> a[i] == b[i]
+    requires forall i | 0 <= i < a.Length :: a[i] == b[i]
+    requires forall i | 0 <= i < a.Length ==> a[i] == b[i] :: true
+    requires forall i :: !(0 <= i < a.Length) || a[i] == b[i]
+    requires forall i :: a[i] == b[i] <== 0 <= i < a.Length
+    requires forall i :: !(0 <= i < a.Length && a[i] != b[i])
+    requires forall i :: 0 <= i < a.Length && a[i] == b[i]
+    requires forall i :: true ==> (0 <= i < a.Length && a[i] == b[i])
+  {
+  }
+}
+
+// --------------- ghost (regression) tests, receivers -------------------------------------
+
+module GhostReceiverTests {
+  class C {
+    ghost function F(x: int): int { 3 }
+    function G(x: int): int { 4 }
+    lemma L(x: int) { }
+    method M(x: int) { }
+  }
+
+  method Caller(x: int, ghost z: int, c: C, ghost g: C) {
+    {
+      var y;
+      y := c.F(x);  // error: LHS is non-ghost, so RHS cannot use ghost function F
+      y := g.F(x);  // error: LHS is non-ghost, so RHS cannot use ghost function F
+      y := c.G(x);
+      y := g.G(x);  // error: LHS is non-ghost, so RHS cannot use ghost variable g
+    }
+    {
+      // all of the these are fine, because: the LHS is ghost and, therefore, the whole statement is
+      ghost var y;
+      y := c.F(x);
+      y := g.F(x);
+      y := c.G(x);
+      y := g.G(x);
+    }
+    {
+      // all of the these are fine, because: the LHS is ghost and, therefore, the whole statement is
+      ghost var y;
+      y := c.F(z);
+      y := g.F(z);
+      y := c.G(z);
+      y := g.G(z);
+    }
+    c.L(x);
+    g.L(x);
+    c.M(x);
+    g.M(x);  // error: cannot pass ghost receiver to compiled method
+  }
+}
+
+// --------------- ghost RHS of constants (regression) tests -------------------------------------
+
+module GhostRhsConst {
+  class C {
+    ghost function F(n: nat): nat { n }  // a ghost function
+    static ghost function G(n: nat): nat { n }  // a ghost function
+    const b := F(0)  // error: RHS uses a ghost function
+    static const u := G(0)  // error: RHS uses a ghost function
+  }
+
+  trait R {
+    ghost function F(n: nat): nat { n }  // a ghost function
+    static ghost function G(n: nat): nat { n }  // a ghost function
+    const b := F(0)  // error: RHS uses a ghost function
+    static const u := G(0)  // error: RHS uses a ghost function
+  }
+}
+
+// --------------- errors from nested modules -------------------------------------
+
+module ErrorsFromNestedModules {
+  method M() {
+    U.V.Test();
+    UU.V.Test();
+  }
+
+  module U {  // regression test: since U is rather empty, this had once caused an error
+    module V {
+      method Test() {
+      }
+      module W {
+        const x1 := 12 * false  // error: bad types
+      }
+    }
+  }
+
+  module UU.V {  // same regression as above
+    method Test() {
+    }
+    module W {
+      const x1 := 12 * false  // error: bad types
+    }
+  }
+}
+
+// --------------- name clashes related to prefix-named modules -------------------------------------
+
+module NameClashes {
+  module U.G {
+  }
+  module U {
+    class G { }  // error: duplicate name: G
+    class H { }
+  }
+  module U.H {  // error: duplicate name: H
+  }
+}
+
+// --------------- regression ghost tests -------------------------------------
+
+module RegressionGhostTests {
+  class Cell {
+    var data: int
+  }
+
+  method field(x: Cell)
+    modifies x
+  {
+    ghost var y := x;
+    x.data := 42;
+    y.data := 42;  // error: assignment to non-ghost field depends on a ghost
+    (assert x == y; x).data := 42;
+    (assert x == y; y).data := 42;  // error: assignment to non-ghost field depends on a ghost
+  }
+
+  method arr(a: array<int>)
+    requires 5 < a.Length
+    modifies a
+  {
+    ghost var b := a;
+    ghost var i := 5;
+    a[i] := 42;  // error: assignment to non-ghost field depends on a ghost
+    b[5] := 42;  // error: assignment to non-ghost field depends on a ghost
+  }
+
+  method arr2(a: array2<int>)
+    requires 5 < a.Length0 && 5 < a.Length1
+    modifies a
+  {
+    ghost var b := a;
+    ghost var i := 5;
+    a[i,5] := 42;  // error: assignment to non-ghost field depends on a ghost
+    a[5,i] := 42;  // error: assignment to non-ghost field depends on a ghost
+    b[5,5] := 42;  // error: assignment to non-ghost field depends on a ghost
+  }
+}
+
+// --------------- regression test const in frame expression ------------------------------
+
+module RegressionConstFrameExpression {
+  class C {
+    const x: int
+    var y: int
+  }
+  method m(c: C)
+    modifies c`x
+    modifies c`y
+    ensures unchanged(c`x)
+    ensures unchanged(c)
+  {
+
+  }
+}
+
+// --------------- change in language semantics to forbid !! on maps ------------------------------
+
+module MapDisjointnessNoMore {
+  method M<X,Y>(a: map, b: map) {
+    assert a !! b;  // error: !! is (no longer) support on maps
+    assert a.Keys !! b.Keys;  // instead, this is the way to do it
+  }
+}
+
+// --------------- expect statements ------------------------------
+
+module ExpectStatements {
+  ghost function UnsafeDivide(a: int, b: int): int {
+    expect b != 0;  // expect statement is not allowed in this context
+    a / b
+  }
+
+  method M() {
+    ghost var g := 5;
+    expect forall i : int :: i == i;  // error: quantifiers in non-ghost contexts must be compilable
+    expect false, if g == 5 then "boom" else "splat"; // error: ghost variables are allowed only in specification contexts
+  }
+}
+
+// --------------- type-parameter scopes ------------------------------
+
+module TypeParameterScopes {
+  class C<X> {
+    function G(): X
+
+    method M<X>(f: X) {
+      var h: X := f;
+      var k: X := G();  // error: this is the wrong X
+    }
+
+    function F<X>(f: X): int {
+      var h: X := f;
+      var k: X := G();  // error: this is the wrong X
+      10
+    }
+  }
+}
+
+// --------------- type of function members (regression tests) ------------------------------
+
+module TypeOfFunctionMember {
+  ghost function Fo<X>(x: X): int
+
+  lemma M() {
+    // Both of the following once crashed the type checker
+    var rd := Fo<real>.reads;
+    var rq := Fo<real>.requires;
+  }
+}
+
+// --------------- update operations ------------------------------
+
+module CollectionUpdates {
+  // Update operations on collections must have the right types, modulo subset types.
+  // For verification errors, see Maps.dfy.
+  trait Trait { }
+  class Elem extends Trait { }
+
+  method UpdateValiditySeq(d: Trait, e: Elem) {
+    var s: seq<Elem> := [e, e, e, e, e];
+    s := s[1 := d];  // error: d is not an Elem (and is not a subset type of it, either)
+  }
+
+  method UpdateValidityMultiset(d: Trait) {
+    var s: multiset<Elem>;
+    s := s[d := 5];  // error: element value is not a Elem
+  }
+
+  method UpdateValidityMap(d: Trait, e: Elem) {
+    var m: map<Elem, Elem>;
+    if * {
+      m := m[d := e];  // error: key is not a Elem
+    } else {
+      m := m[e := d];  // error: value is not a Elem
+    }
+  }
+}
+
+// --------------- update operations ------------------------------
+
+module MoreAutoInitAndNonempty {
+  type A(0)
+  type B(00)
+  type C
+
+  method Q<F(0)>(f: F)
+  method P<G(00)>(g: G)
+  method R<H>(h: H)
+
+  function FQ<F(0)>(f: F): int
+  function FP<G(00)>(g: G): int
+  function FR<H>(h: H): int
+
+  method M<X(0), Y(00), Z>(x: X, y: Y, z: Z)
+  {
+    Q(x);
+    P(x);
+    R(x);
+    Q(y);  // error: auto-init mismatch
+    P(y);
+    R(y);
+    Q(z);  // error: auto-init mismatch
+    P(z);  // error: auto-init mismatch
+    R(z);
+  }
+
+  method N<X(0), Y(00), Z>(x: X, y: Y, z: Z) returns (u: int)
+  {
+    u := FQ(x);
+    u := FP(x);
+    u := FR(x);
+    u := FQ(y);  // error: auto-init mismatch
+    u := FP(y);
+    u := FR(y);
+    u := FQ(z);  // error: auto-init mismatch
+    u := FP(z);  // error: auto-init mismatch
+    u := FR(z);
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors6.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors6.dfy.expect
new file mode 100644
index 00000000000..5bfa32af752
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors6.dfy.expect
@@ -0,0 +1,51 @@
+ResolutionErrors6.dfy(31,26): Error: type parameter (G) passed to method GimmieOne must support auto-initialization (got Yt<GW>)
+ResolutionErrors6.dfy(44,50): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors6.dfy(71,11): Error: name of type (Cache) is used as a variable
+ResolutionErrors6.dfy(71,17): Error: incorrect type for selection into ? (got X)
+ResolutionErrors6.dfy(79,13): Warning: the quantifier has the form 'exists x :: A ==> B', which most often is a typo for 'exists x :: A && B'; if you think otherwise, rewrite as 'exists x :: (A ==> B)' or 'exists x :: !A || B' to suppress this warning
+ResolutionErrors6.dfy(89,13): Warning: the quantifier has the form 'exists x :: A ==> B', which most often is a typo for 'exists x :: A && B'; if you think otherwise, rewrite as 'exists x :: (A ==> B)' or 'exists x :: !A || B' to suppress this warning
+ResolutionErrors6.dfy(123,14): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(124,14): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(126,11): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(147,4): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(157,16): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(158,23): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(164,16): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(165,23): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(182,23): Error: type of left argument to * (int) must agree with the result type (bool)
+ResolutionErrors6.dfy(182,23): Error: type of * must be of a numeric type, bitvector type, or a set-like type (instead got bool)
+ResolutionErrors6.dfy(181,13): Error: not resolving module 'V' because there were errors in resolving its nested module 'W'
+ResolutionErrors6.dfy(191,21): Error: type of left argument to * (int) must agree with the result type (bool)
+ResolutionErrors6.dfy(191,21): Error: type of * must be of a numeric type, bitvector type, or a set-like type (instead got bool)
+ResolutionErrors6.dfy(190,11): Error: not resolving module 'V' because there were errors in resolving its nested module 'W'
+ResolutionErrors6.dfy(177,9): Error: not resolving module 'ErrorsFromNestedModules' because there were errors in resolving its nested module 'U'
+ResolutionErrors6.dfy(199,11): Error: duplicate name of top-level declaration: G
+ResolutionErrors6.dfy(202,10): Related location
+ResolutionErrors6.dfy(205,11): Error: duplicate name of top-level declaration: H
+ResolutionErrors6.dfy(203,10): Related location
+ResolutionErrors6.dfy(221,4): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(223,20): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(232,6): Error: ghost variables such as i are allowed only in specification contexts. i was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(233,4): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(242,6): Error: ghost variables such as i are allowed only in specification contexts. i was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(243,8): Error: ghost variables such as i are allowed only in specification contexts. i was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(244,4): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(256,13): Error: expression is not allowed to refer to constant field x
+ResolutionErrors6.dfy(258,22): Error: expression is not allowed to refer to constant field x
+ResolutionErrors6.dfy(269,13): Error: arguments must be of a set or multiset type (got map<X, Y>)
+ResolutionErrors6.dfy(278,4): Error: expect statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)
+ResolutionErrors6.dfy(284,11): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
+ResolutionErrors6.dfy(285,21): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(297,15): Error: RHS (of type X) not assignable to LHS (of type X)
+ResolutionErrors6.dfy(302,10): Error: type of corresponding source/RHS (X) does not match type of bound variable (X)
+ResolutionErrors6.dfy(330,16): Error: sequence update requires the value to have the element type of the sequence (got Trait)
+ResolutionErrors6.dfy(335,11): Error: multiset update requires domain element to be of type Elem (got Trait)
+ResolutionErrors6.dfy(341,13): Error: map update requires domain element to be of type Elem (got Trait)
+ResolutionErrors6.dfy(343,18): Error: map update requires the value to have the range type Elem (got Trait)
+ResolutionErrors6.dfy(368,5): Error: type parameter (F) passed to method Q must support auto-initialization (got Y) (perhaps try declaring type parameter 'Y' on line 363 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors6.dfy(371,5): Error: type parameter (F) passed to method Q must support auto-initialization (got Z) (perhaps try declaring type parameter 'Z' on line 363 as 'Z(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors6.dfy(372,5): Error: type parameter (G) passed to method P must be nonempty (got Z) (perhaps try declaring type parameter 'Z' on line 363 as 'Z(00)', which says it can only be instantiated with a nonempty type)
+ResolutionErrors6.dfy(381,11): Error: type parameter (F) passed to function FQ must support auto-initialization (got Y) (perhaps try declaring type parameter 'Y' on line 376 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors6.dfy(384,11): Error: type parameter (F) passed to function FQ must support auto-initialization (got Z) (perhaps try declaring type parameter 'Z' on line 376 as 'Z(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors6.dfy(385,11): Error: type parameter (G) passed to function FP must be nonempty (got Z) (perhaps try declaring type parameter 'Z' on line 376 as 'Z(00)', which says it can only be instantiated with a nonempty type)
+46 resolution/type errors detected in ResolutionErrors6.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors6.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors6.dfy.refresh.expect
new file mode 100644
index 00000000000..6d46a15c7e2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors6.dfy.refresh.expect
@@ -0,0 +1,49 @@
+ResolutionErrors6.dfy(31,26): Error: type parameter (G) passed to method GimmieOne must support auto-initialization (got Yt<GW>)
+ResolutionErrors6.dfy(44,50): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors6.dfy(44,50): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got ?10)
+ResolutionErrors6.dfy(71,11): Error: name of type (Cache) is used as a variable
+ResolutionErrors6.dfy(79,13): Warning: the quantifier has the form 'exists x :: A ==> B', which most often is a typo for 'exists x :: A && B'; if you think otherwise, rewrite as 'exists x :: (A ==> B)' or 'exists x :: !A || B' to suppress this warning
+ResolutionErrors6.dfy(89,13): Warning: the quantifier has the form 'exists x :: A ==> B', which most often is a typo for 'exists x :: A && B'; if you think otherwise, rewrite as 'exists x :: (A ==> B)' or 'exists x :: !A || B' to suppress this warning
+ResolutionErrors6.dfy(123,14): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(124,14): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(126,11): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(147,4): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(157,16): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(158,23): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(164,16): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(165,23): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors6.dfy(182,23): Error: type of right argument to * (bool) must agree with the result type (int)
+ResolutionErrors6.dfy(181,13): Error: not resolving module 'V' because there were errors in resolving its nested module 'W'
+ResolutionErrors6.dfy(191,21): Error: type of right argument to * (bool) must agree with the result type (int)
+ResolutionErrors6.dfy(190,11): Error: not resolving module 'V' because there were errors in resolving its nested module 'W'
+ResolutionErrors6.dfy(177,9): Error: not resolving module 'ErrorsFromNestedModules' because there were errors in resolving its nested module 'U'
+ResolutionErrors6.dfy(199,11): Error: duplicate name of top-level declaration: G
+ResolutionErrors6.dfy(202,10): Related location
+ResolutionErrors6.dfy(205,11): Error: duplicate name of top-level declaration: H
+ResolutionErrors6.dfy(203,10): Related location
+ResolutionErrors6.dfy(221,4): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(223,20): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(232,6): Error: ghost variables such as i are allowed only in specification contexts. i was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(233,4): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(242,6): Error: ghost variables such as i are allowed only in specification contexts. i was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(243,8): Error: ghost variables such as i are allowed only in specification contexts. i was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(244,4): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(256,13): Error: expression is not allowed to refer to constant field x
+ResolutionErrors6.dfy(258,22): Error: expression is not allowed to refer to constant field x
+ResolutionErrors6.dfy(269,13): Error: arguments must be of a set or multiset type (got map<X, Y>)
+ResolutionErrors6.dfy(278,4): Error: expect statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)
+ResolutionErrors6.dfy(284,11): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
+ResolutionErrors6.dfy(285,21): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors6.dfy(297,15): Error: RHS (of type X) not assignable to LHS (of type X)
+ResolutionErrors6.dfy(302,10): Error: type of corresponding source/RHS (X) does not match type of bound variable (X)
+ResolutionErrors6.dfy(330,16): Error: sequence update requires the value to have the element type of the sequence (got Trait)
+ResolutionErrors6.dfy(335,11): Error: multiset update requires domain element to be of type Elem (got Trait)
+ResolutionErrors6.dfy(341,13): Error: map update requires domain element to be of type Elem (got Trait)
+ResolutionErrors6.dfy(343,18): Error: map update requires the value to have the range type Elem (got Trait)
+ResolutionErrors6.dfy(368,5): Error: type parameter (F) passed to method Q must support auto-initialization (got Y) (perhaps try declaring type parameter 'Y' on line 363 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors6.dfy(371,5): Error: type parameter (F) passed to method Q must support auto-initialization (got Z) (perhaps try declaring type parameter 'Z' on line 363 as 'Z(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors6.dfy(372,5): Error: type parameter (G) passed to method P must be nonempty (got Z) (perhaps try declaring type parameter 'Z' on line 363 as 'Z(00)', which says it can only be instantiated with a nonempty type)
+ResolutionErrors6.dfy(381,11): Error: type parameter (F) passed to function FQ must support auto-initialization (got Y) (perhaps try declaring type parameter 'Y' on line 376 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors6.dfy(384,11): Error: type parameter (F) passed to function FQ must support auto-initialization (got Z) (perhaps try declaring type parameter 'Z' on line 376 as 'Z(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors6.dfy(385,11): Error: type parameter (G) passed to function FP must be nonempty (got Z) (perhaps try declaring type parameter 'Z' on line 376 as 'Z(00)', which says it can only be instantiated with a nonempty type)
+44 resolution/type errors detected in ResolutionErrors6.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors7.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors7.dfy
new file mode 100644
index 00000000000..72e70c455f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors7.dfy
@@ -0,0 +1,368 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+// --------------- ghost function error messages ------------------------------
+
+module GhostFunctionErrorMessages {
+  ghost function GhostFunction(): int
+  ghost predicate GhostPredicate()
+  least predicate LeastPredicate()
+  greatest predicate GreatestPredicate()
+  twostate function TwoFunction(): int
+  twostate predicate TwoPredicate()
+
+  method GhostsUsedInCompiledContexts() {
+    var x, b;
+    x := GhostFunction(); // error
+    b := GhostPredicate(); // error
+    b := LeastPredicate(); // error
+    b := GreatestPredicate(); // error
+    x := TwoFunction(); // error
+    b := TwoPredicate(); // error
+  }
+}
+
+module TypeParameterCount {
+  ghost function F0(): int
+  ghost function F1<A>(): int
+  ghost function F2<A, B>(): int
+  method M0()
+  method M1<A>()
+  method M2<A, B>()
+
+  method TestFunction() {
+    var x;
+    x := F0();
+    x := F1();  // type argument inferred
+    x := F2();  // type arguments inferred
+    x := F0<int>();  // error: wrong number of type parameters
+    x := F1<int>();
+    x := F2<int>();  // error: wrong number of type parameters
+    x := F0<int, real>();  // error: wrong number of type parameters
+    x := F1<int, real>();  // error: wrong number of type parameters
+    x := F2<int, real>();
+  }
+
+  method TestMethods() {
+    M0();
+    M1();  // type argument inferred
+    M2();  // type arguments inferred
+    M0<int>();  // error: wrong number of type parameters
+    M1<int>();
+    M2<int>();  // error: wrong number of type parameters
+    M0<int, real>();  // error: wrong number of type parameters
+    M1<int, real>();  // error: wrong number of type parameters
+    M2<int, real>();
+  }
+}
+
+module AutoGhostRegressions {
+  datatype Quad<T, U> = Quad(0: T, 1: T, ghost 2: U, ghost 3: U)
+
+  method Test() {
+    var q := Quad(20, 30, 40, 50);
+    print q, "\n";
+
+    var Quad(a, b, c, d) := q;
+    print c, "\n";  // error: c is ghost (this was once not handled correctly)
+
+    match q {
+      case Quad(r, s, t, u) =>
+        print t, "\n";  // error: t is ghost
+    }
+
+    ghost var p := Quad(20, 30, 40, 50);
+    var Quad(a', b', c', d') := p;
+    print a', "\n";  // error: a' is ghost
+    print c', "\n";  // error: c' is ghost
+  }
+
+  datatype NoEquality = NoEquality(ghost u: int)
+  newtype NT = x | var s: set<NoEquality> := {}; |s| <= x  // fine, since constraint is a ghost context
+  type ST = x | var s: set<NoEquality> := {}; |s| <= x  // fine, since constraint is a ghost context
+}
+
+module TypeCharacteristicsInGhostCode {
+  function MustBeNonempty<T(00)>(): int { 5 }
+  function MustBeAutoInit<T(0)>(): int { 5 }
+  function MustSupportEquality<T(==)>(): int { 5 }
+  function NoReferences<T(!new)>(): int { 5 }
+
+  type PossiblyEmpty = x: int | true witness *
+  type Nonempty = x: int | true ghost witness 0
+  datatype NoEquality = NoEquality(ghost u: int)
+  class Class { }
+  type Good = bool
+
+  method TestCompiled<Z>()
+  {
+    var w;
+
+    w := MustBeNonempty<PossiblyEmpty>();  // error
+    w := MustBeNonempty<Nonempty>();
+    w := MustBeNonempty<NoEquality>();
+    w := MustBeNonempty<Class?>();
+    w := MustBeNonempty<Good>();
+    w := MustBeNonempty<Z>();  // error (a hint is given)
+
+    w := MustBeAutoInit<PossiblyEmpty>();  // error
+    w := MustBeAutoInit<Nonempty>();  // error
+    w := MustBeAutoInit<NoEquality>();
+    w := MustBeAutoInit<Class?>();
+    w := MustBeAutoInit<Good>();
+    w := MustBeAutoInit<Z>();  // error (a hint is given)
+
+    w := MustSupportEquality<PossiblyEmpty>();
+    w := MustSupportEquality<Nonempty>();
+    w := MustSupportEquality<NoEquality>();  // error
+    w := MustSupportEquality<Class?>();
+    w := MustSupportEquality<Good>();
+    w := MustSupportEquality<Z>();  // error (a hint is given)
+
+    w := NoReferences<PossiblyEmpty>();
+    w := NoReferences<Nonempty>();
+    w := NoReferences<NoEquality>();
+    w := NoReferences<Class?>();  // error
+    w := NoReferences<Good>();
+    w := NoReferences<Z>();  // error (a hint is given)
+  }
+
+  method TestGhost()
+  {
+    ghost var w;
+
+    w := MustBeNonempty<PossiblyEmpty>();  // error
+    w := MustBeNonempty<Nonempty>();
+    w := MustBeNonempty<NoEquality>();
+    w := MustBeNonempty<Class?>();
+    w := MustBeNonempty<Good>();
+
+    w := MustBeAutoInit<PossiblyEmpty>();  // error
+    w := MustBeAutoInit<Nonempty>();  // fine, because the call appears in a ghost context
+    w := MustBeAutoInit<NoEquality>();
+    w := MustBeAutoInit<Class?>();
+    w := MustBeAutoInit<Good>();
+
+    w := MustSupportEquality<PossiblyEmpty>();
+    w := MustSupportEquality<Nonempty>();
+    w := MustSupportEquality<NoEquality>();
+    w := MustSupportEquality<Class?>();
+    w := MustSupportEquality<Good>();
+
+    w := NoReferences<PossiblyEmpty>();
+    w := NoReferences<Nonempty>();
+    w := NoReferences<NoEquality>();
+    w := NoReferences<Class?>();  // error
+    w := NoReferences<Good>();
+  }
+
+  function FF(a: bool, ghost b: bool): int { 5 }
+  method MM(a: bool, ghost b: bool) { }
+  function GetInt<T(==)>(): int { 2 }
+
+  method GhostContexts<T>(x: T, y: T) {
+    var r;
+    r := FF(x == y, true);  // error: T must support equality
+    r := FF(true, x == y);  // no problem, since this is a ghost context
+    MM(x == y, true);  // error: T must support equality
+    MM(true, x == y);  // no problem, since this is a ghost context
+
+    r := FF(GetInt<NoEquality>() == 0, true);  // error: type argument must support equality
+    r := FF(true, GetInt<NoEquality>() == 0);  // okay, since this is a ghost context
+    MM(GetInt<NoEquality>() == 0, true);  // error: type argument must support equality
+    MM(true, GetInt<NoEquality>() == 0);  // okay, since this is a ghost context
+
+    var q0 := Quad(GetInt<NoEquality>() == 0, true, true, true);  // error: type argument must support equality
+    var q1 := Quad(true, true, GetInt<NoEquality>() == 0, true);  // fine, since in a ghost context
+  }
+
+  datatype Quad<T, U> = Quad(0: T, 1: T, ghost 2: U, ghost 3: U)
+  datatype QuadEq<T(==), U(==)> = QuadEq(0: T, 1: T, ghost 2: U, ghost 3: U)
+
+  method VarDecls<T>(x: T, y: T) {
+    var a := x == y;  // error: this requires T to support equality
+    ghost var b := x == y;  // fine
+
+    var q := Quad(x, y, x, y);
+    var Quad(k, l, m, n) := q;  // k,l are compiled; m,n are ghost
+    var c := k == l;  // error: this requires T to support equality
+    var d := m == n;  // fine, since d is implicitly ghost
+    d, c, d := m == n, k == l, m == n;  // error: "k == l" requires T to support equality
+
+    var q' := QuadEq([x], [x], [0], [0]);  // error: seq<T> requires T to support equality (1 error for local var, 1 for datatype ctor)
+    var q'' := QuadEq([0], [0], [x], [x]); // error: seq<T> requires T to support equality (1 error for local var, 1 for datatype ctor)
+  }
+
+  newtype NT = x | var s: set<NoEquality> := {}; |s| <= x  // fine, since constraint is a ghost context
+  type ST = x | var s: set<NoEquality> := {}; |s| <= x  // fine, since constraint is a ghost context
+
+  method LetVarDecls<T>(x: T, y: T) {
+    var lhs;
+    lhs :=
+      var a := x == y;  // error: this requires T to support equality
+      0;
+    lhs :=
+      ghost var b := x == y;  // fine
+      0;
+
+    var q := Quad(x, y, x, y);
+    var Quad(k, l, m, n) := q;  // k,l are compiled; m,n are ghost
+    lhs :=
+      var c := k == l;  // error: this requires T to support equality
+      0;
+    lhs :=
+      var d := m == n;  // fine, since d is implicitly ghost
+      0;
+
+    ghost var ghostLhs;
+    ghostLhs :=
+      var a := x == y;  // fine
+      0;
+    ghostLhs :=
+      ghost var b := x == y;  // fine
+      0;
+  }
+
+  datatype DatatypeHasMembersToo = Abc | Def {
+    method Test() {
+      var w;
+      w := MustBeNonempty<PossiblyEmpty>();  // error
+      w := MustBeAutoInit<PossiblyEmpty>();  // error
+      w := MustBeAutoInit<Nonempty>();  // error
+      w := MustSupportEquality<NoEquality>();  // error
+      w := NoReferences<Class?>();  // error
+    }
+  }
+
+  newtype NewtypeHasMembersToo = x: int | x == MustBeNonempty<PossiblyEmpty>()  // error: constraint has bad type instantiation
+    witness MustBeNonempty<PossiblyEmpty>()  // error: witness expression has bad type instantiation
+  {
+    method Test() {
+      var w;
+      w := MustBeNonempty<PossiblyEmpty>();  // error
+      w := MustBeAutoInit<PossiblyEmpty>();  // error
+      w := MustBeAutoInit<Nonempty>();  // error
+      w := MustSupportEquality<NoEquality>();  // error
+      w := NoReferences<Class?>();  // error
+    }
+  }
+
+  type SubsetTypeHasExpressionToo = x: int | x == MustBeNonempty<PossiblyEmpty>()  // error: constraint has bad type instantiation
+    witness MustBeNonempty<PossiblyEmpty>()  // error: witness expression has bad type instantiation
+
+  newtype NT_CompiledWitness = x | 0 <= x
+    witness MustSupportEquality<NoEquality>()  // error
+  newtype NT_GhostWitness = x | 0 <= x
+    ghost witness MustSupportEquality<NoEquality>()  // fine, since it's ghost
+  type ST_CompiledWitness = x | 0 <= x
+    witness MustSupportEquality<NoEquality>()  // error
+  type ST_GhostWitness = x | 0 <= x
+    ghost witness MustSupportEquality<NoEquality>()  // fine, since it's ghost
+
+  trait
+    {:MyAttribute MustSupportEquality<NoEquality>(), MustBeNonempty<PossiblyEmpty>()}  // error: about MustBeNonempty (no prob with (==))
+    MyTrait
+  {
+    const x := (CallMyLemma(MustSupportEquality<NoEquality>(), MustBeNonempty<PossiblyEmpty>()); 23)  // error: about MustBeNonempty (no prob with (==))
+  }
+  lemma CallMyLemma(x: int, y: int)
+}
+
+module MoreAutoGhostTests {
+  datatype Quad<T, U> = Quad(0: T, 1: T, ghost 2: U, ghost 3: U)
+
+  method SomeLetVarsAreGhost0(q: Quad<int, int>) returns (r: int) {
+    r :=
+      var Quad(k, l, m, n) := q;  // k,l are compiled; m,n are ghost
+      k + l;
+  }
+
+  method SomeLetVarsAreGhost1(q: Quad<int, int>) returns (r: int) {
+    r :=
+      var Quad(k, l, m, n) := q;  // k,l are compiled; m,n are ghost
+      m;  // error: m is ghost
+  }
+
+  method AssignSuchThat(ghost m: int) {
+    var d :| d == m;  // error: LHS is not inferred to be ghost for :|
+  }
+
+  function LetSuchThat(ghost m: int): int {
+    var d :| d == m;  // error: LHS is not inferred to be ghost for :|
+    0
+  }
+}
+
+module RelaxedAutoInitChecking {
+  // In a ghost context, the (==) is never relevant. Therefore, checking of adherence to (==) for
+  // type arguments is suppressed in ghost contexts.
+  // Similarly, in a ghost context, there's no difference between (0) and (00). Therefore, a
+  // formal parameter that expects (0) can take either a (0) or a (00) in a ghost context.
+
+  function MustBeNonempty<T(00)>(): int { 5 }
+  function MustBeAutoInit<T(0)>(): int { 5 }
+  function MustSupportEquality<T(==)>(): int { 5 }
+  function NoReferences<T(!new)>(): int { 5 }
+
+  type PossiblyEmpty = x: int | true witness *
+  type Nonempty = x: int | true ghost witness 0
+  datatype NoEquality = NoEquality(ghost u: int)
+  class Class { }
+  type Good = bool
+
+  method M(compiledValue: int, ghost ghostValue: int)
+
+  method TestCompiled()
+  {
+    M(MustBeNonempty<PossiblyEmpty>(), 0);  // error
+    M(MustBeNonempty<Nonempty>(), 0);
+    M(MustBeNonempty<NoEquality>(), 0);
+    M(MustBeNonempty<Class?>(), 0);
+    M(MustBeNonempty<Good>(), 0);
+
+    M(MustBeAutoInit<PossiblyEmpty>(), 0);  // error
+    M(MustBeAutoInit<Nonempty>(), 0);  // error
+    M(MustBeAutoInit<NoEquality>(), 0);
+    M(MustBeAutoInit<Class?>(), 0);
+    M(MustBeAutoInit<Good>(), 0);
+
+    M(MustSupportEquality<PossiblyEmpty>(), 0);
+    M(MustSupportEquality<Nonempty>(), 0);
+    M(MustSupportEquality<NoEquality>(), 0);  // error
+    M(MustSupportEquality<Class?>(), 0);
+    M(MustSupportEquality<Good>(), 0);
+
+    M(NoReferences<PossiblyEmpty>(), 0);
+    M(NoReferences<Nonempty>(), 0);
+    M(NoReferences<NoEquality>(), 0);
+    M(NoReferences<Class?>(), 0);  // error
+    M(NoReferences<Good>(), 0);
+  }
+
+  method TestGhost()
+  {
+    M(0, MustBeNonempty<PossiblyEmpty>());  // error
+    M(0, MustBeNonempty<Nonempty>());
+    M(0, MustBeNonempty<NoEquality>());
+    M(0, MustBeNonempty<Class?>());
+    M(0, MustBeNonempty<Good>());
+
+    M(0, MustBeAutoInit<PossiblyEmpty>());  // error
+    M(0, MustBeAutoInit<Nonempty>());  // this is fine in a ghost context
+    M(0, MustBeAutoInit<NoEquality>());
+    M(0, MustBeAutoInit<Class?>());
+    M(0, MustBeAutoInit<Good>());
+
+    M(0, MustSupportEquality<PossiblyEmpty>());
+    M(0, MustSupportEquality<Nonempty>());
+    M(0, MustSupportEquality<NoEquality>());  // this is fine in a ghost context
+    M(0, MustSupportEquality<Class?>());
+    M(0, MustSupportEquality<Good>());
+
+    M(0, NoReferences<PossiblyEmpty>());
+    M(0, NoReferences<Nonempty>());
+    M(0, NoReferences<NoEquality>());
+    M(0, NoReferences<Class?>());  // error
+    M(0, NoReferences<Good>());
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors7.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors7.dfy.expect
new file mode 100644
index 00000000000..7624fc3e4c3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors7.dfy.expect
@@ -0,0 +1,74 @@
+ResolutionErrors7.dfy(16,22): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors7.dfy(17,23): Error: a call to a ghost predicate is allowed only in specification contexts (consider declaring the predicate without the 'ghost' keyword)
+ResolutionErrors7.dfy(18,23): Error: a call to a least predicate is allowed only in specification contexts
+ResolutionErrors7.dfy(19,26): Error: a call to a greatest predicate is allowed only in specification contexts
+ResolutionErrors7.dfy(20,20): Error: a call to a twostate function is allowed only in specification contexts
+ResolutionErrors7.dfy(21,21): Error: a call to a twostate predicate is allowed only in specification contexts
+ResolutionErrors7.dfy(38,9): Error: function 'F0' expects 0 type arguments (got 1)
+ResolutionErrors7.dfy(40,9): Error: function 'F2' expects 2 type arguments (got 1)
+ResolutionErrors7.dfy(41,9): Error: function 'F0' expects 0 type arguments (got 2)
+ResolutionErrors7.dfy(42,9): Error: function 'F1' expects 1 type argument (got 2)
+ResolutionErrors7.dfy(50,4): Error: method 'M0' expects 0 type arguments (got 1)
+ResolutionErrors7.dfy(52,4): Error: method 'M2' expects 2 type arguments (got 1)
+ResolutionErrors7.dfy(53,4): Error: method 'M0' expects 0 type arguments (got 2)
+ResolutionErrors7.dfy(54,4): Error: method 'M1' expects 1 type argument (got 2)
+ResolutionErrors7.dfy(67,10): Error: ghost variables such as c are allowed only in specification contexts. c was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(71,14): Error: ghost variables such as t are allowed only in specification contexts. t was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(76,10): Error: ghost variables such as a' are allowed only in specification contexts. a' was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(77,10): Error: ghost variables such as c' are allowed only in specification contexts. c' was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(101,38): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(106,26): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got Z) (perhaps try declaring type parameter 'Z' on line 97 as 'Z(00)', which says it can only be instantiated with a nonempty type)
+ResolutionErrors7.dfy(108,38): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(109,33): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
+ResolutionErrors7.dfy(113,26): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Z) (perhaps try declaring type parameter 'Z' on line 97 as 'Z(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors7.dfy(117,40): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(120,31): Error: type parameter (T) passed to function MustSupportEquality must support equality (got Z) (perhaps try declaring type parameter 'Z' on line 97 as 'Z(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(125,29): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+ResolutionErrors7.dfy(127,24): Error: type parameter (T) passed to function NoReferences must contain no references (got Z) (perhaps try declaring type parameter 'Z' on line 97 as 'Z(!new)', which says it can only be instantiated with a type that contains no references)
+ResolutionErrors7.dfy(134,38): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(140,38): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(155,29): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+ResolutionErrors7.dfy(165,12): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 163 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(167,7): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 163 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(170,30): Error: type parameter (T) passed to function GetInt must support equality (got NoEquality)
+ResolutionErrors7.dfy(172,25): Error: type parameter (T) passed to function GetInt must support equality (got NoEquality)
+ResolutionErrors7.dfy(175,37): Error: type parameter (T) passed to function GetInt must support equality (got NoEquality)
+ResolutionErrors7.dfy(183,13): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(188,13): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(190,23): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(192,14): Error: type parameter 0 (T) passed to type QuadEq must support equality (got seq<T>) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(192,14): Error: type parameter 0 (T) passed to type QuadEq must support equality (got seq<T>) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(193,15): Error: type parameter 1 (U) passed to type QuadEq must support equality (got seq<T>) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(193,15): Error: type parameter 1 (U) passed to type QuadEq must support equality (got seq<T>) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(202,15): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 199 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(211,15): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 199 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(229,40): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(230,40): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(231,35): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
+ResolutionErrors7.dfy(232,42): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(233,31): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+ResolutionErrors7.dfy(237,76): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(238,41): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(242,40): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(243,40): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(244,35): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
+ResolutionErrors7.dfy(245,42): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(246,31): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+ResolutionErrors7.dfy(250,79): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(251,41): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(254,43): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(258,43): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(263,82): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(266,92): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(283,6): Error: ghost variables such as m are allowed only in specification contexts. m was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(287,8): Error: non-ghost variable cannot be assigned a value that depends on a ghost
+ResolutionErrors7.dfy(291,18): Error: ghost variables such as m are allowed only in specification contexts. m was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(317,35): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(323,35): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(324,30): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
+ResolutionErrors7.dfy(331,37): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(338,26): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+ResolutionErrors7.dfy(344,38): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(350,38): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(365,29): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+73 resolution/type errors detected in ResolutionErrors7.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors7.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors7.dfy.refresh.expect
new file mode 100644
index 00000000000..7624fc3e4c3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors7.dfy.refresh.expect
@@ -0,0 +1,74 @@
+ResolutionErrors7.dfy(16,22): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
+ResolutionErrors7.dfy(17,23): Error: a call to a ghost predicate is allowed only in specification contexts (consider declaring the predicate without the 'ghost' keyword)
+ResolutionErrors7.dfy(18,23): Error: a call to a least predicate is allowed only in specification contexts
+ResolutionErrors7.dfy(19,26): Error: a call to a greatest predicate is allowed only in specification contexts
+ResolutionErrors7.dfy(20,20): Error: a call to a twostate function is allowed only in specification contexts
+ResolutionErrors7.dfy(21,21): Error: a call to a twostate predicate is allowed only in specification contexts
+ResolutionErrors7.dfy(38,9): Error: function 'F0' expects 0 type arguments (got 1)
+ResolutionErrors7.dfy(40,9): Error: function 'F2' expects 2 type arguments (got 1)
+ResolutionErrors7.dfy(41,9): Error: function 'F0' expects 0 type arguments (got 2)
+ResolutionErrors7.dfy(42,9): Error: function 'F1' expects 1 type argument (got 2)
+ResolutionErrors7.dfy(50,4): Error: method 'M0' expects 0 type arguments (got 1)
+ResolutionErrors7.dfy(52,4): Error: method 'M2' expects 2 type arguments (got 1)
+ResolutionErrors7.dfy(53,4): Error: method 'M0' expects 0 type arguments (got 2)
+ResolutionErrors7.dfy(54,4): Error: method 'M1' expects 1 type argument (got 2)
+ResolutionErrors7.dfy(67,10): Error: ghost variables such as c are allowed only in specification contexts. c was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(71,14): Error: ghost variables such as t are allowed only in specification contexts. t was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(76,10): Error: ghost variables such as a' are allowed only in specification contexts. a' was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(77,10): Error: ghost variables such as c' are allowed only in specification contexts. c' was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(101,38): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(106,26): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got Z) (perhaps try declaring type parameter 'Z' on line 97 as 'Z(00)', which says it can only be instantiated with a nonempty type)
+ResolutionErrors7.dfy(108,38): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(109,33): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
+ResolutionErrors7.dfy(113,26): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Z) (perhaps try declaring type parameter 'Z' on line 97 as 'Z(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors7.dfy(117,40): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(120,31): Error: type parameter (T) passed to function MustSupportEquality must support equality (got Z) (perhaps try declaring type parameter 'Z' on line 97 as 'Z(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(125,29): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+ResolutionErrors7.dfy(127,24): Error: type parameter (T) passed to function NoReferences must contain no references (got Z) (perhaps try declaring type parameter 'Z' on line 97 as 'Z(!new)', which says it can only be instantiated with a type that contains no references)
+ResolutionErrors7.dfy(134,38): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(140,38): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(155,29): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+ResolutionErrors7.dfy(165,12): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 163 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(167,7): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 163 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(170,30): Error: type parameter (T) passed to function GetInt must support equality (got NoEquality)
+ResolutionErrors7.dfy(172,25): Error: type parameter (T) passed to function GetInt must support equality (got NoEquality)
+ResolutionErrors7.dfy(175,37): Error: type parameter (T) passed to function GetInt must support equality (got NoEquality)
+ResolutionErrors7.dfy(183,13): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(188,13): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(190,23): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(192,14): Error: type parameter 0 (T) passed to type QuadEq must support equality (got seq<T>) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(192,14): Error: type parameter 0 (T) passed to type QuadEq must support equality (got seq<T>) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(193,15): Error: type parameter 1 (U) passed to type QuadEq must support equality (got seq<T>) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(193,15): Error: type parameter 1 (U) passed to type QuadEq must support equality (got seq<T>) (perhaps try declaring type parameter 'T' on line 182 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(202,15): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 199 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(211,15): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 199 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+ResolutionErrors7.dfy(229,40): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(230,40): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(231,35): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
+ResolutionErrors7.dfy(232,42): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(233,31): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+ResolutionErrors7.dfy(237,76): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(238,41): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(242,40): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(243,40): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(244,35): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
+ResolutionErrors7.dfy(245,42): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(246,31): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+ResolutionErrors7.dfy(250,79): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(251,41): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(254,43): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(258,43): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(263,82): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(266,92): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(283,6): Error: ghost variables such as m are allowed only in specification contexts. m was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(287,8): Error: non-ghost variable cannot be assigned a value that depends on a ghost
+ResolutionErrors7.dfy(291,18): Error: ghost variables such as m are allowed only in specification contexts. m was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors7.dfy(317,35): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(323,35): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(324,30): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
+ResolutionErrors7.dfy(331,37): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
+ResolutionErrors7.dfy(338,26): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+ResolutionErrors7.dfy(344,38): Error: type parameter (T) passed to function MustBeNonempty must be nonempty (got PossiblyEmpty)
+ResolutionErrors7.dfy(350,38): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
+ResolutionErrors7.dfy(365,29): Error: type parameter (T) passed to function NoReferences must contain no references (got Class?)
+73 resolution/type errors detected in ResolutionErrors7.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors8.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors8.dfy
new file mode 100644
index 00000000000..b904094f3c3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors8.dfy
@@ -0,0 +1,462 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+// --------------- let-such-that ghost regressions ------------------------------
+
+module LetSuchThatGhost {
+  ghost predicate True<T>(t: T) { true }
+
+  function F<T>(s: set<T>): int
+    requires s != {}
+  {
+    // once, the RHS for p was (bogusly) considered ghost, which made p ghost,
+    // which made this body illegal
+    var p :=
+      var e :| e in s;
+      true;
+    if p then 6 else 8
+  }
+
+  function G<T>(s: set<T>): int
+    requires s != {}
+  {
+    // again, e and p are both non-ghost
+    var p :=
+      var e :| e in s;
+      e == e;
+    if p then 6 else 8
+  }
+
+  function H<T>(s: set<T>): int
+    requires s != {}
+  {
+    // here, e is ghost, but p is still not
+    var p :=
+      var e :| e in s && True(e);
+      true;
+    if p then 6 else 8
+  }
+
+  function I<T>(s: set<T>): int
+    requires s != {}
+  {
+    // here, e is ghost, and therefore so is p
+    var p :=
+      var e :| e in s && True(e);
+      e == e;
+    if p then 6 else 8  // error: p is ghost
+  }
+}
+
+// --------------- hint restrictions in non-while loops ------------------------------
+
+module HintRestrictionsOtherLoops {
+  class C {
+    ghost function F(): int
+    {
+      calc {
+        6;
+        { var x := 8;
+          while
+            modifies this  // error: cannot use a modifies clause on a loop inside a hint
+          {
+            case x != 0 => x := x - 1;
+          }
+        }
+        6;
+        { for i := 0 to 8
+            modifies this  // error: cannot use a modifies clause on a loop inside a hint
+          {
+          }
+        }
+        6;
+      }
+      5
+    }
+  }
+}
+
+// --------------- regressions: types of arguments to fresh, unchanged, modifies, reads ------------------------------
+
+module FrameTypes {
+  // ----- fresh takes an expression as its argument
+
+  method FreshArgumentType0(
+    o: object,
+    s: set<object>, ss: iset<object>,
+    q: seq<object>,
+    ms: multiset<object>,
+    mp: map<object, int>, mp2: map<int, object>,
+    im: imap<object, object>)
+  {
+    ghost var b;
+    b := fresh(o);
+    b := fresh(s);
+    b := fresh(ss);
+    b := fresh(q);
+    b := fresh(ms); // error: wrong argument type for fresh
+    b := fresh(mp); // error: wrong argument type for fresh
+    b := fresh(mp2); // error: wrong argument type for fresh
+    b := fresh(im); // error: wrong argument type for fresh
+  }
+
+  method FreshArgumentType1(x: int, s: set<bool>, ss: iset<bv8>, q: seq<int>) {
+    ghost var b;
+    b := fresh(x); // error: wrong argument type for fresh
+    b := fresh(s); // error: wrong argument type for fresh
+    b := fresh(ss); // error: wrong argument type for fresh
+    b := fresh(q); // error: wrong argument type for fresh
+  }
+
+  method FreshArgumentType2(f: int -> int, g: int -> object, h: int -> set<object>, i: int -> iset<object>, j: int -> seq<object>, k: set<object> -> int) {
+    ghost var b;
+    b := fresh(f); // error: wrong argument type for fresh
+    b := fresh(g); // error: wrong argument type for fresh
+    b := fresh(h); // error: wrong argument type for fresh
+    b := fresh(j); // error: wrong argument type for fresh
+    b := fresh(k); // error: wrong argument type for fresh
+  }
+
+  // ----- unchanged, modifies, and reads take frame expressions as their arguments
+
+  method UnchangedArgumentType0(
+    o: object,
+    s: set<object>, ss: iset<object>,
+    q: seq<object>,
+    ms: multiset<object>,
+    mp: map<object, int>, mp2: map<int, object>,
+    im: imap<object, object>)
+  {
+    ghost var b;
+    b := unchanged(o);
+    b := unchanged(s);
+    b := unchanged(ss);
+    b := unchanged(q);
+    b := unchanged(ms);
+    b := unchanged(mp); // error: wrong argument type for unchanged
+    b := unchanged(mp2); // error: wrong argument type for unchanged
+    b := unchanged(im); // error: wrong argument type for unchanged
+  }
+
+  method UnchangedArgumentType1(x: int, s: set<bool>, ss: iset<bv8>, q: seq<int>) {
+    ghost var b;
+    b := unchanged(x); // error: wrong argument type for unchanged
+    b := unchanged(s); // error: wrong argument type for unchanged
+    b := unchanged(ss); // error: wrong argument type for unchanged
+    b := unchanged(q); // error: wrong argument type for unchanged
+  }
+
+  method UnchangedArgumentType2(
+    f: int -> int,
+    g: int -> object, h: int -> set<object>, i: int -> iset<object>, j: int -> seq<object>, k: set<object> -> int,
+    l: bool -> multiset<object>, m: bool -> map<object, object>)
+  {
+    ghost var b;
+    b := unchanged(f); // error: wrong argument type for unchanged
+    b := unchanged(g); // error: wrong argument type for unchanged
+    b := unchanged(h); // error: wrong argument type for unchanged
+    b := unchanged(i); // error: wrong argument type for unchanged
+    b := unchanged(j); // error: wrong argument type for unchanged
+    b := unchanged(k); // error: wrong argument type for unchanged
+    b := unchanged(l); // error: wrong argument type for unchanged
+    b := unchanged(m); // error: wrong argument type for unchanged
+  }
+
+  method ModifiesArgumentType0(
+    o: object,
+    s: set<object>, ss: iset<object>,
+    q: seq<object>,
+    ms: multiset<object>,
+    mp: map<object, int>, mp2: map<int, object>,
+    im: imap<object, object>)
+    modifies o
+    modifies s
+    modifies ss
+    modifies q
+    modifies ms
+    modifies mp // error: wrong argument type for modifies
+    modifies mp2 // error: wrong argument type for modifies
+    modifies im // error: wrong argument type for modifies
+  {
+  }
+
+  method ModifiesArgumentType1(x: int, s: set<bool>, ss: iset<bv8>, q: seq<int>)
+    modifies x // error: wrong argument type for modifies
+    modifies s // error: wrong argument type for modifies
+    modifies ss // error: wrong argument type for modifies
+    modifies q // error: wrong argument type for modifies
+  {
+  }
+
+  method ModifiesArgumentType2(
+    f: int -> int,
+    g: int -> object, h: int -> set<object>, i: int -> iset<object>, j: int -> seq<object>, k: set<object> -> int,
+    l: bool -> multiset<object>, m: bool -> map<object, object>)
+    modifies f // error: wrong argument type for modifies
+    modifies g // error: wrong argument type for modifies
+    modifies h // error: wrong argument type for modifies
+    modifies i // error: wrong argument type for modifies
+    modifies j // error: wrong argument type for modifies
+    modifies k // error: wrong argument type for modifies
+    modifies l // error: wrong argument type for modifies
+    modifies m // error: wrong argument type for modifies
+  {
+  }
+
+  ghost predicate ReadsArgumentType0(
+    o: object,
+    s: set<object>, ss: iset<object>,
+    q: seq<object>,
+    ms: multiset<object>,
+    mp: map<object, int>, mp2: map<int, object>,
+    im: imap<object, object>)
+    reads o
+    reads s
+    reads ss
+    reads q
+    reads ms
+    reads mp // error: wrong argument type for reads
+    reads mp2 // error: wrong argument type for reads
+    reads im // error: wrong argument type for reads
+  {
+    true
+  }
+
+  ghost predicate ReadsArgumentType1(x: int, s: set<bool>, ss: iset<bv8>, q: seq<int>)
+    reads x // error: wrong argument type for reads
+    reads s // error: wrong argument type for reads
+    reads ss // error: wrong argument type for reads
+    reads q // error: wrong argument type for reads
+  {
+    true
+  }
+
+  ghost predicate ReadsArgumentType2(
+    f: int -> int,
+    g: int -> object, h: int -> set<object>, i: int -> iset<object>, j: int -> seq<object>, k: set<object> -> int,
+    l: bool -> multiset<object>, m: bool -> map<object, object>)
+    reads f // error: wrong argument type for reads
+    reads g // error: a function must be to a collection of references
+    reads h
+    reads i
+    reads j
+    reads k // error: wrong argument type for reads
+    reads l
+    reads m // error: wrong argument type for reads
+  {
+    true
+  }
+}
+
+module Continue0 {
+  method BadTargetsLevels(a: int, b: int, c: int) {
+    for i := 0 to 100 {
+      for j := 0 to 100 {
+        for k := 0 to 100 {
+          if
+          case k == a =>
+            continue;
+          case k == b =>
+            break continue;
+          case k == c =>
+            break break continue;
+          case k == a + b + c =>
+            break break break continue; // error: too many levels
+        }
+      }
+    }
+  }
+
+  method BadTargetsLabels(a: int, b: int, c: int) {
+    label A:
+    for i := 0 to 100 {
+      label B0: label B1:
+      for j := 0 to 100 {
+        label C:
+        for k := 0 to 100 {
+          if
+          case k == a =>
+            continue C;
+          case k == b =>
+            continue B0;
+          case k == b =>
+            continue B1;
+          case k == c =>
+            continue A;
+        }
+      }
+    }
+  }
+
+  method NonLoopLabels(a: int, b: int, c: int) {
+    // the following labels are attached to BlockStmt's, not loops
+    label X: {
+      for i := 0 to 100 {
+        label Y0: label Y1: {
+          for j := 0 to 100 {
+            label Z: {
+              for k := 0 to 100 {
+                if
+                case k == a =>
+                  continue X; // error: X is not a loop label
+                case k == b =>
+                  continue Y0; // error: Y0 is not a loop label
+                case k == b =>
+                  continue Y1; // error: Y1 is not a loop label
+                case k == c =>
+                  continue Z; // error: Z is not a loop label
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  method SimpleBadJumps0() {
+    break; // error: cannot "break" from here
+  }
+
+  method SimpleBadJumps1() {
+    continue; // error: cannot "continue" from here
+  }
+
+  method SimpleBadJumps2() {
+    label X: {
+      if
+      case true => break; // error: cannot "break" from here
+      case true => continue; // error: cannot "continue" from here
+      case true => break X;
+      case true => continue X; // error: X is not a loop label
+    }
+  }
+
+  method GhostContinueAssertBy(ghost t: int, ghost u: nat)
+  {
+    label L:
+    for i := 0 to 100 {
+      assert true by {
+        for j := 0 to 100 {
+          if j == t {
+            break;
+          } else if j == u {
+            continue;
+          }
+        }
+        if
+        case true => break; // error: cannot jump outside the assert-by
+        case true => continue; // error: cannot jump outside the assert-by
+        case true => break L; // error: cannot jump outside the assert-by
+        case true => continue L; // error: cannot jump outside the assert-by
+      }
+    }
+  }
+}
+
+module Continue1 {
+  method GhostContinueLevels(ghost t: int, ghost u: nat)
+  {
+    var m := 0;
+    for i := 0 to 100 {
+      if i == t {
+        // The following "continue" would pass the increment to m
+        continue; // error: continue from ghost context must target a ghost loop
+      }
+      m := m + 1;
+    }
+
+    for i := 0 to 100 {
+      m := m + 1;
+      // The following "break" would potentially pass both increments to m
+      if i == t {
+        break; // error: break from ghost context must target a ghost loop
+      }
+      m := m + 1;
+    }
+
+    for i := 0 to 100 {
+      if i == t {
+        // Even though there's no statement in the loop body after this ghost if, the continue violates the rule
+        continue; // error: continue from ghost context must target a ghost loop
+      }
+    }
+
+    for i := 0 to 100 {
+      for j := 0 to u {
+        if i == t {
+          continue; // fine
+        }
+      }
+    }
+
+    for i := 0 to 100 {
+      for j := 0 to u {
+        if i == t {
+          break continue; // error: continue from ghost context must target a ghost loop
+        }
+      }
+    }
+
+    for i := 0 to 100 + u {
+      for j := 0 to u {
+        if i == t {
+          break continue; // fine
+        }
+      }
+    }
+  }
+
+  method GhostContinueLabels(ghost t: int, ghost u: nat)
+  {
+    label Outer:
+    for i := 0 to 100 {
+      label Inner:
+      for j := 0 to u {
+        if j == t {
+          continue Inner; // fine
+        } else if j == 20 + t {
+          continue Outer; // error: continue from ghost context must target a ghost loop
+        }
+      }
+    }
+  }
+}
+
+module LabelRegressions {
+  // The cases of if-case, while-case, and match statements are List<Statement>'s, which are essentially
+  // a BlockStmt but without the curly braces. Each Statement in such a List can have labels, so
+  // it's important to ResolveStatementWithLabels, not ResolveStatement. Alas, that was once not the
+  // case (pun intended).
+  // There's also something analogous going on in the Verifier, where lists of statements should call
+  // TrStmtList, not just call TrStmt on every Statement in the List. (See method LabelRegressions()
+  // in Test/comp/ForLoops-Compilation.dfy.)
+  method IfCaseRegression() {
+    if
+    case true =>
+      label Loop:
+      for k := 0 to 10 {
+        continue Loop;
+        break Loop;
+      }
+  }
+
+  method WhileCaseRegression() {
+    while
+    case true =>
+      label Loop:
+      for k := 0 to 10 {
+        continue Loop;
+        break Loop;
+      }
+  }
+
+  method Match() {
+    match (0, 0)
+    case (_, _) =>
+      label Loop:
+      for k := 0 to 10 {
+        break Loop;
+        continue Loop;
+      }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors8.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors8.dfy.expect
new file mode 100644
index 00000000000..9f4af2e8871
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors8.dfy.expect
@@ -0,0 +1,77 @@
+ResolutionErrors8.dfy(47,7): Error: ghost variables such as p are allowed only in specification contexts. p was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors8.dfy(61,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
+ResolutionErrors8.dfy(68,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
+ResolutionErrors8.dfy(97,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got multiset<object>)
+ResolutionErrors8.dfy(98,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got map<object, int>)
+ResolutionErrors8.dfy(99,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got map<int, object>)
+ResolutionErrors8.dfy(100,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got imap<object, object>)
+ResolutionErrors8.dfy(105,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int)
+ResolutionErrors8.dfy(106,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got set<bool>)
+ResolutionErrors8.dfy(107,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got iset<bv8>)
+ResolutionErrors8.dfy(108,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got seq<int>)
+ResolutionErrors8.dfy(113,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> int)
+ResolutionErrors8.dfy(114,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> object)
+ResolutionErrors8.dfy(115,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> set<object>)
+ResolutionErrors8.dfy(116,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> seq<object>)
+ResolutionErrors8.dfy(117,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got set<object> -> int)
+ResolutionErrors8.dfy(136,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got map<object, int>)
+ResolutionErrors8.dfy(137,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got map<int, object>)
+ResolutionErrors8.dfy(138,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got imap<object, object>)
+ResolutionErrors8.dfy(143,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int)
+ResolutionErrors8.dfy(144,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got set<bool>)
+ResolutionErrors8.dfy(145,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got iset<bv8>)
+ResolutionErrors8.dfy(146,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got seq<int>)
+ResolutionErrors8.dfy(155,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> int)
+ResolutionErrors8.dfy(156,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> object)
+ResolutionErrors8.dfy(157,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> set<object>)
+ResolutionErrors8.dfy(158,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> iset<object>)
+ResolutionErrors8.dfy(159,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> seq<object>)
+ResolutionErrors8.dfy(160,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got set<object> -> int)
+ResolutionErrors8.dfy(161,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> multiset<object>)
+ResolutionErrors8.dfy(162,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> map<object, object>)
+ResolutionErrors8.dfy(177,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got map<object, int>)
+ResolutionErrors8.dfy(178,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got map<int, object>)
+ResolutionErrors8.dfy(179,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got imap<object, object>)
+ResolutionErrors8.dfy(184,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int)
+ResolutionErrors8.dfy(185,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got set<bool>)
+ResolutionErrors8.dfy(186,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got iset<bv8>)
+ResolutionErrors8.dfy(187,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got seq<int>)
+ResolutionErrors8.dfy(195,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> int)
+ResolutionErrors8.dfy(196,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> object)
+ResolutionErrors8.dfy(197,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> set<object>)
+ResolutionErrors8.dfy(198,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> iset<object>)
+ResolutionErrors8.dfy(199,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> seq<object>)
+ResolutionErrors8.dfy(200,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got set<object> -> int)
+ResolutionErrors8.dfy(201,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> multiset<object>)
+ResolutionErrors8.dfy(202,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> map<object, object>)
+ResolutionErrors8.dfy(218,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got map<object, int>)
+ResolutionErrors8.dfy(219,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got map<int, object>)
+ResolutionErrors8.dfy(220,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got imap<object, object>)
+ResolutionErrors8.dfy(226,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got int)
+ResolutionErrors8.dfy(227,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got set<bool>)
+ResolutionErrors8.dfy(228,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got iset<bv8>)
+ResolutionErrors8.dfy(229,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got seq<int>)
+ResolutionErrors8.dfy(238,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got int -> int)
+ResolutionErrors8.dfy(239,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got int -> object)
+ResolutionErrors8.dfy(243,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got set<object> -> int)
+ResolutionErrors8.dfy(245,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got bool -> map<object, object>)
+ResolutionErrors8.dfy(264,12): Error: a 'break break break continue' statement is allowed only in contexts with 4 enclosing loops, but the current context only has 3
+ResolutionErrors8.dfy(301,27): Error: continue label must designate a loop: X
+ResolutionErrors8.dfy(303,27): Error: continue label must designate a loop: Y0
+ResolutionErrors8.dfy(305,27): Error: continue label must designate a loop: Y1
+ResolutionErrors8.dfy(307,27): Error: continue label must designate a loop: Z
+ResolutionErrors8.dfy(317,4): Error: a non-labeled 'break' statement is allowed only in loops
+ResolutionErrors8.dfy(321,4): Error: a non-labeled 'continue' statement is allowed only in loops
+ResolutionErrors8.dfy(327,19): Error: a non-labeled 'break' statement is allowed only in loops
+ResolutionErrors8.dfy(328,19): Error: a non-labeled 'continue' statement is allowed only in loops
+ResolutionErrors8.dfy(330,28): Error: continue label must designate a loop: X
+ResolutionErrors8.dfy(347,21): Error: a non-labeled 'break' statement is allowed only in loops
+ResolutionErrors8.dfy(348,21): Error: a non-labeled 'continue' statement is allowed only in loops
+ResolutionErrors8.dfy(349,27): Error: break label is undefined or not in scope: L
+ResolutionErrors8.dfy(350,30): Error: continue label is undefined or not in scope: L
+ResolutionErrors8.dfy(363,8): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
+ResolutionErrors8.dfy(372,8): Error: ghost-context break statement is not allowed to break out of non-ghost loop
+ResolutionErrors8.dfy(380,8): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
+ResolutionErrors8.dfy(395,10): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
+ResolutionErrors8.dfy(418,10): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
+76 resolution/type errors detected in ResolutionErrors8.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors8.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors8.dfy.refresh.expect
new file mode 100644
index 00000000000..8f3e096dc90
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors8.dfy.refresh.expect
@@ -0,0 +1,77 @@
+ResolutionErrors8.dfy(47,7): Error: ghost variables such as p are allowed only in specification contexts. p was inferred to be ghost based on its declaration or initialization.
+ResolutionErrors8.dfy(61,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
+ResolutionErrors8.dfy(68,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
+ResolutionErrors8.dfy(97,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got multiset<object>)
+ResolutionErrors8.dfy(98,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got map<object, int>)
+ResolutionErrors8.dfy(99,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got map<int, object>)
+ResolutionErrors8.dfy(100,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got imap<object, object>)
+ResolutionErrors8.dfy(105,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int)
+ResolutionErrors8.dfy(106,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got set<bool>)
+ResolutionErrors8.dfy(107,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got iset<bv8>)
+ResolutionErrors8.dfy(108,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got seq<int>)
+ResolutionErrors8.dfy(113,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> int)
+ResolutionErrors8.dfy(114,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> object)
+ResolutionErrors8.dfy(115,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> set<object>)
+ResolutionErrors8.dfy(116,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> seq<object>)
+ResolutionErrors8.dfy(117,15): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got set<object> -> int)
+ResolutionErrors8.dfy(136,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got map<object, int>)
+ResolutionErrors8.dfy(137,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got map<int, object>)
+ResolutionErrors8.dfy(138,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got imap<object, object>)
+ResolutionErrors8.dfy(143,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int)
+ResolutionErrors8.dfy(144,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got set<bool>)
+ResolutionErrors8.dfy(145,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got iset<bv8>)
+ResolutionErrors8.dfy(146,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got seq<int>)
+ResolutionErrors8.dfy(155,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> int)
+ResolutionErrors8.dfy(156,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> object)
+ResolutionErrors8.dfy(157,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> set<object>)
+ResolutionErrors8.dfy(158,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> iset<object>)
+ResolutionErrors8.dfy(159,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> seq<object>)
+ResolutionErrors8.dfy(160,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got set<object> -> int)
+ResolutionErrors8.dfy(161,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> multiset<object>)
+ResolutionErrors8.dfy(162,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> map<object, object>)
+ResolutionErrors8.dfy(177,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got map<object, int>)
+ResolutionErrors8.dfy(178,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got map<int, object>)
+ResolutionErrors8.dfy(179,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got imap<object, object>)
+ResolutionErrors8.dfy(184,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int)
+ResolutionErrors8.dfy(185,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got set<bool>)
+ResolutionErrors8.dfy(186,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got iset<bv8>)
+ResolutionErrors8.dfy(187,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got seq<int>)
+ResolutionErrors8.dfy(195,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> int)
+ResolutionErrors8.dfy(196,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> object)
+ResolutionErrors8.dfy(197,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> set<object>)
+ResolutionErrors8.dfy(198,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> iset<object>)
+ResolutionErrors8.dfy(199,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> seq<object>)
+ResolutionErrors8.dfy(200,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got set<object> -> int)
+ResolutionErrors8.dfy(201,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> multiset<object>)
+ResolutionErrors8.dfy(202,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> map<object, object>)
+ResolutionErrors8.dfy(218,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got map<object, int>)
+ResolutionErrors8.dfy(219,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got map<int, object>)
+ResolutionErrors8.dfy(220,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got imap<object, object>)
+ResolutionErrors8.dfy(226,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got int)
+ResolutionErrors8.dfy(227,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got set<bool>)
+ResolutionErrors8.dfy(228,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got iset<bv8>)
+ResolutionErrors8.dfy(229,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got seq<int>)
+ResolutionErrors8.dfy(238,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got int -> int)
+ResolutionErrors8.dfy(239,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got int -> object)
+ResolutionErrors8.dfy(243,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got set<object> -> int)
+ResolutionErrors8.dfy(245,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got bool -> map<object, object>)
+ResolutionErrors8.dfy(264,12): Error: a 'break break break continue' statement is allowed only in contexts with 4 enclosing loops, but the current context only has 3
+ResolutionErrors8.dfy(301,27): Error: continue label must designate a loop: X
+ResolutionErrors8.dfy(303,27): Error: continue label must designate a loop: Y0
+ResolutionErrors8.dfy(305,27): Error: continue label must designate a loop: Y1
+ResolutionErrors8.dfy(307,27): Error: continue label must designate a loop: Z
+ResolutionErrors8.dfy(317,4): Error: a non-labeled 'break' statement is allowed only in loops
+ResolutionErrors8.dfy(321,4): Error: a non-labeled 'continue' statement is allowed only in loops
+ResolutionErrors8.dfy(327,19): Error: a non-labeled 'break' statement is allowed only in loops
+ResolutionErrors8.dfy(328,19): Error: a non-labeled 'continue' statement is allowed only in loops
+ResolutionErrors8.dfy(330,28): Error: continue label must designate a loop: X
+ResolutionErrors8.dfy(347,21): Error: a non-labeled 'break' statement is allowed only in loops
+ResolutionErrors8.dfy(348,21): Error: a non-labeled 'continue' statement is allowed only in loops
+ResolutionErrors8.dfy(349,27): Error: break label is undefined or not in scope: L
+ResolutionErrors8.dfy(350,30): Error: continue label is undefined or not in scope: L
+ResolutionErrors8.dfy(363,8): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
+ResolutionErrors8.dfy(372,8): Error: ghost-context break statement is not allowed to break out of non-ghost loop
+ResolutionErrors8.dfy(380,8): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
+ResolutionErrors8.dfy(395,10): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
+ResolutionErrors8.dfy(418,10): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
+76 resolution/type errors detected in ResolutionErrors8.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors9.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors9.dfy
new file mode 100644
index 00000000000..6f3bb69b40c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors9.dfy
@@ -0,0 +1,219 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --allow-axioms
+
+
+// --------------- regressions: using "this" in places where there is no enclosing class/type ------------------------------
+
+module UseOfThis {
+  // The following uses of "this." once caused the resolver to crash.
+
+  type {:badUseOfThis this.K} OpaqueType { // error: cannot use "this" here
+    const K: int
+  }
+
+  newtype {:badUseOfThis this.x} Newtype = // error: cannot use "this" here
+    x: int | this.u // error: cannot use "this" here
+    witness this.u // error: cannot use "this" here
+  {
+    const K: int
+  }
+
+  type {:badUseOfThis this.x} SynonymType = int // error: cannot use "this" here
+
+  type {:badUseOfThis this.x} SubsetType = // error: cannot use "this" here
+    x: int | this.u // error: cannot use "this" here
+    witness this.u // error: cannot use "this" here
+
+  trait {:badUseOfThis this.K} MyTrait { // error: cannot use "this" here
+    const K: int
+  }
+
+  class {:badUseOfThis this.M} MyClass { // error: cannot use "this" here
+    const M: int
+
+    var {:goodUseOfThis this.M} I: int
+    const {:goodUseOfThis this.M} J := 3
+    method {:goodUseOfThis this.M} CM()
+      ensures {:goodUseOfThis this.M} true
+    ghost function {:goodUseOfThis this.M} CF(): int
+      ensures {:goodUseOfThis this.M} true
+
+    static const {:badUseOfThis this.M} L := 3 // error: cannot use "this" here
+    static const N := this.M // error: cannot use "this" here
+    static method {:badUseOfThis this.M} SM() // error: cannot use "this" here
+      ensures {:badUseOfThis this.M} true // error: cannot use "this" here
+    static ghost function {:badUseOfThis this.M} SF(): int // error: cannot use "this" here
+      ensures {:badUseOfThis this.M} true // error: cannot use "this" here
+  }
+
+  datatype Datatype =
+    | {:badUseOfThis this.K} DatatypeCtor // error: cannot use "this" here
+  {
+    const K: int
+  }
+}
+
+module AutoInitTypeCheckRegression {
+  codatatype AutoStream<G(0)> = AutoNext(head: G, tail: AutoStream<G>)
+
+  function In<G>(a: AutoStream<G>): int // error: the argument to AutoStream is supposed to be an auto-init type
+  function Out<G>(g: G): AutoStream<G> // error: the argument to AutoStream is supposed to be an auto-init type
+
+  method M<G>(a: AutoStream<G>) // error: the argument to AutoStream is supposed to be an auto-init type
+  method N<G>(g: G) returns (a: AutoStream<G>) // error: the argument to AutoStream is supposed to be an auto-init type
+}
+
+module ClassConstructorTests {
+  class ClassWithConstructor {
+    var y: int
+    method NotTheOne() { }
+    constructor InitA() { }
+    constructor InitB() { y := 20; }
+  }
+
+  class ClassWithoutConstructor {
+    method Init() modifies this { }
+  }
+
+  method ConstructorTests()
+  {
+    var o := new object;  // fine: does not have any constructors
+
+    o := new ClassWithoutConstructor;  // fine: don't need to call any particular method
+    o := new ClassWithoutConstructor.Init();  // this is also fine
+
+    var c := new ClassWithConstructor.InitA();
+    c := new ClassWithConstructor;  // error: must call a constructor
+    c := new ClassWithConstructor.NotTheOne();  // error: must call a constructor, not an arbitrary method
+    c := new ClassWithConstructor.InitB();
+  }
+
+  class Y {
+    var data: int
+    constructor (x: int)
+    {
+      data := x;
+    }
+    method Test() {
+      var i := new Y(5);
+      i := new Y(7);
+      i := new Y;  // error: the class has a constructor, so one must be used
+      var s := new Luci.Init(5);
+      s := new Luci.FromArray(null);
+      s := new Luci(false);
+      s := new Luci(true);
+      s := new Luci.M();  // error: there is a constructor, so one must be called
+      s := new Luci;  // error: there is a constructor, so one must be called
+      var l := new Lamb; // fine, since there are no constructors (only methods)
+      l := new Lamb.Gwen();
+    }
+  }
+
+  class Luci {
+    constructor Init(y: int) { }
+    constructor (nameless: bool) { }
+    constructor FromArray(a: array<int>) { }
+    method M() { }
+  }
+
+  class Lamb {
+    method Jess() { }
+    method Gwen() { }
+  }
+}
+
+module DefaultValues {
+  method Test() {
+    var r := 3 + MyFunction(7);
+  }
+
+  function MyFunction(n: int, acc: int := n * false): int { // note, badly type default-value expression
+    20
+  }
+}
+
+module IndexAdviceTypeRegressions {
+  type BV10 = x: bv10 | x != 999 witness 8
+
+  method Index(s: seq<string>)
+    requires 2 < |s|
+  {
+    var k: bv10 := 2;
+    var a := s[k := "tjena"];
+
+    var K: BV10 := 2;
+    var A := s[K := "tjena"];
+
+    // rely on advice for the type
+    var i;
+    var b := s[i := "tjena"];
+  }
+
+  method Multi(matrix: array2<real>)
+    requires matrix.Length0 == matrix.Length1 == 100
+  {
+    var u := matrix[2, 5];
+    var i := 2;
+    u := matrix[i, 5];
+    var j := 2;
+    u := matrix[j, 5];
+    j := j & j;
+    j := 16 as bv29;
+    // rely on advice for the type
+    var k;
+    u := matrix[k, 5];
+  }
+
+  method Array(arr: array<real>) returns (r: real)
+    requires 10 <= arr.Length
+  {
+    var k: bv10 := 2;
+    r := arr[k];
+    var K: BV10 := 2;
+    r := arr[K];
+  }
+
+  method Seq(s: seq<real>) returns (r: real)
+    requires 10 <= |s|
+  {
+    var k: bv10 := 2;
+    r := s[k];
+    var K: BV10 := 2;
+    r := s[K];
+  }
+
+  method Range(arr: array<real>, s: seq<real>) returns (r: seq<real>)
+    requires 10 <= arr.Length <= |s|
+  {
+    var k: bv10 := 2;
+    var K: BV10 := 4;
+    r := arr[k..K];
+    r := s[k..K];
+    r := arr[k..];
+    r := s[k..];
+    r := arr[..K];
+    r := s[..K];
+
+    // rely on advice for the type
+    var a, b, c, d;
+    r := arr[a..b];
+    r := arr[c..];
+    r := arr[..d];
+    var w, x, y, z;
+    r := s[w..x];
+    r := s[y..];
+    r := s[..z];
+  }
+
+  method Bad(arr: array<real>, s: seq<real>, matrix: array2<real>) returns (r: real, range: seq<real>) {
+    r := arr[2.3]; // error: bad index type
+    r := s[2.3]; // error: bad index type
+    r := matrix[false, 2.3]; // error: bad index type
+
+    range := arr[2.3..3.14]; // error (x2): bad index types
+    range := arr[2.3..]; // error: bad index type
+    range := arr[..3.14]; // error: bad index type
+    range := s[2.3..3.14]; // error (x2): bad index types
+    range := s[2.3..]; // error: bad index type
+    range := s[..3.14]; // error: bad index type
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors9.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors9.dfy.expect
new file mode 100644
index 00000000000..a243ad4917b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors9.dfy.expect
@@ -0,0 +1,59 @@
+ResolutionErrors9.dfy(14,13): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(14,18): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(23,13): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(23,18): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(41,22): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(9,22): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(9,27): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(15,12): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(15,17): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(13,25): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(13,30): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(20,22): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(20,27): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(24,12): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(24,17): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(22,22): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(22,27): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(26,23): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(26,28): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(40,32): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(43,29): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(42,33): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(45,29): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(44,41): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(30,23): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(30,28): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(49,21): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(49,26): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(58,20): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 58 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors9.dfy(59,25): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 59 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors9.dfy(61,17): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 61 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors9.dfy(62,32): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 62 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors9.dfy(85,6): Error: when allocating an object of type 'ClassWithConstructor', one of its constructor methods must be called
+ResolutionErrors9.dfy(86,6): Error: when allocating an object of type 'ClassWithConstructor', one of its constructor methods must be called
+ResolutionErrors9.dfy(99,8): Error: when allocating an object of type 'Y', one of its constructor methods must be called
+ResolutionErrors9.dfy(104,8): Error: when allocating an object of type 'Luci', one of its constructor methods must be called
+ResolutionErrors9.dfy(105,8): Error: when allocating an object of type 'Luci', one of its constructor methods must be called
+ResolutionErrors9.dfy(129,44): Error: type of right argument to * (bool) must agree with the result type (int)
+ResolutionErrors9.dfy(210,16): Error: array selection requires integer- or bitvector-based numeric indices (got bool for index 0)
+ResolutionErrors9.dfy(208,13): Error: incorrect type for selection into array<real> (got real)
+ResolutionErrors9.dfy(209,11): Error: incorrect type for selection into seq<real> (got real)
+ResolutionErrors9.dfy(210,23): Error: array selection requires integer- or bitvector-based numeric indices (got real for index 1)
+ResolutionErrors9.dfy(212,17): Error: wrong number of indices for multi-selection
+ResolutionErrors9.dfy(212,17): Error: incorrect type for selection into array<real> (got real)
+ResolutionErrors9.dfy(212,22): Error: wrong number of indices for multi-selection
+ResolutionErrors9.dfy(212,22): Error: incorrect type for selection into array<real> (got real)
+ResolutionErrors9.dfy(213,17): Error: wrong number of indices for multi-selection
+ResolutionErrors9.dfy(213,17): Error: incorrect type for selection into array<real> (got real)
+ResolutionErrors9.dfy(214,19): Error: wrong number of indices for multi-selection
+ResolutionErrors9.dfy(214,19): Error: incorrect type for selection into array<real> (got real)
+ResolutionErrors9.dfy(215,15): Error: wrong number of indices for multi-selection
+ResolutionErrors9.dfy(215,15): Error: incorrect type for selection into seq<real> (got real)
+ResolutionErrors9.dfy(215,20): Error: wrong number of indices for multi-selection
+ResolutionErrors9.dfy(215,20): Error: incorrect type for selection into seq<real> (got real)
+ResolutionErrors9.dfy(216,15): Error: wrong number of indices for multi-selection
+ResolutionErrors9.dfy(216,15): Error: incorrect type for selection into seq<real> (got real)
+ResolutionErrors9.dfy(217,17): Error: wrong number of indices for multi-selection
+ResolutionErrors9.dfy(217,17): Error: incorrect type for selection into seq<real> (got real)
+58 resolution/type errors detected in ResolutionErrors9.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors9.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors9.dfy.refresh.expect
new file mode 100644
index 00000000000..9e3286dc385
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResolutionErrors9.dfy.refresh.expect
@@ -0,0 +1,51 @@
+ResolutionErrors9.dfy(41,22): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(9,22): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(9,27): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(13,25): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(13,30): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(14,13): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(14,18): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(15,12): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(15,17): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(20,22): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(20,27): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(22,22): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(22,27): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(23,13): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(23,18): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(24,12): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(24,17): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(26,23): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(26,28): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(30,23): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(30,28): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(40,32): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(43,29): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(42,33): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(45,29): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(44,41): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(49,21): Error: 'this' is not allowed in a 'static' context
+ResolutionErrors9.dfy(49,26): Error: type of the receiver is not fully determined at this program point
+ResolutionErrors9.dfy(58,20): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 58 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors9.dfy(59,25): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 59 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors9.dfy(61,17): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 61 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors9.dfy(62,32): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 62 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
+ResolutionErrors9.dfy(85,6): Error: when allocating an object of type 'ClassWithConstructor', one of its constructor methods must be called
+ResolutionErrors9.dfy(86,6): Error: when allocating an object of type 'ClassWithConstructor', one of its constructor methods must be called
+ResolutionErrors9.dfy(99,8): Error: when allocating an object of type 'Y', one of its constructor methods must be called
+ResolutionErrors9.dfy(104,8): Error: when allocating an object of type 'Luci', one of its constructor methods must be called
+ResolutionErrors9.dfy(105,8): Error: when allocating an object of type 'Luci', one of its constructor methods must be called
+ResolutionErrors9.dfy(129,46): Error: boolean literal used as if it had type int
+ResolutionErrors9.dfy(210,16): Error: array selection requires integer- or bitvector-based numeric indices (got bool for index 0)
+ResolutionErrors9.dfy(210,23): Error: array selection requires integer- or bitvector-based numeric indices (got real for index 1)
+ResolutionErrors9.dfy(212,17): Error: multi-element selection position expression must have an integer or bitvector type (got real)
+ResolutionErrors9.dfy(212,22): Error: multi-element selection position expression must have an integer or bitvector type (got real)
+ResolutionErrors9.dfy(213,17): Error: multi-element selection position expression must have an integer or bitvector type (got real)
+ResolutionErrors9.dfy(214,19): Error: multi-element selection position expression must have an integer or bitvector type (got real)
+ResolutionErrors9.dfy(215,15): Error: multi-element selection position expression must have an integer or bitvector type (got real)
+ResolutionErrors9.dfy(215,20): Error: multi-element selection position expression must have an integer or bitvector type (got real)
+ResolutionErrors9.dfy(216,15): Error: multi-element selection position expression must have an integer or bitvector type (got real)
+ResolutionErrors9.dfy(217,17): Error: multi-element selection position expression must have an integer or bitvector type (got real)
+ResolutionErrors9.dfy(208,13): Error: index expression must have an integer or bitvector type (got real)
+ResolutionErrors9.dfy(209,11): Error: index expression must have an integer or bitvector type (got real)
+50 resolution/type errors detected in ResolutionErrors9.dfy
diff --git a/Test/dafny0/RestrictedBoundedPools.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RestrictedBoundedPools.dfy
similarity index 98%
rename from Test/dafny0/RestrictedBoundedPools.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RestrictedBoundedPools.dfy
index c29df2645ca..a1a765f7767 100644
--- a/Test/dafny0/RestrictedBoundedPools.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RestrictedBoundedPools.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module Methods_EverythingGoes {
   ghost predicate R<Y>(y: Y) { true }
diff --git a/Test/dafny0/RestrictedBoundedPools.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RestrictedBoundedPools.dfy.expect
similarity index 100%
rename from Test/dafny0/RestrictedBoundedPools.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RestrictedBoundedPools.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeNewtype.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeNewtype.dfy
new file mode 100644
index 00000000000..03821285314
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeNewtype.dfy
@@ -0,0 +1,318 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --general-newtypes "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// This file tests that the results of operations that create values of a newtype satisfy the newtype constraint.
+// See also ResultInTypeSubsetType.dfy for the analogous tests for subset types.
+
+module Bool {
+  newtype False = b: bool | !b
+  newtype True = b: bool | b // error: cannot find witness
+
+  method Construct() returns (b: False) {
+    b := true; // error: true is not a False
+  }
+
+  method Operators(f: False) returns (b: False) {
+    if
+    case true =>
+      b := !f; // error: RHS is not a False
+    case true =>
+      b := f ==> f; // error: RHS is not a False
+    case true =>
+      b := f <== f; // error: RHS is not a False
+    case true =>
+      b := f <==> f; // error: RHS is not a False
+    case true =>
+      b := f == f; // error: RHS is not a False
+  }
+
+  method Is() returns (b: False) {
+    var f: real := 3.0;
+    b := f is int; // error: RHS is not a False
+  }
+
+  method As(a: bool) returns (b: False) {
+    b := a as False; // error: RHS is not a False
+  }
+
+  method Fresh() returns (ghost b: False) {
+    var c := new object;
+    b := fresh(c); // error: RHS is not a False
+  }
+  
+  ghost method QuantifierForall() returns (q: False) {
+    q := forall x :: 0 <= 2 * x < 0 ==> true; // error: the RHS is true, which is not a False
+  }
+
+  ghost method QuantifierExists() returns (q: False) {
+    var y := 3;
+    assert 0 <= 2 * y < 10;
+    q := exists x :: 0 <= 2 * x < 10; // error: the RHS is true, which is not a False
+  }
+}
+
+module Int {
+  newtype Int = x: int | 2 <= x < 4 // error: cannot find witness
+
+  method Construct() returns (r: Int) {
+    r := 20; // error: RHS not an Int
+  }
+
+  method Operators(x: Int, y: Int) returns (r: Int) {
+    if
+    case true =>
+      r := -x; // error: RHS not an Int
+    case true =>
+      r := x + y; // error: RHS not an Int
+    case true =>
+      r := x - y; // error: RHS not an Int
+    case true =>
+      r := x * y; // error: RHS not an Int
+    case true =>
+      r := x / y; // error: RHS not an Int
+  }
+
+  method As(x: int) returns (r: Int) {
+    r := x as Int; // error: RHS is not an Int
+  }
+}
+
+module Real {
+  newtype Real = x: real | 2.0 <= x < 4.0 // error: cannot find witness
+
+  method Construct() returns (r: Real) {
+    r := 20.0; // error: RHS not a Real
+  }
+
+  method Operators(x: Real, y: Real) returns (r: Real) {
+    if
+    case true =>
+      r := -x; // error: RHS not a Real
+    case true =>
+      r := x + y; // error: RHS not a Real
+    case true =>
+      r := x - y; // error: RHS not a Real
+    case true =>
+      r := x * y; // error: RHS not a Real
+    case true =>
+      r := x / y; // error: RHS not a Real
+  }
+
+  method As(x: real) returns (r: Real) {
+    r := x as Real; // error: RHS is not a Real
+  }
+}
+
+module Bv {
+  newtype Bv = x: bv7 | 2 <= x < 5 // error: cannot find witness
+
+  method Construct() returns (r: Bv) {
+    r := 20; // error: RHS not a Bv
+  }
+
+  method Operators(x: Bv, y: Bv) returns (r: Bv) {
+    if
+    case true =>
+      r := -x; // error: RHS not a Bv
+    case true =>
+      r := x + y; // error: RHS not a Bv
+    case true =>
+      r := x - y; // error: RHS not a Bv
+    case true =>
+      r := x * y; // error: RHS not a Bv
+    case true =>
+      r := x / y; // error: RHS not a Bv
+  }
+
+  method BitwiseOperators(x: Bv, y: Bv) returns (r: Bv) {
+    if
+    case true =>
+      r := !x; // error: RHS not a Bv
+    case true =>
+      r := x & y; // error: RHS not a Bv
+    case true =>
+      r := x | y; // error: RHS not a Bv
+    case true =>
+      r := x ^ y; // error: RHS not a Bv
+  }
+
+  method Shifts(x: Bv, y: Bv) returns (r: Bv) {
+    if
+    case true =>
+      r := x << 1; // error: RHS not a Bv
+    case true =>
+      r := x >> 1; // error: RHS not a Bv
+  }
+  
+  method As(x: bv7) returns (r: Bv) {
+    r := x as Bv; // error: RHS is not a Bv
+  }
+}
+
+module Char {
+  newtype Char = x: char | 'a' <= x < 'e' // error: cannot find witness
+
+  method Construct() returns (r: Char) {
+    r := 'z'; // error: RHS not a Char
+  }
+
+  method Operators(x: Char, y: Char) returns (r: Char) {
+    if
+    case true =>
+      r := x + y; // error: RHS not a Char
+    case true =>
+      r := x - y; // error (x2): possible underflow, and RHS not a Char
+  }
+
+  method As(x: char) returns (r: Char) {
+    r := x as Char; // error: RHS is not a Char
+  }
+}
+
+module Set {
+  newtype IntSet = s: set<int> | |s| == 3 // error: cannot find witness
+
+  method Construct() returns (s: IntSet) {
+    if
+    case true =>
+      s := {}; // error: too small
+    case true =>
+      s := {6, 19, 20, 21, 22}; // error: too big
+    case true =>
+      s := {2, 3, 4}; // Goldilocks!
+    case true =>
+      s := set x: int | 2 <= x < 3 && 2 * x < 300; // error: too small
+    case true =>
+      s := set x: int | 2 <= x < 3 :: 2 * x; // error: too small
+  }
+
+  method Operators(a: IntSet, b: IntSet, m: set<int>) returns (s: IntSet) {
+    if
+    case true =>
+      s := a + b; // error: may be too big
+    case true =>
+      s := a - b; // error: may be too small
+    case true =>
+      s := a * b; // error: may be too small
+    case true =>
+      s := m as IntSet; // error: may be of the wrong size
+  }
+}
+
+module Iset {
+  newtype IntIset = s: iset<int> | 2 in s <==> 3 !in s // error: cannot find witness
+
+  method Construct() returns (s: IntIset) {
+    if
+    case true =>
+      s := iset{2, 3}; // error: not an IntIset
+    case true =>
+      s := iset{6, 8}; // error: not an IntIset
+    case true =>
+      s := iset{2};
+    case true =>
+      s := iset x: int | 0 <= x < 5 && 2 * x < 300; // error: not an IntIset
+    case true =>
+      s := iset x: int | 2 <= x < 5 :: 2 * x; // error: not an IntIset
+  }
+
+  method Operators(a: IntIset, b: IntIset, m: iset<int>) returns (s: IntIset) {
+    if
+    case true =>
+      s := a + b; // error: not an IntIset
+    case true =>
+      s := a - b; // error: not an IntIset
+    case true =>
+      s := a * b; // error: not an IntIset
+    case true =>
+      s := m as IntIset; // error: not an IntIset
+  }
+}
+
+module Multiset {
+  newtype Multiset = s: multiset<int> | s[2] + s[3] == 1 // error: cannot find witness
+
+  method Construct() returns (s: Multiset) {
+    if
+    case true =>
+      s := multiset{2, 2}; // error: not a Multiset
+    case true =>
+      s := multiset{6, 8}; // error: not a Multiset
+    case true =>
+      s := multiset{2};
+  }
+
+  method Operators(a: Multiset, b: Multiset, m: multiset<int>) returns (s: Multiset) {
+    if
+    case true =>
+      s := a + b; // error: not a Multiset
+    case true =>
+      s := a - b; // error: not a Multiset
+    case true =>
+      s := a * b; // error: not a Multiset
+    case true =>
+      s := m as Multiset; // error: not a Multiset
+  }
+
+  method Conversion(t: set<int>, q: seq<int>) returns (s: Multiset) {
+    if
+    case true =>
+      s := multiset(t); // error: not a Multiset
+    case true =>
+      s := multiset(q); // error: not a Multiset
+    case true =>
+      s := multiset({2});
+  }
+}
+
+module Seq {
+  newtype Seq = s: seq<int> | |s| == 3 // error: cannot find witness
+  newtype String = s: string | |s| == 3 witness "abc"
+
+  method Construct() returns (s: Seq, g: String) {
+    s, g := [8, 8, 8], ['u', 'v', 'w'];
+    if
+    case true =>
+      s := [2, 2]; // error: not a Seq
+    case true =>
+      s := [8, 7, 6];
+    case true =>
+      g := "xyz";
+    case true =>
+      g := "klmn"; // error: not a String
+  }
+
+  method Operators(a: Seq, b: Seq, m: seq<int>) returns (s: Seq) {
+    if
+    case true =>
+      s := a + b; // error: not a Seq
+    case true =>
+      s := m as Seq; // error: not a Seq
+  }
+
+  method SubSequenceFromSeq(a: Seq) returns (s: Seq) {
+    if
+    case true =>
+      s := a[..2]; // error: not a Seq
+    case true =>
+      s := a[2..]; // error: not a Seq
+    case true =>
+      s := a[1..2]; // error: not a Seq
+    case true =>
+      s := a[..];
+  }
+
+  method SubSequenceFromArray(a: array<int>) returns (s: Seq)
+    requires 3 <= a.Length
+  {
+    if
+    case true =>
+      s := a[..2]; // error: not a Seq
+    case true =>
+      s := a[2..]; // error: not a Seq
+    case true =>
+      s := a[1..2]; // error: not a Seq
+    case true =>
+      s := a[..]; // error: not a Seq
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeNewtype.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeNewtype.dfy.expect
new file mode 100644
index 00000000000..fea948311bc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeNewtype.dfy.expect
@@ -0,0 +1,93 @@
+ResultInTypeNewtype.dfy(9,10): Error: cannot find witness that shows type is inhabited (only tried false); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeNewtype.dfy(12,9): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(18,11): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(20,13): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(22,13): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(24,13): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(26,13): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(31,11): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(35,11): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(40,9): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(44,9): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(50,9): Error: result of operation might violate newtype constraint for 'False'
+ResultInTypeNewtype.dfy(55,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeNewtype.dfy(55,27): Related location: this proposition could not be proved
+ResultInTypeNewtype.dfy(58,9): Error: result of operation might violate newtype constraint for 'Int'
+ResultInTypeNewtype.dfy(64,11): Error: result of operation might violate newtype constraint for 'Int'
+ResultInTypeNewtype.dfy(66,13): Error: result of operation might violate newtype constraint for 'Int'
+ResultInTypeNewtype.dfy(68,13): Error: result of operation might violate newtype constraint for 'Int'
+ResultInTypeNewtype.dfy(70,13): Error: result of operation might violate newtype constraint for 'Int'
+ResultInTypeNewtype.dfy(72,13): Error: result of operation might violate newtype constraint for 'Int'
+ResultInTypeNewtype.dfy(76,11): Error: result of operation might violate newtype constraint for 'Int'
+ResultInTypeNewtype.dfy(81,10): Error: cannot find witness that shows type is inhabited (only tried 0.0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeNewtype.dfy(81,31): Related location: this proposition could not be proved
+ResultInTypeNewtype.dfy(84,9): Error: result of operation might violate newtype constraint for 'Real'
+ResultInTypeNewtype.dfy(90,11): Error: result of operation might violate newtype constraint for 'Real'
+ResultInTypeNewtype.dfy(92,13): Error: result of operation might violate newtype constraint for 'Real'
+ResultInTypeNewtype.dfy(94,13): Error: result of operation might violate newtype constraint for 'Real'
+ResultInTypeNewtype.dfy(96,13): Error: result of operation might violate newtype constraint for 'Real'
+ResultInTypeNewtype.dfy(98,13): Error: result of operation might violate newtype constraint for 'Real'
+ResultInTypeNewtype.dfy(102,11): Error: result of operation might violate newtype constraint for 'Real'
+ResultInTypeNewtype.dfy(107,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeNewtype.dfy(107,26): Related location: this proposition could not be proved
+ResultInTypeNewtype.dfy(110,9): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(116,11): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(118,13): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(120,13): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(122,13): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(124,13): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(130,11): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(132,13): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(134,13): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(136,13): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(142,13): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(144,13): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(148,11): Error: result of operation might violate newtype constraint for 'Bv'
+ResultInTypeNewtype.dfy(153,10): Error: cannot find witness that shows type is inhabited (only tried 'D'); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeNewtype.dfy(153,31): Related location: this proposition could not be proved
+ResultInTypeNewtype.dfy(156,9): Error: result of operation might violate newtype constraint for 'Char'
+ResultInTypeNewtype.dfy(162,13): Error: result of operation might violate newtype constraint for 'Char'
+ResultInTypeNewtype.dfy(164,13): Error: char subtraction might underflow
+ResultInTypeNewtype.dfy(164,13): Error: result of operation might violate newtype constraint for 'Char'
+ResultInTypeNewtype.dfy(168,11): Error: result of operation might violate newtype constraint for 'Char'
+ResultInTypeNewtype.dfy(173,10): Error: cannot find witness that shows type is inhabited (only tried {}); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeNewtype.dfy(178,11): Error: result of operation might violate newtype constraint for 'IntSet'
+ResultInTypeNewtype.dfy(180,11): Error: result of operation might violate newtype constraint for 'IntSet'
+ResultInTypeNewtype.dfy(184,11): Error: result of operation might violate newtype constraint for 'IntSet'
+ResultInTypeNewtype.dfy(186,11): Error: result of operation might violate newtype constraint for 'IntSet'
+ResultInTypeNewtype.dfy(192,13): Error: result of operation might violate newtype constraint for 'IntSet'
+ResultInTypeNewtype.dfy(194,13): Error: result of operation might violate newtype constraint for 'IntSet'
+ResultInTypeNewtype.dfy(196,13): Error: result of operation might violate newtype constraint for 'IntSet'
+ResultInTypeNewtype.dfy(198,13): Error: result of operation might violate newtype constraint for 'IntSet'
+ResultInTypeNewtype.dfy(203,10): Error: cannot find witness that shows type is inhabited (only tried iset{}); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeNewtype.dfy(208,11): Error: result of operation might violate newtype constraint for 'IntIset'
+ResultInTypeNewtype.dfy(210,11): Error: result of operation might violate newtype constraint for 'IntIset'
+ResultInTypeNewtype.dfy(214,11): Error: result of operation might violate newtype constraint for 'IntIset'
+ResultInTypeNewtype.dfy(216,11): Error: result of operation might violate newtype constraint for 'IntIset'
+ResultInTypeNewtype.dfy(222,13): Error: result of operation might violate newtype constraint for 'IntIset'
+ResultInTypeNewtype.dfy(224,13): Error: result of operation might violate newtype constraint for 'IntIset'
+ResultInTypeNewtype.dfy(226,13): Error: result of operation might violate newtype constraint for 'IntIset'
+ResultInTypeNewtype.dfy(228,13): Error: result of operation might violate newtype constraint for 'IntIset'
+ResultInTypeNewtype.dfy(233,10): Error: cannot find witness that shows type is inhabited (only tried multiset{}); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeNewtype.dfy(238,11): Error: result of operation might violate newtype constraint for 'Multiset'
+ResultInTypeNewtype.dfy(240,11): Error: result of operation might violate newtype constraint for 'Multiset'
+ResultInTypeNewtype.dfy(248,13): Error: result of operation might violate newtype constraint for 'Multiset'
+ResultInTypeNewtype.dfy(250,13): Error: result of operation might violate newtype constraint for 'Multiset'
+ResultInTypeNewtype.dfy(252,13): Error: result of operation might violate newtype constraint for 'Multiset'
+ResultInTypeNewtype.dfy(254,13): Error: result of operation might violate newtype constraint for 'Multiset'
+ResultInTypeNewtype.dfy(260,19): Error: result of operation might violate newtype constraint for 'Multiset'
+ResultInTypeNewtype.dfy(262,19): Error: result of operation might violate newtype constraint for 'Multiset'
+ResultInTypeNewtype.dfy(269,10): Error: cannot find witness that shows type is inhabited (only tried []); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeNewtype.dfy(276,11): Error: result of operation might violate newtype constraint for 'Seq'
+ResultInTypeNewtype.dfy(282,11): Error: result of operation might violate newtype constraint for 'String'
+ResultInTypeNewtype.dfy(288,13): Error: result of operation might violate newtype constraint for 'Seq'
+ResultInTypeNewtype.dfy(290,13): Error: result of operation might violate newtype constraint for 'Seq'
+ResultInTypeNewtype.dfy(296,12): Error: result of operation might violate newtype constraint for 'Seq'
+ResultInTypeNewtype.dfy(298,12): Error: result of operation might violate newtype constraint for 'Seq'
+ResultInTypeNewtype.dfy(300,12): Error: result of operation might violate newtype constraint for 'Seq'
+ResultInTypeNewtype.dfy(310,12): Error: result of operation might violate newtype constraint for 'Seq'
+ResultInTypeNewtype.dfy(312,12): Error: result of operation might violate newtype constraint for 'Seq'
+ResultInTypeNewtype.dfy(314,12): Error: result of operation might violate newtype constraint for 'Seq'
+ResultInTypeNewtype.dfy(316,12): Error: result of operation might violate newtype constraint for 'Seq'
+
+Dafny program verifier finished with 3 verified, 87 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeSubsetType.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeSubsetType.dfy
new file mode 100644
index 00000000000..5049cd8a24a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeSubsetType.dfy
@@ -0,0 +1,318 @@
+// RUN: %exits-with 4 %verify --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// This file tests that the results of operations that create values of a subset type satisfy the type's constraint.
+// See also ResultInTypeNewtype.dfy for the analogous tests for newtypes.
+
+module Bool {
+  type False = b: bool | !b
+  type True = b: bool | b // error: cannot find witness
+
+  method Construct() returns (b: False) {
+    b := true; // error: true is not a False
+  }
+
+  method Operators(f: False) returns (b: False) {
+    if
+    case true =>
+      b := !f; // error: RHS is not a False
+    case true =>
+      b := f ==> f; // error: RHS is not a False
+    case true =>
+      b := f <== f; // error: RHS is not a False
+    case true =>
+      b := f <==> f; // error: RHS is not a False
+    case true =>
+      b := f == f; // error: RHS is not a False
+  }
+
+  method Is() returns (b: False) {
+    var f: real := 3.0;
+    b := f is int; // error: RHS is not a False
+  }
+
+  method As(a: bool) returns (b: False) {
+    b := a as False; // error: RHS is not a False
+  }
+
+  method Fresh() returns (ghost b: False) {
+    var c := new object;
+    b := fresh(c); // error: RHS is not a False
+  }
+  
+  ghost method QuantifierForall() returns (q: False) {
+    q := forall x :: 0 <= 2 * x < 0 ==> true; // error: the RHS is true, which is not a False
+  }
+
+  ghost method QuantifierExists() returns (q: False) {
+    var y := 3;
+    assert 0 <= 2 * y < 10;
+    q := exists x :: 0 <= 2 * x < 10; // error: the RHS is true, which is not a False
+  }
+}
+
+module Int {
+  type Int = x: int | 2 <= x < 4 // error: cannot find witness
+
+  method Construct() returns (r: Int) {
+    r := 20; // error: RHS not an Int
+  }
+
+  method Operators(x: Int, y: Int) returns (r: Int) {
+    if
+    case true =>
+      r := -x; // error: RHS not an Int
+    case true =>
+      r := x + y; // error: RHS not an Int
+    case true =>
+      r := x - y; // error: RHS not an Int
+    case true =>
+      r := x * y; // error: RHS not an Int
+    case true =>
+      r := x / y; // error: RHS not an Int
+  }
+
+  method As(x: int) returns (r: Int) {
+    r := x as Int; // error: RHS is not an Int
+  }
+}
+
+module Real {
+  type Real = x: real | 2.0 <= x < 4.0 // error: cannot find witness
+
+  method Construct() returns (r: Real) {
+    r := 20.0; // error: RHS not a Real
+  }
+
+  method Operators(x: Real, y: Real) returns (r: Real) {
+    if
+    case true =>
+      r := -x; // error: RHS not a Real
+    case true =>
+      r := x + y; // error: RHS not a Real
+    case true =>
+      r := x - y; // error: RHS not a Real
+    case true =>
+      r := x * y; // error: RHS not a Real
+    case true =>
+      r := x / y; // error: RHS not a Real
+  }
+
+  method As(x: real) returns (r: Real) {
+    r := x as Real; // error: RHS is not a Real
+  }
+}
+
+module Bv {
+  type Bv = x: bv7 | 2 <= x < 5 // error: cannot find witness
+
+  method Construct() returns (r: Bv) {
+    r := 20; // error: RHS not a Bv
+  }
+
+  method Operators(x: Bv, y: Bv) returns (r: Bv) {
+    if
+    case true =>
+      r := -x; // error: RHS not a Bv
+    case true =>
+      r := x + y; // error: RHS not a Bv
+    case true =>
+      r := x - y; // error: RHS not a Bv
+    case true =>
+      r := x * y; // error: RHS not a Bv
+    case true =>
+      r := x / y; // error: RHS not a Bv
+  }
+
+  method BitwiseOperators(x: Bv, y: Bv) returns (r: Bv) {
+    if
+    case true =>
+      r := !x; // error: RHS not a Bv
+    case true =>
+      r := x & y; // error: RHS not a Bv
+    case true =>
+      r := x | y; // error: RHS not a Bv
+    case true =>
+      r := x ^ y; // error: RHS not a Bv
+  }
+
+  method Shifts(x: Bv, y: Bv) returns (r: Bv) {
+    if
+    case true =>
+      r := x << 1; // error: RHS not a Bv
+    case true =>
+      r := x >> 1; // error: RHS not a Bv
+  }
+  
+  method As(x: bv7) returns (r: Bv) {
+    r := x as Bv; // error: RHS is not a Bv
+  }
+}
+
+module Char {
+  type Char = x: char | 'a' <= x < 'e' // error: cannot find witness
+
+  method Construct() returns (r: Char) {
+    r := 'z'; // error: RHS not a Char
+  }
+
+  method Operators(x: Char, y: Char) returns (r: Char) {
+    if
+    case true =>
+      r := x + y; // error: RHS not a Char
+    case true =>
+      r := x - y; // error (x2): possible underflow, and RHS not a Char
+  }
+
+  method As(x: char) returns (r: Char) {
+    r := x as Char; // error: RHS is not a Char
+  }
+}
+
+module Set {
+  type IntSet = s: set<int> | |s| == 3 // error: cannot find witness
+
+  method Construct() returns (s: IntSet) {
+    if
+    case true =>
+      s := {}; // error: too small
+    case true =>
+      s := {6, 19, 20, 21, 22}; // error: too big
+    case true =>
+      s := {2, 3, 4}; // Goldilocks!
+    case true =>
+      s := set x: int | 2 <= x < 3 && 2 * x < 300; // error: too small
+    case true =>
+      s := set x: int | 2 <= x < 3 :: 2 * x; // error: too small
+  }
+
+  method Operators(a: IntSet, b: IntSet, m: set<int>) returns (s: IntSet) {
+    if
+    case true =>
+      s := a + b; // error: may be too big
+    case true =>
+      s := a - b; // error: may be too small
+    case true =>
+      s := a * b; // error: may be too small
+    case true =>
+      s := m as IntSet; // error: may be of the wrong size
+  }
+}
+
+module Iset {
+  type IntIset = s: iset<int> | 2 in s <==> 3 !in s // error: cannot find witness
+
+  method Construct() returns (s: IntIset) {
+    if
+    case true =>
+      s := iset{2, 3}; // error: not an IntIset
+    case true =>
+      s := iset{6, 8}; // error: not an IntIset
+    case true =>
+      s := iset{2};
+    case true =>
+      s := iset x: int | 0 <= x < 5 && 2 * x < 300; // error: not an IntIset
+    case true =>
+      s := iset x: int | 2 <= x < 5 :: 2 * x; // error: not an IntIset
+  }
+
+  method Operators(a: IntIset, b: IntIset, m: iset<int>) returns (s: IntIset) {
+    if
+    case true =>
+      s := a + b; // error: not an IntIset
+    case true =>
+      s := a - b; // error: not an IntIset
+    case true =>
+      s := a * b; // error: not an IntIset
+    case true =>
+      s := m as IntIset; // error: not an IntIset
+  }
+}
+
+module Multiset {
+  type Multiset = s: multiset<int> | s[2] + s[3] == 1 // error: cannot find witness
+
+  method Construct() returns (s: Multiset) {
+    if
+    case true =>
+      s := multiset{2, 2}; // error: not a Multiset
+    case true =>
+      s := multiset{6, 8}; // error: not a Multiset
+    case true =>
+      s := multiset{2};
+  }
+
+  method Operators(a: Multiset, b: Multiset, m: multiset<int>) returns (s: Multiset) {
+    if
+    case true =>
+      s := a + b; // error: not a Multiset
+    case true =>
+      s := a - b; // error: not a Multiset
+    case true =>
+      s := a * b; // error: not a Multiset
+    case true =>
+      s := m as Multiset; // error: not a Multiset
+  }
+
+  method Conversion(t: set<int>, q: seq<int>) returns (s: Multiset) {
+    if
+    case true =>
+      s := multiset(t); // error: not a Multiset
+    case true =>
+      s := multiset(q); // error: not a Multiset
+    case true =>
+      s := multiset({2});
+  }
+}
+
+module Seq {
+  type Seq = s: seq<int> | |s| == 3 // error: cannot find witness
+  type String = s: string | |s| == 3 witness "abc"
+
+  method Construct() returns (s: Seq, g: String) {
+    s, g := [8, 8, 8], ['u', 'v', 'w'];
+    if
+    case true =>
+      s := [2, 2]; // error: not a Seq
+    case true =>
+      s := [8, 7, 6];
+    case true =>
+      g := "xyz";
+    case true =>
+      g := "klmn"; // error: not a String
+  }
+
+  method Operators(a: Seq, b: Seq, m: seq<int>) returns (s: Seq) {
+    if
+    case true =>
+      s := a + b; // error: not a Seq
+    case true =>
+      s := m as Seq; // error: not a Seq
+  }
+
+  method SubSequenceFromSeq(a: Seq) returns (s: Seq) {
+    if
+    case true =>
+      s := a[..2]; // error: not a Seq
+    case true =>
+      s := a[2..]; // error: not a Seq
+    case true =>
+      s := a[1..2]; // error: not a Seq
+    case true =>
+      s := a[..];
+  }
+
+  method SubSequenceFromArray(a: array<int>) returns (s: Seq)
+    requires 3 <= a.Length
+  {
+    if
+    case true =>
+      s := a[..2]; // error: not a Seq
+    case true =>
+      s := a[2..]; // error: not a Seq
+    case true =>
+      s := a[1..2]; // error: not a Seq
+    case true =>
+      s := a[..]; // error: not a Seq
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeSubsetType.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeSubsetType.dfy.expect
new file mode 100644
index 00000000000..d3a2bec85b5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ResultInTypeSubsetType.dfy.expect
@@ -0,0 +1,93 @@
+ResultInTypeSubsetType.dfy(9,7): Error: cannot find witness that shows type is inhabited (only tried false); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeSubsetType.dfy(12,9): Error: value does not satisfy the subset constraints of 'False'
+ResultInTypeSubsetType.dfy(18,11): Error: result of operation might violate subset type constraint for 'False'
+ResultInTypeSubsetType.dfy(20,13): Error: value does not satisfy the subset constraints of 'False'
+ResultInTypeSubsetType.dfy(22,13): Error: value does not satisfy the subset constraints of 'False'
+ResultInTypeSubsetType.dfy(24,13): Error: value does not satisfy the subset constraints of 'False'
+ResultInTypeSubsetType.dfy(26,13): Error: value does not satisfy the subset constraints of 'False'
+ResultInTypeSubsetType.dfy(31,11): Error: value does not satisfy the subset constraints of 'False'
+ResultInTypeSubsetType.dfy(35,11): Error: result of operation might violate subset type constraint for 'False'
+ResultInTypeSubsetType.dfy(40,9): Error: value does not satisfy the subset constraints of 'False'
+ResultInTypeSubsetType.dfy(44,9): Error: value does not satisfy the subset constraints of 'False'
+ResultInTypeSubsetType.dfy(50,9): Error: value does not satisfy the subset constraints of 'False'
+ResultInTypeSubsetType.dfy(55,7): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeSubsetType.dfy(55,24): Related location: this proposition could not be proved
+ResultInTypeSubsetType.dfy(58,9): Error: value does not satisfy the subset constraints of 'Int'
+ResultInTypeSubsetType.dfy(64,11): Error: value does not satisfy the subset constraints of 'Int'
+ResultInTypeSubsetType.dfy(66,13): Error: value does not satisfy the subset constraints of 'Int'
+ResultInTypeSubsetType.dfy(68,13): Error: value does not satisfy the subset constraints of 'Int'
+ResultInTypeSubsetType.dfy(70,13): Error: value does not satisfy the subset constraints of 'Int'
+ResultInTypeSubsetType.dfy(72,13): Error: value does not satisfy the subset constraints of 'Int'
+ResultInTypeSubsetType.dfy(76,11): Error: result of operation might violate subset type constraint for 'Int'
+ResultInTypeSubsetType.dfy(81,7): Error: cannot find witness that shows type is inhabited (only tried 0.0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeSubsetType.dfy(81,28): Related location: this proposition could not be proved
+ResultInTypeSubsetType.dfy(84,9): Error: value does not satisfy the subset constraints of 'Real'
+ResultInTypeSubsetType.dfy(90,11): Error: value does not satisfy the subset constraints of 'Real'
+ResultInTypeSubsetType.dfy(92,13): Error: value does not satisfy the subset constraints of 'Real'
+ResultInTypeSubsetType.dfy(94,13): Error: value does not satisfy the subset constraints of 'Real'
+ResultInTypeSubsetType.dfy(96,13): Error: value does not satisfy the subset constraints of 'Real'
+ResultInTypeSubsetType.dfy(98,13): Error: value does not satisfy the subset constraints of 'Real'
+ResultInTypeSubsetType.dfy(102,11): Error: result of operation might violate subset type constraint for 'Real'
+ResultInTypeSubsetType.dfy(107,7): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeSubsetType.dfy(107,23): Related location: this proposition could not be proved
+ResultInTypeSubsetType.dfy(110,9): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(116,11): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(118,13): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(120,13): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(122,13): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(124,13): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(130,11): Error: result of operation might violate subset type constraint for 'Bv'
+ResultInTypeSubsetType.dfy(132,13): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(134,13): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(136,13): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(142,13): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(144,13): Error: value does not satisfy the subset constraints of 'Bv'
+ResultInTypeSubsetType.dfy(148,11): Error: result of operation might violate subset type constraint for 'Bv'
+ResultInTypeSubsetType.dfy(153,7): Error: cannot find witness that shows type is inhabited (only tried 'D'); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeSubsetType.dfy(153,28): Related location: this proposition could not be proved
+ResultInTypeSubsetType.dfy(156,9): Error: value does not satisfy the subset constraints of 'Char'
+ResultInTypeSubsetType.dfy(162,13): Error: value does not satisfy the subset constraints of 'Char'
+ResultInTypeSubsetType.dfy(164,13): Error: char subtraction might underflow
+ResultInTypeSubsetType.dfy(164,13): Error: value does not satisfy the subset constraints of 'Char'
+ResultInTypeSubsetType.dfy(168,11): Error: result of operation might violate subset type constraint for 'Char'
+ResultInTypeSubsetType.dfy(173,7): Error: cannot find witness that shows type is inhabited (only tried {}); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeSubsetType.dfy(178,11): Error: value does not satisfy the subset constraints of 'IntSet'
+ResultInTypeSubsetType.dfy(180,11): Error: value does not satisfy the subset constraints of 'IntSet'
+ResultInTypeSubsetType.dfy(184,11): Error: value does not satisfy the subset constraints of 'IntSet'
+ResultInTypeSubsetType.dfy(186,11): Error: value does not satisfy the subset constraints of 'IntSet'
+ResultInTypeSubsetType.dfy(192,13): Error: value does not satisfy the subset constraints of 'IntSet'
+ResultInTypeSubsetType.dfy(194,13): Error: value does not satisfy the subset constraints of 'IntSet'
+ResultInTypeSubsetType.dfy(196,13): Error: value does not satisfy the subset constraints of 'IntSet'
+ResultInTypeSubsetType.dfy(198,13): Error: result of operation might violate subset type constraint for 'IntSet'
+ResultInTypeSubsetType.dfy(203,7): Error: cannot find witness that shows type is inhabited (only tried iset{}); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeSubsetType.dfy(208,11): Error: value does not satisfy the subset constraints of 'IntIset'
+ResultInTypeSubsetType.dfy(210,11): Error: value does not satisfy the subset constraints of 'IntIset'
+ResultInTypeSubsetType.dfy(214,11): Error: value does not satisfy the subset constraints of 'IntIset'
+ResultInTypeSubsetType.dfy(216,11): Error: value does not satisfy the subset constraints of 'IntIset'
+ResultInTypeSubsetType.dfy(222,13): Error: value does not satisfy the subset constraints of 'IntIset'
+ResultInTypeSubsetType.dfy(224,13): Error: value does not satisfy the subset constraints of 'IntIset'
+ResultInTypeSubsetType.dfy(226,13): Error: value does not satisfy the subset constraints of 'IntIset'
+ResultInTypeSubsetType.dfy(228,13): Error: result of operation might violate subset type constraint for 'IntIset'
+ResultInTypeSubsetType.dfy(233,7): Error: cannot find witness that shows type is inhabited (only tried multiset{}); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeSubsetType.dfy(238,11): Error: value does not satisfy the subset constraints of 'Multiset'
+ResultInTypeSubsetType.dfy(240,11): Error: value does not satisfy the subset constraints of 'Multiset'
+ResultInTypeSubsetType.dfy(248,13): Error: value does not satisfy the subset constraints of 'Multiset'
+ResultInTypeSubsetType.dfy(250,13): Error: value does not satisfy the subset constraints of 'Multiset'
+ResultInTypeSubsetType.dfy(252,13): Error: value does not satisfy the subset constraints of 'Multiset'
+ResultInTypeSubsetType.dfy(254,13): Error: result of operation might violate subset type constraint for 'Multiset'
+ResultInTypeSubsetType.dfy(260,19): Error: value does not satisfy the subset constraints of 'Multiset'
+ResultInTypeSubsetType.dfy(262,19): Error: value does not satisfy the subset constraints of 'Multiset'
+ResultInTypeSubsetType.dfy(269,7): Error: cannot find witness that shows type is inhabited (only tried []); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ResultInTypeSubsetType.dfy(276,11): Error: value does not satisfy the subset constraints of 'Seq'
+ResultInTypeSubsetType.dfy(282,11): Error: value does not satisfy the subset constraints of 'String'
+ResultInTypeSubsetType.dfy(288,13): Error: value does not satisfy the subset constraints of 'Seq'
+ResultInTypeSubsetType.dfy(290,13): Error: result of operation might violate subset type constraint for 'Seq'
+ResultInTypeSubsetType.dfy(296,12): Error: value does not satisfy the subset constraints of 'Seq'
+ResultInTypeSubsetType.dfy(298,12): Error: value does not satisfy the subset constraints of 'Seq'
+ResultInTypeSubsetType.dfy(300,12): Error: value does not satisfy the subset constraints of 'Seq'
+ResultInTypeSubsetType.dfy(310,12): Error: value does not satisfy the subset constraints of 'Seq'
+ResultInTypeSubsetType.dfy(312,12): Error: value does not satisfy the subset constraints of 'Seq'
+ResultInTypeSubsetType.dfy(314,12): Error: value does not satisfy the subset constraints of 'Seq'
+ResultInTypeSubsetType.dfy(316,12): Error: value does not satisfy the subset constraints of 'Seq'
+
+Dafny program verifier finished with 3 verified, 87 errors
diff --git a/Test/dafny0/ReturnErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReturnErrors.dfy
similarity index 87%
rename from Test/dafny0/ReturnErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReturnErrors.dfy
index cb55986b5ed..c86c9443e21 100644
--- a/Test/dafny0/ReturnErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReturnErrors.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class N
diff --git a/Test/dafny0/ReturnErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReturnErrors.dfy.expect
similarity index 100%
rename from Test/dafny0/ReturnErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReturnErrors.dfy.expect
diff --git a/Test/dafny0/ReturnTests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReturnTests.dfy
similarity index 93%
rename from Test/dafny0/ReturnTests.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReturnTests.dfy
index 5383d2b534d..91f8c06f50c 100644
--- a/Test/dafny0/ReturnTests.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReturnTests.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class N
diff --git a/Test/dafny1/ListContents.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReturnTests.dfy.expect
similarity index 100%
rename from Test/dafny1/ListContents.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ReturnTests.dfy.expect
diff --git a/Test/dafny0/RevealConsistency.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RevealConsistency.dfy
similarity index 78%
rename from Test/dafny0/RevealConsistency.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RevealConsistency.dfy
index 460ac315231..c91a44808b7 100644
--- a/Test/dafny0/RevealConsistency.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RevealConsistency.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Check that using the reveal_ lemma to prove the well-definedness of a function
 // in a lower SCC does not cause a soundness problem
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RevealConsistency.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RevealConsistency.dfy.expect
new file mode 100644
index 00000000000..4f47a8bab56
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RevealConsistency.dfy.expect
@@ -0,0 +1,4 @@
+RevealConsistency.dfy(11,2): Error: a postcondition could not be proved on this return path
+RevealConsistency.dfy(8,14): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/dafny0/RlimitMultiplier.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RlimitMultiplier.dfy
similarity index 79%
rename from Test/dafny0/RlimitMultiplier.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RlimitMultiplier.dfy
index 8d9b06ac5a6..693d0ffd17c 100644
--- a/Test/dafny0/RlimitMultiplier.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RlimitMultiplier.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" /rlimit:10000 > "%t"
+// RUN: %verify "%s" --resource-limit 10e6 > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost function f(i:nat, j:nat):int {if i == 0 then 0 else f(i - 1, i * j + 1) + f(i - 1, 2 * i * j)}
diff --git a/Test/dafny2/COST-verif-comp-2011-1-MaxArray.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RlimitMultiplier.dfy.expect
similarity index 100%
rename from Test/dafny2/COST-verif-comp-2011-1-MaxArray.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RlimitMultiplier.dfy.expect
diff --git a/Test/dafny0/RuntimeTypeTests0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests0.dfy
similarity index 97%
rename from Test/dafny0/RuntimeTypeTests0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests0.dfy
index 5ddfda42319..dec3d0e25dc 100644
--- a/Test/dafny0/RuntimeTypeTests0.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests0.dfy
@@ -1,5 +1,5 @@
 // UNSUPPORTED: windows
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 // The code in this file demonstrates complications in sorting out covariance in some
 // compilation target languages.
diff --git a/Test/dafny0/RuntimeTypeTests0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests0.dfy.expect
similarity index 100%
rename from Test/dafny0/RuntimeTypeTests0.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests0.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests0.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests0.dfy.rs.check
new file mode 100644
index 00000000000..a3237e853cc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests0.dfy.rs.check
@@ -0,0 +1 @@
+//CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/dafny0/RuntimeTypeTests1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests1.dfy
similarity index 96%
rename from Test/dafny0/RuntimeTypeTests1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests1.dfy
index 79dbeb3e1c2..71ebb859fe4 100644
--- a/Test/dafny0/RuntimeTypeTests1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests1.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:3 "%s" > "%t"
+// RUN: %exits-with 2 %run "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // The code in this file demonstrates how correct compilation of some features
diff --git a/Test/dafny0/RuntimeTypeTests1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests1.dfy.expect
similarity index 100%
rename from Test/dafny0/RuntimeTypeTests1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests1.dfy.expect
diff --git a/Test/dafny0/RuntimeTypeTests2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests2.dfy
similarity index 90%
rename from Test/dafny0/RuntimeTypeTests2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests2.dfy
index c2776a83aa5..6ce6420a784 100644
--- a/Test/dafny0/RuntimeTypeTests2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests2.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 3 %dafny /compile:3 "%s" /compileTarget:cs > "%t"
+// RUN: %exits-with 3 %run "%s" --target cs > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // The errors in this file are produced by the compiler
diff --git a/Test/dafny0/RuntimeTypeTests2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests2.dfy.expect
similarity index 88%
rename from Test/dafny0/RuntimeTypeTests2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests2.dfy.expect
index 97f54aa6ccb..c909162ce1a 100644
--- a/Test/dafny0/RuntimeTypeTests2.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/RuntimeTypeTests2.dfy.expect
@@ -2,3 +2,4 @@
 Dafny program verifier finished with 2 verified, 0 errors
 RuntimeTypeTests2.dfy(15,4): Error: this assign-such-that statement is too advanced for the current compiler; Dafny's heuristics cannot find any bound for variable 'b'
 RuntimeTypeTests2.dfy(22,7): Error: this let-such-that expression is too advanced for the current compiler; Dafny's heuristics cannot find any bound for variable 'b'
+Translation was aborted because errors were found
diff --git a/Test/dafny0/SeqFromArray.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqFromArray.dfy
similarity index 84%
rename from Test/dafny0/SeqFromArray.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqFromArray.dfy
index 39f72303d18..3894bc0fcc3 100644
--- a/Test/dafny0/SeqFromArray.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqFromArray.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // /autoTriggers:1 added to suppress instabilities
 
@@ -54,7 +54,7 @@ method L(a: array<int>, c: array<int>, n: nat)
   }
 }
 
-method M(a: array<int>, c: array<int>, m: nat, n: nat, k: nat, l: nat)
+method M(a: array<int>, c: array<int>, m: nat, n: nat, k: nat, l: nat, i: int)
   requires k + m <= a.Length
   requires l + n <= c.Length
 {
@@ -64,15 +64,15 @@ method M(a: array<int>, c: array<int>, m: nat, n: nat, k: nat, l: nat)
     if * {
       assert m == n;
     } else if * {
-      assert forall i :: 0 <= i < n ==> A[i] == C[i];
+      assert 0 <= i < n ==> A[i] == C[i];
     } else if * {
-      assert forall i {:nowarn} :: k <= i < k+n ==> A[i-k] == C[i-k];
+      assert k <= i < k+n ==> A[i-k] == C[i-k];
     } else if * {
-      assert forall i :: 0 <= i < n ==> A[i] == a[k+i];
+      assert 0 <= i < n ==> A[i] == a[k+i];
     } else if * {
-      assert forall i :: 0 <= i < n ==> C[i] == c[l+i];
+      assert 0 <= i < n ==> C[i] == c[l+i];
     } else if * {
-      assert forall i {:nowarn} :: 0 <= i < n ==> a[k+i] == c[l+i];
+      assert 0 <= i < n ==> a[k+i] == c[l+i];
     }
   }
 }
diff --git a/Test/dafny4/FlyingRobots.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqFromArray.dfy.expect
similarity index 100%
rename from Test/dafny4/FlyingRobots.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqFromArray.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqFromArray.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqFromArray.dfy.rs.check
new file mode 100644
index 00000000000..3d586af71fb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqFromArray.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0061]: this function takes 1 argument but 0 arguments were supplied
\ No newline at end of file
diff --git a/Test/dafny0/SeqSlice.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqSlice.dfy
similarity index 94%
rename from Test/dafny0/SeqSlice.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqSlice.dfy
index 104976e34e1..1fa569ab6b2 100644
--- a/Test/dafny0/SeqSlice.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqSlice.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 method test(x:seq<int>)
   requires |x| == 10
diff --git a/Test/dafny0/SeqSlice.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqSlice.dfy.expect
similarity index 100%
rename from Test/dafny0/SeqSlice.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SeqSlice.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Shadows.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Shadows.dfy
new file mode 100644
index 00000000000..356d99f48df
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Shadows.dfy
@@ -0,0 +1,166 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --warn-shadowing
+
+
+module Module0 {
+  class C<alpha> {
+    method M<beta, beta>(x: beta)  // error: duplicate type parameter
+    method P<alpha>(x: alpha)  // shadowed type parameter
+    ghost function F<beta, beta>(x: beta): int  // error: duplicate type parameter
+    ghost function G<alpha>(x: alpha): int  // shadowed type parameter
+
+    method Q0(x: int) returns (x: int)  // error: duplicate variable name
+  }
+}
+module Module1 {
+  class D {
+    method Q1(x: int) returns (y: int)
+    {
+      var x;  // shadowed
+      var y;  // error: duplicate
+    }
+
+    var f: int
+    method R()
+    {
+      var f;  // okay
+      var f;  // error: duplicate
+    }
+    method S()
+    {
+      var x;
+      {
+        var x;  // shadow
+      }
+    }
+    method T()
+    {
+      var x;
+      ghost var b := forall x :: x < 10;  // shadow
+      ghost var c := forall y :: forall y :: y != y + 1;  // shadow
+    }
+  }
+}
+
+module Module2 {
+  function
+    {:myAttr var r := 10; r}
+    {:warnShadowing false}
+    {:myAttr
+      var x := 2;
+      var x := 3;
+      x
+    }
+    F0(x: int): (r: int)
+  {
+    var x := 2;
+    var x := 3;
+    var r := 4;
+    x
+  }
+
+  function
+    {:myAttr var r := 10; r} // warning: r is shadowed
+    {:warnShadowing true}
+    {:myAttr
+      var x := 2; // warning: x is shadowed
+      var x := 3; // warning: x is shadowed
+      x
+    }
+    F1(x: int): (r: int)
+  {
+    var x := 2; // warning: x is shadowed
+    var x := 3; // warning: x is shadowed
+    var r := 4; // okay
+    x
+  }
+
+  function
+    {:myAttr var r := 10; r} // warning: r is shadowed
+    {:warnShadowing} // this is the same as {:warnShadowing true}
+    {:myAttr
+      var x := 2; // warning: x is shadowed
+      var x := 3; // warning: x is shadowed
+      x
+    }
+    F2(x: int): (r: int)
+  {
+    var x := 2; // warning: x is shadowed
+    var x := 3; // warning: x is shadowed
+    var r := 4; // okay
+    x
+  }
+
+  function
+    {:myAttr var r := 10; r} // warning: r is shadowed
+    {:myAttr
+      var x := 2; // warning: x is shadowed
+      var x := 3; // warning: x is shadowed
+      x
+    }
+    F3(x: int): (r: int)
+  {
+    var x := 2; // warning: x is shadowed
+    var x := 3; // warning: x is shadowed
+    var r := 4; // okay
+    x
+  }
+
+  method
+    {:myAttr var r := 10; r}
+    {:warnShadowing false}
+    {:myAttr
+      var x := 2;
+      var x := 3;
+      x
+    }
+    M0(x: int) returns (r: int)
+  {
+    var x := 2;
+    var x := 3; // error: duplicate variable
+    var r := 4; // error: duplicate variable
+  }
+
+  method
+    {:myAttr var r := 10; r} // warning: r is shadowed
+    {:warnShadowing true}
+    {:myAttr
+      var x := 2; // warning: x is shadowed
+      var x := 3; // warning: x is shadowed
+      x
+    }
+    M1(x: int) returns (r: int)
+  {
+    var x := 2; // warning: x is shadowed
+    var x := 3; // error: duplicate variable
+    var r := 4; // error: duplicate variable
+  }
+
+  method
+    {:myAttr var r := 10; r} // warning: r is shadowed
+    {:warnShadowing} // this is the same as {:warnShadowing true}
+    {:myAttr
+      var x := 2; // warning: x is shadowed
+      var x := 3; // warning: x is shadowed
+      x
+    }
+    M2(x: int) returns (r: int)
+  {
+    var x := 2; // warning: x is shadowed
+    var x := 3; // error: duplicate variable
+    var r := 4; // error: duplicate variable
+  }
+
+  method
+    {:myAttr var r := 10; r} // warning: r is shadowed
+    {:myAttr
+      var x := 2; // warning: x is shadowed
+      var x := 3; // warning: x is shadowed
+      x
+    }
+    M3(x: int) returns (r: int)
+  {
+    var x := 2; // warning: x is shadowed
+    var x := 3; // warning: x is shadowed
+    var r := 4; // warning: r is shadowed
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Shadows.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Shadows.dfy.expect
new file mode 100644
index 00000000000..596d577b37e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Shadows.dfy.expect
@@ -0,0 +1,47 @@
+Shadows.dfy(6,19): Error: Duplicate type-parameter name: beta
+Shadows.dfy(7,13): Warning: Shadowed type-parameter name: alpha
+Shadows.dfy(8,27): Error: Duplicate type-parameter name: beta
+Shadows.dfy(9,21): Warning: Shadowed type-parameter name: alpha
+Shadows.dfy(11,31): Error: Duplicate parameter name: x
+Shadows.dfy(18,10): Warning: Shadowed local-variable name: x
+Shadows.dfy(19,10): Error: Duplicate local-variable name: y
+Shadows.dfy(26,10): Error: Duplicate local-variable name: f
+Shadows.dfy(32,12): Warning: Shadowed local-variable name: x
+Shadows.dfy(38,28): Warning: Shadowed bound-variable name: x
+Shadows.dfy(39,40): Warning: Shadowed bound-variable name: y
+Shadows.dfy(71,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(72,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(65,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(66,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(62,17): Warning: Shadowed let-variable name: r
+Shadows.dfy(87,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(88,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(81,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(82,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(78,17): Warning: Shadowed let-variable name: r
+Shadows.dfy(102,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(103,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(96,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(97,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(94,17): Warning: Shadowed let-variable name: r
+Shadows.dfy(119,8): Error: Duplicate local-variable name: x
+Shadows.dfy(120,8): Error: Duplicate local-variable name: r
+Shadows.dfy(133,8): Warning: Shadowed local-variable name: x
+Shadows.dfy(134,8): Error: Duplicate local-variable name: x
+Shadows.dfy(135,8): Error: Duplicate local-variable name: r
+Shadows.dfy(127,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(128,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(124,17): Warning: Shadowed let-variable name: r
+Shadows.dfy(148,8): Warning: Shadowed local-variable name: x
+Shadows.dfy(149,8): Error: Duplicate local-variable name: x
+Shadows.dfy(150,8): Error: Duplicate local-variable name: r
+Shadows.dfy(142,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(143,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(139,17): Warning: Shadowed let-variable name: r
+Shadows.dfy(162,8): Warning: Shadowed local-variable name: x
+Shadows.dfy(163,8): Error: Duplicate local-variable name: x
+Shadows.dfy(164,8): Error: Duplicate local-variable name: r
+Shadows.dfy(156,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(157,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(154,17): Warning: Shadowed let-variable name: r
+13 resolution/type errors detected in Shadows.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Shadows.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Shadows.dfy.refresh.expect
new file mode 100644
index 00000000000..cf352e92d42
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Shadows.dfy.refresh.expect
@@ -0,0 +1,47 @@
+Shadows.dfy(6,19): Error: Duplicate type-parameter name: beta
+Shadows.dfy(7,13): Warning: Shadowed type-parameter name: alpha
+Shadows.dfy(8,27): Error: Duplicate type-parameter name: beta
+Shadows.dfy(9,21): Warning: Shadowed type-parameter name: alpha
+Shadows.dfy(11,31): Error: Duplicate parameter name: x
+Shadows.dfy(18,10): Warning: Shadowed local-variable name: x
+Shadows.dfy(19,10): Error: Duplicate local-variable name: y
+Shadows.dfy(26,10): Error: Duplicate local-variable name: f
+Shadows.dfy(32,12): Warning: Shadowed local-variable name: x
+Shadows.dfy(38,28): Warning: Shadowed bound-variable name: x
+Shadows.dfy(39,40): Warning: Shadowed bound-variable name: y
+Shadows.dfy(65,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(66,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(62,17): Warning: Shadowed let-variable name: r
+Shadows.dfy(71,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(72,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(81,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(82,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(78,17): Warning: Shadowed let-variable name: r
+Shadows.dfy(87,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(88,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(96,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(97,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(94,17): Warning: Shadowed let-variable name: r
+Shadows.dfy(102,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(103,8): Warning: Shadowed let-variable name: x
+Shadows.dfy(119,8): Error: Duplicate local-variable name: x
+Shadows.dfy(120,8): Error: Duplicate local-variable name: r
+Shadows.dfy(133,8): Warning: Shadowed local-variable name: x
+Shadows.dfy(134,8): Error: Duplicate local-variable name: x
+Shadows.dfy(135,8): Error: Duplicate local-variable name: r
+Shadows.dfy(127,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(128,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(124,17): Warning: Shadowed let-variable name: r
+Shadows.dfy(148,8): Warning: Shadowed local-variable name: x
+Shadows.dfy(149,8): Error: Duplicate local-variable name: x
+Shadows.dfy(150,8): Error: Duplicate local-variable name: r
+Shadows.dfy(142,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(143,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(139,17): Warning: Shadowed let-variable name: r
+Shadows.dfy(162,8): Warning: Shadowed local-variable name: x
+Shadows.dfy(163,8): Error: Duplicate local-variable name: x
+Shadows.dfy(164,8): Error: Duplicate local-variable name: r
+Shadows.dfy(156,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(157,10): Warning: Shadowed let-variable name: x
+Shadows.dfy(154,17): Warning: Shadowed let-variable name: r
+13 resolution/type errors detected in Shadows.dfy
diff --git a/Test/dafny0/SharedDestructors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructors.dfy
similarity index 98%
rename from Test/dafny0/SharedDestructors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructors.dfy
index 98789151562..4a91c1d056e 100644
--- a/Test/dafny0/SharedDestructors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructors.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Dt =
diff --git a/Test/dafny0/SharedDestructors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructors.dfy.expect
similarity index 94%
rename from Test/dafny0/SharedDestructors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructors.dfy.expect
index 598e2b18e0b..5d7694f8475 100644
--- a/Test/dafny0/SharedDestructors.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructors.dfy.expect
@@ -10,6 +10,6 @@ SharedDestructors.dfy(101,12): Error: source of datatype update must be construc
 SharedDestructors.dfy(107,12): Error: source of datatype update must be constructed by 'RR'
 SharedDestructors.dfy(124,12): Error: source of datatype update must be constructed by 'C3'
 SharedDestructors.dfy(139,11): Error: source of datatype update must be constructed by 'Ma5' or 'Ma2'
-SharedDestructors.dfy(145,13): Error: assertion could not be proved
+SharedDestructors.dfy(145,4): Error: assertion might not hold
 
 Dafny program verifier finished with 0 verified, 13 errors
diff --git a/Test/dafny0/SharedDestructorsCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsCompile.dfy
similarity index 94%
rename from Test/dafny0/SharedDestructorsCompile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsCompile.dfy
index 64d8b245b58..3244884f325 100644
--- a/Test/dafny0/SharedDestructorsCompile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsCompile.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype Dt =
   | A(x: int, y: real)
diff --git a/Test/dafny0/SharedDestructorsCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsCompile.dfy.expect
similarity index 100%
rename from Test/dafny0/SharedDestructorsCompile.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsCompile.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsCompile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsCompile.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsCompile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny0/SharedDestructorsResolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsResolution.dfy
similarity index 98%
rename from Test/dafny0/SharedDestructorsResolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsResolution.dfy
index 48f992d6b3c..87eaf8cf0e8 100644
--- a/Test/dafny0/SharedDestructorsResolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsResolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Module0 {
diff --git a/Test/dafny0/SharedDestructorsResolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsResolution.dfy.expect
similarity index 100%
rename from Test/dafny0/SharedDestructorsResolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SharedDestructorsResolution.dfy.expect
diff --git a/Test/dafny0/ShowSnippets.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ShowSnippets.dfy
similarity index 86%
rename from Test/dafny0/ShowSnippets.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ShowSnippets.dfy
index f5304d5ab15..15ba76dc600 100644
--- a/Test/dafny0/ShowSnippets.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ShowSnippets.dfy
@@ -3,7 +3,7 @@
 // https://github.com/dafny-lang/dafny/issues/1518.
 // To work around this, we don't pass /useBaseNameForFileName and instead manually
 // truncate the source paths to their base names using sed.
-// RUN: %exits-with 4 %baredafny /compile:0 /showSnippets:1 "%s" > "%t".raw
+// RUN: %exits-with 4 %baredafny verify --use-basename-for-filename "%s" > "%t".raw
 // RUN: %sed 's/^.*[\/\\]//' "%t".raw > "%t"
 // RUN: %diff "%s.expect" "%t"
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ShowSnippets.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ShowSnippets.dfy.expect
new file mode 100644
index 00000000000..6688218cc49
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/ShowSnippets.dfy.expect
@@ -0,0 +1,17 @@
+ShowSnippets.dfy(13,2): Error: assertion might not hold
+   |
+13 |   assert false;
+   |   ^^^^^^^^^^^^^
+
+ShowSnippets.dfy(17,7): Error: a precondition for this call could not be proved
+   |
+17 |   Never();
+   |   ^^^^^^^^
+
+ShowSnippets.dfy(10,32): Related location: this is the precondition that could not be proved
+   |
+10 | method Never() requires true && false {}
+   |                                 ^^^^^
+
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny0/SiblingImports.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SiblingImports.dfy
similarity index 97%
rename from Test/dafny0/SiblingImports.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SiblingImports.dfy
index 178b3dbd018..46413fd5b53 100644
--- a/Test/dafny0/SiblingImports.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SiblingImports.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" --refresh-exit-code=0 -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   ClientA.Test();
diff --git a/Test/dafny0/SiblingImports.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SiblingImports.dfy.expect
similarity index 100%
rename from Test/dafny0/SiblingImports.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SiblingImports.dfy.expect
diff --git a/Test/dafny0/SiblingImportsErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SiblingImportsErrors.dfy
similarity index 96%
rename from Test/dafny0/SiblingImportsErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SiblingImportsErrors.dfy
index e6acce9332b..adea175f79b 100644
--- a/Test/dafny0/SiblingImportsErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SiblingImportsErrors.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module Library {
   export reveals Max
diff --git a/Test/dafny0/SiblingImportsErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SiblingImportsErrors.dfy.expect
similarity index 100%
rename from Test/dafny0/SiblingImportsErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SiblingImportsErrors.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Simple.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Simple.dfy
new file mode 100644
index 00000000000..d9f0e50d1f6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Simple.dfy
@@ -0,0 +1,103 @@
+// RUN: %resolve --allow-warnings --print:- "%s" > "%t"
+// RUN: %resolve --allow-warnings --print:- --type-system-refresh "%s" > "%t.refresh"
+// RUN: %diff "%s.expect" "%t"
+// RUN: %diff "%s.expect" "%t.refresh"
+// My first Dafny program
+// Rustan Leino, 27 January 2008
+class MyClass<T,U> {
+  var x: int
+
+  method M(s: bool, lotsaObjects: set<object>) returns (t: object, u: set<int>, v: seq<MyClass?<bool,U>>)
+    requires s
+    modifies this, lotsaObjects
+    ensures t == t
+    ensures old(null) != this  // warning: old(null) is the same as null
+  {
+    x := 12;
+    while (x < 100)
+      invariant x <= 100
+    {
+      x := x + 17;
+      if (x % 20 == 3) {
+        x := this.x + 1;
+      } else {
+        this.x := x + 0;
+      }
+      t, u, v := M(true, lotsaObjects);
+      var to: MyClass<T,U>;
+      t, u, v := this.M(true, lotsaObjects);
+      t, u, v := to.M(true, lotsaObjects);
+      assert v[x] != null ==> null !in v[2..x][1..][5 := v[this.x]][..10];
+    }
+  }
+
+  ghost function F(x: int, y: int, h: WildData, k: WildData): WildData
+  {
+    if x < 0 then h else
+    if (x == 0) then
+      if if h==k then true else false then h else if y == 0 then k else h
+    else k
+  }
+}
+
+// some datatype stuff:
+
+datatype List<T> = Nil | Cons(T, List<T>)
+
+datatype WildData =
+  Something() |
+  JustAboutAnything(bool, myName: set<int>, int, WildData) |
+  More(List<int>)
+
+class C {
+  var w: WildData
+  var list: List<bool>
+}
+
+lemma M(x: int)
+  ensures x < 8
+{
+  // proof would go here
+}
+greatest lemma M'(x': int)
+  ensures true
+{
+}
+
+// modifiers on functions
+
+class CF {
+  static ghost function F(): int
+  predicate G()
+  greatest predicate Co()
+  ghost function H(): int
+  static ghost function I(): real
+  static ghost predicate J()
+}
+
+// test printing of various if statements, including with omitted guards
+module A {
+  method P(x: int, y: int) {
+    if x==2 {
+    } else if * {
+    }
+    if x==10 {
+    }
+    if y==0 {
+    } else if y==1 {
+    } else if * {
+    } else if y==2 {
+    } else if (*) {
+    } else if y == 3 {
+    } else {
+    }
+  }
+}
+module B refines A {
+  method P... {
+    if ... {
+    } else if x==3 {
+    }
+    ...;
+  }
+}
diff --git a/Test/dafny0/Simple.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Simple.dfy.expect
similarity index 100%
rename from Test/dafny0/Simple.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Simple.dfy.expect
diff --git a/Test/dafny0/Skeletons.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Skeletons.dfy
similarity index 91%
rename from Test/dafny0/Skeletons.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Skeletons.dfy
index 6c11826ba58..94af9613ee4 100644
--- a/Test/dafny0/Skeletons.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Skeletons.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/dafny0/Skeletons.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Skeletons.dfy.expect
similarity index 100%
rename from Test/dafny0/Skeletons.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Skeletons.dfy.expect
diff --git a/Test/dafny0/SmallTests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SmallTests.dfy
similarity index 99%
rename from Test/dafny0/SmallTests.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SmallTests.dfy
index cac487516fe..b14b1b2aa90 100644
--- a/Test/dafny0/SmallTests.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SmallTests.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint.dfy" "%s" > "%t"
-// RUN: %dafny /noVerify /compile:0 "%t.dprint.dfy" >> "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-axioms --allow-deprecation --print "%t.dprint.dfy" "%s" > "%t"
+// RUN: %resolve --allow-axioms --allow-warnings "%t.dprint.dfy" >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class Node {
@@ -880,7 +880,7 @@ module DatatypeTestZ {
 module ConstantFieldReceiverNonNull {
   newtype Six = x | 6 <= x witness 6
 
-  trait Trait {
+  trait Trait extends object {
     const x0: Six
     const x1: Six := 7
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SmallTests.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SmallTests.dfy.expect
new file mode 100644
index 00000000000..352e0f7ec43
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SmallTests.dfy.expect
@@ -0,0 +1,73 @@
+SmallTests.dfy(920,4): Warning: You have written an assert statement with a negated condition, but the lack of whitespace between 'assert' and '!' suggests you may be used to Rust and have accidentally negated the asserted condition. If you did not intend the negation, remove the '!' and the parentheses; if you do want the negation, please add a space between the 'assert' and '!'.
+SmallTests.dfy(926,4): Warning: You have written an assert statement with a negated condition, but the lack of whitespace between 'assert' and '!' suggests you may be used to Rust and have accidentally negated the asserted condition. If you did not intend the negation, remove the '!' and the parentheses; if you do want the negation, please add a space between the 'assert' and '!'.
+SmallTests.dfy(389,23): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless method together with the {:axiom} attribute instead
+SmallTests.dfy(399,31): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless function together with the {:axiom} attribute instead
+SmallTests.dfy(411,25): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless method together with the {:axiom} attribute instead
+SmallTests.dfy(421,30): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless constructor together with the {:axiom} attribute instead
+SmallTests.dfy(431,33): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless function together with the {:axiom} attribute instead
+SmallTests.dfy(599,12): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+SmallTests.dfy(548,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+SmallTests.dfy(34,11): Error: index out of range
+SmallTests.dfy(65,35): Error: possible division by zero
+SmallTests.dfy(66,50): Error: possible division by zero
+SmallTests.dfy(67,21): Error: target object might be null
+SmallTests.dfy(86,23): Error: target object might be null
+SmallTests.dfy(120,5): Error: call might violate context's modifies clause
+SmallTests.dfy(132,9): Error: call might violate context's modifies clause
+SmallTests.dfy(134,9): Error: call might violate context's modifies clause
+SmallTests.dfy(174,8): Error: assignment might update an object field not in the enclosing context's modifies clause
+SmallTests.dfy(196,18): Error: assertion might not hold
+SmallTests.dfy(197,18): Error: assertion might not hold
+SmallTests.dfy(199,18): Error: assertion might not hold
+SmallTests.dfy(209,18): Error: assertion might not hold
+SmallTests.dfy(211,18): Error: assertion might not hold
+SmallTests.dfy(212,23): Error: assertion might not hold
+SmallTests.dfy(214,23): Error: assertion might not hold
+SmallTests.dfy(223,18): Error: assertion might not hold
+SmallTests.dfy(225,23): Error: assertion might not hold
+SmallTests.dfy(236,18): Error: assertion might not hold
+SmallTests.dfy(239,18): Error: assertion might not hold
+SmallTests.dfy(240,23): Error: assertion might not hold
+SmallTests.dfy(243,23): Error: assertion might not hold
+SmallTests.dfy(253,18): Error: assertion might not hold
+SmallTests.dfy(255,23): Error: assertion might not hold
+SmallTests.dfy(303,23): Error: a precondition for this call could not be proved
+SmallTests.dfy(281,16): Related location: this is the precondition that could not be proved
+SmallTests.dfy(338,2): Error: a postcondition could not be proved on this return path
+SmallTests.dfy(332,10): Related location: this is the postcondition that could not be proved
+SmallTests.dfy(379,2): Error: assertion might not hold
+SmallTests.dfy(386,2): Error: assertion might not hold
+SmallTests.dfy(396,8): Error: cannot prove termination; try supplying a decreases clause
+SmallTests.dfy(408,4): Error: assertion might not hold
+SmallTests.dfy(418,4): Error: assertion might not hold
+SmallTests.dfy(428,10): Error: cannot prove termination; try supplying a decreases clause
+SmallTests.dfy(445,2): Error: a postcondition could not be proved on this return path
+SmallTests.dfy(443,40): Related location: this is the postcondition that could not be proved
+SmallTests.dfy(604,2): Error: assertion might not hold
+SmallTests.dfy(618,19): Error: left-hand sides n.next and n.next.next might refer to the same location
+SmallTests.dfy(620,14): Error: left-hand sides a[j] and a[i] might refer to the same location
+SmallTests.dfy(627,24): Error: target object might be null
+SmallTests.dfy(640,2): Error: assertion might not hold
+SmallTests.dfy(664,4): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+SmallTests.dfy(687,2): Error: assertion might not hold
+SmallTests.dfy(701,9): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+SmallTests.dfy(703,9): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+SmallTests.dfy(716,8): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+SmallTests.dfy(733,4): Error: assertion might not hold
+SmallTests.dfy(754,6): Error: assertion might not hold
+SmallTests.dfy(757,6): Error: assertion might not hold
+SmallTests.dfy(901,14): Error: target object might be null
+SmallTests.dfy(909,14): Error: target object might be null
+SmallTests.dfy(920,4): Error: assertion might not hold
+SmallTests.dfy(926,4): Error: assertion might not hold
+
+Dafny program verifier finished with 56 verified, 50 errors
+SmallTests.dfy.tmp.dprint.dfy(65,23): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless method together with the {:axiom} attribute instead
+SmallTests.dfy.tmp.dprint.dfy(75,31): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless function together with the {:axiom} attribute instead
+SmallTests.dfy.tmp.dprint.dfy(590,25): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless method together with the {:axiom} attribute instead
+SmallTests.dfy.tmp.dprint.dfy(600,30): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless constructor together with the {:axiom} attribute instead
+SmallTests.dfy.tmp.dprint.dfy(610,33): Warning: The {:verify false} attribute should only be used during development. Consider using a bodyless function together with the {:axiom} attribute instead
+SmallTests.dfy.tmp.dprint.dfy(121,12): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+SmallTests.dfy.tmp.dprint.dfy(685,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier did not attempt verification
diff --git a/Test/dafny0/SplitExpr.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SplitExpr.dfy
similarity index 96%
rename from Test/dafny0/SplitExpr.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SplitExpr.dfy
index 741e1ea1b47..a19614a1b97 100644
--- a/Test/dafny0/SplitExpr.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SplitExpr.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class UnboundedStack<T> {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SplitExpr.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SplitExpr.dfy.expect
new file mode 100644
index 00000000000..f8171dcbad5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SplitExpr.dfy.expect
@@ -0,0 +1,4 @@
+SplitExpr.dfy(96,26): Error: loop invariant violation
+SplitExpr.dfy(90,49): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 8 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/StatementExpressions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/StatementExpressions.dfy
new file mode 100644
index 00000000000..ef02e5c9a54
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/StatementExpressions.dfy
@@ -0,0 +1,254 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code 4 "%s"
+
+
+lemma M(n: nat) //returns (y: nat)
+{
+  var y := F(n, 0);
+}
+ghost function F(n: nat, p: int): nat
+{
+  calc {
+    100;
+  <  { if n != 0 { M(n-1); } }
+    102;
+  }
+  n
+}
+
+lemma MM(n: nat) returns (y: nat)
+  decreases n, 0
+{
+  if n != 0 {
+    y := FF(n-1);
+  } else { y := *; }
+}
+ghost function FF(n: nat): nat
+  decreases n, 1
+{
+  calc {
+    100;
+  <  { var y := MM(n); }
+    102;
+  }
+  n
+}
+
+lemma P(n: nat)
+{
+  if n != 0 {
+    var y :=
+      calc {
+        12;
+        { P(n-1); }
+        12;
+      }
+      100;
+    assert y == 100;
+  }
+}
+lemma Q(n: nat)
+{
+  if n != 0 {
+    var y :=
+      calc {
+        12;
+        { Q(n+1); }  // error: cannot prove termination
+        12;
+      }
+      100;
+    assert y == 102;  // error: assertion does not hold
+  }
+}
+
+// ---------------------
+
+ghost function Fact(n: nat): nat
+{
+  if n == 0 then 1 else n * Fact(n-1)
+}
+
+lemma L(n: nat)
+  ensures 1 <= Fact(n)
+{
+}
+
+ghost function F_Fails(n: nat): int
+{
+  50 / Fact(n)  // error: possible division by zero
+}
+
+ghost function F_Succeeds(n: nat): int
+{
+  L(n);
+  50 / Fact(n)
+}
+
+ghost function F_PreconditionViolation(n: int): int
+{
+  L(n);  // error: argument might be negative
+  50 / Fact(n)
+}
+
+// --------------------- These had had parsing problems in the past
+
+lemma MyLemma(x: int) {
+  var d: Dtz := *;
+  if 0 < x {
+    var y: int := *;
+    match MyLemma(y); d {  // error: cannot prove termination
+      case Cons0(_) =>
+      case Cons1(_) =>
+    }
+  }
+}
+
+ghost function Parsing_Regression_test0(): int
+{
+  var x := 12;
+  assert x < 20;
+  MyLemma(x);
+  calc { x; < x+1; }
+  // and again
+  var x := 12;
+  assert x < 20;
+  MyLemma(x);
+  calc { x; < x+1; }
+  17
+}
+
+datatype Dtz = Cons0(int) | Cons1(bool)
+
+ghost function Parsing_Regression_test1(dtz: Dtz): int
+{
+  match dtz
+  case Cons0(s) =>
+    var x := 12;
+    assert x < 20;
+    MyLemma(x);
+    calc { x; < x+1; }
+    // and again
+    var x := 12;
+    assert x < 20;
+    MyLemma(x);
+    calc { x; < x+1; }
+    17
+  case Cons1(_) =>
+    var x := 12;
+    assert x < 20;
+    MyLemma(x);
+    calc { x; < x+1; }
+    // and again
+    var x := 12;
+    assert x < 20;
+    MyLemma(x);
+    calc { x; < x+1; }
+    19
+}
+
+ghost function Parsing_Regression_test2(): int
+{
+  // parentheses should be allowed anywhere
+  var x := 12;
+  ( assert x < 20;
+    ( MyLemma(x);
+      ( calc { x; < x+1; }
+        ( var x := 12;
+          ( assert x < 20;
+            ( MyLemma(x);
+              ( calc { x; < x+1; }
+                17
+  ) ) ) ) ) ) )
+}
+
+function PartialToTheDiagonal(x: int, y: int): int
+  requires x == y
+{
+  5
+}
+
+opaque function GimmieSeven(i: int): int { 7 }
+lemma AboutGimmieSeven(i: int)
+  ensures GimmieSeven(i) == 7
+{
+  reveal GimmieSeven();
+}
+
+function TestForallStatement0(a: int, b: int): int
+{
+  PartialToTheDiagonal(GimmieSeven(a), GimmieSeven(b)) // error: precondition violation
+}
+
+function TestForallStatement1(a: int, b: int): int
+{
+  reveal GimmieSeven();
+  PartialToTheDiagonal(GimmieSeven(a), GimmieSeven(b))
+}
+
+function TestForallStatement2(a: int, b: int): int
+{
+  AboutGimmieSeven(a);
+  AboutGimmieSeven(b);
+  PartialToTheDiagonal(GimmieSeven(a), GimmieSeven(b))
+}
+
+function TestForallStatement3(a: int, b: int): int
+{
+  assert GimmieSeven(a) == GimmieSeven(b) by {
+    forall i
+      ensures GimmieSeven(i) == 7
+    {
+      AboutGimmieSeven(i);
+    }
+  }
+  PartialToTheDiagonal(GimmieSeven(a), GimmieSeven(b))
+}
+
+function TestForallStatement4(a: int, b: int): int
+{
+  assert forall i :: GimmieSeven(i) == 7 by {
+    forall i
+      ensures GimmieSeven(i) == 7
+    {
+      AboutGimmieSeven(i);
+    }
+  }
+  PartialToTheDiagonal(GimmieSeven(a), GimmieSeven(b))
+}
+
+function TestForallStatement5(a: int, b: int): int
+{
+  forall i
+    ensures GimmieSeven(i) == 7
+  {
+    AboutGimmieSeven(i);
+  }
+  PartialToTheDiagonal(GimmieSeven(a), GimmieSeven(b))
+}
+
+function TestForallStatement6(a: int, b: int): int
+{
+  forall i {
+    AboutGimmieSeven(i);
+  }
+  PartialToTheDiagonal(GimmieSeven(a), GimmieSeven(b))
+}
+
+function TestForallStatement7(a: int, b: int): int
+  requires 0 <= a && 0 <= b
+{
+  forall i | 0 <= i
+    ensures GimmieSeven(i) == 7
+  {
+    AboutGimmieSeven(i);
+  }
+  PartialToTheDiagonal(GimmieSeven(a), GimmieSeven(b))
+}
+
+function TestForallStatement8(a: int, b: int): int
+  requires 0 <= a && 0 <= b
+{
+  forall i | 0 <= i {
+    AboutGimmieSeven(i);
+  }
+  PartialToTheDiagonal(GimmieSeven(a), GimmieSeven(b))
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/StatementExpressions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/StatementExpressions.dfy.expect
new file mode 100644
index 00000000000..fc5d3a4fa78
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/StatementExpressions.dfy.expect
@@ -0,0 +1,9 @@
+StatementExpressions.dfy(55,11): Error: cannot prove termination; try supplying a decreases clause
+StatementExpressions.dfy(59,4): Error: assertion might not hold
+StatementExpressions.dfy(77,5): Error: possible division by zero
+StatementExpressions.dfy(88,4): Error: value does not satisfy the subset constraints of 'nat'
+StatementExpressions.dfy(98,17): Error: cannot prove termination; try supplying a decreases clause
+StatementExpressions.dfy(178,22): Error: function precondition could not be proved
+StatementExpressions.dfy(164,13): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 20 verified, 6 errors
diff --git a/Test/dafny0/Stdin.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Stdin.dfy
similarity index 86%
rename from Test/dafny0/Stdin.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Stdin.dfy
index 74cd0093ada..adb6e495710 100644
--- a/Test/dafny0/Stdin.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Stdin.dfy
@@ -1,6 +1,6 @@
 // RUN: %exits-with 0 %stdin "module A{}" %baredafny verify --show-snippets:false --stdin > "%t"
 // RUN: %exits-with 4 %stdin "method a() { assert false; }" %baredafny verify --show-snippets:false --stdin >> "%t"
-// RUN: %exits-with 0 %stdin "" %baredafny verify --show-snippets:false --stdin >> "%t"
+// RUN: %exits-with 0 %stdin "" %baredafny verify --allow-warnings --show-snippets:false --stdin >> "%t"
 // Ensuring include statements work when processing standard in too
 // (regression test for https://github.com/dafny-lang/dafny/issues/4135)
 // We don't capture the output to %t because it ends up including paths,
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Stdin.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Stdin.dfy.expect
new file mode 100644
index 00000000000..757fdba9707
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Stdin.dfy.expect
@@ -0,0 +1,7 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+<stdin>(1,13): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Strings.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Strings.dfy
new file mode 100644
index 00000000000..cfce8478458
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Strings.dfy
@@ -0,0 +1,173 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-deprecation --unicode-char=false
+
+method Char(a: char, s: string, i: int) returns (b: char)
+{
+  var ch: char := *;
+  if a == ch {
+    b := ch;
+  } else if 0 <= i < |s| {
+    b := s[i];
+  } else {
+    b := *;
+  }
+}
+
+// An attribute parameter that is a string literal is passed down
+// to Boogie as a string literal.
+method {:MyAttribute "hello", "hi" + "there", 57} AttrTest()
+{
+}
+
+method M(a: char, b: char) returns (s: string, t: seq<char>)
+  ensures |s| == 3 ==> t == [a, b, b]
+{ 
+  s := *;
+  s := s + [a, b, b] + s;
+  t := s;
+  s := t[0..|s|];
+}
+
+// Note that actually printing strings with non-ASCII characters
+// is currently inconsistent across both languages and platforms.
+// See https://github.com/dafny-lang/dafny/pull/2938 for an
+// attempt to fix this that had to be reverted.
+// For now we're just making runtimes assertions about the contents of
+// strings rather than printing them and relying on the diff with the expect file.
+method Main()
+{
+  var ch: char := *;
+  var s, t := M(ch, ch);
+  print "ch = ", ch, "\n";
+  print "The string is: " + s + "\n";
+  var x, y, z, zz := Escapes();
+  print "Escape X: ", x, "\n";
+  print "Escape Y: ", y, "\n";
+  print "Escape Z: ", z, "\n";
+  // TODO: Won't work until https://github.com/dafny-lang/dafny/issues/2999 is addressed
+  // print "Escape ZZ: ", zz, "\n";
+  var c, d := CharEscapes();
+  print "Here is the end" + [c, d] + [' ', ' ', ' '] + [[d]][0] + "   ", d, "\n";
+
+  // Testing non-ASCII characters directly in string literals.
+  // Code points outside the BMP are still not supported.
+  // See https://github.com/dafny-lang/dafny/issues/818.
+  
+  var coffeeInvitation :=  "Let's go to the café";
+  assert |coffeeInvitation| == 20;
+  expect |coffeeInvitation| == 20;
+  assert coffeeInvitation[19] == 'é';
+  expect coffeeInvitation[19] == 'é';
+
+  var firstNonAsciiChar := "Ā";
+  assert |firstNonAsciiChar| == 1;
+  expect |firstNonAsciiChar| == 1;
+  assert firstNonAsciiChar[0] == 'Ā';
+  expect firstNonAsciiChar[0] == 'Ā';
+
+  // Something above the surrogate range,
+  // and a verbatim string to make sure that's handled as well.
+  var highBMPChar := @"￮";
+  assert |highBMPChar| == 1;
+  expect |highBMPChar| == 1;
+  assert highBMPChar[0] == 0xFFEE as char;
+  expect highBMPChar[0] == 0xFFEE as char;
+  
+  // Testing invalid UTF-16 content that Dafny allows (when --unicode-char=false)
+
+  var x?, y?, z? := WeirdStrings();
+  
+  expect |x?| == 30;
+  expect x?[29] as int == 55296;
+  expect |y?| == 30;
+  expect x?[29] as int == 55296;
+  expect |z?| > 2;
+  expect z?[0..2] == ['\ude0e', '\ud83d'];
+
+  var c?, d? := WeirdChars();
+  expect c? == 0xD800 as char;
+  expect d? == '\uDFFF';
+
+  // Ensuring we're precise enough about identifying \u escapes
+  print "I'm afraid you'll find escape quite impossible, \\u007", "\n";
+  print "Luckily I have this nifty gadget from my good friend, \\\u0051", "\n";
+
+  AllCharsTest();
+}
+
+method GimmieAChar(s: string) returns (ch: char)
+{
+  if s == "" {
+    ch := "tn"[1];
+    assert ch == "nt"[0];
+  } else {
+    var i :| 0 <= i < |s|;  // if guard guarantees such an i exists
+    ch := s[i];
+  }
+}
+
+method Escapes() returns (x: string, y: string, z: string, zz: string)
+  ensures |zz| > 2
+{
+  x := "I say \"hello\" \\ you say \'good bye'";
+  y := @"I say ""hello"" \ you say 'good bye'";
+  assert x == y;
+  z := "There needs to be \u0052\u0026\u0044\n\tYes, sir";
+  zz := "\ud83d\ude0e is the UTF-16 for a very cool emoji";
+}
+
+method CharEscapes() returns (c: char, d: char)
+{
+  // cool variable names, huh?
+  var 'x := 'R';
+  var x' := '\u0052';
+  assert 'x==x' ;
+  c := '\n';
+  d := '*';
+}
+
+// Strings that aren't valid UTF-16 sequences
+method WeirdStrings() returns (x: string, y: string, z: string)
+{
+  x := "What even is this character: \uD800";
+  y := "What even is this character: " + [0xD800 as char];
+  assert x == y;
+  z := "\ude0e\ud83d is not using surrogates correctly";
+}
+
+// Surrogate code points
+method WeirdChars() returns (c: char, d: char)
+{
+  c := '\uD800';
+  d := 0xDFFF as char;
+}
+
+method AllCharsTest() {
+  var allChars := set c: char {:trigger Identity(c)} | true :: Identity(c);
+  var allUTF16CodeUnits := set cp: int {:trigger Identity(cp as char)} | 0 <= cp < 0x1_0000 :: Identity(cp as char);
+  assert forall c: char {:trigger Identity(c)} :: 0 <= Identity(c) as int < 0x1_0000;
+  assert forall c: char :: Identity(c) in allChars;
+  assert allChars == allUTF16CodeUnits;
+
+  // I'd love to expect allChars == allCodePoints, but that's currently
+  // an O(n^2) operation in some runtimes that don't have hashcode-based
+  // set operations, and n here is 2^16. :P
+  expect |allChars| == |allUTF16CodeUnits|;
+}
+
+function Identity<T>(x: T): T { x }
+
+method CharsAndArrows() {
+  var lambda := (c: char) requires c <= 'Z' => c + 1 as char;
+  var fromLambda := lambda('C');
+  print fromLambda, "\n";
+
+  var funcRef := IncrementChar;
+  var fromFuncRef := funcRef('C');
+  print fromFuncRef, "\n";
+}
+
+function IncrementChar(c: char): char 
+  requires c <= 'Z'
+{
+  c + 1 as char
+}
diff --git a/Test/dafny0/Strings.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Strings.dfy.expect
similarity index 100%
rename from Test/dafny0/Strings.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Strings.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Strings.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Strings.dfy.rs.check
new file mode 100644
index 00000000000..294d69868c2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Strings.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitCharBoundedPool</i>.*
\ No newline at end of file
diff --git a/Test/dafny0/SubsetTypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypes.dfy
similarity index 99%
rename from Test/dafny0/SubsetTypes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypes.dfy
index 7e46f921de6..19773e1c00a 100644
--- a/Test/dafny0/SubsetTypes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypes.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" --performance-stats=100 --relax-definite-assignment --allow-axioms > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module AssignmentToNat {
diff --git a/Test/dafny0/SubsetTypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypes.dfy.expect
similarity index 94%
rename from Test/dafny0/SubsetTypes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypes.dfy.expect
index dfc651d0338..61e24262814 100644
--- a/Test/dafny0/SubsetTypes.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypes.dfy.expect
@@ -7,7 +7,7 @@ SubsetTypes.dfy(16,6): Error: cannot establish the existence of LHS values that
 SubsetTypes.dfy(19,11): Error: value does not satisfy the subset constraints of 'nat'
 SubsetTypes.dfy(21,15): Error: value does not satisfy the subset constraints of 'nat'
 SubsetTypes.dfy(23,8): Error: value does not satisfy the subset constraints of 'nat'
-SubsetTypes.dfy(30,4): Error: value does not satisfy the subset constraints of 'nat'
+SubsetTypes.dfy(31,6): Error: value does not satisfy the subset constraints of 'nat'
 SubsetTypes.dfy(31,7): Error: value does not satisfy the subset constraints of 'nat'
 SubsetTypes.dfy(42,24): Error: value does not satisfy the subset constraints of 'nat'
 SubsetTypes.dfy(44,15): Error: value does not satisfy the subset constraints of 'nat'
@@ -23,7 +23,7 @@ SubsetTypes.dfy(72,6): Error: cannot establish the existence of LHS values that
 SubsetTypes.dfy(75,11): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
 SubsetTypes.dfy(77,15): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
 SubsetTypes.dfy(79,8): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
-SubsetTypes.dfy(86,4): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
+SubsetTypes.dfy(87,6): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
 SubsetTypes.dfy(87,7): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
 SubsetTypes.dfy(98,24): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
 SubsetTypes.dfy(100,15): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
@@ -63,10 +63,10 @@ SubsetTypes.dfy(318,18): Error: value does not satisfy the subset constraints of
 SubsetTypes.dfy(323,20): Error: value does not satisfy the subset constraints of 'nat'
 SubsetTypes.dfy(330,20): Error: result of operation might violate newtype constraint for 'Nat'
 SubsetTypes.dfy(337,20): Error: result of operation might violate newtype constraint for 'Nat'
-SubsetTypes.dfy(343,18): Error: value does not satisfy the subset constraints of 'Nat'
 SubsetTypes.dfy(342,7): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-SubsetTypes.dfy(348,18): Error: result of operation might violate newtype constraint for 'Nat'
+SubsetTypes.dfy(343,18): Error: value does not satisfy the subset constraints of 'Nat'
 SubsetTypes.dfy(347,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+SubsetTypes.dfy(348,18): Error: result of operation might violate newtype constraint for 'Nat'
 SubsetTypes.dfy(352,7): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
 SubsetTypes.dfy(360,21): Error: possible division by zero
 SubsetTypes.dfy(365,23): Error: possible division by zero
@@ -83,11 +83,13 @@ SubsetTypes.dfy(398,26): Error: value of expression (of type 'int ~> int') is no
 SubsetTypes.dfy(401,9): Error: value does not satisfy the subset constraints of 'nat'
 SubsetTypes.dfy(411,7): Error: cannot find witness that shows type is inhabited (only tried 'D'); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
 SubsetTypes.dfy(413,7): Error: cannot find witness that shows type is inhabited (only tried 'D'); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-SubsetTypes.dfy(429,13): Error: assertion could not be proved
-SubsetTypes.dfy(436,15): Error: assertion could not be proved
-SubsetTypes.dfy(445,15): Error: assertion could not be proved
-SubsetTypes.dfy(452,15): Error: assertion could not be proved
-SubsetTypes.dfy(459,15): Error: assertion could not be proved
-SubsetTypes.dfy(464,13): Error: assertion could not be proved
+SubsetTypes.dfy(429,4): Error: assertion might not hold
+SubsetTypes.dfy(436,6): Error: assertion might not hold
+SubsetTypes.dfy(445,6): Error: assertion might not hold
+SubsetTypes.dfy(452,6): Error: assertion might not hold
+SubsetTypes.dfy(459,6): Error: assertion might not hold
+SubsetTypes.dfy(464,4): Error: assertion might not hold
 
 Dafny program verifier finished with 13 verified, 91 errors
+Total resources used is 738600
+Max resources used by VC is 76700
diff --git a/Test/dafny0/SubsetTypesERR.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypesERR.dfy
similarity index 97%
rename from Test/dafny0/SubsetTypesERR.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypesERR.dfy
index 9ef8b32bfae..cb500b51206 100644
--- a/Test/dafny0/SubsetTypesERR.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypesERR.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module AssignmentsFromNewAllocation {
diff --git a/Test/dafny0/SubsetTypesERR.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypesERR.dfy.expect
similarity index 100%
rename from Test/dafny0/SubsetTypesERR.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/SubsetTypesERR.dfy.expect
diff --git a/Test/dafny0/Superposition.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Superposition.legacy.dfy
similarity index 100%
rename from Test/dafny0/Superposition.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Superposition.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Superposition.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Superposition.legacy.dfy.expect
new file mode 100644
index 00000000000..d2c642f6533
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Superposition.legacy.dfy.expect
@@ -0,0 +1,20 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+Superposition.legacy.dfy(38,9): Warning: the ... refinement feature in statements is deprecated
+
+Verifying M0.C.M (correctness) ...
+  [4 proof obligations]  verified
+
+Verifying M0.C.Q (well-formedness) ...
+  [3 proof obligations]  error
+Superposition.legacy.dfy(23,6): Error: a postcondition could not be proved on this return path
+Superposition.legacy.dfy(21,25): Related location: this is the postcondition that could not be proved
+
+Verifying M0.C.R (well-formedness) ...
+  [3 proof obligations]  error
+Superposition.legacy.dfy(29,6): Error: a postcondition could not be proved on this return path
+Superposition.legacy.dfy(27,25): Related location: this is the postcondition that could not be proved
+
+Verifying M1.C.M (correctness) ...
+  [1 proof obligation]  verified
+
+Dafny program verifier finished with 2 verified, 2 errors
diff --git a/Test/dafny0/TailCalls.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TailCalls.dfy
similarity index 98%
rename from Test/dafny0/TailCalls.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TailCalls.dfy
index 01580ee9edf..4f43f10f3c9 100644
--- a/Test/dafny0/TailCalls.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TailCalls.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --allow-deprecation
+
 
 method {:tailrecursion} A(q: int) returns (x: int, ghost y: bool, z: nat)
 {
@@ -168,7 +168,7 @@ function U(x: int, ghost y: int): nat
 
 function {:tailrecursion} Q(n: nat): nat {
   if n % 5 == 0 then
-    var s := Q;  // error: this use of Q is not a tail call
+    var s := Q;  // error (x2): this use of Q is not a tail call, and cannot use Q as naked function here
     10
   else if n % 5 == 1 then
     Q(Q(n - 1))  // error: inner Q is not a tail call
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TailCalls.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TailCalls.dfy.expect
new file mode 100644
index 00000000000..b456484c8de
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TailCalls.dfy.expect
@@ -0,0 +1,32 @@
+TailCalls.dfy(21,16): Error: this recursive call is not recognized as being tail recursive, because it is followed by non-ghost code
+TailCalls.dfy(38,24): Error: sorry, tail-call optimizations are not supported for mutually recursive methods
+TailCalls.dfy(43,24): Error: sorry, tail-call optimizations are not supported for mutually recursive methods
+TailCalls.dfy(171,13): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
+TailCalls.dfy(174,7): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
+TailCalls.dfy(178,14): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
+TailCalls.dfy(181,7): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
+TailCalls.dfy(188,32): Error: tail recursion can be specified only for functions that will be compiled, not for ghost functions
+TailCalls.dfy(195,30): Error: tail recursion can be specified only for methods that will be compiled, not for ghost methods
+TailCalls.dfy(229,7): Error: if-then-else branches have different accumulator needs for tail recursion
+TailCalls.dfy(261,2): Error: if-then-else branches have different accumulator needs for tail recursion
+TailCalls.dfy(288,17): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
+TailCalls.dfy(310,22): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
+TailCalls.dfy(316,30): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
+TailCalls.dfy(323,41): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
+TailCalls.dfy(338,22): Error: this recursive call is not recognized as being tail recursive, because it is followed by non-ghost code
+TailCalls.dfy(369,21): Error: this recursive call is not recognized as being tail recursive, because it is followed by non-ghost code
+TailCalls.dfy(380,35): Error: a recursive call in this context is not recognized as a tail call
+TailCalls.dfy(416,35): Error: a recursive call in this context is not recognized as a tail call
+TailCalls.dfy(416,52): Error: a recursive call in this context is not recognized as a tail call
+TailCalls.dfy(425,10): Error: the recursive call to 'FBM2' is not tail recursive because the actual out-parameter is not the formal out-parameter
+TailCalls.dfy(425,17): Error: a recursive call in this context is not recognized as a tail call
+TailCalls.dfy(437,10): Error: the recursive call to 'FBM3' is not tail recursive because the actual out-parameter is not the formal out-parameter 'r'
+TailCalls.dfy(437,17): Error: a recursive call in this context is not recognized as a tail call
+TailCalls.dfy(449,18): Error: a recursive call in this context is not recognized as a tail call
+TailCalls.dfy(451,23): Error: a recursive call in this context is not recognized as a tail call
+TailCalls.dfy(462,15): Error: a recursive call in this context is not recognized as a tail call
+TailCalls.dfy(110,14): Error: the recursive call to '_ctor' is not tail recursive, because the assignment of the LHS happens after the call
+TailCalls.dfy(126,19): Error: the recursive call to 'Compute' is not tail recursive because the actual type argument is not the formal type parameter 'G'
+TailCalls.dfy(139,17): Error: the recursive call to 'Run' is not tail recursive because the actual type argument 1 is not the formal type parameter 'G'
+TailCalls.dfy(171,13): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
+31 resolution/type errors detected in TailCalls.dfy
diff --git a/Test/dafny0/Termination.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Termination.dfy
similarity index 91%
rename from Test/dafny0/Termination.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Termination.dfy
index 68d5a384070..c9fb0a342bf 100644
--- a/Test/dafny0/Termination.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Termination.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /unicodeChar:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --relax-definite-assignment --allow-deprecation --unicode-char=false
+
 
 class Termination {
   method A(N: int)
@@ -392,7 +392,7 @@ module MultisetTests {
     if n == 0 then 0 else F'(a, n-1)
   }
 
-  ghost method M(n: nat, b: multiset<int>)
+  lemma M(n: nat, b: multiset<int>)
     ensures F(b, n) == 0  // proved via automatic induction
   {
   }
@@ -410,7 +410,7 @@ module MapTests {
     if n == 0 then 0 else F'(a, n-1)
   }
 
-  ghost method M(n: nat, b: map<int,int>)
+  lemma M(n: nat, b: map<int,int>)
     ensures F(b, n) == 0  // proved via automatic induction
   {
   }
@@ -487,7 +487,7 @@ datatype Tree = Empty | Node(root: int, left: Tree, right: Tree)
       }
   }
 
-  lemma {:induction this} {:vcs_split_on_every_assert} EvensSumToEven()  // explicitly use "this" as quantified over by induction hypothesis
+  lemma {:induction this} {:isolate_assertions} EvensSumToEven()  // explicitly use "this" as quantified over by induction hypothesis
     requires forall u :: u in Elements() ==> u % 2 == 0
     ensures Sum() % 2 == 0
     // auto: decreases this
@@ -500,7 +500,7 @@ datatype Tree = Empty | Node(root: int, left: Tree, right: Tree)
       right.EvensSumToEven();
   }
 
-  lemma {:vcs_split_on_every_assert} EvensSumToEvenAutoInduction()  // {:induction this} is the default
+  lemma {:isolate_assertions} EvensSumToEvenAutoInduction()  // {:induction this} is the default
     requires forall u :: u in Elements() ==> u % 2 == 0
     ensures Sum() % 2 == 0
     // auto: decreases this
@@ -514,7 +514,7 @@ datatype Tree = Empty | Node(root: int, left: Tree, right: Tree)
   }
 }
 
-lemma ExtEvensSumToEven(t: Tree)
+lemma {:induction false} ExtEvensSumToEven(t: Tree)
   requires forall u :: u in t.Elements() ==> u % 2 == 0
   ensures t.Sum() % 2 == 0
   // auto: decreases t
@@ -523,11 +523,11 @@ lemma ExtEvensSumToEven(t: Tree)
   case Empty =>
   case Node(x, left, right) =>
     assert x in t.Elements();
-    assert left.Sum() % 2 == 0;
-    assert right.Sum() % 2 == 0;
-    assert t.Sum() % 2 == 0;
+    assert left.Elements() <= t.Elements();
+    assert right.Elements() <= t.Elements();
+    ExtEvensSumToEven(left);
+    ExtEvensSumToEven(right);
 }
-
 // ------ attempts to use a decreases term whose "less" relation is "false"
 
 method LoopyInt(x: int) {
@@ -903,6 +903,32 @@ method Negation1(S: set) {
 // ------------------ multiple conjuncts in the guard -----------------------
 
 method MultipleGuardConjuncts0(N: nat) {
+  // The old resolver (/typeSystemRefresh:0) infers the type of `s` to be `nat`. That doesn't
+  // seem justifiable in general, but happens to work for this example. In fact, it's helpful
+  // for this example, because this type then provides the loop invariant `0 <= s`, which is
+  // needed to prove termination.
+  //
+  // The new resolver (/typeSystemRefresh:1) infers the type of `s` to be `int`. That is more
+  // justifiable in general. Unfortunately, this means that the type of `s` does not contribute
+  // the loop invariant that's necessary to prove termination of this loop. Fortunately, Dafny
+  // asks Boogie to do a little abstract interpretation (/infer:j). From the fact that `N`
+  // satisfies `0 <= N` on entry and the assignment `s := s - 1;` is guarded by `s != 0, one
+  // can infer `0 <= s`. Unfortunately, the condition `0 <= N` is encoded in a `where` clause
+  // and Boogie's abstract interpretation doesn't look at `where` clauses (https://github.com/boogie-org/boogie/issues/786).
+  //
+  // For this reason, /typeSystemRefresh:1 causes a cannot-prove-termination complaint for this
+  // method. The nearly identical method MultipleGuardConjuncts0' uses a Dafny precondition for
+  // the condition `0 <= N`, which Boogie's abstract interpreter does pick up. So, it verifies.
+  var s, b := N, *;
+  while b && s != 0 {
+    s, b := s - 1, *;
+  }
+}
+
+method MultipleGuardConjuncts0'(N: int)
+  requires 0 <= N
+{
+  // See comment in MultipleGuardConjuncts0 above.
   var s, b := N, *;
   while b && s != 0 {
     s, b := s - 1, *;
diff --git a/Test/dafny0/Termination.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Termination.dfy.expect
similarity index 81%
rename from Test/dafny0/Termination.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Termination.dfy.expect
index 5b0731df039..805b029c460 100644
--- a/Test/dafny0/Termination.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Termination.dfy.expect
@@ -1,16 +1,16 @@
-Termination.dfy(450,7): Warning: the ... refinement feature in statements is deprecated
-Termination.dfy[TerminationRefinement1](441,5): Error: decreases clause might not decrease
 Termination.dfy(108,2): Error: cannot prove termination; try supplying a decreases clause for the loop
 Termination.dfy(125,2): Error: decreases expression might not decrease
 Termination.dfy(126,16): Error: decreases expression must be bounded below by 0 at end of loop iteration
-Termination.dfy(255,34): Error: cannot prove termination; try supplying a decreases clause
+Termination.dfy(255,41): Error: cannot prove termination; try supplying a decreases clause
 Termination.dfy(296,2): Error: decreases expression might not decrease
+Termination.dfy(361,47): Error: decreases clause might not decrease
 Termination.dfy(534,2): Error: decreases expression might not decrease
 Termination.dfy(542,2): Error: decreases expression might not decrease
 Termination.dfy(549,2): Error: decreases expression might not decrease
 Termination.dfy(556,2): Error: decreases expression might not decrease
 Termination.dfy(563,2): Error: decreases expression might not decrease
 Termination.dfy(571,2): Error: decreases expression might not decrease
+Termination.dfy(577,5): Error: cannot find witness that shows type is inhabited; try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
 Termination.dfy(579,2): Error: decreases expression might not decrease
 Termination.dfy(589,2): Error: decreases expression might not decrease
 Termination.dfy(674,2): Error: cannot prove termination; try supplying a decreases clause for the loop
@@ -18,9 +18,8 @@ Termination.dfy(714,2): Error: cannot prove termination; try supplying a decreas
 Termination.dfy(722,2): Error: cannot prove termination; try supplying a decreases clause for the loop
 Termination.dfy(730,2): Error: decreases expression might not decrease
 Termination.dfy(806,2): Error: cannot prove termination; try supplying a decreases clause for the loop
-Termination.dfy(1152,2): Error: cannot prove termination; try supplying a decreases clause for the loop
-Termination.dfy(1168,2): Error: cannot prove termination; try supplying a decreases clause for the loop
-Termination.dfy(361,46): Error: decreases clause might not decrease
-Termination.dfy(577,5): Error: cannot find witness that shows type is inhabited; try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+Termination.dfy(1178,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+Termination.dfy(1194,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+Termination.dfy[TerminationRefinement1](441,5): Error: decreases clause might not decrease
 
-Dafny program verifier finished with 95 verified, 23 errors
+Dafny program verifier finished with 108 verified, 23 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Termination.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Termination.dfy.refresh.expect
new file mode 100644
index 00000000000..6b893c639cf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Termination.dfy.refresh.expect
@@ -0,0 +1,26 @@
+Termination.dfy(108,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+Termination.dfy(125,2): Error: decreases expression might not decrease
+Termination.dfy(126,16): Error: decreases expression must be bounded below by 0 at end of loop iteration
+Termination.dfy(255,41): Error: cannot prove termination; try supplying a decreases clause
+Termination.dfy(296,2): Error: decreases expression might not decrease
+Termination.dfy(361,47): Error: decreases clause might not decrease
+Termination.dfy(534,2): Error: decreases expression might not decrease
+Termination.dfy(542,2): Error: decreases expression might not decrease
+Termination.dfy(549,2): Error: decreases expression might not decrease
+Termination.dfy(556,2): Error: decreases expression might not decrease
+Termination.dfy(563,2): Error: decreases expression might not decrease
+Termination.dfy(571,2): Error: decreases expression might not decrease
+Termination.dfy(577,5): Error: cannot find witness that shows type is inhabited; try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+Termination.dfy(579,2): Error: decreases expression might not decrease
+Termination.dfy(589,2): Error: decreases expression might not decrease
+Termination.dfy(674,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+Termination.dfy(714,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+Termination.dfy(722,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+Termination.dfy(730,2): Error: decreases expression might not decrease
+Termination.dfy(806,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+Termination.dfy(923,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+Termination.dfy(1178,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+Termination.dfy(1194,2): Error: cannot prove termination; try supplying a decreases clause for the loop
+Termination.dfy[TerminationRefinement1](441,5): Error: decreases clause might not decrease
+
+Dafny program verifier finished with 107 verified, 24 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tooltips.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tooltips.dfy
new file mode 100644
index 00000000000..2f490445ec4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tooltips.dfy
@@ -0,0 +1,23 @@
+// RUN: %dafny /compile:0 /typeSystemRefresh:1 /generalNewtypes:1 /printTooltips "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+type D<X> = set
+
+type B0<Y> = (int, B1<Y>)
+type B1<YY> = y: set | true
+
+newtype NN<!Y3> = iset<Y3>
+datatype B2<!Y2> = Something(NN<Y2>)
+
+newtype OO<!Y5> = y: iset<Y5> | true
+codatatype B3<!Y4> = Something(OO<Y4>)
+
+method M<T>(s: set)
+method N<W>() returns (s: set<W>)
+function F<U>(s: set): U
+function G<U>(x: U): set
+
+method M'(s: set)
+method N'() returns (s: set)
+function F'(s: set): int
+function G'(x: int): set
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tooltips.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tooltips.dfy.expect
new file mode 100644
index 00000000000..db3d6ab324c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tooltips.dfy.expect
@@ -0,0 +1,18 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+Tooltips.dfy(4,7): Info: (==)
+Tooltips.dfy(6,8): Info: (==)
+Tooltips.dfy(7,8): Info: (==)
+Tooltips.dfy(9,12): Info: (==)
+Tooltips.dfy(10,13): Info: (==)
+Tooltips.dfy(12,12): Info: (==)
+Tooltips.dfy(13,15): Info: (==)
+Tooltips.dfy(15,9): Info: (==)
+Tooltips.dfy(16,9): Info: (==)
+Tooltips.dfy(17,11): Info: (==)
+Tooltips.dfy(18,11): Info: (==)
+Tooltips.dfy(20,7): Info: <_T0(==)>
+Tooltips.dfy(21,7): Info: <_T0(==)>
+Tooltips.dfy(22,9): Info: <_T0(==)>
+Tooltips.dfy(23,9): Info: <_T0(==)>
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/dafny0/TriggerInPredicate.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TriggerInPredicate.dfy
similarity index 87%
rename from Test/dafny0/TriggerInPredicate.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TriggerInPredicate.dfy
index 33a2ca0e330..4d842a422af 100644
--- a/Test/dafny0/TriggerInPredicate.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TriggerInPredicate.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost predicate A(x: bool, y: bool) { x }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TriggerInPredicate.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TriggerInPredicate.dfy.expect
new file mode 100644
index 00000000000..83ed96ed7b6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TriggerInPredicate.dfy.expect
@@ -0,0 +1,4 @@
+TriggerInPredicate.dfy(9,21): Info: Some instances of this call are not inlined.
+TriggerInPredicate.dfy(9,21): Info: Some instances of this call are not inlined.
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny0/Tuples.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tuples.dfy
similarity index 89%
rename from Test/dafny0/Tuples.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tuples.dfy
index 0a5a7da529a..20655b34100 100644
--- a/Test/dafny0/Tuples.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tuples.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 method M(x: int)
 {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tuples.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tuples.dfy.expect
new file mode 100644
index 00000000000..b25d23824cd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Tuples.dfy.expect
@@ -0,0 +1,4 @@
+Tuples.dfy(22,2): Error: assertion might not hold
+Tuples.dfy(24,20): Error: possible division by zero
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny0/Twostate-Functions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Functions.dfy
similarity index 98%
rename from Test/dafny0/Twostate-Functions.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Functions.dfy
index d8b56b074c9..add30878f25 100644
--- a/Test/dafny0/Twostate-Functions.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Functions.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Basic {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Functions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Functions.dfy.expect
new file mode 100644
index 00000000000..a613f45eff0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Functions.dfy.expect
@@ -0,0 +1,17 @@
+Twostate-Functions.dfy(11,27): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+Twostate-Functions.dfy(18,12): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+Twostate-Functions.dfy(23,8): Error: insufficient reads clause to read field; Consider adding 'reads u' or 'reads u`aa' in the enclosing twostate function specification for resolution
+Twostate-Functions.dfy(66,29): Error: assertion might not hold
+Twostate-Functions.dfy(54,14): Related location: this proposition could not be proved
+Twostate-Functions.dfy(68,27): Error: assertion might not hold
+Twostate-Functions.dfy(54,14): Related location: this proposition could not be proved
+Twostate-Functions.dfy(92,24): Error: argument for parameter 'u' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new u: U', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Functions.dfy(97,40): Error: argument at index 1 for parameter 'x' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new x: U', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Functions.dfy(129,25): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+Twostate-Functions.dfy(147,12): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+Twostate-Functions.dfy(164,15): Error: argument for parameter 'd' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new d: D', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Functions.dfy(167,13): Error: function precondition could not be proved
+Twostate-Functions.dfy(183,15): Error: argument for parameter 'd' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new d: D', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Functions.dfy(186,13): Error: function precondition could not be proved
+
+Dafny program verifier finished with 18 verified, 13 errors
diff --git a/Test/dafny0/Twostate-Resolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Resolution.dfy
similarity index 96%
rename from Test/dafny0/Twostate-Resolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Resolution.dfy
index a39b6cf5bfb..f710c4e20c5 100644
--- a/Test/dafny0/Twostate-Resolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Resolution.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /env:0 /print:"%t.print" /dprint:- "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --print:-
+
 
 module M0 {
   class A {
@@ -7,8 +7,8 @@ module M0 {
     var g: A
   }
 
+
   twostate lemma L8(a: A, new b: A)
-    requires a != null
     requires unchanged(a.g)
     modifies a.g  // error: lemmas are not allowed to have modifies clauses
     decreases old(a.f)
@@ -124,15 +124,15 @@ module G {
     ensures P()  // error: cannot use a two-state function here
     decreases P()  // error: cannot use a two-state function here
     decreases old(c.f)  // error: cannot use 'old' here
+
   method Me(c: C) returns (b: bool)
-    requires c != null
     requires P()  // error: cannot use a two-state function here
     modifies if P() then {null} else {}  // error: cannot use a two-state function here
     ensures P()
     decreases P()  // error: cannot use a two-state function here
     decreases old(c.f)  // error: cannot use 'old' here
+
   iterator Iter(c: C)
-    requires c != null
     requires P()  // error: cannot use a two-state function here
     yield requires P()  // error: cannot use a two-state function here
     reads if P() then {null} else {}  // error: cannot use a two-state function here
@@ -141,14 +141,14 @@ module G {
     yield ensures P()
     decreases P()  // error: cannot use a two-state function here
     decreases old(c.f)  // error: cannot use 'old' here
+
   twostate function TF(c: C): int
-    requires c != null
     requires P()
     reads if P() then {null} else {}  // error: cannot use a two-state function here
     ensures P()
     decreases P(), old(c.f), c.f
+
   twostate lemma TL(c: C)
-    requires c != null
     requires P()
     ensures P()
     decreases P(), old(c.f), c.f
@@ -166,8 +166,8 @@ module H {
     ghost var q: () -> bool := YY.Sp;  // error: cannot use a two-state function in this context
     if P() then 5 else 7  // error: cannot use a two-state function here
   }
+
   method Me(c: C) returns (b: bool)
-    requires c != null
     ensures P()
   {
     assert P();
@@ -176,8 +176,8 @@ module H {
   }
   class D {
     ghost function G(): int
+
     static method Sm(c: C) returns (ghost b: bool)
-      requires c != null
       ensures P()
     {
       ghost var u := G();  // error: G requires receiver, which is not available here in static method
@@ -188,14 +188,14 @@ module H {
       ghost var q: () -> bool := YY.Sp;
     }
   }
+
   iterator Iter(c: C)
-    requires c != null
     ensures P()
     yield ensures P()
   {
   }
+
   twostate function TF(c: C): int
-    requires c != null
     requires P()
     ensures P()
     decreases P(), old(c.f), c.f
@@ -204,8 +204,8 @@ module H {
       var p: () -> bool := P;
       if p() then 7 else 9
   }
+
   twostate lemma TL(c: C)
-    requires c != null
     requires P()
     ensures P()
     decreases P(), old(c.f), c.f
@@ -478,13 +478,13 @@ module TwoStateAt {
   method UseOrdinaryOpaque() {
     label L:
     reveal OrdinaryOpaque();
-    reveal OrdinaryOpaque;  // error: missing parentheses
+    reveal OrdinaryOpaque;
     reveal OrdinaryOpaque@K();  // error: label K not in scope
     reveal OrdinaryOpaque@L();  // error: @ can only be applied to something two-state (error message can be improved)
   }
   ghost function FuncUseOrdinaryOpaque(): int {
     reveal OrdinaryOpaque();
-    reveal OrdinaryOpaque;  // error: missing parentheses
+    reveal OrdinaryOpaque;
     reveal OrdinaryOpaque@K();  // error: label K not in scope
     10
   }
@@ -492,7 +492,7 @@ module TwoStateAt {
   method UseOpaque() {
     label L:
     reveal Opaque();
-    reveal Opaque;  // error: missing parentheses
+    reveal Opaque;
     reveal Opaque@K();  // error: label K not in scope
     reveal Opaque@L();  // error: all parameters in a reveal must be implicit, including labels
   }
@@ -504,7 +504,7 @@ module TwoStateAt {
   }
   twostate function TwoFuncUseOpaque(): int {
     reveal Opaque();
-    reveal Opaque;  // error: missing parentheses
+    reveal Opaque;
     reveal Opaque@K();  // error: label K not in scope
     10
   }
diff --git a/Test/dafny0/Twostate-Resolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Resolution.dfy.expect
similarity index 91%
rename from Test/dafny0/Twostate-Resolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Resolution.dfy.expect
index ed124045454..dacaa7774d7 100644
--- a/Test/dafny0/Twostate-Resolution.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Resolution.dfy.expect
@@ -3,7 +3,6 @@
 
 module M0 {
   twostate lemma L8(a: A, new b: A)
-    requires a != null
     requires unchanged(a.g)
     modifies a.g
     decreases old(a.f)
@@ -133,21 +132,18 @@ module G {
     decreases P(), old(c.f)
 
   method Me(c: C) returns (b: bool)
-    requires c != null
     requires P()
     modifies if P() then {null} else {}
     ensures P()
     decreases P(), old(c.f)
 
   twostate function TF(c: C): int
-    requires c != null
     requires P()
     reads if P() then {null} else {}
     ensures P()
     decreases P(), old(c.f), c.f
 
   twostate lemma TL(c: C)
-    requires c != null
     requires P()
     ensures P()
     decreases P(), old(c.f), c.f
@@ -157,7 +153,6 @@ module G {
   }
 
   iterator Iter(c: C)
-    requires c != null
     requires P()
     reads if P() then {null} else {}
     modifies if P() then {null} else {}
@@ -184,7 +179,6 @@ module H {
   }
 
   method Me(c: C) returns (b: bool)
-    requires c != null
     ensures P()
   {
     assert P();
@@ -193,7 +187,6 @@ module H {
   }
 
   twostate function TF(c: C): int
-    requires c != null
     requires P()
     ensures P()
     decreases P(), old(c.f), c.f
@@ -205,7 +198,6 @@ module H {
   }
 
   twostate lemma TL(c: C)
-    requires c != null
     requires P()
     ensures P()
     decreases P(), old(c.f), c.f
@@ -235,7 +227,6 @@ module H {
     ghost function G(): int
 
     static method Sm(c: C) returns (ghost b: bool)
-      requires c != null
       ensures P()
     {
       ghost var u := G();
@@ -248,7 +239,6 @@ module H {
   }
 
   iterator Iter(c: C)
-    requires c != null
     yield ensures P()
     ensures P()
   {
@@ -735,7 +725,7 @@ Twostate-Resolution.dfy(167,7): Error: two-state function ('P') can only be call
 Twostate-Resolution.dfy(218,6): Error: two-state lemmas can only be used in two-state contexts
 Twostate-Resolution.dfy(183,21): Error: 'this' is not allowed in a 'static' context
 Twostate-Resolution.dfy(184,21): Error: 'this' is not allowed in a 'static' context
-Twostate-Resolution.dfy(229,9): Error: a call to a twostate predicate is allowed only in specification contexts
+Twostate-Resolution.dfy(229,10): Error: a call to a twostate predicate is allowed only in specification contexts
 Twostate-Resolution.dfy(230,30): Error: a twostate predicate is allowed only in specification contexts
 Twostate-Resolution.dfy(242,26): Error: two-state function ('F') can only be called in a two-state context
 Twostate-Resolution.dfy(243,27): Error: two-state lemmas can only be used in two-state contexts
@@ -753,20 +743,16 @@ Twostate-Resolution.dfy(445,20): Error: no label 'After' in scope at this time
 Twostate-Resolution.dfy(452,17): Error: an @-label can only be applied to a two-state function
 Twostate-Resolution.dfy(453,14): Error: an @-label can only be applied to a two-state lemma
 Twostate-Resolution.dfy(459,19): Error: an @-label can only be applied to a two-state function
-Twostate-Resolution.dfy(481,11): Error: to reveal a function (OrdinaryOpaque), append parentheses
-Twostate-Resolution.dfy(482,26): Error: no label 'K' in scope at this time
-Twostate-Resolution.dfy(483,26): Error: an @-label can only be applied to a two-state lemma
-Twostate-Resolution.dfy(487,11): Error: to reveal a function (OrdinaryOpaque), append parentheses
-Twostate-Resolution.dfy(488,26): Error: no label 'K' in scope at this time
-Twostate-Resolution.dfy(495,11): Error: to reveal a function (Opaque), append parentheses
-Twostate-Resolution.dfy(496,18): Error: no label 'K' in scope at this time
-Twostate-Resolution.dfy(497,19): Error: to reveal a two-state function, do not list any parameters or @-labels
-Twostate-Resolution.dfy(500,17): Error: a two-state function can only be revealed in a two-state context
-Twostate-Resolution.dfy(501,11): Error: to reveal a function (Opaque), append parentheses
-Twostate-Resolution.dfy(502,18): Error: no label 'K' in scope at this time
-Twostate-Resolution.dfy(502,19): Error: a two-state function can only be revealed in a two-state context
-Twostate-Resolution.dfy(507,11): Error: to reveal a function (Opaque), append parentheses
-Twostate-Resolution.dfy(508,18): Error: no label 'K' in scope at this time
+Twostate-Resolution.dfy(482,27): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(483,27): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(488,27): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(496,19): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(497,19): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(500,11): Error: two-state function ('Opaque') can only be called in a two-state context
+Twostate-Resolution.dfy(501,11): Error: two-state function ('Opaque') can only be called in a two-state context
+Twostate-Resolution.dfy(502,19): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(502,11): Error: two-state function ('Opaque') can only be called in a two-state context
+Twostate-Resolution.dfy(508,19): Error: an @-label can not be used in a hide or reveal statement
 Twostate-Resolution.dfy(515,11): Error: two-state lemmas can only be used in two-state contexts
 Twostate-Resolution.dfy(535,28): Error: parameter 'a' of function P cannot be changed, compared to in the overridden function, from non-older to older
 Twostate-Resolution.dfy(536,22): Error: parameter 'a' of function Q cannot be changed, compared to in the overridden function, from older to non-older
@@ -776,4 +762,4 @@ Twostate-Resolution.dfy(558,26): Error: parameter 'a' of function P cannot be ch
 Twostate-Resolution.dfy(559,20): Error: parameter 'a' of function Q cannot be changed, compared to the corresponding function in the module it refines, from older to non-older
 Twostate-Resolution.dfy(560,27): Error: parameter 'a' of function X cannot be changed, compared to the corresponding function in the module it refines, from non-new to new
 Twostate-Resolution.dfy(561,23): Error: parameter 'a' of function Y cannot be changed, compared to the corresponding function in the module it refines, from new to non-new
-73 resolution/type errors detected in Twostate-Resolution.dfy
+69 resolution/type errors detected in Twostate-Resolution.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Resolution.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Resolution.dfy.refresh.expect
new file mode 100644
index 00000000000..dacaa7774d7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Resolution.dfy.refresh.expect
@@ -0,0 +1,765 @@
+// Twostate-Resolution.dfy
+
+
+module M0 {
+  twostate lemma L8(a: A, new b: A)
+    requires unchanged(a.g)
+    modifies a.g
+    decreases old(a.f)
+  {
+  }
+
+  class A {
+    var f: int
+    var g: A
+  }
+}
+
+module M1 {
+  class C {
+    var f: int
+  }
+
+  class K {
+    var g: int
+
+    method M(c: C)
+      requires unchanged(c)
+      ensures unchanged(c)
+
+    lemma L(c: C)
+      requires unchanged(c)
+      ensures unchanged(c)
+
+    ghost function F(c: C): bool
+      requires unchanged(c)
+      ensures unchanged(c)
+
+    twostate lemma L2(c: C, d: C)
+      requires unchanged(c, d`f, `g, this`g)
+      ensures unchanged(c)
+    {
+      assert g == this.g == this.g == d.f;
+    }
+  }
+}
+
+module PrettyPrinting {
+  twostate function F(x: int, new u: object): real
+  {
+    x as real
+  }
+
+  twostate predicate P(y: real, new u: object)
+  {
+    y.Floor as real == y
+  }
+
+  class U {
+    twostate function G(x: int, new u: object): real
+    {
+      x as real
+    }
+
+    twostate predicate Q(y: real, new u: object)
+    {
+      y.Floor as real == y
+    }
+
+    static twostate function H(x: int, new u: object): real
+    {
+      x as real
+    }
+
+    static twostate predicate R(y: real, new u: object)
+    {
+      y.Floor as real == y
+    }
+
+    function MF(y: real, ghost g: int): char
+    {
+      'G'
+    }
+
+    twostate lemma LL(y: real, new u: object)
+    {
+    }
+  }
+}
+
+module F {
+  class U {
+    var aa: int
+    var bb: int
+    var next: U
+
+    static twostate function H(x: int, new u: object): real
+    {
+      assert u == this;
+      x as real
+    }
+
+    twostate predicate R(y: real, new u: object)
+    {
+      y.Floor
+    }
+
+    twostate function G(x: int, new u: object): real
+      requires this != u
+      requires old(aa) <= aa && unchanged(`bb)
+      reads this, old(next)
+      ensures old(aa) <= aa && old(G(x, u)) == G(x, u)
+      decreases old(aa) - old(aa) + x
+    {
+      if 0 < x then
+        G(x - 1, u)
+      else
+        x as real
+    }
+  }
+}
+
+module G {
+  twostate predicate P()
+  {
+    true
+  }
+
+  ghost function Fu(): int
+    requires P()
+    reads if P() then {null} else {}
+    ensures P()
+    decreases P(), old(c.f)
+
+  method Me(c: C) returns (b: bool)
+    requires P()
+    modifies if P() then {null} else {}
+    ensures P()
+    decreases P(), old(c.f)
+
+  twostate function TF(c: C): int
+    requires P()
+    reads if P() then {null} else {}
+    ensures P()
+    decreases P(), old(c.f), c.f
+
+  twostate lemma TL(c: C)
+    requires P()
+    ensures P()
+    decreases P(), old(c.f), c.f
+
+  class C {
+    var f: int
+  }
+
+  iterator Iter(c: C)
+    requires P()
+    reads if P() then {null} else {}
+    modifies if P() then {null} else {}
+    yield requires P()
+    yield ensures P()
+    ensures P()
+    decreases P(), old(c.f)
+}
+
+module H {
+  twostate predicate P()
+  {
+    true
+  }
+
+  ghost function Fu(): int
+  {
+    ghost var p: () -> bool := P;
+    ghost var q: () -> bool := YY.Sp;
+    if P() then
+      5
+    else
+      7
+  }
+
+  method Me(c: C) returns (b: bool)
+    ensures P()
+  {
+    assert P();
+    ghost var p: () -> bool := P;
+    ghost var q: () -> bool := YY.Sp;
+  }
+
+  twostate function TF(c: C): int
+    requires P()
+    ensures P()
+    decreases P(), old(c.f), c.f
+  {
+    if P() then
+      5
+    else
+      var p: () -> bool := P; if p() then 7 else 9
+  }
+
+  twostate lemma TL(c: C)
+    requires P()
+    ensures P()
+    decreases P(), old(c.f), c.f
+  {
+    assert P();
+    var p: () -> bool := P;
+  }
+
+  ghost function K(c: C): int
+  {
+    TL(c);
+    5
+  }
+
+  class C {
+    var f: int
+  }
+
+  class YY {
+    static twostate predicate Sp()
+    {
+      false
+    }
+  }
+
+  class D {
+    ghost function G(): int
+
+    static method Sm(c: C) returns (ghost b: bool)
+      ensures P()
+    {
+      ghost var u := G();
+      ghost var g := G;
+      assert P();
+      b := P();
+      ghost var p: () -> bool := P;
+      ghost var q: () -> bool := YY.Sp;
+    }
+  }
+
+  iterator Iter(c: C)
+    yield ensures P()
+    ensures P()
+  {
+  }
+}
+
+module J {
+  twostate predicate P()
+  {
+    true
+  }
+
+  method Me() returns (b: bool)
+    ensures P()
+  {
+    assert P();
+    b := P();
+    var p': () -> bool;
+    p' := P;
+  }
+}
+
+module OldWithinOld {
+  class C {
+    var data: int
+    var next: C
+
+    twostate function F(): int
+
+    twostate lemma L()
+
+    method M()
+    {
+      ghost var x0 := old(F());
+      ghost var x1 := old(L(); 5);
+      ghost var x2 := old(unchanged(this));
+      ghost var x3 := unchanged(old(next));
+      ghost var x4 := old(fresh(this));
+      ghost var x5 := fresh(old(next));
+      ghost var x6 := old(old(data));
+    }
+  }
+}
+
+module TraitsAndOldParameters {
+  class C { }
+
+  trait Tr {
+    twostate predicate A(c: C)
+
+    twostate predicate B(new c: C)
+
+    twostate predicate P(c: C, new d: C)
+
+    twostate lemma L(c: C)
+
+    twostate lemma M(new c: C)
+
+    twostate lemma N(c: C, new d: C)
+  }
+
+  class Cl extends Tr {
+    twostate predicate A(new c: C)
+
+    twostate predicate B(c: C)
+
+    twostate predicate P(c: C, new d: C)
+
+    twostate lemma L(new c: C)
+
+    twostate lemma M(c: C)
+
+    twostate lemma N(c: C, new d: C)
+  }
+}
+
+module PrintTest {
+  function Five(): int
+  {
+    5
+  }
+
+  ghost function Six(): int
+  {
+    6
+  }
+
+  function Ten(): int
+  {
+    var f := Five();
+    ghost var s := Six();
+    assert s == 6;
+    f + f
+  }
+
+  function TenAgain(): int
+  {
+    var ten := var f := Five(); ghost var s := Six(); assert s == 6; f + f;
+    ten
+  }
+
+  ghost function TenOnceMore(): int
+  {
+    var ten := var f := Five(); ghost var s := Six(); assert s == 6; f + f;
+    ten
+  }
+
+  ghost function Eleven(): int
+  {
+    var f, s := Five(), Six();
+    f + s
+  }
+
+  ghost function Twelve(): int
+  {
+    var s, t := Six(), Six();
+    s + t
+  }
+
+  function Twenty(): int
+  {
+    var x :| x == 10;
+    x + x
+  }
+
+  function TwentyOne(): int
+  {
+    ghost var x :| x == 10 && Yes(x);
+    assert x + x + 1 == 21;
+    21
+  }
+
+  ghost predicate Yes(x: int)
+  {
+    true
+  }
+
+  type Odd = x
+    | var rr := 2; x % rr == 1
+    witness var ww := 2; ww + 7
+
+  newtype NewOdd = x
+    | var rr := 2; x % rr == 1
+    witness var ww := 2; ww + 7
+
+  type Even = x
+    | var rr := 2; x % rr == 0
+    ghost witness var ww := 2; ww + 8
+
+  newtype NewEven = x
+    | var rr := 2; x % rr == 0
+    ghost witness var ww := 2; ww + 8
+}
+
+module TwoStateAt {
+  twostate function SP<Y>(c: Cell, y: Y): int
+    reads c
+  {
+    old(c.data) + c.data
+  }
+
+  ghost function F(): int
+  {
+    9
+  }
+
+  method Test<Y>(c: Cell, b: bool, y: Y)
+    requires c.data == 2
+    modifies c
+  {
+    assert c.Plus(0) == 4;
+    c.data := c.data + 3;
+    label Five:
+    assert Cell.Sum(c, y) == 7;
+    assert Cell.Sum<int>@Five(c, 0) == 10;
+    assert Cell.Sum@Five(c, 0) == 10;
+    assert Cell.Sum<Y>@Five(c, y) == 10;
+    assert Cell.Sum@Five(c, y) == 10;
+    c.data := c.data + 1;
+    assert SP<bv3>(c, 0) == 8;
+    assert SP<Y>@DoesNotExist(c, y) == 11;
+    if b {
+      label OnlyB:
+      c.data := c.data + 10;
+    } else {
+      c.data := c.data + 20;
+    }
+    label PostIf:
+    assert c.Plus<Y>@OnlyB(y) == 16 || c.Plus<int>@Five(0) == 26;
+    assert b ==> Cell.Sum@PostIf(c, y) == 32;
+    ghost var z := F@Five();
+  }
+
+  twostate lemma TwoLemma<Y>(c: Cell, y: Y)
+    requires 2 * old(c.data) <= Cell.Sum<Y>(c, y)
+    ensures old(c.data) <= SP<int>(c, 0) == SP<Y>(c, y) == c.Plus(0)
+  {
+  }
+
+  method CallLemmas<Y>(c: Cell, b: bool, y: Y)
+    modifies c
+  {
+    c.data := c.data + 1;
+    label OneMore:
+    if -1 <= old(c.data) {
+      TwoLemma<Y>(c, y);
+    }
+    c.data := c.data + 4;
+    label FiveMore:
+    TwoLemma<int>@OneMore(c, 0);
+    if b {
+      c.data := c.data - 10;
+      TwoLemma<Y>@FiveMore(c, y);
+    } else {
+      c.data := c.data + 2;
+      TwoLemma<int>@After(c, 0);
+    }
+    c.LL(y);
+    c.LL<Y>(y);
+    c.LL<bv3>(0);
+    label After:
+    var g := c.G@FiveMore();
+    c.Theorem@OneMore();
+  }
+
+  method ExprAt(c: Cell, f: int -> int, g: int -> int, b: bool)
+  {
+    label L:
+    var plus := c.Plus<int>;
+    var xL := plus@L(0);
+  }
+
+  twostate lemma ReturnSomething(c: Cell) returns (x: int, d: Cell)
+  {
+    d := c;
+  }
+
+  method CallTwo(c: Cell)
+    modifies c
+  {
+    c.data := 16;
+    label L:
+    var x, d := ReturnSomething@L(c);
+  }
+
+  ghost function {:opaque} OrdinaryOpaque(): int
+  {
+    12
+  }
+
+  method UseOrdinaryOpaque()
+  {
+    label L:
+    reveal OrdinaryOpaque();
+    reveal OrdinaryOpaque;
+    reveal OrdinaryOpaque@K();
+    reveal OrdinaryOpaque@L();
+  }
+
+  ghost function FuncUseOrdinaryOpaque(): int
+  {
+    reveal OrdinaryOpaque();
+    reveal OrdinaryOpaque;
+    reveal OrdinaryOpaque@K();
+    10
+  }
+
+  twostate function {:opaque} Opaque(): int
+  {
+    12
+  }
+
+  method UseOpaque()
+  {
+    label L:
+    reveal Opaque();
+    reveal Opaque;
+    reveal Opaque@K();
+    reveal Opaque@L();
+  }
+
+  ghost function FuncUseOpaque(): int
+  {
+    reveal Opaque();
+    reveal Opaque;
+    reveal Opaque@K();
+    10
+  }
+
+  twostate function TwoFuncUseOpaque(): int
+  {
+    reveal Opaque();
+    reveal Opaque;
+    reveal Opaque@K();
+    10
+  }
+
+  twostate lemma EasyTwo()
+    ensures true
+
+  ghost function CallEasy(): int
+  {
+    EasyTwo();
+    9
+  }
+
+  class Cell {
+    var data: int
+
+    constructor (x: int)
+      ensures data == x
+    {
+      data := x;
+    }
+
+    static twostate function Sum<Y>(c: Cell, y: Y): int
+      reads c
+    {
+      c.Plus<Y>(y)
+    }
+
+    twostate function Plus<Y>(y: Y): int
+      reads this
+    {
+      SP<Y>(this, y)
+    }
+
+    twostate lemma LL<Y>(y: Y)
+      ensures old(data) < data
+    {
+      var g := data;
+      IdentityLemma<Y>(this, y);
+      Cell.IdentityLemma<int>(this, 0);
+      this.IdentityLemma<Y>(this, y);
+      assert data == g;
+    }
+
+    static twostate lemma IdentityLemma<Y>(c: Cell, y: Y)
+    {
+      assert old(c.data) == c.data;
+    }
+
+    function G(): int
+    {
+      32
+    }
+
+    lemma Theorem()
+    {
+    }
+  }
+}
+
+module OlderParameters {
+  class C { }
+
+  trait Tr {
+    ghost predicate P(a: C)
+
+    ghost predicate Q(older a: C)
+
+    twostate predicate X(a: C)
+
+    twostate predicate Y(new a: C)
+  }
+
+  class Good extends Tr {
+    ghost predicate P(a: C)
+
+    ghost predicate Q(older a: C)
+
+    twostate predicate X(a: C)
+
+    twostate predicate Y(new a: C)
+  }
+
+  class Bad extends Tr {
+    ghost predicate P(older a: C)
+
+    ghost predicate Q(a: C)
+
+    twostate predicate X(new a: C)
+
+    twostate predicate Y(a: C)
+  }
+}
+
+module RefinementBase {
+  ghost predicate P(a: C)
+
+  ghost predicate Q(older a: C)
+
+  twostate predicate X(a: C)
+
+  twostate predicate Y(new a: C)
+
+  class C { }
+}
+
+module GoodRefinement refines RefinementBase {
+  ghost predicate P(a: C)
+  {
+    true
+  }
+
+  ghost predicate Q(older a: C)
+  {
+    true
+  }
+
+  twostate predicate X(a: C)
+  {
+    true
+  }
+
+  twostate predicate Y(new a: C)
+  {
+    true
+  }
+}
+
+module BadRefinement refines RefinementBase {
+  ghost predicate P(older a: C)
+  {
+    true
+  }
+
+  ghost predicate Q(a: C)
+  {
+    true
+  }
+
+  twostate predicate X(new a: C)
+  {
+    true
+  }
+
+  twostate predicate Y(a: C)
+  {
+    true
+  }
+}
+
+module RevealInsideIterator {
+  ghost function {:opaque} G(): int
+  {
+    2
+  }
+
+  iterator Iter(x: int) yields (r: int)
+  {
+    reveal G();
+  }
+}
+Twostate-Resolution.dfy(13,15): Error: twostate lemmas are not allowed to have modifies clauses
+Twostate-Resolution.dfy(25,15): Error: unchanged expressions are not allowed in this context
+Twostate-Resolution.dfy(28,15): Error: unchanged expressions are not allowed in this context
+Twostate-Resolution.dfy(31,15): Error: unchanged expressions are not allowed in this context
+Twostate-Resolution.dfy(32,14): Error: unchanged expressions are not allowed in this context
+Twostate-Resolution.dfy(93,18): Error: 'this' is not allowed in a 'static' context
+Twostate-Resolution.dfy(97,23): Error: Function body type mismatch (expected bool, got int)
+Twostate-Resolution.dfy(106,12): Error: old expressions are not allowed in this context
+Twostate-Resolution.dfy(107,35): Error: two-state function ('G') can only be called in a two-state context
+Twostate-Resolution.dfy(122,13): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(123,13): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(124,12): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(125,14): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(126,14): Error: old expressions are not allowed in this context
+Twostate-Resolution.dfy(126,18): Error: unresolved identifier: c
+Twostate-Resolution.dfy(129,13): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(130,16): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(132,14): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(133,14): Error: old expressions are not allowed in this context
+Twostate-Resolution.dfy(147,13): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(142,14): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(143,14): Error: old expressions are not allowed in this context
+Twostate-Resolution.dfy(138,13): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(139,16): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(136,13): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(137,19): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(165,31): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(166,34): Error: two-state function ('Sp') can only be called in a two-state context
+Twostate-Resolution.dfy(167,7): Error: two-state function ('P') can only be called in a two-state context
+Twostate-Resolution.dfy(218,6): Error: two-state lemmas can only be used in two-state contexts
+Twostate-Resolution.dfy(183,21): Error: 'this' is not allowed in a 'static' context
+Twostate-Resolution.dfy(184,21): Error: 'this' is not allowed in a 'static' context
+Twostate-Resolution.dfy(229,10): Error: a call to a twostate predicate is allowed only in specification contexts
+Twostate-Resolution.dfy(230,30): Error: a twostate predicate is allowed only in specification contexts
+Twostate-Resolution.dfy(242,26): Error: two-state function ('F') can only be called in a two-state context
+Twostate-Resolution.dfy(243,27): Error: two-state lemmas can only be used in two-state contexts
+Twostate-Resolution.dfy(244,26): Error: unchanged expressions are not allowed in this context
+Twostate-Resolution.dfy(246,26): Error: fresh expressions are not allowed in this context
+Twostate-Resolution.dfy(248,26): Error: old expressions are not allowed in this context
+Twostate-Resolution.dfy(264,29): Error: parameter 'c' of function A cannot be changed, compared to in the overridden function, from non-new to new
+Twostate-Resolution.dfy(265,25): Error: parameter 'c' of function B cannot be changed, compared to in the overridden function, from new to non-new
+Twostate-Resolution.dfy(267,25): Error: in-parameter 'c' of method L cannot be changed, compared to in the overridden method, from non-new to new
+Twostate-Resolution.dfy(268,21): Error: in-parameter 'c' of method M cannot be changed, compared to in the overridden method, from new to non-new
+Twostate-Resolution.dfy(405,17): Error: no label 'DoesNotExist' in scope at this time
+Twostate-Resolution.dfy(415,21): Error: no label 'OnlyB' in scope at this time
+Twostate-Resolution.dfy(418,21): Error: an @-label can only be applied to a two-state function
+Twostate-Resolution.dfy(445,20): Error: no label 'After' in scope at this time
+Twostate-Resolution.dfy(452,17): Error: an @-label can only be applied to a two-state function
+Twostate-Resolution.dfy(453,14): Error: an @-label can only be applied to a two-state lemma
+Twostate-Resolution.dfy(459,19): Error: an @-label can only be applied to a two-state function
+Twostate-Resolution.dfy(482,27): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(483,27): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(488,27): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(496,19): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(497,19): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(500,11): Error: two-state function ('Opaque') can only be called in a two-state context
+Twostate-Resolution.dfy(501,11): Error: two-state function ('Opaque') can only be called in a two-state context
+Twostate-Resolution.dfy(502,19): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(502,11): Error: two-state function ('Opaque') can only be called in a two-state context
+Twostate-Resolution.dfy(508,19): Error: an @-label can not be used in a hide or reveal statement
+Twostate-Resolution.dfy(515,11): Error: two-state lemmas can only be used in two-state contexts
+Twostate-Resolution.dfy(535,28): Error: parameter 'a' of function P cannot be changed, compared to in the overridden function, from non-older to older
+Twostate-Resolution.dfy(536,22): Error: parameter 'a' of function Q cannot be changed, compared to in the overridden function, from older to non-older
+Twostate-Resolution.dfy(537,29): Error: parameter 'a' of function X cannot be changed, compared to in the overridden function, from non-new to new
+Twostate-Resolution.dfy(538,25): Error: parameter 'a' of function Y cannot be changed, compared to in the overridden function, from new to non-new
+Twostate-Resolution.dfy(558,26): Error: parameter 'a' of function P cannot be changed, compared to the corresponding function in the module it refines, from non-older to older
+Twostate-Resolution.dfy(559,20): Error: parameter 'a' of function Q cannot be changed, compared to the corresponding function in the module it refines, from older to non-older
+Twostate-Resolution.dfy(560,27): Error: parameter 'a' of function X cannot be changed, compared to the corresponding function in the module it refines, from non-new to new
+Twostate-Resolution.dfy(561,23): Error: parameter 'a' of function Y cannot be changed, compared to the corresponding function in the module it refines, from new to non-new
+69 resolution/type errors detected in Twostate-Resolution.dfy
diff --git a/Test/dafny0/Twostate-Verification.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Verification.dfy
similarity index 99%
rename from Test/dafny0/Twostate-Verification.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Verification.dfy
index badb0d1ec63..bff60008fc3 100644
--- a/Test/dafny0/Twostate-Verification.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Verification.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:3 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %run "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Main() {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Verification.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Verification.dfy.expect
new file mode 100644
index 00000000000..c4ba830fd5b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Twostate-Verification.dfy.expect
@@ -0,0 +1,70 @@
+Twostate-Verification.dfy(656,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(657,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(658,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(659,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(661,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(662,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(663,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(665,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(666,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(667,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(668,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(670,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(671,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(672,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(673,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(675,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(676,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(677,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(679,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(680,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(681,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(682,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(33,13): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+Twostate-Verification.dfy(313,38): Error: assertion might not hold
+Twostate-Verification.dfy(337,23): Error: a precondition for this call could not be proved
+Twostate-Verification.dfy(317,29): Related location: this is the precondition that could not be proved
+Twostate-Verification.dfy(359,6): Error: assertion might not hold
+Twostate-Verification.dfy(361,6): Error: assertion might not hold
+Twostate-Verification.dfy(384,17): Error: receiver argument could not be proved to be allocated in the two-state function's previous state
+Twostate-Verification.dfy(386,17): Error: receiver argument could not be proved to be allocated in the two-state function's previous state
+Twostate-Verification.dfy(391,26): Error: argument at index 0 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(393,28): Error: argument at index 0 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(398,19): Error: receiver argument could not be proved to be allocated in the two-state function's previous state
+Twostate-Verification.dfy(412,8): Error: receiver argument could not be proved to be allocated in the two-state lemma's previous state
+Twostate-Verification.dfy(414,8): Error: receiver argument could not be proved to be allocated in the two-state lemma's previous state
+Twostate-Verification.dfy(420,27): Error: argument at index 0 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(422,29): Error: argument at index 0 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(447,28): Error: argument at index 0 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(451,30): Error: argument at index 0 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(466,29): Error: argument at index 0 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(470,31): Error: argument at index 0 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(558,22): Error: argument at index 2 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(561,22): Error: argument at index 2 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(564,22): Error: argument at index 2 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(567,22): Error: argument at index 2 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(579,11): Error: receiver argument could not be proved to be allocated in the two-state function's previous state
+Twostate-Verification.dfy(582,11): Error: receiver argument could not be proved to be allocated in the two-state lemma's previous state
+Twostate-Verification.dfy(593,19): Error: argument at index 1 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(596,19): Error: argument at index 1 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(599,19): Error: argument at index 1 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(602,19): Error: argument at index 1 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(613,22): Error: argument at index 2 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(616,22): Error: argument at index 2 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(619,26): Error: argument at index 3 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(622,26): Error: argument at index 3 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(635,25): Error: receiver argument could not be proved to be allocated in the two-state function's previous state
+Twostate-Verification.dfy(659,29): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+Twostate-Verification.dfy(271,13): Error: a postcondition could not be proved on this return path
+Twostate-Verification.dfy(263,24): Related location: this is the postcondition that could not be proved
+Twostate-Verification.dfy(277,4): Error: a postcondition could not be proved on this return path
+Twostate-Verification.dfy(276,26): Related location: this is the postcondition that could not be proved
+Twostate-Verification.dfy(6,4): Error: argument at index 0 for parameter 'c' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new c: A', arguments can refer to expressions possibly unallocated in the previous state
+Twostate-Verification.dfy(12,17): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+Twostate-Verification.dfy(37,26): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+Twostate-Verification.dfy(41,32): Error: receiver argument could not be proved to be allocated in the state in which the function is invoked
+Twostate-Verification.dfy(56,26): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+Twostate-Verification.dfy(58,32): Error: receiver argument could not be proved to be allocated in the state in which the function is invoked
+Twostate-Verification.dfy(74,4): Error: assertion might not hold
+
+Dafny program verifier finished with 66 verified, 42 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAdjustments.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAdjustments.dfy
new file mode 100644
index 00000000000..a60921004bb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAdjustments.dfy
@@ -0,0 +1,664 @@
+// RUN: %exits-with 4 %verify --relax-definite-assignment --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+type Even = u | u % 2 == 0
+
+method M0(n: nat, e: Even) {
+  var x; // nat
+  x := n;
+  x := n;
+
+  var y; // int
+  y := e;
+  y := n;
+
+  var z; // int
+  z := n + n;
+
+  x, y, z := *, *, *;
+  if {
+  case true =>
+    assert 0 <= x;
+  case true =>
+    assert 0 <= y; // error: y is an int
+  case true =>
+    assert y % 2 == 0; // error: y is an int
+  case true =>
+    assert 0 <= z; // error: z is an int
+  }
+}
+
+method M1() {
+  var arr;
+  arr := new [100];
+  var y;
+  y := arr[0] + 15;
+
+  arr, y := *, *;
+  var obj: object? := arr;
+  assert obj != null;
+  assert 0 <= y; // error: y is an int
+}
+
+method M2(ms: multiset<real>, m0: map<bool, nat>, m1: imap<real, nat>)
+  requires true in m0.Keys
+  requires 5.90 in m1.Keys
+{
+  var z;
+  var nrr := new nat[100];
+  z := nrr[0];
+  var matrix := new nat[100, 100];
+  z := matrix[2, 3];
+  z := ms[3.19];
+  z := m0[true];
+  z := m1[5.90];
+
+  z := *;
+  assert 0 <= z;
+}
+
+method M3(s: seq<nat>, arr: array<nat>)
+  requires 10 <= |s| && 10 <= arr.Length
+{
+  // variables a, b, c, x, y, z, w have type seq<nat>
+  var a;
+  a := s[..10];
+  var b;
+  b := s[0..];
+  var c;
+  c := s[0..10];
+
+  var x;
+  x := arr[..10];
+  var y;
+  y := arr[0..];
+  var z;
+  z := arr[0..10];
+  var w;
+  w := arr[..];
+
+  var k;
+  k := a[0];
+  k := b[0];
+  k := c[0];
+  k := x[0];
+  k := y[0];
+  k := z[0];
+  k := w[0];
+  k := *;
+  assert 0 <= k;
+}
+
+method M4(i: int, n: nat, b: bool) {
+  var x; // nat
+  x := if b then n else n;
+  var y; // int
+  y := if b then i else n;
+  var z; // int
+  z := if b then n else i;
+
+  x, y, z := *, *, *;
+  if {
+    case true =>
+      assert 0 <= x;
+    case true =>
+      assert 0 <= y; // error: y is int
+    case true =>
+      assert 0 <= z; // error: z is int
+  }
+}
+
+datatype List = Nil | Cons(head: nat, tail: List)
+
+type NatA = x: nat | 10 <= x < 20 witness *
+type NatB = x: nat | 20 <= x < 30 witness *
+type NatC = x: nat | 30 <= x < 40 witness *
+
+method M5(list: List, a: NatA, b: NatB, c: NatC) {
+  var x; // nat
+  match list {
+    case Nil =>
+      x := a;
+    case Cons(_, Nil) =>
+      x := b;
+    case _ =>
+      x := c;
+  }
+
+  x := *;
+  if {
+    case true =>
+      assert 0 <= x;
+    case true =>
+      assert 10 <= x; // error: x is nat
+    case true =>
+      assert 20 <= x; // error: x is nat
+    case true =>
+      assert 30 <= x; // error: x is nat
+  }
+}
+
+method M6(list: List, a: NatA, b: NatB, c: NatC) {
+  var x; // nat
+  x :=
+    match list
+    case Nil => a
+    case Cons(_, Nil) => b
+    case _ => c;
+
+  x := *;
+  if {
+    case true =>
+      assert 0 <= x;
+    case true =>
+      assert 10 <= x; // error: x is nat
+    case true =>
+      assert 20 <= x; // error: x is nat
+    case true =>
+      assert 30 <= x; // error: x is nat
+  }
+}
+
+class Cell {
+  var data: nat
+  function F(): nat {
+    2
+  }
+  method M() returns (x: nat, y: int) {
+  }
+}
+
+class CellX<X> {
+  constructor (u: X) {
+    data := u;
+  }
+  const data: X
+  function F(): X {
+    data
+  }
+  method M() returns (x: X, y: int) {
+    x, y := data, 12;
+  }
+}
+
+method M7(n: nat) {
+  var cell := new Cell;
+
+  var x;
+  x := cell.data;
+  var y;
+  y := cell.F();
+  var z;
+  var w;
+  z, w := cell.M();
+  var ff := cell.F;
+  ff := *;
+  var u;
+  u := ff();
+
+  x, y, z, w, u := *, *, *, *, *;
+  assert 0 <= x;
+  assert 0 <= y;
+  assert 0 <= z;
+  assert 0 <= w; // error: w is int
+  assert ff.requires();
+  assert 0 <= u;
+}
+
+method M8(n: nat) {
+  var cell;
+  cell := new CellX<nat>(n);
+
+  var x;
+  x := cell.data;
+  var y;
+  y := cell.F();
+  var z;
+  var w;
+  z, w := cell.M();
+  var ff := cell.F;
+  ff := *;
+  var u;
+  u := ff();
+
+  x, y, z, w, u := *, *, *, *, *;
+  assert 0 <= x;
+  assert 0 <= y;
+  assert 0 <= z;
+  assert 0 <= w; // error: w is int
+  assert ff.requires();
+  assert 0 <= u;
+}
+
+method M9(n: nat) {
+  if
+  case true =>
+    var cell := new CellX<nat>(n);
+    assert 0 <= cell.data;
+  case true =>
+    var cell := new CellX(n);
+    assert 0 <= cell.data;
+  case true =>
+    var cell := new CellX<int>(n);
+    assert 0 <= cell.data; // error: cell.data is int
+  case true =>
+    var xx: CellX<nat>;
+    var cell := new CellX<int>(n);
+    xx := cell; // error: types of xx and cell don't match
+  case true =>
+    var xx: CellX<int>;
+    var cell := new CellX<nat>(n);
+    xx := cell; // error: types of xx and cell don't match
+}
+
+module TypeParameters {
+  datatype List<+Y> = Nil | Cons(head: Y, List<Y>)
+
+  class Class<A(0)> {
+    var data: A
+    method InstanceMethod(cc: Class<A>) returns (a: A) {
+      a := data;
+    }
+    function InstanceFunction(cc: Class<A>): A
+  }
+
+  method MFitToAnything<G>(g: G) returns (r: G) {
+    return g;
+  }
+
+  method MFitToList<G(0)>(g: List<G>) returns (r: G)
+
+  function FFitToAnything<G>(g: G): G
+
+  function FFitToList<G(0)>(g: List<G>): G
+
+  method M(c: Class<nat>, xs: List<nat>, ys: List<int>, n: nat) {
+    var d := c;
+    var i := d.InstanceMethod(c);
+    assert 0 <= i;
+
+    var g0 := MFitToAnything(c);
+    var g1 := MFitToAnything(xs);
+    var g2 := MFitToAnything(n);
+    var g3 := MFitToAnything((n, n));
+    assert 0 <= g0.data;
+    assert g1.Cons? ==> 0 <= g1.head;
+    assert 0 <= g2;
+    assert 0 <= g3.0 && 0 <= g3.1;
+
+    var x; // nat
+    x := MFitToList(xs);
+    var y; // int
+    y := MFitToList(ys);
+    assert 0 <= x;
+    assert 0 <= y; // error: y is int
+  }
+
+  method F(c: Class<nat>, xs: List<nat>, ys: List<int>, n: nat) {
+    var d := c;
+    var i := d.InstanceFunction(c);
+    assert 0 <= i;
+
+    var g0 := FFitToAnything(c);
+    var g1 := FFitToAnything(xs);
+    var g2 := FFitToAnything(n);
+    var g3 := FFitToAnything((n, n));
+    assert 0 <= g0.data;
+    assert g1.Cons? ==> 0 <= g1.head;
+    assert 0 <= g2;
+    assert 0 <= g3.0 && 0 <= g3.1;
+
+    var x; // nat
+    x := FFitToList(xs);
+    var y; // int
+    y := FFitToList(ys);
+    assert 0 <= x;
+    assert 0 <= y; // error: y is int
+  }
+
+  method Tuples(n: nat) {
+    var p;
+    p := (n, n);
+    p := *;
+    assert 0 <= p.0;
+    assert 0 <= p.1;
+  }
+}
+
+module BinaryExpressions {
+  method Plus(s: set<nat>, t: iset<nat>, mu: multiset<nat>, q: seq<nat>, mf: map<nat, nat>, mi: imap<nat, nat>) {
+    var s' := s + s;
+    var t' := t + t;
+    var mu' := mu + mu;
+    var q' := q + q;
+    var mf' := mf + mf;
+    var mi' := mi + mi;
+    s', t', q', mu', mf', mi' := *, *, *, *, *, *;
+    Test(s', t', mu', q', mf', mi');
+  }
+
+  method Minus(s: set<nat>, t: iset<nat>, si: set<int>, mu: multiset<nat>, mf: map<nat, nat>, mi: imap<nat, nat>) {
+    var s' := s - s;
+    var t' := t - t;
+    var mu' := mu - mu;
+    var mf' := mf - s;
+    var mi' := mi - s;
+    s', t', mu', mf', mi' := *, *, *, *, *;
+    Test(s', t', mu', [], mf', mi');
+
+    var mf'' := mf - si;
+    var mi'' := mi - si;
+    s', t', mu', mf'', mi'' := *, *, *, *, *;
+    Test(s', t', mu', [], mf'', mi'');
+  }
+
+  method Times(s: set<nat>, t: iset<nat>, mu: multiset<nat>) {
+    var s' := s * s;
+    var t' := t * t;
+    var mu' := mu * mu;
+    s', t', mu' := *, *, *;
+    Test(s', t', mu', [], map[], imap[]);
+  }
+
+  method Test(s: set<nat>, t: iset<nat>, mu: multiset<nat>, q: seq<nat>, mf: map<nat, nat>, mi: imap<nat, nat>) {
+  }
+
+  // -------------------------
+
+  method BadPlusSets0(
+    s0: set<nat>, t0: iset<nat>, mu0: multiset<nat>,
+    s1: set<int>, t1: iset<int>, mu1: multiset<int>)
+  {
+    var s' := s0 + s1;
+    var t' := t0 + t1;
+    var mu' := mu0 + mu1;
+    s', t', mu' := *, *, *;
+    TestSets(s', t', mu'); // error (x3)
+  }
+
+  method BadPlusSets1(
+    s0: set<nat>, t0: iset<nat>, mu0: multiset<nat>,
+    s1: set<int>, t1: iset<int>, mu1: multiset<int>)
+  {
+    var s' := s1 + s0;
+    var t' := t1 + t0;
+    var mu' := mu1 + mu0;
+    s', t', mu' := *, *, *;
+    TestSets(s', t', mu'); // error (x3)
+  }
+
+  method BadMinusSets0(
+    s0: set<nat>, t0: iset<nat>, mu0: multiset<nat>,
+    s1: set<int>, t1: iset<int>, mu1: multiset<int>)
+  {
+    var s' := s0 - s1;
+    var t' := t0 - t1;
+    var mu' := mu0 - mu1;
+    s', t', mu' := *, *, *;
+    TestSets(s', t', mu'); // these are fine (in the new type system)
+  }
+
+  method BadMinusSets1(
+    s0: set<nat>, t0: iset<nat>, mu0: multiset<nat>,
+    s1: set<int>, t1: iset<int>, mu1: multiset<int>)
+  {
+    var s' := s1 - s0;
+    var t' := t1 - t0;
+    var mu' := mu1 - mu0;
+    s', t', mu' := *, *, *;
+    TestSets(s', t', mu'); // error (x3) -- no problem with mi'
+  }
+
+  method BadTimes0(
+    s0: set<nat>, t0: iset<nat>, mu0: multiset<nat>,
+    s1: set<int>, t1: iset<int>, mu1: multiset<int>)
+  {
+    // In general, let the result of combining set<A> and set<B> be set<C>. To be precise,
+    // we would need C to be a type that conjoins the constraints of A and B. We don't have such
+    // a time, so we instead (approximate the other direction and) let C be the join of A and B.
+    var s' := s0 * s1;
+    var t' := t0 * t1;
+    var mu' := mu0 * mu1;
+    s', t', mu' := *, *, *;
+    TestSets(s', t', mu'); // error (x3)
+  }
+
+  method BadTimes1(
+    s0: set<nat>, t0: iset<nat>, mu0: multiset<nat>,
+    s1: set<int>, t1: iset<int>, mu1: multiset<int>)
+  {
+    // In general, let the result of combining set<A> and set<B> be set<C>. To be precise,
+    // we would need C to be a type that conjoins the constraints of A and B. We don't have such
+    // a time, so we instead (approximate the other direction and) let C be the join of A and B.
+    var s' := s1 * s0;
+    var t' := t1 * t0;
+    var mu' := mu1 * mu0;
+    s', t', mu' := *, *, *;
+    TestSets(s', t', mu'); // error (x3)
+  }
+
+  method TestSets(s: set<nat>, t: iset<nat>, mu: multiset<nat>) {
+  }
+
+  // -------------------------
+
+  method BadPlusOther0(
+    q0: seq<nat>, mf0: map<nat, nat>, mi0: imap<nat, nat>,
+    q1: seq<int>, mf1: map<int, int>, mi1: imap<int, int>)
+  {
+    var q' := q0 + q1;
+    var mf' := mf0 + mf1;
+    var mi' := mi0 + mi1;
+    q', mf', mi' := *, *, *;
+    TestOther(q', mf', mi'); // error (x3)
+  }
+
+  method BadPlusOther1(
+    q0: seq<nat>, mf0: map<nat, nat>, mi0: imap<nat, nat>,
+    q1: seq<int>, mf1: map<int, int>, mi1: imap<int, int>)
+  {
+    var q' := q1 + q0;
+    var mf' := mf1 + mf0;
+    var mi' := mi1 + mi0;
+    q', mf', mi' := *, *, *;
+    TestOther(q', mf', mi'); // error (x3)
+  }
+
+  method BadMinusOther(
+    s0: set<nat>, mf0: map<nat, nat>, mi0: imap<nat, nat>,
+    s1: set<int>, mf1: map<int, int>, mi1: imap<int, int>)
+  {
+    if
+    case true =>
+      var mf' := mf0 - s1;
+      var mi' := mi0 - s1;
+      mf', mi' := *, *;
+      TestOther([], mf', mi'); // these are fine (in the new type system)
+    case true =>
+      var mf' := mf1 - s0;
+      var mi' := mi1 - s0;
+      mf', mi' := *, *;
+      TestOther([], mf', mi'); // error (x2)
+  }
+
+  method TestOther(q: seq<nat>, mf: map<nat, nat>, mi: imap<nat, nat>) {
+  }
+}
+
+module Arrows {
+  method TestGeneralArrow() returns (f: () ~> int, g: () --> int, h: () -> int)
+  {
+    var k;
+    k := () requires true reads {} => 3;
+    k := *;
+    if
+    case true => f := k;
+    case true => g := k; // error: cannot assign general arrow to partial arrow
+    case true => h := k; // error: cannot assign partial arrow to total arrow
+  }
+
+  method TestPartialArrow() returns (f: () ~> int, g: () --> int, h: () -> int)
+  {
+    var k;
+    k := () requires true => 3;
+    k := *;
+    if
+    case true => f := k;
+    case true => g := k;
+    case true => h := k; // error: cannot assign partial arrow to total arrow
+  }
+
+  method TestTotalArrow() returns (f: () ~> int, g: () --> int, h: () -> int)
+  {
+    var k;
+    k := () => 3;
+    k := *;
+    if
+    case true => f := k;
+    case true => g := k;
+    case true => h := k;
+  }
+}
+
+module Comprehensions {
+  class ClassA { }
+
+  predicate P(x: nat) { true }
+
+  method Sets(s: set<ClassA>) returns (aa': set<ClassA>, nn': set<nat>, ii': set<int>) {
+    var aa := set o: ClassA | o in s; // set<ClassA>
+    var nn := set n: nat | -2 <= n < 8 && P(n); // set<nat>
+    var mm := set n: nat | -2 <= n < 8 && P(n) :: (n); // set<nat>
+    var ii := set n: nat | -2 <= n < 8 && P(n) :: n + 2; // set<int>
+
+    aa, nn, mm, ii := *, *, *, *;
+    if
+    case true => aa' := aa;
+    case true => nn' := nn;
+    case true => nn' := mm;
+    case true => ii' := ii;
+    case true => nn' := ii; // error: LHS is set<nat>, RHS is set<int>
+    case true => ii' := nn;
+  }
+
+  method Maps0(s: set<ClassA>) returns (aa': map<ClassA, bool>, bb': map<ClassA, ClassA>) {
+    var aa := map o: ClassA | o in s :: true; // map<ClassA, bool>
+    var bb := map o: ClassA | o in s :: o; // map<ClassA, ClassA>
+
+    aa, bb := *, *;
+    if
+    case true => aa' := aa;
+    case true => bb' := bb;
+  }
+
+  method Maps1() returns (nn': map<nat, nat>, ii': map<nat, int>, jj': map<int, int>) {
+    var nn := map n: nat | -2 <= n < 8 && P(n) :: n; // map<nat, nat>
+    var mm := map n: nat | -2 <= n < 8 && P(n) :: (n) := (n); // map<nat, nat>
+    var ii := map n: nat | -2 <= n < 8 && P(n) :: n := n + 2; // map<nat, int>
+    var jj := map n: nat | -2 <= n < 8 && P(n) :: n + 2 := n + 2; // map<int, int>
+
+    nn, mm, ii, jj := *, *, *, *;
+    if
+    case true => nn' := nn;
+    case true => nn' := mm;
+    case true => ii' := ii;
+    case true => jj' := jj;
+    case true => ii' := jj; // error: LHS is map<nat, int>, RHS is map<int, int>
+    case true => jj' := ii;
+  }
+}
+
+module TrickyProvides0 {
+  module AAA {
+    import BBB
+
+    type T = t: BBB.U | true witness *
+  }
+
+  module BBB {
+    export
+      provides U, Empty
+
+    import CCC
+    type U = CCC.W // type synonym
+
+    function Empty(): U
+      // In the following line, the type of the RHS of the let should be recorded as U, not just as CCC.W,
+      // because importers of BBB will only be able to see U.
+      ensures var u := Empty(); true
+  }
+
+  module CCC {
+    export
+      provides W
+
+    datatype W = Leaf | Node
+  }
+}
+
+module TrickyProvides1 {
+  module AAA {
+    import BBB
+
+    type T = t: BBB.U | true witness *
+  }
+
+  module BBB {
+    export
+      provides U, Empty
+
+    import CCC
+    type U = w: CCC.W | true witness * // subset type
+
+    function Empty(): U
+      // In the following line, the type of the RHS of the let should be recorded as U, not just as CCC.W,
+      // because importers of BBB will only be able to see U.
+      ensures var u := Empty(); true
+  }
+
+  module CCC {
+    export
+      provides W
+
+    datatype W = Leaf | Node
+  }
+}
+
+module MoreTrickySynonym {
+  type Nat = int
+
+  method M0(n: Nat, b: bool) {
+    var z; // int
+    z := n + n;
+    var w; // Nat
+    w := n;
+    w := n;
+    var u; // Nat
+    u := if b then n else n;
+  }
+}
+
+module MoreTrickySubsetType {
+  type Nat = x: int | 0 <= x
+
+  method M0(n: Nat, b: bool) {
+    var z; // int
+    z := n + n;
+    var w; // Nat
+    w := n;
+    w := n;
+    var u; // Nat
+    u := if b then n else n;
+  }
+}
+
+module Let {
+  method XYZ(n: nat) {
+    var i := n; // nat
+    var j; // nat
+    j := var jj := n; jj;
+    i, j := *, *;
+    assert 0 <= i;
+    assert 0 <= j;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAdjustments.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAdjustments.dfy.expect
new file mode 100644
index 00000000000..bce454f5074
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAdjustments.dfy.expect
@@ -0,0 +1,51 @@
+TypeAdjustments.dfy(588,14): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+TypeAdjustments.dfy(616,14): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+TypeAdjustments.dfy(23,4): Error: assertion might not hold
+TypeAdjustments.dfy(25,4): Error: assertion might not hold
+TypeAdjustments.dfy(27,4): Error: assertion might not hold
+TypeAdjustments.dfy(40,2): Error: assertion might not hold
+TypeAdjustments.dfy(105,6): Error: assertion might not hold
+TypeAdjustments.dfy(107,6): Error: assertion might not hold
+TypeAdjustments.dfy(133,6): Error: assertion might not hold
+TypeAdjustments.dfy(135,6): Error: assertion might not hold
+TypeAdjustments.dfy(137,6): Error: assertion might not hold
+TypeAdjustments.dfy(154,6): Error: assertion might not hold
+TypeAdjustments.dfy(156,6): Error: assertion might not hold
+TypeAdjustments.dfy(158,6): Error: assertion might not hold
+TypeAdjustments.dfy(203,2): Error: assertion might not hold
+TypeAdjustments.dfy(228,2): Error: assertion might not hold
+TypeAdjustments.dfy(243,4): Error: assertion might not hold
+TypeAdjustments.dfy(247,10): Error: value of expression (of type 'CellX<int>') is not known to be an instance of type 'CellX<nat>'
+TypeAdjustments.dfy(251,10): Error: value of expression (of type 'CellX<nat>') is not known to be an instance of type 'CellX<int>'
+TypeAdjustments.dfy(294,4): Error: assertion might not hold
+TypeAdjustments.dfy(316,4): Error: assertion might not hold
+TypeAdjustments.dfy(376,13): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
+TypeAdjustments.dfy(376,17): Error: value of expression (of type 'iset<int>') is not known to be an instance of type 'iset<nat>'
+TypeAdjustments.dfy(376,21): Error: value of expression (of type 'multiset<int>') is not known to be an instance of type 'multiset<nat>'
+TypeAdjustments.dfy(387,13): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
+TypeAdjustments.dfy(387,17): Error: value of expression (of type 'iset<int>') is not known to be an instance of type 'iset<nat>'
+TypeAdjustments.dfy(387,21): Error: value of expression (of type 'multiset<int>') is not known to be an instance of type 'multiset<nat>'
+TypeAdjustments.dfy(409,13): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
+TypeAdjustments.dfy(409,17): Error: value of expression (of type 'iset<int>') is not known to be an instance of type 'iset<nat>'
+TypeAdjustments.dfy(409,21): Error: value of expression (of type 'multiset<int>') is not known to be an instance of type 'multiset<nat>'
+TypeAdjustments.dfy(423,13): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
+TypeAdjustments.dfy(423,17): Error: value of expression (of type 'iset<int>') is not known to be an instance of type 'iset<nat>'
+TypeAdjustments.dfy(423,21): Error: value of expression (of type 'multiset<int>') is not known to be an instance of type 'multiset<nat>'
+TypeAdjustments.dfy(437,13): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
+TypeAdjustments.dfy(437,17): Error: value of expression (of type 'iset<int>') is not known to be an instance of type 'iset<nat>'
+TypeAdjustments.dfy(437,21): Error: value of expression (of type 'multiset<int>') is not known to be an instance of type 'multiset<nat>'
+TypeAdjustments.dfy(453,14): Error: value of expression (of type 'seq<int>') is not known to be an instance of type 'seq<nat>'
+TypeAdjustments.dfy(453,18): Error: value of expression (of type 'map<int, int>') is not known to be an instance of type 'map<nat, nat>'
+TypeAdjustments.dfy(453,23): Error: value of expression (of type 'imap<int, int>') is not known to be an instance of type 'imap<nat, nat>'
+TypeAdjustments.dfy(464,14): Error: value of expression (of type 'seq<int>') is not known to be an instance of type 'seq<nat>'
+TypeAdjustments.dfy(464,18): Error: value of expression (of type 'map<int, int>') is not known to be an instance of type 'map<nat, nat>'
+TypeAdjustments.dfy(464,23): Error: value of expression (of type 'imap<int, int>') is not known to be an instance of type 'imap<nat, nat>'
+TypeAdjustments.dfy(481,20): Error: value of expression (of type 'map<int, int>') is not known to be an instance of type 'map<nat, nat>'
+TypeAdjustments.dfy(481,25): Error: value of expression (of type 'imap<int, int>') is not known to be an instance of type 'imap<nat, nat>'
+TypeAdjustments.dfy(496,22): Error: value does not satisfy the subset constraints of '() --> int' (possible cause: it may have read effects)
+TypeAdjustments.dfy(497,22): Error: value does not satisfy the subset constraints of '() -> int' (possible cause: it may be partial or have read effects)
+TypeAdjustments.dfy(508,22): Error: value does not satisfy the subset constraints of '() -> int' (possible cause: it may be partial or have read effects)
+TypeAdjustments.dfy(540,24): Error: value of expression (of type 'set<int>') is not known to be an instance of type 'set<nat>'
+TypeAdjustments.dfy(566,24): Error: value of expression (of type 'map<int, int>') is not known to be an instance of type 'map<nat, int>'
+
+Dafny program verifier finished with 19 verified, 47 errors
diff --git a/Test/dafny0/TypeAntecedents.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAntecedents.dfy
similarity index 95%
rename from Test/dafny0/TypeAntecedents.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAntecedents.dfy
index aef098e700a..5e826d77e9d 100644
--- a/Test/dafny0/TypeAntecedents.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAntecedents.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachResolver "%s" --expect-exit-code=4 -- --warn-deprecation=false --relax-definite-assignment
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation --relax-definite-assignment
 
 
 // -------- This is an example of what was once logically (although not trigger-ly) unsound ---
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAntecedents.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAntecedents.dfy.expect
new file mode 100644
index 00000000000..cc0d2898960
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeAntecedents.dfy.expect
@@ -0,0 +1,6 @@
+TypeAntecedents.dfy(35,2): Error: assertion might not hold
+TypeAntecedents.dfy(58,0): Error: a postcondition could not be proved on this return path
+TypeAntecedents.dfy(57,14): Related location: this is the postcondition that could not be proved
+TypeAntecedents.dfy(66,8): Error: assertion might not hold
+
+Dafny program verifier finished with 5 verified, 3 errors
diff --git a/Test/dafny0/TypeConstraints.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraints.dfy
similarity index 93%
rename from Test/dafny0/TypeConstraints.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraints.dfy
index 9d95e3c5b20..db6404ba63b 100644
--- a/Test/dafny0/TypeConstraints.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraints.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /env:0 /rprint:- "%s" > "%t"
+// RUN: %exits-with 2 %build --rprint:- "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 module Tests {
 class CC {
@@ -527,3 +527,35 @@ module SameSCC {
   datatype G5 = G5(G6)
   codatatype G6 = G6(array<G0>)
 }
+
+module UnderspecifiedTypeConversions0 {
+  class Cell<X> { }
+  type UCell<U, V> = Cell<U>
+
+  method M(c: Cell<int>) {
+    if c is UCell { // error: type is underspecified
+      print "yes";
+    }
+  }
+
+  method N(c: object) {
+    if c is Cell { // error: type is underspecified
+      print "yes";
+    }
+  }
+}
+
+module UnderspecifiedTypeConversions1 {
+  class Cell<X> { }
+  type UCell<U, V> = Cell<U>
+
+  method M(c: Cell<int>) {
+    var d: Cell<int>;
+    d := c as UCell; // error: type is underspecified
+  }
+
+  method N(c: object) {
+    var d: object;
+    d := c as Cell; // error: type is underspecified
+  }
+}
diff --git a/Test/dafny0/TypeConstraints.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraints.dfy.expect
similarity index 90%
rename from Test/dafny0/TypeConstraints.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraints.dfy.expect
index f25acfc3e6e..040e618a2cd 100644
--- a/Test/dafny0/TypeConstraints.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraints.dfy.expect
@@ -20,6 +20,8 @@ TypeConstraints.dfy(450,8): Error: type array<nat> is not assignable to LHS (of
 TypeConstraints.dfy(452,8): Error: type array<int> is not assignable to LHS (of type array<nat>) (nonvariance for type parameter expects nat = int)
 TypeConstraints.dfy(455,8): Error: RHS (of type array<int>) not assignable to LHS (of type array<nat>) (nonvariance for type parameter expects nat = int)
 TypeConstraints.dfy(457,8): Error: RHS (of type array<nat>) not assignable to LHS (of type array<int>) (nonvariance for type parameter expects int = nat)
+TypeConstraints.dfy(542,9): Error: type test for type 'Cell<?>' must be from an expression assignable to it (got 'object')
+TypeConstraints.dfy(559,11): Error: type cast to reference type 'Cell<?>' must be from an expression assignable to it (got 'object')
 // TypeConstraints.dfy
 
 /*
@@ -47,7 +49,7 @@ module _System {
   */
 
   class {:compile false} array<arg> {
-    var Length: int  // immutable
+    const Length: int
   }
   /*-- non-null type
   type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
@@ -85,21 +87,23 @@ module _System {
     | f.requires()
     /*special witness*/
 
-  datatype {:compile false} /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
 
   type bool { }
 
+  type char { }
+
   type int { }
 
   type real {
-    var Floor: int  // immutable
+    const Floor: int
   }
 
   type ORDINAL {
-    var IsLimit: bool  // immutable
-    var IsSucc: bool  // immutable
-    var Offset: int  // immutable
-    var IsNat: bool  // immutable
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
   }
 
   type _bv {
@@ -108,19 +112,27 @@ module _System {
     function RotateRight(w: nat): selftype
   }
 
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
   type map<+T, +U> {
-    var Keys: set<T>  // immutable
-    var Values: set<U>  // immutable
-    var Items: set<(T, U)>  // immutable
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
   }
 
   type imap<*T, +U> {
-    var Keys: iset<T>  // immutable
-    var Values: iset<U>  // immutable
-    var Items: iset<(T, U)>  // immutable
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
   }
 
-  datatype {:compile false} /*_tuple#0*/ () = _#Make0
+  datatype /*_tuple#0*/ () = _#Make0
 
   type {:compile false} /*_#Func2*/ (-T0, -T1) ~> +R {
     ghost function requires(x0: T0, x1: T1): bool
@@ -198,6 +210,8 @@ module Tests {
 
 module HereAreErrors {
   /* CALL GRAPH for module HereAreErrors:
+   * SCC at height 0:
+   *   MyInt
    */
   method Error0() returns (x: int, z: bool)
   {
@@ -274,6 +288,8 @@ module PlusTests {
 
 module PlusTests' {
   /* CALL GRAPH for module PlusTests':
+   * SCC at height 0:
+   *   MyInt
    */
   method Plus1()
   {
@@ -317,6 +333,10 @@ module PlusTests' {
 
 module MorePlusTests {
   /* CALL GRAPH for module MorePlusTests:
+   * SCC at height 0:
+   *   C
+   * SCC at height 0:
+   *   MyInt
    */
   method Plusses(b: bool, i: int, j: MyInt, r: real)
   {
@@ -349,6 +369,14 @@ module MorePlusTests {
 
 module References {
   /* CALL GRAPH for module References:
+   * SCC at height 0:
+   *   C
+   * SCC at height 0:
+   *   K
+   * SCC at height 0:
+   *   M
+   * SCC at height 0:
+   *   R
    */
   method M0() returns (c: C, r: R)
   {
@@ -929,4 +957,60 @@ module SameSCC {
 
   codatatype G6 = G6(array<G0>)
 }
-22 resolution/type errors detected in TypeConstraints.dfy
+
+module UnderspecifiedTypeConversions0 {
+  /* CALL GRAPH for module UnderspecifiedTypeConversions0:
+   * SCC at height 0:
+   *   Cell
+   * SCC at height 0:
+   *   UCell
+   */
+  method M(c: Cell<int>)
+  {
+    if c is UCell<int, ?> {
+      print "yes";
+    }
+  }
+
+  method N(c: object)
+  {
+    if c is Cell<?> {
+      print "yes";
+    }
+  }
+
+  class Cell<X> { }
+  /*-- non-null type
+  type {:axiom} Cell(==)<X> = c: Cell?<X> | c != null /*special witness*/
+  */
+
+  type UCell<U, V> = Cell<U>
+}
+
+module UnderspecifiedTypeConversions1 {
+  /* CALL GRAPH for module UnderspecifiedTypeConversions1:
+   * SCC at height 0:
+   *   Cell
+   * SCC at height 0:
+   *   UCell
+   */
+  method M(c: Cell<int>)
+  {
+    var d: Cell<int>;
+    d := c as UCell<int, ?>;
+  }
+
+  method N(c: object)
+  {
+    var d: object;
+    d := c as Cell<?>;
+  }
+
+  class Cell<X> { }
+  /*-- non-null type
+  type {:axiom} Cell(==)<X> = c: Cell?<X> | c != null /*special witness*/
+  */
+
+  type UCell<U, V> = Cell<U>
+}
+24 resolution/type errors detected in TypeConstraints.dfy
diff --git a/Test/dafny0/TypeConstraintsE.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsE.dfy
similarity index 87%
rename from Test/dafny0/TypeConstraintsE.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsE.dfy
index 27f7cf608b9..6070b923229 100644
--- a/Test/dafny0/TypeConstraintsE.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsE.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module Arrays_and_SubsetTypes {
   method M()
diff --git a/Test/dafny0/TypeConstraintsE.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsE.dfy.expect
similarity index 100%
rename from Test/dafny0/TypeConstraintsE.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsE.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsRefresh.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsRefresh.dfy
new file mode 100644
index 00000000000..109e8f58f66
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsRefresh.dfy
@@ -0,0 +1,561 @@
+// RUN: %exits-with 2 %build --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+module Tests {
+class CC {
+  var f: nat
+  var g: int
+  function F(): nat
+  method M() {
+    var a := f;  // nat
+    var b := g;  // int
+    var c := F();  // nat
+    var w;  // int (with legacy type system: nat)
+    var d := N(w);  // nat
+  }
+  method N(m: nat) returns (n: nat)
+}
+
+method ChainOfAssignments() returns (x: int, y: int, n: nat)
+{
+  var a;  // int
+  var b := a;  // int
+  var c := b;  // int
+  x := c;
+  y := x;
+
+  var k, l, m;  // int, int, int
+  k := l;
+  l := m;
+  m := x;
+
+  var p, q;  // nat, nat
+  p := q;
+  q := n;
+}
+}  // module Tests
+module HereAreErrors {
+  method Error0() returns (x: int, z: bool)
+  {
+    var a, b, c;
+    a, b := b, c;
+    x := a;
+    z := c;  // error (or on one of the lines above)
+  }
+
+  method Error1() returns (x: int, z: bool)
+  {
+    var a, b, c;
+    a, b := b, c;
+    z := c;
+    x := a;  // error (or on one of the lines above)
+  }
+
+  method Error2() returns (x: int, z: bool)
+  {
+    var a, b, c;
+    a, b := c, c;
+    x := a;
+    z := b;  // error (or on one of the lines above)
+  }
+
+  method Error3() returns (x: int, z: bool)
+  {
+    var a, b, c;
+    c := a;
+    c := b;
+
+    x := a;
+    z := b;  // error (or on one of the lines above)
+  }
+
+  newtype MyInt = x: int | true
+
+  method Literals() returns (r: int, s: MyInt) {
+    var a := 0;  // int
+    var b := 0;  // MyInt
+    r := a;
+    s := b;
+    a := b;  // error (or on the previous line)
+    b := a;  // error (or on the previous two lines)
+    r := s;  // error
+    s := r;  // error
+    var d, e;  // MyInt, MyInt
+    d, e := e, b;
+  }
+}
+module PL {
+method PlainLiterals() {
+  var x := 0;
+  var r := 0.0;
+}
+}
+module PlusTests {
+  method Plus0() {
+    var a, b, c;  // error (x2): underspecified type
+    a := b + c;
+  }
+}
+module PlusTests' {
+  method Plus1() {
+    var a;
+    var b, c;
+    a := b + c;  // error: invalid arguments to +
+    a := true;
+  }
+  method Plus2() {
+    var a, b, c;
+    a := b + c;
+    a := 0;
+  }
+  method Plus3() returns (r: int) {
+    var a, b, c;
+    a := b + c;
+    a := r;
+  }
+  method Plus4() returns (r: int) {
+    var a, b, c;
+    a := b + c;
+    r := a;
+  }
+
+  newtype MyInt = x: int | true
+  method Plus5(y: MyInt) {
+    var a, b, c;
+    a := b + c;
+    a := y;
+  }
+}
+
+module MorePlusTests {
+  newtype MyInt = x: int | true
+  class C { }
+
+  method Plusses(b: bool, i: int, j: MyInt, r: real) {
+    var ii := i + i;
+    var jj := j + j;
+    var bb := b + b;  // error: bool is not plussable
+    var rr := r + r;
+    var s := {false};
+    var ss := s + s;
+    var m := multiset{false, false};
+    var mm := m + m;
+    var q := [false];
+    var qq := q + q;
+    var p := map[false := 17];
+    var pp := p + p;
+    var n: C := null;
+    var nn := n + n;  // error: references types are not plussable
+    var c := new C;
+    var cc := c + c;  // error: class types are not plussable
+  }
+}
+
+module References {
+  class C extends K, M { }
+  trait R { }
+  trait K { }
+  trait M { }
+
+  method M0() returns (c: C, r: R)
+  {
+    var o: object, k: K, m: M;
+    o := o;
+    c := c;
+    r := r;
+    k := c;
+    m := c;
+
+    o := c;
+    o := r;
+    o := k;
+    o := m;
+  }
+
+  method M1() returns (c: C, r: R)
+  {
+    r := c;  // error
+  }
+
+  method M2() returns (c: C, r: R, o: object)
+  {
+    c := o as C;  // OK for type resolution, but must be proved
+  }
+
+  method M3() returns (c: C, r: R, o: object)
+  {
+    r := o as R;  // OK for type resolution, but must be proved
+  }
+}
+
+module SimpleClassesAndTraits {
+  class C extends K, M { }
+  class D extends K, M { }
+  trait R { }
+  trait K { var h: int }
+  trait M { }
+
+  method Infer(c: C, o: object, k: K, d: D) returns (k': K) {
+    var delayme := c;  // object
+
+    var x := c;  // C
+    var yy := x.h;  // int
+
+    delayme := o;
+
+    var u := k;  // K
+    var v := k;  // object
+    v := o;
+    v := c;
+    var w := c;  // K
+    w := k;
+
+    var z := c;  // object
+    z := o;
+
+    var p := o;  // object
+    var y;  // C
+    var d: C := y;
+
+    var n := null;   // object
+    var n' := null;  // K (or object would be alright, too)
+    n' := k;
+    var n'' := null;  // K
+    k' := n'';
+  }
+}
+
+module TypeParameters {  // and abstract types
+  type A
+  type B
+  type C<T,U>
+
+  method M<G,H>(a: A, b: B, c0: C<int,bool>, g: G) returns (c1: C<real,real>, h: H)
+  {
+    var x := a;  // A
+    var y, z;  // B, B
+    y := z;
+    z := b;
+
+    var m, n;  // C<int,bool>, C<int,bool>
+    n := m;
+    m := c0;
+    var k, l;  // C<real,real>, C<real,real>
+    k := l;
+    c1 := k;
+
+    var g' := g;  // G
+    var h', h'';  // H, H
+    h' := h;
+    h := h'';
+
+    var r: C;  // type parameters inferred
+    r := c1;
+  }
+}
+
+module Datatypes {
+  datatype Color = Red | Green | Blue
+
+  method M() returns (c: Color) {
+    var x := c;  // Color
+    var y := x;  // Color
+    var w, z;  // Color, Color
+    w := z;
+    c := w;
+  }
+
+  datatype Record<T,U> = Record(t: T, u: U)
+
+  method P() returns (r: Record<int,bool>)
+  {
+    var a := r;  // Record<int,bool>
+    var b, c;  // int, Record<int,bool>
+    b := r.t;
+    r := c;
+
+    var s: Record;  // Record<int,real>
+    var x, y := s.t, s.u;
+    x := 5;
+    y := 10.0;
+
+    var t: Record;  // Record<bool,char>
+    var tt: bool, uu: char;
+    tt, uu := t.t, t.u;
+  }
+}
+
+module TraitStuff {
+  trait Part {
+    var id: int
+  }
+  trait Motorized { }
+  class PartX extends Part {
+  }
+  class PartY extends Part, Motorized {
+  }
+  class PartZ extends Part, Motorized {
+  }
+  class Aggregate {
+    ghost var Repr: set<object>
+    var x: PartX
+    var y: PartY
+    var z: PartZ
+    constructor ()
+    {
+      x := new PartX;
+      y := new PartY;
+      z := new PartZ;
+      Repr := {this, x, y, z};  // set<object>
+      new;
+      var parts := {x, y};  // set<Part>
+      var ooo := {y, z};  // set<object>  -- since super-traits are not unique
+    }
+  }
+}
+
+module OtherTraitsAndClasses {
+  method Basics(x: int) returns (y: int)
+  {
+    var k := x;  // int
+    var m;  // int
+    y := m + m;
+  }
+
+  trait J { }
+  trait K { }
+  class C extends J { }
+  class D extends J, K { }
+  class E { }
+
+  method Displays(c: C, d: D, e: E, j: J, k: K) {
+    var s := {c, c};  // set<C>
+    var t := {c, j};  // set<J>
+    var t' := {j, c};  // set<J>
+    var u := {c, d};  // set<J>
+    var v := {c, e};  // set<object>
+    var w := {k, c};  // set<object>
+  }
+
+  method G(c: C) {
+    var s := {c};  // set<C>
+    var t: set<C> := s;
+    var u: set<object> := s;
+  }
+
+  method M() returns (r: nat)
+  {
+    var x, y, z, w;  // int, nat, bool, int
+    x := x + y;
+    z := true;
+    y := r;
+    w := 0;
+  }
+
+  method Q0(s: set<char>) returns (t: set<char>) {
+    var p := s + t;  // set<char>
+  }
+
+  method Q1<T>(s: set<MyClass>) returns (t: set<MyClass>) {
+    var p := s + t;  // set<MyClass>
+    var q: set<object> := s + t;
+//    var r: set<T> := s + t;  // error
+  }
+
+  class MyClass { }
+
+
+  method P() {
+    var w, u;  // int, unint8
+    w := 0;
+    u := 0;
+    var v: uint8 := u;
+  }
+
+  newtype uint8 = x | 0 <= x < 256
+
+  method Brackets(a: array<char>)
+
+  {
+    var i;
+    var ch := a[i];
+
+
+
+
+
+
+
+  }
+
+}
+
+module LetPatterns {
+  datatype MyDt = AAA(x: int) | BBB(y: int)
+
+  ghost function M(m: MyDt): int
+    requires m.AAA?
+  {
+    var AAA(u) := m;  // u: int
+    u
+  }
+
+  method P()
+  {
+    var v;  // v: int
+    var m;  // m: MyDt
+    var w := v + var AAA(u) := m; u;  // m may not be an AAA, but that's checked by the verifier
+  }
+
+  method Q(x: int, r: real)
+  {
+    var o;  // real
+    var u := (x, o);  // (int,real)
+    o := r;
+  }
+}
+
+module Arrays_and_SubsetTypes {
+  method M()
+  {
+    var a: array<nat>;
+    var b: array<int>;
+    if * {
+      a := new nat[100];
+      b := new nat[100]; // ERROR
+    } else if * {
+      a := new int[100]; // ERROR
+      b := new int[100];
+    } else if * {
+      a := b;  // ERROR
+    } else if * {
+      b := a;  // ERROR
+    } else if * {
+      var n := new nat[100];  // array<nat>
+      if * {
+        a := n;
+      } else {
+        b := n; // A verification error
+      }
+    }
+  }
+}
+
+module Arrays_and_SubsetTypesOK {
+  method M()
+  { // Type-wise, all of the following are allowed (but the verifier will complain):
+    var a: array<nat>;
+    var b: array<int>;
+    if * {
+      a := new nat[100];
+      b := new nat[100]; // Error
+    } else if * {
+      a := new int[100]; // Error
+      b := new int[100];
+    } else if * {
+      a := b;            // Error
+    } else if * {
+      b := a;            // Error
+    } else if * {
+      var n := new nat[100];  // array<nat>
+      if * {
+        a := n;
+      } else {
+        b := n;
+      }
+    }
+  }
+}
+
+module TypeArgumentPrintTests {
+  trait Tr<X> { }
+
+  class Cl<Y> extends Tr<Y> {
+    lemma M() {
+      var u: Tr := this;  // should print as "var u: Tr<Y> := this;"
+      var v: Tr<Y> := this;  // should print as "var v: Tr<Y> := this;"
+    }
+  }
+
+  // -----
+  class A<X> {
+    static function F(x: X): int { 15 }
+  }
+
+  class B<Y> {
+    function H(y: Y, b: bool): int {
+      if b then
+        A.F(y)  // should print as A<Y>.F(y)
+      else
+        A<Y>.F(y)  // should print as A<Y>.F(y)
+    }
+  }
+}
+
+module PrettyPrintingBindingPowers {
+  newtype MyInt = u: int | u != 193
+
+  method M(m: map<int, real>, n: map<int, real>, a: set<int>, b: set<int>, c: set<int>) returns (r: map<int, real>)
+  {
+    r := m - b - c;
+    r := m - b + n;
+    r := (m - b) + n;  // unnecessary parentheses
+    r := m - (b + c);
+    r := m + n - (b + c);
+    r := m + (n - (b + c));
+    r := m + (n - b) - c;
+    r := m + (m + n) + m;
+    r := (((m + m) + n) + m);  // unnecessary parentheses
+  }
+
+  method P() returns (x: int, u: MyInt, s: set<int>, e: seq<int>, m: map<int, int>)
+  {
+    x := x + (x + x);  // unnecessary parentheses
+    u := u + (u + u);
+    s := s + (s + s);
+    e := e + (e + e);
+    m := m + (m + m);
+  }
+}
+
+module SameSCC {
+  // all of these should be in the same SCC
+  type G0 = G1
+  type G1 = G2
+  type G2 = G3<int>
+  type G3<X> = (X, G4)
+  type G4 = G5
+  datatype G5 = G5(G6)
+  codatatype G6 = G6(array<G0>)
+}
+
+module UnderspecifiedTypeConversions0 {
+  class Cell<X> { }
+  type UCell<U, V> = Cell<U>
+
+  method M(c: Cell<int>) {
+    if c is UCell { // error: type is underspecified
+      print "yes";
+    }
+  }
+
+  method N(c: object) {
+    if c is Cell { // error: type is underspecified
+      print "yes";
+    }
+  }
+}
+
+module UnderspecifiedTypeConversions1 {
+  class Cell<X> { }
+  type UCell<U, V> = Cell<U>
+
+  method M(c: Cell<int>) {
+    var d: Cell<int>;
+    d := c as UCell; // error: type is underspecified
+  }
+
+  method N(c: object) {
+    var d: object;
+    d := c as Cell; // error: type is underspecified
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsRefresh.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsRefresh.dfy.expect
new file mode 100644
index 00000000000..475a725c910
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConstraintsRefresh.dfy.expect
@@ -0,0 +1,19 @@
+TypeConstraintsRefresh.dfy(40,9): Error: RHS (of type bool) not assignable to LHS (of type int)
+TypeConstraintsRefresh.dfy(48,9): Error: RHS (of type bool) not assignable to LHS (of type int)
+TypeConstraintsRefresh.dfy(56,9): Error: RHS (of type int) not assignable to LHS (of type bool)
+TypeConstraintsRefresh.dfy(65,6): Error: RHS (of type bool) not assignable to LHS (of type int)
+TypeConstraintsRefresh.dfy(80,6): Error: RHS (of type MyInt) not assignable to LHS (of type int)
+TypeConstraintsRefresh.dfy(81,6): Error: RHS (of type int) not assignable to LHS (of type MyInt)
+TypeConstraintsRefresh.dfy(78,6): Error: RHS (of type MyInt) not assignable to LHS (of type int)
+TypeConstraintsRefresh.dfy(79,6): Error: RHS (of type int) not assignable to LHS (of type MyInt)
+TypeConstraintsRefresh.dfy(95,11): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got ?3)
+TypeConstraintsRefresh.dfy(102,11): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+TypeConstraintsRefresh.dfy(136,16): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
+TypeConstraintsRefresh.dfy(147,16): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got C?)
+TypeConstraintsRefresh.dfy(149,16): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got C?)
+TypeConstraintsRefresh.dfy(176,6): Error: RHS (of type C) not assignable to LHS (of type R)
+TypeConstraintsRefresh.dfy(536,9): Error: the type of this is-expression is underspecified
+TypeConstraintsRefresh.dfy(542,9): Error: the type of this is-expression is underspecified
+TypeConstraintsRefresh.dfy(554,11): Error: the type ('UCell<int, ?1>') of this expression is underspecified
+TypeConstraintsRefresh.dfy(559,11): Error: the type ('Cell<?2>') of this expression is underspecified
+18 resolution/type errors detected in TypeConstraintsRefresh.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversions.dfy
new file mode 100644
index 00000000000..bc58dbfbd4d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversions.dfy
@@ -0,0 +1,223 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --relax-definite-assignment --rprint:-
+
+
+newtype EvenInt = x | x % 2 == 0
+newtype SmallReal = r | -4.0 <= r < 300.0
+
+// Use of the following predicate will prevent Boogie's cleverness of discarding assignments to dead variables
+ghost predicate UseTheVars(x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0) { true }
+
+method M0() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  if {
+    case true                 => n := x as int;  // error: x may be negative
+    case 0 <= x                => x := x as int;
+    case true                 => x := r as int;  // error: r may have a fractional part
+    case true                 => n := r.Floor;  // error: r may be negative
+    case 0.0 <= r              => n := r.Floor;
+    case r == r.Floor as real => x := r as int;
+    case true                 => var b := r as int == r.Floor;  // error: conversion to int may fail
+    case true                 => assert -4 <= small.Floor < 300;
+    case true                 => even := 6.0 as EvenInt;  assert even == 6;
+  }
+}
+
+method M1() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  if {
+    case true => x := b67 as int;
+    case true => x := w as int;
+    case true => x := seven as int;
+    case true => x := noll as int;
+    case true => n := noll as int;
+    case true => n := b67 as int;  // note, a bitvector is never negative
+    case true => r := b67 as real;
+    case true => r := seven as real;
+    case true => r := noll as real;
+    case true => even := (b67 as int * 2) as EvenInt;
+    case true => small := small as real as SmallReal;
+    case true => small := small.Floor as SmallReal;
+    case true => small := noll as SmallReal;
+    case true => small := seven as SmallReal;
+    case true => small := w as SmallReal;  // error: w may be too big
+    case (w & 0xF) as int <= 0xF /* Z3 doesn't know much about bv2int :( */ => small := (w & 0xF) as SmallReal;
+  }
+}
+
+method M2() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  if {
+    case true => b67 := b67 as bv67;
+    case true => b67 := w as bv67;
+    case true => b67 := seven as bv67;
+    case true => b67 := noll as bv67;
+    case true => w := b67 as bv32;  // error: b67 may be too big
+    case true => w := w as bv32;
+    case true => w := seven as bv32;
+    case true => w := noll as bv32;
+    case true => seven := b67 as bv7;  // error: b67 may be too big
+    case true => seven := w as bv7;  // error: w may be too big
+    case true => seven := seven as bv7;
+    case true => seven := noll as bv7;
+  }
+}
+
+method M2'() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  if {
+    case true => noll := b67 as bv0;  // error: b67 may be too big
+    case true => noll := w as bv0;  // error: w may be too big
+    case true => noll := seven as bv0;  // error: seven may be too big
+    case true => noll := noll as bv0;
+  }
+}
+
+method M3() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  if {
+    case true => x, r := b67 as int, b67 as real;
+    case true => x, r := w as int, w as real;
+    case true => x, r := seven as int, seven as real;
+    case true => x, r := noll as int, noll as real;
+  }
+  assert 0 <= x && 0.0 <= r;
+}
+// M4 is checked quickly, but using bv67 instead of bv7 takes forever, and even bv23 takes 40 minutes. See numbers at bottom of this file.
+method M4() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, seven as bv67, w, seven, noll)
+{
+  if {
+    case true => even := noll as EvenInt;
+    case true => even := seven as EvenInt;  // error: "seven" may be odd
+    case seven as int % 2 == 0 => even := seven as EvenInt;
+    case true => small := seven as SmallReal;
+    case true =>
+      even := small as EvenInt;  // error (x2): small may not even be an integer, let alone odd
+    case small == small.Floor as SmallReal =>
+      even := small as EvenInt;  // error: small may be odd
+    case small == small.Floor as SmallReal && small as int % 2 == 0 =>
+      even := small as EvenInt;
+  }
+}
+
+method M5() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  x := 150;
+  if {
+    case true => b67 := x as bv67;
+    case true => w := x as bv32;
+    case true => seven := x as bv7;  // error: 'x' may not fit in 7 bits
+    case true => noll := x as bv0;  // error: 'x' may not fit in 0 bits
+    case n < 128 => seven := n as bv7;
+    case n == 0 => noll := n as bv0;
+    case n < 1 => noll := n as bv0;
+    case 0 <= even < 0x1_0000_0000 => w := even as bv32;
+    case small as real == small.Floor as real => seven := (if 0.0 <= small < 100.0 then small else 100.0) as bv7;
+  }
+}
+
+class Class { }
+type ClassSubset = c: Class | true // error: the witness guess "null" is not good enough
+
+
+/***
+  Conversions between integers and bitvectors and their corresponding operations is tough for Z3.
+  Given the template program program:
+
+      type BvType = bv67;
+
+      function {:bvbuiltin "bvurem"} BvMod(BvType, BvType): BvType;
+
+      function {:bvbuiltin "bv2int"} BvToNat(BvType): int;
+
+      procedure M4(b: BvType)
+      {
+        assume BvToNat(b) mod 2 == 0;
+        assert BvMod(b, 2bv67) == 0bv67;
+      }
+
+  which is an extract from method M4 above, and replacing the three occurrences of "67" with numbers starting
+  from "6", Z3 version 4.12.1 requires the following times:
+     
+      --------------- bv6 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.25s user 0.08s system 100% cpu 0.336 total
+      --------------- bv7 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.24s user 0.08s system 100% cpu 0.322 total
+      --------------- bv8 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.27s user 0.09s system 100% cpu 0.359 total
+      --------------- bv9 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.25s user 0.08s system 101% cpu 0.319 total
+      --------------- bv10 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.25s user 0.08s system 100% cpu 0.329 total
+      --------------- bv11 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.26s user 0.08s system 101% cpu 0.334 total
+      --------------- bv12 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.26s user 0.09s system 100% cpu 0.347 total
+      --------------- bv13 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.28s user 0.08s system 100% cpu 0.363 total
+      --------------- bv14 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.33s user 0.09s system 100% cpu 0.420 total
+      --------------- bv15 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.42s user 0.09s system 100% cpu 0.504 total
+      --------------- bv16 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.67s user 0.08s system 100% cpu 0.739 total
+      --------------- bv17 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  1.31s user 0.09s system 100% cpu 1.399 total
+      --------------- bv18 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.24s user 0.08s system 10% cpu 3.194 total
+      --------------- bv19 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.26s user 0.09s system 3% cpu 8.910 total
+      --------------- bv20 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.25s user 0.08s system 1% cpu 30.118 total
+      --------------- bv21 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.28s user 0.11s system 0% cpu 2:15.97 total
+      --------------- bv22 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.35s user 0.18s system 0% cpu 10:31.82 total
+      --------------- bv23 --------------
+
+      Boogie program verifier finished with 1 verified, 0 errors
+      boogied dd.bpl  0.45s user 0.44s system 0% cpu 39:51.32 total
+
+  This shows at least exponential growth.
+
+***/
diff --git a/Test/dafny0/TypeConversions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversions.dfy.expect
similarity index 91%
rename from Test/dafny0/TypeConversions.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversions.dfy.expect
index 601a6e302fe..3a5c63ff6cb 100644
--- a/Test/dafny0/TypeConversions.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversions.dfy.expect
@@ -25,7 +25,7 @@ module _System {
   */
 
   class {:compile false} array<arg> {
-    var Length: int  // immutable
+    const Length: int
   }
   /*-- non-null type
   type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
@@ -63,21 +63,23 @@ module _System {
     | f.requires()
     /*special witness*/
 
-  datatype {:compile false} /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
 
   type bool { }
 
+  type char { }
+
   type int { }
 
   type real {
-    var Floor: int  // immutable
+    const Floor: int
   }
 
   type ORDINAL {
-    var IsLimit: bool  // immutable
-    var IsSucc: bool  // immutable
-    var Offset: int  // immutable
-    var IsNat: bool  // immutable
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
   }
 
   type _bv {
@@ -86,19 +88,27 @@ module _System {
     function RotateRight(w: nat): selftype
   }
 
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
   type map<+T, +U> {
-    var Keys: set<T>  // immutable
-    var Values: set<U>  // immutable
-    var Items: set<(T, U)>  // immutable
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
   }
 
   type imap<*T, +U> {
-    var Keys: iset<T>  // immutable
-    var Values: iset<U>  // immutable
-    var Items: iset<(T, U)>  // immutable
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
   }
 
-  datatype {:compile false} /*_tuple#0*/ () = _#Make0
+  datatype /*_tuple#0*/ () = _#Make0
 
   type {:compile false} /*_#Func9*/ (-T0, -T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8) ~> +R {
     ghost function requires(x0: T0, x1: T1, x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8): bool
@@ -284,14 +294,16 @@ method M3()
 }
 
 method M4()
-    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
-  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, seven as bv67, w, seven, noll)
 {
   if {
     case true =>
       even := noll as EvenInt;
-    case b67 as int % 2 == 0 =>
-      even := b67 as EvenInt;
+    case true =>
+      even := seven as EvenInt;
+    case seven as int % 2 == 0 =>
+      even := seven as EvenInt;
     case true =>
       small := seven as SmallReal;
     case true =>
@@ -354,6 +366,7 @@ TypeConversions.dfy(62,28): Error: value to be converted might not fit in bv7
 TypeConversions.dfy(72,29): Error: value to be converted might not fit in bv0
 TypeConversions.dfy(73,27): Error: value to be converted might not fit in bv0
 TypeConversions.dfy(74,31): Error: value to be converted might not fit in bv0
+TypeConversions.dfy(96,31): Error: result of operation might violate newtype constraint for 'EvenInt'
 TypeConversions.dfy(100,20): Error: result of operation might violate newtype constraint for 'EvenInt'
 TypeConversions.dfy(100,20): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
 TypeConversions.dfy(102,20): Error: result of operation might violate newtype constraint for 'EvenInt'
@@ -361,4 +374,4 @@ TypeConversions.dfy(115,28): Error: value to be converted might not fit in bv7
 TypeConversions.dfy(116,27): Error: value to be converted might not fit in bv0
 TypeConversions.dfy(126,5): Error: trying witness null: value of expression (of type 'Class?') is not known to be an instance of type 'Class', because it might be null
 
-Dafny program verifier finished with 3 verified, 17 errors
+Dafny program verifier finished with 3 verified, 18 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversions.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversions.dfy.refresh.expect
new file mode 100644
index 00000000000..1a7bbaa5f35
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversions.dfy.refresh.expect
@@ -0,0 +1,401 @@
+// TypeConversions.dfy
+
+/*
+module _System {
+  /* CALL GRAPH for module _System:
+   * SCC at height 1:
+   *   RotateLeft
+   * SCC at height 1:
+   *   RotateRight
+   * SCC at height 0:
+   *   array
+   * SCC at height 0:
+   *   nat
+   * SCC at height 0:
+   *   object
+   */
+  type string(==,0) = seq<char>
+
+  type {:axiom} nat(==,0) = x: int
+    | 0 <= x
+
+  trait {:compile false} object { }
+  /*-- non-null type
+  type {:axiom} object(==) = c: object? | c != null /*special witness*/
+  */
+
+  class {:compile false} array<arg> {
+    const Length: int
+  }
+  /*-- non-null type
+  type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
+  */
+
+  type {:compile false} /*_#Func1*/ -T0 ~> +R {
+    ghost function requires(x0: T0): bool
+      reads reads(x0)
+
+    ghost function reads(x0: T0): set<object?>
+      reads reads(x0)
+  }
+
+  type {:compile false} /*_#PartialFunc1*/ -T0 --> +R = f: T0 ~> R
+    | forall x0: T0 :: f.reads(x0) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc1*/ -T0 -> +R = f: T0 --> R
+    | forall x0: T0 :: f.requires(x0)
+    /*special witness*/
+
+  type {:compile false} /*_#Func0*/ () ~> +R {
+    ghost function requires(): bool
+      reads reads()
+
+    ghost function reads(): set<object?>
+      reads reads()
+  }
+
+  type {:compile false} /*_#PartialFunc0*/ () --> +R = f: () ~> R
+    | f.reads() == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc0*/ () -> +R = f: () --> R
+    | f.requires()
+    /*special witness*/
+
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+
+  type bool { }
+
+  type char { }
+
+  type int { }
+
+  type real {
+    const Floor: int
+  }
+
+  type ORDINAL {
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
+  }
+
+  type _bv {
+    function RotateLeft(w: nat): selftype
+
+    function RotateRight(w: nat): selftype
+  }
+
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
+  type map<+T, +U> {
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
+  }
+
+  type imap<*T, +U> {
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
+  }
+
+  datatype /*_tuple#0*/ () = _#Make0
+
+  type {:compile false} /*_#Func9*/ (-T0, -T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8) ~> +R {
+    ghost function requires(x0: T0, x1: T1, x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8): bool
+      reads reads(x0, x1, x2, x3, x4, x5, x6, x7, x8)
+
+    ghost function reads(x0: T0, x1: T1, x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8): set<object?>
+      reads reads(x0, x1, x2, x3, x4, x5, x6, x7, x8)
+  }
+
+  type {:compile false} /*_#PartialFunc9*/ (-T0, -T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8) --> +R = f: (T0, T1, T2, T3, T4, T5, T6, T7, T8) ~> R
+    | forall x0: T0, x1: T1, x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8 :: f.reads(x0, x1, x2, x3, x4, x5, x6, x7, x8) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc9*/ (-T0, -T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8) -> +R = f: (T0, T1, T2, T3, T4, T5, T6, T7, T8) --> R
+    | forall x0: T0, x1: T1, x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8 :: f.requires(x0, x1, x2, x3, x4, x5, x6, x7, x8)
+    /*special witness*/
+
+  type bv67 {
+    function RotateLeft(w: nat): bv67
+
+    function RotateRight(w: nat): bv67
+  }
+
+  type bv32 {
+    function RotateLeft(w: nat): bv32
+
+    function RotateRight(w: nat): bv32
+  }
+
+  type bv7 {
+    function RotateLeft(w: nat): bv7
+
+    function RotateRight(w: nat): bv7
+  }
+
+  type bv0 {
+    function RotateLeft(w: nat): bv0
+
+    function RotateRight(w: nat): bv0
+  }
+}
+// bitvector types in use: bv67 bv32 bv7 bv0
+*/
+
+/* CALL GRAPH for module _module:
+ * SCC at height 2:
+ *   M0
+ * SCC at height 2:
+ *   M1
+ * SCC at height 2:
+ *   M2
+ * SCC at height 2:
+ *   M2'
+ * SCC at height 2:
+ *   M3
+ * SCC at height 2:
+ *   M4
+ * SCC at height 2:
+ *   M5
+ * SCC at height 1:
+ *   ClassSubset
+ * SCC at height 1:
+ *   UseTheVars
+ * SCC at height 0:
+ *   Class
+ * SCC at height 0:
+ *   EvenInt
+ * SCC at height 0:
+ *   SmallReal
+ */
+ghost predicate UseTheVars(x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  decreases x, n, r, even, small, b67, w, seven, noll
+{
+  true
+}
+
+method M0()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  if {
+    case true =>
+      n := x as int;
+    case 0 <= x =>
+      x := x as int;
+    case true =>
+      x := r as int;
+    case true =>
+      n := r.Floor;
+    case 0.0 <= r =>
+      n := r.Floor;
+    case r == r.Floor as real =>
+      x := r as int;
+    case true =>
+      var b: bool := r as int == r.Floor;
+    case true =>
+      assert -4 <= small.Floor < 300;
+    case true =>
+      even := 6.0 as EvenInt;
+      assert even == 6;
+  }
+}
+
+method M1()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  if {
+    case true =>
+      x := b67 as int;
+    case true =>
+      x := w as int;
+    case true =>
+      x := seven as int;
+    case true =>
+      x := noll as int;
+    case true =>
+      n := noll as int;
+    case true =>
+      n := b67 as int;
+    case true =>
+      r := b67 as real;
+    case true =>
+      r := seven as real;
+    case true =>
+      r := noll as real;
+    case true =>
+      even := (b67 as int * 2) as EvenInt;
+    case true =>
+      small := small as real as SmallReal;
+    case true =>
+      small := small.Floor as SmallReal;
+    case true =>
+      small := noll as SmallReal;
+    case true =>
+      small := seven as SmallReal;
+    case true =>
+      small := w as SmallReal;
+    case (w & 15) as int <= 15 =>
+      small := (w & 15) as SmallReal;
+  }
+}
+
+method M2()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  if {
+    case true =>
+      b67 := b67 as bv67;
+    case true =>
+      b67 := w as bv67;
+    case true =>
+      b67 := seven as bv67;
+    case true =>
+      b67 := noll as bv67;
+    case true =>
+      w := b67 as bv32;
+    case true =>
+      w := w as bv32;
+    case true =>
+      w := seven as bv32;
+    case true =>
+      w := noll as bv32;
+    case true =>
+      seven := b67 as bv7;
+    case true =>
+      seven := w as bv7;
+    case true =>
+      seven := seven as bv7;
+    case true =>
+      seven := noll as bv7;
+  }
+}
+
+method M2'()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  if {
+    case true =>
+      noll := b67 as bv0;
+    case true =>
+      noll := w as bv0;
+    case true =>
+      noll := seven as bv0;
+    case true =>
+      noll := noll as bv0;
+  }
+}
+
+method M3()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  if {
+    case true =>
+      x, r := b67 as int, b67 as real;
+    case true =>
+      x, r := w as int, w as real;
+    case true =>
+      x, r := seven as int, seven as real;
+    case true =>
+      x, r := noll as int, noll as real;
+  }
+  assert 0 <= x && 0.0 <= r;
+}
+
+method M4()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, seven as bv67, w, seven, noll)
+{
+  if {
+    case true =>
+      even := noll as EvenInt;
+    case true =>
+      even := seven as EvenInt;
+    case seven as int % 2 == 0 =>
+      even := seven as EvenInt;
+    case true =>
+      small := seven as SmallReal;
+    case true =>
+      even := small as EvenInt;
+    case small == small.Floor as SmallReal =>
+      even := small as EvenInt;
+    case small == small.Floor as SmallReal && small as int % 2 == 0 =>
+      even := small as EvenInt;
+  }
+}
+
+method M5()
+    returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
+  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
+{
+  x := 150;
+  if {
+    case true =>
+      b67 := x as bv67;
+    case true =>
+      w := x as bv32;
+    case true =>
+      seven := x as bv7;
+    case true =>
+      noll := x as bv0;
+    case n < 128 =>
+      seven := n as bv7;
+    case n == 0 =>
+      noll := n as bv0;
+    case n < 1 =>
+      noll := n as bv0;
+    case 0 <= even < 4294967296 =>
+      w := even as bv32;
+    case small as real == small.Floor as real =>
+      seven := (if 0.0 <= small < 100.0 then small else 100.0) as bv7;
+  }
+}
+
+newtype EvenInt = x: int
+  | x % 2 == 0
+
+newtype SmallReal = r: real
+  | -4.0 <= r < 300.0
+
+class Class { }
+/*-- non-null type
+type {:axiom} Class(==) = c: Class? | c != null /*special witness*/
+*/
+
+type ClassSubset = c: Class
+  | true
+TypeConversions.dfy(14,40): Error: value does not satisfy the subset constraints of 'nat'
+TypeConversions.dfy(16,40): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
+TypeConversions.dfy(17,40): Error: value does not satisfy the subset constraints of 'nat'
+TypeConversions.dfy(20,44): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
+TypeConversions.dfy(44,28): Error: result of operation might violate newtype constraint for 'SmallReal'
+TypeConversions.dfy(57,26): Error: value to be converted might not fit in bv32
+TypeConversions.dfy(61,30): Error: value to be converted might not fit in bv7
+TypeConversions.dfy(62,28): Error: value to be converted might not fit in bv7
+TypeConversions.dfy(72,29): Error: value to be converted might not fit in bv0
+TypeConversions.dfy(73,27): Error: value to be converted might not fit in bv0
+TypeConversions.dfy(74,31): Error: value to be converted might not fit in bv0
+TypeConversions.dfy(96,31): Error: result of operation might violate newtype constraint for 'EvenInt'
+TypeConversions.dfy(100,20): Error: result of operation might violate newtype constraint for 'EvenInt'
+TypeConversions.dfy(100,20): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
+TypeConversions.dfy(102,20): Error: result of operation might violate newtype constraint for 'EvenInt'
+TypeConversions.dfy(115,28): Error: value to be converted might not fit in bv7
+TypeConversions.dfy(116,27): Error: value to be converted might not fit in bv0
+TypeConversions.dfy(126,5): Error: trying witness null: value of expression (of type 'Class?') is not known to be an instance of type 'Class', because it might be null
+
+Dafny program verifier finished with 3 verified, 18 errors
diff --git a/Test/dafny0/TypeConversionsCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversionsCompile.dfy
similarity index 97%
rename from Test/dafny0/TypeConversionsCompile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversionsCompile.dfy
index 5b1e32b9258..2bac358510f 100644
--- a/Test/dafny0/TypeConversionsCompile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversionsCompile.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // Note the difference in output in Java's case is due to
 // https://github.com/dafny-lang/dafny/issues/4152
diff --git a/Test/dafny0/TypeConversionsCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversionsCompile.dfy.expect
similarity index 100%
rename from Test/dafny0/TypeConversionsCompile.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversionsCompile.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversionsCompile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversionsCompile.dfy.rs.check
new file mode 100644
index 00000000000..d131d585c89
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeConversionsCompile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type\ name\ for\ ORDINAL\ \(Microsoft_dDafny_dBigOrdinalType\)</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefresh.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefresh.dfy
new file mode 100644
index 00000000000..fb785503221
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefresh.dfy
@@ -0,0 +1,1071 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --relax-definite-assignment "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype Color = BlueX | WhiteX | PastelX
+{
+  predicate IsFailure() {
+    WhiteX? || BlueX?
+  }
+  function PropagateFailure(): int {
+    15
+  }
+  function Extract(): real {
+    if BlueX? then 3.09 else 9.03
+  }
+}
+
+function FxF(x: int): bool
+
+method CallF0() {
+  var b0 := FxF(15);
+  var f: int -> bool := FxF;
+  var b1 := f(15);
+  assert b0 == b1;
+}
+
+method CallF1() {
+  var b0 := FxF(15);
+  var f := FxF;
+  var b1 := f(15);
+  assert b0 == b1;
+}
+
+class ClassForOld {
+  var u: int
+  method Old()
+    modifies this
+  {
+    u := u + 1;
+    assert old(u) == u - 1;
+    if old(u) == 5 {
+      var g := 10;
+    }
+  }
+  method Unchanged() {
+    assert unchanged(this);
+  }
+  method New(a': array<int>) returns (r: ClassForOld, a: array<int>)
+    ensures fresh(r)
+    ensures !fresh(a)
+    ensures !fresh(var o := null; o)
+    ensures !fresh(null)
+  {
+    var m := var o := null; o;
+    r := new ClassForOld;
+    a := a';
+  }
+}
+
+method ToMultiset(s: set<int>, q: seq<real>) {
+  var r0 := multiset(s);
+  var r1 := multiset(q);
+}
+
+method CreateLambdaAndSequence() {
+  var f := i => 2 * i;
+  var s := seq(15, f); 
+}
+
+datatype Colors = Blue | Yellow | Gray(n: nat)
+{
+  method PrintMe() {
+    if (this == Blue) {
+      print "blue";
+    } else if (this == Yellow) {
+      print "yellow";
+    } else {
+      print "gray ", n;
+    }
+    print "\n";
+  }
+}
+
+module A {
+  type T
+  datatype BaseType = BaseType(t: T)
+
+  predicate P(d: BaseType)
+
+  class XYZ {
+    static predicate ABC(d: BaseType)
+  }
+
+  type SubsetType = d: BaseType | P(d)
+    witness *
+  type SubsetType' = d: BaseType | d == d
+    witness *
+  type SubsetType'' = d: BaseType | XYZ.ABC(d)
+    witness *
+
+  method M0(dp: SubsetType, tt: T) {
+    var dp0: SubsetType := [dp][0];
+    var dp': SubsetType := dp0.(t := tt); // error: does not satisfy SubsetType
+  }
+
+  method M1(dp: SubsetType, tt: T) {
+    var dp0 := [dp][0];
+    var dp': SubsetType := dp0.(t := tt); // error: does not satisfy SubsetType
+  }
+}
+
+method Bv() {
+  var bv: bv6 := 8;
+  var o: ORDINAL := 8;
+}
+method SUpdate(s: seq<real>, m0: map<real, bool>, m1: imap<real, bool>, mm: multiset<bv6>)
+  requires |s| == 10
+{
+  var s' := s[6 := 3.2];
+  var m0' := m0[3.2 := true];
+  var m1' := m1[3.2 := true];
+  var mm' := mm[8 := 100];
+}
+
+method MultiDimArray(m: array3<real>)
+  requires m.Length0 == m.Length1 == m.Length2 == 10
+{
+  var r := m[2, 4, 6];
+  var b := r == 2.7;
+}
+
+method LittleArray(a: array<real>)
+  requires 10 <= a.Length
+{
+  var s := a [2..3];
+}
+function Qf(x: int, a: array<int>): bool
+  requires x <= a.Length
+  reads a
+{
+  var m := map[2 := true, 3 := false, 4 := false];
+  var u := m[3];
+  var v := true;
+  var w := m[3] == true;
+  var ww := u == v;
+  forall i :: 0 <= i < x ==> m[i] == true // error: index might be outside domain
+}
+
+trait AsTr extends object { }
+class AsCl extends AsTr { }
+
+method Is(clIn: AsCl) {
+  var b;
+  b := clIn is AsTr;
+  b := clIn is object;
+  b := clIn is AsCl?;
+  b := clIn is AsTr?;
+  b := clIn is object?;
+}
+
+method As(clIn: AsCl, ch: char) returns (cl: AsCl) {
+  var tr: AsTr;
+  var obj: object;
+  tr := clIn as AsTr;
+  obj := clIn as AsTr;
+  obj := clIn as object;
+  cl := tr as AsCl;
+  cl := obj as AsCl;
+
+  var x: int;
+  var ord: ORDINAL;
+  x := ch as int;
+
+}
+
+method As?(clIn: AsCl) returns (cl: AsCl?) {
+  var tr: AsTr?;
+  var obj: object?;
+  tr := clIn as AsTr?;
+  obj := clIn as AsTr?;
+  obj := clIn as object?;
+  cl := tr as AsCl?;
+  cl := obj as AsCl?;
+}
+
+datatype BlackWhite = White | Gray(int)
+
+method Dtv(b: bool) returns (c: BlackWhite) {
+  var d := White;
+  var e := BlackWhite.Gray(15);
+  c := if b then BlackWhite.Gray(10) else BlackWhite.Gray(20);
+  assert c.Gray?;
+}
+
+newtype XX = y: YY | true
+type YY = z: int | true
+type ZZ = y: YY | true
+
+newtype jnt8 = x |
+  var lo := -0x80;
+  var hi := 0x80;
+  lo <= x < hi
+
+newtype int8 = x |
+  - 0x80 <= x < 0x80
+
+method TooBigDiv(a: int8) {
+  var b := a;
+  var u := false;
+  u := !u;
+  var q := a != 0;
+  var k :=
+    var xyz := 3; xyz;
+  var l := 3 + if u then 2 else 1;
+  
+  if
+  case true => var x := a / (0-1);  // error: result may not be an int8 (if a is -128)
+  case a != -128 => var x := a / (0-1);
+  case true =>
+    var minusOne := -1;
+    var y := a % minusOne;  // fine
+  case a != 0 =>
+    var z := (0-1) % a;  // fine
+}
+
+method Good(a: int8)
+  requires a != -127-1
+{
+  var x := a / -1;  // fine
+}
+
+class Global {
+  static function G(x: int): int { x+x }
+  static method N(ghost x: int, g: Global) returns (ghost r: int)
+    ensures r == Global.G(x)
+  {
+    if
+    case true =>
+      r := G(x);
+    case true =>
+      r := G(x+0);
+    case true =>
+      r := g.G(x);
+    case true =>
+      var g: Global? := null;
+      r := g.G(x);
+    case true =>
+      r := Global.G(x);
+  }
+}
+
+method Mxy(x: int, y: int) {
+  var b := x == y;
+  var m, n;
+  b := m == n;
+  n := 'n';
+}
+
+module Inheritance {
+  trait Trait extends object { }
+  class A extends Trait { }
+  class B extends Trait { }
+  class C<X, Y, Z> extends Trait { }
+  class D<X(0)> {
+    var x: X
+    var y: X
+  }
+  class Cell {
+    var data: int
+  }
+
+  method FInt() returns (r: int) {
+    var d := new D;
+    var u: int := d.x;
+    r := d.y;
+  }
+  method FIntCell() returns (r: int) {
+    var c := new Cell;
+    var u := c.data;
+    r := u;
+  }
+  method FCell(c: Cell) {
+    var x := c.data;
+  }
+
+  method S0(o: object, t: Trait, a: A, b: B)
+  {
+    var oo := o;
+    var x := t;
+    var y := a;
+  }
+
+  method S1(o: object, t: Trait, a: A, b: B)
+  {
+    var z := a;
+    z := a;
+    z := b;
+    z := t;
+    z := o;
+  }
+
+  method S2(o: object, t: Trait, a: A, b: B)
+  {
+    var uu := a;
+  }
+
+  method S3(o: object?, t: Trait?, a: A?, b: B?, c: C?<int, bool, Trait?>) returns (aa: A?, c3: C?<bool, int, Trait?>)
+  {
+    var uu;
+    aa := uu;
+    var uu3;
+    c3 := uu3;
+  }
+
+  method S4(o: object?, t: Trait?, a: A?, b: B?, c: C?<int, bool, Trait?>) returns (aa: A?, c3: C?<bool, int, Trait?>)
+  {
+    var n := null;
+  }
+
+  method S6(o: object?, t: Trait?, a: A?, b: B?, c: C?<int, bool, Trait?>) returns (aa: A?, c3: C?<bool, int, Trait?>)
+  {
+    var oo := o;
+    var tt := t;
+    tt := null;
+    var a3 := a;
+  }
+}
+
+newtype MyInt = int
+
+type MyNatSynonym = nat
+
+function F(x: int): int {
+  5
+}
+
+function G(x: int): int {
+  x
+}
+
+function H(x: int): int {
+  x % 5
+}
+
+function I(x: MyInt): MyInt {
+  x % 5
+}
+
+method M(x: int, m: MyInt, n: nat, n': MyNatSynonym) {
+  var y, z, w, q;
+  y := x;
+  w := 2;
+  w := x;
+  z := x;
+  q := 3;
+  q := m;
+  y := n;
+  y := n';
+}
+
+method A0(s: seq<int>) {
+  var t;
+  t := s;
+  var u;
+  u := [2, 3];
+  var m := map[3 := true];
+}
+
+method A1(k: MyInt) {
+  var g, h;
+  var p := map[g := 3, true := h];
+  h := k;
+}
+
+method A2() {
+  var g;
+  var s := [g];
+  g := true;
+}
+
+method A3() {
+  var u;
+  u := [2, 3];
+  var v := [];
+  var b := 2 in v;
+}
+
+method B0() {
+  var a := true;
+  var b;
+  var c := b ==> a;
+  var d := (a || a) <== b && (a <==> c);
+}
+
+method MMap() {
+  var a: map<int, bool>, b;
+  var c := a - b;
+}
+
+function Qfx(a: map<int, real>): int
+  requires 3 in a.Keys
+{
+  var w := a[3] == 3.14;
+  17
+}
+
+class XyzClass {
+  method New(c: XyzClass', b: bool, r': XyzClass) returns (r: XyzClass)
+    ensures var q := if b then r else c; true
+  {
+    r := r';
+  }
+}
+type XyzClass' = c: XyzClass? | true witness *
+
+function {:opaque} OpaqueFunction(): int { 12 }
+
+method Reveal() {
+  assert A: true;
+  reveal A;
+  reveal OpaqueFunction();
+}
+
+lemma Calc(a: bool, b: bool, c: int, d: int, e: int)
+  requires c <= d <= e
+  requires a
+  requires b ==> e <= c
+  requires B: b
+  ensures e <= d
+{
+  calc ==> {
+    a;
+    c <= d;
+  ==  { reveal B; }
+    e <= d;
+  }
+}
+
+class CellToModify {
+  var data: int
+}
+
+method Modify(b: bool) {
+  var c := new CellToModify;
+  modify c;
+  modify c { // warning: deprecated statement
+    if b {
+      c.data := 20;
+    }
+  }
+}
+
+module Patterns {
+  datatype Color = Red | Gray(n: nat)
+
+  method VarPattern(c: Color) returns (x: int) {
+    if c != Red {
+      var Gray(mm) := c;
+      x := mm;
+    }
+  }
+
+  method M(c: Color) returns (x: int) {
+    match c
+    case Red =>
+    case Gray(oo) => x := oo;
+  }
+
+  function LetPattern(c: Color): int {
+    if c == Red then 3 else
+      var Gray(pp) := c;
+      pp
+  }
+
+  function F(c: Color): int {
+    match c
+    case Red => 3
+    case Gray(oo) => oo
+  }
+}
+
+method WhileLoops() returns (k: int) {
+  var i := 250;
+  while 2 < i {
+    i := i - 1;
+    k := k + i;
+  }
+  var ii := 0;
+  while ii < 10 {
+    var u: RomanC := ii;
+    ii := ii + 1;
+  }
+}
+
+method ForLoops() returns (k: int) {
+  for i := 250 downto 2 {
+    k := k + i;
+  }
+  for i := 0 to 10
+  {
+    var u: RomanC := i;
+  }
+}
+
+newtype RomanC = x | 0 <= x < 100
+
+method LoopAlternatives(n: nat) {
+  var a, b := 0, n;
+  while
+    decreases b - a
+  case a < b => b := b - 1;
+  case a < b => a := a + 1;
+}
+
+module TypeParameterResolution {
+  type A
+
+  class Class<B> {
+    var aa: A
+    var bb: B
+    constructor()
+    method M<C>() {
+      var a: A;
+      var b: B;
+      var c: C;
+    }
+    function F<D>(a: A, b: B, d: D): int {
+      var a': A := a;
+      var b': B := b;
+      var d': D := d;
+      3
+    }
+  }
+
+  type SS<X(!new)> = o: int | assert forall x: X :: var y: X := x; true; 0 <= o witness *
+
+  datatype Datatype<B> = Ctor {
+    method M<C>() {
+      var a: A;
+      var b: B;
+      var c: C;
+    }
+    function F<D>(a: A, b: B, d: D): int {
+      var a': A := a;
+      var b': B := b;
+      var d': D := d;
+      3
+    }
+  }
+
+  type Opaque<B> {
+    method M<C>() {
+      var a: A;
+      var b: B;
+      var c: C;
+    }
+    function F<D>(a: A, b: B, d: D): int {
+      var a': A := a;
+      var b': B := b;
+      var d': D := d;
+      3
+    }
+  }
+}
+
+module FunctionApplications {
+  function Fn<X>(xp: X): (real, X)
+
+  method NewArrayInit(n: nat) returns (g: int ~> real) {
+    var fn1 := x => 3.00;
+    var u1 := fn1(100);
+
+    var v := Fn(100);
+
+    var fn := (_, q) => 3.00;
+    var u := fn(100, 100);
+
+    var arr := new real[n](_ => 3.00);
+  }
+}
+
+module ForallStmt {
+  method AggregateAssignment(s: set<int>, a: array<real>)
+    requires forall x :: x in s ==> 0 <= x < a.Length
+    modifies a
+  {
+    forall i | i in s {
+      a[i] := 35.50;
+    }
+  }
+
+  function Plus(x: nat, y: nat): nat {
+    if x == 0 then y else 1 + Plus(x - 1, y)
+  }
+
+  lemma DistributePlus(a: nat, x: nat, y: nat)
+    ensures Plus(a + x, y) == a + Plus(x, y)
+  {
+    if a != 0 {
+      calc {
+        Plus(a + x, y);
+      ==
+        1 + Plus(a - 1 + x, y);
+      ==  { DistributePlus(a - 1, x, y); }
+        1 + (a - 1) + Plus(x, y);
+      ==
+        a + Plus(x, y);
+      }
+    }
+  }
+
+  lemma Associative(x: nat, y: nat, z: nat)
+    ensures Plus(Plus(x, y), z) == Plus(x, Plus(y, z))
+  {
+    if x != 0 {
+      calc {
+        Plus(Plus(x, y), z);
+      ==  // def. Plus
+        Plus(1 + Plus(x - 1, y), z);
+      ==  // def. Plus
+        1 + Plus(Plus(x - 1, y), z);
+      ==  { Associative(x - 1, y, z); }
+        1 + Plus(x - 1, Plus(y, z));
+      ==  // def. Plus
+        Plus(x, Plus(y, z));
+      }
+    }
+  }
+
+  lemma AllAssociative()
+    ensures forall x, y, z :: Plus(Plus(x, y), z) == Plus(x, Plus(y, z)) // error (x3): x,y,z are int's, not nat's
+  {
+    forall x, y, z {
+      Associative(x, y, z); // error (x3): x,y,z are int's, not nat's
+    }
+  }
+}
+
+module Variance {
+  method CollectionVariance<X>(b: array<X>) returns (r: set<object>, o: object, m: map<object, object>) {
+    o := b;
+    r := {b};
+    m := map[o := o];
+    m := map[b := o];
+    m := map[o := b];
+  }
+
+  method ArrowCovariance<A, B, X>(arr: array<X>) returns (f: () -> object, g: A -> object, h: (A, B) -> object) {
+    f := () => arr;
+    g := a => arr;
+    h := (a, b) => arr;
+  }
+
+  method ArrowContraariance<A, B, X>(arr: array<X>) returns (f: () -> int, g: array<X> -> int, h: (array<X>, array<X>) -> int) {
+    f := () => 3;
+    g := (a: object) => 4;
+    h := (a: array?<X>, b: object) => 5;
+  }
+}
+
+module ReferenceTypeParents {
+  class Vector<X> { }
+
+  method M<X>(arr: array<X>, v: Vector<X>) returns (repr: set<object>) {
+    repr := {v, arr};
+  }
+
+  method E<X>(arr: array<X>, r: set<object>) returns (repr: set<object>) {
+    repr := r + {arr};
+  }
+}
+
+module PartiallySolveBeforeFindingNames {
+  datatype Option<X> = None | Some(value: X)
+  method GetIt<X>(i: nat, arr: array<Option<X>>)
+    requires i < arr.Length && arr[i].Some?
+  {
+    var a := arr[i];
+    var b := a.value;
+  }
+}
+
+module Frames {
+  class C {
+    var x: int
+    var y: int
+  }
+
+  function A0(): set<C>
+  function A1(): iset<C>
+  function A2(): seq<C>
+  function A3(): multiset<C>
+
+  function F(o: object, s: set<C>, ss: iset<C>, sq: seq<C>, ms: multiset<C>): int
+    reads o
+    reads s
+    reads ss
+    reads sq
+    reads ms
+    reads s`x
+    reads ss`x
+    reads sq`x
+    reads ms`x
+    reads A0
+    reads A1
+    reads A2
+    reads A3
+    reads A0`x
+    reads A1`x
+    reads A2`x
+    reads A3`x
+
+  method M(o: object, s: set<C>, ss: iset<C>, sq: seq<C>, ms: multiset<C>)
+    modifies o
+    modifies s
+    modifies ss
+    modifies sq
+    modifies ms
+    modifies s`x
+    modifies ss`x
+    modifies sq`x
+    modifies ms`x
+  {
+    modify o;
+    modify s;
+    modify ss;
+    modify sq;
+    modify ms;
+    modify s`x;
+    modify ss`x;
+    modify sq`x;
+    modify ms`x;
+  }
+
+  method U(oo: set<object>, o: object, s: set<C>, ss: iset<C>, sq: seq<C>, ms: multiset<C>)
+    modifies oo
+    ensures unchanged(o)
+    ensures unchanged(s)
+    ensures unchanged(ss)
+    ensures unchanged(sq)
+    ensures unchanged(ms)
+    ensures unchanged(s`x)
+    ensures unchanged(ss`x)
+    ensures unchanged(sq`x)
+    ensures unchanged(ms`x)
+  {
+  }
+}
+
+module NeverNever {
+  type Never = x: int | false witness *
+
+  method Test() {
+    var n; // type of 'n' is inferred to be Never, but since 'n' is never used, the verifier has nothing to complain about
+    if false {
+      var u: Never;
+      n := u;
+    }
+  }
+}
+
+module GhostTupleTests {
+  method GhostTupleTest0(ghostSingleton: (ghost bv7))
+    requires ghostSingleton == (ghost 12)
+  {
+    match ghostSingleton
+    case (y) =>
+      assert y == 12;
+  }
+
+  method GhostTupleTest1(ghostSingleton: (ghost bv7))
+    requires ghostSingleton == (ghost 12)
+  {
+    match ghostSingleton
+    case y =>
+      assert y == (ghost 12);
+  }
+}
+
+module MatchLiteralConsts {
+  datatype Cell<T> = Cell(value: T)
+
+  const X := 1
+
+  method q() {
+    var c; // type inferred to be int
+    match c
+    case X => // the literal 1
+      assert c == 1;
+    case Xyz => // a bound variable
+  }
+
+  datatype YT = Y
+  const Y := 2
+
+  method r() {
+    var c: Cell; // type inferred to be Cell<int>
+    match c
+    case Cell(Y) => // the literal 2
+      assert c == Cell(2);
+    case Cell(_) =>
+  }
+
+  method s() {
+    var c: Cell; // type inferred to be Cell<real>
+    match c
+    case Cell(Y: real) => // bound variable
+    case Cell(_) => // warning: redundant
+  }
+}
+
+module TupleTests {
+  method Test(a: (int, ghost real), b: (), c: (ghost bool)) {
+    match a {
+      case (x, y) =>
+        var z0 := x;
+        var z1 := y;
+        print z0, "\n";
+        ghost var y1 := z1;
+    }
+
+    match b {
+      case () =>
+        var u := b;
+        print u, "\n";
+    }
+
+    match c {
+      case _ => print c, "\n";
+    }
+    match c {
+      case (x) => ghost var y := x;
+    }
+  }
+}
+
+module LiteralsNowSupportedInTypeInference {
+  // The following test case works with the new type inference, but did not with the old one.
+
+  method LiteralTest() {
+    var c; // inferred to be bool
+    match c
+    case false =>
+    case true =>
+  }
+}
+
+module OrderingAmongBaseTypes {
+  const int32_MIN: int := -0x8000_0000
+  const int32_MAX: int := 0x7fff_ffff
+  newtype int32 = x | int32_MIN <= x <= int32_MAX
+
+  // With the previous type inference, the following line had given an error that int is not assignable to nat31
+  const nat31_MIN: int32 := 0
+  // With the previous type inference, the following line had complained that type conversions were not supported for int32
+  const nat31_MAX: int32 := int32_MAX as int32
+  type nat31 = x: int32 | nat31_MIN <= x <= nat31_MAX
+
+  method Works() {
+    var x: int32 := 0;
+  }
+
+  method PreviouslyDidNotWork() {
+    // With the previous type inference, the following line had given an error that int is not assignable to nat31
+    var x: nat31 := 0;
+  }
+
+  method Workaround() {
+    var x: nat31 := 0 as int32;
+  }
+}
+
+module OrderingIssues {
+  // The following used to not work:
+  module OrderingIssue_PreviouslyBroken {
+    newtype N = x: MM | 0 <= x < 80
+    newtype MM = x | 0 <= x < 100
+  }
+
+  // whereas the following did work:
+  module OrderingIssue_Fine {
+    newtype MM = x | 0 <= x < 100
+    newtype N = x: MM | 0 <= x < 80
+  }
+}
+
+module TypeInferenceImprovements {
+  type seq32<X> = s: seq<X> | |s| < 0x8000_0000
+  function SeqSize<X>(s: seq32<X>): nat32 {
+    |s|
+  }
+  type nat32 = x: int | 0 <= x < 0x8000_0000
+
+  type Context
+  type Principal
+  datatype Option<X> = None | Some(val: X)
+
+  function PrincipalFromContext(c: Context): Option<Principal>
+
+  function PrincipalsFromContexts(ctxs: seq32<Context>): (res: Option<seq32<Principal>>)
+    ensures res.Some? ==> |ctxs| == |res.val|
+    ensures res.Some? ==> forall i :: 0 <= i < |ctxs| ==> PrincipalFromContext(ctxs[i]).Some?
+    ensures res.Some? ==> forall i:: 0 <= i < |ctxs| ==> res.val[i] == PrincipalFromContext(ctxs[i]).val
+    ensures res.None? ==> exists i :: 0 <= i < |ctxs| && PrincipalFromContext(ctxs[i]).None?
+  {
+    // The Some([]) in the following line used to require an explicit type for the [],
+    // which could have to be given by a let expression.
+    if |ctxs| == 0 then Some([]) else match PrincipalFromContext(ctxs[0]) {
+      case None => None
+      case Some(principal) =>
+        match PrincipalsFromContexts(ctxs[1..]) {
+          case None => None
+          case Some(principals) =>
+            // The following line
+            Some([principal] + principals)
+            // used to require an explicit type, as in:
+            //    var principals1: seq32<Principal>/ := [principal] + principals;
+            //    Some(principals1)
+        }
+    }
+  } by method {
+    var principals: seq32<Principal> := [];
+    for i := 0 to SeqSize(ctxs)
+      invariant SeqSize(principals) == i
+      invariant forall j :: 0 <= j < i ==> PrincipalFromContext(ctxs[j]).Some?
+      invariant forall j :: 0 <= j < i ==> principals[j] == PrincipalFromContext(ctxs[j]).val
+    {
+      var principal := PrincipalFromContext(ctxs[i]);
+      if principal.None? {
+        return None;
+      }
+      principals := principals + [principal.val];
+    }
+    assert principals == PrincipalsFromContexts(ctxs).val;
+    return Some(principals);
+  }
+}
+    
+module StaticReceivers {
+  ghost predicate Caller0(s: seq<int>, list: LinkedList<int>)
+  {
+    s == list.StaticFunction(s) // uses "list" as an object to discard
+  }
+
+  ghost predicate Caller1(s: seq<int>)
+  {
+    s == LinkedList.StaticFunction(s) // type parameters inferred
+  }
+
+  ghost predicate Caller2(s: seq<int>)
+  {
+    s == LinkedList<int>.StaticFunction(s)
+  }
+
+  method Caller3()
+  {
+    var s: seq;
+    var b := s == LinkedList<int>.StaticFunction(s);
+  }
+
+  class LinkedList<UUU> {
+    static ghost function StaticFunction(sq: seq<UUU>): seq<UUU>
+  }
+}
+
+module UnaryMinus {
+  // This modules contains some regression tests to make sure that -nat is an int, not a nat.
+  // This remains a problem in the old resolver, and was once a problem (for different reasons)
+  // in the new resolver.
+
+  predicate Simple(n: nat, d: nat) {
+    var x := -d; // type of x should be inferred to be int, not nat
+    n == x
+  }
+
+  function Abs(n: int): nat {
+    if n < 0 then -n else n
+  }
+
+  predicate IsNat(n: int)
+    ensures IsNat(n) <==> 0 <= n
+  {
+    AtMost(n, 0)
+  }
+
+  predicate AtMost(n: int, d: nat)
+    requires d <= Abs(n)
+    ensures AtMost(n, d) <==> d <= n
+    decreases Abs(n) - d
+  {
+    n == d || (n + d != 0 && AtMost(n, d + 1))
+  }
+
+  predicate AtMost'(n: int, d: nat)
+    requires d <= Abs(n)
+    ensures AtMost'(n, d) <==> d <= n
+    decreases Abs(n) - d
+  {
+    if n == d then
+      true
+    else if n == -d then // the -d here should not pose any problems
+      false
+    else
+      AtMost'(n, d + 1)
+  }
+
+  lemma Same(n: int, d: nat)
+    requires d <= Abs(n)
+    ensures AtMost(n, d) == AtMost'(n, d)
+  {
+  }
+}
+
+module TypeInferenceViaInAndEquals {
+  trait GrandParent { }
+  trait Parent extends GrandParent { const data: int }
+  trait Child extends Parent { }
+
+  method Test(ghost s: set<Parent>, n: Parent) returns (ghost b: bool)
+  {
+    // type inference uses "in" to obtain type
+    b := forall y :: y in s ==> y.data == 19;
+    b := forall y :: y in s ==> P(y);
+
+    // type inference uses "==" to obtain type
+    b := forall y :: y == n ==> y.data == 19;
+    var z := MagicAssign();
+    b := z == n;
+  }
+
+  predicate P<X>(x: X)
+  method MagicAssign<X>() returns (r: X)
+}
+
+/****************************************************************************************
+ ******** TO DO *************************************************************************
+ ****************************************************************************************
+
+// ------------------
+// Clement suggested the following problem to try through the new type inference.
+// On 5 April 2022, he said:
+
+// Below is a test for your new type inference.  Let me know if you would like me to post it as an issue.
+// 
+// In brief, we have no way today to specify the return type of a lambda: it’s always inferred.  This results in issues like below:
+ 
+function method {:opaque} MaxF<T>(f: T ~> int, ts: seq<T>, default: int) : (m: int)
+  reads f.reads
+  requires forall t | t in ts :: f.requires(t)
+  requires forall t | t in ts :: default <= f(t)
+  ensures if ts == [] then m == default else exists t | t in ts :: f(t) == m
+  ensures forall t | t in ts :: f(t) <= m
+  ensures default <= m
+ 
+datatype Tree =
+  | Leaf(i: int)
+  | Branch(trs: seq<Tree>)
+{
+  function method Depth() : nat {
+    match this {
+      case Leaf(_) => 0
+      case Branch(trs) =>
+        // var fn : Tree --> nat := (t: Tree) requires t in trs => t.Depth();
+        1 + MaxF((t: Tree) requires t in trs => t.Depth(), trs, 0)
+    }
+  }
+}
+ 
+// Dafny rejects the call to MaxF, claiming that forall t | t in ts :: default <= f(t) might not hold.  But default is 0 and f(t)
+// has type nat, so it should hold — and in fact just uncommenting the definition of fn above solves the issue… even if fn isn’t used.
+ 
+****************************************************************************************/
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefresh.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefresh.dfy.expect
new file mode 100644
index 00000000000..a09670b9feb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefresh.dfy.expect
@@ -0,0 +1,14 @@
+TypeInferenceRefresh.dfy(445,11): Warning: the modify statement with a block statement is deprecated
+TypeInferenceRefresh.dfy(807,4): Warning: this branch is redundant
+TypeInferenceRefresh.dfy(145,30): Error: element might not be in domain
+TypeInferenceRefresh.dfy(216,26): Error: result of operation might violate newtype constraint for 'int8'
+TypeInferenceRefresh.dfy(102,31): Error: value does not satisfy the subset constraints of 'SubsetType'
+TypeInferenceRefresh.dfy(107,31): Error: value does not satisfy the subset constraints of 'SubsetType'
+TypeInferenceRefresh.dfy(630,40): Error: value does not satisfy the subset constraints of 'nat'
+TypeInferenceRefresh.dfy(630,43): Error: value does not satisfy the subset constraints of 'nat'
+TypeInferenceRefresh.dfy(630,47): Error: value does not satisfy the subset constraints of 'nat'
+TypeInferenceRefresh.dfy(633,18): Error: value does not satisfy the subset constraints of 'nat'
+TypeInferenceRefresh.dfy(633,21): Error: value does not satisfy the subset constraints of 'nat'
+TypeInferenceRefresh.dfy(633,24): Error: value does not satisfy the subset constraints of 'nat'
+
+Dafny program verifier finished with 84 verified, 10 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefreshErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefreshErrors.dfy
new file mode 100644
index 00000000000..24414c7f3f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefreshErrors.dfy
@@ -0,0 +1,281 @@
+// RUN: %exits-with 2 %verify --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Frames {
+  class C {
+    var x: int
+    var y: int
+  }
+
+  // The following was accepted by the old type checking, but it caused a crash in the
+  // translator. Now, we disallow it.
+  function ToC(): C
+  function RegressionTest(): int
+    reads ToC // error: type not allowed: () -> C
+
+  function ToSetReal(): set<real>
+  function ToMap(): map<object, object>
+  function F(r: real, s: set<real>): int
+    reads r // error: not a reference type
+    reads s // error: not a collection of reference type
+    reads ToSetReal // error: not a function to a collection of reference type
+    reads ToMap // error: not a function to a collection of reference type
+}
+
+module As {
+  class C { }
+  class D { }
+  method M(c: C, d: D, obj: object) {
+    var cc: C;
+    var dd: D;
+    cc := obj as C;
+    dd := obj as D;
+    cc := d as C; // error: incompatible types
+    dd := c as D; // error: incompatible types
+  }
+}
+
+module Underspecification0 {
+  method P() {
+    var u;
+    var w := !u; // fine: both u and w are inferred to have type bool (on account of advice)
+  }
+}
+
+module Underspecification1 {
+  class E<T> { }
+
+  method M(obj: object) {
+    var ee := obj as E; // error: type parameter of E is underspecified
+    assert (obj as E) == (obj as E); // error: type parameter of E is underspecified
+    assert (obj as E) == (obj as E<set>); // error: type parameter of set is underspecified
+    assert (obj as E) == (obj as E<set<int>>);
+  }
+
+
+}
+
+module Underspecification2 {
+  method Q(m: map, n: map) { // fine, because of type-parameter elision rules
+    var o := m + n;
+  }
+
+  method R() {
+    var m: map; // error: type is underspecified
+    var n: map; // error: type is underspecified
+    var o; // error: type is underspecified
+    o := m + n; // error: type of + is underspecified
+  }
+}
+
+module Underspecification3 {
+  type Synonym<X, Unused> = seq<X>
+
+  method Underspecification() {
+    // Regression: In the old type inference, the following line was not considered to be an error.
+    var d: Synonym := [100, 101]; // error: type underspecified
+  }
+}
+
+module Underspecification4 {
+  type SubsetType<X, Unused> = s: seq<X> | |s| == 0
+
+  method Underspecification() {
+    // Regression: In the old type inference, the following would pass and would then crash the verifier:
+    var e: SubsetType := [100, 101]; // error: type underspecified
+  }
+}
+
+module Underspecification5 {
+  type Synonym<A, Unused> = seq<A>
+
+  method SM(x: Synonym<int, real>, y: seq<bool>) {
+    var m: seq := y;
+
+    var a := x;
+
+    var b: Synonym := x; // error: type underspecified
+
+    var k: seq := x;
+    var y: Synonym := k; // error: type underspecified
+  }
+}
+
+module DatatypeConstructorTypeArguments {
+  datatype Color = White | Gray(int)
+  datatype ParametricColor<X, Y> = Blue | Red(X) | Green(Y)
+
+  method DatatypeValues() {
+    var w := White<int>; // error (no hint, since the datatype doesn't take any type parameters)
+    var b := Blue<int>; // error: with hint (since the datatype takes _some_ number of type parameters)
+    var g := Gray<int>(2);
+    var r := Red<int>(3);
+  }
+}
+
+module RegressionTest {
+  datatype R = R(int, int)
+
+  method M() {
+    var pair: (int, int) := (20, 30);
+    match pair
+    case R(x, y) => // error: tuple type does not have a constructor R
+      // the following line causes a crash in the old type system, after reporting an error about the previous line
+      print x + y;
+  }
+}
+
+module TooLargeCaseLiteral {
+  method Test(bv: bv7) {
+    match bv {
+      case 84848484848484848 => // error (BUG: this is missed by Dafny 4.0)
+      case _ =>
+    }
+  }
+}
+
+module CaseLiteralWrongType {
+  method Test(bv: bv7, r: real) {
+    match bv {
+      case 2.18 => // error: wrong type // BUG: crashes Dafny 4.0
+    }
+    match r {
+      case 13 => // error: wrong type
+      case -0 => // error: wrong type
+      case 0 => // error: wrong type
+    }
+    match r {
+      case 15 => // error: wrong type // BUG: causes malformed Boogie in Dafny 4.0
+      case -15 => // error: wrong type // BUG: causes malformed Boogie in Dafny 4.0
+      case -0 => // error: wrong type // BUG: causes malformed Boogie in Dafny 4.0
+      case false => // error: wrong type // BUG: causes malformed Boogie in Dafny 4.0
+    }
+  }
+}
+
+module NegativeCaseLabels {
+  newtype int8 = x | -128 <= x < 128
+
+  method NegativeLabels(a: int, nt: int8, bv: bv7, o: ORDINAL, r: real) {
+    match a {
+      case -3 =>
+      case -0 =>
+      case 0 => // redundant
+      case _ =>
+    }
+
+    match nt {
+      case -3 =>
+      case -0 =>
+      case 0 => // redundant
+      case _ =>
+    }
+    
+    match bv {
+      case -3 => // error
+      case -0 => // error
+      case 0 =>
+      case _ =>
+    }
+
+    match o {
+      case -3 => // error
+      case -0 => // error
+      case 0 =>
+      case _ =>
+    }
+
+    match r {
+      case 2.18 =>
+      case -2.18 =>
+      case -0.0 =>
+      case 0.0 => // redundant
+      case _ =>
+    }
+  }
+}
+
+module RedundanCaseLiterals {
+  newtype int8 = x | -128 <= x < 128
+
+  method Tests(a: int, nt: int8, r: real) {
+    match a {
+      case -3 =>
+      case -0 =>
+      case 0 => // redundant
+      case _ =>
+    }
+
+    match nt {
+      case -3 =>
+      case -0 =>
+      case 0 => // redundant
+      case _ =>
+    }
+    
+    match r {
+      case 2.18 =>
+      case -2.18 =>
+      case -0.0 =>
+      case 0.0 => // redundant
+      case _ =>
+    }
+  }
+}
+
+module NewMatchBehavior {
+  /* Here are tests for a match where a case is given by a const.
+   - For the first test, it used to be (that is, before the type system refresh) that this would spill out an unused
+     local variable with that name (FIVE).
+   - The second test checks what happens if the const case label is also given an explicit type.
+     Previously, this would interpret "FIVE" as a const, and it would check that the type was correct.
+     Now, the explicit type causes it to be interpreted as a bound variable.
+   - The third test used to breeze through Dafny without any complaints, even though the type "int" makes no sense here.
+     Now, a pattern with an explicit type is always interpreted as a bound variable.
+   */
+
+  const FIVE: int := 5
+
+  method Five(x: int) {
+    match x {
+      case FIVE => assert x == 5;
+      case _ =>
+    }
+    match x {
+      case FIVE: int =>
+        assert x == 5; // error: x may be anything, since FIVE is a bound variable
+      case _ =>
+    }
+  }
+
+  datatype Color = Blue | Green
+
+  method Colors(c: Color) {
+    match c
+    case Blue: int => // error: because of the ": int", Blue is interpreted as a bound variable, and its type doesn't match that of "c"
+  }
+}
+
+module MinusRegression {
+  method M(s: seq<int>, b: bool) {
+    var w := b - b; // error: - is not for bool
+    var u := s - s; // error: - is not for seq
+  }
+}
+
+module GreaterRegression {
+  method M(s: seq<int>, b: bool) {
+    var w := b > b; // error: > is not for bool
+    var u := s >= s; // error: >= is not for seq
+  }
+}
+
+module ArrayInitializer {
+  method TestFunctionInit(n: nat, init: nat -> nat) {
+    var a: array<bool> := new [n](init); // error: array<int> and array<bool> are incompatible
+  }
+
+  method TestDisplayInit(n: nat, init: nat -> nat) {
+    var a: array<bool> := new [n] [23]; // error: array<int> and array<bool> are incompatible
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefreshErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefreshErrors.dfy.expect
new file mode 100644
index 00000000000..98fc6b86e56
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceRefreshErrors.dfy.expect
@@ -0,0 +1,50 @@
+TypeInferenceRefreshErrors.dfy(14,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got () ~> C)
+TypeInferenceRefreshErrors.dfy(19,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got real)
+TypeInferenceRefreshErrors.dfy(20,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got set<real>)
+TypeInferenceRefreshErrors.dfy(21,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got () ~> set<real>)
+TypeInferenceRefreshErrors.dfy(22,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got () ~> map<object, object>)
+TypeInferenceRefreshErrors.dfy(33,12): Error: type cast to reference type 'C' must be from an expression of a compatible type (got 'D')
+TypeInferenceRefreshErrors.dfy(34,12): Error: type cast to reference type 'D' must be from an expression of a compatible type (got 'C')
+TypeInferenceRefreshErrors.dfy(49,8): Error: the type ('E?<?0>') of this variable is underspecified
+TypeInferenceRefreshErrors.dfy(50,16): Error: the type ('E<?2>') of this expression is underspecified
+TypeInferenceRefreshErrors.dfy(51,16): Error: the type ('E<set<?6>>') of this expression is underspecified
+TypeInferenceRefreshErrors.dfy(64,8): Error: the type ('map<?8, ?9>') of this local variable is underspecified
+TypeInferenceRefreshErrors.dfy(65,8): Error: the type ('map<?10, ?11>') of this local variable is underspecified
+TypeInferenceRefreshErrors.dfy(66,8): Error: the type ('map<?18, ?19>') of this local variable is underspecified
+TypeInferenceRefreshErrors.dfy(67,11): Error: the type ('map<?16, ?17>') of this expression is underspecified
+TypeInferenceRefreshErrors.dfy(76,8): Error: the type ('Synonym<int, ?5>') of this variable is underspecified
+TypeInferenceRefreshErrors.dfy(85,8): Error: the type ('SubsetType<int, ?5>') of this variable is underspecified
+TypeInferenceRefreshErrors.dfy(97,8): Error: the type ('Synonym<int, ?3>') of this variable is underspecified
+TypeInferenceRefreshErrors.dfy(100,8): Error: the type ('Synonym<int, ?6>') of this variable is underspecified
+TypeInferenceRefreshErrors.dfy(109,13): Error: datatype constructor does not take any type parameters ('White')
+TypeInferenceRefreshErrors.dfy(110,13): Error: datatype constructor does not take any type parameters ('Blue'); did you perhaps mean to write 'ParametricColor<int>.Blue'?
+TypeInferenceRefreshErrors.dfy(111,13): Error: datatype constructor does not take any type parameters ('Gray')
+TypeInferenceRefreshErrors.dfy(112,13): Error: datatype constructor does not take any type parameters ('Red'); did you perhaps mean to write 'ParametricColor<int>.Red'?
+TypeInferenceRefreshErrors.dfy(122,9): Error: type '(int, int)' does not contain a datatype constructor 'R'
+TypeInferenceRefreshErrors.dfy(124,12): Error: unresolved identifier: x
+TypeInferenceRefreshErrors.dfy(124,16): Error: unresolved identifier: y
+TypeInferenceRefreshErrors.dfy(124,14): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got ?7)
+TypeInferenceRefreshErrors.dfy(131,11): Error: literal (84848484848484848) is too large for the bitvector type bv7
+TypeInferenceRefreshErrors.dfy(140,11): Error: type of real literal is used as bv7
+TypeInferenceRefreshErrors.dfy(143,11): Error: integer literal used as if it had type real
+TypeInferenceRefreshErrors.dfy(144,11): Error: integer literal used as if it had type real
+TypeInferenceRefreshErrors.dfy(145,11): Error: integer literal used as if it had type real
+TypeInferenceRefreshErrors.dfy(148,11): Error: integer literal used as if it had type real
+TypeInferenceRefreshErrors.dfy(149,11): Error: integer literal used as if it had type real
+TypeInferenceRefreshErrors.dfy(150,11): Error: integer literal used as if it had type real
+TypeInferenceRefreshErrors.dfy(151,11): Error: boolean literal used as if it had type real
+TypeInferenceRefreshErrors.dfy(175,11): Error: unary minus (-3, type bv7) not allowed in case pattern
+TypeInferenceRefreshErrors.dfy(176,11): Error: unary minus (-0, type bv7) not allowed in case pattern
+TypeInferenceRefreshErrors.dfy(182,11): Error: unary minus (-3, type ORDINAL) not allowed in case pattern
+TypeInferenceRefreshErrors.dfy(183,11): Error: unary minus (-0, type ORDINAL) not allowed in case pattern
+TypeInferenceRefreshErrors.dfy(205,6): Warning: this branch is redundant
+TypeInferenceRefreshErrors.dfy(212,6): Warning: this branch is redundant
+TypeInferenceRefreshErrors.dfy(220,6): Warning: this branch is redundant
+TypeInferenceRefreshErrors.dfy(255,9): Error: pattern (of type int) cannot be used with source type Color
+TypeInferenceRefreshErrors.dfy(261,15): Error: type of - must be of a numeric type, a bitvector type, ORDINAL, char, or a set-like or map-like type (instead got bool)
+TypeInferenceRefreshErrors.dfy(262,15): Error: type of - must be of a numeric type, a bitvector type, ORDINAL, char, or a set-like or map-like type (instead got seq<int>)
+TypeInferenceRefreshErrors.dfy(269,15): Error: arguments to >= must be of a numeric type, bitvector type, ORDINAL, char, or a set-like type (instead got seq<int>)
+TypeInferenceRefreshErrors.dfy(268,15): Error: arguments to > must be of a numeric type, bitvector type, ORDINAL, char, or a set-like type (instead got bool)
+TypeInferenceRefreshErrors.dfy(275,34): Error: array-allocation initialization expression expected to have type 'nat ~> bool' (instead got 'nat -> nat') (covariant type parameter 'R' would require bool :> nat)
+TypeInferenceRefreshErrors.dfy(279,35): Error: integer literal used as if it had type bool
+46 resolution/type errors detected in TypeInferenceRefreshErrors.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceSubsetTypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceSubsetTypes.dfy
new file mode 100644
index 00000000000..84bc84f0660
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceSubsetTypes.dfy
@@ -0,0 +1,80 @@
+// RUN: %exits-with 4 %verify --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class Cell {
+  var data: int
+  constructor () {
+    data := 4;
+  }
+}
+
+method Main() {
+  FromNew();
+  FromLocalVariable();
+  var c := new Cell();
+  FromParameter(c);
+  WithNull();
+  FromMethodCall();
+}
+
+method FromNew() {
+  var s := 0;
+  var c := new Cell();
+  for i := 0 to 3
+  {
+    s := s + c.data;
+    c := new Cell();
+  }
+  print s, "\n";
+}
+
+method FromLocalVariable() {
+  var cc := new Cell();
+  var s := 0;
+  var c := cc;
+  for i := 0 to 3
+  {
+    s := s + c.data;
+    c := cc;
+  }
+  print s, "\n";
+}
+
+method FromParameter(cc: Cell) {
+  var s := 0;
+  var c := cc;
+  for i := 0 to 3
+  {
+    s := s + c.data;
+    c := cc;
+  }
+  print s, "\n";
+}
+
+method WithNull() {
+  var cc := new Cell();
+  var s := 0;
+  var c := cc;
+  for i := 0 to 3
+  {
+    s := s + c.data; // error: c may be null
+    c := null;
+    c := cc;
+  }
+  print s, "\n";
+}
+
+method FromMethodCall() {
+  var s := 0;
+  var c := GetCell();
+  for i := 0 to 3
+  {
+    s := s + c.data;
+    c := GetCell();
+  }
+  print s, "\n";
+}
+
+method GetCell() returns (c: Cell) {
+  c := new Cell();
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceSubsetTypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceSubsetTypes.dfy.expect
new file mode 100644
index 00000000000..61636a30d91
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInferenceSubsetTypes.dfy.expect
@@ -0,0 +1,3 @@
+TypeInferenceSubsetTypes.dfy(60,15): Error: target object might be null
+
+Dafny program verifier finished with 6 verified, 1 error
diff --git a/Test/dafny0/TypeInstantiations.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInstantiations.dfy
similarity index 88%
rename from Test/dafny0/TypeInstantiations.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInstantiations.dfy
index f69231fe085..54aad21f2cc 100644
--- a/Test/dafny0/TypeInstantiations.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInstantiations.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 abstract module M0 {
@@ -44,17 +44,17 @@ module M1 refines M0 {
   type K0<W> = List<W>  // error: change in (==)
   type K1<W>  // error: change in (==)
   type L<V(==)> = List<V>  // error: change in (==)
-  type M<U'> = int  // fine, because M<U'> does support equality
-  type N<U'> = List<U'>  // error: N<U'> does not support equality
-  type O<U'(==)> = List<U'>  // error: change in (==)
-  type P<U'> = List<U'>  // fine
+  type M<U> = int  // fine, because M<U> does support equality
+  type N<U> = List<U>  // error: N<U> does not support equality
+  type O<U(==)> = List<U>  // error: change in (==)
+  type P<U> = List<U>  // fine
   class R { }  // error: wrong number of type arguments
-  class S<T> { }  // error: not allowed to rename type parameter (U -> T)
+  class S<T> { }  // error: in refinements, not allowed to rename type parameter (U -> T)
   class T<T> { }  // error: wrong number of type arguments
 
   type TP0<E0>  // error: wrong number of type arguments
   type TP1  // error: wrong number of type arguments
-  type TP2<Y0, E1>  // error: not allowed to rename type parameter (Y1 -> E1)
+  type TP2<Y0, E1>  // error: in refinements, not allowed to rename type parameter (Y1 -> E1)
 }
 
 module ListLibrary {
diff --git a/Test/dafny0/TypeInstantiations.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInstantiations.dfy.expect
similarity index 78%
rename from Test/dafny0/TypeInstantiations.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInstantiations.dfy.expect
index ee469a723d7..81fd13519ad 100644
--- a/Test/dafny0/TypeInstantiations.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeInstantiations.dfy.expect
@@ -1,21 +1,21 @@
 TypeInstantiations.dfy(33,7): Error: to redeclare and refine declaration 'B' from module 'M0', you must use the refining (`...`) notation
-TypeInstantiations.dfy(36,13): Error: a type declaration that requires equality support cannot be replaced by a codatatype
 TypeInstantiations.dfy(40,7): Error: type 'G' is declared with a different number of type parameters (1 instead of 0) than the corresponding type in the module it refines
 TypeInstantiations.dfy(41,7): Error: type 'H' is declared with a different number of type parameters (1 instead of 2) than the corresponding type in the module it refines
 TypeInstantiations.dfy(42,7): Error: type 'J' is declared with a different number of type parameters (0 instead of 1) than the corresponding type in the module it refines
 TypeInstantiations.dfy(44,10): Error: type parameter 'W' is not allowed to change the requirement of supporting equality
 TypeInstantiations.dfy(45,10): Error: type parameter 'W' is not allowed to change the requirement of supporting equality
 TypeInstantiations.dfy(46,9): Error: type parameter 'V' is not allowed to change the requirement of supporting equality
-TypeInstantiations.dfy(49,9): Error: type parameter 'U'' is not allowed to change the requirement of supporting equality
+TypeInstantiations.dfy(49,9): Error: type parameter 'U' is not allowed to change the requirement of supporting equality
 TypeInstantiations.dfy(51,8): Error: class 'R' is declared with a different number of type parameters (0 instead of 1) than the corresponding class in the module it refines
 TypeInstantiations.dfy(52,10): Error: type parameters are not allowed to be renamed from the names given in the class in the module being refined (expected 'U', found 'T')
 TypeInstantiations.dfy(53,8): Error: class 'T' is declared with a different number of type parameters (1 instead of 0) than the corresponding class in the module it refines
 TypeInstantiations.dfy(55,7): Error: abstract type 'TP0' is declared with a different number of type parameters (1 instead of 0) than the corresponding abstract type in the module it refines
 TypeInstantiations.dfy(56,7): Error: abstract type 'TP1' is declared with a different number of type parameters (0 instead of 1) than the corresponding abstract type in the module it refines
 TypeInstantiations.dfy(57,15): Error: type parameters are not allowed to be renamed from the names given in the abstract type in the module being refined (expected 'Y1', found 'E1')
-TypeInstantiations.dfy(34,11): Error: type 'C', which does not support equality, is used to refine an abstract type with equality support
-TypeInstantiations.dfy(35,7): Error: type 'D', which does not support equality, is used to refine an abstract type with equality support
-TypeInstantiations.dfy(48,7): Error: type 'N', which does not support equality, is used to refine an abstract type with equality support
+TypeInstantiations.dfy(34,11): Error: to be a refinement of abstract type 'M0.C' declared with (==), datatype 'M1.C' must support equality
+TypeInstantiations.dfy(35,7): Error: to be a refinement of abstract type 'M0.D' declared with (==), type synonym 'M1.D' must support equality
+TypeInstantiations.dfy(36,13): Error: to be a refinement of abstract type 'M0.E' declared with (==), codatatype 'M1.E' must support equality
+TypeInstantiations.dfy(48,7): Error: to be a refinement of abstract type 'M0.N' declared with (==), type synonym 'M1.N' must support equality (perhaps try declaring type parameter 'U' on line 48 as 'U(==)', which says it can only be instantiated with a type that supports equality)
 TypeInstantiations.dfy(69,29): Error: RHS (of type List<int>) not assignable to LHS (of type MyList.List<real>) (non-variant type parameter would require real = int)
 TypeInstantiations.dfy(81,8): Error: the type of this variable is underspecified
 TypeInstantiations.dfy(82,8): Error: the type of this variable is underspecified
@@ -25,6 +25,6 @@ TypeInstantiations.dfy(109,8): Error: the type of this variable is underspecifie
 TypeInstantiations.dfy(127,27): Error: RHS (of type int) not assignable to LHS (of type C.Classic<real>)
 TypeInstantiations.dfy(137,8): Error: the type of this variable is underspecified
 TypeInstantiations.dfy(137,15): Error: type of type parameter could not be determined; please specify the type explicitly
-TypeInstantiations.dfy(137,23): Error: type parameter 'A' (inferred to be '?') in the function call to 'F' could not be determined
+TypeInstantiations.dfy(137,24): Error: type parameter 'A' (inferred to be '?') in the function call to 'F' could not be determined
 TypeInstantiations.dfy(137,24): Error: the type of this expression is underspecified
 29 resolution/type errors detected in TypeInstantiations.dfy
diff --git a/Test/dafny0/TypeMembers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeMembers.dfy
similarity index 98%
rename from Test/dafny0/TypeMembers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeMembers.dfy
index f2bea4039c9..720008278ef 100644
--- a/Test/dafny0/TypeMembers.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeMembers.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings --relax-definite-assignment
 
 method Main() {
   BasicTests();
diff --git a/Test/dafny0/TypeMembers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeMembers.dfy.expect
similarity index 100%
rename from Test/dafny0/TypeMembers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeMembers.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeMembers.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeMembers.dfy.rs.check
new file mode 100644
index 00000000000..2a0f83900f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeMembers.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: (0,-1): Error: Feature not supported for this compilation target: The /runAllTests option
\ No newline at end of file
diff --git a/Test/dafny0/TypeMembers.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeMembers.dfy.verifier.expect
similarity index 100%
rename from Test/dafny0/TypeMembers.dfy.verifier.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeMembers.dfy.verifier.expect
diff --git a/Test/dafny0/TypeParameters.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeParameters.dfy
similarity index 98%
rename from Test/dafny0/TypeParameters.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeParameters.dfy
index df0eb6d30df..2d2bce2f483 100644
--- a/Test/dafny0/TypeParameters.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeParameters.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class C<U(==)> {
@@ -252,7 +252,7 @@ ghost method ListLemma_T<T(!new)>(xs: List, ys: List)
 {
   assert Subset(xs, ys);
 }
-ghost method ammeLtsiL_T(xs: List, ys: List)
+ghost method ammeLtsiL_T<T(!new)>(xs: List, ys: List)
   requires Subset(xs, ys)
 {
   assert forall x :: InList(x, xs) ==> InList(x, ys);
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeParameters.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeParameters.dfy.expect
new file mode 100644
index 00000000000..2c19e375193
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeParameters.dfy.expect
@@ -0,0 +1,19 @@
+TypeParameters.dfy(44,4): Error: assertion might not hold
+TypeParameters.dfy(66,4): Error: assertion might not hold
+TypeParameters.dfy(153,15): Error: assertion might not hold
+TypeParameters.dfy(153,27): Related location: this proposition could not be proved
+TypeParameters.dfy(155,20): Error: assertion might not hold
+TypeParameters.dfy(155,32): Related location: this proposition could not be proved
+TypeParameters.dfy(157,18): Error: assertion might not hold
+TypeParameters.dfy(137,2): Related location: this proposition could not be proved
+TypeParameters.dfy(159,17): Error: assertion might not hold
+TypeParameters.dfy(144,13): Related location: this proposition could not be proved
+TypeParameters.dfy(144,14): Related location: this proposition could not be proved
+TypeParameters.dfy(161,17): Error: assertion might not hold
+TypeParameters.dfy(146,7): Related location: this proposition could not be proved
+TypeParameters.dfy(175,23): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+TypeParameters.dfy(175,37): Related location: this proposition could not be proved
+TypeParameters.dfy(376,20): Error: assertion might not hold
+
+Dafny program verifier finished with 30 verified, 9 errors
diff --git a/Test/dafny0/TypeSynonyms.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeSynonyms.dfy
similarity index 97%
rename from Test/dafny0/TypeSynonyms.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeSynonyms.dfy
index 33a191599cb..193fea55cde 100644
--- a/Test/dafny0/TypeSynonyms.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeSynonyms.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Basic {
diff --git a/Test/dafny0/TypeSynonyms.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeSynonyms.dfy.expect
similarity index 97%
rename from Test/dafny0/TypeSynonyms.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeSynonyms.dfy.expect
index 0a6cdc29da0..5d031774596 100644
--- a/Test/dafny0/TypeSynonyms.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeSynonyms.dfy.expect
@@ -1,4 +1,4 @@
-TypeSynonyms.dfy(78,11): Error: assertion could not be proved
+TypeSynonyms.dfy(78,4): Error: assertion might not hold
 TypeSynonyms.dfy(119,2): Error: out-parameter 'x', which is subject to definite-assignment rules, might be uninitialized at this return point
 TypeSynonyms.dfy(119,2): Error: out-parameter 'y', which is subject to definite-assignment rules, might be uninitialized at this return point
 TypeSynonyms.dfy(121,2): Error: out-parameter 'x', which is subject to definite-assignment rules, might be uninitialized at this return point
diff --git a/Test/dafny0/TypeTests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeTests.dfy
similarity index 76%
rename from Test/dafny0/TypeTests.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeTests.dfy
index 71d8089b457..617b0325d70 100644
--- a/Test/dafny0/TypeTests.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeTests.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Tests {
@@ -20,7 +20,7 @@ class C {
 
 datatype D = A
 
-datatype NeverendingList = Cons(int, NeverendingList)  // error: no grounding constructor
+
 
 datatype MutuallyRecursiveDataType<T> =
   FromANumber(int) |  // this is the base case
@@ -226,11 +226,11 @@ module ArrayTests {
 // ---------------------
 
 module OtherCycles0 {
-  datatype A = Ctor(A -> A)  // error: cannot be constructed
-  datatype B = Ctor(int -> B)  // error: cannot be constructed
-
-  datatype Cycle = Cycle(Cyc)  // error: cannot be constructed
-  type Cyc = c: Cycle | true
+  datatype A = Ctor(A -> A)  // error: cardinality error
+  datatype B = Ctor(int -> B)  // warning: empty datatype
+} module OtherCycles0' {
+  datatype Cycle = Cycle(Cyc) // (no instance possible, but this issue is masked by the cyclic-dependency error)
+  type Cyc = c: Cycle | true // error: dependency: Cyc -> Cycle -> Cyc
 }
 
 module OtherCycles1 {
@@ -246,7 +246,47 @@ module OtherCycles1 {
 }
 
 module OtherCycles2 {
-  datatype CycleW = CycleW(CycW)
+  // the next line uses a general arrow
+  datatype CycleW = CycleW(int ~> CycW)
   type CycW = c: CycleW | true witness W()  // error: dependency cycle W -> CycW -> CycleW
   function W(): CycleW
 }
+
+module OtherCycles3 {
+  // the next line uses a partial arrow
+  datatype CycleW = CycleW(int -> CycW) // (no instance possible, but this issue is masked by the cyclic-dependency error)
+  type CycW = c: CycleW | true witness W() // error: dependency cycle W -> CycW -> CycleW
+  function W(): CycleW
+}
+
+module OtherCycles4 {
+  // the next line uses a total arrow
+  datatype CycleW = CycleW(int -> CycW) // (no instance possible, but this issue is masked by the cyclic-dependency error)
+  type CycW = c: CycleW | true witness W() // error: dependency cycle: CycW -> W -> CycleW -> CycW
+  function W(): CycleW
+}
+
+module OtherCycles5 {
+  // the next line uses a subset type over a total arrow
+  type MyTotalArrow<X, Y> = f: X -> Y | true
+  datatype CycleW = CycleW(MyTotalArrow<int, CycW>)  // (no instance possible, but this issue is masked by the cyclic-dependency error)
+  type CycW = c: CycleW | true witness W() // error: dependency cycle: CycW -> W -> CycleW -> CycW
+  function W(): CycleW
+}
+
+module NE {
+  datatype NeverendingList = Cons(int, NeverendingList)  // warning: empty type
+  datatype Growing<X> = Make(Growing<array<X>>) // warning: empty type
+  datatype MaybeGrowing<X> = Make(array<MaybeGrowing<X>>) // okay, since it does not violate the cycle rule
+}
+
+module EmptinessAndCardinality {
+  datatype A = Ctor(A -> A) // error: cardinality
+  datatype B = Ctor(int -> B) // (empty, but not "obviously empty")
+  datatype C = More(C) // warning: empty
+  datatype D = More(int --> D)
+  datatype E = More(E --> int) // error: cardinality
+
+  datatype List<X> = Nil | Cons(X, List<X>)
+  datatype Expr = Node(List<Expr>)
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeTests.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeTests.dfy.expect
new file mode 100644
index 00000000000..169f5d7882f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/TypeTests.dfy.expect
@@ -0,0 +1,48 @@
+TypeTests.dfy(45,6): Error: Duplicate local-variable name: z
+TypeTests.dfy(47,6): Error: Duplicate local-variable name: x
+TypeTests.dfy(50,8): Error: Duplicate local-variable name: x
+TypeTests.dfy(53,6): Error: Duplicate local-variable name: y
+TypeTests.dfy(59,11): Error: unresolved identifier: x
+TypeTests.dfy(61,28): Error: unresolved identifier: z
+TypeTests.dfy(62,29): Error: unresolved identifier: w1
+TypeTests.dfy(62,47): Error: unresolved identifier: w0
+TypeTests.dfy(65,28): Error: unresolved identifier: e
+TypeTests.dfy(80,17): Error: object initialization must denote an initializing method or constructor (F)
+TypeTests.dfy(81,17): Error: a method called as an initialization method must not have any result arguments
+TypeTests.dfy(90,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
+TypeTests.dfy(91,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
+TypeTests.dfy(92,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
+TypeTests.dfy(94,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
+TypeTests.dfy(95,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
+TypeTests.dfy(96,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
+TypeTests.dfy(9,17): Error: incorrect argument type at index 0 for function parameter 'c' (expected C, found D)
+TypeTests.dfy(9,20): Error: incorrect argument type at index 1 for function parameter 'd' (expected D, found C)
+TypeTests.dfy(10,15): Error: incorrect argument type at index 0 for function parameter 'c' (expected C, found int)
+TypeTests.dfy(10,18): Error: incorrect argument type at index 1 for function parameter 'd' (expected D, found int)
+TypeTests.dfy(16,17): Error: incorrect argument type for method in-parameter 'x' (expected int, found bool)
+TypeTests.dfy(16,16): Error: incorrect return type at index 1 for method out-parameter 'c' (expected C, got int)
+TypeTests.dfy(17,12): Error: incorrect return type at index 1 for method out-parameter 'c' (expected C, got int)
+TypeTests.dfy(169,7): Error: non-ghost variable cannot be assigned a value that depends on a ghost
+TypeTests.dfy(179,6): Error: cannot assign to non-ghost variable in a ghost context
+TypeTests.dfy(180,9): Error: cannot assign to non-ghost variable in a ghost context
+TypeTests.dfy(198,15): Error: incorrect argument type for datatype constructor parameter (expected int -> Dt<int>, found int -> int) (covariant type parameter 1 would require int <: Dt<int>)
+TypeTests.dfy(204,15): Error: incorrect argument type for datatype constructor parameter (expected ? -> Dt<?>, found Dt<?> -> Dt<?>) (contravariance for type parameter at index 0 expects ? <: Dt<?>)
+TypeTests.dfy(211,11): Error: incorrect argument type for function parameter 'x' (expected ?, found set<?>)
+TypeTests.dfy(222,9): Error: assignment to array element is not allowed in this context, because this is a ghost method
+TypeTests.dfy(229,20): Error: using the type being defined ('A') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
+TypeTests.dfy(233,7): Error: recursive constraint dependency involving a subset type: Cyc -> Cycle -> Cyc
+TypeTests.dfy(237,20): Error: using the type being defined ('A') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
+TypeTests.dfy(238,20): Error: using the type being defined ('B') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
+TypeTests.dfy(243,20): Error: using the type being defined ('E') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
+TypeTests.dfy(244,20): Error: using the type being defined ('F') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
+TypeTests.dfy(245,20): Error: using the type being defined ('G') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
+TypeTests.dfy(251,7): Error: recursive constraint dependency involving a subset type: CycW -> W -> CycleW -> CycW
+TypeTests.dfy(258,7): Error: recursive constraint dependency involving a subset type: CycW -> W -> CycleW -> CycW
+TypeTests.dfy(265,7): Error: recursive constraint dependency involving a subset type: CycW -> W -> CycleW -> CycW
+TypeTests.dfy(273,7): Error: recursive constraint dependency involving a subset type: CycW -> W -> CycleW -> CycW
+TypeTests.dfy(278,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'NeverendingList' can be constructed
+TypeTests.dfy(279,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'Growing' can be constructed
+TypeTests.dfy(286,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'C' can be constructed
+TypeTests.dfy(284,20): Error: using the type being defined ('A') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
+TypeTests.dfy(288,20): Error: using the type being defined ('E') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
+44 resolution/type errors detected in TypeTests.dfy
diff --git a/Test/dafny0/Unchanged.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Unchanged.dfy
similarity index 93%
rename from Test/dafny0/Unchanged.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Unchanged.dfy
index c656b15466c..e618fa1aec7 100644
--- a/Test/dafny0/Unchanged.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Unchanged.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var f: int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Unchanged.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Unchanged.dfy.expect
new file mode 100644
index 00000000000..0aca206afe6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Unchanged.dfy.expect
@@ -0,0 +1,10 @@
+Unchanged.dfy(33,18): Error: assertion might not hold
+Unchanged.dfy(34,18): Error: assertion might not hold
+Unchanged.dfy(35,18): Error: assertion might not hold
+Unchanged.dfy(38,6): Error: assertion might not hold
+Unchanged.dfy(46,35): Error: object could not be proved to be allocated in the old-state of the 'unchanged' predicate
+Unchanged.dfy(47,35): Error: object could not be proved to be allocated in the old-state of the 'unchanged' predicate
+Unchanged.dfy(48,41): Error: object could not be proved to be allocated in the old-state of the 'unchanged' predicate
+Unchanged.dfy(49,35): Error: object could not be proved to be allocated in the old-state of the 'unchanged' predicate
+
+Dafny program verifier finished with 1 verified, 8 errors
diff --git a/Test/dafny0/UnfoldingPerformance.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnfoldingPerformance.dfy
similarity index 90%
rename from Test/dafny0/UnfoldingPerformance.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnfoldingPerformance.dfy
index 878a4499891..9d69129284d 100644
--- a/Test/dafny0/UnfoldingPerformance.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnfoldingPerformance.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var x: nat
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnfoldingPerformance.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnfoldingPerformance.dfy.expect
new file mode 100644
index 00000000000..f143707de05
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnfoldingPerformance.dfy.expect
@@ -0,0 +1,6 @@
+UnfoldingPerformance.dfy(23,2): Error: assertion might not hold
+UnfoldingPerformance.dfy(30,2): Error: assertion might not hold
+UnfoldingPerformance.dfy(51,2): Error: assertion might not hold
+UnfoldingPerformance.dfy(61,2): Error: assertion might not hold
+
+Dafny program verifier finished with 4 verified, 4 errors
diff --git a/Test/dafny0/UnicodeCharLiteralParseErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnicodeCharLiteralParseErrors.dfy
similarity index 85%
rename from Test/dafny0/UnicodeCharLiteralParseErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnicodeCharLiteralParseErrors.dfy
index ce1b0282420..f370098eb8d 100644
--- a/Test/dafny0/UnicodeCharLiteralParseErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnicodeCharLiteralParseErrors.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /unicodeChar:1 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module UnicodeCharSupport {
   const goodUnicodeEscape := '\U{10FFFF}'
diff --git a/Test/dafny0/UnicodeCharLiteralParseErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnicodeCharLiteralParseErrors.dfy.expect
similarity index 100%
rename from Test/dafny0/UnicodeCharLiteralParseErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UnicodeCharLiteralParseErrors.dfy.expect
diff --git a/Test/dafny0/UserSpecifiedTypeParameters.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UserSpecifiedTypeParameters.dfy
similarity index 96%
rename from Test/dafny0/UserSpecifiedTypeParameters.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UserSpecifiedTypeParameters.dfy
index e08795389ef..51f2e101cb1 100644
--- a/Test/dafny0/UserSpecifiedTypeParameters.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UserSpecifiedTypeParameters.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module M0 {
diff --git a/Test/dafny0/UserSpecifiedTypeParameters.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UserSpecifiedTypeParameters.dfy.expect
similarity index 85%
rename from Test/dafny0/UserSpecifiedTypeParameters.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UserSpecifiedTypeParameters.dfy.expect
index 4427715483f..768bcfb0a5f 100644
--- a/Test/dafny0/UserSpecifiedTypeParameters.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/UserSpecifiedTypeParameters.dfy.expect
@@ -1,13 +1,13 @@
 UserSpecifiedTypeParameters.dfy(26,10): Error: the type of this variable is underspecified
 UserSpecifiedTypeParameters.dfy(26,16): Error: type of type parameter could not be determined; please specify the type explicitly
 UserSpecifiedTypeParameters.dfy(26,16): Error: type of type parameter could not be determined; please specify the type explicitly
-UserSpecifiedTypeParameters.dfy(26,24): Error: type parameter 'T' (inferred to be '?') in the function call to 'H' could not be determined
-UserSpecifiedTypeParameters.dfy(26,24): Error: type parameter 'U' (inferred to be '?') in the function call to 'H' could not be determined
+UserSpecifiedTypeParameters.dfy(26,25): Error: type parameter 'T' (inferred to be '?') in the function call to 'H' could not be determined
+UserSpecifiedTypeParameters.dfy(26,25): Error: type parameter 'U' (inferred to be '?') in the function call to 'H' could not be determined
 UserSpecifiedTypeParameters.dfy(46,16): Error: wrong number of arguments (got 1, but function 'F' expects 2: (x: bool, y: bool))
 UserSpecifiedTypeParameters.dfy(46,22): Error: Type or type parameter is not declared in this scope: b (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
 UserSpecifiedTypeParameters.dfy(46,26): Error: Type or type parameter is not declared in this scope: c (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
 UserSpecifiedTypeParameters.dfy(46,18): Error: variable 'a' does not take any type parameters
 UserSpecifiedTypeParameters.dfy(46,30): Error: non-function expression (of type int) is called with parameters
-UserSpecifiedTypeParameters.dfy(77,15): Error: incorrect argument type for lemma in-parameter 'y' (expected A, found int)
-UserSpecifiedTypeParameters.dfy(89,14): Error: incorrect argument type for function parameter 'y' (expected A, found int)
+UserSpecifiedTypeParameters.dfy(77,16): Error: incorrect argument type for lemma in-parameter 'y' (expected A, found int)
+UserSpecifiedTypeParameters.dfy(89,15): Error: incorrect argument type for function parameter 'y' (expected A, found int)
 12 resolution/type errors detected in UserSpecifiedTypeParameters.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Variance.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Variance.dfy
new file mode 100644
index 00000000000..9f2cddd8442
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Variance.dfy
@@ -0,0 +1,159 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --print:-
+
+
+module VarianceChecks {
+  datatype MyData<+A, *B, !C, D, -E> =
+    | MakeA(A)
+    | MakeB(B)
+    | MakeC(C)
+    | MakeD(D)
+    | MakeE(E)  // error: E is used in positive position
+
+  type Syn<X, -Y, Z> = MyData<X, Y, Z, Z, Z>  // error (x3)
+  type Cyn<M, -N> = MyData<int -> M, M, N -> int, N, N -> int>  // error (x4)
+
+  class MyClass<!Inv> {
+  }
+
+  datatype CheckIt<+A, *B, !C, D, -E> =
+    | Cons(A, MyData<int,int,int,int,int>)
+    | Fn(int ~> A)
+    | Nf(A ~> int)  // error: A is used in negative position
+    | Double((A ~> int) ~> int)  // error: A is not in a strict positive position
+    | ToSet(real -> set<A>)
+    | FromSet(set<A> ~> real)  // error: A is used in negative position
+    | Classy(MyClass<A>)  // error: + passed in as =
+    | MakeA(MyData<A,int,int,int,int>)
+    | MakeB(MyData<int,A,int,int,int>)  // error: + passed in as *
+    | MakeC(MyData<int,int,A,int,int>)  // error: + passed in as !
+    | MakeD(MyData<int,int,int,A,int>)  // error: + passed in as (default)
+    | MakeE(MyData<int,int,int,int,A>)  // error: + passed in as -
+    | CreateA(MyData<B,int,int,int,int>)
+    | CreateB(MyData<int,B,int,int,int>)
+    | CreateC(MyData<int,int,B,int,int>)  // error: * passed in as !
+    | CreateD(MyData<int,int,int,B,int>)  // error: * passed in as (default)
+    | CreateE(MyData<int,int,int,int,B>)  // error: * passed in as -
+    | DoA(MyData<C,int,int,int,int>)
+    | DoB(MyData<int,C,int,int,int>)
+    | DoC(MyData<int,int,C,int,int>)
+    | DoD(MyData<int,int,int,C,int>)
+    | DoE(MyData<int,int,int,int,C>)
+    | FabricateA(MyData<D,int,int,int,int>)
+    | FabricateB(MyData<int,D,int,int,int>)  // error: strict passed to context without strict restrictions
+    | FabricateC(MyData<int,int,D,int,int>)  // error: strict passed to context without strict restrictions
+    | FabricateD(MyData<int,int,int,D,int>)
+    | FabricateE(MyData<int,int,int,int,D>)  // error: strict passed to negative context
+    | BorrowA(MyData<E,int,int,int,int>)  // error: - passed in as +
+    | BorrowB(MyData<int,E,int,int,int>)  // error: - passed in as *
+    | BorrowC(MyData<int,int,E,int,int>)  // error: - passed in as !
+    | BorrowD(MyData<int,int,int,E,int>)  // error: - passed in as (default)
+    | BorrowE(MyData<int,int,int,int,E>)
+    | ISetA(iset<A>)  // error: - strict passed to context without strict restrictions
+    | ISetB(iset<B>)
+    | ISetC(iset<C>)
+    | ISetD(iset<D>)  // error: - strict passed to negative context
+    | ISetE(iset<E>)  // error: - contravariant passed to covariant context
+    | SetA(set<A>)
+    | SetB(set<B>)
+    | SetC(set<C>)
+    | SetD(set<D>)
+    | SetE(set<E>)  // error: - contravariant passed to covariant context
+    | IMapAB(imap<A, B>)  // error: - strict passed to context without strict restrictions
+    | IMapAE(imap<B, E>)  // error: - contravariant passed to covariant context
+    | IMapBD(imap<B, D>)
+    | IMapDB(imap<D, B>)  // error: - strict passed to context without strict restrictions
+
+  type {:extern} abs<+A, *B, !C, D, -E>
+
+  datatype CheckRec =
+    | IMapD(imap<CheckRec, int>)  // error: - recursive mentions must be used in a strict (and covariant) context
+    | IMapR(imap<int, CheckRec>)
+    | ISet(iset<CheckRec>)  // error: - recursive mentions must be used in a strict (and covariant) context
+    | Set(set<CheckRec>)
+    | CheckA(abs<CheckRec, int, int, int, int>)
+    | CheckB(abs<int, CheckRec, int, int, int>)  // error: - recursive mentions must be used in a strict (and covariant) context
+    | CheckC(abs<int, int, CheckRec, int, int>)  // error: - recursive mentions must be used in a strict (and covariant) context
+    | CheckD(abs<int, int, int, CheckRec, int>)
+    | CheckE(abs<int, int, int, int, CheckRec>)  // error: - recursive mentions must be used in a strict (and covariant) context
+
+  datatype CheckRec2 =
+    | ArrowD(CheckRec2 -> int)  // error: - recursive mentions must be used in a strict (and covariant) context
+    | ArrowR(int -> CheckRec2)
+
+  class VaryingClass<A,B,C,+HotDog,D,-Whale>  // error (x2): all must be non-variant
+  {
+    var f: HotDog -> Whale  // not a problem here
+    method M() {
+      var g: HotDog -> Whale;  // not a problem here
+    }
+  }
+
+  iterator VaryingIter<A,B,C,+HotDog,D,-Whale>()  // error (x2): all must be non-variant
+  {
+  }
+
+  datatype Dt = Ctor(Dt -> int)  // error: this would give rise to a logical inconsistency
+
+  datatype U0<!A> = U0(A -> bool)
+  type U1<!A> = U0<A>
+  datatype U2 = MakeU2(U1<U2>)  // error: this would give rise to a logical inconsistency
+
+  datatype R0 = Ctor(R2 ~> bool)  // error: this would give rise to a logical inconsistency
+  type R1<X> = X
+  datatype R2 = Ctor(R1<R0>)
+}
+
+module Cycles {
+  type W0 = W1
+  datatype W1 = Ctor(W0 --> bool) // error: this increases cardinality
+
+  datatype Z0 = Ctor(Z2 ~> bool) // error: this increases cardinality
+  type Z1 = Z0
+  datatype Z2 = Ctor(Z1)
+}
+
+module Depen {
+  type V0 = x: V2 | true  // error: recursive definition in constraint of subset type
+  type V1 = V0
+  datatype V2 = Ctor(V1 --> bool)
+}
+
+module DependencyChecks {
+  type A = x: B | true  // error: bad dependency cycle
+  type B = y: int | F(y)
+  ghost predicate F(y: int) {
+    var i: A := 5;
+    i < 32
+  }
+
+  datatype Q = Q(x: R)
+  type R = x: S | true  // error: bad dependency cycle
+  type S = y: int | G(y)
+  ghost predicate G(y: int) {
+    var q: Q :| true;
+    q.x < 32
+  }
+}
+
+module Cycle0 {
+  type B = x: B | true  // error: cycle
+}
+
+module Cycle1 {
+  type A = x: int | var a: A :| true; P(x)  // error: cycle
+  ghost predicate P(x: int)
+}
+
+module Cycle2 {
+  type C = x: int | f(x) == f(x)  // error: cycle
+  ghost function f(x: int): C
+}
+
+module MoreDependencyCycles0 {
+  type MeAndMyself = x: int | var m: MeAndMyself := 5; m < 10  // error: cyclic dependency in constraint
+}
+
+module MoreDependencyCycles1 {
+  type MeAndMyself'' = MeAndMyself'
+  type MeAndMyself' = x: int | var m: MeAndMyself'' := 5; m < 10  // error: cyclic dependency in constraint
+}
diff --git a/Test/dafny0/Variance.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Variance.dfy.expect
similarity index 100%
rename from Test/dafny0/Variance.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Variance.dfy.expect
diff --git a/Test/dafny0/Wellfounded.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy
similarity index 93%
rename from Test/dafny0/Wellfounded.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy
index 7ec2be06b38..19e355241f0 100644
--- a/Test/dafny0/Wellfounded.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --allow-warnings
 
 method Main() {
   var d := Int(10);
diff --git a/Test/dafny0/Wellfounded.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy.expect
similarity index 100%
rename from Test/dafny0/Wellfounded.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy.rs.check
new file mode 100644
index 00000000000..158d9484360
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>QuantifierExpr</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy.verifier.expect
new file mode 100644
index 00000000000..06c8e5dabaf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/Wellfounded.dfy.verifier.expect
@@ -0,0 +1,2 @@
+Wellfounded.dfy(48,14): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Wellfounded.dfy(76,5): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
diff --git a/Test/dafny0/columns.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/columns.dfy
similarity index 80%
rename from Test/dafny0/columns.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/columns.dfy
index b1c625bd8af..8382b255b70 100644
--- a/Test/dafny0/columns.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/columns.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Dafny counts columns from 0, but Boogie from one, so for a while there were small bugs with that.
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/columns.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/columns.dfy.expect
new file mode 100644
index 00000000000..d6991683685
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/columns.dfy.expect
@@ -0,0 +1,6 @@
+columns.dfy(8,0): Warning: module-level methods are always non-instance, so the 'static' keyword is not allowed here
+columns.dfy(9,2): Error: assertion might not hold
+columns.dfy(10,2): Error: assertion might not hold
+columns.dfy(11,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/dafny0/formatting.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting.dfy
similarity index 100%
rename from Test/dafny0/formatting.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting.dfy
diff --git a/Test/dafny0/formatting1-2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting1-2.dfy
similarity index 100%
rename from Test/dafny0/formatting1-2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting1-2.dfy
diff --git a/Test/dafny0/formatting1-3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting1-3.dfy
similarity index 100%
rename from Test/dafny0/formatting1-3.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting1-3.dfy
diff --git a/Test/dafny0/formatting1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting1.dfy
similarity index 100%
rename from Test/dafny0/formatting1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting1.dfy
diff --git a/Test/dafny0/formatting1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting1.dfy.expect
similarity index 78%
rename from Test/dafny0/formatting1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting1.dfy.expect
index 2dfdad92fd8..095796efcfa 100644
--- a/Test/dafny0/formatting1.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting1.dfy.expect
@@ -22,11 +22,6 @@ module A {
     }
   }
 }
-formatting1-3.dfy(1,0): Warning: File contains no code (ID: p_file_has_no_code)
-
-The indicated file has no code. This can be because the file is empty, because some parse error
-left the top-level module with no well-formed declarations, or because a unclosed comment
-has commented-out the whole file.
 // RUN: echo 'lit should ignore this file' 
 
 1 file needs formatting.
@@ -57,6 +52,5 @@ module A {
     }
   }
 }
-formatting1-3.dfy(1,0): Warning: File contains no code
 // RUN: echo 'lit should ignore this file' 
 
diff --git a/Test/dafny0/formatting2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting2.dfy
similarity index 100%
rename from Test/dafny0/formatting2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting2.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting2.dfy.expect
new file mode 100644
index 00000000000..b9a5ee9e1b5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formatting2.dfy.expect
@@ -0,0 +1 @@
+CLI: Error: file unexisting.dfy not found
diff --git a/Test/dafny0/formattingStdin.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingStdin.dfy
similarity index 100%
rename from Test/dafny0/formattingStdin.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingStdin.dfy
diff --git a/Test/dafny0/formattingStdin.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingStdin.dfy.expect
similarity index 100%
rename from Test/dafny0/formattingStdin.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingStdin.dfy.expect
diff --git a/Test/dafny0/formattingcheckfails.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingcheckfails.dfy
similarity index 100%
rename from Test/dafny0/formattingcheckfails.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingcheckfails.dfy
diff --git a/Test/dafny0/formattingcheckfails.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingcheckfails.dfy.expect
similarity index 100%
rename from Test/dafny0/formattingcheckfails.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingcheckfails.dfy.expect
diff --git a/Test/dafny0/formattingchecksucceeds.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingchecksucceeds.dfy
similarity index 100%
rename from Test/dafny0/formattingchecksucceeds.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingchecksucceeds.dfy
diff --git a/Test/dafny0/formattingchecksucceeds.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingchecksucceeds.dfy.expect
similarity index 100%
rename from Test/dafny0/formattingchecksucceeds.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattingchecksucceeds.dfy.expect
diff --git a/Test/dafny0/formattinginclude.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattinginclude.dfy
similarity index 100%
rename from Test/dafny0/formattinginclude.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/formattinginclude.dfy
diff --git a/Test/dafny0/fun-with-slices.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/fun-with-slices.dfy
similarity index 82%
rename from Test/dafny0/fun-with-slices.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/fun-with-slices.dfy
index 2a1b0b5e178..36ff430f591 100644
--- a/Test/dafny0/fun-with-slices.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/fun-with-slices.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This test was contributed by Bryan. It has shown some instabilities in the past.
 
diff --git a/Test/dafny3/CalcExample.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/fun-with-slices.dfy.expect
similarity index 100%
rename from Test/dafny3/CalcExample.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/fun-with-slices.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/incompatibleAttributes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/incompatibleAttributes.dfy
new file mode 100644
index 00000000000..cb07fbe56a9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/incompatibleAttributes.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 2 %resolve "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method {:rlimit 10} {:resource_limit 10000} M() {
+  assert true;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/incompatibleAttributes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/incompatibleAttributes.dfy.expect
new file mode 100644
index 00000000000..4b22bcd7163
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/incompatibleAttributes.dfy.expect
@@ -0,0 +1,2 @@
+incompatibleAttributes.dfy(4,9): Error: the rlimit and resource_limit attributes cannot be used together
+1 resolution/type errors detected in incompatibleAttributes.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/one-message-per-failed-precondition.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/one-message-per-failed-precondition.dfy
new file mode 100644
index 00000000000..04589a240dc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/one-message-per-failed-precondition.dfy
@@ -0,0 +1,20 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+// When a function call violates two preconditions at the same time, it causes
+// two errors to be reported for the same token
+
+method A(x: int)
+  requires x > 0
+  requires x < 0
+{}
+
+method B(x: int) {
+  A(x);
+}
+
+ghost function fA(x: int): int
+  requires x > 0
+  requires x < 0 { 1 }
+
+ghost function fB(x: int): int { fA(x) }
diff --git a/Test/dafny0/one-message-per-failed-precondition.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/one-message-per-failed-precondition.dfy.expect
similarity index 76%
rename from Test/dafny0/one-message-per-failed-precondition.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/one-message-per-failed-precondition.dfy.expect
index 581b2801ea1..fc73d4bd8be 100644
--- a/Test/dafny0/one-message-per-failed-precondition.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/one-message-per-failed-precondition.dfy.expect
@@ -1,10 +1,10 @@
 one-message-per-failed-precondition.dfy(13,3): Error: a precondition for this call could not be proved
-one-message-per-failed-precondition.dfy(9,13): Related location: this is the precondition that could not be proved
-one-message-per-failed-precondition.dfy(13,3): Error: a precondition for this call could not be proved
 one-message-per-failed-precondition.dfy(8,13): Related location: this is the precondition that could not be proved
-one-message-per-failed-precondition.dfy(20,33): Error: function precondition could not be proved
-one-message-per-failed-precondition.dfy(18,13): Related location
-one-message-per-failed-precondition.dfy(20,33): Error: function precondition could not be proved
-one-message-per-failed-precondition.dfy(17,13): Related location
+one-message-per-failed-precondition.dfy(13,3): Error: a precondition for this call could not be proved
+one-message-per-failed-precondition.dfy(9,13): Related location: this is the precondition that could not be proved
+one-message-per-failed-precondition.dfy(20,35): Error: function precondition could not be proved
+one-message-per-failed-precondition.dfy(17,13): Related location: this proposition could not be proved
+one-message-per-failed-precondition.dfy(20,35): Error: function precondition could not be proved
+one-message-per-failed-precondition.dfy(18,13): Related location: this proposition could not be proved
 
 Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots0.v0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots0.v0.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots0.v0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots0.v0.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots0.v1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots0.v1.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots0.v1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots0.v1.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots1.v0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots1.v0.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots1.v0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots1.v0.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots1.v1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots1.v1.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots1.v1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots1.v1.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots2.v0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots2.v0.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots2.v0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots2.v0.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots2.v1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots2.v1.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots2.v1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots2.v1.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots3.v0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots3.v0.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots3.v0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots3.v0.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots3.v1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots3.v1.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots3.v1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots3.v1.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots4.v0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots4.v0.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots4.v0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots4.v0.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots4.v1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots4.v1.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots4.v1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots4.v1.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots5.v0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots5.v0.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots5.v0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots5.v0.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots5.v1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots5.v1.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots5.v1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots5.v1.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots6.v0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots6.v0.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots6.v0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots6.v0.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots6.v1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots6.v1.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots6.v1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots6.v1.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots7.v0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots7.v0.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots7.v0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots7.v0.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots7.v1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots7.v1.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots7.v1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots7.v1.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots8.v0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots8.v0.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots8.v0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots8.v0.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots8.v1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots8.v1.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots8.v1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots8.v1.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots9.v0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots9.v0.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots9.v0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots9.v0.dfy
diff --git a/Test/dafny0/snapshots/Inputs/Snapshots9.v1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots9.v1.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Inputs/Snapshots9.v1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Inputs/Snapshots9.v1.dfy
diff --git a/Test/dafny0/snapshots/Snapshots0.run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots0.run.legacy.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots0.run.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots0.run.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots0.run.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots0.run.legacy.dfy.expect
new file mode 100644
index 00000000000..b8ef92072d9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots0.run.legacy.dfy.expect
@@ -0,0 +1,14 @@
+Processing command (at Snapshots0.v0.dfy(4,3)) assert {:id "id1"} Lit(false);
+  >>> DoNothingToAssert
+
+Dafny program verifier finished with 1 verified, 0 errors
+Processing call to procedure bar (call) in implementation foo (correctness) (at Snapshots0.v1.dfy(3,6)):
+  >>> added axiom: (forall call0old#AT#$Heap: Heap, $Heap: Heap :: {:weight 30} { ##extracted_function##1(call0old#AT#$Heap, $Heap) } ##extracted_function##1(call0old#AT#$Heap, $Heap) == (true && Lit(false) && (forall $o: ref :: { $Heap[$o] } $o != null && $Unbox(read(call0old#AT#$Heap, $o, alloc)): bool ==> $Heap[$o] == call0old#AT#$Heap[$o]) && $HeapSucc(call0old#AT#$Heap, $Heap)))
+  >>> added after: a##cached##0 := a##cached##0 && ##extracted_function##1(call0old#AT#$Heap, $Heap);
+Processing command (at <unknown location>) a##cached##0 := a##cached##0 && ##extracted_function##1(call0old#AT#$Heap, $Heap);
+  >>> AssumeNegationOfAssumptionVariable
+Processing command (at Snapshots0.v1.dfy(4,3)) assert {:id "id5"} Lit(false);
+  >>> MarkAsPartiallyVerified
+Snapshots0.v1.dfy(4,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny0/snapshots/Snapshots1.run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots1.run.legacy.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots1.run.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots1.run.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots1.run.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots1.run.legacy.dfy.expect
new file mode 100644
index 00000000000..0c6bfd5c5d4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots1.run.legacy.dfy.expect
@@ -0,0 +1,11 @@
+Processing command (at Snapshots1.v0.dfy(4,3)) assert {:id "id1"} Lit(false);
+  >>> DoNothingToAssert
+
+Dafny program verifier finished with 1 verified, 0 errors
+Processing call to procedure N (call) in implementation M (correctness) (at Snapshots1.v1.dfy(3,4)):
+  >>> added after: a##cached##0 := a##cached##0 && false;
+Processing command (at Snapshots1.v1.dfy(4,3)) assert {:id "id8"} Lit(false);
+  >>> DoNothingToAssert
+Snapshots1.v1.dfy(4,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny0/snapshots/Snapshots2.run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots2.run.legacy.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots2.run.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots2.run.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots2.run.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots2.run.legacy.dfy.expect
new file mode 100644
index 00000000000..73227d69808
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots2.run.legacy.dfy.expect
@@ -0,0 +1,31 @@
+Processing command (at Snapshots2.v0.dfy(4,3)) assert {:id "id1"} Lit(false);
+  >>> DoNothingToAssert
+Processing command (at Snapshots2.v0.dfy(11,12)) assert {:id "id5"} Lit(true);
+  >>> DoNothingToAssert
+Processing command (at Snapshots2.v0.dfy(11,15)) assert {:id "id4"} _module.__default.P() <==> _module.__default.Q();
+  >>> DoNothingToAssert
+Processing command (at Snapshots2.v0.dfy(14,12)) assert {:id "id8"} Lit(true);
+  >>> DoNothingToAssert
+Processing command (at Snapshots2.v0.dfy(14,15)) assert {:id "id7"} _module.__default.Q() <==> Lit(_module.__default.R());
+  >>> DoNothingToAssert
+
+Dafny program verifier finished with 3 verified, 0 errors
+Processing call to procedure N (call) in implementation M (correctness) (at Snapshots2.v1.dfy(3,4)):
+  >>> added after: a##cached##0 := a##cached##0 && false;
+Processing implementation P (well-formedness) (at Snapshots2.v1.dfy(10,11)):
+  >>> added after assuming the current precondition: a##cached##0 := a##cached##0 && false;
+Processing implementation Q (well-formedness) (at Snapshots2.v1.dfy(13,11)):
+  >>> added after assuming the current precondition: a##cached##0 := a##cached##0 && false;
+Processing command (at Snapshots2.v1.dfy(4,3)) assert {:id "id14"} Lit(false);
+  >>> DoNothingToAssert
+Snapshots2.v1.dfy(4,2): Error: assertion might not hold
+Processing command (at Snapshots2.v1.dfy(11,12)) assert {:id "id18"} Lit(true);
+  >>> DoNothingToAssert
+Processing command (at Snapshots2.v1.dfy(11,15)) assert {:id "id17"} _module.__default.P() <==> _module.__default.Q();
+  >>> DoNothingToAssert
+Processing command (at Snapshots2.v1.dfy(14,12)) assert {:id "id21"} Lit(true);
+  >>> DoNothingToAssert
+Processing command (at Snapshots2.v1.dfy(14,15)) assert {:id "id20"} _module.__default.Q() <==> Lit(_module.__default.R());
+  >>> DoNothingToAssert
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/Test/dafny0/snapshots/Snapshots3.run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots3.run.legacy.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots3.run.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots3.run.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots3.run.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots3.run.legacy.dfy.expect
new file mode 100644
index 00000000000..8555ef7ebb5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots3.run.legacy.dfy.expect
@@ -0,0 +1,13 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+Processing command (at Snapshots3.v0.dfy(9,5)) assert {:id "id0"} Lit(0 != 0);
+  >>> DoNothingToAssert
+Snapshots3.v0.dfy(9,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
+Processing command (at Snapshots3.v1.dfy(5,5)) assert {:id "id1"} Lit(true);
+  >>> DoNothingToAssert
+Processing command (at Snapshots3.v1.dfy(9,5)) assert {:id "id2"} Lit(0 != 0);
+  >>> RecycleError
+Snapshots3.v0.dfy(9,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny0/snapshots/Snapshots4.run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots4.run.legacy.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots4.run.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots4.run.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots4.run.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots4.run.legacy.dfy.expect
new file mode 100644
index 00000000000..4963b138b46
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots4.run.legacy.dfy.expect
@@ -0,0 +1,15 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+Processing command (at Snapshots4.v0.dfy(9,5)) assert {:id "id0"} LitInt(0) == LitInt(0);
+  >>> DoNothingToAssert
+
+Dafny program verifier finished with 1 verified, 0 errors
+Processing command (at Snapshots4.v1.dfy(5,5)) assert {:id "id1"} Lit(1 != 1);
+  >>> DoNothingToAssert
+Processing command (at Snapshots4.v1.dfy(9,5)) assert {:id "id2"} LitInt(0) == LitInt(0);
+  >>> MarkAsFullyVerified
+Processing command (at Snapshots4.v1.dfy(10,5)) assert {:id "id3"} Lit(2 != 2);
+  >>> DoNothingToAssert
+Snapshots4.v1.dfy(5,4): Error: assertion might not hold
+Snapshots4.v1.dfy(10,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny0/snapshots/Snapshots5.run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots5.run.legacy.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots5.run.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots5.run.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots5.run.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots5.run.legacy.dfy.expect
new file mode 100644
index 00000000000..972f9f58737
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots5.run.legacy.dfy.expect
@@ -0,0 +1,27 @@
+Snapshots5.v0.dfy(10,12): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Snapshots5.v0.dfy(13,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Snapshots5.v0.dfy(20,12): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Snapshots5.v0.dfy(26,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Processing command (at Snapshots5.v0.dfy(10,5)) assert {:id "id1"} (forall b#1_1: bool :: b#1_1 || !b#1_1) || 0 != 0;
+  >>> DoNothingToAssert
+Processing command (at Snapshots5.v0.dfy(13,3)) assert {:id "id3"} (forall b#1: bool :: b#1 || !b#1) || 3 != 3;
+  >>> DoNothingToAssert
+Processing command (at Snapshots5.v0.dfy(20,5)) assert {:id "id4"} (forall b#3_1: bool :: b#3_1 || !b#3_1) || 1 != 1;
+  >>> DoNothingToAssert
+
+Dafny program verifier finished with 1 verified, 0 errors
+Snapshots5.v1.dfy(10,12): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Snapshots5.v1.dfy(13,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Snapshots5.v1.dfy(20,12): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Snapshots5.v1.dfy(22,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Snapshots5.v1.dfy(27,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Processing command (at Snapshots5.v1.dfy(10,5)) assert {:id "id10"} (forall b#1_1: bool :: b#1_1 || !b#1_1) || 0 != 0;
+  >>> MarkAsFullyVerified
+Processing command (at Snapshots5.v1.dfy(13,3)) assert {:id "id12"} (forall b#1: bool :: b#1 || !b#1) || 3 != 3;
+  >>> MarkAsFullyVerified
+Processing command (at Snapshots5.v1.dfy(20,5)) assert {:id "id13"} (exists b#3_1: bool :: Lit(true)) || 4 != 4;
+  >>> DoNothingToAssert
+Processing command (at Snapshots5.v1.dfy(22,3)) assert {:id "id14"} (exists b#3: bool :: Lit(true)) || 5 != 5;
+  >>> DoNothingToAssert
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/dafny0/snapshots/Snapshots6.run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots6.run.legacy.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots6.run.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots6.run.legacy.dfy
diff --git a/Test/dafny0/snapshots/Snapshots6.run.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots6.run.legacy.dfy.expect
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots6.run.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots6.run.legacy.dfy.expect
diff --git a/Test/dafny0/snapshots/Snapshots7.run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots7.run.legacy.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots7.run.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots7.run.legacy.dfy
diff --git a/Test/dafny0/snapshots/Snapshots7.run.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots7.run.legacy.dfy.expect
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots7.run.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots7.run.legacy.dfy.expect
diff --git a/Test/dafny0/snapshots/Snapshots8.run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots8.run.legacy.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots8.run.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots8.run.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots8.run.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots8.run.legacy.dfy.expect
new file mode 100644
index 00000000000..bd8eba27c11
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots8.run.legacy.dfy.expect
@@ -0,0 +1,44 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+Processing command (at Snapshots8.v0.dfy(2,23)) assert {:id "id0"} x#0 < 20 || LitInt(10) <= x#0;
+  >>> DoNothingToAssert
+Processing command (at Snapshots8.v0.dfy(3,3)) assert {:id "id1"} x#0 < 10;
+  >>> DoNothingToAssert
+Processing command (at Snapshots8.v0.dfy(4,8)) assert {:id "id4$id2$requires"} {:id "id2"} LitInt(0) <= call0formal#AT#y#0;
+  >>> DoNothingToAssert
+Snapshots8.v0.dfy(3,2): Error: assertion might not hold
+Snapshots8.v0.dfy(4,7): Error: a precondition for this call could not be proved
+Snapshots8.v0.dfy(8,13): Related location: this is the precondition that could not be proved
+Processing command (at Snapshots8.v0.dfy(13,13)) assert {:id "id8"} LitInt(2) <= z#0;
+  >>> DoNothingToAssert
+Snapshots8.v0.dfy(17,9): Error: a postcondition could not be proved on this return path
+Snapshots8.v0.dfy(13,12): Related location: this is the postcondition that could not be proved
+Processing command (at Snapshots8.v0.dfy(23,3)) assert {:id "id10"} u#0 != 53;
+  >>> DoNothingToAssert
+Snapshots8.v0.dfy(23,2): Error: assertion might not hold
+Processing command (at Snapshots8.v0.dfy(28,3)) assert {:id "id11"} Lit(true);
+  >>> DoNothingToAssert
+
+Dafny program verifier finished with 1 verified, 4 errors
+Processing command (at Snapshots8.v1.dfy(30,8)) assert {:id "id24"} u#0 != 53;
+  >>> RecycleError
+Snapshots8.v1.dfy(30,7): Error: assertion might not hold
+Processing command (at Snapshots8.v1.dfy(3,1)) assert {:id "id12"} x#0 < 20 || LitInt(10) <= x#0;
+  >>> MarkAsFullyVerified
+Processing command (at Snapshots8.v1.dfy(5,8)) assert {:id "id13"} x#0 < 10;
+  >>> RecycleError
+Processing command (at Snapshots8.v1.dfy(6,8)) assert {:id "id17$id14$requires"} {:id "id14"} LitInt(0) <= call0formal#AT#y#0;
+  >>> RecycleError
+Processing command (at Snapshots8.v1.dfy(7,3)) assert {:id "id15"} x#0 == LitInt(7);
+  >>> DoNothingToAssert
+Snapshots8.v1.dfy(5,7): Error: assertion might not hold
+Snapshots8.v1.dfy(6,7): Error: a precondition for this call could not be proved
+Snapshots8.v1.dfy(12,20): Related location: this is the precondition that could not be proved
+Snapshots8.v1.dfy(7,2): Error: assertion might not hold
+Processing command (at Snapshots8.v1.dfy(23,5)) assert {:id "id23"} Lit(true);
+  >>> DoNothingToAssert
+Processing command (at Snapshots8.v1.dfy(19,13)) assert {:id "id21"} LitInt(2) <= z#0;
+  >>> DoNothingToAssert
+Snapshots8.v1.dfy(24,9): Error: a postcondition could not be proved on this return path
+Snapshots8.v1.dfy(19,12): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 1 verified, 5 errors
diff --git a/Test/dafny0/snapshots/Snapshots9.run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots9.run.legacy.dfy
similarity index 100%
rename from Test/dafny0/snapshots/Snapshots9.run.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots9.run.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots9.run.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots9.run.legacy.dfy.expect
new file mode 100644
index 00000000000..36e8d43cba9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny0/snapshots/Snapshots9.run.legacy.dfy.expect
@@ -0,0 +1,21 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+Processing command (at Snapshots9.v0.dfy(2,11)) assert {:id "id2"} ok#0;
+  >>> DoNothingToAssert
+Snapshots9.v0.dfy(4,7): Error: a postcondition could not be proved on this return path
+Snapshots9.v0.dfy(2,10): Related location: this is the postcondition that could not be proved
+Processing command (at Snapshots9.v0.dfy(12,11)) assert {:id "id7"} ok#0;
+  >>> DoNothingToAssert
+Snapshots9.v0.dfy(13,0): Error: a postcondition could not be proved on this return path
+Snapshots9.v0.dfy(12,10): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 0 verified, 2 errors
+Processing command (at Snapshots9.v1.dfy(6,11)) assert {:id "id10"} ok#0;
+  >>> RecycleError
+Snapshots9.v1.dfy(8,7): Error: a postcondition could not be proved on this return path
+Snapshots9.v1.dfy(6,10): Related location: this is the postcondition that could not be proved
+Processing command (at Snapshots9.v1.dfy(19,11)) assert {:id "id15"} ok#0;
+  >>> RecycleError
+Snapshots9.v1.dfy(21,0): Error: a postcondition could not be proved on this return path
+Snapshots9.v1.dfy(19,10): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny1/BDD.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/BDD.dfy
similarity index 95%
rename from Test/dafny1/BDD.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/BDD.dfy
index 0b3cc56e615..25eb8702691 100644
--- a/Test/dafny1/BDD.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/BDD.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module SimpleBDD
 {
diff --git a/Test/dafny1/Celebrity.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/BDD.dfy.expect
similarity index 100%
rename from Test/dafny1/Celebrity.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/BDD.dfy.expect
diff --git a/Test/dafny1/BinaryTree.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/BinaryTree.dfy
similarity index 98%
rename from Test/dafny1/BinaryTree.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/BinaryTree.dfy
index b0b6305197b..24371c266a7 100644
--- a/Test/dafny1/BinaryTree.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/BinaryTree.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class IntSet {
   ghost var Contents: set<int>
diff --git a/Test/dafny1/BinaryTree.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/BinaryTree.dfy.expect
similarity index 100%
rename from Test/dafny1/BinaryTree.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/BinaryTree.dfy.expect
diff --git a/Test/dafny1/Celebrity.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Celebrity.dfy
similarity index 95%
rename from Test/dafny1/Celebrity.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Celebrity.dfy
index d4741cb923d..d8ffcd9a315 100644
--- a/Test/dafny1/Celebrity.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Celebrity.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Celebrity example, inspired by the Rodin tutorial
 
diff --git a/Test/dafny2/Intervals.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Celebrity.dfy.expect
similarity index 100%
rename from Test/dafny2/Intervals.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Celebrity.dfy.expect
diff --git a/Test/dafny1/Cubes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Cubes.dfy
similarity index 83%
rename from Test/dafny1/Cubes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Cubes.dfy
index a2280f091ea..4e1549bc781 100644
--- a/Test/dafny1/Cubes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Cubes.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 method Cubes(a: array<int>)
   modifies a
diff --git a/Test/dafny4/Bug120.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Cubes.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug120.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Cubes.dfy.expect
diff --git a/Test/dafny1/ExtensibleArray.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ExtensibleArray.dfy
similarity index 97%
rename from Test/dafny1/ExtensibleArray.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ExtensibleArray.dfy
index 780f8c0e295..243efcc0860 100644
--- a/Test/dafny1/ExtensibleArray.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ExtensibleArray.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class ExtensibleArray<T> {
   ghost var Contents: seq<T>
diff --git a/Test/dafny1/ExtensibleArray.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ExtensibleArray.dfy.expect
similarity index 100%
rename from Test/dafny1/ExtensibleArray.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ExtensibleArray.dfy.expect
diff --git a/Test/dafny1/ExtensibleArrayAuto.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ExtensibleArrayAuto.dfy
similarity index 97%
rename from Test/dafny1/ExtensibleArrayAuto.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ExtensibleArrayAuto.dfy
index 6e275cb63fd..67c16c18cc9 100644
--- a/Test/dafny1/ExtensibleArrayAuto.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ExtensibleArrayAuto.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class {:autocontracts} ExtensibleArray<T> {
   ghost var Contents: seq<T>
diff --git a/Test/dafny1/ExtensibleArrayAuto.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ExtensibleArrayAuto.dfy.expect
similarity index 100%
rename from Test/dafny1/ExtensibleArrayAuto.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ExtensibleArrayAuto.dfy.expect
diff --git a/Test/dafny1/FindZero.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/FindZero.dfy
similarity index 95%
rename from Test/dafny1/FindZero.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/FindZero.dfy
index 62534ec8d87..00f1643cc9c 100644
--- a/Test/dafny1/FindZero.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/FindZero.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 method FindZero(a: array<int>) returns (r: int)
   requires forall i :: 0 <= i < a.Length ==> 0 <= a[i];
diff --git a/Test/dafny3/SetIterations.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/FindZero.dfy.expect
similarity index 100%
rename from Test/dafny3/SetIterations.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/FindZero.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Induction.legacy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Induction.legacy.dfy
new file mode 100644
index 00000000000..473f418e3d3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Induction.legacy.dfy
@@ -0,0 +1,253 @@
+// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class IntegerInduction {
+  // This class considers different ways of proving, for any natural n:
+  //   (SUM i in [0, n] :: i^3) == (SUM i in [0, n] :: i)^2
+
+  // In terms of Dafny functions, the theorem to be proved is:
+  //   SumOfCubes(n) == Gauss(n) * Gauss(n)
+
+  ghost function SumOfCubes(n: int): int
+    requires 0 <= n
+  {
+    if n == 0 then 0 else SumOfCubes(n-1) + n*n*n
+  }
+
+  ghost function Gauss(n: int): int
+    requires 0 <= n
+  {
+    if n == 0 then 0 else Gauss(n-1) + n
+  }
+
+  // Here is one proof.  It uses a lemma, which is proved separately.
+
+  lemma Theorem0(n: int)
+    requires 0 <= n
+    ensures SumOfCubes(n) == Gauss(n) * Gauss(n)
+  {
+    if n != 0 {
+      Theorem0(n-1);
+      Lemma(n-1);
+    }
+  }
+
+  lemma Lemma(n: int)
+    requires 0 <= n
+    ensures 2 * Gauss(n) == n*(n+1)
+  {
+    if n != 0 { Lemma(n-1); }
+  }
+
+  // Here is another proof.  It states the lemma as part of the theorem, and
+  // thus proves the two together.
+
+  lemma Theorem1(n: int)
+    requires 0 <= n
+    ensures SumOfCubes(n) == Gauss(n) * Gauss(n)
+    ensures 2 * Gauss(n) == n*(n+1)
+  {
+    if n != 0 {
+      Theorem1(n-1);
+    }
+  }
+
+  lemma DoItAllInOneGo()
+    ensures forall n {:induction} {:split false} :: 0 <= n ==> // WISH reenable quantifier splitting here. This will only work once we generate induction hypotheses at the Dafny level.
+                SumOfCubes(n) == Gauss(n) * Gauss(n) &&
+                2 * Gauss(n) == n*(n+1)
+  {
+  }
+
+  // The following two lemmas are the same as the previous two, but
+  // here no body is given--and the proof still goes through (thanks to
+  // Dafny's ghost-method induction tactic).
+
+  lemma Lemma_Auto(n: int)
+    requires 0 <= n
+    ensures 2 * Gauss(n) == n*(n+1)
+  {
+  }
+
+  lemma Theorem1_Auto(n: int)
+    requires 0 <= n
+    ensures SumOfCubes(n) == Gauss(n) * Gauss(n)
+    ensures 2 * Gauss(n) == n*(n+1)
+  {
+  }
+
+  // Here is another proof.  It makes use of Dafny's induction heuristics to
+  // prove the lemma.
+
+  lemma Theorem2(n: int)
+    requires 0 <= n
+    ensures SumOfCubes(n) == Gauss(n) * Gauss(n)
+  {
+    if n != 0 {
+      Theorem2(n-1);
+
+      assert forall m {:induction} :: 0 <= m ==> 2 * Gauss(m) == m*(m+1);
+    }
+  }
+
+  lemma M(n: int)
+    requires 0 <= n
+  {
+    assume forall k :: 0 <= k && k < n ==> 2 * Gauss(k) == k*(k+1);  // manually assume the induction hypothesis
+    assert 2 * Gauss(n) == n*(n+1);
+  }
+
+  // Another way to prove the lemma is to supply a postcondition on the Gauss function
+
+  lemma Theorem3(n: int)
+    requires 0 <= n
+    ensures SumOfCubes(n) == GaussWithPost(n) * GaussWithPost(n)
+  {
+    if n != 0 {
+      Theorem3(n-1);
+    }
+  }
+
+  ghost function GaussWithPost(n: int): int
+    requires 0 <= n
+    ensures 2 * GaussWithPost(n) == n*(n+1)
+  {
+    if n == 0 then 0 else GaussWithPost(n-1) + n
+  }
+
+  // Finally, with the postcondition of GaussWithPost, one can prove the entire theorem by induction
+
+  lemma Theorem4()
+    ensures forall n {:induction} :: 0 <= n ==>
+        SumOfCubes(n) == GaussWithPost(n) * GaussWithPost(n)
+  {
+    // look ma, no hints!
+  }
+
+  lemma Theorem5(n: int)
+    requires 0 <= n
+    ensures SumOfCubes(n) == GaussWithPost(n) * GaussWithPost(n)
+  {
+    // the postcondition is a simple consequence of these quantified versions of the theorem:
+    if * {
+      assert forall m {:induction} :: 0 <= m ==> SumOfCubes(m) == GaussWithPost(m) * GaussWithPost(m);
+    } else {
+      Theorem4();
+    }
+  }
+
+  // The body of this function gives a single quantifier, which leads to an efficient
+  // way to check sortedness at run time.  However, an alternative, and ostensibly more general,
+  // way to express sortedness is given in the function's postcondition.  The alternative
+  // formulation may be easier to understand for a human and may also be more readily applicable
+  // for the program verifier.  Dafny will show that postcondition holds, which ensures the
+  // equivalence of the two formulations.
+  // The proof of the postcondition requires induction.  It would have been nicer to state it
+  // as one formula of the form "IsSorted(s) <==> ...", but then Dafny would never consider the
+  // possibility of applying induction.  Instead, the "==>" and "<==" cases are given separately.
+  // Proving the "<==" case is simple; it's the "==>" case that requires induction.
+  // The example uses an attribute that requests induction on just "j".  However, the proof also
+  // goes through by applying induction on both bound variables.
+  function IsSorted(s: seq<int>): bool //WISH remove autotriggers false
+    ensures IsSorted(s) ==> forall i,j {:induction j} {:autotriggers false} :: 0 <= i < j < |s| ==> s[i] <= s[j]
+    ensures (forall i,j :: 0 <= i && i < j && j < |s| ==> s[i] <= s[j]) ==> IsSorted(s)
+  {
+    forall i {:nowarn} {:matchinglooprewrite false} :: 1 <= i && i < |s| ==> s[i-1] <= s[i]
+  }
+}
+
+datatype Tree<T> = Leaf(T) | Branch(Tree<T>, Tree<T>)
+
+class DatatypeInduction<T> {
+  ghost function LeafCount<T>(tree: Tree<T>): int
+  {
+    match tree
+    case Leaf(t) => 1
+    case Branch(left, right) => LeafCount(left) + LeafCount(right)
+  }
+
+  method Theorem0(tree: Tree<T>)
+    ensures 1 <= LeafCount(tree)
+  {
+    assert forall t: Tree<T> {:induction} :: 1 <= LeafCount(t);
+  }
+
+  // see also Test/dafny0/DTypes.dfy for more variations of this example
+
+  ghost function OccurrenceCount<T>(tree: Tree<T>, x: T): int
+  {
+    match tree
+    case Leaf(t) => if x == t then 1 else 0
+    case Branch(left, right) => OccurrenceCount(left, x) + OccurrenceCount(right, x)
+  }
+  method RegressionTest(tree: Tree<T>)
+    // the translation of the following line once crashed Dafny
+    requires forall y :: 0 <= OccurrenceCount(tree, y)
+  {
+  }
+
+}
+
+// ----------------------- Induction and case splits -----------------
+// This is a simple example where the induction hypothesis and the
+// case splits are decoupled.
+
+datatype D = Nothing | Something(D)
+
+ghost function FooD(n: nat, d: D): int
+  ensures 10 <= FooD(n, d)
+{
+  match d
+  case Nothing =>
+    if n == 0 then 10 else FooD(n-1, D.Something(d))
+  case Something(next) =>
+    if n < 100 then n + 12 else FooD(n-13, next)
+}
+
+// ----------------------- Regression: remember to substitute "this" -----------------
+
+class Node {
+  ghost var Repr: set<object>
+  var left: Node?
+  var uu: nat
+
+  ghost predicate Valid()
+    reads this, Repr
+    ensures Valid() ==> this in Repr
+  {
+    this in Repr &&
+    (left != null ==>
+      left in Repr && left.Repr <= Repr &&
+      this !in left.Repr &&
+      left.Valid()) &&
+    ((left == null && uu == 0) || (left != null && uu != 0))
+  }
+
+  constructor ()
+    ensures Valid() && fresh(Repr)
+  {
+    left := null;
+    uu := 0;
+    Repr := {this};
+  }
+
+  lemma InstanceAboutUU()
+    requires Valid()
+    ensures uu == 0 // regression: once upon a time, this used to go through
+    decreases Repr
+  {
+    if left == null {
+    } else { // error: postcondition violation
+    }
+  }
+}
+
+lemma StaticAboutUU(th: Node)
+  requires th.Valid()
+  ensures th.uu == 0
+  decreases th.Repr
+{
+  if th.left == null {
+  } else { // error: postcondition violation
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Induction.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Induction.legacy.dfy.expect
new file mode 100644
index 00000000000..9fde88db7c2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Induction.legacy.dfy.expect
@@ -0,0 +1,6 @@
+Induction.legacy.dfy(251,9): Error: a postcondition could not be proved on this return path
+Induction.legacy.dfy(247,16): Related location: this is the postcondition that could not be proved
+Induction.legacy.dfy(240,11): Error: a postcondition could not be proved on this return path
+Induction.legacy.dfy(236,15): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 32 verified, 2 errors
diff --git a/Test/dafny1/InductionOptions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/InductionOptions.legacy.dfy
similarity index 100%
rename from Test/dafny1/InductionOptions.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/InductionOptions.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/InductionOptions.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/InductionOptions.legacy.dfy.expect
new file mode 100644
index 00000000000..a3bc7bb4c8c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/InductionOptions.legacy.dfy.expect
@@ -0,0 +1,35 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+InductionOptions.legacy.dfy(21,0): Error: a postcondition could not be proved on this return path
+InductionOptions.legacy.dfy(20,26): Related location: this is the postcondition that could not be proved
+InductionOptions.legacy.dfy(25,9): Error: assertion might not hold
+InductionOptions.legacy.dfy(30,0): Error: a postcondition could not be proved on this return path
+InductionOptions.legacy.dfy(29,10): Related location: this is the postcondition that could not be proved
+InductionOptions.legacy.dfy(35,9): Error: assertion might not hold
+InductionOptions.legacy.dfy(40,0): Error: a postcondition could not be proved on this return path
+InductionOptions.legacy.dfy(39,26): Related location: this is the postcondition that could not be proved
+InductionOptions.legacy.dfy(44,9): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 6 errors
+InductionOptions.legacy.dfy(21,0): Error: a postcondition could not be proved on this return path
+InductionOptions.legacy.dfy(20,26): Related location: this is the postcondition that could not be proved
+InductionOptions.legacy.dfy(25,9): Error: assertion might not hold
+InductionOptions.legacy.dfy(30,0): Error: a postcondition could not be proved on this return path
+InductionOptions.legacy.dfy(29,10): Related location: this is the postcondition that could not be proved
+InductionOptions.legacy.dfy(35,9): Error: assertion might not hold
+
+Dafny program verifier finished with 3 verified, 4 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+InductionOptions.legacy.dfy(21,0): Error: a postcondition could not be proved on this return path
+InductionOptions.legacy.dfy(20,26): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 6 verified, 1 error
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 7 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+InductionOptions.legacy.dfy(25,9): Error: assertion might not hold
+InductionOptions.legacy.dfy(30,0): Error: a postcondition could not be proved on this return path
+InductionOptions.legacy.dfy(29,10): Related location: this is the postcondition that could not be proved
+InductionOptions.legacy.dfy(35,9): Error: assertion might not hold
+
+Dafny program verifier finished with 4 verified, 3 errors
diff --git a/Test/dafny1/KatzManna.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/KatzManna.dfy
similarity index 95%
rename from Test/dafny1/KatzManna.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/KatzManna.dfy
index 8f485afed5a..f67b06783e6 100644
--- a/Test/dafny1/KatzManna.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/KatzManna.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 method NinetyOne(x: int, ghost proveFunctionalPostcondition: bool) returns (z: int)
   ensures proveFunctionalPostcondition ==> z == if x > 101 then x-10 else 91
diff --git a/Test/dafny2/Classics.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/KatzManna.dfy.expect
similarity index 100%
rename from Test/dafny2/Classics.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/KatzManna.dfy.expect
diff --git a/Test/dafny1/ListContents.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListContents.dfy
similarity index 96%
rename from Test/dafny1/ListContents.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListContents.dfy
index 6846d1ad0dc..97c144db9cb 100644
--- a/Test/dafny1/ListContents.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListContents.dfy
@@ -1,5 +1,4 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
 
 class Node<T> {
   ghost var List: seq<T>
diff --git a/Test/dafny1/SchorrWaite.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListContents.dfy.expect
similarity index 100%
rename from Test/dafny1/SchorrWaite.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListContents.dfy.expect
diff --git a/Test/dafny1/ListCopy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListCopy.dfy
similarity index 93%
rename from Test/dafny1/ListCopy.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListCopy.dfy
index 23f720b6d14..e5bd2374ee9 100644
--- a/Test/dafny1/ListCopy.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListCopy.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --allow-deprecation --relax-definite-assignment --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class Node {
diff --git a/Test/dafny4/Bug161.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListCopy.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug161.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListCopy.dfy.expect
diff --git a/Test/dafny1/ListReverse.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListReverse.dfy
similarity index 88%
rename from Test/dafny1/ListReverse.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListReverse.dfy
index 4774263d148..b3105164e79 100644
--- a/Test/dafny1/ListReverse.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListReverse.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 class Node {
   var nxt: Node?
diff --git a/Test/dafny4/Bug56.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListReverse.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug56.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/ListReverse.dfy.expect
diff --git a/Test/dafny1/MatrixFun.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MatrixFun.dfy
similarity index 96%
rename from Test/dafny1/MatrixFun.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MatrixFun.dfy
index 34d696728c2..7b1d9c60d38 100644
--- a/Test/dafny1/MatrixFun.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MatrixFun.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 method MirrorImage<T>(m: array2<T>)
   modifies m
diff --git a/Test/dafny1/MatrixFun.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MatrixFun.dfy.expect
similarity index 100%
rename from Test/dafny1/MatrixFun.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MatrixFun.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MoreInduction.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MoreInduction.dfy
new file mode 100644
index 00000000000..6c69c586f82
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MoreInduction.dfy
@@ -0,0 +1,100 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+datatype List<X> = Nil | Cons(Node<X>, List<X>)
+datatype Node<X> = Element(X) | Nary(List<X>)
+
+ghost function FlattenMain<M>(list: List<M>): List<M>
+  ensures IsFlat(FlattenMain(list))
+{
+  Flatten(list, Nil)
+}
+
+ghost function Flatten<X>(list: List<X>, ext: List<X>): List<X>
+  requires IsFlat(ext)
+  ensures IsFlat(Flatten(list, ext))
+{
+  match list
+  case Nil => ext
+  case Cons(n, rest) =>
+    match n
+    case Element(x) => Cons(n, Flatten(rest, ext))
+    case Nary(nn) => Flatten(nn, Flatten(rest, ext))
+}
+
+ghost function IsFlat<F>(list: List<F>): bool
+{
+  match list
+  case Nil => true
+  case Cons(n, rest) =>
+    match n
+    case Element(x) => IsFlat(rest)
+    case Nary(nn) => false
+}
+
+ghost function ToSeq<X>(list: List<X>): seq<X>
+{
+  match list
+  case Nil => []
+  case Cons(n, rest) =>
+    match n
+    case Element(x) => [x] + ToSeq(rest)
+    case Nary(nn) => ToSeq(nn) + ToSeq(rest)
+}
+
+lemma Theorem<X>(list: List<X>)
+  ensures ToSeq(list) == ToSeq(FlattenMain(list))
+{
+  Lemma(list, Nil);
+}
+
+lemma {:isolate_assertions} Lemma<X>(list: List<X>, ext: List<X>)
+  requires IsFlat(ext)
+  ensures ToSeq(list) + ToSeq(ext) == ToSeq(Flatten(list, ext))
+{
+  match (list) {
+    case Nil =>
+    case Cons(n, rest) =>
+      match (n) {
+        case Element(x) =>
+          Lemma(rest, ext);
+        case Nary(nn) =>
+          Lemma(nn, Flatten(rest, ext));
+          Lemma(rest, ext);
+      }
+  }
+}
+
+// ---------------------------------------------
+
+ghost function NegFac(n: int): int
+  decreases -n
+{
+  if -1 <= n then -1 else - NegFac(n+1) * n
+}
+
+lemma LemmaAll()
+  ensures forall n :: NegFac(n) <= -1  // error: induction heuristic does not give a useful well-founded order, and thus this fails to verify
+{
+}
+
+lemma LemmaOne(n: int)
+  ensures NegFac(n) <= -1  // error: induction heuristic does not give a useful well-founded order, and thus this fails to verify
+{
+}
+
+lemma LemmaAll_Neg()
+  ensures forall n {:nowarn} :: NegFac(-n) <= -1  // error: fails to verify because of the minus in the automatically generated trigger
+{
+}
+
+lemma LemmaOne_Neg(n: int)
+  ensures NegFac(-n) <= -1  // error: fails to verify because of the minus in the automatically generated trigger
+{
+}
+
+lemma LemmaOneWithDecreases(n: int)
+  ensures NegFac(n) <= -1  // here, the programmer gives a good well-founded order, so this verifies
+  decreases -n
+{
+}
diff --git a/Test/dafny1/MoreInduction.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MoreInduction.dfy.expect
similarity index 92%
rename from Test/dafny1/MoreInduction.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MoreInduction.dfy.expect
index 89ed8e1ed3c..45df7d21223 100644
--- a/Test/dafny1/MoreInduction.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/MoreInduction.dfy.expect
@@ -7,4 +7,4 @@ MoreInduction.dfy(87,10): Related location: this is the postcondition that could
 MoreInduction.dfy(93,0): Error: a postcondition could not be proved on this return path
 MoreInduction.dfy(92,21): Related location: this is the postcondition that could not be proved
 
-Dafny program verifier finished with 9 verified, 4 errors
+Dafny program verifier finished with 26 verified, 4 errors
diff --git a/Test/dafny1/PriorityQueue.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/PriorityQueue.dfy
similarity index 98%
rename from Test/dafny1/PriorityQueue.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/PriorityQueue.dfy
index 58aee3c437a..8923de762a1 100644
--- a/Test/dafny1/PriorityQueue.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/PriorityQueue.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class PriorityQueue {
   var N: nat  // capacity
diff --git a/Test/dafny1/PriorityQueue.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/PriorityQueue.dfy.expect
similarity index 100%
rename from Test/dafny1/PriorityQueue.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/PriorityQueue.dfy.expect
diff --git a/Test/dafny1/Queue.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Queue.dfy
similarity index 97%
rename from Test/dafny1/Queue.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Queue.dfy
index d71eca34106..1287312b02a 100644
--- a/Test/dafny1/Queue.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Queue.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Queue.dfy
 // Dafny version of Queue.bpl
diff --git a/Test/dafny1/Queue.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Queue.dfy.expect
similarity index 100%
rename from Test/dafny1/Queue.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Queue.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Rippling.legacy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Rippling.legacy.dfy
new file mode 100644
index 00000000000..8fffa7ceed4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Rippling.legacy.dfy
@@ -0,0 +1,616 @@
+// RUN: %dafny /compile:0 /deprecation:0 /induction:3 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Datatypes
+
+datatype Bool = False | True
+
+datatype Nat = Zero | Suc(Nat)
+
+datatype List = Nil | Cons(Nat, List)
+
+datatype Pair = Pair(Nat, Nat)
+
+datatype PList = PNil | PCons(Pair, PList)
+
+datatype Tree = Leaf | Node(Tree, Nat, Tree)
+
+// Boolean functions
+
+ghost function not(b: Bool): Bool
+{
+  match b
+  case False => True
+  case True => False
+}
+
+ghost function and(a: Bool, b: Bool): Bool
+{
+  if a == True && b == True then True else False
+}
+
+// Natural number functions
+
+ghost function add(x: Nat, y: Nat): Nat
+{
+  match x
+  case Zero => y
+  case Suc(w) => Suc(add(w, y))
+}
+
+ghost function minus(x: Nat, y: Nat): Nat
+{
+  match x
+  case Zero => Zero
+  case Suc(a) => match y
+    case Zero => x
+    case Suc(b) => minus(a, b)
+}
+
+ghost function eq(x: Nat, y: Nat): Bool
+{
+  match x
+  case Zero => (match y
+    case Zero => True
+    case Suc(b) => False)
+  case Suc(a) => (match y
+    case Zero => False
+    case Suc(b) => eq(a, b))
+}
+
+ghost function leq(x: Nat, y: Nat): Bool
+{
+  match x
+  case Zero => True
+  case Suc(a) => match y
+    case Zero => False
+    case Suc(b) => leq(a, b)
+}
+
+ghost function less(x: Nat, y: Nat): Bool
+{
+  match y
+  case Zero => False
+  case Suc(b) => match x
+    case Zero => True
+    case Suc(a) => less(a, b)
+}
+
+ghost function min(x: Nat, y: Nat): Nat
+{
+  match x
+  case Zero => Zero
+  case Suc(a) => match y
+    case Zero => Zero
+    case Suc(b) => Suc(min(a, b))
+}
+
+ghost function max(x: Nat, y: Nat): Nat
+{
+  match x
+  case Zero => y
+  case Suc(a) => match y
+    case Zero => x
+    case Suc(b) => Suc(max(a, b))
+}
+
+// List functions
+
+ghost function concat(xs: List, ys: List): List
+{
+  match xs
+  case Nil => ys
+  case Cons(x,tail) => Cons(x, concat(tail, ys))
+}
+
+ghost function mem(x: Nat, xs: List): Bool
+{
+  match xs
+  case Nil => False
+  case Cons(y, ys) => if x == y then True else mem(x, ys)
+}
+
+ghost function delete(n: Nat, xs: List): List
+{
+  match xs
+  case Nil => Nil
+  case Cons(y, ys) =>
+    if y == n then delete(n, ys) else Cons(y, delete(n, ys))
+}
+
+ghost function drop(n: Nat, xs: List): List
+{
+  match n
+  case Zero => xs
+  case Suc(m) => match xs
+    case Nil => Nil
+    case Cons(x, tail) => drop(m, tail)
+}
+
+ghost function take(n: Nat, xs: List): List
+{
+  match n
+  case Zero => Nil
+  case Suc(m) => match xs
+    case Nil => Nil
+    case Cons(x, tail) => Cons(x, take(m, tail))
+}
+
+ghost function len(xs: List): Nat
+{
+  match xs
+  case Nil => Zero
+  case Cons(y, ys) => Suc(len(ys))
+}
+
+ghost function count(x: Nat, xs: List): Nat
+{
+  match xs
+  case Nil => Zero
+  case Cons(y, ys) =>
+    if x == y then Suc(count(x, ys)) else count(x, ys)
+}
+
+ghost function last(xs: List): Nat
+{
+  match xs
+  case Nil => Zero
+  case Cons(y, ys) => match ys
+    case Nil => y
+    case Cons(z, zs) => last(ys)
+}
+
+ghost function apply(f: Nat -> Nat, xs: List): List
+{
+  match xs
+  case Nil => Nil
+  case Cons(y, ys) => Cons(f(y), apply(f, ys))
+}
+
+// In the following two functions, parameter "p" stands for a predicate:  applying p and
+// getting Zero means "false" and getting anything else means "true".
+
+ghost function takeWhileAlways(p: Nat -> Nat, xs: List): List
+{
+  match xs
+  case Nil => Nil
+  case Cons(y, ys) =>
+    if p(y) != Zero
+    then Cons(y, takeWhileAlways(p, ys))
+    else Nil
+}
+
+ghost function dropWhileAlways(p: Nat -> Nat, xs: List): List
+{
+  match xs
+  case Nil => Nil
+  case Cons(y, ys) =>
+    if p(y) != Zero
+    then dropWhileAlways(p, ys)
+    else Cons(y, ys)
+}
+
+ghost function filter(p: Nat -> Nat, xs: List): List
+{
+  match xs
+  case Nil => Nil
+  case Cons(y, ys) =>
+    if p(y) != Zero
+    then Cons(y, filter(p, ys))
+    else filter(p, ys)
+}
+
+ghost function insort(n: Nat, xs: List): List
+{
+  match xs
+  case Nil => Cons(n, Nil)
+  case Cons(y, ys) =>
+    if leq(n, y) == True
+    then Cons(n, Cons(y, ys))
+    else Cons(y, insort(n, ys))
+}
+
+ghost function ins(n: Nat, xs: List): List
+{
+  match xs
+  case Nil => Cons(n, Nil)
+  case Cons(y, ys) =>
+    if less(n, y) == True
+    then Cons(n, Cons(y, ys))
+    else Cons(y, ins(n, ys))
+}
+
+ghost function ins1(n: Nat, xs: List): List
+{
+  match xs
+  case Nil => Cons(n, Nil)
+  case Cons(y, ys) =>
+    if n == y
+    then Cons(y, ys)
+    else Cons(y, ins1(n, ys))
+}
+
+ghost function sort(xs: List): List
+{
+  match xs
+  case Nil => Nil
+  case Cons(y, ys) => insort(y, sort(ys))
+}
+
+ghost function reverse(xs: List): List
+{
+  match xs
+  case Nil => Nil
+  case Cons(t, rest) => concat(reverse(rest), Cons(t, Nil))
+}
+
+// Pair list functions
+
+ghost function zip(a: List, b: List): PList
+{
+  match a
+  case Nil => PNil
+  case Cons(x, xs) => match b
+    case Nil => PNil
+    case Cons(y, ys) => PCons(Pair.Pair(x, y), zip(xs, ys))
+}
+
+ghost function zipConcat(x: Nat, xs: List, more: List): PList
+{
+  match more
+  case Nil => PNil
+  case Cons(y, ys) => PCons(Pair.Pair(x, y), zip(xs, ys))
+}
+
+// Binary tree functions
+
+ghost function height(t: Tree): Nat
+{
+  match t
+  case Leaf => Zero
+  case Node(l, x, r) => Suc(max(height(l), height(r)))
+}
+
+ghost function mirror(t: Tree): Tree
+{
+  match t
+  case Leaf => Leaf
+  case Node(l, x, r) => Node(mirror(r), x, mirror(l))
+}
+
+// Function parameters
+
+// The following functions stand for the constant "false" and "true" functions,
+// respectively.
+
+ghost function AlwaysFalseFunction(): Nat -> Nat { n => Zero }
+ghost function AlwaysTrueFunction(): Nat -> Nat { n => Suc(Zero) }
+
+lemma AboutAlwaysFalseFunction()
+  ensures forall n :: AlwaysFalseFunction()(n) == Zero
+{
+}
+lemma AboutAlwaysTrueFunction()
+  ensures forall n :: AlwaysTrueFunction()(n) != Zero
+{
+}
+
+// -----------------------------------------------------------------------------------
+// The theorems to be proved
+// -----------------------------------------------------------------------------------
+
+lemma P1()
+  ensures forall n, xs :: concat(take(n, xs), drop(n, xs)) == xs;
+{
+}
+
+lemma P2()
+  ensures forall n, xs, ys :: add(count(n, xs), count(n, ys)) == count(n, concat(xs, ys));
+{
+}
+
+lemma P3()
+  ensures forall n, xs, ys :: leq(count(n, xs), count(n, concat(xs, ys))) == True;
+{
+}
+
+lemma P4()
+  ensures forall n, xs :: add(Suc(Zero), count(n, xs)) == count(n, Cons(n, xs));
+{
+}
+
+lemma P5()
+  ensures forall n, xs, x ::
+    add(Suc(Zero), count(n, xs)) == count(n, Cons(x, xs))
+    ==> n == x;
+{
+}
+
+lemma P6()
+  ensures forall m, n :: minus(n, add(n, m)) == Zero;
+{
+}
+
+lemma P7()
+  ensures forall m, n :: minus(add(n, m), n) == m;
+{
+}
+
+lemma P8()
+  ensures forall k, m, n :: minus(add(k, m), add(k, n)) == minus(m, n);
+{
+}
+
+lemma P9()
+  ensures forall i, j, k :: minus(minus(i, j), k) == minus(i, add(j, k));
+{
+}
+
+lemma P10()
+  ensures forall m :: minus(m, m) == Zero;
+{
+}
+
+lemma P11()
+  ensures forall xs :: drop(Zero, xs) == xs;
+{
+}
+
+lemma P12()
+  ensures forall n, xs, f :: drop(n, apply(f, xs)) == apply(f, drop(n, xs));
+{
+}
+
+lemma P13()
+  ensures forall n, x, xs :: drop(Suc(n), Cons(x, xs)) == drop(n, xs);
+{
+}
+
+lemma P14()
+  ensures forall xs, ys, p :: filter(p, concat(xs, ys)) == concat(filter(p, xs), filter(p, ys));
+{
+}
+
+lemma P15()
+  ensures forall x, xs :: len(ins(x, xs)) == Suc(len(xs));
+{
+}
+
+lemma P16()
+  ensures forall x, xs :: xs == Nil ==> last(Cons(x, xs)) == x;
+{
+}
+
+lemma P17()
+  ensures forall n :: leq(n, Zero) == True <==> n == Zero;
+{
+}
+
+lemma P18()
+  ensures forall i, m :: less(i, Suc(add(i, m))) == True;
+{
+}
+
+lemma P19()
+  ensures forall n, xs :: len(drop(n, xs)) == minus(len(xs), n);
+{
+}
+
+lemma P20()
+  ensures forall xs :: len(sort(xs)) == len(xs);
+{
+  // the proof of this theorem requires a lemma about "insort"
+  assert forall x, xs :: len(insort(x, xs)) == Suc(len(xs));
+}
+
+lemma P21()
+  ensures forall n, m :: leq(n, add(n, m)) == True;
+{
+}
+
+lemma P22()
+  ensures forall a, b, c :: max(max(a, b), c) == max(a, max(b, c));
+{
+}
+
+lemma P23()
+  ensures forall a, b :: max(a, b) == max(b, a);
+{
+}
+
+lemma P24()
+  ensures forall a, b :: max(a, b) == a <==> leq(b, a) == True;
+{
+}
+
+lemma P25()
+  ensures forall a, b :: max(a, b) == b <==> leq(a, b) == True;
+{
+}
+
+lemma P26()
+  ensures forall x, xs, ys :: mem(x, xs) == True ==> mem(x, concat(xs, ys)) == True;
+{
+}
+
+lemma P27()
+  ensures forall x, xs, ys :: mem(x, ys) == True ==> mem(x, concat(xs, ys)) == True;
+{
+}
+
+lemma P28()
+  ensures forall x, xs :: mem(x, concat(xs, Cons(x, Nil))) == True;
+{
+}
+
+lemma P29()
+  ensures forall x, xs :: mem(x, ins1(x, xs)) == True;
+{
+}
+
+lemma P30()
+  ensures forall x, xs :: mem(x, ins(x, xs)) == True;
+{
+}
+
+lemma P31()
+  ensures forall a, b, c :: min(min(a, b), c) == min(a, min(b, c));
+{
+}
+
+lemma P32()
+  ensures forall a, b :: min(a, b) == min(b, a);
+{
+}
+
+lemma P33()
+  ensures forall a, b :: min(a, b) == a <==> leq(a, b) == True;
+{
+}
+
+lemma P34()
+  ensures forall a, b :: min(a, b) == b <==> leq(b, a) == True;
+{
+}
+
+lemma P35()
+  ensures forall xs :: dropWhileAlways(AlwaysFalseFunction(), xs) == xs;
+{
+}
+
+lemma P36()
+  ensures forall xs :: takeWhileAlways(AlwaysTrueFunction(), xs) == xs;
+{
+}
+
+lemma P37()
+  ensures forall x, xs :: not(mem(x, delete(x, xs))) == True;
+{
+}
+
+lemma P38()
+  ensures forall n, xs :: count(n, concat(xs, Cons(n, Nil))) == Suc(count(n, xs));
+{
+}
+
+lemma P39()
+  ensures forall n, x, xs ::
+            add(count(n, Cons(x, Nil)), count(n, xs)) == count(n, Cons(x, xs));
+{
+}
+
+lemma P40()
+  ensures forall xs :: take(Zero, xs) == Nil;
+{
+}
+
+lemma P41()
+  ensures forall n, xs, f :: take(n, apply(f, xs)) == apply(f, take(n, xs));
+{
+}
+
+lemma P42()
+  ensures forall n, x, xs :: take(Suc(n), Cons(x, xs)) == Cons(x, take(n, xs));
+{
+}
+
+lemma P43(p: Nat -> Nat)
+  ensures forall xs :: concat(takeWhileAlways(p, xs), dropWhileAlways(p, xs)) == xs;
+{
+}
+
+lemma P44()
+  ensures forall x, xs, ys :: zip(Cons(x, xs), ys) == zipConcat(x, xs, ys);
+{
+}
+
+lemma P45()
+  ensures forall x, xs, y, ys ::
+            zip(Cons(x, xs), Cons(y, ys)) ==
+            PCons(Pair.Pair(x, y), zip(xs, ys));
+{
+}
+
+lemma P46()
+  ensures forall ys :: zip(Nil, ys) == PNil;
+{
+}
+
+lemma P47()
+  ensures forall a :: height(mirror(a)) == height(a);
+{
+  // proving this theorem requires a previously proved lemma:
+  P23();
+}
+
+// ...
+
+lemma P54()
+  ensures forall m, n :: minus(add(m, n), n) == m;
+{
+  // the proof of this theorem follows from two lemmas:
+  assert forall m, n {:autotriggers false} :: minus(add(n, m), n) == m; // FIXME: Why does Autotriggers false make things verify?
+  assert forall m, n :: add(m, n) == add(n, m);
+}
+
+lemma P65()
+  ensures forall i, m :: less(i, Suc(add(m, i))) == True;
+{
+  if (*) {
+    // the proof of this theorem follows from two lemmas:
+    assert forall i, m {:autotriggers false} :: less(i, Suc(add(i, m))) == True; // FIXME: Why does Autotriggers false make things verify?
+    assert forall m, n :: add(m, n) == add(n, m);
+  } else {
+    // a different way to prove it uses the following lemma:
+    assert forall x,y :: add(x, Suc(y)) == Suc(add(x,y));
+  }
+}
+
+lemma P67()
+  ensures forall m, n :: leq(n, add(m, n)) == True;
+{
+  if (*) {
+    // the proof of this theorem follows from two lemmas:
+    assert forall m, n {:autotriggers false} :: leq(n, add(n, m)) == True; // FIXME: Why does Autotriggers false make things verify?
+    assert forall m, n :: add(m, n) == add(n, m);
+  } else {
+    // a different way to prove it uses the following lemma:
+    assert forall x,y :: add(x, Suc(y)) == Suc(add(x,y));
+  }
+}
+
+// ---------
+// Here is a alternate way of writing down the proof obligations:
+
+lemma P1_alt(n: Nat, xs: List)
+  ensures concat(take(n, xs), drop(n, xs)) == xs;
+{
+}
+
+lemma P2_alt(n: Nat, xs: List, ys: List)
+  ensures add(count(n, xs), count(n, ys)) == count(n, (concat(xs, ys)));
+{
+}
+
+// ---------
+
+lemma {:isolate_assertions} Lemma_RevConcat(xs: List, ys: List)
+  ensures reverse(concat(xs, ys)) == concat(reverse(ys), reverse(xs));
+{
+  match (xs) {
+    case Nil =>
+      assert forall ws :: concat(ws, Nil) == ws;
+    case Cons(t, rest) =>
+      assert forall a, b, c :: concat(a, concat(b, c)) == concat(concat(a, b), c);
+  }
+}
+
+lemma Theorem(xs: List)
+  ensures reverse(reverse(xs)) == xs;
+{
+  match (xs) {
+    case Nil =>
+    case Cons(t, rest) =>
+      Lemma_RevConcat(reverse(rest), Cons(t, Nil));
+  }
+}
diff --git a/Test/dafny1/Rippling.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Rippling.legacy.dfy.expect
similarity index 100%
rename from Test/dafny1/Rippling.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Rippling.legacy.dfy.expect
diff --git a/Test/dafny1/SchorrWaite-stages.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite-stages.dfy
similarity index 99%
rename from Test/dafny1/SchorrWaite-stages.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite-stages.dfy
index 92709e3ec3e..e5ed5eaa8d7 100644
--- a/Test/dafny1/SchorrWaite-stages.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite-stages.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // Schorr-Waite algorithms, written and verified in Dafny.
 // Rustan Leino
diff --git a/Test/dafny1/pow2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite-stages.dfy.expect
similarity index 100%
rename from Test/dafny1/pow2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite-stages.dfy.expect
diff --git a/Test/dafny1/SchorrWaite.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite.dfy
similarity index 98%
rename from Test/dafny1/SchorrWaite.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite.dfy
index a1b7640071f..640bea35d5a 100644
--- a/Test/dafny1/SchorrWaite.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --performance-stats=1 --bprint=%t.bpl
+
 
 // Rustan Leino
 // 7 November 2008
@@ -166,7 +166,7 @@ ghost predicate ReachableVia(source: Node, older p: Path, sink: Node, S: set<Nod
   case Extend(prefix, n) => n in S && sink in n.children && ReachableVia(source, prefix, n, S)
 }
 
-method SchorrWaite(root: Node, ghost S: set<Node>)
+method {:isolate_assertions} SchorrWaite(root: Node, ghost S: set<Node>)
   requires root in S
   // S is closed under 'children':
   requires forall n :: n in S ==>
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite.dfy.expect
new file mode 100644
index 00000000000..7d2687dfa4b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 272 verified, 0 errors
+Total resources used is 27749890
+Max resources used by VC is 2181911
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite.dfy.refresh.expect
new file mode 100644
index 00000000000..c74d09b8015
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SchorrWaite.dfy.refresh.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 276 verified, 0 errors
+Total resources used is 28898941
+Max resources used by VC is 1253781
diff --git a/Test/dafny1/SeparationLogicList.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SeparationLogicList.dfy
similarity index 98%
rename from Test/dafny1/SeparationLogicList.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SeparationLogicList.dfy
index 5080c1d8c29..f5c3fea0645 100644
--- a/Test/dafny1/SeparationLogicList.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SeparationLogicList.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // This file contains three variations of the separation-logic lseg linked-list example.
 
diff --git a/Test/dafny1/SeparationLogicList.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SeparationLogicList.dfy.expect
similarity index 100%
rename from Test/dafny1/SeparationLogicList.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SeparationLogicList.dfy.expect
diff --git a/Test/dafny1/Substitution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Substitution.dfy
similarity index 96%
rename from Test/dafny1/Substitution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Substitution.dfy
index 4af89fa062b..43888a02777 100644
--- a/Test/dafny1/Substitution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Substitution.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"
+// RUN: %verify --allow-deprecation --manual-triggers "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype List = Nil | Cons(Expr, List)
diff --git a/Test/dafny1/Substitution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Substitution.dfy.expect
similarity index 100%
rename from Test/dafny1/Substitution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/Substitution.dfy.expect
diff --git a/Test/dafny1/SumOfCubes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SumOfCubes.dfy
similarity index 95%
rename from Test/dafny1/SumOfCubes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SumOfCubes.dfy
index 9ef58eeeff5..83343c5df51 100644
--- a/Test/dafny1/SumOfCubes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SumOfCubes.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 class SumOfCubes {
   static ghost function SumEmUp(n: int, m: int): int
diff --git a/Test/dafny1/SumOfCubes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SumOfCubes.dfy.expect
similarity index 100%
rename from Test/dafny1/SumOfCubes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/SumOfCubes.dfy.expect
diff --git a/Test/dafny1/TerminationDemos.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/TerminationDemos.dfy
similarity index 95%
rename from Test/dafny1/TerminationDemos.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/TerminationDemos.dfy
index 55ea126a3c0..bc4fbc08e54 100644
--- a/Test/dafny1/TerminationDemos.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/TerminationDemos.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class Example {
   method M(n: int)
diff --git a/Test/dafny3/Paulson.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/TerminationDemos.dfy.expect
similarity index 100%
rename from Test/dafny3/Paulson.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/TerminationDemos.dfy.expect
diff --git a/Test/dafny1/TreeDatatype.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/TreeDatatype.dfy
similarity index 94%
rename from Test/dafny1/TreeDatatype.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/TreeDatatype.dfy
index 398b259d645..90c4b921895 100644
--- a/Test/dafny1/TreeDatatype.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/TreeDatatype.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // ------------------ generic list, non-generic tree
 
diff --git a/Test/dafny1/TreeDatatype.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/TreeDatatype.dfy.expect
similarity index 100%
rename from Test/dafny1/TreeDatatype.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/TreeDatatype.dfy.expect
diff --git a/Test/dafny1/UltraFilter.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/UltraFilter.dfy
similarity index 96%
rename from Test/dafny1/UltraFilter.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/UltraFilter.dfy
index e5b8eb834c1..89c7306d350 100644
--- a/Test/dafny1/UltraFilter.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/UltraFilter.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // ultra filter
 
diff --git a/Test/dafny1/UltraFilter.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/UltraFilter.dfy.expect
similarity index 100%
rename from Test/dafny1/UltraFilter.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/UltraFilter.dfy.expect
diff --git a/Test/dafny1/UnboundedStack.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/UnboundedStack.dfy
similarity index 96%
rename from Test/dafny1/UnboundedStack.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/UnboundedStack.dfy
index 0fa9d528e10..9b5b8bfcce2 100644
--- a/Test/dafny1/UnboundedStack.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/UnboundedStack.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class UnboundedStack<T> {
   ghost var representation: set<object>
diff --git a/Test/dafny1/UnboundedStack.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/UnboundedStack.dfy.expect
similarity index 100%
rename from Test/dafny1/UnboundedStack.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/UnboundedStack.dfy.expect
diff --git a/Test/dafny1/pow2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/pow2.dfy
similarity index 89%
rename from Test/dafny1/pow2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/pow2.dfy
index 823e0e5da6d..da4a9600aec 100644
--- a/Test/dafny1/pow2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/pow2.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // This is a Dafny adaptation of a Coq program by David Pichardie.
 
diff --git a/Test/dafny2/TreeBarrier.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/pow2.dfy.expect
similarity index 100%
rename from Test/dafny2/TreeBarrier.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny1/pow2.dfy.expect
diff --git a/Test/dafny2/COST-verif-comp-2011-1-MaxArray.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-1-MaxArray.dfy
similarity index 97%
rename from Test/dafny2/COST-verif-comp-2011-1-MaxArray.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-1-MaxArray.dfy
index 7ad77adb54c..9cb7274bb3a 100644
--- a/Test/dafny2/COST-verif-comp-2011-1-MaxArray.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-1-MaxArray.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 /*
 Rustan Leino, 5 Oct 2011
diff --git a/Test/dafny4/Issue09.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-1-MaxArray.dfy.expect
similarity index 100%
rename from Test/dafny4/Issue09.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-1-MaxArray.dfy.expect
diff --git a/Test/dafny2/COST-verif-comp-2011-2-MaxTree-class.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-2-MaxTree-class.dfy
similarity index 98%
rename from Test/dafny2/COST-verif-comp-2011-2-MaxTree-class.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-2-MaxTree-class.dfy
index eecff85e8ab..cf36e5677a2 100644
--- a/Test/dafny2/COST-verif-comp-2011-2-MaxTree-class.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-2-MaxTree-class.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 /*
 Rustan Leino, 5 Oct 2011
diff --git a/Test/dafny2/COST-verif-comp-2011-2-MaxTree-class.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-2-MaxTree-class.dfy.expect
similarity index 100%
rename from Test/dafny2/COST-verif-comp-2011-2-MaxTree-class.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-2-MaxTree-class.dfy.expect
diff --git a/Test/dafny2/COST-verif-comp-2011-2-MaxTree-datatype.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-2-MaxTree-datatype.dfy
similarity index 96%
rename from Test/dafny2/COST-verif-comp-2011-2-MaxTree-datatype.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-2-MaxTree-datatype.dfy
index 59790186194..657aa343ff2 100644
--- a/Test/dafny2/COST-verif-comp-2011-2-MaxTree-datatype.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-2-MaxTree-datatype.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // This Dafny program was inspired by Claude Marche's Why3ML program that solves
 // Challenge 2 of the COST Verification Competition.  It particular, it uses an
diff --git a/Test/dafny2/TreeFill.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-2-MaxTree-datatype.dfy.expect
similarity index 100%
rename from Test/dafny2/TreeFill.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-2-MaxTree-datatype.dfy.expect
diff --git a/Test/dafny2/COST-verif-comp-2011-3-TwoDuplicates.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-3-TwoDuplicates.dfy
similarity index 98%
rename from Test/dafny2/COST-verif-comp-2011-3-TwoDuplicates.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-3-TwoDuplicates.dfy
index bbf0b0f5515..7fa011cfaa4 100644
--- a/Test/dafny2/COST-verif-comp-2011-3-TwoDuplicates.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-3-TwoDuplicates.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 /*
 Rustan Leino, 5 Oct 2011
diff --git a/Test/dafny4/Bug54.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-3-TwoDuplicates.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug54.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-3-TwoDuplicates.dfy.expect
diff --git a/Test/dafny2/COST-verif-comp-2011-4-FloydCycleDetect.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-4-FloydCycleDetect.dfy
similarity index 99%
rename from Test/dafny2/COST-verif-comp-2011-4-FloydCycleDetect.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-4-FloydCycleDetect.dfy
index 39389077103..8064a5c49b3 100644
--- a/Test/dafny2/COST-verif-comp-2011-4-FloydCycleDetect.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-4-FloydCycleDetect.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 /*
diff --git a/Test/dafny2/COST-verif-comp-2011-4-FloydCycleDetect.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-4-FloydCycleDetect.dfy.expect
similarity index 100%
rename from Test/dafny2/COST-verif-comp-2011-4-FloydCycleDetect.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/COST-verif-comp-2011-4-FloydCycleDetect.dfy.expect
diff --git a/Test/dafny2/CalcDefaultMainOperator.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/CalcDefaultMainOperator.dfy
similarity index 96%
rename from Test/dafny2/CalcDefaultMainOperator.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/CalcDefaultMainOperator.dfy
index 7c816daa7f7..2cb88707408 100644
--- a/Test/dafny2/CalcDefaultMainOperator.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/CalcDefaultMainOperator.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /env:0 /rprint:- "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --rprint:-
+
 
 lemma TestBool(F: bool, T: bool)
   requires F==false && T==true
diff --git a/Test/dafny2/CalcDefaultMainOperator.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/CalcDefaultMainOperator.dfy.expect
similarity index 90%
rename from Test/dafny2/CalcDefaultMainOperator.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/CalcDefaultMainOperator.dfy.expect
index b8bfa411dfa..e6b60452063 100644
--- a/Test/dafny2/CalcDefaultMainOperator.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/CalcDefaultMainOperator.dfy.expect
@@ -25,7 +25,7 @@ module _System {
   */
 
   class {:compile false} array<arg> {
-    var Length: int  // immutable
+    const Length: int
   }
   /*-- non-null type
   type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
@@ -63,21 +63,23 @@ module _System {
     | f.requires()
     /*special witness*/
 
-  datatype {:compile false} /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
 
   type bool { }
 
+  type char { }
+
   type int { }
 
   type real {
-    var Floor: int  // immutable
+    const Floor: int
   }
 
   type ORDINAL {
-    var IsLimit: bool  // immutable
-    var IsSucc: bool  // immutable
-    var Offset: int  // immutable
-    var IsNat: bool  // immutable
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
   }
 
   type _bv {
@@ -86,19 +88,27 @@ module _System {
     function RotateRight(w: nat): selftype
   }
 
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
   type map<+T, +U> {
-    var Keys: set<T>  // immutable
-    var Values: set<U>  // immutable
-    var Items: set<(T, U)>  // immutable
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
   }
 
   type imap<*T, +U> {
-    var Keys: iset<T>  // immutable
-    var Values: iset<U>  // immutable
-    var Items: iset<(T, U)>  // immutable
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
   }
 
-  datatype {:compile false} /*_tuple#0*/ () = _#Make0
+  datatype /*_tuple#0*/ () = _#Make0
 }
 // bitvector types in use:
 */
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Calculations.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Calculations.dfy
new file mode 100644
index 00000000000..ecf9db84e66
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Calculations.dfy
@@ -0,0 +1,284 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
+
+/* Lists */
+// Here are some standard definitions of List and functions on Lists
+
+datatype List<T> = Nil | Cons(T, List)
+
+ghost function length(l: List): nat
+{
+  match l
+  case Nil => 0
+  case Cons(x, xs) => 1 + length(xs)
+}
+
+ghost function concat(l: List, ys: List): List
+{
+  match l
+  case Nil => ys
+  case Cons(x, xs) => Cons(x, concat(xs, ys))
+}
+
+ghost function reverse(l: List): List
+{
+  match l
+  case Nil => Nil
+  case Cons(x, xs) => concat(reverse(xs), Cons(x, Nil))
+}
+
+ghost function revacc(l: List, acc: List): List
+{
+  match l
+  case Nil => acc
+  case Cons(x, xs) => revacc(xs, Cons(x, acc))
+}
+
+ghost function qreverse(l: List): List
+{
+  revacc(l, Nil)
+}
+
+// Here are two lemmas about the List functions.
+
+lemma Lemma_ConcatNil(xs : List)
+  ensures concat(xs, Nil) == xs;
+{
+}
+
+lemma Lemma_RevCatCommute(xs : List)
+  ensures forall ys, zs :: revacc(xs, concat(ys, zs)) == concat(revacc(xs, ys), zs);
+{
+  forall ys, zs
+    ensures revacc(xs, concat(ys, zs)) == concat(revacc(xs, ys), zs)
+  {
+    match xs
+    case Nil =>
+    case Cons(_, xs') =>
+      Lemma_RevCatCommute(xs');
+  }
+}
+
+// Here is a theorem that says "qreverse" and "reverse" calculate the same result.  The proof
+// is given in a calculational style.  The proof is not minimal--some lines can be omitted
+// and Dafny will still fill in the details.
+
+lemma Theorem_QReverseIsCorrect_Calc(l: List)
+  ensures qreverse(l) == reverse(l);
+{
+  calc {
+    qreverse(l);
+    // def. qreverse
+    revacc(l, Nil);
+    { Lemma_Revacc_calc(l, Nil); }
+    concat(reverse(l), Nil);
+    { Lemma_ConcatNil(reverse(l)); }
+    reverse(l);
+  }
+}
+
+lemma Lemma_Revacc_calc(xs: List, ys: List)
+  ensures revacc(xs, ys) == concat(reverse(xs), ys);
+{
+  match (xs) {
+    case Nil =>
+    case Cons(x, xrest) =>
+      calc {
+        concat(reverse(xs), ys);
+        // def. reverse
+        concat(concat(reverse(xrest), Cons(x, Nil)), ys);
+        // induction hypothesis: Lemma_Revacc_calc(xrest, Cons(x, Nil))
+        concat(revacc(xrest, Cons(x, Nil)), ys);
+        { Lemma_RevCatCommute(xrest); } // forall xs,ys,zs :: revacc(xs, concat(ys, zs)) == concat(revacc(xs, ys), zs)
+        revacc(xrest, concat(Cons(x, Nil), ys));
+        // def. concat (x2)
+        revacc(xrest, Cons(x, ys));
+        // def. revacc
+        revacc(xs, ys);
+      }
+  }
+}
+
+// Here is a version of the same proof, as it was constructed before Dafny's "calc" construct.
+
+lemma Theorem_QReverseIsCorrect(l: List)
+  ensures qreverse(l) == reverse(l);
+{
+  assert qreverse(l)
+      == // def. qreverse
+         revacc(l, Nil);
+  Lemma_Revacc(l, Nil);
+  assert revacc(l, Nil)
+      == concat(reverse(l), Nil);
+  Lemma_ConcatNil(reverse(l));
+}
+
+lemma Lemma_Revacc(xs: List, ys: List)
+  ensures revacc(xs, ys) == concat(reverse(xs), ys);
+{
+  match (xs) {
+    case Nil =>
+    case Cons(x, xrest) =>
+      assert revacc(xs, ys)
+          == // def. revacc
+              revacc(xrest, Cons(x, ys));
+
+      assert concat(reverse(xs), ys)
+          == // def. reverse
+              concat(concat(reverse(xrest), Cons(x, Nil)), ys)
+          == // induction hypothesis:  Lemma_Revacc(xrest, Cons(x, Nil))
+              concat(revacc(xrest, Cons(x, Nil)), ys);
+          Lemma_RevCatCommute(xrest);  // forall xs,ys,zs :: revacc(xs, concat(ys, zs)) == concat(revacc(xs, ys), zs)
+      assert concat(revacc(xrest, Cons(x, Nil)), ys)
+          == revacc(xrest, concat(Cons(x, Nil), ys));
+
+      assert forall g: _T0, gs :: concat(Cons(g, Nil), gs) == Cons(g, gs);
+
+      assert revacc(xrest, concat(Cons(x, Nil), ys))
+          == // the assert lemma just above
+              revacc(xrest, Cons(x, ys));
+  }
+}
+
+/* Fibonacci */
+// To further demonstrate what the "calc" construct can do, here are some proofs about the Fibonacci function.
+
+ghost function Fib(n: nat): nat
+{
+  if n < 2 then n else Fib(n - 2) + Fib(n - 1)
+}
+
+lemma Lemma_Fib()
+  ensures Fib(5) < 6;
+{
+  calc {
+    Fib(5);
+    Fib(4) + Fib(3);
+  <
+    calc {
+      Fib(2);
+      Fib(0) + Fib(1);
+      0 + 1;
+      1;
+    }
+    6;
+  }
+}
+
+/* List length */
+// Here are some proofs that show the use of nested calculations.
+
+lemma Lemma_Concat_Length(xs: List, ys: List)
+  ensures length(concat(xs, ys)) == length(xs) + length(ys);
+{}
+
+lemma Lemma_Reverse_Length(xs: List)
+  ensures length(xs) == length(reverse(xs));
+{
+  match (xs) {
+    case Nil =>
+    case Cons(x, xrest) =>
+      calc {
+        length(reverse(xs));
+        // def. reverse
+        length(concat(reverse(xrest), Cons(x, Nil)));
+        { Lemma_Concat_Length(reverse(xrest), Cons(x, Nil)); }
+        length(reverse(xrest)) + length(Cons(x, Nil));
+        // induction hypothesis
+        length(xrest) + length(Cons(x, Nil));
+        calc {
+          length(Cons(x, Nil));
+          // def. length
+          // 1 + length(Nil);  // ambigious type parameter
+          // def. length
+          1 + 0;
+          1;
+        }
+        length(xrest) + 1;
+        // def. length
+        length(xs);
+      }
+  }
+}
+
+lemma Window(xs: List, ys: List)
+  ensures length(xs) == length(ys) ==> length(reverse(xs)) == length(reverse(ys));
+{
+  calc {
+    length(xs) == length(ys) ==> length(reverse(xs)) == length(reverse(ys));
+    { if (length(xs) == length(ys)) {
+      calc {
+        length(reverse(xs));
+        { Lemma_Reverse_Length(xs); }
+        length(xs);
+        length(ys);
+        { Lemma_Reverse_Length(ys); }
+        length(reverse(ys));
+    } } }
+    length(xs) == length(ys) ==> length(reverse(xs)) == length(reverse(xs));
+    true;
+  }
+}
+
+// In the following we use a combination of calc and forall
+
+ghost function ith<a>(xs: List, i: nat): a
+  requires i < length(xs);
+{
+  match xs
+  case Cons(x, xrest) => if i == 0 then x else ith(xrest, i - 1)
+}
+
+lemma lemma_zero_length(xs: List)
+  ensures length(xs) == 0 <==> xs.Nil?;
+{}
+
+lemma lemma_extensionality(xs: List, ys: List)
+  requires length(xs) == length(ys); // (0)
+  requires forall i: nat | i < length(xs) :: ith(xs, i) == ith(ys, i); // (1)
+  ensures xs == ys;
+{
+  match xs {
+    case Nil =>
+      calc {
+        true;
+        // (0)
+        length(xs) == length(ys);
+        0 == length(ys);
+        { lemma_zero_length(ys); }
+        Nil == ys;
+        xs == ys;
+      }
+    case Cons(x, xrest) =>
+      match ys {
+        case Cons(y, yrest) =>
+          calc {
+            xs;
+            Cons(x, xrest);
+            calc {
+              x;
+              ith(xs, 0);
+              // (1) with i = 0
+              ith(ys, 0);
+              y;
+            }
+            Cons(y, xrest);
+            {
+              forall (j: nat | j < length(xrest)) {
+                calc {
+                  ith(xrest, j);
+                  ith(xs, j + 1);
+                  // (1) with i = j + 1
+                  ith(ys, j + 1);
+                  ith(yrest, j);
+                }
+              }
+              lemma_extensionality(xrest, yrest);
+            }
+            Cons(y, yrest);
+            ys;
+          }
+      }
+  }
+}
+
diff --git a/Test/dafny2/Calculations.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Calculations.dfy.expect
similarity index 100%
rename from Test/dafny2/Calculations.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Calculations.dfy.expect
diff --git a/Test/dafny2/Classics.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Classics.dfy
similarity index 97%
rename from Test/dafny2/Classics.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Classics.dfy
index 8b53c31e5c6..6a16dbca0a4 100644
--- a/Test/dafny2/Classics.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Classics.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // A version of Turing's additive factorial program [Dr. A. Turing, "Checking a large routine",
 // In "Report of a Conference of High Speed Automatic Calculating Machines", pp. 67-69, 1949].
diff --git a/Test/dafny4/git-issue44.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Classics.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue44.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Classics.dfy.expect
diff --git a/Test/dafny2/Intervals.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Intervals.dfy
similarity index 95%
rename from Test/dafny2/Intervals.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Intervals.dfy
index 10763580456..dd3249f1b21 100644
--- a/Test/dafny2/Intervals.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Intervals.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // The RoundDown and RoundUp methods in this file are the ones in the Boogie
 // implementation Source/AbsInt/IntervalDomain.cs.
diff --git a/Test/dafny4/Bug91.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Intervals.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug91.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Intervals.dfy.expect
diff --git a/Test/dafny2/MajorityVote.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MajorityVote.dfy
similarity index 99%
rename from Test/dafny2/MajorityVote.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MajorityVote.dfy
index 612745b7e97..59a03abee7c 100644
--- a/Test/dafny2/MajorityVote.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MajorityVote.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Rustan Leino, June 2012.
 // This file verifies an algorithm, due to Boyer and Moore, that finds the majority choice
diff --git a/Test/dafny2/MajorityVote.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MajorityVote.dfy.expect
similarity index 100%
rename from Test/dafny2/MajorityVote.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MajorityVote.dfy.expect
diff --git a/Test/dafny2/MinWindowMax.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MinWindowMax.dfy
similarity index 96%
rename from Test/dafny2/MinWindowMax.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MinWindowMax.dfy
index 32342cdd8b9..460d7bce2c7 100644
--- a/Test/dafny2/MinWindowMax.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MinWindowMax.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // Minimum window-max problem.
 // Rustan Leino
@@ -25,7 +25,7 @@ method Main() {
   print "Window size 5:  min window-max is ", m, "\n";  // 3
 }
 
-method MinimumWindowMax(a: array<int>, W: int) returns (m: int, start: int)
+method {:resource_limit "100e6"} {:isolate_assertions} MinimumWindowMax(a: array<int>, W: int) returns (m: int, start: int)
   requires 1 <= W <= a.Length
   ensures 0 <= start <= a.Length - W
   ensures m == Max(a, start, W)
diff --git a/Test/dafny2/MinWindowMax.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MinWindowMax.dfy.expect
similarity index 100%
rename from Test/dafny2/MinWindowMax.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MinWindowMax.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MinWindowMax.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MinWindowMax.dfy.rs.check
new file mode 100644
index 00000000000..2f52477d3de
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MinWindowMax.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the type `[DafnyInt]` cannot be indexed by `&DafnyInt`
\ No newline at end of file
diff --git a/Test/dafny2/MonotonicHeapstate.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MonotonicHeapstate.dfy
similarity index 97%
rename from Test/dafny2/MonotonicHeapstate.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MonotonicHeapstate.dfy
index 4be63d2b638..0f666e6e506 100644
--- a/Test/dafny2/MonotonicHeapstate.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MonotonicHeapstate.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 module M0 {
   datatype Kind = Constant | Ident | Binary
diff --git a/Test/lambdas/MatrixAssoc.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MonotonicHeapstate.dfy.expect
similarity index 100%
rename from Test/lambdas/MatrixAssoc.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/MonotonicHeapstate.dfy.expect
diff --git a/Test/dafny2/SegmentSum.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SegmentSum.dfy
similarity index 90%
rename from Test/dafny2/SegmentSum.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SegmentSum.dfy
index 2044ad37ac8..22d8cca1300 100644
--- a/Test/dafny2/SegmentSum.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SegmentSum.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost function Sum(a: seq<int>, s: int, t: int): int
   requires 0 <= s <= t <= |a|
diff --git a/Test/dafny2/TuringFactorial.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SegmentSum.dfy.expect
similarity index 100%
rename from Test/dafny2/TuringFactorial.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SegmentSum.dfy.expect
diff --git a/Test/dafny2/SmallestMissingNumber-functional.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-functional.dfy
similarity index 83%
rename from Test/dafny2/SmallestMissingNumber-functional.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-functional.dfy
index a1544efab5f..e043c61f78d 100644
--- a/Test/dafny2/SmallestMissingNumber-functional.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-functional.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler "%s" -- --allow-warnings --relax-definite-assignment
 
 // Smallest missing number problem, functional version without duplicates.
 // A purely functional solution to the programming problem in Richard Bird's
@@ -90,7 +90,7 @@ function SMN''(xs: List<nat>, n: nat, len: nat): nat
       SMN''(R, n + llen, len - llen)
 }
 
-function Split(xs: List<nat>, b: nat): (List<nat>, List<nat>)
+opaque function Split(xs: List<nat>, b: nat): (List<nat>, List<nat>)
   ensures var r := Split(xs, b); Length(xs) == Length(r.0) + Length(r.1)
 {
   match xs
@@ -194,10 +194,20 @@ lemma Split_Correct(xs: List<nat>, b: nat)
     Elements(r.1) == (set x | x in Elements(xs) && b <= x) &&
     NoDuplicates(r.0) && NoDuplicates(r.1)
 {
+  var split := Split(xs, b);
+  reveal Split();
   match xs
   case Nil =>
-  case Cons(_, tail) =>
+    assert split == (Nil, Nil);
+    assert Elements(split.0) == {};
+  case Cons(x, tail) =>
     Split_Correct(tail, b);
+    var (L, R) := Split(tail, b);
+    if x < b {
+      assert split == (Cons(x, L), R);
+    } else {
+      assert split == (L, Cons(x, R));
+    }
 }
 
 lemma Elements_Property(xs: List)
@@ -206,17 +216,18 @@ lemma Elements_Property(xs: List)
 {
 }
 
-ghost function IntRange(lo: nat, len: nat): set<nat>
-  ensures |IntRange(lo, len)| == len
+opaque ghost function IntRange(lo: nat, len: nat): (s: set<nat>)
+  ensures |s| == len
+  ensures forall x :: x in s <==> lo <= x < lo + len
+  decreases len
 {
-  var S := set x | lo <= x < lo + len;
-  assert len != 0 ==> S == IntRange(lo, len - 1) + {lo+len-1};
-  S
+  if len == 0 then {} else
+    IntRange (lo + 1, len - 1) + {lo}
 }
 
 // ----- Proofs of alternative versions
 
-lemma {:vcs_split_on_every_assert} SMN'_Correct(xs: List<nat>, n: nat, len: nat)
+lemma {:induction false} SMN'_Correct(xs: List<nat>, n: nat, len: nat)
   requires NoDuplicates(xs)
   requires forall x :: x in Elements(xs) ==> n <= x
   requires len == Length(xs)
@@ -238,20 +249,27 @@ lemma {:vcs_split_on_every_assert} SMN'_Correct(xs: List<nat>, n: nat, len: nat)
     if llen < half {
       SMN'_Correct(L, n, llen);
     } else {
-      var s := SMN'(R, n + llen, len - llen);
+      var s := SMN'(xs, n, len);
       SMN'_Correct(R, n + llen, len - llen);
-      forall x | n <= x < s
-        ensures x in Elements(xs)
-      {
-        if x < n + llen {
-          SetEquality(Elements(L), bound);
+      assert n <= s <= n + len by {
+      }
+      assert s !in Elements(xs) by {
+      }
+      assert forall x :: n <= x < s ==> x in Elements(xs) by {
+        var t := SMN'(R, n + llen, len - llen);
+        forall x | n <= x < t
+          ensures x in Elements(xs)
+        {
+          if x < n + llen {
+            SetEquality(Elements(L), bound);
+          }
         }
       }
     }
   }
 }
 
-lemma {:vcs_split_on_every_assert} SMN''_Correct(xs: List<nat>, n: nat, len: nat)
+lemma {:induction false} {:isolate_assertions} SMN''_Correct(xs: List<nat>, n: nat, len: nat)
   requires NoDuplicates(xs)
   requires forall x :: x in Elements(xs) ==> n <= x
   requires len == Length(xs)
diff --git a/Test/dafny2/SmallestMissingNumber-functional.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-functional.dfy.expect
similarity index 100%
rename from Test/dafny2/SmallestMissingNumber-functional.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-functional.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-functional.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-functional.dfy.rs.check
new file mode 100644
index 00000000000..172ffa95066
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-functional.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Coercion\ from\ ::std::rc::Rc<super::_module::List<::dafny_runtime::DafnyInt>>\ to\ ::std::rc::Rc<super::_module::List<super::_System::nat>></i>.*
\ No newline at end of file
diff --git a/Test/dafny2/SmallestMissingNumber-imperative.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-imperative.dfy
similarity index 100%
rename from Test/dafny2/SmallestMissingNumber-imperative.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-imperative.dfy
diff --git a/Test/dafny2/SmallestMissingNumber-imperative.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-imperative.dfy.expect
similarity index 100%
rename from Test/dafny2/SmallestMissingNumber-imperative.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-imperative.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-imperative.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-imperative.dfy.rs.check
new file mode 100644
index 00000000000..c17262a423d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SmallestMissingNumber-imperative.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>ForLoops</i>.*
\ No newline at end of file
diff --git a/Test/dafny2/SnapshotableTrees.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SnapshotableTrees.dfy
similarity index 98%
rename from Test/dafny2/SnapshotableTrees.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SnapshotableTrees.dfy
index a9d5459420b..ee0308e3f67 100644
--- a/Test/dafny2/SnapshotableTrees.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SnapshotableTrees.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:3 /proverOpt:O:smt.qi.eager_threshold=80 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %run --solver-option="O:smt.qi.eager_threshold=80" "%s" > "%t"
 // re-enable the following before long
 // %diff "%s.expect" "%t"
 
@@ -580,7 +580,7 @@ module SnapTree {
     }
 
     // private
-    static method {:vcs_split_on_every_assert} Push(stIn: List, ghost n: int, p: Node, ghost C: seq<int>, ghost Nodes: set<object>) returns (st: List)
+    static method {:isolate_assertions} Push(stIn: List, ghost n: int, p: Node, ghost C: seq<int>, ghost Nodes: set<object>) returns (st: List)
       requires p in Nodes && p.Repr <= Nodes && p.NodeValid()
       requires 0 <= n <= |C|
       requires p.Contents <= C[n..]
@@ -607,7 +607,7 @@ module SnapTree {
       case Cons(y, rest) => x := y.data;
     }
 
-    method {:vcs_split_on_every_assert} MoveNext() returns (hasCurrent: bool)
+    method {:isolate_assertions} MoveNext() returns (hasCurrent: bool)
       requires Valid() && N <= |Contents|
       modifies IterRepr
       ensures Valid() && fresh(IterRepr - old(IterRepr)) && T.Repr == old(T.Repr)
diff --git a/Test/dafny2/SnapshotableTrees.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SnapshotableTrees.dfy.expect
similarity index 100%
rename from Test/dafny2/SnapshotableTrees.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/SnapshotableTrees.dfy.expect
diff --git a/Test/dafny2/StoreAndRetrieve.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/StoreAndRetrieve.dfy
similarity index 95%
rename from Test/dafny2/StoreAndRetrieve.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/StoreAndRetrieve.dfy
index f19239e234a..d433bf55bd9 100644
--- a/Test/dafny2/StoreAndRetrieve.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/StoreAndRetrieve.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-deprecation --relax-definite-assignment
 
 // This file shows an example program that uses both refinement and :autocontracts
 // specify a class that stores a set of things that can be retrieved using a query.
diff --git a/Test/dafny2/StoreAndRetrieve.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/StoreAndRetrieve.dfy.expect
similarity index 100%
rename from Test/dafny2/StoreAndRetrieve.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/StoreAndRetrieve.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/StoreAndRetrieve.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/StoreAndRetrieve.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/StoreAndRetrieve.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny4/Leq.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/StoreAndRetrieve.dfy.verifier.expect
similarity index 100%
rename from Test/dafny4/Leq.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/StoreAndRetrieve.dfy.verifier.expect
diff --git a/Test/dafny2/TreeBarrier.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TreeBarrier.dfy
similarity index 97%
rename from Test/dafny2/TreeBarrier.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TreeBarrier.dfy
index 2f1f31ef681..167bff5b6a5 100644
--- a/Test/dafny2/TreeBarrier.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TreeBarrier.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class Node {
   var left: Node?
diff --git a/Test/dafny3/Dijkstra.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TreeBarrier.dfy.expect
similarity index 100%
rename from Test/dafny3/Dijkstra.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TreeBarrier.dfy.expect
diff --git a/Test/dafny2/TreeFill.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TreeFill.dfy
similarity index 88%
rename from Test/dafny2/TreeFill.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TreeFill.dfy
index 16c9bc3012b..97a7655b07a 100644
--- a/Test/dafny2/TreeFill.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TreeFill.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype Tree<T> = Leaf | Node(Tree, T, Tree)
 
diff --git a/Test/dafny3/OpaqueTrees.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TreeFill.dfy.expect
similarity index 100%
rename from Test/dafny3/OpaqueTrees.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TreeFill.dfy.expect
diff --git a/Test/dafny2/TuringFactorial.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TuringFactorial.dfy
similarity index 82%
rename from Test/dafny2/TuringFactorial.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TuringFactorial.dfy
index f196b5ce743..3bd52b7dd39 100644
--- a/Test/dafny2/TuringFactorial.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TuringFactorial.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 ghost function Factorial(n: nat): nat
 {
diff --git a/Test/dafny4/Bug58.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TuringFactorial.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug58.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/TuringFactorial.dfy.expect
diff --git a/Test/dafny2/Z-BirthdayBook.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Z-BirthdayBook.dfy
similarity index 99%
rename from Test/dafny2/Z-BirthdayBook.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Z-BirthdayBook.dfy
index 5f838ac0d22..c7e4e8f9ec2 100644
--- a/Test/dafny2/Z-BirthdayBook.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Z-BirthdayBook.dfy
@@ -1,5 +1,5 @@
 // NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %dafny /compile:3 "%s" > "%t"
+// RUN: %run "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // The birthday book example from the Z Reference Manual
diff --git a/Test/dafny2/Z-BirthdayBook.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Z-BirthdayBook.dfy.expect
similarity index 100%
rename from Test/dafny2/Z-BirthdayBook.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/Z-BirthdayBook.dfy.expect
diff --git a/Test/dafny2/pq-intrinsic-extrinsic.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/pq-intrinsic-extrinsic.dfy
similarity index 94%
rename from Test/dafny2/pq-intrinsic-extrinsic.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/pq-intrinsic-extrinsic.dfy
index 588c2f9e2b1..f658032ab9b 100644
--- a/Test/dafny2/pq-intrinsic-extrinsic.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/pq-intrinsic-extrinsic.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // This file contains several versions of a priority queue implemented by Braun trees:
 //
@@ -219,12 +219,22 @@ module PriorityQueue_extrinsic {
     else
       Node(t.val, Insert(t.right, x), t.left)
   }
-  lemma AboutInsert(t: T, x: int)
+  lemma {:resource_limit "70e6"} AboutInsert(t: T, x: int)
     requires Valid(t)
     ensures var t' := Insert(t, x);
       Valid(t') &&
       Elements(t') == Elements(t) + multiset{x}
   {
+    var t' := Insert(t, x);
+    assert Valid(t') by {
+      if t == Leaf {
+        assert t' == Node(x, Leaf, Leaf);
+      } else if x < t.val {
+        assert t' == Node(x, Insert(t.right, t.val), t.left);
+      } else {
+        assert t' == Node(t.val, Insert(t.right, x), t.left);
+      }
+    }
   }
   function Min(t: T): int
     requires Elements(t) != multiset{}
diff --git a/Test/dafny2/pq-intrinsic-extrinsic.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/pq-intrinsic-extrinsic.dfy.expect
similarity index 100%
rename from Test/dafny2/pq-intrinsic-extrinsic.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/pq-intrinsic-extrinsic.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/pq-intrinsic-extrinsic.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/pq-intrinsic-extrinsic.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny2/pq-intrinsic-extrinsic.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny3/Abstemious.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Abstemious.dfy
similarity index 85%
rename from Test/dafny3/Abstemious.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Abstemious.dfy
index 62d891f950f..258e7be2e6f 100644
--- a/Test/dafny3/Abstemious.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Abstemious.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // Examples from https://www.haskell.org/tutorial/functions.html
 
@@ -143,9 +143,10 @@ greatest lemma OhOnesTail_Correct()
 {
 }
 
-greatest lemma OhOnes_Correct()
+lemma OhOnes_Correct()
   ensures OhOnes() == Cons(0, ones())
 {
+  OhOnesTail_Correct();
 }
 
 lemma OhOnes_Correct'(n: nat)
@@ -205,3 +206,25 @@ lemma Fib_Correct(n: nat)
     }
   }
 }
+
+// --------------- ternary expression is a trigger ---------------
+
+lemma OrdinalLemma(k: ORDINAL)
+  ensures OhOnes().tail ==#[k] ones()
+{
+  // automatic induction on k
+}
+
+lemma NaturalLemma(k: nat)
+  ensures OhOnes().tail ==#[k] ones()
+{
+  // automatic induction on k
+}
+
+lemma Quantifier()
+  // the following quantifiers use the entire body as a trigger (previously, ternary expressions
+  // had not been considered as trigger candidates)
+  requires forall k: nat :: OhOnes().tail ==#[k] ones()
+  requires forall k: ORDINAL :: OhOnes().tail ==#[k] ones()
+{
+}
diff --git a/Test/dafny3/Abstemious.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Abstemious.dfy.expect
similarity index 100%
rename from Test/dafny3/Abstemious.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Abstemious.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Abstemious.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Abstemious.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Abstemious.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny3/AbstemiousErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/AbstemiousErrors.dfy
similarity index 94%
rename from Test/dafny3/AbstemiousErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/AbstemiousErrors.dfy
index 73693b3472f..9d8da6611e3 100644
--- a/Test/dafny3/AbstemiousErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/AbstemiousErrors.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 codatatype Stream<T> = Cons(head: T, tail: Stream<T>)
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/AbstemiousErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/AbstemiousErrors.dfy.expect
new file mode 100644
index 00000000000..bc6fea47a92
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/AbstemiousErrors.dfy.expect
@@ -0,0 +1,7 @@
+AbstemiousErrors.dfy(39,9): Error: cannot prove termination; try supplying a decreases clause (note that calls cannot be co-recursive in this context; perhaps try declaring function 'voraciousAdd' with '{:abstemious}')
+AbstemiousErrors.dfy(47,15): Error: cannot prove termination; try supplying a decreases clause (note that calls cannot be co-recursive in this context; perhaps try declaring function 'voraciousAdd' with '{:abstemious}')
+AbstemiousErrors.dfy(53,21): Error: cannot prove termination; try supplying a decreases clause (note that the call is not sufficiently guarded to be used co-recursively)
+AbstemiousErrors.dfy(60,12): Error: cannot prove termination; try supplying a decreases clause (note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts)
+AbstemiousErrors.dfy(68,19): Error: cannot prove termination; try supplying a decreases clause (note that calls cannot be co-recursive in this context; perhaps try declaring function 'voraciousAdd' with '{:abstemious}')
+
+Dafny program verifier finished with 0 verified, 5 errors
diff --git a/Test/dafny3/CachedContainer.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CachedContainer.dfy
similarity index 98%
rename from Test/dafny3/CachedContainer.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CachedContainer.dfy
index e36e76d6851..66721fe8201 100644
--- a/Test/dafny3/CachedContainer.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CachedContainer.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-deprecation --relax-definite-assignment
 
 // This file contains an example chain of module refinements, starting from a
 // simple interface M0 to an implementation M3. Module Client.Test() is
diff --git a/Test/dafny3/CachedContainer.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CachedContainer.dfy.expect
similarity index 100%
rename from Test/dafny3/CachedContainer.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CachedContainer.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CachedContainer.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CachedContainer.dfy.rs.check
new file mode 100644
index 00000000000..a9c36a1379d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CachedContainer.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `T: Default` is not satisfied
\ No newline at end of file
diff --git a/Test/dafny4/Regression4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CachedContainer.dfy.verifier.expect
similarity index 100%
rename from Test/dafny4/Regression4.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CachedContainer.dfy.verifier.expect
diff --git a/Test/dafny3/CalcExample.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CalcExample.dfy
similarity index 98%
rename from Test/dafny3/CalcExample.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CalcExample.dfy
index 1a979df618a..adf6e5f798e 100644
--- a/Test/dafny3/CalcExample.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CalcExample.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Here is a function "f" and three axioms (that is, unproved lemmas) about "f":
 
diff --git a/Test/dafny4/git-issue235.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CalcExample.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue235.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/CalcExample.dfy.expect
diff --git a/Test/dafny3/Dijkstra.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Dijkstra.dfy
similarity index 95%
rename from Test/dafny3/Dijkstra.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Dijkstra.dfy
index 9a52ce63618..0a07b2ee0a4 100644
--- a/Test/dafny3/Dijkstra.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Dijkstra.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Example taken from:
 // Edsger W. Dijkstra: Heuristics for a Calculational Proof. Inf. Process. Lett. (IPL) 53(3):141-143 (1995)
diff --git a/Test/dafny3/EWD-1062.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Dijkstra.dfy.expect
similarity index 100%
rename from Test/dafny3/EWD-1062.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Dijkstra.dfy.expect
diff --git a/Test/dafny3/EWD-1062.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/EWD-1062.dfy
similarity index 98%
rename from Test/dafny3/EWD-1062.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/EWD-1062.dfy
index 4609e856262..23e1d5cf34d 100644
--- a/Test/dafny3/EWD-1062.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/EWD-1062.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Rustan Leino, 17 Jan 2018.
 // A transcription of a little proof calculation by E.W. Dijkstra, see:
diff --git a/Test/dafny4/git-issue257.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/EWD-1062.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue257.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/EWD-1062.dfy.expect
diff --git a/Test/dafny3/Filter.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Filter.dfy
similarity index 98%
rename from Test/dafny3/Filter.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Filter.dfy
index 8addc752a7d..2c9725bb596 100644
--- a/Test/dafny3/Filter.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Filter.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 codatatype Stream<T> = Cons(head: T, tail: Stream)
@@ -221,7 +221,7 @@ lemma FS_Pong<T>(s: Stream<T>, P: Predicate, x: T, k: nat)
     }
   } else {
     assert fs == Filter(s.tail, P);  // reminder of where we are
-    //FS_Pong(s.tail, h, x, k-1);
+    FS_Pong(s.tail, P, x, k-1);
   }
 }
 
diff --git a/Test/dafny3/Filter.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Filter.dfy.expect
similarity index 100%
rename from Test/dafny3/Filter.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Filter.dfy.expect
diff --git a/Test/dafny3/GenericSort.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/GenericSort.dfy
similarity index 98%
rename from Test/dafny3/GenericSort.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/GenericSort.dfy
index 0be9a36f11b..0f2fefa36ef 100644
--- a/Test/dafny3/GenericSort.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/GenericSort.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 abstract module TotalOrder {
   type T // the type to be compared
diff --git a/Test/dafny4/NipkowKlein-chapter3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/GenericSort.dfy.expect
similarity index 100%
rename from Test/dafny4/NipkowKlein-chapter3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/GenericSort.dfy.expect
diff --git a/Test/dafny3/Inc.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Inc.dfy
similarity index 98%
rename from Test/dafny3/Inc.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Inc.dfy
index b1359907f45..f09d791b97e 100644
--- a/Test/dafny3/Inc.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Inc.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 datatype cmd = Inc | Seq(cmd, cmd) | Repeat(cmd)
 type state = int
diff --git a/Test/dafny3/Inc.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Inc.dfy.expect
similarity index 96%
rename from Test/dafny3/Inc.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Inc.dfy.expect
index 4820521ddb7..cca28a8d4cc 100644
--- a/Test/dafny3/Inc.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Inc.dfy.expect
@@ -20,6 +20,6 @@ Inc.dfy(247,2): Error: a postcondition could not be proved on this return path
 Inc.dfy(244,12): Related location: this is the postcondition that could not be proved
 Inc.dfy(318,17): Error: cannot prove termination; try supplying a decreases clause
 Inc.dfy(318,17): Error: decreases expression at index 1 must be bounded below by 0
-Inc.dfy(303,26): Related location
+Inc.dfy(303,26): Related location: this proposition could not be proved
 
 Dafny program verifier finished with 8 verified, 12 errors
diff --git a/Test/dafny3/InductionVsCoinduction.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/InductionVsCoinduction.dfy
similarity index 96%
rename from Test/dafny3/InductionVsCoinduction.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/InductionVsCoinduction.dfy
index 4e8d78da362..0bb116a1692 100644
--- a/Test/dafny3/InductionVsCoinduction.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/InductionVsCoinduction.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // A definition of a co-inductive datatype Stream, whose values are possibly
 // infinite lists.
@@ -78,7 +78,7 @@ lemma {:induction false} SAppendIsAssociativeK(k:nat, a:Stream, b:Stream, c:Stre
 lemma SAppendIsAssociative(a:Stream, b:Stream, c:Stream)
   ensures SAppend(SAppend(a, b), c) == SAppend(a, SAppend(b, c));
 {
-  forall k:nat { SAppendIsAssociativeK(k, a, b, c); }
+  forall k:nat {:trigger} { SAppendIsAssociativeK(k, a, b, c); }
   // assert for clarity only, postcondition follows directly from it
   assert (forall k:nat {:autotriggers false} :: SAppend(SAppend(a, b), c) ==#[k] SAppend(a, SAppend(b, c))); //FIXME: Should Dafny generate a trigger here? If so then which one?
 }
diff --git a/Test/dafny4/Lucas-down.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/InductionVsCoinduction.dfy.expect
similarity index 100%
rename from Test/dafny4/Lucas-down.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/InductionVsCoinduction.dfy.expect
diff --git a/Test/dafny3/InfiniteTrees.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/InfiniteTrees.dfy
similarity index 99%
rename from Test/dafny3/InfiniteTrees.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/InfiniteTrees.dfy
index dfe83663a5c..015f77bbb39 100644
--- a/Test/dafny3/InfiniteTrees.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/InfiniteTrees.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Here is the usual definition of possibly infinite lists, along with a function Tail(s, n), which drops
diff --git a/Test/dafny3/InfiniteTrees.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/InfiniteTrees.dfy.expect
similarity index 100%
rename from Test/dafny3/InfiniteTrees.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/InfiniteTrees.dfy.expect
diff --git a/Test/dafny3/Iter.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Iter.dfy
similarity index 96%
rename from Test/dafny3/Iter.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Iter.dfy
index 46befa24dd8..04d68eb7baf 100644
--- a/Test/dafny3/Iter.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Iter.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 class List<T> {
   ghost var Contents: seq<T>
diff --git a/Test/dafny3/Iter.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Iter.dfy.expect
similarity index 100%
rename from Test/dafny3/Iter.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Iter.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Iter.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Iter.dfy.rs.check
new file mode 100644
index 00000000000..ca001e7600e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Iter.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Cannot declare local var outside of a statement container: 
\ No newline at end of file
diff --git a/Test/dafny3/OpaqueTrees.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/OpaqueTrees.dfy
similarity index 91%
rename from Test/dafny3/OpaqueTrees.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/OpaqueTrees.dfy
index 4c694b2b37d..6ccb1dc2bfb 100644
--- a/Test/dafny3/OpaqueTrees.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/OpaqueTrees.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype Tree<T> = Leaf(T) | Node(Tree, Tree)
 
diff --git a/Test/dafny4/Circ.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/OpaqueTrees.dfy.expect
similarity index 100%
rename from Test/dafny4/Circ.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/OpaqueTrees.dfy.expect
diff --git a/Test/dafny3/Paulson.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Paulson.dfy
similarity index 98%
rename from Test/dafny3/Paulson.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Paulson.dfy
index 49136108ebd..b0fcc13ec6f 100644
--- a/Test/dafny3/Paulson.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Paulson.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // The following are Dafny versions from Section 8 of
 // "Mechanizing Coinduction and Corecursion in Higher-order Logic"
diff --git a/Test/git-issues/git-issue-1094.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Paulson.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1094.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Paulson.dfy.expect
diff --git a/Test/dafny3/SetIterations.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SetIterations.dfy
similarity index 94%
rename from Test/dafny3/SetIterations.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SetIterations.dfy
index bbc3ff340e5..ce0f04ebefa 100644
--- a/Test/dafny3/SetIterations.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SetIterations.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost function Count<T>(s: set<T>): int
 {
diff --git a/Test/dafny3/Zip.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SetIterations.dfy.expect
similarity index 100%
rename from Test/dafny3/Zip.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SetIterations.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SimpleCoinduction.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SimpleCoinduction.dfy
new file mode 100644
index 00000000000..5ac106cae58
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SimpleCoinduction.dfy
@@ -0,0 +1,127 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+codatatype Stream<T> = Cons(head: T, tail: Stream)
+codatatype IList<T> = Nil | ICons(head: T, tail: IList)
+
+// -----------------------------------------------------------------------
+
+greatest predicate Pos(s: Stream<int>)
+{
+  s.head > 0 && Pos(s.tail)
+}
+
+ghost function Up(n: int): Stream<int>
+{
+  Cons(n, Up(n+1))
+}
+
+ghost function Inc(s: Stream<int>): Stream<int>
+{
+  Cons(s.head + 1, Inc(s.tail))
+}
+
+lemma {:induction false} UpLemma(k: nat, n: int)
+  ensures Inc(Up(n)) ==#[k] Up(n+1)
+{
+  if (k != 0) {
+    UpLemma(k-1, n+1);
+  }
+}
+
+greatest lemma {:induction false} CoUpLemma(n: int)
+  ensures Inc(Up(n)) == Up(n+1)
+{
+  CoUpLemma(n+1);
+}
+
+lemma UpLemma_Auto(k: nat, n: int, nn: int)
+  ensures nn == n+1 ==> Inc(Up(n)) ==#[k] Up(nn)  // note: it would be nice to do an automatic rewrite (from "ensures Inc(Up(n)) ==#[k] Up(n+1)") to obtain the good trigger here
+{
+}
+
+greatest lemma CoUpLemma_Auto(n: int, nn: int)
+  ensures nn == n+1 ==> Inc(Up(n)) == Up(nn)  // see comment above
+{
+}
+
+// -----------------------------------------------------------------------
+
+ghost function Repeat(n: int): Stream<int>
+{
+  Cons(n, Repeat(n))
+}
+
+greatest lemma RepeatLemma(n: int)
+  ensures Inc(Repeat(n)) == Repeat(n+1)
+{
+  RepeatLemma(n);
+}
+
+// -----------------------------------------------------------------------
+
+greatest predicate True(s: Stream)
+{
+  True(s.tail)
+}
+
+greatest lemma AlwaysTrue(s: Stream)
+  ensures True(s)
+{
+}
+
+greatest predicate AlsoTrue(s: Stream)
+{
+  AlsoTrue(s)
+}
+
+greatest lemma AlsoAlwaysTrue(s: Stream)
+  ensures AlsoTrue(s)
+{
+}
+
+greatest predicate TT(y: int)
+{
+  TT(y+1)
+}
+
+greatest lemma AlwaysTT(y: int)
+  ensures TT(y)
+{
+}
+
+// -----------------------------------------------------------------------
+
+ghost function Append(M: IList, N: IList): IList
+{
+  match M
+  case Nil => N
+  case ICons(x, M') => ICons(x, Append(M', N))
+}
+
+ghost function zeros(): IList<int>
+{
+  ICons(0, zeros())
+}
+
+ghost function ones(): IList<int>
+{
+  ICons(1, ones())
+}
+
+greatest predicate AtMost(a: IList<int>, b: IList<int>)
+{
+  match a
+  case Nil => true
+  case ICons(h,t) => b.ICons? && h <= b.head && AtMost(t, b.tail)
+}
+
+greatest lemma ZerosAndOnes_Theorem0()
+  ensures AtMost(zeros(), ones())
+{
+}
+
+greatest lemma ZerosAndOnes_Theorem1()
+  ensures Append(zeros(), ones()) == zeros()
+{
+}
diff --git a/Test/dafny3/SimpleCoinduction.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SimpleCoinduction.dfy.expect
similarity index 100%
rename from Test/dafny3/SimpleCoinduction.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SimpleCoinduction.dfy.expect
diff --git a/Test/dafny3/SimpleInduction.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SimpleInduction.dfy
similarity index 88%
rename from Test/dafny3/SimpleInduction.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SimpleInduction.dfy
index a370a4e5626..0ffe9e2fbe4 100644
--- a/Test/dafny3/SimpleInduction.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SimpleInduction.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 /*
   The well-known Fibonacci function defined in Dafny.  The postcondition of
@@ -10,14 +10,14 @@
   */
 
 ghost function Fib(n: nat): nat
-  decreases n;
+  decreases n
 { if n < 2 then n else Fib(n-2) + Fib(n-1) }
 
 lemma FibLemma(n: nat)
-  ensures Fib(n) % 2 == 0 <==> n % 3 == 0;
-  decreases n;
+  ensures Fib(n) % 2 == 0 <==> n % 3 == 0
+  decreases n
 {
-  if (n < 2) {
+  if n < 2 {
   } else {
     FibLemma(n-2);
     FibLemma(n-1);
@@ -31,7 +31,7 @@ lemma FibLemma(n: nat)
 */
 
 lemma FibLemma_Alternative(n: nat)
-  ensures Fib(n) % 2 == 0 <==> n % 3 == 0;
+  ensures Fib(n) % 2 == 0 <==> n % 3 == 0
 {
   forall k | 0 <= k < n {
     FibLemma_Alternative(k);
@@ -39,7 +39,7 @@ lemma FibLemma_Alternative(n: nat)
 }
 
 lemma FibLemma_All()
-  ensures forall n :: 0 <= n ==> (Fib(n) % 2 == 0 <==> n % 3 == 0);
+  ensures forall n :: 0 <= n ==> (Fib(n) % 2 == 0 <==> n % 3 == 0)
 {
   forall n | 0 <= n {
     FibLemma(n);
@@ -59,7 +59,7 @@ lemma FibLemma_All()
 datatype List<T> = Nil | Cons(head: T, tail: List<T>)
 
 ghost function Append<T>(xs: List<T>, ys: List<T>): List<T>
-  decreases xs;
+  decreases xs
 {
   match xs
   case Nil => ys
@@ -69,8 +69,8 @@ ghost function Append<T>(xs: List<T>, ys: List<T>): List<T>
 // The {:induction false} attribute disables automatic induction tactic,
 // so we can make the proof explicit.
 lemma {:induction false} AppendIsAssociative(xs: List, ys: List, zs: List)
-  ensures Append(Append(xs, ys), zs) == Append(xs, Append(ys, zs));
-  decreases xs;
+  ensures Append(Append(xs, ys), zs) == Append(xs, Append(ys, zs))
+  decreases xs
 {
   match (xs) {
     case Nil =>
@@ -82,7 +82,6 @@ lemma {:induction false} AppendIsAssociative(xs: List, ys: List, zs: List)
 // Here the proof is fully automatic - the body of the method is empty,
 // yet still verifies.
 lemma AppendIsAssociative_Auto(xs: List, ys: List, zs: List)
-  ensures Append(Append(xs, ys), zs) == Append(xs, Append(ys, zs));
+  ensures Append(Append(xs, ys), zs) == Append(xs, Append(ys, zs))
 {
 }
-
diff --git a/Test/dafny3/SimpleInduction.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SimpleInduction.dfy.expect
similarity index 100%
rename from Test/dafny3/SimpleInduction.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/SimpleInduction.dfy.expect
diff --git a/Test/dafny3/Streams.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Streams.dfy
similarity index 98%
rename from Test/dafny3/Streams.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Streams.dfy
index 1e6f9fd5e5f..0ffe3988ec1 100644
--- a/Test/dafny3/Streams.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Streams.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // ----- Stream
 
@@ -62,7 +62,7 @@ greatest lemma Theorem0_Alt(M: Stream<X>)
 lemma Theorem0_Par(M: Stream<X>)
   ensures map_fg(M) == map_f(map_g(M));
 {
-  forall k: nat {
+  forall k: nat {:trigger} {
     Theorem0_Ind(k, M);
   }
 }
@@ -102,7 +102,7 @@ greatest lemma Theorem1_Alt(M: Stream<X>, N: Stream<X>)
 lemma Theorem1_Par(M: Stream<X>, N: Stream<X>)
   ensures map_f(append(M, N)) == append(map_f(M), map_f(N));
 {
-  forall k: nat {
+  forall k: nat {:trigger} {
     Theorem1_Ind(k, M, N);
   }
 }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Streams.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Streams.dfy.expect
new file mode 100644
index 00000000000..9e74af046b4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Streams.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 29 verified, 0 errors
diff --git a/Test/dafny3/WideTrees.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/WideTrees.dfy
similarity index 93%
rename from Test/dafny3/WideTrees.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/WideTrees.dfy
index 155267602d6..54e444ea2b6 100644
--- a/Test/dafny3/WideTrees.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/WideTrees.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 codatatype Stream<T> = SNil | SCons(head: T, tail: Stream)
diff --git a/Test/dafny3/WideTrees.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/WideTrees.dfy.expect
similarity index 100%
rename from Test/dafny3/WideTrees.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/WideTrees.dfy.expect
diff --git a/Test/dafny3/Zip.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Zip.dfy
similarity index 95%
rename from Test/dafny3/Zip.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Zip.dfy
index 80ad15820d4..d1aabcbbfa8 100644
--- a/Test/dafny3/Zip.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Zip.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 /*
 Here, we define infinite streams with some functions and prove a few
diff --git a/Test/dafny4/Bug159.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Zip.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug159.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny3/Zip.dfy.expect
diff --git a/Test/dafny4/- b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/-
similarity index 100%
rename from Test/dafny4/-
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/-
diff --git a/Test/dafny4/ACL2-extractor.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ACL2-extractor.dfy
similarity index 84%
rename from Test/dafny4/ACL2-extractor.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ACL2-extractor.dfy
index 8dac3074c8f..f7da86e8718 100644
--- a/Test/dafny4/ACL2-extractor.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ACL2-extractor.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /deprecation:0 /proverOpt:O:smt.qi.eager_threshold=30 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --solver-option="O:smt.qi.eager_threshold=30" "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This is the Extractor Problem from section 11.8 of the ACL2 book,
@@ -25,7 +25,7 @@ ghost opaque function nth<T(00)>(n: int, xs: List<T>): T
 }
 
 ghost function nthWorker<T>(n: int, xs: List<T>): T
-  requires 0 <= n < length(xs);
+  requires 0 <= n < length(xs)
 {
   if n == 0 then xs.head else nthWorker(n-1, xs.tail)
 }
@@ -57,7 +57,7 @@ ghost function xtr<T(00)>(mp: List<int>, lst: List): List
 }
 
 lemma ExtractorTheorem<T(00)>(xs: List)
-  ensures xtr(nats(length(xs)), xs) == rev(xs);
+  ensures xtr(nats(length(xs)), xs) == rev(xs)
 {
   var a, b := xtr(nats(length(xs)), xs), rev(xs);
   calc {
@@ -73,7 +73,7 @@ lemma ExtractorTheorem<T(00)>(xs: List)
     length(b);
   }
   forall i | 0 <= i < length(xs)
-    ensures nth(i, a) == nth(i, b);
+    ensures nth(i, a) == nth(i, b)
   {
     reveal nth();
     ExtractorLemma(i, xs);
@@ -85,23 +85,23 @@ lemma ExtractorTheorem<T(00)>(xs: List)
 
 // lemmas about length
 
-lemma XtrLength(mp: List<int>, lst: List)
-  ensures length(xtr(mp, lst)) == length(mp);
+lemma XtrLength<T(00)>(mp: List<int>, lst: List)
+  ensures length(xtr(mp, lst)) == length(mp)
 {
 }
 
 lemma NatsLength(n: nat)
-  ensures length(nats(n)) == n;
+  ensures length(nats(n)) == n
 {
 }
 
 lemma AppendLength(xs: List, ys: List)
-  ensures length(append(xs, ys)) == length(xs) + length(ys);
+  ensures length(append(xs, ys)) == length(xs) + length(ys)
 {
 }
 
 lemma RevLength(xs: List)
-  ensures length(rev(xs)) == length(xs);
+  ensures length(rev(xs)) == length(xs)
 {
   match xs {
     case Nil =>
@@ -141,9 +141,9 @@ lemma EqualElementsMakeEqualLists<T(00)>(xs: List, ys: List)
 
 // here is the theorem, but applied to the ith element
 
-lemma {:vcs_split_on_every_assert} ExtractorLemma<T(00)>(i: int, xs: List)
-  requires 0 <= i < length(xs);
-  ensures nth(i, xtr(nats(length(xs)), xs)) == nth(i, rev(xs));
+lemma {:isolate_assertions} ExtractorLemma<T(00)>(i: int, xs: List)
+  requires 0 <= i < length(xs)
+  ensures nth(i, xtr(nats(length(xs)), xs)) == nth(i, rev(xs))
 {
   calc {
     nth(i, xtr(nats(length(xs)), xs));
@@ -160,8 +160,8 @@ lemma {:vcs_split_on_every_assert} ExtractorLemma<T(00)>(i: int, xs: List)
 // lemmas about what nth gives on certain lists
 
 lemma NthXtr<T(00)>(i: int, mp: List<int>, lst: List<T>)
-  requires 0 <= i < length(mp);
-  ensures nth(i, xtr(mp, lst)) == nth(nth(i, mp), lst);
+  requires 0 <= i < length(mp)
+  ensures nth(i, xtr(mp, lst)) == nth(nth(i, mp), lst)
 {
   reveal nth();
   XtrLength(mp, lst);
@@ -179,8 +179,8 @@ lemma NthXtr<T(00)>(i: int, mp: List<int>, lst: List<T>)
 }
 
 lemma NthNats(i: int, n: nat)
-  requires 0 <= i < n;
-  ensures nth(i, nats(n)) == n - 1 - i;
+  requires 0 <= i < n
+  ensures nth(i, nats(n)) == n - 1 - i
 {
   reveal nth();
   NatsLength(n);
@@ -188,14 +188,14 @@ lemma NthNats(i: int, n: nat)
 }
 
 lemma NthNatsWorker(i: int, n: nat)
-  requires 0 <= i < n && length(nats(n)) == n;
-  ensures nthWorker(i, nats(n)) == n - 1 - i;
+  requires 0 <= i < n && length(nats(n)) == n
+  ensures nthWorker(i, nats(n)) == n - 1 - i
 {
 }
 
 lemma NthRev<T(00)>(i: int, xs: List)
-  requires 0 <= i < length(xs) == length(rev(xs));
-  ensures nthWorker(i, rev(xs)) == nthWorker(length(xs) - 1 - i, xs);
+  requires 0 <= i < length(xs) == length(rev(xs))
+  ensures nthWorker(i, rev(xs)) == nthWorker(length(xs) - 1 - i, xs)
 {
   reveal nth();
   assert xs.Cons?;
@@ -236,8 +236,8 @@ lemma NthRev<T(00)>(i: int, xs: List)
 }
 
 lemma NthAppendA<T(00)>(i: int, xs: List, ys: List)
-  requires 0 <= i < length(xs);
-  ensures nth(i, append(xs, ys)) == nth(i, xs);
+  requires 0 <= i < length(xs)
+  ensures nth(i, append(xs, ys)) == nth(i, xs)
 {
   reveal nth();
   if i == 0 {
@@ -258,8 +258,8 @@ lemma NthAppendA<T(00)>(i: int, xs: List, ys: List)
 }
 
 lemma NthAppendB<T(00)>(i: int, xs: List, ys: List)
-  requires length(xs) <= i < length(xs) + length(ys);
-  ensures nth(i, append(xs, ys)) == nth(i - length(xs), ys);
+  requires length(xs) <= i < length(xs) + length(ys)
+  ensures nth(i, append(xs, ys)) == nth(i - length(xs), ys)
 {
   reveal nth();
   AppendLength(xs, ys);
diff --git a/Test/examples/induction-principle-code/VarUnchanged.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ACL2-extractor.dfy.expect
similarity index 100%
rename from Test/examples/induction-principle-code/VarUnchanged.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ACL2-extractor.dfy.expect
diff --git a/Test/dafny4/Ackermann.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy
similarity index 98%
rename from Test/dafny4/Ackermann.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy
index a4ef351c96b..3fe0e763b38 100644
--- a/Test/dafny4/Ackermann.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings --relax-definite-assignment
 
 // Rustan Leino, 8 Sep 2015.
 // This file proves that the Ackermann function is monotonic in each argument
diff --git a/Test/dafny4/Ackermann.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy.expect
similarity index 100%
rename from Test/dafny4/Ackermann.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy.rs.check
new file mode 100644
index 00000000000..36fc3c768d2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: arguments to this function are incorrect
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy.verifier.expect
new file mode 100644
index 00000000000..4d91fcbd465
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Ackermann.dfy.verifier.expect
@@ -0,0 +1,2 @@
+Ackermann.dfy(162,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+Ackermann.dfy(180,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
diff --git a/Test/dafny4/BinarySearch.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/BinarySearch.dfy
similarity index 94%
rename from Test/dafny4/BinarySearch.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/BinarySearch.dfy
index e0ccb180095..a43ef00421f 100644
--- a/Test/dafny4/BinarySearch.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/BinarySearch.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Binary search using standard integers
 
diff --git a/Test/dafny4/BinarySearch.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/BinarySearch.dfy.expect
similarity index 100%
rename from Test/dafny4/BinarySearch.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/BinarySearch.dfy.expect
diff --git a/Test/dafny4/Bug100.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug100.dfy
similarity index 85%
rename from Test/dafny4/Bug100.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug100.dfy
index f97ab65f955..d1971c78890 100644
--- a/Test/dafny4/Bug100.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug100.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify --relax-definite-assignment --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 lemma lemma_ensures(x:int, RefineInt:int->int)
diff --git a/Test/dafny4/Bug134.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug100.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug134.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug100.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug101.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug101.dfy
new file mode 100644
index 00000000000..77ba9930c61
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug101.dfy
@@ -0,0 +1,19 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+ghost predicate P(i:int) { true }
+
+lemma Tester()
+{
+//    forall i ensures false ==> P(i) {}
+    forall i ensures P(i) <== false {}
+    assert forall i :: P(i) ==> false;
+    assert P(0);
+    assert false;
+}
+
+
+
+
+
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug101.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug101.dfy.expect
new file mode 100644
index 00000000000..dc72e5203fa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug101.dfy.expect
@@ -0,0 +1,3 @@
+Bug101.dfy(10,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug103.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug103.dfy
new file mode 100644
index 00000000000..c5045f6ffcd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug103.dfy
@@ -0,0 +1,20 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost predicate IsLessThanSuccesor(i:int)
+{
+  i < i + 1
+}
+
+lemma LemmaWithoutTriggerOnForallStatement()
+{
+  forall i
+    ensures IsLessThanSuccesor(i)
+  {
+  }
+}
+
+
+
+
+
diff --git a/Test/dafny4/Bug136.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug103.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug136.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug103.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug104.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug104.dfy
new file mode 100644
index 00000000000..3ae17a6f7d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug104.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+datatype PartRealPartGhost = PartRealPartGhost(x:int, ghost y:int)
+
+method UpdateField()
+{
+ var v := PartRealPartGhost(3, 4);
+ ghost var g := 5;
+ v := v.(y := g);
+}
diff --git a/Test/dafny4/Bug110.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug104.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug110.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug104.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug107.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug107.dfy
new file mode 100644
index 00000000000..50a0c7548a7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug107.dfy
@@ -0,0 +1,15 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+method Main()
+{
+  var f := Inc;
+	print(f(4));
+}
+
+function Inc(x: int): int
+{
+  x + 2
+}
+
+
+
diff --git a/Test/dafny4/Bug107.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug107.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug107.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug107.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug107.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug107.dfy.rs.check
new file mode 100644
index 00000000000..d3aeb8ed7e9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug107.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `dyn for<'a> Fn(&'a DafnyInt) -> DafnyInt: Default` is not satisfied
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug108.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug108.dfy
new file mode 100644
index 00000000000..d0a4d431cfa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug108.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+method Main() {
+  var A := map[0 := 1];
+  var B := map x | x in (set y | y in A) :: A[x];
+  print A, "\n";
+  print B, "\n";
+}
+
+
diff --git a/Test/dafny4/Bug108.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug108.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug108.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug108.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug108.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug108.dfy.rs.check
new file mode 100644
index 00000000000..2a79815c2f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug108.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitMapBoundedPool</i>.*
\ No newline at end of file
diff --git a/Test/dafny4/Bug110.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug110.dfy
similarity index 87%
rename from Test/dafny4/Bug110.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug110.dfy
index 429d7e55352..5bc16735530 100644
--- a/Test/dafny4/Bug110.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug110.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module Io {
   ghost predicate AdvanceTime(oldTime:int) { oldTime > 2 }
diff --git a/Test/dafny4/Bug111.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug110.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug111.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug110.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug111.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug111.dfy
new file mode 100644
index 00000000000..12009ea337e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug111.dfy
@@ -0,0 +1,18 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+datatype A = A(i:int)
+datatype B = B1(a1:A) | B2(a2:A)
+
+ghost function f(b:B):int
+{
+  match b
+  {
+    case B1(A(i)) => i
+    case B2(A(j)) => j
+  }
+}
+
+
+
+
diff --git a/Test/dafny4/Bug129.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug111.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug129.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug111.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug113.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug113.dfy
new file mode 100644
index 00000000000..4092483ed2d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug113.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+datatype D = D(q:int, r:int, s:int, t:int)
+
+method Main()
+{
+    print D(10, 20, 30, 40);
+    print "\n";
+}
diff --git a/Test/dafny4/Bug113.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug113.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug113.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug113.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug114.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug114.dfy
new file mode 100644
index 00000000000..e11b4588515
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug114.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+ghost function f1(d:int):map<int,int>
+ghost function f2(y:int, d:int):int
+
+method M(m:map<int,int>, d:int, x2:int)
+{
+  assert forall d :: f1(d) == (map x | x in m ::  f2(x, d));
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug114.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug114.dfy.expect
new file mode 100644
index 00000000000..c5a380678a7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug114.dfy.expect
@@ -0,0 +1,3 @@
+Bug114.dfy(9,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/Bug116.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug116.dfy
similarity index 88%
rename from Test/dafny4/Bug116.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug116.dfy
index 501b74c74d5..ab195c50f3f 100644
--- a/Test/dafny4/Bug116.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug116.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // test various compiler-target keywords
 
diff --git a/Test/dafny4/Bug116.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug116.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug116.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug116.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug116.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug116.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug116.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny4/Bug117.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug117.dfy
similarity index 93%
rename from Test/dafny4/Bug117.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug117.dfy
index 7ecb8c4e32a..c7324e1bf80 100644
--- a/Test/dafny4/Bug117.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug117.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 abstract module AbstractModule1
diff --git a/Test/dafny4/Bug117.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug117.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug117.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug117.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug118.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug118.dfy
new file mode 100644
index 00000000000..fc524a36017
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug118.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+class Foo {
+  ghost var Repr: set<object>
+}
+
+ghost function SeqRepr(s:seq<Foo>) : set<object>
+  reads set b | b in s
+{
+  set o,b | b in s && o in b.Repr :: o     // Works if you say "set b,o | ..."
+}
diff --git a/Test/dafny4/Bug150.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug118.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug150.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug118.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug120.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug120.dfy
new file mode 100644
index 00000000000..8047f3baec7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug120.dfy
@@ -0,0 +1,11 @@
+// RUN: %verify --disable-nonlinear-arithmetic "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+ghost function G(n: nat): nat
+{
+  if n == 0 then 5 else G(n-1)
+}
+
+method Test() {
+  assert G(10) == 5;
+}
\ No newline at end of file
diff --git a/Test/dafny4/git-issue27.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug120.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue27.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug120.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug121.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug121.dfy
new file mode 100644
index 00000000000..914b90ffbf0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug121.dfy
@@ -0,0 +1,18 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+method Try (a:int, b:int, c:int)
+{
+	forall
+    ensures a * c == a * c
+    ensures b * c == b * c
+	{
+	}
+}
+
+
+
+
+
+
+
diff --git a/Test/dafny4/Bug121.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug121.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug121.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug121.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug122.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug122.dfy
new file mode 100644
index 00000000000..594b274d52d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug122.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+method Try (a:int)
+{
+	forall
+    ensures a == a
+	{
+	}
+}
+
+
+
+
+
+
+
diff --git a/Test/dafny4/Bug122.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug122.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug122.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug122.dfy.expect
diff --git a/Test/dafny4/Bug124.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug124.dfy
similarity index 78%
rename from Test/dafny4/Bug124.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug124.dfy
index 2cfbf61b00c..2dffdc96e1b 100644
--- a/Test/dafny4/Bug124.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug124.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /noNLarith  "%s" > "%t"
+// RUN: %verify --disable-nonlinear-arithmetic --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost function power(n:nat, e:nat) : int
diff --git a/Test/dafny4/Bug162.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug124.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug162.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug124.dfy.expect
diff --git a/Test/dafny4/Bug125.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125.dfy
similarity index 95%
rename from Test/dafny4/Bug125.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125.dfy
index 8da4c1a6467..a4224ef1ccd 100644
--- a/Test/dafny4/Bug125.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 // Here is the example reported in issue #125 to cause a crash in Dafny.
 // The crash has been fixed.  However, the semantics is not what is suggested
diff --git a/Test/dafny4/Bug125.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug125.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125.dfy.expect
diff --git a/Test/dafny4/Bug125more.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125more.dfy
similarity index 96%
rename from Test/dafny4/Bug125more.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125more.dfy
index 779f9cc6160..687116d9dbd 100644
--- a/Test/dafny4/Bug125more.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125more.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // See comments in Bug125.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125more.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125more.dfy.expect
new file mode 100644
index 00000000000..39ddb6d0dfd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug125more.dfy.expect
@@ -0,0 +1,3 @@
+Bug125more.dfy(59,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/Bug128.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug128.legacy.dfy
similarity index 100%
rename from Test/dafny4/Bug128.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug128.legacy.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug128.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug128.legacy.dfy.expect
new file mode 100644
index 00000000000..f5e8881638f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug128.legacy.dfy.expect
@@ -0,0 +1,3 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug129.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug129.dfy
new file mode 100644
index 00000000000..fa0d98158b4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug129.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+datatype Maybe<T> = Some(v:T) | None
+datatype B = B(b:Maybe<B>)
+
+datatype List<T> = Nil | Cons(T, List<T>)
+datatype Tree<T> = Nodes(children: List<Tree<T>>)
+
+
+
+
diff --git a/Test/dafny4/Bug138.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug129.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug138.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug129.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug131.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug131.dfy
new file mode 100644
index 00000000000..fbc359eb6a4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug131.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+class Cell {
+  method Test(c: Cell) {
+    assert c.F();
+  }
+}
+
+ghost predicate F()
+
diff --git a/Test/dafny4/Bug131.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug131.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug131.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug131.dfy.expect
diff --git a/Test/dafny4/Bug132.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug132.dfy
similarity index 95%
rename from Test/dafny4/Bug132.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug132.dfy
index 2a1af276307..695eeb006b9 100644
--- a/Test/dafny4/Bug132.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug132.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class Cell {
   var data: int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug132.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug132.dfy.expect
new file mode 100644
index 00000000000..652411be7ed
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug132.dfy.expect
@@ -0,0 +1,6 @@
+Bug132.dfy(33,29): Error: receiver argument could not be proved to be allocated in the state in which the function is invoked
+Bug132.dfy(34,29): Error: receiver argument could not be proved to be allocated in the state in which the function is invoked
+Bug132.dfy(37,36): Error: argument could not be proved to be allocated in the state in which the function is invoked
+Bug132.dfy(41,29): Error: receiver argument could not be proved to be allocated in the state in which the function is invoked
+
+Dafny program verifier finished with 2 verified, 4 errors
diff --git a/Test/dafny4/Bug133.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug133.dfy
similarity index 82%
rename from Test/dafny4/Bug133.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug133.dfy
index e530818f414..8828ef43194 100644
--- a/Test/dafny4/Bug133.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug133.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /noNLarith /compile:0 "%s" > "%t"
+// RUN: %verify --disable-nonlinear-arithmetic "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Math__div_def_i {
diff --git a/Test/dafny4/Bug165.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug133.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug165.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug133.dfy.expect
diff --git a/Test/dafny4/Bug134.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug134.dfy
similarity index 82%
rename from Test/dafny4/Bug134.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug134.dfy
index 8f4993f5ad6..8f637dd0be6 100644
--- a/Test/dafny4/Bug134.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug134.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module NativeTypes {
 	newtype{:nativeType "ushort"} uint16 = i:int | 0 <= i < 0x10000
diff --git a/Test/dafny4/Bug166.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug134.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug166.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug134.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug136.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug136.dfy
new file mode 100644
index 00000000000..53769c19a9b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug136.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+method test()
+{
+    assume false;
+    assert true;
+}
+
+
+
+
diff --git a/Test/dafny4/Bug55.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug136.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug55.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug136.dfy.expect
diff --git a/Test/dafny4/Bug138.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug138.dfy
similarity index 86%
rename from Test/dafny4/Bug138.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug138.dfy
index a7f9400d84b..905a4ff490f 100644
--- a/Test/dafny4/Bug138.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug138.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype List = Nil | Cons(int, List)
 
diff --git a/Test/dafny4/Bug139.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug138.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug139.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug138.dfy.expect
diff --git a/Test/dafny4/Bug139.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug139.dfy
similarity index 85%
rename from Test/dafny4/Bug139.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug139.dfy
index 58436dfefac..7602b9124c9 100644
--- a/Test/dafny4/Bug139.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug139.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype List = Nil | Cons(int, List)
 
diff --git a/Test/dafny4/Bug155.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug139.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug155.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug139.dfy.expect
diff --git a/Test/dafny4/Bug140.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug140.dfy
similarity index 93%
rename from Test/dafny4/Bug140.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug140.dfy
index 8280db8f665..09151968e8c 100644
--- a/Test/dafny4/Bug140.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug140.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 class Node<T> {
   ghost var List: seq<T>
diff --git a/Test/dafny4/Bug140.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug140.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug140.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug140.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug140.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug140.dfy.rs.check
new file mode 100644
index 00000000000..dae9bb332ac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug140.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
diff --git a/Test/dafny4/Bug142.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug142.dfy
similarity index 90%
rename from Test/dafny4/Bug142.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug142.dfy
index 48f5568e66a..0796b715c13 100644
--- a/Test/dafny4/Bug142.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug142.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /warnShadowing  /compile:0  "%s" > "%t"
+// RUN: %resolve --warn-shadowing --allow-warnings "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost function P(x:int):int
diff --git a/Test/dafny4/Bug142.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug142.dfy.expect
similarity index 86%
rename from Test/dafny4/Bug142.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug142.dfy.expect
index 195e4383742..a89c8d75ef4 100644
--- a/Test/dafny4/Bug142.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug142.dfy.expect
@@ -5,4 +5,4 @@ Bug142.dfy(30,6): Warning: Shadowed let-variable name: state1
 Bug142.dfy(31,6): Warning: Shadowed let-variable name: state1
 Bug142.dfy(32,6): Warning: Shadowed let-variable name: state1
 
-Dafny program verifier finished with 0 verified, 0 errors
+Dafny program verifier did not attempt verification
diff --git a/Test/dafny4/Bug144.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug144.dfy
similarity index 92%
rename from Test/dafny4/Bug144.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug144.dfy
index 902b218a614..c35b4df70d9 100644
--- a/Test/dafny4/Bug144.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug144.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost predicate p(i: int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug144.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug144.dfy.expect
new file mode 100644
index 00000000000..215e139e050
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug144.dfy.expect
@@ -0,0 +1,3 @@
+Bug144.dfy(40,2): Error: assertion might not hold
+
+Dafny program verifier finished with 3 verified, 1 error
diff --git a/Test/dafny4/Bug145.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug145.dfy
similarity index 90%
rename from Test/dafny4/Bug145.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug145.dfy
index 2452e02e6e8..57639cd905e 100644
--- a/Test/dafny4/Bug145.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug145.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost function existential(mat: array2<bool>): bool
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug145.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug145.dfy.expect
new file mode 100644
index 00000000000..f89365a4794
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug145.dfy.expect
@@ -0,0 +1,4 @@
+Bug145.dfy(11,24): Error: array size (dimension 0) might be negative
+Bug145.dfy(24,4): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Test/dafny4/Bug146.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug146.dfy
similarity index 95%
rename from Test/dafny4/Bug146.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug146.dfy
index 0168e83d88c..d41b76b02c1 100644
--- a/Test/dafny4/Bug146.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug146.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 function inhabited(world: array2<bool>): bool
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug146.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug146.dfy.expect
new file mode 100644
index 00000000000..90953eb4fc2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug146.dfy.expect
@@ -0,0 +1,5 @@
+Bug146.dfy(6,75): Error: insufficient reads clause to read array element; Consider adding 'reads world' in the enclosing function specification for resolution
+Bug146.dfy(37,25): Error: assertion might not hold
+Bug146.dfy(26,4): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 2 verified, 2 errors
diff --git a/Test/dafny4/Bug148.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug148.dfy
similarity index 87%
rename from Test/dafny4/Bug148.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug148.dfy
index f31cef2cdc8..dd5e0e15af0 100644
--- a/Test/dafny4/Bug148.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug148.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main()
 {
diff --git a/Test/dafny4/Bug148.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug148.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug148.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug148.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug148.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug148.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug148.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug150.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug150.dfy
new file mode 100644
index 00000000000..ec2de4b0f19
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug150.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function foo(s:seq<int>) : (int, int)
+{
+  (0, 0)
+}
+
+method pop_run_impl() {
+  var a := new int[10];
+  var i := 0;
+  ghost var (x,y) := foo(a[..i+1]);
+}
\ No newline at end of file
diff --git a/Test/dafny4/Bug71.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug150.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug71.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug150.dfy.expect
diff --git a/Test/dafny4/Bug151.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug151.dfy
similarity index 89%
rename from Test/dafny4/Bug151.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug151.dfy
index 815443b29f3..45513158669 100644
--- a/Test/dafny4/Bug151.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug151.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 method foo(xs: set) {
    assert (set x | x in xs) == xs;
diff --git a/Test/dafny4/Bug151.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug151.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug151.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug151.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug155.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug155.dfy
new file mode 100644
index 00000000000..e05e48c566a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug155.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function foo(m: multiset<object>): int
+  reads m
+{
+  0
+}
diff --git a/Test/dafny4/Bug169.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug155.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug169.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug155.dfy.expect
diff --git a/Test/dafny4/Bug159.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug159.dfy
similarity index 92%
rename from Test/dafny4/Bug159.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug159.dfy
index a074497004b..a63f1bfcac3 100644
--- a/Test/dafny4/Bug159.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug159.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 method ArrayInit(n: nat) returns (a: array<int>)
   ensures a.Length == n
diff --git a/Test/exports/ExportInductivePredicate.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug159.dfy.expect
similarity index 100%
rename from Test/exports/ExportInductivePredicate.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug159.dfy.expect
diff --git a/Test/dafny4/Bug160.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug160.dfy
similarity index 86%
rename from Test/dafny4/Bug160.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug160.dfy
index 59b72a4495c..3c4cb1498d8 100644
--- a/Test/dafny4/Bug160.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug160.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation
+
 
 type U(==)
 ghost function ToU<T>(t:T) : U
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug160.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug160.dfy.expect
new file mode 100644
index 00000000000..adf98276d91
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug160.dfy.expect
@@ -0,0 +1,4 @@
+Bug160.dfy(29,4): Error: a postcondition could not be proved on this return path
+Bug160.dfy(27,13): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/Test/dafny4/Bug161.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug161.dfy
similarity index 77%
rename from Test/dafny4/Bug161.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug161.dfy
index 32e5aa0a34e..8846ec2c9ee 100644
--- a/Test/dafny4/Bug161.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug161.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 type t = seq<int>
 
diff --git a/Test/dafny4/git-issue57.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug161.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue57.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug161.dfy.expect
diff --git a/Test/dafny4/Bug162.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug162.dfy
similarity index 86%
rename from Test/dafny4/Bug162.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug162.dfy
index 00ea59c2f0a..6a55e98642b 100644
--- a/Test/dafny4/Bug162.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug162.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method foo<T(==)>(x:T)
diff --git a/Test/dafny4/Bug72.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug162.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug72.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug162.dfy.expect
diff --git a/Test/dafny4/Bug165.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug165.dfy
similarity index 83%
rename from Test/dafny4/Bug165.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug165.dfy
index 3171cd19287..4024354ad87 100644
--- a/Test/dafny4/Bug165.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug165.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 type T
 ghost function f(a: T) : bool
diff --git a/Test/dafny4/Bug81.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug165.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug81.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug165.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug166.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug166.dfy
new file mode 100644
index 00000000000..15fbd2f2954
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug166.dfy
@@ -0,0 +1,8 @@
+// RUN: %verify --disable-nonlinear-arithmetic --allow-axioms "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+ghost predicate P(x:int)
+
+method test(s:seq<int>)
+    ensures forall x :: x > 5 ==> P(x)
+    ensures forall i :: 0 <= i < |s| ==> P(s[i])
diff --git a/Test/dafny4/Bug82.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug166.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug82.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug166.dfy.expect
diff --git a/Test/dafny4/Bug168.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug168.dfy
similarity index 90%
rename from Test/dafny4/Bug168.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug168.dfy
index 60be6820939..51e43333aa5 100644
--- a/Test/dafny4/Bug168.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug168.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype List = Nil | Cons(head: int, tail: List)
diff --git a/Test/dafny4/Bug168.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug168.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug168.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug168.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug169.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug169.dfy
new file mode 100644
index 00000000000..9f4f9c8dff7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug169.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost predicate R(x: int)
+
+least lemma P(x: int)
+{
+  forall x | R(x)
+  {
+  }
+}
diff --git a/Test/dafny4/Bug69.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug169.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug69.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug169.dfy.expect
diff --git a/Test/dafny4/Bug170.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug170.dfy
similarity index 97%
rename from Test/dafny4/Bug170.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug170.dfy
index d81dac9ac9e..cf67aa71309 100644
--- a/Test/dafny4/Bug170.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug170.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module InductiveThings {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug170.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug170.dfy.expect
new file mode 100644
index 00000000000..9fc780dadfb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug170.dfy.expect
@@ -0,0 +1,48 @@
+Bug170.dfy(8,18): Info: _k: ORDINAL
+Bug170.dfy(13,18): Info: _k: ORDINAL
+Bug170.dfy(18,14): Info: _k: ORDINAL
+Bug170.dfy(26,14): Info: _k: ORDINAL
+Bug170.dfy(19,14): Info: A#[_k]
+Bug170.dfy(18,14): Info: AA# with focal predicates A, B
+Bug170.dfy(21,8): Info: B#[_k - 1]
+Bug170.dfy(22,6): Info: BB#[_k - 1]
+Bug170.dfy(27,14): Info: B#[_k]
+Bug170.dfy(26,14): Info: BB# with focal predicates B, A
+Bug170.dfy(29,8): Info: A#[_k - 1]
+Bug170.dfy(30,6): Info: AA#[_k - 1]
+Bug170.dfy(10,13): Info: B#[_k - 1]
+Bug170.dfy(15,13): Info: A#[_k - 1]
+Bug170.dfy(18,14): Info: AA# decreases _k, x
+Bug170.dfy(26,14): Info: BB# decreases _k, x
+Bug170.dfy(36,21): Info: _k: ORDINAL
+Bug170.dfy(41,21): Info: _k: ORDINAL
+Bug170.dfy(46,17): Info: _k: ORDINAL
+Bug170.dfy(53,17): Info: _k: ORDINAL
+Bug170.dfy(47,13): Info: A#[_k]
+Bug170.dfy(46,17): Info: AA# with focal predicates A, B
+Bug170.dfy(49,4): Info: BB#[_k - 1]
+Bug170.dfy(50,12): Info: B#[_k - 1]
+Bug170.dfy(54,13): Info: B#[_k]
+Bug170.dfy(53,17): Info: BB# with focal predicates B, A
+Bug170.dfy(56,4): Info: AA#[_k - 1]
+Bug170.dfy(57,12): Info: A#[_k - 1]
+Bug170.dfy(38,5): Info: B#[_k - 1]
+Bug170.dfy(43,5): Info: A#[_k - 1]
+Bug170.dfy(46,17): Info: AA# decreases _k, x
+Bug170.dfy(53,17): Info: BB# decreases _k, x
+Bug170.dfy(46,17): Info: AA# {:induction _k, x}
+Bug170.dfy(46,17): Info: AA# {:inductionTrigger A#[_k](x)}
+Bug170.dfy(53,17): Info: BB# {:induction _k, x}
+Bug170.dfy(53,17): Info: BB# {:inductionTrigger B#[_k](x)}
+Bug170.dfy(64,18): Info: _k: ORDINAL
+Bug170.dfy(69,14): Info: _k: ORDINAL
+Bug170.dfy(70,14): Info: A#[_k]
+Bug170.dfy(69,14): Info: AA# with focal predicate A
+Bug170.dfy(72,8): Info: A#[_k - 1]
+Bug170.dfy(73,6): Info: AA#[_k - 1]
+Bug170.dfy(66,13): Info: A#[_k - 1]
+Bug170.dfy(69,14): Info: AA# decreases _k, x
+Bug170.dfy(50,12): Info: Some instances of this call are not inlined.
+Bug170.dfy(57,12): Info: Some instances of this call are not inlined.
+
+Dafny program verifier finished with 5 verified, 0 errors
diff --git a/Test/dafny4/Bug49.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug49.dfy
similarity index 90%
rename from Test/dafny4/Bug49.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug49.dfy
index 868f4a3964b..fcbf58c0fa6 100644
--- a/Test/dafny4/Bug49.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug49.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main()
 {
@@ -12,7 +12,7 @@ method Main()
 // test that the definition axiom for function "apply" is available
 
 function apply(f:int~>int, a:int): int
-  reads f.reads
+  reads f.reads(a)
   requires f.requires(a)
 {
   f(a)
diff --git a/Test/dafny4/Bug49.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug49.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug49.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug49.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug49.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug49.dfy.rs.check
new file mode 100644
index 00000000000..0c4268a75ce
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug49.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Expected a buffered value to have been populated because rhs != null
\ No newline at end of file
diff --git a/Test/dafny4/Bug54.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug54.dfy
similarity index 83%
rename from Test/dafny4/Bug54.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug54.dfy
index 94e667c4246..f90448b24c4 100644
--- a/Test/dafny4/Bug54.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug54.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost predicate G<X(!new)>(f:X~>bool)
   reads f.reads
diff --git a/Test/examples/induction-principle-code/AST.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug54.dfy.expect
similarity index 100%
rename from Test/examples/induction-principle-code/AST.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug54.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug55.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug55.dfy
new file mode 100644
index 00000000000..9583ebd26fa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug55.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost predicate {:opaque} G(f:int~>bool)
+  reads f.reads(0)
+  requires f.requires(0)
+{
+  true
+}
+
+ghost predicate A<T>(s:set<T>)
+
+predicate{:opaque} B(s:set<int>)
+    requires A(s)
diff --git a/Test/dafny4/Bug99.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug55.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug99.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug55.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug56.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug56.dfy
new file mode 100644
index 00000000000..2e013b3ea67
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug56.dfy
@@ -0,0 +1,23 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function I(f:int->bool):int->bool
+  ensures I(f) == f
+
+ghost predicate G<S>(s:S)
+
+type D<X>
+type E
+
+lemma L1<S>(b:int->S)
+  requires forall i :: b.reads(i) == {}
+  requires forall i :: b.requires(i)
+  requires I(j => G(b(j)))(0) // PRECONDITION NOT SATISFIED BY L2
+
+lemma L2(b:int->D<E>)
+  requires forall i :: b.reads(i) == {}
+  requires forall i :: b.requires(i)
+  requires I(j => G(b(j)))(0)
+{
+  L1(b); // FAILS TO SATISFY L1's PRECONDITION
+}
diff --git a/Test/examples/induction-principle-code/PureNoInductionPrinciple.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug56.dfy.expect
similarity index 100%
rename from Test/examples/induction-principle-code/PureNoInductionPrinciple.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug56.dfy.expect
diff --git a/Test/dafny4/Bug58.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug58.dfy
similarity index 81%
rename from Test/dafny4/Bug58.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug58.dfy
index 1b45654cc7b..0f839392ad4 100644
--- a/Test/dafny4/Bug58.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug58.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost function M1(f:map<int, bool>, i:int):bool
 
diff --git a/Test/dafny4/LargeConstants.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug58.dfy.expect
similarity index 100%
rename from Test/dafny4/LargeConstants.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug58.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug60.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug60.dfy
new file mode 100644
index 00000000000..69c0e3e8f38
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug60.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+// This method can be used to test compilation.
+method Main()
+{
+  var s := {2, 3};
+  var m := map[2 := 20, 3 := 30];
+  print (s, m), "\n";
+  print (|s|, |m|), "\n";
+  print set s | s in m, "\n";
+  print forall x :: x in (map[1 := 10, 2 := 20]) ==> x > 0, "\n";
+}
diff --git a/Test/dafny4/Bug60.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug60.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug60.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug60.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug60.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug60.dfy.rs.check
new file mode 100644
index 00000000000..2a79815c2f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug60.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitMapBoundedPool</i>.*
\ No newline at end of file
diff --git a/Test/dafny4/Bug62.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug62.dfy
similarity index 90%
rename from Test/dafny4/Bug62.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug62.dfy
index e6e57c9c9ec..8afa77def85 100644
--- a/Test/dafny4/Bug62.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug62.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 3 %dafny /compile:3  "%s" > "%t"
+// RUN: %exits-with 3 %run  "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class C {
diff --git a/Test/dafny4/Bug62.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug62.dfy.expect
similarity index 85%
rename from Test/dafny4/Bug62.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug62.dfy.expect
index a70c906abe0..2f70baf541e 100644
--- a/Test/dafny4/Bug62.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug62.dfy.expect
@@ -2,3 +2,4 @@
 Dafny program verifier finished with 0 verified, 0 errors
 Bug62.dfy(13,9): Error: More than one method is declared as 'Main'. First declaration appeared at Bug62.dfy(6,9).
 Bug62.dfy(22,16): Error: More than one method is declared as 'Main'. First declaration appeared at Bug62.dfy(6,9).
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug63.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug63.dfy
new file mode 100644
index 00000000000..0bf414bc828
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug63.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+method M()
+  modifies set o: object | true
+{
+}
+
+method Client()
+{
+  assume forall o: object {:nowarn} :: false;
+  M();
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug63.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug63.dfy.expect
new file mode 100644
index 00000000000..2647ac50974
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug63.dfy.expect
@@ -0,0 +1,3 @@
+Bug63.dfy(5,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug67.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug67.dfy
new file mode 100644
index 00000000000..b0b3465e6c9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug67.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+datatype d = D(m:seq<int>)
+
+method Main()
+{
+  assert D([10, 20]) == D([10, 20]); // succeeds
+  print [10, 20] == [10, 20], "\n"; // prints True
+  print D([10, 20]) == D([10, 20]); // prints False
+}
diff --git a/Test/dafny4/Bug67.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug67.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug67.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug67.dfy.expect
diff --git a/Test/dafny4/Bug68.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug68.dfy
similarity index 93%
rename from Test/dafny4/Bug68.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug68.dfy
index bf50015f90c..310e4139387 100644
--- a/Test/dafny4/Bug68.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug68.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method M1()
 {
diff --git a/Test/dafny4/Bug68.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug68.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug68.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug68.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug68.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug68.dfy.rs.check
new file mode 100644
index 00000000000..6935e65ddc6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug68.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `Set<DafnyInt>: DafnyTypeEq` is not satisfied
\ No newline at end of file
diff --git a/Test/dafny4/Bug69.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug69.dfy
similarity index 77%
rename from Test/dafny4/Bug69.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug69.dfy
index 088b3986d97..80bac4fad4a 100644
--- a/Test/dafny4/Bug69.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug69.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module M1
 {
diff --git a/Test/dafny4/Bug70.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug69.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug70.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug69.dfy.expect
diff --git a/Test/dafny4/Bug70.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug70.dfy
similarity index 82%
rename from Test/dafny4/Bug70.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug70.dfy
index 39fb5bee8a3..6c6cf0cb468 100644
--- a/Test/dafny4/Bug70.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug70.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module M1
 {
diff --git a/Test/dafny4/Bug79.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug70.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug79.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug70.dfy.expect
diff --git a/Test/dafny4/Bug71.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug71.dfy
similarity index 75%
rename from Test/dafny4/Bug71.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug71.dfy
index 64d70924244..957ac2925ef 100644
--- a/Test/dafny4/Bug71.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug71.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 function{:opaque} MapSetToSet<X(!new), Y>(xs:set<X>, f:X~>Y):set<Y>
 //function MapSetToSet<X, Y>(xs:set<X>, f:X->Y):set<Y>
diff --git a/Test/dafny4/Juggernaut.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug71.dfy.expect
similarity index 100%
rename from Test/dafny4/Juggernaut.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug71.dfy.expect
diff --git a/Test/dafny4/Bug72.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug72.dfy
similarity index 87%
rename from Test/dafny4/Bug72.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug72.dfy
index 1dd8dcbfb99..41edb64e237 100644
--- a/Test/dafny4/Bug72.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug72.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Ballot = Ballot(seqno:int)
diff --git a/Test/dafny4/git-issue120.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug72.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue120.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug72.dfy.expect
diff --git a/Test/dafny4/Bug73.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug73.dfy
similarity index 80%
rename from Test/dafny4/Bug73.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug73.dfy
index a5dc92f8157..db7ba4eb119 100644
--- a/Test/dafny4/Bug73.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug73.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 lemma L(m:map<int, int>, r:int, i:int)
diff --git a/Test/dafny4/Bug73.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug73.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug73.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug73.dfy.expect
diff --git a/Test/dafny4/Bug75.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug75.dfy
similarity index 93%
rename from Test/dafny4/Bug75.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug75.dfy
index ef33ae4e8ff..87393c77f2a 100644
--- a/Test/dafny4/Bug75.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug75.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost predicate R1(x:int, y:int) { x > 0 ==> R2(x - 1) }
 ghost predicate R2(x:int) { exists y :: R1(x, y) }
diff --git a/Test/dafny4/Bug75.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug75.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug75.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug75.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug79.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug79.dfy
new file mode 100644
index 00000000000..97695eed943
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug79.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function foo(s:int) : (int, int)
+
+ghost function bar(s:int) : bool
+{
+    var (x, rest) := foo(s);
+    x > 0
+}
\ No newline at end of file
diff --git a/Test/dafny4/git-issue109.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug79.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue109.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug79.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug81.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug81.dfy
new file mode 100644
index 00000000000..1ea11196c80
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug81.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function {:opaque} RefineSeqToSeq<T(!new), U>(s:seq<T>, refine_func: T ~> U) : seq<U>
+{
+  if |s| == 0 then []
+  else RefineSeqToSeq(s[1..], refine_func)
+}
diff --git a/Test/dafny4/git-issue141.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug81.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue141.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug81.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug82.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug82.dfy
new file mode 100644
index 00000000000..7917e361b08
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug82.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost opaque function Reverse(id: int): int
+
+ghost function RefineToMap(ReverseKey: int -> int): bool
+
+ghost function RefineToMapOfSeqNums(): bool
+{
+  RefineToMap(Reverse)
+}
diff --git a/Test/dafny4/git-issue110.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug82.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue110.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug82.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug88.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug88.dfy
new file mode 100644
index 00000000000..59e16010102
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug88.dfy
@@ -0,0 +1,18 @@
+// RUN: %exits-with 4 %build "%s" --relax-definite-assignment > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+lemma T(a: int) returns (b: int)
+  ensures a == b
+{
+  calc {
+    a;
+  }
+}
+
+lemma A(i: int)
+  ensures false
+{
+  if * {
+  } else {
+  }
+}
\ No newline at end of file
diff --git a/Test/dafny4/Bug88.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug88.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug88.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug88.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug89.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug89.dfy
new file mode 100644
index 00000000000..292060b98a6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug89.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+method F() returns(x:int)
+  ensures x == 6
+{
+  x := 5;
+  x := (var y := 1; y + x);
+}
+
+method Main()
+{
+  var x := F();
+  print x;
+}
diff --git a/Test/dafny4/Bug89.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug89.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug89.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug89.dfy.expect
diff --git a/Test/dafny4/Bug91.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug91.dfy
similarity index 91%
rename from Test/dafny4/Bug91.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug91.dfy
index 6a47d5c989a..097acfb0039 100644
--- a/Test/dafny4/Bug91.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug91.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 type SendState = map<int, seq<int>>
 
diff --git a/Test/dafny4/Regression16.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug91.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression16.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug91.dfy.expect
diff --git a/Test/dafny4/Bug92.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug92.dfy
similarity index 95%
rename from Test/dafny4/Bug92.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug92.dfy
index e7e58bf2c5f..8a4d559162b 100644
--- a/Test/dafny4/Bug92.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug92.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 module ModOpaque {
     ghost function {:opaque} Hidden(x:int) : (int, int)
     {
diff --git a/Test/dafny4/Bug92.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug92.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug92.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug92.dfy.expect
diff --git a/Test/dafny4/Bug93.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug93.dfy
similarity index 86%
rename from Test/dafny4/Bug93.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug93.dfy
index 7a85f5c78a4..365e9051da1 100644
--- a/Test/dafny4/Bug93.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug93.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module Fuel {
     ghost function FunctionA(x:int) : int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug93.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug93.dfy.expect
new file mode 100644
index 00000000000..b2453f4bf3b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug93.dfy.expect
@@ -0,0 +1,4 @@
+Bug93.dfy(17,8): Error: assertion might not hold
+Bug93.dfy(34,8): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny4/Bug94.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug94.dfy
similarity index 78%
rename from Test/dafny4/Bug94.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug94.dfy
index c41458539fc..8686328c49f 100644
--- a/Test/dafny4/Bug94.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug94.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 ghost function foo() : (int, int)
 {
diff --git a/Test/dafny4/Bug94.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug94.dfy.expect
similarity index 100%
rename from Test/dafny4/Bug94.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug94.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug99.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug99.dfy
new file mode 100644
index 00000000000..b0a4ddbcfbf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug99.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost predicate P(e:int, p:int) { true }
+ghost predicate Q(i:int, t:int)
+
+lemma Tester(x:int)
+{
+    assert forall i :: Q(i, x) ==> (forall p {:trigger P(i, p)} :: P(i, p));
+
+}
diff --git a/Test/dafny4/git-issue176.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug99.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue176.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Bug99.dfy.expect
diff --git a/Test/dafny4/Circ.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Circ.dfy
similarity index 95%
rename from Test/dafny4/Circ.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Circ.dfy
index b1694375eca..2634a2da01c 100644
--- a/Test/dafny4/Circ.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Circ.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // A couple of examples from Grigore Rosu and Dorel Lucanu, "Circular coinduction: A proof theoretical
 // foundation", CALCO 2009.
diff --git a/Test/dafny4/Regression19.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Circ.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression19.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Circ.dfy.expect
diff --git a/Test/dafny4/ClassRefinement.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ClassRefinement.dfy
similarity index 98%
rename from Test/dafny4/ClassRefinement.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ClassRefinement.dfy
index 3d5fd1006eb..8b31990bcca 100644
--- a/Test/dafny4/ClassRefinement.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ClassRefinement.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --allow-deprecation
 
 abstract module M0 {
   class Counter {
diff --git a/Test/dafny4/ClassRefinement.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ClassRefinement.dfy.expect
similarity index 100%
rename from Test/dafny4/ClassRefinement.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ClassRefinement.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ClassRefinement.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ClassRefinement.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ClassRefinement.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny4/git-issue105.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ClassRefinement.dfy.verifier.expect
similarity index 100%
rename from Test/dafny4/git-issue105.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ClassRefinement.dfy.verifier.expect
diff --git a/Test/dafny4/CoqArt-InsertionSort.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/CoqArt-InsertionSort.dfy
similarity index 97%
rename from Test/dafny4/CoqArt-InsertionSort.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/CoqArt-InsertionSort.dfy
index 33c932df695..b9257ef0159 100644
--- a/Test/dafny4/CoqArt-InsertionSort.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/CoqArt-InsertionSort.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 // Dafny transcription of the Coq development of insertion sort, as found in Coq'Art.
 
diff --git a/Test/dafny4/CoqArt-InsertionSort.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/CoqArt-InsertionSort.dfy.expect
similarity index 100%
rename from Test/dafny4/CoqArt-InsertionSort.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/CoqArt-InsertionSort.dfy.expect
diff --git a/Test/dafny4/ExpandedGuardedness.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy
similarity index 93%
rename from Test/dafny4/ExpandedGuardedness.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy
index 3680d0e200f..c2d37d1cfa8 100644
--- a/Test/dafny4/ExpandedGuardedness.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy
@@ -1,5 +1,5 @@
 // UNSUPPORTED: windows
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 method Main() // Windows not supported because of Java that does not pass the check as expected on the CI
 {
   PrintStream("Up", Up(19));
@@ -141,10 +141,10 @@ function OnlyDs(): Lang<char>
 greatest predicate TotalLang<S(!new)>(l: Lang<S>)
   reads *
 {
-  forall s: S :: l.deriv.reads(s) == {} && l.deriv.requires(s) && TotalLang(l.deriv(s))
+  forall s: S :: l.deriv.requires(s) && l.deriv.reads(s) == {} && TotalLang(l.deriv(s))
 }
 
-greatest lemma NothingTotal<S>()
+greatest lemma NothingTotal<S(!new)>()
   ensures TotalLang(Nothing<S>())
 {
 }
@@ -159,10 +159,10 @@ greatest lemma OnlyDsTotal()
 greatest predicate TotalLang_Nat<S(!new)>[nat](l: Lang<S>)
   reads *
 {
-  forall s: S :: l.deriv.reads(s) == {} && l.deriv.requires(s) && TotalLang_Nat(l.deriv(s))
+  forall s: S :: l.deriv.requires(s) && l.deriv.reads(s) == {} && TotalLang_Nat(l.deriv(s))
 }
 
-greatest lemma NothingTotal_Nat<S>[nat]()
+greatest lemma NothingTotal_Nat<S(!new)>[nat]()
   ensures TotalLang_Nat(Nothing<S>())
 {
 }
diff --git a/Test/dafny4/ExpandedGuardedness.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy.expect
similarity index 100%
rename from Test/dafny4/ExpandedGuardedness.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy.java.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy.java.check
new file mode 100644
index 00000000000..53575c6f982
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy.java.check
@@ -0,0 +1,2 @@
+// https://github.com/dafny-lang/dafny/issues/4124
+// CHECK: int cannot be converted to CodePoint
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy.rs.check
new file mode 100644
index 00000000000..d2c004c65de
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardedness.dfy.rs.check
@@ -0,0 +1 @@
+//CHECK: .*<i>Unsupported: Datatype constructor ML expects 2 arguments, but 3 were provided</i>.*
\ No newline at end of file
diff --git a/Test/dafny4/ExpandedGuardednessNeg.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardednessNeg.dfy
similarity index 83%
rename from Test/dafny4/ExpandedGuardednessNeg.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardednessNeg.dfy
index 6fa7b54fa05..bb0f667fba0 100644
--- a/Test/dafny4/ExpandedGuardednessNeg.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardednessNeg.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 codatatype Stream<T> = ICons(head: T, tail: Stream<T>)
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardednessNeg.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardednessNeg.dfy.expect
new file mode 100644
index 00000000000..1752c659c63
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/ExpandedGuardednessNeg.dfy.expect
@@ -0,0 +1,8 @@
+ExpandedGuardednessNeg.dfy(8,27): Error: cannot prove termination; try supplying a decreases clause (note that calls cannot be co-recursive in this context)
+ExpandedGuardednessNeg.dfy(8,27): Error: decreases expression must be bounded below by 0
+ExpandedGuardednessNeg.dfy(6,20): Related location: this proposition could not be proved
+ExpandedGuardednessNeg.dfy(13,27): Error: cannot prove termination; try supplying a decreases clause
+ExpandedGuardednessNeg.dfy(13,27): Error: decreases expression must be bounded below by 0
+ExpandedGuardednessNeg.dfy(11,27): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Test/dafny4/FlyingRobots.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/FlyingRobots.dfy
similarity index 97%
rename from Test/dafny4/FlyingRobots.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/FlyingRobots.dfy
index f14a2a467cd..55eb5478cee 100644
--- a/Test/dafny4/FlyingRobots.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/FlyingRobots.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // The flying robots examples from an F* tutorial.  It demonstrates how to specify
 // mutable data structures in the heap.
@@ -212,7 +212,7 @@ method FlyRobotArmy(bots:seq<Bot>)
   }
 }
 
-method FlyRobotArmy_Recursively(bots:seq<Bot>)
+method {:resource_limit "100e6"} FlyRobotArmy_Recursively(bots:seq<Bot>)
   requires ValidArmy(bots)
   modifies ArmyRepr(bots)
   ensures ValidArmy(bots)
diff --git a/Test/dafny4/git-issue43.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/FlyingRobots.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue43.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/FlyingRobots.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/FlyingRobots.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/FlyingRobots.dfy.rs.check
new file mode 100644
index 00000000000..0a3c4598790
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/FlyingRobots.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0369]: binary operation `!=` cannot be applied to type `Sequence<Rc<Bot>>`
\ No newline at end of file
diff --git a/Test/dafny4/Fstar-QuickSort.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Fstar-QuickSort.dfy
similarity index 97%
rename from Test/dafny4/Fstar-QuickSort.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Fstar-QuickSort.dfy
index 20ccb921059..3ed1076df2e 100644
--- a/Test/dafny4/Fstar-QuickSort.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Fstar-QuickSort.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // A Dafny rendition of an F* version of QuickSort (included at the bottom of this file).
 // Unlike the F* version, Dafny also proves termination and does not use any axioms.  However,
diff --git a/Test/dafny4/Fstar-QuickSort.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Fstar-QuickSort.dfy.expect
similarity index 100%
rename from Test/dafny4/Fstar-QuickSort.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Fstar-QuickSort.dfy.expect
diff --git a/Test/dafny4/GHC-MergeSort.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/GHC-MergeSort.dfy
similarity index 97%
rename from Test/dafny4/GHC-MergeSort.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/GHC-MergeSort.dfy
index 31accd685a2..4463e4a41a6 100644
--- a/Test/dafny4/GHC-MergeSort.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/GHC-MergeSort.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"
+// RUN: %verify --manual-triggers "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Rustan Leino
@@ -382,8 +382,10 @@ lemma sorted_reverse(xs: List<G>, ys: List<G>)
 {
   match xs
   case Nil =>
-  case Cons(x, rest) =>
+  case Cons(x, rest) => {
     sorted_reverse(rest, Cons(x, ys));
+    assert forall a,b :: a in multiset_of(xs) && b in multiset_of(ys) ==> Below(a, b);
+  }
 }
 
 lemma sorted_insertInMiddle(xs: List<G>, a: G, ys: List<G>)
@@ -472,6 +474,17 @@ lemma stable_sequences(g: G, xs: List<G>)
     case Cons(a, ys) =>
       match ys {
         case Nil =>
+          calc {
+            flatten(sequences(xs));
+            // def. sequences, since xs == Cons(a, Nil)
+            flatten(Cons(xs, Nil));
+            // def. flatten
+            append(xs, flatten(Nil));
+            // def. flatten
+            append(xs, Nil);
+            { append_Nil(xs); }
+            xs;
+          }
         case Cons(b, zs) =>
           if !Below(a, b) {
             calc {
diff --git a/Test/dafny4/GHC-MergeSort.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/GHC-MergeSort.dfy.expect
similarity index 100%
rename from Test/dafny4/GHC-MergeSort.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/GHC-MergeSort.dfy.expect
diff --git a/Test/dafny4/Issue09.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Issue09.dfy
similarity index 90%
rename from Test/dafny4/Issue09.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Issue09.dfy
index bc3399acbb6..33e7cf5419d 100755
--- a/Test/dafny4/Issue09.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Issue09.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost function Transform(x:int) : int
 
diff --git a/Test/examples/induction-principle-code/Utils.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Issue09.dfy.expect
similarity index 100%
rename from Test/examples/induction-principle-code/Utils.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Issue09.dfy.expect
diff --git a/Test/dafny4/Juggernaut.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Juggernaut.dfy
similarity index 81%
rename from Test/dafny4/Juggernaut.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Juggernaut.dfy
index c85768bc021..4fc772ad137 100644
--- a/Test/dafny4/Juggernaut.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Juggernaut.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Jug()
diff --git a/Test/dafny4/git-issue2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Juggernaut.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Juggernaut.dfy.expect
diff --git a/Test/dafny4/KozenSilva.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/KozenSilva.dfy
similarity index 99%
rename from Test/dafny4/KozenSilva.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/KozenSilva.dfy
index f595e830f15..e2f0548f1fe 100644
--- a/Test/dafny4/KozenSilva.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/KozenSilva.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Dafny versions of examples from "Practical Coinduction" by Kozen and Silva.
 // The comments in this file explain some things about Dafny and its support for
diff --git a/Test/dafny4/KozenSilva.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/KozenSilva.dfy.expect
similarity index 100%
rename from Test/dafny4/KozenSilva.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/KozenSilva.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/LargeConstants.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/LargeConstants.dfy
new file mode 100644
index 00000000000..b910d86bfa3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/LargeConstants.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+lemma largeIsLarge()
+  ensures 0x8000000000000000 > 0 {
+}
+
+lemma SmallIsSmall()
+  ensures -0x8000000000000000 < 0 {
+}
+
+lemma ShouldCancelOut()
+  ensures -0x8000000000000000 + 0x8000000000000000 == 0 {
+}
diff --git a/Test/dafny4/git-issue148.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/LargeConstants.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue148.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/LargeConstants.dfy.expect
diff --git a/Test/dafny4/LeastGreatest.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/LeastGreatest.dfy
similarity index 92%
rename from Test/dafny4/LeastGreatest.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/LeastGreatest.dfy
index e378cb150bb..c6318ed93d9 100644
--- a/Test/dafny4/LeastGreatest.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/LeastGreatest.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 least predicate Natural(x: int) {
   x == 0 || Natural(x - 1)
diff --git a/Test/dafny4/LeastGreatest.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/LeastGreatest.dfy.expect
similarity index 100%
rename from Test/dafny4/LeastGreatest.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/LeastGreatest.dfy.expect
diff --git a/Test/dafny4/Leq.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Leq.dfy
similarity index 97%
rename from Test/dafny4/Leq.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Leq.dfy
index db689b8fe1c..31c0f6b1d57 100644
--- a/Test/dafny4/Leq.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Leq.dfy
@@ -1,5 +1,5 @@
 // UNSUPPORTED: windows, macosx
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // Rustan Leino, 22 Sep 2015.
 // This file considers two definitions of Leq on naturals+infinity.  One
diff --git a/Test/dafny4/git-issue79.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Leq.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue79.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Leq.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Leq.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Leq.dfy.rs.check
new file mode 100644
index 00000000000..a3387c44492
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Leq.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `LazyFieldWrapper<Rc<Nat>>: Clone` is not satisfied
\ No newline at end of file
diff --git a/Test/dafny4/Lucas-down.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-down.dfy
similarity index 98%
rename from Test/dafny4/Lucas-down.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-down.dfy
index 13194ada46f..6fafc6fbf64 100644
--- a/Test/dafny4/Lucas-down.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-down.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /arith:1 "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Proof of the Lucas theorem
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-down.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-down.dfy.expect
new file mode 100644
index 00000000000..e5f9ee5a233
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-down.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 12 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-up.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-up.dfy
new file mode 100644
index 00000000000..26c390d88dc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-up.dfy
@@ -0,0 +1,375 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Proof of the Lucas theorem, following the structure of a HOL-Light
+// proof of the same theorem by John Harrison. The lemmas in this
+// version go "up", like:
+//   P(k) == P(2*k)
+//   P(k) == P(2*k + 1)
+//
+// Rustan Leino
+// 7 March 2018
+// Updated 25 Oct 2024 to write the proofs manually
+
+// This file defines the ingredients of the Lucas theorem, proves some
+// properties of these, and then states and proves the Lucas theorem
+// itself.
+
+// The following predicate gives the boolean value of bit "k" in
+// the natural number "n".
+ghost predicate Bit(k: nat, n: nat)
+{
+  if k == 0 then n % 2 == 1
+  else Bit(k-1, n / 2)
+}
+
+// This lemma says that bit 0 of an even number is never set.
+lemma ZeroBitOfEven(n: nat)
+  ensures !Bit(0, 2*n)
+{
+  var r := 2*n;
+  assert Bit(0, r) <==> r % 2 == 1;
+}
+
+// Function "BitSet" returns the set of bits in the binary representation
+// of a number.
+ghost function BitSet(n: nat): set<nat>
+{
+  set i | 0 <= i < n && Bit(i, n)
+}
+
+// The following lemma shows that the "i < n" conjunct in
+// the set comprehension in "BitSet" does not restrict
+// the set any more than the conjunct "Bit(i, n)" does.
+lemma BitSize(i: nat, n: nat)
+  requires Bit(i, n)
+  ensures i < n
+{
+}
+
+// An easy-to-read name for the expression that checks if a number
+// is even.
+opaque ghost predicate EVEN(n: nat)
+{
+  n % 2 == 0
+}
+
+lemma EvenPlus(a: nat, b: nat)
+  ensures EVEN(a + b) <==> EVEN(a) == EVEN(b)
+{
+  reveal EVEN();
+}
+
+// The binomial function is defined like in the Pascal triangle.
+// "binom(a, b)" is also known as "a choose b".
+opaque ghost function binom(a: nat, b: nat): nat
+{
+  if b == 0 then 1
+  else if a == 0 then 0
+  else binom(a-1, b) + binom(a-1, b-1)
+}
+
+// This lemma shows that the parity of "binom" is preserved if
+// div-2 is applied to both arguments, except in the case where
+// the first argument to "binom" is even and the second argument
+// is odd, in which case "binom" is always even.
+lemma {:induction false} Lucas_Binary(a: nat, b: nat)
+  ensures EVEN(binom(2*a, 2*b + 1))
+  ensures EVEN(binom(2*a, 2*b)) <==> EVEN(binom(a, b))
+  ensures EVEN(binom(2*a + 1, 2*b + 1)) <==> EVEN(binom(a, b))
+  ensures EVEN(binom(2*a + 1, 2*b)) <==> EVEN(binom(a, b))
+{
+  Lucas_Binary01(a, b);
+  Lucas_Binary00(a, b);
+  Lucas_Binary11(a, b);
+  Lucas_Binary10(a, b);
+}
+
+lemma {:induction false} Lucas_Binary01(a: nat, b: nat)
+  ensures EVEN(binom(2*a, 2*b + 1))
+  decreases a, b, 0
+{
+  var aa, bb := 2*a, 2*b + 1;
+  var r := binom(aa, bb);
+
+  assert bb != 0;
+  if aa == 0 {
+    assert r == 0 && EVEN(r) by {
+      reveal binom(), EVEN();
+    }
+  } else {
+    var a', b' := a - 1, b - 1;
+    calc {
+      EVEN(r);
+      { reveal binom(); }
+      EVEN(binom(aa - 1, bb) + binom(aa - 1, bb - 1));
+      { assert aa - 1 == 2*a' + 1; assert bb == 2*b + 1; }
+      EVEN(binom(2*a' + 1, 2*b + 1) + binom(2*a' + 1, 2*b));
+      { EvenPlus(binom(2*a' + 1, 2*b + 1), binom(2*a' + 1, 2*b)); }
+      EVEN(binom(2*a' + 1, 2*b + 1)) <==> EVEN(binom(2*a' + 1, 2*b));
+      { Lucas_Binary11(a', b); }
+      EVEN(binom(a', b)) <==> EVEN(binom(2*a' + 1, 2*b));
+      { Lucas_Binary10(a', b); }
+      EVEN(binom(a', b)) <==> EVEN(binom(a', b));
+      true;
+    }
+  }
+}
+
+lemma {:induction false} Lucas_Binary00(a: nat, b: nat)
+  ensures EVEN(binom(2*a, 2*b)) <==> EVEN(binom(a, b))
+  decreases a, b, 0
+{
+  var aa, bb := 2*a, 2*b;
+  var r := binom(aa, bb);
+
+  if bb == 0 {
+    assert b == 0;
+    assert r == binom(a, b) by {
+      reveal binom();
+    }
+  } else if aa == 0 {
+    assert a == 0;
+    assert r == binom(a, b) by {
+      reveal binom();
+    }
+  } else {
+    var a', b' := a - 1, b - 1;
+    calc {
+      EVEN(r);
+      { reveal binom(); }
+      EVEN(binom(aa - 1, bb) + binom(aa - 1, bb - 1));
+      { assert aa - 1 == 2*a' + 1; assert bb - 1 == 2*b' + 1; }
+      EVEN(binom(2*a' + 1, 2*b) + binom(2*a' + 1, 2*b' + 1));
+      { EvenPlus(binom(2*a' + 1, 2*b), binom(2*a' + 1, 2*b' + 1)); }
+      EVEN(binom(2*a' + 1, 2*b)) <==> EVEN(binom(2*a' + 1, 2*b' + 1));
+      { Lucas_Binary11(a', b'); }
+      EVEN(binom(2*a' + 1, 2*b)) <==> EVEN(binom(2*a' + 1, 2*b' + 1));
+      { assert binom(2*a' + 1, 2*b) == binom(2*a', 2*b) + binom(2*a', 2*b - 1) by { reveal binom(); } }
+      EVEN(binom(2*a', 2*b) + binom(2*a', 2*b - 1)) <==> EVEN(binom(2*a' + 1, 2*b' + 1));
+      { EvenPlus(binom(2*a', 2*b), binom(2*a', 2*b - 1)); }
+      EVEN(binom(2*a', 2*b)) <==> EVEN(binom(2*a', 2*b - 1)) <==> EVEN(binom(2*a' + 1, 2*b' + 1));
+      { Lucas_Binary00(a', b); }
+      EVEN(binom(a', b)) <==> EVEN(binom(2*a', 2*b - 1)) <==> EVEN(binom(2*a' + 1, 2*b' + 1));
+      { Lucas_Binary11(a', b'); }
+      EVEN(binom(a', b)) <==> EVEN(binom(2*a', 2*b - 1)) <==> EVEN(binom(a', b'));
+      { assert 2*b - 1 == 2*b' + 1; }
+      EVEN(binom(a', b)) <==> EVEN(binom(2*a', 2*b' + 1)) <==> EVEN(binom(a', b'));
+      { Lucas_Binary01(a', b'); }
+      EVEN(binom(a', b)) <==> EVEN(binom(a', b'));
+      { EvenPlus(binom(a', b), binom(a', b')); }
+      EVEN(binom(a', b) + binom(a', b'));
+      { reveal binom(); }
+      EVEN(binom(a, b));
+    }
+  }
+}
+
+lemma {:induction false} Lucas_Binary11(a: nat, b: nat)
+  ensures EVEN(binom(2*a + 1, 2*b + 1)) <==> EVEN(binom(a, b))
+{
+  var aa, bb := 2*a + 1, 2*b + 1;
+  var r := binom(aa, bb);
+
+  assert bb != 0;
+  assert aa != 0;
+  var a', b' := a - 1, b - 1;
+  calc {
+    EVEN(r);
+    { reveal binom(); }
+    EVEN(binom(2*a, 2*b + 1) + binom(2*a, 2*b));
+    { EvenPlus(binom(2*a, 2*b + 1), binom(2*a, 2*b)); }
+    EVEN(binom(2*a, 2*b + 1)) <==> EVEN(binom(2*a, 2*b));
+    { Lucas_Binary01(a, b); }
+    EVEN(binom(2*a, 2*b));
+    { Lucas_Binary00(a, b); }
+    EVEN(binom(a, b));
+  }
+}
+
+lemma {:induction false} Lucas_Binary10(a: nat, b: nat)
+  ensures EVEN(binom(2*a + 1, 2*b)) <==> EVEN(binom(a, b))
+{
+  var aa, bb := 2*a + 1, 2*b;
+  var r := binom(aa, bb);
+
+  assert aa != 0;
+  if bb == 0 {
+    assert b == 0;
+    assert r == binom(a, b) by {
+      reveal binom();
+    }
+  } else {
+    var a', b' := a - 1, b - 1;
+    calc {
+      EVEN(r);
+      { reveal binom(); }
+      EVEN(binom(2*a, 2*b) + binom(2*a, 2*b' + 1));
+      { EvenPlus(binom(2*a, 2*b), binom(2*a, 2*b' + 1)); }
+      EVEN(binom(2*a, 2*b)) <==> EVEN(binom(2*a, 2*b' + 1));
+      { Lucas_Binary00(a, b); }
+      EVEN(binom(a, b)) <==> EVEN(binom(2*a, 2*b' + 1));
+      { Lucas_Binary01(a, b'); }
+      EVEN(binom(a, b));
+    }
+  }
+}
+
+// Here is an alternative way to phrase the previous lemma.
+lemma {:induction false} Lucas_Binary'(a: nat, b: nat)
+  ensures binom(2*a, 2*b) % 2 == binom(a, b) % 2
+  ensures binom(2*a, 2*b + 1) % 2 == 0
+  ensures binom(2*a + 1, 2*b) % 2 == binom(a, b) % 2
+  ensures binom(2*a + 1, 2*b + 1) % 2 == binom(a, b) % 2
+{
+  Lucas_Binary(a, b);
+  reveal EVEN();
+}
+
+// "Suc(S)" returns the set constructed by incrementing
+// each number in "S" by 1. Stated differently, it is the
+// increment-by-1 (successor) function applied pointwise to the
+// set.
+ghost function Suc(S: set<nat>): set<nat>
+{
+  set x | x in S :: x + 1
+}
+
+// The following lemma clearly shows the correspondence between
+// "S" and "Suc(S)".
+lemma SucElements(S: set<nat>)
+  ensures forall x :: x in S <==> (x+1) in Suc(S)
+{
+}
+
+// 0 is not in any set returned by "Suc".
+lemma ZeroNotInImageSuc(S: set<nat>)
+  ensures 0 !in Suc(S)
+{
+}
+
+lemma BitSet_Clauses(n: nat)
+  ensures BitSet(2*n) == Suc(BitSet(n))
+  ensures BitSet(2*n + 1) == {0} + Suc(BitSet(n))
+{
+  if n == 0 {
+  } else {
+    var nn := 2 * n;
+    forall x: nat {
+      calc {
+        x in BitSet(2*n);
+      ==  // def. BitSet
+        0 <= x < 2*n && Bit(x, 2*n);
+      ==  { ZeroBitOfEven(n); }
+        0 < x < 2*n && Bit(x, 2*n);
+      ==  { assert 0 < x ==> Bit(x, nn) == Bit(x-1, nn / 2); }
+        0 < x < 2*n && Bit(x-1, n);
+      ==  { if 0 < x && Bit(x-1, n) { BitSize(x-1, n); } }
+        0 <= x-1 < n && Bit(x-1, n);
+      ==  // def. BitSet
+        (x-1) in BitSet(n);
+      ==  // def. Suc
+        x in Suc(BitSet(n));
+      }
+    }
+    forall x: nat {
+      calc {
+        x in BitSet(2*n + 1);
+      ==  // def. BitSet
+        0 <= x < 2*n + 1 && Bit(x, 2*n + 1);
+      ==  { assert x == 0 ==> Bit(x, 2*n + 1); }
+        x == 0 || (0 < x < 2*n + 1 && Bit(x, 2*n + 1));
+      ==  { assert (2*n + 1) / 2 == n; }
+        x == 0 || (0 < x < 2*n + 1 && Bit(x-1, n));
+      ==  { if 0 < x && Bit(x-1, n) { BitSize(x-1, n); } }
+        x == 0 || (x-1) in BitSet(n);
+      ==
+        x == 0 || x in Suc(BitSet(n));
+      ==
+        x in {0} + Suc(BitSet(n));
+      }
+    }
+  }
+}
+
+// The following gives an induction principle for any two-argument
+// predicate "P" that satisfies the 5 listed properties.
+// (This lemma is not actually used in this proof of the Lucas theorem.)
+lemma INDUCTION_EVEN_ODD(P: (nat, nat) -> bool, A: nat, B: nat)
+  requires P(0, 0)
+  requires forall a: nat, b: nat :: P(a, b) ==> P(2*a, 2*b)
+  requires forall a: nat, b: nat :: P(a, b) ==> P(2*a, 2*b + 1)
+  requires forall a: nat, b: nat :: P(a, b) ==> P(2*a + 1, 2*b)
+  requires forall a: nat, b: nat :: P(a, b) ==> P(2*a + 1, 2*b + 1)
+  ensures P(A, B)
+{
+  if A == 0 && B == 0 {
+  } else {
+    var a, b := A / 2, B / 2;
+    assert A == 2*a || A == 2*a + 1;
+    assert B == 2*b || B == 2*b + 1;
+    INDUCTION_EVEN_ODD(P, a, b);
+  }
+}
+
+lemma Lucas_Theorem(m: nat, n: nat)
+  ensures BitSet(m) <= BitSet(n) <==> !EVEN(binom(n, m))
+{
+  if m == 0 && n == 0 {
+    assert binom(n, m) == 1 && !EVEN(1) by {
+      reveal binom(), EVEN();
+    }
+  } else {
+    var m', n' := m/2, n/2;
+    if {
+      case m == 2*m' && n == 2*n' =>
+        calc {
+          !EVEN(binom(n, m));
+        ==  { Lucas_Binary(n', m'); }
+          !EVEN(binom(n', m'));
+        ==  { Lucas_Theorem(m', n'); }
+          BitSet(m') <= BitSet(n');
+        ==  { SucElements(BitSet(m')); SucElements(BitSet(n')); }
+          Suc(BitSet(m')) <= Suc(BitSet(n'));
+        ==  { BitSet_Clauses(m'); BitSet_Clauses(n'); }
+          BitSet(2*m') <= BitSet(2*n');
+        }
+      case m == 2*m' && n == 2*n' + 1 =>
+        calc {
+          !EVEN(binom(n, m));
+        ==  { Lucas_Binary(n', m'); }
+          !EVEN(binom(n', m'));
+        ==  { Lucas_Theorem(m', n'); }
+          BitSet(m') <= BitSet(n');
+        ==  { SucElements(BitSet(m')); SucElements(BitSet(n')); }
+          Suc(BitSet(m')) <= Suc(BitSet(n'));
+        ==  { ZeroNotInImageSuc(BitSet(m')); }
+          Suc(BitSet(m')) <= {0} + Suc(BitSet(n'));
+        ==  { BitSet_Clauses(m'); BitSet_Clauses(n'); }
+          BitSet(2*m') <= BitSet(2*n' + 1);
+        }
+      case m == 2*m' + 1 && n == 2*n' =>
+        calc {
+          !EVEN(binom(n, m));
+        ==  { Lucas_Binary(n', m'); }
+          false;
+        ==  { assert 0 in BitSet(m) && 0 !in BitSet(n); }
+          BitSet(m) <= BitSet(n);
+        }
+      case m == 2*m' + 1 && n == 2*n' + 1 =>
+        calc {
+          !EVEN(binom(n, m));
+        ==  { Lucas_Binary(n', m'); }
+          !EVEN(binom(n', m'));
+        ==  { Lucas_Theorem(m', n'); }
+          BitSet(m') <= BitSet(n');
+        ==  { SucElements(BitSet(m')); SucElements(BitSet(n')); }
+          Suc(BitSet(m')) <= Suc(BitSet(n'));
+        ==  { ZeroNotInImageSuc(BitSet(m')); ZeroNotInImageSuc(BitSet(n')); }
+          ({0} + Suc(BitSet(m'))) <= {0} + Suc(BitSet(n'));
+        ==  { BitSet_Clauses(m'); BitSet_Clauses(n'); }
+          BitSet(2*m' + 1) <= BitSet(2*n' + 1);
+        }
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-up.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-up.dfy.expect
new file mode 100644
index 00000000000..9e74af046b4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Lucas-up.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 29 verified, 0 errors
diff --git a/Test/dafny4/McCarthy91.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/McCarthy91.dfy
similarity index 94%
rename from Test/dafny4/McCarthy91.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/McCarthy91.dfy
index 428f11eb269..db0667cf304 100644
--- a/Test/dafny4/McCarthy91.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/McCarthy91.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 // The usual recursive method for computing McCarthy's 91 function
 
 method Main() {
diff --git a/Test/dafny4/McCarthy91.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/McCarthy91.dfy.expect
similarity index 100%
rename from Test/dafny4/McCarthy91.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/McCarthy91.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/McCarthy91.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/McCarthy91.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/McCarthy91.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny4/MonadicLaws.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/MonadicLaws.dfy
similarity index 95%
rename from Test/dafny4/MonadicLaws.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/MonadicLaws.dfy
index 08b98652e06..02022da1295 100644
--- a/Test/dafny4/MonadicLaws.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/MonadicLaws.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /rprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Monadic Laws
 // Niki Vazou and Rustan Leino
diff --git a/Test/git-issues/git-issue-1250.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/MonadicLaws.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1250.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/MonadicLaws.dfy.expect
diff --git a/Test/dafny4/NatList.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NatList.dfy
similarity index 96%
rename from Test/dafny4/NatList.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NatList.dfy
index 5a1b0358eaf..2bca1c73de0 100644
--- a/Test/dafny4/NatList.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NatList.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // This file tests some programs where "nat" is a type parameter to
 // a datatype.
diff --git a/Test/dafny4/NatList.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NatList.dfy.expect
similarity index 100%
rename from Test/dafny4/NatList.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NatList.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NatList.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NatList.dfy.rs.check
new file mode 100644
index 00000000000..ed0f1773816
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NatList.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type\ variance\ Co\ not\ supported</i>.*
\ No newline at end of file
diff --git a/Test/dafny4/NipkowKlein-chapter3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter3.dfy
similarity index 98%
rename from Test/dafny4/NipkowKlein-chapter3.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter3.dfy
index 92c345a3cd1..83e4832b070 100644
--- a/Test/dafny4/NipkowKlein-chapter3.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter3.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /proverOpt:O:smt.qi.eager_threshold=30 /compile:0 /rprint:"%t.rprint" "%s" > "%t"
+// RUN: %verify --solver-option="O:smt.qi.eager_threshold=30" "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file is a Dafny encoding of chapter 3 from "Concrete Semantics: With Isabelle/HOL" by
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter3.dfy.expect
new file mode 100644
index 00000000000..842d05da0e6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter3.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 20 verified, 0 errors
diff --git a/Test/dafny4/NipkowKlein-chapter7.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter7.dfy
similarity index 99%
rename from Test/dafny4/NipkowKlein-chapter7.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter7.dfy
index 60ae262da83..3dc14c07ed1 100644
--- a/Test/dafny4/NipkowKlein-chapter7.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter7.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /rprint:"%t.rprint" /autoTriggers:0 "%s" > "%t"
+// RUN: %verify --manual-triggers "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file is a Dafny encoding of chapter 7 from "Concrete Semantics: With Isabelle/HOL" by
@@ -240,6 +240,7 @@ least lemma star_transitive_aux(c0: com, s0: state, c1: com, s1: state, c2: com,
   requires small_step_star(c0, s0, c1, s1)
   ensures small_step_star(c1, s1, c2, s2) ==> small_step_star(c0, s0, c2, s2)
 {
+  if small_step_star(c1, s1, c2, s2) {}
 }
 
 // The big-step semantics can be simulated by some number of small steps
diff --git a/Test/dafny4/NipkowKlein-chapter7.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter7.dfy.expect
similarity index 100%
rename from Test/dafny4/NipkowKlein-chapter7.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NipkowKlein-chapter7.dfy.expect
diff --git a/Test/dafny4/NumberRepresentations.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NumberRepresentations.dfy
similarity index 99%
rename from Test/dafny4/NumberRepresentations.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NumberRepresentations.dfy
index df54c7b3509..9f8066a2899 100644
--- a/Test/dafny4/NumberRepresentations.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NumberRepresentations.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // We consider a number representation that consists of a sequence of digits.  The least
 // significant digit is stored at index 0.
diff --git a/Test/dafny4/NumberRepresentations.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NumberRepresentations.dfy.expect
similarity index 100%
rename from Test/dafny4/NumberRepresentations.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/NumberRepresentations.dfy.expect
diff --git a/Test/dafny4/OpaqueBug.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/OpaqueBug.dfy
similarity index 92%
rename from Test/dafny4/OpaqueBug.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/OpaqueBug.dfy
index ffea139abb6..17e1d07f4b0 100755
--- a/Test/dafny4/OpaqueBug.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/OpaqueBug.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost predicate inner(x:int, y:int) { x == y}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/OpaqueBug.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/OpaqueBug.dfy.expect
new file mode 100644
index 00000000000..7ac7aa1b6e6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/OpaqueBug.dfy.expect
@@ -0,0 +1,4 @@
+OpaqueBug.dfy(13,4): Error: assertion might not hold
+OpaqueBug.dfy(23,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny4/Primes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Primes.dfy
similarity index 89%
rename from Test/dafny4/Primes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Primes.dfy
index 0c3a9177e7d..cdff93cd0cc 100644
--- a/Test/dafny4/Primes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Primes.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost predicate IsPrime(n: int)
 {
@@ -56,7 +56,7 @@ lemma GetLargerPrime(s: set<int>, bound: int) returns (p: int)
   }
 }
 
-ghost function product(s: set<int>): int
+opaque ghost function product(s: set<int>): int
 {
   if s == {} then 1 else
   var a := PickLargest(s); a * product(s - {a})
@@ -66,6 +66,7 @@ lemma product_property(s: set<int>)
   requires forall x :: x in s ==> 1 <= x
   ensures 1 <= product(s) && forall x :: x in s ==> x <= product(s)
 {
+  reveal product();
   if s != {} {
     var a := PickLargest(s);
     var s' := s - {a};
@@ -108,23 +109,23 @@ lemma RemoveFactor(x: int, s: set<int>)
   ensures product(s) == x * product(s - {x})
 {
   var y := PickLargest(s);
-  if x != y {
+  if x == y {
+    reveal product();
+  } else {
     calc {
       product(s);
+      { reveal product(); }
       y * product(s - {y});
       { RemoveFactor(x, s - {y}); }
       y * x * product(s - {y} - {x});
       x * y * product(s - {y} - {x});
       { assert s - {y} - {x} == s - {x} - {y}; }
       x * y * product(s - {x} - {y});
-      /* FIXME: This annotation wasn't needed before the introduction
-       * of auto-triggers. It's not needed if one adds {:no_trigger}
-       * to the forall y :: y in s ==> y <= x part of PickLargest, but that
-       * boils down to z3 picking $Box(...) as good trigger
-       */
-      // FIXME: the parens shouldn't be needed around (s - {x})
-      { assert y in (s - {x}); }
-      { assert y == PickLargest(s - {x}); }
+      { assert y * product(s - {x} - {y}) == product(s - {x}) by {
+          reveal product();
+          assert y in s - {x};
+        }
+      }
       x * product(s - {x});
     }
   }
@@ -186,8 +187,9 @@ lemma Composite(c: int) returns (a: int, b: int)
   }
 }
 
-ghost function PickLargest(s: set<int>): int
+opaque ghost function PickLargest(s: set<int>): (x: int)
   requires s != {}
+  ensures x in s && forall y :: y in s ==> y <= x
 {
   LargestElementExists(s);
   var x :| x in s && forall y :: y in s ==> y <= x;
diff --git a/Test/dafny4/Primes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Primes.dfy.expect
similarity index 100%
rename from Test/dafny4/Primes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Primes.dfy.expect
diff --git a/Test/dafny4/Regression0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression0.dfy
similarity index 89%
rename from Test/dafny4/Regression0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression0.dfy
index 276546d48e1..aab084a9455 100644
--- a/Test/dafny4/Regression0.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression0.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This once crashed Dafny
diff --git a/Test/dafny4/Regression0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression0.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression0.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression0.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression1.dfy
new file mode 100644
index 00000000000..c07347d1bf8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression1.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+ghost method M() {
+  var x :=
+// In the following line, why are the range and term copied in Substitute?
+//    var loo := 100; map y | 0 <= y < 100 :: y+1;
+    var loo := 100; imap y: int | true :: 3;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression1.dfy.expect
new file mode 100644
index 00000000000..79f7ff5f4ec
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression1.dfy.expect
@@ -0,0 +1,3 @@
+Regression1.dfy(8,20): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny4/Regression10.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression10.dfy
similarity index 78%
rename from Test/dafny4/Regression10.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression10.dfy
index b6c5ea2e74d..f83be70e176 100644
--- a/Test/dafny4/Regression10.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression10.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /rprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Once upon a time, the type parameter in the following line had caused
 // malformed Boogie to be generated.
diff --git a/Test/dafny4/Regression10.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression10.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression10.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression10.dfy.expect
diff --git a/Test/dafny4/Regression11.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression11.dfy
similarity index 94%
rename from Test/dafny4/Regression11.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression11.dfy
index c8a3cbd1657..787b49c61e2 100644
--- a/Test/dafny4/Regression11.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression11.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /rprint:"%t.rprint" "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Once upon a time, several of these would crash the resolver after it had reported
diff --git a/Test/dafny4/Regression11.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression11.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression11.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression11.dfy.expect
diff --git a/Test/dafny4/Regression12.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression12.dfy
similarity index 96%
rename from Test/dafny4/Regression12.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression12.dfy
index 0d9cdda914a..9da1016ad52 100644
--- a/Test/dafny4/Regression12.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression12.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
+// RUN: %exits-with 4 %build --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Some tests for the type inference that was revamped
diff --git a/Test/dafny4/Regression12.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression12.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression12.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression12.dfy.expect
diff --git a/Test/dafny4/Regression13.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression13.dfy
similarity index 90%
rename from Test/dafny4/Regression13.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression13.dfy
index f793136e697..1e1ae9c887a 100644
--- a/Test/dafny4/Regression13.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression13.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module M0 {
   type vname = string
diff --git a/Test/dafny4/Regression13.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression13.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression13.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression13.dfy.expect
diff --git a/Test/dafny4/Regression14.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression14.dfy
similarity index 86%
rename from Test/dafny4/Regression14.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression14.dfy
index ae97ec7ec09..f4296394509 100644
--- a/Test/dafny4/Regression14.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression14.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module AAA {
   ghost function Func(): int
diff --git a/Test/dafny4/Regression14.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression14.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression14.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression14.dfy.expect
diff --git a/Test/dafny4/Regression15.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression15.dfy
similarity index 97%
rename from Test/dafny4/Regression15.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression15.dfy
index c5f3de710d3..508850dc5e6 100644
--- a/Test/dafny4/Regression15.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression15.dfy
@@ -1,5 +1,5 @@
 // NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %dafny /compile:3 "%s" > "%t"
+// RUN: %run --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Main() {
diff --git a/Test/dafny4/Regression15.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression15.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression15.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression15.dfy.expect
diff --git a/Test/dafny4/Regression16.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression16.dfy
similarity index 95%
rename from Test/dafny4/Regression16.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression16.dfy
index e5e51e69e4e..f86a7f5da59 100644
--- a/Test/dafny4/Regression16.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression16.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype Tree = Leaf | Node(x: int, left: Tree, right: Tree)
 
diff --git a/Test/git-issues/git-issue-1875.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression16.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1875.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression16.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression17.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression17.dfy
new file mode 100644
index 00000000000..267055eba4d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression17.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+newtype nt = int
+
+method Test(x: int)
+{
+  var y := map[x := nt];  // error (but should not cause a crash): nt is a type
+}
diff --git a/Test/dafny4/Regression17.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression17.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression17.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression17.dfy.expect
diff --git a/Test/dafny4/Regression18.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression18.dfy
similarity index 91%
rename from Test/dafny4/Regression18.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression18.dfy
index 0423c955f50..dfbb1006b70 100644
--- a/Test/dafny4/Regression18.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression18.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module A {
   type X
diff --git a/Test/dafny4/Regression18.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression18.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression18.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression18.dfy.expect
diff --git a/Test/dafny4/Regression19.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression19.dfy
similarity index 95%
rename from Test/dafny4/Regression19.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression19.dfy
index e23b3c53a09..b5e45708341 100644
--- a/Test/dafny4/Regression19.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression19.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost predicate ContainsNothingBut5(s: set<int>)
 {
diff --git a/Test/dafny4/git-issue203.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression19.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue203.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression19.dfy.expect
diff --git a/Test/dafny4/Regression2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression2.dfy
similarity index 86%
rename from Test/dafny4/Regression2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression2.dfy
index 0d28285e74c..4802933ac90 100644
--- a/Test/dafny4/Regression2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression2.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 module NativeTypes {
   newtype uint64 = int
diff --git a/Test/dafny4/Regression2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression2.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression2.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression2.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression2.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression2.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression20.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression20.dfy
new file mode 100644
index 00000000000..4a6ab3a4c10
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression20.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// The type name "bv" once crashed the resolver
+
+method M(x: bv)  // error: undeclared type bv
diff --git a/Test/dafny4/Regression20.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression20.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression20.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression20.dfy.expect
diff --git a/Test/dafny4/Regression3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression3.dfy
similarity index 86%
rename from Test/dafny4/Regression3.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression3.dfy
index fc60fad3cb1..c1cb51d230d 100644
--- a/Test/dafny4/Regression3.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression3.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main()
 {
diff --git a/Test/dafny4/Regression3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression3.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression3.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression3.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression3.dfy.rs.check
new file mode 100644
index 00000000000..86b007ed165
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression3.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Special field: Floor</i>.*
\ No newline at end of file
diff --git a/Test/dafny4/Regression4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression4.dfy
similarity index 88%
rename from Test/dafny4/Regression4.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression4.dfy
index e4bc4cbef85..45688711595 100644
--- a/Test/dafny4/Regression4.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression4.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() { }
 
diff --git a/Test/dafny4/git-issue88.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression4.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue88.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression4.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression5.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression5.dfy
new file mode 100644
index 00000000000..9b850042f8a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression5.dfy
@@ -0,0 +1,16 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+type Syn = bv8
+
+method P(x: int) returns (y: bv8)
+  requires x < 256
+{
+  y := x as Syn;  // error: value might be negative
+}
+
+method Q() {
+  var r: real := -3.0;
+  var v: bv8;
+  v := r as bv8;  // error: value most certainly is negative
+}
diff --git a/Test/dafny4/Regression5.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression5.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression5.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression5.dfy.expect
diff --git a/Test/dafny4/Regression6.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression6.dfy
similarity index 85%
rename from Test/dafny4/Regression6.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression6.dfy
index b589ec0ce7d..9c6d08f8115 100644
--- a/Test/dafny4/Regression6.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression6.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 function Sum(a: array<int>, lo: int, hi: int): int
   requires 0 <= lo <= hi <= a.Length
diff --git a/Test/dafny4/Regression6.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression6.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression6.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression6.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression6.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression6.dfy.rs.check
new file mode 100644
index 00000000000..2f52477d3de
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression6.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the type `[DafnyInt]` cannot be indexed by `&DafnyInt`
\ No newline at end of file
diff --git a/Test/dafny4/Regression7.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression7.dfy
similarity index 88%
rename from Test/dafny4/Regression7.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression7.dfy
index ef3ca5eea44..fd33f489581 100644
--- a/Test/dafny4/Regression7.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression7.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 module ListLibrary {
   datatype List<B> = Nil | Cons(head: B, tail: List<B>)
diff --git a/Test/dafny4/Regression7.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression7.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression7.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression7.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression7.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression7.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression7.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny4/Regression8.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression8.dfy
similarity index 81%
rename from Test/dafny4/Regression8.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression8.dfy
index e71fd878691..7aeb78dede8 100644
--- a/Test/dafny4/Regression8.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression8.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 function F(x: int, w: int): (int, int)
   requires x < 100
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression8.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression8.dfy.expect
new file mode 100644
index 00000000000..cd90a425a91
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression8.dfy.expect
@@ -0,0 +1,4 @@
+Regression8.dfy(14,17): Error: function precondition could not be proved
+Regression8.dfy(5,13): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/Regression9.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression9.dfy
similarity index 87%
rename from Test/dafny4/Regression9.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression9.dfy
index 086007a3ef8..1e06bd025ec 100644
--- a/Test/dafny4/Regression9.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression9.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // Some tests for the type inference that was revamped
 // to better support subset types.
diff --git a/Test/dafny4/Regression9.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression9.dfy.expect
similarity index 100%
rename from Test/dafny4/Regression9.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression9.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression9.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression9.dfy.rs.check
new file mode 100644
index 00000000000..2aa97fc7205
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/Regression9.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `dyn for<'a> Fn(&'a DafnyInt) -> DafnyChar: Default` is not satisfied
\ No newline at end of file
diff --git a/Test/dafny4/SoftwareFoundations-Basics.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/SoftwareFoundations-Basics.dfy
similarity index 98%
rename from Test/dafny4/SoftwareFoundations-Basics.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/SoftwareFoundations-Basics.dfy
index d6fabf02ae0..6241e717e7e 100644
--- a/Test/dafny4/SoftwareFoundations-Basics.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/SoftwareFoundations-Basics.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Basics.v done in Dafny
 
@@ -240,7 +240,7 @@ method test_factorial1()
   var n10 := S(S(S(S(n6))));
   var n12 := S(S(n10));
 
-  assert factorial(n5)==mult(n10, n12);
+  assert {:split_here} factorial(n5)==mult(n10, n12);
 }
 
 method test_factorial1_old()
@@ -269,7 +269,7 @@ lemma plus_lemma(a: Nat, b: Nat, c: Nat)
 {}
 
 // This lemma expresses:  m*(2*n) == (2*m)*n
-lemma {:vcs_split_on_every_assert} mult_lemma(m: Nat, n: Nat)
+lemma {:isolate_assertions} mult_lemma(m: Nat, n: Nat)
   ensures mult(m, plus(n, n)) == mult(plus(m, m), n)
 {
   match m {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/SoftwareFoundations-Basics.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/SoftwareFoundations-Basics.dfy.expect
new file mode 100644
index 00000000000..f01c7815583
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/SoftwareFoundations-Basics.dfy.expect
@@ -0,0 +1,3 @@
+SoftwareFoundations-Basics.dfy(41,2): Error: assertion might not hold
+
+Dafny program verifier finished with 53 verified, 1 error
diff --git a/Test/dafny4/UnionFind.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/UnionFind.dfy
similarity index 97%
rename from Test/dafny4/UnionFind.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/UnionFind.dfy
index 354f28accb7..3831148a1cc 100644
--- a/Test/dafny4/UnionFind.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/UnionFind.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 // Rustan Leino, Nov 2015
 
 // Module M0 gives the high-level specification of the UnionFind data structure
@@ -65,7 +65,7 @@ abstract module M1 refines M0 {
       reads this, set a: Element | a in M
       ensures GoodCMap(Collect())
     {
-      map e | e in M :: e.c
+      map e : Element | e in M :: e.c
     }
     ghost predicate {:autocontracts false} Reaches(d: nat, e: Element, r: Element, C: CMap)
       requires GoodCMap(C)
@@ -264,7 +264,7 @@ module M3 refines M2 {
       }
     }
 
-    lemma {:autocontracts false} ReachUnaffectedByChangeFromRoot'(d: nat, e: Element, r: Element, C: CMap, td: nat, r0: Element, r1: Element, C': CMap)
+    lemma {:autocontracts false} {:induction d, e, r, C} {:nowarn} ReachUnaffectedByChangeFromRoot'(d: nat, e: Element, r: Element, C: CMap, td: nat, r0: Element, r1: Element, C': CMap)
       requires GoodCMap(C)
       requires e in C && Reaches(d, e, r, C)
       requires r0 in C && r1 in C && C[r0].Root? && C[r1].Root? && C[r0].depth == C[r1].depth && r0 != r1
diff --git a/Test/dafny4/UnionFind.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/UnionFind.dfy.expect
similarity index 100%
rename from Test/dafny4/UnionFind.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/UnionFind.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/UnionFind.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/UnionFind.dfy.rs.check
new file mode 100644
index 00000000000..7259f2ea2bc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/UnionFind.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0599]: no method named `borrow` found for struct `Rc<Contents>` in the current scope
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/gcd.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/gcd.dfy
new file mode 100644
index 00000000000..ad026ef48f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/gcd.dfy
@@ -0,0 +1,317 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
+
+// A text describing this file is found in a Dafny Power User note: http://leino.science/papers/krml279.html
+
+type pos = x | 1 <= x witness 1
+
+ghost predicate IsFactor(p: pos, x: pos) {
+  exists q :: p * q == x
+}
+
+lemma GetOtherFactor(p: pos, x: pos) returns (q: pos)
+  requires IsFactor(p, x)
+  ensures p * q == x
+{
+  q :| p * q == x;
+}
+
+ghost function Factors(x: pos): set<pos> {
+  set p: pos | p <= x && IsFactor(p, x)
+}
+
+// The following lemma proves that the conjunct "p <= x" in the
+// definition of Factors does not reduce the elements in the set.
+lemma FactorIsInFactors(p: pos, x: pos)
+  ensures p in Factors(x) <==> IsFactor (p, x)
+{
+}
+
+lemma FactorsContains1(x: pos)
+  ensures 1 in Factors(x)
+{
+  assert 1 * x == x;
+}
+
+lemma FactorsContainsSelf(x: pos)
+  ensures x in Factors(x)
+{
+  assert x * 1 == x;
+}
+
+// This is a somewhat declarative definition of Max
+ghost function Max(s: set<pos>): pos
+  requires s != {}
+{
+  // To use the :| operator below, we need to prove that such a value exists
+  MaxExists(s);
+  var x :| x in s && forall y :: y in s ==> y <= x;
+  x
+}
+
+lemma MaxExists(s: set<pos>)
+  requires s != {}
+  ensures exists x :: x in s && forall y :: y in s ==> y <= x
+{
+  // One way to show that such an x exists is to compute it
+  var x := FindMax(s);
+}
+
+// Here is a recursive definition for computing the max
+ghost function FindMax(s: set<pos>): (max: pos)
+  requires s != {}
+  ensures max in s && forall y :: y in s ==> y <= max
+{
+  var x :| x in s;
+  if s == {x} then
+    x
+  else
+    var s' := s - {x};
+    assert s == s' + {x};
+    var y := FindMax(s');
+    if x < y then y else x
+}
+
+opaque ghost function Gcd(x: pos, y: pos): pos {
+  var common := Factors(x) * Factors(y);
+  assert 1 in common by {
+    FactorsContains1(x);
+    FactorsContains1(y);
+  }
+  Max(common)
+}
+
+lemma IsFactorGcdFirst(x: pos, y: pos)
+  ensures IsFactor(Gcd(x, y), x)
+{
+  reveal Gcd();
+}
+
+lemma IsFactorGcdSecond(x: pos, y: pos)
+  ensures IsFactor(Gcd(x, y), y)
+{
+  reveal Gcd();
+}
+
+lemma IsFactorGcdLess(x: pos, y: pos)
+  ensures forall p: pos :: IsFactor(p, x) && IsFactor(p, y) ==> p <= Gcd(x, y)
+{
+  hide IsFactor;
+  IsFactorGcdFirst(x, y);
+  IsFactorGcdSecond(x, y);
+  forall p: pos | IsFactor(p, x) && IsFactor(p, y)
+    ensures p <= Gcd(x, y)
+  {
+    var qx := GetOtherFactor(p, x);
+    var qy := GetOtherFactor(p, y);
+    reveal Gcd();
+    assert p in Factors(x) * Factors(y);
+  }
+}
+
+lemma AboutGcd(x: pos, y: pos)
+  ensures IsFactor(Gcd(x, y), x)
+  ensures IsFactor(Gcd(x, y), y)
+  ensures forall p: pos :: IsFactor(p, x) && IsFactor(p, y) ==> p <= Gcd(x, y)
+{
+  IsFactorGcdFirst(x, y);
+  IsFactorGcdSecond(x, y);
+  IsFactorGcdLess(x, y);
+}
+
+lemma GcdSymmetric(x: pos, y: pos)
+  ensures Gcd(x, y) == Gcd(y, x)
+{
+  reveal Gcd();
+  assert Factors(x) * Factors(y) == Factors(y) * Factors(x);
+}
+
+lemma GcdIdempotent(x: pos)
+  ensures Gcd(x, x) == x
+{
+  FactorsContainsSelf(x);
+  reveal Gcd();
+  assert x in Factors(x) * Factors(x);
+}
+
+lemma {:isolate_assertions} GcdSubtract (x: pos, y: pos)
+  requires x < y
+  ensures Gcd(x, y) == Gcd(x, y - x)
+{
+  var p := Gcd(x, y);
+
+  assert IsFactor (p, x) by {
+    reveal Gcd();
+    assert p in Factors(x);
+    FactorIsInFactors(p, x);
+  }
+
+  assert IsFactor (p, y) by {
+    reveal Gcd();
+    assert p in Factors(y);
+    FactorIsInFactors(p, y);
+  }
+
+  // By the definition of `Gcd`, we know that p is a factor of both x and y,
+  // We now show that p is also a factor of y - x.
+  assert IsFactor(p, y - x) by
+  {
+    var a :| p * a == x;
+    var b :| p * b == y;
+    calc {
+      y - x;
+    ==
+      p * b - p * a;
+    ==
+      p * (b - a);
+    }
+  }
+
+  // Hence, p is a common factor of x and y - x
+  var common := Factors(x) * Factors(y - x);
+  assert p in common;
+
+  // It remains to show that, among the common factors of x and
+  // y - x, p is the greatest
+  forall q | q in common
+    ensures q <= p
+  {
+    reveal Gcd();
+    // q is a factor of both x and y - x, so a and b exist:
+    var a :| q * a == x;
+    var b :| q * b == y - x;
+    assert IsFactor(q, y) by {
+      calc {
+        y;
+      ==
+        x + (y - x);
+      ==
+        q * a + q * b;
+      ==
+        q * (a + b);
+      }
+    }
+    // We just showed that q is a common factor of x and y.
+    assert q in Factors(x) * Factors(y);
+    // By the definition of Gcd(x, y), we then have that q <= p.
+  }
+  assert Gcd(x, y) == Gcd(x, y - x) by {reveal Gcd();}
+}
+
+method EuclidGcd(X: pos, Y: pos) returns (gcd: pos)
+  ensures gcd == Gcd(X, Y)
+{
+  var x: pos, y: pos := X, Y;
+  while
+    invariant Gcd(x, y) == Gcd(X, Y)
+    decreases x + y
+  {
+    case x < y =>
+      GcdSubtract(x, y);
+      y := y - x;
+    case y < x =>
+      calc {
+        Gcd(x, y);
+      ==  { GcdSymmetric(x, y); }
+        Gcd(y, x);
+      ==  { GcdSubtract(y, x); }
+        Gcd(y, x - y);
+      ==  { GcdSymmetric(y, x - y); }
+        Gcd(x - y, y);
+      }
+      x := x - y;
+  }
+  GcdIdempotent(x);
+  return x;
+}
+
+// ------------------------------------------------------------------------------------------------------
+// The alternative definitions that follow allow the two cases in the GCD algorithm to look more similar.
+
+lemma {:isolate_assertions} GcdSubtractAlt(x: pos, y: pos)
+  requires x < y
+  ensures Gcd(y, x) == Gcd(x, y - x) // this says Gcd(y, x) instead of Gcd(x, y) as in GcdSubtract above
+{
+  GcdSymmetric(x, y); // this is the difference from GcdSubtract above
+  var p := Gcd(x, y);
+
+  assert IsFactor (p, x) by {
+    reveal Gcd();
+    assert p in Factors(x);
+    FactorIsInFactors(p, x);
+  }
+
+  assert IsFactor (p, y) by {
+    reveal Gcd();
+    assert p in Factors(y);
+    FactorIsInFactors(p, y);
+  }
+
+  assert IsFactor(p, y - x) by {
+    var a :| p * a == x;
+    var b :| p * b == y;
+    assert y - x == p * (b - a) by {
+      assert p * b - p * a == p * (b - a);
+    }
+  }
+
+  var common := Factors(x) * Factors(y - x);
+  assert p in common;
+
+  forall q | q in common
+    ensures q <= p
+  {
+    reveal Gcd();
+    var a :| q * a == x;
+    var b :| q * b == y - x;
+    assert IsFactor(q, y)  by {
+      calc {
+        y;
+      ==
+        x + (y - x);
+      ==
+        q * a + q * b;
+      ==
+        q * (a + b);
+      }
+    }
+    assert q in Factors(x) * Factors(y);
+  }
+  assert Gcd(y, x) == Gcd(x, y - x) by { reveal Gcd(); }
+}
+
+method EuclidGcdAlt(X: pos, Y: pos) returns (gcd: pos)
+  ensures gcd == Gcd(X, Y)
+{
+  var x: pos, y: pos := X, Y;
+  while
+    invariant Gcd(x, y) == Gcd(X, Y)
+    decreases x + y
+  {
+    case x < y =>
+      GcdSubtractAlt(x, y);
+      GcdSymmetric(y, x);
+      y := y - x;
+    case y < x =>
+      GcdSymmetric(x - y, y);
+      GcdSubtractAlt(y, x);
+      x := x - y;
+  }
+  GcdIdempotent(x);
+  return x;
+}
+// ------------------------------------------------------------------------------------------------------
+
+method Main() {
+  Test(15, 9);
+  Test(14, 22);
+  Test(371, 1);
+  Test(1, 2);
+  Test(1, 1);
+  Test(13, 13);
+  Test(60, 60);
+}
+
+method Test(x: pos, y: pos) {
+  var gcd := EuclidGcd(x, y);
+  print x, " gcd ", y, "  =  ", gcd, "\n";
+}
diff --git a/Test/dafny4/gcd.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/gcd.dfy.expect
similarity index 100%
rename from Test/dafny4/gcd.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/gcd.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/gcd.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/gcd.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/gcd.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny4/git-issue1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue1.dfy
similarity index 80%
rename from Test/dafny4/git-issue1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue1.dfy
index d3e31a92c88..7c660053156 100644
--- a/Test/dafny4/git-issue1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue1.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
 
 datatype T = T(n:int)
 ghost function P(x: int) : int { x - 1}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue1.dfy.expect
new file mode 100644
index 00000000000..d6b019f4a83
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue1.dfy.expect
@@ -0,0 +1,4 @@
+git-issue1.dfy(15,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue1.dfy(16,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/dafny4/git-issue104.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue104.dfy
similarity index 77%
rename from Test/dafny4/git-issue104.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue104.dfy
index b05ec4de1cc..025fe7fd78b 100644
--- a/Test/dafny4/git-issue104.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue104.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 predicate bug(a: array<int>)
   reads a
diff --git a/Test/dafny4/git-issue104.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue104.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue104.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue104.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue104.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue104.dfy.rs.check
new file mode 100644
index 00000000000..158d9484360
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue104.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>QuantifierExpr</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue105.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue105.dfy
new file mode 100644
index 00000000000..628e55e8ecb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue105.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+method lol() returns (c: int)
+{
+  c := 5;
+  return c;
+}
diff --git a/Test/dafnydoc/doc1/TestDafnyDoc.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue105.dfy.expect
similarity index 100%
rename from Test/dafnydoc/doc1/TestDafnyDoc.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue105.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue106.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue106.dfy
new file mode 100644
index 00000000000..3855d710829
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue106.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+ghost function f(i:nat, j:nat):int {if i == 0 then 0 else f(i - 1, i * j + 1) + f(i - 1, 2 * i * j)}
+
+lemma{:resource_limit 10000000} L()
+{
+  assert f(10, 5) == 0;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue106.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue106.dfy.expect
new file mode 100644
index 00000000000..1a1f32ef221
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue106.dfy.expect
@@ -0,0 +1,3 @@
+git-issue106.dfy(6,32): Error: Verification out of resource (L)
+
+Dafny program verifier finished with 1 verified, 0 errors, 1 out of resource
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue109.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue109.dfy
new file mode 100644
index 00000000000..d66cd4daa64
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue109.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+datatype MyTuple = MyTuple(x:int, y:int)
+
+method M()
+  requires forall x :: MyTuple(x,x) != MyTuple(x,x+1)
+  requires forall x :: (x,x) != (x,x+1)
+{
+}
+
+
diff --git a/Test/dafny4/git-issue155.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue109.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue155.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue109.dfy.expect
diff --git a/Test/dafny4/git-issue110.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue110.dfy
similarity index 86%
rename from Test/dafny4/git-issue110.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue110.dfy
index b83815f5dfa..03d09127781 100644
--- a/Test/dafny4/git-issue110.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue110.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /rprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module MyModule {
   export provides MyType, Empty, MyLemma
diff --git a/Test/dafny4/git-issue45.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue110.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue45.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue110.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue120.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue120.dfy
new file mode 100644
index 00000000000..c4c6aae80ff
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue120.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function {:opaque} opfn(): int { 37 }
+
+ghost function foo(): int
+{
+    var x := opfn();
+    assert x == 37 by { reveal opfn(); }
+    x
+}
+
diff --git a/Test/dafny4/git-issue206.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue120.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue206.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue120.dfy.expect
diff --git a/Test/dafny4/git-issue129.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue129.dfy
similarity index 91%
rename from Test/dafny4/git-issue129.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue129.dfy
index 47f3c7f0f77..2a134750b47 100644
--- a/Test/dafny4/git-issue129.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue129.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 function Foo(): (int, int)
diff --git a/Test/dafny4/git-issue129.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue129.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue129.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue129.dfy.expect
diff --git a/Test/dafny4/git-issue133.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue133.dfy
similarity index 93%
rename from Test/dafny4/git-issue133.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue133.dfy
index e244e4973c7..d25a15ee2a2 100644
--- a/Test/dafny4/git-issue133.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue133.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype State = State(m:map<int, bool>)
 
diff --git a/Test/dafny4/git-issue133.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue133.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue133.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue133.dfy.expect
diff --git a/Test/dafny4/git-issue134.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue134.dfy
similarity index 78%
rename from Test/dafny4/git-issue134.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue134.dfy
index 9b725b511ab..6631c4b4953 100644
--- a/Test/dafny4/git-issue134.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue134.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 lemma MapValues()
     ensures false
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue134.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue134.dfy.expect
new file mode 100644
index 00000000000..e611fba4d4d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue134.dfy.expect
@@ -0,0 +1,3 @@
+git-issue134.dfy(13,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/git-issue135.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue135.dfy
similarity index 78%
rename from Test/dafny4/git-issue135.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue135.dfy
index c8a6dc3f8e2..154db7acefe 100644
--- a/Test/dafny4/git-issue135.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue135.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 lemma lemma_MapTest()
     ensures false
diff --git a/Test/dafny4/git-issue135.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue135.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue135.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue135.dfy.expect
diff --git a/Test/dafny4/git-issue141.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue141.dfy
similarity index 79%
rename from Test/dafny4/git-issue141.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue141.dfy
index 4dab64ffe18..89f669bb480 100644
--- a/Test/dafny4/git-issue141.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue141.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /rprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class Node<T> {
   var next: Node?<T>
diff --git a/Test/dafny4/git-issue210.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue141.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue210.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue141.dfy.expect
diff --git a/Test/dafny4/git-issue143.transcript b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue143.transcript
similarity index 100%
rename from Test/dafny4/git-issue143.transcript
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue143.transcript
diff --git a/Test/dafny4/git-issue143.transcript.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue143.transcript.expect
similarity index 85%
rename from Test/dafny4/git-issue143.transcript.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue143.transcript.expect
index 31a1bbfc86c..46b2c67d9fe 100644
--- a/Test/dafny4/git-issue143.transcript.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue143.transcript.expect
@@ -2,7 +2,7 @@
 
 Verifying B.Bar (correctness) ...
   [1 proof obligation]  error
-Cache.dfy(9,21): Error: assertion could not be proved
+Cache.dfy(9,12): Error: assertion might not hold
 Verification completed successfully!
 [SUCCESS] [[DAFNY-SERVER: EOM]]
 
diff --git a/Test/dafny4/git-issue147.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue147.dfy
similarity index 80%
rename from Test/dafny4/git-issue147.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue147.dfy
index f5026460e60..6dfcb979608 100644
--- a/Test/dafny4/git-issue147.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue147.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 lemma Foo(s: seq<int>, i: int)
diff --git a/Test/dafny4/git-issue147.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue147.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue147.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue147.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue148.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue148.dfy
new file mode 100644
index 00000000000..965bbeb913d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue148.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function Foo(f: () -> (), n: nat): nat
+{
+    if n == 0 then n
+    else Foo(f, n - 1)
+}
+
+lemma lemma_Foo()
+    ensures forall g: () -> () :: Foo(g, 0) == 0  // regression: this had crashed Dafny
+{}
diff --git a/Test/dafny4/git-issue254.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue148.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue254.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue148.dfy.expect
diff --git a/Test/dafny4/git-issue149.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue149.dfy
similarity index 79%
rename from Test/dafny4/git-issue149.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue149.dfy
index 36bb84d60c7..9183113a292 100644
--- a/Test/dafny4/git-issue149.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue149.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost function Foo<T>(m: map<int, T>): seq<T>
diff --git a/Test/dafny4/git-issue149.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue149.dfy.expect
similarity index 82%
rename from Test/dafny4/git-issue149.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue149.dfy.expect
index f23145570c5..b16d937185a 100644
--- a/Test/dafny4/git-issue149.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue149.dfy.expect
@@ -1,4 +1,4 @@
 git-issue149.dfy(8,28): Error: the type of this variable is underspecified
-git-issue149.dfy(8,33): Error: type parameter 'T' (inferred to be '?') in the function call to 'Foo' could not be determined
+git-issue149.dfy(8,36): Error: type parameter 'T' (inferred to be '?') in the function call to 'Foo' could not be determined
 git-issue149.dfy(8,19): Error: type of bound variable 'm' could not be determined; please specify the type explicitly
 3 resolution/type errors detected in git-issue149.dfy
diff --git a/Test/dafny4/git-issue15.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue15.dfy
similarity index 76%
rename from Test/dafny4/git-issue15.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue15.dfy
index 7c77a67ccf9..e022b0128a0 100755
--- a/Test/dafny4/git-issue15.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue15.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype obj = Obj(fooBar:map<foo,int>)
 datatype foo = Foo
diff --git a/Test/dafny4/git-issue15.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue15.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue15.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue15.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue15.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue15.dfy.rs.check
new file mode 100644
index 00000000000..0fbad1462f7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue15.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `foo: Hash` is not satisfied
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue155.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue155.dfy
new file mode 100644
index 00000000000..412e31179e3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue155.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+datatype A = A0
+datatype B = B0
+
+ghost function F(a: A, b: B): int
+{
+  match (a, b)
+  case (A0, B0) => 0
+}
+
+method M(a: A, b: B)
+{
+  match (a, b)
+  case (A0, B0) =>
+}
\ No newline at end of file
diff --git a/Test/dafny4/git-issue47.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue155.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue47.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue155.dfy.expect
diff --git a/Test/dafny4/git-issue158.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue158.dfy
similarity index 100%
rename from Test/dafny4/git-issue158.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue158.dfy
diff --git a/Test/dafny4/git-issue158.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue158.dfy.expect
similarity index 87%
rename from Test/dafny4/git-issue158.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue158.dfy.expect
index 4a67f9531f3..808c08e9324 100644
--- a/Test/dafny4/git-issue158.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue158.dfy.expect
@@ -1,3 +1,4 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 
 Dafny program verifier finished with 4 verified, 0 errors
 map[Record.Make(null, null, _module.Class, 5, 10) := 0.8]
@@ -24,6 +25,7 @@ false
 false false
 false false
 true true
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 
 Dafny program verifier finished with 4 verified, 0 errors
 map[Record.Make(null, null, _module.Class, 5, 10) := 0.8]
diff --git a/Test/dafny4/git-issue159.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue159.dfy
similarity index 95%
rename from Test/dafny4/git-issue159.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue159.dfy
index 969d099cc2a..0e5c86578c6 100644
--- a/Test/dafny4/git-issue159.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue159.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 // map types used to slip through type checking of reads/modifies clauses
 
diff --git a/Test/dafny4/git-issue159.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue159.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue159.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue159.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue16.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue16.dfy
new file mode 100644
index 00000000000..7e82c2e7b92
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue16.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+include "git-issue16.dfyi"
+
+lemma UhOh()
+  ensures false
+{
+}
diff --git a/Test/dafny4/git-issue16.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue16.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue16.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue16.dfy.expect
diff --git a/Test/dafny4/git-issue16.dfyi b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue16.dfyi
similarity index 100%
rename from Test/dafny4/git-issue16.dfyi
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue16.dfyi
diff --git a/Test/dafny4/git-issue161.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue161.dfy
similarity index 78%
rename from Test/dafny4/git-issue161.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue161.dfy
index 26a775880d4..19c55086c8e 100644
--- a/Test/dafny4/git-issue161.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue161.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 datatype Expr0 = Var(val: string)
                | Const(val: int)
diff --git a/Test/dafny4/git-issue161.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue161.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue161.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue161.dfy.expect
diff --git a/Test/dafny4/git-issue167.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue167.dfy
similarity index 97%
rename from Test/dafny4/git-issue167.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue167.dfy
index 7dd835b3f8d..cc3c0bf9fa0 100644
--- a/Test/dafny4/git-issue167.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue167.dfy
@@ -1,5 +1,5 @@
 // NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %dafny /compile:3 "%s" > "%t"
+// RUN: %run "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Main() {
diff --git a/Test/dafny4/git-issue167.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue167.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue167.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue167.dfy.expect
diff --git a/Test/dafny4/git-issue176.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue176.dfy
similarity index 82%
rename from Test/dafny4/git-issue176.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue176.dfy
index 910753faa49..c9993bd6d8e 100644
--- a/Test/dafny4/git-issue176.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue176.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost predicate Thing1() {
     var m := map[0 := 1];
diff --git a/Test/dafny4/git-issue239.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue176.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue239.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue176.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue18.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue18.dfy
new file mode 100644
index 00000000000..ad3a3a76dea
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue18.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+datatype Maybe = Nothing | Just
+ghost predicate bad(e:Maybe)
+{
+    forall i :: 0 <= i < 1 ==>
+        0 == match e
+            case Nothing => 0
+            case Just => 0
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue18.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue18.dfy.expect
new file mode 100644
index 00000000000..79c4758c857
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue18.dfy.expect
@@ -0,0 +1,3 @@
+git-issue18.dfy(7,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue182.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue182.dfy
new file mode 100644
index 00000000000..986fdcaa20c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue182.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+predicate prop()
+ensures prop // OOPS! Forgot () after prop
+{
+true
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue182.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue182.dfy.expect
new file mode 100644
index 00000000000..592125f1b0b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue182.dfy.expect
@@ -0,0 +1,3 @@
+git-issue182.dfy(5,8): Error: Postcondition must be a boolean (got () -> bool)
+git-issue182.dfy(5,8): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
+2 resolution/type errors detected in git-issue182.dfy
diff --git a/Test/dafny4/git-issue195.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue195.dfy
similarity index 95%
rename from Test/dafny4/git-issue195.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue195.dfy
index fccdc5461c8..9238b078122 100644
--- a/Test/dafny4/git-issue195.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue195.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype Block<Hash,Transaction,VProof> =
   Block(prevBlockHash:Hash, txs:seq<Transaction>, proof:VProof)
diff --git a/Test/dafny4/git-issue195.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue195.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue195.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue195.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue195.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue195.dfy.rs.check
new file mode 100644
index 00000000000..7d6c2fd331e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue195.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type name for ORDINAL \(Microsoft_dDafny_dBigOrdinalType\)</i>.*
\ No newline at end of file
diff --git a/Test/dafny4/git-issue196.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue196.dfy
similarity index 96%
rename from Test/dafny4/git-issue196.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue196.dfy
index 056687ab1a5..29084d063e0 100644
--- a/Test/dafny4/git-issue196.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue196.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 class A {
   var a: array<array<int>>
diff --git a/Test/dafny4/git-issue196.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue196.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue196.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue196.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue196.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue196.dfy.rs.check
new file mode 100644
index 00000000000..66736e40df8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue196.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>MultiSelectLValue</i>.*
\ No newline at end of file
diff --git a/Test/dafny4/git-issue2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue2.dfy
similarity index 97%
rename from Test/dafny4/git-issue2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue2.dfy
index e418a404b0e..1edd57e061d 100644
--- a/Test/dafny4/git-issue2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue2.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /rprint:"%t.rprint" /print:"%t.print" /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 type sp_state
 type operand = int
diff --git a/Test/dafny4/git-issue26.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue2.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue26.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue2.dfy.expect
diff --git a/Test/dafny4/git-issue20.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue20.dfy
similarity index 83%
rename from Test/dafny4/git-issue20.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue20.dfy
index e2f56b6f5fb..d35154e4a7a 100755
--- a/Test/dafny4/git-issue20.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue20.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost predicate {:opaque} p(i:int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue20.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue20.dfy.expect
new file mode 100644
index 00000000000..8b432faabbd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue20.dfy.expect
@@ -0,0 +1,3 @@
+git-issue20.dfy(21,2): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/dafny4/git-issue203.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue203.dfy
similarity index 83%
rename from Test/dafny4/git-issue203.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue203.dfy
index 45a7441e317..21a5a4e5e70 100644
--- a/Test/dafny4/git-issue203.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue203.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /rprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype Value = Res(addr: nat) | Nil()
 
diff --git a/Test/dafny4/git-issue40.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue203.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue40.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue203.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue206.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue206.dfy
new file mode 100644
index 00000000000..881a279194c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue206.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+datatype Foo = Bar(x: int)
+
+method letTest() {
+  assert (var (Bar(a), c) := (Bar(1), 2); a) == 1;
+}
diff --git a/Test/dafny4/git-issue28.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue206.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue28.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue206.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue209.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue209.dfy
new file mode 100644
index 00000000000..57d02c10efd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue209.dfy
@@ -0,0 +1,6 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+ghost function F(l: seq<bool>, x: bool, js: seq<int>): bool {
+  forall i, j :: js[i] < j < js[i + 1] ==> l[j] == x
+}
diff --git a/Test/dafny4/git-issue209.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue209.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue209.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue209.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue210.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue210.dfy
new file mode 100644
index 00000000000..2542a40114a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue210.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function F<A>(l: seq<A>): bool {
+  forall i :: 0 <= i < |l|-1 ==> l[i] == l[i + 1] || l[i] == l[i + 1]
+}
+
diff --git a/Test/dafny4/git-issue29.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue210.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue29.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue210.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue22.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue22.dfy
new file mode 100644
index 00000000000..e929b1dbbaf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue22.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+ghost predicate bad()
+{
+    forall i :: i in {1}
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue22.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue22.dfy.expect
new file mode 100644
index 00000000000..ad161f59495
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue22.dfy.expect
@@ -0,0 +1,3 @@
+git-issue22.dfy(6,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny4/git-issue225.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue225.dfy
similarity index 97%
rename from Test/dafny4/git-issue225.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue225.dfy
index 2cb63f34a9d..ea157effe8d 100644
--- a/Test/dafny4/git-issue225.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue225.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module SiblingImport {
   abstract module AbstractModule {
diff --git a/Test/dafny4/git-issue225.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue225.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue225.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue225.dfy.expect
diff --git a/Test/dafny4/git-issue228.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue228.dfy
similarity index 93%
rename from Test/dafny4/git-issue228.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue228.dfy
index a3357958c08..acd46d458e6 100644
--- a/Test/dafny4/git-issue228.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue228.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /env:0 /dprint:- "%s" > "%t"
-// RUN: %exits-with 4 %dafny /env:0 /rprint:- "%s" >> "%t"
+// RUN: %exits-with 4 %build --print:- "%s" --relax-definite-assignment > "%t"
+// RUN: %exits-with 4 %build --rprint:- "%s" --relax-definite-assignment  >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Tests the pretty printing of + and *
diff --git a/Test/dafny4/git-issue228.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue228.dfy.expect
similarity index 89%
rename from Test/dafny4/git-issue228.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue228.dfy.expect
index 4e2081281e1..b2a6fde9340 100644
--- a/Test/dafny4/git-issue228.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue228.dfy.expect
@@ -84,7 +84,7 @@ module _System {
   */
 
   class {:compile false} array<arg> {
-    var Length: int  // immutable
+    const Length: int
   }
   /*-- non-null type
   type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
@@ -122,21 +122,23 @@ module _System {
     | f.requires()
     /*special witness*/
 
-  datatype {:compile false} /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
 
   type bool { }
 
+  type char { }
+
   type int { }
 
   type real {
-    var Floor: int  // immutable
+    const Floor: int
   }
 
   type ORDINAL {
-    var IsLimit: bool  // immutable
-    var IsSucc: bool  // immutable
-    var Offset: int  // immutable
-    var IsNat: bool  // immutable
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
   }
 
   type _bv {
@@ -145,19 +147,27 @@ module _System {
     function RotateRight(w: nat): selftype
   }
 
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
   type map<+T, +U> {
-    var Keys: set<T>  // immutable
-    var Values: set<U>  // immutable
-    var Items: set<(T, U)>  // immutable
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
   }
 
   type imap<*T, +U> {
-    var Keys: iset<T>  // immutable
-    var Values: iset<U>  // immutable
-    var Items: iset<(T, U)>  // immutable
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
   }
 
-  datatype {:compile false} /*_tuple#0*/ () = _#Make0
+  datatype /*_tuple#0*/ () = _#Make0
 }
 // bitvector types in use: bv0 bv19
 */
diff --git a/Test/dafny4/git-issue23.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue23.dfy
similarity index 78%
rename from Test/dafny4/git-issue23.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue23.dfy
index c52e09b0968..20269f47470 100755
--- a/Test/dafny4/git-issue23.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue23.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost predicate {:opaque} ValidRegs()
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue23.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue23.dfy.expect
new file mode 100644
index 00000000000..ccbb03eb50b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue23.dfy.expect
@@ -0,0 +1,4 @@
+git-issue23.dfy(14,22): Error: function precondition could not be proved
+git-issue23.dfy(10,22): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue235.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue235.dfy
new file mode 100644
index 00000000000..fec56bd0431
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue235.dfy
@@ -0,0 +1,22 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module A {
+  ghost predicate F(x: int) { true }
+}
+
+module B {
+  import I = A
+
+  lemma Test(x: int)
+    ensures I.F(x)
+  {
+  }
+
+  lemma TestWrapper()
+  {
+    forall x {
+      Test(x);
+    }
+  }
+}
diff --git a/Test/exceptions/GenericOutcomeDt.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue235.dfy.expect
similarity index 100%
rename from Test/exceptions/GenericOutcomeDt.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue235.dfy.expect
diff --git a/Test/dafny4/git-issue239.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue239.dfy
similarity index 79%
rename from Test/dafny4/git-issue239.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue239.dfy
index d29c6d96ac1..d82a86288ef 100644
--- a/Test/dafny4/git-issue239.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue239.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module List {
   datatype list<A> = Nil | Cons(A, list<A>)
diff --git a/Test/dafny4/git-issue39.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue239.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue39.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue239.dfy.expect
diff --git a/Test/dafny4/git-issue245.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue245.dfy
similarity index 97%
rename from Test/dafny4/git-issue245.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue245.dfy
index e0935d08dd9..12c2218b175 100644
--- a/Test/dafny4/git-issue245.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue245.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Issue 245 pointed out that trait override checks ignored the optional name of function results
 
diff --git a/Test/dafny4/git-issue245.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue245.dfy.expect
similarity index 80%
rename from Test/dafny4/git-issue245.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue245.dfy.expect
index 3e75899048f..78d5583cf15 100644
--- a/Test/dafny4/git-issue245.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue245.dfy.expect
@@ -6,13 +6,13 @@ git-issue245.dfy(64,11): Error: the function must provide an equal or more detai
 git-issue245.dfy(68,11): Error: the function must provide an equal or more detailed postcondition than in its parent trait
 git-issue245.dfy(72,11): Error: the function must provide an equal or more detailed postcondition than in its parent trait
 git-issue245.dfy(76,11): Error: the function must provide an equal or more detailed postcondition than in its parent trait
-git-issue245.dfy(84,11): Error: a postcondition could not be proved on this return path
+git-issue245.dfy(86,7): Error: a postcondition could not be proved on this return path
 git-issue245.dfy(85,17): Related location: this is the postcondition that could not be proved
-git-issue245.dfy(88,11): Error: a postcondition could not be proved on this return path
+git-issue245.dfy(90,7): Error: a postcondition could not be proved on this return path
 git-issue245.dfy(89,19): Related location: this is the postcondition that could not be proved
-git-issue245.dfy(92,11): Error: a postcondition could not be proved on this return path
+git-issue245.dfy(94,7): Error: a postcondition could not be proved on this return path
 git-issue245.dfy(93,19): Related location: this is the postcondition that could not be proved
-git-issue245.dfy(96,11): Error: a postcondition could not be proved on this return path
+git-issue245.dfy(98,7): Error: a postcondition could not be proved on this return path
 git-issue245.dfy(97,17): Related location: this is the postcondition that could not be proved
 
 Dafny program verifier finished with 24 verified, 12 errors
diff --git a/Test/dafny4/git-issue250.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue250.dfy
similarity index 100%
rename from Test/dafny4/git-issue250.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue250.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue250.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue250.dfy.expect
new file mode 100644
index 00000000000..1644c59e8b1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue250.dfy.expect
@@ -0,0 +1,30 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny4/git-issue254.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue254.dfy
similarity index 88%
rename from Test/dafny4/git-issue254.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue254.dfy
index 0c064c3e583..f65bb1b95ca 100644
--- a/Test/dafny4/git-issue254.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue254.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class Foo {}
 
diff --git a/Test/examples/induction-principle-code/Interp.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue254.dfy.expect
similarity index 100%
rename from Test/examples/induction-principle-code/Interp.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue254.dfy.expect
diff --git a/Test/dafny4/git-issue257.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue257.dfy
similarity index 92%
rename from Test/dafny4/git-issue257.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue257.dfy
index 87244febc35..b7471d435de 100644
--- a/Test/dafny4/git-issue257.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue257.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module  M {
   trait T {
diff --git a/Test/git-issues/git-issue-1113.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue257.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1113.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue257.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue26.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue26.dfy
new file mode 100644
index 00000000000..3015b9ecb7f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue26.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function BitvectorCast(x:bv32): int
+    ensures x != 0 ==> BitvectorCast(x) != 0
+{
+    x as int
+}
diff --git a/Test/dafny4/git-issue46.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue26.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue46.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue26.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue27.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue27.dfy
new file mode 100644
index 00000000000..37c88f0ed8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue27.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+type word = x | 0 <= x < 0x1_0000_0000
+
+ghost function extract(src:map<int, word>): map<int, word>
+    requires forall i :: 0 <= i < 0x10 ==> i in src
+{
+    (map i | 0 <= i < 0x10 :: src[i])
+}
+
diff --git a/Test/exports/ClassMemberExport.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue27.dfy.expect
similarity index 100%
rename from Test/exports/ClassMemberExport.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue27.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue28.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue28.dfy
new file mode 100644
index 00000000000..71d2d38d6eb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue28.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+lemma mylemma()
+{
+    var shift:int := 1;
+    assume (1 as bv32 << shift) as int == 2;
+    assert (1 as bv32 << 1) as int == 2;
+}
+
diff --git a/Test/dafny4/git-issue67.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue28.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue67.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue28.dfy.expect
diff --git a/Test/dafny4/git-issue281.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue281.dfy
similarity index 85%
rename from Test/dafny4/git-issue281.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue281.dfy
index 43f997a1a1e..100965aa10e 100644
--- a/Test/dafny4/git-issue281.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue281.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /rprint:"%t.rprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype DT = ConstrA | ConstrB
diff --git a/Test/dafny4/git-issue281.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue281.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue281.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue281.dfy.expect
diff --git a/Test/dafny4/git-issue29.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue29.dfy
similarity index 92%
rename from Test/dafny4/git-issue29.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue29.dfy
index 39b1a1510a0..6f9d59b1948 100644
--- a/Test/dafny4/git-issue29.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue29.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost function Identity<T>(a:T) : T
diff --git a/Test/dafny4/git-issue74.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue29.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue74.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue29.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue3.dfy
new file mode 100644
index 00000000000..9b29f52b931
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue3.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype Even = n: int | exists h :: h * 2 == n
+
+
+
diff --git a/Test/dafny4/git-issue3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue3.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue3.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue39.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue39.dfy
new file mode 100644
index 00000000000..059a7016e2d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue39.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function BitsAsInt(b:bv32): int
+    ensures 0 <= BitsAsInt(b) < 0x1_0000_0000
+{
+    b as int
+}
diff --git a/Test/dafny4/git-issue98.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue39.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue98.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue39.dfy.expect
diff --git a/Test/dafny4/git-issue4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue4.dfy
similarity index 84%
rename from Test/dafny4/git-issue4.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue4.dfy
index b17a545e219..3f5c026b9c7 100644
--- a/Test/dafny4/git-issue4.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue4.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 function IntToChar(i:int):char
   requires 0 <= i < 10
diff --git a/Test/dafny4/git-issue4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue4.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue4.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue4.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue4.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue4.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue4.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/dafny4/git-issue40.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue40.dfy
similarity index 85%
rename from Test/dafny4/git-issue40.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue40.dfy
index 0442898f9fa..1e0a70b6cc0 100644
--- a/Test/dafny4/git-issue40.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue40.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost function SeqRepeat<T>(count:nat, elt:T) : seq<T>
     ensures |SeqRepeat<T>(count, elt)| == count
diff --git a/Test/exports/OpenImportRefined.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue40.dfy.expect
similarity index 100%
rename from Test/exports/OpenImportRefined.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue40.dfy.expect
diff --git a/Test/dafny4/git-issue41.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue41.dfy
similarity index 94%
rename from Test/dafny4/git-issue41.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue41.dfy
index 076d8df9454..8af82bd18f4 100644
--- a/Test/dafny4/git-issue41.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue41.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 type uint32 = i:int | 0 <= i < 0x1_0000_0000
 
diff --git a/Test/dafny4/git-issue41.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue41.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue41.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue41.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue42.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue42.dfy
new file mode 100644
index 00000000000..0da1f6ce98b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue42.dfy
@@ -0,0 +1,12 @@
+// RUN: %verify --warn-shadowing --allow-warnings "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+lemma L(x:int)
+{
+    var x := 2;
+}
+
+lemma {:warnShadowing false} L1(x:int)
+{
+    var x := 2;
+}
diff --git a/Test/dafny4/git-issue42.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue42.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue42.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue42.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue43.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue43.dfy
new file mode 100644
index 00000000000..d4e96c9cdfb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue43.dfy
@@ -0,0 +1,4 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+class System { }
+
diff --git a/Test/git-issues/git-issue-1553.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue43.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1553.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue43.dfy.expect
diff --git a/Test/dafny4/git-issue44.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue44.dfy
similarity index 89%
rename from Test/dafny4/git-issue44.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue44.dfy
index 607f03a8cc1..937393a3e45 100644
--- a/Test/dafny4/git-issue44.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue44.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 type uint32 = i:int | 0 <= i < 0x1_0000_0000
 
diff --git a/Test/examples/maximum.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue44.dfy.expect
similarity index 100%
rename from Test/examples/maximum.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue44.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue45.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue45.dfy
new file mode 100644
index 00000000000..93854e72063
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue45.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module Library {
+}
+
+module Outer {
+  import Library
+
+  module Inner {
+    import Library
+  }
+}
diff --git a/Test/dafny4/git-issue64.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue45.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue64.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue45.dfy.expect
diff --git a/Test/dafny4/git-issue46-include.dfyi b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue46-include.dfyi
similarity index 100%
rename from Test/dafny4/git-issue46-include.dfyi
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue46-include.dfyi
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue46.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue46.dfy
new file mode 100644
index 00000000000..78f227ad636
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue46.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+include "git-issue46-include.dfyi"
+
+module m4 refines m2 { }
+
+
diff --git a/Test/exceptions/VoidOutcomeDt.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue46.dfy.expect
similarity index 100%
rename from Test/exceptions/VoidOutcomeDt.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue46.dfy.expect
diff --git a/Test/dafny4/git-issue47-include.dfyi b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue47-include.dfyi
similarity index 100%
rename from Test/dafny4/git-issue47-include.dfyi
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue47-include.dfyi
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue47.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue47.dfy
new file mode 100644
index 00000000000..89b02910565
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue47.dfy
@@ -0,0 +1,4 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+include "git-issue47-include.dfyi"
diff --git a/Test/exports/ImportPathNonShadow.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue47.dfy.expect
similarity index 100%
rename from Test/exports/ImportPathNonShadow.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue47.dfy.expect
diff --git a/Test/dafny4/git-issue48-include.dfyi b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue48-include.dfyi
similarity index 100%
rename from Test/dafny4/git-issue48-include.dfyi
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue48-include.dfyi
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue48.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue48.dfy
new file mode 100644
index 00000000000..cb232154321
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue48.dfy
@@ -0,0 +1,4 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+include "git-issue48-include.dfyi"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue48.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue48.dfy.expect
new file mode 100644
index 00000000000..3e367ca610d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue48.dfy.expect
@@ -0,0 +1,3 @@
+git-issue48-include.dfyi(4,8): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue49.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue49.dfy
new file mode 100644
index 00000000000..11da0d001f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue49.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module m1 {
+ export reveals f
+
+ type T = int
+ ghost function f(x:T) : T { x }
+}
diff --git a/Test/dafny4/git-issue49.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue49.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue49.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue49.dfy.expect
diff --git a/Test/dafny4/git-issue5.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue5.dfy
similarity index 91%
rename from Test/dafny4/git-issue5.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue5.dfy
index a0d131a799f..4afdf4219e9 100644
--- a/Test/dafny4/git-issue5.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue5.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost predicate isEven(x:int)
 {
diff --git a/Test/dafny4/git-issue5.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue5.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue5.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue5.dfy.expect
diff --git a/Test/dafny4/git-issue50.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue50.dfy
similarity index 81%
rename from Test/dafny4/git-issue50.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue50.dfy
index aee7e7d7fc8..0130e2bfd1f 100644
--- a/Test/dafny4/git-issue50.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue50.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module am {
  type T
diff --git a/Test/dafny4/git-issue50.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue50.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue50.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue50.dfy.expect
diff --git a/Test/dafny4/git-issue51.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue51.dfy
similarity index 94%
rename from Test/dafny4/git-issue51.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue51.dfy
index 4e7572cd177..63db4a65d5c 100644
--- a/Test/dafny4/git-issue51.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue51.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var next: C?
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue51.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue51.dfy.expect
new file mode 100644
index 00000000000..91c80279a79
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue51.dfy.expect
@@ -0,0 +1,12 @@
+git-issue51.dfy(35,15): Error: argument could not be proved to be allocated in the state in which the function is invoked
+git-issue51.dfy(38,20): Error: argument could not be proved to be allocated in the state in which the function is invoked
+git-issue51.dfy(42,15): Error: argument could not be proved to be allocated in the state in which the method is invoked
+git-issue51.dfy(45,15): Error: argument could not be proved to be allocated in the state in which the method is invoked
+git-issue51.dfy(53,22): Error: argument could not be proved to be allocated in the state in which the function is invoked
+git-issue51.dfy(57,19): Error: argument could not be proved to be allocated in the state in which the method is invoked
+git-issue51.dfy(59,17): Error: argument could not be proved to be allocated in the state in which the function is invoked
+git-issue51.dfy(69,12): Error: argument at index 0 for parameter 'a' could not be proved to be allocated in the two-state lemma's previous state -- if you add 'new' before the parameter declaration, like 'new a: C', arguments can refer to expressions possibly unallocated in the previous state
+git-issue51.dfy(75,15): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+git-issue51.dfy(79,11): Error: argument at index 0 for parameter 'a' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new a: C', arguments can refer to expressions possibly unallocated in the previous state
+
+Dafny program verifier finished with 2 verified, 10 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue53.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue53.dfy
new file mode 100644
index 00000000000..d912704cb76
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue53.dfy
@@ -0,0 +1,6 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+ghost predicate P() {
+  forall m:mode :: m == m
+}
diff --git a/Test/dafny4/git-issue53.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue53.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue53.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue53.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue57.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue57.dfy
new file mode 100644
index 00000000000..303a2e7b278
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue57.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+lemma lemma_RotateRightAdds(x:bv32)
+   ensures  (x.RotateRight(2)).RotateRight(3) == x.RotateRight(5)
+{
+}
+
+
diff --git a/Test/ghost/Aliasing.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue57.dfy.expect
similarity index 100%
rename from Test/ghost/Aliasing.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue57.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue59.legacy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue59.legacy.dfy
new file mode 100644
index 00000000000..60468715201
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue59.legacy.dfy
@@ -0,0 +1,9 @@
+// RUN: %exits-with 4 %dafny /tracePOs /compile:0 "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+include "git-issue59.legacy.dfyi"
+
+method foo(x:byte) {
+  var y:byte := x+1;
+   }
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue59.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue59.legacy.dfy.expect
new file mode 100644
index 00000000000..7ac391b40b3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue59.legacy.dfy.expect
@@ -0,0 +1,7 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Verifying foo (correctness) ...
+  [1 proof obligation]  error
+git-issue59.legacy.dfy(7,17): Error: value does not satisfy the subset constraints of 'byte'
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/git-issue59.dfyi b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue59.legacy.dfyi
similarity index 100%
rename from Test/dafny4/git-issue59.dfyi
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue59.legacy.dfyi
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue63.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue63.dfy
new file mode 100644
index 00000000000..3bfeba7512c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue63.dfy
@@ -0,0 +1,69 @@
+// RUN: %verify --relax-definite-assignment --allow-axioms "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+type globalsmap = map<string, seq<int>>
+
+ghost predicate {:axiom} ValidGlobal(g:string)
+
+ghost predicate {:opaque} ValidGlobalStateOpaque(globals: globalsmap)
+{
+    forall g :: ValidGlobal(g) <==> g in globals && |globals[g]| == 1
+}
+
+ghost function GlobalWord(gm:globalsmap, g:string): int
+    requires ValidGlobalStateOpaque(gm) && ValidGlobal(g)
+{
+    reveal ValidGlobalStateOpaque();
+    gm[g][0]
+}
+
+ghost function GlobalUpdate(gm: globalsmap, g:string, v:int): globalsmap
+    requires ValidGlobalStateOpaque(gm) && ValidGlobal(g)
+    ensures ValidGlobalStateOpaque(GlobalUpdate(gm, g, v))
+{
+    reveal ValidGlobalStateOpaque();
+    gm[g := gm[g][0 := v]]
+}
+
+lemma test()
+{
+    ghost var gm1:globalsmap;
+    ghost var g: string;
+    ghost var v: int;
+    assume ValidGlobal(g) && ValidGlobalStateOpaque(gm1);
+	ghost var gm2 := GlobalUpdate(gm1, g, v);
+    // Because ValidGlobal is not revealed in this scope,
+    // it could simplify
+    // gm[g := gm[g][0 := v]][g][0]
+    // == gm[g][0 := v][0]
+    // but it cannot simplify further because
+    // it does not know that 0 < |gm[g]|, which is needed for simplification
+    assert g in gm1 && |gm1[g]| == 1 ==>
+      GlobalWord(gm2, g) == v;
+}
+
+datatype reg = R0|R1|R2|R3
+
+ghost predicate {:opaque} ValidRegState(regs:map<reg, int>)
+{
+    forall r:reg :: r in regs
+}
+
+ghost function sp_update_reg(r:reg, sM:map<reg, int>, sK:map<reg, int>): map<reg, int>
+    requires ValidRegState(sK) && ValidRegState(sM)
+    ensures ValidRegState(sp_update_reg(r, sM, sK))
+{
+    reveal_ValidRegState();
+    sK[r := sM[r]]
+}
+
+lemma test2() {
+    var s0, s1;
+    assume ValidRegState(s0) && ValidRegState(s1);
+    assume s0 == s1;
+    var r: reg;
+    //reveal_ValidRegState();
+
+    // Cannot simplify this because ValidRegState is not revealed in scope.
+    assert r in s0 ==> s0 == sp_update_reg(r, s1, s0);
+}
diff --git a/Test/dafny4/git-issue63.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue63.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue63.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue63.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue64.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue64.dfy
new file mode 100644
index 00000000000..59098607c8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue64.dfy
@@ -0,0 +1,6 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+include "git-issue64.dfyi"
+
+ghost function id(x:word): word { x }
diff --git a/Test/git-issues/git-issue-1129.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue64.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1129.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue64.dfy.expect
diff --git a/Test/dafny4/git-issue64.dfyi b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue64.dfyi
similarity index 100%
rename from Test/dafny4/git-issue64.dfyi
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue64.dfyi
diff --git a/Test/dafny4/git-issue67.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue67.dfy
similarity index 91%
rename from Test/dafny4/git-issue67.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue67.dfy
index 9c2fc52d436..d5ed865b644 100644
--- a/Test/dafny4/git-issue67.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue67.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class Node { }
diff --git a/Test/dafny4/predicateReturnVariable.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue67.dfy.expect
similarity index 100%
rename from Test/dafny4/predicateReturnVariable.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue67.dfy.expect
diff --git a/Test/dafny4/git-issue70.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue70.dfy
similarity index 94%
rename from Test/dafny4/git-issue70.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue70.dfy
index b7297cd9e24..0d8bef888a6 100644
--- a/Test/dafny4/git-issue70.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue70.dfy
@@ -1,5 +1,5 @@
 // NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %dafny  /compile:3 "%s" > "%t"
+// RUN: %run "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Main()
diff --git a/Test/dafny4/git-issue70.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue70.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue70.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue70.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue74.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue74.dfy
new file mode 100644
index 00000000000..37b41aee1cc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue74.dfy
@@ -0,0 +1,16 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+function{:opaque} f(x:int):int { x }
+
+lemma L()
+    ensures forall x:int :: f(x) == x
+{
+    forall x:int
+        ensures f(x) == x
+    {
+        reveal f();
+    }
+    assert forall x:int :: f(x) == x;
+}
+
diff --git a/Test/exceptions/NatOutcomeDt.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue74.dfy.expect
similarity index 100%
rename from Test/exceptions/NatOutcomeDt.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue74.dfy.expect
diff --git a/Test/dafny4/git-issue75.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue75.dfy
similarity index 86%
rename from Test/dafny4/git-issue75.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue75.dfy
index 82dfb3f1b21..37b4a2f292d 100644
--- a/Test/dafny4/git-issue75.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue75.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify "%s" --allow-warnings > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 type t = i:int | 0 <= i < 10
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue75.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue75.dfy.expect
new file mode 100644
index 00000000000..21cd575191d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue75.dfy.expect
@@ -0,0 +1,4 @@
+git-issue75.dfy(12,7): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue75.dfy(17,7): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 3 verified, 0 errors
diff --git a/Test/dafny4/git-issue76.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue76.dfy
similarity index 86%
rename from Test/dafny4/git-issue76.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue76.dfy
index 85613dba2f2..fc564351c60 100644
--- a/Test/dafny4/git-issue76.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue76.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   M0();
diff --git a/Test/dafny4/git-issue76.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue76.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue76.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue76.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue76.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue76.dfy.rs.check
new file mode 100644
index 00000000000..6c32e0626af
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue76.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitWiggleWaggleBoundedPool</i>.*
\ No newline at end of file
diff --git a/Test/dafny4/git-issue79.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue79.dfy
similarity index 94%
rename from Test/dafny4/git-issue79.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue79.dfy
index f3fb17b8531..016b0d11d02 100644
--- a/Test/dafny4/git-issue79.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue79.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype EInt = Int(val: int) | Unknown
 type Pair = (string, EInt)
diff --git a/Test/git-issues/git-issue-1815b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue79.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1815b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue79.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue88.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue88.dfy
new file mode 100644
index 00000000000..be55016ac63
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue88.dfy
@@ -0,0 +1,21 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+type Grid = array2<int>
+
+method M2() {
+  var g: Grid := new int[9,9];
+  g[0,0] := 1;
+}
+
+type Line = array<int>
+
+method M1() {
+  var g: Line := new int[9];
+  g[0] := 1;
+}
+
+method Main()
+{
+  M2();
+  M1();
+}
diff --git a/Test/git-issues/git-issue-2367.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue88.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2367.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue88.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue88.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue88.dfy.rs.check
new file mode 100644
index 00000000000..66736e40df8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue88.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>MultiSelectLValue</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue90.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue90.dfy
new file mode 100644
index 00000000000..007ddeb40ce
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue90.dfy
@@ -0,0 +1,6 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code 2 "%s"
+
+
+const x: MyInt := 200
+const y: int := x as int + 180
+newtype MyInt = k | 0 <= k < y
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue90.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue90.dfy.expect
new file mode 100644
index 00000000000..7af347c9093
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue90.dfy.expect
@@ -0,0 +1,3 @@
+git-issue90.dfy(4,6): Error: type for constant 'x' is 'MyInt', but its initialization value type is 'int'
+git-issue90.dfy(5,18): Error: type conversion to an int-based type is allowed only from numeric and bitvector types, char, and ORDINAL (got MyInt)
+2 resolution/type errors detected in git-issue90.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue90.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue90.dfy.refresh.expect
new file mode 100644
index 00000000000..80a708bf7d2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue90.dfy.refresh.expect
@@ -0,0 +1,2 @@
+git-issue90.dfy(6,8): Error: recursive constraint dependency involving a newtype: MyInt -> y -> x -> MyInt
+1 resolution/type errors detected in git-issue90.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue92.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue92.dfy
new file mode 100644
index 00000000000..c3c1d34bcd5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue92.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+datatype d = D(i:int)
+ghost predicate p(s:int, y:int)
+ghost predicate q(d:d) { exists s :: (match d case D(z) => p(s, z)) }
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue92.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue92.dfy.expect
new file mode 100644
index 00000000000..e02488acf4e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue92.dfy.expect
@@ -0,0 +1,3 @@
+git-issue92.dfy(6,25): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny4/git-issue96.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue96.dfy
similarity index 90%
rename from Test/dafny4/git-issue96.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue96.dfy
index 16eb3f12d14..861b465368b 100644
--- a/Test/dafny4/git-issue96.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue96.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
 
 ghost predicate P(s:seq<int>)
     requires 10 < |s|
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue96.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue96.dfy.expect
new file mode 100644
index 00000000000..c7082dd9b10
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue96.dfy.expect
@@ -0,0 +1,3 @@
+git-issue96.dfy(14,21): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 4 verified, 0 errors
diff --git a/Test/dafny4/git-issue98.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue98.dfy
similarity index 83%
rename from Test/dafny4/git-issue98.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue98.dfy
index f2a9cddabb3..65de848d4e9 100644
--- a/Test/dafny4/git-issue98.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue98.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args --disable-nonlinear-arithmetic "%s" > "%t"
+// RUN: %verify --disable-nonlinear-arithmetic "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 abstract module One {
diff --git a/Test/exports/AliasedImportConsistency.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue98.dfy.expect
similarity index 100%
rename from Test/exports/AliasedImportConsistency.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue98.dfy.expect
diff --git a/Test/dafny4/git-issue99.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue99.dfy
similarity index 80%
rename from Test/dafny4/git-issue99.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue99.dfy
index 8ba0496405a..cdabee84093 100644
--- a/Test/dafny4/git-issue99.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue99.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module TestModule {
diff --git a/Test/dafny4/git-issue99.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue99.dfy.expect
similarity index 100%
rename from Test/dafny4/git-issue99.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/git-issue99.dfy.expect
diff --git a/Test/dafny4/parse-errors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/parse-errors.dfy
similarity index 100%
rename from Test/dafny4/parse-errors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/parse-errors.dfy
diff --git a/Test/dafny4/parse-errors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/parse-errors.dfy.expect
similarity index 100%
rename from Test/dafny4/parse-errors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/parse-errors.dfy.expect
diff --git a/Test/dafny4/parse-errors2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/parse-errors2.dfy
similarity index 100%
rename from Test/dafny4/parse-errors2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/parse-errors2.dfy
diff --git a/Test/dafny4/parse-errors2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/parse-errors2.dfy.expect
similarity index 100%
rename from Test/dafny4/parse-errors2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/parse-errors2.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/predicateReturnVariable.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/predicateReturnVariable.dfy
new file mode 100644
index 00000000000..2541843d59c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/predicateReturnVariable.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+predicate tautology1(x: int): (y: bool)
+  ensures x == 2 ==> y
+{
+  x >= 2
+}
\ No newline at end of file
diff --git a/Test/exports/IncludeSkipTranslate.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/predicateReturnVariable.dfy.expect
similarity index 100%
rename from Test/exports/IncludeSkipTranslate.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/predicateReturnVariable.dfy.expect
diff --git a/Test/dafny4/predicateReturnVariableWrong.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/predicateReturnVariableWrong.dfy
similarity index 81%
rename from Test/dafny4/predicateReturnVariableWrong.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/predicateReturnVariableWrong.dfy
index fe84dab8e6c..586bf05d098 100644
--- a/Test/dafny4/predicateReturnVariableWrong.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/predicateReturnVariableWrong.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 ghost predicate tautology1(x: int): (y: int) {
   true
diff --git a/Test/dafny4/predicateReturnVariableWrong.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/predicateReturnVariableWrong.dfy.expect
similarity index 100%
rename from Test/dafny4/predicateReturnVariableWrong.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/predicateReturnVariableWrong.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/regression-calc.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/regression-calc.dfy
new file mode 100644
index 00000000000..69861488168
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/regression-calc.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+// There is a bug in Dafny that causes the error from `L` to be reported at
+// position 0 in this file, instead of on a curly brace.
+
+lemma L()
+  ensures false {
+    calc { true; }
+}
+
+// Empty calc statements work fine, though:
+
+lemma L'()
+  ensures false {
+    calc { }
+}
diff --git a/Test/dafny4/regression-calc.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/regression-calc.dfy.expect
similarity index 100%
rename from Test/dafny4/regression-calc.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/regression-calc.dfy.expect
diff --git a/Test/dafny4/set-compr.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/set-compr.dfy
similarity index 97%
rename from Test/dafny4/set-compr.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/set-compr.dfy
index 4acb410220b..171811921a7 100644
--- a/Test/dafny4/set-compr.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/set-compr.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module M0 {
   method M()
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/set-compr.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/set-compr.dfy.expect
new file mode 100644
index 00000000000..d45d2b6bb11
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafny4/set-compr.dfy.expect
@@ -0,0 +1,20 @@
+set-compr.dfy(6,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+set-compr.dfy(12,20): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+set-compr.dfy(11,21): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+set-compr.dfy(13,14): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+set-compr.dfy(20,19): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+set-compr.dfy(21,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+set-compr.dfy(28,9): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'o'
+set-compr.dfy(39,34): Error: a function definition is not allowed to depend on the set of allocated references
+set-compr.dfy(41,26): Error: a function definition is not allowed to depend on the set of allocated references
+set-compr.dfy(40,33): Error: a function definition is not allowed to depend on the set of allocated references
+set-compr.dfy(42,30): Error: a function definition is not allowed to depend on the set of allocated references
+set-compr.dfy(44,28): Error: a function definition is not allowed to depend on the set of allocated references
+set-compr.dfy(51,34): Error: a function definition is not allowed to depend on the set of allocated references
+set-compr.dfy(53,26): Error: a function definition is not allowed to depend on the set of allocated references
+set-compr.dfy(52,33): Error: a function definition is not allowed to depend on the set of allocated references
+set-compr.dfy(54,30): Error: a function definition is not allowed to depend on the set of allocated references
+set-compr.dfy(56,28): Error: a function definition is not allowed to depend on the set of allocated references
+set-compr.dfy(74,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+set-compr.dfy(88,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
+13 resolution/type errors detected in set-compr.dfy
diff --git a/Test/dafnydoc/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/.gitignore
similarity index 100%
rename from Test/dafnydoc/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/.gitignore
diff --git a/Test/dafnydoc/doc0/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/.gitignore
similarity index 100%
rename from Test/dafnydoc/doc0/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/.gitignore
diff --git a/Test/dafnydoc/doc0/Doc.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/Doc.dfy
similarity index 100%
rename from Test/dafnydoc/doc0/Doc.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/Doc.dfy
diff --git a/Test/dafnydoc/doc0/doc.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/doc.toml
similarity index 100%
rename from Test/dafnydoc/doc0/doc.toml
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/doc.toml
diff --git a/Test/dafnydoc/doc0/docs-expected/__95.html b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/docs-expected/__95.html
similarity index 100%
rename from Test/dafnydoc/doc0/docs-expected/__95.html
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/docs-expected/__95.html
diff --git a/Test/dafnydoc/doc0/docs-expected/index.html b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/docs-expected/index.html
similarity index 100%
rename from Test/dafnydoc/doc0/docs-expected/index.html
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/docs-expected/index.html
diff --git a/Test/dafnydoc/doc0/docs-expected/styles.css b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/docs-expected/styles.css
similarity index 100%
rename from Test/dafnydoc/doc0/docs-expected/styles.css
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc0/docs-expected/styles.css
diff --git a/Test/dafnydoc/doc1/TestDafnyDoc.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc1/TestDafnyDoc.dfy
similarity index 92%
rename from Test/dafnydoc/doc1/TestDafnyDoc.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc1/TestDafnyDoc.dfy
index cc5a0b7c3eb..7ed16d8f7c7 100644
--- a/Test/dafnydoc/doc1/TestDafnyDoc.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc1/TestDafnyDoc.dfy
@@ -1,6 +1,6 @@
 // RUN: %baredafny doc --use-basename-for-filename "%s" > "%t"
-// RUN: %diff ./docs/index.html "%S"/docs-expected/index.html
-// RUN: %diff ./docs/TestModule_214638566.html "%S"/docs-expected/TestModule_214638566.html
+// RUN: %diff "%S"/docs-expected/index.html ./docs/index.html 
+// RUN: %diff "%S"/docs-expected/TestModule_214638566.html ./docs/TestModule_214638566.html 
 
 /** Test module. More about this test module. */
 module {:options "--function-syntax:4"} TestModule {
@@ -8,12 +8,9 @@ module {:options "--function-syntax:4"} TestModule {
   const c := 7 +
              if true then 8 else 9*1 /** Number of items. All of them. */
 
-  const {:myattribute} cc: real
-  // The distance.
-  const ccc: bool
-  /** Valid or not. */
-  const {:myattribute}{:otherattribute 5,6} cccc: A?
-  // The internal state.
+  const {:myattribute} cc: real // The distance.
+  const ccc: bool // Valid or not.
+  const {:myattribute}{:otherattribute 5,6} cccc: A? // The internal state.
 
   const f1: int -> int
   const f2: set<int> ~> seq<int>
diff --git a/Test/git-issues/git-issue-2441.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc1/TestDafnyDoc.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2441.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc1/TestDafnyDoc.dfy.expect
diff --git a/Test/dafnydoc/doc1/docs-expected/TestModule_214638566.html b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc1/docs-expected/TestModule_214638566.html
similarity index 99%
rename from Test/dafnydoc/doc1/docs-expected/TestModule_214638566.html
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc1/docs-expected/TestModule_214638566.html
index 3b03a4b1862..046762ff319 100644
--- a/Test/dafnydoc/doc1/docs-expected/TestModule_214638566.html
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc1/docs-expected/TestModule_214638566.html
@@ -71,7 +71,7 @@ <h3>Constants</h3>
 <h3>Functions</h3>
 <table>
 <tr><td><tr><td><span class="code"><b><a href="TestModule.f_1070997186.html">f</a></b>(<span class="code">r</span>: <span class="code">real</span>, <span class="code">x</span>: <span class="code">int</span> := <span class="code">0</span>): <span class="code">int</span></span></td><td> &mdash; <span class="doctext">Returns a constant.</span></td></tr></td></tr>
-<tr><td><tr><td><span class="code"><b><a href="TestModule.fif_1005126501.html">fif</a></b>(<b>nameonly </b><span class="code">z</span>: <span class="code"><a href="TestModule.A_1070997149.html">A</a></span>): <span class="code"><a href="TestModule.A_1070997149.html">A</a></span></span></td><td></td></tr></td></tr>
+<tr><td><tr><td><span class="code"><b><a href="TestModule.fif_1005126501.html">fif</a></b>(<b>nameonly </b><span class="code">z</span>: <span class="code"><a href="TestModule.A_1070997149.html">A</a></span>): <span class="code"><a href="TestModule.A_1070997149.html">A</a></span></span></td><td> &mdash; <span class="doctext">return a constant.</span></td></tr></td></tr>
 <tr><td><tr><td><span class="code"><b><a href="TestModule.lp_1060018776.html">lp</a></b>(): <span class="code">bool</span></span></td><td> &mdash; <span class="doctext">A copredicate</span></td></tr></td></tr>
 <tr><td><tr><td><span class="code"><b><a href="TestModule.p_1070997196.html">p</a></b>(): <span class="code">bool</span></span></td><td> &mdash; <span class="doctext">Always true.</span></td></tr></td></tr>
 <tr><td><tr><td><span class="code"><b><a href="TestModule.pf_1060018786.html">pf</a></b>(): <span class="code">bool</span></span></td><td> &mdash; <span class="doctext">Always true.</span></td></tr></td></tr>
diff --git a/Test/dafnydoc/doc1/docs-expected/index.html b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc1/docs-expected/index.html
similarity index 100%
rename from Test/dafnydoc/doc1/docs-expected/index.html
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc1/docs-expected/index.html
diff --git a/Test/dafnydoc/doc2/Test.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc2/Test.dfy
similarity index 100%
rename from Test/dafnydoc/doc2/Test.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc2/Test.dfy
diff --git a/Test/dafnydoc/doc2/Test.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc2/Test.dfy.expect
similarity index 100%
rename from Test/dafnydoc/doc2/Test.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc2/Test.dfy.expect
diff --git a/Test/dafnydoc/doc2/docs-expected/Test_13716.html b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc2/docs-expected/Test_13716.html
similarity index 100%
rename from Test/dafnydoc/doc2/docs-expected/Test_13716.html
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc2/docs-expected/Test_13716.html
diff --git a/Test/dafnydoc/doc2/docs-expected/__95.html b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc2/docs-expected/__95.html
similarity index 100%
rename from Test/dafnydoc/doc2/docs-expected/__95.html
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc2/docs-expected/__95.html
diff --git a/Test/dafnydoc/doc2/docs-expected/index.html b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc2/docs-expected/index.html
similarity index 100%
rename from Test/dafnydoc/doc2/docs-expected/index.html
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc2/docs-expected/index.html
diff --git a/Test/dafnydoc/doc4/Test.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc4/Test.dfy
similarity index 100%
rename from Test/dafnydoc/doc4/Test.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc4/Test.dfy
diff --git a/Test/dafnydoc/doc4/Test.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc4/Test.dfy.expect
similarity index 100%
rename from Test/dafnydoc/doc4/Test.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/dafnydoc/doc4/Test.dfy.expect
diff --git a/Test/doofiles/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/.gitignore
similarity index 100%
rename from Test/doofiles/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/.gitignore
diff --git a/Test/doofiles/BadDoo.doo b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/BadDoo.doo
similarity index 100%
rename from Test/doofiles/BadDoo.doo
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/BadDoo.doo
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Inputs/generatesUnderscoreVariables.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Inputs/generatesUnderscoreVariables.dfy
new file mode 100644
index 00000000000..4e1f998967f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Inputs/generatesUnderscoreVariables.dfy
@@ -0,0 +1,6 @@
+ghost predicate Injective<X(!new), Y>(f: X --> Y)
+  reads f.reads
+  requires forall x :: f.requires(x)
+{
+  forall x1, x2 :: f(x1) == f(x2) ==> x1 == x2
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Inputs/readsOnMethodsLibrary.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Inputs/readsOnMethodsLibrary.dfy
new file mode 100644
index 00000000000..2a93ef19f04
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Inputs/readsOnMethodsLibrary.dfy
@@ -0,0 +1,6 @@
+module Library {
+  method Foo() 
+    reads {} 
+  {
+  }
+}
\ No newline at end of file
diff --git a/Test/doofiles/Test1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test1.dfy
similarity index 100%
rename from Test/doofiles/Test1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test1.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test1.dfy.expect
new file mode 100644
index 00000000000..13f5dca4b9a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test1.dfy.expect
@@ -0,0 +1 @@
+CLI: Error: file NoSuch.doo not found
diff --git a/Test/doofiles/Test2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test2.dfy
similarity index 81%
rename from Test/doofiles/Test2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test2.dfy
index c515b786eff..b80c04dc09c 100644
--- a/Test/doofiles/Test2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test2.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 1 %baredafny resolve --use-basename-for-filename "%s" "%S/BadDoo.doo" 2> "%t"
+// RUN: %exits-with 1 %baredafny resolve --use-basename-for-filename "%s" "%S/BadDoo.doo" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Input .doo file has invalid content
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test2.dfy.expect
new file mode 100644
index 00000000000..40eda744c26
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test2.dfy.expect
@@ -0,0 +1 @@
+CLI: Error: malformed doo file BadDoo.doo
diff --git a/Test/doofiles/Test3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test3.dfy
similarity index 100%
rename from Test/doofiles/Test3.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test3.dfy
diff --git a/Test/doofiles/Test3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test3.dfy.expect
similarity index 100%
rename from Test/doofiles/Test3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test3.dfy.expect
diff --git a/Test/doofiles/Test3a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test3a.dfy
similarity index 100%
rename from Test/doofiles/Test3a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test3a.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test4.dfy
new file mode 100644
index 00000000000..65ad94d2de4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test4.dfy
@@ -0,0 +1,7 @@
+// RUN: %build -t:lib "%s" --output "%S/test2" > "%t"
+// RUN: ! %resolve "%s"  "%S/test2.doo" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Combining a file with a .doo of itself -- was a crash
+
+const c := 42
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test4.dfy.expect
new file mode 100644
index 00000000000..664e4b49644
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test4.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+test2.doo(3,6): Error: Duplicate member name: c
+1 resolution/type errors detected in Test4.dfy
diff --git a/Test/doofiles/Test5.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test5.dfy
similarity index 100%
rename from Test/doofiles/Test5.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test5.dfy
diff --git a/Test/doofiles/Test5.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test5.dfy.expect
similarity index 100%
rename from Test/doofiles/Test5.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/Test5.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/allowWarningsDoo.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/allowWarningsDoo.dfy
new file mode 100644
index 00000000000..0f55dec43a3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/allowWarningsDoo.dfy
@@ -0,0 +1,6 @@
+// RUN: %build %s -t:lib --allow-warnings --output="%S/Output/allowWarnings.doo" &> "%t"
+// RUN: ! %stdin "method Bar() { }" %resolve --stdin %S/Output/allowWarnings.doo &>> %t
+// RUN: %diff "%s.expect" "%t"
+
+method Foo() {
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/allowWarningsDoo.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/allowWarningsDoo.dfy.expect
new file mode 100644
index 00000000000..2a1bfb0eddf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/allowWarningsDoo.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+CLI: Warning: cannot load allowWarnings.doo: --allow-warnings is set locally to False, but the library was built with True
+Compilation failed because warnings were found and --allow-warnings is false
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/semanticOptions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/semanticOptions.dfy
new file mode 100644
index 00000000000..4c7c09ed52c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/semanticOptions.dfy
@@ -0,0 +1,11 @@
+// RUN: %build -t:lib %s --function-syntax:3 --output=%t3.doo &> %t
+// RUN: %build -t:lib %s --function-syntax:4 --output=%t4.doo &>> %t
+// RUN: %resolve %t3.doo --function-syntax:3 &>> %t
+// RUN: %resolve %t4.doo --function-syntax:3 &>> %t
+// RUN: %resolve %t3.doo --function-syntax:4 &>> %t 
+// RUN: %resolve %t4.doo --function-syntax:4 &>> %t
+// RUN: %diff "%s.expect" "%t"
+ 
+predicate Foo() {
+  true
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/semanticOptions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/semanticOptions.dfy.expect
new file mode 100644
index 00000000000..802e3000c6d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/semanticOptions.dfy.expect
@@ -0,0 +1,12 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+
+Dafny program verifier finished with 0 verified, 0 errors
+
+Dafny program verifier did not attempt verification
+
+Dafny program verifier did not attempt verification
+
+Dafny program verifier did not attempt verification
+
+Dafny program verifier did not attempt verification
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/standardLibraryOptionMismatch.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/standardLibraryOptionMismatch.dfy
new file mode 100644
index 00000000000..c71e32b77bd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/standardLibraryOptionMismatch.dfy
@@ -0,0 +1,5 @@
+// RUN: %translate cs --allow-deprecation --unicode-char false --standard-libraries true %s &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Foo() {
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/standardLibraryOptionMismatch.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/standardLibraryOptionMismatch.dfy.expect
new file mode 100644
index 00000000000..a0990cf70f7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/standardLibraryOptionMismatch.dfy.expect
@@ -0,0 +1,4 @@
+CLI: Error: cannot load DafnyStandardLibraries-cs.doo: --unicode-char is set locally to False, but the library was built with True
+CLI: Error: cannot load DafnyStandardLibraries.doo: --unicode-char is set locally to False, but the library was built with True
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useGeneratesUnderscoreVariables.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useGeneratesUnderscoreVariables.dfy
new file mode 100644
index 00000000000..71eb65d5125
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useGeneratesUnderscoreVariables.dfy
@@ -0,0 +1,10 @@
+// RUN: %build -t:lib "%S/Inputs/generatesUnderscoreVariables.dfy" --output "%S/Build/function" > "%t"
+// RUN: %resolve "%s" "%S/Build/function.doo" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+lemma TestInjective() {
+  assert Injective<int, int>((x) => x + 2);
+  var square := (x: int) => x * x;
+  assert square(-1) == square(1);
+  assert !Injective<int, int>((x) => x * x);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useGeneratesUnderscoreVariables.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useGeneratesUnderscoreVariables.dfy.expect
new file mode 100644
index 00000000000..88960949c46
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useGeneratesUnderscoreVariables.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+
+Dafny program verifier did not attempt verification
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useReadsOnMethodsLibrary.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useReadsOnMethodsLibrary.dfy
new file mode 100644
index 00000000000..406f7cdce96
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useReadsOnMethodsLibrary.dfy
@@ -0,0 +1,11 @@
+// RUN: %build -t:lib --reads-clauses-on-methods "%S/Inputs/readsOnMethodsLibrary.dfy" --output "%S/Output/readsOnMethodsLibrary.doo" > "%t"
+// RUN: %resolve %s --library "%S/Output/readsOnMethodsLibrary.doo" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Client {
+  import Library
+
+  method Bar() {
+    Library.Foo();
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useReadsOnMethodsLibrary.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useReadsOnMethodsLibrary.dfy.expect
new file mode 100644
index 00000000000..98429a091f1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/doofiles/useReadsOnMethodsLibrary.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+
+Dafny program verifier did not attempt verification
diff --git a/Test/examples/Simple_compiler/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/.gitignore
similarity index 100%
rename from Test/examples/Simple_compiler/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/.gitignore
diff --git a/Test/examples/Simple_compiler/Compiler.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Compiler.dfy
similarity index 96%
rename from Test/examples/Simple_compiler/Compiler.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Compiler.dfy
index 9e808ab3d8a..d542a65ea1b 100644
--- a/Test/examples/Simple_compiler/Compiler.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Compiler.dfy
@@ -1,5 +1,5 @@
 // RUN: cp %S/Simple.g4 %S/csharp/Simple.g4
-// RUN: %dafny -compile:0 -unicodeChar:0 -spillTargetCode:3 "-out:%S/csharp/Compiler.cs" "%s"
+// RUN: %translate cs --include-runtime --allow-warnings --output:%S/csharp/Compiler.cs "%s"
 // RUN: dotnet run --project %S/csharp/SimpleCompiler.csproj -- %S/example_input.calc > "%t"
 // RUN: %diff "%s.expect" "%t"
 
@@ -237,7 +237,7 @@ module StackMachine {
     }
   }
 
-  const EmptyState := State(Nil, map[], []);
+  const EmptyState := State(Nil, map[], [])
 
   function interpProg(p: Prog, input: RegisterFile) : seq<int> {
     interpProg'(p, EmptyState.(regs := input)).output
@@ -398,22 +398,14 @@ module {:extern "SimpleCompiler.CSharpUtils"} CSharpUtils {
     // calling the method twice produces equal results).
     static function {:extern}
       StringAsDafnyString(s: String): string
+    
+    static method {:axiom} {:extern}
+      DafnyStringAsString(ds: string) returns (s: String)
   }
 
   class ListUtils {
     static function {:extern}
       FoldR<A, B>(f: (A, B) -> B, b0: B, l: List<A>) : B
-
-    static method LinkedListToCList<T>(ll: LinkedList.List<T>) returns (l: List<T>) {
-      l := new List<T>();
-      var it := ll;
-      while it.Cons?
-        decreases it
-      {
-        l.Add(it.hd);
-        it := it.tl;
-      }
-    }
   }
 }
 
@@ -461,7 +453,7 @@ module {:extern "SimpleCompiler.CSharpAST"} CSharpAST {
   }
 
   trait {:compile false} {:extern} Assign extends Stmt {
-    var v: System.String;
+    var v: System.String
     var e: Expr
   }
 
@@ -544,8 +536,10 @@ module Translator {
 /// Alternatively, we could have chosen to expose the stack machine types to C# directly and do the pretty-printing from there.
 
 module PrettyPrint {
-  import opened LinkedList
   import opened StackMachine
+  import opened System
+  import opened CSharpUtils
+  import opened System.Collections.Generic
 
   function prettyPrintNum(n: int, zero: string) : string
     decreases n < 0, if n < 0 then -n else n
@@ -568,10 +562,16 @@ module PrettyPrint {
     }
   }
 
-  function prettyPrint(p: Prog) : List<string> {
-    match p {
-      case Nil => Nil
-      case Cons(instr, p) => Cons(prettyPrintInstr(instr), prettyPrint(p))
+  method prettyPrint(p: Prog) returns (l: System.Collections.Generic.List<String>) {
+    l := new List<String>();
+    var it := p;
+    while it.Cons?
+      decreases it
+    {
+      var ds := prettyPrintInstr(it.hd);
+      var s := StringUtils.DafnyStringAsString(ds);
+      l.Add(s);
+      it := it.tl;
     }
   }
 }
@@ -594,6 +594,7 @@ module {:extern "SimpleCompiler"} Interop {
   import PrettyPrint
   import CSharpUtils
   import Generics = System.Collections.Generic
+  import System
 
   class DafnyCompiler {
     static method Compile(dAST: DafnyAST.Stmt) returns (dSM: StackMachine.Prog)
@@ -619,12 +620,11 @@ module {:extern "SimpleCompiler"} Interop {
     }
 
     static method CompileAndExport(cAST: CSharpAST.Prog)
-      returns (output: Generics.List<string>)
+      returns (output: Generics.List<System.String>)
     {
       var translated: DafnyAST.Stmt := Translator.translateProg(cAST);
       var compiled: StackMachine.Prog := Compile(translated);
-      var prettyPrinted: LinkedList.List<string> := PrettyPrint.prettyPrint(compiled);
-      output := CSharpUtils.ListUtils.LinkedListToCList(prettyPrinted);
+      output := PrettyPrint.prettyPrint(compiled);
     }
   }
 }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Compiler.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Compiler.dfy.expect
new file mode 100644
index 00000000000..c6f9eec108e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Compiler.dfy.expect
@@ -0,0 +1,32 @@
+# Step 1: Parse
+cAST =
+  SimpleCompiler.CSharpAST.Prog
+
+# Step 2: Compile (using Dafny)
+translated = 
+  DafnyAST.Stmt.Seq(DafnyAST.Stmt.Assign("x", DafnyAST.Expr.Const(3)), DafnyAST.Stmt.Seq(DafnyAST.Stmt.Print(DafnyAST.Expr.Var("x")), DafnyAST.Stmt.Seq(DafnyAST.Stmt.Assign("y", DafnyAST.Expr.Op(DafnyAST.BinOp.Add, DafnyAST.Expr.Var("x"), DafnyAST.Expr.Const(0))), DafnyAST.Stmt.Seq(DafnyAST.Stmt.Print(DafnyAST.Expr.Op(DafnyAST.BinOp.Add, DafnyAST.Expr.Var("y"), DafnyAST.Expr.Const(1))), DafnyAST.Stmt.Skip))))
+interp(translated) = 
+  [3, 4]
+
+optimized = 
+  DafnyAST.Stmt.Seq(DafnyAST.Stmt.Assign("x", DafnyAST.Expr.Const(3)), DafnyAST.Stmt.Seq(DafnyAST.Stmt.Print(DafnyAST.Expr.Var("x")), DafnyAST.Stmt.Seq(DafnyAST.Stmt.Assign("y", DafnyAST.Expr.Var("x")), DafnyAST.Stmt.Print(DafnyAST.Expr.Op(DafnyAST.BinOp.Add, DafnyAST.Expr.Var("y"), DafnyAST.Expr.Const(1))))))
+interp(optimized) = 
+  [3, 4]
+
+compiled = 
+  LinkedList.List.Cons(StackMachine.Instr.PopPrint, LinkedList.List.Cons(StackMachine.Instr.PopAdd, LinkedList.List.Cons(StackMachine.Instr.PushConst(1), LinkedList.List.Cons(StackMachine.Instr.PushVar("y"), LinkedList.List.Cons(StackMachine.Instr.PopVar("y"), LinkedList.List.Cons(StackMachine.Instr.PushVar("x"), LinkedList.List.Cons(StackMachine.Instr.PopPrint, LinkedList.List.Cons(StackMachine.Instr.PushVar("x"), LinkedList.List.Cons(StackMachine.Instr.PopVar("x"), LinkedList.List.Cons(StackMachine.Instr.PushConst(3), LinkedList.List.Nil))))))))))
+interp(compiled) = 
+  [3, 4]
+
+
+# Step 3: Print (using C#)
+  PopPrint
+  PopAdd
+  PushConst(1)
+  PushVar(y)
+  PopVar(y)
+  PushVar(x)
+  PopPrint
+  PushVar(x)
+  PopVar(x)
+  PushConst(3)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Makefile b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Makefile
new file mode 100644
index 00000000000..662f746a702
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Makefile
@@ -0,0 +1,43 @@
+# Change this to `Dafny` to run with the system-wide Dafny
+DAFNY_COMPILER ?= dotnet run --project ../../../Source/DafnyDriver/DafnyDriver.csproj
+
+default: run
+
+# Step 1: Copy shared dependencies
+csharp_dir := csharp
+shared_deps := Simple.g4
+$(csharp_dir)/%: %
+	cp "$<" "$@"
+
+# Step 2: create `csharp/_dafny`
+dafny_csharp_dir := $(csharp_dir)/dafny
+$(dafny_csharp_dir):
+	mkdir "$@"
+
+# Step 2: compile Dafny code, putting C# output in `csharp/dafny`
+dafny_files := $(wildcard *.dfy)
+$(dafny_csharp_dir)/%.cs: %.dfy | $(dafny_csharp_dir)
+	$(DAFNY_COMPILER) -spillTargetCode:3 -compile:0 "-out:$@" "$<"
+
+# Step 3: compile resulting C# project
+csproj := SimpleCompiler.csproj
+csharp_dll := $(csharp_dir)/bin/Debug/net8.0/SimpleCompiler.dll
+csharp_files :=  $(wildcard $(csharp_dir)/*)
+csharp_shared_deps := $(patsubst %,$(csharp_dir)/%,$(shared_deps))
+csharp_dafny_deps := $(patsubst %.dfy,$(dafny_csharp_dir)/%.cs,$(dafny_files))
+csharp_deps := $(csharp_shared_deps) $(csharp_dafny_deps) $(csharp_files)
+build: $(csharp_dll)
+$(csharp_dll): $(csharp_deps)
+	dotnet build $(csharp_dir)/$(csproj)
+
+# Step 4: run example
+input := example_input.calc
+run: $(input) $(csharp_deps)
+	dotnet run --project $(csharp_dir)/$(csproj) -- $<
+
+%.dfy.expect: %.dfy $(csharp_copied_deps)
+	$(MAKE) --quiet run > $@
+
+clean:
+	rm -fr $(dafny_csharp_dir) $(csharp_shared_deps) \
+		$(csharp_dir)/bin $(csharp_dir)/obj Compiler.dfy.expect
diff --git a/Test/examples/Simple_compiler/README.md b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/README.md
similarity index 100%
rename from Test/examples/Simple_compiler/README.md
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/README.md
diff --git a/Test/examples/Simple_compiler/Simple.g4 b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Simple.g4
similarity index 100%
rename from Test/examples/Simple_compiler/Simple.g4
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/Simple.g4
diff --git a/Test/examples/Simple_compiler/csharp/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/csharp/.gitignore
similarity index 100%
rename from Test/examples/Simple_compiler/csharp/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/csharp/.gitignore
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/csharp/Main.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/csharp/Main.cs
new file mode 100644
index 00000000000..475497d3043
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/csharp/Main.cs
@@ -0,0 +1,157 @@
+using Antlr4.Runtime;
+
+// This is the C# frontend of a compiler for a simple arithmetic language.  The
+// backend is written in Dafny, except for the final IO stage (printing programs
+// to stdout).
+
+namespace SimpleCompiler {
+
+  // First we define a class hierarchy that models the abstract syntax trees of
+  // our programs (see the Dafny side for more info on the language):
+
+  namespace CSharpAST {
+    public class AST { } // ANTLR root
+    public class Expr : AST { }
+
+    public class Const : Expr {
+      public int n;
+
+      public Const(int n) {
+        this.n = n;
+      }
+    }
+
+    public class Var : Expr {
+      public string v;
+
+      public Var(string v) {
+        this.v = v;
+      }
+    }
+
+    public class Op : Expr {
+      public enum BinOp { Add, Sub }
+
+      public BinOp op;
+      public Expr e1, e2;
+
+      public Op(BinOp op, Expr e1, Expr e2) {
+        this.e1 = e1;
+        this.e2 = e2;
+      }
+    }
+
+    public class Stmt : AST { }
+
+    public class Print : Stmt {
+      public Expr e;
+
+      public Print(Expr e) {
+        this.e = e;
+      }
+    }
+
+    public class Assign : Stmt {
+      public string v;
+      public Expr e;
+
+      public Assign(string v, Expr e) {
+        this.v = v;
+        this.e = e;
+      }
+    }
+
+    public class Prog : AST {
+      public List<Stmt> s;
+
+      public Prog(List<Stmt> s) {
+        this.s = s;
+      }
+    }
+  }
+
+  // Then we define a visitor to translate ANTLR's output into an AST:
+  namespace AntlrVisitor {
+    using CSharpAST;
+
+    public class SimpleVisitor : SimpleCompiler.SimpleBaseVisitor<AST> {
+      public override AST VisitProg(SimpleParser.ProgContext context) {
+        return new Prog(context._s.Select((s, _) => (Stmt)Visit(s)).ToList());
+      }
+
+      public override AST VisitPrint(SimpleParser.PrintContext context) {
+        return new Print((Expr)Visit(context.e));
+      }
+
+      public override AST VisitAssign(SimpleParser.AssignContext context) {
+        return new Assign(context.v.Text, (Expr)Visit(context.e));
+      }
+
+      public override AST VisitAdd(SimpleParser.AddContext context) {
+        return new Op(Op.BinOp.Add, (Expr)Visit(context.l), (Expr)Visit(context.r));
+      }
+
+      public override AST VisitSub(SimpleParser.SubContext context) {
+        return new Op(Op.BinOp.Sub, (Expr)Visit(context.l), (Expr)Visit(context.r));
+      }
+
+      public override AST VisitConst(SimpleParser.ConstContext context) {
+        return new Const(int.Parse(context.c.Text));
+      }
+
+      public override AST VisitVar(SimpleParser.VarContext context) {
+        return new Var(context.v.Text);
+      }
+    }
+  }
+
+  // Then we define any C# methods that Dafny may need:
+
+  namespace CSharpUtils {
+    public partial class StringUtils {
+      public static Dafny.ISequence<Dafny.Rune> StringAsDafnyString(String s) {
+        return Dafny.Sequence<Dafny.Rune>.UnicodeFromString(s);
+      }
+      public static String DafnyStringAsString(Dafny.ISequence<Dafny.Rune> ds) {
+        return ds.ToVerbatimString(false);
+      }
+    }
+
+    public partial class ListUtils {
+      public static B FoldR<A, B>(Func<A, B, B> f, B b0, List<A> lA) {
+        for (int i = lA.Count - 1; i >= 0; i--) {
+          b0 = f(lA[i], b0);
+        }
+        return b0;
+      }
+    }
+  }
+
+  // Finally we define the driver that reads the input file, parses it using
+  // ANTLR, compiles it using Dafny, and prints the result to stdout:
+
+  class Program {
+    private static CSharpAST.Prog parse(string fname) {
+      using (var fstream = new StreamReader(fname)) {
+        var lexer = new SimpleLexer(new AntlrInputStream(fstream));
+        var parser = new SimpleParser(new CommonTokenStream(lexer));
+        var visitor = new AntlrVisitor.SimpleVisitor();
+        return (CSharpAST.Prog)visitor.Visit(parser.prog());
+      }
+    }
+
+    public static void Main(string[] args) {
+      Console.Out.NewLine = "\n";
+
+      Console.WriteLine("# Step 1: Parse");
+      var ast = parse(args[0]);
+      Console.WriteLine($"cAST =\n  {ast}");
+
+      Console.WriteLine("\n# Step 2: Compile (using Dafny)");
+      var pp = SimpleCompiler.DafnyCompiler.CompileAndExport(ast);
+
+      Console.WriteLine("\n# Step 3: Print (using C#)");
+      pp.ForEach(s => Console.WriteLine($"  {s}"));
+    }
+  }
+}
diff --git a/Test/examples/Simple_compiler/csharp/SimpleCompiler.csproj b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/csharp/SimpleCompiler.csproj
similarity index 88%
rename from Test/examples/Simple_compiler/csharp/SimpleCompiler.csproj
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/csharp/SimpleCompiler.csproj
index c3a9eccf93e..bb542208d5a 100644
--- a/Test/examples/Simple_compiler/csharp/SimpleCompiler.csproj
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/csharp/SimpleCompiler.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <NoWarn>CS3021; CS0162; CS0164</NoWarn>
+    <NoWarn>CS8981; CS3021; CS0162; CS0164</NoWarn>
     <!-- <Nullable>enable</Nullable> -->
   </PropertyGroup>
 
diff --git a/Test/examples/Simple_compiler/example_input.calc b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/example_input.calc
similarity index 100%
rename from Test/examples/Simple_compiler/example_input.calc
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler/example_input.calc
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/AST.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/AST.dfy
new file mode 100644
index 00000000000..a80f076c8f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/AST.dfy
@@ -0,0 +1,90 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+include "Utils.dfy"
+
+module AST {
+  import opened Utils
+
+  datatype BinOp =
+    | Add
+    | Sub
+    | Mul
+  
+  datatype Expr_Raw =
+    | Var(name: string)
+    | Literal(n: int)
+    | Bind(bvars: seq<string>, bvals: seq<Expr_Raw>, body: Expr_Raw)
+    | Assign(avars: seq<string>, avals: seq<Expr_Raw>)
+    | If(cond: Expr_Raw, thn: Expr_Raw, els: Expr_Raw)
+    | Op(op: BinOp, oe1: Expr_Raw, oe2: Expr_Raw)
+    | Seq(es: seq<Expr_Raw>)
+  {
+    function Depth() : nat
+    {
+      1 + match this {
+        case Var(_) =>
+          0
+        case Literal(lit) =>
+          0
+        case Bind(bvars, bvals, body) =>
+          var m := MaxF(var f := (e: Expr_Raw) requires e in bvals => e.Depth(); f, bvals, 0);
+          Max(m, body.Depth())
+        case Assign(avars, avals) =>
+          MaxF(var f := (e: Expr_Raw) requires e in avals => e.Depth(); f, avals, 0)
+        case If(cond, thn, els) =>
+          Max(cond.Depth(), Max(thn.Depth(), els.Depth()))
+        case Op(op, e1, e2) =>
+          Max(e1.Depth(), e2.Depth())
+        case Seq(es: seq<Expr_Raw>) =>
+          MaxF(var f := (e: Expr_Raw) requires e in es => e.Depth(); f, es, 0)
+      }
+    }
+
+    static predicate All(e: Expr_Raw, p: (Expr_Raw) -> bool)
+    {
+      p(e) &&
+      (match e
+         case Var(name) => true
+         case Literal(n) => true
+         case Bind(bvars, bvals, body) =>
+          && (forall e | e in bvals :: e.All(e, p))
+          && All(body, p)
+         case Assign(avars, avals) =>
+          && forall e | e in avals :: e.All(e, p)
+         case If(cond, thn, els) =>
+          All(cond, p) && All(thn, p) && All(els, p)
+         case Op(op, oe1, oe2) =>
+          All(oe1, p) && All(oe2, p)
+         case Seq(es) =>
+          && forall e | e in es :: e.All(e, p)
+      )
+    }
+
+    static predicate All_Es(es: seq<Expr_Raw>, p: (Expr_Raw) -> bool)
+      // Rem.: we pay attention of not making ``All_Es`` and ``All`` mutually
+      // recursive, otherwise it causes problems in the proofs.
+    {
+      forall e | e in es :: e.All(e, p)
+    }
+
+    static ghost predicate WellFormed_Single(e: Expr_Raw)
+    {
+      match e
+        case Var(name) => true
+        case Literal(n) => true
+        case Bind(bvars, bvals, body) => |bvars| == |bvals|
+        case Assign(avars, avals) => |avars| == |avals|
+        case If(cond, thn, els) => true
+        case Op(op, oe1, oe2) => true
+        case Seq(es) => true
+    }
+
+    ghost predicate WellFormed()
+    {
+      All(this, WellFormed_Single)
+    }
+  }
+
+  type Expr = e:Expr_Raw | e.WellFormed() witness Var("x")
+}
diff --git a/Test/git-issues/git-issue-1143.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/AST.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1143.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/AST.dfy.expect
diff --git a/Test/examples/induction-principle-code/EliminateMulZero.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/EliminateMulZero.dfy
similarity index 99%
rename from Test/examples/induction-principle-code/EliminateMulZero.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/EliminateMulZero.dfy
index efe28885894..bcc11eba07c 100644
--- a/Test/examples/induction-principle-code/EliminateMulZero.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/EliminateMulZero.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 include "Utils.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/EliminateMulZero.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/EliminateMulZero.dfy.expect
new file mode 100644
index 00000000000..9e74af046b4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/EliminateMulZero.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 29 verified, 0 errors
diff --git a/Test/examples/induction-principle-code/Equiv.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Equiv.dfy
similarity index 99%
rename from Test/examples/induction-principle-code/Equiv.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Equiv.dfy
index ba1af676f6c..6b0794447a2 100644
--- a/Test/examples/induction-principle-code/Equiv.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Equiv.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 include "Utils.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Equiv.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Equiv.dfy.expect
new file mode 100644
index 00000000000..94ea176b77c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Equiv.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 30 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Induction.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Induction.dfy
new file mode 100644
index 00000000000..bbd74918143
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Induction.dfy
@@ -0,0 +1,336 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+include "Utils.dfy"
+include "AST.dfy"
+include "Interp.dfy"
+
+abstract module Induction {
+  import opened Utils
+  import opened AST
+
+  // A state
+  type S(!new)
+
+  // A value
+  type V(!new)
+
+  // A sequence of values
+  type VS(!new)
+
+  ghost const Zero: V
+
+  // ``P`` is the property of interest that we want to prove about the interpreter. It is often
+  // possible to distinguish two cases in the proof: the case corresponding to a successful
+  // execution of the interpreter, and the case corresponding to a failing execution. For instance,
+  // let's say you want to prove that evaluating a pure expression leaves the state unchanged:
+  // the property is trivially true in case the interpreter fails its execution. For this reason,
+  // we decompose ``P`` into ``P_Fail`` (failed execution) and ``P_Succ`` (successful execution,
+  // which also takes as inputs the state and value resulting from the execution).
+  //
+  // One important property to enforce is that:
+  // `P(st, e) <==> P_Fail(st, e) || exists st', v :: P_Succ(st, e, st', v)`
+  // This is enforced by: ``P_Fail_Sound``, ``P_Succ_Sound`` and ``P_Step``.
+  ghost predicate P(st: S, e: Expr)
+  ghost predicate P_Succ(st: S, e: Expr, st': S, v: V) // Success
+  ghost predicate P_Fail(st: S, e: Expr) // Failure
+
+  // ``Pes`` is the property of interest over sequences of expressions.
+  ghost predicate Pes(st: S, es: seq<Expr>)
+  ghost predicate Pes_Succ(st: S, es: seq<Expr>, st': S, vs: VS) // Success
+  ghost predicate Pes_Fail(st: S, es: seq<Expr>) // Failure
+
+  ghost function AppendValue(v: V, vs: VS): VS // Returns: [v] + vs
+
+  // Empty sequence of values
+  ghost const NilVS: VS
+
+  ghost function VS_Last(vs: VS): V
+    requires vs != NilVS
+
+  ghost predicate UpdateState_Pre(st: S, vars: seq<string>, argvs: VS)
+
+  // For the ``Assign`` case
+  ghost function AssignState(st: S, vars: seq<string>, vals: VS): (st':S)
+    requires UpdateState_Pre(st, vars, vals)
+
+  // For the ``Bind`` case
+  ghost function BindStartScope(st: S, vars: seq<string>, vals: VS): (st':S)
+    requires UpdateState_Pre(st, vars, vals)
+
+  // For ``Bind``: used to remove from the context the variables introduced by the bind, while
+  // preserving the mutation. `st0` is the state just before we introduce the let-bounded variables,
+  // `st1 is the state resulting from evaluating the body.
+  ghost function BindEndScope(st0: S, st: S, vars: seq<string>): (st':S)
+
+  ghost function P_Step(st: S, e: Expr): (res: (S, V))
+    requires P(st, e)
+    requires !P_Fail(st, e)
+    ensures P_Succ(st, e, res.0, res.1)
+
+  ghost function Pes_Step(st: S, es: seq<Expr>): (res: (S, VS))
+    requires Pes(st, es)
+    requires !Pes_Fail(st, es)
+    ensures Pes_Succ(st, es, res.0, res.1)
+
+  lemma P_Fail_Sound(st: S, e: Expr)
+    requires P_Fail(st, e)
+    ensures P(st, e)
+
+  lemma P_Succ_Sound(st: S, e: Expr, st': S, v: V)
+    requires P_Succ(st, e, st', v)
+    ensures P(st, e)
+
+  lemma Pes_Fail_Sound(st: S, es: seq<Expr>)
+    requires Pes_Fail(st, es)
+    ensures Pes(st, es)
+
+  lemma Pes_Succ_Sound(st: S, es: seq<Expr>, st': S, vs: VS)
+    requires Pes_Succ(st, es, st', vs)
+    ensures Pes(st, es)
+
+  lemma InductVar(st: S, e: Expr)
+    requires e.Var?
+    requires !P_Fail(st, e)
+    ensures P(st, e)
+
+  lemma InductLiteral(st: S, e: Expr)
+    requires e.Literal?
+    requires !P_Fail(st, e)
+    ensures P(st, e)
+
+  lemma InductIf_Fail(st: S, e: Expr, cond: Expr, thn: Expr, els: Expr)
+    requires e.If? && e.cond == cond && e.thn == thn && e.els == els
+    requires !P_Fail(st, e)
+    requires P(st, cond)
+    ensures !P_Fail(st, cond)
+
+  lemma InductIf_Succ(st: S, e: Expr, cond: Expr, thn: Expr, els: Expr, st_cond: S, condv: V)
+    requires e.If? && e.cond == cond && e.thn == thn && e.els == els
+    requires !P_Fail(st, e)
+    requires P_Succ(st, cond, st_cond, condv)
+    requires P(st_cond, thn)
+    requires P(st_cond, els)
+    ensures P(st, e)
+
+  lemma InductOp_Fail(st: S, e: Expr, op: BinOp, e1: Expr, e2: Expr)
+    requires e.Op? && e.op == op && e.oe1 == e1 && e.oe2 == e2
+    requires !P_Fail(st, e)
+    ensures !P_Fail(st, e1)
+    ensures forall st1, v1 | P_Succ(st, e1, st1, v1) :: !P_Fail(st1, e2)
+
+  lemma InductOp_Succ(st: S, e: Expr, op: BinOp, e1: Expr, e2: Expr, st1: S, v1: V)
+    requires e.Op? && e.op == op && e.oe1 == e1 && e.oe2 == e2
+    requires !P_Fail(st, e)
+    requires P_Succ(st, e1, st1, v1)
+    requires P(st1, e2)
+    ensures P(st, e)
+
+  lemma InductSeq_Fail(st: S, e: Expr, es: seq<Expr>)
+    requires e.Seq? && e.es == es
+    requires !P_Fail(st, e)
+    ensures !Pes_Fail(st, es)
+
+  lemma InductSeq_Succ(st: S, e: Expr, es: seq<Expr>, st1: S, vs: VS)
+    requires e.Seq? && e.es == es
+    requires !P_Fail(st, e)
+    requires Pes_Succ(st, es, st1, vs)
+    ensures P(st, e)
+
+  lemma InductAssign_Fail(st: S, e: Expr, avars: seq<string>, avals: seq<Expr>)
+    requires e.Assign? && e.avars == avars && e.avals == avals
+    requires !P_Fail(st, e)
+    requires Pes(st, avals)
+    ensures !Pes_Fail(st, avals)
+    ensures forall st1, vs | Pes_Succ(st, avals, st1, vs) :: UpdateState_Pre(st1, avars, vs)
+
+  lemma InductAssign_Succ(
+    st: S, e: Expr, avars: seq<string>, avals: seq<Expr>, st1: S, vs: VS, st2: S)
+    requires e.Assign? && e.avars == avars && e.avals == avals
+    requires !P_Fail(st, e)
+    requires Pes_Succ(st, avals, st1, vs)
+    requires UpdateState_Pre(st1, avars, vs)
+    requires st2 == AssignState(st1, avars, vs)
+    // This post is not necessary: what matters is that ``AssignState`` appears somewhere,
+    // but it may help Z3.
+    ensures P_Succ(st, e, st2, Zero)
+    ensures P(st, e)
+
+  lemma InductBind_Fail(st: S, e: Expr, bvars: seq<string>, bvals: seq<Expr>, body: Expr)
+    requires e.Bind? && e.bvars == bvars && e.bvals == bvals && e.body == body
+    requires !P_Fail(st, e)
+    requires Pes(st, bvals)
+    ensures !Pes_Fail(st, bvals)
+    ensures
+      forall st1, vs | Pes_Succ(st, bvals, st1, vs) ::
+      && UpdateState_Pre(st1, bvars, vs)
+      && !P_Fail(BindStartScope(st1, bvars, vs), body)
+
+  lemma InductBind_Succ(
+    st: S, e: Expr, bvars: seq<string>, bvals: seq<Expr>, body: Expr,
+    st1: S, bvarvs: VS, st2: S, st3: S, v: V, st4: S)
+    requires e.Bind? && e.bvars == bvars && e.bvals == bvals && e.body == body
+    requires !P_Fail(st, e)
+    requires Pes_Succ(st, bvals, st1, bvarvs)
+    requires UpdateState_Pre(st1, bvars, bvarvs)
+    requires st2 == BindStartScope(st1, bvars, bvarvs)
+    requires P_Succ(st2, body, st3, v)
+    requires st4 == BindEndScope(st1, st3, bvars) // ``StateBindEndScope`` may have a postcondition, so it's good to have it
+    ensures P_Succ(st, e, st4, v)
+
+  lemma InductExprs_Nil(st: S)
+    ensures !Pes_Fail(st, []) ==> Pes_Succ(st, [], st, NilVS)
+
+  lemma InductExprs_Cons(st: S, e: Expr, es: seq<Expr>)
+    ensures P_Fail(st, e) ==> Pes_Fail(st, [e] + es)
+    ensures !P_Fail(st, e) ==> forall st1, v :: P_Succ(st, e, st1, v) && Pes_Fail(st1, es) ==> Pes_Fail(st, [e] + es)
+    ensures forall st1, v, st2, vs :: P_Succ(st, e, st1, v) && Pes_Succ(st1, es, st2, vs) ==> Pes_Succ(st, [e] + es, st2, AppendValue(v, vs))
+
+  //
+  // Lemmas
+  //
+
+  lemma P_Satisfied(st: S, e: Expr)
+    ensures P(st, e)
+    decreases e, 3
+  {
+    if P_Fail(st, e) {
+      P_Fail_Sound(st, e);
+    }
+    else {
+      P_Satisfied_Succ(st, e);
+    }
+  }
+
+  lemma P_Satisfied_Succ(st: S, e: Expr)
+    requires !P_Fail(st, e)
+    ensures P(st, e)
+    decreases e, 2
+  {
+    match e {
+      case Var(_) =>
+        InductVar(st, e);
+
+      case Literal(_) =>
+        InductLiteral(st, e);
+
+      case Op(op, e1, e2) =>
+        // Recursion
+        P_Satisfied(st, e1);
+
+        assert !P_Fail(st, e1) by { InductOp_Fail(st, e, op, e1, e2); }
+        var (st1, v1) := P_Step(st, e1);
+
+        // Recursion
+        P_Satisfied(st1, e2);
+
+        assert !P_Fail(st1, e2) by { InductOp_Fail(st, e, op, e1, e2); }
+        var (st2, v2) := P_Step(st1, e2);
+
+        InductOp_Succ(st, e, op, e1, e2, st1, v1);
+
+      case Seq(es) =>
+        // Recursion
+        Pes_Satisfied(st, es);
+
+        assert !Pes_Fail(st, es) by { InductSeq_Fail(st, e, es); }
+        var (st1, vs) := Pes_Step(st, es);
+        
+        InductSeq_Succ(st, e, es, st1, vs);
+
+      case If(cond, thn, els) =>
+        // Recursion
+        P_Satisfied(st, cond);
+
+        // Evaluate the condition
+        InductIf_Fail(st, e, cond, thn, els);
+        assert !P_Fail(st, cond);
+        var (st_cond, condv) := P_Step(st, cond);
+
+        P_Satisfied(st_cond, thn); // Recursion
+        P_Satisfied(st_cond, els); // Recursion
+
+        InductIf_Succ(st, e, cond, thn, els, st_cond, condv);
+
+      case Assign(avars, avals) =>
+        // Recursion
+        Pes_Satisfied(st, avals);
+
+        assert !Pes_Fail(st, avals) by { InductAssign_Fail(st, e, avars, avals); }
+        var (st1, vs) := Pes_Step(st, avals);
+
+        assert UpdateState_Pre(st1, avars, vs) by { InductAssign_Fail(st, e, avars, avals); }
+        var st2 := AssignState(st1, avars, vs);
+        InductAssign_Succ(st, e, avars, avals, st1, vs, st2);
+
+      case Bind(bvars, bvals, body) =>
+        Pes_Satisfied(st, bvals); // Recursion
+        assert !Pes_Fail(st, bvals) by { InductBind_Fail(st, e, bvars, bvals, body); }
+        var (st1, bvarvs) := Pes_Step(st, bvals);
+
+        assert UpdateState_Pre(st1, bvars, bvarvs) by { InductBind_Fail(st, e, bvars, bvals, body); }
+        var st2 := BindStartScope(st1, bvars, bvarvs);
+        P_Satisfied(st2, body); // Recursion
+        assert !P_Fail(st2, body) by { InductBind_Fail(st, e, bvars, bvals, body); }
+
+        var (st3, v) := P_Step(st2, body);
+        var st4 := BindEndScope(st1, st3, bvars);
+
+        InductBind_Succ(st, e, bvars, bvals, body, st1, bvarvs, st2, st3, v, st4);
+        P_Succ_Sound(st, e, st4, v);
+    }
+  }
+
+  lemma Pes_Satisfied(st: S, es: seq<Expr>)
+    ensures Pes(st, es)
+    decreases es, 1
+  {
+    if Pes_Fail(st, es) {
+      Pes_Fail_Sound(st, es);
+    }
+    else {
+      Pes_Satisfied_Succ(st, es);
+    }
+  }
+
+  lemma Pes_Satisfied_Succ(st: S, es: seq<Expr>)
+    requires !Pes_Fail(st, es)
+    ensures Pes(st, es)
+    decreases es, 0
+  {
+    if es == [] {
+      InductExprs_Nil(st);
+      assert Pes_Succ(st, [], st, NilVS);
+      Pes_Succ_Sound(st, [], st, NilVS);
+    }
+    else {
+      var e := es[0];
+      var es' := es[1..];
+      assert [e] + es' == es;
+
+      P_Satisfied(st, e); // Recursion
+
+      if P_Fail(st, e) {
+        InductExprs_Cons(st, e, es');
+        assert Pes_Fail(st, [e] + es');
+        Pes_Fail_Sound(st, [e] + es');
+      }
+      else {
+        var (st1, v) := P_Step(st, e);
+        Pes_Satisfied(st1, es'); // Recursion
+
+        if Pes_Fail(st1, es') {
+          InductExprs_Cons(st, e, es');
+          assert Pes_Fail(st, [e] + es');
+          Pes_Fail_Sound(st, [e] + es');
+        }
+        else {
+          var (st2, vs) := Pes_Step(st1, es');
+          InductExprs_Cons(st, e, es');
+          assert Pes_Succ(st, [e] + es', st2, AppendValue(v, vs));
+          Pes_Succ_Sound(st, [e] + es', st2, AppendValue(v, vs));
+        }
+      }
+    }
+  }
+}
diff --git a/Test/examples/induction-principle-code/Induction.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Induction.dfy.expect
similarity index 100%
rename from Test/examples/induction-principle-code/Induction.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Induction.dfy.expect
diff --git a/Test/examples/induction-principle-code/Interp.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Interp.dfy
similarity index 98%
rename from Test/examples/induction-principle-code/Interp.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Interp.dfy
index 40006a5ff68..a86da379a51 100644
--- a/Test/examples/induction-principle-code/Interp.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Interp.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 include "Utils.dfy"
diff --git a/Test/git-issues/git-issue-2947.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Interp.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2947.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Interp.dfy.expect
diff --git a/Test/examples/induction-principle-code/Pure.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Pure.dfy
similarity index 99%
rename from Test/examples/induction-principle-code/Pure.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Pure.dfy
index fcc4bb23f02..6f2a3cb660b 100644
--- a/Test/examples/induction-principle-code/Pure.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Pure.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 include "Utils.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Pure.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Pure.dfy.expect
new file mode 100644
index 00000000000..be068182e1e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Pure.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 25 verified, 0 errors
diff --git a/Test/examples/induction-principle-code/PureNoInductionPrinciple.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/PureNoInductionPrinciple.dfy
similarity index 98%
rename from Test/examples/induction-principle-code/PureNoInductionPrinciple.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/PureNoInductionPrinciple.dfy
index 5aa4dbac3f8..7de6b64edb4 100644
--- a/Test/examples/induction-principle-code/PureNoInductionPrinciple.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/PureNoInductionPrinciple.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 include "Utils.dfy"
diff --git a/Test/git-issues/git-issue-1963c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/PureNoInductionPrinciple.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1963c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/PureNoInductionPrinciple.dfy.expect
diff --git a/Test/examples/induction-principle-code/Utils.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Utils.dfy
similarity index 86%
rename from Test/examples/induction-principle-code/Utils.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Utils.dfy
index f6c2dead0a8..a453dd094f7 100644
--- a/Test/examples/induction-principle-code/Utils.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Utils.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Utils {
@@ -8,8 +8,8 @@ module Utils {
   }
 
   function {:opaque} MaxF<T(!new)>(f: T ~> int, ts: seq<T>, default: int) : (m: int)
-    reads f.reads
-    requires forall t | t in ts :: f.requires(t)
+    reads set x, y | x in ts && y in f.reads(x) :: y
+    requires forall t : T | t in ts :: f.requires(t)
     requires forall t | t in ts :: default <= f(t)
     ensures if ts == [] then m == default else exists t | t in ts :: f(t) == m
     ensures forall t | t in ts :: f(t) <= m
diff --git a/Test/git-issues/git-issue-2380.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Utils.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2380.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/Utils.dfy.expect
diff --git a/Test/examples/induction-principle-code/VarUnchanged.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/VarUnchanged.dfy
similarity index 99%
rename from Test/examples/induction-principle-code/VarUnchanged.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/VarUnchanged.dfy
index 10c1ffd0cc4..a43da5e51f3 100644
--- a/Test/examples/induction-principle-code/VarUnchanged.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/VarUnchanged.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 include "Utils.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/VarUnchanged.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/VarUnchanged.dfy.expect
new file mode 100644
index 00000000000..8a923ac640e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle-code/VarUnchanged.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 28 verified, 0 errors
diff --git a/Test/examples/induction-principle.md b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle.md
similarity index 100%
rename from Test/examples/induction-principle.md
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle.md
diff --git a/Test/examples/maximum.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/maximum.dfy
similarity index 89%
rename from Test/examples/maximum.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/maximum.dfy
index 2ab47098657..7bc1aa23cf7 100644
--- a/Test/examples/maximum.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/maximum.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This file shows how to specify and implement a function to compute the
 // largest element of a list. The function is fully specified by two
diff --git a/Test/git-issues/git-issue-1231.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/maximum.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1231.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/maximum.dfy.expect
diff --git a/Test/examples/parser_combinators.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators.dfy
similarity index 97%
rename from Test/examples/parser_combinators.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators.dfy
index d0fb2f92dbf..5c0327cfaec 100755
--- a/Test/examples/parser_combinators.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators.dfy
@@ -31,11 +31,11 @@
 /// anonymous functions (“lambdas”) modularly: every time a lambda is created,
 /// as with `(fun () -> parentheses' ())`, Dafny checks that the function can be
 /// called in any context.  To see why, consider the function `Apply` below and
-/// the following two uses of it:
+/// the following two uses of it (see also parser_combinators_error.dfy):
 
 function Apply(f: () -> int): int { f() }
 
-function F0(): int { Apply(F0) }
+// function F0(): int { Apply(F0) } // cannot use F0 naked here (see parser_combinators_error.dfy)
 function F1(): int { Apply(() => F1()) }
 
 /// Dafny rejects `F0` because it does not allow using “naked” recursive
@@ -316,5 +316,7 @@ module {:options "-functionSyntax:4"} Parsers {
 /// }
 /// ```
 
-// RUN: %exits-with 4 %dafny -compile:4 "%s" --args "((()))" "((()))no" "((())" > "%t"
+// NONUNIFORM: testDafnyForEachCompiler does not support program argument
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %run --no-verify "%s" "((()))" "((()))no" "((())" >> "%t"
 // RUN: %diff "%s.expect" "%t"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators.dfy.expect
new file mode 100644
index 00000000000..34fc88fa5b1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators.dfy.expect
@@ -0,0 +1,8 @@
+parser_combinators.dfy(39,35): Error: cannot prove termination; try supplying a decreases clause
+
+Dafny program verifier finished with 8 verified, 1 error
+
+Dafny program verifier did not attempt verification
+"((()))": 3 nested parentheses
+"((()))no": no valid parse
+"((())": no valid parse
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators_error.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators_error.dfy
new file mode 100644
index 00000000000..faf30272702
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators_error.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function Apply(f: () -> int): int { f() }
+
+function F0(): int { Apply(F0) } // error: cannot use F0 naked here
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators_error.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators_error.dfy.expect
new file mode 100644
index 00000000000..e2de9f70d30
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators_error.dfy.expect
@@ -0,0 +1,2 @@
+parser_combinators_error.dfy(6,27): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
+1 resolution/type errors detected in parser_combinators_error.dfy
diff --git a/Test/exceptions/Exceptions1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1.dfy
similarity index 100%
rename from Test/exceptions/Exceptions1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1.dfy
diff --git a/Test/exceptions/Exceptions1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1.dfy.expect
similarity index 100%
rename from Test/exceptions/Exceptions1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Test/exceptions/Exceptions1Expressions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1Expressions.dfy
similarity index 94%
rename from Test/exceptions/Exceptions1Expressions.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1Expressions.dfy
index a57e5b78c7e..3b9aaf44de8 100644
--- a/Test/exceptions/Exceptions1Expressions.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1Expressions.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 include "./NatOutcomeDt.dfy"
 include "./VoidOutcomeDt.dfy"
 
diff --git a/Test/exceptions/Exceptions1Expressions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1Expressions.dfy.expect
similarity index 100%
rename from Test/exceptions/Exceptions1Expressions.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1Expressions.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1Expressions.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1Expressions.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/Exceptions1Expressions.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/exceptions/GenericOutcomeDt.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/GenericOutcomeDt.dfy
similarity index 86%
rename from Test/exceptions/GenericOutcomeDt.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/GenericOutcomeDt.dfy
index f76ee13c54d..5ede177dd86 100644
--- a/Test/exceptions/GenericOutcomeDt.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/GenericOutcomeDt.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 // Does not test anything Exceptions-related, but is included by other tests
 
 datatype Outcome<T> =
diff --git a/Test/git-issues/git-issue-2748.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/GenericOutcomeDt.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2748.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/GenericOutcomeDt.dfy.expect
diff --git a/Test/exceptions/NatOutcome.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/NatOutcome.dfy
similarity index 95%
rename from Test/exceptions/NatOutcome.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/NatOutcome.dfy
index 618a78f2541..635344b86f1 100644
--- a/Test/exceptions/NatOutcome.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/NatOutcome.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 // Does not test anything Exceptions-related, but is included by other tests
 
 datatype Option<T> = None | Some(get: T)
diff --git a/Test/exceptions/NatOutcome.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/NatOutcome.dfy.expect
similarity index 100%
rename from Test/exceptions/NatOutcome.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/NatOutcome.dfy.expect
diff --git a/Test/exceptions/NatOutcomeDt.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/NatOutcomeDt.dfy
similarity index 86%
rename from Test/exceptions/NatOutcomeDt.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/NatOutcomeDt.dfy
index c3886bf8d3f..60cef70e4ad 100644
--- a/Test/exceptions/NatOutcomeDt.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/NatOutcomeDt.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 // Does not test anything Exceptions-related, but is included by other tests
 
 datatype NatOutcome =
diff --git a/Test/git-issues/git-issue-1111.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/NatOutcomeDt.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1111.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/NatOutcomeDt.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/ParseErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/ParseErrors.dfy
new file mode 100644
index 00000000000..6e21d5470f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/ParseErrors.dfy
@@ -0,0 +1,20 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+include "./NatOutcome.dfy"
+include "./VoidOutcome.dfy"
+
+method MultiAssignment(r1: NatOutcome, r2: NatOutcome) returns (res: NatOutcome) {
+    var a0, b0 := r1, r2; // <-- multi-assignment allowed
+    var a1, b1 :- r1, r2; // <-- multi-assignment allowed
+    var a2, b2 :- r2; // <-- mismatch in number
+    var a3, b3 :- 100, 101; // <-- mismatch in type
+    return a0;
+}
+
+method MultiRHS(r1: VoidOutcome, r2: nat) returns (res: VoidOutcome) {
+    :- r1;      // one RHS is ok
+    :- r1, r2;  // more than one RHS is not ok, without a LHS
+    var t1 :- r1, r2; // OK
+    var t2: nat :- r1, r2; // OK
+    return r1;
+}
diff --git a/Test/exceptions/ParseErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/ParseErrors.dfy.expect
similarity index 100%
rename from Test/exceptions/ParseErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/ParseErrors.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/ParseErrors.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/ParseErrors.dfy.refresh.expect
new file mode 100644
index 00000000000..cafd7fee566
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/ParseErrors.dfy.refresh.expect
@@ -0,0 +1,4 @@
+ParseErrors.dfy(9,15): Error: number of lhs (2) must match number of rhs (1) for a rhs type (NatOutcome) with member Extract
+ParseErrors.dfy(10,15): Error: member IsFailure does not exist in int, in :- statement
+ParseErrors.dfy(16,4): Error: number of lhs (0) must be one less than number of rhs (2) for a rhs type (VoidOutcome) without member Extract
+3 resolution/type errors detected in ParseErrors.dfy
diff --git a/Test/exceptions/TestAttributeErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TestAttributeErrors.dfy
similarity index 90%
rename from Test/exceptions/TestAttributeErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TestAttributeErrors.dfy
index 30dccb434a4..a8b8dccebd1 100644
--- a/Test/exceptions/TestAttributeErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TestAttributeErrors.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 3 %dafny "%s" > "%t"
+// RUN: %exits-with 3 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 include "../exceptions/VoidOutcomeDt.dfy"
diff --git a/Test/exceptions/TestAttributeErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TestAttributeErrors.dfy.expect
similarity index 85%
rename from Test/exceptions/TestAttributeErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TestAttributeErrors.dfy.expect
index 778fb861a2a..7924804d4cb 100644
--- a/Test/exceptions/TestAttributeErrors.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TestAttributeErrors.dfy.expect
@@ -2,3 +2,4 @@
 Dafny program verifier finished with 0 verified, 0 errors
 TestAttributeErrors.dfy(6,23): Error: Function _module._default.PassingTest must be compiled to use the {:test} attribute
 TestAttributeErrors.dfy(10,23): Error: Function _module._default.FailingTest must be compiled to use the {:test} attribute
+Translation was aborted because errors were found
diff --git a/Test/exceptions/TypecheckErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TypecheckErrors.dfy
similarity index 79%
rename from Test/exceptions/TypecheckErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TypecheckErrors.dfy
index 04e43d8da5c..36a4fd53cbf 100644
--- a/Test/exceptions/TypecheckErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TypecheckErrors.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" /dprint:"%t.dprint" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 include "./NatOutcome.dfy"
 include "./VoidOutcome.dfy"
 
@@ -10,11 +10,11 @@ method TestTypecheckingInDesugaredTerm_Nat() returns (res: NatOutcome) {
 }
 
 method RedeclareVar_Nat() returns (res: NatOutcome) {
-    var a := MakeNatSuccess(42);
+    var x := MakeNatSuccess(42);
     var a :- MakeNatSuccess(43);
     var b :- MakeNatSuccess(44);
-    var b := MakeNatSuccess(45);
-    return a;
+    var y := MakeNatSuccess(45);
+    return x;
 }
 
 trait BadOutcome1 {
@@ -36,15 +36,15 @@ trait BadOutcome3 {
 }
 
 method TestMissingMethods1(o: BadOutcome1) returns (res: BadOutcome1) {
-    var a :- o; return o; // TODO infers 'BadOutcome1?' for RHS of ':-' instead of 'BadOutcome1' (should not infer nullable)
+    var a :- o; return o;
 }
 
 method TestMissingMethods2(o: BadOutcome2) returns (res: BadOutcome2) {
-    var a :- o; return o; // TODO infers 'BadOutcome2?' for RHS of ':-' instead of 'BadOutcome2' (should not infer nullable)
+    var a :- o; return o;
 }
 
 method TestMissingMethods3(o: BadOutcome3) returns (res: BadOutcome3) {
-    var a :- o; return o; // TODO infers 'BadOutcome3?' for RHS of ':-' instead of 'BadOutcome3' (should not infer nullable)
+    var a :- o; return o;
 }
 
 method TestTypecheckingInDesugaredTerm_Void() returns (res: VoidOutcome) {
@@ -78,3 +78,13 @@ method TestMissingVoidMethods2(o: BadVoidOutcome2) returns (res: BadVoidOutcome2
 method TestMissingVoidMethods3(o: BadVoidOutcome3) returns (res: BadVoidOutcome3) {
     :- o; return o;
 }
+
+method TestMissingMethods2WithKeyword(o: BadOutcome2) returns (res: BadOutcome2) {
+  var a :- assert o; // with "assert" keyword, it's fine that PropagateFailure is missing
+  return o;
+}
+
+method TestMissingVoidMethods2WithKeyword(o: BadVoidOutcome2) returns (res: BadVoidOutcome2) {
+  :- assert o; // with "assert" keyword, it's fine that PropagateFailure is missing
+  return o;
+}
diff --git a/Test/exceptions/TypecheckErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TypecheckErrors.dfy.expect
similarity index 75%
rename from Test/exceptions/TypecheckErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TypecheckErrors.dfy.expect
index 4e7c72dc7c0..13d5abc7d42 100644
--- a/Test/exceptions/TypecheckErrors.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TypecheckErrors.dfy.expect
@@ -1,14 +1,12 @@
-TypecheckErrors.dfy(7,28): Error: incorrect argument type for method in-parameter 'n' (expected nat, found string)
-TypecheckErrors.dfy(8,28): Error: incorrect argument type for method in-parameter 'n' (expected nat, found string)
-TypecheckErrors.dfy(14,8): Error: Duplicate local-variable name: a
-TypecheckErrors.dfy(16,8): Error: Duplicate local-variable name: b
+TypecheckErrors.dfy(7,29): Error: incorrect argument type for method in-parameter 'n' (expected nat, found string)
+TypecheckErrors.dfy(8,29): Error: incorrect argument type for method in-parameter 'n' (expected nat, found string)
 TypecheckErrors.dfy(39,10): Error: member IsFailure does not exist in BadOutcome1?, in :- statement
 TypecheckErrors.dfy(43,10): Error: member 'PropagateFailure' does not exist in trait 'BadOutcome2'
 TypecheckErrors.dfy(43,10): Error: The right-hand side of ':-', which is of type 'BadOutcome2?', must have functions 'IsFailure()', 'PropagateFailure()', and 'Extract()'
 TypecheckErrors.dfy(47,10): Error: number of lhs (1) must be one less than number of rhs (1) for a rhs type (BadOutcome3?) without member Extract
-TypecheckErrors.dfy(51,22): Error: incorrect argument type for method in-parameter 'msg' (expected string, found int)
+TypecheckErrors.dfy(51,23): Error: incorrect argument type for method in-parameter 'msg' (expected string, found int)
 TypecheckErrors.dfy(71,4): Error: member IsFailure does not exist in BadVoidOutcome1?, in :- statement
 TypecheckErrors.dfy(75,4): Error: member 'PropagateFailure' does not exist in trait 'BadVoidOutcome2'
 TypecheckErrors.dfy(75,4): Error: The right-hand side of ':-', which is of type 'BadVoidOutcome2?', must have functions 'IsFailure()' and 'PropagateFailure()', but not 'Extract()'
 TypecheckErrors.dfy(79,4): Error: number of lhs (0) must match number of rhs (1) for a rhs type (BadVoidOutcome3?) with member Extract
-13 resolution/type errors detected in TypecheckErrors.dfy
+11 resolution/type errors detected in TypecheckErrors.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TypecheckErrors.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TypecheckErrors.dfy.refresh.expect
new file mode 100644
index 00000000000..bc5158e0762
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/TypecheckErrors.dfy.refresh.expect
@@ -0,0 +1,12 @@
+TypecheckErrors.dfy(7,29): Error: string literal used as if it had type int
+TypecheckErrors.dfy(8,29): Error: string literal used as if it had type int
+TypecheckErrors.dfy(39,10): Error: member IsFailure does not exist in BadOutcome1, in :- statement
+TypecheckErrors.dfy(43,10): Error: member 'PropagateFailure' does not exist in trait 'BadOutcome2'
+TypecheckErrors.dfy(43,10): Error: The right-hand side of ':-', which is of type 'BadOutcome2', must have functions 'IsFailure()', 'PropagateFailure()', and 'Extract()'
+TypecheckErrors.dfy(47,10): Error: number of lhs (1) must be one less than number of rhs (1) for a rhs type (BadOutcome3) without member Extract
+TypecheckErrors.dfy(51,23): Error: integer literal used as if it had type seq<char>
+TypecheckErrors.dfy(71,4): Error: member IsFailure does not exist in BadVoidOutcome1, in :- statement
+TypecheckErrors.dfy(75,4): Error: member 'PropagateFailure' does not exist in trait 'BadVoidOutcome2'
+TypecheckErrors.dfy(75,4): Error: The right-hand side of ':-', which is of type 'BadVoidOutcome2', must have functions 'IsFailure()' and 'PropagateFailure()', but not 'Extract()'
+TypecheckErrors.dfy(79,4): Error: number of lhs (0) must match number of rhs (1) for a rhs type (BadVoidOutcome3) with member Extract
+11 resolution/type errors detected in TypecheckErrors.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VerificationErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VerificationErrors.dfy
new file mode 100644
index 00000000000..8fe9203c3fd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VerificationErrors.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+include "./NatOutcome.dfy"
+include "./VoidOutcome.dfy"
+
+method CheckThatVerifierRunsInsideDesugaredExprs_Nat(r1: NatOutcome, r2: NatOutcome) returns (res: NatOutcome) {
+    var a :- MakeNatSuccess(assert r1 == r2; 12);
+    res := MakeNatSuccess(a);
+}
+
+method CheckThatVerifierRunsInsideDesugaredExprs_Void(r1: VoidOutcome, r2: VoidOutcome) returns (res: VoidOutcome) {
+    var x := assert 2 + 2 == 4; 8;
+    assert x == 8;
+    :- (assert r1 == r2; r1);
+    res := r1;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VerificationErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VerificationErrors.dfy.expect
new file mode 100644
index 00000000000..2a255d7ac24
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VerificationErrors.dfy.expect
@@ -0,0 +1,4 @@
+VerificationErrors.dfy(8,28): Error: assertion might not hold
+VerificationErrors.dfy(15,8): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/exceptions/VoidOutcome.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VoidOutcome.dfy
similarity index 93%
rename from Test/exceptions/VoidOutcome.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VoidOutcome.dfy
index 07afc335dfd..5ee50ee6721 100644
--- a/Test/exceptions/VoidOutcome.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VoidOutcome.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 // Does not test anything Exceptions-related, but is included by other tests
 
 trait VoidOutcome {
diff --git a/Test/exceptions/VoidOutcome.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VoidOutcome.dfy.expect
similarity index 100%
rename from Test/exceptions/VoidOutcome.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VoidOutcome.dfy.expect
diff --git a/Test/exceptions/VoidOutcomeDt.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VoidOutcomeDt.dfy
similarity index 83%
rename from Test/exceptions/VoidOutcomeDt.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VoidOutcomeDt.dfy
index 8c9e4d61c8e..73e52b7300c 100644
--- a/Test/exceptions/VoidOutcomeDt.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VoidOutcomeDt.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 // Does not test anything Exceptions-related, but is included by other tests
 
 datatype VoidOutcome =
diff --git a/Test/git-issues/git-issue-1164.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VoidOutcomeDt.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1164.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exceptions/VoidOutcomeDt.dfy.expect
diff --git a/Test/expectations/Expect.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/Expect.dfy
similarity index 100%
rename from Test/expectations/Expect.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/Expect.dfy
diff --git a/Test/expectations/Expect.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/Expect.dfy.expect
similarity index 100%
rename from Test/expectations/Expect.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/Expect.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectAndExceptions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectAndExceptions.dfy
new file mode 100644
index 00000000000..ac1919accfa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectAndExceptions.dfy
@@ -0,0 +1,24 @@
+// RUN: ! %run --target cs "%s" > "%t"
+// RUN: ! %run --target go "%s" >> "%t"
+// RUN: ! %run --target java "%s" >> "%t"
+// RUN: ! %run --target js "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+include "../exceptions/NatOutcomeDt.dfy"
+include "../exceptions/GenericOutcomeDt.dfy"
+
+method TestAssignOrHalt() {
+    var stmt1: nat :- expect NatSuccess(42) by {
+       assert true;
+    }
+    // Regression test for when assign-or-halt was also calling PropagateFailure, which led
+    // to the error "type variable 'U' in the function call to 'PropagateFailure' could not be determined"
+    // (because of the lack of type constraints).
+    var stmt2: string :- expect Success("Hooray!");
+
+    var stmt3: nat :- expect NatFailure("Kaboom!");
+}
+
+method Main() {
+  TestAssignOrHalt();
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectAndExceptions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectAndExceptions.dfy.expect
new file mode 100644
index 00000000000..cb29b57833f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectAndExceptions.dfy.expect
@@ -0,0 +1,12 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
+[Program halted] ExpectAndExceptions.dfy(19,22): NatOutcome.NatFailure("Kaboom!")
+
+Dafny program verifier finished with 2 verified, 0 errors
+[Program halted] ExpectAndExceptions.dfy(19,22): NatOutcome.NatFailure("Kaboom!")
+
+Dafny program verifier finished with 2 verified, 0 errors
+[Program halted] ExpectAndExceptions.dfy(19,22): NatOutcome.NatFailure("Kaboom!")
+
+Dafny program verifier finished with 2 verified, 0 errors
+[Program halted] ExpectAndExceptions.dfy(19,22): NatOutcome.NatFailure("Kaboom!")
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectWithMessage.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectWithMessage.dfy
new file mode 100644
index 00000000000..ce7b6675abd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectWithMessage.dfy
@@ -0,0 +1,9 @@
+// RUN: ! %run --target cs "%s" > "%t"
+// RUN: ! %run --target go "%s" >> "%t"
+// RUN: ! %run --target java "%s" >> "%t"
+// RUN: ! %run --target js "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  expect 2 + 2 == 5, "Down with Doublethink!";
+}
diff --git a/Test/expectations/ExpectWithMessage.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectWithMessage.dfy.expect
similarity index 100%
rename from Test/expectations/ExpectWithMessage.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectWithMessage.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectWithNonStringMessage.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectWithNonStringMessage.dfy
new file mode 100644
index 00000000000..a3cf3f845f4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectWithNonStringMessage.dfy
@@ -0,0 +1,14 @@
+// RUN: %verify "%s" > "%t"
+// RUN: ! %run --no-verify --target cs "%s" >> "%t"
+// RUN: ! %run --no-verify --target go "%s" >> "%t"
+// RUN: ! %run --no-verify --target java "%s" >> "%t"
+// RUN: ! %run --no-verify --target js "%s" >> "%t"
+// RUN: ! %run --no-verify --target py "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype Option<T> = None | Some(get: T)
+
+method Main() {
+  var x := Some("where over the rainbow");
+  expect x.None?, x;
+}
diff --git a/Test/unicodechars/expectations/ExpectWithNonStringMessage.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectWithNonStringMessage.dfy.expect
similarity index 100%
rename from Test/unicodechars/expectations/ExpectWithNonStringMessage.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/ExpectWithNonStringMessage.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/VerificationErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/VerificationErrors.dfy
new file mode 100644
index 00000000000..13838cda337
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/VerificationErrors.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+datatype Option<T> = None | Some(get: T)
+
+method CheckThatMessageIsVerifiedAssumingExpectFails(x: Option<string>) {
+    expect x.None?, x.get;
+    expect x.Some?, x.get; // error: destructor 'get' can only be applied to datatype values constructed by 'Some'
+}
diff --git a/Test/expectations/VerificationErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/VerificationErrors.dfy.expect
similarity index 100%
rename from Test/expectations/VerificationErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/expectations/VerificationErrors.dfy.expect
diff --git a/Test/exports/AggregateImport.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/AggregateImport.dfy
similarity index 92%
rename from Test/exports/AggregateImport.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/AggregateImport.dfy
index 6812911230a..db35424b4be 100644
--- a/Test/exports/AggregateImport.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/AggregateImport.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/exports/AggregateImport.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/AggregateImport.dfy.expect
similarity index 100%
rename from Test/exports/AggregateImport.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/AggregateImport.dfy.expect
diff --git a/Test/exports/AliasedImportConsistency.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/AliasedImportConsistency.dfy
similarity index 91%
rename from Test/exports/AliasedImportConsistency.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/AliasedImportConsistency.dfy
index 56ddb73b499..d35849c6b68 100644
--- a/Test/exports/AliasedImportConsistency.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/AliasedImportConsistency.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /env:0 /dprint:"%t.dfy" /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 
 module A {
diff --git a/Test/git-issues/git-issue-1158.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/AliasedImportConsistency.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1158.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/AliasedImportConsistency.dfy.expect
diff --git a/Test/exports/ClassMemberExport.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ClassMemberExport.dfy
similarity index 88%
rename from Test/exports/ClassMemberExport.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ClassMemberExport.dfy
index f2b348e9c44..3b57985d02a 100644
--- a/Test/exports/ClassMemberExport.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ClassMemberExport.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /env:0 /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module A {
    export Spec reveals AClass provides T, AClass.f, AClass.Init
diff --git a/Test/git-issues/git-issue-321a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ClassMemberExport.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-321a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ClassMemberExport.dfy.expect
diff --git a/Test/exports/DatatypeExport.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DatatypeExport.dfy
similarity index 95%
rename from Test/exports/DatatypeExport.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DatatypeExport.dfy
index 0a3594e407a..dc53ddc54f1 100644
--- a/Test/exports/DatatypeExport.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DatatypeExport.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /env:0 /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/exports/DatatypeExport.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DatatypeExport.dfy.expect
similarity index 100%
rename from Test/exports/DatatypeExport.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DatatypeExport.dfy.expect
diff --git a/Test/exports/DecreasesExports.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DecreasesExports.dfy
similarity index 90%
rename from Test/exports/DecreasesExports.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DecreasesExports.dfy
index 9aeba55eb29..2243a493058 100644
--- a/Test/exports/DecreasesExports.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DecreasesExports.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /env:0 /dprint:"%t.dfy" /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 
 module A {
diff --git a/Test/exports/DecreasesExports.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DecreasesExports.dfy.expect
similarity index 100%
rename from Test/exports/DecreasesExports.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DecreasesExports.dfy.expect
diff --git a/Test/exports/DefaultExport.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DefaultExport.dfy
similarity index 90%
rename from Test/exports/DefaultExport.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DefaultExport.dfy
index 40bba3943c3..fb4ff62c376 100644
--- a/Test/exports/DefaultExport.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DefaultExport.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/exports/DefaultExport.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DefaultExport.dfy.expect
similarity index 100%
rename from Test/exports/DefaultExport.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/DefaultExport.dfy.expect
diff --git a/Test/exports/ExportErrorLocations.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportErrorLocations.dfy
similarity index 89%
rename from Test/exports/ExportErrorLocations.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportErrorLocations.dfy
index 0ea500a93e1..f915848c1d4 100644
--- a/Test/exports/ExportErrorLocations.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportErrorLocations.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module MyModule {
   // the source locations in the following error message should be on the token
diff --git a/Test/exports/ExportErrorLocations.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportErrorLocations.dfy.expect
similarity index 100%
rename from Test/exports/ExportErrorLocations.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportErrorLocations.dfy.expect
diff --git a/Test/exports/ExportImport.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportImport.dfy
similarity index 92%
rename from Test/exports/ExportImport.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportImport.dfy
index a4ea452bb06..607dfb4afd8 100644
--- a/Test/exports/ExportImport.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportImport.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /env:0 /dprint:"%t.dfy" /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/exports/ExportImport.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportImport.dfy.expect
similarity index 100%
rename from Test/exports/ExportImport.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportImport.dfy.expect
diff --git a/Test/exports/ExportInductivePredicate.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportInductivePredicate.dfy
similarity index 94%
rename from Test/exports/ExportInductivePredicate.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportInductivePredicate.dfy
index 56baf4ebbf9..0cc7ca08ef8 100644
--- a/Test/exports/ExportInductivePredicate.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportInductivePredicate.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module M {
   least predicate P(x: int)
diff --git a/Test/git-issues/git-issue1495.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportInductivePredicate.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue1495.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportInductivePredicate.dfy.expect
diff --git a/Test/exports/ExportRefinement.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportRefinement.dfy
similarity index 87%
rename from Test/exports/ExportRefinement.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportRefinement.dfy
index fd34c4864ee..e06cf0a86d5 100644
--- a/Test/exports/ExportRefinement.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportRefinement.dfy
@@ -1,8 +1,8 @@
 // NONUNIFORM: Multiple testing scenarios (could be split)
-// RUN: %dafny /env:0 /compile:3 /dprint:"%t.dfy" "%s" > "%t.result"
-// RUN: %dafny /env:0 /printMode:DllEmbed /dprint:"%t1.dfy" "%t.dfy"
-// RUN: %dafny /env:0 /printMode:DllEmbed /dprint:"%t2.dfy" /compile:3 "%t1.dfy" > "%t"
-// RUN: %diff "%t1.dfy" "%t2.dfy"
+// RUN: %run --print:"%t1.dfy" "%s" &> "%t.result"
+// RUN: %build --print-mode Serialization --print:"%t2.dfy" "%t1.dfy" &> "%t"
+// RUN: %run --print-mode Serialization --print:"%t3.dfy" "%t2.dfy" &>> "%t"
+// RUN: %diff "%t2.dfy" "%t3.dfy"
 // RUN: %diff "%s.expect" "%t"
 
 abstract module A {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportRefinement.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportRefinement.dfy.expect
new file mode 100644
index 00000000000..56529cadb4d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportRefinement.dfy.expect
@@ -0,0 +1,8 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
+
+Dafny program verifier finished with 2 verified, 0 errors
+A2
+B2.m()
+A2
+A2.C.m
diff --git a/Test/exports/ExportResolve.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportResolve.dfy
similarity index 99%
rename from Test/exports/ExportResolve.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportResolve.dfy
index 426e7f07774..df42866061e 100644
--- a/Test/exports/ExportResolve.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportResolve.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module NamesThatDontExist {
diff --git a/Test/exports/ExportResolve.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportResolve.dfy.expect
similarity index 98%
rename from Test/exports/ExportResolve.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportResolve.dfy.expect
index d641ad7253a..0fcffd944ea 100644
--- a/Test/exports/ExportResolve.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportResolve.dfy.expect
@@ -94,8 +94,7 @@ ExportResolve.dfy(288,39): Error: member 'u' has not been imported in this scope
 ExportResolve.dfy(290,18): Error: type of corresponding source/RHS (G.Trait) does not match type of bound variable (object?)
 ExportResolve.dfy(290,46): Error: type of corresponding source/RHS (G.Klass) does not match type of bound variable (object?)
 ExportResolve.dfy(298,19): Error: member '_ctor' has not been imported in this scope and cannot be accessed here
-ExportResolve.dfy(342,15): Error: unresolved identifier: reveal_OpaqueFunction
-ExportResolve.dfy(342,29): Error: expression has no reveal lemma
+ExportResolve.dfy(342,15): Error: cannot reveal 'OpaqueFunction' because no revealable constant, function, assert label, or requires label in the current scope is named 'OpaqueFunction'
 ExportResolve.dfy(414,15): Error: member 'Q' has not been imported in this scope and cannot be accessed here
 ExportResolve.dfy(410,8): Error: RHS (of type C.X) not assignable to LHS (of type C.Z)
 ExportResolve.dfy(411,8): Error: RHS (of type A.T) not assignable to LHS (of type C.Z)
@@ -118,4 +117,4 @@ ExportResolve.dfy(620,11): Error: new can be applied only to class types (got S.
 ExportResolve.dfy(624,18): Error: member 'u' has not been imported in this scope and cannot be accessed here
 ExportResolve.dfy(634,6): Error: when allocating an object of type 'D', one of its constructor methods must be called
 ExportResolve.dfy(637,10): Error: when allocating an object of imported type 'E', one of its constructor methods must be called
-120 resolution/type errors detected in ExportResolve.dfy
+119 resolution/type errors detected in ExportResolve.dfy
diff --git a/Test/exports/ExportVerify.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportVerify.dfy
similarity index 96%
rename from Test/exports/ExportVerify.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportVerify.dfy
index b13669202a6..8a10bbb0478 100644
--- a/Test/exports/ExportVerify.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportVerify.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Lib {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportVerify.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportVerify.dfy.expect
new file mode 100644
index 00000000000..9465a35b911
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ExportVerify.dfy.expect
@@ -0,0 +1,9 @@
+ExportVerify.dfy(40,13): Error: variable 'd', which is subject to definite-assignment rules, might be uninitialized here
+ExportVerify.dfy(44,4): Error: variable 'd', which is subject to definite-assignment rules, might be uninitialized here
+ExportVerify.dfy(52,4): Error: assertion might not hold
+ExportVerify.dfy(54,4): Error: assertion might not hold
+ExportVerify.dfy(55,4): Error: assertion might not hold
+ExportVerify.dfy(56,4): Error: assertion might not hold
+ExportVerify.dfy(75,4): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 7 errors
diff --git a/Test/exports/FIFO.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/FIFO.dfy
similarity index 88%
rename from Test/exports/FIFO.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/FIFO.dfy
index 95a8d25510c..b9adbab6bac 100644
--- a/Test/exports/FIFO.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/FIFO.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 include "Queue.dfyi"
 
diff --git a/Test/exports/FIFO.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/FIFO.dfy.expect
similarity index 100%
rename from Test/exports/FIFO.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/FIFO.dfy.expect
diff --git a/Test/exports/ImportPathNonShadow.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ImportPathNonShadow.dfy
similarity index 89%
rename from Test/exports/ImportPathNonShadow.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ImportPathNonShadow.dfy
index 6d9b84b06e9..2aafad15f53 100644
--- a/Test/exports/ImportPathNonShadow.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ImportPathNonShadow.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /env:0 /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module A {
   export fandg provides f, g
diff --git a/Test/git-issues/git-issue-1181.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ImportPathNonShadow.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1181.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/ImportPathNonShadow.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/IncludeSkipTranslate.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/IncludeSkipTranslate.dfy
new file mode 100644
index 00000000000..e556a9125db
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/IncludeSkipTranslate.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+include "ExportRefinement.dfy"
+
+module Z {
+  lemma Test()
+  ensures 1 < 2 // this should be the only verification condition produced, plus one top-level one from ExportRefinement
+  {
+  }
+}
diff --git a/Test/git-issues/git-issue-1210.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/IncludeSkipTranslate.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1210.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/IncludeSkipTranslate.dfy.expect
diff --git a/Test/exports/LIFO.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/LIFO.dfy
similarity index 88%
rename from Test/exports/LIFO.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/LIFO.dfy
index 513dd457c3f..39639b9e80e 100644
--- a/Test/exports/LIFO.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/LIFO.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 include "Queue.dfyi"
 
diff --git a/Test/exports/LIFO.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/LIFO.dfy.expect
similarity index 100%
rename from Test/exports/LIFO.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/LIFO.dfy.expect
diff --git a/Test/exports/LIFO.dfy.py.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/LIFO.dfy.py.check
similarity index 100%
rename from Test/exports/LIFO.dfy.py.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/LIFO.dfy.py.check
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueFunctions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueFunctions.dfy
new file mode 100644
index 00000000000..15c3d27edae
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueFunctions.dfy
@@ -0,0 +1,70 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+module A {
+  export A provides f
+  export B reveals f
+  ghost function f() : nat { 7 }
+
+}
+
+module B {
+  import A = A`A
+
+  ghost function g() : nat { A.f() }
+
+  ghost function h() : nat
+  ensures h() == 7
+  { g() } // error
+
+}
+
+module C {
+  import A = A`B
+
+  ghost function g() : nat { A.f() }
+
+  ghost function h() : nat
+  ensures h() == 7
+  { g() }
+
+}
+
+module D {
+  import A = A`A
+  ghost function g() : nat { A.f() }
+}
+
+module E {
+  import D
+  import A`B
+
+  ghost function h() : nat
+  ensures h() == 7
+  { D.g() } // revealed via A`B
+
+}
+
+module AA {
+  export Spec provides f
+  export Body reveals f
+  ghost function {:opaque} f(): int { 0 }
+}
+
+module BB {
+  import A = AA`Spec
+  lemma Test()
+  ensures A.f() == 0 // fails
+  { }
+}
+
+module CC {
+  import A= AA`Body
+  lemma Test1()
+  ensures A.f() == 0 // fails
+  { }
+
+  lemma Test2()
+  ensures A.f() == 0
+  { reveal A.f(); }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueFunctions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueFunctions.dfy.expect
new file mode 100644
index 00000000000..ecac718e52d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueFunctions.dfy.expect
@@ -0,0 +1,8 @@
+OpaqueFunctions.dfy(18,5): Error: a postcondition could not be proved on this return path
+OpaqueFunctions.dfy(17,14): Related location: this is the postcondition that could not be proved
+OpaqueFunctions.dfy(58,2): Error: a postcondition could not be proved on this return path
+OpaqueFunctions.dfy(57,16): Related location: this is the postcondition that could not be proved
+OpaqueFunctions.dfy(65,2): Error: a postcondition could not be proved on this return path
+OpaqueFunctions.dfy(64,16): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 4 verified, 3 errors
diff --git a/Test/exports/OpaqueTypes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueTypes.dfy
similarity index 91%
rename from Test/exports/OpaqueTypes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueTypes.dfy
index f7c63cc0867..56fb575515f 100644
--- a/Test/exports/OpaqueTypes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueTypes.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /env:0 /deprecation:0 /dprint:"%t.dfy" /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/exports/OpaqueTypes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueTypes.dfy.expect
similarity index 100%
rename from Test/exports/OpaqueTypes.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpaqueTypes.dfy.expect
diff --git a/Test/exports/OpenImport.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpenImport.dfy
similarity index 87%
rename from Test/exports/OpenImport.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpenImport.dfy
index a85694a709a..b6b933a2366 100644
--- a/Test/exports/OpenImport.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpenImport.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /env:0 /dprint:"%t.dfy" /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module A{
   export provides T
diff --git a/Test/exports/OpenImport.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpenImport.dfy.expect
similarity index 100%
rename from Test/exports/OpenImport.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpenImport.dfy.expect
diff --git a/Test/exports/OpenImportRefined.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpenImportRefined.dfy
similarity index 90%
rename from Test/exports/OpenImportRefined.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpenImportRefined.dfy
index d34322be07b..5ce871ad53a 100644
--- a/Test/exports/OpenImportRefined.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpenImportRefined.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /env:0 /dprint:"%t.dfy" /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module GiveT {
   type T = int
diff --git a/Test/git-issues/git-issue-353.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpenImportRefined.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-353.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/OpenImportRefined.dfy.expect
diff --git a/Test/exports/Queue.dfyi b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/Queue.dfyi
similarity index 100%
rename from Test/exports/Queue.dfyi
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/Queue.dfyi
diff --git a/Test/exports/RevealProvideAll.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/RevealProvideAll.dfy
similarity index 91%
rename from Test/exports/RevealProvideAll.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/RevealProvideAll.dfy
index 1ceca3a420c..0fdd864df13 100644
--- a/Test/exports/RevealProvideAll.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/RevealProvideAll.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /env:0 /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module A {
   export Spec reveals AClass provides *  // when class is revealed, "provides *" also provides all the constructors of the class
diff --git a/Test/exports/RevealProvideAll.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/RevealProvideAll.dfy.expect
similarity index 79%
rename from Test/exports/RevealProvideAll.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/RevealProvideAll.dfy.expect
index 2465c083bf4..d1761ef6308 100644
--- a/Test/exports/RevealProvideAll.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/RevealProvideAll.dfy.expect
@@ -1,5 +1,5 @@
 RevealProvideAll.dfy(25,45): Error: a postcondition could not be proved on this return path
 RevealProvideAll.dfy(25,26): Related location: this is the postcondition that could not be proved
-RevealProvideAll.dfy(30,13): Error: assertion could not be proved
+RevealProvideAll.dfy(30,4): Error: assertion might not hold
 
 Dafny program verifier finished with 3 verified, 2 errors
diff --git a/Test/exports/SubModuleDefaultExport.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/SubModuleDefaultExport.dfy
similarity index 85%
rename from Test/exports/SubModuleDefaultExport.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/SubModuleDefaultExport.dfy
index e61186171b7..f9cbfc1ed81 100644
--- a/Test/exports/SubModuleDefaultExport.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/SubModuleDefaultExport.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /env:0 /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module E {
diff --git a/Test/exports/SubModuleDefaultExport.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/SubModuleDefaultExport.dfy.expect
similarity index 100%
rename from Test/exports/SubModuleDefaultExport.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/SubModuleDefaultExport.dfy.expect
diff --git a/Test/exports/xrefine0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine0.dfy.expect
similarity index 100%
rename from Test/exports/xrefine0.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine0.dfy.expect
diff --git a/Test/exports/xrefine1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine1.dfy
similarity index 93%
rename from Test/exports/xrefine1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine1.dfy
index ede328a0924..87fc521b5ca 100644
--- a/Test/exports/xrefine1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine1.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:3 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %run "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 
diff --git a/Test/exports/xrefine1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine1.dfy.expect
similarity index 100%
rename from Test/exports/xrefine1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine1.dfy.expect
diff --git a/Test/exports/xrefine2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine2.dfy
similarity index 92%
rename from Test/exports/xrefine2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine2.dfy
index 2409cc0509a..aa7d76a3bac 100644
--- a/Test/exports/xrefine2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine2.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 
 module ProtocolImpl {
diff --git a/Test/exports/xrefine2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine2.dfy.expect
similarity index 100%
rename from Test/exports/xrefine2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine2.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine2.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine2.dfy.rs.check
new file mode 100644
index 00000000000..0cba51517cc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine2.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0369]: cannot add `DafnyInt` to `nat`
\ No newline at end of file
diff --git a/Test/exports/xrefine3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine3.dfy
similarity index 92%
rename from Test/exports/xrefine3.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine3.dfy
index bb2480bfed7..2a63830691f 100644
--- a/Test/exports/xrefine3.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine3.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 
 module AlphaImpl {
diff --git a/Test/exports/xrefine3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine3.dfy.expect
similarity index 100%
rename from Test/exports/xrefine3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/exports/xrefine3.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Aliasing.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Aliasing.dfy
new file mode 100644
index 00000000000..c6ec5dd77e3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Aliasing.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+method Test1(a: array<(int, int)>, b: array<(int, int, ghost int)>) {
+  assert a as object != b;
+}
+
+method Test2(a: array<(int, int)>, b: array<(int, ghost int)>) {
+  assert a as object != b;
+}
diff --git a/Test/git-issues/git-issue-3691.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Aliasing.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3691.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Aliasing.dfy.expect
diff --git a/Test/ghost/AllowedGhost.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AllowedGhost.dfy
similarity index 77%
rename from Test/ghost/AllowedGhost.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AllowedGhost.dfy
index dce38502f46..2cec2c4e472 100644
--- a/Test/ghost/AllowedGhost.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AllowedGhost.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:- "%s" /env:0 > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --print:-
+
 
 method Test()
 {
diff --git a/Test/ghost/AllowedGhost.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AllowedGhost.dfy.expect
similarity index 100%
rename from Test/ghost/AllowedGhost.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AllowedGhost.dfy.expect
diff --git a/Test/ghost/AllowedGhostBindings.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AllowedGhostBindings.dfy
similarity index 79%
rename from Test/ghost/AllowedGhostBindings.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AllowedGhostBindings.dfy
index eea7dc1f7f9..5d6d2609a73 100644
--- a/Test/ghost/AllowedGhostBindings.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AllowedGhostBindings.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:- "%s" /env:0 > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --print:-
+
 
 method Test1()
 {
diff --git a/Test/ghost/AllowedGhostBindings.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AllowedGhostBindings.dfy.expect
similarity index 100%
rename from Test/ghost/AllowedGhostBindings.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AllowedGhostBindings.dfy.expect
diff --git a/Test/ghost/AmbiguousGhost.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AmbiguousGhost.dfy
similarity index 79%
rename from Test/ghost/AmbiguousGhost.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AmbiguousGhost.dfy
index db534b04ef7..844f1c87af3 100644
--- a/Test/ghost/AmbiguousGhost.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AmbiguousGhost.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:- "%s" /env:0 > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --print:-
+
 
 // Test that the `IsTypeSequence` method of the parser allows tuples with ghost components.
 function F(x: int): () { () }
diff --git a/Test/ghost/AmbiguousGhost.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AmbiguousGhost.dfy.expect
similarity index 100%
rename from Test/ghost/AmbiguousGhost.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/AmbiguousGhost.dfy.expect
diff --git a/Test/ghost/Comp.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Comp.dfy
similarity index 97%
rename from Test/ghost/Comp.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Comp.dfy
index 9d820764a53..53800b2deda 100644
--- a/Test/ghost/Comp.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Comp.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
 
 datatype PhantomData<T> = PhantomData(ghost value: T)
 
diff --git a/Test/ghost/Comp.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Comp.dfy.expect
similarity index 100%
rename from Test/ghost/Comp.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Comp.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Comp.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Comp.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Comp.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/DisallowedGhost1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/DisallowedGhost1.dfy
new file mode 100644
index 00000000000..4acf6824bba
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/DisallowedGhost1.dfy
@@ -0,0 +1,18 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --print=-
+
+
+method Test1()
+{
+  var first := 0;
+  var t := (ghost first:=123, 1:=234); // error
+}
+
+method Test2()
+{
+  var t := (1:=123, 2:=234); // error
+}
+
+method Test3()
+{
+  var t := (1:=123, 1:=234); // error
+}
diff --git a/Test/ghost/DisallowedGhost1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/DisallowedGhost1.dfy.expect
similarity index 100%
rename from Test/ghost/DisallowedGhost1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/DisallowedGhost1.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/DisallowedGhost2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/DisallowedGhost2.dfy
new file mode 100644
index 00000000000..234a3430b83
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/DisallowedGhost2.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --print:-
+
+
+method Test()
+{
+  var (ghost x) := 123; // syntax error
+}
diff --git a/Test/ghost/DisallowedGhost2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/DisallowedGhost2.dfy.expect
similarity index 100%
rename from Test/ghost/DisallowedGhost2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/DisallowedGhost2.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Resolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Resolution.dfy
new file mode 100644
index 00000000000..d8e3f4c5f8b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Resolution.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+method M<T(==)>(a: T)
+
+method P() {
+  var x: (int, int, ghost int);
+  M(x); // Disallowed. It's not possible to compile an equality function that also checks ghost components.
+}
diff --git a/Test/ghost/Resolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Resolution.dfy.expect
similarity index 100%
rename from Test/ghost/Resolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Resolution.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Signature.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Signature.dfy
new file mode 100644
index 00000000000..29570388af4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Signature.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver "%s" -- --print:-
+
+
+// The following signature used to cause the error "Undeclared top-level type or type parameter: _tuple#2OG".
+method Test(ghost c: (int, ghost (int, int)))
+{
+}
diff --git a/Test/ghost/Signature.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Signature.dfy.expect
similarity index 100%
rename from Test/ghost/Signature.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/ghost/Signature.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/4104-git-issue.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/4104-git-issue.dfy
new file mode 100644
index 00000000000..849eff5742b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/4104-git-issue.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+// This file tests that it's okay for a filename to start with a digit.
+
+method Main() {
+  print "hello\n";
+}
diff --git a/Test/git-issues/4104-git-issue.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/4104-git-issue.dfy.expect
similarity index 100%
rename from Test/git-issues/4104-git-issue.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/4104-git-issue.dfy.expect
diff --git a/Test/git-issues/BoundedInts.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/BoundedInts.dfy
similarity index 100%
rename from Test/git-issues/BoundedInts.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/BoundedInts.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/PR4715Test.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/PR4715Test.dfy
new file mode 100644
index 00000000000..2df5a26b132
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/PR4715Test.dfy
@@ -0,0 +1,28 @@
+// RUN: %verify --warn-contradictory-assumptions "%s" > "%t"
+// Check that the output contains no warnings about contradictory assumptions
+// RUN: %diff "%s.expect" "%t"
+
+abstract module PR4715Test {
+  opaque function Pow(b: int, e: nat): int
+    decreases e
+  {
+    if e == 0 then
+      1
+    else
+      b * Pow(b, e - 1)
+  }
+
+  function WeirdIdentity(x: int): (r: int)
+    ensures r == x
+  {
+    if x < 0 then
+      assert Pow(1, 2) == 1 by { reveal Pow(); }
+      x
+    else
+      x
+  }
+
+}
+
+module PR4715Test2 refines PR4715Test {
+}
diff --git a/Test/git-issues/git-issue-3792.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/PR4715Test.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3792.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/PR4715Test.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/class.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/class.dfy
new file mode 100644
index 00000000000..17c01a802af
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/class.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+// This file tests that it's okay for a filename to have a name like "class, which is
+// reserved in many languages.
+
+method Main() {
+  print "hello\n";
+}
diff --git a/Test/git-issues/class.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/class.dfy.expect
similarity index 100%
rename from Test/git-issues/class.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/class.dfy.expect
diff --git a/Test/git-issues/git-issue-032-errors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032-errors.dfy
similarity index 90%
rename from Test/git-issues/git-issue-032-errors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032-errors.dfy
index 1bc99684ec2..41be30d806d 100644
--- a/Test/git-issues/git-issue-032-errors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032-errors.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 
diff --git a/Test/git-issues/git-issue-032-errors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032-errors.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-032-errors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032-errors.dfy.expect
diff --git a/Test/git-issues/git-issue-032.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032.dfy
similarity index 82%
rename from Test/git-issues/git-issue-032.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032.dfy
index d7dd61440a7..cae0f0af193 100644
--- a/Test/git-issues/git-issue-032.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings --relax-definite-assignment
 
 
 method Main() {
diff --git a/Test/git-issues/git-issue-032.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-032.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032.dfy.expect
diff --git a/Test/git-issues/git-issue-032.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032.dfy.verifier.expect
similarity index 100%
rename from Test/git-issues/git-issue-032.dfy.verifier.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032.dfy.verifier.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032a.dfy
new file mode 100644
index 00000000000..08dae444dcc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032a.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+method m() {
+  var x := ();
+  match x { case () => print "OK"; case _ => print "DEF"; }
+  print "\n";
+}
+
diff --git a/Test/git-issues/git-issue-032a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-032a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-032a.dfy.expect
diff --git a/Test/git-issues/git-issue-1005.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1005.dfy
similarity index 98%
rename from Test/git-issues/git-issue-1005.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1005.dfy
index b12de83f9cf..b890fec043e 100644
--- a/Test/git-issues/git-issue-1005.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1005.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype S0 = S0()
diff --git a/Test/git-issues/git-issue-1005.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1005.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1005.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1005.dfy.expect
diff --git a/Test/git-issues/git-issue-1016.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1016.dfy
similarity index 97%
rename from Test/git-issues/git-issue-1016.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1016.dfy
index c7b11720a2b..b93d4e9f9a9 100644
--- a/Test/git-issues/git-issue-1016.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1016.dfy
@@ -1,11 +1,11 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Option<T> = Some(value: T) | None {
   predicate IsFailure() {
     None?
   }
-  function PropagateFailure<U>(): Option<U>
+function PropagateFailure<U>(): Option<U>
     requires None?
   {
     None
diff --git a/Test/git-issues/git-issue-1016.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1016.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1016.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1016.dfy.expect
diff --git a/Test/git-issues/git-issue-1016a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1016a.dfy
similarity index 91%
rename from Test/git-issues/git-issue-1016a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1016a.dfy
index 96356f985bd..50bc2e5c604 100644
--- a/Test/git-issues/git-issue-1016a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1016a.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Option<T> = Some(value: T) | None {
diff --git a/Test/git-issues/git-issue-1016a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1016a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1016a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1016a.dfy.expect
diff --git a/Test/git-issues/git-issue-1029.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1029.dfy
similarity index 85%
rename from Test/git-issues/git-issue-1029.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1029.dfy
index 7e1e7a31cf2..335ede5e8dd 100644
--- a/Test/git-issues/git-issue-1029.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1029.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 module ValueType {
   export S
diff --git a/Test/git-issues/git-issue-1029.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1029.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1029.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1029.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1029.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1029.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1029.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1074.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1074.dfy
similarity index 96%
rename from Test/git-issues/git-issue-1074.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1074.dfy
index ea8b7e0ad54..1599ecb4f08 100644
--- a/Test/git-issues/git-issue-1074.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1074.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compileVerbose:1 /compile:1 "%s" > "%t"
+// RUN: %build --verbose "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/git-issues/git-issue-1074.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1074.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1074.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1074.dfy.expect
diff --git a/Test/git-issues/git-issue-1093.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1093.dfy
similarity index 84%
rename from Test/git-issues/git-issue-1093.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1093.dfy
index 97797296680..1a771a21bf4 100644
--- a/Test/git-issues/git-issue-1093.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1093.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   UnusedLabel();
diff --git a/Test/git-issues/git-issue-1093.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1093.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1093.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1093.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1093.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1093.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1093.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1094.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1094.dfy
similarity index 98%
rename from Test/git-issues/git-issue-1094.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1094.dfy
index 67671e62e93..2865c93bc42 100644
--- a/Test/git-issues/git-issue-1094.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1094.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // ----- Type error -----
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1094.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1094.dfy.expect
new file mode 100644
index 00000000000..e5f9ee5a233
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1094.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 12 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1100.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1100.dfy
new file mode 100644
index 00000000000..8fda48b372a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1100.dfy
@@ -0,0 +1,3 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%S/../c++/arrays.dfy" -- --relax-definite-assignment --allow-deprecation --unicode-char false
+
+// Test compilation of a file in another directory
diff --git a/Test/git-issues/git-issue-1100.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1100.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1100.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1100.dfy.expect
diff --git a/Test/git-issues/git-issue-1105.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy
similarity index 81%
rename from Test/git-issues/git-issue-1105.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy
index 593553acb8b..d758d34d63f 100644
--- a/Test/git-issues/git-issue-1105.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 // Regression: A constructor like PushOp with 1+ ghost parameters and 0 non-ghost parameters
 // once caused the Java compiler to emit two 0-parameter constructors
diff --git a/Test/git-issues/git-issue-1105.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1105.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy.expect
diff --git a/Test/git-issues/git-issue-1105.dfy.go.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy.go.expect
similarity index 100%
rename from Test/git-issues/git-issue-1105.dfy.go.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy.go.expect
diff --git a/Test/git-issues/git-issue-1105.dfy.js.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy.js.expect
similarity index 100%
rename from Test/git-issues/git-issue-1105.dfy.js.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy.js.expect
diff --git a/Test/git-issues/git-issue-1105.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy.py.expect
similarity index 100%
rename from Test/git-issues/git-issue-1105.dfy.py.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1105.dfy.py.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1109.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1109.dfy
new file mode 100755
index 00000000000..7cffe18a5a6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1109.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --stdin < "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+lemma TestStdin()
+{
+  assert 2 == 3; // this error should be labeled <stdin>(6, 11)
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1109.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1109.dfy.expect
new file mode 100644
index 00000000000..b3b021a58f6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1109.dfy.expect
@@ -0,0 +1,3 @@
+<stdin>(6,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/git-issues/git-issue-1111.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1111.dfy
similarity index 86%
rename from Test/git-issues/git-issue-1111.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1111.dfy
index cd1743c1960..e3644a10814 100644
--- a/Test/git-issues/git-issue-1111.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1111.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compileTarget:java "%s" > "%t"
+// RUN: %build --target java "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Foo {
diff --git a/Test/git-issues/git-issue-1211.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1111.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1211.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1111.dfy.expect
diff --git a/Test/git-issues/git-issue-1112.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1112.dfy
similarity index 97%
rename from Test/git-issues/git-issue-1112.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1112.dfy
index 5a55e8dae40..19a9b1fc46c 100644
--- a/Test/git-issues/git-issue-1112.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1112.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var d: D?
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1112.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1112.dfy.expect
new file mode 100644
index 00000000000..61e95c65f03
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1112.dfy.expect
@@ -0,0 +1,24 @@
+git-issue-1112.dfy(22,29): Error: target object might be null
+git-issue-1112.dfy(24,21): Error: target object might be null
+git-issue-1112.dfy(24,38): Error: target object might be null
+git-issue-1112.dfy(36,32): Error: target object might be null
+git-issue-1112.dfy(38,24): Error: target object might be null
+git-issue-1112.dfy(38,44): Error: target object might be null
+git-issue-1112.dfy(51,33): Error: target object might be null
+git-issue-1112.dfy(53,25): Error: target object might be null
+git-issue-1112.dfy(53,46): Error: target object might be null
+git-issue-1112.dfy(64,26): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+git-issue-1112.dfy(66,28): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+git-issue-1112.dfy(77,23): Error: array could not be proved to be allocated
+git-issue-1112.dfy(79,25): Error: array could not be proved to be allocated
+git-issue-1112.dfy(90,23): Error: array could not be proved to be allocated
+git-issue-1112.dfy(92,25): Error: array could not be proved to be allocated
+git-issue-1112.dfy(98,11): Error: array might be null
+git-issue-1112.dfy(98,14): Error: index out of range
+git-issue-1112.dfy(99,11): Error: array might be null
+git-issue-1112.dfy(99,13): Error: index 0 out of range
+git-issue-1112.dfy(99,16): Error: index 1 out of range
+git-issue-1112.dfy(107,11): Error: array might be null
+git-issue-1112.dfy(108,11): Error: array might be null
+
+Dafny program verifier finished with 5 verified, 22 errors
diff --git a/Test/git-issues/git-issue-1113.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1113.dfy
similarity index 93%
rename from Test/git-issues/git-issue-1113.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1113.dfy
index 7df99d66f6b..9d32aae8b6d 100644
--- a/Test/git-issues/git-issue-1113.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1113.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // ---------- 1113 ----------
 
diff --git a/Test/git-issues/git-issue-2429.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1113.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2429.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1113.dfy.expect
diff --git a/Test/git-issues/git-issue-1127.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1127.dfy
similarity index 86%
rename from Test/git-issues/git-issue-1127.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1127.dfy
index a55e169ba7d..8b98ff8d3f1 100644
--- a/Test/git-issues/git-issue-1127.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1127.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 // -----
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1127.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1127.dfy.expect
new file mode 100644
index 00000000000..20cd4ba1fc1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1127.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-1127.dfy(15,26): Error: type parameter (T) passed to function Func must be nonempty (got PossiblyEmpty)
+git-issue-1127.dfy(29,40): Error: type parameter (T) passed to function GetInhabitant must support auto-initialization (got EmptyInt)
+2 resolution/type errors detected in git-issue-1127.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1129.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1129.dfy
new file mode 100644
index 00000000000..7cf71717f64
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1129.dfy
@@ -0,0 +1,33 @@
+// NONUNIFORM: Program expected to fail in backend-specific ways
+// RUN: %verify "%s" > "%t"
+// RUN: %exits-with 3 %run --no-verify --target cs "%s" > "%t".abyss
+// RUN: %exits-with 3 %run --no-verify --target java "%s" > "%t".abyss
+// RUN: %run --no-verify --target js "%s" > "%t".abyss
+// RUN: %exits-with 3 %run --no-verify --target go "%s" > "%t".abyss
+// RUN: %exits-with 3 %run --no-verify --target cpp "%s" > "%t".abyss
+// RUN: %diff "%s.expect" "%t"
+
+// Without providing extern code for the :extern C, Dafny will output
+// target-compiler error messages when asked to compile this program.
+// Some of the compilers had then thrown an exception, which caused
+// Dafny to crash. That doesn't seem very friendly. The fix is to
+// just print the error and exit, without crashing.
+//
+// Errors reported by the underlying compiler may contain absolute
+// path names. These are annoying to have in .expect files. Therefore,
+// the output from the Dafny invocations above are piped into the
+// abyss. This testing still detects any crash.
+
+module A {
+  import B
+  datatype D = D(test: B.C)
+}
+
+module B {
+  class {:extern} C {
+    constructor {:extern} (name: string)
+  }
+}
+
+method Main() {
+}
diff --git a/Test/git-issues/git-issue-1184.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1129.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1184.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1129.dfy.expect
diff --git a/Test/git-issues/git-issue-1130.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1130.dfy
similarity index 93%
rename from Test/git-issues/git-issue-1130.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1130.dfy
index f1f5ad5a54b..89f17a444df 100644
--- a/Test/git-issues/git-issue-1130.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1130.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   var a := new Issue.Foo<int>();
diff --git a/Test/git-issues/git-issue-1130.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1130.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1130.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1130.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1130.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1130.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1130.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1143.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1143.dfy
similarity index 89%
rename from Test/git-issues/git-issue-1143.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1143.dfy
index cea4b0bc201..2b4e54d0d39 100644
--- a/Test/git-issues/git-issue-1143.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1143.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype Nat = Zero | Succ(pred: Nat)
 {
diff --git a/Test/git-issues/git-issue-3955.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1143.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3955.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1143.dfy.expect
diff --git a/Test/git-issues/git-issue-1148.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1148.dfy
similarity index 96%
rename from Test/git-issues/git-issue-1148.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1148.dfy
index 1ecc2ab17e3..c81d05cbaa7 100644
--- a/Test/git-issues/git-issue-1148.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1148.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module AutoInitRegressions {
   trait Y { }
diff --git a/Test/git-issues/git-issue-1148.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1148.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1148.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1148.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1150.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1150.dfy
new file mode 100644
index 00000000000..68acca17e88
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1150.dfy
@@ -0,0 +1,18 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+datatype Foo = Foo(x: nat)
+{
+  // the following once generated malformed Boogie
+  const good?: bool := 0 < x < 5
+}
+
+method Main()
+{
+  var x := Foo(2);
+  assert x.good?;
+  print x, " ", x.good?, "\n";
+
+  var y := Foo(5);
+  assert !y.good?;
+  print y, " ", y.good?, "\n";
+}
diff --git a/Test/git-issues/git-issue-1150.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1150.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1150.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1150.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1150.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1150.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1150.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1151-concrete.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151-concrete.cs
similarity index 100%
rename from Test/git-issues/git-issue-1151-concrete.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151-concrete.cs
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151-more.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151-more.dfy
new file mode 100644
index 00000000000..ffb2c3ccbd1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151-more.dfy
@@ -0,0 +1,23 @@
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
+// RUN: %exits-with 3 %run --no-verify --target cs "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target java "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target js "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target go "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --unicode-char false --target cpp "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target py "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// The following example should produce a compilation error, since there's
+// an abstract type. It should not, however, crash.
+
+type Opaque(0) // compilation error: this is an abstract type
+
+datatype E = E(Opaque)
+
+method N() returns (e: E) {
+}
+
+method Main() {
+  var e := N();
+  print e, "\n";
+}
diff --git a/Test/git-issues/git-issue-1151-more.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151-more.dfy.expect
similarity index 77%
rename from Test/git-issues/git-issue-1151-more.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151-more.dfy.expect
index bfc28c38b4b..03f98a0f84a 100644
--- a/Test/git-issues/git-issue-1151-more.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151-more.dfy.expect
@@ -3,22 +3,24 @@ Dafny program verifier finished with 1 verified, 0 errors
 
 Dafny program verifier did not attempt verification
 git-issue-1151-more.dfy(13,5): Error: Abstract type ('_module.Opaque') cannot be compiled; perhaps make it a type synonym or use :extern.
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-1151-more.dfy(13,5): Error: Abstract type ('_module.Opaque') cannot be compiled; perhaps make it a type synonym or use :extern.
-Wrote textual form of partial target program to git-issue-1151-more-java/git_issue_1151_more.java
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-1151-more.dfy(13,5): Error: Abstract type ('_module.Opaque') cannot be compiled; perhaps make it a type synonym or use :extern.
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-1151-more.dfy(13,5): Error: Abstract type ('_module.Opaque') cannot be compiled; perhaps make it a type synonym or use :extern.
-Wrote textual form of partial target program to git-issue-1151-more-go/src/git-issue-1151-more.go
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-1151-more.dfy(13,5): Error: Abstract type ('_module.Opaque') cannot be compiled; perhaps make it a type synonym or use :extern.
-Wrote textual form of partial target program to git-issue-1151-more.cpp
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-1151-more.dfy(13,5): Error: Abstract type ('_module.Opaque') cannot be compiled; perhaps make it a type synonym or use :extern.
-Wrote textual form of partial target program to git-issue-1151-more-py/__main__.py
+Translation was aborted because errors were found
diff --git a/Test/git-issues/git-issue-1151.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151.dfy
similarity index 82%
rename from Test/git-issues/git-issue-1151.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151.dfy
index b58b4f21d12..3211026d9b4 100644
--- a/Test/git-issues/git-issue-1151.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:3 "%s" %S/git-issue-1151-concrete.cs > "%t"
+// RUN: %run "%s" --relax-definite-assignment --input %S/git-issue-1151-concrete.cs > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module {:extern "M"} M {
diff --git a/Test/git-issues/git-issue-1151.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1151.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1151.dfy.expect
diff --git a/Test/git-issues/git-issue-1158.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1158.dfy
similarity index 86%
rename from Test/git-issues/git-issue-1158.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1158.dfy
index 871134fd293..a3ce7e85f77 100644
--- a/Test/git-issues/git-issue-1158.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1158.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 type Id(==)
 
diff --git a/Test/git-issues/git-issue-1838.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1158.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1838.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1158.dfy.expect
diff --git a/Test/git-issues/git-issue-1163.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1163.dfy
similarity index 95%
rename from Test/git-issues/git-issue-1163.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1163.dfy
index b2a1079ea99..84e05c40683 100644
--- a/Test/git-issues/git-issue-1163.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1163.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 ghost function F(i: int): int
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1163.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1163.dfy.expect
new file mode 100644
index 00000000000..fd7de1ef0d2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1163.dfy.expect
@@ -0,0 +1,6 @@
+git-issue-1163.dfy(7,17): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+git-issue-1163.dfy(21,42): Error: receiver argument could not be proved to be allocated in the state in which the function is invoked
+git-issue-1163.dfy(23,44): Error: argument could not be proved to be allocated in the state in which the function is invoked
+git-issue-1163.dfy(27,40): Error: receiver argument could not be proved to be allocated in the state in which the function is invoked
+
+Dafny program verifier finished with 2 verified, 3 errors
diff --git a/Test/git-issues/git-issue-1164.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1164.dfy
similarity index 85%
rename from Test/git-issues/git-issue-1164.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1164.dfy
index 7effd640e1a..df4961ed77a 100644
--- a/Test/git-issues/git-issue-1164.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1164.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class MyList<T>
 {
diff --git a/Test/git-issues/git-issue-1195.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1164.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1195.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1164.dfy.expect
diff --git a/Test/git-issues/git-issue-1165.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1165.dfy
similarity index 96%
rename from Test/git-issues/git-issue-1165.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1165.dfy
index da2715e26de..24a2e95de2a 100644
--- a/Test/git-issues/git-issue-1165.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1165.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 predicate P()
 
diff --git a/Test/git-issues/git-issue-1165.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1165.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1165.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1165.dfy.expect
diff --git a/Test/git-issues/git-issue-1172.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1172.dfy
similarity index 98%
rename from Test/git-issues/git-issue-1172.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1172.dfy
index 5b641a3e65f..d4b338bd9cd 100644
--- a/Test/git-issues/git-issue-1172.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1172.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:3 "%s" > "%t"
+// RUN: %exits-with 2 %run "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // The following examples show that verification would be unsound if ghost methods would
diff --git a/Test/git-issues/git-issue-1172.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1172.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1172.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1172.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1174.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1174.dfy
new file mode 100644
index 00000000000..a8e076b453b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1174.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+ghost function fm1(): bool
+{
+    (true)
+}
+
+function fm2():bool
+{
+    var v := fm1();
+    (v)
+}
+
diff --git a/Test/git-issues/git-issue-1174.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1174.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1174.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1174.dfy.expect
diff --git a/Test/git-issues/git-issue-1180a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180a.dfy
similarity index 99%
rename from Test/git-issues/git-issue-1180a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180a.dfy
index 781254d5d03..50afb019117 100644
--- a/Test/git-issues/git-issue-1180a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180a.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /printTooltips "%s" > "%t"
+// RUN: %exits-with 2 %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // resolution errors
diff --git a/Test/git-issues/git-issue-1180a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1180a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180a.dfy.expect
diff --git a/Test/git-issues/git-issue-1180b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180b.dfy
similarity index 98%
rename from Test/git-issues/git-issue-1180b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180b.dfy
index b9cf47f1e48..03746a917e9 100644
--- a/Test/git-issues/git-issue-1180b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180b.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // verification errors
diff --git a/Test/git-issues/git-issue-1180b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180b.dfy.expect
similarity index 81%
rename from Test/git-issues/git-issue-1180b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180b.dfy.expect
index e7c31658280..22c637ee937 100644
--- a/Test/git-issues/git-issue-1180b.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1180b.dfy.expect
@@ -1,42 +1,42 @@
-git-issue-1180b.dfy(28,15): Error: a postcondition could not be proved on this return path
+git-issue-1180b.dfy(28,32): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(12,21): Related location: this is the postcondition that could not be proved
 git-issue-1180b.dfy(29,40): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(15,18): Related location: this is the postcondition that could not be proved
-git-issue-1180b.dfy(34,15): Error: a postcondition could not be proved on this return path
+git-issue-1180b.dfy(34,32): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(12,21): Related location: this is the postcondition that could not be proved
 git-issue-1180b.dfy(35,40): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(15,18): Related location: this is the postcondition that could not be proved
-git-issue-1180b.dfy(40,15): Error: a postcondition could not be proved on this return path
+git-issue-1180b.dfy(40,32): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(12,21): Related location: this is the postcondition that could not be proved
 git-issue-1180b.dfy(41,40): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(15,18): Related location: this is the postcondition that could not be proved
-git-issue-1180b.dfy(46,15): Error: a postcondition could not be proved on this return path
+git-issue-1180b.dfy(46,32): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(12,21): Related location: this is the postcondition that could not be proved
 git-issue-1180b.dfy(47,40): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(15,18): Related location: this is the postcondition that could not be proved
-git-issue-1180b.dfy(56,15): Error: a postcondition could not be proved on this return path
+git-issue-1180b.dfy(56,32): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(12,21): Related location: this is the postcondition that could not be proved
 git-issue-1180b.dfy(57,40): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(15,18): Related location: this is the postcondition that could not be proved
-git-issue-1180b.dfy(63,15): Error: a postcondition could not be proved on this return path
+git-issue-1180b.dfy(63,32): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(12,21): Related location: this is the postcondition that could not be proved
 git-issue-1180b.dfy(64,40): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(15,18): Related location: this is the postcondition that could not be proved
-git-issue-1180b.dfy(83,15): Error: a postcondition could not be proved on this return path
+git-issue-1180b.dfy(83,32): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(75,21): Related location: this is the postcondition that could not be proved
 git-issue-1180b.dfy(84,40): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(78,18): Related location: this is the postcondition that could not be proved
-git-issue-1180b.dfy(103,15): Error: a postcondition could not be proved on this return path
+git-issue-1180b.dfy(103,32): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(95,21): Related location: this is the postcondition that could not be proved
 git-issue-1180b.dfy(104,40): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(98,18): Related location: this is the postcondition that could not be proved
-git-issue-1180b.dfy(123,15): Error: a postcondition could not be proved on this return path
+git-issue-1180b.dfy(123,32): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(115,21): Related location: this is the postcondition that could not be proved
 git-issue-1180b.dfy(124,40): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(118,18): Related location: this is the postcondition that could not be proved
-git-issue-1180b.dfy(143,15): Error: a postcondition could not be proved on this return path
+git-issue-1180b.dfy(143,32): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(135,21): Related location: this is the postcondition that could not be proved
 git-issue-1180b.dfy(144,40): Error: a postcondition could not be proved on this return path
 git-issue-1180b.dfy(138,18): Related location: this is the postcondition that could not be proved
 
-Dafny program verifier finished with 13 verified, 20 errors
+Dafny program verifier finished with 7 verified, 20 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1181.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1181.dfy
new file mode 100644
index 00000000000..108af5d6779
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1181.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+type T {
+  ghost predicate P(t: T)
+  ghost predicate Q()
+    requires P(this)  // once got the bogus "type mismatch for argument (function expects T, got T)"
+}
diff --git a/Test/git-issues/git-issue-1199.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1181.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1199.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1181.dfy.expect
diff --git a/Test/git-issues/git-issue-1184.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1184.dfy
similarity index 86%
rename from Test/git-issues/git-issue-1184.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1184.dfy
index d4f784c88a3..abb70279ac2 100644
--- a/Test/git-issues/git-issue-1184.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1184.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 type IntMap = map<int, int>
 
diff --git a/Test/git-issues/git-issue-1224.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1184.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1224.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1184.dfy.expect
diff --git a/Test/git-issues/git-issue-1185.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1185.dfy
similarity index 84%
rename from Test/git-issues/git-issue-1185.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1185.dfy
index c7ad72134d1..895ab9b918f 100644
--- a/Test/git-issues/git-issue-1185.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1185.dfy
@@ -1,5 +1,5 @@
 // NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 predicate P(s: set)
   requires s != {}
diff --git a/Test/git-issues/git-issue-1185.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1185.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1185.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1185.dfy.expect
diff --git a/Test/git-issues/git-issue-1185.dfy.java.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1185.dfy.java.expect
similarity index 100%
rename from Test/git-issues/git-issue-1185.dfy.java.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1185.dfy.java.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1185.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1185.dfy.rs.check
new file mode 100644
index 00000000000..023f6254d9f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1185.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `_T0: Hash` is not satisfied
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1195.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1195.dfy
similarity index 77%
rename from Test/git-issues/git-issue-1195.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1195.dfy
index c5a4b22f287..16145c4bcbe 100644
--- a/Test/git-issues/git-issue-1195.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1195.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 method M0(B: ORDINAL)
 {
diff --git a/Test/git-issues/git-issue-1229.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1195.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1229.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1195.dfy.expect
diff --git a/Test/git-issues/git-issue-1199-extern.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1199-extern.cs
similarity index 100%
rename from Test/git-issues/git-issue-1199-extern.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1199-extern.cs
diff --git a/Test/git-issues/git-issue-1199.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1199.dfy
similarity index 77%
rename from Test/git-issues/git-issue-1199.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1199.dfy
index 50c1a5c92ce..d1ea43716f2 100644
--- a/Test/git-issues/git-issue-1199.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1199.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:1 /compileTarget:cs "%s" %S/git-issue-1199-extern.cs > "%t"
+// RUN: %build "%s" %S/git-issue-1199-extern.cs > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module {:extern "Microsoft"} Microsoft {
diff --git a/Test/git-issues/git-issue-1347.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1199.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1347.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1199.dfy.expect
diff --git a/Test/git-issues/git-issue-1207.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1207.dfy
similarity index 97%
rename from Test/git-issues/git-issue-1207.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1207.dfy
index a06d0cc747b..e4b140753b5 100644
--- a/Test/git-issues/git-issue-1207.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1207.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /errorLimit:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --error-limit 0 "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // The point of all of these tests is to make sure no boolean operators slip into
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1207.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1207.dfy.expect
new file mode 100644
index 00000000000..2f4aeeb6a1d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1207.dfy.expect
@@ -0,0 +1,36 @@
+git-issue-1207.dfy(17,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1207.dfy(29,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1207.dfy(41,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1207.dfy(47,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1207.dfy(48,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1207.dfy(10,2): Error: assertion might not hold
+git-issue-1207.dfy(11,2): Error: assertion might not hold
+git-issue-1207.dfy(14,2): Error: assertion might not hold
+git-issue-1207.dfy(15,2): Error: assertion might not hold
+git-issue-1207.dfy(16,2): Error: assertion might not hold
+git-issue-1207.dfy(17,2): Error: assertion might not hold
+git-issue-1207.dfy(18,2): Error: assertion might not hold
+git-issue-1207.dfy(22,2): Error: assertion might not hold
+git-issue-1207.dfy(23,2): Error: assertion might not hold
+git-issue-1207.dfy(26,2): Error: assertion might not hold
+git-issue-1207.dfy(27,2): Error: assertion might not hold
+git-issue-1207.dfy(28,2): Error: assertion might not hold
+git-issue-1207.dfy(29,2): Error: assertion might not hold
+git-issue-1207.dfy(30,2): Error: assertion might not hold
+git-issue-1207.dfy(34,2): Error: assertion might not hold
+git-issue-1207.dfy(35,2): Error: assertion might not hold
+git-issue-1207.dfy(38,2): Error: assertion might not hold
+git-issue-1207.dfy(39,2): Error: assertion might not hold
+git-issue-1207.dfy(40,2): Error: assertion might not hold
+git-issue-1207.dfy(41,2): Error: assertion might not hold
+git-issue-1207.dfy(42,2): Error: assertion might not hold
+git-issue-1207.dfy(43,2): Error: assertion might not hold
+git-issue-1207.dfy(47,2): Error: assertion might not hold
+git-issue-1207.dfy(48,2): Error: assertion might not hold
+git-issue-1207.dfy(49,2): Error: assertion might not hold
+git-issue-1207.dfy(50,2): Error: assertion might not hold
+git-issue-1207.dfy(50,49): Error: index out of range
+git-issue-1207.dfy(50,57): Error: index out of range
+git-issue-1207.dfy(51,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 29 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1210.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1210.dfy
new file mode 100644
index 00000000000..ec02af6e62a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1210.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+abstract module A {
+  const c: nat
+}
+abstract module B refines A {}
+module C refines B {
+  const c: nat := 0
+}
diff --git a/Test/git-issues/git-issue-2016.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1210.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2016.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1210.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1211.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1211.dfy
new file mode 100644
index 00000000000..5c5f1f5db39
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1211.dfy
@@ -0,0 +1,19 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+function apply<T,U>(op: T --> U): ()
+{
+  ()
+}
+
+datatype D = O | LD(c: D, thunk: () -> D)
+{
+  
+  function e(d: D): ()
+  {
+      apply((x: D) requires x.LD? => x.(c := d))
+  }
+}
+
+
+
diff --git a/Test/git-issues/git-issue-2726.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1211.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2726.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1211.dfy.expect
diff --git a/Test/git-issues/git-issue-1212.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1212.dfy
similarity index 93%
rename from Test/git-issues/git-issue-1212.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1212.dfy
index 1706050c001..38074794880 100644
--- a/Test/git-issues/git-issue-1212.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1212.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:3 "%s" > "%t"
+// RUN: %exits-with 4 %run "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait H<Y> { var data: Y }
diff --git a/Test/git-issues/git-issue-1212.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1212.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1212.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1212.dfy.expect
diff --git a/Test/git-issues/git-issue-1219.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1219.dfy
similarity index 92%
rename from Test/git-issues/git-issue-1219.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1219.dfy
index 649f363588a..e7692574a21 100644
--- a/Test/git-issues/git-issue-1219.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1219.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" /dprint:- /env:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --print:-
+
 
 module Issue1219 {
   datatype CheckRussell = ISet(s: iset<CheckRussell>)  // error: recursive mentions must be used in a strict (and covariant) context
diff --git a/Test/git-issues/git-issue-1219.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1219.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1219.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1219.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1224.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1224.dfy
new file mode 100644
index 00000000000..07edf5967e0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1224.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+abstract module SlowPoke {
+  lemma {:timeLimitMultiplier 4} SlowLemma()
+}
+
+module SlowChild refines SlowPoke { }
diff --git a/Test/git-issues/git-issue-1587.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1224.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1587.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1224.dfy.expect
diff --git a/Test/git-issues/git-issue-1227.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1227.dfy
similarity index 90%
rename from Test/git-issues/git-issue-1227.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1227.dfy
index 578561ba0bd..3312e796130 100644
--- a/Test/git-issues/git-issue-1227.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1227.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 trait T {
   function F(): int
diff --git a/Test/git-issues/git-issue-1227.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1227.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1227.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1227.dfy.expect
diff --git a/Test/git-issues/git-issue-1229-extern.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1229-extern.cs
similarity index 100%
rename from Test/git-issues/git-issue-1229-extern.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1229-extern.cs
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1229.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1229.dfy
new file mode 100644
index 00000000000..8191b8a6e16
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1229.dfy
@@ -0,0 +1,14 @@
+// RUN: %build "%s" %S/git-issue-1229-extern.cs > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module {:extern "MyModule2"} MyModule2 {
+    type {:extern "MyType"} MyType(==,!new)
+}
+
+module MyModule1 {
+    import MyModule2
+
+    datatype MyDatatype = MyDatatype (
+        t: MyModule2.MyType
+    )
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1639.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1229.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1639.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1229.dfy.expect
diff --git a/Test/git-issues/git-issue-1231.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1231.dfy
similarity index 84%
rename from Test/git-issues/git-issue-1231.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1231.dfy
index e852da2a024..4a04bfd88b4 100644
--- a/Test/git-issues/git-issue-1231.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1231.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype Dt = Dt(x:int)
 {
diff --git a/Test/git-issues/git-issue-1423.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1231.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1423.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1231.dfy.expect
diff --git a/Test/git-issues/git-issue-1248.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1248.dfy
similarity index 94%
rename from Test/git-issues/git-issue-1248.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1248.dfy
index 3080aaa2d79..4435df3cee9 100644
--- a/Test/git-issues/git-issue-1248.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1248.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
+// RUN: %exits-with 4 %build "%s" > "%t"
 // RUN: %exits-with 4 %dafny /arith:10 "%s" >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
diff --git a/Test/git-issues/git-issue-1248.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1248.dfy.expect
similarity index 88%
rename from Test/git-issues/git-issue-1248.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1248.dfy.expect
index 9c489d683b4..04f483c39c2 100644
--- a/Test/git-issues/git-issue-1248.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1248.dfy.expect
@@ -4,6 +4,7 @@ git-issue-1248.dfy(19,0): Error: a postcondition could not be proved on this ret
 git-issue-1248.dfy(18,10): Related location: this is the postcondition that could not be proved
 
 Dafny program verifier finished with 0 verified, 2 errors
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 git-issue-1248.dfy(13,0): Error: a postcondition could not be proved on this return path
 git-issue-1248.dfy(12,10): Related location: this is the postcondition that could not be proved
 git-issue-1248.dfy(19,0): Error: a postcondition could not be proved on this return path
diff --git a/Test/git-issues/git-issue-1250.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1250.dfy
similarity index 96%
rename from Test/git-issues/git-issue-1250.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1250.dfy
index 680bc694b75..0c12c7abfaf 100644
--- a/Test/git-issues/git-issue-1250.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1250.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This file contains the automatic proofs of two nice properties about Fibonacci-like numbers.
 // The theorems were inspired by singingbanana's video https://www.youtube.com/watch?v=CWhcUea5GNc.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1250.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1250.dfy.expect
new file mode 100644
index 00000000000..ee799665b59
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1250.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 8 verified, 0 errors
diff --git a/Test/git-issues/git-issue-1252.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1252.dfy
similarity index 96%
rename from Test/git-issues/git-issue-1252.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1252.dfy
index 3f29492f91e..2c426a76f0d 100644
--- a/Test/git-issues/git-issue-1252.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1252.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var more: C?
diff --git a/Test/git-issues/git-issue-1252.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1252.dfy.expect
similarity index 89%
rename from Test/git-issues/git-issue-1252.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1252.dfy.expect
index 2c02325d163..e3b1f4d26dd 100644
--- a/Test/git-issues/git-issue-1252.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1252.dfy.expect
@@ -7,13 +7,13 @@ git-issue-1252.dfy(59,15): Error: target object might be null
 git-issue-1252.dfy(70,15): Error: target object might be null
 git-issue-1252.dfy(81,15): Error: target object might be null
 git-issue-1252.dfy(87,13): Error: target object might be null
-git-issue-1252.dfy(100,25): Error: target object might be null
-git-issue-1252.dfy(106,21): Error: object might be null
-git-issue-1252.dfy(106,21): Error: object might not be allocated in the old-state of the 'unchanged' predicate
-git-issue-1252.dfy(106,21): Error: target object might be null
 git-issue-1252.dfy(93,13): Error: target object might be null
-git-issue-1252.dfy(94,10): Error: target object might be null
 git-issue-1252.dfy(93,13): Error: target object might be null
 git-issue-1252.dfy(94,10): Error: target object might be null
+git-issue-1252.dfy(94,10): Error: target object might be null
+git-issue-1252.dfy(100,25): Error: target object might be null
+git-issue-1252.dfy(106,21): Error: object could not be proved to be allocated in the old-state of the 'unchanged' predicate
+git-issue-1252.dfy(106,21): Error: object might be null
+git-issue-1252.dfy(106,21): Error: target object might be null
 
 Dafny program verifier finished with 4 verified, 16 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1253.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1253.dfy
new file mode 100644
index 00000000000..0949d6fe68b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1253.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module M1 {
+  import M2.C
+  export
+    provides
+      C
+  module M2 {
+    const C: int
+  }
+}
diff --git a/Test/git-issues/git-issue-1253.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1253.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1253.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1253.dfy.expect
diff --git a/Test/git-issues/git-issue-1256.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1256.dfy
similarity index 98%
rename from Test/git-issues/git-issue-1256.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1256.dfy
index 4ee798cdd0c..b952c42bc34 100644
--- a/Test/git-issues/git-issue-1256.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1256.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
+// RUN: %exits-with 4 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost function f<X(0)>(): X
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1256.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1256.dfy.expect
new file mode 100644
index 00000000000..f188ed343c7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1256.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-1256.dfy(21,2): Error: assertion might not hold
+git-issue-1256.dfy(22,2): Error: assertion might not hold
+
+Dafny program verifier finished with 15 verified, 2 errors
diff --git a/Test/git-issues/git-issue-1277.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1277.dfy
similarity index 81%
rename from Test/git-issues/git-issue-1277.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1277.dfy
index 922daee9f48..c3b7317f52d 100644
--- a/Test/git-issues/git-issue-1277.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1277.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 ghost function RangeMask(from: nat, to: nat): bv6
 
diff --git a/Test/git-issues/git-issue-1277.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1277.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1277.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1277.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1309.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1309.dfy
new file mode 100644
index 00000000000..b3d1913b781
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1309.dfy
@@ -0,0 +1,26 @@
+// RUN: %exits-with 2 %baredafny verify --allow-axioms --show-snippets:false --use-basename-for-filename "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Example for Issue 1309 -- not yet fixed
+
+module A {
+  module C {
+    datatype Option<T> = None | Some(x : T)
+  }
+}
+
+module B {
+  module C {
+    datatype Option<T> = None | Some(x : T)
+
+  }
+}
+
+module D {
+  import A
+  import B
+
+  lemma Bad(x: int)
+  ensures A.C.Some(x) == B.C.Some(x)
+}
+
diff --git a/Test/git-issues/git-issue-1309.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1309.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1309.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1309.dfy.expect
diff --git a/Test/git-issues/git-issue-1347.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1347.dfy
similarity index 87%
rename from Test/git-issues/git-issue-1347.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1347.dfy
index 6c5624fa999..c8180e51c83 100644
--- a/Test/git-issues/git-issue-1347.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1347.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module Foo {
   datatype T = TX()
diff --git a/Test/git-issues/git-issue-1984.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1347.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1984.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1347.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1373.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1373.dfy
new file mode 100644
index 00000000000..d41c26310b8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1373.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  var x := map[1 := () => 1];
+  print x.Values; // error: map range type must support equality
+  print x.Items; // error: map range type must support equality
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1373.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1373.dfy.expect
new file mode 100644
index 00000000000..9963d8ab5ca
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1373.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-1373.dfy(6,10): Error: Cannot compute the set of Values because the type of the range of the map (() ~> int) does not support equality.
+git-issue-1373.dfy(7,10): Error: Cannot compute the set of Items because the type of the range of the map (() ~> int) does not support equality.
+2 resolution/type errors detected in git-issue-1373.dfy
diff --git a/Test/git-issues/git-issue-1377.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1377.dfy
similarity index 96%
rename from Test/git-issues/git-issue-1377.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1377.dfy
index c45ca762845..8012494cb70 100644
--- a/Test/git-issues/git-issue-1377.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1377.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:3 "%s" > "%t"
+// RUN: %exits-with 2 %run "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class Cell {
diff --git a/Test/git-issues/git-issue-1377.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1377.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1377.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1377.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1384.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1384.dfy
new file mode 100644
index 00000000000..2133f0f05de
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1384.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s" -- --print:-
+
+
+method Test()
+{
+    var f: ((int,int)) -> int := (x: (int,int)) => 1;
+}
+
diff --git a/Test/git-issues/git-issue-1384.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1384.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1384.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1384.dfy.expect
diff --git a/Test/git-issues/git-issue-1419.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1419.dfy
similarity index 99%
rename from Test/git-issues/git-issue-1419.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1419.dfy
index b83e54065a7..d6a34979e33 100644
--- a/Test/git-issues/git-issue-1419.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1419.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:4 /compileTarget:cs "%s" > "%t"
+// RUN: %exits-with 2 %run --target cs "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module FromBugReport {
diff --git a/Test/git-issues/git-issue-1419.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1419.dfy.expect
similarity index 96%
rename from Test/git-issues/git-issue-1419.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1419.dfy.expect
index 08750d290e3..b103e76022c 100644
--- a/Test/git-issues/git-issue-1419.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1419.dfy.expect
@@ -3,10 +3,10 @@ git-issue-1419.dfy(17,4): Error: a exists expression involved in a predicate def
 git-issue-1419.dfy(23,7): Error: type 'Reference' declared as containing no reference types, but the RHS type (object) may contain reference types
 git-issue-1419.dfy(25,7): Error: type 'ReferenceX' declared as containing no reference types, but the RHS type (object) may contain reference types
 git-issue-1419.dfy(27,7): Error: type 'ParamX' declared as containing no reference types, but the RHS type (X) may contain reference types
-git-issue-1419.dfy(32,19): Error: type parameter 0 (X) passed to type Dt must support no references (got object)
+git-issue-1419.dfy(32,19): Error: type parameter 0 (X) passed to type Dt must contain no references (got object)
 git-issue-1419.dfy(32,7): Error: type 'Dt1' declared as containing no reference types, but the RHS type (Dt<object, int>) may contain reference types
 git-issue-1419.dfy(33,7): Error: type 'Dt2' declared as containing no reference types, but the RHS type (Dt<int, object>) may contain reference types
-git-issue-1419.dfy(34,19): Error: type parameter 0 (X) passed to type Dt must support no references (got object)
+git-issue-1419.dfy(34,19): Error: type parameter 0 (X) passed to type Dt must contain no references (got object)
 git-issue-1419.dfy(34,7): Error: type 'Dt3' declared as containing no reference types, but the RHS type (Dt<object, object>) may contain reference types
 git-issue-1419.dfy(38,7): Error: type 'Et1' declared as containing no reference types, but the RHS type (Et<object, int>) may contain reference types
 git-issue-1419.dfy(39,7): Error: type 'Et2' declared as containing no reference types, but the RHS type (Et<int, object>) may contain reference types
@@ -33,14 +33,14 @@ git-issue-1419.dfy(142,4): Error: a exists expression involved in a predicate de
 git-issue-1419.dfy(146,4): Error: a exists expression involved in a predicate definition is not allowed to depend on the set of allocated references, but values of 'o' (of type 'A.ReferenceX<object>') may contain references (see documentation for 'older' parameters)
 git-issue-1419.dfy(150,4): Error: a exists expression involved in a predicate definition is not allowed to depend on the set of allocated references, but values of 'o' (of type 'A.Param<int>') may contain references (see documentation for 'older' parameters)
 git-issue-1419.dfy(154,4): Error: a exists expression involved in a predicate definition is not allowed to depend on the set of allocated references, but values of 'o' (of type 'A.Param<object>') may contain references (see documentation for 'older' parameters)
-git-issue-1419.dfy(187,16): Error: type parameter (X) passed to type Param must support no references (got object)
+git-issue-1419.dfy(187,16): Error: type parameter (X) passed to type Param must contain no references (got object)
 git-issue-1419.dfy(195,4): Error: a exists expression involved in a predicate definition is not allowed to depend on the set of allocated references, but values of 'o' (of type 'Obs') may contain references (see documentation for 'older' parameters)
 git-issue-1419.dfy(202,7): Error: type 'X' declared as containing no reference types, but the RHS type (D) may contain reference types
 git-issue-1419.dfy(205,7): Error: type 'SM0' declared as containing no reference types, but the RHS type (M<int>) may contain reference types
 git-issue-1419.dfy(206,7): Error: type 'SM1' declared as containing no reference types, but the RHS type (M<object>) may contain reference types
 git-issue-1419.dfy(210,7): Error: type 'SN1' declared as containing no reference types, but the RHS type (N<object>) may contain reference types
-git-issue-1419.dfy(218,27): Error: type parameter (X) passed to method NoReferencesPlease must support no references (got Y) (perhaps try declaring type parameter 'Y' on line 214 as 'Y(!new)', which says it can only be instantiated with a type that contains no references)
-git-issue-1419.dfy(219,32): Error: type parameter (X) passed to method NoReferencesPlease must support no references (got object)
+git-issue-1419.dfy(218,27): Error: type parameter (X) passed to method NoReferencesPlease must contain no references (got Y) (perhaps try declaring type parameter 'Y' on line 214 as 'Y(!new)', which says it can only be instantiated with a type that contains no references)
+git-issue-1419.dfy(219,32): Error: type parameter (X) passed to method NoReferencesPlease must contain no references (got object)
 git-issue-1419.dfy(252,7): Error: type 'SM0' declared as containing no reference types, but the RHS type (I.M<int>) may contain reference types
 git-issue-1419.dfy(253,7): Error: type 'SM1' declared as containing no reference types, but the RHS type (I.M<object>) may contain reference types
 git-issue-1419.dfy(256,7): Error: type 'SN1' declared as containing no reference types, but the RHS type (I.N<object>) may contain reference types
diff --git a/Test/git-issues/git-issue-1423.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1423.dfy
similarity index 86%
rename from Test/git-issues/git-issue-1423.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1423.dfy
index 263664ea764..61756d6214e 100644
--- a/Test/git-issues/git-issue-1423.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1423.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost predicate P(s: seq)
 
diff --git a/Test/git-issues/git-issue-2883.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1423.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2883.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1423.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1435.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1435.dfy
new file mode 100644
index 00000000000..b35c9a3cf99
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1435.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+class C {
+  var x:nat
+  twostate predicate p() { unchanged(this) }
+  method bad() modifies this ensures false {
+    assert p();
+    x := x+1;
+    assert p();
+  }
+}
diff --git a/Test/git-issues/git-issue-1435.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1435.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1435.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1435.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1458.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1458.dfy
new file mode 100644
index 00000000000..f445f907af8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1458.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+
+method Main() {
+  SwingoutSister();
+}
+
+method SwingoutSister() {
+  break Out;
+}
diff --git a/Test/git-issues/git-issue-1458.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1458.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1458.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1458.dfy.expect
diff --git a/Test/git-issues/git-issue-1479.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1479.dfy
similarity index 91%
rename from Test/git-issues/git-issue-1479.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1479.dfy
index f680b9aaa45..0eabeabc395 100644
--- a/Test/git-issues/git-issue-1479.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1479.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // This file checks that datatype updates have the correct return type.
 
diff --git a/Test/git-issues/git-issue-1479.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1479.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1479.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1479.dfy.expect
diff --git a/Test/git-issues/git-issue-151.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-151.dfy
similarity index 91%
rename from Test/git-issues/git-issue-151.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-151.dfy
index 99a91090af4..e49d516c66d 100644
--- a/Test/git-issues/git-issue-151.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-151.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module A {
   type T = int
diff --git a/Test/git-issues/git-issue-151.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-151.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-151.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-151.dfy.expect
diff --git a/Test/git-issues/git-issue-1514.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514.dfy
similarity index 77%
rename from Test/git-issues/git-issue-1514.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514.dfy
index 816eadce69b..f301741bba7 100644
--- a/Test/git-issues/git-issue-1514.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514.dfy
@@ -1,7 +1,6 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-axioms --standard-libraries --relax-definite-assignment
 
-include "Wrappers.dfy"
-import opened Wrappers
+import opened Std.Wrappers
 
 trait Foo<C, D> {
   function Bar(a: C): (r: D)
diff --git a/Test/git-issues/git-issue-1514.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1514.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514.dfy.rs.check
new file mode 100644
index 00000000000..7d2d31cd8d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Unsupported:\ Cannot\ emit\ literal\ expression\ 0\ outside\ of\ expression\ context:\ Microsoft_dDafny_dCompilers_dBuilderSyntaxTree'1\[Microsoft_dDafny_dCompilers_dStatementContainer]</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1514b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514b.dfy
similarity index 82%
rename from Test/git-issues/git-issue-1514b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514b.dfy
index 050a4a71760..876880c5298 100644
--- a/Test/git-issues/git-issue-1514b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514b.dfy
@@ -1,7 +1,6 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler "%s" -- --standard-libraries --relax-definite-assignment
 
-include "Wrappers.dfy"
-import opened Wrappers
+import opened Std.Wrappers
 
 trait Foo<C, D> {
   method Bar(a: C) returns (r: D)
diff --git a/Test/git-issues/git-issue-1514b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1514b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514b.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514b.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514b.dfy.rs.check
new file mode 100644
index 00000000000..7d2d31cd8d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514b.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Unsupported:\ Cannot\ emit\ literal\ expression\ 0\ outside\ of\ expression\ context:\ Microsoft_dDafny_dCompilers_dBuilderSyntaxTree'1\[Microsoft_dDafny_dCompilers_dStatementContainer]</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514c.dfy
new file mode 100644
index 00000000000..cb5574214c2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514c.dfy
@@ -0,0 +1,22 @@
+// RUN: %testDafnyForEachCompiler "%s" -- --standard-libraries --relax-definite-assignment
+
+import opened Std.Wrappers
+
+method id<T>(r: T) returns (r2: T)  {
+  r2 := r;
+}
+
+method test(s: string) returns (r: Option<string>) {
+  r := None;
+  var x :- id<Option<string>>(Some(s));
+  r := Some(x);
+}
+
+method Main() {
+  var x := test("ok");
+  if x.Some? {
+    print x.value, "\n";
+  } else {
+    print "None?!";
+  }
+}
diff --git a/Test/git-issues/git-issue-1514c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514c.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1514c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514c.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514c.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514c.dfy.rs.check
new file mode 100644
index 00000000000..7d2d31cd8d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1514c.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Unsupported:\ Cannot\ emit\ literal\ expression\ 0\ outside\ of\ expression\ context:\ Microsoft_dDafny_dCompilers_dBuilderSyntaxTree'1\[Microsoft_dDafny_dCompilers_dStatementContainer]</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-151b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-151b.dfy
similarity index 84%
rename from Test/git-issues/git-issue-151b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-151b.dfy
index 59c8290e2e4..3a1592ac534 100644
--- a/Test/git-issues/git-issue-151b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-151b.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module A {
   method m() {}
diff --git a/Test/git-issues/git-issue-151b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-151b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-151b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-151b.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1545.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1545.dfy
new file mode 100644
index 00000000000..f26ece680c0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1545.dfy
@@ -0,0 +1,63 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 --refresh-exit-code=4 "%s"
+
+ghost predicate Foo(s: seq<int>) {
+  // Under the legacy resolver, a type test for a subset type is not allowed
+  forall i :: 0 <= i < |s| ==> i is nat // error (legacy resolver)
+}
+
+type Not3 = x: int | x != 3
+
+lemma Tests(s: seq<int>) {
+  if
+  case true =>
+    assert forall i :: 0 <= i < |s| ==> i is int;
+  case true =>
+    assert forall i :: 0 <= i < |s| ==> i is nat; // error (legacy resolver)
+  case true =>
+    assert forall i :: -2 <= i < |s| ==> i is nat; // error (legacy resolver, and verification with resolver refresh)
+  case true =>
+    assert forall i :: 0 <= i < |s| ==> i is Not3; // error (legacy resolver, and verification with resolver refresh)
+  case true =>
+    assert forall i :: 4 <= i < |s| ==> i is Not3; // error (legacy resolver)
+}
+
+lemma MoreTests(s: seq<int>) {
+  if
+  case true =>
+    assert forall i: nat :: 0 <= i < |s| ==> i is int;
+  case true =>
+    assert forall i: nat :: 0 <= i < |s| ==> i is nat;
+  case true =>
+    assert forall i: nat :: -2 <= i < |s| ==> i is nat;
+  case true =>
+    assert forall i: Not3 :: 0 <= i < |s| ==> i is Not3;
+  case true =>
+    assert forall i: nat :: 4 <= i < |s| ==> i is Not3; // error (legacy resolver)
+}
+
+type Not5Either = x: Not3 | x != 5
+type Not3Or5 = x: int | x != 3 && x != 5
+
+lemma EvenMoreTests(s: seq<int>) {
+  if
+  case true =>
+    assert forall i: int :: 7 <= i < |s| ==> i is nat; // error (legacy resolver)
+  case true =>
+    assert forall i: Not3 :: 7 <= i < |s| ==> i is nat; // error (legacy resolver)
+  case true =>
+    assert forall i: Not5Either :: 7 <= i < |s| ==> i is Not3;
+  case true =>
+    assert forall i: Not3Or5 :: 7 <= i < |s| ==> i is Not3; // error (legacy resolver)
+}
+
+lemma FinalTests(s: seq<int>) {
+  if
+  case true =>
+    assert forall i: Not3Or5 :: -2 <= i < |s| ==> i is Not5Either; // error (legacy resolver)
+  case true =>
+    assert forall i: Not5Either :: -2 <= i < |s| ==> i is Not3Or5; // error (legacy resolver)
+  case true =>
+    assert forall i: Not3 :: -2 <= i < |s| ==> i is Not5Either; // error (legacy resolver, and verification with resolver refresh)
+  case true =>
+    assert forall i: Not3Or5 :: -2 <= i < |s| ==> i is Not5Either; // error (legacy resolver)
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1545.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1545.dfy.expect
new file mode 100644
index 00000000000..e7bdc63e57a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1545.dfy.expect
@@ -0,0 +1,14 @@
+git-issue-1545.dfy(5,33): Error: a non-trivial type test is allowed only for reference types (tried to test if 'int' is a 'nat')
+git-issue-1545.dfy(15,42): Error: a non-trivial type test is allowed only for reference types (tried to test if 'int' is a 'nat')
+git-issue-1545.dfy(17,43): Error: a non-trivial type test is allowed only for reference types (tried to test if 'int' is a 'nat')
+git-issue-1545.dfy(19,42): Error: a non-trivial type test is allowed only for reference types (tried to test if 'int' is a 'Not3')
+git-issue-1545.dfy(21,42): Error: a non-trivial type test is allowed only for reference types (tried to test if 'int' is a 'Not3')
+git-issue-1545.dfy(35,47): Error: a type test to 'Not3' must be from a compatible type (got 'nat')
+git-issue-1545.dfy(44,47): Error: a non-trivial type test is allowed only for reference types (tried to test if 'int' is a 'nat')
+git-issue-1545.dfy(46,48): Error: a type test to 'nat' must be from a compatible type (got 'Not3')
+git-issue-1545.dfy(50,51): Error: a type test to 'Not3' must be from a compatible type (got 'Not3Or5')
+git-issue-1545.dfy(56,52): Error: a type test to 'Not5Either' must be from a compatible type (got 'Not3Or5')
+git-issue-1545.dfy(58,55): Error: a type test to 'Not3Or5' must be from a compatible type (got 'Not5Either')
+git-issue-1545.dfy(60,49): Error: a non-trivial type test is allowed only for reference types (tried to test if 'Not3' is a 'Not5Either')
+git-issue-1545.dfy(62,52): Error: a type test to 'Not5Either' must be from a compatible type (got 'Not3Or5')
+13 resolution/type errors detected in git-issue-1545.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1545.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1545.dfy.refresh.expect
new file mode 100644
index 00000000000..d9c684b45a4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1545.dfy.refresh.expect
@@ -0,0 +1,24 @@
+git-issue-1545.dfy(5,2): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(13,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(15,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(17,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(19,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(21,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(27,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(29,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(31,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(33,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(35,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(44,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(46,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(48,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(50,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(56,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(58,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(60,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(62,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-1545.dfy(17,4): Error: assertion might not hold
+git-issue-1545.dfy(19,4): Error: assertion might not hold
+git-issue-1545.dfy(60,4): Error: assertion might not hold
+
+Dafny program verifier finished with 5 verified, 3 errors
diff --git a/Test/git-issues/git-issue-1553.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1553.dfy
similarity index 79%
rename from Test/git-issues/git-issue-1553.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1553.dfy
index 81cbef7aa7e..861a183c2df 100644
--- a/Test/git-issues/git-issue-1553.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1553.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() { }
 method Test<R>() {
diff --git a/Test/git-issues/git-issue-2581.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1553.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2581.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1553.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1553.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1553.dfy.rs.check
new file mode 100644
index 00000000000..feefa7e7f6b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1553.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `_R: Default` is not satisfied
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-3.dfy
new file mode 100644
index 00000000000..227bd29c81d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-3.dfy
@@ -0,0 +1,26 @@
+// RUN: %verify --function-syntax:3 --print:- "%s" > "%t"
+// RUN: %verify --function-syntax:experimentalDefaultGhost --print:- "%s" >> "%t"
+// RUN: %verify --function-syntax:experimentalDefaultCompiled --print:- "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function F0(): int
+function method F1(): int
+
+twostate function G0(): int
+
+function H0(): int {
+  2
+} by method {
+  return 2;
+}
+
+predicate P0()
+predicate method P1()
+
+twostate predicate Q0()
+
+predicate R0() {
+  true
+} by method {
+  return true;
+}
diff --git a/Test/git-issues/git-issue-1564-3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-3.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1564-3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-3.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-3to4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-3to4.dfy
new file mode 100644
index 00000000000..f5a3d08206e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-3to4.dfy
@@ -0,0 +1,26 @@
+// RUN: %verify --function-syntax:migration3to4 --print:- "%s" > "%t"
+// RUN: %verify --function-syntax:experimentalDefaultGhost --print:- "%s" >> "%t"
+// RUN: %verify --function-syntax:experimentalDefaultCompiled --print:- "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+ghost function F0(): int
+function method F1(): int
+
+twostate function G0(): int
+
+function H0(): int {
+  2
+} by method {
+  return 2;
+}
+
+ghost predicate P0()
+predicate method P1()
+
+twostate predicate Q0()
+
+predicate R0() {
+  true
+} by method {
+  return true;
+}
diff --git a/Test/git-issues/git-issue-1564-3to4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-3to4.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1564-3to4.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-3to4.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-4.dfy
new file mode 100644
index 00000000000..f4b1fe347ee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-4.dfy
@@ -0,0 +1,26 @@
+// RUN: %verify --function-syntax:4 --print:- "%s" > "%t"
+// RUN: %verify --function-syntax:experimentalDefaultGhost --print:- "%s" >> "%t"
+// RUN: %verify --function-syntax:experimentalDefaultCompiled --print:- "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+ghost function F0(): int
+function F1(): int
+
+twostate function G0(): int
+
+function H0(): int {
+  2
+} by method {
+  return 2;
+}
+
+ghost predicate P0()
+predicate P1()
+
+twostate predicate Q0()
+
+predicate R0() {
+  true
+} by method {
+  return true;
+}
diff --git a/Test/git-issues/git-issue-1564-4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-4.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1564-4.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-4.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-eag.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-eag.dfy
new file mode 100644
index 00000000000..289acb1740f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-eag.dfy
@@ -0,0 +1,23 @@
+// RUN: %verify --function-syntax:experimentalPredicateAlwaysGhost --print:- "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+ghost function F0(): int
+function F1(): int
+
+twostate function G0(): int
+
+function H0(): int {
+  2
+} by method {
+  return 2;
+}
+
+predicate P1()
+
+twostate predicate Q0()
+
+predicate R0() {
+  true
+} by method {
+  return true;
+}
diff --git a/Test/git-issues/git-issue-1564-eag.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-eag.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1564-eag.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564-eag.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564.dfy
new file mode 100644
index 00000000000..c3d7c7c9e7d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564.dfy
@@ -0,0 +1,69 @@
+// RUN: ! %verify --function-syntax:3 "%s" > "%t"
+// RUN: ! %verify --function-syntax:migration3to4 "%s" >> "%t"
+// RUN: ! %verify --function-syntax:4 "%s" >> "%t"
+// RUN: ! %verify --function-syntax:experimentalDefaultGhost "%s" >> "%t"
+// RUN: ! %verify --function-syntax:experimentalDefaultCompiled "%s" >> "%t"
+// RUN: ! %verify --function-syntax:experimentalPredicateAlwaysGhost "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function F0(): int // error: 3to4
+function method F1(): int // error: v4, aGhost
+ghost function F2(): int // error: v3
+ghost function method F3(): int // error
+
+twostate function G0(): int
+twostate function method G1(): int // error
+ghost twostate function G2(): int // error
+ghost twostate function method G3(): int // error
+
+function H0(): int {
+  2
+} by method {
+  return 2;
+}
+function method H1(): int { // error
+  2
+} by method {
+  return 2;
+}
+ghost function H2(): int { // error
+  2
+} by method {
+  return 2;
+}
+ghost function method H3(): int { // error
+  2
+} by method {
+  return 2;
+}
+
+predicate P0() // error: 3to4
+predicate method P1() // error: v4, aGhost
+ghost predicate P2() // error: v3, aGhost
+ghost predicate method P3() // error
+
+twostate predicate Q0()
+twostate predicate method Q1() // error
+ghost twostate predicate Q2() // error
+ghost twostate predicate method Q3() // error
+
+predicate R0() {
+  true
+} by method {
+  return true;
+}
+predicate method R1() { // error
+  true
+} by method {
+  return true;
+}
+ghost predicate R2() { // error
+  true
+} by method {
+  return true;
+}
+ghost predicate method R3() { // error
+  true
+} by method {
+  return true;
+}
diff --git a/Test/git-issues/git-issue-1564.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1564.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1564.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1587.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1587.dfy
new file mode 100644
index 00000000000..238b23c3b03
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1587.dfy
@@ -0,0 +1,4 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+datatype Foo = Foo(Keys: (), Values: (), Items: (), IsLimit: (), IsSucc: (), Offset: (), IsNat: ())
diff --git a/Test/git-issues/git-issue-2022.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1587.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2022.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1587.dfy.expect
diff --git a/Test/git-issues/git-issue-1604.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604.dfy
similarity index 100%
rename from Test/git-issues/git-issue-1604.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604.dfy
diff --git a/Test/git-issues/git-issue-1604.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1604.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604.dfy.rs.check
new file mode 100644
index 00000000000..9aef9ec31ec
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Unsupported:\ <i>Cannot\ assign\ null\ value\ to\ variable</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1604b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604b.dfy
similarity index 90%
rename from Test/git-issues/git-issue-1604b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604b.dfy
index d7c4169ec60..8fae1cdc7a4 100644
--- a/Test/git-issues/git-issue-1604b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604b.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --error-limit:0 --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --error-limit:0 --relax-definite-assignment
 
 // Double constraints. Will this still work?
 
diff --git a/Test/git-issues/git-issue-1604b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1604b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604b.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604b.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604b.dfy.rs.check
new file mode 100644
index 00000000000..158d9484360
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604b.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>QuantifierExpr</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1604c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604c.dfy
similarity index 92%
rename from Test/git-issues/git-issue-1604c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604c.dfy
index 82d4c047845..77b0e02a72e 100644
--- a/Test/git-issues/git-issue-1604c.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604c.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:1 /errorLimit:0 "%s" > "%t"
+// RUN: %exits-with 4 %build --error-limit 0 "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 ghost predicate EvenNat(n: nat) { n % 2 == 0 }
 ghost predicate TrueInt(x: int) { true }
diff --git a/Test/git-issues/git-issue-1604c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604c.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1604c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1604c.dfy.expect
diff --git a/Test/git-issues/git-issue-1607.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1607.dfy
similarity index 80%
rename from Test/git-issues/git-issue-1607.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1607.dfy
index cf1aab7c3d7..5e8c2fe97f3 100644
--- a/Test/git-issues/git-issue-1607.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1607.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 module M {
   datatype D = D_1(a: bool) | D_2(b: bool)
diff --git a/Test/git-issues/git-issue-1607.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1607.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1607.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1607.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1618.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1618.dfy
new file mode 100644
index 00000000000..308a9642576
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1618.dfy
@@ -0,0 +1,12 @@
+// RUN: %resolve "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function {:opaque} mul(a: int, b: int): int
+{
+  a * b
+}
+
+method M()
+{
+  reveal mul;
+}
diff --git a/Test/git-issues/git-issue-442.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1618.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-442.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1618.dfy.expect
diff --git a/Test/git-issues/git-issue-1619.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1619.dfy
similarity index 98%
rename from Test/git-issues/git-issue-1619.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1619.dfy
index 2966be7e144..e86deab782c 100644
--- a/Test/git-issues/git-issue-1619.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1619.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
+// RUN: %exits-with 4 %build "%s" --relax-definite-assignment --allow-axioms > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 predicate {:opaque} P<W>(w: W) {
diff --git a/Test/git-issues/git-issue-1619.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1619.dfy.expect
similarity index 77%
rename from Test/git-issues/git-issue-1619.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1619.dfy.expect
index ff146712766..034cd966652 100644
--- a/Test/git-issues/git-issue-1619.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1619.dfy.expect
@@ -3,14 +3,16 @@ git-issue-1619.dfy(28,17): Error: cannot establish the existence of LHS values t
 git-issue-1619.dfy(38,17): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
 git-issue-1619.dfy(49,17): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
 git-issue-1619.dfy(171,11): Error: variable 'm', which is subject to definite-assignment rules, might be uninitialized here
-git-issue-1619.dfy(173,9): Error: assertion could not be proved
+git-issue-1619.dfy(173,2): Error: assertion might not hold
 git-issue-1619.dfy(178,11): Error: variable 'm', which is subject to definite-assignment rules, might be uninitialized here
-git-issue-1619.dfy(180,9): Error: assertion could not be proved
+git-issue-1619.dfy(180,2): Error: assertion might not hold
+git-issue-1619.dfy(185,12): Error: variable 'u', which is subject to definite-assignment rules, might be uninitialized here
 git-issue-1619.dfy(203,11): Error: variable 'p', which is subject to definite-assignment rules, might be uninitialized here
+git-issue-1619.dfy(222,11): Error: variable 'x', which is subject to definite-assignment rules, might be uninitialized here
 git-issue-1619.dfy(223,11): Error: variable 'p', which is subject to definite-assignment rules, might be uninitialized here
 git-issue-1619.dfy(266,27): Error: variable 'p', which is subject to definite-assignment rules, might be uninitialized here
 git-issue-1619.dfy(271,6): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
 git-issue-1619.dfy(284,27): Error: variable 'p', which is subject to definite-assignment rules, might be uninitialized here
 git-issue-1619.dfy(289,9): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
 
-Dafny program verifier finished with 19 verified, 14 errors
+Dafny program verifier finished with 18 verified, 16 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1637.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1637.dfy
new file mode 100644
index 00000000000..bdd606fd72a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1637.dfy
@@ -0,0 +1,20 @@
+// RUN: %exits-with 2 %resolve "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+type uint8 = i | 0 <= i <= 255
+
+datatype Thing = Thing
+type Foo =  s: seq<uint8> | |s| < 10 witness *
+type Fii =  real 
+
+function {:axiom} Bar(t: Thing): Foo
+function {:axiom} Bii(t: Thing): Fii
+
+predicate {:axiom} Baz(f: Thing -> seq<uint8>)
+
+predicate compose() {
+  Baz(Bar)
+}
+predicate compose2() {
+  Baz(Bii)
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1637.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1637.dfy.expect
new file mode 100644
index 00000000000..ff37b311dbe
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1637.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-1637.dfy(19,6): Error: incorrect argument type for predicate parameter 'f' (expected Thing -> seq<uint8>, found Thing -> Fii) (covariance for type parameter at index 1 expects seq<uint8> :> Fii)
+1 resolution/type errors detected in git-issue-1637.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1639.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1639.dfy
new file mode 100644
index 00000000000..6abad58a403
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1639.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module Foo {
+    ghost function Fun(): () {
+        calc { 0; }
+        ()
+    }
+}
+
+abstract module Bar {
+    import Foo' : Foo
+}
diff --git a/Test/git-issues/git-issue-2100.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1639.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2100.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1639.dfy.expect
diff --git a/Test/git-issues/git-issue-1665.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665.dfy
similarity index 89%
rename from Test/git-issues/git-issue-1665.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665.dfy
index da49fd7f8ba..fc4738ef393 100644
--- a/Test/git-issues/git-issue-1665.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665.dfy
@@ -1,12 +1,12 @@
 // Check that Rprinted program is generated as expected:
-// RUN: %dafny /env:0 /compile:0 /dafnyVerify:0 /rprint:"%t".raw.dfy "%s"
+// RUN: %resolve --rprint "%t".raw.dfy "%s"
 // RUN: %diff "%s.expect" "%t".raw.dfy
 
 // Check that original program successfully verifies (exit code 0):
-// RUN: %dafny /env:0 /compile:0 "%s" > "%t".1
+// RUN: %verify --relax-definite-assignment "%s" > "%t".1
 
 // Check that produced rprinted program also successfuly verifies:
-// RUN: %dafny /env:0 /compile:0 "%t".raw.dfy > "%t".2
+// RUN: %verify  --relax-definite-assignment "%t".raw.dfy > "%t".2
 
 // Check that verification results are the same:
 // RUN: %diff "%t".1 "%t".2
diff --git a/Test/git-issues/git-issue-1665.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665.dfy.expect
similarity index 91%
rename from Test/git-issues/git-issue-1665.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665.dfy.expect
index ee2960c724a..f267cd500a1 100644
--- a/Test/git-issues/git-issue-1665.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665.dfy.expect
@@ -25,7 +25,7 @@ module _System {
   */
 
   class {:compile false} array<arg> {
-    var Length: int  // immutable
+    const Length: int
   }
   /*-- non-null type
   type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
@@ -63,21 +63,23 @@ module _System {
     | f.requires()
     /*special witness*/
 
-  datatype {:compile false} /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
 
   type bool { }
 
+  type char { }
+
   type int { }
 
   type real {
-    var Floor: int  // immutable
+    const Floor: int
   }
 
   type ORDINAL {
-    var IsLimit: bool  // immutable
-    var IsSucc: bool  // immutable
-    var Offset: int  // immutable
-    var IsNat: bool  // immutable
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
   }
 
   type _bv {
@@ -86,19 +88,27 @@ module _System {
     function RotateRight(w: nat): selftype
   }
 
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
   type map<+T, +U> {
-    var Keys: set<T>  // immutable
-    var Values: set<U>  // immutable
-    var Items: set<(T, U)>  // immutable
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
   }
 
   type imap<*T, +U> {
-    var Keys: iset<T>  // immutable
-    var Values: iset<U>  // immutable
-    var Items: iset<(T, U)>  // immutable
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
   }
 
-  datatype {:compile false} /*_tuple#0*/ () = _#Make0
+  datatype /*_tuple#0*/ () = _#Make0
 }
 // bitvector types in use:
 */
diff --git a/Test/git-issues/git-issue-1665a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665a.dfy
similarity index 90%
rename from Test/git-issues/git-issue-1665a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665a.dfy
index a3be1730f21..4ed45b8ef26 100644
--- a/Test/git-issues/git-issue-1665a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665a.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Additional tests
 
diff --git a/Test/git-issues/git-issue-1665a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1665a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1665a.dfy.expect
diff --git a/Test/git-issues/git-issue-1676.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1676.dfy
similarity index 99%
rename from Test/git-issues/git-issue-1676.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1676.dfy
index 9a61fb5afc9..1e0c3fb10aa 100644
--- a/Test/git-issues/git-issue-1676.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1676.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module M0 {
diff --git a/Test/git-issues/git-issue-1676.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1676.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1676.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1676.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1682.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1682.dfy
new file mode 100644
index 00000000000..82811486a8d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1682.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+method IsUnique(str: array<char>) returns (ret: bool)
+{
+  ret := multiset
+}
diff --git a/Test/git-issues/git-issue-1682.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1682.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1682.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1682.dfy.expect
diff --git a/Test/git-issues/git-issue-1700.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1700.dfy
similarity index 81%
rename from Test/git-issues/git-issue-1700.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1700.dfy
index 88d0a0908d4..c37a246c661 100644
--- a/Test/git-issues/git-issue-1700.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1700.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1700.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1700.dfy.expect
new file mode 100644
index 00000000000..59ad783761b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1700.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-1700.dfy(15,21): Error: incorrect argument type for datatype constructor parameter 'e' (expected B.E, found A.E)
+1 resolution/type errors detected in git-issue-1700.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1714.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1714.dfy
new file mode 100644
index 00000000000..538c2f4a103
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1714.dfy
@@ -0,0 +1,15 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+trait Base {}
+class Derived extends Base { var n: int constructor() { n := 0; } }
+
+method f(b: Base) {
+  if (b is Derived) {
+    print "(b as Derived).n == ", (b as Derived).n, "\n";
+  }
+}
+
+method Main() {
+  var d := new Derived();
+  f(d);
+}
diff --git a/Test/git-issues/git-issue-1714.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1714.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1714.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1714.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1714.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1714.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1714.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1731.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1731.dfy
new file mode 100644
index 00000000000..c9d9ccb6d6a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1731.dfy
@@ -0,0 +1,123 @@
+// RUN: %build --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module PreviouslyAProblem {
+  trait Base {
+  }
+
+  class Derived extends Base {
+    var n: int
+    constructor(n: int)
+      ensures this.n == n
+    {
+      this.n := n;
+    }
+  }
+
+  function Upcast(d: Derived): Base {
+    d
+  }
+
+  method Test() {
+    var d := new Derived(0);
+    var b := Upcast(d);
+    if b is Derived {
+      var derived := (b as Derived).n;
+    }
+  }
+}
+
+module PreviousRequiredWorkaround {
+  trait Base {
+  }
+
+  class Derived extends Base {
+    var n: int
+    constructor(n: int)
+      ensures this.n == n
+    {
+      this.n := n;
+    }
+  }
+
+  function Upcast(d: Derived): Base {
+    d
+  }
+
+  method Test() {
+    var d := new Derived(0);
+    var b: Base := Upcast(d);
+    if b is Derived {
+      var derived := (b as Derived).n;
+    }
+  }
+}
+
+module SmallerExample {
+  trait A0 {}
+  trait A1 extends A0 {}
+  trait A2 extends A1 {}
+
+  function IsA2(a0: A0): bool {
+    if a0 is A1 then
+      var a1 := a0 as A1;
+      a1 is A2
+    else
+      true
+  }
+}
+
+module PreviousRequiredWorkaroundForSmallerExample {
+  trait A0 {}
+  trait A1 extends A0 {}
+  trait A2 extends A1 {}
+
+  function IsA2(a0: A0): bool {
+    if a0 is A1 then
+      var a1: A1 := a0 as A1;
+      a1 is A2
+    else
+      true
+  }
+}
+
+module AnotherRepro {
+  trait A {}
+  trait B extends A {}
+
+  method T(a: A) {
+    var aa := a;
+    var test: bool := aa is B;
+  }
+
+  function F(a: A): bool {
+    var aa := a;
+    aa is B
+  }
+}
+
+module OutputExample0 {
+  trait A {}
+  trait B extends A {}
+  trait C extends B {}
+
+  method T(a: A, c: C) {
+    if a is B && c is B {
+      print "OK!";
+    }
+  }
+}
+
+module OutputExample1 {
+  trait A {}
+  trait B extends A {}
+  trait C extends B {}
+
+  method T(a: A, c: C) {
+    var aa := a;
+    var cc := c;
+    if aa is B && cc is B {
+      print "OK!";
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1731.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1731.dfy.expect
new file mode 100644
index 00000000000..ee799665b59
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1731.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 8 verified, 0 errors
diff --git a/Test/git-issues/git-issue-1761-extern.cs b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1761-extern.cs
similarity index 100%
rename from Test/git-issues/git-issue-1761-extern.cs
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1761-extern.cs
diff --git a/Test/git-issues/git-issue-1761.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1761.dfy
similarity index 100%
rename from Test/git-issues/git-issue-1761.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1761.dfy
diff --git a/Test/git-issues/git-issue-1761.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1761.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1761.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1761.dfy.expect
diff --git a/Test/git-issues/git-issue-1762.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1762.dfy
similarity index 83%
rename from Test/git-issues/git-issue-1762.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1762.dfy
index 2356ef40e82..67c46e30136 100644
--- a/Test/git-issues/git-issue-1762.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1762.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:3 "%s" %S/git-issue-1761-extern.cs > "%t"
+// RUN: %run "%s" --input %S/git-issue-1761-extern.cs > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class {:extern "ABC"} XYZ {
diff --git a/Test/git-issues/git-issue-1762.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1762.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1762.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1762.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-179.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-179.dfy
new file mode 100644
index 00000000000..3a26f3f5e0f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-179.dfy
@@ -0,0 +1,18 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
+// RUN: %run --no-verify --target cs "%s" >> "%t"
+// RUN: %run --no-verify --target js "%s" >> "%t"
+// RUN: %run --no-verify --target go "%s" >> "%t"
+// RUN: %run --no-verify --target java "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  var mp: map<int,bool>;
+  mp := mp[5 := false][4 := true][3 := false];
+  var i := mp.Items;
+  print i, "\n";
+  print mp.Keys, "\n";
+  print mp.Values, "\n";
+
+  print 5 in mp, " ", 9 in mp, " ", 8 !in mp, " ",  4 !in mp, "\n";
+}
diff --git a/Test/git-issues/git-issue-179.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-179.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-179.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-179.dfy.expect
diff --git a/Test/git-issues/git-issue-181.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-181.dfy
similarity index 95%
rename from Test/git-issues/git-issue-181.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-181.dfy
index e08a1199620..97d8dfbaf01 100644
--- a/Test/git-issues/git-issue-181.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-181.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Result<T> = Failure(error: string) | Success(value: T)
diff --git a/Test/git-issues/git-issue-181.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-181.dfy.expect
similarity index 84%
rename from Test/git-issues/git-issue-181.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-181.dfy.expect
index 2505ff6ba6d..eab0b7208ea 100644
--- a/Test/git-issues/git-issue-181.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-181.dfy.expect
@@ -1,8 +1,8 @@
 git-issue-181.dfy(27,17): Warning: type parameter T of ghost function g is declared (==), which is unnecessary because the function doesn't contain any compiled code
 git-issue-181.dfy(57,16): Warning: type parameter T of ghost method mg is declared (==), which is unnecessary because the method doesn't contain any compiled code
-git-issue-181.dfy(13,10): Error: type parameter (T) passed to type ResultN must support no references (got C)
-git-issue-181.dfy(15,10): Error: type parameter (T) passed to type ResultN must support no references (got array<int>)
+git-issue-181.dfy(13,10): Error: type parameter (T) passed to type ResultN must contain no references (got C)
+git-issue-181.dfy(15,10): Error: type parameter (T) passed to type ResultN must contain no references (got array<int>)
 git-issue-181.dfy(22,13): Error: type parameter (T) passed to type D must support equality (got int -> int)
 git-issue-181.dfy(23,13): Error: type parameter (T) passed to type D must support equality (got E)
-git-issue-181.dfy(53,11): Error: type parameter (T) passed to function gg must support equality (got T) (perhaps try declaring type parameter 'T' on line 50 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-181.dfy(53,13): Error: type parameter (T) passed to function gg must support equality (got T) (perhaps try declaring type parameter 'T' on line 50 as 'T(==)', which says it can only be instantiated with a type that supports equality)
 5 resolution/type errors detected in git-issue-181.dfy
diff --git a/Test/git-issues/git-issue-1812.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1812.dfy
similarity index 90%
rename from Test/git-issues/git-issue-1812.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1812.dfy
index cfa8855ebb3..c6e4adab2ac 100644
--- a/Test/git-issues/git-issue-1812.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1812.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 ghost function Max(s: set<int>): (m: int)
   requires s != {}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1812.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1812.dfy.expect
new file mode 100644
index 00000000000..97f61289708
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1812.dfy.expect
@@ -0,0 +1,6 @@
+git-issue-1812.dfy(22,16): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+git-issue-1812.dfy(33,16): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+
+Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815a.dfy
new file mode 100644
index 00000000000..c7016b74d29
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815a.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+datatype Dt<+U> = Dt(x: U, i: int)
+
+trait Tr {}
+class Cl extends Tr {
+  constructor () {}
+}
+
+method Main() {
+  var cl: Cl := new Cl();
+  var e: Dt<Tr> := Dt(cl, 1815);
+  match e {
+    case Dt(tr, _) =>
+  }
+  print "done\n";
+}
diff --git a/Test/git-issues/git-issue-1815a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1815a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815a.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815a.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815a.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815a.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1815b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy
similarity index 83%
rename from Test/git-issues/git-issue-1815b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy
index 1b98de70f55..7fb9bd1cb72 100644
--- a/Test/git-issues/git-issue-1815b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 datatype Y<+U> = Y(y: U)
 
diff --git a/Test/git-issues/git-issue-283d.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-283d.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy.go.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy.go.check
new file mode 100644
index 00000000000..49486ebdfb6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy.go.check
@@ -0,0 +1,2 @@
+// https://github.com/dafny-lang/dafny/issues/4120
+// CHECK: Y.* is not a type
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1815b.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1838.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1838.dfy
new file mode 100644
index 00000000000..0f40fb3e453
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1838.dfy
@@ -0,0 +1,6 @@
+// RUN: %verify %S/git-issue-1838.dfy > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module A.B {
+  type u64 = x | 0 <= x <= 0xffff_ffff_ffff_ffff
+}
diff --git a/Test/git-issues/git-issue-2920.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1838.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2920.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1838.dfy.expect
diff --git a/Test/git-issues/git-issue-1852.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1852.dfy
similarity index 82%
rename from Test/git-issues/git-issue-1852.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1852.dfy
index 046f3fca1fc..f5753d65edf 100644
--- a/Test/git-issues/git-issue-1852.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1852.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 module A {
   export
diff --git a/Test/git-issues/git-issue-1852.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1852.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1852.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1852.dfy.expect
diff --git a/Test/git-issues/git-issue-1875.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1875.dfy
similarity index 96%
rename from Test/git-issues/git-issue-1875.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1875.dfy
index a6c2eb5dfc6..532e0d42ffb 100644
--- a/Test/git-issues/git-issue-1875.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1875.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 /// This file checks whether sufficient axioms are generated to compare
 /// datatypes constructed using subset types over sequences.
diff --git a/Test/git-issues/git-issue-327.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1875.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-327.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1875.dfy.expect
diff --git a/Test/git-issues/git-issue-1887.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1887.dfy
similarity index 87%
rename from Test/git-issues/git-issue-1887.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1887.dfy
index 4fec96a7208..1a000986fd7 100644
--- a/Test/git-issues/git-issue-1887.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1887.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 function selectOneConstraint<T>(s: seq<T>): seq<string> {
diff --git a/Test/git-issues/git-issue-1887.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1887.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1887.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1887.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1903.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1903.dfy
new file mode 100644
index 00000000000..ff1786b519b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1903.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+method g<T>(x : seq<T> := []) 
+{
+   print "worked!\n";  
+}
+
+
+method Main() { 
+   g<nat>();
+}
diff --git a/Test/git-issues/git-issue-1903.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1903.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1903.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1903.dfy.expect
diff --git a/Test/git-issues/git-issue-1909.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1909.dfy
similarity index 92%
rename from Test/git-issues/git-issue-1909.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1909.dfy
index 83d9ec1d785..3e3fa275fea 100644
--- a/Test/git-issues/git-issue-1909.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1909.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype ABC = ABC(nameonly a: int, nameonly b: int, nameonly c: int)
 
diff --git a/Test/git-issues/git-issue-1909.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1909.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1909.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1909.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1957.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1957.dfy
new file mode 100644
index 00000000000..c77c1c13c89
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1957.dfy
@@ -0,0 +1,8 @@
+// RUN: %verify --show-hints "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class {:autocontracts} Thing {
+    ghost predicate Valid() {
+        true
+    }
+}
diff --git a/Test/git-issues/git-issue-1957.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1957.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1957.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1957.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1958.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1958.dfy
new file mode 100644
index 00000000000..bed0b6dc725
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1958.dfy
@@ -0,0 +1,178 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Example0 {
+  datatype BaseType = Ctor(x: int)
+  {
+    predicate i()
+  }
+
+  type R = r: BaseType | r.i() witness *
+
+  function F0(v: nat): R { // anonymous result value
+    var o: R := Ctor(v); // error: this BaseType might not be an R
+    o
+  }
+
+  function F1(v: nat): (r: R) { // named result value
+    var o: R := Ctor(v); // error: this BaseType might not be an R
+    o
+  }
+}
+
+module Example1 {
+  datatype BaseType = Ctor(x: int)
+  {
+    predicate i()
+  }
+
+  type R = r: BaseType | r.i() witness *
+
+  function G0(v: nat): R { // anonymous result value
+    Ctor(v) // error: this BaseType might not be an R
+  }
+
+  function G1(v: nat): (r: R) { // named result value
+    Ctor(v) // error: this BaseType might not be an R
+  }
+}
+
+module Example2 {
+  type BaseType(!new)
+  {
+    predicate i()
+  }
+
+  type R = r: BaseType | r.i() witness *
+
+  ghost function Ctor(x: nat): R
+    requires exists b: BaseType :: b.i()
+  {
+    var b: BaseType :| b.i();
+    b
+  }
+
+  ghost function F(v: nat): R {
+    var o: R := Ctor(v); // error: precondition failure (***) as reported in issue 1958, this was once not reported
+    o
+  }
+
+  ghost function G0(v: nat): R { // anonymous result value
+    Ctor(v) // error: precondition failure
+  }
+
+  ghost function G1(v: nat): (r: R) { // named result value
+    Ctor(v) // error: precondition failure (***) as reported in issue 1958, this was once not reported
+  }
+
+  method MF(v: nat) returns (ghost r: R) {
+    ghost var o: R;
+    o := Ctor(v); // error: precondition failure
+    return o;
+  }
+
+  predicate IsR(r: R) { true }
+
+  method AssignSuchThat() {
+    var r: R :| IsR(r); // error: cannot establish existence of r
+  }
+   
+  ghost function LetSuchThat(): R {
+    var r: R :| IsR(r); // error: cannot establish existence of r
+    r
+  }
+}
+
+module Example3 {
+  datatype BaseType = BaseType
+  {
+    predicate i() {
+      false
+    }
+  }
+
+  type R = r: BaseType | r.i() witness *
+
+  function Ctor(x: nat): R
+    requires exists b: BaseType :: b.i()
+  {
+    var b: BaseType :| b.i();
+    b
+  }
+
+  function F(v: nat): R {
+    var o: R := Ctor(v); // error: precondition failure (***) as reported in issue 1958, this was once not reported
+    o
+  }
+
+  method Main() {
+    var r := F(15);
+    print r, "\n";
+  }
+}
+
+// The following tests make sure that the appropriate type information (without allocatedness information) is available
+// when checking the _postcondition_ of functions.
+module FunctionResultType {
+  datatype Option<X> = None | Some(value: X)
+
+  function Search0<T(==)>(s: seq<T>, x: T): (o: Option<nat>)
+    ensures
+      o.Some? && o.value < |s| ==>
+      s[o.value] == x // in order to prove ".value" is non-negative, the type of "o" is necessary
+  {
+    if |s| < 12 then
+      None
+    else if s[9] == x then
+      Some(9)
+    else if s[2] == x then
+      Some(2)
+    else
+      None
+  }
+
+  function Search1<T(==)>(s: seq<T>, x: T): Option<nat>
+    ensures var o := Search1(s, x);
+      o.Some? && o.value < |s| ==>
+      s[o.value] == x // in order to prove ".value" is non-negative, the type of "Search1(s, x)" and "o" is necessary
+  {
+    if |s| < 12 then
+      None
+    else if s[9] == x then
+      Some(9)
+    else if s[2] == x then
+      Some(2)
+    else
+      None
+  }
+
+  function Search2<T(==)>(s: seq<T>, x: T): Option<nat>
+    ensures
+      Search2(s, x).Some? && Search2(s, x).value < |s| ==>
+      s[Search2(s, x).value] == x // in order to prove ".value" is non-negative, the type of "Search2(s, x)" is necessary
+  {
+    if |s| < 12 then
+      None
+    else if s[9] == x then
+      Some(9)
+    else if s[2] == x then
+      Some(2)
+    else
+      None
+  }
+
+  function Search4<T(==)>(s: seq<T>, x: T): (o: Option<int>)
+    ensures
+      o.Some? && o.value < |s| ==>
+      s[o.value] == x // error: ".value" may be negative
+  {
+    if |s| < 12 then
+      None
+    else if s[9] == x then
+      Some(9)
+    else if s[2] == x then
+      Some(2)
+    else
+      None
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1958.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1958.dfy.expect
new file mode 100644
index 00000000000..071dcbfdc85
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1958.dfy.expect
@@ -0,0 +1,19 @@
+git-issue-1958.dfy(13,16): Error: value does not satisfy the subset constraints of 'R'
+git-issue-1958.dfy(18,16): Error: value does not satisfy the subset constraints of 'R'
+git-issue-1958.dfy(32,4): Error: value does not satisfy the subset constraints of 'R'
+git-issue-1958.dfy(36,4): Error: value does not satisfy the subset constraints of 'R'
+git-issue-1958.dfy(56,20): Error: function precondition could not be proved
+git-issue-1958.dfy(49,13): Related location: this proposition could not be proved
+git-issue-1958.dfy(61,8): Error: function precondition could not be proved
+git-issue-1958.dfy(49,13): Related location: this proposition could not be proved
+git-issue-1958.dfy(65,8): Error: function precondition could not be proved
+git-issue-1958.dfy(49,13): Related location: this proposition could not be proved
+git-issue-1958.dfy(70,13): Error: function precondition could not be proved
+git-issue-1958.dfy(49,13): Related location: this proposition could not be proved
+git-issue-1958.dfy(77,13): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+git-issue-1958.dfy(81,4): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+git-issue-1958.dfy(104,20): Error: function precondition could not be proved
+git-issue-1958.dfy(97,13): Related location: this proposition could not be proved
+git-issue-1958.dfy(167,7): Error: index out of range
+
+Dafny program verifier finished with 6 verified, 12 errors
diff --git a/Test/git-issues/git-issue-1963a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963a.dfy
similarity index 79%
rename from Test/git-issues/git-issue-1963a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963a.dfy
index dc7dd28bb0a..f285ca44bcf 100644
--- a/Test/git-issues/git-issue-1963a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963a.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 /// This file checks that refinement is forbidden for newtypes
 
diff --git a/Test/git-issues/git-issue-1963a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1963a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963a.dfy.expect
diff --git a/Test/git-issues/git-issue-1963b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963b.dfy
similarity index 78%
rename from Test/git-issues/git-issue-1963b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963b.dfy
index 62ce78519e0..a84b1fbd935 100644
--- a/Test/git-issues/git-issue-1963b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963b.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 /// This file checks that refinement is forbidden for datatypes
 
diff --git a/Test/git-issues/git-issue-1963b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1963b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963b.dfy.expect
diff --git a/Test/git-issues/git-issue-1963c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963c.dfy
similarity index 95%
rename from Test/git-issues/git-issue-1963c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963c.dfy
index 9b0b27b4f88..78196bb8a09 100644
--- a/Test/git-issues/git-issue-1963c.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963c.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 /// This file checks that refinement works for members of newtypes and
diff --git a/Test/git-issues/git-issue-386.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963c.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-386.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1963c.dfy.expect
diff --git a/Test/git-issues/git-issue-1966.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1966.dfy
similarity index 78%
rename from Test/git-issues/git-issue-1966.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1966.dfy
index ff33c23152f..354dedf065e 100644
--- a/Test/git-issues/git-issue-1966.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1966.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /noVerify "%s" > "%t"
+// RUN: %exits-with 2 %resolve "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // {:compile false}: no error
diff --git a/Test/git-issues/git-issue-1966.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1966.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1966.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1966.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1984.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1984.dfy
new file mode 100644
index 00000000000..d921e130747
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1984.dfy
@@ -0,0 +1,5 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+method {:extern "test"} testInt(i: int)
+method {:extern "test"} testBool(b: bool) // Previously the verifier reported a name collision
diff --git a/Test/git-issues/git-issue-2108.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1984.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2108.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1984.dfy.expect
diff --git a/Test/git-issues/git-issue-1989.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1989.dfy
similarity index 98%
rename from Test/git-issues/git-issue-1989.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1989.dfy
index c64587288ea..641b3e2e790 100644
--- a/Test/git-issues/git-issue-1989.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1989.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // ---------------------------------------
 
diff --git a/Test/git-issues/git-issue-1989.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1989.dfy.expect
similarity index 94%
rename from Test/git-issues/git-issue-1989.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1989.dfy.expect
index 2d2cda6650e..c3693ffb374 100644
--- a/Test/git-issues/git-issue-1989.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1989.dfy.expect
@@ -5,8 +5,8 @@ git-issue-1989.dfy(51,7): Warning: Argument to 'old' does not dereference the mu
 git-issue-1989.dfy(52,7): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
 git-issue-1989.dfy(67,30): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
 git-issue-1989.dfy(70,29): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-git-issue-1989.dfy(70,29): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
 git-issue-1989.dfy(70,51): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+git-issue-1989.dfy(70,29): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
 git-issue-1989.dfy(158,18): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
 git-issue-1989.dfy(160,23): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
 git-issue-1989.dfy(171,9): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
@@ -18,16 +18,16 @@ git-issue-1989.dfy(98,22): Warning: Argument to 'old' does not dereference the m
 git-issue-1989.dfy(122,25): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
 git-issue-1989.dfy(124,23): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
 git-issue-1989.dfy(125,28): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-git-issue-1989.dfy(150,23): Error: assertion could not be proved
+git-issue-1989.dfy(126,2): Error: a postcondition could not be proved on this return path
+git-issue-1989.dfy(122,22): Related location: this is the postcondition that could not be proved
+git-issue-1989.dfy(150,9): Error: assertion might not hold
 git-issue-1989.dfy(156,20): Error: a precondition for this call could not be proved
 git-issue-1989.dfy(130,18): Related location: this is the precondition that could not be proved
-git-issue-1989.dfy(181,24): Error: assertion could not be proved
+git-issue-1989.dfy(181,10): Error: assertion might not hold
 git-issue-1989.dfy(199,17): Error: a precondition for this call could not be proved
 git-issue-1989.dfy(130,18): Related location: this is the precondition that could not be proved
-git-issue-1989.dfy(221,24): Error: assertion could not be proved
+git-issue-1989.dfy(221,10): Error: assertion might not hold
 git-issue-1989.dfy(233,17): Error: a precondition for this call could not be proved
 git-issue-1989.dfy(130,18): Related location: this is the precondition that could not be proved
-git-issue-1989.dfy(126,2): Error: a postcondition could not be proved on this return path
-git-issue-1989.dfy(122,22): Related location: this is the postcondition that could not be proved
 
 Dafny program verifier finished with 17 verified, 7 errors
diff --git a/Test/git-issues/git-issue-1992.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1992.dfy
similarity index 100%
rename from Test/git-issues/git-issue-1992.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1992.dfy
diff --git a/Test/git-issues/git-issue-1992.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1992.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1992.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1992.dfy.expect
diff --git a/Test/git-issues/git-issue-1996.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1996.dfy
similarity index 99%
rename from Test/git-issues/git-issue-1996.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1996.dfy
index 5b5b0d4c512..61abae81827 100644
--- a/Test/git-issues/git-issue-1996.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1996.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module M {
diff --git a/Test/git-issues/git-issue-1996.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1996.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-1996.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-1996.dfy.expect
diff --git a/Test/git-issues/git-issue-19a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19a.dfy
similarity index 93%
rename from Test/git-issues/git-issue-19a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19a.dfy
index 649999af0a6..c6b749cb6c6 100644
--- a/Test/git-issues/git-issue-19a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19a.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Resolution (for verification, see git-issue-19b.dfy)
diff --git a/Test/git-issues/git-issue-19a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19a.dfy.expect
similarity index 75%
rename from Test/git-issues/git-issue-19a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19a.dfy.expect
index f9ebca8d1ce..e9b9efd2dc2 100644
--- a/Test/git-issues/git-issue-19a.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19a.dfy.expect
@@ -1,3 +1,3 @@
 git-issue-19a.dfy(12,30): Error: a forall expression involved in a predicate definition is not allowed to depend on the set of allocated references, but values of 'x' (of type 'T') may contain references (perhaps declare its type as 'T(!new)') (see documentation for 'older' parameters)
-git-issue-19a.dfy(54,11): Error: type parameter (T) passed to predicate AllP must support no references (got C)
+git-issue-19a.dfy(54,18): Error: type parameter (T) passed to predicate AllP must contain no references (got C)
 2 resolution/type errors detected in git-issue-19a.dfy
diff --git a/Test/git-issues/git-issue-19b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19b.dfy
similarity index 97%
rename from Test/git-issues/git-issue-19b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19b.dfy
index f82c8fa0c1a..8c587efd03a 100644
--- a/Test/git-issues/git-issue-19b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19b.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Verification (for resolution, see git-issue-19a.dfy)
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19b.dfy.expect
new file mode 100644
index 00000000000..7fa4a9d7ae6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19b.dfy.expect
@@ -0,0 +1,13 @@
+git-issue-19b.dfy(36,4): Error: assertion might not hold
+git-issue-19b.dfy(43,4): Error: assertion might not hold
+git-issue-19b.dfy(50,4): Error: assertion might not hold
+git-issue-19b.dfy(57,4): Error: assertion might not hold
+git-issue-19b.dfy(64,4): Error: assertion might not hold
+git-issue-19b.dfy(71,4): Error: assertion might not hold
+git-issue-19b.dfy(102,4): Error: assertion might not hold
+git-issue-19b.dfy(115,4): Error: a postcondition could not be proved on this return path
+git-issue-19b.dfy(113,14): Related location: this is the postcondition that could not be proved
+git-issue-19b.dfy(131,36): Error: a precondition for this call could not be proved
+git-issue-19b.dfy(124,17): Related location: this is the precondition that could not be proved
+
+Dafny program verifier finished with 19 verified, 9 errors
diff --git a/Test/git-issues/git-issue-19c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19c.dfy
similarity index 100%
rename from Test/git-issues/git-issue-19c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19c.dfy
diff --git a/Test/git-issues/git-issue-19c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19c.dfy.expect
similarity index 97%
rename from Test/git-issues/git-issue-19c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19c.dfy.expect
index 9d50bad4251..118d2e4bde4 100644
--- a/Test/git-issues/git-issue-19c.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-19c.dfy.expect
@@ -1,3 +1,4 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 git-issue-19c.dfy(41,10): Error: a set comprehension involved in a function definition is not allowed to depend on the set of allocated references, but values of 'basic' (of type 'Basic') may contain references (see documentation for 'older' parameters)
 git-issue-19c.dfy(86,12): Error: a set comprehension involved in a function definition (implicitly by using a function in a reads clause) is not allowed to depend on the set of allocated references, but values of '_x0' (of type 'Basic') may contain references (see documentation for 'older' parameters)
 git-issue-19c.dfy(93,12): Error: a set comprehension involved in a function definition (implicitly by using a function in a reads clause) is not allowed to depend on the set of allocated references, but values of '_x0' (of type 'X') may contain references (perhaps declare its type as 'X(!new)') (see documentation for 'older' parameters)
diff --git a/Test/git-issues/git-issue-2013.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2013.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2013.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2013.dfy
diff --git a/Test/git-issues/git-issue-2013.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2013.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2013.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2013.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2013.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2013.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2013.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2016.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2016.dfy
new file mode 100644
index 00000000000..ba1f81d2796
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2016.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module M {
+  datatype D = D() {
+    static function f(): (res: int) {
+      5
+    } by method {
+      return 5;
+    }
+  }
+}
diff --git a/Test/git-issues/git-issue-2956a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2016.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2956a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2016.dfy.expect
diff --git a/Test/git-issues/git-issue-2019.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2019.dfy
similarity index 88%
rename from Test/git-issues/git-issue-2019.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2019.dfy
index 8ee4ab74b34..f2beb5fde0e 100644
--- a/Test/git-issues/git-issue-2019.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2019.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method f(x: seq<int>) returns (res: seq<int>)
diff --git a/Test/git-issues/git-issue-2019.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2019.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2019.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2019.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-202.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-202.dfy
new file mode 100644
index 00000000000..ed83b76a3eb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-202.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+method push<T>(sequence: seq<T>, element: T) returns (new_sequence: seq<T>)
+  ensures sequence == new_sequence[..|new_sequence|-1]
+{
+  return sequence + [element];
+}
diff --git a/Test/git-issues/git-issue-202.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-202.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-202.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-202.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2022.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2022.dfy
new file mode 100644
index 00000000000..5f8ce75c665
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2022.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module M {
+  export
+    provides
+      Opened,
+      f
+
+  module Opened {
+    type T = int
+  }
+
+  ghost function f(x: Opened.T): int {
+    5
+  }
+}
diff --git a/Test/git-issues/git-issue-2612.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2022.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2612.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2022.dfy.expect
diff --git a/Test/git-issues/git-issue-2026.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2026.dfy
similarity index 91%
rename from Test/git-issues/git-issue-2026.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2026.dfy
index 4ef2c23f620..9c6c1ff274d 100644
--- a/Test/git-issues/git-issue-2026.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2026.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" /extractCounterexample /mv model  > "%t"
+// RUN: %exits-with 4 %verify --extract-counterexample "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // NB: with recent Z3 versions (e.g., 4.12.1), this program no longer
@@ -15,8 +15,8 @@ method foo(n: nat) returns (ret: array<string>)
     var i := 0;
     while i < n - 1
         invariant 0 <= i < n
-        invariant forall j :: 0 <= j < i ==> j % 2 == 0 ==> ret[j] == "even"
         invariant forall j :: 0 <= j < i ==> j % 2 == 1 ==> ret[j] == "odd"
+        invariant forall j :: 0 <= j < i ==> j % 2 == 0 ==> ret[j] == "even"
     {
         if i % 2 == 0 {
             ret[i] := "odd";
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2026.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2026.dfy.expect
new file mode 100644
index 00000000000..83094f7432c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2026.dfy.expect
@@ -0,0 +1,21 @@
+git-issue-2026.dfy(19,18): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+ Related counterexample:
+ WARNING: the following counterexample may be inconsistent or invalid. See dafny.org/dafny/DafnyRef/DafnyRef#sec-counterexamples
+ Temporary variables to describe counterexamples: 
+ ghost var counterexampleLoopGuard0 : bool := false;
+ git-issue-2026.dfy(12,0): initial state:
+ assume 2 == n;
+ git-issue-2026.dfy(13,24):
+ assume ret != null && ret.Length > 0 && 2 == n && 2 == ret.Length && ['o', 'd', 'd'] == ret[0];
+ git-issue-2026.dfy(15,14):
+ assume ret != null && ret.Length > 0 && 2 == n && 2 == ret.Length && ['o', 'd', 'd'] == ret[0] && 0 == i;
+ git-issue-2026.dfy(16,4): after some loop iterations:
+ counterexampleLoopGuard0 := ret != null && 2 == n && 2 == ret.Length && 0 == i;
+ git-issue-2026.dfy(22,27):
+ assume counterexampleLoopGuard0 ==> ret != null && ret.Length > 0 && 2 == n && 2 == ret.Length && ['o', 'd', 'd'] == ret[0] && 0 == i;
+ git-issue-2026.dfy(26,18):
+ assume counterexampleLoopGuard0 ==> ret != null && ret.Length > 0 && 2 == n && 2 == ret.Length && ['o', 'd', 'd'] == ret[0] && 1 == i;
+ 
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2064.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2064.dfy
new file mode 100644
index 00000000000..a04dcc11c62
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2064.dfy
@@ -0,0 +1,217 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+module CoreTests {
+  abstract module UnitTestParent {
+    type T(!new)
+    type U(==)
+    type V(0)
+    type W(00)
+  }
+
+  module OpaqueType refines UnitTestParent {
+    type A
+    type T = A // error: A is not (!new)
+    type U = A // error: A is not (==)
+    type V = A // error: A is not (0)
+    type W = A // error: A is not (00)
+  }
+
+  module OpaqueTypeGood refines UnitTestParent {
+    type A(!new)
+    type B(==)
+    type C(0)
+    type D(00)
+    type T = A
+    type U = B
+    type V = C
+    type W = D
+  }
+
+  module OpaqueTypeMixedUp refines UnitTestParent {
+    type A(!new)
+    type B(==)
+    type C(0)
+    type D(00)
+    type T = D // error: D is not (!new)
+    type U = A // error: A is not (==)
+    type V = B // error: B is not (0)
+    type W = C // fine, since C is (0), and (0) implies (00)
+  }
+
+  module Int refines UnitTestParent {
+    type A = int
+    type T = A
+    type U = A
+    type V = A
+    type W = A
+  }
+
+  module Arrow refines UnitTestParent {
+    type A = int -> object
+    type T = A // error: A is not (!new)
+    type U = A // error: A is not (==)
+    type V = A // error: A is not (0)
+    type W = A // error: A is not (00)
+  }
+
+  module ArrowGood refines UnitTestParent {
+    type A = int ~> int
+    type T = A
+    type U = A // error: A is not (==)
+    type V = A
+    type W = A
+  }
+
+  module ArrowDirect refines UnitTestParent {
+    type T = int -> object // error: RHS is not (!new)
+    type U = int -> object // error: RHS is not (==)
+    type V = int -> object // error: RHS is not (0)
+    type W = int -> object // error: RHS is not (00)
+  }
+
+  module Class refines UnitTestParent {
+    class A { }
+    type T = A // error: A is not (!new)
+    type U = A
+    type V = A // error: A is not (0)
+    type W = A // error: A is not (00)
+  }
+
+  module ClassDirect refines UnitTestParent {
+    class T { } // error: T is not (!new)
+    class U { }
+    class V { } // error: T is not (0)
+    class W { } // error: T is not (00)
+  }
+
+  module NullableClass refines UnitTestParent {
+    class A { }
+    type T = A? // error: A? is not (!new)
+    type U = A?
+    type V = A?
+    type W = A?
+  }
+
+  module InstantiatedDatatypeBad0 refines UnitTestParent {
+    datatype Record<X> = Record(X)
+    type A = Record<object>
+    type T = A // error: A is not (!new)
+    type U = A
+    type V = A // error: A is not (0)
+    type W = A // error: A is not (00)
+  }
+
+  module InstantiatedDatatypeBad1 refines UnitTestParent {
+    datatype Record<X> = Record(X, ghost X)
+    type A = Record<int>
+    type T = A
+    type U = A // error: A is not (==)
+    type V = A
+    type W = A
+  }
+
+  module InstantiatedDatatypeGood refines UnitTestParent {
+    datatype Record<X> = Record(X)
+    type A = Record<set<real>>
+    type T = A
+    type U = A
+    type V = A
+    type W = A
+  }
+}
+
+module BugReport0 {
+  abstract module Parent {
+    type T(!new, ==)
+
+    twostate lemma L(new t: T)
+      ensures old(allocated(t))
+    {}
+  }
+
+  module Child refines Parent {
+    // Once, the following line did not result in any complaints
+    class T { // error: T does not support (!new)
+      var a: int
+      constructor(a: int) ensures this.a == a { this.a := a; }
+    }
+
+    method boom() {
+      var c := new T(0);
+      assert !old(allocated(c));
+      L(c);
+      assert old(allocated(c));
+      assert false;
+    }
+  }
+}
+
+module BugReport1 {
+  abstract module Parent {
+    type U(00)
+
+    lemma Mk() returns (u: U) {
+      u :| true;
+    }
+  }
+
+  module Child refines Parent {
+    type False = x: int | false witness *
+
+    datatype U = U(f: False) // error: does not support (00)
+  }
+
+  method Main() ensures false {
+    ghost var u: Child.U := Child.Mk();
+    ghost var f: Child.False := u.f;
+  }
+}
+
+module BugReport2 {
+  abstract module Parent {
+    type U(00)
+
+    lemma Mk() returns (u: U) {
+      u :| true;
+    }
+  }
+
+  module Child refines Parent {
+    type False = x: int | false witness *
+
+    // Once, the following line was accepted without any complaints
+    class U { // error: U does not support (00)
+      var f: False
+      constructor(f: False) { this.f := f; }
+    }
+  }
+
+  method Main() ensures false {
+    ghost var u: Child.U := Child.Mk();
+    ghost var f: Child.False := u.f;
+  }
+}
+
+module BugReport2' {
+  abstract module Parent {
+    type U(0)
+
+    lemma Mk() returns (u: U) {
+      u :| true;
+    }
+  }
+
+  module Child refines Parent {
+    type False = x: int | false witness *
+
+    class U { // error: U does not support (0)
+      var f: False
+      constructor(f: False) { this.f := f; }
+    }
+  }
+
+  method Main() ensures false {
+    ghost var u: Child.U := Child.Mk();
+    ghost var f: Child.False := u.f;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2064.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2064.dfy.expect
new file mode 100644
index 00000000000..576c49ebeb5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2064.dfy.expect
@@ -0,0 +1,35 @@
+git-issue-2064.dfy(13,9): Error: to be a refinement of abstract type 'UnitTestParent.T' declared with (!new), type synonym 'OpaqueType.T' must contain no references
+git-issue-2064.dfy(14,9): Error: to be a refinement of abstract type 'UnitTestParent.U' declared with (==), type synonym 'OpaqueType.U' must support equality
+git-issue-2064.dfy(15,9): Error: to be a refinement of abstract type 'UnitTestParent.V' declared with (0), type synonym 'OpaqueType.V' must support auto-initialization
+git-issue-2064.dfy(16,9): Error: to be a refinement of abstract type 'UnitTestParent.W' declared with (00), type synonym 'OpaqueType.W' must be nonempty
+git-issue-2064.dfy(35,9): Error: to be a refinement of abstract type 'UnitTestParent.T' declared with (!new), type synonym 'OpaqueTypeMixedUp.T' must contain no references
+git-issue-2064.dfy(36,9): Error: to be a refinement of abstract type 'UnitTestParent.U' declared with (==), type synonym 'OpaqueTypeMixedUp.U' must support equality
+git-issue-2064.dfy(37,9): Error: to be a refinement of abstract type 'UnitTestParent.V' declared with (0), type synonym 'OpaqueTypeMixedUp.V' must support auto-initialization
+git-issue-2064.dfy(51,9): Error: to be a refinement of abstract type 'UnitTestParent.T' declared with (!new), type synonym 'Arrow.T' must contain no references
+git-issue-2064.dfy(52,9): Error: to be a refinement of abstract type 'UnitTestParent.U' declared with (==), type synonym 'Arrow.U' must support equality
+git-issue-2064.dfy(53,9): Error: to be a refinement of abstract type 'UnitTestParent.V' declared with (0), type synonym 'Arrow.V' must support auto-initialization
+git-issue-2064.dfy(54,9): Error: to be a refinement of abstract type 'UnitTestParent.W' declared with (00), type synonym 'Arrow.W' must be nonempty
+git-issue-2064.dfy(60,9): Error: to be a refinement of abstract type 'UnitTestParent.U' declared with (==), type synonym 'ArrowGood.U' must support equality
+git-issue-2064.dfy(66,9): Error: to be a refinement of abstract type 'UnitTestParent.T' declared with (!new), type synonym 'ArrowDirect.T' must contain no references
+git-issue-2064.dfy(67,9): Error: to be a refinement of abstract type 'UnitTestParent.U' declared with (==), type synonym 'ArrowDirect.U' must support equality
+git-issue-2064.dfy(68,9): Error: to be a refinement of abstract type 'UnitTestParent.V' declared with (0), type synonym 'ArrowDirect.V' must support auto-initialization
+git-issue-2064.dfy(69,9): Error: to be a refinement of abstract type 'UnitTestParent.W' declared with (00), type synonym 'ArrowDirect.W' must be nonempty
+git-issue-2064.dfy(74,9): Error: to be a refinement of abstract type 'UnitTestParent.T' declared with (!new), type synonym 'Class.T' must contain no references
+git-issue-2064.dfy(76,9): Error: to be a refinement of abstract type 'UnitTestParent.V' declared with (0), type synonym 'Class.V' must support auto-initialization
+git-issue-2064.dfy(77,9): Error: to be a refinement of abstract type 'UnitTestParent.W' declared with (00), type synonym 'Class.W' must be nonempty
+git-issue-2064.dfy(81,10): Error: to be a refinement of abstract type 'UnitTestParent.T' declared with (!new), class 'ClassDirect.T' must contain no references
+git-issue-2064.dfy(83,10): Error: to be a refinement of abstract type 'UnitTestParent.V' declared with (0), class 'ClassDirect.V' must support auto-initialization
+git-issue-2064.dfy(84,10): Error: to be a refinement of abstract type 'UnitTestParent.W' declared with (00), class 'ClassDirect.W' must be nonempty
+git-issue-2064.dfy(89,9): Error: to be a refinement of abstract type 'UnitTestParent.T' declared with (!new), type synonym 'NullableClass.T' must contain no references
+git-issue-2064.dfy(98,9): Error: to be a refinement of abstract type 'UnitTestParent.T' declared with (!new), type synonym 'InstantiatedDatatypeBad0.T' must contain no references
+git-issue-2064.dfy(100,9): Error: to be a refinement of abstract type 'UnitTestParent.V' declared with (0), type synonym 'InstantiatedDatatypeBad0.V' must support auto-initialization
+git-issue-2064.dfy(101,9): Error: to be a refinement of abstract type 'UnitTestParent.W' declared with (00), type synonym 'InstantiatedDatatypeBad0.W' must be nonempty
+git-issue-2064.dfy(108,9): Error: to be a refinement of abstract type 'UnitTestParent.U' declared with (==), type synonym 'InstantiatedDatatypeBad1.U' must support equality
+git-issue-2064.dfy(134,10): Error: to be a refinement of abstract type 'Parent.T' declared with (==,!new), class 'Child.T' must contain no references
+git-issue-2064.dfy(161,13): Error: to be a refinement of abstract type 'Parent.U' declared with (00), datatype 'Child.U' must be nonempty
+git-issue-2064.dfy(158,9): Error: not resolving module 'BugReport1' because there were errors in resolving its nested module 'Child'
+git-issue-2064.dfy(183,10): Error: to be a refinement of abstract type 'Parent.U' declared with (00), class 'Child.U' must be nonempty
+git-issue-2064.dfy(179,9): Error: not resolving module 'BugReport2' because there were errors in resolving its nested module 'Child'
+git-issue-2064.dfy(207,10): Error: to be a refinement of abstract type 'Parent.U' declared with (0), class 'Child.U' must support auto-initialization
+git-issue-2064.dfy(204,9): Error: not resolving module 'BugReport2'' because there were errors in resolving its nested module 'Child'
+34 resolution/type errors detected in git-issue-2064.dfy
diff --git a/Test/git-issues/git-issue-2068.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2068.dfy
similarity index 80%
rename from Test/git-issues/git-issue-2068.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2068.dfy
index 6a43b753cea..b1061e8d476 100644
--- a/Test/git-issues/git-issue-2068.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2068.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 type A = s: object | true witness this
diff --git a/Test/git-issues/git-issue-2068.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2068.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2068.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2068.dfy.expect
diff --git a/Test/git-issues/git-issue-2071.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2071.dfy
similarity index 86%
rename from Test/git-issues/git-issue-2071.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2071.dfy
index 535116c2439..773732a1ec7 100644
--- a/Test/git-issues/git-issue-2071.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2071.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:1 /spillTargetCode:2 /compileTarget:java "%s" > "%t"
+// RUN: %translate java "%s" > "%t"
 // RUN: javac -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/git-issue-2071-java %S/git-issue-2071-java/git_issue_2071.java %S/git-issue-2071-java/*/*.java >> "%t"
 // RUN: java -ea -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/git-issue-2071-java git_issue_2071 >> "%t"
 // RUN: %diff "%s.expect" "%t"
diff --git a/Test/git-issues/git-issue-2071.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2071.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2071.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2071.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2074.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2074.dfy
new file mode 100644
index 00000000000..048aa49af9f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2074.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method m() {
+  var f := st => set x | x in st;
+}
diff --git a/Test/git-issues/git-issue-2074.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2074.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2074.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2074.dfy.expect
diff --git a/Test/git-issues/git-issue-2100.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2100.dfy
similarity index 87%
rename from Test/git-issues/git-issue-2100.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2100.dfy
index affa34cdebf..7bda25c695a 100644
--- a/Test/git-issues/git-issue-2100.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2100.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module Library {
   export
diff --git a/Test/git-issues/git-issue-274.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2100.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-274.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2100.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2103.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2103.dfy
new file mode 100644
index 00000000000..eda64abd340
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2103.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+datatype DT_<+A> = DT(ret: A)
+type DT<A> = r: DT_<A> | true witness *
+
+method Main() {
+  var d := DT(3);
+  print d, "\n"; // 3
+}
diff --git a/Test/git-issues/git-issue-2103.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2103.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2103.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2103.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2103.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2103.dfy.rs.check
new file mode 100644
index 00000000000..2b5a27013a7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2103.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type variance Co not supported</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2106.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2106.dfy
new file mode 100644
index 00000000000..fb86b9a243a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2106.dfy
@@ -0,0 +1,5 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+predicate P(x: bool)
+type WE = e: (int, int) | P()
diff --git a/Test/git-issues/git-issue-2106.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2106.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2106.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2106.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2108.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2108.dfy
new file mode 100644
index 00000000000..8fe52847645
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2108.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module M0.M1.Base {}
+
+module M0.M2 {
+  import M1.Base
+
+  module Derived refines Base {
+  }
+}
diff --git a/Test/git-issues/git-issue-2829b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2108.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2829b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2108.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2111.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2111.dfy
new file mode 100644
index 00000000000..896eb7ce22f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2111.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype DT = C(s: string) {
+  ghost predicate F() {
+    C.XYZ()
+  }
+}
diff --git a/Test/git-issues/git-issue-2111.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2111.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2111.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2111.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2134.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2134.dfy
new file mode 100644
index 00000000000..f1ba4923103
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2134.dfy
@@ -0,0 +1,67 @@
+// RUN: %exits-with 2 %build --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module NewtypeCycle0 {
+  newtype A = b | P(b)
+  newtype B = a: A | true
+
+  predicate P(b: B) // error: cycle in definition
+}
+
+module NewtypeCycle1 {
+  newtype A = b | P(b)
+  newtype B = a | Q(a)
+
+  predicate P(b: B) // error: cycle in definition
+  predicate Q(a: A)
+}
+
+module NewtypeCycle2 {
+  newtype B = b | P(b)
+
+  predicate P(b: B) // error: cycle in definition
+}
+
+module NewtypeCycle3 {
+  newtype B = b | b == X
+  const X: B // error: cycle in definition
+}
+
+module NewtypeCycle4 {
+  newtype B = b | b == X() // error: cycle in definition
+  function X(): B // error: cycle in definition
+}
+
+// ------------------------------
+
+module SubsetTypeCycle0 {
+  type A = b | P(b)
+  type B = a: A | true
+
+  predicate P(b: B) // error: cycle in definition
+}
+
+module SubsetTypeCycle1 {
+  type A = b | P(b)
+  type B = a | Q(a)
+
+  predicate P(b: B) // error: cycle in definition
+  predicate Q(a: A)
+}
+
+module SubsetTypeCycle2 {
+  type B = b | P(b)
+
+  predicate P(b: B) // error: cycle in definition
+}
+
+module SubsetTypeCycle3 {
+  type B = b | b == X
+  const X: B // error: cycle in definition
+}
+
+module SubsetTypeCycle4 {
+  type B = b | b == X() // error: cycle in definition
+  function X(): B // error: cycle in definition
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2134.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2134.dfy.expect
new file mode 100644
index 00000000000..10edf10836f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2134.dfy.expect
@@ -0,0 +1,19 @@
+git-issue-2134.dfy(8,12): Error: Cyclic dependency among declarations: P -> A -> B -> P
+git-issue-2134.dfy(5,10): Error: base type of newtype 'A' is not fully determined; add an explicit type for bound variable 'b'
+git-issue-2134.dfy(15,12): Error: Cyclic dependency among declarations: P -> A -> Q -> B -> P
+git-issue-2134.dfy(12,10): Error: base type of newtype 'A' is not fully determined; add an explicit type for bound variable 'b'
+git-issue-2134.dfy(22,12): Error: Cyclic dependency among declarations: P -> B -> P
+git-issue-2134.dfy(20,10): Error: base type of newtype 'B' is not fully determined; add an explicit type for bound variable 'b'
+git-issue-2134.dfy(27,8): Error: Cyclic dependency among declarations: X -> B -> X
+git-issue-2134.dfy(26,10): Error: base type of newtype 'B' is not fully determined; add an explicit type for bound variable 'b'
+git-issue-2134.dfy(26,20): Error: arguments must have comparable types (got ?1 and ?0)
+git-issue-2134.dfy(32,11): Error: Cyclic dependency among declarations: X -> B -> X
+git-issue-2134.dfy(31,10): Error: Cyclic dependency among declarations: B -> B -> X
+git-issue-2134.dfy(41,12): Error: Cyclic dependency among declarations: P -> A -> B -> P
+git-issue-2134.dfy(48,12): Error: Cyclic dependency among declarations: P -> A -> Q -> B -> P
+git-issue-2134.dfy(55,12): Error: Cyclic dependency among declarations: P -> B -> P
+git-issue-2134.dfy(60,8): Error: Cyclic dependency among declarations: X -> B -> X
+git-issue-2134.dfy(59,17): Error: arguments must have comparable types (got ?1 and ?0)
+git-issue-2134.dfy(65,11): Error: Cyclic dependency among declarations: X -> B -> X
+git-issue-2134.dfy(64,7): Error: Cyclic dependency among declarations: B -> B -> X
+18 resolution/type errors detected in git-issue-2134.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2139.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2139.dfy
new file mode 100644
index 00000000000..3666ff043db
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2139.dfy
@@ -0,0 +1,24 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module A {
+  datatype T = T(T, T)
+  {
+    ghost predicate P() {
+      match this
+      case T(0, 1) => false // error (x2): neither constant pattern of constructor pattern has the right type
+    }
+  }
+  
+  method M() {
+    var tok := (0, 0);
+    match tok {
+      case "B" => // error: "B" is not of type (int, int)
+      case _ => 
+    }
+  }
+}
+
+module B {
+  datatype T = T(T, T) // warnin: cycle prevents instances (module A has the same problem, but the warning is masked by other errors there)
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2139.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2139.dfy.expect
new file mode 100644
index 00000000000..356acecd947
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2139.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-2139.dfy(16,11): Error: pattern doesn't correspond to a tuple
+git-issue-2139.dfy(9,13): Error: Constant pattern used in place of datatype
+git-issue-2139.dfy(9,16): Error: Constant pattern used in place of datatype
+git-issue-2139.dfy(23,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'T' can be constructed
+3 resolution/type errors detected in git-issue-2139.dfy
diff --git a/Test/git-issues/git-issue-216.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-216.dfy
similarity index 89%
rename from Test/git-issues/git-issue-216.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-216.dfy
index 039261037a4..a0440b1654d 100644
--- a/Test/git-issues/git-issue-216.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-216.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Comparator {
diff --git a/Test/git-issues/git-issue-216.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-216.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-216.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-216.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2173.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2173.dfy
new file mode 100644
index 00000000000..a3fc9bf9b27
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2173.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+datatype T = Leaf(x: int) | T(t: T) {
+  function {:tailrecursion} TR() : int {
+    if Leaf? then 0
+    else t.TR()
+  }
+}
+
+method Main() {
+  print Leaf(0).TR(), "\n";
+}
diff --git a/Test/git-issues/git-issue-2173.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2173.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2173.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2173.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2173.dfy.go.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2173.dfy.go.check
new file mode 100644
index 00000000000..d55f5349188
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2173.dfy.go.check
@@ -0,0 +1,3 @@
+// https://github.com/dafny-lang/dafny/issues/4120
+// CHECK: T.* is not a type
+
diff --git a/Test/git-issues/git-issue-2197.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2197.dfy
similarity index 78%
rename from Test/git-issues/git-issue-2197.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2197.dfy
index d5fd16cd5c8..1b880c4133d 100644
--- a/Test/git-issues/git-issue-2197.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2197.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny /compile:0 /showSnippets:1 "%s" > "%t".raw
+// RUN: %exits-with 4 %baredafny verify --use-basename-for-filename --show-snippets "%s" > "%t".raw
 // RUN: %sed 's/^.*[\/\\]//' "%t".raw > "%t"
 // RUN: %diff "%s.expect" "%t"
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2197.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2197.dfy.expect
new file mode 100644
index 00000000000..21d657afeb1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2197.dfy.expect
@@ -0,0 +1,37 @@
+git-issue-2197.dfy(11,0): Error: a postcondition could not be proved on this return path
+   |
+11 | {
+   | ^
+
+git-issue-2197.dfy(10,14): Related location: this is the postcondition that could not be proved
+   |
+10 |   ensures Test(y)
+   |           ^^^^^^^
+
+git-issue-2197.dfy(6,4): Related location: this proposition could not be proved
+  |
+6 |   y >= 1
+  |   ^^^^^^
+
+git-issue-2197.dfy(17,0): Error: a postcondition could not be proved on this return path
+   |
+17 | {
+   | ^
+
+git-issue-2197.dfy(16,34): Related location: this is the postcondition that could not be proved
+   |
+16 |   ensures 0 <= y < |test| ==> test[y]
+   |                               ^^^^^^^
+
+git-issue-2197.dfy(22,7): Error: a precondition for this call could not be proved
+   |
+22 |   Never();
+   |   ^^^^^^^^
+
+git-issue-2197.dfy(26,13): Related location: this is the precondition that could not be proved
+   |
+26 |   requires 1 == 0
+   |            ^^^^^^
+
+
+Dafny program verifier finished with 1 verified, 3 errors
diff --git a/Test/git-issues/git-issue-2200.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2200.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2200.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2200.dfy
diff --git a/Test/git-issues/git-issue-2200.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2200.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2200.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2200.dfy.expect
diff --git a/Test/git-issues/git-issue-2211.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211.dfy
similarity index 83%
rename from Test/git-issues/git-issue-2211.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211.dfy
index 4c3ebc6eaa2..3991e442822 100644
--- a/Test/git-issues/git-issue-2211.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 predicate P1(a: int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211.dfy.expect
new file mode 100644
index 00000000000..9124309709c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-2211.dfy(17,0): Error: a postcondition could not be proved on this return path
+git-issue-2211.dfy(16,11): Related location: this is the postcondition that could not be proved
+git-issue-2211.dfy(8,2): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/Test/git-issues/git-issue-2211a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211a.dfy
similarity index 85%
rename from Test/git-issues/git-issue-2211a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211a.dfy
index 031147f63cd..0c6bd59bca4 100644
--- a/Test/git-issues/git-issue-2211a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211a.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 predicate P1(a: int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211a.dfy.expect
new file mode 100644
index 00000000000..a1772e35bc1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2211a.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-2211a.dfy(18,0): Error: a postcondition could not be proved on this return path
+git-issue-2211a.dfy(17,11): Related location: this is the postcondition that could not be proved
+git-issue-2211a.dfy(9,2): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/Test/git-issues/git-issue-2216.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2216.dfy
similarity index 93%
rename from Test/git-issues/git-issue-2216.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2216.dfy
index 277af09736b..9c5bf3d14a6 100644
--- a/Test/git-issues/git-issue-2216.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2216.dfy
@@ -1,5 +1,5 @@
 // NONUNIFORM: Too slow on other backends
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs "%s" >> "%t"
+// RUN: %run --no-verify --target cs "%s" >> "%t"
 
 const REPEAT := 100_000
 
diff --git a/Test/git-issues/git-issue-2216.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2216.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2216.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2216.dfy.expect
diff --git a/Test/git-issues/git-issue-2265.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2265.dfy
similarity index 78%
rename from Test/git-issues/git-issue-2265.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2265.dfy
index d71847dab43..1bbd3648816 100644
--- a/Test/git-issues/git-issue-2265.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2265.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
 
 module DefaultModule {
   class DefaultClass {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2265.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2265.dfy.expect
new file mode 100644
index 00000000000..ae693e9a9cf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2265.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-2265.dfy(9,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2266.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2266.dfy
new file mode 100644
index 00000000000..0070a77b245
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2266.dfy
@@ -0,0 +1,5 @@
+// RUN: %verify --bprint "%t.bpl" "%s"
+// RUN: %boogie "%t.bpl" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function Test(f: (int ~> bool)): (b:bool) requires forall x: int :: f.requires(x) reads f.reads { true }
diff --git a/Test/git-issues/git-issue-2266.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2266.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2266.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2266.dfy.expect
diff --git a/Test/git-issues/git-issue-227.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-227.dfy
similarity index 97%
rename from Test/git-issues/git-issue-227.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-227.dfy
index 5194bd6d62f..35156e36cc0 100644
--- a/Test/git-issues/git-issue-227.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-227.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 /* This is a trimmed down version of the original bug. The original program can be found in Issue #227.
    This trimmed version is only for the purpose of testing the type-checking error messages. */
diff --git a/Test/git-issues/git-issue-227.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-227.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-227.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-227.dfy.expect
diff --git a/Test/git-issues/git-issue-2299.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2299.dfy
similarity index 96%
rename from Test/git-issues/git-issue-2299.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2299.dfy
index b0203516d89..e48f1ca30c1 100644
--- a/Test/git-issues/git-issue-2299.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2299.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class Twostate {
   var z: int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2299.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2299.dfy.expect
new file mode 100644
index 00000000000..45b46e76c15
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2299.dfy.expect
@@ -0,0 +1,19 @@
+git-issue-2299.dfy(37,21): Error: assertion might not hold
+git-issue-2299.dfy(10,11): Related location: this proposition could not be proved
+git-issue-2299.dfy(48,21): Error: assertion might not hold
+git-issue-2299.dfy(16,4): Related location: this proposition could not be proved
+git-issue-2299.dfy(58,20): Error: assertion might not hold
+git-issue-2299.dfy(21,4): Related location: this proposition could not be proved
+git-issue-2299.dfy(67,22): Error: assertion might not hold
+git-issue-2299.dfy(21,4): Related location: this proposition could not be proved
+git-issue-2299.dfy(81,16): Error: assertion might not hold
+git-issue-2299.dfy(27,12): Related location: this proposition could not be proved
+git-issue-2299.dfy(10,11): Related location: this proposition could not be proved
+git-issue-2299.dfy(81,16): Error: assertion might not hold
+git-issue-2299.dfy(27,26): Related location: this proposition could not be proved
+git-issue-2299.dfy(16,4): Related location: this proposition could not be proved
+git-issue-2299.dfy(81,16): Error: assertion might not hold
+git-issue-2299.dfy(27,39): Related location: this proposition could not be proved
+git-issue-2299.dfy(21,4): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 7 verified, 7 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2301.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2301.dfy
new file mode 100644
index 00000000000..52fb7014c5c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2301.dfy
@@ -0,0 +1,65 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+class Twostate {
+  var z: int
+
+  twostate predicate NoChange_ReadsThis()
+    reads this
+  {
+    unchanged(this)
+  }
+
+  twostate predicate NoChange_ReadsNothing()
+  {
+    unchanged(this) // error: insufficient reads clause
+  }
+
+  method Test0()
+    modifies this
+  {
+    assert NoChange_ReadsThis();
+    z := z + 1;
+    assert NoChange_ReadsThis(); // error: does not hold
+  }
+
+  method Test1()
+    modifies this
+  {
+    assert NoChange_ReadsNothing();
+    z := z + 1;
+    // If NoChange_ReadsNothing has an empty reads clause, then the following assertion
+    // from the previous assertion.
+    assert NoChange_ReadsNothing();
+  }
+
+  twostate predicate BadVariations0(c: Twostate, d: Twostate, e: Twostate, f: Twostate)
+  {
+    unchanged(
+      this, // error: insufficient reads clause
+      c // error: insufficient reads clause
+    )
+  }
+
+  twostate predicate BadVariations1(c: Twostate, d: Twostate, e: Twostate, f: Twostate)
+  {
+    unchanged({c, d}) // error: insufficient reads clause
+  }
+
+  twostate predicate BadVariations2(c: Twostate, d: Twostate, e: Twostate, f: Twostate)
+  {
+    unchanged(
+      multiset{e, e, c, e}, // error: insufficient reads clause
+      [c, d, e], // error: insufficient reads clause
+      [c, f, e, d] // error: insufficient reads clause
+    )
+  }
+
+  twostate predicate GoodVariations(c: Twostate, d: Twostate, e: Twostate, f: Twostate)
+    reads this, c, {d, e}, multiset{f}
+  {
+    && unchanged(this, c)
+    && unchanged({c, d})
+    && unchanged(multiset{e, e, c, e}, [c, d, e], [c, f, e, d])
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2301.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2301.dfy.expect
new file mode 100644
index 00000000000..ea026313873
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2301.dfy.expect
@@ -0,0 +1,11 @@
+git-issue-2301.dfy(15,14): Error: insufficient reads clause to read state of 'unchanged' object
+git-issue-2301.dfy(23,29): Error: assertion might not hold
+git-issue-2301.dfy(10,4): Related location: this proposition could not be proved
+git-issue-2301.dfy(39,6): Error: insufficient reads clause to read state of 'unchanged' object
+git-issue-2301.dfy(40,6): Error: insufficient reads clause to read state of 'unchanged' object
+git-issue-2301.dfy(46,14): Error: insufficient reads clause to read state of 'unchanged' set element
+git-issue-2301.dfy(52,6): Error: insufficient reads clause to read state of 'unchanged' multiset element
+git-issue-2301.dfy(53,6): Error: insufficient reads clause to read state of 'unchanged' sequence element
+git-issue-2301.dfy(54,6): Error: insufficient reads clause to read state of 'unchanged' sequence element
+
+Dafny program verifier finished with 3 verified, 8 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2303.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2303.dfy
new file mode 100644
index 00000000000..75b21f1ba3a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2303.dfy
@@ -0,0 +1,15 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module A {
+  newtype int0 = x | true // newtype's base type is not fully determined; add an explicit type for 'x'
+}
+
+module B {
+  newtype int0 = y | true
+  const x: int0 := 0 // type for constant 'x' is 'int0', but its initialization value type is 'int'
+}
+
+module C {
+  type int0 = x | true // subset type's base type is not fully determined; add an explicit type for 'x'
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2303.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2303.dfy.expect
new file mode 100644
index 00000000000..c5208a01533
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2303.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-2303.dfy(5,10): Error: base type of newtype 'int0' is not fully determined; add an explicit type for bound variable 'x'
+git-issue-2303.dfy(10,8): Error: type for constant 'x' is 'int0', but its initialization value type is 'int'
+git-issue-2303.dfy(14,7): Error: base type of subset type 'int0' is not fully determined; add an explicit type for bound variable 'x'
+3 resolution/type errors detected in git-issue-2303.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2303.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2303.dfy.refresh.expect
new file mode 100644
index 00000000000..e42de930832
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2303.dfy.refresh.expect
@@ -0,0 +1,5 @@
+git-issue-2303.dfy(5,10): Error: base type of newtype 'int0' is not fully determined; add an explicit type for bound variable 'x'
+git-issue-2303.dfy(9,10): Error: base type of newtype 'int0' is not fully determined; add an explicit type for bound variable 'y'
+git-issue-2303.dfy(10,19): Error: integer literal used as if it had type int0
+git-issue-2303.dfy(14,7): Error: base type of subset type 'int0' is not fully determined; add an explicit type for bound variable 'x'
+4 resolution/type errors detected in git-issue-2303.dfy
diff --git a/Test/git-issues/git-issue-2307.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2307.dfy
similarity index 92%
rename from Test/git-issues/git-issue-2307.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2307.dfy
index 85ba1b14cd9..fc2b5f738a6 100644
--- a/Test/git-issues/git-issue-2307.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2307.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --allow-deprecation
+
 
 module A {
   newtype int0 = x: int | true
diff --git a/Test/git-issues/git-issue-2307.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2307.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2307.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2307.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2367.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2367.dfy
new file mode 100644
index 00000000000..211382411f3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2367.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+newtype IntSubset = i:int | true
+
+method Main() {
+  if 2 != (-6 as IntSubset % -4) as int {
+    print 1 / 0;
+  }
+  if -2 != (-6 as IntSubset / 4) as int {
+    print 1 / 0;
+  }
+}
diff --git a/Test/git-issues/git-issue-2903.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2367.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2903.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2367.dfy.expect
diff --git a/Test/git-issues/git-issue-2380.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2380.dfy
similarity index 89%
rename from Test/git-issues/git-issue-2380.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2380.dfy
index 3d024d29c20..2f779885596 100644
--- a/Test/git-issues/git-issue-2380.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2380.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 method M0(t: map<int, int>, k: int)
   requires k in t
diff --git a/Test/git-issues/git-issue-505.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2380.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-505.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2380.dfy.expect
diff --git a/Test/git-issues/git-issue-2384.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2384.dfy
similarity index 86%
rename from Test/git-issues/git-issue-2384.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2384.dfy
index 6dbbb411ce9..709b6ecd739 100644
--- a/Test/git-issues/git-issue-2384.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2384.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 trait T {
   method M()
diff --git a/Test/git-issues/git-issue-2384.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2384.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2384.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2384.dfy.expect
diff --git a/Test/git-issues/git-issue-2429.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2429.dfy
similarity index 95%
rename from Test/git-issues/git-issue-2429.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2429.dfy
index 8b8a604375c..3a31316a610 100644
--- a/Test/git-issues/git-issue-2429.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2429.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost predicate P<A>(s: seq<A>)
diff --git a/Test/vacid0/SparseArray.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2429.dfy.expect
similarity index 100%
rename from Test/vacid0/SparseArray.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2429.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2441.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2441.dfy
new file mode 100644
index 00000000000..e30ee45a60e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2441.dfy
@@ -0,0 +1,4 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+datatype A = A(B: B)
+datatype B = X
diff --git a/Test/git-issues/git-issue-314.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2441.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-314.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2441.dfy.expect
diff --git a/Test/git-issues/git-issue-2477.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2477.dfy
similarity index 90%
rename from Test/git-issues/git-issue-2477.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2477.dfy
index 76efd22a839..8226758b4e7 100644
--- a/Test/git-issues/git-issue-2477.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2477.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify --show-snippets:false --use-basename-for-filename --cores:2 --verification-time-limit:300 "%s" > "%t"
+// RUN: %exits-with 4 %baredafny verify --show-snippets:false --use-basename-for-filename --cores:2 --verification-time-limit:300 --resource-limit:5e6 "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait T {
diff --git a/Test/git-issues/git-issue-2477.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2477.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2477.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2477.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2496.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2496.dfy
new file mode 100644
index 00000000000..6eb68c5fcbb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2496.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method M() {
+  b1 :| true;
+}
diff --git a/Test/git-issues/git-issue-2496.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2496.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2496.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2496.dfy.expect
diff --git a/Test/git-issues/git-issue-2500.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2500.dfy
similarity index 90%
rename from Test/git-issues/git-issue-2500.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2500.dfy
index 6764811860f..b59730c4dd2 100644
--- a/Test/git-issues/git-issue-2500.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2500.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module M {
   trait {:termination false} Top {
@@ -31,7 +31,7 @@ class Cl extends M.Tr {
     ensures ActuallyTrue()
   { true }
   predicate ActuallyTrue''()
-     // This is logically correct, but the disguised receiver in the Tr spec prevents the override check from passing.
+     // This is logically correct. (Before CanCall, the disguised receiver in the Tr spec had prevented the override check from passing.)
      ensures ActuallyTrue''()
    { true }
   predicate Other(x: nat, free: M.Tr)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2500.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2500.dfy.expect
new file mode 100644
index 00000000000..6360ffa291f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2500.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-2500.dfy(21,12): Error: the function must provide an equal or more detailed postcondition than in its parent trait
+git-issue-2500.dfy(24,12): Error: the function must provide an equal or more detailed postcondition than in its parent trait
+git-issue-2500.dfy(37,12): Error: the function must provide an equal or more detailed postcondition than in its parent trait
+
+Dafny program verifier finished with 27 verified, 3 errors
diff --git a/Test/git-issues/git-issue-2506.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2506.dfy
similarity index 98%
rename from Test/git-issues/git-issue-2506.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2506.dfy
index e68cadcfb93..06f920d93a4 100755
--- a/Test/git-issues/git-issue-2506.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2506.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Class {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2506.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2506.dfy.expect
new file mode 100644
index 00000000000..3c62971e838
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2506.dfy.expect
@@ -0,0 +1,17 @@
+git-issue-2506.dfy(6,17): Error: const definition contains a cycle: T.a -> T.b -> T.a
+git-issue-2506.dfy(10,34): Error: a recursive call from a least predicate can go only to other least predicates
+git-issue-2506.dfy(13,49): Error: a least predicate can be called recursively only in positive positions
+git-issue-2506.dfy(15,45): Error: a least predicate is not allowed to declare any ensures clause
+git-issue-2506.dfy(27,17): Error: const definition contains a cycle: T.a -> T.b -> T.a
+git-issue-2506.dfy(31,34): Error: a recursive call from a least predicate can go only to other least predicates
+git-issue-2506.dfy(34,49): Error: a least predicate can be called recursively only in positive positions
+git-issue-2506.dfy(36,45): Error: a least predicate is not allowed to declare any ensures clause
+git-issue-2506.dfy(48,17): Error: const definition contains a cycle: T.a -> T.b -> T.a
+git-issue-2506.dfy(52,34): Error: a recursive call from a least predicate can go only to other least predicates
+git-issue-2506.dfy(55,49): Error: a least predicate can be called recursively only in positive positions
+git-issue-2506.dfy(57,45): Error: a least predicate is not allowed to declare any ensures clause
+git-issue-2506.dfy(69,17): Error: const definition contains a cycle: T.a -> T.b -> T.a
+git-issue-2506.dfy(73,34): Error: a recursive call from a least predicate can go only to other least predicates
+git-issue-2506.dfy(76,49): Error: a least predicate can be called recursively only in positive positions
+git-issue-2506.dfy(78,45): Error: a least predicate is not allowed to declare any ensures clause
+16 resolution/type errors detected in git-issue-2506.dfy
diff --git a/Test/git-issues/git-issue-2507.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2507.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2507.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2507.dfy
diff --git a/Test/git-issues/git-issue-2507.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2507.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2507.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2507.dfy.expect
diff --git a/Test/git-issues/git-issue-2510.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2510.dfy
similarity index 79%
rename from Test/git-issues/git-issue-2510.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2510.dfy
index 11ee2877bb3..9e3f4c14aca 100644
--- a/Test/git-issues/git-issue-2510.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2510.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 /// Check that the compiler accepts `:- assume {:axiom} …`.
 
diff --git a/Test/git-issues/git-issue-2510.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2510.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2510.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2510.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2510.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2510.dfy.rs.check
new file mode 100644
index 00000000000..ed0f1773816
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2510.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type\ variance\ Co\ not\ supported</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2511.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2511.dfy
similarity index 91%
rename from Test/git-issues/git-issue-2511.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2511.dfy
index e871c573a62..9476d417843 100644
--- a/Test/git-issues/git-issue-2511.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2511.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module WhileLoops {
   lemma false_lemma()
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2511.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2511.dfy.expect
new file mode 100644
index 00000000000..ff9d166d1d7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2511.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-2511.dfy(14,4): Error: assertion might not hold
+git-issue-2511.dfy(24,12): Error: decreases clause might not decrease
+git-issue-2511.dfy(51,11): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
+
+Dafny program verifier finished with 3 verified, 3 errors
diff --git a/Test/git-issues/git-issue-2550.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2550.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2550.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2550.dfy
diff --git a/Test/git-issues/git-issue-2550.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2550.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2550.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2550.dfy.expect
diff --git a/Test/git-issues/git-issue-256.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-256.dfy
similarity index 81%
rename from Test/git-issues/git-issue-256.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-256.dfy
index 3d2c5569840..bac48a55742 100644
--- a/Test/git-issues/git-issue-256.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-256.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module List {
   datatype t<A> = Nil | Cons(A, t<A>)
diff --git a/Test/git-issues/git-issue-256.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-256.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-256.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-256.dfy.expect
diff --git a/Test/git-issues/git-issue-258.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy
similarity index 95%
rename from Test/git-issues/git-issue-258.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy
index 9f85b1135fc..29c0de3ccb8 100644
--- a/Test/git-issues/git-issue-258.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy
@@ -1,5 +1,5 @@
 // NONUNIFORM: https://github.com/dafny-lang/dafny/issues/2582
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
+// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false
 
 method pr<T>(s: seq<T>) {
   print s, "\n";
diff --git a/Test/git-issues/git-issue-258.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-258.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.expect
diff --git a/Test/git-issues/git-issue-258.dfy.go.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.go.expect
similarity index 100%
rename from Test/git-issues/git-issue-258.dfy.go.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.go.expect
diff --git a/Test/git-issues/git-issue-258.dfy.js.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.js.expect
similarity index 100%
rename from Test/git-issues/git-issue-258.dfy.js.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.js.expect
diff --git a/Test/git-issues/git-issue-258.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.py.expect
similarity index 100%
rename from Test/git-issues/git-issue-258.dfy.py.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.py.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.rs.check
new file mode 100644
index 00000000000..3d586af71fb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-258.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0061]: this function takes 1 argument but 0 arguments were supplied
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2581.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2581.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2581.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2581.dfy
diff --git a/Test/git-issues/git-issue-374.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2581.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-374.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2581.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2581.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2581.dfy.rs.check
new file mode 100644
index 00000000000..bdbb19a602c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2581.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0369]: binary operation `==` cannot be applied to type `Sequence<_T>`
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2593.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2593.dfy
new file mode 100644
index 00000000000..f2011067c28
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2593.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+ghost predicate P(x: int)
+
+lemma L()
+  ensures forall y :: P(old(y))
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2593.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2593.dfy.expect
new file mode 100644
index 00000000000..bdd5deee7f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2593.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-2593.dfy(7,24): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
+git-issue-2593.dfy(7,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/git-issues/git-issue-2597-resolution.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-resolution.dfy
similarity index 96%
rename from Test/git-issues/git-issue-2597-resolution.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-resolution.dfy
index dc10abd7019..bb29ef8097f 100644
--- a/Test/git-issues/git-issue-2597-resolution.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-resolution.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class C {
diff --git a/Test/git-issues/git-issue-2597-resolution.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-resolution.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2597-resolution.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-resolution.dfy.expect
diff --git a/Test/git-issues/git-issue-2597-verification.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-verification.dfy
similarity index 97%
rename from Test/git-issues/git-issue-2597-verification.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-verification.dfy
index 11722bc9087..b5190628b47 100644
--- a/Test/git-issues/git-issue-2597-verification.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-verification.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   var data: int
diff --git a/Test/git-issues/git-issue-2597-verification.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-verification.dfy.expect
similarity index 87%
rename from Test/git-issues/git-issue-2597-verification.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-verification.dfy.expect
index dd65dc66106..f9d73be7133 100644
--- a/Test/git-issues/git-issue-2597-verification.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2597-verification.dfy.expect
@@ -6,9 +6,9 @@ git-issue-2597-verification.dfy(46,16): Error: a precondition for this call coul
 git-issue-2597-verification.dfy(8,18): Related location: this is the precondition that could not be proved
 git-issue-2597-verification.dfy(54,16): Error: a precondition for this call could not be proved
 git-issue-2597-verification.dfy(8,18): Related location: this is the precondition that could not be proved
-git-issue-2597-verification.dfy(61,11): Error: assertion could not be proved
-git-issue-2597-verification.dfy(77,27): Error: assertion could not be proved
-git-issue-2597-verification.dfy(84,32): Error: assertion could not be proved
+git-issue-2597-verification.dfy(61,4): Error: assertion might not hold
+git-issue-2597-verification.dfy(77,6): Error: assertion might not hold
+git-issue-2597-verification.dfy(84,6): Error: assertion might not hold
 git-issue-2597-verification.dfy(97,18): Error: a precondition for this call could not be proved
 git-issue-2597-verification.dfy(8,18): Related location: this is the precondition that could not be proved
 git-issue-2597-verification.dfy(111,20): Error: a precondition for this call could not be proved
diff --git a/Test/git-issues/git-issue-2605.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2605.dfy
similarity index 81%
rename from Test/git-issues/git-issue-2605.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2605.dfy
index a72dca5ad8f..7a42d37d0b4 100644
--- a/Test/git-issues/git-issue-2605.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2605.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /errorLimit:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --error-limit 0 "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method M(a: array<int>, j: int) {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2605.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2605.dfy.expect
new file mode 100644
index 00000000000..0cc8b0fab25
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2605.dfy.expect
@@ -0,0 +1,8 @@
+git-issue-2605.dfy(6,14): Error: possible division by zero
+git-issue-2605.dfy(6,23): Error: possible division by zero
+git-issue-2605.dfy(7,13): Error: index out of range
+git-issue-2605.dfy(7,21): Error: index out of range
+git-issue-2605.dfy(9,4): Error: assertion might not hold
+git-issue-2605.dfy(11,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 6 errors
diff --git a/Test/git-issues/git-issue-2608.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2608.dfy
similarity index 82%
rename from Test/git-issues/git-issue-2608.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2608.dfy
index c606177f94f..d81d5f8a792 100644
--- a/Test/git-issues/git-issue-2608.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2608.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method GetNext(i: int) returns (j: int, possible: bool) {
   if i == 1 {
diff --git a/Test/git-issues/git-issue-2608.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2608.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2608.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2608.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-261.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-261.dfy
new file mode 100644
index 00000000000..a4dc6909630
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-261.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+datatype Option<T> = None | Some(T)
+
+method Main() {
+  var x : Option<(nat, nat)> := Some((2,3));
+  var Some((a,b)) := x;
+  print a, " ", b, "\n";
+}
diff --git a/Test/git-issues/git-issue-261.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-261.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-261.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-261.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-261.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-261.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-261.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612.dfy
new file mode 100644
index 00000000000..ffe623c9f30
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+trait T {
+  ghost predicate {:opaque} True() { true }
+}
+
+class C extends T {}
diff --git a/Test/git-issues/git-issue-286.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-286.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612.dfy.expect
diff --git a/Test/git-issues/git-issue-2612b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612b.dfy
similarity index 78%
rename from Test/git-issues/git-issue-2612b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612b.dfy
index efdecdcfe9b..217e5588fa8 100644
--- a/Test/git-issues/git-issue-2612b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612b.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 trait T {
   opaque predicate True() { true }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612b.dfy.expect
new file mode 100644
index 00000000000..2623aaadd92
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2612b.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-2612b.dfy(11,2): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy
new file mode 100644
index 00000000000..0df5bf15aec
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy
@@ -0,0 +1,12 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4119
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+function tst(x: nat): nat {
+    x + 1
+}
+
+method Main() {
+  var f := tst;
+  print f, "\n";
+  print tst, "\n";
+}
diff --git a/Test/git-issues/git-issue-262.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-262.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.expect
diff --git a/Test/git-issues/git-issue-262.dfy.go.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.go.expect
similarity index 100%
rename from Test/git-issues/git-issue-262.dfy.go.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.go.expect
diff --git a/Test/git-issues/git-issue-262.dfy.java.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.java.expect
similarity index 100%
rename from Test/git-issues/git-issue-262.dfy.java.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.java.expect
diff --git a/Test/git-issues/git-issue-262.dfy.js.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.js.expect
similarity index 100%
rename from Test/git-issues/git-issue-262.dfy.js.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.js.expect
diff --git a/Test/git-issues/git-issue-262.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.py.expect
similarity index 100%
rename from Test/git-issues/git-issue-262.dfy.py.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.py.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.rs.check
new file mode 100644
index 00000000000..0cba51517cc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0369]: cannot add `DafnyInt` to `nat`
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-262.dfy.rs.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.rs.expect
similarity index 100%
rename from Test/git-issues/git-issue-262.dfy.rs.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-262.dfy.rs.expect
diff --git a/Test/git-issues/git-issue-2640.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2640.dfy
similarity index 97%
rename from Test/git-issues/git-issue-2640.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2640.dfy
index 0ccbab2c026..0c31191fefb 100644
--- a/Test/git-issues/git-issue-2640.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2640.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module {:options "/functionSyntax:4"} CompilableExpressions {
diff --git a/Test/git-issues/git-issue-2640.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2640.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2640.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2640.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2651.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2651.dfy
new file mode 100644
index 00000000000..2f1cc5b187e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2651.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+method z(x: string, y: string) {
+  var a: string := "abc";
+  var b: string := x + y;
+  assert a <= x ==> a < b; // SHOULD FAIL
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2651.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2651.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2651.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2651.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2657.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2657.dfy
new file mode 100644
index 00000000000..00348895181
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2657.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+lemma Lemma(x: int, p: multiset<int>)
+  requires x in p
+{}
+
+method Test() {
+  Lemma(1, multiset{});
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2657.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2657.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2657.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2657.dfy.expect
diff --git a/Test/git-issues/git-issue-267.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-267.dfy
similarity index 92%
rename from Test/git-issues/git-issue-267.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-267.dfy
index 2b0b3281589..5ed4c362172 100644
--- a/Test/git-issues/git-issue-267.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-267.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
     var c := 1;
diff --git a/Test/git-issues/git-issue-267.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-267.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-267.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-267.dfy.expect
diff --git a/Test/git-issues/git-issue-267.dfy.py.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-267.dfy.py.check
similarity index 100%
rename from Test/git-issues/git-issue-267.dfy.py.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-267.dfy.py.check
diff --git a/Test/git-issues/git-issue-2672.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2672.dfy
similarity index 97%
rename from Test/git-issues/git-issue-2672.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2672.dfy
index 52c5b9c638c..b5a789937ae 100644
--- a/Test/git-issues/git-issue-2672.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2672.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 newtype sreal = r: real | r > -4 as real
 newtype sint = r: int | r > -4 as int
diff --git a/Test/git-issues/git-issue-2672.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2672.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2672.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2672.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2672.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2672.dfy.rs.check
new file mode 100644
index 00000000000..a7107d30768
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2672.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error: `_` cannot be a raw identifier
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2690.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2690.dfy
similarity index 95%
rename from Test/git-issues/git-issue-2690.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2690.dfy
index 290f2f86d0d..b2d1e04ae8f 100644
--- a/Test/git-issues/git-issue-2690.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2690.dfy
@@ -20,5 +20,5 @@ method Main() {
   print "2 in seq? ", f(2),"\n";
   var g := InSeq2([1, 2]);
   print "2 in seq? ", g(2),"\n";
-  print "All right";
+  print "All right", "\n";
 }
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2690.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2690.dfy.expect
new file mode 100644
index 00000000000..bef49ef4325
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2690.dfy.expect
@@ -0,0 +1,12 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 3 verified, 0 errors
+2 in seq? true
+2 in seq? true
+All right
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier did not attempt verification
+2 in seq? true
+2 in seq? true
+All right
diff --git a/Test/git-issues/git-issue-2693.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2693.dfy
similarity index 96%
rename from Test/git-issues/git-issue-2693.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2693.dfy
index 0e2cbe09f85..605e64484d6 100644
--- a/Test/git-issues/git-issue-2693.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2693.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2693.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2693.dfy.expect
new file mode 100644
index 00000000000..03944411c2d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2693.dfy.expect
@@ -0,0 +1,8 @@
+git-issue-2693.dfy(10,10): Warning: Support for member 'PropagateFailure' in type 'EvenGood_OddBad?' (used indirectly via a :- statement) being a method is deprecated; declare it to be a function instead
+git-issue-2693.dfy(10,10): Warning: Support for member 'Extract' in type 'EvenGood_OddBad?' (used indirectly via a :- statement) being a method is deprecated; declare it to be a function instead
+git-issue-2693.dfy(10,10): Error: a postcondition could not be proved on this return path
+git-issue-2693.dfy(6,46): Related location: this is the postcondition that could not be proved
+git-issue-2693.dfy(21,12): Related location: this proposition could not be proved
+git-issue-2693.dfy(11,4): Error: assertion might not hold
+
+Dafny program verifier finished with 6 verified, 2 errors
diff --git a/Test/git-issues/git-issue-2703.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2703.dfy
similarity index 81%
rename from Test/git-issues/git-issue-2703.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2703.dfy
index c0004d71f6f..72bfa23fed7 100644
--- a/Test/git-issues/git-issue-2703.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2703.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 abstract module StillAsby {
   import A : Absy
diff --git a/Test/git-issues/git-issue-2703.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2703.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2703.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2703.dfy.expect
diff --git a/Test/git-issues/git-issue-2708.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2708.dfy
similarity index 82%
rename from Test/git-issues/git-issue-2708.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2708.dfy
index e1e10590955..46a31d993b3 100644
--- a/Test/git-issues/git-issue-2708.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2708.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 method Main() {
   Sequences();
diff --git a/Test/git-issues/git-issue-2708.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2708.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2708.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2708.dfy.expect
diff --git a/Test/git-issues/git-issue-2719.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2719.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2719.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2719.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2719.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2719.dfy.expect
new file mode 100644
index 00000000000..821c790f5ce
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2719.dfy.expect
@@ -0,0 +1,2 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+*** Error: file foobar.dll not found
diff --git a/Test/git-issues/git-issue-2726.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2726.dfy
similarity index 82%
rename from Test/git-issues/git-issue-2726.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2726.dfy
index be87be33b52..ff9cd3d4a65 100644
--- a/Test/git-issues/git-issue-2726.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2726.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:1 /compileTarget:cs "%s" > "%t"
+// RUN: %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Formula =
diff --git a/Test/git-issues/git-issue-3411.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2726.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3411.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2726.dfy.expect
diff --git a/Test/git-issues/git-issue-2726a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2726a.dfy
similarity index 83%
rename from Test/git-issues/git-issue-2726a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2726a.dfy
index a43d5dd0107..4eac3845919 100644
--- a/Test/git-issues/git-issue-2726a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2726a.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 const digits := ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
 
diff --git a/Test/git-issues/git-issue-2726a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2726a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2726a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2726a.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2733.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2733.dfy
new file mode 100644
index 00000000000..3cb4c39017b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2733.dfy
@@ -0,0 +1,5 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+method Main() {
+  print "XYZ"; // Checks that no extra newline is added to the output
+}
diff --git a/Test/git-issues/git-issue-2733.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2733.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2733.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2733.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-274.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-274.dfy
new file mode 100644
index 00000000000..abe0dc6cec2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-274.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module P {
+  type M
+}
+
+module N2 {
+  import opened M = P
+  trait T {
+      var m: M.M
+  }
+}
+
diff --git a/Test/git-issues/git-issue-2885.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-274.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2885.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-274.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2747.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2747.dfy
new file mode 100644
index 00000000000..69ad728a878
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2747.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s" -- --allow-warnings
+
+
+ghost function AnotherBrokenFunction(): nat {
+  var y := 0;
+  assert true by {
+    if
+    case x: bool :| true =>
+      assert true || x;
+  }
+  0
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2747.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2747.dfy.expect
new file mode 100644
index 00000000000..f68c94f5409
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2747.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-2747.dfy(8,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/git-issues/git-issue-2748.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2748.dfy
similarity index 91%
rename from Test/git-issues/git-issue-2748.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2748.dfy
index f13859320db..b99864ba3ea 100644
--- a/Test/git-issues/git-issue-2748.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2748.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 function f(x: int): int { 10 - x * x }
diff --git a/Test/git-issues/git-issue-659.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2748.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-659.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2748.dfy.expect
diff --git a/Test/git-issues/git-issue-2752.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2752.dfy
similarity index 79%
rename from Test/git-issues/git-issue-2752.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2752.dfy
index 9dd7a0a02fa..045ace4f294 100644
--- a/Test/git-issues/git-issue-2752.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2752.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 type Empty = x: object | false witness *
 type EmptyQ = x: object? | false witness *
diff --git a/Test/git-issues/git-issue-2752.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2752.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2752.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2752.dfy.expect
diff --git a/Test/git-issues/git-issue-276.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276.dfy
similarity index 94%
rename from Test/git-issues/git-issue-276.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276.dfy
index c369297ee36..075e8a2b78f 100644
--- a/Test/git-issues/git-issue-276.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /printTooltips "%s" > "%t"
+// RUN: %exits-with 4 %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Main {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276.dfy.expect
new file mode 100644
index 00000000000..966652fd779
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276.dfy.expect
@@ -0,0 +1,22 @@
+git-issue-276.dfy(7,10): Info: newtype byte resolves as target-complete {:nativeType "byte"} (detected range: 0 .. 256)
+git-issue-276.dfy(8,10): Info: newtype b0 resolves as {:nativeType "ushort"} (detected range: 0 .. 2560)
+git-issue-276.dfy(9,10): Info: newtype b1 resolves as {:nativeType "byte"} (detected range: 0 .. 5)
+git-issue-276.dfy(10,10): Info: newtype b2 resolves as {:nativeType "byte"} (detected range: 0 .. 10)
+git-issue-276.dfy(11,10): Info: newtype b3 resolves as {:nativeType "byte"} (detected range: 0 .. 5)
+git-issue-276.dfy(12,10): Info: newtype b3a resolves as {:nativeType "byte"} (detected range: 0 .. 5)
+git-issue-276.dfy(13,10): Info: newtype b4 resolves as {:nativeType "byte"} (detected range: 0 .. 7)
+git-issue-276.dfy(14,10): Info: newtype b4a resolves as {:nativeType "byte"} (detected range: 0 .. 7)
+git-issue-276.dfy(15,10): Info: newtype b5 resolves as {:nativeType "byte"} (detected range: 0 .. 42)
+git-issue-276.dfy(16,10): Info: newtype b6 resolves as {:nativeType "byte"} (detected range: 0 .. 20)
+git-issue-276.dfy(17,10): Info: newtype b7 resolves as {:nativeType "byte"} (detected range: 0 .. 42)
+git-issue-276.dfy(18,10): Info: newtype b8 resolves as {:nativeType "byte"} (detected range: 0 .. 20)
+git-issue-276.dfy(19,10): Info: newtype b9 resolves as {:nativeType "byte"} (detected range: 0 .. 42)
+git-issue-276.dfy(20,10): Info: newtype ba resolves as {:nativeType "byte"} (detected range: 0 .. 20)
+git-issue-276.dfy(21,10): Info: newtype b3b resolves as {:nativeType "byte"} (detected range: 0 .. 6)
+git-issue-276.dfy(22,10): Info: newtype b4b resolves as {:nativeType "byte"} (detected range: 0 .. 10)
+git-issue-276.dfy(38,10): Info: newtype cx resolves as {:nativeType "byte"} (detected range: 0 .. 4)
+git-issue-276.dfy(25,17): Error: result of operation might violate newtype constraint for 'byte'
+git-issue-276.dfy(29,18): Error: result of operation might violate newtype constraint for 'b2'
+git-issue-276.dfy(32,18): Error: result of operation might violate newtype constraint for 'b3'
+
+Dafny program verifier finished with 18 verified, 3 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276a.dfy
new file mode 100644
index 00000000000..2d076023f54
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276a.dfy
@@ -0,0 +1,77 @@
+// RUN: %exits-with 4 %verify --show-hints "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Main {
+  newtype b1 = x | 0 <= x < 3/(2-2)
+  newtype b2 = x | 0 <= x < 3%(2-2)
+  newtype b3 = x | 0 <= x < (3.0/(2.0-2.0)) as int
+  newtype b4 = x | 0 <= x < 1.5 as int
+  newtype b5 = x | 0 <= x < 1000.0 as bv8 as int
+  newtype b6 = x | 0 <= x < 100.5 as bv8 as int
+  newtype b8 = x | 0 <= x < 1000 as bv8 as int
+  newtype b9 = x | 0 <= x < 1000 as bv16 as bv8 as int
+  newtype b10 = x | 0 <= x < -1 as int as char as int
+  newtype b11 = x | 0 <= x < -1 as real as char as int
+  newtype b12 = x | 0 <= x < 1.5 as real as char as int
+  newtype b13 = x | 0 <= x < 'c' as bv2 as int
+  newtype b14 = x | 0 <= x < 0xffffff as bv32 as char as int
+  newtype b15 = x | 0 <= x < ((10 as bv8)/(0 as bv8)) as int
+  newtype b16 = x | 0 <= x < ((10 as bv8)%(0 as bv8)) as int
+  newtype b17 = x | 0 <= x < (10 as bv8 << -1) as int
+  newtype b18 = x | 0 <= x < (10 as bv8 >> -1) as int
+
+  newtype c0 = x | 0 <= x < 100
+  class Default {
+    static const cc1: c0 := 50
+  }
+  newtype c1 = x | 0 <= x < 50 as c0 // not constant-folded
+  newtype c2 = x: int | 0 <= x < Default.cc1 as int // evaluated
+
+  newtype c3 = x | 0 <= x < "abcde"[6] as int
+}
+
+module Regression {
+  newtype GoodUint32 = i: int | 0 <= i <
+    if "abcrimini"[2 + 1 - 1] == 'c' then
+      0x1_0000_0000 + 1 - 1
+    else
+      3
+
+  // Regression test: The following once crashed, because it had expected
+  // the SeqSelect index to really be a folded integer
+  newtype NotUint32 = i: int | 0 <= i <
+    if "abcrimini"[2 + 1 - 1 + k] == 'c' then
+      0x1_0000_0000 + 1 - 1
+    else
+      3
+
+  const k: int
+}
+
+module MoreTests {
+  const bv: bv19 := 203
+
+  newtype EmptyFitsIntoUint8 = i: int |
+    -0x8000_0000 <= i < if !true then 128 else -0x1_0000_0000 // empty range
+    witness *
+
+  newtype int8 = i: int |
+    -128 <= i < if !true then -200 else 128
+
+  newtype AnotherInt8 = i: int |
+    -128 <= i < if true ==> bv == 203 then 128 else -200
+
+  newtype Int16 = i: int |
+    -128 <= i < if true ==> bv == 204 then 128 else 1234
+}
+
+module NotJustInequalityConstraints {
+  newtype Just7 = x: int | 0 <= x < 256 && x == 7 witness 7 // 7..8
+  newtype Just8 = x: int | x == 8 && x == 8 witness 8 // 8..9
+  newtype Also8 = x: int | 8 == x && x < 10 && x < 100 && -2 <= x witness 8 // 8..9
+  newtype Small = x: int | x < 10 && x < 100 && -2 <= x witness 8 // -2..10
+  newtype Only8ButDoesNotDetectCompleteRange = x: int | x == 8 && true witness 8 // 8..9
+  newtype Empty = x: int | 8 == x == 7 && 0 <= x < 256 witness * // empty
+  newtype Byte = x: int | x in {2, 3, 5} witness 3
+  newtype ByteWithKnownRange = x: int | x in {2, 3, 5} && 2 <= x <= 5 witness 3 // 2..6
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276a.dfy.expect
new file mode 100644
index 00000000000..94c26df0806
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276a.dfy.expect
@@ -0,0 +1,54 @@
+git-issue-276a.dfy(23,10): Info: newtype c0 resolves as {:nativeType "byte"} (detected range: 0 .. 100)
+git-issue-276a.dfy(27,10): Info: newtype c1 resolves as {:nativeType "byte"} (detected range: 0 .. 100)
+git-issue-276a.dfy(28,10): Info: newtype c2 resolves as {:nativeType "byte"} (detected range: 0 .. 50)
+git-issue-276a.dfy(34,10): Info: newtype GoodUint32 resolves as target-complete {:nativeType "uint"} (detected range: 0 .. 4294967296)
+git-issue-276a.dfy(54,10): Info: newtype EmptyFitsIntoUint8 resolves as {:nativeType "byte"} (detected range: empty)
+git-issue-276a.dfy(58,10): Info: newtype int8 resolves as target-complete {:nativeType "sbyte"} (detected range: -128 .. 128)
+git-issue-276a.dfy(61,10): Info: newtype AnotherInt8 resolves as target-complete {:nativeType "sbyte"} (detected range: -128 .. 128)
+git-issue-276a.dfy(64,10): Info: newtype Int16 resolves as {:nativeType "short"} (detected range: -128 .. 1234)
+git-issue-276a.dfy(69,10): Info: newtype Just7 resolves as {:nativeType "byte"} (detected range: 7 .. 8)
+git-issue-276a.dfy(70,10): Info: newtype Just8 resolves as {:nativeType "byte"} (detected range: 8 .. 9)
+git-issue-276a.dfy(71,10): Info: newtype Also8 resolves as {:nativeType "byte"} (detected range: 8 .. 9)
+git-issue-276a.dfy(72,10): Info: newtype Small resolves as {:nativeType "sbyte"} (detected range: -2 .. 10)
+git-issue-276a.dfy(73,10): Info: newtype Only8ButDoesNotDetectCompleteRange resolves as {:nativeType "byte"} (detected range: 8 .. 9)
+git-issue-276a.dfy(74,10): Info: newtype Empty resolves as {:nativeType "byte"} (detected range: empty)
+git-issue-276a.dfy(76,10): Info: newtype ByteWithKnownRange resolves as {:nativeType "byte"} (detected range: 2 .. 6)
+git-issue-276a.dfy(5,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+git-issue-276a.dfy(5,26): Related location: this proposition could not be proved
+git-issue-276a.dfy(5,29): Error: possible division by zero
+git-issue-276a.dfy(6,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+git-issue-276a.dfy(6,26): Related location: this proposition could not be proved
+git-issue-276a.dfy(6,29): Error: possible division by zero
+git-issue-276a.dfy(7,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+git-issue-276a.dfy(7,26): Related location: this proposition could not be proved
+git-issue-276a.dfy(7,32): Error: possible division by zero
+git-issue-276a.dfy(8,32): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
+git-issue-276a.dfy(9,35): Error: value to be converted might not fit in bv8
+git-issue-276a.dfy(10,34): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
+git-issue-276a.dfy(11,33): Error: value to be converted might not fit in bv8
+git-issue-276a.dfy(12,41): Error: value to be converted might not fit in bv8
+git-issue-276a.dfy(13,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+git-issue-276a.dfy(13,27): Related location: this proposition could not be proved
+git-issue-276a.dfy(13,39): Error: value to be converted might not fit in char
+git-issue-276a.dfy(14,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+git-issue-276a.dfy(14,27): Related location: this proposition could not be proved
+git-issue-276a.dfy(14,40): Error: real value to be converted might not fit in char
+git-issue-276a.dfy(15,41): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
+git-issue-276a.dfy(16,33): Error: value to be converted might not fit in bv2
+git-issue-276a.dfy(17,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+git-issue-276a.dfy(17,27): Related location: this proposition could not be proved
+git-issue-276a.dfy(17,46): Error: bit-vector value to be converted might not fit in char
+git-issue-276a.dfy(18,41): Error: possible division by zero
+git-issue-276a.dfy(19,41): Error: possible division by zero
+git-issue-276a.dfy(20,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+git-issue-276a.dfy(20,27): Related location: this proposition could not be proved
+git-issue-276a.dfy(20,40): Error: shift amount must be non-negative
+git-issue-276a.dfy(21,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+git-issue-276a.dfy(21,27): Related location: this proposition could not be proved
+git-issue-276a.dfy(21,40): Error: shift amount must be non-negative
+git-issue-276a.dfy(30,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+git-issue-276a.dfy(30,26): Related location: this proposition could not be proved
+git-issue-276a.dfy(30,35): Error: index out of range
+git-issue-276a.dfy(43,18): Error: index out of range
+
+Dafny program verifier finished with 15 verified, 28 errors
diff --git a/Test/git-issues/git-issue-276b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276b.dfy
similarity index 93%
rename from Test/git-issues/git-issue-276b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276b.dfy
index cfb7f7e9776..e39d13c5987 100644
--- a/Test/git-issues/git-issue-276b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276b.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Testing constant folding of bool operations
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276b.dfy.expect
new file mode 100644
index 00000000000..80e07c3f25f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276b.dfy.expect
@@ -0,0 +1,12 @@
+git-issue-276b.dfy(6,10): Info: newtype b0 resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276b.dfy(7,10): Info: newtype b1 resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276b.dfy(8,10): Info: newtype b2 resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276b.dfy(9,10): Info: newtype b3 resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276b.dfy(10,10): Info: newtype b4 resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276b.dfy(11,10): Info: newtype b5 resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276b.dfy(12,10): Info: newtype b6 resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276b.dfy(13,10): Info: newtype b7 resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276b.dfy(14,10): Info: newtype b8 resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276b.dfy(15,10): Info: newtype b9 resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+
+Dafny program verifier finished with 10 verified, 0 errors
diff --git a/Test/git-issues/git-issue-276c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276c.dfy
similarity index 95%
rename from Test/git-issues/git-issue-276c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276c.dfy
index c3dd8768d06..2aceb330ce0 100644
--- a/Test/git-issues/git-issue-276c.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276c.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Testing constant folding of char, string operations
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276c.dfy.expect
new file mode 100644
index 00000000000..f91383ad20f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276c.dfy.expect
@@ -0,0 +1,19 @@
+git-issue-276c.dfy(8,10): Info: newtype b0 resolves as {:nativeType "byte"} (detected range: 0 .. 10)
+git-issue-276c.dfy(9,10): Info: newtype b1 resolves as {:nativeType "byte"} (detected range: 0 .. 101)
+git-issue-276c.dfy(10,10): Info: newtype b2 resolves as {:nativeType "byte"} (detected range: 0 .. 101)
+git-issue-276c.dfy(11,10): Info: newtype b3 resolves as {:nativeType "byte"} (detected range: 0 .. 20)
+git-issue-276c.dfy(12,10): Info: newtype b4 resolves as {:nativeType "byte"} (detected range: 0 .. 200)
+git-issue-276c.dfy(13,10): Info: newtype b5 resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276c.dfy(14,10): Info: newtype b6 resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276c.dfy(15,10): Info: newtype b7 resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276c.dfy(16,10): Info: newtype b8 resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276c.dfy(17,10): Info: newtype b9 resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276c.dfy(18,10): Info: newtype ba resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276c.dfy(19,10): Info: newtype bb resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276c.dfy(20,10): Info: newtype bc resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276c.dfy(21,10): Info: newtype bd resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276c.dfy(22,10): Info: newtype be resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276c.dfy(23,10): Info: newtype bf resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276c.dfy(24,10): Info: newtype bg resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+
+Dafny program verifier finished with 18 verified, 0 errors
diff --git a/Test/git-issues/git-issue-276r.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276r.dfy
similarity index 94%
rename from Test/git-issues/git-issue-276r.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276r.dfy
index 52656969ad3..50ee627c41c 100644
--- a/Test/git-issues/git-issue-276r.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276r.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Testing constant folding of real operations
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276r.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276r.dfy.expect
new file mode 100644
index 00000000000..f299e125052
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276r.dfy.expect
@@ -0,0 +1,18 @@
+git-issue-276r.dfy(6,10): Info: newtype b0 resolves as {:nativeType "byte"} (detected range: 0 .. 5)
+git-issue-276r.dfy(7,10): Info: newtype b1 resolves as {:nativeType "byte"} (detected range: 0 .. 1)
+git-issue-276r.dfy(8,10): Info: newtype b2 resolves as {:nativeType "byte"} (detected range: 0 .. 6)
+git-issue-276r.dfy(10,10): Info: newtype b4 resolves as {:nativeType "byte"} (detected range: 0 .. 2)
+git-issue-276r.dfy(11,10): Info: newtype b5 resolves as {:nativeType "ushort"} (detected range: 0 .. 1000)
+git-issue-276r.dfy(12,10): Info: newtype b6 resolves as {:nativeType "byte"} (detected range: 0 .. 99)
+git-issue-276r.dfy(13,10): Info: newtype b7 resolves as {:nativeType "ushort"} (detected range: 0 .. 2000)
+git-issue-276r.dfy(14,10): Info: newtype b8 resolves as {:nativeType "byte"} (detected range: 0 .. 20)
+git-issue-276r.dfy(15,10): Info: newtype b9 resolves as {:nativeType "byte"} (detected range: 0 .. 20)
+git-issue-276r.dfy(16,10): Info: newtype b10 resolves as {:nativeType "byte"} (detected range: 0 .. 30)
+git-issue-276r.dfy(17,10): Info: newtype b11 resolves as {:nativeType "byte"} (detected range: 0 .. 35)
+git-issue-276r.dfy(18,10): Info: newtype b12 resolves as {:nativeType "byte"} (detected range: 0 .. 35)
+git-issue-276r.dfy(19,10): Info: newtype b13 resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276r.dfy(20,10): Info: newtype b14 resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276r.dfy(21,10): Info: newtype b15 resolves as {:nativeType "byte"} (detected range: 0 .. 40)
+git-issue-276r.dfy(22,10): Info: newtype b16 resolves as {:nativeType "byte"} (detected range: 0 .. 35)
+
+Dafny program verifier finished with 17 verified, 0 errors
diff --git a/Test/git-issues/git-issue-276v.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276v.dfy
similarity index 94%
rename from Test/git-issues/git-issue-276v.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276v.dfy
index 164d9625fd6..05e1dccf688 100644
--- a/Test/git-issues/git-issue-276v.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276v.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Testing constant folding of bit-vector operations
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276v.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276v.dfy.expect
new file mode 100644
index 00000000000..d79e1fbf890
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-276v.dfy.expect
@@ -0,0 +1,20 @@
+git-issue-276v.dfy(8,10): Info: newtype b0 resolves as {:nativeType "byte"} (detected range: 0 .. 57)
+git-issue-276v.dfy(9,10): Info: newtype b1 resolves as {:nativeType "byte"} (detected range: 0 .. 239)
+git-issue-276v.dfy(10,10): Info: newtype b2 resolves as {:nativeType "byte"} (detected range: 0 .. 228)
+git-issue-276v.dfy(11,10): Info: newtype b3 resolves as {:nativeType "byte"} (detected range: 0 .. 1)
+git-issue-276v.dfy(12,10): Info: newtype b4 resolves as {:nativeType "byte"} (detected range: 0 .. 17)
+git-issue-276v.dfy(13,10): Info: newtype b5 resolves as {:nativeType "byte"} (detected range: 0 .. 17)
+git-issue-276v.dfy(14,10): Info: newtype b6 resolves as {:nativeType "byte"} (detected range: 0 .. 4)
+git-issue-276v.dfy(15,10): Info: newtype b7 resolves as {:nativeType "byte"} (detected range: 0 .. 49)
+git-issue-276v.dfy(16,10): Info: newtype b8 resolves as {:nativeType "byte"} (detected range: 0 .. 53)
+git-issue-276v.dfy(17,10): Info: newtype b9 resolves as {:nativeType "byte"} (detected range: 0 .. 235)
+git-issue-276v.dfy(18,10): Info: newtype ba resolves as {:nativeType "byte"} (detected range: 0 .. 24)
+git-issue-276v.dfy(19,10): Info: newtype bb resolves as {:nativeType "byte"} (detected range: 0 .. 24)
+git-issue-276v.dfy(20,10): Info: newtype bc resolves as {:nativeType "byte"} (detected range: 0 .. 56)
+git-issue-276v.dfy(21,10): Info: newtype bd resolves as {:nativeType "byte"} (detected range: 0 .. 56)
+git-issue-276v.dfy(22,10): Info: newtype be resolves as {:nativeType "byte"} (detected range: 0 .. 56)
+git-issue-276v.dfy(23,10): Info: newtype bf resolves as {:nativeType "byte"} (detected range: 0 .. 24)
+git-issue-276v.dfy(24,10): Info: newtype bg resolves as {:nativeType "byte"} (detected range: 0 .. 64)
+git-issue-276v.dfy(25,10): Info: newtype bh resolves as {:nativeType "byte"} (detected range: 0 .. 18)
+
+Dafny program verifier finished with 18 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-277.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-277.dfy
new file mode 100644
index 00000000000..95d47dfe139
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-277.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 2 %dafny /compile:3 /optimize "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method m(a : array<int>) {
+	assert a[..true] == a[..true];
+}
diff --git a/Test/git-issues/git-issue-277.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-277.dfy.expect
similarity index 77%
rename from Test/git-issues/git-issue-277.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-277.dfy.expect
index d02120ea36a..3c3d0792827 100644
--- a/Test/git-issues/git-issue-277.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-277.dfy.expect
@@ -1,3 +1,4 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 git-issue-277.dfy(5,12): Error: wrong number of indices for multi-selection
 git-issue-277.dfy(5,25): Error: wrong number of indices for multi-selection
 git-issue-277.dfy(5,12): Error: incorrect type for selection into array<int> (got bool)
diff --git a/Test/git-issues/git-issue-2792.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2792.dfy
similarity index 81%
rename from Test/git-issues/git-issue-2792.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2792.dfy
index d2fb9db2055..7d7dcfd090c 100644
--- a/Test/git-issues/git-issue-2792.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2792.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype Wrapper<T> = Wrapper(s: seq<T>)
 {
diff --git a/Test/git-issues/git-issue-2792.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2792.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2792.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2792.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2792.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2792.dfy.rs.check
new file mode 100644
index 00000000000..c6d479b2997
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2792.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Static\ functions\ with\ type\ arguments</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2813.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2813.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2813.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2813.dfy
diff --git a/Test/git-issues/git-issue-2827a/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827a/.gitignore
similarity index 100%
rename from Test/git-issues/git-issue-2827a/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827a/.gitignore
diff --git a/Test/git-issues/git-issue-2827a/A.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827a/A.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2827a/A.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827a/A.dfy
diff --git a/Test/git-issues/git-issue-2827a/A.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827a/A.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2827a/A.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827a/A.dfy.expect
diff --git a/Test/git-issues/git-issue-2827b/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827b/.gitignore
similarity index 100%
rename from Test/git-issues/git-issue-2827b/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827b/.gitignore
diff --git a/Test/git-issues/git-issue-2827b/B.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827b/B.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2827b/B.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827b/B.dfy
diff --git a/Test/git-issues/git-issue-2827b/B.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827b/B.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2827b/B.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827b/B.dfy.expect
diff --git a/Test/git-issues/git-issue-2827b/org/D.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827b/org/D.java
similarity index 100%
rename from Test/git-issues/git-issue-2827b/org/D.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827b/org/D.java
diff --git a/Test/git-issues/git-issue-2827c/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827c/.gitignore
similarity index 100%
rename from Test/git-issues/git-issue-2827c/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827c/.gitignore
diff --git a/Test/git-issues/git-issue-2827c/A.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827c/A.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2827c/A.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827c/A.dfy
diff --git a/Test/git-issues/git-issue-2827c/A.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827c/A.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2827c/A.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827c/A.dfy.expect
diff --git a/Test/git-issues/git-issue-2827d/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827d/.gitignore
similarity index 100%
rename from Test/git-issues/git-issue-2827d/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827d/.gitignore
diff --git a/Test/git-issues/git-issue-2827d/A.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827d/A.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2827d/A.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827d/A.dfy
diff --git a/Test/git-issues/git-issue-2827d/A.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827d/A.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2827d/A.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2827d/A.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2828.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2828.dfy
new file mode 100644
index 00000000000..4a2e392af5c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2828.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 2 %build "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method M()
+{
+  assert arr[0];
+}
diff --git a/Test/git-issues/git-issue-2828.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2828.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2828.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2828.dfy.expect
diff --git a/Test/git-issues/git-issue-2829.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829.dfy
similarity index 97%
rename from Test/git-issues/git-issue-2829.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829.dfy
index 56dd1979bcd..3d624e30c15 100644
--- a/Test/git-issues/git-issue-2829.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Either<+L, +R> = Left(l: L) | Right(r: R)
diff --git a/Test/git-issues/git-issue-2829.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829.dfy.expect
similarity index 86%
rename from Test/git-issues/git-issue-2829.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829.dfy.expect
index e0dacc8644a..c3f63c571f5 100644
--- a/Test/git-issues/git-issue-2829.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829.dfy.expect
@@ -2,6 +2,6 @@ git-issue-2829.dfy(52,38): Error: second argument to "in" must be a set, multise
 git-issue-2829.dfy(53,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got A)
 git-issue-2829.dfy(53,15): Error: arguments must have comparable types (got string and A)
 git-issue-2829.dfy(54,16): Error: arguments must have comparable types (got seq<A> and seq<string>)
-git-issue-2829.dfy(56,18): Error: incorrect argument type at index 2 for function parameter 'input' (expected string, found A)
-git-issue-2829.dfy(56,18): Error: incorrect argument type at index 3 for function parameter 'output' (expected seq<A>, found seq<string>) (covariant type parameter would require string <: A)
+git-issue-2829.dfy(56,31): Error: incorrect argument type at index 2 for function parameter 'input' (expected string, found A)
+git-issue-2829.dfy(56,37): Error: incorrect argument type at index 3 for function parameter 'output' (expected seq<A>, found seq<string>) (covariant type parameter would require string <: A)
 6 resolution/type errors detected in git-issue-2829.dfy
diff --git a/Test/git-issues/git-issue-2829b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829b.dfy
similarity index 90%
rename from Test/git-issues/git-issue-2829b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829b.dfy
index f36ba4d9e74..9420f00e161 100644
--- a/Test/git-issues/git-issue-2829b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829b.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 type IntSeq = seq<int>
diff --git a/Test/git-issues/git-issue-327a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-327a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2829b.dfy.expect
diff --git a/Test/git-issues/git-issue-283.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283.dfy
similarity index 100%
rename from Test/git-issues/git-issue-283.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283.dfy
diff --git a/Test/git-issues/git-issue-283.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-283.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2830.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2830.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2830.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2830.dfy
diff --git a/Test/git-issues/git-issue-2830.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2830.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2830.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2830.dfy.expect
diff --git a/Test/git-issues/git-issue-283a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283a.dfy
similarity index 94%
rename from Test/git-issues/git-issue-283a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283a.dfy
index b37ff731931..1aa3ed63e8e 100644
--- a/Test/git-issues/git-issue-283a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283a.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Result<T> =
diff --git a/Test/git-issues/git-issue-283a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-283a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283a.dfy.expect
diff --git a/Test/git-issues/git-issue-283b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283b.dfy
similarity index 86%
rename from Test/git-issues/git-issue-283b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283b.dfy
index dee6419e7f9..7360ff43c40 100644
--- a/Test/git-issues/git-issue-283b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283b.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 datatype Result<T> =
   | Success(value: T)
diff --git a/Test/git-issues/git-issue-283b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-283b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283b.dfy.expect
diff --git a/Test/git-issues/git-issue-283c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283c.dfy
similarity index 88%
rename from Test/git-issues/git-issue-283c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283c.dfy
index 794e84bd36f..6e8d08c6ac3 100644
--- a/Test/git-issues/git-issue-283c.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283c.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 datatype Result<T> =
   | Success(value: T)
diff --git a/Test/git-issues/git-issue-283c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283c.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-283c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283c.dfy.expect
diff --git a/Test/git-issues/git-issue-283d.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283d.dfy
similarity index 91%
rename from Test/git-issues/git-issue-283d.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283d.dfy
index 46c1056d5e1..ba11586a92f 100644
--- a/Test/git-issues/git-issue-283d.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283d.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype Foo = R(v: int)
 
diff --git a/Test/git-issues/git-issue-588.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283d.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-588.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283d.dfy.expect
diff --git a/Test/git-issues/git-issue-283e.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283e.dfy
similarity index 87%
rename from Test/git-issues/git-issue-283e.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283e.dfy
index 11178299ae9..9a4102daf01 100644
--- a/Test/git-issues/git-issue-283e.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283e.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Foo = R(v: int)
diff --git a/Test/git-issues/git-issue-283e.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283e.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-283e.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283e.dfy.expect
diff --git a/Test/git-issues/git-issue-283f.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283f.dfy
similarity index 88%
rename from Test/git-issues/git-issue-283f.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283f.dfy
index 9155b73b4f4..4f787c7bd7e 100644
--- a/Test/git-issues/git-issue-283f.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283f.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 datatype D = Nil | MM | D(x: int, tail: D)
 
diff --git a/Test/git-issues/git-issue-283f.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283f.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-283f.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283f.dfy.expect
diff --git a/Test/git-issues/git-issue-283g.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283g.dfy
similarity index 96%
rename from Test/git-issues/git-issue-283g.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283g.dfy
index 4dd70837d9e..49222e1942b 100644
--- a/Test/git-issues/git-issue-283g.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283g.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Result<T> =
diff --git a/Test/git-issues/git-issue-283g.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283g.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-283g.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-283g.dfy.expect
diff --git a/Test/git-issues/git-issue-2843.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2843.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2843.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2843.dfy
diff --git a/Test/git-issues/git-issue-2843.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2843.dfy.expect
similarity index 92%
rename from Test/git-issues/git-issue-2843.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2843.dfy.expect
index 5b97a774f1b..4fb686a4137 100644
--- a/Test/git-issues/git-issue-2843.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2843.dfy.expect
@@ -1,3 +1,4 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
 git-issue-2843.dfy(14,7): Error: a function with ghost parameters can be used as a value only in specification contexts
 git-issue-2843.dfy(20,7): Error: a ghost function is allowed only in specification contexts
 git-issue-2843.dfy(33,8): Error: ghost variables such as f are allowed only in specification contexts. f was inferred to be ghost based on its declaration or initialization.
diff --git a/Test/git-issues/git-issue-2852.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2852.dfy
similarity index 75%
rename from Test/git-issues/git-issue-2852.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2852.dfy
index 1879c7e211a..9c5fae3f1b5 100644
--- a/Test/git-issues/git-issue-2852.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2852.dfy
@@ -1,5 +1,6 @@
-// RUN: %dafny -compile:3 -compileTarget:cs "%s" > "%t"
-// RUN: %dafny -noVerify -compile:4 -compileTarget:js "%s" >> "%t"
+// NONUNIFORM: regression test
+// RUN: %run --target cs "%s" > "%t"
+// RUN: %run --no-verify --target js "%s" >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Returns a function that computes the sum of n consecutive integers starting at pos
diff --git a/Test/git-issues/git-issue-2852.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2852.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2852.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2852.dfy.expect
diff --git a/Test/git-issues/git-issue-286.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-286.dfy
similarity index 79%
rename from Test/git-issues/git-issue-286.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-286.dfy
index 3add7503784..e6541a95162 100644
--- a/Test/git-issues/git-issue-286.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-286.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype Option<T> = None | Some(t:T)
 
diff --git a/Test/git-issues/git-issue-3288a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-286.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3288a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-286.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2878.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2878.dfy
new file mode 100644
index 00000000000..99d8039ff48
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2878.dfy
@@ -0,0 +1,6 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+method test() returns (a: bool, b: int) {
+  return (true, 0);
+}
diff --git a/Test/git-issues/git-issue-2878.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2878.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2878.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2878.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-288.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-288.dfy
new file mode 100644
index 00000000000..8a3e6224e0c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-288.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module A {
+  type T = int
+}
+
+module B refines A {
+  type T = int
+}
diff --git a/Test/git-issues/git-issue-288.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-288.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-288.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-288.dfy.expect
diff --git a/Test/git-issues/git-issue-2883.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2883.dfy
similarity index 87%
rename from Test/git-issues/git-issue-2883.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2883.dfy
index 0d06e1ed548..eaea41a50c6 100644
--- a/Test/git-issues/git-issue-2883.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2883.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 type MyArray = array<int>
 type MyMatrix = m: array2<int> | m.Length0 == m.Length1 witness *
diff --git a/Test/git-issues/git-issue-336.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2883.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-336.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2883.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2885.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2885.dfy
new file mode 100644
index 00000000000..67094855884
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2885.dfy
@@ -0,0 +1,8 @@
+// RUN: %build "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype KeyValues<T> = Store(underlying: map<string, T> := map[])
+
+function CreateStore<T>(): (r: KeyValues<T>) {
+  Store()
+}
diff --git a/Test/git-issues/git-issue-330.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2885.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-330.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2885.dfy.expect
diff --git a/Test/git-issues/git-issue-289.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-289.dfy
similarity index 100%
rename from Test/git-issues/git-issue-289.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-289.dfy
diff --git a/Test/git-issues/git-issue-289.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-289.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-289.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-289.dfy.expect
diff --git a/Test/git-issues/git-issue-289b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-289b.dfy
similarity index 100%
rename from Test/git-issues/git-issue-289b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-289b.dfy
diff --git a/Test/git-issues/git-issue-2903.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2903.dfy
similarity index 77%
rename from Test/git-issues/git-issue-2903.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2903.dfy
index 97fd1ec738b..57c930ce4d4 100644
--- a/Test/git-issues/git-issue-2903.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2903.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 module A {
   datatype Wrapper = Wrap(val: int)
diff --git a/Test/git-issues/git-issue-622$f.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2903.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-622$f.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2903.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2920.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2920.dfy
new file mode 100644
index 00000000000..ec307958ab9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2920.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+datatype D = D(x: int)
+
+ghost function Foo(): ()
+  ensures assert true by { var D(x) := D(0); } true
+{ () }
diff --git a/Test/git-issues/git-issue-351.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2920.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-351.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2920.dfy.expect
diff --git a/Test/git-issues/git-issue-2927.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2927.dfy
similarity index 92%
rename from Test/git-issues/git-issue-2927.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2927.dfy
index e9432c30767..d67b105847b 100644
--- a/Test/git-issues/git-issue-2927.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2927.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 0 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 include "BoundedInts.dfy"
 
diff --git a/Test/git-issues/git-issue-2927.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2927.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2927.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2927.dfy.expect
diff --git a/Test/git-issues/git-issue-2947.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2947.dfy
similarity index 93%
rename from Test/git-issues/git-issue-2947.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2947.dfy
index eba629bf585..da9ee0240fd 100644
--- a/Test/git-issues/git-issue-2947.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2947.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 codatatype Stream<X> = Nil | Cons(head: X, tail: Stream<X>)
 
diff --git a/Test/git-issues/git-issue-4000.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2947.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4000.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2947.dfy.expect
diff --git a/Test/git-issues/git-issue-2956a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2956a.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2956a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2956a.dfy
diff --git a/Test/git-issues/git-issue-3719a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2956a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3719a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2956a.dfy.expect
diff --git a/Test/git-issues/git-issue-2956b.js b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2956b.js
similarity index 100%
rename from Test/git-issues/git-issue-2956b.js
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2956b.js
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959.dfy
new file mode 100644
index 00000000000..e5cf712259c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959.dfy
@@ -0,0 +1,14 @@
+// RUN: ! %baredafny resolve --show-snippets:false --use-basename-for-filename --enforce-determinism "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method NondetIf() returns (x: int) {
+  if * {
+    x := 0;
+  } else {
+    x := 1;
+  }
+}
+
+method NondetAssign() returns (x: int) {
+  x := *;
+}
diff --git a/Test/git-issues/git-issue-2959.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959.dfy.expect
similarity index 78%
rename from Test/git-issues/git-issue-2959.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959.dfy.expect
index 8a692913d63..c0df67e0608 100644
--- a/Test/git-issues/git-issue-2959.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959.dfy.expect
@@ -1,4 +1,3 @@
-
-Dafny program verifier finished with 2 verified, 0 errors
 git-issue-2959.dfy(5,2): Error: nondeterministic if statement forbidden by the --enforce-determinism option
 git-issue-2959.dfy(13,7): Error: nondeterministic assignment forbidden by the --enforce-determinism option
+2 resolution/type errors detected in git-issue-2959.dfy
diff --git a/Test/git-issues/git-issue-2959a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959a.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2959a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959a.dfy
diff --git a/Test/git-issues/git-issue-2959a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2959a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959a.dfy.expect
diff --git a/Test/git-issues/git-issue-2959b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959b.dfy
similarity index 100%
rename from Test/git-issues/git-issue-2959b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959b.dfy
diff --git a/Test/git-issues/git-issue-2959b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-2959b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-2959b.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3059.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3059.dfy
new file mode 100644
index 00000000000..7452e805da9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3059.dfy
@@ -0,0 +1,76 @@
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+type seq0 = s: seq<int> | forall n <- s :: n == 0
+
+ghost function ReplaceInSeq0_Rejects(s: seq0): seq0
+  requires |s| > 0
+  ensures false
+{
+  var s' := s[0 := 1];
+  assert s'[0] != 0;
+  s' // error: s' does not satisfy subset-type constraint
+}
+
+ghost function ReplaceInSeq0_Accepts(s: seq0): seq<int>
+  requires |s| > 0
+{
+  var s' := s[0 := 1];
+  assert s'[0] != 0;
+  s'
+}
+
+type map0 = m: map<int, int> | forall k <- m :: m[k] == 0
+
+ghost function AddInMap0_Rejects(m: map0): map0
+  ensures false
+{
+  m[0 := 1] // error: s' does not satisfy subset-type constraint
+}
+
+ghost function AddInMap0_Accepts(m: map0): map<int, int>
+{
+  m[0 := 1]
+}
+
+ghost function RecoverType<T>(a: T): T { a }
+
+method AddInMap0_Proxy_Rejects() returns (r: map0)
+  ensures false
+{
+  var m; // The type of m is to be inferred, but that won't happen until
+         // after type inference has processed the assignment to r.
+  r := m[1 := 7]; // error: s' does not satisfy subset-type constraint
+  // To trigger the unsoundness, the verifier needs to be reminded that
+  // r is a variable of type map0. That is done by the following little
+  // trick:
+  ghost var u := RecoverType<map0>(r);
+}
+
+method AddInMap0_Proxy_Accepts() returns (r: map<int, int>)
+{
+  var m; // The type of m is to be inferred, but that won't happen until
+         // after type inference has processed the assignment to r.
+  r := m[1 := 7];
+  // To trigger the unsoundness, the verifier needs to be reminded that
+  // r is a variable of type map0. That is done by the following little
+  // trick:
+  ghost var u := RecoverType<map<int, int>>(r);
+}
+
+type multiset2 = s: multiset<int> | forall n <- s :: s[n] == 2 // everything in the multiset has multiplicity 2
+
+ghost function ReplaceInMultiset2_Rejects(s: multiset2): multiset2
+  ensures false
+{
+  var s' := s[0 := 1];
+  assert s'[0] != 2;
+  s' // error: s' does not satisfy subset-type constraint
+}
+
+ghost function ReplaceInMultiset2_Accepts(s: multiset2): multiset<int>
+{
+  var s' := s[0 := 1];
+  assert s'[0] != 0;
+  s'
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3059.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3059.dfy.expect
new file mode 100644
index 00000000000..dd5ff5579b5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3059.dfy.expect
@@ -0,0 +1,6 @@
+git-issue-3059.dfy(12,2): Error: value does not satisfy the subset constraints of 'seq0'
+git-issue-3059.dfy(28,3): Error: value does not satisfy the subset constraints of 'map0'
+git-issue-3059.dfy(43,8): Error: value does not satisfy the subset constraints of 'map0'
+git-issue-3059.dfy(68,2): Error: value does not satisfy the subset constraints of 'multiset2'
+
+Dafny program verifier finished with 5 verified, 4 errors
diff --git a/Test/git-issues/git-issue-3095.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3095.dfy
similarity index 98%
rename from Test/git-issues/git-issue-3095.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3095.dfy
index 7aa52017847..26fcdf0ae87 100644
--- a/Test/git-issues/git-issue-3095.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3095.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 opaque function HasPrecondition(i: int): int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3095.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3095.dfy.expect
new file mode 100644
index 00000000000..ad56ae4e9c7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3095.dfy.expect
@@ -0,0 +1,49 @@
+git-issue-3095.dfy(18,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(19,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(25,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(25,16): Warning: {:only} only accepts "before" or "after" as an optional argument
+git-issue-3095.dfy(26,13): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(32,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(40,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(49,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(51,13): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(62,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(71,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(73,13): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(83,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(85,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(93,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(95,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(103,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(105,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(114,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(116,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-3095.dfy(19,2): Error: assertion might not hold
+git-issue-3095.dfy(26,4): Error: assertion might not hold
+git-issue-3095.dfy(27,6): Error: assertion might not hold
+git-issue-3095.dfy(32,2): Error: assertion might not hold
+git-issue-3095.dfy(40,2): Error: assertion might not hold
+git-issue-3095.dfy(41,2): Error: assertion might not hold
+git-issue-3095.dfy(42,2): Error: assertion might not hold
+git-issue-3095.dfy(43,0): Error: out-parameter 'j', which is subject to definite-assignment rules, might be uninitialized at this return point
+git-issue-3095.dfy(51,4): Error: assertion might not hold
+git-issue-3095.dfy(52,4): Error: assertion might not hold
+git-issue-3095.dfy(60,2): Error: assertion might not hold
+git-issue-3095.dfy(61,2): Error: assertion might not hold
+git-issue-3095.dfy(62,2): Error: assertion might not hold
+git-issue-3095.dfy(71,2): Error: assertion might not hold
+git-issue-3095.dfy(72,4): Error: assertion might not hold
+git-issue-3095.dfy(73,4): Error: assertion might not hold
+git-issue-3095.dfy(83,2): Error: assertion might not hold
+git-issue-3095.dfy(84,2): Error: assertion might not hold
+git-issue-3095.dfy(85,2): Error: assertion might not hold
+git-issue-3095.dfy(92,2): Error: assertion might not hold
+git-issue-3095.dfy(93,2): Error: assertion might not hold
+git-issue-3095.dfy(95,2): Error: assertion might not hold
+git-issue-3095.dfy(96,2): Error: assertion might not hold
+git-issue-3095.dfy(97,0): Error: out-parameter 'j', which is subject to definite-assignment rules, might be uninitialized at this return point
+git-issue-3095.dfy(103,2): Error: assertion might not hold
+git-issue-3095.dfy(113,2): Error: assertion might not hold
+git-issue-3095.dfy(114,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 27 errors
diff --git a/Test/git-issues/git-issue-3125.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3125.dfy
similarity index 77%
rename from Test/git-issues/git-issue-3125.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3125.dfy
index 57af8d5cb66..4007b04682c 100644
--- a/Test/git-issues/git-issue-3125.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3125.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Foo() returns (i: int) {
diff --git a/Test/git-issues/git-issue-3125.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3125.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3125.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3125.dfy.expect
diff --git a/Test/git-issues/git-issue-314.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-314.dfy
similarity index 100%
rename from Test/git-issues/git-issue-314.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-314.dfy
diff --git a/Test/git-issues/git-issue-684.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-314.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-684.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-314.dfy.expect
diff --git a/Test/git-issues/git-issue-3187.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3187.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187.dfy
diff --git a/Test/git-issues/git-issue-3187.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3187.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187.dfy.expect
diff --git a/Test/git-issues/git-issue-3187a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187a.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3187a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187a.dfy
diff --git a/Test/git-issues/git-issue-3187a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3187a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187a.dfy.expect
diff --git a/Test/git-issues/git-issue-3187b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187b.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3187b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187b.dfy
diff --git a/Test/git-issues/git-issue-3187b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3187b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187b.dfy.expect
diff --git a/Test/git-issues/git-issue-3187c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187c.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3187c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187c.dfy
diff --git a/Test/git-issues/git-issue-3187c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187c.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3187c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187c.dfy.expect
diff --git a/Test/git-issues/git-issue-3187d.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187d.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3187d.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187d.dfy
diff --git a/Test/git-issues/git-issue-3187d.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187d.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3187d.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3187d.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321.dfy
new file mode 100644
index 00000000000..cfe2b2b62d0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321.dfy
@@ -0,0 +1,22 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 --refresh-exit-code=4 "%s"
+
+
+method h(n: nat) {
+  var a: array<nat> := new [n](i => i); // OK, element type inferred as "nat" (in legacy resolver, i is nat, which gives gives RHS as nat)
+}
+
+method k(n: nat) {
+  var a: array := new [n]((i: nat) => i as nat); // OK
+}
+
+method p(n: nat) {
+  var init: nat -> nat := i => i;
+  var a: array := new [n](init); // OK
+}
+
+method q(n: nat) {
+  var init: int -> int := i => i;
+  var a: array<nat> := new [n](init); // ERROR with legacy resolver, which inferred RHS element type as "int"; new resolver infers "nat", so no error
+  var b: array<nat> := new nat[n](init); // OK
+  var c: array<nat> := new int[n](init); // ERROR (resolver error for old resolver; verifier error for new resolver)
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321.dfy.expect
new file mode 100644
index 00000000000..2e2ca8b6826
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-321.dfy(19,20): Error: type array<int> is not assignable to LHS (of type array<nat>) (nonvariance for type parameter expects nat = int)
+git-issue-321.dfy(21,20): Error: type array<int> is not assignable to LHS (of type array<nat>) (nonvariance for type parameter expects nat = int)
+2 resolution/type errors detected in git-issue-321.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321.dfy.refresh.expect
new file mode 100644
index 00000000000..d60b8878aa8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321.dfy.refresh.expect
@@ -0,0 +1,3 @@
+git-issue-321.dfy(21,23): Error: value of expression (of type 'array<int>') is not known to be an instance of type 'array<nat>'
+
+Dafny program verifier finished with 3 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321a.dfy
new file mode 100644
index 00000000000..341fa9faeb5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321a.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+type lowercase = ch | 'a' <= ch <= 'z' witness 'd'
+
+method InitTests() {
+  var aa := new lowercase[3];
+  var s := "hello";
+  aa := new lowercase[|s|](i requires 0 <= i < |s| => s[i]);
+}
+
diff --git a/Test/git-issues/git-issue-833.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-833.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-321a.dfy.expect
diff --git a/Test/git-issues/git-issue-3221.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3221.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3221.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3221.dfy
diff --git a/Test/git-issues/git-issue-3221.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3221.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3221.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3221.dfy.expect
diff --git a/Test/git-issues/git-issue-324.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-324.dfy
similarity index 80%
rename from Test/git-issues/git-issue-324.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-324.dfy
index 1b2398cfdba..f4192f2bbaa 100644
--- a/Test/git-issues/git-issue-324.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-324.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 abstract module Sig {
   class Foo {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-324.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-324.dfy.expect
new file mode 100644
index 00000000000..c359d9c95f8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-324.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-324.dfy(23,16): Error: The abstract import named Impl1 (using :) may only be used in an abstract or replaceable module declaration
+1 resolution/type errors detected in git-issue-324.dfy
diff --git a/Test/git-issues/git-issue-3243.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3243.dfy
similarity index 86%
rename from Test/git-issues/git-issue-3243.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3243.dfy
index 704f8530c24..a84f42e2c38 100644
--- a/Test/git-issues/git-issue-3243.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3243.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 method LoopWithBody(x: int)
   decreases *
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3243.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3243.dfy.expect
new file mode 100644
index 00000000000..20eaabef906
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3243.dfy.expect
@@ -0,0 +1,7 @@
+git-issue-3243.dfy(19,2): Warning: this loop has no body (loop frame: i)
+git-issue-3243.dfy(10,16): Error: this loop invariant could not be proved on entry
+ Related message: loop invariant violation
+git-issue-3243.dfy(21,16): Error: this loop invariant could not be proved on entry
+ Related message: loop invariant violation
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/git-issues/git-issue-326.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-326.dfy
similarity index 89%
rename from Test/git-issues/git-issue-326.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-326.dfy
index 7e95f6e5dad..d7b64622f99 100644
--- a/Test/git-issues/git-issue-326.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-326.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 method test1() {
     var s := [1, 2, 3];
diff --git a/Test/git-issues/git-issue-326.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-326.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-326.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-326.dfy.expect
diff --git a/Test/git-issues/git-issue-3267.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3267.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3267.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3267.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3267.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3267.dfy.expect
new file mode 100644
index 00000000000..a96d0030382
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3267.dfy.expect
@@ -0,0 +1,10 @@
+*** Error: 'zzzz': The first input must be a command or a legacy option or file with supported extension
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+*** Error: 'test.d': Filename extension '.d' is not supported. Input files must be Dafny programs (.dfy) or supported auxiliary files (.cs, .dll)
+CLI: Error: command-line argument '--zzzz' is neither a recognized option nor a Dafny input file (.dfy, .doo, or .toml).
+CLI: Error: command-line argument 'test' is neither a recognized option nor a Dafny input file (.dfy, .doo, or .toml).
+CLI: Error: command-line argument 'test.d' is neither a recognized option nor a Dafny input file (.dfy, .doo, or .toml).
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+*** Error: 'test.d': Filename extension '.d' is not supported. Input files must be Dafny programs (.dfy) or supported auxiliary files (.cs, .dll)
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+*** Error: Command-line argument 'zzzz' is neither a recognized option nor a filename with a supported extension (.dfy, .cs, .dll).
diff --git a/Test/git-issues/git-issue-327.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327.dfy
similarity index 91%
rename from Test/git-issues/git-issue-327.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327.dfy
index 594f14af9cc..5b12ef25e0c 100644
--- a/Test/git-issues/git-issue-327.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module A {
   module AA {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327.dfy.expect
new file mode 100644
index 00000000000..e4e323ccb56
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 5 verified, 0 errors
diff --git a/Test/git-issues/git-issue-3273.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3273.dfy
similarity index 97%
rename from Test/git-issues/git-issue-3273.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3273.dfy
index 01ee9b23537..11ad0dfca6d 100644
--- a/Test/git-issues/git-issue-3273.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3273.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 iterator Iter<Y>(u: set<Y>) // this infers Y to be (==)
diff --git a/Test/git-issues/git-issue-3273.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3273.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3273.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3273.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327a.dfy
new file mode 100644
index 00000000000..a798f09fbf2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327a.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module A {
+  module X { }
+}
+module B {
+  import A.X  // used to require an 'import A' first
+}
+
diff --git a/Test/git-issues/git-issue-3908.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3908.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327a.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir.dfy
new file mode 100644
index 00000000000..6e1e7543d0b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+
+module A {
+  module B {
+    module C {
+      import A.B
+    }
+  }
+
+}
+
diff --git a/Test/git-issues/git-issue-327cir.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-327cir.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir1.dfy
new file mode 100644
index 00000000000..f9724a335ab
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir1.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+
+module A {
+  module B {
+    module C {
+    }
+  }
+
+  import B
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir1.dfy.expect
new file mode 100644
index 00000000000..6fad93b55c1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir1.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-327cir1.dfy(11,2): Error: Import declaration uses same name as a module in the same scope: B
+1 resolution/type errors detected in git-issue-327cir1.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir2.dfy
new file mode 100644
index 00000000000..ded2dcac4f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir2.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+// Error - circular
+
+module D {
+  import E
+}
+
+module E {
+  import D
+}
diff --git a/Test/git-issues/git-issue-327cir2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir2.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-327cir2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir2.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir3.dfy
new file mode 100644
index 00000000000..539ece11771
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir3.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module A {  // error: cyclic import
+  import B
+  module X { }
+}
+module B {
+  import A.X
+}
+
diff --git a/Test/git-issues/git-issue-327cir3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir3.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-327cir3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir3.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir4.dfy
new file mode 100644
index 00000000000..82e58f12bac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir4.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+// Error - circular
+
+module D {
+  module E {
+    import D
+  }
+}
diff --git a/Test/git-issues/git-issue-327cir4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir4.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-327cir4.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327cir4.dfy.expect
diff --git a/Test/git-issues/git-issue-327err.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327err.dfy
similarity index 85%
rename from Test/git-issues/git-issue-327err.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327err.dfy
index 43a3d80ba2a..2555f8c938c 100644
--- a/Test/git-issues/git-issue-327err.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327err.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module A {
   module AA {
diff --git a/Test/git-issues/git-issue-327err.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327err.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-327err.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-327err.dfy.expect
diff --git a/Test/git-issues/git-issue-328.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-328.dfy
similarity index 87%
rename from Test/git-issues/git-issue-328.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-328.dfy
index 64a2ba3c43a..6353063e4f2 100644
--- a/Test/git-issues/git-issue-328.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-328.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module Z {
   datatype T = T(i: int)
diff --git a/Test/git-issues/git-issue-328.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-328.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-328.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-328.dfy.expect
diff --git a/Test/git-issues/git-issue-3288a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288a.dfy
similarity index 87%
rename from Test/git-issues/git-issue-3288a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288a.dfy
index 56285ae638a..d236a920d13 100644
--- a/Test/git-issues/git-issue-3288a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288a.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t" 
 
 // Check that contextual keywords can be used as identifiers
diff --git a/Test/git-issues/git-issue-4261.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4261.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288a.dfy.expect
diff --git a/Test/git-issues/git-issue-3288b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288b.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3288b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288b.dfy
diff --git a/Test/git-issues/git-issue-3288b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3288b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288b.dfy.expect
diff --git a/Test/git-issues/git-issue-3288c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288c.dfy
similarity index 81%
rename from Test/git-issues/git-issue-3288c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288c.dfy
index e807c9a2861..c59a2794f98 100644
--- a/Test/git-issues/git-issue-3288c.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288c.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" --allow-warnings > "%t"
 // RUN: %diff "%s.expect" "%t" 
 
 module M {
diff --git a/Test/git-issues/git-issue-3288c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288c.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3288c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3288c.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3294.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3294.dfy
new file mode 100644
index 00000000000..c1395d60820
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3294.dfy
@@ -0,0 +1,9 @@
+// RUN: %exits-with 2 %verify --library "%s" "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype FailureRestrictedType<T, R> = Failure
+
+method m() returns (r: FailureRestrictedType<bool, bool>) {
+    :- Failure;
+    r := Failure;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3294.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3294.dfy.expect
new file mode 100644
index 00000000000..75ade2bda83
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3294.dfy.expect
@@ -0,0 +1,3 @@
+CLI: Warning: The file 'git-issue-3294.dfy' was passed to --library. Verification for that file might have used options incompatible with the current ones, or might have been skipped entirely. Use a .doo file to enable Dafny to check that compatible options were used
+git-issue-3294.dfy(7,4): Error: member IsFailure does not exist in FailureRestrictedType<?, ?>, in :- statement
+1 resolution/type errors detected in git-issue-3294.dfy
diff --git a/Test/git-issues/git-issue-330.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-330.dfy
similarity index 92%
rename from Test/git-issues/git-issue-330.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-330.dfy
index 53b2c810886..f88c0e62cab 100644
--- a/Test/git-issues/git-issue-330.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-330.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 
 datatype Option<A> = Some(value: A) | None
diff --git a/Test/git-issues/git-issue-4315.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-330.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4315.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-330.dfy.expect
diff --git a/Test/git-issues/git-issue-3304.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3304.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3304.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3304.dfy
diff --git a/Test/git-issues/git-issue-3304.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3304.dfy.expect
similarity index 91%
rename from Test/git-issues/git-issue-3304.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3304.dfy.expect
index c06ad3dc8c5..989f52a3190 100644
--- a/Test/git-issues/git-issue-3304.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3304.dfy.expect
@@ -1,6 +1,6 @@
+git-issue-3304.dfy(5,9): Error: the type of this expression is underspecified
   |
 5 |   assert [] == [[]];
-  |          ^
+  |          ^^
 
-git-issue-3304.dfy(5,9): Error: the type of this expression is underspecified
 1 resolution/type errors detected in git-issue-3304.dfy
diff --git a/Test/git-issues/git-issue-3304b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3304b.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3304b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3304b.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3304b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3304b.dfy.expect
new file mode 100644
index 00000000000..f203f28feda
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3304b.dfy.expect
@@ -0,0 +1,7 @@
+git-issue-3304b.dfy(5,2): Error: assertion might not hold
+  |
+5 |   assert false;
+  |   ^^^^^^^^^^^^^
+
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/git-issues/git-issue-332.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-332.dfy
similarity index 86%
rename from Test/git-issues/git-issue-332.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-332.dfy
index 5166441405d..097bd89ed2e 100644
--- a/Test/git-issues/git-issue-332.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-332.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   var foo := new B.Foo(15);
diff --git a/Test/git-issues/git-issue-332.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-332.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-332.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-332.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-332.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-332.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-332.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3320.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3320.dfy
new file mode 100644
index 00000000000..df24629f2b5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3320.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+datatype Dt = A | B(b: set<nat>)
+
+function SetComprehension(s: seq<Dt>): set<nat> {
+  set i, b | 0 <= i < |s| && s[i].B? && b in s[i].b && 1 != 2 :: b
+}
+
+function MapComprehension(s: seq<Dt>): map<int, int> {
+  map i, b | 0 <= i < |s| && s[i].B? && b in s[i].b && 1 != 2 :: b := b
+}
+
+method Main() {
+  var s := [A, B({0})];
+  print SetComprehension(s), "\n";
+  print MapComprehension(s), "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3320.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3320.dfy.expect
new file mode 100644
index 00000000000..036b7385b5e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3320.dfy.expect
@@ -0,0 +1,2 @@
+{0}
+map[0 := 0]
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3320.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3320.dfy.rs.check
new file mode 100644
index 00000000000..b2ef1d91c39
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3320.dfy.rs.check
@@ -0,0 +1 @@
+CHECK: error: expected identifier, found `<`
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-334.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-334.dfy
similarity index 81%
rename from Test/git-issues/git-issue-334.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-334.dfy
index 6b776ba816b..87382954adb 100644
--- a/Test/git-issues/git-issue-334.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-334.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 function FromAtoB(a: seq<int>): seq<int> {
   // regression: the following had once crashed the translator
diff --git a/Test/git-issues/git-issue-334.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-334.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-334.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-334.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3358.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3358.dfy
new file mode 100644
index 00000000000..01b25cc589f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3358.dfy
@@ -0,0 +1,7 @@
+// RUN: %verify "%s" --allow-warnings > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype MyResult = Ok | Err(error: set<string>)
+function warningTriggerTest(sr: seq<MyResult>): set<string> {
+  set i, err | 0 <= i < |sr| && err in (if sr[i].Err? then sr[i].error else {}) :: err
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3358.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3358.dfy.expect
new file mode 100644
index 00000000000..15ce52ebc01
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3358.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-3358.dfy(6,2): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/git-issues/git-issue-336.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-336.dfy
similarity index 92%
rename from Test/git-issues/git-issue-336.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-336.dfy
index 706f2b9f04b..dfc8ddd1a8d 100644
--- a/Test/git-issues/git-issue-336.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-336.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 lemma TestMap(a: map<int, (int,int)>) {
   // The following assertion used to not prove automatically
diff --git a/Test/git-issues/git-issue-4272.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-336.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4272.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-336.dfy.expect
diff --git a/Test/git-issues/git-issue-3366.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3366.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3366.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3366.dfy
diff --git a/Test/git-issues/git-issue-3366.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3366.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3366.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3366.dfy.expect
diff --git a/Test/git-issues/git-issue-3370.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3370.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3370.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3370.dfy
diff --git a/Test/git-issues/git-issue-3370.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3370.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3370.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3370.dfy.expect
diff --git a/Test/git-issues/git-issue-3377.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3377.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3377.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3377.dfy
diff --git a/Test/git-issues/git-issue-3377.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3377.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3377.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3377.dfy.expect
diff --git a/Test/git-issues/git-issue-3382.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3382.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3382.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3382.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3382.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3382.dfy.expect
new file mode 100644
index 00000000000..f829807e3d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3382.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier did not attempt verification
diff --git a/Test/git-issues/git-issue-3390.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3390.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3390.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3390.dfy
diff --git a/Test/git-issues/git-issue-3411.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3411.dfy
similarity index 79%
rename from Test/git-issues/git-issue-3411.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3411.dfy
index c9c95d4c83d..a77a6140b73 100644
--- a/Test/git-issues/git-issue-3411.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3411.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Test(f: int -> int) {
diff --git a/Test/git-issues/git-issue-3719b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3411.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3719b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3411.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-343.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-343.dfy
new file mode 100644
index 00000000000..e3d046857a0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-343.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method f(a: seq<int>) {
+  var t := a[a .. 1];
+}
diff --git a/Test/git-issues/git-issue-343.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-343.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-343.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-343.dfy.expect
diff --git a/Test/git-issues/git-issue-3449.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3449.dfy
similarity index 81%
rename from Test/git-issues/git-issue-3449.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3449.dfy
index d4edf6f2566..1e0b14bb8fb 100644
--- a/Test/git-issues/git-issue-3449.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3449.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class Basic { }
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3449.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3449.dfy.expect
new file mode 100644
index 00000000000..42d97eb0009
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3449.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-3449.dfy(11,4): Error: assertion might not hold
+git-issue-3449.dfy(13,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/git-issues/git-issue-3451/git-issue-3451.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3451/git-issue-3451.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3451/git-issue-3451.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3451/git-issue-3451.dfy
diff --git a/Test/git-issues/git-issue-3451/git-issue-3451.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3451/git-issue-3451.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3451/git-issue-3451.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3451/git-issue-3451.dfy.expect
diff --git a/Test/git-issues/git-issue-3451/git-issue-3451a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3451/git-issue-3451a.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3451/git-issue-3451a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3451/git-issue-3451a.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3451/git-issue-3451a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3451/git-issue-3451a.dfy.expect
new file mode 100644
index 00000000000..a8442596608
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3451/git-issue-3451a.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-3451a.dfy(5,0): Error: this symbol not expected in Dafny
+1 parse errors detected in git-issue-3451a.dfy
diff --git a/Test/git-issues/git-issue-3461.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3461.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461.dfy.expect
new file mode 100644
index 00000000000..a0eb81388b9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461.dfy.expect
@@ -0,0 +1,8 @@
+git-issue-3461.dfy(4,0): Error: a method cannot be declared 'opaque'
+git-issue-3461.dfy(11,0): Error: a class cannot be declared 'opaque'
+git-issue-3461.dfy(12,0): Error: a datatype or codatatype cannot be declared 'opaque'
+git-issue-3461.dfy(13,0): Error: a newtype cannot be declared 'opaque'
+git-issue-3461.dfy(14,0): Error: a subset type cannot be declared 'opaque'
+git-issue-3461.dfy(17,9): Error: lbrace expected
+git-issue-3461.dfy(18,0): Error: this symbol not expected in VarDeclStatement
+7 parse errors detected in git-issue-3461.dfy
diff --git a/Test/git-issues/git-issue-3461b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461b.dfy
similarity index 79%
rename from Test/git-issues/git-issue-3461b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461b.dfy
index cd307fe84fc..5c38b16cae8 100644
--- a/Test/git-issues/git-issue-3461b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461b.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 const d := 42
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461b.dfy.expect
new file mode 100644
index 00000000000..a0ba6c4710f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3461b.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-3461b.dfy(7,2): Error: assertion might not hold
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/Test/git-issues/git-issue-3472.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3472.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3472.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3472.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3472.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3472.dfy.expect
new file mode 100644
index 00000000000..f829807e3d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3472.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier did not attempt verification
diff --git a/Test/git-issues/git-issue-3475.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3475.dfy
similarity index 94%
rename from Test/git-issues/git-issue-3475.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3475.dfy
index 96d82285c4b..428c37976bd 100644
--- a/Test/git-issues/git-issue-3475.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3475.dfy
@@ -1,4 +1,4 @@
-// RUN: ! %baredafny verify %args "%s" > "%t"
+// RUN: ! %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Test {
diff --git a/Test/git-issues/git-issue-3475.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3475.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3475.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3475.dfy.expect
diff --git a/Test/git-issues/git-issue-3482.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3482.dfy
similarity index 78%
rename from Test/git-issues/git-issue-3482.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3482.dfy
index 317943fbca3..08997dbc801 100644
--- a/Test/git-issues/git-issue-3482.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3482.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" --allow-warnings > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype X = X
diff --git a/Test/git-issues/git-issue-3482.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3482.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3482.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3482.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3496.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3496.dfy
new file mode 100644
index 00000000000..f78785490b3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3496.dfy
@@ -0,0 +1,10 @@
+// RUN: %resolve --allow-axioms:false --allow-warnings "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method m() {
+  assume true;
+}
+
+method p() {
+  assume {:axiom} true;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3496.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3496.dfy.expect
new file mode 100644
index 00000000000..f34d33c9142
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3496.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-3496.dfy(5,2): Warning: assume statement has no {:axiom} annotation
+
+Dafny program verifier did not attempt verification
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3497.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3497.dfy
new file mode 100644
index 00000000000..f6a4d39e0b7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3497.dfy
@@ -0,0 +1,9 @@
+// RUN: %resolve "%s" --allow-warnings > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method m() {
+  forall 
+    ensures true 
+  {
+  }
+}
diff --git a/Test/git-issues/git-issue-3497.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3497.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3497.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3497.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-351.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-351.dfy
new file mode 100644
index 00000000000..b36e13f34ce
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-351.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+
+function DecodeRecursively(s: seq<int>): (b: seq<int>) {
+  seq(|s|, i requires 0 <= i < |s| =>
+    var d := s[0]; // this line produced the reported error, prior to the fix
+    s[i]
+  )
+}
diff --git a/Test/git-issues/git-issue-4139.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-351.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4139.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-351.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3513/git-issue-3513.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3513/git-issue-3513.dfy
new file mode 100644
index 00000000000..fc1638088bf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3513/git-issue-3513.dfy
@@ -0,0 +1,10 @@
+// RUN: %exits-with 2 %resolve --allow-warnings "%s" > "%t"
+// RUN: %exits-with 2 %resolve --allow-warnings --library:"%S/src/A.dfy" "%s" >> "%t"
+// RUN: %resolve --allow-warnings --library:"%S/src/A.dfy,%S/src/sub/B.dfy" "%s" >> "%t"
+// RUN: %resolve --allow-warnings --library:"%S/src/A.dfy , %S/src/sub/B.dfy" "%s" >> "%t"
+// RUN: %resolve --allow-warnings --library:"%S/src" "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module M {
+  import A
+}
diff --git a/Test/git-issues/git-issue-3513/git-issue-3513.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3513/git-issue-3513.dfy.expect
similarity index 84%
rename from Test/git-issues/git-issue-3513/git-issue-3513.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3513/git-issue-3513.dfy.expect
index 4cf1f2f7133..14179a1b9ac 100644
--- a/Test/git-issues/git-issue-3513/git-issue-3513.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3513/git-issue-3513.dfy.expect
@@ -1,7 +1,7 @@
 git-issue-3513.dfy(9,9): Error: module A does not exist
 1 resolution/type errors detected in git-issue-3513.dfy
 A.dfy(4,9): Error: module B does not exist
-1 resolution/type errors detected in the_program
+1 resolution/type errors detected in git-issue-3513.dfy
 
 Dafny program verifier did not attempt verification
 
diff --git a/Test/git-issues/git-issue-3513/src/A.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3513/src/A.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3513/src/A.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3513/src/A.dfy
diff --git a/Test/git-issues/git-issue-3513/src/sub/B.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3513/src/sub/B.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3513/src/sub/B.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3513/src/sub/B.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-353.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-353.dfy
new file mode 100644
index 00000000000..b8ba803f7e6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-353.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+type A = s : seq<int> | |s| < 10
+
+method f(a: seq<A>)
+  ensures multiset(a[..]) == multiset(a[..])
+{
+}
diff --git a/Test/git-issues/git-issue-864z1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-353.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-864z1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-353.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-354.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-354.dfy
new file mode 100644
index 00000000000..f9630679488
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-354.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+class C<X(0)> {
+  static const u: X
+}
+
+method Main() {
+  print C<int>.u, "\n";
+  print C<nat>.u, "\n";
+  print C<real>.u, "\n";
+  print C<bool>.u, "\n";
+}
+
diff --git a/Test/git-issues/git-issue-354.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-354.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-354.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-354.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-354.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-354.dfy.rs.check
new file mode 100644
index 00000000000..b50001a6c91
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-354.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Static\ fields\ with\ type\ arguments</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3549b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3549b.dfy
new file mode 100644
index 00000000000..ff06569a0ea
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3549b.dfy
@@ -0,0 +1,2 @@
+// RUN: %exits-with 1 %baredafny resolve "" > "%t"
+// RUN: %diff "%s.expect" "%t"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3549b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3549b.dfy.expect
new file mode 100644
index 00000000000..3319a13e049
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3549b.dfy.expect
@@ -0,0 +1 @@
+CLI: Error: no Dafny source files were specified as input
diff --git a/Test/git-issues/git-issue-356-errors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356-errors.dfy
similarity index 97%
rename from Test/git-issues/git-issue-356-errors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356-errors.dfy
index e499a22bddb..fb4fc733b92 100644
--- a/Test/git-issues/git-issue-356-errors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356-errors.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /unicodeChar:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-deprecation --unicode-char false "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 
diff --git a/Test/git-issues/git-issue-356-errors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356-errors.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-356-errors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356-errors.dfy.expect
diff --git a/Test/git-issues/git-issue-356-errors2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356-errors2.dfy
similarity index 86%
rename from Test/git-issues/git-issue-356-errors2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356-errors2.dfy
index 5e26567b879..f0281c8b17e 100644
--- a/Test/git-issues/git-issue-356-errors2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356-errors2.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Subset tsype conversions
 
diff --git a/Test/git-issues/git-issue-356-errors2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356-errors2.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-356-errors2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356-errors2.dfy.expect
diff --git a/Test/git-issues/git-issue-356.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356.dfy
similarity index 98%
rename from Test/git-issues/git-issue-356.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356.dfy
index 2d497c0531c..df4fa854cd9 100644
--- a/Test/git-issues/git-issue-356.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --unicode-char:false
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --allow-deprecation --unicode-char false
 
 module M {
   type Tx = i: int | 0 <= i <= 100
diff --git a/Test/git-issues/git-issue-356.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-356.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356.dfy.rs.check
new file mode 100644
index 00000000000..7d6c2fd331e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-356.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type name for ORDINAL \(Microsoft_dDafny_dBigOrdinalType\)</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-3571.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3571.dfy
similarity index 77%
rename from Test/git-issues/git-issue-3571.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3571.dfy
index 8a46ac72c52..d3d6a527ac3 100644
--- a/Test/git-issues/git-issue-3571.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3571.dfy
@@ -2,18 +2,17 @@
 // RUN: %resolve --function-syntax:4 --function-syntax:3 "%s" > "%t"
 // RUN: %resolve --quantifier-syntax:3 --quantifier-syntax:4  "%s" >> "%t"
 // RUN: %build --target:java --target:cs  "%s" >> "%t"
-// RUN: %resolve --unicode-char:false --unicode-char:true  "%s" >> "%t"
+// RUN: %resolve --unicode-char false --unicode-char true  "%s" >> "%t"
 // RUN: %resolve --prelude "%s" --prelude "%s"  "%s" >> "%t"
 // RUN: %verify --cores:2 --cores:1  "%s" >> "%t"
 // RUN: %verify --solver-log x.tct --solver-log y.txt  "%s" >> "%t"
-// RUN: %verify --resource-limit 100 --resource-limit 200  "%s" >> "%t"
-// RUN: %verify --solver-path x --solver-path y  "%s" >> "%t"
+// RUN: %verify --resource-limit 100e3 --resource-limit 200e3  "%s" >> "%t"
+// RUN: ! %verify --solver-path x --solver-path y  "%s"
 // RUN: %verify --verification-time-limit 300 --verification-time-limit 500  "%s" >> "%t"
 // RUN: %verify --error-limit:10 --error-limit:5  "%s" >> "%t"
 // RUN: %translate cs --output x --output y  "%s" >> "%t"
 // RUN: %diff "%s.expect" "%t"
 // Crashes size x is nothing real
 // ## %verify --solver-plugin x --solver-plugin x  "%s" >> "%t"
-// Not testing --boogi, --boogie-filter
 
 module A {}
diff --git a/Test/git-issues/git-issue-3571.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3571.dfy.expect
similarity index 91%
rename from Test/git-issues/git-issue-3571.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3571.dfy.expect
index e1b16517e83..f20acf85027 100644
--- a/Test/git-issues/git-issue-3571.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3571.dfy.expect
@@ -20,5 +20,3 @@ Dafny program verifier finished with 0 verified, 0 errors
 Dafny program verifier finished with 0 verified, 0 errors
 
 Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/git-issues/git-issue-3572.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3572.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3572.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3572.dfy
diff --git a/Test/git-issues/git-issue-3572.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3572.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3572.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3572.dfy.expect
diff --git a/Test/git-issues/git-issue-3605.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3605.dfy
similarity index 79%
rename from Test/git-issues/git-issue-3605.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3605.dfy
index c754d8cc5d3..1bb3080e7e8 100644
--- a/Test/git-issues/git-issue-3605.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3605.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C { }
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3605.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3605.dfy.expect
new file mode 100644
index 00000000000..d7cf98abfd0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3605.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-3605.dfy(15,2): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/git-issues/git-issue-3606.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3606.dfy
similarity index 90%
rename from Test/git-issues/git-issue-3606.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3606.dfy
index 9a80da501b1..4ade4d540c1 100644
--- a/Test/git-issues/git-issue-3606.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3606.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class C { }
diff --git a/Test/git-issues/git-issue-3606.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3606.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3606.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3606.dfy.expect
diff --git a/Test/git-issues/git-issue-3607.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3607.dfy
similarity index 91%
rename from Test/git-issues/git-issue-3607.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3607.dfy
index 4f351310bd5..fc5a36c5361 100644
--- a/Test/git-issues/git-issue-3607.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3607.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class Cell {
diff --git a/Test/git-issues/git-issue-3607.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3607.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3607.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3607.dfy.expect
diff --git a/Test/git-issues/git-issue-362.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-362.dfy
similarity index 83%
rename from Test/git-issues/git-issue-362.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-362.dfy
index 4114f33d3df..fc5e5e2b134 100644
--- a/Test/git-issues/git-issue-362.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-362.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 function IsLetter(c: char): bool { 'A' <= c <= 'Z' }
 type Letter = c: char | IsLetter(c) witness 'A'
diff --git a/Test/git-issues/git-issue-362.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-362.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-362.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-362.dfy.expect
diff --git a/Test/git-issues/git-issue-364.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy
similarity index 87%
rename from Test/git-issues/git-issue-364.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy
index 68c75931746..34b6d73055f 100644
--- a/Test/git-issues/git-issue-364.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy
@@ -1,4 +1,5 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4742
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype NatOutcome =
 | Success(value: nat)
diff --git a/Test/git-issues/git-issue-364.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-364.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy.rs.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy.rs.expect
new file mode 100644
index 00000000000..8170e9d258e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-364.dfy.rs.expect
@@ -0,0 +1,4 @@
+NatOutcome.Success(55) false 55
+12 0
+NatOutcome.Failure(it could be worse) true NatOutcome.Failure(it could be worse)
+14 0
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3691.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3691.dfy
new file mode 100644
index 00000000000..42323b81c35
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3691.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+trait A {
+  predicate f()
+  method g() ensures f()
+}
+
+class B<T> extends A {
+  predicate f() { true }
+  method g() ensures f()
+}
diff --git a/Test/git-issues/git-issue-904.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3691.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-904.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3691.dfy.expect
diff --git a/Test/git-issues/git-issue-370.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-370.dfy
similarity index 80%
rename from Test/git-issues/git-issue-370.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-370.dfy
index cf26ddcaf2a..f81c4baef3b 100644
--- a/Test/git-issues/git-issue-370.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-370.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Issue 370 reported a situation where there were 6 errors, but only 5 of
 // them are reported, since there's a limit of 5 error messages per method.
@@ -10,6 +10,9 @@
 // to be good, so this test file is meant to alert us to any changes, in
 // case we then want to revisit this issue in some way.
 
+// UPDATE: With the full implementation of CanCall, this test gives just
+// 1 error.
+
 datatype T = T(x: int)
 datatype S = S(u: int, v: int, w: int, x: int, y: int, z: int)
 
@@ -34,14 +37,14 @@ ghost predicate Good(s: S) {
   && s.z == 5
 }
 
-ghost function {:opaque} GetT(): T {
+opaque ghost function GetT(): T {
   T(5)
 }
 
 lemma foo()
   ensures var t := GetT();
-    && WellFormed(t)  // error (1x)
-    && Good(Func(t))  // error (5x, but only 4 of these are reported, due to the limit of 5 errors per method)
+    && WellFormed(t)  // error
+    && Good(Func(t))
 {
   reveal GetT();
 }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-370.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-370.dfy.expect
new file mode 100644
index 00000000000..e513f9a936d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-370.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-370.dfy(48,0): Error: a postcondition could not be proved on this return path
+git-issue-370.dfy(46,17): Related location: this is the postcondition that could not be proved
+git-issue-370.dfy(22,6): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/git-issues/git-issue-371-errors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors.dfy
similarity index 75%
rename from Test/git-issues/git-issue-371-errors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors.dfy
index 891770f129e..992fd3081bb 100644
--- a/Test/git-issues/git-issue-371-errors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module M {
   type TT = int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors.dfy.expect
new file mode 100644
index 00000000000..14f8f7a3c0a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-371-errors.dfy(25,2): Error: Duplicate name of import: M
+git-issue-371-errors.dfy(21,0): Error: Import declaration uses same name as a module in the same scope: M
+2 resolution/type errors detected in git-issue-371-errors.dfy
diff --git a/Test/git-issues/git-issue-371-errors2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors2.dfy
similarity index 81%
rename from Test/git-issues/git-issue-371-errors2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors2.dfy
index 17fd85b2d7e..185b0eb4bec 100644
--- a/Test/git-issues/git-issue-371-errors2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors2.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module M {
   type TT = int
diff --git a/Test/git-issues/git-issue-371-errors2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors2.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-371-errors2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371-errors2.dfy.expect
diff --git a/Test/git-issues/git-issue-371.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371.dfy
similarity index 83%
rename from Test/git-issues/git-issue-371.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371.dfy
index 0aaff83b6e9..659d299f47e 100644
--- a/Test/git-issues/git-issue-371.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /env:0 /dprint:- "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --print:-
+
 
 module M {
   type TT = int
diff --git a/Test/git-issues/git-issue-371.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-371.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-371.dfy.expect
diff --git a/Test/git-issues/git-issue-3719.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719.dfy
similarity index 86%
rename from Test/git-issues/git-issue-3719.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719.dfy
index 722c379b424..0fb24994ece 100644
--- a/Test/git-issues/git-issue-3719.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 opaque function inc(x: nat): nat { x + 1 }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719.dfy.expect
new file mode 100644
index 00000000000..bbceecbdce7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-3719.dfy(12,18): Error: assertion might not hold
+git-issue-3719.dfy(7,37): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 3 verified, 1 error
diff --git a/Test/git-issues/git-issue-3719a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719a.dfy
similarity index 77%
rename from Test/git-issues/git-issue-3719a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719a.dfy
index 490a434746a..1d2f83490ef 100644
--- a/Test/git-issues/git-issue-3719a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719a.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost opaque function R(i: int): int {
diff --git a/Test/git-issues/git-issue-4176.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4176.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719a.dfy.expect
diff --git a/Test/git-issues/git-issue-3719b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719b.dfy
similarity index 80%
rename from Test/git-issues/git-issue-3719b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719b.dfy
index 1af697b91d8..c5f0ea437c8 100644
--- a/Test/git-issues/git-issue-3719b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719b.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 opaque predicate P(i: int) { true }
diff --git a/Test/git-issues/git-issue-4202.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4202.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3719b.dfy.expect
diff --git a/Test/git-issues/git-issue-3734.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3734.dfy
similarity index 98%
rename from Test/git-issues/git-issue-3734.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3734.dfy
index ae8249a9e23..0c7d5704af7 100644
--- a/Test/git-issues/git-issue-3734.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3734.dfy
@@ -1,5 +1,5 @@
 // RUN: %baredafny verify "%s"
- // RUN: %testDafnyForEachCompiler "%s"
+ // RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 newtype uint8 = x : int | 0 <= x < 256
 
diff --git a/Test/git-issues/git-issue-3734.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3734.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3734.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3734.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3734.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3734.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3734.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-374.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-374.dfy
new file mode 100644
index 00000000000..d74fe97da15
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-374.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+class C {
+  constructor(ghost x: int)
+  {
+  }
+}
+
+ghost function f() : int { 0 }
+
+method Main() {
+  var c := new C(f());
+}
+
diff --git a/Test/git-issues/git-issue-697e.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-374.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-697e.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-374.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-374.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-374.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-374.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-3744.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3744.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3744.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3744.dfy
diff --git a/Test/git-issues/git-issue-3744.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3744.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3744.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3744.dfy.expect
diff --git a/Test/git-issues/git-issue-3757.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3757.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3757.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3757.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3757.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3757.dfy.expect
new file mode 100644
index 00000000000..73a57bb785f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3757.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-3757.dfy(5,0): Error: expected an identifier after 'const' and any attributes
+1 parse errors detected in git-issue-3757.dfy
diff --git a/Test/git-issues/git-issue-3757a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3757a.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3757a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3757a.dfy
diff --git a/Test/git-issues/git-issue-3757a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3757a.dfy.expect
similarity index 78%
rename from Test/git-issues/git-issue-3757a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3757a.dfy.expect
index b2ffcad38e9..5ec18e6d7a7 100644
--- a/Test/git-issues/git-issue-3757a.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3757a.dfy.expect
@@ -1,4 +1,3 @@
 git-issue-3757a.dfy(4,6): Error: expected an identifier after 'const' and any attributes
 git-issue-3757a.dfy(4,6): Error: this symbol not expected in Dafny
-git-issue-3757a.dfy(1,0): Warning: File contains no code
 2 parse errors detected in git-issue-3757a.dfy
diff --git a/Test/git-issues/git-issue-3792.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3792.dfy
similarity index 91%
rename from Test/git-issues/git-issue-3792.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3792.dfy
index 6e9d97e2d1c..8a44826b7d9 100644
--- a/Test/git-issues/git-issue-3792.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3792.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 /// # Random variable. extracted from any number of bits
diff --git a/Test/git-issues/github-issue-2230.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3792.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-2230.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3792.dfy.expect
diff --git a/Test/git-issues/git-issue-3804.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804.dfy
similarity index 95%
rename from Test/git-issues/git-issue-3804.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804.dfy
index af757798e8c..f1ff9b690f0 100644
--- a/Test/git-issues/git-issue-3804.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 predicate P(x: int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804.dfy.expect
new file mode 100644
index 00000000000..9c4938ace29
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804.dfy.expect
@@ -0,0 +1,8 @@
+git-issue-3804.dfy(9,2): Error: assertion might not hold
+git-issue-3804.dfy(20,2): Error: assertion might not hold
+git-issue-3804.dfy(22,2): Error: assertion might not hold
+git-issue-3804.dfy(31,2): Error: assertion might not hold
+git-issue-3804.dfy(48,2): Error: assertion might not hold
+git-issue-3804.dfy(69,2): Error: assertion might not hold
+
+Dafny program verifier finished with 2 verified, 6 errors
diff --git a/Test/git-issues/git-issue-3804a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804a.dfy
similarity index 84%
rename from Test/git-issues/git-issue-3804a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804a.dfy
index 44b6c75ad5c..6cd132bf833 100644
--- a/Test/git-issues/git-issue-3804a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804a.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 predicate P(x: int)
diff --git a/Test/git-issues/git-issue-3804a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3804a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804a.dfy.expect
diff --git a/Test/git-issues/git-issue-3804b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804b.dfy
similarity index 95%
rename from Test/git-issues/git-issue-3804b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804b.dfy
index a1a29187fa9..1ccf8357a3b 100644
--- a/Test/git-issues/git-issue-3804b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804b.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 function RevealInFunctionNotMethodOk(i: int): (r: int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804b.dfy.expect
new file mode 100644
index 00000000000..6bfab177c40
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804b.dfy.expect
@@ -0,0 +1,8 @@
+git-issue-3804b.dfy(18,2): Error: a postcondition could not be proved on this return path
+git-issue-3804b.dfy(16,12): Related location: this is the postcondition that could not be proved
+git-issue-3804b.dfy(27,2): Error: a postcondition could not be proved on this return path
+git-issue-3804b.dfy(25,12): Related location: this is the postcondition that could not be proved
+git-issue-3804b.dfy(40,2): Error: assertion might not hold
+git-issue-3804b.dfy(48,2): Error: assertion might not hold
+
+Dafny program verifier finished with 5 verified, 4 errors
diff --git a/Test/git-issues/git-issue-3804c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804c.dfy
similarity index 93%
rename from Test/git-issues/git-issue-3804c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804c.dfy
index 43941557c04..cbf89f9392c 100644
--- a/Test/git-issues/git-issue-3804c.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804c.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 predicate P(i: int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804c.dfy.expect
new file mode 100644
index 00000000000..7e33f1ab472
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804c.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-3804c.dfy(15,8): Error: assertion might not hold
+git-issue-3804c.dfy(20,8): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/git-issues/git-issue-3804d.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804d.dfy
similarity index 92%
rename from Test/git-issues/git-issue-3804d.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804d.dfy
index f24fa1737e8..279ba2c14d0 100644
--- a/Test/git-issues/git-issue-3804d.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804d.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 predicate P(i: int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804d.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804d.dfy.expect
new file mode 100644
index 00000000000..b6ef85407e9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3804d.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-3804d.dfy(12,37): Error: unresolved identifier: q
+git-issue-3804d.dfy(16,34): Error: unresolved identifier: p
+git-issue-3804d.dfy(18,9): Error: unresolved identifier: q
+git-issue-3804d.dfy(18,12): Error: unresolved identifier: p
+4 resolution/type errors detected in git-issue-3804d.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3809.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3809.dfy
new file mode 100644
index 00000000000..be8e13ec89b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3809.dfy
@@ -0,0 +1,26 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" 
+
+module m {
+  datatype D = A
+             | B
+             | C {
+    static const Default: D := B // This one will be translated as Default_
+    method Default_() { // Just to be sure there is no clash: this is translated as Default__
+      print "Default_ Method\n";
+    }
+  }
+
+
+
+  method Main() {
+    var x := D.Default;
+    x.Default_();
+    match x {
+      case A => print "A!\n";
+      case B => print "B!\n";
+      case C => print "C!\n";
+    }
+    print "Hello!\n";
+  }
+
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3809.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3809.dfy.expect
new file mode 100644
index 00000000000..9ba695c450c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3809.dfy.expect
@@ -0,0 +1,3 @@
+Default_ Method
+B!
+Hello!
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839a.dfy
new file mode 100644
index 00000000000..4a596b71ba0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839a.dfy
@@ -0,0 +1,22 @@
+// RUN: ! %baredafny test --use-basename-for-filename --show-snippets:false "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method {:test} M(x: int) returns (r: int) // error: in-parameters not supported
+{
+  expect x != x;
+  return x;
+}
+
+method {:test} MethodWithTypeParameters<X(0)>() returns (y: X) { // error: type parameters not supported
+  y := *;
+}
+
+method {:test} MethodWithTypeParameter<X>() returns (u: seq<X>) { // error: type parameters not supported
+  u := [];
+}
+
+predicate {:test} UnusedTypeParameterForFunctionByMethod<A>() { // error: type parameters not supported
+  true
+} by method {
+  return true;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839a.dfy.expect
new file mode 100644
index 00000000000..d134c938e17
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839a.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-3839a.dfy(4,15): Error: Methods with the :test attribute may not have input arguments
+git-issue-3839a.dfy(10,15): Error: Methods with the :test attribute may not have type parameters
+git-issue-3839a.dfy(14,15): Error: Methods with the :test attribute may not have type parameters
+git-issue-3839a.dfy(18,18): Error: Methods with the :test attribute may not have type parameters
+4 resolution/type errors detected in git-issue-3839a.dfy
diff --git a/Test/git-issues/git-issue-3839/git-issue-3839b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839b.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3839/git-issue-3839b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839b.dfy
diff --git a/Test/git-issues/git-issue-3839/git-issue-3839b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3839/git-issue-3839b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839b.dfy.expect
diff --git a/Test/git-issues/git-issue-3839/git-issue-3839c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839c.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3839/git-issue-3839c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839c.dfy
diff --git a/Test/git-issues/git-issue-3839/git-issue-3839c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839c.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3839/git-issue-3839c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839c.dfy.expect
diff --git a/Test/git-issues/git-issue-3839/git-issue-3839d.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839d.dfy
similarity index 100%
rename from Test/git-issues/git-issue-3839/git-issue-3839d.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839d.dfy
diff --git a/Test/git-issues/git-issue-3839/git-issue-3839d.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839d.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3839/git-issue-3839d.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3839/git-issue-3839d.dfy.expect
diff --git a/Test/git-issues/git-issue-3855.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3855.dfy
similarity index 98%
rename from Test/git-issues/git-issue-3855.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3855.dfy
index 5839defe290..827318ba2a7 100644
--- a/Test/git-issues/git-issue-3855.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3855.dfy
@@ -1,4 +1,5 @@
-// RUN: %exits-with 4 %baredafny verify --show-snippets:false --warn-deprecation:false --use-basename-for-filename "%s" > "%t"
+// RUN: %exits-with 4 %baredafny verify --show-snippets:false --allow-axioms --allow-deprecation --use-basename-for-filename "%s" > "%t".raw
+// RUN: %sed 's/after [0-9]+ seconds/after <redacted> seconds/' %t.raw > "%t"
 // RUN: %diff "%s.expect" "%t"
 // Nearly verbatim copy of the text case given in the issue
 //SIMULADA 
@@ -466,8 +467,6 @@ assert heapExternalsZeroOrOneEdges(xedges);
       o.fields := o.fields[f := t];   ///who designed this fucking syntax?
 
       assert ObjectsAreValid({o});
-
-      assert edges(objects) == old( edges(objects) ) + {Edge(o,f,t)};
           
       var zedges := edges(objects);  //or could hand in if necessary?
       var zisos := justTheIsos(objects);
@@ -637,7 +636,7 @@ function partitionOfJustHeapRegions(os : set<Object>) : (partition : map<Region,
 }
 
 
-method {:rlimit 30000} {:vcs_split_on_every_assert} fNullify(o : Object, f : string)
+method {:resource_limit 30000000} {:isolate_assertions} fNullify(o : Object, f : string)
     requires o  in objects
     requires f  in o.fieldModes
     requires f  in o.fields
@@ -666,26 +665,26 @@ method {:rlimit 30000} {:vcs_split_on_every_assert} fNullify(o : Object, f : str
   
       var nedge :=  Edge(o,f, o.fields[f]); //edge to be nullified
 
-      assert nedge in edges(objects);
+      //assert nedge in edges(objects);
 
       o.fields := RemoveKey(o.fields,f);
 
-      assert nedge !in edges(objects);
+      //assert nedge !in edges(objects);
 
       var zedges := edges(objects); 
 
-      assert zedges + {nedge} == xedges;
+      //assert zedges + {nedge} == xedges;
 
       RefCountIsMonotonic(xisos,xedges,zedges);
 
-      assert heapExternalsZeroOrOneEdges(xedges);
-      assert zedges <= xedges;
-      assert justHeapExternalEdges(zedges) <= justHeapExternalEdges(xedges);
-      assert (set he <- justHeapExternalEdges(zedges) :: he.t.region) <= 
-             (set he <- justHeapExternalEdges(xedges) :: he.t.region);
-      assert forall r <- allRegions(old(objects)) ::
-             externalEdges(r, justHeapExternalEdges(zedges)) <= 
-             externalEdges(r, justHeapExternalEdges(xedges));
+      //assert heapExternalsZeroOrOneEdges(xedges);
+      //assert zedges <= xedges;
+      //assert justHeapExternalEdges(zedges) <= justHeapExternalEdges(xedges);
+      //assert (set he <- justHeapExternalEdges(zedges) :: he.t.region) <= 
+      //       (set he <- justHeapExternalEdges(xedges) :: he.t.region);
+      //assert forall r <- allRegions(old(objects)) ::
+      //       externalEdges(r, justHeapExternalEdges(zedges)) <= 
+      //       externalEdges(r, justHeapExternalEdges(xedges));
 
       assert heapExternalsZeroOrOneEdges(xedges);
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3855.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3855.dfy.expect
new file mode 100644
index 00000000000..2c2bc4bc249
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3855.dfy.expect
@@ -0,0 +1,10 @@
+git-issue-3855.dfy(799,0): Warning: attribute :ignore is deprecated
+git-issue-3855.dfy(799,11): Error: Verification of 'Memory.dynMove' timed out after <redacted> seconds. (the limit can be increased using --verification-time-limit)
+git-issue-3855.dfy(942,17): Error: a precondition for this call could not be proved
+git-issue-3855.dfy(430,29): Related location: this is the precondition that could not be proved
+git-issue-3855.dfy(942,17): Error: a precondition for this call could not be proved
+git-issue-3855.dfy(434,36): Related location: this is the precondition that could not be proved
+git-issue-3855.dfy(1335,20): Error: a precondition for this call could not be proved
+git-issue-3855.dfy(434,36): Related location: this is the precondition that could not be proved
+
+Dafny program verifier finished with 99 verified, 3 errors, 1 time out
diff --git a/Test/git-issues/git-issue-386.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-386.dfy
similarity index 86%
rename from Test/git-issues/git-issue-386.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-386.dfy
index 1f1562bcd7d..a9d3a90a0ad 100644
--- a/Test/git-issues/git-issue-386.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-386.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class Foo {
     // this is accepted
diff --git a/Test/git-issues/github-issue-3658.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-386.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-3658.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-386.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868.dfy
new file mode 100644
index 00000000000..df3753fe200
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868.dfy
@@ -0,0 +1,293 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+method Main() {
+  var r := NotOptimized("let");
+  print r, "\n"; // 15
+  var recur := new Recur(25);
+  print NotSoDeep("1900"), "\n";
+  print WoahThat'sDeep(A, "42"), "\n";
+  print WoahThat'sDeepToo(AA("i", "ii", "iii", "iv", "v", "vi", "vii", "viii", "ix", "x"), "555"), "\n";
+  print "Recur: ", recur.Follow0(A, 12, 80), "\n"; // 116 (that is, 80 + 12*(2 + 1)
+  print "Recur: ", recur.Follow1(A, 12, 80), "\n"; // 116 (that is, 80 + 12*(2 + 1)
+  var w := DeepAssignment(25);
+  print w, "\n"; // 25
+  MatchExpressions.Test();
+}
+
+method NotOptimized(s: string) returns (r: int) {
+  return (var abc := |s|; 3 * abc) + (var xyz := |s|; xyz + xyz);
+}
+
+function NotSoDeep(x: string): Option<string> {
+  var x1 := x;
+  var x2 := x1;
+  var x3 := x2;
+  var x4 := x3;
+  var x5 := x4;
+  var x6 := x5;
+  var x7 := x6;
+  var x8 := x7;
+  var x9 := x8;
+  var x10 := x9;
+  Some(x10)
+}
+
+datatype Or = A | B
+
+function WoahThat'sDeep(o: Or, x: string): Option<string> {
+  var r :- match o {
+    case A =>
+      var x1 := x;
+      var x2 := x1;
+      var x3 := x2;
+      var x4 := x3;
+      var x5 := x4;
+      var x6 := x5;
+      var x7 := x6;
+      var x8 := x7;
+      var x9 := x8;
+      var x10 := x9;
+      Some(x10)
+    case B =>
+      Some("hello")
+  };
+  Some(r)
+}
+
+datatype AB = 
+  | AA(x1: string, x2: string, x3: string, x4: string, x5: string, x6: string, x7: string, x8: string, x9: string, x10: string)
+  | BB
+
+function WoahThat'sDeepToo(ab: AB, x: string): Option<string> {
+  var r :- match ab {
+    case AA(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) =>
+      Some(x10)
+    case BB =>
+      Some("hello")
+  };
+  Some(r)
+}
+
+class Recur {
+  var next: Recur?
+  var data: int
+
+  constructor (n: nat) {
+    data := 2;
+    if n == 0 {
+      next := null;
+    } else {
+      next := new Recur(n - 1);
+    }
+  }
+
+  function Follow0(o: Or, n: nat, m: int): int
+    reads *
+  {
+    var th := this;
+    if n == 0 || next == null then
+      m
+    else
+      var r := match o {
+        case A =>
+          // Note: The following mensions "_this", but instead the code uses "th". This
+          // can be changed back to saying "_this" (and not using "th" at all) after the fix of
+          // https://github.com/dafny-lang/dafny/issues/4684
+          //
+          // Because this call is tail recursive, the "this" on the next line
+          // is compiled into a local variable "_this" and in-parameter "n" becomes
+          // mutable in the target code. Since the whole body of this "match o" is
+          // compiled into a lambda, that mutable "_this" and "n" variables cannot be
+          // used (in some target languages). Instead, the compiler (via the "inLetExprBody"
+          // parameter, see SinglePassCompiler.cs) arranges to make a copy of
+          // "_this" and "n" into "effectively final" local variables.
+          // By using "this" and "n" in the following line, we test that "inLetExprBody"
+          // is passed around appropriately.
+          var x1 := n + th.data - n; // 2
+          var x2 := x1;
+          var x3 := x2;
+          var x4 := x3;
+          var x5 := x4;
+          var x6 := x5;
+          var x7 := x6;
+          var x8 := x7;
+          var x9 := x8;
+          var x10 := x9;
+          x10
+        case B =>
+          999
+      };
+      next.Follow0(o, n - 1, m + r) + 1 // accumulator tail recursion
+  }
+
+  // This function has an auto-accumulator recursive call inside the match. However,
+  // this entire compilation uses TrExprOpt, so the point about using things inside
+  // lambda expressions in the target language do not come arise.
+  function Follow1(o: Or, n: nat, m: int): int
+    reads *
+  {
+    var th := this;
+    if n == 0 || next == null then
+      m
+    else
+      match o {
+        case A =>
+          var x1 := n + th.data - n; // 2
+          var x2 := x1;
+          var x3 := x2;
+          var x4 := x3;
+          var x5 := x4;
+          var x6 := x5;
+          var x7 := x6;
+          var x8 := x7;
+          var x9 := x8;
+          var x10 := x9;
+          next.Follow1(o, n - 1, m + th.data) + 1 // accumulator tail recursion
+        case B =>
+          999
+      }
+  }
+}
+
+datatype Option<+T> = None | Some(value: T) {
+  predicate IsFailure() {
+    None?
+  }
+
+  function PropagateFailure<U>(): Option<U>
+    requires None?
+  {
+    None
+  }
+
+  function Extract(): T
+    requires Some?
+  {
+    value
+  }
+}
+
+method DeepAssignment(x: int) returns (r: int) {
+  r :=
+    var x0 := x;
+    var x1 := x0;
+    var x2 := x1;
+    var x3 := x2;
+    var x4 := x3;
+    var x5 := x4;
+    var x6 := x5;
+    var x7 := x6;
+    if x0 == x7 then
+      var y0 := x;
+      var y1 := y0;
+      y1
+    else
+      var y2 := x;
+      var y3 := y2;
+      y3;
+  return r;
+}
+
+module MatchExpressions {
+  datatype Color = Red | Green | Blue
+  datatype AB = A | B
+  datatype ABC = AA | BB | CC
+
+  method Test() {
+    M(Green);
+    N(Red);
+    var r := O(Blue, 10);
+    print r, "\n"; // 12
+    P(7, 2);
+    label L: {
+      var abc := 0;
+      break L;
+    }
+    print TailRecursive(A, 19), " ", AutoAccumulator(A, 19), "\n"; // 6 25
+    print LastCaseIsDisjunctive(BB), "\n"; // 22
+    print F(A, 12, 80), "\n"; // 80
+    print "It's done\n";
+  }
+
+  method M(c: Color) {
+    var x := match c
+      case Red => 5
+      case Green => 7
+      case Blue => 11;
+    print x, "\n"; // 5
+  }
+
+  method N(c: Color)
+    requires c == Red
+  {
+    var x := match c
+      case Red => 5;
+    print x, "\n"; // 5
+  }
+
+  method O(c: Color, y: int) returns (r: int)
+    requires 0 <= y
+  {
+    if y < 0 {
+      // unreachable
+      var x: int := match c;
+    }
+    r := 12;
+  }
+
+  method P(s: int, t: int)
+    requires t == 0 || t == 2
+  {
+    var x: int := match s
+      case 0 => 100
+      case 2 => 200
+      case _ => 400;
+    var y: int := match t
+      case 0 => 60
+      case 2 => 80;
+    if t == 1 {
+      // unreachable
+      var z: int := match s + t;
+    }
+    print x, " ", y, "\n"; // 400 80
+  }
+
+  function TailRecursive(o: AB, n: nat): int {
+    if n == 0 then 6 else
+      match o
+      case A | B => TailRecursive(o, n - 1)
+  }
+
+  function AutoAccumulator(o: AB, n: nat): int {
+    if n == 0 then 6 else
+      match o
+      case A | B => AutoAccumulator(o, n - 1) + 1
+  }
+
+  function LastCaseIsDisjunctive(o: ABC): int {
+    match o
+    case CC =>
+      777
+    case AA | BB =>
+      22
+  }
+
+  function F(o: AB, n: nat, m: int): int
+  {
+    if n == 0 then
+      m
+    else if n == 1 then
+      var ff := () => match o { // for Java, make sure o is copied
+        case A => 20
+        case B => 999
+      };
+      var s := ff();
+      F(o, n - 1, m)
+    else
+      var u := match o {
+        case A => 20
+        case B => 999
+      };
+      F(o, n - 1, m)
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868.dfy.expect
new file mode 100644
index 00000000000..883c085d988
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868.dfy.expect
@@ -0,0 +1,15 @@
+15
+Option.Some(['1', '9', '0', '0'])
+Option.Some(['4', '2'])
+Option.Some(['x'])
+Recur: 116
+Recur: 116
+25
+7
+5
+12
+400 80
+6 25
+22
+80
+It's done
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868.dfy.rs.check
new file mode 100644
index 00000000000..ed0f1773816
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type\ variance\ Co\ not\ supported</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868a.dfy
new file mode 100644
index 00000000000..3a7c843cc17
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868a.dfy
@@ -0,0 +1,10 @@
+// RUN: %baredafny translate java %args %s --output=%S/git-issue-3868a
+// RUN: %OutputCheck --file-to-check %S/git-issue-3868a-java/_System/__default.java "%s"
+// CHECK: Let\(
+
+// See comment in git-issue-3868b.dfy
+
+method NotOptimized(s: string) returns (r: int) {
+  // We expect the Java compilation of the following line to include some "Let(" calls
+  return (var abc := |s|; 3 * abc) + (var xyz := |s|; xyz + xyz);
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868b.dfy
new file mode 100644
index 00000000000..69b0295513c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3868b.dfy
@@ -0,0 +1,77 @@
+// RUN: %baredafny translate java %args %s --output=%S/git-issue-3868b
+// RUN: %OutputCheck --file-to-check %S/git-issue-3868b-java/_System/__default.java "%s"
+// CHECK-NOT: Let\(
+
+// If the nested let expressions in the following function generate nested lambdas in Java,
+// then the Java compiler chokes (either by taking a very long time or by giving some error).
+// As an extra precautionary measure that we don't generate nested lambdas, the test files
+//     git-issue-3868a.dfy
+//     git-issue-3868b.dfy
+// use OutputCheck to look for occurrences of "Let(" in the target .java file. In this file,
+// we expect there not to be any occurrences of "Let(". But this test could fail for the wrong
+// reason (for example, if the Java "Let" function is renamed in the future), so we also
+// check in git-issue-3868a.dfy that there _is_ an occurrence of "Let(".
+
+datatype Or = A | B
+
+function WoahThat'sDeep(o: Or, x: string): Option<string> {
+  var r :- match o {
+    case A =>
+      var x1 := x;
+      var x2 := x1;
+      var x3 := x2;
+      var x4 := x3;
+      var x5 := x4;
+      var x6 := x5;
+      var x7 := x6;
+      var x8 := x7;
+      var x9 := x8;
+      var x10 := x9;
+      Some(x10)
+    case B =>
+      Some("hello")
+  };
+  Some(r)
+}
+
+datatype Option<+T> = None | Some(value: T) {
+  predicate IsFailure() {
+    None?
+  }
+
+  function PropagateFailure<U>(): Option<U>
+    requires None?
+  {
+    None
+  }
+
+  function Extract(): T
+    requires Some?
+  {
+    value
+  }
+}
+
+// The following method includes an assignment whose RHS is a deeply nested expression.
+// We optimize such assignments, too. By including this test here, we make sure the Java
+// we generate doesn't contain any occurrences of "Let(".
+method DeepAssignment(x: int) returns (r: int) {
+  r :=
+    var x0 := x;
+    var x1 := x0;
+    var x2 := x1;
+    var x3 := x2;
+    var x4 := x3;
+    var x5 := x4;
+    var x6 := x5;
+    var x7 := x6;
+    if x0 == x7 then
+      var y0 := x;
+      var y1 := y0;
+      y1
+    else
+      var y2 := x;
+      var y3 := y2;
+      y3;
+  return r;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3873.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3873.dfy
new file mode 100644
index 00000000000..dc08846cbcf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3873.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+method Main() {
+  var a := new ()[1];
+  var m: map<array<()>, ()> := map[a := ()];
+  var v :| v in m;
+  print v[0], "\n";
+}
diff --git a/Test/git-issues/git-issue-3873.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3873.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3873.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3873.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3873.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3873.dfy.rs.check
new file mode 100644
index 00000000000..2a79815c2f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3873.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitMapBoundedPool</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-3883.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3883.dfy
similarity index 97%
rename from Test/git-issues/git-issue-3883.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3883.dfy
index f1b33552e5e..24e81c7370e 100644
--- a/Test/git-issues/git-issue-3883.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3883.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 type MyType<T> = x: T | true witness * // this used to not compile (C#, Java, Go) -- issue #3883
 type MyInt<T> = x: int | true witness *
diff --git a/Test/git-issues/git-issue-3883.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3883.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3883.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3883.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3883.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3883.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3883.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-3908.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3908.dfy
similarity index 90%
rename from Test/git-issues/git-issue-3908.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3908.dfy
index f55515d3b66..59465855190 100644
--- a/Test/git-issues/git-issue-3908.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3908.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 datatype List<T> = Nil | Cons(T, List<T>)
 
diff --git a/Test/git-issues/git-issue-504.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3908.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-504.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3908.dfy.expect
diff --git a/Test/git-issues/git-issue-3918.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3918.dfy
similarity index 91%
rename from Test/git-issues/git-issue-3918.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3918.dfy
index a340eb511bb..61beea271e1 100644
--- a/Test/git-issues/git-issue-3918.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3918.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // The two errors below had previously slipped by the resolver, causing malformed compiled code.
diff --git a/Test/git-issues/git-issue-3918.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3918.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3918.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3918.dfy.expect
diff --git a/Test/git-issues/git-issue-3921.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3921.dfy
similarity index 97%
rename from Test/git-issues/git-issue-3921.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3921.dfy
index 9c9b3349458..fad4fe6c052 100644
--- a/Test/git-issues/git-issue-3921.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3921.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/git-issues/git-issue-3921.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3921.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3921.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3921.dfy.expect
diff --git a/Test/git-issues/git-issue-3922.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3922.dfy
similarity index 96%
rename from Test/git-issues/git-issue-3922.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3922.dfy
index 14f3095d1ad..abf30d9c57c 100644
--- a/Test/git-issues/git-issue-3922.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3922.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Test/git-issues/git-issue-3922.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3922.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3922.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3922.dfy.expect
diff --git a/Test/git-issues/git-issue-3923.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3923.dfy
similarity index 94%
rename from Test/git-issues/git-issue-3923.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3923.dfy
index ea94ad0fb26..28d2b0f3fb7 100644
--- a/Test/git-issues/git-issue-3923.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3923.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 method DoSomething() {
 }
diff --git a/Test/git-issues/git-issue-3923.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3923.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3923.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3923.dfy.expect
diff --git a/Test/git-issues/git-issue-3955.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3955.dfy
similarity index 88%
rename from Test/git-issues/git-issue-3955.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3955.dfy
index 537ebaa0e73..9a5b8dd4505 100644
--- a/Test/git-issues/git-issue-3955.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3955.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class A {
diff --git a/Test/git-issues/git-issue-4056.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3955.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4056.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3955.dfy.expect
diff --git a/Test/git-issues/git-issue-3956.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3956.dfy
similarity index 77%
rename from Test/git-issues/git-issue-3956.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3956.dfy
index 679cf020f60..2be694e9de0 100644
--- a/Test/git-issues/git-issue-3956.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3956.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 datatype AAA<X> = CtorA
 datatype BBB<Y> = CtorB
diff --git a/Test/git-issues/git-issue-3956.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3956.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3956.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3956.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3956.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3956.dfy.rs.check
new file mode 100644
index 00000000000..b684d0589e7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3956.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `DafnyChar: Default` is not satisfied
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-396.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-396.dfy
new file mode 100644
index 00000000000..7cf6c648547
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-396.dfy
@@ -0,0 +1,16 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+datatype Foo = Bar(value: int)
+
+method GetValue(f: Foo) returns (i: int) {
+  match f
+  case Bar(Bar) =>
+    return 72 + Bar;
+}
+
+method Main() {
+  var x: int := 0;
+  var f: Foo := Bar(42);
+  x := GetValue(f);
+  print x, "\n";
+}
diff --git a/Test/git-issues/git-issue-396.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-396.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-396.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-396.dfy.expect
diff --git a/Test/git-issues/git-issue-3962.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3962.dfy
similarity index 90%
rename from Test/git-issues/git-issue-3962.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3962.dfy
index 3c027c2d661..b0727d953bf 100644
--- a/Test/git-issues/git-issue-3962.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3962.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /printTooltips "%s" > "%t"
+// RUN: %exits-with 4 %build --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Issues(a: bool, s: set) {
diff --git a/Test/git-issues/git-issue-3962.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3962.dfy.expect
similarity index 93%
rename from Test/git-issues/git-issue-3962.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3962.dfy.expect
index 4cec2d6e258..76775842353 100644
--- a/Test/git-issues/git-issue-3962.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3962.dfy.expect
@@ -6,6 +6,7 @@ git-issue-3962.dfy(18,4): Info: ==
 git-issue-3962.dfy(20,4): Info: ==
 git-issue-3962.dfy(22,4): Info: ==
 git-issue-3962.dfy(24,4): Info: ==
+git-issue-3962.dfy(4,7): Info: <_T0(==)>
 git-issue-3962.dfy(20,16): Error: the calculation step between the previous line and this line could not be proved
 git-issue-3962.dfy(24,17): Error: the calculation step between the previous line and this line could not be proved
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3978.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3978.dfy
new file mode 100644
index 00000000000..1c741bcb2d7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3978.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+method Main()
+{
+  for v := 3 to 18
+  {
+    if false {
+      continue;
+    }
+    var x := 1;
+    print x, "\n";
+  }
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-3978.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3978.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3978.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3978.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3978.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3978.dfy.rs.check
new file mode 100644
index 00000000000..c17262a423d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3978.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>ForLoops</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-3987.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3987.dfy
similarity index 76%
rename from Test/git-issues/git-issue-3987.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3987.dfy
index 44aa001a469..e53085de55e 100644
--- a/Test/git-issues/git-issue-3987.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3987.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 datatype D = A
 
diff --git a/Test/git-issues/git-issue-3987.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3987.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3987.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3987.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3987.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3987.dfy.rs.check
new file mode 100644
index 00000000000..c17262a423d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3987.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>ForLoops</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3995.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3995.dfy
new file mode 100644
index 00000000000..6ccf8a0b99c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3995.dfy
@@ -0,0 +1,48 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait Animal {
+    function           not_opaque() : ( rv : int)
+    function {:opaque} iam_opaque() : ( rv : int) 
+
+    predicate depends_on_not_opaque() 
+       ensures  not_opaque() == 42 
+    predicate depends_on_iam_opaque() 
+       ensures  iam_opaque() == 42 
+}
+
+class Cat extends Animal {
+    function           not_opaque() : ( rv : int) { 42 } 
+    function {:opaque} iam_opaque() : ( rv : int) 
+         //ensures rv == 42
+         { reveal iam_opaque();  42 } 
+
+    predicate depends_on_not_opaque() 
+       ensures not_opaque() == 42 {true}
+    predicate depends_on_iam_opaque() 
+       ensures iam_opaque() == 42 {reveal iam_opaque(); true}
+}
+
+trait T {
+  predicate Valid(x: int)
+  method MyMethod(x: int) requires Valid(x)
+}
+
+class C extends T {
+  predicate {:opaque} Valid(x: int) { true }
+  method MyMethod(x: int) requires Valid(x) {
+  }
+}
+
+// The following two types make sure that the override axiom is produced with the correct
+// parameters to the CanCall function.
+
+trait TT {
+  opaque predicate Valid<Y>(x: int, y: Y)
+}
+
+class CC extends TT {
+  opaque predicate Valid<Z>(x: int, z: Z) {
+    if 0 < x then Valid(x - 1, z) else true
+  }
+}
diff --git a/Test/vacid0/Composite.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3995.dfy.expect
similarity index 100%
rename from Test/vacid0/Composite.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-3995.dfy.expect
diff --git a/Test/git-issues/git-issue-4000.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4000.dfy
similarity index 85%
rename from Test/git-issues/git-issue-4000.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4000.dfy
index 9e5e0c8abfe..90d77a8a16d 100644
--- a/Test/git-issues/git-issue-4000.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4000.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Gas {
diff --git a/Test/git-issues/git-issue-4188.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4000.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4188.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4000.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy
new file mode 100644
index 00000000000..cfbeea57042
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings --relax-definite-assignment
+
+method Main() {
+    var a := 0;
+    for i := 0 to |(set x: int | 0 <= x < 3 :: x)| {
+        a := a + 1;
+    }
+    print a, "\n";
+}
diff --git a/Test/git-issues/git-issue-4007.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4007.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy.rs.check
new file mode 100644
index 00000000000..c17262a423d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>ForLoops</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy.verifier.expect
new file mode 100644
index 00000000000..ea6781257d4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4007.dfy.verifier.expect
@@ -0,0 +1 @@
+git-issue-4007.dfy(5,20): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401.dfy
new file mode 100644
index 00000000000..d382a05ec1b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401.dfy
@@ -0,0 +1,7 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %verify --solver-option='PROVER_PATH=%z3' "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+// UNSUPPORTED: windows
+method m() {
+  assert 1 + 1 == 2;
+}
diff --git a/Test/git-issues/git-issue-401.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-401.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4012.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4012.dfy
new file mode 100644
index 00000000000..63c9dddf7c5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4012.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+method Main() {
+  var m: multiset<()> := multiset{};
+  m := m[() := 18446744073709551616];
+  print |m|, "\n";
+}
diff --git a/Test/git-issues/git-issue-4012.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4012.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4012.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4012.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4012.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4012.dfy.rs.check
new file mode 100644
index 00000000000..a6f8bf72073
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4012.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitIndexCollectionUpdate for multiset<\(\)></i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401a.dfy
new file mode 100644
index 00000000000..6b95d1df05b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401a.dfy
@@ -0,0 +1,7 @@
+// Dafny should emit exit value 1
+// RUN: ! %verify --solver-option="PROVER_PATH=Output/binz/z3" "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method m() {
+  assert 1 + 1 == 2;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401a.dfy.expect
new file mode 100644
index 00000000000..8d3696a311f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-401a.dfy.expect
@@ -0,0 +1,2 @@
+CLI: Error: Z3 not found at Output/binz/z3. Please either provide a path to the `z3` executable using the `--solver-path <path>` option, manually place the `z3` directory next to the `dafny` executable you are using (this directory should contain `bin/z3-4.12.1` or `bin/z3-4.12.1.exe`), or set the PATH environment variable to also include a directory containing the `z3` executable.
+1 resolution/type errors detected in git-issue-401a.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-403.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-403.dfy
new file mode 100644
index 00000000000..ce6e006b7a0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-403.dfy
@@ -0,0 +1,12 @@
+// NONUNIFORM: nativeType has back-end specific behavior
+// RUN: %run --target java "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype {:nativeType "byte"} uint8 = x:int | 0 <= x < 0x100
+newtype {:nativeType "int"} int32 = x:int | -0x8000_0000 <= x < 0x8000_0000
+
+method Main() {
+  var u8 : uint8 := 140;
+  var i32 : int32 := u8 as int32;
+  print u8, " == ", i32, "\n";
+}
diff --git a/Test/git-issues/git-issue-403.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-403.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-403.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-403.dfy.expect
diff --git a/Test/git-issues/git-issue-4035.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4035.dfy
similarity index 94%
rename from Test/git-issues/git-issue-4035.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4035.dfy
index 2870f77507e..35a8f87dcad 100644
--- a/Test/git-issues/git-issue-4035.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4035.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module ConstInTrait {
   type ReallyEmpty = x: int | false witness *
diff --git a/Test/git-issues/git-issue-4035.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4035.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4035.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4035.dfy.expect
diff --git a/Test/git-issues/git-issue-4046.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4046.dfy
similarity index 92%
rename from Test/git-issues/git-issue-4046.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4046.dfy
index 8dd93e12773..4aff03c79f4 100644
--- a/Test/git-issues/git-issue-4046.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4046.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module Library {
   export
diff --git a/Test/git-issues/git-issue-4046.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4046.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4046.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4046.dfy.expect
diff --git a/Test/git-issues/git-issue-4048.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4048.dfy
similarity index 100%
rename from Test/git-issues/git-issue-4048.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4048.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4048.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4048.dfy.expect
new file mode 100644
index 00000000000..046851e0872
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4048.dfy.expect
@@ -0,0 +1 @@
+CLI: Error: file x.doo not found
diff --git a/Test/git-issues/git-issue-405.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-405.dfy
similarity index 86%
rename from Test/git-issues/git-issue-405.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-405.dfy
index c93787d465c..6c311546b6b 100644
--- a/Test/git-issues/git-issue-405.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-405.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 const WITNESS := seq(10, i => 0)     // This line alone suffices to cause the original bug
 type Seq10 = s: seq<int> | |s| == 10 witness WITNESS
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-405.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-405.dfy.expect
new file mode 100644
index 00000000000..c489ea4b66b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-405.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-405.dfy(19,22): Error: insufficient reads clause to read field; Consider extracting x to a local variable before the lambda expression, or adding 'reads this' in the enclosing lambda specification for resolution
+
+Dafny program verifier finished with 6 verified, 1 error
diff --git a/Test/git-issues/git-issue-4055.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4055.dfy
similarity index 82%
rename from Test/git-issues/git-issue-4055.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4055.dfy
index 3272f93ec64..cf90b9dd3ec 100644
--- a/Test/git-issues/git-issue-4055.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4055.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 lemma LemmaOutsideofScaffolding2(a: int, b: int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4055.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4055.dfy.expect
new file mode 100644
index 00000000000..933847eb2c5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4055.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-4055.dfy(12,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+git-issue-4055.dfy(7,2): Error: assertion might not hold
+git-issue-4055.dfy(18,2): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Test/git-issues/git-issue-4056.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4056.dfy
similarity index 91%
rename from Test/git-issues/git-issue-4056.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4056.dfy
index 842e0e6e1ad..e361696a68f 100644
--- a/Test/git-issues/git-issue-4056.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4056.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args %s > %t
+// RUN: %verify %s > %t
 // RUN: %diff "%s.expect" "%t"
 
 trait ADT {
diff --git a/Test/git-issues/git-issue-697h.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4056.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-697h.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4056.dfy.expect
diff --git a/Test/git-issues/git-issue-4074.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4074.dfy
similarity index 88%
rename from Test/git-issues/git-issue-4074.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4074.dfy
index 98c21f35381..f5d7bdd058f 100644
--- a/Test/git-issues/git-issue-4074.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4074.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method {:only "wrongArgument"} TestReported() {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4074.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4074.dfy.expect
new file mode 100644
index 00000000000..6473a6fb972
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4074.dfy.expect
@@ -0,0 +1,9 @@
+git-issue-4074.dfy(23,11): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
+git-issue-4074.dfy(4,9): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
+git-issue-4074.dfy(4,14): Warning: {:only} on members does not support arguments
+git-issue-4074.dfy(13,11): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
+git-issue-4074.dfy(5,2): Error: assertion might not hold
+git-issue-4074.dfy(14,4): Error: assertion might not hold
+git-issue-4074.dfy(24,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4131.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4131.dfy
new file mode 100644
index 00000000000..087bf02ddde
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4131.dfy
@@ -0,0 +1,15 @@
+// RUN: %verify --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class Element { }
+
+class Foo {
+  function Collect(M: set<Element>): bool
+    reads this, set a | a in M
+    // The legacy resolver inferred "a" in the following line to have type "Foo",
+    // which results in a type error. This has been fixed in the new resolver.
+    decreases (set a | a in M) + {this}
+  {
+    true
+  }
+}
diff --git a/Test/git-issues/git-issue-611.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4131.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-611.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4131.dfy.expect
diff --git a/Test/git-issues/git-issue-4139-main.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4139-main.dfy
similarity index 100%
rename from Test/git-issues/git-issue-4139-main.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4139-main.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4139.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4139.dfy
new file mode 100644
index 00000000000..f5e73e3d667
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4139.dfy
@@ -0,0 +1,8 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+include "git-issue-4139-main.dfy"
+
+method Main() {
+  var undertest := new TestLogic''TopLevel();
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-4205.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4139.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4205.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4139.dfy.expect
diff --git a/Test/git-issues/git-issue-4141.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4141.dfy
similarity index 82%
rename from Test/git-issues/git-issue-4141.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4141.dfy
index e1b09c3b526..899d73d9150 100644
--- a/Test/git-issues/git-issue-4141.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4141.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 method Test<X(==)>(a: X, b: X) {
     print a == b, "\n";
diff --git a/Test/git-issues/git-issue-4141.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4141.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4141.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4141.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4141.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4141.dfy.rs.check
new file mode 100644
index 00000000000..b0832adda14
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4141.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `RefCell<Vec<bool>>: Hash` is not satisfied
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-4152.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4152.dfy
similarity index 88%
rename from Test/git-issues/git-issue-4152.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4152.dfy
index 728ad2d503c..64abeb6ed48 100644
--- a/Test/git-issues/git-issue-4152.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4152.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 method Main() {
   var a: bv8 := 0xFF;
diff --git a/Test/git-issues/git-issue-4152.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4152.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4152.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4152.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4152.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4152.dfy.rs.check
new file mode 100644
index 00000000000..7d6c2fd331e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4152.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Type name for ORDINAL \(Microsoft_dDafny_dBigOrdinalType\)</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4162.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4162.dfy
new file mode 100644
index 00000000000..84fc1d040a2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4162.dfy
@@ -0,0 +1,15 @@
+// NONUNIFORM: %testDafnyForEachCompiler doesn't support /out
+// RUN: %run --target py --build M "%s" > "%t"
+// RUN: %run --target cs --build M "%s" >> "%t"
+// RUN: %run --target java --build M "%s" >> "%t"
+// RUN: %run --target js --build M "%s" >> "%t"
+// RUN: %run --target go --build M "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module M {
+    const i := 0
+}
+
+method Main() {
+    print M.i, "\n";
+}
diff --git a/Test/git-issues/git-issue-4162.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4162.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4162.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4162.dfy.expect
diff --git a/Test/git-issues/git-issue-4176.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4176.dfy
similarity index 88%
rename from Test/git-issues/git-issue-4176.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4176.dfy
index 2e56dbf61fd..bb6a6e4b06d 100644
--- a/Test/git-issues/git-issue-4176.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4176.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args %s > %t
+// RUN: %verify %s > %t
 // RUN: %diff "%s.expect" "%t"
 
 method test(c: Class) {
diff --git a/Test/git-issues/git-issue-4205a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4176.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4205a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4176.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4181.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4181.dfy
new file mode 100644
index 00000000000..1f6928be6ca
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4181.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+module C {
+  method Test() {
+    print "done\n";
+  }
+}
+
+method Main(){
+  C.Test();
+}
\ No newline at end of file
diff --git a/Test/git-issues/github-issue-3874.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4181.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-3874.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4181.dfy.expect
diff --git a/Test/git-issues/git-issue-4188.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4188.dfy
similarity index 88%
rename from Test/git-issues/git-issue-4188.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4188.dfy
index 136a051b92f..1b3ea6ec1b4 100644
--- a/Test/git-issues/git-issue-4188.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4188.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 newtype T1 = nat
diff --git a/Test/vstte2012/Two-Way-Sort.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4188.dfy.expect
similarity index 100%
rename from Test/vstte2012/Two-Way-Sort.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4188.dfy.expect
diff --git a/Test/git-issues/git-issue-4202.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4202.dfy
similarity index 82%
rename from Test/git-issues/git-issue-4202.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4202.dfy
index 12ba3dcec50..bbccbc45c85 100644
--- a/Test/git-issues/git-issue-4202.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4202.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 opaque function F(x: int): char
diff --git a/Test/git-issues/git-issue-4217.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4202.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4217.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4202.dfy.expect
diff --git a/Test/git-issues/git-issue-4205.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4205.dfy
similarity index 75%
rename from Test/git-issues/git-issue-4205.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4205.dfy
index ef8bc224b17..1d036dc57c0 100644
--- a/Test/git-issues/git-issue-4205.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4205.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait T {
diff --git a/Test/git-issues/git-issue-757.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4205.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-757.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4205.dfy.expect
diff --git a/Test/git-issues/git-issue-4205a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4205a.dfy
similarity index 78%
rename from Test/git-issues/git-issue-4205a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4205a.dfy
index 6f13c6b5f6c..0fc8ffec343 100644
--- a/Test/git-issues/git-issue-4205a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4205a.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait T {
diff --git a/Test/git-issues/git-issue-779.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4205a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-779.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4205a.dfy.expect
diff --git a/Test/git-issues/git-issue-4217.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4217.dfy
similarity index 79%
rename from Test/git-issues/git-issue-4217.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4217.dfy
index fbf7318c3c4..c3f8e448bf7 100644
--- a/Test/git-issues/git-issue-4217.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4217.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 function SpecConverter(input: string): int {
   1
diff --git a/Test/git-issues/git-issue-849a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4217.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-849a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4217.dfy.expect
diff --git a/Test/git-issues/git-issue-4224.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4224.dfy
similarity index 96%
rename from Test/git-issues/git-issue-4224.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4224.dfy
index 2d124c07a73..2132a6c4cd3 100644
--- a/Test/git-issues/git-issue-4224.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4224.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Library {
diff --git a/Test/git-issues/git-issue-4224.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4224.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4224.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4224.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4233.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4233.dfy
new file mode 100644
index 00000000000..01f4a4abf3a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4233.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+newtype MyReal = real
+
+method Main() {
+  var x: MyReal := 12.0 / 10.0;
+  print x, "\n"; // expect 1.2
+
+  if x == 1.0 {
+    assert false;
+    print "unreachable\n";
+  }
+}
diff --git a/Test/git-issues/git-issue-4233.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4233.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4233.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4233.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4233.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4233.dfy.rs.check
new file mode 100644
index 00000000000..3b4eb808140
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4233.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0369]: cannot divide `Rc<num_rational::Ratio<BigInt>>` by `Rc<num_rational::Ratio<BigInt>>`
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-425.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-425.dfy
similarity index 79%
rename from Test/git-issues/git-issue-425.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-425.dfy
index 122a10e4fbb..23a927765be 100644
--- a/Test/git-issues/git-issue-425.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-425.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method M() returns (x: int, ghost y: int) {
   return 42, 43;
diff --git a/Test/git-issues/git-issue-425.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-425.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-425.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-425.dfy.expect
diff --git a/Test/git-issues/git-issue-4261.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4261.dfy
similarity index 98%
rename from Test/git-issues/git-issue-4261.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4261.dfy
index b60cf1525c5..06ae0ffbbfe 100644
--- a/Test/git-issues/git-issue-4261.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4261.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module M {
diff --git a/Test/git-issues/git-issue-612.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4261.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-612.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4261.dfy.expect
diff --git a/Test/git-issues/git-issue-4272.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4272.dfy
similarity index 84%
rename from Test/git-issues/git-issue-4272.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4272.dfy
index 32f8bcfff50..fa6afb96bcc 100644
--- a/Test/git-issues/git-issue-4272.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4272.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /typeSystemRefresh:1 "%s" > "%t"
+// RUN: %verify --type-system-refresh "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Bar {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4272.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4272.dfy.expect
new file mode 100644
index 00000000000..ba00363fc08
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4272.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 4 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4284.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4284.dfy
new file mode 100644
index 00000000000..5f24610f53b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4284.dfy
@@ -0,0 +1,5 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --compile-suffix
+
+method Main() {
+  print (true, false), "\n";
+}
diff --git a/Test/git-issues/git-issue-4284.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4284.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4284.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4284.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4298.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4298.dfy
new file mode 100644
index 00000000000..eec1650cd6b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4298.dfy
@@ -0,0 +1,13 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module A {
+  export E
+    provides f
+
+  function f() : bool { true }
+}
+
+abstract module B {
+  import A0: A
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-4298.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4298.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4298.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4298.dfy.expect
diff --git a/Test/git-issues/git-issue-4309.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4309.dfy
similarity index 88%
rename from Test/git-issues/git-issue-4309.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4309.dfy
index 6fe9fd83be2..2068e34c18d 100644
--- a/Test/git-issues/git-issue-4309.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4309.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 method Main() {
   CallFromTextuallyAbove.Test();
diff --git a/Test/git-issues/git-issue-4309.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4309.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-4309.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4309.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4309.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4309.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4309.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4315.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4315.dfy
new file mode 100644
index 00000000000..e4363cc3b42
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4315.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module M1 {
+  class C {
+    opaque function f() : bool { true }
+  }
+}
+
+module M2 refines M1 {
+}
diff --git a/Test/git-issues/git-issue-616.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4315.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-616.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4315.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4394.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4394.dfy
new file mode 100644
index 00000000000..a1ed5df7c1f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4394.dfy
@@ -0,0 +1,32 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype T = T(
+    f:map<nat,nat>
+) {
+    const Keys := f.Keys // Used to be an error
+}
+
+codatatype codatatypeT = CT(
+    f:map<nat,nat>
+) {
+    const Keys := f.Keys // Used to be an error
+}
+
+type opaqueT {
+  const f: map<nat, nat>
+  const Keys := f.Keys
+}
+
+newtype newT = x: int | true {
+  const f: map<nat, nat> := map[]
+  const Keys := f.Keys
+}
+
+class C {
+  const Keys: set<nat>
+
+  constructor(f:map<nat,nat>) {
+    this.Keys := f.Keys;
+  }
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-895.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4394.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-895.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4394.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-442.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-442.dfy
new file mode 100644
index 00000000000..1db62cb3d52
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-442.dfy
@@ -0,0 +1,7 @@
+// RUN: %resolve "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method m()
+  ensures false
+{
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-442.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-442.dfy.expect
new file mode 100644
index 00000000000..f829807e3d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-442.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier did not attempt verification
diff --git a/Test/git-issues/git-issue-443.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-443.dfy
similarity index 83%
rename from Test/git-issues/git-issue-443.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-443.dfy
index 6702e37484f..0beb8f822f0 100644
--- a/Test/git-issues/git-issue-443.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-443.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   print F(), " ", G(802.11), "\n";  // 12 15
diff --git a/Test/git-issues/git-issue-443.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-443.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-443.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-443.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy
new file mode 100644
index 00000000000..cffe89c9a3e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy
@@ -0,0 +1,24 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+module AnyName {
+  class B {
+    const i := 1
+
+    constructor() {}
+  }
+
+  class AnyName {
+    const j: B
+
+    constructor ()
+    {
+      this.j := new B();
+    }
+  }
+}
+
+method Main() {
+  var b := new AnyName.B();
+  var an := new AnyName.AnyName();
+  print b, "\n", an, "\ndone", "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.cs.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.cs.expect
new file mode 100644
index 00000000000..dcab703fd3b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.cs.expect
@@ -0,0 +1,3 @@
+AnyName.B
+AnyName._AnyName
+done
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.expect
new file mode 100644
index 00000000000..93a73046bc5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.expect
@@ -0,0 +1,3 @@
+AnyName.B
+AnyName.AnyName
+done
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.js.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.js.check
new file mode 100644
index 00000000000..e8852a142f0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.js.check
@@ -0,0 +1 @@
+CHECK-L: TypeError: AnyName.B is not a constructor
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4449.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-446.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446.dfy
similarity index 100%
rename from Test/git-issues/git-issue-446.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446.dfy
diff --git a/Test/git-issues/git-issue-446.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-446.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446.dfy.expect
diff --git a/Test/git-issues/git-issue-446a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446a.dfy
similarity index 100%
rename from Test/git-issues/git-issue-446a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446a.dfy
diff --git a/Test/git-issues/git-issue-446a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-446a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446a.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446a.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446a.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446a.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-446b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446b.dfy
similarity index 100%
rename from Test/git-issues/git-issue-446b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446b.dfy
diff --git a/Test/git-issues/git-issue-446b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-446b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446b.dfy.expect
diff --git a/Test/git-issues/git-issue-446e.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446e.dfy
similarity index 91%
rename from Test/git-issues/git-issue-446e.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446e.dfy
index 94b46ca3b1b..4c8c9e3691c 100644
--- a/Test/git-issues/git-issue-446e.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446e.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Result<T> = Success(value: T) | Failure(error: string)
diff --git a/Test/git-issues/git-issue-446e.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446e.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-446e.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-446e.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4471/git-issue-4471a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4471/git-issue-4471a.dfy
new file mode 100644
index 00000000000..55d98898494
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4471/git-issue-4471a.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 0 %verify "%s"
+
+trait YT<W> {
+  const f: W
+}
+
+class Y extends YT<Y -> nat> {
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4471/git-issue-4471b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4471/git-issue-4471b.dfy
new file mode 100644
index 00000000000..e86610a1238
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4471/git-issue-4471b.dfy
@@ -0,0 +1,23 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait YT<W> {
+  const f: W
+}
+
+class Y extends YT<Y -> nat> {
+  constructor(f: Y -> nat)
+    ensures this.f == f
+  {
+    this.f := f;
+  }
+}
+
+method Main()
+  ensures false
+{
+  // error: knot.f calls itself without decreasing
+  var arrow := (x: Y) => 1 + x.f(x);
+  var knot := new Y(arrow);
+  var a := knot.f(knot);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4471/git-issue-4471b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4471/git-issue-4471b.dfy.expect
new file mode 100644
index 00000000000..be5d79ee314
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4471/git-issue-4471b.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-4471b.dfy(12,11): Error: To prevent the creation of non-terminating functions, storing functions into an object's fields that reads the object is disallowed
+1 resolution/type errors detected in git-issue-4471b.dfy
diff --git a/Test/git-issues/git-issue-448.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-448.dfy
similarity index 93%
rename from Test/git-issues/git-issue-448.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-448.dfy
index ace17d6fe06..24cc2a514c2 100644
--- a/Test/git-issues/git-issue-448.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-448.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:3 "%s" > "%t"
+// RUN: %exits-with 4 %run "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class C {
diff --git a/Test/git-issues/git-issue-448.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-448.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-448.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-448.dfy.expect
diff --git a/Test/git-issues/git-issue-452.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452.dfy
similarity index 81%
rename from Test/git-issues/git-issue-452.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452.dfy
index a810e224c6b..70dd7e923c2 100644
--- a/Test/git-issues/git-issue-452.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 ghost function TwinPrimes(): (int, int) {
   (41, 43)
diff --git a/Test/git-issues/git-issue-452.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-452.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452.dfy.expect
diff --git a/Test/git-issues/git-issue-452a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452a.dfy
similarity index 87%
rename from Test/git-issues/git-issue-452a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452a.dfy
index fca7f334a63..d31f596d5fd 100644
--- a/Test/git-issues/git-issue-452a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452a.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 ghost function TwinPrimes(): (int, int) {
   (41, 43)
diff --git a/Test/git-issues/git-issue-452a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-452a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452a.dfy.expect
diff --git a/Test/git-issues/git-issue-452b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452b.dfy
similarity index 86%
rename from Test/git-issues/git-issue-452b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452b.dfy
index 2ee9e4e5c18..d9bd5e43a9e 100644
--- a/Test/git-issues/git-issue-452b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452b.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Record = Record(a: int, ghost b: int)
diff --git a/Test/git-issues/git-issue-452b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-452b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452b.dfy.expect
diff --git a/Test/git-issues/git-issue-452c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452c.dfy
similarity index 82%
rename from Test/git-issues/git-issue-452c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452c.dfy
index c02aef43edb..a706a1e8877 100644
--- a/Test/git-issues/git-issue-452c.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452c.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 datatype Record = Record(a: int, ghost b: int)
 
diff --git a/Test/git-issues/git-issue-452c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452c.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-452c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-452c.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4684.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4684.dfy
new file mode 100644
index 00000000000..4ae03f4c481
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4684.dfy
@@ -0,0 +1,44 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+class C {
+  var data: nat
+  var next: C?
+
+  constructor (n: nat) {
+    data := n;
+    if n == 0 {
+      next := null;
+    } else {
+      next := new C(n - 1);
+    }
+  }
+
+  function FWithoutTailRecursion(n: nat, g: () ~> int): int
+    requires g.requires()
+    reads *
+  {
+    if n == 0 || next == null then
+      g()
+    else
+      var h := () reads this => this.data;
+      var r := next.FWithoutTailRecursion(n - 1, if n < 20 then g else h);
+      r
+  }
+
+  function F(n: nat, g: () ~> int): int
+    requires g.requires()
+    reads *
+  {
+    if n == 0 || next == null then
+      g()
+    else
+      var h := () reads this => this.data;
+      next.F(n - 1, if n < 20 then g else h)
+  }
+}
+
+method Main() {
+  var c := new C(25);
+  print c.FWithoutTailRecursion(25, () => -1), "\n"; // 20
+  print c.F(25, () => -1), "\n"; // 20
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4684.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4684.dfy.expect
new file mode 100644
index 00000000000..b611ed20cf6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4684.dfy.expect
@@ -0,0 +1,2 @@
+20
+20
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4684.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4684.dfy.rs.check
new file mode 100644
index 00000000000..8f800076642
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4684.dfy.rs.check
@@ -0,0 +1 @@
+CHECK: error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4724.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4724.dfy
new file mode 100644
index 00000000000..7768592ed00
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4724.dfy
@@ -0,0 +1,9 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+type seq31<T> = x: seq<T> | |x| <= 31
+
+method TakeThis(x: seq31<int> := []) 
+{
+  TakeThis(); // Error: cannot prove termination; try supplying a decreases clause
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4724.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4724.dfy.expect
new file mode 100644
index 00000000000..61cfed51234
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4724.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-4724.dfy(8,10): Error: cannot prove termination; try supplying a decreases clause
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4731.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4731.dfy
new file mode 100644
index 00000000000..b3dde284c23
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4731.dfy
@@ -0,0 +1,29 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+datatype Option<T> = Some(val: T) | None {
+  predicate  IsFailure() {
+    None?
+  }
+  
+  function  PropagateFailure<V>(): Option<V>
+    requires None?
+  {
+    None
+  }
+
+  function Extract(): T
+    requires Some?
+  {
+    val
+  }
+}
+
+function Foo0(): Option<bool> {
+  var x: Option<bool> :- None;
+  None
+}
+
+function Foo1(): Option<bool> {
+  var x: Option<int> :- None;
+  None
+}
diff --git a/Test/lambdas/StateMonad.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4731.dfy.expect
similarity index 100%
rename from Test/lambdas/StateMonad.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4731.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4768.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4768.dfy
new file mode 100644
index 00000000000..f886d088878
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4768.dfy
@@ -0,0 +1,10 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+abstract module A {
+  opaque predicate Valid<R>(n: int)
+  { true }
+}
+
+abstract module B refines A {
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-621a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4768.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-621a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4768.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4778.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4778.dfy
new file mode 100644
index 00000000000..216baa17c0e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4778.dfy
@@ -0,0 +1,39 @@
+// RUN: %verify --warn-contradictory-assumptions --allow-warnings "%s" > "%t"
+// DIFF: "%s.expect" "%t"
+
+type CodeUnit
+type CodeUnitSeq = seq<CodeUnit>
+type MinimalWellFormedCodeUnitSeq = s: CodeUnitSeq
+  | IsMinimalWellFormedCodeUnitSubsequence(s)
+  witness *
+
+function IsMinimalWellFormedCodeUnitSubsequence(s: CodeUnitSeq): (b: bool)
+  ensures b ==>
+            && |s| > 0
+            && forall i | 0 < i < |s| :: !IsMinimalWellFormedCodeUnitSubsequence(s[..i])
+  decreases |s|
+
+/**
+ * If minimal well-formed code unique subsequences `m1` and `m2` are prefixes of `s`, then they are equal.
+ */
+lemma LemmaUniquePrefixMinimalWellFormedCodeUnitSeq(
+  s: CodeUnitSeq, m1: MinimalWellFormedCodeUnitSeq, m2: MinimalWellFormedCodeUnitSeq
+)
+  decreases |s|, |m1|, |m2|
+  requires m1 <= s
+  requires m2 <= s
+  ensures m1 == m2
+{
+  // Handle only the |m1| <= |m2| case explicitly
+  if |m1| > |m2| {
+    LemmaUniquePrefixMinimalWellFormedCodeUnitSeq(s, m2, m1);
+  } else {
+    assert m1 <= m2;
+    assert m1 == m2 by {
+      var m2' := m2[..|m1|];
+      if m1 < m2 {
+        assert {:contradiction} m1 == m2';
+      }
+    }
+  }
+}
diff --git a/Test/git-issues/github-issue-3797.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4778.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-3797.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4778.dfy.expect
diff --git a/Test/git-issues/git-issue-478-errors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-errors.dfy
similarity index 95%
rename from Test/git-issues/git-issue-478-errors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-errors.dfy
index 637a1304e97..15d1c504bae 100644
--- a/Test/git-issues/git-issue-478-errors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-errors.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 // The LibA and LibB examples are the same, except for the order of declarations.
 //
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-errors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-errors.dfy.expect
new file mode 100644
index 00000000000..be05d5a35d3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-errors.dfy.expect
@@ -0,0 +1,16 @@
+git-issue-478-errors.dfy(22,2): Error: Import declaration uses same name as a module in the same scope: LibW
+git-issue-478-errors.dfy(26,2): Error: Import declaration uses same name as a module in the same scope: LibX
+git-issue-478-errors.dfy(36,7): Error: Duplicate module name: M
+git-issue-478-errors.dfy(35,7): Related location
+git-issue-478-errors.dfy(7,0): Error: Import declaration uses same name as a module in the same scope: LibA
+git-issue-478-errors.dfy(11,0): Error: Import declaration uses same name as a module in the same scope: LibB
+git-issue-478-errors.dfy(37,0): Error: Import declaration uses same name as a module in the same scope: M
+git-issue-478-errors.dfy(38,0): Error: Import declaration uses same name as a module in the same scope: M
+git-issue-478-errors.dfy(40,7): Error: Import declaration uses same name as a module in the same scope: M
+git-issue-478-errors.dfy(41,7): Error: Import declaration uses same name as a module in the same scope: M
+git-issue-478-errors.dfy(44,0): Error: Duplicate name of import: N
+git-issue-478-errors.dfy(48,14): Error: Import declaration uses same name as a module in the same scope: AA
+git-issue-478-errors.dfy(49,14): Error: Import declaration uses same name as a module in the same scope: BB
+git-issue-478-errors.dfy(59,14): Error: Import declaration uses same name as a module in the same scope: X
+git-issue-478-errors.dfy(65,14): Error: Duplicate name of import: R
+14 resolution/type errors detected in git-issue-478-errors.dfy
diff --git a/Test/git-issues/git-issue-478-good.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-good.dfy
similarity index 93%
rename from Test/git-issues/git-issue-478-good.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-good.dfy
index 9abce41e97c..0b3157628b8 100644
--- a/Test/git-issues/git-issue-478-good.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-good.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // By first defining import LibA and then defining a module LibA,
 // the latter used to generate:
diff --git a/Test/git-issues/git-issue-478-good.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-good.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-478-good.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-478-good.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4787.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4787.dfy
new file mode 100644
index 00000000000..e52a5ef73c2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4787.dfy
@@ -0,0 +1,19 @@
+// RUN: %exits-with 4 %verify --warn-redundant-assumptions --allow-axioms --warn-contradictory-assumptions --show-snippets:true "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module M {
+  opaque function ToSet(xs: seq<int>): set<int> {
+    set x: int | x in xs
+  }
+
+  lemma LemmaCardinality(xs: seq<int>)
+    ensures |ToSet(xs)| <= |xs|
+  {}
+
+  lemma LemmaEmpty(xs: seq<int>)
+    requires xs == []
+    ensures |ToSet(xs)| == 0
+  {
+    assume false;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4787.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4787.dfy.expect
new file mode 100644
index 00000000000..16bb2a08797
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4787.dfy.expect
@@ -0,0 +1,22 @@
+git-issue-4787.dfy(11,2): Error: a postcondition could not be proved on this return path
+   |
+11 |   {}
+   |   ^
+
+git-issue-4787.dfy(10,24): Related location: this is the postcondition that could not be proved
+   |
+10 |     ensures |ToSet(xs)| <= |xs|
+   |             ^^^^^^^^^^^^^^^^^^^
+
+git-issue-4787.dfy(14,13): Warning: unnecessary requires clause
+   |
+14 |     requires xs == []
+   |              ^^^^^^^^
+
+git-issue-4787.dfy(15,12): Warning: ensures clause proved using contradictory assumptions
+   |
+15 |     ensures |ToSet(xs)| == 0
+   |             ^^^^^^^^^^^^^^^^
+
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4812.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4812.dfy
new file mode 100644
index 00000000000..52ddbffb21e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4812.dfy
@@ -0,0 +1,16 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait ProblemHolder<T(!new, ==)> {
+  ghost function Solution(): T
+
+  predicate Problem(solution: T)
+    ensures Solution() == solution
+}
+
+trait Instantiation extends ProblemHolder<int> {
+  ghost function Solution(): int
+
+  predicate Problem(solution: int)
+    ensures Solution() == solution
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4812.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4812.dfy.expect
new file mode 100644
index 00000000000..ba00363fc08
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4812.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 4 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4823.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4823.dfy
new file mode 100644
index 00000000000..2d2b01476d7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4823.dfy
@@ -0,0 +1,11 @@
+// RUN: %baredafny verify %args --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait Test<T> {
+  function Cast(t: T): Test<T>
+}
+
+datatype Impl extends Test<Impl> = ImplConstructor()
+{
+  function Cast(t: Impl): Test<Impl> { t }
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-897b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4823.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-897b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4823.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4830.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4830.dfy
new file mode 100644
index 00000000000..9171d3bd42b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4830.dfy
@@ -0,0 +1,3 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+datatype None = None
diff --git a/Test/git-issues/git-issue-784.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4830.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-784.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4830.dfy.expect
diff --git a/Test/git-issues/git-issue-484.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-484.dfy
similarity index 96%
rename from Test/git-issues/git-issue-484.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-484.dfy
index 61dcfa2c225..240bb45bd07 100644
--- a/Test/git-issues/git-issue-484.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-484.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 newtype MyInt = int
diff --git a/Test/git-issues/git-issue-484.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-484.dfy.expect
similarity index 80%
rename from Test/git-issues/git-issue-484.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-484.dfy.expect
index 350b1047787..da23d432306 100644
--- a/Test/git-issues/git-issue-484.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-484.dfy.expect
@@ -1,6 +1,6 @@
 git-issue-484.dfy(10,6): Error: type of corresponding source/RHS (int) does not match type of bound variable (MyInt)
 git-issue-484.dfy(19,6): Error: type of corresponding source/RHS (real) does not match type of bound variable (MyInt)
-git-issue-484.dfy(23,2): Error: incorrect argument type for datatype constructor parameter 'b' (expected MyInt, found int)
+git-issue-484.dfy(23,6): Error: incorrect argument type for datatype constructor parameter 'b' (expected MyInt, found int)
 git-issue-484.dfy(34,6): Error: type of corresponding source/RHS (int) does not match type of bound variable (byte)
-git-issue-484.dfy(40,2): Error: incorrect argument type for datatype constructor parameter 'b' (expected byte, found int)
+git-issue-484.dfy(40,6): Error: incorrect argument type for datatype constructor parameter 'b' (expected byte, found int)
 5 resolution/type errors detected in git-issue-484.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4844.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4844.dfy
new file mode 100644
index 00000000000..06b1803f44b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4844.dfy
@@ -0,0 +1,18 @@
+// RUN: %exits-with 4 %baredafny verify %args "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Ooops()
+  ensures false
+{
+  var x := new O();
+  assert AllocationSoundness(x);
+}
+
+class O {
+  var x: int
+  constructor() {}
+}
+
+twostate predicate AllocationSoundness(o: O)
+  ensures old(allocated(o))
+{ true }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4844.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4844.dfy.expect
new file mode 100644
index 00000000000..042916a5d6a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4844.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-4844.dfy(8,29): Error: argument for parameter 'o' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new o: O', arguments can refer to expressions possibly unallocated in the previous state
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4866.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4866.dfy
new file mode 100644
index 00000000000..d9ee4e974fd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4866.dfy
@@ -0,0 +1,25 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+module A {
+  type R<T, U> = T
+
+  datatype D<U> = D(x: R<string, U>)
+
+  method Foo<U>(x: R<string, U>)
+  {
+    var _ := D(x);
+  }
+}
+
+module B {
+  type MyType<X>
+
+  type R<T, U> = T
+
+  datatype D<U> = D(x: R<MyType<char>, U>)
+
+  method Foo(x: R<MyType<char>, real>)
+  {
+    var y := D<bool>.D(x);
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4866.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4866.dfy.expect
new file mode 100644
index 00000000000..3fce547bf43
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4866.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-4866.dfy(10,8): Error: the type of this variable is underspecified
+1 resolution/type errors detected in git-issue-4866.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4866.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4866.dfy.refresh.expect
new file mode 100644
index 00000000000..a5f52e05169
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4866.dfy.refresh.expect
@@ -0,0 +1,2 @@
+git-issue-4866.dfy(10,8): Error: the type ('D<?0>') of this variable is underspecified
+1 resolution/type errors detected in git-issue-4866.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4893.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4893.dfy
new file mode 100644
index 00000000000..56d6e389f1f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4893.dfy
@@ -0,0 +1,15 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=0 "%s"
+
+module A
+{
+  export
+    provides T
+
+  newtype T = int
+}
+
+module B
+{
+  import A
+  type X = A.T
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-864zz.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4893.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-864zz.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4893.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4926.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4926.dfy
new file mode 100644
index 00000000000..fa67020eaf3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4926.dfy
@@ -0,0 +1,95 @@
+ // RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+module Basics {
+  function F<A(!new)>(): int
+  function G<A(0)>(): int
+  function H<A(00)>(): int
+  function J<A(==)>(): int
+
+  type Cmp<A(==)>
+
+  class Cell { }
+  type Nonempty = x: int | x % 2 == 0 ghost witness 4
+  datatype Record = Record(x: int, ghost y: int) // note, no equality support
+
+  method Test()
+    ensures F<Cell>() == 9 // error: type argument is required to support (!new)
+    ensures G<Cell>() == 9 // error: type argument is required to support (0)
+    ensures H<Cell>() == 9 // error: type argument is required to support (00)
+    ensures J<Cell>() == 9
+  {
+    var x0 := F<Cell>(); // error: type argument is required to support (!new)
+    var x1 := G<Nonempty>(); // error: type argument is required to support (0)
+    var x2 := H<Nonempty>();
+    var x3 := J<Record>(); // error: type argument is required to support (==)
+    ghost var y0 := F<Cell>(); // error: type argument is required to support (!new)
+    ghost var y1 := G<Nonempty>();
+    ghost var y2 := H<Nonempty>();
+    ghost var y3 := J<Record>();
+  }
+
+  method MethodSpecification(o: object)
+    requires F<Cell>() < 100 // error: type argument is required to support (!new)
+    modifies if F<Cell>() < 20 then {o} else {} // error: type argument is required to support (!new)
+    ensures F<Cell>() < 100 // error: type argument is required to support (!new)
+    decreases F<Cell>() // error: type argument is required to support (!new)
+
+  function FunctionSpecification(o: object): int
+    requires F<Cell>() < 100 // error: type argument is required to support (!new)
+    reads if F<Cell>() < 20 then {o} else {} // error: type argument is required to support (!new)
+    ensures F<Cell>() < 100 // error: type argument is required to support (!new)
+    decreases F<Cell>() // error: type argument is required to support (!new)
+
+  iterator IteratorSpecification(o: object)
+    requires F<Cell>() < 100 // error: type argument is required to support (!new)
+    yield requires F<Cell>() < 80 // error: type argument is required to support (!new)
+    modifies if F<Cell>() < 20 then {o} else {} // error: type argument is required to support (!new)
+    reads if F<Cell>() < 20 then {o} else {} // error: type argument is required to support (!new)
+    yield ensures F<Cell>() < 80 // error: type argument is required to support (!new)
+    ensures F<Cell>() < 100 // error: type argument is required to support (!new)
+    decreases F<Cell>() // error: type argument is required to support (!new)
+
+  method DefaultParameters0(x: int := J<Record>()) // error: type argument is required to support (==)
+  method DefaultParameters1(ghost y: int := J<Record>())
+
+  datatype DefaultValues =
+    | Ctor0(x: int := J<Record>()) // error: type argument is required to support (==)
+    | Ctor1(ghost y: int := J<Record>())
+    | ghost Ctor2(z: int := J<Record>())
+
+  function FunctionWithNamedResult(): (u: Cmp<Record>) // error: type argument is required to support (==)
+  function FunctionWithUnnamedResult(): Cmp<Record> // error: type argument is required to support (==)
+}
+
+module Extreme {
+  codatatype InfiniteTree<!A> = Node(value: int, next: A -> InfiniteTree)
+
+  greatest predicate Bisimilar<A(!new)>(t: InfiniteTree, u: InfiniteTree) {
+    && t.value == u.value
+    && forall a: A :: Bisimilar(t.next(a), u.next(a))
+  }
+
+  greatest lemma SelfSimilar<A>(t: InfiniteTree<A>)
+    ensures Bisimilar<A>(t, t) // error: type argument is required to support (!new)
+  {
+  }
+
+  greatest lemma SelfSimilarCorrected<A(!new)>(t: InfiniteTree<A>)
+    ensures Bisimilar<A>(t, t)
+  {
+  }
+
+  class Class { }
+
+  lemma SelfSimilarForClass(t: InfiniteTree<Class>)
+    ensures Bisimilar<Class>(t, t) // error: type argument is required to support (!new)
+  {
+    SelfSimilarCorrected<Class>(t); // error: type argument is required to support (!new)
+  }
+
+  lemma SelfSimilarForClassHash(o: ORDINAL, t: InfiniteTree<Class>)
+    ensures Bisimilar#<Class>[o](t, t) // error: type argument is required to support (!new)
+  {
+    SelfSimilarCorrected#<Class>[o](t); // error: type argument is required to support (!new)
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4926.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4926.dfy.expect
new file mode 100644
index 00000000000..85866c843b1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4926.dfy.expect
@@ -0,0 +1,39 @@
+git-issue-4926.dfy(16,19): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(17,19): Error: type parameter (A) passed to function G must support auto-initialization (got Cell)
+git-issue-4926.dfy(18,19): Error: type parameter (A) passed to function H must be nonempty (got Cell)
+git-issue-4926.dfy(21,21): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(22,25): Error: type parameter (A) passed to function G must support auto-initialization (got Nonempty)
+git-issue-4926.dfy(24,23): Error: type parameter (A) passed to function J must support equality (got Record)
+git-issue-4926.dfy(25,27): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(32,20): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(33,23): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(34,19): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(35,21): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(38,20): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(39,20): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(40,19): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(41,21): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(52,47): Error: type parameter (A) passed to function J must support equality (got Record)
+git-issue-4926.dfy(60,42): Error: type parameter (A) passed to type Cmp must support equality (got Record)
+git-issue-4926.dfy(61,40): Error: type parameter (A) passed to type Cmp must support equality (got Record)
+git-issue-4926.dfy(44,20): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(46,23): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(49,19): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(50,21): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(45,26): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(47,20): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(48,25): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(44,20): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(47,20): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(46,23): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(50,21): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(45,26): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(48,25): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(49,19): Error: type parameter (A) passed to function F must contain no references (got Cell)
+git-issue-4926.dfy(56,31): Error: type parameter (A) passed to function J must support equality (got Record)
+git-issue-4926.dfy(73,24): Error: type parameter (A) passed to greatest predicate Bisimilar must contain no references (got A) (perhaps try declaring type parameter 'A' on line 72 as 'A(!new)', which says it can only be instantiated with a type that contains no references)
+git-issue-4926.dfy(85,28): Error: type parameter (A) passed to greatest predicate Bisimilar must contain no references (got Class)
+git-issue-4926.dfy(87,31): Error: type parameter (A) passed to greatest lemma SelfSimilarCorrected must contain no references (got Class)
+git-issue-4926.dfy(91,32): Error: type parameter (A) passed to prefix predicate Bisimilar# must contain no references (got Class)
+git-issue-4926.dfy(93,35): Error: type parameter (A) passed to prefix lemma SelfSimilarCorrected# must contain no references (got Class)
+38 resolution/type errors detected in git-issue-4926.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936a.dfy
new file mode 100644
index 00000000000..d04391b9792
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936a.dfy
@@ -0,0 +1,16 @@
+// RUN: %testDafnyForEachResolver "%s" -- --general-traits:datatype
+
+module X {
+  trait {:termination false} A extends object {}
+}
+
+module Y {
+  import opened X
+
+  trait B extends A {
+    function GetIndex(): nat
+      // The following once gave an error, complaining that B is not a reference type. The problem had been that
+      // the opened import A was, effectively, hiding the information that A is a reference type.
+      reads this
+  }
+}
diff --git a/Test/git-issues/git-issue-907.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-907.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936a.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936b.dfy
new file mode 100644
index 00000000000..d7f947ee136
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936b.dfy
@@ -0,0 +1,19 @@
+// RUN: %testDafnyForEachResolver "%s" -- --general-traits:datatype
+
+module X {
+  trait K { }
+  trait {:termination false} A extends object, K {}
+}
+
+module Y {
+  import opened X
+
+  trait B extends A { }
+
+  method Test(b: B) returns (a: A) {
+    // The following assignment once caused malformed Boogie to be generated. The reason had been that
+    // the resolver had not determined B to be a reference type. And that, in turn, had been caused by
+    // that the opened import, effectively, had lost the "extends object" information.
+    a := b;
+  }
+}
diff --git a/Test/git-issues/git-issue-944.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-944.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936b.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936c.dfy
new file mode 100644
index 00000000000..f4f1dfdeafc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936c.dfy
@@ -0,0 +1,97 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --general-traits:datatype
+
+// The early-resolver code that figures out if a trait is a reference type or not is operating so early
+// in the resolver pipeline that opened imports have not yet been resolved into the importing module.
+// Thus, this early-resolver code looks directly into the top-level members of opened imports, but does
+// so without consideration for possible ambiguities. This means that the early-resolver code may not
+// properly figure out if a trait is a reference type or not. But if it gets it wrong, the ambiguity
+// will still be reported as an error later in the resolver pipeline.
+//
+// This test file makes sure that the ambiguous-import errors are indeed being reported and that the
+// resolver doesn't crash until then.
+
+module X0 {
+  // Here, A is a reference type
+  trait {:termination false} A extends object {}
+}
+
+module X1 {
+  // Here, A is not a reference type
+  trait {:termination false} A {}
+}
+
+module X2 {
+  // Here, A is not a reference type; in fact, it isn't even a type
+  const A: object?
+}
+
+module Y01 {
+  import opened X0
+  import opened X1
+
+  trait B extends A { // error: A is ambiguous
+    function GetIndex(): nat
+      reads this
+  }
+}
+
+module Y10 {
+  import opened X1
+  import opened X0
+
+  trait B extends A { // error: A is ambiguous
+    function GetIndex(): nat
+      reads this
+  }
+}
+
+module Y0123 {
+  import opened X0
+  import opened X1
+  import opened X2
+
+  trait B extends A { // error: A is ambiguous
+    function GetIndex(): nat
+      reads this
+  }
+}
+
+module Y210 {
+  import opened X2
+  import opened X1
+  import opened X0
+
+  trait B extends A { // error: A is ambiguous
+    function GetIndex(): nat
+      reads this
+  }
+}
+
+module Z {
+  import opened X0
+  import opened X1
+  import opened X2
+
+}
+
+module Z1 {
+  import opened X0
+  import opened X1
+  import opened X2
+
+  trait B extends X0.A { // no problem, since X0.A is fully qualified
+    function GetIndex(): nat
+      reads this // no problem, since B is a reference type
+  }
+}
+
+module Z2 {
+  import opened X0
+  import opened X1
+  import opened X2
+
+  trait B extends X1.A { // no problem, since X1.A is fully qualified
+    function GetIndex(): nat
+      reads this // error: B is not a reference type
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936c.dfy.expect
new file mode 100644
index 00000000000..db24a819468
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936c.dfy.expect
@@ -0,0 +1,6 @@
+git-issue-4936c.dfy(32,18): Error: The name A ambiguously refers to a type in one of the modules X0, X1 (try qualifying the type name with the module name)
+git-issue-4936c.dfy(42,18): Error: The name A ambiguously refers to a type in one of the modules X1, X0 (try qualifying the type name with the module name)
+git-issue-4936c.dfy(53,18): Error: The name A ambiguously refers to a type in one of the modules X0, X1 (try qualifying the type name with the module name)
+git-issue-4936c.dfy(64,18): Error: The name A ambiguously refers to a type in one of the modules X1, X0 (try qualifying the type name with the module name)
+git-issue-4936c.dfy(95,12): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got B)
+5 resolution/type errors detected in git-issue-4936c.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936d.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936d.dfy
new file mode 100644
index 00000000000..214864f6dbf
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936d.dfy
@@ -0,0 +1,58 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --general-traits:datatype
+
+module X {
+  export Public
+    provides A
+  export Friends
+    reveals A
+
+  trait {:termination false} A extends object {}
+}
+
+module Y0 {
+  import opened X`Public
+
+  trait B extends A { // error: A is not even known to be a trait
+    function GetIndex(): nat
+      reads this
+  }
+}
+
+module Y1 {
+  import opened X`Friends
+
+  trait B extends A {
+    function GetIndex(): nat
+      reads this // fine, since B is known to be a reference type
+  }
+}
+
+module Y2 {
+  import opened I = X`Friends
+  import opened J = X`Public
+
+  trait B extends A {
+    function GetIndex(): nat
+      reads this // fine, since B is known to be a reference type
+  }
+}
+
+module Y3 {
+  import opened X`Friends
+  import opened J = X`Public
+
+  trait B extends J.A { // fine, since the module also imports X`Friends
+    function GetIndex(): nat
+      reads this // fine, since B is known to be a reference type
+  }
+}
+
+module Y4 {
+  import I = X`Friends
+  import J = X`Public
+
+  trait B extends J.A { // fine, since the module also imports X`Friends
+    function GetIndex(): nat
+      reads this // fine, since B is known to be a reference type
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936d.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936d.dfy.expect
new file mode 100644
index 00000000000..8be963e3829
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4936d.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-4936d.dfy(15,18): Error: a trait can only extend traits (found 'A')
+1 resolution/type errors detected in git-issue-4936d.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939a.dfy
new file mode 100644
index 00000000000..ea1d9cf37ec
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939a.dfy
@@ -0,0 +1,220 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module FromIssue0 {
+  trait Program {
+    method Compute() returns (r: Result)
+  }
+
+  datatype Result =
+    | Bounce(next: Program)
+    | Done()
+
+  datatype Trivial extends Program =
+    Trivial()
+  {
+    method Compute() returns (r: Result) {
+      return Done();
+    }
+  }
+
+  datatype Seq extends Program =
+    Seq(left: Program, right: Program) // this once gave an error, saying Seq is empty because of cyclic dependencies
+  {
+    method Compute() returns (r: Result) {
+      var result := left.Compute(); // error: cannot prove termination
+      match result
+      case Done() => r := right.Compute();
+      case Bounce(next) =>
+        var next' := Seq(next, right);
+        assert next' is Program;
+        return Bounce(next');
+    }
+  }
+}
+
+module FromIssue1 {
+  trait Program {
+  }
+
+  datatype Trivial extends Program =
+    Trivial()
+
+  datatype Seq extends Program =
+    Seq(left: Program, right: Program) // this once gave an error, saying Seq is empty because of cyclic dependencies
+}
+
+module FromIssue2 {
+  // NoInstances has no instances
+  class NoInstances {
+    constructor ()
+      requires false
+    {
+    }
+  }
+
+  // ... and therefore, neither does D. However, this is not detected syntactically, so there are no complaints.
+  datatype D = D(n: NoInstances)
+}
+
+module FromIssue3 {
+  trait Interface {
+    function getString(i: int): string
+  }
+
+  datatype Wrapper extends Interface = Wrapper(inner: Interface) // this once gave the cyclic-dependency error
+  {
+    function getString(i: int): string {
+      inner.getString(i + 1) // error: cannot prove termination
+    }
+  }
+
+  datatype DetectZero extends Interface  = DetectZero
+  {
+    function getString(i: int): string {
+      if i == 0
+      then "zero"
+      else "I don't know"
+    }
+  }
+
+  function getWrappedDetectZero(): Interface {
+    Wrapper(DetectZero)
+  }
+}
+
+module FromIssue4 {
+  trait Interface {
+    function GetString(i: int): string
+  }
+
+  class {:extern} Store {
+    var interface: Interface
+
+    constructor (interface: Interface) {
+      this.interface := interface;
+    }
+
+    function GetInterface(): (res: Interface)
+       ensures res == interface
+  }
+
+  datatype Wrapper extends Interface = Wrapper(inner: Store)
+  {
+    function GetString(i: int): string {
+      inner.GetInterface().GetString(i + 1) // error: cannot prove termination
+    }
+  }
+}
+
+module SimpleExample0 {
+  trait GeneralTrait {
+  }
+
+  datatype Wrapper = Wrapper(g: GeneralTrait) // this once gave the cyclic-dependency error
+}
+
+module SimpleExample1 {
+  trait ReferenceTrait extends object {
+  }
+
+  datatype Wrapper = Wrapper(g: ReferenceTrait) // this was always fine
+}
+
+module Standard {
+  datatype List<X> = Nil | Cons(X, List<X>)
+
+  datatype Op = Plus | Times
+  datatype Expr = Value(int) | Node(operator: Op, arguments: List<Expr>)
+}
+
+module Good0 {
+  datatype Mutual = M0(Nutual) | M1(Mutual)
+  datatype Nutual = N0(Mutual) | Easy
+}
+
+module Good1 {
+  datatype Nutual = N0(Mutual) | Easy
+  datatype Mutual = M0(Nutual) | M1(Mutual)
+}
+
+module Bad {
+  datatype T = Make(T, T) // warning: empty datatype
+
+  datatype Mutual = M0(Nutual) | M1(Mutual) // warning: empty datatype
+  datatype Nutual = N0(Mutual) // warning: empty datatype
+}
+
+// The following module contains tests for some previous boxing translation errors
+module RegressionTest {
+  trait Interface { }
+
+  datatype Wrapper = Wrapper(inner: Interface)
+
+  method Test0(ww: Wrapper) {
+    var w: Wrapper;
+    w := ww as Wrapper;
+  }
+
+  method Test1(i: Interface) {
+    var w: Wrapper;
+    w := Wrapper(i) as Wrapper;
+  }
+
+  predicate P(x: int) { true }
+
+  method Test() returns (ghost h: bool)  {
+    h := forall i: int :: P(i) ==> var j: int :| true; false;
+  }
+}
+
+// The following module also contains tests for some previous boxing translation errors
+module OtherRegressionTests {
+  trait Parent extends object { }
+  class MyClass extends Parent { }
+
+  datatype Brapper = Brapper(inner: Parent)
+
+  method Testx(c: MyClass) {
+    var kw :=
+      var jj: Parent := c;
+      Brapper(jj);
+    assert true;
+  }
+
+  // ----
+
+  trait Interface { }
+
+  datatype Wrapper extends Interface = Wrapper(inner: Interface)
+
+  datatype DetectZero extends Interface  = DetectZero
+
+  function getWrappedDetectZero(): Interface {
+    var i: Interface := DetectZero;
+    var w: Wrapper := Wrapper(i);
+    w
+  }
+
+  method Test(w: Wrapper) returns (i: Interface) {
+    i := w;
+    i :=
+      var k: Wrapper := Wrapper(i);
+      k;
+    var j: Interface :=
+      var i: Interface := DetectZero;
+      var w: Wrapper := Wrapper(i);
+      w;
+  }
+
+  method SameTest() returns () {
+    var ui: Interface := DetectZero;
+    var e := Wrapper(ui);
+
+    var kw :=
+      var jj: Interface := DetectZero;
+      Wrapper(jj);
+
+    assert true;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939a.dfy.expect
new file mode 100644
index 00000000000..7526628ac4a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939a.dfy.expect
@@ -0,0 +1,13 @@
+git-issue-4939a.dfy(99,19): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+git-issue-4939a.dfy(142,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'T' can be constructed
+git-issue-4939a.dfy(144,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'Mutual' can be constructed
+git-issue-4939a.dfy(145,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'Nutual' can be constructed
+git-issue-4939a.dfy(25,32): Error: cannot prove termination; try supplying a decreases clause
+git-issue-4939a.dfy(68,21): Error: cannot prove termination; try supplying a decreases clause
+git-issue-4939a.dfy(68,21): Error: decreases expression must be bounded below by 0
+git-issue-4939a.dfy(67,23): Related location: this proposition could not be proved
+git-issue-4939a.dfy(105,36): Error: cannot prove termination; try supplying a decreases clause
+git-issue-4939a.dfy(105,36): Error: decreases expression must be bounded below by 0
+git-issue-4939a.dfy(104,23): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 12 verified, 5 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939b.dfy
new file mode 100644
index 00000000000..28b4d43cda7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939b.dfy
@@ -0,0 +1,31 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module NoAutoInit {
+  trait GeneralTrait { }
+  trait ReferenceTrait extends object { }
+
+  datatype A = A(g: GeneralTrait)
+  datatype B = B(h: ReferenceTrait)
+
+  method Test() {
+    var a: A := *;
+    var b: B := *;
+
+    if * {
+      print a, "\n"; // error: A is a possibly empty type, so "a" is subject to definite assignment
+    } else {
+      print b, "\n"; // error: B is a possibly empty type, so "b" is subject to definite assignment
+    }
+  }
+}
+
+module ProvablyEmpty {
+  datatype BadList<X> = Cons(head: X, tail: BadList<X>) // warning: no instances
+
+  lemma NeverGetHere<X>(xs: BadList<X>)
+    ensures false
+  {
+    NeverGetHere(xs.tail);
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939b.dfy.expect
new file mode 100644
index 00000000000..f38e41b4de0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939b.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-4939b.dfy(24,11): Warning: because of cyclic dependencies among constructor argument types, no instances of datatype 'BadList' can be constructed
+git-issue-4939b.dfy(16,12): Error: variable 'a', which is subject to definite-assignment rules, might be uninitialized here
+git-issue-4939b.dfy(18,12): Error: variable 'b', which is subject to definite-assignment rules, might be uninitialized here
+
+Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939c.dfy
new file mode 100644
index 00000000000..815a713da73
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939c.dfy
@@ -0,0 +1,16 @@
+// RUN: %testDafnyForEachCompiler "%s" -- --general-traits=datatype
+
+module NoAutoInit {
+  trait GeneralTrait { }
+  trait ReferenceTrait extends object { }
+
+  datatype A = A(g: GeneralTrait)
+  datatype B = B(h: ReferenceTrait)
+
+  method Main() {
+    // Test that code generation succeeds, even thought "a" and "b" are never defined or used
+    var a: A := *;
+    var b: B := *;
+    print "done\n";
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939c.dfy.expect
new file mode 100644
index 00000000000..19f86f493ab
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939c.dfy.expect
@@ -0,0 +1 @@
+done
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939c.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939c.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4939c.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946a.dfy
new file mode 100644
index 00000000000..98091911235
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946a.dfy
@@ -0,0 +1,20 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --general-traits=datatype
+
+trait ProgramTrait {
+  method Compute() returns (r: Result)
+}
+
+type Program = ProgramTrait | true // error: 'ProgramTrait' is a bound variable here, and its type is undetermined
+
+datatype Result =
+  | Bounce(next: Program)
+  | Done()
+
+datatype Trivial extends ProgramTrait =
+  Trivial()
+{
+  method Compute() returns (r: Result)
+  {
+    return Done();
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946a.dfy.expect
new file mode 100644
index 00000000000..d07f6b41447
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946a.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-4946a.dfy(7,5): Error: base type of subset type 'Program' is not fully determined; add an explicit type for bound variable 'ProgramTrait'
+1 resolution/type errors detected in git-issue-4946a.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946b.dfy
new file mode 100644
index 00000000000..467a9028284
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946b.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --general-traits=legacy
+
+trait GeneralTrait { }
+trait ReferenceTrait extends object { }
+
+type SubsetType = x: GeneralTrait | true // error: cannot find witness (tried null)
+type Reference = x: ReferenceTrait | true // error: cannot find witness (tried null)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946b.dfy.expect
new file mode 100644
index 00000000000..24d3e14bd06
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946b.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-4946b.dfy(6,5): Error: trying witness null: value of expression (of type 'GeneralTrait?') is not known to be an instance of type 'GeneralTrait', because it might be null
+git-issue-4946b.dfy(7,5): Error: trying witness null: value of expression (of type 'ReferenceTrait?') is not known to be an instance of type 'ReferenceTrait', because it might be null
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946c.dfy
new file mode 100644
index 00000000000..7ad310b8107
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946c.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --general-traits=datatype
+
+trait GeneralTrait { }
+trait ReferenceTrait extends object { }
+
+type SubsetType = x: GeneralTrait | true // error: cannot find witness (didn't try anything)
+type Reference = x: ReferenceTrait | true // error: cannot find witness (tried null)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946c.dfy.expect
new file mode 100644
index 00000000000..dc7590f7b42
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946c.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-4946c.dfy(6,5): Error: cannot find witness that shows type is inhabited; try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+git-issue-4946c.dfy(7,5): Error: trying witness null: value of expression (of type 'ReferenceTrait?') is not known to be an instance of type 'ReferenceTrait', because it might be null
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946d.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946d.dfy
new file mode 100644
index 00000000000..d6531878a6e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946d.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --general-traits=datatype --general-newtypes
+
+type Small = x: int | 0 <= x < 10
+
+newtype NewProgram = Small | true // error: 'Small' is a bound variable here, and its type is undetermined
+
+datatype Result =
+  | NewBounce(newNext: NewProgram)
+  | Done()
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946d.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946d.dfy.expect
new file mode 100644
index 00000000000..709e3a5441b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4946d.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-4946d.dfy(5,8): Error: base type of newtype 'NewProgram' is not fully determined; add an explicit type for bound variable 'Small'
+1 resolution/type errors detected in git-issue-4946d.dfy
diff --git a/Test/git-issues/git-issue-495.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-495.dfy
similarity index 96%
rename from Test/git-issues/git-issue-495.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-495.dfy
index a065790c2ab..b23aaeed519 100644
--- a/Test/git-issues/git-issue-495.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-495.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
+// RUN: %exits-with 4 %build "%s" --relax-definite-assignment > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Dt = Make(d: int)
diff --git a/Test/git-issues/git-issue-495.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-495.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-495.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-495.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4952.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4952.dfy
new file mode 100644
index 00000000000..b6368b98f5b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4952.dfy
@@ -0,0 +1,29 @@
+// RUN: %testDafnyForEachResolver "%s" -- --general-traits=datatype
+
+trait A<K> {
+  function FunctionRequires(): bool
+    requires true
+  function FunctionReads(): bool
+    reads {}
+    decreases 2
+  function FunctionEnsures(): bool
+    ensures true
+
+  method MethodRequires()
+    requires true
+  method MethodEnsures()
+    ensures true
+}
+
+type B extends A<string> {
+  // Each of the following 5 override checks once caused a crash, because those checks
+  // were not expecting the overrides to be found in an abstract type.
+
+  function FunctionRequires(): bool
+  function FunctionReads(): bool
+    decreases 2
+  function FunctionEnsures(): bool
+
+  method MethodRequires()
+  method MethodEnsures()
+}
diff --git a/Test/git-issues/git-issue-966.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4952.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-966.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4952.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4953.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4953.dfy
new file mode 100644
index 00000000000..36678a8a4a2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4953.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachResolver "%s" --expect-exit-code=2
+
+// The lookup of a non-existing member once caused a crash in the new resolver.
+
+function Foo(): (result: seq<int>)
+  ensures result.NonExistingMember
+
+function Bar(formal: seq<int>): int
+  requires formal.NonExistingMember
+
+method Zap(i: seq<int>) returns (o: seq<int>) {
+  var local: seq<int> := [];
+
+  var a := i.NonExistingMember;
+  var b := o.NonExistingMember;
+  var c := local.NonExistingMember;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4953.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4953.dfy.expect
new file mode 100644
index 00000000000..035e48d84ef
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4953.dfy.expect
@@ -0,0 +1,6 @@
+git-issue-4953.dfy(6,17): Error: type seq<int> does not have a member NonExistingMember
+git-issue-4953.dfy(9,18): Error: type seq<int> does not have a member NonExistingMember
+git-issue-4953.dfy(14,13): Error: type seq<int> does not have a member NonExistingMember
+git-issue-4953.dfy(15,13): Error: type seq<int> does not have a member NonExistingMember
+git-issue-4953.dfy(16,17): Error: type seq<int> does not have a member NonExistingMember
+5 resolution/type errors detected in git-issue-4953.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4953.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4953.dfy.refresh.expect
new file mode 100644
index 00000000000..c2d79122ad3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4953.dfy.refresh.expect
@@ -0,0 +1,6 @@
+git-issue-4953.dfy(6,17): Error: member 'NonExistingMember' does not exist in type 'seq'
+git-issue-4953.dfy(9,18): Error: member 'NonExistingMember' does not exist in type 'seq'
+git-issue-4953.dfy(14,13): Error: member 'NonExistingMember' does not exist in type 'seq'
+git-issue-4953.dfy(15,13): Error: member 'NonExistingMember' does not exist in type 'seq'
+git-issue-4953.dfy(16,17): Error: member 'NonExistingMember' does not exist in type 'seq'
+5 resolution/type errors detected in git-issue-4953.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4982.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4982.dfy
new file mode 100644
index 00000000000..18c2730a91f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4982.dfy
@@ -0,0 +1,55 @@
+// RUN: %testDafnyForEachResolver "%s" -- --general-traits:datatype
+
+trait Tr1 {
+  function Decrease(): nat {
+    0
+  }
+
+  function F(): nat
+    decreases Decrease()
+}
+
+datatype Dt1 extends Tr1 = Dt {
+  function F(): nat
+    decreases 0
+  {
+    0
+  }
+}
+
+trait Tr2<A> {
+  function Decrease(): nat {
+    0
+  }
+
+  function F(): A
+    decreases Decrease()
+}
+
+datatype Dt2 extends Tr2<nat> = Dt {
+  function F(): nat
+    decreases 0
+  {
+    0
+  }
+}
+
+trait ProgramTrait {
+  function Rank(): nat
+
+  method Compute() returns (r: Result)
+    decreases Rank()
+}
+
+datatype Result = Bounce(next: ProgramTrait) | Done
+
+datatype Trivial extends ProgramTrait = Trivial
+{
+  function Rank(): nat { 0 }
+
+  method Compute() returns (r: Result)
+    decreases Rank()
+  {
+    return Done();
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4982.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4982.dfy.expect
new file mode 100644
index 00000000000..1981561ca00
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4982.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 10 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4983.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4983.dfy
new file mode 100644
index 00000000000..dd426e8fd3e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4983.dfy
@@ -0,0 +1,27 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 --refresh-exit-code=0 "%s" -- --general-traits:datatype
+
+trait Parent {}
+
+datatype Dt extends Parent = Dt {
+  function GetParent(): Parent {
+    // The implicit conversion in the following line once caused malformed Boogie to be generated
+    this // error (in the legacy resolver): legacy resolver does not understand subtyping relationship with Parent
+  }
+}
+
+function GetDtAsParent(): Parent {
+  // The implicit conversion in the following line once caused malformed Boogie to be generated
+  Dt // error (in the legacy resolver): legacy resolver does not understand subtyping relationship with Parent
+}
+
+type Abstract extends Parent {
+  function GetParent(): Parent {
+    this // error (in the legacy resolver): legacy resolver does not understand subtyping relationship with Parent
+  }
+}
+
+function GetAbstract(): Abstract
+
+function GetAbstractAsParent(): Parent {
+  GetAbstract() // error (in the legacy resolver): legacy resolver does not understand subtyping relationship with Parent
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4983.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4983.dfy.expect
new file mode 100644
index 00000000000..e78aafeff32
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4983.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-4983.dfy(12,9): Error: Function body type mismatch (expected Parent, got Dt)
+git-issue-4983.dfy(25,9): Error: Function body type mismatch (expected Parent, got Abstract)
+git-issue-4983.dfy(6,11): Error: Function body type mismatch (expected Parent, got Dt)
+git-issue-4983.dfy(18,11): Error: Function body type mismatch (expected Parent, got Abstract)
+4 resolution/type errors detected in git-issue-4983.dfy
diff --git a/Test/git-issues/github-issue-305-a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4983.dfy.refresh.expect
similarity index 100%
rename from Test/git-issues/github-issue-305-a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4983.dfy.refresh.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4994.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4994.dfy
new file mode 100644
index 00000000000..7a2803ecda1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4994.dfy
@@ -0,0 +1,46 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 --refresh-exit-code=4 "%s" -- --general-traits=datatype
+
+trait Parent {}
+
+datatype D extends Parent = D
+codatatype Co extends Parent = Co
+
+method TestAEq(d: D, co: Co, p: Parent) {
+  // The expressions in these assertions once caused malformed Boogie
+  if
+  case true =>
+    assert p == d; // error: possible assertion violation
+  case true =>
+    assert d == p; // error: possible assertion violation
+  case true =>
+    assert p == co; // error: possible assertion violation
+  case true =>
+    assert co == p; // error: possible assertion violation
+}
+
+method TestANeq(d: D, co: Co, p: Parent) {
+  // The expressions in these assertions once caused malformed Boogie
+  if
+  case true =>
+    assert p != d; // error: possible assertion violation
+  case true =>
+    assert d != p; // error: possible assertion violation
+  case true =>
+    assert p != co; // error: possible assertion violation
+  case true =>
+    assert co != p; // error: possible assertion violation
+}
+
+method TestB(d: D, co: Co, p: Parent) returns (ghost b: bool) {
+  b := p == d;
+  b := d == p;
+
+  b := p == co;
+  b := co == p;
+
+  b := p != d;
+  b := d != p;
+
+  b := p != co;
+  b := co != p;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4994.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4994.dfy.expect
new file mode 100644
index 00000000000..5cc0f6c6612
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4994.dfy.expect
@@ -0,0 +1,17 @@
+git-issue-4994.dfy(12,13): Error: arguments must have comparable types (got Parent and D)
+git-issue-4994.dfy(14,13): Error: arguments must have comparable types (got D and Parent)
+git-issue-4994.dfy(16,13): Error: arguments must have comparable types (got Parent and Co)
+git-issue-4994.dfy(18,14): Error: arguments must have comparable types (got Co and Parent)
+git-issue-4994.dfy(25,13): Error: arguments must have comparable types (got Parent and D)
+git-issue-4994.dfy(27,13): Error: arguments must have comparable types (got D and Parent)
+git-issue-4994.dfy(29,13): Error: arguments must have comparable types (got Parent and Co)
+git-issue-4994.dfy(31,14): Error: arguments must have comparable types (got Co and Parent)
+git-issue-4994.dfy(35,9): Error: arguments must have comparable types (got Parent and D)
+git-issue-4994.dfy(36,9): Error: arguments must have comparable types (got D and Parent)
+git-issue-4994.dfy(38,9): Error: arguments must have comparable types (got Parent and Co)
+git-issue-4994.dfy(39,10): Error: arguments must have comparable types (got Co and Parent)
+git-issue-4994.dfy(41,9): Error: arguments must have comparable types (got Parent and D)
+git-issue-4994.dfy(42,9): Error: arguments must have comparable types (got D and Parent)
+git-issue-4994.dfy(44,9): Error: arguments must have comparable types (got Parent and Co)
+git-issue-4994.dfy(45,10): Error: arguments must have comparable types (got Co and Parent)
+16 resolution/type errors detected in git-issue-4994.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4994.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4994.dfy.refresh.expect
new file mode 100644
index 00000000000..a18d22a4fac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4994.dfy.refresh.expect
@@ -0,0 +1,10 @@
+git-issue-4994.dfy(12,4): Error: assertion might not hold
+git-issue-4994.dfy(14,4): Error: assertion might not hold
+git-issue-4994.dfy(16,4): Error: assertion might not hold
+git-issue-4994.dfy(18,4): Error: assertion might not hold
+git-issue-4994.dfy(25,4): Error: assertion might not hold
+git-issue-4994.dfy(27,4): Error: assertion might not hold
+git-issue-4994.dfy(29,4): Error: assertion might not hold
+git-issue-4994.dfy(31,4): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 8 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4998.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4998.dfy
new file mode 100644
index 00000000000..e053bc78edb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4998.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+// this once crashed, because the implicit postcondition didn't include the type parameter
+predicate Foo<A>() {
+  true
+} by method {
+  return true;
+}
diff --git a/Test/git-issues/git-issue-945.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4998.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-945.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-4998.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017a.dfy
new file mode 100644
index 00000000000..bae69ef1d7d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017a.dfy
@@ -0,0 +1,138 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --general-traits=datatype
+
+module True {
+  trait A {
+    ghost predicate Valid()
+  }
+
+  trait B extends A {
+    ghost opaque predicate Valid() { true }
+  }
+
+  method TestByRequires(b: B)
+    requires b.Valid()
+  {
+    var a: A := b;
+    assert a.Valid();
+  }
+
+  method TestByReveal(b: B) {
+    var a: A := b;
+    assert a.Valid() by {
+      reveal b.Valid();
+    }
+  }
+}
+
+module X {
+  trait A {
+    ghost predicate Valid(w: bool)
+  }
+
+  trait B extends A {
+    ghost opaque predicate Valid(x: bool) { x }
+  }
+
+  method TestByRequires(b: B, y: bool)
+    requires b.Valid(y)
+  {
+    var a: A := b;
+    assert a.Valid(y);
+  }
+
+  method TestByReveal(b: B, y: bool) {
+    var a: A := b;
+    assert a.Valid(y) by { // error: assertion violation
+      reveal b.Valid();
+    }
+  }
+}
+
+module Parameters {
+  trait A {
+    ghost predicate P<T>(t: T)
+  }
+
+  trait B extends A {
+    ghost opaque predicate P<T>(t: T) { t == t }
+  }
+
+
+  method TestByRequires(b: B)
+    requires b.P(5)
+  {
+    var a: A := b;
+    assert a.P(5);
+  }
+
+  method TestByRequires'(b: B)
+    requires b.P(6)
+  {
+    var a: A := b;
+    assert a.P(5); // error: assertion violation
+  }
+
+  method TestByRequires''(b: B)
+    requires b.P(true)
+  {
+    var a: A := b;
+    assert a.P(5); // error: assertion violation
+  }
+
+
+  method TestByReveal(b: B) {
+    var a: A := b;
+    assert a.P(5) by {
+      reveal b.P();
+    }
+  }
+
+  method TestByReveal'(b: B) {
+    var a: A := b;
+    assert a.P(true) by {
+      reveal b.P();
+    }
+  }
+}
+
+module StayOpaque {
+  trait A {
+    opaque predicate Valid()
+  }
+
+  trait B extends A {
+    opaque predicate Valid() { true }
+  }
+
+  trait C extends A {
+    opaque predicate Valid() { true }
+  }
+
+  method TestByRequires(b: B)
+    requires b.Valid()
+  {
+    var a: A := b;
+    assert a.Valid();
+  }
+
+  method TestByReveal(b: B) {
+    var a: A := b;
+    assert a.Valid() by {
+      reveal b.Valid();
+    }
+  }
+
+  method TestIndependence0(b: B, c: C) {
+    var a: A := b;
+    assert b.Valid() by { // error: revealing for C should not affect B
+      reveal c.Valid();
+    }
+  }
+
+  method TestIndependence1(b: B, c: C) {
+    var a: A := b;
+    assert a.Valid() by { // fine: revealing for C also reveals for all A's
+      reveal c.Valid();
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017a.dfy.expect
new file mode 100644
index 00000000000..ff1a243c0c6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017a.dfy.expect
@@ -0,0 +1,6 @@
+git-issue-5017a.dfy(45,4): Error: assertion might not hold
+git-issue-5017a.dfy(72,4): Error: assertion might not hold
+git-issue-5017a.dfy(79,4): Error: assertion might not hold
+git-issue-5017a.dfy(127,4): Error: assertion might not hold
+
+Dafny program verifier finished with 14 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017b.dfy
new file mode 100644
index 00000000000..e3df9d6e840
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017b.dfy
@@ -0,0 +1,147 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s" -- --general-traits=datatype
+
+module Opaque {
+  trait A {
+    predicate Valid()
+  }
+
+  trait B {
+    opaque predicate Valid() { true }
+  }
+
+  trait C {
+    opaque predicate Valid()
+  }
+
+
+  trait K0 extends A {
+    predicate Valid()
+  }
+  trait K1 extends A {
+    opaque predicate Valid()
+  }
+  trait K2 extends A {
+    predicate Valid() { true }
+  }
+  trait K3 extends A {
+    opaque predicate Valid() { true }
+  }
+
+  trait L0 extends B {
+    predicate Valid() { true } // error: B.Valid already has a body
+  }
+  trait L1 extends B {
+    opaque predicate Valid() { true } // error: B.Valid already has a body
+  }
+
+  trait M0 extends C {
+    predicate Valid() // error: must be opaque (since it is in C)
+  }
+  trait M1 extends C {
+    opaque predicate Valid()
+  }
+  trait M2 extends C {
+    predicate Valid() { true } // error: must be opaque (since it is in C)
+  }
+  trait M3 extends C {
+    opaque predicate Valid() { true }
+  }
+
+
+  datatype W0 extends A = W0 {
+    predicate Valid() { true }
+  }
+  class W1 extends A {
+    predicate Valid() { true }
+  }
+
+  datatype X0 extends A = X0 {
+    opaque predicate Valid() { true }
+  }
+  class X1 extends A {
+    opaque predicate Valid() { true }
+  }
+
+  datatype Y0 extends C = Y0 {
+    predicate Valid() { true } // error: must be opaque (since it is in C)
+  }
+  class Y1 extends C {
+    predicate Valid() { true } // error: must be opaque (since it is in C)
+  }
+
+  datatype Z0 extends C = Z0 {
+    opaque predicate Valid() { true }
+  }
+  class Z1 extends C {
+    opaque predicate Valid() { true }
+  }
+}
+
+module StayOpaque {
+  trait A {
+    opaque predicate Valid()
+  }
+
+  datatype B extends A = B {
+    opaque predicate Valid() { true }
+  }
+
+  class C extends A {
+    opaque predicate Valid() { true }
+  }
+
+  method TestA(a: A) {
+    reveal a.Valid(); // error: cannot reveal (no body)
+  }
+
+  method TestB(b: B) {
+    reveal b.Valid();
+  }
+
+  method TestC(c: C) {
+    reveal c.Valid();
+  }
+}
+
+module RevealErrorMessages {
+  trait A {
+    opaque predicate Valid()
+    function TransparentFunction(): int { 3 }
+    const m: int := 10
+    opaque const n: int := 10
+    opaque const o: int
+    method Method() { }
+    opaque function WithBody(x: int): int { x }
+
+    method TestReveal() {
+      reveal UnknownFunction(); // error: UnknownFunction unresolved
+      reveal UnknownFunction; // error: UnknownFunction unresolved
+      reveal Method(); // error: Method unresolved
+      reveal Method; // error: Method unresolved
+      reveal m; // error: m unresolved
+      reveal n;
+      reveal o;
+      reveal Valid(); // error: Valid unresolved
+      reveal Valid; // error: Valid unresolved
+      reveal WithBody();
+      reveal WithBody; // error: missing parens
+    }
+  }
+
+  method TestA(a: A) {
+    reveal x.Valid(); // error: 'x' is unresolved
+    reveal a.UnknownFunction(); // error: UnknownFunction unresolved
+    reveal a.UnknownFunction; // error: UnknownFunction unresolved
+    reveal a.Method(); // error: cannot reveal a method
+    reveal a.Method;
+    reveal a.m; // error: cannot reveal (not opaque)
+    reveal a.n;
+    reveal a.o;
+    reveal a.Valid(); // error: cannot reveal (no body)
+    reveal a.Valid; // error: cannot reveal (no body)
+    reveal a.WithBody();
+    reveal a.WithBody; // error: missing parens
+
+    reveal A.WithBody(); // error: WithBody not found (as static member) in A
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017b.dfy.expect
new file mode 100644
index 00000000000..0e903fbdd61
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017b.dfy.expect
@@ -0,0 +1,22 @@
+git-issue-5017b.dfy(31,14): Error: fully defined predicate 'Valid' is inherited from trait 'B' and is not allowed to be re-declared
+git-issue-5017b.dfy(34,21): Error: fully defined predicate 'Valid' is inherited from trait 'B' and is not allowed to be re-declared
+git-issue-5017b.dfy(34,21): Error: static lemma 'reveal_Valid' is inherited from trait 'B' and is not allowed to be re-declared
+git-issue-5017b.dfy(38,14): Error: overridden predicate 'Valid' in 'M0' must be 'opaque' since the member is 'opaque' in trait 'C'
+git-issue-5017b.dfy(44,14): Error: overridden predicate 'Valid' in 'M2' must be 'opaque' since the member is 'opaque' in trait 'C'
+git-issue-5017b.dfy(66,14): Error: overridden predicate 'Valid' in 'Y0' must be 'opaque' since the member is 'opaque' in trait 'C'
+git-issue-5017b.dfy(69,14): Error: overridden predicate 'Valid' in 'Y1' must be 'opaque' since the member is 'opaque' in trait 'C'
+git-issue-5017b.dfy(94,13): Error: predicate 'Valid' cannot be revealed, because it has no body in trait 'A'
+git-issue-5017b.dfy(132,11): Error: unresolved identifier: x
+git-issue-5017b.dfy(133,13): Error: member 'UnknownFunction' does not exist in trait 'A'
+git-issue-5017b.dfy(134,13): Error: member 'UnknownFunction' does not exist in trait 'A'
+git-issue-5017b.dfy(135,13): Error: only functions and constants can be revealed
+git-issue-5017b.dfy(136,13): Error: only functions and constants can be revealed
+git-issue-5017b.dfy(140,13): Error: predicate 'Valid' cannot be revealed, because it has no body in trait 'A'
+git-issue-5017b.dfy(141,13): Error: predicate 'Valid' cannot be revealed, because it has no body in trait 'A'
+git-issue-5017b.dfy(117,13): Error: unresolved identifier: UnknownFunction
+git-issue-5017b.dfy(118,13): Error: unresolved identifier: UnknownFunction
+git-issue-5017b.dfy(119,13): Error: only functions and constants can be revealed
+git-issue-5017b.dfy(120,13): Error: only functions and constants can be revealed
+git-issue-5017b.dfy(124,13): Error: cannot reveal 'Valid' because no revealable constant, function, assert label, or requires label in the current scope is named 'Valid'
+git-issue-5017b.dfy(125,13): Error: cannot reveal 'Valid' because no revealable constant, function, assert label, or requires label in the current scope is named 'Valid'
+21 resolution/type errors detected in git-issue-5017b.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017b.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017b.dfy.refresh.expect
new file mode 100644
index 00000000000..0e903fbdd61
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017b.dfy.refresh.expect
@@ -0,0 +1,22 @@
+git-issue-5017b.dfy(31,14): Error: fully defined predicate 'Valid' is inherited from trait 'B' and is not allowed to be re-declared
+git-issue-5017b.dfy(34,21): Error: fully defined predicate 'Valid' is inherited from trait 'B' and is not allowed to be re-declared
+git-issue-5017b.dfy(34,21): Error: static lemma 'reveal_Valid' is inherited from trait 'B' and is not allowed to be re-declared
+git-issue-5017b.dfy(38,14): Error: overridden predicate 'Valid' in 'M0' must be 'opaque' since the member is 'opaque' in trait 'C'
+git-issue-5017b.dfy(44,14): Error: overridden predicate 'Valid' in 'M2' must be 'opaque' since the member is 'opaque' in trait 'C'
+git-issue-5017b.dfy(66,14): Error: overridden predicate 'Valid' in 'Y0' must be 'opaque' since the member is 'opaque' in trait 'C'
+git-issue-5017b.dfy(69,14): Error: overridden predicate 'Valid' in 'Y1' must be 'opaque' since the member is 'opaque' in trait 'C'
+git-issue-5017b.dfy(94,13): Error: predicate 'Valid' cannot be revealed, because it has no body in trait 'A'
+git-issue-5017b.dfy(132,11): Error: unresolved identifier: x
+git-issue-5017b.dfy(133,13): Error: member 'UnknownFunction' does not exist in trait 'A'
+git-issue-5017b.dfy(134,13): Error: member 'UnknownFunction' does not exist in trait 'A'
+git-issue-5017b.dfy(135,13): Error: only functions and constants can be revealed
+git-issue-5017b.dfy(136,13): Error: only functions and constants can be revealed
+git-issue-5017b.dfy(140,13): Error: predicate 'Valid' cannot be revealed, because it has no body in trait 'A'
+git-issue-5017b.dfy(141,13): Error: predicate 'Valid' cannot be revealed, because it has no body in trait 'A'
+git-issue-5017b.dfy(117,13): Error: unresolved identifier: UnknownFunction
+git-issue-5017b.dfy(118,13): Error: unresolved identifier: UnknownFunction
+git-issue-5017b.dfy(119,13): Error: only functions and constants can be revealed
+git-issue-5017b.dfy(120,13): Error: only functions and constants can be revealed
+git-issue-5017b.dfy(124,13): Error: cannot reveal 'Valid' because no revealable constant, function, assert label, or requires label in the current scope is named 'Valid'
+git-issue-5017b.dfy(125,13): Error: cannot reveal 'Valid' because no revealable constant, function, assert label, or requires label in the current scope is named 'Valid'
+21 resolution/type errors detected in git-issue-5017b.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017c.dfy
new file mode 100644
index 00000000000..32f945566c0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017c.dfy
@@ -0,0 +1,86 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Datatype {
+  trait A {
+    opaque predicate Valid()
+  }
+
+  datatype B extends A = B {
+    opaque predicate Valid() { true }
+  }
+
+  datatype C extends A = C {
+    opaque predicate Valid() { true }
+  }
+
+  method TestByRequires(b: B)
+    requires b.Valid()
+  {
+    var a: A := b;
+    assert a.Valid();
+  }
+
+  method TestByReveal(b: B) {
+    var a: A := b;
+    assert a.Valid() by {
+      reveal b.Valid();
+    }
+  }
+
+  method TestIndependence0(b: B, c: C) {
+    var a: A := b;
+    assert b.Valid() by { // error: revealing for C should not affect B
+      reveal c.Valid();
+    }
+  }
+
+  method TestIndependence1(b: B, c: C) {
+    var a: A := b;
+    assert a.Valid() by { // fine: revealing for C also reveals for all A's
+      reveal c.Valid();
+    }
+  }
+}
+
+module Class {
+  trait A {
+    opaque predicate Valid()
+  }
+
+  class B extends A {
+    opaque predicate Valid() { true }
+  }
+
+  class C extends A {
+    opaque predicate Valid() { true }
+  }
+
+  method TestByRequires(b: B)
+    requires b.Valid()
+  {
+    var a: A := b;
+    assert a.Valid();
+  }
+
+  method TestByReveal(b: B) {
+    var a: A := b;
+    assert a.Valid() by {
+      reveal b.Valid();
+    }
+  }
+
+  method TestIndependence0(b: B, c: C) {
+    var a: A := b;
+    assert b.Valid() by { // error: revealing for C should not affect B
+      reveal c.Valid();
+    }
+  }
+
+  method TestIndependence1(b: B, c: C) {
+    var a: A := b;
+    assert a.Valid() by { // fine: revealing for C also reveals for all A's
+      reveal c.Valid();
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017c.dfy.expect
new file mode 100644
index 00000000000..4132fbfcaeb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5017c.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-5017c.dfy(33,4): Error: assertion might not hold
+git-issue-5017c.dfy(75,4): Error: assertion might not hold
+
+Dafny program verifier finished with 11 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5023.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5023.dfy
new file mode 100644
index 00000000000..73ec11132c3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5023.dfy
@@ -0,0 +1,176 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+// ---------- compiled variables/fields ----------
+
+module GhostWitness {
+  type Five = x: int | x == 5 ghost witness 5
+
+  class ContainsFive {
+    var five: Five
+
+    constructor () {
+      five := *;
+    } // error: five not defined
+  }
+
+  method M() {
+    var five: Five := *;
+    var c := new ContainsFive();
+
+    if
+    case true =>
+      print five, "\n"; // error: five used before defined
+    case true =>
+      var x :=
+        var f: Five := five; // error: five used before defined
+        assert f == 5;
+        if f == 5 then 200 else 200/0;
+    case true =>
+      print c.five, "\n";
+  }
+}
+
+module CompiledWitness {
+  type Five = x: int | x == 5 witness 5
+
+  class ContainsFive {
+    var five: Five
+
+    constructor () {
+      five := *;
+    }
+  }
+
+  method M() {
+    var five: Five := *;
+    var c := new ContainsFive();
+
+    if
+    case true =>
+      print five, "\n";
+    case true =>
+      var x :=
+        var f: Five := five;
+        assert f == 5;
+        if f == 5 then 200 else 200/0;
+    case true =>
+      print c.five, "\n";
+  }
+}
+
+module NoWitness {
+  type Five = x: int | x == 5 witness *
+
+  class ContainsFive {
+    var five: Five
+
+    constructor () {
+      five := *;
+    } // error: five not defined
+  }
+
+  method M() {
+    var five: Five := *;
+    var c := new ContainsFive();
+
+    if
+    case true =>
+      print five, "\n"; // error: five used before defined
+    case true =>
+      var x :=
+        var f: Five := five; // error: five used before defined
+        assert f == 5;
+        if f == 5 then 200 else 200/0;
+    case true =>
+      print c.five, "\n";
+  }
+}
+
+// ---------- ghost variables/fields ----------
+
+module XGhostWitness {
+  type Five = x: int | x == 5 ghost witness 5
+
+  class ContainsFive {
+    ghost var five: Five
+
+    constructor () {
+      five := *;
+    }
+  }
+
+  method M() returns (ghost g: int) {
+    g := 0;
+    ghost var five: Five := *;
+    var c := new ContainsFive();
+
+    if
+    case true =>
+      g := five;
+    case true =>
+      ghost var x :=
+        var f: Five := five;
+        assert f == 5;
+        if f == 5 then 200 else 200/0;
+    case true =>
+      g := c.five;
+  }
+}
+
+module XCompiledWitness {
+  type Five = x: int | x == 5 witness 5
+
+  class ContainsFive {
+    ghost var five: Five
+
+    constructor () {
+      five := *;
+    }
+  }
+
+  method M() returns (ghost g: int) {
+    g := 0;
+    ghost var five: Five := *;
+    var c := new ContainsFive();
+
+    if
+    case true =>
+      g := five;
+    case true =>
+      ghost var x :=
+        var f: Five := five;
+        assert f == 5;
+        if f == 5 then 200 else 200/0;
+    case true =>
+      g := c.five;
+  }
+}
+
+module XNoWitness {
+  type Five = x: int | x == 5 witness *
+
+  class ContainsFive {
+    ghost var five: Five
+
+    constructor () {
+      five := *;
+    } // error: five not defined
+  }
+
+  method M() returns (ghost g: int) {
+    g := 0;
+    ghost var five: Five := *;
+    var c := new ContainsFive();
+
+    if
+    case true =>
+      g := five; // error: five used before defined
+    case true =>
+      ghost var x :=
+        var f: Five := five; // error: five used before defined
+        assert f == 5;
+        if f == 5 then 200 else 200/0;
+    case true =>
+      g := c.five;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5023.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5023.dfy.expect
new file mode 100644
index 00000000000..b0dfb78864c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5023.dfy.expect
@@ -0,0 +1,11 @@
+git-issue-5023.dfy(13,4): Error: field 'five', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+git-issue-5023.dfy(22,12): Error: variable 'five', which is subject to definite-assignment rules, might be uninitialized here
+git-issue-5023.dfy(25,23): Error: variable 'five', which is subject to definite-assignment rules, might be uninitialized here
+git-issue-5023.dfy(69,4): Error: field 'five', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+git-issue-5023.dfy(78,12): Error: variable 'five', which is subject to definite-assignment rules, might be uninitialized here
+git-issue-5023.dfy(81,23): Error: variable 'five', which is subject to definite-assignment rules, might be uninitialized here
+git-issue-5023.dfy(157,4): Error: field 'five', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+git-issue-5023.dfy(167,11): Error: variable 'five', which is subject to definite-assignment rules, might be uninitialized here
+git-issue-5023.dfy(170,23): Error: variable 'five', which is subject to definite-assignment rules, might be uninitialized here
+
+Dafny program verifier finished with 7 verified, 9 errors
diff --git a/Test/git-issues/git-issue-503.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-503.dfy
similarity index 85%
rename from Test/git-issues/git-issue-503.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-503.dfy
index 26e698151ab..bda3ad8e857 100644
--- a/Test/git-issues/git-issue-503.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-503.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module Option {
   datatype t<A> = None | Some(A)
diff --git a/Test/git-issues/git-issue-503.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-503.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-503.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-503.dfy.expect
diff --git a/Test/git-issues/git-issue-504.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-504.dfy
similarity index 79%
rename from Test/git-issues/git-issue-504.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-504.dfy
index fa76133f28b..8ad616a8f4a 100644
--- a/Test/git-issues/git-issue-504.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-504.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module List {
   datatype t<A> = Nil | Cons(A, t<A>)
diff --git a/Test/git-issues/github-issue-3615.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-504.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-3615.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-504.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy
new file mode 100644
index 00000000000..8de0259104b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+module A.try {
+  datatype Dt = Dt
+}
+
+method Main() {
+  print A.try.Dt, "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy.expect
new file mode 100644
index 00000000000..154455f20d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy.expect
@@ -0,0 +1 @@
+try.Dt.Dt
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy.rs.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy.rs.expect
new file mode 100644
index 00000000000..aa161fe8ea1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy.rs.expect
@@ -0,0 +1 @@
+A.try.Dt.Dt
diff --git a/Test/git-issues/git-issue-505.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-505.dfy
similarity index 89%
rename from Test/git-issues/git-issue-505.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-505.dfy
index cd389c734fb..d18501b4ca5 100644
--- a/Test/git-issues/git-issue-505.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-505.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /timeLimit:20 "%s" > "%t"
+// RUN: %verify --verification-time-limit 20 "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 lemma d()
diff --git a/Test/hofs/Consequence.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-505.dfy.expect
similarity index 100%
rename from Test/hofs/Consequence.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-505.dfy.expect
diff --git a/Test/git-issues/git-issue-506.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-506.dfy
similarity index 94%
rename from Test/git-issues/git-issue-506.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-506.dfy
index b2a409951a1..45a7114da83 100644
--- a/Test/git-issues/git-issue-506.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-506.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
 
diff --git a/Test/git-issues/git-issue-506.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-506.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-506.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-506.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-506.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-506.dfy.rs.check
new file mode 100644
index 00000000000..66736e40df8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-506.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>MultiSelectLValue</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5065.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5065.dfy
new file mode 100644
index 00000000000..550412a3c27
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5065.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+const TWO_TO_THE_8: int := 0x100
+newtype uint8 = x: int | 0 <= x < TWO_TO_THE_8
+
+method Main() {
+  var i: uint8 := 10;
+  var s: seq<uint8> := seq(i, _ => 0);
+  print s;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5065.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5065.dfy.expect
new file mode 100644
index 00000000000..6d326dcad2f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5065.dfy.expect
@@ -0,0 +1 @@
+[0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5065.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5065.dfy.rs.check
new file mode 100644
index 00000000000..efeb4f10e7e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5065.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0107]: method takes 0 generic arguments but 1 generic argument was supplied
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5092.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5092.dfy
new file mode 100644
index 00000000000..cf1963aab8f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5092.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+function True(): bool {
+  if false 
+    then false
+    else if (_ => false)(false)
+      then false 
+      else true
+}
+
+method Main(){
+    print True(), "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5092.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5092.dfy.expect
new file mode 100644
index 00000000000..27ba77ddaf6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5092.dfy.expect
@@ -0,0 +1 @@
+true
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5092.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5092.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5092.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5136.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5136.dfy
new file mode 100644
index 00000000000..490110a2dd9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5136.dfy
@@ -0,0 +1,98 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+type Empty = x: int | false witness *
+
+class TestEmpty {
+  const x: Empty
+
+  constructor ()
+    ensures false
+  {
+    x := 2; // error: RHS does not satisfy type constraint for Empty
+    new;
+  }
+  constructor BadPrecondition(u: int)
+    requires 10 / u == 2 // error: division by 0
+    decreases *
+  {
+    for i := 0 to * {
+    }
+    new;
+  }
+
+  constructor BadPostcondition(u: int)
+    // The following expression is fine, because the assumption generated between the well-formedness checks of the pre- and postconditions
+    // should allow the verifier to derive false.
+    ensures x as int is Empty && 10 / u == 2
+    decreases *
+  {
+    for i := 0 to * {
+    }
+    new;
+  }
+
+  constructor Star() {
+    x := *;
+    new; // error: x is subject to definite assignment, but a ":= *" does not count for a possibly empty type
+  }
+
+}
+
+// Repeat the class above, but with "var x" instead of "const x"
+class TestEmptyWithVar {
+  var x: Empty
+
+  constructor ()
+    ensures false
+  {
+    x := 2; // error: RHS does not satisfy type constraint for Empty
+    new;
+  }
+
+  constructor BadPrecondition(u: int)
+    requires 10 / u == 2 // error: division by 0
+    decreases *
+  {
+    for i := 0 to * {
+    }
+    new;
+  }
+
+  constructor BadPostcondition(u: int)
+    // The following expression is fine, because the assumption generated between the well-formedness checks of the pre- and postconditions
+    // should allow the verifier to derive false.
+    ensures x as int is Empty && 10 / u == 2
+    decreases *
+  {
+    for i := 0 to * {
+    }
+    new;
+  }
+
+  constructor Star() {
+    x := *;
+    new; // error: x is subject to definite assignment, but a ":= *" does not count for a possibly empty type
+  }
+}
+
+method CallEm()
+  ensures false
+{
+  if
+  case true =>
+    var tc := new TestEmpty();
+  case true =>
+    var tv := new TestEmptyWithVar();
+  case true =>
+    var tc := new TestEmpty.Star();
+    assert tc.x as int is Empty;
+  case true =>
+    var tv := new TestEmptyWithVar.Star();
+    assert tv.x as int is Empty;
+}
+
+method Main() {
+  CallEm();
+  print 10 / 0, "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5136.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5136.dfy.expect
new file mode 100644
index 00000000000..070be655a9d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5136.dfy.expect
@@ -0,0 +1,8 @@
+git-issue-5136.dfy(12,9): Error: value does not satisfy the subset constraints of 'Empty'
+git-issue-5136.dfy(16,16): Error: possible division by zero
+git-issue-5136.dfy(37,4): Error: field 'x', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+git-issue-5136.dfy(49,9): Error: value does not satisfy the subset constraints of 'Empty'
+git-issue-5136.dfy(54,16): Error: possible division by zero
+git-issue-5136.dfy(75,4): Error: field 'x', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+
+Dafny program verifier finished with 8 verified, 6 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5184/git-issue-5184.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5184/git-issue-5184.dfy
new file mode 100644
index 00000000000..a6aa1fc8716
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5184/git-issue-5184.dfy
@@ -0,0 +1,11 @@
+// NONUNIFORM: %testDafnyForEachCompiler doesn't support main arguments :(
+// RUN: %run -t:py "%s" Hello > %t
+// RUN: %diff "%s.expect" "%t"
+
+method Main(args: seq<string>) 
+{
+  expect 1 < |args|;
+  print Foo(args[1], "World"), "\n";
+}
+
+datatype Foo = Foo(t: string, x: string)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5184/git-issue-5184.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5184/git-issue-5184.dfy.expect
new file mode 100644
index 00000000000..797ad9a0713
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5184/git-issue-5184.dfy.expect
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+Foo.Foo("Hello", "World")
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5238.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5238.dfy
new file mode 100644
index 00000000000..43192682058
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5238.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler "%s" -- --allow-deprecation --unicode-char=false
+
+method Main() {
+  var s: seq<char>;
+  s := *;
+  print "(", s, ") ", s == "", " ", "" == s, " ", |s|, "\n";
+  s := "";
+  print "(", s, ") ", s == "", " ", "" == s, " ", |s|, "\n";
+  s := "hello";
+  print "(", s, ") ", s == "", " ", "" == s, " ", |s|, "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5238.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5238.dfy.expect
new file mode 100644
index 00000000000..c4b6c940a63
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5238.dfy.expect
@@ -0,0 +1,3 @@
+() true true 0
+() true true 0
+(hello) false false 5
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5262.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5262.dfy
new file mode 100644
index 00000000000..3f84ac81260
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5262.dfy
@@ -0,0 +1,38 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function F(a: array<int>): int
+  requires a.Length > 0
+{
+  a[0] // Suggests to "read a"
+}
+
+class C {
+  var data: int
+
+  function G(): int {
+    // Amazing! I don't think I've ever thought about that ` has really low binding power,
+    // so the suggestion "reads var th := this; th`data" in the following line works!
+    (var th := this; th).data
+  }
+
+  function H(): int {
+    var th := this;
+    // the suggestion here is to use "reads th#Z" (maybe it's better to give up with
+    // a precise "reads" term if the receiver looks complicated, for some definition
+    // of complicated)
+    th.data
+  }
+}
+
+codatatype Stream = More(int, Stream)
+
+function Repeat(c: C): Stream {
+  // Here, it would be better not to give a "reads" suggestion, since functions with
+  // co-recursive calls aren't allowed to have a reads clause. (The AST contain
+  // information that says whether or not a call is co-recursive. But I'm not sure if
+  // the AST remembers which functions are sometimes targets of co-recursive calls.
+  // You could add this. If so, the place to mark a function as such is right next to
+  // the ".IsCoCall = true" in ModuleResolver.cs.)
+  More(c.data, Repeat(c))
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5262.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5262.dfy.expect
new file mode 100644
index 00000000000..c3ea26ed538
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5262.dfy.expect
@@ -0,0 +1,6 @@
+git-issue-5262.dfy(7,3): Error: insufficient reads clause to read array element; Consider adding 'reads a' in the enclosing function specification for resolution
+git-issue-5262.dfy(16,25): Error: insufficient reads clause to read field; Consider adding 'reads var th: C := this; th' or 'reads var th: C := this; th`data' in the enclosing function specification for resolution
+git-issue-5262.dfy(24,7): Error: insufficient reads clause to read field; Consider adding 'reads th' or 'reads th`data' in the enclosing function specification for resolution
+git-issue-5262.dfy(37,9): Error: insufficient reads clause to read field; Mutable fields cannot be accessed within certain scopes, such as default values, the right-hand side of constants, or co-recursive calls
+
+Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5274.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5274.dfy
new file mode 100644
index 00000000000..e0a64ce2125
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5274.dfy
@@ -0,0 +1,27 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+datatype Pair<T(==)> = MakePair(0: T, 1: T) {
+  function Same(): bool {
+    this.0 == this.1
+  }
+}
+
+method ReturnFalse() returns (b: bool)
+  ensures !b
+{
+  var c := (2, ghost 5);
+  var d := (2, ghost 6);
+  assert c != d;
+  b := MakePair(c, d).Same(); // error: uses the type Pair incorrectly
+
+  print MakePair(c, d); // error: uses the type Pair incorrectly
+  print "\n";
+}
+
+method Main() {
+  var b := ReturnFalse();
+  if b {
+    // we should never get here
+    print 10 / 0;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5274.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5274.dfy.expect
new file mode 100644
index 00000000000..c01e30267fa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5274.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-5274.dfy(15,7): Error: type parameter (T) passed to type Pair must support equality (got (int, ghost int))
+git-issue-5274.dfy(17,8): Error: type parameter (T) passed to type Pair must support equality (got (int, ghost int))
+2 resolution/type errors detected in git-issue-5274.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5283.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5283.dfy
new file mode 100644
index 00000000000..980aea74c5f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5283.dfy
@@ -0,0 +1,60 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+/* Obtained from
+https://pkg.go.dev/std
+by running on the console
+copy([...document.querySelectorAll(
+    "td > div.UnitDirectories-pathCell > div > span, "+
+    "td > div.UnitDirectories-pathCell > div > a")]
+    .map(e => "module " + e.textContent + " {}").join("\n"))
+*/
+module archive {}
+module bufio {}
+module builtin {}
+module bytes {}
+module cmp {}
+module compress {}
+module container {}
+module context {}
+module crypto {}
+module database {}
+module debug {}
+module embed {}
+module encoding {}
+module errors {}
+module expvar {}
+module flag {}
+module fmt {}
+module go {}
+module hash {}
+module html {}
+module image {}
+module index {}
+module internal {}
+module io {}
+module log {}
+module maps {}
+module math {}
+module mime {}
+module net {}
+module os {}
+module path {}
+module plugin {}
+module reflect {}
+module regexp {}
+module runtime {}
+module slices {}
+module sort {}
+module strconv {}
+module strings {}
+module sync {}
+module syscall {}
+module testing {}
+module text {}
+module time {}
+module unicode {}
+module unsafe {}
+
+method Main(){
+    print "done\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5283.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5283.dfy.expect
new file mode 100644
index 00000000000..19f86f493ab
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5283.dfy.expect
@@ -0,0 +1 @@
+done
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5285.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5285.dfy
new file mode 100644
index 00000000000..1c8afbdf542
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5285.dfy
@@ -0,0 +1,22 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+const someSet :=
+  set 
+    someString <- {"D"},
+    someChar <- 
+      set c <- someString :: c
+  :: someChar
+
+const someMap := 
+  map x | 
+       0 < x < 3
+    && x in 
+      map y : int | 0 <= y <= x :: y
+  :: x * x
+
+method Main() {
+  print someSet, "\n";
+  // Avoid non-determinism in map printing
+  print someMap - {2}, "\n";
+  print someMap - {1}, "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5285.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5285.dfy.expect
new file mode 100644
index 00000000000..66be4a9c325
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5285.dfy.expect
@@ -0,0 +1,3 @@
+{'D'}
+map[1 := 1]
+map[2 := 4]
diff --git a/Test/git-issues/git-issue-532.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-532.dfy
similarity index 87%
rename from Test/git-issues/git-issue-532.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-532.dfy
index 2a2b5aaaf2e..0219c718379 100644
--- a/Test/git-issues/git-issue-532.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-532.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 predicate SuppressNoTriggerWarning<X>(x: X) { true }
 
diff --git a/Test/git-issues/git-issue-532.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-532.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-532.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-532.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-532.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-532.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-532.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5331.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5331.dfy
new file mode 100644
index 00000000000..9780cf41b4a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5331.dfy
@@ -0,0 +1,19 @@
+// RUN: %baredafny verify %args --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait Ins {
+    function step(s: State): State
+}
+type Code = seq<Ins>
+datatype State = S(
+    clock: nat
+) {
+    function fetch_(): Ins
+    const fetch := fetch_()
+    const step := fetch.step(this)
+    function run(): State
+        decreases clock
+    {
+        if clock == 0 then this else step.(clock := clock - 1).run()
+    }
+}
diff --git a/Test/git-issues/git-issue-956.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5331.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-956.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5331.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5365.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5365.dfy
new file mode 100644
index 00000000000..75c3bd0997a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5365.dfy
@@ -0,0 +1,9 @@
+// RUN: %baredafny verify %args --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype S  = S(
+    n:nat
+) {
+    function f():S { this }
+    function g():S { this.(n := 0).f() }
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-975.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5365.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-975.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5365.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5369.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5369.dfy
new file mode 100644
index 00000000000..f21887b8a19
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5369.dfy
@@ -0,0 +1,43 @@
+// RUN: %exits-with 2 %baredafny verify %args --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+ghost function f2(items: set<nat>): (r:nat)
+  requires |items| > 0 {
+    var item :| item in items;
+    item
+}
+
+function f(items: set<nat>) : (r:nat)
+requires |items| > 0 {
+    //assume exists item :: item in items && forall other <- items :: item == other || item < other;
+    //assert exists item Smallest()
+    var item :| IsSmallest(items, item);
+    item
+}
+
+predicate IsSmallest(s: set<nat>, item: nat) 
+  requires item in s {
+  m in s && forall y: nat :: y in s ==> m <= y
+}
+
+lemma Smallest(s: set<nat>) returns (m: nat)
+  requires s != {}
+  ensures m in s && IsSmallest(s, m)
+  decreases s
+{
+  m :| m in s;
+  if y: nat :| y in s && y < m {
+    ghost var s' := s - {m};
+    assert y in s';
+    m := ThereIsASmallest(s');
+  }
+}
+
+function smallest(items: set<nat>): (r: nat)
+  requires |items| > 0
+
+method m(items: set<nat>) returns (r:nat)
+requires |items| > 0 {
+    var item :| item in items;
+    return item;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5369.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5369.dfy.expect
new file mode 100644
index 00000000000..c4144a73574
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5369.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-5369.dfy(20,2): Error: expression is not allowed to invoke a method (m)
+git-issue-5369.dfy(20,40): Error: expression is not allowed to invoke a method (m)
+git-issue-5369.dfy(32,9): Error: unresolved identifier: ThereIsASmallest
+3 resolution/type errors detected in git-issue-5369.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5469.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5469.dfy
new file mode 100644
index 00000000000..f55fe494d52
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5469.dfy
@@ -0,0 +1,15 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+module SomeDependencyModule {
+  datatype None = None
+}
+
+module SomeModule {
+  import SomeDependencyModule
+
+  const test := SomeDependencyModule.None
+}
+
+method Main() {
+  print SomeModule.test, "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5469.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5469.dfy.expect
new file mode 100644
index 00000000000..2954079eab2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5469.dfy.expect
@@ -0,0 +1 @@
+SomeDependencyModule.None.None
diff --git a/Test/git-issues/git-issue-549.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-549.dfy
similarity index 75%
rename from Test/git-issues/git-issue-549.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-549.dfy
index d362a0bd039..5af6fb42e9b 100644
--- a/Test/git-issues/git-issue-549.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-549.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 trait T {
   function bar(): bv8
diff --git a/Test/git-issues/git-issue-549.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-549.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-549.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-549.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-549.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-549.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-549.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-551.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-551.dfy
similarity index 86%
rename from Test/git-issues/git-issue-551.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-551.dfy
index eae30573f54..3cb499f3b3f 100644
--- a/Test/git-issues/git-issue-551.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-551.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 datatype VoidOutcome =
 | VoidSuccess
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-551.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-551.dfy.expect
new file mode 100644
index 00000000000..6e9fc4bc7f0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-551.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-551.dfy(27,26): Error: a call to a ghost predicate is allowed only in specification contexts (consider declaring the predicate without the 'ghost' keyword)
+1 resolution/type errors detected in git-issue-551.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5520.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5520.dfy
new file mode 100644
index 00000000000..4dfe5c0982e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5520.dfy
@@ -0,0 +1,73 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+module SubsetTypeSubsetType {
+  type Empty = x: int | false witness *
+
+  method OperateOnEmpty(x: Empty)
+    ensures false
+  {
+  }
+
+  type PurportsToBeNonempty = x: Empty | true
+    witness 506 // error: this is not a witness
+
+  method Test() {
+    var x: PurportsToBeNonempty := *;
+    OperateOnEmpty(x);
+    print 10 / 0;
+  }
+}
+
+module SubsetTypeNewtype {
+  type Empty = x: int | false witness *
+
+  newtype PurportsToBeNonempty = x: Empty | true
+    witness 506 // error: this is not a witness
+
+  method OperateOnEmpty(x: PurportsToBeNonempty)
+    ensures false
+  {
+  }
+
+  method Test() {
+    var x: PurportsToBeNonempty := *;
+    OperateOnEmpty(x);
+    print 10 / 0;
+  }
+}
+
+module NewtypeSubsetType {
+  type Empty = x: int | false witness *
+
+  method OperateOnEmpty(x: Empty)
+    ensures false
+  {
+  }
+
+  type PurportsToBeNonempty = x: Empty | true
+    witness 506 // error: this is not a witness
+
+  method Test() {
+    var x: PurportsToBeNonempty := *;
+    OperateOnEmpty(x);
+    print 10 / 0;
+  }
+}
+
+module NewtypeNewtype {
+  type Empty = x: int | false witness *
+
+  newtype PurportsToBeNonempty = x: Empty | true
+    witness 506 // error: this is not a witness
+
+  method OperateOnEmpty(x: PurportsToBeNonempty)
+    ensures false
+  {
+  }
+
+  method Test() {
+    var x: PurportsToBeNonempty := *;
+    OperateOnEmpty(x);
+    print 10 / 0;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5520.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5520.dfy.expect
new file mode 100644
index 00000000000..4d932b10f8b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5520.dfy.expect
@@ -0,0 +1,6 @@
+git-issue-5520.dfy(12,12): Error: result of operation might violate subset type constraint for 'Empty'
+git-issue-5520.dfy(25,12): Error: result of operation might violate subset type constraint for 'Empty'
+git-issue-5520.dfy(48,12): Error: result of operation might violate subset type constraint for 'Empty'
+git-issue-5520.dfy(61,12): Error: result of operation might violate subset type constraint for 'Empty'
+
+Dafny program verifier finished with 8 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5521.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5521.dfy
new file mode 100644
index 00000000000..514b6470ac3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5521.dfy
@@ -0,0 +1,73 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+module WithoutWitnessClause {
+  type Empty = x: int | false witness *
+
+  newtype NewEmpty = Empty // error: the default-witness 0 is not a witness
+
+  method OperateOnNewEmpty(x: NewEmpty)
+    ensures false
+  {
+    var y: Empty := x as Empty;
+  }
+
+  method Test() {
+    var x: NewEmpty := *;
+    OperateOnNewEmpty(x);
+    print 10 / 0;
+  }
+}
+
+module WithWitnessClause {
+  type Empty = x: int | false witness *
+
+  newtype NewEmpty = Empty witness 506 // error: 506 is not a witness
+
+  method OperateOnNewEmpty(x: NewEmpty)
+    ensures false
+  {
+    var y: Empty := x as Empty;
+  }
+
+  method Test() {
+    var x: NewEmpty := *;
+    OperateOnNewEmpty(x);
+    print 10 / 0;
+  }
+}
+
+module WithGhostWitnessClause {
+  type Empty = x: int | false witness *
+
+  newtype NewEmpty = Empty ghost witness 506 // error: 506 is not a ghost witness
+
+  method OperateOnNewEmpty(x: NewEmpty)
+    ensures false
+  {
+    var y: Empty := x as Empty;
+  }
+
+  method Test() {
+    var x: NewEmpty := *;
+    OperateOnNewEmpty(x); // error: x is used before it has really been initialized
+    print 10 / 0;
+  }
+}
+
+module DeclaredAsPossiblyEmpty {
+  type Empty = x: int | false witness *
+
+  newtype NewEmpty = Empty witness *
+
+  method OperateOnNewEmpty(x: NewEmpty)
+    ensures false
+  {
+    var y: Empty := x as Empty;
+  }
+
+  method Test() {
+    var x: NewEmpty := *;
+    OperateOnNewEmpty(x); // error: x is used before it has really been initialized
+    print 10 / 0;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5521.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5521.dfy.expect
new file mode 100644
index 00000000000..38696de0ef1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5521.dfy.expect
@@ -0,0 +1,7 @@
+git-issue-5521.dfy(6,10): Error: trying witness 0: result of operation might violate subset type constraint for 'Empty'
+git-issue-5521.dfy(24,35): Error: result of operation might violate subset type constraint for 'Empty'
+git-issue-5521.dfy(42,41): Error: result of operation might violate subset type constraint for 'Empty'
+git-issue-5521.dfy(52,22): Error: variable 'x', which is subject to definite-assignment rules, might be uninitialized here
+git-issue-5521.dfy(70,22): Error: variable 'x', which is subject to definite-assignment rules, might be uninitialized here
+
+Dafny program verifier finished with 6 verified, 5 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5523.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5523.dfy
new file mode 100644
index 00000000000..d1512f7b9b4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5523.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+function Loop(xs: seq<()>): ()
+{
+  if |xs| == 0
+  then ()
+  else
+    var _: bool -> bool := e => e;
+    Loop(xs[1..])
+}
+
+method Main(){
+    print Loop([(), ()]), "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5523.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5523.dfy.expect
new file mode 100644
index 00000000000..6a452c185a8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5523.dfy.expect
@@ -0,0 +1 @@
+()
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5523.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5523.dfy.rs.check
new file mode 100644
index 00000000000..1bbaea9d839
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5523.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0631]: type mismatch in closure arguments
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-555.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-555.dfy
new file mode 100644
index 00000000000..f821897df82
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-555.dfy
@@ -0,0 +1,25 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: ! %run --no-verify --target cs "%s" >> "%t"
+// RUN: ! %run --no-verify --target js "%s" >> "%t"
+// RUN: ! %run --no-verify --target go "%s" >> "%t"
+// RUN: ! %run --no-verify --target java "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+
+method Main() {
+  g(10);
+  g(-10);
+  f(10);
+  f(-10);
+}
+
+method f(i: int) {
+  assert i > 0;
+  expect i > 0;
+}
+
+method g(i: int) {
+  expect i > 0; // assumes i > 0
+  assert i > 0;
+}
+
diff --git a/Test/git-issues/git-issue-555.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-555.dfy.expect
similarity index 89%
rename from Test/git-issues/git-issue-555.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-555.dfy.expect
index 00b475a43a5..af558470a29 100644
--- a/Test/git-issues/git-issue-555.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-555.dfy.expect
@@ -1,4 +1,4 @@
-git-issue-555.dfy(17,11): Error: assertion could not be proved
+git-issue-555.dfy(17,2): Error: assertion might not hold
 
 Dafny program verifier finished with 2 verified, 1 error
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5554.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5554.dfy
new file mode 100644
index 00000000000..95b3830b33b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5554.dfy
@@ -0,0 +1,13 @@
+// RUN:  %dafny -compile:4 -compileTarget:cs "%s"
+
+datatype MultisetContainer = EmptySet | BooleanMultiset(containerSet: multiset<bool>)
+
+method Main() {
+    var initialMultiset := multiset{false};
+    
+    for iteration := 0 to 31 {
+        var multisetInstance := BooleanMultiset(initialMultiset); 
+        initialMultiset := initialMultiset + multisetInstance.containerSet;  
+    }
+    print initialMultiset > initialMultiset;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5554.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5554.dfy.expect
new file mode 100644
index 00000000000..c508d5366f7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5554.dfy.expect
@@ -0,0 +1 @@
+false
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5570.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5570.dfy
new file mode 100644
index 00000000000..0d48531a014
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5570.dfy
@@ -0,0 +1,30 @@
+// RUN: %verify --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Class {
+  trait Parent { }
+
+  class Record extends Parent {}
+
+  function Pick(b: bool, r: Record, d: Parent): Parent {
+    if b then r else d
+  }
+
+  method Select(b: bool, r: Record, d: Parent) returns (p: Parent) {
+    p := if b then r else d;
+  }
+}
+
+module Datatype {
+  trait Parent { }
+
+  datatype Record extends Parent = Record
+
+  function Pick(b: bool, r: Record, d: Parent): Parent {
+    if b then r else d
+  }
+
+  method Select(b: bool, r: Record, d: Parent) returns (p: Parent) {
+    p := if b then r else d;
+  }
+}
diff --git a/Test/wishlist/FuelTriggers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5570.dfy.expect
similarity index 100%
rename from Test/wishlist/FuelTriggers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5570.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5572.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5572.dfy
new file mode 100644
index 00000000000..e73be31b7f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5572.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+datatype D = A(int) | C(int) {
+  function Test(): D {
+    match this{
+      case A(_) | C(_) =>
+        this
+    }
+  }
+}
+method Main() {
+  var x := C(0).Test();
+  print "ok";
+}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-697f.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5572.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-697f.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5572.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5586.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5586.dfy
new file mode 100644
index 00000000000..6b8feebbe4e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5586.dfy
@@ -0,0 +1,15 @@
+// RUN: %exits-with 4 %verify --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+
+trait Trait { }
+
+class Class extends Trait { }
+
+predicate P(t: Trait) {
+  t is Class // this is the related location of the error below
+}
+
+method M(u: Trait) {
+  assert P(u); // error
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5586.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5586.dfy.expect
new file mode 100644
index 00000000000..702ffec04b3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5586.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-5586.dfy(14,10): Error: assertion might not hold
+git-issue-5586.dfy(10,4): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5597.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5597.dfy
new file mode 100644
index 00000000000..52ae2d329a5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5597.dfy
@@ -0,0 +1,55 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+// Note, these tests seem to be specific to the old type system. With the new type system,
+// assignments that, in some way, involve a conversion from Number to Integer require an
+// explicit "as" type conversion.
+
+method Main() {
+  var n: set<Number> := {};
+  var s: set<Integer>;
+  s := DoItWithAssignment(n);
+  print |s|, " ";
+  s := DoItWithPlainLet(n);
+  print |s|, " ";
+  s := DoItWithOptimizedLet(n);
+  print |s|, " ";
+  s := DoItViaFunctionBodyResult(n);
+  print |s|, "\n";
+}
+
+trait Number {
+  const value: int
+}
+
+class Integer extends Number {
+  constructor(value: int) {
+    this.value := value;
+  }
+}
+
+method DoItWithAssignment(numbers: set<Number>) returns (integers00: set<Integer>)
+  requires |numbers| == 0
+{
+  integers00 := numbers;
+}
+
+function DoItWithPlainLet(numbers: set<Number>): set<Integer>
+  requires |numbers| == 0
+{
+  {} +
+  var integers11: set<Integer> := numbers;
+  integers11
+}
+
+function DoItWithOptimizedLet(numbers: set<Number>): set<Integer>
+  requires |numbers| == 0
+{
+  var integers22: set<Integer> := numbers;
+  integers22
+}
+
+function DoItViaFunctionBodyResult(numbers: set<Number>): set<Integer>
+  requires |numbers| == 0
+{
+  numbers
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5597.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5597.dfy.expect
new file mode 100644
index 00000000000..6a20ce40185
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5597.dfy.expect
@@ -0,0 +1 @@
+0 0 0 0
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5637.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5637.dfy
new file mode 100644
index 00000000000..20f766e2cbc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5637.dfy
@@ -0,0 +1,2 @@
+// RUN: %translate cs --include-test-runner --allow-warnings %s > "%t"
+// RUN: %diff "%s.expect" "%t"
\ No newline at end of file
diff --git a/Test/git-issues/github-issue-4004.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5637.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-4004.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5637.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5642.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5642.dfy
new file mode 100644
index 00000000000..55b40c2bbab
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5642.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+class Cl {
+  const c: bool
+  constructor(c: bool) {
+    this.c := c;
+    this.c := c;
+  }
+}
+
+method Main() {
+  var cl := new Cl(false);
+  print cl.c, "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5642.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5642.dfy.expect
new file mode 100644
index 00000000000..c508d5366f7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5642.dfy.expect
@@ -0,0 +1 @@
+false
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5643.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5643.dfy
new file mode 100644
index 00000000000..4046c77c914
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5643.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+datatype D = A | B
+
+const c := set d: D | true :: d
+
+datatype {:rust_rc false} E = F | G
+
+const h := set e: E | true :: e
+
+method Main() {
+  print |c|, |h|, "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5643.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5643.dfy.expect
new file mode 100644
index 00000000000..2bd5a0a98a3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5643.dfy.expect
@@ -0,0 +1 @@
+22
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5644.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5644.dfy
new file mode 100644
index 00000000000..5be7c59ea24
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5644.dfy
@@ -0,0 +1,21 @@
+// NONUNIFORM: Testing robustness of Dafny/Rust backends wrt set comprehension
+// RUN: %baredafny -noVerify -compileTarget:rs -compile:0 -functionSyntax:3 -spillTargetCode:3 "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Spoo {
+
+  newtype uint8 = x: int | 0 <= x < 0x100
+  newtype uint16 = x: int | 0 <= x < 0x10000
+  function method UInt16ToSeq(x: uint16): (ret: seq<uint8>)
+    ensures |ret| == 2
+    ensures 0x100 * ret[0] as uint16 + ret[1] as uint16 == x
+  {
+    var b0 := (x / 0x100) as uint8;
+    var b1 := (x % 0x100) as uint8;
+    [b0, b1]
+  }
+
+  method {:test} TestSetToOrderedSequenceManyItems() {
+    var a := set x:uint16 | 0 <= x < 0xFFFF :: UInt16ToSeq(x);
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5644.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5644.dfy.expect
new file mode 100644
index 00000000000..39be9965f21
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5644.dfy.expect
@@ -0,0 +1,5 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier did not attempt verification
+Wrote textual form of target program to git-issue-5644-rust/src/git_issue_5644.rs
+Additional output written to git-issue-5644-rust/src/git-issue-5644-rs.dtr
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5647.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5647.dfy
new file mode 100644
index 00000000000..cb86f223c2b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5647.dfy
@@ -0,0 +1,28 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+// Verify shadowing
+
+function {:tailrecursion} GetSum(
+  a_b': nat,
+  ac_c: string)
+  : string
+{
+  if a_b' == 0 then
+    ac_c
+  else
+    var j := a_b';
+    var a_b' := if a_b' % 2 == 0 then "1" else "0";
+    GetSum(j - 1, ac_c + a_b')
+}
+
+function GetSumAuto(x: nat, y: nat): nat
+  decreases y - x
+{
+  if x >= y then y else
+  1 + GetSumAuto(x + 1, y)
+}
+
+method Main() {
+  print GetSum(10, ""), "\n";
+  print GetSumAuto(0, 5);
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5647.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5647.dfy.expect
new file mode 100644
index 00000000000..739a8f781f5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5647.dfy.expect
@@ -0,0 +1,2 @@
+1010101010
+10
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5719.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5719.dfy
new file mode 100644
index 00000000000..efbd8a4ea15
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5719.dfy
@@ -0,0 +1,31 @@
+// RUN: %verify --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait G {}
+
+trait Thing<A, G1 extends G> {
+  function Get(): (a: A)
+    ensures P(a)
+
+  predicate P(a: A) {
+    Q(a)
+  }
+
+  predicate Q(a: A) 
+}
+
+datatype D extends G = Dd
+
+method TestD<A>(thing: Thing<A, D>) {
+  var a := thing.Get();
+  // assert thing.P(a); // this assertion was once needed to prove the next line
+  assert thing.Q(a);
+}
+
+class E extends G { }
+
+method TestE<A>(thing: Thing<A, E>) {
+  var a := thing.Get();
+  // assert thing.P(a); // this assertion was once needed to prove the next line
+  assert thing.Q(a);
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5719.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5719.dfy.expect
new file mode 100644
index 00000000000..00a51f822da
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5719.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 3 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726a.dfy
new file mode 100644
index 00000000000..98a36be86a9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726a.dfy
@@ -0,0 +1,52 @@
+// RUN: %exits-with 2 %verify --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Type errors from Issue 5726 (see also git-issue-5726b.dfy)
+
+module Example0 {
+  trait G {
+    const Three := 3
+    const Six := Three + Three
+  }
+
+  class E extends G { }
+
+  method DoIt<G1 extends G>(g1: G1) {
+    var g := g1 as G;
+    print g.Six, "\n";
+  }
+
+  method Test() {
+    DoIt<E?>(null); // error: E? does not extend G
+  }
+}
+
+module Example3 {
+  trait G {
+    const Three := 3
+    const Six := Three + Three
+  }
+
+  class E extends G { }
+
+  trait Thing<G1 extends G> {
+    function GetG(): (g: G1)
+
+    method PrintGSix() {
+      var g1 := GetG();
+      var g := g1 as G;
+      print g.Six, "\n";
+    }
+  }
+
+  class MyThing extends Thing<E?> { // error: E? does not extend G
+    function GetG(): (g: E?) {
+      null
+    }
+  }
+
+  method Test() {
+    var thing := new MyThing;
+    thing.PrintGSix();
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726a.dfy.expect
new file mode 100644
index 00000000000..21de5995035
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726a.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-5726a.dfy(20,12): Error: type parameter ('G1') passed to method 'DoIt' must meet type bound 'G' (got 'E?')
+git-issue-5726a.dfy(42,24): Error: type parameter ('G1') passed to type 'Thing' must meet type bound 'G' (got 'E?')
+2 resolution/type errors detected in git-issue-5726a.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726b.dfy
new file mode 100644
index 00000000000..7b8ee51f565
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726b.dfy
@@ -0,0 +1,48 @@
+// RUN: %exits-with 4 %verify --type-system-refresh --general-traits=datatype "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Verification errors from Issue 5726 (see also git-issue-5726a.dfy)
+
+module Example1 {
+  trait G extends object {
+    const Three := 3
+    const Six := Three + Three
+  }
+
+  class E extends G { }
+
+  method DoIt<G1 extends G?>(g1: G1) {
+    var g := g1 as G; // error: g1 is a G?, but it might not be a G (because it might be null)
+    print g.Six, "\n";
+  }
+
+  method CheckIt0<G1 extends G?>(g1: G1) {
+    assert g1 is G?;
+  }
+
+  method CheckIt1<G1 extends G?>(g1: G1) {
+    assert g1 is G; // error: g1 is a G?, but it might not be a G (because it might be null)
+  }
+
+  method Test() {
+    DoIt<E?>(null);
+  }
+}
+
+module Example2 {
+  trait G extends object {
+    const Three := 3
+    const Six := Three + Three
+  }
+
+  class E extends G { }
+
+  method DoIt<G1 extends G?>(g1: G1) {
+    var g := g1 as G?;
+    print g.Six, "\n"; // error: this is trying to deference a G?, but it is not known whether or not g is null
+  }
+
+  method Test() {
+    DoIt<E?>(null);
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726b.dfy.expect
new file mode 100644
index 00000000000..1b5edb239cc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5726b.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-5726b.dfy(15,16): Error: value of expression (of type 'G1') is not known to be an instance of type 'G'
+git-issue-5726b.dfy(24,4): Error: assertion might not hold
+git-issue-5726b.dfy(42,12): Error: target object might be null
+
+Dafny program verifier finished with 3 verified, 3 errors
diff --git a/Test/git-issues/github-issue-2928.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/dfyconfig.toml
similarity index 100%
rename from Test/git-issues/github-issue-2928.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/dfyconfig.toml
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/git-issue-5730-include.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/git-issue-5730-include.dfy
new file mode 100644
index 00000000000..2f9fb3a58e1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/git-issue-5730-include.dfy
@@ -0,0 +1,5 @@
+// RUN: echo 'lit should ignore this file' 
+
+method VerifyMe() {
+  assert false; // It should display this as not verified.
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/git-issue-5730.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/git-issue-5730.dfy
new file mode 100644
index 00000000000..91d579a62a8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/git-issue-5730.dfy
@@ -0,0 +1,11 @@
+// RUN: %exits-with -any %baredafny verify %args "%S/dfyconfig.toml" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module X {
+  method {:only} VerifyMe() {
+    assert false; // Should display an error
+  }
+  method DontVerifyMe() {
+    assert false; // Should not show any error
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/git-issue-5730.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/git-issue-5730.dfy.expect
new file mode 100644
index 00000000000..21f3a74d519
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5730/git-issue-5730.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-5730.dfy(5,11): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
+git-issue-5730-include.dfy(4,2): Error: assertion might not hold
+git-issue-5730.dfy(6,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-580.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-580.dfy
new file mode 100644
index 00000000000..21b29f0f6d6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-580.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+trait A {}
+trait B {}
+class C extends A, B {
+  method Foo() {
+    assert false; // error: but this once used to pass
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-580.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-580.dfy.expect
new file mode 100644
index 00000000000..de995cf4538
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-580.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-580.dfy(8,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5873.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5873.dfy
new file mode 100644
index 00000000000..1ac4ccf4146
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5873.dfy
@@ -0,0 +1,20 @@
+// RUN: %verify --type-system-refresh --general-traits=datatype --bprint "%t.bpl" "%s"
+// RUN: %boogie "%t.bpl" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait Parent {
+  method M() returns (r: nat)
+  function F(): nat
+}
+
+datatype Dt<K(!new)> extends Parent = Dt {
+  method M() returns (r: nat) {
+    r := 0;
+  }
+
+  // The type parameter with (!new) once caused function override checks, like the one for this
+  // function, to generate malformed Boogie.
+  function F(): nat {
+    0
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5873.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5873.dfy.expect
new file mode 100644
index 00000000000..00ddb38b45b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5873.dfy.expect
@@ -0,0 +1,2 @@
+
+Boogie program verifier finished with 4 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-588.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-588.dfy
new file mode 100644
index 00000000000..7db894a1971
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-588.dfy
@@ -0,0 +1,16 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+module myclass {
+  class MyClass {
+    var num: int
+
+    constructor (x: int) {
+      num := x;
+    }
+  }
+
+  method Main() {
+    var c_obj := new MyClass(2);
+  }
+}
+
diff --git a/Test/git-issues/github-issue-3343.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-588.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-3343.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-588.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-588.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-588.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-588.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-590.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-590.dfy
new file mode 100644
index 00000000000..6de0506d461
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-590.dfy
@@ -0,0 +1,3 @@
+// dafny should emit exit value 1
+// RUN: ! %run x.cs > "%t"
+// RUN: %diff "%s.expect" "%t"
diff --git a/Test/git-issues/git-issue-590.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-590.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-590.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-590.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972.dfy
new file mode 100644
index 00000000000..ec8e41fc8d4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972.dfy
@@ -0,0 +1,240 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+module Issue5972 {
+  datatype M<T, U> = M(m: map<T, U>)
+
+  method CompareAnything<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := M(map[0 := f]);
+    var m2 := M(map[0 := g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.m[0] == m2.m[0];
+      }
+    }
+    return m1 == m2; // error: the types of m1 and m2 do not support equality
+  }
+
+  datatype S<T> = S(s: seq<T>)
+
+  method CompareAnythingS<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := S([f]);
+    var m2 := S([g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.s[0] == m2.s[0];
+      }
+    }
+    return m1 == m2; // error: the types of m1 and m2 do not support equality
+  }
+
+
+  codatatype Stream = Stream(head: int, tail: Stream)
+  {
+    static function From(i: int): Stream {
+      Stream(i, From(i + 1))
+    }
+  }
+
+  method Main() {
+    var s1 := Stream.From(0);
+    var s2 := Stream.From(0);
+    var b := CompareAnything(s1, s2);
+    var b2 := CompareAnythingS(s1, s2);
+    if !b || !b2 {
+      assert false;
+      print 1/0;
+    }
+  }
+}
+
+// This module is like Issue5972 above, but uses type synonyms around the map/seq types
+module TypeSynonyms {
+  type MyMap<T, U> = map<T, U>
+  type MySeq<T> = seq<T>
+
+  datatype M<T, U> = M(m: MyMap<T, U>)
+
+  method CompareAnything<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := M(map[0 := f]);
+    var m2 := M(map[0 := g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.m[0] == m2.m[0];
+      }
+    }
+    return m1 == m2; // error: the types of m1 and m2 do not support equality
+  }
+
+  datatype S<T> = S(s: MySeq<T>)
+
+  method CompareAnythingS<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := S([f]);
+    var m2 := S([g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.s[0] == m2.s[0];
+      }
+    }
+    return m1 == m2; // error: the types of m1 and m2 do not support equality
+  }
+
+  codatatype Stream = Stream(head: int, tail: Stream)
+  {
+    static function From(i: int): Stream {
+      Stream(i, From(i + 1))
+    }
+  }
+
+  method Test() {
+    var s1 := Stream.From(0);
+    var s2 := Stream.From(0);
+    var b := CompareAnything(s1, s2);
+    var b2 := CompareAnythingS(s1, s2);
+    if !b || !b2 {
+      assert false;
+      print 1/0;
+    }
+  }
+}
+
+// This module is like TypeSynonyms above, but the two type synonyms are declared to definitely support equality.
+// The fact that their RHSs don't gives rise to errors, but in the process of fixing issue 5972, this program
+// had caused a crash, so it seems good to include as a test case.
+module TypeSynonymsWithGuaranteedEqualitySupport {
+  type MyMap(==)<T, U> = map<T, U> // error: RHS does not support equality as promised
+  type MySeq(==)<T> = seq<T> // error: RHS does not support equality as promised
+
+  datatype M<T, U> = M(m: MyMap<T, U>)
+
+  method CompareAnything<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := M(map[0 := f]);
+    var m2 := M(map[0 := g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.m[0] == m2.m[0];
+      }
+    }
+    return m1 == m2;
+  }
+
+  datatype S<T> = S(s: MySeq<T>)
+
+  method CompareAnythingS<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := S([f]);
+    var m2 := S([g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.s[0] == m2.s[0];
+      }
+    }
+    return m1 == m2;
+  }
+
+  codatatype Stream = Stream(head: int, tail: Stream)
+  {
+    static function From(i: int): Stream {
+      Stream(i, From(i + 1))
+    }
+  }
+
+  method Test() {
+    var s1 := Stream.From(0);
+    var s2 := Stream.From(0);
+    var b := CompareAnything(s1, s2);
+    var b2 := CompareAnythingS(s1, s2);
+    if !b || !b2 {
+      assert false;
+      print 1/0;
+    }
+  }
+}
+
+// This module is like TypeSynonyms above, but uses subset types around the map/seq types
+module SubsetTypes {
+  type MyMap<T, U> = m: map<T, U> | true
+  type MySeq<T> = s: seq<T> | true
+
+  datatype M<T, U> = M(m: MyMap<T, U>)
+
+  method CompareAnything<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := M(map[0 := f]);
+    var m2 := M(map[0 := g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.m[0] == m2.m[0];
+      }
+    }
+    return m1 == m2; // error: the types of m1 and m2 do not support equality
+  }
+
+  datatype S<T> = S(s: MySeq<T>)
+
+  method CompareAnythingS<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := S([f]);
+    var m2 := S([g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.s[0] == m2.s[0];
+      }
+    }
+    return m1 == m2; // error: the types of m1 and m2 do not support equality
+  }
+
+  codatatype Stream = Stream(head: int, tail: Stream)
+  {
+    static function From(i: int): Stream {
+      Stream(i, From(i + 1))
+    }
+  }
+
+  method Test() {
+    var s1 := Stream.From(0);
+    var s2 := Stream.From(0);
+    var b := CompareAnything(s1, s2);
+    var b2 := CompareAnythingS(s1, s2);
+    if !b || !b2 {
+      assert false;
+      print 1/0;
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972.dfy.expect
new file mode 100644
index 00000000000..35d393053a0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972.dfy.expect
@@ -0,0 +1,9 @@
+git-issue-5972.dfy(19,11): Error: == can only be applied to expressions of types that support equality (got M<int, A>) (perhaps try declaring type parameter 'A' on line 6 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-5972.dfy(37,11): Error: == can only be applied to expressions of types that support equality (got S<A>) (perhaps try declaring type parameter 'A' on line 24 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-5972.dfy(80,11): Error: == can only be applied to expressions of types that support equality (got M<int, A>) (perhaps try declaring type parameter 'A' on line 67 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-5972.dfy(98,11): Error: == can only be applied to expressions of types that support equality (got S<A>) (perhaps try declaring type parameter 'A' on line 85 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-5972.dfy(124,7): Error: type 'MyMap' declared as supporting equality, but the RHS type (map<T, U>) might not (perhaps try declaring type parameter 'U' on line 124 as 'U(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-5972.dfy(125,7): Error: type 'MySeq' declared as supporting equality, but the RHS type (seq<T>) might not (perhaps try declaring type parameter 'T' on line 125 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-5972.dfy(202,11): Error: == can only be applied to expressions of types that support equality (got M<int, A>) (perhaps try declaring type parameter 'A' on line 189 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-5972.dfy(220,11): Error: == can only be applied to expressions of types that support equality (got S<A>) (perhaps try declaring type parameter 'A' on line 207 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+8 resolution/type errors detected in git-issue-5972.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972a.dfy
new file mode 100644
index 00000000000..96e9bb4ae6c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972a.dfy
@@ -0,0 +1,124 @@
+// RUN: %exits-with 2 %verify --type-system-refresh --general-newtypes "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// This module is like SubsetTypes in git-issue-5972.dfy, but uses newtypes around the map/seq types
+module Newtypes {
+  newtype MyMap<T, U> = map<T, U>
+  newtype MySeq<T> = seq<T>
+
+  datatype M<T, U> = M(m: MyMap<T, U>)
+
+  method CompareAnything<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := M(map[0 := f]);
+    var m2 := M(map[0 := g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.m[0] == m2.m[0];
+      }
+    }
+    return m1 == m2; // error: the types of m1 and m2 do not support equality
+  }
+
+  datatype S<T> = S(s: MySeq<T>)
+
+  method CompareAnythingS<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := S([f]);
+    var m2 := S([g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.s[0] == m2.s[0];
+      }
+    }
+    return m1 == m2; // error: the types of m1 and m2 do not support equality
+  }
+
+  codatatype Stream = Stream(head: int, tail: Stream)
+  {
+    static function From(i: int): Stream {
+      Stream(i, From(i + 1))
+    }
+  }
+
+  method Main() {
+    var s1 := Stream.From(0);
+    var s2 := Stream.From(0);
+    var b := CompareAnything(s1, s2);
+    var b2 := CompareAnythingS(s1, s2);
+    if !b || !b2 {
+      assert false;
+      print 1/0;
+    }
+  }
+}
+
+// This module is like Newtypes above, but the two newtypes are declared to definitely support equality.
+// The fact that their RHSs don't gives rise to errors. This was not properly handled before the fix
+// of issue 5972.
+module NewtypesWithGuaranteedEqualitySupport {
+  type MyMap(==)<T, U> = map<T, U> // error: RHS does not support equality as promised
+  type MySeq(==)<T> = seq<T> // error: RHS does not support equality as promised
+
+  datatype M<T, U> = M(m: MyMap<T, U>)
+
+  method CompareAnything<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := M(map[0 := f]);
+    var m2 := M(map[0 := g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.m[0] == m2.m[0];
+      }
+    }
+    return m1 == m2;
+  }
+
+  datatype S<T> = S(s: MySeq<T>)
+
+  method CompareAnythingS<A>(f: A, g: A) returns (b: bool) 
+    ensures b <==> f == g
+  {
+    var m1 := S([f]);
+    var m2 := S([g]);
+    assert m1 == m2 <==> f == g by {
+      if f == g {
+        assert m1 == m2;
+      }
+      if m1 == m2 {
+        assert m1.s[0] == m2.s[0];
+      }
+    }
+    return m1 == m2;
+  }
+
+  codatatype Stream = Stream(head: int, tail: Stream)
+  {
+    static function From(i: int): Stream {
+      Stream(i, From(i + 1))
+    }
+  }
+
+  method Test() {
+    var s1 := Stream.From(0);
+    var s2 := Stream.From(0);
+    var b := CompareAnything(s1, s2);
+    var b2 := CompareAnythingS(s1, s2);
+    if !b || !b2 {
+      assert false;
+      print 1/0;
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972a.dfy.expect
new file mode 100644
index 00000000000..54f54d2f936
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972a.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-5972a.dfy(24,11): Error: == can only be applied to expressions of types that support equality (got M<int, A>) (perhaps try declaring type parameter 'A' on line 11 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-5972a.dfy(42,11): Error: == can only be applied to expressions of types that support equality (got S<A>) (perhaps try declaring type parameter 'A' on line 29 as 'A(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-5972a.dfy(68,7): Error: type 'MyMap' declared as supporting equality, but the RHS type (map<T, U>) might not (perhaps try declaring type parameter 'U' on line 68 as 'U(==)', which says it can only be instantiated with a type that supports equality)
+git-issue-5972a.dfy(69,7): Error: type 'MySeq' declared as supporting equality, but the RHS type (seq<T>) might not (perhaps try declaring type parameter 'T' on line 69 as 'T(==)', which says it can only be instantiated with a type that supports equality)
+4 resolution/type errors detected in git-issue-5972a.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972c.dfy
new file mode 100644
index 00000000000..9d87a61d24b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972c.dfy
@@ -0,0 +1,14 @@
+// RUN: %exits-with 2 %baredafny verify %args --type-system-refresh --general-newtypes "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype FunMap<T> = s: map<int, int -> T> | true {}
+
+datatype A<T> = A(a: FunMap<T>)
+
+method Test<T(==)>() {
+
+}
+
+method Main() {
+  Test<A<int>>(); // Error: A<int> does not support equality
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972c.dfy.expect
new file mode 100644
index 00000000000..abe28f371f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5972c.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-5972c.dfy(13,14): Error: type parameter (T) passed to method Test must support equality (got A<int>)
+1 resolution/type errors detected in git-issue-5972c.dfy
diff --git a/Test/git-issues/git-issue-600.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-600.dfy
similarity index 81%
rename from Test/git-issues/git-issue-600.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-600.dfy
index d7d2b894bb4..86fed827bee 100644
--- a/Test/git-issues/git-issue-600.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-600.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 datatype D = D(n: int)
 
diff --git a/Test/git-issues/git-issue-600.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-600.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-600.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-600.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6014.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6014.dfy
new file mode 100644
index 00000000000..b43e78bfeb9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6014.dfy
@@ -0,0 +1,61 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" 
+
+module State {
+
+  datatype State = Whatever
+
+}
+
+module Foo {
+
+   import opened State
+
+   const bar: State
+
+   method Main() {
+     print "Hello!\n";
+  }
+}
+
+module Enclosing {
+
+  module A {
+    datatype A = Whatever
+  }
+
+}
+
+module UsingEnclosing {
+
+   import opened Enclosing
+
+   const bar: A.A
+
+   method Main2() {
+     print "Hello!\n";
+  }
+}
+
+module A {
+
+  trait T<X> {
+    var a: X
+  }
+
+  class A extends T<int> {
+    var x : int
+    constructor() {x := 0;}
+  }
+
+}
+
+module UsingA {
+
+   import opened A
+
+   method Main3() {
+     var b := new A();
+
+     print "Hello!\n";
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6014.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6014.dfy.expect
new file mode 100644
index 00000000000..10ddd6d257e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6014.dfy.expect
@@ -0,0 +1 @@
+Hello!
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6038.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6038.dfy
new file mode 100644
index 00000000000..8a0794b9789
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6038.dfy
@@ -0,0 +1,22 @@
+// RUN: %verify %s &> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait T {
+
+  ghost function Modifies(): set<object>
+
+  method Foo()
+    modifies Modifies()
+}
+
+class {:compile false} C extends T {
+
+  const Repr: set<object>
+
+  ghost function Modifies(): set<object> {
+    Repr
+  }
+
+  method Foo()
+    modifies Modifies()
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6038.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6038.dfy.expect
new file mode 100644
index 00000000000..ebe2328e072
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6038.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/git-issues/git-issue-604.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-604.dfy
similarity index 80%
rename from Test/git-issues/git-issue-604.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-604.dfy
index 808fc3f48ee..afaedb0bf5d 100644
--- a/Test/git-issues/git-issue-604.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-604.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 method Inv() returns (x: int) {
   x := 0;
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-604.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-604.dfy.expect
new file mode 100644
index 00000000000..db503984405
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-604.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-604.dfy(6,2): Warning: this loop has no body (loop frame: x)
+git-issue-604.dfy(8,2): Error: assertion might not hold
+git-issue-604.dfy(20,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6043.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6043.dfy
new file mode 100644
index 00000000000..3b0510a2aef
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6043.dfy
@@ -0,0 +1,42 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function F(x: int): int
+  decreases G(x) // error: decreases clause cannot use mutually recursive function
+{
+  G(x) - 1
+}
+
+function G(x: int): int
+  decreases F(x) // error: decreases clause cannot use mutually recursive function
+{
+  F(x)
+}
+
+function K(x: nat): int
+  decreases if x == 0 then 0 else 1 + K(x - 1) // error: decreases clause is not allowed to call enclosing function
+{
+  if x == 0 then 200 else 1 + K(x - 1)
+}
+
+function Id(x: int): int {
+  IdBuddy(x)
+}
+
+function IdBuddy(x: int): int
+  decreases x, 0
+{
+  if x <= 0 then x else
+    var id := Id; // error: cannot use Id naked here
+    id(x - 1)
+}
+
+ghost function H(x: int): int {
+  if H != (H) then 0 else 3 // error (x2): cannot use H naked here
+}
+
+datatype Dt = Dt {
+  ghost function J(x: int): int {
+    if (this).J == J then 0 else 3 // error (x2): cannot use J naked here
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6043.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6043.dfy.expect
new file mode 100644
index 00000000000..c79d8eeca66
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-6043.dfy.expect
@@ -0,0 +1,9 @@
+git-issue-6043.dfy(5,13): Error: the decreases clause of function 'F' is not allowed to call 'G', because they are mutually recursive
+git-issue-6043.dfy(11,13): Error: the decreases clause of function 'G' is not allowed to call 'F', because they are mutually recursive
+git-issue-6043.dfy(17,39): Error: a decreases clause is not allowed to call the enclosing function
+git-issue-6043.dfy(30,14): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
+git-issue-6043.dfy(35,5): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
+git-issue-6043.dfy(35,11): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
+git-issue-6043.dfy(40,14): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
+git-issue-6043.dfy(40,19): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
+8 resolution/type errors detected in git-issue-6043.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-610.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-610.dfy
new file mode 100644
index 00000000000..eaac9b6c2b9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-610.dfy
@@ -0,0 +1,17 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+type pos = i:int | i > 0 witness 1
+
+method Main()
+{
+  var x:pos;
+  assert x > 0;
+  var p:(pos, pos);
+  var (a, b) := p;
+  assert a > 0;
+  assert b > 0;
+  print a, " ", b, "\n";
+  expect a > 0;
+  expect b > 0;
+}
+
diff --git a/Test/git-issues/git-issue-610.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-610.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-610.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-610.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-610.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-610.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-610.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-611.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-611.dfy
similarity index 84%
rename from Test/git-issues/git-issue-611.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-611.dfy
index c44e9d93578..e1a2dabc046 100644
--- a/Test/git-issues/git-issue-611.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-611.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module M1 {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-611.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-611.dfy.expect
new file mode 100644
index 00000000000..012f5b99379
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-611.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-612.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-612.dfy
new file mode 100644
index 00000000000..c15d0b91b90
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-612.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+datatype D = D
+{
+  function {:extern Foo} Foo() : bool
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-612.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-612.dfy.expect
new file mode 100644
index 00000000000..012f5b99379
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-612.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/git-issues/git-issue-615.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-615.dfy
similarity index 81%
rename from Test/git-issues/git-issue-615.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-615.dfy
index 785eceb823a..af1d0d911ad 100644
--- a/Test/git-issues/git-issue-615.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-615.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class MyClass {
   ghost const repr: object
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-615.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-615.dfy.expect
new file mode 100644
index 00000000000..8093a4505e9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-615.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-615.dfy(13,42): Error: insufficient reads clause to invoke function
+git-issue-615.dfy(24,14): Error: insufficient reads clause to invoke function
+
+Dafny program verifier finished with 3 verified, 2 errors
diff --git a/Test/git-issues/git-issue-616.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-616.dfy
similarity index 78%
rename from Test/git-issues/git-issue-616.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-616.dfy
index 4c53fe22e4e..52767662868 100644
--- a/Test/git-issues/git-issue-616.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-616.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 
 module TestBad2 {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-616.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-616.dfy.expect
new file mode 100644
index 00000000000..012f5b99379
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-616.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/git-issues/git-issue-621.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621.dfy
similarity index 76%
rename from Test/git-issues/git-issue-621.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621.dfy
index 971dc5f56d2..7158ffcb22f 100644
--- a/Test/git-issues/git-issue-621.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module M {
   export provides D, MyData
diff --git a/Test/git-issues/git-issue-621.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-621.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621a.dfy
new file mode 100644
index 00000000000..ae670362f2d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621a.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module M {
+  export provides D, MyData
+  datatype D = D1 | D2
+  const MyData : D := D1  // OK even though in the export view, MyData does not have an initializer
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621a.dfy.expect
new file mode 100644
index 00000000000..012f5b99379
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-621a.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-622$f.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-622$f.dfy
new file mode 100644
index 00000000000..2ada5a106ee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-622$f.dfy
@@ -0,0 +1,4 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
+
+method Main() {
+}
diff --git a/Test/git-issues/github-issue-4004_v2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-622$f.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-4004_v2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-622$f.dfy.expect
diff --git a/Test/git-issues/git-issue-623.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-623.dfy
similarity index 97%
rename from Test/git-issues/git-issue-623.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-623.dfy
index 569ed70fa22..9c3bd0b924d 100644
--- a/Test/git-issues/git-issue-623.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-623.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // ----- example reported in Issue 623
diff --git a/Test/git-issues/git-issue-623.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-623.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-623.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-623.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-633.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-633.dfy
new file mode 100644
index 00000000000..32c02b441cb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-633.dfy
@@ -0,0 +1,12 @@
+// NONUNIFORM: need to add support for --input when running to %testDafnyForEachCompiler
+// RUN: %verify "%s" %S/git-issue-633A.dfy > "%t"
+// RUN: %run --no-verify --target cs "%s" --input %S/git-issue-633A.dfy >> "%t"
+// RUN: %run --no-verify --target js "%s" --input %S/git-issue-633A.dfy >> "%t"
+// RUN: %run --no-verify --target go "%s" --input %S/git-issue-633A.dfy >> "%t"
+// RUN: %run --no-verify --target java "%s" --input %S/git-issue-633A.dfy  >> "%t"
+// RUN: %run --no-verify --target py "%s" --input %S/git-issue-633A.dfy  >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method m() {
+  print "OK\n";
+}
diff --git a/Test/git-issues/git-issue-633.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-633.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-633.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-633.dfy.expect
diff --git a/Test/git-issues/git-issue-633A.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-633A.dfy
similarity index 100%
rename from Test/git-issues/git-issue-633A.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-633A.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-643.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-643.dfy
new file mode 100644
index 00000000000..e2637484616
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-643.dfy
@@ -0,0 +1,10 @@
+// RUN: %verify "%s" > "%t"
+// RUN: ! %run --no-verify --target cs "%s" >> "%t"
+// RUN: ! %run --no-verify --target java "%s" >> "%t"
+// RUN: ! %run --no-verify --target js "%s" >> "%t"
+// RUN: ! %run --no-verify --target go "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+   expect false;
+}
diff --git a/Test/git-issues/git-issue-643.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-643.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-643.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-643.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-643a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-643a.dfy
new file mode 100644
index 00000000000..bbdb84edb74
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-643a.dfy
@@ -0,0 +1,10 @@
+// RUN: %verify "%s" > "%t"
+// RUN: ! %run --no-verify --target cs "%s" >> "%t"
+// RUN: ! %run --no-verify --target java "%s" >> "%t"
+// RUN: ! %run --no-verify --target js "%s" >> "%t"
+// RUN: ! %run --no-verify --target go "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+   expect false, "fails";
+}
diff --git a/Test/git-issues/git-issue-643a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-643a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-643a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-643a.dfy.expect
diff --git a/Test/git-issues/git-issue-645.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-645.dfy
similarity index 100%
rename from Test/git-issues/git-issue-645.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-645.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-645.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-645.dfy.expect
new file mode 100644
index 00000000000..90a4537053a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-645.dfy.expect
@@ -0,0 +1,2 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+*** Error: Command-line argument 'xyz' is neither a recognized option nor a filename with a supported extension (.dfy, .cs, .dll).
diff --git a/Test/git-issues/git-issue-659.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659.dfy
similarity index 83%
rename from Test/git-issues/git-issue-659.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659.dfy
index d3f5c19985e..89f65182cbd 100644
--- a/Test/git-issues/git-issue-659.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module A {
   module Inner {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659.dfy.expect
new file mode 100644
index 00000000000..ebe2328e072
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/git-issues/git-issue-659b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659b.dfy
similarity index 85%
rename from Test/git-issues/git-issue-659b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659b.dfy
index 5685889e60f..34b65808033 100644
--- a/Test/git-issues/git-issue-659b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659b.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module A {
   module Inner {
diff --git a/Test/git-issues/git-issue-659b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-659b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659b.dfy.expect
diff --git a/Test/git-issues/git-issue-659e.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659e.dfy
similarity index 87%
rename from Test/git-issues/git-issue-659e.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659e.dfy
index c95047d1e25..37a942406c0 100644
--- a/Test/git-issues/git-issue-659e.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659e.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module M {
   module Inner {
diff --git a/Test/git-issues/git-issue-659e.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659e.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-659e.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-659e.dfy.expect
diff --git a/Test/git-issues/git-issue-663.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-663.dfy
similarity index 99%
rename from Test/git-issues/git-issue-663.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-663.dfy
index 33505836108..2609e32fb91 100644
--- a/Test/git-issues/git-issue-663.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-663.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 3 %dafny /compile:1 "%s" > "%t"
+// RUN: ! %build "%s" &> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method StatementsInCompiledMethod() {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-663.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-663.dfy.expect
new file mode 100644
index 00000000000..9420724e656
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-663.dfy.expect
@@ -0,0 +1,148 @@
+git-issue-663.dfy(250,23): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(252,26): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(255,33): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(256,36): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(260,33): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(261,36): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(265,33): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(266,36): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(5,2): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(8,8): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(12,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(16,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(22,2): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(25,8): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(29,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(33,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(39,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(44,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(50,6): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(55,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(59,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(64,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(70,6): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(75,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(81,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(86,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(92,6): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(97,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(101,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(106,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(112,6): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(117,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(122,2): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(125,8): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(129,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(132,2): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(137,2): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(140,8): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(144,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(147,2): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(154,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(155,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(157,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(156,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(162,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(163,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(165,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(164,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(170,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(171,8): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(172,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(173,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(179,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(180,8): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(181,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(182,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(190,10): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+git-issue-663.dfy(188,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(189,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(191,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(190,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(196,10): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+git-issue-663.dfy(194,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(195,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(197,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(196,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(202,10): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+git-issue-663.dfy(200,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(201,8): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(202,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(203,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(208,10): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+git-issue-663.dfy(206,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(207,8): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(208,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(209,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(214,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(216,2): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(214,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(216,2): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(221,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(223,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(222,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(225,2): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(223,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(222,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(229,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(229,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(233,10): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+git-issue-663.dfy(232,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(234,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(233,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(234,12): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(233,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(279,13): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(279,30): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(280,19): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(281,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(281,21): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(282,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(283,14): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(283,31): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(284,20): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(284,37): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(288,13): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(288,30): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(289,19): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(290,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(291,14): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(291,31): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(292,20): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(292,37): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(296,13): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(296,30): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(297,19): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(298,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(299,14): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(299,31): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(300,20): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(300,37): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(305,13): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(305,30): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(306,19): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(307,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(308,14): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(308,31): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(309,20): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(309,37): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(239,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(242,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(245,16): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(248,16): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(316,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(319,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(323,6): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(327,6): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(333,4): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(336,10): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(340,6): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(344,6): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(221,11): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(225,2): Warning: assume statement has no {:axiom} annotation
+git-issue-663.dfy(232,11): Warning: assume statement has no {:axiom} annotation
+
+Dafny program verifier finished with 23 verified, 0 errors
+git-issue-663.dfy(187,7): Error: Method _module._default.SpecificationOfCompiledMethodWithoutBody has no body so it cannot be compiled
+git-issue-663.dfy(199,9): Error: Function _module._default.SpecificationOfCompiledFunctionWithoutBody has no body so it cannot be compiled
+Translation was aborted because errors were found
diff --git a/Test/git-issues/git-issue-664.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-664.dfy
similarity index 86%
rename from Test/git-issues/git-issue-664.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-664.dfy
index d2b24fe0b45..e40b8b6d9b2 100644
--- a/Test/git-issues/git-issue-664.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-664.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 class C {
   static const X: int
diff --git a/Test/git-issues/git-issue-664.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-664.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-664.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-664.dfy.expect
diff --git a/Test/git-issues/git-issue-666.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-666.dfy
similarity index 96%
rename from Test/git-issues/git-issue-666.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-666.dfy
index 583bb982b93..e438b0765f1 100644
--- a/Test/git-issues/git-issue-666.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-666.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait O {
diff --git a/Test/git-issues/git-issue-666.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-666.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-666.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-666.dfy.expect
diff --git a/Test/git-issues/git-issue-668.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-668.dfy
similarity index 90%
rename from Test/git-issues/git-issue-668.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-668.dfy
index a3884117682..a82ea9fce6f 100644
--- a/Test/git-issues/git-issue-668.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-668.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class X {
diff --git a/Test/git-issues/git-issue-668.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-668.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-668.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-668.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-674.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-674.dfy
new file mode 100644
index 00000000000..1687ded5b95
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-674.dfy
@@ -0,0 +1,18 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+type pos = i:int | i > 0 witness 1
+
+datatype Generic<T> = Gen(p: T)
+
+method Main() {
+  var p: (pos, pos);
+  var (a, b) := p;
+  assert a > 0;
+  assert b > 0;
+
+  var e: Generic<pos>;
+  var Gen(n) := e;
+  assert n > 0;
+
+  print "p=", p, " n=", n, "\n";
+}
diff --git a/Test/git-issues/git-issue-674.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-674.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-674.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-674.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-674.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-674.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-674.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-684.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-684.dfy
new file mode 100644
index 00000000000..e9007a4383f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-684.dfy
@@ -0,0 +1,13 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+datatype Level1 = Level1(u:int)
+datatype Level2 = Level2(u:int, l:Level1)
+
+method TestNestedLet() {
+  var x := Level2(5, Level1(3));
+
+  var Level2(u, Level1(v)) := x;
+}
+
+method Main() {}
+
diff --git a/Test/hofs/Examples.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-684.dfy.expect
similarity index 100%
rename from Test/hofs/Examples.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-684.dfy.expect
diff --git a/Test/git-issues/git-issue-686.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686.dfy
similarity index 76%
rename from Test/git-issues/git-issue-686.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686.dfy
index 9845ce2b027..10fc80e0e2f 100644
--- a/Test/git-issues/git-issue-686.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings --relax-definite-assignment
 
 datatype Color = Blue | Red
 
diff --git a/Test/git-issues/git-issue-686.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-686.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686.dfy.expect
diff --git a/Test/git-issues/git-issue-686.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686.dfy.verifier.expect
similarity index 100%
rename from Test/git-issues/git-issue-686.dfy.verifier.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686.dfy.verifier.expect
diff --git a/Test/git-issues/git-issue-686a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686a.dfy
similarity index 94%
rename from Test/git-issues/git-issue-686a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686a.dfy
index a5e3b3c2043..d58441223ff 100644
--- a/Test/git-issues/git-issue-686a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686a.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Color = Blue | Red
diff --git a/Test/git-issues/git-issue-686a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-686a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-686a.dfy.expect
diff --git a/Test/git-issues/git-issue-697.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697.dfy
similarity index 80%
rename from Test/git-issues/git-issue-697.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697.dfy
index 23cce66dee7..04c9981f7cc 100644
--- a/Test/git-issues/git-issue-697.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype Cell = Cell(x: int)
 type EvenCell = c: Cell | c.x % 2 == 0 witness Cell(0)
diff --git a/Test/git-issues/git-issue-697.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-697.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697.dfy.rs.check
new file mode 100644
index 00000000000..158d9484360
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>QuantifierExpr</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-697b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697b.dfy
similarity index 82%
rename from Test/git-issues/git-issue-697b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697b.dfy
index cdb054d8d78..2dbb20b338d 100644
--- a/Test/git-issues/git-issue-697b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697b.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype Cell = Cell(x: int)
 type EvenCell = c: Cell | c.x % 2 == 0 witness Cell(0)
diff --git a/Test/git-issues/git-issue-697b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-697b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697b.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697b.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697b.dfy.rs.check
new file mode 100644
index 00000000000..9aef9ec31ec
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697b.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Unsupported:\ <i>Cannot\ assign\ null\ value\ to\ variable</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697c.dfy
new file mode 100644
index 00000000000..2ebb178d654
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697c.dfy
@@ -0,0 +1,27 @@
+// RUN: %exits-with 2 %run "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+ghost function ghostPredicate(x: int): bool {
+  x % 2 == 0
+}
+
+datatype Cell = Cell(x: int)
+type EvenCell = c: Cell | ghostPredicate(c.x) witness Cell(0)
+
+function doubleEvenCell(c: EvenCell): int
+{
+  if c.x % 2 == 1 then 1/0 else c.x * 2
+}
+
+method Main() {
+  var x: set<Cell> := { Cell(1), Cell(2), Cell(3), Cell(4) };
+
+  var y: set<EvenCell>;
+  var z: map<EvenCell, nat>;
+  y := set c: EvenCell | c in x; // error: type test for EvenCell is ghost
+  z := map c: EvenCell | c in x :: c.x; // error: type test for EvenCell is ghost
+
+  var b: bool;
+  b := forall c: EvenCell :: c in y ==> doubleEvenCell(c) > 0;
+  b := forall c: EvenCell :: c in x ==> doubleEvenCell(c) > 0; // error: type test for EvenCell is ghost
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697c.dfy.expect
new file mode 100644
index 00000000000..069a6cd4be5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697c.dfy.expect
@@ -0,0 +1,4 @@
+git-issue-697c.dfy(21,7): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'c'
+git-issue-697c.dfy(22,7): Error: map comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'c'
+git-issue-697c.dfy(26,7): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'c'
+3 resolution/type errors detected in git-issue-697c.dfy
diff --git a/Test/git-issues/git-issue-697d.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697d.dfy
similarity index 86%
rename from Test/git-issues/git-issue-697d.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697d.dfy
index 8b65c2da4f7..efcc769ab38 100644
--- a/Test/git-issues/git-issue-697d.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697d.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 function nonGhostPredicate(x: int): bool {
   x % 2 == 0
diff --git a/Test/git-issues/git-issue-697d.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697d.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-697d.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697d.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697d.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697d.dfy.rs.check
new file mode 100644
index 00000000000..158d9484360
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697d.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>QuantifierExpr</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-697e.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697e.dfy
similarity index 100%
rename from Test/git-issues/git-issue-697e.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697e.dfy
diff --git a/Test/hofs/Requires.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697e.dfy.expect
similarity index 100%
rename from Test/hofs/Requires.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697e.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697e.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697e.dfy.rs.check
new file mode 100644
index 00000000000..158d9484360
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697e.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>QuantifierExpr</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-697f.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697f.dfy
similarity index 81%
rename from Test/git-issues/git-issue-697f.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697f.dfy
index acb8810dfbf..39d6837310d 100644
--- a/Test/git-issues/git-issue-697f.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697f.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 ghost function ghostPredicate(x: int): bool {
   x % 2 == 0
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697f.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697f.dfy.expect
new file mode 100644
index 00000000000..b5754e20373
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697f.dfy.expect
@@ -0,0 +1 @@
+ok
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697f.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697f.dfy.rs.check
new file mode 100644
index 00000000000..05679bb3674
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697f.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `EvenCell: num_traits::sign::Signed` is not satisfied
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697g.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697g.dfy
new file mode 100644
index 00000000000..b43535a60a9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697g.dfy
@@ -0,0 +1,15 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+function returnNat(c: nat): int
+{
+  if c < 0 then 1/0 else c
+}
+
+method Main() {
+  var x: set<int> := { -1, 2, -3, 4 };
+  var y := set c: nat | c in x;
+  var b := forall c :: c in y ==> returnNat(c) >= 0;
+  assert b;
+  print b;
+}
+
diff --git a/Test/git-issues/git-issue-697g.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697g.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-697g.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697g.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697g.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697g.dfy.rs.check
new file mode 100644
index 00000000000..1132949004e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697g.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Cannot\ assign\ null\ value\ to\ variable</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-697h.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697h.dfy
similarity index 93%
rename from Test/git-issues/git-issue-697h.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697h.dfy
index 4c545df3aa6..a14f8db3444 100644
--- a/Test/git-issues/git-issue-697h.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697h.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /rprint:"%t.rprint" "%s" > "%t"
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost const maxi := 4
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697h.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697h.dfy.expect
new file mode 100644
index 00000000000..00a51f822da
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697h.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 3 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697i.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697i.dfy
new file mode 100644
index 00000000000..172c568fe66
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697i.dfy
@@ -0,0 +1,200 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+method Main() {
+  Tests.Test();
+  SubsetTypeSubsetType.Test();
+  SubsetTypeNewtype.Test();
+  NewtypeSubsetType.Test();
+  NewtypeNewtype.Test();
+}
+
+module Tests {
+  ghost predicate P(x: int) { x != 3 }
+
+  type PlainInt = int // type synonym
+  type PInt = x: int | P(x)
+  type PNat = x: int | 0 <= x && P(x)
+
+  newtype MyPlainInt = int
+  newtype MyPInt = x: int | P(x)
+  newtype MyPNat = x: int | 0 <= x && P(x)
+
+  class Cell {
+    const k: int
+    constructor (k: int) { this.k := k; }
+  }
+
+  type Cell5 = c: Cell | c.k == 5 witness *
+
+  method Test() {
+    var nats;
+    nats := set nx: nat | 2 <= nx < 5;
+    print |nats|, "\n"; // 3
+
+    var r0, r1, r2;
+    r0 := set n0: PlainInt | 0 <= n0 < 5;
+    r1 := set n1: PInt | 2 <= n1 < 5; // error: this set comprehension is not compilable
+    r2 := set n2: PNat | n2 < 5; // error: this set comprehension is not compilable
+    print |r0|, " ", |r1|, " ", |r2|, "\n"; // 5 2 4
+    var b0, b1;
+    b0 := forall k0: PInt | 2 <= k0 < 5 :: k0 != 3; // error: this set comprehension is not compilable
+    b1 := forall k1: PNat | k1 < 5 :: k1 != 4; // error: this set comprehension is not compilable
+    print b0, " ", b1, "\n"; // true false
+
+    var s0, s1, s2;
+    s0 := set m0: MyPlainInt | 0 <= m0 < 5;
+    s1 := set m1: MyPInt | 2 <= m1 < 5; // error: this set comprehension is not compilable
+    s2 := set m2: MyPNat | m2 < 5; // error: this set comprehension is not compilable
+    print |s0|, " ", |s1|, " ", |s2|, "\n"; // 5 2 4
+    b0 := forall l0: MyPInt | 2 <= l0 < 5 :: l0 as int != 3; // error: this set comprehension is not compilable
+    b1 := forall l1: MyPNat | l1 < 5 :: l1 != 4; // error: this set comprehension is not compilable
+    print b0, " ", b1, "\n"; // true false
+
+    var c0 := new Cell(4);
+    var c1 := new Cell(5);
+    var cc: set<Cell?> := {null, c0, c1};
+    var cc'0 := set y0: Cell? | y0 in cc;
+    var cc'1 := set y1: Cell | y1 in cc;
+    var cc'2 := set y2: Cell5 | y2 in cc;
+    print |cc|, " ", |cc'0|, " ", |cc'1|, " ", |cc'2|, "\n"; // 3 3 2 1
+  }
+}
+
+// check a compilable constraint with a non-compilable base type
+
+module SubsetTypeSubsetType {
+  ghost predicate P(x: int) { x != 3 }
+
+  type NonCompilableTest = x: int | P(x)
+  type NonCompilableTestInt32 = x: int | -0x8000_0000 <= x < 0x8000_0000 && P(x)
+
+  type Type0 = x: NonCompilableTest | true
+  type Type1 = NonCompilableTest
+  type Type2 = x: NonCompilableTestInt32 | true
+  type Type3 = NonCompilableTestInt32
+
+  predicate Q(x: int) { x != 5 }
+
+  type CompilableTest = x: int | Q(x) && x < 8
+  type Type4 = x: CompilableTest | true
+  type Type5 = CompilableTest
+  type Type6 = x: CompilableTest | 0 <= x
+
+  method Test() {
+    var r0, r1, r2, r3;
+    r0 := set y: Type0 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r1 := set y: Type1 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r2 := set y: Type2 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r3 := set y: Type3 | 2 <= y < 6; // error: this set comprehension is not compilable
+    print |r0|, " ", |r1|, " ", |r2|, " ", |r3|, "\n"; // 3 3 3 3
+
+    var r4, r5, r6;
+    r4 := set y: Type4 | 2 <= y;
+    r5 := set y: Type5 | 2 <= y;
+    r6 := set y: Type6 | 2 <= y;
+    print |r4|, " ", |r5|, " ", |r6|, "\n"; // 5 5 5
+  }
+}
+
+module SubsetTypeNewtype {
+  ghost predicate P(x: int) { x != 3 }
+
+  type NonCompilableTest = x: int | P(x)
+  type NonCompilableTestInt32 = x: int | -0x8000_0000 <= x < 0x8000_0000 && P(x)
+
+  newtype Type0 = x: NonCompilableTest | true
+  newtype Type1 = NonCompilableTest
+  newtype Type2 = x: NonCompilableTestInt32 | true
+  newtype Type3 = NonCompilableTestInt32
+
+  predicate Q(x: int) { x != 5 }
+
+  type CompilableTest = x: int | Q(x) && x < 8
+  newtype Type4 = x: CompilableTest | true
+  newtype Type5 = CompilableTest
+  newtype Type6 = x: CompilableTest | 0 <= x
+
+  method Test() {
+    var r0, r1, r2, r3;
+    r0 := set y: Type0 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r1 := set y: Type1 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r2 := set y: Type2 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r3 := set y: Type3 | 2 <= y < 6; // error: this set comprehension is not compilable
+    print |r0|, " ", |r1|, " ", |r2|, " ", |r3|, "\n"; // 3 3 3 3
+
+    var r4, r5, r6;
+    r4 := set y: Type4 | 2 <= y;
+    r5 := set y: Type5 | 2 <= y;
+    r6 := set y: Type6 | 2 <= y;
+    print |r4|, " ", |r5|, " ", |r6|, "\n"; // 5 5 5
+  }
+}
+
+module NewtypeSubsetType {
+  ghost predicate P(x: int) { x != 3 }
+
+  newtype NonCompilableTest = x: int | P(x)
+  newtype NonCompilableTestInt32 = x: int | -0x8000_0000 <= x < 0x8000_0000 && P(x)
+
+  type Type0 = x: NonCompilableTest | true
+  type Type1 = NonCompilableTest
+  type Type2 = x: NonCompilableTestInt32 | true
+  type Type3 = NonCompilableTestInt32
+
+  predicate Q(x: int) { x != 5 }
+
+  newtype CompilableTest = x: int | Q(x) && x < 8
+  type Type4 = x: CompilableTest | true
+  type Type5 = CompilableTest
+  type Type6 = x: CompilableTest | 0 <= x
+
+  method Test() {
+    var r0, r1, r2, r3;
+    r0 := set y: Type0 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r1 := set y: Type1 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r2 := set y: Type2 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r3 := set y: Type3 | 2 <= y < 6; // error: this set comprehension is not compilable
+    print |r0|, " ", |r1|, " ", |r2|, " ", |r3|, "\n"; // 3 3 3 3
+
+    var r4, r5, r6;
+    r4 := set y: Type4 | 2 <= y;
+    r5 := set y: Type5 | 2 <= y;
+    r6 := set y: Type6 | 2 <= y;
+    print |r4|, " ", |r5|, " ", |r6|, "\n"; // 5 5 5
+  }
+}
+
+module NewtypeNewtype {
+  ghost predicate P(x: int) { x != 3 }
+
+  newtype NonCompilableTest = x: int | P(x)
+  newtype NonCompilableTestInt32 = x: int | -0x8000_0000 <= x < 0x8000_0000 && P(x)
+
+  newtype Type0 = x: NonCompilableTest | true
+  newtype Type1 = NonCompilableTest
+  newtype Type2 = x: NonCompilableTestInt32 | true
+  newtype Type3 = NonCompilableTestInt32
+
+  predicate Q(x: int) { x != 5 }
+
+  newtype CompilableTest = x: int | Q(x) && x < 8
+  newtype Type4 = x: CompilableTest | true
+  newtype Type5 = CompilableTest
+  newtype Type6 = x: CompilableTest | 0 <= x
+
+  method Test() {
+    var r0, r1, r2, r3;
+    r0 := set y: Type0 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r1 := set y: Type1 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r2 := set y: Type2 | 2 <= y < 6; // error: this set comprehension is not compilable
+    r3 := set y: Type3 | 2 <= y < 6; // error: this set comprehension is not compilable
+    print |r0|, " ", |r1|, " ", |r2|, " ", |r3|, "\n"; // 3 3 3 3
+
+    var r4, r5, r6;
+    r4 := set y: Type4 | 2 <= y;
+    r5 := set y: Type5 | 2 <= y;
+    r6 := set y: Type6 | 2 <= y;
+    print |r4|, " ", |r5|, " ", |r6|, "\n"; // 5 5 5
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697i.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697i.dfy.expect
new file mode 100644
index 00000000000..7514aadb8ea
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697i.dfy.expect
@@ -0,0 +1,26 @@
+git-issue-697i.dfy(37,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'n1'
+git-issue-697i.dfy(38,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'n2'
+git-issue-697i.dfy(41,10): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'k0'
+git-issue-697i.dfy(42,10): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'k1'
+git-issue-697i.dfy(47,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'm1'
+git-issue-697i.dfy(48,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'm2'
+git-issue-697i.dfy(50,10): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'l0'
+git-issue-697i.dfy(51,10): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'l1'
+git-issue-697i.dfy(86,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(87,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(88,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(89,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(120,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(121,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(122,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(123,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(154,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(155,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(156,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(157,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(188,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(189,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(190,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(191,10): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'y'
+git-issue-697i.dfy(12,7): Error: not resolving module '_module' because there were errors in resolving its nested module 'Tests'
+25 resolution/type errors detected in git-issue-697i.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy
new file mode 100644
index 00000000000..b5b5b4911f6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy
@@ -0,0 +1,305 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings
+
+method Main() {
+  Tests.Test();
+
+  AnotherTest.Test();
+
+  SubsetTypeSubsetType.Test();
+  SubsetTypeNewtype.Test();
+  NewtypeSubsetType.Test();
+  NewtypeNewtype.Test();
+
+  MoreNativeTypes.Test();
+
+  Regressions.Test0();
+  Regressions.Test1();
+
+  EvolvingNativeTypes.Test();
+}
+
+module Tests {
+  predicate P(x: int) { x != 3 }
+
+  type PlainInt = int // type synonym
+  type PInt = x: int | P(x)
+  type PNat = x: int | 0 <= x && P(x)
+
+  newtype MyPlainInt = int
+  newtype MyPInt = x: int | P(x)
+  newtype MyPNat = x: int | 0 <= x && P(x)
+
+  class Cell {
+    const k: int
+    constructor (k: int) { this.k := k; }
+  }
+
+  type Cell5 = c: Cell | c.k == 5 witness *
+
+  method Test() {
+    var nats;
+    nats := set nx: nat | 2 <= nx < 5;
+    print |nats|, "\n"; // 3
+
+    var r0, r1, r2;
+    r0 := set n0: PlainInt | 0 <= n0 < 5;
+    r1 := set n1: PInt | 2 <= n1 < 5;
+    r2 := set n2: PNat | n2 < 5;
+    print |r0|, " ", |r1|, " ", |r2|, "\n"; // 5 2 4
+    var b0, b1;
+    b0 := forall k0: PInt | 2 <= k0 < 5 :: k0 != 3;
+    b1 := forall k1: PNat | k1 < 5 :: k1 != 4;
+    print b0, " ", b1, "\n"; // true false
+
+    var s0, s1, s2;
+    s0 := set m0: MyPlainInt | 0 <= m0 < 5;
+    s1 := set m1: MyPInt | 2 <= m1 < 5;
+    s2 := set m2: MyPNat | m2 < 5;
+    print |s0|, " ", |s1|, " ", |s2|, "\n"; // 5 2 4
+    b0 := forall l0: MyPInt | 2 <= l0 < 5 :: l0 as int != 3;
+    b1 := forall l1: MyPNat | l1 < 5 :: l1 != 4;
+    print b0, " ", b1, "\n"; // true false
+
+    var c0 := new Cell(4);
+    var c1 := new Cell(5);
+    var cc: set<Cell?> := {null, c0, c1};
+    var cc'0 := set y0: Cell? | y0 in cc;
+    var cc'1 := set y1: Cell | y1 in cc;
+    var cc'2 := set y2: Cell5 | y2 in cc;
+    print |cc|, " ", |cc'0|, " ", |cc'1|, " ", |cc'2|, "\n"; // 3 3 2 1
+  }
+}
+
+module AnotherTest {
+  predicate P(s: seq<int>) { |s| <= 1 }
+
+  type T = seq<int>
+  type SST = s: T | P(s)
+
+  method Test() {
+    var a0: T := [];
+    var a1: T := [25];
+    var a2: T := [100, 101];
+    var a3: T := [22];
+    var S: set<T> := { a0, a1, a2, a3 };
+    var s1 := set m: SST | m in S;
+    print |s1|, "\n"; // 3
+  }
+}
+
+module SubsetTypeSubsetType {
+  predicate P(x: int) { x != 3 }
+
+  type NonCompilableTest = x: int | P(x)
+  type NonCompilableTestInt32 = x: int | -0x8000_0000 <= x < 0x8000_0000 && P(x)
+
+  type Type0 = x: NonCompilableTest | true
+  type Type1 = NonCompilableTest
+  type Type2 = x: NonCompilableTestInt32 | true
+  type Type3 = NonCompilableTestInt32
+
+  predicate Q(x: int) { x != 5 }
+
+  type CompilableTest = x: int | Q(x) && x < 8
+  type Type4 = x: CompilableTest | true
+  type Type5 = CompilableTest
+  type Type6 = x: CompilableTest | 0 <= x
+
+  method Test() {
+    var r0, r1, r2, r3;
+    r0 := set y: Type0 | 2 <= y < 6;
+    r1 := set y: Type1 | 2 <= y < 6;
+    r2 := set y: Type2 | 2 <= y < 6;
+    r3 := set y: Type3 | 2 <= y < 6;
+    print |r0|, " ", |r1|, " ", |r2|, " ", |r3|, "\n"; // 3 3 3 3
+
+    var r4, r5, r6;
+    r4 := set y: Type4 | 2 <= y;
+    r5 := set y: Type5 | 2 <= y;
+    r6 := set y: Type6 | 2 <= y;
+    print |r4|, " ", |r5|, " ", |r6|, "\n"; // 5 5 5
+  }
+}
+
+module SubsetTypeNewtype {
+  predicate P(x: int) { x != 3 }
+
+  type NonCompilableTest = x: int | P(x)
+  type NonCompilableTestInt32 = x: int | -0x8000_0000 <= x < 0x8000_0000 && P(x)
+
+  newtype Type0 = x: NonCompilableTest | true
+  newtype Type1 = NonCompilableTest
+  newtype Type2 = x: NonCompilableTestInt32 | true
+  newtype Type3 = NonCompilableTestInt32
+
+  predicate Q(x: int) { x != 5 }
+
+  type CompilableTest = x: int | Q(x) && x < 8
+  newtype Type4 = x: CompilableTest | true
+  newtype Type5 = CompilableTest
+  newtype Type6 = x: CompilableTest | 0 <= x
+
+  method Test() {
+    var r0, r1, r2, r3;
+    r0 := set y: Type0 | 2 <= y < 6;
+    r1 := set y: Type1 | 2 <= y < 6;
+    r2 := set y: Type2 | 2 <= y < 6;
+    r3 := set y: Type3 | 2 <= y < 6;
+    print |r0|, " ", |r1|, " ", |r2|, " ", |r3|, "\n"; // 3 3 3 3
+
+    var r4, r5, r6;
+    r4 := set y: Type4 | 2 <= y;
+    r5 := set y: Type5 | 2 <= y;
+    r6 := set y: Type6 | 2 <= y;
+    print |r4|, " ", |r5|, " ", |r6|, "\n"; // 5 5 5
+  }
+}
+
+module NewtypeSubsetType {
+  predicate P(x: int) { x != 3 }
+
+  newtype NonCompilableTest = x: int | P(x)
+  newtype NonCompilableTestInt32 = x: int | -0x8000_0000 <= x < 0x8000_0000 && P(x)
+
+  type Type0 = x: NonCompilableTest | true
+  type Type1 = NonCompilableTest
+  type Type2 = x: NonCompilableTestInt32 | true
+  type Type3 = NonCompilableTestInt32
+
+  predicate Q(x: int) { x != 5 }
+
+  newtype CompilableTest = x: int | Q(x) && x < 8
+  type Type4 = x: CompilableTest | true
+  type Type5 = CompilableTest
+  type Type6 = x: CompilableTest | 0 <= x
+
+  method Test() {
+    var r0, r1, r2, r3;
+    r0 := set y: Type0 | 2 <= y < 6;
+    r1 := set y: Type1 | 2 <= y < 6;
+    r2 := set y: Type2 | 2 <= y < 6;
+    r3 := set y: Type3 | 2 <= y < 6;
+    print |r0|, " ", |r1|, " ", |r2|, " ", |r3|, "\n"; // 3 3 3 3
+
+    var r4, r5, r6;
+    r4 := set y: Type4 | 2 <= y;
+    r5 := set y: Type5 | 2 <= y;
+    r6 := set y: Type6 | 2 <= y;
+    print |r4|, " ", |r5|, " ", |r6|, "\n"; // 5 5 5
+  }
+}
+
+module NewtypeNewtype {
+  predicate P(x: int) { x != 3 }
+
+  newtype NonCompilableTest = x: int | P(x)
+  newtype NonCompilableTestInt32 = x: int | -0x8000_0000 <= x < 0x8000_0000 && P(x)
+
+  newtype Type0 = x: NonCompilableTest | true
+  newtype Type1 = NonCompilableTest
+  newtype Type2 = x: NonCompilableTestInt32 | true
+  newtype Type3 = NonCompilableTestInt32
+
+  predicate Q(x: int) { x != 5 }
+
+  newtype CompilableTest = x: int | Q(x) && x < 8
+  newtype Type4 = x: CompilableTest | true
+  newtype Type5 = CompilableTest
+  newtype Type6 = x: CompilableTest | 0 <= x
+
+  method Test() {
+    var r0, r1, r2, r3;
+    r0 := set y: Type0 | 2 <= y < 6;
+    r1 := set y: Type1 | 2 <= y < 6;
+    r2 := set y: Type2 | 2 <= y < 6;
+    r3 := set y: Type3 | 2 <= y < 6;
+    print |r0|, " ", |r1|, " ", |r2|, " ", |r3|, "\n"; // 3 3 3 3
+
+    var r4, r5, r6;
+    r4 := set y: Type4 | 2 <= y;
+    r5 := set y: Type5 | 2 <= y;
+    r6 := set y: Type6 | 2 <= y;
+    print |r4|, " ", |r5|, " ", |r6|, "\n"; // 5 5 5
+  }
+}
+
+module MoreNativeTypes {
+  type LoSubset = x: int | -0x8000_0000 <= x
+  newtype LoNewtype = x: int | -0x8000_0000 <= x
+
+  newtype Int32a = x: LoSubset | x < 0x8000_0000
+  newtype Int32b = x: LoNewtype | x < 0x8000_0000
+
+  type Int32c = x: Int32a | x != 3
+  type Int32d = x: Int32b | x != 3
+  newtype Int32e = x: Int32a | x != 3
+  newtype Int32f = x: Int32b | x != 3
+
+  method Test() {
+    var r0, r1;
+    r0 := set y: Int32a | 2 <= y < 6;
+    r1 := set y: Int32b | 2 <= y < 6;
+
+    var r2, r3, r4, r5;
+    r2 := set y: Int32c | 2 <= y < 6;
+    r3 := set y: Int32d | 2 <= y < 6;
+    r4 := set y: Int32e | 2 <= y < 6;
+    r5 := set y: Int32f | 2 <= y < 6;
+
+    print |r0|, " ", |r1|, " ", |r2|, " ", |r3|, " ", |r4|, " ", |r5|, "\n"; // 4 4 3 3 3 3
+  }
+}
+
+module Regressions {
+  type byte = x | x < 256 && x != 7 && 0 <= x
+
+  predicate P(x: int) { x == 7 || x == 9 }
+
+  method Test0() {
+    var s := set b: byte | 5 <= b < 12 && P(b as int);
+    assert 9 in s;
+    var u :| u in s;
+    print u, "\n"; // 9
+  }
+
+  // -----------------------------
+
+  newtype NewByte = x | x < 256 && x != 7 && 0 <= x
+
+  newtype ByteBase = x: int | x != 7
+  type Byyyte = x: ByteBase | x < 256 && 0 <= x
+
+  predicate Filter(x: int) {
+    x % 2 == 1 && x < 10
+  }
+
+  method Test1() {
+    var s := set b: byte | Filter(b as int);
+    var t := set b: NewByte | Filter(b as int);
+    var u := set b: Byyyte | Filter(b as int);
+
+    print |s|, " ", |t|, " ", |u|, "\n"; // 4 4 4
+  }
+}
+
+module EvolvingNativeTypes {
+  newtype Nat = x: int | 0 <= x && x != 1
+  newtype uint32 = x: Nat | x < 0x1_0000_0000 && x != 3
+  newtype byte = x: uint32 | x < 256 && x != 5
+  newtype Not7Either = x: byte | x != 7
+
+  predicate R(x: int) {
+    match x
+    case 5 => true
+    case 1 | 3 | 7 | 9 => true
+    case _ => false
+  }
+
+  method Test() {
+    assert R(7);
+    var u: byte :| R(u as int) && u != 9;
+    assert R(9);
+    var v: Not7Either :| R(v as int);
+    print u, " ", v, "\n"; // 7 9
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy.expect
new file mode 100644
index 00000000000..d70a0d3c3a1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy.expect
@@ -0,0 +1,19 @@
+3
+5 2 4
+true false
+5 2 4
+true false
+3 3 2 1
+3
+3 3 3 3
+5 5 5
+3 3 3 3
+5 5 5
+3 3 3 3
+5 5 5
+3 3 3 3
+5 5 5
+4 4 3 3 3 3
+9
+4 4 4
+7 9
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy.rs.check
new file mode 100644
index 00000000000..45270a849b5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*Unsupported: <i>Cannot assign null value to variable</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy.verifier.expect
new file mode 100644
index 00000000000..177ea6f609a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697j.dfy.verifier.expect
@@ -0,0 +1,49 @@
+git-issue-697j.dfy(41,12): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(45,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(46,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(47,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(50,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(51,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(55,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(56,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(57,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(59,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(60,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(110,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(111,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(112,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(113,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(117,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(118,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(119,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(144,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(145,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(146,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(147,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(151,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(152,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(153,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(178,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(179,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(180,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(181,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(185,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(186,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(187,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(212,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(213,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(214,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(215,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(219,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(220,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(221,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(240,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(241,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(244,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(245,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(246,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(247,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(259,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(277,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(278,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-697j.dfy(279,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697k.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697k.dfy
new file mode 100644
index 00000000000..74aebeb1dda
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697k.dfy
@@ -0,0 +1,90 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+method Main() {
+  M.TestTraits();
+  M.TestConstraintsSimple();
+  SimpleSetContainmentTests.Test();
+}
+
+module M {
+  trait MyTrait extends object { }
+  class MyClass extends MyTrait { }
+  class AnotherClass extends MyTrait { }
+
+  method TestTraits() {
+    var c0 := new MyClass;
+    var c1 := new AnotherClass;
+
+    var s: set<MyClass> := {c0};
+    var t := set x: MyTrait | x in s;
+    expect t == {c0};
+
+    var u: set<MyTrait> := {c0, c1};
+    var v := set y: MyClass | y in u;
+    expect v == {c0};
+
+    var s': set<MyClass?> := {c0, null};
+    var t' := set x: MyTrait | x in s';
+    expect t' == {c0};
+
+    var u': set<MyTrait?> := {c0, c1, null};
+    var v' := set y: MyClass | y in u';
+    expect v' == {c0};
+
+    var s'': set<MyClass?> := {c0, null};
+    var t'' := set x: MyTrait? | x in s'';
+    expect t'' == s'';
+
+    var u'': set<MyTrait?> := {c0, c1, null};
+    var v'' := set y: MyClass? | y in u'';
+    expect v'' == {null, c0};
+  }
+
+  type Not30 = x: int | x != 30
+  newtype Not31 = x: int | x != 31
+
+  predicate P<X>(x: X) { true }
+
+  method TestConstraintsSimple() {
+    var r0, r1;
+    r0 := set a: Not30 | 29 <= a < 33 && P(a); // {29, 31, 32}
+    r1 := set b: Not31 | 29 <= b < 33 && P(b); // {29, 30, 32}
+    print |r0|, " ", |r1|, "\n"; // 3 3
+  }
+}
+
+module SimpleSetContainmentTests {
+  method Test() {
+    M({}, {}, {}, null, null, null);
+    N({}, {}, 2, 2);
+  }
+
+  trait MyTrait extends object { }
+  class MyClass extends MyTrait { }
+
+  method M(ss: set<MyTrait?>, oo: set<object?>, cc: set<MyClass?>, s: MyTrait?, o: object?, c: MyClass?) {
+    var b: bool;
+
+    b := s in ss;
+    b := o in ss;
+    b := c in ss;
+
+    b := s in oo;
+    b := o in oo;
+    b := c in oo;
+
+    b := s in cc;
+    b := o in cc;
+    b := c in cc;
+  }
+
+  method N(ii: set<int>, nn: set<nat>, i: int, n: nat) {
+    var b: bool;
+
+    b := i in ii;
+    b := n in ii;
+
+    b := i in nn;
+    b := n in nn;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697k.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697k.dfy.expect
new file mode 100644
index 00000000000..ac81dc6c529
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697k.dfy.expect
@@ -0,0 +1 @@
+3 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697k.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697k.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-697k.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698.dfy
new file mode 100644
index 00000000000..af2b4e966c7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698.dfy
@@ -0,0 +1,15 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+type Small = x: int | 0 <= x < 100 && x != 3
+
+function F(x: int): int
+  requires x != 3
+{
+  if x == 3 then 1/0 else 100
+}
+
+method Main() {
+  var b := forall n: Small :: F(n) == 100;
+  assert b;
+  print b, "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698.dfy.expect
new file mode 100644
index 00000000000..27ba77ddaf6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698.dfy.expect
@@ -0,0 +1 @@
+true
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698.dfy.rs.check
new file mode 100644
index 00000000000..158d9484360
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>QuantifierExpr</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698b.dfy
new file mode 100644
index 00000000000..ad0aed2d377
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698b.dfy
@@ -0,0 +1,15 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+type Small = x: int | 0 <= x < 100 && x != 3
+
+function F(x: int): int
+  requires x != 3
+{
+  if x == 3 then 1/0 else 100
+}
+
+method Main() {
+  var b := !exists n: Small :: F(n) != 100;
+  assert b;
+  print b;
+}
diff --git a/Test/git-issues/git-issue-698b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-698b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698b.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698b.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698b.dfy.rs.check
new file mode 100644
index 00000000000..158d9484360
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-698b.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>QuantifierExpr</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-701.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-701.dfy
similarity index 82%
rename from Test/git-issues/git-issue-701.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-701.dfy
index 38984df4ecf..e0c98905d10 100644
--- a/Test/git-issues/git-issue-701.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-701.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main() {
   var ca := new ClassA;
diff --git a/Test/git-issues/git-issue-701.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-701.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-701.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-701.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-701.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-701.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-701.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-705.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-705.dfy
new file mode 100644
index 00000000000..8be070bb4f6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-705.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation
+
+datatype MyDataType = AAA {
+ function toString(): int { 222 }
+}
+
+method Main() {
+  var dt: MyDataType;
+  print dt, " ", dt.toString(), "\n";
+}
+
diff --git a/Test/git-issues/git-issue-705.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-705.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-705.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-705.dfy.expect
diff --git a/Test/git-issues/git-issue-731.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731.dfy
similarity index 84%
rename from Test/git-issues/git-issue-731.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731.dfy
index 348d40fecea..7a82ea5456b 100644
--- a/Test/git-issues/git-issue-731.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 trait Trait<Y> {
   const y: Y
diff --git a/Test/git-issues/git-issue-731.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-731.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-731b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731b.dfy
similarity index 77%
rename from Test/git-issues/git-issue-731b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731b.dfy
index 2a0507839a2..5d657eaf6ad 100644
--- a/Test/git-issues/git-issue-731b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731b.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // Testing issue#731 when the class in question has type parameters
 
diff --git a/Test/git-issues/git-issue-731b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-731b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731b.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731b.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731b.dfy.rs.check
new file mode 100644
index 00000000000..f12da961eee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-731b.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Traits</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-748.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-748.dfy
similarity index 77%
rename from Test/git-issues/git-issue-748.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-748.dfy
index 09e7f362939..a8b1489e688 100644
--- a/Test/git-issues/git-issue-748.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-748.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 method ok() {
   var array0: int := 10;
diff --git a/Test/git-issues/git-issue-748.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-748.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-748.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-748.dfy.expect
diff --git a/Test/git-issues/git-issue-748a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-748a.dfy
similarity index 76%
rename from Test/git-issues/git-issue-748a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-748a.dfy
index 58f4c99b8e8..0b52bfb8007 100644
--- a/Test/git-issues/git-issue-748a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-748a.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 method ok() {
   var array0: int := 10;
diff --git a/Test/git-issues/git-issue-748a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-748a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-748a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-748a.dfy.expect
diff --git a/Test/git-issues/git-issue-750.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-750.dfy
similarity index 89%
rename from Test/git-issues/git-issue-750.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-750.dfy
index 5ceacf57bb2..ecedfe8795d 100644
--- a/Test/git-issues/git-issue-750.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-750.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method m() {
diff --git a/Test/git-issues/git-issue-750.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-750.dfy.expect
similarity index 82%
rename from Test/git-issues/git-issue-750.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-750.dfy.expect
index e49654c388a..0abc7cf1da9 100644
--- a/Test/git-issues/git-issue-750.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-750.dfy.expect
@@ -1,5 +1,5 @@
 git-issue-750.dfy(8,4): Error: RHS (of type array<nat>) not assignable to LHS (of type array<int>) (nonvariance for type parameter expects int = nat)
 git-issue-750.dfy(9,4): Error: RHS (of type array<int>) not assignable to LHS (of type array<nat>) (nonvariance for type parameter expects nat = int)
-git-issue-750.dfy(10,4): Error: incorrect argument type at index 0 for method in-parameter 'x' (expected array<nat>, found array<int>) (nonvariance for type parameter expects nat = int)
-git-issue-750.dfy(10,4): Error: incorrect argument type at index 1 for method in-parameter 'y' (expected array<int>, found array<nat>) (nonvariance for type parameter expects int = nat)
+git-issue-750.dfy(10,5): Error: incorrect argument type at index 0 for method in-parameter 'x' (expected array<nat>, found array<int>) (nonvariance for type parameter expects nat = int)
+git-issue-750.dfy(10,8): Error: incorrect argument type at index 1 for method in-parameter 'y' (expected array<int>, found array<nat>) (nonvariance for type parameter expects int = nat)
 4 resolution/type errors detected in git-issue-750.dfy
diff --git a/Test/git-issues/git-issue-755.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-755.dfy
similarity index 78%
rename from Test/git-issues/git-issue-755.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-755.dfy
index 9b72f516173..2d52ee2c73c 100644
--- a/Test/git-issues/git-issue-755.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-755.dfy
@@ -1,9 +1,9 @@
 // NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:java "%s" >> "%t"
+// RUN: %verify "%s" > "%t"
+// RUN: %run --no-verify --target cs "%s" >> "%t"
+// RUN: %run --no-verify --target js "%s" >> "%t"
+// RUN: %run --no-verify --target go "%s" >> "%t"
+// RUN: %run --no-verify --target java "%s" >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Main() {
diff --git a/Test/git-issues/git-issue-755.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-755.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-755.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-755.dfy.expect
diff --git a/Test/git-issues/git-issue-757.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-757.dfy
similarity index 88%
rename from Test/git-issues/git-issue-757.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-757.dfy
index cc87800cffb..5a484af32a4 100644
--- a/Test/git-issues/git-issue-757.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-757.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module M {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-757.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-757.dfy.expect
new file mode 100644
index 00000000000..ebe2328e072
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-757.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/git-issues/git-issue-779.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-779.dfy
similarity index 96%
rename from Test/git-issues/git-issue-779.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-779.dfy
index 882f9234074..02ee491f4c4 100644
--- a/Test/git-issues/git-issue-779.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-779.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Lines marked PRE-FIX were problems before this bug was fixed
diff --git a/Test/git-issues/github-issue-4017.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-779.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-4017.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-779.dfy.expect
diff --git a/Test/git-issues/git-issue-784.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-784.dfy
similarity index 87%
rename from Test/git-issues/git-issue-784.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-784.dfy
index 5f6cf59465c..313fd78c484 100644
--- a/Test/git-issues/git-issue-784.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-784.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype List<T> = Nil | Cons(T, List<T>) {
   function App(ys: List<T>): List<T> {
diff --git a/Test/unicodechars/git-issues/github-issue-2928.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-784.dfy.expect
similarity index 100%
rename from Test/unicodechars/git-issues/github-issue-2928.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-784.dfy.expect
diff --git a/Test/git-issues/git-issue-816.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-816.dfy
similarity index 84%
rename from Test/git-issues/git-issue-816.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-816.dfy
index c7b18a7fd09..a506ea35a2f 100644
--- a/Test/git-issues/git-issue-816.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-816.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 lemma P0(x: int)
   requires X: x == 17
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-816.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-816.dfy.expect
new file mode 100644
index 00000000000..2c384e5a8d9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-816.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-816.dfy(7,2): Error: assertion might not hold
+git-issue-816.dfy(20,2): Error: assertion might not hold
+git-issue-816.dfy(26,2): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 3 errors
diff --git a/Test/git-issues/git-issue-817.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817.dfy
similarity index 100%
rename from Test/git-issues/git-issue-817.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817.dfy
diff --git a/Test/git-issues/git-issue-817.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-817.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817.dfy.rs.check
new file mode 100644
index 00000000000..7ba64d0e832
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Coercion</i>.*
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-817a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817a.dfy
similarity index 100%
rename from Test/git-issues/git-issue-817a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817a.dfy
diff --git a/Test/git-issues/git-issue-817a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-817a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817a.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817a.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817a.dfy.rs.check
new file mode 100644
index 00000000000..f67d57ed044
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817a.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0599]: no method named `borrow_mut` found for struct `DafnyInt` in the current scope
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-817b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817b.dfy
similarity index 90%
rename from Test/git-issues/git-issue-817b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817b.dfy
index a34c12341a4..bca56b10d4e 100644
--- a/Test/git-issues/git-issue-817b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817b.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Result<T> = Failure(msg: string) | Success(value: T) {
diff --git a/Test/git-issues/git-issue-817b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-817b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817b.dfy.expect
diff --git a/Test/git-issues/git-issue-817c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817c.dfy
similarity index 95%
rename from Test/git-issues/git-issue-817c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817c.dfy
index 985597c1ffe..2e6aeec1915 100644
--- a/Test/git-issues/git-issue-817c.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817c.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Result<T> = Failure(msg: string) | Success(value: T) {
diff --git a/Test/git-issues/git-issue-817c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817c.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-817c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817c.dfy.expect
index af6d132927c..44427e3d7c5 100644
--- a/Test/git-issues/git-issue-817c.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817c.dfy.expect
@@ -1,10 +1,10 @@
+git-issue-817c.dfy(22,15): Error: left-hand sides this.data and data might refer to the same location
+git-issue-817c.dfy(29,15): Error: left-hand sides data and this.data might refer to the same location
 git-issue-817c.dfy(45,8): Error: left-hand sides i and i refer to the same location
 git-issue-817c.dfy(51,5): Error: left-hand sides i and i refer to the same location
 git-issue-817c.dfy(67,14): Error: left-hand sides ccc.data and c.data might refer to the same location
 git-issue-817c.dfy(75,17): Error: left-hand sides ccc.data and c.data might refer to the same location
 git-issue-817c.dfy(83,14): Error: left-hand sides aaa[2] and a[2] might refer to the same location
 git-issue-817c.dfy(91,14): Error: left-hand sides aaa[2] and a[2] might refer to the same location
-git-issue-817c.dfy(22,15): Error: left-hand sides this.data and data might refer to the same location
-git-issue-817c.dfy(29,15): Error: left-hand sides data and this.data might refer to the same location
 
 Dafny program verifier finished with 5 verified, 8 errors
diff --git a/Test/git-issues/git-issue-817d.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817d.dfy
similarity index 88%
rename from Test/git-issues/git-issue-817d.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817d.dfy
index 216e8e11b68..fd9b8237fd8 100644
--- a/Test/git-issues/git-issue-817d.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817d.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module M {
diff --git a/Test/git-issues/git-issue-817d.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817d.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-817d.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-817d.dfy.expect
diff --git a/Test/git-issues/git-issue-833.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-833.dfy
similarity index 78%
rename from Test/git-issues/git-issue-833.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-833.dfy
index c8456454de8..728698acda3 100644
--- a/Test/git-issues/git-issue-833.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-833.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class C {
   ghost var x:int
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-833.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-833.dfy.expect
new file mode 100644
index 00000000000..ebe2328e072
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-833.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-845-comments.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-845-comments.dfy
new file mode 100644
index 00000000000..1d0f1c2013b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-845-comments.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+// Demonstrates that nested comments don't work with */ in line comment
+
+method m() {
+/*
+  var b: int;
+  // */
+  var c: int;
+*/
+}
diff --git a/Test/git-issues/git-issue-845-comments.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-845-comments.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-845-comments.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-845-comments.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-845-comments2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-845-comments2.dfy
new file mode 100644
index 00000000000..d1dc1f4eedb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-845-comments2.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+// Demonstrates that nested comments don't work with */ in strings
+
+method m() {
+/*
+  var b: int;
+  var s: string := "a*/b";
+  var c: int;
+*/
+}
diff --git a/Test/git-issues/git-issue-845-comments2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-845-comments2.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-845-comments2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-845-comments2.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-847.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-847.dfy
new file mode 100644
index 00000000000..676f897f1f6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-847.dfy
@@ -0,0 +1,52 @@
+// RUN: %exits-with 2 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait O extends object {
+  var rep: set<O>
+
+  ghost function union<T>(s: set<set<T>>): set<T> {
+    set o,o1 | o in s && o1 in o :: o1
+  }
+
+  least predicate ag()
+    reads *
+  {
+    rep=={} || (forall o: O | o in rep :: o.ag())
+  }
+
+  ghost predicate ldp(n: ORDINAL)
+    reads *
+  {
+    ag#[n]() && (forall n1: ORDINAL | n1 < n :: !ag#[n1]())
+  }
+
+  ghost function ld(n: ORDINAL): ORDINAL
+    reads *
+    requires ag#[n]()
+    ensures ldp(ld(n))
+  {
+    if ldp(n) then n else var n1: ORDINAL :| n1 < n && ag#[n1](); ld(n1)
+  }
+
+  ghost function level(): ORDINAL
+    reads fr()
+    requires ag()
+    ensures ldp(level())
+  {
+    var n: ORDINAL :| ag#[n](); ld(n)
+  }
+
+  least lemma l1()
+    requires ag()
+    ensures forall o: O | o in rep :: o.level() < level()
+    decreases level()
+  {}
+
+  ghost function fr(): set<O>
+    requires ag()
+    reads *
+    decreases level() // error: fr and level are mutually recursive, so fr is not allowed to use level in its decreases clause
+  {
+    {this} + union(set o: O | o in rep :: l1(); o.fr())
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-847.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-847.dfy.expect
new file mode 100644
index 00000000000..401e2e91ee9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-847.dfy.expect
@@ -0,0 +1,2 @@
+git-issue-847.dfy(48,19): Error: the decreases clause of function 'O.fr' is not allowed to call 'level', because they are mutually recursive
+1 resolution/type errors detected in git-issue-847.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-849.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-849.dfy
new file mode 100644
index 00000000000..c3d8a4e8567
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-849.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module A {
+  datatype Test = Test(v: nat, w: nat)
+  method m(oldTest: Test) {
+    var newTest: Test := oldTest[v := 1]; // error: old syntax
+  }
+}
diff --git a/Test/git-issues/git-issue-849.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-849.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-849.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-849.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-849a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-849a.dfy
new file mode 100644
index 00000000000..05d18079e6c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-849a.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module B {
+  datatype Test = Test(v: nat, w: nat)
+  method m(oldTest: Test) {
+    var newTest2: Test := oldTest.(v := 1, w := 2);
+  }
+}
diff --git a/Test/metatests/EachResolverUniformSuccess.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-849a.dfy.expect
similarity index 100%
rename from Test/metatests/EachResolverUniformSuccess.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-849a.dfy.expect
diff --git a/Test/git-issues/git-issue-851.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-851.dfy
similarity index 98%
rename from Test/git-issues/git-issue-851.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-851.dfy
index 8eb96218638..e0e95b42670 100644
--- a/Test/git-issues/git-issue-851.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-851.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module ExampleA {
@@ -43,7 +43,7 @@ module ExampleB {
   export
     provides Test
 
-  trait D {
+  trait D extends object {
     lemma False()
       ensures false
   }
@@ -134,7 +134,7 @@ module OtherBindersInStatements {
     lemma False()
       ensures false
   }
-  trait C {
+  trait C extends object {
     lemma False()
       ensures false
   }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-851.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-851.dfy.expect
new file mode 100644
index 00000000000..9a779bc1948
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-851.dfy.expect
@@ -0,0 +1,51 @@
+git-issue-851.dfy(116,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(144,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(150,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(156,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(162,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(168,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(174,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(180,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(186,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(192,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(211,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(217,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(223,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(229,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(235,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(241,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(247,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(253,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(259,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(265,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(271,13): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-851.dfy(17,4): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+git-issue-851.dfy(37,4): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+git-issue-851.dfy(55,4): Error: variable 'd', which is subject to definite-assignment rules, might be uninitialized here
+git-issue-851.dfy(62,13): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+git-issue-851.dfy(70,13): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+git-issue-851.dfy(127,14): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
+git-issue-851.dfy(145,16): Error: possible division by zero
+git-issue-851.dfy(151,16): Error: possible division by zero
+git-issue-851.dfy(157,16): Error: possible division by zero
+git-issue-851.dfy(163,16): Error: possible division by zero
+git-issue-851.dfy(169,16): Error: possible division by zero
+git-issue-851.dfy(175,16): Error: possible division by zero
+git-issue-851.dfy(181,16): Error: possible division by zero
+git-issue-851.dfy(187,16): Error: possible division by zero
+git-issue-851.dfy(193,16): Error: possible division by zero
+git-issue-851.dfy(199,16): Error: possible division by zero
+git-issue-851.dfy(211,29): Error: possible division by zero
+git-issue-851.dfy(218,7): Error: possible division by zero
+git-issue-851.dfy(224,7): Error: possible division by zero
+git-issue-851.dfy(230,7): Error: possible division by zero
+git-issue-851.dfy(236,7): Error: possible division by zero
+git-issue-851.dfy(242,7): Error: possible division by zero
+git-issue-851.dfy(248,7): Error: possible division by zero
+git-issue-851.dfy(254,7): Error: possible division by zero
+git-issue-851.dfy(260,7): Error: possible division by zero
+git-issue-851.dfy(266,7): Error: possible division by zero
+git-issue-851.dfy(272,7): Error: possible division by zero
+git-issue-851.dfy(278,7): Error: possible division by zero
+
+Dafny program verifier finished with 8 verified, 28 errors
diff --git a/Test/git-issues/git-issue-852.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-852.dfy
similarity index 91%
rename from Test/git-issues/git-issue-852.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-852.dfy
index 9567bf99c2e..74e2b568352 100644
--- a/Test/git-issues/git-issue-852.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-852.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 abstract module M0 {
diff --git a/Test/git-issues/git-issue-852.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-852.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-852.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-852.dfy.expect
diff --git a/Test/git-issues/git-issue-854.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-854.dfy
similarity index 76%
rename from Test/git-issues/git-issue-854.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-854.dfy
index 37da30cf24c..38a53a66acc 100644
--- a/Test/git-issues/git-issue-854.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-854.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module M {
diff --git a/Test/git-issues/git-issue-854.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-854.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-854.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-854.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-856.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-856.dfy
new file mode 100644
index 00000000000..58001e80c9c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-856.dfy
@@ -0,0 +1,15 @@
+// RUN: %verify "%s" > "%t"
+// RUN: ! %run --no-verify --target cs "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target js "%s" >> "%t"
+// RUN: ! %run --no-verify --target go "%s" >> "%t"
+// RUN: ! %run --no-verify --target java "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main()
+{
+  var big := 9223372036854775808;
+  var a := new int[big];
+  assert a.Length == big;
+  print a.Length == big;
+}
+
diff --git a/Test/git-issues/git-issue-856.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-856.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-856.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-856.dfy.expect
diff --git a/Test/git-issues/git-issue-859.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859.dfy
similarity index 100%
rename from Test/git-issues/git-issue-859.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859.dfy
diff --git a/Test/git-issues/git-issue-859.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-859.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-859a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859a.dfy
similarity index 96%
rename from Test/git-issues/git-issue-859a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859a.dfy
index 4dc5d45f034..1e26cefe425 100644
--- a/Test/git-issues/git-issue-859a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859a.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Common {
diff --git a/Test/git-issues/git-issue-859a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859a.dfy.expect
similarity index 92%
rename from Test/git-issues/git-issue-859a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859a.dfy.expect
index ab339eed84a..d7923e23a08 100644
--- a/Test/git-issues/git-issue-859a.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859a.dfy.expect
@@ -1,6 +1,6 @@
 git-issue-859a.dfy(34,4): Error: The Extract member may not be ghost unless the initial LHS is ghost
 git-issue-859a.dfy(44,7): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-git-issue-859a.dfy(55,4): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
+git-issue-859a.dfy(55,7): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
 git-issue-859a.dfy(82,10): Error: Member 'IsFailure' in type 'NotFunctionsAtAll' (used indirectly via a :- statement) is expected to be a function
 git-issue-859a.dfy(82,10): Error: Member 'PropagateFailure' in type 'NotFunctionsAtAll' (used indirectly via a :- statement) is expected to be a function
 git-issue-859a.dfy(82,10): Error: Member 'Extract' in type 'NotFunctionsAtAll' (used indirectly via a :- statement) is expected to be a function
diff --git a/Test/git-issues/git-issue-859b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859b.dfy
similarity index 93%
rename from Test/git-issues/git-issue-859b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859b.dfy
index dc7759667ea..872a9833c6c 100644
--- a/Test/git-issues/git-issue-859b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859b.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype FailureCompatible = Make {
diff --git a/Test/git-issues/git-issue-859b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-859b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859b.dfy.expect
diff --git a/Test/git-issues/git-issue-859c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859c.dfy
similarity index 92%
rename from Test/git-issues/git-issue-859c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859c.dfy
index 694b6d4568d..f630c9893ca 100644
--- a/Test/git-issues/git-issue-859c.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859c.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype FailureCompatible = Make {
diff --git a/Test/git-issues/git-issue-859c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859c.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-859c.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-859c.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-863.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-863.dfy
new file mode 100644
index 00000000000..346fa4b54b1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-863.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+datatype D = D(ghost v:nat)
+function p():D { ghost var v:nat :| true; D(v) }
+
+datatype G = G(v:nat)
+function q():G { var v:nat :| true; G(v) }
+
diff --git a/Test/git-issues/git-issue-863.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-863.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-863.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-863.dfy.expect
diff --git a/Test/git-issues/git-issue-864.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864.dfy
similarity index 86%
rename from Test/git-issues/git-issue-864.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864.dfy
index f3a8bf54476..a03ffa900c4 100644
--- a/Test/git-issues/git-issue-864.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module M1 {
   trait {:termination false} T0 {
diff --git a/Test/git-issues/git-issue-864.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-864.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864.dfy.expect
diff --git a/Test/git-issues/git-issue-864rr.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864rr.dfy
similarity index 84%
rename from Test/git-issues/git-issue-864rr.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864rr.dfy
index a92186d9f6a..e1a722d4c39 100644
--- a/Test/git-issues/git-issue-864rr.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864rr.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 // Tests the resolution of the refinement parent -- that it ignores
 // local declarations.
diff --git a/Test/git-issues/git-issue-864rr.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864rr.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-864rr.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864rr.dfy.expect
diff --git a/Test/git-issues/git-issue-864y.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864y.dfy
similarity index 90%
rename from Test/git-issues/git-issue-864y.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864y.dfy
index bf4626077b6..41162c3674d 100644
--- a/Test/git-issues/git-issue-864y.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864y.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module B {
   export B reveals *
diff --git a/Test/git-issues/git-issue-864y.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864y.dfy.expect
similarity index 75%
rename from Test/git-issues/git-issue-864y.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864y.dfy.expect
index 876ea5a143a..7910eb599f0 100644
--- a/Test/git-issues/git-issue-864y.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864y.dfy.expect
@@ -1,2 +1,3 @@
 git-issue-864y.dfy(6,9): Error: duplicate name of top-level declaration: A
+git-issue-864y.dfy(7,8): Related location
 1 resolution/type errors detected in git-issue-864y.dfy
diff --git a/Test/git-issues/git-issue-864z.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z.dfy
similarity index 81%
rename from Test/git-issues/git-issue-864z.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z.dfy
index f0cd443101a..86b7c185ec3 100644
--- a/Test/git-issues/git-issue-864z.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module A {
   export reveals a
diff --git a/Test/git-issues/git-issue-864z.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-864z.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z.dfy.expect
diff --git a/Test/git-issues/git-issue-864z1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z1.dfy
similarity index 81%
rename from Test/git-issues/git-issue-864z1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z1.dfy
index a7857675995..27f7dd1c96a 100644
--- a/Test/git-issues/git-issue-864z1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z1.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module A {
   export reveals a
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z1.dfy.expect
new file mode 100644
index 00000000000..ebe2328e072
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864z1.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864zz.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864zz.dfy
new file mode 100644
index 00000000000..7af269bae86
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864zz.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+module A {
+  export reveals a
+  const a := 10
+  const b := 20
+}
+
+module B refines A {
+  export X reveals * extends A // used to complain  A is not in B
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864zz.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864zz.dfy.expect
new file mode 100644
index 00000000000..012f5b99379
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-864zz.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/git-issues/git-issue-867.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-867.dfy
similarity index 96%
rename from Test/git-issues/git-issue-867.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-867.dfy
index 1a192fd1e74..ecfd8f783d2 100644
--- a/Test/git-issues/git-issue-867.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-867.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // The following compiled function was always handled correctly:
 
diff --git a/Test/git-issues/git-issue-867.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-867.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-867.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-867.dfy.expect
index 724b5dec70e..d662a8710aa 100644
--- a/Test/git-issues/git-issue-867.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-867.dfy.expect
@@ -1,7 +1,7 @@
-git-issue-867.dfy(49,6): Error: to be compilable, the value of a let-such-that expression must be uniquely determined
-git-issue-867.dfy(90,6): Error: to be compilable, the value of a let-such-that expression must be uniquely determined
 git-issue-867.dfy(9,2): Error: to be compilable, the value of a let-such-that expression must be uniquely determined
 git-issue-867.dfy(21,2): Error: to be compilable, the value of a let-such-that expression must be uniquely determined
 git-issue-867.dfy(29,2): Error: to be compilable, the value of a let-such-that expression must be uniquely determined
+git-issue-867.dfy(49,6): Error: to be compilable, the value of a let-such-that expression must be uniquely determined
+git-issue-867.dfy(90,6): Error: to be compilable, the value of a let-such-that expression must be uniquely determined
 
 Dafny program verifier finished with 4 verified, 5 errors
diff --git a/Test/git-issues/git-issue-885.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-885.dfy
similarity index 95%
rename from Test/git-issues/git-issue-885.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-885.dfy
index 22bafc9591f..b0963673a55 100644
--- a/Test/git-issues/git-issue-885.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-885.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait Trait { }
diff --git a/Test/git-issues/git-issue-885.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-885.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-885.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-885.dfy.expect
diff --git a/Test/git-issues/git-issue-889a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889a.dfy
similarity index 98%
rename from Test/git-issues/git-issue-889a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889a.dfy
index 265c50edf1a..37f11d63a1c 100644
--- a/Test/git-issues/git-issue-889a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889a.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
+// RUN: %exits-with 4 %build "%s" --relax-definite-assignment > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file includes verification tests
diff --git a/Test/git-issues/git-issue-889a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889a.dfy.expect
similarity index 94%
rename from Test/git-issues/git-issue-889a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889a.dfy.expect
index 0e1ceaf0b52..7d104e3a33c 100644
--- a/Test/git-issues/git-issue-889a.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889a.dfy.expect
@@ -8,7 +8,7 @@ git-issue-889a.dfy(51,9): Error: result of operation might violate newtype const
 git-issue-889a.dfy(53,9): Error: result of operation might violate newtype constraint for 'int8'
 git-issue-889a.dfy(55,9): Error: result of operation might violate newtype constraint for 'smallneg'
 git-issue-889a.dfy(57,9): Error: result of operation might violate newtype constraint for 'smallneg'
-git-issue-889a.dfy(97,11): Error: assertion could not be proved
+git-issue-889a.dfy(97,2): Error: assertion might not hold
 git-issue-889a.dfy(121,4): Error: missing case in match statement: not all possibilities for selector of type bv1 have been covered
 
 Dafny program verifier finished with 9 verified, 10 errors
diff --git a/Test/git-issues/git-issue-889b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889b.dfy
similarity index 97%
rename from Test/git-issues/git-issue-889b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889b.dfy
index 824c29a573f..5c115315e37 100644
--- a/Test/git-issues/git-issue-889b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889b.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file tests resolution errors
diff --git a/Test/git-issues/git-issue-889b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-889b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-889b.dfy.expect
diff --git a/Test/git-issues/git-issue-895.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-895.dfy
similarity index 87%
rename from Test/git-issues/git-issue-895.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-895.dfy
index b86dd474b24..fb3650e265c 100644
--- a/Test/git-issues/git-issue-895.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-895.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module A {
   ghost predicate Init(s: int) {
diff --git a/Test/metatests/LegacyResolverFails.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-895.dfy.expect
similarity index 100%
rename from Test/metatests/LegacyResolverFails.dfy.refresh.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-895.dfy.expect
diff --git a/Test/git-issues/git-issue-897.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897.dfy
similarity index 86%
rename from Test/git-issues/git-issue-897.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897.dfy
index 809354239e9..0afe4233ed4 100644
--- a/Test/git-issues/git-issue-897.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 ghost function missing_number(nums: seq<nat>): nat
   requires |set i | i in nums| == |nums|
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897.dfy.expect
new file mode 100644
index 00000000000..2416c28d824
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897.dfy.expect
@@ -0,0 +1,5 @@
+git-issue-897.dfy(10,17): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+git-issue-897.dfy(11,4): Error: assertion might not hold
+git-issue-897.dfy(16,30): Error: possible violation of postcondition of forall statement
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/git-issues/git-issue-897a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897a.dfy
similarity index 84%
rename from Test/git-issues/git-issue-897a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897a.dfy
index 047e6896ac2..6cc88379b33 100644
--- a/Test/git-issues/git-issue-897a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897a.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 ghost function missing_number(nums: seq<nat>): nat
   requires |set i | i in nums| == |nums|
@@ -7,7 +7,7 @@ ghost function missing_number(nums: seq<nat>): nat
 {
   var p := x => 0 <= x <= |nums| && x !in nums;
   assert exists x :: p(x) && forall y :: p(y) ==> y == x by {
-    var range := set i | 0 <= i <= |nums|;
+    var range := set i {:trigger} | 0 <= i <= |nums|;
     assume |range| == |nums| + 1;
     var missing := range - set i | i in nums;
     assert |missing| == 1;
diff --git a/Test/metatests/RefreshResolverFails.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897a.dfy.expect
similarity index 100%
rename from Test/metatests/RefreshResolverFails.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897a.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897b.dfy
new file mode 100644
index 00000000000..0f5e922056e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897b.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function F(): int {
+  var p := x => true;
+  assert true by {
+    forall y: int | p(y) {}
+  }
+  5
+}
diff --git a/Test/wishlist/granted/strings.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897b.dfy.expect
similarity index 100%
rename from Test/wishlist/granted/strings.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-897b.dfy.expect
diff --git a/Test/git-issues/git-issue-904.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-904.dfy
similarity index 81%
rename from Test/git-issues/git-issue-904.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-904.dfy
index 6dd0f9a743a..3d5be25dbf1 100644
--- a/Test/git-issues/git-issue-904.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-904.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 module FOO {
   //  two fields are needed
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-904.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-904.dfy.expect
new file mode 100644
index 00000000000..ebe2328e072
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-904.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-907.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-907.dfy
new file mode 100644
index 00000000000..87b31b3f2ac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-907.dfy
@@ -0,0 +1,10 @@
+// RUN: %translate java "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Checks that the Java runtime library is present
+
+function identity(n:nat):nat
+{
+    n
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-907.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-907.dfy.expect
new file mode 100644
index 00000000000..012f5b99379
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-907.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/git-issues/git-issue-921.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-921.dfy
similarity index 85%
rename from Test/git-issues/git-issue-921.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-921.dfy
index 6698d3ee694..943195e45b6 100644
--- a/Test/git-issues/git-issue-921.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-921.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module StringsOfLength {
   type ShortString = s: string | |s| < 10
diff --git a/Test/git-issues/git-issue-921.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-921.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-921.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-921.dfy.expect
diff --git a/Test/git-issues/git-issue-922.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-922.dfy
similarity index 88%
rename from Test/git-issues/git-issue-922.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-922.dfy
index eea2efbf19c..29a89f75917 100644
--- a/Test/git-issues/git-issue-922.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-922.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module FOO {
   // seq with more than one element
diff --git a/Test/git-issues/git-issue-922.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-922.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-922.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-922.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-922a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-922a.dfy
new file mode 100644
index 00000000000..9aa85b065ad
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-922a.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+module FOO {
+  /** Another type definition. */
+  datatype O = O(x: nat)
+
+  /** This should not be allowed. */
+  const OO := O(-1)   // error: argument is not a nat
+
+}
diff --git a/Test/git-issues/git-issue-922a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-922a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-922a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-922a.dfy.expect
diff --git a/Test/git-issues/git-issue-930.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-930.dfy
similarity index 98%
rename from Test/git-issues/git-issue-930.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-930.dfy
index 190ea13f641..4980ef92998 100644
--- a/Test/git-issues/git-issue-930.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-930.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Result<T> = Success(value: T) | Failure(error: string)
diff --git a/Test/git-issues/git-issue-930.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-930.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-930.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-930.dfy.expect
diff --git a/Test/git-issues/git-issue-936.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-936.dfy
similarity index 95%
rename from Test/git-issues/git-issue-936.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-936.dfy
index e0fcda373a4..ccde6e2da50 100644
--- a/Test/git-issues/git-issue-936.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-936.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Status = Failure(msg: string) | Success
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-936.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-936.dfy.expect
new file mode 100644
index 00000000000..cd58cea9bc4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-936.dfy.expect
@@ -0,0 +1,3 @@
+git-issue-936.dfy(29,5): Error: assertion might not hold
+
+Dafny program verifier finished with 9 verified, 1 error
diff --git a/Test/git-issues/git-issue-944.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-944.dfy
similarity index 85%
rename from Test/git-issues/git-issue-944.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-944.dfy
index c4d3e9abdc4..c21723e719e 100644
--- a/Test/git-issues/git-issue-944.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-944.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class MyClass {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-944.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-944.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-944.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/git-issues/git-issue-945.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-945.dfy
similarity index 86%
rename from Test/git-issues/git-issue-945.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-945.dfy
index 520833c7369..84fa11b301f 100644
--- a/Test/git-issues/git-issue-945.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-945.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module A {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-945.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-945.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-945.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-950.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-950.dfy
new file mode 100644
index 00000000000..c15ed37c56a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-950.dfy
@@ -0,0 +1,12 @@
+// RUN: %verify "%s" "%s" > "%t"
+// RUN: %verify "%s" %S/git-issue-950.dfy >> "%t"
+// RUN: %verify "%s" %S/../git-issues/git-issue-950.dfy >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module M {
+
+  const x: int := 5
+  method m() {
+    assert x == 5;
+  }
+}
diff --git a/Test/git-issues/git-issue-950.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-950.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-950.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-950.dfy.expect
diff --git a/Test/git-issues/git-issue-952.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-952.dfy
similarity index 97%
rename from Test/git-issues/git-issue-952.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-952.dfy
index b6b9749224b..d097f26c627 100644
--- a/Test/git-issues/git-issue-952.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-952.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module A {
   class Cell {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-952.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-952.dfy.expect
new file mode 100644
index 00000000000..e4fcebf8ffe
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-952.dfy.expect
@@ -0,0 +1,8 @@
+git-issue-952.dfy(35,6): Error: assertion might not hold
+git-issue-952.dfy(38,6): Error: assertion might not hold
+git-issue-952.dfy(71,6): Error: assertion might not hold
+git-issue-952.dfy(74,6): Error: assertion might not hold
+git-issue-952.dfy(100,6): Error: assertion might not hold
+git-issue-952.dfy(103,6): Error: assertion might not hold
+
+Dafny program verifier finished with 4 verified, 6 errors
diff --git a/Test/git-issues/git-issue-953.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-953.dfy
similarity index 93%
rename from Test/git-issues/git-issue-953.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-953.dfy
index 9c14e6e4e98..a24f468c365 100644
--- a/Test/git-issues/git-issue-953.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-953.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 module P {
   datatype T_ = T()  // the underscore in this name once caused a problem in Java compilation
diff --git a/Test/git-issues/git-issue-953.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-953.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-953.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-953.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-953.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-953.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-953.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-956.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-956.dfy
new file mode 100644
index 00000000000..9cfa9801318
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-956.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+datatype T = T1(x:nat) | T2(y:nat) {
+    ghost predicate i() requires T2? {
+        y > 0
+    }
+}
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-956.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-956.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-956.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/git-issues/git-issue-958.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-958.dfy
similarity index 78%
rename from Test/git-issues/git-issue-958.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-958.dfy
index fd0d9f8318b..b09f091802b 100644
--- a/Test/git-issues/git-issue-958.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-958.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Atom = MakeAtom(value: int)
diff --git a/Test/git-issues/git-issue-958.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-958.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-958.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-958.dfy.expect
diff --git a/Test/git-issues/git-issue-966.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-966.dfy
similarity index 93%
rename from Test/git-issues/git-issue-966.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-966.dfy
index 874e49b03f2..6f826c7a36a 100644
--- a/Test/git-issues/git-issue-966.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-966.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Test various ways to get to the members of a datatype
 
diff --git a/Test/vacid0/LazyInitArray.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-966.dfy.expect
similarity index 100%
rename from Test/vacid0/LazyInitArray.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-966.dfy.expect
diff --git a/Test/git-issues/git-issue-968.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-968.dfy
similarity index 87%
rename from Test/git-issues/git-issue-968.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-968.dfy
index 5cba3e176a0..37bbd798766 100644
--- a/Test/git-issues/git-issue-968.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-968.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype DT<T(0)> = Make | Create {
diff --git a/Test/git-issues/git-issue-968.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-968.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-968.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-968.dfy.expect
diff --git a/Test/git-issues/git-issue-968a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-968a.dfy
similarity index 82%
rename from Test/git-issues/git-issue-968a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-968a.dfy
index 5bc5bd39fc1..39bd39ec5d4 100644
--- a/Test/git-issues/git-issue-968a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-968a.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype DT<T(0)> = Make | Create {
diff --git a/Test/git-issues/git-issue-968a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-968a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-968a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-968a.dfy.expect
diff --git a/Test/git-issues/git-issue-970a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-970a.dfy
similarity index 92%
rename from Test/git-issues/git-issue-970a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-970a.dfy
index e4c78d5422f..cc6cee960cf 100644
--- a/Test/git-issues/git-issue-970a.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-970a.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module Library {
   datatype Result<T> = Success(value: T) | Failure(error: string)
diff --git a/Test/git-issues/git-issue-970a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-970a.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-970a.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-970a.dfy.expect
diff --git a/Test/git-issues/git-issue-970b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-970b.dfy
similarity index 95%
rename from Test/git-issues/git-issue-970b.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-970b.dfy
index 981a3430c03..48556ec25ec 100644
--- a/Test/git-issues/git-issue-970b.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-970b.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method UnresolvedRhs(x: int) returns (r: Status)
diff --git a/Test/git-issues/git-issue-970b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-970b.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-970b.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-970b.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-975.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-975.dfy
new file mode 100644
index 00000000000..62e5df979ef
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-975.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+ghost function f():nat
+  ensures f() == 0
+{                  // no problem for methods
+  var x := 0;      // no problem without this
+  assert true by {}
+  0
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-975.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-975.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-975.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/git-issues/git-issue-977.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-977.dfy
similarity index 99%
rename from Test/git-issues/git-issue-977.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-977.dfy
index 3fc569a3510..395de625158 100644
--- a/Test/git-issues/git-issue-977.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-977.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /printTooltips "%s" > "%t"
+// RUN: %exits-with 4 %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 datatype Option<V> = Some(value: V) | None
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-977.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-977.dfy.expect
new file mode 100644
index 00000000000..b916d6d74aa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-977.dfy.expect
@@ -0,0 +1,59 @@
+git-issue-977.dfy(209,21): Info: _k: ORDINAL
+git-issue-977.dfy(214,21): Info: _k: ORDINAL
+git-issue-977.dfy(232,21): Info: _k: ORDINAL
+git-issue-977.dfy(237,36): Info: _k: ORDINAL
+git-issue-977.dfy(239,15): Info: Pos#[_k]
+git-issue-977.dfy(237,36): Info: Theorem2# with focal predicate Pos
+git-issue-977.dfy(241,4): Info: Theorem2#[_k - 1]
+git-issue-977.dfy(229,20): Info: co-recursive call
+git-issue-977.dfy(234,21): Info: Pos#[_k - 1]
+git-issue-977.dfy(217,13): Info: Selected triggers: {AAA#[k](t)}
+git-issue-977.dfy(227,17): Info: decreases 1, n
+git-issue-977.dfy(237,36): Info: Theorem2# decreases _k, n
+git-issue-977.dfy(95,19): Info: _k: ORDINAL
+git-issue-977.dfy(113,19): Info: _k: nat
+git-issue-977.dfy(84,16): Info: tail recursive
+git-issue-977.dfy(95,19): Info: tail recursive
+git-issue-977.dfy(113,19): Info: tail recursive
+git-issue-977.dfy(146,16): Info: tail recursive
+git-issue-977.dfy(97,36): Info: GreatestPredOrd#[_k - 1]
+git-issue-977.dfy(115,36): Info: GreatestPredNat#[_k - 1]
+git-issue-977.dfy(71,4): Info: Selected triggers:
+   {RicochetOrd(m, num)}, {GreatestManualOrd(m, num)}, {GreatestPredOrd#[m](num)}, {m < k}
+git-issue-977.dfy(138,4): Info: Selected triggers:
+   {GreatestManualOrd(m, num)}, {m < k}
+git-issue-977.dfy(50,15): Info: decreases n
+git-issue-977.dfy(61,6): Info: decreases k, num
+git-issue-977.dfy(84,16): Info: decreases num
+git-issue-977.dfy(129,16): Info: decreases k, num
+git-issue-977.dfy(146,16): Info: decreases k, num
+git-issue-977.dfy(54,6): Info: {:induction num}
+git-issue-977.dfy(54,6): Info: {:inductionTrigger Pred(num)}
+git-issue-977.dfy(54,6): Info: {:inductionTrigger GreatestPredOrd(num)}
+git-issue-977.dfy(54,6): Info: {:inductionTrigger GreatestPredNat(num)}
+git-issue-977.dfy(61,6): Info: {:induction k, num}
+git-issue-977.dfy(61,6): Info: {:inductionTrigger GreatestPredOrd#[k](num)}
+git-issue-977.dfy(61,6): Info: {:inductionTrigger GreatestManualOrd(k, num)}
+git-issue-977.dfy(61,6): Info: {:inductionTrigger RicochetOrd(k, num)}
+git-issue-977.dfy(77,6): Info: {:induction k, num}
+git-issue-977.dfy(77,6): Info: {:inductionTrigger GreatestPredNat#[k](num)}
+git-issue-977.dfy(77,6): Info: {:inductionTrigger GreatestManualNat(k, num)}
+git-issue-977.dfy(77,6): Info: {:inductionTrigger RicochetNat(k, num)}
+git-issue-977.dfy(71,4): Info: ensures GreatestPredOrd#[m](num)
+git-issue-977.dfy(71,4): Info: ensures GreatestManualOrd(m, num)
+git-issue-977.dfy(71,4): Info: ensures RicochetOrd(m, num)
+git-issue-977.dfy(110,28): Info: Some instances of this call are not inlined.
+git-issue-977.dfy(143,26): Info: Some instances of this call are not inlined.
+git-issue-977.dfy(162,21): Info: Some instances of this call are not inlined.
+git-issue-977.dfy(39,25): Error: assertion might not hold
+git-issue-977.dfy(14,29): Related location: this proposition could not be proved
+git-issue-977.dfy(9,7): Related location: this proposition could not be proved
+git-issue-977.dfy(41,31): Error: assertion might not hold
+git-issue-977.dfy(22,13): Related location: this proposition could not be proved
+git-issue-977.dfy(9,7): Related location: this proposition could not be proved
+git-issue-977.dfy(43,26): Error: assertion might not hold
+git-issue-977.dfy(30,29): Related location: this proposition could not be proved
+git-issue-977.dfy(9,7): Related location: this proposition could not be proved
+git-issue-977.dfy(220,18): Info: Some instances of this call are not inlined.
+
+Dafny program verifier finished with 20 verified, 3 errors
diff --git a/Test/git-issues/git-issue-981.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981.dfy
similarity index 95%
rename from Test/git-issues/git-issue-981.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981.dfy
index a8287eb6aa8..e188b9cbb7f 100644
--- a/Test/git-issues/git-issue-981.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module K {
   module KK {
diff --git a/Test/git-issues/git-issue-981.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-981.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981.dfy.expect
diff --git a/Test/git-issues/git-issue-981d.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981d.dfy
similarity index 91%
rename from Test/git-issues/git-issue-981d.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981d.dfy
index 7c05ab05cc8..701e344a868 100644
--- a/Test/git-issues/git-issue-981d.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981d.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 // This tests all sorts of combinations of duplicate declarations
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981d.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981d.dfy.expect
new file mode 100644
index 00000000000..687fb62e686
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981d.dfy.expect
@@ -0,0 +1,24 @@
+git-issue-981d.dfy(25,9): Error: duplicate name of top-level declaration: E4
+git-issue-981d.dfy(29,8): Related location
+git-issue-981d.dfy(26,9): Error: duplicate name of top-level declaration: E5
+git-issue-981d.dfy(30,9): Related location
+git-issue-981d.dfy(31,8): Error: duplicate name of top-level declaration: E6
+git-issue-981d.dfy(27,9): Related location
+git-issue-981d.dfy(36,7): Error: duplicate name of top-level declaration: T2
+git-issue-981d.dfy(40,8): Related location
+git-issue-981d.dfy(37,7): Error: duplicate name of top-level declaration: T3
+git-issue-981d.dfy(41,9): Related location
+git-issue-981d.dfy(39,7): Error: duplicate name of top-level declaration: T1
+git-issue-981d.dfy(35,7): Related location
+git-issue-981d.dfy(42,8): Error: duplicate name of top-level declaration: T4
+git-issue-981d.dfy(38,7): Related location
+git-issue-981d.dfy(49,8): Error: Duplicate member name: T2
+git-issue-981d.dfy(50,9): Error: Duplicate member name: T3
+git-issue-981d.dfy(51,9): Error: Duplicate member name: T3
+git-issue-981d.dfy(53,9): Error: Duplicate member name: T4
+git-issue-981d.dfy(48,8): Error: duplicate name of top-level declaration: T4
+git-issue-981d.dfy(52,8): Related location
+git-issue-981d.dfy(54,8): Error: duplicate name of top-level declaration: T4
+git-issue-981d.dfy(52,8): Related location
+git-issue-981d.dfy(54,8): Error: a module that already contains a top-level declaration 'T4?' is not allowed to declare a reference type (class) 'T4'
+14 resolution/type errors detected in git-issue-981d.dfy
diff --git a/Test/git-issues/git-issue-981e.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981e.dfy
similarity index 78%
rename from Test/git-issues/git-issue-981e.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981e.dfy
index b9e418505e5..0b7d993e29d 100644
--- a/Test/git-issues/git-issue-981e.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981e.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module Z {}
 module A {
diff --git a/Test/git-issues/git-issue-981e.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981e.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-981e.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981e.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981ee.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981ee.dfy
new file mode 100644
index 00000000000..ff2ee4586c6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981ee.dfy
@@ -0,0 +1,7 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module B {
+  module E2 {}
+  import E2 = Z // error
+}
diff --git a/Test/git-issues/git-issue-981ee.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981ee.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-981ee.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-981ee.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main.dfy
new file mode 100644
index 00000000000..da38b911aae
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main.dfy
@@ -0,0 +1,20 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %exits-with 3 %run --no-verify --target cs "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target js "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target go "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target java "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module A {
+  module AA {
+    method Main() {}
+  }
+}
+
+module B {
+  class C {
+    static method Main() {}
+  }
+}
+
+method Main() {}
diff --git a/Test/git-issues/git-issue-Main.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main.dfy.expect
similarity index 87%
rename from Test/git-issues/git-issue-Main.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main.dfy.expect
index d9200b319a1..3d3647c7f32 100644
--- a/Test/git-issues/git-issue-Main.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main.dfy.expect
@@ -4,17 +4,19 @@ Dafny program verifier finished with 0 verified, 0 errors
 Dafny program verifier did not attempt verification
 git-issue-Main.dfy(16,18): Error: More than one method is declared as 'Main'. First declaration appeared at git-issue-Main.dfy(10,11).
 git-issue-Main.dfy(20,7): Error: More than one method is declared as 'Main'. First declaration appeared at git-issue-Main.dfy(10,11).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-Main.dfy(16,18): Error: More than one method is declared as 'Main'. First declaration appeared at git-issue-Main.dfy(10,11).
 git-issue-Main.dfy(20,7): Error: More than one method is declared as 'Main'. First declaration appeared at git-issue-Main.dfy(10,11).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-Main.dfy(16,18): Error: More than one method is declared as 'Main'. First declaration appeared at git-issue-Main.dfy(10,11).
 git-issue-Main.dfy(20,7): Error: More than one method is declared as 'Main'. First declaration appeared at git-issue-Main.dfy(10,11).
-Wrote textual form of partial target program to git-issue-Main-go/src/git-issue-Main.go
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-Main.dfy(16,18): Error: More than one method is declared as 'Main'. First declaration appeared at git-issue-Main.dfy(10,11).
 git-issue-Main.dfy(20,7): Error: More than one method is declared as 'Main'. First declaration appeared at git-issue-Main.dfy(10,11).
-Wrote textual form of partial target program to git-issue-Main-java/git_issue_Main.java
+Translation was aborted because errors were found
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main0.dfy
new file mode 100644
index 00000000000..3179f489ef2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main0.dfy
@@ -0,0 +1,21 @@
+// NONUNIFORM: Multiple test scenarios (could be split)
+// RUN: %verify "%s" > "%t"
+// RUN: %run --no-verify --target cs --main-method A.B.Main "%s" >> "%t"
+// RUN: %run --no-verify --target js --main-method A.B.Main "%s" >> "%t"
+// RUN: %run --no-verify --target go --main-method A.B.Main "%s" >> "%t"
+// RUN: %run --no-verify --target js --main-method A.B.Main "%s" >> "%t"
+// RUN: %run --no-verify --target cs --main-method A.C.Test "%s" >> "%t"
+// RUN: %run --no-verify --target js --main-method A.C.Test "%s" >> "%t"
+// RUN: %run --no-verify --target go --main-method A.C.Test "%s" >> "%t"
+// RUN: %run --no-verify --target java --main-method A.C.Test "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module A {
+  class B {
+    method Main() { print "Main\n"; }
+  }
+  class C {
+    method Test() { print "Test\n"; }
+  }
+}
+
diff --git a/Test/git-issues/git-issue-Main0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main0.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-Main0.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main0.dfy.expect
diff --git a/Test/git-issues/git-issue-Main1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main1.dfy
similarity index 75%
rename from Test/git-issues/git-issue-Main1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main1.dfy
index c6438f8493e..1a5dcb6be77 100644
--- a/Test/git-issues/git-issue-Main1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main1.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 module A {
   module AA {
diff --git a/Test/git-issues/git-issue-Main1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main1.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-Main1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main1.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main2.dfy
new file mode 100644
index 00000000000..ce6e6957a42
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main2.dfy
@@ -0,0 +1,20 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %exits-with 3 %run --no-verify --target cs "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target js "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target go "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target java "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module A {
+  module AA {
+    method {:main} Main() {}
+  }
+}
+
+module B {
+  class C {
+    static method {:main} Main() {}
+  }
+}
+
+method Main() {}
diff --git a/Test/git-issues/git-issue-Main2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main2.dfy.expect
similarity index 80%
rename from Test/git-issues/git-issue-Main2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main2.dfy.expect
index 0d35cc93128..6c7ec1fd1aa 100644
--- a/Test/git-issues/git-issue-Main2.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main2.dfy.expect
@@ -3,14 +3,16 @@ Dafny program verifier finished with 0 verified, 0 errors
 
 Dafny program verifier did not attempt verification
 git-issue-Main2.dfy(16,26): Error: More than one method is marked {:main}. First declaration appeared at git-issue-Main2.dfy(10,19).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-Main2.dfy(16,26): Error: More than one method is marked {:main}. First declaration appeared at git-issue-Main2.dfy(10,19).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-Main2.dfy(16,26): Error: More than one method is marked {:main}. First declaration appeared at git-issue-Main2.dfy(10,19).
-Wrote textual form of partial target program to git-issue-Main2-go/src/git-issue-Main2.go
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-Main2.dfy(16,26): Error: More than one method is marked {:main}. First declaration appeared at git-issue-Main2.dfy(10,19).
-Wrote textual form of partial target program to git-issue-Main2-java/git_issue_Main2.java
+Translation was aborted because errors were found
diff --git a/Test/git-issues/git-issue-Main3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main3.dfy
similarity index 75%
rename from Test/git-issues/git-issue-Main3.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main3.dfy
index b082ddaa21f..131b954bc13 100644
--- a/Test/git-issues/git-issue-Main3.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main3.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 module A {
   module AA {
diff --git a/Test/git-issues/git-issue-Main3.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main3.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-Main3.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main3.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main4.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main4.dfy
new file mode 100644
index 00000000000..e0fe49893e2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main4.dfy
@@ -0,0 +1,45 @@
+// NONUNIFORM: Multiple test scenarios (could be split)
+// RUN: %verify "%s" > "%t"
+// RUN: %run --no-verify --target cs --main-method A.AA.Test "%s" >> "%t"
+// RUN: %run --no-verify --target js --main-method A.AA.Test "%s" >> "%t"
+// RUN: %run --no-verify --target go --main-method A.AA.Test "%s" >> "%t"
+// RUN: %run --no-verify --target java --main-method A.AA.Test "%s" >> "%t"
+// RUN: %run --no-verify --target cs --main-method B.C.Test "%s" >> "%t"
+// RUN: %run --no-verify --target js --main-method B.C.Test "%s" >> "%t"
+// RUN: %run --no-verify --target go --main-method B.C.Test "%s" >> "%t"
+// RUN: %run --no-verify --target java --main-method B.C.Test "%s" >> "%t"
+// RUN: %run --no-verify --target cs --main-method B.Test "%s" >> "%t"
+// RUN: %run --no-verify --target js --main-method B.Test "%s" >> "%t"
+// RUN: %run --no-verify --target go --main-method B.Test "%s" >> "%t"
+// RUN: %run --no-verify --target java --main-method B.Test "%s" >> "%t"
+// RUN: %run --no-verify --target cs --main-method Test "%s" >> "%t"
+// RUN: %run --no-verify --target js --main-method Test "%s" >> "%t"
+// RUN: %run --no-verify --target go --main-method Test "%s" >> "%t"
+// RUN: %run --no-verify --target java --main-method Test "%s" >> "%t"
+// RUN: %run --no-verify --target cs --main-method C.Test "%s" >> "%t"
+// RUN: %run --no-verify --target js --main-method C.Test "%s" >> "%t"
+// RUN: %run --no-verify --target go --main-method C.Test "%s" >> "%t"
+// RUN: %run --no-verify --target java --main-method C.Test "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target cs --main-method X "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target js --main-method X "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target go --main-method X "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target java --main-method X "%s" >> "%t"
+
+module A {
+  module AA {
+    method Test() { print "Test1\n"; }
+  }
+}
+
+module B {
+  class C {
+    static method Test() { print "Test2\n"; }
+  }
+  method Test() { print "Test3\n"; }
+}
+
+method Test() { print "Test4\n"; }
+
+class C {
+  static method Test() { print "Test5\n"; }
+}
diff --git a/Test/git-issues/git-issue-Main4.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main4.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-Main4.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-Main4.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-MainE.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-MainE.dfy
new file mode 100644
index 00000000000..c6f35fe3559
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-MainE.dfy
@@ -0,0 +1,82 @@
+// NONUNIFORM: Multiple test scenarios (could be split)
+// RUN: %verify --relax-definite-assignment "%s" > "%t"
+// RUN: %exits-with 3 %run --no-verify --main-method A.Test "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --main-method B.Test "%s" >> "%t"
+// RUN: %run --no-verify --main-method C.Test "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --main-method D.Test "%s" >> "%t"
+// RUN: %run --no-verify --main-method E.Test "%s" >> "%t"
+// RUN: %run --no-verify --main-method G.Test "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --main-method H.Test "%s" >> "%t"
+// RUN: %run --no-verify --main-method I.Test "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --main-method J.Test "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --main-method K.Test "%s" >> "%t"
+
+// RUN: %run --no-verify --main-method=-      "%s" &>> "%t"
+// RUN: %exits-with 3 %run --no-verify --main-method Tr.Instance "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --main-method Opaque.Static   "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --main-method Opaque.Instance "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class A {
+  method Test(i: int) { print "Bad\n"; }
+}
+class B {
+  method Test<T>() { print "Bad\n"; }
+}
+class C<T> {
+  method Test() { print "OK-C\n"; }
+}
+class D {
+  constructor() {}
+  method Test() { print "Bad\n"; }
+}
+class E {
+  constructor() {}
+  static method Test() { print "OK-E\n"; }
+}
+class G {
+  method Test(ghost i: int) { print "OK-G\n"; }
+}
+class H {
+  method Test() returns (i: int) { print "Bad\n"; }
+}
+class I {
+  method Test() returns (ghost i: int) { print "OK-I\n"; }
+}
+class J {
+  method Test() requires true { print "Bad\n"; }
+}
+class K {
+  method Test() modifies {} { print "Bad\n"; }
+}
+class Z {
+  method Main() { print "Main\n"; }
+}
+
+// Of the remaining methods, this file tests only the error cases.
+// The cases that compile are tested in Test/comp/MainMethod.dfy.
+
+trait Tr {
+  static method Static() { print "OK-Tr\n"; }
+  method Instance() { print "Bad\n"; }
+}
+
+datatype Dt = Dt0(int) | Dt1(real) {
+  static method Static() { print "OK-Dt: static\n"; }
+  method Instance() { print "OK-Dt: ", this, "\n"; }
+}
+
+codatatype Co = CoMore(Co) {
+  static method Static() { print "OK-Co: static\n"; }
+  method Instance() { print "OK-Co: ", this, "\n"; }
+}
+
+newtype Nt = x | -0x8000_0000 <= x <= 0x8000_0000 {
+  static method Static() { print "OK-Nt: static\n"; }
+  method Instance() { print "OK-Nt: ", this, "\n"; }
+}
+
+type {:extern "OpaqueX"} Opaque {
+  static method Static() { print "Bad\n"; }
+  method Instance() { print "Bad\n"; }
+}
diff --git a/Test/git-issues/git-issue-MainE.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-MainE.dfy.expect
similarity index 82%
rename from Test/git-issues/git-issue-MainE.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-MainE.dfy.expect
index fc59785f193..f965183af74 100644
--- a/Test/git-issues/git-issue-MainE.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-MainE.dfy.expect
@@ -3,15 +3,18 @@ Dafny program verifier finished with 1 verified, 0 errors
 
 Dafny program verifier did not attempt verification
 git-issue-MainE.dfy(21,9): Error: The method 'A.Test' is not permitted as a main method (the method's non-ghost argument type should be an seq<string>, got int).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-MainE.dfy(24,9): Error: The method 'B.Test' is not permitted as a main method (the method has type parameters).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 OK-C
 
 Dafny program verifier did not attempt verification
 git-issue-MainE.dfy(31,9): Error: The method 'D.Test' is not permitted as a main method (the method is not static and the enclosing class has constructors).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 OK-E
@@ -21,26 +24,29 @@ OK-G
 
 Dafny program verifier did not attempt verification
 git-issue-MainE.dfy(41,9): Error: The method 'H.Test' is not permitted as a main method (the method has non-ghost out parameters).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 OK-I
 
 Dafny program verifier did not attempt verification
 git-issue-MainE.dfy(47,9): Error: The method 'J.Test' is not permitted as a main method (the method has requires clauses).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-MainE.dfy(50,9): Error: The method 'K.Test' is not permitted as a main method (the method has modifies clauses).
-
-Dafny program verifier did not attempt verification
-Main
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 
 Dafny program verifier did not attempt verification
 git-issue-MainE.dfy(61,9): Error: The method 'Tr.Instance' is not permitted as a main method (the method is not static and the enclosing type does not support auto-initialization).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-MainE.dfy(80,16): Error: The method 'Opaque.Static' is not permitted as a main method (the enclosing type is an abstract type).
+Translation was aborted because errors were found
 
 Dafny program verifier did not attempt verification
 git-issue-MainE.dfy(81,9): Error: The method 'Opaque.Instance' is not permitted as a main method (the enclosing type is an abstract type).
+Translation was aborted because errors were found
diff --git a/Test/git-issues/git-issue1495.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue1495.dfy
similarity index 96%
rename from Test/git-issues/git-issue1495.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue1495.dfy
index 1aca75cd2a4..3d5b1530f56 100644
--- a/Test/git-issues/git-issue1495.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue1495.dfy
@@ -1,7 +1,7 @@
-// RUN: %dafny /compile:0 /rprint:"%t.rprint" "%s" > "%t"
+// RUN: %verify "%s" --standard-libraries:true --allow-axioms > "%t"
 // RUN: %diff "%s.expect" "%t"
-include "Wrappers.dfy"
-import opened Wrappers
+
+import opened Std.Wrappers
 
 datatype Bar = Bar(i: string)
 function ParseBar(s: string): Result<Bar, string> {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue1495.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue1495.dfy.expect
new file mode 100644
index 00000000000..ee799665b59
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue1495.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 8 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-1267.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-1267.dfy
new file mode 100644
index 00000000000..c046c2e611c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-1267.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver "%s" -- --print:-
+
+
+method Test()
+{
+  var tuple0 := (1 := 300, 0 := 10);
+  var tuple1 := (10, 300);
+  assert tuple0 == tuple1;
+}
diff --git a/Test/git-issues/github-issue-1267.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-1267.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-1267.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-1267.dfy.expect
diff --git a/Test/git-issues/github-issue-2174.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2174.dfy
similarity index 92%
rename from Test/git-issues/github-issue-2174.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2174.dfy
index 74b2386de1c..146cc901794 100644
--- a/Test/git-issues/github-issue-2174.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2174.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /proverOpt:O:smt.arith.solver=6 "%s" > "%t"
+// RUN: %verify --solver-option="O:smt.arith.solver=6" "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 // Taken from https://github.com/dafny-lang/dafny/issues/2174
 lemma lm(val: bv16, idx: nat)
@@ -71,7 +71,11 @@ lemma UpCastRShiftMasking(v: bv64, idx: nat)
   ensures v as bv128 == (v as bv128) & (Ones >> idx)
 {}
 
+// This one has worked in the past but is very brittle. Changing
+// unrelated background axioms causes it to fail.
+/*
 lemma RightMask(v: bv64, i: nat)
   requires 64 <= i <= 128
   ensures v as bv128 & (Ones >> i) == (v & (0xffff_ffff_ffff_ffff >> i - 64)) as bv128
 {}
+*/
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2174.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2174.dfy.expect
new file mode 100644
index 00000000000..9b96db8633f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2174.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 17 verified, 0 errors
diff --git a/Test/git-issues/github-issue-2230.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2230.dfy
similarity index 81%
rename from Test/git-issues/github-issue-2230.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2230.dfy
index bdc326f1f03..97706e69002 100644
--- a/Test/git-issues/github-issue-2230.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2230.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 lemma MergeLShift(v: bv128, i: nat, j: nat)
   requires i <= 128 && j <= 128 && i + j <= 128
   ensures v << i << j == v << i + j
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2230.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2230.dfy.expect
new file mode 100644
index 00000000000..ebe2328e072
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2230.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2563.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2563.dfy
new file mode 100644
index 00000000000..adcb10374ef
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2563.dfy
@@ -0,0 +1,2 @@
+// RUN: %exits-with 4 %verify '--log-format:csv;log.csv' "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2563.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2563.dfy.expect
new file mode 100644
index 00000000000..514cdabfd6c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2563.dfy.expect
@@ -0,0 +1,3 @@
+CLI: Error: unknown parameter to `/verificationLogger:csv`: log.csv
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2574.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2574.dfy
new file mode 100644
index 00000000000..223c4897af8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2574.dfy
@@ -0,0 +1,13 @@
+// RUN: %exits-with 4 %baredafny verify --use-basename-for-filename "%s" > "%t.raw"
+// RUN: %sed 's/^.*[\/\\]//' "%t".raw > "%t"
+// RUN: %diff %s.expect %t
+module Spec {
+  type input
+  method ReadInput() returns (i:input)
+}
+
+module Impl refines Spec {
+  class input {}
+  method ReadInput() returns (i:input) {
+  }
+}
diff --git a/Test/git-issues/github-issue-2574.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2574.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-2574.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2574.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2928.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2928.dfy
new file mode 100644
index 00000000000..63c833648d4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2928.dfy
@@ -0,0 +1,18 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" --
+
+method Main() {
+  var c := '\0';
+  assert c == 0 as char;
+  expect c == 0 as char;
+
+  var s := "\03";
+
+  assert |s| == 2;
+  expect |s| == 2;
+
+  assert s[0] == 0 as char;
+  expect s[0] == 0 as char;
+
+  assert s[1] == '3';
+  expect s[1] == '3';
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2928.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2928.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2928.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2928.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2928.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2989.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2989.dfy
new file mode 100644
index 00000000000..6455b9f8fb5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2989.dfy
@@ -0,0 +1,18 @@
+// NONUNIFORM: Go-specific regression test
+// RUN: %baredafny translate go %args --allow-deprecation --unicode-char false "%s" > "%t"
+// RUN: %baredafny translate go %args --unicode-char true "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t" 
+
+method Main() {
+  var s := Foo();
+}
+
+// An extern method that returned a string used to cause
+// an internal contract violation and nonsensical errors like
+// "Error: Cannot convert from string to seq<char>"
+
+method {:extern "foo"} Foo() returns (s: string)
+
+method Bar() returns (s: string) {
+  return "hello";
+}
diff --git a/Test/git-issues/github-issue-2989.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2989.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-2989.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-2989.dfy.expect
diff --git a/Test/git-issues/github-issue-305-a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-a.dfy
similarity index 100%
rename from Test/git-issues/github-issue-305-a.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-a.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-a.dfy.expect
new file mode 100644
index 00000000000..012f5b99379
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-a.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-b.dfy
new file mode 100644
index 00000000000..07ad8f636d2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-b.dfy
@@ -0,0 +1,9 @@
+// RUN: %exits-with 3 %translate cs --show-snippets=false "%s" > "%t"
+// RUN: %diff "%s".expect "%t"
+
+method hasNoBody()
+
+method Main() {
+    hasNoBody();
+    print "hello\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-b.dfy.expect
new file mode 100644
index 00000000000..4245d9c4e20
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-b.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+github-issue-305-b.dfy(4,7): Error: Method _module._default.hasNoBody has no body so it cannot be compiled
+Translation was aborted because errors were found
diff --git a/Test/git-issues/github-issue-305-c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-c.dfy
similarity index 85%
rename from Test/git-issues/github-issue-305-c.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-c.dfy
index 109105ad0c3..f0d0a6e3d6f 100644
--- a/Test/git-issues/github-issue-305-c.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-c.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny /compile:0 /spillTargetCode:2 "%s" > "%t"
+// RUN: %translate cs "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // At some point (https://github.com/dafny-lang/dafny/pull/307#issuecomment-510191495)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-c.dfy.expect
new file mode 100644
index 00000000000..012f5b99379
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-305-c.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3343.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3343.dfy
new file mode 100644
index 00000000000..23d37727646
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3343.dfy
@@ -0,0 +1,5 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+method Bug() {
+    var zero := 0;
+    var a := new int[zero] [];
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3343.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3343.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Test/git-issues/github-issue-3484.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3484.dfy
similarity index 83%
rename from Test/git-issues/github-issue-3484.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3484.dfy
index 65d5348abc5..63dc3a420ff 100644
--- a/Test/git-issues/github-issue-3484.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3484.dfy
@@ -1,4 +1,4 @@
-// RUN: ! %baredafny verify %args "%s" > "%t"
+// RUN: ! %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Foo(x: int) {
diff --git a/Test/git-issues/github-issue-3484.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3484.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-3484.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3484.dfy.expect
diff --git a/Test/git-issues/github-issue-3615.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3615.dfy
similarity index 80%
rename from Test/git-issues/github-issue-3615.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3615.dfy
index 9dea925b923..34424402710 100644
--- a/Test/git-issues/github-issue-3615.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3615.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 function Foo(x: int := 3): int {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3615.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3615.dfy.expect
new file mode 100644
index 00000000000..012f5b99379
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3615.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/git-issues/github-issue-3658.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3658.dfy
similarity index 94%
rename from Test/git-issues/github-issue-3658.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3658.dfy
index f34c9758f4e..07cd6f789c9 100644
--- a/Test/git-issues/github-issue-3658.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3658.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This case used to cause duplicate Boogie variable declarations
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3658.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3658.dfy.expect
new file mode 100644
index 00000000000..ebe2328e072
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3658.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-a.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-a.dfy
new file mode 100644
index 00000000000..aa619a99165
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-a.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+// good.dfy for 3766
+datatype Tree = Tree(ts: seq<Tree>)
+
+datatype Nothing = Nothing
+{
+  predicate IsFailure() { false }
+}
+
+method Main() {
+  var nothing: Nothing := Nothing;
+  :- expect nothing;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-a.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-a.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-a.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-a.dfy.rs.check
new file mode 100644
index 00000000000..50ba523378e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-a.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0369]: binary operation `==` cannot be applied to type `Sequence<Rc<Tree>>`
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-b.dfy
new file mode 100644
index 00000000000..f448648fa32
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-b.dfy
@@ -0,0 +1,14 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+// bad.dfy for 3766
+datatype Tree = Tree(ts: seq<Tree>)
+
+datatype Nothing<T> = Nothing
+{
+  predicate IsFailure() { false }
+}
+
+method Main() {
+  var nothing: Nothing<Tree> := Nothing;
+  :- expect nothing;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-b.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-b.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-b.dfy.rs.check
new file mode 100644
index 00000000000..50ba523378e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-b.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0369]: binary operation `==` cannot be applied to type `Sequence<Rc<Tree>>`
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-c.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-c.dfy
new file mode 100644
index 00000000000..506603d0e99
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-c.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+// Running this using the Java backend used to cause an NPE
+// because Tree's default value would be initialized using Tree's
+// type descriptor (since it has no non-recursive constructors)
+// before it was initialized
+datatype Tree = Tree(ts : seq<Tree>)
+
+method Main() {
+  var tree: Tree := Tree([]);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-c.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-c.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-c.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-c.dfy.rs.check
new file mode 100644
index 00000000000..50ba523378e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3766-c.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0369]: binary operation `==` cannot be applied to type `Sequence<Rc<Tree>>`
\ No newline at end of file
diff --git a/Test/git-issues/github-issue-3797.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3797.dfy
similarity index 83%
rename from Test/git-issues/github-issue-3797.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3797.dfy
index 9b1b61fbc34..4148aec66e3 100644
--- a/Test/git-issues/github-issue-3797.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3797.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 newtype uint16 = x | 0 <= x < 0x1_0000
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3797.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3797.dfy.expect
new file mode 100644
index 00000000000..ebe2328e072
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3797.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/git-issues/github-issue-3860.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3860.dfy
similarity index 80%
rename from Test/git-issues/github-issue-3860.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3860.dfy
index 1ce2cd47e14..f58899da668 100644
--- a/Test/git-issues/github-issue-3860.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3860.dfy
@@ -1,4 +1,4 @@
-// RUN: ! %baredafny verify %args %s > %t
+// RUN: ! %verify %s > %t
 // RUN: %diff "%s.expect" "%t"
 
 datatype Type = 
diff --git a/Test/git-issues/github-issue-3860.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3860.dfy.expect
similarity index 100%
rename from Test/git-issues/github-issue-3860.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3860.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3871.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3871.dfy
new file mode 100644
index 00000000000..9750001c252
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3871.dfy
@@ -0,0 +1,18 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+// extended bad.dfy for 3871
+method Main() returns () {
+    var v_array: array<int> := new int[] [1, 2];
+
+    var v_int_seq: int := |[v_array]|;
+    assert(v_int_seq == 1);
+    print v_int_seq, "\n";
+
+    var v_int_s: int := |{v_array}|;
+    assert(v_int_s == 1);
+    print v_int_s, "\n";
+
+    var v_int_m: int := |multiset{v_array}|;
+    assert(v_int_m == 1);
+    print v_int_m, "\n";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3871.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3871.dfy.expect
new file mode 100644
index 00000000000..e8183f05f5d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3871.dfy.expect
@@ -0,0 +1,3 @@
+1
+1
+1
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3871.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3871.dfy.rs.check
new file mode 100644
index 00000000000..86f268872b9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3871.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `RefCell<Vec<DafnyInt>>: Hash` is not satisfied
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3874.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3874.dfy
new file mode 100644
index 00000000000..0081d199f9a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3874.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+method Main() {
+    var s: multiset<bool> := multiset{true};
+
+    while (s != multiset{}) {
+        var x :| x in s;
+	s := s[x := 0];
+    }
+
+    print "done", "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3874.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3874.dfy.expect
new file mode 100644
index 00000000000..19f86f493ab
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3874.dfy.expect
@@ -0,0 +1 @@
+done
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3874.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3874.dfy.rs.check
new file mode 100644
index 00000000000..ddab6a3cd43
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-3874.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>EmitIndexCollectionUpdate for multiset<bool></i>.*
\ No newline at end of file
diff --git a/Test/git-issues/github-issue-4004.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004.dfy
similarity index 85%
rename from Test/git-issues/github-issue-4004.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004.dfy
index 2b5ca6a72c7..4fe7b62ba9f 100644
--- a/Test/git-issues/github-issue-4004.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args %s > %t
+// RUN: %verify %s > %t
 // RUN: %diff "%s.expect" "%t"
 
 method Main() returns ()
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004.dfy.expect
new file mode 100644
index 00000000000..012f5b99379
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/git-issues/github-issue-4004_v2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004_v2.dfy
similarity index 76%
rename from Test/git-issues/github-issue-4004_v2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004_v2.dfy
index 383e9c40b62..b47d3dca353 100644
--- a/Test/git-issues/github-issue-4004_v2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004_v2.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 method Main() returns ()
 {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004_v2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4004_v2.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4017.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4017.dfy
new file mode 100644
index 00000000000..fedb1d466a1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4017.dfy
@@ -0,0 +1,8 @@
+// RUN: %verify %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+function Crash(e: nat): string
+{
+  assert match e { case _ => true };
+  ""
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4017.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4017.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4017.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/git-issues/github-issue-4144.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4144.dfy
similarity index 95%
rename from Test/git-issues/github-issue-4144.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4144.dfy
index a7471a6bc49..745cfad7313 100644
--- a/Test/git-issues/github-issue-4144.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4144.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args %s > %t
+// RUN: %verify --allow-warnings %s > %t
 // RUN: %diff "%s.expect" "%t"
 
 module P {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4144.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4144.dfy.expect
new file mode 100644
index 00000000000..a8a90ef0afc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4144.dfy.expect
@@ -0,0 +1,20 @@
+github-issue-4144.dfy(9,31): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy(10,31): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy(11,31): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy(13,23): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy(14,23): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy(15,23): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](9,31): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](9,31): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](10,31): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](10,31): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](11,31): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](11,31): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](13,23): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](13,23): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](14,23): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](14,23): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](15,23): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+github-issue-4144.dfy[Q](15,23): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4483.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4483.dfy
new file mode 100644
index 00000000000..0de86ade3bd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4483.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+const TWO_TO_THE_64:  int := 0x1_00000000_00000000
+newtype uint64 = x: int | 0 <= x < TWO_TO_THE_64
+
+method Foo() returns (tuple: (uint64, uint64)) {
+  var s := [1,2,3];
+  var (foo, length) := (0, |s| as uint64);
+  return (foo, length);
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4483.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4483.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4804.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4804.dfy
new file mode 100644
index 00000000000..6516b3be1a8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4804.dfy
@@ -0,0 +1,27 @@
+// RUN: %exits-with 4 %verify --allow-axioms --resource-limit 1200 %s > %t
+// RUN: %diff "%s.expect" "%t"
+module Power {
+
+  opaque function Pow(b: int, e: nat): int
+    decreases e
+  {
+    if e == 0 then
+      1
+    else
+      b * Pow(b, e - 1)
+  }
+
+  /* Add exponents when multiplying powers with the same base. */
+  lemma LemmaPowAdds(b: int, e1: nat, e2: nat)
+    decreases e1
+    ensures Pow(b, e1 + e2) == Pow(b, e1) * Pow(b, e2)
+
+  lemma LemmaPowSubAddCancel(b: int, e1: nat, e2: nat)
+    decreases e1
+    requires e1 >= e2
+    ensures Pow(b, e1 - e2) * Pow(b, e2) == Pow(b, e1)
+  {
+    LemmaPowAdds(b, e1 - e2, e2);
+  }
+
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4804.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4804.dfy.expect
new file mode 100644
index 00000000000..18aaa834ec7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-4804.dfy.expect
@@ -0,0 +1,3 @@
+github-issue-4804.dfy(19,8): Error: Verification out of resource (Power.LemmaPowSubAddCancel)
+
+Dafny program verifier finished with 3 verified, 0 errors, 1 out of resource
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5029.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5029.dfy
new file mode 100644
index 00000000000..e3d1f409bf9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5029.dfy
@@ -0,0 +1,11 @@
+// RUN: %verify "%s" --warn-contradictory-assumptions
+abstract module Digit {
+  function BASE(): nat
+    ensures BASE() > 1
+
+  type digit = i: nat | 0 <= i < BASE()
+}
+
+module M refines Digit {
+    function BASE(): nat { 32 }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5029.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5029.dfy.expect
new file mode 100644
index 00000000000..79761448140
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5029.dfy.expect
@@ -0,0 +1 @@
+Dafny program verifier finished with 4 verified, 0 errors
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5814.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5814.dfy
new file mode 100644
index 00000000000..46ef58350c0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5814.dfy
@@ -0,0 +1,18 @@
+// RUN: %testDafnyForEachCompiler "%s"
+
+trait MyTrait<T> {
+  method Bar(ghost x: T, y: T) returns (z: T)
+}
+
+class MyClass extends MyTrait<int> {
+  constructor() {}
+  method Bar(ghost x: int, y: int) returns (z: int) {
+    return y;
+  }
+}
+
+method Main() {
+  var c := new MyClass();
+  var z := c.Bar(7, 42);
+  expect z == 42;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5814.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/github-issue-5814.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/DafnyModule1/DafnyModule1.go b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/DafnyModule1/DafnyModule1.go
new file mode 100644
index 00000000000..5a7cbef181d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/DafnyModule1/DafnyModule1.go
@@ -0,0 +1,57 @@
+// Package DafnyModule1
+// Dafny module DafnyModule1 compiled into Go
+
+package DafnyModule1
+
+import (
+	os "os"
+
+	_System "github.com/dafny-lang/DafnyRuntimeGo/v4/System_"
+	_dafny "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny"
+)
+
+var _ = os.Args
+var _ _dafny.Dummy__
+var _ _System.Dummy__
+
+type Dummy__ struct{}
+
+// Definition of class Default__
+type Default__ struct {
+	dummy byte
+}
+
+func New_Default___() *Default__ {
+	_this := Default__{}
+
+	return &_this
+}
+
+type CompanionStruct_Default___ struct {
+}
+
+var Companion_Default___ = CompanionStruct_Default___{}
+
+func (_this *Default__) Equals(other *Default__) bool {
+	return _this == other
+}
+
+func (_this *Default__) EqualsGeneric(x interface{}) bool {
+	other, ok := x.(*Default__)
+	return ok && _this.Equals(other)
+}
+
+func (*Default__) String() string {
+	return "DafnyModule1.Default__"
+}
+func (_this *Default__) ParentTraits_() []*_dafny.TraitID {
+	return [](*_dafny.TraitID){}
+}
+
+var _ _dafny.TraitOffspring = &Default__{}
+
+func (_static *CompanionStruct_Default___) HelloWorld() {
+	_dafny.Print(_dafny.UnicodeSeqOfUtf8Bytes("Hello World").VerbatimString(false))
+}
+
+// End of class Default__
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/go.mod b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/go.mod
new file mode 100644
index 00000000000..57a08d40f42
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/go.mod
@@ -0,0 +1,7 @@
+module GoModule1
+
+go 1.21
+
+require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.0.0-20231204230030-1d44519b5706
+
+replace github.com/dafny-lang/DafnyRuntimeGo/v4 v4.0.0-20231204230030-1d44519b5706 => ../DafnyRuntimeGo
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/go.sum b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/go.sum
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/test.go b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/test.go
new file mode 100644
index 00000000000..3c4daa57aa8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DafnyModule1/test.go
@@ -0,0 +1,15 @@
+// Dafny program helloworld.dfy compiled into Go
+package helloworld
+
+import (
+	DafnyModule1 "GoModule1/DafnyModule1"
+	os "os"
+
+	_System "github.com/dafny-lang/DafnyRuntimeGo/v4/System_"
+	_dafny "github.com/dafny-lang/DafnyRuntimeGo/v4/dafny"
+)
+
+var _ = os.Args
+var _ _dafny.Dummy__
+var _ _System.Dummy__
+var _ DafnyModule1.Dummy__
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DerivedModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DerivedModule.dfy
new file mode 100644
index 00000000000..b95ecb1d1b1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DerivedModule.dfy
@@ -0,0 +1,14 @@
+// RUN: %baredafny translate go  --go-module-name=GoModule2 --library="%S/test.doo" --translation-record "%S/test-go.dtr" --output "%S/test3" "%s"
+// RUN: %cp -rf "%S/go.mod" "%S/test3-go/go.mod"
+// RUN: %cp -rf "%S/go.sum" "%S/test3-go/go.sum"
+// RUN: %cp -rf "%S/../../../../../../../../../DafnyRuntime/DafnyRuntimeGo-gomod" "%S"
+// RUN: %cp -rf "%S/DafnyModule1" "%S/test3-go/"
+// RUN: go run -C %S/test3-go/ test3.go > %t
+// RUN: %diff "%s.expect" "%t"
+module DafnyModule3 {
+import DafnyModule1
+
+method Main() {
+        DafnyModule1.HelloWorld();
+}
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DerivedModule.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DerivedModule.dfy.expect
new file mode 100644
index 00000000000..5e1c309dae7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/DerivedModule.dfy.expect
@@ -0,0 +1 @@
+Hello World
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/dafnysource/helloworld.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/dafnysource/helloworld.dfy
new file mode 100644
index 00000000000..75e0ff227c4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/dafnysource/helloworld.dfy
@@ -0,0 +1,9 @@
+// This file is used to regenerate PythonModule1.doo
+// RUN: echo 'lit should ignore this file' 
+
+module DafnyModule1 {
+  method HelloWorld()
+  {
+    print "Hello World";
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/go.mod b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/go.mod
new file mode 100644
index 00000000000..26efbdd330b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/go.mod
@@ -0,0 +1,11 @@
+module GoModule2
+
+go 1.21
+
+require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.0.0-20231204230030-1d44519b5706
+        
+require GoModule1 v0.0.0
+
+replace github.com/dafny-lang/DafnyRuntimeGo/v4 v4.0.0-20231204230030-1d44519b5706 => ../DafnyRuntimeGo-gomod
+
+replace GoModule1 v0.0.0 => ./DafnyModule1
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/go.sum b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/go.sum
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/test-go.dtr b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/test-go.dtr
new file mode 100644
index 00000000000..d1ede936ebd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/test-go.dtr
@@ -0,0 +1,4 @@
+file_format_version = "1.0"
+dafny_version = "4.9.2.0"
+[options_by_module.DafnyModule1]
+go-module-name = "GoModule1"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/test.doo b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/test.doo
new file mode 100644
index 00000000000..10893813001
Binary files /dev/null and b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/multimodule/test.doo differ
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/go.mod b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/go.mod
new file mode 100644
index 00000000000..d7739bd404e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/go.mod
@@ -0,0 +1,5 @@
+module GoModule1
+
+go 1.21
+
+require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.8.0
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/go.sum b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/go.sum
new file mode 100644
index 00000000000..6303870c71b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/go.sum
@@ -0,0 +1,2 @@
+github.com/dafny-lang/DafnyRuntimeGo/v4 v4.8.0 h1:ttdCpTQKspK9A/tqE1qnipvjp9IrURS1kC2w47we6GM=
+github.com/dafny-lang/DafnyRuntimeGo/v4 v4.8.0/go.mod h1:l2Tm4N2DKuq3ljONC2vOATeM9PUpXbIc8SgXdwwqEto=
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/helloworld.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/helloworld.dfy
new file mode 100644
index 00000000000..5dd4410774a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/helloworld.dfy
@@ -0,0 +1,20 @@
+// This test consciously depends on the published version of the Go runtime
+// at https://github.com/dafny-lang/DafnyRuntimeGo/v4,
+// to ensure that copy works correctly.
+// The other tests use `replace` directives to test against the local copy.
+// That means if this test fails at some point because Dafny changes
+// its compilation output, it may be necessary to
+// publish a new tag on dafny-lang/DafnyRuntimeGo first before
+// this test can pass, much less a new version of Dafny released.
+
+// RUN: %baredafny translate go  --go-module-name=GoModule1 "%s" --output "%S/test"
+// RUN: %cp -rf "%S/go.mod" "%S/test-go/go.mod"
+// RUN: %cp -rf "%S/go.sum" "%S/test-go/go.sum"
+// RUN: go run -C %S/test-go/ test.go > %t
+// RUN: %diff "%s.expect" "%t"
+module DafnyModule1 {
+
+    method Main() {
+        print "Hello World";
+    }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/helloworld.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/helloworld.dfy.expect
new file mode 100644
index 00000000000..5e1c309dae7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/publishedruntime/helloworld.dfy.expect
@@ -0,0 +1 @@
+Hello World
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/go.mod b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/go.mod
new file mode 100644
index 00000000000..3d95a821d7b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/go.mod
@@ -0,0 +1,7 @@
+module GoModule1
+
+go 1.21
+
+require github.com/dafny-lang/DafnyRuntimeGo/v4 v4.0.0-20231204230030-1d44519b5706
+
+replace github.com/dafny-lang/DafnyRuntimeGo/v4 v4.0.0-20231204230030-1d44519b5706 => ../DafnyRuntimeGo-gomod
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/go.sum b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/go.sum
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/helloworld.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/helloworld.dfy
new file mode 100644
index 00000000000..07344c82f78
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/helloworld.dfy
@@ -0,0 +1,12 @@
+// RUN: %baredafny translate go  --go-module-name=GoModule1 "%s" --output "%S/test"
+// RUN: %cp -rf "%S/go.mod" "%S/test-go/go.mod"
+// RUN: %cp -rf "%S/go.sum" "%S/test-go/go.sum"
+// RUN: %cp -rf "%S/../../../../../../../../../../DafnyRuntime/DafnyRuntimeGo-gomod" "%S"
+// RUN: go run -C %S/test-go/ test.go > %t
+// RUN: %diff "%s.expect" "%t"
+module DafnyModule1 {
+
+    method Main() {
+        print "Hello World";
+    }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/helloworld.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/helloworld.dfy.expect
new file mode 100644
index 00000000000..5e1c309dae7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/gomodule/singlemodule/dafnysource/helloworld.dfy.expect
@@ -0,0 +1 @@
+Hello World
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Apply.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Apply.dfy
new file mode 100644
index 00000000000..a821bee5433
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Apply.dfy
@@ -0,0 +1,97 @@
+// RUN: %exits-with 4 %build --allow-axioms "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+
+method Apply(x : int) returns (i : int)
+  ensures i == x
+{
+  i := (x => x)(x);
+}
+
+function Const<A,B>(a : A) : B -> A {
+  b => a
+}
+
+method Test(m : map<int, int -> int -> int>)
+{
+  assume forall i :: i in m;
+  assume forall i, x :: m[i].requires(x);
+  assume forall i, x, y :: m[i](x).requires(y);
+  assume m[1](2)(3) > 5;
+  assert ((m[1])(2))(3) > 4;
+}
+
+method Main() {
+  assert forall x : int, y : int :: Const(x)(y) == (Const(x))(y);
+  assert (a => b => a) == (u : int) => (v : int) => u;
+}
+
+class Cell {
+  var data: int
+}
+
+method AllocationTest(oldcell: Cell)
+  requires oldcell.data == 48
+{
+  var y := new Cell;
+  y.data := 45;
+  var f := () reads y => y.data;
+  assert f() == 45;
+
+  var z := new Cell;
+  var g := () => if y == z then 30 else 45;
+  assert g() == 45;
+
+  if * {
+    ghost var d := old(f());  // error: f, which has a reads clause, is not available in old
+  } else {
+    ghost var e := old(g());  // fine, since g has no reads clause, it is known to produce the same value in any state
+    assert e == g();
+  }
+
+  var j := (c: Cell, b) => if b then c else oldcell;
+  var k := (c: Cell?, b) reads c, oldcell requires b ==> c != null => (if b then c else oldcell).data;
+  var b := *;
+  if {
+    case true =>  assert j(y, b).data < 50;
+    case true =>  assert old(j(y, false).data) == 48;  // error: argument y is not allocated in old state
+    case true =>  assert old(j(y, true).data) == 45;  // error: argument y is not allocated in old state
+    case true =>  assert old(j(oldcell, b).data) == 48;
+    case true =>  assert old(k(oldcell, b)) == 48;
+    case true =>  assert old(k(y, b)) < 50;  // error: argument y is not allocated in old state
+  }
+}
+
+module TwoStateFunctions {
+  method Apply(ghost f: int -> int, x: int) returns (ghost y: int)
+    ensures y == f(x)
+  {
+    y := f(x);
+  }
+
+  class Cell {
+    var data: int
+
+    twostate function F(x: int): int {
+      old(data) + x
+    }
+  }
+
+  method Caller(c: Cell)
+    requires c.data == 9
+    modifies c
+  {
+    c.data := c.data + 1;
+    label L:
+    assert c.F(11) == 20;
+
+    var y := Apply(c.F, 11);
+    assert y == 20;
+
+    assert c.F@L(11) == 21;
+    y := Apply(u => c.F@L(u), 11);
+    assert y == 21;
+
+    assert c.F(100) == 0; // error
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Apply.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Apply.dfy.expect
new file mode 100644
index 00000000000..1a63b6a43da
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Apply.dfy.expect
@@ -0,0 +1,7 @@
+Apply.dfy(95,4): Error: assertion might not hold
+Apply.dfy(46,23): Error: function could not be proved to be allocated in the state in which the function is invoked
+Apply.dfy(57,31): Error: argument could not be proved to be allocated in the state in which the function is invoked
+Apply.dfy(58,31): Error: argument could not be proved to be allocated in the state in which the function is invoked
+Apply.dfy(61,31): Error: argument could not be proved to be allocated in the state in which the function is invoked
+
+Dafny program verifier finished with 7 verified, 5 errors
diff --git a/Test/hofs/ArrowTypeOptimizations.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ArrowTypeOptimizations.dfy
similarity index 93%
rename from Test/hofs/ArrowTypeOptimizations.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ArrowTypeOptimizations.dfy
index 93cf7e4d1da..7b12a4452d7 100644
--- a/Test/hofs/ArrowTypeOptimizations.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ArrowTypeOptimizations.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /tracePOs "%s" > "%t"
+// RUN: %exits-with 4 %verify --isolate-assertions --cores 1 "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // These tests make sure that the built-in arrow types are taken into account when
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ArrowTypeOptimizations.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ArrowTypeOptimizations.dfy.expect
new file mode 100644
index 00000000000..a360a1d34af
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ArrowTypeOptimizations.dfy.expect
@@ -0,0 +1,5 @@
+ArrowTypeOptimizations.dfy(10,2): Error: function precondition could not be proved
+ArrowTypeOptimizations.dfy(10,2): Error: insufficient reads clause to invoke function
+ArrowTypeOptimizations.dfy(16,2): Error: function precondition could not be proved
+
+Dafny program verifier finished with 10 verified, 3 errors
diff --git a/Test/hofs/Classes.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Classes.dfy
similarity index 92%
rename from Test/hofs/Classes.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Classes.dfy
index 0d42448c01d..3907a51444e 100644
--- a/Test/hofs/Classes.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Classes.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
+// RUN: %exits-with 4 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 
@@ -11,7 +11,7 @@ class C {
 
 method K() {
   var f := C.Static;
-  var o : object?;
+  var o : object? := *;
   assert o !in f.reads();
   assert f.requires();
   assert f();
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Classes.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Classes.dfy.expect
new file mode 100644
index 00000000000..067d7a0f32f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Classes.dfy.expect
@@ -0,0 +1,4 @@
+Classes.dfy(33,17): Error: function precondition could not be proved
+Classes.dfy(60,2): Error: assertion might not hold
+
+Dafny program verifier finished with 4 verified, 2 errors
diff --git a/Test/hofs/Compilation.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Compilation.dfy
similarity index 91%
rename from Test/hofs/Compilation.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Compilation.dfy
index 7e9c674b495..8da764558d2 100644
--- a/Test/hofs/Compilation.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Compilation.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 class Ref<A> {
   var val : A
diff --git a/Test/hofs/Compilation.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Compilation.dfy.expect
similarity index 100%
rename from Test/hofs/Compilation.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Compilation.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Compilation.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Compilation.dfy.rs.check
new file mode 100644
index 00000000000..d3aeb8ed7e9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Compilation.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `dyn for<'a> Fn(&'a DafnyInt) -> DafnyInt: Default` is not satisfied
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Consequence.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Consequence.dfy
new file mode 100644
index 00000000000..e09a5318bbe
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Consequence.dfy
@@ -0,0 +1,10 @@
+// RUN: %verify --relax-definite-assignment --allow-axioms "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype Nat = x | 0 <= x
+
+method Check() {
+  var f : Nat -> Nat;
+  assume f.requires(0);
+  var i : Nat := f(0);
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Consequence.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Consequence.dfy.expect
new file mode 100644
index 00000000000..ebe2328e072
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Consequence.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/hofs/Field.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Field.dfy
similarity index 82%
rename from Test/hofs/Field.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Field.dfy
index 92c25d29bd5..b06afa42416 100644
--- a/Test/hofs/Field.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Field.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // calling fields should not make a resolution error:
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Field.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Field.dfy.expect
new file mode 100644
index 00000000000..ae5a833a8e0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Field.dfy.expect
@@ -0,0 +1,6 @@
+Field.dfy(12,2): Error: assertion might not hold
+Field.dfy(12,11): Error: function precondition could not be proved
+Field.dfy(21,2): Error: assertion might not hold
+Field.dfy(21,11): Error: function precondition could not be proved
+
+Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Test/hofs/Fold.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Fold.dfy
similarity index 88%
rename from Test/hofs/Fold.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Fold.dfy
index 96ddb01591f..df5806981e4 100644
--- a/Test/hofs/Fold.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Fold.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype List<A> = Nil | Cons(A,List<A>)
 
diff --git a/Test/hofs/Fold.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Fold.dfy.expect
similarity index 100%
rename from Test/hofs/Fold.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Fold.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Fold.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Fold.dfy.rs.check
new file mode 100644
index 00000000000..e8341277b48
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Fold.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `dyn for<'a, 'b> Fn(&'a Rc<Expr>, &'b Rc<Expr>) -> Rc<Expr>: Default` is not satisfied
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Folding.legacy.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Folding.legacy.dfy
new file mode 100644
index 00000000000..6d02b76062a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Folding.legacy.dfy
@@ -0,0 +1,254 @@
+// NONUNIFORM: /induction:3 not supported by new CLI
+// RUN: %dafny /compile:3 /induction:3 "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Specifications and proofs involving foldr (inspired by Liquid Haskell) and foldl
+// Rustan Leino
+// 13 April 2016
+
+method Main() {
+  var xs := SeqToList([57, 100, -34, 1, 8]);
+  var r := foldr((a,b) => 2*a + b, 0, xs);
+  var l := foldl((b,a) => b + 2*a, 0, xs);
+  print "xs = ", xs, "\n";
+  print "foldr = ", r, "\n";
+  print "foldl = ", l, "\n";
+  print "length = ", length(xs), "\n";
+  print "foldr inc = ", foldr((_,b) => b+1, 0, xs), "\n";
+  print "foldl inc = ", foldl((b,_) => b + 1, 0, xs), "\n";
+}
+
+// ----- standard definitions ----------
+
+datatype List<T> = Nil | Cons(T, List<T>)
+
+function length(xs: List): nat
+{
+  match xs
+  case Nil => 0
+  case Cons(_, tail) => 1 + length(tail)
+}
+
+function SeqToList(s: seq): List
+{
+  if s == [] then Nil else Cons(s[0], SeqToList(s[1..]))
+}
+
+// ----- foldr ----------
+
+function foldr<A,B>(f: (A,B) -> B, b: B, xs: List<A>): B
+{
+  match xs
+  case Nil => b
+  case Cons(head, tail) => f(head, foldr(f, b, tail))
+}
+
+// The following predicate says that "inv" is invariant under "stp".
+// "stp" is really just a relational version of the function "f" passed to fold.
+ghost predicate InvR<A(!new),B(!new)>(inv: (List<A>,B) -> bool, stp: (A,B,B) -> bool)
+{
+  forall x, xs, b, b' ::
+    inv(xs, b) && stp(x, b, b') ==> inv(Cons(x, xs), b')
+}
+
+lemma FoldR_Property<A(!new),B(!new)>(inv: (List<A>,B) -> bool, stp: (A,B,B) -> bool, f: (A,B) -> B, b: B, xs: List<A>)
+  requires InvR(inv, stp)
+  requires forall a,b :: stp(a, b, f(a,b))
+  requires inv(Nil, b)
+  ensures inv(xs, foldr(f, b, xs))
+{
+  // Note:  Dafny is able to complete this whole proof automatically, so the following lines can all be erased.
+  match xs
+  case Nil =>
+    // by the precondition
+  case Cons(head, tail) =>
+    var b' := foldr(f, b, tail);
+    calc {
+      true;
+    ==>  // by the precondition that mentions "stp"
+      stp(head, b', f(head, b'));
+    ==>  // by the induction hypothesis invoked as FoldR_Property(inv, stp, f, b, tail)
+      inv(tail, b') && stp(head, b', f(head, b'));
+    ==>  // by InvR(inv, stp)
+      inv(Cons(head, tail), f(head, b'));
+    }
+}
+
+lemma FoldR_Property_ShortProof<A(!new),B(!new)>(inv: (List<A>,B) -> bool, stp: (A,B,B) -> bool, f: (A,B) -> B, b: B, xs: List<A>)
+  requires InvR(inv, stp)
+  requires forall a,b :: stp(a, b, f(a,b))
+  requires inv(Nil, b)
+  ensures inv(xs, foldr(f, b, xs))
+{
+}
+
+method FoldR_Use(xs: List<int>)
+{
+  var f := (a,b) => 2*a + 3*b;
+  var r := foldr(f, 0, xs);
+  ghost var inv := (xs,b) => b % 2 == 0;
+  ghost var stp := (a,b,b') => b % 2 == 0 ==> b' % 2 == 0;
+  FoldR_Property(inv, stp, f, 0, xs);
+  assert r % 2 == 0;
+}
+
+// The (inv,stp) method of proof above is general, in the sense that it can be instantiated with (inv,stp).
+// For a particular function, like F23, one can also prove a lemma about foldr directly.
+function F23(a: int, b: int): int {
+  2*a + 3*b
+}
+
+lemma FoldR_F23(xs: List<int>)
+  ensures foldr(F23, 0, xs) % 2 == 0
+{
+  // Note: With Z3 v.4.8.4, this proof had been automatic.
+  // With Z3 v.4.8.9, the following empty match structure is needed.
+  match xs
+  case Nil =>
+  case Cons(head, tail) =>
+}
+
+// In fact, it's also possible to write this lemma in an inline assertion.
+method FoldR_Use_Direct(xs: List<int>)
+{
+  var r := foldr(F23, 0, xs);
+  assert forall ys :: foldr(F23, 0, ys) % 2 == 0;
+  assert r % 2 == 0;
+}
+
+method FoldR_Use_Direct_lambda(xs: List<int>)
+{
+  var f := (a,b) => 2*a + 3*b;
+  var r := foldr(f, 0, xs);
+  assert forall ys :: foldr(f, 0, ys) % 2 == 0;
+  assert r % 2 == 0;
+}
+
+// It is not necessary to use the relation "stp".  Instead, the function "f" can be used directly.
+lemma FoldR_Property_inv_f<A,B>(inv: (List<A>,B) -> bool, f: (A,B) -> B, b: B, xs: List<A>)
+  requires forall x, xs, b :: inv(xs, b) ==> inv(Cons(x, xs), f(x, b))
+  requires inv(Nil, b)
+  ensures inv(xs, foldr(f, b, xs))
+{
+}
+
+// Here's another use of the proof technique, showing that folding (+1) over a list gives its length.
+lemma FoldingIncR(xs: List<int>)
+  ensures foldr((_,b) => b + 1, 0, xs) == length(xs)
+{
+  FoldR_Property_inv_f((xs,b) => b == length(xs), (_,b) => b + 1, 0, xs);
+}
+
+// ----- foldl ----------
+
+function foldl<A,B>(f: (B,A) -> B, b: B, xs: List<A>): B
+{
+  match xs
+  case Nil => b
+  case Cons(head, tail) => foldl(f, f(b, head), tail)
+}
+
+// InvL is like InvR above, but the implication goes from larger lists to smaller ones (which is
+// in the opposite direction from in InvR).
+ghost predicate InvL<A(!new),B(!new)>(inv: (B,List<A>) -> bool, stp: (B,A,B) -> bool)
+{
+  forall x, xs, b, b' ::
+    inv(b, Cons(x, xs)) && stp(b, x, b') ==> inv(b', xs)
+}
+
+// This is the analogous lemma to FoldR_Property above.  But instead of proving
+//     inv(Nil, b) ==> inv(xs, foldr(f, b, xs))
+// this lemma proves
+//     inv(b, xs) ==> inv(foldl(f, b, xs), Nil)
+lemma FoldL_Property<A(!new),B(!new)>(inv: (B,List<A>) -> bool, stp: (B,A,B) -> bool, f: (B,A) -> B, b: B, xs: List<A>)
+  requires InvL(inv, stp)
+  requires forall b,a :: stp(b, a, f(b, a))
+  requires inv(b, xs)
+  ensures inv(foldl(f, b, xs), Nil)
+{
+  // Note:  In this case to complete the proof, Dafny needs the call to the induction hypothesis below, but
+  // the rest of the calculation can be omitted.
+  match xs
+  case Nil =>
+    // vacuous
+  case Cons(head, tail) =>
+    calc {
+      true;
+    ==>  // by the precondition
+      inv(b, Cons(head, tail));
+    ==>  // by the precondition that mentions "stp"
+      inv(b, Cons(head, tail)) && stp(b, head, f(b, head));
+    ==>  // by InvLeft(inv, stp)
+      inv(f(b, head), tail);
+    ==>  { FoldL_Property(inv, stp, f, f(b, head), tail); }  // induction hypothesis
+      inv(foldl(f, f(b, head), tail), Nil);
+    }
+}
+
+lemma FoldL_Use(xs: List<int>)
+{
+  var f := (b,a) => 3*b + 2*a;
+  var l := foldl(f, 0, xs);
+  ghost var inv := (b,xs) => b % 2 == 0;
+  ghost var stp := (b,a,b') => b % 2 == 0 ==> b' % 2 == 0;
+  FoldL_Property(inv, stp, f, 0, xs);
+  assert l % 2 == 0;
+}
+
+// Here is FoldL_Property again, but this time with "f" instead of "stp".
+lemma FoldL_Property_inv_f<A,B>(inv: (B,List<A>) -> bool, f: (B,A) -> B, b: B, xs: List<A>)
+  requires forall x, xs, b :: inv(b, Cons(x, xs)) ==> inv(f(b, x), xs)
+  requires inv(b, xs)
+  ensures inv(foldl(f, b, xs), Nil)
+{
+  // the rest of the calculation can be omitted.
+  match xs
+  case Nil =>
+  case Cons(head, tail) =>
+    calc {
+      true;
+    ==>  // by the precondition
+      inv(b, Cons(head, tail));
+    ==>  // by the inductive property of "inv"
+      inv(f(b, head), tail);
+    ==>  { FoldL_Property_inv_f(inv, f, f(b, head), tail); }  // induction hypothesis
+      inv(foldl(f, f(b, head), tail), Nil);
+    }
+}
+
+// And as in the case of foldr, one can also use a specialized lemma for a particular function to be folded.
+function F32(b: int, a: int): int
+{
+  3*b + 2*a
+}
+
+lemma FoldL_F32(xs: List<int>, b: int)
+  requires b % 2 == 0
+  ensures foldl(F32, b, xs) % 2 == 0
+{
+}
+
+method FoldL_Use_Direct(xs: List<int>)
+{
+  var r := foldl(F32, 0, xs);
+  assert forall ys,b :: b % 2 == 0 ==> foldl(F32, b, ys) % 2 == 0;
+  assert r % 2 == 0;
+}
+
+method {:isolate_assertions} FoldL_Use_Direct_lambda(xs: List<int>)
+{
+  var f := (b,a) => 3*b + 2*a;
+  var r := foldl(f, 0, xs);
+  assert forall ys,b :: b % 2 == 0 ==> foldl(f, b, ys) % 2 == 0;
+  assert r % 2 == 0;
+}
+
+// Here is a proof that foldl on (+1) gives the length.
+lemma FoldingIncL(xs: List<int>)
+  ensures foldl((b,_) => b + 1, 0, xs) == length(xs)
+{
+  var inv := (b,ys) => b + length(ys) == length(xs);
+  var inc := (b,_) => b + 1;
+  var r := foldl(inc, 0, xs);
+  FoldL_Property_inv_f(inv, inc, 0, xs);
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Folding.legacy.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Folding.legacy.dfy.expect
new file mode 100644
index 00000000000..3c54825147c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Folding.legacy.dfy.expect
@@ -0,0 +1,9 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 21 verified, 0 errors
+xs = List.Cons(57, List.Cons(100, List.Cons(-34, List.Cons(1, List.Cons(8, List.Nil)))))
+foldr = 264
+foldl = 264
+length = 5
+foldr inc = 5
+foldl inc = 5
diff --git a/Test/hofs/Frame.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Frame.dfy
similarity index 95%
rename from Test/hofs/Frame.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Frame.dfy
index fa794545a65..f7749eba5fe 100644
--- a/Test/hofs/Frame.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Frame.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /deprecation:0 /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation
+
 
 
 class C { var u : int; }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Frame.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Frame.dfy.expect
new file mode 100644
index 00000000000..8621a4760df
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Frame.dfy.expect
@@ -0,0 +1,9 @@
+Frame.dfy(23,4): Error: assertion might not hold
+Frame.dfy(37,2): Error: assertion might not hold
+Frame.dfy(63,4): Error: assertion might not hold
+Frame.dfy(66,18): Error: insufficient reads clause to read array element; Consider extracting a[0] to a local variable before the lambda expression, or adding 'reads a' in the enclosing lambda specification for resolution
+Frame.dfy(68,27): Error: insufficient reads clause to read array element; Consider adding 'reads a' in the enclosing lambda specification for resolution
+Frame.dfy(120,22): Error: function precondition could not be proved
+Frame.dfy(123,6): Error: assertion might not hold
+
+Dafny program verifier finished with 6 verified, 7 errors
diff --git a/Test/hofs/Lambda.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Lambda.dfy
similarity index 92%
rename from Test/hofs/Lambda.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Lambda.dfy
index 0cb50233ca5..913256a78ac 100644
--- a/Test/hofs/Lambda.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Lambda.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 
 method M<A>() {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Lambda.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Lambda.dfy.expect
new file mode 100644
index 00000000000..43b329ad805
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Lambda.dfy.expect
@@ -0,0 +1,3 @@
+Lambda.dfy(24,4): Error: assertion might not hold
+
+Dafny program verifier finished with 3 verified, 1 error
diff --git a/Test/hofs/LambdaParsefail.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/LambdaParsefail.dfy
similarity index 81%
rename from Test/hofs/LambdaParsefail.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/LambdaParsefail.dfy
index 673652c57df..d16005a5e1a 100644
--- a/Test/hofs/LambdaParsefail.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/LambdaParsefail.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 method Fails() { // all these fail
     var g1 := x.x => x;
diff --git a/Test/hofs/LambdaParsefail.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/LambdaParsefail.dfy.expect
similarity index 100%
rename from Test/hofs/LambdaParsefail.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/LambdaParsefail.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/LambdaParsefail2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/LambdaParsefail2.dfy
new file mode 100644
index 00000000000..cf315be3b69
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/LambdaParsefail2.dfy
@@ -0,0 +1,8 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+
+method Fail2() {
+    var g4 := (x, y : A) => (y, x : B); // RHS should fail!
+}
+
diff --git a/Test/hofs/LambdaParsefail2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/LambdaParsefail2.dfy.expect
similarity index 100%
rename from Test/hofs/LambdaParsefail2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/LambdaParsefail2.dfy.expect
diff --git a/Test/hofs/Monads.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Monads.dfy
similarity index 98%
rename from Test/hofs/Monads.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Monads.dfy
index da8baedd46f..9e06834dea3 100644
--- a/Test/hofs/Monads.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Monads.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 abstract module Monad {
   type M<A>
diff --git a/Test/dafny0/ForallCompilation.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Monads.dfy.expect
similarity index 100%
rename from Test/dafny0/ForallCompilation.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Monads.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/MutableField.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/MutableField.dfy
new file mode 100644
index 00000000000..7bd0450a0f0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/MutableField.dfy
@@ -0,0 +1,15 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+
+class C {
+  function f(x : int) : int { x }
+
+  var g : int -> int
+
+  method M() modifies this
+  {
+    f := g; // not ok
+  }
+}
+
diff --git a/Test/hofs/MutableField.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/MutableField.dfy.expect
similarity index 100%
rename from Test/hofs/MutableField.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/MutableField.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Naked.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Naked.dfy
new file mode 100644
index 00000000000..cdafe1d123d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Naked.dfy
@@ -0,0 +1,70 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module Functions {
+  ghost function f(x: nat): nat
+  {
+    if x == 0 then 0 else
+    if var b: bool :| true; b then
+      var h := f;
+      h(x-1)
+    else
+      (f)(x-1)
+  }
+
+  ghost function f1(x: nat): nat { if x == 0 then 0 else f2(x - 1) }
+
+  ghost function f2(x: nat): nat { if x == 0 then 0 else (f1)(x - 1) }
+}
+
+module Requires {
+  ghost function t(x: nat): nat
+    requires !t.requires(x)  // error: use of naked function in its own SCC
+  { x }
+
+  ghost function g(x: nat): nat
+    requires !(g).requires(x)  // error: use of naked function in its own SCC
+  { x }
+
+  ghost function D(x: int): int  // used so termination errors don't mask other errors
+  ghost function g2(x: int): int decreases D(x) { h(x) }
+  ghost function h(x: int): int
+    requires !g2.requires(x)  // error: use of naked function in its own SCC
+  { x }
+}
+
+module Reads {
+  ghost function t(x: nat): nat
+    reads t.reads(x)
+  { x }
+
+  ghost function g(x: nat): nat
+    reads (g).reads(x)
+  { x }
+
+  ghost function g2(x: int): int
+  { h(x) }
+
+  ghost function h(x: int): int
+    reads g2.reads(x)
+  { x }
+}
+
+module ReadsGenerics {
+  class Cl<A> {
+    ghost function t<B>(a: A, b: B): (A, B)
+      reads t.reads(a, b)
+    { (a, b) }
+
+    ghost function g<B>(a: A, b: B): (A, B)
+      reads (g).reads(a, b)
+    { (a, b) }
+
+    ghost function g2<B>(a: A, b: B): (A, B)
+    { h(a, b) }
+
+    ghost function h<B>(a: A, b: B): (A, B)
+      reads g2.reads(a, b)
+    { (a, b) }
+  }
+}
diff --git a/Test/hofs/Naked.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Naked.dfy.expect
similarity index 80%
rename from Test/hofs/Naked.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Naked.dfy.expect
index f546a6dc553..4a32660e2e4 100644
--- a/Test/hofs/Naked.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Naked.dfy.expect
@@ -3,16 +3,11 @@ Naked.dfy(12,7): Error: cannot use naked function in recursive setting. Possible
 Naked.dfy(17,58): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
 Naked.dfy(22,14): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
 Naked.dfy(26,15): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
-Naked.dfy(30,50): Error: function precondition could not be proved
-Naked.dfy(32,13): Related location
 Naked.dfy(32,14): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
 Naked.dfy(38,10): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
 Naked.dfy(42,11): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
-Naked.dfy(46,4): Error: cannot prove termination; try supplying a decreases clause
 Naked.dfy(49,10): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
 Naked.dfy(56,12): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
 Naked.dfy(60,13): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
 Naked.dfy(67,12): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
-Naked.dfy(102,20): Error: assertion could not be proved
-
-Dafny program verifier finished with 5 verified, 15 errors
+12 resolution/type errors detected in Naked.dfy
diff --git a/Test/hofs/ReadsReads.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReads.dfy
similarity index 95%
rename from Test/hofs/ReadsReads.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReads.dfy
index 6e4c43eca6a..43e62d7999f 100644
--- a/Test/hofs/ReadsReads.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReads.dfy
@@ -1,26 +1,30 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 module ReadsRequiresReads {
   ghost function MyReadsOk<A,B>(f : A ~> B, a : A) : set<object?>
+    requires f.requires(a)
     reads f.reads(a)
   {
     f.reads(a)
   }
 
   ghost function MyReadsOk2<A,B>(f : A ~> B, a : A) : set<object?>
+    requires f.requires(a)
     reads f.reads(a)
   {
     (f.reads)(a)
   }
 
   ghost function MyReadsOk3<A,B>(f : A ~> B, a : A) : set<object?>
+    requires (f.requires)(a)
     reads (f.reads)(a)
   {
     f.reads(a)
   }
 
   ghost function MyReadsOk4<A,B>(f : A ~> B, a : A) : set<object?>
+    requires (f.requires)(a)
     reads (f.reads)(a)
   {
     (f.reads)(a)
@@ -37,6 +41,7 @@ module ReadsRequiresReads {
   }
 
   ghost function MyReadsOk'<A,B>(f : A ~> B, a : A, o : object) : bool
+    requires f.requires(a)
     reads f.reads(a)
   {
     o in f.reads(a)
@@ -48,6 +53,7 @@ module ReadsRequiresReads {
   }
 
   ghost function MyRequiresOk<A,B>(f : A ~> B, a : A) : bool
+    requires f.requires(a)
     reads f.reads(a)
   {
     f.requires(a)
@@ -134,7 +140,7 @@ module ReadsAll {
 }
 
 module ReadsOnFunctions {
-  lemma Requires_Reads_What_Function_Reads(f: int ~> int)
+  lemma Requires_Reads_What_Function_Reads(f: int ~> int) requires f.requires(10)
   {
     var g := f.requires;
     assert g.reads(10) == f.reads(10);
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReads.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReads.dfy.expect
new file mode 100644
index 00000000000..7f67349bb47
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReads.dfy.expect
@@ -0,0 +1,21 @@
+ReadsReads.dfy(35,11): Error: function precondition could not be proved
+ReadsReads.dfy(35,11): Error: insufficient reads clause to invoke function
+ReadsReads.dfy(40,4): Error: function precondition could not be proved
+ReadsReads.dfy(40,4): Error: insufficient reads clause to invoke function
+ReadsReads.dfy(52,16): Error: function precondition could not be proved
+ReadsReads.dfy(52,16): Error: insufficient reads clause to invoke function
+ReadsReads.dfy(64,14): Error: insufficient reads clause to invoke function
+ReadsReads.dfy(93,18): Error: assertion might not hold
+ReadsReads.dfy(95,18): Error: assertion might not hold
+ReadsReads.dfy(105,18): Error: assertion might not hold
+ReadsReads.dfy(107,18): Error: assertion might not hold
+ReadsReads.dfy(179,4): Error: assertion might not hold
+ReadsReads.dfy(189,4): Error: assertion might not hold
+ReadsReads.dfy(199,4): Error: assertion might not hold
+ReadsReads.dfy(209,4): Error: assertion might not hold
+ReadsReads.dfy(242,4): Error: assertion might not hold
+ReadsReads.dfy(252,4): Error: assertion might not hold
+ReadsReads.dfy(262,4): Error: assertion might not hold
+ReadsReads.dfy(272,4): Error: assertion might not hold
+
+Dafny program verifier finished with 16 verified, 19 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReadsOnMethods.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReadsOnMethods.dfy
new file mode 100644
index 00000000000..14e9e47ad8f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReadsOnMethods.dfy
@@ -0,0 +1,105 @@
+// RUN: %exits-with 4 %build --reads-clauses-on-methods "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Clone of ReadsReads.dfy but using methods instead of functions
+
+module ReadsRequiresReads {
+  ghost method MyReadsOk<A,B>(f : A ~> B, a : A) returns (r: set<object?>)
+    requires f.requires(a) reads f.reads(a)
+  {
+    r := f.reads(a);
+  }
+
+  ghost method MyReadsOk2<A,B>(f : A ~> B, a : A) returns (r: set<object?>)
+    requires f.requires(a)
+    reads f.reads(a)
+  {
+    r := (f.reads)(a);
+  }
+
+  ghost method MyReadsOk3<A,B>(f : A ~> B, a : A) returns (r: set<object?>)
+    requires (f.requires)(a)
+    reads (f.reads)(a)
+  {
+    r := f.reads(a);
+  }
+
+  ghost method MyReadsOk4<A,B>(f : A ~> B, a : A) returns (r: set<object?>)
+    requires (f.requires)(a)
+    reads (f.reads)(a)
+  {
+    r := (f.reads)(a);
+  }
+
+  ghost method MyReadsBad<A,B>(f : A ~> B, a : A) returns (r: set<object?>)
+    reads {}
+  {
+    r := f.reads(a);  // error: MyReadsBad does not have permission to read what f.reads(a) reads
+  }
+
+  ghost method MyReadsBad2<A,B>(f : A ~> B, a : A) returns (r: set<object?>)
+    reads {}
+  {
+    r := (f.reads)(a);  // error (x2): MyReadsBad2 does not have permission to read what f.reads(a) reads, function precondition cannot be proved
+  }
+
+  ghost method MyReadsOk'<A,B>(f : A ~> B, a : A, o : object) returns (r: bool)
+    requires f.requires(a) reads f.reads(a)
+  {
+    r := o in f.reads(a);
+  }
+
+  ghost method MyReadsBad'<A,B>(f : A ~> B, a : A, o : object) returns (r: bool)
+    reads {}
+  {
+    r := o in f.reads(a);  // error: MyReadsBad' does not have permission to read what f.reads(a) reads
+  }
+
+  ghost method MyRequiresOk<A,B>(f : A ~> B, a : A) returns (r: bool)
+    requires f.requires(a) reads f.reads(a)
+  {
+    r := f.requires(a);
+  }
+
+  ghost method MyRequiresBad<A,B>(f : A ~> B, a : A) returns (r: bool)
+    reads {}
+  {
+    r := f.requires(a);  // error: MyRequiresBad does not have permission to read what f.requires(a) reads
+  }
+}
+
+// WhatWeKnowAboutReads not that applicable since we don't have method references as first class values
+
+module ReadsAll {
+  ghost method A(f: int ~> int) returns (r: int)
+    reads set x,o | o in f.reads(x) :: o  // note, with "set o,x ..." instead, Dafny complains (this is perhaps less than ideal)
+    requires forall x :: f.requires(x)
+  {
+    return f(0) + f(1) + f(2);
+  }
+
+  method B(f: int ~> int) returns (r: int)
+    reads set x,o | o in f.reads(x) :: o  // note, with "set o,x ..." instead, Dafny complains (this is perhaps less than ideal)
+    requires forall x :: f.requires(x)
+  {
+    return f(0) + f(1) + f(2);
+  }
+
+  ghost method C(f: int ~> int) returns (r: int)
+    reads f.reads
+    requires forall x :: f.requires(x)
+  {
+    return f(0) + f(1) + f(2);
+  }
+
+  method D(f: int ~> int) returns (r: int)
+    reads f.reads
+    requires forall x :: f.requires(x)
+  {
+    return f(0) + f(1) + f(2);
+  }
+}
+
+// ReadsOnFunctions not relevant
+// FuncCollectionRegressions not relevant since we're not using method reads clauses
+// in a similar way (yet :)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReadsOnMethods.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReadsOnMethods.dfy.expect
new file mode 100644
index 00000000000..9451b494e11
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ReadsReadsOnMethods.dfy.expect
@@ -0,0 +1,9 @@
+ReadsReadsOnMethods.dfy(37,16): Error: function precondition could not be proved
+ReadsReadsOnMethods.dfy(37,16): Error: insufficient reads clause to invoke function
+ReadsReadsOnMethods.dfy(43,9): Error: function precondition could not be proved
+ReadsReadsOnMethods.dfy(43,9): Error: insufficient reads clause to invoke function
+ReadsReadsOnMethods.dfy(55,21): Error: function precondition could not be proved
+ReadsReadsOnMethods.dfy(55,21): Error: insufficient reads clause to invoke function
+ReadsReadsOnMethods.dfy(67,19): Error: insufficient reads clause to invoke function
+
+Dafny program verifier finished with 20 verified, 7 errors
diff --git a/Test/hofs/Renaming.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Renaming.dfy
similarity index 87%
rename from Test/hofs/Renaming.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Renaming.dfy
index 391c0e79ef6..54e811deea2 100644
--- a/Test/hofs/Renaming.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Renaming.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 function OnId(f : (bool -> bool) -> int) : int
   reads f.reads(x => x)
diff --git a/Test/hofs/Renaming.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Renaming.dfy.expect
similarity index 100%
rename from Test/hofs/Renaming.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Renaming.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Renaming.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Renaming.dfy.rs.check
new file mode 100644
index 00000000000..1bbaea9d839
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Renaming.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0631]: type mismatch in closure arguments
\ No newline at end of file
diff --git a/Test/hofs/Requires.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Requires.dfy
similarity index 93%
rename from Test/hofs/Requires.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Requires.dfy
index f5e51244184..9c84bbee6c1 100644
--- a/Test/hofs/Requires.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Requires.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 method Main()
 {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Requires.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Requires.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Test/hofs/ResolveError.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ResolveError.dfy
similarity index 97%
rename from Test/hofs/ResolveError.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ResolveError.dfy
index 2d459ea6681..203be075837 100644
--- a/Test/hofs/ResolveError.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ResolveError.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Tests {
diff --git a/Test/hofs/ResolveError.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ResolveError.dfy.expect
similarity index 89%
rename from Test/hofs/ResolveError.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ResolveError.dfy.expect
index e18c002572f..7379abb83e0 100644
--- a/Test/hofs/ResolveError.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/ResolveError.dfy.expect
@@ -5,9 +5,9 @@ ResolveError.dfy(32,12): Error: wrong number of arguments (got 2, but function t
 ResolveError.dfy(36,21): Error: wrong number of arguments (got 2, but function 'requires' expects 1: (x0: T0))
 ResolveError.dfy(39,18): Error: wrong number of arguments (got 2, but function 'reads' expects 1: (x0: T0))
 ResolveError.dfy(31,16): Error: arguments must have comparable types (got int and bool)
-ResolveError.dfy(33,12): Error: incorrect argument type for function application parameter (expected int, found bool)
-ResolveError.dfy(34,21): Error: incorrect argument type for function parameter 'x0' (expected int, found bool)
-ResolveError.dfy(37,18): Error: incorrect argument type for function parameter 'x0' (expected int, found bool)
+ResolveError.dfy(33,13): Error: incorrect argument type for function application parameter (expected int, found bool)
+ResolveError.dfy(34,22): Error: incorrect argument type for function parameter 'x0' (expected int, found bool)
+ResolveError.dfy(37,19): Error: incorrect argument type for function parameter 'x0' (expected int, found bool)
 ResolveError.dfy(35,25): Error: arguments must have comparable types (got bool and int)
 ResolveError.dfy(38,22): Error: arguments must have comparable types (got set<object?> and int)
 ResolveError.dfy(47,18): Error: Precondition must be boolean (got int)
@@ -19,5 +19,5 @@ ResolveError.dfy(68,24): Error: unresolved identifier: _
 ResolveError.dfy(86,6): Error: RHS (of type ((int, bool)) -> real) not assignable to LHS (of type (int, bool) -> real)
 ResolveError.dfy(101,6): Error: RHS (of type (()) -> real) not assignable to LHS (of type () -> real)
 ResolveError.dfy(102,6): Error: RHS (of type () -> real) not assignable to LHS (of type (()) -> real)
-ResolveError.dfy(91,15): Error: incorrect argument type at index 0 for method in-parameter 'r' (expected int -> ?, found (int, bool) -> real)
+ResolveError.dfy(91,16): Error: incorrect argument type at index 0 for method in-parameter 'r' (expected int -> ?, found (int, bool) -> real)
 22 resolution/type errors detected in ResolveError.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Simple.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Simple.dfy
new file mode 100644
index 00000000000..f66ef7a69ce
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Simple.dfy
@@ -0,0 +1,98 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+function MkId<A>() : A -> A {
+  x => x
+}
+
+function IntId() : int ~> int {
+  y => y
+}
+
+function DivZero() : int ~> int
+{
+  z => 5 / z  // div by zero
+}
+
+function DivZeroWithReq() : int ~> int
+{
+  (z) requires z != 0 => 5 / z
+}
+
+function DivZero2() : (int, int) ~> int {
+  (x, y) requires y != 0 => x / y
+}
+
+function DivZero3() : int ~> int {
+  z => z / 0   // div by zero
+}
+
+function Shadow() : int ~> real ~> real {
+  x => x => x
+}
+
+method Reqs() {
+  var fn := (u) requires u => u;
+  print fn(true);
+  print fn(false);  // precond violation
+}
+
+method Main() {
+  var id := IntId();
+  print id(5);
+  var polyid : int ~> int := MkId();
+  print polyid(5);
+  assert id(2) == polyid(2);
+  assert id(3) != 4 && 5 != polyid(6);
+  var divvy := DivZero2();
+  print divvy(2,5);
+  print divvy(2,0); // precond violation
+}
+
+function succ(x : int) : int
+  requires x > 0
+{
+  x + 1
+}
+
+method Main2() {
+  var suc := succ;
+  assert suc(3) == succ(3);
+  assert suc(-1) == 0; // precond violation
+}
+
+function Id<A>(x : A) : A {
+  x
+}
+
+
+method Main3() {
+  var id := Id;
+  assert id(3) == 3;
+  assert forall x :: (Id(id))(x) == (y => y)(x);
+  assert forall x :: (Id(id))(x) == (y => y)(2); // should fail
+}
+
+
+ghost function P<A,B>(f: A ~> B, x : A): B
+  reads (f.reads)(x)
+  requires (f.requires)(x)
+{
+  f(x)
+}
+
+
+ghost function Q<U,V>(f: U ~> V, x : U): V
+  reads P.reads(f,x)
+  requires f.requires(x)  // would be nice to be able to write P.requires(f,x)
+{
+  P(f,x)
+}
+
+ghost function QQ<U,V>(f: U ~> V, x : U): V
+  reads ((() => ((()=>f)()).reads)())((()=>x)())
+  requires ((() => ((()=>f)()).requires)())((()=>x)())
+{
+  ((() => P)())((()=>f)(),(()=>x)())
+}
+
diff --git a/Test/hofs/Simple.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Simple.dfy.expect
similarity index 86%
rename from Test/hofs/Simple.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Simple.dfy.expect
index 12acc2a7767..9bb06a48b20 100644
--- a/Test/hofs/Simple.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Simple.dfy.expect
@@ -3,6 +3,6 @@ Simple.dfy(27,9): Error: possible division by zero
 Simple.dfy(37,8): Error: function precondition could not be proved
 Simple.dfy(49,8): Error: function precondition could not be proved
 Simple.dfy(61,9): Error: function precondition could not be proved
-Simple.dfy(73,9): Error: assertion could not be proved
+Simple.dfy(73,2): Error: assertion might not hold
 
 Dafny program verifier finished with 5 verified, 6 errors
diff --git a/Test/hofs/SumSum.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/SumSum.dfy
similarity index 92%
rename from Test/hofs/SumSum.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/SumSum.dfy
index 55e48ce3a71..bda1eb00196 100644
--- a/Test/hofs/SumSum.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/SumSum.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /rprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // Tests that come down to comparing the bodies of (possibly nested) functions.
 // Many of these currently require far more effort than one would like.
@@ -20,6 +20,7 @@ lemma ExchangeEta(n: nat, f: int -> int, g: int -> int)
   requires forall i :: 0 <= i < n ==> f(i) == g(i)
   ensures Sum(n, x => f(x)) == Sum(n, x => g(x))
 {
+  if n != 0 { ExchangeEta(n - 1, f, g); }
 }
 
 lemma NestedAlphaRenaming(n: nat, g: (int,int) -> int)
@@ -37,10 +38,10 @@ lemma Distribute(n: nat, f: int -> int, g: int -> int)
 {
 }
 
-lemma {:induction false} PrettyBasicBetaReduction(n: nat, g: (int,int) -> int, i: int)
+lemma PrettyBasicBetaReduction(n: nat, g: (int,int) -> int, i: int)
   ensures (x => Sum(n, y => g(x,y)))(i) == Sum(n, y => g(i,y))
 {
-  // NOTE: This proof is by induction on n (it can be done automatically)
+  // NOTE: This proof is by induction on n
   if n == 0 {
     calc {
       (x => Sum(n, y => g(x,y)))(i);
@@ -62,7 +63,6 @@ lemma {:induction false} PrettyBasicBetaReduction(n: nat, g: (int,int) -> int, i
 lemma BetaReduction0(n: nat, g: (int,int) -> int, i: int)
   ensures (x => Sum(n, y => g(x,y)))(i) == Sum(n, y => g(i,y))
 {
-  // automatic proof by induction on n
 }
 
 lemma BetaReduction1(n': nat, g: (int,int) -> int, i: int)
@@ -74,7 +74,7 @@ lemma BetaReductionInside(n': nat, g: (int,int) -> int)
   ensures Sum(n', x => g(x,n') + Sum(n', y => g(x,y)))
        == Sum(n', x => (w => g(w,n'))(x) + (w => Sum(n', y => g(w,y)))(x))
 {
-  forall i | 0 <= i < n'
+  forall i {:trigger} | 0 <= i < n'
   {
     calc {
       (x => g(x,n') + Sum(n', y => g(x,y)))(i);
@@ -103,7 +103,7 @@ lemma L(n: nat, n': nat, g: (int, int) -> int)
     { assert (y => g(n',y))(n') == g(n',n'); }
     g(n',n') + Sum(n', y => g(n',y)) + Sum(n', x => Sum(n, y => g(x,y)));
     {
-      forall i | 0 <= i < n' {
+      forall i {:trigger} | 0 <= i < n' {
         calc {
           (x => Sum(n, y => g(x,y)))(i);
           { PrettyBasicBetaReduction(n, g, i); }
diff --git a/Test/git-issues/git-issue-3995.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/SumSum.dfy.expect
similarity index 100%
rename from Test/git-issues/git-issue-3995.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/SumSum.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/TreeMapSimple.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/TreeMapSimple.dfy
new file mode 100644
index 00000000000..a2fc7ebcd90
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/TreeMapSimple.dfy
@@ -0,0 +1,54 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+method Main() {
+  TestY();
+}
+
+datatype List<A> = Nil | Cons(head: A, tail: List<A>)
+
+datatype Tree<A> = Branch(val: A, trees: List<Tree<A>>)
+
+ghost function ListData(xs: List): set
+  ensures forall x :: x in ListData(xs) ==> x < xs
+{
+  match xs
+  case Nil => {}
+  case Cons(x,xs) => {x} + ListData(xs)
+}
+
+ghost function TreeData(t0: Tree): set
+  ensures forall t :: t in TreeData(t0) ==> t < t0
+{
+  var Branch(x, ts) := t0;
+  {x} + set t, y | t in ListData(ts) && y in TreeData(t) :: y
+}
+
+// ---------- Partial functions ----------
+
+ghost predicate PreY<A,B>(f: A --> B, s: set<A>) {
+  forall x :: x in s ==> f.requires(x)
+}
+
+function MapY<A,B>(xs: List<A>, f: A --> B): List<B>
+  requires PreY(f, ListData(xs))
+  decreases xs
+{
+  match xs
+  case Nil => Nil
+  case Cons(x, xs) => Cons(f(x), MapY(xs, f))
+}
+
+function TreeMapY<A,B>(t0: Tree<A>, f: A --> B): Tree<B>
+  requires PreY(f, TreeData(t0))
+  decreases t0
+{
+  var Branch(x, ts) := t0;
+  Branch(f(x), MapY(ts, t requires t in ListData(ts) && PreY(f, TreeData(t)) => TreeMapY(t, f)))
+}
+
+method TestY() {
+  var f := x requires x != 0 => 100 / x;
+  var t := TreeMapY(Branch(1, Cons(Branch(2, Nil), Nil)), f);
+  assert t == Branch(100, Cons(Branch(50, Nil), Nil));  // proved via Lit axioms
+  print t, "\n";
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/TreeMapSimple.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/TreeMapSimple.dfy.expect
new file mode 100644
index 00000000000..facb9253f07
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/TreeMapSimple.dfy.expect
@@ -0,0 +1 @@
+Tree.Branch(100, List.Cons(Tree.Branch(50, List.Nil), List.Nil))
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/TreeMapSimple.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/TreeMapSimple.dfy.rs.check
new file mode 100644
index 00000000000..d3aeb8ed7e9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/TreeMapSimple.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0277]: the trait bound `dyn for<'a> Fn(&'a DafnyInt) -> DafnyInt: Default` is not satisfied
\ No newline at end of file
diff --git a/Test/hofs/Types.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Types.dfy
similarity index 93%
rename from Test/hofs/Types.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Types.dfy
index 13edc4663e8..1c9a9e64255 100644
--- a/Test/hofs/Types.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Types.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" "%s" > "%t"
+// RUN: %exits-with 2 %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method FnEqGhost<A>() {
diff --git a/Test/hofs/Types.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Types.dfy.expect
similarity index 100%
rename from Test/hofs/Types.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Types.dfy.expect
diff --git a/Test/hofs/Underspecified.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Underspecified.dfy
similarity index 77%
rename from Test/hofs/Underspecified.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Underspecified.dfy
index 9395947c41d..d024e9a4313 100644
--- a/Test/hofs/Underspecified.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Underspecified.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 method Underspecified() {
diff --git a/Test/hofs/Underspecified.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Underspecified.dfy.expect
similarity index 100%
rename from Test/hofs/Underspecified.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/Underspecified.dfy.expect
diff --git a/Test/hofs/VectorUpdate.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/VectorUpdate.dfy
similarity index 89%
rename from Test/hofs/VectorUpdate.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/VectorUpdate.dfy
index 70c0de3084e..74cfa026b2f 100644
--- a/Test/hofs/VectorUpdate.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/VectorUpdate.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 // this is a rather verbose version of the VectorUpdate method
 method VectorUpdate<A>(N: int, a : array<A>, f : (int,A) ~> A)
@@ -24,7 +24,7 @@ method VectorUpdate<A>(N: int, a : array<A>, f : (int,A) ~> A)
 
 // here's a shorter version of the method above
 method VectorUpdate'<A>(a : array<A>, f : (int,A) ~> A)
-  requires forall j :: 0 <= j < a.Length ==> a !in f.reads(j,a[j]) && f.requires(j,a[j])
+  requires forall j :: 0 <= j < a.Length ==> f.requires(j,a[j]) && a !in f.reads(j,a[j])
   modifies a
   ensures forall j :: 0 <= j < a.Length ==> a[j] == f(j,old(a[j]))
 {
@@ -41,7 +41,7 @@ method VectorUpdate'<A>(a : array<A>, f : (int,A) ~> A)
 
 // here's yet another version
 method VectorUpdate''<A>(a : array<A>, f : (int,A) ~> A)
-  requires forall j :: 0 <= j < a.Length ==> a !in f.reads(j,a[j]) && f.requires(j,a[j])
+  requires forall j :: 0 <= j < a.Length ==> f.requires(j,a[j]) && a !in f.reads(j,a[j])
   modifies a
   ensures forall j :: 0 <= j < a.Length ==> a[j] == f(j,old(a[j]))
 {
diff --git a/Test/hofs/VectorUpdate.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/VectorUpdate.dfy.expect
similarity index 100%
rename from Test/hofs/VectorUpdate.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/VectorUpdate.dfy.expect
diff --git a/Test/hofs/VectorUpdate.dfy.java.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/VectorUpdate.dfy.java.check
similarity index 100%
rename from Test/hofs/VectorUpdate.dfy.java.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/VectorUpdate.dfy.java.check
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/VectorUpdate.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/VectorUpdate.dfy.rs.check
new file mode 100644
index 00000000000..6199c112309
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/VectorUpdate.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>NonSequentializableForallStatements</i>.*
\ No newline at end of file
diff --git a/Test/hofs/WhileLoop.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/WhileLoop.dfy
similarity index 92%
rename from Test/hofs/WhileLoop.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/WhileLoop.dfy
index 914f47f4522..c1fd473b0d7 100644
--- a/Test/hofs/WhileLoop.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/WhileLoop.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 class Ref<A(0)> {
   var val: A
diff --git a/Test/hofs/WhileLoop.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/WhileLoop.dfy.expect
similarity index 100%
rename from Test/hofs/WhileLoop.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/WhileLoop.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/WhileLoop.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/WhileLoop.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/hofs/WhileLoop.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/irondafny0/inheritreqs0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/inheritreqs0.dfy
similarity index 100%
rename from Test/irondafny0/inheritreqs0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/inheritreqs0.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/inheritreqs0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/inheritreqs0.dfy.expect
new file mode 100644
index 00000000000..ff8132578a1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/inheritreqs0.dfy.expect
@@ -0,0 +1,5 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+inheritreqs0.dfy(19,13): Error: a precondition for this call could not be proved
+inheritreqs0.dfy[Impl](6,17): Related location: this is the precondition that could not be proved
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/irondafny0/inheritreqs1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/inheritreqs1.dfy
similarity index 100%
rename from Test/irondafny0/inheritreqs1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/inheritreqs1.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/inheritreqs1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/inheritreqs1.dfy.expect
new file mode 100644
index 00000000000..4ac3ca4d20c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/inheritreqs1.dfy.expect
@@ -0,0 +1,5 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+inheritreqs1.dfy(20,13): Error: a precondition for this call could not be proved
+inheritreqs1.dfy(15,17): Related location: this is the precondition that could not be proved
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/opened_workaround.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/opened_workaround.dfy
new file mode 100644
index 00000000000..38013754b42
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/opened_workaround.dfy
@@ -0,0 +1,21 @@
+// RUN: %exits-with 3 %build %s > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module A {
+
+    ghost predicate P() ensures false
+
+    class C
+    {
+        static ghost method {:axiom} M()
+            ensures P()
+    }
+}
+
+abstract module B {
+    import opened A
+}
+
+abstract module C {
+    import Bee : B       // Works
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/opened_workaround.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/opened_workaround.dfy.expect
new file mode 100644
index 00000000000..cd98ed9ef35
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/opened_workaround.dfy.expect
@@ -0,0 +1,4 @@
+opened_workaround.dfy(6,32): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+
+Dafny program verifier finished with 1 verified, 0 errors
+Translation was aborted because warnings were found and --allow-warnings was not specified
diff --git a/Test/irondafny0/optimize0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/optimize0.dfy
similarity index 100%
rename from Test/irondafny0/optimize0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/optimize0.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/optimize0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/optimize0.dfy.expect
new file mode 100644
index 00000000000..b1ee3c10f29
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/irondafny0/optimize0.dfy.expect
@@ -0,0 +1,4 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+
+Dafny program verifier finished with 0 verified, 0 errors
+o hai!
\ No newline at end of file
diff --git a/Test/lambdas/LambdaEq.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LambdaEq.dfy
similarity index 82%
rename from Test/lambdas/LambdaEq.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LambdaEq.dfy
index 9c86f42e5a5..88ea98cf38c 100644
--- a/Test/lambdas/LambdaEq.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LambdaEq.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 lemma Eq1(b: bool)
 {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LambdaEq.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LambdaEq.dfy.expect
new file mode 100644
index 00000000000..412a924a7e7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LambdaEq.dfy.expect
@@ -0,0 +1,4 @@
+LambdaEq.dfy(10,2): Error: assertion might not hold
+LambdaEq.dfy(17,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/lambdas/LitInt.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LitInt.dfy
similarity index 91%
rename from Test/lambdas/LitInt.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LitInt.dfy
index 7b1fb84e311..d342c7cfd7d 100644
--- a/Test/lambdas/LitInt.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LitInt.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 const N: nat
 const M := 12
diff --git a/Test/lambdas/LitInt.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LitInt.dfy.expect
similarity index 100%
rename from Test/lambdas/LitInt.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/LitInt.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/MatrixAssoc.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/MatrixAssoc.dfy
new file mode 100644
index 00000000000..56bcdc535af
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/MatrixAssoc.dfy
@@ -0,0 +1,268 @@
+// RUN: %verify --allow-axioms "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+type Pos = x | 0 < x witness 1
+
+/** Matrix dimension */
+const N : Pos
+
+/** Matrix indices */
+type Index = x | 0 <= x < N      // matrix indices
+
+type Matrix = Index -> Index -> int
+
+/** Function extensionality */
+lemma FunEq<X, Y>(f: X -> Y, g: X -> Y)
+  requires forall x :: f(x) == g(x)
+  ensures f == g
+{
+  assume false;
+}
+
+lemma Same(a: Matrix, b: Matrix)
+  requires forall x: Index, y: Index :: a(x)(y) == b(x)(y)
+  ensures a == b
+{
+  forall x: Index
+    ensures a(x) == b(x)
+  {
+    FunEq(a(x), b(x));
+  }
+  FunEq(a, b);
+}
+
+/** Σ f(i) where i ranges from 0 to less than n */
+function Sum_n(f: Index -> int, n: nat): int
+  requires n <= N
+{
+  if n == 0 then 0 else f(n - 1) + Sum_n(f, n - 1)
+}
+
+/** Σ f(i) where i ranges from 0 to less than N */
+function Sum(f: Index -> int): int {
+  Sum_n(f, N)
+}
+
+/** Matrix multiplication */
+function mult(a: Matrix, b: Matrix): Matrix
+{
+  ((x: Index) => (y: Index) =>
+    Sum((k: Index) => a(x)(k) * b(k)(y)))
+}
+
+/** Σ f  +  Σ g  == Σ (i => f(i) + g(i)) */
+/** proof by induction */
+lemma distr_add_n(f: Index -> int, g: Index -> int, n: nat)
+  requires n <= N
+  ensures Sum_n(f, n) + Sum_n(g, n) == Sum_n((i: Index) => f(i) + g(i), n)
+{}
+
+/** (Σ f) * x == Σ (i => f(i) * x) */
+/** proof by induction */
+lemma {:induction n} distr_mult_n(f: Index -> int, n: nat, x: int)
+  requires n <= N
+  ensures Sum_n(f, n) * x == Sum_n((i: Index) => f(i) * x, n)
+{}
+
+/** (Σ f) * x == Σ (i => f(i) * x) */
+lemma distr_mult(f: Index -> int, x: int)
+  ensures Sum(f) * x == Sum((i: Index) => f(i) * x)
+{
+  distr_mult_n(f, N, x);
+}
+
+/** Σ_k (Σ_l f(k,l))  ==  Σ_l (Σ_k f(k,l)) */
+/** proof by induction */
+lemma {:induction m, n1, n2} {:nowarn} sum_assoc_n(m: Matrix, n1: nat, n2: nat)
+  requires n1 <= N && n2 <= N
+  ensures Sum_n((k: Index) => Sum_n((l: Index) => m(k)(l), n1), n2)
+          ==
+          Sum_n((l: Index) => Sum_n((k: Index) => m(k)(l), n2), n1)
+{
+  var f  := (k: Index) => Sum_n((l: Index) => m(k)(l), n1);
+  var g  := (l: Index) => Sum_n((k: Index) => m(k)(l), n2);
+  if n2 == 0 {
+    calc {
+        Sum_n(f, n2);
+    ==
+        0;
+    ==
+        Sum_n(g, n2);
+    }
+  } else {
+    var f2 := (l: Index) => m(n2 - 1)(l);
+    var g2 := (l: Index) => Sum_n((k: Index) => m(k)(l), n2 - 1);
+    calc {
+        Sum_n(f, n2);
+    == // def of Sum_n
+        f(n2 - 1) + Sum_n(f, n2 - 1);
+    == // beta reduction
+        Sum_n(f2, n1) + Sum_n(f, n2 - 1);
+    == // IH applied to Sum_n(f, n2 - 1)
+        Sum_n(f2, n1) + Sum_n(g2, n1);
+    == { distr_add_n(f2, g2, n1); }
+        Sum_n((l: Index) => f2(l) + g2(l), n1);
+    == { // substituting f2 and g2
+        FunEq((l: Index) => f2(l) + g2(l),
+                (l: Index) => m(n2 - 1)(l) + Sum_n((k: Index) => m(k)(l), n2 - 1)); }
+        Sum_n((l: Index) => m(n2 - 1)(l) + Sum_n((k: Index) => m(k)(l), n2 - 1), n1);
+    == { FunEq((l: Index) => m(n2 - 1)(l) + Sum_n((k: Index) => m(k)(l), n2 - 1),
+               (l: Index) => Sum_n((k: Index) => m(k)(l), n2)); }
+        Sum_n((l: Index) => Sum_n((k: Index) => m(k)(l), n2), n1);
+    }
+  }
+}
+
+/** Σ_k (Σ_l f(k,l))  ==  Σ_l (Σ_k f(k,l)) */
+lemma sum_assoc(m: Matrix)
+  ensures Sum((k: Index) => Sum((l: Index) => m(k)(l)))
+          ==
+          Sum((l: Index) => Sum((k: Index) => m(k)(l)))
+{
+  calc {
+      Sum((k: Index) => Sum((l: Index) => m(k)(l)));
+  == { FunEq((k: Index) => Sum((l: Index) => m(k)(l)),
+             (k: Index) => Sum_n((l: Index) => m(k)(l), N)); }
+      Sum_n((k: Index) => Sum_n((l: Index) => m(k)(l), N), N);
+  == { sum_assoc_n(m, N, N); }
+      Sum_n((l: Index) => Sum_n((k: Index) => m(k)(l), N), N);
+  == { FunEq((l: Index) => Sum((k: Index) => m(k)(l)),
+             (l: Index) => Sum_n((k: Index) => m(k)(l), N)); }
+      Sum((l: Index) => Sum((k: Index) => m(k)(l)));
+  }
+}
+
+/** Σ_k (Σ_l (a * b * c))  ==  Σ_l (Σ_k (a * b * c)) */
+lemma sum_assoc_mult(a: Matrix, b: Matrix, c: Matrix, i: Index, j: Index)
+  ensures Sum((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j)))
+          ==
+          Sum((l: Index) => Sum((k: Index) => a(i)(l) * b(l)(k) * c(k)(j)))
+{
+  var m := (k1: Index) => (l1: Index) => a(i)(l1) * b(l1)(k1) * c(k1)(j);
+  calc {
+      Sum((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
+  == {
+      forall k: Index
+          ensures ((l: Index) => a(i)(l) * b(l)(k) * c(k)(j))
+                  ==
+                  ((l: Index) => m(k)(l))
+      { FunEq((l: Index) => a(i)(l) * b(l)(k) * c(k)(j),
+              (l: Index) => m(k)(l)); }
+      FunEq((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j)),
+            (k: Index) => Sum((l: Index) => m(k)(l))); }
+      Sum((k: Index) => Sum((l: Index) => m(k)(l)));
+  == { sum_assoc(m); }
+      Sum((l: Index) => Sum((k: Index) => m(k)(l)));
+  == {
+          forall l: Index
+              ensures ((k: Index) => m(k)(l))
+                      ==
+                      ((k: Index) => a(i)(l) * b(l)(k) * c(k)(j))
+          {
+              FunEq((k: Index) => m(k)(l),
+                    (k: Index) => a(i)(l) * b(l)(k) * c(k)(j));
+          }
+          FunEq((l: Index) => Sum((k: Index) => m(k)(l)),
+                (l: Index) => Sum((k: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
+      }
+      Sum((l: Index) => Sum((k: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
+  }
+}
+
+/** (a * (b * c))(i, j) == ((a * b) * c)(i, j) */
+lemma {:isolate_assertions} mult_assoc_ij(a: Matrix, b: Matrix, c: Matrix, i: Index, j: Index)
+  ensures mult(mult(a, b), c)(i)(j) == mult(a, mult(b, c))(i)(j)
+{
+  calc {
+      mult(mult(a, b), c)(i)(j);
+  ==
+      Sum((k: Index) => mult(a, b)(i)(k) * c(k)(j));
+  == { assert forall k : Index :: mult(a, b)(i)(k) == Sum((l: Index) => a(i)(l) * b(l)(k));
+       FunEq((k: Index) => mult(a, b)(i)(k) * c(k)(j),
+             (k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k)) * c(k)(j)); }
+      Sum((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k)) * c(k)(j));
+  == {
+          forall k: Index
+              ensures Sum((l: Index) => a(i)(l) * b(l)(k)) * c(k)(j)
+                      ==
+                      Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j))
+          {
+              var g := (l: Index) => a(i)(l) * b(l)(k);
+              var x := c(k)(j);
+              calc {
+                  Sum((l: Index) => a(i)(l) * b(l)(k)) * c(k)(j);
+              ==
+                  Sum(g) * x;
+              == { distr_mult(g, x); }
+                  Sum((l: Index) => g(l) * x);
+              == { FunEq((l: Index) => g(l) * x,
+                         (l: Index) => a(i)(l) * b(l)(k) * c(k)(j)); }
+                  Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j));
+              }
+          }
+          FunEq((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k)) * c(k)(j),
+                (k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
+         }
+      Sum((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
+  == { sum_assoc_mult(a, b, c, i, j); }
+      Sum((l: Index) => Sum((k: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
+  == // alpha-renaming k <-> l
+      Sum((k: Index) => Sum((l: Index) => a(i)(k) * b(k)(l) * c(l)(j)));
+  == {
+          forall k: Index
+              ensures Sum((l: Index) => a(i)(k) * b(k)(l) * c(l)(j))
+                      ==
+                      Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k))
+          {
+              FunEq((l: Index) => a(i)(k) * b(k)(l) * c(l)(j),
+                    (l: Index) => b(k)(l) * c(l)(j) * a(i)(k));
+          }
+          FunEq((k: Index) => Sum((l: Index) => a(i)(k) * b(k)(l) * c(l)(j)),
+                (k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k)));
+      }
+      Sum((k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k)));
+  == {
+          forall k: Index
+              ensures Sum((l: Index) => b(k)(l) * c(l)(j)) * a(i)(k)
+                      ==
+                      Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k))
+          {
+              var g := (l: Index) => b(k)(l) * c(l)(j);
+              var x := a(i)(k);
+              calc {
+                  Sum((l: Index) => b(k)(l) * c(l)(j)) * a(i)(k);
+              ==
+                  Sum(g) * x;
+              == { distr_mult(g, x); }
+                  Sum((l: Index) => g(l) * x);
+              == { FunEq((l: Index) => g(l) * x,
+                             (l: Index) => b(k)(l) * c(l)(j) * a(i)(k)); }
+                  Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k));
+              }
+          }
+          FunEq((k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k)),
+                (k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j)) * a(i)(k));
+      }
+      Sum((k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j)) * a(i)(k));
+  == { FunEq((k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j)) * a(i)(k),
+             (k: Index) => a(i)(k) * Sum((l: Index) => b(k)(l) * c(l)(j))); }
+      Sum((k: Index) => a(i)(k) * Sum((l: Index) => b(k)(l) * c(l)(j)));
+  == { FunEq((k: Index) => a(i)(k) * Sum((l: Index) => b(k)(l) * c(l)(j)),
+             (k: Index) => a(i)(k) * mult(b, c)(k)(j)); }
+      Sum((k: Index) => a(i)(k) * mult(b, c)(k)(j));
+  ==
+      mult(a, mult(b, c))(i)(j);
+  }
+}
+
+/** a * (b * c) == (a * b) * c */
+lemma mult_assoc(a: Matrix, b: Matrix, c: Matrix)
+  ensures mult(mult(a, b), c) == mult(a, mult(b, c))
+{
+  forall i: Index, j: Index
+    ensures mult(mult(a, b), c)(i)(j) == mult(a, mult(b, c))(i)(j)
+  {
+    mult_assoc_ij(a, b, c, i, j);
+  }
+  Same(mult(mult(a, b), c), mult(a, mult(b, c)));
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/MatrixAssoc.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/MatrixAssoc.dfy.expect
new file mode 100644
index 00000000000..36b67dbf599
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/MatrixAssoc.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 46 verified, 0 errors
diff --git a/Test/lambdas/StateMonad.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/StateMonad.dfy
similarity index 99%
rename from Test/lambdas/StateMonad.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/StateMonad.dfy
index 2afcf350127..74b667a060d 100644
--- a/Test/lambdas/StateMonad.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/StateMonad.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %build "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 abstract module Monad {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/StateMonad.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/StateMonad.dfy.expect
new file mode 100644
index 00000000000..00a51f822da
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lambdas/StateMonad.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 3 verified, 0 errors
diff --git a/Test/legacy-help.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/legacy-help.dfy
similarity index 100%
rename from Test/legacy-help.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/legacy-help.dfy
diff --git a/Test/linters/constructorCaseWithoutParentheses.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/linters/constructorCaseWithoutParentheses.dfy
similarity index 96%
rename from Test/linters/constructorCaseWithoutParentheses.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/linters/constructorCaseWithoutParentheses.dfy
index a8a0f5531b3..19ec978d8bf 100644
--- a/Test/linters/constructorCaseWithoutParentheses.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/linters/constructorCaseWithoutParentheses.dfy
@@ -1,4 +1,4 @@
-// RUN: %baredafny verify %args --warn-missing-constructor-parentheses "%s" > "%t"
+// RUN: %verify --warn-missing-constructor-parentheses "%s" --allow-warnings > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module WithWarning {
diff --git a/Test/linters/constructorCaseWithoutParentheses.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/linters/constructorCaseWithoutParentheses.dfy.expect
similarity index 100%
rename from Test/linters/constructorCaseWithoutParentheses.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/linters/constructorCaseWithoutParentheses.dfy.expect
diff --git a/Test/lit.site.cfg b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lit.site.cfg
similarity index 86%
rename from Test/lit.site.cfg
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/lit.site.cfg
index 09817026cfd..d7945a938f1 100644
--- a/Test/lit.site.cfg
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/lit.site.cfg
@@ -90,9 +90,7 @@ def quotePath(path):
 
 # Find Dafny.exe
 up = os.path.dirname
-repositoryRoot = up(
-                     up( os.path.abspath(__file__) )
-                   )
+repositoryRoot = up(up(up(up(up(up( os.path.abspath(__file__) ))))))
 lit_config.note('Repository root is {}'.format(repositoryRoot))
 
 binaryDir = os.path.join(repositoryRoot, 'Binaries')
@@ -116,6 +114,7 @@ dafnyArgs = [
     # We do not want absolute or relative paths in error messages, just the basename of the file
     'useBaseNameForFileName',
     'showSnippets:0',
+    'env:0',
 
     # Try to verify 2 verification conditions at once
     'vcsCores:2',
@@ -124,8 +123,18 @@ dafnyArgs = [
     # from the compilers, since that changes with the target language
     'compileVerbose:0',
 
-    # Set a default time limit, to catch cases where verification time runs off the rails
-    'timeLimit:300'
+    # Set a default resource limit, to catch cases where verification runs off the rails
+    'rlimit:50000000',
+
+    # Also include a time limit, because we do care about using too much time.
+    'timeLimit:300',
+    'allowAxioms:1',
+
+    'deprecation:1',
+
+    # Disallow standard libraries by default in tests,
+    # to discourage the language itself from depending on them.
+    'standardLibraries:0'
 ]
     
 boogieArgs = [
@@ -168,12 +177,12 @@ ver = "0"
 if os.name != "nt":
     ver = os.uname().version
 
-config.substitutions.append( ('%resolve', dafnyExecutable + " resolve " + standardArguments ) )
-config.substitutions.append( ('%verify', dafnyExecutable + " verify --cores:2 --verification-time-limit:300 " + standardArguments) )
+config.substitutions.append( ('%resolve', dafnyExecutable + " resolve --standard-libraries:false " + standardArguments ) )
+config.substitutions.append( ('%verify', dafnyExecutable + " verify --cores:2 --verification-time-limit:300 --resource-limit:50e6 --standard-libraries:false " + standardArguments) )
 config.substitutions.append( ('%translate', dafnyExecutable + " translate"  ) )
-config.substitutions.append( ('%trargs', "--cores:2 --verification-time-limit:300 " ) )
-config.substitutions.append( ('%build', dafnyExecutable + " build --cores:2 --verification-time-limit:300 " + standardArguments ) )
-config.substitutions.append( ('%run', dafnyExecutable + " run --cores:2 --verification-time-limit:300 " + standardArguments ) )
+config.substitutions.append( ('%trargs', "--cores:2 --verification-time-limit:300 --resource-limit:50e6 --standard-libraries:false " ) )
+config.substitutions.append( ('%build', dafnyExecutable + " build --cores:2 --verification-time-limit:300 --resource-limit:50e6 --standard-libraries:false " + standardArguments ) )
+config.substitutions.append( ('%run', dafnyExecutable + " run --cores:2 --verification-time-limit:300 --resource-limit:50e6 --standard-libraries:false " + standardArguments ) )
 
 config.substitutions.append( ('%repositoryRoot', repositoryRoot) )
 config.substitutions.append( ('%binaryDir', binaryDir) )
@@ -200,16 +209,16 @@ elif "18.04" in ver and "Ubuntu" in ver:
 else:
     config.available_features = [ 'ubuntu', 'posix' ]
 
-def find(name, rooot):
-    for root, dirs, files in os.walk(rooot):
-        for file in files:
-            if file.endswith(name):
-                return name
-    return ""
+# Sanity check: Check solver executable is available
+solverRoots = os.pathsep.join(
+    (path.dirname(dafnyExecutable), binaryDir, os.environ["PATH"])
+)
+
+print(solverRoots)
 
 solverPath = \
-    find("z3-4.12.1", binaryDir) or \
-    find("cvc4", binaryDir)
+    lit.util.which("z3-4.8.5", solverRoots) or \
+    lit.util.which("cvc4", solverRoots)
 
 if not solverPath:
     lit_config.fatal('Could not find solver')
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ByProofRefactoring.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ByProofRefactoring.dfy
new file mode 100644
index 00000000000..8f725c08f15
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ByProofRefactoring.dfy
@@ -0,0 +1,61 @@
+// RUN: %baredafny verify --use-basename-for-filename --show-snippets false --show-hints --isolate-assertions --suggest-proof-refactoring --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+opaque predicate P() { true }
+
+method M() requires P() { }
+
+method N() ensures P() { reveal P(); }
+
+method NoSuggestion()
+{
+  N();
+  M();
+}
+
+method Call()
+{
+  assert P() by { reveal P(); }
+  M();
+}
+
+method CallFixed()
+{
+  M() by {
+    assert P() by { reveal P(); }
+  }
+}
+
+method Assert()
+{
+  assert P() by { reveal P(); }
+  assert P();
+}
+
+method AssertFixed()
+{
+  assert P() by {
+    assert P() by { reveal P(); }
+  }
+}
+
+method Requires()
+  requires P()
+{
+  assert P();
+}
+
+method RequiresFixed()
+  requires p: P()
+{
+  assert P() by {
+    reveal p;
+  }
+}
+
+method CantMove(){
+  var b := P();
+  assert b by { reveal P(); }
+  b := !b;
+  assert !b;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ByProofRefactoring.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ByProofRefactoring.dfy.expect
new file mode 100644
index 00000000000..9bc12b98631
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ByProofRefactoring.dfy.expect
@@ -0,0 +1,9 @@
+ByProofRefactoring.dfy(11,0): Info: Consider hiding this function, which is unused by the proof: P
+ByProofRefactoring.dfy(18,2): Info: This fact was only used to prove the precondition of the method call ByProofRefactoring.dfy(19,4). Consider moving it into a by-proof.
+ByProofRefactoring.dfy(31,2): Info: This fact was only used to prove the assertion ByProofRefactoring.dfy(32,3)-(32,13). Consider moving it into a by-proof.
+ByProofRefactoring.dfy(44,0): Info: Consider hiding this function, which is unused by the proof: P
+ByProofRefactoring.dfy(43,12): Info: This requires clause was only used to prove the assertion ByProofRefactoring.dfy(45,3)-(45,13). Consider labelling it and revealing it in a by-proof.
+ByProofRefactoring.dfy(50,0): Info: Consider hiding this function, which is unused by the proof: P
+ByProofRefactoring.dfy(58,2): Info: This fact was only used to prove the assertion ByProofRefactoring.dfy(60,3)-(60,12). Consider moving it into a by-proof.
+
+Dafny program verifier finished with 14 verified, 0 errors
diff --git a/Test/logger/CSVLogger.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/CSVLogger.dfy
similarity index 90%
rename from Test/logger/CSVLogger.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/CSVLogger.dfy
index e2101d0a9f4..0a2e5a4ccc4 100644
--- a/Test/logger/CSVLogger.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/CSVLogger.dfy
@@ -1,13 +1,13 @@
-// RUN: %exits-with 4 %baredafny verify --log-format:csv";"LogFileName="%t.csv" "%s"
+// RUN: %exits-with 4 %baredafny verify --log-format:csv";"LogFileName="%t.csv" "%s" > %t
 // RUN: %OutputCheck --file-to-check "%t.csv" "%s"
 
 // CHECK: TestResult\.DisplayName,TestResult\.Outcome,TestResult\.Duration,TestResult\.ResourceCount
 // The CHECK-NOT directives are a regression test: previously the BoogieXmlConvertor
 // wasn't populating the resource count test result property, and the CSV logger was
 // defaulting to 0 for that column.
-// CHECK-NOT: ExampleWithSplits.*,Passed,.*,0
+// CHECK-NOT: ExampleWithSplits.*,Passed,.*,0,.*
 // CHECK: ExampleWithSplits.*,Passed,.*,.*
-// CHECK-NOT: ExampleWithSplits.*,Passed,.*,0
+// CHECK-NOT: ExampleWithSplits.*,Passed,.*,0,.*
 
 method ExampleWithSplits() returns (y: int)
   ensures y >= 0
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/CoverageReport.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/CoverageReport.dfy
new file mode 100644
index 00000000000..895885e7ae6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/CoverageReport.dfy
@@ -0,0 +1,24 @@
+// NONUNIFORM: Not a compiler test
+// Verification coverage:
+// RUN: rm -rf "%t"/coverage_verification
+// RUN: %verify --allow-axioms --verify-included-files --no-timestamp-for-coverage-report --verification-coverage-report "%t/coverage_verification" %s
+// RUN: %sed 's/<h1 hidden.*//' "%t"/coverage_verification/ProofDependencies.dfy_verification.html > "%t"/coverage_verification_actual.html
+// RUN: %diff "%S/ProofDependencies.dfy_verification.html.expect" "%t/coverage_verification_actual.html"
+// Expected test coverage:
+// RUN: rm -rf "%t"/coverage_testing
+// RUN: %baredafny generate-tests Block --allow-axioms --no-timestamp-for-coverage-report --expected-coverage-report "%t/coverage_testing" %s
+// RUN: %sed 's/<h1 hidden.*//' "%t"/coverage_testing/ProofDependencies.dfy_tests_expected.html > "%t"/coverage_testing_actual.html
+// RUN: %diff "%S/ProofDependencies.dfy_tests_expected.html.expect" "%t/coverage_testing_actual.html"
+// Combined coverage:
+// RUN: rm -rf "%t"/coverage_combined
+// RUN: %baredafny merge-coverage-reports --no-timestamp-for-coverage-report "%t"/coverage_combined "%t"/coverage_testing "%t"/coverage_verification
+// RUN: %sed 's/<h1 hidden.*//' "%t"/coverage_combined/ProofDependencies.dfy_combined.html > "%t"/coverage_combined.html
+// RUN: %diff "%S/ProofDependencies.dfy_combined.html.expect" "%t/coverage_combined.html"
+// Combined, limited coverage:
+// RUN: rm -rf "%t"/coverage_combined
+// RUN: %baredafny merge-coverage-reports --only-label NotCovered --no-timestamp-for-coverage-report "%t"/coverage_combined_limited "%t"/coverage_testing "%t"/coverage_verification
+// RUN: %sed 's/<h1 hidden.*//' "%t"/coverage_combined_limited/ProofDependencies.dfy_combined.html > "%t"/coverage_combined_limited.html
+// RUN: %diff "%S/ProofDependencies.dfy_combined_limited.html.expect" "%t/coverage_combined_limited.html"
+
+
+include "ProofDependencies.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/FunctionHidingRefactoring.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/FunctionHidingRefactoring.dfy
new file mode 100644
index 00000000000..bb08918946e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/FunctionHidingRefactoring.dfy
@@ -0,0 +1,59 @@
+// RUN: %baredafny verify --use-basename-for-filename --show-snippets false --show-hints --isolate-assertions --suggest-proof-refactoring --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function Id(i: int): int { i }
+
+function Square(i: int): int { Id(i) * Id(i) }
+
+function Zero(i: int): int { i * 0 }
+
+
+method ResultIsUnused() returns (r: int)
+  ensures true
+{
+  r := Square(Square(3));
+}
+
+method UnusedAssignment() returns (r: int)
+  ensures r == 3
+{
+  r := Zero(Square(3));
+  r := r + 3;
+}
+
+method ReferencedFunctionsAreUsed() returns (r: int)
+  ensures r == 81
+{
+  if Square(Square(3)) > 9 {
+    r := 81;
+  } else {
+    r := -81;
+  }
+}
+
+method HiddenId() returns (r: int)
+  ensures r == 0
+{
+  hide Id;
+  r := -1;
+  match Zero(Square(3)) {
+    case 0 => { r := 0; }
+    case _ => {}
+  }
+}
+
+method HiddenSquare() returns (r: int)
+  ensures r == 0
+{
+  hide Square;
+  r := Zero(Square(3));
+  var i := 3;
+  while i > 0
+    invariant r == 3 - i
+    decreases i
+  {
+    r := r+1;
+    i := i-1;
+  }
+  r := r - 3;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/FunctionHidingRefactoring.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/FunctionHidingRefactoring.dfy.expect
new file mode 100644
index 00000000000..c44ee421a2d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/FunctionHidingRefactoring.dfy.expect
@@ -0,0 +1,12 @@
+FunctionHidingRefactoring.dfy(35,12): Info: hidden functions: Id
+FunctionHidingRefactoring.dfy(46,12): Info: hidden functions: Square
+FunctionHidingRefactoring.dfy(51,2): Info: hidden functions: Square
+FunctionHidingRefactoring.dfy(52,16): Info: hidden functions: Square
+FunctionHidingRefactoring.dfy(53,14): Info: hidden functions: Square
+FunctionHidingRefactoring.dfy(55,9): Info: hidden functions: Square
+FunctionHidingRefactoring.dfy(58,7): Info: hidden functions: Square
+FunctionHidingRefactoring.dfy(13,0): Info: Consider hiding these functions, which are unused by the proof: Id, Square
+FunctionHidingRefactoring.dfy(19,0): Info: Consider hiding these functions, which are unused by the proof: Id, Square
+FunctionHidingRefactoring.dfy(36,0): Info: Consider hiding this function, which is unused by the proof: Square
+
+Dafny program verifier finished with 12 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/JsonLogger.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/JsonLogger.dfy
new file mode 100644
index 00000000000..9aada7e7404
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/JsonLogger.dfy
@@ -0,0 +1,13 @@
+// RUN: %exits-with 4 %baredafny verify --show-snippets:false --log-format:json --isolate-assertions "%s" > "%t"
+// Also test old CLI
+// RUN: %exits-with 4 %baredafny /compile:0 /verificationLogger:json /vcsSplitOnEveryAssert "%s" >> "%t"
+// RUN: %OutputCheck --file-to-check "%t" "%s"
+// CHECK: vcNum.:1,.outcome.:.Valid.*vcNum.:2,.outcome.:.Invalid
+// CHECK: vcNum.:1,.outcome.:.Valid.*vcNum.:2,.outcome.:.Invalid
+method M(x: int, y: int)
+  requires y > 0
+  requires x > 0
+{
+  var d := x / y;
+  assert(d * y == x); // Should fail
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/MultipleLoggers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/MultipleLoggers.dfy
new file mode 100644
index 00000000000..4f265c40f11
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/MultipleLoggers.dfy
@@ -0,0 +1,42 @@
+// RUN: %exits-with 4 %baredafny verify --log-format:text --log-format:csv";"LogFileName="%t.csv" "%s" > "%t"
+// RUN: %OutputCheck --file-to-check "%t" "%s"
+// CHECK: Overall outcome: Errors
+// Check that the CSV file exists
+// RUN: %diff "%t.csv" "%t.csv"
+
+method ExampleWithSplits() returns (y: int)
+  ensures y >= 0
+{
+  var x: int;
+  x := 5;
+  y := 0;
+  while (x > 0)
+    invariant x + y == 5
+    invariant x*x <= 25
+  {
+    x := x - 1;
+    assert {:split_here} (x+y) * (x+y) > 25;
+    y := y + 1;
+    if (x < 3) {
+      assert 2 < 2;
+      assert {:split_here} y*y > 4;
+    }
+    else {
+      assert {:split_here} y*y*y < 8;
+      assert 2 < 2;
+    }
+    assert {:split_here} (x+y) * (x+y) == 25;
+  }
+}
+
+method ExampleWithoutSplits() {
+  assert 1 + 1 == 2;
+  assert 2 + 2 == 4;
+  assert 3 + 3 == 6;
+}
+
+method AnotherExampleWithoutSplits() {
+  assert 1 + 1 == 2;
+  assert 2 + 2 == 4;
+  assert 3 + 3 == 6;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/NoProofDependenciesOnError.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/NoProofDependenciesOnError.dfy
new file mode 100644
index 00000000000..20668e49019
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/NoProofDependenciesOnError.dfy
@@ -0,0 +1,9 @@
+// RUN: %exits-with 4 %baredafny verify --log-format:text --boogie -trackVerificationCoverage "%s" > "%t"
+// RUN: %OutputCheck --file-to-check "%t" "%s"
+// CHECK-NOT:     Proof dependencies:
+// CHECK-NOT:     Unused by proof:
+
+lemma NotTrue(x: int)
+  requires x > 0
+  ensures x + 1 < 0
+{}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy
new file mode 100644
index 00000000000..43a9d2428cc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy
@@ -0,0 +1,454 @@
+// RUN: %diff "%s" "%s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+module M {
+method {:testEntry} RedundantAssumeMethod(n: int)
+{
+    // either one or the other assumption shouldn't be covered
+    assume n > 4;
+    assume n > 3;
+    assert n > 1;
+}
+
+method {:testEntry} ContradictoryAssumeMethod(n: int)
+{
+    assume n > 0;
+    assume n < 0;
+    assume n == 5; // shouldn't be covered
+    assert n < 10; // shouldn't be covered
+}
+
+method {:testEntry} AssumeFalseMethod(n: int)
+{
+    assume n == 15; // shouldn't be covered
+    assume false;
+    assert n < 10; // shouldn't be covered
+}
+
+// Obvious contradiction in requires clauses.
+function {:testEntry} ObviouslyContradictoryRequiresFunc(x: nat): (r: nat)
+  requires x > 10
+  requires x < 10
+  ensures r < x // only provable vacuously 
+{
+  assert x == 10; // contradicts both requires clauses
+  x - 1 // not necessarily a valid nat
+}
+
+method {:testEntry} ObviouslyContradictoryRequiresMethod(x: nat) returns (r: nat)
+  requires x > 10
+  requires x < 10
+  ensures r < x // only provable vacuously
+{
+  assert x == 10; // contradicts both requires clauses
+  return x - 1; // not necessarily a valid nat
+}
+
+// Obvious redundancy in requires clauses.
+function {:testEntry} ObviouslyRedundantRequiresFunc(x: nat): (r: nat)
+  requires x < 10
+  requires x < 100 // implied by previous requires clause
+  ensures r < 11 // should cause body and first requires clause to be covered
+{
+  x + 1
+}
+
+method {:testEntry} ObviouslyRedundantRequiresMethod(x: nat) returns (r: nat)
+  requires x < 10
+  requires x < 100 // implied by previous requires clause
+  ensures r < 11 // should cause body and first requires clause to be covered
+{
+  return x + 1;
+}
+
+// Obviously unnecessary requires clauses.
+function {:testEntry} ObviouslyUnnecessaryRequiresFunc(x: nat): (r: nat)
+  requires x < 10 // not required for the proof
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) then x + 2 else x + 1
+}
+
+method {:testEntry} ObviouslyUnnecessaryRequiresMethod(x: nat) returns (r: nat)
+  requires x < 10 // not required for the proof
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) { return x + 2; } else { return x + 1; }
+}
+
+// Code obviously not constrained by ensures clause.
+function {:testEntry} ObviouslyUnconstrainedCodeFunc(x: int): (r: (int, int))
+  requires x > 10
+  ensures r.0 > 10
+{
+  var a := x + 1; // constrained by ensures clause
+  var b := x - 1; // not constrained by ensures clause 
+  (a,
+   b)
+}
+
+method {:testEntry} ObviouslyUnconstrainedCodeMethod(x: int) returns (r: (int, int))
+  requires x > 10
+  ensures r.0 > 10
+{
+  var a := x + 1; // constrained by ensures clause
+  var b := x - 1; // not constrained by ensures clause
+  return
+    (a,
+     b);
+}
+
+// Partial redundancy in requires clauses.
+function {:testEntry} PartiallyRedundantRequiresFunc(x: nat): (r: nat)
+  requires x < 100 && x < 10 // LHS implied by RHS
+  ensures r < 11 // should cause body and RHS clause to be covered
+{
+  x + 1
+}
+
+// Partly unnecessary requires clause.
+function {:testEntry} PartiallyUnnecessaryRequiresFunc(x: int): (r: nat)
+  requires x < 10 && x > 0 // RHS required for proof, but not LHS
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) then x - 1 else x + 1
+}
+
+
+// Redundancy of one requires clause due to at least two others, with at least
+// one of the three being partly in a separately-defined function.
+function {:testEntry} MultiPartRedundantRequiresFunc(x: int): (r: int)
+  requires x > 10
+  requires x < 12
+  requires x == 11 // implied by the previous two, but neither individually
+  ensures r == 11
+{
+  x
+}
+
+method {:testEntry} MultiPartRedundantRequiresMethod(x: int) returns (r: int)
+  requires x > 10
+  requires x < 12
+  requires x == 11 // implied by the previous two, but neither individually
+  ensures r == 11
+{
+  return x;
+}
+
+// Contradiction between three different requires clauses, with at least one of
+// the three being partly in a separately-defined function (function and
+// method).
+function {:testEntry} MultiPartContradictoryRequiresFunc(x: int, y: int): (r: int)
+  requires x > 10
+  requires x < 12
+  requires y != 11 // contradicts the previous two
+  ensures r == 11 // provable from first two preconditions, but shouldn't be covered
+{
+  x
+}
+
+method {:testEntry} MultiPartContradictoryRequiresMethod(x: int, y: int) returns (r: int)
+  requires x > 10
+  requires x < 12
+  requires y != 11 // contradicts the previous two
+  ensures r == 11 // provable from first two preconditions, but shouldn't be covered
+{
+  return x;
+}
+
+function {:testEntry} ContradictoryEnsuresClauseFunc(x: int): (r: int)
+  requires x > 1
+  ensures  r > x && r < 0
+
+method {:testEntry} ContradictoryEnsuresClauseMethod(x: int) returns (r: int)
+  requires x > 1
+  ensures  r > x && r < 0
+
+// Call function that has contradictory ensures clauses.
+function {:testEntry} CallContradictoryFunctionFunc(x: int): (r: int)
+  requires x > 1
+  ensures r < 0
+{
+  // TODO: Dafny doesn't generate sufficient Boogie code to make the contradiction detectable
+  ContradictoryEnsuresClauseFunc(x) - 1
+}
+
+method {:testEntry} CallContradictoryMethodMethod(x: int) returns (r: int)
+  requires x > 1
+  ensures r < 0
+{
+  var y := ContradictoryEnsuresClauseMethod(x);
+  return y - 1;
+}
+
+// False antecedent requires clause
+method {:testEntry} FalseAntecedentRequiresClauseMethod(x: int) returns (r: int)
+  requires x*x < 0 ==> x == x + 1
+  ensures r > x
+{
+  return x + 1;
+}
+
+// False antecedent assert statement.
+method {:testEntry} FalseAntecedentAssertStatementMethod(x: int) {
+  var y := x*x;
+  assert y < 0 ==> x < 0;
+}
+
+// False antecedent ensures clause.
+method {:testEntry} FalseAntecedentEnsuresClauseMethod(x: int) returns (r: int)
+  ensures r < 0 ==> x < 0
+{
+  return x*x;
+}
+
+function {:testEntry} ObviouslyUnreachableIfExpressionBranchFunc(x: int): (r:int)
+  requires x > 0
+  ensures r > 0
+{
+  if x < 0
+  then x - 1 // unreachable
+  else x + 1
+}
+
+method {:testEntry} ObviouslyUnreachableIfStatementBranchMethod(x: int) returns (r:int)
+  requires x > 0
+  ensures r > 0
+{
+  if x < 0 {
+    return x - 1; // unreachable
+  } else {
+    return x + 1;
+  }
+}
+
+datatype T = A | B
+
+function {:testEntry} ObviouslyUnreachableMatchExpressionCaseFunction(t: T): (r:int)
+  requires t != A
+  ensures r > 1 // alt: r > 0
+{
+  match t {
+    case A => 1 // unreachable
+    case B => 2
+  }
+}
+
+method {:testEntry} ObviouslyUnreachableMatchStatementCaseMethod(t: T) returns (r:int)
+  requires t != A
+  ensures r > 1 // alt: r > 0
+{
+  match t {
+    case A => return 1; // unreachable
+    case B => return 2;
+  }
+}
+
+method {:testEntry} ObviouslyUnreachableReturnStatementMethod(t: T) returns (r:int)
+  requires t != A
+    ensures r > 1 // alt: r > 0
+  {
+    if !t.A? {
+      return 2;
+    }
+
+    return 1; // unreachable
+  }
+
+method {:testEntry} CalcStatementWithSideConditions(x: int) {
+  calc == {
+    x / 2;
+    (x*2) / 4;
+  }
+}
+
+method {:testEntry} DontWarnAboutVacuousAssertFalse(x: int) {
+  assume x == x + 1;
+  assert false;
+}
+
+class C {
+  var x: int
+  constructor() {}
+}
+
+function {:testEntry} GetX(c: C): int
+  reads c
+{
+  c.x
+}
+
+method {:testEntry} DontWarnAboutUnusedAssumeTrue(x: int) {
+  assume true;
+  assert 1 + x == x + 1;
+}
+
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_combined.html.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_combined.html.expect
new file mode 100644
index 00000000000..6ccdf966823
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_combined.html.expect
@@ -0,0 +1,481 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html
+        xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+    <link rel="stylesheet" href="./.resources/coverage.css" type="text/css"/>
+    <title>ProofDependencies.dfy, Combined Coverage Report</title>
+</head>
+<body onload="window['PR_TAB_WIDTH']=4">
+<div class="menu" id="menu">
+    <a href="./index_combined.html">Index</a>
+    <a href="ProofDependencies.dfy_tests_expected.html" class="el_report">Expected Test Coverage (coverage_testing)</a><a href="ProofDependencies.dfy_verification.html" class="el_report">Verification coverage (coverage_verification)</a>
+</div>
+<h1>ProofDependencies.dfy, Combined Coverage Report</h1>
+
+<pre class="source lang-java linenums">
+<span class="na" id="1:1">// RUN: %diff "%s" "%s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+module M {
+method {:testEntry} RedundantAssumeMethod(n: int)
+{
+    // either one or the other assumption shouldn't be covered
+    assume </span><span class="pc" id="176:12">n > 4</span><span class="na" id="176:17">;
+    assume </span><span class="fc" id="177:12">n > 3</span><span class="na" id="177:17">;
+    </span><span class="fc" id="178:5">assert n > 1;
+</span><span class="na" id="179:1">}
+
+method {:testEntry} ContradictoryAssumeMethod(n: int)
+{
+    assume </span><span class="pc" id="183:12">n > 0</span><span class="na" id="183:17">;
+    assume </span><span class="pc" id="184:12">n < 0</span><span class="na" id="184:17">;
+    assume </span><span class="nc" id="185:12">n == 5</span><span class="na" id="185:18">; // shouldn't be covered
+    </span><span class="nc" id="186:5">assert n < 10;</span><span class="na" id="186:19"> // shouldn't be covered
+}
+
+method {:testEntry} AssumeFalseMethod(n: int)
+{
+    assume </span><span class="nc" id="191:12">n == 15</span><span class="na" id="191:19">; // shouldn't be covered
+    assume </span><span class="pc" id="192:12">false</span><span class="na" id="192:17">;
+    </span><span class="nc" id="193:5">assert n < 10;</span><span class="na" id="193:19"> // shouldn't be covered
+}
+
+// Obvious contradiction in requires clauses.
+function {:testEntry} ObviouslyContradictoryRequiresFunc(x: nat): (r: nat)
+  requires x > 10
+  requires x < 10
+  ensures r < x // only provable vacuously 
+{
+  </span><span class="nc" id="202:3">assert x == 10;</span><span class="na" id="202:18"> // contradicts both requires clauses
+  </span><span class="nc" id="203:3">x - 1</span><span class="na" id="203:8"> // not necessarily a valid nat
+}
+
+method {:testEntry} ObviouslyContradictoryRequiresMethod(x: nat) returns (r: nat)
+  requires x > 10
+  requires x < 10
+  ensures r < x // only provable vacuously
+{
+  </span><span class="nc" id="211:3">assert x == 10;</span><span class="na" id="211:18"> // contradicts both requires clauses
+  </span><span class="nc" id="212:3">return x - 1;</span><span class="na" id="212:16"> // not necessarily a valid nat
+</span><span class="nc" id="213:1">}
+
+</span><span class="na" id="215:1">// Obvious redundancy in requires clauses.
+function {:testEntry} ObviouslyRedundantRequiresFunc(x: nat): (r: nat)
+  requires x < 10
+  requires x < 100 // implied by previous requires clause
+  ensures r < 11 // should cause body and first requires clause to be covered
+{
+  </span><span class="fc" id="221:3">x + 1
+</span><span class="na" id="222:1">}
+
+method {:testEntry} ObviouslyRedundantRequiresMethod(x: nat) returns (r: nat)
+  requires x < 10
+  requires x < 100 // implied by previous requires clause
+  ensures r < 11 // should cause body and first requires clause to be covered
+{
+  </span><span class="fc" id="229:3">return x + 1;
+</span><span class="pc" id="230:1">}
+
+</span><span class="na" id="232:1">// Obviously unnecessary requires clauses.
+function {:testEntry} ObviouslyUnnecessaryRequiresFunc(x: nat): (r: nat)
+  requires x < 10 // not required for the proof
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) then </span><span class="pc" id="237:19">x + 2</span><span class="na" id="237:24"> else </span><span class="pc" id="237:30">x + 1
+</span><span class="na" id="238:1">}
+
+method {:testEntry} ObviouslyUnnecessaryRequiresMethod(x: nat) returns (r: nat)
+  requires x < 10 // not required for the proof
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) { </span><span class="pc" id="244:16">return x + 2;</span><span class="na" id="244:29"> } else { </span><span class="pc" id="244:39">return x + 1;</span><span class="na" id="244:52"> }
+</span><span class="pc" id="245:1">}
+
+</span><span class="na" id="247:1">// Code obviously not constrained by ensures clause.
+function {:testEntry} ObviouslyUnconstrainedCodeFunc(x: int): (r: (int, int))
+  requires x > 10
+  ensures r.0 > 10
+{
+  var </span><span class="fc" id="252:7">a</span><span class="na" id="252:8"> := </span><span class="fc" id="252:12">x + 1</span><span class="na" id="252:17">; // constrained by ensures clause
+  var </span><span class="pc" id="253:7">b</span><span class="na" id="253:8"> := </span><span class="pc" id="253:12">x - 1</span><span class="na" id="253:17">; // not constrained by ensures clause 
+  (a,
+</span><span class="fc" id="255:1">   b)
+</span><span class="na" id="256:1">}
+
+method {:testEntry} ObviouslyUnconstrainedCodeMethod(x: int) returns (r: (int, int))
+  requires x > 10
+  ensures r.0 > 10
+{
+  var a </span><span class="fc" id="262:9">:= x + 1;</span><span class="na" id="262:18"> // constrained by ensures clause
+  var b </span><span class="pc" id="263:9">:= x - 1;</span><span class="na" id="263:18"> // not constrained by ensures clause
+  return
+    (a,
+</span><span class="fc" id="266:1">     b);
+</span><span class="pc" id="267:1">}
+
+</span><span class="na" id="269:1">// Partial redundancy in requires clauses.
+function {:testEntry} PartiallyRedundantRequiresFunc(x: nat): (r: nat)
+  requires x < 100 && x < 10 // LHS implied by RHS
+  ensures r < 11 // should cause body and RHS clause to be covered
+{
+  </span><span class="fc" id="274:3">x + 1
+</span><span class="na" id="275:1">}
+
+// Partly unnecessary requires clause.
+function {:testEntry} PartiallyUnnecessaryRequiresFunc(x: int): (r: nat)
+  requires x < 10 && x > 0 // RHS required for proof, but not LHS
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) then </span><span class="pc" id="282:19">x - 1</span><span class="na" id="282:24"> else </span><span class="pc" id="282:30">x + 1
+</span><span class="na" id="283:1">}
+
+
+// Redundancy of one requires clause due to at least two others, with at least
+// one of the three being partly in a separately-defined function.
+function {:testEntry} MultiPartRedundantRequiresFunc(x: int): (r: int)
+  requires x > 10
+  requires x < 12
+  requires x == 11 // implied by the previous two, but neither individually
+  ensures r == 11
+{
+  </span><span class="fc" id="294:3">x
+</span><span class="na" id="295:1">}
+
+method {:testEntry} MultiPartRedundantRequiresMethod(x: int) returns (r: int)
+  requires x > 10
+  requires x < 12
+  requires x == 11 // implied by the previous two, but neither individually
+  ensures r == 11
+{
+  </span><span class="pc" id="303:3">return x;
+}
+
+</span><span class="na" id="306:1">// Contradiction between three different requires clauses, with at least one of
+// the three being partly in a separately-defined function (function and
+// method).
+function {:testEntry} MultiPartContradictoryRequiresFunc(x: int, y: int): (r: int)
+  requires x > 10
+  requires x < 12
+  requires y != 11 // contradicts the previous two
+  ensures r == 11 // provable from first two preconditions, but shouldn't be covered
+{
+  </span><span class="fc" id="315:3">x
+</span><span class="na" id="316:1">}
+
+method {:testEntry} MultiPartContradictoryRequiresMethod(x: int, y: int) returns (r: int)
+  requires x > 10
+  requires x < 12
+  requires y != 11 // contradicts the previous two
+  ensures r == 11 // provable from first two preconditions, but shouldn't be covered
+{
+  </span><span class="pc" id="324:3">return x;
+}
+
+</span><span class="na" id="327:1">function {:testEntry} ContradictoryEnsuresClauseFunc(x: int): (r: int)
+  requires x > 1
+  ensures  r > x && r < 0
+
+method {:testEntry} ContradictoryEnsuresClauseMethod(x: int) returns (r: int)
+  requires x > 1
+  ensures  r > x && r < 0
+
+// Call function that has contradictory ensures clauses.
+function {:testEntry} CallContradictoryFunctionFunc(x: int): (r: int)
+  requires x > 1
+  ensures r < 0
+{
+  // TODO: Dafny doesn't generate sufficient Boogie code to make the contradiction detectable
+  </span><span class="pc" id="341:3">ContradictoryEnsuresClauseFunc(x) - 1
+</span><span class="na" id="342:1">}
+
+method {:testEntry} CallContradictoryMethodMethod(x: int) returns (r: int)
+  requires x > 1
+  ensures r < 0
+{
+  var y </span><span class="nc" id="348:9">:= ContradictoryEnsuresClauseMethod(x);
+</span><span class="na" id="349:1">  </span><span class="nc" id="349:3">return y - 1;
+}
+
+</span><span class="na" id="352:1">// False antecedent requires clause
+method {:testEntry} FalseAntecedentRequiresClauseMethod(x: int) returns (r: int)
+  requires x*x < 0 ==> x == x + 1
+  ensures r > x
+{
+  </span><span class="fc" id="357:3">return x + 1;
+</span><span class="pc" id="358:1">}
+
+</span><span class="na" id="360:1">// False antecedent assert statement.
+method {:testEntry} FalseAntecedentAssertStatementMethod(x: int) {
+  var y </span><span class="fc" id="362:9">:= x*x;
+</span><span class="na" id="363:1">  assert </span><span class="pc" id="363:10">y < 0 ==> x < 0</span><span class="na" id="363:25">;
+}
+
+// False antecedent ensures clause.
+method {:testEntry} FalseAntecedentEnsuresClauseMethod(x: int) returns (r: int)
+  ensures r < 0 ==> x < 0
+{
+  </span><span class="fc" id="370:3">return x*x;
+</span><span class="pc" id="371:1">}
+
+</span><span class="na" id="373:1">function {:testEntry} ObviouslyUnreachableIfExpressionBranchFunc(x: int): (r:int)
+  requires x > 0
+  ensures r > 0
+{
+  if x < 0
+  then </span><span class="pc" id="378:8">x - 1</span><span class="na" id="378:13"> // unreachable
+  else </span><span class="fc" id="379:8">x + 1
+</span><span class="na" id="380:1">}
+
+method {:testEntry} ObviouslyUnreachableIfStatementBranchMethod(x: int) returns (r:int)
+  requires x > 0
+  ensures r > 0
+{
+  if x < 0 {
+    </span><span class="nc" id="387:5">return x - 1;</span><span class="na" id="387:18"> // unreachable
+  } else {
+    </span><span class="fc" id="389:5">return x + 1;
+</span><span class="na" id="390:1">  }
+</span><span class="pc" id="391:1">}
+
+</span><span class="na" id="393:1">datatype T = A | B
+
+function {:testEntry} ObviouslyUnreachableMatchExpressionCaseFunction(t: T): (r:int)
+  requires t != A
+  ensures r > 1 // alt: r > 0
+{
+  match t {
+    case A => </span><span class="pc" id="400:15">1</span><span class="na" id="400:16"> // unreachable
+    case B => </span><span class="fc" id="401:15">2
+</span><span class="na" id="402:1">  }
+}
+
+method {:testEntry} ObviouslyUnreachableMatchStatementCaseMethod(t: T) returns (r:int)
+  requires t != A
+  ensures r > 1 // alt: r > 0
+{
+  match t {
+    case A => </span><span class="nc" id="410:15">return 1;</span><span class="na" id="410:24"> // unreachable
+    case B => </span><span class="fc" id="411:15">return 2;
+</span><span class="na" id="412:1">  }
+</span><span class="pc" id="413:1">}
+
+</span><span class="na" id="415:1">method {:testEntry} ObviouslyUnreachableReturnStatementMethod(t: T) returns (r:int)
+  requires t != A
+    ensures r > 1 // alt: r > 0
+  {
+    if !t.A? {
+      </span><span class="fc" id="420:7">return 2;
+</span><span class="na" id="421:1">    }
+
+    </span><span class="nc" id="423:5">return 1;</span><span class="na" id="423:14"> // unreachable
+  </span><span class="pc" id="424:3">}
+
+</span><span class="na" id="426:1">method {:testEntry} CalcStatementWithSideConditions(x: int) {
+  calc == {
+    x / 2;
+    (x*2) / 4;
+  }
+}
+
+method {:testEntry} DontWarnAboutVacuousAssertFalse(x: int) {
+  assume </span><span class="pc" id="434:10">x == x + 1</span><span class="na" id="434:20">;
+  </span><span class="nc" id="435:3">assert false;
+</span><span class="na" id="436:1">}
+
+class C {
+  var x: int
+  constructor() {}
+}
+
+function {:testEntry} GetX(c: C): int
+  reads c
+{
+  </span><span class="pc" id="446:3">c.x
+</span><span class="na" id="447:1">}
+
+method {:testEntry} DontWarnAboutUnusedAssumeTrue(x: int) {
+  assume </span><span class="pc" id="450:10">true</span><span class="na" id="450:14">;
+  </span><span class="fc" id="451:3">assert 1 + x == x + 1;
+</span><span class="na" id="452:1">}
+
+}
+
+</span></pre>
+<div class="footer">
+    <span class="right">
+        Created with 
+        <a href="https://github.com/dafny-lang/dafny">Dafny</a>
+    </span>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_combined_limited.html.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_combined_limited.html.expect
new file mode 100644
index 00000000000..6f636cae0b2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_combined_limited.html.expect
@@ -0,0 +1,481 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html
+        xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+    <link rel="stylesheet" href="./.resources/coverage.css" type="text/css"/>
+    <title>ProofDependencies.dfy, Combined Coverage Report</title>
+</head>
+<body onload="window['PR_TAB_WIDTH']=4">
+<div class="menu" id="menu">
+    <a href="./index_combined.html">Index</a>
+    <a href="ProofDependencies.dfy_tests_expected.html" class="el_report">Expected Test Coverage (coverage_testing)</a><a href="ProofDependencies.dfy_verification.html" class="el_report">Verification coverage (coverage_verification)</a>
+</div>
+<h1>ProofDependencies.dfy, Combined Coverage Report</h1>
+
+<pre class="source lang-java linenums">
+<span class="na" id="1:1">// RUN: %diff "%s" "%s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+module M {
+method {:testEntry} RedundantAssumeMethod(n: int)
+{
+    // either one or the other assumption shouldn't be covered
+    assume </span><span class="nc" id="176:12">n > 4</span><span class="na" id="176:17">;
+    assume n > 3;
+    assert n > 1;
+}
+
+method {:testEntry} ContradictoryAssumeMethod(n: int)
+</span><span class="nc" id="182:1">{
+    assume n > 0;
+    assume n < 0;
+    assume n == 5; // shouldn't be covered
+    assert n < 10; // shouldn't be covered
+}
+
+</span><span class="na" id="189:1">method {:testEntry} AssumeFalseMethod(n: int)
+</span><span class="nc" id="190:1">{
+    assume n == 15; // shouldn't be covered
+    assume false;
+    assert n < 10; // shouldn't be covered
+}
+
+</span><span class="na" id="196:1">// Obvious contradiction in requires clauses.
+</span><span class="nc" id="197:1">function {:testEntry} ObviouslyContradictoryRequiresFunc(x: nat): (r: nat)
+</span><span class="na" id="198:1">  requires x > 10
+  requires x < 10
+  ensures </span><span class="nc" id="200:11">r < x</span><span class="na" id="200:16"> // only provable vacuously 
+{
+</span><span class="nc" id="202:1">  assert x == 10; // contradicts both requires clauses
+  x - 1 // not necessarily a valid nat
+}
+
+</span><span class="na" id="206:1">method {:testEntry} ObviouslyContradictoryRequiresMethod(x: nat) returns (r: nat)
+  requires x > 10
+  requires x < 10
+  ensures </span><span class="nc" id="209:11">r < x</span><span class="na" id="209:16"> // only provable vacuously
+</span><span class="nc" id="210:1">{
+  assert x == 10; // contradicts both requires clauses
+  return x - 1; // not necessarily a valid nat
+}
+
+</span><span class="na" id="215:1">// Obvious redundancy in requires clauses.
+function {:testEntry} ObviouslyRedundantRequiresFunc(x: nat): (r: nat)
+  requires x < 10
+  requires </span><span class="nc" id="218:12">x < 100</span><span class="na" id="218:19"> // implied by previous requires clause
+  ensures r < 11 // should cause body and first requires clause to be covered
+{
+  x + 1
+}
+
+method {:testEntry} ObviouslyRedundantRequiresMethod(x: nat) returns (r: nat)
+  requires x < 10
+  requires </span><span class="nc" id="226:12">x < 100</span><span class="na" id="226:19"> // implied by previous requires clause
+  ensures r < 11 // should cause body and first requires clause to be covered
+{
+  return x + 1;
+</span><span class="nc" id="230:1">}
+
+</span><span class="na" id="232:1">// Obviously unnecessary requires clauses.
+function {:testEntry} ObviouslyUnnecessaryRequiresFunc(x: nat): (r: nat)
+  requires </span><span class="nc" id="234:12">x < 10</span><span class="na" id="234:18"> // not required for the proof
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) then x + 2 else x + 1
+}
+
+method {:testEntry} ObviouslyUnnecessaryRequiresMethod(x: nat) returns (r: nat)
+  requires </span><span class="nc" id="241:12">x < 10</span><span class="na" id="241:18"> // not required for the proof
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) { return x + 2; } else { return x + 1; }
+</span><span class="nc" id="245:1">}
+
+</span><span class="na" id="247:1">// Code obviously not constrained by ensures clause.
+function {:testEntry} ObviouslyUnconstrainedCodeFunc(x: int): (r: (int, int))
+  requires x > 10
+  ensures r.0 > 10
+{
+  var a := x + 1; // constrained by ensures clause
+  var </span><span class="nc" id="253:7">b</span><span class="na" id="253:8"> := </span><span class="nc" id="253:12">x - 1</span><span class="na" id="253:17">; // not constrained by ensures clause 
+  (a,
+   b)
+}
+
+method {:testEntry} ObviouslyUnconstrainedCodeMethod(x: int) returns (r: (int, int))
+  requires x > 10
+  ensures r.0 > 10
+{
+  var a := x + 1; // constrained by ensures clause
+  var b </span><span class="nc" id="263:9">:= x - 1;</span><span class="na" id="263:18"> // not constrained by ensures clause
+  return
+    (a,
+     b);
+</span><span class="nc" id="267:1">}
+
+</span><span class="na" id="269:1">// Partial redundancy in requires clauses.
+function {:testEntry} PartiallyRedundantRequiresFunc(x: nat): (r: nat)
+  requires </span><span class="nc" id="271:12">x < 100</span><span class="na" id="271:19"> && x < 10 // LHS implied by RHS
+  ensures r < 11 // should cause body and RHS clause to be covered
+{
+  x + 1
+}
+
+// Partly unnecessary requires clause.
+function {:testEntry} PartiallyUnnecessaryRequiresFunc(x: int): (r: nat)
+  requires </span><span class="nc" id="279:12">x < 10</span><span class="na" id="279:18"> && x > 0 // RHS required for proof, but not LHS
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) then x - 1 else x + 1
+}
+
+
+// Redundancy of one requires clause due to at least two others, with at least
+// one of the three being partly in a separately-defined function.
+function {:testEntry} MultiPartRedundantRequiresFunc(x: int): (r: int)
+  requires </span><span class="nc" id="289:12">x > 10
+</span><span class="na" id="290:1">  requires </span><span class="nc" id="290:12">x < 12
+</span><span class="na" id="291:1">  requires x == 11 // implied by the previous two, but neither individually
+  ensures r == 11
+{
+  x
+}
+
+method {:testEntry} MultiPartRedundantRequiresMethod(x: int) returns (r: int)
+  requires </span><span class="nc" id="298:12">x > 10
+</span><span class="na" id="299:1">  requires </span><span class="nc" id="299:12">x < 12
+</span><span class="na" id="300:1">  requires x == 11 // implied by the previous two, but neither individually
+  ensures r == 11
+{
+  return x;
+</span><span class="nc" id="304:1">}
+
+</span><span class="na" id="306:1">// Contradiction between three different requires clauses, with at least one of
+// the three being partly in a separately-defined function (function and
+// method).
+function {:testEntry} MultiPartContradictoryRequiresFunc(x: int, y: int): (r: int)
+  requires x > 10
+  requires x < 12
+  requires </span><span class="nc" id="312:12">y != 11</span><span class="na" id="312:19"> // contradicts the previous two
+  ensures r == 11 // provable from first two preconditions, but shouldn't be covered
+{
+  x
+}
+
+method {:testEntry} MultiPartContradictoryRequiresMethod(x: int, y: int) returns (r: int)
+  requires x > 10
+  requires x < 12
+  requires </span><span class="nc" id="321:12">y != 11</span><span class="na" id="321:19"> // contradicts the previous two
+  ensures r == 11 // provable from first two preconditions, but shouldn't be covered
+{
+  return x;
+</span><span class="nc" id="325:1">}
+
+</span><span class="na" id="327:1">function {:testEntry} ContradictoryEnsuresClauseFunc(x: int): (r: int)
+  requires </span><span class="nc" id="328:12">x > 1
+</span><span class="na" id="329:1">  ensures  </span><span class="nc" id="329:12">r > x</span><span class="na" id="329:17"> && </span><span class="nc" id="329:21">r < 0
+
+</span><span class="na" id="331:1">method {:testEntry} ContradictoryEnsuresClauseMethod(x: int) returns (r: int)
+  requires </span><span class="nc" id="332:12">x > 1
+</span><span class="na" id="333:1">  ensures  </span><span class="nc" id="333:12">r > x</span><span class="na" id="333:17"> && </span><span class="nc" id="333:21">r < 0
+
+</span><span class="na" id="335:1">// Call function that has contradictory ensures clauses.
+</span><span class="nc" id="336:1">function {:testEntry} CallContradictoryFunctionFunc(x: int): (r: int)
+</span><span class="na" id="337:1">  requires x > 1
+  ensures r < 0
+{
+  // TODO: Dafny doesn't generate sufficient Boogie code to make the contradiction detectable
+</span><span class="nc" id="341:1">  ContradictoryEnsuresClauseFunc(x) - 1
+}
+
+</span><span class="na" id="344:1">method {:testEntry} CallContradictoryMethodMethod(x: int) returns (r: int)
+  requires x > 1
+  ensures </span><span class="nc" id="346:11">r < 0
+{
+  var y := ContradictoryEnsuresClauseMethod(x);
+  return y - 1;
+}
+
+</span><span class="na" id="352:1">// False antecedent requires clause
+method {:testEntry} FalseAntecedentRequiresClauseMethod(x: int) returns (r: int)
+  requires </span><span class="nc" id="354:12">x*x < 0 ==> x == x + 1
+</span><span class="na" id="355:1">  ensures r > x
+{
+  return x + 1;
+</span><span class="nc" id="358:1">}
+
+</span><span class="na" id="360:1">// False antecedent assert statement.
+method {:testEntry} FalseAntecedentAssertStatementMethod(x: int) {
+  var y := x*x;
+  assert </span><span class="nc" id="363:10">y < 0 ==> </span><span class="na" id="363:20">x < 0;
+}
+
+// False antecedent ensures clause.
+method {:testEntry} FalseAntecedentEnsuresClauseMethod(x: int) returns (r: int)
+  ensures </span><span class="nc" id="368:11">r < 0 ==> </span><span class="na" id="368:21">x < 0
+{
+  return x*x;
+</span><span class="nc" id="371:1">}
+
+</span><span class="na" id="373:1">function {:testEntry} ObviouslyUnreachableIfExpressionBranchFunc(x: int): (r:int)
+  requires x > 0
+  ensures r > 0
+{
+  if x < 0
+  then </span><span class="nc" id="378:8">x - 1</span><span class="na" id="378:13"> // unreachable
+  else x + 1
+}
+
+method {:testEntry} ObviouslyUnreachableIfStatementBranchMethod(x: int) returns (r:int)
+  requires x > 0
+  ensures r > 0
+{
+  if x < 0 {
+</span><span class="nc" id="387:1">    return x - 1; // unreachable
+</span><span class="na" id="388:1">  } else {
+    return x + 1;
+  }
+</span><span class="nc" id="391:1">}
+
+</span><span class="na" id="393:1">datatype T = A | B
+
+function {:testEntry} ObviouslyUnreachableMatchExpressionCaseFunction(t: T): (r:int)
+  requires t != A
+  ensures r > 1 // alt: r > 0
+{
+  match t {
+    case A => </span><span class="nc" id="400:15">1</span><span class="na" id="400:16"> // unreachable
+    case B => 2
+  }
+}
+
+method {:testEntry} ObviouslyUnreachableMatchStatementCaseMethod(t: T) returns (r:int)
+  requires t != A
+  ensures r > 1 // alt: r > 0
+{
+  match t {
+</span><span class="nc" id="410:1">    case A => return 1; // unreachable
+</span><span class="na" id="411:1">    case B => return 2;
+  }
+</span><span class="nc" id="413:1">}
+
+</span><span class="na" id="415:1">method {:testEntry} ObviouslyUnreachableReturnStatementMethod(t: T) returns (r:int)
+  requires t != A
+    ensures r > 1 // alt: r > 0
+  {
+    if !t.A? {
+      return 2;
+    }
+
+</span><span class="nc" id="423:1">    return 1; // unreachable
+</span><span class="na" id="424:1">  </span><span class="nc" id="424:3">}
+
+</span><span class="na" id="426:1">method {:testEntry} CalcStatementWithSideConditions(x: int) {
+  calc == {
+    x / 2;
+    (x*2) / 4;
+  }
+}
+
+</span><span class="nc" id="433:1">method {:testEntry} DontWarnAboutVacuousAssertFalse(x: int) {
+  assume x == x + 1;
+  assert false;
+}
+
+</span><span class="na" id="438:1">class C {
+  var x: int
+  constructor() {}
+}
+
+function {:testEntry} GetX(c: C): int
+  reads c
+{
+  c.x
+}
+
+method {:testEntry} DontWarnAboutUnusedAssumeTrue(x: int) {
+  assume </span><span class="nc" id="450:10">true</span><span class="na" id="450:14">;
+  assert 1 + x == x + 1;
+}
+
+}
+
+</span></pre>
+<div class="footer">
+    <span class="right">
+        Created with 
+        <a href="https://github.com/dafny-lang/dafny">Dafny</a>
+    </span>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_tests_expected.html.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_tests_expected.html.expect
new file mode 100644
index 00000000000..c270958150a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_tests_expected.html.expect
@@ -0,0 +1,481 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html
+        xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+    <link rel="stylesheet" href="./.resources/coverage.css" type="text/css"/>
+    <title>ProofDependencies.dfy, Expected Test Coverage</title>
+</head>
+<body onload="window['PR_TAB_WIDTH']=4">
+<div class="menu" id="menu">
+    <a href="./index_tests_expected.html">Index</a>
+    
+</div>
+<h1>ProofDependencies.dfy, Expected Test Coverage</h1>
+
+<pre class="source lang-java linenums">
+<span class="na" id="1:1">// RUN: %diff "%s" "%s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+module M {
+method {:testEntry} RedundantAssumeMethod(n: int)
+</span><span class="fc" id="174:1">{
+</span><span class="na" id="175:1">    // either one or the other assumption shouldn't be covered
+</span><span class="fc" id="176:1">    assume n > 4;
+    assume n > 3;
+    assert n > 1;
+}
+
+</span><span class="na" id="181:1">method {:testEntry} ContradictoryAssumeMethod(n: int)
+</span><span class="nc" id="182:1">{
+    assume n > 0;
+    assume n < 0;
+    assume n == 5; // shouldn't be covered
+    assert n < 10; // shouldn't be covered
+}
+
+</span><span class="na" id="189:1">method {:testEntry} AssumeFalseMethod(n: int)
+</span><span class="nc" id="190:1">{
+    assume n == 15; // shouldn't be covered
+    assume false;
+    assert n < 10; // shouldn't be covered
+}
+
+</span><span class="na" id="196:1">// Obvious contradiction in requires clauses.
+</span><span class="nc" id="197:1">function {:testEntry} ObviouslyContradictoryRequiresFunc(x: nat): (r: nat)
+</span><span class="na" id="198:1">  requires x > 10
+  requires x < 10
+  ensures r < x // only provable vacuously 
+{
+</span><span class="nc" id="202:1">  assert x == 10; // contradicts both requires clauses
+  x - 1 // not necessarily a valid nat
+}
+
+</span><span class="na" id="206:1">method {:testEntry} ObviouslyContradictoryRequiresMethod(x: nat) returns (r: nat)
+  requires x > 10
+  requires x < 10
+  ensures r < x // only provable vacuously
+</span><span class="nc" id="210:1">{
+  assert x == 10; // contradicts both requires clauses
+  return x - 1; // not necessarily a valid nat
+}
+
+</span><span class="na" id="215:1">// Obvious redundancy in requires clauses.
+</span><span class="fc" id="216:1">function {:testEntry} ObviouslyRedundantRequiresFunc(x: nat): (r: nat)
+</span><span class="na" id="217:1">  requires x < 10
+  requires x < 100 // implied by previous requires clause
+  ensures r < 11 // should cause body and first requires clause to be covered
+{
+</span><span class="fc" id="221:1">  x + 1
+}
+
+</span><span class="na" id="224:1">method {:testEntry} ObviouslyRedundantRequiresMethod(x: nat) returns (r: nat)
+  requires x < 10
+  requires x < 100 // implied by previous requires clause
+  ensures r < 11 // should cause body and first requires clause to be covered
+</span><span class="fc" id="228:1">{
+  return x + 1;
+}
+
+</span><span class="na" id="232:1">// Obviously unnecessary requires clauses.
+</span><span class="fc" id="233:1">function {:testEntry} ObviouslyUnnecessaryRequiresFunc(x: nat): (r: nat)
+</span><span class="na" id="234:1">  requires x < 10 // not required for the proof
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+</span><span class="fc" id="237:1">  if (x > 5) then x + 2 else x + 1
+}
+
+</span><span class="na" id="240:1">method {:testEntry} ObviouslyUnnecessaryRequiresMethod(x: nat) returns (r: nat)
+  requires x < 10 // not required for the proof
+</span><span class="fc" id="242:1">{
+</span><span class="na" id="243:1">  // cause at least a little proof work to be necessary, for nat bounds
+</span><span class="fc" id="244:1">  if (x > 5) { return x + 2; } else { return x + 1; }
+}
+
+</span><span class="na" id="247:1">// Code obviously not constrained by ensures clause.
+</span><span class="fc" id="248:1">function {:testEntry} ObviouslyUnconstrainedCodeFunc(x: int): (r: (int, int))
+</span><span class="na" id="249:1">  requires x > 10
+  ensures r.0 > 10
+{
+</span><span class="fc" id="252:1">  var a := x + 1; // constrained by ensures clause
+  var b := x - 1; // not constrained by ensures clause 
+</span><span class="na" id="254:1">  (a,
+</span><span class="fc" id="255:1">   b)
+}
+
+</span><span class="na" id="258:1">method {:testEntry} ObviouslyUnconstrainedCodeMethod(x: int) returns (r: (int, int))
+  requires x > 10
+  ensures r.0 > 10
+</span><span class="fc" id="261:1">{
+  var a := x + 1; // constrained by ensures clause
+  var b := x - 1; // not constrained by ensures clause
+</span><span class="na" id="264:1">  return
+    (a,
+</span><span class="fc" id="266:1">     b);
+}
+
+</span><span class="na" id="269:1">// Partial redundancy in requires clauses.
+</span><span class="fc" id="270:1">function {:testEntry} PartiallyRedundantRequiresFunc(x: nat): (r: nat)
+</span><span class="na" id="271:1">  requires x < 100 && x < 10 // LHS implied by RHS
+  ensures r < 11 // should cause body and RHS clause to be covered
+{
+</span><span class="fc" id="274:1">  x + 1
+}
+
+</span><span class="na" id="277:1">// Partly unnecessary requires clause.
+</span><span class="fc" id="278:1">function {:testEntry} PartiallyUnnecessaryRequiresFunc(x: int): (r: nat)
+</span><span class="na" id="279:1">  requires x < 10 && x > 0 // RHS required for proof, but not LHS
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+</span><span class="fc" id="282:1">  if (x > 5) then x - 1 else x + 1
+}
+
+
+</span><span class="na" id="286:1">// Redundancy of one requires clause due to at least two others, with at least
+// one of the three being partly in a separately-defined function.
+</span><span class="fc" id="288:1">function {:testEntry} MultiPartRedundantRequiresFunc(x: int): (r: int)
+</span><span class="na" id="289:1">  requires x > 10
+  requires x < 12
+  requires x == 11 // implied by the previous two, but neither individually
+  ensures r == 11
+{
+</span><span class="fc" id="294:1">  x
+}
+
+</span><span class="na" id="297:1">method {:testEntry} MultiPartRedundantRequiresMethod(x: int) returns (r: int)
+  requires x > 10
+  requires x < 12
+  requires x == 11 // implied by the previous two, but neither individually
+  ensures r == 11
+</span><span class="fc" id="302:1">{
+  return x;
+}
+
+</span><span class="na" id="306:1">// Contradiction between three different requires clauses, with at least one of
+// the three being partly in a separately-defined function (function and
+// method).
+</span><span class="fc" id="309:1">function {:testEntry} MultiPartContradictoryRequiresFunc(x: int, y: int): (r: int)
+</span><span class="na" id="310:1">  requires x > 10
+  requires x < 12
+  requires y != 11 // contradicts the previous two
+  ensures r == 11 // provable from first two preconditions, but shouldn't be covered
+{
+</span><span class="fc" id="315:1">  x
+}
+
+</span><span class="na" id="318:1">method {:testEntry} MultiPartContradictoryRequiresMethod(x: int, y: int) returns (r: int)
+  requires x > 10
+  requires x < 12
+  requires y != 11 // contradicts the previous two
+  ensures r == 11 // provable from first two preconditions, but shouldn't be covered
+</span><span class="fc" id="323:1">{
+  return x;
+}
+
+</span><span class="na" id="327:1">function {:testEntry} ContradictoryEnsuresClauseFunc(x: int): (r: int)
+  requires x > 1
+  ensures  r > x && r < 0
+
+method {:testEntry} ContradictoryEnsuresClauseMethod(x: int) returns (r: int)
+  requires x > 1
+  ensures  r > x && r < 0
+
+// Call function that has contradictory ensures clauses.
+</span><span class="nc" id="336:1">function {:testEntry} CallContradictoryFunctionFunc(x: int): (r: int)
+</span><span class="na" id="337:1">  requires x > 1
+  ensures r < 0
+{
+  // TODO: Dafny doesn't generate sufficient Boogie code to make the contradiction detectable
+</span><span class="nc" id="341:1">  ContradictoryEnsuresClauseFunc(x) - 1
+}
+
+</span><span class="na" id="344:1">method {:testEntry} CallContradictoryMethodMethod(x: int) returns (r: int)
+  requires x > 1
+  ensures r < 0
+</span><span class="nc" id="347:1">{
+  var y := ContradictoryEnsuresClauseMethod(x);
+  return y - 1;
+}
+
+</span><span class="na" id="352:1">// False antecedent requires clause
+method {:testEntry} FalseAntecedentRequiresClauseMethod(x: int) returns (r: int)
+  requires x*x < 0 ==> x == x + 1
+  ensures r > x
+</span><span class="fc" id="356:1">{
+  return x + 1;
+}
+
+</span><span class="na" id="360:1">// False antecedent assert statement.
+</span><span class="fc" id="361:1">method {:testEntry} FalseAntecedentAssertStatementMethod(x: int) {
+  var y := x*x;
+  assert y < 0 ==> x < 0;
+}
+
+</span><span class="na" id="366:1">// False antecedent ensures clause.
+method {:testEntry} FalseAntecedentEnsuresClauseMethod(x: int) returns (r: int)
+  ensures r < 0 ==> x < 0
+</span><span class="fc" id="369:1">{
+  return x*x;
+}
+
+function {:testEntry} ObviouslyUnreachableIfExpressionBranchFunc(x: int): (r:int)
+</span><span class="na" id="374:1">  requires x > 0
+  ensures r > 0
+{
+  if x < 0
+</span><span class="fc" id="378:1">  then x - 1 // unreachable
+  else x + 1
+}
+
+</span><span class="na" id="382:1">method {:testEntry} ObviouslyUnreachableIfStatementBranchMethod(x: int) returns (r:int)
+  requires x > 0
+  ensures r > 0
+</span><span class="fc" id="385:1">{
+</span><span class="na" id="386:1">  if x < 0 {
+</span><span class="nc" id="387:1">    return x - 1; // unreachable
+</span><span class="na" id="388:1">  } else {
+</span><span class="fc" id="389:1">    return x + 1;
+</span><span class="na" id="390:1">  }
+</span><span class="fc" id="391:1">}
+
+</span><span class="na" id="393:1">datatype T = A | B
+
+</span><span class="fc" id="395:1">function {:testEntry} ObviouslyUnreachableMatchExpressionCaseFunction(t: T): (r:int)
+</span><span class="na" id="396:1">  requires t != A
+  ensures r > 1 // alt: r > 0
+{
+  match t {
+</span><span class="fc" id="400:1">    case A => 1 // unreachable
+    case B => 2
+  }
+}
+
+</span><span class="na" id="405:1">method {:testEntry} ObviouslyUnreachableMatchStatementCaseMethod(t: T) returns (r:int)
+  requires t != A
+  ensures r > 1 // alt: r > 0
+</span><span class="fc" id="408:1">{
+</span><span class="na" id="409:1">  match t {
+</span><span class="nc" id="410:1">    case A => return 1; // unreachable
+</span><span class="fc" id="411:1">    case B => return 2;
+</span><span class="na" id="412:1">  }
+</span><span class="fc" id="413:1">}
+
+</span><span class="na" id="415:1">method {:testEntry} ObviouslyUnreachableReturnStatementMethod(t: T) returns (r:int)
+  requires t != A
+    ensures r > 1 // alt: r > 0
+</span><span class="fc" id="418:1">  {
+</span><span class="na" id="419:1">    if !t.A? {
+</span><span class="fc" id="420:1">      return 2;
+</span><span class="na" id="421:1">    }
+
+</span><span class="nc" id="423:1">    return 1; // unreachable
+</span><span class="fc" id="424:1">  }
+
+method {:testEntry} CalcStatementWithSideConditions(x: int) {
+</span><span class="na" id="427:1">  calc == {
+    x / 2;
+    (x*2) / 4;
+  }
+</span><span class="fc" id="431:1">}
+
+</span><span class="nc" id="433:1">method {:testEntry} DontWarnAboutVacuousAssertFalse(x: int) {
+  assume x == x + 1;
+  assert false;
+}
+
+</span><span class="na" id="438:1">class C {
+  var x: int
+  constructor() {}
+}
+
+</span><span class="fc" id="443:1">function {:testEntry} GetX(c: C): int
+</span><span class="na" id="444:1">  reads c
+{
+</span><span class="fc" id="446:1">  c.x
+}
+
+method {:testEntry} DontWarnAboutUnusedAssumeTrue(x: int) {
+  assume true;
+  assert 1 + x == x + 1;
+}
+
+</span><span class="na" id="454:1">}
+
+</span></pre>
+<div class="footer">
+    <span class="right">
+        Created with 
+        <a href="https://github.com/dafny-lang/dafny">Dafny</a>
+    </span>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_verification.html.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_verification.html.expect
new file mode 100644
index 00000000000..238bd819a65
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencies.dfy_verification.html.expect
@@ -0,0 +1,481 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html
+        xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+    <link rel="stylesheet" href="./.resources/coverage.css" type="text/css"/>
+    <title>ProofDependencies.dfy, Verification coverage</title>
+</head>
+<body onload="window['PR_TAB_WIDTH']=4">
+<div class="menu" id="menu">
+    <a href="./index_verification.html">Index</a>
+    
+</div>
+<h1>ProofDependencies.dfy, Verification coverage</h1>
+
+<pre class="source lang-java linenums">
+<span class="na" id="1:1">// RUN: %diff "%s" "%s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+module M {
+method {:testEntry} RedundantAssumeMethod(n: int)
+{
+    // either one or the other assumption shouldn't be covered
+    assume </span><span class="nc" id="176:12">n > 4</span><span class="na" id="176:17">;
+    assume </span><span class="fc" id="177:12">n > 3</span><span class="na" id="177:17">;
+    </span><span class="fc" id="178:5">assert n > 1;
+</span><span class="na" id="179:1">}
+
+method {:testEntry} ContradictoryAssumeMethod(n: int)
+{
+    assume </span><span class="fc" id="183:12">n > 0</span><span class="na" id="183:17">;
+    assume </span><span class="fc" id="184:12">n < 0</span><span class="na" id="184:17">;
+    assume </span><span class="nc" id="185:12">n == 5</span><span class="na" id="185:18">; // shouldn't be covered
+    </span><span class="nc" id="186:5">assert n < 10;</span><span class="na" id="186:19"> // shouldn't be covered
+}
+
+method {:testEntry} AssumeFalseMethod(n: int)
+{
+    assume </span><span class="nc" id="191:12">n == 15</span><span class="na" id="191:19">; // shouldn't be covered
+    assume </span><span class="fc" id="192:12">false</span><span class="na" id="192:17">;
+    </span><span class="nc" id="193:5">assert n < 10;</span><span class="na" id="193:19"> // shouldn't be covered
+}
+
+// Obvious contradiction in requires clauses.
+function {:testEntry} ObviouslyContradictoryRequiresFunc(x: nat): (r: nat)
+  requires </span><span class="fc" id="198:12">x > 10
+</span><span class="na" id="199:1">  requires </span><span class="fc" id="199:12">x < 10
+</span><span class="na" id="200:1">  ensures </span><span class="nc" id="200:11">r < x</span><span class="na" id="200:16"> // only provable vacuously 
+{
+  </span><span class="nc" id="202:3">assert x == 10;</span><span class="na" id="202:18"> // contradicts both requires clauses
+  </span><span class="nc" id="203:3">x - 1</span><span class="na" id="203:8"> // not necessarily a valid nat
+}
+
+method {:testEntry} ObviouslyContradictoryRequiresMethod(x: nat) returns (r: nat)
+  requires </span><span class="pc" id="207:12">x > 10
+</span><span class="na" id="208:1">  requires </span><span class="pc" id="208:12">x < 10
+</span><span class="na" id="209:1">  ensures </span><span class="nc" id="209:11">r < x</span><span class="na" id="209:16"> // only provable vacuously
+{
+  </span><span class="nc" id="211:3">assert x == 10;</span><span class="na" id="211:18"> // contradicts both requires clauses
+  </span><span class="nc" id="212:3">return x - 1;</span><span class="na" id="212:16"> // not necessarily a valid nat
+</span><span class="nc" id="213:1">}
+
+</span><span class="na" id="215:1">// Obvious redundancy in requires clauses.
+function {:testEntry} ObviouslyRedundantRequiresFunc(x: nat): (r: nat)
+  requires </span><span class="fc" id="217:12">x < 10
+</span><span class="na" id="218:1">  requires </span><span class="nc" id="218:12">x < 100</span><span class="na" id="218:19"> // implied by previous requires clause
+  ensures </span><span class="pc" id="219:11">r < 11</span><span class="na" id="219:17"> // should cause body and first requires clause to be covered
+{
+  </span><span class="fc" id="221:3">x + 1
+</span><span class="na" id="222:1">}
+
+method {:testEntry} ObviouslyRedundantRequiresMethod(x: nat) returns (r: nat)
+  requires </span><span class="pc" id="225:12">x < 10
+</span><span class="na" id="226:1">  requires </span><span class="nc" id="226:12">x < 100</span><span class="na" id="226:19"> // implied by previous requires clause
+  ensures </span><span class="pc" id="227:11">r < 11</span><span class="na" id="227:17"> // should cause body and first requires clause to be covered
+{
+  </span><span class="fc" id="229:3">return x + 1;
+</span><span class="nc" id="230:1">}
+
+</span><span class="na" id="232:1">// Obviously unnecessary requires clauses.
+function {:testEntry} ObviouslyUnnecessaryRequiresFunc(x: nat): (r: nat)
+  requires </span><span class="nc" id="234:12">x < 10</span><span class="na" id="234:18"> // not required for the proof
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) then </span><span class="pc" id="237:19">x + 2</span><span class="na" id="237:24"> else </span><span class="pc" id="237:30">x + 1
+</span><span class="na" id="238:1">}
+
+method {:testEntry} ObviouslyUnnecessaryRequiresMethod(x: nat) returns (r: nat)
+  requires </span><span class="nc" id="241:12">x < 10</span><span class="na" id="241:18"> // not required for the proof
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) { </span><span class="pc" id="244:16">return x + 2;</span><span class="na" id="244:29"> } else { </span><span class="pc" id="244:39">return x + 1;</span><span class="na" id="244:52"> }
+</span><span class="nc" id="245:1">}
+
+</span><span class="na" id="247:1">// Code obviously not constrained by ensures clause.
+function {:testEntry} ObviouslyUnconstrainedCodeFunc(x: int): (r: (int, int))
+  requires </span><span class="fc" id="249:12">x > 10
+</span><span class="na" id="250:1">  ensures </span><span class="pc" id="250:11">r.0 > 10
+</span><span class="na" id="251:1">{
+  var </span><span class="fc" id="252:7">a</span><span class="na" id="252:8"> := </span><span class="fc" id="252:12">x + 1</span><span class="na" id="252:17">; // constrained by ensures clause
+  var </span><span class="nc" id="253:7">b</span><span class="na" id="253:8"> := </span><span class="nc" id="253:12">x - 1</span><span class="na" id="253:17">; // not constrained by ensures clause 
+  </span><span class="fc" id="254:3">(a,
+   b)
+</span><span class="na" id="256:1">}
+
+method {:testEntry} ObviouslyUnconstrainedCodeMethod(x: int) returns (r: (int, int))
+  requires </span><span class="pc" id="259:12">x > 10
+</span><span class="na" id="260:1">  ensures </span><span class="pc" id="260:11">r.0 > 10
+</span><span class="na" id="261:1">{
+  var a </span><span class="fc" id="262:9">:= x + 1;</span><span class="na" id="262:18"> // constrained by ensures clause
+  var b </span><span class="nc" id="263:9">:= x - 1;</span><span class="na" id="263:18"> // not constrained by ensures clause
+  </span><span class="fc" id="264:3">return
+    (a,
+     b);
+</span><span class="nc" id="267:1">}
+
+</span><span class="na" id="269:1">// Partial redundancy in requires clauses.
+function {:testEntry} PartiallyRedundantRequiresFunc(x: nat): (r: nat)
+  requires </span><span class="nc" id="271:12">x < 100</span><span class="na" id="271:19"> && </span><span class="fc" id="271:23">x < 10</span><span class="na" id="271:29"> // LHS implied by RHS
+  ensures </span><span class="pc" id="272:11">r < 11</span><span class="na" id="272:17"> // should cause body and RHS clause to be covered
+{
+  </span><span class="fc" id="274:3">x + 1
+</span><span class="na" id="275:1">}
+
+// Partly unnecessary requires clause.
+function {:testEntry} PartiallyUnnecessaryRequiresFunc(x: int): (r: nat)
+  requires </span><span class="nc" id="279:12">x < 10</span><span class="na" id="279:18"> && </span><span class="fc" id="279:22">x > 0</span><span class="na" id="279:27"> // RHS required for proof, but not LHS
+{
+  // cause at least a little proof work to be necessary, for nat bounds
+  if (x > 5) then </span><span class="pc" id="282:19">x - 1</span><span class="na" id="282:24"> else </span><span class="pc" id="282:30">x + 1
+</span><span class="na" id="283:1">}
+
+
+// Redundancy of one requires clause due to at least two others, with at least
+// one of the three being partly in a separately-defined function.
+function {:testEntry} MultiPartRedundantRequiresFunc(x: int): (r: int)
+  requires </span><span class="nc" id="289:12">x > 10
+</span><span class="na" id="290:1">  requires </span><span class="nc" id="290:12">x < 12
+</span><span class="na" id="291:1">  requires </span><span class="fc" id="291:12">x == 11</span><span class="na" id="291:19"> // implied by the previous two, but neither individually
+  ensures </span><span class="pc" id="292:11">r == 11
+</span><span class="na" id="293:1">{
+  </span><span class="fc" id="294:3">x
+</span><span class="na" id="295:1">}
+
+method {:testEntry} MultiPartRedundantRequiresMethod(x: int) returns (r: int)
+  requires </span><span class="nc" id="298:12">x > 10
+</span><span class="na" id="299:1">  requires </span><span class="nc" id="299:12">x < 12
+</span><span class="na" id="300:1">  requires </span><span class="pc" id="300:12">x == 11</span><span class="na" id="300:19"> // implied by the previous two, but neither individually
+  ensures </span><span class="pc" id="301:11">r == 11
+</span><span class="na" id="302:1">{
+  </span><span class="pc" id="303:3">return x;
+</span><span class="nc" id="304:1">}
+
+</span><span class="na" id="306:1">// Contradiction between three different requires clauses, with at least one of
+// the three being partly in a separately-defined function (function and
+// method).
+function {:testEntry} MultiPartContradictoryRequiresFunc(x: int, y: int): (r: int)
+  requires </span><span class="fc" id="310:12">x > 10
+</span><span class="na" id="311:1">  requires </span><span class="fc" id="311:12">x < 12
+</span><span class="na" id="312:1">  requires </span><span class="nc" id="312:12">y != 11</span><span class="na" id="312:19"> // contradicts the previous two
+  ensures </span><span class="pc" id="313:11">r == 11</span><span class="na" id="313:18"> // provable from first two preconditions, but shouldn't be covered
+{
+  </span><span class="fc" id="315:3">x
+</span><span class="na" id="316:1">}
+
+method {:testEntry} MultiPartContradictoryRequiresMethod(x: int, y: int) returns (r: int)
+  requires </span><span class="pc" id="319:12">x > 10
+</span><span class="na" id="320:1">  requires </span><span class="pc" id="320:12">x < 12
+</span><span class="na" id="321:1">  requires </span><span class="nc" id="321:12">y != 11</span><span class="na" id="321:19"> // contradicts the previous two
+  ensures </span><span class="pc" id="322:11">r == 11</span><span class="na" id="322:18"> // provable from first two preconditions, but shouldn't be covered
+{
+  </span><span class="pc" id="324:3">return x;
+</span><span class="nc" id="325:1">}
+
+</span><span class="na" id="327:1">function {:testEntry} ContradictoryEnsuresClauseFunc(x: int): (r: int)
+  requires </span><span class="nc" id="328:12">x > 1
+</span><span class="na" id="329:1">  ensures  </span><span class="nc" id="329:12">r > x</span><span class="na" id="329:17"> && </span><span class="nc" id="329:21">r < 0
+
+</span><span class="na" id="331:1">method {:testEntry} ContradictoryEnsuresClauseMethod(x: int) returns (r: int)
+  requires </span><span class="nc" id="332:12">x > 1
+</span><span class="na" id="333:1">  ensures  </span><span class="nc" id="333:12">r > x</span><span class="na" id="333:17"> && </span><span class="nc" id="333:21">r < 0
+
+</span><span class="na" id="335:1">// Call function that has contradictory ensures clauses.
+function {:testEntry} CallContradictoryFunctionFunc(x: int): (r: int)
+  requires </span><span class="fc" id="337:12">x > 1
+</span><span class="na" id="338:1">  ensures </span><span class="pc" id="338:11">r < 0
+</span><span class="na" id="339:1">{
+  // TODO: Dafny doesn't generate sufficient Boogie code to make the contradiction detectable
+  </span><span class="fc" id="341:3">ContradictoryEnsuresClauseFunc(x) - 1
+</span><span class="na" id="342:1">}
+
+method {:testEntry} CallContradictoryMethodMethod(x: int) returns (r: int)
+  requires </span><span class="pc" id="345:12">x > 1
+</span><span class="na" id="346:1">  ensures </span><span class="nc" id="346:11">r < 0
+</span><span class="na" id="347:1">{
+  var y </span><span class="nc" id="348:9">:= ContradictoryEnsuresClauseMethod(x);
+</span><span class="na" id="349:1">  </span><span class="nc" id="349:3">return y - 1;
+}
+
+</span><span class="na" id="352:1">// False antecedent requires clause
+method {:testEntry} FalseAntecedentRequiresClauseMethod(x: int) returns (r: int)
+  requires </span><span class="nc" id="354:12">x*x < 0 ==> x == x + 1
+</span><span class="na" id="355:1">  ensures </span><span class="pc" id="355:11">r > x
+</span><span class="na" id="356:1">{
+  </span><span class="fc" id="357:3">return x + 1;
+</span><span class="nc" id="358:1">}
+
+</span><span class="na" id="360:1">// False antecedent assert statement.
+method {:testEntry} FalseAntecedentAssertStatementMethod(x: int) {
+  var y </span><span class="fc" id="362:9">:= x*x;
+</span><span class="na" id="363:1">  assert </span><span class="nc" id="363:10">y < 0 ==> </span><span class="pc" id="363:20">x < 0</span><span class="na" id="363:25">;
+}
+
+// False antecedent ensures clause.
+method {:testEntry} FalseAntecedentEnsuresClauseMethod(x: int) returns (r: int)
+  ensures </span><span class="nc" id="368:11">r < 0 ==> </span><span class="pc" id="368:21">x < 0
+</span><span class="na" id="369:1">{
+  </span><span class="fc" id="370:3">return x*x;
+</span><span class="nc" id="371:1">}
+
+</span><span class="na" id="373:1">function {:testEntry} ObviouslyUnreachableIfExpressionBranchFunc(x: int): (r:int)
+  requires </span><span class="fc" id="374:12">x > 0
+</span><span class="na" id="375:1">  ensures </span><span class="pc" id="375:11">r > 0
+</span><span class="na" id="376:1">{
+  if x < 0
+  then </span><span class="nc" id="378:8">x - 1</span><span class="na" id="378:13"> // unreachable
+  else </span><span class="fc" id="379:8">x + 1
+</span><span class="na" id="380:1">}
+
+method {:testEntry} ObviouslyUnreachableIfStatementBranchMethod(x: int) returns (r:int)
+  requires </span><span class="pc" id="383:12">x > 0
+</span><span class="na" id="384:1">  ensures </span><span class="pc" id="384:11">r > 0
+</span><span class="na" id="385:1">{
+  if x < 0 {
+    </span><span class="nc" id="387:5">return x - 1;</span><span class="na" id="387:18"> // unreachable
+  } else {
+    </span><span class="fc" id="389:5">return x + 1;
+</span><span class="na" id="390:1">  }
+</span><span class="nc" id="391:1">}
+
+</span><span class="na" id="393:1">datatype T = A | B
+
+function {:testEntry} ObviouslyUnreachableMatchExpressionCaseFunction(t: T): (r:int)
+  requires </span><span class="fc" id="396:12">t != A
+</span><span class="na" id="397:1">  ensures </span><span class="pc" id="397:11">r > 1</span><span class="na" id="397:16"> // alt: r > 0
+{
+  match t {
+    case A => </span><span class="nc" id="400:15">1</span><span class="na" id="400:16"> // unreachable
+    case B => </span><span class="fc" id="401:15">2
+</span><span class="na" id="402:1">  }
+}
+
+method {:testEntry} ObviouslyUnreachableMatchStatementCaseMethod(t: T) returns (r:int)
+  requires </span><span class="pc" id="406:12">t != A
+</span><span class="na" id="407:1">  ensures </span><span class="pc" id="407:11">r > 1</span><span class="na" id="407:16"> // alt: r > 0
+{
+  match t {
+    case A => </span><span class="nc" id="410:15">return 1;</span><span class="na" id="410:24"> // unreachable
+    case B => </span><span class="fc" id="411:15">return 2;
+</span><span class="na" id="412:1">  }
+</span><span class="nc" id="413:1">}
+
+</span><span class="na" id="415:1">method {:testEntry} ObviouslyUnreachableReturnStatementMethod(t: T) returns (r:int)
+  requires </span><span class="pc" id="416:12">t != A
+</span><span class="na" id="417:1">    ensures </span><span class="pc" id="417:13">r > 1</span><span class="na" id="417:18"> // alt: r > 0
+  {
+    if !t.A? {
+      </span><span class="fc" id="420:7">return 2;
+</span><span class="na" id="421:1">    }
+
+    </span><span class="nc" id="423:5">return 1;</span><span class="na" id="423:14"> // unreachable
+  </span><span class="nc" id="424:3">}
+
+</span><span class="na" id="426:1">method {:testEntry} CalcStatementWithSideConditions(x: int) {
+  calc == {
+    </span><span class="pc" id="428:5">x / 2</span><span class="na" id="428:10">;
+    </span><span class="fc" id="429:5">(x*2) / 4</span><span class="na" id="429:14">;
+  }
+}
+
+method {:testEntry} DontWarnAboutVacuousAssertFalse(x: int) {
+  assume </span><span class="fc" id="434:10">x == x + 1</span><span class="na" id="434:20">;
+  </span><span class="nc" id="435:3">assert false;
+</span><span class="na" id="436:1">}
+
+class C {
+  var x: int
+  constructor() {}
+}
+
+function {:testEntry} GetX(c: C): int
+  reads c
+{
+  </span><span class="pc" id="446:3">c.x
+</span><span class="na" id="447:1">}
+
+method {:testEntry} DontWarnAboutUnusedAssumeTrue(x: int) {
+  assume </span><span class="nc" id="450:10">true</span><span class="na" id="450:14">;
+  </span><span class="fc" id="451:3">assert 1 + x == x + 1;
+</span><span class="na" id="452:1">}
+
+}
+
+</span></pre>
+<div class="footer">
+    <span class="right">
+        Created with 
+        <a href="https://github.com/dafny-lang/dafny">Dafny</a>
+    </span>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyLogging.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyLogging.dfy
new file mode 100644
index 00000000000..3dda3c8b669
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyLogging.dfy
@@ -0,0 +1,177 @@
+// RUN: %baredafny verify --log-format:text --verify-included-files --allow-axioms --boogie -trackVerificationCoverage "%s" > "%t"
+// RUN: %OutputCheck --file-to-check "%t" "%s"
+// CHECK: Results for M.RedundantAssumeMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(177,12\)-\(177,16\): assume statement
+// CHECK:       ProofDependencies.dfy\(178,5\)-\(178,17\): assertion always holds
+//
+// CHECK: Results for M.ContradictoryAssumeMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(183,12\)-\(183,16\): assume statement
+// CHECK:       ProofDependencies.dfy\(184,12\)-\(184,16\): assume statement
+//
+// CHECK: Results for M.AssumeFalseMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(192,12\)-\(192,12\): assume statement
+//
+// CHECK: Results for M.ObviouslyContradictoryRequiresFunc \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(198,12\)-\(198,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(199,12\)-\(199,16\): requires clause
+//
+// CHECK: Results for M.ObviouslyContradictoryRequiresMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(207,12\)-\(207,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(208,12\)-\(208,16\): requires clause
+//
+// CHECK: Results for M.ObviouslyRedundantRequiresFunc \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(216,1\)-\(222,1\): function definition for ObviouslyRedundantRequiresFunc
+// CHECK:       ProofDependencies.dfy\(217,12\)-\(217,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(219,11\)-\(219,15\): ensures clause
+// CHECK:       ProofDependencies.dfy\(221,3\)-\(221,7\): function call result
+// CHECK:       ProofDependencies.dfy\(221,3\)-\(221,7\): value always satisfies the subset constraints of 'nat'
+//
+// CHECK: Results for M.ObviouslyRedundantRequiresMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(225,12\)-\(225,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(227,11\)-\(227,15\): ensures clause
+// CHECK:       ProofDependencies.dfy\(229,3\)-\(229,15\): assignment \(or return\)
+// CHECK:       ProofDependencies.dfy\(229,10\)-\(229,14\): value always satisfies the subset constraints of 'nat'
+//
+// CHECK: Results for M.ObviouslyUnnecessaryRequiresFunc \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(237,19\)-\(237,23\): value always satisfies the subset constraints of 'nat'
+// CHECK:       ProofDependencies.dfy\(237,30\)-\(237,34\): value always satisfies the subset constraints of 'nat'
+//
+// CHECK: Results for M.ObviouslyUnnecessaryRequiresMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(244,23\)-\(244,27\): value always satisfies the subset constraints of 'nat'
+// CHECK:       ProofDependencies.dfy\(244,46\)-\(244,50\): value always satisfies the subset constraints of 'nat'
+//
+// CHECK: Results for M.ObviouslyUnconstrainedCodeFunc \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(248,1\)-\(256,1\): function definition for ObviouslyUnconstrainedCodeFunc
+// CHECK:       ProofDependencies.dfy\(249,12\)-\(249,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(250,11\)-\(250,17\): ensures clause
+// CHECK:       ProofDependencies.dfy\(252,7\)-\(252,7\): let expression binding
+// CHECK:       ProofDependencies.dfy\(252,12\)-\(252,16\): let expression binding RHS well-formed
+// CHECK:       ProofDependencies.dfy\(254,3\)-\(255,5\): function call result
+//
+// CHECK: Results for M.ObviouslyUnconstrainedCodeMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(259,12\)-\(259,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(260,11\)-\(260,17\): ensures clause
+// CHECK:       ProofDependencies.dfy\(262,9\)-\(262,17\): assignment \(or return\)
+// CHECK:       ProofDependencies.dfy\(264,3\)-\(266,8\): assignment \(or return\)
+//
+// CHECK: Results for M.PartiallyRedundantRequiresFunc \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(270,1\)-\(275,1\): function definition for PartiallyRedundantRequiresFunc
+// CHECK:       ProofDependencies.dfy\(271,23\)-\(271,27\): requires clause
+// CHECK:       ProofDependencies.dfy\(272,11\)-\(272,15\): ensures clause
+// CHECK:       ProofDependencies.dfy\(274,3\)-\(274,7\): function call result
+// CHECK:       ProofDependencies.dfy\(274,3\)-\(274,7\): value always satisfies the subset constraints of 'nat'
+//
+// CHECK: Results for M.PartiallyUnnecessaryRequiresFunc \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(279,22\)-\(279,26\): requires clause
+// CHECK:       ProofDependencies.dfy\(282,19\)-\(282,23\): value always satisfies the subset constraints of 'nat'
+// CHECK:       ProofDependencies.dfy\(282,30\)-\(282,34\): value always satisfies the subset constraints of 'nat'
+//
+// CHECK: Results for M.MultiPartRedundantRequiresFunc \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(288,1\)-\(295,1\): function definition for MultiPartRedundantRequiresFunc
+// CHECK:       ProofDependencies.dfy\(291,12\)-\(291,17\): requires clause
+// CHECK:       ProofDependencies.dfy\(292,11\)-\(292,16\): ensures clause
+// CHECK:       ProofDependencies.dfy\(294,3\)-\(294,3\): function call result
+//
+// CHECK: Results for M.MultiPartRedundantRequiresMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(300,12\)-\(300,17\): requires clause
+// CHECK:       ProofDependencies.dfy\(301,11\)-\(301,16\): ensures clause
+//
+// CHECK: Results for M.MultiPartContradictoryRequiresFunc \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(309,1\)-\(316,1\): function definition for MultiPartContradictoryRequiresFunc
+// CHECK:       ProofDependencies.dfy\(310,12\)-\(310,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(311,12\)-\(311,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(313,11\)-\(313,16\): ensures clause
+// CHECK:       ProofDependencies.dfy\(315,3\)-\(315,3\): function call result
+//
+// CHECK: Results for M.MultiPartContradictoryRequiresMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(319,12\)-\(319,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(320,12\)-\(320,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(322,11\)-\(322,16\): ensures clause
+//
+// CHECK: Results for M.CallContradictoryFunctionFunc \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(336,1\)-\(342,1\): function definition for CallContradictoryFunctionFunc
+// CHECK:       ProofDependencies.dfy\(337,12\)-\(337,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(338,11\)-\(338,15\): ensures clause
+// CHECK:       ProofDependencies.dfy\(341,3\)-\(341,35\): function precondition satisfied
+// CHECK:       ProofDependencies.dfy\(341,3\)-\(341,39\): function call result
+//
+// CHECK: Results for M.CallContradictoryMethodMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(345,12\)-\(345,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(348,9\)-\(348,47\): ensures clause at ProofDependencies.dfy\(333,12\)-\(333,16\) from call
+// CHECK:       ProofDependencies.dfy\(348,9\)-\(348,47\): ensures clause at ProofDependencies.dfy\(333,21\)-\(333,25\) from call
+// CHECK:       ProofDependencies.dfy\(348,9\)-\(348,47\): requires clause at ProofDependencies.dfy\(332,12\)-\(332,16\) from call
+//
+// CHECK: Results for M.FalseAntecedentRequiresClauseMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(357,3\)-\(357,15\): assignment \(or return\)
+//
+// CHECK: Results for M.FalseAntecedentAssertStatementMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(362,9\)-\(362,15\): assignment \(or return\)
+// CHECK:       ProofDependencies.dfy\(363,20\)-\(363,24\): assertion always holds
+//
+// CHECK: Results for M.FalseAntecedentEnsuresClauseMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(368,21\)-\(368,25\): ensures clause
+// CHECK:       ProofDependencies.dfy\(370,3\)-\(370,13\): assignment \(or return\)
+//
+// CHECK: Results for M.ObviouslyUnreachableIfExpressionBranchFunc \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(373,1\)-\(380,1\): function definition for ObviouslyUnreachableIfExpressionBranchFunc
+// CHECK:       ProofDependencies.dfy\(374,12\)-\(374,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(375,11\)-\(375,15\): ensures clause
+// CHECK:       ProofDependencies.dfy\(379,8\)-\(379,12\): function call result
+//
+// CHECK: Results for M.ObviouslyUnreachableIfStatementBranchMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(383,12\)-\(383,16\): requires clause
+// CHECK:       ProofDependencies.dfy\(384,11\)-\(384,15\): ensures clause
+// CHECK:       ProofDependencies.dfy\(389,5\)-\(389,17\): assignment \(or return\)
+//
+// CHECK: Results for M.ObviouslyUnreachableMatchExpressionCaseFunction \(well-formedness\)
+//
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(395,1\)-\(403,1\): function definition for ObviouslyUnreachableMatchExpressionCaseFunction
+// CHECK:       ProofDependencies.dfy\(396,12\)-\(396,17\): requires clause
+// CHECK:       ProofDependencies.dfy\(397,11\)-\(397,15\): ensures clause
+// CHECK:       ProofDependencies.dfy\(401,15\)-\(401,15\): function call result
+//
+// CHECK: Results for M.ObviouslyUnreachableMatchStatementCaseMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(406,12\)-\(406,17\): requires clause
+// CHECK:       ProofDependencies.dfy\(407,11\)-\(407,15\): ensures clause
+// CHECK:       ProofDependencies.dfy\(411,15\)-\(411,23\): assignment \(or return\)
+//
+// CHECK: Results for M.ObviouslyUnreachableReturnStatementMethod \(correctness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(416,12\)-\(416,17\): requires clause
+// CHECK:       ProofDependencies.dfy\(417,13\)-\(417,17\): ensures clause
+// CHECK:       ProofDependencies.dfy\(420,7\)-\(420,15\): assignment \(or return\)
+// CHECK:     Unused by proof:
+// CHECK:       ProofDependencies.dfy\(428,5\)-\(428,9\): assumption that divisor is always non-zero.
+// CHECK:       ProofDependencies.dfy\(428,5\)-\(428,9\): calc statement result
+//
+// CHECK: Results for M.GetX \(well-formedness\)
+// CHECK:     Proof dependencies:
+// CHECK:       ProofDependencies.dfy\(446,3\)-\(446,5\): target object is never null
+
+include "ProofDependencies.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyWarnings.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyWarnings.dfy
new file mode 100644
index 00000000000..ec9f858c237
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyWarnings.dfy
@@ -0,0 +1,7 @@
+// RUN: %baredafny verify --use-basename-for-filename --allow-axioms --show-snippets false --verify-included-files --warn-contradictory-assumptions --warn-redundant-assumptions --allow-warnings "%s" > "%t.new"
+// RUN: %diff "%s.expect" "%t.new"
+// Also test old CLI
+// RUN: %baredafny /compile:0 /useBaseNameForFileName /verifyAllModules /warnContradictoryAssumptions /warnRedundantAssumptions "%s" > "%t.old"
+// RUN: %diff "%s.expect2" "%t.old"
+
+include "ProofDependencies.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyWarnings.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyWarnings.dfy.expect
new file mode 100644
index 00000000000..2deed6d26b2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyWarnings.dfy.expect
@@ -0,0 +1,20 @@
+ProofDependencies.dfy(176,11): Warning: unnecessary (or partly unnecessary) assume statement
+ProofDependencies.dfy(185,11): Warning: unnecessary (or partly unnecessary) assume statement
+ProofDependencies.dfy(186,4): Warning: proved using contradictory assumptions: assertion always holds. (Use the `{:contradiction}` attribute on the `assert` statement to silence.)
+ProofDependencies.dfy(191,11): Warning: unnecessary (or partly unnecessary) assume statement
+ProofDependencies.dfy(193,4): Warning: proved using contradictory assumptions: assertion always holds. (Use the `{:contradiction}` attribute on the `assert` statement to silence.)
+ProofDependencies.dfy(202,2): Warning: proved using contradictory assumptions: assertion always holds. (Use the `{:contradiction}` attribute on the `assert` statement to silence.)
+ProofDependencies.dfy(203,2): Warning: proved using contradictory assumptions: value always satisfies the subset constraints of 'nat'
+ProofDependencies.dfy(209,10): Warning: ensures clause proved using contradictory assumptions
+ProofDependencies.dfy(211,2): Warning: proved using contradictory assumptions: assertion always holds. (Use the `{:contradiction}` attribute on the `assert` statement to silence.)
+ProofDependencies.dfy(212,9): Warning: proved using contradictory assumptions: value always satisfies the subset constraints of 'nat'
+ProofDependencies.dfy(226,11): Warning: unnecessary requires clause
+ProofDependencies.dfy(241,11): Warning: unnecessary requires clause
+ProofDependencies.dfy(298,11): Warning: unnecessary requires clause
+ProofDependencies.dfy(299,11): Warning: unnecessary requires clause
+ProofDependencies.dfy(321,11): Warning: unnecessary requires clause
+ProofDependencies.dfy(346,10): Warning: ensures clause proved using contradictory assumptions
+ProofDependencies.dfy(354,23): Warning: unnecessary requires clause
+ProofDependencies.dfy(363,9): Warning: unnecessary (or partly unnecessary) assert statement
+
+Dafny program verifier finished with 32 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyWarnings.dfy.expect2 b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyWarnings.dfy.expect2
new file mode 100644
index 00000000000..964a6aa8c9e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ProofDependencyWarnings.dfy.expect2
@@ -0,0 +1,21 @@
+Warning: this way of using the CLI is deprecated. Use 'dafny --help' to see help for the new Dafny CLI format
+ProofDependencies.dfy(176,11): Warning: unnecessary (or partly unnecessary) assume statement
+ProofDependencies.dfy(185,11): Warning: unnecessary (or partly unnecessary) assume statement
+ProofDependencies.dfy(186,4): Warning: proved using contradictory assumptions: assertion always holds. (Use the `{:contradiction}` attribute on the `assert` statement to silence.)
+ProofDependencies.dfy(191,11): Warning: unnecessary (or partly unnecessary) assume statement
+ProofDependencies.dfy(193,4): Warning: proved using contradictory assumptions: assertion always holds. (Use the `{:contradiction}` attribute on the `assert` statement to silence.)
+ProofDependencies.dfy(202,2): Warning: proved using contradictory assumptions: assertion always holds. (Use the `{:contradiction}` attribute on the `assert` statement to silence.)
+ProofDependencies.dfy(203,2): Warning: proved using contradictory assumptions: value always satisfies the subset constraints of 'nat'
+ProofDependencies.dfy(209,10): Warning: ensures clause proved using contradictory assumptions
+ProofDependencies.dfy(211,2): Warning: proved using contradictory assumptions: assertion always holds. (Use the `{:contradiction}` attribute on the `assert` statement to silence.)
+ProofDependencies.dfy(212,9): Warning: proved using contradictory assumptions: value always satisfies the subset constraints of 'nat'
+ProofDependencies.dfy(226,11): Warning: unnecessary requires clause
+ProofDependencies.dfy(241,11): Warning: unnecessary requires clause
+ProofDependencies.dfy(298,11): Warning: unnecessary requires clause
+ProofDependencies.dfy(299,11): Warning: unnecessary requires clause
+ProofDependencies.dfy(321,11): Warning: unnecessary requires clause
+ProofDependencies.dfy(346,10): Warning: ensures clause proved using contradictory assumptions
+ProofDependencies.dfy(354,23): Warning: unnecessary requires clause
+ProofDependencies.dfy(363,9): Warning: unnecessary (or partly unnecessary) assert statement
+
+Dafny program verifier finished with 32 verified, 0 errors
diff --git a/Test/logger/ResCountXML.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ResCountXML.dfy
similarity index 100%
rename from Test/logger/ResCountXML.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/ResCountXML.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/TextLogger.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/TextLogger.dfy
new file mode 100644
index 00000000000..713aa84b418
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/TextLogger.dfy
@@ -0,0 +1,36 @@
+// RUN: %exits-with 4 %baredafny verify --show-snippets:false --log-format:text --isolate-assertions "%s" > "%t"
+// RUN: %exits-with 4 %baredafny /compile:0 /verificationLogger:text /vcsSplitOnEveryAssert "%s" >> "%t"
+// RUN: %OutputCheck --file-to-check "%t" "%s"
+// CHECK: Overall outcome: Errors
+// CHECK: Overall time: .*
+// CHECK: Overall resource count: .*
+// CHECK: Maximum assertion batch time: .*
+// CHECK: Maximum assertion batch resource count: .*
+// CHECK: Outcome: Valid
+// CHECK: Duration: .*
+// CHECK: Resource count: .*
+// CHECK: TextLogger.dfy\(34,14\): divisor is always non-zero
+// CHECK: Outcome: Invalid
+// CHECK: Duration: .*
+// CHECK: Resource count: .*
+// CHECK: TextLogger.dfy\(35,3\): assertion always holds
+// CHECK: Overall outcome: Errors
+// CHECK: Overall time: .*
+// CHECK: Overall resource count: .*
+// CHECK: Maximum assertion batch time: .*
+// CHECK: Maximum assertion batch resource count: .*
+// CHECK: Outcome: Valid
+// CHECK: Duration: .*
+// CHECK: Resource count: .*
+// CHECK: TextLogger.dfy\(34,14\): divisor is always non-zero
+// CHECK: Outcome: Invalid
+// CHECK: Duration: .*
+// CHECK: Resource count: .*
+// CHECK: TextLogger.dfy\(35,3\): assertion always holds
+method M(x: int, y: int)
+  requires y > 0
+  requires x > 0
+{
+  var d := x / y;
+  assert(d * y == x); // Should fail
+}
diff --git a/Test/logger/TextLoggerBatch.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/TextLoggerBatch.dfy
similarity index 90%
rename from Test/logger/TextLoggerBatch.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/TextLoggerBatch.dfy
index 7981884545a..14286dda933 100644
--- a/Test/logger/TextLoggerBatch.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/TextLoggerBatch.dfy
@@ -9,7 +9,7 @@
 // CHECK: Duration: .*
 // CHECK: Resource count: .*
 // CHECK: TextLoggerBatch.dfy\(17,14\): divisor is always non-zero
-// CHECK: TextLoggerBatch.dfy\(18,9\): assertion always holds
+// CHECK: TextLoggerBatch.dfy\(18,3\): assertion always holds
 method M(x: int, y: int)
   requires y > 0
   requires x > 0
diff --git a/Test/logger/TripleDescription.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/TripleDescription.dfy
similarity index 100%
rename from Test/logger/TripleDescription.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/TripleDescription.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/VerboseName.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/VerboseName.dfy
new file mode 100644
index 00000000000..4ea12ecb8d9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/VerboseName.dfy
@@ -0,0 +1,29 @@
+// RUN: %verify --progress Symbol --cores 1 "%s" > "%t"
+// RUN: %OutputCheck --file-to-check "%t" "%s"
+// CHECK-L:Verified 0/5 symbols. Waiting for smallPrime to verify.
+// CHECK-L:Verified 2/5 symbols. Waiting for posIdMeth to verify.
+// CHECK-L:Verified 4/5 symbols. Waiting for AM1.T2Client.Calc to verify.
+newtype smallPrime = x: int | x in {2, 3, 5, 7} witness 2
+
+function posId(x: smallPrime): smallPrime {
+  x
+}
+
+method posIdMeth(x: smallPrime) returns (r: int)
+  ensures r > 0
+{
+  r := posId(x) as int;
+}
+
+abstract module AM1
+{
+  trait T2
+  {
+    method Calc(i:int, j:int) returns (k:int)
+  }
+
+  class T2Client extends T2
+  {
+    method Calc(ii:int, jj:int) returns (kk:int)
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/VerificationLogger.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/VerificationLogger.dfy
new file mode 100644
index 00000000000..9d01a6aab96
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/logger/VerificationLogger.dfy
@@ -0,0 +1,43 @@
+// RUN: %exits-with 4 %baredafny measure-complexity --iterations=3 --random-seed=1 --log-format:trx";"LogFileName="%t.trx" "%s"
+// RUN: %OutputCheck --file-to-check "%t.trx" "%s"
+
+// CHECK: \<UnitTestResult.* testName="ExampleWithSplits \(correctness\) \(assertion batch 3\).*\>
+// CHECK: \<UnitTestResult.* testName="ExampleWithSplits \(correctness\) \(assertion batch 3\).*\>
+// CHECK: \<UnitTestResult.* testName="ExampleWithSplits \(correctness\) \(assertion batch 3\).*\>
+
+method ExampleWithSplits() returns (y: int)
+  ensures y >= 0
+{
+  var x: int;
+  x := 5;
+  y := 0;
+  while (x > 0)
+    invariant x + y == 5
+    invariant x*x <= 25
+  {
+    x := x - 1;
+    assert {:split_here} (x+y) * (x+y) > 25;
+    y := y + 1;
+    if (x < 3) {
+      assert 2 < 2;
+      assert {:split_here} y*y > 4;
+    }
+    else {
+      assert {:split_here} y*y*y < 8;
+      assert 2 < 2;
+    }
+    assert {:split_here} (x+y) * (x+y) == 25;
+  }
+}
+
+method ExampleWithoutSplits() {
+  assert 1 + 1 == 2;
+  assert 2 + 2 == 4;
+  assert 3 + 3 == 6;
+}
+
+method AnotherExampleWithoutSplits() {
+  assert 1 + 1 == 2;
+  assert 2 + 2 == 4;
+  assert 3 + 3 == 6;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/ConsistentWhenSupported.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/ConsistentWhenSupported.dfy
new file mode 100644
index 00000000000..a0be8cda7c7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/ConsistentWhenSupported.dfy
@@ -0,0 +1,26 @@
+
+// Old way:
+
+// RUN: %exits-with 0 %verify "%s" > "%t"
+// RUN: %exits-with 0 %run --no-verify --target cs "%s" >> "%t"
+// RUN: %exits-with 0 %run --no-verify --target js "%s" >> "%t"
+// RUN: %exits-with 0 %run --no-verify --target go "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target java "%s" >> "%t"
+// RUN: %exits-with 3 %run --no-verify --target cpp "%s" >> "%t"
+// RUN: %exits-with 0 %run --no-verify --target py "%s" >> "%t"
+// RUN: %diff "%s.oldway.expect" "%t"
+
+// New way:
+
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
+
+iterator EmptyIterator() yields (r: bool) 
+  ensures false
+{}
+
+method Main() {
+  var i := new EmptyIterator();
+  var more := i.MoveNext();
+  expect !more;
+  print "All done iterating!\n";
+}
diff --git a/Test/metatests/ConsistentWhenSupported.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/ConsistentWhenSupported.dfy.expect
similarity index 100%
rename from Test/metatests/ConsistentWhenSupported.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/ConsistentWhenSupported.dfy.expect
diff --git a/Test/metatests/ConsistentWhenSupported.dfy.oldway.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/ConsistentWhenSupported.dfy.oldway.expect
similarity index 100%
rename from Test/metatests/ConsistentWhenSupported.dfy.oldway.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/ConsistentWhenSupported.dfy.oldway.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/ConsistentWhenSupported.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/ConsistentWhenSupported.dfy.rs.check
new file mode 100644
index 00000000000..94cce2fbf30
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/ConsistentWhenSupported.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Iterators</i>.*
\ No newline at end of file
diff --git a/Test/metatests/EachResolverUniformSuccess.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/EachResolverUniformSuccess.dfy
similarity index 100%
rename from Test/metatests/EachResolverUniformSuccess.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/EachResolverUniformSuccess.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/EachResolverUniformSuccess.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/EachResolverUniformSuccess.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/EachResolverUniformSuccess.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/InconsistentCompilerBehavior.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/InconsistentCompilerBehavior.dfy
new file mode 100644
index 00000000000..d0a9d5c6332
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/InconsistentCompilerBehavior.dfy
@@ -0,0 +1,13 @@
+// Note we specify the set of compilers to test explicitly since we're looking at the actual output,
+// and otherwise using DAFNY_INTEGRATION_TESTS_ONLY_COMPILERS breaks this test.
+
+// RUN: ! %testDafnyForEachCompiler --refresh-exit-code=0 --compilers cs,java,go,js,cpp,dfy,py,rs "%s" > "%t"
+// RUN: %diff "%s.testdafny.expect" "%t"
+
+// A %testdafny test case expected to fail, since the given
+// output is different than any actual output
+
+method Main() {
+  var i := 0;
+  print i, "\n";
+}
diff --git a/Test/metatests/InconsistentCompilerBehavior.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/InconsistentCompilerBehavior.dfy.expect
similarity index 100%
rename from Test/metatests/InconsistentCompilerBehavior.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/InconsistentCompilerBehavior.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/InconsistentCompilerBehavior.dfy.testdafny.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/InconsistentCompilerBehavior.dfy.testdafny.expect
new file mode 100644
index 00000000000..7e24d9e430a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/InconsistentCompilerBehavior.dfy.testdafny.expect
@@ -0,0 +1,54 @@
+Using legacy resolver and verifying...
+Using refresh resolver and verifying...
+Executing on C#...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-Different than any output
++0
+ 
+
+Executing on C# (with --include-runtime:false)...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-Different than any output
++0
+ 
+
+Executing on JavaScript...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-Different than any output
++0
+ 
+
+Executing on Go...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-Different than any output
++0
+ 
+
+Executing on Java...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-Different than any output
++0
+ 
+
+Executing on Python...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-Different than any output
++0
+ 
+
+Executing on C++...
+Executing on Rust...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-Different than any output
++0
+ 
+
+(non-blocking) The Rust code generator is internal. Not having a '*.rs.check' file is acceptable for now.
+Executing on ResolvedDesugaredExecutableDafny...
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/LegacyResolverFails.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/LegacyResolverFails.dfy
new file mode 100644
index 00000000000..1489346e55b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/LegacyResolverFails.dfy
@@ -0,0 +1,11 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 --refresh-exit-code=0 "%s" -- --relax-definite-assignment
+
+const X := 1
+
+method LegacyTypeSystemCannotInferTypes() {
+  var c; // error: type inferred to be int in refresh resolver, but fails in legacy resolver
+  match c
+  case X => // the literal 1
+    assert c == 1;
+  case Xyz => // a bound variable
+}
diff --git a/Test/metatests/LegacyResolverFails.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/LegacyResolverFails.dfy.expect
similarity index 100%
rename from Test/metatests/LegacyResolverFails.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/LegacyResolverFails.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/LegacyResolverFails.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/LegacyResolverFails.dfy.refresh.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/LegacyResolverFails.dfy.refresh.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/metatests/OutputEncoding.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/OutputEncoding.dfy
similarity index 86%
rename from Test/metatests/OutputEncoding.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/OutputEncoding.dfy
index 59fa53bf298..e55946b0bdf 100644
--- a/Test/metatests/OutputEncoding.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/OutputEncoding.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s"
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"
 
 method Main() {
   // This works fine in all languages because € is a single UTF-16 code unit.
diff --git a/Test/metatests/OutputEncoding.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/OutputEncoding.dfy.expect
similarity index 100%
rename from Test/metatests/OutputEncoding.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/OutputEncoding.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/OutputEncoding.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/OutputEncoding.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/OutputEncoding.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/metatests/README.md b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/README.md
similarity index 100%
rename from Test/metatests/README.md
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/README.md
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/RefreshResolverFails.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/RefreshResolverFails.dfy
new file mode 100644
index 00000000000..861da2276b7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/RefreshResolverFails.dfy
@@ -0,0 +1,9 @@
+// RUN: %testDafnyForEachResolver --refresh-exit-code=2 "%s"
+
+trait Trait { }
+class Class extends Trait { }
+
+method M(c: Class) {
+  var t: Trait := c;
+  var d: Class := t; // error: needs an "as Class" in refresh resolver
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/RefreshResolverFails.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/RefreshResolverFails.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/RefreshResolverFails.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/RefreshResolverFails.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/RefreshResolverFails.dfy.refresh.expect
new file mode 100644
index 00000000000..b5fabb017a5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/RefreshResolverFails.dfy.refresh.expect
@@ -0,0 +1,2 @@
+RefreshResolverFails.dfy(8,15): Error: RHS (of type Trait) not assignable to LHS (of type Class)
+1 resolution/type errors detected in RefreshResolverFails.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/StdLibsOffByDefaultInTests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/StdLibsOffByDefaultInTests.dfy
new file mode 100644
index 00000000000..89720448818
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/StdLibsOffByDefaultInTests.dfy
@@ -0,0 +1,13 @@
+
+// RUN: %exits-with 2 %verify --allow-axioms "%s" > "%t"
+// RUN: %verify --standard-libraries:true --allow-axioms "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t" 
+
+module TriesToUseWrappers {
+
+  import opened Std.Wrappers
+
+  function SafeDiv(a: int, b: int): Option<int> {
+    if b == 0 then None else Some(a/b)
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/StdLibsOffByDefaultInTests.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/StdLibsOffByDefaultInTests.dfy.expect
new file mode 100644
index 00000000000..8eec6b450fe
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/StdLibsOffByDefaultInTests.dfy.expect
@@ -0,0 +1,4 @@
+StdLibsOffByDefaultInTests.dfy(8,20): Error: module Std does not exist (position 0 in path Std.Wrappers)
+1 resolution/type errors detected in StdLibsOffByDefaultInTests.dfy
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy
new file mode 100644
index 00000000000..bda4fbd421e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy
@@ -0,0 +1,12 @@
+// Note we specify the set of compilers to test explicitly since we're looking at the actual output,
+// and otherwise using DAFNY_INTEGRATION_TESTS_ONLY_COMPILERS breaks this test.
+
+// RUN: ! %testDafnyForEachCompiler --refresh-exit-code=0 --compilers cs,java,go,js,cpp,dfy,py,rs "%s" -- --allow-warnings > "%t"
+// RUN: %diff "%s.testdafny.expect" "%t"
+
+method Main() {
+  ghost var n := 15;
+  if j :| 0 <= j < n { // this gives a no-trigger warning
+  }
+  print "hello\n";
+}
diff --git a/Test/metatests/TestBeyondVerifierExpect.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy.expect
similarity index 100%
rename from Test/metatests/TestBeyondVerifierExpect.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy.testdafny.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy.testdafny.expect
new file mode 100644
index 00000000000..a881545e3bb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy.testdafny.expect
@@ -0,0 +1,54 @@
+Using legacy resolver and verifying...
+Using refresh resolver and verifying...
+Executing on C#...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-good bye
++hello
+ 
+
+Executing on C# (with --include-runtime:false)...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-good bye
++hello
+ 
+
+Executing on JavaScript...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-good bye
++hello
+ 
+
+Executing on Go...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-good bye
++hello
+ 
+
+Executing on Java...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-good bye
++hello
+ 
+
+Executing on Python...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-good bye
++hello
+ 
+
+Executing on C++...
+Executing on Rust...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-good bye
++hello
+ 
+
+(non-blocking) The Rust code generator is internal. Not having a '*.rs.check' file is acceptable for now.
+Executing on ResolvedDesugaredExecutableDafny...
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy.verifier.expect
new file mode 100644
index 00000000000..14b278fe2ec
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestBeyondVerifierExpect.dfy.verifier.expect
@@ -0,0 +1 @@
+TestBeyondVerifierExpect.dfy(9,5): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestDoesNotVerify.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestDoesNotVerify.dfy
new file mode 100644
index 00000000000..ede44dc126b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestDoesNotVerify.dfy
@@ -0,0 +1,8 @@
+// RUN: ! %testDafnyForEachCompiler --refresh-exit-code=0 "%s" > "%t"
+// RUN: %diff "%s.testdafny.expect" "%t"
+
+method Main() {
+  ghost var n := 15;
+  assert n < 12; // error: the verifier complains about this
+  print "hello\n";
+}
diff --git a/Test/metatests/TestDoesNotVerify.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestDoesNotVerify.dfy.expect
similarity index 100%
rename from Test/metatests/TestDoesNotVerify.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestDoesNotVerify.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestDoesNotVerify.dfy.testdafny.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestDoesNotVerify.dfy.testdafny.expect
new file mode 100644
index 00000000000..336bffcf501
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestDoesNotVerify.dfy.testdafny.expect
@@ -0,0 +1,7 @@
+Using legacy resolver and verifying...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-TestDoesNotVerify.dfy(6,11): Error: assertion might not hold
++TestDoesNotVerify.dfy(6,2): Error: assertion might not hold
+ 
+
diff --git a/Test/metatests/TestDoesNotVerify.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestDoesNotVerify.dfy.verifier.expect
similarity index 100%
rename from Test/metatests/TestDoesNotVerify.dfy.verifier.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestDoesNotVerify.dfy.verifier.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestMissingVerifierExpect.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestMissingVerifierExpect.dfy
new file mode 100644
index 00000000000..c65f797db0a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestMissingVerifierExpect.dfy
@@ -0,0 +1,9 @@
+// RUN: ! %testDafnyForEachCompiler --refresh-exit-code=0 "%s" > "%t"
+// RUN: %diff "%s.testdafny.expect" "%t"
+
+method Main() {
+  ghost var n := 15;
+  if j :| 0 <= j < n { // this gives a no-trigger warning
+  }
+  print "hello\n";
+}
diff --git a/Test/metatests/TestMissingVerifierExpect.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestMissingVerifierExpect.dfy.expect
similarity index 100%
rename from Test/metatests/TestMissingVerifierExpect.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestMissingVerifierExpect.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestMissingVerifierExpect.dfy.testdafny.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestMissingVerifierExpect.dfy.testdafny.expect
new file mode 100644
index 00000000000..b73dd50e4ae
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestMissingVerifierExpect.dfy.testdafny.expect
@@ -0,0 +1,7 @@
+Using legacy resolver and verifying...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
++TestMissingVerifierExpect.dfy(6,5): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
++Compilation failed because warnings were found and --allow-warnings is false
++
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestWrongVerifierExpect.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestWrongVerifierExpect.dfy
new file mode 100644
index 00000000000..c65f797db0a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestWrongVerifierExpect.dfy
@@ -0,0 +1,9 @@
+// RUN: ! %testDafnyForEachCompiler --refresh-exit-code=0 "%s" > "%t"
+// RUN: %diff "%s.testdafny.expect" "%t"
+
+method Main() {
+  ghost var n := 15;
+  if j :| 0 <= j < n { // this gives a no-trigger warning
+  }
+  print "hello\n";
+}
diff --git a/Test/metatests/TestWrongVerifierExpect.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestWrongVerifierExpect.dfy.expect
similarity index 100%
rename from Test/metatests/TestWrongVerifierExpect.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestWrongVerifierExpect.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestWrongVerifierExpect.dfy.testdafny.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestWrongVerifierExpect.dfy.testdafny.expect
new file mode 100644
index 00000000000..a619131d401
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestWrongVerifierExpect.dfy.testdafny.expect
@@ -0,0 +1,8 @@
+Using legacy resolver and verifying...
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+-warning: out of bananas
++TestWrongVerifierExpect.dfy(6,5): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
++Compilation failed because warnings were found and --allow-warnings is false
+ 
+
diff --git a/Test/metatests/TestWrongVerifierExpect.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestWrongVerifierExpect.dfy.verifier.expect
similarity index 100%
rename from Test/metatests/TestWrongVerifierExpect.dfy.verifier.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/metatests/TestWrongVerifierExpect.dfy.verifier.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/name with space/run.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/name with space/run.dfy
new file mode 100644
index 00000000000..b7267316e1c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/name with space/run.dfy	
@@ -0,0 +1,6 @@
+// RUN: %exits-with 0 %run "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main() {
+  print "hello";
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/name with space/run.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/name with space/run.dfy.expect
new file mode 100644
index 00000000000..760564c0b54
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/name with space/run.dfy.expect	
@@ -0,0 +1,3 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+hello
\ No newline at end of file
diff --git a/Test/new-cli-help.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/new-cli-help.dfy
similarity index 100%
rename from Test/new-cli-help.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/new-cli-help.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/newtype/aliases.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/newtype/aliases.dfy
new file mode 100644
index 00000000000..0c23a21cdae
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/newtype/aliases.dfy
@@ -0,0 +1,6 @@
+// RUN: %baredafny resolve --use-basename-for-filename %s > %t
+// RUN: %diff "%s.expect" %t
+
+newtype VerySpecificInt = x : SpecificIntAlias | x == 1 witness 1
+type SpecificIntAlias = SpecificInt
+newtype SpecificInt = x : int | 0 <= x <= 10
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/newtype/aliases.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/newtype/aliases.dfy.expect
new file mode 100644
index 00000000000..f829807e3d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/newtype/aliases.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier did not attempt verification
diff --git a/Test/patterns/OrPatternErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatternErrors.dfy
similarity index 91%
rename from Test/patterns/OrPatternErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatternErrors.dfy
index 19df77d228b..b3ceae90dd9 100644
--- a/Test/patterns/OrPatternErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatternErrors.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0  "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module SanityChecks {
diff --git a/Test/patterns/OrPatternErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatternErrors.dfy.expect
similarity index 100%
rename from Test/patterns/OrPatternErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatternErrors.dfy.expect
diff --git a/Test/patterns/OrPatterns.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatterns.dfy
similarity index 86%
rename from Test/patterns/OrPatterns.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatterns.dfy
index 6385bd55c93..ab52479f90f 100644
--- a/Test/patterns/OrPatterns.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatterns.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 datatype Enum = One | Two | Three {
   predicate Even() {
@@ -123,6 +123,30 @@ method Main() {
   var b6 := F2(A);
   var b7 := F2(B);
   expect 1 == b0 == b1 == b2 == b3 == b4 == b5 == b6 == b7;
+
+  MoreOrTests.Test();
   
   print "OK\n";
 }
+
+module MoreOrTests {
+  datatype Dt = A | B | C | D | E | F | G
+
+  method Test() {
+    M(A);
+    M(B);
+    M(C);
+    M(D);
+    M(E);
+    M(F);
+    M(G);
+  }
+
+  method M(d: Dt) {
+    match d
+    case A | B => print "AB\n";
+    case C => print "C\n";
+    case D | E => print "DE\n";
+    case F | G => print "FG\n";
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatterns.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatterns.dfy.expect
new file mode 100644
index 00000000000..225f08e4fcb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/OrPatterns.dfy.expect
@@ -0,0 +1,8 @@
+AB
+AB
+C
+DE
+DE
+FG
+FG
+OK
diff --git a/Test/patterns/PatternMatching.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatching.dfy
similarity index 97%
rename from Test/patterns/PatternMatching.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatching.dfy
index e8a73b856e4..152a89ee487 100644
--- a/Test/patterns/PatternMatching.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatching.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings --relax-definite-assignment
 
 /*
 *  This file contains a collection of tests for features modified or introduced in PR 458
diff --git a/Test/patterns/PatternMatching.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatching.dfy.expect
similarity index 100%
rename from Test/patterns/PatternMatching.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatching.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatching.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatching.dfy.rs.check
new file mode 100644
index 00000000000..172ffa95066
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatching.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Coercion\ from\ ::std::rc::Rc<super::_module::List<::dafny_runtime::DafnyInt>>\ to\ ::std::rc::Rc<super::_module::List<super::_System::nat>></i>.*
\ No newline at end of file
diff --git a/Test/patterns/PatternMatching.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatching.dfy.verifier.expect
similarity index 100%
rename from Test/patterns/PatternMatching.dfy.verifier.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatching.dfy.verifier.expect
diff --git a/Test/patterns/PatternMatchingErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatchingErrors.dfy
similarity index 97%
rename from Test/patterns/PatternMatchingErrors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatchingErrors.dfy
index 4a06275f794..c716a26b9f6 100644
--- a/Test/patterns/PatternMatchingErrors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatchingErrors.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /errorLimit:0 "%s" > "%t"
+// RUN: %exits-with 4 %verify --error-limit 0 "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 /*
diff --git a/Test/patterns/PatternMatchingErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatchingErrors.dfy.expect
similarity index 100%
rename from Test/patterns/PatternMatchingErrors.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/PatternMatchingErrors.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/abstractModuleAndMatchFlattening.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/abstractModuleAndMatchFlattening.dfy
new file mode 100644
index 00000000000..87ababfca31
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/abstractModuleAndMatchFlattening.dfy
@@ -0,0 +1,14 @@
+// RUN: %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+abstract module FooM {
+
+  method Foo(x: int) returns (r: int) modifies match x { case 0 => {} case _ => {} } ensures r == 3
+}
+
+abstract module Bla {
+  import Operations : FooM
+
+  method Foo(x: int) returns (r: int) {
+    r := Operations.Foo(3);
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/abstractModuleAndMatchFlattening.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/abstractModuleAndMatchFlattening.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/abstractModuleAndMatchFlattening.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/constructorInsteadOfTuple.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/constructorInsteadOfTuple.dfy
new file mode 100644
index 00000000000..2193c829843
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/constructorInsteadOfTuple.dfy
@@ -0,0 +1,29 @@
+// RUN: ! %resolve "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype Expr =
+    | Const(value: int)
+    | Var(name: string)
+    | Add(left: Expr, right: Expr)
+    | Mult(left: Expr, right: Expr)
+
+function Optimize(expr: Expr): Expr
+{
+    match expr
+        case Const(value) => Const(value)
+        case Var(name) => Var(name)
+        case Add(left, right) =>
+            match (Optimize(left), Optimize(right))
+                case (Const(lv), Const(rv)) => Const(lv + rv)
+                case (Const(0), rv) => rv
+                case (lv, Const(0)) => lv
+                case (lv, rv) => Add(lv, rv)
+                case Mult(left, right) =>
+                    match (Optimize(left), Optimize(right))
+                        case (Const(lv), Const(rv)) => Const(lv * rv)
+                        case (Const(0), _) => Const(0)
+                        case (_, Const(0)) => Const(0)
+                        case (Const(1), rv) => rv
+                        case (lv, Const(1)) => lv
+                        case (lv, rv) => Mult(lv, rv)
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/constructorInsteadOfTuple.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/constructorInsteadOfTuple.dfy.expect
new file mode 100644
index 00000000000..4c346e0489a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/constructorInsteadOfTuple.dfy.expect
@@ -0,0 +1,2 @@
+constructorInsteadOfTuple.dfy(21,21): Error: found constructor Mult but expected a 2-tuple
+1 resolution/type errors detected in constructorInsteadOfTuple.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/nested.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/nested.dfy
new file mode 100644
index 00000000000..1231bf8b11d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/nested.dfy
@@ -0,0 +1,17 @@
+// RUN: %exits-with 4 %verify "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+lemma test()
+{
+    match 0
+    case 0 =>
+      forall i: nat ensures match true {}
+}
+
+datatype T = X
+lemma Crash(e: T)
+{
+  match e
+  case X =>
+    assert forall k :: match k == true case p => p;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/nested.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/nested.dfy.expect
new file mode 100644
index 00000000000..13786c9c758
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/patterns/nested.dfy.expect
@@ -0,0 +1,7 @@
+nested.dfy(8,6): Warning: this forall statement has no body
+nested.dfy(8,6): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+nested.dfy(16,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+nested.dfy(8,28): Error: match has no cases and this is only allowed when the verifier can prove the match is unreachable
+nested.dfy(16,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/printing/Inputs/included.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/printing/Inputs/included.dfy
new file mode 100644
index 00000000000..844a5f2234b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/printing/Inputs/included.dfy
@@ -0,0 +1,2 @@
+method Foo() {
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/printing/ModulePrint.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/printing/ModulePrint.dfy
new file mode 100644
index 00000000000..b0d5a64a1d7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/printing/ModulePrint.dfy
@@ -0,0 +1,42 @@
+// NONUNIFORM: Tests printing much more than compilation
+// RUN: %resolve --print "%t.dfy" "%s" > "%t"
+// RUN: %resolve --print-mode Serialization --print:"%t1.dfy" "%t.dfy" >> "%t"
+// RUN: %run --print-mode Serialization --print:"%t2.dfy" "%t1.dfy" >> "%t"
+// RUN: %resolve --print-mode NoGhostOrIncludes --print:"%t3.dfy" %s >> "%t"
+// RUN: %resolve --print-mode NoIncludes --print:"%t4.dfy" %s >> "%t"
+// RUN: %diff "%t1.dfy" "%t2.dfy" >> "%t"
+// RUN: ! %diff "%t.dfy" "%t3.dfy" >> "%t"
+// RUN: ! %diff "%t.dfy" "%t4.dfy" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+include "./Inputs/included.dfy"
+
+abstract module S {
+  class C {
+    var f: int
+    ghost var g: int
+    var h: int
+    method m()
+      modifies this
+  }
+}
+
+module T refines S {
+  class C ... {
+    ghost var h: int  // change from non-ghost to ghost
+    ghost var j: int
+    var k: int
+    constructor () { }
+    method m()
+      ensures h == h
+      ensures j == j
+    {
+      assert k == k;
+    }
+  }
+}
+
+method Main() {
+  var c := new T.C();
+  c.m();
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/printing/ModulePrint.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/printing/ModulePrint.dfy.expect
new file mode 100644
index 00000000000..20a4b7452ad
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/printing/ModulePrint.dfy.expect
@@ -0,0 +1,99 @@
+
+Dafny program verifier did not attempt verification
+
+Dafny program verifier did not attempt verification
+
+Dafny program verifier finished with 2 verified, 0 errors
+
+Dafny program verifier did not attempt verification
+
+Dafny program verifier did not attempt verification
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+ // ModulePrint.dfy
+ 
+ method Main()
+ {
+   var c := new T.C();
+   c.m();
+ }
+ 
+-method Foo()
+-{
+-}
+-
+ abstract module S {
+   class C {
+     var f: int
+     ghost var g: int
+     var h: int
+ 
+     method m()
+       modifies this
+   }
+ }
+ 
+ module T refines S {
+   class C ... {
+     ghost var h: int
+     ghost var j: int
+     var k: int
+ 
+     constructor ()
+     {
+     }
+ 
+     method m()
+-      ensures h == h
+-      ensures j == j
+     {
+-      assert k == k;
++      
+     }
+   }
+ }
+ 
+AssertEqualWithDiff() Failure
+Diff (changing expected into actual):
+ // ModulePrint.dfy
+ 
+ method Main()
+ {
+   var c := new T.C();
+   c.m();
+ }
+ 
+-method Foo()
+-{
+-}
+-
+ abstract module S {
+   class C {
+     var f: int
+     ghost var g: int
+     var h: int
+ 
+     method m()
+       modifies this
+   }
+ }
+ 
+ module T refines S {
+   class C ... {
+     ghost var h: int
+     ghost var j: int
+     var k: int
+ 
+     constructor ()
+     {
+     }
+ 
+     method m()
+       ensures h == h
+       ensures j == j
+     {
+       assert k == k;
+     }
+   }
+ }
+ 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/alternative-is-complete.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/alternative-is-complete.dfy
new file mode 100644
index 00000000000..800b5b6ed4e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/alternative-is-complete.dfy
@@ -0,0 +1,10 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype D = D0 | D1
+
+method F(d: D) returns (res: D) {
+  if {
+    case d == D0 => return D1;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/alternative-is-complete.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/alternative-is-complete.dfy.expect
new file mode 100644
index 00000000000..1257d10674b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/alternative-is-complete.dfy.expect
@@ -0,0 +1,6 @@
+alternative-is-complete.dfy(7,2): Error: alternative cases fail to cover all possibilities
+ Asserted expression: false
+   in an added catch-all case:
+     case true => ...
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-empty.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-empty.dfy
new file mode 100644
index 00000000000..ca7e77f42f8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-empty.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method ArrayInitEmpty<T>() {
+    var a := new T[1];
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-empty.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-empty.dfy.expect
new file mode 100755
index 00000000000..6066b299e72
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-empty.dfy.expect
@@ -0,0 +1,4 @@
+array-init-empty.dfy(5,13): Error: unless an initializer is provided for the array elements, a new array of 'T' must have empty size
+ Asserted expression: 1 == 0
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-size-valid.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-size-valid.dfy
new file mode 100644
index 00000000000..b31dea25cac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-size-valid.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method ArrayInitSizeValid() {
+    var a := new int[1] [];
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-size-valid.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-size-valid.dfy.expect
new file mode 100755
index 00000000000..385ff209fa2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/array-init-size-valid.dfy.expect
@@ -0,0 +1,4 @@
+array-init-size-valid.dfy(5,21): Error: given array size must agree with the number of expressions in the initializing display (0)
+ Asserted expression: 1 == |[]|
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/assignment-shrinks.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/assignment-shrinks.dfy
new file mode 100644
index 00000000000..31f190a4c66
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/assignment-shrinks.dfy
@@ -0,0 +1,23 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+iterator Repeat(val: int, count: nat) yields (res: int)
+  yield ensures res == val
+{
+  for i := 0 to count { yield val; }
+}
+
+class C {}
+
+method Main() {
+  var repeat := new Repeat(0, 10);
+  var c := new C;
+  while true
+     invariant repeat.Valid() && fresh(repeat._new)
+  {
+    repeat._new := repeat._new + { c };
+    var next := repeat.MoveNext();
+    if (!next) { break; }
+    print next;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/assignment-shrinks.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/assignment-shrinks.dfy.expect
new file mode 100644
index 00000000000..c69f2d8ad78
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/assignment-shrinks.dfy.expect
@@ -0,0 +1,4 @@
+assignment-shrinks.dfy(18,11): Error: an assignment to _new is only allowed to shrink the set
+ Asserted expression: old(allocated(repeat)) && repeat._new <= old(repeat._new)
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/bounded-below.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/bounded-below.dfy
new file mode 100644
index 00000000000..2e137b60319
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/bounded-below.dfy
@@ -0,0 +1,12 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --show-proof-obligation-expressions
+
+method Termination(start: int, up: bool) {
+    for i := start downto *
+      invariant start - 768 < i
+      decreases i - start + 765 // error: not bounded below
+    {
+      if i == start - 768 {
+        return;
+      }
+    }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/bounded-below.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/bounded-below.dfy.expect
new file mode 100644
index 00000000000..1d6dfaaf678
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/bounded-below.dfy.expect
@@ -0,0 +1,5 @@
+bounded-below.dfy(6,26): Error: decreases expression must be bounded below by 0 at end of loop iteration
+ Asserted expression: 0 <= old@LoopEntry(i - start + 765) || i - start + 765 == old@LoopEntry(i - start + 765)
+   with the label `LoopEntry` applied to the loop
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/calc-step.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/calc-step.dfy
new file mode 100644
index 00000000000..4fb28b73746
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/calc-step.dfy
@@ -0,0 +1,40 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+ghost function f(x: int, y: int): int
+
+lemma {:axiom} Associativity(x: int, y: int, z: int)
+  ensures f(x, f(y, z)) == f(f(x, y), z)
+
+lemma {:axiom} Monotonicity(y: int, z: int)
+  requires y <= z
+  ensures forall x :: f(x, y) <= f(x, z)
+
+lemma {:axiom} DiagonalIdentity(x: int)
+  ensures f(x, x) == x
+
+// From these axioms, we can prove a lemma about "f":
+
+method CalculationalStyleProof(a: int, b: int, c: int, x: int)
+  requires c <= x == f(a, b)
+  ensures f(a, f(b, c)) <= x
+{
+  calc == {
+    f(a, f(b, c));
+    { Associativity(a, b, c); }
+    f(f(a, b), c);
+    { assert f(a, b) == x; }
+    f(x, c);
+    { assert c <= x; Monotonicity(c, x); }
+    // Error, because the relation here should be <=, not ==
+    f(x, x);
+    { DiagonalIdentity(x); }
+    x;
+  }
+}
+
+method NoHintProof(x: int) {
+  calc == {
+    x - 1 + 1;
+    x + 1;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/calc-step.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/calc-step.dfy.expect
new file mode 100644
index 00000000000..f477369fd7a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/calc-step.dfy.expect
@@ -0,0 +1,9 @@
+calc-step.dfy(29,5): Error: the calculation step between the previous line and this line could not be proved
+ Asserted expression: f(x, c) == f(x, x)
+   asserted after the following statements:
+     assert c <= x;
+     Monotonicity(c, x);
+calc-step.dfy(38,6): Error: the calculation step between the previous line and this line could not be proved
+ Asserted expression: x - 1 + 1 == x + 1
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-non-unicode.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-non-unicode.dfy
new file mode 100644
index 00000000000..67a9c494f99
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-non-unicode.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 4 %verify --unicode-char=false --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function CanOverflow(c0: char, c1: char): char {
+    c0 + c1
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-non-unicode.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-non-unicode.dfy.expect
new file mode 100755
index 00000000000..e9ef169fb45
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-non-unicode.dfy.expect
@@ -0,0 +1,5 @@
+CLI: Warning: the option unicode-char has been deprecated.
+char-overflow-non-unicode.dfy(5,7): Error: char addition might overflow
+ Asserted expression: 0 <= c0 as int + c1 as int && c0 as int + c1 as int < 65536
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-unicode.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-unicode.dfy
new file mode 100644
index 00000000000..322ce3f0eac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-unicode.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function CanOverflow(c0: char, c1: char): char {
+    c0 + c1
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-unicode.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-unicode.dfy.expect
new file mode 100755
index 00000000000..45fec41a241
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-overflow-unicode.dfy.expect
@@ -0,0 +1,4 @@
+char-overflow-unicode.dfy(5,7): Error: char addition might overflow
+ Asserted expression: (0 <= c0 as int + c1 as int && c0 as int + c1 as int < 55296) || (57344 <= c0 as int + c1 as int && c0 as int + c1 as int < 1114112)
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-non-unicode.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-non-unicode.dfy
new file mode 100644
index 00000000000..be48ec85354
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-non-unicode.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 4 %verify --unicode-char=false --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function CanUnderflow(c0: char, c1: char): char {
+    c0 - c1
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-non-unicode.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-non-unicode.dfy.expect
new file mode 100755
index 00000000000..ed2b2f3c1ee
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-non-unicode.dfy.expect
@@ -0,0 +1,5 @@
+CLI: Warning: the option unicode-char has been deprecated.
+char-underflow-non-unicode.dfy(5,7): Error: char subtraction might underflow
+ Asserted expression: 0 <= c0 as int - c1 as int && c0 as int - c1 as int < 65536
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-unicode.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-unicode.dfy
new file mode 100644
index 00000000000..f24d042b5f9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-unicode.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function CanUnderflow(c0: char, c1: char): char {
+    c0 - c1
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-unicode.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-unicode.dfy.expect
new file mode 100755
index 00000000000..5a010370340
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/char-underflow-unicode.dfy.expect
@@ -0,0 +1,4 @@
+char-underflow-unicode.dfy(5,7): Error: char subtraction might underflow
+ Asserted expression: (0 <= c0 as int - c1 as int && c0 as int - c1 as int < 55296) || (57344 <= c0 as int - c1 as int && c0 as int - c1 as int < 1114112)
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/comprehension-no-alias.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/comprehension-no-alias.dfy
new file mode 100644
index 00000000000..fda25077fdb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/comprehension-no-alias.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function ComprehensionNoAlias(i: nat, j: nat): map<int, nat>
+{
+    map x: nat, y: nat | x < i && y < j :: x + y := x
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/comprehension-no-alias.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/comprehension-no-alias.dfy.expect
new file mode 100644
index 00000000000..0f95b84faf0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/comprehension-no-alias.dfy.expect
@@ -0,0 +1,5 @@
+comprehension-no-alias.dfy(6,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+comprehension-no-alias.dfy(6,45): Error: key expressions might be referring to the same value
+ Asserted expression: forall x: nat, y: nat, x': nat, y': nat | x < i && y < j && x' < i && y' < j && (x != x' || y != y') :: x + y != x' + y' || x == x'
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/concurrent-frame-empty.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/concurrent-frame-empty.dfy
new file mode 100644
index 00000000000..93d7c04163f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/concurrent-frame-empty.dfy
@@ -0,0 +1,15 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions --reads-clauses-on-methods "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class C<T> {}
+
+function {:concurrent} ReadsEmpty<T>(c: C<T>): bool
+    reads {c}
+{
+    true
+}
+
+method {:concurrent} ModifiesEmpty<T>(c: C<T>)
+    reads {}
+    modifies {c}
+{}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/concurrent-frame-empty.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/concurrent-frame-empty.dfy.expect
new file mode 100644
index 00000000000..a0150a7b405
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/concurrent-frame-empty.dfy.expect
@@ -0,0 +1,6 @@
+concurrent-frame-empty.dfy(6,23): Error: reads clause could not be proved to be empty ({:concurrent} restriction)
+ Asserted expression: forall c: C<T> :: ReadsEmpty.reads(c) == {}
+concurrent-frame-empty.dfy(12,21): Error: modifies clause could not be proved to be empty ({:concurrent} restriction)
+ Asserted expression: forall c: C<T> :: ModifiesEmpty.modifies(c) == {}
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-fit.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-fit.dfy
new file mode 100644
index 00000000000..22354e6c09e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-fit.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function ConversionFit(i: int): bv8
+{
+    i as bv8
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-fit.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-fit.dfy.expect
new file mode 100755
index 00000000000..0e4a896a303
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-fit.dfy.expect
@@ -0,0 +1,4 @@
+conversion-fit.dfy(6,6): Error: value to be converted might not fit in bv8
+ Asserted expression: 0 < i && i <= 1 << 8
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-is-natural.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-is-natural.dfy
new file mode 100644
index 00000000000..fe73c1edf43
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-is-natural.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function ConversionIsNatural(ord: ORDINAL): int
+{
+    ord as int
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-is-natural.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-is-natural.dfy.expect
new file mode 100755
index 00000000000..c0725c64dc5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-is-natural.dfy.expect
@@ -0,0 +1,4 @@
+conversion-is-natural.dfy(6,8): Error: value to be converted might be bigger than every natural number
+ Asserted expression: ord is nat
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-positive.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-positive.dfy
new file mode 100644
index 00000000000..7388fe8f59e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-positive.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function ConversionPositive(i: int): ORDINAL
+{
+    i as ORDINAL
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-positive.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-positive.dfy.expect
new file mode 100755
index 00000000000..bbc52694b9d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-positive.dfy.expect
@@ -0,0 +1,4 @@
+conversion-positive.dfy(6,6): Error: a negative integer cannot be converted to an ORDINAL
+ Asserted expression: 0 <= i
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-satisfies-constraints.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-satisfies-constraints.dfy
new file mode 100644
index 00000000000..f4669c1b8a9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-satisfies-constraints.dfy
@@ -0,0 +1,9 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype uint8 = x: int | 0 <= x < 0x100
+
+function ConversionSatisfiesConstraints(i: int): uint8
+{
+    i as uint8
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-satisfies-constraints.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-satisfies-constraints.dfy.expect
new file mode 100755
index 00000000000..cef9b70b74c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/conversion-satisfies-constraints.dfy.expect
@@ -0,0 +1,4 @@
+conversion-satisfies-constraints.dfy(8,6): Error: result of operation might violate newtype constraint for 'uint8'
+ Asserted expression: 0 <= i && i < 256
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/definite-assignment.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/definite-assignment.dfy
new file mode 100644
index 00000000000..d0483aa3ee5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/definite-assignment.dfy
@@ -0,0 +1,89 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class C<G>
+{
+  var x: G
+  const y: G
+  
+  constructor Con0(i: int, a: G, b: G)
+  {
+    if i > 0 {
+      x := a;
+    } else {
+      y := b;
+    }
+    new;
+    if i > 10 {
+      x := y;
+    }
+  }
+}
+
+method M0<G>(i: int, a: G, b: G) returns (x: G, y: G)
+{
+  if i < 0 {
+    x := a;
+  } else if i < 10 {
+    y := b;
+  } else if i < 20 {
+    x := a;
+    y := x;
+  } else if i < 30 {
+    x := y;
+    y := b;
+  }
+}
+
+method M1<G>(i: int, a: G, b: G) returns (x: G, y: G)
+{
+  if i < 0 {
+    return x, y;
+  }
+  return a, b;
+}
+
+method M2<G>(i: int, a: G, b: G) returns (x: G, y: G)
+{
+  if i < 0 {
+    x := a;
+    return x, y;
+  }
+  return a, b;
+}
+
+method M3<G>(i: int, a: G, b: G, c: G) returns (x: G, y: G, z: G)
+{
+  if i < 0 {
+    x := y;
+    return x, y, z;
+  }
+  return a, b, c;
+}
+
+method M4<G>(i: int, a: G, b: G) returns (x: G, y: G)
+{
+  if i < 0 {
+    x := a;
+    return;
+  }
+  return a, b;
+}
+
+method M5<G>(i: int, a: G, b: G, c: G) returns (x: G, y: G, z: G)
+{
+  if i < 0 {
+    x := y;
+    return;
+  }
+  return a, b, c;
+}
+
+method M6<G>(i: int, a: G, b: G) returns (x: G, y: G)
+{
+  if i < 0 {
+    x, y := y, x;
+    return;
+  }
+  return a, b;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/definite-assignment.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/definite-assignment.dfy.expect
new file mode 100644
index 00000000000..ceda23307b2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/definite-assignment.dfy.expect
@@ -0,0 +1,32 @@
+definite-assignment.dfy(16,4): Error: field 'y', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+ Asserted expression: assigned(y)
+definite-assignment.dfy(16,4): Error: field 'x', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
+ Asserted expression: assigned(x)
+definite-assignment.dfy(33,9): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
+ Asserted expression: assigned(y)
+definite-assignment.dfy(36,0): Error: out-parameter 'x', which is subject to definite-assignment rules, might be uninitialized at this return point
+ Asserted expression: assigned(x)
+definite-assignment.dfy(36,0): Error: out-parameter 'y', which is subject to definite-assignment rules, might be uninitialized at this return point
+ Asserted expression: assigned(y)
+definite-assignment.dfy(41,11): Error: variable 'x', which is subject to definite-assignment rules, might be uninitialized here
+ Asserted expression: assigned(x)
+definite-assignment.dfy(41,14): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
+ Asserted expression: assigned(y)
+definite-assignment.dfy(50,14): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
+ Asserted expression: assigned(y)
+definite-assignment.dfy(58,9): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
+ Asserted expression: assigned(y)
+definite-assignment.dfy(59,17): Error: variable 'z', which is subject to definite-assignment rules, might be uninitialized here
+ Asserted expression: assigned(z)
+definite-assignment.dfy(68,4): Error: out-parameter 'y', which is subject to definite-assignment rules, might be uninitialized at this return point
+ Asserted expression: assigned(y)
+definite-assignment.dfy(76,9): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
+ Asserted expression: assigned(y)
+definite-assignment.dfy(77,4): Error: out-parameter 'z', which is subject to definite-assignment rules, might be uninitialized at this return point
+ Asserted expression: assigned(z)
+definite-assignment.dfy(85,12): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
+ Asserted expression: assigned(y)
+definite-assignment.dfy(85,15): Error: variable 'x', which is subject to definite-assignment rules, might be uninitialized here
+ Asserted expression: assigned(x)
+
+Dafny program verifier finished with 0 verified, 15 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/destructor-valid.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/destructor-valid.dfy
new file mode 100644
index 00000000000..db8e084b6df
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/destructor-valid.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype D = D0(n: nat) | D1 | D2(b: bool, n: nat)
+
+method F(d: D) {
+  var n := d.n;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/destructor-valid.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/destructor-valid.dfy.expect
new file mode 100644
index 00000000000..932aae382c6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/destructor-valid.dfy.expect
@@ -0,0 +1,4 @@
+destructor-valid.dfy(7,13): Error: destructor 'n' can only be applied to datatype values constructed by 'D0' or 'D2'
+ Asserted expression: d.D0? || d.D2?
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/distinct-lhs.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/distinct-lhs.dfy
new file mode 100644
index 00000000000..453e9442c60
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/distinct-lhs.dfy
@@ -0,0 +1,27 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method AssignArray(i: nat, j: nat, a: array<int>, x: int)
+    requires 0 <= i < a.Length
+    requires 0 <= j < a.Length
+    modifies a
+{
+  a[i], a[j] := x, x + 1;
+}
+ 
+method AssignMultiArray(i0: nat, i1: nat, j0: nat, j1: nat, a: array2<int>, x: int)
+    requires 0 <= i0 < a.Length0
+    requires 0 <= i1 < a.Length1
+    requires 0 <= j0 < a.Length0
+    requires 0 <= j1 < a.Length1
+    modifies a
+{
+     a[i0, i1], a[j0, j1] := x, x + 1;
+}
+
+class C { var f: int }
+method AssignField(c: C, x: int)
+    modifies c
+{
+    c.f, c.f := x, x + 1;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/distinct-lhs.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/distinct-lhs.dfy.expect
new file mode 100644
index 00000000000..802b0258bb0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/distinct-lhs.dfy.expect
@@ -0,0 +1,8 @@
+distinct-lhs.dfy(9,9): Error: when left-hand sides a[j] and a[i] refer to the same location, they must be assigned the same value
+ Asserted expression: a != a || j != i
+distinct-lhs.dfy(19,17): Error: when left-hand sides a[j0, j1] and a[i0, i1] refer to the same location, they must be assigned the same value
+ Asserted expression: a != a || j0 != i0 || j1 != i1
+distinct-lhs.dfy(26,11): Error: when left-hand sides c.f and c.f refer to the same location, they must be assigned the same value
+ Asserted expression: c != c
+
+Dafny program verifier finished with 2 verified, 3 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ensures-stronger.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ensures-stronger.dfy
new file mode 100644
index 00000000000..60120ddbb3d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ensures-stronger.dfy
@@ -0,0 +1,23 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+predicate P(i: int)
+predicate Q(i: int)
+
+trait T {
+  method M(b: bool)
+    returns (res: int)
+    ensures P(res)
+    ensures P(res + 1)
+    ensures b ==> Q(res)
+}
+
+class C extends T {
+  method M(b': bool)
+    returns (res': int)
+    ensures P(res')
+  {
+    assume {:axiom} P(0);
+    return 0;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ensures-stronger.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ensures-stronger.dfy.expect
new file mode 100644
index 00000000000..adf3c0031ba
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ensures-stronger.dfy.expect
@@ -0,0 +1,6 @@
+ensures-stronger.dfy(16,9): Error: the method must provide an equal or more detailed postcondition than in its parent trait
+ Asserted expression: P(res') ==> b' ==> Q(res')
+ensures-stronger.dfy(16,9): Error: the method must provide an equal or more detailed postcondition than in its parent trait
+ Asserted expression: P(res') ==> P(res' + 1)
+
+Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-assignable.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-assignable.dfy
new file mode 100644
index 00000000000..4f66b4fc727
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-assignable.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method ForRangeAssignable()
+{
+    for i: nat := -1 to 0 {}
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-assignable.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-assignable.dfy.expect
new file mode 100755
index 00000000000..386f4f55eb2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-assignable.dfy.expect
@@ -0,0 +1,4 @@
+for-range-assignable.dfy(6,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'nat'
+ Asserted expression: forall i: nat | -1 <= i && i <= 0 :: i is nat
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-bounds-valid.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-bounds-valid.dfy
new file mode 100644
index 00000000000..a3e9447ffc4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-bounds-valid.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method ForRangeBoundsValid()
+{
+    for _ := 1 to 0 {}
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-bounds-valid.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-bounds-valid.dfy.expect
new file mode 100755
index 00000000000..99dba8e7d15
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/for-range-bounds-valid.dfy.expect
@@ -0,0 +1,4 @@
+for-range-bounds-valid.dfy(6,13): Error: lower bound must not exceed upper bound
+ Asserted expression: 1 <= 0
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-lhs-unique.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-lhs-unique.dfy
new file mode 100644
index 00000000000..7b90ced250e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-lhs-unique.dfy
@@ -0,0 +1,29 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method ForallLHSUniqueArray(a: array<int>)
+    modifies a
+{
+    forall i | 0 <= i < a.Length {
+        a[0] := i;
+    }
+}
+
+method ForallLHSUniqueArray2(a: array2<int>)
+    modifies a
+{
+    forall i, j | 0 <= i < a.Length0 && 0 <= j < a.Length1 {
+        a[0, 0] := i + j;
+    }
+}
+
+class C { var f: int }
+
+method ForallLHSUniqueObj(a: array<C>)
+    modifies a
+    modifies set i | 0 <= i < a.Length :: a[i]`f
+{
+    forall i | 0 <= i < a.Length {
+        a[i].f := i;
+    }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-lhs-unique.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-lhs-unique.dfy.expect
new file mode 100644
index 00000000000..206b7943a5b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-lhs-unique.dfy.expect
@@ -0,0 +1,10 @@
+forall-lhs-unique.dfy(7,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+forall-lhs-unique.dfy(15,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+forall-lhs-unique.dfy(8,13): Error: left-hand sides for different forall-statement bound variables might refer to the same location (and right-hand sides might not be equivalent)
+ Asserted expression: forall i: int, i': int | 0 <= i < a.Length && 0 <= i' && i' < a.Length && i != i' :: a != a || 0 != 0 || i == i'
+forall-lhs-unique.dfy(16,16): Error: left-hand sides for different forall-statement bound variables might refer to the same location (and right-hand sides might not be equivalent)
+ Asserted expression: forall i: int, j: int, i': int, j': int | 0 <= i < a.Length0 && 0 <= j < a.Length1 && 0 <= i' && i' < a.Length0 && 0 <= j' && j' < a.Length1 && (i != i' || j != j') :: a != a || 0 != 0 || 0 != 0 || i + j == i' + j'
+forall-lhs-unique.dfy(27,15): Error: left-hand sides for different forall-statement bound variables might refer to the same location (and right-hand sides might not be equivalent)
+ Asserted expression: forall i: int, i': int | 0 <= i < a.Length && 0 <= i' && i' < a.Length && i != i' :: a[i] != a[i] || i == i'
+
+Dafny program verifier finished with 1 verified, 3 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-postcondition.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-postcondition.dfy
new file mode 100644
index 00000000000..e463bb0f901
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-postcondition.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method ForallPostcondition()
+{
+    forall b: bool ensures b {}
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-postcondition.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-postcondition.dfy.expect
new file mode 100755
index 00000000000..148c4c27f58
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/forall-postcondition.dfy.expect
@@ -0,0 +1,5 @@
+forall-postcondition.dfy(6,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+forall-postcondition.dfy(6,27): Error: possible violation of postcondition of forall statement
+ Asserted expression: b
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/frame-dereference-non-null.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/frame-dereference-non-null.dfy
new file mode 100644
index 00000000000..afdfd643dc2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/frame-dereference-non-null.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class C { var f: int }
+
+function FrameDereferenceNonNull(c: C?): bool
+    reads c`f
+{ true }
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/frame-dereference-non-null.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/frame-dereference-non-null.dfy.expect
new file mode 100644
index 00000000000..502abcad366
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/frame-dereference-non-null.dfy.expect
@@ -0,0 +1,4 @@
+frame-dereference-non-null.dfy(7,12): Error: frame expression might dereference null
+ Asserted expression: c != null
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/function-contract-override.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/function-contract-override.dfy
new file mode 100644
index 00000000000..a42cc573c12
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/function-contract-override.dfy
@@ -0,0 +1,21 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+predicate P(x: int)
+
+trait T {
+  function F(i: int): int
+    requires i < 10
+    ensures F(i) < 5
+    ensures P(F(i))
+}
+
+trait T' extends T {
+  function F(i': int): int
+    requires i' < 5
+    requires P(i')
+    ensures F(i') < 10
+  {
+    0
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/function-contract-override.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/function-contract-override.dfy.expect
new file mode 100644
index 00000000000..e9f4f1459d1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/function-contract-override.dfy.expect
@@ -0,0 +1,10 @@
+function-contract-override.dfy(14,11): Error: the function must provide an equal or more detailed postcondition than in its parent trait
+ Asserted expression: F(i') < 10 ==> this.F(i') < 5
+function-contract-override.dfy(14,11): Error: the function must provide an equal or more detailed postcondition than in its parent trait
+ Asserted expression: F(i') < 10 ==> P(this.F(i'))
+function-contract-override.dfy(14,11): Error: the function must provide an equal or more permissive precondition than in its parent trait
+ Asserted expression: i' < 10 ==> P(i')
+function-contract-override.dfy(14,11): Error: the function must provide an equal or more permissive precondition than in its parent trait
+ Asserted expression: i' < 10 ==> i' < 5
+
+Dafny program verifier finished with 2 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/indices-in-domain.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/indices-in-domain.dfy
new file mode 100644
index 00000000000..fba1158d979
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/indices-in-domain.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method IndicesInDomain() {
+    var a1 := new int[1](i requires i > 0 => 1);
+    var a2 := new int[1, 1]((i, j) requires i > 0 && j < 0 => 1);
+    var s := seq(1, i requires i > 0 => 1);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/indices-in-domain.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/indices-in-domain.dfy.expect
new file mode 100644
index 00000000000..c56d6bf7762
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/indices-in-domain.dfy.expect
@@ -0,0 +1,8 @@
+indices-in-domain.dfy(5,14): Error: all array indices must be in the domain of the initialization function
+ Asserted expression: forall i0: int | 0 <= i0 < 1 :: ((i: nat) requires i > 0 => 1).requires(i0)
+indices-in-domain.dfy(6,14): Error: all array indices must be in the domain of the initialization function
+ Asserted expression: forall i0: int, i1: int | (0 <= i0 < 1) && (0 <= i1 < 1) :: ((i: nat, j: int) requires i > 0 && j < 0 => 1).requires(i0, i1)
+indices-in-domain.dfy(7,13): Error: all sequence indices must be in the domain of the initialization function
+ Asserted expression: forall i0: int | 0 <= i0 < 1 :: ((i: int) requires i > 0 => 1).requires(i0)
+
+Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-allocated.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-allocated.dfy
new file mode 100644
index 00000000000..7828e206188
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-allocated.dfy
@@ -0,0 +1,12 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class C {
+    var f: int
+}
+
+method IsAllocated()
+{
+    var c := new C;
+    var f := old(c.f);
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-allocated.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-allocated.dfy.expect
new file mode 100755
index 00000000000..af8dfd963aa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-allocated.dfy.expect
@@ -0,0 +1,4 @@
+is-allocated.dfy(11,19): Error: receiver could not be proved to be allocated in the state in which its fields are accessed
+ Asserted expression: old(allocated(c))
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-integer.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-integer.dfy
new file mode 100644
index 00000000000..037fca826f5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-integer.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function IsInteger(r: real): int
+{
+    r as int
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-integer.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-integer.dfy.expect
new file mode 100755
index 00000000000..a2dcddc6189
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/is-integer.dfy.expect
@@ -0,0 +1,4 @@
+is-integer.dfy(6,6): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
+ Asserted expression: r == r.Floor as real
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/loop-invariant.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/loop-invariant.dfy
new file mode 100644
index 00000000000..46e9cf822c0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/loop-invariant.dfy
@@ -0,0 +1,12 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method LoopInvariant() {
+  var i := 10;
+  while 0 <= i
+    invariant 0 <= i <= 10
+    decreases i
+  {
+    i := i - 1;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/loop-invariant.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/loop-invariant.dfy.expect
new file mode 100644
index 00000000000..89f7acddaca
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/loop-invariant.dfy.expect
@@ -0,0 +1,5 @@
+loop-invariant.dfy(7,16): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+ Asserted expression: 0 <= i <= 10
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/match-is-complete.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/match-is-complete.dfy
new file mode 100644
index 00000000000..5db53eaf43a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/match-is-complete.dfy
@@ -0,0 +1,9 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype D = D0 | D1
+
+function F(d: D): D {
+  match d
+    case D0 => D1
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/match-is-complete.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/match-is-complete.dfy.expect
new file mode 100644
index 00000000000..bcbc9af65eb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/match-is-complete.dfy.expect
@@ -0,0 +1,6 @@
+match-is-complete.dfy(7,2): Error: missing case in match expression: D1
+ Asserted expression: false
+   in an added catch-all case:
+     case _ => ...
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modifiable.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modifiable.dfy
new file mode 100644
index 00000000000..5ec7f9746df
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modifiable.dfy
@@ -0,0 +1,68 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class C {
+  var x: int
+  var y: int
+  method ModifyClassField()
+    modifies this`y
+  {
+    x := 0;
+  }
+}
+
+class C2 {
+  var x: int
+  var y: int
+}
+
+method ModifyObject(s: seq<C>, t: seq<C2>)
+  requires |s| > 1
+  requires |t| > 0
+  // singletons
+  modifies s[1]           // no field
+  modifies (s[1] as C)`x  // right field
+  modifies (s[0] as C)`y  // right object, wrong field
+  modifies (t[0] as C2)`x // wrong type, right field name
+  // sets
+  modifies {s[1]}         // no field
+  modifies {s[1] as C}`x  // right field
+  modifies {s[0] as C}`y  // right object, wrong field
+  modifies {t[0] as C2}`x // wrong type, right field name
+{
+  s[0].x := 1;
+}
+
+method ModifyObjects(s: seq<C>)
+  requires |s| > 1
+  modifies s[1]
+  modifies (set c | c in s)`y
+{
+  forall c | c in s {
+    c.x := 1;
+  }
+}
+
+method ModifyArray(a: array<int>, b: array<int>)
+  modifies b
+{
+  if a.Length > 0 {
+    a[0] := 1;
+  }
+}
+
+method ModifyArrays(s: seq<array<int>>)
+  requires |s| > 1
+  modifies s[1]
+{
+  forall a | a in s && a.Length > 0 {
+    a[0] := 1;
+  }
+}
+
+method ModifyMultiDimArray(a: array2<int>)
+{
+  if a.Length0 > 0 && a.Length1 > 0 {
+    a[0, 0] := 1;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modifiable.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modifiable.dfy.expect
new file mode 100644
index 00000000000..d68b9142c9c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modifiable.dfy.expect
@@ -0,0 +1,14 @@
+modifiable.dfy(10,4): Error: assignment might update an object not in the enclosing context's modifies clause
+ Asserted expression: this in {}
+modifiable.dfy(33,7): Error: assignment might update an object not in the enclosing context's modifies clause
+ Asserted expression: s[0] == s[1] || s[0] == s[1] as C || s[0] in {s[1]} || s[0] in {s[1] as C}
+modifiable.dfy(42,6): Error: assignment might update an object field not in the enclosing context's modifies clause
+ Asserted expression: c == s[1]
+modifiable.dfy(50,5): Error: assignment might update an array element not in the enclosing context's modifies clause
+ Asserted expression: a == b
+modifiable.dfy(59,5): Error: assignment might update an array element not in the enclosing context's modifies clause
+ Asserted expression: a == s[1]
+modifiable.dfy(66,5): Error: assignment might update an array element not in the enclosing context's modifies clause
+ Asserted expression: a in {}
+
+Dafny program verifier finished with 4 verified, 6 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modify-frame-subset.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modify-frame-subset.dfy
new file mode 100644
index 00000000000..0b654d0bdf5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modify-frame-subset.dfy
@@ -0,0 +1,40 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class C {
+  var x: int
+  var y: int
+}
+
+method ModifyStmt(s: seq<C>)
+  requires |s| > 5
+  modifies s[3]
+  modifies {s[4]}`x
+  modifies {s[5]}`y
+{
+  modify s[0], {s[1]}`x, {s[2]}`y;
+}
+
+method LoopModifies(s: seq<C>)
+  requires |s| > 5
+  modifies s[3]
+  modifies {s[4]}`x
+  modifies {s[5]}`y
+{
+  for i := 0 to 3
+    modifies s[0], {s[1]}`x, {s[2]}`y
+  { }
+}
+
+method Callee(s': seq<C>)
+  requires |s'| > 5
+  modifies s'[0], {s'[1]}`x, {s'[2]}`y
+
+method Caller(s: seq<C>)
+  requires |s| > 5
+  modifies s[3]
+  modifies {s[4]}`x
+  modifies {s[5]}`y
+{
+  Callee(s);
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modify-frame-subset.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modify-frame-subset.dfy.expect
new file mode 100644
index 00000000000..240d6a6c23f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/modify-frame-subset.dfy.expect
@@ -0,0 +1,8 @@
+modify-frame-subset.dfy(15,2): Error: modify statement might violate context's modifies clause
+ Asserted expression: (s[0] == s[3] || s[0] in {s[4]} || s[0] in {s[5]}) && (forall obj: C | obj in {s[1]} :: obj == s[3] || obj in {s[4]}) && forall obj: C | obj in {s[2]} :: obj == s[3] || obj in {s[5]}
+modify-frame-subset.dfy(24,2): Error: loop modifies clause might violate context's modifies clause
+ Asserted expression: (s[0] == s[3] || s[0] in {s[4]} || s[0] in {s[5]}) && (forall obj: C | obj in {s[1]} :: obj == s[3] || obj in {s[4]}) && forall obj: C | obj in {s[2]} :: obj == s[3] || obj in {s[5]}
+modify-frame-subset.dfy(39,8): Error: call might violate context's modifies clause
+ Asserted expression: (s[0] == s[3] || s[0] in {s[4]} || s[0] in {s[5]}) && (forall obj: C | obj in {s[1]} :: obj == s[3] || obj in {s[4]}) && forall obj: C | obj in {s[2]} :: obj == s[3] || obj in {s[5]}
+
+Dafny program verifier finished with 4 verified, 3 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-negative.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-negative.dfy
new file mode 100644
index 00000000000..4ebd45cdc97
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-negative.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function NonNegative(): seq<int>
+{
+    seq(-1, i => 0)
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-negative.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-negative.dfy.expect
new file mode 100755
index 00000000000..2a53adab9ea
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-negative.dfy.expect
@@ -0,0 +1,4 @@
+non-negative.dfy(6,8): Error: sequence size might be negative
+ Asserted expression: 0 <= -1
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-null.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-null.dfy
new file mode 100644
index 00000000000..60ddad634d8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-null.dfy
@@ -0,0 +1,7 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function NonNull(a: array?<int>): int
+{
+    a.Length
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-null.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-null.dfy.expect
new file mode 100755
index 00000000000..f3e3b6f05b9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/non-null.dfy.expect
@@ -0,0 +1,4 @@
+non-null.dfy(6,6): Error: target object might be null
+ Asserted expression: a != null
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/not-ghost-variant.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/not-ghost-variant.dfy
new file mode 100644
index 00000000000..5469d876b2f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/not-ghost-variant.dfy
@@ -0,0 +1,18 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype D = ghost G0 | ghost G1 | C0 | C1
+
+method NotGhostVariantDiscriminator(d: D) returns (res: nat) {
+  res := 0;
+  if d.C0? {
+    res := 1;
+  }
+}
+
+method NotGhostVariantEquality(d: D) returns (res: nat) {
+  res := 0;
+  if d == d {
+    res := 1;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/not-ghost-variant.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/not-ghost-variant.dfy.expect
new file mode 100644
index 00000000000..1541b910526
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/not-ghost-variant.dfy.expect
@@ -0,0 +1,6 @@
+not-ghost-variant.dfy(8,7): Error: in a compiled context, discriminator 'C0?' cannot be applied to a datatype value of a ghost variant (ghost constructor 'G0' or 'G1')
+ Asserted expression: !(d.G0? || d.G1?)
+not-ghost-variant.dfy(15,7): Error: in a compiled context, equality cannot be applied to a datatype value of a ghost variant (ghost constructor 'G0' or 'G1')
+ Asserted expression: !(d.G0? || d.G1?)
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-is-natural.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-is-natural.dfy
new file mode 100644
index 00000000000..718073c345c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-is-natural.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function OrdinalSubtractionIsNatural(o0: ORDINAL, o1: ORDINAL): ORDINAL
+    requires o1.Offset <= o0.Offset
+{
+    o0 - o1
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-is-natural.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-is-natural.dfy.expect
new file mode 100755
index 00000000000..10bb3b11cc6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-is-natural.dfy.expect
@@ -0,0 +1,4 @@
+ordinal-subtraction-is-natural.dfy(7,7): Error: RHS of ORDINAL subtraction must be a natural number, but the given RHS might be larger
+ Asserted expression: o1.IsNat
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-underflow.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-underflow.dfy
new file mode 100644
index 00000000000..a852a5b3134
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-underflow.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function OrdinalSubtractionUnderflow(o0: ORDINAL, o1: ORDINAL): ORDINAL
+    requires o1.IsNat
+{
+    o0 - o1
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-underflow.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-underflow.dfy.expect
new file mode 100755
index 00000000000..f5854e35307
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/ordinal-subtraction-underflow.dfy.expect
@@ -0,0 +1,4 @@
+ordinal-subtraction-underflow.dfy(7,7): Error: ORDINAL subtraction might underflow a limit ordinal (that is, RHS might be too large)
+ Asserted expression: o1.Offset <= o0.Offset
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/pattern-shape-is-valid.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/pattern-shape-is-valid.dfy
new file mode 100644
index 00000000000..36bc1aad4c5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/pattern-shape-is-valid.dfy
@@ -0,0 +1,9 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype D = D0(n: nat) | D1
+
+method F(d: D) {
+  assert d.D0?;
+  var D0(n) := d;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/pattern-shape-is-valid.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/pattern-shape-is-valid.dfy.expect
new file mode 100644
index 00000000000..c18beb779fa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/pattern-shape-is-valid.dfy.expect
@@ -0,0 +1,4 @@
+pattern-shape-is-valid.dfy(7,2): Error: assertion might not hold
+ Asserted expression: d.D0?
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/precondition-satisfied.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/precondition-satisfied.dfy
new file mode 100644
index 00000000000..56601a8f311
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/precondition-satisfied.dfy
@@ -0,0 +1,35 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function Div(x: int, y: int): int
+    requires y != 0
+{
+    x / y
+}
+
+function BadDiv(a: int, b: int): int
+{
+    Div(a, b)
+}
+
+function DivErrorMsg(x: int, y: int): int
+    requires {:error "divisor must be nonzero", "divisor is nonzero"} y != 0
+{
+    x / y
+}
+
+function BadDivErrorMsg(a: int, b: int): int
+{
+    DivErrorMsg(a, b)
+}
+
+function BadNamedLambdaDiv(a: int, b: int): int
+{
+    var lam := (x, y) requires y != 0 => x / y;
+    lam(a, b)
+}
+
+function BadAnonLambdaDiv(a: int, b: int): int
+{
+    ((x, y) requires y != 0 => x / y)(a, b)
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/precondition-satisfied.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/precondition-satisfied.dfy.expect
new file mode 100644
index 00000000000..e1677354d36
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/precondition-satisfied.dfy.expect
@@ -0,0 +1,12 @@
+precondition-satisfied.dfy(12,7): Error: function precondition could not be proved
+ Asserted expression: b != 0
+precondition-satisfied.dfy(5,15): Related location: this proposition could not be proved
+precondition-satisfied.dfy(23,15): Error: divisor must be nonzero
+ Asserted expression: b != 0
+precondition-satisfied.dfy(16,72): Related location: this proposition could not be proved
+precondition-satisfied.dfy(29,4): Error: function precondition could not be proved
+ Asserted expression: lam.requires(a, b)
+precondition-satisfied.dfy(34,4): Error: function precondition could not be proved
+ Asserted expression: ((x: int, y: int) requires y != 0 => x / y).requires(a, b)
+
+Dafny program verifier finished with 2 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/prefix-equality-limit.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/prefix-equality-limit.dfy
new file mode 100644
index 00000000000..63528a63aa0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/prefix-equality-limit.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+codatatype Stream = More(Stream)
+
+method PrefixEqualityLimit(s: Stream, i: int) {
+  ghost var g := s ==#[i] s;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/prefix-equality-limit.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/prefix-equality-limit.dfy.expect
new file mode 100644
index 00000000000..5c36e030712
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/prefix-equality-limit.dfy.expect
@@ -0,0 +1,4 @@
+prefix-equality-limit.dfy(7,19): Error: prefix-equality limit must be at least 0
+ Asserted expression: 0 <= i
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/read-frame-subset.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/read-frame-subset.dfy
new file mode 100644
index 00000000000..0cc1d05d6cb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/read-frame-subset.dfy
@@ -0,0 +1,133 @@
+// RUN: %exits-with 4 %verify --reads-clauses-on-methods --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+class C {
+  var x: int
+  var y: int
+}
+
+function ReadField(s: seq<C>, c': C): bool
+  requires |s| > 4
+  reads s[2]
+  reads {s[3]}`x
+  reads {s[4]}`y
+{
+  s[0].x == 1 || s[1].y == 1
+}
+
+function ReadArrayElement(s: seq<array<int>>): bool
+  requires |s| > 2
+  reads s[1]
+  reads set a | a in s[2..]
+{
+  if s[0].Length > 0 then s[0][0] == 1 else false
+}
+
+function ReadRangeOfArrayElements(s: seq<array<int>>): bool
+  requires |s| > 2
+  reads s[1]
+  reads set a | a in s[2..]
+{
+  if s[0].Length > 0 then s[0][0..1] == [2, 3] else false
+}
+
+function ReadMultiDimArrayElement(s: seq<array2<int>>): bool
+  requires |s| > 2
+  reads s[1]
+  reads set a | a in s[2..]
+{
+  if s[0].Length0 > 0 && s[0].Length1 > 1 then s[0][0, 1] == 2 else false
+}
+
+function ReadByApply(s: seq<C>): bool
+  requires |s| > 5
+  reads s[3]
+  reads {s[4]}`x
+  reads {s[5]}`y
+{
+  var lam := (s': seq<C>)
+    requires |s'| > 2
+    reads if |s'| > 0 then {s'[0]} else {}
+    reads (if |s'| > 1 then {s'[1]} else {})`x
+    reads (if |s'| > 2 then {s'[2]} else {})`y
+    => false;
+  lam(s)
+}
+
+function ReadingFunction(s': seq<C>): bool
+  requires |s'| > 2
+  reads s'[0]
+  reads {s'[1]}`x
+  reads {s'[2]}`y
+{
+  false
+}
+
+function ReadByFunctionCall(s: seq<C>): bool
+  requires |s| > 5
+  reads s[3]
+  reads {s[4]}`x
+  reads {s[5]}`y
+{
+  ReadingFunction(s)
+}
+
+function ReadByReadsCall(s: seq<C>): bool
+  requires |s| > 5
+  reads s[3]
+  reads {s[4]}`x
+  reads {s[5]}`y
+{
+  ghost var r := ReadingFunction.reads(s);
+  false
+}
+
+method ReadByUnchanged(s: seq<C>)
+  requires |s| > 5
+  reads s[3]
+  reads {s[4]}`x
+  reads {s[5]}`y
+{
+  assert unchanged(s[0], {s[1]}`x, {s[2]}`y);
+}
+
+method ReadBySeqInit(s: seq<C>)
+  requires |s| > 5
+  reads s[3]
+  reads {s[4]}`x
+  reads {s[5]}`y
+{
+  var init := i
+    reads s[0]
+    reads {s[1]}`x
+    reads {s[2]}`y
+    => false;
+  var s' := seq(1, init);
+}
+
+method ReadingMethod(s': seq<C>)
+  requires |s'| > 2
+  reads s'[0]
+  reads {s'[1]}`x
+  reads {s'[2]}`y
+{ }
+
+method ReadByCall(s: seq<C>)
+  requires |s| > 5
+  reads s[3]
+  reads {s[4]}`x
+  reads {s[5]}`y
+{
+  ReadingMethod(s);
+}
+
+// tests successful handling of FunctionCallExpr where the receiver isn't a method or function
+function Sum(f: int ~> real, lo: int, hi: int): real
+  requires lo <= hi
+  requires forall i :: lo <= i < hi ==> f.requires(i)
+  reads set i, o | lo <= i < hi && o in f.reads(i) :: o
+  decreases hi - lo
+{
+  if lo == hi then 0.0 else
+    f(lo) + Sum(f, lo + 1, hi)
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/read-frame-subset.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/read-frame-subset.dfy.expect
new file mode 100644
index 00000000000..433c7c55637
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/read-frame-subset.dfy.expect
@@ -0,0 +1,28 @@
+read-frame-subset.dfy(15,7): Error: insufficient reads clause to read field; Consider adding 'reads s[0]' or 'reads s[0]`x' in the enclosing function specification for resolution
+ Asserted expression: s[0] == s[2] || s[0] in {s[3]} || s[0] in {s[4]}
+read-frame-subset.dfy(15,22): Error: insufficient reads clause to read field; Consider adding 'reads s[1]' or 'reads s[1]`y' in the enclosing function specification for resolution
+ Asserted expression: s[1] == s[2] || s[1] in {s[3]} || s[1] in {s[4]}
+read-frame-subset.dfy(23,30): Error: insufficient reads clause to read array element; Consider adding 'reads s[0]' in the enclosing function specification for resolution
+ Asserted expression: s[0] == s[1] || s[0] in set a: array<int> {:trigger a in s[2..]} | a in s[2..]
+read-frame-subset.dfy(31,30): Error: insufficient reads clause to read the indicated range of array elements; Consider adding 'reads s[0]' in the enclosing function specification for resolution
+ Asserted expression: s[0] == s[1] || s[0] in set a: array<int> {:trigger a in s[2..]} | a in s[2..]
+read-frame-subset.dfy(39,51): Error: insufficient reads clause to read array element; Consider adding 'reads s[0]' in the enclosing function specification for resolution
+ Asserted expression: s[0] == s[1] || s[0] in set a: array2<int> {:trigger a in s[2..]} | a in s[2..]
+read-frame-subset.dfy(54,2): Error: insufficient reads clause to invoke function
+ Asserted expression: forall obj: object? | obj in lam.reads(s) :: obj == s[3] || obj in {s[4]} || obj in {s[5]}
+read-frame-subset.dfy(72,17): Error: insufficient reads clause to invoke function
+ Asserted expression: (s[0] == s[3] || s[0] in {s[4]} || s[0] in {s[5]}) && (forall obj: C | obj in {s[1]} :: obj == s[3] || obj in {s[4]}) && forall obj: C | obj in {s[2]} :: obj == s[3] || obj in {s[5]}
+read-frame-subset.dfy(81,38): Error: insufficient reads clause to invoke function
+ Asserted expression: (s[0] == s[3] || s[0] in {s[4]} || s[0] in {s[5]}) && (forall obj: C | obj in {s[1]} :: obj == s[3] || obj in {s[4]}) && forall obj: C | obj in {s[2]} :: obj == s[3] || obj in {s[5]}
+read-frame-subset.dfy(91,20): Error: insufficient reads clause to read state of 'unchanged' object
+ Asserted expression: s[0] == s[3] || s[0] in {s[4]} || s[0] in {s[5]}
+read-frame-subset.dfy(91,25): Error: insufficient reads clause to read state of 'unchanged' set element
+ Asserted expression: forall obj: C | obj in {s[1]} :: obj == s[3] || obj in {s[4]}
+read-frame-subset.dfy(91,35): Error: insufficient reads clause to read state of 'unchanged' set element
+ Asserted expression: forall obj: C | obj in {s[2]} :: obj == s[3] || obj in {s[5]}
+read-frame-subset.dfy(105,12): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
+ Asserted expression: forall i0: int | 0 <= i0 < 1 :: forall obj: object? | obj in init.reads(i0) :: obj == s[3] || obj in {s[4]} || obj in {s[5]}
+read-frame-subset.dfy(121,15): Error: insufficient reads clause to call
+ Asserted expression: (s[0] == s[3] || s[0] in {s[4]} || s[0] in {s[5]}) && (forall obj: C | obj in {s[1]} :: obj == s[3] || obj in {s[4]}) && forall obj: C | obj in {s[2]} :: obj == s[3] || obj in {s[5]}
+
+Dafny program verifier finished with 6 verified, 13 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/requires-weaker.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/requires-weaker.dfy
new file mode 100644
index 00000000000..22553421aa6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/requires-weaker.dfy
@@ -0,0 +1,23 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+predicate P(i: int)
+predicate Q(i: int)
+
+trait T {
+  method M(i: int)
+    returns (res: bool)
+    requires P(i)
+    requires Q(i)
+}
+
+class C extends T {
+  method M(i': int)
+    returns (res': bool)
+    requires P(i')
+    requires Q(i' * 2)
+    requires P(i' + 1) ==> Q(i' + 1)
+  {
+    res' := true;
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/requires-weaker.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/requires-weaker.dfy.expect
new file mode 100644
index 00000000000..760b10a4322
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/requires-weaker.dfy.expect
@@ -0,0 +1,6 @@
+requires-weaker.dfy(15,9): Error: the method must provide an equal or more permissive precondition than in its parent trait
+ Asserted expression: P(i') && Q(i') ==> P(i' + 1) ==> Q(i' + 1)
+requires-weaker.dfy(15,9): Error: the method must provide an equal or more permissive precondition than in its parent trait
+ Asserted expression: P(i') && Q(i') ==> Q(i' * 2)
+
+Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-lower-bound.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-lower-bound.dfy
new file mode 100644
index 00000000000..cb0e542d943
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-lower-bound.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function ShiftLowerBound(b: bv2): bv2 {
+    b.RotateLeft(-1)
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-lower-bound.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-lower-bound.dfy.expect
new file mode 100755
index 00000000000..cfdac31f3f7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-lower-bound.dfy.expect
@@ -0,0 +1,4 @@
+shift-lower-bound.dfy(5,16): Error: rotate amount must be non-negative
+ Asserted expression: 0 <= -1
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-upper-bound.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-upper-bound.dfy
new file mode 100644
index 00000000000..35160e2c87d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-upper-bound.dfy
@@ -0,0 +1,6 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+function ShiftUpperBound(b: bv2): bv2 {
+    b.RotateLeft(3)
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-upper-bound.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-upper-bound.dfy.expect
new file mode 100755
index 00000000000..6e181752b03
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/shift-upper-bound.dfy.expect
@@ -0,0 +1,4 @@
+shift-upper-bound.dfy(5,16): Error: rotate amount must not exceed the width of the result (2)
+ Asserted expression: 3 <= 2
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check-no-type-system-refresh.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check-no-type-system-refresh.dfy
new file mode 100644
index 00000000000..a76c023b66d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check-no-type-system-refresh.dfy
@@ -0,0 +1,9 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method SubrangeCheck<T, U>(o: object?, p: T --> U, r: T ~> U, i: int) {
+    var nonNullVar: object := o;
+    var totalVar: T -> U := p;
+    var partialVar: T --> U := r;
+    var natVar: nat := i;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check-no-type-system-refresh.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check-no-type-system-refresh.dfy.expect
new file mode 100644
index 00000000000..e075451038b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check-no-type-system-refresh.dfy.expect
@@ -0,0 +1,8 @@
+subrange-check-no-type-system-refresh.dfy(5,30): Error: value of expression (of type 'object?') is not known to be an instance of type 'object', because it might be null
+ Asserted expression: o is object
+subrange-check-no-type-system-refresh.dfy(6,28): Error: value does not satisfy the subset constraints of 'T -> U' (possible cause: it may be partial or have read effects)
+subrange-check-no-type-system-refresh.dfy(7,31): Error: value does not satisfy the subset constraints of 'T --> U' (possible cause: it may have read effects)
+subrange-check-no-type-system-refresh.dfy(8,23): Error: value does not satisfy the subset constraints of 'nat'
+ Asserted expression: i is nat
+
+Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check.dfy
new file mode 100644
index 00000000000..9b829998566
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check.dfy
@@ -0,0 +1,9 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions --type-system-refresh "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method SubrangeCheck<T, U>(o: object?, p: T --> U, r: T ~> U, i: int) {
+    var nonNullVar: object := o;
+    var totalVar: T -> U := p;
+    var partialVar: T --> U := r;
+    var natVar: nat := i;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check.dfy.expect
new file mode 100644
index 00000000000..a6a14bc0988
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/subrange-check.dfy.expect
@@ -0,0 +1,10 @@
+subrange-check.dfy(5,30): Error: value of expression (of type 'object?') is not known to be an instance of type 'object', because it might be null
+ Asserted expression: o is object
+subrange-check.dfy(6,28): Error: value does not satisfy the subset constraints of 'T -> U' (possible cause: it may be partial or have read effects)
+ Asserted expression: p is T -> U
+subrange-check.dfy(7,31): Error: value does not satisfy the subset constraints of 'T --> U' (possible cause: it may have read effects)
+ Asserted expression: r is T --> U
+subrange-check.dfy(8,23): Error: value does not satisfy the subset constraints of 'nat'
+ Asserted expression: i is nat
+
+Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-decreases.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-decreases.dfy
new file mode 100644
index 00000000000..3b5d0af67b3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-decreases.dfy
@@ -0,0 +1,17 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait T {
+  method M0(x: nat, y: bool) decreases x, y
+  method M1(x: nat, y: bool) decreases y, x
+  method M2(x: nat, y: bool) decreases false, x
+}
+
+class C extends T {
+  method M0(x: nat, y: bool) decreases y, x
+  { }
+  method M1(x: nat, y: bool) decreases y
+  { }
+  method M2(x: nat, y: bool) decreases y, x
+  { }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-decreases.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-decreases.dfy.expect
new file mode 100644
index 00000000000..a8f279f148f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-decreases.dfy.expect
@@ -0,0 +1,8 @@
+trait-decreases.dfy(11,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
+ Asserted expression: (x, y nonincreases to y, x)
+trait-decreases.dfy(13,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
+ Asserted expression: (y, x nonincreases to y)
+trait-decreases.dfy(15,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
+ Asserted expression: (false, x nonincreases to y, x)
+
+Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-frame.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-frame.dfy
new file mode 100644
index 00000000000..e68eb6e7860
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-frame.dfy
@@ -0,0 +1,12 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+trait T {
+  method M()
+  function F(): bool
+}
+
+class C extends T {
+  method M() modifies this
+  function F(): bool reads this
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-frame.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-frame.dfy.expect
new file mode 100644
index 00000000000..cbfa79998a3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/trait-frame.dfy.expect
@@ -0,0 +1,6 @@
+trait-frame.dfy(10,9): Error: method might modify an object not in the parent trait context's modifies clause
+ Asserted expression: this in {}
+trait-frame.dfy(11,11): Error: function might read an object not in the parent trait context's reads clause
+ Asserted expression: this in {}
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/valid-constructor-names.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/valid-constructor-names.dfy
new file mode 100644
index 00000000000..8872cb25510
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/valid-constructor-names.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+datatype D = D0(n: nat) | D1 | D2(b: bool, n: nat)
+
+method F(d: D) {
+  var d' := d.(n := 0);
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/valid-constructor-names.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/valid-constructor-names.dfy.expect
new file mode 100644
index 00000000000..61c9c4ac0d8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/valid-constructor-names.dfy.expect
@@ -0,0 +1,4 @@
+valid-constructor-names.dfy(7,14): Error: source of datatype update must be constructed by 'D2' or 'D0'
+ Asserted expression: d.D2? || d.D0?
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/witness-check.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/witness-check.dfy
new file mode 100644
index 00000000000..e713741a557
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/witness-check.dfy
@@ -0,0 +1,4 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+newtype Pos = i: int | i > 0
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/witness-check.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/witness-check.dfy.expect
new file mode 100755
index 00000000000..30e2252e2bb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/witness-check.dfy.expect
@@ -0,0 +1,4 @@
+witness-check.dfy(4,8): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
+ Asserted expression: 0 > 0
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/yield-ensures.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/yield-ensures.dfy
new file mode 100644
index 00000000000..76cf26b31ea
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/yield-ensures.dfy
@@ -0,0 +1,20 @@
+// RUN: %exits-with 4 %verify --show-proof-obligation-expressions "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+iterator Repeat0(val: int, count: nat) yields (out: int, index: int)
+  yield ensures this.out == val
+  yield ensures 0 <= index <= count
+{
+  for i := 0 to count { yield count, -i; }
+}
+
+iterator Repeat1(val: int, count: nat) yields (out: int, index: int)
+  yield ensures this.out == val
+  yield ensures 0 <= index <= count
+{
+  for i := 0 to count {
+    out := count;
+    index := -i;
+    yield;
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/yield-ensures.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/yield-ensures.dfy.expect
new file mode 100644
index 00000000000..840540c52b5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/proof-obligation-desc/yield-ensures.dfy.expect
@@ -0,0 +1,14 @@
+yield-ensures.dfy(8,24): Error: possible violation of yield-ensures condition
+ Asserted expression: count == val
+yield-ensures.dfy(5,25): Related location: this proposition could not be proved
+yield-ensures.dfy(8,24): Error: possible violation of yield-ensures condition
+ Asserted expression: 0 <= -i && -i <= count
+yield-ensures.dfy(6,18): Related location: this proposition could not be proved
+yield-ensures.dfy(18,4): Error: possible violation of yield-ensures condition
+ Asserted expression: this.out == val
+yield-ensures.dfy(12,25): Related location: this proposition could not be proved
+yield-ensures.dfy(18,4): Error: possible violation of yield-ensures condition
+ Asserted expression: 0 <= this.index && this.index <= count
+yield-ensures.dfy(13,18): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 2 verified, 4 errors
diff --git a/Test/pydiff.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pydiff.py
similarity index 100%
rename from Test/pydiff.py
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/pydiff.py
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/DerivedModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/DerivedModule.dfy
new file mode 100644
index 00000000000..a826a16f675
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/DerivedModule.dfy
@@ -0,0 +1,13 @@
+// RUN: %baredafny translate py  --python-module-name=PythonModule2 --library="%S/PythonModule1.doo" --translation-record "%S/PythonModule1-py.dtr" --output "%S/PythonModule2" "%s" --include-runtime
+// RUN: %exits-with -any %rm -rf "%S/PythonModule2"
+// RUN: %mv "%S/PythonModule2-py" "%S/PythonModule2"
+// RUN: pip3 install "%S"
+// RUN: %S/python3 PythonModule2/ > %t
+// RUN: %diff "%s.expect" "%t"
+module DafnyModule3 {
+import DafnyModule1
+
+method Main() {
+        DafnyModule1.HelloWorld();
+}
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/DerivedModule.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/DerivedModule.dfy.expect
new file mode 100644
index 00000000000..5e1c309dae7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/DerivedModule.dfy.expect
@@ -0,0 +1 @@
+Hello World
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1-py.dtr b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1-py.dtr
new file mode 100644
index 00000000000..d3fd09523f4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1-py.dtr
@@ -0,0 +1,4 @@
+file_format_version = "1.0"
+dafny_version = "4.9.2.0"
+[options_by_module.DafnyModule1]
+python-module-name = "PythonModule1"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1.doo b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1.doo
new file mode 100644
index 00000000000..7111c30ea06
Binary files /dev/null and b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1.doo differ
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1/DafnyModule1.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1/DafnyModule1.py
new file mode 100644
index 00000000000..e5f622a26fe
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1/DafnyModule1.py
@@ -0,0 +1,19 @@
+import sys
+from typing import Callable, Any, TypeVar, NamedTuple
+from math import floor
+from itertools import count
+
+import PythonModule1.module_ as module_
+import _dafny as _dafny
+import System_ as System_
+
+# Module: PythonModule1.DafnyModule1
+
+class default__:
+    def  __init__(self):
+        pass
+
+    @staticmethod
+    def HelloWorld():
+        _dafny.print((_dafny.SeqWithoutIsStrInference(map(_dafny.CodePoint, "Hello World"))).VerbatimString(False))
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1/__main__.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1/__main__.py
new file mode 100644
index 00000000000..9092b7de99e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1/__main__.py
@@ -0,0 +1,9 @@
+# Dafny program helloworld.dfy compiled into Python
+import sys
+from typing import Callable, Any, TypeVar, NamedTuple
+from math import floor
+from itertools import count
+
+import PythonModule1.module_ as module_
+import _dafny as _dafny
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1/module_.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1/module_.py
new file mode 100644
index 00000000000..25c55c61744
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/PythonModule1/module_.py
@@ -0,0 +1,12 @@
+import sys
+from typing import Callable, Any, TypeVar, NamedTuple
+from math import floor
+from itertools import count
+
+import PythonModule1.module_ as module_
+import _dafny as _dafny
+import System_ as System_
+import PythonModule1.DafnyModule1 as DafnyModule1
+
+# Module: PythonModule1.module_
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/dafnysource/helloworld.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/dafnysource/helloworld.dfy
new file mode 100644
index 00000000000..75e0ff227c4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/dafnysource/helloworld.dfy
@@ -0,0 +1,9 @@
+// This file is used to regenerate PythonModule1.doo
+// RUN: echo 'lit should ignore this file' 
+
+module DafnyModule1 {
+  method HelloWorld()
+  {
+    print "Hello World";
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/setup.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/setup.py
new file mode 100644
index 00000000000..e8a736e7d14
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/multimodule/setup.py
@@ -0,0 +1,13 @@
+# setup.py
+# installs the committed PythonModule1 and generated PythonModule2 as a Python module
+from setuptools import setup
+
+setup(
+    name="testpythonmodulemultimodule",
+    version="0.1.0",
+    packages=["PythonModule1", "PythonModule2"],
+    python_requires='>=3.6',
+    install_requires=[
+        'DafnyRuntimePython',
+    ],
+)
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule.doo b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule.doo
new file mode 100644
index 00000000000..122c1ef09ac
Binary files /dev/null and b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule.doo differ
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/Some.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/Some.py
new file mode 100644
index 00000000000..3b9e9374ae3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/Some.py
@@ -0,0 +1,13 @@
+import sys
+from typing import Callable, Any, TypeVar, NamedTuple
+from math import floor
+from itertools import count
+
+import SomeNestedModule.module_ as module_
+import _dafny as _dafny
+import System_ as System_
+import SomeNestedModule.Some_Nested_Module as Some_Nested_Module
+import SomeNestedModule.Some_Nested as Some_Nested
+
+# Module: Some
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/SomeNestedModule-py.dtr b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/SomeNestedModule-py.dtr
new file mode 100644
index 00000000000..9e136ed4d89
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/SomeNestedModule-py.dtr
@@ -0,0 +1,4 @@
+file_format_version = "1.0"
+dafny_version = "4.9.2.0"
+[options_by_module."Some.Nested.Module"]
+python-module-name = "SomeNestedModule"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/Some_Nested.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/Some_Nested.py
new file mode 100644
index 00000000000..31b5634a411
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/Some_Nested.py
@@ -0,0 +1,12 @@
+import sys
+from typing import Callable, Any, TypeVar, NamedTuple
+from math import floor
+from itertools import count
+
+import SomeNestedModule.module_ as module_
+import _dafny as _dafny
+import System_ as System_
+import SomeNestedModule.Some_Nested_Module as Some_Nested_Module
+
+# Module: Some_Nested
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/Some_Nested_Module.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/Some_Nested_Module.py
new file mode 100644
index 00000000000..e1bbf368761
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/Some_Nested_Module.py
@@ -0,0 +1,19 @@
+import sys
+from typing import Callable, Any, TypeVar, NamedTuple
+from math import floor
+from itertools import count
+
+import SomeNestedModule.module_ as module_
+import _dafny as _dafny
+import System_ as System_
+
+# Module: Some_Nested_Module
+
+class default__:
+    def  __init__(self):
+        pass
+
+    @staticmethod
+    def HelloWorld():
+        _dafny.print((_dafny.SeqWithoutIsStrInference(map(_dafny.CodePoint, "Hello World"))).VerbatimString(False))
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/__main__.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/__main__.py
new file mode 100644
index 00000000000..b88c9409b6c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/__main__.py
@@ -0,0 +1,9 @@
+# Dafny program SomeNestedModule.dfy compiled into Python
+import sys
+from typing import Callable, Any, TypeVar, NamedTuple
+from math import floor
+from itertools import count
+
+import SomeNestedModule.module_ as module_
+import _dafny as _dafny
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/module_.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/module_.py
new file mode 100644
index 00000000000..a3e2e5c9377
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeNestedModule/module_.py
@@ -0,0 +1,14 @@
+import sys
+from typing import Callable, Any, TypeVar, NamedTuple
+from math import floor
+from itertools import count
+
+import SomeNestedModule.module_ as module_
+import _dafny as _dafny
+import System_ as System_
+import SomeNestedModule.Some_Nested_Module as Some_Nested_Module
+import SomeNestedModule.Some_Nested as Some_Nested
+import SomeNestedModule.Some as Some
+
+# Module: module_
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeTestModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeTestModule.dfy
new file mode 100644
index 00000000000..077d23f3902
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeTestModule.dfy
@@ -0,0 +1,12 @@
+// RUN: pip3 install "%S"
+// RUN: %baredafny translate py --output "%S/SomeTestModule" --library="%S/SomeNestedModule.doo" --translation-record "%S/SomeNestedModule/SomeNestedModule-py.dtr" "%s" --include-runtime
+// RUN: %S/python3 SomeTestModule-py/ > %t
+// RUN: %diff "%s.expect" "%t"
+module SomeTestModule {
+
+    import Other = Some.Nested.Module
+
+    method Main() {
+        Other.HelloWorld();
+    }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeTestModule.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeTestModule.dfy.expect
new file mode 100644
index 00000000000..5e1c309dae7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/SomeTestModule.dfy.expect
@@ -0,0 +1 @@
+Hello World
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/dafnysource/SomeNestedModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/dafnysource/SomeNestedModule.dfy
new file mode 100644
index 00000000000..5f5d4774b84
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/dafnysource/SomeNestedModule.dfy
@@ -0,0 +1,9 @@
+// This file is used to regenerate SomeNestedModule.doo
+// RUN: echo 'lit should ignore this file' 
+
+module Some.Nested.Module {
+  method HelloWorld()
+  {
+    print "Hello World";
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/setup.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/setup.py
new file mode 100644
index 00000000000..7e1a7bf94e6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/nestedmodule/setup.py
@@ -0,0 +1,13 @@
+# setup.py
+# installs the committed PythonModule1 and generated PythonModule2 as a Python module
+from setuptools import setup
+
+setup(
+    name="testpythonmodulenestedmodule",
+    version="0.1.0",
+    packages=["SomeNestedModule"],
+    python_requires='>=3.6',
+    install_requires=[
+        'DafnyRuntimePython',
+    ],
+)
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/helloworld.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/helloworld.dfy
new file mode 100644
index 00000000000..957ee79b501
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/helloworld.dfy
@@ -0,0 +1,12 @@
+// RUN: %baredafny translate py  --python-module-name=PythonModule1 "%s" --output "%S/PythonModule1" --include-runtime
+// RUN: %exits-with -any %rm -rf "%S/PythonModule1"
+// RUN: %mv "%S/PythonModule1-py/" "%S/PythonModule1"
+// RUN: pip3 install "%S"
+// RUN: %S/python3 PythonModule1/ > %t
+// RUN: %diff "%s.expect" "%t"
+module DafnyModule1 {
+    
+    method Main() {
+        print "Hello World";
+    }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/helloworld.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/helloworld.dfy.expect
new file mode 100644
index 00000000000..5e1c309dae7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/helloworld.dfy.expect
@@ -0,0 +1 @@
+Hello World
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/setup.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/setup.py
new file mode 100644
index 00000000000..d82f5523ff0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/pythonmodule/singlemodule/dafnysource/setup.py
@@ -0,0 +1,13 @@
+# setup.py
+# installs the generated PythonModule1 as a Python module
+from setuptools import setup
+
+setup(
+    name="testpythonmodulesinglemodule",
+    version="0.1.0",
+    packages=["PythonModule1"],
+    python_requires='>=3.6',
+    install_requires=[
+        'DafnyRuntimePython',
+    ],
+)
\ No newline at end of file
diff --git a/Test/refinement/aliasInRefinee.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/refinement/aliasInRefinee.dfy
similarity index 100%
rename from Test/refinement/aliasInRefinee.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/refinement/aliasInRefinee.dfy
diff --git a/Test/rider-run-unit-tests.png b/Source/IntegrationTests/TestFiles/LitTests/LitTest/rider-run-unit-tests.png
similarity index 100%
rename from Test/rider-run-unit-tests.png
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/rider-run-unit-tests.png
diff --git a/Test/rider-unit-tests-window.png b/Source/IntegrationTests/TestFiles/LitTests/LitTest/rider-unit-tests-window.png
similarity index 100%
rename from Test/rider-unit-tests-window.png
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/rider-unit-tests-window.png
diff --git a/Test/runTests.bat b/Source/IntegrationTests/TestFiles/LitTests/LitTest/runTests.bat
similarity index 100%
rename from Test/runTests.bat
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/runTests.bat
diff --git a/Test/runTests.py b/Source/IntegrationTests/TestFiles/LitTests/LitTest/runTests.py
similarity index 99%
rename from Test/runTests.py
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/runTests.py
index e08dc5f5227..3dcbefb2fa9 100755
--- a/Test/runTests.py
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/runTests.py
@@ -40,7 +40,7 @@ class Defaults:
     EXCLUDED_FOLDERS = ["Inputs", "Output", "sandbox", "desktop"]
     DAFNY_BIN = os.path.realpath(os.path.join(os.path.dirname(__file__), "../Binaries/Dafny.exe"))
     COMPILER = [DAFNY_BIN]
-    FLAGS = ["/useBaseNameForFileName", "/compile:1", "/compileVerbose:0", "/timeLimit:300"]
+    FLAGS = ["/useBaseNameForFileName", "/compile:1", "/compileVerbose:0", "/timeLimit:300", "/rlimit:500000000"]
     EXTENSIONS = [".dfy", ".transcript"]
 
 class Colors:
diff --git a/Test/separate-verification/Inputs/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/Inputs/.gitignore
similarity index 100%
rename from Test/separate-verification/Inputs/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/Inputs/.gitignore
diff --git a/Test/separate-verification/Inputs/seq.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/Inputs/seq.dfy
similarity index 75%
rename from Test/separate-verification/Inputs/seq.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/Inputs/seq.dfy
index 47c41a7e993..04fbd516f7c 100644
--- a/Test/separate-verification/Inputs/seq.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/Inputs/seq.dfy
@@ -9,9 +9,9 @@ module Seq {
   {
   }
 
-  function {:opaque} IndexOfOption<T(==)>(s: seq<T>, v: T): (o: Option<nat>)
+  opaque function IndexOfOption<T(==)>(s: seq<T>, v: T): (o: Option<nat>)
     ensures if o.Some? then o.value < |s| && s[o.value] == v &&
-                            forall j {:trigger s[j]} :: 0 <= j < o.value ==> s[j] != v
+                            forall j :: 0 <= j < o.value ==> s[j] != v
             else v !in s
   {
     if |s| == 0 then None()
diff --git a/Test/separate-verification/Inputs/wrappers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/Inputs/wrappers.dfy
similarity index 100%
rename from Test/separate-verification/Inputs/wrappers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/Inputs/wrappers.dfy
diff --git a/Test/separate-verification/Inputs/wrappers3.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/Inputs/wrappers3.dfy
similarity index 100%
rename from Test/separate-verification/Inputs/wrappers3.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/Inputs/wrappers3.dfy
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/app.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/app.dfy
new file mode 100644
index 00000000000..c9bc3e4e8f7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/app.dfy
@@ -0,0 +1,48 @@
+// NONUNIFORM: Multiple test scenarios - ideally would still test for each backend though
+
+// RUN: %baredafny build %args -t:lib %S/Inputs/wrappers.dfy > %t
+// RUN: %baredafny build %args -t:lib %S/Inputs/seq.dfy --library %S/Inputs/wrappers.doo >> %t
+// RUN: %baredafny run   %args %s --library %S/Inputs/seq.doo --library %S/Inputs/wrappers.doo >> %t
+
+// Supported: matching options
+
+// RUN: %baredafny build %args -t:lib --boogie /vcsSplitOnEveryAssert %S/Inputs/wrappers.dfy
+// RUN: %baredafny build %args -t:lib --boogie /vcsSplitOnEveryAssert %S/Inputs/seq.dfy --library %S/Inputs/wrappers.doo >> %t
+
+// RUN: %baredafny build %args -t:lib --no-verify %S/Inputs/wrappers.dfy
+// RUN: %baredafny build %args -t:lib --no-verify %S/Inputs/seq.dfy --library %S/Inputs/wrappers.doo >> %t
+
+// Supported: mismatching irrelevant options
+
+// RUN: %baredafny build %args -t:lib --function-syntax:3 %S/Inputs/wrappers3.dfy
+// RUN: %baredafny build %args -t:lib %S/Inputs/seq.dfy --library %S/Inputs/wrappers3.doo >> %t
+
+// Error cases: mismatched options
+
+// RUN: %baredafny build %args -t:lib --unicode-char true %S/Inputs/wrappers.dfy
+// RUN: ! %baredafny build %args -t:lib --allow-deprecation --unicode-char false %S/Inputs/seq.dfy --library %S/Inputs/wrappers.doo >> %t
+
+// RUN: %baredafny build %args -t:lib --boogie /vcsLoad:2 %S/Inputs/wrappers.dfy
+// RUN: ! %baredafny build %args -t:lib %S/Inputs/seq.dfy --library %S/Inputs/wrappers.doo >> %t
+
+// RUN: %baredafny build %args -t:lib --no-verify %S/Inputs/wrappers.dfy
+// RUN: ! %baredafny build %args -t:lib %S/Inputs/seq.dfy --library %S/Inputs/wrappers.doo >> %t
+
+// RUN: %diff "%s.expect" %t
+
+module App {
+
+  import opened Seq
+
+  method Main() {
+    var a := [1, 2, 3];
+    var b := [4, 5, 6];
+    var c := [7, 8, 9];
+
+    LemmaConcatIsAssociative(a, b, c);
+    assert (a + b) + c == a + (b + c);
+
+    print a + b + c, "\n";
+  }
+
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/app.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/app.dfy.expect
new file mode 100644
index 00000000000..50c7835bf5a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/app.dfy.expect
@@ -0,0 +1,16 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+
+Dafny program verifier finished with 2 verified, 0 errors
+
+Dafny program verifier finished with 1 verified, 0 errors
+[1, 2, 3, 4, 5, 6, 7, 8, 9]
+
+Dafny program verifier finished with 2 verified, 0 errors
+
+Dafny program verifier did not attempt verification
+
+Dafny program verifier finished with 2 verified, 0 errors
+CLI: Error: cannot load wrappers.doo: --unicode-char is set locally to False, but the library was built with True
+CLI: Error: cannot load wrappers.doo: --boogie is set locally to [], but the library was built with [/vcsLoad:2]
+CLI: Error: cannot load wrappers.doo: --no-verify is set locally to False, but the library was built with True
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/assumptions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/assumptions.dfy
new file mode 100644
index 00000000000..31c3d276abc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/assumptions.dfy
@@ -0,0 +1,6 @@
+// Passing --no-verify because TestAuditor.dfy intentionally has a failing assertion,
+// but that would otherwise mean we don't get far enough to exercise the LibraryBackend.
+// RUN: ! %build -t:lib --allow-axioms false --no-verify --reads-clauses-on-methods %args %s > %t
+// RUN: %diff "%s.expect" %t
+
+include "../auditor/TestAuditor.dfy"
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/assumptions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/assumptions.dfy.expect
new file mode 100644
index 00000000000..4034e917d44
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/separate-verification/assumptions.dfy.expect
@@ -0,0 +1,18 @@
+TestAuditor.dfy(24,25): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+TestAuditor.dfy(38,2): Warning: assume statement has no {:axiom} annotation
+TestAuditor.dfy(45,17): Warning: when a method is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+TestAuditor.dfy(50,17): Warning: when a method is exported, meaning it has a body and an {:extern} annotation, Dafny can not guarantee that it is called with arguments that satisfy its preconditions (its requires clauses and inputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'
+TestAuditor.dfy(72,19): Warning: when a function is imported, meaning it has no body and an {:extern} annotation, Dafny can not guarantee that its implementation satisfies its post-conditions (its ensures clauses and outputs that are subset types). To silence this warning, please add an {:axiom} attribute or use the option '--allow-external-contracts'.
+TestAuditor.dfy(136,2): Warning: assume statement has no {:axiom} annotation
+TestAuditor.dfy(150,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
+TestAuditor.dfy(154,9): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
+TestAuditor.dfy(95,4): Warning: this forall statement has no body
+TestAuditor.dfy(102,4): Warning: this loop has no body (loop frame: i)
+TestAuditor.dfy(139,2): Warning: this forall statement has no body
+TestAuditor.dfy(143,2): Warning: this loop has no body (loop frame: i)
+TestAuditor.dfy(93,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+TestAuditor.dfy(95,4): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+TestAuditor.dfy(139,2): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier did not attempt verification
+Translation was aborted because warnings were found and --allow-warnings was not specified
diff --git a/Test/server/README.md b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/README.md
similarity index 100%
rename from Test/server/README.md
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/README.md
diff --git a/Test/server/counterexample_commandline.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/counterexample_commandline.dfy
similarity index 83%
rename from Test/server/counterexample_commandline.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/counterexample_commandline.dfy
index c19005ba48e..d23397890f2 100644
--- a/Test/server/counterexample_commandline.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/counterexample_commandline.dfy
@@ -1,5 +1,5 @@
 
-// RUN: %exits-with 4 %dafny /compile:0 /proverOpt:O:model.compact=false /proverOpt:O:model.completion=true /warnShadowing /extractCounterexample /mv:%t.model "%s" > "%t"
+// RUN: %exits-with 4 %verify --extract-counterexample "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // The following method performs string equality comparison whereas its 
@@ -19,6 +19,7 @@ module Patterns {
                     s[n] == p[n] || 
                     p[n] == '?'
         { 
+            b := false;
             var i := 0;
             while (i < |s|) 
                 invariant i <= |s|
@@ -27,7 +28,7 @@ module Patterns {
                     p[n] == '?'
             {
                 if (s[i] != p[i]) { // must add && (p[i] != '?') to verify
-                    return false;
+                    return;
                 } 
                 i := i + 1;
             }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/counterexample_commandline.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/counterexample_commandline.dfy.expect
new file mode 100644
index 00000000000..e13eaa030b7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/counterexample_commandline.dfy.expect
@@ -0,0 +1,17 @@
+counterexample_commandline.dfy(31,20): Error: a postcondition could not be proved on this return path
+ Related counterexample:
+ WARNING: the following counterexample may be inconsistent or invalid. See dafny.org/dafny/DafnyRef/DafnyRef#sec-counterexamples
+ Temporary variables to describe counterexamples: 
+ ghost var counterexampleLoopGuard0 : bool := false;
+ counterexample_commandline.dfy(21,8): initial state:
+ assume this != null && |this.p| > 0 && |s| > 0 && 1 == |s| && '\0' == s[0] && 1 == |this.p| && '?' == this.p[0];
+ counterexample_commandline.dfy(22,22):
+ assume this != null && |this.p| > 0 && |s| > 0 && 1 == |s| && '\0' == s[0] && false == b && 1 == |this.p| && '?' == this.p[0];
+ counterexample_commandline.dfy(23,22):
+ assume this != null && |this.p| > 0 && |s| > 0 && 1 == |s| && '\0' == s[0] && false == b && 0 == i && '?' == this.p[0] && 1 == |this.p|;
+ counterexample_commandline.dfy(24,12): after some loop iterations:
+ counterexampleLoopGuard0 := this != null && |this.p| > 0 && |s| > 0 && 1 == |s| && '\0' == s[0] && false == b && 0 == i && '?' == this.p[0] && 1 == |this.p|;
+ 
+counterexample_commandline.dfy(18,22): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/server/counterexample_none.transcript b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/counterexample_none.transcript
similarity index 100%
rename from Test/server/counterexample_none.transcript
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/counterexample_none.transcript
diff --git a/Test/server/counterexample_none.transcript.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/counterexample_none.transcript.expect
similarity index 100%
rename from Test/server/counterexample_none.transcript.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/counterexample_none.transcript.expect
diff --git a/Test/server/marshal.transcript b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/marshal.transcript
similarity index 100%
rename from Test/server/marshal.transcript
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/marshal.transcript
diff --git a/Test/server/marshal.transcript.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/marshal.transcript.expect
similarity index 100%
rename from Test/server/marshal.transcript.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/marshal.transcript.expect
diff --git a/Test/server/minimal.transcript b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/minimal.transcript
similarity index 100%
rename from Test/server/minimal.transcript
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/minimal.transcript
diff --git a/Test/server/minimal.transcript.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/minimal.transcript.expect
similarity index 75%
rename from Test/server/minimal.transcript.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/minimal.transcript.expect
index 651a46f349c..7e307f5991a 100644
--- a/Test/server/minimal.transcript.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/minimal.transcript.expect
@@ -2,6 +2,6 @@
 
 Verifying A (correctness) ...
   [1 proof obligation]  error
-transcript(3,9): Error: assertion could not be proved
+transcript(3,2): Error: assertion might not hold
 Verification completed successfully!
 [SUCCESS] [[DAFNY-SERVER: EOM]]
diff --git a/Test/server/simple-session.transcript.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/simple-session.transcript.expect
similarity index 92%
rename from Test/server/simple-session.transcript.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/simple-session.transcript.expect
index 26edcc53de0..2dcd71e0f2a 100644
--- a/Test/server/simple-session.transcript.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/simple-session.transcript.expect
@@ -253,7 +253,7 @@ transcript(33,0): Warning: module-level methods are always non-instance, so the
 transcript(10,9): Info: Selected triggers: {x' * x'}
 transcript(20,9): Info: Selected triggers: {x' * x'}
 transcript(29,9): Info: Selected triggers: {x' * x'}
-transcript(38,9): Warning: /!\ No terms found to trigger on.
+transcript(38,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 Retrieving cached verification result for implementation M' (correctness)...
   [1 proof obligation]  verified
 Retrieving cached verification result for implementation M0 (correctness)...
@@ -280,7 +280,7 @@ transcript(33,0): Warning: module-level methods are always non-instance, so the
 transcript(10,9): Info: Selected triggers: {x' * x'}
 transcript(20,9): Info: Selected triggers: {x' * x'}
 transcript(29,9): Info: Selected triggers: {x' * x'}
-transcript(38,9): Warning: /!\ No terms found to trigger on.
+transcript(38,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 Retrieving cached verification result for implementation M' (correctness)...
   [1 proof obligation]  verified
 Retrieving cached verification result for implementation M0 (correctness)...
@@ -300,7 +300,7 @@ transcript(33,0): Warning: module-level methods are always non-instance, so the
 transcript(10,9): Info: Selected triggers: {x' * x'}
 transcript(20,9): Info: Selected triggers: {x' * x'}
 transcript(29,9): Info: Selected triggers: {x' * x'}
-transcript(38,9): Warning: /!\ No terms found to trigger on.
+transcript(38,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 Retrieving cached verification result for implementation M' (correctness)...
   [1 proof obligation]  verified
 Retrieving cached verification result for implementation M0 (correctness)...
@@ -319,7 +319,7 @@ transcript(33,0): Warning: module-level methods are always non-instance, so the
 transcript(10,9): Info: Selected triggers: {x' * x'}
 transcript(20,9): Info: Selected triggers: {x' * x'}
 transcript(29,9): Info: Selected triggers: {x' * x'}
-transcript(38,9): Warning: /!\ No terms found to trigger on.
+transcript(38,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 Retrieving cached verification result for implementation M' (correctness)...
   [1 proof obligation]  verified
 Retrieving cached verification result for implementation M0 (correctness)...
@@ -358,7 +358,7 @@ transcript(33,0): Warning: module-level methods are always non-instance, so the
 transcript(10,9): Info: Selected triggers: {x' * x'}
 transcript(20,9): Info: Selected triggers: {x' * x'}
 transcript(29,9): Info: Selected triggers: {x' * x'}
-transcript(38,9): Warning: /!\ No terms found to trigger on.
+transcript(38,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 Retrieving cached verification result for implementation M' (correctness)...
   [1 proof obligation]  verified
 Retrieving cached verification result for implementation M0 (correctness)...
@@ -398,7 +398,7 @@ transcript(33,0): Warning: module-level methods are always non-instance, so the
 transcript(10,9): Info: Selected triggers: {x' * x'}
 transcript(20,9): Info: Selected triggers: {x' * x'}
 transcript(29,9): Info: Selected triggers: {x' * x'}
-transcript(38,9): Warning: /!\ No terms found to trigger on.
+transcript(38,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 Retrieving cached verification result for implementation M' (correctness)...
   [1 proof obligation]  verified
 Retrieving cached verification result for implementation M0 (correctness)...
@@ -417,7 +417,7 @@ transcript(33,0): Warning: module-level methods are always non-instance, so the
 transcript(10,9): Info: Selected triggers: {x' * x'}
 transcript(20,9): Info: Selected triggers: {x' * x'}
 transcript(29,9): Info: Selected triggers: {x' * x'}
-transcript(38,9): Warning: /!\ No terms found to trigger on.
+transcript(38,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 Retrieving cached verification result for implementation M' (correctness)...
   [1 proof obligation]  verified
 Retrieving cached verification result for implementation M0 (correctness)...
diff --git a/Test/server/symbols.transcript b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/symbols.transcript
similarity index 100%
rename from Test/server/symbols.transcript
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/symbols.transcript
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/symbols.transcript.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/symbols.transcript.expect
new file mode 100644
index 00000000000..4f626990b72
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/symbols.transcript.expect
@@ -0,0 +1,11 @@
+# Reading from symbols.transcript
+bank.dfy(2,17): Info: deprecated style: a semi-colon is not needed here (ID: p_deprecated_semicolon)
+Semicolons are required after statements and declarations in method bodies,  
+but are deprecated after declarations within modules and types.
+bank.dfy(4,25): Info: constructors no longer need 'this' to be listed in modifies clauses (ID: g_deprecated_this_in_constructor_modifies_clause)
+bank.dfy(9,29): Info: deprecated style: a semi-colon is not needed here (ID: p_deprecated_semicolon)
+Semicolons are required after statements and declarations in method bodies,  
+but are deprecated after declarations within modules and types.
+SYMBOLS_START [{"Call":null,"Column":3,"EndColumn":3,"EndLine":6,"EndPosition":105,"Ensures":[],"Line":4,"Module":"_module","Name":"_ctor","ParentClass":"BankAccountUnsafe","Position":52,"ReferencedClass":null,"ReferencedModule":null,"References":[],"Requires":[],"SymbolType":"Method"},{"Call":null,"Column":9,"EndColumn":2,"EndLine":13,"EndPosition":253,"Ensures":["balance >= 0"],"Line":8,"Module":"_module","Name":"withdraw","ParentClass":"BankAccountUnsafe","Position":118,"ReferencedClass":null,"ReferencedModule":null,"References":[],"Requires":["amount < balance"],"SymbolType":"Method"},{"Call":null,"Column":6,"EndColumn":null,"EndLine":null,"EndPosition":null,"Ensures":null,"Line":2,"Module":"_module","Name":"balance","ParentClass":"BankAccountUnsafe","Position":32,"ReferencedClass":null,"ReferencedModule":null,"References":[{"Column":5,"Line":5,"MethodName":"balance","Position":87,"ReferencedName":"balance"},{"Column":3,"Line":12,"MethodName":"balance","Position":222,"ReferencedName":"balance"},{"Column":14,"Line":12,"MethodName":"balance","Position":233,"ReferencedName":"balance"}],"Requires":null,"SymbolType":"Field"},{"Call":null,"Column":0,"EndColumn":0,"EndLine":0,"EndPosition":0,"Ensures":null,"Line":0,"Module":"_module","Name":"_default","ParentClass":null,"Position":0,"ReferencedClass":null,"ReferencedModule":null,"References":[],"Requires":null,"SymbolType":"Class"},{"Call":null,"Column":7,"EndColumn":1,"EndLine":14,"EndPosition":256,"Ensures":null,"Line":1,"Module":"_module","Name":"BankAccountUnsafe","ParentClass":null,"Position":6,"ReferencedClass":null,"ReferencedModule":null,"References":[],"Requires":null,"SymbolType":"Class"}] SYMBOLS_END
+Verification completed successfully!
+[SUCCESS] [[DAFNY-SERVER: EOM]]
diff --git a/Test/server/unmarshal.transcript b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/unmarshal.transcript
similarity index 100%
rename from Test/server/unmarshal.transcript
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/unmarshal.transcript
diff --git a/Test/server/unmarshal.transcript.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/server/unmarshal.transcript.expect
similarity index 100%
rename from Test/server/unmarshal.transcript.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/server/unmarshal.transcript.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries.dfy
new file mode 100644
index 00000000000..e25846108a1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries.dfy
@@ -0,0 +1,20 @@
+// RUN: %testDafnyForEachCompiler "%s" -- --standard-libraries
+
+// This is just a basic test of the mechanism to make the standard libraries
+// available to user code in general.
+// The DafnyStandardLibraries project itself contains
+// tests and examples of the actual standard library code.
+
+module UsesWrappers {
+
+  import opened Std.Wrappers
+
+  function SafeDiv(a: int, b: int): Option<int> {
+    if b == 0 then None else Some(a/b)
+  }
+
+  method Main() {
+    print SafeDiv(4, 2), "\n";
+    print SafeDiv(7, 0), "\n";
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries.dfy.expect
new file mode 100644
index 00000000000..2e06a9d1f47
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries.dfy.expect
@@ -0,0 +1,2 @@
+Wrappers.Option.Some(2)
+Wrappers.Option.None
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries.dfy.rs.check
new file mode 100644
index 00000000000..7d2d31cd8d5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Unsupported:\ Cannot\ emit\ literal\ expression\ 0\ outside\ of\ expression\ context:\ Microsoft_dDafny_dCompilers_dBuilderSyntaxTree'1\[Microsoft_dDafny_dCompilers_dStatementContainer]</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_Errors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_Errors.dfy
new file mode 100644
index 00000000000..8f378b60ea3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_Errors.dfy
@@ -0,0 +1,25 @@
+// This test asserts the current behavior for trying to use
+// standard libraries in contexts that aren't supported:
+// not providing the option, providing incompatible options,
+// commands like formatting, etc.
+
+// Valid:
+
+// RUN: %verify --standard-libraries:true "%s" > "%t"
+// RUN: %verify --standard-libraries:true --track-print-effects "%s" >> "%t"
+
+// Invalid:
+
+// RUN: %exits-with 2 %verify "%s" >> "%t"
+// RUN: %exits-with 1 %verify --standard-libraries:true --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: %exits-with 1 %baredafny format --standard-libraries "%s" 2>> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module UsesWrappers {
+
+  import opened Std.Wrappers
+
+  function SafeDiv(a: int, b: int): Option<int> {
+    if b == 0 then None else Some(a/b)
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_Errors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_Errors.dfy.expect
new file mode 100644
index 00000000000..ac5466df830
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_Errors.dfy.expect
@@ -0,0 +1,10 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
+
+Dafny program verifier finished with 1 verified, 0 errors
+StandardLibraries_Errors.dfy(20,20): Error: module Std does not exist (position 0 in path Std.Wrappers)
+1 resolution/type errors detected in StandardLibraries_Errors.dfy
+CLI: Error: cannot load DafnyStandardLibraries-notarget.doo: --unicode-char is set locally to False, but the library was built with True
+CLI: Error: cannot load DafnyStandardLibraries.doo: --unicode-char is set locally to False, but the library was built with True
+Please use the '--check' and/or '--print' option as doo files cannot be formatted in place.
+Please use the '--check' and/or '--print' option as doo files cannot be formatted in place.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy
new file mode 100644
index 00000000000..b1d1c38d18c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy
@@ -0,0 +1,10 @@
+// This test just asserts what happens when you try to use a library
+// that isn't available for all backends (see .check files).
+// Full testing of such libraries is handled in the DafnyStandardLibraries
+// project rather than here.
+
+// RUN: %testDafnyForEachCompiler "%s" -- --standard-libraries:true
+
+module UsesFileIO {
+  import Std.FileIO
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.cpp.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.cpp.check
new file mode 100644
index 00000000000..0aa47749578
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.cpp.check
@@ -0,0 +1 @@
+CHECK-L: StandardLibraries_TargetSpecific.dfy(9,13): Error: module FileIO does not exist (position 1 in path Std.FileIO)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.dfy.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.dfy.check
new file mode 100644
index 00000000000..0aa47749578
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.dfy.check
@@ -0,0 +1 @@
+CHECK-L: StandardLibraries_TargetSpecific.dfy(9,13): Error: module FileIO does not exist (position 1 in path Std.FileIO)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.rs.check
new file mode 100644
index 00000000000..0aa47749578
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/stdlibs/StandardLibraries_TargetSpecific.dfy.rs.check
@@ -0,0 +1 @@
+CHECK-L: StandardLibraries_TargetSpecific.dfy(9,13): Error: module FileIO does not exist (position 1 in path Std.FileIO)
diff --git a/Test/traits/GeneralTraits.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraits.dfy
similarity index 76%
rename from Test/traits/GeneralTraits.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraits.dfy
index 34dd5f6093b..e64b182d029 100644
--- a/Test/traits/GeneralTraits.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraits.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /typeSystemRefresh:1 /generalTraits:1 "%s" > "%t"
+// RUN: %exits-with 2 %build --type-system-refresh --general-traits full "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Tests {
@@ -148,3 +148,59 @@ module MemberLookups {
     }
   }
 }
+
+module NewtypeBuiltinMembers0 {
+  trait MyTrait {
+    function K(): int { 8 }
+  }
+
+  newtype SmallReal extends MyTrait = r | -4.0 <= r < 300.0 {
+    function G(): int { 2 }
+    const Floor: string // error: "Floor" is already inherited from base type "real"
+  }
+
+  newtype AnotherReal = s: SmallReal | s.K() == 8 {
+    function H(): int { 3 }
+    const Floor: string // error: "Floor" is already inherited from base type "SmallReal"
+  }
+}
+
+module NewtypeBuiltinMembers1 {
+  trait MyTrait {
+    function K(): int { 8 }
+  }
+
+  newtype SmallReal extends MyTrait = r | -4.0 <= r < 300.0 {
+    function G(): int { 2 }
+  }
+
+  newtype AnotherReal = s: SmallReal | s.K() == 8 {
+    function H(): int { 3 }
+  }
+
+  method M0() returns (x: int, r: real, small: SmallReal, ano: AnotherReal)
+  {
+    x := r.Floor;
+
+    x := small.Floor;
+    x := small.G();
+    x := small.K();
+
+    x := ano.Floor;
+    x := ano.G();
+    x := ano.H();
+  }
+}
+
+module ValueTraitIs {
+  trait A {}
+
+  trait B extends A {}
+
+  predicate Test(x: A) {
+    // The following gives an error with general traits under the *legacy* type system. That's
+    // a bug, but supporting the combination legacy-type-system + general-traits is not a priority.
+    // It is allowed (as desired) with general traits underthe type system refresh (which we do care about).
+    x is B
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraits.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraits.dfy.expect
new file mode 100644
index 00000000000..4c75793de38
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraits.dfy.expect
@@ -0,0 +1,28 @@
+GeneralTraits.dfy(24,25): Error: datatype is not allowed to extend 'Parent', because it is a reference type
+GeneralTraits.dfy(25,26): Error: codatatype is not allowed to extend 'Parent', because it is a reference type
+GeneralTraits.dfy(26,27): Error: abstract type is not allowed to extend 'Parent', because it is a reference type
+GeneralTraits.dfy(27,24): Error: newtype is not allowed to extend 'Parent', because it is a reference type
+GeneralTraits.dfy(28,35): Error: newtype is not allowed to extend 'Parent', because it is a reference type
+GeneralTraits.dfy(56,36): Error: Raised while checking export set ProvideThem: a abstract type can only extend traits (found 'Trait')
+GeneralTraits.dfy(37,9): Error: This export set is not consistent: ProvideThem
+GeneralTraits.dfy(70,11): Error: arguments must have comparable types (got object and MyInt)
+GeneralTraits.dfy(71,11): Error: arguments must have comparable types (got TraitC and MyInt)
+GeneralTraits.dfy(73,12): Error: arguments must have comparable types (got MyInt and object)
+GeneralTraits.dfy(74,12): Error: arguments must have comparable types (got MyInt and TraitC)
+GeneralTraits.dfy(78,11): Error: arguments must have comparable types (got object and Dt)
+GeneralTraits.dfy(79,11): Error: arguments must have comparable types (got TraitC and Dt)
+GeneralTraits.dfy(81,12): Error: arguments must have comparable types (got Dt and object)
+GeneralTraits.dfy(82,12): Error: arguments must have comparable types (got Dt and TraitC)
+GeneralTraits.dfy(95,9): Error: == can only be applied to expressions of types that support equality (got TraitA)
+GeneralTraits.dfy(96,9): Error: == can only be applied to expressions of types that support equality (got TraitB)
+GeneralTraits.dfy(98,15): Error: == can only be applied to expressions of types that support equality (got TraitA)
+GeneralTraits.dfy(99,15): Error: == can only be applied to expressions of types that support equality (got TraitB)
+GeneralTraits.dfy(101,9): Error: == can only be applied to expressions of types that support equality (got TraitA)
+GeneralTraits.dfy(102,9): Error: == can only be applied to expressions of types that support equality (got TraitB)
+GeneralTraits.dfy(104,15): Error: == can only be applied to expressions of types that support equality (got TraitA)
+GeneralTraits.dfy(105,15): Error: == can only be applied to expressions of types that support equality (got TraitB)
+GeneralTraits.dfy(107,9): Error: == can only be applied to expressions of types that support equality (got TraitA)
+GeneralTraits.dfy(108,17): Error: == can only be applied to expressions of types that support equality (got TraitA)
+GeneralTraits.dfy(159,10): Error: field 'Floor' is inherited from type 'real' and is not allowed to be re-declared in newtype 'SmallReal'
+GeneralTraits.dfy(164,10): Error: const field 'Floor' is inherited from newtype 'SmallReal' and is not allowed to be re-declared in newtype 'AnotherReal'
+27 resolution/type errors detected in GeneralTraits.dfy
diff --git a/Test/traits/GeneralTraitsCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsCompile.dfy
similarity index 98%
rename from Test/traits/GeneralTraitsCompile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsCompile.dfy
index ba491c9b971..05baf25a0ba 100644
--- a/Test/traits/GeneralTraitsCompile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsCompile.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --general-traits --type-system-refresh
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --general-traits=full --type-system-refresh=true
 
 method Main() {
   Tests.Test();
diff --git a/Test/traits/GeneralTraitsCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsCompile.dfy.expect
similarity index 100%
rename from Test/traits/GeneralTraitsCompile.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsCompile.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsCompile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsCompile.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsCompile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/traits/GeneralTraitsVerify.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsVerify.dfy
similarity index 99%
rename from Test/traits/GeneralTraitsVerify.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsVerify.dfy
index 8def00b24b0..148d6b83383 100644
--- a/Test/traits/GeneralTraitsVerify.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsVerify.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /typeSystemRefresh:1 /generalTraits:1 "%s" > "%t"
+// RUN: %exits-with 4 %build --type-system-refresh --general-traits full "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Tests {
diff --git a/Test/traits/GeneralTraitsVerify.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsVerify.dfy.expect
similarity index 85%
rename from Test/traits/GeneralTraitsVerify.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsVerify.dfy.expect
index 518d3c24e9a..42ee8f0def8 100644
--- a/Test/traits/GeneralTraitsVerify.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/GeneralTraitsVerify.dfy.expect
@@ -4,6 +4,6 @@ GeneralTraitsVerify.dfy(40,13): Error: value of expression (of type 'Parent') is
 GeneralTraitsVerify.dfy(43,13): Error: value of expression (of type 'Parent') is not known to be an instance of type 'Abstract'
 GeneralTraitsVerify.dfy(50,13): Error: value of expression (of type 'Parent') is not known to be an instance of type 'MyInt'
 GeneralTraitsVerify.dfy(53,13): Error: value does not satisfy the subset constraints of 'MyConstrainedInt'
-GeneralTraitsVerify.dfy(419,11): Error: assertion might not hold
+GeneralTraitsVerify.dfy(419,4): Error: assertion might not hold
 
-Dafny program verifier finished with 48 verified, 7 errors
+Dafny program verifier finished with 52 verified, 7 errors
diff --git a/Test/traits/NonReferenceTraits.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraits.dfy
similarity index 98%
rename from Test/traits/NonReferenceTraits.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraits.dfy
index 9cae81d22bb..6f45dc10488 100644
--- a/Test/traits/NonReferenceTraits.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraits.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /generalTraits:0 "%s" > "%t"
-// RUN: %exits-with 2 %dafny /generalTraits:1 "%s" >> "%t"
+// RUN: %exits-with 2 %build --general-traits legacy "%s" > "%t"
+// RUN: %exits-with 2 %build --general-traits datatype "%s" >> "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Tests {
diff --git a/Test/traits/NonReferenceTraits.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraits.dfy.expect
similarity index 100%
rename from Test/traits/NonReferenceTraits.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraits.dfy.expect
diff --git a/Test/traits/NonReferenceTraitsCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsCompile.dfy
similarity index 96%
rename from Test/traits/NonReferenceTraitsCompile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsCompile.dfy
index eeb031aef35..c6db687b2a3 100644
--- a/Test/traits/NonReferenceTraitsCompile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsCompile.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --general-traits
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --general-traits=full
 
 method Main() {
   BoxingConcerns.Test();
diff --git a/Test/traits/NonReferenceTraitsCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsCompile.dfy.expect
similarity index 100%
rename from Test/traits/NonReferenceTraitsCompile.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsCompile.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsCompile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsCompile.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsCompile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/traits/NonReferenceTraitsVerify.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsVerify.dfy
similarity index 98%
rename from Test/traits/NonReferenceTraitsVerify.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsVerify.dfy
index 20c09c4cbdb..e93367473ca 100644
--- a/Test/traits/NonReferenceTraitsVerify.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsVerify.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /generalTraits:1 "%s" > "%t"
+// RUN: %exits-with 4 %build --general-traits datatype "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module ChildIsNonRefTrait {
diff --git a/Test/traits/NonReferenceTraitsVerify.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsVerify.dfy.expect
similarity index 87%
rename from Test/traits/NonReferenceTraitsVerify.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsVerify.dfy.expect
index a5d7dab583a..737eae2456d 100644
--- a/Test/traits/NonReferenceTraitsVerify.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/NonReferenceTraitsVerify.dfy.expect
@@ -1,16 +1,16 @@
-NonReferenceTraitsVerify.dfy(33,13): Error: a postcondition could not be proved on this return path
+NonReferenceTraitsVerify.dfy(37,6): Error: a postcondition could not be proved on this return path
 NonReferenceTraitsVerify.dfy(35,22): Related location: this is the postcondition that could not be proved
 NonReferenceTraitsVerify.dfy(43,4): Error: a postcondition could not be proved on this return path
 NonReferenceTraitsVerify.dfy(42,16): Related location: this is the postcondition that could not be proved
 NonReferenceTraitsVerify.dfy(49,13): Error: the function must provide an equal or more permissive precondition than in its parent trait
 NonReferenceTraitsVerify.dfy(56,11): Error: the method must provide an equal or more detailed postcondition than in its parent trait
-NonReferenceTraitsVerify.dfy(103,13): Error: a postcondition could not be proved on this return path
+NonReferenceTraitsVerify.dfy(107,6): Error: a postcondition could not be proved on this return path
 NonReferenceTraitsVerify.dfy(105,22): Related location: this is the postcondition that could not be proved
 NonReferenceTraitsVerify.dfy(113,4): Error: a postcondition could not be proved on this return path
 NonReferenceTraitsVerify.dfy(112,16): Related location: this is the postcondition that could not be proved
 NonReferenceTraitsVerify.dfy(119,13): Error: the function must provide an equal or more permissive precondition than in its parent trait
 NonReferenceTraitsVerify.dfy(126,11): Error: the method must provide an equal or more detailed postcondition than in its parent trait
-NonReferenceTraitsVerify.dfy(173,13): Error: a postcondition could not be proved on this return path
+NonReferenceTraitsVerify.dfy(177,6): Error: a postcondition could not be proved on this return path
 NonReferenceTraitsVerify.dfy(175,22): Related location: this is the postcondition that could not be proved
 NonReferenceTraitsVerify.dfy(183,4): Error: a postcondition could not be proved on this return path
 NonReferenceTraitsVerify.dfy(182,16): Related location: this is the postcondition that could not be proved
diff --git a/Test/traits/TraitBasix.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitBasix.dfy
similarity index 96%
rename from Test/traits/TraitBasix.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitBasix.dfy
index 128bfdcfbb6..56001e63a1d 100644
--- a/Test/traits/TraitBasix.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitBasix.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module m1
 {
@@ -82,7 +82,7 @@ module m1
     method Customizable(w: int) returns (p: int)
       modifies this
     {
-       w:=w+1;
+      p := w + 1;
     }
 
     var c1: I0Child
diff --git a/Test/traits/TraitBasix.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitBasix.dfy.expect
similarity index 100%
rename from Test/traits/TraitBasix.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitBasix.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitBasix.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitBasix.dfy.refresh.expect
new file mode 100644
index 00000000000..59b01f70652
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitBasix.dfy.refresh.expect
@@ -0,0 +1,8 @@
+TraitBasix.dfy(77,8): Error: field 'x' is inherited from trait 'I2' and is not allowed to be re-declared
+TraitBasix.dfy(70,8): Error: class 'I0Child' does not implement trait method 'I2.Customizable'
+TraitBasix.dfy(80,8): Error: class 'I0Child2' does not implement trait function 'I2.F'
+TraitBasix.dfy(91,24): Error: Type or type parameter is not declared in this scope: IX (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
+TraitBasix.dfy(101,16): Error: a trait is not allowed to declare a constructor
+TraitBasix.dfy(117,14): Error: new can be applied only to class types (got I1)
+TraitBasix.dfy(184,6): Error: RHS (of type B) not assignable to LHS (of type Tr?<int>) (non-variant type parameter 'X' would require int = real)
+7 resolution/type errors detected in TraitBasix.dfy
diff --git a/Test/traits/TraitCompile.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompile.dfy
similarity index 99%
rename from Test/traits/TraitCompile.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompile.dfy
index 6e9b925fbc5..fdf3ffcb553 100644
--- a/Test/traits/TraitCompile.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompile.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 trait TT
 {
diff --git a/Test/traits/TraitCompile.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompile.dfy.expect
similarity index 100%
rename from Test/traits/TraitCompile.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompile.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompile.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompile.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompile.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompileErrors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompileErrors.dfy
new file mode 100644
index 00000000000..5796663c8b8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompileErrors.dfy
@@ -0,0 +1,16 @@
+// RUN: %exits-with 3 %build "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module StaticMembers {
+  trait Tr {
+    // the following static members must also be given bodies, but that's checked by the compiler
+    static ghost function Func(): int ensures false
+    static method Method() ensures false
+    static twostate function TwoF(): int ensures false
+    static twostate lemma TwoL() ensures false
+    static least predicate P()
+    static greatest predicate Q()
+    static least lemma IL() ensures false
+    static greatest lemma CL() ensures false
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompileErrors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompileErrors.dfy.expect
new file mode 100644
index 00000000000..5a3326e4591
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitCompileErrors.dfy.expect
@@ -0,0 +1,10 @@
+TraitCompileErrors.dfy(7,46): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+TraitCompileErrors.dfy(8,35): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+TraitCompileErrors.dfy(9,49): Warning: This ensures clause is part of a bodyless function. Add the {:axiom} attribute to it or the enclosing function to suppress this warning
+TraitCompileErrors.dfy(10,41): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+TraitCompileErrors.dfy(13,36): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+TraitCompileErrors.dfy(14,39): Warning: This ensures clause is part of a bodyless method. Add the {:axiom} attribute to it or the enclosing method to suppress this warning
+
+Dafny program verifier finished with 2 verified, 0 errors
+TraitCompileErrors.dfy(8,18): Error: Method StaticMembers.Tr.Method has no body so it cannot be compiled
+Translation was aborted because errors were found
diff --git a/Test/traits/TraitExample.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExample.dfy
similarity index 97%
rename from Test/traits/TraitExample.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExample.dfy
index 54c5cbbec6f..0a724cf53b3 100644
--- a/Test/traits/TraitExample.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExample.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 trait Automobile {
   ghost var Repr: set<object>
diff --git a/Test/traits/TraitExample.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExample.dfy.expect
similarity index 100%
rename from Test/traits/TraitExample.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExample.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExample.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExample.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExample.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/traits/TraitExtend.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExtend.dfy
similarity index 88%
rename from Test/traits/TraitExtend.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExtend.dfy
index 11e1665d1c7..7a981240b78 100644
--- a/Test/traits/TraitExtend.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExtend.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait t
diff --git a/Test/traits/TraitExtend.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExtend.dfy.expect
similarity index 100%
rename from Test/traits/TraitExtend.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitExtend.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitMultiModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitMultiModule.dfy
new file mode 100644
index 00000000000..0b6d74400ac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitMultiModule.dfy
@@ -0,0 +1,74 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
+
+module M1
+{
+  trait T1
+  {
+    method M1 (a:int)
+  }
+  trait {:termination false} T2 
+  {
+    method M2 (a:int)
+  }
+  class C1 extends T1
+  {
+    method M1 (x:int)
+    {
+      var y: int := x;
+    }
+  }
+}
+
+module M2
+{
+  import opened M1
+  class C2 extends T1  // error: currently no support to implement trait in different module
+  {
+    method M1 (a:int) {}
+  }
+  class C3 extends T2  // no error because of {:termination false} on the trait
+  {
+    method M1 (a:int) {}
+  }
+  @AssumeCrossModuleTermination
+  class C4 extends T1  // no error because of @AssumeCrossModuleTermination on this class
+  {
+    method M1 (a:int) {}
+  }
+
+  trait T3 extends T1  // error: currently no support to implement trait in different module
+  {
+  }
+  trait T4 extends T2  // no error because of @AssumeCrossModuleTermination on this trait
+  {
+  }
+}
+
+
+module M3 
+{
+  import opened M1
+
+  // This trait is in a separate module without resolution errors
+  // so we can extend it in another module and still get resolution errors there.
+  @AssumeCrossModuleTermination
+  trait T6 extends T1  // no error because of @AssumeCrossModuleTermination on this trait
+  {
+  }
+}
+
+module M4
+{
+  import M3
+  
+  class C2 extends M3.T6 // Still an error: @AssumeCrossModuleTermination doesn't imply {:termination false}
+  {
+    method M1 (a:int) {}
+  }
+  @AssumeCrossModuleTermination
+  class C3 extends M3.T6  // no error because of @AssumeCrossModuleTermination on this trait
+  {
+    method M1 (a:int) {}
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitMultiModule.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitMultiModule.dfy.expect
new file mode 100644
index 00000000000..02ad8925a31
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitMultiModule.dfy.expect
@@ -0,0 +1,4 @@
+TraitMultiModule.dfy(26,19): Error: class 'C2' is in a different module than trait 'M1.T1'. A class may only extend a trait in the same module, unless the parent trait is annotated with {:termination false} or the class with @AssumeCrossModuleTermination.
+TraitMultiModule.dfy(40,19): Error: trait 'T3' is in a different module than trait 'M1.T1'. A trait may only extend a trait in the same module, unless the parent trait is annotated with {:termination false} or the trait with @AssumeCrossModuleTermination.
+TraitMultiModule.dfy(65,22): Error: class 'C2' is in a different module than trait 'M3.T6'. A class may only extend a trait in the same module, unless the parent trait is annotated with {:termination false} or the class with @AssumeCrossModuleTermination.
+3 resolution/type errors detected in TraitMultiModule.dfy
diff --git a/Test/traits/TraitOverride0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride0.dfy
similarity index 90%
rename from Test/traits/TraitOverride0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride0.dfy
index a2e2fdb2129..856c5e04844 100644
--- a/Test/traits/TraitOverride0.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride0.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 trait T1
 {
diff --git a/Test/traits/TraitOverride0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride0.dfy.expect
similarity index 100%
rename from Test/traits/TraitOverride0.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride0.dfy.expect
diff --git a/Test/traits/TraitOverride1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride1.dfy
similarity index 97%
rename from Test/traits/TraitOverride1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride1.dfy
index c8334856daf..d6c7d58b167 100644
--- a/Test/traits/TraitOverride1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride1.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait T1
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride1.dfy.expect
new file mode 100644
index 00000000000..6d5c968e8a8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride1.dfy.expect
@@ -0,0 +1,6 @@
+TraitOverride1.dfy(200,9): Error: the method must provide an equal or more detailed postcondition than in its parent trait
+TraitOverride1.dfy(205,2): Error: a postcondition could not be proved on this return path
+TraitOverride1.dfy(204,41): Related location: this is the postcondition that could not be proved
+TraitOverride1.dfy(188,32): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 29 verified, 2 errors
diff --git a/Test/traits/TraitOverride2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride2.dfy
similarity index 96%
rename from Test/traits/TraitOverride2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride2.dfy
index ca4fe02155a..f0be6b63540 100644
--- a/Test/traits/TraitOverride2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride2.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --relax-definite-assignment --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait Spec<U> {
diff --git a/Test/traits/TraitOverride2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride2.dfy.expect
similarity index 100%
rename from Test/traits/TraitOverride2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitOverride2.dfy.expect
diff --git a/Test/traits/TraitPolymorphism.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitPolymorphism.dfy
similarity index 89%
rename from Test/traits/TraitPolymorphism.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitPolymorphism.dfy
index 33513e0f497..d8cf37048de 100644
--- a/Test/traits/TraitPolymorphism.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitPolymorphism.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait T1
diff --git a/Test/traits/TraitPolymorphism.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitPolymorphism.dfy.expect
similarity index 100%
rename from Test/traits/TraitPolymorphism.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitPolymorphism.dfy.expect
diff --git a/Test/traits/TraitResolution0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution0.dfy
similarity index 94%
rename from Test/traits/TraitResolution0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution0.dfy
index ca2ffd9868a..d1f83c095be 100644
--- a/Test/traits/TraitResolution0.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution0.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /env:0 /rprint:- /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s" -- --rprint:- --relax-definite-assignment
+
 
 module M0 {
   trait Tr<X> {
diff --git a/Test/traits/TraitResolution0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution0.dfy.expect
similarity index 91%
rename from Test/traits/TraitResolution0.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution0.dfy.expect
index d61e34bf7c0..1fe266b9208 100644
--- a/Test/traits/TraitResolution0.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution0.dfy.expect
@@ -25,7 +25,7 @@ module _System {
   */
 
   class {:compile false} array<arg> {
-    var Length: int  // immutable
+    const Length: int
   }
   /*-- non-null type
   type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
@@ -63,21 +63,23 @@ module _System {
     | f.requires()
     /*special witness*/
 
-  datatype {:compile false} /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
 
   type bool { }
 
+  type char { }
+
   type int { }
 
   type real {
-    var Floor: int  // immutable
+    const Floor: int
   }
 
   type ORDINAL {
-    var IsLimit: bool  // immutable
-    var IsSucc: bool  // immutable
-    var Offset: int  // immutable
-    var IsNat: bool  // immutable
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
   }
 
   type _bv {
@@ -86,19 +88,27 @@ module _System {
     function RotateRight(w: nat): selftype
   }
 
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
   type map<+T, +U> {
-    var Keys: set<T>  // immutable
-    var Values: set<U>  // immutable
-    var Items: set<(T, U)>  // immutable
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
   }
 
   type imap<*T, +U> {
-    var Keys: iset<T>  // immutable
-    var Values: iset<U>  // immutable
-    var Items: iset<(T, U)>  // immutable
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
   }
 
-  datatype {:compile false} /*_tuple#0*/ () = _#Make0
+  datatype /*_tuple#0*/ () = _#Make0
 
   type {:compile false} /*_#Func2*/ (-T0, -T1) ~> +R {
     ghost function requires(x0: T0, x1: T1): bool
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution0.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution0.dfy.refresh.expect
new file mode 100644
index 00000000000..e23fa482a03
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution0.dfy.refresh.expect
@@ -0,0 +1,358 @@
+// TraitResolution0.dfy
+
+/*
+module _System {
+  /* CALL GRAPH for module _System:
+   * SCC at height 1:
+   *   RotateLeft
+   * SCC at height 1:
+   *   RotateRight
+   * SCC at height 0:
+   *   array
+   * SCC at height 0:
+   *   nat
+   * SCC at height 0:
+   *   object
+   */
+  type string(==,0) = seq<char>
+
+  type {:axiom} nat(==,0) = x: int
+    | 0 <= x
+
+  trait {:compile false} object { }
+  /*-- non-null type
+  type {:axiom} object(==) = c: object? | c != null /*special witness*/
+  */
+
+  class {:compile false} array<arg> {
+    const Length: int
+  }
+  /*-- non-null type
+  type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
+  */
+
+  type {:compile false} /*_#Func1*/ -T0 ~> +R {
+    ghost function requires(x0: T0): bool
+      reads reads(x0)
+
+    ghost function reads(x0: T0): set<object?>
+      reads reads(x0)
+  }
+
+  type {:compile false} /*_#PartialFunc1*/ -T0 --> +R = f: T0 ~> R
+    | forall x0: T0 :: f.reads(x0) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc1*/ -T0 -> +R = f: T0 --> R
+    | forall x0: T0 :: f.requires(x0)
+    /*special witness*/
+
+  type {:compile false} /*_#Func0*/ () ~> +R {
+    ghost function requires(): bool
+      reads reads()
+
+    ghost function reads(): set<object?>
+      reads reads()
+  }
+
+  type {:compile false} /*_#PartialFunc0*/ () --> +R = f: () ~> R
+    | f.reads() == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc0*/ () -> +R = f: () --> R
+    | f.requires()
+    /*special witness*/
+
+  datatype /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
+
+  type bool { }
+
+  type char { }
+
+  type int { }
+
+  type real {
+    const Floor: int
+  }
+
+  type ORDINAL {
+    const IsLimit: bool
+    const IsSucc: bool
+    const Offset: int
+    const IsNat: bool
+  }
+
+  type _bv {
+    function RotateLeft(w: nat): selftype
+
+    function RotateRight(w: nat): selftype
+  }
+
+  type set<+T> { }
+
+  type iset<*T> { }
+
+  type seq<+T> { }
+
+  type multiset<+T> { }
+
+  type map<+T, +U> {
+    const Keys: set<T>
+    const Values: set<U>
+    const Items: set<(T, U)>
+  }
+
+  type imap<*T, +U> {
+    const Keys: iset<T>
+    const Values: iset<U>
+    const Items: iset<(T, U)>
+  }
+
+  datatype /*_tuple#0*/ () = _#Make0
+
+  type {:compile false} /*_#Func2*/ (-T0, -T1) ~> +R {
+    ghost function requires(x0: T0, x1: T1): bool
+      reads reads(x0, x1)
+
+    ghost function reads(x0: T0, x1: T1): set<object?>
+      reads reads(x0, x1)
+  }
+
+  type {:compile false} /*_#PartialFunc2*/ (-T0, -T1) --> +R = f: (T0, T1) ~> R
+    | forall x0: T0, x1: T1 :: f.reads(x0, x1) == {}
+    /*special witness*/
+
+  type {:compile false} /*_#TotalFunc2*/ (-T0, -T1) -> +R = f: (T0, T1) --> R
+    | forall x0: T0, x1: T1 :: f.requires(x0, x1)
+    /*special witness*/
+
+  type bv10 {
+    function RotateLeft(w: nat): bv10
+
+    function RotateRight(w: nat): bv10
+  }
+}
+// bitvector types in use: bv10
+*/
+
+/* CALL GRAPH for module _module:
+ */
+
+module M0 {
+  /* CALL GRAPH for module M0:
+   * SCC at height 1:
+   *   Cl.M
+   * SCC at height 0:
+   *   Cl
+   * SCC at height 0:
+   *   Tr
+   * SCC at height 0:
+   *   Tr.F
+   */
+  trait Tr<X> {
+    ghost function F(x: X): int
+    {
+      15
+    }
+  }
+  /*-- non-null type
+  type {:axiom} Tr(==)<X> = c: Tr?<X> | c != null /*special witness*/
+  */
+
+  class Cl<Y> extends Tr<Y> {
+    lemma M()
+    {
+      ghost var v: Cl<Y> := this;
+      ghost var u: Tr<Y> := this;
+      ghost var f: Y -> int := v.F;
+      ghost var g: Y -> int := this.F;
+    }
+  }
+  /*-- non-null type
+  type {:axiom} Cl(==)<Y> = c: Cl?<Y> | c != null /*special witness*/
+  */
+}
+
+module M1 {
+  /* CALL GRAPH for module M1:
+   * SCC at height 1:
+   *   M
+   * SCC at height 0:
+   *   Cl
+   * SCC at height 0:
+   *   Tr
+   */
+  lemma M(c: Cl<int>)
+    decreases c
+  {
+    ghost var x: (int, int) := c.w;
+  }
+
+  trait Tr<X(0)> {
+    var w: X
+  }
+  /*-- non-null type
+  type {:axiom} Tr(==)<X(0)> = c: Tr?<X> | c != null /*special witness*/
+  */
+
+  class Cl<Y(0)> extends Tr<(Y, Y)> { }
+  /*-- non-null type
+  type {:axiom} Cl(==)<Y(0)> = c: Cl?<Y> | c != null /*special witness*/
+  */
+}
+
+module M2 {
+  /* CALL GRAPH for module M2:
+   * SCC at height 1:
+   *   M
+   * SCC at height 0:
+   *   Cl
+   * SCC at height 0:
+   *   Tr
+   * SCC at height 0:
+   *   Tr.F
+   */
+  lemma M(c: Cl<int>)
+    decreases c
+  {
+    ghost var aa: (int, int);
+    ghost var bb: real;
+    ghost var u: bv10 := c.F(aa, bb);
+  }
+
+  trait Tr<X, W> {
+    function F(x: X, w: W): bv10
+    {
+      15
+    }
+  }
+  /*-- non-null type
+  type {:axiom} Tr(==)<X, W> = c: Tr?<X, W> | c != null /*special witness*/
+  */
+
+  class Cl<Y> extends Tr<(Y, Y), real> { }
+  /*-- non-null type
+  type {:axiom} Cl(==)<Y> = c: Cl?<Y> | c != null /*special witness*/
+  */
+}
+
+module P0 {
+  /* CALL GRAPH for module P0:
+   * SCC at height 1:
+   *   Cl.M
+   * SCC at height 0:
+   *   Cl
+   * SCC at height 0:
+   *   Tr
+   * SCC at height 0:
+   *   TrX
+   * SCC at height 0:
+   *   TrX.F
+   */
+  trait TrX<X> {
+    ghost function F(x: X): int
+    {
+      15
+    }
+  }
+  /*-- non-null type
+  type {:axiom} TrX(==)<X> = c: TrX?<X> | c != null /*special witness*/
+  */
+
+  trait Tr<X> extends TrX<X> { }
+  /*-- non-null type
+  type {:axiom} Tr(==)<X> = c: Tr?<X> | c != null /*special witness*/
+  */
+
+  class Cl<Y> extends Tr<Y> {
+    lemma M()
+    {
+      ghost var v: Cl<Y> := this;
+      ghost var u: Tr<Y> := this;
+      ghost var f: Y -> int := v.F;
+      ghost var g: Y -> int := this.F;
+    }
+  }
+  /*-- non-null type
+  type {:axiom} Cl(==)<Y> = c: Cl?<Y> | c != null /*special witness*/
+  */
+}
+
+module P1 {
+  /* CALL GRAPH for module P1:
+   * SCC at height 1:
+   *   M
+   * SCC at height 0:
+   *   Cl
+   * SCC at height 0:
+   *   Tr
+   * SCC at height 0:
+   *   TrX
+   */
+  lemma M(c: Cl<int>)
+    decreases c
+  {
+    ghost var x: (int, int) := c.w;
+  }
+
+  trait TrX<X(0)> {
+    var w: X
+  }
+  /*-- non-null type
+  type {:axiom} TrX(==)<X(0)> = c: TrX?<X> | c != null /*special witness*/
+  */
+
+  trait Tr<X(0)> extends TrX<X> { }
+  /*-- non-null type
+  type {:axiom} Tr(==)<X(0)> = c: Tr?<X> | c != null /*special witness*/
+  */
+
+  class Cl<Y(0)> extends Tr<(Y, Y)> { }
+  /*-- non-null type
+  type {:axiom} Cl(==)<Y(0)> = c: Cl?<Y> | c != null /*special witness*/
+  */
+}
+
+module P2 {
+  /* CALL GRAPH for module P2:
+   * SCC at height 1:
+   *   M
+   * SCC at height 0:
+   *   Cl
+   * SCC at height 0:
+   *   Tr
+   * SCC at height 0:
+   *   TrX
+   * SCC at height 0:
+   *   TrX.F
+   */
+  lemma M(c: Cl<int>)
+    decreases c
+  {
+    ghost var aa: (int, int);
+    ghost var bb: real;
+    ghost var u: bv10 := c.F(aa, bb);
+  }
+
+  trait TrX<X, W> {
+    function F(x: X, w: W): bv10
+    {
+      15
+    }
+  }
+  /*-- non-null type
+  type {:axiom} TrX(==)<X, W> = c: TrX?<X, W> | c != null /*special witness*/
+  */
+
+  trait Tr<X, W> extends TrX<X, W> { }
+  /*-- non-null type
+  type {:axiom} Tr(==)<X, W> = c: Tr?<X, W> | c != null /*special witness*/
+  */
+
+  class Cl<Y> extends Tr<(Y, Y), real> { }
+  /*-- non-null type
+  type {:axiom} Cl(==)<Y> = c: Cl?<Y> | c != null /*special witness*/
+  */
+}
+
+Dafny program verifier finished with 6 verified, 0 errors
diff --git a/Test/traits/TraitResolution1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution1.dfy
similarity index 99%
rename from Test/traits/TraitResolution1.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution1.dfy
index aaae1b412e2..9a21c0e17c4 100644
--- a/Test/traits/TraitResolution1.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution1.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
+// RUN: %exits-with 2 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module M0 {
diff --git a/Test/traits/TraitResolution1.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution1.dfy.expect
similarity index 98%
rename from Test/traits/TraitResolution1.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution1.dfy.expect
index 6b7c4568bb5..f92dd89dd04 100644
--- a/Test/traits/TraitResolution1.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution1.dfy.expect
@@ -19,15 +19,15 @@ TraitResolution1.dfy(121,14): Error: new can be applied only to class types (got
 TraitResolution1.dfy(122,14): Error: new can be applied only to class types (got Tr?<int>)
 TraitResolution1.dfy(123,14): Error: new can be applied only to class types (got Tr<int>)
 TraitResolution1.dfy(124,14): Error: new can be applied only to class types (got Tr<int>)
-TraitResolution1.dfy(136,8): Error: class 'P' inherits a member named 'data' from both traits 'A' and 'B'
+TraitResolution1.dfy(136,8): Error: class 'P' inherits a member named 'data' from both trait 'A' and trait 'B'
 TraitResolution1.dfy(139,8): Error: duplicate trait parents with the same head type must also have the same type arguments; got C<Even> and C<int>
 TraitResolution1.dfy(140,8): Error: duplicate trait parents with the same head type must also have the same type arguments; got C<int> and C<real>
 TraitResolution1.dfy(140,8): Error: duplicate trait parents with the same head type must also have the same type arguments; got C<int> and C<Even>
 TraitResolution1.dfy(150,8): Error: duplicate trait parents with the same head type must also have the same type arguments; got C<(real, int)> (via X6, X4, X3) and C<seq<bool>> (via X7, X2)
 TraitResolution1.dfy(151,8): Error: duplicate trait parents with the same head type must also have the same type arguments; got C<seq<bool>> (via X7, X2) and C<(real, int)> (via X6, X4, X3)
-TraitResolution1.dfy(168,8): Error: class 'P' inherits a member named 'data' from both traits 'B' and 'A'
-TraitResolution1.dfy(169,8): Error: class 'Q' inherits a member named 'data' from both traits 'C' and 'A'
-TraitResolution1.dfy(170,8): Error: class 'R' inherits a member named 'data' from both traits 'D' and 'A'
+TraitResolution1.dfy(168,8): Error: class 'P' inherits a member named 'data' from both trait 'B' and trait 'A'
+TraitResolution1.dfy(169,8): Error: class 'Q' inherits a member named 'data' from both trait 'C' and trait 'A'
+TraitResolution1.dfy(170,8): Error: class 'R' inherits a member named 'data' from both trait 'D' and trait 'A'
 TraitResolution1.dfy(175,17): Error: static non-ghost const field 'Cnst' of type 'object' (which does not have a default compiled value) must give a defining value
 TraitResolution1.dfy(236,8): Error: field 'civ' is inherited from trait 'Tr' and is not allowed to be re-declared
 TraitResolution1.dfy(237,14): Error: field 'giv' is inherited from trait 'Tr' and is not allowed to be re-declared
diff --git a/Test/traits/TraitResolution2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution2.dfy
similarity index 99%
rename from Test/traits/TraitResolution2.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution2.dfy
index d00599982ee..494b54b9c32 100644
--- a/Test/traits/TraitResolution2.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution2.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module M0 {
   trait TrX<X> {
diff --git a/Test/traits/TraitResolution2.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution2.dfy.expect
similarity index 100%
rename from Test/traits/TraitResolution2.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitResolution2.dfy.expect
diff --git a/Test/traits/TraitSpecsOverride0.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitSpecsOverride0.dfy
similarity index 92%
rename from Test/traits/TraitSpecsOverride0.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitSpecsOverride0.dfy
index 70e4990f66f..a24f946c961 100644
--- a/Test/traits/TraitSpecsOverride0.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitSpecsOverride0.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /deprecation:0 /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 2 %verify --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module Tests {
diff --git a/Test/traits/TraitSpecsOverride0.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitSpecsOverride0.dfy.expect
similarity index 100%
rename from Test/traits/TraitSpecsOverride0.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitSpecsOverride0.dfy.expect
diff --git a/Test/traits/TraitUsingParentMembers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitUsingParentMembers.dfy
similarity index 87%
rename from Test/traits/TraitUsingParentMembers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitUsingParentMembers.dfy
index e0765fb9b3b..35aa8404617 100644
--- a/Test/traits/TraitUsingParentMembers.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitUsingParentMembers.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify --relax-definite-assignment --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 
diff --git a/Test/traits/TraitUsingParentMembers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitUsingParentMembers.dfy.expect
similarity index 100%
rename from Test/traits/TraitUsingParentMembers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitUsingParentMembers.dfy.expect
diff --git a/Test/traits/TraitVariance.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVariance.dfy
similarity index 94%
rename from Test/traits/TraitVariance.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVariance.dfy
index 432fdd15ed2..c44a2ae9e57 100644
--- a/Test/traits/TraitVariance.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVariance.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 2 %dafny /generalTraits:1 "%s" > "%t"
+// RUN: %exits-with 2 %build --general-traits full "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 module NoVariance {
diff --git a/Test/traits/TraitVariance.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVariance.dfy.expect
similarity index 100%
rename from Test/traits/TraitVariance.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVariance.dfy.expect
diff --git a/Test/traits/TraitVerify.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVerify.dfy
similarity index 93%
rename from Test/traits/TraitVerify.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVerify.dfy
index f409d3c66db..a2a7c4b97c8 100644
--- a/Test/traits/TraitVerify.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVerify.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %exits-with 4 %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 trait Tr<X> { }
@@ -8,14 +8,14 @@ class B extends Tr<real> { }
 class C<Y> extends Tr<Y> { }
 
 method M(a: A, b: B) {
-  var c: C?;
+  var c: C? := *;
   var t;  // Tr?<int>
   t := a;
   t := c;
 }
 
 method N(a: A, b: B) {
-  var c: C?<int>;
+  var c: C?<int> := *;
   var t: Tr<int>;
   t := a;
   t := c;  // error: c may be null
diff --git a/Test/traits/TraitVerify.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVerify.dfy.expect
similarity index 86%
rename from Test/traits/TraitVerify.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVerify.dfy.expect
index d6812d4027a..d2b472b38a7 100644
--- a/Test/traits/TraitVerify.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitVerify.dfy.expect
@@ -2,4 +2,4 @@ TraitVerify.dfy(21,7): Error: value of expression (of type 'C?<int>') is not kno
 TraitVerify.dfy(25,7): Error: value of expression (of type 'A?') is not known to be an instance of type 'Tr<int>'
 TraitVerify.dfy(30,7): Error: value of expression (of type 'A?') is not known to be an instance of type 'A', because it might be null
 
-Dafny program verifier finished with 4 verified, 3 errors
+Dafny program verifier finished with 5 verified, 3 errors
diff --git a/Test/traits/Traits-Fields.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/Traits-Fields.dfy
similarity index 78%
rename from Test/traits/Traits-Fields.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/Traits-Fields.dfy
index 6ae1aaab6d9..7e6700344a1 100644
--- a/Test/traits/Traits-Fields.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/Traits-Fields.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 trait J
 {
diff --git a/Test/traits/Traits-Fields.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/Traits-Fields.dfy.expect
similarity index 100%
rename from Test/traits/Traits-Fields.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/Traits-Fields.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/Traits-Fields.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/Traits-Fields.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/Traits-Fields.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Test/traits/TraitsDecreases.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsDecreases.dfy
similarity index 96%
rename from Test/traits/TraitsDecreases.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsDecreases.dfy
index d3bfb75da7a..11e067a6aa9 100644
--- a/Test/traits/TraitsDecreases.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsDecreases.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 trait Trait {
   // -----------------------
diff --git a/Test/traits/TraitsDecreases.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsDecreases.dfy.expect
similarity index 100%
rename from Test/traits/TraitsDecreases.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsDecreases.dfy.expect
index 7aab08c866a..47abe83ab25 100644
--- a/Test/traits/TraitsDecreases.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsDecreases.dfy.expect
@@ -1,13 +1,13 @@
+TraitsDecreases.dfy(57,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
+TraitsDecreases.dfy(69,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
+TraitsDecreases.dfy(72,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
+TraitsDecreases.dfy(78,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
+TraitsDecreases.dfy(88,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
 TraitsDecreases.dfy(117,20): Error: predicate's (possibly automatically generated) decreases clause must be below or equal to that in the trait
 TraitsDecreases.dfy(124,20): Error: predicate's (possibly automatically generated) decreases clause must be below or equal to that in the trait
 TraitsDecreases.dfy(131,20): Error: predicate's (possibly automatically generated) decreases clause must be below or equal to that in the trait
 TraitsDecreases.dfy(138,20): Error: predicate's (possibly automatically generated) decreases clause must be below or equal to that in the trait
 TraitsDecreases.dfy(145,20): Error: predicate's (possibly automatically generated) decreases clause must be below or equal to that in the trait
 TraitsDecreases.dfy(152,11): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
-TraitsDecreases.dfy(57,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
-TraitsDecreases.dfy(69,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
-TraitsDecreases.dfy(72,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
-TraitsDecreases.dfy(78,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
-TraitsDecreases.dfy(88,9): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
 
 Dafny program verifier finished with 12 verified, 11 errors
diff --git a/Test/traits/TraitsExtendingTraits.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsExtendingTraits.dfy
similarity index 76%
rename from Test/traits/TraitsExtendingTraits.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsExtendingTraits.dfy
index d5e4b8b7429..4f47800376f 100644
--- a/Test/traits/TraitsExtendingTraits.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsExtendingTraits.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=2 "%s"
+
 
 module TheBasics {
   trait A {
@@ -104,3 +104,26 @@ module DuplicateMembers {
     method M()
   }
 }
+
+module ExtendsMustBeDirect {
+  trait HasG {
+    function G(): int
+  }
+
+  trait A extends HasG { // yes, A does extend HasG
+    function G(): int { 2 }
+  }
+
+  trait B extends A, HasG { // yes, since A extends HasG, so does B
+  }
+
+  trait B' extends HasG, A { // yes again (order of "extends" parents does not matter)
+  }
+
+  trait C { // C quacks like a HasG, but does not declare "extends HasG"
+    function G(): int { 2 }
+  }
+
+  trait D extends C, HasG { // error: D does not declare G by itself and C is not declared to extend HasG
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsExtendingTraits.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsExtendingTraits.dfy.expect
new file mode 100644
index 00000000000..9ca7f62bea6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsExtendingTraits.dfy.expect
@@ -0,0 +1,16 @@
+TraitsExtendingTraits.dfy(23,8): Error: trait definitions contain a cycle: A -> B -> A
+TraitsExtendingTraits.dfy(26,8): Error: trait definitions contain a cycle: SelfLoop -> SelfLoop
+TraitsExtendingTraits.dfy(28,8): Error: trait definitions contain a cycle: K -> M -> L -> K
+TraitsExtendingTraits.dfy(56,8): Error: trait 'X' inherits a member named 'data' from both trait 'A' and trait 'B'
+TraitsExtendingTraits.dfy(56,8): Error: trait 'X' inherits a member named 'fluga' from both trait 'C' and trait 'B'
+TraitsExtendingTraits.dfy(56,8): Error: trait 'X' inherits a member named 'karljohan' from both trait 'A' and trait 'D'
+TraitsExtendingTraits.dfy(56,8): Error: trait 'X' inherits a member named 'svamp' from both trait 'C' and trait 'D'
+TraitsExtendingTraits.dfy(59,8): Error: class 'J' inherits a member named 'sopp' from both trait 'Y' and trait 'B'
+TraitsExtendingTraits.dfy(64,8): Error: class 'K' inherits a member named 'sopp' from both trait 'B' and trait 'Y'
+TraitsExtendingTraits.dfy(66,8): Error: class 'L' inherits a member named 'sopp' from both trait 'Y' and trait 'B'
+TraitsExtendingTraits.dfy(69,8): Error: class 'Diamond' does not implement trait function 'Elva.balalaika'
+TraitsExtendingTraits.dfy(69,8): Error: class 'Diamond' does not implement trait function 'Tolv.banjo'
+TraitsExtendingTraits.dfy(69,8): Error: class 'Diamond' does not implement trait function 'Tio.munspel'
+TraitsExtendingTraits.dfy(95,8): Error: class 'TwoOverrides' inherits a member named 'M' from both trait 'Left2' and trait 'Right2'
+TraitsExtendingTraits.dfy(127,8): Error: trait 'D' inherits a member named 'G' from both trait 'C' and trait 'HasG'
+15 resolution/type errors detected in TraitsExtendingTraits.dfy
diff --git a/Test/traits/TraitsMultipleInheritance.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsMultipleInheritance.dfy
similarity index 78%
rename from Test/traits/TraitsMultipleInheritance.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsMultipleInheritance.dfy
index 67fd8673488..1fc3f234267 100644
--- a/Test/traits/TraitsMultipleInheritance.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsMultipleInheritance.dfy
@@ -1,4 +1,4 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment
 
 trait J1{
   var x: int
diff --git a/Test/traits/TraitsMultipleInheritance.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsMultipleInheritance.dfy.expect
similarity index 100%
rename from Test/traits/TraitsMultipleInheritance.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsMultipleInheritance.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsMultipleInheritance.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsMultipleInheritance.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/traits/TraitsMultipleInheritance.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/InductionWithoutTriggers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/InductionWithoutTriggers.dfy
new file mode 100644
index 00000000000..bb5822ead07
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/InductionWithoutTriggers.dfy
@@ -0,0 +1,125 @@
+// RUN: %testDafnyForEachResolver "%s" --expect-exit-code=4
+
+ghost function Sum(n: nat, f: int -> int): int
+{
+  if n == 0 then 0 else f(n-1) + Sum(n-1, f)
+}
+
+lemma TestTriggerWithLambdaExpression(n: nat, f: int -> int, g: int -> int)
+{
+  // Once, trigger selection would crash on the following quantifier, which uses a LambdaExpr.
+  assert forall n: nat, f: int -> int :: Sum(n, x => 500 + f(x)) == n + Sum(n, f); // error: this does not hold
+}
+
+// With an explicit :induction attribute, the induction hypothesis emitted lets the proof of the lemma go through.
+// However, there is no good matching pattern for the induction hypothesis, so a warning is generated.
+// For a manual proof of this lemma, see lemma ExchangeEta in hofs/SumSum.dfy.
+lemma {:induction n} ExchangeEtaWithInductionAttribute(n: nat, f: int -> int, g: int -> int) // warning: no trigger
+  requires forall i :: 0 <= i < n ==> f(i) == g(i)
+  ensures Sum(n, x => f(x)) == Sum(n, x => g(x))
+{
+}
+
+// -------------------------------------------
+
+type OpaqueType
+
+// Recursive predicates. Note that the heuristics for finding candidate induction variables pay attention
+// to whether or not the predicate is recursive.
+
+predicate P(n: nat) {
+  if n <= 0 then true else P(n - 1)
+}
+
+predicate Q(n: nat, b: bool) {
+  if n <= 0 then true else Q(n - 1, !b)
+}
+
+// --------------------
+
+lemma {:induction n, b} GivenListNoTrigger0(n: nat, o: OpaqueType, b: bool) // warning: no trigger
+  requires 0 <= n < 100
+  ensures P(if b then n else n)
+{ // error: cannot prove postcondition
+}
+
+lemma {:induction n, b} GivenListNoTrigger1(n: nat, o: OpaqueType, b: bool) // warning: no trigger
+  requires 0 <= n < 100
+  ensures P(n)
+{ // error: cannot prove postcondition
+}
+
+lemma {:induction n} GivenList(n: nat, o: OpaqueType, b: bool) // matching pattern for IH: P(n)
+  requires 0 <= n < 100
+  ensures P(n)
+{
+}
+
+// --------------------
+// Just {:inductionTrigger} says to automatically pick variables for the induction, but then omit trigger
+lemma {:inductionTrigger} YesToIH(n: nat, o: OpaqueType, b: bool) // induction: n; warning: no trigger
+  requires 0 <= n < 100
+  ensures P(if b then n else n)
+{
+}
+// {:induction} says to pick ALL parameters (of reasonable types) for the induction
+lemma {:induction} YesToIH1(n: nat, o: OpaqueType, b: bool) // induction: n, b; warning: no trigger
+  requires 0 <= n < 100
+  ensures P(n)
+{ // error: cannot prove postcondition
+}
+
+lemma {:induction} YesToIH2(n: nat, o: OpaqueType) // induction: n
+  requires 0 <= n < 100
+  ensures P(n)
+{
+}
+
+// --------------------
+
+lemma {:induction false} NoIH(n: nat, o: OpaqueType, b: bool)
+  requires 0 <= n < 100
+  ensures P(if b then n else n)
+{ // error: cannot prove postcondition
+}
+
+lemma {:induction false} NoIHButManualProof(n: nat, o: OpaqueType, b: bool)
+  requires 0 <= n < 100
+  ensures P(if b then n else n)
+{
+  if n != 0 {
+    NoIHButManualProof(n - 1, o, b);
+  }
+}
+
+// --------------------
+
+lemma AutomaticInduction(n: nat, o: OpaqueType, b: bool) // no induction, because no triggers (candidates: n)
+  requires 0 <= n < 100
+  ensures P(if b then n else n)
+{ // error: cannot prove postcondition
+}
+
+lemma AutomaticInduction1(n: nat, o: OpaqueType, b: bool) // induction: n; trigger: P(n)
+  requires 0 <= n < 100
+  ensures P(n)
+{
+}
+
+lemma AutomaticInduction2(n: nat, o: OpaqueType, b: bool) // induction: n, b; trigger: Q(n, b)
+  requires 0 <= n < 100
+  ensures Q(n, b)
+{
+}
+
+lemma AutomaticInduction3(n: nat, o: OpaqueType, b: bool) // induction: n; trigger: Q(n, true)
+  requires 0 <= n < 100
+  ensures Q(n, true)
+{
+}
+
+lemma AutomaticInduction4(n: nat, o: OpaqueType, b: bool) // no induction, because no triggers (candidates: n, b)
+  requires 0 <= n < 100
+  ensures P(n) && Q(n + 12, b)
+{ // error (x2): cannot prove postconditions
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/InductionWithoutTriggers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/InductionWithoutTriggers.dfy.expect
new file mode 100644
index 00000000000..95f24f8bd6e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/InductionWithoutTriggers.dfy.expect
@@ -0,0 +1,28 @@
+InductionWithoutTriggers.dfy(17,21): Warning: Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. For more information, see the section quantifier instantiation rules in the reference manual.
+InductionWithoutTriggers.dfy(40,24): Warning: Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. For more information, see the section quantifier instantiation rules in the reference manual.
+InductionWithoutTriggers.dfy(46,24): Warning: Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. For more information, see the section quantifier instantiation rules in the reference manual.
+InductionWithoutTriggers.dfy(66,19): Warning: Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. For more information, see the section quantifier instantiation rules in the reference manual.
+InductionWithoutTriggers.dfy(11,9): Error: assertion might not hold
+InductionWithoutTriggers.dfy(43,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(42,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(49,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(48,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(69,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(68,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(83,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(82,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(100,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(99,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(124,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(123,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(124,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(123,19): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(35,28): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 17 verified, 8 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/InductionWithoutTriggers.dfy.refresh.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/InductionWithoutTriggers.dfy.refresh.expect
new file mode 100644
index 00000000000..fe9d16c0bd7
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/InductionWithoutTriggers.dfy.refresh.expect
@@ -0,0 +1,28 @@
+InductionWithoutTriggers.dfy(17,21): Warning: Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. For more information, see the section quantifier instantiation rules in the reference manual.
+InductionWithoutTriggers.dfy(40,24): Warning: Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. For more information, see the section quantifier instantiation rules in the reference manual.
+InductionWithoutTriggers.dfy(46,24): Warning: Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. For more information, see the section quantifier instantiation rules in the reference manual.
+InductionWithoutTriggers.dfy(66,19): Warning: Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. For more information, see the section quantifier instantiation rules in the reference manual.
+InductionWithoutTriggers.dfy(11,9): Error: assertion might not hold
+InductionWithoutTriggers.dfy(43,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(42,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(49,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(48,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(69,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(68,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(83,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(82,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(100,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(99,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(124,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(123,11): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(31,28): Related location: this proposition could not be proved
+InductionWithoutTriggers.dfy(124,0): Error: a postcondition could not be proved on this return path
+InductionWithoutTriggers.dfy(123,19): Related location: this is the postcondition that could not be proved
+InductionWithoutTriggers.dfy(35,28): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 12 verified, 8 errors
diff --git a/Test/triggers/auto-triggers-fix-an-issue-listed-in-the-ironclad-notebook.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/auto-triggers-fix-an-issue-listed-in-the-ironclad-notebook.dfy
similarity index 81%
rename from Test/triggers/auto-triggers-fix-an-issue-listed-in-the-ironclad-notebook.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/auto-triggers-fix-an-issue-listed-in-the-ironclad-notebook.dfy
index f0776ab29e4..7d70b21818f 100644
--- a/Test/triggers/auto-triggers-fix-an-issue-listed-in-the-ironclad-notebook.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/auto-triggers-fix-an-issue-listed-in-the-ironclad-notebook.dfy
@@ -1,10 +1,10 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This example was listed in IronClad's notebook as one place were z3 picked
 // much too liberal triggers. THe Boogie code for this is shown below:
 //
-// forall k#2: Seq Box :: $Is(k#2, TSeq(TInt)) && $IsAlloc(k#2, TSeq(TInt), $Heap)
+// forall k#2: Seq :: $Is(k#2, TSeq(TInt)) && $IsAlloc(k#2, TSeq(TInt), $Heap)
 //                   ==> Seq#Equal(_module.__default.HashtableLookup($Heap, h1#0, k#2),
 //                                 _module.__default.HashtableLookup($Heap, h2#0, k#2))
 //
diff --git a/Test/triggers/auto-triggers-fix-an-issue-listed-in-the-ironclad-notebook.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/auto-triggers-fix-an-issue-listed-in-the-ironclad-notebook.dfy.expect
similarity index 100%
rename from Test/triggers/auto-triggers-fix-an-issue-listed-in-the-ironclad-notebook.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/auto-triggers-fix-an-issue-listed-in-the-ironclad-notebook.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/constructors-cause-matching-loops.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/constructors-cause-matching-loops.dfy
new file mode 100644
index 00000000000..f5b4ec32e2d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/constructors-cause-matching-loops.dfy
@@ -0,0 +1,11 @@
+// RUN: %verify --show-hints "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// This file is just a small test to check that constructors do cause loops
+
+datatype Nat = Zero | Succ(x: Nat)
+ghost function f(n: Nat): Nat
+
+method M() {
+  assert forall s :: true || f(Succ(s)) == f(s);
+}
diff --git a/Test/triggers/constructors-cause-matching-loops.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/constructors-cause-matching-loops.dfy.expect
similarity index 100%
rename from Test/triggers/constructors-cause-matching-loops.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/constructors-cause-matching-loops.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/emptyTrigger.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/emptyTrigger.dfy
new file mode 100644
index 00000000000..ddb15e92765
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/emptyTrigger.dfy
@@ -0,0 +1,9 @@
+// RUN: ! %verify "%s" > "%t"
+// RUN: ! %run "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method M() {
+  assert exists z :: z <= 3;
+  assert exists z {:trigger} :: z <= 3;
+  assert true;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/emptyTrigger.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/emptyTrigger.dfy.expect
new file mode 100644
index 00000000000..5a29244ede5
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/emptyTrigger.dfy.expect
@@ -0,0 +1,10 @@
+emptyTrigger.dfy(6,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+emptyTrigger.dfy(6,2): Error: assertion might not hold
+emptyTrigger.dfy(7,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
+emptyTrigger.dfy(6,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+emptyTrigger.dfy(6,2): Error: assertion might not hold
+emptyTrigger.dfy(7,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/triggers/function-applications-are-triggers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/function-applications-are-triggers.dfy
similarity index 83%
rename from Test/triggers/function-applications-are-triggers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/function-applications-are-triggers.dfy
index 27884de7a77..c9018681154 100644
--- a/Test/triggers/function-applications-are-triggers.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/function-applications-are-triggers.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file checks that function applications yield trigger candidates
diff --git a/Test/triggers/function-applications-are-triggers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/function-applications-are-triggers.dfy.expect
similarity index 100%
rename from Test/triggers/function-applications-are-triggers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/function-applications-are-triggers.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/induction-triggers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/induction-triggers.dfy
new file mode 100644
index 00000000000..f9bfce2f11f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/induction-triggers.dfy
@@ -0,0 +1,42 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --show-hints
+
+predicate f(n: nat) { if n == 0 then true else f(n-1) }
+predicate g(n: nat) { false }
+
+// Default: auto-generated trigger ⇒ Proof passes.
+lemma Default(n: nat) ensures f(n) {}
+
+// Manual list of variables ⇒ Proof passes.
+lemma {:induction n} ListOfVars(n: nat) ensures f(n) {}
+
+// No induction ⇒ Proof fails.
+lemma {:induction false} NoInduction(n: nat) ensures f(n) {} // error
+
+// No induction, with manual proof ⇒ Proof passes.
+lemma {:induction false} ManualInduction(n: nat)
+  ensures f(n)
+{
+  forall ih_n: nat | (n decreases to ih_n) {
+    ManualInduction(ih_n);
+  }
+}
+
+// No triggers, so no auto induction ⇒ Proof fails.
+lemma NoTriggers(n: nat) ensures f(n + 0) {} // error
+
+// No triggers but forced induction, so warning ⇒ Proof passes.
+lemma {:induction} InductionWarning(n: nat) ensures f(n + 0) {}
+
+// Explicit triggers, so no warning ⇒ Proof passes.
+lemma {:induction} {:inductionTrigger f(n)} NoWarning2(n: nat) ensures f(n + 0) {}
+
+// Legacy mode: auto induction with no triggers ⇒ Proof passes.
+lemma {:inductionTrigger} Legacy(n: nat) ensures f(n) {}
+lemma {:inductionTrigger} Legacy1(n: nat) ensures f(n + 0) {}
+lemma {:induction} {:inductionTrigger} Legacy2(n: nat) ensures f(n + 0) {}
+
+// Poorly chosen explicit trigger, so no warning ⇒ Proof fails.
+lemma {:induction} {:inductionTrigger g(n)} NoWarning3(n: nat) ensures f(n + 0) {} // error
+
+// No triggers but forced induction with a given variable list, so warning ⇒ Proof passes.
+lemma {:induction n} InductionWarningN(n: nat) ensures f(n + 0) {}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/induction-triggers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/induction-triggers.dfy.expect
new file mode 100644
index 00000000000..ad56c7793da
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/induction-triggers.dfy.expect
@@ -0,0 +1,28 @@
+induction-triggers.dfy(3,10): Info: tail recursive
+induction-triggers.dfy(19,2): Info: Selected triggers: {f(ih_n)}
+induction-triggers.dfy(3,10): Info: decreases n
+induction-triggers.dfy(16,25): Info: decreases n
+induction-triggers.dfy(7,6): Info: {:induction n}
+induction-triggers.dfy(7,6): Info: {:inductionTrigger f(n)}
+induction-triggers.dfy(10,21): Info: {:inductionTrigger f(n)}
+induction-triggers.dfy(25,6): Info: omitting automatic induction (for induction-variable candidate n) because of lack of triggers
+induction-triggers.dfy(28,19): Warning: Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. For more information, see the section quantifier instantiation rules in the reference manual.
+induction-triggers.dfy(28,19): Info: {:induction n}
+induction-triggers.dfy(31,44): Info: {:induction n}
+induction-triggers.dfy(34,26): Info: {:induction n}
+induction-triggers.dfy(35,26): Info: {:induction n}
+induction-triggers.dfy(36,39): Info: {:induction n}
+induction-triggers.dfy(39,44): Info: {:induction n}
+induction-triggers.dfy(42,21): Warning: Could not find a trigger for the induction hypothesis. Without a trigger, this may cause brittle verification. Change or remove the {:induction} attribute to generate a different induction hypothesis, or add {:nowarn} to silence this warning. For more information, see the section quantifier instantiation rules in the reference manual.
+induction-triggers.dfy(19,2): Info: ensures f(ih_n)
+induction-triggers.dfy(13,58): Error: a postcondition could not be proved on this return path
+induction-triggers.dfy(13,54): Related location: this is the postcondition that could not be proved
+induction-triggers.dfy(3,48): Related location: this proposition could not be proved
+induction-triggers.dfy(25,42): Error: a postcondition could not be proved on this return path
+induction-triggers.dfy(25,34): Related location: this is the postcondition that could not be proved
+induction-triggers.dfy(3,48): Related location: this proposition could not be proved
+induction-triggers.dfy(39,80): Error: a postcondition could not be proved on this return path
+induction-triggers.dfy(39,72): Related location: this is the postcondition that could not be proved
+induction-triggers.dfy(3,48): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 17 verified, 3 errors
diff --git a/Test/triggers/large-quantifiers-dont-break-dafny.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/large-quantifiers-dont-break-dafny.dfy
similarity index 96%
rename from Test/triggers/large-quantifiers-dont-break-dafny.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/large-quantifiers-dont-break-dafny.dfy
index 73160dd2e69..33b46bb38e3 100644
--- a/Test/triggers/large-quantifiers-dont-break-dafny.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/large-quantifiers-dont-break-dafny.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This test ensures that the trigger  collector (the routine that picks trigger
diff --git a/Test/triggers/large-quantifiers-dont-break-dafny.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/large-quantifiers-dont-break-dafny.dfy.expect
similarity index 100%
rename from Test/triggers/large-quantifiers-dont-break-dafny.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/large-quantifiers-dont-break-dafny.dfy.expect
diff --git a/Test/triggers/let-expressions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/let-expressions.dfy
similarity index 77%
rename from Test/triggers/let-expressions.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/let-expressions.dfy
index 054108c20a0..08f2dd1cda3 100644
--- a/Test/triggers/let-expressions.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/let-expressions.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost predicate Foo(s: seq<int>)
diff --git a/Test/triggers/let-expressions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/let-expressions.dfy.expect
similarity index 86%
rename from Test/triggers/let-expressions.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/let-expressions.dfy.expect
index c2731da3a7c..43c6c5c9d54 100644
--- a/Test/triggers/let-expressions.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/let-expressions.dfy.expect
@@ -1,6 +1,6 @@
 let-expressions.dfy(6,8): Info: Selected triggers: {s[i]}
 let-expressions.dfy(7,8): Info: Selected triggers: {s[i]}
-let-expressions.dfy(8,8): Info: Selected triggers: {s[_t#0], s[i]}
-let-expressions.dfy(9,8): Info: Selected triggers: {s[_t#0], s[i]}
+let-expressions.dfy(8,8): Info: Selected triggers: {s[_t#0], s[i]} where _t#0 := i + 1
+let-expressions.dfy(9,8): Info: Selected triggers: {s[_t#0], s[i]} where _t#0 := i + 1
 
 Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/triggers/loop-detection-is-not-too-strict.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-is-not-too-strict.dfy
similarity index 95%
rename from Test/triggers/loop-detection-is-not-too-strict.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-is-not-too-strict.dfy
index d6cd73c500d..9578074f333 100644
--- a/Test/triggers/loop-detection-is-not-too-strict.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-is-not-too-strict.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints --allow-axioms "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This test shows that the loop detection engine makes compromises when looking
diff --git a/Test/triggers/loop-detection-is-not-too-strict.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-is-not-too-strict.dfy.expect
similarity index 84%
rename from Test/triggers/loop-detection-is-not-too-strict.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-is-not-too-strict.dfy.expect
index aef0837895c..4c9f454a9c4 100644
--- a/Test/triggers/loop-detection-is-not-too-strict.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-is-not-too-strict.dfy.expect
@@ -2,14 +2,14 @@ loop-detection-is-not-too-strict.dfy(15,9): Info: Selected triggers:
    {P(y, x)}, {P(x, y)}
 loop-detection-is-not-too-strict.dfy(18,9): Info: Selected triggers:
    {P(y, x)}, {P(x, y)}
-loop-detection-is-not-too-strict.dfy(21,9): Info: Selected triggers: {P(x, _t#0), P(x, y)}
+loop-detection-is-not-too-strict.dfy(21,9): Info: Selected triggers: {P(x, _t#0), P(x, y)} where _t#0 := y + 1
 loop-detection-is-not-too-strict.dfy(26,9): Info: Selected triggers: {Q(x)}
 loop-detection-is-not-too-strict.dfy(27,9): Info: Selected triggers: {Q(x)}
 loop-detection-is-not-too-strict.dfy(28,9): Info: Selected triggers:
    {P(x, z)}, {P(x, 1)}
 loop-detection-is-not-too-strict.dfy(33,9): Info: Selected triggers: {Q(x)}
 loop-detection-is-not-too-strict.dfy(34,9): Info: Selected triggers: {Q(x)}
-loop-detection-is-not-too-strict.dfy(36,9): Info: Selected triggers: {Q(_t#0), Q(x)}
-loop-detection-is-not-too-strict.dfy(40,9): Info: Selected triggers: {Q(_t#0), Q(x)}
+loop-detection-is-not-too-strict.dfy(36,9): Info: Selected triggers: {Q(_t#0), Q(x)} where _t#0 := if z > 1 then x else 3 * z + 1
+loop-detection-is-not-too-strict.dfy(40,9): Info: Selected triggers: {Q(_t#0), Q(x)} where _t#0 := x + 1
 
 Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/triggers/loop-detection-looks-at-ranges-too.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-looks-at-ranges-too.dfy
similarity index 81%
rename from Test/triggers/loop-detection-looks-at-ranges-too.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-looks-at-ranges-too.dfy
index f123d609027..a467dfd1c1d 100644
--- a/Test/triggers/loop-detection-looks-at-ranges-too.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-looks-at-ranges-too.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file checks that loops between the range and the term of a quantifier
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-looks-at-ranges-too.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-looks-at-ranges-too.dfy.expect
new file mode 100644
index 00000000000..992d2e551f2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-looks-at-ranges-too.dfy.expect
@@ -0,0 +1,4 @@
+loop-detection-looks-at-ranges-too.dfy(11,17): Info: Selected triggers: {P(_t#0), P(x)} where _t#0 := x + 1
+loop-detection-looks-at-ranges-too.dfy(13,17): Info: Selected triggers: {P(x), P(_t#0)} where _t#0 := x + 1
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/triggers/loop-detection-messages--unit-tests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-messages--unit-tests.dfy
similarity index 92%
rename from Test/triggers/loop-detection-messages--unit-tests.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-messages--unit-tests.dfy
index 0187ccd3820..206d2877d34 100644
--- a/Test/triggers/loop-detection-messages--unit-tests.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-messages--unit-tests.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints --allow-warnings "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file is a series of basic tests for loop detection, focusing on the
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-messages--unit-tests.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-messages--unit-tests.dfy.expect
new file mode 100644
index 00000000000..3d8d9a1765e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/loop-detection-messages--unit-tests.dfy.expect
@@ -0,0 +1,30 @@
+loop-detection-messages--unit-tests.dfy(11,9): Info: Selected triggers: {f(f(i))}
+ Rejected triggers: {f(i)} (may loop with "f(f(i))")
+loop-detection-messages--unit-tests.dfy(12,9): Info: Selected triggers: {f(_t#0), f(i)} where _t#0 := i + 1
+loop-detection-messages--unit-tests.dfy(13,9): Info: Selected triggers: {f(_t#0), f(i)} where _t#0 := i + 1
+loop-detection-messages--unit-tests.dfy(15,9): Info: Quantifier was split into 2 parts. Better verification performance and error reporting may be obtained by splitting the quantifier in source. For more information, see the section quantifier instantiation rules in the reference manual.
+loop-detection-messages--unit-tests.dfy(15,9): Info: Part #0 is 'false ==> f(i) == f(_t#0)'
+ Selected triggers: {f(_t#0), f(i)} where _t#0 := i + 1
+loop-detection-messages--unit-tests.dfy(15,9): Info: Part #1 is 'false ==> f(i) == g(i)'
+ Selected triggers:
+   {g(i)}, {f(i)}
+loop-detection-messages--unit-tests.dfy(16,9): Info: Quantifier was split into 2 parts. Better verification performance and error reporting may be obtained by splitting the quantifier in source. For more information, see the section quantifier instantiation rules in the reference manual.
+loop-detection-messages--unit-tests.dfy(16,9): Info: Part #0 is 'false ==> f(i) == f(_t#0)'
+ Selected triggers: {f(_t#0), f(i)} where _t#0 := i + 1
+loop-detection-messages--unit-tests.dfy(16,9): Info: Part #1 is 'false ==> f(i) == f(i)'
+ Selected triggers: {f(i)}
+loop-detection-messages--unit-tests.dfy(17,9): Info: Quantifier was split into 2 parts. Better verification performance and error reporting may be obtained by splitting the quantifier in source. For more information, see the section quantifier instantiation rules in the reference manual.
+loop-detection-messages--unit-tests.dfy(17,9): Info: Part #0 is 'false ==> f(i) == f(_t#0)'
+ Selected triggers: {f(_t#0), f(i)} where _t#0 := i + 1
+loop-detection-messages--unit-tests.dfy(17,9): Info: Part #1 is 'false ==> f(i) == f(i)'
+ Selected triggers: {f(i)}
+loop-detection-messages--unit-tests.dfy(19,9): Info: Selected triggers: {f(i)}
+loop-detection-messages--unit-tests.dfy(20,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+loop-detection-messages--unit-tests.dfy(21,9): Info: The attribute {:autotriggers false} may cause brittle verification. It's better to remove this attribute, or as a second option, manually define a trigger using {:trigger}. For more information, see the section quantifier instantiation rules in the reference manual.
+loop-detection-messages--unit-tests.dfy(23,9): Info: Selected triggers: {f(j), f(i)}
+loop-detection-messages--unit-tests.dfy(24,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+loop-detection-messages--unit-tests.dfy(25,9): Info: Selected triggers: {g(j), f(i)}
+loop-detection-messages--unit-tests.dfy(26,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+loop-detection-messages--unit-tests.dfy(27,9): Info: The attribute {:autotriggers false} may cause brittle verification. It's better to remove this attribute, or as a second option, manually define a trigger using {:trigger}. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/triggers/looping-is-hard-to-decide-modulo-equality.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/looping-is-hard-to-decide-modulo-equality.dfy
similarity index 92%
rename from Test/triggers/looping-is-hard-to-decide-modulo-equality.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/looping-is-hard-to-decide-modulo-equality.dfy
index c576b8d7c69..1e3e5275240 100644
--- a/Test/triggers/looping-is-hard-to-decide-modulo-equality.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/looping-is-hard-to-decide-modulo-equality.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file shows cases where loops could hide behind equalities. In all three
diff --git a/Test/triggers/looping-is-hard-to-decide-modulo-equality.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/looping-is-hard-to-decide-modulo-equality.dfy.expect
similarity index 100%
rename from Test/triggers/looping-is-hard-to-decide-modulo-equality.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/looping-is-hard-to-decide-modulo-equality.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/matrix-accesses-are-triggers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/matrix-accesses-are-triggers.dfy
new file mode 100644
index 00000000000..2fd2b449fd6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/matrix-accesses-are-triggers.dfy
@@ -0,0 +1,8 @@
+// RUN: %exits-with 4 %verify --show-hints "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// This file checks that multi-dimensional array accesses yield trigger candidates
+
+method M(m: array2<int>)
+  requires forall i, j | 0 <= i < m.Length0 && 0 <= j < m.Length1 :: m[i, j] == m[j, i+1] {
+}
diff --git a/Test/triggers/matrix-accesses-are-triggers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/matrix-accesses-are-triggers.dfy.expect
similarity index 85%
rename from Test/triggers/matrix-accesses-are-triggers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/matrix-accesses-are-triggers.dfy.expect
index 4dc44f54ccf..4de25509099 100644
--- a/Test/triggers/matrix-accesses-are-triggers.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/matrix-accesses-are-triggers.dfy.expect
@@ -1,4 +1,4 @@
-matrix-accesses-are-triggers.dfy(7,11): Info: Selected triggers: {m[j, _t#0], m[i, j]}
+matrix-accesses-are-triggers.dfy(7,11): Info: Selected triggers: {m[j, _t#0], m[i, j]} where _t#0 := i + 1
 matrix-accesses-are-triggers.dfy(7,82): Error: index 0 out of range
 matrix-accesses-are-triggers.dfy(7,86): Error: index 1 out of range
 
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/nested-quantifiers-all-get-triggers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/nested-quantifiers-all-get-triggers.dfy
new file mode 100644
index 00000000000..a1a8f61ce99
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/nested-quantifiers-all-get-triggers.dfy
@@ -0,0 +1,9 @@
+// RUN: %verify --show-hints "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// This checks that nested quantifiers do get triggers, and that the parent
+// quantifier does not get annotated twice
+
+method M() {
+  ghost var x := forall s: set<int>, x: int :: (x in s ==> forall y :: y == x ==> y in s);
+}
diff --git a/Test/triggers/nested-quantifiers-all-get-triggers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/nested-quantifiers-all-get-triggers.dfy.expect
similarity index 100%
rename from Test/triggers/nested-quantifiers-all-get-triggers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/nested-quantifiers-all-get-triggers.dfy.expect
diff --git a/Test/triggers/old-is-a-special-case-for-triggers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/old-is-a-special-case-for-triggers.dfy
similarity index 96%
rename from Test/triggers/old-is-a-special-case-for-triggers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/old-is-a-special-case-for-triggers.dfy
index 61742191b37..b39b35c4e93 100644
--- a/Test/triggers/old-is-a-special-case-for-triggers.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/old-is-a-special-case-for-triggers.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" --allow-warnings > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file ensures that `old()` receives the special treatment that it
diff --git a/Test/triggers/old-is-a-special-case-for-triggers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/old-is-a-special-case-for-triggers.dfy.expect
similarity index 100%
rename from Test/triggers/old-is-a-special-case-for-triggers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/old-is-a-special-case-for-triggers.dfy.expect
diff --git a/Test/triggers/redundancy-detection-is-bidirectional.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/redundancy-detection-is-bidirectional.dfy
similarity index 91%
rename from Test/triggers/redundancy-detection-is-bidirectional.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/redundancy-detection-is-bidirectional.dfy
index ceec0c15cf9..4b45d3757fa 100644
--- a/Test/triggers/redundancy-detection-is-bidirectional.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/redundancy-detection-is-bidirectional.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This test checks for tricky cases of redundancy suppression when building
diff --git a/Test/triggers/redundancy-detection-is-bidirectional.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/redundancy-detection-is-bidirectional.dfy.expect
similarity index 100%
rename from Test/triggers/redundancy-detection-is-bidirectional.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/redundancy-detection-is-bidirectional.dfy.expect
diff --git a/Test/triggers/regression-tests.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/regression-tests.dfy
similarity index 87%
rename from Test/triggers/regression-tests.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/regression-tests.dfy
index 3c4d7e11fc6..b1b266e131d 100644
--- a/Test/triggers/regression-tests.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/regression-tests.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" --allow-warnings > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This tests checks that quantifier splitting is resilient to the fact that
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/regression-tests.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/regression-tests.dfy.expect
new file mode 100644
index 00000000000..87d8839650a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/regression-tests.dfy.expect
@@ -0,0 +1,4 @@
+regression-tests.dfy(15,4): Info: ==
+regression-tests.dfy(16,5): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/triggers/set-construction-is-a-good-trigger.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/set-construction-is-a-good-trigger.dfy
similarity index 81%
rename from Test/triggers/set-construction-is-a-good-trigger.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/set-construction-is-a-good-trigger.dfy
index c7c3613c985..04143bfcfd2 100644
--- a/Test/triggers/set-construction-is-a-good-trigger.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/set-construction-is-a-good-trigger.dfy
@@ -1,11 +1,11 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file ensures that display expressions can be picked as triggers. This is
 // useful for code that checks if a set, sequence, or multiset is a singleton.
 
 method M(s: seq<int>, st: set<int>, mst: multiset<int>)
-  requires exists y :: s == [y]           // Seq#Build(Seq#Empty(): Seq Box, $Box(y#3))
+  requires exists y :: s == [y]           // Seq#Build(Seq#Empty(): Seq, $Box(y#3))
   requires exists y :: st == {y}          // Set#UnionOne(Set#Empty(): Set Box, $Box(y#4))
   requires exists y :: mst == multiset{y} // MultiSet#UnionOne(MultiSet#Empty(): MultiSet Box, $Box(y#5))
 {
diff --git a/Test/triggers/set-construction-is-a-good-trigger.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/set-construction-is-a-good-trigger.dfy.expect
similarity index 100%
rename from Test/triggers/set-construction-is-a-good-trigger.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/set-construction-is-a-good-trigger.dfy.expect
diff --git a/Test/triggers/some-proofs-only-work-without-autoTriggers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-proofs-only-work-without-autoTriggers.dfy
similarity index 94%
rename from Test/triggers/some-proofs-only-work-without-autoTriggers.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-proofs-only-work-without-autoTriggers.dfy
index 485b297c575..f069ea25289 100644
--- a/Test/triggers/some-proofs-only-work-without-autoTriggers.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-proofs-only-work-without-autoTriggers.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %exits-with 4 %verify --allow-axioms --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // The examples below work nicely with /autoTriggers:0, but break when we use
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-proofs-only-work-without-autoTriggers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-proofs-only-work-without-autoTriggers.dfy.expect
new file mode 100644
index 00000000000..5836ade8cba
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-proofs-only-work-without-autoTriggers.dfy.expect
@@ -0,0 +1,11 @@
+some-proofs-only-work-without-autoTriggers.dfy(19,11): Info: Selected triggers: {x in a}
+some-proofs-only-work-without-autoTriggers.dfy(20,11): Info: Selected triggers: {x in a[..|a|]}
+some-proofs-only-work-without-autoTriggers.dfy(27,11): Info: Selected triggers: {x in a}
+some-proofs-only-work-without-autoTriggers.dfy(28,11): Info: Selected triggers: {a[i]}
+some-proofs-only-work-without-autoTriggers.dfy(31,11): Info: Selected triggers: {x in a[..3]}
+some-proofs-only-work-without-autoTriggers.dfy(33,11): Info: Selected triggers: {x in a[..2]}
+some-proofs-only-work-without-autoTriggers.dfy(20,4): Error: assertion might not hold
+some-proofs-only-work-without-autoTriggers.dfy(28,4): Error: assertion might not hold
+some-proofs-only-work-without-autoTriggers.dfy(33,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy
similarity index 98%
rename from Test/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy
index ecc6d693a20..2bf6354df74 100644
--- a/Test/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %exits-with 4 %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file shows how Dafny detects loops even for terms that are not literal
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy.expect
new file mode 100644
index 00000000000..e8f06d2c88b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy.expect
@@ -0,0 +1,79 @@
+some-terms-do-not-look-like-the-triggers-they-match.dfy(12,17): Info: Selected triggers: {s[_t#0], s[x]} where _t#0 := x + 1
+some-terms-do-not-look-like-the-triggers-they-match.dfy(15,17): Info: Quantifier was split into 2 parts. Better verification performance and error reporting may be obtained by splitting the quantifier in source. For more information, see the section quantifier instantiation rules in the reference manual.
+some-terms-do-not-look-like-the-triggers-they-match.dfy(15,17): Info: Part #0 is 'x in s ==> s[_t#0] > 0'
+ Selected triggers: {s[_t#0], s[x]} where _t#0 := x + 1
+some-terms-do-not-look-like-the-triggers-they-match.dfy(15,17): Info: Part #1 is 'x in s ==> _t#0 !in s'
+ Selected triggers: {s[_t#0], s[x]} where _t#0 := x + 2
+some-terms-do-not-look-like-the-triggers-they-match.dfy(24,18): Info: Selected triggers: {x in s + t}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(25,18): Info: Selected triggers:
+   {x in t}, {x in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(26,18): Info: Selected triggers: {x in s + t}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(27,18): Info: Selected triggers:
+   {x in t}, {x in s}, {x in s + t}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(31,18): Info: Selected triggers: {x in s * t}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(32,18): Info: Selected triggers:
+   {x in t}, {x in s}, {x in s * t}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(36,18): Info: Selected triggers: {x in s - t}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(37,18): Info: Selected triggers:
+   {x in t}, {x in s}, {x in s - t}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(43,20): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+some-terms-do-not-look-like-the-triggers-they-match.dfy(44,20): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+some-terms-do-not-look-like-the-triggers-they-match.dfy(49,20): Info: Selected triggers: {x in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(50,20): Info: Selected triggers: {x in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(55,18): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+some-terms-do-not-look-like-the-triggers-they-match.dfy(55,36): Info: Selected triggers: {y in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(56,18): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+some-terms-do-not-look-like-the-triggers-they-match.dfy(56,39): Info: Selected triggers: {y in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(58,18): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+some-terms-do-not-look-like-the-triggers-they-match.dfy(58,41): Info: Selected triggers: {y in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(59,18): Info: Selected triggers: {x in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(60,18): Info: Selected triggers: {x in F(s)}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(67,18): Info: Selected triggers: {(s + t)[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(68,18): Info: Selected triggers:
+   {t[x]}, {s[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(71,11): Info: Selected triggers:
+   {t[x]}, {s[x]}, {(s + t)[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(75,18): Info: Selected triggers: {(s * t)[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(76,18): Info: Selected triggers:
+   {t[x]}, {s[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(79,17): Info: Selected triggers:
+   {t[x]}, {s[x]}, {(s * t)[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(83,18): Info: Selected triggers: {(s - t)[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(84,18): Info: Selected triggers:
+   {t[x]}, {s[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(86,11): Info: Selected triggers:
+   {t[x]}, {s[x]}, {(s - t)[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(92,20): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+some-terms-do-not-look-like-the-triggers-they-match.dfy(93,20): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+some-terms-do-not-look-like-the-triggers-they-match.dfy(98,20): Info: Selected triggers: {ms[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(99,20): Info: Selected triggers: {ms[x]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(106,18): Info: Selected triggers: {x in s + t}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(107,18): Info: Selected triggers:
+   {x in t}, {x in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(110,6): Info: Selected triggers:
+   {x in t}, {x in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(121,18): Info: Selected triggers: {x in [2, 3, 5]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(122,18): Info: Selected triggers: {x in [2, 3, 5]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(128,18): Info: Selected triggers: {x in s + t}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(129,18): Info: Selected triggers:
+   {x in t}, {x in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(133,18): Info: Selected triggers: {x in s - u}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(134,18): Info: Selected triggers:
+   {x in u}, {x in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(137,6): Info: Selected triggers:
+   {x in u}, {x in s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(148,18): Info: Selected triggers: {x in map[2 := 20, 3 := 30, 5 := 50]}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(149,18): Info: Selected triggers: {x in F(map[2 := 20, 3 := 30, 5 := 50])}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(156,12): Info: Selected triggers: {x <= s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(157,12): Info: Selected triggers: {x <= s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(158,12): Info: Selected triggers: {x >= s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(159,12): Info: Selected triggers: {x >= s}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(161,12): Info: Selected triggers: {x <= ms}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(162,12): Info: Selected triggers: {x <= ms}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(163,12): Info: Selected triggers: {x >= ms}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(164,12): Info: Selected triggers: {x >= ms}
+some-terms-do-not-look-like-the-triggers-they-match.dfy(166,12): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+some-terms-do-not-look-like-the-triggers-they-match.dfy(167,12): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+some-terms-do-not-look-like-the-triggers-they-match.dfy(152,2): Error: assertion might not hold
+
+Dafny program verifier finished with 4 verified, 1 error
diff --git a/Test/triggers/splitting-picks-the-right-tokens.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-picks-the-right-tokens.dfy
similarity index 85%
rename from Test/triggers/splitting-picks-the-right-tokens.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-picks-the-right-tokens.dfy
index 505f74ef74f..e886372b0db 100644
--- a/Test/triggers/splitting-picks-the-right-tokens.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-picks-the-right-tokens.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %exits-with 4 %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file ensures that trigger splitting picks the right tokens
diff --git a/Test/triggers/splitting-picks-the-right-tokens.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-picks-the-right-tokens.dfy.expect
similarity index 100%
rename from Test/triggers/splitting-picks-the-right-tokens.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-picks-the-right-tokens.dfy.expect
diff --git a/Test/triggers/splitting-triggers-recovers-expressivity.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-recovers-expressivity.dfy
similarity index 94%
rename from Test/triggers/splitting-triggers-recovers-expressivity.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-recovers-expressivity.dfy
index 4923b276821..b90a731a232 100644
--- a/Test/triggers/splitting-triggers-recovers-expressivity.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-recovers-expressivity.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %exits-with 4 %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 ghost predicate P(i: int)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-recovers-expressivity.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-recovers-expressivity.dfy.expect
new file mode 100644
index 00000000000..033ab546826
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-recovers-expressivity.dfy.expect
@@ -0,0 +1,30 @@
+splitting-triggers-recovers-expressivity.dfy(12,10): Info: Selected triggers:
+   {P(_t#0), Q(i)}, {P(_t#0), P(i)} where _t#0 := i + 1
+splitting-triggers-recovers-expressivity.dfy(17,11): Info: Selected triggers:
+   {P(_t#0), Q(j)}, {P(_t#0), P(j)} where _t#0 := j + 1
+splitting-triggers-recovers-expressivity.dfy(26,10): Info: Selected triggers: {Q(i)}
+ Rejected triggers: {P(i)} (may loop with "P(i + 1)")
+splitting-triggers-recovers-expressivity.dfy(33,11): Info: Selected triggers: {Q(j)}
+ Rejected triggers: {P(j)} (may loop with "P(j + 1)")
+splitting-triggers-recovers-expressivity.dfy(44,10): Info: Quantifier was split into 2 parts. Better verification performance and error reporting may be obtained by splitting the quantifier in source. For more information, see the section quantifier instantiation rules in the reference manual.
+splitting-triggers-recovers-expressivity.dfy(44,10): Info: Part #0 is 'P(i) || !Q(i)'
+ Selected triggers:
+   {Q(i)}, {P(i)}
+splitting-triggers-recovers-expressivity.dfy(44,10): Info: Part #1 is 'P(i + 1)'
+ Selected triggers: {Q(i)}
+ Rejected triggers: {P(i)} (may loop with "P(i + 1)")
+splitting-triggers-recovers-expressivity.dfy(49,11): Info: Quantifier was split into 2 parts. Better verification performance and error reporting may be obtained by splitting the quantifier in source. For more information, see the section quantifier instantiation rules in the reference manual.
+splitting-triggers-recovers-expressivity.dfy(49,11): Info: Part #0 is 'j >= 0 ==> P(j)'
+ Selected triggers:
+   {Q(j)}, {P(j)}
+splitting-triggers-recovers-expressivity.dfy(49,11): Info: Part #1 is 'j >= 0 ==> Q(j) ==> P(j + 1)'
+ Selected triggers: {Q(j)}
+ Rejected triggers: {P(j)} (may loop with "P(j + 1)")
+splitting-triggers-recovers-expressivity.dfy(58,11): Info: Selected triggers:
+   {P(i)}, {Q(i)}
+splitting-triggers-recovers-expressivity.dfy(12,63): Error: a postcondition could not be proved on this return path
+splitting-triggers-recovers-expressivity.dfy(12,10): Related location: this is the postcondition that could not be proved
+splitting-triggers-recovers-expressivity.dfy(19,15): Error: a postcondition could not be proved on this return path
+splitting-triggers-recovers-expressivity.dfy(19,11): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 5 verified, 2 errors
diff --git a/Test/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy
similarity index 78%
rename from Test/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy
index 185dad4f2d6..b98daf59291 100644
--- a/Test/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy
@@ -1,4 +1,4 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %exits-with 4 %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This tests shows that, since quantifiers are split, it becomes possible to know more precisely what part of a precondition did not hold at the call site.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy.expect
new file mode 100644
index 00000000000..af17b521378
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy.expect
@@ -0,0 +1,8 @@
+splitting-triggers-yields-better-precondition-related-errors.dfy(7,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+splitting-triggers-yields-better-precondition-related-errors.dfy(15,11): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+splitting-triggers-yields-better-precondition-related-errors.dfy(11,3): Error: a precondition for this call could not be proved
+splitting-triggers-yields-better-precondition-related-errors.dfy(7,11): Related location: this is the precondition that could not be proved
+splitting-triggers-yields-better-precondition-related-errors.dfy(20,4): Error: function precondition could not be proved
+splitting-triggers-yields-better-precondition-related-errors.dfy(15,11): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/triggers/suppressing-warnings-behaves-properly.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/suppressing-warnings-behaves-properly.dfy
similarity index 88%
rename from Test/triggers/suppressing-warnings-behaves-properly.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/suppressing-warnings-behaves-properly.dfy
index a7ac6a81780..1d45397901b 100644
--- a/Test/triggers/suppressing-warnings-behaves-properly.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/suppressing-warnings-behaves-properly.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints --allow-warnings "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file checks that suppressing warnings works properly
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/suppressing-warnings-behaves-properly.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/suppressing-warnings-behaves-properly.dfy.expect
new file mode 100644
index 00000000000..80c6a424512
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/suppressing-warnings-behaves-properly.dfy.expect
@@ -0,0 +1,12 @@
+suppressing-warnings-behaves-properly.dfy(10,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+suppressing-warnings-behaves-properly.dfy(11,9): Info: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
+suppressing-warnings-behaves-properly.dfy(12,9): Info: The attribute {:autotriggers false} may cause brittle verification. It's better to remove this attribute, or as a second option, manually define a trigger using {:trigger}. For more information, see the section quantifier instantiation rules in the reference manual.
+suppressing-warnings-behaves-properly.dfy(14,9): Info: Selected triggers: {f(n)}
+suppressing-warnings-behaves-properly.dfy(15,9): Info: Selected triggers: {f(n)}
+suppressing-warnings-behaves-properly.dfy(16,9): Info: The attribute {:autotriggers false} may cause brittle verification. It's better to remove this attribute, or as a second option, manually define a trigger using {:trigger}. For more information, see the section quantifier instantiation rules in the reference manual.
+suppressing-warnings-behaves-properly.dfy(18,9): Info: Selected triggers:
+   {g(n), f(_t#0)}, {f(_t#0), f(n)} where _t#0 := n + 1
+suppressing-warnings-behaves-properly.dfy(19,9): Info: Selected triggers: {f(n)}
+suppressing-warnings-behaves-properly.dfy(20,9): Info: The attribute {:autotriggers false} may cause brittle verification. It's better to remove this attribute, or as a second option, manually define a trigger using {:trigger}. For more information, see the section quantifier instantiation rules in the reference manual.
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/triggers/triggers-prevent-some-inlining.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/triggers-prevent-some-inlining.dfy
similarity index 91%
rename from Test/triggers/triggers-prevent-some-inlining.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/triggers-prevent-some-inlining.dfy
index c9d52ed11a5..6ead50fe0ae 100644
--- a/Test/triggers/triggers-prevent-some-inlining.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/triggers-prevent-some-inlining.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This  file looks  at the  interactions  between inlining  and triggers.   The
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/triggers-prevent-some-inlining.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/triggers-prevent-some-inlining.dfy.expect
new file mode 100644
index 00000000000..89d7daeaccb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/triggers-prevent-some-inlining.dfy.expect
@@ -0,0 +1,7 @@
+triggers-prevent-some-inlining.dfy(17,2): Info: Selected triggers: {sum(a, b)}
+triggers-prevent-some-inlining.dfy(24,20): Info: Some instances of this call are not inlined.
+triggers-prevent-some-inlining.dfy(25,20): Info: Some instances of this call are not inlined.
+triggers-prevent-some-inlining.dfy(24,20): Info: Some instances of this call are not inlined.
+triggers-prevent-some-inlining.dfy(25,20): Info: Some instances of this call are not inlined.
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/triggers/useless-triggers-are-removed.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/useless-triggers-are-removed.dfy
similarity index 89%
rename from Test/triggers/useless-triggers-are-removed.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/useless-triggers-are-removed.dfy
index 120378a8278..f782ac67621 100644
--- a/Test/triggers/useless-triggers-are-removed.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/useless-triggers-are-removed.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file ensures that Dafny does get rid of redundant triggers before
diff --git a/Test/triggers/useless-triggers-are-removed.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/useless-triggers-are-removed.dfy.expect
similarity index 100%
rename from Test/triggers/useless-triggers-are-removed.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/useless-triggers-are-removed.dfy.expect
diff --git a/Test/triggers/wf-checks-use-the-original-quantifier.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/wf-checks-use-the-original-quantifier.dfy
similarity index 92%
rename from Test/triggers/wf-checks-use-the-original-quantifier.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/wf-checks-use-the-original-quantifier.dfy
index c18f9f39683..ca54190ba7e 100644
--- a/Test/triggers/wf-checks-use-the-original-quantifier.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/wf-checks-use-the-original-quantifier.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
+// RUN: %verify --show-hints "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This test checks that typical expressions requiring WF checks do not suddenly
diff --git a/Test/triggers/wf-checks-use-the-original-quantifier.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/wf-checks-use-the-original-quantifier.dfy.expect
similarity index 100%
rename from Test/triggers/wf-checks-use-the-original-quantifier.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/triggers/wf-checks-use-the-original-quantifier.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/DafnyTests/RunAllTestsOption.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/DafnyTests/RunAllTestsOption.dfy
new file mode 100644
index 00000000000..ca6d2be93d6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/DafnyTests/RunAllTestsOption.dfy
@@ -0,0 +1,8 @@
+// RUN: %verify --allow-deprecation --unicode-char false --verify-included-files "%s" > "%t"
+// RUN: ! %baredafny test %args --allow-deprecation --unicode-char false --no-verify --target:cs "%s" >> "%t"
+// RUN: ! %baredafny test %args --allow-deprecation --unicode-char false --no-verify --target:java "%s" >> "%t"
+// RUN: ! %baredafny test %args --allow-deprecation --unicode-char false --no-verify --target:go "%s" >> "%t"
+// RUN: ! %baredafny test %args --allow-deprecation --unicode-char false --no-verify --target:js "%s" >> "%t"
+// RUN: ! %baredafny test %args --allow-deprecation --unicode-char false --no-verify --target:py "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t" 
+include "../../DafnyTests/RunAllTests/RunAllTestsOption.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/DafnyTests/RunAllTestsOption.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/DafnyTests/RunAllTestsOption.dfy.expect
new file mode 100644
index 00000000000..ab946debb7a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/DafnyTests/RunAllTestsOption.dfy.expect
@@ -0,0 +1,72 @@
+
+Dafny program verifier finished with 2 verified, 0 errors
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure(Whoopsie)
+[Program halted] RunAllTestsOption.dfy(8,0): Test failures occurred: see above.
+
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure(Whoopsie)
+[Program halted] RunAllTestsOption.dfy(8,0): Test failures occurred: see above.
+
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure(Whoopsie)
+[Program halted] RunAllTestsOption.dfy(8,0): Test failures occurred: see above.
+
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure(Whoopsie)
+[Program halted] RunAllTestsOption.dfy(8,0): Test failures occurred: see above.
+
+
+Dafny program verifier did not attempt verification
+TestModule.Passing1: PASSED
+Passing1: PASSED
+Passing2: PASSED
+Failing1: FAILED
+	RunAllTestsOption.dfy(23,2): expectation violation
+Passing3: PASSED
+Failing2: FAILED
+	RunAllTestsOption.dfy(31,2): expectation violation
+FailingReturnValue: FAILED
+	VoidOutcome.VoidFailure(Whoopsie)
+[Program halted] RunAllTestsOption.dfy(8,0): Test failures occurred: see above.
+
diff --git a/Test/unicodechars/comp/.gitignore b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/.gitignore
similarity index 100%
rename from Test/unicodechars/comp/.gitignore
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/.gitignore
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy
new file mode 100644
index 00000000000..0d2f394acb9
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy
@@ -0,0 +1,3 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/2582
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-warnings --unicode-char false --verify-included-files
+include "../../comp/Arrays.dfy"
diff --git a/Test/comp/Arrays.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy.expect
similarity index 100%
rename from Test/comp/Arrays.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy.expect
diff --git a/Test/comp/Arrays.dfy.go.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy.go.expect
similarity index 100%
rename from Test/comp/Arrays.dfy.go.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy.go.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy.rs.check
new file mode 100644
index 00000000000..8387e57c199
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Arrays.dfy(493,5): Error: Feature not supported for this compilation target: Multi-dimensional arrays
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy.verifier.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy.verifier.expect
new file mode 100644
index 00000000000..7a3bd9bc85d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Arrays.dfy.verifier.expect
@@ -0,0 +1 @@
+CLI: Warning: the option unicode-char has been deprecated.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy
new file mode 100644
index 00000000000..5ce4e25b71c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy
@@ -0,0 +1,3 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --allow-deprecation --unicode-char false --spill-translation --verify-included-files
+include "../../comp/Collections.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.expect
new file mode 100644
index 00000000000..7c0fbb1b828
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.expect
@@ -0,0 +1,129 @@
+Sets: {} {17, 82} {12, 17}
+  cardinality: 0 2 2
+  union: {17, 82} {12, 17, 82}
+  intersection: {} {17}
+  difference: {} {82}
+  disjoint: true false
+  subset: true false true
+  proper subset: true false false
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  eq covariance: 1 true true
+false true
+|s|=4 |S|=16
+{{}, {a}, {b}, {c}, {d}, {a, b}, {a, c}, {b, c}, {a, d}, {b, d}, {c, d}, {a, b, c}, {a, b, d}, {a, c, d}, {b, c, d}, {a, b, c, d}}
+Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
+  cardinality: 0 4 2
+  union: multiset{17, 17, 82, 82} multiset{12, 17, 17, 17, 82, 82}
+  intersection: multiset{} multiset{17}
+  difference: multiset{} multiset{17, 82, 82}
+  disjoint: true false
+  subset: true false true true
+  proper subset: true false false true
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
+  multiplicity: 0 2 1
+Test zero multiplicity:
+  printing: multiset{multiset{}, multiset{42}} multiset{12}
+  union: 1 1 1 1
+  membership: false false
+  equality: false true false
+  subset: true true true true false
+  strict subset: true false false true false
+  disjoint: true true true true
+Sequences: [] [17, 82, 17, 82] [12, 17]
+  cardinality: 0 4 2
+  update: [42, 82, 17, 82] [42, 17]
+  index: 17 12
+  subsequence ([lo..hi]): [82, 17] [17]
+  subsequence ([lo..]): [82, 17, 82] [17]
+  subsequence ([..hi]): [17, 82, 17][12]
+  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
+  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+Bound Bound Bound Bound Bound Bound
+ed ed ed ed ed ed
+e e e e e e
+hello
+hEllo
+[2, 4, 6, 8, 10]
+[2, 0, 6, 8, 10]
+true false false
+true true false true
+false false false true
+  eq covariance: true true
+Strings:  uRuR gu
+  cardinality: 0 4 2
+  concatenation: uRuR uRuRgu
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+  constructed as sequence: guru
+  mix: hello-d ddd-hello
+Maps: map[] map[17 := 2, 82 := 2] map[12 := 26, 17 := 0]
+  cardinality: 0 2 2
+  keys: {} {17, 82} {12, 17}
+  values: {} {2} {0, 26}
+  items: {} {(17, 2), (82, 2)} {(12, 26), (17, 0)}
+  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
+  lookup: false 2 0
+m: map[Color.Blue := 30, Color.Yellow := 21]
+keys: {Color.Blue, Color.Yellow}
+values: {21, 30}
+items: {(Color.Blue, 30), (Color.Yellow, 21)}
+3 2 4
+70 52 66
+8 67 67
+4 4 3
+true false true false
+true false false false
+false false true
+false false false true
+0 20 4
+198 20 4
+0 2 false
+true true true false
+0 20 4
+198 20 4
+0 2 false
+false false true
+false true true true
+jack wendy null
+jack null null
+ronald ronald false
+true true true false
+jack wendy null
+jack null null
+ronald ronald false
+Map multiple occurrences test
+  length: 1
+  self-equal: true
+  select: 2
+2: 0 1 1
+3: 0 1 2
+There are 0 occurrences of 58 in the multiset
+There are 536870912 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of null in the multiset
+Map===
+|s|=1 |u|=1
+s[1]=123 u[1]=40
+|S|=1 |U|=1
+S[1]=123 U[1]=41
+Seq===
+|s|=2 |u|=2
+123 42, 123 42, 123 42
+|s|=2 |u|=2
+123 43, 123 43, 123 43
+|s|=2 |u|=2
+123 44, 123 44, 123 44
+Multiset===
+|s|=2 |u|=4
+1 3
+|s|=2 |u|=4
+1 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.go.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.go.expect
new file mode 100644
index 00000000000..19be6351e0d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.go.expect
@@ -0,0 +1,129 @@
+Sets: {} {17, 82} {12, 17}
+  cardinality: 0 2 2
+  union: {17, 82} {17, 82, 12}
+  intersection: {} {17}
+  difference: {} {82}
+  disjoint: true false
+  subset: true false true
+  proper subset: true false false
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  eq covariance: 1 true true
+false true
+|s|=4 |S|=16
+{{}, {a}, {b}, {c}, {d}, {a, b}, {a, c}, {b, c}, {a, d}, {b, d}, {c, d}, {a, b, c}, {a, b, d}, {a, c, d}, {b, c, d}, {a, b, c, d}}
+Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
+  cardinality: 0 4 2
+  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
+  intersection: multiset{} multiset{17}
+  difference: multiset{} multiset{17, 82, 82}
+  disjoint: true false
+  subset: true false true true
+  proper subset: true false false true
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
+  multiplicity: 0 2 1
+Test zero multiplicity:
+  printing: multiset{multiset{}, multiset{42}} multiset{12}
+  union: 1 1 1 1
+  membership: false false
+  equality: false true false
+  subset: true true true true false
+  strict subset: true false false true false
+  disjoint: true true true true
+Sequences: [] [17, 82, 17, 82] [12, 17]
+  cardinality: 0 4 2
+  update: [42, 82, 17, 82] [42, 17]
+  index: 17 12
+  subsequence ([lo..hi]): [82, 17] [17]
+  subsequence ([lo..]): [82, 17, 82] [17]
+  subsequence ([..hi]): [17, 82, 17][12]
+  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
+  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+Bound Bound Bound Bound Bound Bound
+ed ed ed ed ed ed
+e e e e e e
+hello
+hEllo
+[2, 4, 6, 8, 10]
+[2, 0, 6, 8, 10]
+true false false
+true true false true
+false false false true
+  eq covariance: true true
+Strings:  uRuR gu
+  cardinality: 0 4 2
+  concatenation: uRuR uRuRgu
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+  constructed as sequence: guru
+  mix: hello-d ddd-hello
+Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
+  cardinality: 0 2 2
+  keys: {} {17, 82} {17, 12}
+  values: {} {2} {0, 26}
+  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
+  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
+  lookup: false 2 0
+m: map[Color.Blue := 30, Color.Yellow := 21]
+keys: {Color.Blue, Color.Yellow}
+values: {30, 21}
+items: {(Color.Blue, 30), (Color.Yellow, 21)}
+3 2 4
+70 52 66
+8 67 67
+4 4 3
+true false true false
+true false false false
+false false true
+false false false true
+0 20 4
+198 20 4
+0 2 false
+true true true false
+0 20 4
+198 20 4
+0 2 false
+false false true
+false true true true
+jack wendy null
+jack null null
+ronald ronald false
+true true true false
+jack wendy null
+jack null null
+ronald ronald false
+Map multiple occurrences test
+  length: 1
+  self-equal: true
+  select: 2
+2: 0 1 1
+3: 0 1 2
+There are 0 occurrences of 58 in the multiset
+There are 536870912 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of null in the multiset
+Map===
+|s|=1 |u|=1
+s[1]=123 u[1]=40
+|S|=1 |U|=1
+S[1]=123 U[1]=41
+Seq===
+|s|=2 |u|=2
+123 42, 123 42, 123 42
+|s|=2 |u|=2
+123 43, 123 43, 123 43
+|s|=2 |u|=2
+123 44, 123 44, 123 44
+Multiset===
+|s|=2 |u|=4
+1 3
+|s|=2 |u|=4
+1 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.java.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.java.expect
new file mode 100644
index 00000000000..60f096fe133
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.java.expect
@@ -0,0 +1,129 @@
+Sets: {} {17, 82} {17, 12}
+  cardinality: 0 2 2
+  union: {17, 82} {17, 82, 12}
+  intersection: {} {17}
+  difference: {} {82}
+  disjoint: true false
+  subset: true false true
+  proper subset: true false false
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  eq covariance: 1 true true
+false true
+|s|=4 |S|=16
+{{}, {a}, {b}, {c}, {d}, {a, b}, {a, c}, {b, c}, {a, d}, {b, d}, {c, d}, {a, b, c}, {a, b, d}, {a, c, d}, {b, c, d}, {a, b, c, d}}
+Multisets: multiset{} multiset{17, 17, 82, 82} multiset{17, 12}
+  cardinality: 0 4 2
+  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
+  intersection: multiset{} multiset{17}
+  difference: multiset{} multiset{17, 82, 82}
+  disjoint: true false
+  subset: true false true true
+  proper subset: true false false true
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{17, 17, 12}
+  multiplicity: 0 2 1
+Test zero multiplicity:
+  printing: multiset{multiset{}, multiset{42}} multiset{12}
+  union: 1 1 1 1
+  membership: false false
+  equality: false true false
+  subset: true true true true false
+  strict subset: true false false true false
+  disjoint: true true true true
+Sequences: [] [17, 82, 17, 82] [12, 17]
+  cardinality: 0 4 2
+  update: [42, 82, 17, 82] [42, 17]
+  index: 17 12
+  subsequence ([lo..hi]): [82, 17] [17]
+  subsequence ([lo..]): [82, 17, 82] [17]
+  subsequence ([..hi]): [17, 82, 17][12]
+  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
+  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+Bound Bound Bound Bound Bound Bound
+ed ed ed ed ed ed
+e e e e e e
+hello
+hEllo
+[2, 4, 6, 8, 10]
+[2, 0, 6, 8, 10]
+true false false
+true true false true
+false false false true
+  eq covariance: true true
+Strings:  uRuR gu
+  cardinality: 0 4 2
+  concatenation: uRuR uRuRgu
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+  constructed as sequence: guru
+  mix: hello-d ddd-hello
+Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
+  cardinality: 0 2 2
+  keys: {} {17, 82} {17, 12}
+  values: {} {2} {0, 26}
+  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
+  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
+  lookup: false 2 0
+m: map[Color.Yellow := 21, Color.Blue := 30]
+keys: {Color.Yellow, Color.Blue}
+values: {21, 30}
+items: {(Color.Yellow, 21), (Color.Blue, 30)}
+3 2 4
+70 52 66
+8 67 67
+4 4 3
+true false true false
+true false false false
+false false true
+false false false true
+0 20 4
+198 20 4
+0 2 false
+true true true false
+0 20 4
+198 20 4
+0 2 false
+false false true
+false true true true
+jack wendy null
+jack null null
+ronald ronald false
+true true true false
+jack wendy null
+jack null null
+ronald ronald false
+Map multiple occurrences test
+  length: 1
+  self-equal: true
+  select: 2
+2: 0 1 1
+3: 0 1 2
+There are 0 occurrences of 58 in the multiset
+There are 536870912 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of null in the multiset
+Map===
+|s|=1 |u|=1
+s[1]=123 u[1]=40
+|S|=1 |U|=1
+S[1]=123 U[1]=41
+Seq===
+|s|=2 |u|=2
+123 42, 123 42, 123 42
+|s|=2 |u|=2
+123 43, 123 43, 123 43
+|s|=2 |u|=2
+123 44, 123 44, 123 44
+Multiset===
+|s|=2 |u|=4
+1 3
+|s|=2 |u|=4
+1 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.js.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.js.expect
new file mode 100644
index 00000000000..19be6351e0d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.js.expect
@@ -0,0 +1,129 @@
+Sets: {} {17, 82} {12, 17}
+  cardinality: 0 2 2
+  union: {17, 82} {17, 82, 12}
+  intersection: {} {17}
+  difference: {} {82}
+  disjoint: true false
+  subset: true false true
+  proper subset: true false false
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  eq covariance: 1 true true
+false true
+|s|=4 |S|=16
+{{}, {a}, {b}, {c}, {d}, {a, b}, {a, c}, {b, c}, {a, d}, {b, d}, {c, d}, {a, b, c}, {a, b, d}, {a, c, d}, {b, c, d}, {a, b, c, d}}
+Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
+  cardinality: 0 4 2
+  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
+  intersection: multiset{} multiset{17}
+  difference: multiset{} multiset{17, 82, 82}
+  disjoint: true false
+  subset: true false true true
+  proper subset: true false false true
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
+  multiplicity: 0 2 1
+Test zero multiplicity:
+  printing: multiset{multiset{}, multiset{42}} multiset{12}
+  union: 1 1 1 1
+  membership: false false
+  equality: false true false
+  subset: true true true true false
+  strict subset: true false false true false
+  disjoint: true true true true
+Sequences: [] [17, 82, 17, 82] [12, 17]
+  cardinality: 0 4 2
+  update: [42, 82, 17, 82] [42, 17]
+  index: 17 12
+  subsequence ([lo..hi]): [82, 17] [17]
+  subsequence ([lo..]): [82, 17, 82] [17]
+  subsequence ([..hi]): [17, 82, 17][12]
+  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
+  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+Bound Bound Bound Bound Bound Bound
+ed ed ed ed ed ed
+e e e e e e
+hello
+hEllo
+[2, 4, 6, 8, 10]
+[2, 0, 6, 8, 10]
+true false false
+true true false true
+false false false true
+  eq covariance: true true
+Strings:  uRuR gu
+  cardinality: 0 4 2
+  concatenation: uRuR uRuRgu
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+  constructed as sequence: guru
+  mix: hello-d ddd-hello
+Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
+  cardinality: 0 2 2
+  keys: {} {17, 82} {17, 12}
+  values: {} {2} {0, 26}
+  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
+  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
+  lookup: false 2 0
+m: map[Color.Blue := 30, Color.Yellow := 21]
+keys: {Color.Blue, Color.Yellow}
+values: {30, 21}
+items: {(Color.Blue, 30), (Color.Yellow, 21)}
+3 2 4
+70 52 66
+8 67 67
+4 4 3
+true false true false
+true false false false
+false false true
+false false false true
+0 20 4
+198 20 4
+0 2 false
+true true true false
+0 20 4
+198 20 4
+0 2 false
+false false true
+false true true true
+jack wendy null
+jack null null
+ronald ronald false
+true true true false
+jack wendy null
+jack null null
+ronald ronald false
+Map multiple occurrences test
+  length: 1
+  self-equal: true
+  select: 2
+2: 0 1 1
+3: 0 1 2
+There are 0 occurrences of 58 in the multiset
+There are 536870912 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of null in the multiset
+Map===
+|s|=1 |u|=1
+s[1]=123 u[1]=40
+|S|=1 |U|=1
+S[1]=123 U[1]=41
+Seq===
+|s|=2 |u|=2
+123 42, 123 42, 123 42
+|s|=2 |u|=2
+123 43, 123 43, 123 43
+|s|=2 |u|=2
+123 44, 123 44, 123 44
+Multiset===
+|s|=2 |u|=4
+1 3
+|s|=2 |u|=4
+1 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.py.expect
new file mode 100644
index 00000000000..a8cb6f4eb53
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.py.expect
@@ -0,0 +1,129 @@
+Sets: {} {17, 82} {17, 12}
+  cardinality: 0 2 2
+  union: {17, 82} {17, 82, 12}
+  intersection: {} {17}
+  difference: {} {82}
+  disjoint: true false
+  subset: true false true
+  proper subset: true false false
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  eq covariance: 1 true true
+false true
+|s|=4 |S|=16
+{{}, {a}, {b}, {c}, {d}, {a, b}, {a, c}, {b, c}, {a, d}, {b, d}, {c, d}, {a, b, c}, {a, b, d}, {a, c, d}, {b, c, d}, {a, b, c, d}}
+Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
+  cardinality: 0 4 2
+  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
+  intersection: multiset{} multiset{17}
+  difference: multiset{} multiset{17, 82, 82}
+  disjoint: true false
+  subset: true false true true
+  proper subset: true false false true
+  superset: false true true
+  proper superset: false true false
+  membership: false true true
+  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
+  multiplicity: 0 2 1
+Test zero multiplicity:
+  printing: multiset{multiset{}, multiset{42}} multiset{12}
+  union: 1 1 1 1
+  membership: false false
+  equality: false true false
+  subset: true true true true false
+  strict subset: true false false true false
+  disjoint: true true true true
+Sequences: [] [17, 82, 17, 82] [12, 17]
+  cardinality: 0 4 2
+  update: [42, 82, 17, 82] [42, 17]
+  index: 17 12
+  subsequence ([lo..hi]): [82, 17] [17]
+  subsequence ([lo..]): [82, 17, 82] [17]
+  subsequence ([..hi]): [17, 82, 17][12]
+  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
+  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+Bound Bound Bound Bound Bound Bound
+ed ed ed ed ed ed
+e e e e e e
+hello
+hEllo
+[2, 4, 6, 8, 10]
+[2, 0, 6, 8, 10]
+true false false
+true true false true
+false false false true
+  eq covariance: true true
+Strings:  uRuR gu
+  cardinality: 0 4 2
+  concatenation: uRuR uRuRgu
+  prefix: true false true
+  proper prefix: true false false
+  membership: false true true
+  constructed as sequence: guru
+  mix: hello-d ddd-hello
+Maps: map[] map[82 := 2, 17 := 2] map[17 := 0, 12 := 26]
+  cardinality: 0 2 2
+  keys: {} {17, 82} {17, 12}
+  values: {} {2} {0, 26}
+  items: {} {(82, 2), (17, 2)} {(17, 0), (12, 26)}
+  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
+  lookup: false 2 0
+m: map[Color.Blue := 30, Color.Yellow := 21]
+keys: {Color.Blue, Color.Yellow}
+values: {21, 30}
+items: {(Color.Blue, 30), (Color.Yellow, 21)}
+3 2 4
+70 52 66
+8 67 67
+4 4 3
+true false true false
+true false false false
+false false true
+false false false true
+0 20 4
+198 20 4
+0 2 false
+true true true false
+0 20 4
+198 20 4
+0 2 false
+false false true
+false true true true
+jack wendy null
+jack null null
+ronald ronald false
+true true true false
+jack wendy null
+jack null null
+ronald ronald false
+Map multiple occurrences test
+  length: 1
+  self-equal: true
+  select: 2
+2: 0 1 1
+3: 0 1 2
+There are 0 occurrences of 58 in the multiset
+There are 536870912 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of 58 in the multiset
+There are 633825300114114700748351602688 occurrences of null in the multiset
+Map===
+|s|=1 |u|=1
+s[1]=123 u[1]=40
+|S|=1 |U|=1
+S[1]=123 U[1]=41
+Seq===
+|s|=2 |u|=2
+123 42, 123 42, 123 42
+|s|=2 |u|=2
+123 43, 123 43, 123 43
+|s|=2 |u|=2
+123 44, 123 44, 123 44
+Multiset===
+|s|=2 |u|=4
+1 3
+|s|=2 |u|=4
+1 3
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.rs.check
new file mode 100644
index 00000000000..1132949004e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Collections.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK: .*<i>Cannot\ assign\ null\ value\ to\ variable</i>.*
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/CompileWithArguments.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/CompileWithArguments.dfy
new file mode 100644
index 00000000000..14547a9a51e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/CompileWithArguments.dfy
@@ -0,0 +1,50 @@
+// NONUNIFORM: Multiple testing scenarios, highly backend sensitive, testing CLI
+// Note that C++ is not supported yet
+
+// RUN: %verify "%s" > "%t"
+// RUN: %baredafny run %args --allow-deprecation --unicode-char false --no-verify --target:cs "%s" Csharp 1 >> "%t"
+// RUN: %run --no-verify --target:cpp --allow-deprecation --unicode-char false "%s" Cpp Yipee >> "%t"
+// RUN: %baredafny run %args --allow-deprecation --unicode-char false --no-verify --target:java "%s" -- Java --heya >> "%t"
+// RUN: %baredafny run %args --allow-deprecation --unicode-char false --no-verify --target:js "%s" -- Javascript 2 >> "%t"
+// RUN: %run --no-verify --allow-deprecation --unicode-char false --target py "%s" Python 1 >> "%t"
+// RUN: %run --no-verify --allow-deprecation --unicode-char false --target go "%s" "Go go" 1 >> "%t"
+// RUN: %baredafny build %args --allow-deprecation --unicode-char false --no-verify --target:cs "%s" --output:%S/Output/CompileWithArgument.dll
+// RUN: dotnet %S/Output/CompileWithArgument.dll "dotnet" "howdy" >> "%t"
+// RUN: dotnet %S/Output/CompileWithArgument.dll "dotnet" "hello" >> "%t"
+// RUN: dotnet %S/Output/CompileWithArgument.dll "dotnet" "aloha" >> "%t"
+// RUN: %baredafny build %args --allow-deprecation --unicode-char false --no-verify --target:js "%s" --output=%s.js
+// RUN: node %s.js "javascript" 2 >> "%t"
+// RUN: node %s.js "javascript" 1 >> "%t"
+// RUN: node %s.js "javascript" "aloha" >> "%t"
+// RUN: %build --no-verify --target:cpp --allow-deprecation --unicode-char false "%s" --output=%s.exe
+// RUN: %s.exe "cpp" 2 >> "%t"
+// RUN: %s.exe "cpp" 1 >> "%t"
+// RUN: %s.exe "cpp" "aloha" >> "%t"
+// RUN: %baredafny build %args --allow-deprecation --unicode-char false --no-verify --target:java "%s" --output:"%s.jar" >> "%t"
+// RUN: java -jar "%s.jar" Java 2 >> "%t"
+// RUN: java -jar "%s.jar" Java 1 >> "%t"
+// RUN: java -jar "%s.jar" Java aloha >> "%t"
+// RUN: %baredafny build %args --allow-deprecation --unicode-char false --no-verify --target:py "%s" >> "%t"
+// RUN: python3 %S/CompileWithArguments-py Python 2 >> "%t"
+// RUN: python3 %S/CompileWithArguments-py Python 1 >> "%t"
+// RUN: python3 %S/CompileWithArguments-py Python aloha >> "%t"
+// RUN: %baredafny build %args --allow-deprecation --unicode-char false --no-verify --target:go "%s" >> "%t"
+// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go 2 >> "%t"
+// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go 1 >> "%t"
+// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go aloha >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method Main(args: seq<string>) {
+  if |args| != 3 {
+    print "Expected 3 arguments, got ", |args|;
+  } else {
+    print args[1], " says ";
+    if args[2] == "1" {
+      print "hello\n";
+    } else if args[2] == "2" {
+      print "howdy\n";
+    } else {
+      print args[2],"\n";
+    }
+  }
+}
diff --git a/Test/comp/CompileWithArguments.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/CompileWithArguments.dfy.expect
similarity index 100%
rename from Test/comp/CompileWithArguments.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/CompileWithArguments.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Comprehensions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Comprehensions.dfy
new file mode 100644
index 00000000000..fca16e61569
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Comprehensions.dfy
@@ -0,0 +1,3 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation  --allow-deprecation --unicode-char false --verify-included-files
+include "../../comp/Comprehensions.dfy"
diff --git a/Test/unicodechars/comp/Comprehensions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Comprehensions.dfy.expect
similarity index 100%
rename from Test/unicodechars/comp/Comprehensions.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Comprehensions.dfy.expect
diff --git a/Test/unicodechars/comp/Comprehensions.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Comprehensions.dfy.py.expect
similarity index 100%
rename from Test/unicodechars/comp/Comprehensions.dfy.py.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Comprehensions.dfy.py.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Comprehensions.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Comprehensions.dfy.rs.check
new file mode 100644
index 00000000000..323dbedbafa
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Comprehensions.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.InvalidOperationException: Operation is not valid due to the current state of the object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Conversions.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Conversions.java
new file mode 100644
index 00000000000..9d5ea2fb007
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Conversions.java
@@ -0,0 +1,7 @@
+package Util;
+
+public class Conversions {
+    public static String ToJavaString(dafny.DafnySequence<? extends Character> s) {
+        return s.verbatimString();
+    }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternDafnyString.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternDafnyString.dfy
new file mode 100644
index 00000000000..9d9136c81a4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternDafnyString.dfy
@@ -0,0 +1,26 @@
+// RUN: %run --allow-deprecation --unicode-char false --target java "%s" --input %S/ExternDafnyString.java > "%t"
+// RUN: %diff "%s.expect" "%t"
+// In this example, the extern method obtains a Java string and returns it as a Dafny string.
+
+class {:extern "java.lang.String"} JavaString {
+  ghost const value: string
+}
+
+method {:extern "dafny.ExternDafnyString", "getStringFromFile"} GetStringFromFile() returns (s: string)
+
+method Main() {
+  var s := GetStringFromFile();
+
+  var previousStart := 0;
+  for i := 0 to |s|
+    invariant previousStart <= i
+  {
+    if s[i] == '/' {
+      print s[previousStart..i], "\n";
+      previousStart := i + 1;
+    }
+  }
+  if previousStart != |s| {
+    print s[previousStart..], "\n";
+  }
+}
diff --git a/Test/unicodechars/comp/ExternDafnyString.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternDafnyString.dfy.expect
similarity index 100%
rename from Test/unicodechars/comp/ExternDafnyString.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternDafnyString.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternDafnyString.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternDafnyString.java
new file mode 100644
index 00000000000..58f820cbe39
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternDafnyString.java
@@ -0,0 +1,11 @@
+
+package dafny;
+
+public class ExternDafnyString {
+    public static dafny.DafnySequence<? extends Character> getStringFromFile() {
+        // Let's pretend the following is read from a file:
+        String js = "this is some possible / text that / may have come from a file";
+        // Convert this Java string to a Dafny string before returning:
+        return dafny.DafnySequence.asString(js);
+    }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternJavaString.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternJavaString.dfy
new file mode 100644
index 00000000000..449d2040a16
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternJavaString.dfy
@@ -0,0 +1,37 @@
+// RUN: %run --allow-deprecation --unicode-char false --target java "%s" --input %S/Conversions.java --input %S/ExternJavaString.java > "%t"
+// RUN: %diff "%s.expect" "%t"
+// In this example, the extern method obtains a Java string and returns it as such.
+// The Dafny code converts that Java string to a Dafny string.
+
+class {:extern "java.lang.String"} JavaString {
+  ghost const value: string
+}
+
+// Note, the following has to be a method, not a function, because the reference it
+// returns is not determined functionally from the input argument.
+method {:axiom} {:extern "Util.Conversions", "ToJavaString"} ToJavaString(s: string) returns (js: JavaString)
+  ensures js.value == s
+
+// The conversion this way can be a function.
+function {:axiom} {:extern "dafny.DafnySequence", "asString"} ToDafnyString(js: JavaString): string
+  ensures ToDafnyString(js) == js.value
+
+method {:axiom} {:extern "dafny.ExternJavaString", "getStringFromFile"} GetStringFromFile() returns (js: JavaString)
+
+method Main() {
+  var js := GetStringFromFile();
+  var s := ToDafnyString(js);
+
+  var previousStart := 0;
+  for i := 0 to |s|
+    invariant previousStart <= i
+  {
+    if s[i] == '/' {
+      print s[previousStart..i], "\n";
+      previousStart := i + 1;
+    }
+  }
+  if previousStart != |s| {
+    print s[previousStart..], "\n";
+  }
+}
diff --git a/Test/unicodechars/comp/ExternJavaString.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternJavaString.dfy.expect
similarity index 100%
rename from Test/unicodechars/comp/ExternJavaString.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternJavaString.dfy.expect
diff --git a/Test/unicodechars/comp/ExternJavaString.java b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternJavaString.java
similarity index 100%
rename from Test/unicodechars/comp/ExternJavaString.java
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/ExternJavaString.java
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/NativeNumbers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/NativeNumbers.dfy
new file mode 100644
index 00000000000..c6bc80f78c2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/NativeNumbers.dfy
@@ -0,0 +1,4 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --relax-definite-assignment --spill-translation --allow-deprecation --unicode-char false --verify-included-files
+// Skip JavaScript because JavaScript doesn't have the same native types
+
+include "../../comp/NativeNumbers.dfy"
diff --git a/Test/comp/NativeNumbers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/NativeNumbers.dfy.expect
similarity index 100%
rename from Test/comp/NativeNumbers.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/NativeNumbers.dfy.expect
diff --git a/Test/unicodechars/comp/NativeNumbers.dfy.js.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/NativeNumbers.dfy.js.check
similarity index 100%
rename from Test/unicodechars/comp/NativeNumbers.dfy.js.check
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/NativeNumbers.dfy.js.check
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/NativeNumbers.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/NativeNumbers.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/NativeNumbers.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy
new file mode 100644
index 00000000000..1d1361ddb1f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy
@@ -0,0 +1,3 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4174
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-deprecation --relax-definite-assignment --unicode-char false --verify-included-files
+include "../../comp/Numbers.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.expect
new file mode 100644
index 00000000000..bd45e868fd6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.expect
@@ -0,0 +1,126 @@
+0
+0
+3
+-5
+2147483647 (aka C# int.MaxValue)
+2147483648 (aka 2^31)
+2147483649
+4294967295 (aka C# uint.MaxValue)
+4294967296 (aka 2^32)
+9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
+9007199254740992 (aka 2^53)
+-9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
+-9007199254740992
+9223372036854775807 (aka C# long.MaxValue)
+9223372036854775808 (aka 2^63)
+9223372036854775809
+18446744073709551615 (aka C# ulong.MaxValue)
+18446744073709551616 (aka 2^64)
+1267650600228229401496703205376 (aka 2^100)
+170141183460469231731687303715884105727 (aka M_39)
+0.0
+0.0
+3.0
+-5.0
+3.14
+-2.71
+1000000000.0 (aka a billion)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
+0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
+35 27 -27
+124 -124
+-124 124
+g Q 2
+7 3 31
+-8 1 -31
+-7 3 31
+8 1 -31
+0 0 0
+0 0 0
+uint8:  10:1 0:231
+uint16: 2848:7 0:65511
+uint32: 186737707:10 0:4294967271
+uint64: 802032351030850069:4 0:18446744073709551591
+via real: 7:12 -8:1 -7:12 8:1
+int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
+int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
+int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+0.2
+35.2 27.2 -27.2
+124.8 -124.8
+-124.8 124.8
+7.800 31.200
+-7.800 -31.200
+-7.800 31.200
+7.800 -31.200
+0.0 0.0 0.0 
+120.0 120.0 (24.0 / 3.0) (-24.0 / 3.0) 
+123.4567 -123.4567 0.1234 -0.1234 (24.0 / 30.0) 
+0.2 0.02 0.00002 
+-0.2 -0.02 -0.00002 
+(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
+0.0 0.0 0.81 0.81 (8100.0 / 8100.0)
+true false
+0 2 2 2
+0 3 6 46
+0 1 36 2116
+0 0 0 0
+29 2 2 4294967283 2
+29 2 2 9007199254740979 2
+0 0 0 9
+0 0 0 9
+0 0 0 9
+0 4294967295 1267650600228229401496703205375 6
+8 4
+18 72 4
+0
+200 300
+100 100 18
+2
+-2
+-2
+2
+0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
+1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
+42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
+int:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+NativeType:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+120 120.0 120 120 120 x
+120 120.0 120 120 120 x
+120 120
+120 120.0 120 120 120 x
+120 120.0 120 120 120 x
+120 120
+false true false true
+true false true false
+false true false true
+true false true false
+20 23 23 88 880
+62.1 62.2 62.3
+-3 -3 -3
+82 0 -3 -33
+82 0 82 0
+715827880 0 -3 -33
+1431655762 0 1431655762 0
+98382635059784275282 0 98382635059784275282 0
+1 7 7 1 127 127
+1 2 0 1
+1 2 0 1
+1 2 0 1
+3.14 100.0 99.0 9876.0 77.0 129.0
+6
+2
+7
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.go.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.go.expect
new file mode 100644
index 00000000000..8249aa59ada
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.go.expect
@@ -0,0 +1,126 @@
+0
+0
+3
+-5
+2147483647 (aka C# int.MaxValue)
+2147483648 (aka 2^31)
+2147483649
+4294967295 (aka C# uint.MaxValue)
+4294967296 (aka 2^32)
+9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
+9007199254740992 (aka 2^53)
+-9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
+-9007199254740992
+9223372036854775807 (aka C# long.MaxValue)
+9223372036854775808 (aka 2^63)
+9223372036854775809
+18446744073709551615 (aka C# ulong.MaxValue)
+18446744073709551616 (aka 2^64)
+1267650600228229401496703205376 (aka 2^100)
+170141183460469231731687303715884105727 (aka M_39)
+0.0
+0.0
+3.0
+-5.0
+3.14
+-2.71
+1000000000.0 (aka a billion)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
+0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
+35 27 -27
+124 -124
+-124 124
+g Q 2
+7 3 31
+-8 1 -31
+-7 3 31
+8 1 -31
+0 0 0
+0 0 0
+uint8:  10:1 0:231
+uint16: 2848:7 0:65511
+uint32: 186737707:10 0:4294967271
+uint64: 802032351030850069:4 0:18446744073709551591
+via real: 7:12 -8:1 -7:12 8:1
+int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
+int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
+int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+0.2
+35.2 27.2 -27.2
+124.8 -124.8
+-124.8 124.8
+7.8 31.2
+-7.8 -31.2
+-7.8 31.2
+7.8 -31.2
+0.0 0.0 0.0 
+120.0 120.0 8.0 -8.0 
+123.4567 -123.4567 0.1234 -0.1234 0.8 
+0.2 0.02 0.00002 
+-0.2 -0.02 -0.00002 
+(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
+0.0 0.0 0.81 0.81 1.0
+true false
+0 2 2 2
+0 3 6 46
+0 1 36 2116
+0 0 0 0
+29 2 2 4294967283 2
+29 2 2 9007199254740979 2
+0 0 0 9
+0 0 0 9
+0 0 0 9
+0 4294967295 1267650600228229401496703205375 6
+8 4
+18 72 4
+0
+200 300
+100 100 18
+2
+-2
+-2
+2
+0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
+1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
+42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
+int:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+NativeType:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+120 120.0 120 120 120 x
+120 120.0 120 120 120 x
+120 120
+120 120.0 120 120 120 x
+120 120.0 120 120 120 x
+120 120
+false true false true
+true false true false
+false true false true
+true false true false
+20 23 23 88 880
+62.1 62.2 62.3
+-3 -3 -3
+82 0 -3 -33
+82 0 82 0
+715827880 0 -3 -33
+1431655762 0 1431655762 0
+98382635059784275282 0 98382635059784275282 0
+1 7 7 1 127 127
+1 2 0 1
+1 2 0 1
+1 2 0 1
+3.14 100.0 99.0 9876.0 77.0 129.0
+6
+2
+7
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.py.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.py.expect
new file mode 100644
index 00000000000..8249aa59ada
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.py.expect
@@ -0,0 +1,126 @@
+0
+0
+3
+-5
+2147483647 (aka C# int.MaxValue)
+2147483648 (aka 2^31)
+2147483649
+4294967295 (aka C# uint.MaxValue)
+4294967296 (aka 2^32)
+9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
+9007199254740992 (aka 2^53)
+-9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
+-9007199254740992
+9223372036854775807 (aka C# long.MaxValue)
+9223372036854775808 (aka 2^63)
+9223372036854775809
+18446744073709551615 (aka C# ulong.MaxValue)
+18446744073709551616 (aka 2^64)
+1267650600228229401496703205376 (aka 2^100)
+170141183460469231731687303715884105727 (aka M_39)
+0.0
+0.0
+3.0
+-5.0
+3.14
+-2.71
+1000000000.0 (aka a billion)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+0.0000000000667408 (aka G)
+17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
+0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
+35 27 -27
+124 -124
+-124 124
+g Q 2
+7 3 31
+-8 1 -31
+-7 3 31
+8 1 -31
+0 0 0
+0 0 0
+uint8:  10:1 0:231
+uint16: 2848:7 0:65511
+uint32: 186737707:10 0:4294967271
+uint64: 802032351030850069:4 0:18446744073709551591
+via real: 7:12 -8:1 -7:12 8:1
+int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
+int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
+int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
+0.2
+35.2 27.2 -27.2
+124.8 -124.8
+-124.8 124.8
+7.8 31.2
+-7.8 -31.2
+-7.8 31.2
+7.8 -31.2
+0.0 0.0 0.0 
+120.0 120.0 8.0 -8.0 
+123.4567 -123.4567 0.1234 -0.1234 0.8 
+0.2 0.02 0.00002 
+-0.2 -0.02 -0.00002 
+(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
+0.0 0.0 0.81 0.81 1.0
+true false
+0 2 2 2
+0 3 6 46
+0 1 36 2116
+0 0 0 0
+29 2 2 4294967283 2
+29 2 2 9007199254740979 2
+0 0 0 9
+0 0 0 9
+0 0 0 9
+0 4294967295 1267650600228229401496703205375 6
+8 4
+18 72 4
+0
+200 300
+100 100 18
+2
+-2
+-2
+2
+0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
+1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
+42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
+int:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+NativeType:
+-42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
+23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
+120 120.0 120 120 120 x
+120 120.0 120 120 120 x
+120 120
+120 120.0 120 120 120 x
+120 120.0 120 120 120 x
+120 120
+false true false true
+true false true false
+false true false true
+true false true false
+20 23 23 88 880
+62.1 62.2 62.3
+-3 -3 -3
+82 0 -3 -33
+82 0 82 0
+715827880 0 -3 -33
+1431655762 0 1431655762 0
+98382635059784275282 0 98382635059784275282 0
+1 7 7 1 127 127
+1 2 0 1
+1 2 0 1
+1 2 0 1
+3.14 100.0 99.0 9876.0 77.0 129.0
+6
+2
+7
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.rs.check
new file mode 100644
index 00000000000..fbb03b77111
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Numbers.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: Unhandled exception: System.NullReferenceException: Object reference not set to an instance of an object.
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Print.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Print.dfy
new file mode 100644
index 00000000000..6cd59fbb6cb
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Print.dfy
@@ -0,0 +1,7 @@
+// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108 and https://github.com/dafny-lang/dafny/issues/2582
+// RUN: %verify --allow-deprecation --unicode-char false --relax-definite-assignment "%s" > "%t"
+// RUN: %run --no-verify --allow-deprecation --unicode-char false --target cs "%s" >> "%t"
+// RUN: %run --no-verify --allow-deprecation --unicode-char false --target js "%s" >> "%t"
+// RUN: %run --no-verify --allow-deprecation --unicode-char false --target go "%s" >> "%t"
+// RUN: %run --no-verify --allow-deprecation --unicode-char false --target java "%s" >> "%t"
+include "../../comp/Print.dfy"
diff --git a/Test/comp/Print.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Print.dfy.expect
similarity index 100%
rename from Test/comp/Print.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/comp/Print.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/dafny0/Char.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/dafny0/Char.dfy
new file mode 100644
index 00000000000..9f9ddf41853
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/dafny0/Char.dfy
@@ -0,0 +1,101 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s" -- --allow-deprecation --unicode-char false
+
+
+class CharChar {
+  var c: char;
+  var d: char;
+
+  method Order()
+    modifies this;
+    ensures c <= d;
+  {
+    if d < c {
+      c, d := d, c;
+    }
+  }
+
+  ghost function Recurse(ch: char): bool
+    reads this;
+  {
+    if c < ch then Recurse(c)
+    else if d < ch then Recurse(d)
+    else ch == ' '
+  }
+
+  ghost function MinChar(s: string): char
+    requires s != "";
+  {
+    var ch := s[0];
+    if |s| == 1 then ch else
+    var m := MinChar(s[1..]);
+    if m < ch then m else ch
+  }
+  lemma MinCharLemma(s: string)
+    requires |s| != 0;
+    ensures forall i :: 0 <= i < |s| ==> MinChar(s) <= s[i];
+  {
+    if 2 <= |s| {
+      var m := MinChar(s[1..]);
+      assert forall i :: 1 <= i < |s| ==> m <= s[1..][i-1] == s[i];
+    }
+  }
+
+  method CharEq(s: string) {
+    if "hello Dafny" <= s {
+      assert s[6] == 'D';
+      assert s[7] == '\u0061';
+      if * {
+        assert s[9] == '\n';  // error
+      } else if * {
+        assert s[1] < s[2] <= s[3];
+      } else {
+        assert s[0] <= s[5];  // error
+      }
+    }
+  }
+  method CharInbetween(ch: char)
+    requires 'B' < ch;
+  {
+    if ch < 'D' {
+      assert 'C' <= ch <= 'C';
+      assert ch == 'C';
+    } else {
+      assert ch <= 'M';  // error
+    }
+  }
+}
+
+// arithmetic with char's
+
+ghost function toLower(ch: char): char
+{
+  if 'A' <= ch <= 'Z' then
+    ch - 'A' + 'a'
+  else
+    ch
+}
+
+ghost function BadToLower_Overflow(ch: char): char
+{
+  if 'A' <= ch then
+    ch - 'A' + 'a'  // error: possible overvlow
+  else
+    ch
+}
+
+ghost function BadToLower_Underflow(ch: char): char
+{
+  if ch <= 'Z' then
+    ch - 'A' + 'a'  // error: possible overvlow
+  else
+    ch
+}
+
+lemma AboutChar(ch: char, dh: char)
+  requires 'r' < dh < '\uabcd'
+  ensures ch == ch + '\0' == ch - '\0'
+  ensures dh - '\u0020' < dh
+  ensures dh + '\u0020' > dh
+  ensures '\n' + dh == dh + '\n'
+{
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/dafny0/Char.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/dafny0/Char.dfy.expect
new file mode 100644
index 00000000000..fd4c336f045
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/dafny0/Char.dfy.expect
@@ -0,0 +1,8 @@
+Char.dfy(48,8): Error: assertion could not be proved
+Char.dfy(52,8): Error: assertion could not be proved
+Char.dfy(63,6): Error: assertion could not be proved
+Char.dfy(81,13): Error: char addition might overflow
+Char.dfy(89,7): Error: char subtraction might underflow
+Char.dfy(63,16): Error: assertion might not hold
+
+Dafny program verifier finished with 8 verified, 5 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/Expect.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/Expect.dfy
new file mode 100644
index 00000000000..bb80d8a5f6b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/Expect.dfy
@@ -0,0 +1,7 @@
+// RUN: ! %baredafny run --target=cs --allow-deprecation --unicode-char false %args "%s" > "%t"
+// RUN: ! %baredafny run --target=go --allow-deprecation --unicode-char false %args "%s" >> "%t"
+// RUN: ! %baredafny run --target=java --allow-deprecation --unicode-char false %args "%s" >> "%t"
+// RUN: ! %baredafny run --target=js --allow-deprecation --unicode-char false %args "%s" >> "%t"
+// RUN: ! %baredafny run --target=py --allow-deprecation --unicode-char false %args "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+include "../../expectations/Expect.dfy"
diff --git a/Test/unicodechars/expectations/Expect.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/Expect.dfy.expect
similarity index 100%
rename from Test/unicodechars/expectations/Expect.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/Expect.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectAndExceptions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectAndExceptions.dfy
new file mode 100644
index 00000000000..323211c0047
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectAndExceptions.dfy
@@ -0,0 +1,7 @@
+// RUN: ! %run --target cs --allow-deprecation --unicode-char false "%s" > "%t"
+// RUN: ! %run --target go --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: ! %run --target java --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: ! %run --target js --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: ! %run --target py --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+include "../../expectations/ExpectAndExceptions.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectAndExceptions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectAndExceptions.dfy.expect
new file mode 100644
index 00000000000..4ac29e24bf2
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectAndExceptions.dfy.expect
@@ -0,0 +1,15 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+[Program halted] ExpectAndExceptions.dfy(19,22): NatOutcome.NatFailure(Kaboom!)
+
+Dafny program verifier finished with 0 verified, 0 errors
+[Program halted] ExpectAndExceptions.dfy(19,22): NatOutcome.NatFailure(Kaboom!)
+
+Dafny program verifier finished with 0 verified, 0 errors
+[Program halted] ExpectAndExceptions.dfy(19,22): NatOutcome.NatFailure(Kaboom!)
+
+Dafny program verifier finished with 0 verified, 0 errors
+[Program halted] ExpectAndExceptions.dfy(19,22): NatOutcome.NatFailure(Kaboom!)
+
+Dafny program verifier finished with 0 verified, 0 errors
+[Program halted] ExpectAndExceptions.dfy(19,22): NatOutcome.NatFailure(Kaboom!)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithMessage.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithMessage.dfy
new file mode 100644
index 00000000000..ecd4db993e8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithMessage.dfy
@@ -0,0 +1,7 @@
+// RUN: ! %run --target cs --allow-deprecation --unicode-char false "%s" > "%t"
+// RUN: ! %run --target go --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: ! %run --target java --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: ! %run --target js --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: ! %run --target py --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+include "../../expectations/ExpectWithMessage.dfy"
diff --git a/Test/unicodechars/expectations/ExpectWithMessage.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithMessage.dfy.expect
similarity index 100%
rename from Test/unicodechars/expectations/ExpectWithMessage.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithMessage.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithNonStringMessage.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithNonStringMessage.dfy
new file mode 100644
index 00000000000..6dbbe0bae6d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithNonStringMessage.dfy
@@ -0,0 +1,12 @@
+// RUN: %verify --verify-included-files --allow-deprecation --unicode-char false "%s" > "%t"
+// RUN: ! %run --no-verify --target cs --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: ! %run --no-verify --target go --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: ! %run --no-verify --target java --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: ! %run --no-verify --target js "--allow-deprecation --unicode-char %s" >> "%t"
+// RUN: ! %run --no-verify --target py --allow-deprecation --unicode-char false "%s" >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+// Note this is one good example of printing regressing with /unicodeChar:1
+// in the name of simpler and more consistent semantics.
+
+include "../../expectations/ExpectWithNonStringMessage.dfy"
diff --git a/Test/expectations/ExpectWithNonStringMessage.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithNonStringMessage.dfy.expect
similarity index 81%
rename from Test/expectations/ExpectWithNonStringMessage.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithNonStringMessage.dfy.expect
index 61a08ba76bd..ab79f6b054c 100644
--- a/Test/expectations/ExpectWithNonStringMessage.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/expectations/ExpectWithNonStringMessage.dfy.expect
@@ -9,9 +9,7 @@ Dafny program verifier did not attempt verification
 
 Dafny program verifier did not attempt verification
 [Program halted] ExpectWithNonStringMessage.dfy(13,2): Option.Some(where over the rainbow)
-
-Dafny program verifier did not attempt verification
-[Program halted] ExpectWithNonStringMessage.dfy(13,2): Option.Some(where over the rainbow)
+CLI: Error: file ExpectWithNonStringMessage.dfy not found
 
 Dafny program verifier did not attempt verification
 [Program halted] ExpectWithNonStringMessage.dfy(13,2): Option.Some(where over the rainbow)
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/git-issues/github-issue-2928.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/git-issues/github-issue-2928.dfy
new file mode 100644
index 00000000000..7b0144f7e4e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/git-issues/github-issue-2928.dfy
@@ -0,0 +1,3 @@
+// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s" -- --allow-deprecation --unicode-char false
+
+include "../../git-issues/github-issue-2928.dfy"
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/git-issues/github-issue-2928.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/git-issues/github-issue-2928.dfy.expect
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/git-issues/github-issue-2928.dfy.rs.check b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/git-issues/github-issue-2928.dfy.rs.check
new file mode 100644
index 00000000000..d59836f7d8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/unicodecharsFalse/git-issues/github-issue-2928.dfy.rs.check
@@ -0,0 +1 @@
+// CHECK-L: error[E0308]: mismatched types
\ No newline at end of file
diff --git a/Test/vacid0/Composite.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/Composite.dfy
similarity index 98%
rename from Test/vacid0/Composite.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/Composite.dfy
index b94e5218716..36ebb8a95cc 100644
--- a/Test/vacid0/Composite.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/Composite.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class Composite {
   var left: Composite?
diff --git a/Test/vstte2012/RingBufferAuto.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/Composite.dfy.expect
similarity index 100%
rename from Test/vstte2012/RingBufferAuto.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/Composite.dfy.expect
diff --git a/Test/vacid0/LazyInitArray.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/LazyInitArray.dfy
similarity index 98%
rename from Test/vacid0/LazyInitArray.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/LazyInitArray.dfy
index 5b0f8210ced..b47f2722788 100644
--- a/Test/vacid0/LazyInitArray.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/LazyInitArray.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
+// RUN: %verify "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 class LazyInitArray<T(0)> {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/LazyInitArray.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/LazyInitArray.dfy.expect
new file mode 100644
index 00000000000..83193971bf0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/LazyInitArray.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 6 verified, 0 errors
diff --git a/Test/vacid0/SparseArray.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/SparseArray.dfy
similarity index 98%
rename from Test/vacid0/SparseArray.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/SparseArray.dfy
index 75b1358b029..be48803c305 100644
--- a/Test/vacid0/SparseArray.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/SparseArray.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /deprecation:0 "%s" > "%t"
+// RUN: %verify --allow-deprecation --relax-definite-assignment "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // This file was created in the early stages of Dafny, when the
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/SparseArray.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/SparseArray.dfy.expect
new file mode 100644
index 00000000000..851aaf58286
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vacid0/SparseArray.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 7 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/dfyconfig.toml b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/dfyconfig.toml
new file mode 100644
index 00000000000..bed17481d41
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/dfyconfig.toml
@@ -0,0 +1 @@
+includes = ["src/**/*.dfy"]
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/single-file.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/single-file.dfy
new file mode 100644
index 00000000000..24eb8c2507a
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/single-file.dfy
@@ -0,0 +1,25 @@
+method Succeeds()
+  ensures true {
+}
+
+method Fails() 
+  ensures false {
+  assert false by {
+    assert false;
+    assert false;
+  }
+}
+
+method Loop() {
+  var b := true;
+  while(b) 
+    invariant false 
+  {
+    b := false;
+  }
+  assert false;
+}
+
+method DoubleAssertOneLine(x: int) {
+  assert x > 2; assert x > 3;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/src/source1.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/src/source1.dfy
new file mode 100644
index 00000000000..cf223c2cf5f
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/src/source1.dfy
@@ -0,0 +1,7 @@
+method Succeeds()
+  ensures true {
+}
+
+method Fails() 
+  ensures false {
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/src/source2.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/src/source2.dfy
new file mode 100644
index 00000000000..c6d3780d34b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/Inputs/src/source2.dfy
@@ -0,0 +1,7 @@
+method Succeeds2()
+  ensures true {
+}
+
+method Fails2() 
+  ensures false {
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/constructorFresh.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/constructorFresh.dfy
new file mode 100644
index 00000000000..5739fb39a07
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/constructorFresh.dfy
@@ -0,0 +1,28 @@
+// RUN: ! %verify %s &> %t
+// RUN: %diff "%s.expect" "%t"
+
+class A {
+  constructor()
+}
+
+class Test {
+
+  var x: A
+
+  constructor()
+    ensures fresh(this.x)
+    ensures foo()
+  {
+    x := new A();
+  }
+}
+
+predicate foo()
+  requires false
+  ensures false 
+{ true }
+
+method Main() {
+  var t := new Test();
+  assert false;
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/constructorFresh.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/constructorFresh.dfy.expect
new file mode 100644
index 00000000000..6bdd3dea757
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/constructorFresh.dfy.expect
@@ -0,0 +1,4 @@
+constructorFresh.dfy(14,15): Error: function precondition could not be proved
+constructorFresh.dfy(21,11): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 3 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter-symbol.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter-symbol.dfy
new file mode 100644
index 00000000000..126036205b6
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter-symbol.dfy
@@ -0,0 +1,27 @@
+// RUN: %verify --filter-symbol='blaergaerga' %s > %t
+// RUN: ! %verify --filter-symbol='P' %s >> %t
+// RUN: ! %verify --filter-symbol='Q' %s >> %t
+// RUN: ! %verify --filter-symbol='P.Q' %s >> %t
+// RUN: ! %verify --filter-symbol='Q.P' %s >> %t
+// RUN: ! %verify --filter-symbol='DT' %s >> %t
+// RUN: ! %verify --filter-symbol='R1' %s >> %t
+// RUN: %diff "%s.expect" "%t"
+
+module P {
+  module Q {
+    method A() ensures false {}
+  }
+  method B() ensures false {}
+}
+
+module Q {
+  module P {
+    method C() ensures false {}
+  }
+  method D() ensures false {}
+}
+
+method E() ensures false {}
+
+datatype DT = R1(x: nat := -1) | R2(y: nat := -1)
+
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter-symbol.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter-symbol.dfy.expect
new file mode 100644
index 00000000000..701d65563ac
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter-symbol.dfy.expect
@@ -0,0 +1,33 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+filter-symbol.dfy(14,27): Error: a postcondition could not be proved on this return path
+filter-symbol.dfy(14,21): Related location: this is the postcondition that could not be proved
+filter-symbol.dfy(12,29): Error: a postcondition could not be proved on this return path
+filter-symbol.dfy(12,23): Related location: this is the postcondition that could not be proved
+filter-symbol.dfy(19,29): Error: a postcondition could not be proved on this return path
+filter-symbol.dfy(19,23): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 0 verified, 3 errors
+filter-symbol.dfy(12,29): Error: a postcondition could not be proved on this return path
+filter-symbol.dfy(12,23): Related location: this is the postcondition that could not be proved
+filter-symbol.dfy(21,27): Error: a postcondition could not be proved on this return path
+filter-symbol.dfy(21,21): Related location: this is the postcondition that could not be proved
+filter-symbol.dfy(19,29): Error: a postcondition could not be proved on this return path
+filter-symbol.dfy(19,23): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 0 verified, 3 errors
+filter-symbol.dfy(12,29): Error: a postcondition could not be proved on this return path
+filter-symbol.dfy(12,23): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 0 verified, 1 error
+filter-symbol.dfy(19,29): Error: a postcondition could not be proved on this return path
+filter-symbol.dfy(19,23): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 0 verified, 1 error
+filter-symbol.dfy(26,27): Error: value does not satisfy the subset constraints of 'nat'
+filter-symbol.dfy(26,46): Error: value does not satisfy the subset constraints of 'nat'
+
+Dafny program verifier finished with 0 verified, 2 errors
+filter-symbol.dfy(26,27): Error: value does not satisfy the subset constraints of 'nat'
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter.dfy
new file mode 100644
index 00000000000..c5cb15cc764
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter.dfy
@@ -0,0 +1,15 @@
+// RUN: %verify --allow-warnings --filter-position='C:\windows\path.dfy' %s > %t
+// RUN: ! %verify --filter-position='src/source1.dfy:5' %S/Inputs/dfyconfig.toml >> %t
+// RUN: %verify --filter-position='src/source1.dfy:1' %S/Inputs/dfyconfig.toml >> %t
+// RUN: ! %verify --filter-position='e.dfy' %S/Inputs/single-file.dfy >> %t
+// RUN: %verify --filter-position='e.dfy:2' %S/Inputs/single-file.dfy >> %t
+// RUN: %verify --filter-position='blaergaerga' %S/Inputs/single-file.dfy >> %t
+// RUN: ! %verify --isolate-assertions --filter-position='e.dfy:5' %S/Inputs/single-file.dfy >> %t
+// RUN: %verify --isolate-assertions --filter-position='e.dfy:6' %S/Inputs/single-file.dfy >> %t
+// RUN: %verify --isolate-assertions --filter-position='e.dfy:7' %S/Inputs/single-file.dfy >> %t
+// RUN: ! %verify --isolate-assertions --filter-position='e.dfy:8' %S/Inputs/single-file.dfy >> %t
+// RUN: %verify --isolate-assertions --filter-position='e.dfy:9' %S/Inputs/single-file.dfy >> %t
+// RUN: ! %verify --isolate-assertions --filter-position='e.dfy:16' %S/Inputs/single-file.dfy >> %t
+// RUN: %verify --isolate-assertions --filter-position='y:20' %S/Inputs/single-file.dfy >> %t
+// RUN: ! %verify --isolate-assertions --filter-position=':24' %S/Inputs/single-file.dfy >> %t
+// RUN: %diff "%s.expect" "%t"
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter.dfy.expect
new file mode 100644
index 00000000000..711d7c90c74
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/filter.dfy.expect
@@ -0,0 +1,39 @@
+
+Dafny program verifier finished with 0 verified, 0 errors
+source1.dfy(6,16): Error: a postcondition could not be proved on this return path
+source1.dfy(6,10): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 0 assertions verified, 1 error
+
+Dafny program verifier finished with 1 assertions verified, 0 errors
+single-file.dfy(8,4): Error: assertion might not hold
+single-file.dfy(16,14): Error: loop invariant violation
+single-file.dfy(24,2): Error: assertion might not hold
+single-file.dfy(24,16): Error: assertion might not hold
+
+Dafny program verifier finished with 1 verified, 4 errors
+
+Dafny program verifier finished with 0 assertions verified, 0 errors
+
+Dafny program verifier finished with 0 verified, 0 errors
+single-file.dfy(8,4): Error: assertion might not hold
+
+Dafny program verifier finished with 3 assertions verified, 1 error
+
+Dafny program verifier finished with 1 assertions verified, 0 errors
+
+Dafny program verifier finished with 1 assertions verified, 0 errors
+single-file.dfy(8,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 assertions verified, 1 error
+
+Dafny program verifier finished with 1 assertions verified, 0 errors
+single-file.dfy(16,14): Error: loop invariant violation
+
+Dafny program verifier finished with 0 assertions verified, 1 error
+
+Dafny program verifier finished with 1 assertions verified, 0 errors
+single-file.dfy(24,2): Error: assertion might not hold
+single-file.dfy(24,16): Error: assertion might not hold
+
+Dafny program verifier finished with 0 assertions verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/issue4894.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/issue4894.dfy
new file mode 100644
index 00000000000..a92665305c3
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/issue4894.dfy
@@ -0,0 +1,39 @@
+// RUN: %verify %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+class C_2 {
+  var F_C_2_real_1: real
+  var F_C_2_real_2: real
+  var F_C_2_real_3: real
+  var F_C_2_bool_4: bool
+  var F_C_2_real_5: real
+  var F_C_2_bool_6: bool
+  constructor (F_C_2_real_1: real, F_C_2_real_2: real, F_C_2_real_3: real, F_C_2_bool_4: bool, F_C_2_real_5: real, F_C_2_bool_6: bool) {
+    this.F_C_2_real_1 := F_C_2_real_1;
+    this.F_C_2_real_2 := F_C_2_real_2;
+    this.F_C_2_real_3 := F_C_2_real_3;
+    this.F_C_2_bool_4 := F_C_2_bool_4;
+    this.F_C_2_real_5 := F_C_2_real_5;
+    this.F_C_2_bool_6 := F_C_2_bool_6;
+  }
+}
+
+method Main() returns ()
+{
+  var v_int_7: int := 0;
+  var v_int_8: int := 1;
+  while (v_int_7 < v_int_8)
+  {
+    v_int_7 := (v_int_7 + 1);
+    var v_C_2_1: C_2 := new C_2(-20.01, -22.48, -8.26, false, -5.90, false);
+    match 0 {
+      case _ => {
+        if false {
+          continue;
+        } else {
+          var v_C_2_8: C_2 := new C_2(-28.38, -28.94, 9.05, (2) is int, 0.35, v_C_2_1.F_C_2_bool_6);
+        }
+      }
+    }
+  }
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/issue4894.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/issue4894.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/issue4894.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/nonLinearArithmetic.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/nonLinearArithmetic.dfy
new file mode 100644
index 00000000000..83a50b795a4
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/nonLinearArithmetic.dfy
@@ -0,0 +1,105 @@
+// RUN: %verify "%s" --disable-nonlinear-arithmetic --allow-axioms --resource-limit 1e6 > "%t"
+// RUN: %verify "%s" --allow-axioms --resource-limit 1e6 >> "%t"
+// RUN: %diff "%s.expect" "%t"
+
+module Power0 {
+
+  opaque function Pow(b: int, e: nat): int
+    decreases e
+  {
+    if e == 0 then
+      1
+    else
+      b * Pow(b, e - 1)
+  }
+
+  /* Add exponents when multiplying powers with the same base. */
+  lemma LemmaPowAdds(b: int, e1: nat, e2: nat)
+    decreases e1
+    ensures Pow(b, e1 + e2) == Pow(b, e1) * Pow(b, e2)
+
+  lemma LemmaPowSubAddCancel(b: int, e1: nat, e2: nat)
+    decreases e1
+    requires e1 >= e2
+    ensures Pow(b, e1 - e2) * Pow(b, e2) == Pow(b, e1)
+  {
+    LemmaPowAdds(b, e1 - e2, e2);
+  }
+
+}
+
+module {:disableNonlinearArithmetic} Power1 {
+
+  opaque function Pow(b: int, e: nat): int
+    decreases e
+  {
+    if e == 0 then
+      1
+    else
+      b * Pow(b, e - 1)
+  }
+
+  /* Add exponents when multiplying powers with the same base. */
+  lemma LemmaPowAdds(b: int, e1: nat, e2: nat)
+    decreases e1
+    ensures Pow(b, e1 + e2) == Pow(b, e1) * Pow(b, e2)
+
+  lemma LemmaPowSubAddCancel(b: int, e1: nat, e2: nat)
+    decreases e1
+    requires e1 >= e2
+    ensures Pow(b, e1 - e2) * Pow(b, e2) == Pow(b, e1)
+  {
+    LemmaPowAdds(b, e1 - e2, e2);
+  }
+
+}
+module {:disableNonlinearArithmetic true} Power2 {
+
+  opaque function Pow(b: int, e: nat): int
+    decreases e
+  {
+    if e == 0 then
+      1
+    else
+      b * Pow(b, e - 1)
+  }
+
+  /* Add exponents when multiplying powers with the same base. */
+  lemma LemmaPowAdds(b: int, e1: nat, e2: nat)
+    decreases e1
+    ensures Pow(b, e1 + e2) == Pow(b, e1) * Pow(b, e2)
+
+  lemma LemmaPowSubAddCancel(b: int, e1: nat, e2: nat)
+    decreases e1
+    requires e1 >= e2
+    ensures Pow(b, e1 - e2) * Pow(b, e2) == Pow(b, e1)
+  {
+    LemmaPowAdds(b, e1 - e2, e2);
+  }
+
+}
+module {:disableNonlinearArithmetic false} Power3 {
+
+  opaque function Pow(b: int, e: nat): int
+    decreases e
+  {
+    if e == 0 then
+      1
+    else
+      b * Pow(b, e - 1)
+  }
+
+  /* Add exponents when multiplying powers with the same base. */
+  lemma LemmaPowAdds(b: int, e1: nat, e2: nat)
+    decreases e1
+    ensures Pow(b, e1 + e2) == Pow(b, e1) * Pow(b, e2)
+
+  lemma LemmaPowSubAddCancel(b: int, e1: nat, e2: nat)
+    decreases e1
+    requires e1 >= e2
+    ensures Pow(b, e1 - e2) * Pow(b, e2) == Pow(b, e1)
+  {
+    LemmaPowAdds(b, e1 - e2, e2);
+  }
+
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/nonLinearArithmetic.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/nonLinearArithmetic.dfy.expect
new file mode 100644
index 00000000000..9efe4297819
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/nonLinearArithmetic.dfy.expect
@@ -0,0 +1,4 @@
+
+Dafny program verifier finished with 16 verified, 0 errors
+
+Dafny program verifier finished with 16 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/outOfResourceAndIsolateAssertions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/outOfResourceAndIsolateAssertions.dfy
new file mode 100644
index 00000000000..34ab6377f30
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/outOfResourceAndIsolateAssertions.dfy
@@ -0,0 +1,13 @@
+// RUN: ! %verify --isolate-assertions --cores=1 --progress VerificationJobs "%s" &> %t.raw
+// RUN: %sed 's#\(time.*\)#<redacted>#g' %t.raw > %t
+// RUN: %diff "%s.expect" "%t"
+ghost function f(i:nat, j:nat):int {
+  if i == 0 then 0 else f(i - 1, i * j + 1) + f(i - 1, 2 * i * j)
+}
+lemma{:resource_limit 10000000} L()
+{
+  assert true;
+  assert f(10, 5) == 0; // runs out of resources
+  assert true;
+  assert f(10, 6) == 0; // runs out of resources
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/outOfResourceAndIsolateAssertions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/outOfResourceAndIsolateAssertions.dfy.expect
new file mode 100644
index 00000000000..cb406ca08a1
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/outOfResourceAndIsolateAssertions.dfy.expect
@@ -0,0 +1,24 @@
+Verified 0/2 symbols. Waiting for f to verify.
+Verified 1/10 of f: assertion at line 5 - verified successfully <redacted>
+Verified 2/10 of f: assertion at line 5 - verified successfully <redacted>
+Verified 3/10 of f: assertion at line 5 - verified successfully <redacted>
+Verified 4/10 of f: assertion at line 5 - verified successfully <redacted>
+Verified 5/10 of f: assertion at line 5 - verified successfully <redacted>
+Verified 6/10 of f: assertion at line 5 - verified successfully <redacted>
+Verified 7/10 of f: assertion at line 5 - verified successfully <redacted>
+Verified 8/10 of f: assertion at line 5 - verified successfully <redacted>
+Verified 9/10 of f: assertion at line 5 - verified successfully <redacted>
+Verified 10/10 of f: assertion at line 5 - verified successfully <redacted>
+Verified 1/2 symbols. Waiting for L to verify.
+Verified 1/8 of L: assertion at line 9 - verified successfully <redacted>
+Verified 2/8 of L: assertion at line 10 - verified successfully <redacted>
+Verified 3/8 of L: assertion at line 10 - verified successfully <redacted>
+Verified 4/8 of L: assertion at line 10 - ran out of resources <redacted>
+Verified 5/8 of L: assertion at line 11 - verified successfully <redacted>
+Verified 6/8 of L: assertion at line 12 - verified successfully <redacted>
+Verified 7/8 of L: assertion at line 12 - verified successfully <redacted>
+Verified 8/8 of L: assertion at line 12 - ran out of resources <redacted>
+outOfResourceAndIsolateAssertions.dfy(10,18): Error: Verification out of resource (L)
+outOfResourceAndIsolateAssertions.dfy(12,18): Error: Verification out of resource (L)
+
+Dafny program verifier finished with 16 verified, 0 errors, 2 out of resource
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/progress.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/progress.dfy
new file mode 100644
index 00000000000..94e159a8d36
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/progress.dfy
@@ -0,0 +1,20 @@
+// RUN: %verify --cores=1 --progress Symbol --isolate-assertions %s > %t
+// RUN: %diff "%s.expect" "%t"
+
+method Foo() 
+{
+  assert true;
+  assert true; 
+}
+
+method Faz() ensures true { }
+
+method Fopple() ensures true { }
+
+method Burp() 
+{
+  assert true; 
+  assert true;
+}
+
+method Blanc() ensures true { }
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/progress.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/progress.dfy.expect
new file mode 100644
index 00000000000..dda8ed15b63
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/progress.dfy.expect
@@ -0,0 +1,7 @@
+Verified 0/5 symbols. Waiting for Foo to verify.
+Verified 1/5 symbols. Waiting for Faz to verify.
+Verified 2/5 symbols. Waiting for Fopple to verify.
+Verified 3/5 symbols. Waiting for Burp to verify.
+Verified 4/5 symbols. Waiting for Blanc to verify.
+
+Dafny program verifier finished with 7 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAllAssertions.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAllAssertions.dfy
new file mode 100644
index 00000000000..2363f8d4aca
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAllAssertions.dfy
@@ -0,0 +1,22 @@
+// RUN: ! %verify --progress VerificationJobs --cores=1 %s &> %t.raw
+// RUN: %sed 's#\(time.*\)#<redacted>#g' %t.raw > %t
+// RUN: %diff "%s.expect" "%t"
+
+
+method {:isolate_assertions} Foo(x: int) returns (r: int) 
+  ensures r > 3
+  ensures r < 10 
+{
+  assert true;
+  assert true;
+  if (x == 3) {
+    return 7;
+  } else {
+    return 12;
+  }
+}
+
+method Bar() {
+  assert true;
+  assert true;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAllAssertions.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAllAssertions.dfy.expect
new file mode 100644
index 00000000000..9c0187038c8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAllAssertions.dfy.expect
@@ -0,0 +1,13 @@
+Verified 0/2 symbols. Waiting for Foo to verify.
+Verified 1/6 of Foo: assertion at line 10 - verified successfully <redacted>
+Verified 2/6 of Foo: assertion at line 11 - verified successfully <redacted>
+Verified 3/6 of Foo: return at line 15, assertion at line 7 - verified successfully <redacted>
+Verified 4/6 of Foo: return at line 15, assertion at line 8 - could not be verified <redacted>
+Verified 5/6 of Foo: return at line 13, assertion at line 7 - verified successfully <redacted>
+Verified 6/6 of Foo: return at line 13, assertion at line 8 - verified successfully <redacted>
+isolateAllAssertions.dfy(15,4): Error: a postcondition could not be proved on this return path
+isolateAllAssertions.dfy(8,12): Related location: this is the postcondition that could not be proved
+Verified 1/2 symbols. Waiting for Bar to verify.
+Verified 1/1 of Bar: entire body - verified successfully <redacted>
+
+Dafny program verifier finished with 6 verified, 1 error
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAssertionOrJump.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAssertionOrJump.dfy
new file mode 100644
index 00000000000..fee71516a8e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAssertionOrJump.dfy
@@ -0,0 +1,65 @@
+// RUN: ! %verify --progress VerificationJobs --cores=1 %s &> %t.raw
+// RUN: %sed 's#\(time.*\)#<redacted>#g' %t.raw > %t
+// RUN: %diff "%s.expect" "%t"
+
+method Assertion(x: int, y: int) returns (r: int) {
+  r := 0;
+  if x > 0 
+  { 
+    r := r + 1;
+  } else 
+  {
+    r := r + 2;
+  }
+  assert {:isolate} r > 2;
+  r := if r == 0 then r else r;
+  match y {
+    case 0 => 
+      r := r + 3;
+    case _ =>
+      r := r + 4;
+  }
+  assert {:isolate} r > 4;
+}
+
+
+method Return(x: int, y: int) returns (r: int)
+  ensures r > 1
+{
+  r := 0;
+  if x > 0 
+  { 
+    r := r + 1;
+  } else 
+  {
+    r := r + 2;
+  }
+
+  if (y > 0) {
+    return {:isolate};
+  }
+
+  var i := x;
+  while(i > 0) {
+    return {:isolate} 1;
+    i := i - 1;
+  }
+
+  return 1;
+}
+
+method Continue() {
+  var i := 3;
+  var r := 0;
+  while(i > 0)
+    invariant r < 3 - i + 1
+  {
+    i := i - 1;
+    if (i == 2) {
+      r := r + 2;
+      continue {:isolate};
+    } else {
+      r := r + 1;
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAssertionOrJump.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAssertionOrJump.dfy.expect
new file mode 100644
index 00000000000..cdecca24535
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolateAssertionOrJump.dfy.expect
@@ -0,0 +1,21 @@
+Verified 0/3 symbols. Waiting for Assertion to verify.
+Verified 1/2 of Assertion: assertion at line 14 - could not be verified <redacted>
+Verified 2/2 of Assertion: assertion at line 22 - verified successfully <redacted>
+isolateAssertionOrJump.dfy(14,2): Error: assertion might not hold
+Verified 1/3 symbols. Waiting for Return to verify.
+Verified 1/3 of Return: remaining assertions - could not be verified <redacted>
+Verified 2/3 of Return: return at line 44 - could not be verified <redacted>
+Verified 3/3 of Return: return at line 39 - could not be verified <redacted>
+isolateAssertionOrJump.dfy(28,0): Error: a postcondition could not be proved on this return path
+isolateAssertionOrJump.dfy(27,12): Related location: this is the postcondition that could not be proved
+isolateAssertionOrJump.dfy(39,4): Error: a postcondition could not be proved on this return path
+isolateAssertionOrJump.dfy(27,12): Related location: this is the postcondition that could not be proved
+isolateAssertionOrJump.dfy(44,4): Error: a postcondition could not be proved on this return path
+isolateAssertionOrJump.dfy(27,12): Related location: this is the postcondition that could not be proved
+Verified 2/3 symbols. Waiting for Continue to verify.
+Verified 1/2 of Continue: remaining assertions - verified successfully <redacted>
+Verified 2/2 of Continue: continue at line 60 - could not be verified <redacted>
+isolateAssertionOrJump.dfy(55,16): Error: this invariant could not be proved to be maintained by the loop
+ Related message: loop invariant violation
+
+Dafny program verifier finished with 2 verified, 5 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolatePaths.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolatePaths.dfy
new file mode 100644
index 00000000000..6fa6903cf5b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolatePaths.dfy
@@ -0,0 +1,42 @@
+// RUN: ! %verify --progress VerificationJobs --cores=1 %s &> %t.raw
+// RUN: %sed 's#\(time.*\)#<redacted>#g' %t.raw > %t
+// RUN: %diff "%s.expect" "%t"
+
+method Assertion(x: int, y: int) returns (r: int) {
+  r := 0;
+  if x > 0 
+  { 
+    r := r + 1;
+  } else 
+  {
+    r := r + 2;
+  }
+  r := if r == 0 then r else r;
+  match y {
+    case 0 => 
+      r := r + 3;
+    case _ =>
+      r := r + 4;
+  }
+  assert {:isolate "paths"} r > 4;
+}
+
+
+method Return(x: int, y: int) returns (r: int)
+  ensures r > 1
+{
+  r := 0;
+  if x > 0 
+  { 
+    r := r + 1;
+  } else 
+  {
+    r := r + 2;
+  }
+
+  if (y > 0) {
+    return {:isolate "paths"};
+  }
+
+  return 1;
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolatePaths.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolatePaths.dfy.expect
new file mode 100644
index 00000000000..739a50bb2af
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/proofDivision/isolatePaths.dfy.expect
@@ -0,0 +1,16 @@
+Verified 0/2 symbols. Waiting for Assertion to verify.
+Verified 1/4 of Assertion: assertion at line 21, after executing lines 8, 16 - could not be verified <redacted>
+Verified 2/4 of Assertion: assertion at line 21, after executing lines 8, 18 - verified successfully <redacted>
+Verified 3/4 of Assertion: assertion at line 21, after executing lines 11, 16 - verified successfully <redacted>
+Verified 4/4 of Assertion: assertion at line 21, after executing lines 11, 18 - verified successfully <redacted>
+isolatePaths.dfy(21,2): Error: assertion might not hold
+Verified 1/2 symbols. Waiting for Return to verify.
+Verified 1/3 of Return: remaining assertions - could not be verified <redacted>
+Verified 2/3 of Return: return at line 38, after executing lines 30 - could not be verified <redacted>
+Verified 3/3 of Return: return at line 38, after executing lines 33 - verified successfully <redacted>
+isolatePaths.dfy(27,0): Error: a postcondition could not be proved on this return path
+isolatePaths.dfy(26,12): Related location: this is the postcondition that could not be proved
+isolatePaths.dfy(38,4): Error: a postcondition could not be proved on this return path
+isolatePaths.dfy(26,12): Related location: this is the postcondition that could not be proved
+
+Dafny program verifier finished with 4 verified, 3 errors
diff --git a/Test/verification/relaxAssignmentEnforceDeterminism.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/relaxAssignmentEnforceDeterminism.dfy
similarity index 100%
rename from Test/verification/relaxAssignmentEnforceDeterminism.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/verification/relaxAssignmentEnforceDeterminism.dfy
diff --git a/Test/vstte2012/BreadthFirstSearch.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/BreadthFirstSearch.dfy
similarity index 84%
rename from Test/vstte2012/BreadthFirstSearch.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/BreadthFirstSearch.dfy
index 80bd735e11a..b983fa44e16 100644
--- a/Test/vstte2012/BreadthFirstSearch.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/BreadthFirstSearch.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class BreadthFirstSearch<Vertex(==)>
 {
@@ -26,21 +26,24 @@ class BreadthFirstSearch<Vertex(==)>
   // this method returns, as a ghost out-parameter, that existential
   // witness.  The method could equally well have been written using an
   // existential quantifier and no ghost out-parameter.
-  method {:rlimit 8000} BFS(source: Vertex, dest: Vertex, ghost AllVertices: set<Vertex>)
+  method
+    {:resource_limit "8e6"}
+    {:isolate_assertions}
+  BFS(source: Vertex, dest: Vertex, ghost AllVertices: set<Vertex>)
          returns (d: int, ghost path: List<Vertex>)
     // source and dest are among AllVertices
-    requires source in AllVertices && dest in AllVertices;
+    requires source in AllVertices && dest in AllVertices
     // AllVertices is closed under Succ
-    requires IsClosed(AllVertices);
+    requires IsClosed(AllVertices)
     // This method has two basic outcomes, as indicated by the sign of "d".
     // More precisely, "d" is non-negative iff "source" can reach "dest".
     // The following postcondition says that under the "0 <= d" outcome,
     // "path" denotes a path of length "d" from "source" to "dest":
-    ensures 0 <= d ==> IsPath(source, dest, path) && length(path) == d;
+    ensures 0 <= d ==> IsPath(source, dest, path) && length(path) == d
     // Moreover, that path is as short as any path from "source" to "dest":
-    ensures 0 <= d ==> forall p :: IsPath(source, dest, p) ==> length(path) <= length(p);
+    ensures 0 <= d ==> forall p :: IsPath(source, dest, p) ==> length(path) <= length(p)
     // Finally, under the outcome "d < 0", there is no path from "source" to "dest":
-    ensures d < 0 ==> !exists p :: IsPath(source, dest, p);
+    ensures d < 0 ==> !exists p :: IsPath(source, dest, p)
   {
     path := Nil; // avoid indefinite assignment errors
     var V, C, N := {source}, {source}, {};
@@ -60,30 +63,30 @@ class BreadthFirstSearch<Vertex(==)>
     assert {:split_here} true;
     while C != {}
       // V, Processed, C, N are all subsets of AllVertices:
-      invariant V <= AllVertices && Processed <= AllVertices && C <= AllVertices && N <= AllVertices;
+      invariant V <= AllVertices && Processed <= AllVertices && C <= AllVertices && N <= AllVertices
       // source is encountered:
-      invariant source in V;
+      invariant source in V
       // V is the disjoint union of Processed, C, and N:
-      invariant V == Processed + C + N;
-      invariant Processed !! C !! N;  // Processed, C, and N are mutually disjoint
+      invariant V == Processed + C + N
+      invariant Processed !! C !! N  // Processed, C, and N are mutually disjoint
       // "paths" records a path for every encountered vertex
-      invariant ValidMap(source, paths);
-      invariant V == paths.Keys;
+      invariant ValidMap(source, paths)
+      invariant V == paths.Keys
       // shortest paths for vertices in C have length d, and for vertices in N
       // have length d+1
-      invariant forall x :: x in C ==> length(Find(source, x, paths)) == d;
-      invariant forall x :: x in N ==> length(Find(source, x, paths)) == d + 1;
+      invariant forall x :: x in C ==> length(Find(source, x, paths)) == d
+      invariant forall x :: x in N ==> length(Find(source, x, paths)) == d + 1
       // "dest" is not reachable for any smaller value of "d":
-      invariant dest in R(source, d, AllVertices) ==> dest in C;
-      invariant d != 0 ==> dest !in R(source, d-1, AllVertices);
+      invariant dest in R(source, d, AllVertices) ==> dest in C
+      invariant d != 0 ==> dest !in R(source, d-1, AllVertices)
       // together, Processed and C are all the vertices reachable in at most d steps:
-      invariant Processed + C == R(source, d, AllVertices);
+      invariant Processed + C == R(source, d, AllVertices)
       // N are the successors of Processed that are not reachable within d steps:
-      invariant N == Successors(Processed, AllVertices) - R(source, d, AllVertices);
+      invariant N == Successors(Processed, AllVertices) - R(source, d, AllVertices)
       // if we have exhausted C, then we have also exhausted N:
-      invariant C == {} ==> N == {};
+      invariant C == {} ==> N == {}
       // variant:
-      decreases AllVertices - Processed;
+      decreases AllVertices - Processed
     {
       // remove a vertex "v" from "C"
       var v :| v in C;
@@ -94,7 +97,7 @@ class BreadthFirstSearch<Vertex(==)>
 
       if v == dest {
         forall p | IsPath(source, dest, p)
-          ensures length(pathToV) <= length(p);
+          ensures length(pathToV) <= length(p)
         {
           reveal R();
           Lemma_IsPath_R(source, dest, p, AllVertices);
@@ -131,7 +134,7 @@ class BreadthFirstSearch<Vertex(==)>
     // show that "dest" in not in any reachability set, no matter
     // how many successors one follows
     forall n: nat
-      ensures dest !in R(source, n, AllVertices);
+      ensures dest !in R(source, n, AllVertices)
     {
       reveal R();
       if n < d {
@@ -146,7 +149,7 @@ class BreadthFirstSearch<Vertex(==)>
     forall p | IsPath(source, dest, p)
       // this and the previous two lines will establish the
       // absurdity of a "p" satisfying IsPath(source, dest, p)
-      ensures false;
+      ensures false
     {
       reveal R();
       Lemma_IsPath_R(source, dest, p, AllVertices);
@@ -162,8 +165,8 @@ class BreadthFirstSearch<Vertex(==)>
 
   lemma Lemma_IsPath_Closure(source: Vertex, dest: Vertex,
                              p: List<Vertex>, AllVertices: set<Vertex>)
-    requires IsPath(source, dest, p) && source in AllVertices && IsClosed(AllVertices);
-    ensures dest in AllVertices && forall v :: v in elements(p) ==> v in AllVertices;
+    requires IsPath(source, dest, p) && source in AllVertices && IsClosed(AllVertices)
+    ensures dest in AllVertices && forall v :: v in elements(p) ==> v in AllVertices
   {
     match p {
       case Nil =>
@@ -186,9 +189,9 @@ class BreadthFirstSearch<Vertex(==)>
   }
 
   lemma RMonotonicity(source: Vertex, m: nat, n: nat, AllVertices: set<Vertex>)
-    requires m <= n;
-    ensures R(source, m, AllVertices) <= R(source, n, AllVertices);
-    decreases n - m;
+    requires m <= n
+    ensures R(source, m, AllVertices) <= R(source, n, AllVertices)
+    decreases n - m
   {
     reveal R();
     if m < n {
@@ -196,11 +199,11 @@ class BreadthFirstSearch<Vertex(==)>
     }
   }
 
-  lemma {:vcs_split_on_every_assert} IsReachFixpoint(source: Vertex, m: nat, n: nat, AllVertices: set<Vertex>)
-    requires R(source, m, AllVertices) == R(source, m+1, AllVertices);
-    requires m <= n;
-    ensures R(source, m, AllVertices) == R(source, n, AllVertices);
-    decreases n - m;
+  lemma {:isolate_assertions} IsReachFixpoint(source: Vertex, m: nat, n: nat, AllVertices: set<Vertex>)
+    requires R(source, m, AllVertices) == R(source, m+1, AllVertices)
+    requires m <= n
+    ensures R(source, m, AllVertices) == R(source, n, AllVertices)
+    decreases n - m
   {
     reveal R();
     if m < n {
@@ -209,8 +212,8 @@ class BreadthFirstSearch<Vertex(==)>
   }
 
   lemma Lemma_IsPath_R(source: Vertex, x: Vertex, p: List<Vertex>, AllVertices: set<Vertex>)
-    requires IsPath(source, x, p) && source in AllVertices && IsClosed(AllVertices);
-    ensures x in R(source, length(p), AllVertices);
+    requires IsPath(source, x, p) && source in AllVertices && IsClosed(AllVertices)
+    ensures x in R(source, length(p), AllVertices)
   {
     reveal R();
     match p {
@@ -229,8 +232,8 @@ class BreadthFirstSearch<Vertex(==)>
   }
 
   ghost function Find(source: Vertex, x: Vertex, m: map<Vertex, List<Vertex>>): List<Vertex>
-    requires ValidMap(source, m) && x in m;
-    ensures IsPath(source, x, Find(source, x, m));
+    requires ValidMap(source, m) && x in m
+    ensures IsPath(source, x, Find(source, x, m))
   {
     m[x]
   }
@@ -238,13 +241,13 @@ class BreadthFirstSearch<Vertex(==)>
   ghost method UpdatePaths(vSuccs: set<Vertex>, source: Vertex,
                            paths: map<Vertex, List<Vertex>>, v: Vertex, pathToV: List<Vertex>)
                returns (newPaths: map<Vertex, List<Vertex>>)
-    requires ValidMap(source, paths);
-    requires vSuccs !! paths.Keys;
-    requires forall succ :: succ in vSuccs ==> IsPath(source, succ, Cons(v, pathToV));
-    ensures ValidMap(source, newPaths) && newPaths.Keys == paths.Keys + vSuccs;
+    requires ValidMap(source, paths)
+    requires vSuccs !! paths.Keys
+    requires forall succ :: succ in vSuccs ==> IsPath(source, succ, Cons(v, pathToV))
+    ensures ValidMap(source, newPaths) && newPaths.Keys == paths.Keys + vSuccs
     ensures forall x :: x in paths ==>
-                        Find(source, x, paths) == Find(source, x, newPaths);
-    ensures forall x :: x in vSuccs ==> Find(source, x, newPaths) == Cons(v, pathToV);
+                        Find(source, x, paths) == Find(source, x, newPaths)
+    ensures forall x :: x in vSuccs ==> Find(source, x, newPaths) == Cons(v, pathToV)
   {
     if vSuccs == {} {
       newPaths := paths;
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/BreadthFirstSearch.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/BreadthFirstSearch.dfy.expect
new file mode 100644
index 00000000000..6252fafc31c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/BreadthFirstSearch.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 148 verified, 0 errors
diff --git a/Test/vstte2012/Combinators.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Combinators.dfy
similarity index 99%
rename from Test/vstte2012/Combinators.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Combinators.dfy
index 3dfb40a0806..4cc6377bbfd 100644
--- a/Test/vstte2012/Combinators.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Combinators.dfy
@@ -1,4 +1,4 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
+// RUN: %verify --relax-definite-assignment --allow-deprecation "%s" > "%t"
 // RUN: %diff "%s.expect" "%t"
 
 // Problem 2 concerns an interpreter for the language of S and K combinators.
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Combinators.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Combinators.dfy.expect
new file mode 100644
index 00000000000..2532f627752
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Combinators.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 26 verified, 0 errors
diff --git a/Test/vstte2012/RingBuffer.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBuffer.dfy
similarity index 96%
rename from Test/vstte2012/RingBuffer.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBuffer.dfy
index 034e51108a4..7e08c4ef5f8 100644
--- a/Test/vstte2012/RingBuffer.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBuffer.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class RingBuffer<T(0)>
 {
diff --git a/Test/vstte2012/RingBuffer.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBuffer.dfy.expect
similarity index 100%
rename from Test/vstte2012/RingBuffer.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBuffer.dfy.expect
diff --git a/Test/vstte2012/RingBufferAuto.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBufferAuto.dfy
similarity index 96%
rename from Test/vstte2012/RingBufferAuto.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBufferAuto.dfy
index 025ce17aed7..8712acf4e29 100644
--- a/Test/vstte2012/RingBufferAuto.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBufferAuto.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 class {:autocontracts} RingBuffer<T(0)>
 {
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBufferAuto.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBufferAuto.dfy.expect
new file mode 100644
index 00000000000..023f9ca2415
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/RingBufferAuto.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 13 verified, 0 errors
diff --git a/Test/vstte2012/Tree.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Tree.dfy
similarity index 96%
rename from Test/vstte2012/Tree.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Tree.dfy
index c3093371411..37bb623175e 100644
--- a/Test/vstte2012/Tree.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Tree.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // The tree datatype
 datatype Tree = Leaf | Node(Tree, Tree)
@@ -40,7 +40,7 @@ ghost function toList(d: int, t: Tree): seq<int>
 // property; converting the resulting tree back into a
 // sequence yields exactly that portion of the input
 // sequence that has been consumed.
-function {:vcs_split_on_every_assert} build_rec(d: int, s: seq<int>): Result
+function {:isolate_assertions} build_rec(d: int, s: seq<int>): Result
   ensures build_rec(d, s).Res? ==>
             |build_rec(d, s).sOut| < |s| &&
             build_rec(d, s).sOut == s[|s|-|build_rec(d, s).sOut|..]
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Tree.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Tree.dfy.expect
new file mode 100644
index 00000000000..2f021147f08
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Tree.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 67 verified, 0 errors
diff --git a/Test/vstte2012/Two-Way-Sort.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Two-Way-Sort.dfy
similarity index 95%
rename from Test/vstte2012/Two-Way-Sort.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Two-Way-Sort.dfy
index ef1850d4393..0ef047b61db 100644
--- a/Test/vstte2012/Two-Way-Sort.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Two-Way-Sort.dfy
@@ -1,5 +1,5 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver "%s"
+
 
 // This method is a slight generalization of the
 // code provided in the problem statement since it
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Two-Way-Sort.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Two-Way-Sort.dfy.expect
new file mode 100644
index 00000000000..ba00363fc08
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/vstte2012/Two-Way-Sort.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 4 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FuelTriggers.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FuelTriggers.dfy
new file mode 100755
index 00000000000..c0ffaf08ab8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FuelTriggers.dfy
@@ -0,0 +1,19 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+// THIS USED TO BE THE CASE:
+//
+//     With the default version of opaque + fuel, the following fails to verify
+//     because the quantifier in the requires used a trigger that included
+//     StartFuel_P, while the assert used StartFuelAssert_P.  Since P is
+//     opaque, we can't tell that those fuels are the same, and hence the
+//     trigger never fires. A wish would be to fix this.
+//
+// This has been fixed, so the test assertion is now passing.
+
+opaque ghost predicate P(x:int)
+
+method Test(y:int)
+  requires forall x :: P(x)
+{
+  assert P(y);
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FuelTriggers.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FuelTriggers.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FuelTriggers.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/wishlist/FunctionEquality.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FunctionEquality.dfy
similarity index 82%
rename from Test/wishlist/FunctionEquality.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FunctionEquality.dfy
index ee55cd11c51..85b3ca10cfd 100644
--- a/Test/wishlist/FunctionEquality.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FunctionEquality.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 function Const<A,B>(a : A) : B -> A {
   b => a
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FunctionEquality.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FunctionEquality.dfy.expect
new file mode 100644
index 00000000000..02aff987e5e
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/FunctionEquality.dfy.expect
@@ -0,0 +1,6 @@
+FunctionEquality.dfy(11,4): Error: assertion might not hold
+FunctionEquality.dfy(13,4): Error: assertion might not hold
+FunctionEquality.dfy(15,4): Error: assertion might not hold
+FunctionEquality.dfy(19,4): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Test/wishlist/GoModule.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/GoModule.dfy
similarity index 83%
rename from Test/wishlist/GoModule.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/GoModule.dfy
index 708d58049ae..338c167d0e2 100644
--- a/Test/wishlist/GoModule.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/GoModule.dfy
@@ -1,8 +1,7 @@
 // NONUNIFORM: Go-specific extern test
-// RUN: %exits-with 3 %dafny /compile:3 /unicodeChar:0 /spillTargetCode:2 "%s" /compileTarget:go 2> "%t"
-// note: putting /compileTarget:go after "%s" overrides user-provided option
+// RUN: %exits-with 3 %run --allow-external-contracts --target go "%s" &> "%t"
 // RUN: %OutputCheck --file-to-check "%t" "%s"
-// CHECK: GoModuleConversions.go:10:3: "net/url" imported and not used
+// CHECK: undefined: m_GoModuleConversions.ParseURL
 
 // This test used to work only because of a questionable Go-only feature
 // of mapping a Dafny string directly to a Go string when passed in or out of
@@ -19,7 +18,7 @@
 
 // "url" is a built-in package, so it should be accessible to the
 // test suite without further requirements on the setup.
-module {:extern "url", "net/url"} URL {
+module {:extern "url", "net/url"} {:dummyImportMember "URL", true} URL {
 
   class URL {
     var {:extern "Host"} host: string
@@ -30,7 +29,7 @@ module {:extern "url", "net/url"} URL {
   trait {:extern "", "error"} Error { }
 }
 
-module {:extern "GoModuleConversions"} GoModuleConversions {
+module {:extern "GoModuleConversions"} {:dummyImportMember "ParseURL", false} GoModuleConversions {
   import opened URL
   method {:extern "ParseURL"} Parse(address: string) returns (url: URL, error: Error?)
 }
diff --git a/Test/wishlist/GoModuleConversions.go b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/GoModuleConversions.go
similarity index 100%
rename from Test/wishlist/GoModuleConversions.go
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/GoModuleConversions.go
diff --git a/Test/wishlist/assign-such-that-antecedent.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/assign-such-that-antecedent.dfy
similarity index 81%
rename from Test/wishlist/assign-such-that-antecedent.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/assign-such-that-antecedent.dfy
index 82755052e7e..3bec76117a6 100644
--- a/Test/wishlist/assign-such-that-antecedent.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/assign-such-that-antecedent.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // It would be great if Dafny would use a/b as a possible witness when trying to
 // establish the existential in M.
diff --git a/Test/wishlist/assign-such-that-antecedent.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/assign-such-that-antecedent.dfy.expect
similarity index 75%
rename from Test/wishlist/assign-such-that-antecedent.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/assign-such-that-antecedent.dfy.expect
index 898aa433767..786fe979278 100644
--- a/Test/wishlist/assign-such-that-antecedent.dfy.expect
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/assign-such-that-antecedent.dfy.expect
@@ -1,4 +1,4 @@
 assign-such-that-antecedent.dfy(8,8): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-assign-such-that-antecedent.dfy(13,9): Error: assertion could not be proved
+assign-such-that-antecedent.dfy(13,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 2 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/exists-b-exists-not-b.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/exists-b-exists-not-b.dfy
new file mode 100644
index 00000000000..4894ac02511
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/exists-b-exists-not-b.dfy
@@ -0,0 +1,10 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+
+// It would be great if Dafny was able to verify the following statements;
+// otherwise, trigger splitting prevents `exists b :: b || not b` from verifying
+
+method M() {
+  assert exists b : bool {:nowarn} :: b; // WISH
+  assert exists b : bool {:nowarn} :: !b; // WISH
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/exists-b-exists-not-b.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/exists-b-exists-not-b.dfy.expect
new file mode 100644
index 00000000000..908675b3b47
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/exists-b-exists-not-b.dfy.expect
@@ -0,0 +1,4 @@
+exists-b-exists-not-b.dfy(8,2): Error: assertion might not hold
+exists-b-exists-not-b.dfy(9,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/strings.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/strings.dfy
new file mode 100644
index 00000000000..57fb7041a6d
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/strings.dfy
@@ -0,0 +1,6 @@
+// RUN: %testDafnyForEachResolver "%s"
+
+
+method EqualityOfStrings() {
+  assert "a" != "b"; // WISH -- granted
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/strings.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/strings.dfy.expect
new file mode 100644
index 00000000000..823a60a105c
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/strings.dfy.expect
@@ -0,0 +1,2 @@
+
+Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/useless-casts-in-decreases-clauses.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/useless-casts-in-decreases-clauses.dfy
new file mode 100644
index 00000000000..677638208cc
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/useless-casts-in-decreases-clauses.dfy
@@ -0,0 +1,9 @@
+// RUN: %verify --show-hints "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+method M() {
+  var pos := 10;
+  while (pos > 0) { // This shouldn't print int(pos) - int(0); pos - 0 would be better
+    pos := pos - 1;
+  }
+}
diff --git a/Test/wishlist/granted/useless-casts-in-decreases-clauses.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/useless-casts-in-decreases-clauses.dfy.expect
similarity index 100%
rename from Test/wishlist/granted/useless-casts-in-decreases-clauses.dfy.expect
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/granted/useless-casts-in-decreases-clauses.dfy.expect
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/naked-function-in-recursive-setting.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/naked-function-in-recursive-setting.dfy
new file mode 100644
index 00000000000..c8b94e8f4cd
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/naked-function-in-recursive-setting.dfy
@@ -0,0 +1,13 @@
+// RUN: %exits-with 2 %verify --show-hints "%s" > "%t"
+// RUN: %diff "%s.expect" "%t"
+
+ghost function fact(n: int): int
+  requires n >= 0
+{
+  if n == 0 then
+    1
+  else (
+    assert fact.requires(n-1); //WISH
+    n * fact(n-1)
+  )
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/naked-function-in-recursive-setting.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/naked-function-in-recursive-setting.dfy.expect
new file mode 100644
index 00000000000..87ee58bf218
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/naked-function-in-recursive-setting.dfy.expect
@@ -0,0 +1,3 @@
+naked-function-in-recursive-setting.dfy(4,15): Info: auto-accumulator tail recursive
+naked-function-in-recursive-setting.dfy(10,11): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
+1 resolution/type errors detected in naked-function-in-recursive-setting.dfy
diff --git a/Test/wishlist/sequences-literals.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-literals.dfy
similarity index 97%
rename from Test/wishlist/sequences-literals.dfy
rename to Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-literals.dfy
index d510c7bd86e..94a312fdddd 100644
--- a/Test/wishlist/sequences-literals.dfy
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-literals.dfy
@@ -1,5 +1,5 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
 
 // Note: in the tests below, it could be useful to experiment with the
 // following triggers for some of the library axioms:
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-literals.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-literals.dfy.expect
new file mode 100644
index 00000000000..f8465a97e4b
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-literals.dfy.expect
@@ -0,0 +1,6 @@
+sequences-literals.dfy(23,2): Error: assertion might not hold
+sequences-literals.dfy(44,2): Error: assertion might not hold
+sequences-literals.dfy(61,2): Error: assertion might not hold
+sequences-literals.dfy(76,2): Error: assertion might not hold
+
+Dafny program verifier finished with 4 verified, 4 errors
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-s0-in-s.dfy b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-s0-in-s.dfy
new file mode 100644
index 00000000000..8d6385721d8
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-s0-in-s.dfy
@@ -0,0 +1,29 @@
+// RUN: %testDafnyForEachResolver --expect-exit-code=4 "%s"
+
+// The following is also due to a weakness in the axiomatization: namely, it is
+// not easy to learn, using Dafny's axioms, that "s[0] in s". One can of course
+// prove it, but it doesn't come for free.
+
+method InSeqTriggers(s: seq<int>, i: nat)
+  requires forall x :: x in s ==> x > 0
+  requires |s| > 0
+{
+  // Fails
+  assert s[0] > 0; // WISH
+}
+
+method ManualProof(s: seq<int>, i: nat)
+  requires forall x :: x in s ==> x > 0
+  requires |s| > 0
+{
+  // Works
+  assert s[0] in s;
+  assert s[0] > 0;
+}
+
+method InSeqNoAutoTriggers(s: seq<int>, i: nat)
+  requires forall x {:trigger} :: x in s ==> x > 0 // explicitly requests no matching patterns
+  requires |s| > 0
+{
+  assert s[0] > 0; // Works (Z3 matches on $Box above)
+}
diff --git a/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-s0-in-s.dfy.expect b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-s0-in-s.dfy.expect
new file mode 100644
index 00000000000..f46380d2ff0
--- /dev/null
+++ b/Source/IntegrationTests/TestFiles/LitTests/LitTest/wishlist/sequences-s0-in-s.dfy.expect
@@ -0,0 +1,3 @@
+sequences-s0-in-s.dfy(12,2): Error: assertion might not hold
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/Source/IntegrationTests/coverlet.runsettings b/Source/IntegrationTests/coverlet.runsettings
new file mode 100644
index 00000000000..e2ee114db35
--- /dev/null
+++ b/Source/IntegrationTests/coverlet.runsettings
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat Code Coverage">
+        <Configuration>
+          <Exclude>[*]DAST.*,[*]DCOMP.*</Exclude>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+  <xUnit>
+    <!-- 
+    Important to disable the reporter auto-discovery
+    because we have a ton of classes in this project,
+    especially those generated from Dafny,
+    which can cause close to an hour delay before starting any tests!
+    See https://github.com/xunit/xunit/issues/2549.
+    -->
+    <NoAutoReporters>true</NoAutoReporters>
+  </xUnit>
+</RunSettings>
diff --git a/Source/Scripts/Program.cs b/Source/Scripts/Program.cs
new file mode 100644
index 00000000000..a680ca8b4d4
--- /dev/null
+++ b/Source/Scripts/Program.cs
@@ -0,0 +1,13 @@
+using System.CommandLine;
+using System.CommandLine.Builder;
+using System.CommandLine.Parsing;
+
+namespace IntegrationTests;
+
+public class Program {
+  public static Task Main(string[] args) {
+    var root = new RootCommand("Various scripts that help develop Dafny");
+    root.AddCommand(UpdateTests.GetCommand());
+    return root.InvokeAsync(args);
+  }
+}
\ No newline at end of file
diff --git a/Source/Scripts/README.md b/Source/Scripts/README.md
new file mode 100644
index 00000000000..7aad6575c3a
--- /dev/null
+++ b/Source/Scripts/README.md
@@ -0,0 +1,2 @@
+Contains various scripts for developing Dafny. New scripts can be added by adding System.CommandLine commands.
+You can invoke these scripts using `dotnet run --project Source/Scripts <command-name> <command-arguments>`
\ No newline at end of file
diff --git a/Source/Scripts/Scripts.csproj b/Source/Scripts/Scripts.csproj
new file mode 100644
index 00000000000..bc3f09d58c3
--- /dev/null
+++ b/Source/Scripts/Scripts.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    </ItemGroup>
+
+</Project>
diff --git a/Source/Scripts/UpdateTests.cs b/Source/Scripts/UpdateTests.cs
new file mode 100644
index 00000000000..70d0c11c81e
--- /dev/null
+++ b/Source/Scripts/UpdateTests.cs
@@ -0,0 +1,76 @@
+using System.CommandLine;
+using System.Diagnostics;
+using System.IO.Compression;
+using System.Text.RegularExpressions;
+
+namespace IntegrationTests;
+
+public class UpdateTests {
+
+  public static Command GetCommand() {
+    var result = new Command("update-expect-files", "Use the 'log archive' file downloaded from CI to update the integration tests");
+    var fileArgument = new Argument<FileInfo>();
+    result.AddArgument(fileArgument);
+    result.SetHandler(file => Handle(file.Name), fileArgument);
+    return result;
+  }
+
+  public static async Task Handle(string file) {
+    Environment.SetEnvironmentVariable("DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE", "true");
+
+    await using var zipFile = new FileStream(file, FileMode.Open);
+    using var archive = new ZipArchive(zipFile, ZipArchiveMode.Read);
+    var integrationFiles = archive.Entries.Where(entry => {
+      var fileName = entry.Name;
+      var regex = new Regex(@"\d+_integration-tests");
+      var match = regex.Match(fileName);
+      return match.Success;
+    });
+    var failedTestNames = integrationFiles.SelectMany(entry => {
+      var content = new StreamReader(entry.Open()).ReadToEnd();
+      var regex = new Regex(@"Failed (.*) \[");
+      var matches = regex.Matches(content);
+      return matches.Select(m => m.Groups[1].Value);
+    }).ToList();
+
+    string? repoRoot = Directory.GetCurrentDirectory();
+    while (repoRoot != null) {
+      var currentFiles = Directory.GetDirectories(repoRoot);
+      if (currentFiles.Any(f => Path.GetFileName(f) == ".git")) {
+        break;
+      }
+
+      repoRoot = Path.GetDirectoryName(repoRoot)!;
+    }
+
+    Console.WriteLine($"Tests to update:\n{string.Join("\n", failedTestNames)}\n");
+
+    var needsBuilds = true;
+    for (var index = 0; index < failedTestNames.Count; index++) {
+      var failedTestName = failedTestNames[index];
+      Console.WriteLine($"Updating test {index + 1}/{failedTestNames.Count} '{failedTestName}'");
+      var integrationTestsDir = $"{repoRoot}/Source/IntegrationTests";
+      var arguments = new List<string> { "test", integrationTestsDir, $"--filter=DisplayName~{failedTestName}" };
+      if (!needsBuilds) {
+        arguments.Add("--no-build");
+      }
+      needsBuilds = false;
+      var process = Process.Start(
+        new ProcessStartInfo("dotnet", arguments) {
+          RedirectStandardOutput = true,
+          RedirectStandardError = true,
+          WorkingDirectory = repoRoot,
+        })!;
+      var outputTask = process.StandardOutput.ReadToEndAsync();
+      var errorTask = process.StandardError.ReadToEndAsync();
+      await process.WaitForExitAsync();
+      var output = await outputTask;
+      var error = await errorTask;
+      var exitCode = process.ExitCode;
+      if (exitCode != 0) {
+        await Console.Error.WriteLineAsync($"Non-zero exit code. Output:\n{output}\nError:{error}");
+        throw new Exception("Non-zero exit code");
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Source/TestDafny/MultiBackendTest.cs b/Source/TestDafny/MultiBackendTest.cs
index d7c3b9b22e4..ea81a97689c 100644
--- a/Source/TestDafny/MultiBackendTest.cs
+++ b/Source/TestDafny/MultiBackendTest.cs
@@ -22,8 +22,14 @@ public class ForEachCompilerOptions {
   [Value(1, MetaName = "Dafny CLI arguments", HelpText = "Any arguments following '--' will be passed to the dafny CLI unaltered.")]
   public IEnumerable<string> OtherArgs { get; set; } = Array.Empty<string>();
 
+  [Option("run-fails", HelpText = "Whether the running program should return a non-zero exit code")]
+  public bool RunShouldFail { get; set; } = false;
+
   [Option("refresh-exit-code", HelpText = "If present, also run with --type-system-refresh and expect the given exit code.")]
   public int? RefreshExitCode { get; set; } = null;
+
+  [Option("compilers", HelpText = "Test on only the given compilers.")]
+  public string? Compilers { get; set; } = null;
 }
 
 [Verb("features", HelpText = "Print the Markdown content documenting feature support for each compiler.")]
@@ -57,25 +63,31 @@ public class MultiBackendTest {
   private readonly TextWriter output;
   private readonly TextWriter errorWriter;
 
+  private static readonly string? IntegrationTestsRootDir =
+    Environment.GetEnvironmentVariable("DAFNY_INTEGRATION_TESTS_ROOT_DIR");
+  private static readonly bool UpdateTargetExpectFile = DiffCommand.UpdateExpectFile;
+
   public MultiBackendTest(TextReader input, TextWriter output, TextWriter errorWriter) {
     this.input = input;
     this.output = output;
     this.errorWriter = errorWriter;
   }
 
-  public static int Main(string[] args) {
+  public static Task<int> Main(string[] args) {
     return new MultiBackendTest(Console.In, Console.Out, Console.Error).Start(args.ToList());
   }
 
-  public int Start(IEnumerable<string> args) {
-    var result = -1;
+  public Task<int> Start(IEnumerable<string> args) {
+    var result = Task.FromResult(-1);
     var parser = new CommandLine.Parser(with => {
       with.EnableDashDash = true;
       with.HelpWriter = errorWriter;
     });
     var parseResult = parser.ParseArguments<ForEachCompilerOptions, FeaturesOptions, ForEachResolverOptions>(args);
+#pragma warning disable VSTHRD002
     parseResult.WithParsed<ForEachCompilerOptions>(options => { result = ForEachCompiler(options); })
-      .WithParsed<FeaturesOptions>(options => { result = GenerateCompilerTargetSupportTable(options); })
+#pragma warning restore VSTHRD002
+      .WithParsed<FeaturesOptions>(options => { result = Task.FromResult(GenerateCompilerTargetSupportTable(options)); })
       .WithParsed<ForEachResolverOptions>(options => { result = ForEachResolver(options); });
 
     return result;
@@ -94,10 +106,18 @@ record ResolutionSetting(
     int ExpectedExitCode
   );
 
-  private int ForEachCompiler(ForEachCompilerOptions options) {
-    var parseResult = CommandRegistry.Create(TextWriter.Null, TextWriter.Null, TextReader.Null,
-      new string[] { "verify", options.TestFile! }.Concat(options.OtherArgs).ToArray());
-    var dafnyOptions = ((ParseArgumentSuccess)parseResult).DafnyOptions;
+  private async Task<int> ForEachCompiler(ForEachCompilerOptions options) {
+    var pluginParseResult = CommonOptionBag.PluginOption.Parse(options.OtherArgs.ToArray());
+    var pluginArguments = pluginParseResult.GetValueForOption(CommonOptionBag.PluginOption);
+    var plugins = DafnyOptions.ComputePlugins(new List<Plugin>(), pluginArguments ?? new List<string>());
+
+    string rawCompilerFilter = options.Compilers ??
+                               Environment.GetEnvironmentVariable("DAFNY_INTEGRATION_TESTS_ONLY_COMPILERS")
+                               ?? "";
+    string[] compilerFilter = rawCompilerFilter
+      .Split(",")
+      .Where(name => name.Trim() != "").ToArray();
+
 
     // First verify the file (and assume that verification should be successful).
     // Older versions of test files that now use %testDafnyForEachCompiler were sensitive to the number
@@ -116,14 +136,14 @@ private int ForEachCompiler(ForEachCompilerOptions options) {
       $"verify",
       options.TestFile!,
       $"--print:{tmpDPrint}",
-      $"--rprint:{tmpRPrint}",
+      options.OtherArgs.Any(option => option.StartsWith("--print")) ? "" : $"--rprint:{tmpRPrint}",
       $"--bprint:{tmpPrint}"
-    }.Concat(options.OtherArgs.Where(OptionAppliesToVerifyCommand)).ToArray();
+    }.Concat(DafnyCliTests.NewDefaultArgumentsForTesting).ToArray();
 
     var resolutionOptions = new List<ResolutionSetting>() {
       new ResolutionSetting(
         "legacy",
-        new string[] { },
+        new string[] { "--type-system-refresh=false", "--general-traits=legacy", "--general-newtypes=false" },
         new string[] { ".verifier.expect" },
         0)
     };
@@ -136,10 +156,15 @@ private int ForEachCompiler(ForEachCompilerOptions options) {
           (int)options.RefreshExitCode)
       );
     }
+
     foreach (var resolutionOption in resolutionOptions) {
-      var (exitCode, outputString, error) = RunDafny(options.DafnyCliPath, dafnyArgs.Concat(resolutionOption.AdditionalOptions));
+      await output.WriteLineAsync($"Using {resolutionOption.ReadableName} resolver and verifying...");
 
-      output.WriteLine($"Using {resolutionOption.ReadableName} resolver and verifying...");
+      var arguments = dafnyArgs
+        .Concat(resolutionOption.AdditionalOptions)
+        .Concat(options.OtherArgs.Where(OptionAppliesToVerifyCommand))
+        .ToArray();
+      var (exitCode, outputString, error) = await RunDafny(options.DafnyCliPath, arguments);
 
       // If there is a file with extension "suffix", where the alternatives for "suffix" are supplied in order in
       // ExpectFileSuffixes, then we expect the output to match the contents of that file. Otherwise, we expect the output to be empty.
@@ -147,25 +172,27 @@ private int ForEachCompiler(ForEachCompilerOptions options) {
       foreach (var expectFileSuffix in resolutionOption.ExpectFileSuffixes) {
         var expectFileForVerifier = $"{options.TestFile}{expectFileSuffix}";
         if (File.Exists(expectFileForVerifier)) {
-          expectedOutput = File.ReadAllText(expectFileForVerifier);
+          expectedOutput = await File.ReadAllTextAsync(expectFileForVerifier);
           break;
         }
       }
+
       // Chop off the "Dafny program verifier finished with..." trailer
       var trailer = new Regex("\r?\nDafny program verifier[^\r\n]*\r?\n").Match(outputString);
       var actualOutput = outputString.Remove(trailer.Index, trailer.Length);
       var diffMessage = AssertWithDiff.GetDiffMessage(expectedOutput, actualOutput);
       if (diffMessage != null) {
-        output.WriteLine(diffMessage);
+        await output.WriteLineAsync(diffMessage);
         return 1;
       }
 
       // We expect verification to return exit code 0.
       if (exitCode != resolutionOption.ExpectedExitCode) {
-        output.WriteLine($"Verification failed with exit code {exitCode} (expected {resolutionOption.ExpectedExitCode}). Output:");
-        output.WriteLine(outputString);
-        output.WriteLine("Error:");
-        output.WriteLine(error);
+        await output.WriteLineAsync(
+          $"Verification failed with exit code {exitCode} (expected {resolutionOption.ExpectedExitCode}). Output:");
+        await output.WriteLineAsync(outputString);
+        await output.WriteLineAsync("Error:");
+        await output.WriteLineAsync(error);
         return exitCode != 0 ? exitCode : 1;
       }
     }
@@ -173,50 +200,77 @@ private int ForEachCompiler(ForEachCompilerOptions options) {
     // Then execute the program for each available compiler.
 
     string expectFile = options.TestFile + ".expect";
-    var commonExpectedOutput = File.ReadAllText(expectFile);
+    var commonExpectedOutput = await File.ReadAllTextAsync(expectFile);
 
     var success = true;
-    foreach (var plugin in dafnyOptions.Plugins) {
-      foreach (var compiler in plugin.GetCompilers(dafnyOptions)) {
-        if (!compiler.IsStable) {
-          // Some tests still fail when using the lib back-end, for example due to disallowed assumptions being present in the test,
-          // Such as empty constructors with ensures clauses, generated from iterators
+    foreach (var plugin in plugins) {
+      foreach (var compiler in plugin.GetCompilers(DafnyOptions.Default)) {
+        if (!compiler.IsStable || compilerFilter.Any() && !compilerFilter.Contains(compiler.TargetId)) {
           continue;
         }
 
         // Check for backend-specific exceptions (because of known bugs or inconsistencies)
         var expectedOutput = commonExpectedOutput;
         string? checkFile = null;
-        var expectFileForBackend = $"{options.TestFile}.{compiler.TargetId}.expect";
+        var expectFileForBackend = ExpectFileForBackend(options, compiler);
         if (File.Exists(expectFileForBackend)) {
-          expectedOutput = File.ReadAllText(expectFileForBackend);
+          expectedOutput = await File.ReadAllTextAsync(expectFileForBackend);
         }
-        var checkFileForBackend = $"{options.TestFile}.{compiler.TargetId}.check";
+
+        var checkFileForBackend = CheckFileForBackend(options, compiler);
         if (File.Exists(checkFileForBackend)) {
           checkFile = checkFileForBackend;
+        } else if (GetSourceCheckFile(checkFileForBackend, out var originalCheckFile)) {
+          checkFile = originalCheckFile;
         }
 
-        var result = RunWithCompiler(options, compiler, expectedOutput, checkFile);
+        var result = await RunWithCompiler(options, compiler, expectedOutput, checkFile);
         if (result != 0) {
           success = false;
         }
+
+        if (compiler.TargetId == "cs") {
+          // C# is a bit unusual in that the runtime behaves a little differently
+          // depending on whether it is included as source or referenced as DafnyRuntime.dll
+          // (because of "#ifdef ISDAFNYRUNTIMELIB" directives - see DafnyRuntime.cs).
+          // This should be enabled for any other backends that have similar divergence.
+          result = await RunWithCompiler(options, compiler, expectedOutput, checkFile, false);
+          if (result != 0) {
+            success = false;
+          }
+        }
       }
     }
 
     if (success) {
-      output.WriteLine(
+      await output.WriteLineAsync(
         "All executions were successful and matched the expected output (or reported errors for known unsupported features)!");
       return 0;
+    }
+
+    return -1;
+  }
+
+  private static bool GetSourceCheckFile(string checkFileForBackend, out string originalCheckFile) {
+    if (IntegrationTestsRootDir is var x && !string.IsNullOrEmpty(x)
+        && Path.Combine(x, checkFileForBackend) is var s && File.Exists(s)) {
+      originalCheckFile = s;
+      return true;
     } else {
-      return -1;
+      originalCheckFile = "";
+      return false;
     }
   }
 
-  public int ForEachResolver(ForEachResolverOptions options) {
-    var parseResult = CommandRegistry.Create(TextWriter.Null, TextWriter.Null, TextReader.Null,
-      new string[] { "verify", options.TestFile! }.Concat(options.OtherArgs).ToArray());
-    var dafnyOptions = ((ParseArgumentSuccess)parseResult).DafnyOptions;
+  private static string CheckFileForBackend(ForEachCompilerOptions options, IExecutableBackend compiler) {
+    return $"{options.TestFile}.{compiler.TargetId}.check";
+  }
 
+  private static string ExpectFileForBackend(ForEachCompilerOptions options, IExecutableBackend compiler) {
+    return $"{options.TestFile}.{compiler.TargetId}.expect";
+  }
+
+  public async Task<int> ForEachResolver(ForEachResolverOptions options) {
     // We also use --(r|b)print to catch bugs with valid but unprintable programs.
     string fileName = Path.GetFileName(options.TestFile!);
     var testDir = Path.GetDirectoryName(options.TestFile!);
@@ -228,50 +282,52 @@ public int ForEachResolver(ForEachResolverOptions options) {
       $"verify",
       options.TestFile!,
       $"--print:{tmpDPrint}",
-      $"--rprint:{tmpRPrint}",
+      options.OtherArgs.Any(option => option.StartsWith("--print")) ? "" : $"--rprint:{tmpRPrint}",
       $"--bprint:{tmpPrint}"
-    }.Concat(options.OtherArgs.Where(OptionAppliesToVerifyCommand)).ToArray();
+    }.Concat(DafnyCliTests.NewDefaultArgumentsForTesting).ToArray();
 
     var resolutionOptions = new List<ResolutionSetting>() {
-      new ResolutionSetting("legacy", new string[] { }, new string[] { ".expect" },
+      new("legacy", new string[] { "--type-system-refresh=false", "--general-traits=legacy", "--general-newtypes=false" },
+        new string[] { ".expect" },
         options.ExpectExitCode ?? 0),
-      new ResolutionSetting("refresh", new string[] { "--type-system-refresh" }, new string[] { ".refresh.expect", ".expect" },
+      new("refresh", new string[] { "--type-system-refresh" },
+        new string[] { ".refresh.expect", ".expect" },
         options.RefreshExitCode ?? options.ExpectExitCode ?? 0)
     };
 
     foreach (var resolutionOption in resolutionOptions) {
-      var (exitCode, actualOutput, error) = RunDafny(options.DafnyCliPath, dafnyArgs.Concat(resolutionOption.AdditionalOptions));
+      await output.WriteLineAsync($"Using {resolutionOption.ReadableName} resolver and verifying...");
 
-      output.WriteLine($"Using {resolutionOption.ReadableName} resolver and verifying...");
+      var arguments = dafnyArgs
+        .Concat(resolutionOption.AdditionalOptions)
+        .Concat(options.OtherArgs.Where(OptionAppliesToVerifyCommand))
+        .ToArray();
+      var (exitCode, actualOutput, error) = await RunDafny(options.DafnyCliPath, arguments);
 
       // The expected output is indicated by a file with extension "suffix", where the alternatives for "suffix" are supplied in order in
       // ExpectFileSuffixes.
-      string? expectedOutput = null;
-      foreach (var expectFileSuffix in resolutionOption.ExpectFileSuffixes) {
-        var expectFileForVerifier = $"{options.TestFile}{expectFileSuffix}";
-        if (File.Exists(expectFileForVerifier)) {
-          expectedOutput = File.ReadAllText(expectFileForVerifier);
-          break;
-        }
-      }
-      if (expectedOutput == null) {
-        output.WriteLine("Missing expect file: {0}", resolutionOption.ExpectFileSuffixes.Comma(suffix => $"{options.TestFile}{suffix}"));
+      string? expectFile = resolutionOption.ExpectFileSuffixes.
+        Select(expectFileSuffix => $"{options.TestFile}{expectFileSuffix}").
+        FirstOrDefault(File.Exists);
+      if (expectFile == null) {
+        var expectFileDescription = resolutionOption.ExpectFileSuffixes.Comma(suffix => $"{options.TestFile}{suffix}");
+        await output.WriteLineAsync($"Missing expect file: {expectFileDescription}");
         return 1;
       }
 
       // Compare the output
-      var diffMessage = AssertWithDiff.GetDiffMessage(expectedOutput!, actualOutput);
+      var diffMessage = DiffCommand.Run(expectFile, actualOutput);
       if (diffMessage != null) {
-        output.WriteLine(diffMessage);
+        await output.WriteLineAsync(diffMessage);
         return 1;
       }
 
       // We expect verification to return the indicated exit code.
       if (exitCode != resolutionOption.ExpectedExitCode) {
-        output.WriteLine($"Verification failed with exit code {exitCode} (expected {resolutionOption.ExpectedExitCode}). Output:");
-        output.WriteLine(actualOutput);
-        output.WriteLine("Error:");
-        output.WriteLine(error);
+        await output.WriteLineAsync($"Verification failed with exit code {exitCode} (expected {resolutionOption.ExpectedExitCode}). Output:");
+        await output.WriteLineAsync(actualOutput);
+        await output.WriteLineAsync("Error:");
+        await output.WriteLineAsync(error);
         return exitCode != 0 ? exitCode : 1;
       }
     }
@@ -288,39 +344,124 @@ private static bool OptionAppliesToVerifyCommand(string option) {
     var compileOptions = new List<Option> {
       CommonOptionBag.SpillTranslation,
       CommonOptionBag.OptimizeErasableDatatypeWrapper,
-      CommonOptionBag.AddCompileSuffix
+      CommonOptionBag.AddCompileSuffix,
+      RunCommand.MainOverride,
     }.Select(o => o.Name);
 
     return !compileOptions.Contains(name);
   }
 
-  private int RunWithCompiler(ForEachCompilerOptions options, IExecutableBackend backend, string expectedOutput, string? checkFile) {
-    output.WriteLine($"Executing on {backend.TargetName}...");
+  private async Task<int> RunWithCompiler(ForEachCompilerOptions options, IExecutableBackend backend, string expectedOutput,
+    string? checkFile, bool includeRuntime = true) {
+    var expectFailure = options.RunShouldFail;
+    await output.WriteAsync($"Executing on {backend.TargetName}");
+    if (!includeRuntime) {
+      await output.WriteAsync(" (with --include-runtime:false)");
+    }
+    await output.WriteLineAsync("...");
+
+    // Build to a dedicated temporary directory to make sure tests don't interfere with each other.
+    // The path will be something like "<user temp directory>/<random name>/<random name>"
+    // to ensure that all artifacts are put in a dedicated directory,
+    // which just "<user temp directory>/<random name>" would not.
+    var randomDirectory = Path.ChangeExtension(Path.GetRandomFileName(), null);
+    var randomFilename = Path.ChangeExtension(Path.GetRandomFileName(), null);
+    // Attempts at making this path longer will likely crash javac on Windows with issues like "path too long"
+    var tempOutputDirectory = Path.Combine(Path.GetTempPath(), randomDirectory);
+    Directory.CreateDirectory(tempOutputDirectory);
+
     IEnumerable<string> dafnyArgs = new List<string> {
       "run",
       "--no-verify",
+      "--emit-uncompilable-code",
       $"--target:{backend.TargetId}",
+      $"--build:{Path.Combine(tempOutputDirectory, randomFilename)}",
       options.TestFile!,
-    }.Concat(options.OtherArgs);
+    }.Concat(DafnyCliTests.NewDefaultArgumentsForTesting).Concat(options.OtherArgs);
+    if (!includeRuntime) {
+      // We have to provide the path to DafnyRuntime.dll manually, since the program will be run
+      // in the directory containing the DLL built from Dafny code, not the Dafny distribution.
+      if (backend.TargetId != "cs") {
+        throw new ArgumentException("--include-runtime:false is currently only supported for the C# backend");
+      }
+      var libPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+      var runtimePath = Path.Join(libPath, "DafnyRuntime.dll");
+      dafnyArgs = dafnyArgs.Concat(new[] { "--include-runtime:false", "--input", runtimePath });
+      Directory.Delete(tempOutputDirectory);
+    }
+
+    int exitCode;
+    string outputString;
+    string error;
+    try {
+      (exitCode, outputString, error) = await RunDafny(options.DafnyCliPath, dafnyArgs);
+    } catch (Exception e) {
+      // When DAFNY_INTEGRATION_TESTS_IN_PROCESS is set to true, Dafny runs in the same process
+      // so we catch the exception manually
+      (exitCode, outputString, error) = (3, "", e.ToString());
+    }
 
-    var (exitCode, outputString, error) = RunDafny(options.DafnyCliPath, dafnyArgs);
     var compilationOutputPrior = new Regex("\r?\nDafny program verifier[^\r\n]*\r?\n").Match(outputString);
     if (compilationOutputPrior.Success) {
       outputString = outputString.Remove(0, compilationOutputPrior.Index + compilationOutputPrior.Length);
     }
 
-    if (exitCode == 0) {
-      var diffMessage = AssertWithDiff.GetDiffMessage(expectedOutput, outputString);
-      if (diffMessage == null) {
-        return 0;
+    var exitCodeAsExpected = expectFailure == (exitCode != 0);
+    var diffMessage = exitCodeAsExpected ? AssertWithDiff.GetDiffMessage(expectedOutput, outputString) : null;
+    if (checkFile == null && !exitCodeAsExpected) {
+      if (UpdateTargetExpectFile && backend.TargetName != "dfy") {
+        if (string.IsNullOrEmpty(IntegrationTestsRootDir)) {
+          await output.WriteLineAsync(
+            "DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE is true but DAFNY_INTEGRATION_TESTS_ROOT_DIR is not set");
+        } else {
+          return await UpdateBackendCheckFile(options, backend, expectedOutput, outputString, error, exitCode, false);
+        }
+      }
+    }
+
+    if (exitCodeAsExpected) {
+      if (diffMessage != null) {
+        await output.WriteLineAsync(diffMessage);
+        if (backend.IsInternal) {
+          await output.WriteLineAsync(
+            $"(non-blocking) The {backend.TargetName} code generator is internal. Not having a '*.{backend.TargetId}.check' file is acceptable for now.");
+          return 0;
+        }
+
+        // If we hit errors, check for known unsupported features or bugs for this compilation target
+        if (error == "" && OnlyAllowedOutputLines(backend, outputString)) {
+          return 0;
+        }
+        // If we hit errors, check for known unsupported features or bugs for this compilation target
+        if (outputString == "" && OnlyAllowedOutputLines(backend, error)) {
+          return 0;
+        }
+
+        return 1;
       }
 
-      output.WriteLine(diffMessage);
-      return 1;
+      if (checkFile != null) {
+        // The test now works, we delete the check file
+        if (UpdateTargetExpectFile) {
+          if ((IntegrationTestsRootDir ?? "") == "") {
+            await output.WriteLineAsync(
+              "DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE is true but DAFNY_INTEGRATION_TESTS_ROOT_DIR is not set");
+          } else {
+            var sourcePath = Path.Join(IntegrationTestsRootDir,
+              CheckFileForBackend(options, backend));
+            File.Delete(sourcePath);
+          }
+        }
+      }
+      return 0;
     }
 
     // If we hit errors, check for known unsupported features or bugs for this compilation target
-    if (error == "" && OnlyUnsupportedFeaturesErrors(backend, outputString)) {
+    if (error == "" && OnlyAllowedOutputLines(backend, outputString)) {
+      return 0;
+    }
+    // If we hit errors, check for known unsupported features or bugs for this compilation target
+    if (outputString == "" && OnlyAllowedOutputLines(backend, error)) {
       return 0;
     }
 
@@ -330,21 +471,98 @@ private int RunWithCompiler(ForEachCompilerOptions options, IExecutableBackend b
       outputLines.AddRange(ReadAllLines(outputString));
       outputLines.AddRange(ReadAllLines(error));
       var checkDirectives = OutputCheckCommand.ParseCheckFile(checkFile);
-      var (checkResult, checkOutput, checkError) = OutputCheckCommand.Execute(outputLines, checkDirectives);
+      var checkResult = OutputCheckCommand.Execute(errorWriter, outputLines, checkDirectives);
       if (checkResult != 0) {
-        output.WriteLine($"OutputCheck on {checkFile} failed:");
-        output.WriteLine(checkOutput);
-        output.WriteLine("Error:");
-        output.WriteLine(checkError);
+        await output.WriteLineAsync($"OutputCheck on {checkFile} failed. Output was:");
+        await output.WriteLineAsync(string.Join("\n", outputLines));
+
+        if (UpdateTargetExpectFile) {
+          if (string.IsNullOrEmpty(IntegrationTestsRootDir)) {
+            await output.WriteLineAsync(
+              "DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE is true but DAFNY_INTEGRATION_TESTS_ROOT_DIR is not set");
+          } else {
+            return await UpdateBackendCheckFile(options, backend, expectedOutput, outputString, error, exitCode, true);
+          }
+        }
+      }
+
+      if (backend.IsInternal && checkResult != 0) {
+        await output.WriteLineAsync(
+          $"(non-blocking) The {backend.TargetName} code generator is internal. An unmatched '*.{backend.TargetId}.check' file is acceptable for now.");
+        return 0;
       }
 
       return checkResult;
     }
 
-    output.WriteLine("Execution failed, for reasons other than known unsupported features. Output:");
-    output.WriteLine(outputString);
-    output.WriteLine("Error:");
-    output.WriteLine(error);
+
+    if (backend.IsInternal) {
+      await output.WriteLineAsync($"(non-blocking) Execution failed for the internal {backend.TargetName} code generator, for reasons other than known unsupported features. Output:");
+      await output.WriteLineAsync(outputString);
+      await output.WriteLineAsync("Error:");
+      await output.WriteLineAsync(error);
+      await output.WriteLineAsync(
+        $"The {backend.TargetName} code generator is internal. An unmatched '*.{backend.TargetId}.check' file is acceptable for now.");
+      return 0;
+    }
+    await output.WriteLineAsync("Execution failed, for reasons other than known unsupported features. Output:");
+    await output.WriteLineAsync(outputString);
+    await output.WriteLineAsync("Error:");
+    await output.WriteLineAsync(error);
+    return exitCode;
+  }
+
+  private async Task<int> UpdateBackendCheckFile(ForEachCompilerOptions options, IExecutableBackend backend,
+    string expectedOutput, string outputString, string error, int exitCode, bool expectedCheckFile) {
+    var sourcePath = Path.Join(IntegrationTestsRootDir,
+      CheckFileForBackend(options, backend));
+    // outputString == error iff something crashed
+    var contentCheck = outputString == error ? outputString.Trim() : (outputString + "\n" + error).Trim();
+    var checkOutput = "";
+    var shouldSuffice = true;
+    if (contentCheck == "") {
+      shouldSuffice = false;
+      checkOutput = string.Join("\n",
+        expectedOutput.Split("\n").Select(line => "// CHECK-NOT: " + line));
+    } else {
+      // A few heuristics to create the .ext.check files
+      if (new Regex("<i>.*?</i>").Matches(contentCheck) is { Count: > 0 } m1) {
+        checkOutput = "// CHECK: .*" + Regex.Escape(m1[0].Value.Trim()) + ".*";
+      } else if (new Regex("<i>.*").Matches(contentCheck) is { Count: > 0 } m2) {
+        checkOutput = "// CHECK: .*" + Regex.Escape(m2[0].Value.Trim()) + ".*";
+      } else if (new Regex("^Unhandled exception.*$", RegexOptions.Multiline).Matches(contentCheck) is { Count: > 0 } m3) {
+        checkOutput = "// CHECK-L: " + m3[0].Value.Trim();
+      } else if (new Regex(@"^(error(?:\[\w+\])?:(?: \w+)*).*$", RegexOptions.Multiline).Matches(contentCheck) is { Count: > 0 } m4) {
+        checkOutput = "// CHECK-L: " + m4[0].Value.Trim();
+      } else {
+        shouldSuffice = false;
+        checkOutput = string.Join("\n",
+          contentCheck.Split("\n")
+            .Where(line => line != "")
+            .Select(line => "// CHECK-L: " + line));
+      }
+    }
+
+    if (!File.Exists(sourcePath) || expectedCheckFile) {
+      await File.WriteAllTextAsync(sourcePath, checkOutput);
+      if (shouldSuffice) {
+        await output.WriteLineAsync(
+          $"The new .check file {sourcePath} should capture this error. Please relaunch this test");
+      } else {
+        await output.WriteLineAsync(
+          $"Please modify the new check file {sourcePath} so that it's valid no matter what.");
+      }
+    } else {
+      await output.WriteLineAsync(
+        $"Apparently, the file {sourcePath} already exists so the process isn't going to create one " +
+        $" despite DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE set to true and the file {CheckFileForBackend(options, backend)} not existing.\n" +
+        " To avoid this message, please rebuild the solution (modifying a .cs file or a .dfy can help).");
+    }
+
+    await output.WriteLineAsync(outputString);
+    await output.WriteLineAsync("Error:");
+    await output.WriteLineAsync(error);
+
     return exitCode;
   }
 
@@ -356,31 +574,42 @@ public static IList<string> ReadAllLines(string s) {
     }
     return result;
   }
-
-  private static (int, string, string) RunDafny(IEnumerable<string> arguments) {
-    var argumentsWithDefaults = arguments.Concat(DafnyDriver.NewDefaultArgumentsForTesting);
+  private static async Task<(int, string, string)> RunDafny(IEnumerable<string> arguments) {
     var outputWriter = new StringWriter();
     var errorWriter = new StringWriter();
-    var exitCode = DafnyDriver.MainWithWriters(outputWriter, errorWriter, TextReader.Null, argumentsWithDefaults.ToArray());
+    var exitCode = await DafnyBackwardsCompatibleCli.MainWithWriters(outputWriter, errorWriter, TextReader.Null, arguments.ToArray());
     var outputString = outputWriter.ToString();
     var error = errorWriter.ToString();
     return (exitCode, outputString, error);
   }
 
-
-  private static (int, string, string) RunDafny(string? dafnyCLIPath, IEnumerable<string> arguments) {
-    if (dafnyCLIPath == null) {
-      return RunDafny(arguments);
+  private static async Task<(int, string, string)> RunDafny(string? dafnyCliPath, IEnumerable<string> arguments) {
+    if (dafnyCliPath == null) {
+      return await RunDafny(arguments);
     }
 
-    var argumentsWithDefaults = arguments.Concat(DafnyDriver.NewDefaultArgumentsForTesting);
-    ILitCommand command = new ShellLitCommand(dafnyCLIPath, argumentsWithDefaults, DafnyDriver.ReferencedEnvironmentVariables);
+    ILitCommand command = new ShellLitCommand(dafnyCliPath, arguments, DafnyCliTests.ReferencedEnvironmentVariables);
 
-    return command.Execute(TextReader.Null, TextWriter.Null, TextWriter.Null);
+    var outputWriter = new StringWriter();
+    var errorWriter = new StringWriter();
+    var exitCode = await command.Execute(TextReader.Null, outputWriter, errorWriter);
+    return (exitCode, outputWriter.ToString(), errorWriter.ToString());
   }
 
-  private static bool OnlyUnsupportedFeaturesErrors(IExecutableBackend backend, string output) {
+  private static bool OnlyAllowedOutputLines(IExecutableBackend backend, string output) {
+    var prefixRecoverable = output.IndexOf(typeof(UnsupportedInvalidOperationException).FullName!, StringComparison.Ordinal);
+    if (prefixRecoverable > 0) {
+      return true;
+    }
+    prefixRecoverable = output.IndexOf(typeof(RecoverableUnsupportedFeatureException).FullName!, StringComparison.Ordinal);
+    if (prefixRecoverable > 0) {
+      return true;
+    }
+
     using StringReader sr = new StringReader(output);
+    if (output == "") {
+      return false;
+    }
     while (sr.ReadLine() is { } line) {
       if (!IsAllowedOutputLine(backend, line)) {
         return false;
@@ -397,7 +626,7 @@ private static bool IsAllowedOutputLine(IExecutableBackend backend, string line)
     }
 
     // This is output if the compiler emits any errors
-    if (line.StartsWith("Wrote textual form of partial target program to")) {
+    if (line.StartsWith("Translation was aborted")) {
       return true;
     }
 
@@ -413,6 +642,9 @@ private static bool IsAllowedOutputLine(IExecutableBackend backend, string line)
     }
 
     var featureDescription = line[(prefixIndex + UnsupportedFeatureException.MessagePrefix.Length)..];
+    if (featureDescription.IndexOf(RecoverableUnsupportedFeatureException.MessageSuffix) is var i and > 0) {
+      featureDescription = featureDescription[..i];
+    }
     var feature = FeatureDescriptionAttribute.ForDescription(featureDescription);
     if (backend.UnsupportedFeatures.Contains(feature)) {
       return true;
@@ -426,7 +658,7 @@ private static bool IsAllowedOutputLine(IExecutableBackend backend, string line)
   private int GenerateCompilerTargetSupportTable(FeaturesOptions featuresOptions) {
     var dafnyOptions = ParseDafnyOptions(featuresOptions.OtherArgs);
     if (dafnyOptions == null) {
-      return (int)DafnyDriver.CommandLineArgumentsResult.PREPROCESSING_ERROR;
+      return (int)ExitValue.PREPROCESSING_ERROR;
     }
 
     var allCompilers = dafnyOptions.Plugins
diff --git a/Source/TestDafny/TestDafny.csproj b/Source/TestDafny/TestDafny.csproj
index 83f292e7923..4865653669c 100644
--- a/Source/TestDafny/TestDafny.csproj
+++ b/Source/TestDafny/TestDafny.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
       <OutputType>Exe</OutputType>
-      <TargetFramework>net6.0</TargetFramework>
+      <TargetFramework>net8.0</TargetFramework>
       <ImplicitUsings>enable</ImplicitUsings>
      <Nullable>enable</Nullable>
       <IsPackable>false</IsPackable>
diff --git a/Source/XUnitExtensions/Lit/CombinedWriter.cs b/Source/XUnitExtensions/Lit/CombinedWriter.cs
index 64c3c6b0391..b9753867d27 100644
--- a/Source/XUnitExtensions/Lit/CombinedWriter.cs
+++ b/Source/XUnitExtensions/Lit/CombinedWriter.cs
@@ -1,13 +1,15 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace XUnitExtensions.Lit;
 
 class CombinedWriter : TextWriter {
-  private IEnumerable<TextWriter> writers;
+  private readonly IEnumerable<TextWriter> writers;
 
   public CombinedWriter(Encoding encoding, IEnumerable<TextWriter> writers) {
     this.Encoding = encoding;
@@ -43,7 +45,35 @@ public override Task WriteAsync(char value) {
     return Task.WhenAll(writers.Select(w => w.WriteAsync(value)));
   }
 
+  public override Task WriteAsync(string? value) {
+    return Task.WhenAll(writers.Select(w => w.WriteAsync(value)));
+  }
+
   public override Task WriteAsync(char[] buffer, int index, int count) {
     return Task.WhenAll(writers.Select(w => w.WriteAsync(buffer, index, count)));
   }
+
+  public override Task WriteAsync(ReadOnlyMemory<char> buffer, CancellationToken cancellationToken = new()) {
+    return Task.WhenAll(writers.Select(w => w.WriteAsync(buffer, cancellationToken)));
+  }
+
+  public override Task WriteLineAsync(ReadOnlyMemory<char> buffer, CancellationToken cancellationToken = new()) {
+    return Task.WhenAll(writers.Select(w => w.WriteLineAsync(buffer, cancellationToken)));
+  }
+
+  public override Task WriteLineAsync(char value) {
+    return Task.WhenAll(writers.Select(w => w.WriteLineAsync(value)));
+  }
+
+  public override Task WriteLineAsync(string? value) {
+    return Task.WhenAll(writers.Select(w => w.WriteLineAsync(value)));
+  }
+
+  public override Task WriteLineAsync(char[] buffer, int index, int count) {
+    return Task.WhenAll(writers.Select(w => w.WriteLineAsync(buffer, index, count)));
+  }
+
+  public override Task WriteLineAsync(StringBuilder? value, CancellationToken cancellationToken = new()) {
+    return Task.WhenAll(writers.Select(w => w.WriteLineAsync(value, cancellationToken)));
+  }
 }
\ No newline at end of file
diff --git a/Source/XUnitExtensions/Lit/CpCommand.cs b/Source/XUnitExtensions/Lit/CpCommand.cs
new file mode 100644
index 00000000000..add922a2ddf
--- /dev/null
+++ b/Source/XUnitExtensions/Lit/CpCommand.cs
@@ -0,0 +1,107 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+
+namespace XUnitExtensions.Lit {
+  public class CpCommand : ILitCommand {
+
+    private readonly string options;
+    private readonly string fileOrFolder;
+    private readonly string destination;
+
+    private CpCommand(string options, string fileOrFolder, string destination) {
+      this.options = options;
+      this.fileOrFolder = fileOrFolder;
+      this.destination = destination;
+    }
+
+    public static ILitCommand Parse(string[] args) {
+      if (args.Length != 2 && args.Length != 3) {
+        throw new ArgumentException($"Wrong number of arguments for cp, expected 2 or 3 but got {args.Length}: " + string.Join(", ", args));
+      }
+
+      string fileOrFolder;
+      string destination;
+      string options;
+
+      if (args.Length == 2) {
+        options = "";
+        fileOrFolder = args[0];
+        destination = args[1];
+      } else {
+        options = args[0];
+        fileOrFolder = args[1];
+        destination = args[2];
+      }
+      return new CpCommand(options, fileOrFolder, destination);
+    }
+    static void CopyDirectory(string sourceDir, string destinationDir, bool recursive, bool force) {
+      // Get information about the source directory
+      var dir = new DirectoryInfo(sourceDir);
+
+      // Check if the source directory exists
+      if (!dir.Exists)
+        throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
+
+      // Cache directories before we start copying
+      DirectoryInfo[] dirs = dir.GetDirectories();
+
+      // Create the destination directory
+      Directory.CreateDirectory(destinationDir);
+
+      // Get the files in the source directory and copy to the destination directory
+      foreach (FileInfo file in dir.GetFiles()) {
+        string targetFilePath = Path.Combine(destinationDir, file.Name);
+        if (force && File.Exists(targetFilePath)) {
+          File.Delete(targetFilePath);
+        }
+        file.CopyTo(targetFilePath);
+      }
+
+      // If recursive and copying subdirectories, recursively call this method
+      if (recursive) {
+        foreach (DirectoryInfo subDir in dirs) {
+          string newDestinationDir = Path.Combine(destinationDir, subDir.Name);
+          CopyDirectory(subDir.FullName, newDestinationDir, true, force);
+        }
+      }
+    }
+    public async Task<int> Execute(TextReader inputReader,
+      TextWriter outputWriter, TextWriter errorWriter) {
+      if (File.Exists(fileOrFolder)) {
+        try {
+          if (File.Exists(destination) && options.Contains('f')) {
+            File.Delete(destination);
+          }
+          File.Copy(fileOrFolder, destination);
+        } catch (Exception e) {
+          await outputWriter.WriteLineAsync(e.ToString());
+          return 1;
+        }
+      } else if (Directory.Exists(fileOrFolder)) {
+        try {
+          var actualDestination = Directory.Exists(destination)
+            ? Path.Combine(destination, Path.GetFileName(fileOrFolder))
+            : destination;
+          CopyDirectory(fileOrFolder, actualDestination, options.Contains('r'), options.Contains('f'));
+        } catch (Exception e) {
+          await outputWriter.WriteLineAsync(e.ToString());
+          return 1;
+        }
+      } else {
+        throw new ArgumentException("File or folder " + fileOrFolder + " not found");
+      }
+
+      return 0;
+    }
+
+    public override string ToString() {
+      return $"%cp {(options != "" ? options + " " : "")}{fileOrFolder} {destination}";
+    }
+  }
+}
diff --git a/Source/XUnitExtensions/Lit/DiffCommand.cs b/Source/XUnitExtensions/Lit/DiffCommand.cs
index 125391674c0..f4060abbfb0 100644
--- a/Source/XUnitExtensions/Lit/DiffCommand.cs
+++ b/Source/XUnitExtensions/Lit/DiffCommand.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
@@ -10,6 +11,7 @@ namespace XUnitExtensions.Lit {
   /// because 'diff' does not exist on Windows.
   /// </summary>
   public class DiffCommand : ILitCommand {
+    public static readonly bool UpdateExpectFile = "true" == Environment.GetEnvironmentVariable("DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE");
 
     public string ExpectedPath { get; }
     public string ActualPath { get; }
@@ -28,12 +30,29 @@ public static ILitCommand Parse(string[] args) {
       return new DiffCommand(expectedPath, actualPath);
     }
 
-    public (int, string, string) Execute(TextReader inputReader,
+    public static string? Run(string expectedOutputFile, string actualOutput) {
+      if (UpdateExpectFile) {
+        if (Path.GetExtension(expectedOutputFile) == ".tmp") {
+          return "With DAFNY_INTEGRATION_TESTS_UPDATE_EXPECT_FILE=true, first argument of %diff cannot be a *.tmp file, it should be an *.expect file";
+        }
+        var path = Path.GetFullPath(expectedOutputFile).Replace("bin" + Path.DirectorySeparatorChar + "Debug" + Path.DirectorySeparatorChar + "net8.0" + Path.DirectorySeparatorChar, "");
+        File.WriteAllText(path, actualOutput);
+        return null;
+      }
+      var expected = File.ReadAllText(expectedOutputFile);
+      return AssertWithDiff.GetDiffMessage(expected, actualOutput);
+    }
+
+    public async Task<int> Execute(TextReader inputReader,
       TextWriter outputWriter, TextWriter errorWriter) {
-      var expected = File.ReadAllText(ExpectedPath);
-      var actual = File.ReadAllText(ActualPath);
-      var diffMessage = AssertWithDiff.GetDiffMessage(expected, actual);
-      return diffMessage == null ? (0, "", "") : (1, diffMessage, "");
+      var actual = await File.ReadAllTextAsync(ActualPath);
+      var diffMessage = Run(ExpectedPath, actual);
+      if (diffMessage != null) {
+        await outputWriter.WriteAsync(diffMessage);
+        return 1;
+      }
+
+      return 0;
     }
 
     public override string ToString() {
diff --git a/Source/XUnitExtensions/Lit/ExitCommand.cs b/Source/XUnitExtensions/Lit/ExitCommand.cs
index 793e224f6e3..ba119cf6694 100644
--- a/Source/XUnitExtensions/Lit/ExitCommand.cs
+++ b/Source/XUnitExtensions/Lit/ExitCommand.cs
@@ -1,25 +1,37 @@
+using System.ComponentModel;
 using System.IO;
-using Xunit.Abstractions;
+using System.Threading.Tasks;
 
 namespace XUnitExtensions.Lit;
 
+
 public class ExitCommand : ILitCommand {
-  private readonly int expectedExitCode;
+  private readonly string expectedExitCode;
   private readonly ILitCommand operand;
 
-  public ExitCommand(int exitCode, ILitCommand operand) {
+  public ExitCommand(string exitCode, ILitCommand operand) {
     this.expectedExitCode = exitCode;
     this.operand = operand;
   }
 
-  public (int, string, string) Execute(TextReader inputReader,
+  public async Task<int> Execute(TextReader inputReader,
     TextWriter outputWriter, TextWriter errorWriter) {
-    var (exitCode, output, error) = operand.Execute(inputReader, outputWriter, errorWriter);
-    if (exitCode == expectedExitCode) {
-      return (0, output, error);
-    } else {
-      return (1, output, error + $"\nMoreover the expected exit code was {expectedExitCode} but got {exitCode}");
+    var exitCode = 1;
+    try {
+      exitCode = await operand.Execute(inputReader, outputWriter, errorWriter);
+    } catch (Win32Exception) {
+      if (expectedExitCode == "-any") {
+      } else {
+        throw;
+      }
+    }
+
+    if (expectedExitCode == "-any" || exitCode.ToString() == expectedExitCode) {
+      return 0;
     }
+
+    await errorWriter.WriteLineAsync($"Moreover the expected exit code was {expectedExitCode} but got {exitCode}");
+    return 1;
   }
 
   public override string ToString() {
diff --git a/Source/XUnitExtensions/Lit/ILitCommand.cs b/Source/XUnitExtensions/Lit/ILitCommand.cs
index 78f656fad23..162f6551174 100644
--- a/Source/XUnitExtensions/Lit/ILitCommand.cs
+++ b/Source/XUnitExtensions/Lit/ILitCommand.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Security.AccessControl;
 using System.Text;
+using System.Threading.Tasks;
 using Microsoft.Extensions.FileSystemGlobbing;
 using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
 using Xunit.Abstractions;
@@ -22,7 +23,7 @@ public DelayedLitCommand(Func<ILitCommand> factory) {
       this.Factory = factory;
     }
 
-    public (int, string, string) Execute(TextReader inputReader,
+    public Task<int> Execute(TextReader inputReader,
       TextWriter outputWriter,
       TextWriter errorWriter) {
       if (command == null) {
@@ -42,7 +43,7 @@ public interface ILitCommand {
 
     private static readonly Dictionary<string, Func<string, LitTestConfiguration, ILitCommand>> CommandParsers = new();
     static ILitCommand() {
-      CommandParsers.Add("RUN:", RunCommand.Parse);
+      CommandParsers.Add("RUN:", LitRunCommand.Parse);
       CommandParsers.Add("UNSUPPORTED:", UnsupportedCommand.Parse);
       CommandParsers.Add("XFAIL:", XFailCommand.Parse);
       CommandParsers.Add("NONUNIFORM:", NonUniformTestCommand.Parse);
@@ -98,6 +99,6 @@ public static Token[] Tokenize(string line) {
       return result.ToArray();
     }
 
-    public (int, string, string) Execute(TextReader inputReader, TextWriter outputWriter, TextWriter errorWriter);
+    public Task<int> Execute(TextReader inputReader, TextWriter outputWriter, TextWriter errorWriter);
   }
 }
diff --git a/Source/XUnitExtensions/Lit/LitCommandWithRedirection.cs b/Source/XUnitExtensions/Lit/LitCommandWithRedirection.cs
index 34d45640333..703352595a8 100644
--- a/Source/XUnitExtensions/Lit/LitCommandWithRedirection.cs
+++ b/Source/XUnitExtensions/Lit/LitCommandWithRedirection.cs
@@ -41,12 +41,25 @@ public static LitCommandWithRedirection Parse(Token[] tokens, LitTestConfigurati
         errorFile = config.ApplySubstitutions(argumentList[redirectErrorIndex + 1].Value).Single();
         argumentList.RemoveRange(redirectErrorIndex, 2);
       }
+      var redirectOutAndErrorIndex = argumentList.FindIndex(t => t.Value == "&>");
+      if (redirectOutAndErrorIndex >= 0) {
+        outputFile = config.ApplySubstitutions(argumentList[redirectOutAndErrorIndex + 1].Value).Single();
+        errorFile = outputFile;
+        argumentList.RemoveRange(redirectOutAndErrorIndex, 2);
+      }
       var redirectErrorAppendIndex = argumentList.FindIndex(t => t.Value == "2>>");
       if (redirectErrorAppendIndex >= 0) {
         errorFile = config.ApplySubstitutions(argumentList[redirectErrorAppendIndex + 1].Value).Single();
         appendOutput = true;
         argumentList.RemoveRange(redirectErrorAppendIndex, 2);
       }
+      var redirectOutAndErrorAppendIndex = argumentList.FindIndex(t => t.Value == "&>>");
+      if (redirectOutAndErrorAppendIndex >= 0) {
+        outputFile = config.ApplySubstitutions(argumentList[redirectOutAndErrorAppendIndex + 1].Value).Single();
+        errorFile = outputFile;
+        appendOutput = true;
+        argumentList.RemoveRange(redirectOutAndErrorAppendIndex, 2);
+      }
 
       ILitCommand CreateCommand() {
         var arguments = argumentList.SelectMany(a => config.ApplySubstitutions(a.Value).Select(v => a with { Value = v }))
@@ -79,22 +92,29 @@ public LitCommandWithRedirection(ILitCommand command, string? inputFile, string?
       this.ErrorFile = errorFile;
     }
 
-    public (int, string, string) Execute(TextReader inputReader, TextWriter outWriter, TextWriter errWriter) {
+    public async Task<int> Execute(TextReader inputReader, TextWriter outWriter, TextWriter errWriter) {
       var outputWriters = new List<TextWriter> { outWriter };
+      var writersToClose = new List<StreamWriter>();
+      var errorWriters = new List<TextWriter> { errWriter };
       if (OutputFile != null) {
-        outputWriters.Add(new StreamWriter(OutputFile, Append));
+        var outputStreamWriter = new StreamWriter(OutputFile, Append);
+        writersToClose.Add(outputStreamWriter);
+        outputWriters.Add(outputStreamWriter);
+        if (OutputFile == ErrorFile) {
+          errorWriters.Add(outputStreamWriter);
+        }
+      } else if (ErrorFile != null) {
+        var errorStreamWriter = new StreamWriter(ErrorFile, Append);
+        writersToClose.Add(errorStreamWriter);
+        errorWriters.Add(errorStreamWriter);
       }
       inputReader = InputFile != null ? new StreamReader(InputFile) : inputReader;
 
-      var errorWriters = new List<TextWriter> { errWriter };
-      if (ErrorFile != null) {
-        errorWriters.Add(new StreamWriter(ErrorFile, Append));
-      }
-      var result = Command.Execute(inputReader,
+      var result = await Command.Execute(inputReader,
         new CombinedWriter(outWriter.Encoding, outputWriters),
         new CombinedWriter(errWriter.Encoding, errorWriters));
       inputReader.Close();
-      foreach (var writer in outputWriters.Concat(errorWriters)) {
+      foreach (var writer in writersToClose) {
         writer.Close();
       }
       return result;
diff --git a/Source/XUnitExtensions/Lit/LitRunCommand.cs b/Source/XUnitExtensions/Lit/LitRunCommand.cs
new file mode 100644
index 00000000000..7c15266857f
--- /dev/null
+++ b/Source/XUnitExtensions/Lit/LitRunCommand.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.Extensions.FileSystemGlobbing;
+using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
+using Xunit.Abstractions;
+
+namespace XUnitExtensions.Lit {
+  public abstract class LitRunCommand {
+    public static ILitCommand Parse(string line, LitTestConfiguration config) {
+      return ParseArguments(ILitCommand.Tokenize(line), config);
+    }
+
+    private static ILitCommand ParseArguments(Token[] tokens, LitTestConfiguration config) {
+      if (tokens[0].Value == "!") {
+        var operand = ParseArguments(tokens[1..], config);
+        return new NotCommand(operand);
+      }
+      if (tokens[0].Value == "%exits-with") {
+        var ec = tokens[1].Value;
+        var operand = ParseArguments(tokens[2..], config);
+        return new ExitCommand(ec, operand);
+      }
+      if (tokens[0].Value == "%stdin") {
+        var operand = ParseArguments(tokens[2..], config);
+        return new StdInCommand(tokens[1].Value, operand);
+      }
+
+
+      // Just supporting || for now since it's a precise way to ignore an exit code
+      var seqOperatorIndex = Array.FindIndex(tokens, t => t.Value == "||");
+      if (seqOperatorIndex >= 0) {
+        var lhs = LitCommandWithRedirection.Parse(tokens[0..seqOperatorIndex], config);
+        var rhs = ParseArguments(tokens[(seqOperatorIndex + 1)..], config);
+        return new OrCommand(lhs, rhs);
+      }
+      return LitCommandWithRedirection.Parse(tokens, config);
+    }
+  }
+}
diff --git a/Source/XUnitExtensions/Lit/LitTestCase.cs b/Source/XUnitExtensions/Lit/LitTestCase.cs
index 2957b380992..40ea67d1dbb 100644
--- a/Source/XUnitExtensions/Lit/LitTestCase.cs
+++ b/Source/XUnitExtensions/Lit/LitTestCase.cs
@@ -1,13 +1,14 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace XUnitExtensions.Lit {
   public class LitTestCase {
+    private static readonly TimeSpan IndividualTestTimeout = TimeSpan.FromMinutes(15);
     public string FilePath { get; }
     public IEnumerable<ILitCommand> Commands { get; }
     public bool ExpectFailure { get; }
@@ -53,8 +54,11 @@ public static LitTestCase Read(string filePath, LitTestConfiguration config) {
       return Parse(filePath, config);
     }
 
+    public static readonly TimeSpan MaxTestCaseRuntime = TimeSpan.FromMinutes(15);
     public static void Run(string filePath, LitTestConfiguration config, ITestOutputHelper outputHelper) {
-      Read(filePath, config).Execute(outputHelper);
+      var litTestCase = Read(filePath, config);
+      var task = Task.Run(() => litTestCase.Execute(outputHelper));
+      task.Wait(IndividualTestTimeout);
     }
 
     public LitTestCase(string filePath, IEnumerable<ILitCommand> commands, bool expectFailure) {
@@ -63,28 +67,27 @@ public LitTestCase(string filePath, IEnumerable<ILitCommand> commands, bool expe
       this.ExpectFailure = expectFailure;
     }
 
-    public void Execute(ITestOutputHelper outputHelper) {
+    public async Task Execute(ITestOutputHelper outputHelper) {
       Directory.CreateDirectory(Path.Join(Path.GetDirectoryName(FilePath), "Output"));
       // For debugging. Only printed on failure in case the true cause is buried in an earlier command.
       List<(string, string)> results = new();
 
+
       foreach (var command in Commands) {
         int exitCode;
-        string output;
-        string error;
         var outputWriter = new StringWriter();
         var errorWriter = new StringWriter();
         try {
           outputHelper.WriteLine($"Executing command: {command}");
-          (exitCode, output, error) = command.Execute(TextReader.Null, outputWriter, errorWriter);
+          exitCode = await command.Execute(TextReader.Null, outputWriter, errorWriter);
         } catch (Exception e) {
           throw new Exception($"Exception thrown while executing command: {command}", e);
         }
 
         if (ExpectFailure) {
           if (exitCode != 0) {
-            throw new SkipException(
-              $"Command returned non-zero exit code ({exitCode}): {command}\nOutput:\n{output + outputWriter}\nError:\n{error + errorWriter}");
+            results.Add((outputWriter.ToString(), errorWriter.ToString()));
+            return;
           }
         }
 
@@ -96,10 +99,10 @@ public void Execute(ITestOutputHelper outputHelper) {
           }
 
           throw new Exception(
-            $"Command returned non-zero exit code ({exitCode}): {command}\nOutput:\n{output + outputWriter}\nError:\n{error + errorWriter}");
+            $"Command returned non-zero exit code ({exitCode}): {command}\nOutput:\n{outputWriter}\nError:\n{errorWriter}");
         }
 
-        results.Add((output, error));
+        results.Add((outputWriter.ToString(), errorWriter.ToString()));
       }
 
       if (ExpectFailure) {
diff --git a/Source/XUnitExtensions/Lit/MainMethodLitCommand.cs b/Source/XUnitExtensions/Lit/MainMethodLitCommand.cs
deleted file mode 100644
index 461903a2b59..00000000000
--- a/Source/XUnitExtensions/Lit/MainMethodLitCommand.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using Xunit.Abstractions;
-
-namespace XUnitExtensions.Lit {
-  public class MainMethodLitCommand : ILitCommand {
-    private readonly Assembly assembly;
-    public string[] Arguments { get; }
-
-    private MainMethodLitCommand(Assembly assembly, string[] arguments) {
-      this.assembly = assembly;
-      this.Arguments = arguments;
-    }
-
-    public static ILitCommand Parse(Assembly assembly, IEnumerable<string> arguments, LitTestConfiguration config, bool invokeDirectly) {
-      var result = new MainMethodLitCommand(assembly, arguments.ToArray());
-      return invokeDirectly ? result : result.ToShellCommand(config);
-    }
-
-    public (int, string, string) Execute(TextReader inputReader,
-      TextWriter outputWriter, TextWriter errorWriter) {
-      if (inputReader != null) {
-        Console.SetIn(inputReader);
-      }
-      if (outputWriter != null) {
-        Console.SetOut(outputWriter);
-      }
-      if (errorWriter != null) {
-        Console.SetError(errorWriter);
-      }
-
-      var result = assembly.EntryPoint!.Invoke(null, new object[] { Arguments });
-      var exitCode = result == null ? 0 : (int)result;
-
-      return (exitCode, "", "");
-    }
-
-    public ILitCommand ToShellCommand(LitTestConfiguration config) {
-      var shellArguments = new[] { assembly.Location }.Concat(Arguments);
-      return new ShellLitCommand("dotnet", shellArguments, config.PassthroughEnvironmentVariables);
-    }
-
-    public override string ToString() {
-      var builder = new StringBuilder();
-      builder.Append(assembly.EntryPoint);
-      builder.Append(' ');
-      builder.AppendJoin(" ", Arguments);
-      return builder.ToString();
-    }
-  }
-}
diff --git a/Source/XUnitExtensions/Lit/MvCommand.cs b/Source/XUnitExtensions/Lit/MvCommand.cs
new file mode 100644
index 00000000000..8ab0a593516
--- /dev/null
+++ b/Source/XUnitExtensions/Lit/MvCommand.cs
@@ -0,0 +1,57 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+
+namespace XUnitExtensions.Lit {
+  public class MvCommand : ILitCommand {
+
+    private readonly string fileOrFolder;
+    private readonly string destination;
+
+    private MvCommand(string fileOrFolder, string destination) {
+      this.fileOrFolder = fileOrFolder;
+      this.destination = destination;
+    }
+
+    public static ILitCommand Parse(string[] args) {
+      if (args.Length != 2) {
+        throw new ArgumentException($"Wrong number of arguments for mv, expected 2 but got {args.Length}");
+      }
+      var fileOrFolder = args[0];
+      var destination = args[1];
+
+      return new MvCommand(fileOrFolder, destination);
+    }
+
+    public async Task<int> Execute(TextReader inputReader,
+      TextWriter outputWriter, TextWriter errorWriter) {
+      if (File.Exists(fileOrFolder)) {
+        try {
+          File.Move(fileOrFolder, destination);
+        } catch (Exception e) {
+          await outputWriter.WriteLineAsync(e.ToString());
+          return 1;
+        }
+      } else if (Directory.Exists(fileOrFolder)) {
+        try {
+          Directory.Move(fileOrFolder, destination);
+        } catch (Exception e) {
+          await outputWriter.WriteLineAsync(e.ToString());
+          return 1;
+        }
+      } else {
+        throw new ArgumentException("File or folder " + fileOrFolder + " not found");
+      }
+
+      return 0;
+    }
+
+    public override string ToString() {
+      return $"%mv {fileOrFolder} {destination}";
+    }
+  }
+}
diff --git a/Source/XUnitExtensions/Lit/NonUniformTestCommand.cs b/Source/XUnitExtensions/Lit/NonUniformTestCommand.cs
index 70e68419d84..34332c2d8d9 100644
--- a/Source/XUnitExtensions/Lit/NonUniformTestCommand.cs
+++ b/Source/XUnitExtensions/Lit/NonUniformTestCommand.cs
@@ -1,7 +1,8 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 
-namespace XUnitExtensions.Lit; 
+namespace XUnitExtensions.Lit;
 
 public class NonUniformTestCommand : ILitCommand {
   private NonUniformTestCommand(string reason) {
@@ -17,8 +18,8 @@ public static ILitCommand Parse(string line, LitTestConfiguration config) {
     return new NonUniformTestCommand(line);
   }
 
-  public (int, string, string) Execute(TextReader inputReader,
+  public Task<int> Execute(TextReader inputReader,
     TextWriter outputWriter, TextWriter errorWriter) {
-    return (0, "", "");
+    return Task.FromResult(0);
   }
 }
\ No newline at end of file
diff --git a/Source/XUnitExtensions/Lit/NotCommand.cs b/Source/XUnitExtensions/Lit/NotCommand.cs
index bcf62f65ce2..d0066d91f1d 100644
--- a/Source/XUnitExtensions/Lit/NotCommand.cs
+++ b/Source/XUnitExtensions/Lit/NotCommand.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading.Tasks;
 using Xunit.Abstractions;
 
 namespace XUnitExtensions.Lit;
@@ -10,10 +11,10 @@ public NotCommand(ILitCommand operand) {
     this.operand = operand;
   }
 
-  public (int, string, string) Execute(TextReader inputReader,
+  public async Task<int> Execute(TextReader inputReader,
     TextWriter outputWriter, TextWriter errorWriter) {
-    var (exitCode, output, error) = operand.Execute(inputReader, outputWriter, errorWriter);
-    return (exitCode == 0 ? 1 : 0, output, error);
+    var exitCode = await operand.Execute(inputReader, outputWriter, errorWriter);
+    return exitCode == 0 ? 1 : 0;
   }
 
   public override string ToString() {
diff --git a/Source/XUnitExtensions/Lit/OrCommand.cs b/Source/XUnitExtensions/Lit/OrCommand.cs
index ee6d6afb911..b327af8f756 100644
--- a/Source/XUnitExtensions/Lit/OrCommand.cs
+++ b/Source/XUnitExtensions/Lit/OrCommand.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading.Tasks;
 using Xunit.Abstractions;
 
 namespace XUnitExtensions.Lit {
@@ -11,15 +12,15 @@ public OrCommand(ILitCommand lhs, ILitCommand rhs) {
       this.rhs = rhs;
     }
 
-    public (int, string, string) Execute(TextReader inputReader,
+    public async Task<int> Execute(TextReader inputReader,
       TextWriter outputWriter, TextWriter errorWriter) {
-      var (leftExitCode, leftOutput, leftError) = lhs.Execute(inputReader, outputWriter, errorWriter);
+      var leftExitCode = await lhs.Execute(inputReader, outputWriter, errorWriter);
       if (leftExitCode == 0) {
-        return (leftExitCode, leftOutput, leftError);
+        return leftExitCode;
       }
 
-      var (rightExitCode, rightOutput, rightError) = rhs.Execute(inputReader, outputWriter, errorWriter);
-      return (rightExitCode, leftOutput + rightOutput, leftError + rightError);
+      var rightExitCode = await rhs.Execute(inputReader, outputWriter, errorWriter);
+      return rightExitCode;
     }
 
     public override string ToString() {
diff --git a/Source/XUnitExtensions/Lit/OutputCheckCommand.cs b/Source/XUnitExtensions/Lit/OutputCheckCommand.cs
index 9eed590c2ed..9a89c5ec9a0 100644
--- a/Source/XUnitExtensions/Lit/OutputCheckCommand.cs
+++ b/Source/XUnitExtensions/Lit/OutputCheckCommand.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using CommandLine;
 using Xunit.Abstractions;
 
@@ -21,237 +22,239 @@ public readonly record struct OutputCheckCommand(OutputCheckOptions options) : I
 
     public abstract record CheckDirective(string File, int LineNumber) {
 
-    private static readonly Dictionary<string, Func<string, int, string, CheckDirective>> DirectiveParsers = new();
-    static CheckDirective() {
-      DirectiveParsers.Add("CHECK:", CheckRegexp.Parse);
-      DirectiveParsers.Add("CHECK-L:", CheckLiteral.Parse);
-      DirectiveParsers.Add("CHECK-NEXT:", CheckNextRegexp.Parse);
-      DirectiveParsers.Add("CHECK-NEXT-L:", CheckNextLiteral.Parse);
-      DirectiveParsers.Add("CHECK-NOT:", CheckNotRegexp.Parse);
-      DirectiveParsers.Add("CHECK-NOT-L:", CheckNotLiteral.Parse);
-    }
+      private static readonly Dictionary<string, Func<string, int, string, CheckDirective>> DirectiveParsers = new();
+      static CheckDirective() {
+        DirectiveParsers.Add("CHECK:", CheckRegexp.Parse);
+        DirectiveParsers.Add("CHECK-L:", CheckLiteral.Parse);
+        DirectiveParsers.Add("CHECK-NEXT:", CheckNextRegexp.Parse);
+        DirectiveParsers.Add("CHECK-NEXT-L:", CheckNextLiteral.Parse);
+        DirectiveParsers.Add("CHECK-NOT:", CheckNotRegexp.Parse);
+        DirectiveParsers.Add("CHECK-NOT-L:", CheckNotLiteral.Parse);
+      }
 
-    public static CheckDirective? Parse(string file, int lineNumber, string line) {
-      foreach (var (keyword, parser) in DirectiveParsers) {
-        var index = line.IndexOf(keyword);
-        if (index >= 0) {
-          var arguments = line[(index + keyword.Length)..].Trim();
-          return parser(file, lineNumber, arguments);
+      public static CheckDirective? Parse(string file, int lineNumber, string line) {
+        foreach (var (keyword, parser) in DirectiveParsers) {
+          var index = line.IndexOf(keyword);
+          if (index >= 0) {
+            var arguments = line[(index + keyword.Length)..].Trim();
+            return parser(file, lineNumber, arguments);
+          }
         }
+        return null;
       }
-      return null;
-    }
-
-    public abstract bool FindMatch(IEnumerator<string> lines);
-  }
 
-  private record CheckRegexp(string File, int LineNumber, Regex Pattern) : CheckDirective(File, LineNumber) {
-    public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
-      return new CheckRegexp(file, lineNumber, new Regex(arguments));
+      public abstract bool FindMatch(IEnumerator<string> lines);
     }
 
-    public override bool FindMatch(IEnumerator<string> lines) {
-      while (lines.MoveNext()) {
-        if (Pattern.IsMatch(lines.Current)) {
-          return true;
-        }
+    private record CheckRegexp(string File, int LineNumber, Regex Pattern) : CheckDirective(File, LineNumber) {
+      public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
+        return new CheckRegexp(file, lineNumber, new Regex(arguments));
       }
-      return false;
-    }
 
-    public override string ToString() {
-      return $"Check Directive ({File}:{LineNumber} Pattern: '{Pattern}')";
-    }
-  }
+      public override bool FindMatch(IEnumerator<string> lines) {
+        while (lines.MoveNext()) {
+          if (Pattern.IsMatch(lines.Current)) {
+            return true;
+          }
+        }
+        return false;
+      }
 
-  private record CheckNextRegexp(string File, int LineNumber, Regex Pattern) : CheckDirective(File, LineNumber) {
-    public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
-      return new CheckNextRegexp(file, lineNumber, new Regex(arguments));
+      public override string ToString() {
+        return $"Check Directive ({File}:{LineNumber} Pattern: '{Pattern}')";
+      }
     }
 
-    public override bool FindMatch(IEnumerator<string> lines) {
-      if (!lines.MoveNext()) {
-        throw new Exception("No more lines to match against");
+    private record CheckNextRegexp(string File, int LineNumber, Regex Pattern) : CheckDirective(File, LineNumber) {
+      public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
+        return new CheckNextRegexp(file, lineNumber, new Regex(arguments));
       }
 
-      return Pattern.IsMatch(lines.Current);
-    }
+      public override bool FindMatch(IEnumerator<string> lines) {
+        if (!lines.MoveNext()) {
+          throw new Exception("No more lines to match against");
+        }
 
-    public override string ToString() {
-      return $"CheckNext Directive ({File}:{LineNumber} Pattern: '{Pattern}')";
-    }
-  }
+        return Pattern.IsMatch(lines.Current);
+      }
 
-  private record CheckLiteral(string File, int LineNumber, string Literal) : CheckDirective(File, LineNumber) {
-    public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
-      return new CheckLiteral(file, lineNumber, arguments);
+      public override string ToString() {
+        return $"CheckNext Directive ({File}:{LineNumber} Pattern: '{Pattern}')";
+      }
     }
 
-    public override bool FindMatch(IEnumerator<string> lines) {
-      while (lines.MoveNext()) {
-        if (Literal == lines.Current.Trim()) {
-          return true;
+    private record CheckLiteral(string File, int LineNumber, string Literal) : CheckDirective(File, LineNumber) {
+      public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
+        return new CheckLiteral(file, lineNumber, arguments);
+      }
+
+      public override bool FindMatch(IEnumerator<string> lines) {
+        while (lines.MoveNext()) {
+          if (Literal == lines.Current.Trim()) {
+            return true;
+          }
         }
+        return false;
       }
-      return false;
-    }
 
-    public override string ToString() {
-      return $"CheckLiteral Directive ({File}:{LineNumber} Literal: '{Literal}')";
+      public override string ToString() {
+        return $"CheckLiteral Directive ({File}:{LineNumber} Literal: '{Literal}')";
+      }
     }
-  }
 
-  private record CheckNextLiteral(string File, int LineNumber, string Literal) : CheckDirective(File, LineNumber) {
-    public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
-      return new CheckNextLiteral(file, lineNumber, arguments);
-    }
+    private record CheckNextLiteral(string File, int LineNumber, string Literal) : CheckDirective(File, LineNumber) {
+      public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
+        return new CheckNextLiteral(file, lineNumber, arguments);
+      }
+
+      public override bool FindMatch(IEnumerator<string> lines) {
+        if (!lines.MoveNext()) {
+          throw new Exception("No more lines to match against");
+        }
 
-    public override bool FindMatch(IEnumerator<string> lines) {
-      if (!lines.MoveNext()) {
-        throw new Exception("No more lines to match against");
+        return Literal == lines.Current.Trim();
       }
 
-      return Literal == lines.Current.Trim();
+      public override string ToString() {
+        return $"CheckNextLiteral Directive ({File}:{LineNumber} Literal: '{Literal}')";
+      }
     }
 
-    public override string ToString() {
-      return $"CheckNextLiteral Directive ({File}:{LineNumber} Literal: '{Literal}')";
-    }
-  }
+    private class CheckingEnumerator : IEnumerator<string> {
+      private readonly IEnumerator<string> Wrapped;
+      private readonly Action<string> Check;
 
-  private class CheckingEnumerator : IEnumerator<string> {
-    private readonly IEnumerator<string> Wrapped;
-    private readonly Action<string> Check;
+      public CheckingEnumerator(IEnumerator<string> wrapped, Action<string> check) {
+        Wrapped = wrapped;
+        Check = check;
+      }
 
-    public CheckingEnumerator(IEnumerator<string> wrapped, Action<string> check) {
-      Wrapped = wrapped;
-      Check = check;
-    }
+      public bool MoveNext() {
+        var result = Wrapped.MoveNext();
+        if (result) {
+          Check.Invoke(Wrapped.Current);
+        }
+        return result;
+      }
 
-    public bool MoveNext() {
-      var result = Wrapped.MoveNext();
-      if (result) {
-        Check.Invoke(Wrapped.Current);
+      public void Reset() {
+        throw new NotImplementedException();
       }
-      return result;
-    }
 
-    public void Reset() {
-      throw new NotImplementedException();
-    }
+      object IEnumerator.Current => Current;
 
-    object IEnumerator.Current => Current;
+      public string Current => Wrapped.Current;
 
-    public string Current => Wrapped.Current;
+      public void Dispose() => Wrapped.Dispose();
+    }
 
-    public void Dispose() => Wrapped.Dispose();
-  }
+    private record CheckNotRegexp(string File, int LineNumber, Regex Pattern) : CheckDirective(File, LineNumber) {
+      public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
+        return new CheckNotRegexp(file, lineNumber, new Regex(arguments));
+      }
 
-  private record CheckNotRegexp(string File, int LineNumber, Regex Pattern) : CheckDirective(File, LineNumber) {
-    public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
-      return new CheckNotRegexp(file, lineNumber, new Regex(arguments));
-    }
+      public override bool FindMatch(IEnumerator<string> lines) {
+        // This directive is tested using a CheckingEnumerator instead.
+        throw new NotImplementedException();
+      }
 
-    public override bool FindMatch(IEnumerator<string> lines) {
-      // This directive is tested using a CheckingEnumerator instead.
-      throw new NotImplementedException();
+      public override string ToString() {
+        return $"CheckNot Directive ({File}:{LineNumber} Pattern: '{Pattern}')";
+      }
     }
 
-    public override string ToString() {
-      return $"CheckNot Directive ({File}:{LineNumber} Pattern: '{Pattern}')";
-    }
-  }
+    private record CheckNotLiteral(string File, int LineNumber, string Literal) : CheckDirective(File, LineNumber) {
+      public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
+        return new CheckNotLiteral(file, lineNumber, arguments);
+      }
 
-  private record CheckNotLiteral(string File, int LineNumber, string Literal) : CheckDirective(File, LineNumber) {
-    public new static CheckDirective Parse(string file, int lineNumber, string arguments) {
-      return new CheckNotLiteral(file, lineNumber, arguments);
-    }
+      public override bool FindMatch(IEnumerator<string> lines) {
+        // This directive is tested using a CheckingEnumerator instead.
+        throw new NotImplementedException();
+      }
 
-    public override bool FindMatch(IEnumerator<string> lines) {
-      // This directive is tested using a CheckingEnumerator instead.
-      throw new NotImplementedException();
+      public override string ToString() {
+        return $"CheckNotLiteral Directive ({File}:{LineNumber} Literal: '{Literal}')";
+      }
     }
 
-    public override string ToString() {
-      return $"CheckNotLiteral Directive ({File}:{LineNumber} Literal: '{Literal}')";
+    public static ILitCommand Parse(IEnumerable<string> args, LitTestConfiguration config) {
+      ILitCommand? result = null;
+      Parser.Default.ParseArguments<OutputCheckOptions>(args).WithParsed(o => {
+        result = new OutputCheckCommand(o);
+      });
+      return result!;
     }
-  }
 
-  public static ILitCommand Parse(IEnumerable<string> args, LitTestConfiguration config) {
-    ILitCommand? result = null;
-    Parser.Default.ParseArguments<OutputCheckOptions>(args).WithParsed(o => {
-      result = new OutputCheckCommand(o);
-    });
-    return result!;
-  }
+    public static IList<CheckDirective> ParseCheckFile(string fileName) {
+      var result = File.ReadAllLines(fileName)
+        .Select((line, index) => CheckDirective.Parse(fileName, index + 1, line))
+        .Where(e => e != null)
+        .Cast<CheckDirective>()
+        .ToList();
+      if (!result.Any()) {
+        throw new ArgumentException($"'{fileName}' does not contain any CHECK directives");
+      }
 
-  public static IList<CheckDirective> ParseCheckFile(string fileName) {
-    var result = File.ReadAllLines(fileName)
-      .Select((line, index) => CheckDirective.Parse(fileName, index + 1, line))
-      .Where(e => e != null)
-      .Cast<CheckDirective>()
-      .ToList();
-    if (!result.Any()) {
-      throw new ArgumentException($"'{fileName}' does not contain any CHECK directives");
+      return result;
     }
 
-    return result;
-  }
+    public Task<int> Execute(TextReader inputReader,
+      TextWriter outputWriter, TextWriter errorWriter) {
+      if (options.FileToCheck == null) {
+        return Task.FromResult(0);
+      }
 
-  public (int, string, string) Execute(TextReader inputReader,
-    TextWriter outputWriter, TextWriter errorWriter) {
-    if (options.FileToCheck == null) {
-      return (0, "", "");
-    }
+      var linesToCheck = File.ReadAllLines(options.FileToCheck).ToList();
+      var fileName = options.CheckFile;
+      if (fileName == null) {
+        return Task.FromResult(0);
+      }
+      var checkDirectives = ParseCheckFile(options.CheckFile!);
 
-    var linesToCheck = File.ReadAllLines(options.FileToCheck).ToList();
-    var fileName = options.CheckFile;
-    if (fileName == null) {
-      return (0, "", "");
+      return Task.FromResult(Execute(errorWriter, linesToCheck, checkDirectives));
     }
-    var checkDirectives = ParseCheckFile(options.CheckFile!);
-
-    return Execute(linesToCheck, checkDirectives);
-  }
 
-  public static (int, string, string) Execute(IEnumerable<string> linesToCheck, IEnumerable<CheckDirective> checkDirectives) {
-    IEnumerator<string> lineEnumerator = linesToCheck.GetEnumerator();
-    IEnumerator<string>? notCheckingEnumerator = null;
-    foreach (var directive in checkDirectives) {
-      // CHECK-NOT[-L] directives apply up until the next directive, so we handle
-      // them by wrapping the line enumerator for the next time through the loop.
-      if (directive is CheckNotRegexp(var _, var _, var pattern)) {
-        notCheckingEnumerator = new CheckingEnumerator(lineEnumerator, line => {
-          if (pattern.IsMatch(line)) {
-            throw new Exception($"Match found for {directive}: {line}");
+    public static int Execute(TextWriter errorWriter, IEnumerable<string> linesToCheck, IEnumerable<CheckDirective> checkDirectives) {
+      IEnumerator<string> lineEnumerator = linesToCheck.GetEnumerator();
+      IEnumerator<string>? notCheckingEnumerator = null;
+      foreach (var directive in checkDirectives) {
+        // CHECK-NOT[-L] directives apply up until the next directive, so we handle
+        // them by wrapping the line enumerator for the next time through the loop.
+        if (directive is CheckNotRegexp(var _, var _, var pattern)) {
+          notCheckingEnumerator = new CheckingEnumerator(lineEnumerator, line => {
+            if (pattern.IsMatch(line)) {
+              throw new Exception($"Match found for {directive}: {line}");
+            }
+          });
+        } else if (directive is CheckNotLiteral(var _, var _, var literal)) {
+          notCheckingEnumerator = new CheckingEnumerator(lineEnumerator, line => {
+            if (literal == line.Trim()) {
+              throw new Exception($"Match found for {directive}: {line}");
+            }
+          });
+        } else {
+          var enumerator = notCheckingEnumerator ?? lineEnumerator;
+          if (!directive.FindMatch(enumerator)) {
+            errorWriter.WriteLine($"ERROR: Could not find any match for {directive}. The output is above.");
+            errorWriter.WriteLine();
+            return 1;
           }
-        });
-      } else if (directive is CheckNotLiteral(var _, var _, var literal)) {
-        notCheckingEnumerator = new CheckingEnumerator(lineEnumerator, line => {
-          if (literal == line.Trim()) {
-            throw new Exception($"Match found for {directive}: {line}");
-          }
-        });
-      } else {
-        var enumerator = notCheckingEnumerator ?? lineEnumerator;
-        if (!directive.FindMatch(enumerator)) {
-          return (1, "", $"ERROR: Could not find a match for {directive}");
+
+          notCheckingEnumerator = null;
         }
+      }
 
-        notCheckingEnumerator = null;
+      if (notCheckingEnumerator != null) {
+        // Traverse the rest of the enumerator to make sure the CHECK-NOT[-L] directive is fully tested.
+        while (notCheckingEnumerator.MoveNext()) { }
       }
-    }
 
-    if (notCheckingEnumerator != null) {
-      // Traverse the rest of the enumerator to make sure the CHECK-NOT[-L] directive is fully tested.
-      while (notCheckingEnumerator.MoveNext()) { }
+      return 0;
     }
 
-    return (0, "", "");
-  }
-
-  public override string ToString() {
-    return $"OutputCheck --file-to-check {options.FileToCheck} {options.CheckFile}";
+    public override string ToString() {
+      return $"OutputCheck --file-to-check {options.FileToCheck} {options.CheckFile}";
+    }
   }
 }
-}
diff --git a/Source/XUnitExtensions/Lit/RmCommand.cs b/Source/XUnitExtensions/Lit/RmCommand.cs
new file mode 100644
index 00000000000..6b1cee23842
--- /dev/null
+++ b/Source/XUnitExtensions/Lit/RmCommand.cs
@@ -0,0 +1,85 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+
+namespace XUnitExtensions.Lit {
+  public class RmCommand : ILitCommand {
+
+    private readonly string options;
+    private readonly string fileOrFolder;
+
+    private RmCommand(string options, string fileOrFolder) {
+      this.options = options;
+      this.fileOrFolder = fileOrFolder;
+    }
+
+    public static ILitCommand Parse(string[] args) {
+      if (args.Length != 1 && args.Length != 2) {
+        throw new ArgumentException($"Wrong number of arguments for rm, expected 1 or 2 but got {args.Length}");
+      }
+
+      string fileOrFolder;
+      string options;
+      if (args.Length == 2) {
+        options = args[0];
+        fileOrFolder = args[1];
+      } else {
+        options = "";
+        fileOrFolder = args[0];
+      }
+
+      return new RmCommand(options, fileOrFolder);
+    }
+    private static void RecursiveDelete(DirectoryInfo baseDir) {
+      if (!baseDir.Exists) {
+        return;
+      }
+
+      foreach (var dir in baseDir.EnumerateDirectories()) {
+        RecursiveDelete(dir);
+      }
+      baseDir.Delete(true);
+    }
+    public async Task<int> Execute(TextReader inputReader,
+      TextWriter outputWriter, TextWriter errorWriter) {
+      if (File.Exists(fileOrFolder)) {
+        try {
+          File.Delete(fileOrFolder);
+        } catch (Exception e) {
+          await outputWriter.WriteLineAsync(e.ToString());
+          return 1;
+        }
+      } else if (Directory.Exists(fileOrFolder)) {
+        if (Directory.EnumerateFiles(fileOrFolder).Any()) {
+          if (options == "-rf") {
+            RecursiveDelete(new DirectoryInfo(fileOrFolder));
+          } else {
+            await outputWriter.WriteLineAsync("Directory is not empty. Please supply rm with -rf to force deletion");
+            return 1;
+          }
+        } else {
+          try {
+            Directory.Delete(fileOrFolder);
+          } catch (Exception e) {
+            await outputWriter.WriteLineAsync(e.ToString());
+            return 1;
+          }
+        }
+      } else {
+        await outputWriter.WriteLineAsync($"File or folder {fileOrFolder} not found");
+        return 1;
+      }
+
+      return 0;
+    }
+
+    public override string ToString() {
+      return $"%rm {(options != "" ? options + " " : "")}{fileOrFolder}";
+    }
+  }
+}
diff --git a/Source/XUnitExtensions/Lit/RunCommand.cs b/Source/XUnitExtensions/Lit/RunCommand.cs
deleted file mode 100644
index 94a74b505e9..00000000000
--- a/Source/XUnitExtensions/Lit/RunCommand.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Extensions.FileSystemGlobbing;
-using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
-using Xunit.Abstractions;
-
-namespace XUnitExtensions.Lit {
-  public abstract class RunCommand {
-    public static ILitCommand Parse(string line, LitTestConfiguration config) {
-      return ParseArguments(ILitCommand.Tokenize(line), config);
-    }
-
-    private static ILitCommand ParseArguments(Token[] tokens, LitTestConfiguration config) {
-      if (tokens[0].Value == "!") {
-        var operand = ParseArguments(tokens[1..], config);
-        return new NotCommand(operand);
-      }
-      if (tokens[0].Value == "%exits-with") {
-        var ec = Int32.Parse(tokens[1].Value);
-        var operand = ParseArguments(tokens[2..], config);
-        return new ExitCommand(ec, operand);
-      }
-      if (tokens[0].Value == "%stdin") {
-        var operand = ParseArguments(tokens[2..], config);
-        return new StdInCommand(tokens[1].Value, operand);
-      }
-
-
-      // Just supporting || for now since it's a precise way to ignore an exit code
-      var seqOperatorIndex = Array.FindIndex(tokens, t => t.Value == "||");
-      if (seqOperatorIndex >= 0) {
-        var lhs = LitCommandWithRedirection.Parse(tokens[0..seqOperatorIndex], config);
-        var rhs = ParseArguments(tokens[(seqOperatorIndex + 1)..], config);
-        return new OrCommand(lhs, rhs);
-      }
-      return LitCommandWithRedirection.Parse(tokens, config);
-    }
-  }
-}
diff --git a/Source/XUnitExtensions/Lit/SedCommand.cs b/Source/XUnitExtensions/Lit/SedCommand.cs
index 66846045055..5cb212cb2c8 100644
--- a/Source/XUnitExtensions/Lit/SedCommand.cs
+++ b/Source/XUnitExtensions/Lit/SedCommand.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
@@ -21,7 +22,7 @@ private SedCommand(string regexp, string replaceBy, string file) {
 
     public static ILitCommand Parse(string[] args) {
       if (args.Length != 2) {
-        throw new ArgumentException($"Wrong number of arguments for sed: {args.Length}");
+        throw new ArgumentException($"Wrong number of arguments for sed, expected 2 but got {args.Length}");
       }
       var regexpReplace = args[0];
       var delimitCharacter = regexpReplace[1];
@@ -39,17 +40,16 @@ public static ILitCommand Parse(string[] args) {
       return new SedCommand(regexp, replaceBy, file);
     }
 
-    public (int, string, string) Execute(TextReader inputReader,
+    public async Task<int> Execute(TextReader inputReader,
       TextWriter outputWriter, TextWriter errorWriter) {
-      var fileContent = File.ReadAllText(file);
+      var fileContent = await File.ReadAllTextAsync(file);
       try {
         var stdOutput = Regex.Replace(fileContent, "(?m)" + regexp, replaceBy);
-        if (outputWriter != null) {
-          outputWriter.Write(stdOutput);
-        }
-        return (0, stdOutput, "");
+        await outputWriter.WriteAsync(stdOutput);
+        return 0;
       } catch (Exception e) {
-        return (1, e.ToString(), "");
+        await outputWriter.WriteLineAsync(e.ToString());
+        return 1;
       }
     }
 
diff --git a/Source/XUnitExtensions/Lit/ShellLitCommand.cs b/Source/XUnitExtensions/Lit/ShellLitCommand.cs
index bf54dd1e500..8f87d3e8bd9 100644
--- a/Source/XUnitExtensions/Lit/ShellLitCommand.cs
+++ b/Source/XUnitExtensions/Lit/ShellLitCommand.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using Xunit.Abstractions;
 
 namespace XUnitExtensions.Lit {
@@ -18,10 +19,16 @@ public ShellLitCommand(string shellCommand, IEnumerable<string> arguments, IEnum
       this.passthroughEnvironmentVariables = passthroughEnvironmentVariables.ToArray();
     }
 
-    public (int, string, string) Execute(TextReader inputReader,
+    public async Task<int> Execute(TextReader inputReader,
       TextWriter outputWriter, TextWriter errorWriter) {
       using var process = new Process();
 
+      if (shellCommand.Contains('/') && Path.GetFileName(shellCommand) is var command and ("python3" or "cargo")) {
+        var workingDir = Path.GetDirectoryName(shellCommand);
+        process.StartInfo.WorkingDirectory = workingDir;
+        shellCommand = command;
+      }
+
       process.StartInfo.FileName = shellCommand;
       foreach (var argument in Arguments) {
         process.StartInfo.ArgumentList.Add(argument);
@@ -103,23 +110,21 @@ public ShellLitCommand(string shellCommand, IEnumerable<string> arguments, IEnum
       // needed because that is also what C# will use to decode the output of `process`.
 
       process.Start();
-      if (inputReader != null) {
-        string input = inputReader.ReadToEnd();
-        inputReader.Close();
-        process.StandardInput.Write(input);
-        process.StandardInput.Close();
-      }
+      string input = await inputReader.ReadToEndAsync();
+      inputReader.Close();
+      await process.StandardInput.WriteAsync(input);
+      process.StandardInput.Close();
 
       // FIXME the code below will deadlock if process fills the stderr buffer.
-      string output = process.StandardOutput.ReadToEnd();
-      outputWriter?.Write(output);
-      outputWriter?.Close();
-      string error = process.StandardError.ReadToEnd();
-      errorWriter?.Write(error);
-      errorWriter?.Close();
-      process.WaitForExit();
-
-      return (process.ExitCode, output, error);
+      string output = await process.StandardOutput.ReadToEndAsync();
+      await outputWriter.WriteAsync(output);
+      outputWriter.Close();
+      string error = await process.StandardError.ReadToEndAsync();
+      await errorWriter.WriteAsync(error);
+      errorWriter.Close();
+      await process.WaitForExitAsync();
+
+      return process.ExitCode;
     }
 
     public override string ToString() {
diff --git a/Source/XUnitExtensions/Lit/StdInCommand.cs b/Source/XUnitExtensions/Lit/StdInCommand.cs
index df1768cb800..f30a7878e70 100644
--- a/Source/XUnitExtensions/Lit/StdInCommand.cs
+++ b/Source/XUnitExtensions/Lit/StdInCommand.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Threading;
+using System.Threading.Tasks;
 using Xunit.Abstractions;
 
 namespace XUnitExtensions.Lit;
@@ -13,7 +14,7 @@ public StdInCommand(string stdin, ILitCommand operand) {
     this.operand = operand;
   }
 
-  public (int, string, string) Execute(TextReader inputReader,
+  public Task<int> Execute(TextReader inputReader,
     TextWriter outputWriter, TextWriter errorWriter) {
     inputReader = new StringReader(stdin);
     return operand.Execute(inputReader, outputWriter, errorWriter);
diff --git a/Source/XUnitExtensions/Lit/UnsupportedCommand.cs b/Source/XUnitExtensions/Lit/UnsupportedCommand.cs
index b5480d52724..54eab317aa6 100644
--- a/Source/XUnitExtensions/Lit/UnsupportedCommand.cs
+++ b/Source/XUnitExtensions/Lit/UnsupportedCommand.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using Xunit.Abstractions;
 
 namespace XUnitExtensions.Lit {
@@ -19,9 +20,9 @@ public UnsupportedCommand(IEnumerable<string> features) {
       Features = features;
     }
 
-    public (int, string, string) Execute(TextReader inputReader,
+    public Task<int> Execute(TextReader inputReader,
       TextWriter outputWriter, TextWriter errorWriter) {
-      return (0, "", "");
+      return Task.FromResult(0);
     }
   }
 }
\ No newline at end of file
diff --git a/Source/XUnitExtensions/Lit/XFailCommand.cs b/Source/XUnitExtensions/Lit/XFailCommand.cs
index edad57bf4de..36ba090e44d 100644
--- a/Source/XUnitExtensions/Lit/XFailCommand.cs
+++ b/Source/XUnitExtensions/Lit/XFailCommand.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using Xunit.Abstractions;
 
 namespace XUnitExtensions.Lit {
@@ -14,9 +15,9 @@ public static ILitCommand Parse(string line, LitTestConfiguration config) {
       throw new ArgumentException($"Unrecognized arguments to XFAIL: {line}");
     }
 
-    public (int, string, string) Execute(TextReader inputReader,
+    public Task<int> Execute(TextReader inputReader,
       TextWriter outputWriter, TextWriter errorWriter) {
-      return (0, "", "");
+      return Task.FromResult(0);
     }
   }
 }
\ No newline at end of file
diff --git a/Source/XUnitExtensions/XUnitExtensions.csproj b/Source/XUnitExtensions/XUnitExtensions.csproj
index 3ff901352c0..3ee91d23d07 100644
--- a/Source/XUnitExtensions/XUnitExtensions.csproj
+++ b/Source/XUnitExtensions/XUnitExtensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/Test/.gitignore b/Test/.gitignore
deleted file mode 100644
index 819e1eb1197..00000000000
--- a/Test/.gitignore
+++ /dev/null
@@ -1,42 +0,0 @@
-**/Output/
-
-# C# output
-**/*.cs
-**/*.dll
-**/*.runtimeconfig.json
-**/*.mdb
-**/*.pdb
-**/bin
-**/obj
-
-# JavaScript output
-**/*.js
-
-# Go output
-**/*-go
-
-# Java output
-**/*-java
-**/*.jar
-
-# C++ output
-**/*.h
-**/*.cpp
-**/*.dSYM
-**/*.exe
-
-# Python output
-**/*-py
-
-# Rust output
-**/*-rust
-
-node_modules/
-package-lock.json
-packages
-
-server/model.bvd
-git-issues/git-issue-622$f/**
-comp/compile1verbose/CompileAndThenRun
-comp/compile1quiet/CompileRunQuietly
-docexamples
diff --git a/Test/DafnyTestGeneration/TestGeneration.csproj b/Test/DafnyTestGeneration/TestGeneration.csproj
deleted file mode 100644
index 783af910dae..00000000000
--- a/Test/DafnyTestGeneration/TestGeneration.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="Moq" Version="4.16.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    </ItemGroup>
-</Project>
diff --git a/Test/DafnyTestGeneration/TestGeneration.dfy b/Test/DafnyTestGeneration/TestGeneration.dfy
deleted file mode 100644
index d907288faeb..00000000000
--- a/Test/DafnyTestGeneration/TestGeneration.dfy
+++ /dev/null
@@ -1,24 +0,0 @@
-// NONUNIFORM: Multiple build steps (although could we use `dafny test` instead?)
-
-// Generating tests:
-// RUN: cp %S/TestGeneration.dfy %t.dfy
-// RUN: %baredafny generate-tests %args Block %t.dfy > %t-tests.dfy
-// RUN: %baredafny translate cs %args --include-runtime --verbose --no-verify "%t-tests.dfy" > "%t"
-// RUN: dotnet test -v:q %S >> %t
-
-// RUN: %OutputCheck --file-to-check "%t" "%s"
-// CHECK: .*Passed!  - Failed:     0, Passed:     3, Skipped:     0, Total:     3*
-
-module M {
-  class Value {
-    var v:int;
-  }
-  method {:testEntry} compareToZero(v:Value) returns (i:int) {
-    if (v.v == 0) {
-      return 0;
-    } else if (v.v > 0) {
-      return 1;
-    }
-    return -1;
-  }
-}
diff --git a/Test/DafnyTests/DafnyTests.csproj b/Test/DafnyTests/DafnyTests.csproj
deleted file mode 100644
index 768e4f6f829..00000000000
--- a/Test/DafnyTests/DafnyTests.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-  </ItemGroup>
-</Project>
diff --git a/Test/DafnyTests/RunAllTestsOption.dfy b/Test/DafnyTests/RunAllTestsOption.dfy
deleted file mode 100644
index 1079dc2e22c..00000000000
--- a/Test/DafnyTests/RunAllTestsOption.dfy
+++ /dev/null
@@ -1,40 +0,0 @@
-// RUN: %baredafny verify %args "%s" > "%t"
-// RUN: ! %baredafny test %args --unicode-char:false --no-verify --target:cs "%s" >> "%t"
-// RUN: ! %baredafny test %args --unicode-char:false --no-verify --target:java "%s" >> "%t"
-// RUN: ! %baredafny test %args --unicode-char:false --no-verify --target:go "%s" >> "%t"
-// RUN: ! %baredafny test %args --unicode-char:false --no-verify --target:js "%s" >> "%t"
-// RUN: ! %baredafny test %args --unicode-char:false --no-verify --target:py "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t" 
-
-include "../exceptions/VoidOutcomeDt.dfy"
-include "../exceptions/NatOutcomeDt.dfy"
-
-method {:test} Passing1() {
-  expect 2 == 2;
-}
-
-method {:test} Passing2() {
-  expect 2 + 2 == 4;
-}
-
-method {:test} Failing1() {
-  expect 2 + 2 == 5;
-}
-
-method {:test} Passing3() {
-  expect 2 + 2 == 4;
-}
-
-method {:test} Failing2() {
-  expect 2 + 2 == 5;
-}
-
-module TestModule {
-  method {:test} Passing1() {
-    expect 2 + 2 == 4;
-  }
-}
-
-method {:test} FailingReturnValue() returns (result: VoidOutcome) {
-  return VoidFailure("Whoopsie");
-}
diff --git a/Test/DafnyTests/RunAllTestsOption.dfy.expect b/Test/DafnyTests/RunAllTestsOption.dfy.expect
deleted file mode 100644
index 1a59c0bdbc6..00000000000
--- a/Test/DafnyTests/RunAllTestsOption.dfy.expect
+++ /dev/null
@@ -1,72 +0,0 @@
-
-Dafny program verifier finished with 1 verified, 0 errors
-
-Dafny program verifier did not attempt verification
-TestModule.Passing1: PASSED
-Passing1: PASSED
-Passing2: PASSED
-Failing1: FAILED
-	RunAllTestsOption.dfy(21,2): expectation violation
-Passing3: PASSED
-Failing2: FAILED
-	RunAllTestsOption.dfy(29,2): expectation violation
-FailingReturnValue: FAILED
-	VoidOutcome.VoidFailure(Whoopsie)
-[Program halted] RunAllTestsOption.dfy(9,0): Test failures occurred: see above.
-
-
-Dafny program verifier did not attempt verification
-TestModule.Passing1: PASSED
-Passing1: PASSED
-Passing2: PASSED
-Failing1: FAILED
-	RunAllTestsOption.dfy(21,2): expectation violation
-Passing3: PASSED
-Failing2: FAILED
-	RunAllTestsOption.dfy(29,2): expectation violation
-FailingReturnValue: FAILED
-	VoidOutcome.VoidFailure(Whoopsie)
-[Program halted] RunAllTestsOption.dfy(9,0): Test failures occurred: see above.
-
-
-Dafny program verifier did not attempt verification
-TestModule.Passing1: PASSED
-Passing1: PASSED
-Passing2: PASSED
-Failing1: FAILED
-	RunAllTestsOption.dfy(21,2): expectation violation
-Passing3: PASSED
-Failing2: FAILED
-	RunAllTestsOption.dfy(29,2): expectation violation
-FailingReturnValue: FAILED
-	VoidOutcome.VoidFailure(Whoopsie)
-[Program halted] RunAllTestsOption.dfy(9,0): Test failures occurred: see above.
-
-
-Dafny program verifier did not attempt verification
-TestModule.Passing1: PASSED
-Passing1: PASSED
-Passing2: PASSED
-Failing1: FAILED
-	RunAllTestsOption.dfy(21,2): expectation violation
-Passing3: PASSED
-Failing2: FAILED
-	RunAllTestsOption.dfy(29,2): expectation violation
-FailingReturnValue: FAILED
-	VoidOutcome.VoidFailure(Whoopsie)
-[Program halted] RunAllTestsOption.dfy(9,0): Test failures occurred: see above.
-
-
-Dafny program verifier did not attempt verification
-TestModule.Passing1: PASSED
-Passing1: PASSED
-Passing2: PASSED
-Failing1: FAILED
-	RunAllTestsOption.dfy(21,2): expectation violation
-Passing3: PASSED
-Failing2: FAILED
-	RunAllTestsOption.dfy(29,2): expectation violation
-FailingReturnValue: FAILED
-	VoidOutcome.VoidFailure(Whoopsie)
-[Program halted] RunAllTestsOption.dfy(9,0): Test failures occurred: see above.
-
diff --git a/Test/Landin/Knot1.dfy b/Test/Landin/Knot1.dfy
deleted file mode 100644
index 393bafc4423..00000000000
--- a/Test/Landin/Knot1.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class Ref {
-  ghost var hogp: () ~> int
-}
-
-method Main()
-  ensures false
-{
-  var r := new Ref;
-  // error: r.hogp calls itself without decreasing
-  r.hogp := () reads r, r.hogp.reads() => if r.hogp.requires() then 1 + r.hogp() else 0;
-}
\ No newline at end of file
diff --git a/Test/README.md b/Test/README.md
deleted file mode 100644
index a5684478534..00000000000
--- a/Test/README.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Dafny Integration Tests
-
-The tests in this directory are run using the [IntegrationTests](../Source/IntegrationTests) project,
-which uses the xUnit-based LIT test runner from the [XUnitExtensions](../Source/XUnitExtensions) package 
-rather than the LLVM `lit` CLI.
-
-## Executing Tests from the Command Line
-
-The xUnit LIT test interpreter is run through xUnit `Theory` parameterized tests, and therefore
-hooks into the general-purpose `dotnet test` command:
-
-```
-dotnet test --logger "console;verbosity=normal" Source/IntegrationTests
-```
-
-`-logger "console;verbosity=normal"` is optional, and increases the default logging verbosity so that you can see individual tests as the pass.
-
-The file path of each test file, relative to the `Test` directory, is used as the display name of its corresponding test.
-This means you can use the `--filter` option to run a subset of tests, or even a single file:
-
-```
-dotnet test --logger "console;verbosity=normal" Source/IntegrationTests --filter DisplayName~comp/Hello.dfy
-```
-
-[See here](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test) for more information about
-the `dotnet test` command and other supported options.
-
-## Writing tests
-
-Lit tests use a very restricted form of command-line: executables and their arguments, piping,
-`>` and `>>` redirections (for respectively writing and appending stdout to a file) 
-and `2>` and `2>>` redirections (for respectively writing and appending both stdout and stderr to a file).
-
-To work cross-platform, use a number of macros: %verify, %resolve, %build, %run, %translate (with %trargs),
-%exits-with, %diff, %sed and others you can find defined in lit.site.cfg
-
-`Any new macros defined here must also be defied in Source/IntegrationTests/LitTests.cs`
-
-A typical simple test for a single source file that has verification errors is
-```
-// RUN: %exits-with 4 %verify "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-```
-
-There are many examples in the .dfy files under this directory.
-
-If you need an extra dafny file without any verification on it, use the command:
-
-    // RUN: echo 'lit should ignore this file' 
-
-## Uniform backend testing
-
-In order to maximum testing coverage across all supported backends,
-especially as additional backends are added in the future,
-the default command for any test that compiles and/or executes a valid Dafny program should be:
-
-```
-// RUN: %testDafnyForEachCompiler "%s"
-```
-
-This command will run the program with each backend
-and assert that the program output matches the content of `<test file>.expect`.
-See [the TestDafny utility](../Source/TestDafny/) for more details.
-
-Any test that manually compiles and/or executes a program against one or more backends
-will be flagged by CI, and should be fixed by either converting it to use
-`%testDafnyForEachCompiler` or adding a `// NONUNIFORM: <reason>` command
-to flag it as intentionally inconsistent,
-for tests of backend-specific externs for example.
-
-## Executing Tests from JetBrains Rider
-
-You will likely find it more convenient to run tests from an IDE such as
-[JetBrains Rider](https://github.com/dafny-lang/dafny/wiki/JetBrains-Rider-FAQ), with a proper JDK installed like JDK 8.
-
-Assuming you have loaded the `Dafny.sln` solution in Rider, you can execute all the integration tests
-by right-clicking on the `IntegrationTests` package and selecting `Run Unit Tests`.
-
-![Running Integration Tests in Rider](rider-run-unit-tests.png)
-
-You will see a tree of running tests and their results, with lots of options for filtering and summarizing results.
-Note the search window in the top-left, which can be used to filter to tests matching a particular substring.
-
-![Running Integration Tests in Rider](rider-unit-tests-window.png)
-
-Once you have at least started running these tests at least once and this tree has been populated, you can right-click any
-individual test to execute it, or similarly any subset of selected tests. You will often want to start the test suite and then
-immediately cancel it just to populate the tree for this purpose.
-
-## Debugging Tests
-
-The xUnit test runner supports executing commands such as `%dafny` by directly invoking the main entry point
-of the corresponding C# package (i.e. [`DafnyDriver`](../Source/DafnyDriver)), which makes running the debugger against
-a particular test much more convenient. By default this is disabled and the runner creates a separate dafny process
-just as LIT does, however. This is because the main CLI implementation currently has shared static state, which
-causes errors when invoking the CLI in the same process on multiple inputs in sequence, much less in parallel.
-Future changes will address this so that the in-process Main invocation can be used instead, however,
-which will likely improve performance.
-
-To debug a single test, you change the value of the `DAFNY_INTEGRATION_TESTS_IN_PROCESS` environment variable
-to `true` (See https://www.jetbrains.com/help/rider/Reference__Options__Tools__Unit_Testing__Test_Runner.html),
-and then right-click the test you wish to debug and select
-`Debug Selected Unit Tests`. You will see exceptions if the test you are running makes multiple calls to commands like `%dafny`,
-so you may wish to remove the calls you are not interested in first, e.g. if you are debugging an issue with a specific compiler.
diff --git a/Test/VSComp2010/Problem2-Invert.dfy b/Test/VSComp2010/Problem2-Invert.dfy
deleted file mode 100644
index dfd1c4830af..00000000000
--- a/Test/VSComp2010/Problem2-Invert.dfy
+++ /dev/null
@@ -1,82 +0,0 @@
-// RUN: %dafny /compile:0 /deprecation:0 /autoTriggers:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// VSComp 2010, problem 2, compute the inverse 'B' of a permutation 'A' and prove that 'B' is
-// indeed an inverse of 'A' (or at least prove that 'B' is injective).
-// Rustan Leino, 31 August 2010.
-//
-// In the version of this program that I wrote during the week of VSTTE 2010, I had
-// used a lemma (stated as a ghost method) that I proved inductively (using a loop and
-// a loop invariant).  Here, I have simplified that version by just including an
-// assertion of the crucial property, which follows from the surjectivity of 'A'.
-//
-// The difficulty in proving this program with an SMT solver stems from the fact that
-// the quantifier that states the surjectivity property has no good matching trigger
-// (because there are no function symbols mentioned in the antecedent of that quantifier,
-// only built-in predicates).  Therefore, I introduced a dummy function 'inImage' and
-// defined it always to equal 'true'.  I can then mention this function in the crucial
-// assertion, which causes the appropriate triggering to take place.
-//
-// A slight annoyance is that the loop's modifications of the heap, which is checked
-// to include only the elements of 'B'.  Since 'A' and 'B' are arrays stored at different
-// locations in the heap, it then follows that the elements of 'A' are not modified.
-// However, the fact that the heap has changed at all makes the symbolic expressions
-// denoting the elements of 'A' look different before and after the heap.  The
-// assertion after the loop (which, like all assertions, is proved) is needed to
-// connect the two.
-
-method M(N: int, A: array<int>, B: array<int>)
-  requires 0 <= N && N == A.Length && N == B.Length && A != B;
-  requires forall k :: 0 <= k < N ==> 0 <= A[k] < N;
-  requires forall j,k :: 0 <= j < k < N ==> A[j] != A[k];  // A is injective
-  requires forall m :: 0 <= m < N && inImage(m) ==> exists k :: 0 <= k && k < N && A[k] == m;  // A is surjective
-  modifies B;
-  ensures forall k :: 0 <= k < N ==> 0 <= B[k] < N;
-  ensures forall k :: 0 <= k < N ==> B[A[k]] == k == A[B[k]];  // A and B are each other's inverses
-  ensures forall j,k :: 0 <= j < k < N ==> B[j] != B[k];  // (which means that) B is injective
-{
-  var n := 0;
-  while n < N
-    invariant n <= N;
-    invariant forall k :: 0 <= k < n ==> B[A[k]] == k;
-  {
-    B[A[n]] := n;
-    n := n + 1;
-  }
-  assert forall i :: 0 <= i < N ==> A[i] == old(A[i]);  // the elements of A were not changed by the loop
-  // it now follows from the surjectivity of A that A is the inverse of B:
-  assert forall j :: 0 <= j < N && inImage(j) ==> 0 <= B[j] < N && A[B[j]] == j;
-  assert forall j,k :: 0 <= j < k < N ==> B[j] != B[k];
-}
-
-ghost function inImage(i: int): bool { true }  // this function is used to trigger the surjective quantification
-
-method Main()
-{
-  var a := new int[10];
-  a[0] := 9;
-  a[1] := 3;
-  a[2] := 8;
-  a[3] := 2;
-  a[4] := 7;
-  a[5] := 4;
-  a[6] := 0;
-  a[7] := 1;
-  a[8] := 5;
-  a[9] := 6;
-  var b := new int[10];
-  M(10, a, b);
-  print "a:\n";
-  PrintArray(a);
-  print "b:\n";
-  PrintArray(b);
-}
-
-method PrintArray(a: array<int>)
-{
-  var i := 0;
-  while i < a.Length {
-    print a[i], "\n";
-    i := i + 1;
-  }
-}
diff --git a/Test/VSComp2010/Problem4-Queens.dfy b/Test/VSComp2010/Problem4-Queens.dfy
deleted file mode 100644
index 87ef6be4bcc..00000000000
--- a/Test/VSComp2010/Problem4-Queens.dfy
+++ /dev/null
@@ -1,156 +0,0 @@
-// RUN: %dafny /compile:0 /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// VSComp 2010, problem 4, N queens
-// Rustan Leino, 31 August 2010, updated 24 March 2011.
-//
-// In the version of this program that I wrote during the week of VSTTE 2010, I had
-// an unproved assumption.  In this version, I simply changed the existential quantifier
-// in that assumption to specify a particular witness, which is enough of a hint for
-// Dafny to fully prove the correctness of the program.
-//
-// Oh, I also added some comments in this version of the program.
-//
-// The correctness of this program relies on some properties of Queens boards.  These
-// are stated and proved as lemmas, which here are given in assert statements.
-//
-// There is an annoyance in this program.  Dafny's proof-term representation of the function
-// 'IsConsistent' implicitly takes the heap as an argument, despite the fact that
-// 'IsConsistent' does not depend on any part of the heap.  Dafny ought to be able
-// to figure that out from the fact that 'IsConsistent' has no 'reads' clause.
-// Maybe a future version of Dafny will do just that.  But until then, some methods
-// below are specified with an (easy-to-prove) postcondition that 'IsConsistent(B,p)'
-// does not change for any 'B' and 'p', even if the method may change the heap in
-// some way.
-//
-// The March 2011 update of this program was to make use of Dafny's new heuristics for
-// compiling quantifiers.  This makes it possible to call IsConsistent, whose body uses
-// a universal quantifier, from non-ghost code, which simplifies this program.
-
-
-// The Search method returns whether or not there exists an N-queens solution for the
-// given N.  If 'success' returns as 'true', 'board' indicates a solution.  If 'success'
-// returns as 'false', no solution exists, as stated in the second postcondition.
-method Search(N: int) returns (success: bool, board: seq<int>)
-  requires 0 <= N;
-  ensures success ==>
-              |board| == N &&
-              (forall p :: 0 <= p && p < N ==> IsConsistent(board, p));
-  ensures !success ==>
-              (forall B: seq<int> ::
-                  |B| == N && (forall i :: 0 <= i && i < N ==> 0 <= B[i] && B[i] < N)
-                  ==>
-                  (exists p :: 0 <= p && p < N && !IsConsistent(B, p)));
-{
-  success, board := SearchAux(N, []);
-}
-
-// Given a board, this function says whether or not the queen placed in column 'pos'
-// is consistent with the queens placed in columns to its left.
-function IsConsistent(board: seq<int>, pos: int): bool
-{
-  0 <= pos && pos < |board| &&
-  (forall q :: 0 <= q && q < pos ==>
-      board[q] != board[pos] &&
-      board[q] - board[pos] != pos - q &&
-      board[pos] - board[q] != pos - q)
-}
-
-// Here comes the method where the real work is being done.  With an ultimate board size of 'N'
-// in mind and given the consistent placement 'boardSoFar' of '|boardSoFar|' columns, this method
-// will search for a solution for the remaining columns.  If 'success' returns as 'true',
-// then 'newBoard' is a consistent placement of 'N' queens.  If 'success' returns as 'false',
-// then there is no way to extend 'boardSoFar' to get a solution for 'N' queens.
-method SearchAux(N: int, boardSoFar: seq<int>) returns (success: bool, newBoard: seq<int>)
-  requires 0 <= N && |boardSoFar| <= N;
-  // consistent so far:
-  requires (forall k :: 0 <= k && k < |boardSoFar| ==> IsConsistent(boardSoFar, k));
-  ensures success ==>
-              |newBoard| == N &&
-              (forall p :: 0 <= p && p < N ==> IsConsistent(newBoard, p));
-  ensures !success ==>
-              (forall B: seq<int> ::
-                  |B| == N && (forall i :: 0 <= i && i < N ==> 0 <= B[i] && B[i] < N) &&
-                  boardSoFar <= B
-                  ==>
-                  (exists p :: 0 <= p && p < N && !IsConsistent(B, p)));
-  decreases N - |boardSoFar|;
-{
-  var pos := |boardSoFar|;
-  if (pos == N) {
-    // The given board already has the desired size.
-    newBoard := boardSoFar;
-    success := true;
-  } else {
-    // Exhaustively try all possibilities for the new column, 'pos'.
-    var n := 0;
-    while (n < N)
-      invariant n <= N;
-      invariant (forall B: seq<int> ::
-                  // For any board 'B' with 'N' queens, each placed in an existing row
-                  |B| == N && (forall i :: 0 <= i && i < N ==> 0 <= B[i] && B[i] < N) &&
-                  // ... where 'B' is an extension of 'boardSoFar'
-                  boardSoFar <= B &&
-                  // ... and the first column to extend 'boardSoFar' has a queen in one of
-                  // the first 'n' rows
-                  0 <= B[pos] && B[pos] < n
-                  ==>
-                  // ... the board 'B' is not entirely consistent
-                  (exists p :: 0 <= p && p < N && !IsConsistent(B, p)));
-    {
-      // Let's try to extend the board-so-far with a queen in column 'n':
-      var candidateBoard := boardSoFar + [n];
-      if (IsConsistent(candidateBoard, pos)) {
-        // The new queen is consistent.  Thus, 'candidateBoard' is consistent in column 'pos'.
-        // The consistency of the queens in columns left of 'pos' follows from the
-        // consistency of those queens in 'boardSoFar' and the fact that 'candidateBoard' is
-        // an extension of 'boardSoFar', as the following lemma tells us:
-        assert (forall k ::
-                  0 <= k && k < |boardSoFar| && IsConsistent(boardSoFar, k)
-                  ==>
-                  IsConsistent(candidateBoard, k));
-
-        // Thus, we meet the precondition of 'SearchAux' on 'candidateBoard', so let's search
-        // for a solution that extends 'candidateBoard'.
-        var s, b := SearchAux(N, candidateBoard);
-        if (s) {
-          // The recursive call to 'SearchAux' found consistent positions for all remaining columns
-          newBoard := b;
-          success := true;
-          return;
-        }
-        // The recursive call to 'SearchAux' determined that no consistent extensions to 'candidateBoard'
-        // exist.
-      } else {
-        // Since 'n' is not a consistent placement for a queen in column 'pos', there is also
-        // no extension of 'candidateBoard' that would make the entire board consistent.
-        assert (forall B: seq<int> ::
-                  |B| == N && (forall i :: 0 <= i && i < N ==> 0 <= B[i] && B[i] < N) &&
-                  candidateBoard <= B
-                  ==>
-                  !IsConsistent(B, pos));
-      }
-      n := n + 1;
-    }
-
-    success := false;
-  }
-}
-
-method Main()
-{
-  var s, b := Search(2);
-  print "N=2 returns ", s, "\n";
-  s, b := Search(4);
-  print "N=4 returns ", s, "\n";
-  PrintSeq(b);
-}
-
-method PrintSeq(b: seq<int>)
-{
-  var i := 0;
-  while (i < |b|) {
-    print "  ", b[i], "\n";
-    i := i + 1;
-  }
-}
diff --git a/Test/VSI-Benchmarks/b4.dfy.expect b/Test/VSI-Benchmarks/b4.dfy.expect
deleted file mode 100644
index 94a42af27f3..00000000000
--- a/Test/VSI-Benchmarks/b4.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 21 verified, 0 errors
diff --git a/Test/auditor/TestAuditor.dfy b/Test/auditor/TestAuditor.dfy
deleted file mode 100644
index 59580805f1c..00000000000
--- a/Test/auditor/TestAuditor.dfy
+++ /dev/null
@@ -1,143 +0,0 @@
-// RUN: %baredafny audit --report-file "%t.md" "%s"
-// RUN: %baredafny audit --report-file "%t.md" --compare-report "%s"
-// RUN: %baredafny audit --report-file "%t.html" "%s"
-// RUN: %baredafny audit --report-file "%t-ietf.md" --report-format markdown-ietf "%s"
-// RUN: %baredafny audit --use-basename-for-filename "%s" > "%t"
-// RUN: %diff "%s.md.expect" "%t.md"
-// RUN: %diff "%s-ietf.md.expect" "%t-ietf.md"
-// RUN: %diff "%s.html.expect" "%t.html"
-// RUN: %diff "%s.expect" %t"
-
-include "IgnoredAssumptions.dfy"
-
-// Method or lemma with a failed proof (top priority, but shown only in reports from later versions of the tool)
-method BadMethod(i: nat) returns (res: nat)
-  requires i < 64
-  ensures res == 64 - i
-{
-  return 64 + i;
-}
-
-// Lemma with no body
-lemma MinusBv8NoBody(i: nat, j: nat)
-  requires j <= i < 256
-  ensures (i - j) as bv8 == i as bv8 - j as bv8
-
-// Lemma with an {:axiom} attribute
-lemma {:axiom} LeftShiftBV128(v: bv128, idx: nat)
-  requires idx <= 128
-  ensures v << idx == v << idx as bv8
-
-// Function or method with an {:axiom} attribute or {:verify false} attribute
-
-// Lemma with an assume statement in its body
-lemma MinusBv8Assume(i: nat, j: nat)
-  requires j <= i < 256
-  ensures (i - j) as bv8 == i as bv8 - j as bv8
-{
-  assume (i - j) as bv8 == i as bv8 - j as bv8;
-}
-
-// Method declared {:extern} with an ensures clause and no body
-newtype int32 = x | -0x8000_0000 <= x < 0x8000_0000
-newtype uint8 = x | 0 <= x < 0x100
-
-method {:extern} GenerateBytes(i: int32) returns (res: seq<uint8>)
-    requires i >= 0
-    ensures |res| == i as int
-
-// Method declared {:extern} with an ensures clause and a body
-method {:extern} GenerateBytesWithModel(i: int32) returns (res: seq<uint8>)
-    requires i >= 0
-    ensures |res| == i as int
-{
-  return seq(i, _ => 0 as uint8);
-}
-
-// Compiled method with an assume statement with an {:axiom} attribute in its body
-method GenerateBytesWrapper(i: int32) returns (res: seq<uint8>)
-{
-  assume {:axiom} i >= 0;
-  res := GenerateBytes(i);
-}
-
-// Function or method with no body
-ghost function WhoKnows(x: int): int
-
-// Method declared {:extern} with no body and no ensures clauses
-method {:extern} GenerateBytesNoGuarantee(i: int32) returns (res: seq<uint8>)
-    requires i >= 0
-
-// Extern function with postcondition. Should result in two findings.
-function {:extern} ExternFunction(i: int32): (res: int32)
-  ensures res != i
-
-// Successful proof of a function, method, or lemma (shown only in reports from later versions of the tool)
-method GoodMethod(i: nat) returns (res: nat)
-  requires i < 64
-  ensures res == 64 + i
-{
-  return 64 + i;
-}
-
-method DoesNotTerminate()
-  decreases *
-{
-  DoesNotTerminate();
-}
-
-trait {:termination false} T {
-}
-
-lemma ForallWithoutBody()
-  ensures forall y : int :: y != y
-{
-    forall y : int
-      ensures y != y
-}
-
-method LoopWithoutBody(n: int)
-{
-    var i := 0;
-    while i < n
-      decreases n - i
-    assert true;
-}
-
-abstract module M {
-  method AbstractMethod(x: int) returns (y: int)
-    ensures y > x
-}
-
-opaque function f(): int {
-  0
-}
-
-// A method that's safe for concurrent use because it doesn't touch the
-// heap.
-method {:concurrent} ConcurrentMethod(x: int) returns (r: int) {
-  return x;
-}
-
-method {:axiom} AxiomWithStuffInIt(x: int) returns (r: int) {
-  assume x > 0;
-  assume {:axiom} x > 10;
-
-  forall y : int
-    ensures y != y
-
-  var i := 0;
-  while i < x
-    decreases x - i
-
-  return x;
-}
-
-method AssertOnly() {
-  assert {:only} true;
-  assert false;
-}
-
-method {:only} MethodOnly() {
-  assert false;
-}
\ No newline at end of file
diff --git a/Test/auditor/TestAuditor.dfy-ietf.md.expect b/Test/auditor/TestAuditor.dfy-ietf.md.expect
deleted file mode 100644
index 64d49ab3be6..00000000000
--- a/Test/auditor/TestAuditor.dfy-ietf.md.expect
+++ /dev/null
@@ -1,83 +0,0 @@
-# Default module
-
-## Top level
-
-### Member `MinusBv8NoBody`
-
-* Ghost declaration has no body and has an ensures clause. MUST provide a body or add `{:axiom}`.
-
-### Member `LeftShiftBV128`
-
-* Declaration has explicit `{:axiom}` attribute. SHOULD provide a proof or test.
-
-* Ghost declaration has no body and has an ensures clause. MUST provide a body or add `{:axiom}`.
-
-### Member `MinusBv8Assume`
-
-* Definition has `assume` statement in body. MUST replace with `assert` and prove or add `{:axiom}`.
-
-### Member `GenerateBytes`
-
-* Declaration with `{:extern}` has a ensures clause. MUST test external callee.
-
-* Declaration with `{:extern}` has a requires clause. MUST test any external callers.
-
-### Member `GenerateBytesWithModel`
-
-* Declaration with `{:extern}` has a ensures clause. MUST test external callee.
-
-* Declaration with `{:extern}` has a requires clause. MUST test any external callers.
-
-### Member `GenerateBytesWrapper`
-
-* Definition has `assume {:axiom}` statement in body. SHOULD replace with `assert` and prove.
-
-### Member `GenerateBytesNoGuarantee`
-
-* Declaration with `{:extern}` has a requires clause. MUST test any external callers.
-
-### Member `ExternFunction`
-
-* Function with `{:extern}` attribute. SHOULD use `method` with `modifies *` instead.
-
-* Declaration with `{:extern}` has a ensures clause. MUST test external callee.
-
-### Member `DoesNotTerminate`
-
-* Method may not terminate (uses `decreases *`). SHOULD provide a valid `decreases` clause.
-
-### Member `ForallWithoutBody`
-
-* Definition contains `forall` statement with no body. MUST provide a body.
-
-### Member `LoopWithoutBody`
-
-* Definition contains loop with no body. MUST provide a body.
-
-### Member `ConcurrentMethod`
-
-* Declaration has `{:concurrent}` attribute. MUST manually review and test in a concurrent setting.
-
-### Member `AxiomWithStuffInIt`
-
-* Declaration has explicit `{:axiom}` attribute. SHOULD provide a proof or test.
-
-* Definition has `assume` statement in body. MUST replace with `assert` and prove or add `{:axiom}`.
-
-* Definition has `assume {:axiom}` statement in body. SHOULD replace with `assert` and prove.
-
-* Definition contains `forall` statement with no body. MUST provide a body.
-
-* Definition contains loop with no body. MUST provide a body.
-
-### Member `AssertOnly`
-
-* Assertion has explicit temporary `{:only}` attribute. MUST remove the `{:only}` attribute.
-
-### Member `MethodOnly`
-
-* Member has explicit temporary `{:only}` attribute. MUST remove the `{:only}` attribute.
-
-## Type `T`
-
-* Trait method calls may not terminate (uses `{:termination false}`). MUST remove `{:termination false}` or justify.
diff --git a/Test/auditor/TestAuditor.dfy.expect b/Test/auditor/TestAuditor.dfy.expect
deleted file mode 100644
index 1f6cadd0810..00000000000
--- a/Test/auditor/TestAuditor.dfy.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-TestAuditor.dfy(93,10): Warning: /!\ No terms found to trigger on.
-TestAuditor.dfy(95,4): Warning: /!\ No terms found to trigger on.
-TestAuditor.dfy(126,2): Warning: /!\ No terms found to trigger on.
-TestAuditor.dfy(137,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-TestAuditor.dfy(141,7): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
-TestAuditor.dfy(95,4): Warning: note, this forall statement has no body
-TestAuditor.dfy(102,4): Warning: note, this loop has no body (loop frame: i)
-TestAuditor.dfy(126,2): Warning: note, this forall statement has no body
-TestAuditor.dfy(130,2): Warning: note, this loop has no body (loop frame: i)
-TestAuditor.dfy(22,6): Warning: MinusBv8NoBody: Ghost declaration has no body and has an ensures clause. Possible mitigation: Provide a body or add `{:axiom}`.
-TestAuditor.dfy(27,15): Warning: LeftShiftBV128: Declaration has explicit `{:axiom}` attribute. Possible mitigation: Provide a proof or test.
-TestAuditor.dfy(38,2): Warning: MinusBv8Assume: Definition has `assume` statement in body. Possible mitigation: Replace with `assert` and prove or add `{:axiom}`.
-TestAuditor.dfy(45,17): Warning: GenerateBytes: Declaration with `{:extern}` has a ensures clause. Possible mitigation: Test external callee (maybe with `/testContracts`).
-TestAuditor.dfy(45,17): Warning: GenerateBytes: Declaration with `{:extern}` has a requires clause. Possible mitigation: Test any external callers (maybe with `/testContracts`).
-TestAuditor.dfy(50,17): Warning: GenerateBytesWithModel: Declaration with `{:extern}` has a ensures clause. Possible mitigation: Test external callee (maybe with `/testContracts`).
-TestAuditor.dfy(50,17): Warning: GenerateBytesWithModel: Declaration with `{:extern}` has a requires clause. Possible mitigation: Test any external callers (maybe with `/testContracts`).
-TestAuditor.dfy(60,2): Warning: GenerateBytesWrapper: Definition has `assume {:axiom}` statement in body. Possible mitigation: Replace with `assert` and prove.
-TestAuditor.dfy(68,17): Warning: GenerateBytesNoGuarantee: Declaration with `{:extern}` has a requires clause. Possible mitigation: Test any external callers (maybe with `/testContracts`).
-TestAuditor.dfy(72,19): Warning: ExternFunction: Function with `{:extern}` attribute. Possible mitigation: Turn into a `method` with `modifies *` or test thoroughly for lack of side effects.
-TestAuditor.dfy(72,19): Warning: ExternFunction: Declaration with `{:extern}` has a ensures clause. Possible mitigation: Test external callee (maybe with `/testContracts`).
-TestAuditor.dfy(83,7): Warning: DoesNotTerminate: Method may not terminate (uses `decreases *`). Possible mitigation: Provide a valid `decreases` clause.
-TestAuditor.dfy(95,4): Warning: ForallWithoutBody: Definition contains `forall` statement with no body. Possible mitigation: Provide a body.
-TestAuditor.dfy(102,4): Warning: LoopWithoutBody: Definition contains loop with no body. Possible mitigation: Provide a body.
-TestAuditor.dfy(118,21): Warning: ConcurrentMethod: Declaration has `{:concurrent}` attribute. Possible mitigation: Manually review and test in a concurrent setting.
-TestAuditor.dfy(122,16): Warning: AxiomWithStuffInIt: Declaration has explicit `{:axiom}` attribute. Possible mitigation: Provide a proof or test.
-TestAuditor.dfy(137,2): Warning: AssertOnly: Assertion has explicit temporary `{:only}` attribute. Possible mitigation: Remove the `{:only}` attribute.
-TestAuditor.dfy(141,15): Warning: MethodOnly: Member has explicit temporary `{:only}` attribute. Possible mitigation: Remove the `{:only}` attribute.
-TestAuditor.dfy(89,27): Warning: T: Trait method calls may not terminate (uses `{:termination false}`). Possible mitigation: Remove if possible.
-Dafny auditor completed with 19 findings
-
-Dafny program verifier did not attempt verification
diff --git a/Test/auditor/TestAuditor.dfy.md.expect b/Test/auditor/TestAuditor.dfy.md.expect
deleted file mode 100644
index 3de9949157e..00000000000
--- a/Test/auditor/TestAuditor.dfy.md.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-|Name|Compiled|Explicit Assumption|Extern|Issue|Mitigation|
-|----|--------|-------------------|------|-----|----------|
-| MinusBv8NoBody | False | False | False | Ghost declaration has no body and has an ensures clause. | Provide a body or add `{:axiom}`. |
-| LeftShiftBV128 | False | True | False | Declaration has explicit `{:axiom}` attribute. | Provide a proof or test. |
-| MinusBv8Assume | False | False | False | Definition has `assume` statement in body. | Replace with `assert` and prove or add `{:axiom}`. |
-| GenerateBytes | True | False | True | Declaration with `{:extern}` has a ensures clause. | Test external callee (maybe with `/testContracts`). |
-| GenerateBytes | True | False | True | Declaration with `{:extern}` has a requires clause. | Test any external callers (maybe with `/testContracts`). |
-| GenerateBytesWithModel | True | False | True | Declaration with `{:extern}` has a ensures clause. | Test external callee (maybe with `/testContracts`). |
-| GenerateBytesWithModel | True | False | True | Declaration with `{:extern}` has a requires clause. | Test any external callers (maybe with `/testContracts`). |
-| GenerateBytesWrapper | True | False | False | Definition has `assume {:axiom}` statement in body. | Replace with `assert` and prove. |
-| GenerateBytesNoGuarantee | True | False | True | Declaration with `{:extern}` has a requires clause. | Test any external callers (maybe with `/testContracts`). |
-| ExternFunction | True | False | True | Function with `{:extern}` attribute. | Turn into a `method` with `modifies *` or test thoroughly for lack of side effects. |
-| ExternFunction | True | False | True | Declaration with `{:extern}` has a ensures clause. | Test external callee (maybe with `/testContracts`). |
-| DoesNotTerminate | True | False | False | Method may not terminate (uses `decreases *`). | Provide a valid `decreases` clause. |
-| ForallWithoutBody | False | False | False | Definition contains `forall` statement with no body. | Provide a body. |
-| LoopWithoutBody | True | False | False | Definition contains loop with no body. | Provide a body. |
-| ConcurrentMethod | True | False | False | Declaration has `{:concurrent}` attribute. | Manually review and test in a concurrent setting. |
-| AxiomWithStuffInIt | True | True | False | Declaration has explicit `{:axiom}` attribute. | Provide a proof or test. |
-| AssertOnly | True | False | False | Assertion has explicit temporary `{:only}` attribute. | Remove the `{:only}` attribute. |
-| MethodOnly | True | False | False | Member has explicit temporary `{:only}` attribute. | Remove the `{:only}` attribute. |
-| T | True | False | False | Trait method calls may not terminate (uses `{:termination false}`). | Remove if possible. |
diff --git a/Test/benchmarks/sequence-race/SequenceRace.dfy.expect b/Test/benchmarks/sequence-race/SequenceRace.dfy.expect
deleted file mode 100644
index 385c4482cf9..00000000000
--- a/Test/benchmarks/sequence-race/SequenceRace.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Dafny program verifier finished with 2 verified, 0 errors
-SequenceRace.dfy(35,0): Error: The benchmarking plugin does not support this compilation target: Microsoft.Dafny.Compilers.CsharpCompiler (--target:cs)
-Wrote textual form of partial target program to SequenceRace.cs
diff --git a/Test/c++/Makefile b/Test/c++/Makefile
deleted file mode 100644
index 565d462d23c..00000000000
--- a/Test/c++/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-
-DAFNYS=$(wildcard *.dfy)
-CPPS=$(subst .dfy,.cpp,$(DAFNYS))
-DOT_H_S=$(subst .dfy,.h,$(DAFNYS))
-EXECS=$(subst .dfy,,$(DAFNYS))
-DAFNY_DIR=../..
-DAFNY=$(DAFNY_DIR)/Binaries/dafny
-DAFNY_RUNTIME_DIR=$(DAFNY_DIR)/Binaries
-DAFNY_RUNTIME_CPP=$(DAFNY_RUNTIME_DIR)/DafnyRuntime.h
-DAFNY_DEPS=$(DAFNY) $(DAFNY_RUNTIME_DIR)/Dafny.exe $(DAFNY_RUNTIME_DIR)/DafnyPipeline.dll $(DAFNY_RUNTIME_CPP)
-TEST_LOG=tests.log
-
-CXXFLAGS += -g -Wall -Wextra -Wpedantic -std=c++17 -I$(DAFNY_RUNTIME_DIR)
-
-.SECONDARY: $(CPPS)
-
-all:$(EXECS)
-
-vars:
-	echo $(DAFNYS)
-	echo $(CPPS)
-	echo $(EXECS)
-
-%.cpp: %.dfy $(DAFNY) $(DAFNY_DEPS)
-	$(DAFNY) /timeLimit:10 /compile:0 /spillTargetCode:3 /compileTarget:cpp ExternDefs.h $<
-
-%.cs: %.dfy $(DAFNY) $(DAFNY_DEPS)
-	$(DAFNY) /noVerify /compile:0 /spillTargetCode:3 /compileTarget:cs $<
-
-$(EXECS): % : %.cpp $(DAFNY_RUNTIME_CPP)
-	$(CXX) $(CXXFLAGS) -o $@ $<
-
-test: $(EXECS)
-	python run_cpp_tests.py $(EXECS)
-
-clean:
-	rm -f *.cpp *cs $(DOT_H_S) $(EXECS) $(TEST_LOG)
diff --git a/Test/c++/arrays.dfy b/Test/c++/arrays.dfy
deleted file mode 100644
index a02b57e5ff8..00000000000
--- a/Test/c++/arrays.dfy
+++ /dev/null
@@ -1,98 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-newtype uint32 = i:int | 0 <= i < 0x100000000
-
-method returnANullArray() returns (a: array?<uint32>)
-  ensures a == null
-{
-  a := null;
-}
-
-method returnANonNullArray() returns (a: array?<uint32>)
-  ensures a != null
-  ensures a.Length == 5
-{
-  a := new uint32[5];
-  a[0] := 1;
-  a[1] := 2;
-  a[2] := 3;
-  a[3] := 4;
-  a[4] := 5;
-}
-
-method LinearSearch(a: array<uint32>, len:uint32, key: uint32) returns (n: uint32)
-  requires a.Length == len as int
-  ensures 0 <= n <= len
-  ensures n == len || a[n] == key
-{
-  n := 0;
-  while n < len
-    invariant n <= len
-  {
-    if a[n] == key {
-      return;
-    }
-    n := n + 1;
-  }
-}
-
-method PrintArray<A>(a:array?<A>, len:uint32)
-  requires a != null ==> len as int == a.Length
-{
-  if (a == null) {
-    print "It's null\n";
-  } else {
-    var i:uint32 := 0;
-    while i < len {
-      print a[i], " ";
-      i := i + 1;
-    }
-    print "\n";
-  }
-}
-
-datatype ArrayDatatype = AD(ar: array<uint32>)
-
-method Main() {
-  var a := new uint32[23];
-  var i := 0;
-  while i < 23 {
-    a[i] := i;
-    i := i + 1;
-  }
-  PrintArray(a, 23);
-  var n := LinearSearch(a, 23, 17);
-  print n, "\n";
-  var s : seq<uint32> := a[..];
-  print s, "\n";
-  s := a[2..16];
-  print s, "\n";
-  s := a[20..];
-  print s, "\n";
-  s := a[..8];
-  print s, "\n";
-
-  // Conversion to sequence should copy elements (sequences are immutable!)
-  a[0] := 42;
-  print s, "\n";
-
-  PrintArray<uint32>(null, 0);
-
-  print "Null array:\n";
-  var a1 := returnANullArray();
-  PrintArray<uint32>(a1, 5);
-
-  print "Non-Null array:\n";
-  var a2 := returnANonNullArray();
-  PrintArray<uint32>(a2, 5);
-
-  print "Array in datatype:\n";
-  var someAr := new uint32[3];
-  someAr[0] := 1;
-  someAr[1] := 3;
-  someAr[2] := 9;
-  var ad := AD(someAr);
-  PrintArray<uint32>(ad.ar, 3);
-}
-
-
diff --git a/Test/c++/class.dfy b/Test/c++/class.dfy
deleted file mode 100644
index b10d703c981..00000000000
--- a/Test/c++/class.dfy
+++ /dev/null
@@ -1,179 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-newtype uint32 = i:int | 0 <= i < 0x100000000
-
-class MyClass {
-  var a: uint32
-  const b: uint32
-  const c:uint32 := 17
-  static const d: uint32
-  static const e:uint32 := 18
-
-  var ar: array<uint32>
-
-  constructor (x: uint32)
-    requires x < 100
-    ensures this.a < 300
-    ensures this.b < 300
-    ensures fresh(this.ar)
-  {
-    a := 100 + x;
-    b := 200 + x;
-    ar := new uint32[5];
-  }
-
-  function F(): uint32 { 8 }
-  static function G(): uint32 { 9 }
-  method M() returns (r: uint32) { r := 69; }
-  static method N() returns (r: uint32) { return 70; }
-
-  method stuffWithAr()
-    modifies this
-    modifies this.ar
-  {
-    print "stuffWithAr\n";
-    this.ar := new uint32[5];
-    this.ar[0] := 5;
-    print this.ar[0];
-    print "\n";
-  }
-}
-
-method CallEm(c: MyClass, t: MyClass, i: MyClass)
-  requires c.a as int + t.a as int + i.a as int < 1000
-  ensures c.ar == old(c.ar)
-  modifies c, t, i
-{
-  // instance fields
-
-  print c.a, " ", t.a, " ", i.a, " ";
-  c.a := c.a + 3;
-  t.a := t.a + 3;
-  i.a := i.a + 3;
-  print c.a, " ", t.a, " ", i.a, "\n";
-
-  // (instance and static) members via instance
-
-  var u;
-
-  print c.b, " ";
-  print c.c, " ";
-  print c.d, " ";
-  print c.e, " ";
-  print c.F(), " ";
-  print c.G(), " ";
-  u := c.M();
-  print u, " ";
-  u := c.N();
-  print u, "\n";
-
-  print t.b, " ";
-  print t.c, " ";
-  print t.d, " ";
-  print t.e, " ";
-  print t.F(), " ";
-  print t.G(), " ";
-  u := t.M();
-  print u, " ";
-  u := t.N();
-  print u, "\n";
-
-  print i.b, " ";
-  print i.c, " ";
-  print i.d, " ";
-  print i.e, " ";
-  print i.F(), " ";
-  print i.G(), " ";
-  u := i.M();
-  print u, " ";
-  u := i.N();
-  print u, "\n";
-
-  // static members via type name
-
-  print MyClass.d, " ";
-  print MyClass.e, " ";
-  print MyClass.G(), " ";
-  u := MyClass.N();
-  print u, "\n";
-
-  print MyClass.d, " ";
-  print MyClass.e, " ";
-  print MyClass.G(), " ";
-  u := MyClass.N();
-  print u, "\n";
-
-  print MyClass.d, " ";
-  print MyClass.e, " ";
-  print MyClass.G(), " ";
-  u := MyClass.N();
-  print u, "\n";
-}
-
-
-method TestMyClass()
-{
-  var c := new MyClass(3);
-  var t := new MyClass(2);
-  var i := new MyClass(2);
-  print t == t, " ", i == i, " ", i == t, "\n";
-  var t2 : MyClass := t;
-  var t3 : MyClass;
-  t3 := t;
-  CallEm(c, t, i);
-  c.stuffWithAr();
-}
-
-
-class AClass {
-  var x:uint32
-  var y:uint32
-
-  constructor()
-  {
-    x := 0;
-    y := 0;
-  }
-}
-
-method TestEquality() {
-  var a := new AClass();
-  a.x := 25;
-  a.y := 15;
-
-  if a == a {
-    print "EqualityReflexive: This is expected\n";
-  } else {
-    print "EqualityReflexive: This is unexpected\n";
-    assert false;
-  }
-
-  var b := new AClass();
-  b.x := 1;
-  b.y := 2;
-
-  if a == b {
-    print "ClassAndPtrDiffer: This is unexpected\n";
-    assert false;
-  } else {
-    print "ClassAndPtrDiffer: This is expected\n";
-  }
-
-  var c := new AClass();
-  c.x := 25;
-  c.y := 15;
-
-
-  if a == c {
-    print "DeepEquality: This is unexpected\n";
-    assert false;
-  } else {
-    print "DeepEquality: This is expected\n";
-  }
-}
-
-method Main() {
-  TestMyClass();
-  TestEquality();
-}
-
diff --git a/Test/c++/const.dfy b/Test/c++/const.dfy
deleted file mode 100644
index 1bfb79f0361..00000000000
--- a/Test/c++/const.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-module Holder {
-  const x:bool := false
-}
-
-module User {
-  import opened Holder
-
-  method Use() {
-    var b := x;
-  }
-
-  method Main() {
-    Use();
-  }
-}
diff --git a/Test/c++/datatypes.dfy b/Test/c++/datatypes.dfy
deleted file mode 100644
index f56b7907cc3..00000000000
--- a/Test/c++/datatypes.dfy
+++ /dev/null
@@ -1,166 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-newtype uint32 = i:int | 0 <= i < 0x100000000
-
-datatype Op =
-  | NoOp
-  | PushOp(ghost id: int)
-
-datatype Example1 = Example1(u:uint32, b:bool)
-datatype Example2 = Ex2a(u:uint32) | Ex2b(b:bool)
-datatype Example3 = Example3(e:Example1)
-datatype Example4 = Ex4a | Ex4b
-datatype Example5<V> = Ex5a(v:V) | Ex5b(b:bool)
-datatype Example6 = Ex6a(u:uint32) | Ex6b(b:bool) | Ex6c(u:uint32, s:seq<bool>)
-type Ex1Sub = d:Example1 | d.u == 0 witness Example1(0, true)
-type Ex2Sub = d:Example2 | d.Ex2a? && d.u == 0 witness Ex2a(0)
-type Ex3Sub = d:Example3 | d.e.b witness Example3(Example1(42, true))
-
-datatype DtPointer = DtPointer(s:seq<uint32>)
-datatype DtPointerHolder = DtPointerHolder(e:DtPointer) | Other(f:bool)
-
-method Matcher(e:Example1) {
-  match e {
-    case Example1(u, b) => print u, b;
-  }
-}
-
-method TupleMatch(e1:Example2, e2:Example2) {
-  match (e1, e2) {
-    case (Ex2a(u1), Ex2a(u2)) => print u1, u2, "\n";
-    case (Ex2b(u1), Ex2a(u2)) => print u1, u2, "\n";
-    case (Ex2a(u1), Ex2b(u2)) => print u1, u2, "\n";
-    case (Ex2b(u1), Ex2b(u2)) => print u1, u2, "\n";
-  }
-}
-
-method Callee(e:Example2) {
-  match e {
-    case Ex2a(u) => print "Case A: ", u, "\n";
-    case Ex2b(b) => print "Case B: ", b, "\n";
-  }
-}
-
-method DtUpdate(e:Example1)
-{
-  var x := e.(u := 0);
-}
-
-method TestDestructor() {
-  var e1 := Example1(22, false);
-  var x := e1.u;
-  if x == 22 {
-    print "This is expected\n";
-  } else {
-    assert false;
-    print "This is unexpected!!!\n";
-  }
-}
-
-datatype Option<V> = None | Some(value:V)
-
-method TestGenericDefault() {
-  var x:Option<Example5<bool>>;
-}
-
-datatype Err<V> = Fail(err:bool) | Ok(value:V)
-
-method matcher(e:Err<uint32>) {
-  match e {
-    case Fail(s) => print s;
-    case Ok(v) => print v;
-  }
-  print "\n";
-}
-
-method GenericTest() {
-  var v:Option<uint32> := Some(32);
-  matcher(Ok(42));
-  matcher(Fail(true));
-  if v.Some? { print "Got some:", v.value, "\n"; }
-}
-
-method Comparison(x0:Example1, x1:Example1, y0:Example4, y1:Example4) {
-  if x0 == x1 {
-    print "Example1s are equal\n";
-  }
-  if x0 != x1 {
-    print "Example1s are not equal\n";
-  }
-  if y0 == y1 {
-    print "Example4s are equal\n";
-  }
-  if y0 != y1 {
-    print "Example4s are not equal\n";
-  }
-}
-
-
-datatype Dup = Dup1(b:bool, x:uint32) | Dup2(x:uint32)
-
-method DupTest(d:Dup)
-{
-  var y := d.x;
-  print y;
-  print "\n";
-}
-
-method DupTestTest()
-{
-  DupTest(Dup1(false, 42));
-  DupTest(Dup2(330));
-}
-
-datatype IntList =
-  | Nil
-  | Cons(hd:uint32, tl:IntList)
-
-method IntListLen(l:IntList) returns (len:uint32)
-{
-  match l {
-    case Nil => len := 0;
-    case Cons(hd, tl) =>
-      var len_rest := IntListLen(tl);
-      if len_rest < 0xFFFFFFFF {
-        len := len_rest + 1;
-      } else {
-        len := len_rest;
-      }
-  }
-}
-
-// Test generic datatype methods
-datatype Foo<A> = Foo(a: A) {
-  static method Alloc(a: A) returns (f: Foo<A>) {
-    f := Foo(a);
-  }
-}
-
-datatype Test<A> = Test(a:A) | Empty
-{
-  static method Alloc() returns (t:Test<A>) {
-    return Empty;
-  }
-
-  static method Invoke() {
-    var a := Alloc();
-  }
-}
-
-method Main() {
-  var e1 := Example1(22, false);
-  var e2 := Ex2a(42);
-  Callee(e2);
-  e2 := Ex2b(true);
-  Callee(e2);
-  TestDestructor();
-  GenericTest();
-  Comparison(Example1(42, true), Example1(42, true), Ex4b, Ex4b);
-  Comparison(Example1(42, false), Example1(42, true), Ex4a, Ex4a);
-  Comparison(Example1(2,  false), Example1(42, false), Ex4a, Ex4b);
-  DupTestTest();
-
-  var len := IntListLen(Cons(15, Cons(18, Cons(330, Nil))));
-  print len, "\n";
-}
-
diff --git a/Test/c++/datatypes.dfy.go.check b/Test/c++/datatypes.dfy.go.check
deleted file mode 100644
index ce7cb820f5c..00000000000
--- a/Test/c++/datatypes.dfy.go.check
+++ /dev/null
@@ -1,2 +0,0 @@
-// https://github.com/dafny-lang/dafny/issues/4114
-// CHECK: Err \(variable of type bool\) is not a type
diff --git a/Test/c++/generic.dfy b/Test/c++/generic.dfy
deleted file mode 100644
index 374c545b9c1..00000000000
--- a/Test/c++/generic.dfy
+++ /dev/null
@@ -1,35 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-class Test<T> {
-  var t:T
-
-  constructor (e:T) {
-    t := e;
-  }
-}
-
-class UseTest<T> {
-  constructor () {}
-  method DoSomething(t:Test<T>)
-  {
-    var x:Test<T> := t;
-  }
-}
-
-
-datatype Err<V> = Fail(b:bool) | Ok(value:V)
-method ErrTest() returns (e:Err<bool>)
-{
-  return Fail(false);
-}
-
-method GenericIO<A>(a:A) returns (a':A)
-{
-  a' := a;
-}
-
-method Main() {
-  var t := new Test(true);
-  var u := new UseTest();
-  u.DoSomething(t);
-}
diff --git a/Test/c++/hello.dfy b/Test/c++/hello.dfy
deleted file mode 100644
index 523d3152209..00000000000
--- a/Test/c++/hello.dfy
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-method Main() {
-  print "Hello world\n";
-}
diff --git a/Test/c++/recursion.dfy b/Test/c++/recursion.dfy
deleted file mode 100644
index 36048aab527..00000000000
--- a/Test/c++/recursion.dfy
+++ /dev/null
@@ -1,37 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-newtype uint32 = i:int | 0 <= i < 0x100000000
-
-method R0(x:bool)
-{
-  if x {
-    print "x\n";
-    R1(false);
-  } else {
-    print "!x\n";
-  }
-}
-
-method R1(y:bool)
-{
-  if y {
-    print "y\n";
-    R0(false);
-  } else {
-    print "!y\n";
-  }
-}
-
-method CallSelf(x:uint32) {
-  if x == 0 {
-    print "Done\n";
-  } else {
-    print x, "\n";
-    CallSelf(x - 1);
-  }
-}
-
-method Main() {
-  R0(true);
-  CallSelf(3);
-}
diff --git a/Test/c++/returns.dfy b/Test/c++/returns.dfy
deleted file mode 100644
index 5edb6581333..00000000000
--- a/Test/c++/returns.dfy
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-newtype uint64 = i:int | 0 <= i < 0x10000000000000000
-
-method multi() returns (x:uint64, y:uint64)
-{
-  x := 1;
-  y := 2;
-}
-
-method Main()
-{
-  var x, y := multi();
-  print x, y, "\n";
-}
diff --git a/Test/c++/tuple.dfy.expect b/Test/c++/tuple.dfy.expect
deleted file mode 100644
index 08a237fe13c..00000000000
--- a/Test/c++/tuple.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Dafny program verifier finished with 6 verified, 0 errors
-1
diff --git a/Test/c++/while.dfy b/Test/c++/while.dfy
deleted file mode 100644
index 0c0d7ee98df..00000000000
--- a/Test/c++/while.dfy
+++ /dev/null
@@ -1,21 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-newtype uint32 = i:int | 0 <= i < 0x100000000
-
-method Main() {
-  var x:uint32 := 0;
-
-  while (x < 10) {
-    print x, "\n";
-    x := x + 1;
-  }
-
-  print "\n";
-
-  x := 0;
-  while (x < 10) {
-    print x, "\n";
-    if (x == 5) { break; }
-    x := x + 1;
- }
-}
diff --git a/Test/cli/badProverPath.dfy b/Test/cli/badProverPath.dfy
deleted file mode 100644
index c1c176948e3..00000000000
--- a/Test/cli/badProverPath.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %exits-with 4 %baredafny verify %args --solver-path=doesNotExist "%s" > "%t"
-// RUN: %OutputCheck --file-to-check "%t" "%s"
-// CHECK: Fatal Error: ProverException: Cannot find specified prover:.*
-method m() {
-  assert 1 + 1 == 2;
-}
diff --git a/Test/cli/diagnosticsFormats.dfy.expect b/Test/cli/diagnosticsFormats.dfy.expect
deleted file mode 100644
index 8da54471c6b..00000000000
--- a/Test/cli/diagnosticsFormats.dfy.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-diagnosticsFormats.dfy(15,0): Warning: module-level const declarations are always non-instance, so the 'static' keyword is not allowed here
-diagnosticsFormats.dfy(16,17): Error: result of operation might violate newtype constraint for 'byte'
-diagnosticsFormats.dfy(19,16): Error: a precondition for this call could not be proved
-diagnosticsFormats.dfy(18,35): Related location: this is the precondition that could not be proved
-
-Dafny program verifier finished with 1 verified, 2 errors
-{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":15,"character":0}}},"severity":2,"message":"module-level const declarations are always non-instance, so the \u0027static\u0027 keyword is not allowed here","source":"Parser","relatedInformation":[]}
-{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":16,"character":17}}},"severity":1,"message":"Error: result of operation might violate newtype constraint for \u0027byte\u0027","source":"Verifier","relatedInformation":[]}
-{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":19,"character":16}}},"severity":1,"message":"Error: a precondition for this call could not be proved","source":"Verifier","relatedInformation":[{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":18,"character":35}}},"message":"Related location: this is the precondition that could not be proved"}]}
-
-Dafny program verifier finished with 1 verified, 2 errors
-{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":15,"character":0}}},"severity":2,"message":"module-level const declarations are always non-instance, so the \u0027static\u0027 keyword is not allowed here","source":"Parser","relatedInformation":[]}
-{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":14,"character":8}}},"severity":4,"message":"newtype byte resolves as {:nativeType \u0022byte\u0022} (Detected Range: 0 .. 256)","source":"Resolver","relatedInformation":[]}
-{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":16,"character":17}}},"severity":1,"message":"Error: result of operation might violate newtype constraint for \u0027byte\u0027","source":"Verifier","relatedInformation":[]}
-{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":19,"character":16}}},"severity":1,"message":"Error: a precondition for this call could not be proved","source":"Verifier","relatedInformation":[{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":18,"character":35}}},"message":"Related location: this is the precondition that could not be proved"}]}
-
-Dafny program verifier finished with 1 verified, 2 errors
-{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":15,"character":0}}},"severity":2,"message":"module-level const declarations are always non-instance, so the \u0027static\u0027 keyword is not allowed here","source":"Parser","relatedInformation":[]}
-{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":16,"character":17}}},"severity":1,"message":"Error: result of operation might violate newtype constraint for \u0027byte\u0027","source":"Verifier","relatedInformation":[]}
-{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":19,"character":14},"end":{"line":19,"character":18}}},"severity":1,"message":"Error: a precondition for this call could not be proved","source":"Verifier","relatedInformation":[{"location":{"filename":"diagnosticsFormats.dfy","uri":"file:///diagnosticsFormats.dfy","range":{"start":{"line":18,"character":35},"end":{"line":18,"character":35}}},"message":"Related location: this is the precondition that could not be proved"}]}
-
-Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Test/cli/errorLimit.dfy.expect b/Test/cli/errorLimit.dfy.expect
deleted file mode 100644
index 0eafa70c6d2..00000000000
--- a/Test/cli/errorLimit.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-errorLimit.dfy(5,13): Error: assertion could not be proved
-errorLimit.dfy(7,13): Error: assertion could not be proved
-errorLimit.dfy(9,13): Error: assertion could not be proved
-errorLimit.dfy(11,13): Error: assertion could not be proved
-errorLimit.dfy(13,13): Error: assertion could not be proved
-errorLimit.dfy(15,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 6 errors
diff --git a/Test/cli/libraryOption/libraryOption.dfy b/Test/cli/libraryOption/libraryOption.dfy
deleted file mode 100644
index 44b69ea9413..00000000000
--- a/Test/cli/libraryOption/libraryOption.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: ! %baredafny verify %args --library=%S/Inputs/brokenProducer.dfy "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-function Foo(): int {
-  Bar()
-}
diff --git a/Test/cli/libraryOption/libraryOption.dfy.expect b/Test/cli/libraryOption/libraryOption.dfy.expect
deleted file mode 100644
index 98cc15b6f78..00000000000
--- a/Test/cli/libraryOption/libraryOption.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-brokenProducer.dfy(1,9): Error: Function body type mismatch (expected int, got bool)
-1 resolution/type errors detected in the_program
diff --git a/Test/cli/projectFile/libraries/dfyconfig.toml b/Test/cli/projectFile/libraries/dfyconfig.toml
deleted file mode 100644
index e0964ef6199..00000000000
--- a/Test/cli/projectFile/libraries/dfyconfig.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-excludes = ["wrappersLib.dfy"]
-
-[options]
-library = [
-  "wrappersLib.dfy"
-]
\ No newline at end of file
diff --git a/Test/cli/projectFile/libraries/usesLibrary.dfy b/Test/cli/projectFile/libraries/usesLibrary.dfy
deleted file mode 100644
index 7b7e80ab7b3..00000000000
--- a/Test/cli/projectFile/libraries/usesLibrary.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %baredafny resolve --use-basename-for-filename "%S/dfyconfig.toml" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module Consumer {
-
-  import opened Wrappers
-
-  function MaybeInt(): Option<int> {
-    Some(42)
-  }
-
-}
\ No newline at end of file
diff --git a/Test/cli/projectFile/projectFile.dfy b/Test/cli/projectFile/projectFile.dfy
deleted file mode 100644
index d9d6eeb077e..00000000000
--- a/Test/cli/projectFile/projectFile.dfy
+++ /dev/null
@@ -1,37 +0,0 @@
-// A project file can specify input files and configure options
-// RUN: %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/dfyconfig.toml" > "%t"
-
-// Test using a URL instead of a local file as a project file
-// RUN: ! %baredafny resolve --show-snippets:false --use-basename-for-filename "https://github.com/dafny-lang/dafny/blob/master/dfyconfig.toml"
-
-// Test option override behavior
-// RUN: %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/dfyconfig.toml" --warn-shadowing=false >> "%t"
-
-// Test option with default override behavior
-// RUN: ! %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/dfyconfig.toml" --function-syntax=3 >> "%t"
-
-// Multiple project files are not allowed
-// RUN: ! %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/dfyconfig.toml" "%S/broken/dfyconfig.toml"
-
-// Project files may not contain unknown properties
-// RUN: ! %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/broken/dfyconfig.toml"
-
-// Warn if file contains options that don't exist
-// RUN: %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/broken/invalidOption.toml" >> "%t"
-
-// Project files must be files on disk.
-// RUN: ! %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/doesNotExist/dfyconfig.toml"
-
-// Project file options must have the right type
-// RUN: ! %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/badTypes/dfyconfig.toml" 2>> "%t"
-
-// A project file without includes will take all .dfy files as input
-// RUN: %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/noIncludes/dfyconfig.toml" >> "%t"
-
-// Files included by the project file and on the CLI, duplicate is ignored.
-// RUN: %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/dfyconfig.toml" "%S/src/input.dfy" >> "%t"
-
-// Files excluded by the project file and included on the CLI, are included
-// RUN: ! %baredafny resolve --show-snippets:false --use-basename-for-filename "%S/dfyconfig.toml" "%S/src/excluded.dfy" >> "%t"
-
-// RUN: %diff "%s.expect" "%t"
diff --git a/Test/cli/projectFile/projectFile.dfy.expect b/Test/cli/projectFile/projectFile.dfy.expect
deleted file mode 100644
index 82778703cd4..00000000000
--- a/Test/cli/projectFile/projectFile.dfy.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-input.dfy(6,8): Warning: Shadowed local-variable name: x
-
-Dafny program verifier did not attempt verification
-
-Dafny program verifier did not attempt verification
-input.dfy(10,0): Error: a function cannot be declared 'ghost' (it is 'ghost' by default when using --function-syntax:3)
-1 parse errors detected in input.dfy
-Warning: only Dafny project files named dfyconfig.toml are recognised by the Dafny IDE.
-Warning: option 'does-not-exist' that was specified in the project file, is not a valid Dafny option.
-
-Dafny program verifier did not attempt verification
-Error: property 'warn-shadowing' is of type 'System.Int64' but should be of type 'System.Boolean'
-input.dfy(6,8): Warning: Shadowed local-variable name: x
-moreInput.dfy(6,8): Warning: Shadowed local-variable name: x
-
-Dafny program verifier did not attempt verification
-input.dfy(6,8): Warning: Shadowed local-variable name: x
-
-Dafny program verifier did not attempt verification
-input.dfy(3,7): Error: Duplicate member name: Foo
-excluded.dfy(6,8): Warning: Shadowed local-variable name: z
-input.dfy(6,8): Warning: Shadowed local-variable name: x
-1 resolution/type errors detected in the_program
diff --git a/Test/cli/proverPath.dfy b/Test/cli/proverPath.dfy
deleted file mode 100644
index 482e9befc61..00000000000
--- a/Test/cli/proverPath.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %baredafny verify %args --solver-path="%z3" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-// UNSUPPORTED: windows
-method m() {
-  assert 1 + 1 == 2;
-}
diff --git a/Test/cli/solverLog.dfy b/Test/cli/solverLog.dfy
deleted file mode 100644
index db4669c889a..00000000000
--- a/Test/cli/solverLog.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %baredafny verify %args --solver-log="log.smt2" --resource-limit 10 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-// RUN: %OutputCheck --file-to-check "log.smt2" "%s"
-// CHECK: rlimit 10000
-method m() {
-  assert 1 + 1 == 2;
-}
diff --git a/Test/cli/solverOpt.dfy b/Test/cli/solverOpt.dfy
deleted file mode 100644
index 63f24897ff8..00000000000
--- a/Test/cli/solverOpt.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %exits-with 4 %baredafny verify %args --boogie -trace --solver-option BATCH_MODE=true "%s" > "%t"
-// RUN: %OutputCheck --file-to-check "%t" "%s"
-// CHECK: Running in batch mode.
-method M(x: int) {
-  if x == 1 {
-    assert x != 1;
-  } else if x == 2 {
-    assert x != 2;
-  } else if x == 3 {
-    assert x != 3;
-  }
-}
diff --git a/Test/cloudmake/CloudMake-CachedBuilds.dfy.expect b/Test/cloudmake/CloudMake-CachedBuilds.dfy.expect
deleted file mode 100644
index 768f6cc2026..00000000000
--- a/Test/cloudmake/CloudMake-CachedBuilds.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-CloudMake-CachedBuilds.dfy(107,6): Warning: a forall statement with no bound variables is deprecated; use an 'assert by' statement instead
-CloudMake-CachedBuilds.dfy(447,4): Warning: a forall statement with no bound variables is deprecated; use an 'assert by' statement instead
-CloudMake-CachedBuilds.dfy(1249,8): Warning: a forall statement with no bound variables is deprecated; use an 'assert by' statement instead
-
-Dafny program verifier finished with 76 verified, 0 errors
diff --git a/Test/cloudmake/CloudMake-ConsistentBuilds.dfy b/Test/cloudmake/CloudMake-ConsistentBuilds.dfy
deleted file mode 100644
index cbc42e19353..00000000000
--- a/Test/cloudmake/CloudMake-ConsistentBuilds.dfy
+++ /dev/null
@@ -1,663 +0,0 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" /autoTriggers:0 /restartProver "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-/******* State *******/
-type State
-
-ghost function GetSt(p: Path, st: State): Artifact
-ghost function SetSt(p: Path, a: Artifact, st: State): State
-
-ghost function DomSt(st: State): set<Path>
-
-ghost function Restrict(paths: set<Path>, st: State): State
-  requires paths <= DomSt(st)
-  ensures
-    var st' := Restrict(paths, st);
-    DomSt(st') == paths && forall p :: p in paths ==> GetSt(p, st) == GetSt(p, st')
-
-ghost function Union(st: State, st': State): State
-  ensures
-    var result := Union(st, st');
-    DomSt(result) == DomSt(st) + DomSt(st') &&
-    forall p :: p in DomSt(result) ==>
-      (p in DomSt(st) ==> GetSt(p, result) == GetSt(p, st)) &&
-      (p in DomSt(st') ==> GetSt(p, result) == GetSt(p, st'))
-
-lemma StateEqualityProperty(st: State, st': State)
-  requires DomSt(st) == DomSt(st')
-  requires forall p :: p in DomSt(st) ==> GetSt(p, st) == GetSt(p, st')
-  ensures st == st'
-
-/******* Cached state *******/
-datatype StateC = S(st: State, c: Cache)
-
-ghost function EmptyCache(): Cache
-  ensures DomC(EmptyCache()) == {}
-
-ghost function GetC(h: HashValue, c: Cache): Triple<Expression, Expression, string>
-ghost function SetC(h: HashValue, cmd: Triple<Expression, Expression, string>, c: Cache): Cache
-  ensures DomC(SetC(h, cmd, c)) == DomC(c) + {h}
-
-ghost function UpdateC(cmd: Expression, deps: Expression, exts: Expression, stC: StateC): StateC
-  requires
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings?
-  ensures
-    var stC' := UpdateC(cmd, deps, exts, stC);
-    var hashValues := set e | e in exts.lit.strs :: Hash(Loc(cmd, deps, e));
-    stC'.st == stC.st &&
-    DomC(stC.c) + hashValues == DomC(stC'.c)
-  decreases exts.lit.strs
-{
-  var strs := exts.lit.strs;
-  if strs == {} then
-    stC
-  else
-    var e := Choose(strs);
-    var c' := SetC(Hash(Loc(cmd, deps, e)), Trio(cmd, deps, e), stC.c);
-    var exts' := exprLiteral(litArrOfStrings(strs - {e}));
-    UpdateC(cmd, deps, exts', S(stC.st, c'))
-}
-
-lemma UpdateCLemma(cmd: Expression, deps: Expression, exts: Expression, stC: StateC)
-  requires
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
-    ConsistentCache(stC) &&
-    forall e :: e in exts.lit.strs ==> Loc(cmd, deps, e) in DomSt(stC.st)
-  ensures
-    var stC' := UpdateC(cmd, deps, exts, stC);
-    ConsistentCache(stC') &&
-    forall e :: e in exts.lit.strs ==> Hash(Loc(cmd, deps, e)) in DomC(stC'.c)
-  decreases exts.lit.strs
-{
-  var strs := exts.lit.strs;
-  var stC' := UpdateC(cmd, deps, exts, stC);
-  if strs == {} {
-  } else {
-    var e := Choose(strs);
-    var c' := SetC(Hash(Loc(cmd, deps, e)), Trio(cmd, deps, e), stC.c);
-    var exts' := exprLiteral(litArrOfStrings(strs - {e}));
-    // note: This assertion is necessary.
-    assert stC' == UpdateC(cmd, deps, exts', S(stC.st, c'));
-    forall (cmd', deps', e' | Hash(Loc(cmd', deps', e')) == Hash(Loc(cmd, deps, e))) {
-      HashProperty(cmd', deps', e', cmd, deps, e);
-    }
-  }
-}
-
-ghost function Choose(ss: set<string>): string
-  requires ss != {}
-{
-  var s :| s in ss; s
-}
-
-ghost function DomC(c: Cache): set<HashValue>
-
-ghost function UnionC(stC: StateC, stC': StateC): StateC
-  ensures
-    var result := UnionC(stC, stC');
-    DomSt(result.st) == DomSt(stC.st) + DomSt(stC'.st) &&
-    (forall p :: p in DomSt(result.st) ==>
-      (p in DomSt(stC.st) ==> GetSt(p, result.st) == GetSt(p, stC.st)) &&
-      (p in DomSt(stC'.st) ==> GetSt(p, result.st) == GetSt(p, stC'.st))) &&
-    DomC(result.c) == DomC(stC.c) + DomC(stC'.c) &&
-    (forall h :: h in DomC(result.c) ==>
-      (h in DomC(stC.c) ==> GetC(h, result.c) == GetC(h, stC.c)) &&
-      (h in DomC(stC'.c) ==> GetC(h, result.c) == GetC(h, stC'.c)))
-
-ghost predicate CompatibleC(stsC: set<StateC>)
-{
-  forall stC, stC', p, h ::
-    stC in stsC && stC' in stsC &&
-    p in DomSt(stC.st) && p in DomSt(stC'.st) &&
-    h in DomC(stC.c) && h in DomC(stC'.c) ==>
-      GetSt(p, stC.st) == GetSt(p, stC'.st) && GetC(h, stC.c) == GetC(h, stC'.c)
-}
-
-ghost function CombineC(stsC: set<StateC>): StateC
-  requires stsC != {}
-  ensures
-    var stCombinedC := CombineC(stsC);
-    (forall stC :: stC in stsC ==> DomSt(stC.st) <= DomSt(stCombinedC.st)) &&
-    (forall stC, p :: stC in stsC && p in DomSt(stC.st) ==>
-      GetSt(p, stC.st) == GetSt(p, stCombinedC.st)) &&
-    (forall p :: p in DomSt(stCombinedC.st) ==> exists stC :: stC in stsC && p in DomSt(stC.st)) &&
-    (forall stC :: stC in stsC ==> DomC(stC.c) <= DomC(stCombinedC.c)) &&
-    (forall stC, h :: stC in stsC && h in DomC(stC.c) ==>
-      GetC(h, stC.c) == GetC(h, stCombinedC.c)) &&
-    (forall h :: h in DomC(stCombinedC.c) ==> exists stC :: stC in stsC && h in DomC(stC.c))
-{
-  var stC :| stC in stsC;
-  if stsC == {stC} then
-    stC
-  else
-    UnionC(stC, CombineC(stsC - {stC}))
-}
-
-lemma CombineCLemma(stsC: set<StateC>)
-  requires stsC != {}
-  requires forall stC :: stC in stsC ==> ConsistentCache(stC)
-  ensures
-   var stC' := CombineC(stsC);
-   ConsistentCache(stC')
-{
-}
-
-ghost predicate ConsistentCache(stC: StateC)
-{
-  forall cmd, deps, e :: Hash(Loc(cmd, deps, e)) in DomC(stC.c) ==>
-    Loc(cmd, deps, e) in DomSt(stC.st)
-}
-
-/******* {true} init {consistent_cache} *******/
-ghost function ClearCache(stC: StateC): StateC
-  ensures
-    var stC' := ClearCache(stC);
-    // note: This follows directly from the definition.
-    stC.st == stC'.st && DomC(stC'.c) == {} &&
-    ConsistentCache(stC')
-{
-  S(stC.st, EmptyCache())
-}
-
-/******* Environment *******/
-type Env
-
-ghost function EmptyEnv(): Env
-ghost function GetEnv(id: Identifier, env: Env): Expression
-  ensures Value(GetEnv(id, env))
-ghost function SetEnv(id: Identifier, expr: Expression, env: Env): Env
-  requires Value(expr)
-
-/******* Primitive function 'exec' *******/
-ghost function exec(cmd: Expression, deps: Expression, exts: Expression, st: State): Tuple<Expression, State>
-
-lemma ExecProperty(cmd: Expression, deps: Expression, exts: Expression, st: State)
-  requires
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
-    deps.lit.paths <= DomSt(st) &&
-    Pre(cmd, deps, exts, Restrict(deps.lit.paths, st))
-  ensures
-    var result := exec(cmd, deps, exts, st);
-    var expr', st' := result.fst, result.snd;
-    expr'.exprLiteral? && expr'.lit.litArrOfPaths? &&
-    expr'.lit.paths <= DomSt(st') &&
-    // note: We need this for the precondition of Restrict.
-    DomSt(st) <= DomSt(st') && st == Restrict(DomSt(st), st') &&
-    OneToOne(cmd, deps, exts, expr') &&
-    Post(cmd, deps, exts, Restrict(deps.lit.paths, st')) &&
-    forall p :: p !in DomSt(st) && p in DomSt(st') ==> p.OpaquePath?
-
-ghost predicate Pre(cmd: Expression, deps: Expression, exts: Expression, st: State)
-  requires
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings?
-{
-  forall e :: e in exts.lit.strs ==>
-    Loc(cmd, deps, e) in DomSt(st) ==> GetSt(Loc(cmd, deps, e), st) == Res(cmd, deps, e, st)
-}
-
-ghost predicate Post(cmd: Expression, deps: Expression, exts: Expression, st: State)
-  requires
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings?
-{
-  forall e :: e in exts.lit.strs ==>
-    Loc(cmd, deps, e) in DomSt(st) && GetSt(Loc(cmd, deps, e), st) == Res(cmd, deps, e, st)
-}
-
-ghost function Res(cmd: Expression, deps: Expression, ext: string, st: State): Artifact
-
-ghost predicate OneToOne(cmd: Expression, deps: Expression, exts: Expression, paths: Expression)
-  requires
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
-    paths.exprLiteral? && paths.lit.litArrOfPaths?
-{
-  forall e :: e in exts.lit.strs ==> Loc(cmd, deps, e) in paths.lit.paths
-}
-
-ghost function Loc(cmd: Expression, deps: Expression, ext: string): Path
-
-/******* Primitive function 'execC' *******/
-ghost function execC(cmd: Expression, deps: Expression, exts: Expression, stC: StateC): Tuple<Expression, StateC>
-  requires
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings?
-{
-  if forall e | e in exts.lit.strs :: Hash(Loc(cmd, deps, e)) in DomC(stC.c) then
-    var paths := set e | e in exts.lit.strs :: Loc(cmd, deps, e);
-    var expr' := exprLiteral(litArrOfPaths(paths));
-    Pair(expr', stC)
-  else
-    var result := exec(cmd, deps, exts, stC.st);
-    var expr', st' := result.fst, result.snd;
-    var stC' := UpdateC(cmd, deps, exts, S(st', stC.c));
-    Pair(expr', stC')
-}
-
-lemma ExecCProperty(cmd: Expression, deps: Expression, exts: Expression, stC: StateC)
-  requires
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
-    deps.lit.paths <= DomSt(stC.st) &&
-    PreC(cmd, deps, exts, stC) &&
-    ConsistentCache(stC)
-  ensures
-    var result := execC(cmd, deps, exts, stC);
-    var expr', stC' := result.fst, result.snd;
-    expr'.exprLiteral? && expr'.lit.litArrOfPaths? &&
-    expr'.lit.paths <= DomSt(stC'.st) &&
-    // note: We need this for the precondition of Restrict.
-    DomSt(stC.st) <= DomSt(stC'.st) && stC.st == Restrict(DomSt(stC.st), stC'.st) &&
-    OneToOne(cmd, deps, exts, expr') &&
-    PostC(cmd, deps, exts, stC') &&
-    (forall p :: p !in DomSt(stC.st) && p in DomSt(stC'.st) ==> p.OpaquePath?) &&
-    ConsistentCache(stC')
-{
-  var result := execC(cmd, deps, exts, stC);
-  var expr', stC' := result.fst, result.snd;
-  if forall e | e in exts.lit.strs :: Hash(Loc(cmd, deps, e)) in DomC(stC.c) {
-    StateEqualityProperty(stC.st, Restrict(DomSt(stC.st), stC'.st));
-  } else {
-    ExecProperty(cmd, deps, exts, stC.st);
-    var execResult := exec(cmd, deps, exts, stC.st);
-    var st' := execResult.snd;
-    assert DomSt(stC.st) <= DomSt(st');
-    StateEqualityProperty(stC'.st, st');
-    UpdateCLemma(cmd, deps, exts, S(st', stC.c));
-  }
-}
-
-ghost predicate PreC(cmd: Expression, deps: Expression, exts: Expression, stC: StateC)
-  requires
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
-    // note: We need this for the precondition of Restrict.
-    deps.lit.paths <= DomSt(stC.st)
-{
-  Pre(cmd, deps, exts, Restrict(deps.lit.paths, stC.st)) &&
-  forall e :: e in exts.lit.strs ==> Hash(Loc(cmd, deps, e)) in DomC(stC.c) ==>
-    Loc(cmd, deps, e) in deps.lit.paths
-}
-
-ghost predicate PostC(cmd: Expression, deps: Expression, exts: Expression, stC: StateC)
-  requires
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
-    // note: We need this for the precondition of Restrict.
-    deps.lit.paths <= DomSt(stC.st)
-{
-  Post(cmd, deps, exts, Restrict(deps.lit.paths, stC.st)) &&
-  forall e :: e in exts.lit.strs ==> Hash(Loc(cmd, deps, e)) in DomC(stC.c)
-}
-
-ghost function Hash(p: Path): HashValue
-
-lemma HashProperty(cmd: Expression, deps: Expression, ext: string, cmd': Expression, deps': Expression, ext': string)
-  requires Hash(Loc(cmd, deps, ext)) == Hash(Loc(cmd', deps', ext'))
-  ensures cmd == cmd' && deps == deps' && ext == ext'
-
-/******* Grammar *******/
-datatype Program = Program(stmts: seq<Statement>)
-
-datatype Statement = stmtVariable(id: Identifier, expr: Expression) |
-                     stmtReturn(ret: Expression)
-
-datatype Expression = exprLiteral(lit: Literal) | exprIdentifier(id: Identifier) |
-                      exprIf(cond: Expression, ifTrue: Expression, ifFalse: Expression) |
-                      exprAnd(conj0: Expression, conj1: Expression) |
-                      exprOr(disj0: Expression, disj1: Expression) |
-                      exprInvocation(fun: Expression, args: seq<Expression>) |
-                      exprError(r: Reason)
-
-datatype Literal = litTrue | litFalse | litUndefined | litNull |
-                   litNumber(num: int) | litString(str: string) |
-                   litPrimitive(prim: Primitive) |
-                   litArrOfPaths(paths: set<Path>) |
-                   litArrOfStrings(strs: set<string>) |
-                   litArray(arr: seq<Expression>)
-
-datatype Primitive = primCreatePath | primExec
-
-datatype Reason = rCompatibility | rValidity | rInconsistentCache
-
-datatype Path = OpaquePath(int) | TransparentPath(int)
-type Artifact
-type Identifier
-
-type Cache
-type HashValue
-
-datatype Tuple<A, B> = Pair(fst: A, snd: B)
-datatype Triple<A, B, C> = Trio(fst: A, snd: B, trd: C)
-
-/******* Values *******/
-ghost predicate Value(expr: Expression)
-{
-  expr.exprLiteral?
-}
-
-/******* Semantics *******/
-
-ghost predicate Legal(stmts: seq<Statement>)
-{
-  |stmts| != 0
-}
-
-ghost function Arity(prim: Primitive): nat
-{
-  match prim
-  case primCreatePath => 1
-  case primExec => 3
-}
-
-/******* Function 'buildC' *******/
-ghost function buildC(prog: Program, stC: StateC): Tuple<Expression, StateC>
-  requires Legal(prog.stmts)
-{
-  doC(prog.stmts, stC, EmptyEnv())
-}
-
-/******* Function 'doC' *******/
-ghost function doC(stmts: seq<Statement>, stC: StateC, env: Env): Tuple<Expression, StateC>
-  requires Legal(stmts)
-{
-  var stmt := stmts[0];
-  if stmt.stmtVariable? then
-    var result := evalC(stmt.expr, stC, env);
-    var expr', stC' := result.fst, result.snd;
-    if Value(expr') then
-      var env' := SetEnv(stmt.id, expr', env);
-      if Legal(stmts[1..]) then
-        doC(stmts[1..], stC', env')
-      else
-        Pair(expr', stC')
-    else
-      Pair(exprError(rValidity), stC)
-  // todo(maria): Add the recursive case.
-  else
-    assert stmt.stmtVariable? || stmt.stmtReturn?;
-    evalC(stmt.ret, stC, env)
-}
-
-/******* Function 'evalC' *******/
-ghost function evalC(expr: Expression, stC: StateC, env: Env): Tuple<Expression, StateC>
-  decreases expr
-{
-  if Value(expr) then
-    Pair(expr, stC)
-  // identifier
-  else if expr.exprIdentifier? then
-    Pair(GetEnv(expr.id, env), stC)
-  // if-expression
-  else if expr.exprIf? && expr.cond.exprLiteral? && expr.cond.lit == litTrue then
-    evalC(expr.ifTrue, stC, env)
-  else if expr.exprIf? && expr.cond.exprLiteral? && expr.cond.lit == litFalse then
-    evalC(expr.ifFalse, stC, env)
-  else if expr.exprIf? then
-    var result := evalC(expr.cond, stC, env);
-    var cond', stC' := result.fst, result.snd;
-    if cond'.exprLiteral? && cond'.lit == litTrue then
-      evalC(expr.ifTrue, stC', env)
-    else if cond'.exprLiteral? && cond'.lit == litFalse then
-      evalC(expr.ifFalse, stC', env)
-    else
-      Pair(exprError(rValidity), stC)
-  // and-expression
-  else if expr.exprAnd? then
-    var result := evalC(expr.conj0, stC, env);
-    var conj0', stC' := result.fst, result.snd;
-    if conj0'.exprLiteral? && conj0'.lit == litTrue then
-      evalC(expr.conj1, stC', env)
-    else if conj0'.exprLiteral? && conj0'.lit == litFalse then
-      Pair(exprLiteral(litFalse), stC')
-    else
-      Pair(exprError(rValidity), stC)
-  // or-expression
-  else if expr.exprOr? then
-    var result := evalC(expr.disj0, stC, env);
-    var disj0', stC' := result.fst, result.snd;
-    if disj0'.exprLiteral? && disj0'.lit == litTrue then
-      Pair(exprLiteral(litTrue), stC')
-    else if disj0'.exprLiteral? && disj0'.lit == litFalse then
-      evalC(expr.disj1, stC', env)
-    else
-      Pair(exprError(rValidity), stC)
-  // invocation
-  else if expr.exprInvocation? then
-    var resultFun := evalC(expr.fun, stC, env);
-    var fun', stC' := resultFun.fst, resultFun.snd;
-    var resultArgs := evalArgsC(expr, expr.args, stC, env);
-    var args', stsC' := resultArgs.fst, resultArgs.snd;
-    var stsC'' := {stC'} + stsC';
-    if CompatibleC(stsC'') then
-      var stCombinedC := CombineC(stsC'');
-      // primitive functions
-      if fun'.exprLiteral? && fun'.lit.litPrimitive? then
-        // primitive function 'execC'
-        if fun'.lit.prim.primExec? then
-          if |args'| == Arity(primExec) && ValidArgsC(primExec, args', stCombinedC) then
-            execC(args'[0], args'[1], args'[2], stCombinedC)
-          else
-            if ConsistentCache(stCombinedC) then
-              Pair(exprError(rValidity), stC)
-            else
-              Pair(exprError(rInconsistentCache), stC)
-        else
-        // primitive function 'createPath'
-        // todo(maria): Add primitive function 'createPath'.
-          Pair(exprError(rValidity), stC)
-      // todo(maria): Add non-primitive invocations.
-      else
-        Pair(exprError(rValidity), stC)
-    else
-      Pair(exprError(rCompatibility), stC)
-  // error
-  else
-    Pair(exprError(rValidity), stC)
-}
-
-ghost function evalArgsC(expr: Expression, args: seq<Expression>, stC: StateC, env: Env):
-         Tuple<seq<Expression>, set<StateC>>
-  requires forall arg :: arg in args ==> arg < expr
-  decreases expr, |args| + 1
-
-{
-  evalArgsC'(expr, args, stC, env, [], {})
-}
-
-ghost function evalArgsC'(expr: Expression, args: seq<Expression>, stC: StateC, env: Env,
-                    args': seq<Expression>, stsC': set<StateC>):
-         Tuple<seq<Expression>, set<StateC>>
-  requires forall arg :: arg in args ==> arg < expr
-  decreases expr, |args|
-{
-  if args == [] then
-    Pair(args', stsC')
-  else
-    var arg := args[0];
-    var result := evalC(arg, stC, env);
-    var arg', stC' := result.fst, result.snd;
-    evalArgsC'(expr, args[1..], stC, env, args' + [arg'], stsC' + {stC'})
-}
-
-ghost predicate ValidArgsC(prim: Primitive, args: seq<Expression>, stC: StateC)
-  requires prim.primExec? ==> |args| == 3
-  requires prim.primCreatePath? ==> |args| == 1
-{
-  match prim
-  case primCreatePath => false
-  case primExec =>
-    var cmd, deps, exts := args[0], args[1], args[2];
-    cmd.exprLiteral? && cmd.lit.litString? &&
-    deps.exprLiteral? && deps.lit.litArrOfPaths? &&
-    exts.exprLiteral? && exts.lit.litArrOfStrings? &&
-    deps.lit.paths <= DomSt(stC.st) &&
-    PreC(cmd, deps, exts, stC)
-}
-
-/******* {consistent_cache} buildC {no_bad_cache_error /\ consistent_cache} *******/
-lemma CachedBuildsTheorem(prog: Program, stC: StateC)
-  requires Legal(prog.stmts)
-  requires ConsistentCache(stC)
-  ensures
-    var result := buildC(prog, stC);
-    var expr', stC' := result.fst, result.snd;
-    ConsistentCache(stC') && expr'.exprError? ==>
-    expr'.r != rInconsistentCache
-{
-  BuildCLemma(prog, stC);
-}
-
-lemma BuildCLemma(prog: Program, stC: StateC)
-  requires Legal(prog.stmts)
-  requires ConsistentCache(stC)
-  ensures
-    var result := buildC(prog, stC);
-    var expr', stC' := result.fst, result.snd;
-    ConsistentCache(stC') && (expr'.exprError? ==> expr'.r != rInconsistentCache)
-{
-  DoCLemma(prog.stmts, stC, EmptyEnv());
-}
-
-lemma DoCLemma(stmts: seq<Statement>, stC: StateC, env: Env)
-  requires Legal(stmts)
-  requires ConsistentCache(stC)
-  ensures
-    var result := doC(stmts, stC, env);
-    var expr', stC' := result.fst, result.snd;
-    ConsistentCache(stC') && (expr'.exprError? ==> expr'.r != rInconsistentCache)
-{
-  var stmt := stmts[0];
-  if stmt.stmtVariable? {
-    EvalCLemma(stmt.expr, stC, env);
-    var result := evalC(stmt.expr, stC, env);
-    var expr', stC' := result.fst, result.snd;
-    if Value(expr') {
-      var env' := SetEnv(stmt.id, expr', env);
-      if Legal(stmts[1..]) {
-        DoCLemma(stmts[1..], stC', env');
-      } else { }
-    } else { }
-  // todo(maria): Add the recursive case.
-  } else {
-    assert stmt.stmtVariable? || stmt.stmtReturn?;
-    EvalCLemma(stmt.ret, stC, env);
-  }
-}
-
-lemma {:induction expr} EvalCLemma(expr: Expression, stC: StateC, env: Env)
-  requires ConsistentCache(stC)
-  ensures
-    var result := evalC(expr, stC, env);
-    var expr', stC' := result.fst, result.snd;
-    ConsistentCache(stC') && (expr'.exprError? ==> expr'.r != rInconsistentCache)
-  decreases expr
-{
-  if Value(expr) {
-  } else if expr.exprIdentifier? {
-  } else if expr.exprIf? && expr.cond.exprLiteral? && expr.cond.lit == litTrue {
-  } else if expr.exprIf? && expr.cond.exprLiteral? && expr.cond.lit == litFalse {
-  } else if expr.exprIf? {
-    var result := evalC(expr.cond, stC, env);
-    var cond', stC' := result.fst, result.snd;
-    if cond'.exprLiteral? && cond'.lit == litTrue {
-      EvalCLemma(expr.ifTrue, stC', env);
-    } else if cond'.exprLiteral? && cond'.lit == litFalse {
-      EvalCLemma(expr.ifFalse, stC', env);
-    } else { }
-  } else if expr.exprAnd? {
-    var result := evalC(expr.conj0, stC, env);
-    var conj0', stC' := result.fst, result.snd;
-    if conj0'.exprLiteral? && conj0'.lit == litTrue {
-      EvalCLemma(expr.conj1, stC', env);
-    } else if conj0'.exprLiteral? && conj0'.lit == litFalse {
-    } else { }
-  } else if expr.exprOr? {
-    var result := evalC(expr.disj0, stC, env);
-    var disj0', stC' := result.fst, result.snd;
-    if disj0'.exprLiteral? && disj0'.lit == litTrue {
-    } else if disj0'.exprLiteral? && disj0'.lit == litFalse {
-      EvalCLemma(expr.disj1, stC', env);
-    } else { }
-  } else if expr.exprInvocation? {
-    EvalCLemma(expr.fun, stC, env);
-    var resultFun := evalC(expr.fun, stC, env);
-    var fun', stC' := resultFun.fst, resultFun.snd;
-    EvalArgsCLemma(expr, expr.args, stC, env);
-    var resultArgs := evalArgsC(expr, expr.args, stC, env);
-    var args', stsC' := resultArgs.fst, resultArgs.snd;
-    var stsC'' := {stC'} + stsC';
-    if CompatibleC(stsC'') {
-      CombineCLemma(stsC'');
-      var stCombinedC := CombineC(stsC'');
-      if fun'.exprLiteral? && fun'.lit.litPrimitive? {
-        if fun'.lit.prim.primExec? {
-          if |args'| == Arity(primExec) && ValidArgsC(primExec, args', stCombinedC) {
-            ExecCProperty(args'[0], args'[1], args'[2], stCombinedC);
-            var resultExec := execC(args'[0], args'[1], args'[2], stCombinedC);
-            var stExecC := resultExec.snd;
-            // note: This assertion is necessary.
-            assert DomSt(stC'.st) <= DomSt(stCombinedC.st);
-            forall (p | p in DomSt(stCombinedC.st) && p in DomSt(stExecC.st))
-              ensures GetSt(p, stCombinedC.st) == GetSt(p, stExecC.st)
-            {
-              assert DomSt(stCombinedC.st) <= DomSt(stExecC.st);
-              assert stCombinedC.st == Restrict(DomSt(stCombinedC.st), stExecC.st);
-            }
-          } else {
-            if ConsistentCache(stCombinedC) {
-            } else { }
-          }
-        } else { }
-      } else { }
-    } else { }
-  } else { }
-}
-
-lemma EvalArgsCLemma(expr: Expression, args: seq<Expression>, stC: StateC, env: Env)
-  requires ConsistentCache(stC)
-  requires forall arg :: arg in args ==> arg < expr
-  ensures
-    var result := evalArgsC(expr, args, stC, env);
-    var stsC' := result.snd;
-    forall stC' :: stC' in stsC' ==> ConsistentCache(stC')
-  decreases expr, |args| + 1
-
-{
-  EvalArgsC'Lemma(expr, args, stC, env, [], {});
-}
-
-lemma EvalArgsC'Lemma(expr: Expression, args: seq<Expression>, stC: StateC, env: Env,
-                             args': seq<Expression>, stsC': set<StateC>)
-  requires ConsistentCache(stC)
-  requires forall stC' :: stC' in stsC' ==> ConsistentCache(stC')
-  requires forall arg :: arg in args ==> arg < expr
-  ensures
-    var result := evalArgsC'(expr, args, stC, env, args', stsC');
-    var stsC'' := result.snd;
-    forall stC'' :: stC'' in stsC'' ==> ConsistentCache(stC'')
-  decreases expr, |args|
-{
-  if args == [] {
-  } else {
-    var arg := args[0];
-    EvalCLemma(arg, stC, env);
-    var result := evalC(arg, stC, env);
-    var arg', stC' := result.fst, result.snd;
-    EvalArgsC'Lemma(expr, args[1..], stC, env, args' + [arg'], stsC' + {stC'});
-  }
-}
diff --git a/Test/cloudmake/CloudMake-ConsistentBuilds.dfy.expect b/Test/cloudmake/CloudMake-ConsistentBuilds.dfy.expect
deleted file mode 100644
index 1b45cf86b6a..00000000000
--- a/Test/cloudmake/CloudMake-ConsistentBuilds.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 42 verified, 0 errors
diff --git a/Test/cloudmake/CloudMake-ParallelBuilds.dfy.expect b/Test/cloudmake/CloudMake-ParallelBuilds.dfy.expect
deleted file mode 100644
index 3cebd6e69a8..00000000000
--- a/Test/cloudmake/CloudMake-ParallelBuilds.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-CloudMake-ParallelBuilds.dfy(562,6): Warning: a forall statement with no bound variables is deprecated; use an 'assert by' statement instead
-
-Dafny program verifier finished with 101 verified, 0 errors
diff --git a/Test/comp/Arrays.dfy b/Test/comp/Arrays.dfy
deleted file mode 100644
index 9b23f59202d..00000000000
--- a/Test/comp/Arrays.dfy
+++ /dev/null
@@ -1,908 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/2582
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --unicode-char:false
-
-method LinearSearch(a: array<int>, key: int) returns (n: nat)
-  ensures 0 <= n <= a.Length
-  ensures n == a.Length || a[n] == key
-{
-  n := 0;
-  while n < a.Length
-    invariant n <= a.Length
-  {
-    if a[n] == key {
-      return;
-    }
-    n := n + 1;
-  }
-}
-
-method PrintArray<A>(a: array?<A>) {
-  if (a == null) {
-    print "It's null\n";
-  } else {
-    var i := 0;
-    while i < a.Length {
-      print a[i], " ";
-      i := i + 1;
-    }
-    print "\n";
-  }
-}
-
-method Main() {
-  var a := new int[23];
-  var i := 0;
-  while i < 23 {
-    a[i] := i;
-    i := i + 1;
-  }
-  PrintArray(a);
-  var n := LinearSearch(a, 17);
-  print n, "\n";
-  var s : seq<int> := a[..];
-  print s, "\n";
-  s := a[2..16];
-  print s, "\n";
-  s := a[20..];
-  print s, "\n";
-  s := a[..8];
-  print s, "\n";
-
-  // Conversion to sequence should copy elements (sequences are immutable!)
-  a[0] := 42;
-  print s, "\n";
-
-  InitTests();
-
-  MultipleDimensions();
-
-  PrintArray<int>(null);
-
-  Index();
-  More();
-  MoreWithDefaults();
-
-  Coercions();
-
-  CharValues();
-
-  TypeSynonym.Test();
-
-  MoreArrays.Test();
-  NativeArrays.Test();
-  SimultaneousAssignment.Test();
-  ArrayToSeq.Test();
-
-  ArrayAllocationInitialization.Test();
-  VariationsOnIndexAndDimensionTypes.Test();
-  TypeSpecialization.Test();
-
-  GenericArrayEquality.Test();
-}
-
-type lowercase = ch | 'a' <= ch <= 'z' witness 'd'
-
-method InitTests() {
-  var aa := new lowercase[3];
-  PrintArray(aa);
-  var s := "hello";
-  aa := new lowercase[|s|](i requires 0 <= i < |s| => s[i]);
-  PrintArray(aa);
-}
-
-method MultipleDimensions() {
-  var matrix := new int[2,8];
-  PrintMatrix(matrix);
-  matrix := DiagMatrix(3, 5, 0, 1);
-  PrintMatrix(matrix);
-
-  var cube := new int[3,0,4]((_,_,_) => 16);
-  print "cube dims: ", cube.Length0, " ", cube.Length1, " ", cube.Length2, "\n";
-
-  var jagged := new array<int>[5];
-  var i := 0;
-  while i < 5 {
-    jagged[i] := new int[i];
-    i := i + 1;
-  }
-  PrintArrayArray(jagged);
-}
-
-method DiagMatrix<A>(rows: int, cols: int, zero: A, one: A)
-    returns (a: array2<A>)
-    requires rows >= 0 && cols >= 0
-{
-  return new A[rows, cols]((x,y) => if x==y then one else zero);
-}
-
-method PrintMatrix<A>(m: array2<A>) {
-  var i := 0;
-  while i < m.Length0 {
-    var j := 0;
-    while j < m.Length1 {
-      print m[i,j], " ";
-      j := j + 1;
-    }
-    print "\n";
-    i := i + 1;
-  }
-}
-
-method PrintArrayArray<A>(a: array<array<A>>) {
-  var i := 0;
-  while i < a.Length {
-    print a[i][..], " ";
-    i := i + 1;
-  }
-  print "\n";
-}
-
-type BV10 = x: bv10 | x != 999 witness 8
-type Yes = b | b witness true
-newtype nByte = x | -10 <= x < 100 witness 1
-newtype nShort = x | -10 <= x < 1000 witness 2
-newtype nInt = x | -10 <= x < 1_000_000 witness 3
-newtype nLong = x | -10 <= x < 0x100_0000_0000_0000 witness 4
-newtype ubyte = x | 0 <= x < 256
-
-method Index() {
-  var i: nByte := 0;
-  var j: nLong := 1;
-  var k: BV10 := 2;
-  var l: ubyte := 250;  // we wanna be sure this does become negative when used in Java
-  var m: int := 100;
-
-  var a := new string[300];
-  a[i] := "hi";
-  a[j] := "hello";
-  a[k] := "tjena";
-  a[l] := "hej";
-  a[m] := "hola";
-  print a[i], " ", a[j], " ", a[k], " ", a[l], " ", a[m], "\n";
-
-  var b := new string[20, 300];
-  b[18, i] := "hi";
-  b[18, j] := "hello";
-  b[18, k] := "tjena";
-  b[18, l] := "hej";
-  b[18, m] := "hola";
-  print b[18, i], " ", b[18, j], " ", b[18, k], " ", b[18, l], " ", b[18, m], "\n";
-
-  var s := seq(300, _ => "x");
-  s := s[i := "hi"];
-  s := s[j := "hello"];
-  s := s[k := "tjena"];
-  s := s[l := "hej"];
-  s := s[m := "hola"];
-  print s[i], " ", s[j], " ", s[k], " ", s[l], " ", s[m], "\n";
-}
-
-method More() {
-  var aa := new lowercase[3];
-  forall i | 0 <= i < aa.Length {
-    // aa[i] should not be '\0', but in case erroneous code causes it to get a zero-equivalent
-    // value to be produced, then the following if-then-else will give better test output
-    aa[i] := if aa[i] == '\0' then 'a' else aa[i];  // don't print ugly '\0' characters into test output
-  }
-  PrintArray(aa);
-
-  var s := "hello";
-  aa := new lowercase[|s|](i requires 0 <= i < |s| => s[i]);
-  PrintArray(aa);
-
-  var vv := new BV10[4];
-  PrintArray(vv);
-
-  var yy := new Yes[3];
-  PrintArray(yy);
-
-  var a0 := new nByte[5];
-  PrintArray(a0);
-  var a1 := new nShort[5];
-  PrintArray(a1);
-  var a2 := new nInt[5];
-  PrintArray(a2);
-  var a3 := new nLong[5];
-  PrintArray(a3);
-
-  var kitchenSink: (lowercase, BV10, Yes, nByte, nShort, nInt, nLong);
-  if kitchenSink.0 == '\0' {
-    kitchenSink := kitchenSink.(0 := 'a');  // don't print ugly '\0' characters into test output
-  }
-  print kitchenSink, "\n";  // (d, 8, true, 1, 2, 3, 4)
-}
-
-type xchar = ch | '\0' <= ch <= 'z'
-type xBV10 = x: bv10 | x != 999
-type xYes = b | !b
-newtype xnByte = x | -10 <= x < 100
-newtype xnShort = x | -10 <= x < 1000
-newtype xnInt = x | -10 <= x < 1_000_000
-newtype xnLong = x | -10 <= x < 0x100_0000_0000_0000
-
-method MoreWithDefaults() {
-  var aa := new xchar[3];
-  forall i | 0 <= i < aa.Length {
-    aa[i] := if aa[i] == '\0' then 'a' else aa[i];  // don't print ugly '\0' characters into test output
-  }
-  PrintArray(aa);  // D D D
-
-  var vv := new xBV10[4];
-  PrintArray(vv);
-
-  var yy := new xYes[3];
-  PrintArray(yy);
-
-  var a0 := new xnByte[5];
-  PrintArray(a0);
-  var a1 := new xnShort[5];
-  PrintArray(a1);
-  var a2 := new xnInt[5];
-  PrintArray(a2);
-  var a3 := new xnLong[5];
-  PrintArray(a3);
-
-  var kitchenSink: (xchar, xBV10, xYes, xnByte, xnShort, xnInt, xnLong);
-  if kitchenSink.0 == '\0' {
-    kitchenSink := kitchenSink.(0 := 'a');  // don't print ugly '\0' characters into test output
-  }
-  print kitchenSink, "\n";  // (D, 0, false, 0, 0, 0, 0)
-}
-
-method Coercions() {
-  // fields
-  var cell := new Cell(8 as short);
-  var a := cell.arr;
-  var x := a[0];
-
-  var b := new short[22];
-  var y := b[0];
-
-  print x, " ", y, "\n";  // 8 0
-
-  // different types of arrays, where coercions may not be needed
-  var c := new bool[22];
-  var d := new int[22];
-  var e := new object?[22];
-  var f := new Cell?<real>[22];
-  var c0, d0, e0, f0 := c[0], d[0], e[0], f[0];
-  print c0, " ", d0, " ", e0, " ", f0, "\n";
-
-  // function
-  a := cell.FArray();
-  // method with one out-parameter
-  b := cell.MArray();
-  x, y := a[0], b[0];
-  print x, " ", y, "\n";
-  // method with two out-parameters (which may need different compilation scheme)
-  a, b := cell.MArray2();
-  x, y := a[0], b[0];
-  print x, " ", y, "\n";
-
-  // lambda expression
-  b := (sa => sa)(b);
-  // array element
-  var barray := new array<short>[9](_ => b);
-  x, y := b[0], barray[3][0];
-  print x, " ", y, "\n";
-
-  // multi-dimensional arrays
-  var marray := new array<short>[9, 2]((_, _) => b);
-  x, y := marray[3, 1][0], cell.mat[7, 6];
-  print x, " ", y, "\n";
-}
-
-newtype short = x | -10 <= x < 12_000
-
-class Cell<T> {
-  var arr: array<T>
-  const crr: array<T>
-  var mat: array2<T>
-  constructor (t: T)
-    ensures arr.Length == 15 && arr == crr
-    ensures mat.Length0 == mat.Length1 == 15
-  {
-    arr := new T[15](_ => t);
-    crr := arr;
-    mat := new T[15, 15]((_, _) => t);
-  }
-  function FArray(): array<T>
-    reads this
-  {
-    arr
-  }
-  method MArray() returns (x: array<T>)
-    ensures x == arr
-  {
-    x := arr;
-  }
-  method MArray2() returns (x: array<T>, y: array<T>)
-    ensures x == y == arr
-  {
-    x, y := arr, arr;
-  }
-  method UArray(x: T)
-    modifies arr
-  {
-    if arr.Length > 0 {
-      arr[0] := x;
-    }
-  }
-}
-
-type ychar = ch | '\0' <= ch <= 'z'
-type zchar = ch | '\0' <= ch <= 'z' witness 'r'
-
-method CharValues() {
-  var aa := new char[3];
-  forall i | 0 <= i < aa.Length {
-    aa[i] := if aa[i] == '\0' then 'a' else aa[i];  // don't print ugly '\0' characters into test output
-  }
-  PrintArray(aa);  // D D D
-
-  var bb := new ychar[3];
-  forall i | 0 <= i < bb.Length {
-    bb[i] := if bb[i] == '\0' then 'a' else bb[i];  // don't print ugly '\0' characters into test output
-  }
-  PrintArray(bb);  // D D D
-
-  var cc := new char[3];
-  forall i | 0 <= i < cc.Length {
-    cc[i] := if cc[i] == '\0' then 'a' else cc[i];  // don't print ugly '\0' characters into test output
-  }
-  PrintArray(cc);  // r r r
-
-  var e0: char, e1: ychar, e2: zchar, ee: (char, ychar, zchar);
-  print e0, " ", e1, " ", e2, " ", ee, "\n";  // D D r (D, D, r)
-
-  var mm := new char[3, 3];
-  var mx := new ychar[3, 3];
-  var my := new zchar[3, 3];
-  print mm[1, 2], " ", mx[1, 2], " ", my[1, 2], "\n";  // D D r
-}
-
-module TypeSynonym {
-  export
-    provides Test
-
-  newtype uint8 = i:int | 0 <= i < 0x100
-
-  type buffer<T> = a: array<T> | a.Length < 0x1_0000_0000 witness *
-  type buffer_t = buffer<uint8>
-
-  method BufferTest(b: buffer_t) {
-    var t := b[..];
-    print t, "\n";
-  }
-
-  method Test() {
-    var b := new uint8[] [19, 18, 9, 8];
-    BufferTest(b);
-  }
-}
-
-module MoreArrays {
-  newtype byte = x | 0 <= x < 256
-
-  class MyClass { }
-
-  method Test() {
-    TestEqualityOfSomeNonArraysToo();
-
-    var a := StringToByteArray("hello there");
-    WriteLine(a);
-
-    var b := StringToByteArray("hello there");
-    print a == b; // false
-    CheckEquality(a, b); // false (this once caused the emitted JavaScript to crash, see issue #3207)
-    print a == a; // true
-    CheckEquality(a, a); // true
-    var c: array?<byte> := null;
-    print a == c; // false
-    CheckEquality(a, c); // false
-    print c == a; // false
-    CheckEquality(c, a); // false
-  }
-
-  method TestEqualityOfSomeNonArraysToo() {
-    var bb: byte := 76;
-    CheckEquality(bb, bb); // true
-    CheckEquality(bb, bb + 1); // false
-
-    var cc0 := new MyClass;
-    var cc1 := new MyClass;
-    CheckEquality(cc0, cc0); // true
-    CheckEquality(cc0, cc1); // false
-    CheckEquality(cc0, null); // false
-    CheckEquality(null, cc0); // false
-    CheckEquality(null, null); // true
-
-    var s0 := [20, 10, 20];
-    var s1 := [20, 10, 20];
-    var s2 := [20, 10, 22];
-    CheckEquality(s0, s1); // true
-    CheckEquality(s0, s2); // false
-
-    CheckEquality((true, 100), (true, 100)); // true
-    CheckEquality((true, 100), (false, 100)); // false
-
-    var m0 := map[4 := true, 3 := false];
-    var m1 := map[4 := true][3 := false];
-    var m2 := map[3 := false][4 := true][3 := false][4 := true];
-    var m3 := map[3 := false][4 := false][3 := false][3 := false];
-    CheckEquality(m0, m1); // true
-    CheckEquality(m0, m2); // true
-    CheckEquality(m0, m3); // false
-  }
-
-  method StringToByteArray(s: string) returns (arr: array<byte>) {
-    arr := new [|s|];
-    forall i | 0 <= i < |s| {
-      arr[i] := (var ch := s[i]; if ' ' <= ch <= 'z' then ch else 'X') as byte;
-    }
-  }
-
-  method WriteLine(arr: array<byte>) {
-    for i := 0 to arr.Length {
-      print [arr[i] as char];
-    }
-    print "\n";
-  }
-
-  method CheckEquality<T(==)>(x: T, y: T) {
-    print " ", x == y, "\n";
-  }
-}
-
-module NativeArrays {
-  newtype byte = x | 0 <= x < 256
-  newtype onebyte = x | 0 < x < 256 witness 1
-
-  method Test() {
-    var aa := new byte[3];
-    PrintArray(aa, "uninitialized bytes");
-    aa := new byte[] [7, 8, 9];
-    PrintArray(aa, "bytes from display");
-    aa := new byte[3](i => if 0 <= i < 10 then (20 + i) as byte else 88);
-    PrintArray(aa, "bytes from lambda");
-
-    var bb := new onebyte[3];
-    PrintArray(bb, "uninitialized 1bytes");
-    bb := new onebyte[] [7, 8, 9];
-    PrintArray(bb, "1bytes from display");
-    bb := new onebyte[3](i => if 0 <= i < 10 then (20 + i) as onebyte else 88);
-    PrintArray(bb, "1bytes from lambda");
-
-    TestVariousFlavorsOfIndices();
-  }
-
-  method PrintArray(a: array, title: string) {
-    print title, ": array[";
-    for i := 0 to a.Length {
-      print if i == 0 then "" else ", ", a[i];
-    }
-    print "]\n";
-  }
-
-  method TestVariousFlavorsOfIndices() {
-    var arr := new int[250];
-    var m := new int[20, 30];
-
-    arr[3 as bv19] := 17;
-    arr[4 as bv5] := 19;
-    var iIndex: int, bIndex: byte, bvIndex: bv9 := 3, 4, 5;
-    m[iIndex, bIndex] := arr[iIndex];
-    arr[iIndex] := m[iIndex, bvIndex - 1];
-    assert arr[iIndex] == 17;
-    print arr[iIndex], " "; // 17
-    m[bIndex, iIndex] := arr[bIndex];
-    arr[bIndex] := m[bvIndex - 1, iIndex];
-    assert arr[bIndex] == 19;
-    print arr[bIndex], " "; // 19
-    m[iIndex, iIndex] := arr[iIndex] + 1;
-    arr[iIndex] := m[iIndex, iIndex];
-    m[bIndex, bIndex] := arr[bIndex] + 1;
-    arr[bIndex] := m[bIndex, bIndex];
-    print arr[iIndex], " ", arr[bIndex], "\n"; // 18 20
-  }
-}
-
-module SimultaneousAssignment {
-  method Test() {
-    var arr := new int[250];
-    var m := new int[20, 30];
-    var arr', m' := arr, m;
-
-    var a, b, c := 18, 28, 38;
-    var arr'' := new int[1];
-    var m'' := new int[1, 1];
-
-    arr, a, arr[a + b], m, arr, c, m[a, b], b, m := arr'', 100, 120, m'', arr'', 300, c, 200, m'';
-
-    print a, " ", b, " ", c, " ", arr'[46], " ", m'[18, 28], "\n"; // 100 120 200 300 38
-  }
-}
-
-module ArrayToSeq {
-  newtype byte = x | 0 <= x < 256
-
-  trait TraitMeRite {
-  }
-
-  class MyClass extends TraitMeRite {
-  }
-
-  method Test() {
-    var arrChar := new [] ['h', 'e', 'l', 'l', 'o'];
-    var arrInt := new int[5](i => i);
-    var arrByte := new byte[5](_ => 2);
-    var c: MyClass := new MyClass;
-    var tr: TraitMeRite := c;
-    var arrClass := new MyClass[] [c, c, c];
-    var arrTrait := new TraitMeRite[] [tr, c, tr];
-
-    var s0 := arrChar[..];
-    var s1 := arrInt[..];
-    var s2 := arrByte[..];
-    var s3 := arrClass[..];
-    var s4 := arrTrait[..];
-
-    expect s0 == "hello";
-    expect arrInt[1..][..2] == arrInt[..3][1..];
-    expect arrInt[1 as byte..][..2] == arrInt[..3 as byte][1..];
-    expect arrInt[1 as byte..3] == arrInt[1..3 as byte];
-    expect arrByte[..0] <= arrByte[5..] <= arrByte[..3] <= s2;
-    expect s3 == s4;
-
-    print s0, " ";
-    print s1, " ";
-    print s2, "\n";
-  }
-}
-
-module {:options "/functionSyntax:4"} ArrayAllocationInitialization {
-  newtype AutoInit = x | 20 <= x < 2_000_000 witness 77
-  newtype NonAutoInit = x | 20 <= x < 2_000_000 witness *
-  newtype byte = x | 0 <= x < 256
-
-  function AutoInitF(i: nat): AutoInit { if 20 <= i < 30 then i as AutoInit else 78 }
-  function NonAutoInitF(i: nat): NonAutoInit { 82 }
-  function ByteF(i: nat): byte { if 20 <= i < 30 then i as byte else 60 }
-  function CharF(i: nat): char { if 20 <= i < 30 then 'a' + (i - 20) as char else 'g' }
-
-  function AutoInitF2(i: nat, j: nat): AutoInit { if i == j then 50 else 78 }
-  function ByteF2(i: nat, j: nat): byte { if i == j then 50 else 60 }
-  function CharF2(i: nat, j: nat): char { if i == j then 'a' else 'g' }
-
-  method Test() {
-    TestAutoInit();
-    TestTypeParameter(AutoInitF);
-
-    TestNonAutoInit();
-
-    TestByte();
-    TestTypeParameter(ByteF);
-
-    TestChar();
-    TestTypeParameter(CharF);
-
-    TestMatrixAutoInit();
-    TestMatrixTypeParameter(AutoInitF2);
-    TestMatrixTypeParameter(ByteF2);
-    TestMatrixTypeParameter(CharF2);
-  }
-
-  method TestAutoInit() {
-    var zero, five := 0, 5;
-    var a: array<AutoInit>;
-    var s := [];
-
-    a := new AutoInit[zero];
-    s := s + a[..];
-    a := new AutoInit[five]; // initialized by the default element
-    s := s + a[..];
-    a := new AutoInit[zero] []; // initialized as given (no elements)
-    s := s + a[..];
-    a := new AutoInit[] []; // initialized as given (no elements)
-    s := s + a[..];
-    a := new AutoInit[five] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
-    s := s + a[..];
-    a := new AutoInit[] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
-    s := s + a[..];
-    a := new AutoInit[zero](AutoInitF);
-    s := s + a[..];
-    a := new AutoInit[five](AutoInitF);
-    s := s + a[..];
-
-    print s, "\n";
-  }
-
-  method TestNonAutoInit() {
-    var zero, five := 0, 5;
-    var a: array<NonAutoInit>;
-    var s := [];
-
-    a := new NonAutoInit[zero];
-    s := s + a[..];
-    // Note, "new NonAutoInit[five]" is not allowed for a non-auto-init type
-    s := s + [99, 99, 99, 99, 99];
-    a := new NonAutoInit[zero] []; // initialized as given (no elements)
-    s := s + a[..];
-    a := new NonAutoInit[] []; // initialized as given (no elements)
-    s := s + a[..];
-    a := new NonAutoInit[five] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
-    s := s + a[..];
-    a := new NonAutoInit[] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
-    s := s + a[..];
-    a := new NonAutoInit[zero](NonAutoInitF);
-    s := s + a[..];
-    a := new NonAutoInit[five](NonAutoInitF);
-    s := s + a[..];
-
-    print s, "\n";
-  }
-
-  method TestByte() {
-    var zero, five := 0, 5;
-    var a: array<byte>;
-    var s := [];
-
-    a := new byte[zero];
-    s := s + a[..];
-    a := new byte[five]; // initialized by the default element
-    s := s + a[..];
-    a := new byte[zero] []; // initialized as given (no elements)
-    s := s + a[..];
-    a := new byte[] []; // initialized as given (no elements)
-    s := s + a[..];
-    a := new byte[five] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
-    s := s + a[..];
-    a := new byte[] [20, 21, 22, 23, 24]; // initialized as given (5 elements)
-    s := s + a[..];
-    a := new byte[zero](ByteF);
-    s := s + a[..];
-    a := new byte[five](ByteF);
-    s := s + a[..];
-
-    print s, "\n";
-  }
-
-  method TestChar() {
-    var zero, five := 0, 5;
-    var a: array<char>;
-    var s := [];
-
-    a := new char[zero];
-    s := s + a[..];
-    a := new char[five]; // initialized by the default element
-    s := s + a[..];
-    a := new char[zero] []; // initialized as given (no elements)
-    s := s + a[..];
-    a := new char[] []; // initialized as given (no elements)
-    s := s + a[..];
-    a := new char[five] ['a', 'b', 'c', 'd', 'e']; // initialized as given (5 elements)
-    s := s + a[..];
-    a := new char[] ['a', 'b', 'c', 'd', 'e']; // initialized as given (5 elements)
-    s := s + a[..];
-    a := new char[zero](CharF);
-    s := s + a[..];
-    a := new char[five](CharF);
-    s := s + a[..];
-
-    print s, "\n";
-  }
-
-  method TestTypeParameter<T(0)>(initF: nat -> T) {
-    var zero, five := 0, 5;
-    var a: array<T>;
-    var s := [];
-
-    a := new T[zero];
-    s := s + a[..];
-    a := new T[five]; // initialized by the default element
-    s := s + a[..];
-    a := new T[zero] []; // initialized as given (no elements)
-    s := s + a[..];
-    a := new T[] []; // initialized as given (no elements)
-    s := s + a[..];
-    a := new T[five] [initF(20), initF(21), initF(22), initF(23), initF(24)]; // initialized as given (5 elements)
-    s := s + a[..];
-    a := new T[] [initF(20), initF(21), initF(22), initF(23), initF(24)]; // initialized as given (5 elements)
-    s := s + a[..];
-    a := new T[zero](initF);
-    s := s + a[..];
-    a := new T[five](initF);
-    s := s + a[..];
-
-    print s, "\n";
-  }
-
-  function MatrixToSequence<T>(m: array2<T>): seq<T>
-    reads m
-  {
-    M2S(m, 0, 0)
-  }
-
-  function M2S<T>(m: array2<T>, i: nat, j: nat): seq<T>
-    requires i <= m.Length0 && j <= m.Length1
-    requires i == m.Length0 ==> j == 0
-    reads m
-    decreases m.Length0 - i, m.Length1 - j
-  {
-    if i == m.Length0 then
-      []
-    else if j == m.Length1 then
-      M2S(m, i + 1, 0)
-    else
-      [m[i, j]] + M2S(m, i, j + 1)
-  }
-
-  method TestMatrixAutoInit() {
-    var zero, two, five := 0, 2, 5;
-    var a: array2<AutoInit>;
-    var s := [];
-
-    a := new AutoInit[zero, zero];
-    s := s + MatrixToSequence(a);
-    a := new AutoInit[zero, five];
-    s := s + MatrixToSequence(a);
-    a := new AutoInit[five, zero];
-    s := s + MatrixToSequence(a);
-    a := new AutoInit[two, five]; // initialized by the default element
-    s := s + MatrixToSequence(a);
-    
-    a := new AutoInit[zero, zero](AutoInitF2);
-    s := s + MatrixToSequence(a);
-    a := new AutoInit[zero, five](AutoInitF2);
-    s := s + MatrixToSequence(a);
-    a := new AutoInit[five, zero](AutoInitF2);
-    s := s + MatrixToSequence(a);
-    a := new AutoInit[two, five](AutoInitF2);
-    s := s + MatrixToSequence(a);
-
-    print s, "\n";
-  }
-
-  method TestMatrixTypeParameter<T(0)>(initF2: (nat, nat) -> T) {
-    var zero, two, five := 0, 2, 5;
-    var a: array2<T>;
-    var s := [];
-
-    a := new T[zero, zero];
-    s := s + MatrixToSequence(a);
-    a := new T[zero, five];
-    s := s + MatrixToSequence(a);
-    a := new T[five, zero];
-    s := s + MatrixToSequence(a);
-    a := new T[two, five]; // initialized by the default element
-    s := s + MatrixToSequence(a);
-
-    a := new T[zero, zero](initF2);
-    s := s + MatrixToSequence(a);
-    a := new T[zero, five](initF2);
-    s := s + MatrixToSequence(a);
-    a := new T[five, zero](initF2);
-    s := s + MatrixToSequence(a);
-    a := new T[two, five](initF2);
-    s := s + MatrixToSequence(a);
-
-    print s, "\n";
-  }
-}
-
-module {:options "/functionSyntax:4"} VariationsOnIndexAndDimensionTypes {
-  newtype byte = x | 0 <= x < 256
-  newtype onebyte = x | 0 < x < 256 witness 1
-  newtype Long = x | -0x8000_0000_0000_0000 < x < 0x8000_0000_0000_0000
-
-  method Test() {
-    TestArray();
-    TestMatrix();
-  }
-
-  method TestArray() {
-    var aa;
-    aa := new byte[3](i => if 0 <= i < 10 then (20 + i) as byte else 88);
-  }
-
-  method TestMatrix() {
-    var a, b, c := 3 as byte, 2, 5 as Long;
-    var m := new byte[a, b, c](F);
-    expect m[0 as byte, 1, 2 as Long]
-         + m[1 as Long, 1 as byte, 2]
-         + m[2, 1 as Long, 2 as byte]
-        == 138;
-  }
-
-  function F(a: nat, b: nat, c: nat): byte {
-    if a == 0 then
-      45
-    else if a == 1 then
-      46
-    else
-      47
-  }
-}
-
-module TypeSpecialization {
-  newtype byte = x | 0 <= x < 256
-
-  method Test() {
-    var a := new int[100];
-    Int(a, a, 50);
-    print a[19], " ", a[20], " ", a[21], "\n";
-
-    var b := new byte[100];
-    Byte(b, b, 50);
-    print b[19], " ", b[20], " ", b[21], "\n";
-
-    var c := new char[100];
-    Char(c, c, 'n');
-    print c[19], " ", c[20], " ", c[21], "\n";
-  }
-
-  method Int<T>(a: array<T>, b: array<int>, t: T)
-    requires a.Length == b.Length == 100
-    modifies a, b
-  {
-    a[20] := t;
-    b[20] := 69;
-    b[21] := 69;
-    a[21] := t;
-  }
-
-  method Byte<T>(a: array<T>, b: array<byte>, t: T)
-    requires a.Length == b.Length == 100
-    modifies a, b
-  {
-    a[20] := t;
-    b[20] := 69;
-    b[21] := 69;
-    a[21] := t;
-  }
-
-  method Char<T>(a: array<T>, b: array<char>, t: T)
-    requires a.Length == b.Length == 100
-    modifies a, b
-  {
-    a[20] := t;
-    b[20] := 'k';
-    b[21] := 'k';
-    a[21] := t;
-  }
-}
-
-module GenericArrayEquality {
-  method Test() {
-    var a := new int[25];
-    var b := new int[25];
-    ArrayCompare(a, b); // false
-    GenericCompare(a, b); // false
-
-    // In Go, an array is stored as a struct that contains a pointer to the actual array elements.
-    // An easy mistake (in the runtime) would be to compare the address of the struct to determine
-    // array equality. The following test checks that it's done properly.
-    b := a;
-    ArrayCompare(a, b); // true
-    GenericCompare(a, b); // true
-
-    b := null;
-    ArrayCompare(a, b); // false
-    GenericCompare(a, b); // false
-    ArrayCompare(b, a); // false
-    GenericCompare(b, a); // false
-
-    a := null;
-    ArrayCompare(a, b); // true
-    GenericCompare(a, b); // true
-  }
-
-  method ArrayCompare<X>(a: array?<X>, b: array?<X>) {
-    print a == b, " ";
-  }
-  
-
-  method GenericCompare<X(==)>(a: X, b: X) {
-    print a == b, "\n";
-  }
-}
diff --git a/Test/comp/CSharpStyling.dfy.expect b/Test/comp/CSharpStyling.dfy.expect
deleted file mode 100644
index ad4acd57b94..00000000000
--- a/Test/comp/CSharpStyling.dfy.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Dafny program verifier finished with 1 verified, 0 errors
-50
-2
-3
-12
-12
-5 7
-5 7
diff --git a/Test/comp/Collections.dfy b/Test/comp/Collections.dfy
deleted file mode 100644
index 9457e44b170..00000000000
--- a/Test/comp/Collections.dfy
+++ /dev/null
@@ -1,581 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-method Main() {
-  Sets();
-  SubSets();
-  MultiSets();
-  Sequences();
-  Strings();
-  Maps();
-  MultiSetForming();
-  TestExplosiveUnion();
-  Regressions.Test();
-}
-
-// -------------------------------------------------------------------------------------------
-
-trait Trait { }
-class Class extends Trait { }
-
-type IntSet = set<int>
-
-method Sets() {
-  var a := {};
-  var b : IntSet := {17, 82, 17, 82};
-  var c := {12, 17};
-  print "Sets: ", a, " ", b, " ", c, "\n";
-  print "  cardinality: ", |a|, " ", |b|, " ", |c|, "\n";
-  print "  union: ", a + b, " ", b + c, "\n";
-  print "  intersection: ", a * b, " ", b * c, "\n";
-  print "  difference: ", a - b, " ", b - c, "\n";
-  print "  disjoint: ", a !! b, " ", b !! c, "\n";
-  print "  subset: ", a <= b, " ", b <= c, " ", c <= c, "\n";
-  print "  proper subset: ", a < b, " ", b < c, " ", c < c, "\n";
-  print "  superset: ", a >= b, " ", b >= a, " ", c >= c, "\n";
-  print "  proper superset: ", a > b, " ", b > a, " ", c > c, "\n";
-  print "  membership: ", 17 in a, " ", 17 in b, " ", 17 in c, "\n";
-
-  var cl := new Class;
-  var tr: Trait := cl;
-  var xtrait: set<Trait> := {cl, tr};
-  var xclass: set<Class> := {cl, cl};
-  print "  eq covariance: ", |xtrait|, " ", xtrait == xclass, " ", xclass == xtrait, "\n";  // 1 true true
-}
-
-// -------------------------------------------------------------------------------------------
-
-abstract module Order {
-  type T(==)
-  method lt(a: T, b: T) returns (r: bool)
-}
-
-module CharOrder refines Order {
-  type T = char
-  method lt(a: T, b: T) returns (r: bool) {
-    r := a < b;
-  }
-}
-
-module CharSetSetOrder refines Order {
-  type T = set<char>
-
-  function Pow2(i: nat) : nat {
-    if i == 0 then 1 else 2 * Pow2(i-1)
-  }
-
-  method SetAsInt(s: set<char>) returns (r: int) {
-    var ss := s;
-    var acc := 0;
-    while ss != {} {
-      var i: char :| i in ss;
-      ss := ss - {i};
-      acc := acc + Pow2(i as nat);
-    }
-    r := acc;
-  }
-
-  method lt(a: T, b: T) returns (r: bool) {
-    var aInt := SetAsInt(a);
-    var bInt := SetAsInt(b);
-    r := |a| < |b| || (|a| == |b| && aInt <= bInt);
-  }
-}
-
-abstract module PrintOrderedSet {
-  import O : Order
-
-  method PrintElem(e: O.T)
-
-  method Minimum(s: set<O.T>) returns (r: O.T)
-    requires |s| > 0
-    ensures r in s
-  {
-    var ss := s;
-    r :| r in ss;
-    ss := ss - {r};
-    while ss != {}
-      invariant ss <= s
-      invariant r in s
-    {
-      var i: O.T :| i in ss;
-      ss := ss - {i};
-      var lt := O.lt(i, r);
-      if lt {
-        r := i;
-      }
-    }
-  }
-
-  method Print(s: set<O.T>) {
-    var ss := s;
-    print "{";
-    var sep := "";
-    while ss != {} {
-      var bottom: O.T := Minimum(ss);
-      ss := ss - {bottom};
-      print sep;
-      PrintElem(bottom);
-      sep := ", ";
-    }
-    print "}";
-  }
-}
-
-module CharSetPrinter refines PrintOrderedSet {
-  import O = CharOrder
-
-  method PrintElem(e: O.T) {
-    print e;
-  }
-}
-
-module CharSetSetPrinter refines PrintOrderedSet {
-  import O = CharSetSetOrder
-  import P = CharSetPrinter
-
-  method PrintElem(e: O.T) {
-    P.Print(e);
-  }
-}
-
-method SubSets() {
-  var s: set<char> := {'a', 'b', 'c', 'd'};
-  var b0 := forall r | r <= s :: |r| == 2;
-  var b1 := exists r | r <= s :: |r| == 2;
-  print b0, " ", b1, "\n";
-  var S := set r | r <= s && P(r);
-  print "|s|=", |s|, " |S|=", |S|, "\n";
-  CharSetSetPrinter.Print(S);
-  print "\n";
-}
-
-predicate P(r: set<char>) { true }
-
-// -------------------------------------------------------------------------------------------
-
-type IntMultiSet = multiset<int>
-
-method MultiSets() {
-  var a := multiset{};
-  var b : IntMultiSet := multiset{17, 82, 17, 82};
-  var c := multiset{12, 17};
-  var d := multiset{12, 12, 17};
-  print "Multisets: ", a, " ", b, " ", c, "\n";
-  print "  cardinality: ", |a|, " ", |b|, " ", |c|, "\n";
-  print "  union: ", a + b, " ", b + c, "\n";
-  print "  intersection: ", a * b, " ", b * c, "\n";
-  print "  difference: ", a - b, " ", b - c, "\n";
-  print "  disjoint: ", a !! b, " ", b !! c, "\n";
-  print "  subset: ", a <= b, " ", b <= c, " ", c <= c, " ", c <= d, "\n";
-  print "  proper subset: ", a < b, " ", b < c, " ", c < c, " ", c < d, "\n";
-  print "  superset: ", a >= b, " ", b >= a, " ", c >= c, "\n";
-  print "  proper superset: ", a > b, " ", b > a, " ", c > c, "\n";
-  print "  membership: ", 17 in a, " ", 17 in b, " ", 17 in c, "\n";
-  print "  update: ", a[17 := 2], " ", b[17 := 2], " ", c[17 := 2], "\n";
-  print "  multiplicity: ", a[17], " ", b[17], " ", c[17], "\n";
-
-  zeroMultiplicity();
-}
-
-method zeroMultiplicity() {
-  var a := multiset{12}[12 := 0];
-  var b := multiset{42};
-  var c := multiset{1, 2}[1 := 0][2 := 0];
-  var d := multiset{12};
-  var e := multiset{null}[null := 0];
-  var f := multiset{null};
-  print "Test zero multiplicity:\n";
-  print "  printing: ", multiset{a, multiset{42}}, " ", a + d, "\n";
-  print "  union: ", |a + d|, " ", |d + a|, " ", |e + f|, " ", |f + e|, "\n";
-  print "  membership: ", 12 in a, " ", null in e, "\n";
-  print "  equality: ", a == b, " ", a == c, " ", e == f, "\n";
-  print "  subset: ", a <= b, " ", a <= c, " ", c <= a, " ", e <= f, " ", f <= e, "\n";
-  print "  strict subset: ", a < b, " ", a < c, " ", c < a, " ", e < f, " ", f < e, "\n";
-  print "  disjoint: ", a !! d, " ", d !! a, " ", e !! f, " ", f !! e, "\n";
-}
-
-// -------------------------------------------------------------------------------------------
-
-type IntSeq = seq<int>
-
-method Sequences() {
-  var a := [];
-  var b : IntSeq := [17, 82, 17, 82];
-  var c := [12, 17];
-  print "Sequences: ", a, " ", b, " ", c, "\n";
-  print "  cardinality: ", |a|, " ", |b|, " ", |c|, "\n";
-  print "  update: ", b[0 := 42], " ", c[0 := 42], "\n";
-  print "  index: ", b[0], " ", c[0], "\n";
-  print "  subsequence ([lo..hi]): ", b[1..3], " ", c[1..2], "\n";
-  print "  subsequence ([lo..]): ", b[1..], " ", c[1..], "\n";
-  print "  subsequence ([..hi]): ", b[..3], c[..1], "\n";
-  print "  subsequence ([..]): ", a[..], " ", b[..], " ", c[..], "\n";
-  print "  concatenation: ", a + b, " ", b + c, "\n";
-  print "  prefix: ", a <= b, " ", b <= c, " ", c <= c, "\n";
-  print "  proper prefix: ", a < b, " ", b < c, " ", c < c, "\n";
-  print "  membership: ", 17 in a, " ", 17 in b, " ", 17 in c, "\n";
-  BoundedIntegerParameters.Test();
-  SeqUpdate();
-  SeqPrefix();
-
-  var cl := new Class;
-  var tr: Trait := cl;
-  var xtrait: seq<Trait> := [cl, tr];
-  var xclass: seq<Class> := [cl, cl];
-  print "  eq covariance: ", xtrait == xclass, " ", xclass == xtrait, "\n";  // true true
-}
-
-method SeqUpdate() {
-  // regression tests
-  var s := "hello";
-  print s, "\n"; // hello
-  var ch: char := 69 as char;
-  s := s[1 := ch];
-  print s, "\n"; // hEllo
-
-  var t := [2, 4, 6, 8, 10];
-  print t, "\n"; // [2, 4, 6, 8, 10];
-  t := t[1 := 0];
-  print t, "\n"; // [2, 0, 6, 8, 10];
-}
-
-datatype Cell = Cell(data: int)
-
-method SeqPrefix() {
-  // regression tests
-  var a, b, c := Cell(8), Cell(10), Cell(8);
-  var sa := [a, a, a, b, a, b, b];
-  var sc := [c, c, c, b, c, b, b];
-  var t := [a, a, a, b, a, b, b, b];
-  print sa == sc, " ", sa != sc, " ", sa == t, "\n"; // true false false
-  print sa <= sc, " ", sc <= sa, " ", t <= sa, " ", sa <= t, "\n"; // true true false true
-  print sa < sc, " ", sc < sa, " ", t < sa, " ", sa < t, "\n"; // false false false true
-}
-
-module BoundedIntegerParameters {
-  newtype short = x | 0 <= x < 0x100
-  newtype tall = x | 0 <= x < 0x1_0000
-  newtype grande = x | 0 <= x < 0x1_0000_0000
-  newtype venti = x | 0 <= x < 0x1_0000_0000_0000_0000
-  newtype little = x | -12 <= x < 12
-  newtype big = x | -12 <= x < 0x1_0000_0000_0000
-
-  method Test() {
-    Seq(5, 5, 5, 5, 5, 5);
-  }
-
-  method Seq(u0: short, u1: tall, u2: grande, u3: venti, s0: little, s1: big)
-    requires u0 as int <= u1 as int <= u2 as int <= u3 as int < 7
-    requires 0 <= s0 as int <= s1 as int < 7
-  {
-    var data := "Bounded";
-
-    print data[..u0], " ";
-    print data[..u1], " ";
-    print data[..u2], " ";
-    print data[..u3], " ";
-    print data[..s0], " ";
-    print data[..s1], "\n";
-
-    print data[u0..], " ";
-    print data[u1..], " ";
-    print data[u2..], " ";
-    print data[u3..], " ";
-    print data[s0..], " ";
-    print data[s1..], "\n";
-
-    print data[u0], " ";
-    print data[u1], " ";
-    print data[u2], " ";
-    print data[u3], " ";
-    print data[s0], " ";
-    print data[s1], "\n";
-  }
-}
-
-// -------------------------------------------------------------------------------------------
-
-method Strings() {
-  var a := "";
-  var b := "uRuR";
-  var c := "gu";
-  print "Strings: ", a, " ", b, " ", c, "\n";
-  print "  cardinality: ", |a|, " ", |b|, " ", |c|, "\n";
-  print "  concatenation: ", a + b, " ", b + c, "\n";
-  print "  prefix: ", a <= b, " ", b <= c, " ", c <= c, "\n";
-  print "  proper prefix: ", a < b, " ", b < c, " ", c < c, "\n";
-  print "  membership: ", 'u' in a, " ", 'u' in b, " ", 'u' in c, "\n";
-
-  var d := ['g', 'u', 'r', 'u'];
-  print "  constructed as sequence: ", d, "\n";
-
-  var x, y := InterplayBetweenSeqCharAndString('d');
-  // TODO: JavaScript and Go currently differ from C# if the following line is
-  // uncommented, as they don't carry enough type information around at run time
-  // to notice that x and y are character sequences (i.e. strings).
-  // print "  separate: ", x, " ", y, "\n";
-  x := "hello-" + x;
-  y := y + "-hello";
-  print "  mix: ", x, " ", y, "\n";
-}
-
-method InterplayBetweenSeqCharAndString<G>(g: G) returns (a: seq<G>, b: seq<G>) {
-  a := [g];
-  b := a + a;
-  b := b + [g];
-}
-
-// -------------------------------------------------------------------------------------------
-
-type IntMap = map<int, int>
-
-datatype Color = Blue | Yellow | Red
-
-method Maps() {
-  var a := map[];
-  var b: IntMap := map[17 := 2, 82 := 2];
-  var c := map[17 := 0, 12 := 26];
-  print "Maps: ", a, " ", b, " ", c, "\n";
-  print "  cardinality: ", |a|, " ", |b|, " ", |c|, "\n";
-  print "  keys: ", a.Keys, " ", b.Keys, " ", c.Keys, "\n";
-  print "  values: ", a.Values, " ", b.Values, " ", c.Values, "\n";
-  print "  items: ", a.Items, " ", b.Items, " ", c.Items, "\n";
-  var a', b', c' := a[17 := 6], b[17 := 6], c[17 := 6];
-  print "  update: ";
-  print a'[17], " (", |a'|, " ", |a|, ") ";
-  print b'[17], " (", |b'|, " ", |b|, " ", b[17], ") ";
-  print c'[17], " (", |c'|, " ", |c|, " ", c[17], ")\n";
-  print "  lookup: ", 17 in a, " ", b[17], " ", c[17], "\n";
-
-  // regression tests: make sure the types of .Keys, .Values, and .Items are correct
-  var m := map[Blue := 30, Yellow := 21];
-  print "m: ", m, "\n";
-  var keys := m.Keys;
-  print "keys: ", keys, "\n";
-  var values := m.Values;
-  print "values: ", values, "\n";
-  var items := m.Items;
-  print "items: ", items, "\n";
-
-  TestMapMergeSubtraction();
-}
-
-method TestMapMergeSubtraction() {
-  TestMapMerge();
-  TestMapSubtraction();
-  TestNullsAmongKeys();
-  TestNullsAmongValues();
-}
-
-method TestMapMerge() {
-  var a := map["ronald" := 66, "jack" := 70, "bk" := 8];
-  var b := map["wendy" := 52, "bk" := 67];
-  var ages := a + b;
-  assert ages["jack"] == 70;
-  assert ages["bk"] == 67;
-  assert "sanders" !in ages;
-  print |a|, " ", |b|, " ", |ages|, "\n";  // 3 2 4
-  print ages["jack"], " ", ages["wendy"], " ", ages["ronald"], "\n";  // 70 52 66
-  print a["bk"], " ", b["bk"], " ", ages["bk"], "\n";  // 8 67 67
-}
-
-method TestMapSubtraction() {
-  var ages := map["ronald" := 66, "jack" := 70, "bk" := 67, "wendy" := 52];
-  var d := ages - {};
-  var e := ages - {"jack", "sanders"};
-  print |ages|, " ", |d|, " ", |e|, "\n";  // 4 4 3
-  print "ronald" in d, " ", "sanders" in d, " ", "jack" in d, " ", "sibylla" in d, "\n";  // true false true false
-  print "ronald" in e, " ", "sanders" in e, " ", "jack" in e, " ", "sibylla" in e, "\n";  // true false false false
-}
-
-class MyClass {
-  const name: string
-  constructor (name: string) {
-    this.name := name;
-  }
-}
-
-method TestNullsAmongKeys() {
-  var a := new MyClass("ronald");
-  var b := new MyClass("wendy");
-  var c: MyClass? := null;
-  var d := new MyClass("jack");
-  var e := new MyClass("sibylla");
-
-  var m := map[a := 0, b := 1, c := 2, d := 3];
-  var n := map[a := 0, b := 10, c := 20, e := 4];
-  var o := map[b := 199, a := 198];
-
-  var o' := map[b := 199, c := 55, a := 198];
-  var o'' := map[b := 199, c := 56, a := 198];
-  var o3 := map[c := 3, d := 16];
-  var x0, x1, x2 := o == o', o' == o'', o' == o';
-  print x0, " " , x1, " ", x2, "\n";  //  false false true
-
-  var p := m + n;
-  var q := n + o;
-  var r := o + m;
-  var s := o3 + o;
-  var y0, y1, y2, y3 := p == n + m, q == o + n, r == m + o, s == o + o3;
-  print y0, " " , y1, " ", y2, " ", y3, "\n";  // false false false true
-
-  print p[a], " ", p[c], " ", p[e], "\n";  // 0 20 4
-  print q[a], " ", q[c], " ", q[e], "\n";  // 198 20 4
-  print r[a], " ", r[c], " ", e in r, "\n";  // 0 2 false
-
-  p, q, r := GenericMap(m, n, o, a, e);
-  print p[a], " ", p[c], " ", p[e], "\n";  // 0 20 4
-  print q[a], " ", q[c], " ", q[e], "\n";  // 198 20 4
-  print r[a], " ", r[c], " ", e in r, "\n";  // 0 2 false
-}
-
-method GenericMap<K, V>(m: map<K, V>, n: map<K, V>, o: map<K, V>, a: K, b: K)
-    returns (p: map<K, V>, q: map<K, V>, r: map<K, V>)
-  requires a in m.Keys && a in n.Keys
-  requires b !in m.Keys && b !in o.Keys
-  ensures p == m + n && q == n + o && r == o + m
-{
-  p := m + n;
-  q := n + o;
-  r := o + m;
-  print a in m.Keys, " ", a in n.Keys, " ", a in p, " ", b in r, "\n";  // true true true false
-
-  assert p.Keys == m.Keys + n.Keys;
-  assert q.Keys == o.Keys + n.Keys;
-  assert r.Keys == m.Keys + o.Keys;
-}
-
-method TestNullsAmongValues() {
-  var a := new MyClass("ronald");
-  var b := new MyClass("wendy");
-  var d := new MyClass("jack");
-  var e := new MyClass("sibylla");
-
-  var m: map<int, MyClass?> := map[0 := a, 1 := b, 2 := null, 3 := null];
-  var n: map<int, MyClass?> := map[0 := d, 10 := b, 20 := null, 4 := e];
-  var o: map<int, MyClass?> := map[199 := null, 198 := a];
-
-  var o': map<int, MyClass?> := map[199 := b, 55 := null, 198 := a];
-  var o'': map<int, MyClass?> := map[199 := b, 56 := null, 198 := a];
-  var o3: map<int, MyClass?> := map[3 := null, 16 := d];
-  var x0, x1, x2 := o == o', o' == o'', o' == o';
-  print x0, " " , x1, " ", x2, "\n";  //  false false true
-
-  var p := m + n;
-  var q := n + o;
-  var r := o + m;
-  var s := o3 + o;
-  var y0, y1, y2, y3 := p == n + m, q == o + n, r == m + o, s == o + o3;
-  print y0, " " , y1, " ", y2, " ", y3, "\n";  // false true true true
-
-  print p[0].name, " ", p[1].name, " ", p[20], "\n";  // jack wendy null
-  print q[0].name, " ", q[199], " ", q[20], "\n";  // jack null null
-  print r[0].name, " ", r[198].name, " ", 20 in r, "\n";  // ronald ronald false
-
-  p, q, r := GenericMap(m, n, o, 0, 321);
-  print p[0].name, " ", p[1].name, " ", p[20], "\n";  // jack wendy null
-  print q[0].name, " ", q[199], " ", q[20], "\n";  // jack null null
-  print r[0].name, " ", r[198].name, " ", 20 in r, "\n";  // ronald ronald false
-}
-
-// -------------------------------------------------------------------------------------------
-
-method MultiSetForming() {
-  var s := {24, 23, 24};
-  var q := [24, 23, 24];
-  var m := multiset(s);
-  print |m|, ": ", m[2], " ", m[23], " ", m[24], "\n";
-  m := multiset(q);
-  print |m|, ": ", m[2], " ", m[23], " ", m[24], "\n";
-}
-
-// -------------------------------------------------------------------------------------------
-
-method ExplosiveUnion<T(0)>(a: multiset<T>, N: nat) returns (b: multiset<T>)
-  // ensures b == a^N
-{
-  if N == 0 {
-    return multiset{};
-  }
-  var n := 1;
-  b := a;
-  while n < N
-    // invariant b == a^n
-  {
-    b := b + b;  // double the multiplicities of every element in b
-    n := n + 1;
-  }
-}
-
-method TestExplosiveUnion1<T(0)>(a: multiset<T>, N: nat, t: T) {
-  var b := ExplosiveUnion(a, N);
-  print "There are ", b[t], " occurrences of ", t, " in the multiset\n";
-}
-
-method TestExplosiveUnion() {
-  TestExplosiveUnion1(multiset{}, 100, 58);
-  TestExplosiveUnion1(multiset{58}, 30, 58);
-  TestExplosiveUnion1(multiset{58}, 100, 58);  // this requires BigInteger multiplicities in multisets
-  var m: multiset<MyClass?> := multiset{null};
-  TestExplosiveUnion1(m, 100, null);  // also test null, since the C# implementation does something different for null
-}
-
-// -------------------------------------------------------------------------------------------
-
-module Regressions {
-  newtype uint32 = i:int | 0 <= i < 0x1_0000_0000
-
-  method Test() {
-    TestMap();
-    TestSeq();
-    TestMultiset();
-  }
-
-  method TestMap() {
-    print "Map===\n";
-    var s: map<uint32, uint32> := map[1 := 123];
-    var u := s[1 := 40];
-    print "|s|=", |s|, " |u|=", |u|, "\n";  // 1 1
-    print "s[1]=", s[1], " u[1]=", u[1], "\n";  // 123 40
-
-    var S: map<int, uint32> := map[1 := 123];
-    var U := S[1 := 41];
-    print "|S|=", |S|, " |U|=", |U|, "\n";  // 1 1
-    print "S[1]=", S[1], " U[1]=", U[1], "\n";  // 123 41
-  }
-
-  method TestSeq() {
-    print "Seq===\n";
-    var s: seq<uint32> := [14, 123];
-    var u := s[1 := 42];
-    print "|s|=", |s|, " |u|=", |u|, "\n";  // 2 2
-    print s[1], " ", u[1], ", ";  // 123 42
-    print s[1 as int], " ", u[1 as int], ", ";  // 123 42
-    print s[1 as bv3], " ", u[1 as bv3], "\n";  // 123 42
-
-    u := s[1 as uint32 := 43];
-    print "|s|=", |s|, " |u|=", |u|, "\n";  // 2 2
-    print s[1], " ", u[1], ", ";  // 123 43
-    print s[1 as int], " ", u[1 as int], ", ";  // 123 43
-    print s[1 as bv3], " ", u[1 as bv3], "\n";  // 123 43
-
-    u := s[1 as bv3 := 44];
-    print "|s|=", |s|, " |u|=", |u|, "\n";  // 2 2
-    print s[1], " ", u[1], ", ";  // 123 44
-    print s[1 as int], " ", u[1 as int], ", ";  // 123 44
-    print s[1 as bv3], " ", u[1 as bv3], "\n";  // 123 44
-  }
-
-  method TestMultiset() {
-    print "Multiset===\n";
-    var s: multiset<uint32> := multiset{14, 123};
-    var u := s[123 := 3];
-    print "|s|=", |s|, " |u|=", |u|, "\n";  // 2 4
-    print s[123], " ", u[123], "\n";  // 1 3
-
-    u := s[123 := 3 /*as uint32*/];
-    print "|s|=", |s|, " |u|=", |u|, "\n";  // 2 4
-    print s[123], " ", u[123], "\n";  // 1 3
-  }
-}
diff --git a/Test/comp/Collections.dfy.expect b/Test/comp/Collections.dfy.expect
deleted file mode 100644
index e705d887a7d..00000000000
--- a/Test/comp/Collections.dfy.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-Sets: {} {17, 82} {12, 17}
-  cardinality: 0 2 2
-  union: {17, 82} {12, 17, 82}
-  intersection: {} {17}
-  difference: {} {82}
-  disjoint: true false
-  subset: true false true
-  proper subset: true false false
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  eq covariance: 1 true true
-false true
-|s|=4 |S|=16
-{{}, {a}, {b}, {c}, {d}, {a, b}, {a, c}, {b, c}, {a, d}, {b, d}, {c, d}, {a, b, c}, {a, b, d}, {a, c, d}, {b, c, d}, {a, b, c, d}}
-Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
-  cardinality: 0 4 2
-  union: multiset{17, 17, 82, 82} multiset{12, 17, 17, 17, 82, 82}
-  intersection: multiset{} multiset{17}
-  difference: multiset{} multiset{17, 82, 82}
-  disjoint: true false
-  subset: true false true true
-  proper subset: true false false true
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
-  multiplicity: 0 2 1
-Test zero multiplicity:
-  printing: multiset{multiset{}, multiset{42}} multiset{12}
-  union: 1 1 1 1
-  membership: false false
-  equality: false true false
-  subset: true true true true false
-  strict subset: true false false true false
-  disjoint: true true true true
-Sequences: [] [17, 82, 17, 82] [12, 17]
-  cardinality: 0 4 2
-  update: [42, 82, 17, 82] [42, 17]
-  index: 17 12
-  subsequence ([lo..hi]): [82, 17] [17]
-  subsequence ([lo..]): [82, 17, 82] [17]
-  subsequence ([..hi]): [17, 82, 17][12]
-  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
-  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-Bound Bound Bound Bound Bound Bound
-ed ed ed ed ed ed
-e e e e e e
-hello
-hEllo
-[2, 4, 6, 8, 10]
-[2, 0, 6, 8, 10]
-true false false
-true true false true
-false false false true
-  eq covariance: true true
-Strings:  uRuR gu
-  cardinality: 0 4 2
-  concatenation: uRuR uRuRgu
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-  constructed as sequence: guru
-  mix: hello-d ddd-hello
-Maps: map[] map[17 := 2, 82 := 2] map[12 := 26, 17 := 0]
-  cardinality: 0 2 2
-  keys: {} {17, 82} {12, 17}
-  values: {} {2} {0, 26}
-  items: {} {(17, 2), (82, 2)} {(12, 26), (17, 0)}
-  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
-  lookup: false 2 0
-m: map[Color.Blue := 30, Color.Yellow := 21]
-keys: {Color.Blue, Color.Yellow}
-values: {21, 30}
-items: {(Color.Blue, 30), (Color.Yellow, 21)}
-3 2 4
-70 52 66
-8 67 67
-4 4 3
-true false true false
-true false false false
-false false true
-false false false true
-0 20 4
-198 20 4
-0 2 false
-true true true false
-0 20 4
-198 20 4
-0 2 false
-false false true
-false true true true
-jack wendy null
-jack null null
-ronald ronald false
-true true true false
-jack wendy null
-jack null null
-ronald ronald false
-2: 0 1 1
-3: 0 1 2
-There are 0 occurrences of 58 in the multiset
-There are 536870912 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of null in the multiset
-Map===
-|s|=1 |u|=1
-s[1]=123 u[1]=40
-|S|=1 |U|=1
-S[1]=123 U[1]=41
-Seq===
-|s|=2 |u|=2
-123 42, 123 42, 123 42
-|s|=2 |u|=2
-123 43, 123 43, 123 43
-|s|=2 |u|=2
-123 44, 123 44, 123 44
-Multiset===
-|s|=2 |u|=4
-1 3
-|s|=2 |u|=4
-1 3
diff --git a/Test/comp/Collections.dfy.go.expect b/Test/comp/Collections.dfy.go.expect
deleted file mode 100644
index 309d0c550c4..00000000000
--- a/Test/comp/Collections.dfy.go.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-Sets: {} {17, 82} {12, 17}
-  cardinality: 0 2 2
-  union: {17, 82} {17, 82, 12}
-  intersection: {} {17}
-  difference: {} {82}
-  disjoint: true false
-  subset: true false true
-  proper subset: true false false
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  eq covariance: 1 true true
-false true
-|s|=4 |S|=16
-{{}, {a}, {b}, {c}, {d}, {a, b}, {a, c}, {b, c}, {a, d}, {b, d}, {c, d}, {a, b, c}, {a, b, d}, {a, c, d}, {b, c, d}, {a, b, c, d}}
-Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
-  cardinality: 0 4 2
-  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
-  intersection: multiset{} multiset{17}
-  difference: multiset{} multiset{17, 82, 82}
-  disjoint: true false
-  subset: true false true true
-  proper subset: true false false true
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
-  multiplicity: 0 2 1
-Test zero multiplicity:
-  printing: multiset{multiset{}, multiset{42}} multiset{12}
-  union: 1 1 1 1
-  membership: false false
-  equality: false true false
-  subset: true true true true false
-  strict subset: true false false true false
-  disjoint: true true true true
-Sequences: [] [17, 82, 17, 82] [12, 17]
-  cardinality: 0 4 2
-  update: [42, 82, 17, 82] [42, 17]
-  index: 17 12
-  subsequence ([lo..hi]): [82, 17] [17]
-  subsequence ([lo..]): [82, 17, 82] [17]
-  subsequence ([..hi]): [17, 82, 17][12]
-  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
-  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-Bound Bound Bound Bound Bound Bound
-ed ed ed ed ed ed
-e e e e e e
-hello
-hEllo
-[2, 4, 6, 8, 10]
-[2, 0, 6, 8, 10]
-true false false
-true true false true
-false false false true
-  eq covariance: true true
-Strings:  uRuR gu
-  cardinality: 0 4 2
-  concatenation: uRuR uRuRgu
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-  constructed as sequence: guru
-  mix: hello-d ddd-hello
-Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
-  cardinality: 0 2 2
-  keys: {} {17, 82} {17, 12}
-  values: {} {2} {0, 26}
-  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
-  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
-  lookup: false 2 0
-m: map[Color.Blue := 30, Color.Yellow := 21]
-keys: {Color.Blue, Color.Yellow}
-values: {30, 21}
-items: {(Color.Blue, 30), (Color.Yellow, 21)}
-3 2 4
-70 52 66
-8 67 67
-4 4 3
-true false true false
-true false false false
-false false true
-false false false true
-0 20 4
-198 20 4
-0 2 false
-true true true false
-0 20 4
-198 20 4
-0 2 false
-false false true
-false true true true
-jack wendy null
-jack null null
-ronald ronald false
-true true true false
-jack wendy null
-jack null null
-ronald ronald false
-2: 0 1 1
-3: 0 1 2
-There are 0 occurrences of 58 in the multiset
-There are 536870912 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of null in the multiset
-Map===
-|s|=1 |u|=1
-s[1]=123 u[1]=40
-|S|=1 |U|=1
-S[1]=123 U[1]=41
-Seq===
-|s|=2 |u|=2
-123 42, 123 42, 123 42
-|s|=2 |u|=2
-123 43, 123 43, 123 43
-|s|=2 |u|=2
-123 44, 123 44, 123 44
-Multiset===
-|s|=2 |u|=4
-1 3
-|s|=2 |u|=4
-1 3
diff --git a/Test/comp/Collections.dfy.java.expect b/Test/comp/Collections.dfy.java.expect
deleted file mode 100644
index ed929a4d34c..00000000000
--- a/Test/comp/Collections.dfy.java.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-Sets: {} {17, 82} {17, 12}
-  cardinality: 0 2 2
-  union: {17, 82} {17, 82, 12}
-  intersection: {} {17}
-  difference: {} {82}
-  disjoint: true false
-  subset: true false true
-  proper subset: true false false
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  eq covariance: 1 true true
-false true
-|s|=4 |S|=16
-{{}, {a}, {b}, {c}, {d}, {a, b}, {a, c}, {b, c}, {a, d}, {b, d}, {c, d}, {a, b, c}, {a, b, d}, {a, c, d}, {b, c, d}, {a, b, c, d}}
-Multisets: multiset{} multiset{17, 17, 82, 82} multiset{17, 12}
-  cardinality: 0 4 2
-  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
-  intersection: multiset{} multiset{17}
-  difference: multiset{} multiset{17, 82, 82}
-  disjoint: true false
-  subset: true false true true
-  proper subset: true false false true
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{17, 17, 12}
-  multiplicity: 0 2 1
-Test zero multiplicity:
-  printing: multiset{multiset{}, multiset{42}} multiset{12}
-  union: 1 1 1 1
-  membership: false false
-  equality: false true false
-  subset: true true true true false
-  strict subset: true false false true false
-  disjoint: true true true true
-Sequences: [] [17, 82, 17, 82] [12, 17]
-  cardinality: 0 4 2
-  update: [42, 82, 17, 82] [42, 17]
-  index: 17 12
-  subsequence ([lo..hi]): [82, 17] [17]
-  subsequence ([lo..]): [82, 17, 82] [17]
-  subsequence ([..hi]): [17, 82, 17][12]
-  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
-  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-Bound Bound Bound Bound Bound Bound
-ed ed ed ed ed ed
-e e e e e e
-hello
-hEllo
-[2, 4, 6, 8, 10]
-[2, 0, 6, 8, 10]
-true false false
-true true false true
-false false false true
-  eq covariance: true true
-Strings:  uRuR gu
-  cardinality: 0 4 2
-  concatenation: uRuR uRuRgu
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-  constructed as sequence: guru
-  mix: hello-d ddd-hello
-Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
-  cardinality: 0 2 2
-  keys: {} {17, 82} {17, 12}
-  values: {} {2} {0, 26}
-  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
-  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
-  lookup: false 2 0
-m: map[Color.Yellow := 21, Color.Blue := 30]
-keys: {Color.Yellow, Color.Blue}
-values: {21, 30}
-items: {(Color.Yellow, 21), (Color.Blue, 30)}
-3 2 4
-70 52 66
-8 67 67
-4 4 3
-true false true false
-true false false false
-false false true
-false false false true
-0 20 4
-198 20 4
-0 2 false
-true true true false
-0 20 4
-198 20 4
-0 2 false
-false false true
-false true true true
-jack wendy null
-jack null null
-ronald ronald false
-true true true false
-jack wendy null
-jack null null
-ronald ronald false
-2: 0 1 1
-3: 0 1 2
-There are 0 occurrences of 58 in the multiset
-There are 536870912 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of null in the multiset
-Map===
-|s|=1 |u|=1
-s[1]=123 u[1]=40
-|S|=1 |U|=1
-S[1]=123 U[1]=41
-Seq===
-|s|=2 |u|=2
-123 42, 123 42, 123 42
-|s|=2 |u|=2
-123 43, 123 43, 123 43
-|s|=2 |u|=2
-123 44, 123 44, 123 44
-Multiset===
-|s|=2 |u|=4
-1 3
-|s|=2 |u|=4
-1 3
diff --git a/Test/comp/Collections.dfy.js.expect b/Test/comp/Collections.dfy.js.expect
deleted file mode 100644
index 309d0c550c4..00000000000
--- a/Test/comp/Collections.dfy.js.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-Sets: {} {17, 82} {12, 17}
-  cardinality: 0 2 2
-  union: {17, 82} {17, 82, 12}
-  intersection: {} {17}
-  difference: {} {82}
-  disjoint: true false
-  subset: true false true
-  proper subset: true false false
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  eq covariance: 1 true true
-false true
-|s|=4 |S|=16
-{{}, {a}, {b}, {c}, {d}, {a, b}, {a, c}, {b, c}, {a, d}, {b, d}, {c, d}, {a, b, c}, {a, b, d}, {a, c, d}, {b, c, d}, {a, b, c, d}}
-Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
-  cardinality: 0 4 2
-  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
-  intersection: multiset{} multiset{17}
-  difference: multiset{} multiset{17, 82, 82}
-  disjoint: true false
-  subset: true false true true
-  proper subset: true false false true
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
-  multiplicity: 0 2 1
-Test zero multiplicity:
-  printing: multiset{multiset{}, multiset{42}} multiset{12}
-  union: 1 1 1 1
-  membership: false false
-  equality: false true false
-  subset: true true true true false
-  strict subset: true false false true false
-  disjoint: true true true true
-Sequences: [] [17, 82, 17, 82] [12, 17]
-  cardinality: 0 4 2
-  update: [42, 82, 17, 82] [42, 17]
-  index: 17 12
-  subsequence ([lo..hi]): [82, 17] [17]
-  subsequence ([lo..]): [82, 17, 82] [17]
-  subsequence ([..hi]): [17, 82, 17][12]
-  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
-  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-Bound Bound Bound Bound Bound Bound
-ed ed ed ed ed ed
-e e e e e e
-hello
-hEllo
-[2, 4, 6, 8, 10]
-[2, 0, 6, 8, 10]
-true false false
-true true false true
-false false false true
-  eq covariance: true true
-Strings:  uRuR gu
-  cardinality: 0 4 2
-  concatenation: uRuR uRuRgu
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-  constructed as sequence: guru
-  mix: hello-d ddd-hello
-Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
-  cardinality: 0 2 2
-  keys: {} {17, 82} {17, 12}
-  values: {} {2} {0, 26}
-  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
-  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
-  lookup: false 2 0
-m: map[Color.Blue := 30, Color.Yellow := 21]
-keys: {Color.Blue, Color.Yellow}
-values: {30, 21}
-items: {(Color.Blue, 30), (Color.Yellow, 21)}
-3 2 4
-70 52 66
-8 67 67
-4 4 3
-true false true false
-true false false false
-false false true
-false false false true
-0 20 4
-198 20 4
-0 2 false
-true true true false
-0 20 4
-198 20 4
-0 2 false
-false false true
-false true true true
-jack wendy null
-jack null null
-ronald ronald false
-true true true false
-jack wendy null
-jack null null
-ronald ronald false
-2: 0 1 1
-3: 0 1 2
-There are 0 occurrences of 58 in the multiset
-There are 536870912 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of null in the multiset
-Map===
-|s|=1 |u|=1
-s[1]=123 u[1]=40
-|S|=1 |U|=1
-S[1]=123 U[1]=41
-Seq===
-|s|=2 |u|=2
-123 42, 123 42, 123 42
-|s|=2 |u|=2
-123 43, 123 43, 123 43
-|s|=2 |u|=2
-123 44, 123 44, 123 44
-Multiset===
-|s|=2 |u|=4
-1 3
-|s|=2 |u|=4
-1 3
diff --git a/Test/comp/Collections.dfy.py.expect b/Test/comp/Collections.dfy.py.expect
deleted file mode 100644
index 61b4217bbaf..00000000000
--- a/Test/comp/Collections.dfy.py.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-Sets: {} {17, 82} {17, 12}
-  cardinality: 0 2 2
-  union: {17, 82} {17, 82, 12}
-  intersection: {} {17}
-  difference: {} {82}
-  disjoint: true false
-  subset: true false true
-  proper subset: true false false
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  eq covariance: 1 true true
-false true
-|s|=4 |S|=16
-{{}, {a}, {b}, {c}, {d}, {a, b}, {a, c}, {b, c}, {a, d}, {b, d}, {c, d}, {a, b, c}, {a, b, d}, {a, c, d}, {b, c, d}, {a, b, c, d}}
-Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
-  cardinality: 0 4 2
-  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
-  intersection: multiset{} multiset{17}
-  difference: multiset{} multiset{17, 82, 82}
-  disjoint: true false
-  subset: true false true true
-  proper subset: true false false true
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
-  multiplicity: 0 2 1
-Test zero multiplicity:
-  printing: multiset{multiset{}, multiset{42}} multiset{12}
-  union: 1 1 1 1
-  membership: false false
-  equality: false true false
-  subset: true true true true false
-  strict subset: true false false true false
-  disjoint: true true true true
-Sequences: [] [17, 82, 17, 82] [12, 17]
-  cardinality: 0 4 2
-  update: [42, 82, 17, 82] [42, 17]
-  index: 17 12
-  subsequence ([lo..hi]): [82, 17] [17]
-  subsequence ([lo..]): [82, 17, 82] [17]
-  subsequence ([..hi]): [17, 82, 17][12]
-  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
-  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-Bound Bound Bound Bound Bound Bound
-ed ed ed ed ed ed
-e e e e e e
-hello
-hEllo
-[2, 4, 6, 8, 10]
-[2, 0, 6, 8, 10]
-true false false
-true true false true
-false false false true
-  eq covariance: true true
-Strings:  uRuR gu
-  cardinality: 0 4 2
-  concatenation: uRuR uRuRgu
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-  constructed as sequence: guru
-  mix: hello-d ddd-hello
-Maps: map[] map[82 := 2, 17 := 2] map[17 := 0, 12 := 26]
-  cardinality: 0 2 2
-  keys: {} {17, 82} {17, 12}
-  values: {} {2} {0, 26}
-  items: {} {(82, 2), (17, 2)} {(17, 0), (12, 26)}
-  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
-  lookup: false 2 0
-m: map[Color.Blue := 30, Color.Yellow := 21]
-keys: {Color.Blue, Color.Yellow}
-values: {21, 30}
-items: {(Color.Blue, 30), (Color.Yellow, 21)}
-3 2 4
-70 52 66
-8 67 67
-4 4 3
-true false true false
-true false false false
-false false true
-false false false true
-0 20 4
-198 20 4
-0 2 false
-true true true false
-0 20 4
-198 20 4
-0 2 false
-false false true
-false true true true
-jack wendy null
-jack null null
-ronald ronald false
-true true true false
-jack wendy null
-jack null null
-ronald ronald false
-2: 0 1 1
-3: 0 1 2
-There are 0 occurrences of 58 in the multiset
-There are 536870912 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of null in the multiset
-Map===
-|s|=1 |u|=1
-s[1]=123 u[1]=40
-|S|=1 |U|=1
-S[1]=123 U[1]=41
-Seq===
-|s|=2 |u|=2
-123 42, 123 42, 123 42
-|s|=2 |u|=2
-123 43, 123 43, 123 43
-|s|=2 |u|=2
-123 44, 123 44, 123 44
-Multiset===
-|s|=2 |u|=4
-1 3
-|s|=2 |u|=4
-1 3
diff --git a/Test/comp/CompileWithArguments.dfy b/Test/comp/CompileWithArguments.dfy
deleted file mode 100644
index ca72b469756..00000000000
--- a/Test/comp/CompileWithArguments.dfy
+++ /dev/null
@@ -1,48 +0,0 @@
-// NONUNIFORM: Multiple testing scenarios, highly backend sensitive, testing CLI
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %run --no-verify --target:cs "%s" Csharp 1 >> "%t"
-// RUN: %run --no-verify --target:cpp --unicode-char:false "%s" Cpp Yipee >> "%t"
-// RUN: %run --no-verify --target:java "%s" -- Java --heya >> "%t"
-// RUN: %run --no-verify --target:js "%s" -- Javascript 2 >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:py "%s" --args Python 1 >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go "%s" --args "Go go" 1 >> "%t"
-// RUN: %build --no-verify --target:cs "%s" --output:%s.dll
-// RUN: dotnet %s.dll "dotnet" "howdy" >> "%t"
-// RUN: dotnet %s.dll "dotnet" "hello" >> "%t"
-// RUN: dotnet %s.dll "dotnet" "aloha" >> "%t"
-// RUN: %build --no-verify --target:js "%s" --output=%s.js
-// RUN: node %s.js "javascript" 2 >> "%t"
-// RUN: node %s.js "javascript" 1 >> "%t"
-// RUN: node %s.js "javascript" "aloha" >> "%t"
-// RUN: %build --no-verify --target:cpp --unicode-char:false "%s" --output=%s.exe
-// RUN: %s.exe "cpp" 2 >> "%t"
-// RUN: %s.exe "cpp" 1 >> "%t"
-// RUN: %s.exe "cpp" "aloha" >> "%t"
-// RUN: %build --no-verify --target:java "%s" --output:"%s.jar" >> "%t"
-// RUN: java -jar "%s.jar" Java 2 >> "%t"
-// RUN: java -jar "%s.jar" Java 1 >> "%t"
-// RUN: java -jar "%s.jar" Java aloha >> "%t"
-// RUN: %build --no-verify --target:py "%s" >> "%t"
-// RUN: python3 %S/CompileWithArguments-py Python 2 >> "%t"
-// RUN: python3 %S/CompileWithArguments-py Python 1 >> "%t"
-// RUN: python3 %S/CompileWithArguments-py Python aloha >> "%t"
-// RUN: %build --no-verify --target:go "%s" >> "%t"
-// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go 2 >> "%t"
-// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go 1 >> "%t"
-// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go aloha >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main(args: seq<string>) {
-  if |args| != 3 {
-    print "Expected 3 arguments, got ", |args|;
-  } else {
-    print args[1], " says ";
-    if args[2] == "1" {
-      print "hello\n";
-    } else if args[2] == "2" {
-      print "howdy\n";
-    } else {
-      print args[2],"\n";
-    }
-  }
-}
diff --git a/Test/comp/CompileWithArgumentsFail.dfy b/Test/comp/CompileWithArgumentsFail.dfy
deleted file mode 100644
index 970ed05f543..00000000000
--- a/Test/comp/CompileWithArgumentsFail.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:cs "%s" --args csharp 1 >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main(args: int) {
-  print "ok", args;
-}
diff --git a/Test/comp/CompileWithArgumentsFail2.dfy b/Test/comp/CompileWithArgumentsFail2.dfy
deleted file mode 100644
index 3f5ff9b6f88..00000000000
--- a/Test/comp/CompileWithArgumentsFail2.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:cs "%s" --args csharp 1 >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main(args: array<string>, dummy: int) {
-  print "ok", dummy;
-}
diff --git a/Test/comp/Comprehensions.dfy b/Test/comp/Comprehensions.dfy
deleted file mode 100644
index 73c43b22bfa..00000000000
--- a/Test/comp/Comprehensions.dfy
+++ /dev/null
@@ -1,594 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-
-method Main() {
-  AssignSuchThat();
-  LetSuchThat();
-  Quantifier();
-  MapComprehension();
-  TestCollectionEmptiness();
-  OutParamsUnderLambdas();  // white-box testing
-  AltControlFlow();
-  Sequences();
-  SetComprehension();
-  Enumerations();
-  EnumerationsMaybeNull();
-  GoNil();
-  Containment({}, {}, {});
-  TestImplicitTypeTests.Test();
-  ObjectTests.Test();
-  NewtypeRangeRegression.Test();
-  EnumerationRegression.Test();
-}
-
-predicate Thirteen(x: int) { x == 13 }
-predicate Even(y: int) { y % 2 == 1 }
-function FourMore(x: int): int { x + 4 }
-
-method AssignSuchThat() {
-  var x, y;
-  assert Thirteen(13);
-  x, y :| 12 <= x < y && Thirteen(x);
-  print "x=", x, " y=", y, "\n";
-  var b;
-  x, b, y :| 12 <= x < y && Thirteen(x) && b;
-  print "x=", x, " y=", y, " b=", if b then "yes" else "no", "\n";
-}
-
-method LetSuchThat() {
-  assert Thirteen(13);
-  var p := var x, y :| 12 <= x < y < 15 && Thirteen(x); (x, y);
-  assert p == (13, 14);
-  var q := var x, b, y :| 12 <= x < y < 15 && Thirteen(x) && b; (x, y, if b then "yes" else "no");
-  assert q == (13, 14, "yes");
-}
-
-method Quantifier() {
-  // Note, by making *two* assignments to "s" (instead of the obvious one), the direct translation
-  // into Java makes "s" NOT be "effectively final". This means that Java does not allow "s" to be
-  // used in the lambda expression into which the quantifier translates. Compilation into Java
-  // thus needs to capture the value of "s" into another variable, which these tests check on.
-  var s := [0, 1, 1, 2];
-  s := s + [3, 5, 8, 13];
-  print forall x :: x in s ==> x < 20, " ";  // true
-  print forall x :: x in s ==> x < 10, "\n";  // false
-  print exists x :: x in s && x == 3, " ";  // true
-  print exists x :: x in s && x == 4, "\n";  // false
-}
-
-method MapComprehension() {
-  // var m := map x,y | 12 <= x < y < 17 && Thirteen(x) && Even(y) :: x := y;
-  var m := map x | 12 <= x < 15 :: x / 2;
-  print m, "\n";
-  m := map x | 12 <= x < 15 :: FourMore(x) := x;
-  print m, "\n";
-}
-
-method TestCollectionEmptiness() {
-  var a, b, c, d;
-  a, b, c, d := {2, 4}, multiset{4, 4, 1}, [0, 9, 0], map[13 := 26];
-  PrintCollectionEmptiness(a, b, c, d);
-  a, b, c, d := {}, multiset{}, [], map[];
-  PrintCollectionEmptiness(a, b, c, d);
-}
-
-method PrintCollectionEmptiness<X(==)>(a: set<X>, b: multiset<X>, c: seq<X>, d: map<X, int>) {
-  var r0, r1;
-  // set
-  r0 := forall x :: !(x in a);
-  r1 := forall x :: x !in a;
-  expect r0 == r1;
-  print r0, " ";
-  // multiset
-  r0 := forall x :: !(x in b);
-  r1 := forall x :: x !in b;
-  expect r0 == r1;
-  print r0, " ";
-  // seq
-  r0 := forall x :: !(x in c);
-  r1 := forall x :: x !in c;
-  expect r0 == r1;
-  print r0, " ";
-  // map
-  r0 := forall x :: !(x in d);
-  r1 := forall x :: x !in d;
-  expect r0 == r1;
-  print r0, "\n";
-}
-
-
-method OutParamsUnderLambdas() {
-  var x, b := XP();
-  print "XP returned: ", x, " ", b, "\n";
-  var m := XM();
-  print "XM returned: ", m, "\n";
-}
-
-method XP() returns (x: int, b: bool) {
-  var s := {2, 4};
-  b := exists y :: y in s && y < x;
-}
-
-
-method XM() returns (x: int) {
-  var before, after;
-
-  var f := () => x;
-  before := f();
-  x := 2;
-  after := f();
-  print "after: ", f(), " ", "before: ", f(), "\n";
-
-  f := () => x;
-  before := f();
-  x := 16;
-  after := f();
-  print "after: ", f(), " ", "before: ", f(), "\n";
-}
-
-method AltControlFlow() {
-  var s := [2, 29, 34, 35, 36, 59, 104, 106, 107, 107, 108, 2700];
-  var lo, hi, Lo, Hi;
-
-  lo, hi := FindRange(s, 0, 3000);
-  Lo, Hi := FindRange(s, 35, 107);
-  print lo, " ", hi, " ", Lo, " ", Hi, "\n";
-
-  lo, hi := FindRangeIf(s, 0, 3000);
-  Lo, Hi := FindRangeIf(s, 35, 107);
-  print lo, " ", hi, " ", Lo, " ", Hi, "\n";
-
-  lo, hi := FindRangeBindingGuard(s, 0, 3000);
-  Lo, Hi := FindRangeBindingGuard(s, 35, 107);
-  print lo, " ", hi, " ", Lo, " ", Hi, "\n";
-
-  lo, hi := FindRangeBindingGuardAlt(s, 0, 3000);
-  Lo, Hi := FindRangeBindingGuardAlt(s, 35, 107);
-  print lo, " ", hi, " ", Lo, " ", Hi, "\n";
-}
-
-method FindRange(s: seq<int>, from: int, to: int) returns (lo: int, hi: int)
-  requires forall i,j :: 0 <= i < j < |s| ==> s[i] <= s[j]
-  requires from <= to
-  ensures 0 <= lo <= hi <= |s|
-  ensures forall i :: 0 <= i < |s| ==> (from <= s[i] < to <==> lo <= i < hi)
-{
-  lo, hi := 0, |s|;
-  while
-    invariant lo <= hi <= |s|
-    invariant forall i :: 0 <= i < lo ==> s[i] < from
-    invariant forall i :: hi <= i < |s| ==> to <= s[i]
-    decreases hi - lo
-  {
-  case lo < |s| && s[lo] < from =>
-    lo := lo + 1;
-  case 0 < hi && to <= s[hi-1] =>
-    hi := hi - 1;
-  }
-}
-
-method FindRangeIf(s: seq<int>, from: int, to: int) returns (lo: int, hi: int)
-  requires forall i,j :: 0 <= i < j < |s| ==> s[i] <= s[j]
-  requires from <= to
-  ensures 0 <= lo <= hi <= |s|
-  ensures forall i :: 0 <= i < |s| ==> (from <= s[i] < to <==> lo <= i < hi)
-{
-  lo, hi := 0, |s|;
-  while lo < hi
-    invariant lo <= hi <= |s|
-    invariant forall i :: 0 <= i < lo ==> s[i] < from
-    invariant forall i :: hi <= i < |s| ==> to <= s[i]
-    decreases hi - lo
-  {
-    if
-    case s[lo] < from =>
-      lo := lo + 1;
-    case to <= s[hi-1] =>
-      hi := hi - 1;
-    case from <= s[lo] && s[hi-1] < to =>
-      break;
-  }
-}
-
-method FindRangeBindingGuard(s: seq<int>, from: int, to: int) returns (lo: int, hi: int)
-  requires forall i,j :: 0 <= i < j < |s| ==> s[i] <= s[j]
-  requires from <= to
-  ensures 0 <= lo <= hi <= |s|
-  ensures forall i :: 0 <= i < |s| ==> (from <= s[i] < to <==> lo <= i < hi)
-{
-  lo, hi := 0, |s|;
-  while lo < hi
-    invariant lo <= hi <= |s|
-    invariant forall i :: 0 <= i < lo ==> s[i] < from
-    invariant forall i :: hi <= i < |s| ==> to <= s[i]
-    decreases hi - lo
-  {
-    if j :| lo <= j < |s| && s[j] < from {
-      lo := j + 1;
-    } else if j :| 0 <= j < hi && to <= s[j] {
-      hi := j;
-    } else {
-      break;
-    }
-  }
-}
-
-method FindRangeBindingGuardAlt(s: seq<int>, from: int, to: int) returns (lo: int, hi: int)
-  requires forall i,j :: 0 <= i < j < |s| ==> s[i] <= s[j]
-  requires from <= to
-  ensures 0 <= lo <= hi <= |s|
-  ensures forall i :: 0 <= i < |s| ==> (from <= s[i] < to <==> lo <= i < hi)
-{
-  lo, hi := 0, |s|;
-  while lo < hi
-    invariant lo <= hi <= |s|
-    invariant forall i :: 0 <= i < lo ==> s[i] < from
-    invariant forall i :: hi <= i < |s| ==> to <= s[i]
-    decreases hi - lo
-  {
-    if
-    case j :| lo <= j < |s| && s[j] < from =>
-      lo := j + 1;
-    case j :| 0 <= j < hi && to <= s[j] =>
-      hi := j;
-    case forall j :: lo <= j < hi ==> from <= s[j] < to =>
-      break;
-  }
-}
-
-method Sequences() {
-  var four1s := [1, 1, 1, 1];
-  var twelve1s := seq(12, _ => 1);
-  assert twelve1s == four1s + four1s + four1s;
-
-  var squares := seq(8, i => i*i);
-  assert |squares| == 8;
-  assert squares[6] == 36;
-
-  var nats := seq(8, i => i);
-
-  print four1s, "\n";
-  print twelve1s, "\n";
-  print squares, "\n";
-  print nats, "\n";
-}
-
-trait NothingInParticular { }
-class ClassA { }
-class ClassB extends NothingInParticular { }
-
-method SetComprehension() {
-  SetComprehension0();
-  SetComprehension1();
-  SetComprehension2();
-  SetComprehension3();
-}
-
-method SetComprehension0() {
-  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
-  var s := {w, x, y, z};
-  // The following set comprehension picks all elements in s:
-  var all := set o: object | o in s;
-  // The next set comprehension picks out 2 of the elements in s:
-  var aa := set o: ClassA | o in s;
-  // The next set comprehension picks out the other 2 of the elements in s:
-  var bb := set o: ClassB | o in s;
-  // The following picks out the same elements as in bb:
-  var nn := set o: NothingInParticular | o in s;
-
-  print |s|, " ", |all|, " ";           // 4 4
-  print |aa|, " ", |bb|, " ";           // 2 2
-  print |aa * bb|, " ", |aa + bb|, " "; // 0 4
-  print |nn|, " ", bb == nn, "\n";      // 2 true
-}
-
-// SetComprehension1 is like SetComprehension0, but also adds "null" to "s".
-method SetComprehension1() {
-  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
-  var s := {w, x, y, z, null};
-  // The following set comprehension picks all elements in s:
-  var all := set o: object | o in s;
-  // The next set comprehension picks out 2 of the elements in s:
-  var aa := set o: ClassA | o in s;
-  // The next set comprehension picks out the other 2 of the elements in s:
-  var bb := set o: ClassB | o in s;
-  // The following picks out the same elements as in bb:
-  var nn := set o: NothingInParticular | o in s;
-
-  print |s|, " ", |all|, " ";           // 5 4
-  print |aa|, " ", |bb|, " ";           // 2 2
-  print |aa * bb|, " ", |aa + bb|, " "; // 0 4
-  print |nn|, " ", bb == nn, "\n";      // 2 true
-}
-
-// SetComprehension2 is like SetComprehension1, but uses maybe-null types in comprehensions
-method SetComprehension2() {
-  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
-  var s := {w, x, y, z, null};
-  // The following set comprehension picks all elements in s:
-  var all := set o: object? | o in s;
-  // The next set comprehension picks out 2 of the elements in s:
-  var aa := set o: ClassA? | o in s;
-  // The next set comprehension picks out the other 2 of the elements in s:
-  var bb := set o: ClassB? | o in s;
-  // The following picks out the same elements as in bb:
-  var nn := set o: NothingInParticular? | o in s;
-
-  print |s|, " ", |all|, " ";           // 5 5
-  print |aa|, " ", |bb|, " ";           // 3 3
-  print |aa * bb|, " ", |aa + bb|, " "; // 1 5
-  print |nn|, " ", bb == nn, "\n";      // 3 true
-}
-
-datatype Color = Red | Green | Blue
-
-predicate True<G>(g: G) { true }
-
-method SetComprehension3() {
-  var s: set<bool> := {false, true};
-  // The following set comprehension picks all elements in s:
-  var all := set o: bool | o in s;
-  var aa := set o: bool | o in s && !o;
-  var bb := set o: bool | o in s && o;
-
-  print |s|, " ", |all|, " ";           // 2 2
-  print |aa|, " ", |bb|, " ";           // 1 1
-  print |aa * bb|, " ", |aa + bb|, " "; // 0 2
-  print aa == all, " ", aa <= all, "\n"; // false true
-
-  var d := set z: Color | True(z);
-  var e := set z: Color | z in d;
-  print |d|, " ", |e|, "\n"; // 3 3
-}
-
-trait ICell { var data: int }
-class CellA extends ICell { }
-class CellB extends ICell { }
-
-method Enumerations() {
-  var c, d, e := new CellA, new CellA, new CellB;
-  c.data, d.data, e.data := 4, 5, 1;
-  var s: set<ICell?> := {c, d, e, null};
-  print c.data, d.data, e.data, "\n";  // 451
-
-  // non-sequentialized forall statement
-  forall a: CellA | a in s {
-    a.data := c.data + a.data - 2;
-  }
-  print c.data, d.data, e.data, "\n";  // 671
-
-  // sequentialized forall statement
-  forall a: CellA | a in s {
-    a.data := 2;
-  }
-  print c.data, d.data, e.data, "\n";  // 221
-
-  // assign-such-that statement
-  d.data := 9;
-  assert d in s;
-  var u: CellA :| u in s && 7 <= u.data;
-  u.data := 8;
-  print c.data, d.data, e.data, "\n";  // 281
-
-  // set comprehension
-  var r := set a: CellA | a in s && a.data < 6;
-  print |r|, "\n";  // 1
-
-  // map comprehension
-  var m := map a: CellA | a in s && a.data < 6 :: 3;
-  print c in m.Keys, " ", d in m.Keys, " ", |m.Keys|, "\n";  // true false 1
-}
-
-method EnumerationsMaybeNull() {
-  var c, d, e := new CellA, new CellA, new CellB;
-  c.data, d.data, e.data := 4, 5, 1;
-  var s: set<ICell?> := {c, d, e, null};
-  print c.data, d.data, e.data, "\n";  // 451
-
-  // non-sequentialized forall statement
-  forall a: CellA? | a in s {
-    (if a == null then c else a).data := c.data + (if a == null then c else a).data - 2;
-  }
-  print c.data, d.data, e.data, "\n";  // 671
-
-  // sequentialized forall statement
-  forall a: CellA? | a in s {
-    (if a == null then c else a).data := 2;
-  }
-  print c.data, d.data, e.data, "\n";  // 221
-
-  // assign-such-that statement
-  d.data := 9;
-  assert d in s;
-  var u: CellA? :| u in s && u != null && 7 <= u.data;
-  u.data := 8;
-  print c.data, d.data, e.data, "\n";  // 281
-
-  // set comprehension
-  var r := set a: CellA? | a in s && (a == null || a.data < 6);
-  print |r|, "\n";  // 2
-
-  // map comprehension
-  var m := map a: CellA? | a in s && (a == null || a.data < 6) :: 3;
-  print null in m.Keys, " ", c in m.Keys, " ", d in m.Keys, " ", |m.Keys|, "\n";  // true true false 2
-}
-
-method GoNil() {
-  var a, b := new CellA, new CellB;
-  var aa := {a, null};
-  var bb := {b, null};
-  var cc := aa * bb;
-  var dd := aa + bb;
-  print "the intersection is ", cc, "\n";  // {null}
-  print "there are ", |dd|, " elements in the union\n";  // 3
-}
-
-trait SomethingElse { }
-
-method Containment(s: set<CellA>, t: set<ICell>, u: set<SomethingElse>) {
-  // Test that the type parameter emitted by the compiler accommodates that of both
-  // operands of <=.
-  var b0 := s <= t;
-  var b1 := t <= s;
-  var c := t <= u;
-  print b0, " ", b1, " ", c, "\n";  // true true true
-  b0 := s < t;
-  b1 := t < s;
-  c := t < u;
-  print b0, " ", b1, " ", c, "\n";  // false false false
-  b0 := s >= t;
-  b1 := t >= s;
-  c := t >= u;
-  print b0, " ", b1, " ", c, "\n";  // true true true
-  b0 := s > t;
-  b1 := t > s;
-  c := t > u;
-  print b0, " ", b1, " ", c, "\n";  // false false false
-}
-
-module TestImplicitTypeTests {
-  trait A {}
-  trait B extends A {}
-  class C extends B {}
-  class A' extends A {}
-  class B' extends B {}
-
-  method Test() {
-    var o, a, b, c := new object, new A', new B', new C;
-    var r: set<object> := {o, a, b, c};
-    var s: set<A> := set x: A | x in r;
-    var t: set<B> := set x: B | x in s;
-    var u: set<C> := set x: C | x in s;
-    print |r|, " ", |s|, " ", |t|, " ", |u|, "\n"; // 4 3 2 1
-    print r == set x | x in r && x is object, " "; // true
-    print s == set x | x in r && x is A, " "; // true
-    print t == set x | x in r && x is B, " "; // true
-    print u == set x | x in r && x is C, "\n"; // true
-
-    var r': set<object?> := r;
-    var s': set<A?> := s;
-    var t': set<B?> := t;
-    var u': set<C?> := u;
-    print |r'|, " ", |s'|, " ", |t'|, " ", |u'|, "\n"; // 4 3 2 1
-    print r' == set x | x in r && x is object, " "; // true
-    print s' == set x | x in r && x is A, " "; // true
-    print t' == set x | x in r && x is B, " "; // true
-    print u' == set x | x in r && x is C, "\n"; // true
-
-    r', s', t', u' := r' + {null}, s' + {null}, t' + {null}, u' + {null};
-    print r' == set x | x in r && x is object, " "; // false
-    print s' == set x | x in r && x is A, " "; // false
-    print t' == set x | x in r && x is B, " "; // false
-    print u' == set x | x in r && x is C, "\n"; // false
-    print r' == set x | x in r && x is object?, " "; // false
-    print s' == set x | x in r && x is A?, " "; // false
-    print t' == set x | x in r && x is B?, " "; // false
-    print u' == set x | x in r && x is C?, "\n"; // false
-
-    print r == set x | x in r' && x is object, " "; // true
-    print s == set x | x in r' && x is A, " "; // true
-    print t == set x | x in r' && x is B, " "; // true
-    print u == set x | x in r' && x is C, "\n"; // true
-    print r == set x | x in r' && x is object?, " "; // false
-    print s == set x | x in r' && x is A?, " "; // false
-    print t == set x | x in r' && x is B?, " "; // false
-    print u == set x | x in r' && x is C?, "\n"; // false
-    print r == set x | x in r' && x is object? && x != null, " "; // true
-    print s == set x | x in r' && x is A? && x != null, " "; // true
-    print t == set x | x in r' && x is B? && x != null, " "; // true
-    print u == set x | x in r' && x is C? && x != null, "\n"; // true
-  }
-}
-
-module ObjectTests {
-  method Test() {
-    var o, p := new object, new object;
-    print o == p, " ", p == p, "\n"; // false true
-    print GenEqual(o, p), " ", GenEqual(p, p), "\n"; // false true
-    AutoInit<object?>(); // null
-    var o': object?, p': object? := o, p;
-    print GenEqual(o', p'), " ", GenEqual(p', p'), "\n"; // false true
-    o', p' := null, null;
-    print GenEqual(o', p'), " ", GenEqual(p', p'), "\n"; // true true
-  }
-
-  predicate GenEqual<X(==)>(x: X, y: X) {
-    x == y
-  }
-
-  method AutoInit<X(0)>() {
-    var x: X;
-    print x, "\n";
-  }
-}
-
-module NewtypeRangeRegression {
-  newtype MyInt = x | 2 <= x < 5 witness *
-
-  method Test() {
-    var k: MyInt :| k != 2; // this once caused an infinite loop in the target Java code
-    print k, "\n";
-  }
-}
-
-module {:options "--function-syntax:4"} EnumerationRegression {
-  method Test() {
-    // The Java compiler once converted each candidate Long number to a 32-bit int, which meant
-    // that none of them fell into the range mentioned by the set. Thus, it erroneously computed
-    // the empty set. (issue #3204)
-    var s := set l: Long | 0x20_0000_0002 <= l < 0x20_0000_0008 && l.True() && l != 0x20_0000_0006;
-    var s' := ToSeq(s, (x, y) => x < y);
-    print s', "\n";
-
-    var t := set l: AlsoLong | l.True() && l != 0x20_0000_0006;
-    var c := set l | l in s :: Digit(l as int);
-    var u := set l: AlsoLong | l.True() && l != 0x20_0000_0006 :: Digit(l as int);
-    var t' := ToSeq(t, (x, y) => x < y);
-    var c' := ToSeq(c, (x, y) => x < y);
-    var u' := ToSeq(u, (x, y) => x < y);
-    print t', "\n";
-    print c', "\n";
-    print u', "\n";
-  }
-
-  // Another previous problem with the Java compiler was that it generated names that confused
-  // the following "Long" with the built-in "java.lang.Long".
-  newtype Long = x | 0x1F_FFFF_FFF0 <= x < 0x20_0000_0100 witness 0x1F_FFFF_FFF0 {
-    predicate True() { true }
-  }
-
-  newtype AlsoLong = x | 0x20_0000_0002 <= x < 0x20_0000_0008 witness 0x20_0000_0002 {
-    predicate True() { true }
-  }
-
-  function Digit(x: int): char
-    requires 0x20_0000_0000 <= x < 0x20_0000_000a
-  {
-    'a' + (x - 0x20_0000_0000) as char
-  }
-
-  method ToSeq<X>(s: set<X>, below: (X, X) -> bool) returns (r: seq<X>) {
-    r := [];
-    var ss := s;
-    while ss != {} {
-      var x :| x in ss;
-      ss, r := ss - {x}, r + [x];
-    }
-    // sort r
-    ghost var n := |r|;
-    for i := 0 to |r|
-      invariant |r| == n
-    {
-      var y := r[i];
-      for j := i downto 0
-        invariant |r| == n
-      {
-        if below(r[j], r[j + 1]) {
-          break;
-        }
-        // swap elements j and j+1
-        r := r[j := r[j + 1]][j + 1 := r[j]];
-      }
-    }
-  }
-}
diff --git a/Test/comp/ComprehensionsNewSyntax.dfy b/Test/comp/ComprehensionsNewSyntax.dfy
deleted file mode 100644
index 6cd88aeb4f7..00000000000
--- a/Test/comp/ComprehensionsNewSyntax.dfy
+++ /dev/null
@@ -1,278 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
-
-method Main() {
-  Quantifier();
-  MapComprehension();
-  OutParamsUnderLambdas();  // white-box testing
-  SetComprehension();
-  Enumerations();
-  EnumerationsMaybeNull();
-  TestImplicitTypeTests.Test();
-}
-
-function FourMore(x: int): int { x + 4 }
-
-method Quantifier() {
-  // Note, by making *two* assignments to "s" (instead of the obvious one), the direct translation
-  // into Java makes "s" NOT be "effectively final". This means that Java does not allow "s" to be
-  // used in the lambda expression into which the quantifier translates. Compilation into Java
-  // thus needs to capture the value of "s" into another variable, which these tests check on.
-  var s := [0, 1, 1, 2];
-  s := s + [3, 5, 8, 13];
-  print forall x <- s :: x < 20, " ";  // true
-  print forall x <- s :: x < 10, "\n";  // false
-  print exists x <- s :: x == 3, " ";  // true
-  print exists x <- s :: x == 4, "\n";  // false
-}
-
-method MapComprehension() {
-  var s := [12, 13, 14];
-  var m := map x <- s :: x / 2;
-  print m, "\n";
-  m := map x <- s :: FourMore(x) := x;
-  print m, "\n";
-}
-
-method OutParamsUnderLambdas() {
-  var x, b := XP();
-  print "XP returned: ", x, " ", b, "\n";
-  var m := XM();
-  print "XM returned: ", m, "\n";
-}
-
-method XP() returns (x: int, b: bool) {
-  var s := {2, 4};
-  b := exists y <- s :: y < x;
-}
-
-
-method XM() returns (x: int) {
-  var before, after;
-
-  var f := () => x;
-  before := f();
-  x := 2;
-  after := f();
-  print "after: ", f(), " ", "before: ", f(), "\n";
-
-  f := () => x;
-  before := f();
-  x := 16;
-  after := f();
-  print "after: ", f(), " ", "before: ", f(), "\n";
-}
-
-trait NothingInParticular { }
-class ClassA { }
-class ClassB extends NothingInParticular { }
-
-method SetComprehension() {
-  SetComprehension0();
-  SetComprehension1();
-  SetComprehension2();
-  SetComprehension3();
-}
-
-method SetComprehension0() {
-  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
-  var s := {w, x, y, z};
-  // The following set comprehension picks all elements in s:
-  var all := set o: object <- s;
-  // The next set comprehension picks out 2 of the elements in s:
-  var aa := set o: ClassA <- s;
-  // The next set comprehension picks out the other 2 of the elements in s:
-  var bb := set o: ClassB <- s;
-  // The following picks out the same elements as in bb:
-  var nn := set o: NothingInParticular <- s;
-
-  print |s|, " ", |all|, " ";           // 4 4
-  print |aa|, " ", |bb|, " ";           // 2 2
-  print |aa * bb|, " ", |aa + bb|, " "; // 0 4
-  print |nn|, " ", bb == nn, "\n";      // 2 true
-}
-
-// SetComprehension1 is like SetComprehension0, but also adds "null" to "s".
-method SetComprehension1() {
-  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
-  var s := {w, x, y, z, null};
-  // The following set comprehension picks all elements in s:
-  var all := set o: object <- s;
-  // The next set comprehension picks out 2 of the elements in s:
-  var aa := set o: ClassA <- s;
-  // The next set comprehension picks out the other 2 of the elements in s:
-  var bb := set o: ClassB <- s;
-  // The following picks out the same elements as in bb:
-  var nn := set o: NothingInParticular <- s;
-
-  print |s|, " ", |all|, " ";           // 5 4
-  print |aa|, " ", |bb|, " ";           // 2 2
-  print |aa * bb|, " ", |aa + bb|, " "; // 0 4
-  print |nn|, " ", bb == nn, "\n";      // 2 true
-}
-
-// SetComprehension2 is like SetComprehension1, but uses maybe-null types in comprehensions
-method SetComprehension2() {
-  var w, x, y, z := new ClassA, new ClassA, new ClassB, new ClassB;
-  var s := {w, x, y, z, null};
-  // The following set comprehension picks all elements in s:
-  var all := set o: object? <- s;
-  // The next set comprehension picks out 2 of the elements in s:
-  var aa := set o: ClassA? <- s;
-  // The next set comprehension picks out the other 2 of the elements in s:
-  var bb := set o: ClassB? <- s;
-  // The following picks out the same elements as in bb:
-  var nn := set o: NothingInParticular? <- s;
-
-  print |s|, " ", |all|, " ";           // 5 5
-  print |aa|, " ", |bb|, " ";           // 3 3
-  print |aa * bb|, " ", |aa + bb|, " "; // 1 5
-  print |nn|, " ", bb == nn, "\n";      // 3 true
-}
-
-datatype Color = Red | Green | Blue
-
-predicate True<G>(g: G) { true }
-
-method SetComprehension3() {
-  var s: set<bool> := {false, true};
-  // The following set comprehension picks all elements in s:
-  var all := set o: bool <- s;
-  var aa := set o: bool <- s | !o;
-  var bb := set o: bool <- s | o;
-
-  print |s|, " ", |all|, " ";           // 2 2
-  print |aa|, " ", |bb|, " ";           // 1 1
-  print |aa * bb|, " ", |aa + bb|, " "; // 0 2
-  print aa == all, " ", aa <= all, "\n"; // false true
-
-  var d := set z: Color | True(z);
-  var e := set z: Color | z in d;
-  print |d|, " ", |e|, "\n"; // 3 3
-}
-
-trait ICell { var data: int }
-class CellA extends ICell { }
-class CellB extends ICell { }
-
-method Enumerations() {
-  var c, d, e := new CellA, new CellA, new CellB;
-  c.data, d.data, e.data := 4, 5, 1;
-  var s: set<ICell?> := {c, d, e, null};
-  print c.data, d.data, e.data, "\n";  // 451
-
-  // non-sequentialized forall statement
-  forall a: CellA <- s {
-    a.data := c.data + a.data - 2;
-  }
-  print c.data, d.data, e.data, "\n";  // 671
-
-  // sequentialized forall statement
-  forall a: CellA <- s {
-    a.data := 2;
-  }
-  print c.data, d.data, e.data, "\n";  // 221
-
-  // assign-such-that statement
-  d.data := 9;
-  assert d in s;
-  var u: CellA :| u in s && 7 <= u.data;
-  u.data := 8;
-  print c.data, d.data, e.data, "\n";  // 281
-
-  // set comprehension
-  var r := set a: CellA <- s | a.data < 6;
-  print |r|, "\n";  // 1
-
-  // map comprehension
-  var m := map a: CellA <- s | a.data < 6 :: 3;
-  print c in m.Keys, " ", d in m.Keys, " ", |m.Keys|, "\n";  // true false 1
-}
-
-method EnumerationsMaybeNull() {
-  var c, d, e := new CellA, new CellA, new CellB;
-  c.data, d.data, e.data := 4, 5, 1;
-  var s: set<ICell?> := {c, d, e, null};
-  print c.data, d.data, e.data, "\n";  // 451
-
-  // non-sequentialized forall statement
-  forall a: CellA? <- s {
-    (if a == null then c else a).data := c.data + (if a == null then c else a).data - 2;
-  }
-  print c.data, d.data, e.data, "\n";  // 671
-
-  // sequentialized forall statement
-  forall a: CellA? <- s {
-    (if a == null then c else a).data := 2;
-  }
-  print c.data, d.data, e.data, "\n";  // 221
-
-  // assign-such-that statement
-  d.data := 9;
-  assert d in s;
-  var u: CellA? :| u in s && u != null && 7 <= u.data;
-  u.data := 8;
-  print c.data, d.data, e.data, "\n";  // 281
-
-  // set comprehension
-  var r := set a: CellA? <- s | (a == null || a.data < 6);
-  print |r|, "\n";  // 2
-
-  // map comprehension
-  var m := map a: CellA? <- s | (a == null || a.data < 6) :: 3;
-  print null in m.Keys, " ", c in m.Keys, " ", d in m.Keys, " ", |m.Keys|, "\n";  // true true false 2
-}
-
-module TestImplicitTypeTests {
-  trait A {}
-  trait B extends A {}
-  class C extends B {}
-  class A' extends A {}
-  class B' extends B {}
-
-  method Test() {
-    var o, a, b, c := new object, new A', new B', new C;
-    var r: set<object> := {o, a, b, c};
-    var s: set<A> := set x: A <- r;
-    var t: set<B> := set x: B <- s;
-    var u: set<C> := set x: C <- s;
-    print |r|, " ", |s|, " ", |t|, " ", |u|, "\n"; // 4 3 2 1
-    print r == set x <- r | x is object, " "; // true
-    print s == set x <- r | x is A, " "; // true
-    print t == set x <- r | x is B, " "; // true
-    print u == set x <- r | x is C, "\n"; // true
-
-    var r': set<object?> := r;
-    var s': set<A?> := s;
-    var t': set<B?> := t;
-    var u': set<C?> := u;
-    print |r'|, " ", |s'|, " ", |t'|, " ", |u'|, "\n"; // 4 3 2 1
-    print r' == set x <- r | x is object, " "; // true
-    print s' == set x <- r | x is A, " "; // true
-    print t' == set x <- r | x is B, " "; // true
-    print u' == set x <- r | x is C, "\n"; // true
-
-    r', s', t', u' := r' + {null}, s' + {null}, t' + {null}, u' + {null};
-    print r' == set x <- r | x is object, " "; // false
-    print s' == set x <- r | x is A, " "; // false
-    print t' == set x <- r | x is B, " "; // false
-    print u' == set x <- r | x is C, "\n"; // false
-    print r' == set x <- r | x is object?, " "; // false
-    print s' == set x <- r | x is A?, " "; // false
-    print t' == set x <- r | x is B?, " "; // false
-    print u' == set x <- r | x is C?, "\n"; // false
-
-    print r == set x <- r' | x is object, " "; // true
-    print s == set x <- r' | x is A, " "; // true
-    print t == set x <- r' | x is B, " "; // true
-    print u == set x <- r' | x is C, "\n"; // true
-    print r == set x <- r' | x is object?, " "; // false
-    print s == set x <- r' | x is A?, " "; // false
-    print t == set x <- r' | x is B?, " "; // false
-    print u == set x <- r' | x is C?, "\n"; // false
-    print r == set x <- r' | x is object? && x != null, " "; // true
-    print s == set x <- r' | x is A? && x != null, " "; // true
-    print t == set x <- r' | x is B? && x != null, " "; // true
-    print u == set x <- r' | x is C? && x != null, "\n"; // true
-  }
-}
diff --git a/Test/comp/Conversions.java b/Test/comp/Conversions.java
deleted file mode 100644
index 84fe6fd45f3..00000000000
--- a/Test/comp/Conversions.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package Util;
-
-public class Conversions {
-    public static String ToJavaString(dafny.DafnySequence<? extends Character> s) {
-        return s.verbatimString();
-    }
-}
diff --git a/Test/comp/Extern.dfy b/Test/comp/Extern.dfy
deleted file mode 100644
index b87eef948b0..00000000000
--- a/Test/comp/Extern.dfy
+++ /dev/null
@@ -1,93 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs "%s" %S/Extern2.cs >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js "%s" %S/Extern3.js >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go "%s" %S/Extern4.go >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:java "%s" %S/SingletonOptimization.java %S/LibClass.java %S/OtherClass.java %S/AllDafny.java %S/Mixed.java %S/AllExtern.java >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:py "%s" %S/Extern5.py >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main() {
-  print "Hello\n";
-  var x, y := Library.LibClass.CallMeInt(30);
-  var z := Library.LibClass.CallMeNative(44, true);
-  var w := Library.LibClass.CallMeInAnotherClass();
-  print x, " ", y, " ", z, " ", w, "\n";
-
-  Library.AllDafny.M();
-  Library.Mixed.M();
-  print Library.Mixed.F(), "\n";
-  var m := new Library.Mixed();
-  m.IM();
-  print m.IF(), "\n";
-  Library.AllExtern.P();
-  assert Library.AllDafny.Seven() == Library.Mixed.Seven() == Library.AllExtern.Seven();
-  var maybeInt := Library.AllExtern.MaybeInt();
-  print maybeInt, "\n";
-  var intPair := Library.AllExtern.IntPair();
-  print intPair, "\n";
-
-  var singleton := Library.SingletonOptimization.SingletonTuple((ghost 10, 2));
-  assert singleton.0 == 3;
-  var noWrapper := Library.SingletonOptimization.NoWrapper(Library.ErasableWrapper(2));
-  assert noWrapper.x == 3;
-  var ghostWrapper := Library.SingletonOptimization.GhostWrapper(Library.Something(2));
-  assert ghostWrapper.x == 3;
-  print singleton.0, " ", noWrapper.x, " ", ghostWrapper.x, "\n"; // 3 3 3
-}
-
-module Wrappers {
-  datatype Option<T> = Some(value: T) | None
-  datatype Pair<A, B> = Pair(first: A, second: B)
-}
-
-module {:extern "Library"} Library {
-  import opened Wrappers
-
-  newtype MyInt = x | -100 <= x < 0x8000_0000
-  
-  class {:extern "LibClass"} LibClass {
-    static method {:extern} CallMeInt(x: int) returns (y: int, z: int)
-    static method {:extern} CallMeNative(x: MyInt, b: bool) returns (y: MyInt)
-    static method {:extern "Library.OtherClass", "CallMe"} CallMeInAnotherClass() returns (w : object)
-  }
-
-  class {:extern} AllDafny {
-    static function Seven(): int { 7 }
-    static method M() { print "AllDafny.M\n"; }
-  }
-  class {:extern} Mixed {
-    constructor() { }
-    static function Seven(): int { 7 }
-    static method M() { print "Extern static method says: "; P(); }
-    static method {:extern} P()
-    method IM() { print "Extern instance method says: "; IP(); }
-    method {:extern} IP()
-    static function F() : int { 1000 + G() }
-    static function {:extern} G() : int
-    function IF() : int { 2000 + IG() }
-    function {:extern} IG() : int
-  }
-  class {:extern} AllExtern {
-    static ghost function Seven(): int { 7 }
-    static method {:extern} P()
-    static function {:extern} MaybeInt(): Option<int>
-    static function {:extern} IntPair(): Pair<int, int>
-  }
-
-  datatype ErasableWrapper = ErasableWrapper(x: MyInt)
-
-  datatype Ghost<X> = ghost Uninitialized | Something(x: X)
-
-  class {:extern} SingletonOptimization {
-    // The in-parameter and out-parameter of these methods are optimized to just an "MyInt"
-    static method {:extern} SingletonTuple(a: (ghost MyInt, MyInt)) returns (b: (MyInt, ghost MyInt, ghost MyInt))
-      requires a.1 < 0x7fff_ffff
-      ensures b.0 == a.1 + 1
-    static method {:extern} NoWrapper(a: ErasableWrapper) returns (b: ErasableWrapper)
-      requires a.x < 0x7fff_ffff
-      ensures b.x == a.x + 1
-    static method {:extern} GhostWrapper(a: Ghost<MyInt>) returns (b: Ghost<MyInt>)
-      requires a.Something? && a.x < 0x7fff_ffff
-      ensures b.Something? && b.x == a.x + 1
-  }
-}
diff --git a/Test/comp/ExternCtors-externs/Library.go b/Test/comp/ExternCtors-externs/Library.go
deleted file mode 100644
index 93aaf858db5..00000000000
--- a/Test/comp/ExternCtors-externs/Library.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// FIXME: Test currently fails on Go
-
-package Library
-
-import (
-	"dafny"
-	"fmt"
-)
-
-type Class struct{ n dafny.Int }
-
-func New_Class_(n dafny.Int) *Class {
-	return &Class{n}
-}
-
-func (obj *Class) Get() dafny.Int {
-	return obj.n
-}
-
-// have to implement this because the Go backend can't mix Dafny and Go code :-\
-
-func (obj *Class) Print() {
-	fmt.Printf("My value is %d\n", obj.n)
-}
-
-type CompanionStruct_Class_ struct{}
-var Companion_Class_ = CompanionStruct_Class_{}
-
-func (CompanionStruct_Class_) SayHi() {
-	fmt.Println("Hello!");
-}
diff --git a/Test/comp/ExternCtors-externs/Library.py b/Test/comp/ExternCtors-externs/Library.py
deleted file mode 100644
index 3aa02f16f22..00000000000
--- a/Test/comp/ExternCtors-externs/Library.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-import module_
-import _dafny
-import System_
-
-assert "Library" == __name__
-Library = sys.modules[__name__]
-
-class Class:
-    def __init__(self, n) -> None:
-        self.n = n
-
-    @staticmethod
-    def SayHi():
-        print("Hello!")
-
-    def Get(self):
-        return self.n
-
-    def Print(self):
-        _dafny.print(_dafny.string_of(_dafny.Seq("My value is ")))
-        _dafny.print(_dafny.string_of((self).Get()))
-        _dafny.print(_dafny.string_of(_dafny.Seq("\n")))
diff --git a/Test/comp/ExternCtors.dfy b/Test/comp/ExternCtors.dfy
deleted file mode 100644
index 19977ece6da..00000000000
--- a/Test/comp/ExternCtors.dfy
+++ /dev/null
@@ -1,24 +0,0 @@
-// RUN: %dafny /compile:3 /compileTarget:cs "%s" %S/ExternCtors-externs/Library.cs > "%t"
-// RUN: %dafny /compile:3 /compileTarget:java "%s" %S/ExternCtors-externs/Class.java >> "%t"
-// RUN: %dafny /compile:3 /compileTarget:py "%s" %S/ExternCtors-externs/Library.py >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// FIXME: Extern constructors are currently broken in Go and JavaScript,
-// so they are omitted
-
-method Main() {
-  Library.Class.SayHi();
-  var obj := new Library.Class(42);
-  obj.Print();
-}
-
-module {:extern "Library"} Library {
-  class {:extern} Class {
-    constructor {:extern} (n: int)
-    static method {:extern} SayHi()
-    function {:extern} Get() : int
-    method Print() {
-      print "My value is ", Get(), "\n";
-    }
-  }
-}
diff --git a/Test/comp/ExternDafnyString.dfy b/Test/comp/ExternDafnyString.dfy
deleted file mode 100644
index bcb67e80ea1..00000000000
--- a/Test/comp/ExternDafnyString.dfy
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: %dafny /compile:3 /unicodeChar:0 /compileTarget:java "%s" %S/Conversions.java %S/ExternDafnyString.java > "%t"
-// RUN: %diff "%s.expect" "%t"
-// In this example, the extern method obtains a Java string and returns it as a Dafny string.
-
-class {:extern "java.lang.String"} JavaString {
-  ghost const value: string
-}
-
-method {:extern "dafny.ExternDafnyString", "getStringFromFile"} GetStringFromFile() returns (s: string)
-
-method Main() {
-  var s := GetStringFromFile();
-
-  var previousStart := 0;
-  for i := 0 to |s|
-    invariant previousStart <= i
-  {
-    if s[i] == '/' {
-      print s[previousStart..i], "\n";
-      previousStart := i + 1;
-    }
-  }
-  if previousStart != |s| {
-    print s[previousStart..], "\n";
-  }
-}
diff --git a/Test/comp/ExternDafnyString.java b/Test/comp/ExternDafnyString.java
deleted file mode 100644
index 8539d7d2f01..00000000000
--- a/Test/comp/ExternDafnyString.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package dafny;
-
-public class ExternDafnyString {
-    public static dafny.DafnySequence<? extends Character> getStringFromFile() {
-        // Let's pretend the following is read from a file:
-        String js = "this is some possible / text that / may have come from a file";
-        // Convert this Java string to a Dafny string before returning:
-        return dafny.DafnySequence.asString(js);
-    }
-}
diff --git a/Test/comp/ExternJavaString.dfy b/Test/comp/ExternJavaString.dfy
deleted file mode 100644
index 42b9fbe50c2..00000000000
--- a/Test/comp/ExternJavaString.dfy
+++ /dev/null
@@ -1,37 +0,0 @@
-// RUN: %dafny /compile:3 /unicodeChar:0 /compileTarget:java "%s" %S/Conversions.java %S/ExternJavaString.java > "%t"
-// RUN: %diff "%s.expect" "%t"
-// In this example, the extern method obtains a Java string and returns it as such.
-// The Dafny code converts that Java string to a Dafny string.
-
-class {:extern "java.lang.String"} JavaString {
-  ghost const value: string
-}
-
-// Note, the following has to be a method, not a function, because the reference it
-// returns is not determined functionally from the input argument.
-method {:extern "Util.Conversions", "ToJavaString"} ToJavaString(s: string) returns (js: JavaString)
-  ensures js.value == s
-
-// The conversion this way can be a function.
-function {:extern "dafny.DafnySequence", "asString"} ToDafnyString(js: JavaString): string
-  ensures ToDafnyString(js) == js.value
-
-method {:extern "dafny.ExternJavaString", "getStringFromFile"} GetStringFromFile() returns (js: JavaString)
-
-method Main() {
-  var js := GetStringFromFile();
-  var s := ToDafnyString(js);
-
-  var previousStart := 0;
-  for i := 0 to |s|
-    invariant previousStart <= i
-  {
-    if s[i] == '/' {
-      print s[previousStart..i], "\n";
-      previousStart := i + 1;
-    }
-  }
-  if previousStart != |s| {
-    print s[previousStart..], "\n";
-  }
-}
diff --git a/Test/comp/ExternNestedModule.dfy b/Test/comp/ExternNestedModule.dfy
deleted file mode 100644
index fb6e834bdce..00000000000
--- a/Test/comp/ExternNestedModule.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:4 /spillTargetCode:2 /compileTarget:py %S/ExternNestedModule.py "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main(){
-    print Library.THREE, "\n";
-}
-
-module {:extern "Nested.Library"} Library {
-    const THREE := TWO + 1
-    const TWO: int
-}
diff --git a/Test/comp/Hello.dfy b/Test/comp/Hello.dfy
deleted file mode 100644
index 5726d5b4fd0..00000000000
--- a/Test/comp/Hello.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-method Main() {
-    print "Hello, World! Best, Dafny\n";
-    var x := 14;
-    print "x is ", x, "\n";
-    var y := false;
-    print "y is ", y, "\n";
-}
diff --git a/Test/comp/JsModule.dfy b/Test/comp/JsModule.dfy
deleted file mode 100644
index e9f40640f44..00000000000
--- a/Test/comp/JsModule.dfy
+++ /dev/null
@@ -1,25 +0,0 @@
-// NONUNIFORM: Javascript-specific extern test
-// RUN: %dafny /compile:3 /unicodeChar:0 "%s" /compileTarget:js > "%t"
-// note: putting /compileTarget:js after "%s" overrides user-provided option
-// RUN: %diff "%s.expect" "%t"
-
-// "url" is a built-in package in node, so it should be accessible to the
-// test suite without further requirements on the setup.
-module {:extern "url", "url"} URL {
-  class Url {
-    var host: string
-    var pathname: string
-    var search: string
-  }
-  method {:extern "parse"} Parse(address: string, b: bool) returns (u: Url)
-}
-
-method Main() {
-  var address := "http://localhost:8080/default.htm?year=1915&month=august&day=29";
-  var u := URL.Parse(address, true);
-  print "The address ", address, "\n";
-  print "has the following parts:\n";
-  print "host: ", u.host, "\n";
-  print "pathname: ", u.pathname, "\n";
-  print "search: ", u.search, "\n";
-}
diff --git a/Test/comp/MainMethod.dfy b/Test/comp/MainMethod.dfy
deleted file mode 100644
index 0f55cbf7757..00000000000
--- a/Test/comp/MainMethod.dfy
+++ /dev/null
@@ -1,84 +0,0 @@
-// NONUNIFORM: multiple testing scenarios (could be split into several uniform tests)
-// RUN: %dafny /compile:0 "%s" > "%t"
-
-// RUN: %dafny /noVerify /compile:4 /Main:Cl.Static   /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Cl.Instance /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Tr.Static   /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Dt.Static   /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Dt.Instance /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Co.Static   /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Co.Instance /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Nt.Static   /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Nt.Instance /compileTarget:cs "%s" >> "%t"
-
-// RUN: %dafny /noVerify /compile:4 /Main:Cl.Static   /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Cl.Instance /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Tr.Static   /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Dt.Static   /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Dt.Instance /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Co.Static   /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Co.Instance /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Nt.Static   /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Nt.Instance /compileTarget:js "%s" >> "%t"
-
-// RUN: %dafny /noVerify /compile:4 /Main:Cl.Static   /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Cl.Instance /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Tr.Static   /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Dt.Static   /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Dt.Instance /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Co.Static   /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Co.Instance /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Nt.Static   /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Nt.Instance /compileTarget:go "%s" >> "%t"
-
-// RUN: %dafny /noVerify /compile:4 /Main:Cl.Static   /compileTarget:java "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Cl.Instance /compileTarget:java "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Tr.Static   /compileTarget:java "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Dt.Static   /compileTarget:java "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Dt.Instance /compileTarget:java "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Co.Static   /compileTarget:java "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Co.Instance /compileTarget:java "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Nt.Static   /compileTarget:java "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Nt.Instance /compileTarget:java "%s" >> "%t"
-
-// RUN: %dafny /noVerify /compile:4 /Main:Cl.Static   /compileTarget:py "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Cl.Instance /compileTarget:py "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Tr.Static   /compileTarget:py "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Dt.Static   /compileTarget:py "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Dt.Instance /compileTarget:py "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Co.Static   /compileTarget:py "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Co.Instance /compileTarget:py "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Nt.Static   /compileTarget:py "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:Nt.Instance /compileTarget:py "%s" >> "%t"
-
-// RUN: %diff "%s.expect" "%t"
-
-type plural = x | 2 <= x witness 2
-
-class Cl<X(0)> {
-  var p: plural
-  var c: real
-  var x: X
-  static method Static() { print "Cl: static\n"; }
-  method Instance() { print "Cl: ", p, " ", c, " ", x, "\n"; }
-}
-
-trait Tr<X> {
-  static method Static() { print "Tr: static\n"; }
-}
-
-datatype Dt<X> = Dt0(plural, X) | Dt1(real, X) {
-  static method Static() { print "Dt: static\n"; }
-  method Instance() { print "Dt: ", this, "\n"; }
-}
-
-codatatype Co<X> = CoMore(plural, X, Co) {
-  static method Static() { print "Co: static\n"; }
-  method Instance() { print "Co: ", this, "\n"; }
-}
-
-newtype Nt = x | -0x8000_0000 <= x <= 0x8000_0000 {
-  const c: plural
-  static method Static() { print "Nt: static\n"; }
-  method Instance() { print "Nt: ", this, " ", c, "\n"; }
-}
diff --git a/Test/comp/NativeNumbers.dfy b/Test/comp/NativeNumbers.dfy
deleted file mode 100644
index e1fadb1c406..00000000000
--- a/Test/comp/NativeNumbers.dfy
+++ /dev/null
@@ -1,382 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:false
-// Skip JavaScript because JavaScript doesn't have the same native types
-
-
-method Main() {
-  CastTests();
-  DefaultTests();
-  Int8Test();
-  Int16Test();
-  BvTests();
-  ZeroComparisonTests();
-}
-
-newtype {:nativeType "sbyte"} int8 = x | -0x80 <= x < 0x80
-newtype {:nativeType "short"} int16 = x | -0x8000 <= x < 0x8000
-newtype {:nativeType "int"} int32 = x : int | -0x8000_0000 <= x < 0x8000_0000
-newtype {:nativeType "long"} int64 = x : int | -0x8000_0000 <= x < 0x8000_0000_0000_0000
-
-newtype {:nativeType "byte"} uint8 = x : int | 0 <= x < 0x100
-newtype {:nativeType "ushort"} uint16 = x : int | 0 <= x < 0x10000
-newtype {:nativeType "uint"} uint32 = x : int | 0 <= x < 0x1_0000_0000
-newtype {:nativeType "ulong"} uint64 = x : int | 0 <= x < 0x1_0000_0000_0000_0000
-
-method CastTests() {
-  print "Casting:\n\n";
-
-  print "Small numbers:\n";
-  var i : int := 0;
-  print i as int, " ",
-    i as int8, " ", i as int16, " ", i as int32, " ", i as int64, " ",
-    i as uint8, " ", i as uint16, " ", i as uint32, " ", i as uint64, "\n";
-
-  var i8 : int8 := 1;
-  print i8 as int, " ",
-    i8 as int8, " ", i8 as int16, " ", i8 as int32, " ", i8 as int64, " ",
-    i8 as uint8, " ", i8 as uint16, " ", i8 as uint32, " ", i8 as uint64, "\n";
-
-  var i16 : int16 := 2;
-  print i16 as int, " ",
-    i16 as int8, " ", i16 as int16, " ", i16 as int32, " ", i16 as int64, " ",
-    i16 as uint8, " ", i16 as uint16, " ", i16 as uint32, " ", i16 as uint64, "\n";
-
-  var i32 : int32 := 3;
-  print i32 as int, " ",
-    i32 as int8, " ", i32 as int16, " ", i32 as int32, " ", i32 as int64, " ",
-    i32 as uint8, " ", i32 as uint16, " ", i32 as uint32, " ", i32 as uint64, "\n";
-
-  var i64 : int64 := 4;
-  print i64 as int, " ",
-    i64 as int8, " ", i64 as int16, " ", i64 as int32, " ", i64 as int64, " ",
-    i64 as uint8, " ", i64 as uint16, " ", i64 as uint32, " ", i64 as uint64, "\n";
-
-  var u8 : uint8 := 5;
-  print u8 as int, " ",
-    u8 as int8, " ", u8 as int16, " ", u8 as int32, " ", u8 as int64, " ",
-    u8 as uint8, " ", u8 as uint16, " ", u8 as uint32, " ", u8 as uint64, "\n";
-
-  var u16 : uint16 := 6;
-  print u16 as int, " ",
-    u16 as int8, " ", u16 as int16, " ", u16 as int32, " ", u16 as int64, " ",
-    u16 as uint8, " ", u16 as uint16, " ", u16 as uint32, " ", u16 as uint64, "\n";
-
-  var u32 : uint32 := 7;
-  print u32 as int, " ",
-    u32 as int8, " ", u32 as int16, " ", u32 as int32, " ", u32 as int64, " ",
-    u32 as uint8, " ", u32 as uint16, " ", u32 as uint32, " ", u32 as uint64, "\n";
-
-  var u64 : uint64 := 8;
-  print u64 as int, " ",
-    u64 as int8, " ", u64 as int16, " ", u64 as int32, " ", u64 as int64, " ",
-    u64 as uint8, " ", u64 as uint16, " ", u64 as uint32, " ", u64 as uint64, "\n";
-
-  print "\nLarge unsigned numbers:\n";
-  u8 := 0xff;
-  print u8 as int, " ",
-    u8 as int16, " ", u8 as int32, " ", u8 as int64, " ",
-    u8 as uint8, " ", u8 as uint16, " ", u8 as uint32, " ", u8 as uint64, "\n";
-
-  u16 := 0xffff;
-  print u16 as int, " ",
-    u16 as int32, " ", u16 as int64, " ",
-    u16 as uint16, " ", u16 as uint32, " ", u16 as uint64, "\n";
-
-  u32 := 0xffff_ffff;
-  print u32 as int, " ",
-    u32 as int64, " ",
-    u32 as uint32, " ", u32 as uint64, "\n";
-
-  u64 := 0xffff_ffff_ffff_ffff as uint64; // test explicit conversion of literal
-  print u64 as int, " ",
-    u64 as uint64, "\n";
-
-  print "\nInt to large unsigned:\n";
-  i := 0xff;
-  print i as uint8, " ";
-
-  i := 0xffff;
-  print i as uint16, " ";
-
-  i := 0xffff_ffff;
-  print i as uint32, " ";
-
-  i := 0xffff_ffff_ffff_ffff;
-  print i as uint64, "\n";
-
-  print "\nCast from cardinality operator:\n";
-  var s : set<int> := {};
-  print |s| as int, " ",
-    |s| as int8, " ", |s| as int16, " ", |s| as int32, " ", |s| as int64, " ",
-    |s| as uint8, " ", |s| as uint16, " ", |s| as uint32, " ", |s| as uint64, "\n";
-
-  var m : multiset<int> := multiset{1};
-  print |m| as int, " ",
-    |m| as int8, " ", |m| as int16, " ", |m| as int32, " ", |m| as int64, " ",
-    |m| as uint8, " ", |m| as uint16, " ", |m| as uint32, " ", |m| as uint64, "\n";
-
-  var q : seq<int> := [1,2];
-  print |q| as int, " ",
-    |q| as int8, " ", |q| as int16, " ", |q| as int32, " ", |q| as int64, " ",
-    |q| as uint8, " ", |q| as uint16, " ", |q| as uint32, " ", |q| as uint64, "\n";
-
-  var p : map<int, string> := map[1 := "one", 2 := "two", 3 := "three"];
-  print |p| as int, " ",
-    |p| as int8, " ", |p| as int16, " ", |p| as int32, " ", |p| as int64, " ",
-    |p| as uint8, " ", |p| as uint16, " ", |p| as uint32, " ", |p| as uint64, "\n";
-
-  var a : array<int> := new int[4];
-  print a.Length as int, " ",
-    a.Length as int8, " ", a.Length as int16, " ", a.Length as int32, " ", a.Length as int64, " ",
-    a.Length as uint8, " ", a.Length as uint16, " ", a.Length as uint32, " ", a.Length as uint64, "\n";
-
-  print "\nCharacters:\n";
-  var c : char := 'C';
-  print c, " ", c as int, " ",
-    c as int8, " ", c as int16, " ", c as int32, " ", c as int64, " ",
-    c as uint8, " ", c as uint16, " ", c as uint32, " ", c as uint64, "\n";
-
-  i := 0; c := i as char; i := c as int;
-  i8 := 0x7f; c := i8 as char; i8 := c as int8;
-  u8 := 0xff; c := u8 as char; u8 := c as uint8;
-  i16 := 0x7fff; c := i16 as char; i16 := c as int16;
-  u16 := 0xffff; c := u16 as char; u16 := c as uint16;
-  i32 := 0xffff; c := i32 as char; i32 := c as int32;
-  u32 := 0xffff; c := u32 as char; u32 := c as uint32;
-  i64 := 0xffff; c := i64 as char; i64 := c as int64;
-  u64 := 0xffff; c := u64 as char; u64 := c as uint64;
-  print i, " ", i8, " ", i16, " ", i32, " ", i64, " ",
-    u8, " ", u16, " ", u32, " ", u64, "\n";
-
-  print "\n";
-}
-
-method Gimmie<T(0)>() returns (ans : T) { }
-
-method DefaultTests() {
-  print "Defaults:\n\n";
-
-  var i : int := Gimmie();
-  var i8 : int8 := Gimmie();
-  var i16 : int16 := Gimmie();
-  var i32 : int32 := Gimmie();
-  var i64 : int64 := Gimmie();
-  var u8 : uint8 := Gimmie();
-  var u16 : uint16 := Gimmie();
-  var u32 : uint32 := Gimmie();
-  var u64 : uint64 := Gimmie();
-
-  print i, " ", i8, " ", i16, " ", i32, " ", i64, " ",
-    u8, " ", u16, " ", u32, " ", u64, "\n";
-
-  print "\n";
-}
-
-// test handling of byte/short arithmetic in Java
-method Int8Test() {
-  print "Byte arithmetic:\n\n";
-
-  var a, b := 20, 30;
-  var r0 := MInt8(a, b);
-  var r1 := MInt8(b, a);
-  var r2 := MInt8(-2, b);
-  print a, " ", b, "\n";
-  print r0, " ", r1, " ", r2, "\n";
-
-  print "\n";
-}
-
-method MInt8(m: int8, n: int8) returns (r: int8) {
-  if m < 0 || n < 0 {
-    r := 18;
-  } else if m < n {
-    r := n - m;
-  } else {
-    r := m - n;
-  }
-}
-
-method Int16Test() {
-  print "Short arithmetic:\n\n";
-  var a, b := 20, 30;
-  var r0 := MInt16(a, b);
-  var r1 := MInt16(b, a);
-  var r2 := MInt16(-2, b);
-  print a, " ", b, "\n";
-  print r0, " ", r1, " ", r2, "\n";
-
-  print "\n";
-}
-
-method MInt16(m: int16, n: int16) returns (r: int16) {
-  if m < 0 || n < 0 {
-    r := 18;
-  } else if m < n {
-    r := n - m;
-  } else {
-    r := m - n;
-  }
-}
-
-method BvTests() {
-  // These will also be bytes/shorts in Java
-  print "Bitvectors:\n\n";
-
-  var a: bv8 := 250;
-  a := a / 2; // check that we're using unsigned division
-  a := a * 2;
-  a := a + 6;
-  assert a == 0;
-
-  var b: bv7 := 126;
-  b := b + 5;
-  assert b == 3;
-
-  var c: bv16 := 0xfffa;
-  c := c / 2; // check that we're using unsigned division
-  c := c * 2;
-  c := c + 10;
-  assert c == 4;
-
-  var d: bv15 := 0x7ffb;
-  d := d + 6;
-  assert d == 1;
-
-  print a, " ", b, " ", c, " ", d, "\n";
-
-  print "\n";
-}
-
-// Test zero comparisons in Java
-method ZeroComparisonTests() {
-  print "Comparison to zero:\n\n";
-
-  print "int8:\n";
-  ZCInt8Tests(-42);
-  ZCInt8Tests(0);
-  ZCInt8Tests(23);
-
-  print "int16:\n";
-  ZCInt16Tests(-42);
-  ZCInt16Tests(0);
-  ZCInt16Tests(23);
-
-  print "int32:\n";
-  ZCInt32Tests(-42);
-  ZCInt32Tests(0);
-  ZCInt32Tests(23);
-
-  print "int64:\n";
-  ZCInt64Tests(-42);
-  ZCInt64Tests(0);
-  ZCInt64Tests(23);
-
-  print "uint8:\n";
-  ZCUint8Tests(0);
-  ZCUint8Tests(23);
-
-  print "uint16:\n";
-  ZCUint16Tests(0);
-  ZCUint16Tests(23);
-
-  print "uint32:\n";
-  ZCUint32Tests(0);
-  ZCUint32Tests(23);
-
-  print "uint64:\n";
-  ZCUint64Tests(0);
-  ZCUint64Tests(23);
-
-  print "\n";
-}
-
-function YN(b : bool) : string {
-  if b then "Y" else "N"
-}
-
-method ZCInt8Tests(n : int8) {
-  print n, "\t",
-    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
-    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
-    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
-    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
-    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
-    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
-    "\n";
-}
-
-method ZCInt16Tests(n : int16) {
-  print n, "\t",
-    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
-    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
-    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
-    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
-    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
-    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
-    "\n";
-}
-
-method ZCInt32Tests(n : int32) {
-  print n, "\t",
-    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
-    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
-    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
-    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
-    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
-    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
-    "\n";
-}
-
-method ZCInt64Tests(n : int64) {
-  print n, "\t",
-    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
-    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
-    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
-    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
-    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
-    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
-    "\n";
-}
-
-method ZCUint8Tests(n : uint8) {
-  print n, "\t",
-    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
-    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
-    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
-    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
-    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
-    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
-    "\n";
-}
-
-method ZCUint16Tests(n : uint16) {
-  print n, "\t",
-    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
-    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
-    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
-    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
-    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
-    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
-    "\n";
-}
-
-method ZCUint32Tests(n : uint32) {
-  print n, "\t",
-    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
-    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
-    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
-    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
-    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
-    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
-    "\n";
-}
-
-method ZCUint64Tests(n : uint64) {
-  print n, "\t",
-    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
-    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
-    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
-    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
-    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
-    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
-    "\n";
-}
diff --git a/Test/comp/Numbers.dfy b/Test/comp/Numbers.dfy
deleted file mode 100644
index 72d81137120..00000000000
--- a/Test/comp/Numbers.dfy
+++ /dev/null
@@ -1,661 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4174
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --unicode-char:false
-
-method Main() {
-  Literals();
-  Arithmetic();
-  PrintReals();
-  SimpleReality();
-  BitVectorTests();
-  MoreBvTests();
-  NativeTypeTest();
-  NewTypeTest();
-  OrdinalTests();
-  ZeroComparisonTests();
-  TestConversions();
-  ComparisonRegressions();
-  CastRegressions();
-  EuclideanDivisionRegressions.Test();
-}
-
-method Print(description: string, x: int) {
-  print x;
-  if |description| != 0 {  // string length (that is, sequence length)
-    print " (aka ", description, ")";
-  }
-  print "\n";
-}
-
-method PrintReal(description: string, x: real) {
-  print x;
-  if description != "" {  // string comparison
-    print " (aka ", description, ")";
-  }
-  print "\n";
-}
-
-method PrintSeq(s: seq) {
-  var sep, i := "", 0;
-  while i < |s| {
-    print sep, s[i];
-    sep := " ";
-    i := i + 1;
-  }
-  print "\n";
-}
-
-method Literals() {
-  Print("", 0);
-  Print("", -0);
-  Print("", 3);
-  Print("", -5);
-
-  Print("C# int.MaxValue", 0x7FFF_ffff);  // int.MaxValue
-  Print("2^31", 0x8000_0000);  // int.MaxValue + 1
-  Print("", 0x8000_0001);  // int.MaxValue + 2
-  Print("C# uint.MaxValue", 0xFFFF_FFFF);  // uint.MaxValue
-  Print("2^32", 0x1_0000_0000);  // uint.MaxValue + 1
-
-  Print("JavaScript Number.MAX_SAFE_INTEGER", 0x1F_FFFF_FFFF_FFFF);  // 2^53 -  1
-  Print("2^53", 0x20_0000_0000_0000);  // 2^53
-  Print("JavaScript Number.MIN_SAFE_INTEGER", - 0x1F_FFFF_FFFF_FFFF);  // - (2^53 -  1)
-  Print("", - 0x20_0000_0000_0000);  // - 2^53
-
-  Print("C# long.MaxValue", 0x7FFF_ffff_FFFF_ffff);  // long.MaxValue
-  Print("2^63", 0x8000_0000_0000_0000);  // long.MaxValue + 1
-  Print("", 0x8000_0000_0000_0001);  // long.MaxValue + 2
-  Print("C# ulong.MaxValue", 0xFFFF_FFFF_FFFF_FFFF);  // ulong.MaxValue
-  Print("2^64", 0x1_0000_0000_0000_0000);  // ulong.MaxValue + 1
-
-  Print("2^100", 0x10_0000_0000_0000_0000_0000_0000);  // 2^100
-  Print("M_39", 170_141_183_460_469_231_731_687_303_715_884_105_727);
-
-  PrintReal("", 0.0);
-  PrintReal("", -0.0);
-  PrintReal("", 3.0);
-  PrintReal("", -5.0);
-  PrintReal("", 3.14);
-  PrintReal("", -2.71);
-  PrintReal("a billion", 1_000_000_000.0);
-  PrintReal("G", 0.000_000_000_066_740_8);
-  PrintReal("G", 6.67408 / 100_000_000_000.0);
-  PrintReal("G", 6.67408 * 0.000_000_000_01);
-  PrintReal("1/10 of M_39", 17_014_118_346_046_923_173_168_730_371_588_410_572.7);  // test a large mantissa
-  PrintReal("1/googol", 0.000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_000_1);
-}
-
-method Arithmetic() {
-  PrintSeq([31 + 4, 31 - 4, 4 - 31]);  // also tests sequence displays
-
-  PrintSeq([31 * 4, 31 * -4]);
-  PrintSeq([-31 * 4, -31 * -4]);
-
-  PrintSeq(['3' + '4', '7' - '4' + 'N', '4' - '3' + '1']);
-
-  DivMod(31, 4);
-  DivMod(-31, 4);
-  DivMod(31, -4);
-  DivMod(-31, -4);
-  DivMod(0, 4);
-  DivMod(0, -4);
-  DivModNative();
-
-  PrintSeq([0.3 - 0.1]);  // should be 0.2, not something like 0.19999999999999998
-  PrintSeq([31.2 + 4.0, 31.2 - 4.0, 4.0 - 31.2]);
-
-  PrintSeq([31.2 * 4.0, 31.2 * -4.0]);
-  PrintSeq([-31.2 * 4.0, -31.2 * -4.0]);
-
-  DivModReal(31.2, 4.0);
-  DivModReal(-31.2, 4.0);
-  DivModReal(31.2, -4.0);
-  DivModReal(-31.2, -4.0);
-}
-
-method DivMod(dividend: int, divisor: int)
-  requires divisor != 0
-{
-  // Dafny uses Euclidean division/modulo, so the remainder is always non-negative
-  var quotient := dividend / divisor;
-  var remainder := dividend % divisor;
-  assert 0 <= remainder;
-  assert quotient * divisor + remainder == dividend;
-  print quotient, " ", remainder, " ", quotient * divisor + remainder, "\n";
-}
-
-newtype uint8 = x | 0 <= x < 0x100
-newtype uint16 = x | 0 <= x < 0x1_0000
-newtype uint32 = x | 0 <= x < 0x1_0000_0000
-newtype uint64 = x | 0 <= x < 0x1_0000_0000_0000_0000
-newtype int8 = x | -0x80 <= x < 0x80
-newtype int16 = x | -0x8000 <= x < 0x8000
-newtype int32 = x | -0x8000_0000 <= x < 0x8000_0000
-newtype int64 = x | -0x8000_0000_0000_0000 <= x < 0x8000_0000_0000_0000
-
-method DivModNative() {
-  // For non-negative operands, Euclidean division and moduus coincide with those of the
-  // target languages. Here, we're testing that no bad conversion happens between large
-  // unsigned integers and the same-bitpattern negative signed integer.
-  print "uint8:  ";
-  TestDivModUint8(0xE7, 23, " ");                                        // (10, 1)
-  TestDivModUint8(0xE7, 0xFF, "\n");                                     // (0, 231)
-  print "uint16: ";
-  TestDivModUint16(0xFFE7, 23, " ");                                     // (2848, 7)
-  TestDivModUint16(0xFFE7, 0xFFFF, "\n");                                // (0, 65511)
-  print "uint32: ";
-  TestDivModUint32(0xFFFF_FFE7, 23, " ");                                // (186_737_707, 10)
-  TestDivModUint32(0xFFFF_FFE7, 0xFFFF_FFFF, "\n");                      // (0, 4_294_967_271)
-  print "uint64: ";
-  TestDivModUint64(0xFFFF_FFFF_FFFF_FFE7, 23, " ");                      // (802_032_351_030_850_069, 4)
-  TestDivModUint64(0xFFFF_FFFF_FFFF_FFE7, 0xFFFF_FFFF_FFFF_FFFF, "\n");  // (0, 18_446_744_073_709_551_591)
-
-  // Compute via defining definitions
-  var i, j := 103, 13;
-  print "via real: ";
-  EuclideanDefinitions(i, j, " ");       // 7:12
-  EuclideanDefinitions(-i, j, " ");      // -8:1
-  EuclideanDefinitions(i, -j, " ");      // -7:12
-  EuclideanDefinitions(-i, -j, "\n");    // 8:1
-
-  // Check with SMT
-  assert i / j == 7       && i % j == 12;       // (7, 12)
-  assert (-i) / j == -8   && (-i) % j == 1;     // (-8, 1)
-  assert i / (-j) == -7   && i % (-j) == 12;    // (-7, 12)
-  assert (-103) / (-j) == 8 && (-i) % (-j) == 1;  // (8, 1)
-  // NOTE: In the previous line, if "-103" is replaced by the equivalent "-i", then Z3 version 4.8.4
-  // complains. In fact, Z3 4.8.4 is then happy to prove "(-i) / (-j) == 7", which is bogus. However,
-  // it seems that this error has been corrected in Z3 4.8.7 (or earlier). Therefore, by just
-  // writing "-103" here, we have a workaround for this test file. Once Dafny switches to a version
-  // of Z3 that is 4.8.7 or newer, then it would be good to switch "-103" back to "-i" here to make
-  // sure that particular Z3 bug has been fixed.
-
-  print "int:      ";
-  TestDivModInt(i, j, " ");                    // (7, 12)
-  TestDivModInt(-i, j, " ");                   // (-8, 1)
-  TestDivModInt(i, -j, " ");                   // (-7, 12)
-  TestDivModInt(-i, -j, " ");                  // (8, 1)
-  TestDivModInt(-108, 9, " ");                 // (-12, 0)
-  TestDivModInt(-108, -9, "\n");               // (12, 0)
-
-  // Test for native integers
-  var i8: int8, j8: int8 := 103, 13;
-  var i16: int16, j16: int16 := 103, 13;
-  var i32: int32, j32: int32 := 103, 13;
-  var i64: int64, j64: int64 := 103, 13;
-  print "int8:     ";
-  TestDivModInt8(i8, j8, " ");                       // (7, 12)
-  TestDivModInt8(-i8, j8, " ");                      // (-8, 1)
-  TestDivModInt8(i8, -j8, " ");                      // (-7, 12)
-  TestDivModInt8(-i8, -j8, " ");                     // (8, 1)
-  TestDivModInt8(-108, 9, " ");                      // (-12, 0)
-  TestDivModInt8(-108, -9, "\n");                    // (12, 0)
-  print "int16:    ";
-  TestDivModInt16(i16, j16, " ");                    // (7, 12)
-  TestDivModInt16(-i16, j16, " ");                   // (-8, 1)
-  TestDivModInt16(i16, -j16, " ");                   // (-7, 12)
-  TestDivModInt16(-i16, -j16, " ");                  // (8, 1)
-  TestDivModInt16(-108, 9, " ");                     // (-12, 0)
-  TestDivModInt16(-108, -9, "\n");                   // (12, 0)
-  print "int32:    ";
-  TestDivModInt32(i32, j32, " ");                    // (7, 12)
-  TestDivModInt32(-i32, j32, " ");                   // (-8, 1)
-  TestDivModInt32(i32, -j32, " ");                   // (-7, 12)
-  TestDivModInt32(-i32, -j32, " ");                  // (8, 1)
-  TestDivModInt32(-108, 9, " ");                     // (-12, 0)
-  TestDivModInt32(-108, -9, "\n");                   // (12, 0)
-  print "int64:    ";
-  TestDivModInt64(i64, j64, " ");                    // (7, 12)
-  TestDivModInt64(-i64, j64, " ");                   // (-8, 1)
-  TestDivModInt64(i64, -j64, " ");                   // (-7, 12)
-  TestDivModInt64(-i64, -j64, " ");                  // (8, 1)
-  TestDivModInt64(-108, 9, " ");                     // (-12, 0)
-  TestDivModInt64(-108, -9, "\n");                   // (12, 0)
-}
-function Sign(n: int): int {
-  if n < 0 then -1 else if n == 0 then 0 else 1
-}
-function Abs(n: int): nat {
-  if n < 0 then -n else n
-}
-method EuclideanDefinitions(i: int, j: int, suffix: string)
-  requires j != 0
-{
-  // For integers i and j, Euclidean division (i/j) and modulus (i%j) are defined as follows:
-  //   i/j    =    Sign(j) * Floor(i // Abs(j))   where "//" denotes real division
-  //   i%j    =    i - |j| * Floor(i // Abs(j))   where "//" denotes real division
-  var div := Sign(j) * (i as real / Abs(j) as real).Floor;
-  var mod := i - Abs(j) * (i as real / Abs(j) as real).Floor;
-  print div, ":", mod, suffix;
-}
-method TestDivModInt(a: int, b: int, suffix: string) requires b != 0 {
-  print a / b, ":", a % b, suffix;
-}
-method TestDivModUint8(a: uint8, b: uint8, suffix: string) requires b != 0 {
-  print a / b, ":", a % b, suffix;
-}
-method TestDivModUint16(a: uint16, b: uint16, suffix: string) requires b != 0 {
-  print a / b, ":", a % b, suffix;
-}
-method TestDivModUint32(a: uint32, b: uint32, suffix: string) requires b != 0 {
-  print a / b, ":", a % b, suffix;
-}
-method TestDivModUint64(a: uint64, b: uint64, suffix: string) requires b != 0 {
-  print a / b, ":", a % b, suffix;
-}
-method TestDivModInt8(a: int8, b: int8, suffix: string) requires b != 0 && -127 <= a {
-  print a / b, ":", a % b, suffix;
-}
-method TestDivModInt16(a: int16, b: int16, suffix: string) requires b != 0 && -0x7FFF <= a {
-  print a / b, ":", a % b, suffix;
-}
-method TestDivModInt32(a: int32, b: int32, suffix: string) requires b != 0 && -0x7FFF_FFFF <= a {
-  print a / b, ":", a % b, suffix;
-}
-method TestDivModInt64(a: int64, b: int64, suffix: string) requires b != 0 && -0x7FFF_FFFF_FFFF_FFFF <= a {
-  print a / b, ":", a % b, suffix;
-}
-
-method DivModReal(dividend: real, divisor: real)
-  requires divisor != 0.0
-{
-  var quotient := dividend / divisor;
-  assert quotient * divisor == dividend;
-  print quotient, " ", quotient * divisor, "\n";
-}
-
-method PrintReals() {
-  // 0
-  P(0.0);
-  P(0.2 + 0.4 - 0.6);
-  var r: real;
-  P(r);
-  print "\n";
-
-  // integer
-  P(120.0);
-  P(000120.0);
-  P(20.0 / 3.0 + 4.0 / 3.0);  // 8.0
-  P(-(20.0 / 3.0 + 4.0 / 3.0));  // -8.0
-  print "\n";
-
-  // decimal digits
-  P(123.4567);
-  P(-123.4567);
-  P(0.1234);
-  P(-0.1234);
-  P(2.0 / 3.0 + 0.4 / 3.0);  // 0.8
-  print "\n";
-  P(0.2);
-  P(0.02);
-  P(0.0_0002);
-  print "\n";
-  P(-0.2);
-  P(-0.02);
-  P(-0.0_0002);
-  print "\n";
-
-  // general
-  P(20.0 / 3.0);
-  P(-20.0 / 3.0);
-  P(20.0 / -3.0);
-  P(-20.0 / -3.0);
-  print "\n";
-}
-
-method P(r: real) {
-  print r, " ";
-}
-
-method SimpleReality() {
-  var r: real;
-  var z := r - r;
-  var s := 0.81;
-  var t := 2.0 * s + z - s;
-  var u := s / t;  // 1.0
-  print r, " ", z, " ", s, " ", t, " ", u, "\n";
-  print s == t, " ", z == u, "\n";
-}
-
-method BitVectorTests() {
-  var a: bv0 := 0;
-  var b: bv1 := 0;
-  var c: bv2 := 2;
-  var d: bv7 := 2;
-  var e: bv8 := 2;
-  var f: bv15 := 2;
-  var g: bv16 := 2;
-  var h: bv53 := 2;
-  var i: bv100 := 2;
-  print a, " ", c, " ", h, " ", i, "\n";
-  a, c, h, i := a + a, c + 1, 3 * h, i * 23;
-  print a, " ", c, " ", h, " ", i, "\n";
-  a, c, h, i := a * a, c * c, h * h, i * i;
-  print a, " ", c, " ", h, " ", i, "\n";
-  a, c, h, i := a - a, c - c, h - h, i - i;
-  print a, " ", c, " ", h, " ", i, "\n";
-
-  NativeBv32();
-  NativeBv53();
-}
-
-method NativeBv32() {
-  var x: bv32 := 0;
-  var y: bv32 := 15;
-  x := x + y + y - x + 1;  // 2*y + 1
-  y := x / y;  // 2
-  x := x - y;  // 29
-  var z: bv32 := 17;
-  z := z % 3;  // 2
-  var w0: bv32 := -13;  // wrap backwards
-  var w1 := w0 + 15;  // wrap forwards
-  print x, " ", y, " ", z, " ", w0, " ", w1, "\n";
-}
-
-method NativeBv53() {
-  var x: bv53 := 0;
-  var y: bv53 := 15;
-  x := x + y + y - x + 1;  // 2*y + 1
-  y := x / y;  // 2
-  x := x - y;  // 29
-  var z: bv53 := 17;
-  z := z % 3;  // 2
-  var w0: bv53 := -13;  // wrap backwards
-  var w1 := w0 + 15;  // wrap forwards
-  print x, " ", y, " ", z, " ", w0, " ", w1, "\n";
-}
-
-type MyBv = x: bv4 | 2 <= x < 10 witness 7
-
-method MoreBvTests() {
-  var u: bv0;
-  var w: bv32;
-  var B: bv100;
-  var m: MyBv;
-  u := 0;
-  w := 0;
-  B := 0;
-  m := 9;
-  u := u + u & u;
-  print u, " ", w, " ", B, " ", m, "\n";
-  u, w, B, m := u | 0, w | 0, B | 0, m | 0;
-  print u, " ", w, " ", B, " ", m, "\n";
-  u, w, B, m := u ^ 0, w ^ 0, B ^ 0, m ^ 0;
-  print u, " ", w, " ", B, " ", m, "\n";
-  u, w, B, m := !u, !w, !B, !m;
-  print u, " ", w, " ", B, " ", m, "\n";
-
-  B := 32;
-  B := B << 2;  // 128
-  B := B >> 4;  // 8
-  m := 2;
-  m := m << 2;  // 8
-  m := m >> 1;  // 4
-  print B, " ", m, "\n";
-
-  B := 32 | 4;
-  B := B.RotateLeft(99);  // 16 | 2
-  var B' := B;
-  B := B.RotateRight(98);  // 64 | 8
-  m := 2;
-  m := m.RotateLeft(2);  // 8
-  m := m.RotateRight(1);  // 4
-  print B', " ", B, " ", m, "\n";  // 18 72 4
-
-  u := u.RotateLeft(0).RotateRight(0);
-  print u, "\n";  // as 0 as ever
-}
-
-newtype {:nativeType "number", "long"} NativeType = x | -100 <= x < 0x10_0000_0000
-
-method NativeTypeTest() {
-  var a, b := 200, 300;
-  var r0 := M(a, b);
-  var r1 := M(b, a);
-  var r2 := M(-2, b);
-  print a, " ", b, "\n";
-  print r0, " ", r1, " ", r2, "\n";
-}
-
-method M(m: NativeType, n: NativeType) returns (r: NativeType) {
-  if m < 0 || n < 0 {
-    r := 18;
-  } else if m < n {
-    r := n - m;
-  } else {
-    r := m - n;
-  }
-}
-
-newtype NewType = x: int | true
-
-method NewTypeTest() {
-  print var n: NewType := (-4) / (-2); n, "\n";
-  print var n: NewType := ( 4) / (-2); n, "\n";
-  print var n: NewType := (-4) / ( 2); n, "\n";
-  print var n: NewType := ( 4) / ( 2); n, "\n";
-}
-
-method OrdinalTests() {
-  PrintOrdinalInfo(0);
-  PrintOrdinalInfo(1);
-  PrintOrdinalInfo(42);
-}
-
-method PrintOrdinalInfo(o : ORDINAL) {
-  print o;
-  print ": IsNat: ", o.IsNat;
-  print ", Offset: ", o.Offset;
-  print ", IsLimit: ", o.IsLimit;
-  print ", IsSucc: ", o.IsSucc, "\n";
-}
-
-method ZeroComparisonTests() {
-  print "int:\n";
-  ZCIntTests(-42);
-  ZCIntTests(0);
-  ZCIntTests(-0);
-  ZCIntTests(23);
-
-  print "NativeType:\n";
-  ZCNativeTypeTests(-42);
-  ZCNativeTypeTests(0);
-  ZCNativeTypeTests(-0);
-  ZCNativeTypeTests(23);
-}
-
-function YN(b : bool) : string {
-  if b then "Y" else "N"
-}
-
-method ZCIntTests(n : int) {
-  print n, "\t",
-    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
-    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
-    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
-    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
-    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
-    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
-    "\n";
-}
-
-method ZCNativeTypeTests(n : NativeType) {
-  print n, "\t",
-    " <0 ",  YN(n < 0),  " <=0 ", YN(n <= 0),
-    " ==0 ", YN(n == 0), " !=0 ", YN(n != 0),
-    " >0 ",  YN(n > 0),  " >=0 ", YN(n >= 0),
-    " 0< ",  YN(0 < n),  " 0<= ", YN(0 <= n),
-    " 0== ", YN(0 == n), " 0!= ", YN(0 != n),
-    " 0> ",  YN(0 > n),  " 0>= ", YN(0 >= n),
-    "\n";
-}
-
-method TestConversions() {
-  ConvertFromInt(120);
-  ConvertFromReal(120.0);
-  ConvertFromORDINAL(120);
-  ConvertFromBv(120);
-  ConvertFromUInt32(120);
-  ConvertFromChar('x');
-}
-
-method ConvertFromInt(x: int)
-  requires 0 <= x < 128
-{
-  print x as int, " ", x as real, " ", x as ORDINAL, " ", x as bv7, " ", x as uint32, " ", x as char, "\n";
-}
-
-method ConvertFromReal(x: real)
-  requires x.Floor as real == x
-  requires 0 <= x.Floor < 128
-{
-  print x as int, " ", x as real, " ", x as ORDINAL, " ", x as bv7, " ", x as uint32, " ", x as char, "\n";
-}
-
-method ConvertFromORDINAL(x: ORDINAL)
-  requires 0 <= x < 128
-{
-  // ORDINAL doesn't (currently) support many type conversions
-  print x as int, /** " ", x as real, " ", x as ORDINAL, " ", x as bv7,**/ " ", x as uint32, /** " ", x as char,**/ "\n";
-}
-
-method ConvertFromBv(x: bv7)
-{
-  print x as int, " ", x as real, " ", x as ORDINAL, " ", x as bv7, " ", x as uint32, " ", x as char, "\n";
-}
-
-method ConvertFromUInt32(x: uint32)
-  requires 0 <= x < 128
-{
-  print x as int, " ", x as real, " ", x as ORDINAL, " ", x as bv7, " ", x as uint32, " ", x as char, "\n";
-}
-
-method ConvertFromChar(x: char)
-  requires 0 as char <= x < 128 as char
-{
-  // char doesn't (currently) support many type conversions
-  print x as int, /** " ", x as real, " ", x as ORDINAL, " ", x as bv7,**/ " ", x as uint32, /** " ", x as char,**/ "\n";
-}
-
-newtype MyInt = int
-
-method ComparisonRegressions() {
-  {
-    var xx := 2_000_000_000_000_000_000_000;
-    var yy := 3;
-    print xx < yy, " ", yy < xx, " ", xx <= yy, " ", yy <= xx, "\n"; // false true false true
-    print xx > yy, " ", yy > xx, " ", xx >= yy, " ", yy >= xx, "\n"; // true false true false
-  }
-  {
-    var xx: MyInt := 2_000_000_000_000_000_000_000;
-    var yy: MyInt := 3;
-    // The following was once compiled incorrectly for JavaScript
-    print xx < yy, " ", yy < xx, " ", xx <= yy, " ", yy <= xx, "\n"; // false true false true
-    print xx > yy, " ", yy > xx, " ", xx >= yy, " ", yy >= xx, "\n"; // true false true false
-  }
-}
-
-method CastRegressions() {
-  var i: int := 20;
-  var bt: uint8 := (i + 3) as uint8;
-  var bu := (3 + i) as uint8;
-  var b: bool;
-  var bv: uint8 := if b then 89 else 88;
-  var u: uint32 := if b then 890 else 880;
-  print i, " ", bt, " ", bu, " ", bv, " ", u, "\n";
-}
-
-module EuclideanDivisionRegressions {
-  newtype MyReal = real
-  newtype MyRealWithConstraint = r: real | 0.0 <= r
-  newtype MyInt = int
-  newtype MyIntWithConstraint = i: int | -200 <= i
-
-  newtype byte = x: int | 0 <= x < 256
-  newtype sbyte = x: int | -128 <= x < 128
-
-  newtype uint32 = x: int | 0 <= x < 0x1_0000_0000
-  newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
-
-  method Test() {
-    TestDiv();
-    TestWraparound();
-    TestMod();
-  }
-
-  method TestDiv() {
-    // Make sure Euclidean division is used, but not for reals or bitvectors
-
-    var r0: real := 621.0 / 10.0;
-    var r1: MyReal := 622.0 / 10.0;
-    var r2: MyRealWithConstraint := 623.0 / 10.0;
-    print r0, " ", r1, " ", r2, "\n"; // 62.1 62.2 62.3
-
-    var i0: int := 7 / -2;
-    var i1: MyInt := 7 / -2;
-    var i2: MyIntWithConstraint := 7 / -2;
-    print i0, " ", i1, " ", i2, "\n"; // -3 -3 -3
-
-    var b0: byte := 248 / 3;
-    var b1: byte := 100 / 253;
-    var b2: sbyte := -8 / 3;
-    var b3: sbyte := 100 / -3;
-    print b0, " ", b1, " ", b2, " ", b3, "\n"; // 82 0 -3 -33
-
-    // bitvectors give rise to unsigned arithmetic
-    var v0: bv8 := 248 / 3;
-    var v1: bv8 := 100 / 253;
-    var v2: bv8 := -8 / 3;
-    var v3: bv8 := 100 / -3;
-    print v0, " ", v1, " ", v2, " ", v3, "\n"; // 82 0 82 0
-
-    var j0: uint32 := 0x7fff_fff9 / 3;
-    var j1: uint32 := 100 / 0x7fff_fffd;
-    var j2: int32 := -7 / 3;
-    var j3: int32 := 100 / -3;
-    print j0, " ", j1, " ", j2, " ", j3, "\n"; // 715827880 0 -3 -33
-
-    // bitvectors give rise to unsigned arithmetic
-    var w0: bv32 := 0xffff_fff8 / 3;
-    var w1: bv32 := 100 / 0xffff_fffd;
-    var w2: bv32 := -8 / 3;
-    var w3: bv32 := 100 / -3;
-    print w0, " ", w1, " ", w2, " ", w3, "\n"; // 1431655762 0 1431655762 0
-
-    // these bitvectors use BigInteger
-    var h0: bv68 := 0xf_ffff_ffff_ffff_fff8 / 3;
-    var h1: bv68 := 100 / 0xf_ffff_ffff_ffff_fffd;
-    var h2: bv68 := -8 / 3;
-    var h3: bv68 := 100 / -3;
-    print h0, " ", h1, " ", h2, " ", h3, "\n"; // 98382635059784275282 0 98382635059784275282 0
-  }
-
-  method TestWraparound() {
-    var s0: bv3 := 6 + 3;
-    var s1: bv3 := -1;
-    var s2: bv3 := 4 + 5 - 2;
-    var s3: bv7 := 126 + 3;
-    var s4: bv7 := -1;
-    var s5: bv7 := 64 + 65 - 2;
-    print s0, " ", s1, " ", s2, " ", s3, " ", s4, " ", s5, "\n"; // 1 7 7 1 127 127
-  }
-
-  method TestMod() {
-    var m0: int := 100 % -3;
-    var m1: int := -100 % 3;
-    var m2: int := -100 % -2;
-    var m3: int := 100 % 3;
-    print m0, " ", m1, " ", m2, " ", m3, "\n"; // 1 2 0 1
-
-    var n0: MyIntWithConstraint := 100 % -3;
-    var n1: MyIntWithConstraint := -100 % 3;
-    var n2: MyIntWithConstraint := -100 % -2;
-    var n3: MyIntWithConstraint := 100 % 3;
-    print n0, " ", n1, " ", n2, " ", n3, "\n"; // 1 2 0 1
-
-    var p0: int32 := 100 % -3;
-    var p1: int32 := -100 % 3;
-    var p2: int32 := -100 % -2;
-    var p3: int32 := 100 % 3;
-    print p0, " ", p1, " ", p2, " ", p3, "\n"; // 1 2 0 1
-  }
-}
diff --git a/Test/comp/Numbers.dfy.expect b/Test/comp/Numbers.dfy.expect
deleted file mode 100644
index 91dcf38c310..00000000000
--- a/Test/comp/Numbers.dfy.expect
+++ /dev/null
@@ -1,122 +0,0 @@
-0
-0
-3
--5
-2147483647 (aka C# int.MaxValue)
-2147483648 (aka 2^31)
-2147483649
-4294967295 (aka C# uint.MaxValue)
-4294967296 (aka 2^32)
-9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
-9007199254740992 (aka 2^53)
--9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
--9007199254740992
-9223372036854775807 (aka C# long.MaxValue)
-9223372036854775808 (aka 2^63)
-9223372036854775809
-18446744073709551615 (aka C# ulong.MaxValue)
-18446744073709551616 (aka 2^64)
-1267650600228229401496703205376 (aka 2^100)
-170141183460469231731687303715884105727 (aka M_39)
-0.0
-0.0
-3.0
--5.0
-3.14
--2.71
-1000000000.0 (aka a billion)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
-0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
-35 27 -27
-124 -124
--124 124
-g Q 2
-7 3 31
--8 1 -31
--7 3 31
-8 1 -31
-0 0 0
-0 0 0
-uint8:  10:1 0:231
-uint16: 2848:7 0:65511
-uint32: 186737707:10 0:4294967271
-uint64: 802032351030850069:4 0:18446744073709551591
-via real: 7:12 -8:1 -7:12 8:1
-int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
-int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
-int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-0.2
-35.2 27.2 -27.2
-124.8 -124.8
--124.8 124.8
-7.800 31.200
--7.800 -31.200
--7.800 31.200
-7.800 -31.200
-0.0 0.0 0.0 
-120.0 120.0 (24.0 / 3.0) (-24.0 / 3.0) 
-123.4567 -123.4567 0.1234 -0.1234 (24.0 / 30.0) 
-0.2 0.02 0.00002 
--0.2 -0.02 -0.00002 
-(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
-0.0 0.0 0.81 0.81 (8100.0 / 8100.0)
-true false
-0 2 2 2
-0 3 6 46
-0 1 36 2116
-0 0 0 0
-29 2 2 4294967283 2
-29 2 2 9007199254740979 2
-0 0 0 9
-0 0 0 9
-0 0 0 9
-0 4294967295 1267650600228229401496703205375 6
-8 4
-18 72 4
-0
-200 300
-100 100 18
-2
--2
--2
-2
-0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
-1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
-42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
-int:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-NativeType:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-120 120.0 120 120 120 x
-120 120.0 120 120 120 x
-120 120
-120 120.0 120 120 120 x
-120 120.0 120 120 120 x
-120 120
-false true false true
-true false true false
-false true false true
-true false true false
-20 23 23 88 880
-62.1 62.2 62.3
--3 -3 -3
-82 0 -3 -33
-82 0 82 0
-715827880 0 -3 -33
-1431655762 0 1431655762 0
-98382635059784275282 0 98382635059784275282 0
-1 7 7 1 127 127
-1 2 0 1
-1 2 0 1
-1 2 0 1
diff --git a/Test/comp/Numbers.dfy.go.expect b/Test/comp/Numbers.dfy.go.expect
deleted file mode 100644
index 4b3ef8ce259..00000000000
--- a/Test/comp/Numbers.dfy.go.expect
+++ /dev/null
@@ -1,122 +0,0 @@
-0
-0
-3
--5
-2147483647 (aka C# int.MaxValue)
-2147483648 (aka 2^31)
-2147483649
-4294967295 (aka C# uint.MaxValue)
-4294967296 (aka 2^32)
-9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
-9007199254740992 (aka 2^53)
--9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
--9007199254740992
-9223372036854775807 (aka C# long.MaxValue)
-9223372036854775808 (aka 2^63)
-9223372036854775809
-18446744073709551615 (aka C# ulong.MaxValue)
-18446744073709551616 (aka 2^64)
-1267650600228229401496703205376 (aka 2^100)
-170141183460469231731687303715884105727 (aka M_39)
-0.0
-0.0
-3.0
--5.0
-3.14
--2.71
-1000000000.0 (aka a billion)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
-0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
-35 27 -27
-124 -124
--124 124
-g Q 2
-7 3 31
--8 1 -31
--7 3 31
-8 1 -31
-0 0 0
-0 0 0
-uint8:  10:1 0:231
-uint16: 2848:7 0:65511
-uint32: 186737707:10 0:4294967271
-uint64: 802032351030850069:4 0:18446744073709551591
-via real: 7:12 -8:1 -7:12 8:1
-int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
-int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
-int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-0.2
-35.2 27.2 -27.2
-124.8 -124.8
--124.8 124.8
-7.8 31.2
--7.8 -31.2
--7.8 31.2
-7.8 -31.2
-0.0 0.0 0.0 
-120.0 120.0 8.0 -8.0 
-123.4567 -123.4567 0.1234 -0.1234 0.8 
-0.2 0.02 0.00002 
--0.2 -0.02 -0.00002 
-(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
-0.0 0.0 0.81 0.81 1.0
-true false
-0 2 2 2
-0 3 6 46
-0 1 36 2116
-0 0 0 0
-29 2 2 4294967283 2
-29 2 2 9007199254740979 2
-0 0 0 9
-0 0 0 9
-0 0 0 9
-0 4294967295 1267650600228229401496703205375 6
-8 4
-18 72 4
-0
-200 300
-100 100 18
-2
--2
--2
-2
-0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
-1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
-42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
-int:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-NativeType:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-120 120.0 120 120 120 x
-120 120.0 120 120 120 x
-120 120
-120 120.0 120 120 120 x
-120 120.0 120 120 120 x
-120 120
-false true false true
-true false true false
-false true false true
-true false true false
-20 23 23 88 880
-62.1 62.2 62.3
--3 -3 -3
-82 0 -3 -33
-82 0 82 0
-715827880 0 -3 -33
-1431655762 0 1431655762 0
-98382635059784275282 0 98382635059784275282 0
-1 7 7 1 127 127
-1 2 0 1
-1 2 0 1
-1 2 0 1
diff --git a/Test/comp/Numbers.dfy.py.expect b/Test/comp/Numbers.dfy.py.expect
deleted file mode 100644
index 4b3ef8ce259..00000000000
--- a/Test/comp/Numbers.dfy.py.expect
+++ /dev/null
@@ -1,122 +0,0 @@
-0
-0
-3
--5
-2147483647 (aka C# int.MaxValue)
-2147483648 (aka 2^31)
-2147483649
-4294967295 (aka C# uint.MaxValue)
-4294967296 (aka 2^32)
-9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
-9007199254740992 (aka 2^53)
--9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
--9007199254740992
-9223372036854775807 (aka C# long.MaxValue)
-9223372036854775808 (aka 2^63)
-9223372036854775809
-18446744073709551615 (aka C# ulong.MaxValue)
-18446744073709551616 (aka 2^64)
-1267650600228229401496703205376 (aka 2^100)
-170141183460469231731687303715884105727 (aka M_39)
-0.0
-0.0
-3.0
--5.0
-3.14
--2.71
-1000000000.0 (aka a billion)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
-0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
-35 27 -27
-124 -124
--124 124
-g Q 2
-7 3 31
--8 1 -31
--7 3 31
-8 1 -31
-0 0 0
-0 0 0
-uint8:  10:1 0:231
-uint16: 2848:7 0:65511
-uint32: 186737707:10 0:4294967271
-uint64: 802032351030850069:4 0:18446744073709551591
-via real: 7:12 -8:1 -7:12 8:1
-int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
-int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
-int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-0.2
-35.2 27.2 -27.2
-124.8 -124.8
--124.8 124.8
-7.8 31.2
--7.8 -31.2
--7.8 31.2
-7.8 -31.2
-0.0 0.0 0.0 
-120.0 120.0 8.0 -8.0 
-123.4567 -123.4567 0.1234 -0.1234 0.8 
-0.2 0.02 0.00002 
--0.2 -0.02 -0.00002 
-(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
-0.0 0.0 0.81 0.81 1.0
-true false
-0 2 2 2
-0 3 6 46
-0 1 36 2116
-0 0 0 0
-29 2 2 4294967283 2
-29 2 2 9007199254740979 2
-0 0 0 9
-0 0 0 9
-0 0 0 9
-0 4294967295 1267650600228229401496703205375 6
-8 4
-18 72 4
-0
-200 300
-100 100 18
-2
--2
--2
-2
-0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
-1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
-42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
-int:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-NativeType:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-120 120.0 120 120 120 x
-120 120.0 120 120 120 x
-120 120
-120 120.0 120 120 120 x
-120 120.0 120 120 120 x
-120 120
-false true false true
-true false true false
-false true false true
-true false true false
-20 23 23 88 880
-62.1 62.2 62.3
--3 -3 -3
-82 0 -3 -33
-82 0 82 0
-715827880 0 -3 -33
-1431655762 0 1431655762 0
-98382635059784275282 0 98382635059784275282 0
-1 7 7 1 127 127
-1 2 0 1
-1 2 0 1
-1 2 0 1
diff --git a/Test/comp/Print.dfy b/Test/comp/Print.dfy
deleted file mode 100644
index 3cc0c4decd7..00000000000
--- a/Test/comp/Print.dfy
+++ /dev/null
@@ -1,26 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108 and https://github.com/dafny-lang/dafny/issues/2582
-// RUN: %dafny /compile:0 /unicodeChar:0 "%s" > "%t"
-// RUN: %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:java "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Python salts hashes so they are not deterministic.
-
-method Main() {
-  PrintString();
-}
-
-method PrintString() {
-  print "Strings in collections:\n";
-  print "  ", ["abc", "def"], "\n";
-  print "  ", [["abc", "def"]], "\n";
-  print "  ", {"abc", "def"}, "\n";
-  print "  ", [['a', 'b', 'c'], ['d', 'e', 'f']], "\n";
-  var a : seq<seq<char>> := [[]];
-  print "  ", a, "\n";
-  var b : seq<char>;
-  print "  ", [b], "\n";
-  print "  ", [seq(5, x => 'a')], "\n";
-}
diff --git a/Test/comp/SequenceConcatOptimization.dfy b/Test/comp/SequenceConcatOptimization.dfy
deleted file mode 100644
index f3034af606e..00000000000
--- a/Test/comp/SequenceConcatOptimization.dfy
+++ /dev/null
@@ -1,20 +0,0 @@
-// RUN: %baredafny verify %args "%s" > "%t"
-// RUN: %baredafny test --no-verify --target=cs %args   "%s" >> "%t"
-// RUN: %baredafny test --no-verify --target=java %args "%s" >> "%t"
-// RUN: %baredafny test --no-verify --target=go %args   "%s" >> "%t"
-
-module SequenceConcatOptimization {
-
-  // A basic performance sanity check for the sequence concatenation
-  // that is now implemented for C#, Java, and Go (with the latter
-  // using a common implementation in Dafny).
-  // In these languages this test completes in a second or so,
-  // but the others take much longer than I was willing to wait.
-  method {:test} SirConcatsALot() {
-    var s: seq<int> := [];
-    for i := 0 to 1_000_000 {
-      s := s + [i];
-    }
-    expect |s| == 1_000_000;
-  }
-}
diff --git a/Test/comp/TupleMaximumSize.dfy b/Test/comp/TupleMaximumSize.dfy
deleted file mode 100644
index 108da550c97..00000000000
--- a/Test/comp/TupleMaximumSize.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-method Main() {
-  var a := (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
-  print a, "\n";
-}
\ No newline at end of file
diff --git a/Test/comp/UnicodeStrings.dfy b/Test/comp/UnicodeStrings.dfy
deleted file mode 100644
index 4dfe7160484..00000000000
--- a/Test/comp/UnicodeStrings.dfy
+++ /dev/null
@@ -1,260 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --unicode-char
-
-method AssertAndExpect(p: bool) 
-  requires p
-{
-  expect p;
-}
-
-// Included to test casting between char and all supported native types
-newtype uint8 = x: int | 0 <= x < 0x100 
-newtype uint16 = x: int | 0 <= x < 0x1_0000 
-newtype uint32 = x: int | 0 <= x < 0x1_0000_0000 
-newtype uint64 = x: int | 0 <= x < 0x1_0000_0000_0000_0000 
-newtype int8 = x: int | -0x80 <= x < 0x80
-newtype int16 = x: int | -0x8000 <= x < 0x8000
-newtype int32 = x: int | -0x8000_0000 <= x < 0x8000_0000
-newtype int64 = x: int | -0x8000_0000_0000_0000 <= x < 8000_0000_0000_0000
-
-const AllCasesAsCodePoints := [
-  0,        // \0, minimum value
-  0x9,      // \t
-  0xA,      // \n
-  0xD,      // \r
-  0x22,     // \"
-  0x27,     // \'
-  0x44,     // \\
-  0x5c,     // D (because Dafny)
-  0x80,     // First non-ASCII codepoint (and hence first with two bytes in UTF-8)
-  0xFF,     // Last codepoint that could fit into a single byte
-  0x100,    // First codepoint that can't fit into a single byte
-  0xD7FF,   // Last codepoint before the surrogate range
-  0xE000,   // First codepoint after the surrogate range
-  0xFFEE,   // '￮', which is after the surrogate range but a single code unit in UTF-16
-  0x1_0000, // First codepoint beyong the BMP, requiring two UTF-16 code units
-  0x1_D11E, // '𝄞', [0xD834, 0xDD1E] in UTF-16
-            // Included along with ￮ as an evil test case to catch comparing
-            // encoded bytes lexicographically by accident 😈.
-            // UTF-8 seems to have the property that this comparison
-            // is the same, but UTF-16 doesn't.
-  0x1_F680, // Typical non-BMP codepoint (🚀)
-  0x10_FFFF // Maximum value
-]
-
-
-// The primary definition of the character values is casting to characters from integers.
-// This is the simplest and most likely to be correct at runtime, and used as the baseline for comparisons.
-const AllCases := 
-  seq(|AllCasesAsCodePoints|, i requires 0 <= i < |AllCasesAsCodePoints| => AllCasesAsCodePoints[i] as char)
-
-const AlternateForms: seq<seq<char>> := [
-  // As character literals with escapes
-  ['\0', '\t', '\n', '\r', '\"', '\'', '\U{44}', '\\', '\U{80}', '\U{FF}',
-      '\U{100}', '\U{D7FF}', '\U{E000}', '\U{FFEE}', '\U{10000}', '\U{1D11E}', '\U{1F680}', '\U{10FFFF}'],
-  // As verbatim character literals where reasonable, or using a \U escape where not
-  ['\U{0}', '\U{9}', '\U{A}', '\U{D}', '\U{22}', '\U{27}', 'D', '\U{5c}', 
-      '€', 'ÿ', 'Ā', '\U{D7FF}', '\U{E000}', '￮', '𐀀', '𝄞', '🚀', '\U{10FFFF}'],
-  // In a string literal with escapes
-  "\0\t\n\r\"\'\U{44}\\\U{80}\U{FF}\U{100}\U{D7FF}\U{E000}\U{FFEE}\U{10000}\U{1D11E}\U{1F680}\U{10FFFF}",
-  // In a string literal without escapes where reasonable
-  "\U{0}\U{9}\U{A}\U{D}\U{22}\U{27}D\U{5c}€ÿĀ\U{D7FF}\U{E000}￮𐀀𝄞🚀\U{10FFFF}"
-]
-
-method AllCharCasesTest() {
-  // Boy a foreach loop would be really nice right about now... \U{1F604}
-  for caseIndex := 0 to |AllCases| {
-    var thisCase := AllCases[caseIndex];
-    for formIndex := 0 to |AlternateForms| {
-      expect thisCase == AlternateForms[formIndex][caseIndex];
-      expect !(thisCase != AlternateForms[formIndex][caseIndex]);
-      
-      expect AlternateForms[formIndex][caseIndex] == thisCase;
-      expect !(AlternateForms[formIndex][caseIndex] != thisCase);
-
-      CastChar(thisCase);
-    }
-  }
-
-  // Comparisons - taking advantage of the list of cases being in ascending order
-  for i := 0 to |AllCases| {
-    var left := AllCases[i];
-    for j := 0 to |AllCases| {
-      var right := AllCases[j];
-      if i < j {
-        expect left < right;
-        expect left <= right;
-        expect !(left == right);
-        expect left != right;
-        expect !(left > right);
-        expect !(left >= right);
-      } else if i == j {
-        expect !(left < right);
-        expect left <= right;
-        expect left == right;
-        expect !(left != right);
-        expect !(left > right);
-        expect left >= right;
-      } else {
-        expect !(left < right);
-        expect !(left <= right);
-        expect !(left == right);
-        expect left != right;
-        expect left > right;
-        expect left >= right;
-      }
-    }
-  }
-}
-
-// WARNING: Do not do this in real code!
-// It's a great example of what NOT to do when working with Unicode,
-// since the concept of upper/lower case is culture-specific.
-function ToLower(ch: char): char {
-  if 'A' <= ch <= 'Z' then
-    ch - 'A' + 'a'
-  else
-    ch
-}
-
-function MapToLower(s: string): string {
-  if 0 == |s| then
-    []
-  else
-    [ToLower(s[0])] + MapToLower(s[1..])
-}
-
-function MapToInt32(s: string): seq<int32> {
-  if 0 == |s| then
-    []
-  else
-    [s[0] as int32] + MapToInt32(s[1..])
-}
-
-method Main(args: seq<string>) {
-  AllCharCasesTest();
-  CharQuantification();
-  StringPrinting();
-  CharPrinting();
-}
-
-// Not including any non-printable characters in this one
-const stringThatNeedsEscaping := "D\0\r\n\\\"\'\U{1F60E}"
-
-method CharPrinting() {
-  var chars := stringThatNeedsEscaping;
-  for i := 0 to |chars| {
-    print chars[i], "\n";
-  }
-  for i := 0 to |chars| {
-    var r := Print(chars[i]);
-    expect chars[i] == r;
-  }
-}
-
-// Used to ensure characters can be passing in and out of generic code
-// (which is a real challenge in Java for example)
-method Print<T>(t: T) returns (r: T) {
-  print t, "\n";
-  return t;
-}
-
-datatype Option<T> = Some(value: T) | None
-
-datatype StringOption = SomeString(value: string) | NoString
-
-method StringPrinting() {
-  var trickyString := "Dafny is just so \U{1F60E}";
-  print trickyString, "\n";
-
-  var trickyString2 := "Dafny is just so " + [0x1F60E as char];
-  print trickyString2, "\n";
-
-  // Testing that runtimes don't confuse a seq<uint32> for a string
-  // (which would be a problem if we used Int32 in C# instead of Rune, for example)
-  var s := "Ceci n'est pas une string";
-  var notAString := MapToInt32(s);
-  print notAString, "\n";
-
-  // Ensuring character arithmetic can be compiled
-  var sarcastic := "Oh UNicOdE, tHaT's a REaL usEFuL FEaTuRe!";
-  var sincere := MapToLower(sarcastic);
-  print sincere, "\n";
-
-  // Exercising the new rules for how strings are printed,
-  // namely that a string is only printed verbatim if the value
-  // is statically known to be a seq<char>
-
-  var mightBeString := Some(trickyString);
-  print mightBeString, "\n";
-  print mightBeString.value, "\n";
-
-  // Note that the string is printed as a string, but with double quotes and escaping
-  var definitelyString := SomeString(stringThatNeedsEscaping);
-  print definitelyString, "\n";
-
-  var tupleOfString := (stringThatNeedsEscaping, 42);
-  print tupleOfString, "\n";
-}
-
-method CastChar(c: char) {
-  if (c as int < 0x80) {
-    var asInt8 := c as int8;
-    AssertAndExpect(asInt8 as char == c);
-  }
-  if (c as int < 0x100) {
-    var asUint8 := c as uint8;
-    AssertAndExpect(asUint8 as char == c);
-  }
-  if (c as int < 0x8000) {
-    var asInt16 := c as int16;
-    AssertAndExpect(asInt16 as char == c);
-  }
-  if (c as int < 0x1_0000) {
-    var asUint16 := c as uint16;
-    AssertAndExpect(asUint16 as char == c);
-  }
-  var asInt32 := c as int32;
-  AssertAndExpect(asInt32 as char == c);
-  var asInt64 := c as int64;
-  AssertAndExpect(asInt64 as char == c);
-  var asInt := c as int;
-  AssertAndExpect(asInt as char == c);
-  var asReal := c as real;
-  AssertAndExpect(asReal as char == c);
-}
-
-// Testing that the runtime implementation of AllChars() is correct
-method CharQuantification() {
-  ghost var allChars := set c: char {:trigger Identity(c)} | true :: Identity(c);
-  ghost var allCodePoints := (set cp: int {:trigger Identity(cp)} | 0 <= cp < 0xD800 :: Identity(cp as char))
-                     + (set cp: int {:trigger Identity(cp)} | 0xE000 <= cp < 0x11_0000 :: Identity(cp as char));
-  assert forall c: char {:trigger Identity(c)} :: 0 <= Identity(c as int) < 0xD800 || 0xE000 <= Identity(c as int) < 0x11_0000;
-  assert forall c: char :: Identity(c) in allChars;
-  assert allChars == allCodePoints;
-
-  // I'd love to expect allChars == allCodePoints, but that's currently
-  // an O(n^2) operation in some runtimes that don't have hashcode-based
-  // set operations, and n here is over a million. :P
-  // Even just computing allChars at runtime seems to be too slow in Javascript. :(
-  // It seems to be fast enough just to iterate over all characters though.
-  expect forall c: char {:trigger Identity(c)} :: 0 <= c as int < 0xD800 || 0xE000 <= c as int < 0x11_0000;
-}
-
-// Dummy identity function just to enable triggers that Dafny and Boogie are happy with
-function Identity<T>(x: T): T { x }
-
-method CharsAndArrows() {
-  var lambda := (c: char) requires c <= 'Z' => c + 1 as char;
-  var fromLambda := lambda('C');
-  print fromLambda, "\n";
-
-  var funcRef := IncrementChar;
-  var fromFuncRef := funcRef('C');
-  print fromFuncRef, "\n";
-}
-
-function IncrementChar(c: char): char 
-  requires c <= 'Z'
-{
-  c + 1 as char
-}
diff --git a/Test/comp/Variance.dfy b/Test/comp/Variance.dfy
deleted file mode 100644
index ddcde6cd7d7..00000000000
--- a/Test/comp/Variance.dfy
+++ /dev/null
@@ -1,187 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --warn-deprecation:false
-
-datatype Co<+T> = Co(z: T) {
-    const x: int;
-    const y: seq<T>
-
-    function A(x: T): int { 0 }
-    static function sA(x: T): int { 0 }
-    function gA(ghost x: T): int { 0 }
-    function B(x: seq<T>): int { 0 }
-    function C(x: int): seq<T> { y }
-    function D(x: T): T { x }
-
-    method mA(x: T) returns (r: int) { r := 0; }
-    method mD(x: T) returns (r: T) { r := x; }
-}
-
-datatype Non<T> = Non(T) {
-    const x: int;
-    const y: seq<T>
-
-    function A(x: T): int { 0 }
-    static function sA(x: T): int { 0 }
-    function gA(ghost x: T): int { 0 }
-    function B(x: seq<T>): int { 0 }
-    function C(x: int): seq<T> { y }
-    function D(x: T): T { x }
-
-    method mA(x: T) returns (r: int) { r := 0; }
-    method mD(x: T) returns (r: T) { r := x; }
-}
-
-datatype Cont<-T> = Cont(z: T -> int) {
-    const x: int;
-    const y: seq<T>
-
-    function A(x: T): int { 0 }
-    static function sA(x: T): int { 0 }
-    function gA(ghost x: T): int { 0 }
-    function B(x: seq<T>): int { 0 }
-    function C(x: int): seq<T> { y }
-    function D(x: T): T { x }
-
-    method mA(x: T) returns (r: int) { r := 0; }
-    method mD(x: T) returns (r: T) { r := x; }
-}
-
-codatatype CCo<+T> = CCo(T) {
-    const x: int;
-    const y: seq<T>
-
-    function A(x: T): int { 0 }
-    static function sA(x: T): int { 0 }
-    function gA(ghost x: T): int { 0 }
-    function B(x: seq<T>): int { 0 }
-    function C(x: int): seq<T> { y }
-    function D(x: T): T { x }
-
-    method mA(x: T) returns (r: int) { r := 0; }
-    method mD(x: T) returns (r: T) { r := x; }
-}
-
-codatatype CNon<T> = CNon(z: T) {
-    const x: int;
-    const y: seq<T>
-
-    function A(x: T): int { 0 }
-    static function sA(x: T): int { 0 }
-    function gA(ghost x: T): int { 0 }
-    function B(x: seq<T>): int { 0 }
-    function C(x: int): seq<T> { y }
-    function D(x: T): T { x }
-
-    method mA(x: T) returns (r: int) { r := 0; }
-    method mD(x: T) returns (r: T) { r := x; }
-}
-
-codatatype CCon<-T> = CCon(T -> int) {
-    const x: int;
-    const y: seq<T>
-
-    function A(x: T): int { 0 }
-    static function sA(x: T): int { 0 }
-    function gA(ghost x: T): int { 0 }
-    function B(x: seq<T>): int { 0 }
-    function C(x: int): seq<T> { y }
-    function D(x: T): T { x }
-
-    method mA(x: T) returns (r: int) { r := 0; }
-    method mD(x: T) returns (r: T) { r := x; }
-}
-
-trait X {}
-
-class Int extends X {
-  constructor Int() { }
-}
-
-method Covariant() {
-  var i := new Int.Int();
-  var a: Co<Int> := Co(i);
-  var b: Co<X>; // compilation error (java only): compilation does not support trait types as a type parameter; consider introducing a ghost
-  b := a;
-  print a, " and ", b, "\n";
-
-  var s := Co(false);
-  var t := s.mD(true);
-  var y := s.mA(t);
-  print t, y, s.C(s.x), s.B(s.y), s.A(t), Co.sA(t), s.gA(t), "\n"; 
-}
-
-method Nonvariant() {
-  var i := new Int.Int();
-  var j := new Int.Int();
-  var a: Non<Int> := Non(i);
-  var b: Non<Int>;
-  b := a;
-  print a, " and ", b, "\n";
-  
-  var s := Non(false);
-  var t := s.mD(true);
-  var y := s.mA(t);
-  print t, y, s.C(s.x), s.B(s.y), s.A(t), Non.sA(t), s.gA(t), "\n"; 
-}
-
-method Contravariant() {
-  var i := new Int.Int();
-  var a: Cont<X> := Cont(_ => 0);  // compilation error (java only): compilation does not support trait types as a type parameter; consider introducing a ghost
-  var b: Cont<Int>;
-  b := a;
-  print a.z(i), " and ", b.z(i), "\n";
-
-  var s: Cont<X> := Cont(_ => 1);
-  var t := s.mD(i);
-  var y := s.mA(t);
-  print t, y, s.C(s.x), s.B(s.y), s.A(t), Cont.sA(t), s.gA(t), "\n"; 
-}
-
-method CCovariant() {
-  var i := new Int.Int();
-  var a: CCo<Int> := CCo(i);
-  var b: CCo<X>; // compilation error (java only): compilation does not support trait types as a type parameter; consider introducing a ghost
-  b := a;
-  print a, " and ", b, "\n";
-
-  var s := CCo(false);
-  var t := s.mD(true);
-  var y := s.mA(t);
-  print t, y, s.C(s.x), s.B(s.y), s.A(t), CCo.sA(t), s.gA(t), "\n"; 
-}
-
-method CNonvariant() {
-  var i := new Int.Int();
-  var j := new Int.Int();
-  var a: CNon<Int> := CNon(i);
-  var b: CNon<Int>;
-  b := a;
-  print a, " and ", b, "\n";
-  
-  var s := CNon(false);
-  var t := s.mD(true);
-  var y := s.mA(t);
-  print t, y, s.C(s.x), s.B(s.y), s.A(t), CNon.sA(t), s.gA(t), "\n"; 
-}
-
-method CContravariant() {
-  var a: CCon<X> := CCon(_ => 0); // compilation error (java only): compilation does not support trait types as a type parameter; consider introducing a ghost
-  var b: CCon<Int>;
-  b := a;
-  print a, " and ", b, "\n";
-
-  var s: CCon<X> := CCon(_ => 1);
-  var i := new Int.Int();
-  var t := s.mD(i);
-  var y := s.mA(t);
-  print t, y, s.C(s.x), s.B(s.y), s.A(t), CCon.sA(t), s.gA(t), "\n"; 
-}
-
-method Main(){
-  Covariant();
-  Nonvariant();
-  Contravariant();
-  CCovariant();
-  CNonvariant();
-  CContravariant();
-  print "Done\n";
-}
diff --git a/Test/comp/compile1quiet/CompileRunQuietly.dfy b/Test/comp/compile1quiet/CompileRunQuietly.dfy
deleted file mode 100644
index 379841059b3..00000000000
--- a/Test/comp/compile1quiet/CompileRunQuietly.dfy
+++ /dev/null
@@ -1,23 +0,0 @@
-// RUN: %dafny /unicodeChar:0 /compileTarget:cs "%s" > "%t"
-// RUN: dotnet %S/CompileRunQuietly.dll >> "%t"
-
-// RUN: %dafny /unicodeChar:0 /compileTarget:js "%s" >> "%t"
-// RUN: node %S/CompileRunQuietly.js >> "%t"
-
-// RUN: %dafny /unicodeChar:0 /compileTarget:go "%s" >> "%t"
-// RUN: %S/CompileRunQuietly >> "%t"
-
-// RUN: %dafny /unicodeChar:0 /compileTarget:java "%s" >> "%t"
-// RUN: java -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/CompileRunQuietly-java CompileRunQuietly >> "%t"
-
-// RUN: %dafny /unicodeChar:0 /compileTarget:cpp "%s" >> "%t"
-// RUN: %S/CompileRunQuietly.exe >> "%t"
-
-// RUN: %dafny /unicodeChar:0 /compileTarget:py "%s" >> "%t"
-// RUN: python3 %S/CompileRunQuietly-py >> "%t"
-
- // RUN: %diff "%s.expect" "%t"
-
-method Main() {
-  print "hello, Dafny\n";
-}
diff --git a/Test/comp/compile1verbose/CompileAndThenRun.dfy b/Test/comp/compile1verbose/CompileAndThenRun.dfy
deleted file mode 100644
index fbba2baa79d..00000000000
--- a/Test/comp/compile1verbose/CompileAndThenRun.dfy
+++ /dev/null
@@ -1,23 +0,0 @@
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:cs "%s" > "%t"
-// RUN: dotnet %S/CompileAndThenRun.dll >> "%t"
-
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:js "%s" >> "%t"
-// RUN: node %S/CompileAndThenRun.js >> "%t"
-
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:go "%s" >> "%t"
-// RUN: %S/CompileAndThenRun >> "%t"
-
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:java "%s" >> "%t"
-// RUN: java -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/CompileAndThenRun-java CompileAndThenRun >> "%t"
-
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:cpp "%s" >> "%t"
-// RUN: %S/CompileAndThenRun.exe >> "%t"
-
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:py "%s" >> "%t"
-// RUN: python3 %S/CompileAndThenRun-py >> "%t"
-
-// RUN: %diff "%s.expect" "%t"
-
-method Main() {
-  print "hello, Dafny\n";
-}
diff --git a/Test/comp/compile1verbose/CompileAndThenRun.dfy.expect b/Test/comp/compile1verbose/CompileAndThenRun.dfy.expect
deleted file mode 100644
index 9557ee73ea1..00000000000
--- a/Test/comp/compile1verbose/CompileAndThenRun.dfy.expect
+++ /dev/null
@@ -1,68 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-Compiled assembly into CompileAndThenRun.dll
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to CompileAndThenRun.js
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to CompileAndThenRun-go/src/CompileAndThenRun.go
-Additional target code written to CompileAndThenRun-go/src/dafny/dafny.go
-Additional target code written to CompileAndThenRun-go/src/dafny/dafnyFromDafny.go
-Additional target code written to CompileAndThenRun-go/src/System_/System_.go
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to CompileAndThenRun-java/CompileAndThenRun.java
-Additional target code written to CompileAndThenRun-java/dafny/Array.java
-Additional target code written to CompileAndThenRun-java/dafny/BigOrdinal.java
-Additional target code written to CompileAndThenRun-java/dafny/BigRational.java
-Additional target code written to CompileAndThenRun-java/dafny/CodePoint.java
-Additional target code written to CompileAndThenRun-java/dafny/DafnyEuclidean.java
-Additional target code written to CompileAndThenRun-java/dafny/DafnyHaltException.java
-Additional target code written to CompileAndThenRun-java/dafny/DafnyMap.java
-Additional target code written to CompileAndThenRun-java/dafny/DafnyMultiset.java
-Additional target code written to CompileAndThenRun-java/dafny/DafnySequence.java
-Additional target code written to CompileAndThenRun-java/dafny/DafnySet.java
-Additional target code written to CompileAndThenRun-java/dafny/Helpers.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple0.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple1.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple10.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple11.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple12.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple13.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple14.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple15.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple16.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple17.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple18.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple19.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple2.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple20.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple3.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple4.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple5.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple6.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple7.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple8.java
-Additional target code written to CompileAndThenRun-java/dafny/Tuple9.java
-Additional target code written to CompileAndThenRun-java/dafny/TypeDescriptor.java
-Additional target code written to CompileAndThenRun-java/_System/nat.java
-Additional target code written to CompileAndThenRun-java/_System/__default.java
-Wrote executable jar CompileAndThenRun.jar
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to CompileAndThenRun.cpp
-Additional target code written to CompileAndThenRun.h
-Additional target code written to DafnyRuntime.h
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to CompileAndThenRun-py/__main__.py
-Additional target code written to CompileAndThenRun-py/_dafny.py
-Additional target code written to CompileAndThenRun-py/System_.py
-Additional target code written to CompileAndThenRun-py/module_.py
-hello, Dafny
diff --git a/Test/comp/compile3/JustRun.dfy b/Test/comp/compile3/JustRun.dfy
deleted file mode 100644
index 298221d5e39..00000000000
--- a/Test/comp/compile3/JustRun.dfy
+++ /dev/null
@@ -1,19 +0,0 @@
-// NONUNIFORM: /compileVerbose:1 output is backend sensitive
-// (although the second set of comamnds could be separated out)
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:cs /compile:3 "%s" > "%t"
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:js /compile:3 "%s" >> "%t"
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:go /compile:3 "%s" >> "%t"
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:java /compile:3 "%s" >> "%t"
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:cpp /compile:3 "%s" >> "%t"
-// RUN: %dafny /unicodeChar:0 /compileVerbose:1 /compileTarget:py /compile:3 "%s" >> "%t"
-// RUN: %dafny /unicodeChar:0 /compileTarget:cs /compile:3 "%s" >> "%t"
-// RUN: %dafny /unicodeChar:0 /compileTarget:js /compile:3 "%s" >> "%t"
-// RUN: %dafny /unicodeChar:0 /compileTarget:go /compile:3 "%s" >> "%t"
-// RUN: %dafny /unicodeChar:0 /compileTarget:java /compile:3 "%s" >> "%t"
-// RUN: %dafny /unicodeChar:0 /compileTarget:cpp /compile:3 "%s" >> "%t"
-// RUN: %dafny /unicodeChar:0 /compileTarget:py /compile:3 "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main() {
-  print "hello, Dafny\n";
-}
diff --git a/Test/comp/compile3/JustRun.dfy.expect b/Test/comp/compile3/JustRun.dfy.expect
deleted file mode 100644
index d9fd41c29f9..00000000000
--- a/Test/comp/compile3/JustRun.dfy.expect
+++ /dev/null
@@ -1,97 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-Compiled assembly into JustRun.dll
-Running...
-
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Running...
-
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to JustRun-go/src/JustRun.go
-Additional target code written to JustRun-go/src/dafny/dafny.go
-Additional target code written to JustRun-go/src/dafny/dafnyFromDafny.go
-Additional target code written to JustRun-go/src/System_/System_.go
-Running...
-
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to JustRun-java/JustRun.java
-Additional target code written to JustRun-java/dafny/Array.java
-Additional target code written to JustRun-java/dafny/BigOrdinal.java
-Additional target code written to JustRun-java/dafny/BigRational.java
-Additional target code written to JustRun-java/dafny/CodePoint.java
-Additional target code written to JustRun-java/dafny/DafnyEuclidean.java
-Additional target code written to JustRun-java/dafny/DafnyHaltException.java
-Additional target code written to JustRun-java/dafny/DafnyMap.java
-Additional target code written to JustRun-java/dafny/DafnyMultiset.java
-Additional target code written to JustRun-java/dafny/DafnySequence.java
-Additional target code written to JustRun-java/dafny/DafnySet.java
-Additional target code written to JustRun-java/dafny/Helpers.java
-Additional target code written to JustRun-java/dafny/Tuple0.java
-Additional target code written to JustRun-java/dafny/Tuple1.java
-Additional target code written to JustRun-java/dafny/Tuple10.java
-Additional target code written to JustRun-java/dafny/Tuple11.java
-Additional target code written to JustRun-java/dafny/Tuple12.java
-Additional target code written to JustRun-java/dafny/Tuple13.java
-Additional target code written to JustRun-java/dafny/Tuple14.java
-Additional target code written to JustRun-java/dafny/Tuple15.java
-Additional target code written to JustRun-java/dafny/Tuple16.java
-Additional target code written to JustRun-java/dafny/Tuple17.java
-Additional target code written to JustRun-java/dafny/Tuple18.java
-Additional target code written to JustRun-java/dafny/Tuple19.java
-Additional target code written to JustRun-java/dafny/Tuple2.java
-Additional target code written to JustRun-java/dafny/Tuple20.java
-Additional target code written to JustRun-java/dafny/Tuple3.java
-Additional target code written to JustRun-java/dafny/Tuple4.java
-Additional target code written to JustRun-java/dafny/Tuple5.java
-Additional target code written to JustRun-java/dafny/Tuple6.java
-Additional target code written to JustRun-java/dafny/Tuple7.java
-Additional target code written to JustRun-java/dafny/Tuple8.java
-Additional target code written to JustRun-java/dafny/Tuple9.java
-Additional target code written to JustRun-java/dafny/TypeDescriptor.java
-Additional target code written to JustRun-java/_System/nat.java
-Additional target code written to JustRun-java/_System/__default.java
-Wrote executable jar JustRun.jar
-Running...
-
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to JustRun.cpp
-Additional target code written to JustRun.h
-Additional target code written to DafnyRuntime.h
-Running...
-
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to JustRun-py/__main__.py
-Additional target code written to JustRun-py/_dafny.py
-Additional target code written to JustRun-py/System_.py
-Additional target code written to JustRun-py/module_.py
-Running...
-
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-hello, Dafny
diff --git a/Test/comp/elseWithHavocStatement.dfy b/Test/comp/elseWithHavocStatement.dfy
deleted file mode 100644
index 32923f4dfff..00000000000
--- a/Test/comp/elseWithHavocStatement.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-method Main() {
-    var b: bool :| true; 
-    var r: int;
-    if b {
-      r := 13;
-    } else {
-      r := *;
-    }
-    print r;
-}
\ No newline at end of file
diff --git a/Test/comp/firstSteps/1_Calls-F.dfy b/Test/comp/firstSteps/1_Calls-F.dfy
deleted file mode 100644
index 4fe5b83e551..00000000000
--- a/Test/comp/firstSteps/1_Calls-F.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-//
-// This fragment of comp/Calls.dfy serves to facilitate incremental compiler development.
-
-function F(x: int, y: bool): int {
-  x + if y then 2 else 3
-}
-
-method Main() {
-  var w;
-  w := F(2, false);
-  print w, "\n";
-}
diff --git a/Test/comp/firstSteps/2_Modules.dfy b/Test/comp/firstSteps/2_Modules.dfy
deleted file mode 100644
index d0effcb5a71..00000000000
--- a/Test/comp/firstSteps/2_Modules.dfy
+++ /dev/null
@@ -1,19 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-module A {
-  const i: nat := 1
-
-  class X {}
-}
-
-module B {
-  const i: nat := 2
-
-  module X {
-    const i: nat := 3
-  }
-}
-
-method Main(){
-  print A.i, " ", B.i, " ", B.X.i, "\n";
-}
diff --git a/Test/comp/manualcompile/ManualCompile.csproj b/Test/comp/manualcompile/ManualCompile.csproj
deleted file mode 100644
index 41f1d5ad4b2..00000000000
--- a/Test/comp/manualcompile/ManualCompile.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-</Project>
diff --git a/Test/comp/manualcompile/ManualCompile.dfy b/Test/comp/manualcompile/ManualCompile.dfy
deleted file mode 100644
index 6d08a2b3d1a..00000000000
--- a/Test/comp/manualcompile/ManualCompile.dfy
+++ /dev/null
@@ -1,28 +0,0 @@
-// NONUNIFORM: Highly target language specific
-
-// RUN: %baredafny translate cs %args --verbose --include-runtime "%s" > "%t"
-// RUN: dotnet build %S/ManualCompile.csproj
-// RUN: dotnet %S/bin/Debug/net6.0/ManualCompile.dll >> "%t"
-
-// RUN: %dafny /compileVerbose:1 /compile:0 /spillTargetCode:2 /compileTarget:js "%s" >> "%t"
-// RUN: node %S/ManualCompile.js >> "%t"
-
-// RUN: %dafny /compileVerbose:1 /compile:0 /spillTargetCode:2 /compileTarget:go "%s" >> "%t"
-// RUN: env GO111MODULE=auto GOPATH=%S/ManualCompile-go go run %S/ManualCompile-go/src/ManualCompile.go >> "%t"
-
-// RUN: %baredafny translate java %args --verbose --include-runtime "%s" >> "%t"
-// RUN: javac %S/ManualCompile-java/ManualCompile.java %S/ManualCompile-java/**/*.java
-// RUN: java -cp %S/ManualCompile-java ManualCompile >> "%t"
-
-// RUN: %dafny /compileVerbose:1 /compile:0 /unicodeChar:0 /spillTargetCode:2 /compileTarget:cpp "%s" >> "%t"
-// RUN: g++ -g -Wall -Wextra -Wpedantic -Wno-unused-variable -std=c++17 -I %binaryDir -o %S/ManualCompile.exe %S/ManualCompile.cpp
-// RUN: %S/ManualCompile.exe >> "%t"
-
-// RUN: %dafny /compileVerbose:1 /compile:0 /spillTargetCode:2 /compileTarget:py "%s" >> "%t"
-// RUN: python3 %S/ManualCompile-py >> "%t"
-
-// RUN: %diff "%s.expect" "%t"
-
-method Main() {
-  print "hello, Dafny\n";
-}
diff --git a/Test/comp/manualcompile/ManualCompile.dfy.expect b/Test/comp/manualcompile/ManualCompile.dfy.expect
deleted file mode 100644
index 9d5943fb060..00000000000
--- a/Test/comp/manualcompile/ManualCompile.dfy.expect
+++ /dev/null
@@ -1,67 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to ManualCompile.cs
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to ManualCompile.js
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to ManualCompile-go/src/ManualCompile.go
-Additional target code written to ManualCompile-go/src/dafny/dafny.go
-Additional target code written to ManualCompile-go/src/dafny/dafnyFromDafny.go
-Additional target code written to ManualCompile-go/src/System_/System_.go
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to ManualCompile-java/ManualCompile.java
-Additional target code written to ManualCompile-java/dafny/Array.java
-Additional target code written to ManualCompile-java/dafny/BigOrdinal.java
-Additional target code written to ManualCompile-java/dafny/BigRational.java
-Additional target code written to ManualCompile-java/dafny/CodePoint.java
-Additional target code written to ManualCompile-java/dafny/DafnyEuclidean.java
-Additional target code written to ManualCompile-java/dafny/DafnyHaltException.java
-Additional target code written to ManualCompile-java/dafny/DafnyMap.java
-Additional target code written to ManualCompile-java/dafny/DafnyMultiset.java
-Additional target code written to ManualCompile-java/dafny/DafnySequence.java
-Additional target code written to ManualCompile-java/dafny/DafnySet.java
-Additional target code written to ManualCompile-java/dafny/Helpers.java
-Additional target code written to ManualCompile-java/dafny/Tuple0.java
-Additional target code written to ManualCompile-java/dafny/Tuple1.java
-Additional target code written to ManualCompile-java/dafny/Tuple10.java
-Additional target code written to ManualCompile-java/dafny/Tuple11.java
-Additional target code written to ManualCompile-java/dafny/Tuple12.java
-Additional target code written to ManualCompile-java/dafny/Tuple13.java
-Additional target code written to ManualCompile-java/dafny/Tuple14.java
-Additional target code written to ManualCompile-java/dafny/Tuple15.java
-Additional target code written to ManualCompile-java/dafny/Tuple16.java
-Additional target code written to ManualCompile-java/dafny/Tuple17.java
-Additional target code written to ManualCompile-java/dafny/Tuple18.java
-Additional target code written to ManualCompile-java/dafny/Tuple19.java
-Additional target code written to ManualCompile-java/dafny/Tuple2.java
-Additional target code written to ManualCompile-java/dafny/Tuple20.java
-Additional target code written to ManualCompile-java/dafny/Tuple3.java
-Additional target code written to ManualCompile-java/dafny/Tuple4.java
-Additional target code written to ManualCompile-java/dafny/Tuple5.java
-Additional target code written to ManualCompile-java/dafny/Tuple6.java
-Additional target code written to ManualCompile-java/dafny/Tuple7.java
-Additional target code written to ManualCompile-java/dafny/Tuple8.java
-Additional target code written to ManualCompile-java/dafny/Tuple9.java
-Additional target code written to ManualCompile-java/dafny/TypeDescriptor.java
-Additional target code written to ManualCompile-java/_System/nat.java
-Additional target code written to ManualCompile-java/_System/__default.java
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to ManualCompile.cpp
-Additional target code written to ManualCompile.h
-Additional target code written to DafnyRuntime.h
-hello, Dafny
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to ManualCompile-py/__main__.py
-Additional target code written to ManualCompile-py/_dafny.py
-Additional target code written to ManualCompile-py/System_.py
-Additional target code written to ManualCompile-py/module_.py
-hello, Dafny
diff --git a/Test/comp/separate-compilation/Inputs/producer/timesTwo.dfy b/Test/comp/separate-compilation/Inputs/producer/timesTwo.dfy
deleted file mode 100644
index 6b6afcc2076..00000000000
--- a/Test/comp/separate-compilation/Inputs/producer/timesTwo.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-module {:options "--function-syntax:4"} LibraryModule {
-
-  function TimesTwo(x: nat): nat
-  {
-    x * 2
-  }
-
-}
diff --git a/Test/comp/separate-compilation/usesTimesTwo.dfy b/Test/comp/separate-compilation/usesTimesTwo.dfy
deleted file mode 100644
index 87553aa62d8..00000000000
--- a/Test/comp/separate-compilation/usesTimesTwo.dfy
+++ /dev/null
@@ -1,59 +0,0 @@
-// NONUNIFORM: Highly target language specific
-
-// C#
-
-// RUN: %baredafny translate cs %args --output=%S/Inputs/producer/timesTwo %S/Inputs/producer/timesTwo.dfy
-// RUN: dotnet build %S/Inputs/producer
-
-// RUN: %baredafny translate cs %args --output=%S/consumer/usesTimesTwo --library=%S/Inputs/producer/timesTwo.dfy %s
-
-// RUN: dotnet run --project %S/consumer > "%t"
-
-// Java
-
-// RUN: %baredafny translate java --output=%S/Inputs/producer/timesTwo %S/Inputs/producer/timesTwo.dfy
-// RUN: javac -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/Inputs/producer/timesTwo-java %S/Inputs/producer/timesTwo-java/timesTwo.java %S/Inputs/producer/timesTwo-java/*/*.java
-
-// RUN: %baredafny translate java --output=%S/consumer/usesTimesTwo --library=%S/Inputs/producer/timesTwo.dfy %s
-// RUN: javac -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/Inputs/producer/timesTwo-java%{pathsep}%S/consumer/usesTimesTwo-java %S/consumer/usesTimesTwo-java/usesTimesTwo.java %S/consumer/usesTimesTwo-java/*/*.java
-
-// RUN: java -cp %binaryDir/DafnyRuntime.jar%{pathsep}%S/Inputs/producer/timesTwo-java%{pathsep}%S/consumer/usesTimesTwo-java usesTimesTwo >> "%t"
-
-// Python
-
-// TODO: Can we refer to the runtime separately?
-// RUN: %baredafny translate py --output=%S/Inputs/producer/timesTwo %S/Inputs/producer/timesTwo.dfy --include-runtime
-
-// RUN: %baredafny translate py --output=%S/consumer/usesTimesTwo --library=%S/Inputs/producer/timesTwo.dfy %s
-
-// TODO: Won't work on windows
-// RUN: env PYTHONPATH=%S/Inputs/producer/timesTwo-py python3 %S/consumer/usesTimesTwo-py >> "%t"
-
-// Go
-
-// Must --include-runtime since DafnyRuntime.go isn't usable:
-// https://github.com/dafny-lang/dafny/issues/494
-// RUN: %baredafny translate go --output=%S/Inputs/producer/timesTwo %S/Inputs/producer/timesTwo.dfy --include-runtime
-
-// RUN: %baredafny translate go --output=%S/consumer/usesTimesTwo --library=%S/Inputs/producer/timesTwo.dfy %s
-
-// RUN: env GO111MODULE=auto GOPATH=%S/Inputs/producer/timesTwo-go%{pathsep}%S/consumer/usesTimesTwo-go go run %S/consumer/usesTimesTwo-go/src/usesTimesTwo.go >> "%t"
-
-// (Javascript doesn't support this yet)
-
-// Final output check for all runs
-
-// RUN: %diff "%s.expect" "%t"
-
-include "Inputs/producer/timesTwo.dfy"
-
-module ConsumerModule {
-
-  import opened LibraryModule
-
-  method Main() {
-    var n := 21;
-    var TwoN := TimesTwo(n);
-    print "Two times ", n, " is ", TwoN, "\n";
-  }
-}
diff --git a/Test/comp/separate-compilation/usesTimesTwo.dfy.expect b/Test/comp/separate-compilation/usesTimesTwo.dfy.expect
deleted file mode 100644
index db63d3dda35..00000000000
--- a/Test/comp/separate-compilation/usesTimesTwo.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-Two times 21 is 42
-Two times 21 is 42
-Two times 21 is 42
-Two times 21 is 42
diff --git a/Test/concurrency/09-CounterNoStateMachine.dfy.expect b/Test/concurrency/09-CounterNoStateMachine.dfy.expect
deleted file mode 100644
index 49c99f8b11b..00000000000
--- a/Test/concurrency/09-CounterNoStateMachine.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 165 verified, 0 errors
diff --git a/Test/concurrency/10-SequenceInvariant.dfy.expect b/Test/concurrency/10-SequenceInvariant.dfy.expect
deleted file mode 100644
index bd57f1956c5..00000000000
--- a/Test/concurrency/10-SequenceInvariant.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 166 verified, 0 errors
diff --git a/Test/concurrency/11-MutexGuard2.dfy b/Test/concurrency/11-MutexGuard2.dfy
deleted file mode 100644
index a70667f5843..00000000000
--- a/Test/concurrency/11-MutexGuard2.dfy
+++ /dev/null
@@ -1,725 +0,0 @@
-// UNSUPPORTED: windows,posix
-// RUN: %dafny /compile:0 /proverOpt:O:smt.qi.eager_threshold=30 /typeEncoding:p "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// This program models the ownership of a Rust-like MutexGuard.
-// To speed up the verification: /vcsLoad:0.5 /proverOpt:O:smt.qi.eager_threshold=30
-
-// A universe of objects playing under LCI rules
-trait Universe {
-  // The set of objects in the universe
-  var content: set<Object>
-
-  // Universe invariant: the universe doesn't contain itself,
-  // and its objects in this universe agree that they are in this universe.
-  // We define this to allow a generic object operation (Object.join below) to add the object to the universe,
-  // without having to check the object invariants.
-  ghost predicate globalBaseInv() reads this, content {
-    && (forall o: Object | o in content :: o.universe == this && o as object != this && o.baseFieldsInv() && o.triggerAxioms())
-  }
-
-  // Global 1-state invariant: all objects satisfy their individual invariants.
-  ghost predicate globalInv() reads * {
-    globalBaseInv() && (forall o: Object | o in content :: o.inv())
-  }
-
-  // Global transitive 2-state invariant: all old objects satisfy their transitive 2-state invariants.
-  twostate predicate globalSequenceInv2() reads * {
-    forall o: Object | o in old(content) :: o in content && o.sequenceInv2()
-  }
-
-  // Global 2-state invariant: all old objects satisfy their 2-state invariants.
-  twostate predicate globalInv2() reads * {
-    forall o: Object | o in old(content) :: o in content && o.inv2()
-  }
-
-  twostate predicate baseLegalTransitionsSequence() reads * {
-    && old(globalBaseInv())
-    && globalBaseInv()
-    // The universe only grows
-    && old(content) <= content
-    // All objects added to the universe weren't allocated in the old state.
-    // This allows to satisfy the modifies clause checks on the caller side in a sequence of methods that might
-    // modify the universe. For example, the `Havoc` and `Interference` methods.
-    // fresh(content - old(content)) // This is slow. Dafny is 20x faster using the following quantifier!
-    && (forall o: Object | o !in old(content) && o in content :: !old(allocated(o)))
-  }
-
-  // This relation describes a sequence of legal transitions, each of which can be performed by a newly created thread
-  // or by one of the threads in the `running` parameter.
-  // This definition is weaker than `legalTransition`, but it's transitive (if it holds for A->B and B->C then it holds also for A->C).
-  // This definition is also monotonic w.r.t. `running`: `legalTransitionsSequence(S)` should imply `legalTransitionsSequence(T)` whenever `S <= T`.
-  // This definition is needed in the definition of the `Interference` and `Havoc` methods, and in the loop invariants of the `Run` methods.
-  twostate predicate legalTransitionsSequence(running: set<Thread>) reads * {
-    && baseLegalTransitionsSequence()
-    // Version numbers only increase
-    // Updated objects must obey their transitive 2-state invariants.
-    && (forall o: Object | o in old(content) && o in content :: unchanged(o) || o.sequenceInv2()) // `o in content` adds a useful trigger
-    // Objects cannot change the nonvolatile fields if they are directly owned by threads that cannot run.
-    // The 2-state invariant of OwnedObject extends this property to objects that are *transitively* owned by the threads.
-    && (forall o: OwnedObject | o in old(content) && old(o.owner) is Thread ::
-      // Threads created during a legalTransitionsSequence are allowed to run
-      old(o.owner) as Thread !in running && old(allocated(o.owner)) ==> old(o.nonvolatileVersion) == o.nonvolatileVersion
-    )
-  }
-
-  twostate predicate legalTransitionsSequenceAnyThread() reads * {
-    legalTransitionsSequence(set t: Thread | t in old(content))
-  }
-
-  // A legal transition is one that starts from a good state, preserves the universe invariant, and meets the legality conditions.
-  // This relation only needs to describe a *single* legal transition, not a sequence. So, it doesn't need to be
-  // transitive and it can be more precise than `legalTransitionsSequence`.
-  twostate predicate legalTransition(running: Thread) reads * {
-    && legalTransitionsSequence({running})
-    && old(globalInv())
-    // The first condition for legality: old objects that change a field must obey their 1- and 2-state invariants.
-    && (forall o: Object | o in old(content) :: unchanged(o) || (o.inv() && o.inv2()))
-    // The second condition for legality: new objects must satisfy their invariants.
-    && (forall o: Object | o in content && o !in old(content) :: o.inv())
-  }
-
-  // Transitive LCI soundness
-  twostate lemma sequenceLci(running: set<Thread>)
-    requires legalTransitionsSequence(running)
-    ensures globalSequenceInv2()
-  {
-    forall o: Object | o in old(content) && o.goodPreAndLegalChangesSequence(running) ensures o.sequenceInv2() { o.sequenceAdmissibility(running); }
-  }
-
-  // LCI soundness: legal transitions are good. This makes use of the admissibility obligations build into Object's.
-  twostate lemma lci(running: Thread)
-    requires legalTransition(running)
-    ensures globalInv() && globalInv2()
-  {
-    forall o: Object | o in old(content) && o.goodPreAndLegalChanges(running) ensures o.inv2() && o.inv() { o.admissibility(running); }
-  }
-
-  method Havoc()
-    requires globalBaseInv()
-    modifies this, this.content
-    ensures globalBaseInv() && baseLegalTransitionsSequence()
-  {
-    // Do nothing. Just havoc stuff on the caller side.
-  }
-
-  // Model the preemption of a given thread. Any other thread will have a chance to execute any number of legal transitions,
-  // modifying (1) volatile fiels of any object and (2) nonvolatile fields of objects that are not transitively owned by
-  // the preempting thread.
-  method Interference(preempting: Thread)
-    requires globalInv() && preempting in content
-    modifies this, this.content
-    ensures globalInv()
-    // Ensure that other threads executed any number of legal transitions.
-    // Ensuring `globalInv2` would be wrong, because it's not guaranteed to be transitive.
-    ensures legalTransitionsSequence(set t: Thread | t in old(content) && t != preempting) && globalSequenceInv2()
-  {
-    // This method could be bodyless. Checking the following implementation is just a consistency check.
-    // The verifier will report errors in case `legalTransitionsSequence` is not transitive.
-    var steps: int :| 0 <= steps;
-    sequenceLci({});
-    while (steps > 0)
-      invariant globalInv() && legalTransitionsSequence(set t: Thread | t in old(content) && t != preempting) && globalSequenceInv2()
-    {
-      // A thread of the environment (if there is any) executes a single legal transition.
-      var envThreads: set<Thread> := set t: Thread | t in content && t != preempting;
-      if (|envThreads| > 0) {
-        ghost var running: Thread :| running in envThreads;
-        label preTransition:
-        assert globalSequenceInv2(); // (1)
-        Havoc();
-        assume legalTransition@preTransition(running);
-        lci@preTransition(running);
-        assert globalSequenceInv2@preTransition(); // (2)
-        // We cannot call a 3-state lemma to apply the transitivity of `forall o: Object ... o.sequenceInv2`, so we have to assume this, checking (1) and (2).
-        assume baseLegalTransitionsSequence() ==> globalSequenceInv2();
-      }
-      steps := steps - 1;
-    }
-  }
-
-  // Consistency check: baseLegalTransitionsSequence should be transitive.
-  method CheckTransitiveBaseLegalTransitionsSequence()
-    requires globalBaseInv()
-    modifies this, content
-    ensures baseLegalTransitionsSequence()
-  {
-    Havoc();
-    Havoc();
-  }
-
-  // Consistency check: legalTransitionsSequence should be transitive.
-  method CheckTransitiveLegalTransitionsSequence(running: set<Thread>)
-    requires globalInv()
-    modifies this, content
-    ensures legalTransitionsSequence(running)
-  {
-    Havoc();
-    assume legalTransitionsSequence(running);
-    sequenceLci(running);
-    assert globalSequenceInv2(); // (1)
-    label mid:
-    Havoc();
-    assume legalTransitionsSequence@mid(running);
-    sequenceLci@mid(running);
-    assert globalSequenceInv2@mid(); // (2)
-    // We cannot call a 3-state lemma to apply the transitivity of `sequenceInv2`, so we have to assume it, checking (1) and (2).
-    assume baseLegalTransitionsSequence() ==> globalSequenceInv2();
-  }
-
-  // Consistency check: legalTransitionsSequence should be monotonic w.r.t. adding elements to `running`.
-  twostate lemma CheckMonotonicLegalTransitionsSequence(running: set<Thread>, moreRunning: set<Thread>)
-    requires running <= moreRunning
-    requires legalTransitionsSequence(running)
-    ensures legalTransitionsSequence(moreRunning)
-  { }
-
-  // method SmokeTestHavoc()
-  //   requires globalInv()
-  //   modifies this, content
-  //   ensures false // Should fail
-  // {
-  //   Havoc();
-  // }
-
-  // method SmokeTestInterference(running: Thread)
-  //   requires globalInv() && running in content
-  //   modifies this, content
-  //   ensures false // Should fail
-  // {
-  //   Interference(running);
-  // }
-}
-
-// A generic object trait
-trait Object {
-  // Universe of which the Object is a member.
-  // This should really be a constant, but I don't know how to do that while factoring out join below,
-  // because traits can't have constructors.
-  const universe: Universe
-
-  // Global base invariant (from o's perspective)
-  ghost predicate objectGlobalBaseInv() reads * { this in universe.content && baseFieldsInv() && universe.globalBaseInv() }
-
-  // Global invariant (from o's perspective) - I am in the universe and the universe is good. (This implies I am good also.)
-  ghost predicate objectGlobalInv() reads * { this in universe.content && universe.globalInv() }
-
-  // Global 2-state invariant (from o's perspective).
-  twostate predicate objectGlobalInv2() requires old(objectGlobalInv()) reads * { objectGlobalBaseInv() && universe.globalInv2() }
-
-  ghost predicate triggerAxioms() reads this ensures triggerAxioms() {
-    assume (this is OwnedObject || this is Thread) && !(this is OwnedObject && this is Thread);
-    && (this is OwnedObject || this is Thread)
-    && !(this is OwnedObject && this is Thread)
-  }
-
-  // Join the universe
-  method join()
-    requires universe.globalBaseInv() && baseFieldsInv() && this as object != universe
-    modifies universe
-    ensures objectGlobalBaseInv() && universe.content == old(universe.content) + { this }
-  {
-    universe.content := universe.content + { this };
-    forall o: Object | o in universe.content ensures o.baseFieldsInv() {
-      o.baseFieldsInvMonotonicity();
-    }
-  }
-
-  // Precondition for the sequence admissibility check.
-  twostate predicate goodPreAndLegalChangesSequence(running: set<Thread>) reads * {
-    && old(this in universe.content)
-    && unchanged(this)
-    && universe.legalTransitionsSequence(running)
-  }
-
-  // Precondition for the admissibility check.
-  // This is broken into a separate predicate because Dafny currently doesn't allow adm.requires() in a 1-state context
-  twostate predicate goodPreAndLegalChanges(running: Thread) reads * {
-    && old(this in universe.content)
-    && unchanged(this)
-    && universe.legalTransition(running)
-  }
-
-  // To be implemented: 1-state invariant, 2-state invariant, admissibility proof...
-  ghost predicate isOwnedObject() // To prevent a class from extending both OwnedObject and Thread
-  ghost predicate baseFieldsInv() reads this, universe // All fields of this object are in the universe
-  twostate lemma baseFieldsInvMonotonicity() requires old(baseFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseFieldsInv()
-  ghost predicate localInv() reads * ensures localInv() ==> objectGlobalBaseInv()
-  twostate predicate localInv2() reads *
-  ghost predicate inv() ensures inv() ==> localInv() reads *
-  twostate predicate sequenceInv2() reads * // This should be transitive. See `CheckSequenceInv2` below.
-  twostate predicate inv2() ensures inv2() ==> localInv2() && sequenceInv2() reads *
-  twostate lemma sequenceAdmissibility(running: set<Thread>) requires goodPreAndLegalChangesSequence(running) ensures sequenceInv2()
-  twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv()
-}
-
-class Thread extends Object {
-  // To prevent a class from extending both OwnedObject and Thread
-  ghost predicate isOwnedObject() { false }
-
-  ghost predicate baseFieldsInv() reads this, universe {
-    true
-  }
-  twostate lemma baseFieldsInvMonotonicity() requires old(baseFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseFieldsInv() {}
-
-  ghost predicate localInv() reads * ensures localInv() ==> objectGlobalBaseInv() {
-    && objectGlobalBaseInv()
-  }
-  ghost predicate inv() reads * ensures inv() ==> localInv() {
-    && localInv()
-  }
-
-  twostate predicate localInv2() reads * {
-    true
-  }
-  twostate predicate sequenceInv2() reads * {
-    true
-  }
-  twostate predicate inv2() reads * ensures inv2() ==> localInv2() && sequenceInv2() {
-    localInv2() && sequenceInv2()
-  }
-
-  twostate lemma sequenceAdmissibility(running: set<Thread>) requires goodPreAndLegalChangesSequence(running) ensures sequenceInv2() {}
-  twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv() {}
-
-  // Check (trivial) transitivity of sequenceInv2()
-  method CheckSequenceInv2()
-    requires objectGlobalInv()
-    modifies universe, universe.content
-    ensures sequenceInv2()
-  {
-    universe.Havoc();
-    assume universe.baseLegalTransitionsSequence() && forall o: Object | o in old(universe.content) :: o.sequenceInv2();
-    label mid:
-    universe.Havoc();
-    assume universe.baseLegalTransitionsSequence@mid() && forall o: Object | o in old@mid(universe.content) :: o.sequenceInv2@mid();
-  }
-
-  // Here we require a thread to create a thread. Programs shold assume that an initial thread exists in the universe.
-  constructor(universe: Universe, ghost running: Thread)
-    requires universe.globalInv() && running in universe.content
-    modifies universe
-    ensures objectGlobalInv() && universe.legalTransition(running)
-  {
-    this.universe := universe;
-    new;
-    join();
-    universe.lci(running);
-  }
-}
-
-trait OwnedObject extends Object {
-  ghost var nonvolatileVersion: int
-  ghost var owner: Object // nonvolatile
-
-  // If true, any thread can take ownership of the object and change its nonvolatile fields.
-  // If false, only the owner can modify the nonvolatile fields.
-  // Intended usage: This should be set to true when a thread wants to let any thread to take ownership of the object.
-  //ghost var stealable: bool // nonvolatile
-
-  // To prevent a class from extending both OwnedObject and Thread
-  ghost predicate isOwnedObject() { true }
-
-  ghost predicate baseFieldsInv() reads this, universe {
-    && owner in universe.content
-    && baseUserFieldsInv()
-  }
-  twostate lemma baseFieldsInvMonotonicity() requires old(baseFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseFieldsInv() {
-    baseUserFieldsInvMonotonicity();
-  }
-
-  twostate predicate unchangedNonvolatileFields() reads this {
-    && old(owner) == owner
-    && unchangedNonvolatileUserFields()
-  }
-
-  ghost predicate localInv() reads * ensures localInv() ==> objectGlobalBaseInv() {
-    && objectGlobalBaseInv()
-    && localUserInv()
-  }
-  ghost predicate inv() reads * ensures inv() ==> localInv() {
-    && localInv()
-    && userInv()
-  }
-
-  twostate predicate localInv2() reads * {
-    && localUserInv2()
-  }
-
-  twostate predicate sequenceInv2() reads * {
-    && old(nonvolatileVersion) <= nonvolatileVersion
-    && (old(nonvolatileVersion) == nonvolatileVersion ==>
-      // Nonvolatile fields are only allowed to change when the nonvolatileVersion changes.
-      // TODO: This could be optimized by making the nonvolatile fields a version of the nonvolatile version number
-      && unchangedNonvolatileFields()
-      // Transitivity: if a nonvolatileVersion doesn't change, the same should apply to all owned objects
-      //&& (forall o: OwnedObject | o in old(universe.content) && old(o.owner) == this :: old(o.nonvolatileVersion) == o.nonvolatileVersion)
-    )
-    // The nonvolatileVersion cannot change if the version of the old owner doesn't change.
-    && (old(owner) is OwnedObject ==>
-      var oldOwner := old(owner) as OwnedObject;
-      !oldOwner.volatileOwns() && old(oldOwner.nonvolatileVersion) == oldOwner.nonvolatileVersion ==> old(nonvolatileVersion) == nonvolatileVersion
-    )
-    // The nonvolatileVersion cannot change if the version of the new owner doesn't change.
-    // Note: this seems fine, but unnecessary.
-    // && (owner is OwnedObject ==>
-    //   var newOwner := owner as OwnedObject;
-    //   old(allocated(newOwner)) && old(newOwner.nonvolatileVersion) == newOwner.nonvolatileVersion ==> old(nonvolatileVersion) == nonvolatileVersion
-    // )
-  }
-
-  twostate predicate inv2() reads * ensures inv2() ==> localInv2() && sequenceInv2() {
-    && localInv2()
-    && sequenceInv2()
-    && userInv2()
-    // When the owner changes, the invariant of the old and new owner must hold.
-    && (old(owner) != owner ==>
-      && old(owner).localInv()
-      && old(owner).localInv2()
-      && owner.localInv()
-      // In case the new owner existed in the old state
-      && (var currOwner := owner; old(allocated(currOwner)) ==> owner.localInv2())
-    )
-  }
-
-  // Check transitivity of sequenceInv2()
-  method CheckSequenceInv2()
-    requires objectGlobalInv()
-    modifies universe, universe.content
-    ensures sequenceInv2()
-  {
-    universe.Havoc();
-    assume universe.baseLegalTransitionsSequence() && forall o: Object | o in old(universe.content) :: o.sequenceInv2();
-    var u1 := unchangedNonvolatileFields(); // (1)
-    label mid:
-    universe.Havoc();
-    assume universe.baseLegalTransitionsSequence@mid() && forall o: Object | o in old@mid(universe.content) :: o.sequenceInv2@mid();
-    var u2 := unchangedNonvolatileFields@mid(); // (2)
-    // We cannot call a 3-state lemma to apply the transitivity of `unchangedNonvolatileFields`, so we have to assume it.
-    assume u1 && u2 ==> unchangedNonvolatileFields();
-  }
-
-  // To be implemented in the class: 1-state invariant, 2-state invariant, admissibility proof...
-  ghost predicate volatileOwns() // If true, the set of owned objects can change without changing the nonvolatileVersion
-  ghost predicate baseUserFieldsInv() reads this, universe
-  twostate lemma baseUserFieldsInvMonotonicity() requires old(baseUserFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseUserFieldsInv()
-  twostate predicate unchangedNonvolatileUserFields() reads this // Checking transitivity is up to the classes that implement this trait.
-  ghost predicate localUserInv() reads *
-  twostate predicate localUserInv2() reads *
-  ghost predicate userInv() reads * ensures userInv() ==> localUserInv()
-  twostate predicate userInv2() reads * ensures userInv2() ==> localUserInv2()
-
-  // Every class should check the transitivity of unchangedNonvolatileFields():
-  // method CheckTransitiveUnchangedNonvolatileFields()
-  //   modifies universe, universe.content
-  //   ensures unchangedNonvolatileFields()
-  // {
-  //   universe.Havoc();
-  //   assume unchangedNonvolatileFields();
-  //   label mid:
-  //   universe.Havoc();
-  //   assume unchangedNonvolatileFields@mid();
-  // }
-}
-
-method BumpVersion(ghost last: int) returns (res: int) ensures res > last
-
-// fn test(m: Arc<Mutex<u32>>) {
-//   let l: MutexGuard<T> = m.lock().unwrap(); // create a guard == acquire mutex
-//   let a: u32 = *l;
-//   let b: u32 = *l;
-//   assert!(a == b); // Ensured
-//   drop(l); // deallocate a guard == release mutex
-// }
-
-// An owned integer type
-class OwnedU32 extends OwnedObject {
-  var value: int // nonvolatile
-
-  ghost predicate volatileOwns() { false }
-  ghost predicate baseUserFieldsInv() reads this, universe { true }
-  twostate lemma baseUserFieldsInvMonotonicity() requires old(baseUserFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseUserFieldsInv() {}
-
-  twostate predicate unchangedNonvolatileUserFields() reads this {
-    && old(value) == value
-  }
-
-  ghost predicate localUserInv() reads * { true }
-  ghost predicate userInv() reads * ensures userInv() ==> localUserInv() { localUserInv() }
-  twostate predicate localUserInv2() reads * { true }
-  twostate predicate userInv2() reads * ensures userInv2() ==> localUserInv2() { localUserInv2() }
-
-  twostate lemma sequenceAdmissibility(running: set<Thread>) requires goodPreAndLegalChangesSequence(running) ensures sequenceInv2() {}
-  twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv() {}
-
-  constructor(universe: Universe, ghost running: Thread, value: int)
-    requires universe.globalInv() && running in universe.content
-    modifies universe
-    ensures objectGlobalInv() && universe.legalTransition(running)
-    ensures this.universe == universe && this.owner == running && this.value == value
-    ensures universe.content == old(universe.content) + { this }
-  {
-    this.universe := universe;
-    this.owner := running;
-    this.value := value;
-    new;
-    join();
-    universe.lci(running);
-  }
-}
-
-class Mutex extends OwnedObject {
-  var data: OwnedU32 // volatile (it was UnsafeCell<u32>)
-  var locked: bool // volatile (it was UnsafeCell<bool>)
-  ghost var guards: set<MutexGuardU32> // volatile
-
-  ghost predicate volatileOwns() { true }
-  ghost predicate baseUserFieldsInv() reads this, universe {
-    && data in universe.content
-    && guards <= universe.content
-  }
-  twostate lemma baseUserFieldsInvMonotonicity() requires old(baseUserFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseUserFieldsInv() {}
-
-  twostate predicate unchangedNonvolatileUserFields() reads this { true }
-
-  ghost predicate localUserInv() reads * {
-    && (locked ==>
-      && data.owner is MutexGuardU32
-      && (data.owner as MutexGuardU32).mutex == this
-      && guards == { data.owner as MutexGuardU32 }
-    )
-    && (!locked ==>
-      && data.owner == this
-      && guards == {}
-    )
-  }
-  ghost predicate userInv() reads * ensures userInv() ==> localUserInv() {
-    && localUserInv()
-    && (forall g: MutexGuardU32 | g in guards :: g.localInv())
-  }
-  twostate predicate localUserInv2() reads * { 
-    && old(data) == data
-  }
-  twostate predicate userInv2() reads * ensures userInv2() ==> localUserInv2() {
-    && localUserInv2()
-    //&& (forall g: MutexGuardU32 | g in old(guards) :: g.localInv2())
-  }
-
-  twostate lemma sequenceAdmissibility(running: set<Thread>) requires goodPreAndLegalChangesSequence(running) ensures sequenceInv2() {}
-  twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv() {
-    assert userInv();
-  }
-
-  constructor(universe: Universe, ghost running: Thread, data: OwnedU32)
-    requires universe.globalInv() && running in universe.content && data in universe.content && data.owner == running
-    modifies universe, data
-    ensures objectGlobalInv() && universe.legalTransition(running)
-    ensures this.universe == universe && this.owner == running && this.data == data && !this.locked
-    ensures universe.content == old(universe.content) + { this }
-  {
-    this.universe := universe;
-    this.owner := running;
-    this.data := data;
-    this.locked := false;
-    this.guards := {};
-    new;
-    join();
-    // Transfer ownership of `this.data` from `running` to `this`.
-    this.data.owner := this;
-    this.data.nonvolatileVersion := BumpVersion(this.data.nonvolatileVersion);
-    universe.lci(running);
-  }
-}
-
-class MutexGuardU32 extends OwnedObject {
-  var mutex: Mutex // nonvolatile
-  ghost var data: OwnedU32 // nonvolatile
-
-  ghost predicate volatileOwns() { false }
-  ghost predicate baseUserFieldsInv() reads this, universe {
-    && mutex in universe.content
-    && data in universe.content
-  }
-  twostate lemma baseUserFieldsInvMonotonicity() requires old(baseUserFieldsInv()) && old(universe.content) <= universe.content && unchanged(this) ensures baseUserFieldsInv() {}
-
-  twostate predicate unchangedNonvolatileUserFields() reads this {
-    && old(mutex) == mutex
-    && old(data) == data
-  }
-
-  ghost predicate localUserInv() reads * {
-    && mutex.locked
-    && mutex.guards == { this }
-    && mutex.data.owner == this
-    && mutex.data == data
-  }
-  ghost predicate userInv() reads * ensures userInv() ==> localUserInv() {
-    && localUserInv()
-    && mutex.localInv()
-  }
-  twostate predicate localUserInv2() reads * {
-    && old(mutex) == mutex
-  }
-  twostate predicate userInv2() reads * ensures userInv2() ==> localUserInv2() {
-    && localUserInv2()
-    && mutex.localInv2()
-  }
-
-  twostate lemma sequenceAdmissibility(running: set<Thread>) requires goodPreAndLegalChangesSequence(running) ensures sequenceInv2() {}
-  twostate lemma admissibility(running: Thread) requires goodPreAndLegalChanges(running) ensures inv2() && inv() {}
-
-  constructor(universe: Universe, ghost running: Thread, mutex: Mutex)
-    requires universe.globalInv() && running in universe.content && mutex in universe.content
-    requires !mutex.locked
-    modifies universe, mutex`locked, mutex`guards, mutex.data`owner, mutex.data`nonvolatileVersion
-    ensures objectGlobalInv() && universe.legalTransition(running)
-    ensures this.universe == universe && this.owner == running && this.mutex == mutex && this.data == mutex.data && this.mutex.locked && this.mutex.data.owner == this
-    ensures universe.content == old(universe.content) + { this }
-  {
-    this.universe := universe;
-    this.owner := running;
-    this.mutex := mutex;
-    this.data := mutex.data;
-    new;
-    join();
-    // Acquire the lock
-    this.mutex.locked := true;
-    this.mutex.guards := { this };
-    // Transfer ownership of `this.mutex.data` from `this.mutex` to `this`.
-    this.mutex.data.owner := this;
-    this.mutex.data.nonvolatileVersion := BumpVersion(this.mutex.data.nonvolatileVersion);
-    // We don't need to bump this.mutex.nonvolatileVersion, because it uses volatileOwns.
-    universe.lci(running);
-  }
-}
-
-method Acquire(universe: Universe, running: Thread, mutex: Mutex)
-  returns (guard: MutexGuardU32)
-  requires universe.globalInv() && running in universe.content && mutex in universe.content
-  modifies universe, universe.content
-  decreases *
-  // Instead of `baseLegalTransitionsSequence`, `legalTransitionsSequenceAnyThread` would be more precise and complete.
-  ensures universe.globalInv() && universe.baseLegalTransitionsSequence()
-  ensures guard in universe.content
-  ensures guard.owner == running && guard.mutex == mutex
-{
-  universe.Interference(running);
-  assert {:split_here} true;
-
-  label lci_l11:
-  var wasLocked := mutex.locked;
-  universe.lci@lci_l11(running);
-  assert {:split_here} true;
-
-  // No interference
-
-  label beforeLoop:
-  while (wasLocked)
-    modifies universe, universe.content
-    invariant universe.globalInv() && universe.baseLegalTransitionsSequence@beforeLoop()
-    invariant !wasLocked ==> !mutex.locked
-    decreases * // Nothing guarantees that we'll obtain the lock
-  {
-    universe.Interference(running);
-    assert {:split_here} true;
-
-    label lci_l12:
-    wasLocked := mutex.locked;
-    universe.lci@lci_l12(running);
-    assert {:split_here} true;
-  }
-  assert {:split_here} true;
-
-  // No interference
-
-  label lci_l13:
-  guard := new MutexGuardU32(universe, running, mutex);
-  universe.lci@lci_l13(running);
-  assert {:split_here} true;
-
-  universe.Interference(running);
-  assert {:split_here} true;
-}
-
-// fn set_data(m: Arc<Mutex<u32>>) {
-//   let l: MutexGuard<T> = m.lock().unwrap(); // create a guard == acquire mutex
-//   let a: u32 = *l;
-//   let b: u32 = *l;
-//   assert!(a == b); // Ensured
-//   *l = 42;
-//   drop(l); // deallocate a guard == release mutex
-// }
-
-method {:vcs_split_on_every_assert} SetData(universe: Universe, running: Thread, mutex: Mutex)
-  requires universe.globalInv() && running in universe.content && mutex in universe.content
-  modifies universe, universe.content
-  decreases *
-  ensures universe.globalInv() && universe.baseLegalTransitionsSequence()
-{
-  universe.Interference(running);
-
-  // A method call is not a single atomic step.
-  var guard := Acquire(universe, running, mutex);
-
-  universe.Interference(running);
-
-  label lci_l14:
-  var a := guard.mutex.data.value;
-  universe.lci@lci_l14(running);
-
-  universe.Interference(running);
-
-  label lci_l15:
-  var b := guard.mutex.data.value;
-  universe.lci@lci_l15(running);
-
-  universe.Interference(running);
-
-  label lci_l16:
-  assert a == b;
-  universe.lci@lci_l16(running);
-
-  universe.Interference(running);
-
-  label lci_l17:
-  guard.mutex.data.value := 42;
-  guard.mutex.data.nonvolatileVersion := BumpVersion(guard.mutex.data.nonvolatileVersion);
-  guard.nonvolatileVersion := BumpVersion(guard.nonvolatileVersion);
-  universe.lci@lci_l17(running);
-
-  universe.Interference(running);
-
-  // TODO: deallocate guard
-}
-
-// fn main() {
-//   let data = 0;
-//   let mutex = MutexGuard::new(data)
-//   client(mutex)
-// }
-
-method Main(universe: Universe, running: Thread)
-  requires universe.globalInv() && running in universe.content // or, universe.content == { running }
-  modifies universe, universe.content
-  decreases *
-  ensures universe.globalInv() && universe.baseLegalTransitionsSequence()
-{
-  universe.Interference(running);
-  assert {:split_here} true;
-
-  label lci_l1:
-  var data := new OwnedU32(universe, running, 0);
-  universe.lci@lci_l1(running);
-  assert {:split_here} true;
-
-  label lci_l2:
-  var mutex := new Mutex(universe, running, data);
-  universe.lci@lci_l2(running);
-  assert {:split_here} true;
-
-  // A method call is not a single atomic step.
-  SetData(universe, running, mutex);
-
-  universe.Interference(running);
-  assert {:split_here} true;
-}
diff --git a/Test/concurrency/12-MutexLifetime-short.dfy.expect b/Test/concurrency/12-MutexLifetime-short.dfy.expect
deleted file mode 100644
index 5762072e289..00000000000
--- a/Test/concurrency/12-MutexLifetime-short.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 202 verified, 0 errors
diff --git a/Test/contract-wrappers/AllExterns.dfy b/Test/contract-wrappers/AllExterns.dfy
deleted file mode 100644
index eeabf52dd95..00000000000
--- a/Test/contract-wrappers/AllExterns.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: ! %baredafny test %args --no-verify --unicode-char:false --test-assumptions=externs %s %s.externs.cs > %t
-// RUN: %diff "%s.expect" "%t"
-// RUN: %OutputCheck --file-to-check "%S/AllExterns.cs" "%s"
-// CHECK: .*Foo____dafny__checked\(x\).*
-// CHECK: .*Foo____dafny__checked\(new BigInteger\(3\)\).*
-// CHECK: .*Bar____dafny__checked\(x\).*
-// CHECK: .*Bar____dafny__checked\(new BigInteger\(3\)\).*
-include "Inputs/CheckExtern.dfy"
diff --git a/Test/contract-wrappers/Inputs/CheckExtern.dfy b/Test/contract-wrappers/Inputs/CheckExtern.dfy
deleted file mode 100644
index a947d4544f6..00000000000
--- a/Test/contract-wrappers/Inputs/CheckExtern.dfy
+++ /dev/null
@@ -1,77 +0,0 @@
-method {:extern} Foo(x: int) returns (y: int)
-  requires 1 < x < 10
-  ensures y >= 10
-
-method FooCaller(x: int) returns (y: int)
-  requires 1 < x < 10
-  ensures y >= 10
-{
-  y := Foo(x);
-}
-
-method {:test} FooTest()
-{
-  var y := Foo(3);
-  expect y == 30;
-}
-
-function {:extern} Bar(x: int, ghost z: int): (y: int)
-  requires 1 < x < 10
-  requires z > x
-  ensures y >= 10
-  ensures y > z
-
-function BarCaller(x: int): (y: int)
-  requires 1 < x < 10
-  ensures y >= 10
-{
-  Bar(x, 20)
-}
-
-method {:test} BarTest()
-{
-  var y := Bar(3, 20);
-  expect y == 30;
-}
-
-function {:extern} FunctionWithUnnamedResult(x: int): int 
-  requires x > 3
-  ensures x > 3
-
-method {:test} FunctionWithUnnamedResultTest()
-{
-  var y1 := FunctionWithUnnamedResult(4);
-  var y2 := FunctionWithUnnamedResult(3); // Fails
-  expect false;
-}
-
-function {:extern} GenFunction<T>(x: int, y: T): T
-  requires x > 3
-
-method {:test} GenFunctionTest()
-{
-  var y1 := GenFunction(4, 10);
-  var y2 := GenFunction(3, 10); // Fails
-  expect false;
-}
-
-method {:extern} GenMethod<T>(x: int, y: T) returns (z: T)
-  requires x > 3
-
-method {:test} GenMethodTest()
-{
-  var y1 := GenMethod(4, 10);
-  var y2 := GenMethod(3, 10); // Fails
-  expect false;
-}
-
-function {:extern} Baz(x: int): (y: int)
-  ensures y == x
-
-method {:test} BazTest()
-{
-  var y := Baz(3);
-  // An extra check just for fun. The auto-generated wrapper should
-  // already ensure that y == 3.
-  expect y != 7;
-}
diff --git a/Test/contract-wrappers/TestedExterns.dfy b/Test/contract-wrappers/TestedExterns.dfy
deleted file mode 100644
index c95887b5d2f..00000000000
--- a/Test/contract-wrappers/TestedExterns.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: ! %dafny /compile:4 /noVerify /runAllTests:1 /testContracts:TestedExterns %s %s.externs.cs > %t
-// RUN: %diff "%s.expect" "%t"
-// RUN: %OutputCheck --file-to-check "%S/TestedExterns.cs" "%s"
-// CHECK-NOT: .*Foo____dafny__checked\(x\).*
-// CHECK: .*Foo____dafny__checked\(new BigInteger\(3\)\).*
-// CHECK-NOT: .*Bar____dafny__checked\(x\).*
-// CHECK: .*Bar____dafny__checked\(new BigInteger\(3\)\).*
-include "Inputs/CheckExtern.dfy"
-
-method {:extern} NotCalled(x: int) returns (y: int)
-  ensures y != x
diff --git a/Test/contract-wrappers/TestedExterns.dfy.expect b/Test/contract-wrappers/TestedExterns.dfy.expect
deleted file mode 100644
index 489654892ad..00000000000
--- a/Test/contract-wrappers/TestedExterns.dfy.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-CheckExtern.dfy(20,13): Warning: The requires clause at this location cannot be compiled to be tested at runtime because it references ghost state.
-CheckExtern.dfy(22,12): Warning: The ensures clause at this location cannot be compiled to be tested at runtime because it references ghost state.
-
-Dafny program verifier did not attempt verification
-TestedExterns.dfy(10,17): Warning: No :test code calls NotCalled
-FooTest: FAILED
-	CheckExtern.dfy(3,12): Runtime failure of ensures clause from CheckExtern.dfy(3,12)
-BarTest: FAILED
-	CheckExtern.dfy(21,12): Runtime failure of ensures clause from CheckExtern.dfy(21,12)
-FunctionWithUnnamedResultTest: FAILED
-	CheckExtern.dfy(38,13): Runtime failure of requires clause from CheckExtern.dfy(38,13)
-GenFunctionTest: FAILED
-	CheckExtern.dfy(49,13): Runtime failure of requires clause from CheckExtern.dfy(49,13)
-GenMethodTest: FAILED
-	CheckExtern.dfy(59,13): Runtime failure of requires clause from CheckExtern.dfy(59,13)
-BazTest: PASSED
-[Program halted] TestedExterns.dfy(8,0): Test failures occurred: see above.
-
diff --git a/Test/dafny0/Array.dfy b/Test/dafny0/Array.dfy
deleted file mode 100644
index 4cc0d8ec8e9..00000000000
--- a/Test/dafny0/Array.dfy
+++ /dev/null
@@ -1,362 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class A {
-  method M() {
-    var y := new A?[100];
-    y[5] := null;
-  }
-
-  method N0() {
-    var a: array<int>;
-    if 5 < a.Length {
-      a[5] := 12;  // error: violates modifies clause
-    }
-  }
-
-  method N1(a: array?<int>)
-    modifies a
-  {
-    var b := a.Length;  // error: a may be null
-  }
-
-  method N2(a: array<int>)
-    modifies a
-  {
-    a[5] := 12;  // error: index may be outside bounds
-  }
-
-  method N3(a: array<int>)
-    requires 5 < a.Length
-    modifies a
-    ensures (forall i :: 0 <= i && i < a.Length ==> a[i] == old(a[i]) || (i == 5 && a[i] == 12))
-  {
-    a[5] := 12;  // all is good
-  }
-
-  var zz0: array<A?>
-  var zz1: array<B?>
-  method O() {
-    var zz2 := new A?[25];
-    assert zz2 != zz0;  // holds because zz2 is newly allocated
-    var o: object? := zz0;
-    assert this != o;  // holds because zz0 has a different type
-
-    if 2 <= zz0.Length && zz0.Length == zz1.Length {
-      o := zz1[1];
-      assert zz0[1] == o ==> o == null;  // holds because zz0 and zz1 have different element types
-    }
-
-    assert zz2[20] == null;  // error: no reason that this must hold
-  }
-
-  var x: array<int>
-  method P0()
-    modifies this
-  {
-    if 100 <= x.Length {
-      x[5] := 12;  // error: violates modifies clause
-    }
-  }
-  method P1()
-    modifies this`x
-  {
-    if 100 <= x.Length {
-      x[5] := 12;  // error: violates modifies clause
-    }
-  }
-  method P2()
-    modifies x
-  {
-    if 100 <= x.Length {
-      x[5] := 12;  // fine
-    }
-  }
-
-  method Q() {
-    var a := new int[5];
-    a[0],a[1],a[2],a[3],a[4] := 0,1,2,3,4;
-
-    assert [1,2,3,4] == a[1..];
-    assert [1,2,3,4] == a[1.. a.Length];
-    assert [1] == a[1..2];
-    assert [0,1] == a[..2];
-    assert [0,1] == a[0..2];
-    assert forall i :: 0 <= i <= a.Length ==> [] == a[i..i];
-    assert [0,1,2,3,4] == a[..];
-    assert forall i :: 0 <= i < a.Length ==> a[i] == i;
-  }
-
-  method ArrayToSequenceTests(a: array<int>, lo: int, hi: int)
-  {
-    if (a.Length == 10) {
-      var s;
-      s := a[2..5];
-      assert |s| == 3;
-      s := a[..5];
-      assert |s| == 5;
-      s := a[2..];
-      assert |s| == 8;
-      s := a[..];
-      assert |s| == 10;
-      s := a[..10] + a[0..];
-    } else {
-      if {
-        case 0 <= lo <= a.Length =>
-          var s := a[lo..] + a[..lo];
-        case 0 <= lo <= a.Length && 0 <= hi <= a.Length =>
-          var s := a[lo..hi];  // error: lo may be greater than hi
-        case true =>
-      }
-    }
-  }
-
-  ghost function BadRangeReads(a: array<int>, all: bool): bool
-  {
-    a.Length == 10 &&
-    if all then
-      a[..] == []  // error: not allowed to read the elements of a
-    else
-      a[2..5] +       // error: not allowed to read the elements of a
-      a[..5] +        // error: not allowed to read the elements of a
-      a[2..] == []    // error: not allowed to read the elements of a
-  }
-  ghost function GoodRangeReads(a: array<int>, all: bool): bool
-    reads a
-  {
-    a.Length == 10 &&
-    if all then
-      a[..] == []  // no prob, since we now have a reads clause
-    else
-      a[2..5] + a[..5] + a[2..] == []  // no prob, since we now have a reads clause
-  }
-  ghost function AnotherGoodRangeReads(a: array<int>, j: int): bool
-  {
-    0 <= j && j <= a.Length &&
-    a[j..j] == []
-  }
-
-  ghost predicate Q0(s: seq<int>)
-  ghost predicate Q1(s: seq<int>)
-  method FrameTest(a: array<int>) returns (b: array<int>)
-    requires Q0(a[..]);
-  {
-    b := CreateArray(a);
-    assert Q0(a[..]);  // this should still be known after the call to CreateArray
-    assert Q1(b[..]);
-  }
-  method CreateArray(a: array<int>) returns (b: array<int>)
-    ensures fresh(b) && Q1(b[..])
-}
-
-class B { }
-
-// -------------------------------
-
-class ArrayTests {
-  ghost function F0(a: array<int>): bool
-  {
-    10 <= a.Length &&
-    a[7] == 13  // error: reads on something outside reads clause
-  }
-
-  var b: array<int>;
-  ghost function F1(): bool
-    reads this
-  {
-    10 <= b.Length &&
-    b[7] == 13  // error: reads on something outside reads clause
-  }
-
-  ghost function F2(a: array<int>): bool
-    reads this, b, a
-  {
-    10 <= a.Length &&
-    a[7] == 13  // good
-    &&
-    10 <= b.Length &&
-    b[7] == 13  // good
-  }
-
-  method M0(a: array<int>)
-    requires 10 <= a.Length
-  {
-    a[7] := 13;  // error: updates location not in modifies clause
-  }
-
-  method M1()
-    requires 10 <= b.Length
-    modifies this
-  {
-    b[7] := 13;  // error: updates location not in modifies clause
-  }
-
-  method M2()
-    modifies this
-  {
-    var bb := new int[75];
-    b := bb;  // fine
-  }
-
-  method M3(a: array<int>)
-    requires 10 <= a.Length
-    requires 10 <= b.Length
-    modifies this, b, a
-  {
-    a[7] := 13;  // good
-    b[7] := 13;  // good
-  }
-}
-
-// -------------------- induction attribute --------------------------------
-
-ghost method Fill_I(s: seq<int>)
-  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
-  ensures forall i,j {:induction i} :: 0 <= i < j < |s| ==> s[i] <= s[j]
-{  // error: cannot prove postcondition
-}
-
-ghost method Fill_J(s: seq<int>)
-  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
-  ensures forall i,j {:induction j} :: 0 <= i < j < |s| ==> s[i] <= s[j]
-{
-}
-
-ghost method Fill_All(s: seq<int>)
-  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
-  ensures forall i,j {:induction i,j} :: 0 <= i < j < |s| ==> s[i] <= s[j]
-{
-}
-
-ghost method Fill_True(s: seq<int>)
-  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
-  ensures forall i,j {:induction} :: 0 <= i < j < |s| ==> s[i] <= s[j]
-{
-}
-
-ghost method Fill_False(s: seq<int>)
-  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
-  ensures forall i,j {:induction false} :: 0 <= i < j < |s| ==> s[i] <= s[j]
-{  // error: cannot prove postcondition
-}
-
-ghost method Fill_None(s: seq<int>)
-  requires forall i :: 1 <= i < |s| ==> s[i-1] <= s[i]
-  ensures forall i,j :: 0 <= i < j < |s| ==> s[i] <= s[j]
-{  // error: cannot prove postcondition
-}
-
-// -------------- some regression tests; there was a time when array-element LHSs of calls were not translated correctly
-
-method Test_ArrayElementLhsOfCall(a: array<nat>, i: int, c: Cdefg<nat>) returns (x: int)
-  modifies a, c
-{
-  if 0 <= i < a.Length {
-    a[i] := x;  // error: subrange check is applied and it cannot be verified
-    a[i] := Test_ArrayElementLhsOfCall(a, i-1, c);  // this line used to crash Dafny
-    c.t := x-1;  // error: subrange check is applied and it cannot be verified
-    c.t := Test_ArrayElementLhsOfCall(a, i-1, c);  // this line used to crash Dafny
-    var n: nat;
-    n := Test_ArrayElementLhsOfCall(a, i-1, c);  // error: subrange check is applied and it cannot be verified
-  }
-}
-
-class Cdefg<T> {
-  var t: T
-  constructor (t: T) {
-    this.t := t;
-  }
-}
-
-// ---------- allocation business -----------
-
-class MyClass {
-  ghost var Repr: set<object>
-  ghost predicate Valid()
-    reads this, Repr
-}
-
-method AllocationBusiness0(a: array<MyClass>, j: int)
-  requires 0 <= j < a.Length
-{
-  var c := new MyClass;
-  assert c !in a[j].Repr;  // the proof requires allocation axioms for arrays
-}
-
-method AllocationBusiness1(a: array<MyClass>, j: int)
-  requires 0 <= j < a.Length
-  requires a[j].Valid()
-{
-  var c := new MyClass;
-  assert a[j].Valid();  // the allocation should not have invalidated the validity of a[j]
-}
-
-method AllocationBusiness2(a: array2<MyClass>, i: int, j: int)
-  requires 0 <= i < a.Length0 && 0 <= j < a.Length1
-{
-  var c := new MyClass;
-  assert c !in a[i,j].Repr;  // the proof requires allocation axioms for multi-dim arrays
-}
-
-// ------- a regression test, testing that dtype is set correctly after allocation ------
-
-module DtypeRegression {
-  ghost predicate array_equal(a: array<int>, b: array<int>)
-    reads a, b
-  {
-    a[..] == b[..]
-  }
-
-  method duplicate_array(input: array<int>, len: int) returns (output: array<int>)
-    requires len == input.Length
-    ensures array_equal(input, output)
-  {
-    output := new int[len];
-    var i := 0;
-    while i < len
-      invariant 0 <= i <= len;
-      invariant forall j :: 0 <= j < i ==> output[j] == input[j];
-    {
-      output[i] := input[i];
-      i := i + 1;
-    }
-  }
-}
-
-// ------- :| -------
-
-class AssignSuchThat {
-  var x: int
-
-  method P() {
-    x :| assume x == 10;  // error: P is not allowed to modify "this"
-  }
-
-  method Q0(a: array<int>)
-    requires a.Length == 50
-  {
-    a[22] :| assume a[22] == 12;  // error: Q0 is not allowed to modify "a"
-    assert a[22] == 12;
-  }
-  method Q1(a: array<int>)
-    requires a.Length == 50
-    modifies a
-  {
-    a[22] :| assume a[22] == 12;
-    assert a[22] == 12;
-  }
-  method Q2(a: array<int>)
-    requires a.Length == 50
-    modifies a
-  {
-    a[22] :| assume a[22] == 12;
-    assert a[22] == 0;  // error: a[22] is not 0
-  }
-  method R(that: AssignSuchThat)
-    modifies this, that
-  {
-    this.x, that.x :| assume this.x == 5 && that.x == 5;  // error: duplicate LHSs (no regard to same final values in :| statements)
-  }
-}
-
-// WISH: autoTriggers disabled because of induction
diff --git a/Test/dafny0/Array.dfy.expect b/Test/dafny0/Array.dfy.expect
deleted file mode 100644
index 6e3595d6bad..00000000000
--- a/Test/dafny0/Array.dfy.expect
+++ /dev/null
@@ -1,32 +0,0 @@
-Array.dfy(216,0): Error: a postcondition could not be proved on this return path
-Array.dfy(215,10): Related location: this is the postcondition that could not be proved
-Array.dfy(240,0): Error: a postcondition could not be proved on this return path
-Array.dfy(239,10): Related location: this is the postcondition that could not be proved
-Array.dfy(246,0): Error: a postcondition could not be proved on this return path
-Array.dfy(245,10): Related location: this is the postcondition that could not be proved
-Array.dfy(255,12): Error: value does not satisfy the subset constraints of 'nat'
-Array.dfy(256,5): Error: value does not satisfy the subset constraints of 'nat'
-Array.dfy(257,12): Error: value does not satisfy the subset constraints of 'nat'
-Array.dfy(258,6): Error: value does not satisfy the subset constraints of 'nat'
-Array.dfy(260,4): Error: value does not satisfy the subset constraints of 'nat'
-Array.dfy(13,7): Error: assignment might update an array element not in the enclosing context's modifies clause
-Array.dfy(20,15): Error: target object might be null
-Array.dfy(26,5): Error: index out of range
-Array.dfy(50,19): Error: assertion could not be proved
-Array.dfy(58,7): Error: assignment might update an array element not in the enclosing context's modifies clause
-Array.dfy(65,7): Error: assignment might update an array element not in the enclosing context's modifies clause
-Array.dfy(108,20): Error: upper bound below lower bound or above length of array
-Array.dfy(118,7): Error: insufficient reads clause to read the indicated range of array elements
-Array.dfy(120,7): Error: insufficient reads clause to read the indicated range of array elements
-Array.dfy(121,7): Error: insufficient reads clause to read the indicated range of array elements
-Array.dfy(122,7): Error: insufficient reads clause to read the indicated range of array elements
-Array.dfy(160,5): Error: insufficient reads clause to read array element
-Array.dfy(168,5): Error: insufficient reads clause to read array element
-Array.dfy(184,5): Error: assignment might update an array element not in the enclosing context's modifies clause
-Array.dfy(191,5): Error: assignment might update an array element not in the enclosing context's modifies clause
-Array.dfy(332,4): Error: assignment might update an object not in the enclosing context's modifies clause
-Array.dfy(338,5): Error: assignment might update an array element not in the enclosing context's modifies clause
-Array.dfy(353,17): Error: assertion could not be proved
-Array.dfy(358,17): Error: left-hand sides that.x and this.x might refer to the same location
-
-Dafny program verifier finished with 41 verified, 27 errors
diff --git a/Test/dafny0/ArrayElementInitCompile.dfy.expect b/Test/dafny0/ArrayElementInitCompile.dfy.expect
deleted file mode 100644
index eaa3e759999..00000000000
--- a/Test/dafny0/ArrayElementInitCompile.dfy.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-67 67 67 67 67 67 67 67 
-0 1 2 3 
-1 2 3 4 
-2 3 4 5 
-3 4 5 6 
-4 5 6 7 
-O . O . O . O . O . O . 
-12 12 12 12 12 12 12 12 12 12 12 12 
-D E
-y z
-4 3
-7
-100 75 98 25 
-
-looks like this rocks 
--2 -1 0 1 2 3 4 
diff --git a/Test/dafny0/AsIs.dfy.expect b/Test/dafny0/AsIs.dfy.expect
deleted file mode 100644
index c9bd3d718ae..00000000000
--- a/Test/dafny0/AsIs.dfy.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-AsIs.dfy(60,27): Error: value of expression (of type 'object') is not known to be an instance of type 'K<W>'
-AsIs.dfy(62,15): Error: value of expression (of type 'object') is not known to be an instance of type 'B<real, W>'
-AsIs.dfy(64,15): Error: value of expression (of type 'object') is not known to be an instance of type 'B<W, int>'
-AsIs.dfy(66,25): Error: value of expression (of type 'object') is not known to be an instance of type 'B<int, int>'
-AsIs.dfy(68,15): Error: value of expression (of type 'object') is not known to be an instance of type 'A<W>'
-AsIs.dfy(119,13): Error: assertion could not be proved
-AsIs.dfy(123,14): Error: assertion could not be proved
-AsIs.dfy(128,14): Error: assertion could not be proved
-AsIs.dfy(139,15): Error: assertion could not be proved
-AsIs.dfy(143,15): Error: assertion could not be proved
-AsIs.dfy(148,15): Error: assertion could not be proved
-
-Dafny program verifier finished with 7 verified, 11 errors
diff --git a/Test/dafny0/AssertBy.dfy b/Test/dafny0/AssertBy.dfy
deleted file mode 100644
index 3b5c1ab6804..00000000000
--- a/Test/dafny0/AssertBy.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %exits-with 4 %dafny /env:0 /dprint:- "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method M0(x: int, y: int)
-{
-  assert x == 6;  // error
-  assert y == 8;  // error
-}
-
-method M1(x: int, y: int)
-{
-  assert x == 6 by {
-    assume x == 6;  // that was easy
-    assume y == 8;  // hey, why not assume some more while we're at it
-  }
-  assert y == 8;  // error (yes, still -- the previous assumption should not be in effect here)
-}
diff --git a/Test/dafny0/AssertBy.dfy.expect b/Test/dafny0/AssertBy.dfy.expect
deleted file mode 100644
index b864151f301..00000000000
--- a/Test/dafny0/AssertBy.dfy.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-// AssertBy.dfy
-
-method M0(x: int, y: int)
-{
-  assert x == 6;
-  assert y == 8;
-}
-
-method M1(x: int, y: int)
-{
-  assert x == 6 by {
-    assume x == 6;
-    assume y == 8;
-  }
-  assert y == 8;
-}
-AssertBy.dfy(6,11): Error: assertion could not be proved
-AssertBy.dfy(7,11): Error: assertion could not be proved
-AssertBy.dfy(16,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/dafny0/AttributeChecks.dfy.expect b/Test/dafny0/AttributeChecks.dfy.expect
deleted file mode 100644
index 549a326ce71..00000000000
--- a/Test/dafny0/AttributeChecks.dfy.expect
+++ /dev/null
@@ -1,646 +0,0 @@
-// AttributeChecks.dfy
-
-
-module JustAboutEverything {
-  method If(n: int) returns (k: int)
-  {
-    var i := 0;
-    if {:split true} i < n {
-      if {:split 1 + 0} true {
-      }
-    } else if {:split false} i > n {
-    } else {:split true} {
-    }
-  }
-
-  method IfAlt(n: int) returns (k: int)
-  {
-    var i := 0;
-    if {:split true}
-    case {:split 1 + true} i < n =>
-      if {:split 1 + k} true {
-      }
-    case {:split false} i > n =>
-      {
-      }
-      return 2;
-  }
-
-  method While(n: int) returns (k: int)
-  {
-    var f: int -> int := x => x;
-    var i := 0;
-    while {:split true} {:split true + k} i < n
-      invariant forall u :: f(u) == u + i
-    {
-    }
-    return 2;
-  }
-
-  method WhileAlt(n: int) returns (k: int)
-  {
-    var i := 0;
-    var f: int -> int := x => x;
-    while {:split}
-      invariant forall u :: f(u) == u + i
-    {
-      case {:split 1 + true} i < n =>
-        {
-        }
-      case {:split false} i > n =>
-        return 2;
-    }
-  }
-
-  method Match(xs: List<int>) returns (r: int)
-  {
-    match {:split 1} xs {
-      case {:split false} Cons(y, z) =>
-        return y;
-      case {:split 1 + false} Nil =>
-        return 0;
-    }
-  }
-
-  function CaseExpr(r: List<int>): List<int>
-  {
-    match r {
-      case Nil =>
-        Nil
-    }
-  }
-
-  method Calc(x: int, y: int)
-  {
-    calc {:split 1} {:split 1 + false} {
-      x + y;
-      {
-        assume x == 0;
-      }
-      y;
-    }
-    assert x == 0;
-  }
-
-  method ForAll(i: int, j: int, arr: array2<int>)
-  {
-    forall i, j {:split 1 + false} {:split i + j} | i in {-3, 4} && j in {1, 2} {
-      arr[i, j] := 0;
-    }
-  }
-
-  method AssertBy(x: int, y: int)
-  {
-    assert {:split false + x} {:split} x == 6 by {
-      assume x == 6;
-      assume y == 8;
-    }
-    assert {:split} y == 8;
-  }
-
-  method For(lo: int, hi: int) returns (k: int)
-    requires lo <= hi
-  {
-    var f: int -> int := x => x;
-    for {:split i} {:split true + k} i := lo to hi
-      invariant forall u :: f(u) == u + i
-    {
-    }
-    return 2;
-  }
-
-  ghost function FAttr(x: int): int
-    requires {:myAttr false + 3} true
-    ensures {:myAttr false + 3} true
-    decreases {:myAttr false + 3} x
-  {
-    10
-  }
-
-  ghost function GAttr(x: int): int
-    requires {:myAttr old(3)} true
-    ensures {:myAttr old(3)} true
-    decreases {:myAttr old(3)} x
-  {
-    10
-  }
-
-  ghost function HAttr(x: int): (r: int)
-    requires {:myAttr x, r} true
-    ensures {:myAttr x, r} true
-    decreases {:myAttr x, r} x
-  {
-    10
-  }
-
-  twostate function F2Attr(x: int): int
-    requires {:myAttr false + 3} true
-    ensures {:myAttr false + 3} true
-    decreases {:myAttr false + 3} x
-  {
-    10
-  }
-
-  twostate function G2Attr(x: int): int
-    requires {:myAttr old(3)} true
-    ensures {:myAttr old(3)} true
-    decreases {:myAttr old(3)} x
-  {
-    10
-  }
-
-  twostate function H2Attr(x: int): (r: int)
-    requires {:myAttr x, r} true
-    ensures {:myAttr x, r} true
-    decreases {:myAttr x, r} x
-  {
-    10
-  }
-
-  method MAttr(x: int) returns (y: int)
-    requires {:myAttr false + 3} true
-    modifies {:myAttr false + 3} {}
-    ensures {:myAttr false + 3} true
-    decreases {:myAttr false + 3} x
-  {
-  }
-
-  method NAttr(x: int) returns (y: int)
-    requires {:myAttr old(3)} true
-    modifies {:myAttr old(3)} {}
-    ensures {:myAttr old(3)} true
-    decreases {:myAttr old(3)} x
-  {
-  }
-
-  method OAttr(x: int) returns (y: int)
-    requires {:myAttr x, y} true
-    modifies {:myAttr x, y} {}
-    ensures {:myAttr x, y} true
-    decreases {:myAttr x, y} x
-  {
-  }
-
-  twostate lemma M2Attr(x: int) returns (y: int)
-    requires {:myAttr false + 3} true
-    modifies {:myAttr false + 3} {}
-    ensures {:myAttr false + 3} true
-    decreases {:myAttr false + 3} x
-  {
-  }
-
-  twostate lemma N2Attr(x: int) returns (y: int)
-    requires {:myAttr old(3)} true
-    modifies {:myAttr old(3)} {}
-    ensures {:myAttr old(3)} true
-    decreases {:myAttr old(3)} x
-  {
-  }
-
-  twostate lemma O2Attr(x: int) returns (y: int)
-    requires {:myAttr x, y} true
-    modifies {:myAttr x, y} {}
-    ensures {:myAttr x, y} true
-    decreases {:myAttr x, y} x
-  {
-  }
-
-  method ModifyStatement(s: set<object>)
-  {
-    modify {:myAttr false + 3} s;
-  }
-
-  method LocalVariablesAndAssignments(opt: Option<int>, mustHave: MustHave<int>) returns (r: Option<int>)
-  {
-    var {:boolAttr false + 3} a: int, {:boolAttr false + 3} b: int;
-    var x, y := 10 {:boolAttr false + 3}, 20 {:boolAttr false + 3};
-    x, y := 10 {:boolAttr false + 3}, 20 {:boolAttr false + 3};
-    var {:boolAttr false + 3} u0 := If(13);
-    var u1 := If(13) {:boolAttr false + 3};
-    u1 := If(13) {:boolAttr false + 3};
-    var {:boolAttr false + 3} k0: int := *;
-    var k1: int := * {:boolAttr false + 3};
-    k1 := * {:boolAttr false + 3};
-    var {:boolAttr false + 3} c0 := new CClass;
-    var c1 := new CClass {:boolAttr false + 3};
-    c1 := new CClass {:boolAttr false + 3};
-    var {:boolAttr false + 3} d0 := new DClass();
-    var d1 := new DClass() {:boolAttr false + 3};
-    d1 := new DClass() {:boolAttr false + 3};
-    var s := {101};
-    var {:boolAttr false + 3} w0 :| w0 in s;
-    var {:boolAttr false + 3} w1, {:boolAttr false + 3} w2 :| w1 in s && w2 in s;
-    w1, w2 :| assume {:boolAttr false + 3} w1 in s && w2 in s;
-    var {:boolAttr false + 3} f0 :- opt;
-    var {:boolAttr false + 3} f1, {:boolAttr false + 3} f2 :- opt, true;
-    var {:boolAttr false + 3} f3 :- GiveOption();
-    var {:boolAttr false + 3} f4, {:boolAttr false + 3} f5 :- GiveOptions();
-    var g0 :- opt {:boolAttr false + 3};
-    var g1, g2 :- opt {:boolAttr false + 3}, true {:boolAttr false + 3};
-    var g3, g4, g5 :- opt {:boolAttr false + 3}, true {:boolAttr false + 4}, true {:boolAttr false + 5};
-    var g6 :- GiveOption() {:boolAttr false + 3};
-    var g7, g8 :- GiveOptions() {:boolAttr false + 3};
-    :- mustHave {:boolAttr false + 3};
-    :- GiveMustHave() {:boolAttr false + 3};
-    var p0 :- assert {:boolAttr false + 3} opt;
-    var p1 :- assume {:boolAttr false + 3} opt;
-    var p2 :- expect {:boolAttr false + 3} opt;
-    p0 :- assert {:boolAttr false + 3} opt;
-    p1 :- assume {:boolAttr false + 3} opt;
-    p2 :- expect {:boolAttr false + 3} opt;
-    var q0 :- assert {:boolAttr false + 3} GiveOption();
-    var q1 :- assume {:boolAttr false + 3} GiveOption();
-    var q2 :- expect {:boolAttr false + 3} GiveOption();
-    q0 :- assert {:boolAttr false + 3} GiveOption();
-    q1 :- assume {:boolAttr false + 3} GiveOption();
-    q2 :- expect {:boolAttr false + 3} GiveOption();
-    var i := var a, b {:boolAttr false + 3} :| a == 0 && b == 1; 100;
-  }
-
-  ghost function ExtendedPrintExpr(): int
-  {
-    var a, b {:boolAttr false + 3} :| a == 0 && b == 1;
-    100
-  }
-
-  method GiveOption() returns (r: Option<int>)
-
-  method GiveOptions() returns (r: Option<int>, s: int)
-
-  method GiveMustHave() returns (r: MustHave<int>)
-
-  datatype List<T> = Nil | Cons(hd: T, tl: List<T>)
-
-  datatype {:dt 0} {:dt false + 3} Datatype = {:dt k, this} Blue | {:dt 50} Green
-
-  datatype {:dt 0} {:dt false + 3} AnotherDatatype = {:dt 50} Blue | {:dt k, this} Green
-
-  iterator Iter(x: int) yields (y: int)
-    requires {:myAttr false + 3} true
-    modifies {:myAttr false + 3} {}
-    yield requires {:myAttr false + 3} true
-    yield ensures {:myAttr false + 3} true
-    ensures {:myAttr false + 3} true
-    decreases {:myAttr false + 3} x
-  {
-  }
-
-  iterator Jter(x: int) yields (y: int)
-    requires {:myAttr old(3)} true
-    modifies {:myAttr old(3)} {}
-    yield requires {:myAttr old(3)} true
-    yield ensures {:myAttr old(3)} true
-    ensures {:myAttr old(3)} true
-    decreases {:myAttr old(3)} x
-  {
-  }
-
-  iterator Kter(x: int) yields (y: int)
-    requires {:myAttr x, y, ys} true
-    modifies {:myAttr x, y, ys} {}
-    yield requires {:myAttr x, y, ys} true
-    yield ensures {:myAttr x, y, ys} true
-    ensures {:myAttr x, y, ys} true
-    decreases {:myAttr x, y, ys} x
-  {
-  }
-
-  class CClass { }
-
-  class DClass {
-    constructor ()
-    {
-    }
-  }
-
-  datatype Option<+T> = None | Some(value: T) {
-    predicate IsFailure()
-    {
-      None?
-    }
-
-    function PropagateFailure<U>(): Option<U>
-      requires None?
-    {
-      None
-    }
-
-    function Extract(): T
-      requires Some?
-    {
-      value
-    }
-  }
-
-  datatype MustHave<+T> = HasIt | DoesNotHave(value: T) {
-    predicate IsFailure()
-    {
-      DoesNotHave?
-    }
-
-    function PropagateFailure(): Option<T>
-      requires DoesNotHave?
-    {
-      None
-    }
-  }
-}
-
-module {:myAttr false + 3} {:myAttr old(3)} {:myAttr k} Modu {
-}
-
-module TwoStateAttributes {
-  class C {
-    var data: int
-
-    ghost function {:myAttr old(data), x, r} F(x: int): (r: int)
-
-    twostate function {:myAttr old(data), x, r} F2(x: int): (r: int)
-
-    lemma {:myAttr old(data), x, y} L(x: int) returns (y: int)
-
-    twostate lemma {:myAttr old(data), x, y} L2(x: int) returns (y: int)
-
-    method {:myAttr old(data), x, y} M(x: int) returns (y: int)
-
-    least predicate {:myAttr old(data), x} LP(x: int)
-
-    least lemma {:myAttr old(data), x} LL(x: int)
-  }
-}
-
-module TopLevelAttributes {
-  iterator {:myAttr x} {:myAttr y} {:myAttr this} {:myAttr ys} {:myAttr old(arr[0])} Iterator(x: int, arr: array<int>) yields (y: int)
-    requires arr.Length != 0
-
-  type {:myAttr this} {:myAttr N} Opaque {
-    const N: int
-  }
-
-  type {:myAttr this} Subset = x: int
-    | true
-
-  type {:myAttr this} Synonym = int
-
-  newtype {:myAttr this} {:myAttr N} Newtype = x: int
-    | true
-  {
-    const N: int
-  }
-
-  trait {:myAttr this} {:myAttr x} Trait {
-    var x: int
-  }
-
-  class {:myAttr this} {:myAttr x} Class {
-    var x: int
-  }
-
-  datatype {:myAttr this} {:myAttr Ctor?} {:myAttr y} {:myAttr N} Datatype = Ctor(y: int) {
-    const N: int
-  }
-
-  codatatype {:myAttr this} {:myAttr Ctor?} {:myAttr y} {:myAttr N} CoDatatype = Ctor(y: int) {
-    const N: int
-  }
-}
-
-module TopLevelAttributesModule {
-
-  module {:myAttr this} Module {
-  }
-}
-AttributeChecks.dfy(19,19): Error: type of left argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(19,19): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(29,37): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(29,37): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(43,21): Error: type of left argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(43,21): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(53,21): Error: type of left argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(53,21): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(68,30): Error: type of left argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(68,30): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(78,27): Error: type of left argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(78,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(85,25): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(85,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(96,32): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(96,32): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(110,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(111,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(112,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(110,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(111,27): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(112,29): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(118,22): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(119,21): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(120,23): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(126,25): Error: unresolved identifier: r
-AttributeChecks.dfy(128,26): Error: unresolved identifier: r
-AttributeChecks.dfy(134,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(135,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(136,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(134,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(135,27): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(136,29): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(150,25): Error: unresolved identifier: r
-AttributeChecks.dfy(152,26): Error: unresolved identifier: r
-AttributeChecks.dfy(158,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(159,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(161,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(160,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(158,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(159,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(161,29): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(160,27): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(166,22): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(167,22): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(169,23): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(174,25): Error: unresolved identifier: y
-AttributeChecks.dfy(175,25): Error: unresolved identifier: y
-AttributeChecks.dfy(177,26): Error: unresolved identifier: y
-AttributeChecks.dfy(183,33): Error: twostate lemmas are not allowed to have modifies clauses
-AttributeChecks.dfy(182,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(183,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(185,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(184,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(182,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(183,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(185,29): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(184,27): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(191,22): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(191,30): Error: twostate lemmas are not allowed to have modifies clauses
-AttributeChecks.dfy(193,23): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(198,25): Error: unresolved identifier: y
-AttributeChecks.dfy(199,25): Error: unresolved identifier: y
-AttributeChecks.dfy(199,28): Error: twostate lemmas are not allowed to have modifies clauses
-AttributeChecks.dfy(201,26): Error: unresolved identifier: y
-AttributeChecks.dfy(236,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(236,26): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(242,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(243,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(247,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(248,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(250,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(251,26): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(254,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(255,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(256,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(259,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(260,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(261,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(264,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(265,42): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(266,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(267,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(268,44): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(269,40): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(273,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(275,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(276,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(280,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(283,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(285,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(286,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(289,25): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(291,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(292,23): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(296,35): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(298,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(299,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(301,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(302,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(303,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(305,44): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(306,49): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(308,33): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(309,39): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(312,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(313,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(314,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(315,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(316,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(317,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(320,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(321,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(322,38): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(323,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(324,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(325,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(329,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(242,23): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(243,23): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(247,26): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(248,26): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(250,26): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(251,26): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(254,25): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(255,38): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(256,34): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(259,25): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(260,38): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(261,29): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(264,25): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(265,42): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(266,38): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(267,25): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(268,44): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(269,40): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(273,25): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(275,23): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(276,23): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(280,38): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(283,25): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(285,23): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(286,23): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(289,25): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(291,23): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(292,23): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(296,35): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(298,27): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(299,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(301,27): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(302,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(303,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(305,44): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(306,49): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(308,33): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(309,39): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(312,38): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(313,38): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(314,38): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(315,34): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(316,34): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(317,34): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(320,38): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(321,38): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(322,38): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(323,34): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(324,34): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(325,34): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(329,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(335,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(335,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(104,9): Error: unresolved identifier: k
-AttributeChecks.dfy(104,12): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(103,30): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(103,30): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(107,27): Error: unresolved identifier: k
-AttributeChecks.dfy(107,30): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(106,30): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(106,30): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(211,29): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(208,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(206,28): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(207,34): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(209,33): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(210,27): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(211,29): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(208,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(206,28): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(207,34): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(209,33): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(210,27): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(221,23): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(218,22): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(216,22): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(217,28): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(231,26): Error: unresolved identifier: y
-AttributeChecks.dfy(231,29): Error: unresolved identifier: ys
-AttributeChecks.dfy(228,25): Error: unresolved identifier: y
-AttributeChecks.dfy(228,28): Error: unresolved identifier: ys
-AttributeChecks.dfy(226,25): Error: unresolved identifier: y
-AttributeChecks.dfy(226,28): Error: unresolved identifier: ys
-AttributeChecks.dfy(380,11): Error: unresolved identifier: k
-AttributeChecks.dfy(379,11): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(378,17): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-AttributeChecks.dfy(378,17): Error: type of right argument to + (int) must agree with the result type (bool)
-AttributeChecks.dfy(389,28): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(393,19): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(397,20): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(399,29): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(401,25): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(414,13): Error: old expressions are not allowed in this context
-AttributeChecks.dfy(413,13): Error: unresolved identifier: ys
-AttributeChecks.dfy(412,13): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(411,13): Error: unresolved identifier: y
-AttributeChecks.dfy(422,13): Error: unresolved identifier: N
-AttributeChecks.dfy(421,13): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(430,16): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(434,16): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(440,13): Error: unresolved identifier: N
-AttributeChecks.dfy(439,13): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(450,13): Error: unresolved identifier: x
-AttributeChecks.dfy(449,13): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(460,13): Error: unresolved identifier: x
-AttributeChecks.dfy(459,13): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(472,13): Error: unresolved identifier: N
-AttributeChecks.dfy(471,13): Error: unresolved identifier: y
-AttributeChecks.dfy(470,13): Error: unresolved identifier: Ctor?
-AttributeChecks.dfy(469,13): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(484,13): Error: unresolved identifier: N
-AttributeChecks.dfy(483,13): Error: unresolved identifier: y
-AttributeChecks.dfy(482,13): Error: unresolved identifier: Ctor?
-AttributeChecks.dfy(481,13): Error: 'this' is not allowed in a 'static' context
-AttributeChecks.dfy(494,18): Error: 'this' is not allowed in a 'static' context
-233 resolution/type errors detected in AttributeChecks.dfy
diff --git a/Test/dafny0/AutoReq.dfy.expect b/Test/dafny0/AutoReq.dfy.expect
deleted file mode 100644
index c985167c4a2..00000000000
--- a/Test/dafny0/AutoReq.dfy.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-AutoReq.dfy(247,4): Error: function precondition could not be proved
-AutoReq.dfy(239,13): Related location
-AutoReq.dfy(13,2): Error: function precondition could not be proved
-AutoReq.dfy(5,13): Related location
-AutoReq.dfy(25,2): Error: function precondition could not be proved
-AutoReq.dfy(5,13): Related location
-AutoReq.dfy(38,11): Error: assertion could not be proved
-AutoReq.dfy(31,12): Related location
-AutoReq.dfy(7,4): Related location
-AutoReq.dfy(38,11): Error: function precondition could not be proved
-AutoReq.dfy(5,13): Related location
-AutoReq.dfy(40,11): Error: assertion could not be proved
-AutoReq.dfy(31,26): Related location
-AutoReq.dfy(7,4): Related location
-AutoReq.dfy(40,11): Error: function precondition could not be proved
-AutoReq.dfy(5,13): Related location
-AutoReq.dfy(45,11): Error: assertion could not be proved
-AutoReq.dfy(31,12): Related location
-AutoReq.dfy(7,4): Related location
-
-Dafny program verifier finished with 30 verified, 8 errors
diff --git a/Test/dafny0/Backticks.dfy.expect b/Test/dafny0/Backticks.dfy.expect
deleted file mode 100644
index a9e311a972b..00000000000
--- a/Test/dafny0/Backticks.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-Backticks.dfy(38,4): Error: insufficient reads clause to invoke function
-Backticks.dfy(77,7): Error: call might violate context's modifies clause
-
-Dafny program verifier finished with 12 verified, 2 errors
diff --git a/Test/dafny0/BadFunction.dfy.expect b/Test/dafny0/BadFunction.dfy.expect
deleted file mode 100644
index da64c408849..00000000000
--- a/Test/dafny0/BadFunction.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-BadFunction.dfy(9,2): Error: decreases clause might not decrease
-
-Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/dafny0/Basics.dfy.expect b/Test/dafny0/Basics.dfy.expect
deleted file mode 100644
index a255d775f07..00000000000
--- a/Test/dafny0/Basics.dfy.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-Basics.dfy(623,17): Error: result of operation might violate newtype constraint for 'int8'
-Basics.dfy(45,13): Error: assertion could not be proved
-Basics.dfy(69,41): Error: assertion could not be proved
-Basics.dfy(93,13): Error: assertion could not be proved
-Basics.dfy(99,13): Error: assertion could not be proved
-Basics.dfy(112,27): Error: target object might be null
-Basics.dfy(114,13): Error: target object might be null
-Basics.dfy(148,15): Error: assertion could not be proved
-Basics.dfy(167,9): Error: when left-hand sides a[b[18]] and a[4] refer to the same location, they must be assigned the same value
-Basics.dfy(183,9): Error: when left-hand sides x.f and y.f refer to the same location, they must be assigned the same value
-Basics.dfy(195,18): Error: assertion could not be proved
-Basics.dfy(197,9): Error: assignment might update an object not in the enclosing context's modifies clause
-Basics.dfy(197,9): Error: target object might be null
-Basics.dfy(202,11): Error: left-hand sides m.x and m.x might refer to the same location
-Basics.dfy(213,14): Error: assertion could not be proved
-Basics.dfy(273,9): Error: when left-hand sides d.x and c.x refer to the same location, they must be assigned the same value
-Basics.dfy(463,11): Error: assertion could not be proved
-Basics.dfy(474,18): Error: assertion could not be proved
-Basics.dfy(476,11): Error: assertion could not be proved
-Basics.dfy(13,13): Error: variable 'g', which is subject to definite-assignment rules, might be uninitialized here
-
-Dafny program verifier finished with 48 verified, 20 errors
diff --git a/Test/dafny0/BitvectorResolution.dfy.expect b/Test/dafny0/BitvectorResolution.dfy.expect
deleted file mode 100644
index 257b30e428b..00000000000
--- a/Test/dafny0/BitvectorResolution.dfy.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-BitvectorResolution.dfy(9,13): Error: literal (5000) is too large for the bitvector type bv1
-BitvectorResolution.dfy(15,9): Error: literal (1) is too large for the bitvector type bv0
-BitvectorResolution.dfy(18,9): Error: literal (4294967296) is too large for the bitvector type bv32
-BitvectorResolution.dfy(24,12): Error: literal (1) is too large for the bitvector type bv0
-BitvectorResolution.dfy(35,6): Error: RHS (of type bv67) not assignable to LHS (of type int)
-BitvectorResolution.dfy(36,6): Error: RHS (of type bv67) not assignable to LHS (of type int)
-BitvectorResolution.dfy(38,6): Error: RHS (of type bv67) not assignable to LHS (of type int)
-BitvectorResolution.dfy(39,6): Error: RHS (of type bv67) not assignable to LHS (of type int)
-BitvectorResolution.dfy(40,15): Error: type of right argument to << (real) must be an integer-numeric or bitvector type
-BitvectorResolution.dfy(41,15): Error: type of right argument to << (SmallReal) must be an integer-numeric or bitvector type
-BitvectorResolution.dfy(42,25): Error: incorrect argument type for function parameter 'w' (expected nat, found real)
-BitvectorResolution.dfy(43,25): Error: incorrect argument type for function parameter 'w' (expected nat, found SmallReal)
-BitvectorResolution.dfy(94,10): Warning: /!\ No terms found to trigger on.
-BitvectorResolution.dfy(95,10): Warning: /!\ No terms found to trigger on.
-BitvectorResolution.dfy(96,10): Warning: /!\ No terms found to trigger on.
-BitvectorResolution.dfy(98,14): Warning: /!\ No terms found to trigger on.
-BitvectorResolution.dfy(99,14): Warning: /!\ No terms found to trigger on.
-BitvectorResolution.dfy(100,14): Warning: /!\ No terms found to trigger on.
-BitvectorResolution.dfy(110,19): Error: the type of this expression is underspecified
-13 resolution/type errors detected in BitvectorResolution.dfy
diff --git a/Test/dafny0/ByMethod.dfy.expect b/Test/dafny0/ByMethod.dfy.expect
deleted file mode 100644
index e689e63ba8b..00000000000
--- a/Test/dafny0/ByMethod.dfy.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-ByMethod.dfy(38,18): Error: this invariant could not be proved to be maintained by the loop
-ByMethod.dfy(38,18): Related message: loop invariant violation
-ByMethod.dfy(42,4): Error: a postcondition could not be proved on this return path
-ByMethod.dfy(35,4): Related location: this is the postcondition that could not be proved
-ByMethod.dfy(47,11): Error: a postcondition could not be proved on this return path
-ByMethod.dfy(48,12): Related location: this is the postcondition that could not be proved
-ByMethod.dfy(55,11): Error: a postcondition could not be proved on this return path
-ByMethod.dfy(56,12): Related location: this is the postcondition that could not be proved
-ByMethod.dfy(60,4): Error: a postcondition could not be proved on this return path
-ByMethod.dfy(59,4): Related location: this is the postcondition that could not be proved
-ByMethod.dfy(63,12): Error: a postcondition could not be proved on this return path
-ByMethod.dfy(64,27): Related location: this is the postcondition that could not be proved
-ByMethod.dfy(68,4): Error: a postcondition could not be proved on this return path
-ByMethod.dfy(67,4): Related location: this is the postcondition that could not be proved
-ByMethod.dfy(71,12): Error: a postcondition could not be proved on this return path
-ByMethod.dfy(72,27): Related location: this is the postcondition that could not be proved
-ByMethod.dfy(93,11): Error: decreases clause might not decrease
-ByMethod.dfy(102,11): Error: decreases clause might not decrease
-ByMethod.dfy(111,11): Error: decreases clause might not decrease
-ByMethod.dfy(126,10): Error: cannot prove termination; try supplying a decreases clause
-ByMethod.dfy(132,13): Error: cannot prove termination; try supplying a decreases clause
-ByMethod.dfy(148,11): Error: cannot prove termination; try supplying a decreases clause
-ByMethod.dfy(152,13): Error: cannot prove termination; try supplying a decreases clause
-ByMethod.dfy(175,13): Error: decreases clause might not decrease
-
-Dafny program verifier finished with 15 verified, 16 errors
diff --git a/Test/dafny0/ByMethodResolution.dfy.expect b/Test/dafny0/ByMethodResolution.dfy.expect
deleted file mode 100644
index 62bf527a53d..00000000000
--- a/Test/dafny0/ByMethodResolution.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-ByMethodResolution.dfy(17,6): Error: number of return parameters does not match declaration (found 2, expected 1)
-ByMethodResolution.dfy(25,4): Error: Method return value mismatch (expected real, got bv9)
-ByMethodResolution.dfy(24,6): Error: RHS (of type int) not assignable to LHS (of type real)
-ByMethodResolution.dfy(63,13): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-ByMethodResolution.dfy(64,13): Error: a call to a ghost predicate is allowed only in specification contexts (consider declaring the predicate without the 'ghost' keyword)
-ByMethodResolution.dfy(65,13): Error: a call to a twostate function is allowed only in specification contexts
-ByMethodResolution.dfy(85,9): Error: ghost variables such as k are allowed only in specification contexts. k was inferred to be ghost based on its declaration or initialization.
-ByMethodResolution.dfy(92,14): Error: ghost variables such as a are allowed only in specification contexts. a was inferred to be ghost based on its declaration or initialization.
-ByMethodResolution.dfy(106,4): Error: a recursive call from a least predicate can go only to other least predicates
-ByMethodResolution.dfy(142,4): Error: a recursive call from a least predicate can go only to other least predicates
-ByMethodResolution.dfy(157,4): Error: a recursive call from a least predicate can go only to other least predicates
-11 resolution/type errors detected in ByMethodResolution.dfy
diff --git a/Test/dafny0/Calculations.dfy b/Test/dafny0/Calculations.dfy
deleted file mode 100644
index 434fbc0a68f..00000000000
--- a/Test/dafny0/Calculations.dfy
+++ /dev/null
@@ -1,130 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint.dfy" "%s" > "%t"
-// RUN: %dafny /noVerify /compile:0 "%t.dprint.dfy" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method CalcTest0(s: seq<int>) {
-  calc {
-    s[0]; // error: ill-formed line
-  }
-
-  calc {
-    2;
-    { assert s[0] == 1; } // error: ill-formed hint
-    1 + 1;
-  }
-
-  if (|s| > 0) {
-    calc {
-      s[0]; // OK: well-formed in this context
-      <= { assert s[0] == s[0]; }
-      s[0];
-    }
-  }
-  assume forall x :: x in s ==> x >= 0;
-  calc {
-    0 < |s|;
-  ==>  { assert s[0] in s && s[0] >= 0; }  // OK: well-formed after previous line
-    s[0] >= 0;                // OK: well-formed after previous line
-  <==> { assert s[0] in s && s[0] >= 0; }  // OK: well-formed when the previous line is well-formed
-    s[0] > 0 || s[0] == 0;    // OK: well-formed when the previous line is well-formed
-  }
-
-  calc { // same as the last one, but well-formedness is checked in reverse order
-    s[0] + 1 > 0;
-  <==>
-    s[0] >= 0;
-  <== { assert s[0] >= 0; }
-    0 < |s|;
-  }
-}
-
-method CalcTest1(x: int, y: int) {
-  calc {
-    x + y;
-    { assume x == 0; }
-    y;
-  }
-  assert x == 0; // OK: follows from x + y == y;
-}
-
-method CalcTest2(x: int, y: int) {
-  calc {
-    x + y;
-    { assume x == 0; }
-    y + x;
-  }
-  assert x == 0; // error: even though assumed above, is not exported by the calculation
-}
-
-// calc expression:
-ghost function CalcTest3(s: seq<int>): int {
-  calc < {
-    0;
-    { assume |s| == 5; }
-    |s|;
-  }
-  s[0]
-}
-
-// dangling hints:
-method CalcTest4(s: seq<int>)
-  requires forall n | n in s :: n > 0
-{
-  calc {
-    1 + 1;
-    { assert 1 + 1 == 2; }
-  }
-  calc {
-    2;
-    { assert s[0] > 0; } // error: ill-formed hint
-  }
-  calc {
-    |s| > 0;
-  ==> { assert s[0] in s && s[0] > 0; } // okay
-  }
-
-}
-
-// ------------- tests for the pretty printer -------------
-
-lemma CalcPrinting()
-{
-  calc < {
-    2;
-  <= { SubLemma(); }
-    3;
-    5;
-  < { assert 5 < 6 <= 5+1; SubLemma(); assert 6 < 7; }
-    7;
-    11;
-    { SubLemma(); } // dangling hint
-  }
-  calc < {
-    13;
-  }
-  calc {
-    17;
-  == { SubLemma(); }  // dangling hint, following operator
-  }
-  calc <= {
-    19;
-  <=
-    { SubLemma(); }
-    { assert 19 + 23 == 42; }
-    calc { 811; }
-    { assert 42 < 100; }
-    23;
-    { calc < {
-      71; { assert 71 % 19 != 0; } 73;
-    } }
-    29;
-    calc < {
-      311; 313; 331;
-    }
-    31;
-  }
-  calc {
-  }
-}
-
-lemma SubLemma()
diff --git a/Test/dafny0/Calculations.dfy.expect b/Test/dafny0/Calculations.dfy.expect
deleted file mode 100644
index 3b5f084f627..00000000000
--- a/Test/dafny0/Calculations.dfy.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-Calculations.dfy(7,5): Error: index out of range
-Calculations.dfy(12,14): Error: index out of range
-Calculations.dfy(12,18): Error: assertion could not be proved
-Calculations.dfy(56,11): Error: assertion could not be proved
-Calculations.dfy(79,14): Error: index out of range
-Calculations.dfy(79,18): Error: assertion could not be proved
-
-Dafny program verifier finished with 3 verified, 6 errors
-
-Dafny program verifier did not attempt verification
diff --git a/Test/dafny0/CallStmtTests.dfy b/Test/dafny0/CallStmtTests.dfy
deleted file mode 100644
index c0deaa0c573..00000000000
--- a/Test/dafny0/CallStmtTests.dfy
+++ /dev/null
@@ -1,27 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M0 {
-  method testing1(t: int)
- {
-    t := m(); // error: should be checked at the Dafny level, not fall to Boogie.
-  }
-
-  method m() returns (r: int)
-  {
-    return 3;
-  }
-}
-
-module M1 {
-  method testing2()
-  {
-    var v;
-    v := m2(); // error: v needs to be ghost because r is.
-  }
-
-  method m2() returns (ghost r: int)
-  {
-    r := 23;
-  }
-}
diff --git a/Test/dafny0/ChainingDisjointTests.dfy.expect b/Test/dafny0/ChainingDisjointTests.dfy.expect
deleted file mode 100644
index ae65d8529cc..00000000000
--- a/Test/dafny0/ChainingDisjointTests.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-ChainingDisjointTests.dfy(49,2): Error: a postcondition could not be proved on this return path
-ChainingDisjointTests.dfy(48,14): Related location: this is the postcondition that could not be proved
-ChainingDisjointTests.dfy(42,22): Related location
-ChainingDisjointTests.dfy(58,13): Error: assertion could not be proved
-ChainingDisjointTests.dfy(58,18): Error: assertion could not be proved
-ChainingDisjointTests.dfy(58,23): Error: assertion could not be proved
-
-Dafny program verifier finished with 4 verified, 4 errors
diff --git a/Test/dafny0/Char.dfy b/Test/dafny0/Char.dfy
deleted file mode 100644
index 6d6ed423aab..00000000000
--- a/Test/dafny0/Char.dfy
+++ /dev/null
@@ -1,101 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /unicodeChar:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class CharChar {
-  var c: char;
-  var d: char;
-
-  method Order()
-    modifies this;
-    ensures c <= d;
-  {
-    if d < c {
-      c, d := d, c;
-    }
-  }
-
-  ghost function Recurse(ch: char): bool
-    reads this;
-  {
-    if c < ch then Recurse(c)
-    else if d < ch then Recurse(d)
-    else ch == ' '
-  }
-
-  ghost function MinChar(s: string): char
-    requires s != "";
-  {
-    var ch := s[0];
-    if |s| == 1 then ch else
-    var m := MinChar(s[1..]);
-    if m < ch then m else ch
-  }
-  lemma MinCharLemma(s: string)
-    requires |s| != 0;
-    ensures forall i :: 0 <= i < |s| ==> MinChar(s) <= s[i];
-  {
-    if 2 <= |s| {
-      var m := MinChar(s[1..]);
-      assert forall i :: 1 <= i < |s| ==> m <= s[1..][i-1] == s[i];
-    }
-  }
-
-  method CharEq(s: string) {
-    if "hello Dafny" <= s {
-      assert s[6] == 'D';
-      assert s[7] == '\u0061';
-      if * {
-        assert s[9] == '\n';  // error
-      } else if * {
-        assert s[1] < s[2] <= s[3];
-      } else {
-        assert s[0] <= s[5];  // error
-      }
-    }
-  }
-  method CharInbetween(ch: char)
-    requires 'B' < ch;
-  {
-    if ch < 'D' {
-      assert 'C' <= ch <= 'C';
-      assert ch == 'C';
-    } else {
-      assert ch <= 'M';  // error
-    }
-  }
-}
-
-// arithmetic with char's
-
-ghost function toLower(ch: char): char
-{
-  if 'A' <= ch <= 'Z' then
-    ch - 'A' + 'a'
-  else
-    ch
-}
-
-ghost function BadToLower_Overflow(ch: char): char
-{
-  if 'A' <= ch then
-    ch - 'A' + 'a'  // error: possible overvlow
-  else
-    ch
-}
-
-ghost function BadToLower_Underflow(ch: char): char
-{
-  if ch <= 'Z' then
-    ch - 'A' + 'a'  // error: possible overvlow
-  else
-    ch
-}
-
-lemma AboutChar(ch: char, dh: char)
-  requires 'r' < dh < '\uabcd'
-  ensures ch == ch + '\0' == ch - '\0'
-  ensures dh - '\u0020' < dh
-  ensures dh + '\u0020' > dh
-  ensures '\n' + dh == dh + '\n'
-{
-}
diff --git a/Test/dafny0/Char.dfy.expect b/Test/dafny0/Char.dfy.expect
deleted file mode 100644
index 3dce608ce5d..00000000000
--- a/Test/dafny0/Char.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-Char.dfy(81,13): Error: char addition might overflow
-Char.dfy(89,7): Error: char subtraction might underflow
-Char.dfy(48,20): Error: assertion could not be proved
-Char.dfy(52,20): Error: assertion could not be proved
-Char.dfy(63,16): Error: assertion could not be proved
-
-Dafny program verifier finished with 8 verified, 5 errors
diff --git a/Test/dafny0/CoResolution.dfy.expect b/Test/dafny0/CoResolution.dfy.expect
deleted file mode 100644
index 0502672291d..00000000000
--- a/Test/dafny0/CoResolution.dfy.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-CoResolution.dfy(18,11): Error: member 'Undeclared#' does not exist in class 'TestClass'
-CoResolution.dfy(19,6): Error: unresolved identifier: Undeclared#
-CoResolution.dfy(22,9): Error: unresolved identifier: _k
-CoResolution.dfy(41,8): Error: == can only be applied to expressions of types that support equality (got Stream<_T0>)
-CoResolution.dfy(52,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-CoResolution.dfy(76,33): Error: a greatest predicate is not allowed to declare any ensures clause
-CoResolution.dfy(86,27): Error: a recursive call from a greatest predicate can go only to other greatest predicates
-CoResolution.dfy(90,27): Error: a recursive call from a greatest predicate can go only to other greatest predicates
-CoResolution.dfy(99,5): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
-CoResolution.dfy(113,13): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
-CoResolution.dfy(114,13): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
-CoResolution.dfy(119,24): Error: a recursive call from a greatest predicate can go only to other greatest predicates
-CoResolution.dfy(125,28): Error: a recursive call from a greatest predicate can go only to other greatest predicates
-CoResolution.dfy(133,13): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
-CoResolution.dfy(134,13): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
-CoResolution.dfy(139,26): Error: a recursive call from a greatest predicate can go only to other greatest predicates
-CoResolution.dfy(145,30): Error: a recursive call from a greatest predicate can go only to other greatest predicates
-CoResolution.dfy(153,4): Error: a recursive call from a greatest predicate can go only to other greatest predicates
-CoResolution.dfy(155,4): Error: a recursive call from a greatest predicate can go only to other greatest predicates
-CoResolution.dfy(171,13): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
-CoResolution.dfy(206,12): Error: type parameter '_T0' (inferred to be '?') in the function call to 'A' could not be determined
-CoResolution.dfy(206,13): Error: the type of this expression is underspecified
-CoResolution.dfy(206,19): Error: type parameter '_T0' (inferred to be '?') in the function call to 'S' could not be determined
-23 resolution/type errors detected in CoResolution.dfy
diff --git a/Test/dafny0/Coinductive.dfy.expect b/Test/dafny0/Coinductive.dfy.expect
deleted file mode 100644
index 9f58bc94721..00000000000
--- a/Test/dafny0/Coinductive.dfy.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-Coinductive.dfy(13,11): Error: because of cyclic dependencies among constructor argument types, no instances of datatype 'Rec_Forever' can be constructed
-Coinductive.dfy(16,11): Error: because of cyclic dependencies among constructor argument types, no instances of datatype 'D' can be constructed
-Coinductive.dfy(38,11): Error: because of cyclic dependencies among constructor argument types, no instances of datatype 'K' can be constructed
-Coinductive.dfy(64,11): Error: because of cyclic dependencies among constructor argument types, no instances of datatype 'NotFiniteEnough_Dt' can be constructed
-Coinductive.dfy(93,8): Error: a greatest predicate can be called recursively only in positive positions
-Coinductive.dfy(94,8): Error: a greatest predicate can be called recursively only in positive positions
-Coinductive.dfy(95,8): Error: a greatest predicate can be called recursively only in positive positions
-Coinductive.dfy(95,21): Error: a greatest predicate can be called recursively only in positive positions
-Coinductive.dfy(101,5): Error: a greatest predicate can be called recursively only in positive positions
-Coinductive.dfy(104,27): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
-Coinductive.dfy(105,28): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
-Coinductive.dfy(106,17): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
-Coinductive.dfy(116,24): Error: a greatest predicate can be called recursively only in positive positions
-Coinductive.dfy(122,15): Error: a greatest predicate can be called recursively only in positive positions
-Coinductive.dfy(123,10): Error: a greatest predicate can be called recursively only in positive positions
-Coinductive.dfy(148,21): Error: a recursive call from a greatest predicate can go only to other greatest predicates
-Coinductive.dfy(204,8): Error: a least predicate can be called recursively only in positive positions
-Coinductive.dfy(205,8): Error: a least predicate can be called recursively only in positive positions
-Coinductive.dfy(206,8): Error: a least predicate can be called recursively only in positive positions
-Coinductive.dfy(206,21): Error: a least predicate can be called recursively only in positive positions
-Coinductive.dfy(219,15): Error: a greatest predicate can be called recursively only in positive positions
-Coinductive.dfy(226,16): Error: a least predicate can be called recursively only in positive positions
-Coinductive.dfy(238,5): Error: a least predicate can be called recursively only in positive positions
-Coinductive.dfy(241,28): Error: a least predicate can be called recursively only in positive positions and cannot sit inside an unbounded universal quantifier
-Coinductive.dfy(242,29): Error: a least predicate can be called recursively only in positive positions and cannot sit inside an unbounded universal quantifier
-Coinductive.dfy(243,17): Error: a least predicate can be called recursively only in positive positions and cannot sit inside an unbounded universal quantifier
-Coinductive.dfy(253,12): Error: a least predicate can be called recursively only in positive positions
-Coinductive.dfy(259,15): Error: a least predicate can be called recursively only in positive positions
-Coinductive.dfy(260,10): Error: a least predicate can be called recursively only in positive positions
-Coinductive.dfy(280,21): Error: a recursive call from a least predicate can go only to other least predicates
-Coinductive.dfy(296,4): Error: this call does not type check, because the context uses a _k parameter of type ORDINAL whereas the callee uses a _k parameter of type nat
-Coinductive.dfy(299,4): Error: this call does not type check, because the context uses a _k parameter of type nat whereas the callee uses a _k parameter of type ORDINAL
-Coinductive.dfy(307,13): Error: this call does not type check, because the context uses a _k parameter of type nat whereas the callee uses a _k parameter of type ORDINAL
-Coinductive.dfy(313,13): Error: this call does not type check, because the context uses a _k parameter of type ORDINAL whereas the callee uses a _k parameter of type nat
-Coinductive.dfy(323,5): Error: incorrect argument type at index 0 for prefix lemma in-parameter (expected nat, found ORDINAL)
-Coinductive.dfy(329,5): Error: incorrect argument type at index 0 for prefix lemma in-parameter (expected ORDINAL, found int)
-Coinductive.dfy(355,19): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
-Coinductive.dfy(355,44): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
-Coinductive.dfy(358,19): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
-Coinductive.dfy(358,46): Error: a greatest predicate can be called recursively only in positive positions and cannot sit inside an unbounded existential quantifier
-40 resolution/type errors detected in Coinductive.dfy
diff --git a/Test/dafny0/CoinductiveProofs.dfy.expect b/Test/dafny0/CoinductiveProofs.dfy.expect
deleted file mode 100644
index 4ea7bdbb422..00000000000
--- a/Test/dafny0/CoinductiveProofs.dfy.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-CoinductiveProofs.dfy(30,11): Error: assertion could not be proved
-CoinductiveProofs.dfy(15,42): Related location
-CoinductiveProofs.dfy(13,16): Related location
-CoinductiveProofs.dfy(44,11): Error: assertion could not be proved
-CoinductiveProofs.dfy(48,11): Error: assertion could not be proved
-CoinductiveProofs.dfy(13,16): Related location
-CoinductiveProofs.dfy(78,0): Error: a postcondition could not be proved on this return path
-CoinductiveProofs.dfy(77,10): Related location: this is the postcondition that could not be proved
-CoinductiveProofs.dfy(73,2): Related location
-CoinductiveProofs.dfy(94,11): Error: assertion could not be proved
-CoinductiveProofs.dfy(87,35): Related location
-CoinductiveProofs.dfy(73,2): Related location
-CoinductiveProofs.dfy(127,0): Error: a postcondition could not be proved on this return path
-CoinductiveProofs.dfy(126,10): Related location: this is the postcondition that could not be proved
-CoinductiveProofs.dfy(115,2): Related location
-CoinductiveProofs.dfy(136,11): Error: assertion could not be proved
-CoinductiveProofs.dfy(117,35): Related location
-CoinductiveProofs.dfy(115,2): Related location
-CoinductiveProofs.dfy(149,11): Error: assertion could not be proved
-CoinductiveProofs.dfy(115,2): Related location
-CoinductiveProofs.dfy(153,11): Error: assertion could not be proved
-CoinductiveProofs.dfy(115,2): Related location
-CoinductiveProofs.dfy(164,0): Error: a postcondition could not be proved on this return path
-CoinductiveProofs.dfy(163,10): Related location: this is the postcondition that could not be proved
-CoinductiveProofs.dfy(159,2): Related location
-CoinductiveProofs.dfy(203,0): Error: a postcondition could not be proved on this return path
-CoinductiveProofs.dfy(202,21): Related location: this is the postcondition that could not be proved
-CoinductiveProofs.dfy(4,23): Related location
-CoinductiveProofs.dfy(209,0): Error: a postcondition could not be proved on this return path
-CoinductiveProofs.dfy(208,21): Related location: this is the postcondition that could not be proved
-CoinductiveProofs.dfy(4,23): Related location
-
-Dafny program verifier finished with 23 verified, 12 errors
diff --git a/Test/dafny0/CompilationErrors.dfy.expect b/Test/dafny0/CompilationErrors.dfy.expect
deleted file mode 100644
index dd8dc6016e2..00000000000
--- a/Test/dafny0/CompilationErrors.dfy.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-CompilationErrors.dfy(71,2): Warning: note, this loop has no body (loop frame: x)
-CompilationErrors.dfy(73,2): Warning: note, this loop has no body (loop frame: i, x)
-CompilationErrors.dfy(83,4): Warning: note, this loop has no body (loop frame: x)
-CompilationErrors.dfy(85,4): Warning: note, this loop has no body (loop frame: i, x)
-
-Dafny program verifier finished with 5 verified, 0 errors
-CompilationErrors.dfy(6,13): Error: Method _module._default.M has no body
-CompilationErrors.dfy(7,7): Error: Method _module._default.P has no body
-CompilationErrors.dfy(19,15): Error: Function _module._default.F has no body
-CompilationErrors.dfy(20,9): Error: Function _module._default.H has no body
-CompilationErrors.dfy(23,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-CompilationErrors.dfy(27,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-CompilationErrors.dfy(33,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-CompilationErrors.dfy(43,6): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-CompilationErrors.dfy(55,8): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-CompilationErrors.dfy(60,13): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-CompilationErrors.dfy(71,2): Error: a loop without a body cannot be compiled
-CompilationErrors.dfy(73,2): Error: a loop without a body cannot be compiled
-CompilationErrors.dfy(83,4): Error: a loop without a body cannot be compiled
-CompilationErrors.dfy(85,4): Error: a loop without a body cannot be compiled
-CompilationErrors.dfy(4,5): Error: Abstract type ('_module.MyType') cannot be compiled; perhaps make it a type synonym or use :extern.
-CompilationErrors.dfy(5,9): Error: iterator _module.Iter has no body
-CompilationErrors.dfy(12,6): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
diff --git a/Test/dafny0/Comprehensions.dfy b/Test/dafny0/Comprehensions.dfy
deleted file mode 100644
index 6a7d8961d2f..00000000000
--- a/Test/dafny0/Comprehensions.dfy
+++ /dev/null
@@ -1,191 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method M()
-{
-  var numbers := set i | 0 <= i && i < 100;
-  var squares := set i | 0 <= i && i < 100 :: Id(i)*i;  // verifying properties about set comprehensions with a term expression is hard
-
-  assert 12 in numbers;
-  assert Id(5) == 5;
-  assert 25 in squares;
-  assert 200 in numbers;  // error
-}
-
-function Id(x: int): int { x }  // for triggering
-
-datatype D = A | B
-// The following mainly test that set comprehensions can be compiled, but one would
-// have to run the resulting program to check that the compiler is doing the right thing.
-method Main()
-{
-  var q := set i,j | 0 <= i < 10 && 0 <= j < 3 :: i+j;
-  PrintSet(q);
-  q := set b: bool | true :: if b then 3 else 7;
-  var d := set b:D | true;
-  var test := forall d:D {:nowarn} :: d == A || d == B; // Ignoring the warning as we're only compiling here
-  PrintSet(q);
-  var m := set k | k in q :: 2*k;
-  PrintSet(m);
-  PrintSet(set k | k in q && k % 2 == 0);
-  var sq := [30, 40, 20];
-  PrintSet(set k, i | k in sq && 0 <= i < k && i % 7 == 0 :: k + i);
-  var bb := forall k, i {:nowarn} | k in sq && 0 <= i < k && i % 7 == 0 :: k + i == 17; // Ignoring the warning as we're only compiling here
-}
-
-method PrintSet<T>(s: set<T>) {
-  var q := s;
-  while (q != {})
-    decreases q
-  {
-    var x :| x in q;
-    print x, " ";
-    q := q - {x};
-  }
-  print "\n";
-}
-
-// ---------- Regression tests ----------
-
-method SetComprehensionBoxAntecedents()
-{
-  // The first assert below used to not verify, due to a missing $IsBox conjunct in the Boogie lambda
-  // that encodes the set comprehension.
-  var a := set x | x in {0,1,2,3,4,5} && x < 3;
-  var b := {0,1,2};
-
-  if
-  case true =>
-    assert a == b;
-  case true =>
-    assert forall x :: x in a ==> x in b;
-    assert forall x :: x in b ==> x in a;
-  case true =>
-    assert forall x :: x in a <==> x in b;
-}
-
-// ---------- Sequence operations ----------
-
-method Sequences0() {
-  var four1s := [1, 1, 1, 1];
-  var twelve1s := seq(12, _ => 1);
-  assert twelve1s == four1s + four1s + four1s;
-
-  var squares := seq(8, i => i*i);
-  assert |squares| == 8;
-  assert squares[6] == 36;
-  if * {
-    assert squares[7] == 0;  // error
-  }
-
-  var nats := seq(8, i => i);
-}
-
-class SeqOp {
-  var x: real
-
-  function G(i: nat): real
-    reads this
-  {
-    if i < 20 then 2.5 else x
-  }
-  function H(i: nat): real
-    reads if i < 20 then {} else {this}
-  {
-    if i < 20 then 2.5 else x
-  }
-
-  function S0(n: nat): seq<real> {
-    seq(n, G)  // error: S0 reads {this}
-  }
-  function S1(n: nat): seq<real>
-    reads this
-  {
-    seq(n, G)
-  }
-  function S2(n: nat): seq<real> {
-    seq(n, H)  // error: S2 reads {this}
-  }
-  function S3(n: nat): seq<real>
-    reads this
-  {
-    seq(n, H)
-  }
-  function S4(n: nat): seq<real> {
-    seq(n, i => if i < 20 then 2.5 else x)  // error: lambda reads {this}
-  }
-  function S5(n: nat): seq<real> {
-    seq(n, i reads this => if i < 20 then 2.5 else x)  // error: S5 reads {this}
-  }
-  function S6(n: nat): seq<real>
-    reads this
-  {
-    seq(n, i reads this => if i < 20 then 2.5 else x)
-  }
-  function S7(n: nat): seq<real> {
-    seq(n, i requires i < 20 => if i < 20 then 2.5 else x)  // error: S7 violates lambda's precondition
-  }
-
-  function T0(n: nat): seq<real>
-    requires n <= 20
-  {
-    seq(n, G)  // error: T0 reads {this}
-  }
-  function T1(n: nat): seq<real>
-    requires n <= 20
-    reads this
-  {
-    seq(n, G)
-  }
-  function T2(n: nat): seq<real>
-    requires n <= 20
-  {
-    seq(n, H)
-  }
-  function T3(n: nat): seq<real>
-    requires n <= 20
-  {
-    seq(n, i reads this => if i < 20 then 2.5 else x)  // error: T3 reads {this}
-  }
-  function T4(n: nat): seq<real>
-    requires n <= 20
-  {
-    seq(n, i requires i < 20 => if i < 20 then 2.5 else x)
-  }
-  function T5(n: nat): seq<real>
-    requires n <= 20
-  {
-    seq(n, i reads if i < 20 then {} else {this} => if i < 20 then 2.5 else x)
-  }
-
-  function XT0(n: nat): seq<int> {
-    seq<int>(n, _ => 7)
-  }
-  function XT1(n: nat): seq<int> {
-    seq<nat>(n, _ => 7)
-  }
-  function XT2(n: nat): seq<int> {
-    seq<nat>(n, _ => -7)  // error: -7 is not a nat
-  }
-  function XT3(n: nat): seq<nat> {
-    seq(n, _ => -7)  // error: this is not a seq<nat>
-  }
-  function XT4(n: nat): seq<nat> {
-    seq(n, i requires 0 <= i < 3 => 10)  // error: init function doesn't accept all indices
-  }
-  function XT5(n: nat): seq<nat> {
-    seq(n, i requires 0 <= i < n => 10)
-  }
-  function XT6(n: nat): seq<nat> {
-    seq(n, i => if i < n then 10 else -7)  // error: type of lambda is inferred to be int->nat, so the -7 gives an error
-  }
-  function XT7(n: nat): seq<nat> {
-    seq(n, i => var u: int := if i < n then 10 else -7; u)  // fine: lambda has type int->int; use of this lambda always gives a nat
-  }
-  function XT8(n: nat): seq<nat> {
-    seq(n, i => if i < n then -7 else 10)  // error: this can't be assigned to a seq<nat>
-  }
-  function XT9(n: nat): seq<nat> {
-    seq<nat>(n, i => if i < n then -7 else 10)  // error: this can't be assigned to a seq<nat>
-  }
-}
diff --git a/Test/dafny0/Comprehensions.dfy.expect b/Test/dafny0/Comprehensions.dfy.expect
deleted file mode 100644
index 05f9bc25e65..00000000000
--- a/Test/dafny0/Comprehensions.dfy.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-Comprehensions.dfy(6,17): Warning: /!\ No terms found to trigger on.
-Comprehensions.dfy(22,11): Warning: /!\ No terms found to trigger on.
-Comprehensions.dfy(24,7): Warning: /!\ No terms found to trigger on.
-Comprehensions.dfy(25,11): Warning: /!\ No terms found to trigger on.
-Comprehensions.dfy(32,11): Warning: /!\ No trigger covering all quantified variables found.
-Comprehensions.dfy(54,11): Warning: /!\ No terms found to trigger on.
-Comprehensions.dfy(12,13): Error: assertion could not be proved
-Comprehensions.dfy(78,22): Error: assertion could not be proved
-Comprehensions.dfy(99,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
-Comprehensions.dfy(107,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
-Comprehensions.dfy(115,40): Error: insufficient reads clause to read field
-Comprehensions.dfy(118,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
-Comprehensions.dfy(126,4): Error: all sequence indices must be in the domain of the initialization function
-Comprehensions.dfy(132,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
-Comprehensions.dfy(148,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
-Comprehensions.dfy(168,16): Error: value does not satisfy the subset constraints of 'nat'
-Comprehensions.dfy(171,11): Error: value does not satisfy the subset constraints of 'nat'
-Comprehensions.dfy(174,4): Error: all sequence indices must be in the domain of the initialization function
-Comprehensions.dfy(180,38): Error: value does not satisfy the subset constraints of 'nat'
-Comprehensions.dfy(186,30): Error: value does not satisfy the subset constraints of 'nat'
-Comprehensions.dfy(189,16): Error: value does not satisfy the subset constraints of 'nat'
-
-Dafny program verifier finished with 16 verified, 15 errors
diff --git a/Test/dafny0/ComprehensionsNewSyntax.dfy b/Test/dafny0/ComprehensionsNewSyntax.dfy
deleted file mode 100644
index 3164586da8f..00000000000
--- a/Test/dafny0/ComprehensionsNewSyntax.dfy
+++ /dev/null
@@ -1,191 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method M()
-{
-  var numbers := set i | 0 <= i && i < 100;
-  var squares := set i | 0 <= i && i < 100 :: Id(i)*i;  // verifying properties about set comprehensions with a term expression is hard
-
-  assert 12 in numbers;
-  assert Id(5) == 5;
-  assert 25 in squares;
-  assert 200 in numbers;  // error
-}
-
-function Id(x: int): int { x }  // for triggering
-
-datatype D = A | B
-// The following mainly test that set comprehensions can be compiled, but one would
-// have to run the resulting program to check that the compiler is doing the right thing.
-method Main()
-{
-  var q := set i,j | 0 <= i < 10 && 0 <= j < 3 :: i+j;
-  PrintSet(q);
-  q := set b: bool :: if b then 3 else 7;
-  var d := set b:D;
-  var test := forall d:D {:nowarn} :: d == A || d == B; // Ignoring the warning as we're only compiling here
-  PrintSet(q);
-  var m := set k <- q :: 2*k;
-  PrintSet(m);
-  PrintSet(set k <- q | k % 2 == 0);
-  var sq := [30, 40, 20];
-  PrintSet(set k <- sq, i | 0 <= i < k && i % 7 == 0 :: k + i);
-  var bb := forall k <- sq, i {:nowarn} | 0 <= i < k && i % 7 == 0 :: k + i == 17; // Ignoring the warning as we're only compiling here
-}
-
-method PrintSet<T>(s: set<T>) {
-  var q := s;
-  while (q != {})
-    decreases q
-  {
-    var x :| x in q;
-    print x, " ";
-    q := q - {x};
-  }
-  print "\n";
-}
-
-// ---------- Regression tests ----------
-
-method SetComprehensionBoxAntecedents()
-{
-  // The first assert below used to not verify, due to a missing $IsBox conjunct in the Boogie lambda
-  // that encodes the set comprehension.
-  var a := set x <- {0,1,2,3,4,5} | x < 3;
-  var b := {0,1,2};
-
-  if
-  case true =>
-    assert a == b;
-  case true =>
-    assert forall x <- a :: x in b;
-    assert forall x <- b :: x in a;
-  case true =>
-    assert forall x :: x in a <==> x in b;
-}
-
-// ---------- Sequence operations ----------
-
-method Sequences0() {
-  var four1s := [1, 1, 1, 1];
-  var twelve1s := seq(12, _ => 1);
-  assert twelve1s == four1s + four1s + four1s;
-
-  var squares := seq(8, i => i*i);
-  assert |squares| == 8;
-  assert squares[6] == 36;
-  if * {
-    assert squares[7] == 0;  // error
-  }
-
-  var nats := seq(8, i => i);
-}
-
-class SeqOp {
-  var x: real
-
-  function G(i: nat): real
-    reads this
-  {
-    if i < 20 then 2.5 else x
-  }
-  function H(i: nat): real
-    reads if i < 20 then {} else {this}
-  {
-    if i < 20 then 2.5 else x
-  }
-
-  function S0(n: nat): seq<real> {
-    seq(n, G)  // error: S0 reads {this}
-  }
-  function S1(n: nat): seq<real>
-    reads this
-  {
-    seq(n, G)
-  }
-  function S2(n: nat): seq<real> {
-    seq(n, H)  // error: S2 reads {this}
-  }
-  function S3(n: nat): seq<real>
-    reads this
-  {
-    seq(n, H)
-  }
-  function S4(n: nat): seq<real> {
-    seq(n, i => if i < 20 then 2.5 else x)  // error: lambda reads {this}
-  }
-  function S5(n: nat): seq<real> {
-    seq(n, i reads this => if i < 20 then 2.5 else x)  // error: S5 reads {this}
-  }
-  function S6(n: nat): seq<real>
-    reads this
-  {
-    seq(n, i reads this => if i < 20 then 2.5 else x)
-  }
-  function S7(n: nat): seq<real> {
-    seq(n, i requires i < 20 => if i < 20 then 2.5 else x)  // error: S7 violates lambda's precondition
-  }
-
-  function T0(n: nat): seq<real>
-    requires n <= 20
-  {
-    seq(n, G)  // error: T0 reads {this}
-  }
-  function T1(n: nat): seq<real>
-    requires n <= 20
-    reads this
-  {
-    seq(n, G)
-  }
-  function T2(n: nat): seq<real>
-    requires n <= 20
-  {
-    seq(n, H)
-  }
-  function T3(n: nat): seq<real>
-    requires n <= 20
-  {
-    seq(n, i reads this => if i < 20 then 2.5 else x)  // error: T3 reads {this}
-  }
-  function T4(n: nat): seq<real>
-    requires n <= 20
-  {
-    seq(n, i requires i < 20 => if i < 20 then 2.5 else x)
-  }
-  function T5(n: nat): seq<real>
-    requires n <= 20
-  {
-    seq(n, i reads if i < 20 then {} else {this} => if i < 20 then 2.5 else x)
-  }
-
-  function XT0(n: nat): seq<int> {
-    seq<int>(n, _ => 7)
-  }
-  function XT1(n: nat): seq<int> {
-    seq<nat>(n, _ => 7)
-  }
-  function XT2(n: nat): seq<int> {
-    seq<nat>(n, _ => -7)  // error: -7 is not a nat
-  }
-  function XT3(n: nat): seq<nat> {
-    seq(n, _ => -7)  // error: this is not a seq<nat>
-  }
-  function XT4(n: nat): seq<nat> {
-    seq(n, i requires 0 <= i < 3 => 10)  // error: init function doesn't accept all indices
-  }
-  function XT5(n: nat): seq<nat> {
-    seq(n, i requires 0 <= i < n => 10)
-  }
-  function XT6(n: nat): seq<nat> {
-    seq(n, i => if i < n then 10 else -7)  // error: type of lambda is inferred to be int->nat, so the -7 gives an error
-  }
-  function XT7(n: nat): seq<nat> {
-    seq(n, i => var u: int := if i < n then 10 else -7; u)  // fine: lambda has type int->int; use of this lambda always gives a nat
-  }
-  function XT8(n: nat): seq<nat> {
-    seq(n, i => if i < n then -7 else 10)  // error: this can't be assigned to a seq<nat>
-  }
-  function XT9(n: nat): seq<nat> {
-    seq<nat>(n, i => if i < n then -7 else 10)  // error: this can't be assigned to a seq<nat>
-  }
-}
diff --git a/Test/dafny0/ComprehensionsNewSyntax.dfy.expect b/Test/dafny0/ComprehensionsNewSyntax.dfy.expect
deleted file mode 100644
index 924d7f8d9bd..00000000000
--- a/Test/dafny0/ComprehensionsNewSyntax.dfy.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-ComprehensionsNewSyntax.dfy(6,17): Warning: /!\ No terms found to trigger on.
-ComprehensionsNewSyntax.dfy(22,11): Warning: /!\ No terms found to trigger on.
-ComprehensionsNewSyntax.dfy(24,7): Warning: /!\ No terms found to trigger on.
-ComprehensionsNewSyntax.dfy(25,11): Warning: /!\ No terms found to trigger on.
-ComprehensionsNewSyntax.dfy(32,11): Warning: /!\ No trigger covering all quantified variables found.
-ComprehensionsNewSyntax.dfy(54,11): Warning: /!\ No terms found to trigger on.
-ComprehensionsNewSyntax.dfy(12,13): Error: assertion could not be proved
-ComprehensionsNewSyntax.dfy(78,22): Error: assertion could not be proved
-ComprehensionsNewSyntax.dfy(99,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
-ComprehensionsNewSyntax.dfy(107,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
-ComprehensionsNewSyntax.dfy(115,40): Error: insufficient reads clause to read field
-ComprehensionsNewSyntax.dfy(118,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
-ComprehensionsNewSyntax.dfy(126,4): Error: all sequence indices must be in the domain of the initialization function
-ComprehensionsNewSyntax.dfy(132,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
-ComprehensionsNewSyntax.dfy(148,4): Error: insufficient reads clause to invoke the function passed as an argument to the sequence constructor
-ComprehensionsNewSyntax.dfy(168,16): Error: value does not satisfy the subset constraints of 'nat'
-ComprehensionsNewSyntax.dfy(171,11): Error: value does not satisfy the subset constraints of 'nat'
-ComprehensionsNewSyntax.dfy(174,4): Error: all sequence indices must be in the domain of the initialization function
-ComprehensionsNewSyntax.dfy(180,38): Error: value does not satisfy the subset constraints of 'nat'
-ComprehensionsNewSyntax.dfy(186,30): Error: value does not satisfy the subset constraints of 'nat'
-ComprehensionsNewSyntax.dfy(189,16): Error: value does not satisfy the subset constraints of 'nat'
-
-Dafny program verifier finished with 16 verified, 15 errors
diff --git a/Test/dafny0/ComputationsLoop.dfy b/Test/dafny0/ComputationsLoop.dfy
deleted file mode 100644
index 0f8d8f6d57f..00000000000
--- a/Test/dafny0/ComputationsLoop.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function KeepDoin'It(x: nat): nat
-  decreases x
-{
-  KeepDoin'It(x + 1)
-}
-
-lemma Test(r: nat)
-{
-  assert KeepDoin'It(20) == r;
-}
-
diff --git a/Test/dafny0/ComputationsLoop.dfy.expect b/Test/dafny0/ComputationsLoop.dfy.expect
deleted file mode 100644
index f093851693b..00000000000
--- a/Test/dafny0/ComputationsLoop.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-ComputationsLoop.dfy(7,2): Error: decreases clause might not decrease
-ComputationsLoop.dfy(12,25): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny0/ComputationsLoop2.dfy b/Test/dafny0/ComputationsLoop2.dfy
deleted file mode 100644
index b4ff9b2311b..00000000000
--- a/Test/dafny0/ComputationsLoop2.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function KeepDoin'It(x: nat): nat
-{
-  KeepDoin'ItToo(x + 1)
-}
-
-ghost function KeepDoin'ItToo(x: nat): nat
-{
-  KeepDoin'It(x + 1)
-}
-
-lemma Test(r: nat)
-{
-  assert KeepDoin'It(20) == r;
-}
diff --git a/Test/dafny0/ComputationsLoop2.dfy.expect b/Test/dafny0/ComputationsLoop2.dfy.expect
deleted file mode 100644
index 7fe0675e86f..00000000000
--- a/Test/dafny0/ComputationsLoop2.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-ComputationsLoop2.dfy(6,2): Error: cannot prove termination; try supplying a decreases clause
-ComputationsLoop2.dfy(11,2): Error: cannot prove termination; try supplying a decreases clause
-ComputationsLoop2.dfy(16,25): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/dafny0/ComputationsNeg.dfy.expect b/Test/dafny0/ComputationsNeg.dfy.expect
deleted file mode 100644
index f7be4399714..00000000000
--- a/Test/dafny0/ComputationsNeg.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-ComputationsNeg.dfy(7,2): Error: decreases clause might not decrease
-ComputationsNeg.dfy(11,0): Error: a postcondition could not be proved on this return path
-ComputationsNeg.dfy(10,16): Related location: this is the postcondition that could not be proved
-ComputationsNeg.dfy(23,0): Error: a postcondition could not be proved on this return path
-ComputationsNeg.dfy(22,10): Related location: this is the postcondition that could not be proved
-ComputationsNeg.dfy(19,28): Related location
-ComputationsNeg.dfy(19,62): Related location
-ComputationsNeg.dfy(19,65): Related location
-ComputationsNeg.dfy(36,12): Error: assertion could not be proved
-ComputationsNeg.dfy(45,12): Error: assertion could not be proved
-
-Dafny program verifier finished with 5 verified, 5 errors
diff --git a/Test/dafny0/ControlStructures.dfy.expect b/Test/dafny0/ControlStructures.dfy.expect
deleted file mode 100644
index c5ea11da78e..00000000000
--- a/Test/dafny0/ControlStructures.dfy.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-ControlStructures.dfy(8,2): Error: missing case in match statement: Purple
-ControlStructures.dfy(8,2): Error: missing case in match statement: Blue
-ControlStructures.dfy(17,2): Error: missing case in match statement: Purple
-ControlStructures.dfy(46,4): Error: missing case in match statement: Red
-ControlStructures.dfy(54,2): Error: missing case in match expression: Red
-ControlStructures.dfy(75,2): Error: alternative cases fail to cover all possibilties
-ControlStructures.dfy(218,17): Error: assertion could not be proved
-ControlStructures.dfy(235,20): Error: assertion could not be proved
-ControlStructures.dfy(238,29): Error: assertion could not be proved
-ControlStructures.dfy(241,16): Error: assertion could not be proved
-ControlStructures.dfy(350,2): Error: cannot prove termination; try supplying a decreases clause for the loop
-ControlStructures.dfy(381,2): Error: cannot prove termination; try supplying a decreases clause for the loop
-ControlStructures.dfy(448,16): Error: this invariant could not be proved to be maintained by the loop
-ControlStructures.dfy(448,16): Related message: loop invariant violation
-
-Dafny program verifier finished with 18 verified, 13 errors
diff --git a/Test/dafny0/Corecursion.dfy.expect b/Test/dafny0/Corecursion.dfy.expect
deleted file mode 100644
index e20d2f68114..00000000000
--- a/Test/dafny0/Corecursion.dfy.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-Corecursion.dfy(17,12): Error: cannot prove termination; try supplying a decreases clause (note that only functions without side effects can be called co-recursively)
-Corecursion.dfy(23,12): Error: cannot prove termination; try supplying a decreases clause (note that only functions without any ensures clause can be called co-recursively)
-Corecursion.dfy(58,4): Error: cannot prove termination; try supplying a decreases clause
-Corecursion.dfy(71,15): Error: cannot prove termination; try supplying a decreases clause (note that calls cannot be co-recursive in this context)
-Corecursion.dfy(93,14): Error: cannot prove termination; try supplying a decreases clause (note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts)
-Corecursion.dfy(103,14): Error: cannot prove termination; try supplying a decreases clause (note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts)
-Corecursion.dfy(148,12): Error: decreases clause might not decrease (note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts)
-Corecursion.dfy(161,12): Error: decreases clause might not decrease (note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts)
-
-Dafny program verifier finished with 14 verified, 8 errors
diff --git a/Test/dafny0/CustomErrorMesage.dfy.expect b/Test/dafny0/CustomErrorMesage.dfy.expect
deleted file mode 100644
index e7443bcda7d..00000000000
--- a/Test/dafny0/CustomErrorMesage.dfy.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-CustomErrorMesage.dfy(6,45): Error: m: x must be positive
-CustomErrorMesage.dfy(10,45): Error: f: x must be positive
-CustomErrorMesage.dfy(15,2): Error: when calling foo, you must supply a positive x
-CustomErrorMesage.dfy(19,71): Related location
-CustomErrorMesage.dfy(18,15): Error: a postcondition could not be proved on this return path
-CustomErrorMesage.dfy(20,85): Related location: cannot establish that return value of foo is always negative
-CustomErrorMesage.dfy(26,14): Error: a precondition for this call could not be proved
-CustomErrorMesage.dfy(30,71): Related location: when calling bar, you must supply a positive x
-CustomErrorMesage.dfy(32,0): Error: a postcondition could not be proved on this return path
-CustomErrorMesage.dfy(31,85): Related location: cannot establish that return value of bar is always negative
-CustomErrorMesage.dfy(42,63): Error: this loop invariant could not be proved on entry
-CustomErrorMesage.dfy(42,63): Related message: position variable out of range
-CustomErrorMesage.dfy(42,63): Error: this invariant could not be proved to be maintained by the loop
-CustomErrorMesage.dfy(42,63): Related message: position variable out of range
-CustomErrorMesage.dfy(43,63): Error: this invariant could not be proved to be maintained by the loop
-CustomErrorMesage.dfy(43,63): Related message: output array doesn't match input arry
-
-Dafny program verifier finished with 1 verified, 9 errors
diff --git a/Test/dafny0/DafnyLibClient.dfy.expect b/Test/dafny0/DafnyLibClient.dfy.expect
deleted file mode 100644
index d587e6f900a..00000000000
--- a/Test/dafny0/DafnyLibClient.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Dafny program verifier finished with 3 verified, 0 errors
-
-Dafny program verifier finished with 1 verified, 0 errors
-hello from the library
-hello extern
-hello from a nested module
-bye
diff --git a/Test/dafny0/DefaultParameters.dfy.expect b/Test/dafny0/DefaultParameters.dfy.expect
deleted file mode 100644
index 4800b9149e0..00000000000
--- a/Test/dafny0/DefaultParameters.dfy.expect
+++ /dev/null
@@ -1,80 +0,0 @@
-DefaultParameters.dfy(55,23): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(63,42): Error: default value might not be allocated in the two-state function's previous state
-DefaultParameters.dfy(67,38): Error: default value might not be allocated in the two-state lemma's previous state
-DefaultParameters.dfy(92,2): Error: a postcondition could not be proved on this return path
-DefaultParameters.dfy(91,16): Related location: this is the postcondition that could not be proved
-DefaultParameters.dfy(102,15): Error: assertion could not be proved
-DefaultParameters.dfy(110,15): Error: assertion could not be proved
-DefaultParameters.dfy(148,38): Error: possible division by zero
-DefaultParameters.dfy(150,33): Error: possible division by zero
-DefaultParameters.dfy(153,24): Error: possible division by zero
-DefaultParameters.dfy(158,15): Error: possible division by zero
-DefaultParameters.dfy(178,41): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(179,33): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(124,37): Error: insufficient reads clause to read field
-DefaultParameters.dfy(131,40): Error: insufficient reads clause to read field
-DefaultParameters.dfy(135,49): Error: possible division by zero
-DefaultParameters.dfy(137,43): Error: possible division by zero
-DefaultParameters.dfy(140,34): Error: possible division by zero
-DefaultParameters.dfy(145,17): Error: possible division by zero
-DefaultParameters.dfy(160,43): Error: possible division by zero
-DefaultParameters.dfy(160,43): Error: possible division by zero
-DefaultParameters.dfy(162,38): Error: possible division by zero
-DefaultParameters.dfy(162,38): Error: possible division by zero
-DefaultParameters.dfy(165,29): Error: possible division by zero
-DefaultParameters.dfy(165,29): Error: possible division by zero
-DefaultParameters.dfy(170,15): Error: possible division by zero
-DefaultParameters.dfy(170,15): Error: possible division by zero
-DefaultParameters.dfy(172,45): Error: possible division by zero
-DefaultParameters.dfy(180,35): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(180,35): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(181,40): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(194,39): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(200,40): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(211,62): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(219,29): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(220,29): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(229,8): Error: decreases clause might not decrease
-DefaultParameters.dfy(235,4): Error: decreases clause might not decrease
-DefaultParameters.dfy(235,6): Error: decreases clause might not decrease
-DefaultParameters.dfy(241,4): Error: decreases clause might not decrease
-DefaultParameters.dfy(320,45): Error: a precondition for this call could not be proved
-DefaultParameters.dfy(319,15): Related location: this is the precondition that could not be proved
-DefaultParameters.dfy(326,36): Error: insufficient reads clause to read array element
-DefaultParameters.dfy(327,54): Error: insufficient reads clause to read array element
-DefaultParameters.dfy(251,31): Error: insufficient reads clause to read field
-DefaultParameters.dfy(258,40): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(267,41): Error: possible division by zero
-DefaultParameters.dfy(361,40): Error: possible division by zero
-DefaultParameters.dfy(362,32): Error: possible division by zero
-DefaultParameters.dfy(360,38): Error: possible division by zero
-DefaultParameters.dfy(363,37): Error: possible division by zero
-DefaultParameters.dfy(363,37): Error: possible division by zero
-DefaultParameters.dfy(365,38): Error: possible division by zero
-DefaultParameters.dfy(386,37): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(387,29): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(385,35): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(388,34): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(388,34): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(390,35): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(417,29): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(418,30): Error: cannot prove termination; try supplying a decreases clause
-DefaultParameters.dfy(419,21): Error: cannot prove termination; try supplying a decreases clause
-DefaultParameters.dfy(416,28): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(447,5): Error: cannot prove termination; try supplying a decreases clause
-DefaultParameters.dfy(438,27): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(443,28): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(453,32): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(481,32): Error: default-value expression is not allowed to involve recursive or mutually recursive calls
-DefaultParameters.dfy(493,18): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(494,32): Error: value does not satisfy the subset constraints of 'nat'
-DefaultParameters.dfy(500,15): Error: a precondition for this call could not be proved
-DefaultParameters.dfy(503,13): Related location: this is the precondition that could not be proved
-DefaultParameters.dfy(521,40): Error: insufficient reads clause to read field
-DefaultParameters.dfy(524,49): Error: insufficient reads clause to read field
-DefaultParameters.dfy(520,38): Error: insufficient reads clause to read field
-DefaultParameters.dfy(548,38): Error: insufficient reads clause to read field
-DefaultParameters.dfy(601,11): Error: assertion could not be proved
-DefaultParameters.dfy(582,18): Related location
-
-Dafny program verifier finished with 73 verified, 74 errors
diff --git a/Test/dafny0/Definedness.dfy.expect b/Test/dafny0/Definedness.dfy.expect
deleted file mode 100644
index 91840dfb508..00000000000
--- a/Test/dafny0/Definedness.dfy.expect
+++ /dev/null
@@ -1,54 +0,0 @@
-Definedness.dfy(215,15): Error: a postcondition could not be proved on this return path
-Definedness.dfy(217,45): Related location: this is the postcondition that could not be proved
-Definedness.dfy(224,21): Error: target object might be null
-Definedness.dfy(237,15): Error: a postcondition could not be proved on this return path
-Definedness.dfy(240,23): Related location: this is the postcondition that could not be proved
-Definedness.dfy(11,6): Error: possible division by zero
-Definedness.dfy(18,15): Error: possible division by zero
-Definedness.dfy(27,15): Error: target object might be null
-Definedness.dfy(28,20): Error: target object might be null
-Definedness.dfy(29,16): Error: possible division by zero
-Definedness.dfy(36,15): Error: target object might be null
-Definedness.dfy(45,15): Error: target object might be null
-Definedness.dfy(53,17): Error: target object might be null
-Definedness.dfy(54,2): Error: a postcondition could not be proved on this return path
-Definedness.dfy(53,21): Related location: this is the postcondition that could not be proved
-Definedness.dfy(60,17): Error: target object might be null
-Definedness.dfy(61,2): Error: a postcondition could not be proved on this return path
-Definedness.dfy(60,21): Related location: this is the postcondition that could not be proved
-Definedness.dfy(68,2): Error: a postcondition could not be proved on this return path
-Definedness.dfy(67,21): Related location: this is the postcondition that could not be proved
-Definedness.dfy(88,6): Error: target object might be null
-Definedness.dfy(89,4): Error: function precondition could not be proved
-Definedness.dfy(79,15): Related location
-Definedness.dfy(89,9): Error: assignment might update an object not in the enclosing context's modifies clause
-Definedness.dfy(89,9): Error: target object might be null
-Definedness.dfy(90,9): Error: function precondition could not be proved
-Definedness.dfy(79,15): Related location
-Definedness.dfy(95,13): Error: possible division by zero
-Definedness.dfy(95,22): Error: possible division by zero
-Definedness.dfy(96,14): Error: possible division by zero
-Definedness.dfy(101,11): Error: possible division by zero
-Definedness.dfy(108,14): Error: possible division by zero
-Definedness.dfy(117,22): Error: function precondition could not be proved
-Definedness.dfy(79,15): Related location
-Definedness.dfy(123,16): Error: function precondition could not be proved
-Definedness.dfy(79,15): Related location
-Definedness.dfy(133,16): Error: function precondition could not be proved
-Definedness.dfy(79,15): Related location
-Definedness.dfy(133,21): Error: this loop invariant could not be proved on entry
-Definedness.dfy(133,21): Related message: loop invariant violation
-Definedness.dfy(134,16): Error: function precondition could not be proved
-Definedness.dfy(79,15): Related location
-Definedness.dfy(143,14): Error: possible division by zero
-Definedness.dfy(162,14): Error: possible division by zero
-Definedness.dfy(175,27): Error: this loop invariant could not be proved on entry
-Definedness.dfy(175,27): Related message: loop invariant violation
-Definedness.dfy(181,16): Error: function precondition could not be proved
-Definedness.dfy(79,15): Related location
-Definedness.dfy(196,18): Error: possible division by zero
-Definedness.dfy(196,22): Error: this loop invariant could not be proved on entry
-Definedness.dfy(196,22): Related message: loop invariant violation
-Definedness.dfy(196,27): Error: possible division by zero
-
-Dafny program verifier finished with 9 verified, 37 errors
diff --git a/Test/dafny0/Deprecation.dfy b/Test/dafny0/Deprecation.dfy
deleted file mode 100644
index 86521043d43..00000000000
--- a/Test/dafny0/Deprecation.dfy
+++ /dev/null
@@ -1,33 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-// This file contains tests for messags about various deprecated features.
-// As those features go away completely, so can the corresponding tests.
-
-method Main() {
-  // Test that we get all the way to compilation, despite the deprecation warnings below
-  print "yet here we are\n";
-}
-
-// ----------
-
-class C {
-  constructor ()
-    modifies this  // deprecation warning: "this" is no longer needed in modifies of a constructor
-  {
-  }
-}
-
-// ----------
-
-inductive predicate InductivePredicate()  // deprecation warning: "inductive predicate" has been renamed to "least predicate"
-{ true }
-
-copredicate CoPredicate()  // deprecation warning: "copredicate" has been renamed to "greatest predicate"
-{ true }
-
-inductive lemma InductiveLemma()  // deprecation warning: "inductive lemma" has been renamed to "least lemma"
-{ }
-
-colemma CoLemma()  // deprecation warning: "colemma" has been renamed to "greatest lemma"
-{ }
-
diff --git a/Test/dafny0/Deprecation.dfy.verifier.expect b/Test/dafny0/Deprecation.dfy.verifier.expect
deleted file mode 100644
index c0851e9888c..00000000000
--- a/Test/dafny0/Deprecation.dfy.verifier.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-Deprecation.dfy(15,13): Warning: constructors no longer need 'this' to be listed in modifies clauses
-Deprecation.dfy(22,0): Warning: the old keyword phrase 'inductive predicate' has been renamed to 'least predicate'
-Deprecation.dfy(25,0): Warning: the old keyword 'copredicate' has been renamed to the keyword phrase 'greatest predicate'
-Deprecation.dfy(28,0): Warning: the old keyword phrase 'inductive lemma' has been renamed to 'least lemma'
-Deprecation.dfy(31,0): Warning: the old keyword 'colemma' has been renamed to the keyword phrase 'greatest lemma'
diff --git a/Test/dafny0/DiamondImports.dfy.expect b/Test/dafny0/DiamondImports.dfy.expect
deleted file mode 100644
index 8eff803103b..00000000000
--- a/Test/dafny0/DiamondImports.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-DiamondImports.dfy(34,15): Error: assertion could not be proved
-DiamondImports.dfy(50,15): Error: assertion could not be proved
-DiamondImports.dfy(101,15): Error: assertion could not be proved
-DiamondImports.dfy(120,15): Error: assertion could not be proved
-DiamondImports.dfy(140,25): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 5 errors
diff --git a/Test/dafny0/DirtyLoops.dfy.expect b/Test/dafny0/DirtyLoops.dfy.expect
deleted file mode 100644
index 8f59138f6bb..00000000000
--- a/Test/dafny0/DirtyLoops.dfy.expect
+++ /dev/null
@@ -1,141 +0,0 @@
-DirtyLoops.dfy(515,2): Warning: /!\ No terms found to trigger on.
-DirtyLoops.dfy(515,2): Warning: the conclusion of the body of this forall statement will not be known outside the forall statement; consider using an 'ensures' clause
-DirtyLoops.dfy(26,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy(35,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy(46,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy(55,2): Warning: note, this loop has no body (loop frame: i, s)
-DirtyLoops.dfy(68,2): Warning: note, this loop has no body (loop frame: i, s, $Heap)
-DirtyLoops.dfy(80,2): Warning: note, this loop has no body (loop frame: i, s, r)
-DirtyLoops.dfy(88,2): Warning: note, this loop has no body
-DirtyLoops.dfy(106,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy(118,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy(130,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(145,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(159,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(173,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(189,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(203,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(216,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(229,2): Warning: note, this loop has no body (loop frame: i, k)
-DirtyLoops.dfy(242,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(251,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy(260,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(268,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(279,2): Warning: note, this loop has no body (loop frame: i, k)
-DirtyLoops.dfy(293,2): Warning: note, this loop has no body (loop frame: i, k)
-DirtyLoops.dfy(305,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy(319,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(332,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy(343,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy(354,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy(365,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy(377,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy(388,2): Warning: note, this loop has no body (loop frame: i, k)
-DirtyLoops.dfy(400,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy(413,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy(497,2): Warning: note, this forall statement has no body
-DirtyLoops.dfy(504,2): Warning: note, this forall statement has no body
-DirtyLoops.dfy(512,2): Warning: note, this forall statement has no body
-DirtyLoops.dfy(515,2): Warning: note, this forall statement has no body
-DirtyLoops.dfy(531,2): Warning: note, this loop has no body (loop frame: x)
-DirtyLoops.dfy(427,4): Warning: note, this loop has no body (loop frame: $Heap)
-DirtyLoops.dfy(436,4): Warning: note, this loop has no body (loop frame: $Heap)
-DirtyLoops.dfy(452,6): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(468,6): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy(485,6): Warning: note, this loop has no body (loop frame: j, $Heap)
-DirtyLoops.dfy(30,11): Error: assertion could not be proved
-DirtyLoops.dfy(39,11): Error: assertion could not be proved
-DirtyLoops.dfy(48,11): Error: assertion could not be proved
-DirtyLoops.dfy(57,11): Error: assertion could not be proved
-DirtyLoops.dfy(59,12): Error: assertion could not be proved
-DirtyLoops.dfy(70,11): Error: assertion could not be proved
-DirtyLoops.dfy(72,11): Error: assertion could not be proved
-DirtyLoops.dfy(82,11): Error: assertion could not be proved
-DirtyLoops.dfy(83,11): Error: assertion could not be proved
-DirtyLoops.dfy(90,11): Error: assertion could not be proved
-DirtyLoops.dfy(110,11): Error: assertion could not be proved
-DirtyLoops.dfy(122,11): Error: assertion could not be proved
-DirtyLoops.dfy(136,14): Error: assertion could not be proved
-DirtyLoops.dfy(137,11): Error: assertion could not be proved
-DirtyLoops.dfy(149,14): Error: assertion could not be proved
-DirtyLoops.dfy(151,11): Error: assertion could not be proved
-DirtyLoops.dfy(164,14): Error: assertion could not be proved
-DirtyLoops.dfy(165,14): Error: assertion could not be proved
-DirtyLoops.dfy(180,14): Error: assertion could not be proved
-DirtyLoops.dfy(181,11): Error: assertion could not be proved
-DirtyLoops.dfy(193,14): Error: assertion could not be proved
-DirtyLoops.dfy(195,14): Error: assertion could not be proved
-DirtyLoops.dfy(196,11): Error: assertion could not be proved
-DirtyLoops.dfy(208,11): Error: assertion could not be proved
-DirtyLoops.dfy(221,11): Error: assertion could not be proved
-DirtyLoops.dfy(234,11): Error: assertion could not be proved
-DirtyLoops.dfy(244,11): Error: assertion could not be proved
-DirtyLoops.dfy(253,11): Error: assertion could not be proved
-DirtyLoops.dfy(261,13): Error: assertion could not be proved
-DirtyLoops.dfy(270,13): Error: assertion could not be proved
-DirtyLoops.dfy(285,11): Error: assertion could not be proved
-DirtyLoops.dfy(297,11): Error: assertion could not be proved
-DirtyLoops.dfy(298,11): Error: assertion could not be proved
-DirtyLoops.dfy(308,11): Error: assertion could not be proved
-DirtyLoops.dfy(309,11): Error: assertion could not be proved
-DirtyLoops.dfy(321,13): Error: assertion could not be proved
-DirtyLoops.dfy(356,13): Error: assertion could not be proved
-DirtyLoops.dfy(369,13): Error: assertion could not be proved
-DirtyLoops.dfy(380,9): Error: assertion could not be proved
-DirtyLoops.dfy(401,18): Error: this loop invariant could not be proved on entry
-DirtyLoops.dfy(401,18): Related message: loop invariant violation
-DirtyLoops.dfy(414,16): Error: target object might be null
-DirtyLoops.dfy(506,22): Error: assertion could not be proved
-DirtyLoops.dfy(533,11): Error: assertion could not be proved
-DirtyLoops.dfy(452,6): Error: loop modifies clause might violate context's modifies clause
-DirtyLoops.dfy(468,6): Error: loop modifies clause might violate context's modifies clause
-DirtyLoops.dfy(485,6): Error: loop modifies clause might violate context's modifies clause
-
-Dafny program verifier finished with 22 verified, 46 errors
-DirtyLoops.dfy.tmp.dprint.dfy(410,2): Warning: /!\ No terms found to trigger on.
-DirtyLoops.dfy.tmp.dprint.dfy(410,2): Warning: the conclusion of the body of this forall statement will not be known outside the forall statement; consider using an 'ensures' clause
-DirtyLoops.dfy.tmp.dprint.dfy(8,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy.tmp.dprint.dfy(18,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy.tmp.dprint.dfy(29,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy.tmp.dprint.dfy(38,2): Warning: note, this loop has no body (loop frame: i, s)
-DirtyLoops.dfy.tmp.dprint.dfy(52,2): Warning: note, this loop has no body (loop frame: i, s, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(65,2): Warning: note, this loop has no body (loop frame: i, s, r)
-DirtyLoops.dfy.tmp.dprint.dfy(74,2): Warning: note, this loop has no body
-DirtyLoops.dfy.tmp.dprint.dfy(84,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy.tmp.dprint.dfy(96,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy.tmp.dprint.dfy(108,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(123,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(137,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(151,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(167,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(181,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(194,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(207,2): Warning: note, this loop has no body (loop frame: i, k)
-DirtyLoops.dfy.tmp.dprint.dfy(220,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(229,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy.tmp.dprint.dfy(238,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(246,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(256,2): Warning: note, this loop has no body (loop frame: i, k)
-DirtyLoops.dfy.tmp.dprint.dfy(269,2): Warning: note, this loop has no body (loop frame: i, k)
-DirtyLoops.dfy.tmp.dprint.dfy(282,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(296,2): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(309,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy.tmp.dprint.dfy(320,2): Warning: note, this loop has no body (loop frame: i)
-DirtyLoops.dfy.tmp.dprint.dfy(331,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(342,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(354,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(365,2): Warning: note, this loop has no body (loop frame: i, k)
-DirtyLoops.dfy.tmp.dprint.dfy(375,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(386,2): Warning: note, this loop has no body (loop frame: i, k, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(392,2): Warning: note, this forall statement has no body
-DirtyLoops.dfy.tmp.dprint.dfy(399,2): Warning: note, this forall statement has no body
-DirtyLoops.dfy.tmp.dprint.dfy(408,2): Warning: note, this forall statement has no body
-DirtyLoops.dfy.tmp.dprint.dfy(410,2): Warning: note, this forall statement has no body
-DirtyLoops.dfy.tmp.dprint.dfy(416,2): Warning: note, this loop has no body (loop frame: x)
-DirtyLoops.dfy.tmp.dprint.dfy(446,4): Warning: note, this loop has no body (loop frame: $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(455,4): Warning: note, this loop has no body (loop frame: $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(471,6): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(487,6): Warning: note, this loop has no body (loop frame: i, $Heap)
-DirtyLoops.dfy.tmp.dprint.dfy(504,6): Warning: note, this loop has no body (loop frame: j, $Heap)
-
-Dafny program verifier did not attempt verification
diff --git a/Test/dafny0/DiscoverBounds.dfy b/Test/dafny0/DiscoverBounds.dfy
deleted file mode 100644
index 18e56158613..00000000000
--- a/Test/dafny0/DiscoverBounds.dfy
+++ /dev/null
@@ -1,71 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-newtype NT = x | 0 <= x < 100
-newtype UT = NT
-
-newtype Lower = x | -2 <= x
-newtype Upper = x: Lower | x < 100
-
-newtype Int = int
-
-newtype NR = r | -2.0 <= r <= 5.4
-
-method Main()
-{
-  var n: NT :| true;
-  var t: UT :| true;
-
-  var u: Upper :| true;
-  var l: Lower :| l < 20;
-  var o: Lower :| true;
-
-  var j: Int :| true;
-
-  print n, "\n";
-  print t, "\n";
-  print u, "\n";
-  print l, "\n";
-  print o, "\n";
-
-  var b: bool;
-  b := forall n': NT :: true ==> P(n' as int);
-  b := forall t': UT :: true ==> P(t' as int);
-  b := forall u': Upper :: true ==> P(u' as int);
-  b := forall l': Lower :: l' < 20 ==> P(l' as int);
-  b := forall j': Int :: -3 <= j' < 7 ==> P(j' as int);
-
-  var x0, x1, x2, x3, x4, x5 := OtherEq(false, {}, [], map[198 := 200], multiset{}, iset{}, imap[]);
-  print x0, " ", x1, " ", x2, " ", x3, " ", x4, " ", x5, "\n";
-  x0, x1, x2, x3, x4, x5 := OtherEq(true, {}, [], map[198 := 200], multiset{}, iset{}, imap[]);
-  print x0, " ", x1, " ", x2, " ", x3, " ", x4, " ", x5, "\n";
-}
-
-predicate P(x: int)
-{
-  x == 157
-}
-
-predicate Q(r: real)
-{
-  r / 2.0 <= r
-}
-
-method OtherEq<U,V(==)>(b: bool, s: set<int>, t: seq<real>, u: map<U,V>, v: multiset<char>, w: iset<bv12>, x: imap<bv28,int>)
-  returns (s': set<int>, t': seq<real>, u': map<U,V>, v': multiset<char>, w': iset<bv12>, x': imap<bv28,int>)
-{
-  if b {
-    s' :| s' == s;
-    t' :| t' == t;
-    u' :| u' == u;
-    v' :| v' == v;
-    w' :| w' == w;
-    x' :| x' == x;
-  } else {
-    s' := var s'' :| s'' == s; s'';
-    t' := var t'' :| t'' == t; t'';
-    u' := var u'' :| u'' == u; u'';
-    v' := var v'' :| v'' == v; v'';
-    w' := var w'' :| w'' == w; w'';
-    x' := var x'' :| x'' == x; x'';
-  }
-}
diff --git a/Test/dafny0/DiscoverBounds.dfy.expect b/Test/dafny0/DiscoverBounds.dfy.expect
deleted file mode 100644
index 909a58326d0..00000000000
--- a/Test/dafny0/DiscoverBounds.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-0
-0
--2
--2
--2
-{} [] map[198 := 200] multiset{} {} map[]
-{} [] map[198 := 200] multiset{} {} map[]
diff --git a/Test/dafny0/DiscoverBounds.dfy.verifier.expect b/Test/dafny0/DiscoverBounds.dfy.verifier.expect
deleted file mode 100644
index 7c4de01ee0e..00000000000
--- a/Test/dafny0/DiscoverBounds.dfy.verifier.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-DiscoverBounds.dfy(31,7): Warning: /!\ No terms found to trigger on.
-DiscoverBounds.dfy(32,7): Warning: /!\ No terms found to trigger on.
-DiscoverBounds.dfy(33,7): Warning: /!\ No terms found to trigger on.
-DiscoverBounds.dfy(34,7): Warning: /!\ No terms found to trigger on.
-DiscoverBounds.dfy(35,7): Warning: /!\ No terms found to trigger on.
diff --git a/Test/dafny0/DiscoverBoundsErrors.dfy b/Test/dafny0/DiscoverBoundsErrors.dfy
deleted file mode 100644
index ff8c58de3dd..00000000000
--- a/Test/dafny0/DiscoverBoundsErrors.dfy
+++ /dev/null
@@ -1,79 +0,0 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-newtype Lower = x | -2 <= x
-
-newtype NR = r | -2.0 <= r <= 5.4
-
-method Main()
-{
-  var b;
-  b := forall o': Lower :: true ==> P(o' as int);  // error: cannot find finite range
-  b := forall r: real :: 0.0 <= r <= 100.0 ==> Q(r);  // error: cannot find finite range
-  b := forall r': NR :: true ==> Q(r' as real);  // error: cannot find finite range
-}
-
-predicate P(x: int)
-{
-  x == 157
-}
-
-predicate Q(r: real)
-{
-  r / 2.0 <= r
-}
-
-method ForallStmt_Int()
-{
-  var a := new real[8](i => i as real - 4.0);
-  var b := new real[8];
-  var c := new bool[8];
-  forall i | 6 <= 2*(i+3) && i < a.Length {  // error: heuristics too weak to detect this range is compilable
-    b[7-i] := a[i] + 4.0;
-  }
-  forall i | true {  // error: non-compilable range
-    c[if 0 <= i < a.Length then i else 0] :=
-      var j := if 0 <= i < a.Length then i else 0;
-      a[j] < b[j];
-  }
-}
-
-method ForallStmt_Objects(ks: set<K>)
-  requires ks != {}
-  modifies ks
-{
-  print "max: ", Max(ks), "\n";
-  forall k | k in ks {
-    k.u := 57;
-  }
-  print "max: ", Max(ks), "\n";
-
-  var myK := new K;
-  forall k: K | true {  // error: non-compilable range
-    (if k in ks then k else myK).u := 57;
-  }
-}
-
-class K {
-  var u: int
-}
-
-function Max(ks: set<K>): int
-  requires ks != {}
-  reads ks
-{
-  MaxExists(ks);
-  var k :| k in ks && forall m :: m in ks ==> m.u <= k.u;
-  k.u
-}
-
-lemma MaxExists(ks: set<K>)
-  requires ks != {}
-  ensures exists k :: k in ks && forall m :: m in ks ==> m.u <= k.u
-{
-  var k :| k in ks;
-  if m :| m in ks && k.u < m.u {
-    assert |{k,m}| == 2;
-    MaxExists(ks - {k});
-  }
-}
diff --git a/Test/dafny0/DiscoverBoundsErrors.dfy.expect b/Test/dafny0/DiscoverBoundsErrors.dfy.expect
deleted file mode 100644
index 22697debbef..00000000000
--- a/Test/dafny0/DiscoverBoundsErrors.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-DiscoverBoundsErrors.dfy(11,7): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'o''
-DiscoverBoundsErrors.dfy(12,7): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'r'
-DiscoverBoundsErrors.dfy(13,7): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'r''
-DiscoverBoundsErrors.dfy(31,2): Error: forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
-DiscoverBoundsErrors.dfy(34,2): Error: forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
-DiscoverBoundsErrors.dfy(52,2): Error: forall statements in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'k'
-6 resolution/type errors detected in DiscoverBoundsErrors.dfy
diff --git a/Test/dafny0/DividedConstructors.dfy.verifier.expect b/Test/dafny0/DividedConstructors.dfy.verifier.expect
deleted file mode 100644
index f3fdfadddbf..00000000000
--- a/Test/dafny0/DividedConstructors.dfy.verifier.expect
+++ /dev/null
@@ -1 +0,0 @@
-DividedConstructors.dfy(61,9): Warning: the ... refinement feature in statements is deprecated
diff --git a/Test/dafny0/EqualityTypesModuleExports.dfy.expect b/Test/dafny0/EqualityTypesModuleExports.dfy.expect
deleted file mode 100644
index 332185378c4..00000000000
--- a/Test/dafny0/EqualityTypesModuleExports.dfy.expect
+++ /dev/null
@@ -1,63 +0,0 @@
-EqualityTypesModuleExports.dfy(50,11): Error: type parameter (X) passed to type Dt0 must support equality (got M) (perhaps try declaring type parameter 'M' on line 48 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(51,11): Error: type parameter (Y) passed to type Dt1 must support equality (got M) (perhaps try declaring type parameter 'M' on line 48 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(52,11): Error: type parameter (Z) passed to type Dt2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 48 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(65,11): Error: type parameter 0 (X) passed to type Co0 must support equality (got M) (perhaps try declaring type parameter 'M' on line 63 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(66,11): Error: type parameter 0 (Y) passed to type Co1 must support equality (got M) (perhaps try declaring type parameter 'M' on line 63 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(67,11): Error: type parameter 0 (Z) passed to type Co2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 63 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(99,11): Error: type parameter 0 (B) passed to type Opaque2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(105,12): Error: type parameter 1 (C) passed to type O'Pake2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(110,11): Error: type parameter (A) passed to type Syn2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(115,11): Error: type parameter (A) passed to type Syn5 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(117,11): Error: type parameter 0 (C) passed to type Syn6 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(121,11): Error: type parameter (A) passed to type Subset1 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(123,11): Error: type parameter (A) passed to type Subset2 must support equality (got M) (perhaps try declaring type parameter 'M' on line 94 as 'M(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(133,11): Error: type parameter (A) passed to type Syn5 must support equality (got ListWithALittlExtra<int>)
-EqualityTypesModuleExports.dfy(134,11): Error: type parameter (A) passed to type Syn5 must support equality (got Co2<int, int>)
-EqualityTypesModuleExports.dfy(135,11): Error: type parameter (A) passed to type Syn5 must support equality (got Opaque0) (perhaps try declaring abstract type 'Opaque0' on line 73 as 'Opaque0(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(139,11): Error: type parameter (A) passed to type Syn5 must support equality (got Syn1<int -> int>)
-EqualityTypesModuleExports.dfy(13,8): Error: set argument type must support equality (got Klm) (perhaps try declaring type parameter 'Klm' on line 11 as 'Klm(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(13,23): Error: set argument type must support equality (got Klm) (perhaps try declaring type parameter 'Klm' on line 11 as 'Klm(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(32,15): Error: type parameter (X) passed to function Fib must support equality (got Y) (perhaps try declaring type parameter 'Y' on line 26 as 'Y(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(32,23): Error: set argument type must support equality (got Y) (perhaps try declaring type parameter 'Y' on line 26 as 'Y(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(34,13): Error: set argument type must support equality (got GG) (perhaps try declaring type parameter 'GG' on line 21 as 'GG(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(84,7): Error: type 'Syn4' declared as supporting equality, but the RHS type ((real, A)) might not
-EqualityTypesModuleExports.dfy(92,7): Error: type 'Subset4' declared as supporting equality, but the RHS type ((A, int)) might not
-EqualityTypesModuleExports.dfy(153,11): Error: type parameter (A) passed to type MyClass must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(154,11): Error: type parameter (A) passed to type Dt must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(155,11): Error: type parameter (A) passed to type Co must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(156,11): Error: type parameter (A) passed to type Syn must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(157,11): Error: type parameter (A) passed to type SubsetCo must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(149,7): Error: recursive constraint dependency involving a subset type: SubsetCo -> Co -> SubsetCo
-EqualityTypesModuleExports.dfy(174,11): Error: type parameter (A) passed to type MyClass must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(175,11): Error: type parameter (A) passed to type Dt must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(176,11): Error: type parameter (A) passed to type Co must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(177,11): Error: type parameter (A) passed to type Syn must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(178,11): Error: type parameter (A) passed to type SubsetCo must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(170,7): Error: recursive constraint dependency involving a subset type: SubsetCo -> Co -> SubsetCo
-EqualityTypesModuleExports.dfy(195,11): Error: type parameter (A) passed to type MyClass must support equality (got Noeq)
-EqualityTypesModuleExports.dfy(188,22): Error: set argument type must support equality (got A) (perhaps try declaring type parameter 'A' on line 188 as 'A(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(189,24): Error: iset argument type must support equality (got A) (perhaps try declaring type parameter 'A' on line 189 as 'A(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(191,7): Error: recursive constraint dependency involving a subset type: SubsetCo -> Co -> SubsetCo
-EqualityTypesModuleExports.dfy(214,7): Error: type 'Opa', which does not support equality, is used to refine an abstract type with equality support
-EqualityTypesModuleExports.dfy(230,12): Error: type parameter (A) passed to type S must support equality (got GGG.Opa'<int>) (perhaps try declaring abstract type 'Opa'' on line 208 as 'Opa'(==)', which says it can only be instantiated with a type that supports equality)
-EqualityTypesModuleExports.dfy(231,12): Error: type parameter (A) passed to type S must support equality (got GGG.Syn'<int>)
-EqualityTypesModuleExports.dfy(232,12): Error: type parameter (A) passed to type S must support equality (got GGG.Sub'<int>)
-EqualityTypesModuleExports.dfy(249,7): Error: == can only be applied to expressions of types that support equality (got WWW0.XT)
-EqualityTypesModuleExports.dfy(252,7): Error: == can only be applied to expressions of types that support equality (got WWW0.YT)
-EqualityTypesModuleExports.dfy(255,7): Error: == can only be applied to expressions of types that support equality (got WWW0.ZT)
-EqualityTypesModuleExports.dfy(258,7): Error: == can only be applied to expressions of types that support equality (got WWW0.WT)
-EqualityTypesModuleExports.dfy(283,7): Error: type 'A' declared as supporting equality, but the RHS type (QQQ1.Syn<int>) might not
-EqualityTypesModuleExports.dfy(298,7): Error: type 'ExportedType' declared as supporting equality, but the RHS type (PrivateType<A>) might not
-EqualityTypesModuleExports.dfy(346,4): Error: == can only be applied to expressions of types that support equality (got List<A>)
-EqualityTypesModuleExports.dfy(366,9): Warning: note, this export set is empty (did you perhaps forget the 'provides' or 'reveals' keyword?)
-EqualityTypesModuleExports.dfy(409,7): Error: type 'Synonym' declared as being nonempty, but the RHS type (Empty) may be empty
-EqualityTypesModuleExports.dfy(410,7): Error: type 'AnotherSynonym' declared as being nonempty, but the RHS type (Empty) may be empty
-EqualityTypesModuleExports.dfy(413,7): Error: type 'NESynonym' declared as auto-initialization type, but the RHS type (NonEmpty) does not support auto-initialization
-EqualityTypesModuleExports.dfy(417,7): Error: type 'NoReference' declared as containing no reference types, but the RHS type (C?) may contain reference types
-EqualityTypesModuleExports.dfy(420,7): Error: type 'PipeDreamEquality' declared as supporting equality, but the RHS type (Stream) might not
-EqualityTypesModuleExports.dfy(425,7): Error: type 'Subset' declared as being nonempty, but the RHS type (Empty) may be empty
-EqualityTypesModuleExports.dfy(426,7): Error: type 'AnotherSubset' declared as being nonempty, but the RHS type (Empty) may be empty
-EqualityTypesModuleExports.dfy(429,7): Error: type 'NESynonym' declared as auto-initialization type, but the RHS type (NonEmpty) does not support auto-initialization
-EqualityTypesModuleExports.dfy(433,7): Error: type 'NoReference' declared as containing no reference types, but the RHS type (C?) may contain reference types
-EqualityTypesModuleExports.dfy(436,7): Error: type 'PipeDreamEquality' declared as supporting equality, but the RHS type (Stream) might not
-61 resolution/type errors detected in EqualityTypesModuleExports.dfy
diff --git a/Test/dafny0/ExternNegative2.dfy b/Test/dafny0/ExternNegative2.dfy
deleted file mode 100644
index 8a530190e0f..00000000000
--- a/Test/dafny0/ExternNegative2.dfy
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-module {:extern "Modx"} Mod1
-{
-  class {:extern "classx"} Class1
-  {
-    static ghost function {:extern "Fun1x"} Fun1() : int
-      ensures Fun1() > 0
-    static method {:extern "Method1x"} Method1() returns (x: int)
-      ensures x > 0
-    static ghost function Fun2() : int
-      ensures Fun2() > 0
-    {
-      Fun1()
-    }
-    static method Method2() returns (x: int)
-      ensures x > 0
-    {
-      x := Method1();
-    }
-  }
-}
-// Will give error about duplicate CompileName for module.
-module {:extern "Modx"} Mod2
-{
-}
diff --git a/Test/dafny0/ExtremeReads.dfy.expect b/Test/dafny0/ExtremeReads.dfy.expect
deleted file mode 100644
index fa1b35943b7..00000000000
--- a/Test/dafny0/ExtremeReads.dfy.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-ExtremeReads.dfy(47,11): Error: assertion could not be proved
-ExtremeReads.dfy(13,20): Related location
-ExtremeReads.dfy(50,11): Error: assertion could not be proved
-ExtremeReads.dfy(13,20): Related location
-ExtremeReads.dfy(69,11): Error: assertion could not be proved
-ExtremeReads.dfy(20,20): Related location
-ExtremeReads.dfy(83,11): Error: assertion could not be proved
-ExtremeReads.dfy(26,2): Related location
-ExtremeReads.dfy(105,11): Error: assertion could not be proved
-ExtremeReads.dfy(89,2): Related location
-ExtremeReads.dfy(127,11): Error: assertion could not be proved
-ExtremeReads.dfy(9,19): Related location
-ExtremeReads.dfy(127,11): Error: assertion could not be proved
-ExtremeReads.dfy(13,20): Related location
-ExtremeReads.dfy(130,11): Error: assertion could not be proved
-ExtremeReads.dfy(9,19): Related location
-ExtremeReads.dfy(130,11): Error: assertion could not be proved
-ExtremeReads.dfy(13,20): Related location
-ExtremeReads.dfy(149,11): Error: assertion could not be proved
-ExtremeReads.dfy(16,19): Related location
-ExtremeReads.dfy(149,11): Error: assertion could not be proved
-ExtremeReads.dfy(20,20): Related location
-ExtremeReads.dfy(168,11): Error: assertion could not be proved
-ExtremeReads.dfy(23,19): Related location
-ExtremeReads.dfy(168,11): Error: assertion could not be proved
-ExtremeReads.dfy(26,2): Related location
-ExtremeReads.dfy(171,11): Error: assertion could not be proved
-ExtremeReads.dfy(23,19): Related location
-ExtremeReads.dfy(171,11): Error: assertion could not be proved
-ExtremeReads.dfy(26,2): Related location
-ExtremeReads.dfy(181,11): Error: assertion could not be proved
-ExtremeReads.dfy(86,16): Related location
-ExtremeReads.dfy(181,11): Error: assertion could not be proved
-ExtremeReads.dfy(89,2): Related location
-
-Dafny program verifier finished with 10 verified, 17 errors
diff --git a/Test/dafny0/ForLoops.dfy.expect b/Test/dafny0/ForLoops.dfy.expect
deleted file mode 100644
index a24b56923d0..00000000000
--- a/Test/dafny0/ForLoops.dfy.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-ForLoops.dfy(333,2): Warning: note, this loop has no body (loop frame: i, j)
-ForLoops.dfy(342,2): Warning: note, this loop has no body (loop frame: i, j)
-ForLoops.dfy(351,2): Warning: note, this loop has no body (loop frame: i, j)
-ForLoops.dfy(360,2): Warning: note, this loop has no body (loop frame: i, j)
-ForLoops.dfy(369,2): Warning: note, this loop has no body (loop frame: i, x)
-ForLoops.dfy(19,13): Error: assertion could not be proved
-ForLoops.dfy(24,11): Error: lower bound must not exceed upper bound
-ForLoops.dfy(116,11): Error: assertion could not be proved
-ForLoops.dfy(150,17): Error: possible division by zero
-ForLoops.dfy(155,21): Error: lower bound must not exceed upper bound
-ForLoops.dfy(204,6): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'Even'
-ForLoops.dfy(218,6): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NineToFive'
-ForLoops.dfy(225,6): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NineToFive'
-ForLoops.dfy(230,6): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NineToFive'
-ForLoops.dfy(238,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NineToFive'
-ForLoops.dfy(241,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NineToFive'
-ForLoops.dfy(272,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'nat'
-ForLoops.dfy(275,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'nat'
-ForLoops.dfy(287,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NotSeven'
-ForLoops.dfy(290,8): Error: entire range must be assignable to index variable, but some value does not satisfy the subset constraints of 'NotSeven'
-ForLoops.dfy(298,22): Error: result of operation might violate newtype constraint for 'byte'
-ForLoops.dfy(306,17): Error: result of operation might violate newtype constraint for 'byte'
-ForLoops.dfy(311,16): Error: result of operation might violate newtype constraint for 'byte'
-ForLoops.dfy(344,11): Error: assertion could not be proved
-ForLoops.dfy(362,11): Error: assertion could not be proved
-ForLoops.dfy(372,11): Error: assertion could not be proved
-ForLoops.dfy(415,28): Error: this invariant could not be proved to be maintained by the loop
-ForLoops.dfy(415,28): Related message: loop invariant violation
-ForLoops.dfy(434,26): Error: decreases expression must be bounded below by 0 at end of loop iteration
-ForLoops.dfy(443,18): Error: decreases expression must be bounded below by 0 at end of loop iteration
-ForLoops.dfy(457,9): Error: assertion could not be proved
-
-Dafny program verifier finished with 23 verified, 25 errors
diff --git a/Test/dafny0/ForallCompilation.dfy b/Test/dafny0/ForallCompilation.dfy
deleted file mode 100644
index 23b5fd56936..00000000000
--- a/Test/dafny0/ForallCompilation.dfy
+++ /dev/null
@@ -1,105 +0,0 @@
-// NONUNIFORM: New CLI doesn't support /autoTriggers:0
-// RUN: %dafny /compile:3 /print:"%t.print" /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main() {
-  var c := new MyClass;
-  c.arr := new int[10,20];
-  c.K0(3, 12);
-  c.K1(3, 12);
-  c.K2(3, 12);
-  c.K3(3, 12);
-  c.K4(12);
-  c.M();
-  c.N();
-  c.P();
-  c.Q();
-}
-
-class MyClass
-{
-  var arr: array2<int>
-
-  method K0(i: int, j: int)
-    requires 0 <= i < arr.Length0 && 0 <= j < arr.Length1
-    modifies arr
-  {
-    forall k | k in {-3, 4} {
-      arr[i,j] := 50;
-    }
-  }
-
-  method K1(i: int, j: int)
-    requires 0 <= i < arr.Length0 && 0 <= j < arr.Length1
-    // note the absence of a modifies clause
-  {
-    forall k: int | k in {} {
-      arr[i,j] := k;  // fine, since control will never reach here
-    }
-  }
-
-  method K2(i: int, j: int)
-    requires 0 <= i < arr.Length0 && 0 <= j < arr.Length1
-    modifies arr
-  {
-    forall k: int | k in {-3, 4} {
-      // The following would have been an error (since this test file tests
-      // compilation, we don't include the test here):
-      // arr[i,j] := k;  // error: k can take on more than one value
-    }
-  }
-
-  method K3(i: int, j: int)
-    requires 0 <= i < arr.Length0 && 0 <= j < arr.Length1
-    modifies arr
-  {
-    forall k: nat | k in {-3, 4} && k <= i {
-      arr[k,j] := 50;  // fine, since k:nat is at least 0
-    }
-  }
-
-  method K4(j: int)
-    requires 0 <= j < arr.Length1
-    modifies arr
-  {
-    forall i, k: nat | 0 <= i < arr.Length0 && k in {-3, 4} {
-      arr[i,j] := k;  // fine, since k can only take on one value
-    }
-  }
-
-  method M()
-  {
-    var ar := new int [3,3];
-    var S: set<int> := {2,0};
-    forall k | k in S {
-      ar[k,1]:= 0;
-    }
-    forall k, j | k in S && j in S {
-      ar[k,j]:= 0;
-    }
-  }
-
-  method N() {
-    var ar := new int[3, 3];
-    ar[2,2] := 0;
-  }
-
-  method P() {
-    var ar := new int[3];
-    var prev := ar[..];
-    var S: set<int> := {};
-    forall k | k in S {
-      ar[k] := 0;
-    }
-    assert ar[..] == prev;
-  }
-
-  method Q() {
-    var ar := new int[3,3];
-    var S: set<int> := {1,2};
-    forall k | k in S {
-      ar[0,0] := 0;
-    }
-    assert ar[0,0] == 0;
-  }
-}
diff --git a/Test/dafny0/ForallCompilationNewSyntax.dfy.verifier.expect b/Test/dafny0/ForallCompilationNewSyntax.dfy.verifier.expect
deleted file mode 100644
index a94cd5ea608..00000000000
--- a/Test/dafny0/ForallCompilationNewSyntax.dfy.verifier.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-ForallCompilationNewSyntax.dfy(25,4): Warning: /!\ No terms found to trigger on.
-ForallCompilationNewSyntax.dfy(34,4): Warning: /!\ No terms found to trigger on.
-ForallCompilationNewSyntax.dfy(43,4): Warning: /!\ No terms found to trigger on.
-ForallCompilationNewSyntax.dfy(63,4): Warning: /!\ No trigger covering all quantified variables found.
diff --git a/Test/dafny0/ForbidNondeterminism.dfy b/Test/dafny0/ForbidNondeterminism.dfy
deleted file mode 100644
index aba09ef6c6b..00000000000
--- a/Test/dafny0/ForbidNondeterminism.dfy
+++ /dev/null
@@ -1,80 +0,0 @@
-// RUN: ! %baredafny verify %args "%s" > "%t"
-// RUN: ! %baredafny run %args --enforce-determinism "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class C {
-  var f: real
-}
-
-predicate P(z: int) { true }
-
-method M(c: C, u: int) returns (r: int)
-  modifies c
-  decreases *
-{
-  var x := 3;  // fine
-  var y;  // this statement by itself is nondeterministic, but by itself is not an error
-  if u < 10 {
-    r := y;  // error: definite-assignment violation
-  } else if u < 20 {
-    y := 4;
-    r := y;  // fine
-  } else if u < 30 {
-    y := 4;
-    y := *;  // compiler error under deterministic rules
-    r := y;  // allowed by definite-assignment rules, but the previous line is reported by compiler
-  }
-  r := x;
-}
-
-method OutputParameters0(x: int) returns (s: int, t: int)
-{
-  return x, x+45;  // yes, this is legal
-}
-
-method OutputParameters1(x: int) returns (s: int, t: int)
-{
-  if x < 100 {
-    return;  // error (x2): this may leave s and t undefined
-  } else {
-    var y := x + s;  // error: this uses s before it may be defined
-  }
-}  // error: this may leave t undefined (s, too, but it has been checked on all paths leading here)
-
-method DeclWithHavoc()
-{
-  var a: int := *; // this counts as a definite assignment
-  var b: int;  // fine, since b is never used
-  var c := a;
-}
-
-type PossiblyEmpty = x: int | true witness *
-
-method MoreDeclWithHavoc()
-{
-  var a: PossiblyEmpty := *; // this does NOT count as a definite assignment for a possibly-empty type
-  var b: PossiblyEmpty;  // fine, since b is never used
-  var c := a; // error: a is used without being definitely assigned
-}
-
-class CK {
-  var x: int
-  var y: int
-  constructor Init() {
-    x := 10;
-  } // definite-assignment rules allow fields to be left unassigned [error: determinism]
-}
-
-method ArrayAllocation(n: nat, p: nat, q: nat)
-{
-  var a := new int[n]; // definite-assignment rules allow array elements to be left unassigned [error: determinism]
-  var m := new bool[p,q]; // definite-assignment rules allow array elements to be left unassigned [error: determinism]
-}
-
-class Cell {
-  var data: int
-
-  constructor () {
-    // .data is auto-initialized here
-  } // [error: determinism]
-}
diff --git a/Test/dafny0/ForbidNondeterminism.dfy.expect b/Test/dafny0/ForbidNondeterminism.dfy.expect
deleted file mode 100644
index 3a3b095195c..00000000000
--- a/Test/dafny0/ForbidNondeterminism.dfy.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-ForbidNondeterminism.dfy(18,9): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
-ForbidNondeterminism.dfy(38,4): Error: out-parameter 's', which is subject to definite-assignment rules, might be uninitialized at this return point
-ForbidNondeterminism.dfy(38,4): Error: out-parameter 't', which is subject to definite-assignment rules, might be uninitialized at this return point
-ForbidNondeterminism.dfy(40,17): Error: variable 's', which is subject to definite-assignment rules, might be uninitialized here
-ForbidNondeterminism.dfy(42,0): Error: out-parameter 't', which is subject to definite-assignment rules, might be uninitialized at this return point
-ForbidNondeterminism.dfy(57,11): Error: variable 'a', which is subject to definite-assignment rules, might be uninitialized here
-
-Dafny program verifier finished with 3 verified, 6 errors
-ForbidNondeterminism.dfy(18,9): Error: variable 'y', which is subject to definite-assignment rules, might be uninitialized here
-ForbidNondeterminism.dfy(38,4): Error: out-parameter 's', which is subject to definite-assignment rules, might be uninitialized at this return point
-ForbidNondeterminism.dfy(38,4): Error: out-parameter 't', which is subject to definite-assignment rules, might be uninitialized at this return point
-ForbidNondeterminism.dfy(40,17): Error: variable 's', which is subject to definite-assignment rules, might be uninitialized here
-ForbidNondeterminism.dfy(42,0): Error: out-parameter 't', which is subject to definite-assignment rules, might be uninitialized at this return point
-ForbidNondeterminism.dfy(57,11): Error: variable 'a', which is subject to definite-assignment rules, might be uninitialized here
-ForbidNondeterminism.dfy(70,11): Error: unless an initializer is provided for the array elements, a new array of 'int' must have empty size
-ForbidNondeterminism.dfy(71,11): Error: unless an initializer is provided for the array elements, a new array of 'bool' must have empty size
-ForbidNondeterminism.dfy(65,2): Error: field 'y', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-ForbidNondeterminism.dfy(79,2): Error: field 'data', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-
-Dafny program verifier finished with 2 verified, 10 errors
diff --git a/Test/dafny0/ForbidNondeterminismCompile.dfy b/Test/dafny0/ForbidNondeterminismCompile.dfy
deleted file mode 100644
index c4920644933..00000000000
--- a/Test/dafny0/ForbidNondeterminismCompile.dfy
+++ /dev/null
@@ -1,103 +0,0 @@
-// RUN: ! %baredafny build %args --enforce-determinism "%s" --target cs > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class C { // error: constructor-less class not allowed by determinism rules
-  var f: real
-}
-
-predicate P(z: int) { true }
-
-method M(c: C)
-  modifies c
-  decreases *
-{
-  var x := 3;  // fine
-  var y;  // this statement by itself is nondeterministic, but the verifier catches bad uses of "y"
-  y := 4;
-  y := *;  // error: nondeterministic
-  x, y := x, *;  // error: nondeterministic
-  y :| true;  // error: nondeterministic
-  if * {  // error: nondeterministic
-    x := x + 1;
-  }
-  if {  // error: nondeterministic
-    case true =>  x := x + 1;
-    case true =>  x := x + 2;
-  }
-  if c.f < 500.0 {
-    if {  // a one-case if is always deterministic
-      case c.f < 1000.0 => x := x + 1;
-    }
-  }
-  if z :| 10 <= z < 15 && P(z) {  // error: nondeterministic
-    x := z;
-  }
-  while *  // error: nondeterministic
-    decreases *
-  {
-    x := x + 1;
-  }
-  while  // error: nondeterministic
-    decreases if x <= 100 then 100-x else x
-  {
-    case x < 100 => x := x + 1;
-    case 100 < x => x := x - 1;
-  }
-  var a := new int[100](_ => 750);
-  forall i | 0 <= i < a.Length {
-    a[i] := *;  // error: nondeterministic
-  }
-  modify c;  // error: nondeterministic
-  modify c {  // fine (except that a modify statement with a block statement is deprecated)
-  }
-}
-
-method OutputParameters0(x: int) returns (s: int, t: int)
-{
-  return x, x+45;  // yes, this is legal
-}
-
-
-method DeclWithHavoc(yes: bool)
-  requires yes
-{
-  var b: int := *;  // error: assignment is nondeterministic (despite the fact that b is never used)
-  var c: int; // fine, since the declaration alone is not forbidden
-  var d: int;
-  if yes {
-    var e := b; // error: use of b before it has been assigned
-  } else {
-    // the verifier would complain about the next statement, but it knows the statement isn't reachable
-    var e := d;
-  }
-}
-
-iterator IterWeird() yields ()  // no yields parameters, so allowed
-{
-}
-
-iterator Iter() yields (x: int)  // error: not allowed by determinism rules
-{
-}
-
-class C' { // fine, since there are no fields
-}
-
-class C'' { // fine, since the const has a RHS
-  const u := 15
-}
-
-class C''' { // error: constructor-less class not allowed by determinism rules
-  const u: int
-}
-
-class D {
-  var f: real // fine, since the class has a constructor
-  const u: int // fine, since the class has a constructor
-  const w := 15
-
-  constructor D() {
-    f := 0.9;
-    u := 90;
-  }
-}
diff --git a/Test/dafny0/ForbidNondeterminismCompile.dfy.expect b/Test/dafny0/ForbidNondeterminismCompile.dfy.expect
deleted file mode 100644
index 8fa5615a03a..00000000000
--- a/Test/dafny0/ForbidNondeterminismCompile.dfy.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-ForbidNondeterminismCompile.dfy(51,11): Warning: the modify statement with a block statement is deprecated
-
-Dafny program verifier finished with 6 verified, 0 errors
-ForbidNondeterminismCompile.dfy(17,7): Error: nondeterministic assignment forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(18,13): Error: nondeterministic assignment forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(19,4): Error: assign-such-that statement forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(20,2): Error: nondeterministic if statement forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(23,2): Error: case-based if statement forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(32,2): Error: binding if statement forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(35,2): Error: nondeterministic loop forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(40,2): Error: case-based loop forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(48,12): Error: nondeterministic assignment forbidden by --enforce-determinism
-ForbidNondeterminismCompile.dfy(50,2): Error: modify statement without a body forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(64,16): Error: nondeterministic assignment forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(4,6): Error: since fields are initialized arbitrarily, constructor-less classes are forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(79,9): Error: since yield parameters are initialized arbitrarily, iterators are forbidden by the --enforce-determinism option
-ForbidNondeterminismCompile.dfy(90,6): Error: since fields are initialized arbitrarily, constructor-less classes are forbidden by the --enforce-determinism option
diff --git a/Test/dafny0/Fuel.dfy.expect b/Test/dafny0/Fuel.dfy.expect
deleted file mode 100755
index 0cc522360a0..00000000000
--- a/Test/dafny0/Fuel.dfy.expect
+++ /dev/null
@@ -1,67 +0,0 @@
-Fuel.dfy(129,8): Error: Fuel can only increase within a given scope.
-Fuel.dfy(407,8): Error: Fuel can only increase within a given scope.
-Fuel.dfy(17,22): Error: assertion could not be proved
-Fuel.dfy(65,27): Error: assertion might not hold
-Fuel.dfy(69,27): Error: assertion could not be proved
-Fuel.dfy(92,22): Error: assertion could not be proved
-Fuel.dfy(93,23): Error: assertion could not be proved
-Fuel.dfy(94,22): Error: assertion could not be proved
-Fuel.dfy(120,22): Error: assertion could not be proved
-Fuel.dfy(121,23): Error: assertion could not be proved
-Fuel.dfy(122,22): Error: assertion could not be proved
-Fuel.dfy(132,26): Error: assertion could not be proved
-Fuel.dfy(133,26): Error: assertion could not be proved
-Fuel.dfy(157,22): Error: assertion could not be proved
-Fuel.dfy(200,55): Error: assertion could not be proved
-Fuel.dfy(245,22): Error: assertion could not be proved
-Fuel.dfy(247,22): Error: assertion could not be proved
-Fuel.dfy(280,26): Error: assertion could not be proved
-Fuel.dfy(335,26): Error: function precondition could not be proved
-Fuel.dfy(324,21): Related location
-Fuel.dfy(313,41): Related location
-Fuel.dfy(335,26): Error: function precondition could not be proved
-Fuel.dfy(324,21): Related location
-Fuel.dfy(312,43): Related location
-Fuel.dfy(335,26): Error: function precondition could not be proved
-Fuel.dfy(324,21): Related location
-Fuel.dfy(312,58): Related location
-Fuel.dfy(335,26): Error: function precondition could not be proved
-Fuel.dfy(324,21): Related location
-Fuel.dfy(314,46): Related location
-Fuel.dfy(335,26): Error: function precondition could not be proved
-Fuel.dfy(324,21): Related location
-Fuel.dfy(314,72): Related location
-Fuel.dfy(335,26): Error: function precondition could not be proved
-Fuel.dfy(324,21): Related location
-Fuel.dfy(314,93): Related location
-Fuel.dfy(335,49): Error: destructor 't' can only be applied to datatype values constructed by 'VTuple'
-Fuel.dfy(335,50): Error: index out of range
-Fuel.dfy(336,38): Error: index out of range
-Fuel.dfy(336,42): Error: destructor 'u' can only be applied to datatype values constructed by 'VUint64'
-Fuel.dfy(336,45): Error: function precondition could not be proved
-Fuel.dfy(329,21): Related location
-Fuel.dfy(311,43): Related location
-Fuel.dfy(336,45): Error: function precondition could not be proved
-Fuel.dfy(329,21): Related location
-Fuel.dfy(313,41): Related location
-Fuel.dfy(336,45): Error: function precondition could not be proved
-Fuel.dfy(329,21): Related location
-Fuel.dfy(312,43): Related location
-Fuel.dfy(336,45): Error: function precondition could not be proved
-Fuel.dfy(329,21): Related location
-Fuel.dfy(314,72): Related location
-Fuel.dfy(336,45): Error: function precondition could not be proved
-Fuel.dfy(329,21): Related location
-Fuel.dfy(314,93): Related location
-Fuel.dfy(336,45): Error: function precondition could not be proved
-Fuel.dfy(329,21): Related location
-Fuel.dfy(312,58): Related location
-Fuel.dfy(336,71): Error: index out of range
-Fuel.dfy(397,22): Error: assertion could not be proved
-Fuel.dfy(398,22): Error: assertion could not be proved
-Fuel.dfy(399,23): Error: assertion could not be proved
-Fuel.dfy(435,22): Error: assertion could not be proved
-Fuel.dfy(436,22): Error: assertion could not be proved
-Fuel.dfy(437,23): Error: assertion could not be proved
-
-Dafny program verifier finished with 30 verified, 39 errors
diff --git a/Test/dafny0/FunctionSpecifications.dfy.expect b/Test/dafny0/FunctionSpecifications.dfy.expect
deleted file mode 100644
index f1e06b43815..00000000000
--- a/Test/dafny0/FunctionSpecifications.dfy.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-FunctionSpecifications.dfy(35,24): Error: a postcondition could not be proved on this return path
-FunctionSpecifications.dfy(31,12): Related location: this is the postcondition that could not be proved
-FunctionSpecifications.dfy(45,2): Error: a postcondition could not be proved on this return path
-FunctionSpecifications.dfy(40,23): Related location: this is the postcondition that could not be proved
-FunctionSpecifications.dfy(61,10): Error: cannot prove termination; try supplying a decreases clause
-FunctionSpecifications.dfy(68,15): Error: a postcondition could not be proved on this return path
-FunctionSpecifications.dfy(69,21): Related location: this is the postcondition that could not be proved
-FunctionSpecifications.dfy(117,22): Error: assertion could not be proved
-FunctionSpecifications.dfy(120,22): Error: assertion could not be proved
-FunctionSpecifications.dfy(135,26): Error: assertion could not be proved
-FunctionSpecifications.dfy(139,26): Error: assertion could not be proved
-FunctionSpecifications.dfy(144,25): Error: a postcondition could not be proved on this return path
-FunctionSpecifications.dfy(146,28): Related location: this is the postcondition that could not be proved
-FunctionSpecifications.dfy(155,2): Error: decreases clause might not decrease
-FunctionSpecifications.dfy(162,2): Error: decreases clause might not decrease
-FunctionSpecifications.dfy(167,2): Error: cannot prove termination; try supplying a decreases clause
-
-Dafny program verifier finished with 10 verified, 12 errors
diff --git a/Test/dafny0/GhostAllocations.dfy.expect b/Test/dafny0/GhostAllocations.dfy.expect
deleted file mode 100644
index 24aa6a468e0..00000000000
--- a/Test/dafny0/GhostAllocations.dfy.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-GhostAllocations.dfy(88,11): Warning: the modify statement with a block statement is deprecated
-GhostAllocations.dfy(99,13): Warning: the modify statement with a block statement is deprecated
-GhostAllocations.dfy(28,11): Error: assertion could not be proved
-GhostAllocations.dfy(31,11): Error: assertion could not be proved
-GhostAllocations.dfy(63,9): Error: assertion could not be proved
-GhostAllocations.dfy(76,9): Error: assertion could not be proved
-GhostAllocations.dfy(82,9): Error: assertion could not be proved
-GhostAllocations.dfy(93,9): Error: assertion could not be proved
-GhostAllocations.dfy(105,9): Error: assertion could not be proved
-GhostAllocations.dfy(138,2): Error: field 'g', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-GhostAllocations.dfy(177,2): Error: field 'h', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-GhostAllocations.dfy(180,2): Error: field 'g', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-GhostAllocations.dfy(180,2): Error: field 'h', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-GhostAllocations.dfy(184,2): Error: field 'h', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-GhostAllocations.dfy(187,2): Error: field 'g', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-GhostAllocations.dfy(187,2): Error: field 'h', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-
-Dafny program verifier finished with 6 verified, 14 errors
diff --git a/Test/dafny0/GhostGuards.dfy.expect b/Test/dafny0/GhostGuards.dfy.expect
deleted file mode 100644
index e21d6f3470a..00000000000
--- a/Test/dafny0/GhostGuards.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-GhostGuards.dfy(13,9): Info: ghost if
-GhostGuards.dfy(19,2): Info: ghost if
-GhostGuards.dfy(29,2): Info: ghost while
-GhostGuards.dfy(42,2): Info: ghost while
-GhostGuards.dfy(55,2): Info: ghost match
-
-Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/dafny0/GhostPrint.dfy b/Test/dafny0/GhostPrint.dfy
deleted file mode 100644
index a5964f09d01..00000000000
--- a/Test/dafny0/GhostPrint.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /dafnyVerify:0 /compile:0 /env:0 /dprint:"%t.dprint.dfy" "%s"
-// RUN: %dafny /dafnyVerify:0 /compile:0 /env:0 "%t.dprint.dfy" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method M() {
-  ghost var h := var ta := F(); 5;
-  var j := ghost var tb := F(); 5;
-  assert h == j;
-}
-
-ghost function F(): int { 5 }
-
diff --git a/Test/dafny0/IMaps.dfy.expect b/Test/dafny0/IMaps.dfy.expect
deleted file mode 100644
index be7fe6720a1..00000000000
--- a/Test/dafny0/IMaps.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-IMaps.dfy(36,18): Warning: /!\ No terms found to trigger on.
-IMaps.dfy(36,49): Warning: /!\ No terms found to trigger on.
-IMaps.dfy(51,18): Warning: /!\ No terms found to trigger on.
-IMaps.dfy(79,33): Warning: /!\ No terms found to trigger on.
-IMaps.dfy(52,7): Error: element might not be in domain
-
-Dafny program verifier finished with 14 verified, 1 error
diff --git a/Test/dafny0/ISets.dfy.expect b/Test/dafny0/ISets.dfy.expect
deleted file mode 100644
index 0a1a7c2605d..00000000000
--- a/Test/dafny0/ISets.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-ISets.dfy(38,15): Warning: /!\ No terms found to trigger on.
-ISets.dfy(40,9): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/dafny0/ImplicitTypeParamPrint.dfy b/Test/dafny0/ImplicitTypeParamPrint.dfy
deleted file mode 100644
index 3fb060b1d3d..00000000000
--- a/Test/dafny0/ImplicitTypeParamPrint.dfy
+++ /dev/null
@@ -1,41 +0,0 @@
-// NONUNIFORM: Multiple tests in one, fairly C# specific
-// RUN: %dafny /dafnyVerify:0 /compile:0 /env:0 /rprint:"%t.dfy" "%s"
-// RUN: %dafny /dafnyVerify:0 /compile:0 /env:0 /printMode:DllEmbed /rprint:"%t1.dfy" "%t.dfy"
-// RUN: %dafny /env:0 /compile:3 /printMode:DllEmbed /rprint:"%t2.dfy" "%t1.dfy" > "%t"
-// RUN: %diff "%t1.dfy" "%t2.dfy"
-// RUN: %diff "%s.expect" "%t"
-
-datatype List<T> = Nil | Cons(car: T, cdr: List)
-
-function funkyNil(l: List): List
-{
-  match l
-  case Cons(x, y) => funkyNil(y)
-  case Nil => l
-}
-
-method H(a: array, l: List)
-{
-  match l
-  case Cons(x, y) =>
-    if a.Length > 0 && a[0] == x {
-    }
-  case Nil =>
-}
-
-method Main() {
-  var xs := Cons(28, Cons(22, Cons(28, Cons(5, Nil))));
-  var a := new [][60, 60];
-  var nil := funkyNil(xs);
-  H(a, xs);
-  print nil, "\n";
-  print nonExtendedPrintExpr(xs), "\n";
-}
-
-function nonExtendedPrintExpr(l: List): int
-{
-  25 +
-  match l
-  case Cons(x, y) => 10
-  case Nil => 11
-}
diff --git a/Test/dafny0/InSetComprehension.dfy.expect b/Test/dafny0/InSetComprehension.dfy.expect
deleted file mode 100644
index 8b1b941f018..00000000000
--- a/Test/dafny0/InSetComprehension.dfy.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-InSetComprehension.dfy(10,17): Warning: /!\ No terms found to trigger on.
-InSetComprehension.dfy(12,17): Warning: /!\ No terms found to trigger on.
-InSetComprehension.dfy(14,16): Info: Selected triggers: {Even(m)}
-InSetComprehension.dfy(16,17): Info: Selected triggers: {u in uu}
-InSetComprehension.dfy(18,17): Info: Not generating triggers for "Id(u)". Note that {:autotriggers false} can cause instabilities. Consider using {:nowarn}, {:matchingloop} (not great either), or a manual trigger instead.
-InSetComprehension.dfy(28,16): Warning: /!\ No terms found to trigger on.
-InSetComprehension.dfy(30,16): Warning: /!\ No terms found to trigger on.
-InSetComprehension.dfy(33,16): Info: Selected triggers: {Even(m)}
-InSetComprehension.dfy(37,16): Info: Selected triggers: {u in uu}
-InSetComprehension.dfy(39,16): Info: Not generating triggers for "Id(u)". Note that {:autotriggers false} can cause instabilities. Consider using {:nowarn}, {:matchingloop} (not great either), or a manual trigger instead.
-InSetComprehension.dfy(76,13): Info: Selected triggers: {x in si}
-InSetComprehension.dfy(78,13): Info: Selected triggers: {y in ti}
-InSetComprehension.dfy(81,13): Info: Selected triggers: {n in si}
-InSetComprehension.dfy(82,5): Info: Selected triggers: {si[i]}
-InSetComprehension.dfy(53,24): Info: Selected triggers: {x in elems}
-InSetComprehension.dfy(51,25): Info: Selected triggers: {x in elems}
-InSetComprehension.dfy(67,24): Info: Selected triggers: {x in elems}
-InSetComprehension.dfy(65,25): Info: Selected triggers: {x in elems}
-
-Dafny program verifier finished with 8 verified, 0 errors
diff --git a/Test/dafny0/IndexIntoUpdate.dfy b/Test/dafny0/IndexIntoUpdate.dfy
deleted file mode 100644
index 616378b6451..00000000000
--- a/Test/dafny0/IndexIntoUpdate.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-method M()  {
-  var s := [1, 2, 3, 4];
-  assert 3 in s;
-  s := s[0 := 1];
-  if * { assert 3 in s; } // FIXME: This should verify
-  else { assert s[2] == 3; assert 3 in s; }
-}
diff --git a/Test/dafny0/IndexIntoUpdate.dfy.expect b/Test/dafny0/IndexIntoUpdate.dfy.expect
deleted file mode 100644
index 3eb11a6b5b2..00000000000
--- a/Test/dafny0/IndexIntoUpdate.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-IndexIntoUpdate.dfy(7,18): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny0/InductivePredicates.dfy.expect b/Test/dafny0/InductivePredicates.dfy.expect
deleted file mode 100644
index 058210fa1b2..00000000000
--- a/Test/dafny0/InductivePredicates.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-InductivePredicates.dfy(80,9): Error: assertion could not be proved
-InductivePredicates.dfy(92,10): Error: assertion could not be proved
-
-Dafny program verifier finished with 32 verified, 2 errors
diff --git a/Test/dafny0/Inverses.dfy.expect b/Test/dafny0/Inverses.dfy.expect
deleted file mode 100644
index 86ab83654d0..00000000000
--- a/Test/dafny0/Inverses.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-Inverses.dfy(70,2): Error: a postcondition could not be proved on this return path
-Inverses.dfy(67,10): Related location: this is the postcondition that could not be proved
-Inverses.dfy(67,40): Related location
-Inverses.dfy(67,66): Related location
-Inverses.dfy(82,2): Error: a postcondition could not be proved on this return path
-Inverses.dfy(79,10): Related location: this is the postcondition that could not be proved
-Inverses.dfy(79,40): Related location
-Inverses.dfy(79,66): Related location
-Inverses.dfy(193,2): Error: a postcondition could not be proved on this return path
-Inverses.dfy(191,15): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 31 verified, 3 errors
diff --git a/Test/dafny0/Iterators.dfy.expect b/Test/dafny0/Iterators.dfy.expect
deleted file mode 100644
index cbe781dcff3..00000000000
--- a/Test/dafny0/Iterators.dfy.expect
+++ /dev/null
@@ -1,44 +0,0 @@
-Iterators.dfy(251,9): Error: decreases clause might not decrease
-Iterators.dfy(274,9): Error: decreases clause might not decrease
-Iterators.dfy(284,31): Error: decreases clause might not decrease
-Iterators.dfy(296,9): Error: cannot prove termination; try supplying a decreases clause
-Iterators.dfy(317,9): Error: cannot prove termination; try supplying a decreases clause
-Iterators.dfy(326,31): Error: cannot prove termination; try supplying a decreases clause
-Iterators.dfy(343,9): Error: decreases clause might not decrease
-Iterators.dfy(353,31): Error: cannot prove termination; try supplying a decreases clause
-Iterators.dfy(370,9): Error: decreases clause might not decrease
-Iterators.dfy(40,21): Error: a precondition for this call could not be proved
-Iterators.dfy(4,9): Related location: this is the precondition that could not be proved
-Iterators.dfy(89,13): Error: assertion might not hold
-Iterators.dfy(119,15): Error: assertion might not hold
-Iterators.dfy(150,15): Error: assertion might not hold
-Iterators.dfy(155,23): Error: a precondition for this call could not be proved
-Iterators.dfy(125,9): Related location: this is the precondition that could not be proved
-Iterators.dfy(234,20): Error: assertion might not hold
-Iterators.dfy(413,16): Error: this invariant could not be proved to be maintained by the loop
-Iterators.dfy(413,16): Related message: loop invariant violation
-Iterators.dfy(414,21): Error: this invariant could not be proved to be maintained by the loop
-Iterators.dfy(414,21): Related message: loop invariant violation
-Iterators.dfy(415,21): Error: this invariant could not be proved to be maintained by the loop
-Iterators.dfy(415,21): Related message: loop invariant violation
-Iterators.dfy(103,21): Error: assertion could not be proved
-Iterators.dfy(106,13): Error: assertion could not be proved
-Iterators.dfy(177,27): Error: assertion could not be proved
-Iterators.dfy(208,6): Error: an assignment to _new is only allowed to shrink the set
-Iterators.dfy(212,20): Error: assertion could not be proved
-Iterators.dfy(436,18): Error: this invariant could not be proved to be maintained by the loop
-Iterators.dfy(436,18): Related message: loop invariant violation
-Iterators.dfy(437,23): Error: this invariant could not be proved to be maintained by the loop
-Iterators.dfy(437,23): Related message: loop invariant violation
-Iterators.dfy(438,23): Error: this invariant could not be proved to be maintained by the loop
-Iterators.dfy(438,23): Related message: loop invariant violation
-Iterators.dfy(459,16): Error: this invariant could not be proved to be maintained by the loop
-Iterators.dfy(459,16): Related message: loop invariant violation
-Iterators.dfy(460,21): Error: this invariant could not be proved to be maintained by the loop
-Iterators.dfy(460,21): Related message: loop invariant violation
-Iterators.dfy(461,21): Error: this invariant could not be proved to be maintained by the loop
-Iterators.dfy(461,21): Related message: loop invariant violation
-Iterators.dfy(470,4): Error: possible violation of yield-ensures condition
-Iterators.dfy(451,21): Related location
-
-Dafny program verifier finished with 35 verified, 30 errors
diff --git a/Test/dafny0/JavaUseRuntimeLib.dfy.expect b/Test/dafny0/JavaUseRuntimeLib.dfy.expect
deleted file mode 100644
index 97bd1dc93c6..00000000000
--- a/Test/dafny0/JavaUseRuntimeLib.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-bye
diff --git a/Test/dafny0/LabeledAsserts.dfy.expect b/Test/dafny0/LabeledAsserts.dfy.expect
deleted file mode 100644
index f18f1f8d555..00000000000
--- a/Test/dafny0/LabeledAsserts.dfy.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-LabeledAsserts.dfy(63,9): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-LabeledAsserts.dfy(63,30): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-LabeledAsserts.dfy(16,11): Error: assertion could not be proved
-LabeledAsserts.dfy(42,18): Error: assertion could not be proved
-LabeledAsserts.dfy(43,13): Error: assertion could not be proved
-LabeledAsserts.dfy(91,13): Error: assertion could not be proved
-LabeledAsserts.dfy(105,13): Error: assertion could not be proved
-LabeledAsserts.dfy(107,13): Error: assertion could not be proved
-LabeledAsserts.dfy(128,15): Error: assertion could not be proved
-LabeledAsserts.dfy(142,19): Error: assertion could not be proved
-LabeledAsserts.dfy(146,13): Error: assertion could not be proved
-LabeledAsserts.dfy(206,20): Error: assertion could not be proved
-LabeledAsserts.dfy(207,15): Error: assertion could not be proved
-LabeledAsserts.dfy(211,15): Error: assertion could not be proved
-LabeledAsserts.dfy(224,20): Error: assertion could not be proved
-LabeledAsserts.dfy(226,11): Error: assertion could not be proved
-LabeledAsserts.dfy(232,11): Error: assertion could not be proved
-LabeledAsserts.dfy(252,6): Error: the calculation step between the previous line and this line could not be proved
-LabeledAsserts.dfy(265,9): Error: assertion could not be proved
-LabeledAsserts.dfy(25,11): Error: assertion could not be proved
-LabeledAsserts.dfy(27,18): Error: assertion could not be proved
-LabeledAsserts.dfy(28,18): Error: assertion could not be proved
-LabeledAsserts.dfy(29,15): Error: assertion could not be proved
-LabeledAsserts.dfy(32,11): Error: assertion could not be proved
-LabeledAsserts.dfy(162,17): Error: assertion could not be proved
-LabeledAsserts.dfy(172,15): Error: assertion could not be proved
-LabeledAsserts.dfy(189,19): Error: assertion could not be proved
-LabeledAsserts.dfy(193,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 11 verified, 26 errors
diff --git a/Test/dafny0/LabelsOldAt.dfy.expect b/Test/dafny0/LabelsOldAt.dfy.expect
deleted file mode 100644
index 9e918afafcd..00000000000
--- a/Test/dafny0/LabelsOldAt.dfy.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-LabelsOldAt.dfy(429,9): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-LabelsOldAt.dfy(430,9): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-LabelsOldAt.dfy(160,13): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-LabelsOldAt.dfy(358,11): Error: assertion might not hold
-LabelsOldAt.dfy(367,11): Error: assertion might not hold
-LabelsOldAt.dfy(376,11): Error: assertion might not hold
-LabelsOldAt.dfy(385,11): Error: assertion might not hold
-LabelsOldAt.dfy(266,15): Error: object might be null
-LabelsOldAt.dfy(267,15): Error: some set element might be null
-LabelsOldAt.dfy(268,15): Error: some sequence element might be null
-LabelsOldAt.dfy(274,15): Error: object might not be allocated in the old-state of the 'unchanged' predicate
-LabelsOldAt.dfy(275,15): Error: some set element might not be allocated in the old-state of the 'unchanged' predicate
-LabelsOldAt.dfy(276,15): Error: some sequence element might not be allocated in the old-state of the 'unchanged' predicate
-LabelsOldAt.dfy(281,15): Error: object might be null
-LabelsOldAt.dfy(281,15): Error: object might not be allocated in the old-state of the 'unchanged' predicate
-LabelsOldAt.dfy(286,15): Error: some set element might be null
-LabelsOldAt.dfy(286,15): Error: some set element might not be allocated in the old-state of the 'unchanged' predicate
-LabelsOldAt.dfy(291,15): Error: some sequence element might be null
-LabelsOldAt.dfy(291,15): Error: some sequence element might not be allocated in the old-state of the 'unchanged' predicate
-LabelsOldAt.dfy(34,13): Error: assertion could not be proved
-LabelsOldAt.dfy(56,11): Error: assertion could not be proved
-LabelsOldAt.dfy(78,13): Error: assertion could not be proved
-LabelsOldAt.dfy(110,13): Error: assertion could not be proved
-LabelsOldAt.dfy(112,13): Error: assertion could not be proved
-LabelsOldAt.dfy(116,13): Error: assertion could not be proved
-LabelsOldAt.dfy(118,13): Error: assertion could not be proved
-LabelsOldAt.dfy(140,13): Error: assertion could not be proved
-LabelsOldAt.dfy(142,13): Error: assertion could not be proved
-LabelsOldAt.dfy(164,21): Error: receiver might not be allocated in the state in which its fields are accessed
-LabelsOldAt.dfy(166,27): Error: receiver might not be allocated in the state in which its fields are accessed
-LabelsOldAt.dfy(175,19): Error: array might not be allocated
-LabelsOldAt.dfy(177,25): Error: array might not be allocated
-LabelsOldAt.dfy(195,25): Error: object might not be allocated in the old-state of the 'unchanged' predicate
-LabelsOldAt.dfy(197,31): Error: object might not be allocated in the old-state of the 'unchanged' predicate
-LabelsOldAt.dfy(207,31): Error: some set element might not be allocated in the old-state of the 'unchanged' predicate
-LabelsOldAt.dfy(236,14): Error: receiver might not be allocated in the state in which its fields are accessed
-LabelsOldAt.dfy(244,29): Error: object might not be allocated in the old-state of the 'unchanged' predicate
-LabelsOldAt.dfy(246,29): Error: some set element might not be allocated in the old-state of the 'unchanged' predicate
-
-Dafny program verifier finished with 28 verified, 35 errors
diff --git a/Test/dafny0/LetExpr.dfy.expect b/Test/dafny0/LetExpr.dfy.expect
deleted file mode 100644
index 8c19377393b..00000000000
--- a/Test/dafny0/LetExpr.dfy.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-LetExpr.dfy(45,2): Warning: /!\ No terms found to trigger on.
-LetExpr.dfy(206,4): Warning: /!\ No terms found to trigger on.
-LetExpr.dfy(340,18): Error: value does not satisfy the subset constraints of 'nat'
-LetExpr.dfy(344,13): Error: value does not satisfy the subset constraints of 'nat'
-LetExpr.dfy(390,33): Error: assertion could not be proved
-LetExpr.dfy(403,24): Error: assertion could not be proved
-LetExpr.dfy(9,11): Error: assertion might not hold
-LetExpr.dfy(260,18): Error: value does not satisfy the subset constraints of 'nat'
-LetExpr.dfy(263,18): Error: value does not satisfy the subset constraints of 'nat'
-LetExpr.dfy(265,23): Error: value does not satisfy the subset constraints of 'nat'
-LetExpr.dfy(294,13): Error: RHS is not certain to look like the pattern 'Agnes'
-LetExpr.dfy(311,41): Error: value does not satisfy the subset constraints of 'nat'
-LetExpr.dfy(313,11): Error: assertion could not be proved
-LetExpr.dfy(323,11): Error: to be compilable, the value of a let-such-that expression must be uniquely determined
-LetExpr.dfy(109,22): Error: assertion might not hold
-
-Dafny program verifier finished with 37 verified, 13 errors
-LetExpr.dfy.tmp.dprint.dfy(46,2): Warning: /!\ No terms found to trigger on.
-LetExpr.dfy.tmp.dprint.dfy(281,4): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier did not attempt verification
diff --git a/Test/dafny0/LiberalEquality.dfy.expect b/Test/dafny0/LiberalEquality.dfy.expect
deleted file mode 100644
index 769250d1355..00000000000
--- a/Test/dafny0/LiberalEquality.dfy.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-LiberalEquality.dfy(22,14): Error: arguments must have comparable types (got T and U)
-LiberalEquality.dfy(23,14): Error: arguments must have comparable types (got U and int)
-LiberalEquality.dfy(31,14): Error: arguments must have comparable types (got array<T> and array3<T>)
-LiberalEquality.dfy(32,14): Error: arguments must have comparable types (got array<int> and array3<int>)
-LiberalEquality.dfy(33,14): Error: arguments must have comparable types (got array<T> and array3<int>)
-LiberalEquality.dfy(34,14): Error: arguments must have comparable types (got array<int> and array3<T>)
-LiberalEquality.dfy(42,14): Error: arguments must have comparable types (got Weird<T, int, V> and Weird<T, bool, V>)
-LiberalEquality.dfy(52,13): Error: arguments must have comparable types (got Weird<T, bool, T> and Weird<T, int, T>)
-LiberalEquality.dfy(61,14): Error: arguments must have comparable types (got array<int> and array<bool>)
-LiberalEquality.dfy(73,13): Error: arguments must have comparable types (got T ~> int and int ~> int)
-LiberalEquality.dfy(74,13): Error: arguments must have comparable types (got int ~> T and int ~> int)
-LiberalEquality.dfy(84,13): Error: arguments must have comparable types (got Syn<int> and Syn<bool>)
-LiberalEquality.dfy(95,13): Error: arguments must have comparable types (got array<List<int>> and array<List<bool>>) (non-variant type parameter would require int = bool)
-LiberalEquality.dfy(95,13): Error: arguments must have comparable types (got array<List<int>> and array<List<bool>>) (non-variant type parameter would require bool = int)
-LiberalEquality.dfy(97,13): Error: arguments must have comparable types (got array<List<bool>> and array<ListSynonym<T, int>>) (non-variant type parameter would require bool = int)
-LiberalEquality.dfy(97,13): Error: arguments must have comparable types (got array<List<bool>> and array<ListSynonym<T, int>>) (non-variant type parameter would require int = bool)
-LiberalEquality.dfy(99,13): Error: arguments must have comparable types (got array<List<int>> and array<ListSynonym<int, T>>) (non-variant type parameter would require int = T)
-LiberalEquality.dfy(99,13): Error: arguments must have comparable types (got array<List<int>> and array<ListSynonym<int, T>>) (non-variant type parameter would require T = int)
-LiberalEquality.dfy(100,13): Error: arguments must have comparable types (got array<List<bool>> and array<ListSynonym<int, T>>) (non-variant type parameter would require bool = T)
-LiberalEquality.dfy(100,13): Error: arguments must have comparable types (got array<List<bool>> and array<ListSynonym<int, T>>) (non-variant type parameter would require T = bool)
-LiberalEquality.dfy(101,13): Error: arguments must have comparable types (got array<ListSynonym<bool, int>> and array<ListSynonym<int, T>>) (non-variant type parameter would require int = T)
-LiberalEquality.dfy(101,13): Error: arguments must have comparable types (got array<ListSynonym<bool, int>> and array<ListSynonym<int, T>>) (non-variant type parameter would require T = int)
-LiberalEquality.dfy(103,13): Error: arguments must have comparable types (got array<List<bool>> and array<ListSynonym<real, Wrapper<int>>>) (non-variant type parameter would require bool = Wrapper<int>)
-LiberalEquality.dfy(103,13): Error: arguments must have comparable types (got array<List<bool>> and array<ListSynonym<real, Wrapper<int>>>) (non-variant type parameter would require Wrapper<int> = bool)
-24 resolution/type errors detected in LiberalEquality.dfy
diff --git a/Test/dafny0/LitTriggers.dfy.expect b/Test/dafny0/LitTriggers.dfy.expect
deleted file mode 100644
index 3f95a9f3e06..00000000000
--- a/Test/dafny0/LitTriggers.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-LitTriggers.dfy(56,21): Error: assertion could not be proved
-
-Dafny program verifier finished with 5 verified, 1 error
diff --git a/Test/dafny0/Maps.dfy.expect b/Test/dafny0/Maps.dfy.expect
deleted file mode 100644
index 81d9edfc6e2..00000000000
--- a/Test/dafny0/Maps.dfy.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-Maps.dfy(200,11): Warning: /!\ No terms found to trigger on.
-Maps.dfy(78,7): Error: element might not be in domain
-Maps.dfy(128,17): Error: assertion could not be proved
-Maps.dfy(220,36): Error: key expressions might be referring to the same value
-Maps.dfy(226,36): Error: key expressions might be referring to the same value
-Maps.dfy(232,37): Error: key expressions might be referring to the same value
-Maps.dfy(234,24): Error: key expressions might be referring to the same value
-Maps.dfy(241,41): Error: function precondition could not be proved
-Maps.dfy(215,13): Related location
-Maps.dfy(243,36): Error: function precondition could not be proved
-Maps.dfy(215,13): Related location
-Maps.dfy(243,37): Error: key expressions might be referring to the same value
-Maps.dfy(264,54): Error: assertion could not be proved
-Maps.dfy(309,11): Error: index out of range
-Maps.dfy(311,16): Error: value does not satisfy the subset constraints of 'nat'
-Maps.dfy(317,11): Error: value does not satisfy the subset constraints of 'nat'
-Maps.dfy(319,16): Error: new number of occurrences might be negative
-Maps.dfy(328,11): Error: value does not satisfy the subset constraints of 'nat'
-Maps.dfy(330,17): Error: value does not satisfy the subset constraints of 'nat'
-Maps.dfy(339,11): Error: index out of range
-Maps.dfy(341,16): Error: value of expression (of type 'Elem?') is not known to be an instance of type 'Elem', because it might be null
-Maps.dfy(347,11): Error: value of expression (of type 'Elem?') is not known to be an instance of type 'Elem', because it might be null
-Maps.dfy(349,16): Error: new number of occurrences might be negative
-Maps.dfy(358,11): Error: value of expression (of type 'Elem?') is not known to be an instance of type 'Elem', because it might be null
-Maps.dfy(360,16): Error: value of expression (of type 'Elem?') is not known to be an instance of type 'Elem', because it might be null
-Maps.dfy(424,13): Error: assertion could not be proved
-Maps.dfy(429,17): Error: assertion could not be proved
-Maps.dfy(430,13): Error: assertion could not be proved
-Maps.dfy(442,13): Error: assertion could not be proved
-Maps.dfy(447,17): Error: assertion could not be proved
-Maps.dfy(448,13): Error: assertion could not be proved
-Maps.dfy(520,18): Error: assertion could not be proved
-Maps.dfy(525,20): Error: assertion could not be proved
-Maps.dfy(562,2): Error: decreases expression might not decrease
-Maps.dfy(576,2): Error: decreases expression might not decrease
-
-Dafny program verifier finished with 49 verified, 32 errors
diff --git a/Test/dafny0/ModifyStmt.dfy.expect b/Test/dafny0/ModifyStmt.dfy.expect
deleted file mode 100644
index c5d4b2df58b..00000000000
--- a/Test/dafny0/ModifyStmt.dfy.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-ModifyStmt.dfy(133,14): Warning: the modify statement with a block statement is deprecated
-ModifyStmt.dfy(140,14): Warning: the modify statement with a block statement is deprecated
-ModifyStmt.dfy(148,16): Warning: the modify statement with a block statement is deprecated
-ModifyStmt.dfy(160,20): Warning: the modify statement with a block statement is deprecated
-ModifyStmt.dfy(158,17): Warning: the modify statement with a block statement is deprecated
-ModifyStmt.dfy(157,21): Warning: the modify statement with a block statement is deprecated
-ModifyStmt.dfy(155,24): Warning: the modify statement with a block statement is deprecated
-ModifyStmt.dfy(178,16): Warning: the modify statement with a block statement is deprecated
-ModifyStmt.dfy(27,13): Error: assertion could not be proved
-ModifyStmt.dfy(42,4): Error: modify statement might violate context's modifies clause
-ModifyStmt.dfy(48,4): Error: modify statement might violate context's modifies clause
-ModifyStmt.dfy(61,4): Error: modify statement might violate context's modifies clause
-ModifyStmt.dfy(70,13): Error: assertion could not be proved
-ModifyStmt.dfy(89,13): Error: assertion could not be proved
-ModifyStmt.dfy(99,13): Error: assertion could not be proved
-ModifyStmt.dfy(110,13): Error: assertion could not be proved
-ModifyStmt.dfy(122,15): Error: assertion could not be proved
-ModifyStmt.dfy(134,6): Error: assignment might update an object not in the enclosing context's modifies clause
-ModifyStmt.dfy(172,14): Error: assertion could not be proved
-
-Dafny program verifier finished with 11 verified, 11 errors
diff --git a/Test/dafny0/ModuleInsertionErrors.dfy.expect b/Test/dafny0/ModuleInsertionErrors.dfy.expect
deleted file mode 100644
index f4359d670a9..00000000000
--- a/Test/dafny0/ModuleInsertionErrors.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-ModuleInsertionErrors.dfy(23,11): Error: Duplicate module name: B
-ModuleInsertionErrors.dfy(24,11): Error: Duplicate module name: N
-ModuleInsertionErrors.dfy(30,17): Error: Duplicate module name: O
-3 resolution/type errors detected in ModuleInsertionErrors.dfy
diff --git a/Test/dafny0/ModulePrint.dfy b/Test/dafny0/ModulePrint.dfy
deleted file mode 100644
index 08e8911e69a..00000000000
--- a/Test/dafny0/ModulePrint.dfy
+++ /dev/null
@@ -1,36 +0,0 @@
-// NONUNIFORM: Tests printing much more than compilation
-// RUN: %dafny /dafnyVerify:0 /compile:0 /env:0 /dprint:"%t.dfy" "%s" > "%t"
-// RUN: %dafny /dafnyVerify:0 /compile:0 /env:0 /printMode:DllEmbed /dprint:"%t1.dfy" "%t.dfy" >> "%t"
-// RUN: %dafny /env:0 /compile:3 /printMode:DllEmbed /dprint:"%t2.dfy" "%t1.dfy" >> "%t"
-// RUN: %diff "%t1.dfy" "%t2.dfy" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-abstract module S {
-  class C {
-    var f: int
-    ghost var g: int
-    var h: int
-    method m()
-      modifies this
-  }
-}
-
-module T refines S {
-  class C ... {
-    ghost var h: int  // change from non-ghost to ghost
-    ghost var j: int
-    var k: int
-    constructor () { }
-    method m()
-      ensures h == h
-      ensures j == j
-    {
-      assert k == k;
-    }
-  }
-}
-
-method Main() {
-  var c := new T.C();
-  c.m();
-}
diff --git a/Test/dafny0/Modules1.dfy.expect b/Test/dafny0/Modules1.dfy.expect
deleted file mode 100644
index 8b12fb8fd42..00000000000
--- a/Test/dafny0/Modules1.dfy.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-Modules1.dfy(82,15): Error: assertion could not be proved
-Modules1.dfy(95,15): Error: assertion could not be proved
-Modules1.dfy(97,18): Error: assertion could not be proved
-Modules1.dfy(211,16): Error: assertion could not be proved
-Modules1.dfy(212,22): Error: assertion could not be proved
-Modules1.dfy(213,22): Error: assertion could not be proved
-Modules1.dfy(219,16): Error: assertion could not be proved
-Modules1.dfy(220,16): Error: assertion could not be proved
-Modules1.dfy(221,16): Error: assertion could not be proved
-Modules1.dfy(56,8): Error: decreases expression must be bounded below by 0
-Modules1.dfy(54,12): Related location
-Modules1.dfy(62,8): Error: decreases clause might not decrease
-
-Dafny program verifier finished with 9 verified, 11 errors
diff --git a/Test/dafny0/ModulesCycle.dfy b/Test/dafny0/ModulesCycle.dfy
deleted file mode 100644
index 5ad99d1e3f2..00000000000
--- a/Test/dafny0/ModulesCycle.dfy
+++ /dev/null
@@ -1,27 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module V {
-  import t = T  // error: T is not visible (and isn't even a module)
-}
-
-module A {
-  import B = C
-}
-
-module C {
-  import D = A
-}
-
-module Kevin {  // error: cyclic import
-  module Joe {
-    module Nick {
-      import Frankie
-    }
-  }
-}
-
-module Frankie {
-  import Kevin
-  const x := 3
-}
diff --git a/Test/dafny0/MultiDimArray.dfy.expect b/Test/dafny0/MultiDimArray.dfy.expect
deleted file mode 100644
index 96870dfbc38..00000000000
--- a/Test/dafny0/MultiDimArray.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-MultiDimArray.dfy(53,20): Error: assertion could not be proved
-MultiDimArray.dfy(79,24): Error: assertion could not be proved
-
-Dafny program verifier finished with 5 verified, 2 errors
diff --git a/Test/dafny0/NatTypes.dfy.expect b/Test/dafny0/NatTypes.dfy.expect
deleted file mode 100644
index 351db817745..00000000000
--- a/Test/dafny0/NatTypes.dfy.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-NatTypes.dfy(10,4): Error: value does not satisfy the subset constraints of 'nat'
-NatTypes.dfy(44,31): Error: value does not satisfy the subset constraints of 'nat'
-NatTypes.dfy(51,15): Error: assertion could not be proved
-NatTypes.dfy(54,15): Error: assertion could not be proved
-NatTypes.dfy(64,26): Error: value does not satisfy the subset constraints of 'nat'
-NatTypes.dfy(71,15): Error: assertion could not be proved
-NatTypes.dfy(74,15): Error: assertion could not be proved
-NatTypes.dfy(91,15): Error: assertion could not be proved
-NatTypes.dfy(105,15): Error: assertion could not be proved
-NatTypes.dfy(141,44): Error: value does not satisfy the subset constraints of 'nat'
-NatTypes.dfy(164,34): Error: value does not satisfy the subset constraints of 'nat'
-NatTypes.dfy(184,16): Error: value does not satisfy the subset constraints of 'nat'
-NatTypes.dfy(35,11): Error: value does not satisfy the subset constraints of 'nat'
-
-Dafny program verifier finished with 7 verified, 13 errors
diff --git a/Test/dafny0/NativeTypeResolution.dfy.expect b/Test/dafny0/NativeTypeResolution.dfy.expect
deleted file mode 100644
index fdbf9742a37..00000000000
--- a/Test/dafny0/NativeTypeResolution.dfy.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-NativeTypeResolution.dfy(4,8): Info: newtype V resolves as {:nativeType "byte"} (Detected Range: 0 .. 200)
-NativeTypeResolution.dfy(5,29): Error: Dafny's heuristics failed to confirm 'byte' to be a compatible native type.  Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'
-NativeTypeResolution.dfy(6,35): Error: Dafny's heuristics failed to confirm 'byte' to be a compatible native type.  Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'
-NativeTypeResolution.dfy(8,42): Error: Dafny's heuristics failed to confirm 'byte' to be a compatible native type.  Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'
-NativeTypeResolution.dfy(10,50): Info: newtype A resolves as {:nativeType "int"} (Detected Range: 0 .. 256)
-NativeTypeResolution.dfy(11,50): Info: newtype B resolves as {:nativeType "byte"} (Detected Range: 0 .. 256)
-NativeTypeResolution.dfy(12,50): Info: newtype C resolves as {:nativeType "int"} (Detected Range: 0 .. 256)
-NativeTypeResolution.dfy(14,35): Error: :nativeType 'reallylong' not known
-NativeTypeResolution.dfy(15,41): Error: :nativeType 'reallylong' not known
-NativeTypeResolution.dfy(17,31): Error: None of the types given in :nativeType arguments is supported by the current compilation target. Try supplying others.
-NativeTypeResolution.dfy(18,40): Error: None of the types given in :nativeType arguments is supported by the current compilation target. Try supplying others.
-NativeTypeResolution.dfy(21,22): Error: Dafny's heuristics cannot find a compatible native type.  Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'
-NativeTypeResolution.dfy(22,22): Info: newtype I resolves as {:nativeType "sbyte"} (Detected Range: -2 .. 30)
-NativeTypeResolution.dfy(23,27): Error: Dafny's heuristics cannot find a compatible native type.  Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'
-NativeTypeResolution.dfy(24,27): Info: newtype K resolves as {:nativeType "sbyte"} (Detected Range: -2 .. 30)
-NativeTypeResolution.dfy(29,27): Error: unexpected :nativeType argument
-NativeTypeResolution.dfy(30,21): Error: unexpected :nativeType argument
-NativeTypeResolution.dfy(31,28): Error: :nativeType can only be used on integral types
-NativeTypeResolution.dfy(33,29): Error: Dafny's heuristics failed to confirm 'long' to be a compatible native type.  Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'
-NativeTypeResolution.dfy(34,29): Error: Dafny's heuristics failed to confirm 'long' to be a compatible native type.  Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'
-NativeTypeResolution.dfy(38,8): Info: newtype FF resolves as {:nativeType "sbyte"} (Detected Range: -20 .. 20)
-NativeTypeResolution.dfy(39,29): Error: Dafny's heuristics failed to confirm 'byte' to be a compatible native type.  Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'
-15 resolution/type errors detected in NativeTypeResolution.dfy
diff --git a/Test/dafny0/NestedPatterns.dfy.expect b/Test/dafny0/NestedPatterns.dfy.expect
deleted file mode 100644
index 5b0d277566c..00000000000
--- a/Test/dafny0/NestedPatterns.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-NestedPatterns.dfy(75,23): Error: Duplicate parameter name: h
-NestedPatterns.dfy(83,20): Error: Duplicate parameter name: h
-NestedPatterns.dfy(91,23): Error: Duplicate parameter name: e
-NestedPatterns.dfy(107,7): Error: the case pattern is a 2-element tuple, while the match expression is a 3-element tuple
-4 resolution/type errors detected in NestedPatterns.dfy
diff --git a/Test/dafny0/NoMoreAssume2Less2.dfy.expect b/Test/dafny0/NoMoreAssume2Less2.dfy.expect
deleted file mode 100644
index be0eb28afd2..00000000000
--- a/Test/dafny0/NoMoreAssume2Less2.dfy.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-NoMoreAssume2Less2.dfy(26,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(35,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(44,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(50,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(53,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(59,13): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(62,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(68,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(72,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(86,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(92,18): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(95,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(104,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(110,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(78,26): Related location
-NoMoreAssume2Less2.dfy(113,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(119,19): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(135,16): Error: this loop invariant could not be proved on entry
-NoMoreAssume2Less2.dfy(135,16): Related message: loop invariant violation
-NoMoreAssume2Less2.dfy(140,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(146,12): Error: a precondition for this call could not be proved
-NoMoreAssume2Less2.dfy(162,11): Related location: this is the precondition that could not be proved
-NoMoreAssume2Less2.dfy(149,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(158,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(175,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(180,12): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(186,11): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(191,12): Error: assertion could not be proved
-NoMoreAssume2Less2.dfy(198,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 26 errors
diff --git a/Test/dafny0/NoReferencesVerification.dfy.expect b/Test/dafny0/NoReferencesVerification.dfy.expect
deleted file mode 100644
index 1754d488af4..00000000000
--- a/Test/dafny0/NoReferencesVerification.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-NoReferencesVerification.dfy(16,9): Error: assertion could not be proved
-NoReferencesVerification.dfy(26,11): Error: assertion could not be proved
-NoReferencesVerification.dfy(33,11): Error: assertion could not be proved
-NoReferencesVerification.dfy(49,9): Error: assertion could not be proved
-
-Dafny program verifier finished with 2 verified, 4 errors
diff --git a/Test/dafny0/OlderVerification.dfy.expect b/Test/dafny0/OlderVerification.dfy.expect
deleted file mode 100644
index 6c7c2c2faf0..00000000000
--- a/Test/dafny0/OlderVerification.dfy.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-OlderVerification.dfy(89,18): Error: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
-OlderVerification.dfy(141,18): Error: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
-OlderVerification.dfy(168,18): Error: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
-OlderVerification.dfy(263,18): Error: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
-OlderVerification.dfy(267,18): Error: the 'older' parameter might be newer than the other parameter when the predicate returns 'true'
-OlderVerification.dfy(271,18): Error: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
-OlderVerification.dfy(275,18): Error: an 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
-OlderVerification.dfy(279,18): Error: an 'older' parameter might be newer than the non-'older' parameter when the predicate returns 'true'
-OlderVerification.dfy(283,18): Error: an 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
-OlderVerification.dfy(288,20): Error: the 'older' parameter might be newer than the other parameter when the predicate returns 'true'
-OlderVerification.dfy(292,20): Error: the 'older' parameter might be newer than all non-'older' parameters when the predicate returns 'true'
-OlderVerification.dfy(34,16): Error: the 'older' parameter might be newer than the other parameter when the predicate returns 'true'
-OlderVerification.dfy(42,16): Error: the 'older' parameter might be newer than the other parameter when the predicate returns 'true'
-
-Dafny program verifier finished with 19 verified, 13 errors
diff --git a/Test/dafny0/OnDemandResolutionCycle.dfy.expect b/Test/dafny0/OnDemandResolutionCycle.dfy.expect
deleted file mode 100644
index d8338dc9459..00000000000
--- a/Test/dafny0/OnDemandResolutionCycle.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-OnDemandResolutionCycle.dfy(5,6): Error: PRE-TYPE: Cyclic dependency among declarations: a -> A -> a
-OnDemandResolutionCycle.dfy(9,9): Error: PRE-TYPE: Cyclic dependency among declarations: FB -> B -> FB -> b
-OnDemandResolutionCycle.dfy(7,5): Error: PRE-TYPE: Cyclic dependency among declarations: B -> B -> FB -> b
-OnDemandResolutionCycle.dfy(11,6): Error: PRE-TYPE: Cyclic dependency among declarations: c0 -> c1 -> c0
-OnDemandResolutionCycle.dfy(15,6): Error: PRE-TYPE: Cyclic dependency among declarations: d -> D -> d
-OnDemandResolutionCycle.dfy(19,9): Error: PRE-TYPE: Cyclic dependency among declarations: FE -> E -> FE -> e
-OnDemandResolutionCycle.dfy(17,8): Error: PRE-TYPE: Cyclic dependency among declarations: E -> E -> FE -> e
-OnDemandResolutionCycle.dfy(22,9): Error: PRE-TYPE: Cyclic dependency among declarations: f -> F -> f
-OnDemandResolutionCycle.dfy(21,8): Error: PRE-TYPE: Cyclic dependency among declarations: F -> F -> f
-OnDemandResolutionCycle.dfy(24,6): Error: PRE-TYPE: Cyclic dependency among declarations: g -> g
-OnDemandResolutionCycle.dfy(15,14): Error: PRE-TYPE: integer literal used as if it had type D
-11 resolution/type errors detected in OnDemandResolutionCycle.dfy
diff --git a/Test/dafny0/OnDemandResolutionOrdering.dfy b/Test/dafny0/OnDemandResolutionOrdering.dfy
deleted file mode 100644
index 757da5946d8..00000000000
--- a/Test/dafny0/OnDemandResolutionOrdering.dfy
+++ /dev/null
@@ -1,161 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /typeSystemRefresh:1 /print:"%t.print" /rprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Str(s: string) {
-  var t := s;
-}
-
-class Class<XX> {
-}
-
-method MC(c: Class<real>) {
-  var d: Class := c;
-}
-
-type Synonym<A, Unused> = seq<A>
-
-method SM(x: Synonym<int, real>, y: seq<bool>) {
-  var m: seq := y;
-
-  var a := x;
-
-  var b: Synonym<int, bool> := x; // fine
-
-  var k: seq := x;
-  var y: Synonym<int, bv29> := k; // fine
-}
-
-type ParamSub<X> = s | s == CC.GetEmpty<X>()
-
-class CC {
-  static function GetEmpty<Y>(): seq<Y> {
-    []
-  }
-}
-
-method Q0() returns (b: array<ParamSub<real>>, be: ParamSub<real>)
-{
-  if * {
-    // The following gives a verification error, because the inferred RHS type is the pre-type array<seq<real>>.
-    // (Once type improvement for subset types is implemented, this error will go away.)
-    b := new ParamSub<real>[20];
-  } else {
-    // The following gives a verification error, because the inferred RHS type is the pre-type array<seq<real>>.
-    // (Once type improvement for subset types is implemented, this error will go away.)
-    b := new ParamSub[20];
-  }
-  var a := be;
-  var d: array := b;
-  var c: ParamSub := b[0];
-
-  b := new [20];
-  var arr := new array<seq<int>>;
-  var cc := new CC;
-}
-
-type K0 = y | y == C.F(2) witness *
-type L0 = y | y == C.G(2) witness *
-type M0 = y | y == C.H(2) witness *
-
-class C {
-  static function F(x: nat): nat {
-    var u := x; u
-  }
-  static function G<X>(x: X): X {
-    var u := x; u
-  }
-  static function H<X>(x: X): seq<X> {
-    var u := [x]; u
-  }
-  static function Poly<X>(): seq<X> {
-    []
-  }
-}
-
-type K = y | y == C.F(2) witness *
-type L = y | y == C.G(2) witness *
-type M = y | y == C.H(2) witness *
-
-type MX<X> = y | y == C.Poly<X>() witness *
-
-class PolyClass<Z> {
-  static function StaticPoly<Z>(): seq<Z> {
-    var zs: seq<Z> := [];
-    zs
-  }
-  function InstancePoly<Z>(): seq<Z> {
-    var zs: seq<Z> := [];
-    zs
-  }
-  function InstanceMono(): seq<Z> {
-    var zs: seq<Z> := [];
-    zs
-  }
-}
-
-function FF<Y>(): K
-
-
-method Q1() {
-  var b: array<Six>;
-}
-
-method MM(n: nat, x: int)
-{
-  var r := n + x;
-}
-
-type Opaque
-
-type Six = x | 0 <= x witness 7
-
-type XParamSub<X> = s | s == XGetEmpty<X>()
-
-function XGetEmpty<Y>(): seq<Y> {
-  []
-}
-
-newtype N = x | x == n witness 2
-const n: int := 2
-
-const n' := 2
-
-module VariationOnOrdering0 {
-  type ParamSub<X> = s | s == CC.GetEmpty<X>()
-
-  class CC {
-    static function GetEmpty<Y>(): seq<Y> {
-      []
-    }
-  }
-
-  class QQ {
-    // In this module, Q0 follows ParamSub and GetEmpty
-    method Q0() returns (b: array<ParamSub<real>>)
-    {
-      // The following gives a verification error, because the inferred RHS type is the pre-type array<seq<real>>.
-      // (Once type improvement for subset types is implemented, this error will go away.)
-      b := new ParamSub<real>[20];
-    }
-  }
-}
-
-module VariationOnOrdering1 {
-  class QQ {
-    // In this module, Q0 precedes ParamSub and GetEmpty
-    method Q0() returns (b: array<ParamSub<real>>)
-    {
-      // The following gives a verification error, because the inferred RHS type is the pre-type array<seq<real>>.
-      // (Once type improvement for subset types is implemented, this error will go away.)
-      b := new ParamSub<real>[20];
-    }
-  }
-
-  type ParamSub<X> = s | s == CC.GetEmpty<X>()
-
-  class CC {
-    static function GetEmpty<Y>(): seq<Y> {
-      []
-    }
-  }
-}
diff --git a/Test/dafny0/OnDemandResolutionOrdering.dfy.expect b/Test/dafny0/OnDemandResolutionOrdering.dfy.expect
deleted file mode 100644
index c3d02b20371..00000000000
--- a/Test/dafny0/OnDemandResolutionOrdering.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-OnDemandResolutionOrdering.dfy(138,11): Error: value of expression (of type 'array?<seq<real>>') is not known to be an instance of type 'array<ParamSub<real>>' (possible cause: it may be null)
-OnDemandResolutionOrdering.dfy(150,11): Error: value of expression (of type 'array?<seq<real>>') is not known to be an instance of type 'array<ParamSub<real>>' (possible cause: it may be null)
-OnDemandResolutionOrdering.dfy(41,9): Error: value of expression (of type 'array?<seq<real>>') is not known to be an instance of type 'array<ParamSub<real>>' (possible cause: it may be null)
-OnDemandResolutionOrdering.dfy(45,9): Error: value of expression (of type 'array?<seq<real>>') is not known to be an instance of type 'array<ParamSub<real>>' (possible cause: it may be null)
-
-Dafny program verifier finished with 10 verified, 4 errors
diff --git a/Test/dafny0/OpaqueConstants.dfy.expect b/Test/dafny0/OpaqueConstants.dfy.expect
deleted file mode 100644
index 5204332bca1..00000000000
--- a/Test/dafny0/OpaqueConstants.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-OpaqueConstants.dfy(11,20): Error: assertion could not be proved
-OpaqueConstants.dfy(26,20): Error: assertion could not be proved
-OpaqueConstants.dfy(56,16): Error: assertion could not be proved
-OpaqueConstants.dfy(58,15): Error: assertion could not be proved
-OpaqueConstants.dfy(60,15): Error: assertion could not be proved
-OpaqueConstants.dfy(73,38): Error: assertion could not be proved
-OpaqueConstants.dfy(82,21): Error: assertion could not be proved
-OpaqueConstants.dfy(84,24): Error: assertion could not be proved
-OpaqueConstants.dfy(86,24): Error: assertion could not be proved
-OpaqueConstants.dfy(99,47): Error: assertion could not be proved
-
-Dafny program verifier finished with 3 verified, 10 errors
diff --git a/Test/dafny0/OpaqueFunctions.dfy b/Test/dafny0/OpaqueFunctions.dfy
deleted file mode 100644
index 8fc1cb6d2e3..00000000000
--- a/Test/dafny0/OpaqueFunctions.dfy
+++ /dev/null
@@ -1,370 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  export NotSoMuch
-    reveals C, C.RevealedValid
-    provides C.Valid, C.Get, C.M, C.x
-  export More extends NotSoMuch
-    reveals C.Get
-
-  class C {
-    var x: int;
-
-    ghost predicate Valid()
-      reads this
-      ensures Valid() ==> 0 <= x ensures x == 8 ==> Valid()  // holds for 8, does not hold for negative numbers
-
-    ghost predicate RevealedValid()
-      reads this
-      ensures Valid() ==> 0 <= x ensures x == 8 ==> Valid()  // holds for 8, does not hold for negative numbers
-
-    ghost function Get(): int
-      reads this
-    {
-      x
-    }
-
-    constructor ()
-      ensures Valid()
-    {
-      x := 8;
-    }
-
-    method M()
-      requires Valid()
-    {
-      assert Get() == x;
-      assert x == 8;  // error
-    }
-  }
-}
-
-module A' refines A {
-  class C ... {
-    // provide bodies for Valid, RevealedValid, and M
-    ghost predicate Valid...
-    {
-      x == 8
-    }
-    ghost predicate RevealedValid...
-    {
-      x == 8
-    }
-    method N()
-      requires Valid();
-    {
-      assert Get() == x;  // this is known, because the refined body of Get is considered inside A'
-      assert x == 8;
-    }
-  }
-}
-
-abstract module B {
-  import X : A`NotSoMuch
-  method Main() {
-    var c := new X.C();
-    c.M();  // fine
-    c.x := c.x + 1;
-    c.M();  // error, because no body of Valid() is known
-  }
-
-  method L(c: X.C)
-    modifies c;
-  {
-    assert c.Get() == c.x;  // error because Get() is only provided
-    if * {
-      assert c.Valid();  // error, because Valid() may be false (for example, if c.x is negative)
-    } else if * {
-      c.x := 7;
-      assert c.Valid();  // error, because Valid() is not known to hold for x==7
-    } else {
-      c.x := 8;
-      assert c.Valid();  // fine, because the postcondition of Valid() says it holds for x==8
-    }
-  }
-}
-
-abstract module B_direct {
-  import X : A'`NotSoMuch
-  method Main() {
-    var c := new X.C();
-    if * {
-      c.M();  // fine
-      c.x := c.x + 1;  // this may ruin Valid()
-      if * {
-        assert c.Valid();  // error
-      } else {
-        c.M();  // error
-      }
-    } else {
-      assert c.Valid();
-      assert c.x == 8;  // error, because Valid is only provided
-    }
-  }
-
-  method L(c: X.C)
-    modifies c
-  {
-    assert c.Get() == c.x;  // error because Get() is only provided
-    if * {
-      assert c.Valid();  // error, because Valid() is only provided
-    } else if * {
-      c.x := 7;
-      assert c.Valid();  // error, because Valid() is only provided
-    } else {
-      c.x := 8;
-      assert c.Valid();  // fine, because the postcondition of Valid() says it holds for x==8
-    }
-  }
-
-  method K(c: X.C) {
-    if * {
-      assert c.Valid() ==> c.x == 8;  // error, because Valid() is only provided
-    } else {
-      assert c.RevealedValid() ==> c.x == 8;  // good
-    }
-  }
-}
-
-abstract module B_more {
-  import X : A'`More
-  method L(c: X.C)
-    modifies c;
-  {
-    assert c.Get() == c.x;  // yes, this is known, due to using the larger export set of A'
-  }
-}
-
-module B' refines B {
-  import X = A'`NotSoMuch
-  method Main'() {
-    var c := new X.C();
-    c.M();  // fine
-    c.x := c.x + 1;
-    if * {
-      assert c.Valid();  // error, because Valid() is opaque
-    } else {
-      c.M();  // error, because Valid() is opaque
-    }
-  }
-
-  method L'(c: X.C)
-    modifies c
-  {
-    assert c.Get() == c.x;  // error because Get() is only provided
-    if * {
-      assert c.Valid();  // error, because Valid() is only provided
-    } else if * {
-      c.x := 7;
-      assert c.Valid();  // error, because Valid() is only provided
-    } else if * {
-      c.x := 8;
-      assert c.Valid();  // fine, because Valid()'s postcondition says it holds for x==8
-    } else {
-      assert c.Valid() ==> c.x == 8;  // error, because Valid is only provided
-    }
-  }
-}
-
-// ---------------------------------
-
-module OpaqueFunctionsAreNotInlined {
-  ghost predicate {:opaque} F(n: int)
-  {
-    0 <= n < 100
-  }
-
-  method M()
-  {
-    var x := 18;
-    assert F(x);  // error: cannot be determined, since F is opaque
-  }
-
-  method M'()
-  {
-    var x := 18;
-    reveal F();
-    assert F(x);
-  }
-}
-
-// --------------------------------- opaque and refinement
-
-module M0 {
-  ghost function {:opaque} F(): int
-  { 12 }
-}
-
-module M1 refines M0 {
-}
-
-// ---------------------------------- opaque and generics
-
-ghost function {:opaque} id<A>(x: A): A { x }
-
-method id_ok()
-{
-  reveal id();
-  assert id(1) == 1;
-}
-
-method id_fail()
-{
-  assert id(1) == 1;  // error
-}
-
-datatype Box<A> = Bx(A)
-
-ghost function {:opaque} id_box(x: Box): Box { x }
-
-method box_ok()
-{
-  reveal id();
-  assert id(Bx(1)) == Bx(1);
-}
-
-method box_fail()
-{
-  assert id(Bx(1)) == Bx(1);  // error
-}
-
-// ------------------------- opaque and layer quantifiers
-
-module LayerQuantifiers
-{
-  ghost function {:opaque} f(x: nat): bool { if x == 0 then true else f(x-1) }
-
-  method rec_should_ok()
-  {
-    reveal f();
-    assert f(1);
-  }
-
-  method rec_should_fail()
-  {
-    assert f(1);  // error
-  }
-
-  method rec_should_unroll_ok(one : int)
-    requires one == 1
-  {
-    reveal f();
-    // this one should have enough fuel
-    assert f(one + one);
-  }
-
-  method rec_should_unroll_fail(one : int)
-    requires one == 1
-  {
-    reveal f();
-    assert f(one + one + one);  // error: this one does not have enough fuel
-  }
-}
-
-// ------------------------------------- regression test
-
-module Regression
-{
-  datatype List<A> = Nil | Cons(A, tl: List<A>)
-
-  ghost function Empty<A>(): List<A> { Nil }
-
-  ghost function {:opaque} Length<A>(s: List<A>): int
-    ensures 0 <= Length(s)
-  {
-    if s.Cons? then 1 + Length(s.tl) else 0
-  }
-
-  lemma Empty_ToZero<A>()
-    ensures Length<A>(Empty<A>()) == 0;  // this line once caused the verifier to crash
-  {
-    reveal Length();
-  }
-}
-
-// This function used to cause a problem for the old version of opaque,
-// but it's fine with the new fuel-based version
-ghost function {:opaque} zero<A>(): int { 0 }
-
-// ------------------------- opaque for members of non-reference types
-
-module TypeMembers {
-  trait Tr {
-    const fav: bool
-    predicate {:opaque} IsFavorite() {
-      fav
-    }
-    static ghost predicate {:opaque} IsFive(x: int) {
-      x == 5
-    }
-  }
-
-  datatype Color = Carrot | Pumpkin
-  {
-    predicate {:opaque} IsFavorite() {
-      this == Pumpkin
-    }
-    static ghost predicate {:opaque} IsFive(x: int) {
-      x == 5
-    }
-  }
-
-  newtype Small = x | 30 <= x < 40 witness 30
-  {
-    predicate {:opaque} IsFavorite() {
-      this == 34
-    }
-    static ghost predicate {:opaque} IsFive(x: int) {
-      x == 5
-    }
-  }
-
-  method Test(tr: Tr, c: Color, s: Small) {
-    if
-    case tr.IsFavorite() =>
-      assert tr.fav;  // error: this is not known here
-    case c.IsFavorite() =>
-      assert c == Pumpkin;  // error: this is not known here
-    case s.IsFavorite() =>
-      assert s == 34;  // error: this is not known here
-    case tr.IsFavorite() =>
-      reveal tr.IsFavorite();
-      assert tr.fav;
-    case c.IsFavorite() =>
-      reveal c.IsFavorite();
-      assert c == Pumpkin;
-    case s.IsFavorite() =>
-      reveal s.IsFavorite();
-      assert s == 34;
-    case true =>
-      if tr.IsFavorite() && c.IsFavorite() && s.IsFavorite() {
-        reveal tr.IsFavorite(), c.IsFavorite(), s.IsFavorite();
-        assert !tr.fav || c == Carrot || s == 39;  // error: not true
-      }
-  }
-
-  method StaticTest(x: int) {
-    if
-    case Tr.IsFive(x) =>
-      assert x == 5;  // error: this is not known here
-    case Color.IsFive(x) =>
-      assert x == 5;  // error: this is not known here
-    case Small.IsFive(x) =>
-      assert x == 5;  // error: this is not known here
-    case Tr.IsFive(x) =>
-      reveal Tr.IsFive();
-      assert x == 5;
-    case Color.IsFive(x) =>
-      reveal Color.IsFive();
-      assert x == 5;
-    case Small.IsFive(x) =>
-      reveal Small.IsFive();
-      assert x == 5;
-    case true =>
-      if Tr.IsFive(x) && Color.IsFive(x) && Small.IsFive(x) {
-        reveal Tr.IsFive(), Color.IsFive(), Small.IsFive();
-        assert x != 5;  // error: not true
-      }
-  }
-}
diff --git a/Test/dafny0/OpaqueFunctions.dfy.expect b/Test/dafny0/OpaqueFunctions.dfy.expect
deleted file mode 100644
index e911618ff51..00000000000
--- a/Test/dafny0/OpaqueFunctions.dfy.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-OpaqueFunctions.dfy(38,15): Error: assertion could not be proved
-OpaqueFunctions.dfy(69,7): Error: a precondition for this call could not be proved
-OpaqueFunctions.dfy(35,15): Related location: this is the precondition that could not be proved
-OpaqueFunctions.dfy(75,19): Error: assertion could not be proved
-OpaqueFunctions.dfy(77,20): Error: assertion could not be proved
-OpaqueFunctions.dfy(80,20): Error: assertion could not be proved
-OpaqueFunctions.dfy(96,22): Error: assertion could not be proved
-OpaqueFunctions.dfy(98,11): Error: a precondition for this call could not be proved
-OpaqueFunctions.dfy[A'](35,15): Related location: this is the precondition that could not be proved
-OpaqueFunctions.dfy(102,17): Error: assertion could not be proved
-OpaqueFunctions.dfy(109,19): Error: assertion could not be proved
-OpaqueFunctions.dfy(111,20): Error: assertion could not be proved
-OpaqueFunctions.dfy(114,20): Error: assertion could not be proved
-OpaqueFunctions.dfy(123,31): Error: assertion could not be proved
-OpaqueFunctions.dfy(146,20): Error: assertion could not be proved
-OpaqueFunctions.dfy(148,9): Error: a precondition for this call could not be proved
-OpaqueFunctions.dfy[A'](35,15): Related location: this is the precondition that could not be proved
-OpaqueFunctions.dfy(155,19): Error: assertion could not be proved
-OpaqueFunctions.dfy(157,20): Error: assertion could not be proved
-OpaqueFunctions.dfy(160,20): Error: assertion could not be proved
-OpaqueFunctions.dfy(165,31): Error: assertion could not be proved
-OpaqueFunctions.dfy(181,11): Error: assertion could not be proved
-OpaqueFunctions.dfy(246,11): Error: assertion could not be proved
-OpaqueFunctions.dfy(261,11): Error: assertion could not be proved
-OpaqueFunctions.dfy(326,16): Error: assertion could not be proved
-OpaqueFunctions.dfy(328,15): Error: assertion could not be proved
-OpaqueFunctions.dfy(330,15): Error: assertion could not be proved
-OpaqueFunctions.dfy(343,38): Error: assertion could not be proved
-OpaqueFunctions.dfy(350,15): Error: assertion could not be proved
-OpaqueFunctions.dfy(352,15): Error: assertion could not be proved
-OpaqueFunctions.dfy(354,15): Error: assertion could not be proved
-OpaqueFunctions.dfy(367,17): Error: assertion could not be proved
-OpaqueFunctions.dfy(214,15): Error: assertion could not be proved
-OpaqueFunctions.dfy(229,19): Error: assertion could not be proved
-
-Dafny program verifier finished with 20 verified, 31 errors
diff --git a/Test/dafny0/OpaqueTypeWithMembers.dfy.expect b/Test/dafny0/OpaqueTypeWithMembers.dfy.expect
deleted file mode 100644
index c4df0f19db3..00000000000
--- a/Test/dafny0/OpaqueTypeWithMembers.dfy.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-OpaqueTypeWithMembers.dfy(26,13): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-OpaqueTypeWithMembers.dfy(64,13): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-OpaqueTypeWithMembers.dfy(94,13): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-OpaqueTypeWithMembers.dfy(139,15): Error: function precondition could not be proved
-OpaqueTypeWithMembers.dfy(120,13): Related location
-OpaqueTypeWithMembers.dfy(141,16): Error: function precondition could not be proved
-OpaqueTypeWithMembers.dfy(115,13): Related location
-OpaqueTypeWithMembers.dfy(113,28): Related location
-OpaqueTypeWithMembers.dfy(83,42): Error: possible division by zero
-OpaqueTypeWithMembers.dfy(84,51): Error: possible division by zero
-OpaqueTypeWithMembers.dfy(87,9): Error: index out of range
-OpaqueTypeWithMembers.dfy(90,22): Error: index out of range
-OpaqueTypeWithMembers.dfy(93,18): Error: index out of range
-OpaqueTypeWithMembers.dfy(100,8): Error: possible division by zero
-OpaqueTypeWithMembers.dfy(107,17): Error: possible division by zero
-
-Dafny program verifier finished with 15 verified, 9 errors
diff --git a/Test/dafny0/Parallel.dfy b/Test/dafny0/Parallel.dfy
deleted file mode 100644
index 778673d45d0..00000000000
--- a/Test/dafny0/Parallel.dfy
+++ /dev/null
@@ -1,343 +0,0 @@
-// UNSUPPORTED: windows
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-class C {
-  var data: int
-  var n: nat
-  var st: set<object>
-
-  lemma CLemma(k: int)
-    requires k != -23
-    ensures data < k  // magic, isn't it (or bogus, some would say)
-}
-
-// This method more or less just tests the syntax, resolution, and basic verification
-method ParallelStatement_Resolve(
-    a: array<int>,
-    spine: set<C>,
-    Repr: set<object>,
-    S: set<int>,
-    clx: C?, cly: C?, clk: int
-  )
-  modifies a, spine
-{
-  forall i | 0 <= i < a.Length && i % 2 == 0 {
-    a[i] := a[(i + 1) % a.Length] + 3;
-  }
-
-  forall o | o in spine {
-    o.st := o.st + Repr;
-  }
-
-  forall x, y | x in S && 0 <= y+x < 100 {
-    Lemma(clx, x, y);  // error: precondition does not hold (clx may be null)
-  }
-
-  forall x, y | x in S && 0 <= y+x < 100 {
-    cly.CLemma(x + y);  // error: receiver might be null
-  }
-
-  forall p | 0 <= p
-    ensures F(p) <= Sum(p) + p - 1  // error (no connection is known between F and Sum)
-  {
-    assert 0 <= G(p);
-    ghost var t;
-    if p % 2 == 0 {
-      assert G(p) == F(p+2);  // error (there's nothing that gives any relation between F and G)
-      t := p+p;
-    } else {
-      assume H(p, 20) < 100;  // don't know how to justify this
-      t := p;
-    }
-    PowerLemma(p, t);
-    t := t + 1;
-    PowerLemma(p, t);
-  }
-}
-
-lemma Lemma(c: C?, x: int, y: int)
-  requires c != null
-  ensures c.data <= x+y
-lemma PowerLemma(x: int, y: int)
-  ensures Pred(x, y)
-
-ghost function F(x: int): int
-ghost function G(x: int): nat
-ghost function H(x: int, y: int): int
-ghost function Sum(x: int): int
-ghost function Pred(x: int, y: int): bool
-
-// ---------------------------------------------------------------------
-
-method M0(S: set<C>)
-  modifies S
-  ensures forall o :: o in S ==> o.data == 85
-  ensures forall o :: o !in S && !fresh(o) ==> o.data == old(o.data)
-{
-  forall s | s in S {
-    s.data := 85;
-  }
-}
-
-method M1(S: set<C>, x: C)
-  requires x in S
-{
-  forall s | s in S
-    ensures s.data < 100
-  {
-    assume s.data == 85;
-  }
-  if * {
-    assert x.data == 85;  // error (cannot be inferred from forall ensures clause)
-  } else {
-    assert x.data < 120;
-  }
-
-  forall s | s in S
-    ensures s.data < 70  // error
-  {
-    assume s.data == 85;
-  }
-}
-
-method M2() returns (a: array<int>)
-  ensures forall i,j :: 0 <= i < a.Length/2 <= j < a.Length ==> a[i] < a[j]
-{
-  a := new int[250];
-  forall i: nat | i < 125 {
-    a[i] := 423;
-  }
-  forall i | 125 <= i < 250 {
-    a[i] := 300 + i;
-  }
-}
-
-method M4(S: set<C>, k: int)
-  modifies S
-{
-  forall s | s in S {
-    s.n := k;  // error: k might be negative
-  }
-}
-
-method M5()
-{
-  if {
-  case true =>
-    forall x | 0 <= x < 100 {
-      PowerLemma(x, x);
-    }
-    assert Pred(34, 34);
-
-  case true =>
-    forall x,y | 0 <= x < 100 && y == x+1 {
-      PowerLemma(x, y);
-    }
-    assert Pred(34, 35);
-
-  case true =>
-    forall x,y | 0 <= x < y < 100 {
-      PowerLemma(x, y);
-    }
-    assert Pred(34, 35);
-
-  case true =>
-    forall x | x in set k | 0 <= k < 100 {
-      PowerLemma(x, x);
-    }
-    assert Pred(34, 34);
-  }
-}
-
-method Main()
-{
-  var a := new int[180];
-  forall i | 0 <= i < 180 {
-    a[i] := 2*i + 100;
-  }
-  var sq := [0, 0, 0, 2, 2, 2, 5, 5, 5];
-  forall i | 0 <= i < |sq| {
-    a[20+i] := sq[i];
-  }
-  forall t | t in sq {
-    a[t] := 1000;
-  }
-  forall t,u | t in sq && t < 4 && 10 <= u < 10+t {
-    a[u] := 6000 + t;
-  }
-  var k := 0;
-  while k < 180 {
-    if k != 0 { print ", "; }
-    print a[k];
-    k := k + 1;
-  }
-  print "\n";
-}
-
-method DuplicateUpdate() {
-  var a := new int[180];
-  var sq := [0, 0, 0, 2, 2, 2, 5, 5, 5];
-  if * {
-    forall t,u | t in sq && 10 <= u < 10+t {
-      a[u] := 6000 + t;  // error: a[10] (and a[11]) are assigned more than once
-    }
-  } else {
-    forall t,u | t in sq && t < 4 && 10 <= u < 10+t {
-      a[u] := 6000 + t;  // with the 't < 4' conjunct in the line above, this is fine
-    }
-  }
-}
-
-lemma DontDoMuch(x: int)
-{
-}
-
-method OmittedRange() {
-  forall x: int { }  // a type is still needed for the bound variable
-  forall x {
-    DontDoMuch(x);
-  }
-}
-
-// ----------------------- two-state postconditions ---------------------------------
-
-class TwoState_C { ghost var data: int }
-
-// It is not possible to achieve this postcondition in a lemma, because lemma
-// contexts are not allowed to allocate state.  Callers of this lemma will know
-// that the postcondition is tantamount to 'false'.
-lemma TwoState0(y: int)
-  ensures exists o: TwoState_C {:nowarn} :: allocated(o) && fresh(o)
-
-method TwoState_Main0() {
-  forall x { TwoState0(x); }
-  assert false;  // no prob, because the postcondition of TwoState0 implies false
-}
-
-method X_Legit(c: TwoState_C)
-  modifies c
-{
-  c.data := c.data + 1;
-  forall x | c.data <= x
-    ensures old(c.data) < x  // note that the 'old' refers to the method's initial state
-  {
-  }
-}
-
-// At first glance, this looks like a version of TwoState_Main0 above, but with an
-// ensures clause.
-// However, there's an important difference in the translation, which is that the
-// occurrence of 'fresh' here refers to the initial state of the TwoStateMain2
-// method, not the beginning of the 'forall' statement.
-method TwoState_Main2()
-{
-  forall x: int
-    ensures exists o: TwoState_C {:nowarn} :: allocated(o) && fresh(o)
-  {
-    TwoState0(x);
-  }
-  assert false;  // fine, for the postcondition of the forall statement implies false
-}
-
-// At first glance, this looks like an inlined version of TwoState_Main0 above.
-// However, there's an important difference in the translation, which is that the
-// occurrence of 'fresh' here refers to the initial state of the TwoState_Main3
-// method, not the beginning of the 'forall' statement.
-// Still, care needs to be taken in the translation to make sure that the forall
-// statement's effect on the heap is not optimized away.
-method TwoState_Main3()
-{
-  forall x: int
-    ensures exists o: TwoState_C {:nowarn} :: allocated(o) && fresh(o)
-  {
-    assume false;  // (there's no other way to achieve this forall-statement postcondition)
-  }
-  assert false;  // it is known that the forall's postcondition is contradictory, so this assert is fine
-}
-
-// ------- empty forall statement -----------------------------------------
-
-class EmptyForallStatement {
-  var emptyPar: int
-
-  method Empty_Parallel0()
-    modifies this
-    ensures emptyPar == 8
-  {
-    forall () {
-      this.emptyPar := 8;
-    }
-  }
-
-  ghost function EmptyPar_P(x: int): bool
-  lemma EmptyPar_Lemma(x: int)
-    ensures EmptyPar_P(x)
-
-  method Empty_Parallel1()
-    ensures EmptyPar_P(8)
-  {
-    forall {
-      EmptyPar_Lemma(8);
-    }
-  }
-
-  method Empty_Parallel2()
-  {
-    forall
-      ensures exists k :: EmptyPar_P(k)
-    {
-      var y := 8;
-      assume EmptyPar_P(y);
-    }
-    assert exists k :: EmptyPar_P(k);  // yes
-    assert EmptyPar_P(8);  // error: the forall statement's ensures clause does not promise this
-  }
-}
-
-// ---------------------------------------------------------------------
-// The following is an example that once didn't verify (because the forall statement that
-// induction inserts had caused the $Heap to be advanced, despite the fact that Th is a
-// ghost method).
-
-datatype Nat = Zero | Succ(tail: Nat)
-
-ghost predicate ThProperty(step: nat, t: Nat, r: nat)
-{
-  match t
-  case Zero => true
-  case Succ(o) => step>0 && exists ro:nat, ss | ss == step-1 :: ThProperty(ss, o, ro) //WISH: ss should be autogrnerated. Note that step is not a bound variable.
-}
-
-lemma Th(step: nat, t: Nat, r: nat)
-  requires t.Succ? && ThProperty(step, t, r)
-  // the next line follows from the precondition and the definition of ThProperty
-  ensures exists ro:nat, ss | ss == step-1 :: ThProperty(ss, t.tail, ro) //WISH same as above
-{
-}
-
-// ------------------------------------------------------------------------
-// The following example once included a unsoundness bug in the translation
-
-method BogosityClient()
-  ensures false
-{
-  var c := new C;
-  c.data := 3;
-  Bogus(c);
-}
-
-ghost predicate False(x: int) { false }
-
-method Bogus(c: C)
-  requires c.data == 3
-  modifies c
-  ensures false
-{
-  c.data := 4;
-  forall x | old(c.data) == 4
-    ensures False(x)
-  {
-    // easily provable, because the range of x is empty
-  }
-  assert False(10);  // error: does not follow from the "forall" statement
-}
diff --git a/Test/dafny0/Parallel.dfy.expect b/Test/dafny0/Parallel.dfy.expect
deleted file mode 100644
index c31122cdaaa..00000000000
--- a/Test/dafny0/Parallel.dfy.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-Parallel.dfy(267,4): Warning: a forall statement with no bound variables is deprecated; use an 'assert by' statement instead
-Parallel.dfy(279,4): Warning: a forall statement with no bound variables is deprecated; use an 'assert by' statement instead
-Parallel.dfy(286,4): Warning: a forall statement with no bound variables is deprecated; use an 'assert by' statement instead
-Parallel.dfy(33,9): Error: a precondition for this call could not be proved
-Parallel.dfy(59,13): Related location: this is the precondition that could not be proved
-Parallel.dfy(37,4): Error: target object might be null
-Parallel.dfy(41,17): Error: possible violation of postcondition of forall statement
-Parallel.dfy(46,18): Error: assertion could not be proved
-Parallel.dfy(91,18): Error: assertion could not be proved
-Parallel.dfy(97,19): Error: possible violation of postcondition of forall statement
-Parallel.dfy(119,11): Error: value does not satisfy the subset constraints of 'nat'
-Parallel.dfy(182,11): Error: left-hand sides for different forall-statement bound variables might refer to the same location
-Parallel.dfy(342,9): Error: assertion could not be proved
-Parallel.dfy(329,32): Related location
-Parallel.dfy(293,21): Error: assertion could not be proved
-
-Dafny program verifier finished with 19 verified, 10 errors
diff --git a/Test/dafny0/ParallelResolveErrors.dfy b/Test/dafny0/ParallelResolveErrors.dfy
deleted file mode 100644
index 7abb3b4dc52..00000000000
--- a/Test/dafny0/ParallelResolveErrors.dfy
+++ /dev/null
@@ -1,291 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module Basics {
-  method M() {
-    var k := 0;
-    forall i | 0 <= i < 20 {
-      k := k + i;  // error: not allowed to assign to local k, since k is not declared inside forall block
-    }
-
-    forall i | 0 <= i < 20
-      ensures true
-    {
-      var x := i;
-      x := x + 1;
-    }
-
-    ghost var y;
-    var z;
-    forall i | 0 <= i
-      ensures true
-    {
-      var x := i;
-      x := x + 1;
-      y := 18;  // error: assigning to a (ghost) variable inside a ghost forall block
-      z := 20;  // error: assigning to a (non-ghost) variable inside a ghost forall block
-    }
-  }
-}
-
-module Misc {
-  class C { }
-
-  method M0(IS: set<int>) {
-    forall i | 0 <= i < 20 {
-      i := i + 1;  // error: not allowed to assign to bound variable
-    }
-
-    forall i | 0 <= i
-      ensures true
-    {
-      ghost var x := i;
-      x := x + 1;  // cool
-    }
-
-    var ca := new C[20];
-    forall i | 0 <= i < 20 {
-      ca[i] := new C;  // error: new allocation not allowed
-    }
-  }
-
-  method M1() {
-    forall i | 0 <= i < 20 {
-      assert i < 100;
-      if i == 17 { break; }  // error: nothing to break out of
-    }
-
-    var m := 0;
-    label OutsideLoop:
-    while m < 20 {
-      forall i | 0 <= i < 20 {
-        if i == 17 { break; }  // error: not allowed to break out of loop that sits outside forall
-        if i == 8 { break break; }  // error: ditto (also: attempt to break too far)
-        if i == 9 { break OutsideLoop; }  // error: ditto
-      }
-      m := m + 1;
-    }
-
-    forall i | 0 <= i < 20 {
-      var j := 0;
-      while j < i {
-        if j == 6 { break; }  // fine
-        if j % 7 == 4 { break break; }  // error: attempt to break out too far
-        if j % 7 == 4 { break OutsideLoop; }  // error: attempt to break to place not in enclosing scope
-        j := j + 1;
-      }
-    }
-
-    label WhileOutsideForall:
-    while true {
-      forall i | 0 <= i < 20 { // "break" doesn't exit "forall" statements, so the enclosing "while" loop doesn't count
-        var j := 0;
-        while j < i {
-          if j == 6 { break; }  // fine
-          if j % 7 == 4 { break break; }  // error: attempt to break out too far
-          if j % 7 == 4 { break WhileOutsideForall; }  // error: attempt to break to place not in enclosing scope
-          j := j + 1;
-        }
-      }
-      break;
-    }
-  }
-}
-
-module AnotherModule {
-  class C {
-    var data: int
-    ghost var gdata: int
-
-    ghost method Init_ModifyNothing() { }
-
-    ghost method Init_ModifyThis()
-      modifies this
-    {
-      data := 6;  // error: assignment to a non-ghost field
-      gdata := 7;
-    }
-
-    ghost method Init_ModifyStuff(c: C)
-      modifies this, c
-    {
-    }
-
-    method NonGhostMethod() {
-      print "hello\n";
-    }
-
-    ghost method GhostMethodWithModifies(x: int)
-      modifies this
-    {
-      gdata := gdata + x;
-    }
-  }
-
-  method TestNew() {
-    forall i | 0 <= i < 20
-      ensures true
-    {
-      var c := new C;  // error: 'new' not allowed in proof context
-      var d := new C.Init_ModifyNothing();  // error (x2): 'new' not allowed in ghost context
-      var e := new C.Init_ModifyThis();  // error (x2): 'new' not allowed in ghost context
-      var f := new C.Init_ModifyStuff(e);  // error (x2): 'new' not allowed in ghost context
-      c.Init_ModifyStuff(d);  // error: not allowed to call method with modifies clause in ghost context
-      c.NonGhostMethod();  // error: only allowed to call ghost methods (because of possible 'print' statements, sigh)
-    }
-  }
-
-  method M2() {
-    var a := new int[100];
-    forall x | 0 <= x < 100
-      ensures true
-    {
-      a[x] :| assume a[x] > 0;  // error: not allowed to update heap location in a proof-forall statement
-    }
-  }
-
-  method M3(c: C) {
-    forall x {
-      c.GhostMethodWithModifies(x);  // error: not allowed to call method with nonempty modifies clause
-    }
-    forall x
-      ensures true
-    {
-      c.GhostMethodWithModifies(x);  // error: not allowed to call method with nonempty modifies clause
-    }
-  }
-
-  method AggregatePrinting() {
-    forall i | 0 <= i < 1000
-      ensures true
-    {
-      print "here we go\n"; // error: cannot print in ghost context
-    }
-  }
-}
-
-module UpdatesInOuterScope {
-  method M() {
-    ghost var x := 0;
-    forall i | 0 <= i < 100
-      ensures true
-    {
-      // AssignStmt
-      x := 10;
-      // AssignSuchThatStmt
-      x :| x == 10;
-      // CallStmt
-      x := P();
-    }
-  }
-
-  method P() returns (x: int)
-}
-
-module MoreReturn {
-  method M() {
-    forall i | 0 <= i < 20
-      ensures true
-    {
-      if i == 8 { return; }  // error: return not allowed inside forall block
-    }
-  }
-}
-
-// ---------- refinement of modify statements
-
-module NoRefinement {
-  class Cell {
-    var data: int
-  }
-
-  method W(c: Cell)
-  {
-    var c := new Cell;
-    var i := 0;
-    label L:
-    while i < 10
-      invariant i == 0 || c.data == 10
-    {
-      modify c {
-        if * {
-          break; // fine
-        } else if * {
-          break L; // fine
-        }
-        c.data := 9;
-      }
-      c.data := 10;
-      i := i + 1;
-    }
-  }
-}
-
-module ModifyStmtBreak0 {
-  class Cell {
-    var data: int
-  }
-
-  method W(c: Cell)
-    modifies c
-    ensures c.data == 10
-  {
-    var i := 0;
-    label L:
-    while i < 10
-      invariant i == 0 || c.data == 10
-    {
-      modify c;
-      c.data := 10;
-      i := i + 1;
-    }
-  }
-}
-
-module ModifyStmtBreak1 refines ModifyStmtBreak0 {
-  method W... {
-    ...;
-    while ... {
-      modify ... {
-        if * {
-          break; // error: a "break" here would cause a problem with the refinement
-        } else {
-          break L; // error: a "break" here would cause a problem with the refinement
-        }
-      }
-      ...;
-    }
-  }
-}
-
-module ModifyStmtBreak1' refines ModifyStmtBreak0 {
-  method W... {
-    ...;
-    while ... {
-      modify c { // note, this is a new "modify" statement, not a refinement of the one above
-        if * {
-          break; // error: this is still not allowed, since it skips the rest of the loop body
-        } else {
-          break L; // error: ditto
-        }
-      }
-      ...; // (the previous "modify c;" statement is included here)
-    }
-  }
-}
-
-module ModifyStmtContinue refines ModifyStmtBreak0 {
-  method W... {
-    ...;
-    while ... {
-      modify ... {
-        if * {
-          continue; // error: a "continue" here would cause a problem with the refinement
-        } else {
-          continue L; // error: a "continue" here would cause a problem with the refinement
-        }
-      }
-      ...;
-    }
-  }
-}
diff --git a/Test/dafny0/ParallelResolveErrors.dfy.expect b/Test/dafny0/ParallelResolveErrors.dfy.expect
deleted file mode 100644
index eee0d123d2c..00000000000
--- a/Test/dafny0/ParallelResolveErrors.dfy.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-ParallelResolveErrors.dfy(210,15): Warning: the modify statement with a block statement is deprecated
-ParallelResolveErrors.dfy(247,7): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(248,10): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(249,13): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(249,17): Warning: the modify statement with a block statement is deprecated
-ParallelResolveErrors.dfy(256,9): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(263,7): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(264,10): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(265,15): Warning: the modify statement with a block statement is deprecated
-ParallelResolveErrors.dfy(272,9): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(279,7): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(280,10): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(281,13): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(281,17): Warning: the modify statement with a block statement is deprecated
-ParallelResolveErrors.dfy(288,9): Warning: the ... refinement feature in statements is deprecated
-ParallelResolveErrors.dfy(26,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-ParallelResolveErrors.dfy(8,6): Error: a forall statement is not allowed to update a variable it doesn't declare
-ParallelResolveErrors.dfy(25,6): Error: a forall statement is not allowed to update a variable it doesn't declare
-ParallelResolveErrors.dfy(26,6): Error: a forall statement is not allowed to update a variable it doesn't declare
-ParallelResolveErrors.dfy(36,6): Error: LHS of assignment must denote a mutable variable
-ParallelResolveErrors.dfy(48,15): Error: new allocation not supported in aggregate assignments
-ParallelResolveErrors.dfy(55,19): Error: a non-labeled 'break' statement is allowed only in loops
-ParallelResolveErrors.dfy(62,21): Error: a non-labeled 'break' statement is allowed only in loops
-ParallelResolveErrors.dfy(63,20): Error: a 'break break' statement is allowed only in loops
-ParallelResolveErrors.dfy(64,26): Error: break label is undefined or not in scope: OutsideLoop
-ParallelResolveErrors.dfy(73,24): Error: a 'break break' statement is allowed only in contexts with 2 enclosing loops, but the current context only has 1
-ParallelResolveErrors.dfy(74,30): Error: break label is undefined or not in scope: OutsideLoop
-ParallelResolveErrors.dfy(85,26): Error: a 'break break' statement is allowed only in contexts with 2 enclosing loops, but the current context only has 1
-ParallelResolveErrors.dfy(86,32): Error: break label is undefined or not in scope: WhileOutsideForall
-ParallelResolveErrors.dfy(129,15): Error: a forall statement is not allowed to use 'new'
-ParallelResolveErrors.dfy(130,15): Error: a forall statement is not allowed to use 'new'
-ParallelResolveErrors.dfy(130,21): Error: in a forall statement, calls are allowed only to lemmas
-ParallelResolveErrors.dfy(131,15): Error: a forall statement is not allowed to use 'new'
-ParallelResolveErrors.dfy(131,21): Error: in a forall statement, calls are allowed only to lemmas
-ParallelResolveErrors.dfy(132,15): Error: a forall statement is not allowed to use 'new'
-ParallelResolveErrors.dfy(132,21): Error: in a forall statement, calls are allowed only to lemmas
-ParallelResolveErrors.dfy(133,24): Error: in a forall statement, calls are allowed only to lemmas
-ParallelResolveErrors.dfy(134,22): Error: in a forall statement, calls are allowed only to lemmas
-ParallelResolveErrors.dfy(143,7): Error: cannot assign to array element in a ghost context
-ParallelResolveErrors.dfy(149,31): Error: in a forall statement, calls are allowed only to lemmas
-ParallelResolveErrors.dfy(154,31): Error: in a forall statement, calls are allowed only to lemmas
-ParallelResolveErrors.dfy(162,6): Error: print statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)
-ParallelResolveErrors.dfy(105,11): Error: assignment to non-ghost field is not allowed in this context, because this is a ghost method
-ParallelResolveErrors.dfy(178,12): Error: in a forall statement, calls are allowed only to lemmas
-ParallelResolveErrors.dfy(174,6): Error: a forall statement is not allowed to update a variable it doesn't declare
-ParallelResolveErrors.dfy(176,6): Error: a forall statement is not allowed to update a variable it doesn't declare
-ParallelResolveErrors.dfy(178,6): Error: a forall statement is not allowed to update a variable it doesn't declare
-ParallelResolveErrors.dfy(190,18): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
-ParallelResolveErrors.dfy(251,10): Error: break statement in skeleton is not allowed to break outside the skeleton fragment
-ParallelResolveErrors.dfy(253,10): Error: break statement in skeleton is not allowed to break outside the skeleton fragment
-ParallelResolveErrors.dfy(267,10): Error: break statement in skeleton is not allowed to break outside the skeleton fragment
-ParallelResolveErrors.dfy(269,10): Error: break statement in skeleton is not allowed to break outside the skeleton fragment
-ParallelResolveErrors.dfy(283,10): Error: continue statement in skeleton is not allowed to break outside the skeleton fragment
-ParallelResolveErrors.dfy(285,10): Error: continue statement in skeleton is not allowed to break outside the skeleton fragment
-39 resolution/type errors detected in ParallelResolveErrors.dfy
diff --git a/Test/dafny0/ParseErrors.dfy b/Test/dafny0/ParseErrors.dfy
deleted file mode 100644
index ee27923639b..00000000000
--- a/Test/dafny0/ParseErrors.dfy
+++ /dev/null
@@ -1,278 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /deprecation:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// ---------------------- chaining operators -----------------------------------
-
-method TestChaining0(j: int, k: int, m: int)
-  requires j != k != m;  // error: cannot have more than one != per chain
-  requires j == k == m;  // dandy
-  requires j < k == m == m+1 != m+2 >= 100;  // error: cannot mix < and >=
-  requires j >= k == m == m-1 != m-2 < 100;  // error: cannot mix >= and <
-{
-}
-
-method TestChaining1<T>(s: set<T>, t: set<T>, u: set<T>, x: T, SuperSet: set<set<T>>)
-  requires s <= t <= u >= s+u;  // error: cannot mix <= and >=
-  ensures s <= u;
-  ensures s !! t !! u; // valid, means pairwise disjoint
-  ensures x in s in SuperSet;  // error: 'in' is not chaining
-  ensures x !in s in SuperSet;  // error: 'in' is not chaining
-  ensures x in s !in SuperSet;  // error: 'in' is not chaining
-  ensures x in s == t;  // error: 'in' is not chaining
-{
-}
-
-method TestChaining2(a: set<int>, b: set<int>, c: set<int>)
-{
-  var x := a !! b !! c;
-  var y := a !! b == c;  // error
-  var z0 := a == (b !! c);
-  var z1 := (a == b) !! c;
-  var z2 := a == b !! c;  // error: == and !! do not chain together (regression test)
-}
-
-// ---------------------- calc statements -----------------------------------
-
-method TestCalc()
-{
-  calc {} // OK, empty calculations are allowed
-  calc {
-	2 + 3; // OK, single-line calculations are allowed
-  }
-  calc {
-	2 + 3;
-	calc {  // OK: a calc statement is allowed as a sub-hint
-		2;
-		1 + 1;
-	}
-	calc {
-		3;
-		1 + 2;
-	}
-	{ assert true; } // OK: multiple subhints are allowed between two lines
-	1 + 1 + 1 + 2;
-	{ assert 1 + 1 + 1 == 3; }
-	{ assert true; }
-	3 + 2;
-  }
-  calc != { // error: != is not allowed as the main operator of a calculation
-	2 + 3;
-	4;
-  }
-  calc { // OK, these operators are compatible
-	2 + 3;
-	> 4;
-	>= 2 + 2;
-  }
-  calc < { // OK, these operators are compatible
-	2 + 3;
-	== 5;
-	<= 3 + 3;
-  }
-  calc < { // error: cannot mix < and >= or >
-	2 + 3;
-	>= 5;
-	> 2 + 2;
-	6;
-  }
-  calc >= { // error: cannot mix >= and <= or !=
-	2 + 3;
-	<= 5;
-	!= 2 + 2;
-	3;
-  }
-  calc { // error: cannot have more than one != per calc
-	2 + 3;
-	!= 4;
-	!= 1 + 2;
-	3;
-  }
-}
-
-// ---------------------- ghost modifier on methods -----------------------------------
-
-ghost method GhM()
-
-ghost lemma GhL()  // error: a lemma is not allowed to be declared "ghost" -- it is already ghost
-
-ghost least lemma GhIL()  // error: a lemma is not allowed to be declared "ghost" -- it is already ghost
-
-ghost greatest lemma GhCL()  // error: a lemma is not allowed to be declared "ghost" -- it is already ghost
-
-ghost twostate lemma GhL2()  // error: a lemma is not allowed to be declared "ghost" -- it is already ghost
-
-class C {
-  constructor Make()
-  ghost method M()
-}
-
-// ---------------------- ghost parameters -----------------------------------
-
-method M(ghost x: int) returns (ghost y: int)  // error: ditto
-
-ghost method GM(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- the method is already ghost
-  returns (ghost y: int)  // error: ditto
-
-lemma L(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a lemma is already ghost
-  returns (ghost y: int)  // error: ditto
-
-least lemma IL(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a lemma is already ghost
-  returns (ghost y: int)  // error: ditto (actually, least lemmas are not allowed out-parameters at all)
-
-greatest lemma CoL(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a lemma is already ghost
-  returns (ghost y: int)  // error: ditto (actually, co-lemmas are not allowed out-parameters at all)
-
-twostate lemma L2(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a lemma is already ghost
-  returns (ghost y: int)  // error: ditto
-
-class C {
-  constructor Make(ghost x: int)
-  method M(ghost x: int) returns (ghost y: int)
-}
-
-ghost function F(ghost x: int): int  // error: formal not allowed to be declared "ghost" here -- a function is already ghost
-function FM(ghost x: int): int
-ghost predicate P(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a predicate is already ghost
-
-least predicate IP(ghost x: int)  // error: formal not allowed to be declared "ghost" here
-                                      // -- a least predicate is already ghost
-greatest predicate CoP(ghost x: int)  // error: formal not allowed to be declared "ghost" here
-                                      // -- a greatest predicate is already ghost
-
-twostate function F2(ghost x: int): int  // error: formal not allowed to be declared "ghost" here -- a function is already ghost
-twostate predicate P2(ghost x: int)  // error: formal not allowed to be declared "ghost" here -- a predicate is already ghost
-
-// ------------------------- set and map displays ------------------------------
-method Displays()
-    // all of these should parse, but at one point they did not
-    ensures iset{} == iset{}
-    ensures map[] == map[]
-    ensures imap[] == imap[]
-
-method SetComprehensionParsingRegression0()
-{
-  // these once had crashed the parser
-  var s0 := set x,y;
-  var s1 := set x,y | true;
-}
-
-// ------------------------- type members ------------------------------
-
-datatype Dt<A> = Blue | Bucket(diameter: real) | Business(trendy: bool, a: A)
-{
-  var x: int  // mutable fields not allowed in datatypes, but this is not checked by the parser (any more)
-}
-newtype Pos = x | 0 < x witness 1
-{
-  var x: int  // mutable fields not allowed in newtypes, but this is not checked by the parser (any more)
-}
-type Opaque {
-  var x: int  // mutable field not allowed in opaque type, but this is not checked by the parser (any more)
-}
-
-// ------------------------- nameonly parameters ------------------------------
-
-module NameOnlyParameters {
-  // name-less datatype fields
-  datatype D =
-    | D0(int, nameonly int) // error: nameonly modifier must be followed by parameter name
-    | D1(int, nameonly int, real) // error: nameonly modifier must be followed by parameter name
-    | D2(int, nameonly x: int)
-  // named function results
-  ghost function F(nameonly y: int): int
-  ghost function G(y: int): (nameonly r: int) // error: 'nameonly' unexpected here
-  // out-parameters
-  method M(nameonly x: int) returns (y: int)
-  method N(x: int) returns (nameonly y: int) // error: 'nameonly' not allowed here
-  // yield-parameters
-  iterator Iter0(nameonly x: int) yields (y: int)
-  iterator Iter0(x: int) yields (nameonly y: int) // error: 'nameonly' not allowed here
-}
-
-// ------------------------- parameters of ghost constructors ------------------------------
-
-module GhostConstructors {
-  class Either {
-    constructor A(x: int) {
-    }
-    ghost constructor B(x: int) {
-    }
-    constructor C(ghost x: int) {
-    }
-    ghost constructor D(ghost x: int) { // error: don't use 'ghost' keyword for ghost constructor parameters
-    }
-}
-}
-
-// ------------------------- static keyword ------------------------------
-
-module IllegalStatic {
-  class C {
-    static constructor () // error: constructor cannot be declared 'static'
-  }
-  static method M() // warning: 'static' not allowed here
-  static ghost function F(): int // warning: 'static' not allowed here
-  static lemma F() // warning: 'static' not allowed here
-  static twostate function F2(): int // warning: 'static' not allowed here
-  static least predicate LP() // warning: 'static' not allowed here
-
-  static datatype D = D // error: cannot be 'static'
-  static module M { } // error: cannot be 'static'
-}
-
-// ------------------------- ghost keyword ------------------------------
-
-module IllegalGhost {
-  ghost datatype D = D // error: cannot be 'ghost'
-  ghost module M { } // error: cannot be 'ghost'
-}
-
-// ------------------------- already-ghost functions ------------------------------
-
-module AlreadyGhost {
-  // a twostate function/predicate cannot be used with ...
-  ghost twostate function F(): int { 2 } by method { } // error (x2): ... with "by method" or "ghost"
-  twostate function G(): int { 2 } by method { } // error: ... with "by method"
-  ghost twostate predicate P() { true } by method { } // error (x2): ... with "by method" or "ghost"
-  twostate predicate Q() { true } by method { } // error: ... with "by method"
-
-  // an extreme predicate cannot be used with ...
-  ghost least predicate I() { true } by method { } // error (x2): ... with "by method" or "ghost"
-  ghost greatest predicate J() { true } by method { } // error (x2): ... with "by method" or "ghost"
-
-  // a twostate or extreme predicate is not allowed to be declared with either "by method" or "abstract"
-  abstract twostate function A0(): int { 2 } by method { } // error (x2)
-  abstract twostate predicate A1() { true } by method { } // error (x2)
-  abstract least predicate A2() { true } by method { } // error (x2)
-  abstract greatest predicate A3() { true } by method { } // error (x2)
-}
-
-// ------------------------- 'older' contextual keyword ------------------------------
-
-module Older {
-  ghost function F(older x: X): R
-  ghost predicate P(older older older x: X)
-  least predicate Q(older older older x: X) // error (x3): 'older' is an identifier here
-  method M(older x: X) // error: 'older' is an identifier here
-  ghost function F(): (older r: R) // error: 'older' is an identifier here
-
-  twostate function W(a: A, new older new older b: B, nameonly older nameonly c: C := "hello"): int
-  function C(a: A, ghost older older b: B, nameonly ghost older nameonly ghost c: C := "hello"): int
-  twostate lemma L(nameonly older nameonly c: C := "hello") // error: 'older' is an identifier here
-}
-
-// ---------------------- ghost arguments of arrow types -----------------------------------
-
-module ArrowTypes {
-  const f: (ghost int, int) -> int // error: arrow-type arguments are not allowed to be ghost
-
-  method M() {
-    var g: (real, (ghost int, int), bool) -> int;
-    var h: ((ghost int, int)) -> int;
-    var i: (bool, ghost real, int, ghost bv6) -> ORDINAL; // error (x2): ghost not allowed
-  }
-}
-
-// ---------------------- invalid newtype definition -----------------------------------
-
-newtype T {} // error: newtype is expected to have an '='
diff --git a/Test/dafny0/PredExpr.dfy.expect b/Test/dafny0/PredExpr.dfy.expect
deleted file mode 100644
index c2108462355..00000000000
--- a/Test/dafny0/PredExpr.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-PredExpr.dfy(7,11): Error: assertion could not be proved
-PredExpr.dfy(39,14): Error: value does not satisfy the subset constraints of 'nat'
-PredExpr.dfy(52,16): Error: assertion could not be proved
-PredExpr.dfy(77,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 6 verified, 4 errors
diff --git a/Test/dafny0/Predicates.dfy.expect b/Test/dafny0/Predicates.dfy.expect
deleted file mode 100644
index 847ebf9c944..00000000000
--- a/Test/dafny0/Predicates.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-Predicates.dfy(62,15): Error: assertion could not be proved
-Predicates.dfy(66,13): Error: assertion could not be proved
-Predicates.dfy(105,4): Error: a postcondition could not be proved on this return path
-Predicates.dfy(104,14): Related location: this is the postcondition that could not be proved
-Predicates.dfy(104,39): Related location
-Predicates.dfy(104,45): Related location
-
-Dafny program verifier finished with 21 verified, 3 errors
diff --git a/Test/dafny0/PrefixTypeSubst.dfy.expect b/Test/dafny0/PrefixTypeSubst.dfy.expect
deleted file mode 100644
index edb588ab247..00000000000
--- a/Test/dafny0/PrefixTypeSubst.dfy.expect
+++ /dev/null
@@ -1,640 +0,0 @@
-// PrefixTypeSubst.dfy
-
-/*
-module _System {
-  /* CALL GRAPH for module _System:
-   * SCC at height 1:
-   *   RotateLeft
-   * SCC at height 1:
-   *   RotateRight
-   * SCC at height 0:
-   *   array
-   * SCC at height 0:
-   *   nat
-   * SCC at height 0:
-   *   object
-   */
-  type string(==,0) = seq<char>
-
-  type {:axiom} nat(==,0) = x: int
-    | 0 <= x
-
-  trait {:compile false} object { }
-  /*-- non-null type
-  type {:axiom} object(==) = c: object? | c != null /*special witness*/
-  */
-
-  class {:compile false} array<arg> {
-    var Length: int  // immutable
-  }
-  /*-- non-null type
-  type {:axiom} array(==)<arg> = c: array?<arg> | c != null /*special witness*/
-  */
-
-  type {:compile false} /*_#Func1*/ -T0 ~> +R {
-    ghost function requires(x0: T0): bool
-      reads reads(x0)
-
-    ghost function reads(x0: T0): set<object?>
-      reads reads(x0)
-  }
-
-  type {:compile false} /*_#PartialFunc1*/ -T0 --> +R = f: T0 ~> R
-    | forall x0: T0 :: f.reads(x0) == {}
-    /*special witness*/
-
-  type {:compile false} /*_#TotalFunc1*/ -T0 -> +R = f: T0 --> R
-    | forall x0: T0 :: f.requires(x0)
-    /*special witness*/
-
-  type {:compile false} /*_#Func0*/ () ~> +R {
-    ghost function requires(): bool
-      reads reads()
-
-    ghost function reads(): set<object?>
-      reads reads()
-  }
-
-  type {:compile false} /*_#PartialFunc0*/ () --> +R = f: () ~> R
-    | f.reads() == {}
-    /*special witness*/
-
-  type {:compile false} /*_#TotalFunc0*/ () -> +R = f: () --> R
-    | f.requires()
-    /*special witness*/
-
-  datatype {:compile false} /*_tuple#2*/ (+T0, +T1) = _#Make2(0: T0, 1: T1)
-
-  type bool { }
-
-  type int { }
-
-  type real {
-    var Floor: int  // immutable
-  }
-
-  type ORDINAL {
-    var IsLimit: bool  // immutable
-    var IsSucc: bool  // immutable
-    var Offset: int  // immutable
-    var IsNat: bool  // immutable
-  }
-
-  type _bv {
-    function RotateLeft(w: nat): selftype
-
-    function RotateRight(w: nat): selftype
-  }
-
-  type map<+T, +U> {
-    var Keys: set<T>  // immutable
-    var Values: set<U>  // immutable
-    var Items: set<(T, U)>  // immutable
-  }
-
-  type imap<*T, +U> {
-    var Keys: iset<T>  // immutable
-    var Values: iset<U>  // immutable
-    var Items: iset<(T, U)>  // immutable
-  }
-
-  datatype {:compile false} /*_tuple#0*/ () = _#Make0
-
-  type {:compile false} /*_#Func2*/ (-T0, -T1) ~> +R {
-    ghost function requires(x0: T0, x1: T1): bool
-      reads reads(x0, x1)
-
-    ghost function reads(x0: T0, x1: T1): set<object?>
-      reads reads(x0, x1)
-  }
-
-  type {:compile false} /*_#PartialFunc2*/ (-T0, -T1) --> +R = f: (T0, T1) ~> R
-    | forall x0: T0, x1: T1 :: f.reads(x0, x1) == {}
-    /*special witness*/
-
-  type {:compile false} /*_#TotalFunc2*/ (-T0, -T1) -> +R = f: (T0, T1) --> R
-    | forall x0: T0, x1: T1 :: f.requires(x0, x1)
-    /*special witness*/
-
-  type {:compile false} /*_#Func3*/ (-T0, -T1, -T2) ~> +R {
-    ghost function requires(x0: T0, x1: T1, x2: T2): bool
-      reads reads(x0, x1, x2)
-
-    ghost function reads(x0: T0, x1: T1, x2: T2): set<object?>
-      reads reads(x0, x1, x2)
-  }
-
-  type {:compile false} /*_#PartialFunc3*/ (-T0, -T1, -T2) --> +R = f: (T0, T1, T2) ~> R
-    | forall x0: T0, x1: T1, x2: T2 :: f.reads(x0, x1, x2) == {}
-    /*special witness*/
-
-  type {:compile false} /*_#TotalFunc3*/ (-T0, -T1, -T2) -> +R = f: (T0, T1, T2) --> R
-    | forall x0: T0, x1: T1, x2: T2 :: f.requires(x0, x1, x2)
-    /*special witness*/
-}
-// bitvector types in use:
-*/
-
-/* CALL GRAPH for module _module:
- * SCC at height 4:
- *   RstRst7#
- * SCC at height 3:
- *   MyClass.M#
- * SCC at height 3:
- *   RstRst7
- * SCC at height 2:
- *   RstRst5#
- *   RstRst5
- * SCC at height 2:
- *   RstRst6#
- *   RstRst6
- * SCC at height 2:
- *   RstRst8#
- *   RstRst8
- * SCC at height 2:
- *   RstRst9#
- *   RstRst9
- * SCC at height 2:
- *   MyClass.L#
- * SCC at height 2:
- *   MyClass.M
- * SCC at height 2:
- *   N#
- * SCC at height 2:
- *   O#
- * SCC at height 2:
- *   RstRst0#
- * SCC at height 2:
- *   RstRst1#
- * SCC at height 2:
- *   RstRst10#
- * SCC at height 2:
- *   RstRst2#
- * SCC at height 2:
- *   RstRst3#
- * SCC at height 2:
- *   RstRst4#
- * SCC at height 1:
- *   MyClass.L
- * SCC at height 1:
- *   MyClass.P#
- * SCC at height 1:
- *   MyClass.R#
- * SCC at height 1:
- *   MyClass.RST#
- * SCC at height 1:
- *   MyClass.RST_Nat#
- * SCC at height 1:
- *   MyClass.S#
- * SCC at height 1:
- *   N
- * SCC at height 1:
- *   O
- * SCC at height 1:
- *   RstRst0
- * SCC at height 1:
- *   RstRst1
- * SCC at height 1:
- *   RstRst10
- * SCC at height 1:
- *   RstRst2
- * SCC at height 1:
- *   RstRst3
- * SCC at height 1:
- *   RstRst4
- * SCC at height 0:
- *   MyClass
- * SCC at height 0:
- *   MyClass.P
- * SCC at height 0:
- *   MyClass.R
- * SCC at height 0:
- *   MyClass.RST
- * SCC at height 0:
- *   MyClass.RST_Nat
- * SCC at height 0:
- *   MyClass.S
- */
-greatest lemma N<D0, D1, D2>(o: MyClass<D0, D1>)
-  ensures o.R<D2>()
-{
-  N<D0, D1, D2>(o);
-}
-/***
-lemma /*{:_induction _k}*/ N#<D0, D1, D2>[_k: ORDINAL](o: MyClass<D0, D1>)
-  ensures o.R#<D2>[_k]()
-  decreases _k, o
-{
-  if 0 < _k.Offset {
-    N#<D0, D1, D2>[_k - 1](o);
-  } else {
-    forall _k': ORDINAL, o: MyClass<D0, D1> /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger o.R#[_k']()} | _k' < _k
-      ensures o.R#[_k']()
-    {
-      N#[_k'](o)
-    }
-  }
-}
-***/
-
-greatest lemma O<D0, D1, D2>()
-  ensures MyClass<D0, D1>.S<D2>()
-{
-  O<D0, D1, D2>();
-}
-/***
-lemma /*{:_induction _k}*/ O#<D0, D1, D2>[_k: ORDINAL]()
-  ensures MyClass<D0, D1>.S#<D2>[_k]()
-  decreases _k
-{
-  if 0 < _k.Offset {
-    O#<D0, D1, D2>[_k - 1]();
-  } else {
-    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<D0, D1>.S#[_k']()} {:trigger _k' < _k} | _k' < _k
-      ensures MyClass<D0, D1>.S#[_k']()
-    {
-      O#[_k']()
-    }
-  }
-}
-***/
-
-greatest lemma {:induction false} RstRst0<alpha, gamma>()
-  ensures MyClass<alpha, char>.RST<gamma>()
-{
-  RstRst0<int, gamma>();
-}
-/***
-lemma {:induction false} RstRst0#<alpha, gamma>[_k: ORDINAL]()
-  ensures MyClass<alpha, char>.RST#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k.Offset {
-    RstRst0#<int, gamma>[_k - 1]();
-  } else {
-    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, char>.RST#[_k']()} {:trigger _k' < _k} | _k' < _k
-      ensures MyClass<alpha, char>.RST#[_k']()
-    {
-      RstRst0#[_k']()
-    }
-  }
-}
-***/
-
-greatest lemma {:induction false} RstRst1<alpha, gamma>()
-  ensures MyClass<alpha, char>.RST<gamma>()
-{
-  RstRst1<int, int>();
-}
-/***
-lemma {:induction false} RstRst1#<alpha, gamma>[_k: ORDINAL]()
-  ensures MyClass<alpha, char>.RST#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k.Offset {
-    RstRst1#<int, int>[_k - 1]();
-  } else {
-    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, char>.RST#[_k']()} {:trigger _k' < _k} | _k' < _k
-      ensures MyClass<alpha, char>.RST#[_k']()
-    {
-      RstRst1#[_k']()
-    }
-  }
-}
-***/
-
-greatest lemma {:induction false} RstRst2<alpha, gamma>()
-  ensures MyClass<alpha, char>.RST<gamma>()
-{
-  RstRst2<alpha, gamma>();
-}
-/***
-lemma {:induction false} RstRst2#<alpha, gamma>[_k: ORDINAL]()
-  ensures MyClass<alpha, char>.RST#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k.Offset {
-    RstRst2#<alpha, gamma>[_k - 1]();
-  } else {
-    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, char>.RST#[_k']()} {:trigger _k' < _k} | _k' < _k
-      ensures MyClass<alpha, char>.RST#[_k']()
-    {
-      RstRst2#[_k']()
-    }
-  }
-}
-***/
-
-greatest lemma {:induction false} RstRst3<alpha, beta, gamma>()
-  ensures MyClass<alpha, beta>.RST<gamma>()
-{
-  RstRst3<alpha, beta, gamma>();
-}
-/***
-lemma {:induction false} RstRst3#<alpha, beta, gamma>[_k: ORDINAL]()
-  ensures MyClass<alpha, beta>.RST#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k.Offset {
-    RstRst3#<alpha, beta, gamma>[_k - 1]();
-  } else {
-    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, beta>.RST#[_k']()} {:trigger _k' < _k} | _k' < _k
-      ensures MyClass<alpha, beta>.RST#[_k']()
-    {
-      RstRst3#[_k']()
-    }
-  }
-}
-***/
-
-greatest lemma {:induction false} RstRst4<alpha, beta, gamma>()
-  ensures MyClass<alpha, beta>.RST<gamma>()
-{
-  RstRst4<beta, alpha, gamma>();
-}
-/***
-lemma {:induction false} RstRst4#<alpha, beta, gamma>[_k: ORDINAL]()
-  ensures MyClass<alpha, beta>.RST#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k.Offset {
-    RstRst4#<beta, alpha, gamma>[_k - 1]();
-  } else {
-    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, beta>.RST#[_k']()} {:trigger _k' < _k} | _k' < _k
-      ensures MyClass<alpha, beta>.RST#[_k']()
-    {
-      RstRst4#[_k']()
-    }
-  }
-}
-***/
-
-greatest lemma {:induction false} RstRst5<alpha, gamma>()
-  ensures MyClass<alpha, char>.RST<gamma>()
-{
-  if 2 <= _k.Offset {
-    RstRst5#<alpha, gamma>[_k - 2]();
-  } else {
-    assert _k.Offset == 1;
-  }
-}
-/***
-lemma {:induction false} RstRst5#<alpha, gamma>[_k: ORDINAL]()
-  ensures MyClass<alpha, char>.RST#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k.Offset {
-    if 2 <= _k.Offset {
-      RstRst5#<alpha, gamma>[_k - 2]();
-    } else {
-      assert _k.Offset == 1;
-    }
-  } else {
-    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, char>.RST#[_k']()} {:trigger _k' < _k} | _k' < _k
-      ensures MyClass<alpha, char>.RST#[_k']()
-    {
-      RstRst5#[_k']()
-    }
-  }
-}
-***/
-
-greatest lemma {:induction false} RstRst6<alpha, beta, gamma>()
-  ensures MyClass<alpha, beta>.RST<gamma>()
-{
-  if
-  case true =>
-    RstRst6<beta, alpha, gamma>();
-  case 2 <= _k.Offset =>
-    RstRst6#<alpha, beta, gamma>[_k - 2]();
-}
-/***
-lemma {:induction false} RstRst6#<alpha, beta, gamma>[_k: ORDINAL]()
-  ensures MyClass<alpha, beta>.RST#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k.Offset {
-    if
-    case true =>
-      RstRst6#<beta, alpha, gamma>[_k - 1]();
-    case 2 <= _k.Offset =>
-      RstRst6#<alpha, beta, gamma>[_k - 2]();
-  } else {
-    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, beta>.RST#[_k']()} {:trigger _k' < _k} | _k' < _k
-      ensures MyClass<alpha, beta>.RST#[_k']()
-    {
-      RstRst6#[_k']()
-    }
-  }
-}
-***/
-
-greatest lemma RstRst7<alpha, beta, gamma>()
-  ensures MyClass<alpha, beta>.RST<gamma>()
-{
-  if _k != 1 && _k.Offset == 1 {
-    RstRst6<beta, alpha, gamma>();
-  } else {
-  }
-}
-/***
-lemma /*{:_induction _k}*/ RstRst7#<alpha, beta, gamma>[_k: ORDINAL]()
-  ensures MyClass<alpha, beta>.RST#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k.Offset {
-    if _k != 1 && _k.Offset == 1 {
-      RstRst6<beta, alpha, gamma>();
-    } else {
-    }
-  } else {
-    forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger MyClass<alpha, beta>.RST#[_k']()} {:trigger _k' < _k} | _k' < _k
-      ensures MyClass<alpha, beta>.RST#[_k']()
-    {
-      RstRst7#[_k']()
-    }
-  }
-}
-***/
-
-greatest lemma {:induction false} RstRst8<alpha, gamma>[nat]()
-  ensures MyClass<alpha, char>.RST_Nat<gamma>()
-{
-  if 2 <= _k {
-    RstRst8#<alpha, gamma>[_k - 2]();
-  }
-}
-/***
-lemma {:induction false} RstRst8#<alpha, gamma>[_k: nat]()
-  ensures MyClass<alpha, char>.RST_Nat#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k {
-    if 2 <= _k {
-      RstRst8#<alpha, gamma>[_k - 2]();
-    }
-  }
-}
-***/
-
-greatest lemma {:induction false} RstRst9<alpha, beta, gamma>[nat]()
-  ensures MyClass<alpha, beta>.RST_Nat<gamma>()
-{
-  if 2 <= _k {
-    RstRst9#<alpha, beta, gamma>[_k - 2]();
-  }
-}
-/***
-lemma {:induction false} RstRst9#<alpha, beta, gamma>[_k: nat]()
-  ensures MyClass<alpha, beta>.RST_Nat#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k {
-    if 2 <= _k {
-      RstRst9#<alpha, beta, gamma>[_k - 2]();
-    }
-  }
-}
-***/
-
-greatest lemma RstRst10<alpha, beta, gamma>[nat]()
-  ensures MyClass<alpha, beta>.RST_Nat<gamma>()
-{
-}
-/***
-lemma /*{:_induction _k}*/ RstRst10#<alpha, beta, gamma>[_k: nat]()
-  ensures MyClass<alpha, beta>.RST_Nat#<gamma>[_k]()
-  decreases _k
-{
-  if 0 < _k {
-  }
-}
-***/
-
-class MyClass<A, B> {
-  greatest predicate P<X, Y>(x: X, y: Y)
-  {
-    P(x, y)
-  }
-  /*** (note, what is printed here does not show substitutions of calls to prefix predicates)
-  predicate P#<X, Y>[_k: ORDINAL](x: X, y: Y)
-    decreases _k
-  {
-    P(x, y)
-  }
-  ***/
-
-  greatest predicate R<T>()
-  {
-    R<T>()
-  }
-  /*** (note, what is printed here does not show substitutions of calls to prefix predicates)
-  predicate R#<T>[_k: ORDINAL]()
-    decreases _k
-  {
-    R<T>()
-  }
-  ***/
-
-  static greatest predicate S<Q>()
-  {
-    S<Q>()
-  }
-  /*** (note, what is printed here does not show substitutions of calls to prefix predicates)
-  static predicate S#<Q>[_k: ORDINAL]()
-    decreases _k
-  {
-    S<Q>()
-  }
-  ***/
-
-  static greatest predicate RST<QQ>()
-  {
-    MyClass<B, A>.RST<QQ>()
-  }
-  /*** (note, what is printed here does not show substitutions of calls to prefix predicates)
-  static predicate RST#<QQ>[_k: ORDINAL]()
-    decreases _k
-  {
-    MyClass<B, A>.RST<QQ>()
-  }
-  ***/
-
-  static greatest predicate RST_Nat<QQ>[nat]()
-  {
-    MyClass<B, A>.RST_Nat<QQ>()
-  }
-  /*** (note, what is printed here does not show substitutions of calls to prefix predicates)
-  static predicate RST_Nat#<QQ>[_k: nat]()
-    decreases _k
-  {
-    MyClass<B, A>.RST_Nat<QQ>()
-  }
-  ***/
-
-  greatest lemma L<U, V>(u: U, v: V)
-    ensures P(u, v)
-  {
-    L(u, v);
-  }
-  /***
-  lemma /*{:_induction this, _k}*/ L#<U, V>[_k: ORDINAL](u: U, v: V)
-    ensures P#[_k](u, v)
-    decreases _k
-  {
-    if 0 < _k.Offset {
-      L#[_k - 1](u, v);
-    } else {
-      forall _k': ORDINAL, u: U, v: V /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger this.P#[_k'](u, v)} | _k' < _k
-        ensures this.P#[_k'](u, v)
-      {
-        L#[_k'](u, v)
-      }
-    }
-  }
-  ***/
-
-  greatest lemma M<W>()
-    ensures R<char>()
-  {
-    M<W>();
-    assert R#<char>[_k - 1]();
-  }
-  /***
-  lemma /*{:_induction this, _k}*/ M#<W>[_k: ORDINAL]()
-    ensures R#<char>[_k]()
-    decreases _k
-  {
-    if 0 < _k.Offset {
-      M#<W>[_k - 1]();
-      assert R#<char>[_k - 1]();
-    } else {
-      forall _k': ORDINAL /*{:_autorequires}*/ /*{:_trustWellformed}*/ {:auto_generated} {:trigger this.R#[_k']()} {:trigger _k' < _k} | _k' < _k
-        ensures this.R#[_k']()
-      {
-        M#[_k']()
-      }
-    }
-  }
-  ***/
-}
-/*-- non-null type
-type {:axiom} MyClass(==)<A, B> = c: MyClass?<A, B> | c != null /*special witness*/
-*/
-PrefixTypeSubst.dfy(52,0): Error: a postcondition could not be proved on this return path
-PrefixTypeSubst.dfy(51,30): Related location: this is the postcondition that could not be proved
-PrefixTypeSubst.dfy(19,17): Related location
-PrefixTypeSubst.dfy(58,0): Error: a postcondition could not be proved on this return path
-PrefixTypeSubst.dfy(57,30): Related location: this is the postcondition that could not be proved
-PrefixTypeSubst.dfy(19,17): Related location
-PrefixTypeSubst.dfy(64,0): Error: a postcondition could not be proved on this return path
-PrefixTypeSubst.dfy(63,30): Related location: this is the postcondition that could not be proved
-PrefixTypeSubst.dfy(19,17): Related location
-PrefixTypeSubst.dfy(70,0): Error: a postcondition could not be proved on this return path
-PrefixTypeSubst.dfy(69,30): Related location: this is the postcondition that could not be proved
-PrefixTypeSubst.dfy(19,17): Related location
-PrefixTypeSubst.dfy(85,9): Error: a postcondition could not be proved on this return path
-PrefixTypeSubst.dfy(81,30): Related location: this is the postcondition that could not be proved
-PrefixTypeSubst.dfy(19,17): Related location
-
-Dafny program verifier finished with 11 verified, 5 errors
diff --git a/Test/dafny0/PrettyPrinting.dfy b/Test/dafny0/PrettyPrinting.dfy
deleted file mode 100644
index d06fb073f3c..00000000000
--- a/Test/dafny0/PrettyPrinting.dfy
+++ /dev/null
@@ -1,168 +0,0 @@
-// RUN: %exits-with 2 %dafny /dprint:- /env:0 /noVerify "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  method M()
-}
-
-module B refines A {
-  method M ... {
-    while true
-    while true
-      invariant true
-      invariant true
-    while true
-      decreases 5
-    while true
-      modifies {}
-    while ...
-    while true
-      ...
-    while true {
-      var u := 0;
-    }
-    var x := 10;
-  }
-
-  method P(a: array<int>)
-    modifies a
-  {
-    forall i | 0 <= i < 100 {
-      a[i] := 200;
-    }
-    forall i | 0 <= i < 100
-      ensures true
-    forall i | 0 <= i < 100
-      ensures true
-    {
-    }
-  }
-}
-
-module C {
-  method For() {
-    ghost var (x, y) := (123, 234);
-    var a := new int[100];
-    for i := 0 to 100 {
-      a[i] := i;
-    }
-    for i := 100 downto 0 {
-      a[i] := i;
-    }
-    for i: nat := 0 to 100
-    for i: nat := 100 downto 0
-    for i := 0 to 100
-      invariant a[5] == 5
-      invariant a[12] == 12
-    for i := 100 downto 0
-      invariant a[5] == 5
-    for i := 0 to 100
-      invariant a[5] == 5
-      invariant a[12] == 12
-    {
-    }
-    for i := 100 downto 0
-      invariant a[5] == 5
-    {
-      assert true;
-    }
-    for i := 0 to *
-      decreases 100 - i
-      invariant i <= 100
-    for i := 0 to *
-      decreases *
-    {
-    }
-    var c := new Cell;
-    for i := 0 to 100
-      modifies c
-      modifies {c}, {c}
-    {
-    }
-    for i := 100 downto *
-      modifies c
-      decreases i
-      modifies {c}, {c}
-      invariant -68 <= i <= 68
-      invariant i != 3
-    {
-    }
-  }
-  class Cell { var data: int }
-}
-
-module Ats {
-  class Cell {
-    var data: int
-
-    method M()
-    {
-      label Label:
-      assert old(data) == old@Label(data);
-      assert unchanged(this) && unchanged@Label(this);
-      var c := new Cell;
-      assert fresh(c) && fresh@Label(c);
-    }
-  }
-}
-
-module ByMethod {
-  function F(x: nat): int {
-    x
-  } by method {
-    var j := 0;
-    for _ := 0 to x {
-      j := j - 1;
-    }
-    return -j;
-  }
-}
-
-module GhostConstructors {
-  class C {
-    constructor X()
-    ghost constructor Y()
-  }
-}
-
-module BreakContinue {
-  method M() {
-    label Outer:
-    for i := 0 to 100 {
-    label Inner:
-      for j := 0 to 100 {
-        label X: {
-          label Innerer:
-          for k := 0 to 100 {
-            if
-            case true => break;
-            case true => continue;
-            case true => break break;
-            case true => break continue;
-            case true => break break break;
-            case true => break break continue;
-            case true => break Innerer;
-            case true => break Inner;
-            case true => break Outer;
-            case true => break X;
-            case true => continue Innerer;
-            case true => continue Inner;
-            case true => continue Outer;
-          }
-        }
-      }
-    }
-  }
-}
-
-module New {
-  method M() {
-    var three := 3;
-    var a;
-    a := new int[3] [20, 50, 70];
-    a := new [3] [20, 50, 70];
-    a := new [three] [20, 50, 70];
-    a := new int[] [20, 50, 70];
-    a := new [] [20, 50, 70];
-  }
-}
diff --git a/Test/dafny0/PrettyPrinting.dfy.expect b/Test/dafny0/PrettyPrinting.dfy.expect
deleted file mode 100644
index f08b0e021f0..00000000000
--- a/Test/dafny0/PrettyPrinting.dfy.expect
+++ /dev/null
@@ -1,195 +0,0 @@
-PrettyPrinting.dfy(18,10): Warning: the ... refinement feature in statements is deprecated
-PrettyPrinting.dfy(20,6): Warning: the ... refinement feature in statements is deprecated
-// PrettyPrinting.dfy
-
-
-module A {
-  method M()
-}
-
-module B refines A {
-  method M ...
-  {
-    while true
-    while true
-      invariant true
-      invariant true
-    while true
-      decreases 5
-    while true
-      modifies {}
-    while ...
-    while true
-      ...;
-    while true {
-      var u := 0;
-    }
-    var x := 10;
-  }
-
-  method P(a: array<int>)
-    modifies a
-  {
-    forall i | 0 <= i < 100 {
-      a[i] := 200;
-    }
-    forall i | 0 <= i < 100
-      ensures true
-    forall i | 0 <= i < 100
-      ensures true
-    {
-    }
-  }
-}
-
-module C {
-  method For()
-  {
-    ghost var (x, y) := (123, 234);
-    var a := new int[100];
-    for i := 0 to 100 {
-      a[i] := i;
-    }
-    for i := 100 downto 0 {
-      a[i] := i;
-    }
-    for i: nat := 0 to 100
-    for i: nat := 100 downto 0
-    for i := 0 to 100
-      invariant a[5] == 5
-      invariant a[12] == 12
-    for i := 100 downto 0
-      invariant a[5] == 5
-    for i := 0 to 100
-      invariant a[5] == 5
-      invariant a[12] == 12
-    {
-    }
-    for i := 100 downto 0
-      invariant a[5] == 5
-    {
-      assert true;
-    }
-    for i := 0 to *
-      invariant i <= 100
-      decreases 100 - i
-    for i := 0 to *
-      decreases *
-    {
-    }
-    var c := new Cell;
-    for i := 0 to 100
-      modifies c, {c}, {c}
-    {
-    }
-    for i := 100 downto *
-      invariant -68 <= i <= 68
-      invariant i != 3
-      decreases i
-      modifies c, {c}, {c}
-    {
-    }
-  }
-
-  class Cell {
-    var data: int
-  }
-}
-
-module Ats {
-  class Cell {
-    var data: int
-
-    method M()
-    {
-      label Label:
-      assert old(data) == old@Label(data);
-      assert unchanged(this) && unchanged@Label(this);
-      var c := new Cell;
-      assert fresh(c) && fresh@Label(c);
-    }
-  }
-}
-
-module ByMethod {
-  function F(x: nat): int
-  {
-    x
-  } by method {
-    var j := 0;
-    for _v0 := 0 to x {
-      j := j - 1;
-    }
-    return -j;
-  }
-}
-
-module GhostConstructors {
-  class C {
-    constructor X()
-
-    ghost constructor Y()
-  }
-}
-
-module BreakContinue {
-  method M()
-  {
-    label Outer:
-    for i := 0 to 100 {
-      label Inner:
-      for j := 0 to 100 {
-        label X:
-        {
-          label Innerer:
-          for k := 0 to 100 {
-            if
-            case true =>
-              break;
-            case true =>
-              continue;
-            case true =>
-              break break;
-            case true =>
-              break continue;
-            case true =>
-              break break break;
-            case true =>
-              break break continue;
-            case true =>
-              break Innerer;
-            case true =>
-              break Inner;
-            case true =>
-              break Outer;
-            case true =>
-              break X;
-            case true =>
-              continue Innerer;
-            case true =>
-              continue Inner;
-            case true =>
-              continue Outer;
-          }
-        }
-      }
-    }
-  }
-}
-
-module New {
-  method M()
-  {
-    var three := 3;
-    var a;
-    a := new int[3] [20, 50, 70];
-    a := new [3] [20, 50, 70];
-    a := new [three] [20, 50, 70];
-    a := new int[] [20, 50, 70];
-    a := new [] [20, 50, 70];
-  }
-}
-PrettyPrinting.dfy(18,4): Error: skeleton statements are allowed only in refining methods
-PrettyPrinting.dfy(19,4): Error: skeleton statements are allowed only in refining methods
-PrettyPrinting.dfy(73,16): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
-3 resolution/type errors detected in PrettyPrinting.dfy
diff --git a/Test/dafny0/PrintUTF8.dfy b/Test/dafny0/PrintUTF8.dfy
deleted file mode 100644
index eff7baa32a9..00000000000
--- a/Test/dafny0/PrintUTF8.dfy
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-method Main() {
-  print "Mikaël fixed UTF8\n";
-}
diff --git a/Test/dafny0/Protected.dfy.expect b/Test/dafny0/Protected.dfy.expect
deleted file mode 100644
index 5984fc9fe85..00000000000
--- a/Test/dafny0/Protected.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-Protected.dfy(21,19): Error: assertion could not be proved
-Protected.dfy(35,17): Error: assertion could not be proved
-Protected.dfy(39,15): Error: assertion could not be proved
-Protected.dfy(52,19): Error: assertion could not be proved
-Protected.dfy(59,19): Error: assertion could not be proved
-
-Dafny program verifier finished with 3 verified, 5 errors
diff --git a/Test/dafny0/ProtectedResolution.dfy b/Test/dafny0/ProtectedResolution.dfy
deleted file mode 100644
index f4eb062592b..00000000000
--- a/Test/dafny0/ProtectedResolution.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %exits-with 2 %dafny /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M0 {
-  ghost function F(): int { 5 }
-  ghost predicate P() { true }
-}
-module M1 refines M0 {
-  ghost function F... { 7 }  // error: not allowed to change body
-  ghost predicate P... { true }  // error: not allowed to extend body
-}
diff --git a/Test/dafny0/QuantificationNewSyntax.dfy.expect b/Test/dafny0/QuantificationNewSyntax.dfy.expect
deleted file mode 100644
index 7505a331946..00000000000
--- a/Test/dafny0/QuantificationNewSyntax.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-QuantificationNewSyntax.dfy(11,13): Warning: /!\ No trigger covering all quantified variables found.
-QuantificationNewSyntax.dfy(12,13): Warning: /!\ No trigger covering all quantified variables found.
-QuantificationNewSyntax.dfy(11,42): Error: possible division by zero
-QuantificationNewSyntax.dfy(13,36): Error: function precondition could not be proved
-QuantificationNewSyntax.dfy(19,48): Related location
-QuantificationNewSyntax.dfy(15,54): Error: result of operation might violate subset type constraint for 'nat'
-
-Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/dafny0/RankNeg.dfy.expect b/Test/dafny0/RankNeg.dfy.expect
deleted file mode 100644
index d1d8c427d8f..00000000000
--- a/Test/dafny0/RankNeg.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-RankNeg.dfy(10,25): Error: cannot prove termination; try supplying a decreases clause
-RankNeg.dfy(15,27): Error: cannot prove termination; try supplying a decreases clause
-RankNeg.dfy(22,30): Error: cannot prove termination; try supplying a decreases clause
-RankNeg.dfy(32,24): Error: cannot prove termination; try supplying a decreases clause
-
-Dafny program verifier finished with 1 verified, 4 errors
diff --git a/Test/dafny0/Reads.dfy.expect b/Test/dafny0/Reads.dfy.expect
deleted file mode 100644
index bd68ad79877..00000000000
--- a/Test/dafny0/Reads.dfy.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-Reads.dfy(9,16): Error: insufficient reads clause to read field
-Reads.dfy(18,29): Error: insufficient reads clause to read field
-Reads.dfy(28,32): Error: insufficient reads clause to read field
-Reads.dfy(37,29): Error: insufficient reads clause to read field
-Reads.dfy(56,29): Error: insufficient reads clause to read field
-Reads.dfy(122,35): Error: function precondition could not be proved
-Reads.dfy(122,35): Error: insufficient reads clause to invoke function
-Reads.dfy(125,37): Error: insufficient reads clause to invoke function
-Reads.dfy(138,10): Error: insufficient reads clause to read field
-Reads.dfy(149,25): Error: insufficient reads clause to read field
-Reads.dfy(157,18): Error: insufficient reads clause to read field
-Reads.dfy(159,18): Error: insufficient reads clause to invoke function
-
-Dafny program verifier finished with 19 verified, 12 errors
diff --git a/Test/dafny0/RealCompare.dfy.expect b/Test/dafny0/RealCompare.dfy.expect
deleted file mode 100644
index 8e23db69389..00000000000
--- a/Test/dafny0/RealCompare.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-RealCompare.dfy(35,5): Error: decreases clause might not decrease
-RealCompare.dfy(50,3): Error: decreases expression must be bounded below by 0.0
-RealCompare.dfy(48,12): Related location
-RealCompare.dfy(141,11): Error: assertion could not be proved
-RealCompare.dfy(156,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 10 verified, 4 errors
diff --git a/Test/dafny0/RealTypes.dfy.expect b/Test/dafny0/RealTypes.dfy.expect
deleted file mode 100644
index f457323408e..00000000000
--- a/Test/dafny0/RealTypes.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-RealTypes.dfy(12,17): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
-RealTypes.dfy(14,29): Error: assertion could not be proved
-RealTypes.dfy(21,11): Error: possible division by zero
-RealTypes.dfy(21,19): Error: assertion could not be proved
-RealTypes.dfy(29,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 2 verified, 5 errors
diff --git a/Test/dafny0/ResolutionErrors.dfy b/Test/dafny0/ResolutionErrors.dfy
deleted file mode 100644
index 41f8b581214..00000000000
--- a/Test/dafny0/ResolutionErrors.dfy
+++ /dev/null
@@ -1,3964 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module Misc {
-  //Should not verify, as ghost loops should not be allowed to diverge.
-  method GhostDivergentLoop()
-  {
-     var a := new int [2];
-     a[0] := 1;
-     a[1] := -1;
-     ghost var i := 0;
-     while (i < 2)
-        decreases * // error: not allowed on a ghost loop
-        invariant i <= 2
-        invariant (forall j :: 0 <= j && j < i ==> a[j] > 0)
-     {
-       i := 0;
-     }
-     assert a[1] != a[1]; // ...for then this would incorrectly verify
-  }
-
-  method ManyIndices<T>(a: array3<T>, b: array<T>, m: int, n: int)
-  {
-    // the following invalid expressions were once incorrectly resolved:
-    var x := a[m, n];        // error
-    var y := a[m];           // error
-    var z := b[m, n, m, n];  // error
-  }
-
-  method SB(b: array2<int>, s: int) returns (x: int, y: int)
-    requires b != null
-  {
-    while
-    {
-      case b[x,y] == s =>
-    }
-  }
-
-  // -------- name resolution
-
-  class Global {
-    var X: int
-    function F(x: int): int { x }
-    static ghost function G(x: int): int { x }
-    method M(x: int) returns (r: int)
-    {
-      r := x + X;
-    }
-    static method N(x: int) returns (r: int)
-    {
-      r := x + X;  // error: cannot access instance field X from static method
-    }
-  }
-
-  method TestNameResolution0() {
-    var z: int;
-    z := Global.X;  // error: X is an instance field
-    z := F(2);  // error: cannot resolve F
-    z := Global.F(2);  // error: invocation of instance function requires an instance
-    z := G(2);  // error: cannot resolve G
-    z := Global.G(2);
-    z := M(2);  // error: cannot resolve M
-    z := Global.M(2);  // error: call to instance method requires an instance
-    z := N(1);  // error: cannot resolve N
-    z := Global.N(1);
-
-    z := z(5);  // error: using local as if it were a function
-    z := Global.z;  // error: class Global does not have a member z
-
-    var Global: Global;  // a local variable with the name 'Global'
-    z := Global.X;  // this means the instance field X of the object stored in the local variable 'Global'
-    var gg: Global := null;
-    var y := gg.G(5);
-    y := gg.N(5);
-  }
-
-  datatype Abc = Abel | Benny | Cecilia(y: int) | David(x: int) | Eleanor
-  datatype Xyz = Alberta | Benny | Constantine(y: int) | David(x: int)
-  datatype Rst = David(x: int, y: int)
-
-  ghost function Tuv(arg0: Abc, arg1: bool): int { 10 }
-
-  class EE {
-    var Eleanor: bool
-    method TestNameResolution1() {
-      var a0 := Abel;
-      var a1 := Alberta;
-      var b0 := Benny;  // error: there's more than one constructor with the name Benny; needs qualification
-      var b1 := Abc.Benny;
-      var b2 := Xyz.Benny;
-      var Benny := 15;  // introduce a local variable with the name 'Benny'
-      var b3 := Benny;
-      var d0 := David(20);  // error: constructor name David is ambiguous
-      var d1 := David;  // error: constructor name David is ambiguous (never mind that the signature does
-            // not match either of them)
-      var d2 := David(20, 40);  // error: constructor name Davis is ambiguous (never mind that the given
-              // parameters match the signature of only one of those constructors)
-      var d3 := Abc.David(20, 40);  // error: wrong number of parameters
-      var d4 := Rst.David(20, 40);
-      var e := Eleanor;  // this resolves to the field, not the Abc datatype constructor
-      assert Tuv(Abc.Eleanor, e) == 10;
-    }
-  }
-}
-
-// --------------- ghost tests -------------------------------------
-
-module HereAreMoreGhostTests {
-  datatype GhostDt =
-    Nil(ghost extraInfo: int) |
-    Cons(data: int, tail: GhostDt, ghost moreInfo: int)
-
-  class GhostTests {
-    method M(dt: GhostDt) returns (r: int) {
-      ghost var g := 5;
-      r := g;  // error: RHS is ghost, LHS is not
-      r := F(18, g);  // error: RHS is a ghost and will not be available at run time
-      r := G(20, g);  // it's fine to pass a ghost as a parameter to a non-ghost, because
-                      // only the ghost goes away during compilation
-      r := N(22, g);  // ditto
-      r := N(g, 22);  // error: passing in 'g' as non-ghost parameter
-      r := P(24, 22);  // error: 'P' is ghost, but its result is assigned to a non-ghost
-
-      match (dt) {
-        case Nil(gg) =>
-        case Cons(dd, tt, gg) =>
-          r := G(dd, dd);  // fine
-          r := G(dd, gg);  // fine
-          r := G(gg, gg);  // error: cannot pass ghost 'gg' as non-ghost parameter to 'G'
-      }
-      var dd;
-      dd := GhostDt.Nil(g);  // fine
-      dd := GhostDt.Cons(g, dt, 2);  // error: cannot pass 'g' as non-ghost parameter
-      ghost var dtg := GhostDt.Cons(g, dt, 2);  // fine, since result is ghost
-    }
-    ghost function F(x: int, y: int): int {
-      y
-    }
-    function G(x: int, ghost y: int): int {
-      y  // error: cannot return a ghost from a non-ghost function
-    }
-    function H(dt: GhostDt): int {
-      match dt
-      case Nil(gg) =>  gg  // error: cannot return a ghost from a non-ghost function
-      case Cons(dd, tt, gg) =>  dd + gg  // error: ditto
-    }
-    method N(x: int, ghost y: int) returns (r: int) {
-      r := x;
-    }
-    ghost method P(x: int, y: int) returns (r: int) {
-      ghost var g := 5;
-      r := y;  // allowed, since the entire method is ghost
-      r := r + g;  // fine, for the same reason
-      r := N(20, 20);  // error: call to non-ghost method from ghost method is not okay
-    }
-    ghost method BreaksAreFineHere(t: int)
-    {
-      var n := 0;
-      ghost var k := 0;
-      while (true)
-        invariant n <= 112
-        decreases 112 - n
-      {
-        label MyStructure: {
-          if (k % 17 == 0) { break MyStructure; }  // this is fine, because it's a ghost method
-          k := k + 1;
-        }
-        label MyOtherStructure:
-        if (k % 17 == 0) {
-          break MyOtherStructure;
-        } else {
-          k := k + 1;
-        }
-
-        if (n == 112) {
-          break;
-        } else if (n == t) {
-          return;
-        }
-        n := n + 1;
-      }
-    }
-    method BreakMayNotBeFineHere(ghost t: int)
-    {
-      var n := 0;
-      ghost var k := 0;
-      var p := 0;
-      while (true)
-        invariant n <= 112
-        decreases 112 - n
-      {
-        label MyStructure: {
-          k := k + 1;
-        }
-        label MyOtherStructure:
-        if (k % 17 == 0) {
-          break MyOtherStructure;  // this break is fine
-        } else {
-          k := k + 1;
-        }
-
-        var dontKnow;
-        if (n == 112) {
-          ghost var m := 0;
-          label LoopLabel0:
-          label LoopLabel1:
-          while (m < 200) {
-            if (m % 103 == 0) {
-              if {
-                case true => break;  // fine, since this breaks out of the enclosing ghost loop
-                case true => break LoopLabel0;  // fine
-                case true => break LoopLabel1;  // fine
-              }
-            } else if (m % 101 == 0) {
-            }
-            m := m + 3;
-          }
-          break;
-        } else if (dontKnow == 708) {
-          var q := 0;
-          while (q < 1) {
-            label IfNest:
-            if (p == 67) {
-              break break;  // fine, since this is not a ghost context
-            }
-            q := q + 1;
-          }
-        } else if (n == t) {
-        }
-        n := n + 1;
-        p := p + 1;
-      }
-    }
-    method BreakMayNotBeFineHere_Ghost(ghost t: int)
-    {
-      var n := 0;
-      ghost var k := 0;
-      var p := 0;
-      while (true)
-        invariant n <= 112
-        decreases 112 - n
-      {
-        label MyStructure: {
-          if (k % 17 == 0) { break MyStructure; }  // error: break from ghost to non-ghost point
-          k := k + 1;
-        }
-        label MyOtherStructure:
-        if (k % 17 == 0) {
-          break MyOtherStructure;  // this break is fine
-        } else {
-          k := k + 1;
-        }
-
-        var dontKnow;
-        if (n == 112) {
-          ghost var m := 0;
-          label LoopLabel0:
-          label LoopLabel1:
-          while (m < 200) {
-            if (m % 103 == 0) {
-              if {
-                case true => break;  // fine, since this breaks out of the enclosing ghost loop
-                case true => break LoopLabel0;  // fine
-                case true => break LoopLabel1;  // fine
-              }
-            } else if (m % 101 == 0) {
-              break break;  // error: break out of non-ghost loop from ghost context
-            }
-            m := m + 3;
-          }
-          break;
-        } else if (dontKnow == 708) {
-          var q := 0;
-          while (q < 1) {
-            label IfNest:
-            if (p == 67) {
-              break break;  // fine, since this is not a ghost context
-            } else if (*) {
-              break break;  // fine, since this is not a ghost context
-            } else if (k == 67) {
-              break break;  // error, because this is a ghost context
-            }
-            q := q + 1;
-          }
-        } else if (n == t) {
-          return;  // error: this is a ghost context trying to return from a non-ghost method
-        }
-        n := n + 1;
-        p := p + 1;
-      }
-    }
-  }
-} // HereAreMoreGhostTests
-
-module MiscMore {
-  method DuplicateLabels(n: int) {
-    var x;
-    if (n < 7) {
-      label DuplicateLabel: x := x + 1;
-    } else {
-      label DuplicateLabel: x := x + 1;
-    }
-    label DuplicateLabel: x := x + 1;
-    label DuplicateLabel': {
-      label AnotherLabel:
-      label DuplicateLabel':  // error: duplicate label (shadowed by enclosing label)
-      label OneMoreTime:
-      x := x + 1;
-    }
-    label DuplicateLabel'':
-    label DuplicateLabel'':  // error: duplicate label (shadowed by enclosing label)
-    x := x + 1;
-    label DuplicateLabel'': x := x + 1;  // error: duplicate label (shadowed by dominating label)
-  }
-
-  // --------------- constructors -------------------------------------
-  // Note, more tests in module ClassConstructorTests below
-
-  class ClassWithConstructor {
-    var y: int
-    method NotTheOne() { }
-    constructor InitA() { }
-    constructor InitB() modifies this { y := 20; }  // error: don't use "this" in modifies of constructor
-  }
-
-  method ConstructorTests()
-  {
-    var c := new ClassWithConstructor.InitB();
-    c.InitB();  // error: not allowed to call constructors except during allocation
-  }
-
-  // ------------------- datatype destructors ---------------------------------------
-
-  datatype DTD_List = DTD_Nil | DTD_Cons(Car: int, Cdr: DTD_List, ghost g: int)
-
-  method DatatypeDestructors(d: DTD_List) {
-    if {
-      case d.DTD_Nil? =>
-        assert d == DTD_Nil;
-      case d.DTD_Cons? =>
-        var hd := d.Car;
-        var tl := d.Cdr;
-        assert hd == d.Cdr;  // type error
-        assert tl == d.Car;  // type error
-        assert d.DTD_Cons? == d.Car;  // type error
-        assert d == DTD_Cons(hd, tl, 5);
-        ghost var g0 := d.g;  // fine
-    }
-  }
-} // MiscMore
-
-// ------------------- print statements ---------------------------------------
-
-module GhostPrintAttempts {
-  method PrintOnlyNonGhosts(a: int, ghost b: int)
-  {
-    print "a: ", a, "\n";
-    print "b: ", b, "\n";  // error: print statement cannot take ghosts
-  }
-}
-
-// ------------------- auto-added type arguments ------------------------------
-
-module MiscEvenMore {
-  class GenericClass<T> { var data: T }
-
-  method MG0(a: GenericClass, b: GenericClass)
-    requires a != null && b != null
-    modifies a
-  {
-    a.data := b.data;  // allowed, since both a and b get the same auto type argument
-  }
-
-  method G_Caller()
-  {
-    var x := new GenericClass;
-    MG0(x, x);  // fine
-    var y := new GenericClass;
-    MG0(x, y);  // also fine (and now y's type argument is constrained to be that of x's)
-    var z := new GenericClass<int>;
-    var w := new GenericClass<bool>;
-    MG0(x, w);  // this has the effect of making x's and y's type GenericClass<bool>
-
-    y.data := z.data;  // error: bool vs int
-    assert x.data == 5;  // error: bool vs int
-  }
-
-  datatype GList<+T> = GNil | GCons(hd: T, tl: GList)
-
-  method MG1(l: GList, n: nat)
-  {
-    if (n != 0) {
-      MG1(l, n-1);
-      MG1(GCons(12, GCons(20, GNil)), n-1);
-    }
-    var t := GCons(100, GNil);  // error: types don't match up (List<_T0> versus List<int>)
-    t := GCons(120, l);  // error: types don't match up (List<_T0> versus List<int>)
-  }
-
-  // ------------------- calc statements ------------------------------
-
-  method TestCalc(m: int, n: int, a: bool, b: bool)
-  {
-    calc {
-      a + b; // error: invalid line
-      n + m;
-    }
-    calc {
-      a && b;
-      n + m; // error: all lines must have the same type
-    }
-    calc ==> {
-      n + m; // error: ==> operator requires boolean lines
-      n + m + 1;
-      n + m + 2;
-    }
-    calc {
-      n + m;
-      n + m + 1;
-      ==> n + m + 2; // error: ==> operator requires boolean lines
-    }
-  }
-} // MiscEvenMore
-
-module MyOwnModule {
-  class SideEffectChecks {
-    ghost var ycalc: int
-
-    ghost method Mod(a: int)
-      modifies this
-      ensures ycalc == a
-    {
-      ycalc := a;
-    }
-
-    ghost method Bad()
-      modifies this
-      ensures 0 == 1
-    {
-      var x: int;
-      calc {
-        0;
-        { Mod(0); }     // error: methods with side-effects are not allowed
-        ycalc;
-        { ycalc := 1; } // error: heap updates are not allowed
-        1;
-        { x := 1; }     // error: updates to locals defined outside of the hint are not allowed
-        x;
-        {
-          var x: int;
-          x := 1;       // this is OK
-        }
-        1;
-      }
-    }
-  }
-}
-
-// ------------------- nameless constructors ------------------------------
-
-module MiscAgain {
-  class Y {
-    var data: int
-    constructor (x: int)
-    {
-      data := x;
-    }
-    constructor (y: bool)  // error: duplicate constructor name
-    {
-    }
-    method Test() {
-      var i := new Y(5);
-      i := new Y(7);
-
-      var s := new Luci.Init(5);
-      s := new Luci.FromArray(null);
-      s := new Luci(false);
-      s := new Luci(true);
-
-      var l := new Lamb;
-      l := new Lamb();  // error: there is no default constructor
-    }
-  }
-
-  class Luci {
-    constructor Init(y: int) { }
-    constructor (nameless: bool) { }
-    constructor FromArray(a: array<int>) { }
-    method M() { }
-  }
-
-  class Lamb {
-    method Jess() { }
-    method Gwen() { }
-  }
-
-  // ------------------- assign-such-that and ghosts ------------------------------
-
-  method AssignSuchThatFromGhost()
-  {
-    var x: int;
-    ghost var g: int;
-
-    x := *;
-    assume x == g;  // this mix of ghosts and non-ghosts is cool (but, of course,
-                    // the compiler will complain)
-
-    x :| assume x == g;  // this is cool, since it's an assume (but, of course, the
-                         // compiler will complain)
-
-    x :| x == 5;
-    g :| g <= g;
-    g :| assume g < g;  // the compiler will complain here, despite the LHS being
-                        // ghost -- and rightly so, since an assume is used
-  }
-}  // MiscAgain
-
-// ------------------------ inferred type arguments ----------------------------
-
-// Put the following tests in a separate module, so that the method bodies will
-// be type checked even if there are resolution errors in other modules.
-module NoTypeArgs0 {
-  datatype List<+T> = Nil | Cons(T, List)
-  datatype Tree<+A,+B> = Leaf(A, B) | Node(Tree, Tree<B,A>)
-
-  method DoAPrefix0<A, B, C>(xs: List) returns (ys: List<A>)
-  {
-    ys := xs;
-  }
-
-  method DoAPrefix1<A, B, C>(xs: List) returns (ys: List<B>)
-  {
-    ys := xs;  // error: List<B> cannot be assign to a List<A>
-  }
-
-  method DoAPrefix2<A, B, C>(xs: List) returns (ys: List<B>)
-  {
-    ys := xs;  // error: List<B> cannot be assign to a List<A>
-  }
-
-  ghost function FTree0(t: Tree): Tree
-  {
-    match t
-    case Leaf(_,_) => t
-    case Node(x, y) => x
-  }
-
-  ghost function FTree1(t: Tree): Tree
-  {
-    match t
-    case Leaf(_,_) => t
-    case Node(x, y) => y  // error: y does not have the right type
-  }
-
-  ghost function FTree2<A,B,C>(t: Tree): Tree<A,B>
-  {
-    t
-  }
-}
-
-module NoTypeArgs1 {
-  datatype Tree<A,B> = Leaf(A, B) | Node(Tree, Tree<B,A>)
-
-  ghost function FTree3<T>(t: Tree): Tree<T,T>  // error: type of 't' does not have enough type parameters
-  {
-    t
-  }
-}
-
-// ----------- let-such-that expressions ------------------------
-
-module MiscMisc {
-  method LetSuchThat(ghost z: int, n: nat)
-  {
-    var x: int;
-    x := var y :| y < 0; y;  // fine for the resolver (but would give a verification error for not being deterministic)
-
-    x := var w :| w == 2*w; w;  // fine (even for the verifier, this one)
-    x := var w := 2*w; w;  // error: the 'w' in the RHS of the assignment is not in scope
-    ghost var xg := var w :| w == 2*w; w;
-  }
-}
-
-// ------------ quantified variables whose types are not inferred ----------
-
-module NonInferredType {
-  ghost predicate P<T>(x: T)
-
-  method InferredType(x: int)
-  {
-    var t;
-    assume forall z :: P(z) && z == t;
-    assume t == x;  // this statement determines the type of t and z
-  }
-
-  method NonInferredType(x: int)
-  {
-    var t;  // error: the type of t is not determined
-    assume forall z :: P(z) && z == t;  // error: the type of z is not determined
-  }
-}
-
-// ------------ Here are some tests that lemma contexts don't allocate objects -------------
-
-module GhostAllocationTests {
-  class G { }
-  iterator GIter() { }
-  class H { constructor () }
-  lemma GhostNew0()
-    ensures exists o: G :: fresh(o)
-  {
-    var p := new G;  // error: lemma context is not allowed to allocate state
-    p := new G;  // error: ditto
-  }
-
-  method GhostNew1(n: nat, ghost g: int) returns (t: G, z: int)
-  {
-    if n < 0 {
-      z, t := 5, new G;  // fine
-    }
-    if n < g {
-      var tt := new H();  // error: 'new' not allowed in ghost contexts
-    }
-  }
-
-  method GhostNew2(ghost b: bool)
-  {
-    if (b) {
-      var y := new GIter();  // error: 'new' not allowed in ghost contexts (and a non-ghost method is not allowed to be called here either)
-    }
-  }
-}
-module MoreGhostAllocationTests {
-  class G { }
-  method GhostNew3(n: nat) {
-    var g := new G;
-    calc {
-      5;
-      { var y := new G; }  // error: 'new' not allowed in lemma contexts
-      2 + 3;
-    }
-  }
-  ghost method GhostNew4(g: G)
-    modifies g
-  {
-  }
-}
-
-module NewForallAssign {
-  class G { }
-  method NewForallTest(n: nat) {
-    var a := new G[n];
-    forall i | 0 <= i < n {
-      a[i] := new G;  // error: 'new' is currently not supported in forall statements
-  } }
-}
-module NewForallProof {
-  class G { }
-  method NewForallTest(n: nat) { var a := new G[n];
-    forall i | 0 <= i < n ensures true { // this makes the whole 'forall' statement into a ghost statement
-      a[i] := new G;  // error: proof-forall cannot update state (and 'new' not allowed in ghost contexts, but that's checked at a later stage)
-  } }
-}
-
-// ------------------------- underspecified types ------------------------------
-
-module UnderspecifiedTypes {
-  method M(S: set<int>) {
-    var n, p, T0 :| 12 <= n && n in T0 && 10 <= p && p in T0 && T0 <= S && p % 2 != n % 2;
-    var T1 :| 12 in T1 && T1 <= S;
-    var T2 :| T2 <= S && 12 in T2;
-    var T3 :| 120 in T3;  // error: underspecified type
-    var T3'0: set<int> :| 120 in T3'0;
-    var T3'1: multiset<int> :| 120 in T3'1;
-    var T3'2: map<int,bool> :| 120 in T3'2;
-    var T3'3: seq<int> :| 120 in T3'3;
-    var T3'4: bool :| 120 in T3'4;  // error: second argument to 'in' cannot be bool
-    var T4 :| T4 <= S;
-  }
-}
-
-// ------------------------- lemmas ------------------------------
-module MiscLemma {
-  class L { }
-
-  // a lemma is allowed to have out-parameters, but not a modifies clause
-  lemma MyLemma(x: int, l: L) returns (y: int)
-    requires 0 <= x
-    modifies l
-    ensures 0 <= y
-  {
-    y := x;
-  }
-}
-
-// ------------------------- statements in expressions ------------------------------
-
-module StatementsInExpressions {
-  class MyClass {
-    ghost method SideEffect()
-      modifies this
-    {
-    }
-
-    method NonGhostMethod()
-    {
-    }
-
-    ghost function F(): int
-    {
-      calc {
-        6;
-        { assert 6 < 8; }
-        { var x := 8;
-          while x != 0
-            decreases *  // error: cannot use 'decreases *' here
-          {
-            x := x - 1;
-          }
-        }
-        { var x := 8;
-          while x != 0
-          {
-            x := x - 1;
-          }
-        }
-        { var x := 8;
-          while x != 0
-          {
-            x := x - 1;
-          }
-        }
-        6;
-      }
-      5
-    }
-
-    var MyField: int
-    ghost var MyGhostField: int
-
-    method N()
-    {
-      var y :=
-      calc {
-        6;
-        { assert 6 < 8; }
-        { var x := 8;
-          while x != 0
-            decreases *  // error: cannot use 'decreases *' here
-          {
-            x := x - 1;
-          }
-        }
-        { var x := 8;
-          while x != 0
-          {
-            x := x - 1;
-          }
-        }
-        { var x := 8;
-          while x != 0
-          {
-            x := x - 1;
-          }
-        }
-        6;
-      }
-      5;
-    }
-  }
-}
-
-module StmtExprOutParams {
-
-  lemma MyLemma()
-
-  lemma OutParamLemma() returns (y: int)
-
-  ghost function UseLemma(): int
-  {
-    MyLemma();
-    OutParamLemma(); // error: has out-parameters
-    10
-  }
-}
-
-module GhostLetExpr {
-  method M() {
-    ghost var y;
-    var x;
-    var g := G(x, y);
-    ghost var h := ghost var ta := F(); 5;
-    var j; j := var tb := F(); 5;  // fine (tb is ghost, j is not, but RHS body doesn't depend on tb)
-    assert h == j;
-  }
-
-  ghost function F(): int
-  { 5 }
-
-  function G(x: int, ghost y: int): int
-  {
-    assert y == x;
-    y  // error: not allowed in non-ghost context
-  }
-
-  datatype Dt = MyRecord(a: int, ghost b: int)
-
-  method P(dt: Dt) {
-    match dt {
-      case MyRecord(aa, bb) =>
-        ghost var z := aa + F();
-        ghost var t0 := var y := z; z + 3;
-        ghost var t1 := ghost var y := z + bb; y + z + 3;
-        var t2; t2 := ghost var y := z; y + 3;  // t2 is not ghost - error
-    }
-  }
-
-  function FM(e: bool): int
-  {
-    if e then
-      G(5, F())
-    else
-      var xyz := F();  // fine, because 'xyz' becomes ghost automatically
-      G(5, xyz)
-  }
-}
-
-module ObjectType {
-  type B
-  datatype Dt = Blue | Green
-  codatatype CoDt = Cons(int, CoDt)
-  class MyClass { }
-
-  method M<G>(zz: array<B>, j: int, b: B, co: CoDt, g: G) returns (o: object)
-    requires zz != null && 0 <= j < zz.Length
-  {
-    o := b;  // error
-    o := 17;  // error
-    o := zz[j];  // error
-    o := null;
-    o := zz;
-    o := new MyClass;
-    o := o;
-    o := g;  // error
-    o := Blue;  // error
-    o := co;  // error
-  }
-}
-
-// ------------------ modify statment ---------------------------
-
-module MiscModify {
-  class ModifyStatementClass {
-    var x: int
-    ghost var g: int
-    method M()
-    {
-      modify x;  // error: type error
-    }
-    ghost method G0()
-      modifies `g
-      modifies `x  // error: non-ghost field mentioned in ghost context
-  }
-}
-
-module ModifyStatementClass_More {
-  class C {
-    var x: int
-    ghost var g: int
-    ghost method G0()
-      modifies `g
-    {
-      modify `g;
-      modify `x;  // error: non-ghost field mentioned in ghost context
-    }
-    method G1()
-      modifies this
-    {
-      modify `x;
-      if g < 100 {
-        // we are now in a ghost context
-        modify `x;  // error: non-ghost field mentioned in ghost context
-      }
-    }
-    method G2(y: nat)
-      modifies this
-    {
-      if g < 100 {
-        // we're now in a ghost context
-        var n := 0;
-        while n < y
-          modifies `x  // error: non-ghost field mentioned in ghost context
-        {
-          if * {
-            g := g + 1;  // if we got as far as verification, this would be flagged as an error too
-          }
-          n := n + 1;
-        }
-      }
-      modify `x;  // fine
-      ghost var i := 0;
-      while i < y
-        modifies `x  // error: non-ghost field mentioned in ghost context
-      {
-        i := i + 1;
-      }
-    }
-  }
-}
-
-module LhsLvalue {
-  method M()
-  {
-    var mySeq: seq<int>;
-    var a := new int[78];
-    var b := new int[100, 200];
-    var c := new MyRecord[29];
-
-    mySeq[0] := 5;  // error: cannot assign to a sequence element
-    mySeq[0] := MyMethod();  // error: ditto
-    a[0] := 5;
-    a[0] := MyMethod();
-    b[20, 18] := 5;
-    b[20, 18] := MyMethod();
-    c[25].x := 5;  // error: cannot assign to a destructor
-    c[25].x := MyMethod();  // error: ditto
-    mySeq[0..4] := 5;  // error: cannot assign to a range
-    mySeq[0..4] := MyMethod();  // error: ditto
-    a[0..4] := 5;  // error: cannot assign to a range
-    a[0..4] := MyMethod();  // error: ditto
-  }
-
-  datatype MyRecord = Make(x: int, y: int)
-
-  method MyMethod() returns (w: int)
-}
-
-// ------------------- dirty loops -------------------
-module MiscEtc {
-  method DirtyM(S: set<int>) {
-    forall s | s in S ensures s < 0
-    assert s < 0; // error: s is unresolved
-  }
-
-  // ------------------- tuples -------------------
-
-  method TupleResolution(x: int, y: int, r: real)
-  {
-    var unit: () := ();
-    var expr: int := (x);
-    var pair: (int,int) := (x, x);
-    var triple: (int,int,int) := (y, x, x);
-    var badTriple: (int,real,int) := (y, x, r);  // error: parameters 1 and 2 have the wrong types
-    var quadruple: (int,real,int,real) := (y, r, x);  // error: trying to use a triple as a quadruple
-
-    assert unit == ();
-    assert pair.0 == pair.1;
-    assert triple.2 == x;
-
-    assert triple.2;  // error: 2 has type int, not the expected bool
-    assert triple.3 == pair.x;  // error(s):  3 and x are not destructors
-
-    var k0 := (5, (true, 2, 3.14));
-    var k1 := (((false, 10, 2.7)), 100, 120);
-    if k0.1 == k1.0 {
-      assert false;
-    } else if k0.1.1 < k1.0.1 {
-      assert k1.2 == 120;
-    }
-
-    // int and (int) are the same type (i.e., there are no 1-tuples)
-    var pp: (int) := x;
-    var qq: int := pp;
-  }
-
-  // ------------------- conversions -------------------
-
-  method TypeConversions(m: nat, i: int, r: real) returns (n: nat, j: int, s: real)
-  {
-    n := r as int;
-    j := r as int;
-    s := m as real;  // nat->real is allowed, just like int->real is
-    s := i as real;
-    s := i as real / 2;  // error: division expects two reals
-    s := 15 % s;  // error: modulus is not defined for reals
-
-    s := (2.0 / 1.7) + (r / s) - (--r) * -12.3;
-
-    s := s as real;  // fine (identity transform)
-    j := j as int;  // fine (identity transform)
-    j := n as int;  // fine (identity transform)
-  }
-}
-
-// --- filling in type arguments and checking that there aren't too many ---
-
-module TypeArgumentCount {
-  class C<T> {
-    var f: T
-  }
-
-  method R0(a: array3, c: C)
-
-  method R1()
-  {
-    var a: array3;
-    var c: C;
-  }
-
-  method R2<T>()
-  {
-    var a: array3<T,int>;  // error: too many type arguments
-    var c: C<T,int>;  // error: too many type arguments
-  }
-}
-
-// --- Type synonyms ---
-
-module BadTypeSynonyms {
-  datatype List<T> = Nil | Cons(T, List)
-  type BadSyn0 = List  // error: must have at least one type parameter
-  type BadSyn1 = badName  // error: badName does not denote a type
-  type BadSyn2 = List<X>  // error: X does not denote a type
-  type BadSyn2 = int  // error: repeated name
-}
-
-// --- cycles ---
-
-module CycleError0 {
-  type A = A  // error: cycle: A -> A
-}
-module CycleError1 {
-  type A = B  // error: cycle: A -> B -> A
-  type B = A
-}
-module CycleError2 {
-  type A = B  // error: cycle: A -> B -> A
-  type B = set<A>
-}
-module CycleErrors3 {
-  type A = (B, D<bool>)
-  type B = C
-  class C {
-    var a: A  // this is fine
-  }
-  datatype D<X> = Make(A, B, C)  // error: cannot construct a D<X>
-}
-module CycleError4 {
-  type A = B  // error: cycle: A -> B -> A
-  type B = C<A>
-  class C<T> { }
-}
-module CycleError5 {
-  type A = B  // error: cycle: A -> B -> A
-  type B = Dt<A>
-  datatype Dt<T> = Make(T)
-}
-module CycleError6 {
-  type A = Dt<Dt<A>>  // error: cycle A -> A
-  datatype Dt<T> = Make(T)
-}
-
-// --- attributes in top-level declarations ---
-
-module MiscIterator {
-  iterator {:myAttribute x} Iter() {  // error: x does not refer to anything
-  }
-
-  class {:myAttribute x} C {  // error: x does not refer to anything
-  }
-
-  datatype {:myAttribute x} Dt = Blue  // error: x does not refer to anything
-
-  type {:myAttribute x} Something  // error: x does not refer to anything
-
-  type {:myAttribute x} Synonym = int  // error: x does not refer to anything
-}
-
-module {:myAttribute x} Modulette {  // error: x does not refer to anything
-}
-
-// --- abstract types with type parameters ---
-
-module OpaqueTypes0 {
-  type P<AA>
-  method M<B>(p: P<B>) returns (q: P<B,B>)  // error: wrong param count
-  {
-    q := p;
-  }
-}
-
-module OpaqueTypes1 {
-  type P<A>
-
-  method M0<B>(p: P<B>) returns (q: P<B>)
-  {
-    q := p;
-    var m: P<BX>;  // error: BX undefined
-  }
-
-  method M1<B>(p: P<B>) returns (q: P)  // type parameter of q's type inferred
-  {
-    q := p;
-  }
-
-  method M2(p: P<int>) returns (q: P<bool>)
-  {
-    q := p;  // error: cannot assign P<bool> to P<int>
-  }
-
-  method M3<A,B>(p: P<A>) returns (q: P<B>)
-  {
-    q := p;  // error: cannot assign P<A> to P<B>
-  }
-
-  method M4<A>() returns (p: P<A>, q: P<int>)
-  {
-    q := p;  // error: cannot assign P<A> to P<int>
-    p := q;  // error: cannot assign P<int> to P<A>
-  }
-
-  method EqualityTests<X>(p: P<int>, q: P<bool>, r: P<X>)
-  {
-    assert p != r;  // error: types must be the same in order to do compare
-    assert q != r;  // error: types must be the same in order to do compare
-    assert p != q;  // error: types must be the same in order to do compare
-  }
-}
-
-// ----- new trait -------------------------------------------
-
-module MiscTrait {
-  trait J { }
-  type JJ = J
-  method TraitSynonym()
-  {
-    var x := new JJ;  // error: new cannot be applied to a trait
-  }
-}
-
-// ----- set comprehensions where the term type is finite -----
-
-module ObjectSetComprehensionsNever {
-  // the following set comprehensions are known to be finite
-  ghost function A() : set<object> { set o : object | true :: o }  // error: a function is not allowed to depend on the allocated state
-  function B() : set<object> { set o : object | true :: o }  // error: a function is not allowed to depend on the allocated state
-}
-module ObjectSetComprehensionsSometimes {
-  // outside functions, the comprehension is permitted, but it cannot be compiled
-  lemma C() { var x; x := set o : object | true :: o; }
-
-  method D() { var x; x := set o : object | true :: o; }  // error: not (easily) compilable, so this is allowed only in ghost contexts
-}
-
-// ------ regression test for type checking of integer division -----
-
-module MiscTests {
-  method IntegerDivision(s: set<bool>)
-  {
-    var t := s / s;  // error: / cannot be used with sets
-  }
-
-  // ----- decreases * tests ----
-
-  method NonTermination_A()
-  {
-    NonTermination_B();  // error: to call a non-terminating method, the caller must be marked 'decreases *'
-  }
-
-  method NonTermination_B()
-    decreases *
-  {
-    while true
-      decreases *
-    {
-    }
-  }
-
-  method NonTermination_C()
-  {
-    while true
-      decreases *  // error: to use an infinite loop, the enclosing method must be marked 'decreases *'
-    {
-    }
-  }
-
-  method NonTermination_D()
-    decreases *
-  {
-    var n := 0;
-    while n < 100  // note, no 'decreases *' here, even if the nested loop may fail to terminate
-    {
-      while *
-        decreases *
-      {
-      }
-      n := n + 1;
-    }
-  }
-}
-
-// ------------ type variables whose values are not inferred ----------
-
-module NonInferredTypeVariables {
-  class C<CT> {
-    var f: CT
-  }
-
-  predicate P<PT>(x: int)
-  {
-    x < 100
-  }
-  ghost function Q<QT>(x: int): QT
-  {
-    var qt :| true; qt
-  }
-  method M<MT>(n: nat)
-  {
-    var a := new MT[n];
-  }
-  method N<NT>(n: nat) returns (x: NT)
-  {
-    var a := new NT[10];
-    x := a[3];
-  }
-
-  method DeterminedClient(n: nat)
-  {
-    ghost var q := Q(n);
-    var x := N(n);
-    var a := new array;
-    var c := new C;
-    var s: set;
-    var ss := new set[15];
-
-    q := 3.14;  // this will determine the type parameter of Q to be 'real'
-    x := 3.14;  // this will determine the type parameter of N to be 'real'
-    if a.Length != 0 {
-      a[0] := 3.14;  // this will determine the type parameter of 'array' to be 'real'
-    }
-    c.f := 3.14;  // this will determine the type parameter of 'C' to be 'real'
-    var containsPi := 3.14 in s;  // this will determine the type parameter of 'set' to be 'real'
-    ss[12] := s;  // this will determine the type parameter of 'array<set< _ >>' to be 'real'
-  }
-  method BadClient(n: nat)
-  {
-    var p := P(n);  // error: cannot infer the type argument for P
-    ghost var q := Q(n);  // error: cannot infer the type argument for Q (and thus q's type cannot be determined either)
-    M(n);  // error: cannot infer the type argument for M
-    var x := N(n);  // error: cannot infer the type argument for N (and thus x's type cannot be determined either)
-    var a := new array;  // error: cannot infer the type argument for 'array'
-    var c := new C;  // error: cannot infer the type argument for 'C'
-    var s: set;  // type argument for 'set'
-    var ss := new set[15];  // error: cannot infer the type argument in 'array<set< _ >>'
-    var what;  // error: the type of this local variable in underspecified
-  }
-  method MoreBadClient()
-  {
-    var b0 := forall s :: s <= {} ==> s == {};  // error: type of s underspecified
-    var b1 := forall s: set :: s <= {} ==> s == {};  // error: type of s underspecified
-    var b2 := forall c: C? :: c in {null} ==> c == null;  // error: type parameter of c underspecified
-
-    // In the following, the type of the bound variable is completely determined.
-    var S: set<set<int>>;
-    ghost var d0 := forall s :: s == {7} ==> s != {};
-    var d1 := forall s: set :: s in S ==> s == {};
-    var ggcc0: C;
-    var ggcc1: C;  // error: full type cannot be determined
-    ghost var d2 := forall c: C? :: c != null ==> c.f == 10;
-    ghost var d2' := forall c: C? :: c == ggcc0 && c != null ==> c.f == 10;
-    ghost var d2'' := forall c: C? :: c == ggcc1 && c != null ==> c.f == c.f; // error: here, type of c is not determined
-
-    var d0' := forall s :: s == {7} ==> s != {};
-    var d0'' := forall s :: s <= {7} ==> s == {};
-  }
-}
-
-// -------------- signature completion ------------------
-
-module SignatureCompletion {
-  // datatype signatures do not allow auto-declared type parameters on the LHS
-  datatype Dt = Ctor(X -> Dt)  // error: X is not a declared type
-  datatype Et<Y> = Ctor(X -> Et, Y)  // error: X is not a declared type
-
-
-  method My0<A,B>(s: set, x: A -> B)
-  method My1<A,B>(x: A -> B, s: set)
-  method My2<A,B>(s: set, x: A -> B)
-  method My3<A,B>(x: A -> B, s: set)
-
-  ghost function F0<A,B>(s: set, x: A -> B): int
-  ghost function F1<A,B>(x: A -> B, s: set): int
-  ghost function F2<A,B>(s: set, x: A -> B): int
-  ghost function F3<A,B>(x: A -> B, s: set): int
-}
-
-// -------------- more fields as frame targets --------------------
-
-module FrameTargetFields {
-  class C {
-    var x: int
-    var y: int
-    ghost var z: int
-
-    method M()
-      modifies this
-    {
-      var n := 0;
-      ghost var save := y;
-      while n < x
-        modifies `x
-      {
-        n, x := n + 1, x - 1;
-      }
-      assert y == save;
-    }
-
-    ghost method N()
-      modifies this
-      modifies `y  // resolution error: cannot mention non-ghost here
-      modifies `z  // cool
-    {
-    }
-  }
-}
-
-module FrameTargetFields_More {
-  class C {
-    var x: int
-    var y: int
-    ghost var z: int
-    method P()
-      modifies this
-    {
-      ghost var h := x;
-      while 0 <= h
-        modifies `x  // resolution error: cannot mention non-ghost here
-        modifies `z  // cool
-      {
-        h, z := h - 1, 5 * z;
-      }
-    }
-  }
-}
-
-// ------------------------------------------------------
-
-module AmbiguousModuleReference {
-  module A {
-    module Inner {
-      ghost predicate Q()
-    }
-  }
-  module B {
-    module Inner {
-      ghost predicate Q()
-    }
-  }
-  module OpenClient {
-    import opened A
-    import opened B
-    lemma M() {
-      var a := A.Inner.Q();  // fine
-      var b := B.Inner.Q();  // fine
-      var p := Inner.Q();  // error: Inner is ambiguous (A.Inner or B.Inner)
-    }
-  }
-}
-
-// --------------------------------------------------
-
-module GhostLet {
-  method M() {
-    var x: int;
-    x := ghost var tmp := 5; tmp;  // error: ghost -> non-ghost
-    x := ghost var tmp := 5; 10;  // fine
-    x := ghost var a0, a1 :| a0 == 0 && a1 == 1; a0 + a1;  // error: ghost -> non-ghost
-    x := ghost var a :| 0 <= a; 10;  // fine
-  }
-}
-
-// ------------------- tuple equality support -------------------
-
-module TupleEqualitySupport {
-  datatype GoodRecord = GoodRecord(set<(int,int)>)
-  datatype BadRecord = BadRecord(set<(int, int->bool)>)  // error: this tuple type does not support equality
-}
-
-// ------------------- non-type variable names -------------------
-
-module NonTypeVariableNames {
-  type X = int
-
-  module Y { }
-
-  method M(m: map<real,string>)
-  {
-    assert X == X;  // error (x2): type name used as variable
-    assert Y == Y;  // error (x2): module name used as variable
-    assert X in m;  // error (x2): type name used as variable
-    assert Y in m;  // error (x2): module name used as variable
-  }
-
-  method N(k: int)
-  {
-    assert k == X;  // error (x2): type name used as variable
-    assert k == Y;  // error (x2): module name used as variable
-    X := k;  // error: type name used as variable
-    Y := k;  // error: module name used as variable
-  }
-}
-
-// ------------------- assign-such-that and let-such-that -------------------
-
-module SuchThat {
-  method M() {
-    var x: int;
-    x :| 5 + 7;  // error: constraint should be boolean
-    x :| x;  // error: constraint should be boolean
-    var y :| 4;  // error: constraint should be boolean
-  }
-  ghost function F(): int {
-    var w :| 6 + 8;  // error: constraint should be boolean
-    w
-  }
-}
-
-// ---------------------- NEW STUFF ----------------------------------------
-
-module GhostTests {
-  class G { }
-
-  method GhostNew3(n: nat)
-  {
-    var g := new G;
-    calc {
-      5;
-      2 + 3;
-      { if n != 0 { GhostNew3(n-1); } }  // error: cannot call non-ghost method in a ghost context
-      1 + 4;
-      { GhostNew4(g); }  // error: cannot call method with nonempty modifies
-      -5 + 10;
-    }
-  }
-
-  ghost method GhostNew4(g: G)
-    modifies g
-  {
-  }
-
-  class MyClass {
-    ghost method SideEffect()
-      modifies this
-    {
-    }
-
-    method NonGhostMethod()
-    {
-    }
-
-    ghost method M()
-      modifies this
-    {
-      calc {
-        5;
-        { SideEffect(); }  // error: cannot call method with side effects
-        5;
-      }
-    }
-    ghost function F(): int
-    {
-      calc {
-        6;
-        { assert 6 < 8; }
-        { NonGhostMethod(); }  // error: cannot call non-ghost method
-        { var x := 8;
-          while x != 0
-          {
-            x := x - 1;
-          }
-        }
-        { var x := 8;
-          while x != 0
-          {
-            x := x - 1;
-          }
-        }
-        { MyField := 12; }  // error: cannot assign to a field, and especially not a non-ghost field
-        { MyGhostField := 12; }  // error: cannot assign to any field
-        { SideEffect(); }  // error: cannot call (ghost) method with a modifies clause
-        { var x := 8;
-          while x != 0
-            modifies this  // error: cannot use a modifies clause on a loop inside a hint
-          {
-            x := x - 1;
-          }
-        }
-        6;
-      }
-      5
-    }
-    var MyField: int
-    ghost var MyGhostField: int
-    method N()
-    {
-      var y :=
-      calc {
-        6;
-        { assert 6 < 8; }
-        { NonGhostMethod(); }  // error: cannot call non-ghost method
-        { var x := 8;
-          while x != 0
-          {
-            x := x - 1;
-          }
-        }
-        { MyField := 12; }  // error: cannot assign to a field, and especially not a non-ghost field
-        { MyGhostField := 12; }  // error: cannot assign to any field
-        { M(); }  // error: cannot call (ghost) method with a modifies clause
-        { var x := 8;
-          while x != 0
-            modifies this  // error: cannot use a modifies clause on a loop inside a hint
-          {
-            x := x - 1;
-          }
-        }
-        { var x := 8;
-          while x != 0
-          {
-            x := x - 1;
-          }
-        }
-        6;
-      }
-      5;
-    }
-  }
-}
-module CallsInStmtExpr {
-  class MyClass {
-    lemma MyLemma()
-    ghost method MyEffectlessGhostMethod()
-    ghost function UseLemma(): int
-    {
-      MyEffectlessGhostMethod(); // error: cannot call ghost methods (only lemmas) from this context
-      MyLemma();
-      10
-    }
-  }
-}
-
-module EvenMoreGhostTests {
-  ghost method NiceTry()
-    ensures false
-  {
-    while (true)
-      decreases *  // error:  not allowed here
-    {
-    }
-  }
-  method BreakMayNotBeFineHere()
-  {
-    var n := 0;
-    var p := 0;
-    while (true)
-    {
-      var dontKnow;
-      if (n == 112) {
-      } else if (dontKnow == 708) {
-        while * {
-          label IfNest:
-          if (p == 67) {
-            break break;  // fine, since this is not a ghost context
-          } else if (*) {
-            break break break;  // error: tries to break out of more loop levels than there are
-          }
-        }
-      }
-    }
-  }
-}
-
-module BadGhostTransfer {
-  datatype DTD_List = DTD_Nil | DTD_Cons(Car: int, Cdr: DTD_List, ghost g: int)
-
-  method DatatypeDestructors_Ghost(d: DTD_List) {
-    var g1; g1 := d.g;  // error: cannot use ghost member in non-ghost code
-  }
-  method AssignSuchThatFromGhost()
-  {
-    var x: int;
-    ghost var g: int;
-
-    x := g;  // error: ghost cannot flow into non-ghost
-
-    x := *;
-    assume x == g;  // this mix of ghosts and non-ghosts is cool (but, of course,
-                    // the compiler will complain)
-
-    x :| x == g;  // error: left-side has non-ghost, so RHS must be non-ghost as well
-
-    x :| assume x == g;  // this is cool, since it's an assume (but, of course, the
-                         // compiler will complain)
-
-    x :| x == 5;
-    g :| g <= g;
-    g :| assume g < g;  // the compiler will complain here, despite the LHS being
-                        // ghost -- and rightly so, since an assume is used
-  }
-}
-
-module MoreGhostPrintAttempts {
-  method TestCalc_Ghost(m: int, n: int, a: bool, b: bool)
-  {
-    calc {
-      n + m;
-      { print n + m; } // error: non-ghost statements are not allowed in hints
-      m + n;
-    }
-  }
-}
-
-module MoreLetSuchThatExpr {
-  method LetSuchThat_Ghost(ghost z: int, n: nat)
-  {
-    var x; x := var y :| y < z; y;  // error: contraint depend on ghost (z)
-  }
-}
-
-module UnderspecifiedTypedShouldBeResolvedOnlyOnce {
-  method CalcTest0(s: seq<int>) {
-    calc {
-      2;
-      var t :| true; 2;  // error: type of 't' is underspecified
-    }
-  }
-}
-
-module LoopResolutionTests {
-  class C {
-    var x: int
-    ghost var y: int
-  }
-
-
-  ghost method M(c: C)
-    modifies c
-  {
-    var n := 0;
-    while n < 100
-      modifies c`y
-      modifies c`x  // error: not allowed to mention non-ghost field in modifies clause of ghost loops
-    {
-      c.x := c.x + 1;  // error: assignment to non-ghost field not allowed here
-    }
-  }
-
-
-  method MM(c: C)
-    modifies c
-  {
-    var n := 0;
-    while
-      invariant n <= 100
-      modifies c  // regression test
-    {
-      case n < 100 =>  n := n + 1;
-    }
-  }
-
-
-  method MMX(c: C, ghost g: int)
-    modifies c
-  {
-    var n := 0;
-    while
-      invariant n <= 100
-      modifies c`y
-      modifies c`x  // error: not allowed to mention non-ghost field in modifies clause of ghost loops
-    {
-      case n < 100 =>  n := n + 1;  // error: cannot assign to non-ghost in a ghost loop
-      case g < 56 && n != 100 => n := n + 1;  // error: cannot assign to non-ghost in a ghost loop
-    }
-  }
-
-
-  method MD0(c: C, ghost g: nat)
-    modifies c
-    decreases *
-  {
-    var n := 0;
-    while n + g < 100
-      invariant n <= 100
-      decreases *  // error: disallowed on ghost loops
-    {
-      n := n + 1;  // error: cannot assign to non-ghost in a ghost loop
-    }
-  }
-
-
-  method MD1(c: C, ghost g: nat)
-    modifies c
-    decreases *
-  {
-    var n := 0;
-    while
-      invariant n <= 100
-      decreases *  // error: disallowed on ghost loops
-    {
-      case n + g < 100 =>  n := n + 1;  // error: cannot assign to non-ghost in a ghost loop
-    }
-  }
-}
-
-module UnderspecifiedTypesInAttributes {
-  function P<T>(x: T): int
-  method M() {
-    var {:myattr var u :| true; 6} v: int;  // error: type of u is underspecified
-    var j {:myattr var u :| true; 6} :| 0 <= j < 100;  // error: type of u is underspecified
-
-    var a := new int[100];
-    forall lp {:myattr var u :| true; 6} | 0 <= lp < 100 {  // error: type of u is underspecified
-      a[lp] := 0;
-    }
-
-    modify {:myattr P(10)} {:myattr var u :| true; 6} a;  // error: type of u is underspecified
-
-    calc {:myattr P(10)} {:myattr var u :| true; 6} // error: type of u is underspecified
-    {
-      5;
-    }
-  }
-}
-
-// ------------------- infer array types for Indexable and MultiIndexable XConstraints ----------
-// ------------------- using weaker subtyping constraints                              ----------
-
-module AdvancedIndexableInference {
-  datatype MyRecord = Make(x: int, y: int)
-  method M(d: array<MyRecord>, e: seq<MyRecord>)
-    requires d.Length == 100 == |e|
-  {
-    if * {
-      var c := d;
-      var xx := c[25].x;
-    } else if * {
-      var c := d;
-      var xx := c[25..50][10].x;
-    } else if * {
-      var c := e;
-      var xx := c[25].x;
-    } else {
-      var c := e;
-      var xx := c[25..50][10].x;
-    }
-  }
-}
-
-// --------------------------
-
-module TypeConversions {
-  trait J { }
-  class C extends J { }
-  method M() returns (x: int, n: nat, o: object, j: J, c: C) {
-    n := x as nat;  // yes, this is allowed now
-    o := j;
-    j := o;  // OK for type resolution, but must be proved
-    j := o as J;  // yes, this is allowed now
-    j := c;
-    c := j;  // OK for type resolution, but must be proved
-    c := j as C;  // yes, this is allowed now
-    var oo := o as realint;  // error: there's no such type as "realint" (this once used to crash Dafny)
-  }
-}
-
-// --------------------- regression
-
-module Regression_NewType {
-  class C { }
-  newtype MyInt = x: int | {} == set c: C | c  // this once crashed Dafny
-}
-
-// --------------------- regression
-
-module PrefixGeneratorDuplicates {
-  greatest predicate P()
-  greatest predicate P()  // error: duplicate name (this once crashed Dafny)
-  greatest lemma L()
-  greatest lemma L()  // error: duplicate name (this once crashed Dafny)
-}
-
-// ------------------- unary TLA+ style predicates -------------------
-
-module TLAplusOperators {
-  ghost function BadA(y: int): int  // error: body has wrong return type
-  {
-    && 5 + y  // error: using operator "&&" requires the operand to be boolean
-  }
-  ghost function BadB(y: int): bool
-  {
-    && 5 + y  // error: using operator "&&" requires the operand to be boolean
-  }
-  ghost function BadC(y: int): int  // error: body has wrong return type
-  {
-    || 5 + y  // error: using operator "||" requires the operand to be boolean
-  }
-  ghost function BadD(y: int): bool
-  {
-    || 5 + y  // error: using operator "||" requires the operand to be boolean
-  }
-  ghost function BadE(y: int): int  // error: body has wrong return type
-  {
-    && (|| 5 + y)  // error: bad types
-  }
-}
-
-// ------------------------- divided constructors -------------------
-
-module DividedConstructors {
-
-  class MyClass {
-    var a: nat
-    var b: nat
-    var c: nat
-    var n: MyClass
-    const t := 17
-    static const g := 25
-
-    constructor Init(x: nat)
-    {
-      this.a := this.b;  // this use of "this" in RHS is allowed
-      ((this)).b := 10;
-      n := new MyClass();
-      n.a := 10;  // error: not allowed use of "this" in this way
-      c := a + b;  // error (x2): not allowed "this" in RHS
-      var th := this;  // error: not allowed "this" in RHS
-      Helper();  // error: not allowed to call instance method
-      var mc := new MyClass();
-      StaticHelper(mc);
-      this.StaticHelper(mc);  // error: "this" is benign here; yet, it seems consistent to disallow it
-      StaticHelper(this);  // error: cannot use "this" here
-      P(a);  // error: cannot use "this" here
-      P(g);
-      P(this.g);  // error: "this" is benign here; yet, it seems consistent to disallow it
-      modify this;  // error: cannot use "this" here
-      modify this`c;  // error: cannot use "this" here
-      modify `c;  // error: cannot use (implicit) "this" here
-      new;
-      a := a + b;
-      Helper();
-    }
-
-    method Helper()
-    {
-    }
-
-    static method StaticHelper(mc: MyClass)
-    {
-    }
-
-    static method P(x: nat)
-    {
-    }
-
-    constructor ()
-    {
-      a, c := 0, 0;
-      new;
-    }
-
-  }
-}
-
-module ConstructorsThisUsage {
-  class C {
-    var x: int
-    constructor M()
-      requires this != null  // error: cannot use "this" here
-      modifies this  // error: cannot use "this" here (but we just issue a deprecation warning)
-      decreases this.x  // error: cannot use "this" here
-      ensures this.x == 5
-    {
-      x := 5;
-    }
-  }
-}
-
-module ReturnBeforeNew {
-  class C {
-    var a: int
-    var b: int
-    constructor TriesToReturnBeforeNew(xyz: int)
-    {
-      a := 0;
-      if xyz < 100 {
-        return;  // error: "return" is not allowed before "new;"
-      }
-    }
-  }
-}
-
-// ---------------- required auto-initialization -----------------------
-
-module ZI {
-  // the following are different syntactic ways of saying that the type
-  // must support auto-initialization
-  type ZA(0)
-  type ZB(==)(0)
-  type ZC(0)(==)
-  type ZD(==,0)
-  type ZE(0,==)
-  type Y
-
-  method P<G(0)>(x: G)
-  method M0<F,G(0)>(a: ZA, b: ZB, c: ZC, d: ZD, e: ZE, f: F, g: G, y: Y)
-  {
-    P(a);
-    P(b);
-    P(c);
-    P(d);
-    P(e);
-    P(f);  // error: type of argument is expected to support auto-initialization
-    P(g);
-    P(y);  // error: type of argument is expected to support auto-initialization
-  }
-
-  datatype List<T> = Nil | Cons(T, List<T>)
-  method M1<G,H(0)>(xs: List<G>, ys: List<H>) {
-    P(xs);  // yay, type of argument does support auto-initialization
-    P(ys);  // yay, type of argument does support auto-initialization
-  }
-
-  class Cls {
-    var q: int
-    var rs: List<List<Cls>>
-  }
-  method M2(c: Cls?) {
-    P(c);
-  }
-
-  newtype byte = x: int | 0 <= x < 256  // supports auto-initialization
-  newtype MyInt = int  // supports auto-initialization
-  newtype SixOrMore = x | 6 <= x ghost witness 6
-  newtype AnotherSixOrMore = s: SixOrMore | true ghost witness 6
-  newtype MySixOrMore = x: MyInt | 6 <= x ghost witness 6
-  // The resolver uses the presence/absence of a "witness" clause to figure out if the type
-  // supports auto-initialization.  This can be inaccurate.  If the type does not have a
-  // "witness" clause, some type replacements may slip by the resolver, but will then be
-  // caught by the verifier when the witness test is performed (because the witness test
-  // uses a zero value in the absence of a "witness" clause).
-  // A "ghost witness" clause tells the resolver that the type does not support
-  // auto-initialization, but only ghost auto-initialzation.
-
-  newtype UnclearA = x: int | true ghost witness 0  // actually supports auto-initialization, but has a "ghost witness" clause
-  newtype UnclearB = x | x == 6 && x < 4  // "witness" clause omitted; type does not actually support auto-initialization
-
-  method M3(a: byte, b: MyInt, c: SixOrMore, d: AnotherSixOrMore, e: MySixOrMore,
-            ua: UnclearA, ub: UnclearB) {
-    P(a);
-    P(b);
-    P(c);  // error: type of argument is expected to support auto-initialization
-    P(d);  // error: type of argument is expected to support auto-initialization
-    P(e);  // error: type of argument is expected to support auto-initialization
-    P(ua);  // error: as far as the resolver can tell, type of argument does not support auto-initialization
-    P(ub);  // fine, as far as the resolver can tell (but this would be caught later by the verifier)
-  }
-
-  type Sbyte = x: int | 0 <= x < 256  // supports auto-initialization
-  type SMyInt = int  // supports auto-initialization
-  type SSixOrMore = x | 6 <= x ghost witness 6
-  type SAnotherSixOrMore = s: SSixOrMore | true ghost witness 6
-  type SMySixOrMore = x: SMyInt | 6 <= x ghost witness 6
-  type SUnclearA = x: int | true ghost witness 0  // see note about for UnclearA
-  type SUnclearB = x | 6 <= x  // see note about for UnclearB
-
-  method M4(a: Sbyte, b: SMyInt, c: SSixOrMore, d: SAnotherSixOrMore, e: SMySixOrMore,
-            sua: SUnclearA, sub: SUnclearB) {
-    P<Sbyte>(a);
-    P<SMyInt>(b);
-    P<SSixOrMore>(c);  // error: type of argument is expected to support auto-initialization
-    P<SAnotherSixOrMore>(d);  // error: type of argument is expected to support auto-initialization
-    P<SMySixOrMore>(e);  // error: type of argument is expected to support auto-initialization
-    P<SUnclearA>(sua);  // error: as far as the resolver can tell, type of argument does not support auto-initialization
-    P<SUnclearB>(sub);  // fine, as far as the resolver can tell (but this would be caught later by the verifier)
-  }
-}
-abstract module ZI_RefinementAbstract {
-  type A0
-  type A1
-  type A2
-  type A3
-  type B0(0)
-  type B1(0)
-  type B2(0)
-  type B3(0)
-  type C0(00)
-  type C1(00)
-  type C2(00)
-  type C3(00)
-
-  method Delta<Q(0),W,E(0),R>()
-}
-module ZI_RefinementConcrete0 refines ZI_RefinementAbstract {
-  newtype Kuusi = x | 6 <= x witness 6  // supports auto-initialization
-  newtype Six = x | 6 <= x ghost witness 6  // does not support auto-initialization
-  newtype Sesis = x | 6 <= x witness *  // possibly empty
-  type A0 = int
-  type A1 = Kuusi
-  type A2 = Six
-  type A3 = Sesis
-  type B0 = int
-  type B1 = Kuusi
-  type B2 = Six  // error: RHS is expected to support auto-initialization
-  type B3 = Sesis  // error: RHS is expected to support auto-initialization
-  type C0 = int
-  type C1 = Kuusi
-  type C2 = Six
-  type C3 = Sesis  // error: RHS is expected to be nonempty
-}
-module ZI_ExportSource {
-  export
-    reveals RGB
-    provides XYZ
-  datatype RGB = Red | Green | Blue
-  datatype XYZ = X | Y | Z
-}
-
-module ZI_RefinementConcrete1 refines ZI_RefinementAbstract {
-  import Z = ZI_ExportSource
-
-  method P<G(0)>(g: G)
-  method M(m: Z.RGB, n: Z.XYZ) {
-    P(m);
-    P(n);  // error: Z.XYZ is not known to support auto-initialization
-  }
-
-  type A0
-  type A1(0)   // error: not allowed to change auto-initialization setting
-  type A2(00)  // error: not allowed to change nonempty setting
-  type B0      // error: not allowed to change auto-initialization setting
-  type B1(0)
-  type B2(00)  // error: not allowed to change auto-initialization setting
-  type C0      // error: not allowed to change nonempty setting
-  type C1(0)   // error: not allowed to change auto-initialization setting
-  type C2(00)
-
-  method Delta<
-    Q,  // error: not allowed to change auto-initialization setting
-    W,
-    E(0),
-    R(0)>()  // error: not allowed to change auto-initialization setting
-}
-
-// ----- constructor-less classes with need for initialization -----
-
-module ConstructorlessClasses {
-  class C<T(==)> {  // error: must have constructor
-    var x: int
-    var s: string
-    var t: set<T>
-    var u: T
-    const c: T
-  }
-
-  method Test()
-  {
-    var c := new C<set<real>>;
-    print "int: ", c.x, "\n";
-    print "string: ", c.s, "\n";
-    print "set<set<real>>: ", c.t, "\n";
-    print "real: ", c.u, "\n";
-    print "real: ", c.c, "\n";
-  }
-
-  codatatype Co<X> = Suc(Co<seq<X>>)  // does not know a known compilable value
-  codatatype Co2 = CoEnd | CoSuc(Co2)
-  trait Trait {
-    var co: Co<int>  // has no known initializer
-  }
-  class Class extends Trait {  // error: must have constructor, because of inherited field "co"
-  }
-
-  class CoClass0 {  // error: must have constructor
-    const co: Co<int>
-  }
-
-  class CoClass1 {  // fine
-    const co: Co2 := CoEnd
-  }
-
-  trait CoTrait {
-    const co: Co2 := CoEnd
-  }
-  class CoClass2 extends CoTrait {  // fine
-  }
-
-  iterator Iter<T>(u: T) yields (v: T)
-  {
-  }
-}
-
-module GhostWitness {
-  type BadGhost_EffectlessArrow<A,B> = f: A -> B
-    | true
-    witness (GhostEffectlessArrowWitness<A,B>)  // error: a ghost witness must use the keyword "ghost"
-
-  type GoodGhost_EffectlessArrow<A,B> = f: A -> B
-    | true
-    ghost witness (GhostEffectlessArrowWitness<A,B>)
-
-  ghost function GhostEffectlessArrowWitness<A,B>(a: A): B
-  {
-    var b: B :| true; b
-  }
-}
-
-module BigOrdinalRestrictions {  // also see BigOrdinalRestrictionsExtremePred below
-  method Test() {
-    var st: set<ORDINAL>;  // error: cannot use ORDINAL as type argument
-    var p: (int, ORDINAL);  // error: cannot use ORDINAL as type argument
-    var o: ORDINAL;  // okay
-    ghost var f := F(o);  // error: cannot use ORDINAL as type argument
-    f := F'<ORDINAL>();  // error: cannot use ORDINAL as type argument
-    f := F'<(char,ORDINAL)>();  // error: cannot use ORDINAL as type argument
-    var lambda := F'<ORDINAL>;  // error: cannot use ORDINAL as type argument
-    ParameterizedMethod(o);  // error: cannot use ORDINAL as type argument
-    assert forall r: ORDINAL :: P(r);
-    assert forall r: (ORDINAL, int) :: F(r.1) < 8;
-    assert exists x: int, r: ORDINAL, y: char :: P(r) && F(x) == F(y);
-    var s := set r: ORDINAL | r in {};  // error: cannot use ORDINAL as type argument (to set)
-    var s' := set r: ORDINAL | true :: 'G';
-    ghost var m := imap r: ORDINAL :: 10;
-    var sq := [o, o];  // error: cannot use ORDINAL as type argument (to seq)
-    var mp0 := map[o := 'G'];  // error: cannot use ORDINAL as type argument (to map)
-    var mp1 := map['G' := o];  // error: cannot use ORDINAL as type argument (to map)
-    var w := var h: ORDINAL := 100; h + 40;  // okay
-    var w': (int, ORDINAL);  // error: cannot use ORDINAL as type argument
-    var u: ORDINAL :| u == 15;
-    var ti: ORDINAL :| assume true;
-    var u': (ORDINAL, int) :| u' == (15, 15);  // error (x2): ORDINAL cannot be a type argument
-    var ti': (ORDINAL, ORDINAL) :| assume true;  // error (x4): ORDINAL cannot be a type argument
-    var lstLocal := var lst: ORDINAL :| lst == 15; lst;
-    var lstLocal' := var lst: (ORDINAL, int) :| lst == (15, 15); lst.1;  // error: ORDINAL cannot be a type argument
-    if yt: ORDINAL :| yt == 16 {
-      ghost var pg := P(yt);
-    }
-    if {
-      case zt: ORDINAL :| zt == 180 =>
-        ghost var pg := P(zt);
-    }
-    forall om: ORDINAL  // allowed
-      ensures om < om+1
-    {
-    }
-    var arr := new int[23];
-    forall om: ORDINAL | om == 11  // allowed
-    {
-      arr[0] := 0;
-    }
-  }
-  ghost function F<G>(g: G): int
-  ghost function F'<G>(): int
-  method ParameterizedMethod<G>(g: G)
-  ghost predicate P(g: ORDINAL)
-}
-
-module IteratorDuplicateParameterNames {
-  // each of the following once caused a crash in the resolver
-  iterator MyIterX(u: char) yields (u: char)  // error: duplicate name "u"
-  iterator MyIterY(us: char) yields (u: char)  // error: in-effect-duplicate name "us"
-}
-
-module TernaryTypeCheckinngAndInference {
-  codatatype Stream = Cons(int, Stream)
-
-  method M(k: nat, K: ORDINAL, A: Stream, B: Stream)
-    requires A == B
-  {
-    // all of the following are fine
-    assert A ==#[k] B;
-    assert A ==#[K] B;
-    assert A ==#[3] B;
-    var b;
-    assert A ==#[b] B;
-  }
-}
-
-module DontQualifyWithNonNullTypeWhenYouMeanAClass {
-  module Z {
-    class MyClass {
-      static const g := 100
-    }
-    method M0() {
-      var x := MyClass?.g;  // error: use MyClass, not MyClass?
-      assert x == 100;
-    }
-    method M1() {
-      var x := MyClass.g;  // that's it!
-      assert x == 100;
-    }
-    method P(from: MyClass) returns (to: MyClass?) {
-      to := from;
-    }
-    method Q() {
-      var x := MyClass;  // error: type used as variable
-      var y := MyClass?;  // error: type used as variable
-    }
-  }
-
-  module A {
-    class MyClass {
-      static const g := 100
-    }
-  }
-
-  module B {
-    import A
-    method M0() {
-      var x := A.MyClass?.g;  // error: use MyClass, not MyClass?
-      assert x == 100;
-    }
-    method M1() {
-      var x := A.MyClass.g;  // that's it!
-      assert x == 100;
-    }
-    method P(from: A.MyClass) returns (to: A.MyClass?) {
-      to := from;
-    }
-    method Q() {
-      var x := A.MyClass;  // error: type used as variable
-      var y := A.MyClass?;  // error: type used as variable
-    }
-  }
-}
-
-module UninterpretedModuleLevelConst {
-  type Six = x | 6 <= x witness 6
-  type Odd = x | x % 2 == 1 ghost witness 7
-  const S: Six  // fine
-  const X: Odd  // error: the type of a non-ghost static const must have a known initializer
-
-  class MyClass { }
-  const Y: MyClass  // error: the type of a non-ghost static const must have a known (non-ghost) initializer
-  ghost const Y': MyClass  // error: the type of a ghost static const must be known to be nonempty
-
-  class AnotherClass {  // fine, the class itself is not required to have a constructor, because the bad fields are static
-    static const k := 18
-    static const W: MyClass  // error: the type of a non-ghost static const must have a known (non-ghost) initializer
-    static const U: Six  // fine, since Six has a non-ghost witness and thus has a known initializer
-    static const O: Odd  // error: the type of a non-ghost static const must have a known initializer
-    const u: Six
-  }
-
-  trait Trait {
-    static const k := 18
-    static const W: MyClass  // error: the type of a non-ghost static const must have a known (non-ghost) initializer
-    static const U: Six  // fine, since Six has a non-ghost witness and thus has a known initializer
-    static const O: Odd  // error: the type of a non-ghost static const must have a known initializer
-  }
-  class ClassyTrait extends Trait {  // fine, since the bad fields in Trait are static
-  }
-
-  trait InstanceConst {
-    const w: MyClass
-  }
-  class Instance extends InstanceConst {  // error: because of "w", must declare a constructor
-  }
-
-  trait GhostTr {
-    ghost const w: MyClass  // the responsibility to initialize "w" lies with any class that implements "GhostTr"
-  }
-  class GhostCl extends GhostTr {  // error: w and z need initialization, so GhostCl must have a constructor
-    ghost const z: MyClass
-  }
-}
-
-module NonThisConstAssignments {
-  const X: int
-
-  class Cla {
-    constructor () {
-      X := 15;  // error: can never assign to static const (this used to crash)
-      Clb.Y := 15;  // error: can never assign to static const (this used to crash)
-    }
-  }
-
-  class Clb {
-    static const Y: int
-    constructor () {
-      Y := 15;  // error: cannot ever assign to a static const (this used to crash)
-    }
-  }
-
-  class Clc {
-    const Z: int
-    constructor (c: Clc) {
-      c.Z := 15;  // error: can assign to const only for 'this' (this used to crash)
-    }
-  }
-
-  class Cld {
-    const Z: int
-    constructor () {
-      Z := 15;
-    }
-  }
-}
-
-module ConstGhostRhs {
-  class S {
-    const m: int := n  // error: use of ghost to assign non-ghost field
-    ghost const n: int
-  }
-  const a: int := b  // error: use of ghost to assign non-ghost field
-  ghost const b: int
-
-  class S' {
-    ghost const m': int := n'
-    const n': int
-  }
-  ghost const a': int := b'
-  const b': int
-
-}
-
-module Regression15 {
-  predicate F(i: int, j: int) { true }
-  function S(i: int): set<int> { {i} }
-  method M0() returns (b: bool) {
-    b := forall i, j | j <= i <= 100 && i <= j < 100 :: true;  // error: this bogus cyclic dependency was once allowed
-  }
-  method M4() returns (b: bool) {
-    b := forall i, j :: j <= i < 100 && j in S(i) ==> F(i,j);  // error: this bogus cyclic dependency was once allowed
-  }
-}
-
-module AllocDepend0a {
-  class Class {
-    const z := if {} == set c: Class | true then 5 else 4  // error: condition depends on alloc (also not compilable, but that's not reported in the same pass)
-  }
-  const y := if {} == set c: Class | true then 5 else 4  // error: condition depends on alloc (also not compilable, but that's not reported in the same pass)
-  newtype byte = x | x < 5 || {} == set c: Class | true  // error: condition not allowed to depend on alloc
-  type small = x | x < 5 || {} == set c: Class | true  // error: condition not allowed to depend on alloc
-}
-module AllocDepend0b {
-  class Class { }
-  method M() returns (y: int, z: int) {
-    z := if {} == set c: Class | true then 5 else 4; // error: not compilable
-    y := if {} == set c: Class | true then 5 else 4; // error: not compilable
-  }
-}
-module AllocDepend1 {
-  class Class { }
-  predicate P(x: int) {
-    x < 5 || {} == set c: Class | true  // error: function not allowed to depend on alloc
-  }
-}
-
-module AllocDepend2 {
-  class Klass {
-    const z := if exists k: Klass :: allocated(k) then 3 else 4  // error (x2): condition depends on alloc
-  }
-  const y := if exists k: Klass :: allocated(k) then 3 else 4  // error (x2): condition depends on alloc
-  newtype byte = x | x < 5 || exists k: Klass :: allocated(k)  // error: condition not allowed to depend on alloc
-  type small = x | x < 5 || exists k: Klass :: allocated(k)  // error: condition not allowed to depend on alloc
-}
-module AllocDepend3 {
-  class Klass { }
-  predicate P(x: int) {
-    x < 5 || exists k: Klass :: allocated(k)  // error: function not allowed to depend on alloc
-  }
-}
-
-module AllocDepend4 {
-  class Xlass {
-    const z := if var k: Xlass? := null; allocated(k) then 3 else 4  // error (x2): condition depends on alloc
-  }
-  const y := if var k: Xlass? := null; allocated(k) then 3 else 4  // error (x2): condition depends on alloc
-  newtype byte = x | x < 5 || var k: Xlass? := null; allocated(k)  // error: condition not allowed to depend on alloc
-  type small = x | x < 5 || var k: Xlass? := null; allocated(k)  // error: condition not allowed to depend on alloc
-}
-module AllocDepend5 {
-  class Xlass { }
-  predicate P(x: int) {
-    x < 5 || var k: Xlass? := null; allocated(k)  // error: function not allowed to depend on alloc
-  }
-}
-
-module AbstemiousCompliance {
-  codatatype EnormousTree<X> = Node(left: EnormousTree, val: X, right: EnormousTree)
-
-  ghost function {:abstemious} Five(): int {
-    5  // error: an abstemious function must return with a co-constructor
-  }
-
-  ghost function {:abstemious} Id(t: EnormousTree): EnormousTree
-  {
-    t  // to be abstemious, a parameter is as good as a co-constructor
-  }
-
-  ghost function {:abstemious} IdGood(t: EnormousTree): EnormousTree
-  {
-    match t
-    case Node(l, x, r) => Node(l, x, r)
-  }
-
-  ghost function {:abstemious} AlsoGood(t: EnormousTree): EnormousTree
-  {
-    Node(t.left, t.val, t.right)
-  }
-
-  ghost function {:abstemious} UniformTree<X>(x: X): EnormousTree<X>
-  {
-    Node(UniformTree(x), x, UniformTree(x))
-  }
-
-  ghost function {:abstemious} AlternatingTree<X>(x: X, y: X): EnormousTree<X>
-  {
-    Node(AlternatingTree(y, x), x, AlternatingTree(y, x))
-  }
-
-  ghost function {:abstemious} AnotherAlternatingTree<X>(x: X, y: X): EnormousTree<X>
-  {
-    var t := Node(AlternatingTree(x, y), y, AlternatingTree(x, y));
-    Node(t, x, t)
-  }
-
-  ghost function {:abstemious} NonObvious<X>(x: X): EnormousTree<X>
-  {
-    AlternatingTree(x, x)  // error: does not return with a co-constructor
-  }
-
-  ghost function {:abstemious} BadDestruct(t: EnormousTree): EnormousTree
-  {
-    Node(t.left, t.val, t.right.right)  // error: cannot destruct t.right
-  }
-
-  ghost function {:abstemious} BadMatch(t: EnormousTree): EnormousTree
-  {
-    match t.right  // error: cannot destruct t.right
-    case Node(a, x, b) =>
-      Node(a, x, b)
-  }
-
-  ghost function {:abstemious} BadEquality(t: EnormousTree, u: EnormousTree, v: EnormousTree): EnormousTree
-  {
-    if t == u then  // error: cannot co-compare
-      Node(t.left, t.val, t.right)
-    else if u != v then  // error: cannot co-compare
-      Node(u.left, u.val, u.right)
-    else
-      Node(v.left, v.val, v.right)
-  }
-
-  ghost function {:abstemious} Select(b: bool, t: EnormousTree, u: EnormousTree): EnormousTree
-  {
-    if b then t else u  // abstemious yes: parameters are as good as a co-constructors
-  }
-
-  ghost function {:abstemious} Select'(b: bool, t: EnormousTree, u: EnormousTree): EnormousTree
-  {
-    if b then
-      Node(t.left, t.val, t.right)  // fine, too
-    else
-      Node(u.left, u.val, u.right)  // fine, too
-  }
-}
-
-module BigOrdinalRestrictionsExtremePred {
-  least predicate Test() {
-    var st: set<ORDINAL> := {};  // error: cannot use ORDINAL as type argument
-    var p: (int, ORDINAL) := (0,0);  // error: cannot use ORDINAL as type argument
-    var o: ORDINAL := 0;  // okay
-    ghost var f := F(o);  // error: cannot use ORDINAL as type argument
-    var f := F'<ORDINAL>();  // error: cannot use ORDINAL as type argument
-    var f := F'<(char,ORDINAL)>();  // error: cannot use ORDINAL as type argument
-    var lambda := F'<ORDINAL>;  // error: cannot use ORDINAL as type argument
-    ParameterizedLemma(o);  // error: cannot use ORDINAL as type argument
-    assert forall r: ORDINAL :: P(r);  // error: cannot quantify over ORDINAL here
-    assert forall r: (ORDINAL, int) :: F(r.1) < 8;  // error: cannot quantify over ORDINAL here
-    assert exists x: int, r: ORDINAL, y: char :: P(r) && F(x) == F(y);  // error: cannot quantify over ORDINAL here
-    var s := set r: ORDINAL | r in {};  // error (x2): cannot use ORDINAL as type argument (to set)
-    var s' := set r: ORDINAL | true :: 'G';  // error: cannot use ORDINAL here
-    ghost var m := imap r: ORDINAL :: 10;  // error (x2): cannot use ORDINAL here
-    var sq := [o, o];  // error: cannot use ORDINAL as type argument (to seq)
-    var mp0 := map[o := 'G'];  // error: cannot use ORDINAL as type argument (to map)
-    var mp1 := map['G' := o];  // error: cannot use ORDINAL as type argument (to map)
-    var w := var h: ORDINAL := 100; h + 40;  // okay
-    var w': (int, ORDINAL) := (8,8);  // error: cannot use ORDINAL as type argument
-    var u: ORDINAL :| u == 15;
-    var ti: ORDINAL :| true;
-    var u': (ORDINAL, int) :| u' == (15, 15);  // error (x2): ORDINAL cannot be a type argument
-    var ti': (ORDINAL, ORDINAL) :| true;  // error (x2): ORDINAL cannot be a type argument
-    var lstLocal := var lst: ORDINAL :| lst == 15; lst;
-    var lstLocal' := var lst: (ORDINAL, int) :| lst == (15, 15); lst.1;  // error: ORDINAL cannot be a type argument
-    var gr := if yt: ORDINAL :| yt == 16 then
-      ghost var pg := P(yt); 5
-    else
-      7;
-    calc {
-      100;
-    ==  {
-          forall om: ORDINAL  // allowed
-            ensures om < om+1
-          {
-          }
-        }
-      100;
-    }
-    true
-  }
-  ghost function F<G>(g: G): int
-  ghost function F'<G>(): int
-  lemma ParameterizedLemma<G>(g: G)
-  ghost predicate P(g: ORDINAL)
-}
-
-// ----- label domination -----
-
-module LabelDomination {
-  method DuplicateLabels(n: int) {
-    var x;
-    if (n < 7) {
-      label L: x := x + 1;
-    } else {
-      label L: x := x + 1;
-    }
-    assert old@L(true);  // error: L is not available here
-    label L: x := x + 1;
-    assert old@L(true);
-    label L: x := x + 1;  // error: duplicate label
-    assert old@L(true);
-
-    {
-      label K:
-      x := x + 1;
-    }
-    assert old@K(true);
-    label K:  // error: duplicate label
-    assert old@K(true);
-  }
-
-  datatype Color = A | B | C
-  method Branches(n: int, c: Color) {
-    var x: int;
-    if n < 2 {
-      label X: x := x + 1;
-    } else if n < 4 {
-      label X: x := x + 1;
-    } else {
-      label X: x := x + 1;
-    }
-    if * {
-      label X: x := x + 1;
-    } else {
-      label X: x := x + 1;
-    }
-
-    if {
-      case true =>
-        label X: x := x + 1;
-      case true =>
-        label X: x := x + 1;
-    }
-
-    var i := 0;
-    while i < x {
-      label X: x := x + 1;
-      i := i + 1;
-    }
-
-    i := 0;
-    while {
-      case i < x =>
-        label X: x := x + 1;
-        i := i + 1;
-      case i < x =>
-        label X: x := x + 1;
-        i := i + 1;
-    }
-
-    match c {
-      case A =>
-        label X: x := x + 1;
-      case B =>
-        label X: x := x + 1;
-      case C =>
-        label X: x := x + 1;
-    }
-
-    label X: x := x + 1;  // all okay
-  }
-
-  method A0() {
-    label Q:
-    assert true;
-  }
-  method A1() {
-    label Q:
-    assert true;
-  }
-
-  class MyClass {
-    var x: int
-    method LabelNotInScope_Old(y: int) {
-      label GoodLabel:
-      if y < 5 {
-        label Treasure:
-        assert true;
-      }
-      assert old(x) == old@Treasure(x);  // error: no label Treasure in scope
-      assert 10 == old@WonderfulLabel(x);  // error: no label WonderfulLabel in scope
-      assert old(x) == old@GoodLabel(x);
-      assert old(x) == old@FutureLabel(x);  // error: no label FutureLabel in scope
-      label FutureLabel: {}
-    }
-    method LabelNotInScope_Unchanged(y: int) {
-      label GoodLabel:
-      if y < 5 {
-        label Treasure:
-        assert true;
-      }
-      assert unchanged@Treasure(`x);  // error: no label Treasure in scope
-      assert unchanged@WonderfulLabel(this);  // error: no label WonderfulLabel in scope
-      assert unchanged@GoodLabel(this);
-      assert unchanged@FutureLabel(this);  // error: no label FutureLabel in scope
-      label FutureLabel: {}
-    }
-    method LabelNotInScope_Fresh(y: int, c: MyClass) {
-      label GoodLabel:
-      if y < 5 {
-        label Treasure:
-        assert true;
-      }
-      assert fresh@Treasure(c);  // error: no label Treasure in scope
-      assert fresh@WonderfulLabel(c);  // error: no label WonderfulLabel in scope
-      assert fresh@GoodLabel(c);
-      assert fresh@FutureLabel(c);  // error: no label FutureLabel in scope
-      label FutureLabel: {}
-    }
-  }
-}
-
-// ----- bad use of types without auto-initializers -----
-
-module Initialization {
-  datatype Yt<Y> = MakeYt(x: int, y: Y)
-  type Even = x | x % 2 == 0
-  type Odd = x | x % 2 == 1 witness 17
-  type GW = x | x % 2 == 1 ghost witness 17
-  method DefiniteAssignmentViolation() returns (e: Yt<Even>, o: Yt<Odd>, g: Yt<GW>)
-  {
-  }  // no resolution errors (but verification errors, see NonZeroInitialization.dfy)
-  method ArrayElementInitViolation() returns (e: array<Yt<Even>>, o: array<Yt<Odd>>, g: array<Yt<GW>>)
-  {
-    e := new Yt<Even>[20];
-    o := new Yt<Odd>[20];
-    g := new Yt<GW>[20];
-  }  // no resolution errors (but verification errors, see NonZeroInitialization.dfy)
-  method GimmieOne<G(0)>() returns (g: G)
-  {
-  }
-  method TypeParamViolation() returns (e: Yt<Even>, o: Yt<Odd>, g: Yt<GW>)
-  {
-    e := GimmieOne<Yt<Even>>();
-    o := GimmieOne<Yt<Odd>>();
-    g := GimmieOne<Yt<GW>>();  // error: cannot pass Yt<GW> to a (0)-parameter
-  }
-}
-
-// ----------------- regression tests ----------------------------------------------------
-
-module FreshTypeInferenceRegression {
-  class MyClass {
-    method M(N: nat)
-    {
-      var i, os := 0, {};
-      while i < N
-        invariant fresh(os)
-        invariant forall o :: o in os ==> fresh(o.inner)  // error: type of "o" not yet known (this once caused a crash)
-      {
-        var o := new Outer();
-        os, i := os + {o}, i + 1;
-      }
-    }
-  }
-
-  class Outer {
-    const inner: Inner
-    constructor ()
-      ensures fresh(inner)
-    {
-      inner := new Inner();
-    }
-  }
-
-  class Inner {
-    constructor ()
-  }
-}
-
-module RegressionTest {
-  class Cache<X> {
-    method Lookup(K: X) returns (V: X)
-    {
-      V := Cache[K];  // error: Cache is not a field but a type
-    }
-  }
-}
-
-module ExistsImpliesWarning {
-  method M(a: array<int>, b: array<int>)
-    requires a.Length == b.Length
-    requires exists i :: 0 <= i < a.Length ==> a[i] == b[i]  // warning
-    requires exists i :: true && (0 <= i < a.Length ==> a[i] == b[i])
-    requires exists i :: (0 <= i < a.Length ==> a[i] == b[i])
-    requires exists i | 0 <= i < a.Length :: true ==> a[i] == b[i]
-    requires exists i | 0 <= i < a.Length :: a[i] == b[i]
-    requires exists i | 0 <= i < a.Length ==> a[i] == b[i] :: true
-    requires exists i :: !(0 <= i < a.Length) || a[i] == b[i]
-    requires exists i :: a[i] == b[i] <== 0 <= i < a.Length  // warning
-    requires exists i :: !(0 <= i < a.Length && a[i] != b[i])
-    requires exists i :: 0 <= i < a.Length && a[i] == b[i]
-    requires exists i :: true ==> (0 <= i < a.Length && a[i] == b[i])  // warning
-  {
-  }
-
-  method N(a: array<int>, b: array<int>)
-    requires a.Length == b.Length
-    requires forall i :: 0 <= i < a.Length ==> a[i] == b[i]
-    requires forall i :: true && (0 <= i < a.Length ==> a[i] == b[i])
-    requires forall i :: (0 <= i < a.Length ==> a[i] == b[i])
-    requires forall i | 0 <= i < a.Length :: true ==> a[i] == b[i]
-    requires forall i | 0 <= i < a.Length :: a[i] == b[i]
-    requires forall i | 0 <= i < a.Length ==> a[i] == b[i] :: true
-    requires forall i :: !(0 <= i < a.Length) || a[i] == b[i]
-    requires forall i :: a[i] == b[i] <== 0 <= i < a.Length
-    requires forall i :: !(0 <= i < a.Length && a[i] != b[i])
-    requires forall i :: 0 <= i < a.Length && a[i] == b[i]
-    requires forall i :: true ==> (0 <= i < a.Length && a[i] == b[i])
-  {
-  }
-}
-
-// --------------- ghost (regression) tests, receivers -------------------------------------
-
-module GhostReceiverTests {
-  class C {
-    ghost function F(x: int): int { 3 }
-    function G(x: int): int { 4 }
-    lemma L(x: int) { }
-    method M(x: int) { }
-  }
-  method Caller(x: int, ghost z: int, c: C, ghost g: C) {
-    {
-      var y;
-      y := c.F(x);  // error: LHS is non-ghost, so RHS cannot use ghost function F
-      y := g.F(x);  // error: LHS is non-ghost, so RHS cannot use ghost function F
-      y := c.G(x);
-      y := g.G(x);  // error: LHS is non-ghost, so RHS cannot use ghost variable g
-    }
-    {
-      // all of the these are fine, because: the LHS is ghost and, therefore, the whole statement is
-      ghost var y;
-      y := c.F(x);
-      y := g.F(x);
-      y := c.G(x);
-      y := g.G(x);
-    }
-    {
-      // all of the these are fine, because: the LHS is ghost and, therefore, the whole statement is
-      ghost var y;
-      y := c.F(z);
-      y := g.F(z);
-      y := c.G(z);
-      y := g.G(z);
-    }
-    c.L(x);
-    g.L(x);
-    c.M(x);
-    g.M(x);  // error: cannot pass ghost receiver to compiled method
-  }
-}
-
-// --------------- ghost RHS of constants (regression) tests -------------------------------------
-
-module GhostRhsConst {
-  class C {
-    ghost function F(n: nat): nat { n }  // a ghost function
-    static ghost function G(n: nat): nat { n }  // a ghost function
-    const b := F(0)  // error: RHS uses a ghost function
-    static const u := G(0)  // error: RHS uses a ghost function
-  }
-
-  trait R {
-    ghost function F(n: nat): nat { n }  // a ghost function
-    static ghost function G(n: nat): nat { n }  // a ghost function
-    const b := F(0)  // error: RHS uses a ghost function
-    static const u := G(0)  // error: RHS uses a ghost function
-  }
-}
-
-// --------------- errors from nested modules -------------------------------------
-
-module ErrorsFromNestedModules {
-  method M() {
-    U.V.Test();
-    UU.V.Test();
-  }
-
-  module U {  // regression test: since U is rather empty, this had once caused an error
-    module V {
-      method Test() {
-      }
-      module W {
-        const x1 := 12 * false  // error: bad types
-      }
-    }
-  }
-
-  module UU.V {  // same regression as above
-    method Test() {
-    }
-    module W {
-      const x1 := 12 * false  // error: bad types
-    }
-  }
-}
-
-// --------------- name clashes related to prefix-named modules -------------------------------------
-
-module NameClashes {
-  module U.G {
-  }
-  module U {
-    class G { }  // error: duplicate name: G
-    class H { }
-  }
-  module U.H {  // error: duplicate name: H
-  }
-}
-
-// --------------- regression ghost tests -------------------------------------
-
-module RegressionGhostTests {
-  class Cell {
-    var data: int
-  }
-
-  method field(x: Cell)
-    modifies x
-  {
-    ghost var y := x;
-    x.data := 42;
-    y.data := 42;  // error: assignment to non-ghost field depends on a ghost
-    (assert x == y; x).data := 42;
-    (assert x == y; y).data := 42;  // error: assignment to non-ghost field depends on a ghost
-  }
-
-  method arr(a: array<int>)
-    requires 5 < a.Length
-    modifies a
-  {
-    ghost var b := a;
-    ghost var i := 5;
-    a[i] := 42;  // error: assignment to non-ghost field depends on a ghost
-    b[5] := 42;  // error: assignment to non-ghost field depends on a ghost
-  }
-
-  method arr2(a: array2<int>)
-    requires 5 < a.Length0 && 5 < a.Length1
-    modifies a
-  {
-    ghost var b := a;
-    ghost var i := 5;
-    a[i,5] := 42;  // error: assignment to non-ghost field depends on a ghost
-    a[5,i] := 42;  // error: assignment to non-ghost field depends on a ghost
-    b[5,5] := 42;  // error: assignment to non-ghost field depends on a ghost
-  }
-}
-
-// --------------- regression test const in frame expression ------------------------------
-
-module RegressionConstFrameExpression {
-  class C {
-    const x: int
-    var y: int
-  }
-  method m(c: C)
-    modifies c`x
-    modifies c`y
-    ensures unchanged(c`x)
-    ensures unchanged(c)
-  {
-
-  }
-}
-
-// --------------- change in language semantics to forbid !! on maps ------------------------------
-
-module MapDisjointnessNoMore {
-  method M<X,Y>(a: map, b: map) {
-    assert a !! b;  // error: !! is (no longer) support on maps
-    assert a.Keys !! b.Keys;  // instead, this is the way to do it
-  }
-}
-
-// --------------- expect statements ------------------------------
-
-module ExpectStatements {
-
-  ghost function UnsafeDivide(a: int, b: int): int {
-    expect b != 0;  // expect statement is not allowed in this context
-    a / b
-  }
-
-  method M() {
-    ghost var g := 5;
-    expect forall i : int :: i == i;  // error: quantifiers in non-ghost contexts must be compilable
-    expect false, if g == 5 then "boom" else "splat"; // error: ghost variables are allowed only in specification contexts
-  }
-}
-
-// --------------- type-parameter scopes ------------------------------
-
-module TypeParameterScopes {
-  class C<X> {
-    function G(): X
-    method M<X>(f: X) {
-      var h: X := f;
-      var k: X := G();  // error: this is the wrong X
-    }
-    function F<X>(f: X): int {
-      var h: X := f;
-      var k: X := G();  // error: this is the wrong X
-      10
-    }
-  }
-}
-
-// --------------- type of function members (regression tests) ------------------------------
-
-module TypeOfFunctionMember {
-  ghost function Fo<X>(x: X): int
-
-  lemma M() {
-    // Both of the following once crashed the type checker
-    var rd := Fo<real>.reads;
-    var rq := Fo<real>.requires;
-  }
-}
-
-// --------------- update operations ------------------------------
-
-module CollectionUpdates {
-  // Update operations on collections must have the right types, modulo subset types.
-  // For verification errors, see Maps.dfy.
-  trait Trait { }
-  class Elem extends Trait { }
-
-  method UpdateValiditySeq(d: Trait, e: Elem) {
-    var s: seq<Elem> := [e, e, e, e, e];
-    s := s[1 := d];  // error: d is not an Elem (and is not a subset type of it, either)
-  }
-  method UpdateValidityMultiset(d: Trait) {
-    var s: multiset<Elem>;
-    s := s[d := 5];  // error: element value is not a Elem
-  }
-  method UpdateValidityMap(d: Trait, e: Elem) {
-    var m: map<Elem, Elem>;
-    if * {
-      m := m[d := e];  // error: key is not a Elem
-    } else {
-      m := m[e := d];  // error: value is not a Elem
-    }
-  }
-}
-
-// --------------- update operations ------------------------------
-
-module MoreAutoInitAndNonempty {
-  type A(0)
-  type B(00)
-  type C
-
-  method Q<F(0)>(f: F)
-  method P<G(00)>(g: G)
-  method R<H>(h: H)
-
-  function FQ<F(0)>(f: F): int
-  function FP<G(00)>(g: G): int
-  function FR<H>(h: H): int
-
-  method M<X(0), Y(00), Z>(x: X, y: Y, z: Z)
-  {
-    Q(x);
-    P(x);
-    R(x);
-    Q(y);  // error: auto-init mismatch
-    P(y);
-    R(y);
-    Q(z);  // error: auto-init mismatch
-    P(z);  // error: auto-init mismatch
-    R(z);
-  }
-
-  method N<X(0), Y(00), Z>(x: X, y: Y, z: Z) returns (u: int)
-  {
-    u := FQ(x);
-    u := FP(x);
-    u := FR(x);
-    u := FQ(y);  // error: auto-init mismatch
-    u := FP(y);
-    u := FR(y);
-    u := FQ(z);  // error: auto-init mismatch
-    u := FP(z);  // error: auto-init mismatch
-    u := FR(z);
-  }
-}
-
-// --------------- ghost function error messages ------------------------------
-
-module GhostFunctionErrorMessages {
-  ghost function GhostFunction(): int
-  ghost predicate GhostPredicate()
-  least predicate LeastPredicate()
-  greatest predicate GreatestPredicate()
-  twostate function TwoFunction(): int
-  twostate predicate TwoPredicate()
-
-  method GhostsUsedInCompiledContexts() {
-    var x, b;
-    x := GhostFunction(); // error
-    b := GhostPredicate(); // error
-    b := LeastPredicate(); // error
-    b := GreatestPredicate(); // error
-    x := TwoFunction(); // error
-    b := TwoPredicate(); // error
-  }
-}
-
-module TypeParameterCount {
-  ghost function F0(): int
-  ghost function F1<A>(): int
-  ghost function F2<A, B>(): int
-  method M0()
-  method M1<A>()
-  method M2<A, B>()
-
-  method TestFunction() {
-    var x;
-    x := F0();
-    x := F1();  // type argument inferred
-    x := F2();  // type arguments inferred
-    x := F0<int>();  // error: wrong number of type parameters
-    x := F1<int>();
-    x := F2<int>();  // error: wrong number of type parameters
-    x := F0<int, real>();  // error: wrong number of type parameters
-    x := F1<int, real>();  // error: wrong number of type parameters
-    x := F2<int, real>();
-  }
-
-  method TestMethods() {
-    M0();
-    M1();  // type argument inferred
-    M2();  // type arguments inferred
-    M0<int>();  // error: wrong number of type parameters
-    M1<int>();
-    M2<int>();  // error: wrong number of type parameters
-    M0<int, real>();  // error: wrong number of type parameters
-    M1<int, real>();  // error: wrong number of type parameters
-    M2<int, real>();
-  }
-}
-
-module AutoGhostRegressions {
-  datatype Quad<T, U> = Quad(0: T, 1: T, ghost 2: U, ghost 3: U)
-
-  method Test() {
-    var q := Quad(20, 30, 40, 50);
-    print q, "\n";
-
-    var Quad(a, b, c, d) := q;
-    print c, "\n";  // error: c is ghost (this was once not handled correctly)
-
-    match q {
-      case Quad(r, s, t, u) =>
-        print t, "\n";  // error: t is ghost
-    }
-
-    ghost var p := Quad(20, 30, 40, 50);
-    var Quad(a', b', c', d') := p;
-    print a', "\n";  // error: a' is ghost
-    print c', "\n";  // error: c' is ghost
-  }
-
-  datatype NoEquality = NoEquality(ghost u: int)
-  newtype NT = x | var s: set<NoEquality> := {}; |s| <= x  // fine, since constraint is a ghost context
-  type ST = x | var s: set<NoEquality> := {}; |s| <= x  // fine, since constraint is a ghost context
-}
-
-module TypeCharacteristicsInGhostCode {
-  function MustBeNonempty<T(00)>(): int { 5 }
-  function MustBeAutoInit<T(0)>(): int { 5 }
-  function MustSupportEquality<T(==)>(): int { 5 }
-  function NoReferences<T(!new)>(): int { 5 }
-
-  type PossiblyEmpty = x: int | true witness *
-  type Nonempty = x: int | true ghost witness 0
-  datatype NoEquality = NoEquality(ghost u: int)
-  class Class { }
-  type Good = bool
-
-  method TestCompiled<Z>()
-  {
-    var w;
-
-    w := MustBeNonempty<PossiblyEmpty>();  // error
-    w := MustBeNonempty<Nonempty>();
-    w := MustBeNonempty<NoEquality>();
-    w := MustBeNonempty<Class?>();
-    w := MustBeNonempty<Good>();
-    w := MustBeNonempty<Z>();  // error (a hint is given)
-
-    w := MustBeAutoInit<PossiblyEmpty>();  // error
-    w := MustBeAutoInit<Nonempty>();  // error
-    w := MustBeAutoInit<NoEquality>();
-    w := MustBeAutoInit<Class?>();
-    w := MustBeAutoInit<Good>();
-    w := MustBeAutoInit<Z>();  // error (a hint is given)
-
-    w := MustSupportEquality<PossiblyEmpty>();
-    w := MustSupportEquality<Nonempty>();
-    w := MustSupportEquality<NoEquality>();  // error
-    w := MustSupportEquality<Class?>();
-    w := MustSupportEquality<Good>();
-    w := MustSupportEquality<Z>();  // error (a hint is given)
-
-    w := NoReferences<PossiblyEmpty>();
-    w := NoReferences<Nonempty>();
-    w := NoReferences<NoEquality>();
-    w := NoReferences<Class?>();  // error
-    w := NoReferences<Good>();
-    w := NoReferences<Z>();  // error (a hint is given)
-  }
-
-  method TestGhost()
-  {
-    ghost var w;
-
-    w := MustBeNonempty<PossiblyEmpty>();  // error
-    w := MustBeNonempty<Nonempty>();
-    w := MustBeNonempty<NoEquality>();
-    w := MustBeNonempty<Class?>();
-    w := MustBeNonempty<Good>();
-
-    w := MustBeAutoInit<PossiblyEmpty>();  // error
-    w := MustBeAutoInit<Nonempty>();  // fine, because the call appears in a ghost context
-    w := MustBeAutoInit<NoEquality>();
-    w := MustBeAutoInit<Class?>();
-    w := MustBeAutoInit<Good>();
-
-    w := MustSupportEquality<PossiblyEmpty>();
-    w := MustSupportEquality<Nonempty>();
-    w := MustSupportEquality<NoEquality>();
-    w := MustSupportEquality<Class?>();
-    w := MustSupportEquality<Good>();
-
-    w := NoReferences<PossiblyEmpty>();
-    w := NoReferences<Nonempty>();
-    w := NoReferences<NoEquality>();
-    w := NoReferences<Class?>();  // error
-    w := NoReferences<Good>();
-  }
-
-  function FF(a: bool, ghost b: bool): int { 5 }
-  method MM(a: bool, ghost b: bool) { }
-  function GetInt<T(==)>(): int { 2 }
-  method GhostContexts<T>(x: T, y: T) {
-    var r;
-    r := FF(x == y, true);  // error: T must support equality
-    r := FF(true, x == y);  // no problem, since this is a ghost context
-    MM(x == y, true);  // error: T must support equality
-    MM(true, x == y);  // no problem, since this is a ghost context
-
-    r := FF(GetInt<NoEquality>() == 0, true);  // error: type argument must support equality
-    r := FF(true, GetInt<NoEquality>() == 0);  // okay, since this is a ghost context
-    MM(GetInt<NoEquality>() == 0, true);  // error: type argument must support equality
-    MM(true, GetInt<NoEquality>() == 0);  // okay, since this is a ghost context
-
-    var q0 := Quad(GetInt<NoEquality>() == 0, true, true, true);  // error: type argument must support equality
-    var q1 := Quad(true, true, GetInt<NoEquality>() == 0, true);  // fine, since in a ghost context
-  }
-
-  datatype Quad<T, U> = Quad(0: T, 1: T, ghost 2: U, ghost 3: U)
-  datatype QuadEq<T(==), U(==)> = QuadEq(0: T, 1: T, ghost 2: U, ghost 3: U)
-
-  method VarDecls<T>(x: T, y: T) {
-    var a := x == y;  // error: this requires T to support equality
-    ghost var b := x == y;  // fine
-
-    var q := Quad(x, y, x, y);
-    var Quad(k, l, m, n) := q;  // k,l are compiled; m,n are ghost
-    var c := k == l;  // error: this requires T to support equality
-    var d := m == n;  // fine, since d is implicitly ghost
-    d, c, d := m == n, k == l, m == n;  // error: "k == l" requires T to support equality
-
-    var q' := QuadEq([x], [x], [0], [0]);  // error: seq<T> requires T to support equality
-    var q'' := QuadEq([0], [0], [x], [x]); // error: seq<T> requires T to support equality
-  }
-
-  newtype NT = x | var s: set<NoEquality> := {}; |s| <= x  // fine, since constraint is a ghost context
-  type ST = x | var s: set<NoEquality> := {}; |s| <= x  // fine, since constraint is a ghost context
-
-  method LetVarDecls<T>(x: T, y: T) {
-    var lhs;
-    lhs :=
-      var a := x == y;  // error: this requires T to support equality
-      0;
-    lhs :=
-      ghost var b := x == y;  // fine
-      0;
-
-    var q := Quad(x, y, x, y);
-    var Quad(k, l, m, n) := q;  // k,l are compiled; m,n are ghost
-    lhs :=
-      var c := k == l;  // error: this requires T to support equality
-      0;
-    lhs :=
-      var d := m == n;  // fine, since d is implicitly ghost
-      0;
-
-    ghost var ghostLhs;
-    ghostLhs :=
-      var a := x == y;  // fine
-      0;
-    ghostLhs :=
-      ghost var b := x == y;  // fine
-      0;
-  }
-
-  datatype DatatypeHasMembersToo = Abc | Def {
-    method Test() {
-      var w;
-      w := MustBeNonempty<PossiblyEmpty>();  // error
-      w := MustBeAutoInit<PossiblyEmpty>();  // error
-      w := MustBeAutoInit<Nonempty>();  // error
-      w := MustSupportEquality<NoEquality>();  // error
-      w := NoReferences<Class?>();  // error
-    }
-  }
-
-  newtype NewtypeHasMembersToo = x: int | x == MustBeNonempty<PossiblyEmpty>()  // error: constraint has bad type instantiation
-    witness MustBeNonempty<PossiblyEmpty>()  // error: witness expression has bad type instantiation
-  {
-    method Test() {
-      var w;
-      w := MustBeNonempty<PossiblyEmpty>();  // error
-      w := MustBeAutoInit<PossiblyEmpty>();  // error
-      w := MustBeAutoInit<Nonempty>();  // error
-      w := MustSupportEquality<NoEquality>();  // error
-      w := NoReferences<Class?>();  // error
-    }
-  }
-
-  type SubsetTypeHasExpressionToo = x: int | x == MustBeNonempty<PossiblyEmpty>()  // error: constraint has bad type instantiation
-    witness MustBeNonempty<PossiblyEmpty>()  // error: witness expression has bad type instantiation
-
-  newtype NT_CompiledWitness = x | 0 <= x
-    witness MustSupportEquality<NoEquality>()  // error
-  newtype NT_GhostWitness = x | 0 <= x
-    ghost witness MustSupportEquality<NoEquality>()  // fine, since it's ghost
-  type ST_CompiledWitness = x | 0 <= x
-    witness MustSupportEquality<NoEquality>()  // error
-  type ST_GhostWitness = x | 0 <= x
-    ghost witness MustSupportEquality<NoEquality>()  // fine, since it's ghost
-
-  trait
-    {:MyAttribute MustSupportEquality<NoEquality>(), MustBeNonempty<PossiblyEmpty>()}  // error: about MustBeNonempty (no prob with (==))
-    MyTrait
-  {
-    const x := (CallMyLemma(MustSupportEquality<NoEquality>(), MustBeNonempty<PossiblyEmpty>()); 23)  // error: about MustBeNonempty (no prob with (==))
-  }
-  lemma CallMyLemma(x: int, y: int)
-}
-
-module MoreAutoGhostTests {
-  datatype Quad<T, U> = Quad(0: T, 1: T, ghost 2: U, ghost 3: U)
-
-  method SomeLetVarsAreGhost0(q: Quad<int, int>) returns (r: int) {
-    r :=
-      var Quad(k, l, m, n) := q;  // k,l are compiled; m,n are ghost
-      k + l;
-  }
-
-  method SomeLetVarsAreGhost1(q: Quad<int, int>) returns (r: int) {
-    r :=
-      var Quad(k, l, m, n) := q;  // k,l are compiled; m,n are ghost
-      m;  // error: m is ghost
-  }
-
-  method AssignSuchThat(ghost m: int) {
-    var d :| d == m;  // error: LHS is not inferred to be ghost for :|
-  }
-
-  function LetSuchThat(ghost m: int): int {
-    var d :| d == m;  // error: LHS is not inferred to be ghost for :|
-    0
-  }
-}
-
-module RelaxedAutoInitChecking {
-  // In a ghost context, the (==) is never relevant. Therefore, checking of adherence to (==) for
-  // type arguments is suppressed in ghost contexts.
-  // Similarly, in a ghost context, there's no difference between (0) and (00). Therefore, a
-  // formal parameter that expects (0) can take either a (0) or a (00) in a ghost context.
-
-  function MustBeNonempty<T(00)>(): int { 5 }
-  function MustBeAutoInit<T(0)>(): int { 5 }
-  function MustSupportEquality<T(==)>(): int { 5 }
-  function NoReferences<T(!new)>(): int { 5 }
-
-  type PossiblyEmpty = x: int | true witness *
-  type Nonempty = x: int | true ghost witness 0
-  datatype NoEquality = NoEquality(ghost u: int)
-  class Class { }
-  type Good = bool
-
-  method M(compiledValue: int, ghost ghostValue: int)
-
-  method TestCompiled()
-  {
-    M(MustBeNonempty<PossiblyEmpty>(), 0);  // error
-    M(MustBeNonempty<Nonempty>(), 0);
-    M(MustBeNonempty<NoEquality>(), 0);
-    M(MustBeNonempty<Class?>(), 0);
-    M(MustBeNonempty<Good>(), 0);
-
-    M(MustBeAutoInit<PossiblyEmpty>(), 0);  // error
-    M(MustBeAutoInit<Nonempty>(), 0);  // error
-    M(MustBeAutoInit<NoEquality>(), 0);
-    M(MustBeAutoInit<Class?>(), 0);
-    M(MustBeAutoInit<Good>(), 0);
-
-    M(MustSupportEquality<PossiblyEmpty>(), 0);
-    M(MustSupportEquality<Nonempty>(), 0);
-    M(MustSupportEquality<NoEquality>(), 0);  // error
-    M(MustSupportEquality<Class?>(), 0);
-    M(MustSupportEquality<Good>(), 0);
-
-    M(NoReferences<PossiblyEmpty>(), 0);
-    M(NoReferences<Nonempty>(), 0);
-    M(NoReferences<NoEquality>(), 0);
-    M(NoReferences<Class?>(), 0);  // error
-    M(NoReferences<Good>(), 0);
-  }
-
-  method TestGhost()
-  {
-    M(0, MustBeNonempty<PossiblyEmpty>());  // error
-    M(0, MustBeNonempty<Nonempty>());
-    M(0, MustBeNonempty<NoEquality>());
-    M(0, MustBeNonempty<Class?>());
-    M(0, MustBeNonempty<Good>());
-
-    M(0, MustBeAutoInit<PossiblyEmpty>());  // error
-    M(0, MustBeAutoInit<Nonempty>());  // this is fine in a ghost context
-    M(0, MustBeAutoInit<NoEquality>());
-    M(0, MustBeAutoInit<Class?>());
-    M(0, MustBeAutoInit<Good>());
-
-    M(0, MustSupportEquality<PossiblyEmpty>());
-    M(0, MustSupportEquality<Nonempty>());
-    M(0, MustSupportEquality<NoEquality>());  // this is fine in a ghost context
-    M(0, MustSupportEquality<Class?>());
-    M(0, MustSupportEquality<Good>());
-
-    M(0, NoReferences<PossiblyEmpty>());
-    M(0, NoReferences<Nonempty>());
-    M(0, NoReferences<NoEquality>());
-    M(0, NoReferences<Class?>());  // error
-    M(0, NoReferences<Good>());
-  }
-}
-
-// --------------- let-such-that ghost regressions ------------------------------
-
-module LetSuchThatGhost {
-  ghost predicate True<T>(t: T) { true }
-
-  function F<T>(s: set<T>): int
-    requires s != {}
-  {
-    // once, the RHS for p was (bogusly) considered ghost, which made p ghost,
-    // which made this body illegal
-    var p :=
-      var e :| e in s;
-      true;
-    if p then 6 else 8
-  }
-
-  function G<T>(s: set<T>): int
-    requires s != {}
-  {
-    // again, e and p are both non-ghost
-    var p :=
-      var e :| e in s;
-      e == e;
-    if p then 6 else 8
-  }
-
-  function H<T>(s: set<T>): int
-    requires s != {}
-  {
-    // here, e is ghost, but p is still not
-    var p :=
-      var e :| e in s && True(e);
-      true;
-    if p then 6 else 8
-  }
-
-  function I<T>(s: set<T>): int
-    requires s != {}
-  {
-    // here, e is ghost, and therefore so is p
-    var p :=
-      var e :| e in s && True(e);
-      e == e;
-    if p then 6 else 8  // error: p is ghost
-  }
-}
-
-// --------------- hint restrictions in non-while loops ------------------------------
-
-module HintRestrictionsOtherLoops {
-  class C {
-    ghost function F(): int
-    {
-      calc {
-        6;
-        { var x := 8;
-          while
-            modifies this  // error: cannot use a modifies clause on a loop inside a hint
-          {
-            case x != 0 => x := x - 1;
-          }
-        }
-        6;
-        { for i := 0 to 8
-            modifies this  // error: cannot use a modifies clause on a loop inside a hint
-          {
-          }
-        }
-        6;
-      }
-      5
-    }
-  }
-}
-
-// --------------- regressions: types of arguments to fresh, unchanged, modifies, reads ------------------------------
-
-module FrameTypes {
-  // ----- fresh takes an expression as its argument
-
-  method FreshArgumentType0(
-    o: object,
-    s: set<object>, ss: iset<object>,
-    q: seq<object>,
-    ms: multiset<object>,
-    mp: map<object, int>, mp2: map<int, object>,
-    im: imap<object, object>)
-  {
-    ghost var b;
-    b := fresh(o);
-    b := fresh(s);
-    b := fresh(ss);
-    b := fresh(q);
-    b := fresh(ms); // error: wrong argument type for fresh
-    b := fresh(mp); // error: wrong argument type for fresh
-    b := fresh(mp2); // error: wrong argument type for fresh
-    b := fresh(im); // error: wrong argument type for fresh
-  }
-
-  method FreshArgumentType1(x: int, s: set<bool>, ss: iset<bv8>, q: seq<int>) {
-    ghost var b;
-    b := fresh(x); // error: wrong argument type for fresh
-    b := fresh(s); // error: wrong argument type for fresh
-    b := fresh(ss); // error: wrong argument type for fresh
-    b := fresh(q); // error: wrong argument type for fresh
-  }
-
-  method FreshArgumentType2(f: int -> int, g: int -> object, h: int -> set<object>, i: int -> iset<object>, j: int -> seq<object>, k: set<object> -> int) {
-    ghost var b;
-    b := fresh(f); // error: wrong argument type for fresh
-    b := fresh(g); // error: wrong argument type for fresh
-    b := fresh(h); // error: wrong argument type for fresh
-    b := fresh(j); // error: wrong argument type for fresh
-    b := fresh(k); // error: wrong argument type for fresh
-  }
-
-  // ----- unchanged, modifies, and reads take frame expressions as their arguments
-
-  method UnchangedArgumentType0(
-    o: object,
-    s: set<object>, ss: iset<object>,
-    q: seq<object>,
-    ms: multiset<object>,
-    mp: map<object, int>, mp2: map<int, object>,
-    im: imap<object, object>)
-  {
-    ghost var b;
-    b := unchanged(o);
-    b := unchanged(s);
-    b := unchanged(ss);
-    b := unchanged(q);
-    b := unchanged(ms);
-    b := unchanged(mp); // error: wrong argument type for unchanged
-    b := unchanged(mp2); // error: wrong argument type for unchanged
-    b := unchanged(im); // error: wrong argument type for unchanged
-  }
-
-  method UnchangedArgumentType1(x: int, s: set<bool>, ss: iset<bv8>, q: seq<int>) {
-    ghost var b;
-    b := unchanged(x); // error: wrong argument type for unchanged
-    b := unchanged(s); // error: wrong argument type for unchanged
-    b := unchanged(ss); // error: wrong argument type for unchanged
-    b := unchanged(q); // error: wrong argument type for unchanged
-  }
-
-  method UnchangedArgumentType2(
-    f: int -> int,
-    g: int -> object, h: int -> set<object>, i: int -> iset<object>, j: int -> seq<object>, k: set<object> -> int,
-    l: bool -> multiset<object>, m: bool -> map<object, object>)
-  {
-    ghost var b;
-    b := unchanged(f); // error: wrong argument type for unchanged
-    b := unchanged(g); // error: wrong argument type for unchanged
-    b := unchanged(h); // error: wrong argument type for unchanged
-    b := unchanged(i); // error: wrong argument type for unchanged
-    b := unchanged(j); // error: wrong argument type for unchanged
-    b := unchanged(k); // error: wrong argument type for unchanged
-    b := unchanged(l); // error: wrong argument type for unchanged
-    b := unchanged(m); // error: wrong argument type for unchanged
-  }
-
-  method ModifiesArgumentType0(
-    o: object,
-    s: set<object>, ss: iset<object>,
-    q: seq<object>,
-    ms: multiset<object>,
-    mp: map<object, int>, mp2: map<int, object>,
-    im: imap<object, object>)
-    modifies o
-    modifies s
-    modifies ss
-    modifies q
-    modifies ms
-    modifies mp // error: wrong argument type for modifies
-    modifies mp2 // error: wrong argument type for modifies
-    modifies im // error: wrong argument type for modifies
-  {
-  }
-
-  method ModifiesArgumentType1(x: int, s: set<bool>, ss: iset<bv8>, q: seq<int>)
-    modifies x // error: wrong argument type for modifies
-    modifies s // error: wrong argument type for modifies
-    modifies ss // error: wrong argument type for modifies
-    modifies q // error: wrong argument type for modifies
-  {
-  }
-
-  method ModifiesArgumentType2(
-    f: int -> int,
-    g: int -> object, h: int -> set<object>, i: int -> iset<object>, j: int -> seq<object>, k: set<object> -> int,
-    l: bool -> multiset<object>, m: bool -> map<object, object>)
-    modifies f // error: wrong argument type for modifies
-    modifies g // error: wrong argument type for modifies
-    modifies h // error: wrong argument type for modifies
-    modifies i // error: wrong argument type for modifies
-    modifies j // error: wrong argument type for modifies
-    modifies k // error: wrong argument type for modifies
-    modifies l // error: wrong argument type for modifies
-    modifies m // error: wrong argument type for modifies
-  {
-  }
-
-  ghost predicate ReadsArgumentType0(
-    o: object,
-    s: set<object>, ss: iset<object>,
-    q: seq<object>,
-    ms: multiset<object>,
-    mp: map<object, int>, mp2: map<int, object>,
-    im: imap<object, object>)
-    reads o
-    reads s
-    reads ss
-    reads q
-    reads ms
-    reads mp // error: wrong argument type for reads
-    reads mp2 // error: wrong argument type for reads
-    reads im // error: wrong argument type for reads
-  {
-    true
-  }
-
-  ghost predicate ReadsArgumentType1(x: int, s: set<bool>, ss: iset<bv8>, q: seq<int>)
-    reads x // error: wrong argument type for reads
-    reads s // error: wrong argument type for reads
-    reads ss // error: wrong argument type for reads
-    reads q // error: wrong argument type for reads
-  {
-    true
-  }
-
-  ghost predicate ReadsArgumentType2(
-    f: int -> int,
-    g: int -> object, h: int -> set<object>, i: int -> iset<object>, j: int -> seq<object>, k: set<object> -> int,
-    l: bool -> multiset<object>, m: bool -> map<object, object>)
-    reads f // error: wrong argument type for reads
-    reads g // error: a function must be to a collection of references
-    reads h
-    reads i
-    reads j
-    reads k // error: wrong argument type for reads
-    reads l
-    reads m // error: wrong argument type for reads
-  {
-    true
-  }
-}
-
-module Continue0 {
-  method BadTargetsLevels(a: int, b: int, c: int) {
-    for i := 0 to 100 {
-      for j := 0 to 100 {
-        for k := 0 to 100 {
-          if
-          case k == a =>
-            continue;
-          case k == b =>
-            break continue;
-          case k == c =>
-            break break continue;
-          case k == a + b + c =>
-            break break break continue; // error: too many levels
-        }
-      }
-    }
-  }
-
-  method BadTargetsLabels(a: int, b: int, c: int) {
-    label A:
-    for i := 0 to 100 {
-      label B0: label B1:
-      for j := 0 to 100 {
-        label C:
-        for k := 0 to 100 {
-          if
-          case k == a =>
-            continue C;
-          case k == b =>
-            continue B0;
-          case k == b =>
-            continue B1;
-          case k == c =>
-            continue A;
-        }
-      }
-    }
-  }
-
-  method NonLoopLabels(a: int, b: int, c: int) {
-    // the following labels are attached to BlockStmt's, not loops
-    label X: {
-      for i := 0 to 100 {
-        label Y0: label Y1: {
-          for j := 0 to 100 {
-            label Z: {
-              for k := 0 to 100 {
-                if
-                case k == a =>
-                  continue X; // error: X is not a loop label
-                case k == b =>
-                  continue Y0; // error: Y0 is not a loop label
-                case k == b =>
-                  continue Y1; // error: Y1 is not a loop label
-                case k == c =>
-                  continue Z; // error: Z is not a loop label
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  method SimpleBadJumps0() {
-    break; // error: cannot "break" from here
-  }
-
-  method SimpleBadJumps1() {
-    continue; // error: cannot "continue" from here
-  }
-
-  method SimpleBadJumps2() {
-    label X: {
-      if
-      case true => break; // error: cannot "break" from here
-      case true => continue; // error: cannot "continue" from here
-      case true => break X;
-      case true => continue X; // error: X is not a loop label
-    }
-  }
-
-  method GhostContinueAssertBy(ghost t: int, ghost u: nat)
-  {
-    label L:
-    for i := 0 to 100 {
-      assert true by {
-        for j := 0 to 100 {
-          if j == t {
-            break;
-          } else if j == u {
-            continue;
-          }
-        }
-        if
-        case true => break; // error: cannot jump outside the assert-by
-        case true => continue; // error: cannot jump outside the assert-by
-        case true => break L; // error: cannot jump outside the assert-by
-        case true => continue L; // error: cannot jump outside the assert-by
-      }
-    }
-  }
-}
-
-module Continue1 {
-  method GhostContinueLevels(ghost t: int, ghost u: nat)
-  {
-    var m := 0;
-    for i := 0 to 100 {
-      if i == t {
-        // The following "continue" would pass the increment to m
-        continue; // error: continue from ghost context must target a ghost loop
-      }
-      m := m + 1;
-    }
-
-    for i := 0 to 100 {
-      m := m + 1;
-      // The following "break" would potentially pass both increments to m
-      if i == t {
-        break; // error: break from ghost context must target a ghost loop
-      }
-      m := m + 1;
-    }
-
-    for i := 0 to 100 {
-      if i == t {
-        // Even though there's no statement in the loop body after this ghost if, the continue violates the rule
-        continue; // error: continue from ghost context must target a ghost loop
-      }
-    }
-
-    for i := 0 to 100 {
-      for j := 0 to u {
-        if i == t {
-          continue; // fine
-        }
-      }
-    }
-
-    for i := 0 to 100 {
-      for j := 0 to u {
-        if i == t {
-          break continue; // error: continue from ghost context must target a ghost loop
-        }
-      }
-    }
-
-    for i := 0 to 100 + u {
-      for j := 0 to u {
-        if i == t {
-          break continue; // fine
-        }
-      }
-    }
-  }
-
-  method GhostContinueLabels(ghost t: int, ghost u: nat)
-  {
-    label Outer:
-    for i := 0 to 100 {
-      label Inner:
-      for j := 0 to u {
-        if j == t {
-          continue Inner; // fine
-        } else if j == 20 + t {
-          continue Outer; // error: continue from ghost context must target a ghost loop
-        }
-      }
-    }
-  }
-}
-
-module LabelRegressions {
-  // The cases of if-case, while-case, and match statements are List<Statement>'s, which are essentially
-  // a BlockStmt but without the curly braces. Each Statement in such a List can have labels, so
-  // it's important to ResolveStatementWithLabels, not ResolveStatement. Alas, that was once not the
-  // case (pun intended).
-  // There's also something analogous going on in the Verifier, where lists of statements should call
-  // TrStmtList, not just call TrStmt on every Statement in the List. (See method LabelRegressions()
-  // in Test/comp/ForLoops-Compilation.dfy.)
-  method IfCaseRegression() {
-    if
-    case true =>
-      label Loop:
-      for k := 0 to 10 {
-        continue Loop;
-        break Loop;
-      }
-  }
-
-  method WhileCaseRegression() {
-    while
-    case true =>
-      label Loop:
-      for k := 0 to 10 {
-        continue Loop;
-        break Loop;
-      }
-  }
-
-  method Match() {
-    match (0, 0)
-    case (_, _) =>
-      label Loop:
-      for k := 0 to 10 {
-        break Loop;
-        continue Loop;
-      }
-  }
-}
-
-// --------------- regressions: using "this" in places where there is no enclosing class/type ------------------------------
-
-module UseOfThis {
-  // The following uses of "this." once caused the resolver to crash.
-
-  type {:badUseOfThis this.K} OpaqueType { // error: cannot use "this" here
-    const K: int
-  }
-
-  newtype {:badUseOfThis this.x} Newtype = // error: cannot use "this" here
-    x: int | this.u // error: cannot use "this" here
-    witness this.u // error: cannot use "this" here
-  {
-    const K: int
-  }
-
-  type {:badUseOfThis this.x} SynonymType = int // error: cannot use "this" here
-
-  type {:badUseOfThis this.x} SubsetType = // error: cannot use "this" here
-    x: int | this.u // error: cannot use "this" here
-    witness this.u // error: cannot use "this" here
-
-  trait {:badUseOfThis this.K} MyTrait { // error: cannot use "this" here
-    const K: int
-  }
-
-  class {:badUseOfThis this.M} MyClass { // error: cannot use "this" here
-    const M: int
-
-    var {:goodUseOfThis this.M} I: int
-    const {:goodUseOfThis this.M} J := 3
-    method {:goodUseOfThis this.M} CM()
-      ensures {:goodUseOfThis this.M} true
-    ghost function {:goodUseOfThis this.M} CF(): int
-      ensures {:goodUseOfThis this.M} true
-
-    static const {:badUseOfThis this.M} L := 3 // error: cannot use "this" here
-    static const N := this.M // error: cannot use "this" here
-    static method {:badUseOfThis this.M} SM() // error: cannot use "this" here
-      ensures {:badUseOfThis this.M} true // error: cannot use "this" here
-    static ghost function {:badUseOfThis this.M} SF(): int // error: cannot use "this" here
-      ensures {:badUseOfThis this.M} true // error: cannot use "this" here
-  }
-
-  datatype Datatype =
-    | {:badUseOfThis this.K} DatatypeCtor // error: cannot use "this" here
-  {
-    const K: int
-  }
-}
-
-module AutoInitTypeCheckRegression {
-  codatatype AutoStream<G(0)> = AutoNext(head: G, tail: AutoStream<G>)
-
-  function In<G>(a: AutoStream<G>): int // error: the argument to AutoStream is supposed to be an auto-init type
-  function Out<G>(g: G): AutoStream<G> // error: the argument to AutoStream is supposed to be an auto-init type
-
-  method M<G>(a: AutoStream<G>) // error: the argument to AutoStream is supposed to be an auto-init type
-  method N<G>(g: G) returns (a: AutoStream<G>) // error: the argument to AutoStream is supposed to be an auto-init type
-}
-
-module ClassConstructorTests {
-  class ClassWithConstructor {
-    var y: int
-    method NotTheOne() { }
-    constructor InitA() { }
-    constructor InitB() { y := 20; }
-  }
-
-  class ClassWithoutConstructor {
-    method Init() modifies this { }
-  }
-
-  method ConstructorTests()
-  {
-    var o := new object;  // fine: does not have any constructors
-
-    o := new ClassWithoutConstructor;  // fine: don't need to call any particular method
-    o := new ClassWithoutConstructor.Init();  // this is also fine
-
-    var c := new ClassWithConstructor.InitA();
-    c := new ClassWithConstructor;  // error: must call a constructor
-    c := new ClassWithConstructor.NotTheOne();  // error: must call a constructor, not an arbitrary method
-    c := new ClassWithConstructor.InitB();
-  }
-
-  class Y {
-    var data: int
-    constructor (x: int)
-    {
-      data := x;
-    }
-    method Test() {
-      var i := new Y(5);
-      i := new Y(7);
-      i := new Y;  // error: the class has a constructor, so one must be used
-      var s := new Luci.Init(5);
-      s := new Luci.FromArray(null);
-      s := new Luci(false);
-      s := new Luci(true);
-      s := new Luci.M();  // error: there is a constructor, so one must be called
-      s := new Luci;  // error: there is a constructor, so one must be called
-      var l := new Lamb; // fine, since there are no constructors (only methods)
-      l := new Lamb.Gwen();
-    }
-  }
-
-  class Luci {
-    constructor Init(y: int) { }
-    constructor (nameless: bool) { }
-    constructor FromArray(a: array<int>) { }
-    method M() { }
-  }
-
-  class Lamb {
-    method Jess() { }
-    method Gwen() { }
-  }
-}
diff --git a/Test/dafny0/ResolutionErrors.dfy.expect b/Test/dafny0/ResolutionErrors.dfy.expect
deleted file mode 100644
index 8828428e25f..00000000000
--- a/Test/dafny0/ResolutionErrors.dfy.expect
+++ /dev/null
@@ -1,634 +0,0 @@
-ResolutionErrors.dfy(323,33): Warning: constructors no longer need 'this' to be listed in modifies clauses
-ResolutionErrors.dfy(1879,15): Warning: constructors no longer need 'this' to be listed in modifies clauses
-ResolutionErrors.dfy(13,18): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
-ResolutionErrors.dfy(25,13): Error: array selection requires an array2 (got array3<T>)
-ResolutionErrors.dfy(27,13): Error: array selection requires an array4 (got array<T>)
-ResolutionErrors.dfy(26,14): Error: element selection requires a sequence, array, multiset, or map (got array3<T>)
-ResolutionErrors.dfy(57,16): Error: accessing member 'X' requires an instance expression
-ResolutionErrors.dfy(58,9): Error: unresolved identifier: F
-ResolutionErrors.dfy(59,16): Error: accessing member 'F' requires an instance expression
-ResolutionErrors.dfy(60,9): Error: unresolved identifier: G
-ResolutionErrors.dfy(62,9): Error: unresolved identifier: M
-ResolutionErrors.dfy(63,16): Error: accessing member 'M' requires an instance expression
-ResolutionErrors.dfy(64,9): Error: unresolved identifier: N
-ResolutionErrors.dfy(67,10): Error: non-function expression (of type int) is called with parameters
-ResolutionErrors.dfy(68,16): Error: member 'z' does not exist in non-null type 'Global'
-ResolutionErrors.dfy(51,15): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(88,16): Error: the name 'Benny' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.Benny')
-ResolutionErrors.dfy(93,16): Error: the name 'David' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.David')
-ResolutionErrors.dfy(94,16): Error: the name 'David' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.David')
-ResolutionErrors.dfy(96,16): Error: the name 'David' denotes a datatype constructor, but does not do so uniquely; add an explicit qualification (for example, 'Abc.David')
-ResolutionErrors.dfy(98,20): Error: wrong number of arguments (got 2, but datatype constructor 'David' expects 1: (x: int))
-ResolutionErrors.dfy(116,11): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(117,11): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-ResolutionErrors.dfy(121,13): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(122,12): Error: actual out-parameter is required to be a ghost variable
-ResolutionErrors.dfy(129,17): Error: ghost variables such as gg are allowed only in specification contexts. gg was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(133,25): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(140,6): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(144,23): Error: ghost variables such as gg are allowed only in specification contexts. gg was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(145,37): Error: ghost variables such as gg are allowed only in specification contexts. gg was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(154,12): Error: only ghost methods can be called from this context
-ResolutionErrors.dfy(244,29): Error: ghost-context break statement is not allowed to break out of non-ghost structure
-ResolutionErrors.dfy(267,14): Error: ghost-context break statement is not allowed to break out of non-ghost loop
-ResolutionErrors.dfy(281,14): Error: ghost-context break statement is not allowed to break out of non-ghost loop
-ResolutionErrors.dfy(286,10): Error: return statement is not allowed in this context (because it is guarded by a specification-only expression)
-ResolutionErrors.dfy(306,12): Error: label shadows an enclosing label
-ResolutionErrors.dfy(311,10): Error: duplicate label
-ResolutionErrors.dfy(313,10): Error: label shadows a dominating label
-ResolutionErrors.dfy(329,11): Error: a constructor is allowed to be called only when an object is being allocated
-ResolutionErrors.dfy(345,27): Error: arguments must have comparable types (got bool and int)
-ResolutionErrors.dfy(343,18): Error: arguments must have comparable types (got int and DTD_List)
-ResolutionErrors.dfy(344,18): Error: arguments must have comparable types (got DTD_List and int)
-ResolutionErrors.dfy(358,17): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(382,7): Error: incorrect argument type at index 1 for method in-parameter 'b' (expected GenericClass<int>, found GenericClass<bool>) (non-variant type parameter would require int = bool)
-ResolutionErrors.dfy(396,13): Error: incorrect argument type at index 0 for datatype constructor parameter 'hd' (expected _T0, found int)
-ResolutionErrors.dfy(397,9): Error: incorrect argument type at index 0 for datatype constructor parameter 'hd' (expected _T0, found int)
-ResolutionErrors.dfy(406,8): Error: all lines in a calculation must have the same type (got int after bool)
-ResolutionErrors.dfy(410,8): Error: all lines in a calculation must have the same type (got int after bool)
-ResolutionErrors.dfy(413,8): Error: first argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(413,8): Error: second argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(414,12): Error: first argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(414,12): Error: second argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(415,12): Error: first argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(415,12): Error: second argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(413,8): Error: first argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(413,8): Error: second argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(419,12): Error: first argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(419,12): Error: second argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(418,8): Error: first argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(418,8): Error: second argument to ==> must be of type bool (instead got int)
-ResolutionErrors.dfy(405,8): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-ResolutionErrors.dfy(405,8): Error: arguments must have comparable types (got bool and int)
-ResolutionErrors.dfy(405,8): Error: arguments must have comparable types (got bool and int)
-ResolutionErrors.dfy(409,8): Error: arguments must have comparable types (got bool and int)
-ResolutionErrors.dfy(409,8): Error: arguments must have comparable types (got bool and int)
-ResolutionErrors.dfy(443,13): Error: in a hint, calls are allowed only to lemmas
-ResolutionErrors.dfy(445,10): Error: a hint is not allowed to make heap updates
-ResolutionErrors.dfy(447,10): Error: a hint is not allowed to update a variable it doesn't declare
-ResolutionErrors.dfy(468,4): Error: More than one anonymous constructor
-ResolutionErrors.dfy(481,15): Error: class Lamb does not have an anonymous constructor
-ResolutionErrors.dfy(533,7): Error: RHS (of type List<A>) not assignable to LHS (of type List<B>) (covariant type parameter would require A <: B)
-ResolutionErrors.dfy(538,7): Error: RHS (of type List<A>) not assignable to LHS (of type List<B>) (covariant type parameter would require A <: B)
-ResolutionErrors.dfy(552,23): Error: type of case bodies do not agree (found Tree<_T1, _T0>, previous types Tree<_T0, _T1>) (covariant type parameter 0 would require _T1 <: _T0)
-ResolutionErrors.dfy(564,30): Error: Wrong number of type arguments (0 instead of 2) passed to datatype: Tree
-ResolutionErrors.dfy(579,20): Error: unresolved identifier: w
-ResolutionErrors.dfy(598,8): Error: the type of this local variable is underspecified
-ResolutionErrors.dfy(599,25): Error: the type of this variable is underspecified
-ResolutionErrors.dfy(599,23): Error: type parameter 'T' (inferred to be '?') in the function call to 'P' could not be determined
-ResolutionErrors.dfy(599,18): Error: type of bound variable 'z' could not be determined; please specify the type explicitly
-ResolutionErrors.dfy(612,13): Error: a lemma is not allowed to use 'new'
-ResolutionErrors.dfy(613,9): Error: a lemma is not allowed to use 'new'
-ResolutionErrors.dfy(622,16): Error: only ghost methods can be called from this context
-ResolutionErrors.dfy(629,15): Error: only ghost methods can be called from this context
-ResolutionErrors.dfy(639,17): Error: a hint is not allowed to use 'new'
-ResolutionErrors.dfy(654,14): Error: new allocation not supported in aggregate assignments
-ResolutionErrors.dfy(661,14): Error: a forall statement is not allowed to use 'new'
-ResolutionErrors.dfy(661,11): Error: assignment to array element is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-ResolutionErrors.dfy(677,26): Error: second argument to "in" must be a set, multiset, or sequence with elements of type int, or a map with domain int (instead got bool)
-ResolutionErrors.dfy(672,18): Error: second argument to "in" must be a set, multiset, or sequence with elements of type int, or a map with domain int (instead got ?)
-ResolutionErrors.dfy(689,13): Error: lemmas are not allowed to have modifies clauses
-ResolutionErrors.dfy(716,22): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
-ResolutionErrors.dfy(749,22): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
-ResolutionErrors.dfy(782,17): Error: the method returns 1 value but is assigned to 0 variable (all return values must be assigned)
-ResolutionErrors.dfy(803,4): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(814,40): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(837,6): Error: RHS (of type B) not assignable to LHS (of type object)
-ResolutionErrors.dfy(839,6): Error: RHS (of type B) not assignable to LHS (of type object)
-ResolutionErrors.dfy(844,6): Error: RHS (of type G) not assignable to LHS (of type object)
-ResolutionErrors.dfy(845,6): Error: RHS (of type Dt) not assignable to LHS (of type object)
-ResolutionErrors.dfy(846,6): Error: RHS (of type CoDt) not assignable to LHS (of type object)
-ResolutionErrors.dfy(838,6): Error: RHS (of type int) not assignable to LHS (of type object)
-ResolutionErrors.dfy(858,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int)
-ResolutionErrors.dfy(862,16): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
-ResolutionErrors.dfy(874,14): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
-ResolutionErrors.dfy(882,16): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
-ResolutionErrors.dfy(892,20): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
-ResolutionErrors.dfy(903,18): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
-ResolutionErrors.dfy(925,10): Error: LHS of assignment must denote a mutable field
-ResolutionErrors.dfy(926,10): Error: LHS of assignment must denote a mutable field
-ResolutionErrors.dfy(927,9): Error: cannot assign to a range of array elements (try the 'forall' statement)
-ResolutionErrors.dfy(928,9): Error: cannot assign to a range of array elements (try the 'forall' statement)
-ResolutionErrors.dfy(929,5): Error: cannot assign to a range of array elements (try the 'forall' statement)
-ResolutionErrors.dfy(930,5): Error: cannot assign to a range of array elements (try the 'forall' statement)
-ResolutionErrors.dfy(919,4): Error: LHS of array assignment must denote an array element (found seq<int>)
-ResolutionErrors.dfy(920,4): Error: LHS of array assignment must denote an array element (found seq<int>)
-ResolutionErrors.dfy(942,11): Error: unresolved identifier: s
-ResolutionErrors.dfy(961,18): Error: member '3' does not exist in datatype '_tuple#3'
-ResolutionErrors.dfy(961,28): Error: member 'x' does not exist in datatype '_tuple#2'
-ResolutionErrors.dfy(960,18): Error: condition is expected to be of type bool, but is int
-ResolutionErrors.dfy(954,39): Error: RHS (of type (int, real, int)) not assignable to LHS (of type (int, real, int, real))
-ResolutionErrors.dfy(953,34): Error: RHS (of type (int, int, real)) not assignable to LHS (of type (int, real, int)) (covariant type parameter 1 would require int <: real)
-ResolutionErrors.dfy(953,34): Error: RHS (of type (int, int, real)) not assignable to LHS (of type (int, real, int)) (covariant type parameter 2 would require real <: int)
-ResolutionErrors.dfy(985,12): Error: type of left argument to % (int) must agree with the result type (real)
-ResolutionErrors.dfy(985,12): Error: arguments to % must be integer-numeric or bitvector types (got real)
-ResolutionErrors.dfy(984,19): Error: type of right argument to / (int) must agree with the result type (real)
-ResolutionErrors.dfy(1012,11): Error: Wrong number of type arguments (2 instead of 1) passed to non-null type: array3
-ResolutionErrors.dfy(1013,11): Error: Wrong number of type arguments (2 instead of 1) passed to non-null type: C
-ResolutionErrors.dfy(1024,7): Error: duplicate name of top-level declaration: BadSyn2
-ResolutionErrors.dfy(1021,17): Error: Wrong number of type arguments (0 instead of 1) passed to datatype: List
-ResolutionErrors.dfy(1022,17): Error: Type or type parameter is not declared in this scope: badName (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
-ResolutionErrors.dfy(1023,22): Error: Type or type parameter is not declared in this scope: X (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
-ResolutionErrors.dfy(1030,7): Error: type-synonym cycle: A -> A
-ResolutionErrors.dfy(1033,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
-ResolutionErrors.dfy(1037,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
-ResolutionErrors.dfy(1046,11): Error: because of cyclic dependencies among constructor argument types, no instances of datatype 'D' can be constructed
-ResolutionErrors.dfy(1049,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
-ResolutionErrors.dfy(1054,7): Error: cycle among redirecting types (newtypes, subset types, type synonyms): A -> B -> A
-ResolutionErrors.dfy(1059,7): Error: type-synonym cycle: A -> A
-ResolutionErrors.dfy(1066,25): Error: unresolved identifier: x
-ResolutionErrors.dfy(1069,22): Error: unresolved identifier: x
-ResolutionErrors.dfy(1072,25): Error: unresolved identifier: x
-ResolutionErrors.dfy(1074,21): Error: unresolved identifier: x
-ResolutionErrors.dfy(1076,21): Error: unresolved identifier: x
-ResolutionErrors.dfy(1079,21): Error: unresolved identifier: x
-ResolutionErrors.dfy(1086,35): Error: Wrong number of type arguments (2 instead of 1) passed to abstract type: P
-ResolutionErrors.dfy(1098,13): Error: Type or type parameter is not declared in this scope: BX (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
-ResolutionErrors.dfy(1108,6): Error: RHS (of type P<int>) not assignable to LHS (of type P<bool>) (non-variant type parameter would require bool = int)
-ResolutionErrors.dfy(1113,6): Error: RHS (of type P<A>) not assignable to LHS (of type P<B>) (non-variant type parameter would require B = A)
-ResolutionErrors.dfy(1118,6): Error: RHS (of type P<A>) not assignable to LHS (of type P<int>) (non-variant type parameter would require int = A)
-ResolutionErrors.dfy(1119,6): Error: RHS (of type P<int>) not assignable to LHS (of type P<A>) (non-variant type parameter would require A = int)
-ResolutionErrors.dfy(1124,13): Error: arguments must have comparable types (got P<int> and P<X>)
-ResolutionErrors.dfy(1125,13): Error: arguments must have comparable types (got P<bool> and P<X>)
-ResolutionErrors.dfy(1126,13): Error: arguments must have comparable types (got P<int> and P<bool>)
-ResolutionErrors.dfy(1137,13): Error: new can be applied only to class types (got JJ)
-ResolutionErrors.dfy(1145,37): Error: a set comprehension involved in a function definition is not allowed to depend on the set of allocated references, but values of 'o' (of type 'object') may contain references (see documentation for 'older' parameters)
-ResolutionErrors.dfy(1146,31): Error: a set comprehension involved in a function definition is not allowed to depend on the set of allocated references, but values of 'o' (of type 'object') may contain references (see documentation for 'older' parameters)
-ResolutionErrors.dfy(1152,27): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'o'
-ResolutionErrors.dfy(1160,15): Error: arguments to / must be numeric or bitvector types (got set<bool>)
-ResolutionErrors.dfy(1167,20): Error: a call to a possibly non-terminating method is allowed only if the calling method is also declared (with 'decreases *') to be possibly non-terminating
-ResolutionErrors.dfy(1182,16): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
-ResolutionErrors.dfy(1247,13): Error: type parameter 'PT' (inferred to be '?') in the function call to 'P' could not be determined
-ResolutionErrors.dfy(1248,14): Error: the type of this variable is underspecified
-ResolutionErrors.dfy(1248,19): Error: type parameter 'QT' (inferred to be '?') in the function call to 'Q' could not be determined
-ResolutionErrors.dfy(1248,20): Error: the type of this expression is underspecified
-ResolutionErrors.dfy(1249,4): Error: type parameter 'MT' (inferred to be '?') to the method 'M' could not be determined
-ResolutionErrors.dfy(1250,8): Error: the type of this variable is underspecified
-ResolutionErrors.dfy(1250,13): Error: type parameter 'NT' (inferred to be '?') to the method 'N' could not be determined
-ResolutionErrors.dfy(1251,8): Error: the type of this variable is underspecified
-ResolutionErrors.dfy(1252,8): Error: the type of this variable is underspecified
-ResolutionErrors.dfy(1253,8): Error: the type of this local variable is underspecified
-ResolutionErrors.dfy(1254,8): Error: the type of this variable is underspecified
-ResolutionErrors.dfy(1255,8): Error: the type of this local variable is underspecified
-ResolutionErrors.dfy(1259,26): Error: the type of this variable is underspecified
-ResolutionErrors.dfy(1259,21): Error: type of bound variable 's' could not be determined; please specify the type explicitly
-ResolutionErrors.dfy(1260,31): Error: the type of this variable is underspecified
-ResolutionErrors.dfy(1260,21): Error: type of bound variable 's' could not be determined; please specify the type explicitly
-ResolutionErrors.dfy(1261,30): Error: the type of this variable is underspecified
-ResolutionErrors.dfy(1261,21): Error: type of bound variable 'c' could not be determined; please specify the type explicitly
-ResolutionErrors.dfy(1268,8): Error: the type of this local variable is underspecified
-ResolutionErrors.dfy(1271,29): Error: type of bound variable 'c' could not be determined; please specify the type explicitly
-ResolutionErrors.dfy(1282,21): Error: Type or type parameter is not declared in this scope: X (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
-ResolutionErrors.dfy(1283,24): Error: Type or type parameter is not declared in this scope: X (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
-ResolutionErrors.dfy(1320,16): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (y)
-ResolutionErrors.dfy(1337,18): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
-ResolutionErrors.dfy(1365,15): Error: The name Inner ambiguously refers to a type in one of the modules A, B (try qualifying the type name with the module name)
-ResolutionErrors.dfy(1375,29): Error: ghost variables such as tmp are allowed only in specification contexts. tmp was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(1377,49): Error: ghost variables such as a0 are allowed only in specification contexts. a0 was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(1377,54): Error: ghost variables such as a1 are allowed only in specification contexts. a1 was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(1386,33): Error: set argument type must support equality (got (int, int -> bool))
-ResolutionErrors.dfy(1398,11): Error: name of type (X) is used as a variable
-ResolutionErrors.dfy(1398,16): Error: name of type (X) is used as a variable
-ResolutionErrors.dfy(1399,11): Error: name of module (Y) is used as a variable
-ResolutionErrors.dfy(1399,16): Error: name of module (Y) is used as a variable
-ResolutionErrors.dfy(1400,11): Error: name of type (X) is used as a variable
-ResolutionErrors.dfy(1401,11): Error: name of module (Y) is used as a variable
-ResolutionErrors.dfy(1406,16): Error: name of type (X) is used as a variable
-ResolutionErrors.dfy(1407,16): Error: name of module (Y) is used as a variable
-ResolutionErrors.dfy(1408,4): Error: name of type (X) is used as a variable
-ResolutionErrors.dfy(1409,4): Error: name of module (Y) is used as a variable
-ResolutionErrors.dfy(1419,9): Error: type of RHS of assign-such-that statement must be boolean (got int)
-ResolutionErrors.dfy(1418,11): Error: type of left argument to + (int) must agree with the result type (bool)
-ResolutionErrors.dfy(1418,11): Error: type of right argument to + (int) must agree with the result type (bool)
-ResolutionErrors.dfy(1418,11): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-ResolutionErrors.dfy(1420,13): Error: type of RHS of assign-such-that statement must be boolean (got int)
-ResolutionErrors.dfy(1423,15): Error: type of left argument to + (int) must agree with the result type (bool)
-ResolutionErrors.dfy(1423,15): Error: type of right argument to + (int) must agree with the result type (bool)
-ResolutionErrors.dfy(1423,15): Error: type of + must be of a numeric type, a bitvector type, ORDINAL, char, a sequence type, or a set-like or map-like type (instead got bool)
-ResolutionErrors.dfy(1439,29): Error: in a hint, calls are allowed only to lemmas
-ResolutionErrors.dfy(1441,17): Error: in a hint, calls are allowed only to lemmas
-ResolutionErrors.dfy(1466,20): Error: in a hint, calls are allowed only to lemmas
-ResolutionErrors.dfy(1475,24): Error: in a hint, calls are allowed only to lemmas
-ResolutionErrors.dfy(1488,18): Error: assignment to non-ghost field is not allowed in this context, because this is a ghost function
-ResolutionErrors.dfy(1489,10): Error: a hint is not allowed to make heap updates
-ResolutionErrors.dfy(1490,20): Error: in a hint, calls are allowed only to lemmas
-ResolutionErrors.dfy(1493,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
-ResolutionErrors.dfy(1510,24): Error: in a hint, calls are allowed only to lemmas
-ResolutionErrors.dfy(1517,18): Error: assignment to non-ghost field is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-ResolutionErrors.dfy(1518,10): Error: a hint is not allowed to make heap updates
-ResolutionErrors.dfy(1519,11): Error: in a hint, calls are allowed only to lemmas
-ResolutionErrors.dfy(1522,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
-ResolutionErrors.dfy(1545,29): Error: in a statement expression, calls are allowed only to lemmas
-ResolutionErrors.dfy(1557,16): Error: a possibly infinite loop is allowed only if the enclosing method is declared (with 'decreases *') to be possibly non-terminating
-ResolutionErrors.dfy(1575,12): Error: a 'break break break' statement is allowed only in contexts with 3 enclosing loops, but the current context only has 2
-ResolutionErrors.dfy(1587,20): Error: a ghost field is allowed only in specification contexts
-ResolutionErrors.dfy(1594,9): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(1600,4): Error: non-ghost variable cannot be assigned a value that depends on a ghost
-ResolutionErrors.dfy(1617,8): Error: print statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)
-ResolutionErrors.dfy(1626,29): Error: ghost variables such as z are allowed only in specification contexts. z was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(1634,10): Error: the type of the bound variable 't' could not be determined
-ResolutionErrors.dfy(1634,10): Error: the type of the bound variable 't' could not be determined
-ResolutionErrors.dfy(1634,10): Error: the type of the bound variable 't' could not be determined
-ResolutionErrors.dfy(1634,10): Error: the type of the bound variable 't' could not be determined
-ResolutionErrors.dfy(1652,15): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
-ResolutionErrors.dfy(1654,10): Error: assignment to non-ghost field is not allowed in this context, because this is a ghost method
-ResolutionErrors.dfy(1679,15): Error: in a ghost context, only ghost fields can be mentioned as modifies frame targets (x)
-ResolutionErrors.dfy(1681,25): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-ResolutionErrors.dfy(1682,35): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-ResolutionErrors.dfy(1692,4): Error: 'decreases *' is not allowed on ghost loops
-ResolutionErrors.dfy(1696,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-ResolutionErrors.dfy(1706,4): Error: 'decreases *' is not allowed on ghost loops
-ResolutionErrors.dfy(1710,29): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-ResolutionErrors.dfy(1718,21): Error: the type of the bound variable 'u' could not be determined
-ResolutionErrors.dfy(1719,23): Error: the type of the bound variable 'u' could not be determined
-ResolutionErrors.dfy(1722,27): Error: the type of the bound variable 'u' could not be determined
-ResolutionErrors.dfy(1726,40): Error: the type of the bound variable 'u' could not be determined
-ResolutionErrors.dfy(1728,38): Error: the type of the bound variable 'u' could not be determined
-ResolutionErrors.dfy(1772,19): Error: Type or type parameter is not declared in this scope: realint (did you forget to qualify a name or declare a module import 'opened'?) (note that names in outer modules are not visible in contained modules)
-ResolutionErrors.dfy(1780,44): Error: range of comprehension must be of type bool (instead got C)
-ResolutionErrors.dfy(1787,21): Error: Duplicate member name: P
-ResolutionErrors.dfy(1789,17): Error: Duplicate member name: L
-ResolutionErrors.dfy(1797,4): Error: second argument to && must be of type bool (instead got int)
-ResolutionErrors.dfy(1795,17): Error: Function body type mismatch (expected int, got bool)
-ResolutionErrors.dfy(1801,4): Error: second argument to && must be of type bool (instead got int)
-ResolutionErrors.dfy(1805,4): Error: second argument to || must be of type bool (instead got int)
-ResolutionErrors.dfy(1803,17): Error: Function body type mismatch (expected int, got bool)
-ResolutionErrors.dfy(1809,4): Error: second argument to || must be of type bool (instead got int)
-ResolutionErrors.dfy(1813,8): Error: second argument to || must be of type bool (instead got int)
-ResolutionErrors.dfy(1811,17): Error: Function body type mismatch (expected int, got bool)
-ResolutionErrors.dfy(1834,6): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1835,11): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1835,15): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1836,16): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1837,6): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1840,6): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1841,19): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1842,8): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1844,8): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1845,13): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1846,13): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1847,14): Error: in the first division of the constructor body (before 'new;'), 'this' can only be used to assign to its fields
-ResolutionErrors.dfy(1878,15): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(1880,16): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(1896,8): Error: return statement is not allowed before 'new;' in a constructor
-ResolutionErrors.dfy(1922,5): Error: type parameter (G) passed to method P must support auto-initialization (got F) (perhaps try declaring type parameter 'F' on line 1915 as 'F(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(1924,5): Error: type parameter (G) passed to method P must support auto-initialization (got Y) (perhaps try declaring abstract type 'Y' on line 1912 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(1961,5): Error: type parameter (G) passed to method P must support auto-initialization (got SixOrMore)
-ResolutionErrors.dfy(1962,5): Error: type parameter (G) passed to method P must support auto-initialization (got AnotherSixOrMore)
-ResolutionErrors.dfy(1963,5): Error: type parameter (G) passed to method P must support auto-initialization (got MySixOrMore)
-ResolutionErrors.dfy(1964,5): Error: type parameter (G) passed to method P must support auto-initialization (got UnclearA)
-ResolutionErrors.dfy(1980,17): Error: type parameter (G) passed to method P must support auto-initialization (got SSixOrMore)
-ResolutionErrors.dfy(1981,24): Error: type parameter (G) passed to method P must support auto-initialization (got SAnotherSixOrMore)
-ResolutionErrors.dfy(1982,19): Error: type parameter (G) passed to method P must support auto-initialization (got SMySixOrMore)
-ResolutionErrors.dfy(1983,16): Error: type parameter (G) passed to method P must support auto-initialization (got SUnclearA)
-ResolutionErrors.dfy(2013,7): Error: type 'B2', which does not support auto-initialization, is used to refine an abstract type that expects auto-initialization
-ResolutionErrors.dfy(2014,7): Error: type 'B3', which does not support auto-initialization, is used to refine an abstract type that expects auto-initialization
-ResolutionErrors.dfy(2018,7): Error: type 'C3', which may be empty, is used to refine an abstract type expected to be nonempty
-ResolutionErrors.dfy(2048,4): Error: type parameter 'Q' is not allowed to change the requirement of supporting auto-initialization
-ResolutionErrors.dfy(2051,4): Error: type parameter 'R' is not allowed to change the requirement of supporting auto-initialization
-ResolutionErrors.dfy(2038,7): Error: type declaration 'A1' is not allowed to change the requirement of supporting auto-initialization
-ResolutionErrors.dfy(2039,7): Error: type declaration 'A2' is not allowed to change the requirement of being nonempty
-ResolutionErrors.dfy(2040,7): Error: type declaration 'B0' is not allowed to change the requirement of supporting auto-initialization
-ResolutionErrors.dfy(2042,7): Error: type declaration 'B2' is not allowed to change the requirement of supporting auto-initialization
-ResolutionErrors.dfy(2043,7): Error: type declaration 'C0' is not allowed to change the requirement of being nonempty
-ResolutionErrors.dfy(2044,7): Error: type declaration 'C1' is not allowed to change the requirement of supporting auto-initialization
-ResolutionErrors.dfy(2034,5): Error: type parameter (G) passed to method P must support auto-initialization (got Z.XYZ)
-ResolutionErrors.dfy(2097,33): Error: type of yield-parameter must support auto-initialization (got 'T')
-ResolutionErrors.dfy(2105,13): Error: a ghost function is allowed only in specification contexts
-ResolutionErrors.dfy(2119,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2120,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2122,19): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F' is not allowed to use ORDINAL
-ResolutionErrors.dfy(2123,9): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F'' is not allowed to use ORDINAL
-ResolutionErrors.dfy(2124,9): Error: type parameter 'G' (passed in as '(char, ORDINAL)') to function call 'F'' is not allowed to use ORDINAL
-ResolutionErrors.dfy(2125,18): Error: type parameter 'G' (passed in as 'ORDINAL') to the function 'F'' is not allowed to use ORDINAL
-ResolutionErrors.dfy(2126,4): Error: type parameter 'G' (passed in as 'ORDINAL') to the method 'ParameterizedMethod' is not allowed to use ORDINAL
-ResolutionErrors.dfy(2130,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2132,14): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2133,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2134,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2135,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2137,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2140,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2140,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2141,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2141,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2141,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2141,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2143,25): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2169,36): Error: Name of yield-parameter is used by another member of the iterator: u
-ResolutionErrors.dfy(2170,37): Error: Name of implicit yield-history variable 'u' is already used by another member of the iterator
-ResolutionErrors.dfy(2194,15): Error: To access members of class 'MyClass', write 'MyClass', not 'MyClass?'
-ResolutionErrors.dfy(2205,15): Error: name of type (MyClass) is used as a variable
-ResolutionErrors.dfy(2206,15): Error: name of type (MyClass?) is used as a variable
-ResolutionErrors.dfy(2219,17): Error: To access members of class 'MyClass', write 'MyClass', not 'MyClass?'
-ResolutionErrors.dfy(2230,17): Error: name of type (MyClass) is used as a variable
-ResolutionErrors.dfy(2231,17): Error: name of type (MyClass?) is used as a variable
-ResolutionErrors.dfy(2240,8): Error: static non-ghost const field 'X' of type 'Odd' (which does not have a default compiled value) must give a defining value
-ResolutionErrors.dfy(2243,8): Error: static non-ghost const field 'Y' of type 'MyClass' (which does not have a default compiled value) must give a defining value
-ResolutionErrors.dfy(2244,14): Error: static ghost const field 'Y'' of type 'MyClass' (which may be empty) must give a defining value
-ResolutionErrors.dfy(2248,17): Error: static non-ghost const field 'W' of type 'MyClass' (which does not have a default compiled value) must give a defining value
-ResolutionErrors.dfy(2250,17): Error: static non-ghost const field 'O' of type 'Odd' (which does not have a default compiled value) must give a defining value
-ResolutionErrors.dfy(2256,17): Error: static non-ghost const field 'W' of type 'MyClass' (which does not have a default compiled value) must give a defining value
-ResolutionErrors.dfy(2258,17): Error: static non-ghost const field 'O' of type 'Odd' (which does not have a default compiled value) must give a defining value
-ResolutionErrors.dfy(2266,8): Error: class 'Instance' with fields without known initializers, like 'w' of type 'MyClass', must declare a constructor
-ResolutionErrors.dfy(2272,8): Error: class 'GhostCl' with fields without known initializers, like 'z' of type 'MyClass', must declare a constructor
-ResolutionErrors.dfy(2282,6): Error: LHS of assignment must denote a mutable field
-ResolutionErrors.dfy(2283,10): Error: LHS of assignment must denote a mutable field
-ResolutionErrors.dfy(2290,6): Error: LHS of assignment must denote a mutable field
-ResolutionErrors.dfy(2297,8): Error: LHS of assignment must denote a mutable field of 'this'
-ResolutionErrors.dfy(2314,18): Error: a ghost const field is allowed only in specification contexts
-ResolutionErrors.dfy(2311,20): Error: a ghost const field is allowed only in specification contexts
-ResolutionErrors.dfy(2330,9): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
-ResolutionErrors.dfy(2333,9): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
-ResolutionErrors.dfy(2341,22): Error: a set comprehension involved in a const field definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
-ResolutionErrors.dfy(2339,24): Error: a set comprehension involved in a const field definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
-ResolutionErrors.dfy(2342,36): Error: a set comprehension involved in a newtype definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
-ResolutionErrors.dfy(2343,34): Error: a set comprehension involved in a subset type definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
-ResolutionErrors.dfy(2348,18): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'c'
-ResolutionErrors.dfy(2349,18): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'c'
-ResolutionErrors.dfy(2355,19): Error: a set comprehension involved in a predicate definition is not allowed to depend on the set of allocated references, but values of 'c' (of type 'Class') may contain references (see documentation for 'older' parameters)
-ResolutionErrors.dfy(2363,35): Error: a const field definition is not allowed to depend on the set of allocated references
-ResolutionErrors.dfy(2361,37): Error: a const field definition is not allowed to depend on the set of allocated references
-ResolutionErrors.dfy(2364,49): Error: a newtype definition is not allowed to depend on the set of allocated references
-ResolutionErrors.dfy(2365,47): Error: a subset type definition is not allowed to depend on the set of allocated references
-ResolutionErrors.dfy(2370,32): Error: a predicate definition is not allowed to depend on the set of allocated references
-ResolutionErrors.dfy(2378,39): Error: a const field definition is not allowed to depend on the set of allocated references
-ResolutionErrors.dfy(2376,41): Error: a const field definition is not allowed to depend on the set of allocated references
-ResolutionErrors.dfy(2379,53): Error: a newtype definition is not allowed to depend on the set of allocated references
-ResolutionErrors.dfy(2380,51): Error: a subset type definition is not allowed to depend on the set of allocated references
-ResolutionErrors.dfy(2385,36): Error: a predicate definition is not allowed to depend on the set of allocated references
-ResolutionErrors.dfy(2392,31): Error: the value returned by an abstemious function must come from invoking a co-constructor
-ResolutionErrors.dfy(2428,31): Error: the value returned by an abstemious function must come from invoking a co-constructor
-ResolutionErrors.dfy(2435,32): Error: an abstemious function is allowed to invoke a codatatype destructor only on its parameters
-ResolutionErrors.dfy(2440,12): Error: an abstemious function is allowed to codatatype-match only on its parameters
-ResolutionErrors.dfy(2447,9): Error: an abstemious function is not allowed to check codatatype equality
-ResolutionErrors.dfy(2449,14): Error: an abstemious function is not allowed to check codatatype equality
-ResolutionErrors.dfy(2474,19): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F' is not allowed to use ORDINAL
-ResolutionErrors.dfy(2475,13): Error: type parameter 'G' (passed in as 'ORDINAL') to function call 'F'' is not allowed to use ORDINAL
-ResolutionErrors.dfy(2476,13): Error: type parameter 'G' (passed in as '(char, ORDINAL)') to function call 'F'' is not allowed to use ORDINAL
-ResolutionErrors.dfy(2477,18): Error: type parameter 'G' (passed in as 'ORDINAL') to the function 'F'' is not allowed to use ORDINAL
-ResolutionErrors.dfy(2478,4): Error: type parameter 'G' (passed in as 'ORDINAL') to the lemma 'ParameterizedLemma' is not allowed to use ORDINAL
-ResolutionErrors.dfy(2479,18): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
-ResolutionErrors.dfy(2480,18): Error: type of bound variable 'r' ('(ORDINAL, int)') is not allowed to use type ORDINAL
-ResolutionErrors.dfy(2481,26): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
-ResolutionErrors.dfy(2482,17): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
-ResolutionErrors.dfy(2483,18): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
-ResolutionErrors.dfy(2484,24): Error: type of bound variable 'r' ('ORDINAL') is not allowed to use type ORDINAL
-ResolutionErrors.dfy(2495,25): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2496,17): Error: type of bound variable 'yt' ('ORDINAL') is not allowed to use type ORDINAL
-ResolutionErrors.dfy(2493,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2493,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2492,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2489,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2487,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2486,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2485,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2484,14): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2482,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2472,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2471,8): Error: an ORDINAL type is not allowed to be used as a type argument
-ResolutionErrors.dfy(2528,11): Error: no label 'L' in scope at this time
-ResolutionErrors.dfy(2531,10): Error: label shadows a dominating label
-ResolutionErrors.dfy(2539,10): Error: label shadows a dominating label
-ResolutionErrors.dfy(2611,23): Error: no label 'Treasure' in scope at this time
-ResolutionErrors.dfy(2612,19): Error: no label 'WonderfulLabel' in scope at this time
-ResolutionErrors.dfy(2614,23): Error: no label 'FutureLabel' in scope at this time
-ResolutionErrors.dfy(2623,13): Error: no label 'Treasure' in scope at this time
-ResolutionErrors.dfy(2624,13): Error: no label 'WonderfulLabel' in scope at this time
-ResolutionErrors.dfy(2626,13): Error: no label 'FutureLabel' in scope at this time
-ResolutionErrors.dfy(2635,13): Error: no label 'Treasure' in scope at this time
-ResolutionErrors.dfy(2636,13): Error: no label 'WonderfulLabel' in scope at this time
-ResolutionErrors.dfy(2638,13): Error: no label 'FutureLabel' in scope at this time
-ResolutionErrors.dfy(2667,26): Error: type parameter (G) passed to method GimmieOne must support auto-initialization (got Yt<GW>)
-ResolutionErrors.dfy(2680,50): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(2706,11): Error: name of type (Cache) is used as a variable
-ResolutionErrors.dfy(2706,17): Error: incorrect type for selection into ? (got X)
-ResolutionErrors.dfy(2714,13): Warning: the quantifier has the form 'exists x :: A ==> B', which most often is a typo for 'exists x :: A && B'; if you think otherwise, rewrite as 'exists x :: (A ==> B)' or 'exists x :: !A || B' to suppress this warning
-ResolutionErrors.dfy(2724,13): Warning: the quantifier has the form 'exists x :: A ==> B', which most often is a typo for 'exists x :: A && B'; if you think otherwise, rewrite as 'exists x :: (A ==> B)' or 'exists x :: !A || B' to suppress this warning
-ResolutionErrors.dfy(2757,13): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-ResolutionErrors.dfy(2758,13): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-ResolutionErrors.dfy(2760,11): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(2781,4): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(2791,15): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-ResolutionErrors.dfy(2792,22): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-ResolutionErrors.dfy(2798,15): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-ResolutionErrors.dfy(2799,22): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-ResolutionErrors.dfy(2816,23): Error: type of left argument to * (int) must agree with the result type (bool)
-ResolutionErrors.dfy(2816,23): Error: type of * must be of a numeric type, bitvector type, or a set-like type (instead got bool)
-ResolutionErrors.dfy(2815,13): Error: not resolving module 'V' because there were errors in resolving its nested module 'W'
-ResolutionErrors.dfy(2825,21): Error: type of left argument to * (int) must agree with the result type (bool)
-ResolutionErrors.dfy(2825,21): Error: type of * must be of a numeric type, bitvector type, or a set-like type (instead got bool)
-ResolutionErrors.dfy(2824,11): Error: not resolving module 'V' because there were errors in resolving its nested module 'W'
-ResolutionErrors.dfy(2811,9): Error: not resolving module 'ErrorsFromNestedModules' because there were errors in resolving its nested module 'U'
-ResolutionErrors.dfy(2833,11): Error: duplicate name of top-level declaration: G
-ResolutionErrors.dfy(2839,11): Error: duplicate name of top-level declaration: H
-ResolutionErrors.dfy(2855,4): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(2857,20): Error: ghost variables such as y are allowed only in specification contexts. y was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(2866,6): Error: ghost variables such as i are allowed only in specification contexts. i was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(2867,4): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(2876,6): Error: ghost variables such as i are allowed only in specification contexts. i was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(2877,8): Error: ghost variables such as i are allowed only in specification contexts. i was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(2878,4): Error: ghost variables such as b are allowed only in specification contexts. b was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(2890,13): Error: expression is not allowed to refer to constant field x
-ResolutionErrors.dfy(2892,22): Error: expression is not allowed to refer to constant field x
-ResolutionErrors.dfy(2903,13): Error: arguments must be of a set or multiset type (got map<X, Y>)
-ResolutionErrors.dfy(2913,4): Error: expect statement is not allowed in this context (because this is a ghost method or because the statement is guarded by a specification-only expression)
-ResolutionErrors.dfy(2919,11): Error: quantifiers in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'i'
-ResolutionErrors.dfy(2920,21): Error: ghost variables such as g are allowed only in specification contexts. g was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(2931,15): Error: RHS (of type X) not assignable to LHS (of type X)
-ResolutionErrors.dfy(2935,10): Error: type of corresponding source/RHS (X) does not match type of bound variable (X)
-ResolutionErrors.dfy(2963,16): Error: sequence update requires the value to have the element type of the sequence (got Trait)
-ResolutionErrors.dfy(2967,11): Error: multiset update requires domain element to be of type Elem (got Trait)
-ResolutionErrors.dfy(2972,13): Error: map update requires domain element to be of type Elem (got Trait)
-ResolutionErrors.dfy(2974,18): Error: map update requires the value to have the range type Elem (got Trait)
-ResolutionErrors.dfy(2999,5): Error: type parameter (F) passed to method Q must support auto-initialization (got Y) (perhaps try declaring type parameter 'Y' on line 2994 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(3002,5): Error: type parameter (F) passed to method Q must support auto-initialization (got Z) (perhaps try declaring type parameter 'Z' on line 2994 as 'Z(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(3003,5): Error: type parameter (G) passed to method P must support nonempty (got Z) (perhaps try declaring type parameter 'Z' on line 2994 as 'Z(00)', which says it can only be instantiated with a nonempty type)
-ResolutionErrors.dfy(3012,9): Error: type parameter (F) passed to function FQ must support auto-initialization (got Y) (perhaps try declaring type parameter 'Y' on line 3007 as 'Y(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(3015,9): Error: type parameter (F) passed to function FQ must support auto-initialization (got Z) (perhaps try declaring type parameter 'Z' on line 3007 as 'Z(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(3016,9): Error: type parameter (G) passed to function FP must support nonempty (got Z) (perhaps try declaring type parameter 'Z' on line 3007 as 'Z(00)', which says it can only be instantiated with a nonempty type)
-ResolutionErrors.dfy(3033,9): Error: a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword)
-ResolutionErrors.dfy(3034,9): Error: a call to a ghost predicate is allowed only in specification contexts (consider declaring the predicate without the 'ghost' keyword)
-ResolutionErrors.dfy(3035,9): Error: a call to a least predicate is allowed only in specification contexts
-ResolutionErrors.dfy(3036,9): Error: a call to a greatest predicate is allowed only in specification contexts
-ResolutionErrors.dfy(3037,9): Error: a call to a twostate function is allowed only in specification contexts
-ResolutionErrors.dfy(3038,9): Error: a call to a twostate predicate is allowed only in specification contexts
-ResolutionErrors.dfy(3055,9): Error: function 'F0' expects 0 type arguments (got 1)
-ResolutionErrors.dfy(3057,9): Error: function 'F2' expects 2 type arguments (got 1)
-ResolutionErrors.dfy(3058,9): Error: function 'F0' expects 0 type arguments (got 2)
-ResolutionErrors.dfy(3059,9): Error: function 'F1' expects 1 type argument (got 2)
-ResolutionErrors.dfy(3067,4): Error: method 'M0' expects 0 type arguments (got 1)
-ResolutionErrors.dfy(3069,4): Error: method 'M2' expects 2 type arguments (got 1)
-ResolutionErrors.dfy(3070,4): Error: method 'M0' expects 0 type arguments (got 2)
-ResolutionErrors.dfy(3071,4): Error: method 'M1' expects 1 type argument (got 2)
-ResolutionErrors.dfy(3084,10): Error: ghost variables such as c are allowed only in specification contexts. c was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(3088,14): Error: ghost variables such as t are allowed only in specification contexts. t was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(3093,10): Error: ghost variables such as a' are allowed only in specification contexts. a' was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(3094,10): Error: ghost variables such as c' are allowed only in specification contexts. c' was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(3118,9): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3123,9): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got Z) (perhaps try declaring type parameter 'Z' on line 3114 as 'Z(00)', which says it can only be instantiated with a nonempty type)
-ResolutionErrors.dfy(3125,9): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
-ResolutionErrors.dfy(3126,9): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
-ResolutionErrors.dfy(3130,9): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Z) (perhaps try declaring type parameter 'Z' on line 3114 as 'Z(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(3134,9): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
-ResolutionErrors.dfy(3137,9): Error: type parameter (T) passed to function MustSupportEquality must support equality (got Z) (perhaps try declaring type parameter 'Z' on line 3114 as 'Z(==)', which says it can only be instantiated with a type that supports equality)
-ResolutionErrors.dfy(3142,9): Error: type parameter (T) passed to function NoReferences must support no references (got Class?)
-ResolutionErrors.dfy(3144,9): Error: type parameter (T) passed to function NoReferences must support no references (got Z) (perhaps try declaring type parameter 'Z' on line 3114 as 'Z(!new)', which says it can only be instantiated with a type that contains no references)
-ResolutionErrors.dfy(3151,9): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3157,9): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
-ResolutionErrors.dfy(3172,9): Error: type parameter (T) passed to function NoReferences must support no references (got Class?)
-ResolutionErrors.dfy(3181,12): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 3179 as 'T(==)', which says it can only be instantiated with a type that supports equality)
-ResolutionErrors.dfy(3183,7): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 3179 as 'T(==)', which says it can only be instantiated with a type that supports equality)
-ResolutionErrors.dfy(3186,12): Error: type parameter (T) passed to function GetInt must support equality (got NoEquality)
-ResolutionErrors.dfy(3188,7): Error: type parameter (T) passed to function GetInt must support equality (got NoEquality)
-ResolutionErrors.dfy(3191,19): Error: type parameter (T) passed to function GetInt must support equality (got NoEquality)
-ResolutionErrors.dfy(3199,13): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 3198 as 'T(==)', which says it can only be instantiated with a type that supports equality)
-ResolutionErrors.dfy(3204,13): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 3198 as 'T(==)', which says it can only be instantiated with a type that supports equality)
-ResolutionErrors.dfy(3206,23): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 3198 as 'T(==)', which says it can only be instantiated with a type that supports equality)
-ResolutionErrors.dfy(3208,14): Error: type parameter 0 (T) passed to type QuadEq must support equality (got seq<T>)
-ResolutionErrors.dfy(3209,15): Error: type parameter 1 (U) passed to type QuadEq must support equality (got seq<T>)
-ResolutionErrors.dfy(3218,15): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 3215 as 'T(==)', which says it can only be instantiated with a type that supports equality)
-ResolutionErrors.dfy(3227,15): Error: == can only be applied to expressions of types that support equality (got T) (perhaps try declaring type parameter 'T' on line 3215 as 'T(==)', which says it can only be instantiated with a type that supports equality)
-ResolutionErrors.dfy(3245,11): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3246,11): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
-ResolutionErrors.dfy(3247,11): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
-ResolutionErrors.dfy(3248,11): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
-ResolutionErrors.dfy(3249,11): Error: type parameter (T) passed to function NoReferences must support no references (got Class?)
-ResolutionErrors.dfy(3253,47): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3254,12): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3258,11): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3259,11): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
-ResolutionErrors.dfy(3260,11): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
-ResolutionErrors.dfy(3261,11): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
-ResolutionErrors.dfy(3262,11): Error: type parameter (T) passed to function NoReferences must support no references (got Class?)
-ResolutionErrors.dfy(3266,50): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3267,12): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3270,12): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
-ResolutionErrors.dfy(3274,12): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
-ResolutionErrors.dfy(3279,53): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3282,63): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3299,6): Error: ghost variables such as m are allowed only in specification contexts. m was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(3303,8): Error: non-ghost variable cannot be assigned a value that depends on a ghost
-ResolutionErrors.dfy(3307,18): Error: ghost variables such as m are allowed only in specification contexts. m was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(3333,6): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3339,6): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
-ResolutionErrors.dfy(3340,6): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got Nonempty)
-ResolutionErrors.dfy(3347,6): Error: type parameter (T) passed to function MustSupportEquality must support equality (got NoEquality)
-ResolutionErrors.dfy(3354,6): Error: type parameter (T) passed to function NoReferences must support no references (got Class?)
-ResolutionErrors.dfy(3360,9): Error: type parameter (T) passed to function MustBeNonempty must support nonempty (got PossiblyEmpty)
-ResolutionErrors.dfy(3366,9): Error: type parameter (T) passed to function MustBeAutoInit must support auto-initialization (got PossiblyEmpty)
-ResolutionErrors.dfy(3381,9): Error: type parameter (T) passed to function NoReferences must support no references (got Class?)
-ResolutionErrors.dfy(3429,7): Error: ghost variables such as p are allowed only in specification contexts. p was inferred to be ghost based on its declaration or initialization.
-ResolutionErrors.dfy(3443,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
-ResolutionErrors.dfy(3450,21): Error: a loop in a hint is not allowed to use 'modifies' clauses
-ResolutionErrors.dfy(3479,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got multiset<object>)
-ResolutionErrors.dfy(3480,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got map<object, int>)
-ResolutionErrors.dfy(3481,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got map<int, object>)
-ResolutionErrors.dfy(3482,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got imap<object, object>)
-ResolutionErrors.dfy(3487,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int)
-ResolutionErrors.dfy(3488,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got set<bool>)
-ResolutionErrors.dfy(3489,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got iset<bv8>)
-ResolutionErrors.dfy(3490,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got seq<int>)
-ResolutionErrors.dfy(3495,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> int)
-ResolutionErrors.dfy(3496,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> object)
-ResolutionErrors.dfy(3497,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> set<object>)
-ResolutionErrors.dfy(3498,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got int -> seq<object>)
-ResolutionErrors.dfy(3499,9): Error: the argument of a fresh expression must denote an object or a set or sequence of objects (instead got set<object> -> int)
-ResolutionErrors.dfy(3518,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got map<object, int>)
-ResolutionErrors.dfy(3519,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got map<int, object>)
-ResolutionErrors.dfy(3520,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got imap<object, object>)
-ResolutionErrors.dfy(3525,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int)
-ResolutionErrors.dfy(3526,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got set<bool>)
-ResolutionErrors.dfy(3527,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got iset<bv8>)
-ResolutionErrors.dfy(3528,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got seq<int>)
-ResolutionErrors.dfy(3537,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> int)
-ResolutionErrors.dfy(3538,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> object)
-ResolutionErrors.dfy(3539,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> set<object>)
-ResolutionErrors.dfy(3540,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> iset<object>)
-ResolutionErrors.dfy(3541,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> seq<object>)
-ResolutionErrors.dfy(3542,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got set<object> -> int)
-ResolutionErrors.dfy(3543,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> multiset<object>)
-ResolutionErrors.dfy(3544,19): Error: an unchanged expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> map<object, object>)
-ResolutionErrors.dfy(3559,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got map<object, int>)
-ResolutionErrors.dfy(3560,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got map<int, object>)
-ResolutionErrors.dfy(3561,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got imap<object, object>)
-ResolutionErrors.dfy(3566,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int)
-ResolutionErrors.dfy(3567,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got set<bool>)
-ResolutionErrors.dfy(3568,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got iset<bv8>)
-ResolutionErrors.dfy(3569,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got seq<int>)
-ResolutionErrors.dfy(3577,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> int)
-ResolutionErrors.dfy(3578,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> object)
-ResolutionErrors.dfy(3579,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> set<object>)
-ResolutionErrors.dfy(3580,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> iset<object>)
-ResolutionErrors.dfy(3581,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got int -> seq<object>)
-ResolutionErrors.dfy(3582,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got set<object> -> int)
-ResolutionErrors.dfy(3583,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> multiset<object>)
-ResolutionErrors.dfy(3584,13): Error: a modifies-clause expression must denote an object or a set/iset/multiset/seq of objects (instead got bool -> map<object, object>)
-ResolutionErrors.dfy(3600,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got map<object, int>)
-ResolutionErrors.dfy(3601,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got map<int, object>)
-ResolutionErrors.dfy(3602,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got imap<object, object>)
-ResolutionErrors.dfy(3608,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got int)
-ResolutionErrors.dfy(3609,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got set<bool>)
-ResolutionErrors.dfy(3610,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got iset<bv8>)
-ResolutionErrors.dfy(3611,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got seq<int>)
-ResolutionErrors.dfy(3620,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got int -> int)
-ResolutionErrors.dfy(3621,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got int -> object)
-ResolutionErrors.dfy(3625,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got set<object> -> int)
-ResolutionErrors.dfy(3627,10): Error: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got bool -> map<object, object>)
-ResolutionErrors.dfy(3646,12): Error: a 'break break break continue' statement is allowed only in contexts with 4 enclosing loops, but the current context only has 3
-ResolutionErrors.dfy(3683,27): Error: continue label must designate a loop: X
-ResolutionErrors.dfy(3685,27): Error: continue label must designate a loop: Y0
-ResolutionErrors.dfy(3687,27): Error: continue label must designate a loop: Y1
-ResolutionErrors.dfy(3689,27): Error: continue label must designate a loop: Z
-ResolutionErrors.dfy(3699,4): Error: a non-labeled 'break' statement is allowed only in loops
-ResolutionErrors.dfy(3703,4): Error: a non-labeled 'continue' statement is allowed only in loops
-ResolutionErrors.dfy(3709,19): Error: a non-labeled 'break' statement is allowed only in loops
-ResolutionErrors.dfy(3710,19): Error: a non-labeled 'continue' statement is allowed only in loops
-ResolutionErrors.dfy(3712,28): Error: continue label must designate a loop: X
-ResolutionErrors.dfy(3729,21): Error: a non-labeled 'break' statement is allowed only in loops
-ResolutionErrors.dfy(3730,21): Error: a non-labeled 'continue' statement is allowed only in loops
-ResolutionErrors.dfy(3731,27): Error: break label is undefined or not in scope: L
-ResolutionErrors.dfy(3732,30): Error: continue label is undefined or not in scope: L
-ResolutionErrors.dfy(3745,8): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
-ResolutionErrors.dfy(3754,8): Error: ghost-context break statement is not allowed to break out of non-ghost loop
-ResolutionErrors.dfy(3762,8): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
-ResolutionErrors.dfy(3777,10): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
-ResolutionErrors.dfy(3800,10): Error: ghost-context continue statement is not allowed to continue out of non-ghost loop
-ResolutionErrors.dfy(3856,13): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3856,18): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3865,13): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3865,18): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3883,22): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3851,22): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3851,27): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3857,12): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3857,17): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3855,25): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3855,30): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3862,22): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3862,27): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3866,12): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3866,17): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3864,22): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3864,27): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3868,23): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3868,28): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3882,32): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3885,29): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3884,33): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3887,29): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3886,41): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3872,23): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3872,28): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3891,21): Error: 'this' is not allowed in a 'static' context
-ResolutionErrors.dfy(3891,26): Error: type of the receiver is not fully determined at this program point
-ResolutionErrors.dfy(3900,20): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 3900 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(3901,25): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 3901 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(3903,17): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 3903 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(3904,32): Error: type parameter (G) passed to type AutoStream must support auto-initialization (got G) (perhaps try declaring type parameter 'G' on line 3904 as 'G(0)', which says it can only be instantiated with a type that supports auto-initialization)
-ResolutionErrors.dfy(3927,6): Error: when allocating an object of type 'ClassWithConstructor', one of its constructor methods must be called
-ResolutionErrors.dfy(3928,6): Error: when allocating an object of type 'ClassWithConstructor', one of its constructor methods must be called
-ResolutionErrors.dfy(3941,8): Error: when allocating an object of type 'Y', one of its constructor methods must be called
-ResolutionErrors.dfy(3946,8): Error: when allocating an object of type 'Luci', one of its constructor methods must be called
-ResolutionErrors.dfy(3947,8): Error: when allocating an object of type 'Luci', one of its constructor methods must be called
-629 resolution/type errors detected in ResolutionErrors.dfy
diff --git a/Test/dafny0/ReturnTests.dfy.expect b/Test/dafny0/ReturnTests.dfy.expect
deleted file mode 100644
index 0825601cd97..00000000000
--- a/Test/dafny0/ReturnTests.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 9 verified, 0 errors
diff --git a/Test/dafny0/RevealConsistency.dfy.expect b/Test/dafny0/RevealConsistency.dfy.expect
deleted file mode 100644
index d441109d535..00000000000
--- a/Test/dafny0/RevealConsistency.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-RevealConsistency.dfy(7,15): Error: a postcondition could not be proved on this return path
-RevealConsistency.dfy(8,14): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/dafny0/Shadows.dfy b/Test/dafny0/Shadows.dfy
deleted file mode 100644
index 230e0d183c0..00000000000
--- a/Test/dafny0/Shadows.dfy
+++ /dev/null
@@ -1,42 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /warnShadowing "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module Module0 {
-  class C<alpha> {
-    method M<beta, beta>(x: beta)  // error: duplicate type parameter
-    method P<alpha>(x: alpha)  // shadowed type parameter
-    ghost function F<beta, beta>(x: beta): int  // error: duplicate type parameter
-    ghost function G<alpha>(x: alpha): int  // shadowed type parameter
-
-    method Q0(x: int) returns (x: int)  // error: duplicate variable name
-  }
-}
-module Module1 {
-  class D {
-    method Q1(x: int) returns (y: int)
-    {
-      var x;  // shadowed
-      var y;  // error: duplicate
-    }
-
-    var f: int
-    method R()
-    {
-      var f;  // okay
-      var f;  // error: duplicate
-    }
-    method S()
-    {
-      var x;
-      {
-        var x;  // shadow
-      }
-    }
-    method T()
-    {
-      var x;
-      ghost var b := forall x :: x < 10;  // shadow
-      ghost var c := forall y :: forall y :: y != y + 1;  // shadow
-    }
-  }
-}
diff --git a/Test/dafny0/Shadows.dfy.expect b/Test/dafny0/Shadows.dfy.expect
deleted file mode 100644
index 77e2cfb8bc2..00000000000
--- a/Test/dafny0/Shadows.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-Shadows.dfy(6,19): Error: Duplicate type-parameter name: beta
-Shadows.dfy(7,13): Warning: Shadowed type-parameter name: alpha
-Shadows.dfy(8,27): Error: Duplicate type-parameter name: beta
-Shadows.dfy(9,21): Warning: Shadowed type-parameter name: alpha
-Shadows.dfy(11,31): Error: Duplicate parameter name: x
-Shadows.dfy(18,10): Warning: Shadowed local-variable name: x
-Shadows.dfy(19,10): Error: Duplicate local-variable name: y
-Shadows.dfy(26,10): Error: Duplicate local-variable name: f
-Shadows.dfy(32,12): Warning: Shadowed local-variable name: x
-Shadows.dfy(38,28): Warning: Shadowed bound-variable name: x
-Shadows.dfy(39,40): Warning: Shadowed bound-variable name: y
-5 resolution/type errors detected in Shadows.dfy
diff --git a/Test/dafny0/ShowSnippets.dfy.expect b/Test/dafny0/ShowSnippets.dfy.expect
deleted file mode 100644
index 83f08c23c89..00000000000
--- a/Test/dafny0/ShowSnippets.dfy.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-ShowSnippets.dfy(13,9): Error: assertion could not be proved
-   |
-13 |   assert false;
-   |          ^^^^^
-
-ShowSnippets.dfy(17,2): Error: a precondition for this call could not be proved
-   |
-17 |   Never();
-   |   ^^^^^^^^
-
-ShowSnippets.dfy(10,32): Related location: this is the precondition that could not be proved
-   |
-10 | method Never() requires true && false {}
-   |                                 ^^^^^
-
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny0/Simple.dfy b/Test/dafny0/Simple.dfy
deleted file mode 100644
index 129991681d9..00000000000
--- a/Test/dafny0/Simple.dfy
+++ /dev/null
@@ -1,103 +0,0 @@
-// RUN: %dafny /dprint:- /env:0 /noVerify "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// My first Dafny program
-// Rustan Leino, 27 January 2008
-
-class MyClass<T,U> {
-  var x: int
-
-  method M(s: bool, lotsaObjects: set<object>) returns (t: object, u: set<int>, v: seq<MyClass?<bool,U>>)
-    requires s
-    modifies this, lotsaObjects
-    ensures t == t
-    ensures old(null) != this  // warning: old(null) is the same as null
-  {
-    x := 12;
-    while (x < 100)
-      invariant x <= 100
-    {
-      x := x + 17;
-      if (x % 20 == 3) {
-        x := this.x + 1;
-      } else {
-        this.x := x + 0;
-      }
-      t, u, v := M(true, lotsaObjects);
-      var to: MyClass<T,U>;
-      t, u, v := this.M(true, lotsaObjects);
-      t, u, v := to.M(true, lotsaObjects);
-      assert v[x] != null ==> null !in v[2..x][1..][5 := v[this.x]][..10];
-    }
-  }
-
-  ghost function F(x: int, y: int, h: WildData, k: WildData): WildData
-  {
-    if x < 0 then h else
-    if (x == 0) then
-      if if h==k then true else false then h else if y == 0 then k else h
-    else k
-  }
-}
-
-// some datatype stuff:
-
-datatype List<T> = Nil | Cons(T, List<T>)
-
-datatype WildData =
-  Something() |
-  JustAboutAnything(bool, myName: set<int>, int, WildData) |
-  More(List<int>)
-
-class C {
-  var w: WildData
-  var list: List<bool>
-}
-
-lemma M(x: int)
-  ensures x < 8
-{
-  // proof would go here
-}
-greatest lemma M'(x': int)
-  ensures true
-{
-}
-
-// modifiers on functions
-
-class CF {
-  static ghost function F(): int
-  predicate G()
-  greatest predicate Co()
-  ghost function H(): int
-  static ghost function I(): real
-  static ghost predicate J()
-}
-
-// test printing of various if statements, including with omitted guards
-module A {
-  method P(x: int, y: int) {
-    if x==2 {
-    } else if * {
-    }
-    if x==10 {
-    }
-    if y==0 {
-    } else if y==1 {
-    } else if * {
-    } else if y==2 {
-    } else if (*) {
-    } else if y == 3 {
-    } else {
-    }
-  }
-}
-module B refines A {
-  method P... {
-    if ... {
-    } else if x==3 {
-    }
-    ...;
-  }
-}
diff --git a/Test/dafny0/SmallTests.dfy.expect b/Test/dafny0/SmallTests.dfy.expect
deleted file mode 100644
index bd48bdc4700..00000000000
--- a/Test/dafny0/SmallTests.dfy.expect
+++ /dev/null
@@ -1,64 +0,0 @@
-SmallTests.dfy(920,4): Warning: You have written an assert statement with a negated condition, but the lack of whitespace between 'assert' and '!' suggests you may be used to Rust and have accidentally negated the asserted condition. If you did not intend the negation, remove the '!' and the parentheses; if you do want the negation, please add a space between the 'assert' and '!'.
-SmallTests.dfy(926,4): Warning: You have written an assert statement with a negated condition, but the lack of whitespace between 'assert' and '!' suggests you may be used to Rust and have accidentally negated the asserted condition. If you did not intend the negation, remove the '!' and the parentheses; if you do want the negation, please add a space between the 'assert' and '!'.
-SmallTests.dfy(599,12): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-SmallTests.dfy(548,4): Warning: /!\ No trigger covering all quantified variables found.
-SmallTests.dfy(901,14): Error: target object might be null
-SmallTests.dfy(909,14): Error: target object might be null
-SmallTests.dfy(920,10): Error: assertion could not be proved
-SmallTests.dfy(926,10): Error: assertion could not be proved
-SmallTests.dfy(338,2): Error: a postcondition could not be proved on this return path
-SmallTests.dfy(332,10): Related location: this is the postcondition that could not be proved
-SmallTests.dfy(332,40): Related location
-SmallTests.dfy(379,11): Error: assertion could not be proved
-SmallTests.dfy(386,9): Error: assertion could not be proved
-SmallTests.dfy(396,3): Error: cannot prove termination; try supplying a decreases clause
-SmallTests.dfy(440,15): Error: a postcondition could not be proved on this return path
-SmallTests.dfy(443,40): Related location: this is the postcondition that could not be proved
-SmallTests.dfy(604,11): Error: assertion could not be proved
-SmallTests.dfy(618,19): Error: left-hand sides n.next and n.next.next might refer to the same location
-SmallTests.dfy(620,14): Error: left-hand sides a[j] and a[i] might refer to the same location
-SmallTests.dfy(627,24): Error: target object might be null
-SmallTests.dfy(640,9): Error: assertion could not be proved
-SmallTests.dfy(664,4): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-SmallTests.dfy(687,22): Error: assertion could not be proved
-SmallTests.dfy(701,9): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-SmallTests.dfy(703,9): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-SmallTests.dfy(716,8): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-SmallTests.dfy(34,11): Error: index out of range
-SmallTests.dfy(65,35): Error: possible division by zero
-SmallTests.dfy(66,50): Error: possible division by zero
-SmallTests.dfy(67,21): Error: target object might be null
-SmallTests.dfy(86,23): Error: target object might be null
-SmallTests.dfy(120,5): Error: call might violate context's modifies clause
-SmallTests.dfy(132,9): Error: call might violate context's modifies clause
-SmallTests.dfy(134,9): Error: call might violate context's modifies clause
-SmallTests.dfy(174,8): Error: assignment might update an object field not in the enclosing context's modifies clause
-SmallTests.dfy(196,25): Error: assertion could not be proved
-SmallTests.dfy(197,25): Error: assertion could not be proved
-SmallTests.dfy(199,25): Error: assertion could not be proved
-SmallTests.dfy(209,25): Error: assertion could not be proved
-SmallTests.dfy(211,25): Error: assertion could not be proved
-SmallTests.dfy(212,30): Error: assertion could not be proved
-SmallTests.dfy(214,30): Error: assertion could not be proved
-SmallTests.dfy(223,25): Error: assertion could not be proved
-SmallTests.dfy(225,30): Error: assertion could not be proved
-SmallTests.dfy(236,25): Error: assertion could not be proved
-SmallTests.dfy(239,25): Error: assertion could not be proved
-SmallTests.dfy(240,30): Error: assertion could not be proved
-SmallTests.dfy(243,30): Error: assertion could not be proved
-SmallTests.dfy(253,25): Error: assertion could not be proved
-SmallTests.dfy(255,30): Error: assertion could not be proved
-SmallTests.dfy(303,23): Error: a precondition for this call could not be proved
-SmallTests.dfy(281,16): Related location: this is the precondition that could not be proved
-SmallTests.dfy(408,11): Error: assertion could not be proved
-SmallTests.dfy(418,11): Error: assertion could not be proved
-SmallTests.dfy(428,5): Error: cannot prove termination; try supplying a decreases clause
-SmallTests.dfy(733,13): Error: assertion could not be proved
-SmallTests.dfy(754,13): Error: assertion could not be proved
-SmallTests.dfy(757,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 56 verified, 50 errors
-SmallTests.dfy.tmp.dprint.dfy(123,12): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-SmallTests.dfy.tmp.dprint.dfy(687,4): Warning: /!\ No trigger covering all quantified variables found.
-
-Dafny program verifier did not attempt verification
diff --git a/Test/dafny0/SplitExpr.dfy.expect b/Test/dafny0/SplitExpr.dfy.expect
deleted file mode 100644
index 463ab6b6991..00000000000
--- a/Test/dafny0/SplitExpr.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-SplitExpr.dfy(96,14): Error: loop invariant violation
-SplitExpr.dfy(90,49): Related location
-
-Dafny program verifier finished with 8 verified, 1 error
diff --git a/Test/dafny0/StatementExpressions.dfy b/Test/dafny0/StatementExpressions.dfy
deleted file mode 100644
index 0da5fbcd3ea..00000000000
--- a/Test/dafny0/StatementExpressions.dfy
+++ /dev/null
@@ -1,161 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-lemma M(n: nat) //returns (y: nat)
-{
-  var y := F(n, 0);
-}
-ghost function F(n: nat, p: int): nat
-{
-  calc {
-    100;
-  <  { if n != 0 { M(n-1); } }
-    102;
-  }
-  n
-}
-
-lemma MM(n: nat) returns (y: nat)
-  decreases n, 0
-{
-  if n != 0 {
-    y := FF(n-1);
-  }
-}
-ghost function FF(n: nat): nat
-  decreases n, 1
-{
-  calc {
-    100;
-  <  { var y := MM(n); }
-    102;
-  }
-  n
-}
-
-lemma P(n: nat)
-{
-  if n != 0 {
-    var y :=
-      calc {
-        12;
-        { P(n-1); }
-        12;
-      }
-      100;
-    assert y == 100;
-  }
-}
-lemma Q(n: nat)
-{
-  if n != 0 {
-    var y :=
-      calc {
-        12;
-        { Q(n+1); }  // error: cannot prove termination
-        12;
-      }
-      100;
-    assert y == 102;  // error: assertion does not hold
-  }
-}
-
-// ---------------------
-
-ghost function Fact(n: nat): nat
-{
-  if n == 0 then 1 else n * Fact(n-1)
-}
-
-lemma L(n: nat)
-  ensures 1 <= Fact(n)
-{
-}
-
-ghost function F_Fails(n: nat): int
-{
-  50 / Fact(n)  // error: possible division by zero
-}
-
-ghost function F_Succeeds(n: nat): int
-{
-  L(n);
-  50 / Fact(n)
-}
-
-ghost function F_PreconditionViolation(n: int): int
-{
-  L(n);  // error: argument might be negative
-  50 / Fact(n)
-}
-
-// --------------------- These had had parsing problems in the past
-
-lemma MyLemma(x: int) {
-  var d: Dtz;
-  if 0 < x {
-    var y: int;
-    match MyLemma(y); d {  // error: cannot prove termination
-      case Cons0(_) =>
-      case Cons1(_) =>
-    }
-  }
-}
-
-ghost function Parsing_Regression_test0(): int
-{
-  var x := 12;
-  assert x < 20;
-  MyLemma(x);
-  calc { x; < x+1; }
-  // and again
-  var x := 12;
-  assert x < 20;
-  MyLemma(x);
-  calc { x; < x+1; }
-  17
-}
-
-datatype Dtz = Cons0(int) | Cons1(bool)
-
-ghost function Parsing_Regression_test1(dtz: Dtz): int
-{
-  match dtz
-  case Cons0(s) =>
-    var x := 12;
-    assert x < 20;
-    MyLemma(x);
-    calc { x; < x+1; }
-    // and again
-    var x := 12;
-    assert x < 20;
-    MyLemma(x);
-    calc { x; < x+1; }
-    17
-  case Cons1(_) =>
-    var x := 12;
-    assert x < 20;
-    MyLemma(x);
-    calc { x; < x+1; }
-    // and again
-    var x := 12;
-    assert x < 20;
-    MyLemma(x);
-    calc { x; < x+1; }
-    19
-}
-
-ghost function Parsing_Regression_test2(): int
-{
-  // parentheses should be allowed anywhere
-  var x := 12;
-  ( assert x < 20;
-    ( MyLemma(x);
-      ( calc { x; < x+1; }
-        ( var x := 12;
-          ( assert x < 20;
-            ( MyLemma(x);
-              ( calc { x; < x+1; }
-                17
-  ) ) ) ) ) ) )
-}
diff --git a/Test/dafny0/StatementExpressions.dfy.expect b/Test/dafny0/StatementExpressions.dfy.expect
deleted file mode 100644
index 2e7d94e0268..00000000000
--- a/Test/dafny0/StatementExpressions.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-StatementExpressions.dfy(55,11): Error: cannot prove termination; try supplying a decreases clause
-StatementExpressions.dfy(59,13): Error: assertion could not be proved
-StatementExpressions.dfy(77,5): Error: possible division by zero
-StatementExpressions.dfy(88,4): Error: value does not satisfy the subset constraints of 'nat'
-StatementExpressions.dfy(98,17): Error: cannot prove termination; try supplying a decreases clause
-
-Dafny program verifier finished with 11 verified, 5 errors
diff --git a/Test/dafny0/Stdin.dfy.expect b/Test/dafny0/Stdin.dfy.expect
deleted file mode 100644
index c71edc6c31e..00000000000
--- a/Test/dafny0/Stdin.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-<stdin>(1,20): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
-<stdin>(1,0): Warning: File contains no code
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny0/Strings.dfy b/Test/dafny0/Strings.dfy
deleted file mode 100644
index 8c17e2163a9..00000000000
--- a/Test/dafny0/Strings.dfy
+++ /dev/null
@@ -1,173 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --unicode-char=false
-
-method Char(a: char, s: string, i: int) returns (b: char)
-{
-  var ch: char := *;
-  if a == ch {
-    b := ch;
-  } else if 0 <= i < |s| {
-    b := s[i];
-  } else {
-    b := *;
-  }
-}
-
-// An attribute parameter that is a string literal is passed down
-// to Boogie as a string literal.
-method {:MyAttribute "hello", "hi" + "there", 57} AttrTest()
-{
-}
-
-method M(a: char, b: char) returns (s: string, t: seq<char>)
-  ensures |s| == 3 ==> t == [a, b, b]
-{ 
-  s := *;
-  s := s + [a, b, b] + s;
-  t := s;
-  s := t[0..|s|];
-}
-
-// Note that actually printing strings with non-ASCII characters
-// is currently inconsistent across both languages and platforms.
-// See https://github.com/dafny-lang/dafny/pull/2938 for an
-// attempt to fix this that had to be reverted.
-// For now we're just making runtimes assertions about the contents of
-// strings rather than printing them and relying on the diff with the expect file.
-method Main()
-{
-  var ch: char := *;
-  var s, t := M(ch, ch);
-  print "ch = ", ch, "\n";
-  print "The string is: " + s + "\n";
-  var x, y, z, zz := Escapes();
-  print "Escape X: ", x, "\n";
-  print "Escape Y: ", y, "\n";
-  print "Escape Z: ", z, "\n";
-  // TODO: Won't work until https://github.com/dafny-lang/dafny/issues/2999 is addressed
-  // print "Escape ZZ: ", zz, "\n";
-  var c, d := CharEscapes();
-  print "Here is the end" + [c, d] + [' ', ' ', ' '] + [[d]][0] + "   ", d, "\n";
-
-  // Testing non-ASCII characters directly in string literals.
-  // Code points outside the BMP are still not supported.
-  // See https://github.com/dafny-lang/dafny/issues/818.
-  
-  var coffeeInvitation :=  "Let's go to the café";
-  assert |coffeeInvitation| == 20;
-  expect |coffeeInvitation| == 20;
-  assert coffeeInvitation[19] == 'é';
-  expect coffeeInvitation[19] == 'é';
-
-  var firstNonAsciiChar := "Ā";
-  assert |firstNonAsciiChar| == 1;
-  expect |firstNonAsciiChar| == 1;
-  assert firstNonAsciiChar[0] == 'Ā';
-  expect firstNonAsciiChar[0] == 'Ā';
-
-  // Something above the surrogate range,
-  // and a verbatim string to make sure that's handled as well.
-  var highBMPChar := @"￮";
-  assert |highBMPChar| == 1;
-  expect |highBMPChar| == 1;
-  assert highBMPChar[0] == 0xFFEE as char;
-  expect highBMPChar[0] == 0xFFEE as char;
-  
-  // Testing invalid UTF-16 content that Dafny allows (when --unicode-char=false)
-
-  var x?, y?, z? := WeirdStrings();
-  
-  expect |x?| == 30;
-  expect x?[29] as int == 55296;
-  expect |y?| == 30;
-  expect x?[29] as int == 55296;
-  expect |z?| > 2;
-  expect z?[0..2] == ['\ude0e', '\ud83d'];
-
-  var c?, d? := WeirdChars();
-  expect c? == 0xD800 as char;
-  expect d? == '\uDFFF';
-
-  // Ensuring we're precise enough about identifying \u escapes
-  print "I'm afraid you'll find escape quite impossible, \\u007", "\n";
-  print "Luckily I have this nifty gadget from my good friend, \\\u0051", "\n";
-
-  AllCharsTest();
-}
-
-method GimmieAChar(s: string) returns (ch: char)
-{
-  if s == "" {
-    ch := "tn"[1];
-    assert ch == "nt"[0];
-  } else {
-    var i :| 0 <= i < |s|;  // if guard guarantees such an i exists
-    ch := s[i];
-  }
-}
-
-method Escapes() returns (x: string, y: string, z: string, zz: string)
-  ensures |zz| > 2
-{
-  x := "I say \"hello\" \\ you say \'good bye'";
-  y := @"I say ""hello"" \ you say 'good bye'";
-  assert x == y;
-  z := "There needs to be \u0052\u0026\u0044\n\tYes, sir";
-  zz := "\ud83d\ude0e is the UTF-16 for a very cool emoji";
-}
-
-method CharEscapes() returns (c: char, d: char)
-{
-  // cool variable names, huh?
-  var 'x := 'R';
-  var x' := '\u0052';
-  assert 'x==x' ;
-  c := '\n';
-  d := '*';
-}
-
-// Strings that aren't valid UTF-16 sequences
-method WeirdStrings() returns (x: string, y: string, z: string)
-{
-  x := "What even is this character: \uD800";
-  y := "What even is this character: " + [0xD800 as char];
-  assert x == y;
-  z := "\ude0e\ud83d is not using surrogates correctly";
-}
-
-// Surrogate code points
-method WeirdChars() returns (c: char, d: char)
-{
-  c := '\uD800';
-  d := 0xDFFF as char;
-}
-
-method AllCharsTest() {
-  var allChars := set c: char {:trigger Identity(c)} | true :: Identity(c);
-  var allUTF16CodeUnits := set cp: int {:trigger Identity(cp)} | 0 <= cp < 0x1_0000 :: Identity(cp as char);
-  assert forall c: char {:trigger Identity(c)} :: 0 <= Identity(c as int) < 0x1_0000;
-  assert forall c: char :: Identity(c) in allChars;
-  assert allChars == allUTF16CodeUnits;
-
-  // I'd love to expect allChars == allCodePoints, but that's currently
-  // an O(n^2) operation in some runtimes that don't have hashcode-based
-  // set operations, and n here is 2^16. :P
-  expect |allChars| == |allUTF16CodeUnits|;
-}
-
-function Identity<T>(x: T): T { x }
-
-method CharsAndArrows() {
-  var lambda := (c: char) requires c <= 'Z' => c + 1 as char;
-  var fromLambda := lambda('C');
-  print fromLambda, "\n";
-
-  var funcRef := IncrementChar;
-  var fromFuncRef := funcRef('C');
-  print fromFuncRef, "\n";
-}
-
-function IncrementChar(c: char): char 
-  requires c <= 'Z'
-{
-  c + 1 as char
-}
diff --git a/Test/dafny0/Superposition.dfy.expect b/Test/dafny0/Superposition.dfy.expect
deleted file mode 100644
index 19ca9b2d423..00000000000
--- a/Test/dafny0/Superposition.dfy.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-Superposition.dfy(38,9): Warning: the ... refinement feature in statements is deprecated
-
-Verifying M0.C.M (correctness) ...
-  [4 proof obligations]  verified
-
-Verifying M0.C.Q (well-formedness) ...
-  [3 proof obligations]  error
-Superposition.dfy(20,20): Error: a postcondition could not be proved on this return path
-Superposition.dfy(21,25): Related location: this is the postcondition that could not be proved
-
-Verifying M0.C.R (well-formedness) ...
-  [3 proof obligations]  error
-Superposition.dfy(26,20): Error: a postcondition could not be proved on this return path
-Superposition.dfy(27,25): Related location: this is the postcondition that could not be proved
-
-Verifying M1.C.M (correctness) ...
-  [1 proof obligation]  verified
-
-Dafny program verifier finished with 2 verified, 2 errors
diff --git a/Test/dafny0/TailCalls.dfy.expect b/Test/dafny0/TailCalls.dfy.expect
deleted file mode 100644
index fd15ff0a3ca..00000000000
--- a/Test/dafny0/TailCalls.dfy.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-TailCalls.dfy(21,16): Error: this recursive call is not recognized as being tail recursive, because it is followed by non-ghost code
-TailCalls.dfy(38,24): Error: sorry, tail-call optimizations are not supported for mutually recursive methods
-TailCalls.dfy(43,24): Error: sorry, tail-call optimizations are not supported for mutually recursive methods
-TailCalls.dfy(171,13): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
-TailCalls.dfy(174,6): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
-TailCalls.dfy(178,13): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
-TailCalls.dfy(181,6): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
-TailCalls.dfy(188,32): Error: tail recursion can be specified only for functions that will be compiled, not for ghost functions
-TailCalls.dfy(195,30): Error: tail recursion can be specified only for methods that will be compiled, not for ghost methods
-TailCalls.dfy(229,7): Error: if-then-else branches have different accumulator needs for tail recursion
-TailCalls.dfy(261,2): Error: if-then-else branches have different accumulator needs for tail recursion
-TailCalls.dfy(288,14): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
-TailCalls.dfy(310,19): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
-TailCalls.dfy(316,24): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
-TailCalls.dfy(323,33): Error: to be tail recursive, every use of this function must be part of a tail call or a simple accumulating tail call
-TailCalls.dfy(338,22): Error: this recursive call is not recognized as being tail recursive, because it is followed by non-ghost code
-TailCalls.dfy(369,21): Error: this recursive call is not recognized as being tail recursive, because it is followed by non-ghost code
-TailCalls.dfy(380,31): Error: a recursive call in this context is not recognized as a tail call
-TailCalls.dfy(416,31): Error: a recursive call in this context is not recognized as a tail call
-TailCalls.dfy(416,48): Error: a recursive call in this context is not recognized as a tail call
-TailCalls.dfy(425,10): Error: the recursive call to 'FBM2' is not tail recursive because the actual out-parameter is not the formal out-parameter
-TailCalls.dfy(425,13): Error: a recursive call in this context is not recognized as a tail call
-TailCalls.dfy(437,10): Error: the recursive call to 'FBM3' is not tail recursive because the actual out-parameter is not the formal out-parameter 'r'
-TailCalls.dfy(437,13): Error: a recursive call in this context is not recognized as a tail call
-TailCalls.dfy(449,14): Error: a recursive call in this context is not recognized as a tail call
-TailCalls.dfy(451,19): Error: a recursive call in this context is not recognized as a tail call
-TailCalls.dfy(462,11): Error: a recursive call in this context is not recognized as a tail call
-TailCalls.dfy(110,14): Error: the recursive call to '_ctor' is not tail recursive, because the assignment of the LHS happens after the call
-TailCalls.dfy(126,19): Error: the recursive call to 'Compute' is not tail recursive because the actual type parameter is not the formal type parameter 'G'
-TailCalls.dfy(139,17): Error: the recursive call to 'Run' is not tail recursive because the actual type parameter 1 is not the formal type parameter 'G'
-30 resolution/type errors detected in TailCalls.dfy
diff --git a/Test/dafny0/TriggerInPredicate.dfy.expect b/Test/dafny0/TriggerInPredicate.dfy.expect
deleted file mode 100644
index 165522db591..00000000000
--- a/Test/dafny0/TriggerInPredicate.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-TriggerInPredicate.dfy(6,38): Info: Not generating triggers for "A(x, y) && z".
-TriggerInPredicate.dfy(9,20): Info: Some instances of this call are not inlined.
-TriggerInPredicate.dfy(9,20): Info: Some instances of this call are not inlined.
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny0/Tuples.dfy.expect b/Test/dafny0/Tuples.dfy.expect
deleted file mode 100644
index 025120723fe..00000000000
--- a/Test/dafny0/Tuples.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-Tuples.dfy(22,18): Error: assertion could not be proved
-Tuples.dfy(24,20): Error: possible division by zero
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny0/Twostate-Functions.dfy.expect b/Test/dafny0/Twostate-Functions.dfy.expect
deleted file mode 100644
index 13e2cf3441d..00000000000
--- a/Test/dafny0/Twostate-Functions.dfy.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-Twostate-Functions.dfy(11,27): Error: receiver might not be allocated in the state in which its fields are accessed
-Twostate-Functions.dfy(18,12): Error: receiver might not be allocated in the state in which its fields are accessed
-Twostate-Functions.dfy(23,8): Error: insufficient reads clause to read field
-Twostate-Functions.dfy(66,17): Error: assertion could not be proved
-Twostate-Functions.dfy(54,14): Related location
-Twostate-Functions.dfy(68,15): Error: assertion could not be proved
-Twostate-Functions.dfy(54,14): Related location
-Twostate-Functions.dfy(92,24): Error: argument ('u') might not be allocated in the two-state function's previous state
-Twostate-Functions.dfy(97,40): Error: argument at index 1 ('x') might not be allocated in the two-state function's previous state
-Twostate-Functions.dfy(129,25): Error: receiver might not be allocated in the state in which its fields are accessed
-Twostate-Functions.dfy(147,12): Error: receiver might not be allocated in the state in which its fields are accessed
-Twostate-Functions.dfy(164,15): Error: argument ('d') might not be allocated in the two-state function's previous state
-Twostate-Functions.dfy(167,13): Error: function precondition could not be proved
-Twostate-Functions.dfy(183,15): Error: argument ('d') might not be allocated in the two-state function's previous state
-Twostate-Functions.dfy(186,13): Error: function precondition could not be proved
-
-Dafny program verifier finished with 23 verified, 13 errors
diff --git a/Test/dafny0/Twostate-Verification.dfy.expect b/Test/dafny0/Twostate-Verification.dfy.expect
deleted file mode 100644
index bee3b2013e9..00000000000
--- a/Test/dafny0/Twostate-Verification.dfy.expect
+++ /dev/null
@@ -1,70 +0,0 @@
-Twostate-Verification.dfy(656,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(657,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(658,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(659,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(661,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(662,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(663,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(665,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(666,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(667,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(668,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(670,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(671,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(672,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(673,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(675,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(676,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(677,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(679,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(680,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(681,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(682,22): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(33,13): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-Twostate-Verification.dfy(313,38): Error: assertion could not be proved
-Twostate-Verification.dfy(337,23): Error: a precondition for this call could not be proved
-Twostate-Verification.dfy(317,29): Related location: this is the precondition that could not be proved
-Twostate-Verification.dfy(359,18): Error: assertion could not be proved
-Twostate-Verification.dfy(361,18): Error: assertion could not be proved
-Twostate-Verification.dfy(384,17): Error: receiver argument might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(386,17): Error: receiver argument might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(391,26): Error: argument at index 0 ('c') might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(393,28): Error: argument at index 0 ('c') might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(398,19): Error: receiver argument might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(412,8): Error: receiver argument might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(414,8): Error: receiver argument might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(420,27): Error: parameter at index 0 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(422,29): Error: parameter at index 0 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(447,28): Error: argument at index 0 ('c') might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(451,30): Error: argument at index 0 ('c') might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(466,29): Error: parameter at index 0 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(470,31): Error: parameter at index 0 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(558,22): Error: argument at index 2 ('c') might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(561,22): Error: parameter at index 2 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(564,22): Error: argument at index 2 ('c') might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(567,22): Error: parameter at index 2 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(579,11): Error: receiver argument might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(582,11): Error: receiver argument might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(593,19): Error: argument at index 1 ('c') might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(596,19): Error: parameter at index 1 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(599,19): Error: argument at index 1 ('c') might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(602,19): Error: parameter at index 1 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(613,22): Error: argument at index 2 ('c') might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(616,22): Error: parameter at index 2 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(619,26): Error: argument at index 3 ('c') might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(622,26): Error: parameter at index 3 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(635,25): Error: receiver argument might not be allocated in the two-state function's previous state
-Twostate-Verification.dfy(659,29): Error: receiver might not be allocated in the state in which its fields are accessed
-Twostate-Verification.dfy(271,13): Error: a postcondition could not be proved on this return path
-Twostate-Verification.dfy(263,24): Related location: this is the postcondition that could not be proved
-Twostate-Verification.dfy(277,4): Error: a postcondition could not be proved on this return path
-Twostate-Verification.dfy(276,26): Related location: this is the postcondition that could not be proved
-Twostate-Verification.dfy(6,4): Error: parameter at index 0 ('c') might not be allocated in the two-state lemma's previous state
-Twostate-Verification.dfy(12,17): Error: receiver might not be allocated in the state in which its fields are accessed
-Twostate-Verification.dfy(37,26): Error: receiver might not be allocated in the state in which its fields are accessed
-Twostate-Verification.dfy(41,32): Error: receiver argument might not be allocated in the state in which the function is invoked
-Twostate-Verification.dfy(56,26): Error: receiver might not be allocated in the state in which its fields are accessed
-Twostate-Verification.dfy(58,32): Error: receiver argument might not be allocated in the state in which the function is invoked
-Twostate-Verification.dfy(74,15): Error: assertion could not be proved
-
-Dafny program verifier finished with 66 verified, 42 errors
diff --git a/Test/dafny0/TypeAntecedents.dfy.expect b/Test/dafny0/TypeAntecedents.dfy.expect
deleted file mode 100644
index 9d12eaf71a8..00000000000
--- a/Test/dafny0/TypeAntecedents.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-TypeAntecedents.dfy(35,12): Error: assertion could not be proved
-TypeAntecedents.dfy(58,0): Error: a postcondition could not be proved on this return path
-TypeAntecedents.dfy(57,14): Related location: this is the postcondition that could not be proved
-TypeAntecedents.dfy(66,15): Error: assertion could not be proved
-
-Dafny program verifier finished with 5 verified, 3 errors
diff --git a/Test/dafny0/TypeConversions.dfy b/Test/dafny0/TypeConversions.dfy
deleted file mode 100644
index 86cc5f8dc8d..00000000000
--- a/Test/dafny0/TypeConversions.dfy
+++ /dev/null
@@ -1,126 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /env:0 /rprint:- "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-newtype EvenInt = x | x % 2 == 0
-newtype SmallReal = r | -4.0 <= r < 300.0
-
-// Use of the following predicate will prevent Boogie's cleverness of discarding assignments to dead variables
-ghost predicate UseTheVars(x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0) { true }
-
-method M0() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
-  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
-{
-  if {
-    case true                 => n := x as int;  // error: x may be negative
-    case 0 <= x                => x := x as int;
-    case true                 => x := r as int;  // error: r may have a fractional part
-    case true                 => n := r.Floor;  // error: r may be negative
-    case 0.0 <= r              => n := r.Floor;
-    case r == r.Floor as real => x := r as int;
-    case true                 => var b := r as int == r.Floor;  // error: conversion to int may fail
-    case true                 => assert -4 <= small.Floor < 300;
-    case true                 => even := 6.0 as EvenInt;  assert even == 6;
-  }
-}
-
-method M1() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
-  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
-{
-  if {
-    case true => x := b67 as int;
-    case true => x := w as int;
-    case true => x := seven as int;
-    case true => x := noll as int;
-    case true => n := noll as int;
-    case true => n := b67 as int;  // note, a bitvector is never negative
-    case true => r := b67 as real;
-    case true => r := seven as real;
-    case true => r := noll as real;
-    case true => even := (b67 as int * 2) as EvenInt;
-    case true => small := small as real as SmallReal;
-    case true => small := small.Floor as SmallReal;
-    case true => small := noll as SmallReal;
-    case true => small := seven as SmallReal;
-    case true => small := w as SmallReal;  // error: w may be too big
-    case (w & 0xF) as int <= 0xF /* Z3 doesn't know much about bv2int :( */ => small := (w & 0xF) as SmallReal;
-  }
-}
-
-method M2() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
-  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
-{
-  if {
-    case true => b67 := b67 as bv67;
-    case true => b67 := w as bv67;
-    case true => b67 := seven as bv67;
-    case true => b67 := noll as bv67;
-    case true => w := b67 as bv32;  // error: b67 may be too big
-    case true => w := w as bv32;
-    case true => w := seven as bv32;
-    case true => w := noll as bv32;
-    case true => seven := b67 as bv7;  // error: b67 may be too big
-    case true => seven := w as bv7;  // error: w may be too big
-    case true => seven := seven as bv7;
-    case true => seven := noll as bv7;
-  }
-}
-
-method M2'() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
-  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
-{
-  if {
-    case true => noll := b67 as bv0;  // error: b67 may be too big
-    case true => noll := w as bv0;  // error: w may be too big
-    case true => noll := seven as bv0;  // error: seven may be too big
-    case true => noll := noll as bv0;
-  }
-}
-
-method M3() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
-  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
-{
-  if {
-    case true => x, r := b67 as int, b67 as real;
-    case true => x, r := w as int, w as real;
-    case true => x, r := seven as int, seven as real;
-    case true => x, r := noll as int, noll as real;
-  }
-  assert 0 <= x && 0.0 <= r;
-}
-
-method M4() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
-  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
-{
-  if {
-    case true => even := noll as EvenInt;
-    //case true => even := b67 as EvenInt;  // error: bv67 may be odd  // disabled because it doesn't terminate with 4.4.2 Z3
-    case b67 as int % 2 == 0 => even := b67 as EvenInt;
-    case true => small := seven as SmallReal;
-    case true =>
-      even := small as EvenInt;  // error (x2): small may not even be an integer, let alone odd
-    case small == small.Floor as SmallReal =>
-      even := small as EvenInt;  // error: small may be odd
-    case small == small.Floor as SmallReal && small as int % 2 == 0 =>
-      even := small as EvenInt;
-  }
-}
-
-method M5() returns (x: int, n: nat, r: real, even: EvenInt, small: SmallReal, b67: bv67, w: bv32, seven: bv7, noll: bv0)
-  ensures UseTheVars(x, n, r, even, small, b67, w, seven, noll)
-{
-  x := 150;
-  if {
-    case true => b67 := x as bv67;
-    case true => w := x as bv32;
-    case true => seven := x as bv7;  // error: 'x' may not fit in 7 bits
-    case true => noll := x as bv0;  // error: 'x' may not fit in 0 bits
-    case n < 128 => seven := n as bv7;
-    case n == 0 => noll := n as bv0;
-    case n < 1 => noll := n as bv0;
-    case 0 <= even < 0x1_0000_0000 => w := even as bv32;
-    case small as real == small.Floor as real => seven := (if 0.0 <= small < 100.0 then small else 100.0) as bv7;
-  }
-}
-
-class Class { }
-type ClassSubset = c: Class | true // error: the witness guess "null" is not good enough
diff --git a/Test/dafny0/TypeInferenceRefresh.dfy b/Test/dafny0/TypeInferenceRefresh.dfy
deleted file mode 100644
index 4de0fec2cda..00000000000
--- a/Test/dafny0/TypeInferenceRefresh.dfy
+++ /dev/null
@@ -1,1061 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /typeSystemRefresh:1 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype Color = BlueX | WhiteX | PastelX
-{
-  predicate IsFailure() {
-    WhiteX? || BlueX?
-  }
-  function PropagateFailure(): int {
-    15
-  }
-  function Extract(): real {
-    if BlueX? then 3.09 else 9.03
-  }
-}
-
-function FxF(x: int): bool
-
-method CallF0() {
-  var b0 := FxF(15);
-  var f: int -> bool := FxF;
-  var b1 := f(15);
-  assert b0 == b1;
-}
-
-method CallF1() {
-  var b0 := FxF(15);
-  var f := FxF;
-  var b1 := f(15);
-  assert b0 == b1;
-}
-
-class ClassForOld {
-  var u: int
-  method Old()
-    modifies this
-  {
-    u := u + 1;
-    assert old(u) == u - 1;
-    if old(u) == 5 {
-      var g := 10;
-    }
-  }
-  method Unchanged() {
-    assert unchanged(this);
-  }
-  method New(a': array<int>) returns (r: ClassForOld, a: array<int>)
-    ensures fresh(r)
-    ensures !fresh(a)
-    ensures !fresh(var o := null; o)
-    ensures !fresh(null)
-  {
-    var m := var o := null; o;
-    r := new ClassForOld;
-    a := a';
-  }
-}
-
-method ToMultiset(s: set<int>, q: seq<real>) {
-  var r0 := multiset(s);
-  var r1 := multiset(q);
-}
-
-method CreateLambdaAndSequence() {
-  var f := i => 2 * i;
-  var s := seq(15, f); 
-}
-
-datatype Colors = Blue | Yellow | Gray(n: nat)
-{
-  method PrintMe() {
-    if (this == Blue) {
-      print "blue";
-    } else if (this == Yellow) {
-      print "yellow";
-    } else {
-      print "gray ", n;
-    }
-    print "\n";
-  }
-}
-
-module A {
-  type T
-  datatype BaseType = BaseType(t: T)
-
-  predicate P(d: BaseType)
-
-  class XYZ {
-    static predicate ABC(d: BaseType)
-  }
-
-  type SubsetType = d: BaseType | P(d)
-    witness *
-  type SubsetType' = d: BaseType | d == d
-    witness *
-  type SubsetType'' = d: BaseType | XYZ.ABC(d)
-    witness *
-
-  method M0(dp: SubsetType, tt: T) {
-    var dp0: SubsetType := [dp][0];
-    var dp': SubsetType := dp0.(t := tt); // error: does not satisfy SubsetType
-  }
-
-  method M1(dp: SubsetType, tt: T) {
-    var dp0 := [dp][0];
-//SOON:    var dp': SubsetType := dp0.(t := tt); // error: does not satisfy SubsetType
-  }
-}
-
-method Bv() {
-  var bv: bv6 := 8;
-  var o: ORDINAL := 8;
-}
-method SUpdate(s: seq<real>, m0: map<real, bool>, m1: imap<real, bool>, mm: multiset<bv6>)
-  requires |s| == 10
-{
-  var s' := s[6 := 3.2];
-  var m0' := m0[3.2 := true];
-  var m1' := m1[3.2 := true];
-  var mm' := mm[8 := 100];
-}
-
-method MultiDimArray(m: array3<real>)
-  requires m.Length0 == m.Length1 == m.Length2 == 10
-{
-  var r := m[2, 4, 6];
-  var b := r == 2.7;
-}
-
-method LittleArray(a: array<real>)
-  requires 10 <= a.Length
-{
-  var s := a [2..3];
-}
-function Qf(x: int, a: array<int>): bool
-  requires x <= a.Length
-  reads a
-{
-  var m := map[2 := true, 3 := false, 4 := false];
-  var u := m[3];
-  var v := true;
-  var w := m[3] == true;
-  var ww := u == v;
-true//SOON:  forall i :: 0 <= i < x ==> m[i] == true // error: domain
-}
-
-trait AsTr { }
-class AsCl extends AsTr { }
-
-method Is(clIn: AsCl) {
-  var b;
-  b := clIn is AsTr;
-  b := clIn is object;
-  b := clIn is AsCl?;
-  b := clIn is AsTr?;
-  b := clIn is object?;
-}
-
-method As(clIn: AsCl, ch: char) returns (cl: AsCl) {
-  var tr: AsTr;
-  var obj: object;
-  tr := clIn as AsTr;
-  obj := clIn as AsTr;
-  obj := clIn as object;
-  cl := tr as AsCl;
-  cl := obj as AsCl;
-
-  var x: int;
-  var ord: ORDINAL;
-  x := ch as int;
-  ord := ch as ORDINAL;
-}
-
-method As?(clIn: AsCl) returns (cl: AsCl?) {
-  var tr: AsTr?;
-  var obj: object?;
-  tr := clIn as AsTr?;
-  obj := clIn as AsTr?;
-  obj := clIn as object?;
-  cl := tr as AsCl?;
-  cl := obj as AsCl?;
-}
-
-datatype BlackWhite = White | Gray(int)
-
-method Dtv(b: bool) returns (c: BlackWhite) {
-  var d := White;
-  var e := BlackWhite.Gray(15);
-  c := if b then BlackWhite.Gray(10) else BlackWhite.Gray(20);
-  assert c.Gray?;
-}
-
-newtype XX = y: YY | true
-type YY = z: int | true
-type ZZ = y: YY | true
-
-newtype jnt8 = x |
-  var lo := -0x80;
-  var hi := 0x80;
-  lo <= x < hi
-
-newtype int8 = x |
-  - 0x80 <= x < 0x80
-
-method TooBigDiv(a: int8) {
-  var b := a;
-  var u := false;
-  u := !u;
-  var q := a != 0;
-  var k :=
-    var xyz := 3; xyz;
-  var l := 3 + if u then 2 else 1;
-  
-  if
-  case true =>
-//SOON:    var x := a / (0-1);  // error: result may not be an int8 (if a is -128)
-  case true =>
-    var minusOne := -1;
-    var y := a % minusOne;  // fine
-  case a != 0 =>
-    var z := (0-1) % a;  // fine
-}
-
-method Good(a: int8)
-  requires a != -127-1
-{
-  var x := a / -1;  // fine
-}
-
-class Global {
-  static function G(x: int): int { x+x }
-  static method N(ghost x: int, g: Global) returns (ghost r: int)
-    ensures r == Global.G(x)
-  {
-    if
-    case true =>
-      r := G(x);
-    case true =>
-      r := G(x+0);
-    case true =>
-      r := g.G(x);
-    case true =>
-      var g: Global? := null;
-      r := g.G(x);
-    case true =>
-      r := Global.G(x);
-  }
-}
-
-method Mxy(x: int, y: int) {
-  var b := x == y;
-  var m, n;
-  b := m == n;
-  n := 'n';
-}
-
-module Inheritance {
-  trait Trait { }
-  class A extends Trait { }
-  class B extends Trait { }
-  class C<X, Y, Z> extends Trait { }
-  class D<X(0)> {
-    var x: X
-    var y: X
-  }
-  class Cell {
-    var data: int
-  }
-
-  method FInt() returns (r: int) {
-    var d := new D;
-    var u: int := d.x;
-    r := d.y;
-  }
-  method FIntCell() returns (r: int) {
-    var c := new Cell;
-    var u := c.data;
-    r := u;
-  }
-  method FCell(c: Cell) {
-    var x := c.data;
-  }
-
-  method S0(o: object, t: Trait, a: A, b: B)
-  {
-    var oo := o;
-    var x := t;
-    var y := a;
-  }
-
-  method S1(o: object, t: Trait, a: A, b: B)
-  {
-    var z := a;
-    z := a;
-    z := b;
-    z := t;
-    z := o;
-  }
-
-  method S2(o: object, t: Trait, a: A, b: B)
-  {
-    var uu := a;
-  }
-
-  method S3(o: object?, t: Trait?, a: A?, b: B?, c: C?<int, bool, Trait?>) returns (aa: A?, c3: C?<bool, int, Trait?>)
-  {
-    var uu;
-    aa := uu;
-    var uu3;
-    c3 := uu3;
-  }
-
-  method S4(o: object?, t: Trait?, a: A?, b: B?, c: C?<int, bool, Trait?>) returns (aa: A?, c3: C?<bool, int, Trait?>)
-  {
-    var n := null;
-  }
-
-  method S6(o: object?, t: Trait?, a: A?, b: B?, c: C?<int, bool, Trait?>) returns (aa: A?, c3: C?<bool, int, Trait?>)
-  {
-    var oo := o;
-    var tt := t;
-    tt := null;
-    var a3 := a;
-  }
-}
-
-newtype MyInt = int
-
-type MyNatSynonym = nat
-
-function F(x: int): int {
-  5
-}
-
-function G(x: int): int {
-  x
-}
-
-function H(x: int): int {
-  x % 5
-}
-
-function I(x: MyInt): MyInt {
-  x % 5
-}
-
-method M(x: int, m: MyInt, n: nat, n': MyNatSynonym) {
-  var y, z, w, q;
-  y := x;
-  w := 2;
-  w := x;
-  z := x;
-  q := 3;
-  q := m;
-  y := n;
-  y := n';
-}
-
-method A0(s: seq<int>) {
-  var t;
-  t := s;
-  var u;
-  u := [2, 3];
-  var m := map[3 := true];
-}
-
-method A1(k: MyInt) {
-  var g, h;
-  var p := map[g := 3, true := h];
-  h := k;
-}
-
-method A2() {
-  var g;
-  var s := [g];
-  g := true;
-}
-
-method A3() {
-  var u;
-  u := [2, 3];
-  var v := [];
-  var b := 2 in v;
-}
-
-method B0() {
-  var a := true;
-  var b;
-  var c := b ==> a;
-  var d := (a || a) <== b && (a <==> c);
-}
-
-method MMap() {
-  var a: map<int, bool>, b;
-  var c := a - b;
-}
-
-function Qfx(a: map<int, real>): int
-  requires 3 in a.Keys
-{
-  var w := a[3] == 3.14;
-  17
-}
-
-class XyzClass {
-  method New(c: XyzClass', b: bool, r': XyzClass) returns (r: XyzClass)
-    ensures var q := if b then r else c; true
-  {
-    r := r';
-  }
-}
-type XyzClass' = c: XyzClass? | true witness *
-
-function {:opaque} OpaqueFunction(): int { 12 }
-
-method Reveal() {
-  assert A: true;
-  reveal A;
-  reveal OpaqueFunction();
-}
-
-lemma Calc(a: bool, b: bool, c: int, d: int, e: int)
-  requires c <= d <= e
-  requires a
-  requires b ==> e <= c
-  requires B: b
-  ensures e <= d
-{
-  calc ==> {
-    a;
-    c <= d;
-  ==  { reveal B; }
-    e <= d;
-  }
-}
-
-class CellToModify {
-  var data: int
-}
-
-method Modify(b: bool) {
-  var c := new CellToModify;
-  modify c;
-  modify c { // warning: deprecated statement
-    if b {
-      c.data := 20;
-    }
-  }
-}
-
-module Patterns {
-  datatype Color = Red | Gray(n: nat)
-
-  method VarPattern(c: Color) returns (x: int) {
-    if c != Red {
-      var Gray(mm) := c;
-      x := mm;
-    }
-  }
-
-  method M(c: Color) returns (x: int) {
-    match c
-    case Red =>
-    case Gray(oo) => x := oo;
-  }
-
-  function LetPattern(c: Color): int {
-    if c == Red then 3 else
-      var Gray(pp) := c;
-      pp
-  }
-
-  function F(c: Color): int {
-    match c
-    case Red => 3
-    case Gray(oo) => oo
-  }
-}
-
-method WhileLoops() returns (k: int) {
-  var i := 250;
-  while 2 < i {
-    i := i - 1;
-    k := k + i;
-  }
-  var ii := 0;
-  while ii < 10 {
-    var u: RomanC := ii;
-    ii := ii + 1;
-  }
-}
-
-method ForLoops() returns (k: int) {
-  for i := 250 downto 2 {
-    k := k + i;
-  }
-  for i := 0 to 10
-  {
-    var u: RomanC := i;
-  }
-}
-
-newtype RomanC = x | 0 <= x < 100
-
-method LoopAlternatives(n: nat) {
-  var a, b := 0, n;
-  while
-    decreases b - a
-  case a < b => b := b - 1;
-  case a < b => a := a + 1;
-}
-
-module TypeParameterResolution {
-  type A
-
-  class Class<B> {
-    var aa: A
-    var bb: B
-    constructor()
-    method M<C>() {
-      var a: A;
-      var b: B;
-      var c: C;
-    }
-    function F<D>(a: A, b: B, d: D): int {
-      var a': A := a;
-      var b': B := b;
-      var d': D := d;
-      3
-    }
-  }
-
-  type SS<X(!new)> = o: int | assert forall x: X :: var y: X := x; true; 0 <= o witness *
-
-  datatype Datatype<B> = Ctor {
-    method M<C>() {
-      var a: A;
-      var b: B;
-      var c: C;
-    }
-    function F<D>(a: A, b: B, d: D): int {
-      var a': A := a;
-      var b': B := b;
-      var d': D := d;
-      3
-    }
-  }
-
-  type Opaque<B> {
-    method M<C>() {
-      var a: A;
-      var b: B;
-      var c: C;
-    }
-    function F<D>(a: A, b: B, d: D): int {
-      var a': A := a;
-      var b': B := b;
-      var d': D := d;
-      3
-    }
-  }
-}
-
-module FunctionApplications {
-  function Fn<X>(xp: X): (real, X)
-
-  method NewArrayInit(n: nat) returns (g: int ~> real) {
-    var fn1 := x => 3.00;
-    var u1 := fn1(100);
-
-    var v := Fn(100);
-
-    var fn := (_, q) => 3.00;
-    var u := fn(100, 100);
-
-    var arr := new real[n](_ => 3.00);
-  }
-}
-
-module ForallStmt {
-  method AggregateAssignment(s: set<int>, a: array<real>)
-    requires forall x :: x in s ==> 0 <= x < a.Length
-    modifies a
-  {
-    forall i | i in s {
-      a[i] := 35.50;
-    }
-  }
-
-  function Plus(x: nat, y: nat): nat {
-    if x == 0 then y else 1 + Plus(x - 1, y)
-  }
-
-  lemma DistributePlus(a: nat, x: nat, y: nat)
-    ensures Plus(a + x, y) == a + Plus(x, y)
-  {
-    if a != 0 {
-      calc {
-        Plus(a + x, y);
-      ==
-        1 + Plus(a - 1 + x, y);
-      ==  { DistributePlus(a - 1, x, y); }
-        1 + (a - 1) + Plus(x, y);
-      ==
-        a + Plus(x, y);
-      }
-    }
-  }
-
-  lemma Associative(x: nat, y: nat, z: nat)
-    ensures Plus(Plus(x, y), z) == Plus(x, Plus(y, z))
-  {
-    if x != 0 {
-      calc {
-        Plus(Plus(x, y), z);
-      ==  // def. Plus
-        Plus(1 + Plus(x - 1, y), z);
-      ==  // def. Plus
-        1 + Plus(Plus(x - 1, y), z);
-      ==  { Associative(x - 1, y, z); }
-        1 + Plus(x - 1, Plus(y, z));
-      ==  // def. Plus
-        Plus(x, Plus(y, z));
-      }
-    }
-  }
-
-  lemma AllAssociative()
-    ensures forall x, y, z :: Plus(Plus(x, y), z) == Plus(x, Plus(y, z)) // error (x3): x,y,z are int's, not nat's
-  {
-    forall x, y, z {
-      Associative(x, y, z); // error (x3): x,y,z are int's, not nat's
-    }
-  }
-}
-
-module Variance {
-  method CollectionVariance<X>(b: array<X>) returns (r: set<object>, o: object, m: map<object, object>) {
-    o := b;
-    r := {b};
-    m := map[o := o];
-    m := map[b := o];
-    m := map[o := b];
-  }
-
-  method ArrowCovariance<A, B, X>(arr: array<X>) returns (f: () -> object, g: A -> object, h: (A, B) -> object) {
-    f := () => arr;
-    g := a => arr;
-    h := (a, b) => arr;
-  }
-
-  method ArrowContraariance<A, B, X>(arr: array<X>) returns (f: () -> int, g: array<X> -> int, h: (array<X>, array<X>) -> int) {
-    f := () => 3;
-    g := (a: object) => 4;
-    h := (a: array?<X>, b: object) => 5;
-  }
-}
-
-module ReferenceTypeParents {
-  class Vector<X> { }
-
-  method M<X>(arr: array<X>, v: Vector<X>) returns (repr: set<object>) {
-    repr := {v, arr};
-  }
-
-  method E<X>(arr: array<X>, r: set<object>) returns (repr: set<object>) {
-    repr := r + {arr};
-  }
-}
-
-module PartiallySolveBeforeFindingNames {
-  datatype Option<X> = None | Some(value: X)
-  method GetIt<X>(i: nat, arr: array<Option<X>>)
-    requires i < arr.Length && arr[i].Some?
-  {
-    var a := arr[i];
-    var b := a.value;
-  }
-}
-
-module Frames {
-  class C {
-    var x: int
-    var y: int
-  }
-
-  function A0(): set<C>
-  function A1(): iset<C>
-  function A2(): seq<C>
-  function A3(): multiset<C>
-
-  function F(o: object, s: set<C>, ss: iset<C>, sq: seq<C>, ms: multiset<C>): int
-    reads o
-    reads s
-    reads ss
-    reads sq
-    reads ms
-    reads s`x
-    reads ss`x
-    reads sq`x
-    reads ms`x
-    reads A0
-    reads A1
-//    reads A2 // TODO
-//    reads A3 // TODO
-//    reads A0`x // TODO
-//    reads A1`x // TODO
-    reads A2`x
-    reads A3`x
-
-  method M(o: object, s: set<C>, ss: iset<C>, sq: seq<C>, ms: multiset<C>)
-    modifies o
-    modifies s
-    modifies ss
-    modifies sq
-    modifies ms
-    modifies s`x
-    modifies ss`x
-    modifies sq`x
-    modifies ms`x
-  {
-    modify o;
-    modify s;
-    modify ss;
-    modify sq;
-    modify ms;
-    modify s`x;
-    modify ss`x;
-    modify sq`x;
-    modify ms`x;
-  }
-
-  method U(oo: set<object>, o: object, s: set<C>, ss: iset<C>, sq: seq<C>, ms: multiset<C>)
-    modifies oo
-    ensures unchanged(o)
-    ensures unchanged(s)
-    ensures unchanged(ss)
-    ensures unchanged(sq)
-    ensures unchanged(ms)
-    ensures unchanged(s`x)
-    ensures unchanged(ss`x)
-    ensures unchanged(sq`x)
-    ensures unchanged(ms`x)
-  {
-  }
-}
-
-module NeverNever {
-  type Never = x: int | false witness *
-
-  method Test() {
-    var n; // type of 'n' is inferred to be Never, but since 'n' is never used, the verifier has nothing to complain about
-    if false {
-      var u: Never;
-      n := u;
-    }
-  }
-}
-
-
-/****************************************************************************************
- ******** TO DO *************************************************************************
- ****************************************************************************************
-// ------------------
-// https://github.com/dafny-lang/dafny/issues/2134
-/*
-newtype A = b | P(b)
-newtype B = a: A | true
-
-predicate P(b: B)
-*/
-
-// ------------------
-// There was never a test for the error message that comes out here:
-
-datatype Color = White | Gray(int)
-datatype ParametricColor<X, Y> = Blue | Red(X) | Green(Y)
-
-method DatatypeValues() {
-  var w := White<int>; // error (no hint, since the datatype doesn't take any type parameters)
-  var b := Blue<int>; // error: with hint (since the datatype takes _some_ number of type parameters)
-  var g := Gray<int>(2);
-  var r := Red<int>(3);
-}
-
-// ------------------
-// Clement suggested the following problem to try through the new type inference.
-// On 5 April 2022, he said:
-
-// Below is a test for your new type inference.  Let me know if you would like me to post it as an issue.
-// 
-// In brief, we have no way today to specify the return type of a lambda: it’s always inferred.  This results in issues like below:
- 
-function method {:opaque} MaxF<T>(f: T ~> int, ts: seq<T>, default: int) : (m: int)
-  reads f.reads
-  requires forall t | t in ts :: f.requires(t)
-  requires forall t | t in ts :: default <= f(t)
-  ensures if ts == [] then m == default else exists t | t in ts :: f(t) == m
-  ensures forall t | t in ts :: f(t) <= m
-  ensures default <= m
- 
-datatype Tree =
-  | Leaf(i: int)
-  | Branch(trs: seq<Tree>)
-{
-  function method Depth() : nat {
-    match this {
-      case Leaf(_) => 0
-      case Branch(trs) =>
-        // var fn : Tree --> nat := (t: Tree) requires t in trs => t.Depth();
-        1 + MaxF((t: Tree) requires t in trs => t.Depth(), trs, 0)
-    }
-  }
-}
- 
-// Dafny rejects the call to MaxF, claiming that forall t | t in ts :: default <= f(t) might not hold.  But default is 0 and f(t)
-// has type nat, so it should hold — and in fact just uncommenting the definition of fn above solves the issue… even if fn isn’t used.
- 
-
-// ------------------
-// Can the following example (from S) be improved to not need the explicit seq32<Principal> type annotations?
-
-type seq32<X> = s: seq<X> | |s| < 0x8000_0000
-function method seqSize<X>(s: seq32<X>): nat32 {
-  |s|
-}
-type nat32 = x: int | 0 <= x < 0x8000_0000
-
-type Context
-type Principal
-datatype Option<X> = None | Some(val: X)
-
-class Sean {
-  function method principalFromContext(c: Context): Option<Principal>
-
-  function principalsFromContexts(ctxs: seq32<Context>): (res: Option<seq32<Principal>>)
-    ensures res.Some? ==> |ctxs| == |res.val|
-    ensures res.Some? ==> forall i :: 0 <= i < |ctxs| ==> principalFromContext(ctxs[i]).Some?;
-    ensures res.Some? ==> forall i:: 0 <= i < |ctxs| ==> res.val[i] == principalFromContext(ctxs[i]).val
-    ensures res.None? ==> exists i :: 0 <= i < |ctxs| && principalFromContext(ctxs[i]).None?
-  {
-    var empty: seq32<Principal> := [];
-    if |ctxs| == 0 then Some(empty) else match principalFromContext(ctxs[0]) {
-      case None => None
-      case Some(principal) =>
-        match principalsFromContexts(ctxs[1..]) {
-          case None => None
-          case Some(principals) =>
-            // TODO: Remove when dafny supports type ascription
-            var principals1: seq32<Principal> := [principal] + principals;
-            Some(principals1)
-        }
-    }
-  } by method {
-    var principals: seq32<Principal> := [];
-    for i := 0 to seqSize(ctxs)
-      invariant seqSize(principals) == i
-      invariant forall j :: 0 <= j < i ==> principalFromContext(ctxs[j]).Some?
-      invariant forall j :: 0 <= j < i ==> principals[j] == principalFromContext(ctxs[j]).val
-    {
-      var principal := principalFromContext(ctxs[i]);
-      if principal.None? {
-        return None;
-      }
-      principals := principals + [principal.val];
-    }
-    assert principals == principalsFromContexts(ctxs).val;
-    return Some(principals);
-  }
-}
-
-// ------------------
-// From Clement:
-
-method copy<T>(a: array<T>) returns (a': array<T>) {
-  a' := new T[a.Length](k requires k < a.Length reads a => a[k]);
-}
-
-// The lambda in a new T is supposed to take a nat, but Dafny infers k to be an int and rejects a[k]
-
-// ------------------
-// In this program, one has to write "n + d != 0" instead of "n != -d", because of a previously known problem with type inference
-
-predicate method ge0'(n: int)
-  ensures ge0'(n) <==> 0 <= n
-{
-  downup_search'(n, 0)
-}
-
-function method Abs(n: int): nat {
-  if n < 0 then -n else n
-}
-
-predicate method downup_search'(n: int, d: nat)
-  requires d <= Abs(n)
-  ensures downup_search'(n, d) <==> d <= n
-  decreases Abs(n) - d
-{
-  n == d || (n + d != 0 && downup_search'(n, d + 1))
-  /*
-  if n - d == 0 then
-    true
-  else if n + d == 0 then
-    false
-  else
-    downup_search'(n, d + 1)
-  */
-}
-
-// ------------------
-// The following used to not work:
-module OrderingIssue_PreviouslyBroken {
-  newtype N = x: MM | 0 <= x < 100
-  newtype MM = x | 0 <= x < 100
-}
-// whereas the following did work.
-module OrderingIssue_Fine {
-  newtype MM = x | 0 <= x < 100
-  newtype N = x: MM | 0 <= x < 100
-}
-
-// ------------------------
-// From Marianna:
-
-const int32_MIN: int := -0x8000_0000
-const int32_MAX: int := 0x7fff_ffff
-newtype int32 = x | int32_MIN <= x <= int32_MAX
-
-const nat31_MIN: int32 := 0
-const nat31_MAX: int32 := int32_MAX as int32
-type nat31 = x: int32 | nat31_MIN <= x <= nat31_MAX
-
-method Works() {
-  var x: int32 := 0;
-}
-
-method DoesNotWork() {
-  var x: nat31 := 0; // gives error: int not assignable to nat31
-}
-
-method Workaround() {
-  var x: nat31 := 0 as int32;
-}
-
-// ------------------------
-// Also, see examples in https://github.com/dafny-lang/dafny/issues/1731
-
-
-// ------------------------
-// From https://github.com/dafny-lang/dafny/issues/1292:
-
-datatype List <T> = None | Cons (hd: T, tl: List<T>)
-
-method m (x: List<int>)  {
-  match x
-    case None => {assert 4 > 3;}
-    case Cons(None, t) => {assert 4 > 3;}
-}
-****************************************************************************************/
-
-/* The following test case may work with the new type inference, but did not with the old one.
-
-method LitTest() {
-  var c; // inferred to be bool
-  match c
-  case false =>
-  case true =>
-}
-
-*/
-
-/* Here's are tests for a match where a case is given by a const.
-   - For the first test, it used to be that this would spill out an unused local variable with that name (FIVE).
-   - The second test checks what happens if the const case label is also given an explicit type.
-     Previously, this would interpret "FIVE" as a const, and it would check that the type was correct.
-     Now, the explicit type causes it to be interpreted as a bound variable.
-   - The third test used to breeze through Dafny without any complaints, even though the type "int" makes no sense here.
-     Now, a pattern with an explicit type is always interpreted as a bound variable.
-
-const FIVE: int := 5
-  
-method Five(x: int) {
-  match x {
-    case FIVE => assert x == 5;
-    case _ =>
-  }
-  match x {
-    case FIVE: int =>
-      assert x == 5; // error: x may be anything, since FIVE is a bound variable
-    case _ =>
-  }
-}
-
-datatype Color = Blue | Green
-
-match Colors(c: Color) {
-  match c
-  case Blue: int => // error: because of the ": int", Blue is interpreted as a bound variable, and its type doesn't match that of "c"
-}
-
- */
-
-/* Some additional match tests
-
-method TupleTests(a: (int, ghost real), b: (), c: (ghost bool)) {
-  match a {
-  case (x, y) =>
-    var z0 := x;
-    var z1 := y;
-    print z0, "\n";
-  }
-
-  match b {
-    case () =>
-      var u := b;
-      print u, "\n";
-  }
-
-  match c {
-    case _ => print c, "\n";
-  }
-  match c {
-    case (x) => //print x, "\n";
-  }
-}
-
- */
-
-/*
-datatype Cell<T> = Cell(value: T)
-
-const X := 1
-
-method q() {
-  var c;
-  match c {
-    case X => // the literal 1
-    case Xyz => // a bound variable
-  }
-}
-
-datatype YT = Y
-const Y := 2
-
-method r() {
-  var c: Cell;
-  match c {
-    case Cell(Y) => // the literal 2
-    case Cell(_) =>
-  }
-}
-
-method s() {
-  var c: Cell;
-  match c {
-    case Cell(Y: real) => // bound variable
-    case Cell(_) => // redundant
-  }
-}
- */
diff --git a/Test/dafny0/TypeInferenceRefresh.dfy.expect b/Test/dafny0/TypeInferenceRefresh.dfy.expect
deleted file mode 100644
index 4c077d28556..00000000000
--- a/Test/dafny0/TypeInferenceRefresh.dfy.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-TypeInferenceRefresh.dfy(445,11): Warning: the modify statement with a block statement is deprecated
-TypeInferenceRefresh.dfy(102,31): Error: value does not satisfy the subset constraints of 'SubsetType'
-TypeInferenceRefresh.dfy(630,40): Error: value does not satisfy the subset constraints of 'nat'
-TypeInferenceRefresh.dfy(630,43): Error: value does not satisfy the subset constraints of 'nat'
-TypeInferenceRefresh.dfy(630,47): Error: value does not satisfy the subset constraints of 'nat'
-TypeInferenceRefresh.dfy(633,18): Error: value does not satisfy the subset constraints of 'nat'
-TypeInferenceRefresh.dfy(633,21): Error: value does not satisfy the subset constraints of 'nat'
-TypeInferenceRefresh.dfy(633,24): Error: value does not satisfy the subset constraints of 'nat'
-TypeInferenceRefresh.dfy(704,10): Error: function precondition could not be proved
-TypeInferenceRefresh.dfy(704,10): Error: insufficient reads clause to invoke function
-TypeInferenceRefresh.dfy(709,10): Error: function precondition could not be proved
-TypeInferenceRefresh.dfy(709,10): Error: insufficient reads clause to invoke function
-TypeInferenceRefresh.dfy(710,10): Error: function precondition could not be proved
-
-Dafny program verifier finished with 62 verified, 12 errors
diff --git a/Test/dafny0/TypeInferenceRefreshErrors.dfy b/Test/dafny0/TypeInferenceRefreshErrors.dfy
deleted file mode 100644
index fa1db888c56..00000000000
--- a/Test/dafny0/TypeInferenceRefreshErrors.dfy
+++ /dev/null
@@ -1,225 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /typeSystemRefresh:1 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module Frames {
-  class C {
-    var x: int
-    var y: int
-  }
-
-  // The following was accepted by the old type checking, but it caused a crash in the
-  // translator. Now, we disallow it.
-  function ToC(): C
-  function RegressionTest(): int
-    reads ToC // error: type not allowed: () -> C
-
-  function ToSetReal(): set<real>
-  function ToMap(): map<object, object>
-  function F(r: real, s: set<real>): int
-    reads r // error: not a reference type
-    reads s // error: not a collection of reference type
-    reads ToSetReal // error: not a function to a collection of reference type
-    reads ToMap // error: not a function to a collection of reference type
-}
-
-module As {
-  class C { }
-  class D { }
-  method M(c: C, d: D, obj: object) {
-    var cc: C;
-    var dd: D;
-    cc := obj as C;
-    dd := obj as D;
-    cc := d as C; // error: incompatible types
-    dd := c as D; // error: incompatible types
-  }
-}
-
-module Underspecification0 {
-  method P() {
-    var u;
-    var w := !u; // error: type is underspecified, so ! operator is not understood
-  }
-}
-
-module Underspecification1 {
-  class E<T> { }
-
-  /* SOON
-  method M(obj: object) {
-    var ee := obj as E; // error: type parameter of E is underspecified
-    assert (obj as E) == (obj as E); // error: type parameter of E is underspecified
-    assert (obj as E) == (obj as E<set>); // error: type parameter of set is underspecified
-    assert (obj as E) == (obj as E<set<int>>);
-  }
-  */
-}
-
-module Underspecification2 {
-  method Q(m: map, n: map) { // fine, because of type-parameter elision rules
-    var o := m + n;
-  }
-
-  method R() {
-    var m: map; // error: type is underspecified
-    var n: map; // error: type is underspecified
-    var o; // error: type is underspecified
-    o := m + n; // error: type of + is underspecified
-  }
-}
-
-module Underspecification3 {
-  type Synonym<X, Unused> = seq<X>
-
-  method Underspecification() {
-    // Regression: In the old type inference, the following line was not considered to be an error.
-    var d: Synonym := [100, 101]; // error: type underspecified
-  }
-}
-
-module Underspecification4 {
-  type SubsetType<X, Unused> = s: seq<X> | |s| == 0
-
-  method Underspecification() {
-    // Regression: In the old type inference, the following would pass and would then crash the verifier:
-    var e: SubsetType := [100, 101]; // error: type underspecified
-  }
-}
-
-module Underspecification5 {
-  type Synonym<A, Unused> = seq<A>
-
-  method SM(x: Synonym<int, real>, y: seq<bool>) {
-    var m: seq := y;
-
-    var a := x;
-
-    var b: Synonym := x; // error: type underspecified
-
-    var k: seq := x;
-    var y: Synonym := k; // error: type underspecified
-  }
-}
-
-/*
- * The following example causes Dafny 4.0 to crash (after reporting the expected error).
-
-datatype R = R(int, int)
-
-method M() {
-  var pair: (int, int) := (20, 30);
-  match pair
-  case R(x, y) => // bogus: should not be allowed to match a pair against an R constructor
-    print x + y, "\n";
-}
- */
-
-/* An additional match test
-
-method TupleTests(d: bv7) {
-  match d {
-    case (y) => // error: parentheses not allowed around pattern
-  }
-}
-
- */
-
-/*
-module TooLargeCaseLiteral {
-  method Test(bv: bv7) {
-    match bv {
-      case 84848484848484848 => // error (BUG: this is missed by Dafny 4.0)
-      case _ =>
-    }
-  }
-}
-
-module CaseLiteralWrongType {
-  method Test(bv: bv7, r: real) {
-    match bv {
-      case 2.18 => // error: wrong type // BUG: crashes Dafny 4.0
-    }
-    match r {
-      case 13 => // error: wrong type
-      case -0 => // error: wrong type
-      case 0 => // error: wrong type
-    }
-    match r {
-      case 15 => // error: wrong type // BUG: causes malformed Boogie in Dafny 4.0
-      case -15 => // error: wrong type // BUG: causes malformed Boogie in Dafny 4.0
-      case -0 => // error: wrong type // BUG: causes malformed Boogie in Dafny 4.0
-      case false => // error: wrong type // BUG: causes malformed Boogie in Dafny 4.0
-    }
-  }
-}
-
-module NegativeCaseLabels {
-  newtype int8 = x | -128 <= x < 128
-
-  method NegativeLabels(a: int, nt: int8, bv: bv7, o: ORDINAL, r: real) {
-    match a {
-      case -3 =>
-      case -0 =>
-      case 0 => // redundant
-      case _ =>
-    }
-
-    match nt {
-      case -3 =>
-      case -0 =>
-      case 0 => // redundant
-      case _ =>
-    }
-    
-    match bv {
-      case -3 => // error
-      case -0 => // error
-      case 0 =>
-      case _ =>
-    }
-
-    match o {
-      case -3 => // error
-      case -0 => // error
-      case 0 =>
-      case _ =>
-    }
-
-    match r {
-      case 2.18 =>
-      case -2.18 =>
-      case -0.0 =>
-      case 0.0 => // redundant
-      case _ =>
-    }
-  }
-}
-
-module RedundanCaseLiterals {
-  newtype int8 = x | -128 <= x < 128
-
-  method Tests(a: int, nt: int8, r: real) {
-    match a {
-      case -3 =>
-      case -0 =>
-      case 0 => // redundant
-      case _ =>
-    }
-
-    match nt {
-      case -3 =>
-      case -0 =>
-      case 0 => // redundant
-      case _ =>
-    }
-    
-    match r {
-      case 2.18 =>
-      case -2.18 =>
-      case -0.0 =>
-      case 0.0 => // redundant
-      case _ =>
-    }
-  }
-}
- */
diff --git a/Test/dafny0/TypeInferenceRefreshErrors.dfy.expect b/Test/dafny0/TypeInferenceRefreshErrors.dfy.expect
deleted file mode 100644
index f4dd68fe09a..00000000000
--- a/Test/dafny0/TypeInferenceRefreshErrors.dfy.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-TypeInferenceRefreshErrors.dfy(14,10): Error: PRE-TYPE: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got () ~> C?)
-TypeInferenceRefreshErrors.dfy(19,10): Error: PRE-TYPE: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got real)
-TypeInferenceRefreshErrors.dfy(20,10): Error: PRE-TYPE: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got set<real>)
-TypeInferenceRefreshErrors.dfy(21,10): Error: PRE-TYPE: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got () ~> set<real>)
-TypeInferenceRefreshErrors.dfy(22,10): Error: PRE-TYPE: a reads-clause expression must denote an object, a set/iset/multiset/seq of objects, or a function to a set/iset/multiset/seq of objects (instead got () ~> map<object?, object?>)
-TypeInferenceRefreshErrors.dfy(33,12): Error: PRE-TYPE: type cast to reference type 'C?' must be from an expression assignable to it (got 'D?')
-TypeInferenceRefreshErrors.dfy(34,12): Error: PRE-TYPE: type cast to reference type 'D?' must be from an expression assignable to it (got 'C?')
-TypeInferenceRefreshErrors.dfy(41,13): Error: PRE-TYPE: logical/bitwise negation expects a boolean or bitvector argument (instead got ?0)
-TypeInferenceRefreshErrors.dfy(64,8): Error: PRE-TYPE: the type ('map<?8, ?9>') of this local variable is underspecified
-TypeInferenceRefreshErrors.dfy(65,8): Error: PRE-TYPE: the type ('map<?10, ?11>') of this local variable is underspecified
-TypeInferenceRefreshErrors.dfy(66,8): Error: PRE-TYPE: the type ('map<?18, ?19>') of this local variable is underspecified
-TypeInferenceRefreshErrors.dfy(67,11): Error: PRE-TYPE: the type ('map<?16, ?17>') of this expression is underspecified
-TypeInferenceRefreshErrors.dfy(76,8): Error: PRE-TYPE: the type ('Synonym<int, ?4>') of this variable is underspecified
-TypeInferenceRefreshErrors.dfy(85,8): Error: the type of this local variable is underspecified
-TypeInferenceRefreshErrors.dfy(97,8): Error: PRE-TYPE: the type ('Synonym<int, ?3>') of this variable is underspecified
-TypeInferenceRefreshErrors.dfy(100,8): Error: PRE-TYPE: the type ('Synonym<int, ?6>') of this variable is underspecified
-16 resolution/type errors detected in TypeInferenceRefreshErrors.dfy
diff --git a/Test/dafny0/TypeParameters.dfy.expect b/Test/dafny0/TypeParameters.dfy.expect
deleted file mode 100644
index 1d655f84294..00000000000
--- a/Test/dafny0/TypeParameters.dfy.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-TypeParameters.dfy(376,20): Error: could not be proved
-TypeParameters.dfy(153,11): Error: could not be proved
-TypeParameters.dfy(153,27): Related location
-TypeParameters.dfy(155,11): Error: assertion could not be proved
-TypeParameters.dfy(155,32): Related location
-TypeParameters.dfy(157,11): Error: assertion could not be proved
-TypeParameters.dfy(137,2): Related location
-TypeParameters.dfy(159,11): Error: assertion could not be proved
-TypeParameters.dfy(144,4): Related location
-TypeParameters.dfy(144,14): Related location
-TypeParameters.dfy(161,11): Error: assertion could not be proved
-TypeParameters.dfy(146,7): Related location
-TypeParameters.dfy(175,14): Error: this invariant could not be proved to be maintained by the loop
-TypeParameters.dfy(175,37): Related location
-TypeParameters.dfy(175,14): Related message: loop invariant violation
-TypeParameters.dfy(175,37): Related location
-TypeParameters.dfy(44,21): Error: assertion could not be proved
-TypeParameters.dfy(66,26): Error: assertion could not be proved
-
-Dafny program verifier finished with 31 verified, 9 errors
diff --git a/Test/dafny0/TypeTests.dfy.expect b/Test/dafny0/TypeTests.dfy.expect
deleted file mode 100644
index 8f151daccd4..00000000000
--- a/Test/dafny0/TypeTests.dfy.expect
+++ /dev/null
@@ -1,42 +0,0 @@
-TypeTests.dfy(45,6): Error: Duplicate local-variable name: z
-TypeTests.dfy(47,6): Error: Duplicate local-variable name: x
-TypeTests.dfy(50,8): Error: Duplicate local-variable name: x
-TypeTests.dfy(53,6): Error: Duplicate local-variable name: y
-TypeTests.dfy(59,11): Error: unresolved identifier: x
-TypeTests.dfy(61,28): Error: unresolved identifier: z
-TypeTests.dfy(62,29): Error: unresolved identifier: w1
-TypeTests.dfy(62,47): Error: unresolved identifier: w0
-TypeTests.dfy(65,28): Error: unresolved identifier: e
-TypeTests.dfy(80,17): Error: object initialization must denote an initializing method or constructor (F)
-TypeTests.dfy(81,17): Error: a method called as an initialization method must not have any result arguments
-TypeTests.dfy(90,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
-TypeTests.dfy(91,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
-TypeTests.dfy(92,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
-TypeTests.dfy(94,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
-TypeTests.dfy(95,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
-TypeTests.dfy(96,3): Error: cannot assign to a range of array elements (try the 'forall' statement)
-TypeTests.dfy(9,14): Error: incorrect argument type at index 0 for function parameter 'c' (expected C, found D)
-TypeTests.dfy(9,14): Error: incorrect argument type at index 1 for function parameter 'd' (expected D, found C)
-TypeTests.dfy(10,14): Error: incorrect argument type at index 0 for function parameter 'c' (expected C, found int)
-TypeTests.dfy(10,14): Error: incorrect argument type at index 1 for function parameter 'd' (expected D, found int)
-TypeTests.dfy(16,16): Error: incorrect argument type for method in-parameter 'x' (expected int, found bool)
-TypeTests.dfy(16,16): Error: incorrect return type at index 1 for method out-parameter 'c' (expected C, got int)
-TypeTests.dfy(17,12): Error: incorrect return type at index 1 for method out-parameter 'c' (expected C, got int)
-TypeTests.dfy(23,9): Error: because of cyclic dependencies among constructor argument types, no instances of datatype 'NeverendingList' can be constructed
-TypeTests.dfy(169,7): Error: non-ghost variable cannot be assigned a value that depends on a ghost
-TypeTests.dfy(179,6): Error: cannot assign to non-ghost variable in a ghost context
-TypeTests.dfy(180,9): Error: cannot assign to non-ghost variable in a ghost context
-TypeTests.dfy(198,10): Error: incorrect argument type for datatype constructor parameter (expected int -> Dt<int>, found int -> int) (covariant type parameter 1 would require int <: Dt<int>)
-TypeTests.dfy(204,10): Error: incorrect argument type for datatype constructor parameter (expected ? -> Dt<?>, found Dt<?> -> Dt<?>) (contravariance for type parameter at index 0 expects ? <: Dt<?>)
-TypeTests.dfy(211,10): Error: incorrect argument type for function parameter 'x' (expected ?, found set<?>)
-TypeTests.dfy(222,9): Error: assignment to array element is not allowed in this context, because this is a ghost method
-TypeTests.dfy(229,11): Error: because of cyclic dependencies among constructor argument types, no instances of datatype 'A' can be constructed
-TypeTests.dfy(230,11): Error: because of cyclic dependencies among constructor argument types, no instances of datatype 'B' can be constructed
-TypeTests.dfy(232,11): Error: because of cyclic dependencies among constructor argument types, no instances of datatype 'Cycle' can be constructed
-TypeTests.dfy(237,20): Error: using the type being defined ('A') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
-TypeTests.dfy(238,20): Error: using the type being defined ('B') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
-TypeTests.dfy(243,20): Error: using the type being defined ('E') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
-TypeTests.dfy(244,20): Error: using the type being defined ('F') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
-TypeTests.dfy(245,20): Error: using the type being defined ('G') here would cause a logical inconsistency by defining a type whose cardinality exceeds itself (like the Continuum Transfunctioner, you might say its power would then be exceeded only by its mystery)
-TypeTests.dfy(250,7): Error: recursive constraint dependency involving a subset type: CycW -> W -> CycleW -> CycW
-41 resolution/type errors detected in TypeTests.dfy
diff --git a/Test/dafny0/Unchanged.dfy.expect b/Test/dafny0/Unchanged.dfy.expect
deleted file mode 100644
index 5c6252574a5..00000000000
--- a/Test/dafny0/Unchanged.dfy.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-Unchanged.dfy(33,25): Error: assertion could not be proved
-Unchanged.dfy(34,25): Error: assertion could not be proved
-Unchanged.dfy(35,25): Error: assertion could not be proved
-Unchanged.dfy(38,13): Error: assertion could not be proved
-Unchanged.dfy(46,35): Error: object might not be allocated in the old-state of the 'unchanged' predicate
-Unchanged.dfy(47,35): Error: object might not be allocated in the old-state of the 'unchanged' predicate
-Unchanged.dfy(48,41): Error: object might not be allocated in the old-state of the 'unchanged' predicate
-Unchanged.dfy(49,35): Error: object might not be allocated in the old-state of the 'unchanged' predicate
-
-Dafny program verifier finished with 1 verified, 8 errors
diff --git a/Test/dafny0/UnfoldingPerformance.dfy.expect b/Test/dafny0/UnfoldingPerformance.dfy.expect
deleted file mode 100644
index 84766b64b38..00000000000
--- a/Test/dafny0/UnfoldingPerformance.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-UnfoldingPerformance.dfy(23,11): Error: assertion could not be proved
-UnfoldingPerformance.dfy(30,11): Error: assertion could not be proved
-UnfoldingPerformance.dfy(51,11): Error: assertion could not be proved
-UnfoldingPerformance.dfy(61,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 4 verified, 4 errors
diff --git a/Test/dafny0/Variance.dfy b/Test/dafny0/Variance.dfy
deleted file mode 100644
index e8fe36292b2..00000000000
--- a/Test/dafny0/Variance.dfy
+++ /dev/null
@@ -1,159 +0,0 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" /dprint:- /env:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module VarianceChecks {
-  datatype MyData<+A, *B, !C, D, -E> =
-    | MakeA(A)
-    | MakeB(B)
-    | MakeC(C)
-    | MakeD(D)
-    | MakeE(E)  // error: E is used in positive position
-
-  type Syn<X, -Y, Z> = MyData<X, Y, Z, Z, Z>  // error (x3)
-  type Cyn<M, -N> = MyData<int -> M, M, N -> int, N, N -> int>  // error (x4)
-
-  class MyClass<!Inv> {
-  }
-
-  datatype CheckIt<+A, *B, !C, D, -E> =
-    | Cons(A, MyData<int,int,int,int,int>)
-    | Fn(int ~> A)
-    | Nf(A ~> int)  // error: A is used in negative position
-    | Double((A ~> int) ~> int)  // error: A is not in a strict positive position
-    | ToSet(real -> set<A>)
-    | FromSet(set<A> ~> real)  // error: A is used in negative position
-    | Classy(MyClass<A>)  // error: + passed in as =
-    | MakeA(MyData<A,int,int,int,int>)
-    | MakeB(MyData<int,A,int,int,int>)  // error: + passed in as *
-    | MakeC(MyData<int,int,A,int,int>)  // error: + passed in as !
-    | MakeD(MyData<int,int,int,A,int>)  // error: + passed in as (default)
-    | MakeE(MyData<int,int,int,int,A>)  // error: + passed in as -
-    | CreateA(MyData<B,int,int,int,int>)
-    | CreateB(MyData<int,B,int,int,int>)
-    | CreateC(MyData<int,int,B,int,int>)  // error: * passed in as !
-    | CreateD(MyData<int,int,int,B,int>)  // error: * passed in as (default)
-    | CreateE(MyData<int,int,int,int,B>)  // error: * passed in as -
-    | DoA(MyData<C,int,int,int,int>)
-    | DoB(MyData<int,C,int,int,int>)
-    | DoC(MyData<int,int,C,int,int>)
-    | DoD(MyData<int,int,int,C,int>)
-    | DoE(MyData<int,int,int,int,C>)
-    | FabricateA(MyData<D,int,int,int,int>)
-    | FabricateB(MyData<int,D,int,int,int>)  // error: strict passed to context without strict restrictions
-    | FabricateC(MyData<int,int,D,int,int>)  // error: strict passed to context without strict restrictions
-    | FabricateD(MyData<int,int,int,D,int>)
-    | FabricateE(MyData<int,int,int,int,D>)  // error: strict passed to negative context
-    | BorrowA(MyData<E,int,int,int,int>)  // error: - passed in as +
-    | BorrowB(MyData<int,E,int,int,int>)  // error: - passed in as *
-    | BorrowC(MyData<int,int,E,int,int>)  // error: - passed in as !
-    | BorrowD(MyData<int,int,int,E,int>)  // error: - passed in as (default)
-    | BorrowE(MyData<int,int,int,int,E>)
-    | ISetA(iset<A>)  // error: - strict passed to context without strict restrictions
-    | ISetB(iset<B>)
-    | ISetC(iset<C>)
-    | ISetD(iset<D>)  // error: - strict passed to negative context
-    | ISetE(iset<E>)  // error: - contravariant passed to covariant context
-    | SetA(set<A>)
-    | SetB(set<B>)
-    | SetC(set<C>)
-    | SetD(set<D>)
-    | SetE(set<E>)  // error: - contravariant passed to covariant context
-    | IMapAB(imap<A, B>)  // error: - strict passed to context without strict restrictions
-    | IMapAE(imap<B, E>)  // error: - contravariant passed to covariant context
-    | IMapBD(imap<B, D>)
-    | IMapDB(imap<D, B>)  // error: - strict passed to context without strict restrictions
-
-  type {:extern} abs<+A, *B, !C, D, -E>
-
-  datatype CheckRec =
-    | IMapD(imap<CheckRec, int>)  // error: - recursive mentions must be used in a strict (and covariant) context
-    | IMapR(imap<int, CheckRec>)
-    | ISet(iset<CheckRec>)  // error: - recursive mentions must be used in a strict (and covariant) context
-    | Set(set<CheckRec>)
-    | CheckA(abs<CheckRec, int, int, int, int>)
-    | CheckB(abs<int, CheckRec, int, int, int>)  // error: - recursive mentions must be used in a strict (and covariant) context
-    | CheckC(abs<int, int, CheckRec, int, int>)  // error: - recursive mentions must be used in a strict (and covariant) context
-    | CheckD(abs<int, int, int, CheckRec, int>)
-    | CheckE(abs<int, int, int, int, CheckRec>)  // error: - recursive mentions must be used in a strict (and covariant) context
-
-  datatype CheckRec2 =
-    | ArrowD(CheckRec2 -> int)  // error: - recursive mentions must be used in a strict (and covariant) context
-    | ArrowR(int -> CheckRec2)
-
-  class VaryingClass<A,B,C,+HotDog,D,-Whale>  // error (x2): all must be non-variant
-  {
-    var f: HotDog -> Whale  // not a problem here
-    method M() {
-      var g: HotDog -> Whale;  // not a problem here
-    }
-  }
-
-  iterator VaryingIter<A,B,C,+HotDog,D,-Whale>()  // error (x2): all must be non-variant
-  {
-  }
-
-  datatype Dt = Ctor(Dt -> int)  // error: this would give rise to a logical inconsistency
-
-  datatype U0<!A> = U0(A -> bool)
-  type U1<!A> = U0<A>
-  datatype U2 = MakeU2(U1<U2>)  // error: this would give rise to a logical inconsistency
-
-  datatype R0 = Ctor(R2 ~> bool)  // error: this would give rise to a logical inconsistency
-  type R1<X> = X
-  datatype R2 = Ctor(R1<R0>)
-}
-
-module Cycles {
-  type W0 = W1
-  datatype W1 = Ctor(W0 --> bool) // error: this increases cardinality
-
-  datatype Z0 = Ctor(Z2 ~> bool) // error: this increases cardinality
-  type Z1 = Z0
-  datatype Z2 = Ctor(Z1)
-}
-
-module Depen {
-  type V0 = x: V2 | true  // error: recursive definition in constraint of subset type
-  type V1 = V0
-  datatype V2 = Ctor(V1 --> bool)
-}
-
-module DependencyChecks {
-  type A = x: B | true  // error: bad dependency cycle
-  type B = y: int | F(y)
-  ghost predicate F(y: int) {
-    var i: A := 5;
-    i < 32
-  }
-
-  datatype Q = Q(x: R)
-  type R = x: S | true  // error: bad dependency cycle
-  type S = y: int | G(y)
-  ghost predicate G(y: int) {
-    var q: Q :| true;
-    q.x < 32
-  }
-}
-
-module Cycle0 {
-  type B = x: B | true  // error: cycle
-}
-
-module Cycle1 {
-  type A = x: int | var a: A :| true; P(x)  // error: cycle
-  ghost predicate P(x: int)
-}
-
-module Cycle2 {
-  type C = x: int | f(x) == f(x)  // error: cycle
-  ghost function f(x: int): C
-}
-
-module MoreDependencyCycles0 {
-  type MeAndMyself = x: int | var m: MeAndMyself := 5; m < 10  // error: cyclic dependency in constraint
-}
-
-module MoreDependencyCycles1 {
-  type MeAndMyself'' = MeAndMyself'
-  type MeAndMyself' = x: int | var m: MeAndMyself'' := 5; m < 10  // error: cyclic dependency in constraint
-}
diff --git a/Test/dafny0/Wellfounded.dfy.verifier.expect b/Test/dafny0/Wellfounded.dfy.verifier.expect
deleted file mode 100644
index e61f12f01b2..00000000000
--- a/Test/dafny0/Wellfounded.dfy.verifier.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-Wellfounded.dfy(48,14): Warning: /!\ No terms found to trigger on.
-Wellfounded.dfy(76,5): Warning: /!\ No terms found to trigger on.
diff --git a/Test/dafny0/columns.dfy.expect b/Test/dafny0/columns.dfy.expect
deleted file mode 100644
index 681d219e04a..00000000000
--- a/Test/dafny0/columns.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-columns.dfy(8,0): Warning: module-level methods are always non-instance, so the 'static' keyword is not allowed here
-columns.dfy(9,9): Error: assertion could not be proved
-columns.dfy(10,11): Error: assertion could not be proved
-columns.dfy(11,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/dafny0/formatting2.dfy.expect b/Test/dafny0/formatting2.dfy.expect
deleted file mode 100644
index 76063704466..00000000000
--- a/Test/dafny0/formatting2.dfy.expect
+++ /dev/null
@@ -1 +0,0 @@
-*** Error: file unexisting.dfy not found
diff --git a/Test/dafny0/one-message-per-failed-precondition.dfy b/Test/dafny0/one-message-per-failed-precondition.dfy
deleted file mode 100644
index d1413b6d6f6..00000000000
--- a/Test/dafny0/one-message-per-failed-precondition.dfy
+++ /dev/null
@@ -1,20 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// When a function call violates two preconditions at the same time, it causes
-// two errors to be reported for the same token
-
-method A(x: int)
-  requires x > 0
-  requires x < 0
-{}
-
-method B(x: int) {
-  A(x);
-}
-
-ghost function fA(x: int): int
-  requires x > 0
-  requires x < 0 { 1 }
-
-ghost function fB(x: int): int { fA(x) }
diff --git a/Test/dafny0/snapshots/Snapshots0.run.dfy.expect b/Test/dafny0/snapshots/Snapshots0.run.dfy.expect
deleted file mode 100644
index 82890f26a0c..00000000000
--- a/Test/dafny0/snapshots/Snapshots0.run.dfy.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-Processing command (at Snapshots0.v0.dfy(4,10)) assert Lit(false);
-  >>> DoNothingToAssert
-
-Dafny program verifier finished with 1 verified, 0 errors
-Processing call to procedure bar (call) in implementation foo (correctness) (at Snapshots0.v1.dfy(3,6)):
-  >>> added axiom: (forall call0old#AT#$Heap: Heap, $Heap: Heap :: {:weight 30} { ##extracted_function##1(call0old#AT#$Heap, $Heap) } ##extracted_function##1(call0old#AT#$Heap, $Heap) == (true && Lit(false) && (forall $o: ref :: { $Heap[$o] } $o != null && read(call0old#AT#$Heap, $o, alloc): bool ==> $Heap[$o] == call0old#AT#$Heap[$o]) && $HeapSucc(call0old#AT#$Heap, $Heap)))
-  >>> added after: a##cached##0 := a##cached##0 && ##extracted_function##1(call0old#AT#$Heap, $Heap);
-Processing command (at <unknown location>) a##cached##0 := a##cached##0 && ##extracted_function##1(call0old#AT#$Heap, $Heap);
-  >>> AssumeNegationOfAssumptionVariable
-Processing command (at Snapshots0.v1.dfy(4,10)) assert Lit(false);
-  >>> MarkAsPartiallyVerified
-Snapshots0.v1.dfy(4,9): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny0/snapshots/Snapshots1.run.dfy.expect b/Test/dafny0/snapshots/Snapshots1.run.dfy.expect
deleted file mode 100644
index cfd21d04c89..00000000000
--- a/Test/dafny0/snapshots/Snapshots1.run.dfy.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-Processing command (at Snapshots1.v0.dfy(4,10)) assert Lit(false);
-  >>> DoNothingToAssert
-
-Dafny program verifier finished with 1 verified, 0 errors
-Processing call to procedure N (call) in implementation M (correctness) (at Snapshots1.v1.dfy(3,4)):
-  >>> added after: a##cached##0 := a##cached##0 && false;
-Processing command (at Snapshots1.v1.dfy(4,10)) assert Lit(false);
-  >>> DoNothingToAssert
-Snapshots1.v1.dfy(4,9): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny0/snapshots/Snapshots2.run.dfy.expect b/Test/dafny0/snapshots/Snapshots2.run.dfy.expect
deleted file mode 100644
index 6a289d43e4a..00000000000
--- a/Test/dafny0/snapshots/Snapshots2.run.dfy.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-Processing command (at Snapshots2.v0.dfy(4,10)) assert Lit(false);
-  >>> DoNothingToAssert
-Processing command (at Snapshots2.v0.dfy(11,11)) assert true;
-  >>> DoNothingToAssert
-Processing command (at Snapshots2.v0.dfy(11,15)) assert _module.__default.P() <==> _module.__default.Q();
-  >>> DoNothingToAssert
-Processing command (at Snapshots2.v0.dfy(14,11)) assert true;
-  >>> DoNothingToAssert
-Processing command (at Snapshots2.v0.dfy(14,15)) assert _module.__default.Q() <==> Lit(_module.__default.R());
-  >>> DoNothingToAssert
-
-Dafny program verifier finished with 3 verified, 0 errors
-Processing call to procedure N (call) in implementation M (correctness) (at Snapshots2.v1.dfy(3,4)):
-  >>> added after: a##cached##0 := a##cached##0 && false;
-Processing implementation P (well-formedness) (at Snapshots2.v1.dfy(10,11)):
-  >>> added after assuming the current precondition: a##cached##0 := a##cached##0 && false;
-Processing implementation Q (well-formedness) (at Snapshots2.v1.dfy(13,11)):
-  >>> added after assuming the current precondition: a##cached##0 := a##cached##0 && false;
-Processing command (at Snapshots2.v1.dfy(4,10)) assert Lit(false);
-  >>> DoNothingToAssert
-Snapshots2.v1.dfy(4,9): Error: assertion could not be proved
-Processing command (at Snapshots2.v1.dfy(11,11)) assert true;
-  >>> DoNothingToAssert
-Processing command (at Snapshots2.v1.dfy(11,15)) assert _module.__default.P() <==> _module.__default.Q();
-  >>> DoNothingToAssert
-Processing command (at Snapshots2.v1.dfy(14,11)) assert true;
-  >>> DoNothingToAssert
-Processing command (at Snapshots2.v1.dfy(14,15)) assert _module.__default.Q() <==> Lit(_module.__default.R());
-  >>> DoNothingToAssert
-
-Dafny program verifier finished with 2 verified, 1 error
diff --git a/Test/dafny0/snapshots/Snapshots3.run.dfy.expect b/Test/dafny0/snapshots/Snapshots3.run.dfy.expect
deleted file mode 100644
index 393295b2055..00000000000
--- a/Test/dafny0/snapshots/Snapshots3.run.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-Processing command (at Snapshots3.v0.dfy(9,14)) assert Lit(0 != 0);
-  >>> DoNothingToAssert
-Snapshots3.v0.dfy(9,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
-Processing command (at Snapshots3.v1.dfy(5,12)) assert Lit(true);
-  >>> DoNothingToAssert
-Processing command (at Snapshots3.v1.dfy(9,14)) assert Lit(0 != 0);
-  >>> RecycleError
-Snapshots3.v0.dfy(9,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny0/snapshots/Snapshots4.run.dfy.expect b/Test/dafny0/snapshots/Snapshots4.run.dfy.expect
deleted file mode 100644
index c1f4d9cfc4e..00000000000
--- a/Test/dafny0/snapshots/Snapshots4.run.dfy.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-Processing command (at Snapshots4.v0.dfy(9,14)) assert LitInt(0) == LitInt(0);
-  >>> DoNothingToAssert
-
-Dafny program verifier finished with 1 verified, 0 errors
-Processing command (at Snapshots4.v1.dfy(5,14)) assert Lit(1 != 1);
-  >>> DoNothingToAssert
-Processing command (at Snapshots4.v1.dfy(9,14)) assert LitInt(0) == LitInt(0);
-  >>> MarkAsFullyVerified
-Processing command (at Snapshots4.v1.dfy(10,14)) assert Lit(2 != 2);
-  >>> DoNothingToAssert
-Snapshots4.v1.dfy(5,13): Error: assertion could not be proved
-Snapshots4.v1.dfy(10,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny0/snapshots/Snapshots5.run.dfy.expect b/Test/dafny0/snapshots/Snapshots5.run.dfy.expect
deleted file mode 100644
index f4a197e224d..00000000000
--- a/Test/dafny0/snapshots/Snapshots5.run.dfy.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-Snapshots5.v0.dfy(10,12): Warning: /!\ No terms found to trigger on.
-Snapshots5.v0.dfy(13,10): Warning: /!\ No terms found to trigger on.
-Snapshots5.v0.dfy(20,12): Warning: /!\ No terms found to trigger on.
-Snapshots5.v0.dfy(26,11): Warning: /!\ No terms found to trigger on.
-Processing command (at Snapshots5.v0.dfy(10,40)) assert (forall b#1_1: bool :: true ==> b#1_1 || !b#1_1) || 0 != 0;
-  >>> DoNothingToAssert
-Processing command (at Snapshots5.v0.dfy(13,38)) assert (forall b#1: bool :: true ==> b#1 || !b#1) || 3 != 3;
-  >>> DoNothingToAssert
-Processing command (at Snapshots5.v0.dfy(20,40)) assert (forall b#3_1: bool :: true ==> b#3_1 || !b#3_1) || 1 != 1;
-  >>> DoNothingToAssert
-
-Dafny program verifier finished with 1 verified, 0 errors
-Snapshots5.v1.dfy(10,12): Warning: /!\ No terms found to trigger on.
-Snapshots5.v1.dfy(13,10): Warning: /!\ No terms found to trigger on.
-Snapshots5.v1.dfy(20,12): Warning: /!\ No terms found to trigger on.
-Snapshots5.v1.dfy(22,10): Warning: /!\ No terms found to trigger on.
-Snapshots5.v1.dfy(27,11): Warning: /!\ No terms found to trigger on.
-Processing command (at Snapshots5.v1.dfy(10,40)) assert (forall b#1_1: bool :: true ==> b#1_1 || !b#1_1) || 0 != 0;
-  >>> MarkAsFullyVerified
-Processing command (at Snapshots5.v1.dfy(13,38)) assert (forall b#1: bool :: true ==> b#1 || !b#1) || 3 != 3;
-  >>> MarkAsFullyVerified
-Processing command (at Snapshots5.v1.dfy(20,37)) assert (exists b#3_1: bool :: Lit(true)) || 4 != 4;
-  >>> DoNothingToAssert
-Processing command (at Snapshots5.v1.dfy(22,35)) assert (exists b#3: bool :: Lit(true)) || 5 != 5;
-  >>> DoNothingToAssert
-
-Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/dafny0/snapshots/Snapshots8.run.dfy.expect b/Test/dafny0/snapshots/Snapshots8.run.dfy.expect
deleted file mode 100644
index 7f1daac152f..00000000000
--- a/Test/dafny0/snapshots/Snapshots8.run.dfy.expect
+++ /dev/null
@@ -1,43 +0,0 @@
-Processing command (at Snapshots8.v0.dfy(2,37)) assert x#0 < 20 || LitInt(10) <= x#0;
-  >>> DoNothingToAssert
-Processing command (at Snapshots8.v0.dfy(3,12)) assert x#0 < 10;
-  >>> DoNothingToAssert
-Processing command (at Snapshots8.v0.dfy(4,8)) assert LitInt(0) <= call0formal#AT#y#0;
-  >>> DoNothingToAssert
-Snapshots8.v0.dfy(3,11): Error: assertion could not be proved
-Snapshots8.v0.dfy(4,7): Error: a precondition for this call could not be proved
-Snapshots8.v0.dfy(8,13): Related location: this is the precondition that could not be proved
-Processing command (at Snapshots8.v0.dfy(13,13)) assert LitInt(2) <= z#0;
-  >>> DoNothingToAssert
-Snapshots8.v0.dfy(17,9): Error: a postcondition could not be proved on this return path
-Snapshots8.v0.dfy(13,12): Related location: this is the postcondition that could not be proved
-Processing command (at Snapshots8.v0.dfy(23,12)) assert u#0 != 53;
-  >>> DoNothingToAssert
-Snapshots8.v0.dfy(23,11): Error: assertion could not be proved
-Processing command (at Snapshots8.v0.dfy(28,10)) assert Lit(true);
-  >>> DoNothingToAssert
-
-Dafny program verifier finished with 1 verified, 4 errors
-Processing command (at Snapshots8.v1.dfy(30,17)) assert u#0 != 53;
-  >>> RecycleError
-Snapshots8.v1.dfy(30,16): Error: assertion could not be proved
-Processing command (at Snapshots8.v1.dfy(3,15)) assert x#0 < 20 || LitInt(10) <= x#0;
-  >>> MarkAsFullyVerified
-Processing command (at Snapshots8.v1.dfy(5,17)) assert x#0 < 10;
-  >>> RecycleError
-Processing command (at Snapshots8.v1.dfy(6,8)) assert LitInt(0) <= call0formal#AT#y#0;
-  >>> RecycleError
-Processing command (at Snapshots8.v1.dfy(7,12)) assert x#0 == LitInt(7);
-  >>> DoNothingToAssert
-Snapshots8.v1.dfy(5,16): Error: assertion could not be proved
-Snapshots8.v1.dfy(6,7): Error: a precondition for this call could not be proved
-Snapshots8.v1.dfy(12,20): Related location: this is the precondition that could not be proved
-Snapshots8.v1.dfy(7,11): Error: assertion could not be proved
-Processing command (at Snapshots8.v1.dfy(23,12)) assert Lit(true);
-  >>> DoNothingToAssert
-Processing command (at Snapshots8.v1.dfy(19,13)) assert LitInt(2) <= z#0;
-  >>> DoNothingToAssert
-Snapshots8.v1.dfy(24,9): Error: a postcondition could not be proved on this return path
-Snapshots8.v1.dfy(19,12): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 1 verified, 5 errors
diff --git a/Test/dafny0/snapshots/Snapshots9.run.dfy.expect b/Test/dafny0/snapshots/Snapshots9.run.dfy.expect
deleted file mode 100644
index 579a79fadc7..00000000000
--- a/Test/dafny0/snapshots/Snapshots9.run.dfy.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-Processing command (at Snapshots9.v0.dfy(2,11)) assert ok#0;
-  >>> DoNothingToAssert
-Snapshots9.v0.dfy(4,7): Error: a postcondition could not be proved on this return path
-Snapshots9.v0.dfy(2,10): Related location: this is the postcondition that could not be proved
-Processing command (at Snapshots9.v0.dfy(12,11)) assert ok#0;
-  >>> DoNothingToAssert
-Snapshots9.v0.dfy(13,0): Error: a postcondition could not be proved on this return path
-Snapshots9.v0.dfy(12,10): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
-Processing command (at Snapshots9.v1.dfy(6,11)) assert ok#0;
-  >>> RecycleError
-Snapshots9.v1.dfy(8,7): Error: a postcondition could not be proved on this return path
-Snapshots9.v1.dfy(6,10): Related location: this is the postcondition that could not be proved
-Processing command (at Snapshots9.v1.dfy(19,11)) assert ok#0;
-  >>> RecycleError
-Snapshots9.v1.dfy(21,0): Error: a postcondition could not be proved on this return path
-Snapshots9.v1.dfy(19,10): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny0/warnings-as-errors.dfy b/Test/dafny0/warnings-as-errors.dfy
deleted file mode 100644
index a4fa870d84f..00000000000
--- a/Test/dafny0/warnings-as-errors.dfy
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /warnShadowing /warningsAsErrors "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-method f(x: int) {
-  var x := 0;
-}
diff --git a/Test/dafny0/warnings-as-errors.dfy.expect b/Test/dafny0/warnings-as-errors.dfy.expect
deleted file mode 100644
index d5bdf4ca5a7..00000000000
--- a/Test/dafny0/warnings-as-errors.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-warnings-as-errors.dfy(4,6): Error: Shadowed local-variable name: x
-1 resolution/type errors detected in warnings-as-errors.dfy
diff --git a/Test/dafny1/Induction.dfy b/Test/dafny1/Induction.dfy
deleted file mode 100644
index a7309c89a8f..00000000000
--- a/Test/dafny1/Induction.dfy
+++ /dev/null
@@ -1,253 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /induction:3 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class IntegerInduction {
-  // This class considers different ways of proving, for any natural n:
-  //   (SUM i in [0, n] :: i^3) == (SUM i in [0, n] :: i)^2
-
-  // In terms of Dafny functions, the theorem to be proved is:
-  //   SumOfCubes(n) == Gauss(n) * Gauss(n)
-
-  ghost function SumOfCubes(n: int): int
-    requires 0 <= n;
-  {
-    if n == 0 then 0 else SumOfCubes(n-1) + n*n*n
-  }
-
-  ghost function Gauss(n: int): int
-    requires 0 <= n;
-  {
-    if n == 0 then 0 else Gauss(n-1) + n
-  }
-
-  // Here is one proof.  It uses a lemma, which is proved separately.
-
-  lemma Theorem0(n: int)
-    requires 0 <= n;
-    ensures SumOfCubes(n) == Gauss(n) * Gauss(n);
-  {
-    if (n != 0) {
-      Theorem0(n-1);
-      Lemma(n-1);
-    }
-  }
-
-  lemma Lemma(n: int)
-    requires 0 <= n;
-    ensures 2 * Gauss(n) == n*(n+1);
-  {
-    if (n != 0) { Lemma(n-1); }
-  }
-
-  // Here is another proof.  It states the lemma as part of the theorem, and
-  // thus proves the two together.
-
-  lemma Theorem1(n: int)
-    requires 0 <= n;
-    ensures SumOfCubes(n) == Gauss(n) * Gauss(n);
-    ensures 2 * Gauss(n) == n*(n+1);
-  {
-    if (n != 0) {
-      Theorem1(n-1);
-    }
-  }
-
-  lemma DoItAllInOneGo()
-    ensures (forall n {:split false} :: 0 <= n ==> // WISH reenable quantifier splitting here. This will only work once we generate induction hypotheses at the Dafny level.
-                SumOfCubes(n) == Gauss(n) * Gauss(n) &&
-                2 * Gauss(n) == n*(n+1));
-  {
-  }
-
-  // The following two lemmas are the same as the previous two, but
-  // here no body is given--and the proof still goes through (thanks to
-  // Dafny's ghost-method induction tactic).
-
-  lemma Lemma_Auto(n: int)
-    requires 0 <= n;
-    ensures 2 * Gauss(n) == n*(n+1);
-  {
-  }
-
-  lemma Theorem1_Auto(n: int)
-    requires 0 <= n;
-    ensures SumOfCubes(n) == Gauss(n) * Gauss(n);
-    ensures 2 * Gauss(n) == n*(n+1);
-  {
-  }
-
-  // Here is another proof.  It makes use of Dafny's induction heuristics to
-  // prove the lemma.
-
-  lemma Theorem2(n: int)
-    requires 0 <= n;
-    ensures SumOfCubes(n) == Gauss(n) * Gauss(n);
-  {
-    if (n != 0) {
-      Theorem2(n-1);
-
-      assert (forall m :: 0 <= m ==> 2 * Gauss(m) == m*(m+1));
-    }
-  }
-
-  lemma M(n: int)
-    requires 0 <= n;
-  {
-    assume (forall k :: 0 <= k && k < n ==> 2 * Gauss(k) == k*(k+1));  // manually assume the induction hypothesis
-    assert 2 * Gauss(n) == n*(n+1);
-  }
-
-  // Another way to prove the lemma is to supply a postcondition on the Gauss function
-
-  lemma Theorem3(n: int)
-    requires 0 <= n;
-    ensures SumOfCubes(n) == GaussWithPost(n) * GaussWithPost(n);
-  {
-    if (n != 0) {
-      Theorem3(n-1);
-    }
-  }
-
-  ghost function GaussWithPost(n: int): int
-    requires 0 <= n;
-    ensures 2 * GaussWithPost(n) == n*(n+1);
-  {
-    if n == 0 then 0 else GaussWithPost(n-1) + n
-  }
-
-  // Finally, with the postcondition of GaussWithPost, one can prove the entire theorem by induction
-
-  lemma Theorem4()
-    ensures (forall n :: 0 <= n ==>
-        SumOfCubes(n) == GaussWithPost(n) * GaussWithPost(n));
-  {
-    // look ma, no hints!
-  }
-
-  lemma Theorem5(n: int)
-    requires 0 <= n;
-    ensures SumOfCubes(n) == GaussWithPost(n) * GaussWithPost(n);
-  {
-    // the postcondition is a simple consequence of these quantified versions of the theorem:
-    if (*) {
-      assert (forall m :: 0 <= m ==> SumOfCubes(m) == GaussWithPost(m) * GaussWithPost(m));
-    } else {
-      Theorem4();
-    }
-  }
-
-  // The body of this function gives a single quantifier, which leads to an efficient
-  // way to check sortedness at run time.  However, an alternative, and ostensibly more general,
-  // way to express sortedness is given in the function's postcondition.  The alternative
-  // formulation may be easier to understand for a human and may also be more readily applicable
-  // for the program verifier.  Dafny will show that postcondition holds, which ensures the
-  // equivalence of the two formulations.
-  // The proof of the postcondition requires induction.  It would have been nicer to state it
-  // as one formula of the form "IsSorted(s) <==> ...", but then Dafny would never consider the
-  // possibility of applying induction.  Instead, the "==>" and "<==" cases are given separately.
-  // Proving the "<==" case is simple; it's the "==>" case that requires induction.
-  // The example uses an attribute that requests induction on just "j".  However, the proof also
-  // goes through by applying induction on both bound variables.
-  function IsSorted(s: seq<int>): bool //WISH remove autotriggers false
-    ensures IsSorted(s) ==> (forall i,j {:induction j} {:autotriggers false} :: 0 <= i < j < |s| ==> s[i] <= s[j]);
-    ensures (forall i,j :: 0 <= i && i < j && j < |s| ==> s[i] <= s[j]) ==> IsSorted(s);
-  {
-    (forall i {:nowarn} {:matchinglooprewrite false}:: 1 <= i && i < |s| ==> s[i-1] <= s[i])
-  }
-}
-
-datatype Tree<T> = Leaf(T) | Branch(Tree<T>, Tree<T>)
-
-class DatatypeInduction<T> {
-  ghost function LeafCount<T>(tree: Tree<T>): int
-  {
-    match tree
-    case Leaf(t) => 1
-    case Branch(left, right) => LeafCount(left) + LeafCount(right)
-  }
-
-  method Theorem0(tree: Tree<T>)
-    ensures 1 <= LeafCount(tree);
-  {
-    assert (forall t: Tree<T> :: 1 <= LeafCount(t));
-  }
-
-  // see also Test/dafny0/DTypes.dfy for more variations of this example
-
-  ghost function OccurrenceCount<T>(tree: Tree<T>, x: T): int
-  {
-    match tree
-    case Leaf(t) => if x == t then 1 else 0
-    case Branch(left, right) => OccurrenceCount(left, x) + OccurrenceCount(right, x)
-  }
-  method RegressionTest(tree: Tree<T>)
-    // the translation of the following line once crashed Dafny
-    requires forall y :: 0 <= OccurrenceCount(tree, y);
-  {
-  }
-
-}
-
-// ----------------------- Induction and case splits -----------------
-// This is a simple example where the induction hypothesis and the
-// case splits are decoupled.
-
-datatype D = Nothing | Something(D)
-
-ghost function FooD(n: nat, d: D): int
-  ensures 10 <= FooD(n, d);
-{
-  match d
-  case Nothing =>
-    if n == 0 then 10 else FooD(n-1, D.Something(d))
-  case Something(next) =>
-    if n < 100 then n + 12 else FooD(n-13, next)
-}
-
-// ----------------------- Regression: remember to substitute "this" -----------------
-
-class Node {
-  ghost var Repr: set<object>
-  var left: Node?
-  var uu: nat
-
-  ghost predicate Valid()
-    reads this, Repr
-    ensures Valid() ==> this in Repr
-  {
-    this in Repr &&
-    (left != null ==>
-      left in Repr && left.Repr <= Repr &&
-      this !in left.Repr &&
-      left.Valid()) &&
-    ((left == null && uu == 0) || (left != null && uu != 0))
-  }
-
-  constructor ()
-    ensures Valid() && fresh(Repr)
-  {
-    left := null;
-    uu := 0;
-    Repr := {this};
-  }
-
-  lemma InstanceAboutUU()
-    requires Valid()
-    ensures uu == 0 // regression: once upon a time, this used to go through
-    decreases Repr
-  {
-    if left == null {
-    } else { // error: postcondition violation
-    }
-  }
-}
-
-lemma StaticAboutUU(th: Node)
-  requires th.Valid()
-  ensures th.uu == 0
-  decreases th.Repr
-{
-  if th.left == null {
-  } else { // error: postcondition violation
-  }
-}
diff --git a/Test/dafny1/Induction.dfy.expect b/Test/dafny1/Induction.dfy.expect
deleted file mode 100644
index 0294a2297ac..00000000000
--- a/Test/dafny1/Induction.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-Induction.dfy(251,9): Error: a postcondition could not be proved on this return path
-Induction.dfy(247,16): Related location: this is the postcondition that could not be proved
-Induction.dfy(240,11): Error: a postcondition could not be proved on this return path
-Induction.dfy(236,15): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 32 verified, 2 errors
diff --git a/Test/dafny1/InductionOptions.dfy.expect b/Test/dafny1/InductionOptions.dfy.expect
deleted file mode 100644
index a3f1eccd0f0..00000000000
--- a/Test/dafny1/InductionOptions.dfy.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-InductionOptions.dfy(21,0): Error: a postcondition could not be proved on this return path
-InductionOptions.dfy(20,26): Related location: this is the postcondition that could not be proved
-InductionOptions.dfy(25,9): Error: assertion could not be proved
-InductionOptions.dfy(25,38): Related location
-InductionOptions.dfy(30,0): Error: a postcondition could not be proved on this return path
-InductionOptions.dfy(29,10): Related location: this is the postcondition that could not be proved
-InductionOptions.dfy(29,39): Related location
-InductionOptions.dfy(35,9): Error: assertion could not be proved
-InductionOptions.dfy(35,38): Related location
-InductionOptions.dfy(40,0): Error: a postcondition could not be proved on this return path
-InductionOptions.dfy(39,26): Related location: this is the postcondition that could not be proved
-InductionOptions.dfy(44,9): Error: assertion could not be proved
-InductionOptions.dfy(44,51): Related location
-
-Dafny program verifier finished with 1 verified, 6 errors
-InductionOptions.dfy(21,0): Error: a postcondition could not be proved on this return path
-InductionOptions.dfy(20,26): Related location: this is the postcondition that could not be proved
-InductionOptions.dfy(25,9): Error: assertion could not be proved
-InductionOptions.dfy(25,38): Related location
-InductionOptions.dfy(30,0): Error: a postcondition could not be proved on this return path
-InductionOptions.dfy(29,10): Related location: this is the postcondition that could not be proved
-InductionOptions.dfy(29,39): Related location
-InductionOptions.dfy(35,9): Error: assertion could not be proved
-InductionOptions.dfy(35,38): Related location
-
-Dafny program verifier finished with 3 verified, 4 errors
-InductionOptions.dfy(21,0): Error: a postcondition could not be proved on this return path
-InductionOptions.dfy(20,26): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 6 verified, 1 error
-
-Dafny program verifier finished with 7 verified, 0 errors
-InductionOptions.dfy(25,9): Error: assertion could not be proved
-InductionOptions.dfy(25,38): Related location
-InductionOptions.dfy(30,0): Error: a postcondition could not be proved on this return path
-InductionOptions.dfy(29,10): Related location: this is the postcondition that could not be proved
-InductionOptions.dfy(29,39): Related location
-InductionOptions.dfy(35,9): Error: assertion could not be proved
-InductionOptions.dfy(35,38): Related location
-
-Dafny program verifier finished with 4 verified, 3 errors
diff --git a/Test/dafny1/MoreInduction.dfy b/Test/dafny1/MoreInduction.dfy
deleted file mode 100644
index 2e5eefa0f30..00000000000
--- a/Test/dafny1/MoreInduction.dfy
+++ /dev/null
@@ -1,100 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" /autoTriggers:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype List<X> = Nil | Cons(Node<X>, List<X>)
-datatype Node<X> = Element(X) | Nary(List<X>)
-
-ghost function FlattenMain<M>(list: List<M>): List<M>
-  ensures IsFlat(FlattenMain(list));
-{
-  Flatten(list, Nil)
-}
-
-ghost function Flatten<X>(list: List<X>, ext: List<X>): List<X>
-  requires IsFlat(ext);
-  ensures IsFlat(Flatten(list, ext));
-{
-  match list
-  case Nil => ext
-  case Cons(n, rest) =>
-    match n
-    case Element(x) => Cons(n, Flatten(rest, ext))
-    case Nary(nn) => Flatten(nn, Flatten(rest, ext))
-}
-
-ghost function IsFlat<F>(list: List<F>): bool
-{
-  match list
-  case Nil => true
-  case Cons(n, rest) =>
-    match n
-    case Element(x) => IsFlat(rest)
-    case Nary(nn) => false
-}
-
-ghost function ToSeq<X>(list: List<X>): seq<X>
-{
-  match list
-  case Nil => []
-  case Cons(n, rest) =>
-    match n
-    case Element(x) => [x] + ToSeq(rest)
-    case Nary(nn) => ToSeq(nn) + ToSeq(rest)
-}
-
-lemma Theorem<X>(list: List<X>)
-  ensures ToSeq(list) == ToSeq(FlattenMain(list));
-{
-  Lemma(list, Nil);
-}
-
-lemma {:vcs_split_on_every_assert} Lemma<X>(list: List<X>, ext: List<X>)
-  requires IsFlat(ext);
-  ensures ToSeq(list) + ToSeq(ext) == ToSeq(Flatten(list, ext));
-{
-  match (list) {
-    case Nil =>
-    case Cons(n, rest) =>
-      match (n) {
-        case Element(x) =>
-          Lemma(rest, ext);
-        case Nary(nn) =>
-          Lemma(nn, Flatten(rest, ext));
-          Lemma(rest, ext);
-      }
-  }
-}
-
-// ---------------------------------------------
-
-ghost function NegFac(n: int): int
-  decreases -n;
-{
-  if -1 <= n then -1 else - NegFac(n+1) * n
-}
-
-lemma LemmaAll()
-  ensures forall n :: NegFac(n) <= -1;  // error: induction heuristic does not give a useful well-founded order, and thus this fails to verify
-{
-}
-
-lemma LemmaOne(n: int)
-  ensures NegFac(n) <= -1;  // error: induction heuristic does not give a useful well-founded order, and thus this fails to verify
-{
-}
-
-lemma LemmaAll_Neg() //FIXME I don't understand the comment below; what trigger?
-  ensures forall n {:nowarn} :: NegFac(-n) <= -1;  // error: fails to verify because of the minus in the trigger
-{
-}
-
-lemma LemmaOne_Neg(n: int) //FIXME What trigger?
-  ensures NegFac(-n) <= -1;  // error: fails to verify because of the minus in the trigger
-{
-}
-
-lemma LemmaOneWithDecreases(n: int)
-  ensures NegFac(n) <= -1;  // here, the programmer gives a good well-founded order, so this verifies
-  decreases -n;
-{
-}
diff --git a/Test/dafny1/Rippling.dfy b/Test/dafny1/Rippling.dfy
deleted file mode 100644
index 544f10d2f8f..00000000000
--- a/Test/dafny1/Rippling.dfy
+++ /dev/null
@@ -1,616 +0,0 @@
-// RUN: %dafny /compile:0 /deprecation:0 /induction:3 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Datatypes
-
-datatype Bool = False | True
-
-datatype Nat = Zero | Suc(Nat)
-
-datatype List = Nil | Cons(Nat, List)
-
-datatype Pair = Pair(Nat, Nat)
-
-datatype PList = PNil | PCons(Pair, PList)
-
-datatype Tree = Leaf | Node(Tree, Nat, Tree)
-
-// Boolean functions
-
-ghost function not(b: Bool): Bool
-{
-  match b
-  case False => True
-  case True => False
-}
-
-ghost function and(a: Bool, b: Bool): Bool
-{
-  if a == True && b == True then True else False
-}
-
-// Natural number functions
-
-ghost function add(x: Nat, y: Nat): Nat
-{
-  match x
-  case Zero => y
-  case Suc(w) => Suc(add(w, y))
-}
-
-ghost function minus(x: Nat, y: Nat): Nat
-{
-  match x
-  case Zero => Zero
-  case Suc(a) => match y
-    case Zero => x
-    case Suc(b) => minus(a, b)
-}
-
-ghost function eq(x: Nat, y: Nat): Bool
-{
-  match x
-  case Zero => (match y
-    case Zero => True
-    case Suc(b) => False)
-  case Suc(a) => (match y
-    case Zero => False
-    case Suc(b) => eq(a, b))
-}
-
-ghost function leq(x: Nat, y: Nat): Bool
-{
-  match x
-  case Zero => True
-  case Suc(a) => match y
-    case Zero => False
-    case Suc(b) => leq(a, b)
-}
-
-ghost function less(x: Nat, y: Nat): Bool
-{
-  match y
-  case Zero => False
-  case Suc(b) => match x
-    case Zero => True
-    case Suc(a) => less(a, b)
-}
-
-ghost function min(x: Nat, y: Nat): Nat
-{
-  match x
-  case Zero => Zero
-  case Suc(a) => match y
-    case Zero => Zero
-    case Suc(b) => Suc(min(a, b))
-}
-
-ghost function max(x: Nat, y: Nat): Nat
-{
-  match x
-  case Zero => y
-  case Suc(a) => match y
-    case Zero => x
-    case Suc(b) => Suc(max(a, b))
-}
-
-// List functions
-
-ghost function concat(xs: List, ys: List): List
-{
-  match xs
-  case Nil => ys
-  case Cons(x,tail) => Cons(x, concat(tail, ys))
-}
-
-ghost function mem(x: Nat, xs: List): Bool
-{
-  match xs
-  case Nil => False
-  case Cons(y, ys) => if x == y then True else mem(x, ys)
-}
-
-ghost function delete(n: Nat, xs: List): List
-{
-  match xs
-  case Nil => Nil
-  case Cons(y, ys) =>
-    if y == n then delete(n, ys) else Cons(y, delete(n, ys))
-}
-
-ghost function drop(n: Nat, xs: List): List
-{
-  match n
-  case Zero => xs
-  case Suc(m) => match xs
-    case Nil => Nil
-    case Cons(x, tail) => drop(m, tail)
-}
-
-ghost function take(n: Nat, xs: List): List
-{
-  match n
-  case Zero => Nil
-  case Suc(m) => match xs
-    case Nil => Nil
-    case Cons(x, tail) => Cons(x, take(m, tail))
-}
-
-ghost function len(xs: List): Nat
-{
-  match xs
-  case Nil => Zero
-  case Cons(y, ys) => Suc(len(ys))
-}
-
-ghost function count(x: Nat, xs: List): Nat
-{
-  match xs
-  case Nil => Zero
-  case Cons(y, ys) =>
-    if x == y then Suc(count(x, ys)) else count(x, ys)
-}
-
-ghost function last(xs: List): Nat
-{
-  match xs
-  case Nil => Zero
-  case Cons(y, ys) => match ys
-    case Nil => y
-    case Cons(z, zs) => last(ys)
-}
-
-ghost function apply(f: Nat -> Nat, xs: List): List
-{
-  match xs
-  case Nil => Nil
-  case Cons(y, ys) => Cons(f(y), apply(f, ys))
-}
-
-// In the following two functions, parameter "p" stands for a predicate:  applying p and
-// getting Zero means "false" and getting anything else means "true".
-
-ghost function takeWhileAlways(p: Nat -> Nat, xs: List): List
-{
-  match xs
-  case Nil => Nil
-  case Cons(y, ys) =>
-    if p(y) != Zero
-    then Cons(y, takeWhileAlways(p, ys))
-    else Nil
-}
-
-ghost function dropWhileAlways(p: Nat -> Nat, xs: List): List
-{
-  match xs
-  case Nil => Nil
-  case Cons(y, ys) =>
-    if p(y) != Zero
-    then dropWhileAlways(p, ys)
-    else Cons(y, ys)
-}
-
-ghost function filter(p: Nat -> Nat, xs: List): List
-{
-  match xs
-  case Nil => Nil
-  case Cons(y, ys) =>
-    if p(y) != Zero
-    then Cons(y, filter(p, ys))
-    else filter(p, ys)
-}
-
-ghost function insort(n: Nat, xs: List): List
-{
-  match xs
-  case Nil => Cons(n, Nil)
-  case Cons(y, ys) =>
-    if leq(n, y) == True
-    then Cons(n, Cons(y, ys))
-    else Cons(y, insort(n, ys))
-}
-
-ghost function ins(n: Nat, xs: List): List
-{
-  match xs
-  case Nil => Cons(n, Nil)
-  case Cons(y, ys) =>
-    if less(n, y) == True
-    then Cons(n, Cons(y, ys))
-    else Cons(y, ins(n, ys))
-}
-
-ghost function ins1(n: Nat, xs: List): List
-{
-  match xs
-  case Nil => Cons(n, Nil)
-  case Cons(y, ys) =>
-    if n == y
-    then Cons(y, ys)
-    else Cons(y, ins1(n, ys))
-}
-
-ghost function sort(xs: List): List
-{
-  match xs
-  case Nil => Nil
-  case Cons(y, ys) => insort(y, sort(ys))
-}
-
-ghost function reverse(xs: List): List
-{
-  match xs
-  case Nil => Nil
-  case Cons(t, rest) => concat(reverse(rest), Cons(t, Nil))
-}
-
-// Pair list functions
-
-ghost function zip(a: List, b: List): PList
-{
-  match a
-  case Nil => PNil
-  case Cons(x, xs) => match b
-    case Nil => PNil
-    case Cons(y, ys) => PCons(Pair.Pair(x, y), zip(xs, ys))
-}
-
-ghost function zipConcat(x: Nat, xs: List, more: List): PList
-{
-  match more
-  case Nil => PNil
-  case Cons(y, ys) => PCons(Pair.Pair(x, y), zip(xs, ys))
-}
-
-// Binary tree functions
-
-ghost function height(t: Tree): Nat
-{
-  match t
-  case Leaf => Zero
-  case Node(l, x, r) => Suc(max(height(l), height(r)))
-}
-
-ghost function mirror(t: Tree): Tree
-{
-  match t
-  case Leaf => Leaf
-  case Node(l, x, r) => Node(mirror(r), x, mirror(l))
-}
-
-// Function parameters
-
-// The following functions stand for the constant "false" and "true" functions,
-// respectively.
-
-ghost function AlwaysFalseFunction(): Nat -> Nat { n => Zero }
-ghost function AlwaysTrueFunction(): Nat -> Nat { n => Suc(Zero) }
-
-lemma AboutAlwaysFalseFunction()
-  ensures forall n :: AlwaysFalseFunction()(n) == Zero
-{
-}
-lemma AboutAlwaysTrueFunction()
-  ensures forall n :: AlwaysTrueFunction()(n) != Zero
-{
-}
-
-// -----------------------------------------------------------------------------------
-// The theorems to be proved
-// -----------------------------------------------------------------------------------
-
-lemma P1()
-  ensures forall n, xs :: concat(take(n, xs), drop(n, xs)) == xs;
-{
-}
-
-lemma P2()
-  ensures forall n, xs, ys :: add(count(n, xs), count(n, ys)) == count(n, concat(xs, ys));
-{
-}
-
-lemma P3()
-  ensures forall n, xs, ys :: leq(count(n, xs), count(n, concat(xs, ys))) == True;
-{
-}
-
-lemma P4()
-  ensures forall n, xs :: add(Suc(Zero), count(n, xs)) == count(n, Cons(n, xs));
-{
-}
-
-lemma P5()
-  ensures forall n, xs, x ::
-    add(Suc(Zero), count(n, xs)) == count(n, Cons(x, xs))
-    ==> n == x;
-{
-}
-
-lemma P6()
-  ensures forall m, n :: minus(n, add(n, m)) == Zero;
-{
-}
-
-lemma P7()
-  ensures forall m, n :: minus(add(n, m), n) == m;
-{
-}
-
-lemma P8()
-  ensures forall k, m, n :: minus(add(k, m), add(k, n)) == minus(m, n);
-{
-}
-
-lemma P9()
-  ensures forall i, j, k :: minus(minus(i, j), k) == minus(i, add(j, k));
-{
-}
-
-lemma P10()
-  ensures forall m :: minus(m, m) == Zero;
-{
-}
-
-lemma P11()
-  ensures forall xs :: drop(Zero, xs) == xs;
-{
-}
-
-lemma P12()
-  ensures forall n, xs, f :: drop(n, apply(f, xs)) == apply(f, drop(n, xs));
-{
-}
-
-lemma P13()
-  ensures forall n, x, xs :: drop(Suc(n), Cons(x, xs)) == drop(n, xs);
-{
-}
-
-lemma P14()
-  ensures forall xs, ys, p :: filter(p, concat(xs, ys)) == concat(filter(p, xs), filter(p, ys));
-{
-}
-
-lemma P15()
-  ensures forall x, xs :: len(ins(x, xs)) == Suc(len(xs));
-{
-}
-
-lemma P16()
-  ensures forall x, xs :: xs == Nil ==> last(Cons(x, xs)) == x;
-{
-}
-
-lemma P17()
-  ensures forall n :: leq(n, Zero) == True <==> n == Zero;
-{
-}
-
-lemma P18()
-  ensures forall i, m :: less(i, Suc(add(i, m))) == True;
-{
-}
-
-lemma P19()
-  ensures forall n, xs :: len(drop(n, xs)) == minus(len(xs), n);
-{
-}
-
-lemma P20()
-  ensures forall xs :: len(sort(xs)) == len(xs);
-{
-  // the proof of this theorem requires a lemma about "insort"
-  assert forall x, xs :: len(insort(x, xs)) == Suc(len(xs));
-}
-
-lemma P21()
-  ensures forall n, m :: leq(n, add(n, m)) == True;
-{
-}
-
-lemma P22()
-  ensures forall a, b, c :: max(max(a, b), c) == max(a, max(b, c));
-{
-}
-
-lemma P23()
-  ensures forall a, b :: max(a, b) == max(b, a);
-{
-}
-
-lemma P24()
-  ensures forall a, b :: max(a, b) == a <==> leq(b, a) == True;
-{
-}
-
-lemma P25()
-  ensures forall a, b :: max(a, b) == b <==> leq(a, b) == True;
-{
-}
-
-lemma P26()
-  ensures forall x, xs, ys :: mem(x, xs) == True ==> mem(x, concat(xs, ys)) == True;
-{
-}
-
-lemma P27()
-  ensures forall x, xs, ys :: mem(x, ys) == True ==> mem(x, concat(xs, ys)) == True;
-{
-}
-
-lemma P28()
-  ensures forall x, xs :: mem(x, concat(xs, Cons(x, Nil))) == True;
-{
-}
-
-lemma P29()
-  ensures forall x, xs :: mem(x, ins1(x, xs)) == True;
-{
-}
-
-lemma P30()
-  ensures forall x, xs :: mem(x, ins(x, xs)) == True;
-{
-}
-
-lemma P31()
-  ensures forall a, b, c :: min(min(a, b), c) == min(a, min(b, c));
-{
-}
-
-lemma P32()
-  ensures forall a, b :: min(a, b) == min(b, a);
-{
-}
-
-lemma P33()
-  ensures forall a, b :: min(a, b) == a <==> leq(a, b) == True;
-{
-}
-
-lemma P34()
-  ensures forall a, b :: min(a, b) == b <==> leq(b, a) == True;
-{
-}
-
-lemma P35()
-  ensures forall xs :: dropWhileAlways(AlwaysFalseFunction(), xs) == xs;
-{
-}
-
-lemma P36()
-  ensures forall xs :: takeWhileAlways(AlwaysTrueFunction(), xs) == xs;
-{
-}
-
-lemma P37()
-  ensures forall x, xs :: not(mem(x, delete(x, xs))) == True;
-{
-}
-
-lemma P38()
-  ensures forall n, xs :: count(n, concat(xs, Cons(n, Nil))) == Suc(count(n, xs));
-{
-}
-
-lemma P39()
-  ensures forall n, x, xs ::
-            add(count(n, Cons(x, Nil)), count(n, xs)) == count(n, Cons(x, xs));
-{
-}
-
-lemma P40()
-  ensures forall xs :: take(Zero, xs) == Nil;
-{
-}
-
-lemma P41()
-  ensures forall n, xs, f :: take(n, apply(f, xs)) == apply(f, take(n, xs));
-{
-}
-
-lemma P42()
-  ensures forall n, x, xs :: take(Suc(n), Cons(x, xs)) == Cons(x, take(n, xs));
-{
-}
-
-lemma P43(p: Nat -> Nat)
-  ensures forall xs :: concat(takeWhileAlways(p, xs), dropWhileAlways(p, xs)) == xs;
-{
-}
-
-lemma P44()
-  ensures forall x, xs, ys :: zip(Cons(x, xs), ys) == zipConcat(x, xs, ys);
-{
-}
-
-lemma P45()
-  ensures forall x, xs, y, ys ::
-            zip(Cons(x, xs), Cons(y, ys)) ==
-            PCons(Pair.Pair(x, y), zip(xs, ys));
-{
-}
-
-lemma P46()
-  ensures forall ys :: zip(Nil, ys) == PNil;
-{
-}
-
-lemma P47()
-  ensures forall a :: height(mirror(a)) == height(a);
-{
-  // proving this theorem requires a previously proved lemma:
-  P23();
-}
-
-// ...
-
-lemma P54()
-  ensures forall m, n :: minus(add(m, n), n) == m;
-{
-  // the proof of this theorem follows from two lemmas:
-  assert forall m, n {:autotriggers false} :: minus(add(n, m), n) == m; // FIXME: Why does Autotriggers false make things verify?
-  assert forall m, n :: add(m, n) == add(n, m);
-}
-
-lemma P65()
-  ensures forall i, m :: less(i, Suc(add(m, i))) == True;
-{
-  if (*) {
-    // the proof of this theorem follows from two lemmas:
-    assert forall i, m {:autotriggers false} :: less(i, Suc(add(i, m))) == True; // FIXME: Why does Autotriggers false make things verify?
-    assert forall m, n :: add(m, n) == add(n, m);
-  } else {
-    // a different way to prove it uses the following lemma:
-    assert forall x,y :: add(x, Suc(y)) == Suc(add(x,y));
-  }
-}
-
-lemma P67()
-  ensures forall m, n :: leq(n, add(m, n)) == True;
-{
-  if (*) {
-    // the proof of this theorem follows from two lemmas:
-    assert forall m, n {:autotriggers false} :: leq(n, add(n, m)) == True; // FIXME: Why does Autotriggers false make things verify?
-    assert forall m, n :: add(m, n) == add(n, m);
-  } else {
-    // a different way to prove it uses the following lemma:
-    assert forall x,y :: add(x, Suc(y)) == Suc(add(x,y));
-  }
-}
-
-// ---------
-// Here is a alternate way of writing down the proof obligations:
-
-lemma P1_alt(n: Nat, xs: List)
-  ensures concat(take(n, xs), drop(n, xs)) == xs;
-{
-}
-
-lemma P2_alt(n: Nat, xs: List, ys: List)
-  ensures add(count(n, xs), count(n, ys)) == count(n, (concat(xs, ys)));
-{
-}
-
-// ---------
-
-lemma {:vcs_split_on_every_assert} Lemma_RevConcat(xs: List, ys: List)
-  ensures reverse(concat(xs, ys)) == concat(reverse(ys), reverse(xs));
-{
-  match (xs) {
-    case Nil =>
-      assert forall ws :: concat(ws, Nil) == ws;
-    case Cons(t, rest) =>
-      assert forall a, b, c :: concat(a, concat(b, c)) == concat(concat(a, b), c);
-  }
-}
-
-lemma Theorem(xs: List)
-  ensures reverse(reverse(xs)) == xs;
-{
-  match (xs) {
-    case Nil =>
-    case Cons(t, rest) =>
-      Lemma_RevConcat(reverse(rest), Cons(t, Nil));
-  }
-}
diff --git a/Test/dafny1/SchorrWaite-stages.dfy.expect b/Test/dafny1/SchorrWaite-stages.dfy.expect
deleted file mode 100644
index 4ea2437c20d..00000000000
--- a/Test/dafny1/SchorrWaite-stages.dfy.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-SchorrWaite-stages.dfy(149,7): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(150,10): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(161,9): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(162,16): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(164,11): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(168,15): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(174,11): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(175,11): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(201,7): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(202,10): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(221,9): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(223,11): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(225,16): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(230,11): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(236,11): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(239,11): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(255,7): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(256,10): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(260,9): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(261,16): Warning: the ... refinement feature in statements is deprecated
-SchorrWaite-stages.dfy(263,11): Warning: the ... refinement feature in statements is deprecated
-
-Dafny program verifier finished with 7 verified, 0 errors
diff --git a/Test/dafny2/Calculations.dfy b/Test/dafny2/Calculations.dfy
deleted file mode 100644
index 474f6a933fb..00000000000
--- a/Test/dafny2/Calculations.dfy
+++ /dev/null
@@ -1,276 +0,0 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-/* Lists */
-// Here are some standard definitions of List and functions on Lists
-
-datatype List<T> = Nil | Cons(T, List)
-
-ghost function length(l: List): nat
-{
-  match l
-  case Nil => 0
-  case Cons(x, xs) => 1 + length(xs)
-}
-
-ghost function concat(l: List, ys: List): List
-{
-  match l
-  case Nil => ys
-  case Cons(x, xs) => Cons(x, concat(xs, ys))
-}
-
-ghost function reverse(l: List): List
-{
-  match l
-  case Nil => Nil
-  case Cons(x, xs) => concat(reverse(xs), Cons(x, Nil))
-}
-
-ghost function revacc(l: List, acc: List): List
-{
-  match l
-  case Nil => acc
-  case Cons(x, xs) => revacc(xs, Cons(x, acc))
-}
-
-ghost function qreverse(l: List): List
-{
-  revacc(l, Nil)
-}
-
-// Here are two lemmas about the List functions.
-
-lemma Lemma_ConcatNil(xs : List)
-  ensures concat(xs, Nil) == xs;
-{
-}
-
-lemma Lemma_RevCatCommute(xs : List)
-  ensures forall ys, zs :: revacc(xs, concat(ys, zs)) == concat(revacc(xs, ys), zs);
-{
-}
-
-// Here is a theorem that says "qreverse" and "reverse" calculate the same result.  The proof
-// is given in a calculational style.  The proof is not minimal--some lines can be omitted
-// and Dafny will still fill in the details.
-
-lemma Theorem_QReverseIsCorrect_Calc(l: List)
-  ensures qreverse(l) == reverse(l);
-{
-  calc {
-    qreverse(l);
-    // def. qreverse
-    revacc(l, Nil);
-    { Lemma_Revacc_calc(l, Nil); }
-    concat(reverse(l), Nil);
-    { Lemma_ConcatNil(reverse(l)); }
-    reverse(l);
-  }
-}
-
-lemma Lemma_Revacc_calc(xs: List, ys: List)
-  ensures revacc(xs, ys) == concat(reverse(xs), ys);
-{
-  match (xs) {
-    case Nil =>
-    case Cons(x, xrest) =>
-      calc {
-        concat(reverse(xs), ys);
-        // def. reverse
-        concat(concat(reverse(xrest), Cons(x, Nil)), ys);
-        // induction hypothesis: Lemma_Revacc_calc(xrest, Cons(x, Nil))
-        concat(revacc(xrest, Cons(x, Nil)), ys);
-        { Lemma_RevCatCommute(xrest); } // forall xs,ys,zs :: revacc(xs, concat(ys, zs)) == concat(revacc(xs, ys), zs)
-        revacc(xrest, concat(Cons(x, Nil), ys));
-        // def. concat (x2)
-        revacc(xrest, Cons(x, ys));
-        // def. revacc
-        revacc(xs, ys);
-      }
-  }
-}
-
-// Here is a version of the same proof, as it was constructed before Dafny's "calc" construct.
-
-lemma Theorem_QReverseIsCorrect(l: List)
-  ensures qreverse(l) == reverse(l);
-{
-  assert qreverse(l)
-      == // def. qreverse
-         revacc(l, Nil);
-  Lemma_Revacc(l, Nil);
-  assert revacc(l, Nil)
-      == concat(reverse(l), Nil);
-  Lemma_ConcatNil(reverse(l));
-}
-
-lemma Lemma_Revacc(xs: List, ys: List)
-  ensures revacc(xs, ys) == concat(reverse(xs), ys);
-{
-  match (xs) {
-    case Nil =>
-    case Cons(x, xrest) =>
-      assert revacc(xs, ys)
-          == // def. revacc
-              revacc(xrest, Cons(x, ys));
-
-      assert concat(reverse(xs), ys)
-          == // def. reverse
-              concat(concat(reverse(xrest), Cons(x, Nil)), ys)
-          == // induction hypothesis:  Lemma_Revacc(xrest, Cons(x, Nil))
-              concat(revacc(xrest, Cons(x, Nil)), ys);
-          Lemma_RevCatCommute(xrest);  // forall xs,ys,zs :: revacc(xs, concat(ys, zs)) == concat(revacc(xs, ys), zs)
-      assert concat(revacc(xrest, Cons(x, Nil)), ys)
-          == revacc(xrest, concat(Cons(x, Nil), ys));
-
-      assert forall g: _T0, gs :: concat(Cons(g, Nil), gs) == Cons(g, gs);
-
-      assert revacc(xrest, concat(Cons(x, Nil), ys))
-          == // the assert lemma just above
-              revacc(xrest, Cons(x, ys));
-  }
-}
-
-/* Fibonacci */
-// To further demonstrate what the "calc" construct can do, here are some proofs about the Fibonacci function.
-
-ghost function Fib(n: nat): nat
-{
-  if n < 2 then n else Fib(n - 2) + Fib(n - 1)
-}
-
-lemma Lemma_Fib()
-  ensures Fib(5) < 6;
-{
-  calc {
-    Fib(5);
-    Fib(4) + Fib(3);
-  <
-    calc {
-      Fib(2);
-      Fib(0) + Fib(1);
-      0 + 1;
-      1;
-    }
-    6;
-  }
-}
-
-/* List length */
-// Here are some proofs that show the use of nested calculations.
-
-lemma Lemma_Concat_Length(xs: List, ys: List)
-  ensures length(concat(xs, ys)) == length(xs) + length(ys);
-{}
-
-lemma Lemma_Reverse_Length(xs: List)
-  ensures length(xs) == length(reverse(xs));
-{
-  match (xs) {
-    case Nil =>
-    case Cons(x, xrest) =>
-      calc {
-        length(reverse(xs));
-        // def. reverse
-        length(concat(reverse(xrest), Cons(x, Nil)));
-        { Lemma_Concat_Length(reverse(xrest), Cons(x, Nil)); }
-        length(reverse(xrest)) + length(Cons(x, Nil));
-        // induction hypothesis
-        length(xrest) + length(Cons(x, Nil));
-        calc {
-          length(Cons(x, Nil));
-          // def. length
-          // 1 + length(Nil);  // ambigious type parameter
-          // def. length
-          1 + 0;
-          1;
-        }
-        length(xrest) + 1;
-        // def. length
-        length(xs);
-      }
-  }
-}
-
-lemma Window(xs: List, ys: List)
-  ensures length(xs) == length(ys) ==> length(reverse(xs)) == length(reverse(ys));
-{
-  calc {
-    length(xs) == length(ys) ==> length(reverse(xs)) == length(reverse(ys));
-    { if (length(xs) == length(ys)) {
-      calc {
-        length(reverse(xs));
-        { Lemma_Reverse_Length(xs); }
-        length(xs);
-        length(ys);
-        { Lemma_Reverse_Length(ys); }
-        length(reverse(ys));
-    } } }
-    length(xs) == length(ys) ==> length(reverse(xs)) == length(reverse(xs));
-    true;
-  }
-}
-
-// In the following we use a combination of calc and forall
-
-ghost function ith<a>(xs: List, i: nat): a
-  requires i < length(xs);
-{
-  match xs
-  case Cons(x, xrest) => if i == 0 then x else ith(xrest, i - 1)
-}
-
-lemma lemma_zero_length(xs: List)
-  ensures length(xs) == 0 <==> xs.Nil?;
-{}
-
-lemma lemma_extensionality(xs: List, ys: List)
-  requires length(xs) == length(ys); // (0)
-  requires forall i: nat | i < length(xs) :: ith(xs, i) == ith(ys, i); // (1)
-  ensures xs == ys;
-{
-  match xs {
-    case Nil =>
-      calc {
-        true;
-        // (0)
-        length(xs) == length(ys);
-        0 == length(ys);
-        { lemma_zero_length(ys); }
-        Nil == ys;
-        xs == ys;
-      }
-    case Cons(x, xrest) =>
-      match ys {
-        case Cons(y, yrest) =>
-          calc {
-            xs;
-            Cons(x, xrest);
-            calc {
-              x;
-              ith(xs, 0);
-              // (1) with i = 0
-              ith(ys, 0);
-              y;
-            }
-            Cons(y, xrest);
-            {
-              forall (j: nat | j < length(xrest)) {
-                calc {
-                  ith(xrest, j);
-                  ith(xs, j + 1);
-                  // (1) with i = j + 1
-                  ith(ys, j + 1);
-                  ith(yrest, j);
-                }
-              }
-              lemma_extensionality(xrest, yrest);
-            }
-            Cons(y, yrest);
-            ys;
-          }
-      }
-  }
-}
-
diff --git a/Test/dafny2/MonotonicHeapstate.dfy.expect b/Test/dafny2/MonotonicHeapstate.dfy.expect
deleted file mode 100644
index f015f6885ea..00000000000
--- a/Test/dafny2/MonotonicHeapstate.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-MonotonicHeapstate.dfy(92,13): Warning: the ... refinement feature in statements is deprecated
-MonotonicHeapstate.dfy(99,13): Warning: the ... refinement feature in statements is deprecated
-MonotonicHeapstate.dfy(106,13): Warning: the ... refinement feature in statements is deprecated
-MonotonicHeapstate.dfy(146,9): Warning: the ... refinement feature in statements is deprecated
-MonotonicHeapstate.dfy(147,13): Warning: the ... refinement feature in statements is deprecated
-
-Dafny program verifier finished with 24 verified, 0 errors
diff --git a/Test/dafny2/SmallestMissingNumber-functional.dfy.verifier.expect b/Test/dafny2/SmallestMissingNumber-functional.dfy.verifier.expect
deleted file mode 100644
index cf10280f376..00000000000
--- a/Test/dafny2/SmallestMissingNumber-functional.dfy.verifier.expect
+++ /dev/null
@@ -1 +0,0 @@
-SmallestMissingNumber-functional.dfy(212,11): Warning: /!\ No terms found to trigger on.
diff --git a/Test/dafny2/StoreAndRetrieve.dfy.verifier.expect b/Test/dafny2/StoreAndRetrieve.dfy.verifier.expect
deleted file mode 100644
index 0c3d269cdc1..00000000000
--- a/Test/dafny2/StoreAndRetrieve.dfy.verifier.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-StoreAndRetrieve.dfy(60,13): Warning: the ... refinement feature in statements is deprecated
-StoreAndRetrieve.dfy(65,9): Warning: the ... refinement feature in statements is deprecated
-StoreAndRetrieve.dfy(66,13): Warning: the ... refinement feature in statements is deprecated
-StoreAndRetrieve.dfy(81,9): Warning: the ... refinement feature in statements is deprecated
-StoreAndRetrieve.dfy(92,9): Warning: the ... refinement feature in statements is deprecated
diff --git a/Test/dafny3/AbstemiousErrors.dfy.expect b/Test/dafny3/AbstemiousErrors.dfy.expect
deleted file mode 100644
index 7591d67126c..00000000000
--- a/Test/dafny3/AbstemiousErrors.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-AbstemiousErrors.dfy(39,6): Error: cannot prove termination; try supplying a decreases clause (note that calls cannot be co-recursive in this context; perhaps try declaring function 'voraciousAdd' with '{:abstemious}')
-AbstemiousErrors.dfy(47,6): Error: cannot prove termination; try supplying a decreases clause (note that calls cannot be co-recursive in this context; perhaps try declaring function 'voraciousAdd' with '{:abstemious}')
-AbstemiousErrors.dfy(53,2): Error: cannot prove termination; try supplying a decreases clause (note that the call is not sufficiently guarded to be used co-recursively)
-AbstemiousErrors.dfy(60,6): Error: cannot prove termination; try supplying a decreases clause (note that a call can be co-recursive only if all intra-cluster calls are in non-destructive contexts)
-AbstemiousErrors.dfy(68,6): Error: cannot prove termination; try supplying a decreases clause (note that calls cannot be co-recursive in this context; perhaps try declaring function 'voraciousAdd' with '{:abstemious}')
-
-Dafny program verifier finished with 0 verified, 5 errors
diff --git a/Test/dafny3/CachedContainer.dfy.verifier.expect b/Test/dafny3/CachedContainer.dfy.verifier.expect
deleted file mode 100644
index a037bc94ff6..00000000000
--- a/Test/dafny3/CachedContainer.dfy.verifier.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-CachedContainer.dfy(112,13): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(119,9): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(122,13): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(129,9): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(132,13): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(153,9): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(154,13): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(162,9): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(163,13): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(166,9): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(167,9): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(178,9): Warning: the ... refinement feature in statements is deprecated
-CachedContainer.dfy(179,13): Warning: the ... refinement feature in statements is deprecated
diff --git a/Test/dafny3/GenericSort.dfy.expect b/Test/dafny3/GenericSort.dfy.expect
deleted file mode 100644
index 25822a5c6cc..00000000000
--- a/Test/dafny3/GenericSort.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 24 verified, 0 errors
diff --git a/Test/dafny3/InductionVsCoinduction.dfy.expect b/Test/dafny3/InductionVsCoinduction.dfy.expect
deleted file mode 100644
index db81f5e6780..00000000000
--- a/Test/dafny3/InductionVsCoinduction.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-InductionVsCoinduction.dfy(81,2): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 12 verified, 0 errors
diff --git a/Test/dafny3/SimpleCoinduction.dfy b/Test/dafny3/SimpleCoinduction.dfy
deleted file mode 100644
index fa70a13cbfc..00000000000
--- a/Test/dafny3/SimpleCoinduction.dfy
+++ /dev/null
@@ -1,126 +0,0 @@
-// RUN: %dafny /compile:0 /deprecation:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-codatatype Stream<T> = Cons(head: T, tail: Stream)
-codatatype IList<T> = Nil | ICons(head: T, tail: IList)
-
-// -----------------------------------------------------------------------
-
-greatest predicate Pos(s: Stream<int>)
-{
-  s.head > 0 && Pos(s.tail)
-}
-
-ghost function Up(n: int): Stream<int>
-{
-  Cons(n, Up(n+1))
-}
-
-ghost function Inc(s: Stream<int>): Stream<int>
-{
-  Cons(s.head + 1, Inc(s.tail))
-}
-
-lemma {:induction false} UpLemma(k: nat, n: int)
-  ensures Inc(Up(n)) ==#[k] Up(n+1);
-{
-  if (k != 0) {
-    UpLemma(k-1, n+1);
-  }
-}
-
-greatest lemma {:induction false} CoUpLemma(n: int)
-  ensures Inc(Up(n)) == Up(n+1);
-{
-  CoUpLemma(n+1);
-}
-
-lemma UpLemma_Auto(k: nat, n: int, nn: int)
-  ensures nn == n+1 ==> Inc(Up(n)) ==#[k] Up(nn);  // note: it would be nice to do an automatic rewrite (from "ensures Inc(Up(n)) ==#[k] Up(n+1)") to obtain the good trigger here
-{
-}
-
-greatest lemma CoUpLemma_Auto(n: int, nn: int)
-  ensures nn == n+1 ==> Inc(Up(n)) == Up(nn);  // see comment above
-{
-}
-
-// -----------------------------------------------------------------------
-
-ghost function Repeat(n: int): Stream<int>
-{
-  Cons(n, Repeat(n))
-}
-
-greatest lemma RepeatLemma(n: int)
-  ensures Inc(Repeat(n)) == Repeat(n+1);
-{
-}
-
-// -----------------------------------------------------------------------
-
-greatest predicate True(s: Stream)
-{
-  True(s.tail)
-}
-
-greatest lemma AlwaysTrue(s: Stream)
-  ensures True(s);
-{
-}
-
-greatest predicate AlsoTrue(s: Stream)
-{
-  AlsoTrue(s)
-}
-
-greatest lemma AlsoAlwaysTrue(s: Stream)
-  ensures AlsoTrue(s);
-{
-}
-
-greatest predicate TT(y: int)
-{
-  TT(y+1)
-}
-
-greatest lemma AlwaysTT(y: int)
-  ensures TT(y);
-{
-}
-
-// -----------------------------------------------------------------------
-
-ghost function Append(M: IList, N: IList): IList
-{
-  match M
-  case Nil => N
-  case ICons(x, M') => ICons(x, Append(M', N))
-}
-
-ghost function zeros(): IList<int>
-{
-  ICons(0, zeros())
-}
-
-ghost function ones(): IList<int>
-{
-  ICons(1, ones())
-}
-
-greatest predicate AtMost(a: IList<int>, b: IList<int>)
-{
-  match a
-  case Nil => true
-  case ICons(h,t) => b.ICons? && h <= b.head && AtMost(t, b.tail)
-}
-
-greatest lemma ZerosAndOnes_Theorem0()
-  ensures AtMost(zeros(), ones());
-{
-}
-
-greatest lemma ZerosAndOnes_Theorem1()
-  ensures Append(zeros(), ones()) == zeros();
-{
-}
diff --git a/Test/dafny3/Streams.dfy.expect b/Test/dafny3/Streams.dfy.expect
deleted file mode 100644
index 183d373ac75..00000000000
--- a/Test/dafny3/Streams.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-Streams.dfy(65,2): Warning: /!\ No terms found to trigger on.
-Streams.dfy(105,2): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 29 verified, 0 errors
diff --git a/Test/dafny4/ACL2-extractor.dfy.expect b/Test/dafny4/ACL2-extractor.dfy.expect
deleted file mode 100644
index e43bbd93c5f..00000000000
--- a/Test/dafny4/ACL2-extractor.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 22 verified, 0 errors
diff --git a/Test/dafny4/Ackermann.dfy.verifier.expect b/Test/dafny4/Ackermann.dfy.verifier.expect
deleted file mode 100644
index b302e2b4daf..00000000000
--- a/Test/dafny4/Ackermann.dfy.verifier.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-Ackermann.dfy(162,4): Warning: /!\ No terms found to trigger on.
-Ackermann.dfy(180,4): Warning: /!\ No terms found to trigger on.
diff --git a/Test/dafny4/Bug101.dfy b/Test/dafny4/Bug101.dfy
deleted file mode 100644
index ab6848feb9b..00000000000
--- a/Test/dafny4/Bug101.dfy
+++ /dev/null
@@ -1,19 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost predicate P(i:int) { true }
-
-lemma Tester()
-{
-//    forall i ensures false ==> P(i) {}
-    forall i ensures P(i) <== false {}
-    assert forall i :: P(i) ==> false;
-    assert P(0);
-    assert false;
-}
-
-
-
-
-
-
diff --git a/Test/dafny4/Bug101.dfy.expect b/Test/dafny4/Bug101.dfy.expect
deleted file mode 100644
index 2bdf3cfc608..00000000000
--- a/Test/dafny4/Bug101.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-Bug101.dfy(10,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/Bug103.dfy b/Test/dafny4/Bug103.dfy
deleted file mode 100644
index 151852bb4eb..00000000000
--- a/Test/dafny4/Bug103.dfy
+++ /dev/null
@@ -1,20 +0,0 @@
-// RUN: %dafny /compile:0 /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost predicate IsLessThanSuccesor(i:int)
-{
-  i < i + 1
-}
-
-lemma LemmaWithoutTriggerOnForallStatement()
-{
-  forall i
-    ensures IsLessThanSuccesor(i)
-  {
-  }
-}
-
-
-
-
-
diff --git a/Test/dafny4/Bug104.dfy b/Test/dafny4/Bug104.dfy
deleted file mode 100644
index 5fa20172d11..00000000000
--- a/Test/dafny4/Bug104.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype PartRealPartGhost = PartRealPartGhost(x:int, ghost y:int)
-
-method UpdateField()
-{
- var v := PartRealPartGhost(3, 4);
- ghost var g := 5;
- v := v.(y := g);
-}
diff --git a/Test/dafny4/Bug107.dfy b/Test/dafny4/Bug107.dfy
deleted file mode 100644
index b7ab69c9a8d..00000000000
--- a/Test/dafny4/Bug107.dfy
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-method Main()
-{
-  var f := Inc;
-	print(f(4));
-}
-
-function Inc(x: int): int
-{
-  x + 2
-}
-
-
-
diff --git a/Test/dafny4/Bug108.dfy b/Test/dafny4/Bug108.dfy
deleted file mode 100644
index 8228fe44f87..00000000000
--- a/Test/dafny4/Bug108.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-method Main() {
-  var A := map[0 := 1];
-  var B := map x | x in (set y | y in A) :: A[x];
-  print A, "\n";
-  print B, "\n";
-}
-
-
diff --git a/Test/dafny4/Bug111.dfy b/Test/dafny4/Bug111.dfy
deleted file mode 100644
index cc2e7e9c52b..00000000000
--- a/Test/dafny4/Bug111.dfy
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype A = A(i:int)
-datatype B = B1(a1:A) | B2(a2:A)
-
-ghost function f(b:B):int
-{
-  match b
-  {
-    case B1(A(i)) => i
-    case B2(A(j)) => j
-  }
-}
-
-
-
-
diff --git a/Test/dafny4/Bug113.dfy b/Test/dafny4/Bug113.dfy
deleted file mode 100644
index 0bec0c1ce31..00000000000
--- a/Test/dafny4/Bug113.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-datatype D = D(q:int, r:int, s:int, t:int)
-
-method Main()
-{
-    print D(10, 20, 30, 40);
-    print "\n";
-}
diff --git a/Test/dafny4/Bug114.dfy b/Test/dafny4/Bug114.dfy
deleted file mode 100644
index c1a6ef1f316..00000000000
--- a/Test/dafny4/Bug114.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function f1(d:int):map<int,int>
-ghost function f2(y:int, d:int):int
-
-method M(m:map<int,int>, d:int, x2:int)
-{
-  assert forall d :: f1(d) == (map x | x in m ::  f2(x, d));
-}
diff --git a/Test/dafny4/Bug114.dfy.expect b/Test/dafny4/Bug114.dfy.expect
deleted file mode 100644
index d7294ec332d..00000000000
--- a/Test/dafny4/Bug114.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-Bug114.dfy(9,9): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/Bug116.dfy.py.check b/Test/dafny4/Bug116.dfy.py.check
deleted file mode 100644
index 893d5379d1f..00000000000
--- a/Test/dafny4/Bug116.dfy.py.check
+++ /dev/null
@@ -1,2 +0,0 @@
-// https://github.com/dafny-lang/dafny/issues/4161
-// CHECK: ImportError: cannot import name 'Callable' from partially initialized module 'typing'
diff --git a/Test/dafny4/Bug118.dfy b/Test/dafny4/Bug118.dfy
deleted file mode 100644
index 15881948020..00000000000
--- a/Test/dafny4/Bug118.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class Foo {
-  ghost var Repr: set<object>
-}
-
-ghost function SeqRepr(s:seq<Foo>) : set<object>
-  reads set b | b in s
-{
-  set o,b | b in s && o in b.Repr :: o     // Works if you say "set b,o | ..."
-}
diff --git a/Test/dafny4/Bug120.dfy b/Test/dafny4/Bug120.dfy
deleted file mode 100644
index 80264f48ce7..00000000000
--- a/Test/dafny4/Bug120.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:0 /noNLarith "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function G(n: nat): nat
-{
-  if n == 0 then 5 else G(n-1)
-}
-
-method Test() {
-  assert G(10) == 5;
-}
\ No newline at end of file
diff --git a/Test/dafny4/Bug121.dfy b/Test/dafny4/Bug121.dfy
deleted file mode 100644
index 0bda1602ed1..00000000000
--- a/Test/dafny4/Bug121.dfy
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Try (a:int, b:int, c:int)
-{
-	forall
-    ensures a * c == a * c
-    ensures b * c == b * c
-	{
-	}
-}
-
-
-
-
-
-
-
diff --git a/Test/dafny4/Bug122.dfy b/Test/dafny4/Bug122.dfy
deleted file mode 100644
index 3844a7bbf24..00000000000
--- a/Test/dafny4/Bug122.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Try (a:int)
-{
-	forall
-    ensures a == a
-	{
-	}
-}
-
-
-
-
-
-
-
diff --git a/Test/dafny4/Bug125more.dfy.expect b/Test/dafny4/Bug125more.dfy.expect
deleted file mode 100644
index 1ec07dc42ec..00000000000
--- a/Test/dafny4/Bug125more.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-Bug125more.dfy(59,15): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/Bug129.dfy b/Test/dafny4/Bug129.dfy
deleted file mode 100644
index fda40abb55a..00000000000
--- a/Test/dafny4/Bug129.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype Maybe<T> = Some(v:T) | None
-datatype B = B(b:Maybe<B>)
-
-datatype List<T> = Nil | Cons(T, List<T>)
-datatype Tree<T> = Nodes(children: List<Tree<T>>)
-
-
-
-
diff --git a/Test/dafny4/Bug131.dfy b/Test/dafny4/Bug131.dfy
deleted file mode 100644
index 76207b6ce33..00000000000
--- a/Test/dafny4/Bug131.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class Cell {
-  method Test(c: Cell) {
-    assert c.F();
-  }
-}
-
-ghost predicate F()
-
diff --git a/Test/dafny4/Bug132.dfy.expect b/Test/dafny4/Bug132.dfy.expect
deleted file mode 100644
index 22055966205..00000000000
--- a/Test/dafny4/Bug132.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-Bug132.dfy(33,29): Error: receiver argument might not be allocated in the state in which the function is invoked
-Bug132.dfy(34,29): Error: receiver argument might not be allocated in the state in which the function is invoked
-Bug132.dfy(37,36): Error: argument might not be allocated in the state in which the function is invoked
-Bug132.dfy(41,29): Error: receiver argument might not be allocated in the state in which the function is invoked
-
-Dafny program verifier finished with 2 verified, 4 errors
diff --git a/Test/dafny4/Bug136.dfy b/Test/dafny4/Bug136.dfy
deleted file mode 100644
index 0b1df7d8216..00000000000
--- a/Test/dafny4/Bug136.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method test()
-{
-    assume false;
-    assert true;
-}
-
-
-
-
diff --git a/Test/dafny4/Bug144.dfy.expect b/Test/dafny4/Bug144.dfy.expect
deleted file mode 100644
index 31628ceefeb..00000000000
--- a/Test/dafny4/Bug144.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-Bug144.dfy(40,9): Error: assertion could not be proved
-
-Dafny program verifier finished with 3 verified, 1 error
diff --git a/Test/dafny4/Bug145.dfy.expect b/Test/dafny4/Bug145.dfy.expect
deleted file mode 100644
index d47c963e9f8..00000000000
--- a/Test/dafny4/Bug145.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-Bug145.dfy(11,24): Error: array size (dimension 0) might be negative
-Bug145.dfy(24,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Test/dafny4/Bug146.dfy.expect b/Test/dafny4/Bug146.dfy.expect
deleted file mode 100644
index 25166bab48c..00000000000
--- a/Test/dafny4/Bug146.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-Bug146.dfy(6,75): Error: insufficient reads clause to read array element
-Bug146.dfy(37,15): Error: assertion could not be proved
-Bug146.dfy(26,4): Related location
-Bug146.dfy(26,67): Related location
-Bug146.dfy(26,75): Related location
-
-Dafny program verifier finished with 2 verified, 2 errors
diff --git a/Test/dafny4/Bug150.dfy b/Test/dafny4/Bug150.dfy
deleted file mode 100644
index 2d2084d6a25..00000000000
--- a/Test/dafny4/Bug150.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function foo(s:seq<int>) : (int, int)
-{
-  (0, 0)
-}
-
-method pop_run_impl() {
-  var a := new int[10];
-  var i := 0;
-  ghost var (x,y) := foo(a[..i+1]);
-}
\ No newline at end of file
diff --git a/Test/dafny4/Bug155.dfy b/Test/dafny4/Bug155.dfy
deleted file mode 100644
index fa76c739746..00000000000
--- a/Test/dafny4/Bug155.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function foo(m: multiset<object>): int
-  reads m
-{
-  0
-}
diff --git a/Test/dafny4/Bug160.dfy.expect b/Test/dafny4/Bug160.dfy.expect
deleted file mode 100644
index 4dc8e5ababa..00000000000
--- a/Test/dafny4/Bug160.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-Bug160.dfy(26,18): Error: a postcondition could not be proved on this return path
-Bug160.dfy(27,13): Related location: this is the postcondition that could not be proved
-Bug160.dfy(27,29): Related location
-
-Dafny program verifier finished with 2 verified, 1 error
diff --git a/Test/dafny4/Bug166.dfy b/Test/dafny4/Bug166.dfy
deleted file mode 100644
index e77c097438d..00000000000
--- a/Test/dafny4/Bug166.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0  /noNLarith /print:"%t.print" /rprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost predicate P(x:int)
-
-method test(s:seq<int>)
-    ensures forall x :: x > 5 ==> P(x)
-    ensures forall i :: 0 <= i < |s| ==> P(s[i])
diff --git a/Test/dafny4/Bug169.dfy b/Test/dafny4/Bug169.dfy
deleted file mode 100644
index ae275d3cd19..00000000000
--- a/Test/dafny4/Bug169.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost predicate R(x: int)
-
-least lemma P(x: int)
-{
-  forall x | R(x)
-  {
-  }
-}
diff --git a/Test/dafny4/Bug170.dfy.expect b/Test/dafny4/Bug170.dfy.expect
deleted file mode 100644
index 255fdfb0d87..00000000000
--- a/Test/dafny4/Bug170.dfy.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-Bug170.dfy(18,14): Info: AA# {:induction _k, x}
-Bug170.dfy(26,14): Info: BB# {:induction _k, x}
-Bug170.dfy(8,18): Info: _k: ORDINAL
-Bug170.dfy(13,18): Info: _k: ORDINAL
-Bug170.dfy(18,14): Info: _k: ORDINAL
-Bug170.dfy(26,14): Info: _k: ORDINAL
-Bug170.dfy(19,14): Info: A#[_k]
-Bug170.dfy(18,14): Info: AA# with focal predicates A, B
-Bug170.dfy(21,7): Info: B#[_k - 1]
-Bug170.dfy(22,6): Info: BB#[_k - 1]
-Bug170.dfy(27,14): Info: B#[_k]
-Bug170.dfy(26,14): Info: BB# with focal predicates B, A
-Bug170.dfy(29,7): Info: A#[_k - 1]
-Bug170.dfy(30,6): Info: AA#[_k - 1]
-Bug170.dfy(10,12): Info: B#[_k - 1]
-Bug170.dfy(15,12): Info: A#[_k - 1]
-Bug170.dfy(18,14): Info: AA# decreases _k, x
-Bug170.dfy(26,14): Info: BB# decreases _k, x
-Bug170.dfy(46,17): Info: AA# {:induction _k, x}
-Bug170.dfy(53,17): Info: BB# {:induction _k, x}
-Bug170.dfy(36,21): Info: _k: ORDINAL
-Bug170.dfy(41,21): Info: _k: ORDINAL
-Bug170.dfy(46,17): Info: _k: ORDINAL
-Bug170.dfy(53,17): Info: _k: ORDINAL
-Bug170.dfy(47,13): Info: A#[_k]
-Bug170.dfy(46,17): Info: AA# with focal predicates A, B
-Bug170.dfy(49,4): Info: BB#[_k - 1]
-Bug170.dfy(50,11): Info: B#[_k - 1]
-Bug170.dfy(54,13): Info: B#[_k]
-Bug170.dfy(53,17): Info: BB# with focal predicates B, A
-Bug170.dfy(56,4): Info: AA#[_k - 1]
-Bug170.dfy(57,11): Info: A#[_k - 1]
-Bug170.dfy(38,4): Info: B#[_k - 1]
-Bug170.dfy(43,4): Info: A#[_k - 1]
-Bug170.dfy(46,17): Info: AA# decreases _k, x
-Bug170.dfy(53,17): Info: BB# decreases _k, x
-Bug170.dfy(69,14): Info: AA# {:induction _k, x}
-Bug170.dfy(64,18): Info: _k: ORDINAL
-Bug170.dfy(69,14): Info: _k: ORDINAL
-Bug170.dfy(70,14): Info: A#[_k]
-Bug170.dfy(69,14): Info: AA# with focal predicate A
-Bug170.dfy(72,7): Info: A#[_k - 1]
-Bug170.dfy(73,6): Info: AA#[_k - 1]
-Bug170.dfy(66,12): Info: A#[_k - 1]
-Bug170.dfy(69,14): Info: AA# decreases _k, x
-Bug170.dfy(50,11): Info: Some instances of this call are not inlined.
-Bug170.dfy(57,11): Info: Some instances of this call are not inlined.
-
-Dafny program verifier finished with 5 verified, 0 errors
diff --git a/Test/dafny4/Bug55.dfy b/Test/dafny4/Bug55.dfy
deleted file mode 100644
index 44bcb9690f3..00000000000
--- a/Test/dafny4/Bug55.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost predicate {:opaque} G(f:int~>bool)
-  reads f.reads
-  requires f.requires(0)
-{
-  true
-}
-
-ghost predicate A<T>(s:set<T>)
-
-predicate{:opaque} B(s:set<int>)
-    requires A(s)
diff --git a/Test/dafny4/Bug56.dfy b/Test/dafny4/Bug56.dfy
deleted file mode 100644
index a8237b46846..00000000000
--- a/Test/dafny4/Bug56.dfy
+++ /dev/null
@@ -1,23 +0,0 @@
-// RUN: %dafny /compile:0 /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function I(f:int->bool):int->bool
-    ensures I(f) == f;
-
-ghost predicate G<S>(s:S)
-
-type D<X>
-type E
-
-lemma L1<S>(b:int->S)
-    requires forall i :: b.reads(i) == {};
-    requires forall i :: b.requires(i);
-    requires I(j => G(b(j)))(0); // PRECONDITION NOT SATISFIED BY L2
-
-lemma L2(b:int->D<E>)
-    requires forall i :: b.reads(i) == {};
-    requires forall i :: b.requires(i);
-    requires I(j => G(b(j)))(0);
-{
-    L1(b); // FAILS TO SATISFY L1's PRECONDITION
-}
diff --git a/Test/dafny4/Bug60.dfy b/Test/dafny4/Bug60.dfy
deleted file mode 100644
index f4585753f5f..00000000000
--- a/Test/dafny4/Bug60.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-// This method can be used to test compilation.
-method Main()
-{
-  var s := {2, 3};
-  var m := map[2 := 20, 3 := 30];
-  print (s, m), "\n";
-  print (|s|, |m|), "\n";
-  print set s | s in m, "\n";
-  print forall x :: x in (map[1 := 10, 2 := 20]) ==> x > 0, "\n";
-}
diff --git a/Test/dafny4/Bug63.dfy b/Test/dafny4/Bug63.dfy
deleted file mode 100644
index e1496880ee2..00000000000
--- a/Test/dafny4/Bug63.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method M()
-  modifies set o: object | true
-{
-}
-
-method Client()
-{
-  assume forall o: object {:nowarn} :: false;
-  M();
-}
diff --git a/Test/dafny4/Bug63.dfy.expect b/Test/dafny4/Bug63.dfy.expect
deleted file mode 100644
index 96e4b779fc2..00000000000
--- a/Test/dafny4/Bug63.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-Bug63.dfy(5,11): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/dafny4/Bug67.dfy b/Test/dafny4/Bug67.dfy
deleted file mode 100644
index f01d4239a75..00000000000
--- a/Test/dafny4/Bug67.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-datatype d = D(m:seq<int>)
-
-method Main()
-{
-  assert D([10, 20]) == D([10, 20]); // succeeds
-  print [10, 20] == [10, 20], "\n"; // prints True
-  print D([10, 20]) == D([10, 20]); // prints False
-}
diff --git a/Test/dafny4/Bug79.dfy b/Test/dafny4/Bug79.dfy
deleted file mode 100644
index 56a8d7bfd0e..00000000000
--- a/Test/dafny4/Bug79.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function foo(s:int) : (int, int)
-
-ghost function bar(s:int) : bool
-{
-    var (x, rest) := foo(s);
-    x > 0
-}
\ No newline at end of file
diff --git a/Test/dafny4/Bug81.dfy b/Test/dafny4/Bug81.dfy
deleted file mode 100644
index 78138b2d03c..00000000000
--- a/Test/dafny4/Bug81.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function {:opaque} RefineSeqToSeq<T(!new), U>(s:seq<T>, refine_func: T ~> U) : seq<U>
-  reads refine_func.reads
-{
-  if |s| == 0 then []
-  else RefineSeqToSeq(s[1..], refine_func)
-}
diff --git a/Test/dafny4/Bug82.dfy b/Test/dafny4/Bug82.dfy
deleted file mode 100644
index fa5d0e5a59b..00000000000
--- a/Test/dafny4/Bug82.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function {:opaque} Reverse(id:int) : int
-
-ghost function RefineToMap(ReverseKey:int->int) : bool
-
-ghost function RefineToMapOfSeqNums() : bool
-{
-    RefineToMap(Reverse)
-}
diff --git a/Test/dafny4/Bug88.dfy b/Test/dafny4/Bug88.dfy
deleted file mode 100644
index e1dd95fc421..00000000000
--- a/Test/dafny4/Bug88.dfy
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %exits-with 4 %dafny   "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-lemma T(a: int) returns (b: int)
-  ensures a == b
-{
-  calc {
-    a;
-  }
-}
-
-lemma A(i: int)
-  ensures false
-{
-  if * {
-  } else {
-  }
-}
\ No newline at end of file
diff --git a/Test/dafny4/Bug89.dfy b/Test/dafny4/Bug89.dfy
deleted file mode 100644
index c7b77b44f99..00000000000
--- a/Test/dafny4/Bug89.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-method F() returns(x:int)
-  ensures x == 6
-{
-  x := 5;
-  x := (var y := 1; y + x);
-}
-
-method Main()
-{
-  var x := F();
-  print x;
-}
diff --git a/Test/dafny4/Bug93.dfy.expect b/Test/dafny4/Bug93.dfy.expect
deleted file mode 100644
index e034990d072..00000000000
--- a/Test/dafny4/Bug93.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-Bug93.dfy(17,28): Error: assertion could not be proved
-Bug93.dfy(34,28): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny4/Bug99.dfy b/Test/dafny4/Bug99.dfy
deleted file mode 100644
index ffdbf6e5c11..00000000000
--- a/Test/dafny4/Bug99.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost predicate P(e:int, p:int) { true }
-ghost predicate Q(i:int, t:int)
-
-lemma Tester(x:int)
-{
-    assert forall i :: Q(i, x) ==> (forall p {:trigger P(i, p)} :: P(i, p));
-
-}
diff --git a/Test/dafny4/ClassRefinement.dfy.verifier.expect b/Test/dafny4/ClassRefinement.dfy.verifier.expect
deleted file mode 100644
index 7e1c9137a16..00000000000
--- a/Test/dafny4/ClassRefinement.dfy.verifier.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-ClassRefinement.dfy(68,9): Warning: the ... refinement feature in statements is deprecated
-ClassRefinement.dfy(69,13): Warning: the ... refinement feature in statements is deprecated
-ClassRefinement.dfy(74,9): Warning: the ... refinement feature in statements is deprecated
-ClassRefinement.dfy(75,13): Warning: the ... refinement feature in statements is deprecated
-ClassRefinement.dfy(75,17): Warning: the modify statement with a block statement is deprecated
-ClassRefinement.dfy(78,13): Warning: the ... refinement feature in statements is deprecated
diff --git a/Test/dafny4/ExpandedGuardedness.dfy.java.check b/Test/dafny4/ExpandedGuardedness.dfy.java.check
deleted file mode 100644
index 76eff868f59..00000000000
--- a/Test/dafny4/ExpandedGuardedness.dfy.java.check
+++ /dev/null
@@ -1,2 +0,0 @@
-// https://github.com/dafny-lang/dafny/issues/4124
-// CHECK: error: incompatible types: int cannot be converted to CodePoint
diff --git a/Test/dafny4/ExpandedGuardednessNeg.dfy.expect b/Test/dafny4/ExpandedGuardednessNeg.dfy.expect
deleted file mode 100644
index 3b06ca07cde..00000000000
--- a/Test/dafny4/ExpandedGuardednessNeg.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-ExpandedGuardednessNeg.dfy(8,17): Error: cannot prove termination; try supplying a decreases clause (note that calls cannot be co-recursive in this context)
-ExpandedGuardednessNeg.dfy(8,17): Error: decreases expression must be bounded below by 0
-ExpandedGuardednessNeg.dfy(6,20): Related location
-ExpandedGuardednessNeg.dfy(13,16): Error: cannot prove termination; try supplying a decreases clause
-ExpandedGuardednessNeg.dfy(13,16): Error: decreases expression must be bounded below by 0
-ExpandedGuardednessNeg.dfy(11,27): Related location
-
-Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Test/dafny4/LargeConstants.dfy b/Test/dafny4/LargeConstants.dfy
deleted file mode 100644
index 76f2488b9b8..00000000000
--- a/Test/dafny4/LargeConstants.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-lemma largeIsLarge()
-  ensures 0x8000000000000000 > 0 {
-}
-
-lemma SmallIsSmall()
-  ensures -0x8000000000000000 < 0 {
-}
-
-lemma ShouldCancelOut()
-  ensures -0x8000000000000000 + 0x8000000000000000 == 0 {
-}
diff --git a/Test/dafny4/Lucas-up.dfy b/Test/dafny4/Lucas-up.dfy
deleted file mode 100644
index c2002adf6bd..00000000000
--- a/Test/dafny4/Lucas-up.dfy
+++ /dev/null
@@ -1,243 +0,0 @@
-// RUN: %dafny /compile:0 /arith:2 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Proof of the Lucas theorem, following the structure of a HOL-Light
-// proof of the same theorem by John Harrison. The lemmas in this
-// version go "up", like:
-//   P(k) == P(2*k)
-//   P(k) == P(2*k + 1)
-//
-// Rustan Leino
-// 7 March 2018
-
-// This file defines the ingredients of the Lucas theorem, proves some
-// properties of these, and then states and proves the Lucas theorem
-// itself.
-
-// The following predicate gives the boolean value of bit "k" in
-// the natural number "n".
-ghost predicate Bit(k: nat, n: nat)
-{
-  if k == 0 then n % 2 == 1
-  else Bit(k-1, n / 2)
-}
-
-// This lemma says that bit 0 of an even number is never set.
-lemma ZeroBitOfEven(n: nat)
-  ensures !Bit(0, 2*n)
-{
-  var r := 2*n;
-  assert Bit(0, r) <==> r % 2 == 1;
-}
-
-// Function "BitSet" returns the set of bits in the binary representation
-// of a number.
-ghost function BitSet(n: nat): set<nat>
-{
-  set i | 0 <= i < n && Bit(i, n)
-}
-
-// The following lemma shows that the "i < n" conjunct in
-// the set comprehension in "BitSet" does not restrict
-// the set any more than the conjunct "Bit(i, n)" does.
-lemma BitSize(i: nat, n: nat)
-  requires Bit(i, n)
-  ensures i < n
-{
-}
-
-// An easy-to-read name for the expression that checks if a number
-// is even.
-ghost predicate EVEN(n: nat)
-{
-  n % 2 == 0
-}
-
-// The binomial function is defined like in the Pascal triangle.
-// "binom(a, b)" is also known as "a choose b".
-ghost function binom(a: nat, b: nat): nat
-{
-  if b == 0 then 1
-  else if a == 0 then 0
-  else binom(a-1, b) + binom(a-1, b-1)
-}
-
-// This lemma shows that the parity of "binom" is preserved if
-// div-2 is applied to both arguments, except in the case where
-// the first argument to "binom" is even and the second argument
-// is odd, in which case "binom" is always even.
-lemma Lucas_Binary(a: nat, b: nat)
-  ensures EVEN(binom(2*a, 2*b + 1))
-  ensures EVEN(binom(2*a, 2*b)) <==> EVEN(binom(a, b))
-  ensures EVEN(binom(2*a + 1, 2*b + 1)) <==> EVEN(binom(a, b))
-  ensures EVEN(binom(2*a + 1, 2*b)) <==> EVEN(binom(a, b))
-{
-  if a == 0 {
-  } else {
-    var a', b' := a - 1, b - 1;
-    assert binom(2*a, 2*b + 1) == binom(2*a' + 1, 2*b + 1) + binom(2*a' + 1, 2*b);
-    assert b != 0 ==> binom(2*a, 2*b) == binom(2*a' + 1, 2*b) + binom(2*a' + 1, 2*b' + 1);
-    assert EVEN(binom(2*a' + 1, 2*b + 1)) == EVEN(binom(a', b));
-    assert EVEN(binom(2*a' + 1, 2*b)) == EVEN(binom(a', b));
-  }
-}
-
-// Here is an alternative way to phrase the previous lemma.
-lemma Lucas_Binary'(a: nat, b: nat)
-  ensures binom(2*a, 2*b) % 2 == binom(a, b) % 2
-  ensures binom(2*a, 2*b + 1) % 2 == 0
-  ensures binom(2*a + 1, 2*b) % 2 == binom(a, b) % 2
-  ensures binom(2*a + 1, 2*b + 1) % 2 == binom(a, b) % 2
-{
-  if a != 0 {
-    var a', b' := a - 1, b - 1;
-    assert b != 0 ==> binom(2*a, 2*b) == binom(2*a' + 1, 2*b) + binom(2*a' + 1, 2*b' + 1);
-    assert binom(2*a' + 1, 2*b) % 2 == binom(a', b) % 2;
-    assert binom(2*a' + 1, 2*b + 1) % 2 == binom(a', b) % 2;
-  }
-}
-
-// "Suc(S)" returns the set constructed by incrementing
-// each number in "S" by 1. Stated differently, it is the
-// increment-by-1 (successor) function applied pointwise to the
-// set.
-ghost function Suc(S: set<nat>): set<nat>
-{
-  set x | x in S :: x + 1
-}
-
-// The following lemma clearly shows the correspondence between
-// "S" and "Suc(S)".
-lemma SucElements(S: set<nat>)
-  ensures forall x :: x in S <==> (x+1) in Suc(S)
-{
-}
-
-// 0 is not in any set returned by "Suc".
-lemma ZeroNotInImageSuc(S: set<nat>)
-  ensures 0 !in Suc(S)
-{
-}
-
-lemma BitSet_Clauses(n: nat)
-  ensures BitSet(2*n) == Suc(BitSet(n))
-  ensures BitSet(2*n + 1) == {0} + Suc(BitSet(n))
-{
-  if n == 0 {
-  } else {
-    var nn := 2 * n;
-    forall x: nat {
-      calc {
-        x in BitSet(2*n);
-      ==  // def. BitSet
-        0 <= x < 2*n && Bit(x, 2*n);
-      ==  { ZeroBitOfEven(n); }
-        0 < x < 2*n && Bit(x, 2*n);
-      ==  { assert 0 < x ==> Bit(x, nn) == Bit(x-1, nn / 2); }
-        0 < x < 2*n && Bit(x-1, n);
-      ==  { if 0 < x && Bit(x-1, n) { BitSize(x-1, n); } }
-        0 <= x-1 < n && Bit(x-1, n);
-      ==  // def. BitSet
-        (x-1) in BitSet(n);
-      ==  // def. Suc
-        x in Suc(BitSet(n));
-      }
-    }
-    forall x: nat {
-      calc {
-        x in BitSet(2*n + 1);
-      ==  // def. BitSet
-        0 <= x < 2*n + 1 && Bit(x, 2*n + 1);
-      ==  { assert x == 0 ==> Bit(x, 2*n + 1); }
-        x == 0 || (0 < x < 2*n + 1 && Bit(x, 2*n + 1));
-      ==  { assert (2*n + 1) / 2 == n; }
-        x == 0 || (0 < x < 2*n + 1 && Bit(x-1, n));
-      ==  { if 0 < x && Bit(x-1, n) { BitSize(x-1, n); } }
-        x == 0 || (x-1) in BitSet(n);
-      ==
-        x == 0 || x in Suc(BitSet(n));
-      ==
-        x in {0} + Suc(BitSet(n));
-      }
-    }
-  }
-}
-
-// The following gives an induction principle for any two-argument
-// predicate "P" that satisfies the 5 listed properties.
-// (This lemma is not actually used in this proof of the Lucas theorem.)
-lemma INDUCTION_EVEN_ODD(P: (nat, nat) -> bool, A: nat, B: nat)
-  requires P(0, 0)
-  requires forall a: nat, b: nat :: P(a, b) ==> P(2*a, 2*b)
-  requires forall a: nat, b: nat :: P(a, b) ==> P(2*a, 2*b + 1)
-  requires forall a: nat, b: nat :: P(a, b) ==> P(2*a + 1, 2*b)
-  requires forall a: nat, b: nat :: P(a, b) ==> P(2*a + 1, 2*b + 1)
-  ensures P(A, B)
-{
-  if A == 0 && B == 0 {
-  } else {
-    var a, b := A / 2, B / 2;
-    assert A == 2*a || A == 2*a + 1;
-    assert B == 2*b || B == 2*b + 1;
-    INDUCTION_EVEN_ODD(P, a, b);
-  }
-}
-
-lemma Lucas_Theorem(m: nat, n: nat)
-  ensures BitSet(m) <= BitSet(n) <==> !EVEN(binom(n, m))
-{
-  if m == 0 && n == 0 {
-  } else {
-    var m', n' := m/2, n/2;
-    if {
-      case m == 2*m' && n == 2*n' =>
-        calc {
-          !EVEN(binom(n, m));
-        ==  { Lucas_Binary(n', m'); }
-          !EVEN(binom(n', m'));
-        ==  { Lucas_Theorem(m', n'); }
-          BitSet(m') <= BitSet(n');
-        ==  { SucElements(BitSet(m')); SucElements(BitSet(n')); }
-          Suc(BitSet(m')) <= Suc(BitSet(n'));
-        ==  { BitSet_Clauses(m'); BitSet_Clauses(n'); }
-          BitSet(2*m') <= BitSet(2*n');
-        }
-      case m == 2*m' && n == 2*n' + 1 =>
-        calc {
-          !EVEN(binom(n, m));
-        ==  { Lucas_Binary(n', m'); }
-          !EVEN(binom(n', m'));
-        ==  { Lucas_Theorem(m', n'); }
-          BitSet(m') <= BitSet(n');
-        ==  { SucElements(BitSet(m')); SucElements(BitSet(n')); }
-          Suc(BitSet(m')) <= Suc(BitSet(n'));
-        ==  { ZeroNotInImageSuc(BitSet(m')); }
-          Suc(BitSet(m')) <= {0} + Suc(BitSet(n'));
-        ==  { BitSet_Clauses(m'); BitSet_Clauses(n'); }
-          BitSet(2*m') <= BitSet(2*n' + 1);
-        }
-      case m == 2*m' + 1 && n == 2*n' =>
-        calc {
-          !EVEN(binom(n, m));
-        ==  { Lucas_Binary(n', m'); }
-          false;
-        ==  { assert 0 in BitSet(m) && 0 !in BitSet(n); }
-          BitSet(m) <= BitSet(n);
-        }
-      case m == 2*m' + 1 && n == 2*n' + 1 =>
-        calc {
-          !EVEN(binom(n, m));
-        ==  { Lucas_Binary(n', m'); }
-          !EVEN(binom(n', m'));
-        ==  { Lucas_Theorem(m', n'); }
-          BitSet(m') <= BitSet(n');
-        ==  { SucElements(BitSet(m')); SucElements(BitSet(n')); }
-          Suc(BitSet(m')) <= Suc(BitSet(n'));
-        ==  { ZeroNotInImageSuc(BitSet(m')); ZeroNotInImageSuc(BitSet(n')); }
-          ({0} + Suc(BitSet(m'))) <= {0} + Suc(BitSet(n'));
-        ==  { BitSet_Clauses(m'); BitSet_Clauses(n'); }
-          BitSet(2*m' + 1) <= BitSet(2*n' + 1);
-        }
-    }
-  }
-}
diff --git a/Test/dafny4/Lucas-up.dfy.expect b/Test/dafny4/Lucas-up.dfy.expect
deleted file mode 100644
index 8c4d74ae00a..00000000000
--- a/Test/dafny4/Lucas-up.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 19 verified, 0 errors
diff --git a/Test/dafny4/MonadicLaws.dfy.expect b/Test/dafny4/MonadicLaws.dfy.expect
deleted file mode 100644
index 0825601cd97..00000000000
--- a/Test/dafny4/MonadicLaws.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 9 verified, 0 errors
diff --git a/Test/dafny4/OpaqueBug.dfy.expect b/Test/dafny4/OpaqueBug.dfy.expect
deleted file mode 100644
index a4805ddda64..00000000000
--- a/Test/dafny4/OpaqueBug.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-OpaqueBug.dfy(13,13): Error: assertion could not be proved
-OpaqueBug.dfy(23,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/dafny4/Regression1.dfy b/Test/dafny4/Regression1.dfy
deleted file mode 100644
index 470f1781be3..00000000000
--- a/Test/dafny4/Regression1.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost method M() {
-  var x :=
-// In the following line, why are the range and term copied in Substitute?
-//    var loo := 100; map y | 0 <= y < 100 :: y+1;
-    var loo := 100; imap y: int | true :: 3;
-}
diff --git a/Test/dafny4/Regression1.dfy.expect b/Test/dafny4/Regression1.dfy.expect
deleted file mode 100644
index db802e5c4b1..00000000000
--- a/Test/dafny4/Regression1.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-Regression1.dfy(8,20): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny4/Regression17.dfy b/Test/dafny4/Regression17.dfy
deleted file mode 100644
index 3552e0d84a5..00000000000
--- a/Test/dafny4/Regression17.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-newtype nt = int
-
-method Test(x: int)
-{
-  var y := map[x := nt];  // error (but should not cause a crash): nt is a type
-}
diff --git a/Test/dafny4/Regression20.dfy b/Test/dafny4/Regression20.dfy
deleted file mode 100644
index ab0216ae75c..00000000000
--- a/Test/dafny4/Regression20.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// The type name "bv" once crashed the resolver
-
-method M(x: bv)  // error: undeclared type bv
diff --git a/Test/dafny4/Regression5.dfy b/Test/dafny4/Regression5.dfy
deleted file mode 100644
index 66fc5a9a18f..00000000000
--- a/Test/dafny4/Regression5.dfy
+++ /dev/null
@@ -1,16 +0,0 @@
-// RUN: %exits-with 4 %dafny /rprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-type Syn = bv8
-
-method P(x: int) returns (y: bv8)
-  requires x < 256
-{
-  y := x as Syn;  // error: value might be negative
-}
-
-method Q() {
-  var r: real := -3.0;
-  var v: bv8;
-  v := r as bv8;  // error: value most certainly is negative
-}
diff --git a/Test/dafny4/Regression8.dfy.expect b/Test/dafny4/Regression8.dfy.expect
deleted file mode 100644
index 7f6b73c9e2e..00000000000
--- a/Test/dafny4/Regression8.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-Regression8.dfy(14,16): Error: function precondition could not be proved
-Regression8.dfy(5,13): Related location
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/RollYourOwnArrowType.dfy b/Test/dafny4/RollYourOwnArrowType.dfy
deleted file mode 100644
index c67d8be2c68..00000000000
--- a/Test/dafny4/RollYourOwnArrowType.dfy
+++ /dev/null
@@ -1,180 +0,0 @@
-// RUN: %exits-with 4 %dafny /dprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// ----- arrows with no read effects -------------------------------------
-
-type NoWitness_EffectlessArrow<!A(!new), B> = f: A ~> B  // error: cannot find witness
-  | forall a :: f.reads(a) == {}
-
-type NonGhost_EffectlessArrow<!A(!new), B> = f: A ~> B
-  | forall a :: f.reads(a) == {}
-  witness EffectlessArrowWitness<A, B>
-
-// The following compilable function, which is used in the witness clause above, can never
-// be implemented, because there is no way to produce a B (for any B) in compiled code.
-function EffectlessArrowWitness<A, B>(a: A): B
-
-type EffectlessArrow<!A(!new), B(00)> = f: A ~> B
-  | forall a :: f.reads(a) == {}
-  ghost witness GhostEffectlessArrowWitness<A, B>
-
-ghost function GhostEffectlessArrowWitness<A, B(00)>(a: A): B
-{
-  var b: B :| true; b
-}
-
-
-function Twice(f: EffectlessArrow<int,int>, x: int): int
-  requires forall x :: f.requires(x)
-{
-  var y := f(x);
-  f(y)
-}
-
-function Twice'(f: EffectlessArrow<int,int>, x: int): int
-  reads f.reads
-  requires forall x :: f.requires(x)
-{
-  f(f(x))
-}
-
-function Twice''(f: EffectlessArrow<int,int>, x: int): int
-  reads f.reads
-  requires forall x :: f.requires(x)
-{
-  assert f.requires(f(x));  // this is another workaround to the problem with Twice'
-  f(f(x))
-}
-
-function TwoTimes(f: int ~> int, x: int): int
-  requires forall x :: f.reads(x) == {}
-  requires forall x :: f.requires(x)
-{
-  f(f(x))
-}
-
-function Inc(x: int): int
-{
-  x + 1
-}
-
-method Main()
-{
-  var y := TwoTimes(Inc, 3);
-  assert y == 5;
-  var z := Twice(Inc, 12);
-  assert z == 14;
-}
-
-// ----- totality constraint by predicate Total -------------------------------------
-
-ghost predicate Total<A(!new), B>(f: A ~> B)  // (is this (!new) really necessary?)
-  reads f.reads
-{
-  forall a :: f.reads(a) == {} && f.requires(a)
-}
-
-type TotalArrow<!A(!new), B(00)> = f: EffectlessArrow<A, B>
-  | Total(f)
-  ghost witness TotalWitness<A, B>
-
-ghost function TotalWitness<A, B(00)>(a: A): B
-{
-  var b: B :| true; b
-}
-
-lemma TotalWitnessIsTotal<A, B>()
-  ensures Total(TotalWitness<A, B>)
-{
-}
-
-ghost function TotalClientTwice(f: TotalArrow<int,int>, x: int): int
-{
-  f(f(x))
-}
-
-// ----- inlined totality constraint -------------------------------------
-
-type DirectTotalArrow<!A(!new), B(00)> = f: EffectlessArrow<A, B>
-  | forall a :: f.requires(a)
-  ghost witness TotalWitness<A, B>
-
-lemma DirectTotalWitnessIsTotal<A(!new), B(00)>(f: DirectTotalArrow<A, B>)
-  ensures Total(TotalWitness<A, B>)
-{
-}
-
-ghost function DirectTotalClientTwice(f: DirectTotalArrow<int,int>, x: int): int
-{
-  f(f(x))
-}
-
-// ----- using two predicates, and showing which conjunct of constraint is violated ------
-
-ghost predicate EmptyReads<A(!new), B>(f: A ~> B)  // (is this (!new) really necessary?)
-  reads f.reads
-{
-  forall a :: f.reads(a) == {}
-}
-
-ghost predicate TruePre<A(!new), B>(f: A ~> B)  // (is this (!new) really necessary?)
-  reads f.reads
-{
-  forall a :: f.requires(a)
-}
-
-type TwoPred_TotalArrow<!A(!new), B(00)> = f: A ~> B
-  | EmptyReads(f) && TruePre(f)
-  ghost witness TotalWitness<A, B>
-
-ghost predicate SomeCondition<A>(a: A)
-
-ghost function PartialFunction<A, B(00)>(a: A): B
-  requires SomeCondition(a)
-{
-  var b: B :| true; b
-}
-
-type Bad_TwoPred_TotalArrow<!A(!new), B(00)> = f: A ~> B
-  | EmptyReads(f) && TruePre(f)
-  // cool: the type instantiation of "PartialFunction" below is inferred
-  ghost witness PartialFunction  // error: the second conjunct of the constraint is not satisfied
-
-// ----- Interaction between user-defined conditions and built-in arrows -----
-
-method Any_to_Partial(f: int ~> int) returns (g: int --> int)
-  requires forall x :: f.reads(x) == {}
-{
-  g := f;
-}
-
-method Partial_to_Any(g: int --> int) returns (f: int ~> int)
-  ensures forall x :: f.reads(x) == {}
-{
-  f := g;
-}
-
-method Partial_to_Total(g: int --> int) returns (tot: int -> int)
-  requires forall x :: g.requires(x)
-{
-  tot := g;
-}
-
-method Total_to_Partial(tot: int -> int) returns (g: int --> int)
-  ensures forall x :: g.requires(x)
-{
-  g := tot;
-}
-
-
-method Any_to_Total(f: int ~> int) returns (tot: int -> int)
-  requires forall x :: f.reads(x) == {} && f.requires(x)
-{
-  tot := f;
-}
-
-method Total_to_Any(tot: int -> int) returns (f: int ~> int)
-  ensures forall x :: f.reads(x) == {} && f.requires(x)
-{
-  f := tot;
-}
diff --git a/Test/dafny4/RollYourOwnArrowType.dfy.expect b/Test/dafny4/RollYourOwnArrowType.dfy.expect
deleted file mode 100644
index 1e55ed2687b..00000000000
--- a/Test/dafny4/RollYourOwnArrowType.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-RollYourOwnArrowType.dfy(6,5): Error: cannot find witness that shows type is inhabited; try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-RollYourOwnArrowType.dfy(141,16): Error: the given witness expression might not satisfy constraint
-RollYourOwnArrowType.dfy(139,21): Related location
-RollYourOwnArrowType.dfy(123,2): Related location
-RollYourOwnArrowType.dfy(123,16): Related location
-
-Dafny program verifier finished with 28 verified, 2 errors
diff --git a/Test/dafny4/SoftwareFoundations-Basics.dfy.expect b/Test/dafny4/SoftwareFoundations-Basics.dfy.expect
deleted file mode 100644
index 995ef64166a..00000000000
--- a/Test/dafny4/SoftwareFoundations-Basics.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-SoftwareFoundations-Basics.dfy(41,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 42 verified, 1 error
diff --git a/Test/dafny4/gcd.dfy b/Test/dafny4/gcd.dfy
deleted file mode 100644
index fa92223fa49..00000000000
--- a/Test/dafny4/gcd.dfy
+++ /dev/null
@@ -1,256 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
-
-// A text describing this file is found in a Dafny Power User note: http://leino.science/papers/krml279.html
-
-type pos = x | 1 <= x witness 1
-
-ghost predicate IsFactor(p: pos, x: pos) {
-  exists q :: p * q == x
-}
-
-ghost function Factors(x: pos): set<pos> {
-  set p: pos | p <= x && IsFactor(p, x)
-}
-
-// The following lemma proves that the conjunct "p <= x" in the
-// definition of Factors does not reduce the elements in the set.
-lemma FactorsHasAllFactors(x: pos)
-  ensures forall n :: n in Factors(x) <==> n in iset p: pos | IsFactor(p, x)
-{
-}
-
-lemma FactorsContains1(x: pos)
-  ensures 1 in Factors(x)
-{
-  assert 1 * x == x;
-}
-
-lemma FactorsContainsSelf(x: pos)
-  ensures x in Factors(x)
-{
-  assert x * 1 == x;
-}
-
-// This is a somewhat declarative definition of Max
-ghost function Max(s: set<pos>): pos
-  requires s != {}
-{
-  // To use the :| operator below, we need to prove that such a value exists
-  MaxExists(s);
-  var x :| x in s && forall y :: y in s ==> y <= x;
-  x
-}
-
-lemma MaxExists(s: set<pos>)
-  requires s != {}
-  ensures exists x :: x in s && forall y :: y in s ==> y <= x
-{
-  // One way to show that such an x exists is to compute it
-  var x := FindMax(s);
-}
-
-// Here is a recursive definition for computing the max
-ghost function FindMax(s: set<pos>): (max: pos)
-  requires s != {}
-  ensures max in s && forall y :: y in s ==> y <= max
-{
-  var x :| x in s;
-  if s == {x} then
-    x
-  else
-    var s' := s - {x};
-    assert s == s' + {x};
-    var y := FindMax(s');
-    if x < y then y else x
-}
-
-ghost function Gcd(x: pos, y: pos): pos {
-  var common := Factors(x) * Factors(y);
-  assert 1 in common by {
-    FactorsContains1(x);
-    FactorsContains1(y);
-  }
-  Max(common)
-}
-
-lemma AboutGcd(x: pos, y: pos)
-  ensures IsFactor(Gcd(x, y), x)
-  ensures IsFactor(Gcd(x, y), y)
-  ensures forall p: pos :: IsFactor(p, x) && IsFactor(p, y) ==> p <= Gcd(x, y)
-{
-  forall p: pos | IsFactor(p, x) && IsFactor(p, y)
-    ensures p <= Gcd(x, y)
-  {
-    assert p in Factors(x) * Factors(y);
-  }
-}
-
-lemma GcdSymmetric(x: pos, y: pos)
-  ensures Gcd(x, y) == Gcd(y, x)
-{
-  assert Factors(x) * Factors(y) == Factors(y) * Factors(x);
-}
-
-lemma GcdIdempotent(x: pos)
-  ensures Gcd(x, x) == x
-{
-  FactorsContainsSelf(x);
-  assert x in Factors(x) * Factors(x);
-}
-
-lemma GcdSubtract(x: pos, y: pos)
-  requires x < y
-  ensures Gcd(x, y) == Gcd(x, y - x)
-{
-  var p := Gcd(x, y);
-
-  // By the definition of `Gcd`, we know that p is a factor of both x and y,
-  // We now show that p is also a factor of y - x.
-  assert IsFactor(p, y - x) by {
-    var a :| p * a == x;
-    var b :| p * b == y;
-    calc {
-      y - x;
-    ==
-      p * b - p * a;
-    ==
-      p * (b - a);
-    }
-  }
-
-  // Hence, p is a common factor of x and y - x
-  var common := Factors(x) * Factors(y - x);
-  assert p in common;
-
-  // It remains to show that, among the common factors of x and
-  // y - x, p is the greatest
-  forall q | q in common
-    ensures q <= p
-  {
-    // q is a factor of both x and y - x, so a and b exist:
-    var a :| q * a == x;
-    var b :| q * b == y - x;
-    assert IsFactor(q, y) by {
-      calc {
-        y;
-      ==
-        x + (y - x);
-      ==
-        q * a + q * b;
-      ==
-        q * (a + b);
-      }
-    }
-    // We just showed that q is a common factor of x and y.
-    assert q in Factors(x) * Factors(y);
-    // By the definition of Gcd(x, y), we then have that q <= p.
-  }
-}
-
-method EuclidGcd(X: pos, Y: pos) returns (gcd: pos)
-  ensures gcd == Gcd(X, Y)
-{
-  var x: pos, y: pos := X, Y;
-  while
-    invariant Gcd(x, y) == Gcd(X, Y)
-    decreases x + y
-  {
-    case x < y =>
-      GcdSubtract(x, y);
-      y := y - x;
-    case y < x =>
-      calc {
-        Gcd(x, y);
-      ==  { GcdSymmetric(x, y); }
-        Gcd(y, x);
-      ==  { GcdSubtract(y, x); }
-        Gcd(y, x - y);
-      ==  { GcdSymmetric(y, x - y); }
-        Gcd(x - y, y);
-      }
-      x := x - y;
-  }
-  GcdIdempotent(x);
-  return x;
-}
-
-// ------------------------------------------------------------------------------------------------------
-// The alternative definitions that follow allow the two cases in the GCD algorithm to look more similar.
-
-lemma GcdSubtractAlt(x: pos, y: pos)
-  requires x < y
-  ensures Gcd(y, x) == Gcd(x, y - x) // this says Gcd(y, x) instead of Gcd(x, y) as in GcdSubtract above
-{
-  GcdSymmetric(x, y); // this is the difference from GcdSubtract above
-  var p := Gcd(x, y);
-
-  assert IsFactor(p, y - x) by {
-    var a :| p * a == x;
-    var b :| p * b == y;
-    calc {
-      y - x;
-    ==
-      p * b - p * a;
-    ==
-      p * (b - a);
-    }
-  }
-
-  var common := Factors(x) * Factors(y - x);
-  assert p in common;
-  forall q | q in common
-    ensures q <= p
-  {
-    var a :| q * a == x;
-    var b :| q * b == y - x;
-    assert IsFactor(q, y) by {
-      calc {
-        y;
-      ==
-        x + (y - x);
-      ==
-        q * a + q * b;
-      ==
-        q * (a + b);
-      }
-    }
-    assert q in Factors(x) * Factors(y);
-  }
-}
-
-method EuclidGcdAlt(X: pos, Y: pos) returns (gcd: pos)
-  ensures gcd == Gcd(X, Y)
-{
-  var x: pos, y: pos := X, Y;
-  while
-    invariant Gcd(x, y) == Gcd(X, Y)
-    decreases x + y
-  {
-    case x < y =>
-      GcdSubtractAlt(x, y);
-      GcdSymmetric(y, x);
-      y := y - x;
-    case y < x =>
-      GcdSymmetric(x - y, y);
-      GcdSubtractAlt(y, x);
-      x := x - y;
-  }
-  GcdIdempotent(x);
-  return x;
-}
-// ------------------------------------------------------------------------------------------------------
-
-method Main() {
-  Test(15, 9);
-  Test(14, 22);
-  Test(371, 1);
-  Test(1, 2);
-  Test(1, 1);
-  Test(13, 13);
-  Test(60, 60);
-}
-
-method Test(x: pos, y: pos) {
-  var gcd := EuclidGcd(x, y);
-  print x, " gcd ", y, "  =  ", gcd, "\n";
-}
diff --git a/Test/dafny4/git-issue1.dfy.expect b/Test/dafny4/git-issue1.dfy.expect
deleted file mode 100644
index 960e4210e3a..00000000000
--- a/Test/dafny4/git-issue1.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue1.dfy(15,11): Warning: /!\ No terms found to trigger on.
-git-issue1.dfy(16,11): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/dafny4/git-issue105.dfy b/Test/dafny4/git-issue105.dfy
deleted file mode 100644
index 4cff2330cba..00000000000
--- a/Test/dafny4/git-issue105.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-method lol() returns (c: int)
-{
-  c := 5;
-  return c;
-}
diff --git a/Test/dafny4/git-issue106.dfy b/Test/dafny4/git-issue106.dfy
deleted file mode 100644
index 5fc6d29385c..00000000000
--- a/Test/dafny4/git-issue106.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function f(i:nat, j:nat):int {if i == 0 then 0 else f(i - 1, i * j + 1) + f(i - 1, 2 * i * j)}
-
-lemma{:rlimit 10000} L()
-{
-  assert f(10, 5) == 0;
-}
diff --git a/Test/dafny4/git-issue106.dfy.expect b/Test/dafny4/git-issue106.dfy.expect
deleted file mode 100644
index 757646ed6c3..00000000000
--- a/Test/dafny4/git-issue106.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue106.dfy(6,21): Verification out of resource (L (correctness))
-
-Dafny program verifier finished with 1 verified, 0 errors, 1 out of resource
diff --git a/Test/dafny4/git-issue109.dfy b/Test/dafny4/git-issue109.dfy
deleted file mode 100644
index ee58f2fe158..00000000000
--- a/Test/dafny4/git-issue109.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 /rprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype MyTuple = MyTuple(x:int, y:int)
-
-method M()
-  requires forall x :: MyTuple(x,x) != MyTuple(x,x+1)
-  requires forall x :: (x,x) != (x,x+1)
-{
-}
-
-
diff --git a/Test/dafny4/git-issue120.dfy b/Test/dafny4/git-issue120.dfy
deleted file mode 100644
index 9e9e37353ea..00000000000
--- a/Test/dafny4/git-issue120.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function {:opaque} opfn(): int { 37 }
-
-ghost function foo(): int
-{
-    var x := opfn();
-    assert x == 37 by { reveal opfn(); }
-    x
-}
-
diff --git a/Test/dafny4/git-issue134.dfy.expect b/Test/dafny4/git-issue134.dfy.expect
deleted file mode 100644
index 13adf46fe69..00000000000
--- a/Test/dafny4/git-issue134.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue134.dfy(13,21): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/git-issue148.dfy b/Test/dafny4/git-issue148.dfy
deleted file mode 100644
index fd39c1ca8a3..00000000000
--- a/Test/dafny4/git-issue148.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function Foo(f: () -> (), n: nat): nat
-{
-    if n == 0 then n
-    else Foo(f, n - 1)
-}
-
-lemma lemma_Foo()
-    ensures forall g: () -> () :: Foo(g, 0) == 0  // regression: this had crashed Dafny
-{}
diff --git a/Test/dafny4/git-issue155.dfy b/Test/dafny4/git-issue155.dfy
deleted file mode 100644
index 187c98f6e3b..00000000000
--- a/Test/dafny4/git-issue155.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype A = A0
-datatype B = B0
-
-ghost function F(a: A, b: B): int
-{
-  match (a, b)
-  case (A0, B0) => 0
-}
-
-method M(a: A, b: B)
-{
-  match (a, b)
-  case (A0, B0) =>
-}
\ No newline at end of file
diff --git a/Test/dafny4/git-issue16.dfy b/Test/dafny4/git-issue16.dfy
deleted file mode 100644
index e959309b94c..00000000000
--- a/Test/dafny4/git-issue16.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:3 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "git-issue16.dfyi"
-
-lemma UhOh()
-  ensures false
-{
-}
diff --git a/Test/dafny4/git-issue18.dfy b/Test/dafny4/git-issue18.dfy
deleted file mode 100644
index ebc9ee57f82..00000000000
--- a/Test/dafny4/git-issue18.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype Maybe = Nothing | Just
-ghost predicate bad(e:Maybe)
-{
-    forall i :: 0 <= i < 1 ==>
-        0 == match e
-            case Nothing => 0
-            case Just => 0
-}
-
diff --git a/Test/dafny4/git-issue18.dfy.expect b/Test/dafny4/git-issue18.dfy.expect
deleted file mode 100644
index 48ecd75ed5b..00000000000
--- a/Test/dafny4/git-issue18.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue18.dfy(7,4): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny4/git-issue182.dfy b/Test/dafny4/git-issue182.dfy
deleted file mode 100644
index 16e6a6260a5..00000000000
--- a/Test/dafny4/git-issue182.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-predicate prop()
-ensures prop // OOPS! Forgot () after prop
-{
-true
-}
diff --git a/Test/dafny4/git-issue182.dfy.expect b/Test/dafny4/git-issue182.dfy.expect
deleted file mode 100644
index 649b395ad03..00000000000
--- a/Test/dafny4/git-issue182.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue182.dfy(5,8): Error: Postcondition must be a boolean (got () -> bool)
-1 resolution/type errors detected in git-issue182.dfy
diff --git a/Test/dafny4/git-issue20.dfy.expect b/Test/dafny4/git-issue20.dfy.expect
deleted file mode 100644
index b10d0acad0b..00000000000
--- a/Test/dafny4/git-issue20.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue20.dfy(21,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/dafny4/git-issue206.dfy b/Test/dafny4/git-issue206.dfy
deleted file mode 100644
index f174780f3fb..00000000000
--- a/Test/dafny4/git-issue206.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 /rprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype Foo = Bar(x: int)
-
-method letTest() {
-  assert (var (Bar(a), c) := (Bar(1), 2); a) == 1;
-}
diff --git a/Test/dafny4/git-issue209.dfy b/Test/dafny4/git-issue209.dfy
deleted file mode 100644
index 8171825d66f..00000000000
--- a/Test/dafny4/git-issue209.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /rprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function F(l: seq<bool>, x: bool, js: seq<int>): bool {
-  forall i, j :: js[i] < j < js[i + 1] ==> l[j] == x
-}
diff --git a/Test/dafny4/git-issue210.dfy b/Test/dafny4/git-issue210.dfy
deleted file mode 100644
index bf43428f574..00000000000
--- a/Test/dafny4/git-issue210.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %dafny /compile:0 /rprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function F<A>(l: seq<A>): bool {
-  forall i :: 0 <= i < |l|-1 ==> l[i] == l[i + 1] || l[i] == l[i + 1]
-}
-
diff --git a/Test/dafny4/git-issue22.dfy b/Test/dafny4/git-issue22.dfy
deleted file mode 100644
index 7a698b5803e..00000000000
--- a/Test/dafny4/git-issue22.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost predicate bad()
-{
-    forall i :: i in {1}
-}
diff --git a/Test/dafny4/git-issue22.dfy.expect b/Test/dafny4/git-issue22.dfy.expect
deleted file mode 100644
index 201dbe5d40b..00000000000
--- a/Test/dafny4/git-issue22.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue22.dfy(6,4): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny4/git-issue23.dfy.expect b/Test/dafny4/git-issue23.dfy.expect
deleted file mode 100644
index 91a0b5a328b..00000000000
--- a/Test/dafny4/git-issue23.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue23.dfy(14,11): Error: function precondition could not be proved
-git-issue23.dfy(10,13): Related location
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/git-issue235.dfy b/Test/dafny4/git-issue235.dfy
deleted file mode 100644
index cabd02057d3..00000000000
--- a/Test/dafny4/git-issue235.dfy
+++ /dev/null
@@ -1,22 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  ghost predicate F(x: int) { true }
-}
-
-module B {
-  import I = A
-
-  lemma Test(x: int)
-    ensures I.F(x)
-  {
-  }
-
-  lemma TestWrapper()
-  {
-    forall x {
-      Test(x);
-    }
-  }
-}
diff --git a/Test/dafny4/git-issue250.dfy.expect b/Test/dafny4/git-issue250.dfy.expect
deleted file mode 100644
index 971a5ef441e..00000000000
--- a/Test/dafny4/git-issue250.dfy.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny4/git-issue26.dfy b/Test/dafny4/git-issue26.dfy
deleted file mode 100644
index f6c66fa49ac..00000000000
--- a/Test/dafny4/git-issue26.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function BitvectorCast(x:bv32): int
-    ensures x != 0 ==> BitvectorCast(x) != 0
-{
-    x as int
-}
diff --git a/Test/dafny4/git-issue27.dfy b/Test/dafny4/git-issue27.dfy
deleted file mode 100644
index 8877eb1ab1f..00000000000
--- a/Test/dafny4/git-issue27.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-type word = x | 0 <= x < 0x1_0000_0000
-
-ghost function extract(src:map<int, word>): map<int, word>
-    requires forall i :: 0 <= i < 0x10 ==> i in src
-{
-    (map i | 0 <= i < 0x10 :: src[i])
-}
-
diff --git a/Test/dafny4/git-issue28.dfy b/Test/dafny4/git-issue28.dfy
deleted file mode 100644
index c108066fb68..00000000000
--- a/Test/dafny4/git-issue28.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-lemma mylemma()
-{
-    var shift:int := 1;
-    assume (1 as bv32 << shift) as int == 2;
-    assert (1 as bv32 << 1) as int == 2;
-}
-
diff --git a/Test/dafny4/git-issue3.dfy b/Test/dafny4/git-issue3.dfy
deleted file mode 100644
index af5e240cda7..00000000000
--- a/Test/dafny4/git-issue3.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-newtype Even = n: int | exists h :: h * 2 == n
-
-
-
diff --git a/Test/dafny4/git-issue39.dfy b/Test/dafny4/git-issue39.dfy
deleted file mode 100644
index e7bc64b73f8..00000000000
--- a/Test/dafny4/git-issue39.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function BitsAsInt(b:bv32): int
-    ensures 0 <= BitsAsInt(b) < 0x1_0000_0000
-{
-    b as int
-}
diff --git a/Test/dafny4/git-issue42.dfy b/Test/dafny4/git-issue42.dfy
deleted file mode 100644
index 7bf1460980f..00000000000
--- a/Test/dafny4/git-issue42.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /warnShadowing /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-lemma L(x:int)
-{
-    var x := 2;
-}
-
-lemma {:warnShadowing false} L1(x:int)
-{
-    var x := 2;
-}
diff --git a/Test/dafny4/git-issue43.dfy b/Test/dafny4/git-issue43.dfy
deleted file mode 100644
index d320d7761bc..00000000000
--- a/Test/dafny4/git-issue43.dfy
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-class System { }
-
diff --git a/Test/dafny4/git-issue45.dfy b/Test/dafny4/git-issue45.dfy
deleted file mode 100644
index e401d51014c..00000000000
--- a/Test/dafny4/git-issue45.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module Library {
-}
-
-module Outer {
-  import Library
-
-  module Inner {
-    import Library
-  }
-}
diff --git a/Test/dafny4/git-issue46.dfy b/Test/dafny4/git-issue46.dfy
deleted file mode 100644
index fdc01bb2868..00000000000
--- a/Test/dafny4/git-issue46.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "git-issue46-include.dfyi"
-
-module m4 refines m2 { }
-
-
diff --git a/Test/dafny4/git-issue47.dfy b/Test/dafny4/git-issue47.dfy
deleted file mode 100644
index 307ca0e8f5d..00000000000
--- a/Test/dafny4/git-issue47.dfy
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "git-issue47-include.dfyi"
diff --git a/Test/dafny4/git-issue48.dfy b/Test/dafny4/git-issue48.dfy
deleted file mode 100644
index af517da0652..00000000000
--- a/Test/dafny4/git-issue48.dfy
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "git-issue48-include.dfyi"
diff --git a/Test/dafny4/git-issue48.dfy.expect b/Test/dafny4/git-issue48.dfy.expect
deleted file mode 100644
index d97f45ab82e..00000000000
--- a/Test/dafny4/git-issue48.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue48-include.dfyi(4,8): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny4/git-issue49.dfy b/Test/dafny4/git-issue49.dfy
deleted file mode 100644
index be0702641d2..00000000000
--- a/Test/dafny4/git-issue49.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module m1 {
- export reveals f
-
- type T = int
- ghost function f(x:T) : T { x }
-}
diff --git a/Test/dafny4/git-issue51.dfy.expect b/Test/dafny4/git-issue51.dfy.expect
deleted file mode 100644
index 1af66232088..00000000000
--- a/Test/dafny4/git-issue51.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-git-issue51.dfy(35,15): Error: argument might not be allocated in the state in which the function is invoked
-git-issue51.dfy(38,20): Error: argument might not be allocated in the state in which the function is invoked
-git-issue51.dfy(42,15): Error: argument might not be allocated in the state in which the method is invoked
-git-issue51.dfy(45,15): Error: argument might not be allocated in the state in which the method is invoked
-git-issue51.dfy(53,22): Error: argument might not be allocated in the state in which the function is invoked
-git-issue51.dfy(57,19): Error: argument might not be allocated in the state in which the method is invoked
-git-issue51.dfy(59,17): Error: argument might not be allocated in the state in which the function is invoked
-git-issue51.dfy(69,12): Error: parameter at index 0 ('a') might not be allocated in the two-state lemma's previous state
-git-issue51.dfy(75,15): Error: receiver might not be allocated in the state in which its fields are accessed
-git-issue51.dfy(79,11): Error: argument at index 0 ('a') might not be allocated in the two-state function's previous state
-
-Dafny program verifier finished with 2 verified, 10 errors
diff --git a/Test/dafny4/git-issue53.dfy b/Test/dafny4/git-issue53.dfy
deleted file mode 100644
index e772feb7c33..00000000000
--- a/Test/dafny4/git-issue53.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost predicate P() {
-  forall m:mode :: m == m
-}
diff --git a/Test/dafny4/git-issue57.dfy b/Test/dafny4/git-issue57.dfy
deleted file mode 100644
index e97fb1df243..00000000000
--- a/Test/dafny4/git-issue57.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-lemma lemma_RotateRightAdds(x:bv32)
-   ensures  (x.RotateRight(2)).RotateRight(3) == x.RotateRight(5)
-{
-}
-
-
diff --git a/Test/dafny4/git-issue59.dfy b/Test/dafny4/git-issue59.dfy
deleted file mode 100644
index 5a017938139..00000000000
--- a/Test/dafny4/git-issue59.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 4 %dafny /tracePOs /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "git-issue59.dfyi"
-
-method foo(x:byte) {
-  var y:byte := x+1;
-   }
-
diff --git a/Test/dafny4/git-issue59.dfy.expect b/Test/dafny4/git-issue59.dfy.expect
deleted file mode 100644
index 3204e9e1f08..00000000000
--- a/Test/dafny4/git-issue59.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Verifying foo (correctness) ...
-  [1 proof obligation]  error
-git-issue59.dfy(7,17): Error: value does not satisfy the subset constraints of 'byte'
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/dafny4/git-issue63.dfy b/Test/dafny4/git-issue63.dfy
deleted file mode 100644
index 868924f6088..00000000000
--- a/Test/dafny4/git-issue63.dfy
+++ /dev/null
@@ -1,60 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-type globalsmap = map<string, seq<int>>
-
-ghost predicate {:axiom} ValidGlobal(g:string)
-
-ghost predicate {:opaque} ValidGlobalStateOpaque(globals: globalsmap)
-{
-    forall g :: ValidGlobal(g) <==> g in globals && |globals[g]| == 1
-}
-
-ghost function GlobalWord(gm:globalsmap, g:string): int
-    requires ValidGlobalStateOpaque(gm) && ValidGlobal(g)
-{
-    reveal_ValidGlobalStateOpaque();
-    gm[g][0]
-}
-
-ghost function GlobalUpdate(gm: globalsmap, g:string, v:int): globalsmap
-    requires ValidGlobalStateOpaque(gm) && ValidGlobal(g)
-    ensures ValidGlobalStateOpaque(GlobalUpdate(gm, g, v))
-{
-    reveal_ValidGlobalStateOpaque();
-    gm[g := gm[g][0 := v]]
-}
-
-lemma test()
-{
-    ghost var gm1:globalsmap;
-    ghost var g: string;
-    ghost var v: int;
-    assume ValidGlobal(g) && ValidGlobalStateOpaque(gm1);
-		ghost var gm2 := GlobalUpdate(gm1, g, v);
-    assert GlobalWord(gm2, g) == v;
-}
-
-datatype reg = R0|R1|R2|R3
-
-ghost predicate {:opaque} ValidRegState(regs:map<reg, int>)
-{
-    forall r:reg :: r in regs
-}
-
-ghost function sp_update_reg(r:reg, sM:map<reg, int>, sK:map<reg, int>): map<reg, int>
-    requires ValidRegState(sK) && ValidRegState(sM)
-    ensures ValidRegState(sp_update_reg(r, sM, sK))
-{
-    reveal_ValidRegState();
-    sK[r := sM[r]]
-}
-
-lemma test2() {
-    var s0, s1;
-    assume ValidRegState(s0) && ValidRegState(s1);
-    assume s0 == s1;
-    var r: reg;
-    //reveal_ValidRegState();
-    assert s0 == sp_update_reg(r, s1, s0);
-}
diff --git a/Test/dafny4/git-issue64.dfy b/Test/dafny4/git-issue64.dfy
deleted file mode 100644
index 9647bf8a891..00000000000
--- a/Test/dafny4/git-issue64.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %dafny /rprint:"%t.rprint" /compile:0  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "git-issue64.dfyi"
-
-ghost function id(x:word): word { x }
diff --git a/Test/dafny4/git-issue74.dfy b/Test/dafny4/git-issue74.dfy
deleted file mode 100644
index ef83917f341..00000000000
--- a/Test/dafny4/git-issue74.dfy
+++ /dev/null
@@ -1,16 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-function{:opaque} f(x:int):int { x }
-
-lemma L()
-    ensures forall x:int :: f(x) == x
-{
-    forall x:int
-        ensures f(x) == x
-    {
-        reveal f();
-    }
-    assert forall x:int :: f(x) == x;
-}
-
diff --git a/Test/dafny4/git-issue75.dfy.expect b/Test/dafny4/git-issue75.dfy.expect
deleted file mode 100644
index 783980ba8f2..00000000000
--- a/Test/dafny4/git-issue75.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue75.dfy(12,7): Warning: /!\ No terms found to trigger on.
-git-issue75.dfy(17,7): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/dafny4/git-issue88.dfy b/Test/dafny4/git-issue88.dfy
deleted file mode 100644
index 83c0b4a8ef9..00000000000
--- a/Test/dafny4/git-issue88.dfy
+++ /dev/null
@@ -1,21 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-type Grid = array2<int>
-
-method M2() {
-  var g: Grid := new int[9,9];
-  g[0,0] := 1;
-}
-
-type Line = array<int>
-
-method M1() {
-  var g: Line := new int[9];
-  g[0] := 1;
-}
-
-method Main()
-{
-  M2();
-  M1();
-}
diff --git a/Test/dafny4/git-issue90.dfy b/Test/dafny4/git-issue90.dfy
deleted file mode 100644
index 04e3e9b990c..00000000000
--- a/Test/dafny4/git-issue90.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:3 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-const x: MyInt := 200
-const y: int := x as int + 180
-newtype MyInt = k | 0 <= k < y
-
-
diff --git a/Test/dafny4/git-issue90.dfy.expect b/Test/dafny4/git-issue90.dfy.expect
deleted file mode 100644
index e6c3fc90eed..00000000000
--- a/Test/dafny4/git-issue90.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue90.dfy(4,6): Error: type for constant 'x' is 'MyInt', but its initialization value type is 'int'
-1 resolution/type errors detected in git-issue90.dfy
diff --git a/Test/dafny4/git-issue92.dfy b/Test/dafny4/git-issue92.dfy
deleted file mode 100644
index daa5086dea2..00000000000
--- a/Test/dafny4/git-issue92.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype d = D(i:int)
-ghost predicate p(s:int, y:int)
-ghost predicate q(d:d) { exists s :: (match d case D(z) => p(s, z)) }
-
diff --git a/Test/dafny4/git-issue92.dfy.expect b/Test/dafny4/git-issue92.dfy.expect
deleted file mode 100644
index 5e6b805f90d..00000000000
--- a/Test/dafny4/git-issue92.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue92.dfy(6,25): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/dafny4/git-issue96.dfy.expect b/Test/dafny4/git-issue96.dfy.expect
deleted file mode 100644
index cdae50c163a..00000000000
--- a/Test/dafny4/git-issue96.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue96.dfy(14,21): Warning: For expression "0 <= i && i < j && j < 5 ==> s[_t#0] == s[i]":
-   /!\ No trigger covering all quantified variables found. In subexpression at git-issue96.dfy(15,23) [Related location] git-issue96.dfy(15,36)
-
-Dafny program verifier finished with 4 verified, 0 errors
diff --git a/Test/dafny4/predicateReturnVariable.dfy b/Test/dafny4/predicateReturnVariable.dfy
deleted file mode 100644
index 04316b90cbf..00000000000
--- a/Test/dafny4/predicateReturnVariable.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-predicate tautology1(x: int): (y: bool)
-  ensures x == 2 ==> y
-{
-  x >= 2
-}
\ No newline at end of file
diff --git a/Test/dafny4/regression-calc.dfy b/Test/dafny4/regression-calc.dfy
deleted file mode 100644
index a760757e36a..00000000000
--- a/Test/dafny4/regression-calc.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// There is a bug in Dafny that causes the error from `L` to be reported at
-// position 0 in this file, instead of on a curly brace.
-
-lemma L()
-  ensures false {
-    calc { true; }
-}
-
-// Empty calc statements work fine, though:
-
-lemma L'()
-  ensures false {
-    calc { }
-}
diff --git a/Test/dafny4/set-compr.dfy.expect b/Test/dafny4/set-compr.dfy.expect
deleted file mode 100644
index c4277280584..00000000000
--- a/Test/dafny4/set-compr.dfy.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-set-compr.dfy(6,13): Warning: /!\ No terms found to trigger on.
-set-compr.dfy(12,20): Warning: /!\ No terms found to trigger on.
-set-compr.dfy(11,21): Warning: /!\ No terms found to trigger on.
-set-compr.dfy(13,14): Warning: /!\ No terms found to trigger on.
-set-compr.dfy(20,19): Warning: /!\ No terms found to trigger on.
-set-compr.dfy(21,9): Warning: /!\ No terms found to trigger on.
-set-compr.dfy(28,9): Error: set comprehensions in non-ghost contexts must be compilable, but Dafny's heuristics can't figure out how to produce or compile a bounded set of values for 'o'
-set-compr.dfy(39,34): Error: a function definition is not allowed to depend on the set of allocated references
-set-compr.dfy(41,26): Error: a function definition is not allowed to depend on the set of allocated references
-set-compr.dfy(40,33): Error: a function definition is not allowed to depend on the set of allocated references
-set-compr.dfy(42,30): Error: a function definition is not allowed to depend on the set of allocated references
-set-compr.dfy(44,28): Error: a function definition is not allowed to depend on the set of allocated references
-set-compr.dfy(51,34): Error: a function definition is not allowed to depend on the set of allocated references
-set-compr.dfy(53,26): Error: a function definition is not allowed to depend on the set of allocated references
-set-compr.dfy(52,33): Error: a function definition is not allowed to depend on the set of allocated references
-set-compr.dfy(54,30): Error: a function definition is not allowed to depend on the set of allocated references
-set-compr.dfy(56,28): Error: a function definition is not allowed to depend on the set of allocated references
-set-compr.dfy(74,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-set-compr.dfy(88,8): Error: assignment to non-ghost variable is not allowed in this context, because the statement is in a ghost context; e.g., it may be guarded by a specification-only expression
-13 resolution/type errors detected in set-compr.dfy
diff --git a/Test/doofiles/Test1.dfy.expect b/Test/doofiles/Test1.dfy.expect
deleted file mode 100644
index 8526d344cb7..00000000000
--- a/Test/doofiles/Test1.dfy.expect
+++ /dev/null
@@ -1 +0,0 @@
-*** Error: file NoSuch.doo not found
diff --git a/Test/doofiles/Test2.dfy.expect b/Test/doofiles/Test2.dfy.expect
deleted file mode 100644
index ba4b83c7294..00000000000
--- a/Test/doofiles/Test2.dfy.expect
+++ /dev/null
@@ -1 +0,0 @@
-*** Error: BadDoo.doo: End of Central Directory record could not be found.
diff --git a/Test/doofiles/Test4.dfy b/Test/doofiles/Test4.dfy
deleted file mode 100644
index 9029c829b2a..00000000000
--- a/Test/doofiles/Test4.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %baredafny build -t:lib --use-basename-for-filename "%s" --output "%S/test2" > "%t"
-// RUN: %baredafny resolve --use-basename-for-filename "%s"  "%S/test2.doo" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-// XFAIL: *
-
-// Combining a file with a .doo of itself -- was a crash
-
-const c := 42
diff --git a/Test/examples/Simple_compiler/Compiler.dfy.expect b/Test/examples/Simple_compiler/Compiler.dfy.expect
deleted file mode 100644
index ca294422db7..00000000000
--- a/Test/examples/Simple_compiler/Compiler.dfy.expect
+++ /dev/null
@@ -1,32 +0,0 @@
-# Step 1: Parse
-cAST =
-  SimpleCompiler.CSharpAST.Prog
-
-# Step 2: Compile (using Dafny)
-translated = 
-  DafnyAST.Stmt.Seq(DafnyAST.Stmt.Assign(x, DafnyAST.Expr.Const(3)), DafnyAST.Stmt.Seq(DafnyAST.Stmt.Print(DafnyAST.Expr.Var(x)), DafnyAST.Stmt.Seq(DafnyAST.Stmt.Assign(y, DafnyAST.Expr.Op(DafnyAST.BinOp.Add, DafnyAST.Expr.Var(x), DafnyAST.Expr.Const(0))), DafnyAST.Stmt.Seq(DafnyAST.Stmt.Print(DafnyAST.Expr.Op(DafnyAST.BinOp.Add, DafnyAST.Expr.Var(y), DafnyAST.Expr.Const(1))), DafnyAST.Stmt.Skip))))
-interp(translated) = 
-  [3, 4]
-
-optimized = 
-  DafnyAST.Stmt.Seq(DafnyAST.Stmt.Assign(x, DafnyAST.Expr.Const(3)), DafnyAST.Stmt.Seq(DafnyAST.Stmt.Print(DafnyAST.Expr.Var(x)), DafnyAST.Stmt.Seq(DafnyAST.Stmt.Assign(y, DafnyAST.Expr.Var(x)), DafnyAST.Stmt.Print(DafnyAST.Expr.Op(DafnyAST.BinOp.Add, DafnyAST.Expr.Var(y), DafnyAST.Expr.Const(1))))))
-interp(optimized) = 
-  [3, 4]
-
-compiled = 
-  LinkedList.List.Cons(StackMachine.Instr.PopPrint, LinkedList.List.Cons(StackMachine.Instr.PopAdd, LinkedList.List.Cons(StackMachine.Instr.PushConst(1), LinkedList.List.Cons(StackMachine.Instr.PushVar(y), LinkedList.List.Cons(StackMachine.Instr.PopVar(y), LinkedList.List.Cons(StackMachine.Instr.PushVar(x), LinkedList.List.Cons(StackMachine.Instr.PopPrint, LinkedList.List.Cons(StackMachine.Instr.PushVar(x), LinkedList.List.Cons(StackMachine.Instr.PopVar(x), LinkedList.List.Cons(StackMachine.Instr.PushConst(3), LinkedList.List.Nil))))))))))
-interp(compiled) = 
-  [3, 4]
-
-
-# Step 3: Print (using C#)
-  PopPrint
-  PopAdd
-  PushConst(1)
-  PushVar(y)
-  PopVar(y)
-  PushVar(x)
-  PopPrint
-  PushVar(x)
-  PopVar(x)
-  PushConst(3)
diff --git a/Test/examples/Simple_compiler/Makefile b/Test/examples/Simple_compiler/Makefile
deleted file mode 100644
index 9b695cffd4d..00000000000
--- a/Test/examples/Simple_compiler/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Change this to `Dafny` to run with the system-wide Dafny
-DAFNY_COMPILER ?= dotnet run --project ../../../Source/DafnyDriver/DafnyDriver.csproj
-
-default: run
-
-# Step 1: Copy shared dependencies
-csharp_dir := csharp
-shared_deps := Simple.g4
-$(csharp_dir)/%: %
-	cp "$<" "$@"
-
-# Step 2: create `csharp/_dafny`
-dafny_csharp_dir := $(csharp_dir)/dafny
-$(dafny_csharp_dir):
-	mkdir "$@"
-
-# Step 2: compile Dafny code, putting C# output in `csharp/dafny`
-dafny_files := $(wildcard *.dfy)
-$(dafny_csharp_dir)/%.cs: %.dfy | $(dafny_csharp_dir)
-	$(DAFNY_COMPILER) -spillTargetCode:3 -compile:0 "-out:$@" "$<"
-
-# Step 3: compile resulting C# project
-csproj := SimpleCompiler.csproj
-csharp_dll := $(csharp_dir)/bin/Debug/net6.0/SimpleCompiler.dll
-csharp_files :=  $(wildcard $(csharp_dir)/*)
-csharp_shared_deps := $(patsubst %,$(csharp_dir)/%,$(shared_deps))
-csharp_dafny_deps := $(patsubst %.dfy,$(dafny_csharp_dir)/%.cs,$(dafny_files))
-csharp_deps := $(csharp_shared_deps) $(csharp_dafny_deps) $(csharp_files)
-build: $(csharp_dll)
-$(csharp_dll): $(csharp_deps)
-	dotnet build $(csharp_dir)/$(csproj)
-
-# Step 4: run example
-input := example_input.calc
-run: $(input) $(csharp_deps)
-	dotnet run --project $(csharp_dir)/$(csproj) -- $<
-
-%.dfy.expect: %.dfy $(csharp_copied_deps)
-	$(MAKE) --quiet run > $@
-
-clean:
-	rm -fr $(dafny_csharp_dir) $(csharp_shared_deps) \
-		$(csharp_dir)/bin $(csharp_dir)/obj Compiler.dfy.expect
diff --git a/Test/examples/Simple_compiler/csharp/Main.cs b/Test/examples/Simple_compiler/csharp/Main.cs
deleted file mode 100644
index 71eb821ac78..00000000000
--- a/Test/examples/Simple_compiler/csharp/Main.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using Antlr4.Runtime;
-
-// This is the C# frontend of a compiler for a simple arithmetic language.  The
-// backend is written in Dafny, except for the final IO stage (printing programs
-// to stdout).
-
-namespace SimpleCompiler {
-
-  // First we define a class hierarchy that models the abstract syntax trees of
-  // our programs (see the Dafny side for more info on the language):
-
-  namespace CSharpAST {
-    public class AST { } // ANTLR root
-    public class Expr : AST { }
-
-    public class Const : Expr {
-      public int n;
-
-      public Const(int n) {
-        this.n = n;
-      }
-    }
-
-    public class Var : Expr {
-      public string v;
-
-      public Var(string v) {
-        this.v = v;
-      }
-    }
-
-    public class Op : Expr {
-      public enum BinOp { Add, Sub }
-
-      public BinOp op;
-      public Expr e1, e2;
-
-      public Op(BinOp op, Expr e1, Expr e2) {
-        this.e1 = e1;
-        this.e2 = e2;
-      }
-    }
-
-    public class Stmt : AST { }
-
-    public class Print : Stmt {
-      public Expr e;
-
-      public Print(Expr e) {
-        this.e = e;
-      }
-    }
-
-    public class Assign : Stmt {
-      public string v;
-      public Expr e;
-
-      public Assign(string v, Expr e) {
-        this.v = v;
-        this.e = e;
-      }
-    }
-
-    public class Prog : AST {
-      public List<Stmt> s;
-
-      public Prog(List<Stmt> s) {
-        this.s = s;
-      }
-    }
-  }
-
-  // Then we define a visitor to translate ANTLR's output into an AST:
-  namespace AntlrVisitor {
-    using CSharpAST;
-
-    public class SimpleVisitor : SimpleCompiler.SimpleBaseVisitor<AST> {
-      public override AST VisitProg(SimpleParser.ProgContext context) {
-        return new Prog(context._s.Select((s, _) => (Stmt)Visit(s)).ToList());
-      }
-
-      public override AST VisitPrint(SimpleParser.PrintContext context) {
-        return new Print((Expr)Visit(context.e));
-      }
-
-      public override AST VisitAssign(SimpleParser.AssignContext context) {
-        return new Assign(context.v.Text, (Expr)Visit(context.e));
-      }
-
-      public override AST VisitAdd(SimpleParser.AddContext context) {
-        return new Op(Op.BinOp.Add, (Expr)Visit(context.l), (Expr)Visit(context.r));
-      }
-
-      public override AST VisitSub(SimpleParser.SubContext context) {
-        return new Op(Op.BinOp.Sub, (Expr)Visit(context.l), (Expr)Visit(context.r));
-      }
-
-      public override AST VisitConst(SimpleParser.ConstContext context) {
-        return new Const(int.Parse(context.c.Text));
-      }
-
-      public override AST VisitVar(SimpleParser.VarContext context) {
-        return new Var(context.v.Text);
-      }
-    }
-  }
-
-  // Then we define any C# methods that Dafny may need:
-
-  namespace CSharpUtils {
-    public partial class StringUtils {
-      public static Dafny.ISequence<char> StringAsDafnyString(String s) {
-        return Dafny.Sequence<char>.FromString(s);
-      }
-    }
-
-    public partial class ListUtils {
-      public static B FoldR<A, B>(Func<A, B, B> f, B b0, List<A> lA) {
-        for (int i = lA.Count - 1; i >= 0; i--) {
-          b0 = f(lA[i], b0);
-        }
-        return b0;
-      }
-    }
-  }
-
-  // Finally we define the driver that reads the input file, parses it using
-  // ANTLR, compiles it using Dafny, and prints the result to stdout:
-
-  class Program {
-    private static CSharpAST.Prog parse(string fname) {
-      using (var fstream = new StreamReader(fname)) {
-        var lexer = new SimpleLexer(new AntlrInputStream(fstream));
-        var parser = new SimpleParser(new CommonTokenStream(lexer));
-        var visitor = new AntlrVisitor.SimpleVisitor();
-        return (CSharpAST.Prog)visitor.Visit(parser.prog());
-      }
-    }
-
-    public static void Main(string[] args) {
-      Console.Out.NewLine = "\n";
-
-      Console.WriteLine("# Step 1: Parse");
-      var ast = parse(args[0]);
-      Console.WriteLine($"cAST =\n  {ast}");
-
-      Console.WriteLine("\n# Step 2: Compile (using Dafny)");
-      var pp = SimpleCompiler.DafnyCompiler.CompileAndExport(ast);
-
-      Console.WriteLine("\n# Step 3: Print (using C#)");
-      pp.ForEach(s => Console.WriteLine($"  {s}"));
-    }
-  }
-}
diff --git a/Test/examples/induction-principle-code/AST.dfy b/Test/examples/induction-principle-code/AST.dfy
deleted file mode 100644
index 6a5b4124866..00000000000
--- a/Test/examples/induction-principle-code/AST.dfy
+++ /dev/null
@@ -1,90 +0,0 @@
-// RUN: %baredafny verify %args "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "Utils.dfy"
-
-module AST {
-  import opened Utils
-
-  datatype BinOp =
-    | Add
-    | Sub
-    | Mul
-  
-  datatype Expr_Raw =
-    | Var(name: string)
-    | Literal(n: int)
-    | Bind(bvars: seq<string>, bvals: seq<Expr_Raw>, body: Expr_Raw)
-    | Assign(avars: seq<string>, avals: seq<Expr_Raw>)
-    | If(cond: Expr_Raw, thn: Expr_Raw, els: Expr_Raw)
-    | Op(op: BinOp, oe1: Expr_Raw, oe2: Expr_Raw)
-    | Seq(es: seq<Expr_Raw>)
-  {
-    function Depth() : nat
-    {
-      1 + match this {
-        case Var(_) =>
-          0
-        case Literal(lit) =>
-          0
-        case Bind(bvars, bvals, body) =>
-          var m := MaxF(var f := (e: Expr_Raw) requires e in bvals => e.Depth(); f, bvals, 0);
-          Max(m, body.Depth())
-        case Assign(avars, avals) =>
-          MaxF(var f := (e: Expr_Raw) requires e in avals => e.Depth(); f, avals, 0)
-        case If(cond, thn, els) =>
-          Max(cond.Depth(), Max(thn.Depth(), els.Depth()))
-        case Op(op, e1, e2) =>
-          Max(e1.Depth(), e2.Depth())
-        case Seq(es: seq<Expr_Raw>) =>
-          MaxF(var f := (e: Expr_Raw) requires e in es => e.Depth(); f, es, 0)
-      }
-    }
-
-    static predicate All(e: Expr_Raw, p: (Expr_Raw) -> bool)
-    {
-      p(e) &&
-      (match e
-         case Var(name) => true
-         case Literal(n) => true
-         case Bind(bvars, bvals, body) =>
-          && (forall e | e in bvals :: e.All(e, p))
-          && All(body, p)
-         case Assign(avars, avals) =>
-          && forall e | e in avals :: e.All(e, p)
-         case If(cond, thn, els) =>
-          All(cond, p) && All(thn, p) && All(els, p)
-         case Op(op, oe1, oe2) =>
-          All(oe1, p) && All(oe2, p)
-         case Seq(es) =>
-          && forall e | e in es :: e.All(e, p)
-      )
-    }
-
-    static predicate All_Es(es: seq<Expr_Raw>, p: (Expr_Raw) -> bool)
-      // Rem.: we pay attention of not making ``All_Es`` and ``All`` mutually
-      // recursive, otherwise it causes problems in the proofs.
-    {
-      forall e | e in es :: e.All(e, p)
-    }
-
-    static ghost predicate WellFormed_Single(e: Expr_Raw)
-    {
-      match e
-        case Var(name) => true
-        case Literal(n) => true
-        case Bind(bvars, bvals, body) => |bvars| == |bvals|
-        case Assign(avars, avals) => |avars| == |avals|
-        case If(cond, thn, els) => true
-        case Op(op, oe1, oe2) => true
-        case Seq(es) => true
-    }
-
-    ghost predicate WellFormed()
-    {
-      All(this, WellFormed_Single)
-    }
-  }
-
-  type Expr = e:Expr_Raw | e.WellFormed() witness Var("x")
-}
diff --git a/Test/examples/induction-principle-code/EliminateMulZero.dfy.expect b/Test/examples/induction-principle-code/EliminateMulZero.dfy.expect
deleted file mode 100644
index 023b0990012..00000000000
--- a/Test/examples/induction-principle-code/EliminateMulZero.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 33 verified, 0 errors
diff --git a/Test/examples/induction-principle-code/Equiv.dfy.expect b/Test/examples/induction-principle-code/Equiv.dfy.expect
deleted file mode 100644
index 8ba5c0236f4..00000000000
--- a/Test/examples/induction-principle-code/Equiv.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 34 verified, 0 errors
diff --git a/Test/examples/induction-principle-code/Induction.dfy b/Test/examples/induction-principle-code/Induction.dfy
deleted file mode 100644
index 630e4b73c58..00000000000
--- a/Test/examples/induction-principle-code/Induction.dfy
+++ /dev/null
@@ -1,336 +0,0 @@
-// RUN: %baredafny verify %args "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "Utils.dfy"
-include "AST.dfy"
-include "Interp.dfy"
-
-abstract module Induction {
-  import opened Utils
-  import opened AST
-
-  // A state
-  type S(!new)
-
-  // A value
-  type V(!new)
-
-  // A sequence of values
-  type VS(!new)
-
-  ghost const Zero: V
-
-  // ``P`` is the property of interest that we want to prove about the interpreter. It is often
-  // possible to distinguish two cases in the proof: the case corresponding to a successful
-  // execution of the interpreter, and the case corresponding to a failing execution. For instance,
-  // let's say you want to prove that evaluating a pure expression leaves the state unchanged:
-  // the property is trivially true in case the interpreter fails its execution. For this reason,
-  // we decompose ``P`` into ``P_Fail`` (failed execution) and ``P_Succ`` (successful execution,
-  // which also takes as inputs the state and value resulting from the execution).
-  //
-  // One important property to enforce is that:
-  // `P(st, e) <==> P_Fail(st, e) || exists st', v :: P_Succ(st, e, st', v)`
-  // This is enforced by: ``P_Fail_Sound``, ``P_Succ_Sound`` and ``P_Step``.
-  ghost predicate P(st: S, e: Expr)
-  ghost predicate P_Succ(st: S, e: Expr, st': S, v: V) // Success
-  ghost predicate P_Fail(st: S, e: Expr) // Failure
-
-  // ``Pes`` is the property of interest over sequences of expressions.
-  ghost predicate Pes(st: S, es: seq<Expr>)
-  ghost predicate Pes_Succ(st: S, es: seq<Expr>, st': S, vs: VS) // Success
-  ghost predicate Pes_Fail(st: S, es: seq<Expr>) // Failure
-
-  ghost function AppendValue(v: V, vs: VS): VS // Returns: [v] + vs
-
-  // Empty sequence of values
-  ghost const NilVS: VS
-
-  ghost function VS_Last(vs: VS): V
-    requires vs != NilVS
-
-  ghost predicate UpdateState_Pre(st: S, vars: seq<string>, argvs: VS)
-
-  // For the ``Assign`` case
-  ghost function AssignState(st: S, vars: seq<string>, vals: VS): (st':S)
-    requires UpdateState_Pre(st, vars, vals)
-
-  // For the ``Bind`` case
-  ghost function BindStartScope(st: S, vars: seq<string>, vals: VS): (st':S)
-    requires UpdateState_Pre(st, vars, vals)
-
-  // For ``Bind``: used to remove from the context the variables introduced by the bind, while
-  // preserving the mutation. `st0` is the state just before we introduce the let-bounded variables,
-  // `st1 is the state resulting from evaluating the body.
-  ghost function BindEndScope(st0: S, st: S, vars: seq<string>): (st':S)
-
-  ghost function P_Step(st: S, e: Expr): (res: (S, V))
-    requires P(st, e)
-    requires !P_Fail(st, e)
-    ensures P_Succ(st, e, res.0, res.1)
-
-  ghost function Pes_Step(st: S, es: seq<Expr>): (res: (S, VS))
-    requires Pes(st, es)
-    requires !Pes_Fail(st, es)
-    ensures Pes_Succ(st, es, res.0, res.1)
-
-  lemma P_Fail_Sound(st: S, e: Expr)
-    requires P_Fail(st, e)
-    ensures P(st, e)
-
-  lemma P_Succ_Sound(st: S, e: Expr, st': S, v: V)
-    requires P_Succ(st, e, st', v)
-    ensures P(st, e)
-
-  lemma Pes_Fail_Sound(st: S, es: seq<Expr>)
-    requires Pes_Fail(st, es)
-    ensures Pes(st, es)
-
-  lemma Pes_Succ_Sound(st: S, es: seq<Expr>, st': S, vs: VS)
-    requires Pes_Succ(st, es, st', vs)
-    ensures Pes(st, es)
-
-  lemma InductVar(st: S, e: Expr)
-    requires e.Var?
-    requires !P_Fail(st, e)
-    ensures P(st, e)
-
-  lemma InductLiteral(st: S, e: Expr)
-    requires e.Literal?
-    requires !P_Fail(st, e)
-    ensures P(st, e)
-
-  lemma InductIf_Fail(st: S, e: Expr, cond: Expr, thn: Expr, els: Expr)
-    requires e.If? && e.cond == cond && e.thn == thn && e.els == els
-    requires !P_Fail(st, e)
-    requires P(st, cond)
-    ensures !P_Fail(st, cond)
-
-  lemma InductIf_Succ(st: S, e: Expr, cond: Expr, thn: Expr, els: Expr, st_cond: S, condv: V)
-    requires e.If? && e.cond == cond && e.thn == thn && e.els == els
-    requires !P_Fail(st, e)
-    requires P_Succ(st, cond, st_cond, condv)
-    requires P(st_cond, thn)
-    requires P(st_cond, els)
-    ensures P(st, e)
-
-  lemma InductOp_Fail(st: S, e: Expr, op: BinOp, e1: Expr, e2: Expr)
-    requires e.Op? && e.op == op && e.oe1 == e1 && e.oe2 == e2
-    requires !P_Fail(st, e)
-    ensures !P_Fail(st, e1)
-    ensures forall st1, v1 | P_Succ(st, e1, st1, v1) :: !P_Fail(st1, e2)
-
-  lemma InductOp_Succ(st: S, e: Expr, op: BinOp, e1: Expr, e2: Expr, st1: S, v1: V)
-    requires e.Op? && e.op == op && e.oe1 == e1 && e.oe2 == e2
-    requires !P_Fail(st, e)
-    requires P_Succ(st, e1, st1, v1)
-    requires P(st1, e2)
-    ensures P(st, e)
-
-  lemma InductSeq_Fail(st: S, e: Expr, es: seq<Expr>)
-    requires e.Seq? && e.es == es
-    requires !P_Fail(st, e)
-    ensures !Pes_Fail(st, es)
-
-  lemma InductSeq_Succ(st: S, e: Expr, es: seq<Expr>, st1: S, vs: VS)
-    requires e.Seq? && e.es == es
-    requires !P_Fail(st, e)
-    requires Pes_Succ(st, es, st1, vs)
-    ensures P(st, e)
-
-  lemma InductAssign_Fail(st: S, e: Expr, avars: seq<string>, avals: seq<Expr>)
-    requires e.Assign? && e.avars == avars && e.avals == avals
-    requires !P_Fail(st, e)
-    requires Pes(st, avals)
-    ensures !Pes_Fail(st, avals)
-    ensures forall st1, vs | Pes_Succ(st, avals, st1, vs) :: UpdateState_Pre(st1, avars, vs)
-
-  lemma InductAssign_Succ(
-    st: S, e: Expr, avars: seq<string>, avals: seq<Expr>, st1: S, vs: VS, st2: S)
-    requires e.Assign? && e.avars == avars && e.avals == avals
-    requires !P_Fail(st, e)
-    requires Pes_Succ(st, avals, st1, vs)
-    requires UpdateState_Pre(st1, avars, vs)
-    requires st2 == AssignState(st1, avars, vs)
-    // This post is not necessary: what matters is that ``AssignState`` appears somewhere,
-    // but it may help Z3.
-    ensures P_Succ(st, e, st2, Zero)
-    ensures P(st, e)
-
-  lemma InductBind_Fail(st: S, e: Expr, bvars: seq<string>, bvals: seq<Expr>, body: Expr)
-    requires e.Bind? && e.bvars == bvars && e.bvals == bvals && e.body == body
-    requires !P_Fail(st, e)
-    requires Pes(st, bvals)
-    ensures !Pes_Fail(st, bvals)
-    ensures
-      forall st1, vs | Pes_Succ(st, bvals, st1, vs) ::
-      && UpdateState_Pre(st1, bvars, vs)
-      && !P_Fail(BindStartScope(st1, bvars, vs), body)
-
-  lemma InductBind_Succ(
-    st: S, e: Expr, bvars: seq<string>, bvals: seq<Expr>, body: Expr,
-    st1: S, bvarvs: VS, st2: S, st3: S, v: V, st4: S)
-    requires e.Bind? && e.bvars == bvars && e.bvals == bvals && e.body == body
-    requires !P_Fail(st, e)
-    requires Pes_Succ(st, bvals, st1, bvarvs)
-    requires UpdateState_Pre(st1, bvars, bvarvs)
-    requires st2 == BindStartScope(st1, bvars, bvarvs)
-    requires P_Succ(st2, body, st3, v)
-    requires st4 == BindEndScope(st1, st3, bvars) // ``StateBindEndScope`` may have a postcondition, so it's good to have it
-    ensures P_Succ(st, e, st4, v)
-
-  lemma InductExprs_Nil(st: S)
-    ensures !Pes_Fail(st, []) ==> Pes_Succ(st, [], st, NilVS)
-
-  lemma InductExprs_Cons(st: S, e: Expr, es: seq<Expr>)
-    ensures P_Fail(st, e) ==> Pes_Fail(st, [e] + es)
-    ensures !P_Fail(st, e) ==> forall st1, v :: P_Succ(st, e, st1, v) && Pes_Fail(st1, es) ==> Pes_Fail(st, [e] + es)
-    ensures forall st1, v, st2, vs :: P_Succ(st, e, st1, v) && Pes_Succ(st1, es, st2, vs) ==> Pes_Succ(st, [e] + es, st2, AppendValue(v, vs))
-
-  //
-  // Lemmas
-  //
-
-  lemma P_Satisfied(st: S, e: Expr)
-    ensures P(st, e)
-    decreases e, 3
-  {
-    if P_Fail(st, e) {
-      P_Fail_Sound(st, e);
-    }
-    else {
-      P_Satisfied_Succ(st, e);
-    }
-  }
-
-  lemma P_Satisfied_Succ(st: S, e: Expr)
-    requires !P_Fail(st, e)
-    ensures P(st, e)
-    decreases e, 2
-  {
-    match e {
-      case Var(_) =>
-        InductVar(st, e);
-
-      case Literal(_) =>
-        InductLiteral(st, e);
-
-      case Op(op, e1, e2) =>
-        // Recursion
-        P_Satisfied(st, e1);
-
-        assert !P_Fail(st, e1) by { InductOp_Fail(st, e, op, e1, e2); }
-        var (st1, v1) := P_Step(st, e1);
-
-        // Recursion
-        P_Satisfied(st1, e2);
-
-        assert !P_Fail(st1, e2) by { InductOp_Fail(st, e, op, e1, e2); }
-        var (st2, v2) := P_Step(st1, e2);
-
-        InductOp_Succ(st, e, op, e1, e2, st1, v1);
-
-      case Seq(es) =>
-        // Recursion
-        Pes_Satisfied(st, es);
-
-        assert !Pes_Fail(st, es) by { InductSeq_Fail(st, e, es); }
-        var (st1, vs) := Pes_Step(st, es);
-        
-        InductSeq_Succ(st, e, es, st1, vs);
-
-      case If(cond, thn, els) =>
-        // Recursion
-        P_Satisfied(st, cond);
-
-        // Evaluate the condition
-        InductIf_Fail(st, e, cond, thn, els);
-        assert !P_Fail(st, cond);
-        var (st_cond, condv) := P_Step(st, cond);
-
-        P_Satisfied(st_cond, thn); // Recursion
-        P_Satisfied(st_cond, els); // Recursion
-
-        InductIf_Succ(st, e, cond, thn, els, st_cond, condv);
-
-      case Assign(avars, avals) =>
-        // Recursion
-        Pes_Satisfied(st, avals);
-
-        assert !Pes_Fail(st, avals) by { InductAssign_Fail(st, e, avars, avals); }
-        var (st1, vs) := Pes_Step(st, avals);
-
-        assert UpdateState_Pre(st1, avars, vs) by { InductAssign_Fail(st, e, avars, avals); }
-        var st2 := AssignState(st1, avars, vs);
-        InductAssign_Succ(st, e, avars, avals, st1, vs, st2);
-
-      case Bind(bvars, bvals, body) =>
-        Pes_Satisfied(st, bvals); // Recursion
-        assert !Pes_Fail(st, bvals) by { InductBind_Fail(st, e, bvars, bvals, body); }
-        var (st1, bvarvs) := Pes_Step(st, bvals);
-
-        assert UpdateState_Pre(st1, bvars, bvarvs) by { InductBind_Fail(st, e, bvars, bvals, body); }
-        var st2 := BindStartScope(st1, bvars, bvarvs);
-        P_Satisfied(st2, body); // Recursion
-        assert !P_Fail(st2, body) by { InductBind_Fail(st, e, bvars, bvals, body); }
-
-        var (st3, v) := P_Step(st2, body);
-        var st4 := BindEndScope(st1, st3, bvars);
-
-        InductBind_Succ(st, e, bvars, bvals, body, st1, bvarvs, st2, st3, v, st4);
-        P_Succ_Sound(st, e, st4, v);
-    }
-  }
-
-  lemma Pes_Satisfied(st: S, es: seq<Expr>)
-    ensures Pes(st, es)
-    decreases es, 1
-  {
-    if Pes_Fail(st, es) {
-      Pes_Fail_Sound(st, es);
-    }
-    else {
-      Pes_Satisfied_Succ(st, es);
-    }
-  }
-
-  lemma Pes_Satisfied_Succ(st: S, es: seq<Expr>)
-    requires !Pes_Fail(st, es)
-    ensures Pes(st, es)
-    decreases es, 0
-  {
-    if es == [] {
-      InductExprs_Nil(st);
-      assert Pes_Succ(st, [], st, NilVS);
-      Pes_Succ_Sound(st, [], st, NilVS);
-    }
-    else {
-      var e := es[0];
-      var es' := es[1..];
-      assert [e] + es' == es;
-
-      P_Satisfied(st, e); // Recursion
-
-      if P_Fail(st, e) {
-        InductExprs_Cons(st, e, es');
-        assert Pes_Fail(st, [e] + es');
-        Pes_Fail_Sound(st, [e] + es');
-      }
-      else {
-        var (st1, v) := P_Step(st, e);
-        Pes_Satisfied(st1, es'); // Recursion
-
-        if Pes_Fail(st1, es') {
-          InductExprs_Cons(st, e, es');
-          assert Pes_Fail(st, [e] + es');
-          Pes_Fail_Sound(st, [e] + es');
-        }
-        else {
-          var (st2, vs) := Pes_Step(st1, es');
-          InductExprs_Cons(st, e, es');
-          assert Pes_Succ(st, [e] + es', st2, AppendValue(v, vs));
-          Pes_Succ_Sound(st, [e] + es', st2, AppendValue(v, vs));
-        }
-      }
-    }
-  }
-}
diff --git a/Test/examples/parser_combinators.dfy.expect b/Test/examples/parser_combinators.dfy.expect
deleted file mode 100644
index 463e63c2939..00000000000
--- a/Test/examples/parser_combinators.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-parser_combinators.dfy(38,27): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
-parser_combinators.dfy(39,33): Error: cannot prove termination; try supplying a decreases clause
-
-Dafny program verifier finished with 8 verified, 2 errors
-"((()))": 3 nested parentheses
-"((()))no": no valid parse
-"((())": no valid parse
diff --git a/Test/exceptions/ParseErrors.dfy b/Test/exceptions/ParseErrors.dfy
deleted file mode 100644
index 1d433774461..00000000000
--- a/Test/exceptions/ParseErrors.dfy
+++ /dev/null
@@ -1,20 +0,0 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-include "./NatOutcome.dfy"
-include "./VoidOutcome.dfy"
-
-method MultiAssignment(r1: NatOutcome, r2: NatOutcome) returns (res: NatOutcome) {
-    var a0, b0 := r1, r2; // <-- multi-assignment allowed
-    var a1, b1 :- r1, r2; // <-- multi-assignment allowed
-    var a2, b2 :- r2; // <-- mismatch in number
-    var a3, b3 :- 100, 101; // <-- mismatch in type
-    return a0;
-}
-
-method MultiRHS(r1: VoidOutcome, r2: nat) returns (res: VoidOutcome) {
-    :- r1;      // one RHS is ok
-    :- r1, r2;  // more than one RHS is not ok, without a LHS
-    var t1 :- r1, r2; // OK
-    var t2: nat :- r1, r2; // OK
-    return r1;
-}
diff --git a/Test/exceptions/VerificationErrors.dfy b/Test/exceptions/VerificationErrors.dfy
deleted file mode 100644
index a6db6261f7c..00000000000
--- a/Test/exceptions/VerificationErrors.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %exits-with 4 %dafny "%s" /rprint:"%t.rprint" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "./NatOutcome.dfy"
-include "./VoidOutcome.dfy"
-
-method CheckThatVerifierRunsInsideDesugaredExprs_Nat(r1: NatOutcome, r2: NatOutcome) returns (res: NatOutcome) {
-    var a :- MakeNatSuccess(assert r1 == r2; 12);
-    res := MakeNatSuccess(a);
-}
-
-method CheckThatVerifierRunsInsideDesugaredExprs_Void(r1: VoidOutcome, r2: VoidOutcome) returns (res: VoidOutcome) {
-    var x := assert 2 + 2 == 4; 8;
-    assert x == 8;
-    :- (assert r1 == r2; r1);
-    res := r1;
-}
diff --git a/Test/exceptions/VerificationErrors.dfy.expect b/Test/exceptions/VerificationErrors.dfy.expect
deleted file mode 100644
index 7337d038d2d..00000000000
--- a/Test/exceptions/VerificationErrors.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-VerificationErrors.dfy(8,38): Error: assertion could not be proved
-VerificationErrors.dfy(15,18): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/expectations/ExpectAndExceptions.dfy b/Test/expectations/ExpectAndExceptions.dfy
deleted file mode 100644
index aaa8d8024ec..00000000000
--- a/Test/expectations/ExpectAndExceptions.dfy
+++ /dev/null
@@ -1,22 +0,0 @@
-// RUN: ! %dafny /compile:3 /compileTarget:cs /unicodeChar:0 "%s" > "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:go /unicodeChar:0 "%s" >> "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:java /unicodeChar:0 "%s" >> "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:js /unicodeChar:0 "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "../exceptions/NatOutcomeDt.dfy"
-include "../exceptions/GenericOutcomeDt.dfy"
-
-method TestAssignOrHalt() {
-    var stmt1: nat :- expect NatSuccess(42);
-    // Regression test for when assign-or-halt was also calling PropagateFailure, which led
-    // to the error "type variable 'U' in the function call to 'PropagateFailure' could not be determined"
-    // (because of the lack of type constraints).
-    var stmt2: string :- expect Success("Hooray!");
-
-    var stmt3: nat :- expect NatFailure("Kaboom!");
-}
-
-method Main() {
-  TestAssignOrHalt();
-}
\ No newline at end of file
diff --git a/Test/expectations/ExpectAndExceptions.dfy.expect b/Test/expectations/ExpectAndExceptions.dfy.expect
deleted file mode 100644
index 9ff915cb45c..00000000000
--- a/Test/expectations/ExpectAndExceptions.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Dafny program verifier finished with 2 verified, 0 errors
-[Program halted] ExpectAndExceptions.dfy(17,19): NatOutcome.NatFailure(Kaboom!)
-
-Dafny program verifier finished with 2 verified, 0 errors
-[Program halted] ExpectAndExceptions.dfy(17,19): NatOutcome.NatFailure(Kaboom!)
-
-Dafny program verifier finished with 2 verified, 0 errors
-[Program halted] ExpectAndExceptions.dfy(17,19): NatOutcome.NatFailure(Kaboom!)
-
-Dafny program verifier finished with 2 verified, 0 errors
-[Program halted] ExpectAndExceptions.dfy(17,19): NatOutcome.NatFailure(Kaboom!)
diff --git a/Test/expectations/ExpectWithMessage.dfy b/Test/expectations/ExpectWithMessage.dfy
deleted file mode 100644
index afe2e1806b4..00000000000
--- a/Test/expectations/ExpectWithMessage.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: ! %dafny /compile:3 /compileTarget:cs "%s" > "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:go "%s" >> "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:java "%s" >> "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:js "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main() {
-  expect 2 + 2 == 5, "Down with Doublethink!";
-}
diff --git a/Test/expectations/ExpectWithNonStringMessage.dfy b/Test/expectations/ExpectWithNonStringMessage.dfy
deleted file mode 100644
index c2298beff15..00000000000
--- a/Test/expectations/ExpectWithNonStringMessage.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %dafny /compile:0 /unicodeChar:0 "%s" > "%t"
-// RUN: ! %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:cs "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:go "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:java "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:js "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:py "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype Option<T> = None | Some(get: T)
-
-method Main() {
-  var x := Some("where over the rainbow");
-  expect x.None?, x;
-}
diff --git a/Test/expectations/VerificationErrors.dfy b/Test/expectations/VerificationErrors.dfy
deleted file mode 100644
index 19e1e67d557..00000000000
--- a/Test/expectations/VerificationErrors.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 4 %dafny "%s" /rprint:"%t.rprint" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype Option<T> = None | Some(get: T)
-
-method CheckThatMessageIsVerifiedAssumingExpectFails(x: Option<string>) {
-    expect x.None?, x.get;
-    expect x.Some?, x.get; // error: destructor 'get' can only be applied to datatype values constructed by 'Some'
-}
diff --git a/Test/exports/ExportRefinement.dfy.expect b/Test/exports/ExportRefinement.dfy.expect
deleted file mode 100644
index 4c28d2a1aa0..00000000000
--- a/Test/exports/ExportRefinement.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Dafny program verifier finished with 2 verified, 0 errors
-A2
-B2.m()
-A2
-A2.C.m
diff --git a/Test/exports/ExportVerify.dfy.expect b/Test/exports/ExportVerify.dfy.expect
deleted file mode 100644
index 320992fc4c8..00000000000
--- a/Test/exports/ExportVerify.dfy.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-ExportVerify.dfy(40,13): Error: variable 'd', which is subject to definite-assignment rules, might be uninitialized here
-ExportVerify.dfy(44,4): Error: variable 'd', which is subject to definite-assignment rules, might be uninitialized here
-ExportVerify.dfy(52,19): Error: assertion could not be proved
-ExportVerify.dfy(54,21): Error: assertion could not be proved
-ExportVerify.dfy(55,20): Error: assertion could not be proved
-ExportVerify.dfy(56,15): Error: assertion could not be proved
-ExportVerify.dfy(75,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 1 verified, 7 errors
diff --git a/Test/exports/IncludeSkipTranslate.dfy b/Test/exports/IncludeSkipTranslate.dfy
deleted file mode 100644
index 71c90484ee4..00000000000
--- a/Test/exports/IncludeSkipTranslate.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /env:0 /dprint:"%t.dfy" /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "ExportRefinement.dfy"
-
-module Z {
-  lemma Test()
-  ensures 1 < 2 // this should be the only verification condition produced, plus one top-level one from ExportRefinement
-  {
-  }
-}
diff --git a/Test/exports/OpaqueFunctions.dfy b/Test/exports/OpaqueFunctions.dfy
deleted file mode 100644
index a99d9bbb36f..00000000000
--- a/Test/exports/OpaqueFunctions.dfy
+++ /dev/null
@@ -1,70 +0,0 @@
-// RUN: %exits-with 4 %dafny /env:0 /dprint:"%t.dfy" /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  export A provides f
-  export B reveals f
-  ghost function f() : nat { 7 }
-
-}
-
-module B {
-  import A = A`A
-
-  ghost function g() : nat { A.f() }
-
-  ghost function h() : nat
-  ensures h() == 7
-  { g() } // error
-
-}
-
-module C {
-  import A = A`B
-
-  ghost function g() : nat { A.f() }
-
-  ghost function h() : nat
-  ensures h() == 7
-  { g() }
-
-}
-
-module D {
-  import A = A`A
-  ghost function g() : nat { A.f() }
-}
-
-module E {
-  import D
-  import A`B
-
-  ghost function h() : nat
-  ensures h() == 7
-  { D.g() } // revealed via A`B
-
-}
-
-module AA {
-  export Spec provides f
-  export Body reveals f
-  ghost function {:opaque} f(): int { 0 }
-}
-
-module BB {
-  import A = AA`Spec
-  lemma Test()
-  ensures A.f() == 0 // fails
-  { }
-}
-
-module CC {
-  import A= AA`Body
-  lemma Test1()
-  ensures A.f() == 0 // fails
-  { }
-
-  lemma Test2()
-  ensures A.f() == 0
-  { reveal A.f(); }
-}
diff --git a/Test/exports/OpaqueFunctions.dfy.expect b/Test/exports/OpaqueFunctions.dfy.expect
deleted file mode 100644
index 2748ea237d8..00000000000
--- a/Test/exports/OpaqueFunctions.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-OpaqueFunctions.dfy(16,17): Error: a postcondition could not be proved on this return path
-OpaqueFunctions.dfy(17,14): Related location: this is the postcondition that could not be proved
-OpaqueFunctions.dfy(58,2): Error: a postcondition could not be proved on this return path
-OpaqueFunctions.dfy(57,16): Related location: this is the postcondition that could not be proved
-OpaqueFunctions.dfy(65,2): Error: a postcondition could not be proved on this return path
-OpaqueFunctions.dfy(64,16): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 4 verified, 3 errors
diff --git a/Test/ghost/Aliasing.dfy b/Test/ghost/Aliasing.dfy
deleted file mode 100644
index 9d726720656..00000000000
--- a/Test/ghost/Aliasing.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0 /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Test1(a: array<(int, int)>, b: array<(int, int, ghost int)>) {
-  assert a as object != b;
-}
-
-method Test2(a: array<(int, int)>, b: array<(int, ghost int)>) {
-  assert a as object != b;
-}
diff --git a/Test/ghost/DisallowedGhost1.dfy b/Test/ghost/DisallowedGhost1.dfy
deleted file mode 100644
index 9a8570d40cd..00000000000
--- a/Test/ghost/DisallowedGhost1.dfy
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /dprint:- "%s" /env:0 > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Test1()
-{
-  var first := 0;
-  var t := (ghost first:=123, 1:=234); // error
-}
-
-method Test2()
-{
-  var t := (1:=123, 2:=234); // error
-}
-
-method Test3()
-{
-  var t := (1:=123, 1:=234); // error
-}
diff --git a/Test/ghost/DisallowedGhost2.dfy b/Test/ghost/DisallowedGhost2.dfy
deleted file mode 100644
index 91879743f85..00000000000
--- a/Test/ghost/DisallowedGhost2.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /dprint:- "%s" /env:0 > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Test()
-{
-  var (ghost x) := 123; // syntax error
-}
diff --git a/Test/ghost/Resolution.dfy b/Test/ghost/Resolution.dfy
deleted file mode 100644
index 7e15acf92cd..00000000000
--- a/Test/ghost/Resolution.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method M<T(==)>(a: T)
-
-method P() {
-  var x: (int, int, ghost int);
-  M(x); // Disallowed. It's not possible to compile an equality function that also checks ghost components.
-}
diff --git a/Test/ghost/Signature.dfy b/Test/ghost/Signature.dfy
deleted file mode 100644
index 4d361de3d67..00000000000
--- a/Test/ghost/Signature.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %dafny /compile:0 /dprint:- "%s" /env:0 > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// The following signature used to cause the error "Undeclared top-level type or type parameter: _tuple#2OG".
-method Test(ghost c: (int, ghost (int, int)))
-{
-}
diff --git a/Test/git-issues/4104-git-issue.dfy b/Test/git-issues/4104-git-issue.dfy
deleted file mode 100644
index acd0026df92..00000000000
--- a/Test/git-issues/4104-git-issue.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-// This file tests that it's okay for a filename to start with a digit.
-
-method Main() {
-  print "hello\n";
-}
diff --git a/Test/git-issues/Wrappers.dfy b/Test/git-issues/Wrappers.dfy
deleted file mode 100644
index 56f267a4628..00000000000
--- a/Test/git-issues/Wrappers.dfy
+++ /dev/null
@@ -1,98 +0,0 @@
-// RUN: %diff "%s" "%s"
-/*******************************************************************************
- *  Copyright by the contributors to the Dafny Project
- *  SPDX-License-Identifier: MIT 
- *******************************************************************************/
-
-module {:options "-functionSyntax:4"} Wrappers {
-
-  datatype Option<+T> = None | Some(value: T) {
-    function ToResult(): Result<T, string> {
-      match this
-      case Some(v) => Success(v)
-      case None() => Failure("Option is None")
-    }
-
-    function UnwrapOr(default: T): T {
-      match this
-      case Some(v) => v
-      case None() => default
-    }
-
-    predicate IsFailure() {
-      None?
-    }
-
-    function PropagateFailure<U>(): Option<U>
-      requires None?
-    {
-      None
-    }
-
-    function Extract(): T
-      requires Some?
-    {
-      value
-    }
-  }
-
-  datatype Result<+T, +R> = | Success(value: T) | Failure(error: R) {
-    function ToOption(): Option<T>
-    {
-      match this
-      case Success(s) => Some(s)
-      case Failure(e) => None()
-    }
-
-    function UnwrapOr(default: T): T
-    {
-      match this
-      case Success(s) => s
-      case Failure(e) => default
-    }
-
-    predicate IsFailure() {
-      Failure?
-    }
-
-    function PropagateFailure<U>(): Result<U, R>
-      requires Failure?
-    {
-      Failure(this.error)
-    }
-
-    function MapFailure<NewR>(reWrap: R -> NewR): Result<T, NewR>
-    {
-      match this
-      case Success(s) => Success(s)
-      case Failure(e) => Failure(reWrap(e))
-    }
-
-    function Extract(): T
-      requires Success?
-    {
-      value
-    }
-  }
-
-  datatype Outcome<E> = Pass | Fail(error: E)
-  {
-    predicate IsFailure() {
-      Fail?
-    }
-    // Note: PropagateFailure returns a Result, not an Outcome.
-    function PropagateFailure<U>(): Result<U, E>
-      requires Fail?
-    {
-      Failure(this.error)
-    }
-    // Note: no Extract method
-  }
-
-  // A helper function to ensure a requirement is true at runtime
-  // :- Need(5 == |mySet|, "The set MUST have 5 elements.")
-  function Need<E>(condition: bool, error: E): (result: Outcome<E>)
-  {
-    if condition then Pass else Fail(error)
-  }
-}
diff --git a/Test/git-issues/class.dfy b/Test/git-issues/class.dfy
deleted file mode 100644
index b6c5a94a2f2..00000000000
--- a/Test/git-issues/class.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-// This file tests that it's okay for a filename to have a name like "class, which is
-// reserved in many languages.
-
-method Main() {
-  print "hello\n";
-}
diff --git a/Test/git-issues/git-issue-032a.dfy b/Test/git-issues/git-issue-032a.dfy
deleted file mode 100644
index 489919c9fd1..00000000000
--- a/Test/git-issues/git-issue-032a.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method m() {
-  var x := ();
-  match x { case () => print "OK"; case _ => print "DEF"; }
-  print "\n";
-}
-
diff --git a/Test/git-issues/git-issue-1100.dfy b/Test/git-issues/git-issue-1100.dfy
deleted file mode 100644
index d8826adbde3..00000000000
--- a/Test/git-issues/git-issue-1100.dfy
+++ /dev/null
@@ -1,3 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%S/../c++/arrays.dfy" -- --relax-definite-assignment --unicode-char:false
-
-// Test compilation of a file in another directory
diff --git a/Test/git-issues/git-issue-1109.dfy b/Test/git-issues/git-issue-1109.dfy
deleted file mode 100755
index fef08328dad..00000000000
--- a/Test/git-issues/git-issue-1109.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /stdin < "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-lemma TestStdin()
-{
-  assert 2 == 3; // this error should be labeled <stdin>(6, 11)
-}
diff --git a/Test/git-issues/git-issue-1109.dfy.expect b/Test/git-issues/git-issue-1109.dfy.expect
deleted file mode 100644
index 63d772a52af..00000000000
--- a/Test/git-issues/git-issue-1109.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-<stdin>(6,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/git-issues/git-issue-1112.dfy.expect b/Test/git-issues/git-issue-1112.dfy.expect
deleted file mode 100644
index 080f08a4e12..00000000000
--- a/Test/git-issues/git-issue-1112.dfy.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-git-issue-1112.dfy(22,29): Error: target object might be null
-git-issue-1112.dfy(24,21): Error: target object might be null
-git-issue-1112.dfy(24,38): Error: target object might be null
-git-issue-1112.dfy(36,32): Error: target object might be null
-git-issue-1112.dfy(38,24): Error: target object might be null
-git-issue-1112.dfy(38,44): Error: target object might be null
-git-issue-1112.dfy(51,33): Error: target object might be null
-git-issue-1112.dfy(53,25): Error: target object might be null
-git-issue-1112.dfy(53,46): Error: target object might be null
-git-issue-1112.dfy(64,26): Error: receiver might not be allocated in the state in which its fields are accessed
-git-issue-1112.dfy(66,28): Error: receiver might not be allocated in the state in which its fields are accessed
-git-issue-1112.dfy(77,23): Error: array might not be allocated
-git-issue-1112.dfy(79,25): Error: array might not be allocated
-git-issue-1112.dfy(90,23): Error: array might not be allocated
-git-issue-1112.dfy(92,25): Error: array might not be allocated
-git-issue-1112.dfy(98,11): Error: array might be null
-git-issue-1112.dfy(98,14): Error: index out of range
-git-issue-1112.dfy(99,11): Error: array might be null
-git-issue-1112.dfy(99,13): Error: index 0 out of range
-git-issue-1112.dfy(99,16): Error: index 1 out of range
-git-issue-1112.dfy(107,11): Error: array might be null
-git-issue-1112.dfy(108,11): Error: array might be null
-
-Dafny program verifier finished with 5 verified, 22 errors
diff --git a/Test/git-issues/git-issue-1127.dfy.expect b/Test/git-issues/git-issue-1127.dfy.expect
deleted file mode 100644
index 119a89a52cc..00000000000
--- a/Test/git-issues/git-issue-1127.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-1127.dfy(15,7): Error: type parameter (T) passed to function Func must support nonempty (got PossiblyEmpty)
-git-issue-1127.dfy(29,17): Error: type parameter (T) passed to function GetInhabitant must support auto-initialization (got EmptyInt)
-2 resolution/type errors detected in git-issue-1127.dfy
diff --git a/Test/git-issues/git-issue-1129.dfy b/Test/git-issues/git-issue-1129.dfy
deleted file mode 100644
index d641592006b..00000000000
--- a/Test/git-issues/git-issue-1129.dfy
+++ /dev/null
@@ -1,33 +0,0 @@
-// NONUNIFORM: Program expected to fail in backend-specific ways
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:cs "%s" > "%t".abyss
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:java "%s" > "%t".abyss
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js "%s" > "%t".abyss
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:go "%s" > "%t".abyss
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:cpp "%s" > "%t".abyss
-// RUN: %diff "%s.expect" "%t"
-
-// Without providing extern code for the :extern C, Dafny will output
-// target-compiler error messages when asked to compile this program.
-// Some of the compilers had then thrown an exception, which caused
-// Dafny to crash. That doesn't seem very friendly. The fix is to
-// just print the error and exit, without crashing.
-//
-// Errors reported by the underlying compiler may contain absolute
-// path names. These are annoying to have in .expect files. Therefore,
-// the output from the Dafny invocations above are piped into the
-// abyss. This testing still detects any crash.
-
-module A {
-  import B
-  datatype D = D(test: B.C)
-}
-
-module B {
-  class {:extern} C {
-    constructor {:extern} (name: string)
-  }
-}
-
-method Main() {
-}
diff --git a/Test/git-issues/git-issue-1150.dfy b/Test/git-issues/git-issue-1150.dfy
deleted file mode 100644
index d3416a53813..00000000000
--- a/Test/git-issues/git-issue-1150.dfy
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-datatype Foo = Foo(x: nat)
-{
-  // the following once generated malformed Boogie
-  const good?: bool := 0 < x < 5
-}
-
-method Main()
-{
-  var x := Foo(2);
-  assert x.good?;
-  print x, " ", x.good?, "\n";
-
-  var y := Foo(5);
-  assert !y.good?;
-  print y, " ", y.good?, "\n";
-}
diff --git a/Test/git-issues/git-issue-1151-more.dfy b/Test/git-issues/git-issue-1151-more.dfy
deleted file mode 100644
index 609b7e4b9bf..00000000000
--- a/Test/git-issues/git-issue-1151-more.dfy
+++ /dev/null
@@ -1,23 +0,0 @@
-// RUN: %dafny /compile:0 /unicodeChar:0 "%s" > "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:cs "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:java "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:js "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:go "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:cpp "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /unicodeChar:0 /compileTarget:py "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// The following example should produce a compilation error, since there's
-// an abstract type. It should not, however, crash.
-
-type Opaque(0) // compilation error: this is an abstract type
-
-datatype E = E(Opaque)
-
-method N() returns (e: E) {
-}
-
-method Main() {
-  var e := N();
-  print e, "\n";
-}
diff --git a/Test/git-issues/git-issue-1163.dfy.expect b/Test/git-issues/git-issue-1163.dfy.expect
deleted file mode 100644
index 3f619a04c07..00000000000
--- a/Test/git-issues/git-issue-1163.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-git-issue-1163.dfy(7,17): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-git-issue-1163.dfy(21,42): Error: receiver argument might not be allocated in the state in which the function is invoked
-git-issue-1163.dfy(23,44): Error: argument might not be allocated in the state in which the function is invoked
-git-issue-1163.dfy(27,40): Error: receiver argument might not be allocated in the state in which the function is invoked
-
-Dafny program verifier finished with 2 verified, 3 errors
diff --git a/Test/git-issues/git-issue-1174.dfy b/Test/git-issues/git-issue-1174.dfy
deleted file mode 100644
index 292c366ad70..00000000000
--- a/Test/git-issues/git-issue-1174.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function fm1(): bool
-{
-    (true)
-}
-
-function fm2():bool
-{
-    var v := fm1();
-    (v)
-}
-
diff --git a/Test/git-issues/git-issue-1181.dfy b/Test/git-issues/git-issue-1181.dfy
deleted file mode 100644
index 412a87a2ae8..00000000000
--- a/Test/git-issues/git-issue-1181.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-type T {
-  ghost predicate P(t: T)
-  ghost predicate Q()
-    requires P(this)  // once got the bogus "type mismatch for argument (function expects T, got T)"
-}
diff --git a/Test/git-issues/git-issue-1207.dfy.expect b/Test/git-issues/git-issue-1207.dfy.expect
deleted file mode 100644
index 63898edaaaa..00000000000
--- a/Test/git-issues/git-issue-1207.dfy.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-git-issue-1207.dfy(17,9): Warning: /!\ No terms found to trigger on.
-git-issue-1207.dfy(29,9): Warning: /!\ No terms found to trigger on.
-git-issue-1207.dfy(41,9): Warning: /!\ No terms found to trigger on.
-git-issue-1207.dfy(47,9): Warning: /!\ No terms found to trigger on.
-git-issue-1207.dfy(48,9): Warning: /!\ No terms found to trigger on.
-git-issue-1207.dfy(10,9): Error: assertion could not be proved
-git-issue-1207.dfy(11,9): Error: assertion could not be proved
-git-issue-1207.dfy(14,9): Error: assertion could not be proved
-git-issue-1207.dfy(15,9): Error: assertion could not be proved
-git-issue-1207.dfy(16,9): Error: assertion could not be proved
-git-issue-1207.dfy(17,9): Error: assertion might not hold
-git-issue-1207.dfy(18,9): Error: assertion might not hold
-git-issue-1207.dfy(22,9): Error: assertion could not be proved
-git-issue-1207.dfy(23,9): Error: assertion could not be proved
-git-issue-1207.dfy(24,9): Error: assertion could not be proved
-git-issue-1207.dfy(26,9): Error: assertion could not be proved
-git-issue-1207.dfy(27,9): Error: assertion might not hold
-git-issue-1207.dfy(28,9): Error: assertion might not hold
-git-issue-1207.dfy(29,9): Error: assertion might not hold
-git-issue-1207.dfy(30,9): Error: assertion could not be proved
-git-issue-1207.dfy(34,9): Error: assertion could not be proved
-git-issue-1207.dfy(35,9): Error: assertion could not be proved
-git-issue-1207.dfy(38,9): Error: assertion could not be proved
-git-issue-1207.dfy(39,9): Error: assertion could not be proved
-git-issue-1207.dfy(40,9): Error: assertion might not hold
-git-issue-1207.dfy(41,9): Error: assertion might not hold
-git-issue-1207.dfy(42,9): Error: assertion might not hold
-git-issue-1207.dfy(43,9): Error: assertion could not be proved
-git-issue-1207.dfy(47,9): Error: assertion could not be proved
-git-issue-1207.dfy(48,9): Error: assertion could not be proved
-git-issue-1207.dfy(49,9): Error: assertion could not be proved
-git-issue-1207.dfy(50,9): Error: assertion might not hold
-git-issue-1207.dfy(50,49): Error: index out of range
-git-issue-1207.dfy(50,57): Error: index out of range
-git-issue-1207.dfy(51,9): Error: assertion might not hold
-
-Dafny program verifier finished with 0 verified, 30 errors
diff --git a/Test/git-issues/git-issue-1210.dfy b/Test/git-issues/git-issue-1210.dfy
deleted file mode 100644
index 0701b51f36a..00000000000
--- a/Test/git-issues/git-issue-1210.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-abstract module A {
-  const c: nat
-}
-abstract module B refines A {}
-module C refines B {
-  const c: nat := 0
-}
diff --git a/Test/git-issues/git-issue-1211.dfy b/Test/git-issues/git-issue-1211.dfy
deleted file mode 100644
index 40804159a3f..00000000000
--- a/Test/git-issues/git-issue-1211.dfy
+++ /dev/null
@@ -1,19 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-function apply<T,U>(op: T --> U): ()
-{
-  ()
-}
-
-datatype D = O | LD(c: D, thunk: () -> D)
-{
-  
-  function e(d: D): ()
-  {
-      apply((x: D) requires x.LD? => x.(c := d))
-  }
-}
-
-
-
diff --git a/Test/git-issues/git-issue-1224.dfy b/Test/git-issues/git-issue-1224.dfy
deleted file mode 100644
index 1bd77933647..00000000000
--- a/Test/git-issues/git-issue-1224.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-abstract module SlowPoke {
-  lemma {:timeLimitMultiplier 4} SlowLemma()
-}
-
-module SlowChild refines SlowPoke { }
diff --git a/Test/git-issues/git-issue-1229.dfy b/Test/git-issues/git-issue-1229.dfy
deleted file mode 100644
index 192f14ae3cd..00000000000
--- a/Test/git-issues/git-issue-1229.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %dafny /compile:1 /compileTarget:cs "%s" %S/git-issue-1229-extern.cs > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module {:extern "MyModule2"} MyModule2 {
-    type {:extern "MyType"} MyType(==,!new)
-}
-
-module MyModule1 {
-    import MyModule2
-
-    datatype MyDatatype = MyDatatype (
-        t: MyModule2.MyType
-    )
-}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-1253.dfy b/Test/git-issues/git-issue-1253.dfy
deleted file mode 100644
index 19a5100ed01..00000000000
--- a/Test/git-issues/git-issue-1253.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M1 {
-  import M2.C
-  export
-    provides
-      C
-  module M2 {
-    const C: int
-  }
-}
diff --git a/Test/git-issues/git-issue-1256.dfy.expect b/Test/git-issues/git-issue-1256.dfy.expect
deleted file mode 100644
index e746714a65b..00000000000
--- a/Test/git-issues/git-issue-1256.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue-1256.dfy(21,11): Error: assertion could not be proved
-git-issue-1256.dfy(22,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 15 verified, 2 errors
diff --git a/Test/git-issues/git-issue-1309.dfy b/Test/git-issues/git-issue-1309.dfy
deleted file mode 100644
index cc127b077a9..00000000000
--- a/Test/git-issues/git-issue-1309.dfy
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: %exits-with 2 %baredafny verify --show-snippets:false --use-basename-for-filename "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Example for Issue 1309 -- not yet fixed
-
-module A {
-  module C {
-    datatype Option<T> = None | Some(x : T)
-  }
-}
-
-module B {
-  module C {
-    datatype Option<T> = None | Some(x : T)
-
-  }
-}
-
-module D {
-  import A
-  import B
-
-  lemma Bad(x: int)
-  ensures A.C.Some(x) == B.C.Some(x)
-}
-
diff --git a/Test/git-issues/git-issue-1384.dfy b/Test/git-issues/git-issue-1384.dfy
deleted file mode 100644
index bc15a024dd4..00000000000
--- a/Test/git-issues/git-issue-1384.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 /env:0 /dprint:- "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Test()
-{
-    var f: ((int,int)) -> int := (x: (int,int)) => 1;
-}
-
diff --git a/Test/git-issues/git-issue-1435.dfy b/Test/git-issues/git-issue-1435.dfy
deleted file mode 100644
index 2d54bf12c24..00000000000
--- a/Test/git-issues/git-issue-1435.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class C {
-  var x:nat
-  twostate predicate p() { unchanged(this) }
-  method bad() modifies this ensures false {
-    assert p();
-    x := x+1;
-    assert p();
-  }
-}
diff --git a/Test/git-issues/git-issue-1458.dfy b/Test/git-issues/git-issue-1458.dfy
deleted file mode 100644
index 13f7616c704..00000000000
--- a/Test/git-issues/git-issue-1458.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-
-method Main() {
-  SwingoutSister();
-}
-
-method SwingoutSister() {
-  break Out;
-}
diff --git a/Test/git-issues/git-issue-1514c.dfy b/Test/git-issues/git-issue-1514c.dfy
deleted file mode 100644
index 578316f217c..00000000000
--- a/Test/git-issues/git-issue-1514c.dfy
+++ /dev/null
@@ -1,23 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-include "Wrappers.dfy"
-import opened Wrappers
-
-method id<T>(r: T) returns (r2: T)  {
-  r2 := r;
-}
-
-method test(s: string) returns (r: Option<string>) {
-  r := None;
-  var x :- id<Option<string>>(Some(s));
-  r := Some(x);
-}
-
-method Main() {
-  var x := test("ok");
-  if x.Some? {
-    print x.value, "\n";
-  } else {
-    print "None?!";
-  }
-}
diff --git a/Test/git-issues/git-issue-1545.dfy b/Test/git-issues/git-issue-1545.dfy
deleted file mode 100644
index 9c09df498bd..00000000000
--- a/Test/git-issues/git-issue-1545.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /rprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost predicate Foo(s: seq<int>)
-{
-    // Does not work
-    && (forall i :: 0 <= i < |s| ==>
-      && i is nat)
-}
diff --git a/Test/git-issues/git-issue-1545.dfy.expect b/Test/git-issues/git-issue-1545.dfy.expect
deleted file mode 100644
index 6f26458f0a2..00000000000
--- a/Test/git-issues/git-issue-1545.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue-1545.dfy(8,11): Error: a non-trivial type test is allowed only for reference types (tried to test if 'int' is a 'nat')
-1 resolution/type errors detected in git-issue-1545.dfy
diff --git a/Test/git-issues/git-issue-1564-3.dfy b/Test/git-issues/git-issue-1564-3.dfy
deleted file mode 100644
index 86459aa26a9..00000000000
--- a/Test/git-issues/git-issue-1564-3.dfy
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: %baredafny verify %args --function-syntax:3 --print:- "%s" > "%t"
-// RUN: %baredafny verify %args --function-syntax:experimentalDefaultGhost --print:- "%s" >> "%t"
-// RUN: %baredafny verify %args --function-syntax:experimentalDefaultCompiled --print:- "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-function F0(): int
-function method F1(): int
-
-twostate function G0(): int
-
-function H0(): int {
-  2
-} by method {
-  return 2;
-}
-
-predicate P0()
-predicate method P1()
-
-twostate predicate Q0()
-
-predicate R0() {
-  true
-} by method {
-  return true;
-}
diff --git a/Test/git-issues/git-issue-1564-3to4.dfy b/Test/git-issues/git-issue-1564-3to4.dfy
deleted file mode 100644
index e4ad0a23246..00000000000
--- a/Test/git-issues/git-issue-1564-3to4.dfy
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: %baredafny verify %args --function-syntax:migration3to4 --print:- "%s" > "%t"
-// RUN: %baredafny verify %args --function-syntax:experimentalDefaultGhost --print:- "%s" >> "%t"
-// RUN: %baredafny verify %args --function-syntax:experimentalDefaultCompiled --print:- "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function F0(): int
-function method F1(): int
-
-twostate function G0(): int
-
-function H0(): int {
-  2
-} by method {
-  return 2;
-}
-
-ghost predicate P0()
-predicate method P1()
-
-twostate predicate Q0()
-
-predicate R0() {
-  true
-} by method {
-  return true;
-}
diff --git a/Test/git-issues/git-issue-1564-4.dfy b/Test/git-issues/git-issue-1564-4.dfy
deleted file mode 100644
index fed6d98fa14..00000000000
--- a/Test/git-issues/git-issue-1564-4.dfy
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: %baredafny verify %args --function-syntax:4 --print:- "%s" > "%t"
-// RUN: %baredafny verify %args --function-syntax:experimentalDefaultGhost --print:- "%s" >> "%t"
-// RUN: %baredafny verify %args --function-syntax:experimentalDefaultCompiled --print:- "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function F0(): int
-function F1(): int
-
-twostate function G0(): int
-
-function H0(): int {
-  2
-} by method {
-  return 2;
-}
-
-ghost predicate P0()
-predicate P1()
-
-twostate predicate Q0()
-
-predicate R0() {
-  true
-} by method {
-  return true;
-}
diff --git a/Test/git-issues/git-issue-1564-eag.dfy b/Test/git-issues/git-issue-1564-eag.dfy
deleted file mode 100644
index 9e37294f9ec..00000000000
--- a/Test/git-issues/git-issue-1564-eag.dfy
+++ /dev/null
@@ -1,23 +0,0 @@
-// RUN: %baredafny verify %args --function-syntax:experimentalPredicateAlwaysGhost --print:- "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function F0(): int
-function F1(): int
-
-twostate function G0(): int
-
-function H0(): int {
-  2
-} by method {
-  return 2;
-}
-
-predicate P1()
-
-twostate predicate Q0()
-
-predicate R0() {
-  true
-} by method {
-  return true;
-}
diff --git a/Test/git-issues/git-issue-1564.dfy b/Test/git-issues/git-issue-1564.dfy
deleted file mode 100644
index f94dbb74cf8..00000000000
--- a/Test/git-issues/git-issue-1564.dfy
+++ /dev/null
@@ -1,69 +0,0 @@
-// RUN: ! %baredafny verify %args --function-syntax:3 "%s" > "%t"
-// RUN: ! %baredafny verify %args --function-syntax:migration3to4 "%s" >> "%t"
-// RUN: ! %baredafny verify %args --function-syntax:4 "%s" >> "%t"
-// RUN: ! %baredafny verify %args --function-syntax:experimentalDefaultGhost "%s" >> "%t"
-// RUN: ! %baredafny verify %args --function-syntax:experimentalDefaultCompiled "%s" >> "%t"
-// RUN: ! %baredafny verify %args --function-syntax:experimentalPredicateAlwaysGhost "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-function F0(): int // error: 3to4
-function method F1(): int // error: v4, aGhost
-ghost function F2(): int // error: v3
-ghost function method F3(): int // error
-
-twostate function G0(): int
-twostate function method G1(): int // error
-ghost twostate function G2(): int // error
-ghost twostate function method G3(): int // error
-
-function H0(): int {
-  2
-} by method {
-  return 2;
-}
-function method H1(): int { // error
-  2
-} by method {
-  return 2;
-}
-ghost function H2(): int { // error
-  2
-} by method {
-  return 2;
-}
-ghost function method H3(): int { // error
-  2
-} by method {
-  return 2;
-}
-
-predicate P0() // error: 3to4
-predicate method P1() // error: v4, aGhost
-ghost predicate P2() // error: v3, aGhost
-ghost predicate method P3() // error
-
-twostate predicate Q0()
-twostate predicate method Q1() // error
-ghost twostate predicate Q2() // error
-ghost twostate predicate method Q3() // error
-
-predicate R0() {
-  true
-} by method {
-  return true;
-}
-predicate method R1() { // error
-  true
-} by method {
-  return true;
-}
-ghost predicate R2() { // error
-  true
-} by method {
-  return true;
-}
-ghost predicate method R3() { // error
-  true
-} by method {
-  return true;
-}
diff --git a/Test/git-issues/git-issue-1587.dfy b/Test/git-issues/git-issue-1587.dfy
deleted file mode 100644
index b04128db05d..00000000000
--- a/Test/git-issues/git-issue-1587.dfy
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype Foo = Foo(Keys: (), Values: (), Items: (), IsLimit: (), IsSucc: (), Offset: (), IsNat: ())
diff --git a/Test/git-issues/git-issue-1618.dfy b/Test/git-issues/git-issue-1618.dfy
deleted file mode 100644
index ab803572240..00000000000
--- a/Test/git-issues/git-issue-1618.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %exits-with 2 %resolve "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-function {:opaque} mul(a: int, b: int): int
-{
-  a * b
-}
-
-method M()
-{
-  reveal mul;
-}
diff --git a/Test/git-issues/git-issue-1618.dfy.expect b/Test/git-issues/git-issue-1618.dfy.expect
deleted file mode 100644
index 731250eaf69..00000000000
--- a/Test/git-issues/git-issue-1618.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue-1618.dfy(11,9): Error: to reveal a function (mul), append parentheses
-1 resolution/type errors detected in git-issue-1618.dfy
diff --git a/Test/git-issues/git-issue-1637.dfy b/Test/git-issues/git-issue-1637.dfy
deleted file mode 100644
index 259d999331d..00000000000
--- a/Test/git-issues/git-issue-1637.dfy
+++ /dev/null
@@ -1,20 +0,0 @@
-// RUN: %exits-with 2 %resolve "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-type uint8 = i | 0 <= i <= 255
-
-datatype Thing = Thing
-type Foo =  s: seq<uint8> | |s| < 10 witness *
-type Fii =  real 
-
-function Bar(t: Thing): Foo
-function Bii(t: Thing): Fii
-
-predicate Baz(f: Thing -> seq<uint8>)
-
-predicate compose() {
-  Baz(Bar)
-}
-predicate compose2() {
-  Baz(Bii)
-}
diff --git a/Test/git-issues/git-issue-1637.dfy.expect b/Test/git-issues/git-issue-1637.dfy.expect
deleted file mode 100644
index e2f5f60300e..00000000000
--- a/Test/git-issues/git-issue-1637.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-1637.dfy(19,5): Error: incorrect argument type for predicate parameter 'f' (expected Thing -> seq<uint8>, found Thing -> Fii) (covariance for type parameter at index 1 expects seq<uint8> :> Fii)
-git-issue-1637.dfy(19,5): Error: incorrect argument type for predicate parameter 'f' (expected Thing -> seq<uint8>, found Thing -> Fii) (covariance for type parameter at index 1 expects real :> seq<uint8>)
-2 resolution/type errors detected in git-issue-1637.dfy
diff --git a/Test/git-issues/git-issue-1639.dfy b/Test/git-issues/git-issue-1639.dfy
deleted file mode 100644
index 0c6c63f80bc..00000000000
--- a/Test/git-issues/git-issue-1639.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module Foo {
-    ghost function Fun(): () {
-        calc { 0; }
-        ()
-    }
-}
-
-abstract module Bar {
-    import Foo' : Foo
-}
diff --git a/Test/git-issues/git-issue-1682.dfy b/Test/git-issues/git-issue-1682.dfy
deleted file mode 100644
index 99a88df0a21..00000000000
--- a/Test/git-issues/git-issue-1682.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method IsUnique(str: array<char>) returns (ret: bool)
-{
-  ret := multiset
-}
diff --git a/Test/git-issues/git-issue-1700.dfy.expect b/Test/git-issues/git-issue-1700.dfy.expect
deleted file mode 100644
index 84aa011805b..00000000000
--- a/Test/git-issues/git-issue-1700.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue-1700.dfy(15,13): Error: incorrect argument type for datatype constructor parameter 'e' (expected B.E, found A.E)
-1 resolution/type errors detected in git-issue-1700.dfy
diff --git a/Test/git-issues/git-issue-1714.dfy b/Test/git-issues/git-issue-1714.dfy
deleted file mode 100644
index 540a41c39cb..00000000000
--- a/Test/git-issues/git-issue-1714.dfy
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-trait Base {}
-class Derived extends Base { var n: int constructor() { n := 0; } }
-
-method f(b: Base) {
-  if (b is Derived) {
-    print "(b as Derived).n == ", (b as Derived).n, "\n";
-  }
-}
-
-method Main() {
-  var d := new Derived();
-  f(d);
-}
diff --git a/Test/git-issues/git-issue-179.dfy b/Test/git-issues/git-issue-179.dfy
deleted file mode 100644
index 5eda20e7877..00000000000
--- a/Test/git-issues/git-issue-179.dfy
+++ /dev/null
@@ -1,18 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:java "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main() {
-  var mp: map<int,bool>;
-  mp := mp[5 := false][4 := true][3 := false];
-  var i := mp.Items;
-  print i, "\n";
-  print mp.Keys, "\n";
-  print mp.Values, "\n";
-
-  print 5 in mp, " ", 9 in mp, " ", 8 !in mp, " ",  4 !in mp, "\n";
-}
diff --git a/Test/git-issues/git-issue-1812.dfy.expect b/Test/git-issues/git-issue-1812.dfy.expect
deleted file mode 100644
index fad84c7a38a..00000000000
--- a/Test/git-issues/git-issue-1812.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-git-issue-1812.dfy(22,16): Error: this invariant could not be proved to be maintained by the loop
-git-issue-1812.dfy(22,16): Related message: loop invariant violation
-git-issue-1812.dfy(33,16): Error: this invariant could not be proved to be maintained by the loop
-git-issue-1812.dfy(33,16): Related message: loop invariant violation
-
-Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Test/git-issues/git-issue-1815a.dfy b/Test/git-issues/git-issue-1815a.dfy
deleted file mode 100644
index 72d55a1cb4f..00000000000
--- a/Test/git-issues/git-issue-1815a.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-datatype Dt<+U> = Dt(x: U, i: int)
-
-trait Tr {}
-class Cl extends Tr {
-  constructor () {}
-}
-
-method Main() {
-  var cl: Cl := new Cl();
-  var e: Dt<Tr> := Dt(cl, 1815);
-  match e {
-    case Dt(tr, _) =>
-  }
-  print "done\n";
-}
diff --git a/Test/git-issues/git-issue-1815b.dfy.go.check b/Test/git-issues/git-issue-1815b.dfy.go.check
deleted file mode 100644
index b806adb9572..00000000000
--- a/Test/git-issues/git-issue-1815b.dfy.go.check
+++ /dev/null
@@ -1,2 +0,0 @@
-// https://github.com/dafny-lang/dafny/issues/4120
-// CHECK: Y \(variable of type interface{}\) is not a type
diff --git a/Test/git-issues/git-issue-1838.dfy b/Test/git-issues/git-issue-1838.dfy
deleted file mode 100644
index 669d5fc3dd2..00000000000
--- a/Test/git-issues/git-issue-1838.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %dafny /useBaseNameForFileName /compile:0 %S/git-issue-1838.dfy > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A.B {
-  type u64 = x | 0 <= x <= 0xffff_ffff_ffff_ffff
-}
diff --git a/Test/git-issues/git-issue-1903.dfy b/Test/git-issues/git-issue-1903.dfy
deleted file mode 100644
index 60ee1c121ab..00000000000
--- a/Test/git-issues/git-issue-1903.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-method g<T>(x : seq<T> := []) 
-{
-   print "worked!\n";  
-}
-
-
-method Main() { 
-   g<nat>();
-}
diff --git a/Test/git-issues/git-issue-1957.dfy b/Test/git-issues/git-issue-1957.dfy
deleted file mode 100644
index 6c20c9ec4c0..00000000000
--- a/Test/git-issues/git-issue-1957.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class {:autocontracts} Thing {
-    ghost predicate Valid() {
-        true
-    }
-}
diff --git a/Test/git-issues/git-issue-1984.dfy b/Test/git-issues/git-issue-1984.dfy
deleted file mode 100644
index 3e3cdae2698..00000000000
--- a/Test/git-issues/git-issue-1984.dfy
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method {:extern "test"} testInt(i: int)
-method {:extern "test"} testBool(b: bool) // Previously the verifier reported a name collision
diff --git a/Test/git-issues/git-issue-19b.dfy.expect b/Test/git-issues/git-issue-19b.dfy.expect
deleted file mode 100644
index cb441ae3fb3..00000000000
--- a/Test/git-issues/git-issue-19b.dfy.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-git-issue-19b.dfy(36,11): Error: assertion could not be proved
-git-issue-19b.dfy(43,11): Error: assertion could not be proved
-git-issue-19b.dfy(50,11): Error: assertion could not be proved
-git-issue-19b.dfy(57,11): Error: assertion could not be proved
-git-issue-19b.dfy(64,11): Error: assertion could not be proved
-git-issue-19b.dfy(71,11): Error: assertion could not be proved
-git-issue-19b.dfy(102,11): Error: assertion could not be proved
-git-issue-19b.dfy(115,4): Error: a postcondition could not be proved on this return path
-git-issue-19b.dfy(113,14): Related location: this is the postcondition that could not be proved
-git-issue-19b.dfy(113,36): Related location
-git-issue-19b.dfy(131,36): Error: a precondition for this call could not be proved
-git-issue-19b.dfy(124,17): Related location: this is the precondition that could not be proved
-
-Dafny program verifier finished with 19 verified, 9 errors
diff --git a/Test/git-issues/git-issue-2016.dfy b/Test/git-issues/git-issue-2016.dfy
deleted file mode 100644
index 948484e8484..00000000000
--- a/Test/git-issues/git-issue-2016.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M {
-  datatype D = D() {
-    static function f(): (res: int) {
-      5
-    } by method {
-      return 5;
-    }
-  }
-}
diff --git a/Test/git-issues/git-issue-202.dfy b/Test/git-issues/git-issue-202.dfy
deleted file mode 100644
index e0ece592ee2..00000000000
--- a/Test/git-issues/git-issue-202.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method push<T>(sequence: seq<T>, element: T) returns (new_sequence: seq<T>)
-  ensures sequence == new_sequence[..|new_sequence|-1]
-{
-  return sequence + [element];
-}
diff --git a/Test/git-issues/git-issue-2022.dfy b/Test/git-issues/git-issue-2022.dfy
deleted file mode 100644
index bc489c9c82a..00000000000
--- a/Test/git-issues/git-issue-2022.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M {
-  export
-    provides
-      Opened,
-      f
-
-  module Opened {
-    type T = int
-  }
-
-  ghost function f(x: Opened.T): int {
-    5
-  }
-}
diff --git a/Test/git-issues/git-issue-2026.dfy.expect b/Test/git-issues/git-issue-2026.dfy.expect
deleted file mode 100644
index d9a38be0bce..00000000000
--- a/Test/git-issues/git-issue-2026.dfy.expect
+++ /dev/null
@@ -1,32 +0,0 @@
-git-issue-2026.dfy(18,18): Error: this invariant could not be proved to be maintained by the loop
-git-issue-2026.dfy(18,18): Related message: loop invariant violation
-
-Dafny program verifier finished with 0 verified, 1 error
-Counterexample for first failing assertion: 
-git-issue-2026.dfy(12,0): initial state:
-	n : int = 2
-	ret : _System.array<seq<char>> = ()
-git-issue-2026.dfy(13,24):
-	n : int = 2
-	ret : _System.array?<seq<char>> = (Length := 2, [(- 39)] := @0, [0] := @0)
-	@0 : seq<char> = ['o', 'd', 'd']
-git-issue-2026.dfy(15,14):
-	n : int = 2
-	ret : _System.array?<seq<char>> = (Length := 2, [(- 39)] := @0, [0] := @0)
-	i : int = 0
-	@0 : seq<char> = ['o', 'd', 'd']
-git-issue-2026.dfy(16,4): after some loop iterations:
-	n : int = 2
-	ret : _System.array?<seq<char>> = (Length := 2, [(- 39)] := @0)
-	i : int = 0
-	@0 : seq<char> = ['o', 'd', 'd']
-git-issue-2026.dfy(22,27):
-	n : int = 2
-	ret : _System.array?<seq<char>> = (Length := 2, [(- 39)] := @0, [0] := @0)
-	i : int = 0
-	@0 : seq<char> = ['o', 'd', 'd']
-git-issue-2026.dfy(26,18):
-	n : int = 2
-	ret : _System.array?<seq<char>> = (Length := 2, [(- 39)] := @0, [0] := @0)
-	i : int = 1
-	@0 : seq<char> = ['o', 'd', 'd']
diff --git a/Test/git-issues/git-issue-2074.dfy b/Test/git-issues/git-issue-2074.dfy
deleted file mode 100644
index c85c624c4c6..00000000000
--- a/Test/git-issues/git-issue-2074.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method m() {
-  var f := st => set x | x in st;
-}
diff --git a/Test/git-issues/git-issue-2103.dfy b/Test/git-issues/git-issue-2103.dfy
deleted file mode 100644
index 9f807fd7a03..00000000000
--- a/Test/git-issues/git-issue-2103.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-datatype DT_<+A> = DT(ret: A)
-type DT<A> = r: DT_<A> | true witness *
-
-method Main() {
-  var d := DT(3);
-  print d, "\n"; // 3
-}
diff --git a/Test/git-issues/git-issue-2106.dfy b/Test/git-issues/git-issue-2106.dfy
deleted file mode 100644
index be981bc1244..00000000000
--- a/Test/git-issues/git-issue-2106.dfy
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-predicate P(x: bool)
-type WE = e: (int, int) | P()
diff --git a/Test/git-issues/git-issue-2108.dfy b/Test/git-issues/git-issue-2108.dfy
deleted file mode 100644
index e9f16500d6f..00000000000
--- a/Test/git-issues/git-issue-2108.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M0.M1.Base {}
-
-module M0.M2 {
-  import M1.Base
-
-  module Derived refines Base {
-  }
-}
diff --git a/Test/git-issues/git-issue-2111.dfy b/Test/git-issues/git-issue-2111.dfy
deleted file mode 100644
index 154d32a56c8..00000000000
--- a/Test/git-issues/git-issue-2111.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype DT = C(s: string) {
-  ghost predicate F() {
-    C.XYZ()
-  }
-}
diff --git a/Test/git-issues/git-issue-2139.dfy b/Test/git-issues/git-issue-2139.dfy
deleted file mode 100644
index 8a897b3674f..00000000000
--- a/Test/git-issues/git-issue-2139.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype T = T(T, T) {
-  ghost predicate P() {
-    match this
-      case T(0, 1) => false
-  }
-}
-method a() 
-{
-    var tok := (0,0);
-    match tok {
-      case "B" => 
-      case _ => 
-    }
-}
diff --git a/Test/git-issues/git-issue-2139.dfy.expect b/Test/git-issues/git-issue-2139.dfy.expect
deleted file mode 100644
index 86873c092c4..00000000000
--- a/Test/git-issues/git-issue-2139.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-git-issue-2139.dfy(14,11): Error: pattern doesn't correspond to a tuple
-git-issue-2139.dfy(7,13): Error: Constant pattern used in place of datatype
-git-issue-2139.dfy(7,16): Error: Constant pattern used in place of datatype
-git-issue-2139.dfy(4,9): Error: because of cyclic dependencies among constructor argument types, no instances of datatype 'T' can be constructed
-4 resolution/type errors detected in git-issue-2139.dfy
diff --git a/Test/git-issues/git-issue-2173.dfy b/Test/git-issues/git-issue-2173.dfy
deleted file mode 100644
index f1b552b84a0..00000000000
--- a/Test/git-issues/git-issue-2173.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-datatype T = Leaf(x: int) | T(t: T) {
-  function {:tailrecursion} TR() : int {
-    if Leaf? then 0
-    else t.TR()
-  }
-}
-
-method Main() {
-  print Leaf(0).TR(), "\n";
-}
diff --git a/Test/git-issues/git-issue-2173.dfy.go.check b/Test/git-issues/git-issue-2173.dfy.go.check
deleted file mode 100644
index 4654124ceb0..00000000000
--- a/Test/git-issues/git-issue-2173.dfy.go.check
+++ /dev/null
@@ -1,3 +0,0 @@
-// https://github.com/dafny-lang/dafny/issues/4120
-// CHECK: T \(variable of type T\) is not a type
-
diff --git a/Test/git-issues/git-issue-2197.dfy.expect b/Test/git-issues/git-issue-2197.dfy.expect
deleted file mode 100644
index f2f05014ac6..00000000000
--- a/Test/git-issues/git-issue-2197.dfy.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-git-issue-2197.dfy(11,0): Error: a postcondition could not be proved on this return path
-   |
-11 | {
-   | ^
-
-git-issue-2197.dfy(10,10): Related location: this is the postcondition that could not be proved
-   |
-10 |   ensures Test(y)
-   |           ^^^^^^^
-
-git-issue-2197.dfy(6,2): Related location
-  |
-6 |   y >= 1
-  |   ^^^^^^
-
-git-issue-2197.dfy(17,0): Error: a postcondition could not be proved on this return path
-   |
-17 | {
-   | ^
-
-git-issue-2197.dfy(16,30): Related location: this is the postcondition that could not be proved
-   |
-16 |   ensures 0 <= y < |test| ==> test[y]
-   |                               ^^^^^^^
-
-git-issue-2197.dfy(22,2): Error: a precondition for this call could not be proved
-   |
-22 |   Never();
-   |   ^^^^^^^^
-
-git-issue-2197.dfy(26,11): Related location: this is the precondition that could not be proved
-   |
-26 |   requires 1 == 0
-   |            ^^^^^^
-
-
-Dafny program verifier finished with 1 verified, 3 errors
diff --git a/Test/git-issues/git-issue-2211.dfy.expect b/Test/git-issues/git-issue-2211.dfy.expect
deleted file mode 100644
index 5ab2b499d5b..00000000000
--- a/Test/git-issues/git-issue-2211.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-git-issue-2211.dfy(17,0): Error: a postcondition could not be proved on this return path
-git-issue-2211.dfy(16,10): Related location: this is the postcondition that could not be proved
-git-issue-2211.dfy(8,2): Related location
-
-Dafny program verifier finished with 2 verified, 1 error
diff --git a/Test/git-issues/git-issue-2211a.dfy.expect b/Test/git-issues/git-issue-2211a.dfy.expect
deleted file mode 100644
index 8329b0541d8..00000000000
--- a/Test/git-issues/git-issue-2211a.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-git-issue-2211a.dfy(18,0): Error: a postcondition could not be proved on this return path
-git-issue-2211a.dfy(17,10): Related location: this is the postcondition that could not be proved
-git-issue-2211a.dfy(9,2): Related location
-
-Dafny program verifier finished with 2 verified, 1 error
diff --git a/Test/git-issues/git-issue-2265.dfy.expect b/Test/git-issues/git-issue-2265.dfy.expect
deleted file mode 100644
index 6562976839b..00000000000
--- a/Test/git-issues/git-issue-2265.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-2265.dfy(9,11): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/git-issues/git-issue-2266.dfy b/Test/git-issues/git-issue-2266.dfy
deleted file mode 100644
index 73b26012780..00000000000
--- a/Test/git-issues/git-issue-2266.dfy
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %dafny /compile:0 /noVerify /print:%t.bpl "%s"
-// RUN: %boogie "%t.bpl" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-function Test(f: (int ~> bool)): (b:bool) reads f.reads { true }
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2299.dfy.expect b/Test/git-issues/git-issue-2299.dfy.expect
deleted file mode 100644
index 7b59feedfab..00000000000
--- a/Test/git-issues/git-issue-2299.dfy.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-git-issue-2299.dfy(37,11): Error: assertion could not be proved
-git-issue-2299.dfy(10,11): Related location
-git-issue-2299.dfy(48,11): Error: assertion could not be proved
-git-issue-2299.dfy(16,4): Related location
-git-issue-2299.dfy(58,11): Error: assertion could not be proved
-git-issue-2299.dfy(21,4): Related location
-git-issue-2299.dfy(67,13): Error: assertion could not be proved
-git-issue-2299.dfy(21,4): Related location
-git-issue-2299.dfy(81,11): Error: assertion could not be proved
-git-issue-2299.dfy(27,18): Related location
-git-issue-2299.dfy(16,4): Related location
-git-issue-2299.dfy(81,11): Error: assertion could not be proved
-git-issue-2299.dfy(27,32): Related location
-git-issue-2299.dfy(21,4): Related location
-git-issue-2299.dfy(81,11): Error: assertion could not be proved
-git-issue-2299.dfy(27,4): Related location
-git-issue-2299.dfy(10,11): Related location
-
-Dafny program verifier finished with 7 verified, 7 errors
diff --git a/Test/git-issues/git-issue-2301.dfy b/Test/git-issues/git-issue-2301.dfy
deleted file mode 100644
index 6ed159e6667..00000000000
--- a/Test/git-issues/git-issue-2301.dfy
+++ /dev/null
@@ -1,57 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class Twostate {
-  var z: int
-
-  twostate predicate NoChange_ReadsThis()
-    reads this
-  {
-    unchanged(this)
-  }
-
-  twostate predicate NoChange_ReadsNothing()
-  {
-    unchanged(this) // error: insufficient reads clause
-  }
-
-  method Test0()
-    modifies this
-  {
-    assert NoChange_ReadsThis();
-    z := z + 1;
-    assert NoChange_ReadsThis(); // error: does not hold
-  }
-
-  method Test1()
-    modifies this
-  {
-    assert NoChange_ReadsNothing();
-    z := z + 1;
-    // If NoChange_ReadsNothing has an empty reads clause, then the following assertion
-    // from the previous assertion.
-    assert NoChange_ReadsNothing();
-  }
-
-  twostate predicate BadVariations(c: Twostate, d: Twostate, e: Twostate, f: Twostate)
-  {
-    && unchanged(
-        this, // error: insufficient reads clause
-        c // error: insufficient reads clause
-      )
-    && unchanged({c, d}) // error: insufficient reads clause
-    && unchanged(
-        multiset{e, e, c, e}, // error: insufficient reads clause
-        [c, d, e],
-        [c, f, e, d] // error: insufficient reads clause
-      )
-  }
-
-  twostate predicate GoodVariations(c: Twostate, d: Twostate, e: Twostate, f: Twostate)
-    reads this, c, {d, e}, multiset{f}
-  {
-    && unchanged(this, c)
-    && unchanged({c, d})
-    && unchanged(multiset{e, e, c, e}, [c, d, e], [c, f, e, d])
-  }
-}
diff --git a/Test/git-issues/git-issue-2301.dfy.expect b/Test/git-issues/git-issue-2301.dfy.expect
deleted file mode 100644
index 74d34be649b..00000000000
--- a/Test/git-issues/git-issue-2301.dfy.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-git-issue-2301.dfy(15,14): Error: insufficient reads clause to read state of 'unchanged' object
-git-issue-2301.dfy(23,11): Error: assertion could not be proved
-git-issue-2301.dfy(10,4): Related location
-git-issue-2301.dfy(39,8): Error: insufficient reads clause to read state of 'unchanged' object
-git-issue-2301.dfy(40,8): Error: insufficient reads clause to read state of 'unchanged' object
-git-issue-2301.dfy(42,17): Error: insufficient reads clause to read state of 'unchanged' set element
-git-issue-2301.dfy(44,8): Error: insufficient reads clause to read state of 'unchanged' multiset element
-git-issue-2301.dfy(46,8): Error: insufficient reads clause to read state of 'unchanged' sequence element
-
-Dafny program verifier finished with 3 verified, 7 errors
diff --git a/Test/git-issues/git-issue-2303.dfy b/Test/git-issues/git-issue-2303.dfy
deleted file mode 100644
index 6f4df498493..00000000000
--- a/Test/git-issues/git-issue-2303.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  newtype int0 = x | true // newtype's base type is not fully determined; add an explicit type for 'x'
-}
-
-module B {
-  newtype int0 = x | true
-  const x: int0 := 0 // type for constant 'x' is 'int0', but its initialization value type is 'int'
-}
-
diff --git a/Test/git-issues/git-issue-2303.dfy.expect b/Test/git-issues/git-issue-2303.dfy.expect
deleted file mode 100644
index 7f709c06505..00000000000
--- a/Test/git-issues/git-issue-2303.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-2303.dfy(5,10): Error: newtype's base type is not fully determined; add an explicit type for 'x'
-git-issue-2303.dfy(10,8): Error: type for constant 'x' is 'int0', but its initialization value type is 'int'
-2 resolution/type errors detected in git-issue-2303.dfy
diff --git a/Test/git-issues/git-issue-2367.dfy b/Test/git-issues/git-issue-2367.dfy
deleted file mode 100644
index 51d40135a2a..00000000000
--- a/Test/git-issues/git-issue-2367.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-newtype IntSubset = i:int | true
-
-method Main() {
-  if 2 != (-6 as IntSubset % -4) as int {
-    print 1 / 0;
-  }
-  if -2 != (-6 as IntSubset / 4) as int {
-    print 1 / 0;
-  }
-}
diff --git a/Test/git-issues/git-issue-2441.dfy b/Test/git-issues/git-issue-2441.dfy
deleted file mode 100644
index 4179ecc87bc..00000000000
--- a/Test/git-issues/git-issue-2441.dfy
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-datatype A = A(B: B)
-datatype B = X
diff --git a/Test/git-issues/git-issue-2496.dfy b/Test/git-issues/git-issue-2496.dfy
deleted file mode 100644
index 22127884a0d..00000000000
--- a/Test/git-issues/git-issue-2496.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method M() {
-  b1 :| true;
-}
diff --git a/Test/git-issues/git-issue-2500.dfy.expect b/Test/git-issues/git-issue-2500.dfy.expect
deleted file mode 100644
index 64fcebbc922..00000000000
--- a/Test/git-issues/git-issue-2500.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-git-issue-2500.dfy(21,12): Error: the function must provide an equal or more detailed postcondition than in its parent trait
-git-issue-2500.dfy(24,12): Error: the function must provide an equal or more detailed postcondition than in its parent trait
-git-issue-2500.dfy(33,12): Error: the function must provide an equal or more detailed postcondition than in its parent trait
-git-issue-2500.dfy(37,12): Error: the function must provide an equal or more detailed postcondition than in its parent trait
-
-Dafny program verifier finished with 26 verified, 4 errors
diff --git a/Test/git-issues/git-issue-2506.dfy.expect b/Test/git-issues/git-issue-2506.dfy.expect
deleted file mode 100644
index 36697ad7114..00000000000
--- a/Test/git-issues/git-issue-2506.dfy.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-git-issue-2506.dfy(6,17): Error: const definition contains a cycle: T.a -> T.b -> T.a
-git-issue-2506.dfy(10,33): Error: a recursive call from a least predicate can go only to other least predicates
-git-issue-2506.dfy(13,41): Error: a least predicate can be called recursively only in positive positions
-git-issue-2506.dfy(15,45): Error: a least predicate is not allowed to declare any ensures clause
-git-issue-2506.dfy(27,17): Error: const definition contains a cycle: T.a -> T.b -> T.a
-git-issue-2506.dfy(31,33): Error: a recursive call from a least predicate can go only to other least predicates
-git-issue-2506.dfy(34,41): Error: a least predicate can be called recursively only in positive positions
-git-issue-2506.dfy(36,45): Error: a least predicate is not allowed to declare any ensures clause
-git-issue-2506.dfy(48,17): Error: const definition contains a cycle: T.a -> T.b -> T.a
-git-issue-2506.dfy(52,33): Error: a recursive call from a least predicate can go only to other least predicates
-git-issue-2506.dfy(55,41): Error: a least predicate can be called recursively only in positive positions
-git-issue-2506.dfy(57,45): Error: a least predicate is not allowed to declare any ensures clause
-git-issue-2506.dfy(69,17): Error: const definition contains a cycle: T.a -> T.b -> T.a
-git-issue-2506.dfy(73,33): Error: a recursive call from a least predicate can go only to other least predicates
-git-issue-2506.dfy(76,41): Error: a least predicate can be called recursively only in positive positions
-git-issue-2506.dfy(78,45): Error: a least predicate is not allowed to declare any ensures clause
-16 resolution/type errors detected in git-issue-2506.dfy
diff --git a/Test/git-issues/git-issue-2511.dfy.expect b/Test/git-issues/git-issue-2511.dfy.expect
deleted file mode 100644
index acffc78e08f..00000000000
--- a/Test/git-issues/git-issue-2511.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-git-issue-2511.dfy(14,11): Error: assertion could not be proved
-git-issue-2511.dfy(24,12): Error: decreases clause could not be proved to decrease
-git-issue-2511.dfy(51,11): Error: method's (possibly automatically generated) decreases clause must be below or equal to that in the trait
-
-Dafny program verifier finished with 3 verified, 3 errors
diff --git a/Test/git-issues/git-issue-2593.dfy b/Test/git-issues/git-issue-2593.dfy
deleted file mode 100644
index e990e0dcb53..00000000000
--- a/Test/git-issues/git-issue-2593.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost predicate P(x: int)
-
-lemma L()
-  ensures forall y :: P(old(y))
diff --git a/Test/git-issues/git-issue-2593.dfy.expect b/Test/git-issues/git-issue-2593.dfy.expect
deleted file mode 100644
index c56ec7986a4..00000000000
--- a/Test/git-issues/git-issue-2593.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue-2593.dfy(7,24): Warning: Argument to 'old' does not dereference the mutable heap, so this use of 'old' has no effect
-git-issue-2593.dfy(7,10): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/git-issues/git-issue-2605.dfy.expect b/Test/git-issues/git-issue-2605.dfy.expect
deleted file mode 100644
index 8def20915f2..00000000000
--- a/Test/git-issues/git-issue-2605.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-git-issue-2605.dfy(6,14): Error: possible division by zero
-git-issue-2605.dfy(6,23): Error: possible division by zero
-git-issue-2605.dfy(7,13): Error: index out of range
-git-issue-2605.dfy(7,21): Error: index out of range
-git-issue-2605.dfy(9,11): Error: assertion could not be proved
-git-issue-2605.dfy(11,9): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 6 errors
diff --git a/Test/git-issues/git-issue-261.dfy b/Test/git-issues/git-issue-261.dfy
deleted file mode 100644
index e747192524c..00000000000
--- a/Test/git-issues/git-issue-261.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-datatype Option<T> = None | Some(T)
-
-method Main() {
-  var x : Option<(nat, nat)> := Some((2,3));
-  var Some((a,b)) := x;
-  print a, " ", b, "\n";
-}
diff --git a/Test/git-issues/git-issue-2612.dfy b/Test/git-issues/git-issue-2612.dfy
deleted file mode 100644
index a8ce2828123..00000000000
--- a/Test/git-issues/git-issue-2612.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-trait T {
-  ghost predicate {:opaque} True() { true }
-}
-
-class C extends T {}
diff --git a/Test/git-issues/git-issue-2612b.dfy.expect b/Test/git-issues/git-issue-2612b.dfy.expect
deleted file mode 100644
index c1e023ba252..00000000000
--- a/Test/git-issues/git-issue-2612b.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-2612b.dfy(11,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/git-issues/git-issue-262.dfy b/Test/git-issues/git-issue-262.dfy
deleted file mode 100644
index 67da57beae7..00000000000
--- a/Test/git-issues/git-issue-262.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4119
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-function tst(x: nat): nat {
-    x + 1
-}
-
-method Main() {
-  var f := tst;
-  print f, "\n";
-  print tst, "\n";
-}
diff --git a/Test/git-issues/git-issue-2651.dfy b/Test/git-issues/git-issue-2651.dfy
deleted file mode 100644
index e4454679b88..00000000000
--- a/Test/git-issues/git-issue-2651.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method z(x: string, y: string) {
-  var a: string := "abc";
-  var b: string := x + y;
-  assert a <= x ==> a < b; // SHOULD FAIL
-}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2657.dfy b/Test/git-issues/git-issue-2657.dfy
deleted file mode 100644
index be7568636b7..00000000000
--- a/Test/git-issues/git-issue-2657.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-lemma Lemma(x: int, p: multiset<int>)
-  requires x in p
-{}
-
-method Test() {
-  Lemma(1, multiset{});
-}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2690.dfy.expect b/Test/git-issues/git-issue-2690.dfy.expect
deleted file mode 100644
index 6533295402e..00000000000
--- a/Test/git-issues/git-issue-2690.dfy.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Dafny program verifier finished with 3 verified, 0 errors
-2 in seq? true
-2 in seq? true
-All right
-Dafny program verifier did not attempt verification
-2 in seq? true
-2 in seq? true
-All right
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-2693.dfy.expect b/Test/git-issues/git-issue-2693.dfy.expect
deleted file mode 100644
index 93ca7d8d18d..00000000000
--- a/Test/git-issues/git-issue-2693.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-git-issue-2693.dfy(10,10): Warning: Support for member 'PropagateFailure' in type 'EvenGood_OddBad?' (used indirectly via a :- statement) being a method is deprecated; declare it to be a function instead
-git-issue-2693.dfy(10,10): Warning: Support for member 'Extract' in type 'EvenGood_OddBad?' (used indirectly via a :- statement) being a method is deprecated; declare it to be a function instead
-git-issue-2693.dfy(10,10): Error: a postcondition could not be proved on this return path
-git-issue-2693.dfy(6,37): Related location: this is the postcondition that could not be proved
-git-issue-2693.dfy(21,12): Related location
-git-issue-2693.dfy(11,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 6 verified, 2 errors
diff --git a/Test/git-issues/git-issue-2719.dfy.expect b/Test/git-issues/git-issue-2719.dfy.expect
deleted file mode 100644
index 1f8b85a60e4..00000000000
--- a/Test/git-issues/git-issue-2719.dfy.expect
+++ /dev/null
@@ -1 +0,0 @@
-*** Error: file foobar.dll not found
diff --git a/Test/git-issues/git-issue-2733.dfy b/Test/git-issues/git-issue-2733.dfy
deleted file mode 100644
index 65bc2b991fd..00000000000
--- a/Test/git-issues/git-issue-2733.dfy
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --unicode-char:false
-
-method Main() {
-  print "XYZ"; // Checks that no extra newline is added to the output
-}
diff --git a/Test/git-issues/git-issue-274.dfy b/Test/git-issues/git-issue-274.dfy
deleted file mode 100644
index 18aea6d3758..00000000000
--- a/Test/git-issues/git-issue-274.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module P {
-  type M
-}
-
-module N2 {
-  import opened M = P
-  trait T {
-      var m: M.M
-  }
-}
-
diff --git a/Test/git-issues/git-issue-2747.dfy b/Test/git-issues/git-issue-2747.dfy
deleted file mode 100644
index 43f8e4d9f29..00000000000
--- a/Test/git-issues/git-issue-2747.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function AnotherBrokenFunction(): nat {
-  var y := 0;
-  assert true by {
-    if
-    case x: bool :| true =>
-      assert true || x;
-  }
-  0
-}
diff --git a/Test/git-issues/git-issue-2747.dfy.expect b/Test/git-issues/git-issue-2747.dfy.expect
deleted file mode 100644
index 881388148ee..00000000000
--- a/Test/git-issues/git-issue-2747.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-2747.dfy(8,9): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/git-issues/git-issue-276.dfy.expect b/Test/git-issues/git-issue-276.dfy.expect
deleted file mode 100644
index 039d4aa8d20..00000000000
--- a/Test/git-issues/git-issue-276.dfy.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-git-issue-276.dfy(7,10): Info: newtype byte resolves as {:nativeType "byte"} (Detected Range: 0 .. 256)
-git-issue-276.dfy(8,10): Info: newtype b0 resolves as {:nativeType "ushort"} (Detected Range: 0 .. 2560)
-git-issue-276.dfy(9,10): Info: newtype b1 resolves as {:nativeType "byte"} (Detected Range: 0 .. 5)
-git-issue-276.dfy(10,10): Info: newtype b2 resolves as {:nativeType "byte"} (Detected Range: 0 .. 10)
-git-issue-276.dfy(11,10): Info: newtype b3 resolves as {:nativeType "byte"} (Detected Range: 0 .. 5)
-git-issue-276.dfy(12,10): Info: newtype b3a resolves as {:nativeType "byte"} (Detected Range: 0 .. 5)
-git-issue-276.dfy(13,10): Info: newtype b4 resolves as {:nativeType "byte"} (Detected Range: 0 .. 7)
-git-issue-276.dfy(14,10): Info: newtype b4a resolves as {:nativeType "byte"} (Detected Range: 0 .. 7)
-git-issue-276.dfy(15,10): Info: newtype b5 resolves as {:nativeType "byte"} (Detected Range: 0 .. 42)
-git-issue-276.dfy(16,10): Info: newtype b6 resolves as {:nativeType "byte"} (Detected Range: 0 .. 20)
-git-issue-276.dfy(17,10): Info: newtype b7 resolves as {:nativeType "byte"} (Detected Range: 0 .. 42)
-git-issue-276.dfy(18,10): Info: newtype b8 resolves as {:nativeType "byte"} (Detected Range: 0 .. 20)
-git-issue-276.dfy(19,10): Info: newtype b9 resolves as {:nativeType "byte"} (Detected Range: 0 .. 42)
-git-issue-276.dfy(20,10): Info: newtype ba resolves as {:nativeType "byte"} (Detected Range: 0 .. 20)
-git-issue-276.dfy(21,10): Info: newtype b3b resolves as {:nativeType "byte"} (Detected Range: 0 .. 6)
-git-issue-276.dfy(22,10): Info: newtype b4b resolves as {:nativeType "byte"} (Detected Range: 0 .. 10)
-git-issue-276.dfy(38,10): Info: newtype cx resolves as {:nativeType "byte"} (Detected Range: 0 .. 4)
-git-issue-276.dfy(25,17): Error: result of operation might violate newtype constraint for 'byte'
-git-issue-276.dfy(29,18): Error: result of operation might violate newtype constraint for 'b2'
-git-issue-276.dfy(32,18): Error: result of operation might violate newtype constraint for 'b3'
-
-Dafny program verifier finished with 18 verified, 3 errors
diff --git a/Test/git-issues/git-issue-276a.dfy b/Test/git-issues/git-issue-276a.dfy
deleted file mode 100644
index b80c2a7279b..00000000000
--- a/Test/git-issues/git-issue-276a.dfy
+++ /dev/null
@@ -1,32 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /printTooltips "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module Main {
-  newtype b1 = x | 0 <= x < 3/(2-2)
-  newtype b2 = x | 0 <= x < 3%(2-2)
-  newtype b3 = x | 0 <= x < (3.0/(2.0-2.0)) as int
-  newtype b4 = x | 0 <= x < 1.5 as int
-  newtype b5 = x | 0 <= x < 1000.0 as bv8 as int
-  newtype b6 = x | 0 <= x < 100.5 as bv8 as int
-  newtype b8 = x | 0 <= x < 1000 as bv8 as int
-  newtype b9 = x | 0 <= x < 1000 as bv16 as bv8 as int
-  newtype b10 = x | 0 <= x < -1 as int as char as int
-  newtype b11 = x | 0 <= x < -1 as real as char as int
-  newtype b12 = x | 0 <= x < 1.5 as real as char as int
-  newtype b13 = x | 0 <= x < 'c' as bv2 as int
-  newtype b14 = x | 0 <= x < 0xffffff as bv32 as char as int
-  newtype b15 = x | 0 <= x < ((10 as bv8)/(0 as bv8)) as int
-  newtype b16 = x | 0 <= x < ((10 as bv8)%(0 as bv8)) as int
-  newtype b17 = x | 0 <= x < (10 as bv8 << -1) as int
-  newtype b18 = x | 0 <= x < (10 as bv8 >> -1) as int
-
-  newtype c0 = x | 0 <= x < 100
-  class Default {
-    static const cc1: c0 := 50
-  }
-  newtype c1 = x | 0 <= x < 50 as c0 // not constant-folded
-  newtype c2 = x: int | 0 <= x < Default.cc1 as int // evaluated
-
-  newtype c3 = x | 0 <= x < "abcde"[6] as int
-}
-
diff --git a/Test/git-issues/git-issue-276a.dfy.expect b/Test/git-issues/git-issue-276a.dfy.expect
deleted file mode 100644
index 8aed05ec055..00000000000
--- a/Test/git-issues/git-issue-276a.dfy.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-git-issue-276a.dfy(23,10): Info: newtype c0 resolves as {:nativeType "byte"} (Detected Range: 0 .. 100)
-git-issue-276a.dfy(27,10): Info: newtype c1 resolves as {:nativeType "byte"} (Detected Range: 0 .. 100)
-git-issue-276a.dfy(28,10): Info: newtype c2 resolves as {:nativeType "byte"} (Detected Range: 0 .. 50)
-git-issue-276a.dfy(5,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-git-issue-276a.dfy(5,26): Related location
-git-issue-276a.dfy(5,29): Error: possible division by zero
-git-issue-276a.dfy(6,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-git-issue-276a.dfy(6,26): Related location
-git-issue-276a.dfy(6,29): Error: possible division by zero
-git-issue-276a.dfy(7,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-git-issue-276a.dfy(7,26): Related location
-git-issue-276a.dfy(7,32): Error: possible division by zero
-git-issue-276a.dfy(8,32): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
-git-issue-276a.dfy(9,35): Error: value to be converted might not fit in bv8
-git-issue-276a.dfy(10,34): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
-git-issue-276a.dfy(11,33): Error: value to be converted might not fit in bv8
-git-issue-276a.dfy(12,41): Error: value to be converted might not fit in bv8
-git-issue-276a.dfy(13,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-git-issue-276a.dfy(13,27): Related location
-git-issue-276a.dfy(13,39): Error: value to be converted might not fit in char
-git-issue-276a.dfy(14,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-git-issue-276a.dfy(14,27): Related location
-git-issue-276a.dfy(14,40): Error: real value to be converted might not fit in char
-git-issue-276a.dfy(15,41): Error: the real-based number must be an integer (if you want truncation, apply .Floor to the real-based number)
-git-issue-276a.dfy(16,33): Error: value to be converted might not fit in bv2
-git-issue-276a.dfy(17,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-git-issue-276a.dfy(17,27): Related location
-git-issue-276a.dfy(17,46): Error: bit-vector value to be converted might not fit in char
-git-issue-276a.dfy(18,41): Error: possible division by zero
-git-issue-276a.dfy(19,41): Error: possible division by zero
-git-issue-276a.dfy(20,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-git-issue-276a.dfy(20,27): Related location
-git-issue-276a.dfy(20,40): Error: shift amount must be non-negative
-git-issue-276a.dfy(21,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-git-issue-276a.dfy(21,27): Related location
-git-issue-276a.dfy(21,40): Error: shift amount must be non-negative
-git-issue-276a.dfy(30,10): Error: cannot find witness that shows type is inhabited (only tried 0); try giving a hint through a 'witness' or 'ghost witness' clause, or use 'witness *' to treat as a possibly empty type
-git-issue-276a.dfy(30,26): Related location
-git-issue-276a.dfy(30,35): Error: index out of range
-
-Dafny program verifier finished with 4 verified, 27 errors
diff --git a/Test/git-issues/git-issue-276b.dfy.expect b/Test/git-issues/git-issue-276b.dfy.expect
deleted file mode 100644
index 36fc8e9cca7..00000000000
--- a/Test/git-issues/git-issue-276b.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-git-issue-276b.dfy(6,10): Info: newtype b0 resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276b.dfy(7,10): Info: newtype b1 resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276b.dfy(8,10): Info: newtype b2 resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276b.dfy(9,10): Info: newtype b3 resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276b.dfy(10,10): Info: newtype b4 resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276b.dfy(11,10): Info: newtype b5 resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276b.dfy(12,10): Info: newtype b6 resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276b.dfy(13,10): Info: newtype b7 resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276b.dfy(14,10): Info: newtype b8 resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276b.dfy(15,10): Info: newtype b9 resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-
-Dafny program verifier finished with 10 verified, 0 errors
diff --git a/Test/git-issues/git-issue-276c.dfy.expect b/Test/git-issues/git-issue-276c.dfy.expect
deleted file mode 100644
index b5c6b296b0e..00000000000
--- a/Test/git-issues/git-issue-276c.dfy.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-git-issue-276c.dfy(8,10): Info: newtype b0 resolves as {:nativeType "byte"} (Detected Range: 0 .. 10)
-git-issue-276c.dfy(9,10): Info: newtype b1 resolves as {:nativeType "byte"} (Detected Range: 0 .. 101)
-git-issue-276c.dfy(10,10): Info: newtype b2 resolves as {:nativeType "byte"} (Detected Range: 0 .. 101)
-git-issue-276c.dfy(11,10): Info: newtype b3 resolves as {:nativeType "byte"} (Detected Range: 0 .. 20)
-git-issue-276c.dfy(12,10): Info: newtype b4 resolves as {:nativeType "byte"} (Detected Range: 0 .. 200)
-git-issue-276c.dfy(13,10): Info: newtype b5 resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276c.dfy(14,10): Info: newtype b6 resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276c.dfy(15,10): Info: newtype b7 resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276c.dfy(16,10): Info: newtype b8 resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276c.dfy(17,10): Info: newtype b9 resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276c.dfy(18,10): Info: newtype ba resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276c.dfy(19,10): Info: newtype bb resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276c.dfy(20,10): Info: newtype bc resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276c.dfy(21,10): Info: newtype bd resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276c.dfy(22,10): Info: newtype be resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276c.dfy(23,10): Info: newtype bf resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276c.dfy(24,10): Info: newtype bg resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-
-Dafny program verifier finished with 18 verified, 0 errors
diff --git a/Test/git-issues/git-issue-276r.dfy.expect b/Test/git-issues/git-issue-276r.dfy.expect
deleted file mode 100644
index eecf2b52758..00000000000
--- a/Test/git-issues/git-issue-276r.dfy.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-git-issue-276r.dfy(6,10): Info: newtype b0 resolves as {:nativeType "byte"} (Detected Range: 0 .. 5)
-git-issue-276r.dfy(7,10): Info: newtype b1 resolves as {:nativeType "byte"} (Detected Range: 0 .. 1)
-git-issue-276r.dfy(8,10): Info: newtype b2 resolves as {:nativeType "byte"} (Detected Range: 0 .. 6)
-git-issue-276r.dfy(10,10): Info: newtype b4 resolves as {:nativeType "byte"} (Detected Range: 0 .. 2)
-git-issue-276r.dfy(11,10): Info: newtype b5 resolves as {:nativeType "ushort"} (Detected Range: 0 .. 1000)
-git-issue-276r.dfy(12,10): Info: newtype b6 resolves as {:nativeType "byte"} (Detected Range: 0 .. 99)
-git-issue-276r.dfy(13,10): Info: newtype b7 resolves as {:nativeType "ushort"} (Detected Range: 0 .. 2000)
-git-issue-276r.dfy(14,10): Info: newtype b8 resolves as {:nativeType "byte"} (Detected Range: 0 .. 20)
-git-issue-276r.dfy(15,10): Info: newtype b9 resolves as {:nativeType "byte"} (Detected Range: 0 .. 20)
-git-issue-276r.dfy(16,10): Info: newtype b10 resolves as {:nativeType "byte"} (Detected Range: 0 .. 30)
-git-issue-276r.dfy(17,10): Info: newtype b11 resolves as {:nativeType "byte"} (Detected Range: 0 .. 35)
-git-issue-276r.dfy(18,10): Info: newtype b12 resolves as {:nativeType "byte"} (Detected Range: 0 .. 35)
-git-issue-276r.dfy(19,10): Info: newtype b13 resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276r.dfy(20,10): Info: newtype b14 resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276r.dfy(21,10): Info: newtype b15 resolves as {:nativeType "byte"} (Detected Range: 0 .. 40)
-git-issue-276r.dfy(22,10): Info: newtype b16 resolves as {:nativeType "byte"} (Detected Range: 0 .. 35)
-
-Dafny program verifier finished with 17 verified, 0 errors
diff --git a/Test/git-issues/git-issue-276v.dfy.expect b/Test/git-issues/git-issue-276v.dfy.expect
deleted file mode 100644
index 5766d66e02c..00000000000
--- a/Test/git-issues/git-issue-276v.dfy.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-git-issue-276v.dfy(8,10): Info: newtype b0 resolves as {:nativeType "byte"} (Detected Range: 0 .. 57)
-git-issue-276v.dfy(9,10): Info: newtype b1 resolves as {:nativeType "byte"} (Detected Range: 0 .. 239)
-git-issue-276v.dfy(10,10): Info: newtype b2 resolves as {:nativeType "byte"} (Detected Range: 0 .. 228)
-git-issue-276v.dfy(11,10): Info: newtype b3 resolves as {:nativeType "byte"} (Detected Range: 0 .. 1)
-git-issue-276v.dfy(12,10): Info: newtype b4 resolves as {:nativeType "byte"} (Detected Range: 0 .. 17)
-git-issue-276v.dfy(13,10): Info: newtype b5 resolves as {:nativeType "byte"} (Detected Range: 0 .. 17)
-git-issue-276v.dfy(14,10): Info: newtype b6 resolves as {:nativeType "byte"} (Detected Range: 0 .. 4)
-git-issue-276v.dfy(15,10): Info: newtype b7 resolves as {:nativeType "byte"} (Detected Range: 0 .. 49)
-git-issue-276v.dfy(16,10): Info: newtype b8 resolves as {:nativeType "byte"} (Detected Range: 0 .. 53)
-git-issue-276v.dfy(17,10): Info: newtype b9 resolves as {:nativeType "byte"} (Detected Range: 0 .. 235)
-git-issue-276v.dfy(18,10): Info: newtype ba resolves as {:nativeType "byte"} (Detected Range: 0 .. 24)
-git-issue-276v.dfy(19,10): Info: newtype bb resolves as {:nativeType "byte"} (Detected Range: 0 .. 24)
-git-issue-276v.dfy(20,10): Info: newtype bc resolves as {:nativeType "byte"} (Detected Range: 0 .. 56)
-git-issue-276v.dfy(21,10): Info: newtype bd resolves as {:nativeType "byte"} (Detected Range: 0 .. 56)
-git-issue-276v.dfy(22,10): Info: newtype be resolves as {:nativeType "byte"} (Detected Range: 0 .. 56)
-git-issue-276v.dfy(23,10): Info: newtype bf resolves as {:nativeType "byte"} (Detected Range: 0 .. 24)
-git-issue-276v.dfy(24,10): Info: newtype bg resolves as {:nativeType "byte"} (Detected Range: 0 .. 64)
-git-issue-276v.dfy(25,10): Info: newtype bh resolves as {:nativeType "byte"} (Detected Range: 0 .. 18)
-
-Dafny program verifier finished with 18 verified, 0 errors
diff --git a/Test/git-issues/git-issue-277.dfy b/Test/git-issues/git-issue-277.dfy
deleted file mode 100644
index d7df3280be1..00000000000
--- a/Test/git-issues/git-issue-277.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:3 /optimize /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method m(a : array<int>) {
-	assert a[..true] == a[..true];
-}
diff --git a/Test/git-issues/git-issue-2828.dfy b/Test/git-issues/git-issue-2828.dfy
deleted file mode 100644
index b7526139af5..00000000000
--- a/Test/git-issues/git-issue-2828.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %exits-with 2 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method M()
-{
-  assert arr[0];
-}
diff --git a/Test/git-issues/git-issue-2878.dfy b/Test/git-issues/git-issue-2878.dfy
deleted file mode 100644
index 467f96c1cf0..00000000000
--- a/Test/git-issues/git-issue-2878.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method test() returns (a: bool, b: int) {
-  return (true, 0);
-}
diff --git a/Test/git-issues/git-issue-288.dfy b/Test/git-issues/git-issue-288.dfy
deleted file mode 100644
index 1a71d736992..00000000000
--- a/Test/git-issues/git-issue-288.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  type T = int
-}
-
-module B refines A {
-  type T = int
-}
diff --git a/Test/git-issues/git-issue-2885.dfy b/Test/git-issues/git-issue-2885.dfy
deleted file mode 100644
index 2401aa08fcb..00000000000
--- a/Test/git-issues/git-issue-2885.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:1 /compileTarget:cs "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype KeyValues<T> = Store(underlying: map<string, T> := map[])
-
-function CreateStore<T>(): (r: KeyValues<T>) {
-  Store()
-}
diff --git a/Test/git-issues/git-issue-2920.dfy b/Test/git-issues/git-issue-2920.dfy
deleted file mode 100644
index 6ff0e1aed33..00000000000
--- a/Test/git-issues/git-issue-2920.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype D = D(x: int)
-
-ghost function Foo(): ()
-  ensures assert true by { var D(x) := D(0); } true
-{ () }
diff --git a/Test/git-issues/git-issue-2959.dfy b/Test/git-issues/git-issue-2959.dfy
deleted file mode 100644
index bce0d4ff9b8..00000000000
--- a/Test/git-issues/git-issue-2959.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %exits-with 3 %baredafny build --show-snippets:false --use-basename-for-filename --enforce-determinism "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method NondetIf() returns (x: int) {
-  if * {
-    x := 0;
-  } else {
-    x := 1;
-  }
-}
-
-method NondetAssign() returns (x: int) {
-  x := *;
-}
diff --git a/Test/git-issues/git-issue-3059.dfy b/Test/git-issues/git-issue-3059.dfy
deleted file mode 100644
index 3b064d973f0..00000000000
--- a/Test/git-issues/git-issue-3059.dfy
+++ /dev/null
@@ -1,59 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-type seq0 = s: seq<int> | forall n <- s :: n == 0
-
-ghost function ReplaceInSeq0_Rejects(s: seq0): seq0
-  requires |s| > 0
-  ensures false
-{
-  var s' := s[0 := 1];
-  assert s'[0] != 0;
-  s'
-}
-
-ghost function ReplaceInSeq0_Accepts(s: seq0): seq<int>
-  requires |s| > 0
-{
-  var s' := s[0 := 1];
-  assert s'[0] != 0;
-  s'
-}
-
-type map0 = m: map<int, int> | forall k <- m :: m[k] == 0
-
-ghost function AddInMap0_Rejects(m: map0): map0
-  ensures false
-{
-  m[0 := 1]
-}
-
-ghost function AddInMap0_Accepts(m: map0): map<int, int>
-{
-  m[0 := 1]
-}
-
-ghost function RecoverType<T>(a: T): T { a }
-
-method AddInMap0_Proxy_Rejects() returns (r: map0)
-  ensures false
-{
-  var m; // The type of m is to be inferred, but that won't happen until
-         // after type inference has processed the assignment to r.
-  r := m[1 := 7];
-  // To trigger the unsoundness, the verifier needs to be reminded that
-  // r is a variable of type map0. That is done by the following little
-  // trick:
-  ghost var u := RecoverType<map0>(r);
-}
-
-method AddInMap0_Proxy_Accepts() returns (r: map<int, int>)
-{
-  var m; // The type of m is to be inferred, but that won't happen until
-         // after type inference has processed the assignment to r.
-  r := m[1 := 7];
-  // To trigger the unsoundness, the verifier needs to be reminded that
-  // r is a variable of type map0. That is done by the following little
-  // trick:
-  ghost var u := RecoverType<map<int, int>>(r);
-}
diff --git a/Test/git-issues/git-issue-3059.dfy.expect b/Test/git-issues/git-issue-3059.dfy.expect
deleted file mode 100644
index 90a9984aca4..00000000000
--- a/Test/git-issues/git-issue-3059.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-git-issue-3059.dfy(12,2): Error: value does not satisfy the subset constraints of 'seq0'
-git-issue-3059.dfy(28,3): Error: value does not satisfy the subset constraints of 'map0'
-git-issue-3059.dfy(43,8): Error: value does not satisfy the subset constraints of 'map0'
-
-Dafny program verifier finished with 3 verified, 3 errors
diff --git a/Test/git-issues/git-issue-3095.dfy.expect b/Test/git-issues/git-issue-3095.dfy.expect
deleted file mode 100644
index c47296d065f..00000000000
--- a/Test/git-issues/git-issue-3095.dfy.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-git-issue-3095.dfy(18,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(19,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(25,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(25,16): Warning: {:only} only accepts "before" or "after" as an optional argument
-git-issue-3095.dfy(26,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(32,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(40,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(49,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(51,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(62,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(71,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(73,11): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(83,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(85,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(93,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(95,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(103,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(105,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(114,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(116,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-3095.dfy(19,19): Error: assertion might not hold
-git-issue-3095.dfy(26,21): Error: assertion might not hold
-git-issue-3095.dfy(27,15): Error: assertion might not hold
-git-issue-3095.dfy(32,19): Error: assertion might not hold
-git-issue-3095.dfy(40,27): Error: assertion might not hold
-git-issue-3095.dfy(41,11): Error: assertion might not hold
-git-issue-3095.dfy(42,11): Error: assertion might not hold
-git-issue-3095.dfy(43,0): Error: out-parameter 'j', which is subject to definite-assignment rules, might be uninitialized at this return point
-git-issue-3095.dfy(51,29): Error: assertion might not hold
-git-issue-3095.dfy(52,13): Error: assertion might not hold
-git-issue-3095.dfy(60,11): Error: assertion might not hold
-git-issue-3095.dfy(61,11): Error: assertion might not hold
-git-issue-3095.dfy(62,28): Error: assertion might not hold
-git-issue-3095.dfy(71,19): Error: assertion might not hold
-git-issue-3095.dfy(72,13): Error: assertion might not hold
-git-issue-3095.dfy(73,30): Error: assertion might not hold
-git-issue-3095.dfy(83,27): Error: assertion might not hold
-git-issue-3095.dfy(84,11): Error: assertion might not hold
-git-issue-3095.dfy(85,28): Error: assertion might not hold
-git-issue-3095.dfy(92,11): Error: assertion might not hold
-git-issue-3095.dfy(93,28): Error: assertion might not hold
-git-issue-3095.dfy(95,27): Error: assertion might not hold
-git-issue-3095.dfy(96,11): Error: assertion might not hold
-git-issue-3095.dfy(97,0): Error: out-parameter 'j', which is subject to definite-assignment rules, might be uninitialized at this return point
-git-issue-3095.dfy(103,19): Error: assertion might not hold
-git-issue-3095.dfy(113,11): Error: assertion might not hold
-git-issue-3095.dfy(114,28): Error: assertion might not hold
-
-Dafny program verifier finished with 0 verified, 27 errors
diff --git a/Test/git-issues/git-issue-321.dfy b/Test/git-issues/git-issue-321.dfy
deleted file mode 100644
index 29d91342fda..00000000000
--- a/Test/git-issues/git-issue-321.dfy
+++ /dev/null
@@ -1,21 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method h(n: nat) {
-  var a: array<nat> := new [n](i => i); // OK - i is nat, RHS is array<nat>
-}
-
-method k(n: nat) {
-  var a: array := new [n]((i: nat) => i as nat); // OK
-}
-
-method p(n: nat) {
-  var init: nat -> nat := i => i;
-  var a: array := new [n](init); // OK
-}
-
-method q(n: nat) {
-  var init: int -> int := i => i;
-  var a: array<nat> := new [n](init); // ERROR
-  var b: array<nat> := new nat[n](init); // OK
-}
diff --git a/Test/git-issues/git-issue-321.dfy.expect b/Test/git-issues/git-issue-321.dfy.expect
deleted file mode 100644
index 468e123b7c1..00000000000
--- a/Test/git-issues/git-issue-321.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue-321.dfy(19,20): Error: type array<int> is not assignable to LHS (of type array<nat>) (nonvariance for type parameter expects nat = int)
-1 resolution/type errors detected in git-issue-321.dfy
diff --git a/Test/git-issues/git-issue-321a.dfy b/Test/git-issues/git-issue-321a.dfy
deleted file mode 100644
index 10efabbf015..00000000000
--- a/Test/git-issues/git-issue-321a.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-type lowercase = ch | 'a' <= ch <= 'z' witness 'd'
-
-method InitTests() {
-  var aa := new lowercase[3];
-  var s := "hello";
-  aa := new lowercase[|s|](i requires 0 <= i < |s| => s[i]);
-}
-
diff --git a/Test/git-issues/git-issue-324.dfy.expect b/Test/git-issues/git-issue-324.dfy.expect
deleted file mode 100644
index bad306d7e9d..00000000000
--- a/Test/git-issues/git-issue-324.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue-324.dfy(23,16): Error: The abstract import named Impl1 (using :) may only be used in an abstract module declaration
-1 resolution/type errors detected in git-issue-324.dfy
diff --git a/Test/git-issues/git-issue-3243.dfy.expect b/Test/git-issues/git-issue-3243.dfy.expect
deleted file mode 100644
index eb0ff1a3789..00000000000
--- a/Test/git-issues/git-issue-3243.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-git-issue-3243.dfy(19,2): Warning: note, this loop has no body (loop frame: i)
-git-issue-3243.dfy(10,16): Error: this loop invariant could not be proved on entry
-git-issue-3243.dfy(10,16): Related message: loop invariant violation
-git-issue-3243.dfy(21,16): Error: this loop invariant could not be proved on entry
-git-issue-3243.dfy(21,16): Related message: loop invariant violation
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/git-issues/git-issue-3267.dfy.expect b/Test/git-issues/git-issue-3267.dfy.expect
deleted file mode 100644
index d5e4f928774..00000000000
--- a/Test/git-issues/git-issue-3267.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Error: 'zzzz': The first input must be a command or a legacy option or file with supported extension
-*** Error: 'test.d': Filename extension '.d' is not supported. Input files must be Dafny programs (.dfy) or supported auxiliary files (.cs, .dll)
-*** Error: Command-line argument '--zzzz' is neither a recognized option nor a filename with a supported extension (.dfy).
-*** Error: Command-line argument 'test' is neither a recognized option nor a filename with a supported extension (.dfy).
-*** Error: 'test.d': Filename extension '.d' is not supported. Input files must be Dafny programs (.dfy) or supported auxiliary files ()
-*** Error: 'test.d': Filename extension '.d' is not supported. Input files must be Dafny programs (.dfy) or supported auxiliary files (.cs, .dll)
-*** Error: Command-line argument 'zzzz' is neither a recognized option nor a filename with a supported extension (.dfy, .cs, .dll).
diff --git a/Test/git-issues/git-issue-327a.dfy b/Test/git-issues/git-issue-327a.dfy
deleted file mode 100644
index 1869ffa7f30..00000000000
--- a/Test/git-issues/git-issue-327a.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  module X { }
-}
-module B {
-  import A.X  // used to require an 'import A' first
-}
-
diff --git a/Test/git-issues/git-issue-327cir.dfy b/Test/git-issues/git-issue-327cir.dfy
deleted file mode 100644
index e90010ff323..00000000000
--- a/Test/git-issues/git-issue-327cir.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-
-module A {
-  module B {
-    module C {
-      import A.B
-    }
-  }
-
-}
-
diff --git a/Test/git-issues/git-issue-327cir1.dfy b/Test/git-issues/git-issue-327cir1.dfy
deleted file mode 100644
index b808ac366e6..00000000000
--- a/Test/git-issues/git-issue-327cir1.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-
-module A {
-  module B {
-    module C {
-    }
-  }
-
-  import B
-}
-
diff --git a/Test/git-issues/git-issue-327cir1.dfy.expect b/Test/git-issues/git-issue-327cir1.dfy.expect
deleted file mode 100644
index b92432eb5cd..00000000000
--- a/Test/git-issues/git-issue-327cir1.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue-327cir1.dfy(11,9): Error: Import declaration uses same name as a module in the same scope: B
-1 resolution/type errors detected in git-issue-327cir1.dfy
diff --git a/Test/git-issues/git-issue-327cir2.dfy b/Test/git-issues/git-issue-327cir2.dfy
deleted file mode 100644
index bfcbcb279e9..00000000000
--- a/Test/git-issues/git-issue-327cir2.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Error - circular
-
-module D {
-  import E
-}
-
-module E {
-  import D
-}
diff --git a/Test/git-issues/git-issue-327cir3.dfy b/Test/git-issues/git-issue-327cir3.dfy
deleted file mode 100644
index 9acededdc07..00000000000
--- a/Test/git-issues/git-issue-327cir3.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {  // error: cyclic import
-  import B
-  module X { }
-}
-module B {
-  import A.X
-}
-
diff --git a/Test/git-issues/git-issue-327cir4.dfy b/Test/git-issues/git-issue-327cir4.dfy
deleted file mode 100644
index 6232e5a9973..00000000000
--- a/Test/git-issues/git-issue-327cir4.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Error - circular
-
-module D {
-  module E {
-    import D
-  }
-}
diff --git a/Test/git-issues/git-issue-3294.dfy b/Test/git-issues/git-issue-3294.dfy
deleted file mode 100644
index d3b35115e7a..00000000000
--- a/Test/git-issues/git-issue-3294.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /library:"%s" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype FailureRestrictedType<T, R> = Failure
-
-method m() returns (r: FailureRestrictedType<bool, bool>) {
-    :- Failure;
-    r := Failure;
-}
diff --git a/Test/git-issues/git-issue-3294.dfy.expect b/Test/git-issues/git-issue-3294.dfy.expect
deleted file mode 100644
index 53f65df4b6e..00000000000
--- a/Test/git-issues/git-issue-3294.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue-3294.dfy(7,4): Error: member IsFailure does not exist in FailureRestrictedType<?, ?>, in :- statement
-1 resolution/type errors detected in git-issue-3294.dfy
diff --git a/Test/git-issues/git-issue-3304b.dfy.expect b/Test/git-issues/git-issue-3304b.dfy.expect
deleted file mode 100644
index 947f7140c06..00000000000
--- a/Test/git-issues/git-issue-3304b.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-git-issue-3304b.dfy(5,9): Error: assertion might not hold
-  |
-5 |   assert false;
-  |          ^^^^^
-
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/git-issues/git-issue-343.dfy b/Test/git-issues/git-issue-343.dfy
deleted file mode 100644
index f076f872961..00000000000
--- a/Test/git-issues/git-issue-343.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method f(a: seq<int>) {
-  var t := a[a .. 1];
-}
diff --git a/Test/git-issues/git-issue-3449.dfy.expect b/Test/git-issues/git-issue-3449.dfy.expect
deleted file mode 100644
index d9e909b464c..00000000000
--- a/Test/git-issues/git-issue-3449.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue-3449.dfy(11,11): Error: assertion could not be proved
-git-issue-3449.dfy(13,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/git-issues/git-issue-3451/git-issue-3451a.dfy.expect b/Test/git-issues/git-issue-3451/git-issue-3451a.dfy.expect
deleted file mode 100644
index 847b628e43e..00000000000
--- a/Test/git-issues/git-issue-3451/git-issue-3451a.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-3451a.dfy(5,0): Error: this symbol not expected in Dafny
-git-issue-3451a.dfy(1,0): Warning: File contains no code
-1 parse errors detected in git-issue-3451a.dfy
diff --git a/Test/git-issues/git-issue-3461.dfy.expect b/Test/git-issues/git-issue-3461.dfy.expect
deleted file mode 100644
index 72379bc71f5..00000000000
--- a/Test/git-issues/git-issue-3461.dfy.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-git-issue-3461.dfy(4,0): Error: a method cannot be declared 'opaque'
-git-issue-3461.dfy(11,0): Error: a class cannot be declared 'opaque'
-git-issue-3461.dfy(12,0): Error: a datatype or codatatype cannot be declared 'opaque'
-git-issue-3461.dfy(13,0): Error: a newtype cannot be declared 'opaque'
-git-issue-3461.dfy(14,0): Error: a subset type cannot be declared 'opaque'
-git-issue-3461.dfy(17,2): Warning: opaque is deprecated as an identifier. It will soon become a reserved word. Use a different name.
-git-issue-3461.dfy(17,2): Error: missing semicolon at end of statement
-git-issue-3461.dfy(18,0): Error: this symbol not expected in VarDeclStatement
-7 parse errors detected in git-issue-3461.dfy
diff --git a/Test/git-issues/git-issue-3461b.dfy.expect b/Test/git-issues/git-issue-3461b.dfy.expect
deleted file mode 100644
index 57fd53648b4..00000000000
--- a/Test/git-issues/git-issue-3461b.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-3461b.dfy(7,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 2 verified, 1 error
diff --git a/Test/git-issues/git-issue-3496.dfy b/Test/git-issues/git-issue-3496.dfy
deleted file mode 100644
index 7f667e5972e..00000000000
--- a/Test/git-issues/git-issue-3496.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %resolve "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method m() {
-  assume true;
-}
-
-method p() {
-  assume {:axiom} true;
-}
diff --git a/Test/git-issues/git-issue-3497.dfy b/Test/git-issues/git-issue-3497.dfy
deleted file mode 100644
index d452775c850..00000000000
--- a/Test/git-issues/git-issue-3497.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %resolve "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method m() {
-  forall 
-    ensures true 
-  {
-  }
-}
diff --git a/Test/git-issues/git-issue-351.dfy b/Test/git-issues/git-issue-351.dfy
deleted file mode 100644
index 5867d274c2b..00000000000
--- a/Test/git-issues/git-issue-351.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-
-function DecodeRecursively(s: seq<int>): (b: seq<int>) {
-  seq(|s|, i requires 0 <= i < |s| =>
-    var d := s[0]; // this line produced the reported error, prior to the fix
-    s[i]
-  )
-}
diff --git a/Test/git-issues/git-issue-3513/git-issue-3513.dfy b/Test/git-issues/git-issue-3513/git-issue-3513.dfy
deleted file mode 100644
index 2fdd65f2c73..00000000000
--- a/Test/git-issues/git-issue-3513/git-issue-3513.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %exits-with 2 %baredafny resolve --show-snippets:false --use-basename-for-filename "%s" > "%t"
-// RUN: %exits-with 2 %baredafny resolve --show-snippets:false --use-basename-for-filename --library:"%S/src/A.dfy" "%s" >> "%t"
-// RUN: %baredafny resolve --show-snippets:false --use-basename-for-filename --library:"%S/src/A.dfy,%S/src/sub/B.dfy" "%s" >> "%t"
-// RUN: %baredafny resolve --show-snippets:false --use-basename-for-filename --library:"%S/src/A.dfy , %S/src/sub/B.dfy" "%s" >> "%t"
-// RUN: %baredafny resolve --show-snippets:false --use-basename-for-filename --library:"%S/src" "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M {
-  import A
-}
diff --git a/Test/git-issues/git-issue-353.dfy b/Test/git-issues/git-issue-353.dfy
deleted file mode 100644
index 90ff09d0541..00000000000
--- a/Test/git-issues/git-issue-353.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-type A = s : seq<int> | |s| < 10
-
-method f(a: seq<A>)
-  ensures multiset(a[..]) == multiset(a[..])
-{
-}
diff --git a/Test/git-issues/git-issue-354.dfy b/Test/git-issues/git-issue-354.dfy
deleted file mode 100644
index c3d63021209..00000000000
--- a/Test/git-issues/git-issue-354.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-class C<X(0)> {
-  static const u: X
-}
-
-method Main() {
-  print C<int>.u, "\n";
-  print C<nat>.u, "\n";
-  print C<real>.u, "\n";
-  print C<bool>.u, "\n";
-}
-
diff --git a/Test/git-issues/git-issue-3549a.dfy b/Test/git-issues/git-issue-3549a.dfy
deleted file mode 100644
index 9ce07b0f267..00000000000
--- a/Test/git-issues/git-issue-3549a.dfy
+++ /dev/null
@@ -1,2 +0,0 @@
-// RUN: %exits-with 1 %baredafny "" 2> "%t"
-// RUN: %diff "%s.expect" "%t"
diff --git a/Test/git-issues/git-issue-3549a.dfy.expect b/Test/git-issues/git-issue-3549a.dfy.expect
deleted file mode 100644
index 32d93e22db0..00000000000
--- a/Test/git-issues/git-issue-3549a.dfy.expect
+++ /dev/null
@@ -1 +0,0 @@
-Invalid filename: The path is empty. (Parameter 'path')
diff --git a/Test/git-issues/git-issue-3549b.dfy b/Test/git-issues/git-issue-3549b.dfy
deleted file mode 100644
index 2f565e87b9e..00000000000
--- a/Test/git-issues/git-issue-3549b.dfy
+++ /dev/null
@@ -1,2 +0,0 @@
-// RUN: %exits-with 1 %baredafny resolve "" 2> "%t"
-// RUN: %diff "%s.expect" "%t"
diff --git a/Test/git-issues/git-issue-3549b.dfy.expect b/Test/git-issues/git-issue-3549b.dfy.expect
deleted file mode 100644
index 87de056fa9f..00000000000
--- a/Test/git-issues/git-issue-3549b.dfy.expect
+++ /dev/null
@@ -1 +0,0 @@
-*** Error: No input files were specified in command-line resolve|.
diff --git a/Test/git-issues/git-issue-3605.dfy.expect b/Test/git-issues/git-issue-3605.dfy.expect
deleted file mode 100644
index 4b18080bd01..00000000000
--- a/Test/git-issues/git-issue-3605.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-3605.dfy(15,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/git-issues/git-issue-3691.dfy b/Test/git-issues/git-issue-3691.dfy
deleted file mode 100644
index 8f0d5e155bc..00000000000
--- a/Test/git-issues/git-issue-3691.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %exits-with 0 %dafny /compile:0 /functionSyntax:4 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-trait A {
-  predicate f()
-  method g() ensures f()
-}
-
-class B<T> extends A {
-  predicate f() { true }
-  method g() ensures f()
-}
diff --git a/Test/git-issues/git-issue-370.dfy.expect b/Test/git-issues/git-issue-370.dfy.expect
deleted file mode 100644
index a12ae32d4a3..00000000000
--- a/Test/git-issues/git-issue-370.dfy.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-git-issue-370.dfy(45,0): Error: a postcondition could not be proved on this return path
-git-issue-370.dfy(43,7): Related location: this is the postcondition that could not be proved
-git-issue-370.dfy(19,5): Related location
-git-issue-370.dfy(45,0): Error: a postcondition could not be proved on this return path
-git-issue-370.dfy(44,7): Related location: this is the postcondition that could not be proved
-git-issue-370.dfy(29,9): Related location
-git-issue-370.dfy(45,0): Error: a postcondition could not be proved on this return path
-git-issue-370.dfy(44,7): Related location: this is the postcondition that could not be proved
-git-issue-370.dfy(30,9): Related location
-git-issue-370.dfy(45,0): Error: a postcondition could not be proved on this return path
-git-issue-370.dfy(44,7): Related location: this is the postcondition that could not be proved
-git-issue-370.dfy(31,9): Related location
-git-issue-370.dfy(45,0): Error: a postcondition could not be proved on this return path
-git-issue-370.dfy(44,7): Related location: this is the postcondition that could not be proved
-git-issue-370.dfy(32,9): Related location
-
-Dafny program verifier finished with 1 verified, 5 errors
diff --git a/Test/git-issues/git-issue-370b.dfy b/Test/git-issues/git-issue-370b.dfy
deleted file mode 100644
index 6b3d2d3ea36..00000000000
--- a/Test/git-issues/git-issue-370b.dfy
+++ /dev/null
@@ -1,47 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Issue 370 reported a situation where there were 6 errors, but only 5 of
-// them are reported, since there's a limit of 5 error messages per method.
-// The confusing part was that the omitted error was the first of the 6,
-// which makes it appear as if there's no problem with postcondition
-// WellFormed(t) of foo(). While the ordering of error messages is not
-// guaranteed to be deterministic, the current behavior for this test happens
-// to be good, so this test file is meant to alert us to any changes, in
-// case we then want to revisit this issue in some way.
-
-datatype T = T(x: int)
-datatype S = S(u: int, v: int, w: int, x: int, y: int, z: int)
-
-predicate a(t: T)
-
-predicate WellFormed(t: T) {
-  && a(t)
-}
-
-function Func(t: T): S
-  requires WellFormed(t)  // Note, there should be NO complaint about this precondition in foo() below.
-{
-  S(t.x, t.x, t.x, t.x, t.x, t.x)
-}
-
-predicate Good(s: S) {
-  && s.u == 5
-  && s.v == 5
-  && s.w == 5
-  && s.x == 5
-  && s.y == 5
-  && s.z == 5
-}
-
-opaque function GetT(): T {
-  T(5)
-}
-
-lemma foo()
-  ensures var t := GetT();
-    && WellFormed(t)  // error (1x)
-    && Good(Func(t))  // error (5x, but only 4 of these are reported, due to the limit of 5 errors per method)
-{
-  reveal GetT();
-}
diff --git a/Test/git-issues/git-issue-370b.dfy.expect b/Test/git-issues/git-issue-370b.dfy.expect
deleted file mode 100644
index 2afc3d74c95..00000000000
--- a/Test/git-issues/git-issue-370b.dfy.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-git-issue-370b.dfy(45,0): Error: a postcondition could not be proved on this return path
-git-issue-370b.dfy(43,7): Related location: this is the postcondition that could not be proved
-git-issue-370b.dfy(19,5): Related location
-git-issue-370b.dfy(45,0): Error: a postcondition could not be proved on this return path
-git-issue-370b.dfy(44,7): Related location: this is the postcondition that could not be proved
-git-issue-370b.dfy(29,9): Related location
-git-issue-370b.dfy(45,0): Error: a postcondition could not be proved on this return path
-git-issue-370b.dfy(44,7): Related location: this is the postcondition that could not be proved
-git-issue-370b.dfy(30,9): Related location
-git-issue-370b.dfy(45,0): Error: a postcondition could not be proved on this return path
-git-issue-370b.dfy(44,7): Related location: this is the postcondition that could not be proved
-git-issue-370b.dfy(31,9): Related location
-git-issue-370b.dfy(45,0): Error: a postcondition could not be proved on this return path
-git-issue-370b.dfy(44,7): Related location: this is the postcondition that could not be proved
-git-issue-370b.dfy(32,9): Related location
-
-Dafny program verifier finished with 1 verified, 5 errors
diff --git a/Test/git-issues/git-issue-371-errors.dfy.expect b/Test/git-issues/git-issue-371-errors.dfy.expect
deleted file mode 100644
index d2cba20241c..00000000000
--- a/Test/git-issues/git-issue-371-errors.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-371-errors.dfy(25,9): Error: Duplicate name of import: M
-git-issue-371-errors.dfy(21,7): Error: Import declaration uses same name as a module in the same scope: M
-2 resolution/type errors detected in git-issue-371-errors.dfy
diff --git a/Test/git-issues/git-issue-3719.dfy.expect b/Test/git-issues/git-issue-3719.dfy.expect
deleted file mode 100644
index 661b40fa943..00000000000
--- a/Test/git-issues/git-issue-3719.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue-3719.dfy(12,9): Error: assertion might not hold
-git-issue-3719.dfy(7,37): Related location
-
-Dafny program verifier finished with 3 verified, 1 error
diff --git a/Test/git-issues/git-issue-374.dfy b/Test/git-issues/git-issue-374.dfy
deleted file mode 100644
index 15b56ec6396..00000000000
--- a/Test/git-issues/git-issue-374.dfy
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-class C {
-  constructor(ghost x: int)
-  {
-  }
-}
-
-ghost function f() : int { 0 }
-
-method Main() {
-  var c := new C(f());
-}
-
diff --git a/Test/git-issues/git-issue-3757.dfy.expect b/Test/git-issues/git-issue-3757.dfy.expect
deleted file mode 100644
index c95d9cce865..00000000000
--- a/Test/git-issues/git-issue-3757.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-3757.dfy(5,0): Error: expected an identifier after 'const' and any attributes
-git-issue-3757.dfy(1,0): Warning: File contains no code
-1 parse errors detected in git-issue-3757.dfy
diff --git a/Test/git-issues/git-issue-3804.dfy.expect b/Test/git-issues/git-issue-3804.dfy.expect
deleted file mode 100644
index 6e33309248a..00000000000
--- a/Test/git-issues/git-issue-3804.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-git-issue-3804.dfy(9,17): Error: assertion might not hold
-git-issue-3804.dfy(20,17): Error: assertion might not hold
-git-issue-3804.dfy(22,10): Error: assertion might not hold
-git-issue-3804.dfy(31,17): Error: assertion might not hold
-git-issue-3804.dfy(48,10): Error: assertion might not hold
-git-issue-3804.dfy(69,10): Error: assertion might not hold
-
-Dafny program verifier finished with 2 verified, 6 errors
diff --git a/Test/git-issues/git-issue-3804b.dfy.expect b/Test/git-issues/git-issue-3804b.dfy.expect
deleted file mode 100644
index 04076ef15b3..00000000000
--- a/Test/git-issues/git-issue-3804b.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-git-issue-3804b.dfy(14,9): Error: a postcondition could not be proved on this return path
-git-issue-3804b.dfy(16,12): Related location: this is the postcondition that could not be proved
-git-issue-3804b.dfy(23,9): Error: a postcondition could not be proved on this return path
-git-issue-3804b.dfy(25,12): Related location: this is the postcondition that could not be proved
-git-issue-3804b.dfy(40,20): Error: assertion might not hold
-git-issue-3804b.dfy(48,21): Error: assertion might not hold
-
-Dafny program verifier finished with 5 verified, 4 errors
diff --git a/Test/git-issues/git-issue-3804c.dfy.expect b/Test/git-issues/git-issue-3804c.dfy.expect
deleted file mode 100644
index 7aa1c97d1c8..00000000000
--- a/Test/git-issues/git-issue-3804c.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue-3804c.dfy(15,21): Error: assertion might not hold
-git-issue-3804c.dfy(20,21): Error: assertion might not hold
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/git-issues/git-issue-3804d.dfy.expect b/Test/git-issues/git-issue-3804d.dfy.expect
deleted file mode 100644
index 21fcaa9a765..00000000000
--- a/Test/git-issues/git-issue-3804d.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-git-issue-3804d.dfy(12,37): Error: cannot reveal 'q' because no constant, assert label, or requires label in the current scope is named 'q'
-git-issue-3804d.dfy(16,34): Error: cannot reveal 'p' because no constant, assert label, or requires label in the current scope is named 'p'
-git-issue-3804d.dfy(18,9): Error: cannot reveal 'q' because no constant, assert label, or requires label in the current scope is named 'q'
-git-issue-3804d.dfy(18,12): Error: cannot reveal 'p' because no constant, assert label, or requires label in the current scope is named 'p'
-4 resolution/type errors detected in git-issue-3804d.dfy
diff --git a/Test/git-issues/git-issue-3839/git-issue-3839a.dfy b/Test/git-issues/git-issue-3839/git-issue-3839a.dfy
deleted file mode 100644
index 467b950aafe..00000000000
--- a/Test/git-issues/git-issue-3839/git-issue-3839a.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: ! %baredafny test --use-basename-for-filename --show-snippets:false "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method {:test} M(x: int) returns (r: int)
-{
-    expect x != x;
-    return x;
-}
diff --git a/Test/git-issues/git-issue-3839/git-issue-3839a.dfy.expect b/Test/git-issues/git-issue-3839/git-issue-3839a.dfy.expect
deleted file mode 100644
index 06d273e175f..00000000000
--- a/Test/git-issues/git-issue-3839/git-issue-3839a.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue-3839a.dfy(4,15): Error: Methods with the :test attribute may not have input arguments
-1 resolution/type errors detected in git-issue-3839a.dfy
diff --git a/Test/git-issues/git-issue-3855.dfy.expect b/Test/git-issues/git-issue-3855.dfy.expect
deleted file mode 100644
index b9a9258c467..00000000000
--- a/Test/git-issues/git-issue-3855.dfy.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-git-issue-3855.dfy(800,0): Warning: attribute :ignore is deprecated
-git-issue-3855.dfy(1336,20): Error: a precondition for this call could not be proved
-git-issue-3855.dfy(433,36): Related location: this is the precondition that could not be proved
-git-issue-3855.dfy(800,11): Verification of 'Memory.dynMove (correctness)' timed out after 1 seconds
-git-issue-3855.dfy(943,17): Error: a precondition for this call could not be proved
-git-issue-3855.dfy(429,29): Related location: this is the precondition that could not be proved
-git-issue-3855.dfy(943,17): Error: a precondition for this call could not be proved
-git-issue-3855.dfy(433,36): Related location: this is the precondition that could not be proved
-
-Dafny program verifier finished with 69 verified, 3 errors, 1 time out
diff --git a/Test/git-issues/git-issue-3873.dfy b/Test/git-issues/git-issue-3873.dfy
deleted file mode 100644
index 064fc77ad3e..00000000000
--- a/Test/git-issues/git-issue-3873.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-method Main() {
-  var a := new ()[1];
-  var m: map<array<()>, ()> := map[a := ()];
-  var v :| v in m;
-  print v[0], "\n";
-}
diff --git a/Test/git-issues/git-issue-396.dfy b/Test/git-issues/git-issue-396.dfy
deleted file mode 100644
index 7866d3d0498..00000000000
--- a/Test/git-issues/git-issue-396.dfy
+++ /dev/null
@@ -1,16 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-datatype Foo = Bar(value: int)
-
-method GetValue(f: Foo) returns (i: int) {
-  match f
-  case Bar(Bar) =>
-    return 72 + Bar;
-}
-
-method Main() {
-  var x: int := 0;
-  var f: Foo := Bar(42);
-  x := GetValue(f);
-  print x, "\n";
-}
diff --git a/Test/git-issues/git-issue-3978.dfy b/Test/git-issues/git-issue-3978.dfy
deleted file mode 100644
index 7015c09ea28..00000000000
--- a/Test/git-issues/git-issue-3978.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-method Main()
-{
-  for v := 3 to 18
-  {
-    if false {
-      continue;
-    }
-    var x := 1;
-    print x, "\n";
-  }
-}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-3995.dfy b/Test/git-issues/git-issue-3995.dfy
deleted file mode 100644
index 406b740c072..00000000000
--- a/Test/git-issues/git-issue-3995.dfy
+++ /dev/null
@@ -1,35 +0,0 @@
-// RUN: %baredafny verify %args "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-trait Animal {
-    function           not_opaque() : ( rv : int)
-    function {:opaque} iam_opaque() : ( rv : int) 
-
-    predicate depends_on_not_opaque() 
-       ensures  not_opaque() == 42 
-    predicate depends_on_iam_opaque() 
-       ensures  iam_opaque() == 42 
-}
-
-class Cat extends Animal {
-    function           not_opaque() : ( rv : int) { 42 } 
-    function {:opaque} iam_opaque() : ( rv : int) 
-         //ensures rv == 42
-         { reveal iam_opaque();  42 } 
-
-    predicate depends_on_not_opaque() 
-       ensures not_opaque() == 42 {true}
-    predicate depends_on_iam_opaque() 
-       ensures iam_opaque() == 42 {reveal iam_opaque(); true}
-}
-
-trait T {
-  predicate Valid(x: int)
-  method MyMethod(x: int) requires Valid(x)
-}
-
-class C extends T {
-  predicate {:opaque} Valid(x: int) { true }
-  method MyMethod(x: int) requires Valid(x) {
-  }
-}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-4007.dfy b/Test/git-issues/git-issue-4007.dfy
deleted file mode 100644
index 5a279e7b8e6..00000000000
--- a/Test/git-issues/git-issue-4007.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-method Main() {
-    var a := 0;
-    for i := 0 to |(set x: int | 0 <= x < 3 :: x)| {
-        a := a + 1;
-    }
-    print a, "\n";
-}
diff --git a/Test/git-issues/git-issue-4007.dfy.verifier.expect b/Test/git-issues/git-issue-4007.dfy.verifier.expect
deleted file mode 100644
index 1d4310d09b5..00000000000
--- a/Test/git-issues/git-issue-4007.dfy.verifier.expect
+++ /dev/null
@@ -1 +0,0 @@
-git-issue-4007.dfy(5,20): Warning: /!\ No terms found to trigger on.
diff --git a/Test/git-issues/git-issue-401.dfy b/Test/git-issues/git-issue-401.dfy
deleted file mode 100644
index c4e4ee97783..00000000000
--- a/Test/git-issues/git-issue-401.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %dafny /compile:0  "%s" > "%t"
-// RUN: %dafny /compile:0 /proverOpt:PROVER_PATH="%z3" "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-// UNSUPPORTED: windows
-method m() {
-  assert 1 + 1 == 2;
-}
diff --git a/Test/git-issues/git-issue-4012.dfy b/Test/git-issues/git-issue-4012.dfy
deleted file mode 100644
index 14b6d550fb7..00000000000
--- a/Test/git-issues/git-issue-4012.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-method Main() {
-  var m: multiset<()> := multiset{};
-  m := m[() := 18446744073709551616];
-  print |m|, "\n";
-}
diff --git a/Test/git-issues/git-issue-401a.dfy b/Test/git-issues/git-issue-401a.dfy
deleted file mode 100644
index 3b094c793b5..00000000000
--- a/Test/git-issues/git-issue-401a.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// Dafny should emit exit value 1
-// RUN: ! %dafny /compile:0 /proverOpt:PROVER_PATH=Output/binz/z3 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method m() {
-  assert 1 + 1 == 2;
-}
diff --git a/Test/git-issues/git-issue-401a.dfy.expect b/Test/git-issues/git-issue-401a.dfy.expect
deleted file mode 100644
index 44300eb01d3..00000000000
--- a/Test/git-issues/git-issue-401a.dfy.expect
+++ /dev/null
@@ -1 +0,0 @@
-Fatal Error: ProverException: Cannot find specified prover: Output/binz/z3
diff --git a/Test/git-issues/git-issue-403.dfy b/Test/git-issues/git-issue-403.dfy
deleted file mode 100644
index b2c3f9d3557..00000000000
--- a/Test/git-issues/git-issue-403.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny -compile:4 -compileTarget:java "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-newtype {:nativeType "byte"} uint8 = x:int | 0 <= x < 0x100
-newtype {:nativeType "int"} int32 = x:int | -0x8000_0000 <= x < 0x8000_0000
-
-method Main() {
-  var u8 : uint8 := 140;
-  var i32 : int32 := u8 as int32;
-  print u8, " == ", i32, "\n";
-}
diff --git a/Test/git-issues/git-issue-4048.dfy.expect b/Test/git-issues/git-issue-4048.dfy.expect
deleted file mode 100644
index ee31aaebd62..00000000000
--- a/Test/git-issues/git-issue-4048.dfy.expect
+++ /dev/null
@@ -1 +0,0 @@
-*** Error: file x.doo not found
diff --git a/Test/git-issues/git-issue-405.dfy.expect b/Test/git-issues/git-issue-405.dfy.expect
deleted file mode 100644
index 86505e65a93..00000000000
--- a/Test/git-issues/git-issue-405.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-405.dfy(19,22): Error: insufficient reads clause to read field
-
-Dafny program verifier finished with 6 verified, 1 error
diff --git a/Test/git-issues/git-issue-4055.dfy.expect b/Test/git-issues/git-issue-4055.dfy.expect
deleted file mode 100644
index 824afee9684..00000000000
--- a/Test/git-issues/git-issue-4055.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-git-issue-4055.dfy(12,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-git-issue-4055.dfy(7,9): Error: assertion might not hold
-git-issue-4055.dfy(18,9): Error: assertion might not hold
-
-Dafny program verifier finished with 1 verified, 2 errors
diff --git a/Test/git-issues/git-issue-4074.dfy.expect b/Test/git-issues/git-issue-4074.dfy.expect
deleted file mode 100644
index e8b8a61387c..00000000000
--- a/Test/git-issues/git-issue-4074.dfy.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-git-issue-4074.dfy(23,9): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
-git-issue-4074.dfy(4,7): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
-git-issue-4074.dfy(4,14): Warning: {:only} on members does not support arguments
-git-issue-4074.dfy(13,9): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
-git-issue-4074.dfy(24,11): Error: assertion might not hold
-git-issue-4074.dfy(5,9): Error: assertion might not hold
-git-issue-4074.dfy(14,11): Error: assertion might not hold
-
-Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/git-issues/git-issue-4139.dfy b/Test/git-issues/git-issue-4139.dfy
deleted file mode 100644
index 3103c5fd35f..00000000000
--- a/Test/git-issues/git-issue-4139.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %baredafny verify %args "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-include "git-issue-4139-main.dfy"
-
-method Main() {
-  var undertest := new TestLogic''TopLevel();
-}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-4162.dfy b/Test/git-issues/git-issue-4162.dfy
deleted file mode 100644
index 4c5fd03f68c..00000000000
--- a/Test/git-issues/git-issue-4162.dfy
+++ /dev/null
@@ -1,15 +0,0 @@
-// NONUNIFORM: %testDafnyForEachCompiler doesn't support /out
-// RUN: %dafny /compile:4 /compileTarget:py /out:M "%s" > "%t"
-// RUN: %dafny /compile:4 /compileTarget:cs /out:M "%s" >> "%t"
-// RUN: %dafny /compile:4 /compileTarget:java /out:M "%s" >> "%t"
-// RUN: %dafny /compile:4 /compileTarget:js /out:M "%s" >> "%t"
-// RUN: %dafny /compile:4 /compileTarget:go /out:M "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M {
-    const i := 0
-}
-
-method Main() {
-    print M.i, "\n";
-}
diff --git a/Test/git-issues/git-issue-4233.dfy b/Test/git-issues/git-issue-4233.dfy
deleted file mode 100644
index 65974c7e7dc..00000000000
--- a/Test/git-issues/git-issue-4233.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-newtype MyReal = real
-
-method Main() {
-  var x: MyReal := 12.0 / 10.0;
-  print x, "\n"; // expect 1.2
-
-  if x == 1.0 {
-    assert false;
-    print "unreachable\n";
-  }
-}
diff --git a/Test/git-issues/git-issue-4284.dfy b/Test/git-issues/git-issue-4284.dfy
deleted file mode 100644
index 67e95b9542b..00000000000
--- a/Test/git-issues/git-issue-4284.dfy
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --compile-suffix
-
-method Main() {
-  print (true, false), "\n";
-}
diff --git a/Test/git-issues/git-issue-4298.dfy b/Test/git-issues/git-issue-4298.dfy
deleted file mode 100644
index 53f8985f741..00000000000
--- a/Test/git-issues/git-issue-4298.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %exits-with 2 %baredafny verify %args "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  export E
-    provides f
-
-  function f() : bool { true }
-}
-
-abstract module B {
-  import A0: A
-}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-4315.dfy b/Test/git-issues/git-issue-4315.dfy
deleted file mode 100644
index 781be3d319f..00000000000
--- a/Test/git-issues/git-issue-4315.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M1 {
-  class C {
-    opaque function f() : bool { true }
-  }
-}
-
-module M2 refines M1 {
-}
\ No newline at end of file
diff --git a/Test/git-issues/git-issue-442.dfy b/Test/git-issues/git-issue-442.dfy
deleted file mode 100644
index 8bedbfa4a9d..00000000000
--- a/Test/git-issues/git-issue-442.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %dafny /noVerify /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method m()
-  ensures false
-{
-}
diff --git a/Test/git-issues/git-issue-478-errors.dfy.expect b/Test/git-issues/git-issue-478-errors.dfy.expect
deleted file mode 100644
index c529c695867..00000000000
--- a/Test/git-issues/git-issue-478-errors.dfy.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-git-issue-478-errors.dfy(22,9): Error: Import declaration uses same name as a module in the same scope: LibW
-git-issue-478-errors.dfy(26,9): Error: Import declaration uses same name as a module in the same scope: LibX
-git-issue-478-errors.dfy(36,7): Error: Duplicate module name: M
-git-issue-478-errors.dfy(7,7): Error: Import declaration uses same name as a module in the same scope: LibA
-git-issue-478-errors.dfy(11,7): Error: Import declaration uses same name as a module in the same scope: LibB
-git-issue-478-errors.dfy(37,7): Error: Import declaration uses same name as a module in the same scope: M
-git-issue-478-errors.dfy(38,7): Error: Import declaration uses same name as a module in the same scope: M
-git-issue-478-errors.dfy(40,7): Error: Import declaration uses same name as a module in the same scope: M
-git-issue-478-errors.dfy(41,7): Error: Import declaration uses same name as a module in the same scope: M
-git-issue-478-errors.dfy(44,7): Error: Duplicate name of import: N
-git-issue-478-errors.dfy(48,14): Error: Import declaration uses same name as a module in the same scope: AA
-git-issue-478-errors.dfy(49,14): Error: Import declaration uses same name as a module in the same scope: BB
-git-issue-478-errors.dfy(59,14): Error: Import declaration uses same name as a module in the same scope: X
-git-issue-478-errors.dfy(65,14): Error: Duplicate name of import: R
-14 resolution/type errors detected in git-issue-478-errors.dfy
diff --git a/Test/git-issues/git-issue-551.dfy.expect b/Test/git-issues/git-issue-551.dfy.expect
deleted file mode 100644
index a21f3686e77..00000000000
--- a/Test/git-issues/git-issue-551.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-git-issue-551.dfy(27,15): Error: a call to a ghost predicate is allowed only in specification contexts (consider declaring the predicate without the 'ghost' keyword)
-1 resolution/type errors detected in git-issue-551.dfy
diff --git a/Test/git-issues/git-issue-555.dfy b/Test/git-issues/git-issue-555.dfy
deleted file mode 100644
index 00b53e4b4c5..00000000000
--- a/Test/git-issues/git-issue-555.dfy
+++ /dev/null
@@ -1,25 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:cs "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:js "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:go "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:java "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-
-method Main() {
-  g(10);
-  g(-10);
-  f(10);
-  f(-10);
-}
-
-method f(i: int) {
-  assert i > 0;
-  expect i > 0;
-}
-
-method g(i: int) {
-  expect i > 0; // assumes i > 0
-  assert i > 0;
-}
-
diff --git a/Test/git-issues/git-issue-580.dfy b/Test/git-issues/git-issue-580.dfy
deleted file mode 100644
index 9685c09bafe..00000000000
--- a/Test/git-issues/git-issue-580.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-trait A {}
-trait B {}
-class C extends A, B {
-  method Foo() {
-    assert false; // error: but this once used to pass
-  }
-}
diff --git a/Test/git-issues/git-issue-580.dfy.expect b/Test/git-issues/git-issue-580.dfy.expect
deleted file mode 100644
index 49ad81ac0e4..00000000000
--- a/Test/git-issues/git-issue-580.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-580.dfy(8,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/git-issues/git-issue-588.dfy b/Test/git-issues/git-issue-588.dfy
deleted file mode 100644
index 85721d5146a..00000000000
--- a/Test/git-issues/git-issue-588.dfy
+++ /dev/null
@@ -1,16 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-module myclass {
-  class MyClass {
-    var num: int
-
-    constructor (x: int) {
-      num := x;
-    }
-  }
-
-  method Main() {
-    var c_obj := new MyClass(2);
-  }
-}
-
diff --git a/Test/git-issues/git-issue-590.dfy b/Test/git-issues/git-issue-590.dfy
deleted file mode 100644
index 9dfa6727591..00000000000
--- a/Test/git-issues/git-issue-590.dfy
+++ /dev/null
@@ -1,3 +0,0 @@
-// dafny should emit exit value 1
-// RUN: ! %dafny /compile:3 x.cs > "%t"
-// RUN: %diff "%s.expect" "%t"
diff --git a/Test/git-issues/git-issue-604.dfy.expect b/Test/git-issues/git-issue-604.dfy.expect
deleted file mode 100644
index a478da5b928..00000000000
--- a/Test/git-issues/git-issue-604.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-git-issue-604.dfy(6,2): Warning: note, this loop has no body (loop frame: x)
-git-issue-604.dfy(8,11): Error: assertion could not be proved
-git-issue-604.dfy(20,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/git-issues/git-issue-610.dfy b/Test/git-issues/git-issue-610.dfy
deleted file mode 100644
index 5e958f768ce..00000000000
--- a/Test/git-issues/git-issue-610.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-type pos = i:int | i > 0 witness 1
-
-method Main()
-{
-  var x:pos;
-  assert x > 0;
-  var p:(pos, pos);
-  var (a, b) := p;
-  assert a > 0;
-  assert b > 0;
-  print a, " ", b, "\n";
-  expect a > 0;
-  expect b > 0;
-}
-
diff --git a/Test/git-issues/git-issue-612.dfy b/Test/git-issues/git-issue-612.dfy
deleted file mode 100644
index 8c0293ecae9..00000000000
--- a/Test/git-issues/git-issue-612.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype D = D
-{
-  function {:extern Foo} Foo() : bool
-}
-
diff --git a/Test/git-issues/git-issue-615.dfy.expect b/Test/git-issues/git-issue-615.dfy.expect
deleted file mode 100644
index 44592500154..00000000000
--- a/Test/git-issues/git-issue-615.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue-615.dfy(13,35): Error: insufficient reads clause to invoke function
-git-issue-615.dfy(24,13): Error: insufficient reads clause to invoke function
-
-Dafny program verifier finished with 3 verified, 2 errors
diff --git a/Test/git-issues/git-issue-621a.dfy b/Test/git-issues/git-issue-621a.dfy
deleted file mode 100644
index 3b099713f2f..00000000000
--- a/Test/git-issues/git-issue-621a.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M {
-  export provides D, MyData
-  datatype D = D1 | D2
-  const MyData : D := D1  // OK even though in the export view, MyData does not have an initializer
-}
-
diff --git a/Test/git-issues/git-issue-622$f.dfy b/Test/git-issues/git-issue-622$f.dfy
deleted file mode 100644
index 2a7003e0f4e..00000000000
--- a/Test/git-issues/git-issue-622$f.dfy
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
-
-method Main() {
-}
diff --git a/Test/git-issues/git-issue-633.dfy b/Test/git-issues/git-issue-633.dfy
deleted file mode 100644
index 6abcf6b7dfe..00000000000
--- a/Test/git-issues/git-issue-633.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// NONUNIFORM: need to add support for --input when running to %testDafnyForEachCompiler
-// RUN: %dafny /compile:0 "%s" %S/git-issue-633A.dfy > "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs /spillTargetCode:3 "%s" %S/git-issue-633A.dfy >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js /spillTargetCode:3 "%s" %S/git-issue-633A.dfy >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go /spillTargetCode:3 "%s" %S/git-issue-633A.dfy >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:java /spillTargetCode:3 "%s" %S/git-issue-633A.dfy  >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:py /spillTargetCode:3 "%s" %S/git-issue-633A.dfy  >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method m() {
-  print "OK\n";
-}
diff --git a/Test/git-issues/git-issue-643.dfy b/Test/git-issues/git-issue-643.dfy
deleted file mode 100644
index 4e985d7c7b8..00000000000
--- a/Test/git-issues/git-issue-643.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:cs "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:java "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:js "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:go "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main() {
-   expect false;
-}
diff --git a/Test/git-issues/git-issue-643a.dfy b/Test/git-issues/git-issue-643a.dfy
deleted file mode 100644
index 8db3ca9de6e..00000000000
--- a/Test/git-issues/git-issue-643a.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:cs "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:java "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:js "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:go "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main() {
-   expect false, "fails";
-}
diff --git a/Test/git-issues/git-issue-645.dfy.expect b/Test/git-issues/git-issue-645.dfy.expect
deleted file mode 100644
index 16f0e80fa22..00000000000
--- a/Test/git-issues/git-issue-645.dfy.expect
+++ /dev/null
@@ -1 +0,0 @@
-*** Error: Command-line argument 'xyz' is neither a recognized option nor a filename with a supported extension (.dfy, .cs, .dll).
diff --git a/Test/git-issues/git-issue-663.dfy.expect b/Test/git-issues/git-issue-663.dfy.expect
deleted file mode 100644
index 99fbb6833de..00000000000
--- a/Test/git-issues/git-issue-663.dfy.expect
+++ /dev/null
@@ -1,136 +0,0 @@
-
-Dafny program verifier finished with 23 verified, 0 errors
-git-issue-663.dfy(5,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(8,8): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(12,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(16,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(22,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(25,8): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(29,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(33,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(39,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(44,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(50,6): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(55,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(59,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(64,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(70,6): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(75,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(81,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(86,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(92,6): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(97,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(101,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(106,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(112,6): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(117,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(132,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(129,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(125,8): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(122,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(147,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(144,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(140,8): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(137,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(154,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(155,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(156,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(157,12): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(162,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(163,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(164,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(165,12): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(170,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(171,8): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(172,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(173,12): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(179,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(180,8): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(181,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(182,12): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(187,7): Error: Method _module._default.SpecificationOfCompiledMethodWithoutBody has no body
-git-issue-663.dfy(188,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(189,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(190,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(191,12): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(193,13): Error: Method _module._default.SpecificationOfGhostMethodWithoutBody has no body
-git-issue-663.dfy(194,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(195,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(196,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(197,12): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(199,9): Error: Function _module._default.SpecificationOfCompiledFunctionWithoutBody has no body
-git-issue-663.dfy(200,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(201,8): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(202,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(203,12): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(205,15): Error: Function _module._default.SpecificationOfGhostFunctionWithoutBody has no body
-git-issue-663.dfy(206,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(207,8): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(208,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(209,12): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(214,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(216,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(221,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(222,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(223,12): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(225,2): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(228,16): Error: Function _module._default.ExtremePredicateWithoutBody has no body
-git-issue-663.dfy(229,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(231,12): Error: Method _module._default.ExtremeLemmaWithoutBody has no body
-git-issue-663.dfy(232,11): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(233,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(234,12): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(279,13): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(279,30): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(280,19): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(281,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(281,21): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(282,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(283,14): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(283,31): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(284,20): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(284,37): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(288,13): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(288,30): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(289,19): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(290,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(291,14): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(291,31): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(292,20): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(292,37): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(296,13): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(296,30): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(297,19): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(299,14): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(299,31): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(300,20): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(300,37): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(298,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(305,13): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(305,30): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(306,19): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(308,14): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(308,31): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(309,20): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(309,37): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(307,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(250,23): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(252,26): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(239,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(242,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(245,16): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(248,16): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(255,33): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(256,36): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(260,33): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(261,36): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(265,33): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(266,36): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(316,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(319,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(323,6): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(327,6): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(333,4): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(336,10): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(340,6): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
-git-issue-663.dfy(344,6): Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)
diff --git a/Test/git-issues/git-issue-674.dfy b/Test/git-issues/git-issue-674.dfy
deleted file mode 100644
index 30a22bd2f8f..00000000000
--- a/Test/git-issues/git-issue-674.dfy
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-type pos = i:int | i > 0 witness 1
-
-datatype Generic<T> = Gen(p: T)
-
-method Main() {
-  var p: (pos, pos);
-  var (a, b) := p;
-  assert a > 0;
-  assert b > 0;
-
-  var e: Generic<pos>;
-  var Gen(n) := e;
-  assert n > 0;
-
-  print "p=", p, " n=", n, "\n";
-}
diff --git a/Test/git-issues/git-issue-684.dfy b/Test/git-issues/git-issue-684.dfy
deleted file mode 100644
index 4c2b0a8fa02..00000000000
--- a/Test/git-issues/git-issue-684.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-datatype Level1 = Level1(u:int)
-datatype Level2 = Level2(u:int, l:Level1)
-
-method TestNestedLet() {
-  var x := Level2(5, Level1(3));
-
-  var Level2(u, Level1(v)) := x;
-}
-
-method Main() {}
-
diff --git a/Test/git-issues/git-issue-697c.dfy b/Test/git-issues/git-issue-697c.dfy
deleted file mode 100644
index ddfd2fafa65..00000000000
--- a/Test/git-issues/git-issue-697c.dfy
+++ /dev/null
@@ -1,24 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:3 /rprint:"%t.rprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function ghostPredicate(x: int): bool {
-  x % 2 == 0
-}
-
-datatype Cell = Cell(x: int)
-type EvenCell = c: Cell | ghostPredicate(c.x) witness Cell(0)
-
-function doubleEvenCell(c: EvenCell): int
-{
-  if c.x % 2 == 1 then 1/0 else c.x * 2
-}
-
-method Main() {
-  var x: set<Cell> := { Cell(1), Cell(2), Cell(3), Cell(4) };
-  var y := set c: EvenCell | c in x;
-  var z: map<EvenCell, nat> := map c: EvenCell | c in x :: c.x;
-  var b := forall c :: c in y ==> doubleEvenCell(c) > 0;
-  assert b;
-  print b;
-}
-
diff --git a/Test/git-issues/git-issue-697c.dfy.expect b/Test/git-issues/git-issue-697c.dfy.expect
deleted file mode 100644
index f2033eb8071..00000000000
--- a/Test/git-issues/git-issue-697c.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue-697c.dfy(18,15): Error: EvenCell is a subset type and its constraint is not compilable, hence it cannot yet be used as the type of a bound variable in set comprehension. The constraint is not compilable because a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword) git-issue-697c.dfy(9,26)
-git-issue-697c.dfy(19,35): Error: EvenCell is a subset type and its constraint is not compilable, hence it cannot yet be used as the type of a bound variable in map comprehension. The constraint is not compilable because a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword) git-issue-697c.dfy(9,26)
-git-issue-697c.dfy(20,18): Error: EvenCell is a subset type and its constraint is not compilable, hence it cannot yet be used as the type of a bound variable in forall expression. The constraint is not compilable because a call to a ghost function is allowed only in specification contexts (consider declaring the function without the 'ghost' keyword) git-issue-697c.dfy(9,26)
-3 resolution/type errors detected in git-issue-697c.dfy
diff --git a/Test/git-issues/git-issue-697g.dfy b/Test/git-issues/git-issue-697g.dfy
deleted file mode 100644
index 7b30de7f3a0..00000000000
--- a/Test/git-issues/git-issue-697g.dfy
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-function returnNat(c: nat): int
-{
-  if c < 0 then 1/0 else c
-}
-
-method Main() {
-  var x: set<int> := { -1, 2, -3, 4 };
-  var y := set c: nat | c in x;
-  var b := forall c :: c in y ==> returnNat(c) >= 0;
-  assert b;
-  print b;
-}
-
diff --git a/Test/git-issues/git-issue-698.dfy b/Test/git-issues/git-issue-698.dfy
deleted file mode 100644
index 7b7a9ca15b8..00000000000
--- a/Test/git-issues/git-issue-698.dfy
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-type Small = x: int | 0 <= x < 100 && x != 3
-
-function F(x: int): int
-  requires x != 3
-{
-  if x == 3 then 1/0 else 100
-}
-
-method Main() {
-  var b := forall n: Small :: F(n) == 100;
-  assert b;
-  print b, "\n";
-}
diff --git a/Test/git-issues/git-issue-698b.dfy b/Test/git-issues/git-issue-698b.dfy
deleted file mode 100644
index dbdbc3b36d3..00000000000
--- a/Test/git-issues/git-issue-698b.dfy
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-type Small = x: int | 0 <= x < 100 && x != 3
-
-function F(x: int): int
-  requires x != 3
-{
-  if x == 3 then 1/0 else 100
-}
-
-method Main() {
-  var b := !exists n: Small :: F(n) != 100;
-  assert b;
-  print b;
-}
diff --git a/Test/git-issues/git-issue-705.dfy b/Test/git-issues/git-issue-705.dfy
deleted file mode 100644
index 9c36a336e8e..00000000000
--- a/Test/git-issues/git-issue-705.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation
-
-datatype MyDataType = AAA {
- function toString(): int { 222 }
-}
-
-method Main() {
-  var dt: MyDataType;
-  print dt, " ", dt.toString(), "\n";
-}
-
diff --git a/Test/git-issues/git-issue-816.dfy.expect b/Test/git-issues/git-issue-816.dfy.expect
deleted file mode 100644
index ed52f09bfcc..00000000000
--- a/Test/git-issues/git-issue-816.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-git-issue-816.dfy(7,11): Error: assertion could not be proved
-git-issue-816.dfy(20,11): Error: assertion could not be proved
-git-issue-816.dfy(26,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 1 verified, 3 errors
diff --git a/Test/git-issues/git-issue-845-comments.dfy b/Test/git-issues/git-issue-845-comments.dfy
deleted file mode 100644
index 60faee7c1f3..00000000000
--- a/Test/git-issues/git-issue-845-comments.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Demonstrates that nested comments don't work with */ in line comment
-
-method m() {
-/*
-  var b: int;
-  // */
-  var c: int;
-*/
-}
diff --git a/Test/git-issues/git-issue-845-comments2.dfy b/Test/git-issues/git-issue-845-comments2.dfy
deleted file mode 100644
index 9fb5d906fdd..00000000000
--- a/Test/git-issues/git-issue-845-comments2.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Demonstrates that nested comments don't work with */ in strings
-
-method m() {
-/*
-  var b: int;
-  var s: string := "a*/b";
-  var c: int;
-*/
-}
diff --git a/Test/git-issues/git-issue-845.dfy b/Test/git-issues/git-issue-845.dfy
deleted file mode 100644
index 3fe9a576338..00000000000
--- a/Test/git-issues/git-issue-845.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %dafny /useBaseNameForFileName /compile:0 %S/git-issue-845.dfy > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-/* blah blah /* blah */
-method foo() returns (r:bool) { assert true == false; }
-
-
diff --git a/Test/git-issues/git-issue-845.dfy.expect b/Test/git-issues/git-issue-845.dfy.expect
deleted file mode 100644
index 8e7aa999029..00000000000
--- a/Test/git-issues/git-issue-845.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-845.dfy(1,0): Warning: File contains no code
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/git-issues/git-issue-847.dfy b/Test/git-issues/git-issue-847.dfy
deleted file mode 100644
index 90be43fc90c..00000000000
--- a/Test/git-issues/git-issue-847.dfy
+++ /dev/null
@@ -1,52 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-trait O {
-  var rep:set<O>
-  ghost function union<T>(s:set<set<T>>):set<T> {
-    set o,o1 | o in s && o1 in o :: o1
-  }
-
-  least predicate ag()
-    reads *
-  {
-    rep=={} || (forall o:O | o in rep :: o.ag())
-  }
-
-  ghost predicate ldp(n:ORDINAL)
-    reads *
-  {
-    ag#[n]() && (forall n1:ORDINAL | n1 < n:: !ag#[n1]())
-  }
-
-  ghost function ld(n:ORDINAL):ORDINAL
-    reads *
-    requires ag#[n]()
-    ensures ldp(ld(n))
-  {
-    if ldp(n) then n else var n1:ORDINAL :| n1 < n && ag#[n1](); ld(n1)
-  }
-
-  ghost function level():ORDINAL
-    reads fr()
-    requires ag()
-    ensures ldp(level())
-  {
-    var n:ORDINAL :| ag#[n](); ld(n)
-  }
-
-  least lemma l1()
-    requires ag()
-    ensures forall o:O | o in rep :: o.level() < level()
-    decreases level()
-  {}
-
-  ghost function fr():set<O>
-    requires ag()
-    reads *
-    decreases level()
-  {
-    {this} + union(set o:O | o in rep :: l1(); o.fr())
-  }
-}
-
diff --git a/Test/git-issues/git-issue-847.dfy.expect b/Test/git-issues/git-issue-847.dfy.expect
deleted file mode 100644
index af8bbdd3886..00000000000
--- a/Test/git-issues/git-issue-847.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-git-issue-847.dfy(40,39): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
-git-issue-847.dfy(40,49): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
-git-issue-847.dfy(41,14): Error: a recursive call from a greatest lemma can go only to other greatest lemmas and prefix lemmas
-3 resolution/type errors detected in git-issue-847.dfy
diff --git a/Test/git-issues/git-issue-849.dfy b/Test/git-issues/git-issue-849.dfy
deleted file mode 100644
index 6c29c30dae0..00000000000
--- a/Test/git-issues/git-issue-849.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  datatype Test = Test(v: nat, w: nat)
-  method m(oldTest: Test) {
-    var newTest: Test := oldTest[v := 1]; // error: old syntax
-  }
-}
diff --git a/Test/git-issues/git-issue-849a.dfy b/Test/git-issues/git-issue-849a.dfy
deleted file mode 100644
index 1959998776c..00000000000
--- a/Test/git-issues/git-issue-849a.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module B {
-  datatype Test = Test(v: nat, w: nat)
-  method m(oldTest: Test) {
-    var newTest2: Test := oldTest.(v := 1, w := 2);
-  }
-}
diff --git a/Test/git-issues/git-issue-851.dfy.expect b/Test/git-issues/git-issue-851.dfy.expect
deleted file mode 100644
index 14abeb39887..00000000000
--- a/Test/git-issues/git-issue-851.dfy.expect
+++ /dev/null
@@ -1,51 +0,0 @@
-git-issue-851.dfy(116,9): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(144,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(150,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(156,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(162,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(168,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(174,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(180,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(186,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(192,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(211,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(217,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(223,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(229,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(235,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(241,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(247,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(253,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(259,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(265,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(271,13): Warning: /!\ No terms found to trigger on.
-git-issue-851.dfy(17,4): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-git-issue-851.dfy(37,4): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-git-issue-851.dfy(55,4): Error: variable 'd', which is subject to definite-assignment rules, might be uninitialized here
-git-issue-851.dfy(62,13): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-git-issue-851.dfy(70,13): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-git-issue-851.dfy(127,14): Error: cannot establish the existence of LHS values that satisfy the such-that predicate
-git-issue-851.dfy(145,16): Error: possible division by zero
-git-issue-851.dfy(151,16): Error: possible division by zero
-git-issue-851.dfy(157,16): Error: possible division by zero
-git-issue-851.dfy(163,16): Error: possible division by zero
-git-issue-851.dfy(169,16): Error: possible division by zero
-git-issue-851.dfy(175,16): Error: possible division by zero
-git-issue-851.dfy(181,16): Error: possible division by zero
-git-issue-851.dfy(187,16): Error: possible division by zero
-git-issue-851.dfy(193,16): Error: possible division by zero
-git-issue-851.dfy(199,16): Error: possible division by zero
-git-issue-851.dfy(211,29): Error: possible division by zero
-git-issue-851.dfy(218,7): Error: possible division by zero
-git-issue-851.dfy(224,7): Error: possible division by zero
-git-issue-851.dfy(230,7): Error: possible division by zero
-git-issue-851.dfy(236,7): Error: possible division by zero
-git-issue-851.dfy(242,7): Error: possible division by zero
-git-issue-851.dfy(248,7): Error: possible division by zero
-git-issue-851.dfy(254,7): Error: possible division by zero
-git-issue-851.dfy(260,7): Error: possible division by zero
-git-issue-851.dfy(266,7): Error: possible division by zero
-git-issue-851.dfy(272,7): Error: possible division by zero
-git-issue-851.dfy(278,7): Error: possible division by zero
-
-Dafny program verifier finished with 8 verified, 28 errors
diff --git a/Test/git-issues/git-issue-856.dfy b/Test/git-issues/git-issue-856.dfy
deleted file mode 100644
index d2c1bd60352..00000000000
--- a/Test/git-issues/git-issue-856.dfy
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:cs "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:js "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:go "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:java "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main()
-{
-  var big := 9223372036854775808;
-  var a := new int[big];
-  assert a.Length == big;
-  print a.Length == big;
-}
-
diff --git a/Test/git-issues/git-issue-863.dfy b/Test/git-issues/git-issue-863.dfy
deleted file mode 100644
index c5fb85529ab..00000000000
--- a/Test/git-issues/git-issue-863.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype D = D(ghost v:nat)
-function p():D { ghost var v:nat :| true; D(v) }
-
-datatype G = G(v:nat)
-function q():G { var v:nat :| true; G(v) }
-
diff --git a/Test/git-issues/git-issue-864zz.dfy b/Test/git-issues/git-issue-864zz.dfy
deleted file mode 100644
index a69f95bdcab..00000000000
--- a/Test/git-issues/git-issue-864zz.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  export reveals a
-  const a := 10
-  const b := 20
-}
-
-module B refines A {
-  export X reveals * extends A // used to complain  A is not in B
-}
diff --git a/Test/git-issues/git-issue-897.dfy.expect b/Test/git-issues/git-issue-897.dfy.expect
deleted file mode 100644
index 8892e7c9361..00000000000
--- a/Test/git-issues/git-issue-897.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-git-issue-897.dfy(10,17): Warning: /!\ No terms found to trigger on.
-git-issue-897.dfy(11,19): Error: assertion could not be proved
-git-issue-897.dfy(16,30): Error: possible violation of postcondition of forall statement
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/git-issues/git-issue-897a.dfy.expect b/Test/git-issues/git-issue-897a.dfy.expect
deleted file mode 100644
index 0db280ffedc..00000000000
--- a/Test/git-issues/git-issue-897a.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-897a.dfy(10,17): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/git-issues/git-issue-897b.dfy b/Test/git-issues/git-issue-897b.dfy
deleted file mode 100644
index 70478b8b617..00000000000
--- a/Test/git-issues/git-issue-897b.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function F(): int {
-  var p := x => true;
-  assert true by {
-    forall y: int | p(y) {}
-  }
-  5
-}
diff --git a/Test/git-issues/git-issue-907.dfy b/Test/git-issues/git-issue-907.dfy
deleted file mode 100644
index ed81c320aed..00000000000
--- a/Test/git-issues/git-issue-907.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:1 /compileTarget:java /spillTargetCode:1  "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Checks that the Java runtime library is present
-
-function identity(n:nat):nat
-{
-    n
-}
-
diff --git a/Test/git-issues/git-issue-922a.dfy b/Test/git-issues/git-issue-922a.dfy
deleted file mode 100644
index 6c1cc3a3e5e..00000000000
--- a/Test/git-issues/git-issue-922a.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module FOO {
-  /** Another type definition. */
-  datatype O = O(x: nat)
-
-  /** This should not be allowed. */
-  const OO := O(-1)   // error: argument is not a nat
-
-}
diff --git a/Test/git-issues/git-issue-936.dfy.expect b/Test/git-issues/git-issue-936.dfy.expect
deleted file mode 100644
index e437cbb152a..00000000000
--- a/Test/git-issues/git-issue-936.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-git-issue-936.dfy(29,2): Error: assertion could not be proved
-
-Dafny program verifier finished with 9 verified, 1 error
diff --git a/Test/git-issues/git-issue-950.dfy b/Test/git-issues/git-issue-950.dfy
deleted file mode 100644
index c16a1487d5b..00000000000
--- a/Test/git-issues/git-issue-950.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 "%s" "%s" > "%t"
-// RUN: %dafny /compile:0 "%s" %S/git-issue-950.dfy >> "%t"
-// RUN: %dafny /compile:0 "%s" %S/../git-issues/git-issue-950.dfy >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M {
-
-  const x: int := 5
-  method m() {
-    assert x == 5;
-  }
-}
diff --git a/Test/git-issues/git-issue-952.dfy.expect b/Test/git-issues/git-issue-952.dfy.expect
deleted file mode 100644
index ea86f7bde8a..00000000000
--- a/Test/git-issues/git-issue-952.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-git-issue-952.dfy(35,15): Error: assertion could not be proved
-git-issue-952.dfy(38,20): Error: assertion could not be proved
-git-issue-952.dfy(71,15): Error: assertion could not be proved
-git-issue-952.dfy(74,20): Error: assertion could not be proved
-git-issue-952.dfy(100,15): Error: assertion could not be proved
-git-issue-952.dfy(103,20): Error: assertion could not be proved
-
-Dafny program verifier finished with 4 verified, 6 errors
diff --git a/Test/git-issues/git-issue-956.dfy b/Test/git-issues/git-issue-956.dfy
deleted file mode 100644
index 485dac03997..00000000000
--- a/Test/git-issues/git-issue-956.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-datatype T = T1(x:nat) | T2(y:nat) {
-    ghost predicate i() requires T2? {
-        y > 0
-    }
-}
-
diff --git a/Test/git-issues/git-issue-975.dfy b/Test/git-issues/git-issue-975.dfy
deleted file mode 100644
index e6ef79a5855..00000000000
--- a/Test/git-issues/git-issue-975.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function f():nat
-  ensures f() == 0
-{                  // no problem for methods
-  var x := 0;      // no problem without this
-  assert true by {}
-  0
-}
diff --git a/Test/git-issues/git-issue-977.dfy.expect b/Test/git-issues/git-issue-977.dfy.expect
deleted file mode 100644
index c7cd7bc61b1..00000000000
--- a/Test/git-issues/git-issue-977.dfy.expect
+++ /dev/null
@@ -1,50 +0,0 @@
-git-issue-977.dfy(217,13): Info: Selected triggers: {AAA#[k](t)}
-git-issue-977.dfy(209,21): Info: _k: ORDINAL
-git-issue-977.dfy(214,21): Info: _k: ORDINAL
-git-issue-977.dfy(232,21): Info: _k: ORDINAL
-git-issue-977.dfy(237,36): Info: _k: ORDINAL
-git-issue-977.dfy(239,15): Info: Pos#[_k]
-git-issue-977.dfy(237,36): Info: Theorem2# with focal predicate Pos
-git-issue-977.dfy(241,4): Info: Theorem2#[_k - 1]
-git-issue-977.dfy(229,13): Info: co-recursive call
-git-issue-977.dfy(234,18): Info: Pos#[_k - 1]
-git-issue-977.dfy(227,17): Info: decreases 1, n
-git-issue-977.dfy(237,36): Info: Theorem2# decreases _k, n
-git-issue-977.dfy(71,4): Info: Selected triggers:
-   {RicochetOrd(m, num)}, {GreatestManualOrd(m, num)}, {GreatestPredOrd#[m](num)}, {m < k}
-git-issue-977.dfy(138,4): Info: Selected triggers:
-   {GreatestManualOrd(m, num)}, {m < k}
-git-issue-977.dfy(54,6): Info: {:induction num}
-git-issue-977.dfy(61,6): Info: {:induction k, num}
-git-issue-977.dfy(77,6): Info: {:induction k, num}
-git-issue-977.dfy(95,19): Info: _k: ORDINAL
-git-issue-977.dfy(113,19): Info: _k: nat
-git-issue-977.dfy(84,16): Info: tail recursive
-git-issue-977.dfy(95,19): Info: tail recursive
-git-issue-977.dfy(113,19): Info: tail recursive
-git-issue-977.dfy(146,16): Info: tail recursive
-git-issue-977.dfy(97,21): Info: GreatestPredOrd#[_k - 1]
-git-issue-977.dfy(115,21): Info: GreatestPredNat#[_k - 1]
-git-issue-977.dfy(50,15): Info: decreases n
-git-issue-977.dfy(61,6): Info: decreases k, num
-git-issue-977.dfy(84,16): Info: decreases num
-git-issue-977.dfy(129,16): Info: decreases k, num
-git-issue-977.dfy(146,16): Info: decreases k, num
-git-issue-977.dfy(71,4): Info: ensures GreatestPredOrd#[m](num)
-git-issue-977.dfy(71,4): Info: ensures GreatestManualOrd(m, num)
-git-issue-977.dfy(71,4): Info: ensures RicochetOrd(m, num)
-git-issue-977.dfy(220,11): Info: Some instances of this call are not inlined.
-git-issue-977.dfy(110,9): Info: Some instances of this call are not inlined.
-git-issue-977.dfy(143,9): Info: Some instances of this call are not inlined.
-git-issue-977.dfy(162,2): Info: Some instances of this call are not inlined.
-git-issue-977.dfy(39,11): Error: assertion could not be proved
-git-issue-977.dfy(14,20): Related location
-git-issue-977.dfy(9,7): Related location
-git-issue-977.dfy(41,11): Error: assertion could not be proved
-git-issue-977.dfy(22,4): Related location
-git-issue-977.dfy(9,7): Related location
-git-issue-977.dfy(43,11): Error: assertion could not be proved
-git-issue-977.dfy(30,20): Related location
-git-issue-977.dfy(9,7): Related location
-
-Dafny program verifier finished with 20 verified, 3 errors
diff --git a/Test/git-issues/git-issue-981d.dfy.expect b/Test/git-issues/git-issue-981d.dfy.expect
deleted file mode 100644
index 34d8bdc6765..00000000000
--- a/Test/git-issues/git-issue-981d.dfy.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-git-issue-981d.dfy(25,9): Error: duplicate name of top-level declaration: E4
-git-issue-981d.dfy(26,9): Error: duplicate name of top-level declaration: E5
-git-issue-981d.dfy(31,8): Error: duplicate name of top-level declaration: E6
-git-issue-981d.dfy(36,7): Error: duplicate name of top-level declaration: T2
-git-issue-981d.dfy(37,7): Error: duplicate name of top-level declaration: T3
-git-issue-981d.dfy(39,7): Error: duplicate name of top-level declaration: T1
-git-issue-981d.dfy(42,8): Error: duplicate name of top-level declaration: T4
-git-issue-981d.dfy(49,8): Error: Duplicate member name: T2
-git-issue-981d.dfy(50,9): Error: Duplicate member name: T3
-git-issue-981d.dfy(51,9): Error: Duplicate member name: T3
-git-issue-981d.dfy(53,9): Error: Duplicate member name: T4
-git-issue-981d.dfy(48,8): Error: duplicate name of top-level declaration: T4
-git-issue-981d.dfy(54,8): Error: duplicate name of top-level declaration: T4
-git-issue-981d.dfy(54,8): Error: a module that already contains a top-level declaration 'T4?' is not allowed to declare a reference type (class) 'T4'
-14 resolution/type errors detected in git-issue-981d.dfy
diff --git a/Test/git-issues/git-issue-981ee.dfy b/Test/git-issues/git-issue-981ee.dfy
deleted file mode 100644
index 0ac1a5e388a..00000000000
--- a/Test/git-issues/git-issue-981ee.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module B {
-  module E2 {}
-  import E2 = Z // error
-}
diff --git a/Test/git-issues/git-issue-Main.dfy b/Test/git-issues/git-issue-Main.dfy
deleted file mode 100644
index 17fdce40796..00000000000
--- a/Test/git-issues/git-issue-Main.dfy
+++ /dev/null
@@ -1,20 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:cs "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:js "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:go "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:java "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  module AA {
-    method Main() {}
-  }
-}
-
-module B {
-  class C {
-    static method Main() {}
-  }
-}
-
-method Main() {}
diff --git a/Test/git-issues/git-issue-Main0.dfy b/Test/git-issues/git-issue-Main0.dfy
deleted file mode 100644
index 945b973ff52..00000000000
--- a/Test/git-issues/git-issue-Main0.dfy
+++ /dev/null
@@ -1,21 +0,0 @@
-// NONUNIFORM: Multiple test scenarios (could be split)
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs /Main:A.B.Main "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js /Main:A.B.Main "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go /Main:A.B.Main "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js /Main:A.B.Main "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs /Main:A.C.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js /Main:A.C.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go /Main:A.C.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:java /Main:A.C.Test "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  class B {
-    method Main() { print "Main\n"; }
-  }
-  class C {
-    method Test() { print "Test\n"; }
-  }
-}
-
diff --git a/Test/git-issues/git-issue-Main2.dfy b/Test/git-issues/git-issue-Main2.dfy
deleted file mode 100644
index 5f89b0c3b08..00000000000
--- a/Test/git-issues/git-issue-Main2.dfy
+++ /dev/null
@@ -1,20 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:cs "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:js "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:go "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:java "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-  module AA {
-    method {:main} Main() {}
-  }
-}
-
-module B {
-  class C {
-    static method {:main} Main() {}
-  }
-}
-
-method Main() {}
diff --git a/Test/git-issues/git-issue-Main4.dfy b/Test/git-issues/git-issue-Main4.dfy
deleted file mode 100644
index 104a0929523..00000000000
--- a/Test/git-issues/git-issue-Main4.dfy
+++ /dev/null
@@ -1,45 +0,0 @@
-// NONUNIFORM: Multiple test scenarios (could be split)
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs /Main:A.AA.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js /Main:A.AA.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go /Main:A.AA.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:java /Main:A.AA.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs /Main:B.C.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js /Main:B.C.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go /Main:B.C.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:java /Main:B.C.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs /Main:B.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js /Main:B.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go /Main:B.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:java /Main:B.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs /Main:Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js /Main:Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go /Main:Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:java /Main:Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:cs /Main:C.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:js /Main:C.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:go /Main:C.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /compileTarget:java /Main:C.Test "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:cs /Main:X "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:js /Main:X "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:go /Main:X "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:java /Main:X "%s" >> "%t"
-
-module A {
-  module AA {
-    method Test() { print "Test1\n"; }
-  }
-}
-
-module B {
-  class C {
-    static method Test() { print "Test2\n"; }
-  }
-  method Test() { print "Test3\n"; }
-}
-
-method Test() { print "Test4\n"; }
-
-class C {
-  static method Test() { print "Test5\n"; }
-}
diff --git a/Test/git-issues/git-issue-MainE.dfy b/Test/git-issues/git-issue-MainE.dfy
deleted file mode 100644
index e1f830f22cd..00000000000
--- a/Test/git-issues/git-issue-MainE.dfy
+++ /dev/null
@@ -1,82 +0,0 @@
-// NONUNIFORM: Multiple test scenarios (could be split)
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /Main:A.Test "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /Main:B.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:C.Test "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /Main:D.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:E.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:G.Test "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /Main:H.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:I.Test "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /Main:J.Test "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /Main:K.Test "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:       "%s" >> "%t"
-// RUN: %dafny /noVerify /compile:4 /Main:-      "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /Main:Tr.Instance "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /Main:Opaque.Static   "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /Main:Opaque.Instance "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class A {
-  method Test(i: int) { print "Bad\n"; }
-}
-class B {
-  method Test<T>() { print "Bad\n"; }
-}
-class C<T> {
-  method Test() { print "OK-C\n"; }
-}
-class D {
-  constructor() {}
-  method Test() { print "Bad\n"; }
-}
-class E {
-  constructor() {}
-  static method Test() { print "OK-E\n"; }
-}
-class G {
-  method Test(ghost i: int) { print "OK-G\n"; }
-}
-class H {
-  method Test() returns (i: int) { print "Bad\n"; }
-}
-class I {
-  method Test() returns (ghost i: int) { print "OK-I\n"; }
-}
-class J {
-  method Test() requires true { print "Bad\n"; }
-}
-class K {
-  method Test() modifies {} { print "Bad\n"; }
-}
-class Z {
-  method Main() { print "Main\n"; }
-}
-
-// Of the remaining methods, this file tests only the error cases.
-// The cases that compile are tested in Test/comp/MainMethod.dfy.
-
-trait Tr {
-  static method Static() { print "OK-Tr\n"; }
-  method Instance() { print "Bad\n"; }
-}
-
-datatype Dt = Dt0(int) | Dt1(real) {
-  static method Static() { print "OK-Dt: static\n"; }
-  method Instance() { print "OK-Dt: ", this, "\n"; }
-}
-
-codatatype Co = CoMore(Co) {
-  static method Static() { print "OK-Co: static\n"; }
-  method Instance() { print "OK-Co: ", this, "\n"; }
-}
-
-newtype Nt = x | -0x8000_0000 <= x <= 0x8000_0000 {
-  static method Static() { print "OK-Nt: static\n"; }
-  method Instance() { print "OK-Nt: ", this, "\n"; }
-}
-
-type {:extern "OpaqueX"} Opaque {
-  static method Static() { print "Bad\n"; }
-  method Instance() { print "Bad\n"; }
-}
diff --git a/Test/git-issues/github-issue-1267.dfy b/Test/git-issues/github-issue-1267.dfy
deleted file mode 100644
index d52ae1698c4..00000000000
--- a/Test/git-issues/github-issue-1267.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0 /env:0 /dprint:- "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Test()
-{
-  var tuple0 := (1 := 300, 0 := 10);
-  var tuple1 := (10, 300);
-  assert tuple0 == tuple1;
-}
diff --git a/Test/git-issues/github-issue-2174.dfy.expect b/Test/git-issues/github-issue-2174.dfy.expect
deleted file mode 100644
index 8c4d74ae00a..00000000000
--- a/Test/git-issues/github-issue-2174.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 19 verified, 0 errors
diff --git a/Test/git-issues/github-issue-2563.dfy b/Test/git-issues/github-issue-2563.dfy
deleted file mode 100644
index 72a55975789..00000000000
--- a/Test/git-issues/github-issue-2563.dfy
+++ /dev/null
@@ -1,2 +0,0 @@
-// RUN: %exits-with 1 %dafny /compile:0 '/verificationLogger:csv;log.csv' "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
diff --git a/Test/git-issues/github-issue-2563.dfy.expect b/Test/git-issues/github-issue-2563.dfy.expect
deleted file mode 100644
index 60092e2041c..00000000000
--- a/Test/git-issues/github-issue-2563.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-github-issue-2563.dfy(1,0): Warning: File contains no code
-
-Dafny program verifier finished with 0 verified, 0 errors
-*** Error: unknown parameter to `/verificationLogger:csv`: log.csv
diff --git a/Test/git-issues/github-issue-2574.dfy b/Test/git-issues/github-issue-2574.dfy
deleted file mode 100644
index 25f9d39b1ad..00000000000
--- a/Test/git-issues/github-issue-2574.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %exits-with 4 %baredafny /compile:0 /showSnippets:1 "%s" > "%t.raw"
-// RUN: %sed 's/^.*[\/\\]//' "%t".raw > "%t"
-// RUN: %diff %s.expect %t
-module Spec {
-  type input
-  method ReadInput() returns (i:input)
-}
-
-module Impl refines Spec {
-  class input {}
-  method ReadInput() returns (i:input) {
-  }
-}
diff --git a/Test/git-issues/github-issue-2928.dfy b/Test/git-issues/github-issue-2928.dfy
deleted file mode 100644
index 0ce6e567216..00000000000
--- a/Test/git-issues/github-issue-2928.dfy
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %testDafnyForEachCompiler %s
-
-method Main() {
-  var c := '\0';
-  assert c == 0 as char;
-  expect c == 0 as char;
-
-  var s := "\03";
-  
-  assert |s| == 2;
-  expect |s| == 2;
-
-  assert s[0] == 0 as char;
-  expect s[0] == 0 as char;
-
-  assert s[1] == '3';
-  expect s[1] == '3';
-}
diff --git a/Test/git-issues/github-issue-2989.dfy b/Test/git-issues/github-issue-2989.dfy
deleted file mode 100644
index 7618282314a..00000000000
--- a/Test/git-issues/github-issue-2989.dfy
+++ /dev/null
@@ -1,18 +0,0 @@
-// NONUNIFORM: Go-specific regression test
-// RUN: %baredafny translate go %args --unicode-char:false "%s" > "%t"
-// RUN: %baredafny translate go %args --unicode-char:true "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t" 
-
-method Main() {
-  var s := Foo();
-}
-
-// An extern method that returned a string used to cause
-// an internal contract violation and nonsensical errors like
-// "Error: Cannot convert from string to seq<char>"
-
-method {:extern "foo"} Foo() returns (s: string)
-
-method Bar() returns (s: string) {
-  return "hello";
-}
diff --git a/Test/git-issues/github-issue-305-b.dfy b/Test/git-issues/github-issue-305-b.dfy
deleted file mode 100644
index c8cb980f915..00000000000
--- a/Test/git-issues/github-issue-305-b.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %exits-with 3 %dafny /compile:0 /spillTargetCode:2 /useBaseNameForFileName "%s" > "%t"
-// RUN: %diff "%s".expect "%t"
-
-method hasNoBody()
-
-method Main() {
-    hasNoBody();
-    print "hello\n";
-}
diff --git a/Test/git-issues/github-issue-305-b.dfy.expect b/Test/git-issues/github-issue-305-b.dfy.expect
deleted file mode 100644
index 886f0b876f8..00000000000
--- a/Test/git-issues/github-issue-305-b.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Dafny program verifier finished with 1 verified, 0 errors
-github-issue-305-b.dfy(4,7): Error: Method _module._default.hasNoBody has no body
-Wrote textual form of partial target program to github-issue-305-b.cs
diff --git a/Test/git-issues/github-issue-305-c.dfy.expect b/Test/git-issues/github-issue-305-c.dfy.expect
deleted file mode 100644
index 7a0d776f0ce..00000000000
--- a/Test/git-issues/github-issue-305-c.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-Wrote textual form of target program to github-issue-305-c.cs
diff --git a/Test/git-issues/github-issue-3343.dfy b/Test/git-issues/github-issue-3343.dfy
deleted file mode 100644
index d518b2a1a41..00000000000
--- a/Test/git-issues/github-issue-3343.dfy
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-method Bug() {
-    var zero := 0;
-    var a := new int[zero] [];
-}
diff --git a/Test/git-issues/github-issue-3874.dfy b/Test/git-issues/github-issue-3874.dfy
deleted file mode 100644
index 465df2ba1fe..00000000000
--- a/Test/git-issues/github-issue-3874.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s"
-
-method Main() {
-    var s: multiset<bool> := multiset{true};
-
-    while (s != multiset{}) {
-        var x :| x in s;
-	s := s[x := 0];
-    }
-
-    print "done", "\n";
-}
diff --git a/Test/git-issues/github-issue-4017.dfy b/Test/git-issues/github-issue-4017.dfy
deleted file mode 100644
index 4815b91fd69..00000000000
--- a/Test/git-issues/github-issue-4017.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %baredafny verify %args %s > %t
-// RUN: %diff "%s.expect" "%t"
-
-function Crash(e: nat): string
-{
-  assert match e { case _ => true };
-  ""
-}
\ No newline at end of file
diff --git a/Test/git-issues/github-issue-4144.dfy.expect b/Test/git-issues/github-issue-4144.dfy.expect
deleted file mode 100644
index 748466e904b..00000000000
--- a/Test/git-issues/github-issue-4144.dfy.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-github-issue-4144.dfy(9,31): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy(10,31): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy(11,31): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy(13,23): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy(14,23): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy(15,23): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](9,31): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](9,31): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](10,31): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](10,31): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](11,31): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](11,31): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](13,23): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](13,23): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](14,23): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](14,23): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](15,23): Warning: /!\ No terms found to trigger on.
-github-issue-4144.dfy[Q](15,23): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 2 verified, 0 errors
diff --git a/Test/hofs/Apply.dfy b/Test/hofs/Apply.dfy
deleted file mode 100644
index b40f7a3e7b9..00000000000
--- a/Test/hofs/Apply.dfy
+++ /dev/null
@@ -1,63 +0,0 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-
-method Apply(x : int) returns (i : int)
-  ensures i == x
-{
-  i := (x => x)(x);
-}
-
-function Const<A,B>(a : A) : B -> A {
-  b => a
-}
-
-method Test(m : map<int, int -> int -> int>)
-{
-  assume forall i :: i in m;
-  assume forall i, x :: m[i].requires(x);
-  assume forall i, x, y :: m[i](x).requires(y);
-  assume m[1](2)(3) > 5;
-  assert ((m[1])(2))(3) > 4;
-}
-
-method Main() {
-  assert forall x : int, y : int :: Const(x)(y) == (Const(x))(y);
-  assert (a => b => a) == (u : int) => (v : int) => u;
-}
-
-class Cell {
-  var data: int
-}
-
-method AllocationTest(oldcell: Cell)
-  requires oldcell.data == 48
-{
-  var y := new Cell;
-  y.data := 45;
-  var f := () reads y => y.data;
-  assert f() == 45;
-
-  var z := new Cell;
-  var g := () => if y == z then 30 else 45;
-  assert g() == 45;
-
-  if * {
-    ghost var d := old(f());  // error: f, which has a reads clause, is not available in old
-  } else {
-    ghost var e := old(g());  // fine, since g has no reads clause, it is known to produce the same value in any state
-    assert e == g();
-  }
-
-  var j := (c: Cell, b) => if b then c else oldcell;
-  var k := (c: Cell?, b) reads c, oldcell requires b ==> c != null => (if b then c else oldcell).data;
-  var b;
-  if {
-    case true =>  assert j(y, b).data < 50;
-    case true =>  assert old(j(y, false).data) == 48;  // error: argument y is not allocated in old state
-    case true =>  assert old(j(y, true).data) == 45;  // error: argument y is not allocated in old state
-    case true =>  assert old(j(oldcell, b).data) == 48;
-    case true =>  assert old(k(oldcell, b)) == 48;
-    case true =>  assert old(k(y, b)) < 50;  // error: argument y is not allocated in old state
-  }
-}
diff --git a/Test/hofs/Apply.dfy.expect b/Test/hofs/Apply.dfy.expect
deleted file mode 100644
index 9de0165d0e5..00000000000
--- a/Test/hofs/Apply.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-Apply.dfy(46,23): Error: function might not be allocated in the state in which the function is invoked
-Apply.dfy(57,31): Error: argument might not be allocated in the state in which the function is invoked
-Apply.dfy(58,31): Error: argument might not be allocated in the state in which the function is invoked
-Apply.dfy(61,31): Error: argument might not be allocated in the state in which the function is invoked
-
-Dafny program verifier finished with 4 verified, 4 errors
diff --git a/Test/hofs/ArrowTypeOptimizations.dfy.expect b/Test/hofs/ArrowTypeOptimizations.dfy.expect
deleted file mode 100644
index 9ef977121c6..00000000000
--- a/Test/hofs/ArrowTypeOptimizations.dfy.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Verifying CheckReads (well-formedness) ...
-  [3 proof obligations]  errors
-ArrowTypeOptimizations.dfy(10,2): Error: function precondition could not be proved
-ArrowTypeOptimizations.dfy(10,2): Error: insufficient reads clause to invoke function
-
-Verifying CheckPre (well-formedness) ...
-  [2 proof obligations]  error
-ArrowTypeOptimizations.dfy(16,2): Error: function precondition could not be proved
-
-Verifying CheckReadsTot (well-formedness) ...
-  [1 proof obligation]  verified
-
-Verifying CheckReadsParens (well-formedness) ...
-  [1 proof obligation]  verified
-
-Verifying CheckReadsLambdaGeneral (well-formedness) ...
-  [3 proof obligations]  verified
-
-Verifying CheckReadsLambdaPartial (well-formedness) ...
-  [2 proof obligations]  verified
-
-Verifying CheckReadsLambdaTotal (well-formedness) ...
-  [1 proof obligation]  verified
-
-Dafny program verifier finished with 5 verified, 3 errors
diff --git a/Test/hofs/Classes.dfy.expect b/Test/hofs/Classes.dfy.expect
deleted file mode 100644
index 57c1b11c8a7..00000000000
--- a/Test/hofs/Classes.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-Classes.dfy(60,11): Error: assertion could not be proved
-Classes.dfy(38,5): Error: function precondition could not be proved
-
-Dafny program verifier finished with 4 verified, 2 errors
diff --git a/Test/hofs/Consequence.dfy b/Test/hofs/Consequence.dfy
deleted file mode 100644
index 9c62a6ba331..00000000000
--- a/Test/hofs/Consequence.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-newtype Nat = x | 0 <= x
-
-method Check() {
-  var f : Nat -> Nat;
-  assume f.requires(0);
-  var i : Nat := f(0);
-}
diff --git a/Test/hofs/Examples.dfy b/Test/hofs/Examples.dfy
deleted file mode 100644
index bebda559221..00000000000
--- a/Test/hofs/Examples.dfy
+++ /dev/null
@@ -1,57 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-function Apply<A,B>(f: A ~> B, x: A): B
-  reads f.reads(x)
-  requires f.requires(x)
-{
-  f(x)
-}
-
-function Apply'<A,B>(f: A ~> B) : A ~> B
-{
-  x reads f.reads(x)
-    requires f.requires(x)
-    => f(x)
-}
-
-
-function Compose<A,B,C>(f: B ~> C, g:A ~> B): A ~> C
-{
-  x reads g.reads(x)
-    reads if g.requires(x) then f.reads(g(x)) else {}
-    requires g.requires(x)
-    requires f.requires(g(x))
-    => f(g(x))
-}
-
-function W<A>(f : (A,A) ~> A): A ~> A
-{
-  x requires f.requires(x,x)
-    reads f.reads(x,x)
-    => f(x,x)
-}
-
-function Curry<A,B,C>(f : (A,B) ~> C) : A ~> B ~> C
-{
-  x => y requires f.requires(x,y)
-         reads f.reads(x,y)
-         => f(x,y)
-}
-
-function Uncurry<A,B,C>(f : A ~> B ~> C) : (A,B) ~> C
-{
-  (x,y) requires f.requires(x)
-        requires f(x).requires(y)
-        reads f.reads(x)
-        reads if f.requires(x) then f(x).reads(y) else {}
-        => f(x)(y)
-}
-
-function S<A,B,C>(f : (A,B) ~> C, g : A ~> B): A ~> C
-{
-  x requires g.requires(x)
-    requires f.requires(x,g(x))
-    reads g.reads(x)
-    reads if g.requires(x) then f.reads(x,g(x)) else {}
-    => f(x,g(x))
-}
diff --git a/Test/hofs/Field.dfy.expect b/Test/hofs/Field.dfy.expect
deleted file mode 100644
index 6e855f7dc57..00000000000
--- a/Test/hofs/Field.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-Field.dfy(12,11): Error: function precondition could not be proved
-Field.dfy(12,14): Error: assertion could not be proved
-Field.dfy(21,11): Error: function precondition could not be proved
-Field.dfy(21,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Test/hofs/Folding.dfy b/Test/hofs/Folding.dfy
deleted file mode 100644
index 2b73098e991..00000000000
--- a/Test/hofs/Folding.dfy
+++ /dev/null
@@ -1,254 +0,0 @@
-// NONUNIFORM: /induction:3 not supported by new CLI
-// RUN: %dafny /compile:3 /induction:3 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Specifications and proofs involving foldr (inspired by Liquid Haskell) and foldl
-// Rustan Leino
-// 13 April 2016
-
-method Main() {
-  var xs := SeqToList([57, 100, -34, 1, 8]);
-  var r := foldr((a,b) => 2*a + b, 0, xs);
-  var l := foldl((b,a) => b + 2*a, 0, xs);
-  print "xs = ", xs, "\n";
-  print "foldr = ", r, "\n";
-  print "foldl = ", l, "\n";
-  print "length = ", length(xs), "\n";
-  print "foldr inc = ", foldr((_,b) => b+1, 0, xs), "\n";
-  print "foldl inc = ", foldl((b,_) => b + 1, 0, xs), "\n";
-}
-
-// ----- standard definitions ----------
-
-datatype List<T> = Nil | Cons(T, List<T>)
-
-function length(xs: List): nat
-{
-  match xs
-  case Nil => 0
-  case Cons(_, tail) => 1 + length(tail)
-}
-
-function SeqToList(s: seq): List
-{
-  if s == [] then Nil else Cons(s[0], SeqToList(s[1..]))
-}
-
-// ----- foldr ----------
-
-function foldr<A,B>(f: (A,B) -> B, b: B, xs: List<A>): B
-{
-  match xs
-  case Nil => b
-  case Cons(head, tail) => f(head, foldr(f, b, tail))
-}
-
-// The following predicate says that "inv" is invariant under "stp".
-// "stp" is really just a relational version of the function "f" passed to fold.
-ghost predicate InvR<A(!new),B(!new)>(inv: (List<A>,B) -> bool, stp: (A,B,B) -> bool)
-{
-  forall x, xs, b, b' ::
-  inv(xs, b) && stp(x, b, b') ==> inv(Cons(x, xs), b')
-}
-
-lemma FoldR_Property<A,B>(inv: (List<A>,B) -> bool, stp: (A,B,B) -> bool, f: (A,B) -> B, b: B, xs: List<A>)
-  requires InvR(inv, stp)
-  requires forall a,b :: stp(a, b, f(a,b))
-  requires inv(Nil, b)
-  ensures inv(xs, foldr(f, b, xs))
-{
-  // Note:  Dafny is able to complete this whole proof automatically, so the following lines can all be erased.
-  match xs
-  case Nil =>
-    // by the precondition
-  case Cons(head, tail) =>
-    var b' := foldr(f, b, tail);
-    calc {
-      true;
-    ==>  // by the precondition that mentions "stp"
-      stp(head, b', f(head, b'));
-    ==>  // by the induction hypothesis invoked as FoldR_Property(inv, stp, f, b, tail)
-      inv(tail, b') && stp(head, b', f(head, b'));
-    ==>  // by InvR(inv, stp)
-      inv(Cons(head, tail), f(head, b'));
-    }
-}
-
-lemma FoldR_Property_ShortProof<A,B>(inv: (List<A>,B) -> bool, stp: (A,B,B) -> bool, f: (A,B) -> B, b: B, xs: List<A>)
-  requires InvR(inv, stp)
-  requires forall a,b :: stp(a, b, f(a,b))
-  requires inv(Nil, b)
-  ensures inv(xs, foldr(f, b, xs))
-{
-}
-
-method FoldR_Use(xs: List<int>)
-{
-  var f := (a,b) => 2*a + 3*b;
-  var r := foldr(f, 0, xs);
-  ghost var inv := (xs,b) => b % 2 == 0;
-  ghost var stp := (a,b,b') => b % 2 == 0 ==> b' % 2 == 0;
-  FoldR_Property(inv, stp, f, 0, xs);
-  assert r % 2 == 0;
-}
-
-// The (inv,stp) method of proof above is general, in the sense that it can be instantiated with (inv,stp).
-// For a particular function, like F23, one can also prove a lemma about foldr directly.
-function F23(a: int, b: int): int {
-  2*a + 3*b
-}
-
-lemma FoldR_F23(xs: List<int>)
-  ensures foldr(F23, 0, xs) % 2 == 0
-{
-  // Note: With Z3 v.4.8.4, this proof had been automatic.
-  // With Z3 v.4.8.9, the following empty match structure is needed.
-  match xs
-  case Nil =>
-  case Cons(head, tail) =>
-}
-
-// In fact, it's also possible to write this lemma in an inline assertion.
-method FoldR_Use_Direct(xs: List<int>)
-{
-  var r := foldr(F23, 0, xs);
-  assert forall ys :: foldr(F23, 0, ys) % 2 == 0;
-  assert r % 2 == 0;
-}
-
-method FoldR_Use_Direct_lambda(xs: List<int>)
-{
-  var f := (a,b) => 2*a + 3*b;
-  var r := foldr(f, 0, xs);
-  assert forall ys :: foldr(f, 0, ys) % 2 == 0;
-  assert r % 2 == 0;
-}
-
-// It is not necessary to use the relation "stp".  Instead, the function "f" can be used directly.
-lemma FoldR_Property_inv_f<A,B>(inv: (List<A>,B) -> bool, f: (A,B) -> B, b: B, xs: List<A>)
-  requires forall x, xs, b :: inv(xs, b) ==> inv(Cons(x, xs), f(x, b))
-  requires inv(Nil, b)
-  ensures inv(xs, foldr(f, b, xs))
-{
-}
-
-// Here's another use of the proof technique, showing that folding (+1) over a list gives its length.
-lemma FoldingIncR(xs: List<int>)
-  ensures foldr((_,b) => b + 1, 0, xs) == length(xs)
-{
-  FoldR_Property_inv_f((xs,b) => b == length(xs), (_,b) => b + 1, 0, xs);
-}
-
-// ----- foldl ----------
-
-function foldl<A,B>(f: (B,A) -> B, b: B, xs: List<A>): B
-{
-  match xs
-  case Nil => b
-  case Cons(head, tail) => foldl(f, f(b, head), tail)
-}
-
-// InvL is like InvR above, but the implication goes from larger lists to smaller ones (which is
-// in the opposite direction from in InvR).
-ghost predicate InvL<A(!new),B(!new)>(inv: (B,List<A>) -> bool, stp: (B,A,B) -> bool)
-{
-  forall x, xs, b, b' ::
-  inv(b, Cons(x, xs)) && stp(b, x, b') ==> inv(b', xs)
-}
-
-// This is the analogous lemma to FoldR_Property above.  But instead of proving
-//     inv(Nil, b) ==> inv(xs, foldr(f, b, xs))
-// this lemma proves
-//     inv(b, xs) ==> inv(foldl(f, b, xs), Nil)
-lemma FoldL_Property<A,B>(inv: (B,List<A>) -> bool, stp: (B,A,B) -> bool, f: (B,A) -> B, b: B, xs: List<A>)
-  requires InvL(inv, stp)
-  requires forall b,a :: stp(b, a, f(b, a))
-  requires inv(b, xs)
-  ensures inv(foldl(f, b, xs), Nil)
-{
-  // Note:  In this case to complete the proof, Dafny needs the call to the induction hypothesis below, but
-  // the rest of the calculation can be omitted.
-  match xs
-  case Nil =>
-    // vacuous
-  case Cons(head, tail) =>
-    calc {
-      true;
-    ==>  // by the precondition
-      inv(b, Cons(head, tail));
-    ==>  // by the precondition that mentions "stp"
-      inv(b, Cons(head, tail)) && stp(b, head, f(b, head));
-    ==>  // by InvLeft(inv, stp)
-      inv(f(b, head), tail);
-    ==>  { FoldL_Property(inv, stp, f, f(b, head), tail); }  // induction hypothesis
-      inv(foldl(f, f(b, head), tail), Nil);
-    }
-}
-
-lemma FoldL_Use(xs: List<int>)
-{
-  var f := (b,a) => 3*b + 2*a;
-  var l := foldl(f, 0, xs);
-  ghost var inv := (b,xs) => b % 2 == 0;
-  ghost var stp := (b,a,b') => b % 2 == 0 ==> b' % 2 == 0;
-  FoldL_Property(inv, stp, f, 0, xs);
-  assert l % 2 == 0;
-}
-
-// Here is FoldL_Property again, but this time with "f" instead of "stp".
-lemma FoldL_Property_inv_f<A,B>(inv: (B,List<A>) -> bool, f: (B,A) -> B, b: B, xs: List<A>)
-  requires forall x, xs, b :: inv(b, Cons(x, xs)) ==> inv(f(b, x), xs)
-  requires inv(b, xs)
-  ensures inv(foldl(f, b, xs), Nil)
-{
-  // the rest of the calculation can be omitted.
-  match xs
-  case Nil =>
-  case Cons(head, tail) =>
-    calc {
-      true;
-    ==>  // by the precondition
-      inv(b, Cons(head, tail));
-    ==>  // by the inductive property of "inv"
-      inv(f(b, head), tail);
-    ==>  { FoldL_Property_inv_f(inv, f, f(b, head), tail); }  // induction hypothesis
-      inv(foldl(f, f(b, head), tail), Nil);
-    }
-}
-
-// And as in the case of foldr, one can also use a specialized lemma for a particular function to be folded.
-function F32(b: int, a: int): int
-{
-  3*b + 2*a
-}
-
-lemma FoldL_F32(xs: List<int>, b: int)
-  requires b % 2 == 0
-  ensures foldl(F32, b, xs) % 2 == 0
-{
-}
-
-method FoldL_Use_Direct(xs: List<int>)
-{
-  var r := foldl(F32, 0, xs);
-  assert forall ys,b :: b % 2 == 0 ==> foldl(F32, b, ys) % 2 == 0;
-  assert r % 2 == 0;
-}
-
-method {:vcs_split_on_every_assert} FoldL_Use_Direct_lambda(xs: List<int>)
-{
-  var f := (b,a) => 3*b + 2*a;
-  var r := foldl(f, 0, xs);
-  assert forall ys,b :: b % 2 == 0 ==> foldl(f, b, ys) % 2 == 0;
-  assert r % 2 == 0;
-}
-
-// Here is a proof that foldl on (+1) gives the length.
-lemma FoldingIncL(xs: List<int>)
-  ensures foldl((b,_) => b + 1, 0, xs) == length(xs)
-{
-  var inv := (b,ys) => b + length(ys) == length(xs);
-  var inc := (b,_) => b + 1;
-  var r := foldl(inc, 0, xs);
-  FoldL_Property_inv_f(inv, inc, 0, xs);
-}
diff --git a/Test/hofs/Folding.dfy.expect b/Test/hofs/Folding.dfy.expect
deleted file mode 100644
index c4384266dfb..00000000000
--- a/Test/hofs/Folding.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Dafny program verifier finished with 21 verified, 0 errors
-xs = List.Cons(57, List.Cons(100, List.Cons(-34, List.Cons(1, List.Cons(8, List.Nil)))))
-foldr = 264
-foldl = 264
-length = 5
-foldr inc = 5
-foldl inc = 5
diff --git a/Test/hofs/Frame.dfy.expect b/Test/hofs/Frame.dfy.expect
deleted file mode 100644
index e7c903d2472..00000000000
--- a/Test/hofs/Frame.dfy.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-Frame.dfy(23,15): Error: assertion could not be proved
-Frame.dfy(37,13): Error: assertion could not be proved
-Frame.dfy(63,22): Error: assertion could not be proved
-Frame.dfy(66,18): Error: insufficient reads clause to read array element
-Frame.dfy(68,27): Error: insufficient reads clause to read array element
-Frame.dfy(123,13): Error: function precondition could not be proved
-Frame.dfy(123,18): Error: assertion could not be proved
-
-Dafny program verifier finished with 5 verified, 7 errors
diff --git a/Test/hofs/Lambda.dfy.expect b/Test/hofs/Lambda.dfy.expect
deleted file mode 100644
index 8b68a2df145..00000000000
--- a/Test/hofs/Lambda.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-Lambda.dfy(24,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 3 verified, 1 error
diff --git a/Test/hofs/LambdaParsefail2.dfy b/Test/hofs/LambdaParsefail2.dfy
deleted file mode 100644
index 8ca9224b1ec..00000000000
--- a/Test/hofs/LambdaParsefail2.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-
-method Fail2() {
-    var g4 := (x, y : A) => (y, x : B); // RHS should fail!
-}
-
diff --git a/Test/hofs/Monads.dfy.expect b/Test/hofs/Monads.dfy.expect
deleted file mode 100644
index 4bb1c2c7251..00000000000
--- a/Test/hofs/Monads.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 18 verified, 0 errors
diff --git a/Test/hofs/MutableField.dfy b/Test/hofs/MutableField.dfy
deleted file mode 100644
index 909d6f774b1..00000000000
--- a/Test/hofs/MutableField.dfy
+++ /dev/null
@@ -1,15 +0,0 @@
-// RUN: %exits-with 2 %dafny /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-
-class C {
-  function f(x : int) : int { x }
-
-  var g : int -> int
-
-  method M() modifies this
-  {
-    f := g; // not ok
-  }
-}
-
diff --git a/Test/hofs/Naked.dfy b/Test/hofs/Naked.dfy
deleted file mode 100644
index 104e99e9b8b..00000000000
--- a/Test/hofs/Naked.dfy
+++ /dev/null
@@ -1,104 +0,0 @@
-// RUN: %exits-with 4 %dafny /deprecation:0 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module Functions {
-  ghost function f(x: nat): nat
-  {
-    if x == 0 then 0 else
-    if var b: bool :| true; b then
-      var h := f;
-      h(x-1)
-    else
-      (f)(x-1)
-  }
-
-  ghost function f1(x: nat): nat { if x == 0 then 0 else f2(x - 1) }
-
-  ghost function f2(x: nat): nat { if x == 0 then 0 else (f1)(x - 1) }
-}
-
-module Requires {
-  ghost function t(x: nat): nat
-    requires !t.requires(x);  // error: use of naked function in its own SCC
-  { x }
-
-  ghost function g(x: nat): nat
-    requires !(g).requires(x);  // error: use of naked function in its own SCC
-  { x }
-
-  ghost function D(x: int): int  // used so termination errors don't mask other errors
-  ghost function g2(x: int): int decreases D(x) { h(x) }  // error: precondition violation
-  ghost function h(x: int): int
-    requires !g2.requires(x);  // error: use of naked function in its own SCC
-  { x }
-}
-
-module Reads {
-  ghost function t(x: nat): nat
-    reads t.reads(x);
-  { x }
-
-  ghost function g(x: nat): nat
-    reads (g).reads(x);
-  { x }
-
-  ghost function g2(x: int): int
-  { h(x) }
-
-  ghost function h(x: int): int
-    reads g2.reads(x);
-  { x }
-}
-
-module ReadsGenerics {
-  class Cl<A> {
-    ghost function t<B>(a: A, b: B): (A, B)
-      reads t.reads(a, b);
-    { (a, b) }
-
-    ghost function g<B>(a: A, b: B): (A, B)
-      reads (g).reads(a, b);
-    { (a, b) }
-
-    ghost function g2<B>(a: A, b: B): (A, B)
-    { h(a, b) }
-
-    ghost function h<B>(a: A, b: B): (A, B)
-      reads g2.reads(a, b);
-    { (a, b) }
-  }
-}
-
-module TwoStateFunctions {
-  method Apply(ghost f: int -> int, x: int) returns (ghost y: int)
-    ensures y == f(x)
-  {
-    y := f(x);
-  }
-
-  class Cell {
-    var data: int
-
-    twostate function F(x: int): int {
-      old(data) + x
-    }
-  }
-
-  method Caller(c: Cell)
-    requires c.data == 9
-    modifies c
-  {
-    c.data := c.data + 1;
-    label L:
-    assert c.F(11) == 20;
-
-    var y := Apply(c.F, 11);
-    assert y == 20;
-
-    assert c.F@L(11) == 21;
-    y := Apply(u => c.F@L(u), 11);
-    assert y == 21;
-
-    assert c.F(100) == 0; // error
-  }
-}
diff --git a/Test/hofs/ReadsReads.dfy.expect b/Test/hofs/ReadsReads.dfy.expect
deleted file mode 100644
index 048e732106f..00000000000
--- a/Test/hofs/ReadsReads.dfy.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-ReadsReads.dfy(31,6): Error: insufficient reads clause to invoke function
-ReadsReads.dfy(36,4): Error: insufficient reads clause to invoke function
-ReadsReads.dfy(47,11): Error: insufficient reads clause to invoke function
-ReadsReads.dfy(58,6): Error: insufficient reads clause to invoke function
-ReadsReads.dfy(87,49): Error: assertion could not be proved
-ReadsReads.dfy(89,28): Error: assertion could not be proved
-ReadsReads.dfy(99,36): Error: assertion could not be proved
-ReadsReads.dfy(101,28): Error: assertion could not be proved
-ReadsReads.dfy(173,13): Error: assertion could not be proved
-ReadsReads.dfy(183,13): Error: assertion could not be proved
-ReadsReads.dfy(193,13): Error: assertion could not be proved
-ReadsReads.dfy(203,13): Error: assertion could not be proved
-ReadsReads.dfy(236,13): Error: assertion could not be proved
-ReadsReads.dfy(246,13): Error: assertion could not be proved
-ReadsReads.dfy(256,13): Error: assertion could not be proved
-ReadsReads.dfy(266,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 16 verified, 16 errors
diff --git a/Test/hofs/Simple.dfy b/Test/hofs/Simple.dfy
deleted file mode 100644
index de98803203e..00000000000
--- a/Test/hofs/Simple.dfy
+++ /dev/null
@@ -1,98 +0,0 @@
-// RUN: %exits-with 4 %dafny "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-function MkId<A>() : A -> A {
-  x => x
-}
-
-function IntId() : int ~> int {
-  y => y
-}
-
-function DivZero() : int ~> int
-{
-  z => 5 / z  // div by zero
-}
-
-function DivZeroWithReq() : int ~> int
-{
-  (z) requires z != 0 => 5 / z
-}
-
-function DivZero2() : (int, int) ~> int {
-  (x, y) requires y != 0 => x / y
-}
-
-function DivZero3() : int ~> int {
-  z => z / 0   // div by zero
-}
-
-function Shadow() : int ~> real ~> real {
-  x => x => x
-}
-
-method Reqs() {
-  var fn := (u) requires u => u;
-  print fn(true);
-  print fn(false);  // precond violation
-}
-
-method Main() {
-  var id := IntId();
-  print id(5);
-  var polyid : int ~> int := MkId();
-  print polyid(5);
-  assert id(2) == polyid(2);
-  assert id(3) != 4 && 5 != polyid(6);
-  var divvy := DivZero2();
-  print divvy(2,5);
-  print divvy(2,0); // precond violation
-}
-
-function succ(x : int) : int
-  requires x > 0
-{
-  x + 1
-}
-
-method Main2() {
-  var suc := succ;
-  assert suc(3) == succ(3);
-  assert suc(-1) == 0; // precond violation
-}
-
-function Id<A>(x : A) : A {
-  x
-}
-
-
-method Main3() {
-  var id := Id;
-  assert id(3) == 3;
-  assert forall x :: (Id(id))(x) == (y => y)(x);
-  assert forall x :: (Id(id))(x) == (y => y)(2); // should fail
-}
-
-
-ghost function P<A,B>(f: A ~> B, x : A): B
-  reads (f.reads)(x)
-  requires (f.requires)(x)
-{
-  f(x)
-}
-
-
-ghost function Q<U,V>(f: U ~> V, x : U): V
-  reads P.reads(f,x)
-  requires f.requires(x)  // would be nice to be able to write P.requires(f,x)
-{
-  P(f,x)
-}
-
-ghost function QQ<U,V>(f: U ~> V, x : U): V
-  reads ((() => ((()=>f)()).reads)())((()=>x)())
-  requires ((() => ((()=>f)()).requires)())((()=>x)())
-{
-  ((() => P)())((()=>f)(),(()=>x)())
-}
-
diff --git a/Test/hofs/SumSum.dfy.expect b/Test/hofs/SumSum.dfy.expect
deleted file mode 100644
index 909b183fd5f..00000000000
--- a/Test/hofs/SumSum.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-SumSum.dfy(77,2): Warning: /!\ No terms found to trigger on.
-SumSum.dfy(106,6): Warning: /!\ No terms found to trigger on.
-
-Dafny program verifier finished with 11 verified, 0 errors
diff --git a/Test/hofs/TreeMapSimple.dfy b/Test/hofs/TreeMapSimple.dfy
deleted file mode 100644
index b7baf6eb8d7..00000000000
--- a/Test/hofs/TreeMapSimple.dfy
+++ /dev/null
@@ -1,93 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment
-
-method Main() {
-  TestY();
-  TestZ();
-}
-
-datatype List<A> = Nil | Cons(head: A, tail: List<A>)
-
-datatype Tree<A> = Branch(val: A, trees: List<Tree<A>>)
-
-ghost function ListData(xs: List): set
-  ensures forall x :: x in ListData(xs) ==> x < xs
-{
-  match xs
-  case Nil => {}
-  case Cons(x,xs) => {x} + ListData(xs)
-}
-
-ghost function TreeData(t0: Tree): set
-  ensures forall t :: t in TreeData(t0) ==> t < t0
-{
-  var Branch(x, ts) := t0;
-  {x} + set t, y | t in ListData(ts) && y in TreeData(t) :: y
-}
-
-// ---------- Partial functions ----------
-
-ghost predicate PreY<A,B>(f: A --> B, s: set<A>) {
-  forall x :: x in s ==> f.requires(x)
-}
-
-function MapY<A,B>(xs: List<A>, f: A --> B): List<B>
-  requires PreY(f, ListData(xs))
-  decreases xs
-{
-  match xs
-  case Nil => Nil
-  case Cons(x, xs) => Cons(f(x), MapY(xs, f))
-}
-
-function TreeMapY<A,B>(t0: Tree<A>, f: A --> B): Tree<B>
-  requires PreY(f, TreeData(t0))
-  decreases t0
-{
-  var Branch(x, ts) := t0;
-  Branch(f(x), MapY(ts, t requires t in ListData(ts) && PreY(f, TreeData(t)) => TreeMapY(t, f)))
-}
-
-method TestY() {
-  var f := x requires x != 0 => 100 / x;
-  var t := TreeMapY(Branch(1, Cons(Branch(2, Nil), Nil)), f);
-  assert t == Branch(100, Cons(Branch(50, Nil), Nil));  // proved via Lit axioms
-  print t, "\n";
-}
-
-// ---------- Read-effect functions ----------
-
-ghost predicate PreZ<A,B>(f: A ~> B, s: set<A>)
-  reads set x, y | x in s && y in f.reads(x) :: y
-{
-  forall x :: x in s ==> f.requires(x)
-}
-
-function MapZ<A,B>(xs: List<A>, f: A ~> B): List<B>
-  requires PreZ(f, ListData(xs))
-  reads PreZ.reads(f, ListData(xs))
-  decreases xs
-{
-  match xs
-  case Nil => Nil
-  case Cons(x, xs) => Cons(f(x), MapZ(xs, f))
-}
-
-function TreeMapZ<A,B>(t0: Tree<A>, f: A ~> B): Tree<B>
-  requires PreZ(f, TreeData(t0))
-  reads PreZ.reads(f, TreeData(t0))
-  decreases t0
-{
-  var Branch(x, ts) := t0;
-  var g := t requires t in ListData(ts) && PreZ(f, TreeData(t))
-            reads set x, y | x in TreeData(t) && y in f.reads(x) :: y
-           => TreeMapZ(t, f);
-  Branch(f(x), MapZ(ts, g))
-}
-
-method TestZ() {
-  var f := x requires x != 0 => 100 / x;
-  var t := TreeMapZ(Branch(1, Cons(Branch(2, Nil), Nil)), f);
-  // Functions with reads clauses don't get Lit axioms, so we can't prove the same
-  // assertion as we did in TestY.
-  print t, "\n";
-}
diff --git a/Test/hofs/TreeMapSimple.dfy.expect b/Test/hofs/TreeMapSimple.dfy.expect
deleted file mode 100644
index be0317f1016..00000000000
--- a/Test/hofs/TreeMapSimple.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-Tree.Branch(100, List.Cons(Tree.Branch(50, List.Nil), List.Nil))
-Tree.Branch(100, List.Cons(Tree.Branch(50, List.Nil), List.Nil))
diff --git a/Test/hofs/Twice.dfy b/Test/hofs/Twice.dfy
deleted file mode 100644
index 75e095eb371..00000000000
--- a/Test/hofs/Twice.dfy
+++ /dev/null
@@ -1,37 +0,0 @@
-// RUN: %exits-with 4 %dafny /print:"%t.print" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-function Twice<A>(f : A ~> A): A ~> A
-{
-  x requires f.requires(x) && f.requires(f(x))
-    reads f.reads(x), if f.requires(x) then f.reads(f(x)) else {}
-  => f(f(x))
-}
-
-method Simple() {
-  assert Twice(x => x + 1)(0) == 2;
-  assert Twice(Twice(x => x + 1))(0) == 4;
-
-  assert Twice(Twice)(x => x + 1)(0) == 4;
-  assert Twice(Twice)(Twice)(x => x + 1)(0) == 16;
-}
-
-method WithReads() {
-  var a : array<int> := new int[1];
-  a[0] := 1;
-  var f := x reads a => x + a[0];
-  assert Twice(f)(0) == 2;
-  a[0] := 2;
-  assert Twice(f)(0) == 4;
-  assert Twice(f)(0) == 2; // should fail
-  assert false;            // should fail
-}
-
-
-function Twice_bad<A>(f : A ~> A): A ~> A
-{
-  x requires f.requires(x) && f.requires(f(x))
-    reads f.reads(x) + f.reads(f(x))
-  => f(f(x))
-}
-
diff --git a/Test/hofs/Twice.dfy.expect b/Test/hofs/Twice.dfy.expect
deleted file mode 100644
index f7683b3c111..00000000000
--- a/Test/hofs/Twice.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-Twice.dfy(26,21): Error: assertion could not be proved
-Twice.dfy(34,31): Error: function precondition could not be proved
-
-Dafny program verifier finished with 2 verified, 2 errors
diff --git a/Test/irondafny0/inheritreqs0.dfy.expect b/Test/irondafny0/inheritreqs0.dfy.expect
deleted file mode 100644
index 82635c38581..00000000000
--- a/Test/irondafny0/inheritreqs0.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-inheritreqs0.dfy(19,13): Error: a precondition for this call could not be proved
-inheritreqs0.dfy[Impl](6,17): Related location: this is the precondition that could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/irondafny0/inheritreqs1.dfy.expect b/Test/irondafny0/inheritreqs1.dfy.expect
deleted file mode 100644
index 6dd57debae4..00000000000
--- a/Test/irondafny0/inheritreqs1.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-inheritreqs1.dfy(20,13): Error: a precondition for this call could not be proved
-inheritreqs1.dfy(15,17): Related location: this is the precondition that could not be proved
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/irondafny0/opened_workaround.dfy b/Test/irondafny0/opened_workaround.dfy
deleted file mode 100644
index 7801ab82e54..00000000000
--- a/Test/irondafny0/opened_workaround.dfy
+++ /dev/null
@@ -1,21 +0,0 @@
-// RUN: %exits-with 3 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module A {
-
-    ghost predicate P()
-
-    class C
-    {
-        static method{:axiom} M()
-            ensures P()
-    }
-}
-
-abstract module B {
-    import opened A
-}
-
-abstract module C {
-    import Bee : B       // Works
-}
diff --git a/Test/irondafny0/opened_workaround.dfy.expect b/Test/irondafny0/opened_workaround.dfy.expect
deleted file mode 100644
index 82f547d87ae..00000000000
--- a/Test/irondafny0/opened_workaround.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-opened_workaround.dfy(6,20): Error: Function A._default.P has no body
diff --git a/Test/irondafny0/optimize0.dfy.expect b/Test/irondafny0/optimize0.dfy.expect
deleted file mode 100644
index 4e37c19c360..00000000000
--- a/Test/irondafny0/optimize0.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-o hai!
\ No newline at end of file
diff --git a/Test/lambdas/LambdaEq.dfy.expect b/Test/lambdas/LambdaEq.dfy.expect
deleted file mode 100644
index cc1f0340c79..00000000000
--- a/Test/lambdas/LambdaEq.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-LambdaEq.dfy(10,11): Error: assertion could not be proved
-LambdaEq.dfy(17,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/lambdas/MatrixAssoc.dfy b/Test/lambdas/MatrixAssoc.dfy
deleted file mode 100644
index 33e69c9952a..00000000000
--- a/Test/lambdas/MatrixAssoc.dfy
+++ /dev/null
@@ -1,262 +0,0 @@
-// RUN: %dafny /compile:0 /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-type Pos = x | 0 < x witness 1
-
-/** Matrix dimension */
-const N : Pos
-
-/** Matrix indices */
-type Index = x | 0 <= x < N      // matrix indices
-
-type Matrix = Index -> Index -> int
-
-/** Function extensionality */
-lemma FunEq<X, Y>(f: X -> Y, g: X -> Y)
-    requires forall x :: f(x) == g(x)
-    ensures f == g
-{ assume false; }
-
-lemma Same(a: Matrix, b: Matrix)
-    requires forall x, y :: a(x)(y) == b(x)(y)
-    ensures a == b
-{
-    forall x ensures a(x) == b(x) {
-        FunEq(a(x), b(x));
-    }
-    FunEq(a, b);
-}
-
-/** Σ f(i) where i ranges from 0 to less than n */
-function Sum_n(f: Index -> int, n: nat): int
-    requires n <= N
-{
-    if n == 0 then 0 else f(n - 1) + Sum_n(f, n - 1)
-}
-
-/** Σ f(i) where i ranges from 0 to less than N */
-function Sum(f: Index -> int): int {
-    Sum_n(f, N)
-}
-
-/** Matrix multiplication */
-function mult(a: Matrix, b: Matrix): Matrix
-{
-    ((x: Index) => (y: Index) =>
-        Sum((k: Index) => a(x)(k) * b(k)(y)))
-}
-
-/** Σ f  +  Σ g  == Σ (i => f(i) + g(i)) */
-/** proof by induction */
-lemma distr_add_n(f: Index -> int, g: Index -> int, n: nat)
-    requires n <= N
-    ensures Sum_n(f, n) + Sum_n(g, n) == Sum_n((i: Index) => f(i) + g(i), n)
-{}
-
-/** (Σ f) * x == Σ (i => f(i) * x) */
-/** proof by induction */
-lemma distr_mult_n(f: Index -> int, n: nat, x: int)
-    requires n <= N
-    ensures Sum_n(f, n) * x == Sum_n((i: Index) => f(i) * x, n)
-{}
-
-/** (Σ f) * x == Σ (i => f(i) * x) */
-lemma distr_mult(f: Index -> int, x: int)
-    ensures Sum(f) * x == Sum((i: Index) => f(i) * x)
-{
-    distr_mult_n(f, N, x);
-}
-
-/** Σ_k (Σ_l f(k,l))  ==  Σ_l (Σ_k f(k,l)) */
-/** proof by induction */
-lemma sum_assoc_n(m: Matrix, n1: nat, n2: nat)
-    requires n1 <= N && n2 <= N
-    ensures Sum_n((k: Index) => Sum_n((l: Index) => m(k)(l), n1), n2)
-            ==
-            Sum_n((l: Index) => Sum_n((k: Index) => m(k)(l), n2), n1)
-{
-    var f  := (k: Index) => Sum_n((l: Index) => m(k)(l), n1);
-    var g  := (l: Index) => Sum_n((k: Index) => m(k)(l), n2);
-    if n2 == 0 {
-        calc {
-            Sum_n(f, n2);
-        ==
-            0;
-        ==
-            Sum_n(g, n2);
-        }
-    } else {
-        var f2 := (l: Index) => m(n2 - 1)(l);
-        var g2 := (l: Index) => Sum_n((k: Index) => m(k)(l), n2 - 1);
-        calc {
-            Sum_n(f, n2);
-        == // def of Sum_n
-            f(n2 - 1) + Sum_n(f, n2 - 1);
-        == // beta reduction
-            Sum_n(f2, n1) + Sum_n(f, n2 - 1);
-        == // IH applied to Sum_n(f, n2 - 1)
-            Sum_n(f2, n1) + Sum_n(g2, n1);
-        == { distr_add_n(f2, g2, n1); }
-            Sum_n((l: Index) => f2(l) + g2(l), n1);
-        == { // substituting f2 and g2
-            FunEq((l: Index) => f2(l) + g2(l),
-                    (l: Index) => m(n2 - 1)(l) + Sum_n((k: Index) => m(k)(l), n2 - 1)); }
-            Sum_n((l: Index) => m(n2 - 1)(l) + Sum_n((k: Index) => m(k)(l), n2 - 1), n1);
-        == { FunEq((l: Index) => m(n2 - 1)(l) + Sum_n((k: Index) => m(k)(l), n2 - 1),
-                   (l: Index) => Sum_n((k: Index) => m(k)(l), n2)); }
-            Sum_n((l: Index) => Sum_n((k: Index) => m(k)(l), n2), n1);
-        }
-    }
-}
-
-/** Σ_k (Σ_l f(k,l))  ==  Σ_l (Σ_k f(k,l)) */
-lemma sum_assoc(m: Matrix)
-    ensures Sum((k: Index) => Sum((l: Index) => m(k)(l)))
-            ==
-            Sum((l: Index) => Sum((k: Index) => m(k)(l)))
-{
-    calc {
-        Sum((k: Index) => Sum((l: Index) => m(k)(l)));
-    == { FunEq((k: Index) => Sum((l: Index) => m(k)(l)),
-               (k: Index) => Sum_n((l: Index) => m(k)(l), N)); }
-        Sum_n((k: Index) => Sum_n((l: Index) => m(k)(l), N), N);
-    == { sum_assoc_n(m, N, N); }
-        Sum_n((l: Index) => Sum_n((k: Index) => m(k)(l), N), N);
-    == { FunEq((l: Index) => Sum((k: Index) => m(k)(l)),
-               (l: Index) => Sum_n((k: Index) => m(k)(l), N)); }
-        Sum((l: Index) => Sum((k: Index) => m(k)(l)));
-    }
-}
-
-/** Σ_k (Σ_l (a * b * c))  ==  Σ_l (Σ_k (a * b * c)) */
-lemma sum_assoc_mult(a: Matrix, b: Matrix, c: Matrix, i: Index, j: Index)
-  ensures Sum((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j)))
-          ==
-          Sum((l: Index) => Sum((k: Index) => a(i)(l) * b(l)(k) * c(k)(j)))
-{
-    var m := (k1: Index) => (l1: Index) => a(i)(l1) * b(l1)(k1) * c(k1)(j);
-    calc {
-        Sum((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
-    == {
-        forall k: Index
-            ensures ((l: Index) => a(i)(l) * b(l)(k) * c(k)(j))
-                    ==
-                    ((l: Index) => m(k)(l))
-        { FunEq((l: Index) => a(i)(l) * b(l)(k) * c(k)(j),
-                (l: Index) => m(k)(l)); }
-        FunEq((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j)),
-              (k: Index) => Sum((l: Index) => m(k)(l))); }
-        Sum((k: Index) => Sum((l: Index) => m(k)(l)));
-    == { sum_assoc(m); }
-        Sum((l: Index) => Sum((k: Index) => m(k)(l)));
-    == {
-            forall l: Index
-                ensures ((k: Index) => m(k)(l))
-                        ==
-                        ((k: Index) => a(i)(l) * b(l)(k) * c(k)(j))
-            {
-                FunEq((k: Index) => m(k)(l),
-                      (k: Index) => a(i)(l) * b(l)(k) * c(k)(j));
-            }
-            FunEq((l: Index) => Sum((k: Index) => m(k)(l)),
-                  (l: Index) => Sum((k: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
-        }
-        Sum((l: Index) => Sum((k: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
-    }
-}
-
-/** (a * (b * c))(i, j) == ((a * b) * c)(i, j) */
-lemma {:vcs_split_on_every_assert} mult_assoc_ij(a: Matrix, b: Matrix, c: Matrix, i: Index, j: Index)
-    ensures mult(mult(a, b), c)(i)(j) == mult(a, mult(b, c))(i)(j)
-{
-    calc {
-        mult(mult(a, b), c)(i)(j);
-    ==
-        Sum((k: Index) => mult(a, b)(i)(k) * c(k)(j));
-    == { assert forall k : Index :: mult(a, b)(i)(k) == Sum((l: Index) => a(i)(l) * b(l)(k));
-         FunEq((k: Index) => mult(a, b)(i)(k) * c(k)(j),
-               (k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k)) * c(k)(j)); }
-        Sum((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k)) * c(k)(j));
-    == {
-            forall k: Index
-                ensures Sum((l: Index) => a(i)(l) * b(l)(k)) * c(k)(j)
-                        ==
-                        Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j))
-            {
-                var g := (l: Index) => a(i)(l) * b(l)(k);
-                var x := c(k)(j);
-                calc {
-                    Sum((l: Index) => a(i)(l) * b(l)(k)) * c(k)(j);
-                ==
-                    Sum(g) * x;
-                == { distr_mult(g, x); }
-                    Sum((l: Index) => g(l) * x);
-                == { FunEq((l: Index) => g(l) * x,
-                           (l: Index) => a(i)(l) * b(l)(k) * c(k)(j)); }
-                    Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j));
-                }
-            }
-            FunEq((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k)) * c(k)(j),
-                  (k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
-           }
-        Sum((k: Index) => Sum((l: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
-    == { sum_assoc_mult(a, b, c, i, j); }
-        Sum((l: Index) => Sum((k: Index) => a(i)(l) * b(l)(k) * c(k)(j)));
-    == // alpha-renaming k <-> l
-        Sum((k: Index) => Sum((l: Index) => a(i)(k) * b(k)(l) * c(l)(j)));
-    == {
-            forall k: Index
-                ensures Sum((l: Index) => a(i)(k) * b(k)(l) * c(l)(j))
-                        ==
-                        Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k))
-            {
-                FunEq((l: Index) => a(i)(k) * b(k)(l) * c(l)(j),
-                      (l: Index) => b(k)(l) * c(l)(j) * a(i)(k));
-            }
-            FunEq((k: Index) => Sum((l: Index) => a(i)(k) * b(k)(l) * c(l)(j)),
-                  (k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k)));
-        }
-        Sum((k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k)));
-    == {
-            forall k: Index
-                ensures Sum((l: Index) => b(k)(l) * c(l)(j)) * a(i)(k)
-                        ==
-                        Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k))
-            {
-                var g := (l: Index) => b(k)(l) * c(l)(j);
-                var x := a(i)(k);
-                calc {
-                    Sum((l: Index) => b(k)(l) * c(l)(j)) * a(i)(k);
-                ==
-                    Sum(g) * x;
-                == { distr_mult(g, x); }
-                    Sum((l: Index) => g(l) * x);
-                == { FunEq((l: Index) => g(l) * x,
-                               (l: Index) => b(k)(l) * c(l)(j) * a(i)(k)); }
-                    Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k));
-                }
-            }
-            FunEq((k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j) * a(i)(k)),
-                  (k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j)) * a(i)(k));
-        }
-        Sum((k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j)) * a(i)(k));
-    == { FunEq((k: Index) => Sum((l: Index) => b(k)(l) * c(l)(j)) * a(i)(k),
-               (k: Index) => a(i)(k) * Sum((l: Index) => b(k)(l) * c(l)(j))); }
-        Sum((k: Index) => a(i)(k) * Sum((l: Index) => b(k)(l) * c(l)(j)));
-    == { FunEq((k: Index) => a(i)(k) * Sum((l: Index) => b(k)(l) * c(l)(j)),
-               (k: Index) => a(i)(k) * mult(b, c)(k)(j)); }
-        Sum((k: Index) => a(i)(k) * mult(b, c)(k)(j));
-    ==
-        mult(a, mult(b, c))(i)(j);
-    }
-}
-
-/** a * (b * c) == (a * b) * c */
-lemma mult_assoc(a: Matrix, b: Matrix, c: Matrix)
-    ensures mult(mult(a, b), c) == mult(a, mult(b, c))
-{
-    forall i, j
-        ensures mult(mult(a, b), c)(i)(j) == mult(a, mult(b, c))(i)(j)
-        { mult_assoc_ij(a, b, c, i, j); }
-    Same(mult(mult(a, b), c), mult(a, mult(b, c)));
-}
diff --git a/Test/libraries b/Test/libraries
deleted file mode 160000
index 44f5891e7b5..00000000000
--- a/Test/libraries
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 44f5891e7b5b21a5f13f139b22fb5559b46de36f
diff --git a/Test/logger/TextLogger.dfy b/Test/logger/TextLogger.dfy
deleted file mode 100644
index a5e01450cf6..00000000000
--- a/Test/logger/TextLogger.dfy
+++ /dev/null
@@ -1,22 +0,0 @@
-// RUN: %exits-with 4 %baredafny verify --show-snippets:false --log-format:text --isolate-assertions "%s" > "%t"
-// RUN: %OutputCheck --file-to-check "%t" "%s"
-// CHECK: Overall outcome: Errors
-// CHECK: Overall time: .*
-// CHECK: Overall resource count: .*
-// CHECK: Maximum assertion batch time: .*
-// CHECK: Maximum assertion batch resource count: .*
-// CHECK: Outcome: Valid
-// CHECK: Duration: .*
-// CHECK: Resource count: .*
-// CHECK: TextLogger.dfy\(20,14\): divisor is always non-zero
-// CHECK: Outcome: Invalid
-// CHECK: Duration: .*
-// CHECK: Resource count: .*
-// CHECK: TextLogger.dfy\(21,9\): assertion always holds
-method M(x: int, y: int)
-  requires y > 0
-  requires x > 0
-{
-  var d := x / y;
-  assert(d * y == x); // Should fail
-}
diff --git a/Test/logger/VerboseName.dfy b/Test/logger/VerboseName.dfy
deleted file mode 100644
index 0671646883b..00000000000
--- a/Test/logger/VerboseName.dfy
+++ /dev/null
@@ -1,29 +0,0 @@
-// RUN: %dafny /compile:0 /trace "%s" > "%t"
-// RUN: %OutputCheck --file-to-check "%t" "%s"
-// CHECK-L:Verifying AM1.T2Client.Calc (override check) ...
-// CHECK-L:Verifying posIdMeth (correctness) ...
-// CHECK-L:Verifying smallPrime (well-formedness) ...
-newtype smallPrime = x: int | x in {2, 3, 5, 7} witness 2
-
-function posId(x: smallPrime): smallPrime {
-  x
-}
-
-method posIdMeth(x: smallPrime) returns (r: int)
-  ensures r > 0
-{
-  r := posId(x) as int;
-}
-
-abstract module AM1
-{
-  trait T2
-  {
-    method Calc(i:int, j:int) returns (k:int)
-  }
-
-  class T2Client extends T2
-  {
-    method Calc(ii:int, jj:int) returns (kk:int)
-  }
-}
diff --git a/Test/logger/VerificationLogger.dfy b/Test/logger/VerificationLogger.dfy
deleted file mode 100644
index 0ca3c540135..00000000000
--- a/Test/logger/VerificationLogger.dfy
+++ /dev/null
@@ -1,41 +0,0 @@
-// RUN: %exits-with 4 %baredafny measure-complexity --iterations=2 --random-seed=1 --log-format:trx";"LogFileName="%t.trx" "%s"
-// RUN: %OutputCheck --file-to-check "%t.trx" "%s"
-
-// CHECK: \<UnitTestResult.* testName="ExampleWithSplits \(correctness\) \(assertion batch 3\)" .*\>
-
-method ExampleWithSplits() returns (y: int)
-  ensures y >= 0
-{
-  var x: int;
-  x := 5;
-  y := 0;
-  while (x > 0)
-    invariant x + y == 5
-    invariant x*x <= 25
-  {
-    x := x - 1;
-    assert {:split_here} (x+y) * (x+y) > 25;
-    y := y + 1;
-    if (x < 3) {
-      assert 2 < 2;
-      assert {:split_here} y*y > 4;
-    }
-    else {
-      assert {:split_here} y*y*y < 8;
-      assert 2 < 2;
-    }
-    assert {:split_here} (x+y) * (x+y) == 25;
-  }
-}
-
-method ExampleWithoutSplits() {
-  assert 1 + 1 == 2;
-  assert 2 + 2 == 4;
-  assert 3 + 3 == 6;
-}
-
-method AnotherExampleWithoutSplits() {
-  assert 1 + 1 == 2;
-  assert 2 + 2 == 4;
-  assert 3 + 3 == 6;
-}
diff --git a/Test/metatests/ConsistentWhenSupported.dfy b/Test/metatests/ConsistentWhenSupported.dfy
deleted file mode 100644
index 6e0ee91a4e9..00000000000
--- a/Test/metatests/ConsistentWhenSupported.dfy
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// Old way:
-
-// RUN: %exits-with 0 %dafny /compile:0 "%s" > "%t"
-// RUN: %exits-with 0 %dafny /noVerify /compile:4 /compileTarget:cs "%s" >> "%t"
-// RUN: %exits-with 0 %dafny /noVerify /compile:4 /compileTarget:js "%s" >> "%t"
-// RUN: %exits-with 0 %dafny /noVerify /compile:4 /compileTarget:go "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:java "%s" >> "%t"
-// RUN: %exits-with 3 %dafny /noVerify /compile:4 /compileTarget:cpp "%s" >> "%t"
-// RUN: %exits-with 0 %dafny /noVerify /compile:4 /compileTarget:py "%s" >> "%t"
-// RUN: %diff "%s.oldway.expect" "%t"
-
-// New way:
-
-// RUN: %testDafnyForEachCompiler "%s"
-
-iterator EmptyIterator() yields (r: bool) 
-  ensures false
-{}
-
-method Main() {
-  var i := new EmptyIterator();
-  var more := i.MoveNext();
-  expect !more;
-  print "All done iterating!\n";
-}
diff --git a/Test/metatests/InconsistentCompilerBehavior.dfy b/Test/metatests/InconsistentCompilerBehavior.dfy
deleted file mode 100644
index a9eaa659ca6..00000000000
--- a/Test/metatests/InconsistentCompilerBehavior.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: ! %testDafnyForEachCompiler "%s" > "%t"
-// RUN: %diff "%s.testdafny.expect" "%t"
-
-// A %testdafny test case expected to fail, since the given
-// output is different than any actual output
-
-method Main() {
-  var i := 0;
-  print i, "\n";
-}
diff --git a/Test/metatests/InconsistentCompilerBehavior.dfy.testdafny.expect b/Test/metatests/InconsistentCompilerBehavior.dfy.testdafny.expect
deleted file mode 100644
index c1448ca5ba5..00000000000
--- a/Test/metatests/InconsistentCompilerBehavior.dfy.testdafny.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-Using legacy resolver and verifying...
-Executing on C#...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--Different than any output
-+0
- 
-
-Executing on JavaScript...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--Different than any output
-+0
- 
-
-Executing on Go...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--Different than any output
-+0
- 
-
-Executing on Java...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--Different than any output
-+0
- 
-
-Executing on Python...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--Different than any output
-+0
- 
-
-Executing on C++...
diff --git a/Test/metatests/LegacyResolverFails.dfy b/Test/metatests/LegacyResolverFails.dfy
deleted file mode 100644
index 7041c0756bc..00000000000
--- a/Test/metatests/LegacyResolverFails.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %testDafnyForEachResolver "%s" --expect-exit-code=2 --refresh-exit-code=0 -- --relax-definite-assignment
-
-const X := 1
-
-method LegacyTypeSystemCannotInferTypes() {
-  var c; // error: type inferred to be int in refresh resolver, but fails in legacy resolver
-  match c
-  case X => // the literal 1
-    assert c == 1;
-  case Xyz => // a bound variable
-}
diff --git a/Test/metatests/RefreshResolverFails.dfy b/Test/metatests/RefreshResolverFails.dfy
deleted file mode 100644
index 0ec8a2b1969..00000000000
--- a/Test/metatests/RefreshResolverFails.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %testDafnyForEachResolver "%s" --refresh-exit-code=2
-
-trait Trait { }
-class Class extends Trait { }
-
-method M(c: Class) {
-  var t: Trait := c;
-  var d: Class := t; // error: needs an "as Class" in refresh resolver
-}
diff --git a/Test/metatests/RefreshResolverFails.dfy.refresh.expect b/Test/metatests/RefreshResolverFails.dfy.refresh.expect
deleted file mode 100644
index d834c9efacc..00000000000
--- a/Test/metatests/RefreshResolverFails.dfy.refresh.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-RefreshResolverFails.dfy(8,15): Error: PRE-TYPE: RHS (of type Trait?) not assignable to LHS (of type Class?)
-1 resolution/type errors detected in RefreshResolverFails.dfy
diff --git a/Test/metatests/TestBeyondVerifierExpect.dfy b/Test/metatests/TestBeyondVerifierExpect.dfy
deleted file mode 100644
index dadd3116247..00000000000
--- a/Test/metatests/TestBeyondVerifierExpect.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: ! %testDafnyForEachCompiler "%s" > "%t"
-// RUN: %diff "%s.testdafny.expect" "%t"
-
-method Main() {
-  ghost var n := 15;
-  if j :| 0 <= j < n { // this gives a no-trigger warning
-  }
-  print "hello\n";
-}
diff --git a/Test/metatests/TestBeyondVerifierExpect.dfy.testdafny.expect b/Test/metatests/TestBeyondVerifierExpect.dfy.testdafny.expect
deleted file mode 100644
index 6b39e0d8451..00000000000
--- a/Test/metatests/TestBeyondVerifierExpect.dfy.testdafny.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-Using legacy resolver and verifying...
-Executing on C#...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--good bye
-+hello
- 
-
-Executing on JavaScript...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--good bye
-+hello
- 
-
-Executing on Go...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--good bye
-+hello
- 
-
-Executing on Java...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--good bye
-+hello
- 
-
-Executing on Python...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--good bye
-+hello
- 
-
-Executing on C++...
diff --git a/Test/metatests/TestBeyondVerifierExpect.dfy.verifier.expect b/Test/metatests/TestBeyondVerifierExpect.dfy.verifier.expect
deleted file mode 100644
index dc52d4a07e1..00000000000
--- a/Test/metatests/TestBeyondVerifierExpect.dfy.verifier.expect
+++ /dev/null
@@ -1 +0,0 @@
-TestBeyondVerifierExpect.dfy(6,5): Warning: /!\ No terms found to trigger on.
diff --git a/Test/metatests/TestDoesNotVerify.dfy b/Test/metatests/TestDoesNotVerify.dfy
deleted file mode 100644
index aec66dca876..00000000000
--- a/Test/metatests/TestDoesNotVerify.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: ! %testDafnyForEachCompiler "%s" > "%t"
-// RUN: %diff "%s.testdafny.expect" "%t"
-
-method Main() {
-  ghost var n := 15;
-  assert n < 12; // error: the verifier complains about this
-  print "hello\n";
-}
diff --git a/Test/metatests/TestDoesNotVerify.dfy.testdafny.expect b/Test/metatests/TestDoesNotVerify.dfy.testdafny.expect
deleted file mode 100644
index 93e0f2d96dd..00000000000
--- a/Test/metatests/TestDoesNotVerify.dfy.testdafny.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-Using legacy resolver and verifying...
-Verification failed with exit code 4 (expected 0). Output:
-TestDoesNotVerify.dfy(6,11): Error: assertion might not hold
-
-Dafny program verifier finished with 0 verified, 1 error
-
-Error:
-
diff --git a/Test/metatests/TestMissingVerifierExpect.dfy b/Test/metatests/TestMissingVerifierExpect.dfy
deleted file mode 100644
index dadd3116247..00000000000
--- a/Test/metatests/TestMissingVerifierExpect.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: ! %testDafnyForEachCompiler "%s" > "%t"
-// RUN: %diff "%s.testdafny.expect" "%t"
-
-method Main() {
-  ghost var n := 15;
-  if j :| 0 <= j < n { // this gives a no-trigger warning
-  }
-  print "hello\n";
-}
diff --git a/Test/metatests/TestMissingVerifierExpect.dfy.testdafny.expect b/Test/metatests/TestMissingVerifierExpect.dfy.testdafny.expect
deleted file mode 100644
index 93a2696a0d3..00000000000
--- a/Test/metatests/TestMissingVerifierExpect.dfy.testdafny.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-Using legacy resolver and verifying...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
-+TestMissingVerifierExpect.dfy(6,5): Warning: /!\ No terms found to trigger on.
-+
-
diff --git a/Test/metatests/TestWrongVerifierExpect.dfy b/Test/metatests/TestWrongVerifierExpect.dfy
deleted file mode 100644
index dadd3116247..00000000000
--- a/Test/metatests/TestWrongVerifierExpect.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: ! %testDafnyForEachCompiler "%s" > "%t"
-// RUN: %diff "%s.testdafny.expect" "%t"
-
-method Main() {
-  ghost var n := 15;
-  if j :| 0 <= j < n { // this gives a no-trigger warning
-  }
-  print "hello\n";
-}
diff --git a/Test/metatests/TestWrongVerifierExpect.dfy.testdafny.expect b/Test/metatests/TestWrongVerifierExpect.dfy.testdafny.expect
deleted file mode 100644
index b31db3c85af..00000000000
--- a/Test/metatests/TestWrongVerifierExpect.dfy.testdafny.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-Using legacy resolver and verifying...
-AssertEqualWithDiff() Failure
-Diff (changing expected into actual):
--warning: out of bananas
-+TestWrongVerifierExpect.dfy(6,5): Warning: /!\ No terms found to trigger on.
- 
-
diff --git a/Test/name with space/run.dfy b/Test/name with space/run.dfy
deleted file mode 100644
index afd921cd707..00000000000
--- a/Test/name with space/run.dfy	
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %exits-with 0 %dafny /compile:3 "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main() {
-  print "hello";
-}
\ No newline at end of file
diff --git a/Test/patterns/OrPatterns.dfy.expect b/Test/patterns/OrPatterns.dfy.expect
deleted file mode 100644
index d86bac9de59..00000000000
--- a/Test/patterns/OrPatterns.dfy.expect
+++ /dev/null
@@ -1 +0,0 @@
-OK
diff --git a/Test/separate-verification/app.dfy b/Test/separate-verification/app.dfy
deleted file mode 100644
index 49d9c150012..00000000000
--- a/Test/separate-verification/app.dfy
+++ /dev/null
@@ -1,42 +0,0 @@
-// NONUNIFORM: Multiple test scenarios - ideally would still test for each backend though
-
-// RUN: %baredafny build %args -t:lib %S/Inputs/wrappers.dfy > %t
-// RUN: %baredafny build %args -t:lib %S/Inputs/seq.dfy --library %S/Inputs/wrappers.doo >> %t
-// RUN: %baredafny run   %args %s --library %S/Inputs/seq.doo --library %S/Inputs/wrappers.doo >> %t
-
-// Supported: matching options
-
-// RUN: %baredafny build %args -t:lib --boogie /vcsSplitOnEveryAssert %S/Inputs/wrappers.dfy
-// RUN: %baredafny build %args -t:lib --boogie /vcsSplitOnEveryAssert %S/Inputs/seq.dfy --library %S/Inputs/wrappers.doo >> %t
-
-// Supported: mismatching irrelevant options
-
-// RUN: %baredafny build %args -t:lib --function-syntax:3 %S/Inputs/wrappers3.dfy
-// RUN: %baredafny build %args -t:lib %S/Inputs/seq.dfy --library %S/Inputs/wrappers3.doo >> %t
-
-// Error cases: mismatched options
-
-// RUN: %baredafny build %args -t:lib --unicode-char:true %S/Inputs/wrappers.dfy
-// RUN: ! %baredafny build %args -t:lib --unicode-char:false %S/Inputs/seq.dfy --library %S/Inputs/wrappers.doo >> %t
-
-// RUN: %baredafny build %args -t:lib --boogie /vcsLoad:2 %S/Inputs/wrappers.dfy
-// RUN: ! %baredafny build %args -t:lib %S/Inputs/seq.dfy --library %S/Inputs/wrappers.doo >> %t
-
-// RUN: %diff "%s.expect" %t
-
-module App {
-
-  import opened Seq
-
-  method Main() {
-    var a := [1, 2, 3];
-    var b := [4, 5, 6];
-    var c := [7, 8, 9];
-
-    LemmaConcatIsAssociative(a, b, c);
-    assert (a + b) + c == a + (b + c);
-
-    print a + b + c, "\n";
-  }
-
-}
\ No newline at end of file
diff --git a/Test/separate-verification/app.dfy.expect b/Test/separate-verification/app.dfy.expect
deleted file mode 100644
index 94150d81bf5..00000000000
--- a/Test/separate-verification/app.dfy.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-
-Dafny program verifier finished with 2 verified, 0 errors
-
-Dafny program verifier finished with 1 verified, 0 errors
-[1, 2, 3, 4, 5, 6, 7, 8, 9]
-
-Dafny program verifier finished with 2 verified, 0 errors
-
-Dafny program verifier finished with 2 verified, 0 errors
-*** Error: Cannot load wrappers.doo: --unicode-char is set locally to False, but the library was built with True
-*** Error: Cannot load wrappers.doo: --boogie is set locally to [], but the library was built with [/vcsLoad:2]
diff --git a/Test/separate-verification/assumptions.dfy b/Test/separate-verification/assumptions.dfy
deleted file mode 100644
index bc4005de169..00000000000
--- a/Test/separate-verification/assumptions.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// Passing --no-verify because TestAuditor.dfy intentionally has a failing assertion,
-// but that would otherwise mean we don't get far enough to exercise the LibraryBackend.
-// RUN: ! %baredafny build -t:lib --no-verify %args %s > %t
-// RUN: %diff "%s.expect" %t
-
-include "../auditor/TestAuditor.dfy"
\ No newline at end of file
diff --git a/Test/separate-verification/assumptions.dfy.expect b/Test/separate-verification/assumptions.dfy.expect
deleted file mode 100644
index 71df58700e5..00000000000
--- a/Test/separate-verification/assumptions.dfy.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-TestAuditor.dfy(93,10): Warning: /!\ No terms found to trigger on.
-TestAuditor.dfy(95,4): Warning: /!\ No terms found to trigger on.
-TestAuditor.dfy(126,2): Warning: /!\ No terms found to trigger on.
-TestAuditor.dfy(137,9): Warning: Assertion with {:only} temporarily transforms other assertions into assumptions
-TestAuditor.dfy(141,7): Warning: Members with {:only} temporarily disable the verification of other members in the entire file
-TestAuditor.dfy(95,4): Warning: note, this forall statement has no body
-TestAuditor.dfy(102,4): Warning: note, this loop has no body (loop frame: i)
-TestAuditor.dfy(126,2): Warning: note, this forall statement has no body
-TestAuditor.dfy(130,2): Warning: note, this loop has no body (loop frame: i)
-
-Dafny program verifier did not attempt verification
-TestAuditor.dfy(22,6): Error: Ghost declaration has no body and has an ensures clause.
-TestAuditor.dfy(27,15): Error: Ghost declaration has no body and has an ensures clause.
-TestAuditor.dfy(38,2): Error: Definition has [assume] statement in body.
-TestAuditor.dfy(45,17): Error: Declaration with [{:extern}] has a ensures clause.
-TestAuditor.dfy(45,17): Error: Declaration with [{:extern}] has a requires clause.
-TestAuditor.dfy(50,17): Error: Declaration with [{:extern}] has a ensures clause.
-TestAuditor.dfy(50,17): Error: Declaration with [{:extern}] has a requires clause.
-TestAuditor.dfy(60,2): Error: Definition has [assume {:axiom}] statement in body.
-TestAuditor.dfy(68,17): Error: Declaration with [{:extern}] has a requires clause.
-TestAuditor.dfy(72,19): Error: Function with [{:extern}] attribute.
-TestAuditor.dfy(72,19): Error: Declaration with [{:extern}] has a ensures clause.
-TestAuditor.dfy(83,7): Error: Method may not terminate (uses [decreases *]).
-TestAuditor.dfy(95,4): Error: Definition contains [forall] statement with no body.
-TestAuditor.dfy(102,4): Error: Definition contains loop with no body.
-TestAuditor.dfy(118,21): Error: Declaration has [{:concurrent}] attribute.
-TestAuditor.dfy(123,2): Error: Definition has [assume] statement in body.
-TestAuditor.dfy(124,2): Error: Definition has [assume {:axiom}] statement in body.
-TestAuditor.dfy(126,2): Error: Definition contains [forall] statement with no body.
-TestAuditor.dfy(130,2): Error: Definition contains loop with no body.
-TestAuditor.dfy(137,2): Error: Assertion has explicit temporary [{:only}] attribute.
-TestAuditor.dfy(141,15): Error: Member has explicit temporary [{:only}] attribute.
-IgnoredAssumptions.dfy(2,15): Error: Ghost declaration has no body and has an ensures clause.
-TestAuditor.dfy(89,27): Error: Trait method calls may not terminate (uses [{:termination false}]).
-Wrote textual form of partial target program to assumptions-lib/assumptions.doo
diff --git a/Test/server/counterexample.transcript b/Test/server/counterexample.transcript
deleted file mode 100644
index d6fea106fd2..00000000000
--- a/Test/server/counterexample.transcript
+++ /dev/null
@@ -1,6 +0,0 @@
-# RUN: %server "%s" > "%t"
-# RUN: %diff "%s.expect" "%t"
-
-counterexample
-eyJhcmdzIjpbXSwiZmlsZW5hbWUiOiJhYnMuZGZ5Iiwic291cmNlIjoibWV0aG9kIEFicyh4OiBpbnQpIFxyXG4gICAgcmV0dXJucyAoeTogaW50KVxyXG5lbnN1cmVzIHkgPj0gMCB7XHJcbiAgICByZXR1cm4geDtcclxufSIsInNvdXJjZUlzRmlsZSI6ZmFsc2V9
-[[DAFNY-CLIENT: EOM]]
diff --git a/Test/server/counterexample.transcript.expect b/Test/server/counterexample.transcript.expect
deleted file mode 100644
index 9f68c5dfd27..00000000000
--- a/Test/server/counterexample.transcript.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-# Reading from counterexample.transcript
-
-Verifying Abs (correctness) ...
-  [1 proof obligation]  error
-abs.dfy(4,4): Error: a postcondition could not be proved on this return path
-abs.dfy(3,10): Related location: this is the postcondition that could not be proved
-COUNTEREXAMPLE_START {"States":[{"Column":0,"Line":0,"Name":"<initial>","Variables":[{"CanonicalName":"-1","Name":"x","RealName":null,"Value":"-1"}]},{"Column":15,"Line":3,"Name":"abs.dfy(3,15): initial state","Variables":[{"CanonicalName":"-1","Name":"x","RealName":null,"Value":"-1"}]},{"Column":12,"Line":4,"Name":"abs.dfy(4,12)","Variables":[{"CanonicalName":"-1","Name":"x","RealName":null,"Value":"-1"},{"CanonicalName":"-1","Name":"y","RealName":null,"Value":"-1"}]}]} COUNTEREXAMPLE_END
-Verification completed successfully!
-[SUCCESS] [[DAFNY-SERVER: EOM]]
diff --git a/Test/server/counterexample_commandline.dfy.expect b/Test/server/counterexample_commandline.dfy.expect
deleted file mode 100644
index 1aa5726ac5e..00000000000
--- a/Test/server/counterexample_commandline.dfy.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-counterexample_commandline.dfy(30,20): Error: a postcondition could not be proved on this return path
-counterexample_commandline.dfy(18,22): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 1 verified, 1 error
-Counterexample for first failing assertion: 
-counterexample_commandline.dfy(21,8): initial state:
-	s : seq<char> = ['A']
-	this : Patterns.Simple = (p := @2)
-	@2 : seq<char> = ['?']
-counterexample_commandline.dfy(22,22):
-	s : seq<char> = ['A']
-	this : Patterns.Simple = (p := @2)
-	i : int = 0
-	@2 : seq<char> = ['?']
-counterexample_commandline.dfy(23,12): after some loop iterations:
-	s : seq<char> = ['A']
-	this : Patterns.Simple = (p := @2)
-	i : int = 0
-	@2 : seq<char> = ['?']
-counterexample_commandline.dfy(30,32):
-	s : seq<char> = ['A']
-	this : Patterns.Simple = (p := @2)
-	i : int = 0
-	b : bool = false
-	@2 : seq<char> = ['?']
diff --git a/Test/server/git-issue223.transcript b/Test/server/git-issue223.transcript
deleted file mode 100644
index 7bec0961f2a..00000000000
--- a/Test/server/git-issue223.transcript
+++ /dev/null
@@ -1,9 +0,0 @@
-# RUN: %server "%s" > "%t"
-# RUN: %diff "%s.expect" "%t"
-
-counterexample
-eyJhcmdzIjpbXSwiZmlsZW5hbWUiOiJhYnMuZGZ5Iiwic291cmNlIjoibWV0aG9kIEFicyh4OiBpbnQpIFxyXG4gICAgcmV0dXJucyAoeTogaW50KVxyXG5lbnN1cmVzIHkgPj0gMCB7XHJcbiAgICByZXR1cm4geDtcclxufSIsInNvdXJjZUlzRmlsZSI6ZmFsc2V9
-[[DAFNY-CLIENT: EOM]]
-counterexample
-eyJhcmdzIjpbXSwiZmlsZW5hbWUiOiJhYnMuZGZ5Iiwic291cmNlIjoibWV0aG9kIEFicyh4OiBpbnQpIFxyXG4gICAgcmV0dXJucyAoeTogaW50KVxyXG5lbnN1cmVzIHkgPj0gMCB7XHJcbiAgICByZXR1cm4geDtcclxufSIsInNvdXJjZUlzRmlsZSI6ZmFsc2V9
-[[DAFNY-CLIENT: EOM]]
diff --git a/Test/server/git-issue223.transcript.expect b/Test/server/git-issue223.transcript.expect
deleted file mode 100644
index ceb6bdf0793..00000000000
--- a/Test/server/git-issue223.transcript.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-# Reading from git-issue223.transcript
-
-Verifying Abs (correctness) ...
-  [1 proof obligation]  error
-abs.dfy(4,4): Error: a postcondition could not be proved on this return path
-abs.dfy(3,10): Related location: this is the postcondition that could not be proved
-COUNTEREXAMPLE_START {"States":[{"Column":0,"Line":0,"Name":"<initial>","Variables":[{"CanonicalName":"-1","Name":"x","RealName":null,"Value":"-1"}]},{"Column":15,"Line":3,"Name":"abs.dfy(3,15): initial state","Variables":[{"CanonicalName":"-1","Name":"x","RealName":null,"Value":"-1"}]},{"Column":12,"Line":4,"Name":"abs.dfy(4,12)","Variables":[{"CanonicalName":"-1","Name":"x","RealName":null,"Value":"-1"},{"CanonicalName":"-1","Name":"y","RealName":null,"Value":"-1"}]}]} COUNTEREXAMPLE_END
-Verification completed successfully!
-[SUCCESS] [[DAFNY-SERVER: EOM]]
-
-Verifying Abs (correctness) ...
-  [0 proof obligations]  error
-abs.dfy(4,4): Error: a postcondition could not be proved on this return path
-abs.dfy(3,10): Related location: this is the postcondition that could not be proved
-COUNTEREXAMPLE_START {"States":[{"Column":0,"Line":0,"Name":"<initial>","Variables":[{"CanonicalName":"-1","Name":"x","RealName":null,"Value":"-1"}]},{"Column":15,"Line":3,"Name":"abs.dfy(3,15): initial state","Variables":[{"CanonicalName":"-1","Name":"x","RealName":null,"Value":"-1"}]},{"Column":12,"Line":4,"Name":"abs.dfy(4,12)","Variables":[{"CanonicalName":"-1","Name":"x","RealName":null,"Value":"-1"},{"CanonicalName":"-1","Name":"y","RealName":null,"Value":"-1"}]}]} COUNTEREXAMPLE_END
-Verification completed successfully!
-[SUCCESS] [[DAFNY-SERVER: EOM]]
diff --git a/Test/server/symbols.transcript.expect b/Test/server/symbols.transcript.expect
deleted file mode 100644
index 15bd61a15bf..00000000000
--- a/Test/server/symbols.transcript.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-# Reading from symbols.transcript
-SYMBOLS_START [{"Call":null,"Column":3,"EndColumn":3,"EndLine":6,"EndPosition":105,"Ensures":[],"Line":4,"Module":"_module","Name":"_ctor","ParentClass":"BankAccountUnsafe","Position":52,"ReferencedClass":null,"ReferencedModule":null,"References":[],"Requires":[],"SymbolType":"Method"},{"Call":null,"Column":9,"EndColumn":2,"EndLine":13,"EndPosition":253,"Ensures":["balance >= 0"],"Line":8,"Module":"_module","Name":"withdraw","ParentClass":"BankAccountUnsafe","Position":118,"ReferencedClass":null,"ReferencedModule":null,"References":[],"Requires":["amount < balance"],"SymbolType":"Method"},{"Call":null,"Column":6,"EndColumn":null,"EndLine":null,"EndPosition":null,"Ensures":null,"Line":2,"Module":"_module","Name":"balance","ParentClass":"BankAccountUnsafe","Position":32,"ReferencedClass":null,"ReferencedModule":null,"References":[{"Column":5,"Line":5,"MethodName":"balance","Position":87,"ReferencedName":"balance"},{"Column":3,"Line":12,"MethodName":"balance","Position":222,"ReferencedName":"balance"},{"Column":14,"Line":12,"MethodName":"balance","Position":233,"ReferencedName":"balance"}],"Requires":null,"SymbolType":"Field"},{"Call":null,"Column":0,"EndColumn":0,"EndLine":0,"EndPosition":0,"Ensures":null,"Line":0,"Module":"_module","Name":"_default","ParentClass":null,"Position":0,"ReferencedClass":null,"ReferencedModule":null,"References":[],"Requires":null,"SymbolType":"Class"},{"Call":null,"Column":7,"EndColumn":1,"EndLine":14,"EndPosition":256,"Ensures":null,"Line":1,"Module":"_module","Name":"BankAccountUnsafe","ParentClass":null,"Position":6,"ReferencedClass":null,"ReferencedModule":null,"References":[],"Requires":null,"SymbolType":"Class"}] SYMBOLS_END
-Verification completed successfully!
-[SUCCESS] [[DAFNY-SERVER: EOM]]
diff --git a/Test/traits/GeneralTraits.dfy.expect b/Test/traits/GeneralTraits.dfy.expect
deleted file mode 100644
index 828027a9f7e..00000000000
--- a/Test/traits/GeneralTraits.dfy.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-GeneralTraits.dfy(24,25): Error: datatype is not allowed to extend 'Parent', because it is a reference type
-GeneralTraits.dfy(25,26): Error: codatatype is not allowed to extend 'Parent', because it is a reference type
-GeneralTraits.dfy(26,27): Error: abstract type is not allowed to extend 'Parent', because it is a reference type
-GeneralTraits.dfy(27,24): Error: newtype is not allowed to extend 'Parent', because it is a reference type
-GeneralTraits.dfy(28,35): Error: newtype is not allowed to extend 'Parent', because it is a reference type
-GeneralTraits.dfy(56,36): Error: Raised while checking export set ProvideThem: a abstract type can only extend traits (found 'Trait')
-GeneralTraits.dfy(37,9): Error: This export set is not consistent: ProvideThem
-GeneralTraits.dfy(70,11): Error: PRE-TYPE: arguments must have comparable types (got object? and MyInt)
-GeneralTraits.dfy(71,11): Error: PRE-TYPE: arguments must have comparable types (got TraitC and MyInt)
-GeneralTraits.dfy(73,12): Error: PRE-TYPE: arguments must have comparable types (got MyInt and object?)
-GeneralTraits.dfy(74,12): Error: PRE-TYPE: arguments must have comparable types (got MyInt and TraitC)
-GeneralTraits.dfy(78,11): Error: PRE-TYPE: arguments must have comparable types (got object? and Dt)
-GeneralTraits.dfy(79,11): Error: PRE-TYPE: arguments must have comparable types (got TraitC and Dt)
-GeneralTraits.dfy(81,12): Error: PRE-TYPE: arguments must have comparable types (got Dt and object?)
-GeneralTraits.dfy(82,12): Error: PRE-TYPE: arguments must have comparable types (got Dt and TraitC)
-GeneralTraits.dfy(95,9): Error: == can only be applied to expressions of types that support equality (got TraitA)
-GeneralTraits.dfy(96,9): Error: == can only be applied to expressions of types that support equality (got TraitB)
-GeneralTraits.dfy(98,15): Error: == can only be applied to expressions of types that support equality (got TraitA)
-GeneralTraits.dfy(99,15): Error: == can only be applied to expressions of types that support equality (got TraitB)
-GeneralTraits.dfy(101,9): Error: == can only be applied to expressions of types that support equality (got TraitA)
-GeneralTraits.dfy(102,9): Error: == can only be applied to expressions of types that support equality (got TraitB)
-GeneralTraits.dfy(104,15): Error: == can only be applied to expressions of types that support equality (got TraitA)
-GeneralTraits.dfy(105,15): Error: == can only be applied to expressions of types that support equality (got TraitB)
-GeneralTraits.dfy(107,9): Error: == can only be applied to expressions of types that support equality (got TraitA)
-GeneralTraits.dfy(108,17): Error: == can only be applied to expressions of types that support equality (got TraitA)
-25 resolution/type errors detected in GeneralTraits.dfy
diff --git a/Test/traits/TraitCompileErrors.dfy b/Test/traits/TraitCompileErrors.dfy
deleted file mode 100644
index 806a8fce4f5..00000000000
--- a/Test/traits/TraitCompileErrors.dfy
+++ /dev/null
@@ -1,16 +0,0 @@
-// RUN: %exits-with 3 %dafny /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module StaticMembers {
-  trait Tr {
-    // the following static members must also be given bodies, but that's checked by the compiler
-    static ghost function Func(): int
-    static method Method()
-    static twostate function TwoF(): int
-    static twostate lemma TwoL()
-    static least predicate P()
-    static greatest predicate Q()
-    static least lemma IL()
-    static greatest lemma CL()
-  }
-}
diff --git a/Test/traits/TraitCompileErrors.dfy.expect b/Test/traits/TraitCompileErrors.dfy.expect
deleted file mode 100644
index dc67c85f1fd..00000000000
--- a/Test/traits/TraitCompileErrors.dfy.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-TraitCompileErrors.dfy(7,26): Error: Function StaticMembers.Tr.Func has no body
-TraitCompileErrors.dfy(8,18): Error: Method StaticMembers.Tr.Method has no body
-TraitCompileErrors.dfy(9,29): Error: Function StaticMembers.Tr.TwoF has no body
-TraitCompileErrors.dfy(10,26): Error: Method StaticMembers.Tr.TwoL has no body
-TraitCompileErrors.dfy(11,27): Error: Function StaticMembers.Tr.P has no body
-TraitCompileErrors.dfy(12,30): Error: Function StaticMembers.Tr.Q has no body
-TraitCompileErrors.dfy(13,23): Error: Method StaticMembers.Tr.IL has no body
-TraitCompileErrors.dfy(14,26): Error: Method StaticMembers.Tr.CL has no body
diff --git a/Test/traits/TraitMultiModule.dfy b/Test/traits/TraitMultiModule.dfy
deleted file mode 100644
index a160996f6e2..00000000000
--- a/Test/traits/TraitMultiModule.dfy
+++ /dev/null
@@ -1,33 +0,0 @@
-// RUN: %exits-with 2 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-module M1
-{
-  trait T1
-  {
-    method M1 (a:int)
-  }
-  class C1 extends T1
-  {
-    method M1 (x:int)
-    {
-      var y: int := x;
-    }
-  }
-}
-
-module M2
-{
-  import opened M1
-  class C2 extends T1  // error: currently no support to implement trait in different module
-  {
-  }
-}
-
-module M3
-{
-  import M1
-  class C2 extends M1.T1  // error: currently no support to implement trait in different module
-  {
-  }
-}
diff --git a/Test/traits/TraitMultiModule.dfy.expect b/Test/traits/TraitMultiModule.dfy.expect
deleted file mode 100644
index 8c6e517495c..00000000000
--- a/Test/traits/TraitMultiModule.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-TraitMultiModule.dfy(22,19): Error: class 'C2' is in a different module than trait 'M1.T1'. A class may only extend a trait in the same module, unless the parent trait is annotated with {:termination false}.
-TraitMultiModule.dfy(30,22): Error: class 'C2' is in a different module than trait 'M1.T1'. A class may only extend a trait in the same module, unless the parent trait is annotated with {:termination false}.
-2 resolution/type errors detected in TraitMultiModule.dfy
diff --git a/Test/traits/TraitOverride1.dfy.expect b/Test/traits/TraitOverride1.dfy.expect
deleted file mode 100644
index e28b26fe37f..00000000000
--- a/Test/traits/TraitOverride1.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-TraitOverride1.dfy(200,9): Error: the method must provide an equal or more detailed postcondition than in its parent trait
-TraitOverride1.dfy(205,2): Error: a postcondition could not be proved on this return path
-TraitOverride1.dfy(204,40): Related location: this is the postcondition that could not be proved
-TraitOverride1.dfy(188,32): Related location
-
-Dafny program verifier finished with 29 verified, 2 errors
diff --git a/Test/traits/TraitsExtendingTraits.dfy.expect b/Test/traits/TraitsExtendingTraits.dfy.expect
deleted file mode 100644
index b309066869a..00000000000
--- a/Test/traits/TraitsExtendingTraits.dfy.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-TraitsExtendingTraits.dfy(23,8): Error: trait definitions contain a cycle: A -> B -> A
-TraitsExtendingTraits.dfy(26,8): Error: trait definitions contain a cycle: SelfLoop -> SelfLoop
-TraitsExtendingTraits.dfy(28,8): Error: trait definitions contain a cycle: K -> M -> L -> K
-TraitsExtendingTraits.dfy(56,8): Error: trait 'X' inherits a member named 'karljohan' from both traits 'A' and 'D'
-TraitsExtendingTraits.dfy(56,8): Error: trait 'X' inherits a member named 'svamp' from both traits 'C' and 'D'
-TraitsExtendingTraits.dfy(56,8): Error: trait 'X' inherits a member named 'data' from both traits 'A' and 'B'
-TraitsExtendingTraits.dfy(56,8): Error: trait 'X' inherits a member named 'fluga' from both traits 'C' and 'B'
-TraitsExtendingTraits.dfy(59,8): Error: class 'J' inherits a member named 'sopp' from both traits 'Y' and 'B'
-TraitsExtendingTraits.dfy(64,8): Error: class 'K' inherits a member named 'sopp' from both traits 'B' and 'Y'
-TraitsExtendingTraits.dfy(66,8): Error: class 'L' inherits a member named 'sopp' from both traits 'Y' and 'B'
-TraitsExtendingTraits.dfy(95,8): Error: class 'TwoOverrides' inherits a member named 'M' from both traits 'Left2' and 'Right2'
-11 resolution/type errors detected in TraitsExtendingTraits.dfy
diff --git a/Test/triggers/constructors-cause-matching-loops.dfy b/Test/triggers/constructors-cause-matching-loops.dfy
deleted file mode 100644
index 1109d94b156..00000000000
--- a/Test/triggers/constructors-cause-matching-loops.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// This file is just a small test to check that constructors do cause loops
-
-datatype Nat = Zero | Succ(x: Nat)
-ghost function f(n: Nat): Nat
-
-method M() {
-  assert forall s :: true || f(Succ(s)) == f(s);
-}
diff --git a/Test/triggers/loop-detection-looks-at-ranges-too.dfy.expect b/Test/triggers/loop-detection-looks-at-ranges-too.dfy.expect
deleted file mode 100644
index a6679d8c1ea..00000000000
--- a/Test/triggers/loop-detection-looks-at-ranges-too.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-loop-detection-looks-at-ranges-too.dfy(11,17): Info: Selected triggers: {P(_t#0), P(x)}
-loop-detection-looks-at-ranges-too.dfy(13,17): Info: Selected triggers: {P(x), P(_t#0)}
-
-Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/triggers/loop-detection-messages--unit-tests.dfy.expect b/Test/triggers/loop-detection-messages--unit-tests.dfy.expect
deleted file mode 100644
index cde3e84f38b..00000000000
--- a/Test/triggers/loop-detection-messages--unit-tests.dfy.expect
+++ /dev/null
@@ -1,28 +0,0 @@
-loop-detection-messages--unit-tests.dfy(11,9): Info: Selected triggers: {f(f(i))}
- Rejected triggers: {f(i)} (may loop with "f(f(i))")
-loop-detection-messages--unit-tests.dfy(12,9): Info: Selected triggers: {f(_t#0), f(i)}
-loop-detection-messages--unit-tests.dfy(13,9): Info: Selected triggers: {f(_t#0), f(i)}
-loop-detection-messages--unit-tests.dfy(15,9): Info: For expression "false ==> f(i) == f(_t#0)":
-   Selected triggers: {f(_t#0), f(i)} in subexpression at loop-detection-messages--unit-tests.dfy(15,27) [Related location] loop-detection-messages--unit-tests.dfy(15,36)
-loop-detection-messages--unit-tests.dfy(15,9): Info: For expression "false ==> f(i) == g(i)":
-   Selected triggers:
-     {g(i)}, {f(i)} in subexpression at loop-detection-messages--unit-tests.dfy(15,27) [Related location] loop-detection-messages--unit-tests.dfy(15,54)
-loop-detection-messages--unit-tests.dfy(16,9): Info: For expression "false ==> f(i) == f(_t#0)":
-   Selected triggers: {f(_t#0), f(i)} in subexpression at loop-detection-messages--unit-tests.dfy(16,27) [Related location] loop-detection-messages--unit-tests.dfy(16,36)
-loop-detection-messages--unit-tests.dfy(16,9): Info: For expression "false ==> f(i) == f(i)":
-   Selected triggers: {f(i)} in subexpression at loop-detection-messages--unit-tests.dfy(16,27) [Related location] loop-detection-messages--unit-tests.dfy(16,54)
-loop-detection-messages--unit-tests.dfy(17,9): Info: For expression "false ==> f(i) == f(_t#0)":
-   Selected triggers: {f(_t#0), f(i)} in subexpression at loop-detection-messages--unit-tests.dfy(17,43) [Related location] loop-detection-messages--unit-tests.dfy(17,52)
-loop-detection-messages--unit-tests.dfy(17,9): Info: For expression "false ==> f(i) == f(i)":
-   Selected triggers: {f(i)} in subexpression at loop-detection-messages--unit-tests.dfy(17,43) [Related location] loop-detection-messages--unit-tests.dfy(17,70)
-loop-detection-messages--unit-tests.dfy(19,9): Info: Selected triggers: {f(i)}
-loop-detection-messages--unit-tests.dfy(20,9): Warning: /!\ No terms found to trigger on.
-loop-detection-messages--unit-tests.dfy(21,9): Info: Not generating triggers for "false ==> f(i + 1) == 0". Note that {:autotriggers false} can cause instabilities. Consider using {:nowarn}, {:matchingloop} (not great either), or a manual trigger instead.
-loop-detection-messages--unit-tests.dfy(23,9): Info: Selected triggers: {f(j), f(i)}
-loop-detection-messages--unit-tests.dfy(24,9): Warning: /!\ No trigger covering all quantified variables found.
-loop-detection-messages--unit-tests.dfy(25,9): Info: Selected triggers: {g(j), f(i)}
-loop-detection-messages--unit-tests.dfy(26,9): Warning: /!\ No trigger covering all quantified variables found.
-loop-detection-messages--unit-tests.dfy(27,9): Info: Not generating triggers for "false ==> f(i) == f(i)". Note that {:autotriggers false} can cause instabilities. Consider using {:nowarn}, {:matchingloop} (not great either), or a manual trigger instead.
-loop-detection-messages--unit-tests.dfy(28,9): Info: Not generating triggers for "false ==> f(i) == f(i)".
-
-Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/triggers/matrix-accesses-are-triggers.dfy b/Test/triggers/matrix-accesses-are-triggers.dfy
deleted file mode 100644
index 43f301ec989..00000000000
--- a/Test/triggers/matrix-accesses-are-triggers.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// This file checks that multi-dimensional array accesses yield trigger candidates
-
-method M(m: array2<int>)
-  requires forall i, j | 0 <= i < m.Length0 && 0 <= j < m.Length1 :: m[i, j] == m[j, i+1] {
-}
diff --git a/Test/triggers/nested-quantifiers-all-get-triggers.dfy b/Test/triggers/nested-quantifiers-all-get-triggers.dfy
deleted file mode 100644
index a399cd10331..00000000000
--- a/Test/triggers/nested-quantifiers-all-get-triggers.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// This checks that nested quantifiers do get triggers, and that the parent
-// quantifier does not get annotated twice
-
-method M() {
-  ghost var x := forall s: set<int>, x: int :: (x in s ==> forall y :: y == x ==> y in s);
-}
diff --git a/Test/triggers/regression-tests.dfy.expect b/Test/triggers/regression-tests.dfy.expect
deleted file mode 100644
index 5ed406d5574..00000000000
--- a/Test/triggers/regression-tests.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-regression-tests.dfy(16,5): Warning: /!\ No terms found to trigger on.
-regression-tests.dfy(15,4): Info: ==
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/Test/triggers/some-proofs-only-work-without-autoTriggers.dfy.expect b/Test/triggers/some-proofs-only-work-without-autoTriggers.dfy.expect
deleted file mode 100644
index 01561f33f84..00000000000
--- a/Test/triggers/some-proofs-only-work-without-autoTriggers.dfy.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-some-proofs-only-work-without-autoTriggers.dfy(19,11): Info: Selected triggers: {x in a}
-some-proofs-only-work-without-autoTriggers.dfy(20,11): Info: Selected triggers: {x in a[..|a|]}
-some-proofs-only-work-without-autoTriggers.dfy(27,11): Info: Selected triggers: {x in a}
-some-proofs-only-work-without-autoTriggers.dfy(28,11): Info: Selected triggers: {a[i]}
-some-proofs-only-work-without-autoTriggers.dfy(31,11): Info: Selected triggers: {x in a[..3]}
-some-proofs-only-work-without-autoTriggers.dfy(33,11): Info: Selected triggers: {x in a[..2]}
-some-proofs-only-work-without-autoTriggers.dfy(20,11): Error: assertion could not be proved
-some-proofs-only-work-without-autoTriggers.dfy(28,11): Error: assertion could not be proved
-some-proofs-only-work-without-autoTriggers.dfy(33,11): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 3 errors
diff --git a/Test/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy.expect b/Test/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy.expect
deleted file mode 100644
index f25d2c06c1e..00000000000
--- a/Test/triggers/some-terms-do-not-look-like-the-triggers-they-match.dfy.expect
+++ /dev/null
@@ -1,78 +0,0 @@
-some-terms-do-not-look-like-the-triggers-they-match.dfy(12,17): Info: Selected triggers: {s[_t#0], s[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(15,17): Info: For expression "x in s ==> s[_t#0] > 0":
-   Selected triggers: {s[_t#0], s[x]} in subexpression at some-terms-do-not-look-like-the-triggers-they-match.dfy(15,59) [Related location] some-terms-do-not-look-like-the-triggers-they-match.dfy(15,70)
-some-terms-do-not-look-like-the-triggers-they-match.dfy(15,17): Info: For expression "x in s ==> _t#0 !in s":
-   Selected triggers: {s[_t#0], s[x]} in subexpression at some-terms-do-not-look-like-the-triggers-they-match.dfy(15,59) [Related location] some-terms-do-not-look-like-the-triggers-they-match.dfy(15,81)
-some-terms-do-not-look-like-the-triggers-they-match.dfy(24,18): Info: Selected triggers: {x in s + t}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(25,18): Info: Selected triggers:
-   {x in t}, {x in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(26,18): Info: Selected triggers: {x in s + t}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(27,18): Info: Selected triggers:
-   {x in t}, {x in s}, {x in s + t}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(31,18): Info: Selected triggers: {x in s * t}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(32,18): Info: Selected triggers:
-   {x in t}, {x in s}, {x in s * t}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(36,18): Info: Selected triggers: {x in s - t}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(37,18): Info: Selected triggers:
-   {x in t}, {x in s}, {x in s - t}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(43,20): Warning: /!\ No terms found to trigger on.
-some-terms-do-not-look-like-the-triggers-they-match.dfy(44,20): Warning: /!\ No terms found to trigger on.
-some-terms-do-not-look-like-the-triggers-they-match.dfy(49,20): Info: Selected triggers: {x in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(50,20): Info: Selected triggers: {x in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(55,18): Warning: /!\ No terms found to trigger on.
-some-terms-do-not-look-like-the-triggers-they-match.dfy(55,36): Info: Selected triggers: {y in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(56,18): Warning: /!\ No terms found to trigger on.
-some-terms-do-not-look-like-the-triggers-they-match.dfy(56,39): Info: Selected triggers: {y in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(58,18): Warning: /!\ No terms found to trigger on.
-some-terms-do-not-look-like-the-triggers-they-match.dfy(58,41): Info: Selected triggers: {y in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(59,18): Info: Selected triggers: {x in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(60,18): Info: Selected triggers: {x in F(s)}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(67,18): Info: Selected triggers: {(s + t)[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(68,18): Info: Selected triggers:
-   {t[x]}, {s[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(71,11): Info: Selected triggers:
-   {t[x]}, {s[x]}, {(s + t)[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(75,18): Info: Selected triggers: {(s * t)[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(76,18): Info: Selected triggers:
-   {t[x]}, {s[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(79,17): Info: Selected triggers:
-   {t[x]}, {s[x]}, {(s * t)[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(83,18): Info: Selected triggers: {(s - t)[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(84,18): Info: Selected triggers:
-   {t[x]}, {s[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(86,11): Info: Selected triggers:
-   {t[x]}, {s[x]}, {(s - t)[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(92,20): Warning: /!\ No terms found to trigger on.
-some-terms-do-not-look-like-the-triggers-they-match.dfy(93,20): Warning: /!\ No terms found to trigger on.
-some-terms-do-not-look-like-the-triggers-they-match.dfy(98,20): Info: Selected triggers: {ms[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(99,20): Info: Selected triggers: {ms[x]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(106,18): Info: Selected triggers: {x in s + t}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(107,18): Info: Selected triggers:
-   {x in t}, {x in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(110,6): Info: Selected triggers:
-   {x in t}, {x in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(121,18): Info: Selected triggers: {x in [2, 3, 5]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(122,18): Info: Selected triggers: {x in [2, 3, 5]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(128,18): Info: Selected triggers: {x in s + t}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(129,18): Info: Selected triggers:
-   {x in t}, {x in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(133,18): Info: Selected triggers: {x in s - u}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(134,18): Info: Selected triggers:
-   {x in u}, {x in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(137,6): Info: Selected triggers:
-   {x in u}, {x in s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(148,18): Info: Selected triggers: {x in map[2 := 20, 3 := 30, 5 := 50]}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(149,18): Info: Selected triggers: {x in F(map[2 := 20, 3 := 30, 5 := 50])}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(156,12): Info: Selected triggers: {x <= s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(157,12): Info: Selected triggers: {x <= s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(158,12): Info: Selected triggers: {x >= s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(159,12): Info: Selected triggers: {x >= s}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(161,12): Info: Selected triggers: {x <= ms}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(162,12): Info: Selected triggers: {x <= ms}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(163,12): Info: Selected triggers: {x >= ms}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(164,12): Info: Selected triggers: {x >= ms}
-some-terms-do-not-look-like-the-triggers-they-match.dfy(166,12): Warning: /!\ No terms found to trigger on.
-some-terms-do-not-look-like-the-triggers-they-match.dfy(167,12): Warning: /!\ No terms found to trigger on.
-some-terms-do-not-look-like-the-triggers-they-match.dfy(152,9): Error: assertion could not be proved
-
-Dafny program verifier finished with 4 verified, 1 error
diff --git a/Test/triggers/splitting-triggers-recovers-expressivity.dfy.expect b/Test/triggers/splitting-triggers-recovers-expressivity.dfy.expect
deleted file mode 100644
index f142e510491..00000000000
--- a/Test/triggers/splitting-triggers-recovers-expressivity.dfy.expect
+++ /dev/null
@@ -1,28 +0,0 @@
-splitting-triggers-recovers-expressivity.dfy(12,10): Info: Selected triggers:
-   {P(_t#0), Q(i)}, {P(_t#0), P(i)}
-splitting-triggers-recovers-expressivity.dfy(17,11): Info: Selected triggers:
-   {P(_t#0), Q(j)}, {P(_t#0), P(j)}
-splitting-triggers-recovers-expressivity.dfy(26,10): Info: Selected triggers: {Q(i)}
- Rejected triggers: {P(i)} (may loop with "P(i + 1)")
-splitting-triggers-recovers-expressivity.dfy(33,11): Info: Selected triggers: {Q(j)}
- Rejected triggers: {P(j)} (may loop with "P(j + 1)")
-splitting-triggers-recovers-expressivity.dfy(44,10): Info: For expression "P(i) || !Q(i)":
-   Selected triggers:
-     {Q(i)}, {P(i)}
-splitting-triggers-recovers-expressivity.dfy(44,10): Info: For expression "P(i + 1)":
-   Selected triggers: {Q(i)}
-   Rejected triggers: {P(i)} (may loop with "P(i + 1)")
-splitting-triggers-recovers-expressivity.dfy(49,11): Info: For expression "j >= 0 ==> P(j)":
-   Selected triggers:
-     {Q(j)}, {P(j)} in subexpression at splitting-triggers-recovers-expressivity.dfy(49,59) [Related location] splitting-triggers-recovers-expressivity.dfy(49,64)
-splitting-triggers-recovers-expressivity.dfy(49,11): Info: For expression "j >= 0 ==> Q(j) ==> P(j + 1)":
-   Selected triggers: {Q(j)}
-   Rejected triggers: {P(j)} (may loop with "P(j + 1)") in subexpression at splitting-triggers-recovers-expressivity.dfy(49,59) [Related location] splitting-triggers-recovers-expressivity.dfy(49,78)
-splitting-triggers-recovers-expressivity.dfy(58,11): Info: Selected triggers:
-   {P(i)}, {Q(i)}
-splitting-triggers-recovers-expressivity.dfy(12,63): Error: a postcondition could not be proved on this return path
-splitting-triggers-recovers-expressivity.dfy(12,10): Related location: this is the postcondition that could not be proved
-splitting-triggers-recovers-expressivity.dfy(19,15): Error: a postcondition could not be proved on this return path
-splitting-triggers-recovers-expressivity.dfy(19,10): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 5 verified, 2 errors
diff --git a/Test/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy.expect b/Test/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy.expect
deleted file mode 100644
index 447f9feb0b5..00000000000
--- a/Test/triggers/splitting-triggers-yields-better-precondition-related-errors.dfy.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-splitting-triggers-yields-better-precondition-related-errors.dfy(7,11): Warning: /!\ No terms found to trigger on.
-splitting-triggers-yields-better-precondition-related-errors.dfy(15,11): Warning: /!\ No terms found to trigger on.
-splitting-triggers-yields-better-precondition-related-errors.dfy(11,3): Error: a precondition for this call could not be proved
-splitting-triggers-yields-better-precondition-related-errors.dfy(7,11): Related location: this is the precondition that could not be proved
-splitting-triggers-yields-better-precondition-related-errors.dfy(20,2): Error: function precondition could not be proved
-splitting-triggers-yields-better-precondition-related-errors.dfy(15,11): Related location
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/triggers/suppressing-warnings-behaves-properly.dfy.expect b/Test/triggers/suppressing-warnings-behaves-properly.dfy.expect
deleted file mode 100644
index 41cae535592..00000000000
--- a/Test/triggers/suppressing-warnings-behaves-properly.dfy.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-suppressing-warnings-behaves-properly.dfy(10,9): Warning: /!\ No terms found to trigger on.
-suppressing-warnings-behaves-properly.dfy(11,9): Info: (Suppressed warning) No terms found to trigger on.
-suppressing-warnings-behaves-properly.dfy(12,9): Info: Not generating triggers for "n >= 0 || n < 0". Note that {:autotriggers false} can cause instabilities. Consider using {:nowarn}, {:matchingloop} (not great either), or a manual trigger instead.
-suppressing-warnings-behaves-properly.dfy(14,9): Info: Selected triggers: {f(n)}
-suppressing-warnings-behaves-properly.dfy(15,9): Warning: Selected triggers: {f(n)}
- /!\ There is no warning here to suppress.
-suppressing-warnings-behaves-properly.dfy(16,9): Info: Not generating triggers for "(n != 0) == f(n) || true". Note that {:autotriggers false} can cause instabilities. Consider using {:nowarn}, {:matchingloop} (not great either), or a manual trigger instead.
-suppressing-warnings-behaves-properly.dfy(18,9): Info: Selected triggers:
-   {g(n), f(_t#0)}, {f(_t#0), f(n)}
-suppressing-warnings-behaves-properly.dfy(19,9): Warning: Selected triggers: {f(n)}
- /!\ There is no warning here to suppress.
-suppressing-warnings-behaves-properly.dfy(20,9): Info: Not generating triggers for "(n != 0) == f(n) || true". Note that {:autotriggers false} can cause instabilities. Consider using {:nowarn}, {:matchingloop} (not great either), or a manual trigger instead.
-
-Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/triggers/triggers-prevent-some-inlining.dfy.expect b/Test/triggers/triggers-prevent-some-inlining.dfy.expect
deleted file mode 100644
index 89c40cc572a..00000000000
--- a/Test/triggers/triggers-prevent-some-inlining.dfy.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-triggers-prevent-some-inlining.dfy(17,2): Info: Selected triggers: {sum(a, b)}
-triggers-prevent-some-inlining.dfy(24,10): Info: Some instances of this call are not inlined.
-triggers-prevent-some-inlining.dfy(25,10): Info: Some instances of this call are not inlined.
-triggers-prevent-some-inlining.dfy(24,10): Info: Some instances of this call are not inlined.
-triggers-prevent-some-inlining.dfy(25,10): Info: Some instances of this call are not inlined.
-
-Dafny program verifier finished with 1 verified, 0 errors
diff --git a/Test/unicodechars/DafnyTests/RunAllTestsOption.dfy b/Test/unicodechars/DafnyTests/RunAllTestsOption.dfy
deleted file mode 100644
index 4bf5de34f62..00000000000
--- a/Test/unicodechars/DafnyTests/RunAllTestsOption.dfy
+++ /dev/null
@@ -1,8 +0,0 @@
-// RUN: %baredafny verify %args --unicode-char --verify-included-files "%s" > "%t"
-// RUN: ! %baredafny test %args --unicode-char --no-verify --target:cs "%s" >> "%t"
-// RUN: ! %baredafny test %args --unicode-char --no-verify --target:java "%s" >> "%t"
-// RUN: ! %baredafny test %args --unicode-char --no-verify --target:go "%s" >> "%t"
-// RUN: ! %baredafny test %args --unicode-char --no-verify --target:js "%s" >> "%t"
-// RUN: ! %baredafny test %args --unicode-char --no-verify --target:py "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t" 
-include "../../DafnyTests/RunAllTestsOption.dfy"
diff --git a/Test/unicodechars/DafnyTests/RunAllTestsOption.dfy.expect b/Test/unicodechars/DafnyTests/RunAllTestsOption.dfy.expect
deleted file mode 100644
index 27fb15fcc12..00000000000
--- a/Test/unicodechars/DafnyTests/RunAllTestsOption.dfy.expect
+++ /dev/null
@@ -1,72 +0,0 @@
-
-Dafny program verifier finished with 2 verified, 0 errors
-
-Dafny program verifier did not attempt verification
-TestModule.Passing1: PASSED
-Passing1: PASSED
-Passing2: PASSED
-Failing1: FAILED
-	RunAllTestsOption.dfy(21,2): expectation violation
-Passing3: PASSED
-Failing2: FAILED
-	RunAllTestsOption.dfy(29,2): expectation violation
-FailingReturnValue: FAILED
-	VoidOutcome.VoidFailure("Whoopsie")
-[Program halted] RunAllTestsOption.dfy(8,0): Test failures occurred: see above.
-
-
-Dafny program verifier did not attempt verification
-TestModule.Passing1: PASSED
-Passing1: PASSED
-Passing2: PASSED
-Failing1: FAILED
-	RunAllTestsOption.dfy(21,2): expectation violation
-Passing3: PASSED
-Failing2: FAILED
-	RunAllTestsOption.dfy(29,2): expectation violation
-FailingReturnValue: FAILED
-	VoidOutcome.VoidFailure("Whoopsie")
-[Program halted] RunAllTestsOption.dfy(8,0): Test failures occurred: see above.
-
-
-Dafny program verifier did not attempt verification
-TestModule.Passing1: PASSED
-Passing1: PASSED
-Passing2: PASSED
-Failing1: FAILED
-	RunAllTestsOption.dfy(21,2): expectation violation
-Passing3: PASSED
-Failing2: FAILED
-	RunAllTestsOption.dfy(29,2): expectation violation
-FailingReturnValue: FAILED
-	VoidOutcome.VoidFailure("Whoopsie")
-[Program halted] RunAllTestsOption.dfy(8,0): Test failures occurred: see above.
-
-
-Dafny program verifier did not attempt verification
-TestModule.Passing1: PASSED
-Passing1: PASSED
-Passing2: PASSED
-Failing1: FAILED
-	RunAllTestsOption.dfy(21,2): expectation violation
-Passing3: PASSED
-Failing2: FAILED
-	RunAllTestsOption.dfy(29,2): expectation violation
-FailingReturnValue: FAILED
-	VoidOutcome.VoidFailure("Whoopsie")
-[Program halted] RunAllTestsOption.dfy(8,0): Test failures occurred: see above.
-
-
-Dafny program verifier did not attempt verification
-TestModule.Passing1: PASSED
-Passing1: PASSED
-Passing2: PASSED
-Failing1: FAILED
-	RunAllTestsOption.dfy(21,2): expectation violation
-Passing3: PASSED
-Failing2: FAILED
-	RunAllTestsOption.dfy(29,2): expectation violation
-FailingReturnValue: FAILED
-	VoidOutcome.VoidFailure("Whoopsie")
-[Program halted] RunAllTestsOption.dfy(8,0): Test failures occurred: see above.
-
diff --git a/Test/unicodechars/comp/Arrays.dfy b/Test/unicodechars/comp/Arrays.dfy
deleted file mode 100644
index e0aa3ea7b93..00000000000
--- a/Test/unicodechars/comp/Arrays.dfy
+++ /dev/null
@@ -1,2 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --unicode-char
-include "../../comp/Arrays.dfy"
diff --git a/Test/unicodechars/comp/Collections.dfy b/Test/unicodechars/comp/Collections.dfy
deleted file mode 100644
index 14d241ed5ab..00000000000
--- a/Test/unicodechars/comp/Collections.dfy
+++ /dev/null
@@ -1,3 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:true --verify-included-files
-include "../../comp/Collections.dfy"
diff --git a/Test/unicodechars/comp/Collections.dfy.expect b/Test/unicodechars/comp/Collections.dfy.expect
deleted file mode 100644
index 89f08b08d75..00000000000
--- a/Test/unicodechars/comp/Collections.dfy.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-Sets: {} {17, 82} {12, 17}
-  cardinality: 0 2 2
-  union: {17, 82} {12, 17, 82}
-  intersection: {} {17}
-  difference: {} {82}
-  disjoint: true false
-  subset: true false true
-  proper subset: true false false
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  eq covariance: 1 true true
-false true
-|s|=4 |S|=16
-{{}, {'a'}, {'b'}, {'c'}, {'d'}, {'a', 'b'}, {'a', 'c'}, {'b', 'c'}, {'a', 'd'}, {'b', 'd'}, {'c', 'd'}, {'a', 'b', 'c'}, {'a', 'b', 'd'}, {'a', 'c', 'd'}, {'b', 'c', 'd'}, {'a', 'b', 'c', 'd'}}
-Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
-  cardinality: 0 4 2
-  union: multiset{17, 17, 82, 82} multiset{12, 17, 17, 17, 82, 82}
-  intersection: multiset{} multiset{17}
-  difference: multiset{} multiset{17, 82, 82}
-  disjoint: true false
-  subset: true false true true
-  proper subset: true false false true
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
-  multiplicity: 0 2 1
-Test zero multiplicity:
-  printing: multiset{multiset{}, multiset{42}} multiset{12}
-  union: 1 1 1 1
-  membership: false false
-  equality: false true false
-  subset: true true true true false
-  strict subset: true false false true false
-  disjoint: true true true true
-Sequences: [] [17, 82, 17, 82] [12, 17]
-  cardinality: 0 4 2
-  update: [42, 82, 17, 82] [42, 17]
-  index: 17 12
-  subsequence ([lo..hi]): [82, 17] [17]
-  subsequence ([lo..]): [82, 17, 82] [17]
-  subsequence ([..hi]): [17, 82, 17][12]
-  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
-  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-Bound Bound Bound Bound Bound Bound
-ed ed ed ed ed ed
-'e' 'e' 'e' 'e' 'e' 'e'
-hello
-hEllo
-[2, 4, 6, 8, 10]
-[2, 0, 6, 8, 10]
-true false false
-true true false true
-false false false true
-  eq covariance: true true
-Strings:  uRuR gu
-  cardinality: 0 4 2
-  concatenation: uRuR uRuRgu
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-  constructed as sequence: guru
-  mix: hello-d ddd-hello
-Maps: map[] map[17 := 2, 82 := 2] map[12 := 26, 17 := 0]
-  cardinality: 0 2 2
-  keys: {} {17, 82} {12, 17}
-  values: {} {2} {0, 26}
-  items: {} {(17, 2), (82, 2)} {(12, 26), (17, 0)}
-  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
-  lookup: false 2 0
-m: map[Color.Blue := 30, Color.Yellow := 21]
-keys: {Color.Blue, Color.Yellow}
-values: {21, 30}
-items: {(Color.Blue, 30), (Color.Yellow, 21)}
-3 2 4
-70 52 66
-8 67 67
-4 4 3
-true false true false
-true false false false
-false false true
-false false false true
-0 20 4
-198 20 4
-0 2 false
-true true true false
-0 20 4
-198 20 4
-0 2 false
-false false true
-false true true true
-jack wendy null
-jack null null
-ronald ronald false
-true true true false
-jack wendy null
-jack null null
-ronald ronald false
-2: 0 1 1
-3: 0 1 2
-There are 0 occurrences of 58 in the multiset
-There are 536870912 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of null in the multiset
-Map===
-|s|=1 |u|=1
-s[1]=123 u[1]=40
-|S|=1 |U|=1
-S[1]=123 U[1]=41
-Seq===
-|s|=2 |u|=2
-123 42, 123 42, 123 42
-|s|=2 |u|=2
-123 43, 123 43, 123 43
-|s|=2 |u|=2
-123 44, 123 44, 123 44
-Multiset===
-|s|=2 |u|=4
-1 3
-|s|=2 |u|=4
-1 3
diff --git a/Test/unicodechars/comp/Collections.dfy.go.expect b/Test/unicodechars/comp/Collections.dfy.go.expect
deleted file mode 100644
index 2fc0f3b7093..00000000000
--- a/Test/unicodechars/comp/Collections.dfy.go.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-Sets: {} {17, 82} {12, 17}
-  cardinality: 0 2 2
-  union: {17, 82} {17, 82, 12}
-  intersection: {} {17}
-  difference: {} {82}
-  disjoint: true false
-  subset: true false true
-  proper subset: true false false
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  eq covariance: 1 true true
-false true
-|s|=4 |S|=16
-{{}, {'a'}, {'b'}, {'c'}, {'d'}, {'a', 'b'}, {'a', 'c'}, {'b', 'c'}, {'a', 'd'}, {'b', 'd'}, {'c', 'd'}, {'a', 'b', 'c'}, {'a', 'b', 'd'}, {'a', 'c', 'd'}, {'b', 'c', 'd'}, {'a', 'b', 'c', 'd'}}
-Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
-  cardinality: 0 4 2
-  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
-  intersection: multiset{} multiset{17}
-  difference: multiset{} multiset{17, 82, 82}
-  disjoint: true false
-  subset: true false true true
-  proper subset: true false false true
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
-  multiplicity: 0 2 1
-Test zero multiplicity:
-  printing: multiset{multiset{}, multiset{42}} multiset{12}
-  union: 1 1 1 1
-  membership: false false
-  equality: false true false
-  subset: true true true true false
-  strict subset: true false false true false
-  disjoint: true true true true
-Sequences: [] [17, 82, 17, 82] [12, 17]
-  cardinality: 0 4 2
-  update: [42, 82, 17, 82] [42, 17]
-  index: 17 12
-  subsequence ([lo..hi]): [82, 17] [17]
-  subsequence ([lo..]): [82, 17, 82] [17]
-  subsequence ([..hi]): [17, 82, 17][12]
-  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
-  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-Bound Bound Bound Bound Bound Bound
-ed ed ed ed ed ed
-'e' 'e' 'e' 'e' 'e' 'e'
-hello
-hEllo
-[2, 4, 6, 8, 10]
-[2, 0, 6, 8, 10]
-true false false
-true true false true
-false false false true
-  eq covariance: true true
-Strings:  uRuR gu
-  cardinality: 0 4 2
-  concatenation: uRuR uRuRgu
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-  constructed as sequence: guru
-  mix: hello-d ddd-hello
-Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
-  cardinality: 0 2 2
-  keys: {} {17, 82} {17, 12}
-  values: {} {2} {0, 26}
-  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
-  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
-  lookup: false 2 0
-m: map[Color.Blue := 30, Color.Yellow := 21]
-keys: {Color.Blue, Color.Yellow}
-values: {30, 21}
-items: {(Color.Blue, 30), (Color.Yellow, 21)}
-3 2 4
-70 52 66
-8 67 67
-4 4 3
-true false true false
-true false false false
-false false true
-false false false true
-0 20 4
-198 20 4
-0 2 false
-true true true false
-0 20 4
-198 20 4
-0 2 false
-false false true
-false true true true
-jack wendy null
-jack null null
-ronald ronald false
-true true true false
-jack wendy null
-jack null null
-ronald ronald false
-2: 0 1 1
-3: 0 1 2
-There are 0 occurrences of 58 in the multiset
-There are 536870912 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of null in the multiset
-Map===
-|s|=1 |u|=1
-s[1]=123 u[1]=40
-|S|=1 |U|=1
-S[1]=123 U[1]=41
-Seq===
-|s|=2 |u|=2
-123 42, 123 42, 123 42
-|s|=2 |u|=2
-123 43, 123 43, 123 43
-|s|=2 |u|=2
-123 44, 123 44, 123 44
-Multiset===
-|s|=2 |u|=4
-1 3
-|s|=2 |u|=4
-1 3
diff --git a/Test/unicodechars/comp/Collections.dfy.java.expect b/Test/unicodechars/comp/Collections.dfy.java.expect
deleted file mode 100644
index 39975cadfc4..00000000000
--- a/Test/unicodechars/comp/Collections.dfy.java.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-Sets: {} {17, 82} {17, 12}
-  cardinality: 0 2 2
-  union: {17, 82} {17, 82, 12}
-  intersection: {} {17}
-  difference: {} {82}
-  disjoint: true false
-  subset: true false true
-  proper subset: true false false
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  eq covariance: 1 true true
-false true
-|s|=4 |S|=16
-{{}, {'a'}, {'b'}, {'c'}, {'d'}, {'a', 'b'}, {'a', 'c'}, {'b', 'c'}, {'a', 'd'}, {'b', 'd'}, {'c', 'd'}, {'a', 'b', 'c'}, {'a', 'b', 'd'}, {'a', 'c', 'd'}, {'b', 'c', 'd'}, {'a', 'b', 'c', 'd'}}
-Multisets: multiset{} multiset{17, 17, 82, 82} multiset{17, 12}
-  cardinality: 0 4 2
-  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
-  intersection: multiset{} multiset{17}
-  difference: multiset{} multiset{17, 82, 82}
-  disjoint: true false
-  subset: true false true true
-  proper subset: true false false true
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{17, 17, 12}
-  multiplicity: 0 2 1
-Test zero multiplicity:
-  printing: multiset{multiset{}, multiset{42}} multiset{12}
-  union: 1 1 1 1
-  membership: false false
-  equality: false true false
-  subset: true true true true false
-  strict subset: true false false true false
-  disjoint: true true true true
-Sequences: [] [17, 82, 17, 82] [12, 17]
-  cardinality: 0 4 2
-  update: [42, 82, 17, 82] [42, 17]
-  index: 17 12
-  subsequence ([lo..hi]): [82, 17] [17]
-  subsequence ([lo..]): [82, 17, 82] [17]
-  subsequence ([..hi]): [17, 82, 17][12]
-  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
-  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-Bound Bound Bound Bound Bound Bound
-ed ed ed ed ed ed
-'e' 'e' 'e' 'e' 'e' 'e'
-hello
-hEllo
-[2, 4, 6, 8, 10]
-[2, 0, 6, 8, 10]
-true false false
-true true false true
-false false false true
-  eq covariance: true true
-Strings:  uRuR gu
-  cardinality: 0 4 2
-  concatenation: uRuR uRuRgu
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-  constructed as sequence: guru
-  mix: hello-d ddd-hello
-Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
-  cardinality: 0 2 2
-  keys: {} {17, 82} {17, 12}
-  values: {} {2} {0, 26}
-  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
-  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
-  lookup: false 2 0
-m: map[Color.Yellow := 21, Color.Blue := 30]
-keys: {Color.Yellow, Color.Blue}
-values: {21, 30}
-items: {(Color.Yellow, 21), (Color.Blue, 30)}
-3 2 4
-70 52 66
-8 67 67
-4 4 3
-true false true false
-true false false false
-false false true
-false false false true
-0 20 4
-198 20 4
-0 2 false
-true true true false
-0 20 4
-198 20 4
-0 2 false
-false false true
-false true true true
-jack wendy null
-jack null null
-ronald ronald false
-true true true false
-jack wendy null
-jack null null
-ronald ronald false
-2: 0 1 1
-3: 0 1 2
-There are 0 occurrences of 58 in the multiset
-There are 536870912 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of null in the multiset
-Map===
-|s|=1 |u|=1
-s[1]=123 u[1]=40
-|S|=1 |U|=1
-S[1]=123 U[1]=41
-Seq===
-|s|=2 |u|=2
-123 42, 123 42, 123 42
-|s|=2 |u|=2
-123 43, 123 43, 123 43
-|s|=2 |u|=2
-123 44, 123 44, 123 44
-Multiset===
-|s|=2 |u|=4
-1 3
-|s|=2 |u|=4
-1 3
diff --git a/Test/unicodechars/comp/Collections.dfy.js.expect b/Test/unicodechars/comp/Collections.dfy.js.expect
deleted file mode 100644
index 2fc0f3b7093..00000000000
--- a/Test/unicodechars/comp/Collections.dfy.js.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-Sets: {} {17, 82} {12, 17}
-  cardinality: 0 2 2
-  union: {17, 82} {17, 82, 12}
-  intersection: {} {17}
-  difference: {} {82}
-  disjoint: true false
-  subset: true false true
-  proper subset: true false false
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  eq covariance: 1 true true
-false true
-|s|=4 |S|=16
-{{}, {'a'}, {'b'}, {'c'}, {'d'}, {'a', 'b'}, {'a', 'c'}, {'b', 'c'}, {'a', 'd'}, {'b', 'd'}, {'c', 'd'}, {'a', 'b', 'c'}, {'a', 'b', 'd'}, {'a', 'c', 'd'}, {'b', 'c', 'd'}, {'a', 'b', 'c', 'd'}}
-Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
-  cardinality: 0 4 2
-  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
-  intersection: multiset{} multiset{17}
-  difference: multiset{} multiset{17, 82, 82}
-  disjoint: true false
-  subset: true false true true
-  proper subset: true false false true
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
-  multiplicity: 0 2 1
-Test zero multiplicity:
-  printing: multiset{multiset{}, multiset{42}} multiset{12}
-  union: 1 1 1 1
-  membership: false false
-  equality: false true false
-  subset: true true true true false
-  strict subset: true false false true false
-  disjoint: true true true true
-Sequences: [] [17, 82, 17, 82] [12, 17]
-  cardinality: 0 4 2
-  update: [42, 82, 17, 82] [42, 17]
-  index: 17 12
-  subsequence ([lo..hi]): [82, 17] [17]
-  subsequence ([lo..]): [82, 17, 82] [17]
-  subsequence ([..hi]): [17, 82, 17][12]
-  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
-  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-Bound Bound Bound Bound Bound Bound
-ed ed ed ed ed ed
-'e' 'e' 'e' 'e' 'e' 'e'
-hello
-hEllo
-[2, 4, 6, 8, 10]
-[2, 0, 6, 8, 10]
-true false false
-true true false true
-false false false true
-  eq covariance: true true
-Strings:  uRuR gu
-  cardinality: 0 4 2
-  concatenation: uRuR uRuRgu
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-  constructed as sequence: guru
-  mix: hello-d ddd-hello
-Maps: map[] map[17 := 2, 82 := 2] map[17 := 0, 12 := 26]
-  cardinality: 0 2 2
-  keys: {} {17, 82} {17, 12}
-  values: {} {2} {0, 26}
-  items: {} {(17, 2), (82, 2)} {(17, 0), (12, 26)}
-  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
-  lookup: false 2 0
-m: map[Color.Blue := 30, Color.Yellow := 21]
-keys: {Color.Blue, Color.Yellow}
-values: {30, 21}
-items: {(Color.Blue, 30), (Color.Yellow, 21)}
-3 2 4
-70 52 66
-8 67 67
-4 4 3
-true false true false
-true false false false
-false false true
-false false false true
-0 20 4
-198 20 4
-0 2 false
-true true true false
-0 20 4
-198 20 4
-0 2 false
-false false true
-false true true true
-jack wendy null
-jack null null
-ronald ronald false
-true true true false
-jack wendy null
-jack null null
-ronald ronald false
-2: 0 1 1
-3: 0 1 2
-There are 0 occurrences of 58 in the multiset
-There are 536870912 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of null in the multiset
-Map===
-|s|=1 |u|=1
-s[1]=123 u[1]=40
-|S|=1 |U|=1
-S[1]=123 U[1]=41
-Seq===
-|s|=2 |u|=2
-123 42, 123 42, 123 42
-|s|=2 |u|=2
-123 43, 123 43, 123 43
-|s|=2 |u|=2
-123 44, 123 44, 123 44
-Multiset===
-|s|=2 |u|=4
-1 3
-|s|=2 |u|=4
-1 3
diff --git a/Test/unicodechars/comp/Collections.dfy.py.expect b/Test/unicodechars/comp/Collections.dfy.py.expect
deleted file mode 100644
index e4e346dede0..00000000000
--- a/Test/unicodechars/comp/Collections.dfy.py.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-Sets: {} {17, 82} {17, 12}
-  cardinality: 0 2 2
-  union: {17, 82} {17, 82, 12}
-  intersection: {} {17}
-  difference: {} {82}
-  disjoint: true false
-  subset: true false true
-  proper subset: true false false
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  eq covariance: 1 true true
-false true
-|s|=4 |S|=16
-{{}, {'a'}, {'b'}, {'c'}, {'d'}, {'a', 'b'}, {'a', 'c'}, {'b', 'c'}, {'a', 'd'}, {'b', 'd'}, {'c', 'd'}, {'a', 'b', 'c'}, {'a', 'b', 'd'}, {'a', 'c', 'd'}, {'b', 'c', 'd'}, {'a', 'b', 'c', 'd'}}
-Multisets: multiset{} multiset{17, 17, 82, 82} multiset{12, 17}
-  cardinality: 0 4 2
-  union: multiset{17, 17, 82, 82} multiset{17, 17, 17, 82, 82, 12}
-  intersection: multiset{} multiset{17}
-  difference: multiset{} multiset{17, 82, 82}
-  disjoint: true false
-  subset: true false true true
-  proper subset: true false false true
-  superset: false true true
-  proper superset: false true false
-  membership: false true true
-  update: multiset{17, 17} multiset{17, 17, 82, 82} multiset{12, 17, 17}
-  multiplicity: 0 2 1
-Test zero multiplicity:
-  printing: multiset{multiset{}, multiset{42}} multiset{12}
-  union: 1 1 1 1
-  membership: false false
-  equality: false true false
-  subset: true true true true false
-  strict subset: true false false true false
-  disjoint: true true true true
-Sequences: [] [17, 82, 17, 82] [12, 17]
-  cardinality: 0 4 2
-  update: [42, 82, 17, 82] [42, 17]
-  index: 17 12
-  subsequence ([lo..hi]): [82, 17] [17]
-  subsequence ([lo..]): [82, 17, 82] [17]
-  subsequence ([..hi]): [17, 82, 17][12]
-  subsequence ([..]): [] [17, 82, 17, 82] [12, 17]
-  concatenation: [17, 82, 17, 82] [17, 82, 17, 82, 12, 17]
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-Bound Bound Bound Bound Bound Bound
-ed ed ed ed ed ed
-'e' 'e' 'e' 'e' 'e' 'e'
-hello
-hEllo
-[2, 4, 6, 8, 10]
-[2, 0, 6, 8, 10]
-true false false
-true true false true
-false false false true
-  eq covariance: true true
-Strings:  uRuR gu
-  cardinality: 0 4 2
-  concatenation: uRuR uRuRgu
-  prefix: true false true
-  proper prefix: true false false
-  membership: false true true
-  constructed as sequence: guru
-  mix: hello-d ddd-hello
-Maps: map[] map[82 := 2, 17 := 2] map[17 := 0, 12 := 26]
-  cardinality: 0 2 2
-  keys: {} {17, 82} {17, 12}
-  values: {} {2} {0, 26}
-  items: {} {(82, 2), (17, 2)} {(17, 0), (12, 26)}
-  update: 6 (1 0) 6 (2 2 2) 6 (2 2 0)
-  lookup: false 2 0
-m: map[Color.Blue := 30, Color.Yellow := 21]
-keys: {Color.Blue, Color.Yellow}
-values: {21, 30}
-items: {(Color.Blue, 30), (Color.Yellow, 21)}
-3 2 4
-70 52 66
-8 67 67
-4 4 3
-true false true false
-true false false false
-false false true
-false false false true
-0 20 4
-198 20 4
-0 2 false
-true true true false
-0 20 4
-198 20 4
-0 2 false
-false false true
-false true true true
-jack wendy null
-jack null null
-ronald ronald false
-true true true false
-jack wendy null
-jack null null
-ronald ronald false
-2: 0 1 1
-3: 0 1 2
-There are 0 occurrences of 58 in the multiset
-There are 536870912 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of 58 in the multiset
-There are 633825300114114700748351602688 occurrences of null in the multiset
-Map===
-|s|=1 |u|=1
-s[1]=123 u[1]=40
-|S|=1 |U|=1
-S[1]=123 U[1]=41
-Seq===
-|s|=2 |u|=2
-123 42, 123 42, 123 42
-|s|=2 |u|=2
-123 43, 123 43, 123 43
-|s|=2 |u|=2
-123 44, 123 44, 123 44
-Multiset===
-|s|=2 |u|=4
-1 3
-|s|=2 |u|=4
-1 3
diff --git a/Test/unicodechars/comp/CompileWithArguments.dfy b/Test/unicodechars/comp/CompileWithArguments.dfy
deleted file mode 100644
index b7191d0d291..00000000000
--- a/Test/unicodechars/comp/CompileWithArguments.dfy
+++ /dev/null
@@ -1,45 +0,0 @@
-// NONUNIFORM: Multiple testing scenarios, highly backend sensitive, testing CLI
-// Note that C++ is not supported yet
-
-// RUN: %dafny /compile:0 "%s" > "%t"
-// RUN: %baredafny run %args --unicode-char --no-verify --target:cs "%s" Csharp 1 >> "%t"
-// RUN: %baredafny run %args --unicode-char --no-verify --target:java "%s" -- Java --heya >> "%t"
-// RUN: %baredafny run %args --unicode-char --no-verify --target:js "%s" -- Javascript 2 >> "%t"
-// RUN: %dafny /noVerify /compile:4 /unicodeChar:1 /compileTarget:py "%s" --args Python 1 >> "%t"
-// RUN: %dafny /noVerify /compile:4 /unicodeChar:1 /compileTarget:go "%s" --args "Go go" 1 >> "%t"
-// RUN: %baredafny build %args --unicode-char --no-verify --target:cs "%s" --output:%s.dll
-// RUN: dotnet %s.dll "dotnet" "howdy" >> "%t"
-// RUN: dotnet %s.dll "dotnet" "hello" >> "%t"
-// RUN: dotnet %s.dll "dotnet" "aloha" >> "%t"
-// RUN: %baredafny build %args --unicode-char --no-verify --target:js "%s" --output=%s.js
-// RUN: node %s.js "javascript" 2 >> "%t"
-// RUN: node %s.js "javascript" 1 >> "%t"
-// RUN: node %s.js "javascript" "aloha" >> "%t"
-// RUN: %baredafny build %args --unicode-char --no-verify --target:java "%s" --output:"%s.jar" >> "%t"
-// RUN: java -jar "%s.jar" Java 2 >> "%t"
-// RUN: java -jar "%s.jar" Java 1 >> "%t"
-// RUN: java -jar "%s.jar" Java aloha >> "%t"
-// RUN: %baredafny build %args --unicode-char --no-verify --target:py "%s" >> "%t"
-// RUN: python3 %S/CompileWithArguments-py Python 2 >> "%t"
-// RUN: python3 %S/CompileWithArguments-py Python 1 >> "%t"
-// RUN: python3 %S/CompileWithArguments-py Python aloha >> "%t"
-// RUN: %baredafny build %args --unicode-char --no-verify --target:go "%s" >> "%t"
-// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go 2 >> "%t"
-// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go 1 >> "%t"
-// RUN: env GO111MODULE=auto GOPATH=%S/CompileWithArguments-go go run %S/CompileWithArguments-go/src/CompileWithArguments.go Go aloha >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method Main(args: seq<string>) {
-  if |args| != 3 {
-    print "Expected 3 arguments, got ", |args|;
-  } else {
-    print args[1], " says ";
-    if args[2] == "1" {
-      print "hello\n";
-    } else if args[2] == "2" {
-      print "howdy\n";
-    } else {
-      print args[2],"\n";
-    }
-  }
-}
diff --git a/Test/unicodechars/comp/Comprehensions.dfy b/Test/unicodechars/comp/Comprehensions.dfy
deleted file mode 100644
index 8bd5f67525e..00000000000
--- a/Test/unicodechars/comp/Comprehensions.dfy
+++ /dev/null
@@ -1,3 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4108
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:true --verify-included-files
-include "../../comp/Comprehensions.dfy"
diff --git a/Test/unicodechars/comp/Conversions.java b/Test/unicodechars/comp/Conversions.java
deleted file mode 100644
index d79d930f94f..00000000000
--- a/Test/unicodechars/comp/Conversions.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package Util;
-
-public class Conversions {
-    public static String ToJavaString(dafny.DafnySequence<? extends dafny.CodePoint> s) {
-        return s.verbatimString();
-    }
-}
diff --git a/Test/unicodechars/comp/ExternDafnyString.dfy b/Test/unicodechars/comp/ExternDafnyString.dfy
deleted file mode 100644
index 1e9701857a6..00000000000
--- a/Test/unicodechars/comp/ExternDafnyString.dfy
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: %dafny /compile:3 /unicodeChar:1 /compileTarget:java "%s" %S/ExternDafnyString.java > "%t"
-// RUN: %diff "%s.expect" "%t"
-// In this example, the extern method obtains a Java string and returns it as a Dafny string.
-
-class {:extern "java.lang.String"} JavaString {
-  ghost const value: string
-}
-
-method {:extern "dafny.ExternDafnyString", "getStringFromFile"} GetStringFromFile() returns (s: string)
-
-method Main() {
-  var s := GetStringFromFile();
-
-  var previousStart := 0;
-  for i := 0 to |s|
-    invariant previousStart <= i
-  {
-    if s[i] == '/' {
-      print s[previousStart..i], "\n";
-      previousStart := i + 1;
-    }
-  }
-  if previousStart != |s| {
-    print s[previousStart..], "\n";
-  }
-}
diff --git a/Test/unicodechars/comp/ExternDafnyString.java b/Test/unicodechars/comp/ExternDafnyString.java
deleted file mode 100644
index 01cba068068..00000000000
--- a/Test/unicodechars/comp/ExternDafnyString.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package dafny;
-
-public class ExternDafnyString {
-    public static dafny.DafnySequence<? extends CodePoint> getStringFromFile() {
-        // Let's pretend the following is read from a file:
-        String js = "this is some possible / text that / may have come from a file";
-        // Convert this Java string to a Dafny string before returning:
-        return dafny.DafnySequence.asUnicodeString(js);
-    }
-}
diff --git a/Test/unicodechars/comp/ExternJavaString.dfy b/Test/unicodechars/comp/ExternJavaString.dfy
deleted file mode 100644
index 5fb7bd9adb1..00000000000
--- a/Test/unicodechars/comp/ExternJavaString.dfy
+++ /dev/null
@@ -1,37 +0,0 @@
-// RUN: %dafny /compile:3 /unicodeChar:1 /compileTarget:java "%s" %S/Conversions.java %S/ExternJavaString.java > "%t"
-// RUN: %diff "%s.expect" "%t"
-// In this example, the extern method obtains a Java string and returns it as such.
-// The Dafny code converts that Java string to a Dafny string.
-
-class {:extern "java.lang.String"} JavaString {
-  ghost const value: string
-}
-
-// Note, the following has to be a method, not a function, because the reference it
-// returns is not determined functionally from the input argument.
-method {:extern "Util.Conversions", "ToJavaString"} ToJavaString(s: string) returns (js: JavaString)
-  ensures js.value == s
-
-// The conversion this way can be a function.
-function {:extern "dafny.DafnySequence", "asUnicodeString"} ToDafnyString(js: JavaString): string
-  ensures ToDafnyString(js) == js.value
-
-method {:extern "dafny.ExternJavaString", "getStringFromFile"} GetStringFromFile() returns (js: JavaString)
-
-method Main() {
-  var js := GetStringFromFile();
-  var s := ToDafnyString(js);
-
-  var previousStart := 0;
-  for i := 0 to |s|
-    invariant previousStart <= i
-  {
-    if s[i] == '/' {
-      print s[previousStart..i], "\n";
-      previousStart := i + 1;
-    }
-  }
-  if previousStart != |s| {
-    print s[previousStart..], "\n";
-  }
-}
diff --git a/Test/unicodechars/comp/NativeNumbers.dfy b/Test/unicodechars/comp/NativeNumbers.dfy
deleted file mode 100644
index 20cdb1e214f..00000000000
--- a/Test/unicodechars/comp/NativeNumbers.dfy
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --spill-translation --unicode-char:true --verify-included-files
-// Skip JavaScript because JavaScript doesn't have the same native types
-
-include "../../comp/NativeNumbers.dfy"
diff --git a/Test/unicodechars/comp/Numbers.dfy b/Test/unicodechars/comp/Numbers.dfy
deleted file mode 100644
index 5ea33ecaaea..00000000000
--- a/Test/unicodechars/comp/Numbers.dfy
+++ /dev/null
@@ -1,3 +0,0 @@
-// NONUNIFORM: https://github.com/dafny-lang/dafny/issues/4174
-// RUN: %testDafnyForEachCompiler "%s" -- --relax-definite-assignment --unicode-char:true --verify-included-files
-include "../../comp/Numbers.dfy"
diff --git a/Test/unicodechars/comp/Numbers.dfy.expect b/Test/unicodechars/comp/Numbers.dfy.expect
deleted file mode 100644
index d4a6c55164c..00000000000
--- a/Test/unicodechars/comp/Numbers.dfy.expect
+++ /dev/null
@@ -1,122 +0,0 @@
-0
-0
-3
--5
-2147483647 (aka C# int.MaxValue)
-2147483648 (aka 2^31)
-2147483649
-4294967295 (aka C# uint.MaxValue)
-4294967296 (aka 2^32)
-9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
-9007199254740992 (aka 2^53)
--9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
--9007199254740992
-9223372036854775807 (aka C# long.MaxValue)
-9223372036854775808 (aka 2^63)
-9223372036854775809
-18446744073709551615 (aka C# ulong.MaxValue)
-18446744073709551616 (aka 2^64)
-1267650600228229401496703205376 (aka 2^100)
-170141183460469231731687303715884105727 (aka M_39)
-0.0
-0.0
-3.0
--5.0
-3.14
--2.71
-1000000000.0 (aka a billion)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
-0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
-35 27 -27
-124 -124
--124 124
-'g' 'Q' '2'
-7 3 31
--8 1 -31
--7 3 31
-8 1 -31
-0 0 0
-0 0 0
-uint8:  10:1 0:231
-uint16: 2848:7 0:65511
-uint32: 186737707:10 0:4294967271
-uint64: 802032351030850069:4 0:18446744073709551591
-via real: 7:12 -8:1 -7:12 8:1
-int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
-int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
-int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-0.2
-35.2 27.2 -27.2
-124.8 -124.8
--124.8 124.8
-7.800 31.200
--7.800 -31.200
--7.800 31.200
-7.800 -31.200
-0.0 0.0 0.0 
-120.0 120.0 (24.0 / 3.0) (-24.0 / 3.0) 
-123.4567 -123.4567 0.1234 -0.1234 (24.0 / 30.0) 
-0.2 0.02 0.00002 
--0.2 -0.02 -0.00002 
-(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
-0.0 0.0 0.81 0.81 (8100.0 / 8100.0)
-true false
-0 2 2 2
-0 3 6 46
-0 1 36 2116
-0 0 0 0
-29 2 2 4294967283 2
-29 2 2 9007199254740979 2
-0 0 0 9
-0 0 0 9
-0 0 0 9
-0 4294967295 1267650600228229401496703205375 6
-8 4
-18 72 4
-0
-200 300
-100 100 18
-2
--2
--2
-2
-0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
-1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
-42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
-int:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-NativeType:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-120 120.0 120 120 120 'x'
-120 120.0 120 120 120 'x'
-120 120
-120 120.0 120 120 120 'x'
-120 120.0 120 120 120 'x'
-120 120
-false true false true
-true false true false
-false true false true
-true false true false
-20 23 23 88 880
-62.1 62.2 62.3
--3 -3 -3
-82 0 -3 -33
-82 0 82 0
-715827880 0 -3 -33
-1431655762 0 1431655762 0
-98382635059784275282 0 98382635059784275282 0
-1 7 7 1 127 127
-1 2 0 1
-1 2 0 1
-1 2 0 1
diff --git a/Test/unicodechars/comp/Numbers.dfy.go.expect b/Test/unicodechars/comp/Numbers.dfy.go.expect
deleted file mode 100644
index c1c7ffa393c..00000000000
--- a/Test/unicodechars/comp/Numbers.dfy.go.expect
+++ /dev/null
@@ -1,122 +0,0 @@
-0
-0
-3
--5
-2147483647 (aka C# int.MaxValue)
-2147483648 (aka 2^31)
-2147483649
-4294967295 (aka C# uint.MaxValue)
-4294967296 (aka 2^32)
-9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
-9007199254740992 (aka 2^53)
--9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
--9007199254740992
-9223372036854775807 (aka C# long.MaxValue)
-9223372036854775808 (aka 2^63)
-9223372036854775809
-18446744073709551615 (aka C# ulong.MaxValue)
-18446744073709551616 (aka 2^64)
-1267650600228229401496703205376 (aka 2^100)
-170141183460469231731687303715884105727 (aka M_39)
-0.0
-0.0
-3.0
--5.0
-3.14
--2.71
-1000000000.0 (aka a billion)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
-0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
-35 27 -27
-124 -124
--124 124
-'g' 'Q' '2'
-7 3 31
--8 1 -31
--7 3 31
-8 1 -31
-0 0 0
-0 0 0
-uint8:  10:1 0:231
-uint16: 2848:7 0:65511
-uint32: 186737707:10 0:4294967271
-uint64: 802032351030850069:4 0:18446744073709551591
-via real: 7:12 -8:1 -7:12 8:1
-int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
-int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
-int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-0.2
-35.2 27.2 -27.2
-124.8 -124.8
--124.8 124.8
-7.8 31.2
--7.8 -31.2
--7.8 31.2
-7.8 -31.2
-0.0 0.0 0.0 
-120.0 120.0 8.0 -8.0 
-123.4567 -123.4567 0.1234 -0.1234 0.8 
-0.2 0.02 0.00002 
--0.2 -0.02 -0.00002 
-(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
-0.0 0.0 0.81 0.81 1.0
-true false
-0 2 2 2
-0 3 6 46
-0 1 36 2116
-0 0 0 0
-29 2 2 4294967283 2
-29 2 2 9007199254740979 2
-0 0 0 9
-0 0 0 9
-0 0 0 9
-0 4294967295 1267650600228229401496703205375 6
-8 4
-18 72 4
-0
-200 300
-100 100 18
-2
--2
--2
-2
-0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
-1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
-42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
-int:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-NativeType:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-120 120.0 120 120 120 'x'
-120 120.0 120 120 120 'x'
-120 120
-120 120.0 120 120 120 'x'
-120 120.0 120 120 120 'x'
-120 120
-false true false true
-true false true false
-false true false true
-true false true false
-20 23 23 88 880
-62.1 62.2 62.3
--3 -3 -3
-82 0 -3 -33
-82 0 82 0
-715827880 0 -3 -33
-1431655762 0 1431655762 0
-98382635059784275282 0 98382635059784275282 0
-1 7 7 1 127 127
-1 2 0 1
-1 2 0 1
-1 2 0 1
diff --git a/Test/unicodechars/comp/Numbers.dfy.py.expect b/Test/unicodechars/comp/Numbers.dfy.py.expect
deleted file mode 100644
index c1c7ffa393c..00000000000
--- a/Test/unicodechars/comp/Numbers.dfy.py.expect
+++ /dev/null
@@ -1,122 +0,0 @@
-0
-0
-3
--5
-2147483647 (aka C# int.MaxValue)
-2147483648 (aka 2^31)
-2147483649
-4294967295 (aka C# uint.MaxValue)
-4294967296 (aka 2^32)
-9007199254740991 (aka JavaScript Number.MAX_SAFE_INTEGER)
-9007199254740992 (aka 2^53)
--9007199254740991 (aka JavaScript Number.MIN_SAFE_INTEGER)
--9007199254740992
-9223372036854775807 (aka C# long.MaxValue)
-9223372036854775808 (aka 2^63)
-9223372036854775809
-18446744073709551615 (aka C# ulong.MaxValue)
-18446744073709551616 (aka 2^64)
-1267650600228229401496703205376 (aka 2^100)
-170141183460469231731687303715884105727 (aka M_39)
-0.0
-0.0
-3.0
--5.0
-3.14
--2.71
-1000000000.0 (aka a billion)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-0.0000000000667408 (aka G)
-17014118346046923173168730371588410572.7 (aka 1/10 of M_39)
-0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001 (aka 1/googol)
-35 27 -27
-124 -124
--124 124
-'g' 'Q' '2'
-7 3 31
--8 1 -31
--7 3 31
-8 1 -31
-0 0 0
-0 0 0
-uint8:  10:1 0:231
-uint16: 2848:7 0:65511
-uint32: 186737707:10 0:4294967271
-uint64: 802032351030850069:4 0:18446744073709551591
-via real: 7:12 -8:1 -7:12 8:1
-int:      7:12 -8:1 -7:12 8:1 -12:0 12:0
-int8:     7:12 -8:1 -7:12 8:1 -12:0 12:0
-int16:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int32:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-int64:    7:12 -8:1 -7:12 8:1 -12:0 12:0
-0.2
-35.2 27.2 -27.2
-124.8 -124.8
--124.8 124.8
-7.8 31.2
--7.8 -31.2
--7.8 31.2
-7.8 -31.2
-0.0 0.0 0.0 
-120.0 120.0 8.0 -8.0 
-123.4567 -123.4567 0.1234 -0.1234 0.8 
-0.2 0.02 0.00002 
--0.2 -0.02 -0.00002 
-(20.0 / 3.0) (-20.0 / 3.0) (-20.0 / 3.0) (20.0 / 3.0) 
-0.0 0.0 0.81 0.81 1.0
-true false
-0 2 2 2
-0 3 6 46
-0 1 36 2116
-0 0 0 0
-29 2 2 4294967283 2
-29 2 2 9007199254740979 2
-0 0 0 9
-0 0 0 9
-0 0 0 9
-0 4294967295 1267650600228229401496703205375 6
-8 4
-18 72 4
-0
-200 300
-100 100 18
-2
--2
--2
-2
-0: IsNat: true, Offset: 0, IsLimit: true, IsSucc: false
-1: IsNat: true, Offset: 1, IsLimit: false, IsSucc: true
-42: IsNat: true, Offset: 42, IsLimit: false, IsSucc: true
-int:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-NativeType:
--42	 <0 Y <=0 Y ==0 N !=0 Y >0 N >=0 N 0< N 0<= N 0== N 0!= Y 0> Y 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-0	 <0 N <=0 Y ==0 Y !=0 N >0 N >=0 Y 0< N 0<= Y 0== Y 0!= N 0> N 0>= Y
-23	 <0 N <=0 N ==0 N !=0 Y >0 Y >=0 Y 0< Y 0<= Y 0== N 0!= Y 0> N 0>= N
-120 120.0 120 120 120 'x'
-120 120.0 120 120 120 'x'
-120 120
-120 120.0 120 120 120 'x'
-120 120.0 120 120 120 'x'
-120 120
-false true false true
-true false true false
-false true false true
-true false true false
-20 23 23 88 880
-62.1 62.2 62.3
--3 -3 -3
-82 0 -3 -33
-82 0 82 0
-715827880 0 -3 -33
-1431655762 0 1431655762 0
-98382635059784275282 0 98382635059784275282 0
-1 7 7 1 127 127
-1 2 0 1
-1 2 0 1
-1 2 0 1
diff --git a/Test/unicodechars/dafny0/Char.dfy b/Test/unicodechars/dafny0/Char.dfy
deleted file mode 100644
index 7528e45d621..00000000000
--- a/Test/unicodechars/dafny0/Char.dfy
+++ /dev/null
@@ -1,117 +0,0 @@
-// RUN: %exits-with 4 %dafny /deprecation:0 /compile:0 /unicodeChar:1 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-class CharChar {
-  var c: char;
-  var d: char;
-
-  method Order()
-    modifies this;
-    ensures c <= d;
-  {
-    if d < c {
-      c, d := d, c;
-    }
-  }
-
-  ghost function Recurse(ch: char): bool
-    reads this;
-  {
-    if c < ch then Recurse(c)
-    else if d < ch then Recurse(d)
-    else ch == ' '
-  }
-
-  ghost function MinChar(s: string): char
-    requires s != "";
-  {
-    var ch := s[0];
-    if |s| == 1 then ch else
-    var m := MinChar(s[1..]);
-    if m < ch then m else ch
-  }
-  lemma MinCharLemma(s: string)
-    requires |s| != 0;
-    ensures forall i :: 0 <= i < |s| ==> MinChar(s) <= s[i];
-  {
-    if 2 <= |s| {
-      var m := MinChar(s[1..]);
-      assert forall i :: 1 <= i < |s| ==> m <= s[1..][i-1] == s[i];
-    }
-  }
-
-  method CharEq(s: string) {
-    if "hello Dafny" <= s {
-      assert s[6] == 'D';
-      assert s[7] == '\U{61}';
-      if * {
-        assert s[9] == '\n';  // error
-      } else if * {
-        assert s[1] < s[2] <= s[3];
-      } else {
-        assert s[0] <= s[5];  // error
-      }
-    }
-  }
-  method CharInbetween(ch: char)
-    requires 'B' < ch;
-  {
-    if ch < 'D' {
-      assert 'C' <= ch <= 'C';
-      assert ch == 'C';
-    } else {
-      assert ch <= 'M';  // error
-    }
-  }
-}
-
-// arithmetic with char's
-
-ghost function toLower(ch: char): char
-{
-  if 'A' <= ch <= 'Z' then
-    ch - 'A' + 'a'
-  else
-    ch
-}
-
-ghost function BadToLower_Overflow(ch: char): char
-{
-  if 'A' <= ch then
-    ch - 'A' + 'a'  // error: possible overflow
-  else
-    ch
-}
-
-ghost function BadToLower_Underflow(ch: char): char
-{
-  if ch <= 'Z' then
-    ch - 'A' + 'a'  // error: possible underflow
-  else
-    ch
-}
-
-ghost function BadToLower_OverflowIntoSurrogateRange(ch: char): char
-{
-  if 'A' <= ch <= '\U{D7FF}' then
-    ch - 'A' + 'a'  // error: possible overflow
-  else
-    ch
-}
-
-ghost function BadToLower_UnderflowIntoSurrogateRange(ch: char): char
-{
-  if '\U{E000}' <= ch <= '\U{1_0000}' then
-    ch - 'A' + 'a'  // error: possible underflow
-  else
-    ch
-}
-
-lemma AboutChar(ch: char, dh: char)
-  requires 'r' < dh < '\U{abcd}'
-  ensures ch == ch + '\0' == ch - '\0'
-  ensures dh - '\U{20}' < dh
-  ensures dh + '\U{20}' > dh
-  ensures '\n' + dh == dh + '\n'
-{
-}
diff --git a/Test/unicodechars/dafny0/Char.dfy.expect b/Test/unicodechars/dafny0/Char.dfy.expect
deleted file mode 100644
index 857d7c0bd70..00000000000
--- a/Test/unicodechars/dafny0/Char.dfy.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-Char.dfy(81,7): Error: char subtraction might underflow
-Char.dfy(81,13): Error: char addition might overflow
-Char.dfy(89,7): Error: char subtraction might underflow
-Char.dfy(97,13): Error: char addition might overflow
-Char.dfy(105,7): Error: char subtraction might underflow
-Char.dfy(48,20): Error: assertion could not be proved
-Char.dfy(52,20): Error: assertion could not be proved
-Char.dfy(63,16): Error: assertion could not be proved
-
-Dafny program verifier finished with 8 verified, 8 errors
diff --git a/Test/unicodechars/expectations/Expect.dfy b/Test/unicodechars/expectations/Expect.dfy
deleted file mode 100644
index 009d13ef948..00000000000
--- a/Test/unicodechars/expectations/Expect.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: ! %baredafny run --target=cs --unicode-char %args "%s" > "%t"
-// RUN: ! %baredafny run --target=go --unicode-char %args "%s" >> "%t"
-// RUN: ! %baredafny run --target=java --unicode-char %args "%s" >> "%t"
-// RUN: ! %baredafny run --target=js --unicode-char %args "%s" >> "%t"
-// RUN: ! %baredafny run --target=py --unicode-char %args "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-include "../../expectations/Expect.dfy"
diff --git a/Test/unicodechars/expectations/ExpectAndExceptions.dfy b/Test/unicodechars/expectations/ExpectAndExceptions.dfy
deleted file mode 100644
index 1884d82b732..00000000000
--- a/Test/unicodechars/expectations/ExpectAndExceptions.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: ! %dafny /compile:3 /compileTarget:cs /unicodeChar:1 "%s" > "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:go /unicodeChar:1 "%s" >> "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:java /unicodeChar:1 "%s" >> "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:js /unicodeChar:1 "%s" >> "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:py /unicodeChar:1 "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-include "../../expectations/ExpectAndExceptions.dfy"
diff --git a/Test/unicodechars/expectations/ExpectAndExceptions.dfy.expect b/Test/unicodechars/expectations/ExpectAndExceptions.dfy.expect
deleted file mode 100644
index e169d362395..00000000000
--- a/Test/unicodechars/expectations/ExpectAndExceptions.dfy.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Dafny program verifier finished with 0 verified, 0 errors
-[Program halted] ExpectAndExceptions.dfy(17,19): NatOutcome.NatFailure("Kaboom!")
-
-Dafny program verifier finished with 0 verified, 0 errors
-[Program halted] ExpectAndExceptions.dfy(17,19): NatOutcome.NatFailure("Kaboom!")
-
-Dafny program verifier finished with 0 verified, 0 errors
-[Program halted] ExpectAndExceptions.dfy(17,19): NatOutcome.NatFailure("Kaboom!")
-
-Dafny program verifier finished with 0 verified, 0 errors
-[Program halted] ExpectAndExceptions.dfy(17,19): NatOutcome.NatFailure("Kaboom!")
-
-Dafny program verifier finished with 0 verified, 0 errors
-[Program halted] ExpectAndExceptions.dfy(17,19): NatOutcome.NatFailure("Kaboom!")
diff --git a/Test/unicodechars/expectations/ExpectWithMessage.dfy b/Test/unicodechars/expectations/ExpectWithMessage.dfy
deleted file mode 100644
index 6d7f6d06464..00000000000
--- a/Test/unicodechars/expectations/ExpectWithMessage.dfy
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: ! %dafny /compile:3 /compileTarget:cs /unicodeChar:1 "%s" > "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:go /unicodeChar:1 "%s" >> "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:java /unicodeChar:1 "%s" >> "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:js /unicodeChar:1 "%s" >> "%t"
-// RUN: ! %dafny /compile:3 /compileTarget:py /unicodeChar:1 "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-include "../../expectations/ExpectWithMessage.dfy"
diff --git a/Test/unicodechars/expectations/ExpectWithNonStringMessage.dfy b/Test/unicodechars/expectations/ExpectWithNonStringMessage.dfy
deleted file mode 100644
index eb3ab3068fe..00000000000
--- a/Test/unicodechars/expectations/ExpectWithNonStringMessage.dfy
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %dafny /compile:0 /verifyAllModules "%s" > "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:cs /unicodeChar:1 "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:go /unicodeChar:1 "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:java /unicodeChar:1 "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:js /unicodeChar:1 "%s" >> "%t"
-// RUN: ! %dafny /noVerify /compile:4 /compileTarget:py /unicodeChar:1 "%s" >> "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// Note this is one good example of printing regressing with /unicodeChar:1
-// in the name of simpler and more consistent semantics.
-
-include "../../expectations/ExpectWithNonStringMessage.dfy"
diff --git a/Test/unicodechars/git-issues/github-issue-2928.dfy b/Test/unicodechars/git-issues/github-issue-2928.dfy
deleted file mode 100644
index 414164a8fe2..00000000000
--- a/Test/unicodechars/git-issues/github-issue-2928.dfy
+++ /dev/null
@@ -1,3 +0,0 @@
-// RUN: %testDafnyForEachCompiler %s -- --unicode-char
-
-include "../../git-issues/github-issue-2928.dfy"
diff --git a/Test/verification/filter.dfy b/Test/verification/filter.dfy
deleted file mode 100644
index 698ca39ed04..00000000000
--- a/Test/verification/filter.dfy
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %baredafny verify %args --boogie-filter='*Succeeds*' --bprint:"%t.bpl" %s > %t
-// RUN: ! %baredafny verify %args %s >> %t
-// RUN: %diff "%s.expect" "%t"
-
-method Succeeds()
-  ensures true {
-}
-
-method Fails() 
-  ensures false {
-}
diff --git a/Test/verification/filter.dfy.expect b/Test/verification/filter.dfy.expect
deleted file mode 100644
index b2fd7799fda..00000000000
--- a/Test/verification/filter.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Dafny program verifier finished with 1 verified, 0 errors
-filter.dfy(10,16): Error: a postcondition could not be proved on this return path
-filter.dfy(10,10): Related location: this is the postcondition that could not be proved
-
-Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/vstte2012/BreadthFirstSearch.dfy.expect b/Test/vstte2012/BreadthFirstSearch.dfy.expect
deleted file mode 100644
index 66ffe3665d5..00000000000
--- a/Test/vstte2012/BreadthFirstSearch.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 14 verified, 0 errors
diff --git a/Test/vstte2012/Combinators.dfy.expect b/Test/vstte2012/Combinators.dfy.expect
deleted file mode 100644
index 25822a5c6cc..00000000000
--- a/Test/vstte2012/Combinators.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 24 verified, 0 errors
diff --git a/Test/vstte2012/Tree.dfy.expect b/Test/vstte2012/Tree.dfy.expect
deleted file mode 100644
index ccc01c35f48..00000000000
--- a/Test/vstte2012/Tree.dfy.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Dafny program verifier finished with 11 verified, 0 errors
diff --git a/Test/wishlist/FuelTriggers.dfy b/Test/wishlist/FuelTriggers.dfy
deleted file mode 100755
index d81cce244b8..00000000000
--- a/Test/wishlist/FuelTriggers.dfy
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-// XFAIL: *
-
-// With the default version of opaque + fuel, the following fails to verify
-// because the quantifier in the requires used a trigger that included
-// StartFuel_P, while the assert used StartFuelAssert_P.  Since P is
-// opaque, we can't tell that those fuels are the same, and hence the
-// trigger never fires. A wish would be to fix this.
-
-ghost predicate {:opaque} P(x:int)
-
-method test(y:int)
-  requires forall x :: P(x)
-{
-  assert P(y);
-}
diff --git a/Test/wishlist/FunctionEquality.dfy.expect b/Test/wishlist/FunctionEquality.dfy.expect
deleted file mode 100644
index 8ee52b6fff1..00000000000
--- a/Test/wishlist/FunctionEquality.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-FunctionEquality.dfy(11,17): Error: assertion could not be proved
-FunctionEquality.dfy(13,26): Error: assertion could not be proved
-FunctionEquality.dfy(15,26): Error: assertion could not be proved
-FunctionEquality.dfy(19,13): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 4 errors
diff --git a/Test/wishlist/exists-b-exists-not-b.dfy b/Test/wishlist/exists-b-exists-not-b.dfy
deleted file mode 100644
index 6bab0e3c8ac..00000000000
--- a/Test/wishlist/exists-b-exists-not-b.dfy
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// It would be great if Dafny was able to verify the following statements;
-// otherwise, trigger splitting prevents `exists b :: b || not b` from verifying
-
-method M() {
-  assert exists b : bool {:nowarn} :: b; // WISH
-  assert exists b : bool {:nowarn} :: !b; // WISH
-}
diff --git a/Test/wishlist/exists-b-exists-not-b.dfy.expect b/Test/wishlist/exists-b-exists-not-b.dfy.expect
deleted file mode 100644
index b30e927a5ef..00000000000
--- a/Test/wishlist/exists-b-exists-not-b.dfy.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-exists-b-exists-not-b.dfy(8,9): Error: assertion could not be proved
-exists-b-exists-not-b.dfy(9,9): Error: assertion could not be proved
-
-Dafny program verifier finished with 0 verified, 2 errors
diff --git a/Test/wishlist/granted/strings.dfy b/Test/wishlist/granted/strings.dfy
deleted file mode 100644
index c6ea70cf370..00000000000
--- a/Test/wishlist/granted/strings.dfy
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method EqualityOfStrings() {
-  assert "a" != "b"; // WISH -- granted
-}
diff --git a/Test/wishlist/granted/useless-casts-in-decreases-clauses.dfy b/Test/wishlist/granted/useless-casts-in-decreases-clauses.dfy
deleted file mode 100644
index bf1d8bae4de..00000000000
--- a/Test/wishlist/granted/useless-casts-in-decreases-clauses.dfy
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-method M() {
-  var pos := 10;
-  while (pos > 0) { // This shouldn't print int(pos) - int(0); pos - 0 would be better
-    pos := pos - 1;
-  }
-}
diff --git a/Test/wishlist/naked-function-in-recursive-setting.dfy b/Test/wishlist/naked-function-in-recursive-setting.dfy
deleted file mode 100644
index 7ff768d24cd..00000000000
--- a/Test/wishlist/naked-function-in-recursive-setting.dfy
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-ghost function fact(n: int): int
-  requires n >= 0
-{
-  if n == 0 then
-    1
-  else (
-    assert fact.requires(n-1); //WISH
-    n * fact(n-1)
-  )
-}
diff --git a/Test/wishlist/naked-function-in-recursive-setting.dfy.expect b/Test/wishlist/naked-function-in-recursive-setting.dfy.expect
deleted file mode 100644
index 7517f0bf9b2..00000000000
--- a/Test/wishlist/naked-function-in-recursive-setting.dfy.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-naked-function-in-recursive-setting.dfy(4,15): Info: auto-accumulator tail recursive
-naked-function-in-recursive-setting.dfy(4,15): Info: decreases n
-naked-function-in-recursive-setting.dfy(10,11): Error: cannot use naked function in recursive setting. Possible solution: eta expansion.
-
-Dafny program verifier finished with 0 verified, 1 error
diff --git a/Test/wishlist/sequences-literals.dfy.expect b/Test/wishlist/sequences-literals.dfy.expect
deleted file mode 100644
index 4815416758f..00000000000
--- a/Test/wishlist/sequences-literals.dfy.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-sequences-literals.dfy(23,9): Error: assertion could not be proved
-sequences-literals.dfy(44,11): Error: assertion could not be proved
-sequences-literals.dfy(61,9): Error: assertion could not be proved
-sequences-literals.dfy(76,9): Error: assertion could not be proved
-
-Dafny program verifier finished with 4 verified, 4 errors
diff --git a/Test/wishlist/sequences-s0-in-s.dfy b/Test/wishlist/sequences-s0-in-s.dfy
deleted file mode 100644
index 34b59c2d11c..00000000000
--- a/Test/wishlist/sequences-s0-in-s.dfy
+++ /dev/null
@@ -1,25 +0,0 @@
-// RUN: %exits-with 4 %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" "%s" > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// The following is also due to a weakness in the axiomatization: namely, it is
-// not easy to learn, using Dafny's axioms, that s[0] in s. One can of course
-// prove it, but it doesn't come for free.
-
-method InSeqTriggers(s: seq<int>, i: nat)
-  requires forall x :: x in s ==> x > 0
-  requires |s| > 0 {
-    if * {
-      // Fails
-      assert s[0] > 0; // WISH
-    } else if * {
-      // Works
-      assert s[0] in s;
-      assert s[0] > 0;
-    }
-}
-
-method InSeqNoAutoTriggers(s: seq<int>, i: nat)
-  requires forall x {:autotriggers false} :: x in s ==> x > 0
-  requires |s| > 0 {
-    assert s[0] > 0; // Works (Z3 matches on $Box above)
-}
diff --git a/Test/wishlist/sequences-s0-in-s.dfy.expect b/Test/wishlist/sequences-s0-in-s.dfy.expect
deleted file mode 100644
index f2d114818b0..00000000000
--- a/Test/wishlist/sequences-s0-in-s.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-sequences-s0-in-s.dfy(13,18): Error: assertion could not be proved
-
-Dafny program verifier finished with 1 verified, 1 error
diff --git a/Test/wishlist/we-should-always-print-tooltips.dfy b/Test/wishlist/we-should-always-print-tooltips.dfy
deleted file mode 100644
index 50540907a10..00000000000
--- a/Test/wishlist/we-should-always-print-tooltips.dfy
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: %dafny /compile:0 /print:"%t.print" /dprint:"%t.dprint" /printTooltips %S/we-should-always-print-tooltips.dfy > "%t"
-// RUN: %diff "%s.expect" "%t"
-
-// WISH it would be great to add /printTooltips to all tests
diff --git a/Test/wishlist/we-should-always-print-tooltips.dfy.expect b/Test/wishlist/we-should-always-print-tooltips.dfy.expect
deleted file mode 100644
index 68b2626158c..00000000000
--- a/Test/wishlist/we-should-always-print-tooltips.dfy.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-we-should-always-print-tooltips.dfy(1,0): Warning: File contains no code
-
-Dafny program verifier finished with 0 verified, 0 errors
diff --git a/customBoogie.patch b/customBoogie.patch
index 22f8535f3ea..d1ce3d699e2 100644
--- a/customBoogie.patch
+++ b/customBoogie.patch
@@ -4,7 +4,7 @@ index 426b132e2..18db4aebb 100644
 +++ b/Source/Dafny.sln
 @@ -43,6 +43,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoExtern.Test", "AutoExte
  EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DafnyCore.Test", "DafnyCore.Test\DafnyCore.Test.csproj", "{33C29F26-A27B-474D-B436-83EA615B09FC}"
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scripts", "Scripts\Scripts.csproj", "{3FAB051A-1745-497B-B4C0-D49194BB5D32}"
  EndProject
 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boogie", "Boogie", "{60332269-9C5D-465E-8582-01F9B738BD90}"
 +EndProject
@@ -57,12 +57,22 @@ diff --git a/Source/DafnyCore/DafnyCore.csproj b/Source/DafnyCore/DafnyCore.cspr
 index 4a8b2f89b..a308be9bf 100644
 --- a/Source/DafnyCore/DafnyCore.csproj
 +++ b/Source/DafnyCore/DafnyCore.csproj
-@@ -31,7 +31,7 @@
+@@ -33,5 +33,15 @@
        <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
        <PackageReference Include="System.Runtime.Numerics" Version="4.3.0" />
-       <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
--      <PackageReference Include="Boogie.ExecutionEngine" Version="3.0.0" />
+       <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
+-      <PackageReference Include="Boogie.ExecutionEngine" Version="3.4.3" />
 +      <ProjectReference Include="..\..\boogie\Source\ExecutionEngine\ExecutionEngine.csproj" />
-       <PackageReference Include="Tomlyn" Version="0.16.2" />
++      <ProjectReference Include="..\..\boogie\Source\BaseTypes\BaseTypes.csproj" />
++      <ProjectReference Include="..\..\boogie\Source\Core\Core.csproj" />
++      <ProjectReference Include="..\..\boogie\Source\Graph\Graph.csproj" />
++      <ProjectReference Include="..\..\boogie\Source\Model\Model.csproj" />
++      <ProjectReference Include="..\..\boogie\Source\CodeContractsExtender\CodeContractsExtender.csproj" />
++      <ProjectReference Include="..\..\boogie\Source\VCExpr\VCExpr.csproj" />
++      <ProjectReference Include="..\..\boogie\Source\VCGeneration\VCGeneration.csproj" />
++      <ProjectReference Include="..\..\boogie\Source\Provers\SMTLib\SMTLib.csproj" />
++      <ProjectReference Include="..\..\boogie\Source\Houdini\Houdini.csproj" />
++      <ProjectReference Include="..\..\boogie\Source\Concurrency\Concurrency.csproj" />
+       <PackageReference Include="Tomlyn" Version="0.17.0" />
    </ItemGroup>
  
diff --git a/docs/Compilation/AutoInitialization.md b/docs/Compilation/AutoInitialization.md
index 6c6b69dbf58..48eaabf3e41 100644
--- a/docs/Compilation/AutoInitialization.md
+++ b/docs/Compilation/AutoInitialization.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Automatic Initialization of Variables
+---
 
 Automatic Initialization of Variables
 =====================================
diff --git a/docs/Compilation/Boogie.md b/docs/Compilation/Boogie.md
index 2ba8d85debe..b219dba84e2 100644
--- a/docs/Compilation/Boogie.md
+++ b/docs/Compilation/Boogie.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Dafny compilation to Boogie
+---
 
 # Dafny compilation to Boogie
 
diff --git a/docs/Compilation/Go.md b/docs/Compilation/Go.md
index 0df9c7a0c87..5b254c1353b 100644
--- a/docs/Compilation/Go.md
+++ b/docs/Compilation/Go.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Dafny compilation to Go
+---
 
 Dafny compilation to Go
 =======================
diff --git a/docs/Compilation/ReferenceTypes.md b/docs/Compilation/ReferenceTypes.md
index d085facb7a7..ee15aa31841 100644
--- a/docs/Compilation/ReferenceTypes.md
+++ b/docs/Compilation/ReferenceTypes.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Dafny compilation of trait and class
+---
 
 Dafny compilation of trait and class
 ====================================
diff --git a/docs/Compilation/StringsAndChars.md b/docs/Compilation/StringsAndChars.md
index be404658f2a..30b671f5679 100644
--- a/docs/Compilation/StringsAndChars.md
+++ b/docs/Compilation/StringsAndChars.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Strings and Characters
+---
 
 # Strings and Characters
 
diff --git a/docs/DafnyRef/Attributes.1.expect b/docs/DafnyRef/Attributes.1.expect
index d0c9ed9455e..b7ceee8a4e3 100644
--- a/docs/DafnyRef/Attributes.1.expect
+++ b/docs/DafnyRef/Attributes.1.expect
@@ -1,2 +1,2 @@
-text.dfy(2,29): Error: Dafny's heuristics failed to confirm 'byte' to be a compatible native type.  Hint: try writing a newtype constraint of the form 'i:int | lowerBound <= i < upperBound && (...any additional constraints...)'
+text.dfy(2,29): Error: Dafny's heuristics failed to confirm 'byte' to be a compatible native type. Hint: try writing a newtype constraint of the form 'i: int | lowerBound <= i < upperBound && (...any additional constraints...)'.
 1 resolution/type errors detected in text.dfy
diff --git a/docs/DafnyRef/Attributes.3.expect b/docs/DafnyRef/Attributes.3.expect
index 9d483746053..53d5a6fa3fd 100644
--- a/docs/DafnyRef/Attributes.3.expect
+++ b/docs/DafnyRef/Attributes.3.expect
@@ -1,3 +1,3 @@
-text.dfy(25,14): Error: assertion could not be proved
+text.dfy(25,6): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/Attributes.4.expect b/docs/DafnyRef/Attributes.4.expect
index aeb2662f96c..6abe439773d 100644
--- a/docs/DafnyRef/Attributes.4.expect
+++ b/docs/DafnyRef/Attributes.4.expect
@@ -1,3 +1,3 @@
-text.dfy(1,23): Verification out of resource (f (correctness))
+text.dfy(1,23): Error: Verification out of resource (f)
 
 Dafny program verifier finished with 0 verified, 0 errors, 1 out of resource
diff --git a/docs/DafnyRef/Attributes.md b/docs/DafnyRef/Attributes.md
index 046668032bd..3c25e23a039 100644
--- a/docs/DafnyRef/Attributes.md
+++ b/docs/DafnyRef/Attributes.md
@@ -1,4 +1,5 @@
 # 11. Attributes {#sec-attributes}
+
 Dafny allows many of its entities to be annotated with _Attributes_.
 Attributes are declared between `{:` and `}` like this:
 <!-- %no-check -->
@@ -173,10 +174,12 @@ Dafny does not perform sanity checks on the arguments---it is the user's respons
 
 For more detail on the use of `{:extern}`, see the corresponding [section](#sec-extern-decls) in the user's guide.
 
+### 11.1.5. `{:disableNonlinearArithmetic}` {#sec-disable-nonlinear-arithmetic}
+This attribute only applies to module declarations. It overrides the global option `--disable-nonlinear-arithmetic` for that specific module. The attribute can be given true or false to disable or enable nonlinear arithmetic. When no value is given, the default value is true.
+
 ## 11.2. Attributes on functions and methods
 
 ### 11.2.1. `{:abstemious}`
-
 The `{:abstemious}` attribute is appropriate for functions on codatatypes.
 If appropriate to a function, the attribute can aid in proofs that the function is _productive_.
 See [the section on abstemious functions](#sec-abstemious) for more description.
@@ -218,19 +221,38 @@ function g(y:int, b:bool) : bool
 }
 ```
 
-### 11.2.3. `{:axiom}` {#sec-axiom}
+### 11.2.3. `{:autoRevealDependencies k}` {#sec-autorevealdependencies}
+When setting `--default-function-opacity` to `autoRevealDependencies`, the `{:autoRevealDependencies k}` attribute can be set on methods and functions to make sure that only function dependencies of depth `k` in the call-graph or less are revealed automatically. As special cases, one can also use `{:autoRevealDependencies false}` (or `{:autoRevealDependencies 0}`) to make sure that no dependencies are revealed, and `{:autoRevealDependencies true}` to make sure that all dependencies are revealed automatically.
+
+For example, when the following code is run with `--default-function-opacity` set to `autoRevealDependencies`, the function `p()` should verify and `q()` should not.
+<!-- %no-check -->
+```dafny
+   function t1() : bool { true }
+   
+   function t2() : bool { t1() }
+
+   function {:autoRevealDependencies 1} p() : (r: bool) 
+     ensures r
+   { t1() }
+   
+   function {:autoRevealDependencies 1} q() : (r: bool) 
+     ensures r
+   { t2() }
+```
+
+### 11.2.4. `{:axiom}` {#sec-axiom}
 The `{:axiom}` attribute may be placed on a function or method.
 It means that the post-condition may be assumed to be true
 without proof. In that case also the body of the function or
 method may be omitted.
 
 The `{:axiom}` attribute only prevents Dafny from verifying that the body matches the post-condition.
-Dafny still verifies the well-formedness of pre-conditions, of post-conditions, and of the body if provided.
+Dafny still verifies the [well-formedness](#sec-assertion-batches) of pre-conditions, of post-conditions, and of the body if provided.
 To prevent Dafny from running all these checks, one would use [`{:verify false}`](#sec-verify), which is not recommended.
 
 The compiler will still emit code for an [`{:axiom}`](#sec-axiom), if it is a [`function`, a `method` or a `function by method`](#sec-function-declarations) with a body.
 
-### 11.2.4. `{:compile}`
+### 11.2.5. `{:compile}`
 The `{:compile}` attribute takes a boolean argument. It may be applied to
 any top-level declaration. If that argument is false, then that declaration
 will not be compiled at all.
@@ -238,10 +260,24 @@ The difference with [`{:extern}`](#sec-extern) is that [`{:extern}`](#sec-extern
 will still emit declaration code if necessary,
 whereas `{:compile false}` will just ignore the declaration for compilation purposes.
 
-### 11.2.5. `{:extern <name>}` {#sec-extern-method}
+### 11.2.6. `{:concurrent}`  {#sec-concurrent-attribute}
+The `{:concurrent}` attribute indicates that the compiled code for a function or method
+may be executed concurrently.
+While Dafny is a sequential language and does not support any native concepts for spawning
+or controlling concurrent execution,
+it does support restricting the specification of declarations such that it is safe to execute them concurrently
+using integration with the target language environment.
+
+Currently, the only way to satisfy this requirement is to ensure that the specification
+of the function or method includes the equivalent of `reads {}` and `modifies {}`.
+This ensures that the code does not read or write any shared mutable state,
+although it is free to read and write newly allocated objects.
+
+### 11.2.7. `{:extern <name>}` {#sec-extern-method}
 See [`{:extern <name>}`](#sec-extern).
 
-### 11.2.6. `{:fuel X}` {#sec-fuel}
+### 11.2.8. `{:fuel X}` {#sec-fuel}
+
 The fuel attribute is used to specify how much "fuel" a function should have,
 i.e., how many times the verifier is permitted to unfold its definition.  The
 `{:fuel}` annotation can be added to the function itself, in which
@@ -264,11 +300,11 @@ fewer assert statements), but it may also increase verification time,
 so use it with care.  Setting the fuel to 0,0 is similar to making the
 definition opaque, except when used with all literal arguments.
 
-### 11.2.7. `{:id <string>}`
+### 11.2.9. `{:id <string>}`
 Assign a custom unique ID to a function or a method to be used for verification
 result caching.
 
-### 11.2.8. `{:induction}` {#sec-induction}
+### 11.2.10. `{:induction}` {#sec-induction}
 The `{:induction}` attribute controls the application of
 proof by induction to two contexts. Given a list of
 variables on which induction might be applied, the
@@ -289,13 +325,11 @@ The two contexts are:
 
 The form of the `{:induction}` attribute is one of the following:
 
-* `{:induction}` -- apply induction to all bound variables
+* `{:induction}` or `{:induction true}` -- apply induction to all bound variables
 * `{:induction false}` -- suppress induction, that is, don't apply it to any bound variable
-* `{:induction L}` where `L` is a list consisting entirely of bound variables
+* `{:induction L}` where `L` is a sublist of the bound variables
 -- apply induction to the specified bound variables
-* `{:induction X}` where `X` is anything else -- treat the same as
-`{:induction}`, that is, apply induction to all bound variables. For this
-usage conventionally `X` is `true`.
+* `{:induction X}` where `X` is anything else -- raise an error.
 
 Here is an example of using it on a quantifier expression:
 <!-- %check-verify -->
@@ -318,7 +352,12 @@ lemma Correspondence()
 }
 ```
 
-### 11.2.9. `{:only}` {#sec-only-functions-methods}
+
+### 11.2.11. `{:inductionTrigger}` {#sec-induction-trigger}
+
+Dafny automatically generates triggers for quantified induction hypotheses.  The default selection can be overridden using the `{:inductionTrigger}` attribute, which works like the usual [`{:trigger}` attribute](#sec-trigger).
+
+### 11.2.12. `{:only}` {#sec-only-functions-methods}
 
 `method {:only} X() {}` or `function {:only} X() {}`  temporarily disables the verification of all other non-`{:only}` members, e.g. other functions and methods, in the same file, even if they contain [assertions with `{:only}`](#sec-only).
 
@@ -343,19 +382,9 @@ method TestUnverified() {
 
 `{:only}` can help focusing on a particular member, for example a lemma or a function, as it simply disables the verification of all other lemmas, methods and functions in the same file. It's equivalent to adding [`{:verify false}`](#sec-verify) to all other declarations simulatenously on the same file. Since it's meant to be a temporary construct, it always emits a warning.
 
-### 11.2.10. `{:opaque}` {#sec-opaque}
-
-_This attribute is replaced by the keyword `opaque`; the attribute is deprecated._
-
-Ordinarily, the body of a function is transparent to its users, but
-sometimes it is useful to hide it. If a function `foo` or `bar` is given the
-`{:opaque}` attribute, then Dafny hides the body of the function,
-so that it can only be seen within its recursive clique (if any),
-or if the programmer specifically asks to see it via the statement `reveal foo(), bar();`.
-
 More information about the Boogie implementation of `{:opaque}` is [here](https://github.com/dafny-lang/dafny/blob/master/docs/Compilation/Boogie.md).
 
-### 11.2.11. `{:print}` {#sec-print}
+### 11.2.13. `{:print}` {#sec-print}
 This attribute declares that a method may have print effects,
 that is, it may use `print` statements and may call other methods
 that have print effects. The attribute can be applied to compiled
@@ -365,15 +394,18 @@ allowed to use a `{:print}` attribute only if the overridden method
 does.
 Print effects are enforced only with `--track-print-effects`.
 
-### 11.2.12. `{:priority}`
+### 11.2.14. `{:priority}`
 `{:priority N}` assigns a positive priority 'N' to a method or function to control the order
 in which methods or functions are verified (default: N = 1).
 
-### 11.2.13. `{:rlimit}` {#sec-rlimit}
+### 11.2.15. `{:resource_limit}` and `{:rlimit}` {#sec-rlimit}
+
+`{:resource_limit N}` limits the verifier resource usage to verify the method or function to `N`.
+
+This is the per-method equivalent of the command-line flag `/rlimit:N` or `--resource-limit N`.
+If using [`{:isolate_assertions}`](#sec-isolate_assertions) as well, the limit will be set for each assertion.
 
-`{:rlimit N}` limits the verifier resource usage to verify the method or function at `N * 1000`.
-This is the per-method equivalent of the command-line flag `/rlimit:N`.
-If using [`{:vcs_split_on_every_assert}`](#sec-vcs_split_on_every_assert) as well, the limit will be set for each assertion.
+The attribute `{:rlimit N}` is also available, and limits the verifier resource usage to verify the method or function to `N * 1000`. This version is deprecated, however.
 
 To give orders of magnitude about resource usage, here is a list of examples indicating how many resources are used to verify each method:
 
@@ -395,10 +427,10 @@ To give orders of magnitude about resource usage, here is a list of examples ind
   }
   ```
 
-* 40K total resource usage using [`{:vcs_split_on_every_assert}`](#sec-vcs_split_on_every_assert)
+* 40K total resource usage using [`{:isolate_assertions}`](#sec-isolate_assertions)
 <!-- %check-verify -->
   ```dafny
-  method {:vcs_split_on_every_assert} f(a: bool, b: bool) {
+  method {:isolate_assertions} f(a: bool, b: bool) {
     assert a: (a ==> b) <==> (!b ==> !a);
     assert b: (a ==> b) <==> (!b ==> !a);
     assert c: (a ==> b) <==> (!b ==> !a);
@@ -415,15 +447,15 @@ To give orders of magnitude about resource usage, here is a list of examples ind
 
 Note that, the default solver Z3 tends to overshoot by `7K` to `8K`, so if you put `{:rlimit 20}` in the last example, the total resource usage would be `27K`.
 
-### 11.2.14. `{:selective_checking}`
+### 11.2.16. `{:selective_checking}`
 Turn all assertions into assumptions except for the ones reachable from after the
 assertions marked with the attribute `{:start_checking_here}`.
 Thus, `assume {:start_checking_here} something;` becomes an inverse
 of `assume false;`: the first one disables all verification before
 it, and the second one disables all verification after.
 
-### 11.2.15. `{:tailrecursion}`
-This attribute is used on method declarations. It has a boolean argument.
+### 11.2.17. `{:tailrecursion}`
+This attribute is used on method or function declarations. It has a boolean argument.
 
 If specified with a `false` value, it means the user specifically
 requested no tail recursion, so none is done.
@@ -438,7 +470,81 @@ recursion was explicitly requested.
 * If `{:tailrecursion true}` was specified but the code does not allow it,
 an error message is given.
 
-### 11.2.16. `{:test}` {#sec-test-attribute}
+If you have a stack overflow, it might be that you have
+a function on which automatic attempts of tail recursion
+failed, but for which efficient iteration can be implemented by hand. To do this,
+use a [function by method](#sec-function-by-method) and
+define the loop in the method yourself,
+proving that it implements the function.
+
+Using a function by method to implement recursion can
+be tricky. It usually helps to look at the result of the function
+on two to three iterations, without simplification,
+and see what should be the first computation. For example,
+consider the following tail-recursion implementation:
+
+<!-- %check-verify -->
+```dafny
+datatype Result<V,E> = Success(value: V) | Failure(error: E)
+
+function f(x: int): Result<int, string>
+
+//  {:tailrecursion true}  Not possible here
+function MakeTailRec(
+  obj: seq<int>
+): Result<seq<int>, string>
+{
+  if |obj| == 0 then Success([])
+  else
+    var tail := MakeTailRec(obj[1..]);
+    var r := f(obj[0]);
+    if r.Failure? then
+      Failure(r.error)
+    else if tail.Failure? then
+      tail
+    else
+      Success([r.value] + tail.value)
+} by method {
+  var i: nat := |obj|;
+  var tail := Success([]); // Base case
+  while i != 0
+    decreases i
+    invariant tail == MakeTailRec(obj[i..])
+  {
+    i := i - 1;
+    var r := f(obj[i]);
+    if r.Failure? {
+      tail := Failure(r.error);
+    } else if tail.Success? {
+      tail := Success([r.value] + tail.value);
+    } else {
+    }
+  }
+  return tail;
+}
+```
+
+The rule of thumb to unroll a recursive call into a sequential one
+is to look at how the result would be computed if the operations were not
+simplified. For example, unrolling the function on `[1, 2, 3]` yields the result
+`Success([f(1).value] + ([f(2).value] + ([f(3).value] + [])))`.
+If you had to compute this expression manually, you'd start with
+`([f(3).value] + [])`, then add `[f(2).value]` to the left, then 
+`[f(1).value]`.
+This is why the method loop iterates with the objects
+from the end, and why the intermediate invariants are
+all about proving `tail == MakeTailRec(obj[i..])`, which
+makes verification succeed easily because we replicate
+exactly the behavior of `MakeTailRec`.
+If we were not interested in the first error but the last one,
+a possible optimization would be, on the first error, to finish
+iterate with a ghost loop that is not executed.
+
+Note that the function definition can be changed by computing
+the tail closer to where it's used or switching the order of computing
+`r` and `tail`, but the `by method` body can stay the same.
+
+### 11.2.18. `{:test}` {#sec-test-attribute}
 This attribute indicates the target function or method is meant
 to be executed at runtime in order to test that the program is working as intended.
 
@@ -476,10 +582,10 @@ harness that supplies input arguments but has no inputs of its own and that
 checks any output values, perhaps with `expect` statements. The test harness
 is then the method marked with `{:test}`.
 
-### 11.2.17. `{:timeLimit N}` {#sec-time-limit}
+### 11.2.19. `{:timeLimit N}` {#sec-time-limit}
 Set the time limit for verifying a given function or method.
 
-### 11.2.18. `{:timeLimitMultiplier X}`
+### 11.2.20. `{:timeLimitMultiplier X}`
 This attribute may be placed on a method or function declaration
 and has an integer argument. If `{:timeLimitMultiplier X}` was
 specified a `{:timeLimit Y}` attribute is passed on to Boogie
@@ -487,25 +593,29 @@ where `Y` is `X` times either the default verification time limit
 for a function or method, or times the value specified by the
 Boogie `-timeLimit` command-line option.
 
-### 11.2.19. `{:verify false}` {#sec-verify}
+### 11.2.21. `{:transparent}` {#sec-transparent}
+
+By default, the body of a function is transparent to its users. This can be overridden using the `--default-function-opacity` command line flag. If default function opacity is set to `opaque` or `autoRevealDependencies`, then this attribute can be used on functions to make them always non-opaque.
+
+### 11.2.22. `{:verify false}` {#sec-verify}
      
 Skip verification of a function or a method altogether,
-not even trying to verify the well-formedness of postconditions and preconditions.
+not even trying to verify the [well-formedness](#sec-assertion-batches) of postconditions and preconditions.
 We discourage using this attribute and prefer [`{:axiom}`](#sec-axiom),
 which performs these minimal checks while not checking that the body satisfies the postconditions.
 
 If you simply want to temporarily disable all verification except on a single function or method, use the [`{:only}`](#sec-only-functions-methods) attribute on that function or method.
 
-### 11.2.20. `{:vcs_max_cost N}` {#sec-vcs_max_cost}
+### 11.2.23. `{:vcs_max_cost N}` {#sec-vcs_max_cost}
 Per-method version of the command-line option `/vcsMaxCost`.
 
 The [assertion batch](#sec-assertion-batches) of a method
 will not be split unless the cost of an [assertion batch](#sec-assertion-batches) exceeds this
 number, defaults to 2000.0. In
 [keep-going mode](#sec-vcs_max_keep_going_splits), only applies to the first round.
-If [`{:vcs_split_on_every_assert}`](#sec-vcs_split_on_every_assert) is set, then this parameter is useless.
+If [`{:isolate_assertions}`](#sec-isolate_assertions) is set, then this parameter is useless.
 
-### 11.2.21. `{:vcs_max_keep_going_splits N}` {#sec-vcs_max_keep_going_splits}
+### 11.2.24. `{:vcs_max_keep_going_splits N}` {#sec-vcs_max_keep_going_splits}
 
 Per-method version of the command-line option `/vcsMaxKeepGoingSplits`.
 If set to more than 1, activates the _keep going mode_ where, after the first round of splitting,
@@ -514,24 +624,24 @@ until we succeed proving them, or there is only one
 single assertion that it timeouts (in which
 case an error is reported for that assertion).
 Defaults to 1.
-If [`{:vcs_split_on_every_assert}`](#sec-vcs_split_on_every_assert) is set, then this parameter is useless.
+If [`{:isolate_assertions}`](#sec-isolate_assertions) is set, then this parameter is useless.
 
-### 11.2.22. `{:vcs_max_splits N}` {#sec-vcs_max_splits}
+### 11.2.25. `{:vcs_max_splits N}` {#sec-vcs_max_splits}
 
 Per-method version of the command-line option `/vcsMaxSplits`.
 Maximal number of [assertion batches](#sec-assertion-batches) generated for this method.
 In [keep-going mode](#sec-vcs_max_keep_going_splits), only applies to the first round.
 Defaults to 1.
-If [`{:vcs_split_on_every_assert}`](#sec-vcs_split_on_every_assert) is set, then this parameter is useless.
+If [`{:isolate_assertions}`](#sec-isolate_assertions) is set, then this parameter is useless.
 
-### 11.2.23. `{:vcs_split_on_every_assert}` {#sec-vcs_split_on_every_assert}
-Per-method version of the command-line option `/vcsSplitOnEveryAssert`.
+### 11.2.26. `{:isolate_assertions}` {#sec-isolate_assertions}
+Per-method version of the command-line option<span id="sec-vcs_split_on_every_assert"></span> `/vcsSplitOnEveryAssert`
 
 In the first and only verification round, this option will split the original [assertion batch](#sec-assertion-batches)
 into one assertion batch per assertion.
 This is mostly helpful for debugging which assertion is taking the most time to prove, e.g. to profile them.
 
-### 11.2.24. `{:synthesize}` {#sec-synthesize-attr}
+### 11.2.27. `{:synthesize}` {#sec-synthesize-attr}
 
 The `{:synthesize}` attribute must be used on methods that have no body and
 return one or more fresh objects. During compilation, 
@@ -565,7 +675,7 @@ BOUNDVARS = ID : ID
           | BOUNDVARS, BOUNDVARS
 ```
 
-### 11.2.25. `{:options OPT0, OPT1, ... }` {#sec-attr-options}
+### 11.2.28. `{:options OPT0, OPT1, ... }` {#sec-attr-options}
 
 This attribute applies only to modules. It configures Dafny as if
 `OPT0`, `OPT1`, … had been passed on the command line.  Outside of the module,
@@ -574,9 +684,22 @@ options revert to their previous values.
 Only a small subset of Dafny's command line options is supported.  Use the
 `/attrHelp` flag to see which ones.
 
-## 11.3. Attributes on assertions, preconditions and postconditions {#sec-verification-attributes-on-assertions}
+## 11.3. Attributes on reads and modifies clauses
+
+### 11.3.1. `{:assume_concurrent}`
+This attribute is used to allow non-empty `reads` or `modifies` clauses on methods
+with the `{:concurrent}` attribute, which would otherwise reject them.
+
+In some cases it is possible to know that Dafny code that reads or writes shared mutable state
+is in fact safe to use in a concurrent setting, especially when that state is exclusively ghost.
+Since the semantics of `{:concurrent}` aren't directly expressible in Dafny syntax,
+it isn't possible to express this assumption with an `assume {:axiom} ...` statement.
 
-### 11.3.1. `{:only}` {#sec-only}
+See also the [`{:concurrent}`](#sec-concurrent-attribute) attribute.
+
+## 11.4. Attributes on assertions, preconditions and postconditions {#sec-verification-attributes-on-assertions}
+
+### 11.4.1. `{:only}` {#sec-only}
 
 `assert {:only} X;` temporarily transforms all other non-`{:only}` assertions in the surrounding declaration into assumptions.
 
@@ -613,7 +736,7 @@ As soon as a declaration contains one `assert {:only}`, none of the postconditio
 
 You can also isolate the verification of a single member using [a similar `{:only}` attribute](#sec-only-functions-methods).
 
-### 11.3.2. `{:focus}` {#sec-focus}
+### 11.4.2. `{:focus}` {#sec-focus}
 `assert {:focus} X;` splits verification into two [assertion batches](#sec-assertion-batches).
 The first batch considers all assertions that are not on the block containing the `assert {:focus} X;`
 The second batch considers all assertions that are on the block containing the `assert {:focus} X;` and those that will _always_ follow afterwards.
@@ -670,7 +793,7 @@ method doFocus2(x: bool) returns (y: int) {
 }
 ```
 
-### 11.3.3. `{:split_here}` {#sec-split_here}
+### 11.4.3. `{:split_here}` {#sec-split_here}
 `assert {:split_here} X;` splits verification into two [assertion batches](#sec-assertion-batches).
 It verifies the code leading to this point (excluded) in a first assertion batch,
 and the code leading from this point (included) to the next `{:split_here}` or until the end in a second assertion batch.
@@ -699,12 +822,12 @@ method doSplitHere(x: bool) returns (y: int) {
 }
 ```
 
-### 11.3.4. `{:subsumption n}`
+### 11.4.4. `{:subsumption n}`
 Overrides the `/subsumption` command-line setting for this assertion.
 `{:subsumption 0}` checks an assertion but does not assume it after proving it.
 You can achieve the same effect using [labelled assertions](#sec-labeling-revealing-assertions).
 
-### 11.3.5. `{:error "errorMessage", "successMessage"}` {#sec-error-attribute}
+### 11.4.5. `{:error "errorMessage", "successMessage"}` {#sec-error-attribute}
 Provides a custom error message in case the assertion fails.
 As a hint, messages indicating what the user needs to do to fix the error are usually better than messages that indicate the error only.
 For example:
@@ -733,37 +856,13 @@ method Test()
 
 The success message is optional but is recommended if errorMessage is set.
 
-### 11.3.4. `{:error "errorMessage", "successMessage"}` {#sec-error-attribute}
-Provides a custom error message in case the assertion fails.
-As a hint, messages indicating what the user needs to do to fix the error are usually better than messages that indicate the error only.
-For example:
-
-```
-method Process(instances: int, price: int)
-  requires {:error "There should be an even number of instances", "The number of instances is always even"} i % 2 == 0
-  requires {:error "Could not prove that the price is positive", "The price is always positive"} price >= 0
-{
-}
-method Test()
-{
-  if * {
-    Process(1, 0); // Error: There should be an even number of instances
-  }
-  if * {
-    Process(2, -1); // Error: Could not prove that the price is positive
-  }
-  if * {
-    Process(2, 5); // Success: The number of instances is always even
-                   // Success: The price is always positive
-  }
-}
-```
+### 11.4.6. `{:contradiction}`
 
-The success message is optional but is recommended if errorMessage is set.
+Silences warnings about this assertion being involved in a proof using contradictory assumptions when `--warn-contradictory-assumptions` is enabled. This allows clear identification of intentional proofs by contradiction.
 
-## 11.4. Attributes on variable declarations
+## 11.5. Attributes on variable declarations
 
-### 11.4.1. `{:assumption}` {#sec-assumption}
+### 11.5.1. `{:assumption}` {#sec-assumption}
 This attribute can only be placed on a local ghost bool
 variable of a method. Its declaration cannot have a rhs, but it is
 allowed to participate as the lhs of exactly one assignment of the
@@ -772,16 +871,16 @@ Boogie output to a declaration followed by an `assume b` command.
 See [@LeinoWuestholz2015], Section 3, for example uses of the `{:assumption}`
 attribute in Boogie.
 
-## 11.5. Attributes on quantifier expressions (forall, exists)
+## 11.6. Attributes on quantifier expressions (forall, exists)
 
-### 11.5.1. `{:heapQuantifier}`
+### 11.6.1. `{:heapQuantifier}`
 
 _This attribute has been removed._
 
-### 11.5.2. `{:induction}` {#sec-induction-quantifier}
+### 11.6.2. `{:induction}` {#sec-induction-quantifier}
 See [`{:induction}`](#sec-induction) for functions and methods.
 
-### 11.5.3. `{:trigger}` {#sec-trigger}
+### 11.6.3. `{:trigger}` {#sec-trigger}
 Trigger attributes are used on quantifiers and comprehensions.
 
 The verifier instantiates the body of a quantified expression only when it can find an expression that matches the provided trigger.  
@@ -792,7 +891,7 @@ Here is an example:
 predicate P(i: int)
 predicate Q(i: int)
 
-lemma PHoldEvenly()
+lemma {:axiom} PHoldEvenly()
   ensures  forall i {:trigger Q(i)} :: P(i) ==> P(i + 2) && Q(i)
 
 lemma PHoldsForTwo()
@@ -827,7 +926,7 @@ Here are ways one can prove `assert P(j + 4);`:
 * Remove `{:trigger Q(i)}` so that it will automatically determine all possible triggers thanks to the option `/autoTriggers:1` which is the default.
 
 
-## 11.6. Deprecated attributes
+## 11.7. Deprecated attributes
 
 These attributes have been deprecated or removed. They are no longer useful (or perhaps never were) or were experimental.
 They will likely be removed entirely sometime soon after the release of Dafny 4.
@@ -837,7 +936,10 @@ Removed:
 - :dllimport
 - :handle
 
-## 11.7. Other undocumented verification attributes
+Deprecated:
+- :opaque : This attribute has been promoted to a first-class modifier for functions. Find more information [here](#sec-opaque).
+
+## 11.8. Other undocumented verification attributes
 
 A scan of Dafny's sources shows it checks for the
 following attributes.
@@ -904,4 +1006,67 @@ following attributes.
 * `{:weight}`
 * `{:yields}`
 
+## 11.9. New attribute syntax {#sec-at-attributes}
+
+There is a new syntax for typed prefix attributes that is being added: `@Attribute(...)`.
+For now, the new syntax works only as top-level declarations. When all previous attributes will be migrated, this section will be rewritten. For example, you can write
+
+<!-- %check-resolve -->
+```dafny
+@IsolateAssertions
+method Test() {
+}
+```
+
+instead of
+
+<!-- %check-resolve -->
+```dafny
+method {:isolate_assertions} Test() {
+}
+```
+
+
+Dafny rewrites `@`-attributes to old-style equivalent attributes. The definition of these attributes is similar to the following:
+
+<!-- %no-check -->
+```dafny
+datatype Attribute =
+  | AutoContracts
+  | AutoRequires
+  | AutoRevealDependenciesAll
+  | AutoRevealDependencies
+  | Axiom
+  | Compile(bool)
+  | Concurrent
+  | DisableNonlinearArithmetic
+  | Fuel(low: int, high: int := low + 1, functionName: string := "")
+  | IsolateAssertions
+  | NativeUInt8 | NativeInt8 ... | NativeUInt128 | NativeInt128 | NativeInt | NativeNone | NativeIntOrReal
+  | Options(string)
+  | Print
+  | Priority(weight: int)
+  | ResourceLimit(value: string)
+  | Synthesize
+  | TimeLimit(amount: int)
+  | TimeLimitMultiplier(multiplier: int)
+  | TailRecursion
+  | Test
+  | TestEntry
+  | TestInline(amount: int)
+  | Transparent
+  | VcsMaxCost
+  | VcsMaxKeepGoingSplits
+  | VcsMaxSplits
+  | Verify(verify: bool)
+  | VerifyOnly
+  
+```
+
+@-attributes have the same checks as regular resolved datatype values
+* The attribute should exist
+* Arguments should be compatible with the parameters, like for a datatype constructor call
 
+However, @-attributes have more checks:
+* The attribute should be applied to a place where it can be used by Dafny
+* Arguments should be literals
diff --git a/docs/DafnyRef/CommandLineOptions.md b/docs/DafnyRef/CommandLineOptions.md
index b2ca7aa8a46..3bf424319b8 100644
--- a/docs/DafnyRef/CommandLineOptions.md
+++ b/docs/DafnyRef/CommandLineOptions.md
@@ -1,3 +1,3 @@
 # 16. Full list of legacy command-line options {#sec-full-command-line-options} <!-- PDFOMIT -->
-For the on-line version only, the output of `dafny -?` follows. Note that with the advent of [dafny commands](#sec-dafny-commands), many options are only applicable to some (if any) commandsi, some are renamed, and some are obsolete and will eventually be removed. <!--PDFOMIT-->
+For the on-line version only, the output of `dafny -?` follows. Note that with the advent of [dafny commands](#sec-dafny-commands), many options are only applicable to some (if any) commands, some are renamed, and some are obsolete and will eventually be removed. <!--PDFOMIT-->
 {% include_relative Options.txt %} <!-- PDFOMIT -->
diff --git a/docs/DafnyRef/Expressions.5.expect b/docs/DafnyRef/Expressions.5.expect
new file mode 100644
index 00000000000..ecbb16ae6b8
--- /dev/null
+++ b/docs/DafnyRef/Expressions.5.expect
@@ -0,0 +1,3 @@
+text.dfy(2,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
\ No newline at end of file
diff --git a/docs/DafnyRef/Expressions.md b/docs/DafnyRef/Expressions.md
index 6391e3cd909..9cdafdcd547 100644
--- a/docs/DafnyRef/Expressions.md
+++ b/docs/DafnyRef/Expressions.md
@@ -459,7 +459,7 @@ The _specification_ is a list of clauses `requires E` or
 expression.
 
 _body_ is an expression that defines the function's return
-value.  The body must be well-formed for all possible values of the
+value.  The body must be [well-formed](#sec-assertion-batches) for all possible values of the
 parameters that satisfy the precondition (just like the bodies of
 named functions and methods).  In some cases, this means it is
 necessary to write explicit `requires` and `reads` clauses.  For
@@ -468,7 +468,7 @@ example, the lambda expression
 ```dafny
 x requires x != 0 => 100 / x
 ```
-would not be well-formed if the `requires` clause were omitted,
+would not be [well-formed](#sec-assertion-batches) if the `requires` clause were omitted,
 because of the possibility of division-by-zero.
 
 In settings where functions cannot be partial and there are no
@@ -632,6 +632,7 @@ old(x)
 allocated(x)
 unchanged(x)
 fresh(e)
+assigned(x)
 ```
 
 These expressions are never l-values. They include
@@ -644,6 +645,7 @@ These expressions are never l-values. They include
 - [unchanged expressions](#sec-unchanged-expression)
 - [old expressions](#sec-old-expression)
 - [cardinality expressions](#sec-cardinality-expression)
+- [assigned expressions](#sec-assigned-expression)
 
 ## 9.20. Literal Expressions ([grammar](#g-literal-expression)} {#sec-literal-expression}
 
@@ -900,7 +902,6 @@ Examples:
 ```dafny
 allocated(c)
 allocated({c1,c2})
-allocated@L(c)
 ```
 
 For any expression `e`, the expression `allocated(e)` evaluates to `true`
@@ -1374,7 +1375,7 @@ where the bound variable is of a reference type. In non-ghost contexts,
 it is not allowed, because--even though the resulting set would be
 finite--it is not pleasant or practical to compute at run time.
 
-[^set-of-objects-not-in-functions]: In order to be deterministic, the result of a function should only depend on the arguments and of the objects  it [reads](#sec-reads-clause), and Dafny does not provide a way to explicitly pass the entire heap as the argument to a function. See [this post](https://github.com/dafny-lang/dafny/issues/1366#issuecomment-906785889) for more insights.
+[^set-of-objects-not-in-functions]: In order to be deterministic, the result of a function should only depend on the arguments and of the objects  it [reads](#sec-reads-clause), and Dafny does not provide a way to explicitly pass the entire heap as the argument to a function. See [this post](https://github.com/dafny-lang/dafny/issues/1366) for more insights.
 
 The universe in which set comprehensions are evaluated is the set of all
 _allocated_ objects, of the appropriate type and satisfying the given predicate.
@@ -1717,7 +1718,7 @@ e[ .. ]
 A subsequence suffix applied to a sequence produces a new sequence whose
 elements are taken from a contiguous part of the original sequence. For
 example, expression `s[lo..hi]` for sequence `s`, and integer-based
-numerics `lo` and `hi` satisfying `0 <= lo <= hi <= |s|`. See
+numeric bounds `lo` and `hi` satisfying `0 <= lo <= hi <= |s|`. See
 [the section about other sequence expressions](#sec-other-sequence-expressions) for details.
 
 A subsequence suffix applied to an array produces a _sequence_ consisting of 
@@ -1852,7 +1853,54 @@ value for each optional parameter, and must never name
 non-existent formals. Any optional parameter that is not given a value
 takes on the default value declared in the callee for that optional parameter.
 
-## 9.37. Compile-Time Constants {#sec-compile-time-constants}
+## 9.37. Assigned Expressions {#sec-assigned-expression}
+
+Examples:
+<!-- %no-check -->
+```dafny
+assigned(x)
+```
+
+For any variable, constant, out-parameter, or object field `x`,
+the expression `assigned(x)` evaluates to `true` in a state
+if `x` is definitely assigned in that state.
+
+See [Section 12.6](#sec-definite-assignment) for more details on definite assignment.
+
+## 9.38. Termination Ordering Expressions {#sec-termination-ordering-expressions}
+
+When proving that a loop or recursive callable terminates, Dafny
+automatically generates a proof obligation that the sequence of
+expressions listed in a `decreases` clause gets smaller (in the
+[lexicographic termination ordering](#sec-decreases-clause)) with each
+iteration or recursive call. Normally, this proof obligation is purely
+internal. However, it can be written as a Dafny expression using the
+`decreases to` operator.
+
+The Boolean expression `(a, ..., b decreases to a', ..., b')` encodes
+this ordering. (The parentheses can be omitted if there is exactly 1 left-hand side
+and exactly 1 right-hand side.) For example, the following assertions are valid:
+<!-- %check-verify -->
+```dafny
+method M(x: int, y: int) {
+  assert 1 decreases to 0;
+  assert (true, false decreases to false, true);
+  assert (x, y decreases to x - 1, y);
+}
+```
+
+Conversely, the following assertion is invalid:
+<!-- %check-verify Expressions.5.expect -->
+```dafny
+method M(x: int, y: int) {
+  assert x decreases to x + 1;
+}
+```
+
+The `decreases to` operator is strict, that is, it means "strictly greater than".
+The `nonincreases to` operator is the non-strict ("greater than or equal") version of it.
+
+## 9.39. Compile-Time Constants {#sec-compile-time-constants}
 
 In certain situations in Dafny it is helpful to know what the value of a
 constant is during program analysis, before verification or execution takes
@@ -1893,7 +1941,7 @@ In Dafny, the following expressions are compile-time constants[^CTC], recursivel
 
 [^CTC]: This set of operations that are constant-folded may be enlarged in future versions of `dafny`.
 
-## 9.38. List of specification expressions {#sec-list-of-specification-expressions}
+## 9.40. List of specification expressions {#sec-list-of-specification-expressions}
 
 The following is a list of expressions that can only appear in specification contexts or in ghost blocks.
 
@@ -1901,5 +1949,7 @@ The following is a list of expressions that can only appear in specification con
 * [Allocated expressions](#sec-allocated-expression)
 * [Unchanged expressions](#sec-unchanged-expression)
 * [Old expressions](#sec-old-expression)
+- [Assigned expressions](#sec-assigned-expression)
 * [Assert and calc expressions](#sec-statement-in-an-expression)
 * [Hash Calls](#sec-hash-call)
+* [Termination ordering expression](#sec-termination-ordering-expressions)
diff --git a/docs/DafnyRef/Features.md b/docs/DafnyRef/Features.md
index c08b88e2989..c09e18d0d67 100644
--- a/docs/DafnyRef/Features.md
+++ b/docs/DafnyRef/Features.md
@@ -1,54 +1,57 @@
-| Feature | C# | JavaScript | Go | Java | Python | C++ | Dafny Library (.doo) | Rust |
-|-|-|-|-|-|-|-|-|-|
-| [Unbounded integers](#sec-numeric-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [Real numbers](#sec-numeric-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [Ordinals](#sec-ordinals) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Function values](#sec-arrow-subset-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [Iterators](#sec-iterator-types) |  X  |  X  |  X  |  |  X  |  |  X  |  |
-| [Collections with trait element types](#sec-collection-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [External module names with only underscores](#sec-extern-decls) |  X  |  X  |  |  X  |  X  |  X  |  X  |  X  |
-| [Co-inductive datatypes](#sec-coinductive-datatypes) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [Multisets](#sec-multisets) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Runtime type descriptors](#) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [Multi-dimensional arrays](#sec-multi-dimensional-arrays) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [Map comprehensions](#sec-map-comprehension-expression) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Traits](#sec-trait-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [Let-such-that expressions](#sec-let-expression) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Non-native numeric newtypes](#sec-newtypes) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [Method synthesis](#sec-synthesize-attr) |  X  |  |  |  |  |  |  X  |  |
-| [External classes](#sec-extern-decls) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Instantiating the `object` type](#sec-object-type) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [`forall` statements that cannot be sequentialized](#sec-forall-statement)[^compiler-feature-forall-note] |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Taking an array's length](#sec-array-type) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [`m.Items` when `m` is a map](#sec-maps) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [The /runAllTests option](#sec-test-attribute) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Integer range constraints in quantifiers (e.g. `a <= x <= b`)](#sec-quantifier-domains) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |  |
-| [Exact value constraints in quantifiers (`x == C`)](#sec-quantifier-domains) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Sequence displays of characters](#sec-sequence-displays)[^compiler-sequence-display-of-characters-note] |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Type test expressions (`x is T`)](#sec-as-is-expression) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Type test expressions on subset types](#sec-as-is-expression) |  |  |  |  |  |  |  X  |  |
-| [Quantifiers](#sec-quantifier-expression) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [Bitvector RotateLeft/RotateRight functions](#sec-bit-vector-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |  |
-| [`for` loops](#sec-for-statement) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |  |
-| [`continue` statements](#sec-break-continue-statement) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |  |
-| [Assign-such-that statements with potentially infinite bounds](#sec-update-and-call-statement)[^compiler-infinite-assign-such-that-note] |  X  |  X  |  X  |  X  |  X  |  X  |  X  |  |
-| [Sequence update expressions](#sec-other-sequence-expressions) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |  |
-| [Sequence constructions with non-lambda initializers](#sec-sequence-displays)[^compiler-sequence-display-nolambda-note] |  X  |  X  |  X  |  X  |  X  |  X  |  X  |  |
-| [Externally-implemented constructors](#sec-extern-decls) |  X  |  |  |  X  |  X  |  X  |  X  |  |
-| [Auto-initialization of tuple variables](#sec-tuple-types) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |  X  |
-| [Subtype constraints in quantifiers](#sec-quantifier-expression) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |  |
-| [Tuples with more than 20 arguments](#sec-tuple-types) |  |  X  |  X  |  |  X  |  X  |  X  |  |
-| [Unicode chars](##sec-characters) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [Converting values to strings](#sec-print-statement) |  X  |  X  |  X  |  X  |  X  |  |  X  |  X  |
-| [Legacy CLI without commands](#sec-dafny-commands) |  X  |  X  |  X  |  X  |  X  |  X  |  |  X  |
-| [Separate compilation](#sec-compilation) |  X  |  |  X  |  X  |  X  |  X  |  X  |  X  |
+| Feature | C# | JavaScript | Go | Java | Python | C++ | Dafny Library (.doo) |
+|-|-|-|-|-|-|-|-|
+| [Unbounded integers](#sec-numeric-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Real numbers](#sec-numeric-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Ordinals](#sec-ordinals) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Function values](#sec-arrow-subset-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Iterators](#sec-iterator-types) |  X  |  X  |  X  |  |  X  |  |  X  |
+| [Collections with trait element types](#sec-collection-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [External module names with only underscores](#sec-extern-decls) |  X  |  X  |  |  X  |  X  |  X  |  X  |
+| [Co-inductive datatypes](#sec-coinductive-datatypes) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Multisets](#sec-multisets) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Runtime type descriptors](#) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Multi-dimensional arrays](#sec-multi-dimensional-arrays) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Map comprehensions](#sec-map-comprehension-expression) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Traits](#sec-trait-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Let-such-that expressions](#sec-let-expression) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Non-native numeric newtypes](#sec-newtypes) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Method synthesis](#sec-synthesize-attr) |  X  |  |  |  |  |  |  X  |
+| [External classes](#sec-extern-decls) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Instantiating the `object` type](#sec-object-type) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [`forall` statements that cannot be sequentialized](#sec-forall-statement)[^compiler-feature-forall-note] |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Taking an array's length](#sec-array-type) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [`m.Items` when `m` is a map](#sec-maps) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [The /runAllTests option](#sec-test-attribute) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Integer range constraints in quantifiers (e.g. `a <= x <= b`)](#sec-quantifier-domains) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |
+| [Exact value constraints in quantifiers (`x == C`)](#sec-quantifier-domains) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Sequence displays of characters](#sec-sequence-displays)[^compiler-sequence-display-of-characters-note] |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Type test expressions (`x is T`)](#sec-as-is-expression) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Type test expressions on subset types](#sec-as-is-expression) |  |  |  |  |  |  |  X  |
+| [Quantifiers](#sec-quantifier-expression) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Bitvector RotateLeft/RotateRight functions](#sec-bit-vector-types) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [`for` loops](#sec-for-statement) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |
+| [`continue` statements](#sec-break-continue-statement) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |
+| [Assign-such-that statements with potentially infinite bounds](#sec-update-and-call-statement)[^compiler-infinite-assign-such-that-note] |  X  |  X  |  X  |  X  |  X  |  X  |  X  |
+| [Sequence update expressions](#sec-other-sequence-expressions) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |
+| [Sequence constructions with non-lambda initializers](#sec-sequence-displays)[^compiler-sequence-display-nolambda-note] |  X  |  X  |  X  |  X  |  X  |  X  |  X  |
+| [Externally-implemented constructors](#sec-extern-decls) |  X  |  |  |  X  |  X  |  X  |  X  |
+| [Auto-initialization of tuple variables](#sec-tuple-types) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |
+| [Subtype constraints in quantifiers](#sec-quantifier-expression) |  X  |  X  |  X  |  X  |  X  |  X  |  X  |
+| [Tuples with more than 20 arguments](##sec-compilation-built-ins) |  |  X  |  X  |  |  X  |  X  |  X  |
+| [Arrays with more than 16 dimensions](##sec-compilation-built-ins) |  |  X  |  X  |  |  X  |  X  |  X  |
+| [Arrow types with more than 16 arguments](##sec-compilation-built-ins) |  |  X  |  X  |  |  X  |  X  |  X  |
+| [Unicode chars](##sec-characters) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Converting values to strings](#sec-print-statement) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Legacy CLI without commands](#sec-dafny-commands) |  X  |  X  |  X  |  X  |  X  |  X  |  |
+| [Separate compilation](#sec-compilation) |  X  |  |  X  |  X  |  X  |  X  |  X  |
+| [All built-in types in runtime library](#sec-compilation-built-ins) |  X  |  X  |  X  |  X  |  X  |  |  X  |
+| [Execution coverage report](#sec-dafny-test) |  X  |  |  |  |  |  |  |
 
 [^compiler-feature-forall-note]: 'Sequentializing' a `forall` statement refers to compiling it directly to a series of nested loops
     with the statement's body directly inside. The alternative, default compilation strategy
     is to calculate the quantified variable bindings separately as a collection of tuples,
     and then execute the statement's body for each tuple.
-    Not all `forall` statements can be sequentialized; See [the implementation](https://github.com/dafny-lang/dafny/blob/master/Source/Dafny/Compilers/SinglePassCompiler.cs#L3493-L3528)
-    for details.
+    Not all `forall` statements can be sequentialized.
 
 [^compiler-sequence-display-of-characters-note]: This refers to an expression such as `['H', 'e', 'l', 'l', 'o']`, as opposed to a string literal such as `"Hello"`.
 
diff --git a/docs/DafnyRef/Grammar.md b/docs/DafnyRef/Grammar.md
index 5c086ddae13..127ab70bfe8 100644
--- a/docs/DafnyRef/Grammar.md
+++ b/docs/DafnyRef/Grammar.md
@@ -183,17 +183,12 @@ by IDEs and documentation generation tools to present information to users.
 
 In Dafny programs.
 * Documentation comments (a) either begin with `/**` or (b) begin with `//` or /*` in specific locations
-* Doc-comments may be associated with any declaration, including type definitions, export declarations, and datatype constructors.
-* They may be placed before or after the declaration. 
-   * If before, it must be a `/**` comment and may not have any blank or white-space lines between the comment
-     and the declaration.
-   * If after, any comments are placed after the signature (with no intervening lines), but before any
-     specifications or left-brace that starts a body, and may be `//` or `/**` or `/*` comments.
-   * If doc-comments are in both places, only the comments after the declaration are used.
-* Doc-comments after the declaration are preferred.
-* If the first of a series of single-line or multi-line comments is interpreted as a doc-string, then any subsequent comments
-  are appended to it, so long as there are no intervening lines, whether blank, all white-space or containing program text.
-* The extraction of the doc-string from a multiline comment follow these rules 
+* Documentation comments may be associated with any declaration, including type definitions, export declarations, and datatype constructors.
+* They may be placed before the declaration, between the declaration and the definition or after the definition. The priority of these comments is the following:
+   * If there is a comment starting with `/**` right before the definition, it's the documentation comment.
+   * Otherwise, if one or more comments appear between a declaration and its definition — which is uncommon in other programming languages — they are treated as documentation comments, regardless of whether they start with //, /**, or /*. This is because there is no other plausible reason for a comment to be placed in this position.
+   * Otherwise, if there is a single comment starting with `//` or `/**` or `/*` at the end of the definition, it's the documentation comment. In this case, multi-line documentation comments must be starting with `/*`
+* The extraction of the doc-string from a documentation comment follows the following rules 
   * On the first line, an optional `*` right after `/*` and an optional space are removed, if present
   * On other lines, the indentation space (with possibly one star in it) is removed, as if the content was supposed to align with A if the comment started with `/** A` for example.
 * The documentation string is interpreted as plain text, but it is possible to provide a user-written
@@ -203,40 +198,32 @@ In Dafny programs.
 Here are examples:
 <!-- %check-resolve -->
 ```dafny
-const c0 := 8
-/** docstring about c0 */
+/* Just a comment */
+const c0: int := 8 // docstring about c0
+// Just a comment
 
 /** docstring about c1 */
-const c1 := 8
-
-/** first line of docstring */
-const c2 := 8
-/** second line of docstring */
-
-const c3 := 8
-// docstring about c3
-// on two lines
-
-const c4 := 8
-
-// just a comment
+newtype c1 = x : int | x > 8 // Just a comment
 
+/* Just a comment */
+function c2(): (r: int) // Docstring about c2
+  ensures r > 0
+{ 8 } // Just a comment
 
 // just a comment
 const c5 := 8
-
 ```
 
 Datatype constructors may also have comments:
 <!-- %check-resolve -->
 ```dafny
-datatype T =  // Docstring for T
-  | A(x: int,
+datatype T // Docstring for T
+= | A(x: int,
       y: int) // Docstring for A
   | B()       /* Docstring for B */ |
     C()       // Docstring for C
 
-/** Docstring for T0*/
+/** Docstring for T0 */
 datatype T0 =
   | /** Docstring for A */
     A(x: int,
@@ -251,21 +238,23 @@ As can `export` declarations:
 <!-- %check-resolve -->
 ```dafny
 module M {
-const A: int
-const B: int
-const C: int
-const D: int
-
-export
-  // This is the eponymous export set intended for most clients
-  provides A, B, C
-
-
-export Friends extends M
-  // This export set is for clients who need to know more of the
-  // details of the module's definitions.
-  reveals A
-  provides D
+  const A: int
+  const B: int
+  const C: int
+  const D: int
+
+  export
+    // This is the docstring of the eponymous export set intended for most clients
+    provides A, B, C
+
+  /** This is the docstring */
+  export AB provides A, B
+
+  export Friends extends AB
+    // This is the docstring of the export set is for clients who need to know more of the
+    // details of the module's definitions.
+    reveals A
+    provides D
 }
 ```
 
@@ -511,11 +500,11 @@ may also include any of three optional elements:
 
 Note that a variable's domain expression may reference any variable declared before it,
 and a variable's range expression may reference the attached variable (and usually does) and any variable declared before it.
-For example, in the quantifier domain `i | 0 <= i < |s|, y <- s[i] | i < y`, the expression `s[i]` is well-formed
+For example, in the quantifier domain `i | 0 <= i < |s|, y <- s[i] | i < y`, the expression `s[i]` is always [well-formed](#sec-assertion-batches)
 because the range attached to `i` ensures `i` is a valid index in the sequence `s`.
 
 Allowing per-variable ranges is not fully backwards compatible, and so it is not yet allowed by default;
-the `--quantifier-syntax:4` option needs to be provided to enable this feature (See [Section 13.8.5](#sec-controlling-language)).
+the `--quantifier-syntax:4` option needs to be provided to enable this feature (See [Section 13.9.5](#sec-controlling-language)).
 
 ### 2.7.5. Numeric Literals ([grammar](#g-literal-expression)) {#sec-numeric-literals}
 
diff --git a/docs/DafnyRef/GrammarDetails.md b/docs/DafnyRef/GrammarDetails.md
index ac80b5d22b1..ce00966a00f 100644
--- a/docs/DafnyRef/GrammarDetails.md
+++ b/docs/DafnyRef/GrammarDetails.md
@@ -584,9 +584,9 @@ MethodSignature_(isGhost, isExtreme) =
 KType = "[" ( "nat" | "ORDINAL" ) "]"
 
 Formals(allowGhostKeyword, allowNewKeyword, allowOlderKeyword, allowDefault) =
-  "(" [ GIdentType(allowGhostKeyword, allowNewKeyword, allowOlderKeyword, 
+  "(" [ { Attribute } GIdentType(allowGhostKeyword, allowNewKeyword, allowOlderKeyword,
                    allowNameOnlyKeyword: true, allowDefault)
-        { "," GIdentType(allowGhostKeyword, allowNewKeyword, allowOlderKeyword,
+        { "," { Attribute } GIdentType(allowGhostKeyword, allowNewKeyword, allowOlderKeyword,
                          allowNameOnlyKeyword: true, allowDefault) }
       ]
   ")"
@@ -782,8 +782,7 @@ InvariantClause_ =
 
 ````grammar
 ReadsClause(allowLemma, allowLambda, allowWild) =
-  "reads"
-  { Attribute }
+  "reads" { Attribute }
   PossiblyWildFrameExpression(allowLemma, allowLambda, allowWild)
   { "," PossiblyWildFrameExpression(allowLemma, allowLambda, allowWild) }
 ````
@@ -1143,6 +1142,19 @@ CalcOp =
   )
 ````
 
+#### 17.2.6.24. Opaque block {#g-opaque-block}
+
+([discussion](#sec-opaque-block))
+
+````grammar
+OpaqueBlock = "opaque" OpaqueSpec BlockStmt
+  
+OpaqueSpec = {
+  | ModifiesClause(allowLambda: false)
+  | EnsuresClause(allowLambda: false)
+}
+````
+
 ### 17.2.7. Expressions
 
 #### 17.2.7.1. Top-level expression {#g-top-level-expression}
@@ -1327,7 +1339,7 @@ LambdaExpression(allowLemma, allowBitwiseOps) =
   Expression(allowLemma, allowLambda: true, allowBitwiseOps)
 ````
 
-#### 17.2.7.14. Left-hand-side expression #g-lhs-expression}
+#### 17.2.7.14. Left-hand-side expression {#g-lhs-expression}
 ([discussion](#sec-lhs-expression)) {
 
 ````grammar
@@ -1619,7 +1631,7 @@ MapComprehensionExpr(allowLemma, allowLambda) =
 
 ````grammar
 StmtInExpr = ( AssertStmt | AssumeStmt | ExpectStmt
-             | RevealStmt | CalcStmt
+             | RevealStmt | CalcStmt | ForallStmt
              )
 ````
 
@@ -1824,6 +1836,7 @@ LocalIdentTypeOptional = WildIdent [ ":" Type ]
 IdentTypeOptional = WildIdent [ ":" Type ]
 
 TypeIdentOptional =
+  { Attribute }
   { "ghost" | "nameonly" } [ NoUSIdentOrDigits ":" ] Type
   [ ":=" Expression(allowLemma: true, allowLambda: true) ]
 
diff --git a/docs/DafnyRef/Makefile b/docs/DafnyRef/Makefile
index fa07eca2bab..03bf986f11d 100644
--- a/docs/DafnyRef/Makefile
+++ b/docs/DafnyRef/Makefile
@@ -1,9 +1,5 @@
-XELATEXF := /usr/local/texlive/2020/bin/x86_64-darwin/xelatex
-XELATEXB := /usr/local/texlive/2020basic/bin/x86_64-darwin/xelatex
-XELATEX := $(shell (test -x ${XELATEXF} && echo ${XELATEXF}) || (test -x ${XELATEXB} && echo ${XELATEXB}) || echo "xelatex")
-
 all: features numbers options
-	./concat DafnyRef.md | sed -e '/numbered toc/d' -e '/:toc/d' -e '/PDFOMIT/d'  -e 's/<!--PDF NEWPAGE-->/\\newpage/' -e 's/<!--.*-->//' | pandoc --citeproc --toc --syntax-definition="../KDESyntaxDefinition/dafny.xml"  --syntax-definition="../KDESyntaxDefinition/grammar.xml" --highlight-style=../KDESyntaxDefinition/dafny.theme --pdf-engine=xelatex --bibliography=DafnyRef.bib --bibliography=krml250.bib --bibliography=poc.bib --bibliography=paper-full.bib --bibliography=references.bib -H head.tex -B header.tex -V colorlinks=true -t pdf -o DafnyRef.pdf
+	./concat DafnyRef.md | sed -e '/numbered toc/d' -e '/:toc/d' -e '/PDFOMIT/d'  -e 's/<!--PDF NEWPAGE-->/\\newpage/' -e 's/<!--.*-->//' | pandoc --citeproc --toc --syntax-definition="../KDESyntaxDefinition/dafny.xml"  --syntax-definition="../KDESyntaxDefinition/grammar.xml" --highlight-style=../KDESyntaxDefinition/dafny.theme --pdf-engine=tectonic --bibliography=DafnyRef.bib --bibliography=krml250.bib --bibliography=poc.bib --bibliography=paper-full.bib --bibliography=references.bib -H head.tex -B header.tex -V colorlinks=true -t pdf -o DafnyRef.pdf
 
 numbers:
 	javac Numbers.java && java Numbers -r DafnyRef.md
diff --git a/docs/DafnyRef/Modules.1.expect b/docs/DafnyRef/Modules.1.expect
index 2abe8743cba..0d25735fd46 100644
--- a/docs/DafnyRef/Modules.1.expect
+++ b/docs/DafnyRef/Modules.1.expect
@@ -1,2 +1,2 @@
-text.dfy(2,7): Error: Import declaration uses same name as a module in the same scope: MyModule
+text.dfy(2,0): Error: Import declaration uses same name as a module in the same scope: MyModule
 1 resolution/type errors detected in text.dfy
diff --git a/docs/DafnyRef/Modules.2.expect b/docs/DafnyRef/Modules.2.expect
index e2d65005a88..045e5b9a103 100644
--- a/docs/DafnyRef/Modules.2.expect
+++ b/docs/DafnyRef/Modules.2.expect
@@ -1,4 +1,4 @@
 text.dfy(9,6): Error: value does not satisfy the subset constraints of 'nat'
-text.dfy(12,21): Error: assertion could not be proved
+text.dfy(12,4): Error: assertion could not be proved
 
 Dafny program verifier finished with 1 verified, 2 errors
diff --git a/docs/DafnyRef/Modules.4.expect b/docs/DafnyRef/Modules.4.expect
index 66b6fa48b2e..35c7d75ee47 100644
--- a/docs/DafnyRef/Modules.4.expect
+++ b/docs/DafnyRef/Modules.4.expect
@@ -1,3 +1,3 @@
-text.dfy(10,15): Error: assertion could not be proved
+text.dfy(10,4): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/Modules.md b/docs/DafnyRef/Modules.md
index ab757469ce9..31ee26bbfe1 100644
--- a/docs/DafnyRef/Modules.md
+++ b/docs/DafnyRef/Modules.md
@@ -352,9 +352,8 @@ Examples:
 ```dafny
 export E extends F reveals f,g provides g,h
 export E reveals *
-export reveals f
+export reveals f,g provides g,h
 export E
-export
 export E ... reveals f
 ```
 
@@ -375,15 +374,16 @@ module using the `import` mechanism.
 An _export set_ enables a module to disallow the
 use of some declarations outside the module.
 
-Export sets have names; those names are used in `import` statements to
-designate which export set of a module is being imported.
-If a module `M` has export sets
-`E1` and `E2`, we can write ``import A = M`E1`` to create a module alias
-`A` that contains only the
-names in `E1`. Or we can write ``import A = M`{E1,E2}`` to import the union
+An export set has an optional name used to disambiguate
+in case of multiple export sets;
+If specified, such names are used in `import` statements
+to designate which export set of a module is being imported.
+If a module `M` has export sets `E1` and `E2`,
+we can write ``import A = M`E1`` to create a module alias
+`A` that contains only the names in `E1`.
+Or we can write ``import A = M`{E1,E2}`` to import the union
 of names in `E1` and `E2` as module alias `A`.
-As before, ``import M`E1`` is an
-abbreviation of ``import M = M`E1``.
+As before, ``import M`E1`` is an abbreviation of ``import M = M`E1``.
 
 If no export set is given in an import
 statement, the default export set of the module is used.
diff --git a/docs/DafnyRef/Options.txt b/docs/DafnyRef/Options.txt
index 027681972ac..7c3402da97a 100644
--- a/docs/DafnyRef/Options.txt
+++ b/docs/DafnyRef/Options.txt
@@ -1,5 +1,5 @@
 ```
-Use 'dafny --help' to see help for a newer Dafny CLI format.
+Use 'dafny --help' to see help for the new Dafny CLI format.
 Usage: dafny [ option ... ] [ filename ... ]
 
   ---- General options -------------------------------------------------------
@@ -33,36 +33,8 @@ Usage: dafny [ option ... ] [ filename ... ]
   
   ---- Plugins ---------------------------------------------------------------
   
-  /plugin:<path-to-one-assembly[,argument]*>
-      
-      (experimental) One path to an assembly that contains at least one
-      instantiatable class extending Microsoft.Dafny.Plugin.Rewriter. It
-      can also extend Microsoft.Dafny.Plugins.PluginConfiguration to
-      receive arguments. More information about what plugins do and how
-      to define them:
-      
-      https://github.com/dafny-lang/dafny/blob/master/Source/DafnyLanguageServer/README.md#about-plugins
-
   ---- Overall reporting and printing ----------------------------------------
   
-  /dprint:<file>
-      Print Dafny program after parsing it.
-      (Use - as <file> to print to console.)
-
-  /printMode:<Everything|DllEmbed|NoIncludes|NoGhost>
-      Everything (default) - Print everything listed below.
-      DllEmbed - print the source that will be included in a compiled dll.
-      NoIncludes - disable printing of {:verify false} methods
-          incorporated via the include mechanism, as well as datatypes and
-          fields included from other files.
-      NoGhost - disable printing of functions, ghost methods, and proof
-          statements in implementation methods. It also disables anything
-          NoIncludes disables.
-
-  /rprint:<file>
-      Print Dafny program after resolving it.
-      (use - as <file> to print to console.)
-
   /showSnippets:<value>
       0 (default) - Don't show source code snippets for Dafny messages.
       1 - Show a source code snippet for each Dafny message.
@@ -99,25 +71,21 @@ Usage: dafny [ option ... ] [ filename ... ]
   
   ---- Language feature selection --------------------------------------------
   
-  /generalTraits:<value>
-      0 (default) - Every trait implicitly extends 'object', and thus is a reference type. Only traits and classes can extend traits.
-      1 - A trait is a reference type iff it or one of its ancestor traits is 'object'. Any type with members can extend traits.
+  /defaultFunctionOpacity:<value>
+      Change the default opacity of functions. 
+      `transparent` (default) means functions are transparent, can be manually made opaque and then revealed. 
+      `autoRevealDependencies` makes all functions not explicitly labelled as opaque to be opaque but reveals them automatically in scopes which do not have `{:autoRevealDependencies false}`. 
+      `opaque` means functions are always opaque so the opaque keyword is not needed, and functions must be revealed everywhere needed for a proof.
 
-  /ntitrace:<value>
-      0 (default) - Don't print debug information for the new type system.
-      1 - Print debug information for the new type system.
+  /readsClausesOnMethods:<value>
+      0 (default) - Reads clauses on methods are forbidden.
+      1 - Reads clauses on methods are permitted (with a default of 'reads *').
 
-  /titrace:<value>
-      0 (default) - Don't print type-inference debug information.
-      1 - Print type-inference debug information.
-
-  /typeSystemRefresh:<value>
-      0 (default) - The type-inference engine and supported types are those of Dafny 4.0.
-      1 - Use an updated type-inference engine. Warning: This mode is under construction and probably won't work at this time.
-
-  /unicodeChar:<value>
-      0 - The char type represents any UTF-16 code unit.
-      1 (default) - The char type represents any Unicode scalar value.
+  /standardLibraries:<value>
+      0 (default) - Do not allow Dafny code to depend on the standard libraries included with the Dafny distribution.
+      1 - Allow Dafny code to depend on the standard libraries included with the Dafny distribution.
+      See https://github.com/dafny-lang/dafny/blob/master/Source/DafnyStandardLibraries/README.md for more information.
+      Not compatible with the /unicodeChar:0 option.
 
   /noIncludes
       Ignore include directives.
@@ -195,6 +163,16 @@ Usage: dafny [ option ... ] [ filename ... ]
   
   ---- Verification options -------------------------------------------------
   
+  /allowAxioms:<value>
+      Prevents a warning from being generated for axioms, such as assume statements and functions or methods without a body, that don't have an {:axiom} attribute.
+
+  /verificationLogger:<configuration>
+      Logs verification results using the given test result format. The currently supported formats are `trx`, `csv`, and `text`. These are: the XML-based format commonly used for test results for .NET languages, a custom CSV schema, and a textual format meant for human consumption. You can provide configuration using the same string format as when using the --logger option for dotnet test, such as: --format "trx;LogFileName=<...>");
+      
+      The `trx` and `csv` formats automatically choose an output file name by default, and print the name of this file to the console. The `text` format prints its output to the console by default, but can send output to a file given the `LogFileName` option.
+      
+      The `text` format also includes a more detailed breakdown of what assertions appear in each assertion batch. When combined with the isolate-assertions option, it will provide approximate time and resource use costs for each assertion, allowing identification of especially expensive assertions.
+
   /dafnyVerify:<n>
       0 - Stop after resolution and typechecking.
       1 - Continue on to verification and compilation.
@@ -202,34 +180,15 @@ Usage: dafny [ option ... ] [ filename ... ]
   /verifyAllModules
       Verify modules that come from an include directive.
   
+  /emitUncompilableCode
+      Allow compilers to emit uncompilable code that usually contain useful
+      information about what feature is missing, rather than
+      stopping on the first problem
+  
   /separateModuleOutput
       Output verification results for each module separately, rather than
       aggregating them after they are all finished.
   
-  /verificationLogger:<configuration string>
-      Logs verification results to the given test result logger. The
-      currently supported loggers are `trx`, `csv`, and `text`. These are
-      the XML-based format commonly used for test results for .NET
-      languages, a custom CSV schema, and a textual format meant for human
-      consumption. You can provide configuration using the same string
-      format as when using the --logger option for dotnet test, such as:
-  
-          /verificationLogger:trx;LogFileName=<...>.
-  
-      The exact mapping of verification concepts to these formats is
-      experimental and subject to change!
-  
-      The `trx` and `csv` loggers automatically choose an output file name
-      by default, and print the name of this file to the console. The
-      `text` logger prints its output to the console by default, but can
-      send output to a file given the `LogFileName` option.
-  
-      The `text` logger also includes a more detailed breakdown of what
-      assertions appear in each assertion batch. When combined with the
-      `/vcsSplitOnEveryAssert` option, it will provide approximate time
-      and resource use costs for each assertion, allowing identification
-      of especially expensive assertions.
-  
   /noCheating:<n>
       0 (default) - Allow assume statements and free invariants.
       1 - Treat all assumptions as asserts, and drop free.
@@ -321,16 +280,10 @@ Usage: dafny [ option ... ] [ filename ... ]
   
   /extractCounterexample
       If verification fails, report a detailed counterexample for the
-      first failing assertion. Requires specifying the /mv:<file> option as well
-      as /proverOpt:O:model_compress=false (for z3 version < 4.8.7) or
-      /proverOpt:O:model.compact=false (for z3 version >= 4.8.7), and
-      /proverOpt:O:model.completion=true.
+      first failing assertion (experimental).
   
   ---- Compilation options ---------------------------------------------------
   
-  /compileSuffix:<value>
-      Add the suffix _Compile to module names without :extern
-
   /compileTarget:<language>
       cs (default) - Compile to .NET via C#.
       go - Compile to Go.
@@ -363,6 +316,16 @@ Usage: dafny [ option ... ] [ filename ... ]
   /out:<file>
       Specify the filename and location for the generated target language files.
 
+  /runAllTests:<n>
+      0 (default) - Annotates compiled methods with the {:test}
+              attribute such that they can be tested using a testing framework
+              in the target language (e.g. xUnit for C#).
+          1 - Emits a main method in the target language that will execute
+              every method in the program with the {:test} attribute. Cannot
+              be used if the program already contains a main method. Note that
+              /compile:3 or 4 must be provided as well to actually execute
+              this main method!
+
   /compile:<n>
       0 - Do not compile Dafny program.
       1 (default) - Upon successful verification of the Dafny program,
@@ -383,15 +346,6 @@ Usage: dafny [ option ... ] [ filename ... ]
       When running a Dafny file through /compile:3 or /compile:4, '--args' provides
       all arguments after it to the Main function, at index starting at 1.
       Index 0 is used to store the executable's name if it exists.
-  /runAllTests:<n> (experimental)
-      0 (default) - Annotates compiled methods with the {:test}
-          attribute such that they can be tested using a testing framework
-          in the target language (e.g. xUnit for C#).
-      1 - Emits a main method in the target language that will execute
-          every method in the program with the {:test} attribute. Cannot
-          be used if the program already contains a main method. Note that
-          /compile:3 or 4 must be provided as well to actually execute
-          this main method!
   
   /compileVerbose:<n>
       0 - Don't print status of compilation to the console.
@@ -479,6 +433,7 @@ Usage: dafny [ option ... ] [ filename ... ]
   /printWithUniqueIds : print augmented information that uniquely
                    identifies variables
   /printUnstructured : with /print option, desugars all structured statements
+  /printPassive :  with /print option, prints passive version of program
   /printDesugared : with /print option, desugars calls
   /printLambdaLifting : with /print option, desugars lambda lifting
 
@@ -493,6 +448,10 @@ Usage: dafny [ option ... ] [ filename ... ]
 
   /loopUnroll:<n>
                 unroll loops, following up to n back edges (and then some)
+                default is -1, which means loops are not unrolled
+  /extractLoops
+                extract reducible loops into recursive procedures and
+                inline irreducible loops using the bound supplied by /loopUnroll:<n>
   /soundLoopUnrolling
                 sound loop unrolling
   /doModSetAnalysis
@@ -651,12 +610,18 @@ Usage: dafny [ option ... ] [ filename ... ]
                 the SMT theory of arrays. This option allows the use of axioms instead.
   /reflectAdd   In the VC, generate an auxiliary symbol, elsewhere defined
                 to be +, instead of +.
-  /prune
-                Turn on pruning. Pruning will remove any top-level Boogie declarations 
-                that are not accessible by the implementation that is about to be verified.
-                Without pruning, due to the unstable nature of SMT solvers,
-                a change to any part of a Boogie program has the potential 
-                to affect the verification of any other part of the program.
+  /prune:<n>
+                0 - Turn off pruning.
+                1 - Turn on pruning (default). Pruning will remove any top-level
+                Boogie declarations that are not accessible by the implementation
+                that is about to be verified. Without pruning, due to the unstable
+                nature of SMT solvers, a change to any part of a Boogie program
+                has the potential to affect the verification of any other part of
+                the program.
+
+                Only use this if your program contains uses clauses
+                where required, otherwise pruning will break your program.
+                More information can be found here: https://github.com/boogie-org/boogie/blob/afe8eb0ffbb48d593de1ae3bf89712246444daa8/Source/ExecutionEngine/CommandLineOptions.cs#L160
   /printPruned:<file>
                 After pruning, print the Boogie program to the specified file.
   /relaxFocus   Process foci in a bottom-up fashion. This way only generates
@@ -686,6 +651,11 @@ Usage: dafny [ option ... ] [ filename ... ]
                 report. This generalizes and replaces the previous
                 (undocumented) `/printNecessaryAssertions` option.
 
+  /keepQuantifier
+                If pool-based quantifier instantiation creates instances of a quantifier
+                then keep the quantifier along with the instances. By default, the quantifier
+                is dropped if any instances are created.
+
   ---- Verification-condition splitting --------------------------------------
 
   /vcsMaxCost:<f>
@@ -753,7 +723,7 @@ Usage: dafny [ option ... ] [ filename ... ]
                 Limit the number of seconds spent trying to verify
                 each procedure
   /rlimit:<num>
-                Limit the Z3 resource spent trying to verify each procedure
+                Limit the Z3 resource spent trying to verify each procedure.
   /errorTrace:<n>
                 0 - no Trace labels in the error output,
                 1 (default) - include useful Trace labels in error output,
diff --git a/docs/DafnyRef/Plugins.md b/docs/DafnyRef/Plugins.md
index f2dffc26733..c044914d6a0 100644
--- a/docs/DafnyRef/Plugins.md
+++ b/docs/DafnyRef/Plugins.md
@@ -6,18 +6,19 @@ without concern for verifying or compiling the program. Or it might modify the p
 and then continue on with verification and compilation with the core Dafny tool. A user plugin might also be used
 in the Language Server and thereby be available in the VSCode (or other) IDE.
 
-_ **This is an experimental aspect of Dafny.**
+_**This is an experimental aspect of Dafny.**
 The plugin API directly exposes the Dafny AST, which is constantly evolving.
 Hence, always recompile your plugin against the binary of Dafny that will be importing your plugin._
 
-Plugins are libraries linked to a `Dafny.dll` of the same version as the language server.
+Plugins are libraries linked to a `Dafny.dll` of the same version as the Language Server.
 A plugin typically defines:
 
 * Zero or one class extending `Microsoft.Dafny.Plugins.PluginConfiguration`, which receives plugins arguments in its method `ParseArguments`, and
-  1) Can return a list of `Microsoft.Dafny.Plugins.Rewriter`s when its method `GetRewriters()` is called by Dafny,
-  2) Can return a list of `Microsoft.Dafny.Plugins.Compiler`s when its method `GetCompilers()` is called by Dafny,
-  3) If the configuration extends the subclass `Microsoft.Dafny.LanguageServer.Plugins.PluginConfiguration`,
-     then it can return a list of `Microsoft.Dafny.LanguageServer.Plugins.DafnyCodeActionProvider`s when its method `GetDafnyCodeActionProviders()` is called by the Dafny Language Server.
+  1. Can return a list of `Microsoft.Dafny.Plugins.Rewriter`s when its method `GetRewriters()` is called by Dafny,
+  2. Can return a list of `Microsoft.Dafny.Plugins.Compiler`s when its method `GetCompilers()` is called by Dafny,
+  3. If the configuration extends the subclass `Microsoft.Dafny.LanguageServer.Plugins.PluginConfiguration`:
+      1. Can return a list of `Microsoft.Dafny.LanguageServer.Plugins.DafnyCodeActionProvider`s when its method `GetDafnyCodeActionProviders()` is called by the Dafny Language Server.
+      2. Can return a modified version of `OmniSharp.Extensions.LanguageServer.Server.LanguageServerOptions` when its method `WithPluginHandlers()` is called by the Dafny Language Server.
 
 * Zero or more classes extending `Microsoft.Dafny.Plugins.Rewriter`.
   If a configuration class is provided, it is responsible for instantiating them and returning them in `GetRewriters()`.
@@ -29,6 +30,7 @@ A plugin typically defines:
   Only a configuration class of type `Microsoft.Dafny.LanguageServer.Plugins.PluginConfiguration` can be responsible for instantiating them and returning them in `GetDafnyCodeActionProviders()`.
 
 The most important methods of the class `Rewriter` that plugins override are
+
 * (experimental) `PreResolve(ModuleDefinition)`: Here you can optionally modify the AST before it is resolved.
 * `PostResolve(ModuleDefinition)`: This method is repeatedly called with every resolved and type-checked module, before verification.
   Plugins override this method typically to report additional diagnostics.
@@ -38,11 +40,12 @@ Plugins are typically used to report additional diagnostics such as unsupported
 
 Note that all plugin errors should use the original program's expressions' token and NOT `Token.NoToken`, else no error will be displayed in the IDE.
 
-## 15.1. Code actions plugin tutorial
+## 15.1. Language Server plugin tutorial
+
+In this section, we will create a plugin that enhances the functionality of the Language Server.
+We will start by showing the steps needed to create a plugin, followed by an example implementation that demonstrates how to provide more code actions and add custom request handlers.
 
-In this section, we will create a plugin to provide more code actions to Dafny.
-The code actions will be simple: Add a dummy comment in front of the first method name,
-if the selection is on the line of the method.
+### 15.1.1. Create plugin project
 
 Assuming the Dafny source code is installed in the folder `dafny/`
 start by creating an empty folder next to it, e.g. `PluginTutorial/`
@@ -51,22 +54,33 @@ start by creating an empty folder next to it, e.g. `PluginTutorial/`
 mkdir PluginTutorial
 cd PluginTutorial
 ```
+
 Then, create a dotnet class project
+
 ```bash
 dotnet new classlib
 ```
+
 It will create a file `Class1.cs` that you can rename
+
 ```bash
-mv Class1.cs PluginAddComment.cs
+mv Class1.cs MyPlugin.cs
 ```
+
 Open the newly created file `PluginTutorial.csproj`, and add the following after `</PropertyGroup>`:
+
 ```xml
   <ItemGroup>
     <ProjectReference Include="../dafny/source/DafnyLanguageServer/DafnyLanguageServer.csproj" />
   </ItemGroup>
 ```
+### 15.1.2. Implement plugin
+
+#### 15.1.2.1. Code actions plugin
 
-Then, open the file `PluginAddComment.cs`, remove everything, and write the imports and a namespace:
+This code action plugin will add a code action that allows you to place a dummy comment in front of the first method name, only if the selection is on the line of the method.
+
+Open the file `MyPlugin.cs`, remove everything, and write the imports and a namespace:
 
 ```csharp
 using Microsoft.Dafny;
@@ -76,11 +90,12 @@ using Microsoft.Dafny.LanguageServer.Language;
 using System.Linq;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
-namespace PluginAddComment;
+namespace MyPlugin;
 ```
 
 After that, add a `PluginConfiguration` that will expose all the quickfixers of your plugin.
 This class will be discovered and instantiated automatically by Dafny.
+
 ```csharp
 public class TestConfiguration : PluginConfiguration {
   public override DafnyCodeActionProvider[] GetDafnyCodeActionProviders() {
@@ -88,6 +103,7 @@ public class TestConfiguration : PluginConfiguration {
   }
 }
 ```
+
 Note that you could also override the methods `GetRewriters()` and `GetCompilers()` for other purposes, but this is out of scope for this tutorial.
 
 Then, we need to create the quickFixer `AddCommentDafnyCodeActionProvider` itself:
@@ -102,6 +118,7 @@ public class AddCommentDafnyCodeActionProvider : DafnyCodeActionProvider {
 
 For now, this quick fixer returns nothing. `input` is the program state, and `selection` is where the caret is.
 We replace the return statement with a conditional that tests whether the selection is on the first line:
+
 ```csharp
     var firstTokenRange = input.Program?.GetFirstTopLevelToken()?.GetLspRange();
     if(firstTokenRange != null && firstTokenRange.Start.Line == selection.Start.Line) {
@@ -118,6 +135,7 @@ A `DafnyCodeActionEdit` has a `Range` to remove and some `string` to insert inst
 of the same `DafnyCodeAction` are applied at the same time if selected.
 
 To create a `DafnyCodeAction`, we can either use the easy-to-use `InstantDafnyCodeAction`, which accepts a title and an array of edits:
+
 ```csharp
   return new DafnyCodeAction[] {
     new InstantDafnyCodeAction("Insert comment", new DafnyCodeActionEdit[] {
@@ -127,6 +145,7 @@ To create a `DafnyCodeAction`, we can either use the easy-to-use `InstantDafnyCo
 ```
 
 or we can implement our custom inherited class of `DafnyCodeAction`:
+
 ```csharp
 public class CustomDafnyCodeAction: DafnyCodeAction {
   public Range whereToInsert;
@@ -141,18 +160,76 @@ public class CustomDafnyCodeAction: DafnyCodeAction {
   }
 }
 ```
+
 In that case, we could return:
+
 ```csharp
   return new DafnyCodeAction[] {
     new CustomDafnyCodeAction(firstTokenRange)
   };
 ```
 
+#### 15.1.2.2. Request handler plugin
+
+This request handler plugin enhances the Language Server to support a request with a `TextDocumentIdentifier` as parameter, which will return a `bool` value denoting whether the provided `DocumentUri` has any `LoopStmt`'s in it.
+
+Open the file `MyPlugin.cs`, remove everything, and write the imports and a namespace:
+
+```csharp
+using OmniSharp.Extensions.JsonRpc;
+using OmniSharp.Extensions.LanguageServer.Server;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using Microsoft.Dafny.LanguageServer.Plugins;
+using Microsoft.Dafny.LanguageServer.Workspace;
+using MediatR;
+using Microsoft.Dafny;
+
+namespace MyPlugin;
+```
+
+After that, add a `PluginConfiguration` that will add all the request handlers of your plugin.
+This class will be discovered and instantiated automatically by Dafny.
+
+```csharp
+public class TestConfiguration : PluginConfiguration {
+  public override LanguageServerOptions WithPluginHandlers(LanguageServerOptions options) {
+    return options.WithHandler<DummyHandler>();
+  }
+}
+```
+
+Then, we need to create the request handler `DummyHandler` itself:
+
+```csharp
+[Parallel]
+[Method("dafny/request/dummy", Direction.ClientToServer)]
+public record DummyParams : TextDocumentIdentifier, IRequest<bool>;
+
+public class DummyHandler : IJsonRpcRequestHandler<DummyParams, bool> {
+  private readonly IProjectDatabase projects;
+  public DummyHandler(IProjectDatabase projects) {
+    this.projects = projects;
+  }
+  public async Task<bool> Handle(DummyParams request, CancellationToken cancellationToken) {
+    var state = await projects.GetParsedDocumentNormalizeUri(request);
+    if (state == null) {
+      return false;
+    }
+    return state.Program.Descendants().OfType<LoopStmt>().Any();
+  }
+}
+```
+
+For more advanced example implementations of request handlers, look at `dafny/Source/DafnyLanguageServer/Handlers/*`.
+
+### 15.1.3. Building plugin
+
 That's it! Now, build your library while inside your folder:
+
 ```bash
 > dotnet build
 ```
 
-This will create the file `PluginTutorial/bin/Debug/net6.0/PluginTutorial.dll`.
+This will create the file `PluginTutorial/bin/Debug/net8.0/PluginTutorial.dll`.
 Now, open VSCode, open Dafny settings, and enter the absolute path to this DLL in the plugins section.
 Restart VSCode, and it should work!
diff --git a/docs/DafnyRef/README.md b/docs/DafnyRef/README.md
index f001dfdb90a..2025fc7568a 100644
--- a/docs/DafnyRef/README.md
+++ b/docs/DafnyRef/README.md
@@ -30,7 +30,7 @@ subfolders. In order to render files locally you must
 * set the working directly (`cd`) to the `docs` folder (Windows or Ruby 3.0 users, see below for some tweaks)
 * run the jekyll server: `bundle exec jekyll server`
 * open a browser on the page http://localhost:4000 or directly to http://localhost:4000/DafnyRef/DafnyRef
-* the server rerenders when files are changed -- but not always quite completely. Sometimes one must kill the server process, delete all the files in the _saite folder, and restart the server.
+* the server rerenders when files are changed -- but not always quite completely. Sometimes one must kill the server process, delete all the files in the _site folder, and restart the server.
 
 In order to convert markdown to pdf, you must be able to execute the Makefile, which requires installing pandoc and LaTeX, and being on a Linux-like platform.
 
@@ -64,12 +64,11 @@ definition file.
 ## On-line RM through github
 Github uses rouge, via Jekyll. The syntax definition is a ruby-based file
 maintained in the rouge github repo.
-To modify the definition, follow the directions in
-[https://rouge-ruby.github.io/docs/file.LexerDevelopment.html]
-(https://rouge-ruby.github.io/docs/file.LexerDevelopment.html)
-after setting up a development environment according to
-[https://rouge-ruby.github.io/docs/file.DevEnvironment.html]
-(https://rouge-ruby.github.io/docs/file.DevEnvironment.html).
+To modify the definition, follow
+[these](https://rouge-ruby.github.io/docs/file.LexerDevelopment.html)
+directions after [setting
+up](https://rouge-ruby.github.io/docs/file.DevEnvironment.html) a
+development environment.
 The file itself, `dafny.rb` is in Ruby. Details of the Ruby Regular
 Expression language can be found many places online, such as
 [here](https://www.princeton.edu/~mlovett/reference/Regular-Expressions.pdf).
@@ -113,4 +112,4 @@ file as well.
 ## LSP
 
 Many IDEs interact with Language Servers (via LSP). Possibly an LSP protocol
-will be generated in the future.
\ No newline at end of file
+will be generated in the future.
diff --git a/docs/DafnyRef/Refinement.md b/docs/DafnyRef/Refinement.md
index 000b7f226be..5e1433a4133 100644
--- a/docs/DafnyRef/Refinement.md
+++ b/docs/DafnyRef/Refinement.md
@@ -152,7 +152,7 @@ Method declarations can be refined as in the following example.
 
 <!-- %check-verify -->
 ```dafny
-module A {
+abstract module A {
   method ToImplement(x: int) returns (r: int)
     ensures r > x
 
@@ -225,7 +225,7 @@ the following example.
 
 <!-- %check-verify -->
 ```dafny
-module A {
+abstract module A {
   function F(x: int): (r: int)
     ensures r > x
 
diff --git a/docs/DafnyRef/Specifications.2.expect b/docs/DafnyRef/Specifications.2.expect
index 636d76a6761..6d4e1a7fc37 100644
--- a/docs/DafnyRef/Specifications.2.expect
+++ b/docs/DafnyRef/Specifications.2.expect
@@ -1,3 +1,3 @@
-text.dfy(4,2): Warning: note, this loop has no body (loop frame: i)
+text.dfy(4,2): Warning: this loop has no body (loop frame: i)
 
 Dafny program verifier did not attempt verification
diff --git a/docs/DafnyRef/Specifications.md b/docs/DafnyRef/Specifications.md
index 7000cdf6dc3..0c3159bddc1 100644
--- a/docs/DafnyRef/Specifications.md
+++ b/docs/DafnyRef/Specifications.md
@@ -58,7 +58,7 @@ of all the given Attributes. The order of conjunctions
 can be important: earlier conjuncts can set conditions that
 establish that later conjuncts are well-defined.
 
-The attributes recognized for requires clauses are discussed in [Section 11.3](#sec-verification-attributes-on-assertions).
+The attributes recognized for requires clauses are discussed in [Section 11.4](#sec-verification-attributes-on-assertions).
 
 A requires clause can have [custom error and success messages](#sec-error-attribute).
 
@@ -67,7 +67,7 @@ A requires clause can have [custom error and success messages](#sec-error-attrib
 Examples:
 <!-- %check-resolve -->
 ```dafny
-method m(i: int) returns (r: int)
+method {:axiom} m(i: int) returns (r: int)
   ensures r > 0
 ```
 
@@ -86,7 +86,7 @@ The order of conjunctions
 can be important: earlier conjuncts can set conditions that
 establish that later conjuncts are well-defined.
 
-The attributes recognized for ensures clauses are discussed in [Section 11.3](#sec-verification-attributes-on-assertions).
+The attributes recognized for ensures clauses are discussed in [Section 11.4](#sec-verification-attributes-on-assertions).
 
 An ensures clause can have [custom error and success messages](#sec-error-attribute).
 
@@ -366,9 +366,9 @@ the decreases clause, the decreases tuple automatically decreases on any
 calls in a non-recursive context.
 
 Though Dafny fixes a well-founded order that it uses when checking
-termination, Dafny does not surface this ordering directly in
-expressions. That is, syntactically, there is no single operator that
-stands for the well-founded ordering.
+termination, Dafny does not normally surface this ordering directly in
+expressions. However, it is possible to write such ordering constraints
+using [`decreases to` expressions](#sec-termination-ordering-expressions).
 
 ### 7.1.4. Framing ([grammar](#g-frame-expression)) {#sec-frame-expression}
 
@@ -464,6 +464,12 @@ function g()
   reads o, oo
 function h()
   reads { o }
+method f()
+  reads *
+method g()
+  reads o, oo
+method h()
+  reads { o }
 ```
 
 Functions are not allowed to have side effects; they may also be restricted in
@@ -479,11 +485,24 @@ able to give invariants to preserve it in this case, it gets even more
 complex when manipulating data structures. In this case, framing is
 essential to making the verification process feasible.
 
-It is not just the body of a function that is subject to `reads`
+By default, methods are not required to list the memory location they read.
+However, there are use cases for restricting what methods can read as well.
+In particular, if you want to verify that imperative code is safe to execute concurrently when compiled,
+you can specify that a method does not read or write any shared state,
+and therefore cannot encounter race conditions or runtime crashes related to
+unsafe communication between concurrent executions.
+See [the `{:concurrent}` attribute](#sec-concurrent-attribute) for more details.
+
+It is not just the body of a function or method that is subject to `reads`
 checks, but also its precondition and the `reads` clause itself.
 
 A `reads` clause can list a wildcard `*`, which allows the enclosing
-function to read anything. In many cases, and in particular in all cases
+function or method to read anything. 
+This is the implicit default for methods with no `reads` clauses,
+allowing methods to read whatever they like.
+The default for functions, however, is to not allow reading any memory.
+Allowing functions to read arbitrary memory is more problematic:
+in many cases, and in particular in all cases
 where the function is defined recursively, this makes it next to
 impossible to make any use of the function. Nevertheless, as an
 experimental feature, the language allows it (and it is sound).
@@ -491,7 +510,7 @@ If a `reads` clause uses `*`, then the `reads` clause is not allowed to
 mention anything else (since anything else would be irrelevant, anyhow).
 
 A `reads` clause specifies the set of memory locations that a function,
-lambda, or iterator may read. The readable memory locations are all the fields
+lambda, or method may read. The readable memory locations are all the fields
 of all of the references given in the set specified in the frame expression
 and the single fields given in [`FrameField`](#sec-frame-expression) elements of the frame expression.
 For example, in
@@ -546,7 +565,7 @@ another function. For example, function `Sum` adds up the values of
 ```dafny
 function Sum(f: int ~> real, lo: int, hi: int): real
   requires lo <= hi
-  requires forall i :: lo <= i < hi ==> f.requires(i)
+  requires forall i :: f.requires(i)
   reads f.reads
   decreases hi - lo
 {
@@ -562,9 +581,29 @@ read. More precise would be to specify that `Sum` reads only what `f`
 reads on the values from `lo` to `hi`, but the larger set denoted by
 `reads f.reads` is easier to write down and is often good enough.)
 
+Without such `reads` function, one could also write the more precise
+and more verbose:
+<!-- %check-verify -->
+```dafny
+function Sum(f: int ~> real, lo: int, hi: int): real
+  requires lo <= hi
+  requires forall i :: lo <= i < hi ==> f.requires(i)
+  reads set i, o | lo <= i < hi && o in f.reads(i) :: o
+  decreases hi - lo
+{
+  if lo == hi then 0.0 else
+    f(lo) + Sum(f, lo + 1, hi)
+}
+```
+
 Note, only `reads` clauses, not `modifies` clauses, are allowed to
 include functions as just described.
 
+Iterator specifications also allow `reads` clauses,
+with the same syntax and interpretation of arguments as above,
+but the meaning is quite different!
+See [Section 5.11](#sec-iterator-types) for more details.
+
 ### 7.1.6. Modifies Clause ([grammar](#g-modifies-clause)) {#sec-modifies-clause}
 
 Examples:
@@ -581,12 +620,11 @@ method Q()
   modifies o, p`f
 ```
 
-Frames also affect methods. Methods are not
-required to list the things they read. Methods are allowed to read
+By default, methods are allowed to read
 whatever memory they like, but they are required to list which parts of
 memory they modify, with a `modifies` annotation. These are almost identical
 to their `reads` cousins, except they say what can be changed, rather than
-what the value of the function depends on. In combination with reads,
+what the definition depends on. In combination with reads,
 modification restrictions allow Dafny to prove properties of code that
 would otherwise be very difficult or impossible. Reads and modifies are
 one of the tools that allow Dafny to work on one method at a time,
@@ -684,10 +722,12 @@ class C {
 }
 ```
 
-A method specification consists of zero or more `modifies`, `requires`,
+A method specification consists of zero or more `reads`, `modifies`, `requires`,
 `ensures` or `decreases` clauses, in any order.
-A method does not have `reads` clauses because methods are allowed to
-read any memory.
+A method does not need `reads` clauses in most cases,
+because methods are allowed to read any memory by default,
+but `reads` clauses are supported for use cases such as verifying safe concurrent execution.
+See [the `{:concurrent}` attribute](#sec-concurrent-attribute) for more details.
 
 ## 7.3. Function Specification ([grammar](#g-function-specification)) {#sec-function-specification}
 
@@ -735,7 +775,7 @@ and `yield ensures` clauses.
 An iterator specification applies both to the iterator's constructor
 method and to its `MoveNext` method.
 - The `reads` and `modifies`
-clauses apply to both of them. 
+clauses apply to both of them (but `reads` clauses have a [different meaning on iterators](#sec-iterator-types) than on functions or methods).
 - The `requires` and `ensures` clauses apply to the constructor.
 - The `yield requires` and `yield ensures` clauses apply to the `MoveNext` method.
 
@@ -746,6 +786,8 @@ Examples of iterators, including iterator specifications, are given in
 - a decreases clause is used to show that the iterator will eventually terminate
 - a yield requires clause is a precondition for calling `MoveNext`
 - a yield ensures clause is a postcondition for calling `MoveNext`
+- a reads clause gives a set of memory locations that will be unchanged after a `yield` statement
+- a modifies clause gives a set of memory locations the iterator may write to
 
 ## 7.6. Loop Specification ([grammar](#g-loop-specification)) {#sec-loop-specification}
 
@@ -844,3 +886,70 @@ add:
    requires Valid()
    reads Repr
 ```
+
+## 7.8. Well-formedness of specifications {#sec-well-formedness-specifications}
+
+Dafny ensures that the [`requires` clauses](#sec-requires-clause)
+and [`ensures` clauses](#sec-ensures-clause), which are expressions,
+are [well-formed](#sec-assertion-batches) independent of the body
+they belong to.
+Examples of conditions this rules out are null pointer dereferencing,
+out-of-bounds array access, and division by zero.
+Hence, when declaring the following method:
+
+<!-- %check-verify -->
+```dafny
+method Test(a: array<int>) returns (j: int)
+  requires a.Length >= 1
+  ensures a.Length % 2 == 0 ==> j >= 10 / a.Length
+{
+  j := 20;
+  var divisor := a.Length;
+  if divisor % 2 == 0 {
+    j := j / divisor;
+  }
+}
+```
+
+Dafny will split the verification in two [assertion batches](#sec-assertion-batches)
+that will roughly look like the following lemmas:
+
+<!-- %check-verify %options --allow-axioms -->
+```dafny
+lemma Test_WellFormed(a: array?<int>)
+{
+  assume a != null;       // From the definition of a
+  assert a != null;       // for the `requires a.Length >= 1`
+  assume a.Length >= 1;   // After well-formedness, we assume the requires
+  assert a != null;       // Again for the `a.Length % 2`
+  if a.Length % 2 == 0 {
+    assert a != null;     // Again for the final `a.Length`
+    assert a.Length != 0; // Because of the 10 / a.Length
+  }
+}
+
+method Test_Correctness(a: array?<int>)
+{ // Here we assume the well-formedness of the condition
+  assume a != null;       // for the `requires a.Length >= 1`
+  assume a != null;       // Again for the `a.Length % 2`
+  if a.Length % 2 == 0 {
+    assume a != null;     // Again for the final `a.Length`
+    assume a.Length != 0; // Because of the 10 / a.Length
+  }
+
+  // Now the body is translated
+  var j := 20;
+  assert a != null;          // For `var divisor := a.Length;`
+  var divisor := a.Length;
+  if * {
+    assume divisor % 2 == 0;
+    assert divisor != 0;
+    j := j / divisor;
+  }
+  assume divisor % 2 == 0 ==> divisor != 0;
+  assert a.Length % 2 == 0 ==> j >= 10 / a.Length;
+}
+```
+
+For this reason the IDE typically reports at least two [assertion batches](#sec-assertion-batches)
+when hovering a method.
diff --git a/docs/DafnyRef/Statements.10.expect b/docs/DafnyRef/Statements.10.expect
index 61c7fb50662..5522d312aae 100644
--- a/docs/DafnyRef/Statements.10.expect
+++ b/docs/DafnyRef/Statements.10.expect
@@ -1,3 +1,3 @@
-text.dfy(8,13): Error: assertion could not be proved
+text.dfy(8,4): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/Statements.13.expect b/docs/DafnyRef/Statements.13.expect
index 4e574bf02ac..bb385285b2a 100644
--- a/docs/DafnyRef/Statements.13.expect
+++ b/docs/DafnyRef/Statements.13.expect
@@ -1,3 +1,3 @@
-text.dfy(3,5): Warning: /!\ No terms found to trigger on.
+text.dfy(3,5): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 
 Dafny program verifier did not attempt verification
diff --git a/docs/DafnyRef/Statements.14.expect b/docs/DafnyRef/Statements.14.expect
index 49393636521..9932a32402c 100644
--- a/docs/DafnyRef/Statements.14.expect
+++ b/docs/DafnyRef/Statements.14.expect
@@ -1,3 +1,3 @@
-text.dfy(13,5): Warning: /!\ No terms found to trigger on.
+text.dfy(13,5): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 
 Dafny program verifier did not attempt verification
diff --git a/docs/DafnyRef/Statements.15.expect b/docs/DafnyRef/Statements.15.expect
index 90942e24622..a6b281c16d0 100644
--- a/docs/DafnyRef/Statements.15.expect
+++ b/docs/DafnyRef/Statements.15.expect
@@ -1,3 +1,3 @@
-text.dfy(6,2): Warning: note, this loop has no body (loop frame: i)
+text.dfy(6,2): Warning: this loop has no body (loop frame: i)
 
 Dafny program verifier did not attempt verification
diff --git a/docs/DafnyRef/Statements.16.expect b/docs/DafnyRef/Statements.16.expect
new file mode 100644
index 00000000000..971d1af6958
--- /dev/null
+++ b/docs/DafnyRef/Statements.16.expect
@@ -0,0 +1,3 @@
+text.dfy(17,2): Error: assertion might not hold
+
+Dafny program verifier finished with 2 verified, 1 error
diff --git a/docs/DafnyRef/Statements.3.expect b/docs/DafnyRef/Statements.3.expect
index ca0b8ffa7f0..a3cdeb0e2bf 100644
--- a/docs/DafnyRef/Statements.3.expect
+++ b/docs/DafnyRef/Statements.3.expect
@@ -1,5 +1,5 @@
-text.dfy(12,2): Warning: note, this loop has no body (loop frame: i, a, $Heap)
-text.dfy(16,11): Error: assertion could not be proved
-text.dfy(18,16): Error: assertion could not be proved
+text.dfy(12,2): Warning: this loop has no body (loop frame: i, a, $Heap)
+text.dfy(16,2): Error: assertion could not be proved
+text.dfy(18,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 1 verified, 2 errors
diff --git a/docs/DafnyRef/Statements.5.expect b/docs/DafnyRef/Statements.5.expect
index a30c42d79b7..b054160782e 100644
--- a/docs/DafnyRef/Statements.5.expect
+++ b/docs/DafnyRef/Statements.5.expect
@@ -1,4 +1,4 @@
-text.dfy(2,14): Error: assertion could not be proved
-text.dfy(3,11): Error: assertion could not be proved
+text.dfy(2,2): Error: assertion could not be proved
+text.dfy(3,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 2 errors
diff --git a/docs/DafnyRef/Statements.6.expect b/docs/DafnyRef/Statements.6.expect
index 35f0ff1bdb0..a34c37cecfd 100644
--- a/docs/DafnyRef/Statements.6.expect
+++ b/docs/DafnyRef/Statements.6.expect
@@ -1,3 +1,3 @@
-text.dfy(2,14): Error: assertion could not be proved
+text.dfy(2,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/Statements.7.expect b/docs/DafnyRef/Statements.7.expect
index 35f0ff1bdb0..a34c37cecfd 100644
--- a/docs/DafnyRef/Statements.7.expect
+++ b/docs/DafnyRef/Statements.7.expect
@@ -1,3 +1,3 @@
-text.dfy(2,14): Error: assertion could not be proved
+text.dfy(2,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/Statements.8b.expect b/docs/DafnyRef/Statements.8b.expect
new file mode 100644
index 00000000000..0732822b503
--- /dev/null
+++ b/docs/DafnyRef/Statements.8b.expect
@@ -0,0 +1,4 @@
+text.dfy(6,13): Error: function precondition could not be proved
+text.dfy(3,30): Related location: this proposition could not be proved
+
+Dafny program verifier finished with 8 verified, 1 error
diff --git a/docs/DafnyRef/Statements.md b/docs/DafnyRef/Statements.md
index 2e8c8b7bc0d..a47fc45aa9e 100644
--- a/docs/DafnyRef/Statements.md
+++ b/docs/DafnyRef/Statements.md
@@ -179,8 +179,7 @@ a, b.e().f := m() {:attr};
 
 In this case, the right-hand-side must be a method call and the number of
 left-hand sides must match the number of out-parameters of the
-method that is called or there must be just one ``Lhs`` to the left of
-the `:=`, which then is assigned a tuple of the out-parameters.
+method that is called.
 Note that the result of a method call is not allowed to be used as an argument of
 another method call, as if it were an expression.
 
@@ -258,6 +257,38 @@ Note that the syntax
 
 is interpreted as a label in which the user forgot the `label` keyword.
 
+### 8.5.6. Method call with a `by` proof
+
+The purpose of this form of a method call is to seperate the called method's
+precondition and its proof from the rest of the correctness proof of the
+calling method.
+
+<!-- %check-verify Statements.16.expect -->
+```dafny
+opaque predicate P() { true }
+
+lemma ProveP() ensures P() {
+  reveal P();
+}
+
+method M(i: int) returns (r: int)
+  requires P()
+  ensures r == i
+{ r := i; }
+
+method C() {
+  var v := M(1/3) by { // We prove 3 != 0 outside of the by proof
+    ProveP();          // Prove precondtion  
+  }
+  assert v == 0;       // Use postcondition
+  assert P();          // Fails
+}
+```
+
+By placing the call to lemma `ProveP` inside of the by block, we can not use
+`P` after the method call. The well-formedness checks of the arguments to the
+method call are not subject to the separation.
+
 ## 8.6. Update with Failure Statement (`:-`) ([grammar](#g-update-with-failure-statement)) {#sec-update-with-failure-statement}
 
 See the subsections below for examples.
@@ -1527,15 +1558,16 @@ variable `i` becomes smaller each loop iteration, and is bounded below by
 zero. When `i` becomes 0, the lower bound of the well-founded order, control
 flow exits the loop.
 
-This is fine, except the loop is backwards from most loops, which
+This is fine, except the loop is backwards compared to most loops, which
 tend to count up instead of down. In this case, what decreases is not the
 counter itself, but rather the distance between the counter and the upper
 bound. A simple trick for dealing with this situation is given below:
 
 <!-- %check-verify -->
 ```dafny
-method m(m: nat, n: int) {
-  assume m <= n;
+method m(m: nat, n: int) 
+  requires m <= n 
+{
   var i := m;
   while i < n
     invariant 0 <= i <= n
@@ -1643,7 +1675,7 @@ the loop needs to be declared either with `invariant c.data == 100` or with
 When a loop has an explicit `modifies` clause, there is, at the top of
 every iteration, a proof obligation that
 
-* the expressions given in the `modifies` clause are well-formed, and
+* the expressions given in the `modifies` clause are [well-formed](#sec-assertion-batches), and
 * everything indicated in the loop `modifies` clause is allowed to be modified by the
   (effective `modifies` clause of the) enclosing loop or method.
 
@@ -1854,7 +1886,7 @@ Examples of this form of assert are given in the section of the [`reveal`](#sec-
 
 An assert statement may have a label, whose use is explained in [Section 8.20.1](#sec-reveal-assertions).
 
-The attributes recognized for assert statements are discussed in [Section 11.3](#sec-verification-attributes-on-assertions).
+The attributes recognized for assert statements are discussed in [Section 11.4](#sec-verification-attributes-on-assertions).
 
 Using `...` as the argument of the statement is deprecated.
 
@@ -1879,14 +1911,10 @@ the program required the proposition. By using the `assume` statement
 the other verification can proceed. Then when that is completed the
 user would come back and replace the `assume` with `assert`.
 
-An `assume` statement cannot be compiled. In fact, the compiler
-will complain if it finds an `assume` anywhere.
-
-Using an `{:axiom}` attribute makes the claim that the assume statement is
-OK because it is known outside the Dafny program to be true.
-The verifier will not complain about it, but it is the user's 
-responsibility to be absolutely sure that the proposition is
-indeed true.
+To help the user not forget about that last step, a warning is emitted for any assume statement.
+Adding the `{:axiom}` attribute to the assume will suppress the warning,
+indicating the user takes responsibility for being absolutely sure 
+that the proposition is indeed true.
 
 Using `...` as the argument of the statement is deprecated.
 
@@ -1934,7 +1962,7 @@ it cannot be verified that `Random` actually satisfies this specification.
 
 To mitigate this situation somewhat, we can define a wrapper function, `Random'`,
 that calls `Random` but in which we can put some run-time checks:
-<!-- %check-resolve -->
+<!-- %check-resolve %options --allow-external-contracts -->
 ```dafny
 method {:extern} Random(n: nat) returns (r: nat)
 
@@ -2034,7 +2062,7 @@ is not used subsequently.  For example, consider
 ```dafny
 method m(i: int) {
   assert x: i == 0; // Fails
-  assert i == 0; // Fails also because the x: makes the first assertion opaque
+  assert i == 0; // Fails also because the label 'x:' hides the first assertion
 }
 ```
 The first assertion fails. Without the label `x:`, the second would succeed because after a failing assertion, the 
@@ -2102,27 +2130,75 @@ relevant information.
 Section 7 of [http://leino.science/papers/krml276.html](http://leino.science/papers/krml276.html) provides 
 an extended illustration of this technique to make all the dependencies of an `assert` explicit.
 
-### 8.20.3. Revealing function bodies
+### 8.20.3. Hiding and revealing function bodies {#hide-statement}
 
-Normally function bodies are transparent and available for constructing proofs of assertions that use those functions.
-However, sometimes it is helpful to mark a function [`{:opaque}`](#sec-opaque) and treat it as an uninterpreted function, whose properties are
-just its specifications.  This action limits the information available to the logical reasoning engine and may make a proof 
-possible where there might be information overload otherwise.
+By default, function bodies are revealed and available for constructing proofs of assertions that use those functions.
+However, if a function body is not necessary for a proof, the runtime of the proof can be improved by hiding that body.
+To do this, use the hide statement. Here's an example:
 
-But then there may be specific instances where the definition of that opaque function is needed. In that situation, the
-body of the function can be _revealed_ using the reveal statement. Here is an example:
-<!-- %check-verify Statements.9.expect -->
+<!-- %check-verify %options --isolate-assertions --type-system-refresh -->
 ```dafny
-opaque function f(i: int): int { i + 1 }
+// We are using the options --isolate-assertions and --type-system-refresh
+method Outer(x: int)
+  requires ComplicatedBody(x) 
+{
+  hide ComplicatedBody; // This hides the body of ComplicatedBody for the remainder of the method.
+  
+  // The body of ComplicatedBody is not needed to prove the requires of Inner
+  var y := Inner(x);
+  
+  // We reveal ComplicatedBody inside the following expression, to prove that we are not dividing by zero
+  var z := (reveal ComplicatedBody; 10 / x);
+}
 
-method m(i: int) {
-  assert f(i) == i + 1;
+method Inner(x: int) returns (r: int)
+  requires ComplicatedBody(x)
+
+predicate ComplicatedBody(x: int) {
+  x != 0 && true // pretend true is complicated 
+}
+```
+
+Here is a larger example that shows the rules for hide and reveal statements when used on functions:
+
+<!-- %check-verify Statements.8b.expect %options --isolate-assertions --type-system-refresh -->
+```dafny
+// We are using the options --isolate-assertions and --type-system-refresh
+predicate P() { true }
+predicate Q(x: bool) requires x
+
+method Foo() {
+  var q1 := Q(hide P; P()); // error, precondition not satisfied
+  var q2 := Q(hide P; reveal P; P()); // no error
+  
+  hide *;
+  
+  var q3 := Q(P()); // error, precondition not satisfied
+  var q4 := Q(reveal P; P()); // no error
+  
+  if (*) {
+    reveal P;
+    assert P();
+  } else {
+    assert P(); // error
+  }
+  reveal P;
+  if (*) {
+    assert P();
+  } else {
+    hide *;
+    assert P(); // error
+  }
+  
+  hide *;
+  if (*) {
+    reveal P;
+  } else {
+    reveal P;
+  }
+  assert P(); // error, since the previous two reveal statements are out of scope
 }
 ```
-Without the [`opaque`] modifier, the assertion is valid; with the modifier it cannot be proved because the body of the
-function is not visible. However if a `reveal f();` statement is inserted before the assertion, the proof succeeds.
-Note that the pseudo-function-call in the `reveal` statement is written without arguments and serves to mark `f` as a function name
-instead of a label.
 
 ### 8.20.4. Revealing constants
 
@@ -2400,4 +2476,27 @@ the expressions is to provide hints to aid Dafny in proving that
 step. As shown in the example, comments can also be used to aid
 the human reader in cases where Dafny can prove the step automatically.
 
+## 8.24. Opaque Block ([grammar](#g-opaque-block)) {#sec-opaque-block}
+As a Dafny sequence of statements grows in length, it can become harder to verify later statements in the block. With each statement, new information can become available, and with each modification of the heap, it becomes more expensive to access information from an older heap version. To reduce the verification complexity of long lists of statements, Dafny users can extract part of this block into a separate method or lemma. However, doing so introduces some boilerplate, which is where opaque blocks come in. They achieve a similar effect on verification performance as extracting code, but without the boilerplate. 
+
+An opaque block is similar to a block statement: it contains a sequence of zero or more statements, enclosed by curly braces. However, an opaque block is preceded by the keyword 'opaque', and may define ensures and modifies clauses before the curly braces. Anything that happens inside the block is invisible to the statements that come after it, unless it is specified by the ensures clause. Here is an example:
+
+<!-- %check-verify Statements.opaqueBlock.expect -->
+```dafny
+method OpaqueBlockUser() returns (x: int)
+  ensures x > 4 
+{
+  x := 1;
+  var y := 1;
+  opaque
+    ensures x > 3 
+  {
+    x := x + y;
+    x := x + 2;
+  }
+  assert x == 4; // error
+  x := x + 1;
+}
+```
 
+By default, the modifies clause of an opaque block is the same as that of the enclosing context. Opaque blocks may be nested.
diff --git a/docs/DafnyRef/Statements.opaqueBlock.expect b/docs/DafnyRef/Statements.opaqueBlock.expect
new file mode 100644
index 00000000000..04352d31b9a
--- /dev/null
+++ b/docs/DafnyRef/Statements.opaqueBlock.expect
@@ -0,0 +1,3 @@
+text.dfy(12,2): Error: assertion might not hold
+
+Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/Topics.3.expect b/docs/DafnyRef/Topics.3.expect
index a5f9b7e52ef..66c482d6870 100644
--- a/docs/DafnyRef/Topics.3.expect
+++ b/docs/DafnyRef/Topics.3.expect
@@ -1,3 +1,3 @@
 text.dfy(6,10): Error: the type of this variable is underspecified
-text.dfy(6,15): Error: type parameter 'T' (inferred to be '?') in the function call to 'EmptySet' could not be determined
+text.dfy(6,23): Error: type parameter 'T' (inferred to be '?') in the function call to 'EmptySet' could not be determined
 2 resolution/type errors detected in text.dfy
diff --git a/docs/DafnyRef/Topics.md b/docs/DafnyRef/Topics.md
index 866a8537187..2dda40fa2af 100644
--- a/docs/DafnyRef/Topics.md
+++ b/docs/DafnyRef/Topics.md
@@ -1146,3 +1146,29 @@ method TestD(dd: D) {
   }
 }
 ```
+
+## 12.8. Quantifier instantiation rules {#sec-quantifier-triggers}
+During verification, when Dafny knows that a universal quantifier is true, such as when verifying the body of a function that has the requires clause `forall x :: f(x) == 1`, it may instantiate the quantifier. Instantiation means Dafny will pick a value for all the variables of the quantifier, leading to a new expression, which it hopes to use to prove an assertion. In the above example, instantiating using `3` for `x` will lead to the expression `f(3) == 1`.
+
+For each universal quantifier, Dafny generates rules to determine which instantiations are worthwhile doing. We call these rules triggers, a term that originates from SMT solvers. If Dafny can not generate triggers for a specific quantifier, it falls back to a set of generic rules. However, this is likely to be problematic, since the generic rules can cause many useless instantiations, leading to verification timing out or failing to proof a valid assertion. When the generic rules are used, Dafny emits a warning telling the user no triggers were found for the quantifier, indicating the Dafny program should be changed so Dafny can find triggers for this quantifier.
+
+Here follows the approach Dafny uses to generate triggers based on a quantifier. Dafny finds terms in the quantifier body where a quantified variable is used in an operation, such as in a function application `P(x)`, array access `a[x]`, member accesses `x.someField`, or set membership tests `x in S`. To find a trigger, Dafny must find a set of such terms so that each quantified variable is used. You can investigate which triggers Dafny finds by hovering over quantifiers in the IDE and looking for 'Selected triggers', or by using the options `--show-tooltips` when using the LCI.
+
+There are particular expressions which, for technical reasons, Dafny can not use as part of a trigger. Among others, these expression include: [match](#sec-match-expression), [let](#sec-let-expression), [arithmetic operations and logical connectives](#sec-expressions). For example, in the quantifier `forall x :: x in S ⇐⇒ f(x) > f(x+1)`, Dafny will use `x in S` and `f(x)` as trigger terms, but will not use `x+1` or any terms that contain it. You can investigate which triggers Dafny can not use by hovering over quantifiers in the IDE and looking for 'Rejected triggers', or by using the options `--show-tooltips` when using the LCI.
+
+Besides not finding triggers, another problematic situation is when Dafny was able to generate triggers, but believes the triggers it found may still cause useless instantiations because they create matching loops. Dafny emits a warning when this happens, indicating the Dafny program should be changed so Dafny can find triggers for this quantifier that do not cause matching loops.
+
+To understand matching loops, one needs to understand how triggers are used. During a single verification run, such as verifying a method or function, Dafny maintains a set of expressions which it believes to be true, which we call the ground terms. For example, in the body of a method, Dafny knows the requires clauses of that method hold, so the expressions in those will be ground terms. When Dafny steps through the statements of the body, the set of ground terms grows. For example, when an assignment `var x := 3` is evaluated, a ground term `x == 3` will be added. Given a universal quantifier that's a ground term, Dafny will try to pattern match its triggers on sub-expressions of other ground terms. If the pattern matches, that sub-expression is used to instantiate the quantifier. 
+
+Dafny makes sure not to perform the exact same instantiation twice. However, if an instantiation leads to a new term that also matches the trigger, but is different from the term used for the instantiation, the quantifier may be instantiated too often, an event we call a matching loop. For example, given the ground terms `f(3)` and `forall x {f(x)} :: f(x) + f(f(x))`, where `{f(x)}` indicates the trigger for the quantifier, Dafny may instantiate the quantifier using `3` for `x`. This creates a new ground term `f(3) + f(f(3))`, of which the right hand side again matches the trigger, allowing Dafny to instantiate the quantifier again using `f(3)` for `x`, and again and again, leading to an unbounded amount of instantiations.
+
+Even existential quantifiers need triggers. This is because when Dafny determines an existential quantifier is false, for example in the body of a method that has `requires !exists x :: f(x) == 2`, Dafny will use a logical rewrite rule to change this existential into a universal quantifier, so it becomes `requires forall x :: f(x) != 2`. Before verification, Dafny can not determine whether quantifiers will be determined to be true or false, so it must assume any quantifier may turn into a universal quantifier, and thus they all need triggers. Besides quantifiers, comprehensions such as set and map comprehensions also need triggers, since these are modeled using universal quantifiers.
+
+Dafny may report 'Quantifier was split into X parts'. This occurs when Dafny determines it can only generate good triggers for a quantifier by splitting it into multiple smaller quantifiers, whose aggregation is logically equivalent to the original one. To maintain logical equivalence, Dafny may have to generate more triggers than if the split had been done manually in the Dafny source file. An example is the expression `forall x :: P(x) && (Q(x) =⇒ P(x+1))`, which Dafny will split into
+<!-- %no-check -->
+```dafny
+forall x {P(x)} {Q(x)} :: P(x) &&
+forall x {(Q(x)} :: Q(x) =⇒ P(x+1)
+```
+
+Note the trigger `{Q(x)}` in the first quantifier, which was added to maintain equivalence with the original quantifier. If the quantifier had been split in source, only the trigger `{P(x)}` would have been added for `forall x :: P(x)`.
diff --git a/docs/DafnyRef/Types.11.expect b/docs/DafnyRef/Types.11.expect
index 607b134067d..881c05e2302 100644
--- a/docs/DafnyRef/Types.11.expect
+++ b/docs/DafnyRef/Types.11.expect
@@ -1,3 +1,3 @@
-text.dfy(11,25): Error: argument at index 1 ('d') might not be allocated in the two-state function's previous state
+text.dfy(11,25): Error: argument at index 1 for parameter 'd' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new d: Cell', arguments can refer to expressions possibly unallocated in the previous state
 
 Dafny program verifier finished with 2 verified, 1 error
diff --git a/docs/DafnyRef/Types.12.expect b/docs/DafnyRef/Types.12.expect
index 92111995947..ef354a07b10 100644
--- a/docs/DafnyRef/Types.12.expect
+++ b/docs/DafnyRef/Types.12.expect
@@ -1,3 +1,3 @@
-text.dfy(10,27): Error: argument at index 0 ('c') might not be allocated in the two-state function's previous state
+text.dfy(10,27): Error: argument at index 0 for parameter 'c' could not be proved to be allocated in the two-state function's previous state -- if you add 'new' before the parameter declaration, like 'new c: Cell', arguments can refer to expressions possibly unallocated in the previous state
 
 Dafny program verifier finished with 2 verified, 1 error
diff --git a/docs/DafnyRef/Types.19.expect b/docs/DafnyRef/Types.19.expect
index 6337db908d3..4ac23827a38 100644
--- a/docs/DafnyRef/Types.19.expect
+++ b/docs/DafnyRef/Types.19.expect
@@ -1,3 +1,3 @@
-text.dfy(9,11): Error: assertion could not be proved
+text.dfy(9,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/Types.20.expect b/docs/DafnyRef/Types.20.expect
index 940ebf0ff74..df1d037df0b 100644
--- a/docs/DafnyRef/Types.20.expect
+++ b/docs/DafnyRef/Types.20.expect
@@ -1,5 +1,5 @@
 text.dfy(26,0): Error: a postcondition could not be proved on this return path
-text.dfy(25,10): Related location: this is the postcondition that could not be proved
-text.dfy(10,9): Related location
+text.dfy(25,15): Related location: this is the postcondition that could not be proved
+text.dfy(10,9): Related location: this proposition could not be proved
 
 Dafny program verifier finished with 1 verified, 1 error
diff --git a/docs/DafnyRef/Types.21.expect b/docs/DafnyRef/Types.21.expect
index d2990e4842b..f2e6c548d23 100644
--- a/docs/DafnyRef/Types.21.expect
+++ b/docs/DafnyRef/Types.21.expect
@@ -1,4 +1,4 @@
 text.dfy(8,4): Error: field 'x', which is subject to definite-assignment rules, might be uninitialized at this point in the constructor body
-text.dfy(10,13): Error: assertion could not be proved
+text.dfy(10,4): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 2 errors
diff --git a/docs/DafnyRef/Types.25.expect b/docs/DafnyRef/Types.25.expect
index 5175bdf7f57..90911938794 100644
--- a/docs/DafnyRef/Types.25.expect
+++ b/docs/DafnyRef/Types.25.expect
@@ -1,3 +1,3 @@
-text.dfy(3,13): Error: assertion might not hold
+text.dfy(3,4): Error: assertion might not hold
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/Types.26.expect b/docs/DafnyRef/Types.26.expect
index d1254dad24d..99a48f2cc5d 100644
--- a/docs/DafnyRef/Types.26.expect
+++ b/docs/DafnyRef/Types.26.expect
@@ -1,2 +1,2 @@
-text.dfy(3,9): Error: type parameter (T) passed to type A must support nonempty (got Q) (perhaps try declaring abstract type 'Q' on line 2 as 'Q(00)', which says it can only be instantiated with a nonempty type)
+text.dfy(3,9): Error: type parameter (T) passed to type A must be nonempty (got Q) (perhaps try declaring abstract type 'Q' on line 2 as 'Q(00)', which says it can only be instantiated with a nonempty type)
 1 resolution/type errors detected in text.dfy
diff --git a/docs/DafnyRef/Types.7a.expect b/docs/DafnyRef/Types.7a.expect
index 068c5824d44..2fc74e63134 100644
--- a/docs/DafnyRef/Types.7a.expect
+++ b/docs/DafnyRef/Types.7a.expect
@@ -1,3 +1,3 @@
-text.dfy(5,11): Error: assertion could not be proved
+text.dfy(5,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/Types.9.expect b/docs/DafnyRef/Types.9.expect
index f485f75cf55..8100593ed11 100644
--- a/docs/DafnyRef/Types.9.expect
+++ b/docs/DafnyRef/Types.9.expect
@@ -1,3 +1,3 @@
-text.dfy(10,10): Error: type parameter (T) passed to type ResultN must support no references (got C)
-text.dfy(12,10): Error: type parameter (T) passed to type ResultN must support no references (got array<int>)
+text.dfy(10,10): Error: type parameter (T) passed to type ResultN must contain no references (got C)
+text.dfy(12,10): Error: type parameter (T) passed to type ResultN must contain no references (got array<int>)
 2 resolution/type errors detected in text.dfy
diff --git a/docs/DafnyRef/Types.md b/docs/DafnyRef/Types.md
index c6f891578b1..744008a9069 100644
--- a/docs/DafnyRef/Types.md
+++ b/docs/DafnyRef/Types.md
@@ -49,7 +49,7 @@ Dafny supports both reference types that contain the special `null` value
 
 A _Named Type_ is used to specify a user-defined type by a (possibly module- or class-qualified) name.
 Named types are introduced by
-class, trait, inductive, coinductive, synonym and opaque
+class, trait, inductive, coinductive, synonym and abstract
 type declarations. They are also used to refer to type variables.
 A Named Type is denoted by a dot-separated sequence of name segments ([Section 9.32](#sec-name-segment)).
 
@@ -181,7 +181,7 @@ C <== B <== A
 To illustrate the short-circuiting rules, note that the expression
 `a.Length` is defined for an array `a` only if `a` is not `null` (see
 [Section 5.1.2](#sec-reference-types)), which means the following two
-expressions are well-formed:
+expressions are [well-formed](#sec-assertion-batches):
 <!-- %no-check -->
 ```dafny
 a != null ==> 0 <= a.Length
@@ -193,9 +193,9 @@ The contrapositives of these two expressions would be:
 a.Length < 0 ==> a == null  // not well-formed
 a == null <== a.Length < 0  // not well-formed
 ```
-but these expressions are not well-formed, since well-formedness
+but these expressions might not necessarily be [well-formed](#sec-assertion-batches), since well-formedness
 requires the left (and right, respectively) operand, `a.Length < 0`,
-to be well-formed by itself.
+to be [well-formed](#sec-assertion-batches) in their context.
 
 Implication `A ==> B` is equivalent to the disjunction `!A || B`, but
 is sometimes (especially in specifications) clearer to read.  Since,
@@ -204,12 +204,12 @@ is sometimes (especially in specifications) clearer to read.  Since,
 ```dafny
 a == null || 0 <= a.Length
 ```
-is well-formed, whereas
+is [well-formed](#sec-assertion-batches) by itself, whereas
 <!-- %no-check -->
 ```dafny
 0 <= a.Length || a == null  // not well-formed
 ```
-is not.
+is not if the context cannot prove that `a != null`.
 
 In addition, booleans support _logical quantifiers_ (forall and
 exists), described in [Section 9.31.4](#sec-quantifier-expression).
@@ -937,7 +937,7 @@ expression `e` of type `T`, sets support the following operations:
  expression          | precedence | result type |  description
 ---------------------|:---:|:---:|------------------------------------
  `e in s`            | 4   | `bool` | set membership
- `e !in s`           | 3   | `bool` | set non-membership
+ `e !in s`           | 4   | `bool` | set non-membership
  `|s|`               | 11  | `nat`  | set cardinality (not for `iset`)
 
 The expression `e !in s` is a syntactic shorthand for `!(e in s)`.
@@ -1085,9 +1085,10 @@ same name.
 
 #### 5.5.3.4. Other Sequence Expressions {#sec-other-sequence-expressions}
 In addition, for any sequence `s` of type `seq<T>`, expression `e`
-of type `T`, integer-based numeric `i` satisfying `0 <= i < |s|`, and
-integer-based numerics `lo` and `hi` satisfying
-`0 <= lo <= hi <= |s|`, sequences support the following operations:
+of type `T`, integer-based numeric index `i` satisfying `0 <= i < |s|`, and
+integer-based numeric bounds `lo` and `hi` satisfying
+`0 <= lo <= hi <= |s|`, noting that bounds can equal the length of the sequence,
+sequences support the following operations:
 
  expression         | precedence | result type | description
  -------------------|:---:|:---:|----------------------------------------
@@ -1131,7 +1132,7 @@ colon, then the length of the last slice extends until the end of `s`,
 that is, its length is `|s|` minus the sum of the given length
 designators.  For example, the following equalities hold, for any
 sequence `s` of length at least `10`:
-<!-- %check-verify -->
+<!-- %check-verify %options --allow-axioms -->
 ```dafny
 method m(s: seq<int>) {
   var t := [3.14, 2.7, 1.41, 1985.44, 100.0, 37.2][1:0:3];
@@ -1262,7 +1263,8 @@ the domain, the range, and the 2-tuples holding the key-value
 associations in the map. Note that `m.Values` will have a different
 cardinality than `m.Keys` and `m.Items` if different keys are
 associated with the same value. If `m` is an `imap`, then these
-expressions return `iset` values.
+expressions return `iset` values. If `m` is a map, `m.Values` and `m.Items`
+require the type of the range `U` to support equality.
 
 [^fn-map-membership]: This is likely to change in the future as
     follows:  The `in` and `!in` operations will no longer be
@@ -1292,7 +1294,7 @@ The `-` operator implements a map difference operator. Here the LHS
 is a `map<K,V>` or `imap<K,V>` and the RHS is a `set<K>` (but not an `iset`); the operation removes
 from the LHS all the (key,value) pairs whose key is a member of the RHS set.
 
-To avoid cuasing circular reasoning chains or providing too much informatino that might
+To avoid causing circular reasoning chains or providing too much information that might
 complicate Dafny's prover finding proofs, not all properties of maps are known by the prover by default.
 For example, the following does not prove:
 <!-- %check-verify Types.25.expect -->
@@ -1412,7 +1414,7 @@ type abstractly. There are several mechanisms in Dafny to do this:
 * ([Section 5.6.1](#sec-synonym-type)) A typical _synonym type_, in which a type name is a synonym for another type
 * ([Section 5.6.2](#sec-abstract-types)) An _abstract type_, in which a new type name is declared as an uninterpreted type
 * ([Section 5.6.3](#sec-subset-types)) A _subset type_, in which a new type name is given to a subset of the values of a given type
-* ([Section 0.0){#sec-newtypes)) A _newtype_, in which a subset type is declared, but with restrictions on converting to and from its base type
+* ([Section 5.7](#sec-newtypes)) A _newtype_, in which a subset type is declared, but with restrictions on converting to and from its base type
 
 ### 5.6.1. Type synonyms ([grammar](#g-type-definition)) {#sec-synonym-type}
 
@@ -1429,7 +1431,7 @@ type Y<T> = G
 ```
 declares `Y<T>` to be a synonym for the type `G`.
 If the `= G` is omitted then the declaration just declares a name as an uninterpreted
-_opaque_ type, as described in [Section 5.6.2](#sec-abstract-types).  Such types may be
+_abstract_ type, as described in [Section 5.6.2](#sec-abstract-types).  Such types may be
 given a definition elsewhere in the Dafny program.
 
   Here, `T` is a
@@ -1684,13 +1686,14 @@ and the subset type `(TT) --> U` is called the _partial arrow type_.
 think of the little gap between the two hyphens in `-->` as showing a broken
 arrow.)
 
-The built-in partial arrow type is defined as follows (here shown
+Intuitively, the built-in partial arrow type is defined as follows (here shown
 for arrows with arity 1):
 <!-- %no-check -->
 ```dafny
 type A --> B = f: A ~> B | forall a :: f.reads(a) == {}
 ```
-(except that what is shown here left of the `=` is not legal Dafny syntax).
+(except that what is shown here left of the `=` is not legal Dafny syntax
+and that the restriction could not be verified as is).
 That is, the partial arrow type is defined as those functions `f`
 whose reads frame is empty for all inputs.
 More precisely, taking variance into account, the partial arrow type
@@ -1773,7 +1776,7 @@ type BaseType
 predicate RHS(x: BaseType)
 type MySubset = x: BaseType | RHS(x) ghost witness MySubsetWitness()
 
-function MySubsetWitness(): BaseType
+function {:axiom} MySubsetWitness(): BaseType
   ensures RHS(MySubsetWitness())
 ```
 Here the type is given a ghost witness: the result of the expression
@@ -1857,7 +1860,7 @@ the newtype operations are defined only if the result satisfies the
 predicate `Q`, and likewise for the literals of the
 newtype.
 
-For example, suppose `lo` and `hi` are integer-based numerics that
+For example, suppose `lo` and `hi` are integer-based numeric bounds that
 satisfy `0 <= lo <= hi` and consider the following code fragment:
 <!-- %no-check -->
 ```dafny
@@ -1934,7 +1937,7 @@ Furthermore, for the compiler to be able to make an appropriate choice of
 representation, the constants in the defining expression as shown above must be
 known constants at compile-time. They need not be numeric literals; combinations
 of basic operations and symbolic constants are also allowed as described
-in [Section 9.37](#sec-compile-time-constants).
+in [Section 9.39](#sec-compile-time-constants).
 
 ### 5.7.1. Conversion operations {#sec-conversion}
 
@@ -2406,8 +2409,9 @@ an error message is generated.
 
 One-dimensional arrays support operations that convert a stretch of
 consecutive elements into a sequence.  For any array `a` of type
-`array<T>`, integer-based numerics `lo` and `hi` satisfying
-`0 <= lo <= hi <= a.Length`, the following operations each yields a
+`array<T>`, integer-based numeric bounds `lo` and `hi` satisfying
+`0 <= lo <= hi <= a.Length`, noting that bounds can equal the array's length,
+the following operations each yields a
 `seq<T>`:
 
  expression          | description
@@ -2494,7 +2498,7 @@ matrix.Length0 == m && matrix.Length1 == n
 Higher-dimensional arrays are similar (`Length0`, `Length1`,
 `Length2`, ...).  The array selection expression and array update
 statement require that the indices are in bounds.  For example, the
-swap statement above is well-formed only if:
+swap statement above is [well-formed](#sec-assertion-batches) only if:
 <!-- %no-check -->
 ```dafny
 0 <= i < matrix.Length0 && 0 <= j < matrix.Length1 &&
@@ -2669,6 +2673,16 @@ Note, in the precondition of the iterator, which is to hold upon
 construction of the iterator, the in-parameters are indeed
 in-parameters, not fields of `this`.
 
+`reads` clauses on iterators have a different meaning than they do on functions and methods.
+Iterators may read any memory they like, but because arbitrary code may be executed
+whenever they `yield` control, they need to declare what memory locations must not be modified
+by other code in order to maintain correctness.
+The contents of an iterator's `reads` clauses become part of the `reads` clause
+of the implicitly created `Valid()` predicate.
+This means if client code modifies any of this state,
+it will not be able to establish the precondition for the iterator's `MoveNext()` method,
+and hence the iterator body will never resume if this state is modified.
+
 It is regrettably tricky to use iterators. The language really
 ought to have a `foreach` statement to make this easier.
 Here is an example showing a definition and use of an iterator.
@@ -2856,21 +2870,48 @@ body.  For a function `f: T ~> U`, the value that the function yields
 for an input `t` of type `T` is denoted `f(t)` and has type `U`.
 
 Note that `f.reads` and `f.requires` are themselves functions.
-Suppose `f` has type `T ~> U` and `t` has type `T`.  Then, `f.reads`
-is a function of type `T ~> set<object?>` whose `reads` and `requires`
-properties are:
+Without loss of generality, suppose `f` is defined as:
+<!-- %no-check -->
+```dafny 
+function f<T,U>(x: T): U
+  reads R(x)
+  requires P(x)
+{
+  body(x)
+}
+```
+where `P`, `R`, and `body` are declared as:
+<!-- %no-check -->
+```dafny 
+predicate P<T>(x: T)
+function R<T>(x: T): set<object>
+function body<T,U>(x: T): U
+```
+Then, `f.reads` is a function of type `T ~> set<object?>` 
+whose `reads` and `requires` properties are given by the definition:
 <!-- %no-check -->
 ```dafny
-f.reads.reads(t) == f.reads(t)
-f.reads.requires(t) == true
+function f.reads<T>(x: T): set<object>
+  reads R(x)
+  requires P(x)
+{
+  R(x)
+}
 ```
 `f.requires` is a function of type `T ~> bool` whose `reads` and
-`requires` properties are:
+`requires` properties are given by the definition:
 <!-- %no-check -->
 ```dafny
-f.requires.reads(t) == f.reads(t)
-f.requires.requires(t) == true
+predicate f_requires<T>(x: T)
+  requires true
+  reads if P(x) then R(x) else *
+{
+  P(x)
+}
 ```
+where `*` is a notation to indicate that any memory location can
+be read, but is not valid Dafny syntax.
+
 In these examples, if `f` instead had type `T --> U` or `T -> U`,
 then the type of `f.reads` is `T -> set<object?>` and the type
 of `f.requires` is `T -> bool`.
@@ -2980,7 +3021,7 @@ Note that the expression
 ```dafny
 Cons(5, Nil).tail.head
 ```
-is not well-formed, since `Cons(5, Nil).tail` does not necessarily satisfy
+is not [well-formed](#sec-assertion-batches) by itself, since `Cons(5, Nil).tail` does not necessarily satisfy
 `Cons?`.
 
 A constructor can have the same name as
@@ -3558,7 +3599,7 @@ _TODO: Say more about the effect of this attribute and when it should be applied
 (and likely, correct the paragraph above)._
 
 
-# 6. Member declarations
+# 6. Member declarations {#sec-member-declaration}
 
 Members are the various kinds of methods, the various kinds of functions, mutable fields,
 and constant fields. These are usually associated with classes, but they also may be
@@ -4169,11 +4210,6 @@ default. To make it ghost, replace the keyword `function` with the two keywords
 (See the [--function-syntax option](#sec-function-syntax) for a description 
 of the migration path for this change in behavior.}
 
-Functions (including predicates, function-by-methods, two-state functions, and extreme predicates) may be 
-declared `opaque`. In that case, only the signature and specification of the method
-is known at its points of use, not its body. The body can be _revealed_ for reasoning
-purposes using the [reveal statment](#sec-reveal-statement).
-
 Like methods, functions can be either _instance_ (which they are by default when declared within a type) or
 _static_ (when the function declaration contains the keyword `static` or is declared in a module).
 An instance function, but not a static function, has an implicit receiver parameter, `this`.  
@@ -4251,34 +4287,36 @@ This means that the run-time evaluation of an expression may have print effects.
 If `--track-print-effects` is enabled, this use of print in a function context
 will be disallowed.
 
-### 6.4.4. Function Transparency
-A function is said to be _transparent_ in a location if the
-body of the function is visible at that point.
-A function is said to be _opaque_ at a location if it is not
-transparent. However the specification of a function
-is always available.
-
-A function is usually transparent up to some unrolling level (up to
-1, or maybe 2 or 3). If its arguments are all literals it is
-transparent all the way.
-
-But the transparency of a function is affected by
-whether the function was declared with an [`opaque` modifier]((#sec-opaque),
-the ([reveal statement](#sec-reveal-statement)),
-and whether it was `reveal`ed in an export set.
-
-- Inside the module where the function is declared:
-   - if there is no `opaque` modifier, the function is transparent
-   - if there is an `opaque` modifier, then the function is opaque,
-   except if the function is mentioned in a `reveal` statement, then
-   it is transparent between that `reveal` statement and the end of
-   the block containing the `reveal` statement.
-- Outside the module where the function is declared, the function is 
-visible only if it was listed in the export set by which the contents
-of its module was imported. In that case, if the function was exported
-with `reveals`, the rules are the same within the importing module as when the function is used inside
-its declaring module. If the function is exported only with `provides` it is
-always opaque and is not permitted to be used in a reveal statement.
+### 6.4.4. Function Hiding {#sec-opaque}
+A function is said to be _revealed_ at a location if the
+body of the function is visible for verification at that point, otherwise it is considered _hidden_.
+
+Functions are revealed by default, but can be hidden using the `hide` statement, which takes either a specific function or a wildcard, to hide all functions. Hiding a function can speed up verification of a proof if the body of that function is not needed for the proof. See the [hide statement](#hide-statement) for more information.
+
+Although mostly made obsolete by the hide statement, a function can also be hidden using the `opaque` keyword, or using the option `default-function-opacity`. Here are the rules regarding those:
+
+Inside the module where the function is declared:
+  - If `--default-function-opacity` is set to `transparent` (default), then:
+     - if there is no `opaque` modifier, the function is transparent.
+     - if there is an `opaque` modifier, then the function is opaque. If the function is mentioned in a `reveal` statement, then
+     its body is available starting at that `reveal` statement.
+
+  - If `--default-function-opacity` is set to `opaque`, then:
+    - if there is no [`{:transparent}` attribute](#sec-transparent), the function is opaque. If the function is mentioned in a `reveal` statement, then the body of the function is available starting at that `reveal` statement.
+    - if there is a [`{:transparent}` attribute](#sec-transparent), then the function is transparent.
+
+  - If `--default-function-opacity` is set to `autoRevealDependencies`, then:
+    - if there is no [`{:transparent}` attribute](#sec-transparent), the function is opaque. However, the body of the function is available inside any callable that depends on this function via an implicitly inserted `reveal` statement, unless the callable has the [`{autoRevealDependencies k}` attribute](#sec-autorevealdependencies) for some natural number `k` which is too low.
+    - if there is a [`{:transparent}` attribute](#sec-transparent), then the function is transparent.
+
+Outside the module where the function is declared, the function is
+  visible only if it was listed in the export set by which the contents
+  of its module was imported. In that case, if the function was exported
+  with `reveals`, the rules are the same within the importing module as when the function is used inside
+  its declaring module. If the function is exported only with `provides` it is
+  always hidden and is not permitted to be used in a reveal statement.
+
+More information about the Boogie implementation of opaquenes is [here](https://github.com/dafny-lang/dafny/blob/master/docs/Compilation/Boogie.md).
 
 ### 6.4.5. Extreme (Least or Greatest) Predicates and Lemmas
 See [Section 12.5.3](#sec-friendliness) for descriptions
@@ -4576,7 +4614,7 @@ both preceding and subsequent parameters, but there may not be any
 dependent cycle between the parameters and their default-value
 expressions.
 
-The well-formedness of default-value expressions is checked independent
+The [well-formedness](#sec-assertion-batches) of default-value expressions is checked independent
 of the precondition of the enclosing declaration. For a function, the
 parameter default-value expressions may only read what the function's
 `reads` clause allows. For a datatype constructor, parameter default-value
diff --git a/docs/DafnyRef/UserGuide.3.expect b/docs/DafnyRef/UserGuide.3.expect
index 9188c416079..9e9e2c4a6ba 100644
--- a/docs/DafnyRef/UserGuide.3.expect
+++ b/docs/DafnyRef/UserGuide.3.expect
@@ -1,3 +1,3 @@
-text.dfy(7,13): Error: assertion could not be proved
+text.dfy(7,4): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/UserGuide.4.expect b/docs/DafnyRef/UserGuide.4.expect
index 9188c416079..9e9e2c4a6ba 100644
--- a/docs/DafnyRef/UserGuide.4.expect
+++ b/docs/DafnyRef/UserGuide.4.expect
@@ -1,3 +1,3 @@
-text.dfy(7,13): Error: assertion could not be proved
+text.dfy(7,4): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/UserGuide.5.expect b/docs/DafnyRef/UserGuide.5.expect
index 55c85f1c344..3201dd8b97a 100644
--- a/docs/DafnyRef/UserGuide.5.expect
+++ b/docs/DafnyRef/UserGuide.5.expect
@@ -1,3 +1,3 @@
-text.dfy(6,13): Error: assertion could not be proved
+text.dfy(6,4): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/DafnyRef/UserGuide.md b/docs/DafnyRef/UserGuide.md
index d814d30be0c..5ad58d8a059 100644
--- a/docs/DafnyRef/UserGuide.md
+++ b/docs/DafnyRef/UserGuide.md
@@ -102,7 +102,7 @@ to be verified.
 
 [^fn-duplicate-files]: File names are considered equal if they have the same absolute path, compared as case-sensitive strings (regardless of whether the underlying file-system is case sensitive).  Using symbolic links may make the same file have a different absolute path; this will generally cause duplicate declaration errors.
 
-### 13.3.1. Dafny Build Artifacts: the Library Backend and .doo Files {#sec-doo-files}
+### 13.3.1. Dafny Verification Artifacts: the Library Backend and .doo Files {#sec-doo-files}
 
 As of Dafny 4.1, `dafny` now supports outputting a single file containing
 a fully-verified program along with metadata about how it was verified.
@@ -137,15 +137,48 @@ The exact file format is internal and may evolve over time to support additional
 
 Note that the library backend only supports the [newer command-style CLI interface](#sec-dafny-commands).
 
-## 13.4. Dafny Code Style
+### 13.3.2. Dafny Translation Artifacts: .dtr Files {#sec-dtr-files}
+
+Some options, such as `--outer-module` or `--optimize-erasable-datatype-wrapper`,
+affect what target language code the same Dafny code is translated to.
+In order to translate Dafny libraries separately from their consuming codebases,
+the translation process for consuming code needs to be aware
+of what options were used when translating the library.
+
+For example, if a library defines a `Foo()` function in an `A` module,
+but `--outer-module org.coolstuff.foolibrary.dafnyinternal` is specified when translating the library to Java,
+then a reference to `A.Foo()` in a consuming Dafny project
+needs to be translated to `org.coolstuff.foolibrary.dafnyinternal.A.Foo()`,
+independently of what value of `--outer-module` is used for the consuming project.
+
+To meet this need,
+`dafny translate` also outputs a `<program-name>-<target id>.dtr` Dafny Translation Record file.
+Like `.doo` files, `.dtr` files record all the relevant options that were used,
+in this case relevant to translation rather than verification.
+These files can be provided to future calls to `dafny translate` using the `--translation-record` option,
+in order to provide the details of how various libraries provided with the `--library` flag were translated.
+
+Currently `--outer-module` is the only option recorded in `.dtr` files,
+but more relevant options will be added in the future.
+A later version of Dafny will also require `.dtr` files that cover all modules
+that are defined in `--library` options,
+to support checking that all relevant options are compatible.
+
+## 13.4. Dafny Standard Libraries
+
+As of Dafny 4.4, the `dafny` tool includes standard libraries that any Dafny code base can depend on.
+For now they are only available when the `--standard-libraries` option is provided,
+but they will likely be available by default in the next major version of Dafny.
+
+See https://github.com/dafny-lang/dafny/blob/master/Source/DafnyStandardLibraries/README.md for details.
+
+## 13.5. Dafny Code Style
 
 There are coding style conventions for Dafny code, recorded [here](https://dafny-lang.github.io/dafny/StyleGuide/Style-Guide).
 Most significantly, code is written without tabs and with a 2 space indentation. Following code style conventions 
 improves readability but does not alter program semantics.
 
-
-
-## 13.5. Using Dafny From the Command Line {#command-line}
+## 13.6. Using Dafny From the Command Line {#command-line}
 
 `dafny` is a conventional command-line tool, operating just like other
 command-line tools in Windows and Unix-like systems.
@@ -153,7 +186,7 @@ In general, the format of a command-line is determined by the shell program that
 (.e.g., bash, the windows shell, COMMAND, etc.), 
 but is expected to be a series of space-separated "words", each representing a command, option, option argument, file, or folder. 
 
-### 13.5.1. dafny commands {#sec-dafny-commands}
+### 13.6.1. dafny commands {#sec-dafny-commands}
 
 As of v3.9.0, `dafny` uses a command-style command-line (like `git` for example); prior to v3.9.0, the 
 command line consisted only of options and files.
@@ -194,10 +227,10 @@ the language that the Dafny files are being compiled to. The kind of file is det
 - Boolean options can take the values `true` and `false` (or any case-insensitive version of those words). For example, the value of `--no-verify` is by default `false` (that is, do verification). 
 It can be explicitly set to true (no verification) using `--no-verify`, `--no-verify:true`, `--no-verify=true`, `--noverify true`; 
 it can be explicitly set false (do verification) using `--no-verify:false` or `--no-verify=false` or `--no-verify false`.
-- There is a potential ambiguity when the form `--option value` is used if the value is optional (such as for boolean values). In such a case an argument afer an option (that does not have an argument given with `:` or `=`) is interpreted as the value if it is indeed a valid value for that option. However, better style advises always using a ':' or '=' to set option values.
+- There is a potential ambiguity when the form `--option value` is used if the value is optional (such as for boolean values). In such a case an argument after an option (that does not have an argument given with `:` or `=`) is interpreted as the value if it is indeed a valid value for that option. However, better style advises always using a ':' or '=' to set option values.
 No valid option values in dafny look like filenames or begin with `--`.
 
-#### 13.5.1.1. Options that are not associated with a command
+#### 13.6.1.1. Options that are not associated with a command
 
 A few options are not part of a command. In these cases any single-hyphen spelling also permits a spelling beginning with '/'.
 - `dafny --help` or `dafny -h` lists all the available commands
@@ -205,7 +238,7 @@ A few options are not part of a command. In these cases any single-hyphen spelli
 - `dafny --version` (or `-version`) prints out the number of the version this build of dafny implements
 
 
-#### 13.5.1.2. `dafny resolve` {#sec-dafny-resolve}
+#### 13.6.1.2. `dafny resolve` {#sec-dafny-resolve}
 
 The `dafny resolve` command checks the command-line and then parses and typechecks the given files and any included files.
 
@@ -233,7 +266,7 @@ implementation.
 
 The options relevant to this command are
 - those relevant to the command-line itself
-   - `--warn-as-errors` --- turn all warnings into errors, which alters [dafny's exit code](#sec-exit-codes)
+   - `--allow-warnings` --- return a success [exit code](#sec-exit-codes), even when there are warnings 
 
 - those that affect dafny` as a whole, such as
    - `--cores` --- set the number of cores dafny should use
@@ -250,7 +283,7 @@ The options relevant to this command are
    - `--warn-missing-constructor-parentheses`
 
 
-#### 13.5.1.3. `dafny verify` {#sec-dafny-verify}
+#### 13.6.1.3. `dafny verify` {#sec-dafny-verify}
 
 The `dafny verify` command performs the [`dafny resolve`](#sec-dafny-resolve) checks and then attempts to verify each method in the files listed on the command line. Although the Dafny program being considered
 consists of the listed files and any included files (recursively), by default only listed files are verified.
@@ -281,14 +314,14 @@ Various options control the verification process, in addition to all those descr
    - `--relax-definite-assignment`
    - `--track-print-effects`
    - `--disable-nonlinear-arithmetic`
+   - `--filter-symbol`
 
 - Control of the proof engine
    - `--verification-time-limit`
    - `--boogie`
-   - `--boogie-filter`
 
 
-#### 13.5.1.4. `dafny translate <language>` {#sec-dafny-translate}
+#### 13.6.1.4. `dafny translate <language>` {#sec-dafny-translate}
 
 The `dafny translate` command translates Dafny source code to source code for another target programming language.
 The command always performs the actions of `dafny resolve` and, unless the `--no-verify` option is specified, does the actions of `dafny verify`.
@@ -323,7 +356,7 @@ Various options control the translation process, in addition to all those descri
    - `--enforce-determinism`
    - `--test-assumptions` --- (experimental) inserts runtime checks for unverified assumptions when they are compilable
 
-#### 13.5.1.5. `dafny build` {#sec-dafny-build}
+#### 13.6.1.5. `dafny build` {#sec-dafny-build}
 
 The `dafny build` command runs `dafny translate` and then compiles the result into an executable artifact for the target platform,
 such as a `.exe` or `.dll` or executable `.jar`, or just the source code for an interpreted language.
@@ -340,7 +373,7 @@ Note that `dafny build` may do optimizations that `dafny run` does not.
 
 Details for specific target platforms are described [in Section 25.7](#sec-compilation).
 
-#### 13.5.1.6. `dafny run` {#sec-dafny-run}
+#### 13.6.1.6. `dafny run` {#sec-dafny-run}
 
 The `dafny run` command compiles the Dafny program and then runs the resulting executable.
 Note that `dafny run` is engineered to quickly compile and launch the program; 
@@ -355,8 +388,7 @@ the `--input` option on the command-line.
 is an argument to the program being run (and not to dafny itself).
 - If the `--` option is used, then anything after that option is a command-line argument to the program being run.
 
-If more complex build configurations are required, then use `dafny build` and then execute the compiled program, as two separate steps. 
-`dafny run` is primarily intended as a convenient way to run relatively simple Dafny programs.
+During development, users must use `dafny run --allow-warnings` if they want to run their Dafny code when it contains warnings.
 
 Here are some examples:
   - `dafny run A.dfy` -- builds and runs the Main program in `A.dfy` with no command-line arguments
@@ -368,19 +400,22 @@ then runs it with the four command-line arguments `1 2 3 B.dfy`
 then runs it with the three command-line arguments `1 2 3`
   - `dafny run A.dfy 1 2 -- 3 -quiet` -- builds the Main program in `A.dfy` and then runs it with the four command-line arguments `1 2 3 -quiet`
 
+Each time `dafny run` is invoked, the input Dafny program is compiled before it is executed.
+If a Dafny program should be run more than once, it can be faster to use `dafny build`,
+which enables compiling a Dafny program once and then running it multiple times.
 
 **Note:** `dafny run` will typically produce the same results as the executables produced by `dafny build`.  The only expected differences are these:
 - performance --- `dafny run` may not optimize as much as `dafny build`
 - target-language-specific configuration issues ---  e.g. encoding issues: `dafny run` sets language-specific flags to request UTF-8 output for the [`print`](#print-encoding) statement in all languages, whereas `dafny build` leaves language-specific runtime configuration to the user.
 
-#### 13.5.1.7. `dafny server` {#sec-dafny-server}
+#### 13.6.1.7. `dafny server` {#sec-dafny-server}
 
 The `dafny server` command starts the Dafny Language Server, which is an [LSP-compliant](https://microsoft.github.io/language-server-protocol/) implementation of Dafny.
 The [Dafny VSCode extension]() uses this LSP implementation, which in turn uses the same core Dafny implementation as the command-line tool.
 
 The Dafny Language Server is described in more detail [here](#sec-dafny-language-server-vscode).
 
-#### 13.5.1.8. `dafny audit` {#sec-dafny-audit}
+#### 13.6.1.8. `dafny audit` {#sec-dafny-audit}
 
 The `dafny audit` command reports issues in the Dafny code that might limit the soundness claims of verification.
 
@@ -388,7 +423,7 @@ _This command is under development._
 
 The command executes the `dafny resolve` phase (accepting its options) and has the following additional options:
 
-- `--report-file:<report-file>` --- spcifies the path where the audit
+- `--report-file:<report-file>` --- specifies the path where the audit
    report file will be stored. Without this option, the report
     will be issued as standard warnings, written to standard-out.
 - `--report-format:<format>` --- specifies the file format to use for
@@ -425,11 +460,6 @@ Since Dafny cannot prove properties about code written in other languages,
 adding tests to provide evidence that any `ensures` clauses do hold can improve assurance.
 The same considerations apply to `requires` clauses on Dafny code intended to be called from external code.
 
-* Any declaration marked with the `{:concurrent}` attribute.
-This is intended to indicate that the code is safe for use in a concurrent setting, but Dafny currently cannot prove that form of safety.
-The [addition of `reads` clauses to methods](https://github.com/dafny-lang/rfcs/pull/6) will be a step toward being able to prove safety in this case,
-but until it exists, careful inspection and testing are appropriate.
-
 * Any definition with an `assume` statement in its body.
 To improve assurance, attempt to convert it to an `assert` statement and prove that it holds.
 Such a definition will not be compilable unless the statement is also marked with `{:axiom}`.
@@ -452,7 +482,7 @@ To improve assurance, provide a body that establishes any stated invariants.
 Any code that calls this declaration will assume that all `ensures` clauses are true after it returns.
 To improve assurance, provide a body that proves that any `ensures` clauses hold.
 
-#### 13.5.1.9. `dafny format` {#sec-dafny-format}
+#### 13.6.1.9. `dafny format` {#sec-dafny-format}
 
 Dafny supports a formatter, which for now only changes the indentation of lines in a Dafny file, so that it conforms
 to the idiomatic Dafny code formatting style.
@@ -471,7 +501,7 @@ Each version of `dafny format` returns a non-zero return code if there are any c
 errors or if --check is stipulated and at least one file is not the same as its formatted version.  
 `dafny format` does not necessarily report name or type resolution errors and does not attempt verification.
 
-#### 13.5.1.10. `dafny test` {#sec-dafny-test}
+#### 13.6.1.10. `dafny test` {#sec-dafny-test}
  
 This command (verifies and compiles the program and) runs every method in the program that is annotated with the [`{:test}` attribute](#sec-test-attribute).
 Verification can be disabled using the `--no-verify` option. `dafny test` also accepts all other options of the `dafny build` command. 
@@ -483,6 +513,8 @@ In particular, it accepts the `--target` option that specifies the programming l
 - `--output` - gives the folder and filename root for compilation artifacts
 - `--methods-to-test` - the value is a (.NET) regular expression that is matched against the fully
   qualified name of the method; only those methods that match are tested
+- `--coverage-report` - the value is a directory in which Dafny will save an html coverage report highlighting parts of
+  the program that execution of the tests covered.
 
 The order in which the tests are run is not specified.
 
@@ -534,7 +566,7 @@ Hi!
 PASSED
 ```
 
-#### 13.5.1.11. `dafny doc` [Experimental] {#sec-dafny-doc}
+#### 13.6.1.11. `dafny doc` [Experimental] {#sec-dafny-doc}
 
 The `dafny doc` command generates HTML documentation pages describing the contents of each
 module in a set of files, using the documentation comments in the source files.
@@ -566,29 +598,203 @@ The output files are HTML files, all contained in the given folder, one per modu
 an alphabetical by name list of all the declarations in all the modules.
 The documentation for the root module is in `_.html`.
 
-#### 13.5.1.12. `dafny generate-tests` {#sec-dafny-generate-tests}
+#### 13.6.1.12. `dafny generate-tests` {#sec-dafny-generate-tests}
 
-This _experimental_ command generates unit test code (as Dafny source code) that provides
-complete coverage of a method indicated with the --target-method option.
+This _experimental_ command allows generating tests from Dafny programs.
+The tests provide complete coverage of the implementation and one can execute them using the [`dafny test`](#sec-dafny-test) command.
+Dafny can target different notions of coverage while generating tests, with basic-block coverage being the recommended setting.
+Basic blocks are extracted from the Boogie representation of the Dafny program, with one basic block corresponding
+to a statement or a non-short-circuiting subexpression in the Dafny code. The underlying implementation uses the 
+verifier to reason about the reachability of different basic blocks in the program and infers necessary test inputs 
+from counterexamples.
 
-This command enforces determinism by default and disables the functionality provided by the --snow-snippets option.
+For example, this code (as the file `program.dfy`)
+<!-- %no-check -->
+```dafny
+module M {
+  function {:testEntry} Min(a: int, b: int): int {
+    if a < b then a else b
+  }
+}
+```
+and this command-line
+```bash
+dafny generate-tests Block program.dfy
+```
+produce two tests:
+<!-- %no-check -->
+```dafny
+include "program.dfy"
+module UnitTests {
+  import M
+  method {:test} Test0() {
+    var r0 := M.Min(0, 0);
+  }
+  method {:test} Test1() {
+    var r0 := M.Min(0, 1);
+  }
+}
+```
+
+The two tests together cover every basic block within the `Min` function in the input program. 
+Note that the `Min` function is annotated with the `{:testEntry}` attribute. This attribute marks `Min` as 
+the entry point for all generated tests, and there must always be at least one method or function so annotated.
+Another requirement is that any top-level declaration that is not itself a module (such as class, method, function, 
+etc.) must be a member of an explicitly named module, which is called `M` in the example above.
 
 _This command is under development and not yet fully functional._
 
-#### 13.5.1.13. `dafny find-dead-code` {#sec-dafny-find-dead-code}
+#### 13.6.1.13. `Inlining` {#sec-dafny-generate-tests-inlining}
 
-This _experimental_ command finds dead code in a program, that is, code branches within a method that are not reachable by any inputs that satisfy 
-the method's preconditions.
+By default, when asked to generate tests, Dafny will produce _unit tests_, which guarantee coverage of basic blocks
+within the method they call but not within any of its callees. By contrast, system-level tests can
+guarantee coverage of a large part of the program while at the same time using a single method as an entry point. 
+In order to prompt Dafny to generate system-level tests, one must use the `{:testInline}` attribute. 
 
-_This command is under development and not yet functional._
+For example, this code (as the file `program.dfy`)
+<!-- %no-check -->
+```dafny
+module M {
+  function {:testInline} Min(a: int, b: int): int {
+    if a < b then a else b
+  }
+  method {:testEntry} Max(a: int, b: int) returns (c: int)
+    // the tests convert the postcondition below into runtime check:
+    ensures c == if a > b then a else b
+  {
+    return -Min(-a, -b);
+  }
+}
+```
+and this command-line
+```bash
+dafny generate-tests Block program.dfy
+```
+produce two tests:
+<!-- %no-check -->
+```dafny
+include "program.dfy"
+module UnitTests {
+  import M
+  method {:test} Test0() {
+    var r0 := M.Max(7719, 7720);
+    expect r0 == if 7719 > 7720 then 7719 else 7720;
+  }
+  method {:test} Test1() {
+    var r0 := M.Max(1, 0);
+    expect r0 == if 1 > 0 then 1 else 0;
+  }
+}
+```
+
+Without the use of the `{:testInline}` attribute in the example above, Dafny will only generate a single test 
+because there is only one basic-block within the `Max` method itself -- all the branching occurs within the `Min` function.
+Note also that Dafny automatically converts all non-ghost postconditions on the method under tests into `expect` statements,
+which the compiler translates to runtime checks in the target language of choice.
+
+When the inlined method or function is recursive, it might be necessary to unroll the recursion several times to 
+get adequate code coverage. The depth of recursion unrolling should be provided as an integer argument to the `{:testInline}`
+attribute. For example, in the program below, the function `Mod3` is annotated with `{:testInline 2}` and 
+will, therefore, be unrolled twice during test generation. The function naively implements division by repeatedly and
+recursively subtracting `3` from its argument, and it returns the remainder of the division, which is one of 
+the three base cases. Because the `TestEntry` method calls `Mod3` with an argument that is guaranteed to be at least `3`,
+the base case will never occur on first iteration, and the function must be unrolled at least twice for Dafny to generate
+tests covering any of the base cases:
+
+<!-- %no-check -->
+```dafny
+module M {
+  function {:testInline 2} Mod3 (n: nat): nat
+    decreases n
+  {
+    if n == 0 then 0 else
+    if n == 1 then 1 else
+    if n == 2 then 2 else
+    Mod3(n-3)
+  }
+  method {:testEntry} TestEntry(n: nat) returns (r: nat)
+    requires n >= 3
+  {
+    r := Mod3(n);
+  }
+}
+```
+
+#### 13.6.1.14. `Command Line Options` {#sec-dafny-generate-tests-clo}
+
+Test generation supports a number of command-line options that control its behavior.
+
+The first argument to appear after the `generate-test` command specifies the coverage criteria Dafny will attempt to satisfy. 
+Of these, we recommend basic-block coverage (specified with keyword `Block`), which is also the coverage criteria used
+throughout the relevant parts of this reference manual. The alternatives are path coverage (`Path`) and block coverage 
+after inlining (`InlinedBlock`). Path coverage provides the most diverse set of tests but it is also the most expensive 
+in terms of time it takes to produce these tests. Block coverage after inlining is a call-graph sensitive version of 
+block coverage - it takes into account every block in a given method for every path through the call-graph to that method.
+
+The following is a list of command-line-options supported by Dafny during test generation:
+
+- `--verification-time-limit` - the value is an integer that sets a timeout for generating a single test. 
+  The default is 20 seconds.
+- `--length-limit` - the value is an integer that is used to limit the lengths or all sequences and sizes of all 
+  maps and sets that test generation will consider as valid test inputs. This can sometimes be necessary to 
+  prevent test generation from creating unwieldy tests with excessively long strings or large maps. This option is
+  disabled by default
+- `--coverage-report` - the value is a directory in which Dafny will save an html coverage report highlighting parts of
+  the program that the generated tests are expected to cover.
+- `--print-bpl` - the value is the name of the file to which Dafny will save the Boogie code used for generating tests.
+  This options is mostly useful for debugging test generation functionality itself.
+- `--force-prune` - this flag enables axiom pruning, a feature which might significantly speed up test generation but 
+  can also reduce coverage or cause Dafny to produce tests that do not satisfy the preconditions.
+
+Dafny will also automatically enforce the following options during test generation: `--enforce-determinism`, 
+`/typeEncoding:p` (an option passed on to Boogie).
+
+#### 13.6.1.15. `dafny find-dead-code` {#sec-dafny-find-dead-code}
 
-#### 13.5.1.14. `dafny measure-complexity` {#sec-dafny-measure-complexity}
+This _experimental_ command finds dead code in a program, that is, basic-blocks within a method that are not reachable 
+by any inputs that satisfy the method's preconditions. The underlying implementation is identical to that of
+[`dafny generate-tests`](#sec-dafny-test) command and can be controlled by the same command line options and method 
+attributes.
+
+For example, this code (as the file `program.dfy`)
+<!-- %no-check -->
+```dafny
+module M {
+  function {:testEntry} DescribeProduct(a: int): string {
+    if a * a < 0 
+    then "Product is negative"
+    else "Product is nonnegative"
+  }
+}
+```
+and this command-line
+```bash
+dafny find-dead-code program.dfy
+```
+produce this output:
+```text
+program.dfy(5,9) is reachable.
+program.dfy(3,4):initialstate is reachable.
+program.dfy.dfy(5,9)#elseBranch is reachable.
+program.dfy.dfy(4,9)#thenBranch is potentially unreachable.
+Out of 4 basic blocks, 3 are reachable.
+```
+
+Dafny reports that the then branch of the condition is potentially unreachable because the verifier proves that no
+input can reach it. In this case, this is to be expected, since the product of two numbers can never be negative. In
+practice, `find-dead-code` command can produce both false positives (if the reachability query times out) and false
+negatives (if the verifier cannot prove true unreachability), so the results of such a report should always be
+reviewed.
+
+_This command is under development and not yet fully functional._
+
+#### 13.6.1.16. `dafny measure-complexity` {#sec-dafny-measure-complexity}
 
 This _experimental_ command reports complexity metrics of a program.
 
 _This command is under development and not yet functional._
 
-#### 13.5.1.15. Plugins
+#### 13.6.1.17. Plugins
 
 This execution mode is not a command, per se, but rather a command-line option that enables executing plugins to the dafny tool.
 
@@ -597,7 +803,7 @@ where the argument to `--plugin` gives the path to the compiled assembly of the
 
 More on writing and building plugins can be found [in this section](#sec-plugins).
 
-#### 13.5.1.16. Legacy operation
+#### 13.6.1.18. Legacy operation
 
 Prior to implementing the command-based CLI, the `dafny` command-line simply took files and options and the arguments to options.
 That legacy mode of operation is still supported, though discouraged. The command `dafny -?` produces the list of legacy options.
@@ -606,14 +812,14 @@ options like `-compile`, `-compileTarget` and `-spillTargetCode`.
  
 Users are encouraged to migrate to the command-based style of command-lines and the double-hyphen options.
 
-### 13.5.2. In-tool help
+### 13.6.2. In-tool help
 
 As is typical for command-line tools, `dafny` provides in-tool help through the `-h` and `--help` options:
 - `dafny -h`, `dafny --help` list the commands available in the `dafny` tool
 - `dafny -?` lists all the (legacy) options implemented in `dafny`
 - `dafny <command> -h`, `dafny <command> --help`, `dafny <command> -?` list the options available for that command
 
-### 13.5.3. dafny exit codes {#sec-exit-codes}
+### 13.6.3. dafny exit codes {#sec-exit-codes}
 
 The basic resolve, verify, translate, build, run and commands of dafny terminate with these exit codes.
 
@@ -631,7 +837,7 @@ Other dafny commands may have their own conventions for exit codes.
 However in all cases, an exit code of 0 indicates successful completion of the command's
 task and small positive integer values indicate errors of some sort.
 
-### 13.5.4. dafny output
+### 13.6.4. dafny output
 
 Most output from `dafny` is directed to the standard output of the shell invoking the tool, though some goes to standard error.
 - Command-line errors: these are produced by the dotnet CommandLineOptions package are directed to **standard-error**
@@ -641,7 +847,7 @@ Most output from `dafny` is directed to the standard output of the shell invokin
 - Dafny `expect` statements (when they fail) send a message to **standard-out**.
 - Dafny I/O libraries send output explicitly to either **standard-out or standard-error**
 
-### 13.5.5. Project files {#sec-project-files}
+### 13.6.5. Project files {#sec-project-files}
 
 Commands on the Dafny CLI that can be passed a Dafny file can also be passed a Dafny project file. Such a project file may define which Dafny files the project contains and which Dafny options it uses. The project file must be a [TOML](https://toml.io/en/) file named `dfyconfig.toml` for it to work on both the CLI and in the Dafny IDE, although the CLI will accept any `.toml` file. 
 Here's an example of a Dafny project file:
@@ -650,6 +856,8 @@ Here's an example of a Dafny project file:
 includes = ["src/**/*.dfy"]
 excludes = ["**/ignore.dfy"]
 
+base = ["../commonOptions.dfyconfig.toml"]
+
 [options]
 enforce-determinism = true
 warn-shadowing = true
@@ -664,13 +872,15 @@ The `excludes` does not remove any files that are listed explicitly on the comma
 - Options specified on the command-line take precedence over any specified in the project file, no matter the order of items on the command-line.
 - When using a Dafny IDE based on the `dafny server` command, the IDE will search for project files by traversing up the file tree looking for the closest `dfyconfig.toml` file to the dfy being parsed that it can find. Options from the project file will override options passed to `dafny server`.
 
+- The field 'base' can be used to let one project file inherit options from another. If an option is specified in both, then the value specified in the inheriting project is used. Includes from the inheritor override excludes from the base.
+
 It's not possible to use Dafny project files in combination with the legacy CLI UI.
 
-## 13.6. Verification {#sec-verification}
+## 13.7. Verification {#sec-verification}
 
 In this section, we suggest a methodology to figure out [why Dafny cannot prove a single assertion](#sec-verification-debugging), we propose techniques to deal with [assertions that slow a proof down](#sec-verification-debugging-slow), we explain how to [verify assertions in parallel or in a focused way](#sec-assertion-batches), and we also give some more examples of [useful options and attributes to control verification](#sec-command-line-options-and-attributes-for-verification).
 
-### 13.6.1. Verification debugging when verification fails {#sec-verification-debugging}
+### 13.7.1. Verification debugging when verification fails {#sec-verification-debugging}
 
 Let's assume one assertion is failing ("assertion could not be proven" or "postcondition could not be proven"). What should you do next?
 First, it's good to know that if an assertion is failing, it means that the assertion might not hold or that Dafny would requires more proof hints, which can be found in a mechanical way.
@@ -678,7 +888,7 @@ First, it's good to know that if an assertion is failing, it means that the asse
 The following section is textual description of the animation below, which illustrates the principle of debugging an assertion by computing the weakest precondition:  
 ![weakestpreconditionDemo](https://user-images.githubusercontent.com/3601079/157976402-83fe4d37-8042-40fc-940f-bcfc235c7d2b.gif)
 
-#### 13.6.1.1. Failing postconditions {#sec-failing-postconditions}
+#### 13.7.1.1. Failing postconditions {#sec-failing-postconditions}
 Let's look at an example of a failing postcondition.
 <!-- %check-verify UserGuide.1.expect -->
 ```dafny
@@ -724,7 +934,7 @@ method FailingPostcondition(b: bool) returns (i: int)
 That's it! Now the postcondition is not failing anymore, but the `assert` contains the error!
 you can now move to the next section to find out how to debug this `assert`.
 
-#### 13.6.1.2. Failing asserts {#sec-failing-asserts}
+#### 13.7.1.2. Failing asserts {#sec-failing-asserts}
 In the [previous section](#sec-failing-postconditions), we arrived at the point where we have a failing assertion:
 <!-- %check-verify UserGuide.4.expect -->
 ```dafny
@@ -741,7 +951,7 @@ method FailingPostcondition(b: bool) returns (i: int)
 }
 ```
 To debug why Dafny cannot prove this assert, we need to _move this assert up_, which is similar to [_computing the weakest precondition_](https://en.wikipedia.org/wiki/Predicate_transformer_semantics#Weakest_preconditions).
-For example, if we have `x := Y; assert F;` and Dafny cannot prove `assert F;`, the weakest precondition for it to hold before `x := Y;` can be written as the assertion `assert F[x:= Y];`, where we replace every occurence of `x` in `F` into `Y`.
+For example, if we have `x := Y; assert F;` and Dafny cannot prove `assert F;`, the weakest precondition for it to hold before `x := Y;` can be written as the assertion `assert F[x:= Y];`, where we replace every occurrence of `x` in `F` into `Y`.
 Let's do it in our example:
 <!-- %check-verify UserGuide.5.expect -->
 ```dafny
@@ -808,7 +1018,7 @@ b ==>  2 <= (if !b then 3 else 1)
 Now we can understand what went wrong: When b is true, all of these formulas above are false, this is why the `dafny` verifier was not able to prove them.
 In the next section, we will explain how to "move asserts up" in certain useful patterns.
 
-#### 13.6.1.3. Failing asserts cases {#sec-failing-asserts-special-cases}
+#### 13.7.1.3. Failing asserts cases {#sec-failing-asserts-special-cases}
 
 This list is not exhaustive but can definitely be useful to provide the next step to figure out why Dafny could not prove an assertion.
 
@@ -826,25 +1036,29 @@ This list is not exhaustive but can definitely be useful to provide the next ste
  <br><br>`assert A == B;`<br>`callLemma(x);`<br>`assert B == C;`<br> | [`calc == {`](#sec-calc-statement)<br>&nbsp;&nbsp;`  A;`<br>&nbsp;&nbsp;`  B;`<br>&nbsp;&nbsp;`  { callLemma(x); }`<br>&nbsp;&nbsp;`  C;`<br>`};`<br>`assert A == B;`<br>where the [`calc`](#sec-calc-statement) statement can be used to make intermediate computation steps explicit. Works with `<`, `>`, `<=`, `>=`, `==>`, `<==` and `<==>` for example.
  <br><br><br>`assert A ==> B;` | `if A {`<br>&nbsp;&nbsp;`  assert B;`<br>`};`<br>`assert A ==> B;`
  <br><br>`assert A && B;` | `assert A;`<br>`assert B;`<br>`assert A && B;`
- <br>`assert P(x);`<br>where `P` is an [`{:opaque}`](#sec-opaque) predicate | [`reveal P();`](#sec-reveal-statement)<br>`assert P(x);`<br><br>
- `assert P(x);`<br>where `P` is an [`{:opaque}`](#sec-opaque) predicate<br><br> | [`assert P(x) by {`](#sec-assert-statement)<br>[&nbsp;&nbsp;`  reveal P();`](#sec-reveal-statement)<br>`}`
- `assert P(x);`<br>where `P` is not an [`{:opaque}`](#sec-opaque) predicate with a lot of `&&` in its body and is assumed | Make `P` [`{:opaque}`](#sec-opaque) so that if it's assumed, it can be proven more easily. You can always [reveal](#sec-reveal-statement) it when needed.
  `ensures P ==> Q` on a lemma<br> | `requires P ensures Q` to avoid accidentally calling the lemma on inputs that do not satisfy `P`
  `seq(size, i => P)` | `seq(size, i requires 0 <= i < size => P);`
   <br><br>`assert forall x :: G(i) ==> R(i);` |  `assert G(i0);`<br>`assert R(i0);`<br>`assert forall i :: G(i) ==> R(i);` with a guess of the `i0` that makes the second assert to fail.
   <br><br>`assert forall i | 0 < i <= m :: P(i);` |  `assert forall i | 0 < i < m :: P(i);`<br>`assert forall i | i == m :: P(i);`<br>`assert forall i | 0 < i <= m :: P(i);`<br><br>
   <br><br>`assert forall i | i == m :: P(m);` |  `assert P(m);`<br>`assert forall i | i == m :: P(i);`
   `method m(i) returns (j: T)`<br>&nbsp;&nbsp;`  requires A(i)`<br>&nbsp;&nbsp;`  ensures B(i, j)`<br>`{`<br>&nbsp;&nbsp;`  ...`<br>`}`<br><br>`method n() {`<br>&nbsp;&nbsp;`  ...`<br><br><br>&nbsp;&nbsp;`  var x := m(a);`<br>&nbsp;&nbsp;`  assert P(x);` | `method m(i) returns (j: T)`<br>&nbsp;&nbsp;`  requires A(i)`<br>&nbsp;&nbsp;`  ensures B(i, j)`<br>`{`<br>&nbsp;&nbsp;`  ...`<br>`}`<br><br>`method n() {`<br>&nbsp;&nbsp;`  ...`<br>&nbsp;&nbsp;`  assert A(k);`<br>&nbsp;&nbsp;`  assert forall x :: B(k, x) ==> P(x);`<br>&nbsp;&nbsp;`  var x := m(k);`<br>&nbsp;&nbsp;`  assert P(x);`
-  `method m_mod(i) returns (j: T)`<br>&nbsp;&nbsp;`  requires A(i)`<br>&nbsp;&nbsp;`  modifies this, i`<br>&nbsp;&nbsp;`  ensures B(i, j)`<br>`{`<br>&nbsp;&nbsp;`  ...`<br>`}`<br><br>`method n_mod() {`<br>&nbsp;&nbsp;`  ...`<br><br><br><br><br>&nbsp;&nbsp;`  var x: m_mod(a);`<br>&nbsp;&nbsp;`  assert P(x);` | `method m_mod(i) returns (j: T)`<br>&nbsp;&nbsp;`  requires A(i)`<br>&nbsp;&nbsp;`  modifies this, i`<br>&nbsp;&nbsp;`  ensures B(i, j)`<br>`{`<br>&nbsp;&nbsp;`  ...`<br>`}`<br><br>`method n_mod() {`<br>&nbsp;&nbsp;`  ...`<br>&nbsp;&nbsp;`  assert A(k);`<br>&nbsp;&nbsp;`  modify this, i; // Temporarily`<br>&nbsp;&nbsp;`  var x := T;     // Temporarily`<br>&nbsp;&nbsp;`  assume B(k, x);`<br>&nbsp;&nbsp;`//  var x := m_mod(k);`<br>&nbsp;&nbsp;`  assert P(x);`
+  `method m_mod(i) returns (j: T)`<br>&nbsp;&nbsp;`  requires A(i)`<br>&nbsp;&nbsp;`  modifies this, i`<br>&nbsp;&nbsp;`  ensures B(i, j)`<br>`{`<br>&nbsp;&nbsp;`  ...`<br>`}`<br><br>`method n_mod() {`<br>&nbsp;&nbsp;`  ...`<br><br><br><br><br>&nbsp;&nbsp;`  var x := m_mod(a);`<br>&nbsp;&nbsp;`  assert P(x);` | `method m_mod(i) returns (j: T)`<br>&nbsp;&nbsp;`  requires A(i)`<br>&nbsp;&nbsp;`  modifies this, i`<br>&nbsp;&nbsp;`  ensures B(i, j)`<br>`{`<br>&nbsp;&nbsp;`  ...`<br>`}`<br><br>`method n_mod() {`<br>&nbsp;&nbsp;`  ...`<br>&nbsp;&nbsp;`  assert A(k);`<br>&nbsp;&nbsp;`  modify this, i; // Temporarily`<br>&nbsp;&nbsp;`  var x: T;     // Temporarily`<br>&nbsp;&nbsp;`  assume B(k, x);`<br>&nbsp;&nbsp;`//  var x := m_mod(k);`<br>&nbsp;&nbsp;`  assert P(x);`
   <br>`modify x, y;`<br>`assert P(x, y, z);` | `assert x != z && y != z;`<br>`modify x, y;`<br>`assert P(x, y, z);`
 
-### 13.6.2. Verification debugging when verification is slow {#sec-verification-debugging-slow}
+#### 13.7.1.4. Counterexamples {#sec-counterexamples}
+
+When verification fails, we can rerun Dafny with `--extract-counterexample` flag to get a counterexample that can potentially explain the proof failure.
+Note that Danfy cannot guarantee that the counterexample it reports provably violates the assertion it was generated for (see [^smt-encoding])
+The counterexample takes the form of assumptions that can be inserted into the code to describe the potential conditions under which the given assertion is violated. 
+This output should be inspected manually and treated as a hint.
+
+### 13.7.2. Verification debugging when verification is slow {#sec-verification-debugging-slow}
 
 In this section, we describe techniques to apply in the case when verification is slower than expected, does not terminate, or times out.
 
 Additional detail is available in the [verification optimization guide](../VerificationOptimization/VerificationOptimization).
 
-#### 13.6.2.1. `assume false;` {#sec-assume-false}
+#### 13.7.2.1. `assume false;` {#sec-assume-false}
 
 Assuming `false` is an empirical way to short-circuit the verifier and usually stop verification at a given point,[^explainer-assume-false] and since the final compilation steps do not accept this command, it is safe to use it during development.
 Another similar command, `assert false;`, would also short-circuit the verifier, but it would still make the verifier try to prove `false`, which can also lead to timeouts.
@@ -883,7 +1097,7 @@ method NotTerminating() {
 }
 ```
 
-This verifies instantly. This gives use a strategy to bisect, or do binary search to find the assertion that slows everything down.
+This verifies instantly. This gives us a strategy to bisect, or do binary search to find the assertion that slows everything down.
 Now, we move the `assume false;` below the next assertion:
 
 <!-- %no-check -->
@@ -968,7 +1182,7 @@ If verification is fast, which of the two assertions `assert Z;` or `assert P;`
 We now hope you know enough of `assume false;` to locate assertions that make verification slow.
 Next, we will describe some other strategies at the assertion level to figure out what happens and perhaps fix it.
 
-#### 13.6.2.2. `assert ... by {}` {#sec-verification-debugging-assert-by}
+#### 13.7.2.2. `assert ... by {}` {#sec-verification-debugging-assert-by}
 
 If an assertion `assert X;` is slow, it is possible that calling a lemma or invoking other assertions can help to prove it: The postcondition of this lemma, or the added assertions, could help the `dafny` verifier figure out faster how to prove the result.
 
@@ -1000,7 +1214,7 @@ Now, only `X` is available for the `dafny` verifier to prove the rest of the met
 
 [^verifier-lost]: By default, the expression of an assertion or a precondition is added to the knowledge base of the `dafny` verifier for further assertions or postconditions. However, this is not always desirable, because if the verifier has too much knowledge, it might get lost trying to prove something in the wrong direction.
 
-#### 13.6.2.3. Labeling and revealing assertions {#sec-labeling-revealing-assertions}
+#### 13.7.2.3. Labeling and revealing assertions {#sec-labeling-revealing-assertions}
 
 Another way to prevent assertions or preconditions from cluttering the verifier[^verifier-lost] is to label and reveal them.
 Labeling an assertion has the effect of "hiding" its result, until there is a "reveal" calling that label.
@@ -1068,13 +1282,13 @@ method TestMethod(x: bool)
 
 To lift assertions, please refer to the techniques described in [Verification Debugging](#sec-verification-debugging).
 
-#### 13.6.2.4. Non-opaque `function method` {#sec-non-opaque-function-method}
+#### 13.7.2.4. Non-opaque `function method` {#sec-non-opaque-function-method}
 
 Functions are normally used for specifications, but their functional syntax is sometimes also desirable to write application code.
 However, doing so naively results in the body of a `function method Fun()` be available for every caller, which can cause the verifier to time out or get extremely slow[^verifier-lost].
 A solution for that is to add the attribute [`{:opaque}`](#sec-opaque) right between `function method` and `Fun()`, and use [`reveal Fun();`](#sec-reveal-statement) in the calling functions or methods when needed.
 
-#### 13.6.2.5. Conversion to and from bitvectors {#sec-conversion-to-and-from-bitvectors}
+#### 13.7.2.5. Conversion to and from bitvectors {#sec-conversion-to-and-from-bitvectors}
 
 Bitvectors and natural integers are very similar, but they are not treated the same by the `dafny` verifier. As such, conversion from `bv8` to an `int` and vice-versa is not straightforward, and can result in slowdowns.
 
@@ -1085,7 +1299,7 @@ There are two solutions to this for now. First, one can define a [subset type](#
 type byte = x | 0 <= x < 256
 ```
 
-One of the problems of this approach is that additions, substractions and multiplications do not enforce the result to be in the same bounds, so it would have to be checked, and possibly truncated with modulos. For example:
+One of the problems of this approach is that additions, subtractions and multiplications do not enforce the result to be in the same bounds, so it would have to be checked, and possibly truncated with modulos. For example:
 
 <!-- %check-resolve -->
 ```dafny
@@ -1116,7 +1330,7 @@ method m() {
 
 One might consider refactoring this code into separate functions if used over and over.
 
-#### 13.6.2.6. Nested loops {#sec-nested-loops}
+#### 13.7.2.6. Nested loops {#sec-nested-loops}
 
 In the case of nested loops, the verifier might timeout sometimes because of inadequate or too much available information[^verifier-lost].
 One way to mitigate this problem, when it happens, is to isolate the inner loop by refactoring it into a separate method, with suitable pre and postconditions that will usually assume and prove the invariant again.
@@ -1152,12 +1366,61 @@ method innerLoop()
 
 In the next section, when everything can be proven in a timely manner, we explain another strategy to decrease proof time by parallelizing it if needed, and making the verifier focus on certain parts.
 
-### 13.6.3. Assertion batches {#sec-assertion-batches}
+### 13.7.3. Assertion batches, well-formedness, correctness {#sec-assertion-batches}
 
 To understand how to control verification,
 it is first useful to understand how `dafny` verifies functions and methods.
 
-For every method (or function, constructor, etc.), `dafny` extracts _assertions_. Here is a non-exhaustive list of such extracted assertions:
+For every method (or function, constructor, etc.), `dafny` extracts _assertions_.
+Assertions can roughly be sorted into two kinds: Well-formedness and correctness.
+
+- _Well-formedness_ assertions: All the implicit requirements
+  of native operation calls (such as indexing and asserting that divisiors are nonzero),
+  [`requires` clauses](#sec-requires-clause) of function calls, explicit
+  [assertion expressions](#sec-statement-in-an-expression) and
+  [`decreases` clauses](#sec-decreases-clause) at function call sites
+  generate well-formedness assertions.  
+  An expression is said to be _well-formed_ in a context if
+  all well-formedness assertions can be proven in that context.
+
+- _Correctness_ assertions: All remaining assertions and clauses
+
+For example, given the following statements:
+
+<!-- %no-check -->
+```dafny
+if b {
+  assert a*a != 0;
+}
+c := (assert b ==> a != 0; if b then 3/a else f(a));
+assert c != 5/a;
+```
+
+Dafny performs the following checks:
+
+<!-- %no-check -->
+```dafny
+var c: int;
+if b {
+  assert a*a != 0;   // Correctness
+}
+assert b ==> a != 0; // Well-formedness
+if b {
+  assert a != 0;     // Well-formedness
+} else {
+  assert f.requires(a); // Well-formedness
+}
+c := if b then 3/a else f(a);
+assert a != 0;       // Well-formedness
+assert c != 5/a;     // Correctness
+```
+
+Well-formedness is proved at the same time as correctness, except for
+[well-formedness of requires and ensures clauses](#sec-well-formedness-specifications)
+which is proved separately from the well-formedness and correctness of the rest of the method/function.
+For the rest of this section, we don't differentiate between well-formedness assertions and correctness assertions.
+
+We can also classify the assertions extracted by Dafny in a few categories:
 
 **Integer assertions:**
 
@@ -1170,26 +1433,26 @@ For every method (or function, constructor, etc.), `dafny` extracts _assertions_
 
 * Every [object property access](#sec-class-types) yields an _assertion_ that the object is not null.
 * Every assignment `o.f := E;` yields an _assertion_ that `o` is among the set of objects of the `modifies` clause of the enclosing [loop](#sec-loop-framing) or [method](#sec-modifies-clause).
-* Every read `o.f` yields an _assertion_ that `o` is among the set of objects of the [`reads`](#sec-reads-clause) clause of the enclosing function or predicate; or the [`modifies`](#sec-modifies-clause) clause of the enclosing method.
+* Every read `o.f` yields an _assertion_ that `o` is among the set of objects of the [`reads`](#sec-reads-clause) clause of the enclosing function or predicate.
 * Every [array access](#sec-array-type) `a[x]` yields the assertion that `0 <= x < a.Length`.
 * Every [sequence access](#sec-sequences) `a[x]` yields an _assertion_, that `0 <= x < |a|`, because sequences are never null.
 * Every [datatype update expression](#sec-datatype-update-suffix) and [datatype destruction](#sec-algebraic-datatype) yields an _assertion_ that the object has the given property.
 * Every method overriding a [`trait`](#sec-trait-types) yields an _assertion_ that any postcondition it provides implies the postcondition of its parent trait, and an _assertion_ that any precondition it provides is implied by the precondition of its parent trait.
 
-**Other implicit assertions:**
+**Other assertions:**
 
 * Every value whose type is assigned to a [subset type](#sec-subset-types) yields an _assertion_ that it satisfies the subset type constraint.
 * Every non-empty [subset type](#sec-subset-types) yields an _assertion_ that its witness satisfies the constraint.
-* Every [Assign-such-that operator](#sec-update-and-call-statement) `x :| P(x)` yields an _assertion_ that `exists x :: P(x)`.
+* Every [Assign-such-that operator](#sec-update-and-call-statement) `x :| P(x)` yields an _assertion_ that `exists x :: P(x)`. In case `x :| P(x); Body(x)` appears in an expression and `x` is non-ghost, it also yields `forall x, y | P(x) && P(y) :: Body(x) == Body(y)`.
 * Every recursive function yields an _assertion_ that [it terminates](#sec-loop-termination).
 * Every [match expression](#sec-match-expression) or [alternative if statement](#sec-if-statement) yields an _assertion_ that all cases are covered.
+* Every call to a function or method with a [`requires`](#sec-requires-clause) clause yields _one assertion per requires clause_[^precision-requires-clause]
+  (special cases such as sequence indexing come with a special `requires` clause that the index is within bounds).
 
-**Explicit assertions:**
+**Specification assertions:**
 
 * Any explicit [`assert`](#sec-assert-statement) statement is _an assertion_[^precision-requires-clause].
 * A consecutive pair of lines in a [`calc`](#sec-calc-statement) statement forms _an assertion_ that the expressions are related according to the common operator.
-* Every call to a function or method with a [`requires`](#sec-requires-clause) clause yields _one assertion per requires clause_[^precision-requires-clause]
-  (special cases such as sequence indexing come with a special `requires` clause that the index is within bounds).
 * Every [`ensures`](#sec-ensures-clause) clause yields an _assertion_ at the end of the method and on every return, and on [`forall`](#sec-forall-statement) statements.
 * Every [`invariant`](#sec-invariant-clause) clause yields an _assertion_ that it holds before the loop and an _assertion_ that it holds at the end of the loop.
 * Every [`decreases`](#sec-decreases-clause) clause yields an _assertion_ at either a call site or at the end of a while loop.
@@ -1210,31 +1473,25 @@ The fundamental unit of verification in `dafny` is an _assertion batch_, which c
 * If the verifier says it is correct,[^smt-encoding] it means that all the assertions hold.
 * If the verifier returns a counterexample, this counterexample is used to determine both the failing assertion and the failing path.
   In order to retrieve additional failing assertions, `dafny` will again query the verifier after turning previously failed assertions into assumptions.[^example-assertion-turned-into-assumption] [^caveat-about-assertion-and-assumption]
-* If the verifier returns `unknown` or times out, or even preemptively for difficult assertions or to reduce the chance that the verifier will ‘be confused’ by the many assertions in a large batch, `dafny` may partition the assertions into smaller batches[^smaller-batches]. An extreme case is the use of the `/vcsSplitOnEveryAssert` command-line option or the [`{:vcs_split_on_every_assert}` attribute](#sec-vcs_split_on_every_assert), which causes `dafny` to make one batch for each assertion.
+* If the verifier returns `unknown` or times out, or even preemptively for difficult assertions or to reduce the chance that the verifier will ‘be confused’ by the many assertions in a large batch, `dafny` may partition the assertions into smaller batches[^smaller-batches]. An extreme case is the use of the `/vcsSplitOnEveryAssert` command-line option or the [`{:isolate_assertions}` attribute](#sec-isolate_assertions), which causes `dafny` to make one batch for each assertion.
 
 [^smt-encoding]: The formula sent to the underlying SMT solver is the negation of the formula that the verifier wants to prove - also called a VC or verification condition. Hence, if the SMT solver returns "unsat", it means that the SMT formula is always false, meaning the verifier's formula is always true. On the other side, if the SMT solver returns "sat", it means that the SMT formula can be made true with a special variable assignment, which means that the verifier's formula is false under that same variable assignment, meaning it's a counter-example for the verifier. In practice and because of quantifiers, the SMT solver will usually return "unknown" instead of "sat", but will still provide a variable assignment that it couldn't prove that it does not make the formula true. `dafny` reports it as a "counter-example" but it might not be a real counter-example, only provide hints about what `dafny` knows.
 
-[^example-assertion-turned-into-assumption]: This [post](https://github.com/dafny-lang/dafny/discussions/1898#discussioncomment-2344533) gives an overview of how assertions are turned into assumptions for verification purposes.
+[^example-assertion-turned-into-assumption]: This [post](https://github.com/dafny-lang/dafny/discussions/1898) gives an overview of how assertions are turned into assumptions for verification purposes.
 
 [^caveat-about-assertion-and-assumption]: Caveat about assertion and assumption: One big difference between an "assertion transformed in an assumption" and the original "assertion" is that the original "assertion" can unroll functions twice, whereas the "assumed assertion" can unroll them only once. Hence, `dafny` can still continue to analyze assertions after a failing assertion without automatically proving "false" (which would make all further assertions vacuous).
 
 [^smaller-batches]: To create a smaller batch, `dafny` duplicates the assertion batch, and arbitrarily transforms the clones of an assertion into assumptions except in exactly one batch, so that each assertion is verified only in one batch. This results in "easier" formulas for the verifier because it has less to prove, but it takes more overhead because every verification instance have a common set of axioms and there is no knowledge sharing between instances because they run independently.
 
-#### 13.6.3.1. Controlling assertion batches {#sec-assertion-batches-control}
+#### 13.7.3.1. Controlling assertion batches {#sec-assertion-batches-control}
 
-Here is how you can control how `dafny` partitions assertions into batches.
+When Dafny verifies a symbol, such as a method, a function or a constant with a subset type, that verification may contain multiple assertions. A symbol is generally verified the fastest when all assertions it in are verified together, in what we call a single 'assertion batch'. However, is it possible to split verification of a symbol into multiple batches, and doing so makes the individual batches simpler, which can lead to less brittle verification behavior. Dafny contains several attributes that allow you to customize how verification is split into batches.
 
-* [`{:focus}`](#sec-focus) on an assert generates a separate assertion batch for the assertions of the enclosing block.
-* [`{:split_here}`](#sec-split_here) on an assert generates a separate assertion batch for assertions after this point.
-* [`{:vcs_split_on_every_assert}`](#sec-vcs_split_on_every_assert) on a function or a method generates one assertion batch per assertion
+Firstly, you can instruct Dafny to verify individual assertions in separate batches. You can place the `{:isolate}` attribute on a single assertion to place it in a separate batch, or you can place `{:isolate_assertions}` on a symbol, such as a function or method declaration, to place all assertions in it into separate batches. The CLI option `--isolate-assertions` will place all assertions into separate batches for all symbols. `{:isolate}` can be used on `assert`, `return` and `continue` statements. When placed on a `return` statement, it will verify the postconditions for all paths leading to that `return` in a separate batch. When placed on a `continue`, it will verify the loop invariants for all paths leading to that `continue` in a separate batch. 
 
-We discourage the use of the following _heuristics attributes_ to partition assertions into batches.
-The effect of these attributes may vary, because they are low-level attributes and tune low-level heuristics, and will result in splits that could be manually controlled anyway.
-* [`{:vcs_max_cost N}`](#sec-vcs_max_cost) on a function or method enables splitting the assertion batch until the "cost" of each batch is below N.
-  Usually, you would set [`{:vcs_max_cost 0}`](#sec-vcs_max_cost) and [`{:vcs_max_splits N}`](#sec-vcs_max_splits) to ensure it generates N assertion batches.
-* [`{:vcs_max_keep_going_splits N}`](#sec-vcs_max_keep_going_splits) where N > 1 on a method dynamically splits the initial assertion batch up to N components if the verifier is stuck the first time.
+Given an assertion that is placed into a separate batch, you can then further simplify the verification of this assertion by placing each control flow path that leads to this assertion into a separate batch. You can do this using the attribute `{:isolate "paths"}`.
 
-### 13.6.4. Command-line options and other attributes to control verification {#sec-command-line-options-and-attributes-for-verification}
+### 13.7.4. Command-line options and other attributes to control verification {#sec-command-line-options-and-attributes-for-verification}
 
 There are many great options that control various aspects of verifying dafny programs. Here we mention only a few:
 
@@ -1247,43 +1504,106 @@ There are many great options that control various aspects of verifying dafny pro
 
 You can search for them in [this file](https://dafny-lang.github.io/dafny/DafnyRef/DafnyRef) as some of them are still documented in raw text format.
 
-### 13.6.5. Debugging variable verification
+### 13.7.5. Analyzing proof dependencies {#sec-proof-dependencies}
+
+When Dafny successfully verifies a particular definition, it can ask the
+solver for information about what parts of the program were actually
+used in completing the proof. The program components that can
+potentially form part of  a proof include:
+
+* `assert` statements (and the implicit assumption that they hold in subsequent code),
+* implicit assertions (such as array or sequence bounds checks),
+* `assume` statements,
+* `ensures` clauses,
+* `requires` clauses,
+* function definitions,
+* method calls, and
+* assignment statements.
+
+Understanding what portions of the program the proof depended on can
+help identify mistakes, and to better understand the structure of your
+proof (which can help when optimizing it, among other things). In
+particular, there are two key dependency structures that tend to
+indicate mistakes, both focused on what parts of the program were _not_
+included in the proof.
+
+* Redundant assumptions. In some cases, a proof can be completed without
+  the need of certain `assume` statements or `requires` clauses. This
+  situation might represent a mistake, and when the mistake is corrected
+  those program elements may become required. However, they may also
+  simply be redundant, and the program will become simpler if they're
+  removed. Dafny will report assumptions of this form when verifying
+  with the flag `--warn-redundant-assumptions`. Note that `assert`
+  statements may be warned about, as well, indicating that the fact
+  proved by the assertion wasn't needed to prove anything else in the
+  program.
+
+* Contradictory assumptions. If the combination of all assumptions in
+  scope at a particular program point is contradictory, anything can be
+  proved at that point. This indicates the serious situation that,
+  unless done on purpose in a proof by contradiction, your proof may be
+  entirely vacuous. It therefore may not say what you intended, giving
+  you a false sense of confidence. The
+  `--warn-contradictory-assumptions` flag instructs Dafny to warn about
+  any assertion that was proved through the use of contradictions
+  between assumptions. If a particular `assert` statement is part of an
+  intentional proof by contradiction, annotating it with the
+  `{:contradiction}` attribute will silence this warning.
+
+These options can be specified in `dfyconfig.toml`, and this is typically the most convenient way to use them with the IDE.
+
+More detailed information is available using either the `--log-format
+text` or `--verification-coverage-report` option to `dafny verify`. The former will
+include a list of proof dependencies (including source location and
+description) alongside every assertion batch in the generated log
+whenever one of the two warning options above is also included. The
+latter will produce a highlighted HTML version of your source code, in
+the same format used by `dafny test --coverage-report`
+and `dafny generate-tests --verification-coverage-report`,
+indicating which parts of the program were used, not used, or partly
+used in the verification of the entire program.
+
+### 13.7.6. Debugging brittle verification {#sec-brittle-verification}
 
 When evolving a Dafny codebase, it can sometimes occur that a proof
 obligation succeeds at first only for the prover to time out or report a
-potential error after minor, valid changes. This is ultimately due to
-decidability limitations in the form of automated reasoning that Dafny
-uses. The Z3 SMT solver that Dafny depends on attempts to efficiently
-search for proofs, but does so using both incomplete heuristics and a
-degree of randomness, with the result that it can sometimes fail to find
-a proof even when one exists (or continue searching forever).
+potential error after minor, valid changes. We refer to such a proof
+obligation as _brittle_. This is ultimately due to decidability
+limitations in the form of automated reasoning that Dafny uses. The Z3
+SMT solver that Dafny depends on attempts to efficiently search for
+proofs, but does so using both incomplete heuristics and a degree of
+randomness, with the result that it can sometimes fail to find a proof
+even when one exists (or continue searching forever).
 
 Dafny provides some features to mitigate this issue, primarily focused
 on early detection. The philosophy is that, if Dafny programmers are
-alerted to proofs that show early signs of variability, before they are
-obviously so, they can refactor the proofs to make them less variable
+alerted to proofs that show early signs of brittleness, before they are
+obviously so, they can refactor the proofs to make them less brittle
 before further development becomes difficult.
 
 The mechanism for early detection focuses on measuring the resources
-used to complete a proof (either using duration or a more deterministic
-"resource count" metric available from Z3). Dafny can re-run a given
-proof attempt multiple times after automatically making minor changes to
-the structure of the input or to the random choices made by the solver.
-If the resources used during these attempts (or the ability to find a
-proof at all) vary widely, we say that the verification of the relevant
-properties is _highly variable_.
-
-#### 13.6.5.1. Measuring proof variability
-
-To measure the variability of your proofs, start by using the
-`-randomSeedIterations:N` flag to instruct Dafny to attempt each proof
-goal `N` times, using a different random seed each time. The random seed
-used for each attempt is derived from the global random seed `S`
-specified with `-randomSeed:S`, which defaults to `0` (which means use
-an arbitrary -- e.g. clock-based -- seed).
+used to discharge a proof obligation (either using duration or a more
+deterministic "resource count" metric available from Z3). Dafny can
+re-run a given proof attempt multiple times after automatically making
+minor changes to the structure of the input or to the random choices
+made by the solver.  If the resources used during these attempts (or the
+ability to find a proof at all) vary widely, we use this as a proxy
+metric indicating that the proof may be brittle.
+
+#### 13.7.6.1. Measuring proof brittleness
+
+To measure the brittleness of your proofs, start by using the `dafny
+measure-complexity` command with the `--iterations N` flag to instruct
+Dafny to attempt each proof goal `N` times, using a different random
+seed each time. The random seed used for each attempt is derived from
+the global random seed `S` specified with `-randomSeed:S`, which
+defaults to `0`. The random seed affects the structure of the SMT
+queries sent to the solver, changing the ordering of SMT commands, the
+variable names used, and the random seed the solver itself uses when
+making decisions that can be arbitrary.
 
 For most use cases, it also makes sense to specify the
-`-verificationLogger:csv` flag, to log verification cost statistics to a
+`--log-format csv` flag, to log verification cost statistics to a
 CSV file. By default, the resulting CSV files will be created in the
 `TestResults` folder of the current directory.
 
@@ -1311,24 +1631,24 @@ than 20%, perhaps even as low as 5%. However, when beginning to analyze
 a new project, it may be necessary to set limits as high as a few
 hundred percent and incrementally ratchet down the limit over time.
 
-When first analyzing proof variability, you may also find that certain proof
+When first analyzing proof brittleness, you may also find that certain proof
 goals succeed on some iterations and fail on others. If your aim is
-first to ensure that variability doesn't worsen and then to start
-improving it, integrating `dafny-reportgenerator` into CI and using the
+first to ensure that brittleness doesn't worsen and then to start
+reducing it, integrating `dafny-reportgenerator` into CI and using the
 `--allow-different-outcomes` flag may be appropriate. Then, once you've
-improved variability sufficiently, you can likely remove that flag (and
-likely have significantly lower limits on other variability metrics).
+improved brittleness sufficiently, you can likely remove that flag (and
+likely have significantly lower limits on other metrics).
 
-#### 13.6.5.2. Improving proof variability
+#### 13.7.6.2. Improving proof brittleness
 
-Improving proof variability is typically closely related to improving
+Reducing proof brittleness is typically closely related to improving
 performance overall. As such, [techniques for debugging slow
 verification](#sec-verification-debugging-slow) are typically useful for
-debugging highly variable verification, as well. See also the
+debugging brittle proofs, as well. See also the
 [verification optimization
 guide](../VerificationOptimization/VerificationOptimization).
 
-## 13.7. Compilation {#sec-compilation}
+## 13.8. Compilation {#sec-compilation}
 
 The `dafny` tool can compile a Dafny program to one of several target languages. Details and idiosyncrasies of each
 of these are described in the following subsections. In general note the following:
@@ -1342,7 +1662,18 @@ included by default and must be explicitly requested using `--include-runtime`.
 To be compilable to an executable program, a Dafny program must contain a `Main` entry point, as described [here](#sec-user-guide-main).
 
 
-### 13.7.1. `extern` declarations {#sec-extern-decls}
+### 13.8.1.1 Built-in declarations {#sec-compilation-built-ins}
+
+Dafny includes several built-in types such as tuples, arrays, arrows (functions), and the `nat` subset type.
+The supporting target language code for these declarations could be emitted on-demand,
+but these could then become multiple definitions of the same symbols when compiling multiple components separately. 
+Instead, all such built-ins up to a pre-configured maximum size are included in most of the runtime libraries.
+This means that when compiling to certain target languages, the use of such built-ins above these maximum sizes,
+such as tuples with more than 20 elements, is not supported.
+See the [Supported features by target language](#sec-supported-features-by-target-language) table
+for the details on these limits.
+
+### 13.8.2. `extern` declarations {#sec-extern-decls}
 
 A Dafny declaration can be marked with the [`{:extern}`](#sec-extern) attribute to
 indicate that it refers to an external definition that is already
@@ -1364,7 +1695,7 @@ the set of allowed identifiers) vary between languages, Dafny allows
 additional forms for the `{:extern}` attribute.
 
 The form `{:extern <s1>}` instructs `dafny` to compile references to most
-declarations using the name `s1` instead of the Dafny name. For [opaque
+declarations using the name `s1` instead of the Dafny name. For [abstract
 types](#sec-abstract-types), however, `s1` is sometimes used as a hint as
 to how to declare that type when compiling. This hint is interpreted
 differently by each compiler.
@@ -1455,7 +1786,35 @@ Detailed description of the `dafny build` and `dafny run` commands and
 the `--input` option (needed when `dafny run` has more than one input file)
 is contained [in the section on command-line structure](#command-line).
 
-### 13.7.2. C\#
+### 13.8.3. Replaceable modules
+To enable easily customising runtime behavior across an entire Dafny program, Dafny has placeholder modules. Here follows an example:
+
+<!-- %check-run -->
+```dafny
+replaceable module Foo {
+  method Bar() returns (i: int) 
+    ensures i >= 2
+}
+
+method Main() {
+  var x := Foo.Bar();
+  print x;
+}
+// At this point, the program can be verified but not run.
+
+module ConcreteFoo replaces Foo {
+  method Bar() returns (i: int) {
+    return 3; // Main will print 3.
+  }
+}
+// ConcreteFoo can be swapped out for different replacements of Foo, to customize runtime behavior.
+```
+
+When replacing a replaceable module, the same rules apply as when refining an abstract module. However, unlike an abstract module, a placeholder module can be used as if it is a concrete module. When executing code, using for example `dafny run` or `dafny translate`, any program that contains a placeholder module must also contain a replacement of this placeholder. When using `dafny verify`, placeholder modules do not have to be replaced.
+
+Replaceable modules are particularly useful for defining behavior that depends on which target language Dafny is translated to.
+
+### 13.8.4. C\#
 
 For a simple Dafny-only program, the translation step converts a `A.dfy` file into `A.cs`;
 the build step then produces a `A.dll`, which can be used as a library or as an executable (run using `dotnet A.dll`).
@@ -1476,7 +1835,7 @@ which is then compiled by `dotnet` to a `.dll`.
 Examples of how to integrate C# libraries and source code with Dafny source code
 are contained in [this separate document](integration-cs/IntegrationCS).
 
-### 13.7.3. Java
+### 13.8.5. Java
 
 The Dafny-to-Java compiler translation phase writes out the translated files of a file _A_`.dfy`
 to a directory _A_`-java`. 
@@ -1498,7 +1857,7 @@ but not if dafny is only doing translation.
 Examples of how to integrate Java source code and libraries with Dafny source
 are contained in [this separate document](integration-java/IntegrationJava).
 
-### 13.7.4. Javascript
+### 13.8.6. Javascript
 
 The Dafny-to-Javascript compiler translates all the given `.dfy` files into a single `.js` file, 
 which can then be run using `node`. (Javascript has no compilation step). 
@@ -1512,7 +1871,7 @@ Or, in one step,
 Examples of how to integrate Javascript libraries and source code with Dafny source
 are contained in [this separate document](integration-js/IntegrationJS).
 
-### 13.7.5. Go
+### 13.8.7. Go
 
 The Dafny-to-Go compiler translates all the given `.dfy` files into a single
 `.go` file in `A-go/src/A.go`; the output folder can be specified with the 
@@ -1536,7 +1895,7 @@ change, though the `./A` alternative will still be supported.
 Examples of how to integrate Go source code and libraries with Dafny source
 are contained in [this separate document](integration-go/IntegrationGo).
 
-### 13.7.6. Python
+### 13.8.8. Python
 
 The Dafny-to-Python compiler is still under development. However, simple
 Dafny programs can be built and run as follows. The Dafny-to-Python
@@ -1554,7 +1913,7 @@ In one step:
 Examples of how to integrate Python libraries and source code with Dafny source
 are contained in [this separate document](integration-py/IntegrationPython).
 
-### 13.7.7. C++
+### 13.8.9. C++
 
 The C++ backend was written assuming that it would primarily support writing
 C/C++ style code in Dafny, which leads to some limitations in the current
@@ -1574,7 +1933,7 @@ implementation.
 - The current backend also assumes the use of C++17 in order to cleanly and
   performantly implement datatypes.
 
-### 13.7.8. Supported features by target language {#sec-supported-features-by-target-language}
+### 13.8.10. Supported features by target language {#sec-supported-features-by-target-language}
 
 Some Dafny features are not supported by every target language.
 The table below shows which features are supported by each backend.
@@ -1583,7 +1942,7 @@ while an X indicates that it is.
 
 {% include_relative Features.md %}
 
-## 13.8. Dafny Command Line Options {#sec-command-line-options}
+## 13.9. Dafny Command Line Options {#sec-command-line-options}
 
 There are many command-line options to the `dafny` tool.
 The most current documentation of the options is within the tool itself,
@@ -1594,11 +1953,11 @@ Remember that options are typically stated with either a leading `--`.
 Legacy options begin with either '-' or '/'; however they are being
 migrated to the POSIX-compliant `--` form as needed.
 
-### 13.8.1. Help and version information {#sec-controlling-help}
+### 13.9.1. Help and version information {#sec-controlling-help}
 
 These options emit general information about commands, options and attributes.
 When present, the dafny program will terminates after emitting the requested information
-but without processig any files.
+but without processing any files.
 
 * `--help`, `-h` - shows the various commands (which have help information under them as `dafny <command> -h`
 
@@ -1624,7 +1983,7 @@ Legacy options:
 
 * `-wait` - wait for the user to press `Enter` before terminating after a successful execution.
 
-### 13.8.2. Controlling input {#sec-controlling-input}
+### 13.9.2. Controlling input {#sec-controlling-input}
 
 These options control how Dafny processes its input.
 
@@ -1641,9 +2000,9 @@ a list of all .dfy files contained, recursively, in those folders
   the translator from Dafny to Boogie. Using an alternative prelude is
   primarily useful if you're extending the Dafny language or changing
   how Dafny constructs are modeled. The default prelude is 
-  [here](https://github.com/dafny-lang/dafny/blob/master/Source/Dafny/DafnyPrelude.bpl).
+  [here](https://github.com/dafny-lang/dafny/blob/master/Source/DafnyCore/DafnyPrelude.bpl).
 
-### 13.8.3. Controlling plugins {#sec-controlling-plugins}
+### 13.9.3. Controlling plugins {#sec-controlling-plugins}
 
 Dafny has a plugin capability. 
 A plugin has access to an AST of the dafny input files
@@ -1659,7 +2018,7 @@ and (b) example plugins in the
 The value of the option `--plugin` is a path to a dotnet dll that contains
 the compiled plugin.
 
-### 13.8.4. Controlling output {#sec-controlling-output}
+### 13.9.4. Controlling output {#sec-controlling-output}
 
 These options instruct Dafny to print various information about your
 program during processing, including variations of the original source
@@ -1802,12 +2161,17 @@ Legacy options:
     }
     ```
 
-### 13.8.5. Controlling language features {#sec-controlling-language}
+### 13.9.5. Controlling language features {#sec-controlling-language}
 
 These options allow some Dafny language features to be enabled or
 disabled. Some of these options exist for backward compatibility with
 older versions of Dafny.
 
+* `--default-function-opacity:<transparent|autoRevealDependencies|opaque>` - Change the default opacity of functions.
+  * `transparent` (default) means functions are transparent, can be manually made opaque and then revealed.
+  * `autoRevealDependencies` makes all functions not explicitly labelled as opaque to be opaque but reveals them automatically in scopes which do not have `{:autoRevealDependencies false}`.
+  * `opaque` means functions are always opaque so the opaque keyword is not needed, and functions must be revealed everywhere needed for a proof.
+
 * `--function-syntax` (value '3' or '4') - permits a choice of using the Dafny 3 syntax (`function` and `function method`)
 or the Dafny 4 syntax (`ghost function` and `function`)
 
@@ -1816,7 +2180,7 @@ or the Dafny 4 syntax (`ghost function` and `function`)
 * `--unicode-char` - if false, the `char` type represents any UTF-16 code unit,
   that is, any 16-bit value, including surrogate code points and
   allows `\uXXXX` escapes in string and character literals.
-  If true, `char` represnts any Unicode scalar value,
+  If true, `char` represents any Unicode scalar value,
   that is, any Unicode code point excluding surrogates and
   allows `\U{X..X}` escapes in string and character literals. 
   The default is false for Dafny version 3 and true for version 4.
@@ -1904,7 +2268,7 @@ Legacy options:
   implicitly static and field declarations are not allowed at the
   module scope.
 
-### 13.8.6. Controlling warnings {#sec-controlling-warnings}
+### 13.9.6. Controlling warnings {#sec-controlling-warnings}
 
 These options control what warnings Dafny produces, and whether to treat
 warnings as errors.
@@ -1927,7 +2291,7 @@ Legacy options
 
    * `2` - issue warnings and advise about alternate syntax.
 
-### 13.8.7. Controlling verification {#sec-controlling-verification}
+### 13.9.7. Controlling verification {#sec-controlling-verification}
 
 These options control how Dafny verifies the input program, including
 how much it verifies, what techniques it uses to perform verification,
@@ -1977,10 +2341,20 @@ and what information it produces about the verification process.
   operators. (This option will perhaps be replaced by `-arith` in the
   future. For now, it takes precedence over `-arith`.)
 
-* `--manual-lemma-induction` - diables automatic inducntion for lemmas
+  The behavior of `disable-nonlinear-arithmetic` can be turned on and off on a per-module basis 
+  by placing the attribute [`{:disable-nonlinear-arithmetic}`](#sec-disable-nonlinear-arithmetic) after the module keyword.
+  The attribute optionally takes the value `false` to enable nonlinear arithmetic.
+
+* `--manual-lemma-induction` - disables automatic inducntion for lemmas
 
 * `--isolate-assertions` - verify assertions individually
 
+* `--extract-counterexample` - if verification fails, report a potential
+  counterexample as a set of assumptions that can be inserted into the code.
+  Note that Danfy cannot guarantee that the counterexample
+  it reports provably violates the assertion or that the assumptions are not
+  mutually inconsistent (see [^smt-encoding]), so this output should be inspected manually and treated as a hint.
+
 Controlling the proof engine:
 
 * `--cores:<n>` - sets the number or percent of the available cores to be used for verification
@@ -2134,14 +2508,7 @@ Legacy options:
   * `1` (default) - in the body of prefix lemmas, rewrite any use of a
     focal predicate `P` to `P#[_k-1]`.
 
-* `-extractCounterexample` - control generation of counterexamples. If
-  verification fails, report a detailed counterexample for the first
-  failing assertion. Requires specifying the `-mv` option, to specify
-  where to write the counterexample, as well as the
-  `-proverOpt:O:model_compress=false` and
-  `-proverOpt:O:model.completion=true` options.
-
-### 13.8.8. Controlling compilation {#sec-controlling-compilation}
+### 13.9.8. Controlling compilation {#sec-controlling-compilation}
 
 These options control what code gets compiled, what target language is
 used, how compilation proceeds, and whether the compiled program is
@@ -2295,7 +2662,7 @@ out the textual target program as part of compilation, in which case
     method marked with the `{:extern}` attribute directly from a
     function or method marked with the `{:test}` attribute.
 
-### 13.8.9. Controlling Boogie {#sec-controlling-boogie}
+### 13.9.9. Controlling Boogie {#sec-controlling-boogie}
 
 Dafny builds on top of Boogie, a general-purpose intermediate language
 for verification. Options supported by Boogie on its own are also
@@ -2308,8 +2675,6 @@ terminology.
 
 * `--solver-plugin` - specifies a plugin to use as the SMT solver, instead of an external pdafny translaterocess
 
-* `--boogie-filter` - restricts the set of verification tasks (for debugging) 
-
 * `--boogie` - arguments to send to boogie
 
 Legacy options:
@@ -2346,7 +2711,7 @@ Legacy options:
 
 * `-vcsSplitOnEveryAssert` - prove each (explicit or implicit) assertion
   in each procedure separately. See also the attribute
-  [`{:vcs_split_on_every_assert}`](#sec-vcs_split_on_every_assert) for
+  [`{:isolate_assertions}`](#sec-isolate_assertions) for
   restricting this option on specific procedures. By default, Boogie
   attempts to prove that every assertion in a given procedure holds all
   at once, in a single query to an SMT solver. This usually performs
@@ -2372,7 +2737,7 @@ If you have Boogie installed locally, you can run the printed Boogie file with t
 DOTNET=$(which dotnet)
 
 BOOGIE_ROOT="path/to/boogie/Source"
-BOOGIE="$BOOGIE_ROOT/BoogieDriver/bin/Debug/net6.0/BoogieDriver.dll"
+BOOGIE="$BOOGIE_ROOT/BoogieDriver/bin/Debug/net8.0/BoogieDriver.dll"
 
 if [[ ! -x "$DOTNET" ]]; then
     echo "Error: Dafny requires .NET Core to run on non-Windows systems."
@@ -2397,11 +2762,11 @@ PROVER_OPTIONS="\
 #"$BOOGIE" $BOOGIE_OPTIONS $PROVER_OPTIONS "$@"
 ```
 
-### 13.8.10. Controlling the prover {#sec-controlling-prover}
+### 13.9.10. Controlling the prover {#sec-controlling-prover}
 
 Much of controlling the prover is accomplished by controlling 
 verification condition generation ([25.9.7](#sec-controlling-verification)) or Boogie 
-([Section 13.8.9](#sec-controlling-boogie)). 
+([Section 13.9.9](#sec-controlling-boogie)). 
 The following options are also commonly used:
 
 * `--verification-error-limit:<n>` - limits the number of verification errors reported per procedure.
@@ -2409,10 +2774,10 @@ The following options are also commonly used:
   but a large positive number reports more errors per run
 
 * `--verification-time-limit:<n>` (was `-timeLimit:<n>`) - limits 
-  the number of seconds spent trying to verify each procedure.
+  the number of seconds spent trying to verify each assertion batch.
 
 
-### 13.8.11. Controlling test generation {#sec-controlling-test-gen}
+### 13.9.11. Controlling test generation {#sec-controlling-test-gen}
 
 Dafny is capable of generating unit (runtime) tests. It does so by asking the prover to solve
 for values of inputs to a method that cause the program to execute specific blocks or paths.
diff --git a/docs/DafnyRef/VSCodeIDE.md b/docs/DafnyRef/VSCodeIDE.md
index 32ad90189a4..c4b73f42297 100644
--- a/docs/DafnyRef/VSCodeIDE.md
+++ b/docs/DafnyRef/VSCodeIDE.md
@@ -73,7 +73,7 @@ the position of the parse or resolution error.
 
 ## 14.3. The Dafny Server {#sec-old-dafny-server}
 
-Before Dafny [implemented](https://github.com/dafny-lang/dafny/tree/master/Source/DafnyLanguageServer) the official [Language Server Protocol](https://microsoft.github.io/language-server-protocol/), it implemented its own protocol for [Emacs](https://github.com/boogie-org/boogie-friends), which resulted in a project called [DafnyServer](https://github.com/dafny-lang/dafny/tree/master/Source/DafnyServer).
+Before Dafny [implemented](https://github.com/dafny-lang/dafny/tree/master/Source/DafnyLanguageServer) the official [Language Server Protocol](https://microsoft.github.io/language-server-protocol/), it implemented its own protocol for [Emacs](https://github.com/boogie-org/boogie-friends), which resulted in a project called [DafnyServer](https://github.com/dafny-lang/dafny/tree/master/Source/DafnyServer). While the latest Dafny releases still contain a working DafnyServer binary, this component has been feature frozen since 2022, and it may not support features that were added to Dafny after that time. We do not recommend using it.
 
 The Dafny Server has [integration tests](https://github.com/dafny-lang/dafny/tree/master/Test/server) that serve as the basis of the documentation.
 
@@ -156,5 +156,3 @@ btoa(JSON.stringify({
 
 Thus to decode such output, you'd manually use `JSON.parse(atob(payload))`.
 
-The Dafny Server is still supported, but we recommend using the [Language Server](https://github.com/dafny-lang/dafny/tree/master/Source/DafnyLanguageServer) instead. It is supported in [VSCode](https://marketplace.visualstudio.com/items?itemName=dafny-lang.ide-vscode) only. The Language Server also provides features such as ghost highlighting or symbol hovering.
-
diff --git a/docs/DafnyRef/integration- rust/IntegrationRust.md b/docs/DafnyRef/integration- rust/IntegrationRust.md
new file mode 100644
index 00000000000..6eb44ff9d4b
--- /dev/null
+++ b/docs/DafnyRef/integration- rust/IntegrationRust.md	
@@ -0,0 +1,184 @@
+---
+title: Integrating Dafny and Rust code
+---
+
+## THIS FILE IS A WORK IN PROGRESS, IT CAN BE MODIFIED AT ANY TIME WITHOUT NOTICE
+** The Dafny-to-Rust compiler is not an officially supported backend yet**
+
+The `dafny build` and `dafny run` currently translate a entry Dafny program `<program>.dfy`
+or project file like `program/dfyconfig.toml` into the following architecture,
+where the program depends on the Dafny runtime crate explicitly.
+```
+program-rust/   // Can be changed with --output:
+  runtime/
+    src/
+      lib.rs    // The Dafny runtime
+    cargo.lock
+    cargo.toml
+  src/
+    program.rs  // The generated program
+  cargo.lock
+  cargo.toml
+```
+
+With `dafny translate`, only `program-rust/src/program.rs` is emitted.
+
+## **Matching Dafny and Rust types**
+
+It's worth recalling that Rust has two semantics for variables:
+
+* *Copy semantics* are the one everyone used to `C#`, `Java`, `JavaScript`, `Go` understand.
+At run-time, it means the actual bits of memory are copied from one location to the other.
+Primitive types like `bool`, `u8`, `i8`, `u16`... but also any references `& T`, `&mut T`, `*const T`, `*mut T` or structs of these types have copy semantics.
+* *Move semantics* or *owned semantics* indicate that once a variable or a field is used without borrowing, it can no longer be used afterwards. These are the semantics that allow Rust to forget the garbage collector, by cleaning up resources Rust can statically determine they are not longer used.
+Move semantics are the default for any type that does not implement the `Copy` trait.
+
+Dafny has only Copy semantics, which as said offer a straight encoding for primitive types and reference types.
+However, immutable types and datatypes are a bit harder, because variables containing them would have
+move semantics by default. Fortunately, there exist a method `Cloneable::clone(&self)` that borrows an object of a struct or enum that implements the trait `Clone` and can create a duplicate. That method is a no-op for types implementing the `Copy` trait.
+
+Hence, whenever a variable with move semantics (borrowed or owned) is used in a place that expects an owned value (such as an addition), Dafny inserts a `.Clone()` call in Rust so that the result can be used independently of the variable. Moreover, to pass a variable to any function, it must be either borrowed (prefixed with `&`) or cloned, unless Dafny could theoretically determine it's the last occurrence of this variable.
+
+For maximum flexibility, Dafny follows these rules to encode types in Rust:
+- Function parameters always take primitive types without borrowing them (`bool`, `u32`, etc.) 
+- Function parameters always borrow variables of other types (`DafnyString`, structs, etc.), because
+  borrowing is always cheaper than cloning for non-Copy types.  
+  Open question: There are at least two more possible alternatives
+  - We could actually have parameters be always owned, which require `.clone()` also to be used at the call site
+  - We could have parameter attributes like `{:rc_owned true}` so that users can choose which API to precisely give to their functions.
+- Functions always return an owned type, otherwise we would need to have an automated theory about lifetimes of returned borrowed references, which Dafny does not support yet. Moreover, borrowing a variable makes its lifetime not `'static`, so it's not possible to use that trait.
+- `& T` and `&mut T` annotations only appear at the top-level of types, never nested.
+- Class types are encoded in reference-counted pointers by default, but there is a command-line flag `--raw-pointers` that encodes class type into an equivalent of a raw pointer. The Dafny team will have to make a deallocation statement available in the future, as it is not available yet. Please weight in on [this issue](https://github.com/dafny-lang/dafny/issues/5257) if you are interested.
+
+For each construct, the third column indicates if it's in the Dafny runtime, is native built-in in Rust, or is a Rust crate.
+If runtime, it also indicates in parentheses what it is roughly equivalent to. `[[U]]` notation indicates the Rust equivalent of the Dafny type `U`.
+The exact runtime types are subject to change, and code that is not Dafny-generated should not rely on those details.
+
+For guaranteed stability, code interfacting with Dafny structures should use types and conversions from `pub mod dafny_runtime_conversions`, such as `::dafny_runtime::dafny_runtime_conversions::DafnySequence<T>` and `::dafny_runtime::dafny_runtime_conversions::vec_to_dafny_sequence(array: &Vec<X>, elem_converter: fn(&X) -> T) -> DafnySequence<T>` for example.
+
+|  Dafny type                   |   Rust type                 | Defined in       |
+|-------------------------------|-----------------------------|------------------|
+| `bool`                        | `bool`                      | Native           |
+| `int`                         | `DafnyInt`                  | Runtime (`Rc<num::BigInt>`) |
+| `int64`                       | `i64`                       | Native           |
+| `int32`                       | `i32`                       | Native           |
+| `int16`                       | `i16`                       | Native           |
+| `int8`                        | `i8`                        | Native           |
+| `char`                        | `DafnyChar`                 | Runtime (`char`) |
+| `char` (`--unicode-chars=false`)| `DafnyCharUTF16`          | Runtime (`u16`)  |
+| `bv8` ... `bv128`             | `u8` ... `u128`             | Native           |
+| `type T = u: U | <range>`     | `[[U]]`                     | Native           |
+| `newtype T = u: U | range`    | `struct T([[U]])`           | Native           |
+| `newtype T = u: int | <range>`| `u8` ... `i128`             | Native           |
+| `ORDINAL`                     | N/A                         | TODO             |
+| `real`                        | Partially supported         | TODO             |
+| `seq<T>`                      | `Sequence<[[T]]>           `| Runtime |
+| `set<T>`, `iset<T>`           | `Set<[[T]]>`                | Runtime |
+| `multiset<T>`                 | `Multiset<[[T]]>`           | Runtime |
+| `map<T>`, `imap<T>`           | `Map<[[T]]>`                | Runtime |
+| `string`                      | `DafnyString`           | Runtime (`Sequence<DafnyCharUTF16>`) |
+| `string` (`--unicode-chars=false`)| `DafnyStringUTF16`      | Runtime (`Sequence<DafnyCharUTF16>`) |
+| (co)datatype `D`              | `std::rc::Rc<D>`            | Native wrapped struct |
+| (co)datatype `D` with attribute `{:rust_rc false}` | `D`    | Native struct    |
+| `(T1, T2...)`  (Up to size 12)| `(T1, T2...)`               | Native           |
+| `(T1, T2..., TN)` (13<=N<=20) | `_System.TupleN`            | Runtime because Rust limitations |
+| `A -> B`                      | `Rc<dyn Fn([[A]]) -> [[B]]>`| Native (note: arguments always borrowed) |
+
+## Encoding of classes and arrays (default)
+By default, Dafny uses reference counting to compile class and array references.
+
+|  Dafny type                   |   Rust type             | Defined in       |
+|-------------------------------|-------------------------|------------------|
+| `C`, `C?` (for class, iterator C) | `Object<C>`         | Runtime (`Option<Rc<UnsafeCell<C>>>`) |
+| (trait) `T`                   | (trait) `Object<dyn T>` | Runtime (`Option<Rc<UnsafeCell<dyn T>>>`) |
+| `array<T>`                    | `Object<[T]>`           | Runtime (`Option<Rc<UnsafeCell<[T]>>>`) |
+| `array2<T>`                   | `Object<array2<T>>`     | Runtime (`struct array2 {length0: usize, length1: usize, data: Box<[Box<[T]>]>}`)     |
+| `array3<T>` ... `array16<T>`  | `Object<array3<T>>` ... `Object<array16<T>>` | Runtime (`struct arrayN {length0: usize, ... lengthN-1: usize, data: Box<[...Box<[T]>...]>}`)     |
+| `c.x` if `c: C`               | `rd!(c).x`              | Runtime         |
+| `c.x := 2` if `c: C`          | `md!(c).x = 2`          | Runtime         |
+| `a[0]` if `a: array<T>`       | `rd!(a)[0]`             | Runtime         |
+| `a[1] := 2` if  `a: array<T>` | `md!(a)[1] = 2`         | Runtime         |
+
+
+## Encoding of classes and arrays with the option --raw-pointers
+The option `--raw-pointers` ensures that classes only have 8 bytes pointers,
+and array only have 8 bytes pointers + information about the length,
+and point to raw memory. Therefore, pointers have copy semantics and
+no call to any clone method needs to be made.
+However, since pointer comparison in Rust normally compares vtables,
+which is brittle, Dafny use its own pointer types which are wrappers:
+```rs
+pub struct Ptr<T: ?Sized>(pub Option<NonNull<UnsafeCell<T>>>);
+```
+
+|  Dafny type                   |   Rust type             | Defined in       |
+|-------------------------------|-------------------------|------------------|
+| `C`, `C?` (for class, iterator C) | `Ptr<C>`            | Runtime (`Option<NonNull<UnsafeCell<C>>>`) |
+| (trait) `T`                   | (trait) `Ptr<dyn T>`    | Runtime (`Option<NonNull<UnsafeCell<dyn T>>>`) |
+| `array<T>`                    | `Ptr<[T]>`              | Runtime (`Option<NonNull<UnsafeCell<[T]>>>`) |
+| `array2<T>`                   | `Ptr<array2<T>>`        | Runtime (`struct array2 {length0: usize, length1: usize, data: Box<[Box<[T]>]>}`)     |
+| `array3<T>` ... `array16<T>`  | `Ptr<array3<T>>` ... `Ptr<array16<T>>` | Runtime (`struct arrayN {length0: usize, ... lengthN-1: usize, data: Box<[...Box<[T]>...]>}`)     |
+| `c.x` if `c: C`               | `read!(c).x`            | Runtime         |
+| `c.x := 2` if `c: C`          | `modify!(c).x = 2`      | Runtime         |
+| `a[0]` if `a: array<T>`       | `read!(a)[0]`           | Runtime         |
+| `a[1] := 2` if  `a: array<T>` | `modify!(a)[1] = 2`     | Runtime         |
+
+# Externs
+
+You can provide additional `*.rs` files to `dafny translate`, `dafny build` and even `dafny run` (via the `--input` option)
+
+The best way to see what you have to implement as an extern Rust file is to compile your code with extern attributes and adding an external Rust file. For extra methods or static methods, you would then define an additional implementation in the extern Rust file. For other class or struct types, you just need to define them without any `mod` wrapper, or using the module structure as defined in the `{:extern}` attribute.
+
+When using simple 1-argument externs, the compilation follows Dafny conventions: static methods are static instance methods of a `pub struct _default {}` which is defined in the module itself, or must be defined externally if all static methods are labelled as externs.
+When using 2-argument extern methods or functions, the compilation follows Rust convention: The first argument is a path of Rust module names separated by `::` (or `.` for cross-compilation with e.g. the Java compiler). The second argument is the name of a static `pub fn` of that module.
+
+Let's assume you provide an additional input file `external.rs` with the following content:
+```
+pub mod rust {
+  pub mod module {
+    fn outsideMethod()
+  }
+}
+pub mod Test {
+  pub struct _default {}
+  impl _default {
+    pub fn extern_y() {
+    }
+  }
+}
+```
+Assuming that your Dafny program looks like:
+
+```
+
+module Test {
+  method {:extern "rust.module", "externalMethod"} outsideMethod()
+  method {:extern "extern_y"} dafny_y();
+}
+method Main() {
+  Test.outsideMethod();
+  Test.dafny_y();
+}
+```
+
+As of today, Dafny will generate the following for you (internal names not guaranteed):
+
+```
+pub mod external;         // from the additional external.rs input file
+
+pub mod _dafny_externs {  // from the additional external.rs input file
+  import opened external::*;
+}
+pub mod Test {
+  pub use super::_dafny_externs::Test::*; // Imports the _default
+}
+fn main() {
+  crate::rust::module::externalMethod();
+  super::Test::_default::extern_y();
+}
+```
+
+# Tests
+
+* Methods with the `{:test}` attribute will produce an equivalent `#[test]` method that can be run via `cargo test` on the code produced by `dafny build`.
+* Modules with the `{:rust_cfg_test}` attribute will have the attribute `#[cfg(test)]` when translated to Rust.
\ No newline at end of file
diff --git a/docs/Gemfile b/docs/Gemfile
index c8e7ff5ebfc..aff4e1df596 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -7,12 +7,12 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-#gem "jekyll", "~> 4.1.1"
+gem "jekyll", "~> 4.3.3"
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minima", "~> 2.5"
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
-gem "github-pages", "~> 228", group: :jekyll_plugins
+# gem "github-pages", "~> 228", group: :jekyll_plugins
 # If you have any plugins, put them here!
 #group :jekyll_plugins do
 #  gem "jekyll-feed", "~> 0.12"
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index a3afaa7ab69..0256d191cdd 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,206 +1,47 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.4)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
-    dnsruby (1.70.0)
-      simpleidn (~> 0.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    faraday (2.7.5)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    ffi (1.15.5)
-    ffi (1.15.5-x64-mingw-ucrt)
-    ffi (1.15.5-x64-unknown)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (228)
-      github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.3)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.4.0)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.13.0)
-      jekyll-include-cache (= 0.2.1)
-      jekyll-mentions (= 1.6.0)
-      jekyll-optional-front-matter (= 0.3.2)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.16.0)
-      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.3)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.8.0)
-      jekyll-sitemap (= 1.4.0)
-      jekyll-swiss (= 1.0.0)
-      jekyll-theme-architect (= 0.2.0)
-      jekyll-theme-cayman (= 0.2.0)
-      jekyll-theme-dinky (= 0.2.0)
-      jekyll-theme-hacker (= 0.2.0)
-      jekyll-theme-leap-day (= 0.2.0)
-      jekyll-theme-merlot (= 0.2.0)
-      jekyll-theme-midnight (= 0.2.0)
-      jekyll-theme-minimal (= 0.2.0)
-      jekyll-theme-modernist (= 0.2.0)
-      jekyll-theme-primer (= 0.6.0)
-      jekyll-theme-slate (= 0.2.0)
-      jekyll-theme-tactile (= 0.2.0)
-      jekyll-theme-time-machine (= 0.2.0)
-      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
-      kramdown (= 2.3.2)
-      kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.4)
-      mercenary (~> 0.3)
-      minima (= 2.5.1)
-      nokogiri (>= 1.13.6, < 2.0)
-      rouge (= 3.26.0)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.17.9)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (>= 3.0, < 5.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.14.3)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
+    google-protobuf (3.25.5-arm64-darwin)
+    google-protobuf (3.25.5-x86_64-linux)
     http_parser.rb (0.8.0)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.3)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (>= 0.7, < 2)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.4.0)
-      commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.4.0)
-      commonmarker (~> 0.23.7)
-      jekyll (~> 3.9.0)
-      jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 5.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.15.1)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.13.0)
-      jekyll (>= 3.4, < 5.0)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-include-cache (0.2.1)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-mentions (1.6.0)
-      html-pipeline (~> 2.3)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-numbered-headings (0.1.1)
-    jekyll-optional-front-matter (0.3.2)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.3.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-redirect-from (0.16.0)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-relative-links (0.6.1)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.4.3)
-      addressable (~> 2.0)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
-      rubyzip (>= 1.3.0, < 3.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
-    jekyll-sitemap (1.4.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-swiss (1.0.0)
-    jekyll-theme-architect (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.6.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.3)
-      jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.12.0)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
@@ -208,69 +49,35 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    mini_portile2 (2.8.2)
+    mercenary (0.4.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.18.0)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    nokogiri (1.14.3-x64-mingw-ucrt)
-      racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
-      racc (~> 1.4)
-    octokit (4.25.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    racc (1.6.2)
+    public_suffix (5.0.4)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.26.0)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rexml (3.3.9)
+    rouge (4.2.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.3)
-      tzinfo (>= 1.0.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unf_ext (0.0.8.2-x64-mingw-ucrt)
-    unf_ext (0.0.8.2-x64-unknown)
-    unicode-display_width (1.8.0)
-    wdm (0.1.1)
-    zeitwerk (2.6.8)
+    sass-embedded (1.69.7-arm64-darwin)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.69.7-x86_64-linux-gnu)
+      google-protobuf (~> 3.25)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.5.0)
+    webrick (1.8.2)
 
 PLATFORMS
-  x64-mingw-ucrt
-  x64-unknown
+  arm64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
-  github-pages (~> 228)
+  jekyll (~> 4.3.3)
   jekyll-numbered-headings
   kramdown (>= 2.3.1)
   minima (~> 2.5)
@@ -279,4 +86,4 @@ DEPENDENCIES
   wdm (~> 0.1.1)
 
 BUNDLED WITH
-   2.4.13
+   2.3.26
diff --git a/docs/HowToFAQ/ERROR_NoCode.md b/docs/HowToFAQ/ERROR_NoCode.md
deleted file mode 100644
index e0c7ac298bd..00000000000
--- a/docs/HowToFAQ/ERROR_NoCode.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: "Warning: file contains no code"
----
-
-This warning can occur if a file being compiled by Dafny is completely empty.
-Previous other occurrences of this warning were bugs.
-
diff --git a/docs/HowToFAQ/Errors-CommandLine.md b/docs/HowToFAQ/Errors-CommandLine.md
index 0a7c0edf6f8..b7308b206eb 100644
--- a/docs/HowToFAQ/Errors-CommandLine.md
+++ b/docs/HowToFAQ/Errors-CommandLine.md
@@ -14,9 +14,9 @@ The `-t` or `--target` options specifies which backend compiler to use for
 those dafny commands that compile dafny to other programming languages. 
 This error message says that the named language is not supported.
 
-## **Error: No input files were specified in command-line _command_** {#cli_no_files}
+## **Error: no Dafny source files were specified as input** {#cli_no_files}
 
-<!-- %check-cli  %err-->
+<!-- %check-cli -->
 ```bash
 dafny resolve
 ```
@@ -49,8 +49,8 @@ command is invoked or are absolute file paths. In particular, this
 instance of this error message identifies non-.dfy files that still
 have permitted extensions (according to the target platform) but
 cannot be found in the file system.
-
-## **Error: Command-line argument '_arg_' is neither a recognized option nor a filename with a supported extension (_ext_).** {#cli_bad_option}
+    
+## **Error: command-line argument '--zzz' is neither a recognized option nor a Dafny input file (.dfy, .doo, or .toml).** {#cli_bad_option}
 
 <!-- %check-cli -->
 ```bash
@@ -75,7 +75,7 @@ in an unrecognized form (e.g., with no filename extension).
 
 <!-- %check-cli -->
 ```bash
-dafny resolve z.zzz
+dafny build z.zzz
 ```
 
 Dafny programs are in files with a `.dfy` extension.
@@ -204,13 +204,12 @@ It is also recommended to use the new CLI, with the option `--quantifier-syntax`
 
 ## **Error: Invalid argument _argument_ to option verificationLogger_help_** {#cli_verification_logger}
 
-<!-- %check-cli %err %first -->
+<!-- %verify %err %first -->
 ```bash 
-dafny -verificationLogger:z
+--log-format:z
 ```
 
-The `verificationLogger` option has these alternatives: trx, csv, text.
-The option name in the new CLI is `--log-format`.
+The `--log-format` option has these alternatives: trx, csv, text.
 
 ## **Error: Invalid argument _argument_ to option testContracts_help_** {#cli_test_contracts}
 
diff --git a/docs/HowToFAQ/Errors-Compiler.md b/docs/HowToFAQ/Errors-Compiler.md
index dee8cb6eb12..da243df24e4 100644
--- a/docs/HowToFAQ/Errors-Compiler.md
+++ b/docs/HowToFAQ/Errors-Compiler.md
@@ -74,7 +74,7 @@ For example, [`type T(00)` indicates that the type `T` is non-empty](../DafnyRef
 
 ## **Error: since yield parameters are initialized arbitrarily, iterators are forbidden by the --enforce-determinism option** {#c_iterators_are_not_deterministic}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 iterator Gen(start: int) yields (x: int)
   yield ensures |xs| <= 10 && x == start + |xs| - 1
@@ -106,11 +106,11 @@ Programs containing iterators without bodies can be verified.
 However, a body-less iterator is an unchecked assumption (even if it is ghost).
 Consequently, like body-less functions and loops, dafny will not
 compile a program containing an iterator without a body.
-Furthermore, if the iterator is non-ghost, it cannot be executed if it does not have a body.
+Furthermore, if the iterator is non-ghost, it cannot be compiled if it does not have a body.
 
 ## **Error: since fields are initialized arbitrarily, constructor-less classes are forbidden by the --enforce-determinism option** {#c_constructorless_class_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 class A { var j: int }
 ```
@@ -121,7 +121,7 @@ Consequently an explicit constructor is required.
 
 ## **Error: The method '_name_' is not permitted as a main method (_reason_).** {#c_method_may_not_be_main_method}
 
-<!-- %check-legacy %options -compile:2 -Main:mmm -->
+<!-- %check-run %options --main-method:mmm -->
 ```dafny
 method mmm(i: int) {}
 ```
@@ -140,7 +140,7 @@ Most commonly and for clarity, the intended main method is marked with the attri
 
 ## **Error: Could not find the method named by the -Main option: _name_** {#c_could_not_find_stipulated_main_method}
 
-<!-- %check-legacy %options /compile:2 -Main:m -->
+<!-- %check-run %options --main-method:m -->
 ```dafny
 class A { static method mm() {} }
 ```
@@ -209,7 +209,7 @@ This error occurs if the `Main` method that is found
 does not qualify as a main entry point because it violates one or more of the [rules](#sec-user-guide-main),
 as given by the reason in the error message.
 
-## **Error: Function _name_ has no body** {#c_function_has_no_body}
+## **Error: Function _name_ has no body so it cannot be compiled** {#c_function_has_no_body}
 
 <!-- %check-run -->
 ```dafny
@@ -242,7 +242,7 @@ a mock object for methods that do not have bodies.
 It is currently only available for compiling to C# and in conjunction with the Moq library.
 See the [reference manual section on {:synthesize}](../DafnyRef/DafnyRef#sec-synthesize-attr) for more detail.
 
-## **Error: Method _name_ has no body** {#c_method_has_no_body}
+## **Error: Method _name_ has no body so it cannot be compiled** {#c_method_has_no_body}
 
 <!-- %check-run -->
 ```dafny
@@ -253,7 +253,7 @@ To be part of a compiled program, each method must have a body.
 Ghost methods are the equivalent of unchecked assumptions
 so they too must have bodies.
 
-## **Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)** {#c_assume_statement_may_not_be_compiled}
+## **Warning: assume statement has no {:axiom} annotation** {#r_assume_statement_without_axiom}
 
 <!-- %check-run -->
 ```dafny
@@ -262,13 +262,6 @@ method m(x: int) {
 }
 ```
 
-A method may be parsed and verified even if an [assume statement](../DafnyRef/DafnyRef#sec-assume-statement) is present. 
-However, the assume statement is an explicit, unchecked assumption.
-Dafny does not allow programs with unchecked assumptions, that is, incompletely verified programs, to be compiled.
-The `{:axiom}` attribute can be used to tell Dafny that the assumption is to be considered an
-externally verified _axiom_, with the program author taking responsibility for its validity.
-
-If the assumption marked with `{:axiom}` is not actually valid, then the validity of the entire program is in question.
 
 ## **Error: a forall statement without a body cannot be compiled** {#c_forall_statement_has_no_body}
 
@@ -305,7 +298,7 @@ Body-less loops in ghost methods are similar to unchecked assumptions.
 
 ## **Error: nondeterministic assignment forbidden by the --enforce-determinism option** {#c_nondeterminism_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m() {
   var x: int;
@@ -326,7 +319,7 @@ There are a few different forms of this kind of assignment:
 
 ## **Error: assign-such-that statement forbidden by the --enforce-determinism option** {#c_assign_such_that_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m() {
   var x: int;
@@ -349,7 +342,7 @@ However, in this case the expression is too complex for Dafny's heuristics.
 
 ## **Error: nondeterministic if statement forbidden by the --enforce-determinism option** {#c_nondeterministic_if_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m() {
 var y: int;
@@ -386,7 +379,7 @@ whether there is a reasonable way to compute a value.)
 
 ## **Error: case-based if statement forbidden by the --enforce-determinism option** {#c_case_based_if_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m(k: int) {
   var i := k;
@@ -408,7 +401,7 @@ To enforce a deterministic order to the evaluation, use a chain of if-then-else
 
 ## **Error: nondeterministic loop forbidden by the --enforce-determinism option** {#c_non_deterministic_loop_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m(b: bool) decreases * {
   while * 
@@ -423,7 +416,7 @@ Hence this 'non-deterministic while' (`while *`) statement is not permitted with
 
 ## **Error: case-based loop forbidden by the --enforce-determinism option** {#c_case_based_loop_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m(k: int) {
   var i := k;
@@ -452,7 +445,7 @@ _The documentation of this problem is in progress._
 
 ## **Error: modify statement without a body forbidden by the --enforce-determinism option** {#c_bodyless_modify_statement_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 class A { constructor A(){}}
 
diff --git a/docs/HowToFAQ/Errors-Compiler.template b/docs/HowToFAQ/Errors-Compiler.template
index 0ddd4861585..c6591bd1bce 100644
--- a/docs/HowToFAQ/Errors-Compiler.template
+++ b/docs/HowToFAQ/Errors-Compiler.template
@@ -44,7 +44,7 @@ type T
 
 ## **Error: since yield parameters are initialized arbitrarily, iterators are forbidden by the --enforce-determinism option** {#c_iterators_are_not_deterministic}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 iterator Gen(start: int) yields (x: int)
   yield ensures |xs| <= 10 && x == start + |xs| - 1
@@ -72,7 +72,7 @@ iterator Gen(start: int) yields (x: int)
 
 ## **Error: since fields are initialized arbitrarily, constructor-less classes are forbidden by the --enforce-determinism option** {#c_constructorless_class_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 class A { var j: int }
 ```
@@ -81,7 +81,7 @@ class A { var j: int }
 
 ## **Error: The method '_name_' is not permitted as a main method (_reason_).** {#c_method_may_not_be_main_method}
 
-<!-- %check-legacy %options -compile:2 -Main:mmm -->
+<!-- %check-run %options --main-method:mmm -->
 ```dafny
 method mmm(i: int) {}
 ```
@@ -90,7 +90,7 @@ method mmm(i: int) {}
 
 ## **Error: Could not find the method named by the -Main option: _name_** {#c_could_not_find_stipulated_main_method}
 
-<!-- %check-legacy %options /compile:2 -Main:m -->
+<!-- %check-run %options --main-method:m -->
 ```dafny
 class A { static method mm() {} }
 ```
@@ -137,7 +137,7 @@ method Main(i: int) {}
 
 <!-- INSERT-TEXT -->
 
-## **Error: Function _name_ has no body** {#c_function_has_no_body}
+## **Error: Function _name_ has no body so it cannot be compiled** {#c_function_has_no_body}
 
 <!-- %check-run -->
 ```dafny
@@ -160,7 +160,7 @@ ghost function {:test} f(): int { 42 }
 <!-- TODO: Need example? -->
 <!-- INSERT-TEXT -->
 
-## **Error: Method _name_ has no body** {#c_method_has_no_body}
+## **Error: Method _name_ has no body so it cannot be compiled** {#c_method_has_no_body}
 
 <!-- %check-run -->
 ```dafny
@@ -169,7 +169,7 @@ method m()
 
 <!-- INSERT-TEXT -->
 
-## **Error: an assume statement cannot be compiled (use the {:axiom} attribute to let the compiler ignore the statement)** {#c_assume_statement_may_not_be_compiled}
+## **Warning: assume statement has no {:axiom} annotation** {#r_assume_statement_without_axiom}
 
 <!-- %check-run -->
 ```dafny
@@ -208,7 +208,7 @@ ghost method m(i: int) {
 
 ## **Error: nondeterministic assignment forbidden by the --enforce-determinism option** {#c_nondeterminism_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m() {
   var x: int;
@@ -222,7 +222,7 @@ method m() {
 
 ## **Error: assign-such-that statement forbidden by the --enforce-determinism option** {#c_assign_such_that_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m() {
   var x: int;
@@ -239,7 +239,7 @@ method m() {
 
 ## **Error: nondeterministic if statement forbidden by the --enforce-determinism option** {#c_nondeterministic_if_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m() {
 var y: int;
@@ -266,7 +266,7 @@ method m(k: int) {
 
 ## **Error: case-based if statement forbidden by the --enforce-determinism option** {#c_case_based_if_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m(k: int) {
   var i := k;
@@ -282,7 +282,7 @@ method m(k: int) {
 
 ## **Error: nondeterministic loop forbidden by the --enforce-determinism option** {#c_non_deterministic_loop_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m(b: bool) decreases * {
   while * 
@@ -295,7 +295,7 @@ method m(b: bool) decreases * {
 
 ## **Error: case-based loop forbidden by the --enforce-determinism option** {#c_case_based_loop_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 method m(k: int) {
   var i := k;
@@ -317,7 +317,7 @@ method m(k: int) {
 
 ## **Error: modify statement without a body forbidden by the --enforce-determinism option** {#c_bodyless_modify_statement_forbidden}
 
-<!-- %check-run %options --enforce-determinism -->
+<!-- %check-resolve %options --enforce-determinism -->
 ```dafny
 class A { constructor A(){}}
 
diff --git a/docs/HowToFAQ/Errors-Parser.md b/docs/HowToFAQ/Errors-Parser.md
index 51af89b896c..9fc4c067a51 100644
--- a/docs/HowToFAQ/Errors-Parser.md
+++ b/docs/HowToFAQ/Errors-Parser.md
@@ -248,14 +248,25 @@ module N refines M { datatype D = ... Y | Z }
 There are limitations on refining a datatype, namely that the set of constructors cannot be changed.
 It is only allowed to add members to the body of the datatype.
 
-## **Error: datatype extending traits is a beta feature; use /generalTraits:1 to engage** {#p_general_traits_beta}
+## **Error: datatype extending traits is not yet enabled by default; use --general-traits=datatype to enable it** {#p_general_traits_datatype}
 
 ```dafny
 trait Trait { }
 datatype D extends Trait = A | B
 ```
 
-Use of traits as non-reference types is a beta feature. To engage, use /generalTraits:1.
+A newtype extending a trait is not generally supported. The option --general-traits=full causes
+Dafny to allow them in the input, but is not recommended.
+
+## **Error: newtype extending traits is not fully supported (specifically, compilation of such types is not supported); to use them for verification only, use --general-traits=full** {#p_general_traits_full}
+
+```dafny
+trait Trait { }
+newtype N extends Trait = int
+```
+
+Use of traits as non-reference types is supported, but is not yet the default. Until it becomes the
+default, use --general--traits=datatype to enable it.
 
 ## **Warning: module-level const declarations are always non-instance, so the 'static' keyword is not allowed here {#p_module_level_const_always_static}
 
@@ -1002,25 +1013,6 @@ that assist in proving the validity of the asserted expression.
 
 <!-- TODO -->
 
-## **Error: a forall statement with an ensures clause must have a body** {#p_forall_with_ensures_must_have_body}
-
-<!-- TODO: This example does not yet work in the new CLI because there is no way to turn on /noCheating in the new CLI -->
-
-<!-- %check-legacy %options -compile:0 -noCheating:1 -->
-```dafny
-module M {
-  predicate f(i: int) { true }
-  method  m(a: seq<int>) {
-    forall i | 0 <= i < 10
-       ensures f(i)
-  }
-}
-```
-
-A forall statement without a body is like an assume statement: the ensures clause is assumed in the following code.
-Assumptions like that are a risk to soundness because there is no check that the assumption is true.
-Thus in a context in which open assumptions are not allowed, body-less forall statements are also not allowed.
-
 ## **Warning: the modify statement with a block statement is deprecated** {#p_deprecated_modify_statement_with_block}
 
 <!-- TODO-->
@@ -1273,7 +1265,7 @@ are grouped. The example `5 | 6 & 7` should be written as either `(5 | 6) & 7` o
 
 ## **Error: too many characters in character literal** {#p_invalid_char_literal}
 
-<!-- %check-resolve --unicode-char:false -->
+<!-- %check-resolve %options --allow-deprecation --unicode-char:false -->
 ```dafny
 const c := '🚀'
 ```
@@ -1466,7 +1458,7 @@ that is a single underscore is used as a wild-card match.
 
 ## **Warning: deprecated style: a semi-colon is not needed here {#p_deprecated_semicolon}
 
-<!-- %check-legacy %exit 0 %options /compile:0 /deprecation:2 -->
+<!-- %check-resolve %options -->
 ```dafny
 const c := 5;
 ```
@@ -1550,17 +1542,6 @@ scanner recognizes. The only pragma ever recognized was `#line`.
 
 <!-- ./DafnyCore/AST/Grammar/ProgramParser.cs -->
 
-## **Warning: File contains no code** {#p_file_has_no_code}
-
-<!-- %check-resolve-warn -->
-```dafny
-// const c := 42
-```
-
-The indicated file has no code. This can be because the file is empty, because some parse error
-left the top-level module with no well-formed declarations, or because a unclosed comment
-has commented-out the whole file.
-
 ## **Error: [internal error] Parser exception: _message_** {#p_internal_exception}
 
 This error indicates an internal crashing bug in Dafny. Please report it with as much of 
diff --git a/docs/HowToFAQ/Errors-Parser.template b/docs/HowToFAQ/Errors-Parser.template
index 571c7115464..f5e57a773e8 100644
--- a/docs/HowToFAQ/Errors-Parser.template
+++ b/docs/HowToFAQ/Errors-Parser.template
@@ -204,7 +204,7 @@ module N refines M { datatype D = ... Y | Z }
 
 <!-- INSERT-TEXT -->
 
-## **Error: datatype extending traits is a beta feature; use /generalTraits:1 to engage** {#p_general_traits_beta}
+## **Error: datatype extending traits is not yet enabled by default; use --general-traits=datatype to enable it** {#p_general_traits_datatype}
 
 ```dafny
 trait Trait { }
@@ -213,6 +213,15 @@ datatype D extends Trait = A | B
 
 <!-- INSERT-TEXT -->
 
+## **Error: newtype extending traits is not fully supported (specifically, compilation of such types is not supported); to use them for verification only, use --general-traits=full** {#p_general_traits_full}
+
+```dafny
+trait Trait { }
+newtype N extends Trait = int
+```
+
+<!-- INSERT-TEXT -->
+
 ## **Warning: module-level const declarations are always non-instance, so the 'static' keyword is not allowed here {#p_module_level_const_always_static}
 
 <!-- %check-resolve-warn -->
@@ -802,23 +811,6 @@ method m() {
 
 <!-- INSERT-TEXT -->
 
-## **Error: a forall statement with an ensures clause must have a body** {#p_forall_with_ensures_must_have_body}
-
-<!-- TODO: This example does not yet work in the new CLI because there is no way to turn on /noCheating in the new CLI -->
-
-<!-- %check-legacy %options -compile:0 -noCheating:1 -->
-```dafny
-module M {
-  predicate f(i: int) { true }
-  method  m(a: seq<int>) {
-    forall i | 0 <= i < 10
-       ensures f(i)
-  }
-}
-```
-
-<!-- INSERT-TEXT -->
-
 ## **Warning: the modify statement with a block statement is deprecated** {#p_deprecated_modify_statement_with_block}
 
 <!-- INSERT-TEXT -->
@@ -991,7 +983,7 @@ const i: int := 5 | 6 & 7
 
 ## **Error: too many characters in character literal** {#p_invalid_char_literal}
 
-<!-- %check-resolve --unicode-char:false -->
+<!-- %check-resolve %options --allow-deprecation --unicode-char:false -->
 ```dafny
 const c := '🚀'
 ```
@@ -1124,7 +1116,7 @@ const _myconst := 5
 
 ## **Warning: deprecated style: a semi-colon is not needed here {#p_deprecated_semicolon}
 
-<!-- %check-legacy %exit 0 %options /compile:0 /deprecation:2 -->
+<!-- %check-resolve %options -->
 ```dafny
 const c := 5;
 ```
@@ -1188,15 +1180,6 @@ scanner recognizes. The only pragma ever recognized was `#line`.
 
 <!-- ./DafnyCore/AST/Grammar/ProgramParser.cs -->
 
-## **Warning: File contains no code** {#p_file_has_no_code}
-
-<!-- %check-resolve-warn -->
-```dafny
-// const c := 42
-```
-
-<!-- INSERT-TEXT -->
-
 ## **Error: [internal error] Parser exception: _message_** {#p_internal_exception}
 
 <!-- INSERT-TEXT -->
diff --git a/docs/HowToFAQ/Errors-Refinement.md b/docs/HowToFAQ/Errors-Refinement.md
index bed4294e995..eb4b6dd7142 100644
--- a/docs/HowToFAQ/Errors-Refinement.md
+++ b/docs/HowToFAQ/Errors-Refinement.md
@@ -80,78 +80,68 @@ module Q refines P {
 
 A submodule M within a module that is refining some base module must refine some submodule M in the base module.
 
-## **Error: type declaration '_name_' is not allowed to change the requirement of supporting equality** {#ref_mismatched_equality}
-
-<!-- TODO -->
-
-## **Error: type declaration '_name_' is not allowed to change the requirement of supporting auto-initialization** {#ref_mismatched_auto_init}
-
-<!-- TODO -->
-
-## **Error: type declaration '_name_' is not allowed to change the requirement of being nonempty** {#ref_mismatched_nonempty}
-
-<!-- TODO -->
-
-## **Error: a type declaration that requires equality support cannot be replaced by this trait** {#ref_trait_mismatched_equality}
-
-<!-- TODO -->
-
-## **Error: a type declaration that requires equality support cannot be replaced by a codatatype** {#ref_equality_support_precludes_codatatype}
+## **Error: to be a refinement of _kind_ '_name_' declared with (==), _kind_ '_name_' must support equality {#ref_mismatched_type_characteristics_equality}
 
 ```dafny
 module P {
   type T(==)
 }
 module Q refines P {
-  codatatype T = A
+  type T = AlwaysAndForeverMore
+  codatatype AlwaysAndForeverMore = Cons(int, AlwaysAndForeverMore)
 }
 ```
 
-Codatatypes do not generally support equality and so cannot be refinements of an abstract type that declares that it supports equality.
+The abstract type `T` in module `P` says it supports equality, but its attempted refinement in module `Q` does not.
+Codatatypes do not generally support equality and so cannot be refinements of equality-supporting abstract types.
 
-## **Error: type '_name_', which does not support equality, is used to refine an abstract type with equality support** {#ref_mismatched_type_equality_support}
+## **Error: to be a refinement of _kind_ '_name_' declared with (!new), _kind_ '_name_' must contain no references {#ref_mismatched_type_characteristics_noreferences}
 
 ```dafny
 module P {
-  type T(==)
+  type T(!new)
 }
 module Q refines P {
-  codatatype A = B | C
-  type T = A
+  type T = (int, bool, array<real>)
 }
 ```
 
-A refining type must be declared to support equality (with `(==)`) if the base declaration is declared to support equality.
-
+The abstract type `T` in module `P` says it contains no reference, but its attempted refinement in module `Q` does.
+A refining type must support the type characteristics declared of the refined type.
 
-## **Error: type '_name_', which does not support auto-initialization, is used to refine an abstract type that expects auto-initialization** {#ref_mismatched_type_auto_init}
+## **Error: to be a refinement of _kind_ '_name_' declared with (00), _kind_ '_name_' must be nonempty {#ref_mismatched_type_characteristics_nonempty}
 
 ```dafny
 module P {
-  type T(0)
+  type T(00)
 }
 module Q refines P {
-  class A{}
   type T = A
+  class A { }
 }
 ```
 
-A refining type must be declared to be auto-initializing (with `(0)`) if the base declaration is declared auto-initializing.
+The abstract type `T` in module `P` uses the type characteristic `(00)` to say that it is nonempty. However, a class type is
+not generally known to be nonempty, so `A` cannot be used as a refinement for `T` in `Q`.
 
+For this particular situation, a possible remedy would be to instead use `type T = A?`, since the nullable type `A?` is known to be nonempty.
 
-## **Error: type '_name_', which may be empty, is used to refine an abstract type expected to be nonempty** {#ref_mismatched_type_nonempty}
+## **Error: to be a refinement of _kind_ '_name_' declared with (0), _kind_ '_name_' must support auto-initialization {#ref_mismatched_type_characteristics_autoinit}
 
 ```dafny
 module P {
-  type T(00)
+  type T(0)
 }
 module Q refines P {
-  class A{}
   type T = A
+  class A { }
 }
 ```
 
-A refining type must be declared to be non-empty (with `(00)`) if the base declaration is declared non-empty.
+The abstract type `T` in module `P` uses the type characteristic `(00)` to say that it can be auto-initialized. However, a class type does
+not support auto-initialization, so `A` cannot be used as a refinement for `T` in `Q`.
+
+For this particular situation, a possible remedy would be to instead use `type T = A?`, since the nullable type `A?` does support auto-initialization.
 
 ## **Error: a _kind_ (_name_) cannot declare members, so it cannot refine an abstract type with members** {#ref_mismatched_type_with_members}
 
@@ -775,6 +765,32 @@ There are restrictions on what can be changed in a refinement.
 In particular, the variance of type parameters must remain the same.
 
 
+## **Error: type parameter '_name_' of _what_ '_declarationname_' is declared with a different number of type bounds than in the corresponding _what_ in the module it refines (expected _oldnum_, found _num_)** {#ref_mismatched_type_bounds_count}
+
+``` dafny
+module A {
+  type AbstrType<X extends object>
+}
+
+module B refines A {
+  type AbstrType<X>
+}
+```
+
+## **Error: type bound for type parameter '_name_' of _what_ '_declarationname_' is different from the corresponding type bound of the corresponding type parameter of the corresponding _what_ in the module it refines (expected '_oldbound_', found '_bound_'** {#ref_mismatched_type_parameter_bound}
+
+``` dafny
+module A {
+  type AbstrType<X extends object>
+}
+
+module B refines A {
+  trait Trait { }
+  type AbstrType<X extends Trait>
+}
+```
+
+
 ## **Error: _kind_ '_name_' is declared with a different number of _what_ (_num_ instead of _oldnum_) than the corresponding _kind_ in the module it refines** {#ref_mismatched_kind_count}
 
 ```dafny
diff --git a/docs/HowToFAQ/Errors-Resolver2.md b/docs/HowToFAQ/Errors-Resolver2.md
index c64504a5a68..ae804063a4c 100644
--- a/docs/HowToFAQ/Errors-Resolver2.md
+++ b/docs/HowToFAQ/Errors-Resolver2.md
@@ -108,7 +108,7 @@ Part of the pattern that is amenable to this optimization is that the last thing
 in the body of a recursive method (or function) is a call of the recursive function with the
 value returned being assigned to the out-parameter.
 
-## **Error: the recursive call to '_name_' is not tail recursive because the actual type parameter _typeparam_ is not the formal type parameter '_formal_'**
+## **Error: the recursive call to '_name_' is not tail recursive because the actual type argument _typeparam_ is not the formal type parameter '_formal_'**
 
 ```dafny
 method {:tailrecursion} m<T,U>(n: nat) returns (r: nat)
@@ -168,7 +168,7 @@ and optimizing tail-recursion opportunities in mutually recursive functions.
 ```dafny
 function {:tailrecursion} f(n: nat): nat
 {
-  if n == 0 then n else var ff := f; ff(n-1)
+  if n == 0 then n else var r := f(n-1); r
 }
 ```
 
diff --git a/docs/HowToFAQ/Errors.md b/docs/HowToFAQ/Errors.md
index fc3373e757e..68fa1c26a57 100644
--- a/docs/HowToFAQ/Errors.md
+++ b/docs/HowToFAQ/Errors.md
@@ -42,6 +42,10 @@ Italicized words in the given messages indicate variable content.
 {% include_relative Errors-Resolver3.md %}
 {% include_relative Errors-Rewriter.md %}
 
+# **Refinement Errors**
+
+{% include_relative Errors-Refinement.md %}
+
 # **Verification Errors**
 
 _This section is a work in progress_
diff --git a/docs/HowToFAQ/FAQForallTricks.md b/docs/HowToFAQ/FAQForallTricks.md
index 76cb5e48404..e9aca723f5a 100644
--- a/docs/HowToFAQ/FAQForallTricks.md
+++ b/docs/HowToFAQ/FAQForallTricks.md
@@ -1,10 +1,10 @@
 ---
-title: Why can't I write 'forall t: Test :: t.i == 1' for an object t?
+title: "Why can't I write `forall t: Test :: t.i == 1` for an object `t`?"
 ---
 
 ## Question:
 
-Why can't I write `forall t: Test :: t.i == 1` for an object t?
+Why can\'t I write `forall t: Test :: t.i == 1` for an object `t`?
 
 ## Answer:
 
diff --git a/docs/HowToFAQ/FAQFunctionByMethodProof.md b/docs/HowToFAQ/FAQFunctionByMethodProof.md
new file mode 100644
index 00000000000..e107e2716b0
--- /dev/null
+++ b/docs/HowToFAQ/FAQFunctionByMethodProof.md
@@ -0,0 +1,87 @@
+---
+title: I can't prove the equivalence between the method part of a `function by method`` and the function itself
+---
+
+## Question
+
+I can't prove the equivalence between the method part of a function by method and the function itself.
+It seems that my invariants can't be maintained by the loop, and I don't know how to prove them.
+
+## Answer
+
+Consider the simple problem of computing the sum of a sequence of integers.
+You might be tempted to immediately write the following equivalence,
+with your best guess of an invariant
+and a hint at the end to help Dafny realize that the result is correct.
+However you cannot prove the invariant you just wrote.
+
+```
+{% include_relative FAQFunctionByMethodProof1.dfy %}
+```
+
+Let's unroll the computation of the function on a sequence of 3 elements.
+The function will compute:
+
+`s[0] + (s[1] + (s[2] + 0))`
+
+But the loop will compute
+
+`((0 + s[0]) + s[1]) + s[2]`
+
+In the function, we add the first element (`s[0]`) to the result of computing the sum of the remaining elements (`s[1] + (s[2] + 0))`).
+In the by method, we add the last element (`s[2]`) to the accumulator, which contains the sum of the initial terms (`(0 + s[0]) + s[1]`).
+If it was not the case that the addition was associative and 0 was a neutral element, there would be no immediate way to prove that the two computations are equivalent.
+
+There are essentially three solutions around that:
+
+* Improve the invariant, knowing `+` is associative
+* Change the order of computation of the function so that it matches the by method
+* Change the order of computation of the by method so that it matches the function
+
+There are more intrusive solutions, such as making the function tail-recursive by changing the function's signature to include an accumulator or a sequence of callbacks to perform a the end, but we will explore only the one that don't change the signature of `Sum()`.
+
+## Improved invariant
+
+You can change the invariant to be `invariant result + Sum(s[i..]) == Sum(s)`, as below:
+
+```
+{% include_relative FAQFunctionByMethodProof2.dfy %}
+```
+
+This works because, with `result'` being the result at the end of the loop and `+` being associative,
+the lemma `IntermediateProperty()` shows the underlying reasoning that helps prove that the invariant
+is indeed invariant. Dafny can prove it automatically, so the lemma is not needed in the loop body.
+One nice thing is that we can get rid of the final hint.
+
+What if you had an operation more complex that "+", that is not associative?
+This is when you need to ensure the loop and the function are computing in the same order.
+Let's explore how to do so by changing either the function, or the by-method body.
+
+## Make the function compute what the by-method does
+The by-method loop's first addition is 0 plus the first element (`s[0]`) of the sequence. For this to
+be the first addition performed by the function, it has to be at the bottommost level of the call.
+Indeed, each addition is performed after the recursive call finishes. This means that
+the function needs to sum the `n-1` elements first and add the remaining last one.
+
+Since it's exactly what the method computes, it satisfies our initial invariant.
+
+```
+{% include_relative FAQFunctionByMethodProof3.dfy %}
+```
+
+Not only does this approach require more proof hints, but it might also break the proofs that dependend on the shape of the function, while all we wanted in the first place was to give a more efficient implementation to the function.
+Therefore, it's reasonable to expect we will prefer to change the implementation of the by-method body to reflect the function, not the opposite, as follows:
+
+## Make the by-method body compute what the function computes
+
+To compute iteratively what the function computes recursively, you have to find what is the first
+addition that will be computed by the method. As mentioned previously, the first addition is the one performed at the bottommost level of recursion: the first addition is `s[|s|-1] + 0`,
+so the loop has to actually be in reverse, like this:
+
+```
+{% include_relative FAQFunctionByMethodProof4.dfy %}
+```
+
+Note that this approach results in the smallest invariant that actually closely matches the function itself.
+Also, instead of adding to the right of `result`, adding to the left ensures the same order is kept,
+in case the operation was not commutative (so that it would work for sequence append operation).
\ No newline at end of file
diff --git a/docs/HowToFAQ/FAQFunctionByMethodProof1.dfy b/docs/HowToFAQ/FAQFunctionByMethodProof1.dfy
new file mode 100644
index 00000000000..be5753e854c
--- /dev/null
+++ b/docs/HowToFAQ/FAQFunctionByMethodProof1.dfy
@@ -0,0 +1,16 @@
+function Sum(s: seq<int>): (result: int) {
+  if |s| == 0 then
+    0
+  else
+    s[0] + Sum(s[1..])
+} by method {
+  result := 0; 
+  for i := 0 to |s|
+    invariant result == Sum(s[0..i])
+    //        ^^^^^^^^^^^^^^^^^^^^^^
+    //           Cannot be proved
+  {
+    result := result + s[i];
+  }
+  assert s[0..|s|] == s;
+}
\ No newline at end of file
diff --git a/docs/HowToFAQ/FAQFunctionByMethodProof1.txt b/docs/HowToFAQ/FAQFunctionByMethodProof1.txt
new file mode 100644
index 00000000000..c1cae2502d8
--- /dev/null
+++ b/docs/HowToFAQ/FAQFunctionByMethodProof1.txt
@@ -0,0 +1,2 @@
+FAQFunctionByMethodProof1.dfy(9,14): Error: this invariant could not be proved to be maintained by the loop
+Dafny program verifier finished with 1 verified, 1 error
diff --git a/docs/HowToFAQ/FAQFunctionByMethodProof2..txt b/docs/HowToFAQ/FAQFunctionByMethodProof2..txt
new file mode 100644
index 00000000000..c39a053eb9c
--- /dev/null
+++ b/docs/HowToFAQ/FAQFunctionByMethodProof2..txt
@@ -0,0 +1 @@
+Dafny program verifier finished with 2 verified, 0 error
diff --git a/docs/HowToFAQ/FAQFunctionByMethodProof2.dfy b/docs/HowToFAQ/FAQFunctionByMethodProof2.dfy
new file mode 100644
index 00000000000..2169f6e73c2
--- /dev/null
+++ b/docs/HowToFAQ/FAQFunctionByMethodProof2.dfy
@@ -0,0 +1,28 @@
+function Sum(s: seq<int>): (result: int) {
+  if |s| == 0 then
+    0
+  else
+    s[0] + Sum(s[1..])
+} by method {
+  result := 0;
+  for i := 0 to |s|
+    invariant result + Sum(s[i..]) == Sum(s) // New invariant
+  {
+    result := result + s[i];
+  }
+} // No hint needed at the end
+
+lemma IntermediateProperty(result: int, result': int, i: int, s: seq<int>)
+  requires 0 <= i < |s|
+  requires result' == result + s[i]
+  requires result + Sum(s[i..]) == Sum(s)
+  ensures result' + Sum(s[i+1..]) == Sum(s)
+{
+  calc {
+     Sum(s);
+  == result + Sum(s[i..]);             // Requires definition
+  == result + (s[i]  + Sum(s[i+1..])); // Definition of Sum()
+  ==(result +  s[i]) + Sum(s[i+1..]);  // Associativity
+  == result'         + Sum(s[i+1..]);  // Definition of result'
+  }
+}
\ No newline at end of file
diff --git a/docs/HowToFAQ/FAQFunctionByMethodProof3.dfy b/docs/HowToFAQ/FAQFunctionByMethodProof3.dfy
new file mode 100644
index 00000000000..6229ab8b2df
--- /dev/null
+++ b/docs/HowToFAQ/FAQFunctionByMethodProof3.dfy
@@ -0,0 +1,17 @@
+function Sum(s: seq<int>): (result: int) {
+  if |s| == 0 then
+    0
+  else
+    Sum(s[0..|s|-1]) + s[|s| - 1]
+    // We add the last element to the sum of the first
+} by method {
+  result := 0;
+  for i := 0 to |s|
+    invariant result == Sum(s[0..i])
+  {
+    assert s[0..i+1][0..i] == s[0..i];
+     // Minimum hint needed for proof
+    result := result + s[i];
+  }
+  assert s[0..|s|] == s;
+} // One last hint
\ No newline at end of file
diff --git a/docs/HowToFAQ/FAQFunctionByMethodProof3.txt b/docs/HowToFAQ/FAQFunctionByMethodProof3.txt
new file mode 100644
index 00000000000..c39a053eb9c
--- /dev/null
+++ b/docs/HowToFAQ/FAQFunctionByMethodProof3.txt
@@ -0,0 +1 @@
+Dafny program verifier finished with 2 verified, 0 error
diff --git a/docs/HowToFAQ/FAQFunctionByMethodProof4.dfy b/docs/HowToFAQ/FAQFunctionByMethodProof4.dfy
new file mode 100644
index 00000000000..5fd07ce805f
--- /dev/null
+++ b/docs/HowToFAQ/FAQFunctionByMethodProof4.dfy
@@ -0,0 +1,10 @@
+function Sum(s: seq<int>): (result: int) {
+  if |s| == 0 then 0 else s[0] + Sum(s[1..])
+} by method {
+  result := 0;
+  for i := |s| downto 0              // Reverse. First i == |s| - 1
+    invariant result == Sum(s[i..])  // The invariant looks like the function
+  {
+    result := s[i] + result;         // Note how we sum in reverse as well.
+  }
+} // No hint needed at the end
\ No newline at end of file
diff --git a/docs/HowToFAQ/FAQFunctionByMethodProof4.txt b/docs/HowToFAQ/FAQFunctionByMethodProof4.txt
new file mode 100644
index 00000000000..c39a053eb9c
--- /dev/null
+++ b/docs/HowToFAQ/FAQFunctionByMethodProof4.txt
@@ -0,0 +1 @@
+Dafny program verifier finished with 2 verified, 0 error
diff --git a/docs/HowToFAQ/FAQTerminationFalse.md b/docs/HowToFAQ/FAQTerminationFalse.md
index d9ff0a062c4..d9d2bc773ab 100644
--- a/docs/HowToFAQ/FAQTerminationFalse.md
+++ b/docs/HowToFAQ/FAQTerminationFalse.md
@@ -1,14 +1,14 @@
 ---
-title: What does {:termination false} do on trait? It looks like it is required if I want to extend traits from other modules.
+title: What do {:termination false} and @AssumeCrossModuleTermination do? It looks one of them is required if I want to extend traits from other modules.
 ---
 
 ## Question
 
-What does `{:termination false}` do on trait? It looks like it is required if I want to extend traits from other modules.
+What do `{:termination false}` and `@AssumeCrossModuleTermination` do? It looks one of them is required if I want to extend traits from other modules.
 
 ## Answer
 
-The attribute turns off termination checking for the trait. Here is an example
+These attributes allow a class to extend a trait from another module, even though termination checking may then miss cases of non-termination. Here is an example
 ```dafny
 module foo1 {
 
@@ -34,14 +34,18 @@ module foo2 {
   }
 }
 ```
-In this example, omitting `{:termination false}` provokes the error "class 'Boz' is in a different module than trait 'foo1.Foo'. A class may only extend a trait in the same module, unless the parent trait is annotated with {:termination false}.".
+In this example, omitting `{:termination false}` provokes the error "class 'Boz' is in a different module than trait 'foo1.Foo'. A class may only extend a trait in the same module, 
+unless the class is annotated with `@AssumeCrossModuleTermination` or the parent trait is annotated with `{:termination false}`.".
 
-The `{:termination false}` is only needed when there is dynamic dispatch across module boundaries.
-It does put the onus on the user to prove termiation, as Dafny is no longer doing so.
+These attributes are only needed when there is dynamic dispatch across module boundaries.
+It does put the onus on the user to prove termiation, as Dafny may successfully verify the program even if some execution paths may never terminate.
 The origin of this situation has to do with the interaction of current decreases clauses and traits.
 
 Dafny decreases clauses were designed before the language had dynamic dispatch via trait members. As such, decreases clauses are made to be as simple as possible within each module, and decreases clauses are unnecessary across modules. When dynamic dispatch was added to the language, a draconian restriction was put in place to maintain soundness, namely to disallow dynamic dispatch across module boundaries. This is enforced by insisting that a class that implements a trait is declared in the same module that declares the trait.
 
-The draconian restriction outlaws the useful case where a trait is placed in a library. Indeed, we are seeing this in [`dafny-lang/libraries`](https://github.com/dafny-lang/libraries/) now. So, Dafny supports a way for users to lift the draconian restriction and instead take responsibility themselves for termination of dynamically dispatched calls via a trait--it is to mark the trait with `{:termination false}`.
+The draconian restriction outlaws the useful case where a trait is placed in a library. 
+The recommended approach is to NOT add `{:termination false}` to the trait,
+but instead expect that any extending classes declared in other modules add `@AssumeCrossModuleTermination`.
+This ensures that users of the library are made aware of this unsoundness and must opt-in to it.
 
 The status of solutions to this problem are discussed [here](https://github.com/dafny-lang/dafny/issues/1588).
diff --git a/docs/HowToFAQ/MakeErrorCatalog.java b/docs/HowToFAQ/MakeErrorCatalog.java
deleted file mode 100644
index 0bc11eeeda5..00000000000
--- a/docs/HowToFAQ/MakeErrorCatalog.java
+++ /dev/null
@@ -1,115 +0,0 @@
-import java.util.*;
-import java.io.*;
-public class MakeErrorCatalog {
-
-  public static void main(String ... args) {
-    String template = args[0];
-    List<String> ids = new LinkedList<>();
-    Map<String,String> explanations = new HashMap<>();
-    for (int i = 1; i < args.length; i++) {
-     String file = args[i];
-     try (BufferedReader br = new BufferedReader(new FileReader(file))) {
-      String line = null;  
-      String text = null;
-      String errorid = null;
-      boolean inblock = false;
-      int number = 0;
-      while ((line = br.readLine()) != null) {  
-        number++;
-        if (line.contains("Add(ErrorId")) {
-          if (inblock) {
-            System.out.println("SYNTAX ERROR LINE " + number + ": New errorid while still in text block");
-            System.exit(1);
-          }
-          errorid = line.replace("Add(ErrorId.","").replaceAll(",.*","").trim();
-          ids.add(errorid);
-          if (errorid.length() == 0 || errorid.contains(" ")) {
-            System.out.println("SYNTAX ERROR LINE " + number + ": Invalid errorid: " + errorid);
-            System.exit(1);
-          }
-          continue;
-        }
-        if (line.contains("@\"")) {
-          if (inblock) {
-            System.out.println("SYNTAX ERROR LINE " + number + ": Start of block detected while in block");
-            System.exit(1);
-          }
-          if (errorid == null) {
-            System.out.println("SYNTAX ERROR LINE " + number + ": No errorid known at start of explanation block");
-            System.exit(1);
-          }
-          inblock = true;
-          text = "";
-          continue;
-        }
-        if (line.startsWith("\"")) {
-          if (!inblock) {
-            System.out.println("SYNTAX ERROR LINE " + number + ": End of block detected while not in block");
-            System.exit(1);
-          }
-          inblock = false;
-          explanations.put(errorid,text.replaceAll("\"\"","\""));
-          errorid = null;
-          continue;
-        }
-        if (inblock) {
-          text += line + "\n";
-          continue;
-        }
-      } 
-      if (inblock) {
-        System.out.println("FAILURE - SYNTAX: ended file in block");
-        System.exit(1);
-      }
-     } catch (Exception e) {
-        System.out.println("EXCEPTION: " + e);
-        e.printStackTrace(System.out);
-        System.exit(1);
-     }
-    }
-
-/*
-    for (var s: ids) {
-      System.out.println("ERRORID: " + s);
-      System.out.println(explanations.get(s));
-    }
-*/
-    String outname = template.replace("template","tmp");
-    try (PrintStream fileout = new PrintStream(outname); BufferedReader br = new BufferedReader(new FileReader(template))) {
-      String line = null;
-      String errorid = null;
-      boolean inblock = false;
-      int number = 0;
-      while ((line = br.readLine()) != null) {
-        number++;
-        if (line.startsWith("## **")) {
-          int k = line.indexOf("{#");
-          int kk = line.lastIndexOf("}");
-          if (k == -1 || kk == -1) {
-            System.out.println("SYNTAX ERROR IN TEMPLATE LINE " + number + ": no errorid");
-            System.exit(1);
-          }
-          errorid = line.substring(k+2, kk);
-          fileout.println(line);
-          continue;
-        }
-        if (line.contains("INSERT-TEXT")) {
-          var text = explanations.get(errorid);
-          if (text != null) {
-            fileout.print(text); // text already has trailing newline
-          } else {
-            fileout.println(line);
-            System.out.println("Unknown errorid: " + errorid);
-          }
-        } else {
-          fileout.println(line);
-        }
-      }
-    } catch (Exception e) {
-        System.out.println("EXCEPTION: " + e);
-        e.printStackTrace(System.out);
-        System.exit(1);
-    }
-    System.exit(0);
-  }
-}
diff --git a/docs/HowToFAQ/check-errors b/docs/HowToFAQ/check-errors
index 716c58f3f51..9ccb43d9653 100755
--- a/docs/HowToFAQ/check-errors
+++ b/docs/HowToFAQ/check-errors
@@ -84,7 +84,7 @@ echo ">>>> GENERIC"
 echo ">>>> COMPILER"
 
 csfiles="$D/Compilers/*.cs $D/Compilers/*/*.cs"
-./check-errors-a Errors-Compiler.md $D/Compilers/CompilerErrors.cs "$csfiles"
+./check-errors-a Errors-Compiler.md $D/Backends/GeneratorErrors.cs "$csfiles"
 
 echo ">>>> REFINEMENT"
 
diff --git a/docs/HowToFAQ/index.md b/docs/HowToFAQ/index.md
index f4bc0632b87..cc47c424446 100644
--- a/docs/HowToFAQ/index.md
+++ b/docs/HowToFAQ/index.md
@@ -69,7 +69,7 @@ If you have questions that are not addressed here, be sure to communicate them t
 - ["Are there functional alternatives to recursive calls that are more efficient or use less stack space?"](FAQRecursiveCalls)
 - ["How do I read a file as a string?"](FAQReadFile)
 - ["Can I ask dafny to not check termination of a function?"](FAQNoTermCheck)
-- ["What does {:termination false} do on trait? It looks like it is required if I want to extend traits from other modules."](FAQTerminationFalse)
+- ["What do {:termination false} and @AssumeCrossModuleTermination do? It looks one of them is required if I want to extend traits from other modules."](FAQTerminationFalse)
 - ["How do I make Dafny termination checking happy with this pattern of mutual recursion?"](FAQMutualRecursion)
 - ["Can it be proved that a class instance is not an instance of a trait?"](FAQTypeReasoning)
 - ["Is there a nice way to turn a set into a seq?"](FAQSetToSeq)
@@ -86,6 +86,7 @@ If you have questions that are not addressed here, be sure to communicate them t
 - ["How do I model extern methods that return objects?"](FAQExternReturnsObject)
 - ["How do I tell Dafny that a class field may be updated?"](FAQUpdateArrayField)
 - ["Why does Dafny not know this obvious property of maps?"](FAQMapMembership)
+- ["I can't prove the equivalence between the method part of a `function by method` and the function itself"](FAQFunctionByMethodProof)
 
 ## Dafny tools
 
@@ -120,7 +121,6 @@ Also see [the error catalog](./Errors) for a complete, searchable list of error
 - ["Cannot export mutable field 'x' without revealing its enclosing class 'A'"](ERROR_MutableField)
 - ["this symbol not expected in Dafny"](ERROR_PostconditionLemma)
 - [Prover error: Unexpected prover response (getting info about 'unknown' response): (:reason-unknown "Overflow encountered when expanding old_vector")](ERROR_ProverError1)
-- ["Warning: File contains no code: ..."](ERROR_NoCode)
 - ["Duplicate name of import: ..."](ERROR_DuplicateImportName)
 - ["Warning: /!\ No terms found to trigger on."](ERROR_NoTriggers)
 - ["Error: value does not satisfy the subset constraints of '(seq\<uint8>, Materials.EncryptedDataKey) -> seq\<uint8>' (possible cause: it may be partial or have read effects)"](ERROR_SubsetConstraints)
diff --git a/docs/HowToFAQ/make-error-catalog b/docs/HowToFAQ/make-error-catalog
index 42b2993d15e..f81d1e27960 100755
--- a/docs/HowToFAQ/make-error-catalog
+++ b/docs/HowToFAQ/make-error-catalog
@@ -3,21 +3,18 @@ dir=$(dirname "${BASH_SOURCE[0]}")
 cd "$dir"
 
 FAIL=0
-java MakeErrorCatalog.java Errors-Compiler.template \
-      ../../Source/DafnyCore/Compilers/CompilerErrors.cs 
+../../Scripts/dafny documentation Errors-Compiler.template
 if [ "$?" != "0" ] ; then echo "Java build-run failed"; exit 1; fi
 
 diff Errors-Compiler.tmp Errors-Compiler.md || \
    { echo "Errors-Compiler.md has been altered -- check and commit the edits"; FAIL=1; }
 
-java MakeErrorCatalog.java Errors-Parser.template \
-      ../../Source/DafnyCore/AST/Grammar/ParseErrors.cs 
+../../Scripts/dafny documentation Errors-Parser.template
 if [ "$?" != "0" ] ; then echo "Java build-run failed"; exit 1; fi
 
 diff Errors-Parser.tmp Errors-Parser.md || \
    { echo "Errors-Parser.md has been altered -- check and commit the edits"; FAIL=1; }
 
-
 if [ "$FAIL" != "0" ]; then echo FAILURE; exit 1; fi
 
 
diff --git a/docs/HowToFAQ/onepage.md b/docs/HowToFAQ/onepage.md
index fa8f70553ac..16930fca51c 100644
--- a/docs/HowToFAQ/onepage.md
+++ b/docs/HowToFAQ/onepage.md
@@ -2307,6 +2307,92 @@ method mmm<K(==),V(==)>(m: map<K,V>, k: K, v: V) {
 ```
 proves just fine.
 
+# I can't prove the equivalence between the method part of a `function by method`` and the function itself
+
+
+## Question
+
+I can't prove the equivalence between the method part of a function by method and the function itself.
+It seems that my invariants can't be maintained by the loop, and I don't know how to prove them.
+
+## Answer
+
+Consider the simple problem of computing the sum of a sequence of integers.
+You might be tempted to immediately write the following equivalence,
+with your best guess of an invariant
+and a hint at the end to help Dafny realize that the result is correct.
+However you cannot prove the invariant you just wrote.
+
+```
+{% include_relative FAQFunctionByMethodProof1.dfy %}
+```
+
+Let's unroll the computation of the function on a sequence of 3 elements.
+The function will compute:
+
+`s[0] + (s[1] + (s[2] + 0))`
+
+But the loop will compute
+
+`((0 + s[0]) + s[1]) + s[2]`
+
+In the function, we add the first element (`s[0]`) to the result of computing the sum of the remaining elements (`s[1] + (s[2] + 0))`).
+In the by method, we add the last element (`s[2]`) to the accumulator, which contains the sum of the initial terms (`(0 + s[0]) + s[1]`).
+If it was not the case that the addition was associative and 0 was a neutral element, there would be no immediate way to prove that the two computations are equivalent.
+
+There are essentially three solutions around that:
+
+* Improve the invariant, knowing `+` is associative
+* Change the order of computation of the function so that it matches the by method
+* Change the order of computation of the by method so that it matches the function
+
+There are more intrusive solutions, such as making the function tail-recursive by changing the function's signature to include an accumulator or a sequence of callbacks to perform a the end, but we will explore only the one that don't change the signature of `Sum()`.
+
+## Improved invariant
+
+You can change the invariant to be `invariant result + Sum(s[i..]) == Sum(s)`, as below:
+
+```
+{% include_relative FAQFunctionByMethodProof2.dfy %}
+```
+
+This works because, with `result'` being the result at the end of the loop and `+` being associative,
+the lemma `IntermediateProperty()` shows the underlying reasoning that helps prove that the invariant
+is indeed invariant. Dafny can prove it automatically, so the lemma is not needed in the loop body.
+One nice thing is that we can get rid of the final hint.
+
+What if you had an operation more complex that "+", that is not associative?
+This is when you need to ensure the loop and the function are computing in the same order.
+Let's explore how to do so by changing either the function, or the by-method body.
+
+## Make the function compute what the by-method does
+The by-method loop's first addition is 0 plus the first element (`s[0]`) of the sequence. For this to
+be the first addition performed by the function, it has to be at the bottommost level of the call.
+Indeed, each addition is performed after the recursive call finishes. This means that
+the function needs to sum the `n-1` elements first and add the remaining last one.
+
+Since it's exactly what the method computes, it satisfies our initial invariant.
+
+```
+{% include_relative FAQFunctionByMethodProof3.dfy %}
+```
+
+Not only does this approach require more proof hints, but it might also break the proofs that dependend on the shape of the function, while all we wanted in the first place was to give a more efficient implementation to the function.
+Therefore, it's reasonable to expect we will prefer to change the implementation of the by-method body to reflect the function, not the opposite, as follows:
+
+## Make the by-method body compute what the function computes
+
+To compute iteratively what the function computes recursively, you have to find what is the first
+addition that will be computed by the method. As mentioned previously, the first addition is the one performed at the bottommost level of recursion: the first addition is `s[|s|-1] + 0`,
+so the loop has to actually be in reverse, like this:
+
+```
+{% include_relative FAQFunctionByMethodProof4.dfy %}
+```
+
+Note that this approach results in the smallest invariant that actually closely matches the function itself.
+Also, instead of adding to the right of `result`, adding to the left ensures the same order is kept,
+in case the operation was not commutative (so that it would work for sequence append operation).
 # Is there a Dafny style? and a Dafny linter (style checker and bad smell warnings)?
 
 
@@ -2851,13 +2937,6 @@ As of v3.9.0 there is work underway to update Z3 to a more recent version.
 Until then, the best you can do is to try to change the verification condition sent to Z3 by splitting it up, using various Dafny options and attributes like `{:split_here}`, `{:focus}`, `/vcsSplitOnEveryAssert`, `/vcsMaxSplits`, and `/randomSeed`.
 
 
-# "Warning: file contains no code"
-
-
-This warning can occur if a file being compiled by Dafny is completely empty.
-Previous other occurences of this warning were bugs.
-
-
 # "Duplicate name of import: ..."
 
 
diff --git a/docs/Installation.md b/docs/Installation.md
index b78b677c53b..991e4b06b42 100644
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -15,7 +15,7 @@ are in the [Dafny project wiki](https://github.com/dafny-lang/dafny/wiki/INSTALL
 System Requirements
 ===================
 
-The `dafny tool` is a .NET 6.0 artifact, but it compiles to native executables on supported platforms.
+The `dafny tool` is a .NET 8.0 artifact, but it compiles to native executables on supported platforms.
 That and the Z3 tool are all that is needed to use dafny for verification; additional tools are 
 need for compilation, as described below.
 
@@ -41,7 +41,7 @@ In addition, the Dafny toolkit supplies runtime libraries, either in source form
 ### C#
 
 - Dafny targeting C# produces C#10-compatible source code.
-- Only the .NET 6.0 set of tools (which includes the C# compiler) is needed to compile and run the generated C# code.
+- Only the .NET 8.0 set of tools (which includes the C# compiler) is needed to compile and run the generated C# code.
 - The Dafny runtime library is included as C# source along with the generated C# code, so the user can compile those sources
 and any user code in one project.
 
@@ -55,7 +55,6 @@ and any user code in one project.
 
 - Dafny targeting Javascript produces Javascript source consistent with Node.js v 16.0.0
 
-
 ### Python
 
 - Dafny targeting Python produces targets Python 3.7 source.
@@ -67,6 +66,10 @@ with the user's choice of python tool (that compiles at least 3.7).
 
 - Dafny targeting Go produces Go source content consistent with Go 1.18.
 
+### Rust
+
+- Partial and growing support
+
 ### C++
 
 C++ has only rudimentary special purpose support at present.
@@ -83,9 +86,9 @@ For most users, we recommend using Dafny with VS Code, which has an easy install
 ## Visual Studio Code {#Visual-Studio-Code}
 
 0. Install [Visual Studio Code](https://code.visualstudio.com/)
-1. If you are on a Mac or Linux, install .NET 6.0, as described under those platforms below.  
+1. If you are on a Mac or Linux, install .NET 8.0, as described under those platforms below.
 2. In Visual Studio Code, press `Ctrl+P` (or `⌘P` on a Mac), and enter `ext install dafny-lang.ide-vscode`.
-3. If you open a `.dfy` file, Dafny VSCode will offer to download and install the latest Dafny. You can also browse extensions: 
+3. If you open a `.dfy` file, Dafny VSCode will offer to download and install the latest Dafny. You can also browse extensions:
   ![vs-code-dafny-2 0 1-install](https://user-images.githubusercontent.com/3601079/141353551-5cb5e23b-5536-47be-ba17-e5af494b775c.gif)
 
 ## Emacs {#Emacs}
@@ -115,7 +118,7 @@ install the correct dependencies for the desired language.
 
 To install Dafny on your own machine, 
 
-* Install (if not already present) .NET Core 6.0: `https://dotnet.microsoft.com/download/dotnet/6.0`
+* Install (if not already present) .NET Core 8.0: `https://dotnet.microsoft.com/download/dotnet/8.0`
 * Download the windows zip file from the [releases page](https://github.com/dafny-lang/dafny/releases/latest) and **save** it to your disk. 
 * Then, **before you open or unzip it**, right-click on it and select Properties; at the bottom of the dialog, click the **Unblock** button and then the OK button. 
 * Now, open the zip file and copy its contents into a directory on your machine. (You can now delete the zip file.)
@@ -127,7 +130,7 @@ Then:
 ## Linux (Binary) {#linux-binary}
 
 To install a binary installation of dafny on Linux (e.g., Ubuntu), do the following:
-* Install .NET 6.0. See: `https://docs.microsoft.com/dotnet/core/install/linux` or `sudo apt install dotnet-sdk-6.0`
+* Install .NET 8.0. See: `https://docs.microsoft.com/dotnet/core/install/linux` or `sudo apt install dotnet-sdk-8.0`
 * Install the Linux binary version of Dafny, from `https://github.com/dafny-lang/dafny/releases/latest`
 * Unzip the downloaded file in a (empty) location of your choice
 
@@ -140,16 +143,18 @@ After the compiler dependencies are installed, you can run a quick test of the i
 
 ## Mac (Binary) {#Mac-binary}
 
-To install a binary installation of dafny on Mac OS, do one of the following:
-Either
+To install a binary installation of Dafny on macOS, do one of the following:
+
+Either  
    * Install the Mac binary version of Dafny, from `https://github.com/dafny-lang/dafny/releases/latest`
-   * Unzip the downloaded file in a (empty) location of your choice ($INSTALL)
-   * cd into the installation directory (`$INSTALL/dafny`) and run the script `./allow_on_mac.sh`
-   * dafny is run with the command `$INSTALL/dafny/dafny`
+   * Unzip the downloaded file in a (empty) location of your choice (`$INSTALL`)
+   * `cd` into the installation directory (`$INSTALL/dafny`) and run the script `./allow_on_mac.sh`
+   * Dafny is run with the command `$INSTALL/dafny/dafny`
+
 or
-   * install dafny using brew, with the command `brew install dafny` (the version on brew sometimes lags the
+   * Install Dafny using brew, with the command `brew install dafny` (the version on brew sometimes lags the
      project release page)
-   * run dafny with the command `dafny`
+   * Run Dafny with the command `dafny`
 
 If you intend to use the Dafny compiler, install the appropriate tools as described [here](#compiling-dafny).
 
@@ -160,7 +165,7 @@ After the compiler dependencies are installed, you can run a quick test of the i
 
 The .NET [NuGet](https://www.nuget.org/) repository collects .NET libraries and tools for easy installation. Dafny is available on NuGet, and can be installed as follows:
 
-* Install .NET 6.0 as described for your platform in one of the subsections above.
+* Install .NET 8.0 as described for your platform in one of the subsections above.
 * Install a binary version of Z3 4.12.1 for your platform from its [GitHub releases page](https://github.com/Z3Prover/z3/releases/tag/Z3-4.12.1) and put the `z3` executable in your `PATH`.
 * Install Dafny using `dotnet tool install --global dafny` (or leave out the `--global` to use with `dotnet tool run` from the source directory of a .NET project).
 
@@ -176,10 +181,10 @@ Additional instructions are found in the [Dafny User Guide](DafnyRef/DafnyRef#se
 
 ### C# (.Net)
 
-Install .NET 6.0:
-* Windows) `https://dotnet.microsoft.com/download/dotnet/6.0`
-* Linux) Install .NET 6.0. See: `https://docs.microsoft.com/dotnet/core/install/linux` or `sudo apt install dotnet-sdk-6.0`
-* Mac) Install .NET 6.0: `brew install dotnet-sdk` or from `https://docs.microsoft.com/dotnet/core/install/macos`
+Install .NET 8.0:
+* Windows) `https://dotnet.microsoft.com/download/dotnet/8.0`
+* Linux) Install .NET 8.0. See: `https://docs.microsoft.com/dotnet/core/install/linux` or `sudo apt install dotnet-sdk-8.0`
+* Mac) Install .NET 8.0: `brew install dotnet-sdk` or from `https://docs.microsoft.com/dotnet/core/install/macos`
 
 
 To separately compile and run your program for .NET:
@@ -205,7 +210,9 @@ To set up Dafny to compile to Go:
 * Install Go from [https://golang.org/dl](https://golang.org/dl) or
    * Linux: `sudo apt install golang`
    * Mac: `brew install golang`
-* Make sure `go` is on your path
+* Install `goimports` from [https://pkg.go.dev/golang.org/x/tools/cmd/goimports](https://pkg.go.dev/golang.org/x/tools/cmd/goimports)
+   * `go install golang.org/x/tools/cmd/goimports@latest`
+* Make sure `go` and `goimports` are on your path
 
 To separately compile and run your program for Go:
 - `dafny build --target:go MyProgram.dfy`
@@ -234,4 +241,9 @@ To setup Dafny to compile to python3:
 
 To separately compile and run your program for Python:
 - `dafny build -t:py MyProgram.dfy`
-- `python3 MyProgram-py/MyProgram.py
+- `python3 MyProgram-py/MyProgram.py`
+
+### Rust
+
+To setup Dafny to compile to Rust:
+* Install Rust from https://rustup.rs/
diff --git a/docs/OnlineTutorial/Lemmas.2.expect b/docs/OnlineTutorial/Lemmas.2.expect
index 0b245131800..406404e2c17 100644
--- a/docs/OnlineTutorial/Lemmas.2.expect
+++ b/docs/OnlineTutorial/Lemmas.2.expect
@@ -1,4 +1,4 @@
 text.dfy(10,14): Error: this invariant could not be proved to be maintained by the loop
-text.dfy(10,14): Related message: loop invariant violation
+ Related message: loop invariant violation
 
 Dafny program verifier finished with 1 verified, 1 error
diff --git a/docs/OnlineTutorial/Lemmas.3.expect b/docs/OnlineTutorial/Lemmas.3.expect
index 16d98528080..741469b444b 100644
--- a/docs/OnlineTutorial/Lemmas.3.expect
+++ b/docs/OnlineTutorial/Lemmas.3.expect
@@ -1,6 +1,4 @@
 text.dfy(6,0): Error: a postcondition could not be proved on this return path
 text.dfy(5,10): Related location: this is the postcondition that could not be proved
-text.dfy(5,56): Related location
-text.dfy(5,65): Related location
 
 Dafny program verifier finished with 1 verified, 1 error
diff --git a/docs/OnlineTutorial/Lemmas.4.expect b/docs/OnlineTutorial/Lemmas.4.expect
index 7bdfae08f53..dfd367ec4e6 100644
--- a/docs/OnlineTutorial/Lemmas.4.expect
+++ b/docs/OnlineTutorial/Lemmas.4.expect
@@ -1,6 +1,4 @@
 text.dfy(6,0): Error: a postcondition could not be proved on this return path
 text.dfy(5,10): Related location: this is the postcondition that could not be proved
-text.dfy(5,56): Related location
-text.dfy(5,65): Related location
 
 Dafny program verifier finished with 3 verified, 1 error
diff --git a/docs/OnlineTutorial/Lemmas.md b/docs/OnlineTutorial/Lemmas.md
index f2fa5a5e651..48bda036d71 100644
--- a/docs/OnlineTutorial/Lemmas.md
+++ b/docs/OnlineTutorial/Lemmas.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Lemmas and Induction
+---
 
 # Lemmas and Induction
 
diff --git a/docs/OnlineTutorial/Modules.1.expect b/docs/OnlineTutorial/Modules.1.expect
index ed42e629ef7..d6dc21a21f9 100644
--- a/docs/OnlineTutorial/Modules.1.expect
+++ b/docs/OnlineTutorial/Modules.1.expect
@@ -1,4 +1,4 @@
-text.dfy(27,23): Error: assertion could not be proved
-text.dfy(37,23): Error: assertion could not be proved
+text.dfy(27,4): Error: assertion could not be proved
+text.dfy(37,4): Error: assertion could not be proved
 
 Dafny program verifier finished with 5 verified, 2 errors
diff --git a/docs/OnlineTutorial/Modules.5.expect b/docs/OnlineTutorial/Modules.5.expect
index 13a7db9fb02..6b41b05f352 100644
--- a/docs/OnlineTutorial/Modules.5.expect
+++ b/docs/OnlineTutorial/Modules.5.expect
@@ -1,3 +1,3 @@
-text.dfy(13,21): Error: assertion could not be proved
+text.dfy(13,4): Error: assertion could not be proved
 
 Dafny program verifier finished with 2 verified, 1 error
diff --git a/docs/OnlineTutorial/Modules.md b/docs/OnlineTutorial/Modules.md
index d5add36f5b8..15c56d3e5f5 100644
--- a/docs/OnlineTutorial/Modules.md
+++ b/docs/OnlineTutorial/Modules.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Modules
+---
 
 # Modules
 
diff --git a/docs/OnlineTutorial/Sequences.md b/docs/OnlineTutorial/Sequences.md
index 79347d4b457..78c6480143c 100644
--- a/docs/OnlineTutorial/Sequences.md
+++ b/docs/OnlineTutorial/Sequences.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Sequences
+---
 
 # Sequences
 
diff --git a/docs/OnlineTutorial/Sets.1.expect b/docs/OnlineTutorial/Sets.1.expect
index 500049c807d..3d1df100b62 100644
--- a/docs/OnlineTutorial/Sets.1.expect
+++ b/docs/OnlineTutorial/Sets.1.expect
@@ -1,3 +1,3 @@
-text.dfy(4,41): Error: assertion could not be proved
+text.dfy(4,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/OnlineTutorial/Sets.W1.expect b/docs/OnlineTutorial/Sets.W1.expect
index 25779fa85c6..f331a19471d 100644
--- a/docs/OnlineTutorial/Sets.W1.expect
+++ b/docs/OnlineTutorial/Sets.W1.expect
@@ -1,3 +1,3 @@
-text.dfy(6,9): Warning: /!\ No terms found to trigger on.
+text.dfy(6,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 
 Dafny program verifier finished with 1 verified, 0 errors
diff --git a/docs/OnlineTutorial/Sets.W2.expect b/docs/OnlineTutorial/Sets.W2.expect
index 687ed435e3a..0f54bf67b67 100644
--- a/docs/OnlineTutorial/Sets.W2.expect
+++ b/docs/OnlineTutorial/Sets.W2.expect
@@ -1,3 +1,3 @@
-text.dfy(3,10): Warning: /!\ No terms found to trigger on.
+text.dfy(3,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 
 Dafny program verifier finished with 1 verified, 0 errors
diff --git a/docs/OnlineTutorial/Sets.W3.expect b/docs/OnlineTutorial/Sets.W3.expect
index 687ed435e3a..0f54bf67b67 100644
--- a/docs/OnlineTutorial/Sets.W3.expect
+++ b/docs/OnlineTutorial/Sets.W3.expect
@@ -1,3 +1,3 @@
-text.dfy(3,10): Warning: /!\ No terms found to trigger on.
+text.dfy(3,10): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 
 Dafny program verifier finished with 1 verified, 0 errors
diff --git a/docs/OnlineTutorial/Sets.md b/docs/OnlineTutorial/Sets.md
index fa363f9eded..0b01c7cf0bc 100644
--- a/docs/OnlineTutorial/Sets.md
+++ b/docs/OnlineTutorial/Sets.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Sets
+---
 
 # Sets
 
diff --git a/docs/OnlineTutorial/Termination.md b/docs/OnlineTutorial/Termination.md
index a3254cd7b4a..68a5d1bb157 100644
--- a/docs/OnlineTutorial/Termination.md
+++ b/docs/OnlineTutorial/Termination.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Termination
+---
 
 # Termination
 
diff --git a/docs/OnlineTutorial/ValueTypes.md b/docs/OnlineTutorial/ValueTypes.md
index a938fde171e..b42442360c2 100644
--- a/docs/OnlineTutorial/ValueTypes.md
+++ b/docs/OnlineTutorial/ValueTypes.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: Collection Types
+---
 
 # Collection Types
 
diff --git a/docs/OnlineTutorial/guide.10.expect b/docs/OnlineTutorial/guide.10.expect
index e714f865f0b..6a7d67a8974 100644
--- a/docs/OnlineTutorial/guide.10.expect
+++ b/docs/OnlineTutorial/guide.10.expect
@@ -1,14 +1,14 @@
 text.dfy(7,0): Error: a postcondition could not be proved on this return path
+text.dfy(4,12): Related location: this is the postcondition that could not be proved
+text.dfy(7,0): Error: a postcondition could not be proved on this return path
 text.dfy(5,23): Related location: this is the postcondition that could not be proved
 text.dfy(7,0): Error: a postcondition could not be proved on this return path
 text.dfy(6,22): Related location: this is the postcondition that could not be proved
-text.dfy(7,0): Error: a postcondition could not be proved on this return path
-text.dfy(4,12): Related location: this is the postcondition that could not be proved
+text.dfy(16,0): Error: a postcondition could not be proved on this return path
+text.dfy(13,12): Related location: this is the postcondition that could not be proved
 text.dfy(16,0): Error: a postcondition could not be proved on this return path
 text.dfy(14,23): Related location: this is the postcondition that could not be proved
 text.dfy(16,0): Error: a postcondition could not be proved on this return path
 text.dfy(15,22): Related location: this is the postcondition that could not be proved
-text.dfy(16,0): Error: a postcondition could not be proved on this return path
-text.dfy(13,12): Related location: this is the postcondition that could not be proved
 
 Dafny program verifier finished with 0 verified, 6 errors
diff --git a/docs/OnlineTutorial/guide.12.expect b/docs/OnlineTutorial/guide.12.expect
index 6337db908d3..4ac23827a38 100644
--- a/docs/OnlineTutorial/guide.12.expect
+++ b/docs/OnlineTutorial/guide.12.expect
@@ -1,3 +1,3 @@
-text.dfy(9,11): Error: assertion could not be proved
+text.dfy(9,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/OnlineTutorial/guide.13.expect b/docs/OnlineTutorial/guide.13.expect
index 46499092bdd..a3a11e7c04d 100644
--- a/docs/OnlineTutorial/guide.13.expect
+++ b/docs/OnlineTutorial/guide.13.expect
@@ -1,6 +1,6 @@
 text.dfy(5,21): Error: this loop invariant could not be proved on entry
-text.dfy(5,21): Related message: loop invariant violation
+ Related message: loop invariant violation
 text.dfy(5,21): Error: this invariant could not be proved to be maintained by the loop
-text.dfy(5,21): Related message: loop invariant violation
+ Related message: loop invariant violation
 
 Dafny program verifier finished with 0 verified, 2 errors
diff --git a/docs/OnlineTutorial/guide.14.expect b/docs/OnlineTutorial/guide.14.expect
index c7dd5ce32a4..5218101a696 100644
--- a/docs/OnlineTutorial/guide.14.expect
+++ b/docs/OnlineTutorial/guide.14.expect
@@ -1,4 +1,4 @@
 text.dfy(14,20): Error: this loop invariant could not be proved on entry
-text.dfy(14,20): Related message: loop invariant violation
+ Related message: loop invariant violation
 
 Dafny program verifier finished with 1 verified, 1 error
diff --git a/docs/OnlineTutorial/guide.17.expect b/docs/OnlineTutorial/guide.17.expect
index 169c34eac1c..baa44a334db 100644
--- a/docs/OnlineTutorial/guide.17.expect
+++ b/docs/OnlineTutorial/guide.17.expect
@@ -1,3 +1,3 @@
-text.dfy(3,9): Warning: /!\ No terms found to trigger on.
+text.dfy(3,9): Warning: Could not find a trigger for this quantifier. Without a trigger, the quantifier may cause brittle verification. To silence this warning, add an explicit trigger using the {:trigger} attribute. For more information, see the section quantifier instantiation rules in the reference manual.
 
 Dafny program verifier finished with 1 verified, 0 errors
diff --git a/docs/OnlineTutorial/guide.18.expect b/docs/OnlineTutorial/guide.18.expect
index cff5e599067..271d2cbcfea 100644
--- a/docs/OnlineTutorial/guide.18.expect
+++ b/docs/OnlineTutorial/guide.18.expect
@@ -1,6 +1,4 @@
 text.dfy(4,0): Error: a postcondition could not be proved on this return path
 text.dfy(3,24): Related location: this is the postcondition that could not be proved
-text.dfy(3,54): Related location
-text.dfy(3,63): Related location
 
 Dafny program verifier finished with 1 verified, 1 error
diff --git a/docs/OnlineTutorial/guide.20.expect b/docs/OnlineTutorial/guide.20.expect
index 1e4b70abf5d..8cd4f6b8f87 100644
--- a/docs/OnlineTutorial/guide.20.expect
+++ b/docs/OnlineTutorial/guide.20.expect
@@ -1,3 +1,3 @@
-text.dfy(3,44): Error: insufficient reads clause to read array element
+text.dfy(3,44): Error: insufficient reads clause to read array element; Consider adding 'reads a' in the enclosing predicate specification for resolution
 
 Dafny program verifier finished with 0 verified, 1 error
diff --git a/docs/OnlineTutorial/guide.7.expect b/docs/OnlineTutorial/guide.7.expect
index 1e8ca772dab..7b7328252c0 100644
--- a/docs/OnlineTutorial/guide.7.expect
+++ b/docs/OnlineTutorial/guide.7.expect
@@ -1,3 +1,3 @@
-text.dfy(14,11): Error: assertion could not be proved
+text.dfy(14,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 1 verified, 1 error
diff --git a/docs/OnlineTutorial/guide.8.expect b/docs/OnlineTutorial/guide.8.expect
index db49796be3a..d11d0d05600 100644
--- a/docs/OnlineTutorial/guide.8.expect
+++ b/docs/OnlineTutorial/guide.8.expect
@@ -1,3 +1,3 @@
-text.dfy(11,11): Error: assertion could not be proved
+text.dfy(11,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 1 verified, 1 error
diff --git a/docs/OnlineTutorial/guide.9.expect b/docs/OnlineTutorial/guide.9.expect
index 354d54bfcf2..0f758f1836e 100644
--- a/docs/OnlineTutorial/guide.9.expect
+++ b/docs/OnlineTutorial/guide.9.expect
@@ -1,3 +1,3 @@
-text.dfy(10,11): Error: assertion could not be proved
+text.dfy(10,2): Error: assertion could not be proved
 
 Dafny program verifier finished with 1 verified, 1 error
diff --git a/docs/OnlineTutorial/guide.md b/docs/OnlineTutorial/guide.md
index 2363ea77f0b..c1489511891 100644
--- a/docs/OnlineTutorial/guide.md
+++ b/docs/OnlineTutorial/guide.md
@@ -1,4 +1,6 @@
-<p></p> <!-- avoids duplicate title -->
+---
+title: "Getting Started with Dafny: A Guide"
+---
 
 # Getting Started with Dafny: A Guide
 
@@ -514,7 +516,7 @@ method Abs(x: int) returns (y: int)
 
 This expresses exactly the property we discussed before,
 that the absolute value is the same for non-negative integers. The second
-ensures is expressed via the implication operator, which basically says that
+`ensures` is expressed via the implication operator `==>`, which basically says that
 the left hand side implies the right in the mathematical sense (it binds more
 weakly than boolean "and" and comparisons, so the above says `0 <= x` implies `y == x`).
 The left and right sides must both be boolean expressions.
@@ -667,11 +669,11 @@ method m()
 ```
 
 In fact, not only can we write this statement directly
-without capturing to a local variable, we didn't even need to write all the
-postconditions that we did with the method (though functions can and do have
+without capturing to a local variable, we didn't even need to write any
+postconditions to caputure the behavior as we did with the method (though functions can and do have
 pre- and postconditions in general). The limitations of functions are
-precisely what let Dafny do this. Unlike methods, Dafny does not forget the
-body of a function when considering other functions. So it can expand the
+precisely what enable Dafny to do this. Unlike with methods, Dafny does not forget the
+body of a function when using it. So it can expand the
 definition of `abs` in the above assertion and determine that the result is
 actually `3`.
 
@@ -691,45 +693,12 @@ method Testing() {
 }
 ```
 
-One caveat of functions is that not only can they appear in
-annotations, they can only appear in annotations. One cannot write:
-
-<!-- %no-check -->
-```dafny
-  var v := abs(3);
-```
-
-as this is not an annotation. Functions are never part of
-the final compiled program, they are just tools to help us verify our code.
-Sometimes it is convenient to use a function in real code, so one can define a
-`function method`, which can be called from real code. Note
-that there are restrictions on what functions can be function methods (See the
-reference for details).
-
 **Exercise 5.**
-  *Change your test method from Exercise 4 to capture the value of
-  `max` to an out-parameter, and then do the checks from Exercise 4 using
-  the variable. Dafny will reject this program because you are calling
-  `max` from real code. Fix this problem using a `function method`.*
-
-<!-- %check-resolve -->
-```dafny
-function max(a: int, b: int): int
-{
-  0 // Use your code from Exercise 4
-}
-method Testing() returns (r: int) {
-  // Add assertions to check max here. Be sure to capture it to the out-parameter
-  r := 0;
-}
-```
-
-**Exercise 6.**
   *Now that we have an `abs` function, change the postcondition of
   method `Abs` to make use of `abs`. After confirming the method still
   verifies, change the body of `Abs` to also use `abs`. (After doing
   this, you will realize there is not much point in having a method
-  that does exactly the same thing as a function method.)*
+  that does exactly the same thing as a function.)*
 
 <!-- %check-verify -->
 ```dafny
@@ -764,9 +733,8 @@ function fib(n: nat): nat
 
 Here we use `nat`s, the type of
 natural numbers (non-negative integers), which is often more convenient than
-annotating everything to be non-negative. It turns out that we could make this
-function a function method if we wanted to. But this would be extremely slow,
-as this version of calculating the Fibonacci numbers has exponential
+annotating everything to be non-negative. Using this function for actually calculating
+the Fibonacci numbers would be extremely slow, as this implementation has exponential
 complexity. There are much better ways to calculate the Fibonacci function. But
 this function is still useful, as we can have Dafny prove that a fast version
 really matches the mathematical definition. We can get the best of both worlds:
@@ -923,7 +891,7 @@ The challenge in picking loop invariants is finding one that is preserved
 by the loop, but also that lets you prove what you need after the loop
 has executed.
 
-**Exercise 7.**
+**Exercise 6.**
   *Change the loop invariant to `0 <= i <= n+2`. Does the loop still
   verify? Does the assertion `i == n` after the loop still verify?*
 
@@ -942,7 +910,7 @@ method m(n: nat)
 ```
 
 
-**Exercise 8.**
+**Exercise 7.**
   *With the original loop invariant, change the loop guard from
   `i < n` to `i != n`. Do the loop and the assertion after the loop
   still verify? Why or why not?*
@@ -1070,7 +1038,7 @@ holding, because if `n` were zero, it would return before reaching the loop.
 Dafny is also able to use the loop invariants to prove that after the loop, `i == n`
 and `b == fib(i)`, which together imply the postcondition, `b == fib(n)`.
 
-**Exercise 9.**
+**Exercise 8.**
   *The `ComputeFib` method above is more complicated than
   necessary. Write a simpler program by not introducing `a` as the
   Fibonacci number that precedes `b`, but instead introducing a
@@ -1106,7 +1074,7 @@ method ComputeFib(n: nat) returns (b: nat)
 ```
 
 
-**Exercise 10.**
+**Exercise 9.**
   *Starting with the completed `ComputeFib` method above, delete the
   `if` statement and initialize `i` to `0`, `a` to `1`, and `b` to
   `0`.  Verify this new program by adjusting the loop invariants to
@@ -1161,7 +1129,7 @@ an expression that decreases with every loop iteration or recursive call.
 There are two conditions that Dafny needs to verify when using a `decreases`
 expression: that the expression actually gets smaller and that it is bounded.
 Many times, an integral value (natural or plain integer) is the quantity that
-decreases, but other things that can be used as well. (See the reference for
+decreases, but other things can be used as well. (See the reference for
 details.) In the case of integers, the bound is assumed to be zero. For
 example, the following is a proper use of `decreases` on a loop (with its own
 keyword, of course):
@@ -1182,7 +1150,7 @@ method m ()
 
 Here Dafny has all the ingredients it needs to prove
 termination. The variable `i` gets smaller each loop iteration and is bounded
-below by zero. This is fine, except the loop is backwards from most loops,
+below by zero. This is fine, except the loop is backwards compared to most loops,
 which tend to count up instead of down. In this case, what decreases is not the
 counter itself, but rather the distance between the counter and the upper
 bound. A simple trick for dealing with this situation is given below:
@@ -1209,11 +1177,11 @@ the quantity. This also works when the bound `n` is not
 constant, such as in the binary search algorithm, where two quantities approach
 each other, and neither is fixed.
 
-**Exercise 11.**
+**Exercise 10.**
   *In the loop above, the invariant `i <= n` and the negation of the
   loop guard allow us to conclude `i == n` after the loop (as we
   checked previously with an `assert`. Note that if the loop guard
-  were instead written as `i != n` (as in Exercise 8), then the
+  were instead written as `i != n` (as in Exercise 7), then the
   negation of the guard immediately gives `i == n` after the loop,
   regardless of the loop invariant. Change the loop guard to `i != n`
   and delete the invariant annotation. Does the program verify? What
@@ -1426,7 +1394,7 @@ method Find(a: array<int>, key: int) returns (index: int)
 ```
 
 This says that everything before, but excluding, the current
-index is not the key. Notice that upon entering the loop, `i`
+index is not the key. Notice that upon entering the loop, `index`
 is zero, so the first part of the implication is always false, and thus the
 quantified property is always true. This common situation is known as
 *vacuous truth*: the
@@ -1465,7 +1433,7 @@ method Find(a: array<int>, key: int) returns (index: int)
 }
 ```
 
-**Exercise 12.**
+**Exercise 11.**
   *Write a method that takes an integer array, which it requires to
   have at least one element, and returns an index to the maximum of
   the array's elements. Annotate the method with pre- and
@@ -1487,7 +1455,7 @@ queries are made of the same data. If the array is sorted, then we can use the
 very efficient binary search procedure to find the key. But in order for us to
 be able to prove our implementation correct, we need some way to require that
 the input array actually is sorted. We could do this directly with a quantifier
-inside a requires clause of our method, but a more modular way to express this
+inside a `requires` clause of our method, but a more modular way to express this
 is through a *predicate*.
 
 ## Predicates
@@ -1593,7 +1561,7 @@ reference types, and they are stored on the heap (though as always there is a su
 distinction between the reference itself and the value it points to.)
 
 
-**Exercise 13.**
+**Exercise 12.**
   *Modify the definition of the `sorted` predicate so that it returns
   true exactly when the array is sorted and all its elements are
   distinct.*
@@ -1607,7 +1575,7 @@ predicate sorted(a: array<int>)
 }
 ```
 
-**Exercise 14.**
+**Exercise 13.**
   *Change the definition of `sorted` so that it allows its argument to be 
   null (using a nullable array type) but
   returns false if it is.*
@@ -1715,7 +1683,7 @@ prove the code correct, but we can understand the operation of the code more eas
 ourselves.
 
 
-**Exercise 15.**
+**Exercise 14.**
   *Change the assignments in the body of `BinarySearch` to set `low`
   to `mid` or to set `high` to `mid - 1`. In each case, what goes
   wrong?*
diff --git a/docs/QuickReference.md b/docs/QuickReference.md
index 4dfef1d4579..b3e92be4bc2 100755
--- a/docs/QuickReference.md
+++ b/docs/QuickReference.md
@@ -1,5 +1,6 @@
-<p></p>
-<link rel="stylesheet" href="assets/main.css">
+---
+title: Dafny Quick Reference
+---
 
 # Dafny Quick Reference
 
diff --git a/docs/Snapshots.md b/docs/Snapshots.md
index f10e79d6436..0b6c682ccdb 100644
--- a/docs/Snapshots.md
+++ b/docs/Snapshots.md
@@ -7,6 +7,13 @@ layout: default
 
 - [Current development version](https://dafny.org/dafny)
 - [Latest release snapshot](https://dafny.org/latest)
+- [v4.9.1](https://dafny.org/v4.9.1)
+- [v4.8.1](https://dafny.org/v4.8.1)
+- [v4.6.0](https://dafny.org/v4.6.0)
+- [v4.5.0](https://dafny.org/v4.5.0)
+- [v4.4.0](https://dafny.org/v4.4.0)
+- [v4.3.0](https://dafny.org/v4.3.0)
+- [v4.2.0](https://dafny.org/v4.2.0)
 - [v4.1.0](https://dafny.org/v4.1.0)
 - [v4.0.0](https://dafny.org/v4.0.0)
 - [v3.12.0](https://dafny.org/v3.12.0)
diff --git a/docs/StyleGuide/Style-Guide.md b/docs/StyleGuide/Style-Guide.md
index bb6d049521d..e80f507bfbc 100644
--- a/docs/StyleGuide/Style-Guide.md
+++ b/docs/StyleGuide/Style-Guide.md
@@ -1,4 +1,8 @@
-<font size="+4"><p style="text-align: center;">Dafny Style Guide</p></font>
+---
+title: Dafny Style Guide
+---
+
+# Dafny Style Guide
 
 * toc
 {:toc}
diff --git a/docs/VerificationOptimization/VerificationOptimization.md b/docs/VerificationOptimization/VerificationOptimization.md
index 8b9adf9727c..aa83919a5ce 100644
--- a/docs/VerificationOptimization/VerificationOptimization.md
+++ b/docs/VerificationOptimization/VerificationOptimization.md
@@ -1,3 +1,7 @@
+---
+title: Verification Optimization
+---
+
 # Overview
 
 Dafny verifies your program using a type of theorem prover known as a Satisfiability Modulo Theories (SMT) solver. More specifically, it uses the [Z3](https://github.com/Z3Prover/z3) solver. In many cases, it's possible to state only the final properties you want your program to have, with annotations such as `requires` and `ensures` clauses, and let the prover do the rest for you, automatically.
@@ -74,9 +78,9 @@ Dafny provides several attributes that tell it to verify certain assertions sepa
 
 * The [`{:focus}`](../DafnyRef/DafnyRef#sec-focus) attribute on an `assert` or `assume` statement tells Dafny to verify all assertions in the containing block, and everything that _always_ follows it, in one batch, and the rest of the definition in another batch (potentially subject to further splitting due to other occurrences of `{:focus}`).
 
-* The [`{:vcs_split_on_every_assert}`](../DafnyRef/DafnyRef#sec-vcs_split_on_every_assert) attribute on a definition tells Dafny to verify each assertion in that definition in its own batch. You can think of this as being similar to having many `{:focus}` or `{:split_here}` occurrences, including on assertions that arise implicitly, such as preconditions of calls or side conditions on partial operations.
+* The [`{:isolate_assertions}`](../DafnyRef/DafnyRef#sec-isolate_assertions) attribute on a definition tells Dafny to verify each assertion in that definition in its own batch. You can think of this as being similar to having many `{:focus}` or `{:split_here}` occurrences, including on assertions that arise implicitly, such as preconditions of calls or side conditions on partial operations.
 
-We recommend using `{:vcs_split_on_every_assert}` over either of the other attributes under most circumstances.  It can also be specified globally, applying to all definitions, with `dafny verify --isolate-assertions`. If you're using the legacy options without top-level commands, use the `/vcsSplitOnEveryAssert` flag, instead.
+We recommend using `{:isolate_assertions}` over either of the other attributes under most circumstances.  It can also be specified globally, applying to all definitions, with `dafny verify --isolate-assertions`. If you're using the legacy options without top-level commands, use the `/vcsSplitOnEveryAssert` flag, instead.
 
 When Dafny verifies a definition in smaller batches, the VS Code plugin will display performance statistics for each batch when you hover over a particular definition.
 
@@ -87,7 +91,7 @@ Consider the following method, which proves a few simple arithmetic facts.
 const TWO_TO_THE_32:  int := 0x1_00000000
 newtype uint32 = x: int | 0 <= x < TWO_TO_THE_32
 
-method {:vcs_split_on_every_assert} ProveSomeArithmetic(x: uint32) {
+method {:isolate_assertions} ProveSomeArithmetic(x: uint32) {
   assert forall y :: y * y != 115249; // 115249 is prime
   assert (x as bv32) as uint32 <= x;
   assert x < 65535 ==> x * 2 == x + x;
@@ -100,7 +104,7 @@ Hovering over the name of the definition will show you performance statistics fo
 
 Although the time taken to complete verification is ultimately the factor that most impacts the development cycle, this time can depend on CPU frequency scaling, other processes, etc., so Z3 provides a separate measurement of verification difficulty known as a _resource count_. When running the same build of Z3 on the same platform multiple times, the resource count is deterministic, unlike time. Therefore, the IDE displays performance information in terms of Resource Units (RU).
 
-Hovering over a specific assertion will show you performance statistics for the specific batch containing that assertion (and, in the case of `{:vcs_split_on_every_assert}`, only that assertion).
+Hovering over a specific assertion will show you performance statistics for the specific batch containing that assertion (and, in the case of `{:isolate_assertions}`, only that assertion).
 
 ![image](hover-assertion.png)
 
diff --git a/docs/_config.yml b/docs/_config.yml
index 9a0e827a943..57af79d8795 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -65,3 +65,11 @@ exclude:
    - vendor/cache/
    - vendor/gems/
    - vendor/ruby/
+   - "*.expect"
+
+defaults:
+  -
+    scope:
+      path: "" # an empty string here means all files in the project
+    values:
+      layout: "single"
\ No newline at end of file
diff --git a/docs/_layouts/single.html b/docs/_layouts/single.html
new file mode 100644
index 00000000000..32800307467
--- /dev/null
+++ b/docs/_layouts/single.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="{{ page.lang | default: site.lang | default: "en" }}">
+
+{%- include head.html -%}
+
+<body>
+
+  <main class="page-content" aria-label="Content">
+    <div class="wrapper">
+      {{ content }}
+    </div>
+  </main>
+
+  {%- include footer.html -%}
+
+</body>
+
+</html>
diff --git a/docs/check-examples b/docs/check-examples
index d716422a203..58264f735bc 100755
--- a/docs/check-examples
+++ b/docs/check-examples
@@ -121,7 +121,7 @@ outdir="$dir/../Test/docexamples"
 
 coverage=0
 permOptions="--show-snippets:false "
-defOptions="--function-syntax:4 --use-basename-for-filename --unicode-char:false"
+defOptions="--function-syntax:4 --use-basename-for-filename"
 legacyOptions="-functionSyntax:4 -useBaseNameForFileName -showSnippets:0"
 
 while getopts 'c' opt; do
@@ -340,6 +340,7 @@ do
         if [ -z "$expect" -a "$useHeadings" == "0" ]; then
           defaultExit=0
         elif [ "$iswarn" == "1" ]; then
+          dOptions="$dOptions --allow-warnings"
           defaultExit=0
         elif [ "$verb" == "verify" ]; then
           defaultExit=4
@@ -422,7 +423,7 @@ do
                  FAIL=1
               fi
               if [ "$actualExit" != "$expectedExit" ]; then
-                echo EXPECTED EXIT CODE $expectedExit, got $actualec
+                echo EXPECTED EXIT CODE $expectedExit, got $actualExit
                 FAIL=1
               fi
             else 
diff --git a/docs/dafny.sty b/docs/dafny.sty
index f6a747b70c7..013d31d24bb 100644
--- a/docs/dafny.sty
+++ b/docs/dafny.sty
@@ -9,14 +9,14 @@
       bool,char,nat,int,real,object,set,iset,multiset,seq,string,map,imap,array,array2,array3,
       bv0,bv1,bv2,bv3,bv4,bv5,bv6,bv7,bv8,bv12,bv16,bv20,bv24,bv32,bv48,bv64,bv128,
       function,predicate,copredicate,inductive,
-      ghost,var,static,refines,
+      ghost,var,const,static,refines,
       method,lemma,constructor,colemma,twostate,
-      returns,yields,abstract,module,import,default,opened,as,in,
+      returns,yields,abstract,module,export,import,default,opened,as,in,
       requires,modifies,ensures,reads,decreases,include,provides,reveals,witness,
       % expressions
       match,case,false,true,null,old,fresh,allocated,unchanged,this,
       % statements
-      assert,by,assume,print,new,if,then,else,while,invariant,break,label,return,yield,
+      assert,by,assume,expect,print,new,if,then,else,while,invariant,break,label,return,yield,
       where,calc,modify
       },
   literate=%
diff --git a/docs/dev/RELEASE.md b/docs/dev/RELEASE.md
index e8cf95aaef5..263b3e47551 100644
--- a/docs/dev/RELEASE.md
+++ b/docs/dev/RELEASE.md
@@ -8,30 +8,31 @@
    * has the intended branch checked out (usually `master`,
      but may be another mainline branch such as `main-3.x`).
 
-1. Select a version number `$VER` (e.g., "3.0.0" or "3.0.0-alpha"). 
-   The `major`.`minor`.`patch` numbers may already have been
-   incremented since the last release, so they do not necessarily need
-   to be updated. However, you may want to increment them further
-   depending the types of changes that are in the release.
-1. Run `Scripts/prepare_release.py $VER prepare --source-branch <this branch>`
-   (`--source-branch` is optional and defaults to 'master')
-   from the root of the repository. The script will check that the repository is in a good
-   state, create and check out a new release branch, update
-   `Source/Directory.Build.props` and `RELEASE_NOTES.md`, prepare a release commit,
-   and push it.
-
-1. Kick off the deep test suite by navigating to
-   <https://github.com/dafny-lang/dafny/actions/workflows/deep-tests.yml>,
-   clicking the "Run workflow" dropdown, selecting the newly created branch, and
-   clicking the "Run workflow" button. The automation for releasing below will
-   check for a run of this workflow on the exact commit to release.  (TODO:
-   Run this automatically as part of the prepare-release script.)
-
-1. Once the the tests complete, run `Scripts/prepare_release.py $VER
+1. Get the version number from `Source/Directory.Build.props`.
+   It should look like "3.0.0" (or "3.0.0-alpha"). It's referred to as
+   `$VER` in the following. 
+   The `major`.`minor`.`patch` numbers should already have been
+   incremented since the last release, so they do not need
+   to be updated. However, you may want to increment the minor
+   or major version depending the types of changes that are in the release.
+
+1. Run `Scripts/prepare_release.py $VER prepare --source-branch <this
+   branch>` (`--source-branch` is optional and defaults to 'master')
+   from the root of the repository. The script will check that the
+   repository is in a good state, create and check out a new release
+   branch, update `Source/Directory.Build.props` and `RELEASE_NOTES.md`.
+
+1. You don't need to update the version number as the patch number
+   is already set for the next release. However, if you wish to change the
+   minor or major version, see [VERSIONBUMP.md](VERSIONBUMP.md)
+
+1. Run `./Scripts/prepare_release.py $VER
    release` from the root of the repository. The script will tag the
-   current commit and push it. (TODO: Merge with the two steps above.) A
+   current commit and push it. A
    GitHub action will automatically run in reaction to the tag being
-   pushed, which will build the artifacts and reference manual and then
+   pushed, which will run the deep integration test suite,
+   build the artifacts and reference manual,
+   publish artifacts to nuget.org, and then
    create a draft GitHub release. You can find and watch the progress of
    this workflow at <https://github.com/dafny-lang/dafny/actions>.
 
@@ -45,8 +46,14 @@
    on multiple platforms. Again you can watch for this workflow at
    <https://github.com/dafny-lang/dafny/actions>.
 
-1. Create a pull request to merge the newly created branch into the source branch (the
-   script will give you a link to do so).  Get it approved and merged.
+1. We are going to merge the release branch into master to take into account
+   any fix that was implemented there, and also update the version number.
+   With the release branch checked out, run `./Scripts/prepare_release.py
+   $NEXT_VER set-next version` to set the version number for the next
+   release, where `$NEXT_VER` is `$VER` with the patch incremented.
+   Then follow the instructions [VERSIONBUMP.md](VERSIONBUMP.md) to keep Dafny
+   up-to-date with the new version number.
+   Create a new pull request for this change, have it approved and merged.
 
 1. Clone <https://github.com/dafny-lang/ide-vscode> and run `publish_process.js`
    to create a new release of the VSCode plugin.
diff --git a/docs/dev/TypeSystemRefresh.md b/docs/dev/TypeSystemRefresh.md
new file mode 100644
index 00000000000..23486c07ae7
--- /dev/null
+++ b/docs/dev/TypeSystemRefresh.md
@@ -0,0 +1,130 @@
+# Dafny type system refresh
+
+## Overview
+
+The "type system refresh" is a reimplementation of Dafny's name resolution, type inference, and type checking. In many ways, it just improves the organization of the implementation. This will allow Dafny's type system to continue to evolve. For example, it has already enabled the support of traits on datatypes, and it has been building with non-numeric newtypes in mind. Most of this document is concerned with the new implementation. But the new type system also makes some changes in the language that are not backward compatible. Those breaking changes are:
+
+* An downcast from a trait to some type that implements the trait now requires an explicit cast (using `as`). Like the previous implicit cast, this explicit cast is checked statically.
+
+    Other popular languages with static type checking also require such a cast. Note, subset types are unaffected by this change; for example, it is still possible to write an assignment from an `int` to a `nat` without an explicit cast.
+
+* Equality-checking expressions (like `==`) no longer treat formal type parameters in a special way.
+
+    Previously, Dafny allowed, for example, an `array<int>` and an `array<X>` to be compared, where `X` is a type parameter, on the grounds that `X` may be `int` and thus the two arrays could be equal. Since Dafny, now since many years, has an `as` operator, such a comparison can easily be expressed without a special case in the type system: `a == b as object`.
+
+* The types of bound variables are inferred to be base types, not subset types. For example, bound variable `x` in `forall x :: P(x)` may be inferred to have type `int`, but never `nat`.
+
+    This makes inference more predictable. It also removes the risk that, say, an intended quantifier `forall x: int :: P(x)` is instead inferred to be the logically weaker `forall x: nat :: P(x)`.
+
+    (This design may soon change in one place, namely when a lambda expressions is known to be used in a limited number of places. This happens in array initializers and sequence comprehensions, where it would be friendly to try to infer the bound variable to be of type `nat` rather than `int`.)
+
+The new type system also fixes a number of bugs in the previous type system. Among them are bugs having to do with cyclic dependencies among declarations, which the new type system is equipped to handle.
+
+The rest of this document describes the implementation of the new type system.
+
+## Pre-types and type refinements
+
+The earlier parts of the resolver are tricky, because of cyclic dependencies among the information that is to be computed. For example, to determine the type of an expression `o.f`, it is necessary to know what `f` is, which in turn requires knowing the type of `o`. As a concrete example, consider
+
+``` dafny
+class Cell {
+  var data: bv32
+  constructor (data: bv32) {
+    this.data := data;
+  }
+}
+
+method Tricky() {
+  var c := null; // Cell?
+  var s := 0; // bv32
+  for i := 0 to 100 {
+    if c == null {
+      c := new Cell(s + 10);
+    }
+    s := s + c.data;
+  }
+}
+```
+
+For the expression `c.data` in the loop body, name resolution will determine that `c` is a local variable, then type inference will determine that the type of `c` is `Cell?`, then name resolution to look up `data` as a member in class `Cell`, and then type inference can determine the type of `c.data` to be `bv32`. (Type inference will then also determine that `s` has type `bv32`, and therefore that the literal `0` in the initial assignment to `s` also has type `bv32`.) So, name resolution and some part of type inference are mutually dependent.
+
+Define _pre-type_ to be a type that is completed handled by the static type system, without the later help of the verifier. In other words, a pre-type is a type that does not involve subset types. It is the inference of pre-types that is mutually dependent on name resolution, because subset types do not introduce any type members (like the `.f` in the example above). This suggests separating name resolution and pre-type inference from the further inference of types with subset types. But there is also another reason for such a separation, namely that assignments in Dafny (like `x := E;`) obey standard subtyping rules for pre-types, whereas types with subset types do not. For example, the pre-type of `E` must be a subtype of the pre-type of `x`. The subset type `nat` is a subtype of the base type `int`, and the type system allow any combination of `x` and `E` being `int` or `nat`; in particular, it allows `E` to have type `int` and `x` to have type `nat`. By separating concerns regarding subset types from the initial inference where names are resolved, the tricky part of resolving names gets to use simpler type constraints.
+
+After successfully completing pre-type inference, all names and operators have been resolved, and all expressions and variables have pre-types. Since subset types are the difference between pre-types and types, and since subset types are enforced by the verifier, one could imagine that type inference would be done. This is almost true, but not quite. For one, having only the pre-types means that the verifier has to work harder than necessary. For example, using the `Cell` class from above, consider the program
+
+``` dafny
+method Add(x: bv32, y: bv32) returns (r: bv32) {
+  var c := new Cell(x);
+  var d := new Cell(y);
+  r := c.data + d.data;
+}
+```
+
+The pre-types of `c` and `d` are `Cell?`. With just those types, the verifier would have to prove that `c` and `d` are non-null in the expressions `c.data` and `d.data`. However, if type inference could figure out that `c` and `d` have the non-null types `Cell` (recall, `Cell` in Dafny is a subset type with base type `Cell?`), then the verifier would not have anything to prove. There are also situations where the verifier would fail, because of lack of loop invariants. For example,
+
+``` dafny
+method Natural(m: nat, n: nat, s: seq<int>) returns (r: int) {
+  var k := m;
+  r := 0;
+  for i := 0 to |s| {
+    if k < |s| {
+      r := r + s[k];
+    }
+    k := if k == m then n else m;
+  }
+}
+```
+
+The pre-type of `k` is `int`. With only that information about `k`, the operation `s[k]` could not be verified to be using a non-negative index. The proof would go through if one adds `invariant 0 <= k` to the loop. A simpler way to make the proof go through is if `k` can be inferred to have the subset type `nat`, in which case the non-negative index property follows directly from the types.
+
+Once names have been resolved and pre-types inferred, the type system converts the pre-types into types and then goes into a phase of _refining_ those types into types that involve subset types. For example, if a local variable `x` (without a user-supplied type) is inferred to have pre-type `int` and all assignments to `x` are from variables declared to have `nat`, then `x` will, at the end of the type-refinement phase, have type `nat`.
+
+## Resolution phases
+
+Resolution proceeds in a number of phases. One group of these phases is called "pass 0" in the resolver (search for "`Pass 0`" in `ModuleResolver.cs`). This document is concerned with describe the phases in pass 0.
+
+The name "pass 0" is somewhat arbitrary, since resolution performs some important tasks before pass 0. Those initial tasks are quite delicate, since they don't even have pre-types available. It would be good to have a document that describes those initial tasks. For now, suffice it to mention three ingredients of those tasks (performed in the order here listed):
+
+* Resolve import relations between modules. This allows the rest of resolution to happen one module at a time. Indeed, the resolution phases described here at all performed for one module at a time (from inner modules to outer modules).
+* Register the names of top-level declarations and member declarations in each module (that is, build a symbol table from names to declarations).
+* Resolve the types that occur in top-level declarations and member declarations. (Note, `newtype`, subset type, and `const` declarations are allowed to omit types in their signatures. Such types will be inferred in pass 0. This issue is tricky, since it means that pass 0 can't rely on all type signatures to be known. More about that below.)
+
+After pass 0, the resolver has many more phases. Those are grouped into pass 1, 2, and 3. The division between those names is rather arbitrary, but it generally true that later phases have more information about the module being resolved. As Dafny evolves and new phases are added, it is therefore a good idea to add new phases as late as possible, since that means they have more information to start with.
+
+For the new type system, pass 0 consists of the following phases:
+
+* Resolve names and infer pre-types. Ostensibly, this iterates over all declarations (in the module being resolved), computing the pre-type signature and body of each declaration. When one declaration uses another (that is, when one declaration has a name that resolves to another declaration), then it is only the pre-type signature of the other declaration that is needed. Because `newtype`, subset type, and `const` declarations can omit their type signatures and let them be inferred, the order in which declarations have to visited cannot be _a priori_ determined (in particular, note that determining such an order requires names to be resolved, but this is the phase that resolves names!). Therefore, this phase keeps track of which declarations are in progress and which have finished, and so will visit the declarations on demand. If any cycles are detected, they are reported as errors.
+
+* Look for any under-specified pre-types, that is, places where pre-type inference did not come up with a type. This phase also fills in some additional information in the AST, like the `.ResolvedOp` field of binary expressions.
+
+* Convert pre-types to types.
+
+    The central operation in this phase is the `Combine` method, which combines whatever portions of the type may have been given explicitly in the program with the portions of the type inferred as a pre-type. In some cases, the pre-type may have more information; for example, when a local variable is declared without any type information. In other cases, the user-declared type may have more information; for example, if a variable is declared to have type `nat`, in which case pre-type inference would only have used the fact that this type has a pre-type of `int`. There are also cases where the two need to be combined; for example, with a declaration `class C<X>` in scope, the program may have declared a local variable `var c: C;` (where `C` is the subset type based on the nullable (pre-)type `C?`) and pre-type inference may have come up with `C?<int>`, so these will be combined into something that has both the subset type `C` and the type argument `int`.
+
+    Whenever this combination reaches a place where no user-supplied type is given, `Combine` will output a _refinement-wrapper type_. This will let the later type-refinement phase change the type to take subset types into consideration. Such a refinement-wrapper type is a wrapper around another type, which is the "current approximation" of that type. At first, that approximation is a "bottom type" (see description below of the type-refinement phase), which will be gradually refined in the next phase.
+
+    The bottom type is also a kind of wrapper, since it keeps track of the base type for which it is a bottom type. At the moment, both the refinement wrapper and the bottom-type wrapper are implemented as type proxies (that is, as subclasses of `TypeProxy`). This may not be the best representation. It means that the type-refinement phase needs its own version of `.Normalize()`, or otherwise one would skip passed these two special wrappers, too. It also means that the `.Type` getter of `Expression` needs to have an `.UnnormalizedType` variation, since `.Type` (anticipates uses that occur after type inference and) normalizes the types it gets and sets. A property of these wrappers is that a bottom-type wrapper is only ever used as the type contained in a refinement wrapper.
+
+    This phase needs to start by processing `newtype`, subset type, and `const` declarations, because their type signatures are needed when converting other types. This may seem like the dependency issues that during pre-type inference necessitated an on-demand computation. Luckily, this phase is simpler, because all it needs to do is to combine any user-supplied type in the signatures of these declarations with any inferred pre-type. This `Combine` operation does not need to look at any other declarations. So, all that is needed in this phase is to process those three kinds of declarations first, and then process all the other declarations.
+
+* Refine the initial user-supplied-type/inferred-pre-type combinations into types that take subset types into consideration.
+
+## Conversions of pre-types into types, and type refinements
+
+Subset types form a hierarchy (a tree) rooted at a base type. Each subset type is declared with a predicate, but those predicates are not consulted during type refinement. Instead, only the edges in the hierarchy are used. In other words, subset-type inference is done _nominally_, not semantically. For the purposes of type refinements, we also use a "bottom type" for each base type. This bottom type is considered to be a subset of the base type and all its (transitive) subset types.
+
+This phase sets up "flows", where one or several types have an influence on another type. For example, there is a flow from the RHS of an assignment to the LHS of the assignment, and there is a flow from the `then` and `else` expressions of an `if-then-else` expression into the result of the expression. This phase defines a set of such flows for the module. The `Solve()` method then finds the more general types that satisfy these flows.
+
+The conversion from pre-types to types is coupled with the type-refinement phase. The former needs to create refinement wrapper for the latter to refine. Also, if there is a type that will not be refined, then the conversion phase should not set it to be a bottom type. For example, if the pre-types of expressions `x` and `y` are `int`, then the type of expression `x + y` is fixed to be `int`. That is, even if the types of `x` and `y` are eventually refined to, say, `nat`, the type of `x + y` is still defined to be `int`. For this situation, the type-refinement phase does not define any flow from `x` and `y` to `x + y`, since it is not desirable to further refine the type of `x + y`.
+
+## Solving constraints
+
+Pre-type inference builds up constraints that are required to hold among the pre-types to be inferred, and the type-refinement phase builds up flows that are used to compute the final types as fix-points. At the moment, the data structures used in those phases are simple lists. Surely, there are far better ways to organize these constraints and flows. These can be improved and suitably optimized in the future.
+
+In the current implementation, pre-type constraints are built up and solved for each declaration, whereas the flows are built up and solved for the entire module. The flows in one declaration do not affect the flows of other declarations, so the flows could be changed to be solved after each declaration (and doing so would probably be more efficient, since it a set of smaller fix points would be faster to compute than one fix point for the whole module).
+
+Saying that pre-type constraints built up and then solved for each declaration is an over-simplification. In more detail, some parts of a declaration may be considered separately. For example, each attribute of a top-level declaration is considered separately. Moreover, pre-type inference sometimes _partially solves_ the constraints while building up more constraints. This currently happens in a few places, typified by member lookup, where pre-type inference will partially solve constraints in order to obtain enough of the type of `o` in an expression `o.f` before continuing to process the expression. If the partial solving does not yield enough of a pre-type for `o` to determine `f`, then an error is reported right away, rather than waiting until all constraints are solved. This design is a left-over from the old type system. The new type system has a notion of "guarded constraints", which could be used to eliminate any partial solving and instead just do solving at the end. However, in order to reduce changes between the old and new type system, it seemed wise to keep this design for now. Once the new type system is stable, it can be changed to use "guarded constraints" for expressions like member lookup, which will then admit strictly more programs.
+
+## Debugging
+
+The `/ntitrace:1` flag (for "New Type Inference TRACE") spills out information from pre-type inference and from type refinement.
diff --git a/docs/dev/VERSIONBUMP.md b/docs/dev/VERSIONBUMP.md
new file mode 100644
index 00000000000..39ee77e798a
--- /dev/null
+++ b/docs/dev/VERSIONBUMP.md
@@ -0,0 +1,40 @@
+# Change version number
+
+After each release, we change the version number by first running
+
+    python3 Scripts/prepare_release.py NEXT_VERSION set-next-version
+
+where NEXT_VERSION is the version of the last release of the format
+`major.minor.patch` and the patch has been increased by 1. This script
+has for effect to change the version number in `Source/Directory.Build.props`.
+Then, many things in Dafny that depend on this version number have to be
+updated.
+
+This file is an exhaustive list of everything that needs to be updated
+whenever the version number changes. All these steps are
+executable by running
+
+    ./Scripts/bump_version_number.js NEW_VERSION
+
+and `make bumpversion-test` run by the CI on each release
+verifies that this file is in sync with that script.
+
+# How to keep Dafny consistent with the new version number
+
+Assuming `<TestDirectory>` to be `Source/IntegrationTests/TestFiles/LitTests/LitTest`,
+perform the following:
+* Compile Dafny to ensure you have the right version number.
+* Compile the standard libraries and update their binaries which are checked in
+* Recompile Dafny so that standard libraries are in the executable.
+* In the test directory `Source/IntegrationTests/TestFiles/LitTests/LitTest`,
+  * Rebuild `pythonmodule/multimodule/PythonModule1.doo` from `pythonmodule/multimodule/dafnysource/helloworld.dfy`
+  * Rebuild `pythonmodule/nestedmodule/SomeNestedModule.doo` from `pythonmodule/nestedmodule/dafnysource/SomeNestedModule.dfy`
+  * Rebuild `gomodule/multimodule/test.doo` from `gomodule/multimodule/dafnysource/helloworld.dfy`
+  * Search for `dafny_version = ` in checked-in `.dtr` files of the `<TestDirectory>`
+   and update the version number.
+    Except for the file NoGood.dtr which is not valid.
+    Except for WrongDafnyVersion.dtr as well.
+  * Update `comp/separate-compilation/translation-records/InvalidFormat.dfy.expect` by updating the version number after `by Dafny ` 
+* In `Source/DafnyRuntime/DafnyRuntimeJava/build.gradle`, search for `version = ` and update the version number
+* In `Source/DafnyRuntime/DafnyRuntimePython/pyproject.toml`, search for `version = ` and update the version number
+* Update the Dafny runtime version number by searching for `DafnyRuntime-` and updating the version right afterwards, in the files `DafnyPipeline.csproj` and `DafnyRuntime.csproj`
\ No newline at end of file
diff --git a/docs/dev/news/2320.feat b/docs/dev/news/2320.feat
deleted file mode 100644
index a465357fbe9..00000000000
--- a/docs/dev/news/2320.feat
+++ /dev/null
@@ -1,2 +0,0 @@
-Add support for the Find References LSP request
-- Returned references may be incomplete when not using project mode
diff --git a/docs/dev/news/3792.fix b/docs/dev/news/3792.fix
deleted file mode 100644
index 321e3b1f222..00000000000
--- a/docs/dev/news/3792.fix
+++ /dev/null
@@ -1 +0,0 @@
-Subset type decl's witness correctly taken into account
\ No newline at end of file
diff --git a/docs/dev/news/4243.fix b/docs/dev/news/4243.fix
deleted file mode 100644
index 2d1ac90107d..00000000000
--- a/docs/dev/news/4243.fix
+++ /dev/null
@@ -1 +0,0 @@
-Allow JavaScript keywords as names of Dafny modules
diff --git a/docs/dev/news/4255.feat b/docs/dev/news/4255.feat
deleted file mode 100644
index 002430b1fa8..00000000000
--- a/docs/dev/news/4255.feat
+++ /dev/null
@@ -1 +0,0 @@
-Improve scalability of inlining for test generation and generate coverage information with respect to the original Dafny source
\ No newline at end of file
diff --git a/docs/dev/news/4257.fix b/docs/dev/news/4257.fix
deleted file mode 100644
index 9ffc1cc4a24..00000000000
--- a/docs/dev/news/4257.fix
+++ /dev/null
@@ -1 +0,0 @@
-Support odd characters in pathnames for Go
diff --git a/docs/dev/news/4258.fix b/docs/dev/news/4258.fix
deleted file mode 100644
index b062aa55795..00000000000
--- a/docs/dev/news/4258.fix
+++ /dev/null
@@ -1 +0,0 @@
-Allow Dafny filenames compiled to Java to start with a digit
diff --git a/docs/dev/news/4261.fix b/docs/dev/news/4261.fix
deleted file mode 100644
index 7f496bc65fc..00000000000
--- a/docs/dev/news/4261.fix
+++ /dev/null
@@ -1 +0,0 @@
-Parser now supports files with a lot of consecutive single-line comments
\ No newline at end of file
diff --git a/docs/dev/news/4287.fix b/docs/dev/news/4287.fix
deleted file mode 100644
index d2e0b16b991..00000000000
--- a/docs/dev/news/4287.fix
+++ /dev/null
@@ -1 +0,0 @@
-Gutter icons more robust
\ No newline at end of file
diff --git a/docs/dev/news/4298.fix b/docs/dev/news/4298.fix
deleted file mode 100644
index 91fc07fe391..00000000000
--- a/docs/dev/news/4298.fix
+++ /dev/null
@@ -1 +0,0 @@
-Unresolved abstract imports no longer crash the resolver
\ No newline at end of file
diff --git a/docs/dev/news/4310.fix b/docs/dev/news/4310.fix
deleted file mode 100644
index a3269be4dc3..00000000000
--- a/docs/dev/news/4310.fix
+++ /dev/null
@@ -1 +0,0 @@
-Make capitalization of target Go code consistent
diff --git a/docs/dev/news/4315.fix b/docs/dev/news/4315.fix
deleted file mode 100644
index b3713be658a..00000000000
--- a/docs/dev/news/4315.fix
+++ /dev/null
@@ -1 +0,0 @@
-Refining an abstract module with a class with an opaque function no longer crashes
\ No newline at end of file
diff --git a/docs/dev/news/4325.fix b/docs/dev/news/4325.fix
deleted file mode 100644
index 8cc59e5e01c..00000000000
--- a/docs/dev/news/4325.fix
+++ /dev/null
@@ -1,2 +0,0 @@
-Dafny can now produce coverage reports indicating which parts of the program are expected to be covered by automatically generated tests. 
-The same functionality can be used to report other forms of coverage.
\ No newline at end of file
diff --git a/docs/dev/news/4326.feat b/docs/dev/news/4326.feat
deleted file mode 100644
index fb7b7d19b4d..00000000000
--- a/docs/dev/news/4326.feat
+++ /dev/null
@@ -1 +0,0 @@
-Support generating of tests targeting path-coverage of the entire program and tests targeting call-graph-sensitive block coverage (referred to as Branch coverage)
\ No newline at end of file
diff --git a/docs/dev/news/4357.fix b/docs/dev/news/4357.fix
deleted file mode 100644
index 6aea8c19cb9..00000000000
--- a/docs/dev/news/4357.fix
+++ /dev/null
@@ -1 +0,0 @@
-Allow function-syntax and other options with a custom default to be overridden in `dfyconfig.toml`
\ No newline at end of file
diff --git a/docs/dev/news/4365.feat b/docs/dev/news/4365.feat
deleted file mode 100644
index 2fbb47a518e..00000000000
--- a/docs/dev/news/4365.feat
+++ /dev/null
@@ -1,2 +0,0 @@
-Add support for Rename LSP request
-- Support requires enabling project mode and defining a Dafny project file
diff --git a/docs/dev/news/4385.fix b/docs/dev/news/4385.fix
deleted file mode 100644
index 6b581df269c..00000000000
--- a/docs/dev/news/4385.fix
+++ /dev/null
@@ -1 +0,0 @@
-Old command line interface for test generation is no longer supported, all calls should use dafny generate-tests
\ No newline at end of file
diff --git a/docs/dev/news/4392.fix b/docs/dev/news/4392.fix
deleted file mode 100644
index 0f7257f0ae3..00000000000
--- a/docs/dev/news/4392.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug leading to stack overflow during counterexample extraction on some programs.
\ No newline at end of file
diff --git a/docs/dev/news/4401.fix b/docs/dev/news/4401.fix
deleted file mode 100644
index 35425c7925f..00000000000
--- a/docs/dev/news/4401.fix
+++ /dev/null
@@ -1 +0,0 @@
-Existential assertions are now printed correctly
\ No newline at end of file
diff --git a/docs/dev/news/4413.fix b/docs/dev/news/4413.fix
deleted file mode 100644
index 009b24f19b4..00000000000
--- a/docs/dev/news/4413.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix flickering and incorrect results in the verification status bar, and improve responsiveness of verification diagnostics
\ No newline at end of file
diff --git a/docs/dev/news/6024.fix b/docs/dev/news/6024.fix
new file mode 100644
index 00000000000..d8b3b8868e5
--- /dev/null
+++ b/docs/dev/news/6024.fix
@@ -0,0 +1 @@
+By clauses for assign-such-that statements (:|), are now never ignored.
\ No newline at end of file
diff --git a/docs/dev/news/6025.fix b/docs/dev/news/6025.fix
new file mode 100644
index 00000000000..f861d68ac82
--- /dev/null
+++ b/docs/dev/news/6025.fix
@@ -0,0 +1 @@
+The code action for assertion no longer suggests asserting the same assertion.
\ No newline at end of file
diff --git a/docs/dev/news/6050.fix b/docs/dev/news/6050.fix
new file mode 100644
index 00000000000..c9e1028c8d6
--- /dev/null
+++ b/docs/dev/news/6050.fix
@@ -0,0 +1 @@
+Fix a bug that caused a crash when translating by blocks
\ No newline at end of file
diff --git a/docs/dev/news/fix.4328 b/docs/dev/news/fix.4328
deleted file mode 100644
index e141e73a96b..00000000000
--- a/docs/dev/news/fix.4328
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue that would prevent the IDE from correctly handling default export sets
\ No newline at end of file
diff --git a/docs/examples/README.md b/docs/examples/README.md
index 5639dec1acd..78cb9dd88dc 100644
--- a/docs/examples/README.md
+++ b/docs/examples/README.md
@@ -7,10 +7,10 @@ demonstrating various coding techniques or proof capabilities.
 Each of these verify successfully.
 
 The files for these examples can be found in 
-the [examples folder of Dafny's github project](https://github.com/dafny-lang/dafny/tree/master/Test/examples).
+the [examples folder of Dafny's github project](https://github.com/dafny-lang/dafny/tree/master/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples).
 
-- [Simple Maximum method](https://github.com/dafny-lang/dafny/tree/master/Test/examples/maximum.dfy)
-- [Tutorial on parser combinators](https://github.com/dafny-lang/dafny/tree/master/Test/examples/parser_combinators.dfy)
-- [A simple compiler](https://github.com/dafny-lang/dafny/tree/master/Test/examples/Simple_compiler)
-- [An example of significant use of induction on a mini-compiler](https://github.com/dafny-lang/dafny/tree/master/Test/examples/induction-principle.md)
+- [Simple Maximum method](https://github.com/dafny-lang/dafny/tree/master/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/maximum.dfy)
+- [Tutorial on parser combinators](https://github.com/dafny-lang/dafny/tree/master/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/parser_combinators.dfy)
+- [A simple compiler](https://github.com/dafny-lang/dafny/tree/master/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/Simple_compiler)
+- [An example of significant use of induction on a mini-compiler](https://github.com/dafny-lang/dafny/tree/master/Source/IntegrationTests/TestFiles/LitTests/LitTest/examples/induction-principle.md)
 
diff --git a/docs/index.html b/docs/index.html
index 1799d660c3d..5ed73cbf3f0 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -31,6 +31,7 @@ <h2>Quick Links</h2>
 <ul>
 <li><a href="./Installation"><b>Installation</b></a>
      (or a <a href="https://marketplace.visualstudio.com/items?itemName=dafny-lang.ide-vscode">VSCode plugin for Dafny</a>)</li>
+<li><a href="https://dafny.zulipchat.com/" target="_blank" rel="noopener noreferrer">Zulip channel</a> to ask questions about Dafny</li>
 <li><a href="./DafnyRef/DafnyRef">Dafny Reference Manual and User Guide</a></li>
 <li><a href="./toc">Dafny Resources for Users</a></li>
 <li><a href="https://github.com/dafny-lang/dafny">Dafny GitHub project (for developers of the Dafny tools themselves)</a></li>
diff --git a/docs/make-snapshot b/docs/make-snapshot
index dc16ddda8b8..56ddb7892e6 100755
--- a/docs/make-snapshot
+++ b/docs/make-snapshot
@@ -21,6 +21,11 @@
 if [ ! `which gh` ]; then echo "This script requires that gh is installed"; exit 1; fi
 if [ ! `which git` ]; then echo "This script requires that git is installed"; exit 1; fi
 
+## Check that gh is logged in by running gh auth status, and if not, run gh auth login
+if [ -z "`gh auth status | grep -i logged`" ]; then
+  gh auth login;
+fi
+
 if [ "$#" == "0" ]; then
   echo "Usage: ./make-snapshot -b <branch> <version>"
   exit 0
@@ -42,7 +47,7 @@ echo Making a snapshot from branch $branch named version $1
 ## The version name
 V=v$1
 ## Text string in index.html that marks where to put the version text
-M="<!-- VERSION INFO HERE-->"
+M='<!-- VERSION INFO HERE-->'
 
 ## Location of the development docs folder
 D=$(dirname "$BASH_SOURCE")
@@ -53,12 +58,21 @@ B=`echo snapshot-$V | sed -e "s/\./_/g"`
 
 ## Temp folder in which to clone
 P=/tmp/docsnapshotT
+
+if [ -n "$WINDIR" ]; then
+  P=/c/tmp/docsnapshotT
+fi
+
 rm -rf $P
-mkdir $P
-pushd $P
-git clone git@github.com:dafny-lang/dafny.git -b $branch --depth 1
-git clone git@github.com:dafny-lang/dafny-lang.github.io.git -b main --depth 1
-popd
+mkdir -p $P
+
+CWD=`pwd`
+cd $P
+(git clone git@github.com:dafny-lang/dafny.git -b $branch --depth 1) || \
+    (echo FAILED to clone dafny; exit 1)
+(git clone git@github.com:dafny-lang/dafny-lang.github.io.git -b main --depth 1) || \
+    (echo FAILED to clone dafny-lang.github.io; exit 1)
+cd $CWD
 
 ## Location of the dafny-lang.github.io repo
 T=$P/dafny-lang.github.io
@@ -78,7 +92,8 @@ rm Snapshots.md-e
 git add Snapshots.md
 git commit -m "Documentation snapshot for $V"
 git push --set-upstream origin "$B"
-gh pr create --fill -R https://github.com/dafny-lang/dafny -B $branch --head "$B" | tail -1 > $P/url1
+(gh pr create --fill -R https://github.com/dafny-lang/dafny -B $branch --head "$B" | tail -1 > $P/url1) || \
+    (echo FAILED to create PR with gh; exit 1)
 
 ## Changes on dafny-lang.github.io
 ( cd $T && git checkout -b "$B" main ) || \
@@ -87,7 +102,8 @@ gh pr create --fill -R https://github.com/dafny-lang/dafny -B $branch --head "$B
 (cd $T; git rm -r latest; rm -rf latest; mkdir latest; git commit -m "Removing old latest")
 
 cp -R . "$T/$V" || ( echo copy FAILED; exit 1 )
-cp -R "$T/$V/" "$T/latest/"
+## Copy the latest snapshot "$T/$V" to the latest folder "$T/latest/"
+cp -R "$T/$V/." "$T/latest"
 cp Snapshots.md "$T"
 
 ## Tweaks to snapshot files
@@ -103,7 +119,8 @@ grep -q "$M" $T/$V/index.html || (echo FAILED: No Version marker line in "$T/$V/
 sed -i -e "s/$M.*/${M}$V documentation snapshot/" $T/$V/index.html || (echo Version replacement FAILED; exit 1; )
 sed -i -e "s/$M.*/${M}Latest release documentation snapshot/" $T/latest/index.html || (echo Version replacement FAILED; exit 1; )
 
-pushd $T
+CWD=`pwd`
+cd $T
 rm `find . -name index.html-e`
 
 (git add -u \
@@ -115,7 +132,7 @@ rm `find . -name index.html-e`
 git status
 git push --set-upstream origin "$B"
 gh pr create --fill -R https://github.com/dafny-lang/dafny-lang.github.io -B main --head "$B" | tail -1 > $P/url2
-popd
+cd $CWD
 
 ##diff -r . $T/latest
 ##diff -r . $T/$V
diff --git a/docs/news/6006.fix b/docs/news/6006.fix
new file mode 100644
index 00000000000..33dd67b02e8
--- /dev/null
+++ b/docs/news/6006.fix
@@ -0,0 +1 @@
+Fix soundness bug that could occur for opaque blocks with empty modifies clauses
\ No newline at end of file
diff --git a/docs/news/6028.feat b/docs/news/6028.feat
new file mode 100644
index 00000000000..2bfb7957467
--- /dev/null
+++ b/docs/news/6028.feat
@@ -0,0 +1 @@
+Change the default value for --verification-time-limit to 30 seconds instead of 0 (no limit)
\ No newline at end of file
diff --git a/docs/news/fix.3809 b/docs/news/fix.3809
new file mode 100644
index 00000000000..177fb99de1b
--- /dev/null
+++ b/docs/news/fix.3809
@@ -0,0 +1 @@
+Fix C#, Java and Go generated code when a datatype contains a method named 'Default'
diff --git a/docs/news/fix.5746 b/docs/news/fix.5746
new file mode 100644
index 00000000000..19e1b00b370
--- /dev/null
+++ b/docs/news/fix.5746
@@ -0,0 +1 @@
+Fix C# generated code when a module contains a type with the same name
diff --git a/docs/news/fix.6014 b/docs/news/fix.6014
new file mode 100644
index 00000000000..614d71f3329
--- /dev/null
+++ b/docs/news/fix.6014
@@ -0,0 +1 @@
+Fix Java generated code when a module contains a type with the same name
diff --git a/docs/toc.md b/docs/toc.md
index 57ab1e58470..cd3da7aae9d 100644
--- a/docs/toc.md
+++ b/docs/toc.md
@@ -6,12 +6,6 @@ layout: default
 ---
 
 <link rel="stylesheet" href="assets/main.css">
-<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
-<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
-<script type="text/x-mathjax-config">
-        MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ["\\(","\\)"]], displayMath: [ ["$$","$$"], ["\\[","\\]"] ]
-        }});
-</script>
 
 <font size="+4"><p style="text-align: center;">Dafny Documentation</p></font>
 
diff --git a/dotnet-tools.json b/dotnet-tools.json
index 3f18a8db86e..3c54d779830 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -3,22 +3,16 @@
   "isRoot": true,
   "tools": {
     "cocor": {
-      "version": "2014.12.24",
+      "version": "2014.12.25",
       "commands": [
         "coco"
       ]
     },
-    "dotnet-format": {
-      "version": "5.1.250801",
-      "commands": [
-        "dotnet-format"
-      ]
-    },
     "boogie": {
-      "version": "2.16.0",
+      "version": "3.2.5",
       "commands": [
         "boogie"
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/global.json b/global.json
new file mode 100644
index 00000000000..8cdc63e1385
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.111",
+    "rollForward": "latestFeature"
+  }
+}
\ No newline at end of file
diff --git a/script.sh b/script.sh
new file mode 100755
index 00000000000..523d8653e16
--- /dev/null
+++ b/script.sh
@@ -0,0 +1 @@
+dotnet run --project Source/Scripts/Scripts.csproj -- "$@"
\ No newline at end of file